From: Richard Huang <r.huang@samsung.com>
Date: Fri, 12 Apr 2024 09:53:36 +0000 (+0100)
Subject: [dali_2.3.19] Merge branch 'devel/master'
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=HEAD;hp=5e7b7d7fb3a8c320a9371cf31043a0b3fddb8f3d

[dali_2.3.19] Merge branch 'devel/master'

Change-Id: I9e0ec33f708c2b1c5c45c385e277d821f0fab64b
---

diff --git a/.gitignore b/.gitignore
index 8fef0e8..f069b3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,19 @@
+# Common gitignore
 .cproject
 .project
 .settings
 .directory
-.idea/
 Makefile.in
 Makefile
+BROWSE
 CMakeCache.txt
 CMakeFiles/
 cmake_install.cmake
-dali.node
-dali.doxy
 install_manifest.txt
-libdali2-toolkit.so*
 *~
+*.pc
 *.o
 *.o.d
-*.pc
 *.lo
 *.loT
 *.la
@@ -37,18 +35,47 @@ libdali2-toolkit.so*
 .deps
 .libs
 *.swp
+*.creator
+*.creator.user
 /docs/generated/*
 /build/tizen/doc
 /build/tizen/.cov
-build/tizen/CMakeDoxyfile.in
-build/tizen/CMakeDoxygenDefaults.cmake
+/build/tizen/CPack*.cmake
+
+/build/tizen/.ninja_deps
+/build/tizen/.ninja_log
+/build/tizen/build.ninja
+/build/tizen/rules.ninja
+
+/build/tizen/dali-physics/*.cmake
+/build/tizen/dali-physics/Makefile
+/build/tizen/dali-physics/CMakeCache.txt
+/build/tizen/dali-physics/CMakeFiles/
+/build/tizen/dali-physics/cmake_install.cmake
+/build/tizen/dali-physics/bullet3/
+/build/tizen/dali-physics/chipmunk2d/
+
 /build/desktop
 /packaging/home*
+compile_commands.json
+.clangd
+/debugfiles.list
+/debuglinks.list
+/debugsources.list
+.clangd/
+*.vscode/
+*.cache/
+# dali-toolkit only
+.idea/
+dali.node
+dali.doxy
+libdali2-toolkit.so*
+build/tizen/CMakeDoxyfile.in
+build/tizen/CMakeDoxygenDefaults.cmake
 .vscode/
 core
-.clangd/
-compile_commands.json
 dali-toolkit/internal/graphics/generated/*
 dali-toolkit/internal/graphics/builtin-shader-extern-gen.h
-dali-scene-loader/internal/graphics/generated/*
-dali-scene-loader/internal/graphics/builtin-shader-extern-gen.h
+dali-scene3d/internal/graphics/generated/*
+dali-scene3d/internal/graphics/builtin-shader-extern-gen.h
+automated-tests/resources/overwritable-image.jpg
\ No newline at end of file
diff --git a/README.md b/README.md
index e4cfdbc..b744509 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
          * Build with the Visual Studio project.
          * Build with CMake.
       * [4. Building for MacOS](#4-building-for-macos)
-   * [DALi Scene Loader](#dali-scene-loader)
+   * [DALi Scene3D](#dali-scene3d)
 
 # Build Instructions
 
@@ -131,6 +131,6 @@ To build, run:
 % make install -j8
 ```
 
-# DALi Scene Loader
+# DALi Scene3D
 
-For information about the DALi Scene Loader library, refer to dali-scene-loader/README.md.
+For information about the DALi Scene3D library, refer to dali-scene3d/README.md.
diff --git a/automated-tests/README.md b/automated-tests/README.md
index f256435..f58ffdb 100644
--- a/automated-tests/README.md
+++ b/automated-tests/README.md
@@ -1,7 +1,7 @@
 Testing environment   {#auto_testing}
 ===================
 
-The new test environment from Tizen is the Web-TCT test suite. This was written for testing web components, but can easily be used for testing Dali.
+The current test environment from Tizen is the Web-TCT test suite. This was written for testing web components, but can easily be used for testing Dali. The tests remain compatible with the previous TET test suite.
 
 Each of the DALi repositories, **dali-core**, **dali-adaptor** and **dali-toolkit**, have their own test suites under the `automated-tests` folder. Within the src folder are a number of secondary folders - these correspond to 'API' tests  and internal (for desktop testing only)
 
@@ -59,7 +59,7 @@ Building libraries with coverage options
 
 Building dali toolkit:
 
-    cd dali-core  # the location of your dali-core repository
+    cd dali-toolkit  # the location of your dali-toolkit repository
     cd build/tizen
     export CC=gcc
     export CXX=g++
@@ -79,7 +79,7 @@ Run the following commands:
     cd automated-tests
     ./build.sh
 
-This will build dali-toolkit and dali-toolkit-internal test sets.
+This will build each of the test sets found under automated-tests/src.
 
 Test sets can be built individually:
 
@@ -91,7 +91,7 @@ They can also be built without regenerating test case scripts (Useful for quicke
 
 Or without cleaning down the build area (Useful for fast build/run/debug cycles)
 
-    ./build.sh -n -r dali-toolkit-internal
+    ./build.sh -n -r dali-scene3d
 
 
 Executing the tests
@@ -105,11 +105,19 @@ To execute tests, cd into automated-tests and run
 
     ./execute.sh
 
-This will execute dali and dali-internal test sets. Note that the output summary for the first will be printed before running the second.
+To execute a subset of tests, you can run individual test sets, e.g.
+
+    ./execute.sh dali
+
+To execute a specific test, just pass it on the command line:
+
+    ./execute.sh UtcDaliImageViewNewP
 
-By default the tests execute in parallel, which is faster but does not produce any test case output files.  Use this to execute the tests in series and log test output to stdout/err
+To execute a matching subset of tests, use the prefix option:
 
-    ./execute.sh -S
+    ./execute.sh -p UtcDaliImageView
+
+will execute all tests that start with the prefix "UtcDaliImageView".
 
 To use test kit lite, (which is very slow),
 
@@ -119,10 +127,6 @@ To see the test kit lite results, copy the style folder from web-tct_2.2.1_r1/to
 
     firefox --new-window summary.xml
 
-To execute a subset of tests, you can run individual test sets, e.g.
-
-    ./execute.sh dali-toolkit
-
 To get full coverage output (you need to first build dali libraries with
 --coverage), run
 
@@ -159,19 +163,25 @@ sudo apt-get install libconfig-tiny-perl
 If you use a non-standard `GBS_ROOT` then you will need to edit the tcbuild script to match your configuration - change line 96 and add a -B option with your GBS-ROOT path (line 96 = `gbs build -A armv7l --spec core-$1-tests.spec --include-all --keep-packs` ).
 To install on device from a non-standard GBS_ROOT, also modify line 28 (`RPM_DIR="$HOME/GBS-ROOT/local/repos/$PROFILE/armv7l/RPMS"`).
 
-For core Dali cd into automated-tests, and use:
-
-sudo ./tcbuild build dali
-
-    sudo ./tcbuild build dali
-    ./tcbuild install dali
-
-For Dali Adaptor, cd into automated-tests, and use:
 
-    sudo ./tcbuild build dali-adaptor
-    sudo ./tcbuild build dali-platform-abstraction
-    ./tcbuild install dali-adaptor
-    ./tcbuild install dali-platform-abstraction
+For Dali Toolkit, cd into automated-tests, and use:
+
+    sudo ./tcbuild build dali-physics
+    sudo ./tcbuild build dali-scene3d
+    sudo ./tcbuild build dali-scene3d-internal
+    sudo ./tcbuild build dali-shader-generator
+    sudo ./tcbuild build dali-toolkit
+    sudo ./tcbuild build dali-toolkit-internal
+    sudo ./tcbuild build dali-toolkit-styling
+    sudo ./tcbuild build dali-toolkit-third-party
+    ./tcbuild install dali-physics
+    ./tcbuild install dali-scene3d
+    ./tcbuild install dali-scene3d-internal
+    ./tcbuild install dali-shader-generator
+    ./tcbuild install dali-toolkit
+    ./tcbuild install dali-toolkit-internal
+    ./tcbuild install dali-toolkit-styling
+    ./tcbuild install dali-toolkit-third-party
 
 Ensure your handset's filesystem is writable:
 
@@ -190,15 +200,10 @@ You can find the output files under /opt/tct/manager/result/
 Adding tests
 ============
 
-To Managed API
---------------
-
-If you are adding test cases for new or existing managed API (CAPI), you need to add your changes to the src/dali mirror, and copy your change to the managed test suite in core-api. You need to inform HQ of your update.
-
 For internal API
 ----------------
 
-If you are adding tests for internal API, then this will only work on desktop, and you should add your tests to the src/dali-internal test suite.
+If you are adding tests for internal API, then this will only work on desktop, and you should add your tests to the src/dali-toolkit-internal test suite.
 
 General
 -------
@@ -214,7 +219,7 @@ If you are adding test cases to existing files, then all you need to do is creat
 
 Note that **the parentheses in the method signature must not be empty** (i.e., it must violate our coding convention and follow __exactly__ this pattern: `int UtcDaliMyTestcaseName(void)`), as it's parsed by an awk script to auto-generate the testcase arrays in the main header file. Neither may any comments on the same line contain empty parentheses.
 
-You can contine to use the TET api, e.g. `tet_infoline`, `tet_result` and our test check methods `DALI_TEST_CHECK`, `DALI_TEST_EQUALS`, etc.
+You can use the previous TET api, e.g. `tet_infoline`, `tet_result` and our test check methods `DALI_TEST_CHECK`, `DALI_TEST_EQUALS`, etc.
 
 If you need any non-test methods or variables, ensure they are wrapped in an anonymous namespace.
 
@@ -262,14 +267,14 @@ Debugging
 On desktop, you can debug the tests by running gdb on the test program:
 
     $ cd automated-tests
-    $ gdb build/src/dali-toolkit/tct-dali-toolkit-core
+    $ ./execute.sh -d <TestCase>
     gdb> r <TestCase>
 
 replace `<TestCase>` with the name of the failing testcase.
 
 For example, using testcase UtcDaliControlBackgroundProperties from the dali-toolkit test suite:
 
-    $ gdb build/src/dali-toolkit/tct-dali-toolkit-core
+    $ ./execute.sh -d UtcDaliControlBackgroundProperties
     gdb> r UtcDaliControlBackgroundProperties
 
 
diff --git a/automated-tests/build.sh b/automated-tests/build.sh
index 7e812e1..a56cd87 100755
--- a/automated-tests/build.sh
+++ b/automated-tests/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 
-TEMP=`getopt -o r --long rebuild \
+TEMP=`getopt -o rn --long rebuild,no-gen \
      -n 'genmake' -- "$@"`
 
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -10,10 +10,12 @@ if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 eval set -- "$TEMP"
 
 opt_rebuild=false
+opt_generate=true
 
 while true ; do
     case "$1" in
         -r|--rebuild) opt_rebuild=true ; shift ;;
+        -n|--no-gen)  opt_generate=false ; shift ;;
         --) shift ; break ;;
         *) shift ;;   # Ignore
     esac
@@ -26,7 +28,17 @@ fi
 
 function build
 {
-    (cd build ; cmake .. -DMODULE=$1 ; make -j7 )
+    if [ $opt_generate == true -o $opt_rebuild == false ] ; then
+        (cd src/$1; ../../scripts/tcheadgen.sh tct-$1-core.h)
+        if [ $? -ne 0 ]; then echo "Aborting..."; exit 1; fi
+    fi
+    BUILDSYSTEM="Unix Makefiles"
+    BUILDCMD=make
+    if [ -e ../build/tizen/build.ninja ] ; then
+        BUILDSYSTEM="Ninja"
+        BUILDCMD=ninja
+    fi
+    (cd build ; cmake .. -DMODULE=$1 -G "$BUILDSYSTEM" ; $BUILDCMD -j7 )
 }
 
 if [ -n "$1" ] ; then
diff --git a/automated-tests/coverage.sh b/automated-tests/coverage.sh
index 11c534d..d9589ce 100755
--- a/automated-tests/coverage.sh
+++ b/automated-tests/coverage.sh
@@ -6,18 +6,16 @@ if [ $1 == -n ] ; then
 fi
 
 BUILD_DIR_NAME=tizen
-function MakeCovData()
-{
-    (  cd ../build/$BUILD_DIR_NAME ; make cov_data )
-}
-
-MakeCovData
-if [[ $? -ne 0 ]]
-then
-    BUILD_DIR_NAME=tizen-cmake
-    MakeCovData
+
+BUILDSYSTEM=make
+
+if [ -e ../build/tizen/build.ninja ] ; then
+    BUILDSYSTEM=ninja
 fi
 
+(  cd ../build/$BUILD_DIR_NAME ; $BUILDSYSTEM cov_data )
+
+
 # From lcov version 1.10 onwards, branch coverage is off by default and earlier versions do not support the rc option
 LCOV_OPTS=`if [ \`printf "\\\`lcov --version | cut -d' ' -f4\\\`\n1.10\n" | sort -V | head -n 1\` = 1.10 ] ; then echo "--rc lcov_branch_coverage=1" ; fi`
 
diff --git a/automated-tests/execute.sh b/automated-tests/execute.sh
index adee84b..152b052 100755
--- a/automated-tests/execute.sh
+++ b/automated-tests/execute.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEMP=`getopt -o dhsSmfq --long debug,help,failnorerun,quiet,serial,tct,modules -n 'execute.sh' -- "$@"`
+TEMP=`getopt -o dhsSmfqp: --long debug,help,failnorerun,quiet,serial,tct,modules,prefix: -n 'execute.sh' -- "$@"`
 
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 
@@ -13,6 +13,7 @@ function usage
     echo -e "       execute.sh\t\tExecute test cases from all modules in parallel"
     echo -e "       execute.sh -f \tExecute test cases from all modules in parallel without rerunning failed test cases"
     echo -e "       execute.sh -d <testcase>\tDebug testcase"
+    echo -e "       execute.sh -p <prefix>\tExecute all testcases named with <prefix>"
     echo -e "       execute.sh [module]\tExecute test cases from the given module in parallel"
     echo -e "       execute.sh -s [module]\t\tExecute test cases in serial using Testkit-Lite"
     echo -e "       execute.sh -S [module]\t\tExecute test cases in serial"
@@ -27,6 +28,7 @@ opt_modules=0
 opt_debug=0
 opt_noFailedRerun="";
 opt_quiet="";
+opt_match="";
 while true ; do
     case "$1" in
         -h|--help)     usage ;;
@@ -35,6 +37,7 @@ while true ; do
         -f|--nofailedrerun) opt_noFailedRerun="-f" ; shift ;;
         -S|--serial)   opt_serial="-s" ; shift ;;
         -q|--quiet)    opt_quiet="-q" ; shift ;;
+        -p|--prefix)   opt_match="-m $2" ; shift 2;;
         -m|--modules)  opt_modules=1 ; shift ;;
         --) shift; break;;
         *) echo "Internal error $1!" ; exit 1 ;;
@@ -147,7 +150,7 @@ else
             echo -e "$ASCII_BOLD"
             echo -e "Executing $mod$ASCII_RESET"
             output_start $mod
-            dbus-launch build/src/$mod/tct-$mod-core $opt_serial $opt_noFailedRerun $opt_quiet
+            dbus-launch build/src/$mod/tct-$mod-core $opt_serial $opt_noFailedRerun $opt_quiet $opt_match
             output_end $mod
         done
         summary_end
@@ -159,7 +162,7 @@ else
         module=$1
         shift;
         output_start ${module}
-        dbus-launch build/src/$module/tct-$module-core $opt_serial $opt_noFailedRerun $opt_quiet $*
+        dbus-launch build/src/$module/tct-$module-core $opt_serial $opt_noFailedRerun $opt_quiet $opt_match $*
         output_end ${module}
         summary_end
 
@@ -184,6 +187,19 @@ else
         done
         echo $1 not found
     fi
+
+    # Kill off any dangling or sleeping dbus sessions that we would have created
+    cgroup=$(awk -F ':' '$2 == "name=systemd" { print $3 }' /proc/self/cgroup)
+    if [ -n "$cgroup" ] ; then
+        for pid in $(cat /sys/fs/cgroup/systemd/$cgroup/tasks 2>/dev/null); do
+            comm=$(cat /proc/$pid/comm 2>/dev/null)
+            case "$comm" in
+            dbus-daemon|dbus-launch)
+                kill $pid
+                ;;
+            esac
+        done
+    fi
 fi
 
 if [ -f summary.xml ] ; then
diff --git a/automated-tests/patch-coverage.pl b/automated-tests/patch-coverage.pl
index 1f836a4..38fc2b0 100755
--- a/automated-tests/patch-coverage.pl
+++ b/automated-tests/patch-coverage.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (c) 2020 Samsung Electronics Co., Ltd.
+# Copyright (c) 2023 Samsung Electronics Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -985,7 +985,7 @@ sub parse_diff
     $files{$file}->{"patch"} = [@checklines];
     $files{$file}->{"b_lines"} = {%b_lines};
 
-    my %filter = map { $_ => $files{$_} } grep {m!^dali(-toolkit|-scene-loader)?/!} (keys(%files));
+    my %filter = map { $_ => $files{$_} } grep {m!^dali(-toolkit|-scene3d|-physics)?/!} (keys(%files));
 
     if($pd_debug)
     {
diff --git a/automated-tests/resources/AlphaBlendModeTest.gltf b/automated-tests/resources/AlphaBlendModeTest.gltf
new file mode 100644
index 0000000..e2a3553
--- /dev/null
+++ b/automated-tests/resources/AlphaBlendModeTest.gltf
@@ -0,0 +1,1325 @@
+{
+    "accessors" : [
+        {
+            "bufferView" : 0,
+            "componentType" : 5121,
+            "count" : 6,
+            "max" : [
+                3
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 1,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.550000011920929,
+                1.9699997901916504,
+                -0.0
+            ],
+            "min" : [
+                -0.550000011920929,
+                0.10000008344650269,
+                -0.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 2,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 3,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 4,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.675000011920929,
+                0.9850000245496631
+            ],
+            "min" : [
+                0.1250002235174179,
+                0.050000011920928955
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 5,
+            "componentType" : 5121,
+            "count" : 6,
+            "max" : [
+                3
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 6,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.550000011920929,
+                1.9699997901916504,
+                -0.0
+            ],
+            "min" : [
+                -0.550000011920929,
+                0.10000008344650269,
+                -0.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 7,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 8,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 9,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.675000011920929,
+                0.9850000245496631
+            ],
+            "min" : [
+                0.1250002235174179,
+                0.050000011920928955
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 10,
+            "componentType" : 5121,
+            "count" : 90,
+            "max" : [
+                71
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 11,
+            "componentType" : 5126,
+            "count" : 72,
+            "max" : [
+                4.300000190734863,
+                2.2995333671569824,
+                0.550000011920929
+            ],
+            "min" : [
+                -4.300000190734863,
+                -0.10000002384185791,
+                -0.75
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 12,
+            "componentType" : 5126,
+            "count" : 72,
+            "max" : [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "min" : [
+                -1.0,
+                -1.0,
+                -1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 13,
+            "componentType" : 5126,
+            "count" : 72,
+            "max" : [
+                4.471359034141642e-07,
+                1.0,
+                1.0,
+                1.0
+            ],
+            "min" : [
+                -9.737556183608831e-08,
+                -1.0,
+                -1.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 14,
+            "componentType" : 5126,
+            "count" : 72,
+            "max" : [
+                0.9974293112754822,
+                0.9976851856335998
+            ],
+            "min" : [
+                0.0025706912856549025,
+                0.0023148059844970703
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 15,
+            "componentType" : 5121,
+            "count" : 6,
+            "max" : [
+                3
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 16,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.550000011920929,
+                1.9699997901916504,
+                -0.0
+            ],
+            "min" : [
+                -0.550000011920929,
+                0.10000008344650269,
+                -0.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 17,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 18,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 19,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.675000011920929,
+                0.9850000245496631
+            ],
+            "min" : [
+                0.1250002235174179,
+                0.050000011920928955
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 20,
+            "componentType" : 5121,
+            "count" : 9,
+            "max" : [
+                8
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 21,
+            "componentType" : 5126,
+            "count" : 9,
+            "max" : [
+                3.0900001525878906,
+                0.48338040709495544,
+                -0.0
+            ],
+            "min" : [
+                0.0,
+                -0.4815960228443146,
+                -0.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 22,
+            "componentType" : 5126,
+            "count" : 9,
+            "max" : [
+                -0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 23,
+            "componentType" : 5126,
+            "count" : 9,
+            "max" : [
+                0.9998476505279541,
+                -0.017456788569688797,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                0.9998476505279541,
+                -0.017456810921430588,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 24,
+            "componentType" : 5126,
+            "count" : 9,
+            "max" : [
+                0.8169060349464417,
+                0.6157673895359039
+            ],
+            "min" : [
+                0.81337970495224,
+                0.6086612045764923
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 25,
+            "componentType" : 5121,
+            "count" : 48,
+            "max" : [
+                31
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 26,
+            "componentType" : 5126,
+            "count" : 32,
+            "max" : [
+                3.2899999618530273,
+                0.15600000321865082,
+                0.009999990463256836
+            ],
+            "min" : [
+                -3.2899999618530273,
+                -0.15600000321865082,
+                -5.364418029785156e-07
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 27,
+            "componentType" : 5126,
+            "count" : 32,
+            "max" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 28,
+            "componentType" : 5126,
+            "count" : 32,
+            "max" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 29,
+            "componentType" : 5126,
+            "count" : 32,
+            "max" : [
+                0.9825000166893005,
+                0.7575000524520874
+            ],
+            "min" : [
+                0.7800000309944153,
+                0.019777417182922363
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 30,
+            "componentType" : 5121,
+            "count" : 6,
+            "max" : [
+                3
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 31,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.550000011920929,
+                1.9699997901916504,
+                -0.0
+            ],
+            "min" : [
+                -0.550000011920929,
+                0.10000008344650269,
+                -0.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 32,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 33,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 34,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.675000011920929,
+                0.9850000245496631
+            ],
+            "min" : [
+                0.1250002235174179,
+                0.050000011920928955
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 35,
+            "componentType" : 5121,
+            "count" : 6,
+            "max" : [
+                3
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 36,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                -0.9919999837875366,
+                0.11400000005960464,
+                0.009999999776482582
+            ],
+            "min" : [
+                -1.2080000638961792,
+                -0.11400000005960464,
+                0.009999999776482582
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 37,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 38,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 39,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.9825000166893005,
+                0.7575000524520874
+            ],
+            "min" : [
+                0.8924999237060547,
+                0.6624999940395355
+            ],
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 40,
+            "componentType" : 5121,
+            "count" : 6,
+            "max" : [
+                3
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 41,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.550000011920929,
+                1.9699997901916504,
+                -0.0
+            ],
+            "min" : [
+                -0.550000011920929,
+                0.10000008344650269,
+                -0.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 42,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "min" : [
+                -0.0,
+                0.0,
+                1.0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 43,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "min" : [
+                1.0,
+                0.0,
+                -0.0,
+                1.0
+            ],
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 44,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.675000011920929,
+                0.9850000245496631
+            ],
+            "min" : [
+                0.1250002235174179,
+                0.050000011920928955
+            ],
+            "type" : "VEC2"
+        }
+    ],
+    "asset" : {
+        "copyright": "Copyright 2018 Analytical Graphics, Inc, CC-BY 4.0 https://creativecommons.org/licenses/by/4.0/ - Model and textures by Ed Mackey.",
+        "generator" : "Khronos Blender glTF 2.0 exporter, with hand-edits for alpha blend/cutoff modes",
+        "version" : "2.0"
+    },
+    "bufferViews" : [
+        {
+            "buffer" : 0,
+            "byteLength" : 6,
+            "byteOffset" : 0,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 8,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 56,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 64,
+            "byteOffset" : 104,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 168,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 6,
+            "byteOffset" : 200,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 208,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 256,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 64,
+            "byteOffset" : 304,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 368,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 90,
+            "byteOffset" : 400,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 864,
+            "byteOffset" : 492,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 864,
+            "byteOffset" : 1356,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 1152,
+            "byteOffset" : 2220,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 576,
+            "byteOffset" : 3372,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 6,
+            "byteOffset" : 3948,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3956,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4004,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 64,
+            "byteOffset" : 4052,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 4116,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 9,
+            "byteOffset" : 4148,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 108,
+            "byteOffset" : 4160,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 108,
+            "byteOffset" : 4268,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 144,
+            "byteOffset" : 4376,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 72,
+            "byteOffset" : 4520,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4592,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 384,
+            "byteOffset" : 4640,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 384,
+            "byteOffset" : 5024,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 512,
+            "byteOffset" : 5408,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 256,
+            "byteOffset" : 5920,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 6,
+            "byteOffset" : 6176,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 6184,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 6232,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 64,
+            "byteOffset" : 6280,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 6344,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 6,
+            "byteOffset" : 6376,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 6384,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 6432,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 64,
+            "byteOffset" : 6480,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 6544,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 6,
+            "byteOffset" : 6576,
+            "target" : 34963
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 6584,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 6632,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 64,
+            "byteOffset" : 6680,
+            "target" : 34962
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 6744,
+            "target" : 34962
+        }
+    ],
+    "buffers" : [
+        {
+            "byteLength" : 6776,
+            "uri" : "data:application/octet-stream;base64,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"
+        }
+    ],
+    "images" : [
+        {
+            "uri" : "data:image/jpeg;base64,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SM7xhy9fVPmV37TjrforNiaRbaMOnk9Pyezysejfry0yazPN00no4dsN/My0667Sr03w12w4aaefpv2TFs3Xzc2HsV8fj7PRpOnXxz5e17dOe1QAAAEphWU3rEQrS0Xljbi6rxLtryyuABWbWioELE4Xjoy6ctPP1rqRKYJglAAC01z6saS6OS3Pnrpno3paJmqL1tW1STO0WER0ZzyariI0tGVqsrRa1gAAAABFNc5zzvvmr6OVK2zraJWmIrMj0OPThRwds9auaIUAAAG8WGlJpn1+XpHXryXjsT5mtdwJOnnr5nXp0VrMLUvS+MrgXrN658ut9IAAAATCJTCJSQAWiaIl0sfPnfeDSrK0SkASnJOioV1rbC60AAAAAAAAAAAAAAAJpNrxQSQWz0wvlrKSEgSTW0M62vSdNc+eL3AENdcebk264vl04dNHkU29HSuNiEkqrTSJvEV9Hz9eHTz4123RnN6T0bV4s9daX015duLTm7435deDavXjpET0Rzuq3Djptne1J1vGXdy14st8PQy6qQAAAJWrNZgABJ3cG3NHD5PodXVeu1BONtbxEua0aSQkXrTSlUb8e/NtGohIJBBMxESmIiZF62vjabcOc68+/ZetbUwi100vFqzQuaK56Ms7alrUytN8L3ztYpvSoAAAAF6FY2xnTLfz/R59axEzCQBMRthjvS3JfbWisgAABj1QSWo19Ljz8nSadGek820dAAk6Ma4Rry9Eb1ytN4BKZitZnWk82saVAAAE1haYlMKkwmQgKdGV+bVBYBBIASa5V5trKa6OdMxNgJIAAAAAAAAAAAAACdKUzvYADSjktbeagkgSQXrfKcLToACZrRaermnOuOFe7j6Y3v5+s7GlU3rWLQTDqrHFfOzWQAIi0zURE9ONOW/RnOPSc13ZnXKlo3C9a650o25rX3pdhz8PZft5OnxvR5/WzpIWKw2znDeqJmAAtE1VvM59fNHK08n0Ozr5ufuz4GmuU6prZKLSzrMym9NcLc2k3JgF63kpaqKxNkQmSBaL648mG/RJtlStq526CsK4200Z2idKaUtyRO4rTsw14emt9K01xZzGG15smAAAAAktmraKWiJveIAExeIqtWUiAAAAAGkxG+eNc9ufXD0eW3j9+HQ6ZgABMNs6cO/TdjpUJTCANKMNF4AACa6nNFtJRCxFqqzFZvM1vjN4xy21AEJSmIAAtS0zhS2xAAJIAAAAAAAAAJIAABalF71BJAEpvk5d41ibViJAC1OmkcEujLW0oytfStEzlfXanLrW08+21OPy+u/Ra0100jCJuCdcaxPRhp5956QANMr4bY3jWIobVtlWOhfl35dsenHXjvXriYADbONss+fXescS3p7cvNw7y6I0z7KW4d6r5dfB0cfVGgAmNazjalYvcWh3+djxdueevUNKVpe0FoiJQkWjTFnpIAFypCCQlMIJrVa0CU5purpnek34+jLv588I0pvN6rxUF781+foz5dXfnUC0KSkAAALK1mJipaldI0pELRawBaYpEyAAAAABKbRRCTfKeeldW3n9PPtbWRCQADqwjk1pF9bREphAElqxneZgAJSrVaYBMEoBpVhZtStL2AA0pNLZ1m8pBEr1ZStaFZgkC0WztS0SAAABDTOumvNlW1c9l7RcSJym+sZgAExF7xz1tpKaokAhN60vS3NsvCQCs72pyUttdG2NMra604401vne0Y8215jo5qzrtl2cWnn9fH0RattgAIpeb0AAEiCtotlrTow059OTfl7MvR4urzO3zPQw7fO2z60gASRSZvTXn7+SnD0b1y59em+PNtab22pW2G3l9uXbSQWvTPObWsgExOdrXjIsAAABaLUwpPRIAmJiYAAAVvM4xNxKZy6OPp5OzK+tFq14ejLoz0tCFufSmkaUr17V841zm3B0ba1iltIO3Lgs0AACNqua02JAtCpMoBDSYxTYAC0bosAAAM74ShCUwm+eWeulOfrx6/P6aWtEgAAXqJ5dZ3pFZi0ABMIkAJSVhYiQmEAC1FNImJABMogmCQhJc5zQACUohMQkAAACsYZuLafUL6c+/B08HQ10gR08u3mzLrx6KgIaXrzVtqJJpOd4laJi1Zic5y6JtyLaUtaSFtMKRrpgrtOcN705a31AAHRxTzdM3jLPPo5OzHtpIEmWfVrlwZ36uXruRvWmlc7QELRKVLU6sNMJ5a7IdE55r6Lc2vN2c+9LgAVym2sXx9HGvzu2vtcscXRppesUi2WjeiMXP103pdWsWmaxFpAlM0pW9gAAABJfGme1iQTKtGKdLRcWi2Vq2rvE8dmoEptj6OFvGpfXoreZiksNZ2pNJbUjKerop5uc7dOVJypa2U23rXC9dOLq2i1gAMp6b5UjTku0JAFo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jxF/SAynbowyy0mL4XjVGucZaWCU7Y9PBv5/TXTSs60yytbDS94mJAACUwgSmCESms3tGULZ20tFZjOwTJAAAAAJISQJi8TkWAAAA0z14843z04tr827q4uqd8NdPOnm579fTeLSmqJJIJgzta+d62ztrenFasc9PQnp85PST2c3ThbDm3roAAtCkrIWVxyvbelokCUwVlesRLp56cm902xtPRWlG/Hpea07IwtE0mbY35NtbzyWnXopmiImSSAANKUra0TIAvSKTfl1vtFL1qAAAL1m1cc9Nr5s5tlpjrF7ROdotAWrNL16ufp5NvPpfo1qFJ0mM7AAlKs1nOZsL00y05rRqBMTW0TAAAADq52GlctI0y0z1687efpGswKzWpa8dOF+JG95rIFd7uA0yv0RSLVrOlb1RKsyABK2lJwvzS64nnvFoSCZisTIAJnKNZrja1lb1vjSK9C8JTTl2870dOrLn0i9sqVqvMV2jSILM+mL+VaepExMSIgmszKAAABKUVJlF61pab0m0ZUves2iZgEkAAAAAkIhKN6W5bxcAAADjj0pw59J6sdfO9blcHbHZy8XVzefxdPsU6bFoWlkWAJtnWuk3iNc6ZWitttuNx9+OtdQJLUjO2lbUvAFpjNOhnnXf0Obn8zpna1gBJasZ2m0EhetdcbcxfDpz05+6OTztuiultsZ1w7Mp8xNuXT0p38zdtz6a9VcJISSCAAAJQT089OXdK8SAAANKTlpF7Vz0y7vM6vL7KdEpyidJqJiYmume+WnBtl28m+OtdrxWrBOoEJrOWldEhBK9WUrklZTSLTXKs1AAAE210rXK+lop18+/n9PFpXTal6TzbZd/PpPFvvSfI9nl7vP2yrpbpzIzyvvemeueTSazYEkAAA2znLSJiK53jWsgvDOUgAmYWrTOenDXn6KSOjm7/A6eb0uat630vwdmLPaK2vlppelbRPO6uPored+jl82d9gABJMaZTotzzFiJTarDS9oz0rWUwkgACSAAAAAAACUwiU3pTK9pAAAANuDoy15/V5efh6ZwierPp8D0MM9vY3x4e22WlbzHPE6ASmq0xlZplNrMJXo3MNaTjrXSsgSXprzac2jaYi0UiZhM13OCLdF8rc+6YtdSYgCYRIATBLbKl8ac/RrelsNufOPTnPl0K2dfNxc3Z1c1+3q5POnbaJgJgEg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9bpGueud+KJ6OjC3nbuiazDTPbm15dY1IAAJIAiJmYA2x6efXzJp3r8stUhrnty68u1dYmAJJrWl9Nc4pbPXOarUjKm+lokAASWqmunHryc+u3bmvWUXpa1seaddrUiqlkwdOWVLRhtuJIABetsaRfWJJiImatJYlgSVJAAHTht5fTyy7+nHDHSmk1vFrRFZgkEkAAAUm14qBMTWYNMK9FdeSW8NOW+quFpjfJLm3nHal6zpE1LWhnMWKTsp6G+fj7Zc3dhr8z6uPRHRtXQAAXrLntzb57XkkBCZrCRMOjGuGl1NODrrrFejOazW0AAAAAAAJiYmAJCYVlMABJUmQQAEkWrbC8axAFq75X47xqBKITMWmtzDKxbTpyyRTLXVCU0smAAEiIAGuemM1w000nO9VlIm0AA1pW/H0eN27dOEehXh8vur2U1J0rWlohYdWMc1p5N7duOnNfk3bIrEyCYmYQRMTErVtW2VosNsujh6OHfDrjXntFwJTFIm6AAC0RWLJmhrXn1r0cXRltS4AAEm2cYRyeffDuv6FovaupyS0raYTJAJIAAAAW047eb3zqr00pWb3plW+kxUSQAAASa88bVwz001yjh6Vb73ipMTEwlMKymATDO2qMt6Vztfmvp0VrCljXDXXlng6fM76dcMe7njm1xnPrw2c/RhXTWzUmQQlXt4deXtz0vSmWnH3c2/m9L0uXPyO/TWG+cEgADSkZ57cnVTqpCItKAACY2pHP055mmVtOXWnQlAkgAAAAATCJACs6SymJAAAEggAEmmcYaLJkpHXlpwb0vKYABaJiIia3hS1gAJIAAAAABvjGF6ze8AAkgCNuvj4onLLo6uet53i8SikTYADo53LrtS/Hq3glBMLxNYJVlaCYmlsdK3EpnK+F6aWpKwBMxETJAAAvWyts78Vp6dKKyxvMotAAADTN08mfmehXaNbVmtoJEphEphUkAAACUTnPXjm59vK7rU3ik6ddOTSNIAAAABFU2AWiyMazpKJTVOVraxQAE6UilqRNx28uvm68mut5XhbTGlNaxNxJatufSvRnVVhtTSuoAmNkFcSxOEzhrv3Y+Tab9vNp5XZGrQsQAAJh04Zck9dNuXSdAABpTfK/Btn18XRToznfGeDe9px2qlKJiYAAJIAAmETBMptXOI1zvRNrRBJAAEkETa0UhIExOdl66R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mAJhEgBMEuvlpzaRF7qq654Z+pdxTNZievDj4+zu557O3m8auvVMzCszMAJIAEkAvWcpmLUvFiJIImZiAzu0yReW1KxNvPmerStspymbgTDTPTNnetOTTbpnCs3TIAvW2Vs7LAEzFYm80rW8StMRFYXm1Nq35lJXtJ18HoeR3+J1usACYVtaq164J03w59snF2aFwAATNdefXn6M7RICYnK06RUE2iLRSYb5TzRaZrzaL62lKIkAA3xtya5XteYEkAaVmFc7WlAAE1mLVkhYi0REzBpVjMbUjPSwAFq2pOabSEkCq1lZiYmpIFomk1lIAAAFoUjRlEJw1aTFpiZi0CAAABaumnLXC3K16+unLhr0d3JEvNwn0vM6549HpVxs1AExNYibC1q41tpk79KeTadotbOa6RIExNonG2WsTWbAmE2rlFrjfKvNrPTkwnTHbPasgCUwqaGRaGmHM6OnG9N+G+uvPhG+u+FaacM368I9Hq5PnHb3QkCa3ytjouAAAAJi9Ks7xeYvEC0K1mNIwpvtfDXO8xFqPO6sOumonKY1gCSC8RA5+3g3x1pltrWyQBMIkAIm81zmZmFZgmaosms1tpNeZbSTo4uvzuzyuieoAQtWdCkpxvXSqE1idWcr5zGkVmAEm2c43yztpeAEptnfm2zsteKzCQms26Odx9HPtzej5/dxduU2gAABpRnZnedKxEzMQAJhEgAJiImSSJIABfO2WuVouABIEIlKITE6XrhWbgACRERMgAAAClNb357Rppjrxacu95mLJm2W3ny6dcdIAASnq83q8/u4qq3169ceXeOSY7sMc/Wyp5/Tp5vTauu+tc9arRWYmsRNkwiVq7Xx4p0157tYRE1uJENLVqjCumswJLZzTSAA0pOV6a1tEUw12tFbRAJrK1YSF6W6+S/gdzq59l8unDz9rzhv0xF8sunrw8XLu64m4AtCiML16K3AAAAvSxhpW+cqLReJz1ziefov6HFlzdeU2trWezk7Pn+7zvSreYnbLbj25do0EkGUdF8qa07/AD+nytZvGdFtdb00rBNq6525pm8wpO8057WEiSCImZVjZnzTrErjr5ezyN/M7L7gE1nVCJwtE3pbn2iKJUuWjbO23PphvWmtVVrxEpmM6ibACubeZzszmcdNJZ60XiL0vw9FfT4ejzejy+i3SJiZAABaF6RjpN4ikzIBJAAJWrMIiyISAAJTSFpgAEkAAmSa0iZTMAAAAAAAAFqTnpW9WlbTXHHTTO8aVtJ6HFTzMujyPUgAezXO2e2mFM5wtvFI7KX8e0+jth287xJ6PR356468/XhfmpvjeeLtdtY0zym14QJrazCttbVjO03rrx657RNY06MuZeYTEWreNKyUZK7WAEwiQGlKwnn03iabUpes0tmm6L0r0cuuXbx82uufXy7/AD/p07s9Nca0xno0w5OnW8WAkhJF6ppXLW0gABMLmVoiJsAJEResdfPlzzrWdOHprz69Xo4V6MePh6M9nRpTTGcLWuKtZzjaOKZ6tueZjzLW9XyOrzvRy6+S1plEWtesSJrLr555d8ZXlIAhJffnyy2wi3QBet8Ofp8nvvu5uusaxfGdClLWMd6ZdGW0sIYUvfWlt8c6WrlrtWbWhWbUnOV70Z6RMSBrhal7Z25NY3vRneePbal8+rOOrn04OmumM4dHN0Z6SWgAAAL1mlqWi1JhKYkSQAWi9GNptCQAAJTFKryAThN94zABMkKkgASmEAtWa2gAAABbC0b4mtUyraCKVtcDbKO/z6gDyvVvNVqdEx563bE8dLpdFOTe/TyXWvn08O3n7ugSdXJjhvfHW9oEVaXjKJsBeq1NDimOmJy59tdIQWhNGOrSJmK1mQJTCpIAHRjWlsstN5iazWUotrjMue9NOLW8Tv2cvl5dW+Wul4WhSktazEgSCEkIhMgms2g0rSVazYAAACU1rWbT38e3Pfi5da92WvLa+deik1ztfg79OrLSGHZXz7R1cz1NcPA6Nd9KW56o3a5aZacu0aVret8tqaY3pKdKRnewAGmemN8LrJQkCY17eDTafI4te7i0vS/S2is83Xzzjfj1bp3iee0Zy1haUwgASTCspIJIBFZ0RS1bRa9aTE9PPfk208vsvDbopydWNuXXivO+tYJmJAAAFV5mkwiYmJAAExMKpkAAAC0RWZAims1Z7c2kaATE1mJABKYQBKb57c2vFrGwAAAmNM6Y30tWsxOF52AAAAAlMRG2dsNFsk34Yv2Tl3YvH016yNaXwnKb2mAEl89PO6Y2y6NK+be24AlMReLYWi8wIrMgDSk4XWVtGuFs9okgAAAACYRK0RasRSLXtWNrcvFh3bXWRETaYsrGWtLRNoCSF5iycoETW1r1ia5TKlrgAAAASlWsWmYnfC2U8+M9vDs6rYb1jfGvVwV5Ojt5Ozxed7nVzcnblzeZ09PTslPThr5PXh6PPbkvpaOXZrW1Zi8wzvS0WtE52i0CazOmdq25pXibAC3N0zp5ujTWicqzW+9OSk4r9uG1+TovMWMU2hoBJAABJBMK2mYgKlkkAktWOzmrvjTm10xvitHH0dEWiVr1raLAAADSrOZraskxIEpqiVkQmhYASQAUbXxty9HD0168qOmmd4x5uiLxtC1oiCJrZNYsmsgABNotScU6TEAAAWy7vK6+Lqx35duXRXty1tEAAAAATSeaeyb8nTXGsjVy6z08ybwWi1VKTa6ABpTTXPko15uil41BaJraLK5xaSRaJpNZSALZaZ65Xx0Z059p02resgAAADSm2F+S07403nOeXo19Dm8i22sxellqzna9LRtSKs1kxYmE2iklZmQmpKhYAAAAAmJWhSFpiUsoprtS0ejw8/l7dHP1PQzyHXys8Mk8+PodkRfq4beL6fP357bY9EV8vLo13yY69GMRtNZTNaVtJItVS62etXPawvE2iakwm2XXwacu9ts6xTXPvxvGdYvxaTvJrnNJvhpyymWhYATE1smIAkgmESCNM2WkzKYQBIB38VObatL6kQphrKWlbgAAAXrOdoEgAtEwtnOV1gABJAHHvXr5b0rnn173587Jjo5Nc+rMnKbaFUImbVUumAABfOZhas1pabKXrnrWxOdr1m3Zx9cx4/i93Z6GPJtSmO214uAAAABNejXHh2w6PL6NuDtz1r29vH5uvRIFomEQVtFokQuZ3hrnbnvGWjaqYEGsOaZ1gAmESAJU1X5ZjWJprnpz2yvbSJTCszKJiASCIa8WmvXnyzTW/NGzzcOzuAA3ytlaKXoppnrneNLUraaVm4BJa1c87xaLAAAAkShCURNlYreJib49XPry9WdcNKd3N6fi9Xk9k7WiwiJmYCEy34p4O7Ptw1yiue9NF5rMVrGkzCJAAXptlblvG1b5zFpWqgka4235uPDevTS1qTybzlO2t2d4mJk2x3w28yJ3NQABes53rMSJIAgletqRSui0SABJatsNKdOU2pXWkcfRTWmnNtXSugAAAA1pNZmlqgFiklq2zvSYsASRKYREbUz577Wzw16XLTXXK+u+PPelcN9JTC8TnMTIIrM2gASlFtKZxE46V6aMpjO9bOmYpMRLO9bUU9Lg5+S3TzurzuzOnVvdl3Z0tCESmYuAKznvzd/D0+D0x39GN3Mw06fG7/G9anaCazaItrGGFr6xAvSaXzlcXrEVc+1tawKZ7zry2i4AEiFLWROueFNNJICZipaaqGuW3Nfkb6a1nmt38mvN34U3yy6sceaO+kzydfk9kdtZSACTbKefSmuenDtPXXmTtAAJLVUm5nja+0VAABMqkwADSl+bXLWttstK5c3P19Exfbm12y+c5u72BMaRHOtoLVVkkxhtOtL89s7LzW6eObbiAADSl+fXLTO6yEXiayJLVcydZJgLRrOVOfox1prM1ROmfVz6+Td1FgJTCBKYTS0XrAAtE1msxeIzWsAABaJiJx0rvQic5rtCFKWuSAAJTVEkxfm0rE59OdyURMxCZiImRS171iFUzMEXrzZ7Xxmvpefv5HbPQjorHLF9dKbY6cl41tS8WzqrM3ibTSctK3ibRU05NLdWWWkZ6VViIsiReJC0QRWbXpXLS8kxG2GevOpa/H1zx7dWk59FMyoAtE9HP1cHR5XQ69M9s8denDzvH776663LZ33jm3y04rpmJ0mYQmUAC8L5OLZuV5bW6qgAASlWJUi10TE1LTECJAm0VJnNS8d/DbLXzct+7LS4Hped1fKety9yO3C2d62iQBJajOzbDLDp3hKazCSYgtSL6xyxbXfG/BtVe29KAkSiAAAE6Urm0hlVr105b12zjlw6esCtJteAABrlPJvGsNc6VtpNZzvjLSQQACS9JyvBasxeLFbQyXm2MxaJi0SEa705cJteb52i0TbK1NsTQAAAXrNZrW0zCSEkStBjEborKQAAa0nCa2tM06eWnNp0U3pasyAAAJhEyWvTCk1i+0xMqwmUwiUoXpPJtN1b1pK16Xiees6b8npcHT850X9OaxKkTrSdonhvGyNYnntF8r9NY5+mmV8Org6KzfPpz6dMfMrrrS+sxaK2ppheLymazlet4ATE0mItF6yAJOzkyztHPPVlbMAabK59NNuDWu2lNuZarDr43N34dFOrG3NediNs55mmXRz7U3vTCLXAAGuccum+/PxV6NwAJi9LZ2reWUTcCQiFoRISQJBSb3rnEyABMa+v49vife5vWpfoorNsrt6UA0pas5Z16I1iYymqwmc56LZ82lsqW2Ew1ooc2mmd46K1tFSQAATMVTKITbbGvH0NayACVarSAJiazEmuc821dKzaJhVKEgkEAEzEmavX5O8+hXC0Kp2yxjS0ESIinflPldE72hWV63wvnvlfLXO0WAAAAvVSylpvWLQrKYiq+2OWW95hEgABJrlbl3z7OfpjPDze3m66dIAAAELUtoUhEK3i14zLCkdeGvF153qXhelcpVtW0aLRaNs55XL6GfV5e7oRETN62pN8dObamlqRW9sp6+nDhpfBbqwnTuw5cM9sOim95hIk3yvx7c+kaiSastJvWAL1mTO0AAAQtKAAR1cPd5Xb4XXPfpXXXn6fB14+/PXj7N93DrTPaLJtWejo5MsduO9t8rzaJAAA3wtydGWkWLJhAmYjC+u1MUyACZRCJhE2IAErxTGb3gABLJq30wv856eHVnT0s66YTzWsvTLTrrfm7cOjK/MkRatE2QmvOt0RNgJL1i9ZqpDXj2y2jSQTEAEggSEqznalpmYAkraFZkACYRKYRXXHbC9dbxQASIiJkCSa6VnPXC/Zy+fxdXRa986Xy2xvbSYmllJv2cOnL1+Tee8TCUwramuOvPeNAATAmJgBaExGd0xMkF6xWZiYlJEJAAFomktaa82vLtlrTStokAAAXrNF87TpWqa5XpWdbxN+e2tuC9Onj6abUulNayUXhWbTOdq6Z58HXbv87R01RJaJ6MbeV1U6Kr10za9GfmxfpzmkzfXPPDXbOPQifC3jrAFomkRNgElqxSZhNbzesQmJi0CASC0xkABE205+zn38rSem9bd3H3effxumnF6PH6vyvsRtr0Vtlphv05cjWK20kmrOywAANc9+TXi0b3iEIkJL5RhtbOdNYzkmIBYqRKYACZraLYlwAJi1Ib5R3cm/F1eHFPZ8Xtb1t01pld6fPhnScdPRx38nopeJiLaVja0ZzMAAASTDfOtaX4euutVomJlESSTEVmQBes5zFZm+V6qJi2gAABEpiYnbNhplYrOgAAAAtEkFaymLWibVztjpzdOG0b420ObasY3vaLC0WytXai1dOXbn1roAJgQImQBMTE1LSiATExMAAAEkDbK2OkROUY9efRx7V1AAABPVzaUtlnpOd1q8+kaVmIlE6XpbK+dl4VmJiYvW0TlE6YRrvj0dPN4Xn+l2bV1hEgvWZwinRnamtpwztrEzETMwr1ZRn3ZV87o8voegACaVte1AABML1jO83yvlfOt9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7clr58vmd+vn9XJ7nPbWoi9bZ2zlYACUwqTKUN8efHXaLISBJAAITKLRBNornZMWTCLzFE1rNwL0nHSNIiEgAAAAAACUohIgmC+ds9FbV1zmkqXTDWm2N+O8a6U05d8enDTWkXplw9FNJ3AEN6Tz3i8sywBJYylYTECYtRTejm2Wi5ABM1lOUTcDXPfz9sOurfKvLPVaOC2ukLirW+WXH0deji3pak62ppW3n3bjbLq4NvO6a9O+eWlI5dWWu2lYhWUgAEkCU1BIACALRExOGd51XzrM69eHk8+/VnpsAAAAJia2rMSAJjTO1MJv1VzABMxESAAAtntauN505tOaabaKTGnn9EU0t3Y09Lz+rw/Q8rup1Mezj14NNLaxYAAvXPLPXpvGGkTWK759Hnb8/Tl089fF9GfSwh2cteGNMfSp0RIAAFoQVtMxExbTLPC2vNfeb07OCeTrz6efVtl28fmeDv7caV3jl6tkgAAAAEwiQAAAAmESEpKkwCYtWc5WAAtWK2kAAAAAAACSCQATntz7Y9Gc5zetsdcr563RFbUtF5RamdTaNee1LLTaswCNTLWuFLa4X6aS2pz2JiU1hYASlGlXNM61LKymASlFImwEmuXVV5OOnZKejLPOl8umtlhjTvw6OH0+Pnx225NOu2eXXllnvNogXp25T41564kJibxSk2LUtFoASElYSSAiwATUEAb83bybeJtbvtGNLawAAAAASQAkis20qtx65W4sOvp3i3Dpv2Z8U2velK1s0rMSlWbE1lrlWt9qzNq48179HPXW3JtnpDLh6Or0OW1L+dWvo7158615Neqt89Fk2qpes2z3z6PM0x9CtnJ1Z9OU2inTj0+bry9NK4dO21Y059eLqw9Hhjl6Zm10xaIAAFoisyqmyYjfDG1NcbV6vOjg9D15n5ab9/p8u3Pfya6+lyzrTebEpqESSQAEkAAAAAACSAAlEJAACSqZQACSAAAAJTVEgABPRhpybY5aT1ZSUrOmuWnLvnMYax0I5rV6+XXTi106cuD0sduHXBfqvGeudZnHC3XrllrXGyMddYmxAAAmL5XXrSY0pbmvGoFZteKwAAtail88512jOE746eNvpe02pv6fneROu+G2d7W6MsJppzbTNdfP69N4Thtpp5iegASTCJmIml63qAlbK0XiqL3jMkADk0nqogA24+nj7PO3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0Z3qWBMogAA0ztlGV9JheWdZves3x03rz81see/TM9U58zTnve6dJi1KxGlbRIEphUmJuigkBIREq2iKWuAAAAAAAAC+Np3zxi1hJasWiM7Tetc73AvWKW0xi1r52rNlCRaqJis2iYtAAACSAAWpbPStoTFmOnS4tuevl9XZjtTuplna+uHTy9HB0U6M5jN06c+ULaUyvbkz6uqEgAAC0ImCbViGuOmelJiYlErQgAATCJK3lhFtBpSd8a+freuzophaNKWvz313pzSsSRSdkVRFZv28vHecs73x26ETtnmnNFuTTv59ef0uevLrGkTeqloJExerK6ca6dVeatr0ve9a0tMJAkAgAAlJWEiSAa5OfVcAAmGlL52zxt09GXn100TtXlW6ohXSlsYrOszAC0RpS/DvToppjDacyQATMViZtEClpmAktRleZLGabqyQAAAASIRKU7Y0iGW1Zpqx3jXymvaiImbRaaW5d8Nq3mAmETItFCazMTKNEY2rZaIkAAACSKzNogAAADSnRnXzZ06okABaIiZFq35rxMt89bU5K2tW1InWyYQJiZhS1RKQAAAAJTNIqtTO6MOjRlo1z2mODO3Zk03jlraEbK2ly016AAASCACZVLQgE3rEK1tMwiZlMKkgAmJi0TFJXzLAWiezn6PC7cF7a03vhTqr5tNesiGkTTbPOJvTPe9vMpp2AAtMUiZmL9GXOaeb0uvK2N11ZiZiaplQvEGNadM2rat40rUStChMpgiSEoJIBJAEggJvnfn2y1rJMSJtnHLp2b14+rLHn2odE499Y8a2/VBMTesY2mbVmJAtF5zijWmvmaOyCUwEWretsDQTExNSQBplpz64Xz6cZ0xvl1WwvWwAAAAFaza0Zxtrg4eu+udezHz669NZWicr2padqVitc9K61kksVlBMEpiLy5k6QkAAACqppMVtCl4tEgAAmUTUmKymLVtEwAAkJvSJiObWd86prW2hEJApN71mqlbV0iRIIJICSAJC9Zz1pW9GdpiNmeVLwuvE0vNopE3kgAAAkEAJrC0wTKITKIL1nO1JWAAAExphZS19I5ta2AEp3x01w4cples335dpL2RWmi+Et85tbLnnUXiLWiglETImJKXib005NuTpz6Mr1ibXppWMa26LRx2m+2U5005pW1reytl4mFZSTVWwgWiazFompIrM2iAAWtGV6XxvFiQiJtvzWrnPj+h1004ezPfTka9GAExNomkxS2d4uATemetdOa9KaX0rBAlaIqmQBMIkAEb1jitbo3w5bRpxbX0tIBJAAJILUmZrXfLXk0y6uDO3Vjjv0gSa5znMUu0zvGXVn1cSL2jKZtAJBarK9LRcAAAATFdK2xulEwraZgAJBBMIkJBAAAJi1qzz6tK4Ut05W0sxtEWhel+fXPrxiKqVTrmnQAACSCa2x0m0RrWtZIJqWmJvGdZmJ0mucSibkAAAAAAmURWFptE1hF6TFi0KSkSmEAACK9N8/P3TnOnLvbWoEyiYmFImwJznazkmOqsZZW3tntaPL1tNba3rEopawAEhKI0ppx647xYSDnjq6Y85OtZsJN8aKzy72Wi0CREV0z0pfNa0xbO1bwEgtRjovCU1RaCUEkAFq6Uy5tNdfR8/Lg0Zz6/mdfielbpBJNq6535KtNYQTGkOeWkS0pFYnPVaAmu+VuTRoABJBEyib50rovVWYibWqrZMTWk2bclsNdI1qL8+ltqZ2z0vlllGuG3o4x896N+vOy0AAN8rc+mctppemnPpFKzoAJTMWqtWcK200rUAAACUwi1Wd14Kq2iUgCEygCSCUwgAASWqvSKWmazFr8u2F4vJas0jWmvPtS2ubC02tEwAAAEp0plVelplCbQqSAJgWic5i0SAAAEphBMStEQKFwtFqWzmLTARISmFSQATahbKJ0F864aX0QICb0vjfK9bXpoy5892sTei2eOlO7ye7zO2nZS0otnM8+1rxGtKyi0QALVvz26dM+KlurG2DLp748am3bCQAWqa1Qz59NNq1kAgAvmz1i1b1tSYmS1a1tekzetImQJIAJi1cM56LaU0xlfh6OPs4o6J6azeuiMN89OK9btV8dImEkASWqVml4SYd1NvGvPWAAJIi5lKSYkCyM02BN61vWlI1yvXp5vS5L+Brp2xeqbyep5k/Lepbqvn242xvF4AC0L0iksr8V3XDStpvWoARa0Ypvpnpxzz66aSkAAAVWspes0tFotSYkAFJ0lnaAEggAAAExM1tS0b5a8m+EzW0WHRz68PXybU0vFrVnCWkwAAATMREgAAAXUjO+eq0AkgAAAFF7TjaLQkTCJAIJTAilptCSAEgthbToy5F9IAJqiwFikxMqxNhAAJWvlXOcmmoF613yoW5dV62y0sKW1rGt6Y9NPPy17LZ3vHF05b+X100a2gSQJiJRE2mGlKYaXLFJSAIb8+mPRnYylYAXrFLTJAAAJjXKOfS17xfOm+cef6nH63hel8/wB1PTpGV72HTjXKOji6+Ppz2iJmYAAkorW07cSvXIABMStWxim4BELSrVaUEyiASVmdKKzSJsAC3r+P0/Fe/wAnrY16K6ZaNKxMQBpW9Y5qXms9MI1plWbUu0rbFtpHLeZhMw1o5dM4b0u2rEqgC2czOdbXEphFomk1lIJ0pnWbVtIABJUkkgAE3rW0NKU0ow0nj36qWx6sL525+XfftxpaF6OTWdogACUxFUyAAM22lM4mlkTNs5smtoAAAAEkaUrS9oAJIALRNUSImYrS8XrphpN610rNYrMx0Z05tSdAJiycoXF6Xy0xvF4AAAAJqiwAAWhWZtFKT0TFNKUpNYtlMd8T5qeu9Z5rN4okTSbSrMABaLVmsxVNoAC96Z6VplpMTaEgAmCUACSAbc/X5unldmnVaL9nL3/P6+R6Wfp+f1cE667UpvWllidMe7C3jzpveIibgAC0L56Y25pvoSAJTVExKakiUwgEzWsWkSQCU1rNrZwsABFN9q8/Zw9Xx3t4+ni9DLKsaZVnPaY000jDWkGlZpEoReK6Umkb604KadFbSBMTMJRWs8+1d6yAFL1vnK0hAJmIrKUggSCExMTCYtWaStSZTF6wBMTExJMLVVIrrZhEWsw05ejh7aWtOqdaV59JskAQlKYgCJtSZ0rTXLPPXSASdGHR5vTw9NdSQAJTEQSmpIAAAEkEJlAAlKt6X57RoJAhEgImZrEWmYiUkQAAASmECObWvVz3i4AAQTpaqWNoyhrW0Xrvz3xq03zuivF0YdlNUL1Z3yNABMTDSIxppN4mYgISvS2NouJIAJSiqZgAlMIFo0rz4um1onu4+/yt+fow+e9Hl9n5/wBR02Ya00r12ynoz8ym/STMM7TaIAAAzi97UtUTEwCLZ7Z6c1mgAAIJEkABrMc0ToAALZyX7uTXk381Xr+d77enjOelu3Lm7MJ5Znn32u6dY8yysTNHRNa2nGttQABaForrmpFvK6OEAdM9utbSggsRMTnZpVS1rxjC4AmBETKJiUlorCqbolE1tnKwEwvEdXJbh7Oe0XrKV7Jmrk002jO1dOfWm1YLK2tGKZiZkExFq1zvcAAaVcjo5N962rtTn66UmFlQJhEgAABKakokmIrMgCY1tHNWZibgCRCk2S0rnE2QiQAAAAAG+GnFvz7NAACZTSZ2zxTSs6wmVb1Fb06OHbPqzVjmjXpgkiL1tnaJJIJ0zvy6xpGdis689r9GeNq2y0aRlKwAAAAEpqSKd+bxtb9VJtph6uvL8dj3+vE29rxej5/0eTzu/t9bz/N130zvoAL1Z2SAAmJtbOueiQmYiVSdaTjFZtaKpIVi682hEEgALWrnFrQAAYV9CseT0306eP1uXq+WjL3fUw8zzune9a8ropo6b11x7tMejzfR8y9aQ0tVM46VsAAAANKRrSoApN+XS9rZRF7oBaYrne2uedbWAABIAJpKWdosBJAABrnNWUWRN4mYmZhvjTDSYm2lK8+19IpesVmwAAAAAGc9PVxef01ppWeTZjr1Vyty9teqkBBIAAASTERMwAAC9bUtmSSAAL1mtYiOvj6OHspeUQkAAASlDKzSIERZaswABMLaV56zomYAALQ3ycts7aXhIFoIVkmIXlFq560nHTOs32pffKnFvGme+Vue19CQJIBMKzatbTamdra5pxjn007cu/xuzwPVz7sK9vVxeFHd01teC0L0z6vNv5Xr12i4AAmFLTaIAmLVmt61V359Md6otJUsLQgTEJF6ac+uZpMZ6QAJmKpmAADGnd2cfP5npebtPf08HRn1cHTjGWsWjS+W/HMRpalLL9Otue0+fS3XpStnIaROoAJIAkgAAEm+M8mqLTLPSL1TMRpGedrIvjdtWoBJJBEJk0pTK4tKSABJAJi9WdiJmREq349r61w7MbZTnrnpy9ON4umZgAAAAIWwr09PNwupE3AEnRzV4N9bWaMyQCSAAAITKAC1JaVpMK2mJTAACYkp0c3p8XR89o9BYAAAABfFh0W0rXXOMtILAmJXrExSlrgAAAStauNLaAAAC0QWztFoWiRWYmEotC1GG1ZjQQSiSBGksFdJiuvLpz2zo00rTorbmnTzu2fX5/Lz6u2AADu49vJ6OHo06AABJNHPrpZFHRtlvFvP1pBnFlbXmKxNgBJBWbTWycdaVvVSdOa86WiYnlvt1UwAABfp5eW2Xq+H6nn9/H35z5PUvGlqzZE6V6Ip53Xn2eb05d+Gmduvyuvl68b8vRh0Z5aV6CAAaYXrvSoAAAAmGlIgw1jSLWrNZzidjK0W2zcW0xadqVlKIlELRMVWlnaLRMEgAAC1dK25jVBNorK1OjDDPXStrwWrrSedNrV3w0wvF7RSUgCUwhC1NlfOrr1pAAAdGWnNOWWlovfemYBBYgSQBEpgCk9GleFOwRaJzLAAktFKaxSt7VmZIAAAABMNM559qXi0phEpRURMyQAAAE1m6MrrFYSAAAL12yvyWjUACYmJgmFq2resXhRCZJrE0dGufDE6pTWaotEpr0c2eN2HZbWLAACsdN6efGm4AABbXHOV6Rz+d0c06b9uXSNM4y0WhEyAATetITWwkWhalubSLR061w8Xrv25x1UplXatLKZ30y2vn2+f38XZ8/avs46edvHTE5y2ROdr2pXl069o83bPtrbjratLbVKW5OjP0+TXHqpMENKU6tM/OW15973yrtnzzW+d8ABXo69K0vEaZuW+9p59KolJEyBpSsxGel4JQJiZisxWlrJsiEzAAAAr1Ya8O1NLQStWtHRFuSWoJtW8Tzs9JkmsEXmJtMQSRC5nE6aUzQraE2AABMxW8RMRejj6NL1WVhJJAAlMxSs2ExrFOZpoBMKykACFo2ztyXjas1tCJmSCRExNSRE2RExCUpRWJkSmEAATFqWraAAExtmyvORpKYQCYlMQCazbXO3PbDSZlIAEwItCYjDTS8VhaVL10yiu8cuWnSCSBWbZztrTn6+WPO66dDSIsInOVhfKtNbAAAC9bUisXrpVvjStb8t7WnWszntxbRuBJASQJBAJiZVmm+FrxavVz83DPTybY+1nhetInTijp13z0y6OCKdlsZtyp6YmwmJ2zyvVtjvwa55dFda6Qy2ooxrTbG3X0U5/E7de3Lm7c7bZ5Y7a2aWrxVm+enSQABVjam9LJl04YY7bRMzCsgABIBEWiayTExNSQAAAJTtzac3Tw3dEJmES0pSl7wEkTEprSLzOjleZ3aaTXv5sLJrbLKO7SPPvbatTS1o54nUAAAAEwlG+duK0dNq4XWrBZMTloq01zpnpG1FTSlea+k3rrWBJACZhWVotVjZZKEkkASmECSaxEomRaFZgkmJTEAASmaacu9NaxaJhbG2m2fPtXLO+oJlEAtERMwTC0UrN0WpelokAAADfHXh6ObpzvW0l7YZZbaLxeqE8um/RjhrFNa5Y661a6c8c3VntWZiImYacOnb14eVpfQAAACYtWaSmUzFY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KqK6UVzrTpvE3rMXrAAiNbxyJ10x14enLorIAJmKxMgCSCU2pXG+1q5WzqtTemunP5/H395IrF7TmSABpjPL0xvRtlStoq3x0wvGgkgAEwJqqnSFLxaJiYUXThK8StAWrrvlzefuXttSbRN8r57cxsAJIANKzjetokSQkgktlFdUJAAAb5Txa12Sr0ccY9emelVJsAAAJIJi22U8u3LduRMRE2JKkloi/NrHRSkxWU3rrpTmvWKzbHQjTO8DO3VEU2zppHm0v7Gmfm2aq05ujaxMSQBaIgTNqxMMdExaUAAZztS1N80WymLASTERNoQBKYQBOW+W3FpG2lNuWJ3rz2wc3dnrTpRzzfSTp5449bU2z1prEUmZAAkIpOmnJhXq0AALRNZrezGJvBIIJKplBMqwmUkVmdM6UvYADSmvV51/lfZ5fZylN6y1rBAGuds7YUjqromM71pW14tWY3pWN45K22kmG2UculsdL3VvC8UJgAAEwF60ra+2Fsdsq2uACb50ppYATE1tFqtM5w2ztF7RYzrIsBEzMQATaqsxaL+frftpSJiFr5ZRpKUIlKnRjPLvM60TClr43prlNNIlIAAAGlZwvFkzETCJTAm+GVOjSAAACYXpOG1evm6K5YeX6PP3ZdAAAABNZsL1jO1YnS0LRmIb82vLtR05WhN615Nb2ZzGlkRIC0RWbTFaT06V50IZVva9OituKZ6b0ces9NKJkUm8qTAAWi1JpaIibABGmtMJUyvdN4AATBKAAANeLt8/u8brjs0ptbLXxbcfo5b83be80iObqraUwvrzbcu/nbT0RNC4AAmJvlfLXmmdQATas5XrepIAEyiCaxFrEACVq1ra0QkAE1pb0Oa/Denh+hr6WPP35RlF8k02VvrvTn2z6cp514paZiNa1mt1Yswz03AlMxM1TFML6Z3x2i6JEoAELSoTMImZreLUIAJExESAEkQSmLYW0tOF4tMQABaIrMgSWrplbLfm67YebzdenQ04tNdY5rW0FZRKeb0s+j53aPQAtFqKzGtL894uACRExMBJeqkq2iYmYRK1CVbRKYAAANKzjau1Ojn05NM710XiYAAAL1tja2lamcTbO0TGV29KdGscemdphl0RCbRFq1yvpFYm8gCVoZnReuSMbINs7V0rpy6Z2rppS5Xl3w6qaoXrXK9ZXAFotnKaVjRaAJmK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1ivPTWbRYAkgAACSAlF6xja0kkzEJiEzFqzW0UlaszNOqebm21ry7cO1eul79OFvM6Y6ITC0LZW5tq6V2rnz92Th1mdlgkAAACSAAAASCYUm2dp1rS0KzJW0BWZFomkxIBJBJMNaTy6TtlRNMNrWjWktKwZiVgAAAJIAETFkxM0tS+UmtJyteJwNrIKlrRWs2mITWFgAATMQTEoTE52iwmF4pna4AGtJrWq+UTpWbCTTFlpFL675Y4azZbSlYmtZuAAASQACZ5tdKYTMc1onXRnrl08+8WlaIhMAAEymFRMCa2WiIABMXq5+inRybY756ZTS02AAhO/N6mevkZ83Fr1dlJ0IJ0jKltIlJetenmr38PNSNPm/attl232xtAAAEzW8s4VTExalq9HLfj7I1rMxea4VvoCYRrS+N8LNBIBAAACapvFSNefTk6stYtIBBJataWsSM+Tbt04s79eN/Lme8WjSmdK60usBekaVrnN+W2s0jbXCF7JzTdUAAAtE1mAAAAAtC9K53tEr1ilpAAFotnatoAATCUWqzvErWrUm9YyspN5lKAAAAABKZipLO14nHXks3J1pbmvW0yUlYlF4nC0TDTG87VoACYSmsxZFLRbO9JWJmIAAAERa00rM2qLZWnC+t4z7cMsZ0vSuO1LTNokAAASQAQmmXdafGtp1AC0L87l6JppTekSuACSspgAFomk1lIFZvMV0rWJmImLQjXO+GlbAC1Y35ehXzefs1i2wAEmbfitt304L1rLoyw359uL06dvmdPldVeoACJ0VrZjeLlYWhEWWrZmx3mGm+F/K6sfQpFqxKImbQrIAAAADON9Y5FtYVlN+fTn6efSNAACaNM8pvnrpfxZ279stebXhs6RMOnnjk0pOugmLK1pdFbdVOfTLTjvOXTbasaUpne4AAF6znesxIAAAAAAExETIAEk1nK8XgAAJiImQAC165xNqyAAAAAAAFqq2qWEw0pNZjC9dF71nO1Spa8Nsp8/paQ0rBMwIFZsRMUsmkpRKYSAAJWmmUXvEEzlPRpXk7OauGmddd5RWbqFqROuN2taImUACYmtomJmEc99LcWe/SAABvldG/m9VOqmEwBMxWJkkgAF4ZSsDWHPeLVlKbVnK03rvx78PVnrMCYTak1V0jmpp0kAmJmq16V1pjrjly9fSBtlVzraxhtXO+14iU1Sh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"
+        },
+        {
+            "uri" : "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wgARCAgACAADAREAAhEBAxEB/8QAGwAAAgMBAQEAAAAAAAAAAAAAAQIAAwQFBgf/xAAbAQACAwEBAQAAAAAAAAAAAAAAAQIDBAUGB//aAAwDAQACEAMQAAAB4fy77VtozZbdFNlkApvFMFE7bIrZRR6jk8TyPa9ErmUBysgiNJTKauXawc5JT5eveJSMSNhsxCIogMkQA42oEbKKORDVTRluvgX112QhXOVFlpRG4AGUr4VK3VKwNxJlF0qpz2UZ6LLabLIhhBAlIpAIECARFKBAgQIOBG4lBhjIRt0gKDIAIECBBBuAyi0Ywdc5vGFc56aqaJ2pKUB1HTTRVOxkroVVSs2UZedr2782TFfp9DzePA831OzbCvPZbG4JoxgvT8nh9bHg8X3fSY79EFAZR9357ynH29HzvT69crBI10Zvp/kvDeQ7fo/PdPsRECDIypWRemqnHfp6WXFxt3T01UI3bGOyjNyNnQDZABAjUS100VykRZ7bYkGlYyjBIwNQiGgEIhoAsnFXZGFc7Si6FaOyEoSg2UrYXwfbwczLdoy232Rh0suIBwuj1SiA8YpJxtooNgIEBWylrqoVuqU65zA2FEEABFBwOhmx87TsIQNlGWiy3VTTi0aba6+1h5rKPm+p2oAbthXbCvXTRiv0VWWQIEABAA1bgQIECBlu4m2jNkt0U2WkCh4ph0TtsitlFHqOTxPI9r0SuZQHO2EYNJTKaufbwc2uU+Xr6AkzEjYGUEClAZBEBxsDgMoo5ENVNGW6+BfXXZCFc5UWWlEbgAZSvhUrdUrA3EmUXSqnPZRnostpssiGEECUikAgQIBEUoECBAg4EGQABjIRt0gKDIAIECAQVkBlFoxg65zeMK5z01U0TtSUoDqOmmiqdjJXQqqlZtoy83Xt35smK/T6Hm8eB5vqdm2Feey6MiTKJD03J4XWx4PF930mO/RBQGUfd+e8px9vR870+vXKxZGyjN9P8l4bzPW7njO76RRwZCDZSZWK5MoxBAivrqosuAnikkyMqLqICuU9tGXNbdRZYyjAhGEWUUbVpWRxUUcSopJBoCJWCDqd9cKZ3FShKEg5vGV0NJSvrp7GLnvGDqOK/Ty9e9G9NdSN1ynVOwMKCEAAAWUmUbYQ20Zsd+imdkCAUQLIxRtWyF9dTqOa26yEFlKBbCvTVT18XOw36uZr3UWWxgCyEVk9dGcNq3AgQIFNllcpAcCBAgQMl/D2582S/RVO2IYbxiU6Z3WRWyij1HJ4nke16MEiNXK2ESSRzg1cu3g5qSnytfQDbIAw5FIgUiMpEQHGwOAyijkQ1U0Zbr4F9ddkIVzlRZcUo3AAylfCpW6pWBuJMoulVOeyjPRZbTZZEMIIEpFIBAgQCIpQIECBBwcAgADGQjbpAUGQAQIEAgrIDKLRjB1zm8YVznpqponakpQHUdNNFU7GSuhVVKzbRm5uvZvzZMV+n0PN48DzfU7NsK89l0ZEmUSHpuTwutjweL7vpMd+mCgmUfd+e8px9vR870+vXKxZLZRn+n+S8N5nrdvx3c9GjkG4BTKnYrIhW4EAiaKjFbKIyJX113102RhkuvrnOuUlbZRDUEBQVkKkkU2SKiHFXEOMK6pEdSvKCGmqfQzQx37EldFKOwqTxs01X7KM10K9NVGmqmiy3hdDq1ynBaaqc9t0HAVsAUiAAgyjXKbJdnDzeJv6bCUZSIMkGQatwRSg4BAM0VUq5Vylsoz7KcySny9W4NwFbDCjr4udytnQgQIBFXJgcCBAgQIGPRwdufLku01Ttg2TsiinTO6yK2UUeo5PE8j2fRhyIwTsjEjR2QA5drBzklPla94cmRAVyKRBkQCkRAlGAcBlFXKI1VUZbr4F9ddkIVznRZcVGNwAMpXwqVuqVgbiTKLpVTnsoz0WW02WRDCCBKRSAQIECAyUFAgyAGQAEAAYyEbdICgyACBAgEFZAeKZRAVzm8YVznpqponakpQHUdNNFU7GSuhVVKzbRm5uvbvzY8V+n0PN48DzfU7NsK89l0ZEnUYHpuTw+tj5/jO76TFfpgQiyXu/PeU4+3oed6fYrlNZLXRn+oeS8N5jrdvx3c9E8YVzmrkU2U7I3Mo1ykQgRECBAjIgpMo3wqonaSNFlrKKseMAwCDUI1yYaigkkSsOKSgpXVOAMtc+Yypvr29THKuenJdshcymHY0btFenZRn1059lGbgdLrxG/PkxaNLRTKOey4NwAxXJ4xIAIECBGdnBzePt6IbgEIESWUikQggOAQABkB4pJSgoPTTRuoy8vXurlMpQGF2cPN4PR60CBEmSgoECBAgQIGHT53bnzZbtNM7imydkRk6Z32RWyin1HI4nku16NXIjhOyMSmjnBrKXbwc2uVnL171bZEGrZQROgAyUADjAOA0UsnEaqqMt18C+uuyEK5zosuKjG4AGUr4VK3VKwNxJlF0q5Wa6c9FllM7YDJQFbZIMgQAEbKRSI4EAAQAEAAYyEbdICgyACBAgEFZAeKZRgVzm0Y1ylprponakpQHUdNNFU7GSuhVVKzbRm5uvb0MuPDo0+h5vHgeb6nathXnstjChlGC9NyeH1sfP8Z3fS4rtEYRGMfd+f8pyNvQ850+xXKayWunP9Q8l4Xy/W7fj+36JlXZGGiqnnatzRstjoeMUlIBAgRgQwQK5SZRKCLo5cWDTqpnYVGCgnVasViSEaJAEVlFXWjgkqlefPbk20auhl9LASWTFf4QnYK1LLS8bCrLI36qdVsIWwrSUqLLoHRzYr66uTs6AbRyIAAwoIAAwogQIF0K9lGbmatpCAQKjAAw3GBEYrk8YhkGrcAiaKgr66766edq2lKyMNdNDxhz9OyBARshBQIECBAgQObr8vtz581umqd7KTKVkGylVO+yK2UU+p5HF8j2vRgkRhzshEjRzgw5drBzUlZytm8DYAAJECJkgNkolGwMMgNFLKURqqoy3Xweiul4QrnOiy4qMbgAZSvhUrlVKYbKGSdRqlPXTnpssonbAZKArbJRkAArkQZRgFECAAIACAAMZCNukBQZABAgQCCsgPFMowK5zeMapT01U0WWrJgHUdNNFU7GSuhVVKzbRm5uvb0MuPDo1eh5nHgeb6vZthCiy0ARMowPT8nh9XHz/ABnd9Jju0wUEUvd+e8pyNvQ871OvVKayWunN9P8AJeF8v1u147uehZVPGr2/A8v4/t+lxaOlfVqgRuArCggAIQAAYBwWqqjLbdGFRggJlHTVmx33pJAQcA4I4JKCSqqlUksma3B0svR6WX1IHXLHy9nztH2nW66F5V7xsuho01bmUSkkpXV12Rh18XO6+Ln8jb0eH0OpRZYBslAKREHIAyQBlF1FXLo5sfL1bo2AuhWG0cg2ADEcnjGMgMiAGAbRjrpz3Qr6GbHRZdiv057bvVcfg6qqOTs383Vtgc3XtQZCCgQIECBAgcbd4zdRnz2bElpeNrxnbGTRnVO+2L2UU+p5HF8j2fRhyKlHKyEYNJTI1JdrDzUlPla+gGylBq2QKTJQZIlAbABuA0UspFLTVRluvg9FdNkIVTspstiUCDjCi6upW652K2UmSdRqlPXTnpssonbAZKArbJRgBXKA0YlkCAUQABAAQABjIRt0gKDIAIECAQVkB4plGBXObxjVKemqmmy1JMDeMdVVFM7GUbq66pz20Zubq29DNjw6NXoeZx4HnOp2rY157LYEB4xgem5XD62Pn+L7npMl+kCIFR9357ynI29DznU69UpLI105fp3kvCeX6/Z8b3O/Cgmf2/n/ACXC6PW52rv9jDfVKzk7ehAgEIECAjZSjAMkdVNGW654wgkkwFsaioUzkyrz2yVxDgrrpnFXQrzUWZqbOf0svX6mP1Cykjxcfd86h1rIbLI6YabI23V6tVW+A0Y1zkUX11ex4nnLIw3Z8vkO16LjbujXKdkYlRjZSVuBBq3AthDZTmrlNG6rLd2fLiv057LWSgBkBHKyMYECBAgEADxhG9lGZ4xz2W66aN1GXjbelVOfSy4uzh5vj+56NBkIKBAgQIECBwOl8tZXWQ6Ae+yOm2Fumpwtqnptg7q16Lm8rla+ljv1lMOVsIkK5WQYH08uK+uvj7ukoyKDVspETIAQHUVbKFbgMkrYZoqpqnare7PlrnOqVkFXOyCA4BCyFYbqnZAKTqJSrlO2MEbrlMgUoCtskGK5QGjEhAjIEAoAEABABGFCNslAIQAECAAYFZAZIpAaybJI5aK6apWJOURZGFkY1TnAvrqUfTy4uPt6N0K6pz9LyuLy9m7n6NbIqnOBBX1102Weh5nH9PyeH4rvel52rbrpz5bbklL2HD85i0aeTt3YNGi6unp5ef3+bxOXr0+R7XZrnmthyfScvyPk+xfor91pq9F1MmHRVVxt3RRyjCiBADIBRGgDKKOTqDxr105kb6mTnhoOPmer1wRVwWVYIJKpXnpsqpnlqng6mPr9jF6aqc4YeRs+bZL+7dXqZa2Wi2Fl0NeqnowICSlZGFsIWRhsozer4/B8p2O9g0a6bLLIQeMWEUgNJyy23so3Qr35snM17wF9dTqKOTqOS7QUoCycQyUAhAAQIGiulopJStjC+unNZdVOyqdkBW2S6+Ln97ncnynZ72O7TZGECCgQIECBA4HS+TZ7Olor3eh5mX1PI5vhPQ+z73Pw8rX1s1ut4yZTZS3586uzNboBLbRRmt0JKTIg7oVwZSostA4BEBhuyMYACyMKp2MogZApBuBEr66rIw01U8rZvgMo2RjVOYbiCEC6urJdothXbGECiy0pECopKQbaKgQCCSYGyiUQIECMAQGQADGQAgEAwDgmRAZRRygBgHqqourryX6K5TKQYBkTJaKqqbLL66kby3aHjEgAeMejmxZbb8t2jXTn358nJ2dC6Fea26DAWwrqnZGr6quxi53Xxc/y/W7nP06tVVBUXjHFo0pI6OXDqpy4dF2W6wOrNbGLB0svD831bocXpZPW9DP6amdl1dfqOTw/Ldfu1TnAgQANkoIMeMQCyYBWlk2jCEd+fH6zjeb4u/oea6vXRxV1sUWQzVTo5+l1yyrLn9nB1Ojm9YyVM8nP0/MeXr9DbHYVqsje8btFerXR0ilGREYrZRbGHpOVxc1t2O/RXKzXTmg0lLNbdXKea26qdlkYdTJh5+nZXKcSsjBJSvrqeMaLLap2QIAZAKIBAAGFJ4xdR01U9HLj5O3oUTtDatkAEC6FbKNsK7YQ6uPASMCBAgQIED5x6jwNU+jfXt6mNev4vJ35o31z+den9wktDKULGUip6aq+llyUWaM9l9Fl0baJAeMa52aaqQOiy2AGAZEUECldCrLbeRMkrbJQcAB0c2IEudq1wAOBZGAcoACAQshWrlorprnOmdlcplJkoAbgoOCKCChGFAYBslAgBjIAQIBABAgQIyIII3ZGCuRABAgMo7KM+HRqII2QgoMpWwr3UZuZq2q2yRCJXwqz2XaaqOrjw9fHzilxd/T427pVylbCDKOa24o1U59+fKRcfb0QyDgiK+qnJddGrq6LI1315mVGDRasqefpjbDlcvXXDi9LL6np5PUaaqdVOe2EPQ83j+W6/eurqjOJv6kEyUB4wsjDJdeyjBKwCJFWroUZ7J3Qo6+LlPGnTVk4XR3crXotjj52l0zyk53XxdfXR7CNq8NFnyrib/S2w1k1XV26K5aqdbx7FsYVSnbCFcpBt0rIV311Y79IburqrnPbnzPGEbZRxX6qp2aKqFcqbLVb6OXHRZbnstIaqaNFdGK/TTZbBgFbYSjZKAkpPGMBW9FdLJFLPbcBq2yUBlF1GuVgAMDcCBAgQIECBwuh8hV792e/o5Zel5eDn6er2sGPx3b9TTZrBaSx4sqUc2T01V31wzW31ysVyKGADgaKqUlOuU4ECBAgaaqA3VKwNq2yRSZRKVVlnQzZKLLctt4CMg7IwAK5QIBABrpz57LVcg2rcBkmUa5TZIMKIBAMA4AAiA2SIACACAQgAIEAMgFBFqpoy3Xq2UBkCAyWyjNVOyidobgQA2Ur4Vb82TJdoZRKKbLXjAN2Rhju0hvvc7kUWXdLLi890uwyjmtvVtJSKWyjMQrlOiyyArcERaqaM1tiSdsKWVeqnLZHNydmvZTz+Jvn0M3F8707LI8To5fUdDN6yuc76qdtGfRXTkuvz23fQvM+Q8p2e/xtvSvhVoqozW37s+TPbbz9OuCAoK6FFNk7YU5LbI4K4em5XA831OrmtSupXnpsqonmDwdPJ2uhm9ZAV4kl8m890/U316bYaHjffXO+vZdDsWQgsmyQHAgaaqcl18B0r66ctt/RzY+llxK5YNGq6FfM17rYQostgAPXcXz0Zxd3T5evdAgMlZGFM7IEAgAgEADxhZGNkYJKVcptGLCostDZQ0YpJhhQkpQAECBAgQIECBxd/wAgqn0Q+ldXo6GZ+h5mDn6upZCeLRvhajuJMqZGykpPTVVpqqx36g5QZQGK5sovGMGrcCAQVmiqqmy0ARFCtkADJXQqrlOuU4ECAQ0VUVTsqnODeMVbZK6FWa25kq5TZIpQCIpK5QIEYUAIAYB311b8+RkmSVvLbfXOdM7A3ZCFFlobZRIAAPZTnonaspAGUSgiDcSsjEisjDLberlAjL6qmSKjRbdfXVpqorlPDfqvhVuz5edp2QO9z+VyNvQ9NyeJzNe7jbujVO1QDZEB66c+a26BAWTgilAhHTVnxX3baMm7PhvrzcnZpZZufphjvpvr43K2ZOhm9VvzesrlO2MGS258uO/T2sPM975zyfy/1vuuxi5tM7M1t2K/TbGvq48HO068GnSrGUb66IRyXWo0HCOvTVkyXSqnFHVVOmuVFU81U8XVx9noZvWQFeK2HyHyvY9fpqvshpsV+ml3Q3aauqBq2yUCBdCuuU0lINtGPd5/K5OzoVTs35sfVyYeXr3Y79DxjpqpxX6ap2d3n8rRXVRZb2cHNw6NWHRqSUlbwaNdNloZEQCCN3QruhXmtuVsogPGNsYZbboBForqqlNXINVyhAgMiyMoECBAgQIHB6PyKifTJ0NFejbne/PHBo6XtuB5/gdLu4r9qyvBbCRJFSKZJFGiupkUWXPFUWWkIDRTxjXOcFAKIDJBsqKSkyUHAAEL66aLLVbKIABkg3AgoMhBaaaM9t1c5xEBkgwoKUCuc2UQMigK5MolEDTVTtoy8nZ0LIw7eDmUzs5evcspK30smLrY+f5nq9tJTDCiyMClXOyBAurqVuBAuhXnsu20Zs1twbrlMMKXSy48OjV2MXO4XQ6rxg8Y0WWhkAhEQPT8nh5rrylrpz+d6XYz23QAyB0M2PZRmrlZmtupssqlOqc4wBZGsqFU3pqzdfFy3VGO6fnOp0NdHL5O19HN5/l68eyj1nQzerDbRRDfmyc/Tr7nP5fd5/K8X3vS9jDzuF0Oqyjrpz1TnXKXpOXxPM9btVSldCqiybxqqkw4q4Bw35sHL2Xq4JKquVNU6Kp5q5Y+ti6/Qz+tiEliy3fK+Nu9HfXpsjoshfbGzTTs1U9WNqxop1FoxIU2WgIED03K4mqmjj7uhiv1aqqLYV5LtGS7QQaMd+fJXKd0K6LLbq6sWjU8Yso1TsqlOmdhCBAIaKqellw4NGvJfoA4ECBZGDJbKM2K/TZGGa2+BGAZSZK2NasgQIECBAgYNHxiG3Lb2CbLYX9TJVfXPfnrtrlwOl2qp6a5XEsKZJlOEgMjthF4xrnYUK5BhRADIMpECovGKSkrlAIQAAYUWRg8Y0W2gCiAyispREANlJ1GJK5JKQbaMSBAARFKqdjJACKIWUmUWRA0VU78+TkbOhGWQg6jApnbXKTJXQq9Vx+D5zqdrnadlka9FdWey6BAINGBC+uroZsea2/Bp1wEcmUdFdWiqlJS0V1c3TstjCqdlkIVTmUmSz22wCi2ML66q5SVvRVT2sPN4e/qY79MFfXVtozczXuKV0KtlGbLdffXVmttSUuvi5uS67n6dPpeVwt2fDzdWjg9HoczXbdXzsWjPTPDto86H7XoZfWQIFsK+nlxcXd0vacLzXI29DPZcRczVtYV1dWmqjVVRVOfUx8/zHW7WmrPTOWS+5SIcQ4WRpV15bmCuuVKSqpnRXPNXLF1sXZ6Gb1kCuWNl8i4+70dU+i8dFkb3jdor2dDL0a5zKIG2jK8Vg06oOAA6WXF0suLma91E7Kp2X11X11XRrUYbqnZ0suLJdoRy5WzesmUigMZKAUq5TIFKBuz5Vbx36NVVOa24DZRKCLRXTiv0wChWyEEBslfXVRZZBhkCBAgQIGDR8XZbNtF/WxRyX9PLb0O3gxbKI+h5vO8N6D1uS7bRZorleSRUiMplODDlZGIJECkkpQZSgEAEB4wIVTmUEFbKQZBlJlHVVTju0K2RX11311Yr9MCBAZRgK5EQHAgoMMKAzZRnx36GRAAEFYUBhRdCvTVRg0ayK2EKZ2QICSkyTJKFsYWRhfXUjlku0LKUSLIi6Fe7Pk62PB5rqdqqdhBQYAAZbCHWx8/Ffp0VVc3VsDYbg7IwthXRO1ZS01UFKBltvjOrjwe14PmfF930qSk0Y8rbvA4EBWwxlEpK36nkcDFovrkej5fFhVwej0ufpt427XZHm2R5nF3vsYfKMvZX1ezgdTJhvhV6Pl8bj7ej6/i+e8X3fS6aqOdq2QOTs6DKN9dPYxc3j7ehtoy9jDzPG9z0XQzYubq11yQcQ4XQzZbZ1ygkq651qZ0lRVPMksXUydroZfWFJ1zuNu+baqdRNma3ow1XQnoq278/Tz2Wsk8Ya6aLIwVy5evcyVka+1h5vL17wFFlobshDfnydTJh5urZy9e/rY+fXKdU7M9lpSrnOiy2ArkyRSgMopKUBoqxQurrqnOuU9NVOe25RhuB0M2TDo1FJJSVuAyRFBhkRAgRkCBAgQOD0PkNNnSvq19nFV7Xg8TbnL4TR6NVS8n2PSczX0sl2yizQrsJIqTIIwSZBRZGCSsKSuSSkyRSZJW4F9dVU7A2AgBhCIgQCDRikpBlsIbs+XbRm4HR60CBAsjAN1yk8Yq5QCEBW1bsjDpZMXP07FlKAAgK3AImREo2rOhmyZLtFcphhAAUQIFkYUzsIrYQvrqzW3aaqYFFltsIdDNjqnZzNe1RiTKRQGQZSvrqSUoAGRMkjkRJKcSjChlFktFdNsK9NNNU58vZueMSlTZa0YrJgYbVhSIlZ6/iec6uTn2wo4HR6lcjzHX6yONc6FePJdn6Obz/M1ZOhm9Ttz+v9VyOD6jkcLLdf4zu+luhX0MuP0XM4/zD1vuIHc5/L5OzfXKemugqJFktu7eDlc3XswaNGunLjutSQrgypzWsOsOquVSumuVFU89csHUydvo5fWX11Vzx+a6vz4HS0VX66p7s4Ver6jx7ZABAsjCuc/oHmvI9LLi5Wzerlwej1dVNF0K8l2jm6tmqqmC9PyeJ5frdzj7ej6jk8LzPV7mqqjHfpVkADgERQQgFJG1lLRVSyQbALKTKNbnGwADbRmqnZVOdcpskQAMohtHKBAgQUZAgQIHC6HyFH0A+lfXftol6Lmc/wBbxeNTZros2I7uVs6nP07+fp3VyusiFShJkBspkIPZRnz23I5pKUE8VGPCDpK2kpgCCsAyJkq5TKXUyYdFVPJ29DZRnthWree27Fo1W11xhSKSuVcpXwrrlJXIhAgKx4x100VylTO1ZNRwA2G4DqOiqnq48BD13F894P0Pq8OjTXOZSgQCiBsozZL9AGRQcCJJKVsYNGNsIVzlVOwDDbJQAAZAKFbDbJFK+uqyMK5TVuqdkCBAIFL1HJ4XmOr3NdObHfpA/Qc7kcLodWuUr66njCqyyqUwyBA6OXB9h8R838j2+/57pdXDo0cPobkcEnTVLLnsyMuVmu5v0vyi9z5/fwuh1PMdbuY79PP0665T100aqs/L17miiLTVQ8Y1yaTnW3XOQa9XxvP+b6nYy3W315s9s0cXVNFgrrR1pKlJVUzpqnmBg6eXt9HL6zXTnyXUec6nz1H0t1FmqmxZat2aJOkV3YAYrldCpXL6R5bxjxg6Xh/Qeo5erc6jpqo6+LnVTtw36e5g5nYw83HfppnYyj47uejZKiy4BAgBkGAdK+unVTRXKVNluqmjTVTx9vRWUgGmqlW6LLVbgbaM1kYYr9SycQyiG4AGAIQIEAMgQIEDhdD5DVPoQ6NkNV8Lbq7dVT7GHKys6eTNnt1Z7NXJ29OqdzKRUgSg45PFQcCyMdFVOW3QG4EAN2wr0V01ynnsugQFbIikQVyeMPT8nieb6nZthDXTmyX6YlrqopnZXKeS/Q0VAgg5RK2MKbLCgBAKWmunXRn3UZcl15DFdpw6dQHoqpuhXbCG7Pk9Xx+Duz5fN9Xtcfb0OTs6FU7FbgMlAIbc+XHfpDAOAQiQbgQIDxispQIEAAGFEBlFJSKFbgOo2Qhvz5CjlbN6SlAZRthDpZcV1dea6/JbfntuImjG6Feey1hWQhvz5MGjXRZYGRLu8/kBnv8Aznj+Zq2eM7voeF0N6uFc6KpZq54tFfF10ef9z5/X6Tl975X6/wB4kpgAwDdLTVRRZajkyjbCtlEieMMd+hGVTnZGrsYeXxd/RhC+vPXNK45bRXXVOKupXnrnTRZQVzunk7fo+Z38V+rFfT57p/O2XQ01Xb8xnt37s8bYb3j3CABJSuhWUvpnlPElL5n6v2xCBAVyVkBXKARb82W2NeujPzdW3pZcXA6XXABspQAwovrqvhVdXXRZZVOwDVvpZcXK2dAN66M1U7M1tzJWwgsnZCFNlgHAgESjjCgMgQIEABAgQOF0fkVUugToWx1WQ0bKFTZsZW9THn1UwWV9U74p5L9bKQJQk6ASKCEGQ000311YNOwAGWwgAWU766aLLQOAGwDJMlBdDNkVySUmjHFo1Mo6Kqc117xjRZYyNNNCSlXKaSkQ2UZcV+ogAgPGOqrPdXX08uHNbfRZayWK/Srd0IaKqMd+mAUst1/Zw83s4edTOzBp1479HN1bShJNXLfmyZL9Lxhpqpz2W1Tm8VbGsDgVzmAVygQCEBG4x4qCgwEZEMkAtjDRVSreW6+uU3UddGe+urBp1pKSOTCKUC6uqiy0NgGUdlGaBjv066ctM50WT9BzeN6nkef8d3PQcHo9BHFlkZYObrhfXycN/O20eq6Gb1rJMkADANkoF0K6p2AUCyMA3bCqmc65SDStaas+/Piw33khjvnfXn20YOD0Ogkq1dKSprlRTPOksXo+Xv10+wzW31Tx+f6XzuHRuho0VW6qpQ03Q331dggADIHRy4+zh5vI29Hl690B0gBBWPGPbwcyiy3n6ddFl3QzY/Rczj+b6nZ9BzeT5Ls+ggBuCA2S01UJKdFljJFK2FauVc52whZCuDdR7nP5fE39LJdpDEciKDIgOAAgEFbZKBAgQIEZAgcLofIaZ9GHQshqtjeyv6+LNh0dF42aqYXwKJ6bIvPboaMoSjkUMmHJkigDuhD0nL4vm+p2aLLXiikkpEQCDeMLoQSTVyDZS35siSni0afQc3kcrXvw6NW/PkyXaEcroV02WgNdOemdkCmyy+uq2EFbWUqpWaqc+qqjBo10WWQeunPku0BhQUg2rbxiQsjCmdgbKUCBuz5L4V2wry234r9O+jLzNW22EOzh5vRy48WjTy9e+iy2qU3Ub66lbzW3K5ERQQVgbeMYMAQAEIDxgUg3ZGG/NkzXXlLJdovrqxX6SKBBlR0V1Mo3V1wXN1bQ2VG+FdUpdHNi5evZBdDNh62Pm8bdvosWDRaTO8cCSwVy5/L14+hm9T0cvrA28YhsAUiEB4xSUiAE8YxrZRmy2202WASSCRvrz5rbIQpmK4dfFyiU8vXopnXVOquVMMeivlbKO/ZH2sCuWPg9H50r6VkdNsL9+daqZX17Wj3M9txEUXV1baM1U7MOjVBQcFZGNsK1crIwy3XgYbVtlHRVV08uHn6Ndc50ztVuyMbIwZRz2XI5OowAwogBkHtoy6qaOVs39HLj6uPB5vq9pG4NlFXKAQABkAhEQIECBAgQIyBwuh8gpn0odGyOm2Gh43aajbRHFo39nBi6uPL5nrd8EyTKmU4SI2QGyhkAd9dW7PlxX6s9trpI5QGUVbIWQhtoza6c/P066LLgCSkQRy9Jy+L53p9iDARvTVRoqp52raA2U5sV+l4x7WDm49GnBo1dbFg6ObFxt3S0V1cnZvrlN4xZR7GLncXd04BC2FaSkjkQAQLoVVTtgAIEZAgW119jFzsl2jm6tvTy4c1t6OXTy4c9l0C6FdU7AGe24Dz22gcAhAAEQGGFBSDcBW4DJMldCoDqnPVTRjv0wAyAB6K6SFE7AGiurRXTg0allJox7vP5OHRq52nUGtlGN4183XqKo6mTm8Tfqosoz24yuZjv5vTyen6WX1YGRQatvGJCBdXVTZYBhjxh1MmHFfo01Z+dq1qyuTJDTTnyX2wgklXKKOuyNFU4K6bYY81tYeTuc/znP0+z2UewgVTycDpfOUfTuhpsjfoqs6GaHreNish2vLdfvJKUC+uroZsnL2btFVN9dWS7QG3jFW8t17xikpOogagwoHXxc/j7eiyRSgOowK5TgBlkIJKcYUAElJ4xZLfnyYr9PXxc6DyXX4NOx4wKVU7A3AeMUk4BQQgQIECBAgAUFxOh8hz2dNX0bI6r67rI3MrullpzWbNtFe7PTTZo52noEkVNk4ODKcGyLoV6qaLYQtjDLbekp4r9MC2FfRzY81t+S7Q8YMlrpzvGOLRpZLLbfZGFcp+u43nvJ9j0CtwFb01U9nDzeJv6dU7NFdNcp9fFzsl2nFo03V16K6efp2d3n8rl69uS7RBlIhsozZLrw5KyBoqqrnMDWTiLYQSTDYHAgEAEE8Y6aqabLYFcpEClqpoz22wdkYPGOW6+uU3jAOQCAGK5WRgBwCksnBlJJSKTJQOrjwVWWI3nsutjC6FeG/TAKElIMKUAMZLbnzdvBy+nlwo35/pdbidDpq46ac+e2dcksoPGjRVhpsy8rWrY8jBow9HL6fpZfWQIwpPGMBXJlG2FauVFlkGGujlxso5Lrst1xSSSJHRVmx33QirrVwDgjrSVV0MiSptrx5bqaLMnZw9eyPtgFc8fn+l87R9K6Gm2F9kbroWdfFP2PDp8p2O/mtuga6aMt16tq28UG4IDgBjIVuCgI5WRikpd3n8porkbehVOwiurrpstAEQGGAbJEAAZAA9tGaBTOzRXUApstpnZAIlcgDxiGyKIdRA4ECBAgQIEDgdL5DRZ01fRur02RvdX2RtthPoZqgWOp9DNRxt3VhNoyg45lDJq5MiyMe7zuU6jltvZLNbfnttZGmmjnatnQzZMGnWVEDIkctlGfNdfVOemqlkvWcbz/h+/6hlEDrnN4x62Pn66M/n+l191GXZRn5urbXKdc5wGUd2fL3Ofy/Mdbt0ztgQIBS0V05rb4ECAGNFWxgrYb1056J21TsVuAyUC+umiy3pZcTxjzdW3TVSG8OjTrozrKSt7KM/P066p2QGSZIBAjIi+uquUiCSkrlBMhG4DJdjFzubq2d7ncrjbulku0BjJbs+Xn6dkEBslBBkQQWT9BzOOyXO1a+jlxcDpdWqbaMK5iOIdYKknVbXz2XMy3Y+bqxdDN6npZfVlDxhrpzskkp1ylZGBQsnku0AIHQzY+tj53n+l1s9lgYBBxdVVyYIK4pKCSgjgsqoU9LLys1lfG33I8PouZ0Orj9TmtvyX0ee6XztX0b4abIaLI3WRu6GW/wBHzLa5S427psohuuUiiBAVsigMgBAVuARK5PGMC+uoM9Fy+PorppstyXaObq2Y79MHAViuTxjASUmUYEDbRnyXaAECyMHjGqc4BSdJlGqditgcCBZGBSgQIECBAged6nySmfSB0Lo6bIaLYWsriXaqY7KIVT0em5PI8t2PQ1yteLZSgymRq5MiyMepjw9bHz81t8DlbN9M7FcqLLYDxjfXVXOaSlAAPGNU7LoV9TJgurrpss5WveGwNJSgWRh08mLkbehspz5LtECBZCuqdnc5/L2U5ttGbx/b9FVKyAGyk8Y7qMvN1bQEBkoAbAEUC2ENVNGe24AG7oV1ymrdU5lGunPmtvDHjGuU7YwUA28Y1zmjlAZKAsm8VAgFLZRmyXaEkwOMKAwD6eXDvz5bq6+Nu6NUrMejS0YwLIwVsNlAYUoAYUdDNj01U8rZuvrp2UZg1x93QRqEQ4o61dVc6qLM9FmTq4/O1T5G7P6vfm9dRZZdCvVTRZGFU51ysthWRQMGjVRZdZGu6urqZMHB6PUpnYrUaVl9eembVpXCuUUnGqUGVCum2OQrJzNTSWLrY+z1MfqUlOqeTz/S+c1y6l8NFtd7q943aK9u/N1LI13V10WW1ymGyBUQNhVykUQFbIoBStjFW0ciF9dOey6BA1VUX11a6M/D6HUIQFZAKFbIoCuRS358mW7QjlAZReMSEForqVvTVTg0a6Z2BuyMGjGBBwIECBAgQPOdT5JVPow6FsNNkdG2hUWbWjbZGWmo6ObPqpr4XQ7JJFSZSgynBkbIurqz2XWxhorq2UZstujJfoRygK2yjZGIbAwyI1059dOf1PI4Xlex3ubq2hvo5cVFluS7QHKB0smGuc65Ty3aFZAKLIwSUujlx9zBy8tt/E6HTzWXwIyIZLpZcXL17gwhEK3AgMlGRBAAQAQCkkpQIF0KylVOwMgEGjEDDatslAVsiA2SgEILTVSjlnstWUoDKIHrpz3114NGpkrIwIs9l0ABprpRyDdcphhSSUg3qpo6eTDbGvDfp2U5uXr29vBy+B0epjvuaNcILKtXXVOnPbnpnm73O8rwOjDTV63p5PV9DPk0VU66aNlGa2Fd0K8d+iiy5G+F0OrTZZBALY166M3P064RDSNaqs+a2aSijVc0HUCpXWkqb68eHQUzzpLF0cvc6uP1MCuWPgdL5yH0rYarIX2RvdW6Ktu7P1NFdUS1VU87TsSUnUYESSU4EBZSKUCJMKDthXTOyM10Z8l2iBA0V057LtNVPWx8/matuO/SkpAbxhGFAYBkW/Ply23pKRQUgzTVS6jEs9tyOdkYVzmAeMa5zaKWTgQIECBAgcPf8gps6QOhZHVdC7rY6K5a8d266FnRy5t2erbRV5zqdxXaSUUoMjZAcrIReKqnZBso9nDzufp15Lr0lN4xgQAGmummdsDfnyUzsA74VK3RZbVOz1vF89w+h1Ofp2VymUuhnyc7TsZRVySUikRPGOqmjZTnostpnYUst2hWw3BFGiunPZcrbJQK5SZJkiCsKIEYUKEB0klJkgDKOmqnHfpgFIMeMQ2BpKTKJQGREYyABEQRtorVVRku0QIEBkg2BOlfXVdXVz9OyBA1U58t2jRXSB57bYIDId7ncmyMOPt6PteD5imyzynY7xI1SlntnTNhxRwV1JKqmzLTPJ6jk+R8/wBGt17Ldn9aUQICtso9vBzN2fNXOeS6/ma92ey0pBkFbCqmc4x419PJzuRt3VTA4ghXKNckTOrgrpuhjxXma2lZYepj7PTyergVyx+f6fzqHRur02Rvtheyuuhu10da6FfRzY8V+nXTn5+nYo4BBJMogQA2kpMomKIXQqpnaRPGNU5lFkYbs+Xm6ttkYbs+Xo5sfB6PVonaG2jFZSeMYCtslvz5MV+lXKBAgBkCAUOowKpTDbxiGNGJRAgQIECBA4nQ+P0WdNZdGyGrZRLXSB6ullo5urpaKjXTDFftdOmd8JwmUQk6CGiqpJTonbfXWsndXXAz23qwogQGUbYQrlPVVRZGHN07GDRVRmtugwzt4OYB7KMySnjv0crZvA3UUcoAY8Y7KM+W6+uU4AC2MO/zuT5zp9kNgCLfny0zsrlO2FdU7KpzeKgK2GFEAgAVtkiECAAZJ4wpnYQIQK5SKRErk8YkFZBo3ZGLqKtgcCA6jqpoyXaAzZRnx3aCAYrdsIK5K2GPGOumjNbdAsjCqc6pTZL1/F890suHw/f9Rluvurq6GbHZGF0KeB0epqqy8/TpBBXBXXVOqueTZRxsV+bPbzN2f1W/N62AkpPGMBJSKRS1VU9TJg4u/po2GAIIM01UMoPGumydUjPbNXG+vPntaOAdaSrrlU8cmW6NUs9c8PVx9ro5fWK2Hh4PR+dK+jbDS60vG9426at2yjq2RgkpXV1hlkY57LgwDABuAyUCBADIEGVG2MUcg2AgFJZMoeMNFdWiumuU+fp1lEAMKAy+uu2Fee24AHIArcAiII5WwrgK5K2yUBWw3AgQIECBA5+n4vnt6iPpQ2aK7ezhzcnZ19VS73Nwq7bYvBo6FFmhJWpK0EmTKZDZRRXKyqdjqNsIZbdAY8URK5QAEB4xgOoK5JKSOVkYvGFc7AHQzY8GjXG9NVGiqnLbfmuuvrrSUkcmS6mTBTOzn6tgG8YWRgkp3V166c+K/SraSl0c2OuU8V+qCZKuUoMNlIgAgEFYQiCKDiSSlAsjFW2UYMiVtXJlGDAQIEANo5Oo2RgjkQAPGJErlsozZbr+vi5/K2b65TVtlF4xqnZAABvdRlx3aQwhEmUYH3DwHzDwHpPW+N7no1bAaK6c9ll0KiobaMnL1665iutXCqdNU8vRy8ThdBh8ffm9R0s3rCkBkIAAMUl2cXNzW3ZbtCNwFZGRKEdVWfu8/k+a6nYVoldFktFWXJdYsq0cElXDPRZFXmrnmpnk6uPtdDL6uMhg4HR+dVT6tsNNsdDxueN2ivbtz9XpZcWW29ZOmdu2jMG81t1cplKyMLIwgXV1WRjkuvqnbVObKLxXTy4c9luHRqgQLIRdRpnYG2UWS9jw/OcTf0+Jv6bJQIEDr4+fyde8N2wgGI5BtJSKTJQNFVNFlqthtkoAZAgQIECBAgcvX8bsjqzW9eGx46fQ8zn8vZ14X66a2VvTyZtdNdcruF0OxXO6KRGycDoZsuHRreKSU1bgI5WRjbCtXKMiIy+uq+uplHn6NaSm8Y1zkyAGqnPntvSUmSshW6jnsudR3ZsvP06+nlxc/TrDdbkQthWyVNlkGA3UZcN+qMAdjDzubq2pKXYxc7Lbflu0UzsZJJMoDCiBAjIghAggMiKUCyMAOucwOAGMiAAgQA2rbKLIAQIFkYK5Btox6uTBztOyBVOyCg9VOeiy6myxlHTTT3MHLxX6eLv6QbKRS9pwvNeg5vI+Y+s9xTZYjdkYK3BK0RWQpsjTTMV1uqq5UpLIDn8PoOHF7nP9Bso9hVOyAGAZEUK3dCtHL0HO5GDRr5mvYG4kRAiygGt+bFRZNZLFdbfDNXN5rFXOIKbI5s1qrlnV5Flh6GXvdnD6bLddDDx9vzTFo7V1emyOiyN1kbb692yjq9jFz6J2VTsrlPVVRVKaSlmtvgmQAjHjGuU6pzsjBXJktFVPd5/K4m/p6K6kcsOjVA0V057LlbIilpqq7WHmcnZ0MOjUAZIi35svO1ayiAGFDqKNwcB4xuhVntvRySTZIpQIECBAgQIEDBp+LK999eyuW91o7GHPg09MF2qkzXa7YPqZMuW3VRZozW6SpEcH08mOmy6qdlM7YOAyQB4xWUgOArbqOmqmBAz2WkFHGwECyMK5TDCiB0M2RZPDfqsjD0PN5GW2/h9DqQGS258pFsoz83Vsz236qc+iurm6toCB3efyst1/P0bCK+uqyEM9t1U7IJXKMiIEBlGDDbKLRircbthWkpNFXQrrlIN0ztVuBAgQCAAMKIECAQaMYCylBFJJSA4DJQCCNskrd8KvQczkdXHg01U8Ho9XrY+f6fk8N4x8N6D1HlOz6AAGPGFcpEUErXTyc/Bp06qcfRzc4qjh9Dd0svE4PRu5GypZcjtYPRdrB6XJdoostDbKLJFK2FdFl19dNM7fW8fz/ke16BG2UVYUiQKiGka105KLJVyi6qx3zhXuz87PZHnarKp01SzdDNxetj7Gir2Wa6+meTh9D5xns619ei2F9ivaNumrbvz9SArYbUbJQGUbYwiKZ2BuAG4IDgERRA0V00WW9LJi6GbJ57p9dZSaKgq5TAXRgreiqnt4OZ5/pdeuU1buhXZGGa26ABlIg8YOo0WWlDKNkY1TsAK2QAERRAgQIECBAwafi2qm/Bp7W3PPRVb08tXO1dVo2EtJbXLQCzRXFovnat4Jke/PmaKyX6oPXTQrlnsugK2rk6QCBAsjDZRnqnNW0lKqVgbgEUBWyiBAItlGbLdosjBWwPs4ebwuh1Q2Uvb8Dy/G3dLm6trqOiqlXK+urj7ujXKcD0XM4/B6PVpnY6iUoMqKuUZBgIECARQIOJMk6iG2jFW4DqNE7YyDKStq2yRCAAgQA3BFEBkgCTlqpoz2XK2UowogQCEAM7ODm9nDze9zuVtoy7aM2yjNzNW7wHpPWYdGrk7OhAuhVTOwMAiJWroUZ7JwjbDNVONU6urj4nA6VnP0Zw+R08vpulk9W6jdXVTZarYG6iyipJW9dWeA8Yc/TrIgICjUUYRSQrQcCqr68+2jBtowem5PnuH0NnP02c3VPBpj08nC9hxLqpe8jOLun47ueHV9IPdbC8rQ6u0VbddHWjZFEJKRSZJZMI3UZs1twbgK2BslVObJPGMC2Fdc5vGPpeVxeTt38zVuDN+fLz9GtJSaKtjApdLLiy3X0WWsloqpostostARtlEDIQAwAyV1ddNlsEBq3qqoKRCBAgQIECBw9/x+qfR2U6Abe3gzdXHTwej3njZnt2a6K+tjydXJk890u5nt0VSueJXO54xqnbZFK55rboOAUQA2UoEAM2UZ9VNGa27RXTku0Zrb4DKLJJKYAMgNFOovGIZB0WWFHUyYOzh53I29C2Fee25HLJdoqnZbCspK5dfHzoOiy3p5MPl+v3CggASTsigDqG7PmwaNStsiAyjdXUkp1TmkpkUQRAYYBkAN1GBARuA6UCuUmSZIBAgJKTxhAWU9FVCuVU5wZSVtkiACBGfTfJ+I1U50lLs4ed5vqdnu87leY6/c4+3oq5ec6nZsjWB02TgAUaeMEkoo6qsmW6ea0KzQwQw8rZXRZyunk9N08nqyK2ENVOfBp1tFWRhRZayVkYI3TZbuz5Mt17KKSagGg0VBWkkmVdUlZGiqYHT1sXKyXjRyZLlVPNqq5HTydzo5fVwfD6FnM1/MrI7udp7FkdFsLmV19e7VT1w2yUErlAKTpK3Bbs+aiy2idhCBGREAhqpz57bgOB6rj8Dj7uly9e4i3Z8uDRrSUik6iB9fFzmSgY79FcrM1t0AgAKUYBwAxXLRVSkp3100ztSUgzVVTltvgQIECBAgQOVs+NX16exhjTZ0XjpZX0WbWVtM9OS7d0cuf2vC870subyvX9DfXBlLn6due2/Lboz23hyKIOAUBhQGyosi6FXRzY6Z2QL66q5T5OzoQGUQ5QAEZEXQrurqw6NXSy4r4V8jZ0Azv83k+m5XE+fek9ckpwIAZBsowN+bJVOzPbdqpo0VU8/VronbAIoDIAaK6erjwYNGvRXTntuAwGe25XJW4EApOkkpAFbKTBAAEK5SA7IwgBspBhRAgBjxjBsopKVsIVTsAQAwoSUmSZIB7nz/AJbpZcXkuz6DXTRZGHZw8zr4ufnst6+Pn+N7npPIdr0OO/QAJGAGaac2S61JDxpqmr68vXxcbz/S0Vzxh8zl6snSzeo6WT1cDRVTfXVi0aUlIDZKyMGUc9lsC2ML66aJ2aqs9Fk89lqtQQcQ0ypz2SuhnosVU4+j5fA850+jTZDtYOH08vF4PRu7fP6vc5/pOD0etdDmYr/lnkuz7FjXbDRbC2+uemrZoq7MCBAgK3AdIMCLIx6GbHTZZju0htW2SvrqSUu1g5nG39JHK2EPT8rh8vVu42/pwNVOeiy2qcygMg2UQPpZcW/NkWUuPt6NFlqtkRRGREANlJ1GyEKLLSlGJKV1ddcpkIECBAgQIHD6Hx+qfR6OWzr4qwa8d/S2UK2MuPt7AdtkZe14HnbYHG39Wmd2e3SUw5aKq81t+a28ORAoA4BSYQGA0V09HLj3UZfMdbubKM9Up0WWq26UErlGFK+uq+qqqc8d+lkmUQ5b82SC9BzeRXKfku16BXJ4xZIpLKUS0V1BgHnstjeiqlJSrlNWw3vz5b66aZ2pKSOUDrY+fku0c7TsWTDcQyUC6FemqjDfqjcAAGRBAgAAEIEAiA4ECMKIk6ikplKA8YVTsgQA2jkyiyUD13G891ceCmdnE39PpZcfE39LJfo9RyOH53p9f1HJ4fP06+Pt6PN1bUk4IC1VZcV+glYIVyXpOXwOPu00zy87VCuXOpnytlPrOnk9XA105766udp11ymyVkYa6c/P0a4whBFReMa5O+umiydc5AjCKuMIOqaLGjgSnoZeb2cXGthj7WDh8Ho6vJdnobKPQdbH6jrY+fso5Hyz1/n81vXvrvthosjdZG30/Iza6etwOl1iiBAgQIAZAvrqg6Zz358obz2XMo6aqQ32ufzMOjVzde3Lbf1sfP8AX8TzvhPRery23wNdOfLdogAIDKPSy4vQc3k+n5PD4+7o83Vt4m/p8rZvVsothXZGGW68DsjHoZseDRrWTAyECyMK5TgQIECBAgQOD0fkFE+mH0LoaPQc3J2MOaizb53p94O6yM9uevt4Ofh0be1g5/L2dLnad9sI0WXq5QfSy49VNOHTrRyqnZ08mGBzNe6DVvTVR2cPNxX6eLv6bKOqmjPbeADZUSDxirauUAieMUlNlGBdXWkn3+dyt2fJ4vu+lA2S3UZc1l1c7IDxhfXVlu0I2AIdTJhx36apzAb8+XLboSTthDq48G2jNg06uRs6KycBHKARWRjW5aK6qLLYFsK6p2K3AZJkoINq3EBtkgwogQIDKKSkUOoqOAG4ECBAgEILp5MXr+J53j7ujspz83Ts8z1u3dCv0HN5Hmer2tufMyjluv6uPBfXSrfF39G2FPP06XVauJVIdVFkKpZllzsV+bRVwNFfrunk9XrpoostrlKyMa5SDdkIdDNk5WzfAjAJlEAGIwieNRIwjXIhXZGnHfYrq6uPlbKMTrNxt2orJso5Xmerr6uTtdvn+lWUsl2fyXZ8GH0rq9NsdFsLWjdor29PJ0aLLYCSkyiBht4xsjB4xz22q5MowChJSgPGOqqjp5MWO6/rY8Ge27Jdf6Dm8jz3T7HI2dCyMdtGbHfpAK3uoyvGPN1bfUcnh2wrx36ddGfzfU7PSy4s1t5EB5L9EADthXtoy87VtrlIoIALYV1TsgQIECBAgQOD0fkKS31y6dkdV0LvR8vn+24HA8h2/Ucjb2Hi+rjy8/T0Onkykllu04r9kJX1wKNtGe2EcWjTmtvZKJxlkIUWWwGS01UMoslnsuSUnjGmdkYjlAYRihJgcCC2UZ1bqnZ0M2PFfqeMbIw7/O5PB6PVw36ttGaBg06mSA4AZAKIzRTTspzdrDzefp2Zbb8l2iyNeumjqY8FU7PO9PsJKW7Pm5mvayjdXXXOYGyTKNsK81t90K766aZ21TnZCFNlgbIRCtskGylAjIggrHilbIMogA3roz479JCBAgQGUdFVPYxc7Bo1dnDzeD0etz9Ovs4ebztOyiy3bRmvrp5WzeRALq6tFeeqcsd90IwhCqiaSVVNmWqeMrk2R4m/N6ntYfTc/RrrnZAAXQqDdM7HjFXKCgQIJJOCgoIEWI2woyXWgixTTMRx7GLkb8/OwaJ6asLRx7KeV4nvdjTV6LbR6+yENVXJ8j2vCVy6lsNLx0aK7IaNNWzo5ekQpnYrZSjHjF4xWUq5SgAbpACEBW4IhuzZcOjVoqp9rwvM8Ho9bm6tmqmi6Fd9dWyjPzdWzn6dne5/K5Ozfytm++urt8/l+d6nZaK9BzuRxtvSuhUkp5L9FkK2SpnZtozZLtCt2RjXKathkRohVrozq3AgQIECBA8l2vlkNyPpE2WR0dvBl6OWri7ux6jk8mqejhdDtVTv9DzOZg07c1umKWiuvTVXoqqg+Zs357LiiDgQAyDKTKKuUAMKNFdLRjVO1ZNW4NoxWUkbDcQRMogd8K65SSUmRBbKM3puVxeD0OrztWyqc9FVXQzY+Zr3VymyQb000EV9dVsYUyng060cllKyMSkAgdrDzVb5evdZGFFlocmUVHG7q6nUctt3XxYORu6AQG3UQMMKAxkrIxonYyQCMKCAAiAwxoqMVtkr66s9lxCBAAQCLrYuffXUG+H0Ooo+5g5fE39MMKOrkwcvXuABgEGX10aKs+W63bRi5G3XXKKuimzLnsyw51U+Pvz+q6eT1bxgjksmyAEFdCtHNJS1VZ8tt8AMggKNAK5MquEY4ggHCuSV13QzWwy4NM7YY/Scrzfj+518V9PawdbbR65kr6uX57p/O8l3YJseOm2Fzq3TVt25+qQeMFbuhXZGGW29XKAGwBFEECECArIGmqnPZcQ10Zu7z+VztOzVVTxt3SzW3AO9z+V7Xg+Z20ZvB+i9XfXVVOyuU+B0esre2jN2MPN5WzerldCrFfposugaKqVk6p2wVsK6p2AcCBrpz1TnAgQIECBA890/klUugToa6bexho1Uvm6urmu29jDlz2a6bNHRy5sd+x4tXYSVM7lc2ApgcBkQYYUQIwpAZCCAykRXV10WWhuAyQbgAAyDKTKMHoqoyX6IEAgA7WDm+j5nG5Ozfku066c/A6PWpnZGaaaCFM7FcvR8zjed6fYpnYG3jGAUg2QshXdCu+uqyMMV+q+unn6dZHEtVVFcpso2wh0M2PHfpyXaGSy23EClGAcBlEDjAMiAyIDIgOBAIgOBuz5abLKZ2QIMpOodTJheMabLMV+rLbf08uHLbfntuAEWujORYr9CSlBFIlfSy4dVOXk7NmHTarqV1VyxZbqXjyc1vM35/U9HL6uDshCucoiAQvrqsjBXLqZOe8VxN/SpssgoKCALKIECIcQ4o43Qz5rX0svNJToqw0WQ87091FlEMHVx9nuYPSPGNUsfE6HzjFf2a5dBlpvrsthZfDfso6sQwtFVOe26uUiiBAgK2GyIxTBAgQURorqzW3QNFdLxjdXVqqo7/O5Xlut3edq2QHUfV8bgEXlOx30lLdny9PJi4PR6rKPpuTxPP9Lrxmay4hVObJPGIbRygXQrKUDZTn5+jUkpwIECBAgQIHD6HyCqfQh0LYaXWrVSw9F1cu3gx1T0ZrdbxdU76pXR2FMqUGspvFQCgORSg4EABprposuaMVbIBsARJKRSZESjcABAgWwr3UZdNNOO/Rg061GQIQWunPvzZMd+nFfpVyvrqVuuc+zh5vL174HQzY9VNHC6HVgoEbgK2BpKTxiQeMNlGbJdorlOAQZR1U0aaqMd+nNbcG9ufN1cmDn6deK/TB0zsDIBSdJHINvGIY8YwFcmUVbrlNkoAbeMSorKVsIUWWFEAM7nP5myjN3+dyePt6PM17boV+d6XYIoBFsozBvNZbTZaBEjdClGq5nQzYMOi7NY0lSksma3MHy6LOZ0M3qN+b1qtvGLqKOUBktNVKszW6HUK5T6WXDg0agyCJEAkgEQIlaNB178+HNa9VWMFNkcvnen0KZ01Tz1TydXH2Opk9V1sXPoszed6fzwnQzW9LTVar1K9Wmrbso6sC6Fd1dWa6+uU4ACAUiEBW4DxiwoiMrlO+ulXKuU2UfRczjwM9t2mqj3fnfK/K/Ye8w36oF0K0lMBZGFcp9HNjaMcd+nq48HL17s9t10KgOuc4iMKSuUCBuz5YGS/Q8YUzsIQIECBAgQOPt+O0z6NU+pZHVdC943FXktuhMqy2BCy2DSVoc2i2GBwbIKcbiCABXJkiKyEKp2FLXTnzW31TnbGDxjmtuKTJEAEYAKAzo5cdkYYNGuyMVbzXXtGMBWyK+uuqdgBlHp5MOK/VfCq+uq2Fe/PlzW3crXvz23I5RsAGQIEQQIWQruhXsozczXuIVym8YdvBzORs6Ga64ojIiC0V1aKqap2ZbrwMpBu2NauSOUC+uqmy1lFHJJSuhW0Y1TsDcCCKIEEGyggUu3g5fC6HVvrq9FzOP6Tl8Tma93hPQ+qgALIw35siylXKWK/RBMoOoVTlVJMoaasOS6ee2NU80Oej5uW7mdDN6ro5fWQElKBZCBE8Y2xhmsuSUiKBZGCN2RhorothVvz4+Hv6We2d1dPSy8/kbdtkaUcNlOL2fC8r5/pdDx3c7pWbLdXVPOjxdPJ2+ll9XsozOud57p/POhls5+ns57eiyveN2mrbto6sSZK+ulhI5UWXLJo5PGJABGRKDIACJHKBvz5cV+kh6nkcHk7OgReo5HCy23+M7vpUlJlHRVVRZbAdRKSSntz5cd+mC6ObHku0XQrrlPHdoDbxiGQcEG9dGdkqLLQOBGQIECBAgQOD0fkOW3qw32R03132RuZXNG2O26EtFSV2xThNiUUoOEmQRlEbiCkHKBAgWwrqnZAVuyMElJ4qCrnYAeMSJXKCiIBDoZ8mDRqRyIildCFM7AxXKyMLIQDdsIa6c90K+bp2VTmQItlGe+urkbei8YaaqNFdSOSuWa25W6p2QCAC+ur03K4nN1bN2fNA20ZfI9r0Oa24ogQIECyMHjHRXSkpZrLllIDIg2AKLoVVTsKRCuUihW7IxsjWrkkpQYCArbJQIzo5cfP07HjD0XM43oObye5z+V8z9X7bnadiyk0YhnTyYrY18Xd0q5SthTTZMCSShBXVpqyWRycfdPq4+BwOjZVPkdHN6no5fVlEAMKNlOaidqSmAIg2Ulk1AiIoopIvrpZQ6ObA8avPdLqK41yjXON0Mv1Tx/z35r6r13L13pLNkuqrnk62Ls9LL6uBZHm8LofON+a7ma+1dC+yFsem6vdto60DTVRXKeay2+FfVx4OXs3UysIEIKIDcCAGMgMA7YV6K6WirYV0WWxm3Pm427pK2yWiumiy2AUBkCDthXoqpxX6WSWTthAN1ymAIoNGyIoIWwrthXXKbKLJQIECBAgQPMdb5Pnt6gOhdDTbC+yNzxtZW2wnqphorMOjcylFIkimSYGyFlMoKRHpqpz2WwZBGykQgJKVsK1cgBEySSm0YrJlDKIbshC6FZFiv1FKAGaqac1t0BlEgADkAIQAECMMVdCvTVRz9OyBAgEV1dbqNcp2QrWUmjHrZMBSqlZxt3R9DzeRwej1tufKkp5Lr65TDCOAASUnjFW7IxthXXKVc5wFcikyWium2Feey5XKuc2SVhQyStskrcCAGFEB4x6GbHzNe54x9xwPL8bd0fWcbgeb6nZ4fQ6iylg0aoIo7nP5VNlnI27766aLJhxUSygrirqhnhisjzeH0FDj9HL6fpZfVwCgpEVsYUTtIAIEFAsjCqc4IMAoRKiyrDjnssDgStXCuUWVHr+J5f2vB8n8j9p7jHest1VUse/P3ujl9YQqnj5Oz5nvzXE2aK7a5bIaGXR0Vdnp5MOLRqy23gCFsK9+fLAqnPLbekpq2QVhQQRsiZJRskG+nkwpKeDRqjcABAuhVTO2BAAETxSyk0Y6K6cl15ApBygAIJ0qZ2AbqDRTJaK6aLLfc+f8v0M2OBAgQIECB8W935emzoI+nbDVdC7fmiyuthOi3YVZ18WLnauirsBYSRTZOEigOUGQaKgQcCBAgQCAB4wsjGuc7IQeMM9txDTTRVOyuc7q6q5TuhXRZbVKZAMKHjFZSgNGMYjlAgEAAYBskUg3pqoy3XxDAASUilAKTBtz5d1GUpOo87TsuhXVKeLRqthDbRl5+jXXKYbthWG65TgQFbeMboV1ymspKxXJlF4x0VUpOdblVZY0UQABspPGKSlGRBABAIWQr7/O5Pmur2njH2/A8x1sfPrlPJdfh0asd+nzfU7KSlA7/O5FkIcPodOuUqbHFEOKuCygrhXKpXiePM5eysHG6WX1HRy+sIANFdKOVc5gcAiA1k7YVtGNNlgYBFRDFa358WDRoqmyq4QVwWUNufn5bj6T5bwumrD879N6bzvT2k53d53U20eushGmzJ4/t+G9Jy8zLYr10z3Z7dt1e/u8/Tiv1VTsVsNxJ1HRXVoqp105wPk7N6ykBrJgcBW7IwVyABt4x0107KM3M1bllIBAZRgwAbgQIDxikpFLdRlrlPPZcG1bgJKTKJRADAMhA1059VNHouZxrYQgQIECBAgfJ/ZeKpn0QdHVVey0lXur3jN42MrOtjxlWcvX0oSZSZBTDk6HirYRpnZBhsoDCgMgQcApFIirlMgUoEF2cXO5evfVKZABAZINgA3bCuAkpAYYUQIBCArCgBGFEDo5sXP0bA2QgI2yUCCuhX0cuOyMebq2JKWiqq+FTxhTO2Bvz5FcuF0OqVGyMQ3TOwNwFbsjHoZsdM7K5zz2WwGRZGuyEaLLCFcpQGQAgBt4wVyIlbA2SIQCo9HNk5urarPS8ri/TPKeJ+d+m9hx93R+m+U8R4X0PqeVr3gLYw5urXVOyCKiHGuThAOKOAddcqap5tlHF4m8SXI6mT0vUyergI5bs+TNdeBq5AA26iAgFRrnJHJ1CCVl1dCyKZySSBEOCuAdWirIkq+7zuH7Xg+R8p2eq8cPm+rqsj6bXR7DJdfso5HB6Xzr1PHw8Lo+hzWdGmzdfXPTVtsj3AEBW4BFAVyeMb4VdPJhgYb9VNlobRsOQAiA1bjAO2FeunPTOx0rYVq3mtvrlNWykwAIDqIGG2jDbRmyX6KZ2QCgNlKAQAK2QKRE8YslAgQIECBAged6fyOizpB9K6vRZHRZG5lc8bGVpVjxl6Dncx4y0VQwad2O/UCdU7QSg3SVyKIAbKIBABAZRAxJlIDjIiBbCF0Kst16tlECAQeMAO6FWey4NwICybRUCBAgQIAYUEIDKO3Pm5+nXAgBjIgrIw2582e26idlc7GSVt4xgaaqOrjwc3Vsg8WjVAAX11VTnXKcBkiGyjNpqorlPJdoItlGbLdothXVKeey6ucykwFJWw28YK5EQHAKTqKOXVyYOfp11TsshD1nG8/lv0ea6naVv0PN4/peVxdNVHgPR+t52rZBJKZUQRJEEY0jirqVwrnUjx2w5eO/IkuR0M3qehm9aQrlMqOyjPmtuvhUBkK5SqlZGnjCiy2CggJlEONU5RQDSuKuCSj6Tl8CqcfOdTp+g5vB62Lj1yo5eyavBpp9F3+d6Lm6tvnenprn8n9TyMfM1drn6etDTrpMt3ZB6ANwIIoWUiolEFBwNFdO7PlyXaFbSUq5WBuAjbJQAyyMdufLXKdU7KLLboV782Tl7N4ANgGSIAAy+qqN9HLi5evfXOUApQcAMKCCgQIAIyIgQIECBAgQXE6HyCizoq+ndXpsjeyvsjbZCyFpLunkyq7c1uq2IU1dnUyY65Tw6NkG8SuU420YxsAyQGQAK26iBxkRAgEVkIOo5rbiiBAIAIDJbKM2mqmucubp2rJgbJK2yQYUQIBApX105rb4Gqqiiy1HIMKIBSdRSUgOBAgQAEbgPGHVx4ORt6MAhAVlkIkSt2whXKYYB2xrqnayjoqpKW/Plz2W8zXuVuAyRCJQGEUtFVIb1U0JKRS100djFzebq2+e6fY9Tx+DzNe7jbujBwQAs9XxuB5vqdnPbdBButtlAkSRirosZK0dTrKksmO6h1ytdHnWXsttHr65WBsBAeMElOArdkY7KczRisnhv0hkFCIEkmkh4wDgpEOHZw8j13G815nq9Xj7tna5/EZZsWg5G2dU8noOb0fc+f6GW29487z3T+d9LLZwuh6F1pK08Xf2s1vZur7QAhAdRRygRkQQRsi7GHnvGHI29FW42rCggAjIi+uq6FdM7A3VOzXRm6GbJxOh1AAbgAGFEMowd9dN0K8V+lXIMIREBW2SIAAwDIoMpQIECBAgWQhqqz+W7HyqqXQV9J1rtheyvKuthO+EurjzFT5mvpFSZShIkinZFdLJjosux36oNZSKRQyirkQAQIEC2FdU7ICSlbCGmqjPbdEg5QA2AIQAAb1U0dHNjzW3Yr9NU7FBgAERQQgQIEDRVQB0W2kCkrYG6jEVzkQKIEABAgBhRAsjADrlIhAgQIBCAAeMLIxpnZGQcCA0Yht4wSUlcgyyMVGG2UbYQpnZqqoz23aKqb66rq6mEUvbcDzPG39Lxfd9LVOZRADEciK+urq4+fxN/UjQCuUoJlWSBUNFeZHDZTiw3lc8uO6jPbhshw7Y+w3Z/XRBAMKCECyFdkYK5VTmsnfVVqqz87TrjOvi5vG29BJEFCAcQRZU2wzdzBx/V8bzfM135Ln5/pbsV5zNbsjze9zup6Hm+gw36uvi8/5jreA9jxOYr38/T1klr8h2vU02dfZR1wECBorpvrqyXaKZ2OlZCCSemqnrYuf6flcTzXV7XC6HVpnZAgEAECB0M2NJTthWG/Scvi8Td0+Xs30zsgQIyIDCiMiNtGXLbespK5EUQrbJK2RMgAAIQCLXRnIoECBAA7IQgeS7XywPakuo8dVkdFkbXje6nppNlEMWjaHaYydSJIEmTKNFdfXxYMl2nNbfjv0kGioDJK3AgK2yV0K6Z2QAzrYsHM17kk4DxiBhuBAIRJhaKqUlKqdkSrnOBECTKRQQAEIACBqpzpKdFlsYUikG0cmSIRINkIEAAGNFaa6VHmtujZSgQIyIgBhRbCt1GmdiSkQUZEyAJkMo2RhTO2BBK5WRhtozaKqcl2iMqlOBdCt4xthXXOzrYufwej1c1tySkUBgCBrpzpKdFlgBWEQFBBwKhCtZQury93n8Tm6o+c6mnLdjvq4PQzeo2U+wgwECAQKQZAgAIBFoqpthVpqo6+Lm2Rr851Ovjuu0V5766IQSUeNu27aMPoObwq5Qy2rhdHdivWO+tHi9Zx9Pc5/pN2fLXPHwOj867/ADqdlFqPY60eR7PqFfU35+pzdW3RXTXKfVx4NVVFFluqnPTO3FfpdR5Wzfltvvrq6mTDsozc7VsyXaa5SWUlcoAB4x6mTB6Lmcfk7eh2sHM6GbJ879N7HNbdAVthKMiKAwovrqqnNXIMKICtslAgEAECBAZLTVQyUCBAaMSlAgeU7XytXuR9K+vRHrvrseNt0Jo9G2ivHdsZTZSKkxIEmTKbpK5wbJXV11ynXOcB4xIK5QStgdkYpKTJNGPUy4eTs6EAAyiUVzlBlJ1Fkrq6lbSU1bRySUikyQbZIBAjGioBFXKRRZGFU7IBEBwIBCAVFkq5TgQCADVTn105+Xr3huAAIoOAyUEUmCyFfQzZOdq2Z7LoAAhADHilbZR01U5L9FkII5BnWx4OXr3VSm6TKKuQZfXXoqpDIPXTm4+3pWRgyjVOatlF9dNFlwZBAIBIq4hgI7aMWO+dFirlWVgthzM1uHfn85XL299fs4EANlKAGK5MolBEAgMo9HLh7mDl7aMmyjLjvvij4L0fqUaqmep5HnvLdjstGr2nC8pytmjz/S6GDTOqVOe2iuWLt8/q9jF6ft4OZZHm8fb800V6+pjWDT1b67fNdX0XRy39rDs1U5/Fd70yOUBknjDdRm52rYAZEBWwBE8V0suLn6diSYGQgNGPrOP5/gdHr9nDzGSw36uNv6VcpkVU7IFkILJwbxjBAYb2UZtFdXP0a1lKArcBklYUQIKDgWwrvrqIQAFcp6KqYECB5/p/I657wdIPb18VVU9mHR0unjz5b91tbps0splShMqQc4SeKIMmyVsIdTJi5+nXfVVkv00WWaqaa5SuhXXKbqNkIVTspnZorppnZqqppnZmtugEAECA6jdXWRVylXKwAJMpQbxhXKZSjcSDZFEBsNsolJJSeMSCjjYCBAIXV031102WI5PGO/Pkz23YNGuBAdRVuBBgClGQahA358tNllM7UlIAyUAgAIQLYV66c+G/UspPGGqqhHKqdlcp3V1dDPkw6NWey5JMhbXXqqoz2XVzmrYDTVT3+dyOHv6mLRpKI0rYIlINAiHFJKFVM4h01yyZ7ctE+fZHibs/quhm9aG4JXJkrIQWTRygBtlEpQCLv83kb8+PpZMHF39LfnxZrbfKdjuZ7JrKPs+F5emw4e/frpw3QzeR7PYrnXXKimeZJYunk7fSy+r1VUNHncDpfOtNWrVTdjv6nUyU8PodzqZLenk6Fbn7Th+a8P3/AFOS68AspMowCiBAIAIEZoqp20ZuXq3BuA8Y/QPOeR9Hy+NfXV5br93wHo/W1TsgECopKQGyUAMgFJXJkmSeMA5JKQCArcY8VAgAAyAUEUCAAthDXRngQIHlez8q01XZbexZHU60+o5HL8v1/R3Vz7GLJytnVKmVMkoTeLBMjeJbGLJUWX9jDzvR8vjeZ63c5mrcrbpAA2Ug2rbKJRAZRsjGqdkEySORCyMAEBkrIV57bklJkRKMsjBXIDDAOBAgMoq5ACDqKjsjB4xrnNXIiRyAECBUd+fJ0cuR1CBh0a+Vr3Olqpz57Lq5TSUoEAhAABgGRaKqdFdWO/TXKUCAUEHjCuUwwo2UZqLLap2aK6c9lzxjfXTtoz9TJg4u7pc/TsDcZEWRhXKfRzYs9t1sIa6M+unNw+h1c1twYUgBErQBiKkVajgVVTOKSposzVTyZrcOirgaqvW9HL6wMA2EUXV1UzsEmjlBQbxhGb82O+urr4ubuz5Obq1soX10ZrbOJ0OjydmzqZOb6vjec8D6P0+ynD7bgeT+d+m9Rg0yrlTTPPXPF08nb6eT1fXxc7j7Z8Lo/OK59TRVeVq9HzOfytfW0V7rI9vdnzX109vBzPP9Hr87XsiIyIIQAEBlGAkpgN2fK6jroz4dGrvc/ldDLjuhX6zjcDkbug8Y2Qh43uek8v2O4hIgAIQIAbAFINuoxEANwCACBAgQAwDgEGUYhW4y6uvXRngQIHkO58tK29nDHi7/AEFsL9+eDxvy27enlz4r95JsptGUJMpaaq6p27aM+K/YG2idXHgsiuNu6MHAgQQbKIyIVuAG3jEpBsMKIBFsozso1ymQx36IhW3UQOARFF9dWW26MZEAAAYSOTqLRRFoqp0V1YNGpZSVsDgQLYV7s+Ui6uPDXOeDRq5urbVOdkY2QhTOyNwEbgMlADGSgK3dXXvz5eTs3kSjdKAyStkEbZRg4ECBA1056LLlb6ObFqpoSUuPt6RErYGAZLp5cPL2b76qaLLYEBWyKCALJlRKgsgEQQSVauNc89M89csme3B1MnmOjl9P0cvrOZr26aqYFU7ClZGFcp1TmrkRQLIw2UZctt3oObx9tGVWVTlnsspsk0aePu3Qj1sfK5OzVsowh1VThivMOhq8lM8nQz93rYvUXQryXUcTf83dbs9nTuhdoqs9NyuZy9foc1vpK5T6ObHZCumy2qdmey2AHJW2SAK2yUBJSthBWwyyMWjHRXT2sHN9fxfPel5XF+Re1+hAOxi53k+x37oQz2W0WWhjxjASUigMKIECAUg3AIQAEAgADAMiAyKDAEV1deujPAgQPH935fTPodHLZ0c0ga/Tcrm6KpZL93L1dPn6ulVK9iYLNNUGTsiu7zubVOzz/S7Oiqrp5cRRmt0YdGsNwIESDZCAVFJSIRECAALIiAyVkYWRhmsusUaJ2MkGWwgkpQIBSqnYyjADbRUAMKFbeMbIwIXV1aqqM1t+S68OQBZMDthDdnyaqqAPjbulqpzulmtuuhXXKVU7AOArcBkiACBAjIjs4ebxt3SjIghAglcikQgoMAQDABQRK5QCltozX11crZvgoEDRVTrpz8zXugAGSjIACBBK3CIIwiGoV2Rz5bpAoZc/n6atVPGx387t4PQ9DN6zJdo10589l1U52RiArnYAgXQqVyKj18XOuhVdCrNbbfXT1cfN4XQ6fM17KbJArxX3QqSUYU3V5KbIbs/O4XR10Tz1zxdXH2uvi9R2MPN4m+3Fo+WldDDo69U919c/d+e89xt3pc9no9tGb0fL42a67Ffq8/0us8V0c2Ll690CAUACAb258uS/QBxkQGaKqqpz0V1WQhspzaKqeJv6lFtsRbCsNwEcroV0WWwIECBAZRSUoBRAjIiAQgAIECAAjAMi2UZ7YVwIEDx/b+XpLeDo3Q0dzn5nVuK/p6alsor5mvqPGSu5lJlJkw5xNXPdnz1zs3Z82ynPlt0VTsy231TsIQIEAqMGGwECAGFBAAkpPGMC2Fe7Pl5mvcrbJQGSIilVOcQspOoxAbKSSbJFEAgAgWwr2U5sl2hXKuU4AZB2wrsjC6Feey2qVlkYdTJhpss5+nYAVygQAwoIAA2UoECBuz5apzzW3wCEBlEAHIAGFCtwGSDAMNwCkyQZtz5q5zyXaClqqourqqnZmtvDGUSkrlASTZIiAmUKpyBC6FPZw8rHfZbDMkqOdpWS7Ph0ZaLOV3+d3+nk9XEsGnWQrlIg0YwatwHjAiuhWrZUa5NZNoweNeW66FdU3CCSSusOCuoqm6GTNbDJdGmzOjxdrB1d+f13reL5/mbF5TseC7GFZL+ryNnbeN/Uy1XV7qp+i6uPn9PJi0V0gOF0erzdW70nK4kDzfU7UbgAILqZMWHRqossAyKAUQNlGbn6djKNkY/T/JeG+Zes9vXKdcp6aqPTcriea6vbpnMDIQIECARNGNc5kIggAIQAECArauVkYQIwAyLYVUWXQIEDlbPjeHR14t/VyRK1B6vVcfk4dG/bRDl6+prprpnpKksrcGjaVIOW3Pnjlmt0AfVyYcOjXTOzfmy1yllv0RAAgyirkQABhRAIQICsA4DC0005Lr2SIoiNso7KM3O07GSgQCAYAA4DJBhQUg3ZGF0K6LLUcoAAhAIWQrScgO6uvZTm6mPD0suLgdLrcjb0a5TgFKAyUBW4DJAHUXjEN7c+Xm690ABorpqnYrkAgK2G2jGMgMiArIO2Fd9dXVx4IGa27NbfRZZ7bg+Zost4HR63I29GCIgOAADZIgFk3jXrpylQosnVNpKFEyudOmrl57MvK2VWx4Xp+R2Orj9TAeMcWjVh0aq5Tgbs+THfpZJ4wpnYsmreujNRbYrFbRoNK0HEEUkg6ldausqi6GSGfFeZbqleDp5O30M3rSJHi890/nnSyz6OV1T3YdHTsjdfXu35un2sPM6GbJwuh1cV+jqZMTJcPf07Iw6GbJzdW0N2wr0VU5br6bLFcnjEgAIAL66gyiy5kvW8Xz3kuz6Ag8Yeq5HB8p1++k52QrrnOuU3UVbKTIKUBWw2rbxiQAQIEAMVygMolECAQeMKLLYECBxd/wAethq9FzMzLZx9vc2UFctWS/d9A835jy/W9D0sufznU70JvF9HNlKdsF0c2Xz3S7CSmCXVx4aLLc9t6uWqnPVOyiy3r4udg06+1g5vL17sOjVAgEIEAAGykrZEUa6c+K/TorqRtZSg7q6ilAottA4yIgVylZGMFBwIxoxWUr6qiJHINq5JJkIBQUoCSZR0cuL0/K4m2jNW5eR7foeXr3wLIwgFKAjkwlGG4GunOyUFVOyBqpo5+nWkplKAGAYbeMYAYUQIBCJENFdOmmhJSost6WXHBczXuRy358nL17iFsK6LLSlGoAC6FWqnNmtsy22hoOCOCyhVKmyPO6WXh+W6+q6HB6mT03seH1eB0etmtvgt+fLdCvJbekp0WWwFbIikRWwqVlFlkFCIaUQcA4q4h1o4VTjoqx5bhJUgzQxw5+qr0O/N66Ay5/J2/M8Gjt2R1bc79Ly+fuzxos6/Ux9Dn6tma27n6NdU5wfoObyOPu6Oey66FfoeZx/Rczj4NOvh7+nwuj1q5SAWRiQVjIgAOhmx8/VsiLYV02WQOnkxYr9NU7FbIikySSkrk8YwCKABwA2UgwogEAEAMgylAgEAGiurPZbAgQMOj4rjv67Lcr3Q1vG6+udsJrK73PnvOWRl5Ps+jqno101Yr9lsF7vz3lvNdXuYr9eS/Ttz5+1g5vTy4vOdPs8rZvZLt4OXsoz8Tf1Odp1kOzh5qSlytnQVhRAgQAwogQCKISUroVvGOunOyXSy4qpzrlPg9HqlEZAiIDKKuUApMK6uqmy3oZcea2+mywDSTVyZKBAgBit3QgyV1dXZw83pZcXnul2OZr2wLYwiLoVo5MRy231TsdR2580Fjv1ANVNCybJVTnTKwhASUmjEhAIQAECBspz1SmRMldXXVOee25HIMgFG2jL3udyfM9Xt1TsDHjHfny6KqKLLNFdGS68qHK2bYRVwSUAVpKmmeZ1zIc2+vz90PYet4vZ4+7oxLHo0o5a6aMl16uQYpJiMCBBQWyjNVOWeywkYQSTRoOCuIK1lXXKF9eXHeI6UlTTZnUwdPL2+ll9ZAshzOB0vnXqeRj870/SZrel6LmYOvizcbd6XsYdtFlmS7QQy3XgeyjMspY7tHRzY9lGd1HmatuynPRO3Do0q5QABCMAyldCvRVS6iAwadeiqlksl2iAADcBkikG4CtslADCiArbJEIACBAACUmjGAAYLq6nUXjCBAgeW6/ypXuJvBusjothbdCaPRdCdsD1vG4lM9Pn+l2qp331w01V0WXUWXwl3efy8lul0udq2XV11ynrqo3ZsvH3dENsoxFNlu/Nk7WDmeY6/cUcbgiCjdKAGWQgrkrcBZSAPGMD0PM4/Wx4OF0Opxd/TgQNFdV1dWS6+uU2BowuhWGyjXTmVyw6NSSkrlBQCiARFCtkStsjRVR6Tl8bnatmS7Q8Y6aqElKuU8tt8Zhv1QNNdOujPg061cnjBW2SuhW0Y5rr0coEABGylAIBgBknjF4w6WXGyXK2bkc1bDcCBBaK6kb1VUaKqttGXqZMHjO76WCvqpIsOjQrFaBAOKSgrrV00WZqbMfo+X5Tm6sXpuT2GXt+B0usUQFbvrqtjCidqSkrYYyStlRDAx4QDUIkiyqosmCCuIdaSirq20YMtpjvdcs+e2lXg6mPt9PL6vdnyc7TDznU+eut/TyLVTPs4c+yiPlOx7LoZunvz5eZr27s+W2FZDuc7l8Lo9W6FXc5/L8R3/UXV1VTsVtknjBXJZMogQAyDKUApXQr2U5ubp2wA2QAK2RFEAgAKRAMZLTTTkuvDbqMADVsMgFBCAAgEXawczj7eksnAgQNdHwTz3T9Lg0dq6GnTVY6vrlqshZ1seR42FT52rospwk6ZT0VV5rtBT0V1XVw2UZ6p2VynmtvWUtFVOW7QAIrYQ01UaaqN2fN0cuLy3Y73Xxc/j7ehh0aoDxQZoqpostSU2SABkG8Y1ylpqpost20ZetjwWQg6jxN/TyXaLYV5bbyF0K4FU7IG7Pkvrq5WzeBpKTqNkIJKSttFRkQsnBslpqorcqbLYFkYJKXQzZCkGQeK/Skp7KMuW7QjkG+zh5vJ2dAAyWynMUst2imdhAAG4KAUBiuVkYAYZoqq20ZsV+miy0MgFAZfXVdXXjv0QFbZR9Ly+LwOj1lb6GbHytm6CDSOMErgHBHWkqap5ap4/Qc3ynI25u5z/QXQ9px9vRuhAAGWQisnvzZMGjXAWTIAUAMRl9dVc5AiGlcSoQhXJB1grJSyzVThltVFlVU87Lm9fF2ell9XRZbTPJ5vqfPmW++GjZnl6zj8n0PM5/m+p6zl7PXWQr2U581txSost01UpKXpOVxehnyeL7vpaLLVbiGAARPGMBJSKSORBWw28YhsARWwgrYcgECAQgQLYVVymGyiAyiyTKMAogZ7bQMBGFBSgEUGyiUq52QIEC6v4Ng09jl6+/oqvps3sryrrYz35oX1rDo3MrCpQsKGUtlNGW3TZGKue7PmZLZRn42/p9THg5G3odbHg4+3oskQVtHLVVn2UZ9VNHG39LpZcXruJ57x/c9FzdW3pZMVVllE7e3g5nC6PUqlYQgANVVFUphuuU4FsIeh5vH811O0GyBUVcoBSjAMhrpz7s+Tib+myAECyMK5TSUrYVpKTJQFHZGLqOa25lF4q2Fea27rY+f0M2TNbdju0uo4NOuyEKbLQGiqn1fI4Oey3z/S6+S7RAgWRjBVynAIQAECARPGNsIEVcp6KqaLLQ3TOcGRMkjlAgq5TIoHTyYXUc1tqOTqGS69WgIOFcgOkOKuiuWOyPN7nP8AL8Ho19PJ6eyPtctt7JQAy6utkqLLboVVSsgBjxgyV0KtVObJfeVDLddTOTKu6FGW2x400WOucQV1zqKzo6aLKqLKEli62Ptb83rGSrlj890/nYfRuhptrv8AV8flUWbNtGrZR1cOjXztOzTXRmsuSUmS9Jy+NfXV5zp9nFo02RhBgCAAMZF1dWe22BBskADIDxirkkpFJklbDbxiQgQHjDZRmyXaElK6FaOSSlAWUtVGdXINpKVcpwIxRkRRAgFKAG4ECBh0fFe9zqPP9L02O/rMtLK5432RnC3fmqz262UipgsZDKRHZFXV15btPXxYLIw3Z83H29HpZcfB6PW3Z8qyeG/VASUlbthAi3Z8uDRr9fxfO9nDzfB+h9X1sfPzW35LtGe266urs4ebwej1qLLYFkYPGLqOa28MiLYQuhVltvjcAAQABkAgA100djDzfNdXt2RioELoV1ymGK2BslAgX11UWWq3AsjD0HN5Pnun17Ix6GXH0c2PjbulRZbbCu+urn6dkF6LmccNgOpkw87Tsy3aElJHLnatiSmGFACAkpbKM6SlTZYAKIBStjDNbcyjA1U05rboAYBwQb0V0q2jlGAGUXjXRZMEUkkkoV7aMHTycnl61bHm66OHwOlHRV6/XT6+mdsANgNdOfNbfA6GbHdCuqdmey2CZLbRk427oqwqPVyc7la9qtLJAgyqrlGOumaZZldWS4osqV5K5Yupk7XSy+rKK54/P9L50DpWR02w0d3n46LNqvq7KOqyXQzY6Z2ZLtKyemmjr4uf5/p9eqU0lOyMLIwAw2AgBl1ddcprJlBCAAdRVygI2G3jGBXKbqEANslppoost62PBXKWW7RdXXjv0VymUiDxhTOx1F4xqnZAgQIAAgQDIlAgQK5fD1lv1U6PPdP0zx0PG51c8bO5z8ILXU6LNVU70dtc7SmSVtcWRTZZ2cPP20Z4GO7Tytm/ZTnwaNXf53K4e/qK2rcBkiG/Nk5+nX7Thea5mvbku0Zbr8d2iyMdNVFM7XUe5z+X5rq9uCshCqdjxgspgIF8K7YVZLtICBADCERAjIhkupkwcfb0XSAQGSgK3AVu6Fat6qaM116OUCA6j7LhebxaNPJ2dCmdmynPAw36arLAOyMOnkw5btF0K6J2Wwhg06tdNGey0hnstVygACBDbny78+TkbehVO1WFECBbCFka7668t15SostgBkApPGIbVuCVsMgnjDVTlw6dGmrPppyK4Y9FmW2LLAVzuzh81VPlMvZMvb87TsgQIGqqjRVTpqp0V047tOO/Qrea64Bqpz5brgBIAVFkiRZVq4AikoMqLYZ6pwyXOuVNU6q5ZUli6eXt9HL6tkVTx+f6XzsHRthptjfsodkbFfV009dkmFqpo6GbGyTxjx9vQosuARsAyTJFKAk5RG2jNjv0lRII5QCKAjkyQbDGioAbKRABA7OHm0WW2RhztOzRXVbCu2FfK2b4BBHJ4xWTthAN1SmrbJAIAbZKBAgQIHG3/HapdHZTo7/Nzeb6npIaLI29fFlyXb65aLIvRVHVVXVO+6Cz2XvE62PDg0bM1t/tuD5oD4XR63L2bs1l/RzY+Zq29PLipnZku0QIEFoqq20ZuVs3/RfMeO8D6P1nYxc3kbejTOx1HRVVqpzwNVNDJcPodTdny87VsSUoOBA2UZcOjWUoAAgGylAIAIFkYei5nG8/0evTZaGAZE0U6jVOcRfCuyELY14dGuAAIdrBy3SyW34dGopaa6bYV3110WWwLYV2wrqnZluv5+nYAZKAGMlEEK5SgMlA6mTDh0aa5TuhXnsugOolK6uuqydUrA2UlbKUYBso3QrpnZAsjXVOaOUEyh6Dncfj7d2a2yFdUwOqLMHisjzOfpoBxfdee1+l5Xe8b3fScvZviVsIVylZGPaw8yiy3la99U52xhTOxWX11UWTZRvrpyXWgQkoq1aVwJWkoQpV1Z7FXKiudNM86SxdbF2enl9XAqlj4HS+dK+lbDTbHRZC7RXO2G++vsPGMCBbGGmmjfnycjb0YCSkow28YJKZABZGGmqjXTRztOyqc7IxSUkcmUUlJXJ4xgRgCIIQIECC100ZLtBFEWKOqnPAy23slRZaGQZSVt1GAjkyTJWRrz2XQGSgQIEDg9H5DTZ0Xju9Vx+d3MGby3X9NfVNZX4NHRZWMpMpwshKyLKZT9pwvOcDpdfp5MfZw87NbfzNe7kbOjkv0dHLjrnPLbf1sfP427pQHjHrY+foqq6+LnUWXd3n8ny/W7ue26yFfM17sV+qyMNlObfmycrZ0PQc3kYr9PD6HU6GbHy9e8hAgaaaMd+hklbgMkQgQIAApbqMoHtoy5btGa26uU7YVwGSzW3MlbCvTVTpqpwaNWS/RA6OXHdCvn6ddsK81t6Slqpo3UZerjwcDo9bHdp9BzePztW2my1QDdU7KpzgK5MolEBlFJSKGS0V0qOmyx4xsjCiy5Wwwo6GbJh0aikkpK2RQGSABhRAggxW4DxrthTbGnn6NMcFdYdbLMjx8/TVntxFcTpZfT+v4nX9753ydcp/P/Seuost5urb0M2OAyWey2qyyuU7IV1Tm8YVzk8YXV05L7laDQIhwDgpBZVgrWVQKap1UWVJLLTPH2MPY20evKUMHnOp89SXTur0PHRfC1ldpp278/TRyDcB4x6ObHh0aqZ2QClorqRu2MKpzostKEk92fNAy3XqN0tNVGe25RrKQCAyUCBAgK3AeMY3BAZFEQNNdJSdRUeW6+uU4BSDdsIOo0WW2Rg8YUTtjCgpMlAgQOXs+NUz6OqrTppvqnsx39PdRHPZrZW2wkHaVZCZJNGRGCX0by/jiNXPkbelluv4m/qK5PGMC2FeqqhXKDyXX+44Hl+rjwcnZ0PL9fudTJhgdjDzfnnpvYvGHd5/K4m/qFLZTnonY6jRZb6Dm8jg9HrVynorpyXaIMA8YU2WsolAYyIAAgAgaqs9E7lkyi+uoi35sma6+qU8t2iAAgWRgGfUPJeHqlPnatmey7kbehspztGOO/Tz9OvfnypKXpeVxfHdv0WDRr9TyeF53p9hXKqdisgAcAiKCEAqNcpxmmmmAGwCyk0Y1TsIVybxW/Pky231zmrkyiBwTJK2kmyIKBADRSArI1QjRZIOKuuyOfPZCizPXLDntxQ427P6rqZPVe7875XRXTluv8v1u6AsUeZq21ymRaaqa5Sz226aqLIQvrpSTy2257ZpJwhCKOIcFcA4K6klWVRnsrqnTXLMksXUydroZvWNFWR5vC6PznPZ1nWoGzTVLVVK+vdsz9WucwMNhlsK6Z2QZABAZINso3V1MlRZbpqoKWa2+iy0pEClG4ACBAgAIBABAZKNgLoV0WWlK+urRXSyVcp1Tmjkrkk5RCyk8IOolKDqnOBGFACBAgQOJv8Aj5NnbwQ4HR9H1MkMd/Q0Vz73N53B6PcdWa6IMpUz0B2QkVIj9fxPP/RPM+Q8N6H1XK19DDo1cvXvjcQQaMbYwost7GHm/SfLeL8p2O/5/pdfPbbg0a1b6OXHXKePRpeMGS0V02whltvgK3VOx1H1/E8747uejA9NVGa2+yMFclk4ghAABsqMHAsjC2EKZzWU1DoZ8mey51GyFeHRrgQFbjLq64H1zxfz3gdLraaafn/pfXUztKj0suPoZsfP061cvRczj7aMuS7Rorq890+vztOzBo1kAECAGAZEyNdGa+urNbcyRF0c2Tg9DqkAHQzZOfp1hgGUuhmyVTnmuvDZioyyMKpWBqBAAyIiiRIxLVVmxaL0aVxhSko1TqqnkthzOZqqZcXdn9T08vq/a8HzPP07LoV+U7HeA2Uevj5/L1b65zAQWunOkpb8+Pm6dfYxc3matmW65ZJGBxVxDgrirrrlWHUrqqlXXLPVZnrlh6uPtdLL6yBTPHwOl86U6V0NN9dt0LiX3V79tHUZJRrJwbJQTxikpgAAbKRCBdCrpZcat1ynRZbRZbZCCylAqnZADIiBAVsigAcB1FHJkrYVpKbqF9dV1deey6BfCqqU6bLANJTAMk6iyjRO0NxgAoIAIECBztXxa2GuufU0VXYNHVJpshbfW2VgdzxnqqhroqwadyStik6PR8vkWxh73znlfM9XueO7no8OjXAIRDKPXxc/TVTorp7GHnfPfS+vIAFbImitdOfHfpIMo6qc+W3RfCq2FeK/SkpJKemmjoZsfK2dC2MCo2whRZbXKcBJSKTJBgbeMWjHo5snM1ba5zgPGNsYX1U5rr9VOemdtFlpBWK5aaqLYQ+q+P8ABeZ63c8R3vTOlAgJKQADjYCyMN2fKA100Wxr5mrdi0agAbKUANsloqpuhVbCGa25JSVyuhVbCHP07ILo5cfO1bElIovrqqnO6uumywNxBEADcCCgykGQV9dVM7IRdV31UYdFyySOuucFdNUs1NmTJdisjxOll9P7DidXjbultozaKqeF0OrAgdnDzcWjVjuvjcSsjCiyzTVRpqz6as+O/Rg0aYRshTVY65FUglQdSuCOtJUwz0WV0WZ1eHp5O30c3qyimeTg9L50Do2R02w0WwusjZoq3aauvZGKsgwwogQV0K89lzJAIDAAIrIQDdcpq3AZKyMLq6qLbkcoEAgAgQAwDIQQGyRSDbKNsIMo57bgDpdDNkpnOqVlFttkIXQrgUzsDd1dea65W2QAjIECBxtvx6+F/O092yOp46LYWWRusjZoqKp6SWFStgb89FM76bL9+bLjv1gl7Xg+avhX5jq9zk7eiUaaqGSzW37c+XDp1FFU5vGJAAG4BSInjFJTAFJ1FlF4xz23AcYB9PJhDdUpxmS3R0s2NlHk7N5QQgQAEDqZMPP0665TDcApFLRXUGWQhqqp5OzfAgBt4w6mTD1sXP8ALdfu1TsIMkAII3qqo7WDmcvXvy3X1Ts6+LndXHg5evdqqo890uwAjIOCaK1VUZ7bq5SZJoq2NdUppKemqiDdRthX1cfP4m/qUWWpKStskBkQHADCkGwDJBkDRVQspUTmSKs0V52jXi0XI4VTiHRTPLRZkK5fRzea9dxenVP3nB6HV20ZmUefp2EFYyW3Pmx36ElKBbCtW9lGXBp1ANdOVlDJdbGqpCSSOKusOFcoLKpHUyzZra6551eDqZO1vzetKKp5OB0vnVcundDRbC+2FzRu017dufqwCIDgQCEB4xZQpnaQAQIyIeMa5zKUAMZEBlFXKCA4ECArYbZRiIwDSUnjGAyQYB3QrSUlbA7YQ1VUWwr5+nYUr66q5yA6p2Oo66MySnltvDZFAgQMGj4vztXZpn1bYaLY3vG+6E9lEXjZoqSS0YtG1oydGiqFU7uhmy8/TtZPv87lAeHRqz2X57broV31Va6c+DTrzW3tGNc5kRig3AZKBAeMVlKBAaMdVVEDJdeHIAG7YVwK5TIq5TKXo+ZxuZq3UzsScwBSuhXtozc3VsostIRECAGPFbKM2qrPtz5vN9XtI5ETJWwh0c2PDfpzW3wUHBX11skGMlltvjFGG3jHo5sbKOS7RXKdU7IDxhbCAZnsugMlAgQIAYB9PLiKXO1bOzh5tkY8HodWAyQYBwIEAMgQIkWI5Mosoo2G3jWrIV6qs+G+6qcUlAOimeQPDluxb83nNuf1Wmr2dcpEUGGQcCB0cuLr4+ejl18XN890uwknyNvQpnMkYJ416K86SKpBIZbZpKKutXXXKtjPnsg8cgeOuWLXT6Hr4vUUzsrlj4HS+dVy6d0NNsL2V9kbtNWzbn6oYBskkpPGMAMKGSIlcq5SKTJQGUa5TIQQG6RUVbg4ECBAgBkAogQAyBdCvPO1xNFQV0K1cqLLCkBsltozXQrx36Ecg2BrKUCAVENskUoECBwOj8hz29MHSsjqsjdbC7ZSlNIdzKe/PUCzLdrKlpqr7eDncjb089l8H1seDJdpy3aNdNGujPy9m8D0V057blG8YrJgZEBht4xIQLq6qLLYAZuz5oK2EKLLc9lyyaOWiuoAkpq3ASUildCtJSsjGyFaSloqq7mDl+W6/dAwyBEBshBXQh08mGyFeW7Rz9OxW7IweMdtGbn6deqmh1HHdoIPGNM7KpzZJJSdRUYBhFLq5MPI2dB0okQsjXVKwNwIDqKSlEQICSdkVpqogI32cPOzW3crZ0Ax4xgVymsmYphK3AKUCAGMkjayZUQxo12Rq9BzeLwej1GWdlR0svKwaKuJvuhy3XFePsdlHrw2Ug5ALIwrlOyMPXcXz3peVxc9tt1deHRp+fel9dmtuKiGoKEQIkOhmwVyOZr0wgrrSUAU1TrrlUks9M898OX18PY9VyO1ku0cfa/OdT57TZ1bq9NkdFkbnjdor27KOtBQICuTKJQGQAN4xWTA2SIQQGGylAgFIgG4BSVuBAZJJO2EGSqnYADeiumyEMV+lkmSDANkr66WSeMc114BJSRygWRgrlAgEEbSUrYQIQIEDhdD5ATZdXrzW9S+FzRuJoeNjxsZWFTti+vixdLLl7vO5uO/X5Xsd/Ffsg9ufPkv0gZFqppuhWjlntuvrqy3aCkrcCAyi6SjjClqpox36Q2AuhXbCvoZsfE39SBADbJaKqMl2hkoyBEQCK+qp1G6FdFluiqnNbdntvAQAwDKUZEaK6e1h5vXxc/x3b9HTZZfXVApnarcBklbIgOAAIK2wlGG2jEN+m5XEw6NXM1bknJoxsjGqcwMiDYHBMiArIEHA3Z8tUprKWunPVKdFltVlhSAK5MlBQIBSdRKUCAGWwrossJGqTvro9357yXlex26LAOqyGTn6Y7s/Fw6Mrx4uHT72+r2YbIjFRvs4eb08mHPZd6rkcHh9DqXV1PGJFy9e3g9Hq5LryRVgEGoQDiCG2jFRY6LEko57ErpSVVcqKp5q5Yezh7HouZ38t19UsnH3fNFfTxX9ayOiyNtkbr6923P1VbgMlAjAOCKAyA0UJMBAurrrnNW4iMKCksmUQIECBAIlbgaqaKbLaLLXjHrY+eo+Xs3QGSgwEBktNVFU7KpzAw3BFECBAgEAEAhAgQIHA6PyGizo3Q27KLct3Qtha8b7YzaNhLHjNlMp+l5fIz2aM9mjfnz+f6XYI2illODMUQg+hmx2RjnttwaNZSIii+urTVTBVTsA7IwsjDFfprnZAAdbHz+nkw+X6/eAQAEZZCKycHAVkGAIrIR7WHmcvXux36bYQ20ZYGW7RVKcANlKBAIaaqe7zuTy9m7mat19dVFloYUQICtkCkQARijIgOA6iB6qqFb9TyOEAy3aM9lvH29Gmy0hARuMaKDFcmUYEDbRmyXaQEB4xIlbgMkyiyVM7FbgQIF9dNNlpUVb2UZtlObkbegklVKWqrNmtauNcq1dDLDTZjwaM+7P5vTV63XT7IAQAaaqO/zuTtz5qp2b8+TpZcWG/Vydu/hdDqWRgGcvXtglYrRIgiHFXGuS1U5NFeTFfZjvauqqdSSorlmrli7/O6eqn2F9dVM8nmur8+uht6mOPP1daGpo3aK9u2jqgatslGREBWyBSgQIKDgQNFdKuVM7IEBlGqdjRiQjIiAUlk4NW3jFlGmdlsYet4vn+Xs38jb0AMNgIBAARK2yAAYBskQgFINqEYBslAgQIHB6PyDNb1GXQ102q9dsLnjaytsjNlYVN1L0fL5XH29OOzVTVbCMJcvXvDkyUGUQA2rbxXoObyMl+imdkCmdmmqnTVQyVFloC2MHjGiy3DfqSctFVNsIbaM3A6PWgBuCVy1U0UzsDcAMRzjLIQIdHLiwaNSSnAthWkpAcbAK2yRABGGKZRvhWUs9lqymAIFRgAayZQADZFAZK2EK5TVuBoqpz23AHS0V06qaGUeTs6BAAGRBBWykGwBDo5seG/UJMoZReMA3ZGN9dKOV9dfN1bElKCshFlFJSSUgBC2FUFXKaSVsKM9lkcKpRDqV0Vzy2Q5nK2V66fO783qtNXsoEAg0Y+g53I5urbpqp62LnkQDm6tvE6HTRvvc/k8vXty23BquTJACDirikoghpqxsqedptqnXVOtJZ0eZJYe1g62yn15R08vC8f2vDXQ2dPInWnkbe0Vfoq27aOqUg2QABtlGyMEcoOARQFcgAbZRgNGJDVTRjv0VTseMSEAAGbs+aiy2mywDKTJX11baMvTyYc1t/G3dJW1cklIgoRhQGFAYUQIEAhEoxW4iuc7IwKIECBwej8hos6TLfrptshfHphe8bnjYsrXjPdnp6eTLtoo4u/q782fFfs7OHnea6vbVzsjEogyCtq5Ml6fk8PzfU7NFlt1de6jLpqp2UZtNVN0KrYQwaNaSlku0cXd0lkygi1U0VTnVO2BBQNFVOa2+AsmoyDRjGFGmqjNbeADYbeMYBApBkCDgACkwtFVJFbCGDRrVt4xDZSrnIogJKTKMAoIih4xqnMpaK6c1t5B4wgJKfRy4tFVPO1bct16NwLIxDCgAGyLpZceDRrDCkyQb01UFAZRO1W3SqnMqLJK2rlAWTiVsa4F9dFM5K1RZIONUoh1q6KbM1kOZRZzw+Rto9Vro9jAgFLdRlyXaKpzA7YQSTDZR1MmAC9NyuHXOfM1a+Vs3c3VsBEkUlFXGEAVx1b83P5ezRXKqiyKvPVLKksPaw9fZR7AA8edwOl85z29foZnsonlu6BV90N+ujrQCJ4xgaKqSCt5rb3jBkqLLXjG2NaOUYjnAthXRZbqqoy23hhRAIALoVWQhRZckpMkRI5FIgyjsozVTsz2Wq5RtWQdsIVycHAgQIECMiCCsaKVsNsKBAgQOD0PkFNnSeO7TVer2dHNDPZtheymVbuoq7/N5nG3dbZRV6nkcPma+hzdW/m6t+qmjBp2lEbAylBwNdOf0PN5Hnul18d2ggGFAZBvGHoeZyLIwpssyXaOZq2pKcCBGXV1UztgaqaNdObk7ehERuCVyDdkIQLIwZKiyxHJ1EogQIEBkoIgBqyDVvTVT0M2TBp1aKqcOjWrbJBtWylAgLJqSZRZKBdXVTbbZCFcpBtkX102whiv0311dDPk0VUcDpddHIiKADJQFbdR358vP0aoOBAjAEHBFFsK6pzdRpnY6iB2RhXKQAi35siyeeyxWqZyDQcFdaSgjposyq8OW7H0M3mttHq7Ie2gFLv87k8jb0Mtt8YB3QreMWUSFU5eo5HC4HS62DRpeNfUyYMGjTi0XwirjCAIBwSVd9eTHdYsqa5U1ypR5Cc7p5e5so9gArlj5mv5jku7NkdOumd9dsL2XT10dWNlRgyKIdQ35suW6/VVRzdW0pPGPRzY6J2UW3ZrblbvrrpnZdCqqViycRADdsYbc+YqOS/TTOxkoJXIhuz5M1t6Nq5BsiA3UWjHRXVg0amSDAMiKIECAQggOBADCECBA4HR+Q0z6V9e3VVar1vG66uxZXgvug/dee83ZE8N6D1oc9dNW3PRsooy3acWjWCWey5gA4AGyXcwcvjbejASU4AYBskG1bKTJdHNjurq5O3owFYUBspaqc5B4xpnZVZZTKbBfVTTZbAgQHUQCylEQCCsA3jEiIAFbg4BCA8YK3ZGDxikp1SmG4AYBwGSIgOMAQIBSvhXRO0gAgQQbKLYVuo9PJh5WzfRZaUQA2UgzbRmostA0lKDVkGAIoCOeiuhXJZNRslAWTvrqvrqpnYrOvi52S6/m69aNQirgHWrhXKnPbnV4cl2S2HC35/UdDN66B2sHLKOH0OoAWUrq6+7z+Vrpz+W6/dVsM6mPDoro4nQ6dbI1bXV0c2Hj7t8IKRWUFcQ60dZM4KKbI1yoBjSWLfm7vQz+ugK8PL1/Mq5dPoZ5Q1aKp5rd6vqa6OswAAwgURJhQN2bIQpnYQpnYUozPZcUg2RaqaMl16uQbKQbgaaqbq6qp2I5JORSgK5dfFzqLLst12iqnpZcd0K+Vs3MlRZbVKyuc6J2WKMQQAAIDBAKStkFCNwUCBA4PR+Q1y6Lx26K9CPY6uthc8Z2Rs73O5/1HyXivmPq/d8PodaFjJ6KoU2XaK67IR1008nZ0GRAgBuyEenlw8nZvVyuhXXOZSAyEAArcDs4ebmtvxaNUAAGQCiB08uHo5cfnOp2bYQSUkctNVGe2+AADdkYI5FKNwAAZA0000WWhhADgBhQRdTJhw36llKqU+hmx0WW0WXJKRSuhU8VA01UJKWW6+qViSk8Y2Rh2MXO423opKatslpqpzW3QA20Y6aqPW8bz/lex3sGjWyUCBBdjFz+Pu6MRdCtW1bVySUmSKUDTVRmtuDYGyiG4Io62PnpJ3V1YNOtXHHdojgjUIh1pKpHUsseezJkux2w4W/P6rfm9d0M2TZRm4u/pK5WRhXKZS9bx/PxHkO36EpQNdOb0fL43H3b+Nu6MECLKGmrNTZLNbNJRBWHWypy2ium6GPp5ORx91mK+nqZO3vzetgWR5vm+p8+rl07Y6e5z81sLeZr69kd+yjrFJJSKRBkoEEUmSVyDYY8Yo5EWiqquc6pTthXspz5LtFcpK5QIECBbCtkqbLFbKGSKUC+uoiKVc557LoCtkFb1U0YtGm2FZRAjIiMKIEAAQABkCBAgcDo/Ig9+7Pd6Dm5OH0O9mt6DK62FmmpfS/K+O5urp+H7/q4WBzurisrCnBsjTTVGwSKWiurJdo6mTDz9OvNbeA0V00ztDYZAgykGyk8Y2KHe53K4e/p5rrwOJECBUdNVMC6FeS7RVOzZRlx3aVlIBbGEErnAurqrnOIsjDPbbrpoRyz22lECBAgFLtYubhv1BlM7NlGeqc89l1U7IDJBuCeMaLLQ28YK5Mo9LLj20ZuNt6PTy4edp20WWkV1ddFlqtkTRWunP3MHL831O1TOwgUmUdlGfDp1REAM01U0zsVygQNNVFNliOaSkrbKJSjCl2cHN7WHmdbHz/ACXZ7/F39FJNSKtQgsoVyrV00zyVzy5bcPQzeb2U+rsh7bbRly3XgcCBfXVqpz9rDzeNu6XN1bQzTVQyjsozXQq4PQ6cEshREgyq3Z8fXxcvzHW610MwK+Vs0K6UlSkqN+bkc/TVuz+g6Gb1l0KleLzHW8BDostWmq3dnVc9cXS109cpRhQrbxiQVlsIVymRAcBkg2AIaKqKp2dbHz+Vr31zseMGSrlNW4wogPGGe26yECFkYVykBkCkkmBlIhAgBuBoqprnNHIhAAQAwoIAIECAQgQIHA6PyHPb0+nkn1scPT8nmw08fb2fTcrl+h5nMx37vD+g9bwuh2SpOiE4TZEUijqZcWO7Vuz5erkw5LtHO07O1h5vn+j189twYyW/NkwadaOQbeMSK2EEbDlbCt4x7eDl+Z63bA2SVt4xYQBklb20Zs9lxSDdFluiunZRmzW35LtECC7OHnMo8vXvqnMDdRqnYyjAAyESZINq2GAbJQHUba60nKtzjasgQYCAUoy+uuuUrYQ20ZtdOfgdHrQHjFJyRyKV0K65T6uPBZGHI29BJSgX11wKJ2BsgUoF0K0lKuUii+uqmyyABpKTxgkpOo6KqWUcl2jq4+fzNe26unJdbHFWoQVwR1pKmizNRZkSXOBxvQ83u9LL6vn6dlUpslAAWxhXKfQzY0lPDo0gN+fLjv0KztYOXx93QqlIMDiVAqvRXm9dxfN315c9r8n2O1yN2tHTXOqqVFU8+irk9/ndO6v2Ycsd9Hn+l86D6VkNWmuwGrXSX17rYdqBAAwx4ogUrIwz2WwHUQOBAIQNFVFsYVynkuvgAdkYByAQIBC+qmmyxkrYVhvLbfAZIpJKRFAgylADIOCurrrlMNwAyDKRABAIQAECBAgcHo/IKp9L03KydPIet4vIJo7eDI8bOLv7Pg/RevqlowaegyloqhRZeylBsiErYQqlYwaKqq5TVvv87lef6XWSUiiBAthXZGGe24DgXQqqnY8Yo5a6c99dWK/TTZaQAQIDKMGGK5MotFbKc22jN2sHM6+Ln8rZv5+nZiv00zs9dxvPPGPE39PXTR5rq9qqU6p2VynGK3EQFk4ECIWUikySSkUt+fLiv0kQGG4KDqlO2MCldCqiy14xthD1fH4Hkuz6CqdlkYWRhku0K3ZGDJbaM1blbGGHRr01UXQrw36lbDIDJACMBGAL6665Sg4JJSZRurrIlbA3UM9loZ2sHL4XQ6UIBiuAdaOFc6aZ5qLMmmri4NGH1HJ6/Yw+nw6NfP064EApRsA6juz5eXr3bKM1U51TmBWxrKjTZNRBoqGqrNvz4e3z+Pmtn1cfK8f3O7w9+6qddU6klRXLNXLF1MnZ9BzfRUzsy3Uef6XzquXUsjqvruKvthdrp17KeqjkGFECBAsjDVVRku0AatwTpPGKOSt7aMtkY83VtgK3AsjBXIgAgEAGqqiBnsuVtZOIZIpJKTJBkAogQAyDAWwrSU4ECAQARhRAAQCECBA890vkRNv1Tx/k7I69FdnQzR4m/t+l5XK8L6H18Lufp38fb1tNVdU71dhUoSIX1wqnbdXXpqpx36lctFdBRorq52nYrZEUEW7Pmz2W1TmyRFVKwi000Y79MDdny5L9DxikpgAyIdJZNR2RikpXV11zndXV08mGi23RVVg0aullxQHUUcs9t2DRr6uPBjv04dGmBAA1bWUoDKMBXKAyiUK26jtz5sl2iuciiMiCKDgb82Tm69t1dRR7Hiec8h2vQ0WW2RhorqxXaElJknjG2MOjlxPGNc5479KOVFlsAgAdRiElKArcDRXVXKd9dOey6MVvTVRmtu100UznZGGW24i9LyuHwOl1M1lkEsoK665Vq6ap5rI8vDozZ7OZ1sfpO3z/AEuW7QratsKIgAI308mHDo1Mo57bVGygRbKMuK/QrUE6qVqFemrL3Ofx+Lv3XV5eNv2UzhRZXVOmqWaueLq4+1vzet10576+X43u+IR9Nlr0VW2K+K/XTs6OXo1ynGwBCAGX11VSsDIMqKuRAA8Y2xriM9t0CBAgXQqeMc1t6tuowYZoqpz2XEStgbJQCIpK5QIEZAiIEBW3Ubq6tNVN9dUDLdopnZXKSSmyikpq2RQIEDhdD5BTPpfR/L+duhp870/Ra6TVS/T8nl31vRXHVTHxPe9V5fr+grlcybJwk8VdCFFl8GyQH08mLTVRzNe54xZLn6dbJQClqqogZrb0kwN4xsjAN1TnAvqqdKuUtdOfHfprlOAQgATJK5PGKSkG/UcnheY6vc0V09rBzellxczXt100Z7LeZr3dbFzw35jrdxWMkUaaqXUMd2iDgQICSkyiyFYUWwr6GbJkv0ZrbgMMaKuhVXOz0HN5Hnen2Lq64HseJ5zyXZ9Blu0AN+fJg0awwoDcEyQH6XlcXFo0so8jb0UclbYUApAcBW3UXjEhVOZSAJKV9dVcp6aqVkwLNbcVHuYOVxd3RpmyQDirgrrvrwgxOubh0Zc9nM35/U9nD6fBo1PGLqNFlwApBuBrpz311Zbrs9lwZBQO3g5WO+/DfoSQrSuIIXRp6WTm8bds7/O4fO1X83VbnshRZCmzMjxdTJ2uhm9bBK8XH3fNa5dOG26u4PU8btNW3dn6lkYVynADCiMaMQ5RINwCKDAELq6a5WVzkUQIEApBsigFAbaMLYwzW3AcAhBRDCeMaZ2FKMiIEbiRAMKO1h5nH29FkuhmyaKqORt6NcpkWqmjqZMPn+l11k4ECBw+h8gz2dP6N5fztU+iy0YNHU6uSjzXV9DbB+j5fL5Wzqen5PH4XQ7HP078GnaykCRT100ZLtLxQbIen5PE4+3oq5UWW3104dGshAZR2UZoGDRrVt1G2EL66cOjVAKIF0KqZ2uo3V10WWVymyRAARWwrpnaGaKqu3g5eqmjq48HXx8/zPV7fn+l10lK2EO5z+UUeN7vpABSIQCkyirksmyAECBAgBkDXTRmsuIt2fKkp5rbr66r66q5z9LyuLweh1cOjVRZb6jk8Lq48HgvResgXQrgVTsgBkRdCvpZcXs+F5q2EMOjVxd/T5Wzfy9e4pBmyjPTOyiy2BfXVspzc/TsABspQLIwrlPRXTtoy8rXurnMqPRy4ttGTz3T6hUFcQ69dGHXTgzXUZrcyvmK+P6Dm97oZvWczVuDN2fMUuPu6NFlquSt2xrA9FVGLRpgACR6eTBztWvoZsTxqqnLJdbVMZVa6cTKlo0dnDx/Hdzt5bTNdCmedJYepj7XRzetAVzx8Do/Ob69pNjx0FXstGmrbso6pErYGRFBSIihZNW2QAgACEDTVRmtvgQAx4xVygQFbYTRjZGCudM5hspMkQAQGSrnIDKUCAspFReKIQN+bHh0ag3ZCGynNRZdTOyqcyjbRl9LyuLkuvgQIHzr0/z4Pb18R63jczi7u73Ofk8z1vR83V0+llz7KI8rZ0+pky4r9rJ9nBgtis9mjlbN90I47tNkVG7q6q5WBtkrIwiClTZbZGFsK6LLVcrYV02WNGJDoZsfK2byiBAeMUlKArbKNsYvGKNrKVkIQKLLXjHvc/k2Rjoqo4e/qdbJgpnZydnQsjC+uqiy2mdmS7QyUAgUlbdRurqz23q2rbKIHAZK+upW6LLQ2yjBlKuc2jF1HXRn6WXFku0dXJgx3aYzu87leG9B6hJTurrvhVmtvVjJb82XNbbTZb7Dh+c5ezfsozc7Ts5+nZvz5Ml2h4xx6NKOTxgG9dOcoxX6VkyiCDLq60lLrY+fztOzNbcGQVkavT8nhZ7J8Tf0ct09Febt8/i7Kecjyc/TXytlSvj9HL6jTX7Lm6dtU7LoVVTsVygWRhbCtXLPbbqpoossqnOCgu7zuSshWUWT0VZr66A4Yr7sd9nSy82+vJ6LmcHwvoPQ83XdjuWS+oGDp5O30M3rYCSxcTf83pn1bY6bYX2RvthbbDfrp6zJQQGQAMo2RhnsuZIgAgQFbZIhuz5MOjWrcEUX11Z7bYBRGGKIklJ4pWwBCAG2UQOyMK5TgEAEAMKIAAh3udyeJ0OpXKVkIJKcCyMKZ2QGSZR1VUQIEDyvX+VJLf0M13RyiS19vBl8z1fSLLR6Pl8zz3S7l0Dr4seK/Znt0snFPTXVoqrpnbnt0QdkYQaOcCA6jsozK2kpaaqefo2LKUABorpqnYjkyirkQAFJWw2QgiiBbCsN0zsdRgJKTRXf53I1U05br9NVG3PmdR8l2fQZrb0k7q4bqMnN07Q3AgOo1ykyVsKwOmyyDgih1F4xqnNWwMgyQAgAVsiKN2fLh06urjwep4/B8p2e+jldCvXTneMdtGbkbehmtu9BzeT5rq9rJbo6WXFdCvj7ejbGvv8AN5PB6PW6eXDxt3SKWmqmiy2Brpz4dGpkmjGucwMMgt2fMArnPPZdXKRIwTxh6/i+b9ZxvO6Ks6SVFj6Obm1yp5Ox8PoW+X6+mHHsh7CyPtebq3LJxDxispAA2yRSDAEAMAQWiuiqclYkkVCyNPWxc31HJ89XJUWGivJppxeZ63V8909/P0GLQq5Yell7m/N61kkli4m/5ukumVsvrtY02Qsuhv1U9dkokRQcCyMClXOwBAgBspQIBB4wrlMMgaaqe5z+X53p9lW4EApMKuUnilbgEIJW1cmjHoZ8lU7M1t8ABADAMiKCl0suLl7N/QzYwPDo1QCCtwTIAQIECBwej8hqn0Lobevir3ZzHf0ufp6eyiGyiPP09All1Z0cubm6+gykCTJwe7Png2QB479KuTJQAzVTRluvKCKyEKp2RkRAdRaMUlJknjGiy0grCiBAVsNsosgBAZRrlNktFVN8Ksl2jZRm9DzeR5Hs+gWU7YV1TnbCG3Ply3aKbLK5TAEClZGFcpwLYVrKWiqlW81t0HAVuARFEAhAABkDTVTRZcUuhmx9bHz8l2iI42/pVymReo5HD9x5/wAvytm/y/X7lkY5rbUlPh7+pA6+LnX11ZL9KNhvPZbntuZLVTRmtuVyZReMapzgBu+upG0lKDSRAZR6WXDRZPTVmKhuz4dlGKuUOfplkvr3Z+Nivx1z5NM/cw9vVO2AAIgMgjbJBjJI26jXKStvGGunNivvJFWlahB1Vsox+h5nC9Xx/OVTjy9ejnaruHv18nbbytk81ufrYuz0M3rICSx8Ho/OA+k0ddsL9tAstVsN+mrrqOyMYFkYK3ZGNcpq2QAK3AdRRygX11a6aElLJdf1MmG6FeS7Rg0alcmSgnjFks9ttsIAaSkQgQFbKWmqllHNbeG1bKQbAK3ZGOiunp5MOK/VspzZbb8OjXVOZSIiiBAgQIEDidD4+Db28Ea5bya8V/SV6O9zsPH3ddlIqy2D101FTxX6yTKGTuhDfny9DNl890uwkplJkoCuWunPlu0KyAUMkjcbKUDbRmpnZbGvqY8KSlxN/URsgQgAAwogQIDqIBW+xi59sK9VNHM17uRt6FkYFKyMNVNEGVG2MMGjXnttA7YQDAOAQKjqqpxaNMCIIAICSlAKTJEIECCKL66s1t0ZsozlK6FWyjP2cPN8l2fQZL9BRoqo9Hy+MG/J9nv2Rj2sHMyXaMV+nXTR2cPM831O1fXVRZbspz87VsaKZRVtXKBfXTXOzTTQyjiv0wIyCVygtFVHawcqi23TVl5GzdXNdfFyuTs14r3XPI8ebrp4RXGyX+9th7QNxBApAHUUlMAAIVylBWxrqlOxV7KMvP0ao1CIIhxUiSqOG3Pz+nk5mHRPq4+VkvMGh+f6WvNbm6WTt9HN6yBVPHwej86V9K2GmyOi2Fu2hQ6eqnrwICydsIX11Mlju0QCCtgGSKSSkQ9Xx+B5vqdm6uvZTnw6NTxi8YhuuUqbLK3OMaKSUikySSkQAQIFkYbaM2iqmuc0csd+imdtcpuoso3Qr6+Ln+5895bPbbyNvR5evdwuh1aLLYCtkRQQgQIEDz/S+RA3djEu3gp7nOyeY6/pWjcS7i7+w8bGU7IvfmoSVmS7WrsdDRLYQDk6WyjPg0a1cyIpMlArlMNo3BuoFCSkyiUb8+TBo1wAxkbKM2O/SAIFIAsnEEClG3jDfnyZbdHUyYK5TSUuTs6AYBhhRorq6eTDRZboqpw6ddUpvGFFlySkQAQNFdNsK8OjXBAcCAyUCArZB4wKICtrKWqmjPZaG+jmx78+SyEMOjV6Pl8buc/l/KfY++AQL66q52BlkIVyn2MXOyXaAGyjNzNe6qyzRVTpqp5+nXERkQG4EDRXTBK5VTmrbxjbCuBbCrVVn6WXDxt2/Ffo3Z8We2WqnHytmqmyuqWZJYell89XLlUWe41U+xgQAxkoMqJBHKBGRIMeMElIqPUyYOVs2qxJEIwgCKyhbDPRYVTj0snMvrxUzr52qxXk5euHUydzoZvWK2ksfC6PzhH07Y6bIaLI3aanoq3aK+yAgQV9ddM7LoV1TmrlADYB1GDAWRh0suLma93TyYcV+rPbbdXW6gB5rb4FsYWQhTZYrlA258uHRqIAAxorVVRrpz9TJhyXaElK2FeHRqw36tdOfbRmx3aFlLRVSG9lGfpZcVkYeT7PfrlPPbcUASSmUoECBxOh8g1U21y6lFnS6eWv0fL5/s+Fw/nvpfa8fd12U2jZfXHqZMuS7UHZmt0MnfXXXK2No52whtoz4dGpRkOjlxc/TsDcCBASUoF0K4FkIMlmtuVsiIPGIHbGu+qrdnyhvj7eikpdDNjuhXz9OuyMYHWxc/3XnvK/OvUey5erc8Y1znAAECHRy4g3fXVrozcXf1M9twCBAIFIpbKc1M7A3nsuDFcnjEgAgRkQQAEVcp2wr0V1Zbb7YQ9Ly+Jytm8pe24HmPIdv0XA6XWgWQg8Y1TsgPGMBZS358nP0a7oV6qc9Flt9dVFl2S6+A6irlAgg3fVURQKpzZJoxtjW8YaaqM9luO/RVN1TdcjTVl7vO43nep0njlyXVUWZOpk89ztWK2HsN2f1rIRsiKIBC2FaSkrkADAx4xKiknsoy5Lr6ZyJAEY4girgkobaMWDRasqmjmZZs9tRWPDop6WXub83rVbV4uD0fnKS6dkdV9drrRbC3p5Lb6+xmtvKVkYJKYB1GuU2jF1EDjAMqJDt4OZzdWyD6eTDwuj1b66ilkuvdKArlqpz0zsthDJfoeMdVWfJbodRrlN4x1VUUzsVuM0005rrq3MiIK5QTxijlZGFU7AwoZR358l1ddFlsDPbdmturlZAgQONu+OPHYsuiDdvznq+Nyepko7eDF819V7zLdstrA7b647s9F9ceLv6sJ3V11Ttgw5MkUb8+UN4b9Xf5vI4PS66siIwogK26jtozZLbw5QIACMAwwoZIMgaaaVk/Rczj8Tf08OjVB1ylB9rBy/e+d8p829T7Sqdlcp1ykGPFEAGyjMQ358nG29F4xjdcpgI3Ba6M+W6+uU9tGbTVTzdWxXKAQgogNwIECBGAeiqm+FSj0V1ZbrrYQeMebq2q2yWmqjNbeUiCtkUHqpzhvNbe0YrJ6KqqpzSUwBEBq2RFEFoqpjAMiiLY1vGHTy4eTs30WTpnKqbAtNeZXW8c+HQ6p5ctufdn4PJ25t+f1XRy+rZCNskRAZBlHTVRkt0LJwIKAVGC62PncnZvViyQIhxUisoK4vHPrpxcvZo35ud0cvK8x1ulTZQjwdPL3N+b1oZVLJwuj85rl07oab67WWi6uzq5LNufqc7VseMQ2BkIIDsjDbRl1U08/TrrlNZSAK5FR7GLn4r9GDRrsjEN2Rrvrqy3aEctNVGe24N6qM+qqnm6tnTy4upjwcXf04F9dXK2b1bgdrBzePu6IHAsjABXObIABl1daSmGwECAGaqqbqqttGbRXTAgQPn3pfnWmq/Nb1wbttD9553znm+p6L6J5nyvgvR+yzWast2ymellK2C9HzOTxt3Uy26L4QqlaRhuDiZFdCuyELYQwadRQGQIOyMK5SvrrRySUiAAAREHjGuUwBAMZBSeMA3RZaUnSABu+ur6T5bxWiqr5p6v2sRVZZW5VzsKRCyNbxj2MPOz23AKbLUcllJW92fLzNe6qUwDCvrq258wZmtvqnZVOYGQVhRAVsiZJXJ4wVy7OHm4dGrJdoIQFYyVsIUzsgBhQyUAN311AKLLWUQ2BkFBhFKmdpE8Ysk8a7IwA/TcricLo9RkrYVbs+Xk7N6tU2TzW2X10aasvH260kistU8iSw2R5XO1Yuhm9T0MvrIAAgUg2QgMo3V1U2WI5wUFBXQp2UZ+Xr2EirStK4rJArBBZQ104cl0is+/Nyq51ef6WtJYulk7fSy+rgVyx8DpfOlfSthpvrt1VT0VS3Z9OmrsJJ5LtKtwNNVFkYY79TxgyjvzZboV8zXtZLLbeUg33efyubq247tDqNcp3Qr7WDmcnb0M9l2ynPiv0b82TbRn52nXVOzfny8/Tr7GHnUW28nXvWTeKga6c9cp02WgA3pqoostA1bIPGMANgIECBAgERSgQIHC6PyLqY487V3KLOlsol9M8p5HPbu35qsGnocrX1KLNfC6PYhZdXH0vL4+G/bzde6uVocigpwYbKAzZRnqnOidpAMZECC0VU1zsqlOBAIgMN2QrZKmyyDKUAMeMddNGK/SkpPGMCAQ6GbGrf1zxfz3ib+n4f0HqeRs6Guqi6urPbbtoz4b9VU5+l5fFzW3UTty3X479NkYbc+bBo11zkBq2yi6WujPZGG/Pkx3acGnWrYbRygBgHbCuudkSjbxjrpzaKqeXs6AAgBMiAGwECBAeMUlIpdPLhwadcHVKcAMVyeMYEAMAyJlHXTRuz5Opjw8zXtzW393n8nnatmG/SSCsosn6XlcHg9HpcfbtWVbLNmtoshyoc7Bpwbc/quhm9bAIATJQA5AAwpX1102WAIIMKiSKtq1CKSStAhHBHFJVwq104ctpZHJpq5/A6OqmePrY+10c3rFZXLHwuj85ql1LoaNFd3awZbYWaK92irsQOXr3EOlkxU2WX11c/Trg4FkYI5MovGOS7RorqzW2+58/5fxPf9OrkUqZ2OodPJi6GbJwej1XjHoZshFyte+xQpna0YLKXTyYmUeTt6AQQgQNdOfJdogQIDKJRZGFU7A2VF4xrnODDIiBdCoDrnZAgAXC6HyHVVdiv7RNl0LvoHmvNet43G+Y+s9/08mb2nC4Hju36fidDsbc9LJ8vX0oSI7IpXIEiEHAKIOyMNtGbm6tkBkikQRy6OXFh0ayJHKAG3jEMgEK5SA3SgKGumjPbcratskAIFLZTnAe04Xmupkw8/TryXaORt6ODTqy231yn0M2TXTn6+Ln8Ho9XFo05rLtNdIHku0QAwDIQQGG7Iw01U9TJgz2XY79Ncpq2rkrZCArAONxK+uvRXTRZZfXUBsli0agCtslAgQHjFZSKVkYaKqMl+muUoMpBspQCCsgQCkyRUSFU52Rhppo3UZOZq22xq1U57I0crZtVrHdNXWrornlz2ZLI8qmzk66PWdHN62AAIigiRyVuAyRSZRSTgQFZZGtJNGo1CKOMIq4K4LKtJQthlaOdll3Z+X5/pa8t2fp5e30cvrAFcsfC6PziqXUtjpuhf28GX0XL5zx6Ni7nK17q5TA8WjSrk6jfVVXOSuQGGPGIbrlPdny311ej5fF8X3vTJKdkYUymQZL0PN4/mup2ujmx5bb652QHjCuU9VOf03L4rxjwuh1OTs6EAMKAHSzY+bq2gIBSIBuA8YBvVTRfXVku0VznXKW7NlotuKVNlkCBBQOLv+QdDK+J0PSX137KJe78953ynY9Ph0dGK33Xn/Ob89DRl4H0fsK5XEkrsZDIeIrkwAZRBhl0K9NNNU5pKSSmUoCSnZCu6Fdc53V1pKRSrlNJSKQbrlMgAIPGFcphspBspK2Re24HmfN9Xtc7Ts9157yuW6/oZsnL2b7q6st1+iurkbOhy9m/1/E87vz5OPt6PN1bWSZRwadeDRrggNkgwDZKARAcDbRlurrzXXqNJSrnODALJtFQA3pqourrIsN+oN9jFzuXr3JKahGwxoogrCjRXVbCuyMMGjWrZABAgBhRADCiCDIBQrcCyNcBWa6cvSy4cd93P06dNWfmar1daSoV48l9CPnWw4Oiv1/Ry+sIKwoIRINxijZKAGMogIAagg0jEk3jUHEEFcbY5sts0lWHU0aNFeDRVz+Lvvy3Zunk7fRy+sgJLHwej84rl07YatlMleu+uXRy6Onl6COWK/SkpI5RhRbCuMUkGwzRVTRbd7Dh+czW3+c6nYpnb1cmDLbfTOyudkDRVTrpz4r9FcrElKBAthXXOzRVR6PmcYo4HS62G/VADCiB1ceDl7NyjjCgMg1bZRIRDJAHUQNJSZJJMDDIECAr+H+h5uPxvc9pZHX6jkc3z3T9Bns2srHjayseMvZcPz/j+36YkynCaudkYlN0oNHNkiF9dQBXLoZ8it4NGtlGqdoCBAeMUlKAjeuqh4xuhXVKeO/SQAMohtJSA7IxAEIHqeRwfR8vjeP7fost1/peVxapzyXaOdp2EO7zuV0suJJS01U66M9U58HpdZ4xzW3ef6XXx36a5SKIEB1FHKBGFABWyl6Tmcbm6tuDRqDcGrZSgQIEDZRmDdNlsSrnZ6Pl8Xz/AEuukpgAwDIiEQyiB7qMtUp5rr1biIwogK2yRBWQA3EiBFdXUG6ZzgQV1dN9dCSKLJsqcl1lcoJKmqeSizLTZhvq4Gqr1u7P60ogEABFBgIEAMDcBowgoBIwirFaDiCKuKuGmrLXKOLRNXXZHL1MnJ3Z+X5frdDBop6mTudHN6wMrlj4PR+c1vp6K79NVqvUyv20au9ztEDl699U5tGMbKUCyMElID0VU6a6bIw1U0ZrbsV+muU+xi52DRrostpstAdLLix36AOudlcpFIgyi8Y9THgsjDLdorlPFfpjasgFF0KmSzW3EIhJSgPGMCBAgRhRAAMo1Tm8VBQIEDn6fjGmq/33nOF5Dt+v811fS3V22RtZWMrAXWRl2cOLJdrzW6SShJXYUWRTIeMdVNJDbnzZbr6Z2MlGFLJdoSUiiAGFBCJWKF1ddM7K5zgaaaboVc7Vs0VVb8+Xk7N6tslAgENVNCSfu/O+VuhXpqo831O1z9WvLboossvrr6WXEjlqqovrq3Z8npOXxufp2Zbr+Vs3+P7Xos1tzJQIEFspoaMcd+muUrIxsjBJS3Z8vc5/L7GLneR7PoOZr31ylAgEAECB2MXN5+nZrpo0VUd3n8vyvX72K/SG4ECMiAwojIjdRly231TsgigNgCIDZIgrIBSgMo6K6mjGucs1t0ACthVTZNWoQuhRnsdNkUlTVLLXLHntwMuLtz+q6Gb1pSjIBRADA5FJkgAZAKi6iVF411zkVBJOqbVxBAqvbRhWUHjn4+3Xorw2Ry4NBVOjJdm6mTtb83rg3XLFwej86R9LZTbZG9Xrsjbtz6unk6DqOHRqVsogEFZpppScil0M2TlbN8DRVVTZYrauXXxc7u8/l83Vs5urbRZayWW28igAYZA0V1X11YrtJAA6j3efy/P9LrK5KBC6Fd9dVM7GSWTpnayiUlcgyAQKAECARACMCgoEDnavjRNiPp97nZuD0fQI9TF7xsZWsplWdPJmxaNkLISikw4myIO2MUcroQuhX6fk8Pz/AEevzdW2N6aqKJ2JKZABAIQCoq5MkG4EBox0V03Qr258vZw83Fo1cXd0qZ2aaqb66mFju04NOv0PM490Kullx8Tf0udp2ZbtCSloqq6mTBrpz9TJh52nZ18XP62PnxFNllFlvh/Qeox3aboVpKVsIK328HLqlZbGu2EM1t2K/S6XJ2b6LLdlGbqZMN9dXK2b6LLUcklMNwAFsK+/zuT1seDj7ej6fk8PJfo8H6H1SuQYG2SUZFAgFLRXVRZaBhhQGQCiBAIAAwpBuyMHjFWykkmkpQGjXXNq1CIK7FRRMpsrosyUTzVWc9o8Tfn9V0MvrCAYrlAeMUkyggUoECCsjXbCvRVQsiqUq5yKrz2zVlUglfWx8rhdDoXQy9bHycN8nWbFeudqavBuz9/dn9bEJLH5/pfOyb+llKLOhDT0ctV0N8O88UySSlAAQGUSDRiQKWa25kr66qbLVZroornOuU9FdHYw8+mdnD6HUIrYQpnYQ10ZtFdWO/RntuAX111ynfXToqpWUst2hWyl2cPN4fQ6l9dSuSSkjkGykQAQCACMiClGRCyYCMgQOVr+Nw3K+ltosZX47+loqnZGdU9LKx4y01RpnfCx0wSZMoJIErIw2U0Y7tKSlA100XV1XQr6WXF57p9iidoAgG2Sgkcg28YwCABlGB3efy+zh5t0K9ufLntu5GzoeX6/dRyYXpeVxPMdbu9jDzezh5uW6/z3S7FNloBWyK+uvRVT6Hm8e+upktufLbCGPRpwaNWDTr7WDmVTswaNfmOt2wMgUtFdNkYYb9TCKAAbAEWqmm6FWO/SjlAIQN2fJ2+fy+Lv6ne53JpnZytu/m6dpCuUklJknjFJSKTpQSuTxjsozMo4dGsNgFbIigMKIyJQIF9dRSJHLdoVskSkVAMrkg1CFsM1co5rY5raKbMdU+e0eLvz+p6WX1gBWyJXJlEoDCgNq28YsosoVTm8a7oVaKqcd9zxqtjTmttpmVTOtj5eHRbktlspwlZ9VWCyGLjbredqhqp9F0M3rIxHj4HS+dbKL65dBlpvrsrlrvr266euyjdXWrcbKSSldXXZGGyjNzNe6uU2UQ3EBt1HRVTku0QLIwaMUlJJT358mHRrthWrdsIZ7bVbKL66qbLIMBfXUkpVymGaaqddGflbN9sYNGKSkkpMkrZQGRBCBGREFBwUGrIECBxOh8gzWdRjftzz6GYw6Oi8bWV7qzqY8vXxY/OdTuq7WUiSUk6ZTI4ODKSuQbZIpQYZfXVTOyDVsgo2I2whXKatwA28YwCK+urtYOZ2sHNSUsl2i6FWey7yvY7wcgH03yniPFd70zxj1MmDm6tvD6HVgAIECBA358lsIJKW7PlVvPbdAx3ae1h5nI2dDoZsnouZxvBei9YGw2rbJEURAgEAEAM35spFg0a4EDZRm+k+W8X0suPRXT899L67ynY9ArZBlFHIMgylADCiArbJMk8YLKYANgFbgOlBAcBWERQRX11UWWqwpETRrqnJJEIq4Wxz0zVUqs12euWTPbgZcbbn9T0svrCkrYbDbKLRStslAVuMeMIkGLJxR6eXAknTORULoUZbZ1TfVx8vm676LHFRluA6Ojl5OW6rHfQ8fTdLL6wBXLHx93zWyO5XuhqhqthZfXu109W2ECCOUBW3UWitdOeuc6pTrnMoDcBW7q6klOuUmSgbKMySnmttthDqZMPWx4PI9n0CykyVtdWmulkqpzyXaXjDVTRluvSUwG/Nk3UZeLu6WuqjTTQG8GjXVOyCWUgBCIjCkUg2UikGwyBAguB0fklFnSK6Gmq8mjr4qM9m3VUdHLSynxt3XSVxUnTKmRxMkmRBgdkYq5QcEGygisjGyFea29WyBSIX100WWq2rkUoDJQOvi50b9BzOOQx36XjHXRm5uvdxN/Sw6NXquPwdFdXk+x3/AEnL43bwcz576X14bgAIAY0V1seDnadZCuU2UbYw6mTDnst01U8Tf09VNG/Pk6mTD5Tr96m22IjIghAAQTpAdcpMLfmyFG2jNzNe32PD85TZZ1MeH1nG8/5Ps+g3Z8t1dXz303sOH0OmUQIECBAVshBQbJFIMVsoIAIECBAgK3GoiyMElIpKwhbCqmc1ahEOKtB1vHPlujRPLXPJntwvHib83qehm9aGFAYBskrYbgPGKycQSMABGio782OEYQ6GbHz9N7KvLdPtYOTx92uuUElUCrPbHnaZaquXTPJbD0u/P60NxYOfq+YZretVLo6K7dVMleq2G/dR1K5SKIECA6jfXVpqp5+jVbGFUrElKBAZJJMogQIGmqm6FWa26DgdvBy/PdLsK2yXpeVxObr21ynRZbdCuyENdOfib+oGK30MuTRXTyNvRDbxjBWRjXKRADVuBAgMkGAIDxi6iRAUCB5zqfJ0fQrl0rY6rYaOtjz4r+iysurkktDKRVhJtFsSBIEnQyASIFCuTIgBjRTJd7n8muU8d+jFfq1U0U2WK5FK6Fea25HINslAeMd+fJntt9LyuLfXVRZayXP062jEN8nZ0NtGXRVVluv6GfJROwox36aLLLoV0WWkNufLytm/p5MMHRZbnttaK358nQzZOJv6fP061cu3g5eHRrthXkv0VSnADkrbJKAbZKBXKd9dVc5FDKN9dVsIdvBy/oXmvIq38m9l9A7WHmVylwuh1bIwz2XVTsDLIRWTA4AbKUCARQAOAQgAIECMAAIyA0UrYYUiKyFdFlkIwgGlcVdauqPPltposyZrcV9fB3Z/VdHN6wDgEAAYBxkQyUEG4CsKUEGtlGXv83j8jdupnO6GeiyW/Nh6+Lk+f6XTz2qFWK+W/PzIZc9lHF32dTH2dVXsYO2HM8p2PBB9LVTbZHRXLayu01bNufqpORSZAAMthDZRmpst000UWW479MCBZGCSnAVkGUnjG2NdM7Ckk5xF9dXVx4ORt6GunP1sfPz2X5rrsl2i2FYGA1VU5rbs9t3puVxPLdbuVzmUQFk2ioAb1U589lwbgQCKyMa5MoVsNlRgQUDlbPjuHR2AdC2OqyN/f5uPj7uu8bWVrKbxmVNlIkipQlCbJEZTg7YQgVzstrrdRz2W9XHh5ezdvzZKLLUlPXTn5+jW6iUBiSmAgXQqA7Iw6+Ln3QqgZrb+pkw6qaOB0uthv1JKQbzW3lRg3jG+umyMLIx5mraG4BFqpo6GbJXKSylpqp4m/po5baM3f53I8r1+9fXV1MmHr4ufXKfA6XW52nZpqpdQxX6YEAogQCLXRnxaNJRGRAb1058lt/RzY8t2j0vK4nK2b+Zr3I5QNFdNFltkYKMhXKcCAQAECkkmyAECMiIBABADCkGQIAbKj0M2Tq4+f5vqdiuRHECqmoVK4XQxYdEKLMmezA8eJvz+p6OX1sCMKIAAgAjDFBuBGgEEBQIR2UZd+fDiv0dHNgz2zthn0VZePt15L7M1qosV9eH2HE8noq5vie/1+ti7HqeT3ONt6PM1rz/S+d0WdWqfQthosjc8btFe3Zn6sZEECkRdLLjZRqnYyjfXVxd3TgFJhI5QIEApa6qMd1+iursYed57pdchuz5fo3mPG+H7/qORt6FU7CCtq3ZGAHqqourqZKBtozcTf06pzKIAYUQIHRzY6Z2XQrZRyW6GEUqpypnYG4ACCgQMl3xflbO2kupZHR08kdNU8d/QJcVbfWB3FTKkHOyLKbIBMOTI3Z8vQzZa5TZKyMMOjWreK/SrlpqouhXAx3aFlINgLYQSUwECyMGUXjGDIkcklK6FajostgRgGGFEBlF1HVRRjv0rJqMhorpVy9x5/wAt5Ls+g6uTDZGHO07OVs3gOpkw479Oa2/u87k6qqNVNFFt3nen181uj2PD83x93S4u7pEIAB4x6eXDytm9WwMigFEFrpowadbwh0c2P23B8z869P7FXJHLr4+fuz5OF0OrXKYAhAgQIDJQSSkUQCAAhAAQIFcpETKMHBQCK2Fe7Pk6eTB5zqdeiyakVlEFaygjopnmotx0Tww43Rzeo6OX1hFAUcYUQAEbKUAMAEUFBAUFCN8KKLJ9zn8jVTlwaL8Gm5XV18XK890+lz9Niuju87g+k5fmPM9bay9Psz+uYWO6nidD5vju7KvdbC+2N1sLdFW3XT1oBFAKHjDqZcPRy4+F0Oq8YOlhv002WtGLCRyjIhktlGZ1Hn6dYHpqoz23lLrY+eUu9zuV4jv+nVtkiBUVcmSuhUrauTKNFluqmiuc6Z2gFbvhXrozq3fCqqVlM7HUd2fLztOzPbcrUGyiG4IBAgs13xemfRqn1NlFnsOJxs1vR811fRZ7dhVlsJQsKsZThJk4ShK2C358iOymy1XJXNJSA+3g5nI29BJTKXSy4r66tNVFcp4tGrDo1FJW92fLiv1WRhBVysWTga6aM9lqtgayZQrcCAG2jENkNFVNkYWRhjv0q3BgIBEUoPsYubdXXh0asd+mCthGyNfXxc++urgdLrUzs7GHnY79HM1btFdOqqnm6trRjfCq6uvBo1JKQbeMYEAgA2UZsl+hW2S9ZxuB5Psd8htoy9rBzfLdfukVsK89l0AiVyeMSDxhXKZBW1beMSACBAgBiSkUmUSiMgQRjGiyxiNkKmVSspsauCSrR0pLDRZnyXY4cboZvUdTH6qBZGBCmdhBG2SgBitslBQIIMglESLKFUgNQr9FzOJCnFfby9mnDokrrBR28HBqnn1U8hl6d4+2psspnl831fnt9ezTVdrpng0dR43Ww39bHu3Z83O06w2rlBdrBzboVeb6naIXV1rJo5QGSRthPGMBW1cmUVcmSgr66wzv83k9nDzfAek9bXKZS100JJ1TsgwHTy4udp2JJgYb35sjJYtGlHLqZMNU7AGa27TXV0smHXTn850+zVOyMSTAihlGBBQIGDT8aos6SvpdnDVmt6Oa3fbCzdnhztXStg7ItHeykykRwnrop01VYdGpJWQcHBwAPu8/l479HP07Lq6roV+g5vI8z1e3RZbZGHTy4qZ2I5Zbr1coCtskQKWmqjNbekmUQIEZEQABBW4Gmqmmy2JOo6K6qpTostIANVOe2McOjUVHXTn9dxfP8/TrgaaqeF0OpTZbhv0pKZF6LmcfgdHrVznvzZPQc3kd3ncrj7uj5zqdrnadlcpsoukADGRAiW2jLg06yi2FdFlrJdbHz+Vr3rJgZE8UGK5BjRUY0YrKURADCgMKIBABAVhApBhRADV1dWa66CshVuz4tVWXHddi0W5rWkqaZ5Sc/n6cpXF6eT1G/P61oxjdkIVTnAVyDIBQrbKIYULIrlIqEFCKtOq0aSShDtYOR73zvj/nnpvVcLobUdfTy8mqdPO1Hd53mqp+tZe2eMa5YuLv+b1T6l0NPWxVYdHT10uyPQ1U9bVTRg0a0k2Rorp1U0X11czXtzW331UhumdiylAeMWUVcgwoDNNVN1deW6/XTnRyIFLtYeZydnQ5urbdCvfmyc3XtRygFKMVuBAKOhmx6aqc9lobpnYwbM+XoZ8l9dXH29Hl7N+3Pm5mvayjZCqqc4NlF1ABBQOH0PksNua3r2w0stNsLrI297nc/TUcHo9sqcLNlFNsTpZcuK/ZsooyXao3zdO10gSIFECBsozbaMyylktv9BzuTwOj1rIww6NRS0VU479JBW1beMQEAsMVspzZ7LklOCdKqUg3BlKBAgaK6c9l0CAAIBjIKjpqpvrq7/O5Plex3qJ2+44Hl/P9Lr5bb+nlw83VtrlNW89t4Do5sWO7TRZb3efy6pzKWa2+6FVM7cOjTBhhRGAINlHRVTdCsoDMV+nZRnzW31TmQVsAQKRSDcBW3UVcikRAYbZKBAAQIJW4BFBwGUdFVKszW2hgaKhZGkEYVZrSudVM89csGW7Huz+c20er10ewSUlcklKyEGUVlIDgBkApBuCVkFBQiGQi8alapm1lDoZuf1sXL5mq/pZubnsjwejuw6F0M3JBzw/Vbs/rQ3tz8fj7vmuyjQHu4u/ulXvG/RVt3UdUArbJMkGRCykyjZCFsYVSmG4FcpsogYbSUikG7IwAyK2Feey5kmUehmyd3n8rib+nku0Z7bmitVVFM7KLLYBBoxuhVorqVu6utZPHdpy3XvGOqmgMqnZsozWwhh0amUcl+ho1vGNc5EYIgIEDjb/kdM+ir6VsNVkb3jdbG3ZRCuWjdnr356dVNe/PT47t+lsidfFh5G3pQkCUbKcADZEAMKXtuD5ny3X7uiurPZdh0aSgMgaqaFcq5zRySUmSgQAEAiKCIodRgVSmQiUbgRLo5seS6+my6BVKbqECyEdlObn6dhStjDoZsbJer43n/Ldfvcjb0NVNFkYYNOvp5MNcp78+Xdny8PodToZseqmjyfZ9BdXVTZZBlKyMElJW2QAgBuCZAAi000XQr52rY8UrZAArbJQIECAUiJW7oQqnOBAaKjANWwwpQIEBWyKyEOtj5/H3dEArQYrhBK4BwSVZWa+vl8rYJLn783m92f1Oyj2GS/QjkrcAhfXU0Y1zmjlGAIEZFEMRskYIEA08arI07aMPQzc/i793P03NGjfn5vI26bYYK5ZoYNVXoehm9a8Y8zXHjbvm1cuoy1WR0WwusjdfVt209WIDIDxStkQHAeMboVVTsRyDZApBsAGwBEyQHpqppssrlIoDCHQy4/ScvjcPodTDo1dXHz89l/J29CCaMb4VwKJ2djFzklPkbehXKbRjAYTRSykVHVVRoqpsjDnadumrPz9OhWyO2FaSIKBB8Pf8lps6SS6dsNFsNDK/oZq1eiuWllZCzRWvRczlcHodgOzpZcnM1dAjA42U4BRAgyGqnP6Dm8jgdHrJKSSnmtusjFWQLIRZR0V1ZLtCtwIECArbJMoq5QIEB1EDARjJPGDxiG6J2rKRSuhWUoFFlqyYBoohrpz+24PmIPzHW7nG3dLRVTbGutyrnYkpaaqKpT9xwPMcjb0PPdLsZ7bYBQQDGjF4xVyWTiFkyCOTKMCArlbCsgBq3AgQCEABfXVVOwMKCJoxZIiA3jCuc6Z2wAyAUmSVsiKRUYxGw0rIRVxDijgsq0dIeFlz0lzstvM1U+t6Gf1sQQRtknjBktFdKSnltvgBkEG4kSICEQ1CIIrJMqqpK6GcOumce9zuJh0SwaJVyqw6IJLDvz9/oZvWwK5Y+B0vnKvpWR1WQvsjfZG3RVu20dUAG766ap2lIMgykjcbZRA4BSgRuAAgENVOfRVSkpYNOsDAEIGqqj0XL41U7Obr287TsurrostWT6OXHRZbjv0baM3Vx4ONu6Wa24oZRKQbVyDINlGyEL66rIx52rWrqJEo6GbGkpQIiD871PleW7q1vpXQ1XQtsjfC+yFhLAXOpvF9nDhpnesrUdjJ57LyODAw5MkUFJ1HtYeZqpo4XQ6t9dXN1bQBCAGX11lKmyyyMUcgyBZCDC2UZwFM7GFiu0rJ3V1slXObxjRZbBQIO6upJTVtW2SDIBRAVsgUroVel5XFxaNV9dWey3Do1ZrbmSpnYrlfXV6rkcHBo18Lo9SmdpSgQCAAAwXQqz2WwIDIVhRAIlbRydRiA3GNFEIEDTVQyjnsugPGKSlASUoGyjPnttshCiy1XJZMpAZIkAEQRBoARK0rUIhwVwrlFJZ9NXLK5+O/Liv5/Xxej6eT1SSnVOZS1VUZbb9NdOqmjn6ddFlqtwCkAjUEBQTKEI1yFkoQBWHXVMqlCyOaqcKp1wyo8me3N0svb6OX1hCqWPgdL5yDpWx1WRveN1kb9FW3XR1YDpPGFU7Clrqz0ztpnZAuhXRZaAZKCIwEZERlsK+3z+ZztWxXKqU8t15EUBkDTTTRbcAgXQqvrrzW3baMyt7KM27Pm5Wzfg060bKElIMgFAZAaKsjFlHpZcXH3dCqVMcQG2jPuz5SSiCPxPe+dZremy3316NdM65a3VrRuZWMrGU9VMEldCcJFSuhEEllODVyA3Uexh5+qqjHdp7WHmVTs4XQ6mmqnmatqSnAVsi100Y7tF0K92fLZGFM7KLLYPRXSUubr2gLq691GbnadatwbJOoo2ULJ3V1pKVFlsApEUCAUQABCBZGHWx8/n6dlE7SK2EN2fJku0Z7bg308mG2EOJv6aSkrdsIPGKycGAgBmiqrPZbGFBABAZRDkASUikyQYjlZGIbAMlpqopnb3efyubq2JKbKOO/UAKTJEVM7L66klJXKCDCiArbJRpQKUcYRrkQirgrisq0dNcsbrnWR5QOL6jkdjrY/Ucnb0Mtt+e27p5MNFlvL17lctdOfLderZRGgBEBAFkK1ZGoEVarkg4AgkoJKFcoLKkrNXKiuWamePp5e10cvrYFU8nC6HzhX0rY6rI3vG+2Ft0N2ujrMlAvrpz23FCt2wrqnZZGEGkmrkyi8UknAKABDXTmSU8l2hoxsjBkqp2QSSm0YulbCqD1VUdTHg5ezfRZa8YX11VTs62Ln+c6nauhXbCu+umqdma2+mdgAhAgQCLs4ebpqz0WZ3jRB5LtHL19FlMjg+B0flVsNQfSZalewrTZG0ljxseM76xJXspFSDnCTJ3V131wyXaehmy311BywaNZFoqpvrr9fxfO8bd0qpz4XQ6ua2+BAItdOfVTRdCvTTRytm8N4b9QbdRshCiy2AyikpI5soukAIAL66rYwz2W1ymGQCiAGFEAMgRDBA2UZs9ltM7FlJkmUddGfoZshFA4m/po5EFbIihkmUVbSUr66iimy1lEDSTKGSSTgykrcB0lZAKIKD3UZQGqmimyzFfq1VUX11cvXuKTJJKUBopJO+uqmdgbVtkrIwrlJJSZRgKxlFWlaDijiHWrgkqKp5aZ5LI8grjev4vS9Hy+/wArZvxX6a5ztrr6ObH5nq9yiy0i2UZsd+kDDStsogCRDRUa5CtK1CuOCkFlBHWkqroZL68XI231yzJLD1cfa6GX1gbpnk4XR+cJLp2Q1XQveN+qp3Q3aqOvG1YUoMhXKVkYAZEBlKucmiiEBWyKItjDXRnwadcAgrNVNGW68ogPGIbgK2QgAIECBpqo20ZuTs6ECAQshXqqosjDPZdASUilpqp01U7aMvm+p1+9zvLcbdsZRVvLdusjcVKDwafkHH296HReOq6F5V90LCXNGd9cnUldxUroKuVqux4hH6jkcPz3T7NcrGSVyZKyML66tFVWHRq01UdPLi7vO5XjO76THfpaMbIxqnPRXT3edy+Xs3c7TsDbxjTOwhbCuqU7IxdQz2XEQGyStskQAPGAbrlOBG1BkmSIQIACBAIQVkY1ykjkyUApWRh08uKqU8WjSBq2spFKDVsgAuhVvz5UcsOjUG7IwpnZBlRrlOAyUAMgRBCBAgXQrgUzsIiiyNemqnDfqtjABTZZBxIgGaKqs9tgGyVkYBlFlrKJSgQiSCirkLJB1q6qpVVWZKZ5qJ862PE62L0nf53orYV6K6oLJdo2UZ+Rt6GHRqVu6FemqnDfpDIBSDQE6hVOUIgirSyjFW6oeNBVGS+dM4aqefg0yz2UVTx9PJ2ujm9ZAR4+D0vnNUupZHVZHRdXZornbDfso60CAGQGQoMK6utZMouhVRO1JTuhUBpKV9dSt3QrpnbluvKUBW766qp2EAF9dVNlgHAIAIAbKREB2xrrlNWyiArZCCiHSKW2jNtoy311Yr9PH3baZ8TFojZCGynO0dt9etlMkuD0flVM+lXLputbR0sr7YWOrLIzKtKm6kymVKEg5vEZHRy5MWjXXKwpQbJXV1xmW29kg20Y+x4nnPZ8LzfF39LxHf8AUZ7bcd2ns4ebg069FVOW2+qyxW7YQpnZZGCSnsozZbr0cowBEECEAAUmSIlbDYGRFKuU2SuhXRZbAKUB1FWyiyMKp2ACFsKt+bLy9m4DgOo3V1pJ3QhnstrlOAkpdbHz8GjWkpqy6uu2MM9lwbRsgAZKMiIAYBskQAFINkUQwr6qWE0Y1Tsz23I5EQGwrYVgKZ23101zmjkRQTKMErcIQirVkaapqmaqnTVPNnsxU2YiuL08np+tj9Q8Y9DNj3Z8sGyirea2/m6tuS7QGX11ZrbgyCglYyikkBQiriStXGFdU1XKoOtHVsp59kMPF36M9mTp5O308vqoFcsnnun87eO6+vQ8dDGlo3X17dtHVgFAbgoggUoCyYGyUCB0cuKiy7LdeQAoNkg2ADZSsjBHINwIBAAQgBgCBAKUHdCq6uvHfpIQEbIoi2MElLp5MWmqjNbfmtuuhVRMy3eU5+nOGdHLk6Gfqa6OkysJLwvoPn+iu/Hd2SbbI3WwteN9kZvG0EyXPFkkymU4SeLVy1VU1ysSU4Noq6FdNlsCyEFlIDDNlGb3Hn/LkOVs3+e6XXeMXUeTs6EBktFdNUp02W7KMzxjbGCt47tFU7FbZKAGFAYUEQHZGFcpxkQQgI3bCGiukpU2W1TmjlfXU8YrKTxjTZYUJJlJ4xpssZACBAZRDbxjbCtks1t2/PlRyx36Kp2PGMApRsBAgQIAYUQAwpQZCCeMapzZLRVTdCuuUylXOdUpxtJSiFb01UpKUEG0lIBAIgEErLYUq0SNsM+e15rGkqVeOmzJhvysuJ0c3qOlk9XA7WHm6qc/O1bc1t2S68ouhVfXXkvvaK0V0Y7tAbuhSyhTOaSauKsVxJWjSyhXKCusOuqdSlPSy8hJZaZ5Loek1U+xgK8PA6XzqqfUvr0WR0vG543aKtu2jqwCACARQcEUK2GFEAhuz5M1t9FlhRADGQ8YAElKyMUcg3ASUmSKUAgADCiArbJEALqZMXL17oBAMiIBFrozuo5rb6Z2MkGQq5WzyrR831MmDlbOj1Mno9lHUdWRPy/X+ZXQ047uzDc8b74Wsr7YNXe8bCTaMySeMiSaIyGT01VZLtIcoDxStwZS1058WjUySN78+X1PI4PP066p2ed6XYLLqqulmx8nZ0A2AZR01UwNlGbma93e53K4u/pVTsAK5EAECBAgQCJWygMKCECAoFkRAsjApJKcAigK2rkUiBSZJJSABsAUiBFpqp6OXHnttA8d+mA8YVznEVzsARkRAgLJlIgjk8YhgG6VsK6pzthDVTng89lrqOiunHdpdRz2WhspPGJEyjmtug4IDJGBBFRZVwgyr01ZsWi3LbKuVNNmXPZkosxw4vSy+n6OX1kCBuz5c9t1U5lJXIN2QruhWRMkrKpzUKpyDARgg4pJFVrKKOCuAdVcoUzgTNvz8vm6jTVyuti7F0Paa6M+O+nyvY8CkundXoJqeN90Lb6tu2jqwUAjgK2yiBxkRAgEGUb6qct2gAQgEIAAi6GbHRZdppo5mvdBK5MkrbJQIECMiCKyEKp2QL66klJJTVkAoIrYQaMaLLQ2GFAZCNM85K7IV9TJiz23lSJIj830/l+W7qPHcHtthpeNtsbGjcS1ozYm0ZsmSbRlfCFUrWT1VUI7KLLg3ABJhRAbAPGJD0fL4vA6XW6+Ln5LtHN1bYDJdnDzebq2Zrr4ghZCGe23bRm0VU7Kc3I2dGqdgDRCrPZarauTxjAgQHjEMVyDCgMgEFGyUAMKIDqIHXKVsYI5QAyAUOolKmdjJACBAMMVfCrPbdEK3AsjBkrq6s9t6twIBABAgBsAUo3AKRSDdsK7IxrlKucwO6Fe3PlostqnZTZbdXUyiGVymUrYwyXXwCkrLIweNZIgjCDKuqcc1sqbKqp5s1uXNZgj5HRy+n6Ob1oCBsoz0WWBtW3itFdO3PmotsxX6ehmxwALDo00zmsgqIaVxBFXAOKuNc4gpV1XV5Olm5fE36cl1avB08vb6GX1sC6HM4+35pi0dplsZaStFkbdNW3bn6kGQgAIEAigQaNkWmqlHKAkpwA2AgEAADXTnIdvBzPP9Lr0zsSUmUQMiKIBCBAgbKM2ey6ucyo2RjVOwMKRSVytjCuUgOBAgQFYRRNhXV1pKpXEhB8Do/KqbOlF0bI6rY3tG51a8bnU4rWU7IuE2Ut2ejLdpBNkAl0suTFfprnZBq5MowCjTVR28HMZLkbehg0a+vi53P07KLLYAZbCGmqnDfpIQLIwgaqaMOjVA358iuWa26BXKcANwUADgMk8Y1zkUEFYUQFbgBuA8YwAwogQCIDgEIECyFYbrlMgoEIyIdRqlNkgwoIFKArZEBwIEBWw20YxkBXINtGJEUK26iUlcg2A0V1aK6Slg0a7Y16Kqct15SrlPRXTqpz5LtGe20ieELI1hxthQknVMzWNimiyGezNluzZrcVkeJuzep6Ob1pSZK6FVM7WUUlLdnyo52xrx3aEnMCgbs+TJdeyhqqz4b9CSSSIQAlcFlBXWjrhT0svM5G3Rmtrrnmhg6eTt7s/rShJY+H0Pm/oObTjv6uS7pJLYVfqp2b8/TgQagQVtkroV1TmBhvRVTZGGK/TAdRaKWUgEAhARvdRlUdVlikq5SDcCAGykyRCBAgANdOcN5bb4ECCeMUlOAQgoOBAgAIBE0VfCrLbekoBxAEONu+So+hXLpWx1WwveNzxuZWOrWU3jMqYdl0FFMOUJWwQcroQeMc9l1crGFEOo2QhXKfTy4Q5YNGquU7IxSTgQcCJd/ncl4w6GfLA5mrbku0cjb0CEEUXQqvrrrlJXKBRZYGyiAG7IV1znpqpaMUlOmdlkYVTsgBsARQAMpMAYoyBSSUnjGAGFDxirYbrlOyMIBFEJKREBlJgZRSUoiBAgQAyIIQIEAMKTxjTOx0mSgtFdVM7K5TgQHUejlxVTsostrlMpVzmAgQREBsowSSAJ41LIqmI4JKtJU1yy57cuW3G64nQy+n6WX1hEUdDNjxX6UlMpMo2xgUsl2gMKRI3V1soKwkbYU4NGlJAcUcQ4pKDxopsTRzX15efplRZXXPKpi6mTtdDP6yIrli4u/5tXLqOtd9dtsLyr7obtdPWZKDAQFbgXQrostsjEB3ufyuF0OpBwCoslVOcGUmSeMIGmqnJdoIgOucoDRSybxREBhuJMIpI5RlkIJKayZRBAYYyIESZJWw3AIAL4VdDLjwaNee25ZRUjBQOTt+R1y6Ncuk61stN9U2V7FjxseNjqZUoTsgJK0kipMhktVNPe53L4HS6+iqrXTRuz5MWjVztOzVTRA52rYkpFAANlRZCSlqqo9x5/wAv1MmDLdo6WTF5Ht+h8h2fQ1zk8UGMgAQthX0cuLDo1Zrb2SDAN1FHKAQgtlGe2FfXxc/l693O1bFcqpzsjEBAgQA3BQICuTxjADIMBZGCSkBulAKjXKZEUQIDJBuBAKStwCBSSUtNVFU7Fclbgb82TLdfTOxkmUVcoDJaqs8QspUWWFFU5q5FRsjFJSKUCBXKUY8YRRYjCKSAJ405rXXOAKKp5aLMmW7EVxull9P0cvrIHSy4r66uRt6CuUCyMFbVyDADJPGBE8a6bJ9zn8plDla9kI1zFcQ46KsnJ2a9tGHBpnbDLz9M6pU1Tyh4unk7W6j1wGksXD3/ADhZdKyGq+F23OOrmj0d+fp57LtVNFc5WRijkkpaKqVlLPZbdXWkpaK6s9t1UpwCACBGNGNkYAd0K6LLQ2jYbKHjFW4woABtkoABZSKTxhXKbCKSuRCAAgEHjB4xSU65Nkr66tNVOK/TVOyAriHGBA4u/wCSUz6ROg8dTLRoqsKvsjNlbZGVkZWwAWsmSVkEkrYOuVnVx4fYcXz3j+36O+uumdnQzZOfp19jDzklLNbfxN/TotuAFIgyj6XlcVW9NVPoeZx/OdTs9LLipnZZGPE6HT4m7p1TsIAIABgAOo782TLdogqLLQMgAgEIG3PldRosteMNFVWa27HfpDGSgRAbSUmSKUAMgQIEAoIg2AiL4V0TsjIBRAKSyZRAgQIECAGFGqmjLdfXObwh3+dyuZr24r9LJEUGAgWRhdCuqVlU5wFbIilBwUZEQAyARKKNFRhBJAIVygkoJKmuWbPZjz24ocXo5vUdHL6wosjBkqp2AIBSjFcikyiremrPluvgrYVQiyhqpz1zM1s2jXXOPoOZxPIdvuh1dXHyeNu2VTrqnRVLMssPTydvfm9arlDn8Po/OHjvV7tud+p5HLz27ubq9AV3WSgAGACdJWyhW2UdFdWa2+6umuU0lMhAaMYxW9+fLnstz2XFKNlKCZJWw2BwIEBkg2ADGSaKDdkawNJSgwxWyggA3Z8vQzY4yI01U+f6XXrnO6uoDqskCICC4PS+T1y6EOjfXo0V2FXg1MrWVrKbxlorjVO94sFnbwc3FfryX6g5KS11U0TujANorTVRXOyuUtlOfFfqAQCADoZsfd5/Kvrqg+hmx6Kqct2jhdDqcfd0tufLg068t2iArIBQQAQA3tz5dVVHK17w3AAEIEDfnyYNGroZsmS/TXKe/Nj0V1crXuVyDcAgrINklYUQFbIiiBAgQCJW9dGfPbcrlAIoFcpvGMCBAgMo1ymQVuyMYlXOe7Pl9Jy+Lwej1sGjXADYAhAAEQGQDAEApQClGAYYAjIkGQQIkgrQK1kklWjpqnmzW5KLMJOJ0Mvqell9ZAdRgI5QCAB4wqnZqpo0V057LaLLBJgRUdFdGa2xJN41dbHzOF0OkCG2jCko87TdspwYNE6bK65U1SzB4Onk7nUyepA654uJv+b5rew619XHV3edj4u/tpLq7KOqUQA2UgyABwIDJMkG1YUoMhdXTbCFijltvDKpWK2yUAigQLYVq5VTsZIBAgESOTJMowdsK9VWfPZdTO0MDkAgWRhrpz6aqdVNGqrOkp+a6narnMpaKqc9lxIhxgQOVs+PZberdDbpquthdZG7Ff0SW2QndCVkXXLRCZUmT01VpKxXMpvGNc7ImspMkyV9VSylTOzXTny3aFBgAEL66e3z+Zy9m7dny9bFz6bLAPk7ehyte+2MOzh5vI29CmdsBJMogQICtkOrj5+DRrqnYrauTqJSIWwqqnboqp1058OjTrpz9HLkxaNPK174AY0VGAZAArd0KwAbA2SDZEjlADbRjGWQgG9VNGHRqWTeKgQFYUbs+TLdoqnODZIqOqmjpZsemqjDfq5mvcASUlcoECAGEIgMKIEZEoBAAGButuyMCICDStEgrirgrrrlTTZlzW5s9mFlxujm9P08nqyoq3BwIEAiA3jFZMBqqoy23BiNkjsoy02Tz2TVrdnxdHNgwaL9+fBuz4eZrvzWvi79eeyNM6KbKIuf2cXX6OX1fawc1JYvn/pPJVy6fVyR2USy29CuevRVu20dWBBAZAAUllKCgFEABGFEApWRhpqpostIstt7JBt4wA4wAyEbDbCUbJQIEBJSsjCyEHUWS35sma6/FfpVyABtW3jHXTn6ObHroz8DpdYDuhVjv0311WQhku0BgagoHK1/HQ98OgTYDZdCwl8L7YSZTKsBYScJvF3VxujGuVl9deS7TBwauTJFKD358lE7XUct2gAQAWxhroz8/TqVyIrIQrnMogdjFztVNHWx8+qU+Xs3crXvw6NTxjADZApENdOZSWe20N1ym8YwLIwgVynGbM+bLfoVvoZcbJc/TrKSSkG2QUmUWUbq67YwyXXpKbxiraSk8Y2RgjkspQFburrz2W66aMt14YUQCADVVQo6LbQN4xDatskAuhXpqoz2XU2WBuDRtkrIwrlOBAgQIAZBFBBWyoq5RqJRgFCKtBxBBXBZV1yqpnlosx0WYicbp5PS9PJ6u+uqiy1JTgKxoqNgCKAG9dGZlHDo0gCRAunl5/I27yqwRWS3Z8PRy8/Pa8GizrY+V5Tsddlly3Rqlmrni7GHsbaPXtGJOf53p/PNVWrXTb0Myhqrlqos7FsO0yIECBAeMElMBAgQIBSDaSkyiUFLTVRTZbTOxkoEB4wVyjANJSKTJK2RQYBkgDAAIijfnx1SspstpnZAALKVkYXV1311VznnsuDOrjwZLtGW6+IjAAFGQOLu+Q0WdJZdK2Gm2F+qqQNELirXjNlO2LV2QnfWt+bMkrMl2p0q5WQZRAg4AZbCCSl0suLm6dobgWRh6HmcfzXV7UGGAeunPVOy2FbJU2Wez4Xm/E9706t6aqd+fJy9e6qdgBkoBCA8YMlVOZQrZSdRvrqosurlKARa6aMd2iyMLYV2RhnsurnMoDZSgFKM01UXV1pKRSw6NVkYMl1MmHLbfh0aklIoKispX1VZbryIoDcC2FfSy4stt+e26uU7IwrlOAyjvzZMWjUrYcoACCeKIrq68d+hkg3BQCAApQCAZEBgCArA0VGOCijhXKAdaOmmeTPbnpswA4vQzep6eT1cDXTnA89tytwIEAgVEBdGu+qmqc8l1xEkjZRmqm6ZyrkaashK8l1m7Pz9ufDVOHH3aoZ89ldscGezLZH0vSy+sVivFyNvzTLd2bYaOtjqR7M1u7qZLNtHVx3aYECAUiAbgKBCBAIQFZAgQOllx83VsA2SgiDRWmqjJdoVshAIAIxRxjRQYUFINkW7PlonbRbbAA4EBkrIwKSybxjA6GbJdCvPZbztOymywBBQIHF3/Iap9BH0rFraOjZQE0B3tGdsbCplWbKKSNJXPE6uPFku083XuaIRlECAGylBhnQzZMGjWQKXp+Tw+H0Oniv1BsBqqo9Jy+Nh0auD0OrADPQc3k4r9PN1bVbgbaM10K+bq2MgBAAMCsuhWUqpWOotGJCqcw5ALoV6aqFb1U0VTsuhXzNW2qc4MgrIBQQiTKMb6WTFVOyuUoFFtrxirdM7SkG3jG+FWW29JSgEUHEtdOcpJKdc5gFbZIN+g5vI4m/qWRhoqp6mTDVOfN1bbYQossostpnakpPGMAgADClAIQAEBWRiMJEqIIhoOCuCOuudKvHluz0zwK+P0c3qOlk9WyjfXU8Y6K6uXr3QIECBZGDKN9dVcpdTJz+Nu6NU5gW/Pix33qzpZedroyYtFtUzpZOb5jr9b2/n/JeK73e7eDi+c6m/m6iHP7nP6vYxenw6NXbwed8T3vFY7uy61bs7uhbTPbqp19jFtx3aa5zAX11dXJg5+jZluvgQCECBAUCAbDGitVVGW29lEgrcHZCuyMM9l1kYVTsgQICSkyRSgQIwpBsxWmummdgbgVykUQCACBAgaqc/qOTw+1g5me27xvc9JztWyuUoACBxt/yCizow6N1em6FumqVUtbFrRtsjMljRk6fd5/OyXa9VNOO/VRZfVO0pq5MkUQIO+umi25R7s+XHfpgdrBzM9t3O07I28YVynbGHu/O+U8v1+7x9vRgXQrKXs+H5ryXZ9Div0wIFsa9NNOS/RXKUCIsUQFM7HUd2fN08mHi7+nXKQGG3UXjGqdkE8Y9fFz6bLOXr3BuIDFcikRMiAUilADatkRQrbxhfCvNbcB6aqLYQz23VSmG4ECARXV1q3XOauRSZIiKV9dUCBTZbVKcBW2SSUtVNGO/TbGuBAiAyCKIEAMKQYGFCNEgBBoOCuCOtJVVTy02YstuOHG6Ob0/Ux+rdRqlNlEg0Y1TsVuMeMdFVIYjk6jCPRy4+Nu6Lqt41dHLhzW2Oq65Ll69VU0HAqm+vH2MPF6eXl+H9B3ufoSvF1Mna6WX1fseH5vLdR889N5PJd2LYauxio9ZxuTydnY5O30eujrb8+TrY8DKPnel2KLbe9zuTz9O3Bo1QIEAgAVspEIEBkkk7YQshDXVnRz6GbHkv0PGPH29GBAjIgAQgQCkGX110WW2xr2582LRqAI5JKTJQIEBWw28Y311dHNj7/N5G2jN5Ls+g5mvdXOYFAgcPf8hot6ZXQthp6GaOe3e0bg73VlkJMpsp3QXf5vL6+LFtoo8r2PQcfb0mTg4BHEBsoIihJS6mPBytm++uohROxgAMlfXVsoy9fHz/ADnT7Wa24M6OXHi0avQ8zj8zXu52nZADIBRfXV08mHfny+X6/c62Ln8/Tsy3XskAsjDp5MXO1bElMM10Zs1t6SkUQNFdNkYZrL65SDcCBADbxiQULYwqlNkg2RFAbAMo2wgRdLLi423pRu2FYCucw3EEIIpU2W2wrKHUaZzKCBSSTA2SgQCCSdkI2wrpssAyEEBhkApQAwpBuCglYGgRJBXBXFHVXOqmeaizKTkg4+un1nQzeuKStwCKyMbq6s1t1kY2wryXaCKCgFR7GLm8fb0KpvRXR18XN4HR6l9ebNbYrikoWRorlCmyOirH6Tl+dvr5/ju52M9mXo5e50svq9tGbk7H57p/O9lGjZRZbC/Jf0b65ldLRX2ezg5uDTry23pKQZB9PJh6GbJ5zp9iMiCEYo2SIAHUVbUZAMVyeMb66u1h5nqORw/Fd70vK2byiAQthW8YZrbyESuhW8YOlA258vK2b1lJHIMAykQIFJW3Ua5SKNVOf0nM41E7efq2c/RrjUCBw9/yHBp7AOhdDTsoaS2WRuKsBfdBQutg9lFNNmgqWyijLdphKuVhGBsiBBwFbZJ4x6GbHRbdEst19cpslAZRgK5dvBy+Nu6aSZS20ZsV+q2FfRzY+Vr3rKQAiZDxhtoy+7875bm6tmiurwfovV02WRAZAgb82XTVRz9Owiz2XBjIgWQrpss10Zw5ZbroBBGyhkiBSsjDNbcyiUBhSI4ADdnyuo8/TrAwwDtjBXIBAgEWmqnLbforqeMM1t1c5xDJEStwcFAKCCtwRRdCumdkCBADClADcEUoxQgg0GoRBFJKyOemZXKmmzNTPHntw3V8Ldn9Vuz+uIK2AIoDIthXuz5eXr3K2yUERX10Z7Lehmx7KcvUx8/Hfdg0aORu3UTZK7I0ZbZVyrtjn104Cs3E36qbM1UsfWx9rpZfV3V1Yb6eD0vnVsNvTyjR0aa7KZ7LIdDZT1dVNHN1bYFsK7YQsUCl0cuPs4eb47t+j358vO1a89lxEUEIK2EKZ2EQGG1beMQy6uuuc+rjwX11YNGvqZMOa27n6dkFlu0EVkIWwrosuDLIQ7mDl8HodZJSSUmUbIxVtW7YQgAdc5QbJaac+2jNyNvRgMkGoEDhdD5Fnt6cOhbDTsokktVsLCr4W6K1dBxWWxKJ6NNdeazQ6Ozh5/F3dQhCUAojcSVt0t+bLRZZ3ufyqZ28LodSuUyAApRsBqqoAY79PQzZMd2gNhmmqmqdiOUCA8Y7ac3Ry4u7zuXi0ae7zuV869P7LPZaG1bZIgAZR3Z8ua2+qditgCEFBkCkGwECBAgQNFdJSpstA1bKTqJSVyWUullw1Ssw6NQYBwLIwDlAAQCADZRmqnZTZYBrJxDJESOTJBuCKCABWyIoZRVygQUCAGFECCDcEADQIwjHG2GfNbJHBJU0WZabM2ezC8eH08npuhm9aspK2UoCtsldCvoZseO/SjkGVTnbCtWw1VKcI9/nce6FOa2zi7+gCFclRYVTQKt+fnVyrz2xxXlM81csXVydro5fWa6c+DRX57p/O7obbYaOhmLoW4r+jbDoa6er2MXP423oskQAJKW/Pk258zqNM7MOjV9E8x47w/oPU8vXuthXpqpWT1U0YdGrPZcQgQLq6qp2X105rb4FsK/b8HzHlev3uZr2si6uqiy0MsjEAHIA6j3edyuB0utBgIDKKuSSlbCspBtXIMZFkIU2WRIhGAIEDg9H5DTPoh9O+u/VTN433QnVPVZGy2DKsDt256A7M9mgObJ+v4vn/I9n0RGUQcANsk0Y66qMd2gN7s+VJTyXaFbgEURADZS6uTByte6+uvLdeUmSthXZGOa26ARWQgrk6j0cuLpZcWO/Tju0Y79KuSSlADIBQrfSy4llLFfpVuDZRA0lJlGyEVk4MAQgKzTVTTO1WyESjcABdCuAyjnsugQIBDVTnpnZTZbAaMQ2RXV157bXiq5zKiUECoq3BwIEYUAIAYB2xhdXVtozFKuUs9t1U51TsA2UapzAmSDQIrJaas9clRY65QV5q5ZqbMmezCy4nTyen7GL09U50zsVygBlsIXV1BuqdmyjNdCpXLBp1aaqOhmxcXd0YLsYuZydm72HE815/pdTma9WO61ZRrlBXSjhprxYr3XKmqeauWLqZO10cvrGSqnj4275rnt6/SynSyR6GaHH3dl49HVT19NVIbxX6YAbqlO2NbJbc+bJdo6uTB7vz3lfnXpvY9DPkaMcGnXjv06qc/Ux4eF0OpTZbAIaqc6OVNlqtwClorqqnNJTgACAAMKAyA8V6fk8PzHW7gbABl9ddUpxtWQZSgQIKDWTA7IxKjAgQPO9P5JTZ0iuhorv01WRaIaLYyBcyt0VpXbqphbCOO/YHN4noebyfPdLsEbRI3EMlrpz3Qr0VU5LtG7PlSUsl2jDo12wrDKp2gUHAIt+bKrdFltFlsCBbCHYxc3nadma29ZSABjxjfXX0suHkbej6rj8Hg9Hq5rbq52I5QAyBAgWQhbGCSnXKTJVTmBlJ0njCqc4ghAgMohyKStkUHAAENFVGe25XIpQIEAiAylGFCt6K6a5TpnZAgFKNlJkoKuc2igyIIBspQAxortYeZxN/UZR7eDmZbbufp2Rit9THgZLi7+iyQEHBlB4057LFlWHW0cme3PRZmz2YbI8Pbn9V2cXpwFU7KZ2EAHWx8/nadnUyYePt6JFpqpyX3qECChFWes4/n+dq03V0lV+a6vXWUUcElBXXZDN08vL52q3BoVNlMXO3Z+90c3rAMPDwej85rl1N2eXawZ9VUleqizsbKOrz9OztYOZx93SVtW1crIwIbs+TBo19jDzfT8rieF9D6nqY8PH3dG6uu2FdNlhR6Hm8fzHV7gbvrqostthXXOwBAIunkw8zXvAQIyIjABRGRED0HN5HC6HVWUgEBlEgBhtW3jCDKWiurLbcG4EB1GABQPO9P5Jmu6tkNvRzSurtos3kueNjxsdWXViuzo5c6Ttx3a1dlkV6blcbhdDrZrb2Sg3iuhmybKM1Nlqt6qaCLs4ebyNvR52nZbCvfny0WW8fb0a5TVsN3QqKClntugQL66r66qp2baMpSrnPLboVlsYdHLjost73O5OO/Tw9/UostrnODgACAANwWmqlJSUaykBgGCAjcAiZBSIoCOUAgAgACF0Kw3VOcRADHjFXKBAVtknUbIQpssrlOAyiUEAEApVzmUoBCAkpNGLpQClvz5Ofp1so311WRhVKea29W2Uevi53UyYPKdjvUzm6r0V0ZbbFcFdYcA89M8xXNV81XyNdXrejl9ZnstdR0VU311VynBUWXaqqMN+q+FOa29owjKZzgikSG/NiqnKqctlGPfnwea6vYqkllWVV1MnJ427XbDIyx2Qwc7VX08ncth7SM20cfzfU+fY7+z6HmY+zhpzW7+dq6uS7td3n6sN+rbRlKOfp1wIECB0cuPm69vsuH5vn6deDRr0V08Xd04LTVTorqVvdny3Qr870+xppoostDkG4ECyMHjDPZcQAQA3BFBABAgd/ncnl692W7QoRhRAZRRyDZFpppvhViv1BsBA2UZttGaBAgvDeg+a1z6DLodbFXTPdXPayushYxY8Z2wdkX0smXm6ujXO0pklppq9ZxuBztW7i7+pXKfQzZO7z+XrozsLDfqyX6N+bJmtu5mvdztW0A8YVymHKBbCq6EM1tySnsozZLr0lIoeMe7g5TJYrtLKOqqi6uuBz9Oumy3u87lWxr7WDm+I7/p8t1+ay5JziIECBAgK3bCtZTKjAVyDGRBAcCA8YMKmdpSIAIAYBsk8Y6aqMd+lW2SKVsYUWWFECAUiINwAMAQDIhhAdsYUzsZKAAIKxkKBB4x7WHmcLodQN2whVORQRVymVEivrqvrpossurox33VTaSQK1lWCkPC8eZ1sfnPMdWeun1nRzetAEAEC6Ffbwczl69tsIYr9KSmSIHZGtlGiyxWa6cqt0zdcmHDp5Of6nkee8T3/AEWS6XTyc3i79dM4pKmuVNNmdHh7OHr9XH6iuU/Q83zPi+74iqfV9rweMy08vX1+Vs6+e3s9HL0tlGfm6tnbwczj7ujAA9ufLsqz+i5fH8/0uv6jkcLx/c9H18PO52rZjv00WWvGGmqnvc/lef6PW6ObHrpo850+x0suLjbukHKBA1U0Zrbkk4CjdIhAAEAEB4w6+PnlGO/Riv0q5MolK+uvNbcwrYV9HLjIYNGrLbfG2jHuYOXjv0QIEDxvc+Xk23V7KZ9HRXa8boaGVrK14z6eTLTZpBZTZeCxkFS3Z83teF5ru87mbaM9FltsIdDNlz23ZLr/AD3S7HK2b9FdPP07OPt6OHRqgQTpI5QA2yiUBuCgAYYUX11K3XOwCdK+qrv87kek5fGz2XETxj0cuLxfe9NzNe3Lboz2WpKUCAyUCBAImiklJlFHJZSZRgMkBwLq6knNXIBADIBRAgEHjCuUwwo20Zenkxef6XXgQIDJQFk2ilbgEQGG1bsjDrYufytnQDcABAVuARMjXRmrnPNbdsoz1TnTOyMABspEQBlGqbgtdGQOOO+2FdcoUWVwxdHNxMtuLk7Mu6j1fQy+sIFIMgMjRVRXKbqNM7GSViuTxgknBBgI2xrshVCAcd+fDbXn4u/foryc3VfnsA6ap11yz57KVlh6mPs9LL6xW/V8fyXnen886mSWHR19dMvN9T0bq4rpdfFuqlPo5sdU7KLLsN+nr4+f6nkcHXTR5Dteh3Z8voObyNFdXzH1ft1b9Ly+L5zp9pJSvrpthBlFJT7vP5XmOr21ctlOfHfpgALYQz22solCtskQAEIADRXTbCGO7QRaK6rYV311BvLbfluvg4ACyMElL3XnvLMo57Ls1t2LRqVuBAgeE9D82rl0NFequW+yOnTVOF8LnjYSzZRCqd4LCphyZNk+3g5uDRs2UUWxhvzZenkxY79ODTrurr6ObHTOx4x4XR6vL17klOAAIgOArbJBhSVysjCmdpFfXU8Y57bWSUYbZK2FfUy4fT8jh+i5nHz2XYNOrm6tvH3dHn6deDRrqnY8YwIEAMIRDKOiqnPbckpK5QHjEiZIpFKudgAgAVsiZCSkUtdOfbnzcvZuthXvzZLIxw6NOHRrKTKJRbGuqU65zurrSUlciEAAG2UdlGeiyyuVitgCAbVuA8Y9fFzs9t19dXpOXxfG9z0eey5JSZKCAEUDTVRkutAiQDQIXQyo4JKlJZEeLBpzVT5O3P6roZvWukAgK2RPFVykG3jEivrqKSSdU5qwCgg0CMI+i5nE4PR6VkaMOi5XDsYuRwehvDpeOSiyuiyiizJ1Mnb6OX1cDqZOF6rj/BfPdP1PJ2dyizfyN3baN2ivbuz9UBqqozW37KMvtOF5vp5MPE39Pz/S6+HRqx36dtGXrYsHnOn2HUWSvrqthXXKaSmknTOy2MPXcXz/AI/teiWT0VU57bwF0K6LLCghAgKwogoOBpqppnMOQC+FTxiG766udp1wcAAG7Y1o5fRPM+P52rb2MPN851Oz5/pdeyEIECB5XsfKq5dBlvda3josjdrpSPV0cueqzXns0PGTKULISKfaw89kaqaoPk7Ohorq6mTDxd3TrnN4x2UZ+vi52a6/hdDq5bb4wogRIiZCSkrCiMrlNoxZJW9VVADPbcUQCAAiZJox62Pn6qaFculmxZrb+fp18fb0apzKIACMA2SgBl1dbqNcp1SmQgK3dCvVTRnstpstgEEkykUESOTJet43nvOdPs02W9bHz8GjWRX1VZrr3jDFfqZIMZJHJlGAspFACBAvrq1059FdNU7KZ2ZLtFM7FbsUXhG6FfquPwPRczj4tGnDo1cDo9bj7eik5KMMZKCIbc+TDo0KxXGEQRWVaShXKquWSmzHVLnw4+7P6noZvWkAEZEBtoxWUoJXIpWxrurq1056pz5urWrcIwiSPSy4N2bDzdeqiyWK+1XXorxo4Yr2HRbDFZHBydp0cvc6OX1kDsYvP0z+Uet43P8AN9T0/A6PoOZs7DRu0Vbd1HVKW7PldR2UZvqnj/B/F/d/Ssl2iAGAbJaqqMtt8B4x0V01ynbCsiy3aEcq5z10Z+jmxcfb0nUbIwRyVtXKArcBkgxXK2FauW6jLTOzNberbJXV16aqMd+jXTnx3aQ3ADaOV9dIb+jeX8bmuv8AJdn0GO/TAgQIEDzvT+R0WdNlveOuyN9kbnjdtorV6GU65aCp6K4snZAuhHo5ct0Icfd065T3Z8+e27ZRnwaNdU7HjF1D0fL4/K2b+Vr3pKUCBAIQHjCuUyACCg4DxikpaK6dVNHN1bYCybRRABBaqqcd2i2FfTy4tlGbJdoostqnZku0QAwDIgNkoECBsozXwr5uraAAWRgyVc7NFVOa22DgK2QZRgAeynNZCGa27bRn5+nWreiupW4jNbcQvrqgVzmjkQ258uHTqKAACxR2UZtFVXWx8/m6tjJEOVr3hmunPoqpyXaWUWSsjDpZMPQzZMGnVwOl1s1l1c5skjYZuz5Md97xrZV0WTrkiUo41zponnpsyUz58ONvz+p6OX1hCAjcB0ikGwEZEEiB3Qq3Z8mDRppssrlIqvfnx2Rpx33ZrZ1ySuEK0lU8aM1qqnUkqAY9VPJ1Veh10+wvrqZc/wAl2fCet43P9Xx+b4fv+z5WzsPG7VVs35umkpdDNkiXP1bIAGQAAA26RSuhXRZbAAX11K3bGGey1XJWyLoZshRXOdsK81t2iqquUsWjVAKRCAADeunPZGGG/UrcbKTJXV1EQHfXVh0aiAANlR3Z83quRwfF930tM7CJkQIECB53p/JKp72j0LI6rI3WRveNu2iNctF0GrvZSvrVkC+ENVNWHRtz2XK51TtIdDNk6uPDwuh1b66qp2QPQ83j8HodbNbcyUBW2SgEGUWjFJTDYAMA7oQSTshC2FeW7QrZEUEAEAi3Z8uDRreMboVuoKMhku0EAAbKRBWMlERu2FV9dWK/UGMk8Y1ynBMhW2SKTEa3Mgyjvz5bYV83Vs7WDm8zXtxX6d+fLmtvpnZdCumdhDZRmpnYGZ7LrYw000ZL9DRisp311PGCSlXKbJX105rb0lIpAcbiTKKylZCFU7FYyVkYbs+XXTnz2W57bqLLc9tvSy4ebp1sodfFzdFebmatXP03WRz0WRWWLNZnx34klyN2f1XSy+rKCCtht4wgwBABBEHjApJJ66c1ka+dp12wposnpqzc/TohFXAOuOtSq6GR458Wh4r1VPPDn93ndTTV7Lo5cXH3S4HS+d9LJP0PNyczV2Ml/Spns6WW7r4tySlbCvlbN5SqnZAeMQwDIiiAyirkQgPGCuW2jLku0JKcBG2S3Z8uHRqZRqnYyj6fk8TnadmLRprlOuUyEFdXXrpz83XtAECgBAKWunO6j18XP850+xXOcAotjXtz5mS5mrakpEClAgQIHA6XyGmfSK32x1PHTbC2yNtkZ66YwtaMyWWQVsS+uO/Nm5ezoVTuqlYrmR7KMxGrkjlXOcDq4+fydnRSTKICtslBQZCyFdsK8t2gNwRRAZRurr1VUYNGtJSgQCACAG9dOd4xxX6erj5/RzY/NdTtkSuUCAGQZSVtkmSVu6Fd9dVU55rbrIRSUoDJK2RW119DPkKWLRqqlNW3UUlNHL03K4nnOn2FlJoxWUr66roV4r9QDVTRkuvYW/NkjeG/T3efy7YV8fd0ddGfLdow6NRSZR62PBxt3RKCFsKqp2K2yFYyTxhXKyCgQAyBsozOo9LLh5+jVzNezpZcKSHjV08nO5+m/FomjpqnlSWHnac9U+Vso9Z0M3rYBABAKQbjIgiA4INhjxgBa6c1ka89ljKvFovRpXEOKShbDPbDLivsqnVto52O9c7SB4Opj7foeb6B4x5Ox8DpfOttF+yizn6etqplvzxos6+mrsgLoV5bb7YVrJgZFBgGSIQLIV1zsAQLIw6OXHluvvrqwaNYbSTZLRVTntviQbSUilqqoosteMb66klK6uv0fM43kez6FJSgBhRGAIF1de6jL6Pl8bi7unw+h1A2UrYV9PLi5G3o7c+WyMMl2gMKIECB5nrfJ6Z9JluthoD2XV23QnZGeitvCfUy5ddFfO1dC+taKq7IrBo2RzpnbRZf18XP52nZntvZKIvhUrlsozc3VtgQIAYyIlG4AC2FbqNM7FciKDKWmqi2FfP063SVsDgK2yRCC6GbJz9OvfmydPJi5O3fjv1AQbKIECBAIWRhdXVZCBFTO0iy3XgcDpZcWO/TVKbqNkYbs+Vkudp2Mo5bb7IwrlP03K4nnOp2Vbgw3qpz9XHg4fQ6gctVOfJdo6uPBbGHK17rIwvrqzW39bHz8GjXg06wDJEOhmx8/RrjasKNFdOey2DSUmUbq665zAQIwAUBkBlDVTnzW22Rrz2zihHAqiuSZZct1MOfg0Z6p8joZvUdHL62BADAN1EDAMIDDICORIsowXTyYM1tue2wqDxrSSy3WAgSpJRqlBZVVutJ0vHFbDBZHm+j5e/1XH7Xke16Hk7X5/pfO9VOlXuhrsjdvzQ359LLuZ7Lt2fLh0amUVcgwgAZIpAZForqqlZVOYZA6GbI0Y0WW5br4NW2S1U58l+gogBhRAIrq62UbIwsjEpVynh0aoACAGyEEUX107aM/q+PwPF930ua26Brpz0ztrlNJNkg5QIKBAged6fySqfRaO+6GmyN7K+yNrxsvreumHYw4761z9O4ku7z+dxN/WrlYyFc65Weu4vn/H9v0eW7QUWxrA9FVOmunla98CBAIQTJAYbVkBoq6FdFlpCCA2UWSSU4KIWTA2SgBuCthDRXS0UreynNx9vSgQIAYUQFbZK6urq5MBQJNHLNbdjv0tGPUyYcGjXuoy8vXuZRgPFJKWqmjNbdTZZoqpqnZ7Phea8R3/UMkkmrlZGHc5/LrlPj7ejpqo6WXFjv1Z7bqLLINlGI7/O5PD6HUossKIECyMHjGiy2BAIikUrIxpssZJ4wVySUgAYUQV9dVM59TJgrnLBo02woWSx3W7aMOa11Tr01crjbp4r8kON08vpunk9YAgBkC6FaObKKSkjlAZRSUoJlHoZsfP06etj59Uny9m1WtFWa6GfnadKSgkogqV11zpSVSOiizP6Tl+W73O6eez3u2jP5frbeD0fnJOgDbZHRbC62NmmnZ3udpSUoPnatgYUihktNVDJK3XKVkYlJXLNdfAAdXHg20ZuLv6Wey6BADLq4VTmRQYAMg4FkYdPJhVy5WzeUujmx1TszztrnOMgRECBAsjD0fL43P06+Zr3QIFU5lEAiVyKStwIEDh9H4/RPpFdG6Gm2N5V9kbWVtsJWwlCbKyFl1cdVVe3Pn5ezo7KKNlGeudmK/XTO2uc4m8YLKTxjsozc/TsIQIABkgDCRyVuA6TKMBXKCgwFkYJKQHAIAIECAQUNlOe2FdU7O9zuV5nrduuUykQAQCCtlIpeh5vH62PBTOzHfp5WvcspK5Y79AHbCuyMVbrnOAB2wrpssKNlGXs4edA811e1AKK5yKLoV9nDzfP9Lr9HLixaNSuRSKSSl18XP7GLm66aPE9701cpwAwodR105+fo1wCBSgBuCeMVb2UZ3Uc1t1UpkWmqmmc4ymdhUdlGXJfcCLKvNbZbHMjrpsrV5Md2fHfkJxejl9R1MnqkcnSgQLIw01UZbb0lIDgQAxWbs+TtYOZZGrn6dfF39CiyZUFasjTTYwVq61cFlSjrrlSks7xw7KeNbD03Uyep6OXHg0V+Q7fha5dS2OmyGiyN1kbb692yjrWwr6ObHXKSuVUp57b9VOfXVnKVcrK5TuhUQrcsWjVVOd1deqqjt8/l+X6/drlMMgAd0K0co3AViuSt2QgQ1U0WxrwaNcCyMLYQrnOuUwAYUEAEAgVHRXVEqbLElMDINGKtkElIMgQIHF3fHs9vTB0bYaboX2RuZXWRsaNjKwqbKcJunZAZSDl08mPZRnwadlU7Vcs1t5QRPGNcp3QqVyqnYUiCsKCESDYYBukAgMkG4IDZRSUgNW7Ywg4ADRXTmtuA3S0VUX11dDNk4HS6ytwCiAQAAGS0V1ZrbtVVGiqm+urFfpz23JKQGGMldXXXOYCDgX11BnsOJ53jbulxN/Tgbs+WqdmS7QG4G3Plgq52ZrLg3AgWwrrnZ0suHs4eaB+a6vbpnZAjIh1HoZcfM17g3BFAYBht4xDChlFW3jFW1k2SRsMgr66a5NJCuKtB1K60lTTPPmtyU2YAcbo5fUdHN61W3jEhAgaqc+a26uUw2RFIBpro258vJ2brI1lRthVh0XkirjdChXGiwrlBZQV1UzhXKqGXp5OM65iP1nouZ38GnX2cPn/nnpfJZrevor0XQushe6tur3a6evA9RyeH5/pdbLbfqpo6GfJdXXtoy7KM6ydUrKbLK5TKXE39OqdiuSt6K6XjDLdpgQSOWunPRZcrYBZSgFIpENVVGey1XKAkpWRgBkCkrIMhAAMokNVNF9dKSng0alciDKMQkpQIECBA4XR+QUz6IfSsjpurvsjcVc8bWLGjZZGTKWmqKOxJWsmU9VVV1cKbLXjGiy6qdhTgmSVygWRhRZa8YwIECAUg3AgEEbgQHjEiDbxiADYHAIBspbs+TJdpossZLZTn62Ln7s+TyHb9FBwAEZEQAyyEXUKp2qGiurtYeZydnQy3X1ym8YhspQLIwSUoGyjMyWunOyWW2/NbdVOz0XM4/C6HUqnYkpxLqZcPM1bXSqlNJSKRFZCLqPZw83PZbntuSUsd2mAGRBDdny4dGoMKICSkUmSgBhRBBhQAjGSrlJlECZR0V58V96tQrSUGVNU66LM2a3LTPBDj9DN6fp5PVwIECAyirldCtoxy36CowIDxgkmSJSthVbCnBp0ASuN9dGa6V1ebNa6pxV1VzhW6evj4rxw8jae786roez4fQ6lcsnn+l86x39l467Y3vG+yNt9e7Zn6pD2XD835/pdfma9wBkoEEUtNdXpOVxb4VY7tOO/RyNnQottKAwhroz5LtEApdLNi5+nYkpRAYjkG7IQgENFVOe22uU3SAMkQABjRTCA4INgat3QrsjCBoqqw6NUSjCFcplKBAgQPPdP5GDckulbHVdXdZG4q+yM3jYys0Vxtg7YFM7qp3smCWiuFFlxQyL66s9t4HAInjFXJkq5SIQURGFEBWw20YsACAG3jBkoF0K65TKSSlXKcAhbCvdnyQA3g0a9lGYpZrryjPbdAVuCgMgCuhXB0WWPFWRhoqpSUsl2gNlKBAItNVNE7b66dFdXN1bSGmqjPZaG1cvU8fgrKVFlnN1bYGW7QjkyStwAyBsozwMt18QGaK6uti5/B6PWVsAwtNVKt1TsvrqpnYkpvGMBWwwoDRRAVsiKQYQUTKLxqotmCIcUddc4o6KZ5s1uaufPhxujm9R0cvrFbeMWUYNWwBZdXW8YZrboF0K6ZzgoJZO+uiuTqnJXEqGyjHi0XFVWRz4r502RV09bFyO/zvP8Aj+31uZrj6Tlb/VcftY79BMHz70vktNWrPZ07oXPG943aK9u3P1dtGWyMcV+lJSA4CtskG1bZJox1059dVHL1bllIAAIBmmmmuc9lGYN5rb89lsC6Fdcpq2yUCBpqpzXXACggAVt1GIIQQGG4BAA8Y3QqZKBXKdM7I3AABgHAgQOF0fkFcuhDo2R1WwvsjcyueNjxtYnoqjCwqbJq7Q5tEZCSsKCO6FauSuStwANkoECBAVtW2SZJJSgPGMCBAIrq67Iw0V0qOqditxumdgGkpX11b8+Tkbeh0M2TfmyZrbtlOfjbekyVNltcpBspQCF9dLJUTtDNlGfNbfVObxiGBygAIDxjGMk0YpKVM7HUbYV0ztDN+bLku0BvdnydXHg5ezfzdWyyECFcpkOjlxEXP07K5SZK2EK5Svrq35snO1bVbSU9ufK6jh0agBBW1cgwogQIEEG4KAUoOCWTAPGtZAIhxhCuUKpCyz1yy57MlFmGPi9DL6jo5vWI5uo2QgkmRgHUSk8Y2xry239nDzeLu6MYjCJ411TkCKSIR1VZMl1tcoK4QqSVVcqvs/hfl3ie93fBej79csfUydrs4fTUWW2w5vnen8720aObq7NsNFkbrI3X17dufq9vBzOTt30TtuhXXOcSDbIgAFbgdTJheMebr2q5AA3AgijpZcW2jNwej1XjEpUzs105812iAADIOCKCEABADGSaMVlKDAQAwogbKM1c51ynXKeynOAzW3JKYCyMXUIECB5zp/JaLOmTdbDVZC+2NzRtdWvGyyMtVUQWPF5btTKRUrYxiYcgSg3irYwgZ7bgMpMlGFEAArZBW3jGAGFCyYG8YvGJFXKdsK9VVADPbdoqqdRzW3VSnG+3z+XydvQrlPo5seiqnRXTdXXzdW3lbN6SmrCggA6eXDztOx4xDdc5gaOVkYXQrRygQQbuhXoqpZLBo1pKTqKNshW9VVFM7KpTYLq6gyqdhS2UZ8OjVorqRtks9t0SYVsK6Z2kAGunPku0RgDrYsHP066p2dXHz+fp21zkBkStlAYUQQbgoBQAJFZSiiyirVka0lGqQkoLKCOmqeWizJntxFcTfm9T0M3rVcnUGig3AAWxgrkG7q6ullw4tGlW81t0ECOqqjLbbTOTKu+FHWxczkbdmDRcsoK6gVdzn8P6D5vxXyX2ftebqlVPH18XY6OX1it1yx+f6fzq6vbpqupnuuhcyv0V7erj36KqeZq2kHjCNo5QIAYQCFlLbnzUWWdnDzuXs3Z7bgBRAIFR2UZ766sd+miy1W9NVFU7a5SVthX1U0WXMk6irajdRqnZfXToqpw6NZEBwIAZA7WDm1znmsuqss3ZstFtuO7SrZSZIigQIHnul8jot6avo316LYXWRueNzK4qy2MorLoF0Ciy9lIpvEZFcrIMjiNNdNFlwGGMgBADcSIK2G1bsjAoVt0gCtkTxjARyIWxr3Z8oHRZbdCt4wz2XBvr4ufy9e6uUr4V4b9WqrP08mKuU+Zr25rbyACBtozJKSOVFlqtskADd0K0cg2ADbqOiqmDZRzW3QYCNgA3oqpostVtkoLdnzUWW0zs0V1djFzmUfN9TswGRfVTprpaMcd+mmy22FeqnPg07AEDv87k87Vsy233Qr258tc7MN+lJSDatwCiNAGSgwDKJErADKEIkgVCiyQdVM1XOqieSmeWi3EDjdHN6fpZPWBhQQAQCBUSCuUE0Y1zkAjCogREkiEUavrz9fHzOzg5OO+zg9HodPJzO/zuJ08nK8V3u743udumeZZYeti7O2j1zIqlj4HS+ddHLZVPo9DNHfnW/PEHU2UdTn6dnO1bEciHRy4sGjWspBkQyiUWRhVOy6FRR6Hm8fy/W7qSkyjBlIpEGSZR6OXFz9OxZSZRonard9dQbSUgOB1MmCiy4N47ryi2MKZ2QIECBAZRuhWkpVymrZQUrY1wKp2AcCBAgcPofH6bOkr6NsNVsL7I3PG0q0lrxm6nbBq7Xi4SZO6EaZ2kZRBwbIeMK5WBjIAQIEAMKA2AZJZMDImiklJlGAUBkBkutjwUTsuhXsozc7VturqDfSy4+Vr3ERQsnTO0AyUFh0a1bgaqqNdGfFo1UzsvhU8I57bYEBJSZACBAsjDbRmpnZXKatpKSuUCAUlkyiBAgt+fLVOyuUiDwj0M2Ph9DqERR6/i+e4HR6tcppKeiukBrpo427pK2Gd/m8nlbd+W3QVFkihlFJTZRSUgOCgQClGwBE0YuoI3dCqiyTquyFWe2VU1VOKOrPbmz2ZabMAON0svp+jl9YGFAZAZABlGDrlK6FdU5hkACZRDIoq1BLJXV0dvByO/zuL1cfL0VZXWcFPke12vMdbqef6W6meZlzuhm7vRzetDEeLz/S+dX17K5dDTVZ0c0FeoHU9fxa/PdLr02WFEAithWrlVOwqMG6i8YI5wLY19TJh5unbluvIAIBSZINwFbZKyFeiurXTn0V1er4/AxX6eNu6WDRqpst7nP5fp+Tw/PdLr4NOvBo1YtGqqU4MiRyjcEBwIAYBwCJXJkullxYdGpW4ECBw+h8fon0w+jZHVbC+yNzRuZWuplWsp2RkCZJMpPFPErlaRsiDgQCh4xrnZASUnhAgRAcAgrIAHAImSVsoDFcmjGAQ62Pn9LLi5OzoQHjFW+1h5miqrhdHqvGGey62Fe2jNdCvlbN5S5+nXBwNNdOG/TbGDwhVOyqyyIgQFk2iiAAM0003wqqlPXTRh0aqLLYBE0UspAA3BFFkYXQrz2XQEkyjrY+fVOeS7R08mLRXUA5urakpFKyMElLXTRiv0gPQc7k+U7HeIREBJSsjEARaKqc1t8CNRDqJSVuCSU4KKMYrStK4hwrkmVNcqKZ5s9uWizCTi9DN6jfm9ayTIVhRAVt1EDSUt2fJmtvrlIiglZBEiBASyj9Q8l4TXRj1VZbIZ/O9Tqd3ncX5/6T1Hmet09NWHg9DVHkBg20d/o5fWQK5Y+D0vnIOjbDTqqsK0B6tNOzp5Ohprp5+nWjkRFBFoqpsjDFfqZRvrrzW2shlF4wy3aOhmx4NGtkiACAAdRVySUrIwA7oVpKe7Pk7WDmcnb0NFVOa2+iy3qZMBSz2XdHNj890uu6RSyXXxuABq2rYbKREjkQZIpK2yWqnOkpwIEDzfV+S0z6IfSthpthfZG542srmU3jYSbRsIyrLIrsYefdCPD6HXVyZAGHIpENFVOey4sAFAbKUZEEIACBAgFINxkRAgQIIh1sXPgJKfSy4st1+iqm6FfL17stt9c51yn1ceD2fD83RO3zHW7eunPfXXyNvQostSUstt9M7CEYBhhQUgwpELIQ6eXFXKSSnbCtXLl7N0Q8YrJgcCBAdR0VU479PTyYbIw5OzoBnf5vJ9pwvNfPPTewxX6Q5AFbgPGMZsozPGLJMo3118Tf0wyIIBjIAQXVyYcl2jTTRXOdFljRjB1TnTZZBQIIqKSFaSQVUrrDrrlVVPNkuy5rcNsOJ0M3qOhm9ayQYUQAAbsjGAVFJSuhXTOwMglYUkkEjCCi+geb8f0M+HxXd9D1sfLrlHs4eP28HGwabK5U+C9F6PzvU14NFXVx9rpZfWAKp4+Rt+aZrexZHTvzuqWyyNvUx27Keqkp3V1c3VtZKMiNFVOiunFfqSTVyZKyMLIwzW3gNNVNsYUznfXVmtvrlOAQgAHjGiyzRXUkpq328HL5evdXKfUyYe5z+Xxt3S2UZtFdXB6PVeMfScvi8DpdbjbulEMlZGDKNFlxSgQAwOQCyMQyIsjC+uqBAgeX6/yimfSB0LoabI6HjdZG5laruthKyMiTKkylZAZHc5/ODlxt3UrlMjVtkQCiMiIAZBlJklbDCiBADIBQQRsiKIEAiA3jGyMCLuc/l6K6eVr31Tsvrq105+D0OrRbayXteD5nfmy+X6/cqnZmtuaMUlOyMMGnXVKbJQCkGQcAiKIGmqjdny9HNj850+xuz5qLLcd+hJSeKgK3GRFsa9ufNTOzDo1WwrZKudmqnPbCv0XM4/K17+D0uqBskQKirkyWmqjNbdbCFcppKWunPltvWTAw3qpovrqDLoV0WW0zs1057q6+Xs3VykBwCRgWwquhVjvuAlcVcVcFdaSpqnmz25M1uG2HE3Z/U9HL6wiDcRAgEIKyEElMMZIqNc5gQEGVykygSAI+u4vm+nk53M16eVs2b8/Py2ywabO1g4uHRPq4+L5DtdXidCzZR6Dp5PVkKpY+Tt+Z47uzdDTdC4rR6vj8knTrl6CqVlkYZbr0lOBA0VUbKc/K171bInjHTVTkuvDkUoFkYFJZS10Z8V+lZMoIACJ4xVyRthei5nHZRrlZ6rj8HFfo4HS62a29HLVVR6XlcXxvc9HzNe4pMKIZLp5MIb5WzcUEAEAMZCsg9FVOunPAgQPIdv5bTPow6NkdVsL7I3PG4loLrYSeMnUipspOhXNHbZFWwhbCNU7ElMog4K2EK5TSUllIpWwrA7YwVtJTgVylZGAGrcApEAwoDZSDChlFXIN310+k5fGzWXU2Wcjb0aZ2MlZGHquPweVs39fFzuXr38zXugqp2K3dCvZRnpnZku0JOTxh0M2WCwaNcBXLRVT18fOyXaONu6TxjfXVTZaAgMkrbqMCJK5RkADeMVk9dGdZS9Jy+LfVV4nv8AplcnjHXTnpstrlKDeENdWfDfqWTUZZ08mLDo1I5QXUyYsl19sIY79HQzY+tjwVTs870+vAUayZApFRVmmrPmuuUi6rpmkkkdayorlkosyZ7cIOR0M3qOll9WUBhRAgQGUVlKIdRRyJEAGQSsgoRAg49nDyvTcngYdN9cllul5Ls9orP6Pl8DyPa7O/Py2WHHfR3+b0+vi9PzdWzm6o8bd81x6O1oqvsjothdtzonS25+oQRysjCmy2BpqogUzteMKLLSK6uvoZsfH29EhAgMlAVsNvGDJJKUG0YOo2Rjltvgbs+XRXT1ceAN3V1JKfnen2LIw20ZnjDl69+O/TAKUAiA4HRzY+bq2QYYyQADZIpWxhVOdcpwIEDi7/j9M+gH0ra9FsdFkbmja6tKtsjNlIqbKZUnTsiqJ3sjTXX0M2S2uGS/Rku0pKcCIuhXRZayjbCFNljxiG2jENpKQGAjIEAoDGRXKQGRFIgAeMVkwNkvXcXz3pOXxfnvpfX83VtuhX2MPN5+nZpqp0V04r9ODTraMXSAOoq30cuTHfoZKuUoDqOW29XJktdObVTQkpYdGuuU766s9lqyaObKLqJQkmUQIG2jMkpUTt6WXFjv0OlZCv0HN5PlOx3qp2bKM1sYc/TrA4DJK2GQIDxXVx4N1GXl6tobostsjHo5cW2jNZGHmer265Tvrpwadbxi6jXKcE8YKy6FWW6wqGyjLlunTNQqoshTZlpnjz2Yg+P0M3qOll9WUQIwoABjRQbIPGAbVl9dWa22CggINAiyr01Zu9z+PyNuzsYeV5/pdLk7dXQy8yiw5+memrnq8fJ2vq4+z0snq+rkwZ7c3lut4DHf2tFd9kdGmqavVfXt25+q8Y6K6dlGbFo066aMGjXVOcCI0V002Wo5WRhXKZABAKSSkRQCiBdCvRVTz9OuBbCuuc4Puc/l9rDzMOjUAZL0HN5Hi+76XnatlUrLoV7KM2HRrSUilAeMUlKA6i8Y1SnXObKKuUDVTQrdc5o5AIyBA4u/4+kugp0bI6rI3vHRZGx42h22RseMoTaMrYmiqCyspndCUG8Y3QiG3iqZ2BuBZGFbn2MXO52rYjkkppJgdsYQFbUZBW2SgBhQkpMolAAsiL66qLLQwD6+Ln9jFzeTs6HXxc/Fo08jb0c1t3ouZx+Vr35br65TuhXvzZNVVGiqnDo1cbd0oECBADcApMogcYrbJX11FKqdkBXJW3UVclbVuAUnUVHbGAbrlNkrIw6WTF28HL851OzltvrnOyENVVGS7RXKZEB2wrtjDRVSG9ufLh0asV+qmyyyMNdGeqdiSlvz5K5TossRyosteMWIo5RlkKrI15Lrujlwc3VrWUa5RdUZ7K6Z5qZ5M9uC6HC10es6Gf1rRQCMKCAApBsMaKDYZdCpQrnKCAg0rUIsqunk58K9FeXzvT6lNkezg43A6XQrlTDNvzcjh9CzrY+z0cvrIyuWPk7Pmdcuor3dbHVjv6ZL9FW3bn6kCyMFbSUnirYV02WqwogMoukjkrdsK652QQHADIEGrbKJRAgMo1ymyW/PkshDHfp1U5/VcjheS7XoMN+q+uqiy14x20Zap2Z7bkclbZJW7YVxtRwA3dXVfCuqc6J2hsNwUCBAgcXf8fqn0YuhZHS8dBNFkbXja8bGU2VkLHi9lFOmqHP07Y5RSjcTI4BCIvrq1VU8/Tr10Z9dOdJSyXaKLLVclk4hktNVCSmjkrcZBgCKABq2yUCAUrYwthX08uLRVTy9e7nadm/PkthDJfo1U0VTnArlN4xz2257LmSIK3BFEAMIRAYUiEHAAEVkIWRhRZaGwNkgEbAK3AImSA9dOfJdogBkAh3+byd2fLxd3Spss7GHncfd0sd+gBfXWyUFTOz0fM4/D39THfojGioBEySuVkK9+fJbCvNbfRZZfXVz9OyCgXQqaMAx1X1MnO4m/oVSdU41zikqapZaLMdFmRlwt+b1PQzetgQIEAgAIAIEApLIgb82PHfork4AcYRsjVoqzWRothRztV+HRftz4ElVztNtc6q5UaK+bVPHoq9H0M3rCFbx8Ho/OexiN2efM19jNbveN2qnZto6tcpbKc9E7ElOBGPCFc7ClAgaaqSKB1sXPrnPjbelXORQQgAAwogQIEC2FdNlm7PmvrqqnPbRm5mrbnsuZJ1G2FcC2Fd8K8V2nJfoVtlGyEVkwMpEWiuqiyxJTiCAAMDYCBAgcrZ8cSW9X0dVN1ct0NNkbCrnU3jZZGUJtGViGi1dpAE4MhCRQG4DJX11WQhdCvJdoqnNXIgAVt0rIVuo2QhVOyiy2BAjFGyUCAQgQIkRQYZqpoSUil6Dm8jn6dmO/S8YZbr0c0lIhAAJKTxjAgQIECBADL66qp2lJWyKArbRSSkyRApBuBAAQLIw0V1aaaM1t2O/TAAMEFvzZO9zuVkv0cvXuyXaLIwrlOuU+xi53M17UctufN0suLz/AE+uo2EyUQG1bVtlEhdXVtozYNOtW1bgPGG2jLApnLLda0a+hnw31Z+Zs0Yr7ElVktoz25aLMQfF6eT0/Qy+sIMowGSgI5WKFcpq5FKCDZUbY1gCoU2TDARrkd7ncfq5Oboqy+X6/YxX3baOdwOj0FdaSpSWbRVzaLMuun0O2j18SV4uH0fnBXQeOrq46+fp6jq/TTs35+nXKeiqmi21XJW1bshBkq5zKTJWwrsjDJdouhWrluz5cGnWAgEICsgQGRAAX11QOhmyVTn6Dm8nynY72a26MAyldCvqZMFcrGUXjDk7OhdCCt0WWwCAC2FeiunLdoqlMigQCgMARkCBxN/yBXv01aqJ9HbTKmWxi9la8bCrHjJlNlJlIqUGSRRCUGQI4COVkY9HLjdRonbku0aqqAyuU65TthXZGOey3VVRpqp5evdXKYYUEABCBAAWwrDaSkBskUoxHIN3V1VymRMkyjTO0AQIAAxkQIAAhAVspFKyMK52NGOqqjLbfXOTRVkYZ7bikyRABAjIgM3Z8u2jNku0QMd+mmdjxjADClfXXTZaAgbKc1UrGUdFdUS6mXEjfL2b8tt8BXJWw2RRAbiRFbCF9dN8KuXr3FEFA6eTBRZbh0aA0rUIOqtlGKqccdxivppszZ7cEOP2+f6DZR6+qdkCyMElMqKuSSlfXUASUwwAxFQDCoqwkQRJHt4ORwOj0+hm5/o+Zwuti5nmur1PHdvuLKquVKvNpq5tU8m2jv6qfYFCvFxOh82pn1itemqzpZYYtHRvr3bc/VeMb66st14CBG0bIWwgGFLXTnx36apTdRA7oVo5WRhorpurr3UZuB0eqrkyV9dWa27TVTrpzX11+v4nneD0ut5Tsd54xrlOBAgQOjmxtGLJEWey7JfoRygEABE8Y2wreMaLLa52KxHJ1EpQIECBwuh8hqs6Lx3PHZDRsoaS1MrnjMqx1MqZJNGRJFSZNkg5gZCDKA2UrIx1U0aaqLoV9bHz89l3N1bct19U7Ozh5vM1befp2EWqmjJdoDCiBAIQACtwLIwg4FcpMlBBsDVydRurrSTKFkw3EQA2UiEAAUo2ADZSgX11UWWwAx4xrlO2MIFM7CJooiVyIgghGdDLjxaNVM7GjG6FatpKcYjk8Y311VylbCG+jLuz5eLu6QHbGt4xvhUjlztW1oxvrquhVnsuostqnZAgQIKA6j6Dmciqyy6upJS2UZuD0epzdWyChENAirg6paNF8MXN0xx30ZrcSy4/Sy+n6WX1kCI0VU0W2sko1lIpQGUWUYFU5kQAEVYRAiHHpZefy9ex409zBxfT8nz/AEM3O+Vew9vh0TqnU8MceO2HL6+Ls1S92G4YPOdT56r6TrVdXfbC3pZa4dOyPa7WDm8zXuossKAwogK2yWunOkpUzsg4IOUSjEcmSINGEb0VUhnXxc/oZcnlex3q5TrnNW+pjwe/855L5x6j2dU7AOuclcnjEhA258sZEY79BQRVymQgQLYVvGGW7Roqp6mTDxt3RSUikRgUZAgcPf8AIa5dCuXTvhfbDQyu1UuuWolrKbxnorjRPQyk6cJRNkQlBhygFBAogFLbRmDO/wA7lbs+TkbejntuqlPo5cdU7PP9LrByZR1U0YdGlkKwDZKAQAMorKSjgMKIIAIEFrposjDBo1EYApRijDbJK2QKQC+FVU7IOArZUYOBXKd0KlcoBEBq26irZQrZEyVkIaaqcGnUUQAzTTTmuuKCIpQAONwIACBAItNNGqqjl698CAUroV66c6t1TsDaNpKfTyYboV3Qq870ux6blcTidDp9HLi52rZkuuVisBGOKuNM4lU1zqKw0WY8d+auXI6OX1HSy+rgMlbGspVysZRqnMoVtknjBJyKSsgg0oQjGiobaMXN06mKvY8Py/E37/b8HyXj+12+D0d9M6+brspnlZYPV8fTfX7Pm6tlsOb5nrfPwdKyOqyOh43WRu3Z9GyjrdPJh4+3okAyBAKIDKN0K89l0CBBMhWyIDgEAEBlGA8Y0WWht4xgJKVkYfSfK+L2U5vmvqfaq3ntuSUoBQQKjvz5c1l2qqiyMElKuU81t9cp9DNjz23Zbbwxkr66tNVFcp5bb4wpQAKBxd/yHLd1K5dO2Gq6FzK+6ud0JJLSyssg7YsE6p3WwCpEbJskCSuQbZBQsm0UrZFbCF9dXQzY3S10Z81tzCRy5Wvdlu0QNFdLRjlu0QIBAARMlXKTIABuCZGiqhkmUc1t6t9HNj52naAVuNwClAgK3ADbRjbGFcpwCAAMKCCsthBoxSUrIwthDLdeyVkYK5QLYVq3fXVku0UWWskGFFkYJKcCyMFGkpQIBABADZSKQbuhXRZZAKICtwClAdK6FXRy4roVvGPN1bHUapTwadd1dWmqjJfork1aKgHGuSVwV102VK8YMOS/GkuR0M3qN+b1zJNGO2nNAostzWXETIABhSKQYrCKCVgIkV0KOzg5Xmur12VPuvP+SshnqnDk7NOLROuVfmet0c9lFcsfs+HZ3ef6Pz3S6+e3N5rqfPodG2GmyOh432Rt01benk6F0KsV+kDjCiARWQgG0cg2QglbVyuhXbCGey0MA2SgQN2fLjv0UztdRZIBA358lcp/V/HeB4XQ6ni+96bHdo0V1WwrqnOuViSlnst3Z8vTy4qLLc9l2S68N9HLjz23ZrbklNQIOo7c+W6FeqnPlu0YNGoCgQOVt+PYNHXpn1XWq6u5lovrldCRLEenXTXTPSSbKRTtgByg2RBlFkYpKaOUGGFIORSeMboVMl2MXOurrDIF9dXG3dLJdozW3PGJFTO2BAgEQHGREAMsjEDIkcoECB28HLx36efp2K2UiIoVsieMbIwqnYBhhQGFACNwUAoKRCuUiBSgQOvi53M17q5TIARGUg2ADbRjZGNc5AcAiA4BCArIEAogQOnkw8zXugEACyk0YgLYwAdbHguhXztOtJSthXorqeMMOjVbCvfmx49Gjla90IX10VTea2xJVq66p1h5Lq+Tkux57eXso9Z0cvrGStjW0VTZYUVykyRAAGQLIwrlIqKyYFCMECMI9LLz+Tt2hw9Vx/O/QvM+L8l2u1yNur1XH83889N6bjbtOa2nZRx9VPoboe0IKYPN9X59Do2w02RveN9sbtFW3bR1ehlxczXuZIiaKgJKXQzZMd+hJSA4EBlENlJkq5TSUrIxgALIweMaLLQ2UoEAhqpzso+q4/C9vwPL+U7Pf5Gzocnb0Ml2jJdo105+hmx5btGmmh1HLbfjv0rJ6aacl2hJSgBsARQFbthXsoz9PLh0V0wIADwPo/nVFnSrl1LI6njoZX2Qt1VIq1ixXdFYVJiTJxTIyi6EQ5PGN1dea3Qk5lK2EKpTSUmSIFKC9Hy+NRZbjv05br89lzJaKqHSyXX6KqozNbcUaKqVk65TVyABuAyQbAK2yQANuo9vn8yucq5Tw6NdM7GSDAMNvGKtwIECBAgQIBSjYEyFbDCiBZGGunPiv0pKTIARhRZGtXJRuo1ymRK2rk8YwIBAAAIBkBkQLYVaK6sN+qAQDCgCIbs+UBRZbRZaRAdkYFLZTm2UZcGjXoro5G3oK0rjfXRntnXKCuFcqa55NNXJpngqlydNfrulk9XdCuuU9NVGa2+uUqp2FJgiQbVt1BW4IBGookikjdnxZrbM9klcPUcngdDNzvBei9NVOv23B8l2MPG5uqfj+31uB0bupk7e/P60pJLFwuj85rl07q9NkdFkbrI2317tufqdLLjx36ElOuU7IwKSSnZCvVVRnsuuhUBxlcp1SsDLIxpnZAIQIlZGFNlhQG4AAN9PJh100cTf0/Rczj+i5nHy3X2Qrpst5+nZqpz8Dpdbmat3UyYfQ83j4NGvn6dee27ZRm5+nZltvDIOARK20UGoEApWRgAgQORt+PWR187V3dueyqe11fdCdtc3U2VlUtDEypFTdOKRHZGLJ2Ri8I6qqufp11ynBwAyAUEAyIeMNVVOW24OUBJOBfXW8YMkyjXKyqcylVOwMZACAGMgAGFBBW1b0VU7KM+W6/bRmDeW27oZsnM17qZ2EGUapTgOkAgEQGQAK28YhuMiIEAhdXVAz22lECAQAQGS6ObEB57Lct2iMAykGykAIQIwoKTKNcpwNVVGey5WwyIIEV9dSt1TsUcYUg3Eg2RX109TJg4m/pwARVxWSeNCuNcokzZbc9U8dM8LLia6vW9XF6jfnyUzt2UZqLbeZq3K3AZIpQAx1FW9VOamyxG2UNVOXTVn62Pm+c6nW52nT6Tl8KFXluv2a5Vq60lSrq9jxPJeF9B3aLMnVx9noZvWhtXh4HS+dQ6NsNLLTbC543bKNXRzdLPZdvzZNVVHL17iCSkrkAIrIQrnNRhu2FemqmBAxaNLIAERSSU1beMYECB1MmD3/nPJ+N7no+Nu6XpOXxr6qQ3ytm+Buz5e5z+XTZZEb8+W+urgdLrZ7LbYQ42/pcjZ0KZ2RhRAZJWwyCKICthgFAgcbf8AIboabYbQba5bWWjVUXVzrlohbfAZTz2aGjJiUJW1xtjGDeKhK2EKbLaZ2QasDcCDgK3AZLTTRTZaGBuyENVVGmmjHfprlPZRmsjHLddmtvqnODKUAMKIEBWw2yiUb8+Tdny8Pf1I3AAQIG2jLbCGO/TVKYbVspECIDIAIECA6ijlASUrIwvqqrnNkqpzgQYCBAgQNNVHUyYaLLedq20zsVtlEDZKAQgQIKD258uS7QkpWRhBpKQBkoJHK6NdUrIKDgQQYBkUB4wdRosshEEQKNK4K61cEdCTyUyxY9GWLjdLN6fo5fWwVkYgdsK6LLUkw28YwANlF4wWTthWrOrj58IpJgjqqze04Pl/Gd30PA6PRwadAdSSgrrpnBXRrp5t1fO4PRv6mTs9LL6yqc1eLh9D5wDo6arnjpdX9HLX0M17x7kAiKWS7RXOajIBhRAIFRuhWBrJwLa67Yw5+jWQ2UZsl+lWQGQAIFLo5sXc5/L9DzORiv0xnH29HDo1c/Trvrq100dLLizW3dPJisjDrYufVOzLdfh0avK9jvYb9UCBAgXQrKVNliNkRSDYFGoADi7/AJHVPoX1bNlNoNVNm3VS9FZRZsKsJZuzU2RMt2quVzotrVkYkd9dYcs1l4bZJJTVuqUyIoVsgyVsK1clbZRVvpZceW6++urBo1QcY0Y7aM2G/VqqoZRyXaA2BkIAApLKTKN1deynPz9OtJSiCABW2SIaqc/Zw83mat2O/RntuImSiCkG4EYo2SvrqostgK30M2TLdfTOwhZGAGGwBCAAga6c5DPZaG65TAESuRSgMlAIQAEDfnyZbb6p2QCkREK5SKCEEBwUCBGAZSsjW8Y57bQEcQIOKijgjrSUFdIeKuWHFfmrnyell9P0cvrIJoqBG2jAgrkyiBpOTRjqpz6K6UlKqcqpSZQsjUyhdCgEejlweY63Yy3SVxV1JKuuddcqbIYoZMGmnp5O30M3rWSpnk4XR+cKdK+GndnLYW7aDfmvtj2+Xq3BvXTnz23I2RgIEAgUikGBsDIFR100ANNVPcwcvk7OhxN/TVvfny3V1OopKXO07exi53oObx6LLqZ2cbd0c9t2ey54x6uTBpqoVy01Ubs+Xr4uftz5sl+gB4X0Pqubq2X11Y79JQUvQc7kbs2XDp1ARFVOyBTOYFGoHje581z2dOHQ1U3dfHRkt6MeiF9kJpK9lNlJlMplSsiQkHIp2RirlXKZHAKCCtgClGykQ1U54FFlobgNGOumjJdfVOyBAvrqrlLVVSkpQL66ufp1wAMBGMkUo28IaK6cV+oMKCEAMiCFkIJKSsuhWjmGI5EClGwEBWyDxhXKbpNGPZw83h9DqEIDRjBVznBlJknjC6FauVcpLKUCuUykRK28YwA3BxJhFKuUmSsjGmdkAiA4EAhAKjAVygoEAM01U782TlbNySkADQEHACjgjrSUSZyufdDmcjbXRZzOhm9R0cvrClAVu2EA3bGspZrbmSiGI9LJiwadWa25lAiRgaKhoqzMq9VWaqa5WvXCoOqixVTrR03Qw4dEap4+pj7XRzerKElj890vnQfSuho6WWNM9wNG6jT18W14xSUuvi5/H29Hn6dkCBAgQICybRRCAAInjHfmydDPk6+Lndzn8zlbN+a27x/b9FAqlPvc/lef6XYsjD2fC81ku0cTf08GnWrlXKUDfmyaaqfRczjso6K6Xit+fJz9Ospee6XY6GfJbCvDo1cHodWmyymdsBlHo5cPO1a65TZAcYICgc7V8gD257OsHtur0B6Cr7oSthMO14zZSKmkrXiWRCnbGKucHB2RjRO2AyRHARuA6QCB3+dyebq2Y79IGyTKKSkBq2QaMboV1zndXVXKfoebyKLLeZr3WQrDdM7NNVIbxX6ehmx87Vt0VU5LtEAgAgJKUBkiKIImiujmx8/TrgMlVOeqmimdl8KqJ2wNNVNFltcp3wqqlPRXTlu0I5QCACBGPGNkIFKMrlYGJKURAsjCuUylG4lG2UQNWwxkikkpPGMBXIhAAQCLTVQB0WWht4w1U0Ejiv1JJwCoqwkUaDiVWsoApqnDPbn008jnaqKp8rdn9T0svrClAIAIBDTTQ6jnstqnMh0cuLLddnstDLIV2xqVpJOqTrm2VW/Ng5mvRXJK6651q6unk5OHQuZqkssPUydrfm9aUJLH57p/OgdKyOm2GiyNxV+mrZ0M3TWUgFsIFKqditkFbZJ4wDdcplKAyRCCgd/m8ns4ebqqo5evdtozUWW+O7fo0lMB73zvk+F0Orku0dfFzq5z811O2spAIECBA105+hmx3QrKXQzZeRt6GqnP5zqdr0HN5HK2bunkxUzs42/pK2UJKUK4ghBRoEQEDDo+PZbupXPqFbbIXOr7I2WRtaNjKxlNlMqRJFSZOEimQaIHKDDcAogACECAAYV1ddU7A2AIRINhhQyRStjXRZcA1U56LbtdGd1EBRZdZGFsK+jlxec6navrq20ZeZr3gIAYBkSuUB4xdReMKZ29XHg73O5PE6HU5+nZmtuKUAAQIogMKA3bCtkqp2WwrqnNXIgUoBE0Y6K6qbLKJ2kIlGWQgspAA2BwIEBkg2AgMlBFDqKtq3Bq2GFBABspzdLLigFIM4u7pgNFdFM7VkVSkrUIxpXBHWko1zqqlkdcxHz81vM2Ues6Ob1cQQINGKykAIt+bJku0VTnqpoy3X2Rr01UPGHTy4MOjTxtu+NK4gjZGmmw6GXBztWi2GW+vJ08nK5Wy/g9HXTPOHh6mTtdHL6yMqlk4HS+dA6NkdNsNF0LCtGivbtz9WAGPGLJVynADCERorqossVtXKBAeMYG2jN0M2PqZMO2jNy9e6+urRVTyNvR4u/pZrb+7zuV6Xl8XxPe9Nsozey4fnPnfpvYVzsgAIwDKXVx4OXr3OolEFXOfe53J5G3paKqctt2qunq4ufvz5fIdr0NVlgBXAoIgAcYIBBcjd8nz2dOHQthpdaHjfZC2yNjqx4zKnCwkypFSYcUiEG8SDgQYbZIDDCiBAgETJAatwCAB1FHLZRmtjDHdornZAUNEKoiqdiSe7Pmvrp5eveQ6uPn4NGuiy3o5sfO07IECBAgX11UzsvrqqnZXORR1sfP6WXF5jq9wNxkRADIBAABwIDJMkG1YyQHA20ZgCuUFlu0QFbdRA4DJQL66c1t4AhAgQCJHJknUQGmqmyEMt+hHKCDkAgXQq1059dNGunNfXVzNW3j7ujXKbxjZGumdgYBLIBCCDhXKEK65U0WZiuey5XL2ZOll9P0snq2SgMlADdcpNGJFBhhSgaaqKbJ2Rr6mPA6rw36OXs2xRVxDikovGjo5ufyNum+vJivlVOuqdNE88eDqY+1vz+uAJLHwOl86U6N0NNsb7IXsrdFe7XR1mSKXVyYNtGblbN/P0a4zRVSkp2Qg8Y1TnXKayZRAIdHLiyXX93n8vo5cea68pQCk6j5vqdm6FfpOXxuB0etvzZN+fJg0a8GnXntuULIxSUnjG6FdU56KqklLn6dl0KtVNHRy4uPu6XO07IGqqgpb8+Tm6tuey1JQJFXIqMEBQIHI3fJ81vTh0LYanjfdC5la8bXjY6saMiTKmrtI7IBGRwcTZEbiCAHArlJ0iKIIFRVyIgOMiCIDsjCuU2Ub666LLVbVtkt+fJju01zlB9rBzCKidvaw822FfP068OjXztWuuVkAN31UwLoV9nDzqLLPP8AS67xj08uGyEOXr3rKUCBAiQbIACJW4EAogBuCKIDKN9ddsK8l2i2MMttzJBu2FdcpEADJVymQgoNkgECArdkY2wrgX11aqs+O/Tlt0BsArYbthXvz5LYQ10ZuB0uvqqz0zspnZrpz1zlRO0MAkkBoqAdaOIdVcqaLM9csW6jg8jbn6OX1HQy+sYIEErkUoBSjcCCDYB4wDEbjTxq6GbHVN87TqVpXEODxp2UYOTt1K60lUjprnRVLMssPUx9roZ/Wo5K8PB6PzlX07I6b677YWw0baNXRy9Giy3ZRmrlOxRurqxX6erjw83VsrnYUlk0cw2AvrqSUrIw6eTFpqo6mTDnst01U3Qr870+xztOyi23TTRlu0PGNM7L4VtGDBsozcrXvdRpnZGGK6uTBlu0bKMuDRrVyqnO+uv2HE854zu+lsjC2FfVx4LoV8Xd08GnUVGqcFaAQUagQIPkbflFM+jDpWR02Qvsje8bWVrqdkbGUypsmrtaLIymSRQHJkEIgNwIEAogPGJFpqpx36IMBAKUbAFKNgOpkw4dGqmdkAhsozVynkuvsjEMA+xi52ujNg07Lq6g3ytm8No5BhQUllJ4weMbIweMdtGbRXTXKeK/VmtuostIoOBAKRSWUgECBAIohZNXJ4xgMo66aMV+lW2SgMowICuUCuU3UChW2SVuAyUAhBAd0K9VOfNbekpVynAVsN2wruhXsozYNGuuc7IV9bHz8d+nn6dbKKtwStAI4wirgjikqUlVXLPRZi2UcPm6sm6j1PSyerIQCkGQYAMKFbIoAAMARqCijBbs+LLdbmtshB1TsoxZbpY7ppKtXSroqnVVPNTZj62Ls9HL6yAHh851PngOldDR6HmYq5bCaLI9C2HaKTJY79DxjtozZ7LqLLWUVlKIsjBXJW4BSsjC6FdsK8t2gAQshXvz5cd+kAkpU2Wo5QCESuhXbCuDyX3gYDRXUyXsuH5vhdDqOo9PJhw6NXnen2IPuc/l8LodVZS6GXH1sfP2UZrYw8h2/RZrLPQ83znP06OPt6UFAI4Mp8jb8pz29IrovHVZG6yN1kbXjc8ZsrHUopspklCZTBMgyCmQg4EGyQGrbpVykUmSKW6jNnstpssA4EAhAKiyTxjpqoy3X0ztgBvdny0zsostgbKcxRluv7fP5YbIsV+qmdlkIWxhnstx36SCt3V1Oo57LiLq48GHRqz2XMkGwECBAZRDlAABhRAgEICsg4FkYa6M/P06yBSKUY0Vrpz4NOspQIECMABsoKQYyIkG7Yw0VUZLtAbA4EZEMlbCqqyxoxZLTVTsozdDNi4m/qYdGquUg0VENQgBLKKOAdKuquWSmzHnsxbaPOFez6Gb1sC2MFGGw2ADYAigQCkAWQAZQ01Z+llwhxx3383VqRx9Xx/PQq4XR6HL16UlWCiuVVU6aZ5q54urj7XRy+sVsPFw+h83ur2XQ0A2WRuthbpr2dbFuosuw36SF9dPWx4LYQguNu6We24oDNdGfNbc6VsK6LLQ2jlvz5M9l1cpK5BuArcAgrbJQQHbGGmmiBkv0AZCAAvrqDdcpdDNk01U8nZvrlOBtozZrr+vi51sIUWWY7tPWx8/ma9eDRnthRB87VrKkymSTJ83V8lw6OuDo3Q02wvsjc8bSXWQm6mymVMqbKQcymHN4jIg4BHEQcEySuRErlBFFkYWwhspzZLtGS69kAIBC2FcFoqqSUullxcXd01bIt+bJi0amUezh52iunk6+hspzPGPB6PV+g+b8j4nvem73O5XmOr26rLbYV7aM1cpUzt7nP5fD6HUostDOnkxYdGpJStrr1VUYNOtHJ1G6uvsYudw9/TSU4EAhAgAABBWyBS1058V+m6FathuDshXZGFcp1ymG4BAAkpNGJCBAgEQburqKA2raOSyZQQgFRgLJxHUyYPTcri7KM2S67x/b9Fh0aoJ4wDjCII1yYdKyqqlCqeZlzFfPhxL6/X78/rtufNluvpnZADChJSA7IwgBhSDIKCeNYZoqz3wpihCGqrLuz4fO9PqUWCSrwaLQ6FKKLa6p5keLqZO10M3rbIQvhy+D0PnGDT3GWu6F7xvZX317u7ztOunPxN/TdR01U9vBzOTs34NGvXTn01UJKdFlpSy3XgYYUERRfXTntuVyKUCAGQCgMKAxXLVTRXOZSthWQKWS7RAgX11MlTOy6FXTyYtVVFkIUW2wIGDRrx36KLLYHo+XwvK9izLaaK6urjwaanZG9lPla+j5zqfMQ92a3r316LYXvG542srXVlkbGUyplSZShMjKATdKEoBRBwYY0VG1YyQB4xgJKTIZRgVymkpFK2MLq6g2BkTJbc+Xl697KOmqndRlzWXX11YtGrFfpgQV0K76qvWcfgZrr/K9fvVTmySuVkK/fec8n5vq9rj7ejRZa6j6DmcjtYeZ5Tsd/Bp1mK6+Pnbc+ZJT811ezZGPf5vJ4m/p57bgBCAQAK2yQYUERSrlPTVSyjqqoKNtGXn6NdsYcjb0CiMgRAYUoOARQLYV0zt358lM7aZzg1k1cilAgQAxW7Iwvrq6OXH18XOtjDznT7HM17YKyNYI2wprkBxz2lExZUEwlc/l66ocXr4vR9bH6koy3X1ymUoCSk0YkIEFAjIAFqqz5bbla01Z9NWfPZPJfarirjXKIcOlk5jrPwejuBnosrSWS+vl9rB1tlHr9dVGDRVw9/zjm6+7dXpsjodX2wtvq27aOr1cmDDfq6ObHnst7nP5fE6HUKWHRqVvXTnyXaA5KwDIiiBAIt2fLntuonbAIg2AiI2UoAb0VU57bSggAgBspQL66tlOZ4x5WzeB+h5vI6WXFydm/XTn5mrdku0VTnVOyA8c/J28XPbn258vbwcvTVv01b8tu3jbupxeh8qeOuHQR9CyN9kbnjaytKtdTsjMqcJPGUJMpQcHCRQyA2UQA2BkNlGaqc6p2KMgrcBkroVQKp2WQgyWa25koEC6FW/Nl5evckpdXHgDfP067oV0WXACK6uuiywhuz5fZ8LzfL17vPdPrslRO3XVQA5+nXZGPSy4kcroV8vXutjXku0WRj2+fy+Pu6NM7VbDIHd53LrlLjb+lAiIwgo3SgBlkIVymGFCtwGS01U+p5HB2UZ/F930mS/QUQGS0V00zsrlMgyjbXW6jA2UZs9t2S7QrauStkUAoIikkpPGKSkyWujL6blcXBp1crXurnLbRkUKbHnssjr52nQkoPHJrp5HJ2SxX5ScTpZfT9TH6oN2RhRZdAABkCAUQIINwRFbCl4x62Lm4tGjBo0K1VMSSVxVwDgVR0cvMqnAOi+vn66eZ5Ls9Dr4ux1Mnqr66+fpr8t1/AJLqXQ0WQ0PG+yNuivbso6pR6zj8Dl692G/Tuz5uPu6MAMg9VOcoz23K2kpFIiAyKDiTqIGyVihEUW2lECCg4GujNRZbVOwhXKRSImRppoqsnTOzfmy78+THfp6GbHvzZPHdz0mqnPqqoy2366aFbpnZ3efxPDeg5VFnH7WDmeZ63b35/S7s/XKuZHG3fJq5b1fT1VXI9lkbrI3FWOrHjNlYVYybKRJRSgyOEmRAg7YQrlODgEILXTRltuVygK2QgFIhqpz2Rhz9OyAUiBUb66s1t3bwcwo7vP5XL17ubq283XtA3UXjHPZaRb82UithXy9e+ArbpQLYVZrLiGynPfXVdXVRZcGK2UJKWW7RBWwhdXU6irl6Pl8auUvN9XtdLLi4u7pBuDZKA8YK2G4MArcBkg3fXVXKXbwcyqU6Lbunkw4NOvFfpRypssKLoVFKmy2D6OXE8Y8zXuRtZSZRthCuU4Jkg2AVsgUtdOayMefo1EjspzUznpqzwjVJVTeS+yqUddPPwaYZLqM1uHXT57bR6vZR6/RVTsozpKWDTrRyIAA3BQCkG1Y8YrIeMHjXvz4+Xr11yatK4wrSULYZ9FeTl67w6a5Vq83oOb5zy/X29TH2vS8ru8nb0K5ZPO9P54r6N0NNkb7YXPG7TVt20dUpem5PD5mvdztWzo5cfG3dKyMIAbeMAPXTnyX6QIORSDChW1lK+upHKBAgMkADbJQVkY66c1UrMt2hW1bthWQsjBXLPZaGMlEbaM3ruN5/dmyfPPT+xrlPVTnDEcmSIa6MnN183dn8/pqo8t1/Q319myGskmRwuh8los6TLfbDTbC9lfZG142srGVhU3UmUypQkylBwkUEbJWwhTO2NxAZAKGS6ObFztO1Ww2Ug3BFGynNdXXntuVtHJZSshBJSgJKdsK/Qc3kMo8zVu52rZZGFUrKpzDbKPTyYoHP07FbgQIEDZTnx3aGUSjRXTZGFsK+dq22QhRZb1ceDk7egUiCsVy6uPBdCvXTn4e/p9TJh9TyOF4T0Pqs1t+yjMG4HQzZOJv6UGQgANNVFNlrxjTOyBvz5PV8bgeL73paJ2sFsKqZ2wHUQNWyGujNqqo5GzoMCgQdRrlJXK2FaSkyQANso2wrz23FIqLKNU5dTHz9lOTFfcrjlulh0XMsuS6nPbkV8/1fH8Nns9ykvdI5wIF0K65SVygQIEZEgwBbCuyNcEknqpy57baZumySuIIB1pKCuCOqmyCumuVG7PyKp49+fvdPJ6qqVmS+nzvT+eA6F0NLrRbC543aatm7P1b66fTcricTf1Md+hksV+l4xgBl1dbJBkHVOcGAKUbshDbRlrnNHLLderZRdCpJTiSSkHKJRlkYxCSlAgMopKRRAWTKRRZGHpeVxGSuhXytm/l691kIOo5rb6pzVv0XL4nSzZeD0etydm94xVygQXC6PyGmfSV9K2GjTVZuoN2aLKyueimepXcruJNk0dpG8SEoOD358uO7SHIgYoigEIi6FVsIZ7bqpzA4EZoqpgQElPbny6aqMGjXRZbvz5b66uRt6GunPqpozW3+w4nnPJ9nv4dGuqdisA2SWT2582W7RAAJKTKJQ6jA0VU4r9PYxc4pdLLi890+xTOyD6mTBztWyqVkBJSVu2EGS3Z8vP06/Vcjg9rBzPH9v0emqiyMeTs31Ts258u7Pl4HS66twHUbq6oGa2+MiLIwsjCmdobgACAAMgEAG2jP08mHz3S67pKBC6FVU7QCsIFEFAvrposurlIisjX18XO4m/paK8/Sy4NufHwOl0lcFdbxy8fdOmeXsYvMvHid7nd/bR6/j7ehmtvSUmiqpzqnZAIQACt311EjnstgoRgmUGUM11gVccbYZ6LGkoo60lXVOuuVTLJDFTPHvz+g6OX1d0K6LMvm+p89h0bI6itV0LNFc+lku6uPf0M2PZTn8/0uuyjhv1VTsgBsBqqoz2XJKWyjNbCAZVOy2EHjDbRm4+7pVTnZCHTyYeXs3lIAspXV11ymsmBkV1dee25WyBSgoMpEAACMKPQc7kYNGvFfpvrqvrqgYr9KSmAtjDv87kcLodXLbfXKdsYWQgspQXA6PyGizpk6FsNPQzLTTLDp6Oml9/nc7ma+pmt1vGUJ9/ncvnad+HRsZODJK+qoOVcpwbpWwrrlOBAurrz227s+aiyymdiSmQiXUyYc1119dfM1bboVQKZ2hhQGFBF67i+e5+nY8YVzs4HR6pQGQCjdnyaaqcd+nPZcsmBq2RQbxhArlPq48GynPZCGa67kbOgR1yl28HL4u/qAElKA8YlLbRmw6NXruL56qdnG3dJWY79V9dLJVTnqpp6GbHwOl14K6uuiy22NdcrAyI0V1XQqxX6gECMiAyAURkRbCHWx87hdDqukAgOolKuU4CstjBXK6uquU0lKArTpex4fmubq18rZuVrXTlpmc7VfXKKSorll01cmizCDjeh5vc6eT1fP07NNVGe21XLl69yuUCBAgmS7OHmcjb0KpzDIohkE8anVV1dGS+1lVkumrhXKtJVgpWVCujNZSksPTy9voZfWQGXP4fQ+b5rexpqu6OVX12WxsaPS01deyMPS8ri8/TrqnZy9e7HfpgQIGmqiyMNNVOiqmN4NGqiy7PZbA1058t2gBErFHPbcUrIxgQFZorqiLIwyXaAxXKyMQAZAZAYAgFBDVTnSUstt4bKWqqjZRmsjFHKucsGjWrkGAZEUOowPNdT5NXPoPHdbDTpqnrpnns22RntogVasraLNJU7Ino+XyA7POdPtQldCDxVU7IMoIPGMDTVTqpz4r9VNlhCqU7Yw000PGDCxX6bYQZLPZa6jRO2yMElKudjRjAdR6WTFluvAdLLisjHgdLrgCG3PldRxX6tdOa6uqyMct19U55rb3jHo5seey3Ldo9bxvP311cLodTBo1pKXTyYuH0Op28HL5WvfVZZEQIBS6GfJzdWz6R5bxngvR+s7WDmcPodSiy2BsozWwhVOztYOZztWzl692yjPh0amSDcCBqpz5brwOBAgBsiiCACAyj3ufyuB0etBqyBEQHUUlIBdCsD20Zufp1wIwC6uPB0c2HnadmDRojjfVnsjUyoy3NXTVPLZHm83Tmy3c+2PsOhm9aYxYUCIIlcgyDKUDtYeZzdWyqU41VKUCEWVd9dGW62uQkkVWkoh11yrSVYKbI5Mdyrnmhz9+bvb8/rSkrxB/JOPu9FZDTZHQr2PG3ZTq6eTo7s+WyMLYVhy7OHm+O7fo8110RbCthNGPYxc5HLjb+lVKy2FdM7I3dXVTZYyLYV57LYwDeMVbIMkAuhWjlVOZEBwCkQIQAECAQgFK+urPbbXKbKJRA01UaqqPQ8zkea6vazW30znBhtoxDZDgdL5DTPpA6F0NPWx1NG/Fo6FsLGjZC22MgWRzeMinuoordl0IElju0hyA2FBtGN0K+pjw6aqPO9PspKRAAQAEV1dfZw83Fo01SsyX6ANlFXLTVRTOxJTDN+bLVOdFlobaMfU8jhOo+Z6vbDe/Nk4+7pQIEBQjL6qmEUep5HB8/0uvspz+r43A5mvbzNe7ib+nnst3Z81FltU7Orj5/J29ADIurjwPGPouZx+F0Op6Pmcfy3X7uujPTZZyte9ZOyEOhnyb82Ti7+n6Hmcfl7N/O07NlGbkbeiQgQNlGXBo1skrcBkiEABAgQNdOffnyXV18nb0M9lquTqJSuhXmstdR0V1bKMzxjxt3RSUiGqnP0cuLm6tlka8d9yNaqs2irNtowcXftxXy62Lg8/TXj0ZQcbXT63VT7CuUwxXJlEoIgAcikRbc+Wiy2myd9VKSdU5wVc2VDbRjwaNAIJJVTUKldaupXVVOmuVNU8yvD08vc35vWQA8PK2fM0fSps6V1d1ivshbto09LL0c1t6OUB4w9TyOF63jef4+7peO7foq5Tx36ehmyaK6SlzdW2mywpFKmy3RXTVKyyMNFdWS7QGAIBRAIAGSKQZASUihW7YV1zmUEQGGylAgETJRCyYHAsjDdny57bstt8CyMLq665SvhVku0I5cHpfIqLOky33V6evio5+nqOrupkz4r+gVYymVMk2TZShKyCrnZbCOmqpXLNbfZCKSkrlqpo6+Pn8/TrwaNYYBkRQGykRaaqUclbrlO6FdFlpSdRRyIBsqNkYX11gHUejlxq3ytm/fny8bb0XSABuAsnEMKIVv6H5ryHO1bOjlxcnZ0ElLjbulnsuDeiqki01UtGPM17q5z9JyuL3udySjx3c9H6rkcG2EAHzz03sNVNHZxc3z/S68RspzVynZGBS6+Ln+Y63bthCyMM9t4CBZGFFlrKMRGykQAEAEDZTmRyzW3MlrpzlGunPRZZjv01TsAQIFkYMl9B815HNbbz9WyJczXtuhVkuu5urXRZOyFXSzc/0fL4Hju53ubpt9HzPMeZ6urJfkR8ndn9Tvz+tAyKAUQCDKNUpwLoVQbxgknXKVkYUzlGq2Mo66cmW61JKqSDqDirgHRVKumdayz1SzLLD1Mfb35/WFKuWPidD5u8d9cuhbG+yF+it317tNXYiIEZEa6s/tuB5nXTn5G3ocHo9aqc7YQ427olF0K9NVGG/UG9NVCSnZCFc5gKbLIMpQAwogQCIDthXVOyMKABBW2jHbRmgZ7ba5WVylorqsjCqU2UUlNJTAijVVRmtuDlAAQGUQO6FZF5nq/J89vTi6F8NHpeVg5+np9nDl6WWnynY9IjvjseMmUipumU9VNWW7SUMiDKWqqlJSZJooiosupnYGAbpAA3BQGiklINvGJS010qNZSqnYAIgMhAeMPRczjed6fa1VZ8N+q6FXSy4+Pt6NkYWwrrlNJSVygQAz3HA8x7bgeY8J6H1WHRqxaNXI2dCBAIWQrjdcp9rBy/W8bz+qmjy/X7vL17sOjVmsu6uTDZGHG3dF4q+ukhoqpzW3hiuVM7NlGb0XM4/ke16F1GyEKLLbIwVtJSKCEAAGFKDgPGLqCuSOSt78+XPbddXUyWDTqKICtwV0IFR+seO8B53p9js4ed4D0frMWjTZGvtYOX18XM4m/o6as2/Ph2UYfI9ruAz5rqOB0budpzsuN0M3qOhm9bAVuARMi6uq+FWey6yMGjHdnycbf0wKC1VUY7rw0kgqPVx83DovzWzSUYVJKLKimarlVVOpJU0zzAw9bH2N+f1oGrxcfd80zW9d463jo0QseF10N+2jq7KMuW7QrajjPd+e8rmtvA/JdnvrKVsIdHNj5evcrkAthW6irl1cfPxaNXb5/M4fQ6ea29JSAyACBAgBhQySSZCBEEIEABAgFJhKNZNkFRZINq2rbIAFKNgAEbKUAM4XR+Q0z6NsNu3PZ7vz3n+viowaelztPS4u/s87T0SWQsKk6bKTJ7c+fHfqBKDYIgjVsogrIxVsOQCAQARkQG2UVbgwEC6FemqnZRm5+nZkv0ACkQsjDt8/mZ7bYGHRqostiOhmyYtGlW3S2Z8sbw6NSOUCB6vj8Duc/l9rDzfIdr0Pmur28V+mBAIFR358uiqnt4OX6vj8H5D7T6HGwCtkHjG+unLdeyTxjsoz4r9N8KnjDLdorlJJT6uPAreDRrvrqqnO2EKbLQEBW4DJBsBZGIDo5seDRqqnZG2jG+uqyMKLLdNVOK/TAgBiOWmqhkvrXjfn/D39PwPo/WK2GEUI1SkkgOKuDxo9Hy+ETNxN9hXP871Lap8rdn9V0MvrGSgACF0K9ufLYo5bbqZ2kWqnPmuvzWWhnSyYeZr2JJwV0KKpyvrzZbbElFXGFSyrplBZVI6ap0VyzB4Onk7nUyepgVTycfd81B0aZ9C2OiyN5V2mrbuz9WJVzm8YkXZw86mdlkYaqaPOdPsEIHaw8znadma2+BAsjFWaaqbYQ1VUc3VspnZBuoVSsgJKTRiwACAE6SuSsgFECArbJQIwBZCLKKSmkmyUQGw2UoxoxeKpsnERuCZADl6/jVsdLLfW+hspkHp3Z108mfrYsvA6Xcw6N2S7YHOyDSVuiut4lcrbIxZKqdyt2QirkRJKTxircGQAEACtkHjEBGwECAyQb10ZroV4r9NM7BJ2Qj0suKBg0665SUZAgUnjCudisKNFdOiqnJfpRy10565SqnZ9A835GB4zu+l5uraUiJoxWU+ti52HRqosuSUikQAK2RMh4wKK5zAPGJEyVkYZrbgMNwXZw87FfpKTqNFluujPi0aaLLoJkQIChGdLLjy2357bQOAyTJaKqapzvhVW557boEBWXQr6mTD6bk8Pxfe9Lju0ERABCKSVkKullwZbrM1pmtl08nKvhzObphHzOD0Kt+f1XRy+sDICuWyjMrlTOyxRKVsK6Z2VTn0c2PJdeA3UZGjDkbt7RgskjIQRoOCuCygjrWVVcq65VK89U81csXYxdjrYvUZrblli870vneunS610z3PHQxfpp2bs/UDLIx7OHm5rLunlw+a6vb6GXGyXM17oAZoqq2U5+dp1pKRRorpqlZbCtJTDOnkw8/TrSU3jGuUklNWyIoVsigWwhXOcQQABsiUcCBAImQrCiAUgyDjIghAthWjkkpQIECM4PQ+Q0WdKyO62Gl1ovrsV6WVlkLNNS20Vbs9Oa3TTPRnt03VwDnTZddXDvc7lpKfO07KLLoEHZGFM7I3ROwgUoBBG4DqMGAIACEC2FQGG92fLXKeO/TfXTXKdkY5Lr4BApFJha6M7KOK/TTZaUrIw01U5br+jlx83Vtgek5fFgYr9PL17klO6FWyjPdCvFfpyXaGSqnMpMkrcBkoEBlFXKAQKjpqpgZbr4MArd0K7oV5bbylXOdsK/W8bgeb6nZRypstVhHEtlOcBi0aSEQQgAHUddGfRXToqp4XR6qtwClbCvoZslNlnO07IEERRIkbI1XQoRmLRfXKFcoQz9nF5/naYYr8uW7m6qfWdHL6x1GyELIwz2XVzkyUQQgQAwBvz5L66edp19/nciuT890+sHECDiriCtZRRwSUFdSSqrlSroz25wYe5z+rqq9grYMXm+r89eO/fndFnQZaCr9NW3bn6l0K2jHVVRtozcbd0kcnUYFcpEcCBtz5boVZ7LunlxczVt01U5Lr8d+kiga6M9kY1TsSTKKLLA3AKFbsjAN2wgVGuU6p2WxgjlADIEHBAZEyACtlIgrbJQIBB4wVsOVcpMoslx9vx3Ff1SdK2Gh1pvrnZG0FzxtZWMplTZPdnpsidrDz/ADnT7Vcre5g5nK19Dq5MOyjPz9OyqdoBkoFFltU7KLLSkQgACKDARkQRQYANgLIwg9+bGspVTsKWS7RADIAHqqoshDHfpZLp5MPN17aZ2MotFdPLhzW35btADsYudltvw6NW/PkRyx36YF9dWa24N2QgspACKDAOlAgWwrpnYQAbKMzqLJUTsosuWTVy01UUzsg1bALKTxjfXVRZbfXU6iA100dfFzvKdjvwAyAUBkAhfVV08uH0XM4/kez6DBp1wLIVwfSy4uZr27KMzJZLr4zRVRVOWO+8EFYCtZQSUFdCvHfXyuNuL6/P7s/q9+b1rKIbVyDIFkIpOURADFbeMd2fJnttzW3drBy6LJ8zXsArY01yKpiOMdYKqpxR1h0pKquVFFmdJYerj7e7N6yNo8XC6Pzl47u9z8/J2dq2F19c9lGrTV181t+iunXRnx36VbrlOBG4Jkkcil6Xl8T2fC82yW3Pm8z1u34P0Pqs1tzpBspQIDxj0c2LLbflu0FKNgGUQ2rkyRUehmyJKXUyYeVs35LtCOUCBAgQIAYUQACTm8YFAZAg3jBXJJSeMSHE3/Hq5dCmfUtjqZab67NNTR6WU2VrKZU2UiSZSvrg8VXK2yKqnYyGirYwrlN4xgMlRZaGwNW4EYBwGUQOAySSZQG0bdJkgLu8/l8Xd07oVVynbCtJTz2WuolJZSA4EZEaqqN+bJRZb6XlcR4x8Z3fS0W2gOhmyYdGpRkOllxMlzdWyyMGSosuKirkGEAh0gBCBrpz47tAbDNFVMH0suLkbegrlAVuyMb66ct15RGACiAyjbCFkYPGMDVVn5urdVOwBADFGwoBRtoy66c/oObyfG9z0dM7LoV2wrpstrlJW3jFJMpBisVoqCSIVpKFcoB00WZ/Rczy3mOroWXH25/V9HN6y+urPZdGFKArcAoIKyBAKjuz5CRZRvrpwaNOS62uZFFZRSRClXBHWrqWVIKKLKg8ivB0cvd3Z/XEFeHz3T+d6qdP0TzHnPKdn1OmqdkLd+fTto6mujPi0abYQ811e1luvA2SiQb6mTDsozQPW8bz/I29HRXTVKe2jN5jrdzjbulVOwpQIEAhAurpthDNbewgFcpkAECBAtjDp5MKt1TsaMQ3ztW0BAgEStgcBkgEZAIAIMpQQbKIHD6HyCue8HSvr0WwuD1aKpWRsV3EtKsKmybxlfXCqd/oObyeRt6ayldXCudlE7ehmy5br7Iw0VVc3VtVsNvGJSVsgGQLq61cgwN1ym8YwElIpPGPQzY8WjV18XPw6NWK/TGbs2VJSx36IAGyUAMKIED2nC8znsu5uvc0Y8Lo9SBZCFU7IDJQNFVPXx8/nadaSniv0wCIosjDRVSRVymB2KFkIY79SSlAKXUyYOjlx+Y63cgQAwothCucoOArIAGRXV19bHgw6NXP069FVOunPVOzPZdXORADKUCAQvqp9HzONw+h1MGjVoqpz23BhRGAAyJQCRDStI4gik4I4QzUWZdFfNZcnp5PMWR9jtz+vostxX6ap2EACthlkUrFbZIBA20Zcd94FAZVuq6ZuEYQVwrkklBJQrlWrqV0Www474VTx9PJ2vTcrulLj7p+d6fzymfU62ONct0elo37KdXRy9FHKyMddObm6tythhQGX11eg5vI3Z8uey7p5cV0K+dp2Bvib+nqpo5urZg064MAGQGQAgMo9DNkAZbr6LboiAQgANdOeuU7oV5Lr4O+um6FeG/UQDAMiVuAURkCIWTKRRAgQUGA4PS+RUz6JOhZDVbC66FrK7rY82ezWrvWV11ZdBK7FdqOdkTVVTnsvsiklOuVmmqlHINlKuc65TgPGJErkyUCBpqoKWa28AG4EAMA+5g5emqnVTRxN/T5urakpFKBbCFNljRiQDGQAgQOxi52O7Qkp6aqNVNHP1bMd2gMKIyIgQFb1VUbKM0HVOea29G9tGfRXSRZ52xu6FbKOW2/JdoSUtlGfRVT0M+PzXU7cANlJJPRVVXKcbABiOcZZCBDqZMHN07ElOBorpVtHNZSAK2yRABAIMo6KqabLFGkpQIBFAAJJsoqJZEIhxhBlRTNVyqqnmhzcGihlxPScvtdTJ6nVTTz9Ovm6tpCArcSIK2RAA2VHfnyYtGlWQjFEkKptREqJDXRi5+q+qUUlUrrhlrnTltqSWLqY+118Xp7Iwx31ef6XzonQaOu2N7R0WRt01bd+bp6qs+K/Vqqoy23QcCAQthV6LmcfLdoeMOzh5uqmh4x8/0uv5/pdemyztYObytm6uVgYjk6QAgAVuBvz5a5SzW3hiuRSZKBorpona6j1MmDmat26jL1MeHn6dfJ29ADVt0oIDIAIAbgQRQUiEBWyHA6PyHPb0yt9kddkbr67WV1kLLI2EnbBq7SpsmHZCTJ6qaaLLoSgAbogQAMMKIAYBwHSgQGjHRXTku0K2rkyiRQfQzYwPHfoIWwrKWW68oIrq64FNlgGGFCSlAthX3udyiLkbejroz5Lr+9z+X5Xr90NvGJCBAUElMi9ZxuB5br92qc+hmyaqaNFdO/Pk0VVVykkp57bilmtu4+3orJq5Mlroz479AcgEBW9lOfNbeAVsNwGSiRDXTnyXaIAbAMowZApK2RQYCA6iyjppoeMap2ZL9ABkoKAknAAkkyQBGChWHUrhTOumzKy53P052jxd2f1PRy+sYOpkwVyng0a0lJW4DxiGQIACC6ObFztOsiKi6rBHVVmeNTxpyXWZ7XTMz2uFBWeiyGe2qqeeqWPq4+z18fqQFkeb5nq+AZbq59CyF5NNsLNNO3bR1dlGbNbfdCqiy5W4BCBoqoKWW7RZGGmqmmdlNlgHuz5A5ey4fm8GjVwOl189luS7QQKQYBkClbGvo5cfL17lcklJlEogXQrqnYA358mW28hvz5HjDl696uQYBwGSgQV0K6Z2ECkyQGkpMosoq5ee6fySizoo+nfXothdbG4q22NpVjxsZSJY0ZMpByaMiOyMb6oY79LIIQLIpW1bDbRQCMiCECBBMkG7q6w3nstIogg6ijkUnUdFdSt5bb4DqLJVynpqoy23hhBHLTVT3efyubq2782Tp5MPO1bcGnXkuvthXh0amQAgEIAC+un1fH4Pl+t3Md+kigFEBlHZTn9RyOFVOzJdow6NXK1765yKAxktFVOa2+BbCvbRm5urbAABtXKBZGACyMXUaJ2JKTpAGSIAIDJQRADVkGremqjTVTVOcDLbfGFAZXKTKIEGIxZJlXCCuu2GbHe4Ys1uXJdjZcX0XM7e3P6/Do1aqqOllxPGHn+l10cyJlEDZIMAEXRy4sGnUjA0BBoNQgriCDqiiwhVnsjCquVEefNZRVPH1Mnb9DzPQUW20Ty8DpfOqZ9W2OmyGiyNzxu01bdlHVtjXZCGiurDfqSUoEDr4udmtvwadUADtjCIDd1dTqPp+Tw/PdPsUzs3Z8t9dXD6HUpnYRAbJEIEDTVRju0WRirYBkrYwZRosuDIjVTny3aHjDRXUUklLPbdERuJOolJkklLRVSG0lKuU65TeMdlGamy3hdH5Bg0dhX0dNV7x0MtDq142PGxlNlYCyyLZSJIpwkyLYRpstKCnASUmSA1lK2EAAYG4h0mjFJODDCjTVQkp0zsKV0a6Z2FINgemqiiy1XKBbCu+FWey62FYHRbarZR6fk8Pq5MHh+/6hXLsYubfVVspz8Tf089t1E7UlKBAgRhR18XO52nYrdU7IAYBskrYbaMWS6GfIyjzdO2NgIAYyWmqmmdm7PlqnPJdorlOBdCuqcwNkoFsa1Gk5gCggrIDJFECCDYGQgAHUb66Vcrq6sl+hWwEGGBkFFEMSUQIOAK1lWjpWWPLbmz2YWXE6Gb1PQzesDbJaaqbIwthXzNW6BAgBhSVvVVQBU2TrlIqKSAIOAaBCuaurzVTSShVOIKK5U1Tqhiqnk6+Lr9HL6ztYebzdUfIdvwtcundDTbC+yF7K6+vdsp61kK0lLfny5Lb1lOB0cuLbRm8/0etADdkYdXHg2U5+Lu6VFlySfYw85ZS5WvesnEbaMzKOHRqKIECAQKjZGECmdrxhZGDpUzsSU4EFvzZXjBZSzW3a6M+S7RmuuKCACBAIQGjAh2cPNyXaFciKCeK8d3Pl1M+iH0bIaroX2RueNzKx42EseMypumVMklJsiyIG4SKCAGkpPFQIECBGKNXK2NZSVyIALYVpKV0KylorqSUsl2hRhuyMFbAw2rd9dUCqcw2UMkGdbFz/AKl5Hwvzz0vr/NdbuAIGmqjNdftz5ik6jzdWwogQIEF3efy+H0OorlbCuuU4ABggKAbgdnDzap2c7VtgAA3AiTC7ODmpKXI29G6FdcpK5aqaM118AArZEUQCEAAGQLIQDlADYAMgQCluz5c1t6Skre2jNVOdFlqSlBWQhZGsC0V0JIy22U2OqcYq1lm35uPw+hZnsxk4vRy+n7GL0+a24oDHjHo5cff53J8h2vRVzmUgBANdbHz+Ts3wV1dNc5VyatVyZK4QVxuhlzWySUK5QBRXKqudCSy9XFwGXqO5z/R1znRZm8n2fBg6Lx1WxvthdZG2+vd0M3TgVylfVUspVyntozdrDzOB0OtntuZRSU3jH1vG89A8f2/RMgBsozej5nG890uvh0a4AZsozlKiy2qdgYUQHUaZ2Mlsozbc+Xm69ySkAVygaK6aZ2hl9dXc5/Lw6NXO07KbLYJkK2AIMlAZRAWRjXKYbAPGKylxN/x7Ld1St9kdVkdFkLXVzxseNhLGjNlNlIqTDBN4jJwdsIJKauUJQUGQAQIAYrlAeMSIDgQLYQrlKN7KMu7Pl5evfAqnZBMlorqy23VyndCvZRn6ObFwej1q5TAETJfQPN+S105/m/p/Z1zmkpWwrDYGRAe2jLnturc2SIr6692fJztWzPZdAuhVTO2AGFAYUK2Q1U5w31ceDi7ukk5gCggAZR6+Ln4dGpXLNbcQ105sl2lW4DKNsK6p2lJ4wSUwxoxrlPoZ8mW2+qdhEBwIAbZR7eDmc/TriVNlvQzY8d+nNbcrbKJSVuEbI1ZrbEkoV1STFOujn7s/I8709BOVjv527P6vqZPVPGFM7Q3BPFdXHz+hmyeY63cVsiKTKPQzY+Xr2kQEGaas+a2xJEIK43V565xosKZxSUAUVyqrnQksvTycL23Al08vq/Idr0OS6jznU+eq+lZHTdDRZG5o3aK9u/N1ClVOfSy4ufp2JKXRzY8V2kNwGUbIx105+3z+Xy9m/j7ejAuhXbCvq48Ab4HR60CAGFFsK9FVMDFo06qqSlh0ailA0109PHh5G3orJgdsa7IRzW3QAy6uvo5sfN1bapzVsogQA28YkAFkYVymyQbAMkreO/4rku6ma3r2R1MtLxvdWvGxlY8bLIuFhUrItkwTI7IqJuhkqp2FFcpwcCBAgEFYUQCACAQaMQ2rbqKjWTg4JkACkspFJW+pkw7aM3d53K5mvbzdW3tYOb6Lm8fTTR4D0nreF0OrAgiCtskBso9LLjzW3baMu2jPZCtJT01Ueb6nax3aA3bCvXTRh06gNWPFETRjG0b0V1X11b82TgdLrBspQbRjGFDJXQq1U0YNGt1CqdlcpFGqqjLbfBQbqPRy41bxX6qpyeKIqZ2MkQAEADxhbGFM7FbDZSeMHUQOmyyCglYBLKIECAdaSr1VYcd1FNmbXRw4caqftt1Hr3hCucwOBbCtXLtYebVOfJ2dBWEHjBlGmdgagioxxshVVN1yA43158tslddc41ThCiqdSvPDHbDl31+j9157fy9e/m6o+Z63z4PpPHXdC543vG7RXt2UdWA8Y7Kc9bkQzW3VTseMYAZdXWkp9XHgy3X4r9Kt9DNjyXaQzs4ebxt3TRsNwGSZLZRl9/5zyfB6PVSU+Nu6PL17iiMARG/PlsjDnadmiummdtVk2SiHjFJS01UU2W1ynBQAMNvGJAqLxjRZbAZRgyID4u/49VPoQ6TLXfXbDS8bmVjxsZTsjKFhU3i7IjoBK6EKp3aKqoOmy1XJXKIWTgykQgAIyIDZSIAHUVGkpXQrqnMDgEClAIAIAZuz5u1g5nquRwdlGbTVTdXVTZb4fv8AqORt6HI29EhdXVRZbAgFIN6aqM9t1sK92fLiv1dPJh9BzeR4f0HqUkyiA6i8YVymkpFEC+uqqc3SrcttGboZ8nD39NXIgAIFRIKOAG3jGyMNVNGiunp5cPf5vJw6NXC6HVyX6K5T9lw/N6aaOB0utmtv5WzfntuqlYyiG1biIwDgBkBWykySSlbCvbRlw6NSiWTVqEQ40zbKkOorLkuqV4Q+Z6Dm+Pz2e6h7iyMCLPZcAtjAD6GbIrat479N0KtNVGK/SkmrcIkiomUUklcQ42RppmlcFddM4EoR0MZapZqLMfWx9rfm9bVOfRzcXxvc8Qr6LrW8NF0LnV2irZso6wZuz5qLLezh5ua26iduDTrgQGSDYC+urTVRzNe7VTng6LLQzXTRVOyqUwyAyWiqno5sfe53K0VU9nDzfn/pPXcfb0Q2GykQAWxr6WTFz9OymdgbgAHUVlIxWqqjLbeG4ECMAMi2FemqjDfqIKyDZRtjDzPV+T0WdJ477I6b67dNUqpa7Fcym0bLoDKQLCpLKxot0w5RMORADI3jGABq2yRAAkpPGJBWFEBW7IxrlIhuz5cV+kNlKArbJEAEC+ur6v4/wMR0c2PNbdzNW3tYeb8r9f7yuc63PnatmiumtzrnOBAgWRhXKdsK3UaZ2K5PGGqqghg0agNhFBS358mO7RXObxi8Y0WWslfXTnsuDeunPjv0slAAACDKKSkrlbCCt3QrRy7GLnX104r9OmqnBp1311aqaA2jlrpz+e6fY3Z8oDn6dcbAAYbSUoDKMBJSKTJQQbshXfXVmttSRBK0CIcVdQcNdPO5G2QMOe3B6fk+Ly2+8Ze2thXfCvFforlN4xsjDRXVroz6K6cV+lJSrlLLdfBQQB1WrSSYIpJI1pry57HbDNmtlVOtXVdDHhvLI4KLcnWxdnVT7Ei9BzPM+A9J5GqfVeOqyOi2FzK++vbto6mmmmBluv6uTDppo427pJKQbgiiBADfRy4ufp2X11Z7bgxkilpppzXXgIFsYWQrdR6OXH0suPnadYb4+3opKSuUCAGylGbs2V1Dn6dqtq3ZCAbVtkr66qLLYEAhAAdDNjxaNQGGykGFCt8Lo/IKLOmVvsjq0VWdTJVXPVsoWezUS54yhOuV9crmTZNkwSIw5K5PGJQQA4FcpkVkYgA2UoECAGRDqJQsmUWRhTOyBADZSVtkoDKP0zyviVcvKdjvdXHgSUvW8Xz+mqmqdnP06/Gd30vD39OmdjBAUHSurqz23FK+FVFl2iqjbRmwaNdsK1k8d2lkgxorbRmrlKmy2qc4BRZGDxhmtvgbqM1UpslZGvHfpA4BCABMlXOy6uquU1b9BzeRxOh1Lq6t2fL28HM4u7pdPLipst5Ozfrpz9jDzvHdz0dcpskUr66qpzSUigMIgNHJ1EpBkC+unTVnwaNSSA0riyrKopsOnj5HA6Wllz6LMHq+P4jBo98H7mBtz5cOjUrbJBuCurrVvvc/lcrXu1VUcnZvDFZBQRIKxSKyRVcKyV0zSuquUKbI2Rx5ra7YYM1ubr4uxpq9kUuxi8/4nveKpn1LY67I32RvaN2yjV1ce/TVTnturlLt4OZxt3SzW3wRBHKARK2UdDNjKWW7RRZaGylA7eDmc7Try3aCABWylbGHd5/K4fQ6nb5/M5urZTZbVKaSnADZSVuBorqKVcppKTJJJq5FJkrIwrlKDgEAwpQcSDCOBAgee6XyOizo7891sNOiqy6Ftctiu/p5aFduDR0IWQm6ZUmT1VVKTpsuKYZBwCghAVyAMIAyAKDgACBSImSSUoFsIVymrcCMUaSlZGBRA+jeY8bh0aqp2cvXu7OHm8Xd0klP0HN5Fcpa6c/kuz6HnatlFltkYgClorpzXXtGIcoL1nG4HK2b+bq2WQhdCvn6dhCBBbc+Ypc/VrAylbGGiurDfpIiiBpqozW33QrthXku0BspQIBFbCFM7A3oqp9NyuHzNW7qZMPbwcvm6tvH3dLJdoAdPLi7fP5fz/0nrq5zZRIRDxj3ufyeJv6dFlpSgQAyAULIiNtGWqc3jXZGqqby22kgVRntfseH5TyHb6eDRXivyei5njoe0h7iBpqppssVygAIAb6WXF7PheaVvFfp4+7ocbd0s9tjRislqpzVTlnsmrTKrbRi5+m9JRSValSSqhnosqhj1Vclo+n20euZLoZuLwOl865evvWQ1WRvthftoj1Mlu2jqxK6FaSl28HM5urbzdW2BoqprlPn6ddcphsMthB4xuhXiv0wAxkdbFzsOjVrpzq5Z7bqpTDd1de2jLTZZ18WDZRm8v1u5TZbVOcGAgEAACMurrDZFVKwNgHSiStxsAyUApEUGkmUQIEDgdL5Ey16atVct+qmyuWzs4svTyUc/T0eTs6jxnHZFYybJsnB6qas1ughZCNc7FcmSKGSABsAwlHAgEIEApRgbKGUUcmSDYCAGFECBbCvv87k+j5fG4fQ6nQzZPP9Lr8PodPoZsnQzY+D0Ot28HMyXaCLoZsgZydnQzW3aK6sd2h1EDuhWyjXKbxirbJVTmHIpa6c9M7ElIpVTssjBkuhmx8jZ0CECBZGFcpwA3ZGBSSUoDxjZCAbostgdbHz2Uezh52K/T18XP4HS63N07NNdWmqiByte/NbcyUCARAbqOqnPiv1BgGRAIDJOolRpnNZSKhCAFXN315rIZ9dOK+vDh0Rrnh425Ww4Wqr1tkPalK+uq2MM1t4BW+hmyBlcp+14Pmcd+kqPH3dHPbajdFlgaosnTORUFlHfmw02PFfbVOIKw66p0vHLnth08nE5uqOir0fRzesgmXPz2fKePu9EDc60bKJdzn4uhmv6WXpUzspss01U6qc/M17uTs6Ab258tU7Ml2hJSeMXjAOWe23ZRny23VymQgd/ncmmdjJK3pqpZRz23ZrLklLs4eaG/S8ri+J7/psd2miy2uUyAAgAgAIyyEA5EQBXIMZAAAQgQLoV0zsgEIEEBq3g0/FqZ9KufU2UT7GGndnjDR5nrei1UxJbmt1XVtk1drJ3QjXKzRVDPbfdXXqqqy3XwcBHKNlIDVsiiCECAQAQUHAIWwrqnY8YFKqdhAAQgQLIV9HNj6WXFh0au1g5vkuz36LLu/zuTweh1bIw6WXFz9Oymy2A0Y9PLhrlPLdozW2lDJOo1SnAgWxhrozMlTZZppp5evdGQbKN1dee20DsjCqU2AAUg2rZFAKIGyjNXOeS7RZGBSrlN4x9JzONuz5cd2iuc9ufN0M2Pxvc9Ji0aUctFdWunPztOwgAgPGCSnAsjCBTOyMiQbKV9dQbqnNWQRUVahENVyiCuOvVVz+XrO1g872cPmfK9i7dn9V0snq7YV6K6WS4PQ6tc593n8rla9+W7RbCvq5MHH29HVTn6eXDxN/S6eTByNvQsjWVCmyRULYUZL7rIZ6plNgrrrlUrr1U86myqiynHfn6Gbu9LJ6uBDD1cfxT2vC5Wa3p57Oir1drDlthu2Udbkbehw+h1bYV57buXr3czVuSUoDKIcoCg6RSWUilAVuMiNFVMZXKcC6uq2MO3g5nZwc3n6taOfUyYOpkw+V6/e4fQ6mey7NbcrYbgMkQARhREg2yirkrZEUEQHAZRVygQIAYBkRRxt3x3Hf1gdHVVbuzuuWt1f18WXFfueM6p6Fd9sVFKOwp6aqkdiSnvz5sGjYrZG8YpKUAgBvGEHXKTJBkQQIQUGAgMkrYZpqppnYHKBAgKwo1059dOfVTRTZZxd3TuhVvzZeVt3gNVNOiunm6tjIDABFuzZsl+h4xvrpx36kbYURAvrqz22lDqLxjTOyBAgWxrVyVtkikkpwStlAYUK2G2USiBAZRqnZbCG3PlsjDLdo105/T8nh+K73pqpTtjCqdlsK9ufLi0aqpTWTAykGXQgrYbeMK5T1VUFKiy2uUwxWEURCIaBEOKuKSgrhfXiwaa65Yunk8/bDhJL22mr2RSqnPoZsnquPwfR8zjc/Tr8T3vT7s+W+urj7ujydm+B3udyc11xUefp1WRqrlLJdaVDXTkxaL0cWVKSjTZFHVXKu2OSidNFlFU8nSy9zpZfVFGunkcXf822UaNVN3Vx19PLXrpVcus8e5pqpwadVsIc3Vt4XQ6me28BAKQbgJJvFBjRSybxjXOajsjHZRmx6NJilk1cnjG+uruYOX6fk8P0HM5FFluDTr4u7pcjd0ebq24r9NM7CIogQAyAUWRhbCFNliOSyYGyRUXjFXK6FdU7FbIAAyAyFZwej8irl0AdG+Gi2FzLRsoW2iOuiHP09GyLZSyXbGUmRfXAqVsY2Qjvz5uPt6UbrlYrZSZJXKAyjAVygQIBABAgQIBSjFG6W6jLhv0q5QCkRWwhtoyuo2Qhy9m+idvbwcvkbeirkG2jDZTnrlPJfoAEIjRVT08uLZTm830+ykpwCAAN7c+XHfpAEGSALJlBABuz5c9tuiqnqZMWS6/k7egrZQQgAAwogQIFkYJKQH0M2O6FYHZGHI29EpRlkK7YQDeiukow6NOey4NvGDxikpwTJEWiqnJdoDIBQGAFbjUIlRhEOKkUlAOp45cV9VFmSyPJtjwvS8rtd3neky3X+Z6vbDCjuc/l9zBy4HiO/6cpek5fF4PR61U57c+Xvc7keW6/d20ZOfp1Wwqx33Eg8aapNJJXG+GTLdKyGVlnw6JVSppszo8PRzdzo5fWWxh0snD811fnrLoZ7enpqs73Nxc/V1AdTfn6e2jN0M2O6uvgdLrc7TtVuAQiUBhK5KyAUVymwnjCqU7Ix2U5sV+mAUEABEyVkId/ncnZTmxXaepkw5rb+dq18bb0s9txSIBhQGQGQrLIRuhXnstWTg4Ct3QrurrDKLLgBBWwBE8UkpcPf8fqn0Sb3jssjeVffCxo2aajpZc/K2dS6CV3MnqprthG6uGS/VXKzRVV0c2SDwaNdFtyjSUlciIDthXXOwqLpKOyMFcg28YVTsDZSgQHjEieMQ3VOZQrZF6XlcXp5MLqPkO16KC20Z+Lu6UAg0Y7aMtcp479KSkyiUWRgUr66nUefp1lBSYUQ6jTOwNo5QLY1gaSkyiUbaM2O/RAiLoV2Rhku0QCECAjZFEMEAqNsK4PqZMMDbRm8x1e2kpRsAUtlGbfny0WW3QrwaNVM7b4VVSnVOyBAgXQq01U87VsiUCARQAEErUaKgVWHGuUK5RuhiwaYUWZdFXF01cDr4vR6avZet43nyl869P7GDgX11VymknbCCSfe53K5G3oaKqdNVHJ27qpz0VZ9VObl69hIK0HFGllWCt45mVGe1ZrY1ToV5YYOpj7PVx+p6GbJ18fA8H6LxxXR2UTz2dHXVLBo6Wivbpp7FkYdzn8uBwOl1s9l0CBAKUbeMFbVygQIAbeMFcnjDpZcXL2bwMMiCBABfXVTOy6FfTy4d+bJlu0ZrbqLLcGjXAgBsBGRDJRkRqqoA89t0ABAuhWjlbCuiy0NwA2AdRgwHB6PyGizpQ6N0NFkL3V9kLLY2XVvoZqaZ6ct+t4yKk8Tr48PP07aJ3xuJkNFVeynPTOzPZdVOyCgFF8Ks9lsG8YLKUGyijkrlfXTXKYbVuA6iGwBQGMiB0cuJJSx36e5z+X18XO9LyuL829T7Tma9xEAshHo5seey3PbdVOwpX11VymG65S0V06aqcGnXEQNtGbHfoA4AZBpKTRjZGIZZGN9dOK/UrbJQLoVI5WwhfXVuz5ap2cjbvg7YQJGqVmunPpqp20ZfZcPzngPR+t5mvaUJKUCBAIdXHz6pz1U0wMGnXktvDcAgAZRsjC+uqqc6pWVzkBrJvGMEBBkIlQWSVxV10zLY4qpZMd9TLkdzn+Tqn7fqZPVe14HmeZs3eI7/pwN4xvrqostgWxgrah0M+Tnadd9dLqFM56K6K5PDo0K0VWririHBJQvryUziHTmtijoDxsub1sfa7OD01U7Odqh57pfO6bOqVs3UP0XL5/E39zTVs3UdWJdvBzMGjVztW2AQVkBkQIKyEK52AIEAN2RhAVvbnzY79FcpkIJkAIBFqpoxX6boV2wrsjBXK6FfO07CABW2SIAAxkgNlHu8/lcTf1Kpzg7IVhyVu2Fdc5xEYUg3AaKDObq+MZburTPqk2WwveN1kbnjYys1Uw9DzeZmt1789Ga3TuzZ/M9bvU2XlMogyMpWRjpqpsjHHforc4wDKQk4ERpqpzW3WRhXKYbKUCyMYKAkpwABEjkyUDbRlostqnbsozej5fF9DzeRVKz536f2Ga26yMXjDXTREr4Vcjb0gFsYVSnGI5PGNkYbaMySlhv1d7ncnhdHrKwoDCiArbxjspzUWW1ysgQA3EgwNlBSZRZK+uquc/WcbgcnZv4+7o1TtRuB6zj8Dp5MPh+/wCoZKmdiSkG3jEgVHZRngdXJg890uwyiBpKRCBBX11I3TZb0M2OuU8V+kiKQZBQirA4gSuAddcoVzqvq5tNmPPZhePE6mX03Yw+m10Uec6nZVtktFdOey4pEA2BQN2fLkvvrlLTVRTOd0Kc9llc2pEkEkklEFauEKroZKpwonBJZ65ZXXO6+Lr+i5noeZq2476PPdP55RZ1rI6d2eW7PFTQTqa6esrfZw87k7N9NlkBkJJlIpQZCyML66sd2gMgQGREozp5MXO1bEcoBCBAAK3qqovrqw6Ne7Pk6OXHwuj1WSqlOAQUA2yUAMsjFHJlHuc/l479PM17nUImrcBlFXKyMN2fKRZLtCuSt1Tnwej8hZbdlF4NrrUVcTRbCfVx5r61VPTz9O/0XM5fC6HX6+LDyNvTpncSQGRlAbVyeMYGiupJTrlJXIBAIFLRXTXKZSrnNWyhW3SaMVk4AHAjABRA20ZqLLap2aaqPY8PznnOp2PpXlfF/N/U+zzW35br81lwb105+xh53F39LNbdqqponbAVsgAImSKOnkwcrZ0IAbgoN4xSUr66gFU7IECAyStlINwCCsZBSgnjHPbcUnSViuWiqn6/4r555zqdnwvofUvCGa69RxjIAaK6XjHpZcWW291GuU65SyX6Sl0c2PFfpzW3QHjHbRlthDNbbmtvJGuUgwEVahEOFcoK4B589lCvn5LsncweSK9pdD2kAAGFF9dVFlsCBAZRAwzXTmostpnJ1ACSTAg4q4wjRYQrhUHU0c7Gemde/Py+bpI8HWxdj0/J7vG3dGmeXzXW+fZ7OtfXo6WWOHR07YW6qte7N1IHQz5OVr3wIEAMKGSVshAshWyVFlsApBtkrI19PJi4+7otFLKQCAGFBCC6GbHh0a9dOfr4edz9Ozl7N4EGyiBAgEADJMo3Qr0VU0WWq2kp0zsgPGN0Kq5TgMl08uGI5uvaUZrbvP8AS+RUW9Mx33w0Wwvthb0M0N+enRUyrObr6XSyZuXs6VcrtVNTp0WXI7IOyMVcw3BlCyd9VUBJTVtWw28Y2RhqpoWTz2XUWWvGJBWQChlFXKAQAQIBD0HN5HI29DJdfqpp+keW8Xw+h1Oxi53nen2Ml2iqdnE39MMZL1vG8/zdW3la99NlgGQAQA2UiLoZsmK/TXKYZEEIDKLJFKqdkAhBK5ALYQsUM9lsHAKUBktlGbDo1VznZCBAAQ6GbHbCv6v47wPiO/6fynY79U7NNVDxjntuKVFloD0nM42W2+iy3PZdku0Mo9TJh5urZTZaAVtkrYV7aM1ka9VNHO1a8V+hWw0kkBK41ygyppsqqnlosy0z5+qrgaqfWbc/ryEAAyiULKQCBAgOoJKRUd2fLg0aQwMUiGkkMq4q65iSgHWCsFF8Mm7PzfRcvznluv0MWir0/J231+yx36apZPOdT55nt6/ruLy+Xr7PK2dllbqp278/T1U57oV83VtA4EAgAKRANgAyyEboVZrbiOCA7IwgK5BhSVyVsiKICt2xhppornOyEN+fJxd/TA4BAAGFEZEWRh0suJkmSrlIN47tOe27oZsbxhpppIcfd0YF1dQbSUrIQx36fP8AS+RZ7enZHddXovru0Vy7GHMysxaOi8ZWRl0cueizRRZo10Vb8+fjbupmt0MlqppzXaKpTIwOBbGG3PmrnPLbfXKREUWwrsjHLdc8Y1ym6UAAGMkUlbgBuAUiOB0M2PJdopnY6h9E8x4/0/J4fgPSet6uPBfXV5Ps+g4fQ6l9VO/Pl5urbTZbBPGNUpkCACMKAF0K766ufp1vGLJFKMrcuplw87TtVuBAgOogZFEVzkBulAVmqmmqdlcpBspQIDJaqc90K/def8t1cfP4m/qeZ6vbyXaMd+jJdo6eTFpqoDfawczkbujiv05LtFkYWQhluvVyDAEAiVygroV782Tdnyc3Vsz221yK5NZJHFXWHVTOuizNTZmoswaqfP8ARzen25/XvGKt3115L9AAMKCAAMshBJSKjrpzkjmttossVoqKSRIK4ggkopKCOuFMKA89U6c9tJXO9Lyuh1MfqOfq2NHncTofN7q9tU+jTPdXPZZG3RVt2UdW2EdlObDfqSUiECAUiKISUlbIFJkiJXKJRsBZGCSkBwCAAgADCiBsozBu+urfmycPodSmy1koAAAwAAwo73O5PZxc7Bo1K5YNGqqdit5rb6bLAOBZGBSDaSldXWG6pz4HS+R559Fl0L4ab67OhmhC/PZshe8ZMWXVolnWxYYTSVtcrcGjZBkeiurNZfAgyIo6mTCrdU557LnUbIQost10589t1E7UlJkiEEBhjJAZEBwClAjOrjwcnZ0Ck6j7zzvlOF0er5zp9ki+neT8OUcvZu8l2PQYNOuAkpFJknUapTZKBAIALY17KM+O7QkpK5OolFcpaaqHjFJTthWkpQKpzVygAaSlAIQGjGCrlMgrZEG4jv8AO5OK/Vz9Ov3fnvKUzt01Uhme27FfpshDz/S6+O/T6nkcLpZcXH3dHn6dlcpa6c/L176J2RgGRQA2VGDIlCyMOjlw1TnntmrVcnVNpKtJV1ThVLHTZky24tFfB6uP0vWx+ponbA2UZudq2q2G4KDZKABEVkIMoWRrx36EkFRDSiDirhCCygjgHWkqkdVcqUlRnsojwdfF2Oxh9Pnsudc7Jd8ros62HR19tDyXdGyN2yjTvzdSiy26FbKOey6AQDIBQUg2rFG6RCCKQcoIDIgMMVyeMYBCBZCuqditslorqvrp6GbHydnRy23Bt0gBCAAgXQrRy2U5tVNBFlt0Z7bapTSU4ECAyjfXU6WW262EKLLb66vM9b5PVPoFdG+u/VTMPVC8lrxseNhU2UyTaL6GfNbBc7VviZHBwdsIAYbsjBHIN3111ylXOy+unfmyZLtHQz5MGjVhv1K2wmQUgAbeMSLRXTTO1W7YV66c91dfo+ZxvCeh9VZGPrON5/jbulx93Rg4BUWS9fxPO+M7vpYEBWw28YwGUVcgxkAGUXSUfSzYlHh0aiFU7IAAishCqdgYB66c5RZGFNlmey4gAZIMRyDdkYgCAD0fM43suH5v5/6P12HTq9lwvN57blb5Wvewu1g5vRzYqJ22xh0cuKqVnC6PURyIcHo9Xm6tyScAhEiJXKBBFAaVsqPe5/J5mrXmttSSSSrlCFdU6ap5qZ5M9mHVV57pZfT7c/r0lJJT9Jy+L57pddJTAK2G2USABlFlHZRmDMN+hWKwOMIhxRqOtSCSgsq65Vo61lRXKiGOuWLpZe30M3roK6vmc3X8wpn1s9vS0VW0Wbnjbpq3bs/TWUoi6Fea25lFkAIEApBuBAgBgGRMiCg2UQCthtkoiNwWiqmmdtcpEHUezh5u/Nk890+xltvIQAyIgQGUboQostVl1dfQz5GjHlbN9cplINslAKV8KqLLbIx3Z8jxj6Lmcf5X6/xFc+gr6NkNeiuyGp42MrXjYysKmSbxkSV1cYTrna0Qjg4ETIEIiyMA3XKbqKuUCJOowLYV5rbwwDeMYwDZK2FdU56aqVb7WHm57LoIo6uPn+m5XF8b3fSec6fZVuBAgJKTJei5nG4e/qU2WFCt1zm8YtGJCyMAEH0c2IOWK/TqqoKVM7KbLapTgQAwoIQGjG+FVcpq2UtFdKOWS7Q6jpqpyXaA2UiAAhfXVoqp9rwfMwNdOfidDp4NGvDo1ZrbrYV9fFgST20ZoHWxc/r4ufx9vRWUuJv6fmOt3KpzA4EZEtFdKOVU7FbZKNKGqrP6rj+f01UeL7vo8l9qOKutZVo6qbM1M8ma3B1cfmOvi9HbD2uiunu87lef6XX5uraG4ECMiAwoDUDfmx5brqLLA1Eg4q1CKSjCsEElFXUsqkdayoaONXlSWHVT6Ho5vWgGXO890/niPp2R066ZpLZC/TVt2UdWyMUcmUUlIDKRCBAIAFbKRCAGAbqLRREyUApJKSOUZBso9HLjsjDPZdz9OvfnyX11K3mtvyXaCAAMgMh4waMQ3VOwgA6GbGQwaNVcpslAIQIEFbXXuoy87VtA4HD6Hx+izpVy6d9emyN1kb3ja6saNrKxlMk2i9NUVc653Qk0SDI4BGAI4jVVRROwNpKZSVtkmUVcmSdQVyA2UVbVy0V0vGO2jNmtuVyrlOyNdkIWxhZGFkIXwr8/0utVOwAUBsAA6ObJlu0VTkBwIAbZRKLIwuhXdXXZGADFfpqstiWqqjNbcrkQABjIgMogICuUAg8Yaqc6uXQz5Oti5/n+l1+Zr3PGO3PlvhUB02W4dGr1nG8/Bb8+Xib+nh0asl2hHK+FXRy49NVFsIVzn3Ody+5g5aOWa6/Lbf4H0frGUaZ21TmyTxh6blcRW6LLVbKVFtqhz9OvLdb1MnP6GbDluu4+3ZRY0lCuVWezNTZkzW4dNXA7nP8AQel5Xe5+rZ18PODfk+x342ADZEBwUCAVHRXTnssWTURIqxXAkVcQQV1pKKyrV1o6iZVeeuWVXg25/Q78/rYEMHnep88rfTuhpvrutjaDTor3bKOoBslAgBspBtWykySthspOkAgQLIwuhXZCDKNNlsBW6p2AatvGPVyYONu6PQzZNdGfHfp20ZsV+mmdlVliOQZAKCGmqi6FeS2+iy3fny57LapzsjGBXKZAAQgQLq6tlObm6toGQeMPO9P5JTZ0odC+vS8br67SXsrWjYysZTKn0c2a6tc3X0ISKYJMiDIyEQG7YQ358lUp5rb6p2QA2yQCAyRUbIwVypsseMVb100X11c7VsRydKCAwyyMdVOcD6mTDy9e7Lde6RUabLYiBqqozW3qwoDCggADLYQ1U0Y79Ct2xhuz5Vcr66ujlx+c6nYpnbAgQCEErkAZIhAAOolLrY+f0cuPq48HRzY8l2jz3S6/C6PVVysjDoZsnG3dLsYeb08uIped6fYzW3o2kp2Rhtoy7KM/qeRws9trRW2jNbCvNbdjv08vXu358t9dXn+l1ubq20zsrnKD3Z8miurk7N8AqKsSTgmVW2jJXJZrXTNVTrpsyUzyg5m2jzvqeR1vV8ftZLtGa27gdHrc7VsrlNZSiVkY1ym6iVGAsnbXVfCmiyyqUg0GkahAOCtArWUFdSSgjpZZgZs9ufPZm6eXt9DN60pK8XA6XzmuXTeOu+F2yhvG5l0b6+zAeMYBCAADAMNtGMZBlJWw28YlKyMElPTVRZGDJZLr9NVIHTZZVKxZS7OHm87Trpst6mTDqpz3QrshDgdHrEMd+lWECiBZGtoquU7Y10WWgatsk6jEBsAJOBAKQHAIQTxj57p/I6Z9MHQujpshfbC3dngstVcr2jZfWtlNSu7JdrJKKToDk0RXJkMlAZCSlZCGiunNbfXKatkRRAIAIBDoZseW29JSrlO+uq+uqmyzPZaUXQrtjWjkkp1TmB3Qr35snL17oBBW7oV9jDzeNu6Vc7IEBG2SIAIECCVyjZSZRAw3ppoz22watwA2yjZGNbkspMkAZKARNGPpOZxu5z+XltvSUq5TSUvI9n0MbgvqHkvDfO/Tex35snVx8/l7N/D39SNgIECARdDNk35slc59LLiA8OjVRZbiv1dTJg5Ozf6Xl8XPZb5nq9sNgIBFAgQQFBBpXEkell52O+zFfYjpqnmrlg9557wWqnz+O73mHT9C5WvfAgWRjVOQHAZKArbKMBWMJ4166c2G/QrFkI0rjCMdYIJKtHBJQV0Qz1Tpsjz8t1HRy9zoZvWFKGDzvT+eVT6tsNNsb9dEqp674btmfqslAgQAwoWTiFlJoxdJG2SgK3AtjAArYcmUerjwZ7Lq5SuhB1HNZckpdnDzedq2VTsthXju06aqOtj57JczVt52raQAEHjB4wrlON0zsdRiElJ4xKUCMgMowIEBHKDgEIlwuj8hps6KvpWw02wvsjc8betjy7c8XjJ1LNbr5uroWRNNUKZ3I7A5wZHAI4hJSZIhsozFLFfpjYAogEGjFJSIFLfnyYb9SSeumjLdffXVbCvTVT0c2Pj7ejz9GsgGFFsKw3rpz5LtGqmjZTn6WXFwOj1sOjVBFEAMgQCiAGPGKuQAhAgBlkYwEcgyAUEL66c9lobRyIFJkoHXxc+yNff53KRvHfpvrqvrq4HS63J2dCqc/Z8LzdM7PPdPseg5vI3Z8vh/QepgQAEYBlLrY+fyte91GIjNFVWmqhW+fp16K6njD0PN5FM7PLdfuhkHBQCKIVoiKhVNhxBX08vPxXyqnVivh7Hh+Nx35NtHnPRczudPJ6rk7Og6j4jv+ny23wIAYyAEBW4KMiTEYorIUUEHBWBwBBXBZVpKuuUEdSSqBlpsohz+jl7nRzetshXntzee6fzsHSthpsjothdpqbLpa6eqyAECBAgQFbDbRjGK5FJkkkyhkiINwClvzZQyyMNdNGS6+6uvJfo7OHm8rXvDZSsjCiy2mdt9dKSliv1AI2RdTHhSUsOjUjkRQGigyNgYCAGPGJRADA5BkCIgcPofH6Z9IPo2R1X13aan08lVsJdPLRsoh5jregonpWVuiuEU1c4ShIORQQgwN4pZOB0MuTPbbntugAbJERSDkASUnjEiA4EB4xtjXXKemqnpZcUDmatuO/SyQbAQOnlxZbbqp2X11Zbb42rANkoCtwGSKQbgMkkmUQAwosjDt4OYrfL17sl2hkroVI52RrtjHNZaspK2UQCLqZMOO7R6Pl8bVVTh0atdObNbfdCumdnnel2O1h5uqnPzde3q48FkIczXuyX6KJ22RgkpRGunPh069+bGB87VsVy0V09PJisjXwuh1s1t0DtYOXh0atVVPO066p2QUGrGIqNWiRKhRZKyNFU42wz7aOdluoiweg53ldufztM/b4NP0P1XH4MDzHW7mO/Tju0BsMeMVcoAYAIoEIgUErIQDiBLKKuAcEcFdaShXKquVSvLRbSrw9TH2ell9ZbGvLbRwOl85B0rYabI6LI3Wwtvr3a6etBK5MolBErZQQVkADDZSZIMgQFcikUozpZMXWx4OPu6NsIPGFFl3Sy4urkwcTf06pWWxrx3aNFdVcp6aqMd2ii23JdoKN+fJTOyqc7oQeMUlKiy1HIhXKTJMkADHiiKArYGQDIiBxN/x6izph9IrXbC/ZS+jlp10oO/k7Op0M1Ga3XCeyiqizQkrISKaykU2SKA5Mko4zdnzQMV+kMKCBSVsMKCKBBwIAZEWRgkpK2Qvqp6GfLiu05br4CtkXZwc3i7+myQYQiIECBADFcnjGBAgWRhXKcAithCqU+lmxY79O7Plz2Wq5dTJh4e/p2RirYbRyDZFdXWG3jHrY+drpo2582W6/p5MOe27znT7GS7RVOzVVRjv0tGKSnfXSG9dGdXLDo1EVcpwNFdWiqnZTmx36dlGbkbOgkp9PLh6+Ln+b6nZaK20ZerjwVTn5/pdeiy3TVQree24MiUEGQjXI01Zs9slcUdaSqosy2R5vO1ZvU8fxVU/b9/nej5+nXiv01ymQ1U0ZLr3UGig3XKcEGFAagio1yZIq1CKuIcQ4qVrKFcq1daulJVVTopnmrlj62Ps9zn+kurq5W18Do/OlfSsjpeOm2FtkbtFe3ZR1YAGRQCiBGFEABAgBjJRAbgQIECAUuxi52qqjnadm7Plz23WRh2sHM4fQ6ma2/NbdA6mPD7Di+dpnZ4fv8AqN+fJ08mHjbulmtvIqZ25rboAZAA2SDIggUozRVUyjAosuSUlBgiV9dXmut8mql0FfTdarYX6apaqTVUY794LttFPVx5eTs6dU72TBJiQJQGTgQYGyAwoIuvh53H3dKBAIFJWylGwEZELJmKjINWQcApETRXTy4uTs3wCK+uvoZsfL17lcgyyMVcgEBW2SIFRVyDZS01U9LLhSU6pzpnbmtu1VUZrbqpWXQq0VVZrbq5TjAOBZGCSmAgMo2whbGspZrb3UVHrpouhXmtuSUgPPbcAgECo311WwhnstqnYsmUaaqLoV+04XmvH9v0fXxc6uU8l1/I29EpdvBzPP8AS65Dv83kaaqOllxc/Tr8t1+7A9bxvP8Anul2MGnVBQQFGulk53P06s9jWUVdaSoqnmR89JYMtvM6Wb1HreL1/Q83keF9B6pJSVvbRm6mTBw9/UVygQUHBQA0RRRSThECDiHEEVdayirgrrqnBHUsqKpU1zygw9PJ2u1h9N6HmceizL899L5OizrWx0tHTbC51dpq2bKOqQiICtslAgoOBAgQAwoIKyAUQIEApENNVCt+i5nHdRwaNeW29JS6mTByNvR5+nYyj6XlcX1fH4Hn+l1+Zq3VzkUYr9Nc55bb1bIiiAQARgQQZK2FfWx891GmVnN1bap2BiSm0YsLhdD5BRZ0kfStjquhdbC2+qYd9kZPGzpZc/Sy5oT5G3qZbdQcymyINkQYbKCkQZID1VUI3mu0AIF0K0lJXIBAVshBQCggAVuBdCuyMO3z+ZntuwaNWO/TdCr1vF8/VOzy3X7tU7IDxgspgIAbKQZBsldXTdCEFTO0igK5djFzeJv6iOUDpZcVkYdLLiy3aOPt6NM7HUQGmqnPZdbGDKNE7I2o9+fJlu0VykBq2QVuAQRt4xjcFdXXpqpqnPNdfEEAEDVVRnsusjX6HmcjnatnM17gDxjdCuB1cfP6WXHwOj1lk+nkw8Tf1CLTVRnstyX3gIR3Z8mO+6iyStB1ArrlVVPLntx318jFfzuhm9T1sXqfbcHzHhfQ+pgX11en5PD8p2O+UEjmtvZKCDCkRPGuuUlaDFYVWHFXEEElBXWkoUzQdIeet56rKFMHVydrp5PVZ7Loc/i7/m9c+oVrthosjc8bdNW3oZumkpK3XKbJWRhEWRgrkkpEFbKUCAG4KIjIghAAMK2EKZ2Bmqmj0/J4fN1bc9t1Up87VtDGR6HmcfXTnAYdOrDfqz2XQLYwthXXKdU7M1txErZRpqprlJZSUZD0HN46ylg0a8l2h4xz2WhsgVHib/kGW7qB9G2Gm2F9kbr65q72Vjxs9Hy+V3Ofz+nlycDpdvzfT7ea7U8U8SDZKDWU2igAbg9+fIjldCvDo1PGN9dWS7QkpQAworlMieMYAYURkRAvrqoss6GfLbCsDsjDqY8FFt3H29GCrlZmtudRAK5QIACMvrq1U0K5YtGkDgQFbdR9Fy+Pw+h1M1t1kY66c3awc3g9Hq5rbt2fNorpzW3ByplOmy2AGykUiGmqjHfogFECAGRBAMKFbIaaqKLLbq64FsK6p2UWWkFZsoz1TsRy1VUb8+TpZMWa25ZSsjCmdmK/Tg0a6pzdR9PyeH5br91W+hmx9HLj7nP5OS+/yvY7mS22qcoVkqR11zqqlkosyLLna6fPNH2XQzetvrqz22sjq4ufzdW2qyYGwnjGuUg2AZRgmUUbhENJIigGg4K4AgsoI6651gqrlTXOiuWZXh6eTt9bH6jNbcksXG3fNt2e/fnlku6Wa3e0b9Fe3bR1rq6qLLQDqIbKUDRXVnstVyDIggAEm0VGRAbrlJkikQVt4xjFG6XpeVxPVcfg/NfU+0z3XFHSy4tNVHP07PQc3kcbb0sGnVdCuuU2Uap2K36Pl8bjbulfCvPO3RXTtozcvXvpnYG9FVOynOjeDTsAWxgjdU7ElKBxd/x7PZ04dC6Gi2GiyNzxuhc8Z6KzTVDbRX6vjcTkbenxt3UxaNbxdkIkd0K0djJZbtAGRa6aIGa28qN9dTqMRi0aYBQGAbJQIBABAgMlpqoyXaIHQzY1cg3iv0MkrlAgej5nG5OzoYdGp4wSUroQ0VU6K6clt+/PlxX6XUefp2MkoRhQQeMd+bHntu2U58tt/peVxPNdXt2Rhhv1Oo2Qhmuug1bAMlAgQLIw1U0Zbr65TgEQGGQZSgQAy+uqmdsCBAgBjIAa6c+/Pk1U0eb6nage8875Tz3T7FsK9FdPF3dIN5LtCtwNtGbNbbTZb2+fytVVEFhv03Qo5mvZg0XwgrgrrrnTVPNRZjpnh1U+e6Ob1Gyj17xjlu0aaqHjHJdogBgGQZRgK2RI28YJIgoRVoNArhFXFZQV1q4UzgrqV56500zzEwdbF2erj9Rltvrnj4HS+dPHfsosZadFVlFu26vdto610KqZWbKcyuWa24NwElKyEHjGuc0ciEFAZCsKFbgECkGFFsa6pWK2Q35snp+Tw8d+gOWDRqostx36d+bJqqo4+3o1TsqnPfmya6c/RzY4Hm+p2q5TgQCEErZQyUSYQbVythXBK5AI3VKfC6PyGizpQ6F9eiyOi2FjxusjOF1sJAtsi+rjx9/nc3m6t/L19G2Md2fPTO5JTosuKMGjWyWyjNorq5+nWrlbCuMKQbaKostIAAyBAKIBBWFDKN0K4j0HO5HG3dLJdoIVylBgIEDRXT0cuPPZbuozWQh0M+Txnc9Jvz5NdGfm69pDNZcGFEBW2SIACL3HA8v5LseguhXXKeHRqgBspbaM1FltUprJo5OkAIACJkoBSKLY11ynXOZREo3AgbKM2e22uVgBJSZRgMjbny4dGko6GfJppoxaNXruL57zPV7XJ29DoZsiOWW6/rY+fltvuhX1cfP4HS6+iqjp5MPmet29FVGa21JNlU8YUWCSgCpJVZ7c9M8dFmGyPD6eT0/Wxen0V1EWG/Ukpq2QVgGyUCBBRkUYJZO2FNM5hpWmjUsoq41yiriHVXKpXUkqqLKa5ZWXP9Vx9VM/erKVcsXnen89V9G+Gi2F9kb2jdvz6Onk6OK/TdCvq4+fRZbVOzHdpSUlbIRK+FbxhTZarcHAAQIEANlKBAgr662UdFdXXw87mbN3P0a9NVPYxc7hdDqso66c4by23wLYV5LtECuUw2GFECBGRAZAeMVciIDgWRhpqpzW3K5BuB57pfIqLOky366bQ9eiqxXouhIq6FtkZOpdTHkx366Z33QjoqrSVmumkDDlTO3NbfB9HNiwaNauRDTVRmtvKWunPrpz47tGS7QGyChGQIDIVuAyird1dbJb8+TlbN4GGylAAbaMwbyXaGSSUtNVHd53K8/0+wjl1cfP5O3owAAbIgghAIQL66fScvi8Do9cpU2WZLtFkYqyIdReMbIxz22gYYUBkBW2QVGDgQCIoAQCBFZCGqqiiy3PZckmB311QLIxpsspnYUmSIujlx+58/5bkbej4zuekIbaMue26yFdU7NFVOiunPZb7Died5urZ5fr9ymywChEEVadVK66ZxWVNUsuW7NRZgK43Sy+n35/XQQHbGEQrcbgKwogQQZZGCtgQYCLKAaKjCDqmix0WNXXXKCOoOtXnqnTVPPDn9bH2d2b1wbqnj8/0vnQfSsjqshosjdZG3RVt6mToaKqgyuU1bostgw3XKTKLJPGN0K0cqLLSAZEBhSgwwoIQIkG3Ubq67oVAdFlvd5/KzW3Yr9Vsa8N+p1HPZcQgAFbgERRAIKwogQHjBZTgQUGUkk2SZJHKAQ4PR+QZ7OmToaKr4arI33VzZWsrWUmVt0Iwsrlc8S6uNVl11cOllx7aM+G/WQxX6qbLbYV1TtVnTyYvS8ri+f6XX5O3fBgIK+uuiy2BAgQIBBWFF0K7IwAK5aqc9Nlua25XKAQKStkACSkyUS6+Pn0ztSTg6LLap2AIEANlKARMl1sXP358nC6HVthXz9OxW3SAQLoVvGKSauSSlBgRQQvrq01UVTnVKzPbcGPGLxircCudkSjIF1daSkjkQgiCjIQFbgMlpqp9NyuGBpKXM17uXr3aaqEcqbLK5TuhX3+dyNVNHmup2c11yNhkIwijQcY6rYZ8V5TPLTZkongJx9+f1HSyerIlclbeMYCtwGSIQQDRXTdXVh0aYK2NdcnFGOKtX10ZbZWxpyXTrlGuUA6klUjpSWemedJY+pj7PSy+rDayxef6XzpH07YabY6HjcVfso19nDsZRZLm6trKLxiG1ciK6upJT1U57oV4r9Oe24DgQIyIIQUB4xRyjcE8YgbCqlMN6qc6SmkpWQgyjntvAQCAANwTIgAIBABAKV9dVFtxUdFVVFtqOUCyMKp2AGSKXA6XyLPb07Ibb67yanjeyusja8ZsrGUtVUaJ6VlY8TXTVsoz8vX0N2fP1ceEhxt3SeKeMQ3iv1Wxr9Fy+Osnrooy3X8rZvpnYrk6jltvVuAQgAA3oqpVumywogELIVhuiy1lEovrqostgQFbDcDRVTZGNNliOUDRXTRO2NgFk1GyWmqjbRmgei5nH5urbx93R01U83VtRygK2Raqacl15FtozvGCOSSk8Y6qqHjHjbukGa6KNFdODTrKStwLYQqnNW4N4xZRz23EQGyjAgFBBQIBl1dfcwczlbN2ey6+urTVQjli0aUc4LfnydXJg831OzVOxWWQrZQWTBFWlcK5QuhnyXRqnmpsx0zwvHh78/qull9WrkASUikyQYrk8YhkCBpqppnPq4+fg06oIqGO+4MBF41K402O2GeixVTgHXXKtHRVOmqdAfP6mPtdDN62CSWPgdL51XLqXQ0WQ0WRueN2mrZ0svS1059FVLxjvz5CHM1bct19M7ellw479OHRqurrZRzW3hhRAgEIABW1b01UhtW0lOJMIDVuNxK2MIgiRyWTKCCtwRQQAQCKDrlJoxIX11Z7bSiBAVuyMGSqnYAZK2Ffnep8kpn0YdG+vRbC4rSxaVdoqI7tdEKLNMJlSJPRVX7bg+a8/0uxz9O26ENdNGW3Riv1EGUYPq4+fVOwhppogZLtGynNku0UzswaNYbgQIEDTVRvzZOVt6COQYyAECyMNVNCSkrdU7K5TgBuCZDRgspAcAMAyGmqhXKidmqqjTVS6jEllOqU7Iw9dxfPec6nZdR4u3pU2WwIEDXTnuhXdCvZRmx3aKp2c7TsDbxhbGGey6AyUCmdjKLpQICs1U0QYZnsuVuA6SsgylAjAEAoIbc+TLdoostgMo311bs+W6FVM7dVNHF39Kmc4CsZIkSoQjVMVplnhXntjVLJnty0WYLI8Tdn9TuzeujChZOIdJWAbJQAzVTRbGu6uq6unnatjqDRr5urYSAIhxBAOCSjZGjPYVTrSVaOgPPmtoV4epk7XQzetgK8Xn+l86rl1LoabI6LI3WQt0V7dufqkNdGaB2MXO6+Ln8jb0Ml2imdmynNqpp831OzVOyyMLoV5bb4EBG3SjCgAyispKMNuoxBABAVvRXVpqowaNbJK2RRAbVtkgwogQLIwRygRsAyirkQSUnjBW3ig3BVymyi8Y8Ho/IabOip07YabY3WwuJeVbtohVPR0M1OK/aVMkni/Qc3lJKyiy/Do2PCOqqm6EClVOyuU9dOdXIN8rXuqnZAZIigFEEkpQIMpMl3MHL4m7pOo1ysVuAyiyWqqjDfqDIBQGykG4DxjZCumy0ishCmdiykyjEen5XE890uuREKZ2lKyMNFVO6jKB3V1aqqHjHyvY71c5mKujWB3V1dvBzOfp18nZ0GSgVzkUnjGuU2SsjDPbcUoDJK2yRABfXVTZYrcGAgMlAIQAECAQgPGDxjnttVyZRIGMb4VdXHgost5+nWrlVOQGSIFGlIQVkaddOFJQ5mq2mzKrxc/TnePD6Gf1O7N66AyUAMgQZSgQIGynNRZYo0k4K2FWunNztWplBlDLbNXGOCOEK2VGa1VyrDoKy02Zsl1PXxdfpZfWAElj4HR+cB9NlreOiyN1sLdFe3Zn6sAhbGGqnP1ceAirlYAqnZvz5PO9PsZ7LoLVVTAy23wA2yQCA8YpKUCBADCgpWxhfXVnstDeyjPh0aQ5AAyBEQCAbVuAyV9dNE7SBAAGQGQrLIxaMQ2Ur66s9tyt311+a6vyWuXQWXTurvvrtuhaj1aK5bs9d0B4y5OzqMpFS62PE6MN+y6Ec9t6uW/Nl01U66aOJv6lM7PR8zj4r9OO/Q8VRZbRZYrkrYbZRKCkGw2yRUdtGaiy2iy3TTRVOxXJW1k9lGemdiuSykASUnjGARRAbgQCIDSUmUWS6mTDzNW1XIgAZRsjG2FeS7RAAXwq9rwfNeh5nH8t2O95jq9tW8t2js4ebTOyyMOVs3q26QCuU74VVSs2UZs9t1cpxgHBFBCAAKTqKtgYbVtkmUUlNkikkpRIhAgETRjASU4EFdCrfny8zVuSTKLYVWRgknZGvFfcBBxSS6eTnc/TbmtjTZmrlhBzaLOXvz+p3Z/XFKAyUZEQAAbIilAZJJMqJEVG6FFcpWwpz2zz2WVyRK1cA67I5qJxz2p45KZ1Z7aQYOpk7XSy+rDdcsnn+l85K6NkdV0LWWkq7RXu2Z+rGQcSdRvrqsjHoZse7PlSUrYQSUsV+nl691NltsK4Gey6BAgQCkJOIII3AeMb4VI51ykGyLpZcUHz9Guqcw2yjAgQbRiyirkGwwoDIERAjCiBAZRVyVtlEjDL6quTt+N0z6WmrVDbjv6TLQ8bXVrKy6t9XHk9jw/P0WauXr6NsVhv2aK4c3Vux366pz10097ncrVTR5Xsd94x62Pn87TswadgCAGwBEUQIBAqNUpsK+uuAADaSlZCFc7ACt2Rhrpoy23pKQYUQCIoRsNslAgBkBopJS2U56Z2JKcCCurrWUq5TgikG4Hbwcz03J4eyjP5/pdfhdHqsolLk7OgyWium2EMV+llHRXUrYG6jltuDcGUoAYUBhQRAdsK6p2QCAAgjdsIbqMtM7KZ2VTsVvVVQUq5TdRonbADHjG+FWS7QUoyCAMogVsaQKuZmslvz4c9iy3GW6kHPyXYnXF35vU9DN62AGFECBAgBjJAcERFRrlMkbq6b66QyqYrM9kllGuSRxSULY5kddM4R581sKpZo8HSydvoZvWMlTZl4e/5usuldXp2USD1I9WmrZvz9RW65TZIgVEh6DmceyMefq2UTsostqnZoqprnOiy22EIKqVkbaMboVVymkpgA3BWwhXOYGG4IoVuyMOpkw83VtA65zgoDJAYB0gEbAQIEABGQANkoDKKuQbKUCB0suLg9H5DzNfb1U6YbabN1sLnjaS94zvrOvixfSvK+P831e7uz0eB9F64k7YR9Jy+Nuz5+F0Ot0suPtYebkt0eb6vb9DzOP4b0Pqba6812iAAgQFbgMkUtFdNkYZrb92fLluv6GbJyNvQgFGmqjJdoDFcroV9PJh52rbTOZQ6ijdsY1ymADCAGUoBEBvGF8K81lwbDLIQVyDbJbaMuDRqIK5XV1e+875Pl692S7R5zqdkD2UZroV87VtgKGmulXK2EN2fJmtu6+Ln8Lo9XPZaGwMgAIAIECAySSZQGMiBAgAIEApMorKSjYRSZIN1ycGUikRK5BgZBRRVplDXTk105ElXVJcrZfRbmonlyXZLY8LZR6vo5fWQIECAkpMolCSk8YhkApWwqpsseMNVOaEaLbLYUwhmtsBHPbJXFJV2wzUWKyOXDolVKiuWZXg6mTt9DN60AssXG3fNodG2GnbQ6LNyS16KtuyjqkSuRSIAIDKPSy48t19E7FclbjNVNDJJKWmqnLbekpWRhTOxXKAQABjIARkRAgJKTxj1sfPthC+upZPk7Ohtz5udq2UzsIFRSUgNkgwogEQGQgihW4yIgQCDKOujP57p/Isl3Xhv01XVT32RueNsL3VmmmHZw4vpflfHeK73qvL9f0DRcJECpJKauZRG9dGf0fL490K/Kdnvd7m8rzPV7cbVkGUoAYyWmmjTVS6jju0LKSOXTy4eVr6CykVHfny87TsSUmjG+FatslVOYbiGSDaNlIgGMgAQsjAAG92fLjv01ymAgK2QZIAsm0VA9Jy+LydnQ6ObHltv5WzfAdR6+LncvVupttiCFkYI3rpzvGOqqjkbOgG4N1CqVgBZSeMYECAyiBhsNlKBAgK2yUAMKLIwIVykrkyiGwECCIPGCuSNwQYRQgrRUL682K+xXCqyqqWVlzqLMBXF01eu6Gb1sCAQARkQGK5MowADJMoqy+um2Neeyymcg1oqzWxpzWzqkUWOyNAdJVGW4R01Toy3VAw9XJ2t+b1rKMMHC6PzmLoWR1a6Zq9dc9d9e7ZR1QMMA2SDYCBorpSU0ciIpXQrZJHJZPoZcjKNNluO7RTZZBlKBADCiAGByaMQwD7OHm5LtGS/TAgAIzo5caOWa29ZNXJG2SgACEAgAgAGFAg1biVsYFIN+f6XyJ466bOr0cry3dFloeNrK0q3TUei5nK6+LH4X0PrCpsmyZJRMN6qaunlxc/TsrlYrl2sHMrlPfnycTf1MOjVAgBkCD2UZs9twB1EpWwhnstDfQzZMV+l1Hq48GDTrw36bYQrnMDZJW4ECBAgBkGyQAM1U01TnXKRQG+pkwc7VtrlKArkyRSVvRXV2cPMA6LLuRt6Hbwcvm6t2a26AGbc+Z1Hn6dZCJaaqc9l2mqiiy62Ne3Pm5+nWG7IwonaG1bYQQGyJkikspRBBWQCCjgQIDJQAxkgMqIbDIBRAgXQqpnYGQQEGg1CBVVNjBVVOmqeameSizn3Q4W3P6vdn9bBwCAAMDZSiIxJSgNGMEQVjKEIqxJEI6act0aKZmHRdZDNbDPh0TDqosq1U8+mzPkuz9DN3t+b1tsKyYOF0PnDLeTaVphqthZdDfqp69cpBjJI5wCIpa6c+a29lFJT01UFLo5ceHRqyXaAwj3Z8mO/S8Y2RrzW3wFbZEABADCh1HsYedztWzJbeQIAAwoIX10782TLdoxX6VbDbxiyiHIBAgACGunPltvDat2xhqpz4dGsN8Xd8dD3aadXWxxyXdHDo6bK6yNlkZ31nVx5cOjdmt1FSZMqTIdF1cLYQrnZlt0BuBbCHe53Ky3X4r9Oa25JTeMSK6usizW3AbJACECAG7Iw258obost9Vx+D5zqdnDo1AcFBwCIDjABBRslASUrIQtjCmdkBkg3dCopUWXVylAKTJXQrAb8+S6FfI29FHK+uqmywDIQIl1cmCiy2+uopVTssjDma91UpkUDfnygKZ2wA3TOwMgEFHdCtHK+FQHVOxW2UVcoAbAEIIDZIgrAMiKFk2jEMgFKyNdcrAyuTZVhqEQV0zQdVc6qpZap46Z88Pkb8/qelk9WAIQAwDIFIMKAwNvCFc5MolRDWmqjLbakhJBULYZ9FebJdNZQrcVlTTONU6qpUExEwbKO/0svrClVPJwuh84db7Iag9cNNsLdFe3ZR1UclbsjFJSaMWCC10Z89tytkL6qVlJkstt8ZEEWiqmyMUlK2Fbxjg0a0lIgAgK3bGCSlZCG2jNh0aq5SgFBAMiCFkIMosokM9lyNkAxoqMA4CtkNVOfJfpaMYHbwczjbuiHIBwuj8grl0b69ff52XsYaPJdn1NU9bxs01myiCO9JXbaKa5W1yuhLXTTku01TthIhE4EbKW/NlzW3U2WWRiBgLIwqnODDZUWSSUiiAGwDpdTJg5Wve6j2MPOxX6cWjVEroV02WK2BvGIbDCEQQABjJK5AA26iUr6quplw8jZ0A3oqpsjHJdfVOzXTn01U4NGoNq2G4MqMGrbxj7nz/lu5g5d1deunP4P0Xq/J9nvo5MkrbJQIGiundny83VtrlMpRsA6jW5RjIshXtozQOjlx8Xf0s9lwbSUnjGBAgBkCBAgVylZGEABAjHjFG0kMoQjCNc0jrBXXOmqeWqeTPZhJxOhl9T0cvrA3AIQSt6KqqbLYChGbaM2a26qU2IxRDADKu6FBIUTnnslspxUWSy3NXXCiiyKuquVFU81M8fUydrqY/VEK5Y+D0fnCvputWmq1XqZXaatu7P1YCtgHSAQOjmxaqaOPu6SORSdReMK5TrnMDdReMSlArlPs4ubju0479N1dTqMAN311Yr9OunPku0aqqMN+mDIQICNwCBSgQIGqqgBmtvsjCuU7IwZJ4wpnakpWwrSUoDxjfXVVOymdgb4PR+P0WdMrodbHDvc7IktnD6HcV3789YLa5aA7WTZShNosOUJEZQGyhXIoIrIx9Hy+N5zp9hJTgMo2whRZbAIoCOTCiCCsgQL669NVBStjC2EOXr3VymsmUgNJSshBZNkoBSKAx4xdRqnYjkyTKKSl2sHN9bxfPeO7no92fMsnbCBFuzZMd+nLdfwuh1aLLYDKMAo7nP5aylvz5PRcvj8jb0NFdMApeX6/d5evcrZRAgQCESvhVZGGay+yMKbLAMgAgQIGunPsozVymspNGOHTrqlOAQiQbDA3EEjBwIKAAjCogYahEEWVdUxXBZVo6qbMlUsee3DDjdDN6no5fWBhQQglbeMdVVOK/Qrkyj2MXOw36sd97KJSDQYCN0KSoK40WOqYkoq6wVpKtJUo6klRVPNXLF1Mna6WX1gBXh4XR+c1y6dkdVsL2Whlfpq2bc/VgAIwoAELIwsjCiy4BAZJWwwogQNNVGe294weMbYV9PLiZRyXaMd+l4xgdfFzvNdXtWwh0c2PnadlcpwICtkFbDbxgUEURorp7eDmVynh0asGnWjlAgFKxQiIFkY5rbroVvGCuVkYUzs870/kdFvTi6N0NPTyw9BzOf5/p+gonq20Qz2a2U2UnUwTZOEmTKZGBhyKSubJMlBdHNk2UZurjwc3Vtz23Z7bsd2iuUyABZOIdJWwwogrIQtjGiy2AAuhUBrKUSIFJJTDcAAQKWqnPlu0EUDu87lc3VtxX6Q3XOfVx4Ofo1hsMeKuhVXKd9dV0K+fp2AAwoDNufN6Hm8i6FYDo5cdFtqOXP06+dq27KM3D39Si26AoRhQQAAL4V7KMxS5uvaBwIBCAA6ObHg0atdOfHfpZLo5cdFluO7RADIMiRygmSDcFAVtkoAERAQahFlW8ac1sqpxSWeqeaieTPbjePD3Z/U9LL6yBAIklMpAHUYFM7dlGX0/K4nnul1sd+kCDAEIhoNNGuqZCKSikqwQjrR1o6a501yppnnrnh6uPtdHL6wMSWPgdH5yy6JWu6F7xvZXaK9u7P1QECBAAELYVhtJTAEADxjVOd9deynNltvVyrnMBbGt4xqnYjlorp1U0c3VtIdvn8vma9ua2/p5cXO07FbgQIEBkgEC6Fdc51Sn0c2P0vK4vm+p2efp2BjIUA2yQYBgCBApPGKykrCHC3/IKbOiDpWx0XQvvrt1UlctMLoWMrGUmjJlIOULGRBwlAZNkmiklKBdCuuU1cnjHoZsbqO3Pm4m/p0W3QACtskGAZSDcC+FVkIZ7bwEB1EAkpkTRjbCGiunDo1AYYyVsIVymkpFKBpqorlZXKQbeMElMgrZSIa6c1Fl1Up6qaMt18CAQgbKM3e53J52rZroz9vBzHUUcvOdTs8bd0ijqZMHK2b1clbDbJACABW4zr4efzNe5W1bDbJFKBpqoz237c+Vkstt22nN0suPk7N+HRrAK28YhgbKUAMeKVsMIioq2SKMVxVjxprnBlTXKplg5muGezDdDhbaPV9DL62BA2U5s1l9c5AbpFR0V1dXHg6ObFx9vR5WvdGkbVuEVYGg4giHBXEOtXBHWrrWVSOiqdFFlCPF0s3c6mP1MCuWPgdL5ykupfXosjoshe6s0VbtlHVWTiGFEEIkGQcCMiCIDdReMapT0105rbwJXIi3Z82e26qUw32cHMWUsV+rVTn3Z8vL2b7oVc/TsrlKDAMo2xg8I2xhfXTztW2qdjxh0smLNbfluvgQCESDcCBADIOAUoEAMKOH0Pj9M+iH0rYaboXaKp7KFdCee3ZVPSVOyIVYyauwkomHJ04ggUWwjXOYb0VU0TtDcC2FdU7GS7GLm4r9WO/SjYbKTJBkCDAOo7s+XBo1kTxiyTxhorpvrrVumdtU557bkcrYVlJJTSUgwDZK2FdsYVyldXXluvVygJKTRiwAN2fLjv06K6c1t4AhAiW2jNmtuqnZbCvRXTmtvrlKD6ObHqpo9LyuJx93R4u/p0Tty3XtGJANwIIo6GbHVOzNberdcpWRjAZRZJJTgujlx87VsKXVyYVHytm9lFW4OCKCIpWKDwhTZbBQAxG2USVqyqZCKODLNluLYc/naas9uF48ToZ/U9HL60A8YaK6stt4bIigMsjGJWRhpqoy3XVTmjkGkbhF1XVJxxVwBFZVq4JKCupHUkqKp0o8tFmTqZO108vq4FUsfA6XztX0bYarYX2RusjdfXt2UdWDgMkVFkr66st18HBBspQABADga6c6t5rb4ECyMN2fLzNe6CZLTVTsozdbFz7oV479N1dXl+v3SKqVgYUWRhVOfXxYGUeXr3aaqehmx2RhTOzPbdzNW6AQgQIEDRVRRZcrcCBAgEUDhdD5BXLorLo2Q1utDxu6OWt42XQlnt1K74Tsi1LI5tFwkQRzZNkmB4xaKpssvqqpstDGRvzY8t2iqc9ufN0c2PNbdyNvRrlJ4xgECkGQbKO/Nkw6NatwIINwCiAQshWkpJKQGyREUlclbZR358tM7c1t1sK652AIECBAjL6qoLXTRztWwDgFL0HO5HB6PVrc42A0V1VTsKjpqpKXr+L57w/f9RspzbaMwDh9DqwQGRFBCA8YFKmyx4xSUihktFVNNltcpQGSuhVntuurrthWyjRZdVOcCAUmSZRgtlGYhnsuqnKqc1bsjXrpy5Lrq5FckHWVTmtjZHn83VXTZgK4u/P6no5PWWxh1sfP5+nZnstVythXVOyAyWiummdhFXKSsABoqIa0V0ZLroVo0HBXFXWrrV1JKtXnpnTXPNDn9DN3ejm9YB1Tx8PofOEfTsjquhe8b7I3X1bNtHVDbJK2AZIpbKc+W68DVkCDgEGUVb0VU3Qry3X1SsIKzbRmx3aGQsnoqpsjBSVc5bc+bTXTx9vQZKuU9NVMDJdoIAFb1U0LKTKO7Plz2XY79G7PmyX6KpTgEABSYSuUABAgBjIgcPf8eps6avo2w1WRvtha6t3Z4Vy07KIYdG11MqcUiShNkEYJQcGUiMpQbxgkpwCDKKOQY8VsozLJ2whzdW0pQIAYUBm/Ply23q2rkQRsig4IDDeiqlXKuc4DJAIy2utJSthBlHq5MOG/TztWyIIEIACBAgRnRy4+dp2EIHe53JxX6ebq2hkHfXV2sHMpss5mrdTZYrfpeVxeH0OpmsuWUmUd+bLVOeW69kAIEBkgy6usMosuurqdRZKiy1XIA6juz5K5TKKpz2U5+dp2UzsZKCgwwpQGUWUWS62LnY79MEkgqLKvn6dNFjhCqdcKA8ODRTmtxw43Sy+o6OX1ZFtozAaSlRO1kkk2RBd/ncnhdDqMowN2fJbCrJdfbCqmydFlmO+5XGEA4KVhwqnEFKyprlVXKiqeeHO35+90cvq1ckeLidD5uj6dkddsb7IXurtFWzfn6dcpNFJKUBkoLTVTrpoy3X5br4ghAgFJ1G2ut1Dfny8Pf1CADo5sdE7apzZLo5sdU5lHouZxvO9Psem5PE8l2vQd3n8vk7Ohjv0QLIwRyyXaO1h5ma2/HdoSU9tGamdlNlhR0c2Ll69wHAZLo5sfP0aw3ADCghAgKHF3/HqLemr6VsNNkb9NM9lJTPVC5lZvzUUWaa53q7HiXQjZFNF6aqqZ20WW1TtDbxTKPVx4OPu6JQGylfXTntuKIwxXf53J01UeV7HegFECAyj0cuPmbNzxjZCFc5pKSjDbKJRAvrposuDIDIAQLoV9XHz+bq3bKc1M7KLLc1txQrbJQCEFdXVRbco9tGbJdoIdfFzr66uHv6aynBK3fXX7zzvlPKdjvcjb0SDxhdCv1nG8/wCQ7foqJ2hhS20Z4LJdpVsMgNFRlcpvGPQzZL66eZr3BsDDZSthXVOwBuoy9TJh52nZz9OuuU2SgLJxIgUoDKMEyVcpBkIwijLI1MqstzVxeOUrn8/VDDfkJxehm9T0svrIJ4q6upZSSUkcoDJBmunOUoLTVQreDRqossVkIrIvrz4r77YUq4K4LKCuCOpXUkqap56p51eDpZe30M3rSlVPJw+h84R9OyOq6F9kb2jdor27aOnAAyKBAthXVKxktVWfLbespq2AZLXTngQK5S0V1aaqeVs3tGOiumyMWS6uPBVKfI29DJdoIQO3g5eqqjdmy+Q7foqZ2QCGmqj0fL4oH5fr96uUg3sozeq4/B4PR6vL2b2jHZTn6OXForq4XQ6iuXoObyPNdXt0zsgQCEAArfF3/Hqp9FX0rYamWjdnXTyU5L99sJh27c9WS7ZRZoZSZNkwTZKyKosugyCkrIw6+Ln3Qr427pbKM3O1bGRdXVVOauQZAthDs4eaUuB0usBslA0V03Qrw36oECyNZHXKasKIGunPltvDdcpkRSgQHS9NyeH08mHNdf5zp9nDo1QIECBADGSsjFG0lPp5MPK2b7oV311Zbb4ECyMLIw2583cwcvzPV7eS7QGdDNkx36fV8fgcPf1Obq2wIAYyV9dWiqmqdmS7R0M2PJdoz23MlA20ZdVNHK174wD1VUUTtSUoAZsoz311c7TsSUoEZAiUGyjADLIQrnIpBgESKSQE6pUrScelk5HE6F+a3KDm1T5G7P6vo5fWQCBUQ3VKx4wYHjBJSAQICthpkgINQSSLoUq1VIVwDirrSVaOCSqWVFcqKZ5g8HSydroZvWkKZ4+D0fnSvpXQ1Ww0Mr7YXXV7dlPTg766qpzKFbgK3AIXQqMVntuZK+urPZbGQbxiRdnDzeHv6gbeMfR8zjeb6fZuhXVOwNgLIwZKmdnTyYfYcXzuay7y3X7qykrkGdbFgw6NVFlrxhfXVrpow6NTxjydvQgdjDzWS4+7oo5BkD0fL4+O/TyNu+DKUCAGcTf8gpn0Q+jbDVZG7TVZZCxZaSrSTeM760ylCdcrimwwSI1GRsiBA6GbJju0aaqejmx4r9XP1a4h1GuUwAC+FaSl6Tl8bjbujju0q2wr6qqLLIMNxJhRF8Ks9l0CBoqpotugI2rk8YBtktlGaqyyI9FzOPyNvQ5+nWrlADCiBAgBhQyj1MmHm6tt9dWW69JSaKgFJ0lZ3udyuD0esknA6OXHg0a9NVGqqnma9qtq5FJ0mUepjwfQ/M+P8F6P1nXxc/yPa9BRZaURgQ6juz5Q3h0atVNGS7QrbpQHjCuU9dOfLdejkRQFbgPGMAieMM9lrJEiGQgoo4q46Ksl8MvN1WZLqqLMea3FdXw9tHqujl9ZAIQWqmjFfpuhC+unPbdVKZEUEijYbZRAo0BKwOLRrZV02NXAOCOFc61dKOmqdFNmYHP6eTtdDN62BXPHwOj86D6d1ep1o1UyD1XV7ddHTIOo66M+S7RXOTIVgGRQLIRdR20Zedp2VymyRApX10q5baMt9dfQzY+Xr3Bvn6ddM7YF0K6pTSUrIw1U0a6c+DTrz2XJKTxiQsjDPOwhprp35smW2+2MEcst199dW2jNx9vRIrIwthB4xyXX+n5PESUvNdXtbKM2LRqA4LkbfjmezppLp3Q0vHQ8b7I2srWVhVrqTxkrt2UU2xWa3TFIOQJMkHJJTthCBdXXTZbdXVtozdbHz/LdfulGqqjJdoVuBZCAb6+LnYr9Qbz23aaaLY14NGuArZEyQGySycCIuhXVOwpK2rd0Kyk8Yslntt1U0ZL9BS6ObHzNW4gGRBAAGwDJbs+UN9TJgyXaOdp2VTsgQGUQ5AOjmx47tFFtu7Ply23q5Bm7PmyXaFbDChktdOfp5MPd5/K01UdDNk+X+t9zVOwDVtkiADVVn100c7TsSUgOBBMhW3UdFVOW7QADIEFAKL66mUM9twANgTqoEa5tXHo5edTNcvZbTPNnsy57efbHi783qell9YAgEIlrqogstt6uSSkUmSglkykrIIqMErSyIRaNVc0BLKtXWkq0dVcqa50VSypLB08na6Ob1gCuWPg9L50Dp2w16arIanV19ezXR04yIIulkxc3VtDatkUADZK6FeunPz9GuMKA20YQElOA8Y+j5nG6eTD53p9jma9yt2RjVOdcplLqZMJFTOzFfqgQIEDXTnx36IMishDpZcVU7MGjV0c2Pl69/TyYebq2wCABW+/zuSrltozYNGrPbd7Hh+b8R3/UZbtHB6PyBHvV9O2Op46IaLYW2RmVZC6yMniyTKlpqg6KJ3hspwcGRlKD6GbHzNe6+urZRn7/ADuR5Ls+hVvdny5LtFU5rKTwgwuhmyNGOqqjDo1VymkpZ7LoECBfXVRZbAgLJlGiqlJTsjXnsugroQVuuU9tGaqU6bLFlIper4/B8p2O/AgACCsgMlroz5rb0lLr4+eUuRt6KsgQCiAGFHRzY+Zq26qqMl2hkiK6uuBVOwARXV1sovGPaw80pMo8PodXNbcrkkmUQAwoIunkw5bdGa69G4DKMGrdsYNGNU7IKBAgBvTVRTOxW41EQirQavroosL682DRakqabM1M8me3DfXwdlHq9uf1xEUQCFsK6LLHjGuUyIogmUUlKCgAQYVFWRxVpWrIUBx105FdWK+dNkaZ1VTppnlD52/N3Ohm9YyVU8fC6PzpX1dlF19d9ctjK7TVr1U9EhAKNFdNkIZrbq5TjYAMeK0V02wrSUtVNFkYZ7Ls1t2iqnpZsfC6HUKO1h5nI2dD2PE875jrduiy3HfqALJlIo2U5stugNwK5SZIpWwgkpWwrZRsjHdny7KM3C6HV6GfHy9e/oZsat8rXvIBlUrLoVvGO6jLjv0bs+X3XnvLeH7/AKi+urwnovm1UugTo788qZ73jdZG5lY8bGViu26AynCTKWumm6uGDRsg4SIWRi0YrKfUx4OPu6OqmjTVT6Hmcfxnd9KQKWunNi0agMpK26i8YgO9z+Vh0agPm6tsBW2SAMIDjFHZGJSYVcpFJJTAXQrSU9NOdksd+lW2S9Jy+L5nq9siZEAARWQhrpz2xhltv2U54ljv05br2igwOUEBxhiupkw5br6p2UWWRBC2FfVyYOXr3UzsIwCtuo3V19nDzeLv6fc5/K5O3oVSsqnNXIMgQAOBqqoVuuUw3EJKQbZRZJ4xqnOCKIAZZCKSlBBkFBASuMavry5bZ1TikqKp5aZ5c9uAri9HL6jo5fWBjIVu2FZFRZaBhtlGAUiKCSUikAgo0ooIOKtEr6mPnc3Xpiq7GLkc/TZztVueyrNbn20cO6HodNPsWSrnj4HR+eFdPoZ7Kpb7I6LI266L9NXRDYCyMVk2iroV57Lap2QIHVyYMGjXvz5OXq3RmqmjPZdXOUAhEBnquPweRt6PTy4kb890+xBqwDIoPo5cXP0ay2AgBkCDZRthCmdmunP0c2O6uqmy3m6djpYr9IBgAK3XKd0KyG3Plw6NXaw831nG8/8AP/Seu62Pn+I7/wAzos6YOjqpt9Jy8Pnun6B43WRsZWMrCpspspBzeJ0MubJfp1U1OiqU89t99VYbsjH1PI4Plex36Z2NGPteF5nz/S7HE39OBrpz5btECAADLYQ6WXF7nz/ludp257buB0etytm+ucmilb6GfJiu0pORRZCvXTRi0aQOAQgPGCSnrozMlh0aq5SsjH0/J4fmur2klNkgBS20ZrIwsjBlG6FdsIbs+Xm6tvO1bLYV6aqctt+DRqWUgMN3102whXKdFlsAM01U6KqUlPRXTTOymdlcpwL66t2fLi0afYcTzvC6HV5OzfTZakpAcCAQABt4w01U57LWCmdkEBuowEcoIgUoEEySyajJEBGlcQRthRVMpsijopszUWZKZ4FfH6WX1HRy+rVt1Fkr6qs111cpwGSKUCBBQVc5lRDCkBJJsoFRDjCvo5sPK163VOqnGHThvljvjntzA5nteDG+HsuF0OrTPJwej892Ubll0bYaLIXWRtvhp1U7766oFkIZbr9NVOS7QUroVEHjFW0lLoZsnI2dDRXVnttKQbVygigh2MPNDKJ276MqkuD0erAgFLuYOXjv06KqUlK+urBo10zsz23QNNVDJQOhnydHLjpnZg0auRt6PRzY+dp2a6c6OWe26AAIQOllxc3Vt9Zx+BXKXF39P1nG8/8AKfY+Krl0FfTeOrdnkyvrlpKvdWNGbKbKbxd0EHOuVsJMkUQkG9FdWqmjXRRdCohlu0Yr9Pc5/L20ZvEd70zpb82TFo1QAEDpZcWa26+FftuB5jg9Hq9DNk8x1e3bGFFltcpo5JKVU7IDJdbHz+bq2UztDGQAIrIQgdfFz+Rt6FNlgGRbc+bfny8jb0KpTjNtGfs4eboqoIZ7Lqpz3Z8xUeTt6HO07XUdVOemdmS7QG7YQeMKLLa5z2582K/SGyFkK+zh5pDPZbZGGqqlHLPbbmsuZLtYeZZGPRy4vH9v0ea26iy1XIgAIAIEBZO+qqqc3SA1bDGSAQcFAeMWUaLLGCCAQijA0SDRqtjmw321Tprnkpnlpnz65cjpZfUdLL6uMKRSDcBW4MpBhQRAHUapzKjAggJZBUQ0BPGvtYeT5/pdNJJlTVKJKKJ1Zrs9M8HTydH1HJ7NFlvN1R42756j7lsdbx02wtZWaK79lGvRVV3+dyPPdPsZLtMAAyRFbCsD7eDl8nb0Ciqc65WFRDdsIVylXOcRrpzwM9t0B4x6+PnbKM/luv3SjqZMGHRrostgQAADVVQyVU7PTcricvXueMPU8jhVTs5mvbwOj1sWjVbXXdCtlHbRn4u7pQIGyjNqqo6uPB53p9n2XD834/t+i6+LnUzt8R3/AJnTZ0iugy22wu01ThoV6LIzJaym8TRVFZWI7ITZBTgyAHGyjRVSG65T9lw/OMo+e6XY0V002W3V1a6aMN+nlbN5F3Ofy+D0etXKfUyYc9lue2/pZcMDDo1b82XlbN10K2Sy23aqqQOmyy2FdU7EcoAYUujmyUWWgea25JSKRFpqp+m+T8R18XO5+nZkv0WQh08uKyEMWjTwOj1uVs36aqcGnVy9W7n6tgHAZINgIDqIAORUQMNxkRorpKVFlzxhbCvTXV6Hmcffnyc3Vturr20Zeti5/hvQ+p52nZntuosuVuAAZKBAgEUGAZRRyEmYqMKUZAtrrWUkcgyCVkFBBxglK3VFFjqnTTPLfXy7ocfi7qOhm9T0svq4BSIK2yStwCIDDA20Y9PJh5mvdBAI0AWRBARUdFecEMd92ivOrjmtkrrSVdM6abMWyjX0cvpCJHj4fQ8f1cmkGyiza8bGVlkb9lGnrY+e0Y8Xf01cgEbKUCMKWujPTZZfXXh0abIQWUoN4wgBtXJlGyEL66qLLCHSy4vQc3k+c6fYdLDo05LtICAQSTA3UYhW/ZcPzmS/QUroV9LJi8p2O8kp479G7PlVuub2UYOTs6Fc5sj03J5XVx4edq2bc+X0XM4+DTr8R3vT83Vt4XR+Q1T6SvpXQ06KrmWhlddCUV2ymuFtU71dkUoSZMjZEJFEANwdsIFKqdmiqnv87k4NOuqU8GnWyVU59rBzPTcnien5XE8t1+75jrdzpZcV9dXl+t3M1t7KPpuVxONu6V9dWO/TAVvNbdbCF9dWW6+DthXVOYbCA3sozUW3K2Bq2wojuc/l57btlGbVTRvz5Oti5/oebyNdNHL17vN9Ts87VsuhXxN/T4+3o1zsAQGSVuAsm0UAYStvGNU7IF1dd0Ks115SVyVuyENVVHouZx/S8ridnDzcV+nFo1cDo9bl693P07Md+muUmSgQIAbKUC2FbqNM7FcklKCeKZRAELIwpnZAjQBWyRhFGQhZGnTTk52q+udO3PyGXO52qjl68fSy+o6WX1bRhZGNc51ylZCKthshAVgG6juz5Ml2iuUg2BQQYrIIqPSy4Odq1Mod3n8fzvS6tUyuSjrV1q6klnz2c26FCPpXQ2WwsZTeNmymqFlkLdFerRXTltvy3XqNZSeMQyABslZGCOSylZGAC2EAwopstgQURGQdsKuzh5uDRrWUsV2ki3Z8uDTreMXjGqdgANwIED0nL4v0DzfkeXr3+a6va5+nZxN/TgQCACMMV1cmDdny93ncp1Hj7ulxt3Sw36dlOf0fL43iu96W2EPO9P5NTZ0Xjvvr1FabYX2xsshPVUstuxlJlNk4ShIOZTZDIKIEHGWQjArlIo1VUXQr2UZuxh53A6PW5O3oBjI9bxfPWRhnsu8p2e88Y+r4/B8p2O+8YdvBzClxt3SvhVltvsjHNdc8YtGNcpxuJXwqosu258tU7KLLIAGG1bgdDPkvrqthXnsuz23WQh2MXO9LyuJ3edy/P9Lr4NOquU8l2jg9Hq479MAhAiRFBq2GFEZVKdsIBsM000q3TZZAKCAApMLTTR6Hm8hWw3vzZMWjTy9e7lbOhVKbJQABAMKIAZpqpRyqnYrZEUJJ311aaqctt6SlAgklIkYIqNcnCPqOT57ib9+DRZ1MnK5et1Tw57cODRg6mT0/Ry+qAyBSSUrIwVyVshAgALY16aaHUK5TossossVyVhIgVsa/Y8PzXc5/K5evZuz4/Fd70fH27qpsOKyiCAK6p5dtGPLd0WjeykVJ1IqQdjxs01aCoslXOwBAIQAyIDZSVuAG2Surq0V0vGNM7cl94cokQKW2jN3udyfPdPsWQhiv0xnYw87n6dlFlrxhrpzweLRpRygRnb5/L995zyYb8l2fQczXu5G3ogIBAqMGUujmx/ZvDfNvk/sff8Do9ZJSDFcrYV6Kqst18Zx9vx+uXQSXVsjtshfZG+yNmqlWwljv2vFkmykU2UgMjA2Bop0omspANNVOa2+B1ceDbRmZRxX6fdef8t5vqdryPa9BBlK6FdU7AyyEL66uhmycnZv6mTDXOfL17lb3Z8zxhg06ylAVuDgMlfXSQrlOmdkC2FcB1F4x73O5Vsa+Rt6N1dV9dWDRqpnb3+dyOzh52K/TVZYrfF39Pla99cpwIEAig7IV1TsIAIINwHjFXLVVRfXVztOyAGylAgFLRXVluv3Z8vQzY9tGbBo11Tniv1ZrboEANwFbeMYEAi2582a6+uUwAY8YuoqO+urLdeAgLJlRIgRVmiujXTk5urRtow4bzLdTTZkZclHxr6/Zbs/q7Y1xCSmG4GujNj0aSgAGPGO2jNpqo6+LncnZvvrqqnPi7+kyjtz5b66aLLLoUWwr6eTnpJ310ec6nX5WzbXIAmIoxJVbs+XLbrsShJXZFJ0QkVZZHSUMohygQIABWyDJMoo5QAyIYUHppz7qMvM1bqLLQ28Y7s+XTVRjv0wM1t6tkIK2FdU7QEDZRmsjDFo1K5WRh0M2Pn6NfpuVxPWcbgeA9J63jbulBEIgpb8+To5cfK279lGfkbejAAAA26VkIMo02W+e6XyuizoWw2Xw1Ww0PG/RXLRU2U89mplKEwTJOyKKA5EbRUHBwFbVz20Zc9t8D0/J4fO060lIo995zyXD6HV8L6H1IDRXUASU3UHiqp2aKqSlRbbtz5cOjUG9VNEDDo1RJhEAOCA91GXJdpthXXKSuWmqgDtjXfXXmtuy23huqc4HXxc8BbCHaw8y6FYb4+3o8jb0KbLInAVtkiEBoxWTgwECBAvrqpssthC+unDo1QFcnjEgAgX11Z7LRKWqnPfXVEBgbxX6iCNwHSABhRAgX109HNk5G3oqyBdXXXOYC6FVFlpRAViybRgyhZGvp5Odkuv1VY+Lu21zprlluhzOJvWivldDL376/Ubs9VNlquVU5lG2jNiv0skGwFkYXV1Xwq01UX11cvXtVspUWWJKWyjLRbbTOWqnPg06QLXTn9Jy+H6bk8HxHf8AT+f6XUDSt1TfSy4cV+t4roZ8uW3RRZfZBaaqiT0VW5L9QBXIMIFEBWBt4qBAARhQyijlZGFkYX11ZLtFU52Ri0Y6a6cOjUBqDpEQHqqoy23q3AIroV9LLj5Wvd08mLl7Nyt9vBzPRcvj8Lo9Tib+pXKe6jLroz8bd0oEB4xossKTJEAwDZIMeKVv/8QAMhAAAgICAQMDBAICAgMBAQADAQIAAwQREhATIAUhMRQiMDIjQTNCFUAGJDRDFlAlRP/aAAgBAQABBQKU/Nn+QwdFj/PTH/Zv/mb561/5H/brjzI+fwif2eoh6CD9OifGR+3/AOfkkPT+4IPiY3+Sz9v/APCV/u3Ruh/xwwdD+j/FXy/7H4o/wj5Pw8u/xZ/+BP8AI/7mDovy/wC3o3z6p83fPX+v/H//AJPUP/sf9ulH74E9bxkxMvmJzE5ichOYnITkNJ8E/fZchqlB0WEx3CWZX8kPn8Iiky4gv0PzDB+P/SCD58B0/u2xbJYpM4Ga9lmafbqvz+FP8QjA/i/arrf7Tf3XKeiiYdbT1L/B1T9rzuZh5JZ9x4mcTOJnEziZxM1r8FMs/cwdFj/PTH/Zv/mb561/5H/brjzI+fwj4/s9RD0EH6dE+Mj9v/z8kh6f3BB8TG/yWft//gT1r/dujdD/AI4YOh/R/ir5f9j8Uf4R8n4eXf4s/wDwJ/kf9zB0X5b9vRvn1T5u+ev9f+P/APyeof8A2P8At0o/fAn/AJN/9P4N+HPkvTe+oHIldTj7SyzgDYzDqYvuTrfhvp/U313F95rofAdNSqh3PDgBXsNSq0PeKke1rGDROOnZCS5I89dEOoF+1rCV8RD1qt4G3hskStuDOeRH6rYQEK3GuhMeZPMl/jqvyfeY9oWPQyP2rZ2rZ2rZ2rZ2rY3JT+Cn5s/yHqsf56Y/7N/8zfPWv/I/7dceZHz+EfH9nqIegg/Tonxkft/+fkkPT+4IPiY3+Sz9v/8AAnrX+7dG6H/HDB0P6P8AFXy/7H4o/wAI+T8PLv8AFn/4E/yP+5g6L8t+3o3z6p83fPX+v/H/AP5PUP8A7H/bpR++BP8Ayb/6f6/6Ke0YfyX640jdljcn8P6HRdS2zuHx/ombm5uVzjyV11PmbK9RPaVkbe91rx+UtyOw2VcuTUPfoJr7fwnrYv8AB5b6gb8lYafanZMpySgW9BMjToV1ANw+FrMvp/ead5p3mnead1vxU/Nn7mDosf5gmP8As3/zN89a/wDI/wC3XHmR8/hHx/Z6iHoIP06J8ZH7f/n5JD0/uCD4mN/ks/b/APwJ61/u3Ruh/wAcMHQ/o/xV8v8Asfij/EPk/Dy7/Fn/AOBP8j/v1X5b9vRvn1T5u+ev9f8Aj/8A8nqP/wBj/t0o/fAn/k3/ANMT5Pz4a+3x+Zrrucp3ozcjz0vVTqGH46H28t9TsjTwh5VvfMaNm18BBF9gVDtbcKQxLFDxa2rke0214LGsB/DvwpJtw/w789zc30ofttyW4WDgeoHJs32w9TU1Nfjp+bP3MHRY/wAwTH/Zv/mb561/5H/brjzI+fwj4/s9RD0EH6dE+Mj9v/z8kh6f3BB8TH/yWft//gT1r/dujfEP+OGDof0f4q+X/Y/FH+IfJ+Hl3+LP/wACf5H/AH6r8t+3o3z6p83fPX+v/H//AJPUf/sf9ulH74E/8m/+mJ81/wCXKxTW3U/lqxgHsfk3g3xqN8+RPQmM0xOtn+ND7FzOXt1WCAGLdqMvRR7q3EZJ7imvU17fkqsNbZQDjw/rXifwa6Vn3v8Aur6IpcvWtLZB2Py7lJ97P3g6LH+YJj/s3/zN89a/8j/t1x5kfP4R8f2eoh6CD9OifGR+3/5+SQ9P76D4mP8A5LP2/wD8Cetf7t0b4h/xwwdD+j/FXy/7H4o/xD5Pw8u/xZ/+BP8AI/7nqvy/7ejfPqnzb8+H/j//AMnqP/2P+3Sj98Cf+Tf/AExPmo/zYmmszKOxcIJv8otPaM14f1Rox/nx3D0MMw+r/oX4wbMHTfRegYiOJ8zmpFKcmGIbYcbuY2TilFf8IHTlPtacSCjC2nWj0SsvGI34b/AF3AAleKtVljY2NPpwYMK1o1Dg4PpDmh8LBrmTRS6f8fdLMF6aPx8pQ3u5+/cHRY/z0x/2b/5m+etf+R/2648yPn8I+P7PUQ9BB+nRPjI/b/8APySHp/fQfEx/8ln7f/4E9a/3bo3xD/jhg6N+j/Ffy/yfij/Evyfh5d/iz/8AAn+R/wBz1X5b9vRvn1T5u+fD/wAf/wDk9R/+x/26UfvgT/yf/wCn+kPvWf5sNv5cxx39VKcZsTWVgdlfyV2cFb5QE9NdFHJV+1FXkbiOXUw9DDDMOKOXRv1sHuGgm+q9WPt0pPFqEArwreZsXtVZFIBfW+mupE1N9a15M2UTFv4FtNOBnaqrV7OXlr8Jb2Q+9Q5nntzYVZMtpbnsUa7lO4d4QbIt9S/+L8bJEftnXIwdEXcf56I/A1ZldqZGOavCv93/AG647++Uv4gfEQ9BEO4w0ZVUWGQQbAfYpryU6jGb6ib0Ij8Cx2f/APAnqp4knoTBB7j4hgiryLNCdxW1C4M2JUvHDE7xhO4CrYeTmd4J+zH36lO0T7z0e5UtzqO/MihlgQkrhWtLKzUfmYNp9Owsx63telWjKVNWO90xcPd49UXGb1q361dzlqVqXsuyq8GWZJusY7aYuaaIcJcmFSp/GYrcZ3Wgyaygajfax2rtwWYDE7FPiYV6HphiIvvwaCssMofcPAQeIG4W9kvZRjWduy1lyqTWwNqcW1AJqIIV9+O5b9vWusu1lf0w6IncBbtwW+9oVh+RAkejQroe6LQ9ZLAVKfZ+m+uBf2YV/wCRxbcW2npxmhNCaE0JoTQmhNCMeiNxmJ2bGH/j+NbR2yGxcfdd3s/hXkEh6GHWghQ/yOqMVgsPJ11+I/pN+XxLfulNXcmRcK16B42vJqj2uldZtZ/sPU/90J7eFLKrdgNDoeSnRZlsnGCnc5CvxReRstXtDGdwQQcWnv3Z1/IrWzRtIOpPCb2YfsHpma+NZmeuVsbc2yw8jt72tVLyktyrLoWJ6Y133ZXdY4z9m20k2JvoKSxCnBpNjbBBPEkilzNalVpqYL/y9L1tW34FmvPDyrMW+71bDzTk+nJYrKVPRUZ52dG8++4YJh/HLjO6YWLTMXiBNwHoIPAzeuqzG5JU+ese9b1WgmLUBHdNFFaNFMs+Yo2TqutnLdANlzqA6PbDztMsasp+QPxg0TRk24d2R6ndnpYCBub8U4xrioqyGULeyEZ1RH1uPPrcefW48+tx59bjz63Hn1uPPrceHoolVLtMa5sYfRYufZ9GtNdn7+NdzVlbasiPi8GsbfjvojyxOJ/BYvFdeGvDGQWgE0v4f14q5jpxK1gwtqH38P6/7nIt5A6N1Gl86/2t96vEvxEovfHez1RrBh34zp9BU12Tb9zdOE5hOtFfcfIRSXsFFPjWPs6a0iXugStJY9Lzve+RVxPMrLu4ccwfI+RYVn1O4MavIFHdwLnysf1BcjCONZi/TW3ZvpVuKegG+gQtL6+1N+GpqH2lY6V3PQyvVnF/R7AbcSjErtzdwuSeHNYYJiHqfZco7pg6CVnRZt9GPtGGvBPm7INg6dx1hctK9BB90B1DUeJ6UHT2NtpuYuK+Qb6GxrYPaLlWLGyluBrH4h7joH5gDUZGYa14oORYAflYQCVkLEu1Mayu2uxnpmLnrkJcP5/Nbfb6ckOvE9B4IwIZeJ8qjxjubW66gbjOe4K99D9mO+Q9i9NdNfbrXkLOCs5c/PiBsf8Aa+ZZ/EvnS0erj51Lt34MnbQQUcp9PuGlg3b4QVFoMVmhHEyvQK5bLlZeLyR1gr4A+/hXkGlMcdy+5udvTfWg/cRoy72NK7jr9tFPcrtTicT+UONGvd2GYk/26I5WLksIGRzl2c7a9hhmt9JciZtrKUNFBue2qqt2eYoWZuOtNnhT7H92tIA61+qtTi2u1rdNlYYYDMTq/wCuQpbFEHQRBuEdAdDxYdtTAejJ/FKX2lCoTZjwsUbgL04mKuh0A2a//VpsrGQmZiNj+LDa+etz2Sdyc6jC1ehqbMZzw68fAmbnKbm5ubm5ubm4YWgYwMZTcVLObKqMoJfkVcbNTXnVcajaRfNdB47hGvItpOpPt1B4yz7ozb8ks4TluEdNQxRs2jRm9QwdV+WHE/hqTu2NjLVEtxEPdxGexMaOtW+KTXQqeB8kHaDMXM1NanzNdNTfEV28C6+zeFdfKWEbdNV/E+obitpYXZHI7leQ9c/5FhDYSRYA1QbIs192JlJWmX2hY78j4GU7ROuvHa1Qnk2Prdh3WLfpsK6s9rBsTGyMwcciu40WZeOCon+x8AOFBO56YeFhyAvp6N/Ilq31/XajIts1o8/tqyVsqy8U479NbhZVHFUq8DVqN0MMMPTE6v8ApcpGAIOgg/Ueae0J2dTXTD+9bqjS4Oojyu/itvzvUDmLYJYummLQK074EDPa+91Wenq4/wCOaH06yfQ2pHffnWpsZwqsfBW4z9wYOiLGOz04icBO2ItU7U7c7c7c7c7c7c7cYdBE1FWcyKOOp6fh15uLdT22h896it3I1RWa92XxJ8id9Pjzqb2/DvqqcYTN+beW/DH13ckpxiiYViBsnt8mWfE3MTJFRs9MryxZW1T9U9o1hfwFhEYgwLNRfgyuta0Z9tvmSNdOJi3iihByZl2sUbNr+/lg27wkrrRi1MXjlDIx3xrPDHwzeLxjlVwRav0dkOPYs4HwC7nGN7THXlL00PUAK8LJbjgmOO9S0wv51avg/wDtNdWX/wBOem1Na/rNvYx6gS/qiml4Gi6sXidD2KEZeK68DOQCQ/p4Xv8Axw9DD0/vE6v+nLli/wBjwQ6h+eiH3ZeEqr7j2kcvD02vRyrqeVy1MQvFlG4yhpZVoCEEQfcMWgR7SxJFNYzXU/8AK38Hy7LYmQVllu4uTakLGw+NWO10RFwxaFLeK/KAK3/r8PsMYgJ463P1nITkJyE5CchOQnITkIQpn04YGkqQm4F1KLElmNPTWNVnqdQW0ia/D3GgG1hG/HXgBOH27/BWdPcNWeH9eI+OWz+Aj28deFA5W31DiftnIxTxneMBjDR6VXPSy2U+splYb4zQR32vgJqL84+Ich8riLCYW5dBFdROVIHdJbIo7lanUa5yqruF+MCbmuMKRgR14fbU2wXO4rzHtGSMnGbGt6U1G6zOs1bAdQZFgn/I3aGTYD9uSDjuD2jPo+FTpxhGzgYpMyqQp9Sr7jZLfYZjWcLshO1ZRb2bciv7vhuorZpZRYuD8z/x1f8A2/Vru7lYAH1Gff8AUWanAmBeMA5vdgmtcZ+29tVOcgqYWVY688jHahv661LyfJP39D0MPTE6v+lVYND47IR1EWD3HTUsqeUk1L4YtQeNknt1vtrm20U9OWpY+p9W4WsK72fZAmjbSzp4bm+muXjjA7uJef3w5jpxM+IH4nIHQjXXfgDwH4eU73bK5K7x8VcpbMNkJqMw9sir2rcv+Wm2vixEI/CvU/gEf28d+AOje/cPWuo2S/HNY8P6P6jz3PmV0tYPw1P23tyjYJqWLwPn3GK0GoPbbSZdjGo614bgMor5Pbb9Je7bPkGlGR26K7BztZOT2GwjqpMsIM+Oldg4bHKyqbm5jbV89KM/CuwkSJgWEd2vDBOz131309OBvTJG3x8fu2nI+lNqdx8e58nMzayFleO1syKtpwMx0Z6L07ds1uV461Du25Ngrr9IxqMKjPKemPh4H/EuhyHxcCvGOPeuZgHF6BgIlxUpm6jNyagnl6mErHI7ryzpzybrQ3G1zyaHqYemJ01Oyzo2QysM/YsrrugpYTtkRauU7fGLwEIE+0TvHQy3aurKmRhsvQjUpr7tl5WhWf7a24p+xYxDB7zHo7hyfk/HpdfO+637720FvZYcgmM4YeWtjqj8Ws9rLIG1P87H2Pz12Gw5/X/QM2REs1Kcj+TGyK7RXjV2kemdqWVOsawS2tmZ6+MP4lTkuofEe/X2h9/xe/VKzYyVWvLitdfgqkxh5noJS0Yab8JPTFT3sPJpvyUdVYrO9ualWM1kOLYIaHEWl4w+nFzh0P4K4NByyzSxPYuvuFJnwOvxOWwlhrP8JNdasx4VLZeXqYxLWSXgc5x3CNdNePoJ5y304s91CenVE84+Y5xlcqzOTOUe52XkUa7OetKr3rdne99Hfp/pTuf+IoqU+o4+KrUveKs2rFPqnq75QNtdOC7F2/WYuVyR04sF2Vq97l+7aondMw8hbUycKzGPxOa3xlKnoPYeR6YnSq01G+1rEgiGE6NVxEa4pY9ps8U6elgjDbiA2bTlQ4FOIO3TY4w8Ni/pNRW30XLpFuBfSa/SMx4aLMdlTsem3nfTHX6T0vntsh+X4hD0VTxNf2cvb2M1E9n8KlLVsIfjw/r8ZnzBBKsh6jj+p/d/yDGW+rbP1i3mxO4bEIjgRvw71FbuL4g6Jirvx30EPWvHK0YDB7X/AHxcX6iWXhJ9U5rXfHcVS/TcDGP7GD3Q+QEX7ZYv3cYR4GDpRSb7W9JdZTiY4ez0/HFF2PwcjU15InKvpvwJMFrwuxiOSp/D/XQdEECcjzaMhHTfhrcVPoaGOzQsPyPY1V15lDoa3gfc7UZdHw9OLjLCgpn4h2fZMhlGH1MMv90X59BwRlYy+kVoL8+v057/AFBLAPULlDMWm5W66ycktXBNFZruQOpFq9uEbrB9jA3E+nZYsryKjRdEPOH2i+7WHZPgYYZ/eJ0s1xs9qyelPzd7lGiES3ifDcT3Yz0XT4/qvJKxk0+i4ebnvlvynMygtzX1q+lsn1e6+D1C6UetlQfV8TLQ+k1ZYX/xi2evqMbHpr7lmR7X/gSrlFQbauIolv3V+mBGdhxbpSvca5eNvWu40izRB6mA6m5v8Z8BAJRlPQReuQKNCf6DI1LuLywaP4UPEssPhqCLYql1HmeiqWN+Uv0Kni/aex8phRXWVQDIZZjgaspqqPe4dP6h6unDx1K03GTgRRzrAWHG5R8dlB6LUzT6cwUcZiP9NkU+r1O91OPbM57ceE/VK68fM/ZRNee4Ifn8BGh4CLYVNN4Z8in7mBHhXW1h0uJLMu4tidhrLX5HoHKm1zYNzkYlzKeVeSj1leupiMMOqj1W2i7FzEz687ADjPCBeh6H2iDu4tXpgUel5uL6bVkf+Q4yY1jmx/FGDh14mb1EuKvkIEdW5V1e9P8AXRSVhP1uN0sXmKq9tZWU6nqYZvcxIiLQtjkmz/GYsUxW5KJVYUllhfxr/YrpvTqvp8XPzExqC/cb7ROQncMLEzc11Ckmu58RjnWMth73pWKdWeq0jn5qnstoMD6BPTUVzW9v/uzWulO+V3+SKNzXGNFb7fj/AKJ6CDpWdxxxZSRO9sV5GlZ+Uq2DePLXjS2myKeJ6pGOzN8E66nx1C8jVTYluSNW00d27Jua21xxgWFVrDNzI906KukY8h/XSw7p8F+Q3CK+icruCwDkLtRsrlLAhilVnf8Ad7VcEwHZcgDkZR6o6LX6thoMn6LNi+lki3AtqmtdG9oD75P2mA7i17BQjoPeGlgO007DTiUh/wCgDxHe7isjiECag9z3e0queD2GxifEAleoOot/IWUjjKqzaLLeRJnpl/GzIySK7k7lJHRamePjMqNPux6eRY/7fgL8l6v+tZ+9N12OOJ6493ZtycdJupJ9SwjW8zUwEu9PLVEeBh6elrqWWbMs/wAeoIIh0XHKL50DldV6hkX2eo5ZyrvJQWNOALpkPTSTcZuUPRxxsau2mraPklPo+m+vHlFq4Brd9NzlBZqF99KrjSzHuRKebD7CKhn0WYV1S/EP/UMMEHQHRQC9CvEiImxbU1QDx22vmIelfyqq9Fydt4BCerdAORNJEHtNT+vhcAquR9SWJYlvRkU25LAWSsqQdE6lY6of4q2ALNsa2eEAVkOPYsKaTUoq7jX4jVz2QQEywMELHqeu4Do75jxx823HJvqyH+gDm3FKRqyJmfcIq8in8EGOly/Q91mxnraxmY7nKKHtnaMYfmDcZz3OMruao/ZlT6Sxp2O3XWnce5yB4rSzz/5271dsfD+09RZqWfLnt4vTDOrMq7a/UGs2AW9A5E+pcT6szNyebhySPdvwAe3UnkqJprPuvsVufhd7dD8dML1B8Vs4oZ3IV5E1tODGfTuYuE4lVu+tn+MwdFMrMCqYKtyxOM31GkmOP42u4rqcZroELT6dxAqrFuCQtsnwqsNT5N1iNZktZDpoVM1PaBQB3iIST+Gohl/+erlo41xWX2s2EQR01uMOP/SMMEHTURtS4c1lI50EDJ9OI0fxqJy2vvYNT46gbPRWld2i4Syt04xv1sHty9q/2mDxpxH+VGzvog5wV/Z01woijka8QgZGk6YmYa5/Bkm0tU1LGkO5dui/JIejqhEZeJ6iEAjzWxklWbUa84hrNTG4o11pusrd6m/5D7fq/dSllr1pS3Kklr5x+0BXhXX5d+FL9tnuaw8iCXDL4fMUBY1rHrVc1RZPqiyFegUtB6ey1ZN3cXpjftfZuGVua3ZEy0ZSpMMyl06iD9vwVjfgjcWyriJQDbfeAx1DrreOh+YegbXT4JE5Mp4typuD10pwbpZ+h6CCK0pb39MxVy56n6e1BZOg+WXbWca8TUU1id2sQ3Hl3WM7jRrnbw+fEA24PgEJj/PX48x7TKY2zsu0x8IhTXZWbyeE/Wb5CGCf1+UiHoIOgMps+1l0cWYOWcd8pfu/Co2BUJ2TBVGT7nIVeiVtYaaUQ5FJqYdBDZ/HkXcq395f+8Qew+WxisJ2dRj0qOjx7i2LxaO26krNh4LiortZ0Sz7sg1qsxrBmDJfnZ4UMNsNN12GXiYQV6p+xGj561N810GhJ102DPpxpx7qTtazYXsm5vz/AK6CE+eJYmLZk8LHqxi8ss5kXcomOLoylTqb15blWW9UPp6+pD070z6WfW90+o1a61HirNyPRbCkfIW2WY32kTI96lg/brxnGFZqalX2taNN1vQlPT1JyMn/ADeBO6D5oA8X3gTkHtC149mnpHLrZ/jMEHVG4zGy7KpTntk4Fj8jEG2tbhORM+en9fk9OvWh7fTTHqevqP4/yo7rWcq4juNBlOJZe1w4nwMEPT+pqanGcZxnGcZxnGcYTDBB1EU6jL3Ex/ZmAV8tdw+34UbiRR3lGNaA1D7Ssg2qGn07a7GocvhWzblVgesjRm4zbDNKz7WHk8X2oxcZsu/1RDTiwfLj7oPaY1w5Z1C8ydmmoNWL0rWy3lKzpumtivBtsGHh8Jf/AJvBDpsn/L4hjOReFCIPYihrFdT4agE5cQZh5AobLPOLuBFaWKqdKmMP3Teo12g3v4nwr2w1xJ9+hHkKlxqa6XuZsH6Sq7Ja3qG0TlNYN7/BuY7Ni0f8hbdWLOQqb6imxGrab9vAynINBdUvmWONST/boqwLOMYTUCwL73jb9ce0ccSrsC9udvhv7PnqfGq0cMluMaL7HAbnOCkMgEs/x9B0HTHcJMfMSk38bgZX7FjyP5ddavsPebnieqitGTGyXt9OSpvouT3p2H+fxp/8/VNbY8ZynLU5QKpPZOteIXc4ThOE4ThOE4ThDDB11rpuV2lJVruOfetPqPTm/aDzC7mPnHHUZquGsG7bSELe3Mxn31Wa5j4hntDN66V1G1rsWwVYmYuGlmfZmR14ELst89EH3Zzr2UGzZZ7dbBoz09FMuym5UXMou/y+CftmLpvwo7Vmwi5tCcDAonNBN+5bc30Unhs9Gfl0rPE8puA9NTXTft4A6Lvzjts+WJWOTZuOWPqp7dlxvsupKeC/sy6PngY4uyPUXsN1b8batVZJvHJUbLTyMYzcqx3zqBVTRN43LsLaTQyxVgWduPX7CucIE97Kvd6dTgYiqC1lQb/kXItGn6mVAeJ8E0xzCO6emEeJY+/Iyz/Gegg6pBEB2aTG8AOm/wAAA0Rrqf8AB0BInfcLXmukLLlVfjr96T1AnGGkiLQ7RcK5h9JZtcdqzYvE9ApM46/Eeg665V9azO1uJQ3D8A94f8cSzU3KFNjXDi5MJ8FbXiy/x4/ptl1lllXp+JkX2Xg7i/a2WByfQJ+elNKstyoQyrWk31/0mLj9yGxK1tyA6XL7+G9E/wA9X5z8dUbjHEPhr8g953Drs82KlfGhVLXZRcBdk+5/QBv4+v6hXjLrwPTtMKu39Pi0X92Z2OMa849TK374tq4r5C8bPEwwiUBqMEq3I+zKxBXMtWLnRcqhp9XjrO5Ten0u1evjNe1rnjZ89ef35a+/XW4dIG+YfIHhWYemH1s/xzUHgntOUXIad6zexlQjXTUM+PxHbL0ccaetq66U2Gp7MWlxZitWv4cb3De7a6e4m4Mgz6tzPq7eHeecjC5YbE5anObjD31NTU1NTU1NQw9RMenlLMZkc+xUblVPuLlVvqKQtqduzz+AP06D5rt7Zv8A38RCh1qalY4B7yx77ErcxD3Fx3CIXJnpeMM/Ftw7qXf5g9zcwrm9ze/Gv3YUmJlgMbvfu+ylnVgVPhTca2b9vAfi/wBfDYNZ8N+A/BvXQHU4i1SvE9Ndfcz9ZQvO206Xq6+0pAZ7ajU3UD3vqLn1dRVZRZ23U4uct3pSUYuOndbMobGsqcatr7T+Bhnybr/psV3Dxvd/HlMX1JqVPqNdksdOLWAh/EWfx/HRENh9lDjR6keNo9jD0wx1s/xmCCCb6L0rPCUn6mOrUuQty/B8z4q2l6Ofu6KI9iduK2pXb71uFa1O3YZrzo+wEnw34r8v8+HIidwzuGdwzuGdwzuGdwzuGND0EqXnLHNS1ZL1k1rlLwKFY1e4/wBsb76/IfNg0f8ASLWWh0pW7UZu4PFROXSoCXt9vQ+1XQe5xctsOH1K5o1q5iH0d2X6UY5PzNaHVVLlguLGYt4KxEd1zsXqItIQFuaJXyn2bYe83N/mVtQ+BOoOmoPIDZPgPtJTYI6NSa64BuE9EfgR7np8wv8AbxnxO+5h0evp/ovep41V4ORabXiWlJ9dbYlOYMI5lq51eiDlL7eBhmFUXsymYujaJO3/AAUe7tjrWG+fFWUhscwOKx3Y559Qv8c10M/uyzmTD0w+tn+M9PjwXp/r8Q3EhbNNaOQ67m/DU1NeCLycjR6nqGht2uMld4ysNsbzqXkbzqfMKkdD034J8n58D+FlhG5rpWdHI/nr1KbWqYhbF+k9qfubKxnqsoP3WLwfxx6+TWnbf0q6nf8As6A68hFhGpyIBO+mox30A5M3HHXoj6Vclt22l+muAJ5dANwVUhLbkTqq7n2CA6JvYzHv4AupnOFtzAYi7OtNl6PxJ+1t8pyInz+cdNTXXU1r8A8V+Wm9Sr+aVqe76m38nAw9FGy+uh62nu+P7RV5Ma+xi+rXiteqHtw+8QwXMs/jyEtrapuphgf6bGdixWf7fgx617FdjGN8+VGS1E+lxs2uytqmXUdlIm/4fDgQnQ+3TE68OYsXgwg8F6VVc6mVRNb6Y42SUUb6aMAg4ifbF4R+1tgoJ6Dpi1Hu5aFbOq/NyhX6A6ing2JfXaM7A7HliJpSdmK/EHj5ov2k+G/xF2gUONaOoo96R/EfkiP91VWbZVDkm4G3+P6NSlo1Z4fMZu1X8nnwJcv4CctT2mxNAzQ3oNBwQ5JDK3TevDH+SeqEbC66IOTMveGjt8Fqq+XGcj1Ff28uS9cddr19PXlbb72IvJilNithWLLKyh/6KiH8evJToHojcG71QZ7ebtc7zc30BrZT9pikqVs5munHvfOwjS/UAk+j+kM1vqGdoW2m1uie3h+0UGODbOw07RgxbGmRjNQcZd2Zq7J9op96au5LE4N5AbnMwE7r7GQMjHKv4+3FWKHIyvqCtAsl+K9HSr5sXi562bA6b3HXgcL3nZ0kY/bkkPBB4DpSB2nRYvFYeMrye2NJYbKTX5B9QnrrpUvNn/gW2znKKQy5OL2eu+adR7iuwrPT7+5fk45os8Eu41eAmvBfc3+zRvHU1NTU1NTU1DXOBWLqycdStdl/sr+IRuVJyjVFXblUldn1FVV71TI97PCqv7XqAnIKOupxm+PjqUg87faxDuHx1ucvbwoHNHx+Fe5Xy5Y7Vm71DKNrGDoteqeYyG7AqS33MSjmvFqKeuBbxOUgLb4xbCsGQRDf3QUE+IT+ETW+moqbnIiAFoEOjSRO3qH8w+Og+WOzNzfnU3be/BW+ujJttwm9PxMuq/0pcQ4w5GmuuqHHKKG+tu6t7eOOw0HiNE++X5H08tymtlH2y+zbPBKbjXC6XLZWaz0HTW5YOPT/ABjZY21FsIzXh8krqDU+ImUQpCk8CptRtRULs2BainFvthhhmPwtq9OxWIt52NxIln6E7EA8EnxN+XIrAQ8el0mj46m+oOja5LRm1EHdRl4tPiMNda/mYzcb7ztWQr1Ckx/ZPESwhuqnTWfv0MX3/H3yCO24YcYG7y41J7tq8zxHLUIj2OI27KaFPLITjd2zdT1x6wZZbqFtxVLQY+hwr6bPTfiJW3GW/c1dZZj9v46DpA5E+xpz0Ebi1rpk0sNHp2KRgjBbiceyJjO0+lpSNiSzlZi8ddAJgLwFjcnime02J7dNny/roOg49BZwnOLcyxr3ecpvf5xD0prLk+x/DhelX5qp6Hl4x9MoydsaxMWymxW/W7LrwFyfWrrbhc1S9EGofc+HLgs3qLawhsLQ6M9PyBSLl4M0WD5isVhqDRkKnoJYfdYTuKOytOU1dmXWA/juEam5y6cjK7HLd3HZMcPXGtfEx/8AleLWnEvaztqNmen31A15uFVLvXCZTZk509QWoTtgx8V6um5uCL+A9K7m4sWU78TB0Hubhp1+eUwzuZ9Iru6ZCcU6mIfvy2lP3h0NbIu58m47bqPIe8t/bwKczusTlXOVc5VzlXOVc5VzlXOVcIWf3x5jQmJfMlewH+yJwWXZHOYelOJXVZdX6YUs9UoNWTjOVe2kNkticIESO/KCix4aRVO8R5a8ak3GogGpyGrUI6qORb28hOfGV1G17qzS/T05tZOR6Ddyb01kNSYuO1uXzb/kMgQ5FhnMzubgbjFdlK2DJlnprApjMh9RtWujzrH39rkpGp8zU1EHv2TGrInx4fHjr84hE1Of2sPxYFvP0481wMf1zgfrK7qbMbHqbHsZ09V9Iy3sT0PIE9QxnFJUiViO/LxRYx5EaM+mGrAAYtbWl62rm1dbk4MsHz0r/fLrCEe81qGz26Urzsucu0T+aoownA+R6f1uL7CBysOTZdToRHp3aOJpxmyGylr5YQQE8AbfULWrt/x1YrOLnfGUPojW/tgg8x4IFtDrw8ddcb/JdZ3Hr+de+GhbHzrubwfLHuVTXQQHRPauArorJavMdiK4reIM9vFPboNItjcoBPicyaPwl5WFcisleyFZzXLbe5B95bGsSMnaEovNbY17E30pkIcRaGxjXW12XWZetOlYBXsaE7/HXXymlReDNOAEROMyPuUjXQeSoWjcVrmIQx9SZWu6Yzr6clV49ZxnQ1v5qESt8p2my0Wy2iWZK5Meor134Uf5WTaqhnd7cfIDxKu9CBXOZm/D5LD36a8j+LUJnzGA3N8l8d+Hpl+sJrO36dx79hySILdzDP00f1HtDHzjm3EV5K5mMtEvP3TfgDpejHpVQ1zXAY1Vj8oa5YosrA0R89Flv3V78PiH+NeinjC5uO2rgt7ktq7Z8f8AXUYcRCZiU22YNm9j3P0ndaprK6+zZZMHHqQXNjY45kk1PbXkXfQ1Gw2PBBEnzNeJg8ANytNx8WcSPAcXjLxnp1PcSxOLKNtbrlg2cl9Sx+1Z0xn1Y68G6Hpy0NzB9r8rDa7PFlaW2pwP4BB7nXDoIei/p+EmAlGT1F5RbVlTJwzVB7THG7MnKLEsT19KHJL8zTGh7V4sBxj2famuIqoulmMyFkK+WoRqDpj/AORlHdyracdC5Ypd21a5mhO+gh8ErgZRGsXqemEga0j6u700NjW+v4gS+b6AbhGutLaN9XbcHtg9Et4xh76hEEqp5Fqq0m0E705kwIzyrDAWzIGj1HUajKLF/DrpqfHnqcuo9i5B8dQdfReOs5+7HxhhYoTnK0rpTLzS7rkOwwScPHoz7K2x/UPqhk4NbFsF9NUywdf/APng+T79KbErwTf73cDWWgfTP/lHz0VOEa/kGXiegEC8K/BTo2NyeG3kpWH28NeyDrX+9eQUfLx6ckp6CtISntVZ174lFlztMJtRU3MTGF0s9Wqw8e+1r3Aggg6ekJj2T1PESr8VepZcXgYiJkbHGmME2lJaDD2PoL56fYKca5K741RrEw7OJsxUyEya+1f0vHitbWFMJOPp9FFT5OIlt/ZoqORhUcWwCY6Mh6U65W8NHoBsLX9OrHZ8FG/xGHop1Mb1Jkn0X1RysSzCTfQSmg2yrJ+nqoflLbezh2W+5fc0EUnc1NzHyJmYXbrpxmuD41tcFTNKMSsm9UomuUOumOu3qrBuztcoIo67m/YDcCCb11HyU94JxisVrBZDVk7qvbu+nzUAnHijDh1Qfdfb3G8KX5VupB1B9pstUxnJn7RaGY14oWPbVim3J+ojji25rfhrfRf0m4vxuGDrrf4z1A3CNTft+Cv/AOmjWNLsg32Yk9Rt9pX+2baa8JZSTVZlfuljJMf1AVhbMKxrfT/4yk4/xdUXkXfkTN6h0wMetoB9wBM0KYX5GD7gVKwexLbmPcO2fnqITs9RYYK+cap1nssWzUbQWa3MXF3G9K2tAtrS5nL1Wshzq2tBXRwSon1NKSzLsvl/3UNB0EHRIlmvHfULuMqrCd+JEHRcmxJVlk1M9LnVeQjelOEXHsqatnnqevqR0ubuVdPmIopN2W1g3o4F3CZfq/eOPfwb1B+Sq5iObIe3sU1tGpFYsE+RrUrfhZcvch6Dqv6fhMYe0HTHymx77rqMql/Sw7W0PS1NfMhwsd9z02jvWep2criytT+s5bIcrNvbKcIvLfS7qB327e9wWMsLExTxL2BzvqLPZchq5ZkC0WKhgXRVjyPudGMhB8N9abO3GtUgaaI9NCd88zkM0H8hxrJk4pofUQLUbLuX4UoZ4L0x4usrGODHqorhauBqZS9Ys+pqE79EtPKwHUYC2r4M/ca10HtCNxRxGolRedusRlWALOA4+OvbzPz0B0SdmMosTyX9sc/y2W8KQeQQlKsuzm0wKEY5VvfuB1K25TMTi3VL7Kgl4hXlCPc/IUsSeh6fBDCPf7VZTrBltHXwW32K76b14nyB1Lch7umofeGfMxqftqyP5bMg87chrhXyrZ/UasbHuyu+2MOifKaZHEHQRelY3OM9tTXTjO2YAFhbf4/b6eUPwf6texnG+gjMfX1VbivHxbh9PhVSrEw8wXej3VE4Vm8f0c0Ll/b0rx3tOYjYGLA2pjN9RXZUanqG2zP/AKNyv7jZoQe0X74/sQSJ+wPhVZwZnAPcE7gncE7gncE7gncE7ghikQproJljjZ3uVXeZLaM0OuWtaIdifMqb6ai9OUC/b2naLjisC7Fn11NYb1fIYNfY/wCE+3jX86AI9vD46HyQcFfrvUTJaUWJl121dixt7iDuR8cU1sR0HSurnP41PB7J2a6Q+e5Bct476Y+NWUsxEMDFYy9wcD031XdZccxqPTxwvwv8fiHVWIjDn5f6oxBBNyrjLrItCKTuD3Ocopo6+1tZXifCptNbikxaXd8hFxVh6GGFfsYaZfmBofbwHsW0Qw0oj1e3kfIHUPRT9lFhFhYsfd4mSmDhXN3jME/bB82DSXJpuPQQQRPbqupqABYbQsZi35Qf4uin7FuTLpXBQtb6Laotx7Mfp8TD9aycSemeo4+dfnfxyxU9QuNeLh2H1k1kPZ6nSRozHYqcivv1f45eOUtqrxozgw+/QH2f3boRteqryay77u6Z3TO6Z3TO6Z3TO6Z3TGHRXIK3RcuuqHIXMx1JFXE7rxbguRaXldpQ1tWiBy72P7C9gq3MsYlj+Me3lz1E00+D+D5jDRA3D5YVmjdg997/AEx1H0HALdQgu5c+lSbDaScy0UTENYSxy7eGuqnUN0pfRsRbz/iYP3VPsYPllKzuStNzaRGUo+MROCx6WQdBD03N7mvL+/Opgp7fcPEzREA3Nam1ZcTCW2WY9mPCwlrb6YCIbci45F3XW0XTxvnqPk3ntUZfIZQK2dWHsRAPbe2/26H7h4U2dt7tEgUmVrj8ETEeWLxb8duj0xscW10ns3/8Uwsyq0w7LXa1uXGcgZgkCIFsnZ97P8W+YPTUVdzeoDvruViP8/l1FUGrpSSbBX/J9N7qO0Ex/r8O/AvxuoYqV9XbMxa82j07Gtsa11Gzi5Rxsn1OlGgWBuUsvTFpyW5Ol/BdmxmTiOm/bfWsiPqV182bt6J/EYYnyw9wIp4KrlZXYQ/1j6+thuQwspDjtE+/5tS0BegG5rwAIb8Nf7V426u3qt05L41uFl+dcsfOyHDMW6Mec1oSsjslS7IjB6KQzWW9pCvvwM4TYnOb31HTepivqy3/ACA66g8SclmFREtfkdzcTLdI1lGdW9NtELe7a114nXtpgR03C24pE305+zLrxAhactQ2Er4ANi0Y3qkrp9PyT6p6S+PEwHuoyEGP6b4VtP0ez9z11xH+qniTYtq20mvoYTDLftiz/Y9Nze4R1or5NkWdxljdDb9QnXXQ+OoMRirkrMRG5mi7d/qb20GGGamIIp4nfOvIA7a6LX1duwLsjjXC++i9VWBtSz9uu/LXTc2elT/e40Yvscmj6Z2yCwvCawnKzh3Ezauxlb6BTw6D2EoyjWt9WwrBJ3kvSwe0q9o3vNT2m9+OLV3ZaBU5O5aNNNTU1NTU1NTUKQoZxMHsd76icuiDkSdxvzDpbvcB1Bf7N8xNz5H4cSsO2Rdud4yu3RerXhvp+46BS0oxWaXfvTWQBRZkP9GwlKoj5bpRb+8Ibz115yp/utFdwatlPbfoqNY30y4i228z413tWTd3pZXw8DFA07Fz0deg+OiNxhVT0M+R5j59Sb3lTEWvlXpTiZ7JZ/5NisLtdQJQv32HTOharovsbLO4YYD7JZyFlZQmGVobLcz/AOhZ/t010HvOMCQ2cVM49V9judyCyoip6g2RZiGW1GtpVU1z2+m3Ivabnv6dvqbeVWd93pzYLv693DcfY/sDD0w+lNoSXDjVXpxXV9Slh7fgvXlKxzLurN2w0I1014a8jBHHNOleQl2D2nBNbGen0r2/VfV9xiWPR/ZemyIdamMeRPsQYf5qhVFCS3hx101D4UPwlv3xRtmPJvicpynKcpynKcpyjQwGCDxEAIVfnfTX4ddNdbG5dd+7/M/1EPQQ+RHBCdzXQEiEbTr8SpuL6E5JKslED+p2a77zm05tO64XDbhd6med0DkRb1E7lDw46NPo3nYaGllHhXWztXiJRX9cwOLa97ZbUq32JTc7M/jqfYIrATvc41XtrXnW/GGL8sNeAnEGctfhy25mJ+wr54t2dXiU0sPVcLJxOyz1kSuouTYYtpU/ZlrSA1TLwaJ7joeqZGgUXIBE9MQdy1ubrP8AbwEQ6rZ9+PxAfbrvojlS1iGem5Yx8jP9Xsvfmdw9KrDVY1S+rYGTitS4PFrF0WgmH15/xoumxrimPo7UThNai9a6uUduiEqbf/bD1Onj/XlqI/bIFdjOKllaHIhusri5LCP6m5p60KHtPz41v23dO4dagOpufAP4VfUOlAT2CbnbnbnbnbnbnbnbnbhhEEEHQdFGzzCm9udf5HUou/A+A9x0G4V9vAIxhUgismHHlx4+L+1fRRyJ9yfwtbyF1veq8VtZYz84p0SytP49JQXi01Uzm7G8lFrQ3MXGLSbCz1XlDbruMuvwqTGmvfxpr5lsfc7ZEcwflVeTZq8LIv7em192vKxWWr/xy0GvLbuWIWrOQz66D2mKgymy14uQZ+idD4ByhdeUNn0lJiwft0EcaK/Lt7+G+nD7Om/ALP1B8QJ6R6muG2fjJdj5aFiBpWq3O2yzF6v+ll20xhxxFE+wDurA6RipioWParoW242eCsRFubRrV5ZhvWOMP4B7dB0xbuIdPfx2VTxPRTo2nl1J34hdjw9pvjCSxwfTbGx/+Lsn/F2T/i7J/wAXZP8Ai7J/xdk/4uyf8XZDD0HSutOKvWIcgQsWgla81KcX/Dr8Y9iCs56guad+E7itxPbV4+lnIzvtC5aC72b38B8n36q3An8dNZt8d+NVG5x5QHtR7yVI9sccEyK35cDAjRcbvqQaz0VOUYcfFY3vG8VGyXjWQHcMHiB+CtuFnrli3ZEX59GfVtmPr1TEw7PTsm/0x2yc3CFVjNV22b3g9zjp9KuRn02l7NxvE9DAxVsggu5ESf7dPiBDYuuHlrpv7emuo+eXbrMPjj8RF+5vRMt+3mekrY2T6baLrENbrcyzDtpsjpRMfF7xycdqkMRf4NbnCHQjSuI61VFwzeHMiLfDbspMisFdTU14gQ/PWtA0RC4cabw35DoPmhe9L6u3ApMI1+PaiI1atX/5DbWv/wDS2z/+ltn/APS2z/8ApbZ//S2z/wDpbZ//AEts/wD6W2GGAbgUAdR0ExcgKcleF3QePcMV/wAoHkugj+zfg4TY103+TAOriNHrrwRfcHjGt4Kz7nKM41U4SPbF7jCu1lcasfNRnT4mxFv4xn5+VA7kFimMoh6/qtPy3zrQMHiT+BRs57lr+nplpWx3p7Hqnr75UxPVL8SJZV6xinGNF2XjlLKsJrFWynGllrWt0BhWb8TDLQDVYsWKRvYntDMdigbfLttNEdRNdDD41roO/M+G+n7L3hScLMtZsq/6WmnJNeRk+jVZN1np6VTEw9lsG0QbSNn29rjXdZZQqVElWYsYZTT3I9Qq/EtpWUZKl7KRGXXTU1+ATg3A+8ro5w4hEWlOT/t5L89OWobO4DYSPxD26MZubE2JsTYmxNibE2I0MHUeVVKWUph4xC+lrYLPTnqn01mzUa4evwPw6H4Kx9zNC3lzOvZp2HRN9T+VTxbKKOfKv9zpR3I7bg6bm4TKbu0zvXlR6noe7Jexeq8I41110rbtKEpulhCQsCErDRcMOtykEFUSqvmzHZg8/wCumpx3NTCo55F2+8PkV+/p2KFnqvqQy2Ouno3qC+n33+r4Pcux8WynMy/qrPJh79TDOOy5Xi9RioZxHLQntqA6nfLICwn1DBWyeUFtfEnaCalnjqO2/E9PSfSG9Qf1LirmeiJ3MrPt7hVV+i+oK2fVcpiaBZVurtxWyVsU8cPEt5PV3ZZj6j1RcVnnbFSXfkquKFtOCIfIdU+XLa9paPvlYnqVK05XXfhyiBWgr97KYRqa/wCsYYIOgg6iYmK2Sclg1kVysLlpuVZzcXxG1rXQ+Q8d+aHjD934XsYDB1dkZlAS/UMB/CPYvV9vSoc4Rrx+Zx4zkfLfVTo3Wh8bxBgbU/sa1/sfkHULcxAdRLisd5Vle32vD7eYgWAViLVzg9PyHX6fJqb6m5Yhx8melgU5HrPptmJkIvJqkpwhneotl+XpVqsuRSce7rvwKnXXhxD/AHKazAPcioF9c4Ts9eXt1rbi7hYtYaFQ6kaPQQ+eHi0lcHO71mXUWsbFLSupsDDZOStcTHt2/Oei5HbsurxBUHluaj007NlqcJb89rSG46ts92bl4/P4PTvusysc1Ezf4KF5WE83b7CSXExxtvWXDZ/XXhvU3Mcc7LG3Cdzf5B+BU5QDjDD4joicyuJWsfLAo8lYrF1lq1DUflUeCjccCsctwWHQGyfbyB92O68GzsHItFluzo/jS0ivsnRgOoTvqBuH8iicjD+Ffkj21AdeH9fERuLH51OM4+CCMxMTVaFixpyraJ9dkmf8nkRs1bAuYa56Z6rVmD1DEx/TrLrXus8qrDW/qj963puEeAOoMYsoxXJGL2kdTkW5Sdqd+WX7hG43s/8AXkE9q+IjWTkegIM/zRlKEAtGwSKD7eSIbGtcA+gkH1LMWiuYeTX3PVsxWe7ILh30Adz7demWcRexurxrj3fUGWxa9q9bdxGp7grXgcjG9sheJXxVZ9PzDKV69tpxMoxza1FqYrfUYuaMrB07VlfwYY97qzXYFD0rTFOBW/qLoMi1+434cb2it7t8/lFQ12lnaWdpZ2lnaWdsdT1HQHU+YDqIGc5fux+POvak5a2JaaXnZ2vXe/P4r6008Kmbkenx5a9lXcucsC/ITXt1MAmj513MgP3eAhP4wNyuvlLDrp8/hq/yW/t/XiTua1FHKPVx6b1OfRQZahLBacYfUpsXVw3RcqxSMsz60z6/YfMZgi/VYT/PGa666Y9XKW2G1/DXUe5dtkMQe53DhZuLXMzGO3XUaVOyQ2MXJ2fMeIOwF7oq4o1RaZfozOj+lXhVxbTFx6zBiUAtjYpmTV9GswLezmZNpZsUlBm3jg1sts3Oeor7bB0Vq5JK/TjY3qWPYgo/iFV3284SLI2nXNrsJxKDL8T7VqZp9I/Fcdi1H0ta252LWK80PNq5fJpoj+ps0/5NyjXMzFveu4rK80rO5VkSykTte3Ca8ATrGuraD0e1WyKGybsX/wAaLtkel4nYup7D9N9N+AiEEa4H8oMHuPwN04kns2CEESuvcAawiluX9v7g+7ee99Qfc1gxgF6gcoVI6a6tB0UbbJuBr6g6h8P63pagCbzys1Gm/Hfhx6MRDBPj8I+ePv40j3sdaJvfnqaM7ZnHUV1Q3sm2I8tTfRWKzj3B8RF5E9LOTo52fHtNpakE7wWVZdtJv1lVwExeJZvc9CSKvwD5F6adtkwwFkV893HcoJGbXMi3u29d9T5CbmIncarDNVlnKfUckK/TW+q1pfjE+5O+leI2fgkaNaGx8jHquLE10X2bhhhE/vDsMFxmNlES+05FtzrzqKGHjxNvFsiwa+vczF9SFcT1WkvmYn1dZBU9UbRbIOj7nrrqrcTdWdbPiqFzZ6Qa6GoJbD9Xv9Mh9eeZHrWTkBrWPRhrwI8D7zUBWyfRs0ZePhv8CrucROInETiID93g+I6hzUqd/U4WvMWqyxsqxlbZlBFyBdO7+G/PU7e5Vj9stSxtbGSqFl6C9uPcMFq64gntADdbSxVE5e40w1xOqrI9JXzHvHHGBDGbbdddB+A9W6Ca351MOXaBLUsJ22gq968YFryK1669pvp8TfTc30ZofeEa/DU/be+cuiJza2wEjTxqih1Ak+hPFjWg2T1ReRx7Vqttr7duj1qx7Lm/4tKFyrEsf8TfJ6GGGV+0Pu/io2eu/DW5oY9GK2pkJXxR+JZhclX20Wppun/j14RvXsZZSo7FNoUZ6Guo+/Q9cPpjqz2Nkds25XvTme31+o+UzTPdvp5imkR6K7pjZdmG6Y9Hq65NBxrvyU3PVH45C9UQ2N6X6emMy09tzh0Inq3p3ej1ms9W8yfAMyQsW8NfgJm5ubm5X8+BciaFo7xhvdxXYUfIVc3CERijXatq8tTXRVnPXTEAEpoRnvymaH8G+oOo55dNz56qvKahGpWNu952zF/BvldfgPgOiiEew+fLjKcWwkrudvkMitazdl8TyJgMBQDkIzFvwDoh3LPtR3Nnl+vTfSm2NxDRLOAhgtYSqtcgqFoFyOGK6PUHQlbLdX2LARXWkrKCP6j21tve4/jf56GGGcSB/t031U8U88MbtbJ+/GuDBmcje4FCyq0TIw0c34TVQjR9Ouam/NRbcctxmGN5DNXecyj6a8ww9MTpUDRjMhdTUROPuK/YDcdTl0rXxssULAdE5HdWiyzGK52L6lM3CbDs/Bucdz4m5TZ2T9l5q9LteW4llbejcKMvJx7navBNC4tQUeo5/wBDeTT6rRjel47VZ3owrZlKn8e/+gYJX8+BldzUWWY65dI6UXFZau+lf20+SAa1spTxLPyaKPen3Nue2vD5/PX81D779cqvtTxPQRHCRjyPieupqJHr5RhxPzNnXVPlDyFt72NR7T61a3zW7ra+2L82fH4BG9ulX+TMTgfH48APbwEBFk2RNxcoFUuVpbQjgjUA8Aff1JmW9fnue35T0MM+YfaUAsp4h/pxanbLT6G4B6hUOJhOgDXpgu5qamp22mPutdbbGobQrZY+EbIq9qXNUxGTP+TOrW7zVrXU1ufyH1sGaZd6oNnOXLl1lCgiiyDHrEc4yzBtqErso7nqDMluI/Fu8BZdhT6YxAiDG2rnGGXVkenmiNWy9MJlW3KwzWa8r7GrQTXtx9vMxRodORi3MjOxVk9bayr0qlb6W4YqeoZQyWwsp6Tk+tvbUbjs5HdDV9RD8Dy1/wBESv58D0w8l8Zy+JkPUMYti04XO+nFoyq8PDBz6e1eqBz1QpCw3W1ZsKYNllta1wjRWh2gxKkrCmfRW8CNfgYa8teG4H0e90duXgra6H56bg/Cr6haV6jNqWNuHqYIIh4mpB3cjJ0Jjn73oM7Zisixn5eI/Bk7uo8T4b899NwGDJMcLaD7HrRX3LPVDzzPz21aEALFxWsZtzHWtYX5vRYFlvIgGV5tlUtua5wYWmvDn9ie8+5jxHYW3GqJ9TTbepbmN6ltu5za9C7Gl1f6ayb7AnI6m9RUDio8HyBWcYw9MMRa2eHFezGB7Zz07krq7i34z0MIjFTW/PEzSYtrpKbuVnYp0MdeWfgdroDqZCca/LUXHFak7PhV7xlKnGzLsJ7s67JPpCU25mdgth229a24s68SF9v7ezl5/wBf9GtNjwO57CCAbmPYBV9WKVe57JiZBxrvVXNmYkOunzBCd+FDduWWta1RqWqmznjd18aNal8sqauDxHyff8B8EXuMta0UHwHy3zrrr8ifsRCfdvAfM+4Du84ywysSuzTZI7lnCEa/Li39tsivt2eB+deJ/BrXSozJ926U0m41lEtv9n6KNlvnyb56V1Gwm2iqtL3EONXbKqaqTZjFmala5kXd0pKK+UKmpjiMycTtgB1U6J6hNwfaTYzzkujQeHAA/ZsMgj3nWzDa5HxDN9d6O9EHlLn2TGgEwLTWO40wc4NR6waNYmUa3v8ATqijXotPOdwzEzDVMm8XdMata53rL4nGiPli2ZWKazMC5fp8zDq4EaPhXWKBba1reX+WkwQexuqQ+iOdt0qQuciqnCxePL8JGh+Inz9xXubm5uMsYcSsb7hcOEppa5q/Tq6Rk24qzPxCuNSKmH/GvbDTVjsbqBLglo6008hYCeuO2sVmLiY93GZNYqsm+o9vzWWFxNeBg49mf15Dyr/ZnnvB5BiYfY70WZWGPXK8NlORjcplUGh2/DrpynEPF+yXatp6ivS78DN/gCEywqFwXpsrfHx4+NtPoreK41jsvo4rrfH9PWZtaueg+fPUpxXujCquNduGww2EwmEzC2cvN33zEmJaUXKsa2qljiw5VN8fEOnqZIIw0Qf49CArosOO+qElOYhfc3D4fPU9B8t/FOKWy2pqiYJi9Ny3bVzGybKZ2qcuP6XcgFc7TRa2iL9y1c4beCXWbPclOaOL4Hcm4tjIdLmRlKNrcWl2Pb7EssNredFnastq7bdMXPH/AAvRNbLp6bjWWNa85xl0fEQn3h/EB5f/AJ+BlNLXtj+nU9sLShsarvV5/bmRmNeVGzfcmRhrjkPlA0Yc1AdSvJXYrquON6e9tuYy1Rm5dcIfc9FmO/AjorK6PSyDiWNXpOS4ZErev6PJrysRsV/ydzdcAPEgzXQr9r+yVKCWPJvxa+2UjbH53PjyHyx9+mJrnYO3Rjf+3RmcXW2oITB466b607SHJLwX/awBKVFmYU1Rm5eJE1+AexY7lHtKxxUH2FpU05rK2RmMYbILCsWn6tPcGceQ8NaldfM7CpbkPaPAwzHu+nv9Wq5O0rSbKtjfyYDNpyICRK8mXpWkUrytsNh8q24G2so34T0UAdDOZ0LdQ2I8xuvcKVmjmNaIOpXlW1z0+xc2zKwMbDuGLVbKsKqsXXlWZuYLdcLIVce1OJlaFjXiLc1eNRVLcxLrs3CKmGDz586en/59Ka+FdlrWt1BhHLxEPXX51/TU1NTULUiWZLMMe56BzPQRELsD2yCd+kW12rnYzWS2llKUvZBg2kEcSiGxvrPphcai7UTUTDdhg0LWF9Sq7nqK8cjcBnp9ZZ2y6cGXZtt/Qe0pzFaqzAbt/iE30VyoFzAtkVWCs45Y00M1mA5bLoGLR5Ea8OMC/ZwImHWedo++HzMEURn3O8WX0+/ttnIMivts0I0QIBCPZRsagTcs/bpj43ea77V6CvYNhES4CWIF/Kq1mWVFJ9O5qX/Hc41vSt8+GJd2bczC+rrtpspI3Ne6ryZ6Ex3pxhdLa2VrahjYrVPbOVWOD7mHqYYuSyquI1r2Bajrm2E6UUP2WZexxYJNCcQ0be/wd4ms6efM0YEJmvNV3X0MPTE6uO3V9Q3NDRm034j48E9H/wDr9b/+ip+EryNy5twMIaS81rpTjm2WKOmJSXe/N5WHLbjU+n+vasc6rgycT476I/bPKm2fS7nZZaNQY7avt5/iPQ/k14qhM/Q/ZPsn2T7IxMFRMY6g6INkvBEGyxInpnqn01eT62bWsvssiOyF7TY6Zj1x7Xab30xLe5LhY5psKVT34AbleM9hym+lpDmfM7TTsvqY2U+O2VifWUka/CPjXgOvpXqbYTPmYOdMv001eC0u0rrCmw7PQdOeobTMH77coathPUeA6b9ule9mz6alvUJYUti45gRFhsDsUEYzZ03zKl2bW4QnfRF2WOyhnY5TtGMpQ/jD+yruYPqDYrXUILH/AG5eS1HTXM0GQzLVltWeeHcyW4lVN1rX2MdLg0fUZWbf9Rkcj4nofgwzDtNWDkndnptK21eqJ228AdBnDzXvNeB6ctQ9NzkQS3PzSs9hq9VQxoJidFTsre5dTFYiVZhn09Vs9KwrUyvXk2w2JW2iV7olNmldkcUYq2ns1otuJxauht/TDGxP7Fmlmugaa8NbmgPDeomVakOXpXZnb8qNxa24Wrqant+Sq9aaWJY+D46VC6wsYvvAuoX9oJiVQoptyruuurDVPR/tguZxWKseWGqV2B2sqNTK7A5SutvVbWWC9XJwRZMLLtwDeuP6kDUKGw8ej1AZOFdinoB0qp5taOD766moBvprVUx8t8c1Y9edE9Gc2ZJx8Y25jWwN72V/Z0HtCeuGeN2f/k8AftMHyx5Ffk+FT8Dba1zQfJtcTezvQ+QPcWVMkPSpgtZPWj0629CNHUDFYmZYssurvhr1+L+p8EnuRQRQ1beVZCyzJawdVPGYeRyrK/cdk4h7S/gMM1s5C9rDt+cR2RfULC0Hhr7Yy81h8tRx5EdDNzYnf0nPdcM1uKomIgM+1AfeWf4zBBE+PS77EFnb9SX1TCGJ0VypKDICbVn95toHFkLcT6X9x9QuCL9jEjR8AdT7TGQrNTl4CGAdFOiSGP4Fr2s301NagHI8Dy4hSpClvu6nqOmunIw+48PrRacrG7TcORKipeggjZLFMb7a+u+qfdTK15Ox21Se1ix6OVLDidd/D1Mr+bG6nolpWJkmVOm3PJvT3ajIy83hU2N3emNi859iEtKK6nS2vtWeAPCqtQzWNzPStij5XqzPWeuzrpvwxv8AN6muj4a+0zU37eCjkbNA7gg+bk4mK3Na0R0so4EWlDbUOHExhxTpjU965rvezFXIfJpam3qNiONHzCbgbjBaN86ozKYp3XtpY/I9SAIffrubm5ijbPVWIMgrPqLCSq2J4b8NSmvuPmpH+56rjXMhu4+vD/8ANWFY5+/Ln4cDO20qoZ3sWvDhyWaartjoUMC8iawoBMKxvnqvuW4gmE9MTrZ/jPQRW4mlilBvepqcnuR0otj4JgLVtZcGhcmfMHzi012DIyVx1syGsm4Tvzrb8B6j8CDk1mSTGTQVeTHSw7nxOXRX5BxxlTajD8+tFMmmyt2Cknfkd109deCjZawIBKGCpd85dvbORSVswrEFJ+cW8IcrG+nfoYOt38Qnpdhqr9eyFGHTY1Uayvgc02R6hB9s7mjzrzxbUabOijZZgwtAQdUXkxTh+PHOrvWENZHgZvzH2LNdF+RV9RjEaKNopZGu5I4m9RX1OSupGiql2VEoQ5PtRtTavKW+nLv/AI5ofTrI+LZjhm5nypr7k9j47jfr1H2L4amoFVAXLeAPEkcz110pw7L42HTjgtTMS+mizNp5h/Y62zjXjV7qfeKhJqpO1o2OKmFUA75413lDbklEPv0HtDaj0853D02Z3GEJDQpoTtbDMOLTcI6YfWz/ABmA9BEZDWze3KCwxbWUh0ypZiMk4GalK8jZd9GjMXJ6Cb3Na8a00zD38R7dT+FV41CYQ5m+gpOPEf6E+BPKFdQGOAD+UmqdxAWoGchU1t1AlOElYtFNrtgfZ9HZDQ4nA9RAs4z+8Srke33L/UONnqHqVnctQ8GyE6LWcvBPt01NdcxeNk9Jx2tPrOR3b/TamtyMtt3wNCBYpH21OUbLUZVEEduXR/nrV7WZD7f8QOjmtzH4U+6H2lNYIJ2eq/OGBj1PdUXeupigigRq1aW1lYASCCs1zCVimkE2NbcK4M6xZZ6rfZDe7lMgx7DPqbQD7jxrw3dSa6I48gOS1lElhoUDgTadnxVeUb3M14KxQ8e+kqx+YWrHY86KJblW29eG56Yr88nBPe+kYNfUUPhUNGquuCV0GW5YVxf9+Qd2dLT9nTUZvt8lfge2CbH6HoemH1s/x9B0pMevU1rwryGSKEevtIwVBjy602t47nKEAzWpqXK3XR8D1MHlrp6j/HMeqtg2cyhnLSoKy433NlVBa9QLyh9um+ikRteW/NjNyuwxUHqdZUoenp9Ieyy1rWisViZNqFs+51TKdYahdDQ4ldBdrcXtmwcYle2w8U8VQJlZFRFuQ3K2Y38lRmDdxORUarPBaLDPUK3rdfunpLdn0u5+5ZgWCiu887uMFZi/Yaae61+IaDi3CoZmKl6V1GwU41dksrapvDHWMdt03+Cteb31C6p6mTrvoPlh1qUl7KXDMxTH8KEFVeRkl1rf7Wb33oqYIpO2tIZ8p3XGRXaw7gXhMigp47m58Qr7eFW0qfe1Oi1fXjPYSl9PavB9eYhbiOimbhg6ejXV12WvxcuWm9Dw7opF2VZbKrTPTLKe1fjUZtWTgtSSpEC7nwCYvNJiWcpcWsZ/mfsvQ+9fRl4JrwPhv2P3dD0MBmH1s/xwQQdA8+fHcoZqny7g1Y4zSTgZo9GXXgr6lTLzuZTH4b3O62mH5gdS5zb4L+1JNbW3s6/M7nsem+o8NTvMAfug8jCYmyfS7fpbvVsTGuvfEAsGCVWzJUV/gU6apO5jOvI4GNspmffdvFTF5WYmWhS2U4zTIr91raZil6+iIbCorxJj4+R6i+Zdi41GL6OmdPU/T7XxqvS0WzNyqFlNWPnDJxmxbJz1KcgoXzP4wTPTnC3eoj6V1cqTl808K341fi0ZVWagmW6H61bDZQrTsnXbIgpJATiWKEaE2BPqG2+UzCu5cgX4r0kAmH2mFQLWvtHK1twtpBN+6GKNxadVXfJmGvDCD8muf+UZLCd8mMwbzI9utLe675NraWGs8Vcb8Moh+jfkME+JjMFyMtAr+AG4WCx230B9wxB9MdmfHfHoXNwqMqvMx+wcmj6aqYg02Vld8jL2rK1zNUydAoYFCsU9K/3yf8n4P6B4krDxntGUQBRMTR6lC6N7QdBApM+Ihg9yfnoIktO36D2neadwmC3YavwxPe29+TdANxl4KfmGD8nx4KxADc5wUx6VhWa6iLqaBhiLuF/AT2ntPae0N25/DKaiym2uqX2c5v3pt+4rxYTh+D01fqsFPSjZblsmLC3amdkvZQthUciYHIj2NZMZytt+fZaMfJCi3EIFVTWtg+jPwfCwcIZ3qnLGOMtEw/WBh3WeoPZ6p65auHT/AGGNbG76vG1uKm5XUu9cnscLBaRF4+pY9tD0Mj9tzxu8G9l/El7VqzFz0T55aZLvYWsY4HHw/wBE3zTaVXXrijnX6icjHowUSnGYphYTxvRu81no2WrfQZAsX0bM1WjBvUR9PL4Pc+pf+nRQ38lrc7PwjoJxKh6zWWb3+2ag/Xw4bqaHxP4T7yke7tvw9lDPuGBOUZdRQJ/srlGpybs6russv0Jbwd+eOg5LlLbUan6Jd7dpiPcRH3Gx2Vjic4MSxXdGJII/F/pDD0w+gOo17LU1wI2sIEESwrO8CEfc37t7njNdO6wh9/EdA2pzDzsho1LLKFYL2tRoYJuD87e6dAvsGBjBdcQRqMuvDUUT4JWH7R+Eymhsi3KcV0iceNMrbi12OmTVAdQEPO1qa8f/AB4t37q+deZi9o3H7fUHDW+CnTXLxtnpSvblv6amOl3q9Vdd2aGZ826xSeldiFsrIbIsnyFJQ8eMBSyP9ptGiTsRLCh7g9Qwun+VZVrZO/MfPSv3ezTuTrrToRxplaWH7PDcX9a/azFUNVl0NlZmd63VjLde1zhtTmZj2tSK/XMiuXeo3WtX6hahp9e1LM7C9Qjeg/UjF/8AHBTb67Z3PUsWrl4b8B0WmKvs9ehXxWZHu1apZ6b1or5jqBEyZavE9AdT+/1H4OJM46nACs9fiGGGK/tY2ysP7IpYgp6fQbvuv0KSdmKdHQsqdeJ6fE/zgVe6WmmWfY+HmfZYum2x/FuHoYJh9bP0PQQEGCucCsWCe034/t476q2ouR7Pkdk/WlpYUeLoztexqM19v4TBD1XWtQKYmmFiCoF4LNRdNLm9k95YnBj00ZwMU6LfP4fpbIt5x3sucClsdccnlB0rtas2fsDOZleQyR1S+MNdQu4130lHp/rFlDK1eXXl4S1tma7/AIf01L5YswsfETAzcei71n12q6jy/wAw10DESh9sw4NYeaWDdMPSu1qmzF7qxDxaysrK6vZkKHzJ90QuSVpVj4A6jnmgmyyNVxHhWNzGr7l6/wAA9azVqUcYConOdxpszcI6aiVsxTLsoDZdhHqgG/TGUWZdPYu6a676ce3O4Hhs2pmtwzHvOPZdT3OtOyOgg+2f2W5L8fk48V30rtNbXqp8zNRIBtsJPp6HuLNW3OZdv8fWnVmPxJHUIzAxH9giMldWPxycW2iD3nxFUPGUofEwfLjUMMExOtn6dR0DagO+gHmw2PNfmw7fqrFZ3IG2hH/QVuMYq0tt7vVWndLIauQOyIsVtR7JvcGjBUph9j591o1jUKD776DoIynj1VysFgtltXb6KnbQuTOXv6Vke2fkbry6prouO7y2g1QAk3O1PT+vEdAYzcvC3/JX94TZQ+GHcqG3GWizuVpDlWCcgZRwMy8B8ea80Boqdt9dda24ll4moba9CKvBDpsRzQlGfdxttN1nlShc14NXC29eTWkzcrfFsGVjdzAxD93qhXyFZaaFQazl05TlO7C3Su9kBAaLRyWqzg2Rh/V13YtmPEPH89NPeaz9utNxqORprD0PQxoKpiGsHHz0xp6jnfUNMZ+Jy3DHqDqHI7iudnp3DokNOx2KydmU5TVhqO4uyJzhY+B8CPY9P7xetn6dR1Tr8+StqMm/MTfkemz+I+Qh8EfjAZzdgfYiL7yyfCTlBSGDY5Hm2LxlrmxhBBBB7xcZjEu7BHZvl2M1PUe0D7g+58xv5OmA3EZVvJhkyxPeLYywZTiY+Z/LZfs8yZ/UHnr7er7c447boGL8fCteT2Hbxvczepieo6TI+y3mDOG4ayIK2aDFsMGN9NLbTY3kDFPtSo7mXr6cjXUDZJCjQSi242TU4zXRaXaGh1n2KDd9u4fDDuNb2X20WG7mxG4VME0DPtSNcx/EB3xkOFAbUotbj6lZ3uqryP41hPTc+RP6v9q4ehnHc9hGaYh7cvfuW8T0B1Cdnww0VrrfTXsto9GyRbk/+OBa09LJlnYxZba1rdVc1n6gNDwM5AQOPEwHjD7QcIQm3pYTEBnD2ln6H3n9jqInjvxB1D1HU/HUdB+HXjqFO2vXUS7tx7AwhUzU3K+VsuxnA7eoy6ixvDmwhct5MWh6DoqloCqQ2M3WnJNUOOWBUjpTS9rvifRS9+7Z0xzqu19mY9xpN2MrL0oG7mHuBD+HW6+m5iPxtyLW7mIplqgz2hm5UdWWLwsHz4ctjW4kIgLNKgQ1r/V4x9j5hpjn2JNotoZAV6V/K1lmzWUuBFeoQ3qoFrCdxp3Csd2fqPY+APvmqSnTfRUhOz0Ah9vPHs7V1ysbRjWNBicK3SxQRozlqN79RD5hT11B7dF2RTX3sZqirfTORXidxj6DaRd6NkVrZi2pGwjUhrausuVcvue0I103qEdEQufTsXtkZQEf1a2sY3rBss9WqDG5WB8t6gyEumRjqnj/AEepleSyTAsQtUMdxdhS+oomoRph0HRT468l9/I/P5kYSxOB60rysvH3eI1ECMS3JrEWNWRA5WFyegm4fA+fMg9xWn03NNag0JvoOogOpjZxUt6KbRXT/wAVh/Ui0ZdRpv6cuKb613tXOddzW45ri/a2UvG+E7PUJOMImpxlXwR79Kf8uQhWzDU/TH58LztvIHU0DWvuGQBb7uRxrTxtX3/BVbwmBZ3Mr1LnVUx3DKF2XsPLl+UdANzFtrvxrfTnSMjJ0C7h+0fkNtlatkWPBYREzbK2tsF0KkDwEPhoQVloQKz3DPZ59K/FVLHQWH3lOQcdsL1ai1si0CxPUnpjeq2mY/q1yyz1C8W0+vWJGvfKsybAZcf5D4CYdezk0pWtLe9SL2rudDU5m5Yq0RLxkrfRLK5rz3qUVpktZQ9Ylmgehh6+nj3v7aRmcB8ksi9pmfH+0QQdF/J8+CqTD4ib8z7dRb9rjU30w6OYurCk+XxCRZD7An/omGU2tUXvLoPwIC7NkPjJdmPkV9yXKcyjoTvyoyuCdkM2Z/n3B79UWcZxhEAnGVjRYe/VW+or/wDmxPFjv8APEq4eXPyaI5SA8gUWMuvwY7iu5fUUAyEEMQ8F8D0356muqsakquas1eqpZWuLj5LthKhGCCGJU9T+C3/H1WM2pyE5TcCqY1RXyBKTl7wzGu7b5PbsyT8ma3Kn7BMPQwNylicYxlDc1tH8nhUu5R9oAHbVFEYWvXdim/GT084iveWWxiox8xlN9ZZvwGfVNxUV2zJblZ4Hp6X+1h29R5zJoNaymw1WfSBw1fA9F/AfwcjEsjqs11I0PICH38PkcIo2RXxqvUk/7eO58f8ATaGLE95rUHn6XUUF3JXp9xiWCte+dXUk4/nuK2i+Cb6y2NTPqKi/0xZeyyxRAu5249fuK5xiV7j1R6+M7ZlXaWVXhLLM18xfHWqvEdcfgbH926I2psict/gE+ZWpMNJXx17D8PEGHrd+3QMYb32mcwmUFsr/AAHrZ9y9dThyJqYQY1hn0FwC4dpnZKqw0enAzWofCsfezbhHR07adCeu+JyTzhmN+13+TwDcYlgSpsnuOtkqtjZKqf8AlFqF2dXcrNvoamXFerj017eeL7W5KHuGGHoemCdCA6OQe9RvjFuBicWruqXt9F6HwJijcZNThNagEM111B0BhlRRi3ufKv2pOtTXVGmOoovbOXla4tjD7ofDUP4t/hPRPck6AbkOPEwdNwRsd0syf/VfHC5kRRXkWUVJKx/It1YxWGiPMDZy1evHZddEdkgzbRBnSvKxyfraIe1cWxdB01P1mQxMPz0U8TjOFturNVvQxU5EsC3Q+Vh4ibhg8deQcrBkOYuQ6M6CxT01D7w+34QdRxroBs5H+TpX+7rxeYr6NuHWJdQ1BP4R/wDPo9BDYTAxB+pM+psMsyrHndcwMQWbkYHnOL8+A+AfuyLucqAL3Wd1+hHUyrRlmOympSGs/wAnX5na7AstNrdFYqT89MetWrpp3bdlUY0dcbKlvpjgvSay3z5KxRsqzuT5hEPQwD3xhxHTulEs+ZVb9gsj/IX2Xw1uBJ2wZVTtraWQznCvHpue4HIR14wQxRpZR5pUzxhwh6AbhGuu4p9+XszTlN9RFGz+QzXk3Ssfc66glFfeUrxI64qc78Wk5XqWWd5GBldiw42JnL6phLiU4uL9SLQVsTWQD7Hyxau7fm54Nt2m8twOQavViq/W1WS11VrXDRvFn7g6U1c5YeSHpvyQbez3frry3034JYawK/qakY1vbWpHQe3kem+pbaxPnrXoG+xX6K+pU/KEi2mamoYPHfHH/Ck/t/DfIdFXka6649DUm1SH/VPEww+ybMxCeeV/m6AbmHSiLkXfUW9ax72oUbsNxCokstLn0zNW2ZrcsqLe9c+vGQt1UEPk6rx4dGmpxiLqY531s/T9q+Ooh0R8KfZmgPhvUBm5W3FrMo2L9jF8Jq4fecGhQiJjlksxbN3V9pt9LLNrK/Zn/bwEptZZc3dJToDG+eleOHDLwYk+PGLXyPA1J/026V+7O/cgAgfie6WhEERS7f8AEJgUepcMFSdtK8hq42Q+ZKPVe0M1RdZTtbchOFvljVtXjWb2vv1PnjJ3ZdWKl8RBwsn05Um32Fuo3v1deKzXWtuJJ5fg+Jrc+PJvhWKw2lpXbxli8W6bm/HU1PjwRCw6jwV9SyznKsavLS6lqG8qU3LG5PoNCCPDfgvx8Q+/igFhfEeqH7AF90s1jgqlbEsfEwywQyttQnk3TDxvb1BuI6r849HOZ6jEoLF+uI/00yqu9CJrpVaayaFvq8jO6yrtGjIYDCZymL8dGUtWLO3O9Eqqyp9JaJXUlUfXKD8BleQ1Stkgr9S8OVY8a14MixYztauvCtPv/s+KtoMdgQjc+I3yOmAq3W5Y1YvvPpixq9NJn0lNZa+pZ9TWUa8Ad8tHXiN/m3Nzc3DNSk8bH+7qIDqa9vQ6O/6lmhSPU8nvXdeXBYG+yvIIj1Lk+QHJsi7gnzPiH7h5iWoKsfmz1+ePl8RkYFVletFSojkHpaeQ8HQ19Nb8qaTYD+B6fs0sI+2Iv8LsuiemjABAVEHGJwh7bQ6EPVVLHFr/AI7FKt1q4liNHoJjW9uxezlY2XiNi2eGtxh28Ppz9vYll4HxI4J4b64j8zbivXK6AaEcvbe56nwMT3e39jK15FhxfcxakJvzxrkegXlNdPTDueusCnT5l44D01k+jzccL4ByJ3Q0sA2euowh6V3GuV10Xy+g0ncxOtw4VnorFTVmkhquCFtkfgE+YzeB6A6PJWL+xiDZs2lWw0KHrrqph9puE9eMDai3TmiH6ywRsm1vJPvp1/0mMDlJj2KXxsOm6XYzUtB0qqe5vR/TvoK/VPUOVROz0/VeuonIE19w9l4KSZXhW2Gys1thr9l6/d0p9yRryMUQuTKWZX7ePlS2ph5NqY2Q2PY9gtavF7ssqappX9ywwRF5M7cm6IO4T7EKTLKuAmO/B7tdzyHyQvF1Xe0A+0E5W1FaWF6yh8NzmdGDprpiV91rrQkduTJiqRdT2XgMsPPw/pLiBjf+7iOhrPVZbbyq8GI3rwpUMzHk0PlTrCVfWUzKmwv/AEv+Mtrsc8n/AAE+x9phceeXrvgbN+gSffqPuK9qaRcTMPXHXduQeVmBlClstvuPz4KeMrpryGH/AI5dbLqWotoq5nJTgT1+ImVtHTicTpUAz5XsvQSs6Y5JjiD8K/EHm33VouzXWtFVlhsaB4V8uJZYPia4wnfX+vNTxOlsJXX/AETCJg2IlluHZiu1pvl/o+NlT6JMa7FR7oirxzF+jxrF7/p/RRs/J6g6LMBiq8raVDlL80oe+Hs+6jHduqnizBL2Yceo6Iu2f9gNktwmMGN/qlfTXUQDcI1PYjZU/Uc14AxAytYjIZTjveWw7aS+JcidPiFVuo7D4wNbmFSJuMd+e5vy5lYq92PU6HR8t9aWIcsTKddwN996d2josPseg90mA2mydOCpU9Ahlv7+KnjH1vpUdHqYBsdAnCXtygGyLHwoWJa/38zGhj/Cto4+G+XLKfo4BNdQNlj0w2PPLYm7op7VZO+j8b6D463EOp6dmWVTO9P/AORsxvTnx29Q2L+hhhldxAwkqyJbjPSdKi2naHoIvSt4SD+ED+M/gp+48ezZlWdyyb6A+3jXb2466KjkOHaN1rXH8tf7H2/6B6Y/oN9ta+lZuCuJRZXjtZUspdLUcFpmerJho3qV9stsKVdP0Xqfke5Z9ictTvMBy3Nbi3i704+3ihnY2ddV+Sdn4AGyx+nmLkS2vt2eI9+m5yggYiVWGGzHtmIMmZmZ9JB6oOLDEMsYTkwnpmVihcn1XEqvf1u9mSu+yuwVMwo5l6WpbevD2/CDqd1rU5HxPQdKV25+ViN91Sh67a+3ZKhysyF1bNwHR+JiH+XIOyF+oriLqLCdnr/R+fCr9j86h6IdN29TucSn3Pb+w/iUnZi1/UYPiYY3Rq60oGph49lqtg28s2wPb5K/A5Ld9ZSFjsCelbcWce/gqStgkxtXx7Wxmo9QGXX6uP8A2iIYeh6YcTJMcFjauq5uA9B0rUtCvHzQcjaycdeHxPtM49MZNw5K2L4L5poq1gA+fEfP4v8AJ/0DKn425DGwZdlmO2P66HGRbRei114tgVslMn0PMe5PRrqZ6lQ/1Won2qzcj1+Yv2rK1DH6dVje5leO9s1qELdCNeOMOTXLwsA3AQpZ+XWn7VJ2R7R1N6cSJwYDy1D7Dc/0ldz1NdY9h+wRGqsDzEw59lt/2iCwVHJzLcmcdmvBfWTexPODU9vwjqDo9tLA3sfDXWl+1Sfcp7qn78TVVdZ3LIn2m/7umum/al+25Shyr1Y84JkBrAZv7PAER/nqBP8AXW42hHmvbcuYt0xxuw/c+R/kn9ehP/7OQgru8DN+3yeCiXEuV+UdlNN71sTs+dA5JZXwI/xnwtU66g6ncneMqyCpNv1Cc0V8/wC+xhCIw6HpidKsg1zK420dAPCpiIX2PKvQHX2g6qxWPpgLONXimhH4gnx19kBhMHg3z+Ee0C95hiCJgC2P6cyQ4zKO00KEdP6PkZ/b386PVLeBpQs31RdgxuOLeKBb6qahh5AvW+gZlOVUiF2LHwX5Y/xwfJPvMXENrZVnGb5OE4m5Qw6iIdS/9id9R7zXKOw10Sw1nXci2MhBGRHQ1t4t8KvIt8wbY5NNrYhmOC1leLxl5sXGGLZaUpxg2VdUkVjMXGuss9Rzu1N+FZEdU468TB4KpnbQq+MyzWuo9pxVoRqfT/8A+uI0aQOStq2n+WvJp7F3Sr76vEt09K+acICd0X1MvFvD+vBV5Q/aIOp/SVHjK1JlzcrOno51m2f5PDW4tXtw1AnKW1FYEgr2wp41GBNw0+3RutdmpY3eDLxXwHvU1QecD11NCcJi29ln92wKTmrkY7UMY0MMExOmox0m+cKEdNe3ROn+vj/U150sAzex/Dvoq7jt+BjseO/Gunjhn5QbmOic8jDrqhXj09pjsqtd6UTWRrxMM9MdFptrbKuzUXGC1QvXhrZlszJY95y7jh+m43qVlMS9c2u7BWWYbqDWVmut/sIPbov7Zd68BcrS7RblK28ACxXVMd+/D01Au5b9ieFT8DAdRrO7OJ8SJ8V9KW4TAyeNzemplXp6PTjPZTY9XqGa7O78jygQCVULVVk+uaob3g8N6m+UII/EjCsO5cq5E7y2DjRNAxaOQ+iLRsO6sG9ExbaFsjrx6en2cmy8FLB0qOrLV4WeCY7PBh1CekpTW1mDTO3S4ycOiPguARowyjSiziWPRa2cv/Avz46+yBCRf9jHrg2drJ9ZrUZPhUkWvasNxgYpMNcxdKLk7hsrQla/evGO3wVYWUcJxmpqKJv3s+5fDJPKpHIbkpnZR59LHq4zhACJTxeXYvGYFrY1vqycg0YQwwTF62fpBedD75ymoIvnrc1ua1D+C4eI8hO5oN7k+f8AR8D0HhWpaorqb1Fb3bJ59G+emPmWY7Htetp//PZU/wD57Kn/APPZU/8A57KhlY3Z6dt7O8MHH5czT/hzreVkwxuz1S7nagJmMxWW+1iXOkX1GtkU4doysBsecJcPbrX9g5HoDGG5XvnZS1bxKy55iub6a7k+IrcZyllotxvAe3huc9haGeGtgSQIlm5Z7dFTnKMNTVZ6aaYTcmPv7sS50fLx2R9RWRT9alRa53No8ddEbgz3d0QwdN9Vr3G4iH3mvAiCA6i5dqw5Q7SPT3Hx1zDb6W1YorspetiJboWRG4Nkf5ZuKpdq3GPLr3ulZ02Lm/SV3+oNkHDyAreoH7q3bfvYv8TTsIwO1LezEcprUxreDWponxb9QNyjINMZ9+CezY2Dd6pit/49mKbsW2icGESvcTFIr+n4J9GWj45BsUiV7M3xaxyY/tORn1NijvOZszcFmpyUyzW4j/xt4JYjY1LVBsiyqBkIV+3NpbPpA7W47VkrMV9x6uDGqq7EyKuDMscQ9MTq/wChhlbcZ/Y6DzX55cR+Gwq1Hga2VPAQdD+BYfn8PKuvDY8jNaXpzM31DFD9bfPrb59bfPrb4Z8DEGxkZHNkBJsftixuTiUBMPGPuVbUxdO968G6jIsC95WVkg9jAu4TvwB1EsCy3IJsXJcRsg2KV4+Hd5Rl1034CHyS1qy9jWNqD2h6KCTUq01V5J4VZLi1rDfZUTUM71ZVra3ulhqai/AHPHI8P9YPc6Ah9x01OE7ZmwoJ3+PI10wbhXZbd3mybL6blzWhvpsC4uI84YCT/jqM+t/Srklfp1tzf8cMOrI/bUxfT7Miz1NyL4j8SyfV4+uJxRtv73ANx9bB1NcxA0PjRYJZZ7b4L4L7tiW/8ffZ6qEP1dN62HGsRMLDJ+lQS+pOAQc8tdS1dwJxlgHcsfjD1/rw35smqlOoZvU7hgeY+R2GqZcoP6apI9Nat7Kgsq4inOH8r1mNG6YnV/0hgigt0HwPMD2b8W/brW3blSt2z7N4fA/DQdNk+934Pk5qiszFCmZJG/xmPKHZG4iyJQlcybiemLX3bvUCPqx0rJDXKLJrxo08sxXU4+KbnyWHLw3OHufnpvkPBG4ll93GjWNtYnHzPl/XTelW1uwvzWhZ8/PSmtx0P3LK/mpQWZfcjruBdwpodPbQUmLwQm6b3+Ww+0ES01m/t5i0+nV2m30a9JYjVtAxQ4nr99U9MyaMyj1C5ceU4QzrFycPHDetX8citsqjpivwOXRtg/Arj9zJsKVlP2/sRT79AdF10etGlYtyY+/jhEUu9xe826UX2RXDJQyKD6i/fv8AVrmNWWysMrktgE/WZL/zM3nrxHuD7dbT9k/qanxP6qzGrNHqamD1Adt8yk12XVut4LC5SI9csGumJ8dLP8fQRTxKcXmoBqHwPvANz+/w1obDWqG/KqFNyqWP0y4wTIQlrmvd2281PYQERzvog5TXt5J7S73/AA46l7s7Du7y4FxlPp90yMZ620fxnUJVzR6dyqKNUS8Y7MxHGLj9V+W9p7MnhWeJsyGQi/6hH+eghEAh+0dQdRvGi3iGADqKd/8AqhWShqCNH8SHT2aFkGMpx8VDaKPSiGssGP0D6mxAyrFrVx2tdH+9WmpqBJvw+YB9n5tSxRw6VfetVXKDH0VbtNl+n/W03YtuN1oybMWzIzU9UrzPVFSmLPSstaWzsf6e7XEYw712RmL3H9rDkHig5HtHsdNw9V0VIlSAS0oIfaCAbhE1OMooN12TjdvIXHWPgWZZtw7aTVSXahKUe9xYT0Wziajza5ve8/yny14mCH7hqKOTZC7Hl89Kc56o1qZATfd20NwJvrXjaNQTE6v+hgg6L7RhymteKxQBLE9+pg8fTBXXiN9r5NnesxQcaoE5Fm60as8rbsJkYVrXLH5sOh9xAdHXt4qJwIVK+4vY92xiIaiIw114GCkzB/gyHyMa17/RkaXJ/wAXLrfqo4P4zEQ2PZc+PMX1Kq+VYWFljN9Osxr7PTn4+q8Uu6iL96p8dBB7lvaN7rVZwL8cguhRum4g2zn36HoDPnwoArDnkV1DK3NbXHujrrzROZOI6xiXNNdnYVHxZm59meemutT9tm0rEcGprDu66gTlOSqGbl4gcZyh+eu/LU9puEzcrPJemAgsyfuxbu9za4KG9Os4vm4vcx5voy8B0PsJXlC0XU8Gqu7bXPXctg08H+O1mFWtTYm4fCkcnLARPuc/MUTUE4zHf6eyz1nuy3PssPfdYPVrwHzS4RmpxkaN7dDMFvutt21p3Z5Ax/nxHxE9mdt1N8w+Knct+0hypW7kKsnibX3DYeV42sxOr/oYIIOiWcZz5eC+5bS9K42t+aD7riypoyzWPXbbZaoi1kzudqK5ZeiLuEDX9dE96PARRDZzlb1rVaORD8D3lIyG5otcHBJtShsM7ss3pPU8moVX/wDISnCwt5Xpi5KfSWBjQ4PwYZucpynKco0wf/rym5XLuYbEMuRa2T6bnNmP6tivj5vVVlS/Zzl6cT0rftQnZ6AzffRlKnphJybx10+ZxgTUazlDNa6/6htQW+/OkzFsxw1poyGKkdMXEsyTdgXJK6meLcawuTbXMbOpLYJxWqz+42QPaMBrxrsDq/2xdcXo7lVj+fKV6UclYmrrrwHt51txa5NGVtwfLsTLUVuIKjyx+GPV6h6o+ZZ0VdtY3JunIw66D+TGiPxa5OcFYEXiJc5ZtdNeNZ4s4ifaOgmooiruW/seh6VD7qP5Y44t+6wmYH7O23P7+ZHKFSviDqMdmWn+NvPeoqi5WQo3xBvZDAcoW+2YnV/06L0EWUUm2XVms9P1HQn26cTAIwmosHvMsolmTebDjqb8j1SkV5LNylI2LOSTUT9mH3SgzenICdAPapSQQRFXfRRstjmsAM8LwWkTvs1fcnMmCHpzInPc3FPt1DERfUclR/yuRDV3TZhWJGqYKUmpqamo0xmK5Fn+QTH/AGrUJdZ6ouJf6ljLm4T0cGZCsSvgvcYyrINbPWji1RdR0+a/DeouTsWVBq5Xqn0zzELcVLb6np8T/XqT0S3hC6z071IY9OTn3ZR5e0PT0vMOHleremjIqtqKyuEa8kPdQDjTfaxxeMCwpNeAqVUdi3THtNL3U94sjJ4a/BqJZqVpU0LojdlmrOS5iZbKcrOsyh1rUGryosCRqj05e3zAfuf9vwK3KN7jhxjLqKOiypNKYRCOmpUsFpVrNXwHibB0x3Nab2f9vMHU3zU+3lrRtThVCNeRiNxlw7tcxV5NjVi7DccTvpi9X/Q9BB0UTGtamWXG/oIep6DUVxDQlkKan9f6I3GM5Zn+fR0L+oZjl7ehPIgchWn3N+0oXbE9K6ecavgC2zjZK7bCUxkWtqgGsys1ttYz9P7pVSjDR6LqMpQ9dzjyGteVeTbVDm2tKPp7h9PjT6fGn0+NPp8aNMNOV1nswlH7DH+owciri1Nwf0a8G5a2aXF2fojFDj0LYlo9wp2+vNH1OyzNkX/x+KjcPsa9Qnfjuajrx676/M4ezew8NRB7+i+qpbPWcftpbVxYga7J2yFfCt+DW29w2gpWBGZBDaJySMF1XSXLGrHjuXPVGYTuEj6dbDbjNSda/H/US3uUuvt4uT4iHpU3Ev8AtAdTfiV+2Dqut89CpDdbnemWVrwKxV3O3xlr9uiajCETGxzk251f09hm48B0bBtqmg+f9vwBtQjnCmvHXNHyN0GfM15blDjdq8Wx2K3UZIx8vPqTmemJ1f8AQwQRRuLUTAmpSpliHfANCd9aaGtbIqKGaglT6AKdj/8AI+1MQbY+7UVstOVruwnYEQ6KD7bl00rOqZRimyDJ4m61rWHGHGATmQyWjOlu8RPCl9NcNWQ9B96610PT4hO/wampqamoTPSL+xnZX/0iU/t6R/JTRg/UV4lDY9FPpVldluMuPdlOjV730rQ2Gq1cCXZlds57YjX4MewpYdA+O9Q1Eg+OoB7xvcT58E95a+hNeO1TGo2GwbzlY+Z6KO2+Bb0TJZZyx7Y6VSrCNtdtZSUjdtg+8jcZBGIhlTcLHygRseIsIld8D8mSZNYD6mprqYJrXUdFT2avdfjvy/1giVd9LF4NwOuh89xf2BQtRkjHa71+5hZn90i4c6wt6ZHvZvXQicCx9MdMOvNtFzdD+k2AuN7tr7v9vE+IfY8AdQQ+Z6fEP8qVfbbevvZ747+xmJ1f/GR0EU6KJ3EXms5MZ7k2VgzgZxMqSukW38zVb3g6cG6cvtD6Wv7kv6Uf5DMENi4bftHHQTHs+7Mo5VOvE1LzNWOqS+/25e9p3ZNkrMfEdn9S/wA/huXe6eHIznucAwI10HvNe3iqiMfEiYQP1LNzeIdH0W/TZuZRgJn+qW5zemetXUW5+NX6hh10RqGWz6LghylqQnfXe4Rqb8kOnyEHPiegabHXkwp0TO2011/oCf2YfEfxAnkfJgCyZRrPpNtmRZ6hlbXBuWyWehVhLMGsT6Hcsw7awrmuDPLTBxq7r8tEhZtNuERKgEdl4/gB1EyCsqursR6uJYe8ImvwLsx0KQjlExuYONqBEA8x8dFsKNY4jMT+QfJb7m/XcVp3AFqXvh2PJGiIbGt+wFiDYOv92KVO4radhxs/267m5/XiffxB9vPXQyq3tswHK/2OCPqKL07ZmJ1f/H0EEwb1pNd1TSx1M+2O/Od0iG86J30U6Y/fB0+Zr2T2jNsxV4VYdKdzK9XrtjLxMb46D2ILfQcixrPZrLknow9pj19x/wCPEWjIBs9UO8nxtX/1vLc5tNyi0JLWDpwaa10H6kAFiJucpynKcoVlNP8AAIvuKqiWxBX6ZVl5RzLuno/q1WPj1+q4ORbnrRgiy1rn8R869/D5iL7uVuY1MIUM4amhCeiOVNlptALLPqTDkcma2srYeXRR9z/t4CMdnxAmB6KFxctzZZPRR28bIYtZkha4mSQPqBbFPBrl3MnD+1K2c+n4ltEsx+ctp1GqIP0ZloGrFAT8dV+o69T+Cn3LsSyfPT06oWZDrxfrvw3ucQVor/ktq4hhNf8AQ/1DQ+8rq5Qcqg7Q+5t9mJ6GE8gYG1D90+G/JvwHyfY9B4BeSTXRYyF5jPZS+QSbZidbP8fQSsaXe5Xbxldu4thly8IYT4K2izbPVE2ACxwPSa6hbnIqc/eXDlj8Psc7PSqo2F6X7aUHRO/Ae6SguHFBZRwFeT958VPdo/FvUJ3A5E5HrvyagT02tcirLw7MOzEoa91ycXATIybMuzwHyo/5D07w31+YwK9Qu5/jjr7ivUoHvkcFCifA8C3LwoIhA3214unc8Pj8GPXj4QrynysKygz6FrGt3jO47Ma0wWQ2e3p+R7ZC4lFi3NURl12TGUlrxqMOTspqNtuxbbC5PiR+DCr72NfU1Z/DR7Ko3N8Y+26ej6XJc7fpqa8OU5ETH+2tz0J/IOnEEGrQ6pBkFY2Ryi7Z7v8AKfmGf2w1DEMf3cfiPkPnW5qa8a0bd1JrJ6CsmAcFVdTOGsjUxOr/AKHokrPWmU/bMx+TeO5r26V17ZyiKuWURvUXsBdNbEJWenVfWHIQ1O/WvddT2liHPHwB0SujTxx5bYAxsGxYIRo+FVnBsgg2f9U2Sr1BqWoyMX1jEy+PprweXpuScfIyRrI668BDikRcR2hqXHlNDXvaeNv1EFvJ7F4wtD58dQFFU2bm4DqK3uy99ZVUbWycM1edKQ2bP/jgV6Mt6FmDlpwycveS9pZrX+1YSsqu4zL3v068824vbiMVsb+QX0d1EHIZeNxl3s3iqRsY6II6AEw1OJwMpxgy4ebXQ1n02at2EUhUj8GPXyo4lTZWLFx6k79V2Asexqrz8/h3rFU+3gPwqNnioISH46g6TqDyjdTCY0SH9+u/xDofmtSZ/Z6HqPeV/wAA+r2bKUvUqUIsaNth7pGPcpExetn6GCa+xB0EqOoGEdg6+I+Q3EMdlV3NBEJ2ZV8Fpvp6df8AS35XqtdrCvGvrOFaIlDs9+w0EPhXRzHf4zc2ZuI2pVVVmUkaPVazYTWs7U7UdOPQant/0PqTs52z9U7tl1c1OmnHyqH09fTXXXVJvcSxq4rIJTl41+NkYzoSNdNvwI4H8g+d7nbWyUncpRrpm+iNUbfTL6QMVwFx6Wi42KsXEx7Xyt1vPSLjWbrOcqY11Zd/Jzd7u/I9yUP9xURN6x/THRnocXVv2gLtzucZtd3rtcup+aUs7WYr1haHMbEZYlHtVbhJLvUahK8sPAV02dXTG9SsLW+ovYvM65RMgiV52oe1etlQENU4a8dtMTtZ0/418UV+n25t2N/43XUvqfp+PZUw4mbm+m/H/Kvx4GD8IMb53CdAjq3x1/u0cWZdQ9Ghi/P+34B4ge3IGLTzCLoldz4hrnGcYYDouBdjmVXGolVyYcdhEmbWUNb8Gsr7Zxetn+MxRs2faqnUUcjSUU3EHoDqH38RP7gfjDaSOnwnSvH2rvym9yppX6i6TKzmtBijcJGuleMbEOKlEtva2fEHue2dETdYXFZVvvFbW6WHUTRbL7dCA6PcEJDzlqfP/SNc41pO+Zj51lUyUEEB9k4hOglpPL8CNxJvQgnfVbrKC2YbTVfjKwzq7JcRzm5vwPkJuYtC3V4+PZROXbsZ/qDjuuNb6zR27eWoTKzxfPwWeielrrKvxaxMmzjLG5N01F+0iw7W/wB6MshcFu7ebE51cJaVEqu1Zm3dpcXK719j146UepY7v6j6e6joOlVnGWXkjw11obT3VNU2/HDxvqL8z0xsaLQ26vX76af+euEyPUcjJJctF94eg6a8VPEqqWlsRwpGvyBIdCdv2Pz0AhmvBjyrD+zjUM1DBP8Ab8J6gbn9bi2FYtnuV4ORFc1zjyjD3PTF9zcoViJW5+nqzika2m1e4LKnwS0yPnE6v/jMxxxD2c2HtO4B0XoINCampx3NQJ7JTLKuNXwJoTfVF5tc55dFOiV4u3zO3/DFqZxrjO9qN79Nbi8V8KRuyz2fpT+/qH+WLWzE1ssI9vDf4T8+DQwRFHHHItqUTR10xfT7MlnxaMKO3N/wr8+Sn3Pz46+3zpqN1lti88U6mWqCU3amQveXJ+/EI0enpN6Ngep430+U6qEobvN6jtW86Q3boyzVDlHa5g4vn+1F7vkepMfq6Pe25HsrbEdRg+pPjtf6XVl4xGvy05LoL1BHXFxXynwMWjHprp4K2Pj459T9LetiCvVfk+Qm+v8AfNlhOyTvwHmTPmcofnoPnuFYXJ8EMdOJeGGNFn+3gYPwmfPQtzAXcYe67Wa70KanH3o/jDjZaV/NqcGQ8VodXWrKbGfLZbJh9bP8dadyMjxU1CdwDovQLGO/D5gl0Ro410Pgn2Qnfhj/AHv2XeewgtIK1DKF714uOx31rr5xeCouI6m4DotbPMZeNznk/TE4iz1BA7D2Nd3bIzTGtS1TUZ8HX4RNeRhgm/tHtDrKRaXMApSV2Kku9TYhmLmD8K/PiByLqVe+lqmm/BjpfPG/jpTJ+6m37bS/H2afoK3SxbcBWa7Farp6RcZ6rWrpyJnpPtbkV159BGj4gbmT/DSlL2DtzQhTUoPCzKoa44SjnlZAehLGrZrEvNGZfgg/SerC6pqLPPc3OJ6D3KXipBQL4PSrTX9M/L0lx9K2FcXqxEx7KqwFPrBoyb8avMl3pWHZiZXpb0dD8/i+fz78E8y3JY0MMWf7ddfgHTfXcwwXLVspDabQuliGpgVsTX3OmqnT3K6hWPYHHMWJWSpydwDuV4nUoXX2qDXcui1sxGNZCnApNzfiIg98j36MNtvw+PLH/wAz5Lc+HKBQsNpJ4pmoevpmH9Rj2YjCw32JObMVxLXjY1+MKLBbVD0w15WZz8bSdwTU1094NQjXiPD3nu04GdsztmdswzXtNwT03ZzLHJdDDZy/6WoDqJ2q497K12NxqWg2H6C5SygHidltndRnt01NQAmdthN8KKk21eO3AVkR8FxAyVx3rBGZxj+ol1INxxba8Zr84iLncSmca2Pq/Bzk13S22kP26bIKaEjvQJ36tYLUtbe7s+G5+kosTIluHxY4+oeHHDLrMypaxZbW6cSOmHwuqvobHbvjJVlQTWoV1576foOnIym4qy3W4lv/ACiZ0w8fuVepZVeHi328nw/UbMYZ/qjZQF7qWsW8shHXUb3/AOprx1Ne3nrSGGf2pn+34iuvPGu+nuYfUrZQ00yw/coTjKHRjZXLfuYAvLilS1N3G+k7d1nprUv6pSaEqfTcPfsPrsmOFqod+UWpmg4Vw5DTcETzQbnbM0dqiy48vDjoeIiHtlv2ZGr61Nps7FPcNFm6sC602WLiVp6mK5Z6hzf6tocpnFd71k5Tcgab1tw7K4KzuilaMWxzY/mP5oRo9R8lCOu/J6yB0HT0scLSPv8AzJrdlRraIvKMaxPmBq8bH+ZjW8JYGSBuMT1C5Bv3VpvcPg78gNha1ZmcVcky6KT/AMmNN6iZi5/cUuCj1PZOy8+meNZpIWJ6AiNXyTHsEzVRW66ldFjHMxW16bd2bb6O3lfTd9bKmqeYthrt9W/+dWKn6iyYbLcz045WrEDnMxOw8o0bMpWR/JULs9a448VHdQzH9SyMVLLntnpGLTm411DUWP8APSs7BGjoKEbgXfkfI/8ASSvUf0pq0KlSfJ3DUmGGL8/7f9LHyGobJtVl4bldagPSd/TkK2U/0zPtTyWcC0NpBryDypz+QyqVyqn9PsptwaBdZYlOrMX7WrHbNgSPezgQdU8gOUqoIDWme7lUKs6haugjHl4iV1gwncx9GzNT/wBXphUd+3Ez6r68vMzKrXuezw1B0rq7s501z/kLQBmvHuqvosrKHzx14g+7VqkcUzW52SJ3NTuQ+/ny1HHFoJVRtKCvE/PSsb81+etFPvdfWQlzWBsWpoqVrT9KWI4Y5di7SlSW48ZbiOoVdw9V+OvD2VuEJLTa2R6GQ8UE+3S2KJZaWOyIzs8HipisVixmLt17zBEtZHrzarVy2rW/ByUsGR6emK+VkI69ycyYl/fpejgoGzQUw1/luK3JjhnXLl9BpaJZVfVnYio/gilzsYik8j474y4cl6YPH6n/AMjQIsPTCxWybPUWx1JQ/gA3G+fxEweVm1GN6lbRM31FMmhtdT1MO4YYDP8Ab8Z8j0ck1q5Q1+oJpXXIF9DpBvXybnVKrb+UPT01uRut7Aych7rMFyI1jWENpG+5Pp3ujVPWYOgG4BrrrqjaZ0KrXicabcj3ptOrL1MZ+XQQ+AG4qcJYvu37S25rhAORyR21wd1W/wDkGLyWb669ulT8Wtr4xF3GsPSu3UsQCamuiqWJxHEFWmDmuG7kW++V45sPaXHltxsP4TWJbj7jYVyDB9PfJvPptFUK4Fcvp7bdAdDyE1FwyFL1rO979xoWJ6bnp3Pg3z0wiVORyuvXJ+lVrMfJD4bwqVi+8X2az40JtY7BiT0EY7TuanKb/FWOR5hT2VthQqfDkRCDB805bqv0dWRLvTraZ25wZDyLSocGrqFZuv8Aax4LSIuUmSMjCNKblV7VFqFtWBC0THd5y+mh94T50HmrJxM3qeq5wy8Lpi1G6zOzFxlm5sPCPIHXU/h1NeVnv0HTtl49LV+B6MNRovz/ALL0VtErsdDP66b/AAmz7IYpKmn1MMt+KulqZTdaWYnp8zB/gmTlfUZOPxUYrjT2aZdtLTwTZEOTYRVYjy3D4qoLEjUWU41l0OE1cY+/HXQDZZS8zK+2hgMQbLDien9TRMK8ZzM5E9GXXQQjUx24Wd09zFyA8pt71B9iYIibB+7wtP8A65PhjhWl1YRegUdpr9ip9FmLsmOzTHqSqNfXWtu+e5rw1NTU1NR7PZj9teQySjN4izJZjziXFZZjc6hBGXw1uaiIApsNJssa1vL0rIFN2ZQabtTtkRNrVmf/AD7h9orlZTctst4I6WCsMSx8q/uhUqfwmLDoJ05mLeBLGVvCuz2fFIEDERMy1J6fRT6orUYyMlFDM9NVCtke9kJ62X12YrrwaYyPzxsGjl/FjRbkzjlYrUnoPIHTXt3Or9BDyw0+fANqah8B4a/O/wDj6LFs1GtDB0qIeor0MMI5VmLAPcwCfqylGbfsylfwny17dcTKOOvOvPxcv0u/HLKQZVX2zfb91Wy+Wv0uP6eO4n98/Y67e1i1Fy2PZXMfOapK7TUTmO0GQ079m7r+6vLXWvQi5XvZclqNSeGp8Sw7aGCD2mz41e7OtU0JRQWlvbUtZU0BHHDu987H7V0SvkX4Vhn5dd6m9+NNSrHFdoOM8+isMNIWLQDKcStomNQD2xM9eMDanHvJ8dO37a6D2nIzmZzM5mFtxvnqOnpuSK2zPS3FjIyEKT0xsc5D6qUpi7UVM75IWm/sfdZci1+YvNq0YLbexVbkXj3U14ZFRjdgp9sUDkV/DvUe7kW1rRmjO2dfHm6/x+YBY8+zMXKdLMiijNqtoehp6B+ucSuRVd/J3tyxvcMI1Da6Jj6Vh0xF7IGYWsvyHauqztq3qDcW7VoK6Pjvol3bmqbT9KSL6mRQhYrV2DZY1reXz/0DB4rUzT2I68tTuQnlBaQphhnLjGEox9i2spZwJhXXUHU+Z8wqR+VPmxOPVk/9LHu/gtzXrt79WdLfT0oj2e7nkcABXzLGvmFD7BK2sZ8Ve0mPQsGZiVg+sNC5duieZO+oMNZBPuxO4T01+BByZm31DcTXkiVMmZXfiGm2xpvUH3SvHZgygeAXlOwRFPbHae9uJwofULI97v1SwhTcZ3GmPjtlyzAdIrGssvcWb1OW/MzfQdROBogtbl32aU53CVnBmXlV0YwHJnbkfTh2lYljsn8RvK1Wji+Eotvy/wDN4B+Dt981011HVT79NxXKw+/nZUe3avHyVSxY9hSdmLYUiZQsn0a2H0XGelPVU45SnRR/e2vaxbvaztGY2EsuqrdfpiGpxi89Tr+mxRGs2OvLY+PDW57Dw2REyrRLcwn86Pw6amp7TX4l/a/JHZHsfwctTglwsQoVneKwX7NrhoR7eA0I784Rry1D5b1P4zK8aniox7qat1NadmttS2/hT3IuMtr23ATnxXAdVi2KDZkkx/06iDovh/Z8eWoDyZvY76n8Cj7HPv4Yr6bKpORXZisAMdmlPpwAyMkjqg2TXA4SFi5wk7tmZaa3LE+O9CASuztRb2ZsiruxQUPOuMfu6AAj2ntPae0ZT1HWuwUx7WtPWt+BsuF2EAVmtxjwwPxYyc7cv/6bfd8ckXZbbvHgw0a/2tTc15oPuI0fD5Oum5ucgI1xcWPzHTU4rOAjMB0PgCVmFkvj15mGvqFeR6a+PVK7ihso2E/V4GZZut4GO/T9dr1K730rDxDan2tCpU/EJ31MEPvPgRH4/iNfFZvoBNaiqWipyn2xWChh5DqDOZjTcPt5b1D7wclL5La1yTmJy23iqcjriSvbjpoflYam5U3Fu99zWAyjJSlXaho9dO1CqGTgS2xi9bP0J10Hgvhw1X5fEc7P4RW1j14/uyQjxrGonqQopb1ssr+pWEF2JZ+6gEMxFUy4+8Wrk9dYpF/vZOO5x1Ptm+hg6KdRLP5Mz2s6fHQW1lOazms5rOazbCM2zBANz48dwGVLup1rSfVWRb2llYA8N9dTU9Op525H+WyY32Bvc+D+8NgVVcrG+NdB7zgZ2mlGKbY9qUn6jme0tkI0YicpYvEKdzj4qBPbpvy11pJ5uxVVzLMcn1H6kNRjtLcN0FVhrZ7PfkelX7UUV8crOEstLwNo/PnvdXkPk+5/FToGy9ry6FCicoT7tufE3AdTYsj+0VgUI/6R6IF06owsZq1VfeukvDRqGqcIq+7U6nuhXIBldatH3U34V4mFDsjpy3PaFuvcMY7hjfbCxNcxOtn6HoPBfAn+OA6KGsx+g+dcofn8FS8339IFySoW/T3IVbx5ck61oSbV4CtebFtRqn0lBsGRjDHltpaEzc5H8AIg47spFyEa67mPjNdPoRPoRPoRPoRCeq+8b7R4agG57VHkT4I/GFTrrqAblHp1lksqx6ITURgZNCrlYzVvaPf4x2+fD/8AGJUWi0ngah22VTDwUtczSnI1Mm9ielbcGybEYdwzmT02Z3CJ7GMvGana4x25EwTX4UOmdlIsbc5ancMrves8EypZjNVOBE1MavmcnKKdD1/bx+YqhRry+PAeQ6WL21lFXfosqbfsht/XqIf5DE9yfHW/M+fLUW0LBeoi3pvDat1u4mMYwmpir3hbTxh9jFTvLrX4dTep3WE5w+/Qw9D0H7MdlzrpidbP06DwHhv+Dq3xF9oGjfPQ+VIKiyzkei2MJrn4CA6NifyCsSquvkt2Niy7JW5+9xgymEX1GwH6my5vUuJpDEQ2cjXwsP09Zj4jLDUwmvPGxrMiWNXWf4jLcGkLR6dX28rNJHfad9p32nfaMpiNVLGq3XwBJ2fEL7dNeFdhrllX2RcdEUVY5U5SVR7XsIggr5TAqN+JZhdoinmtq8T11uKo7aKgXTOBWuOjZUou9z0X9rjuzq7b6DxRxAnEu3L81enDpx8PiJkNorUB2AYzDFrJ5Hx3OUK76Ug9y1SGnzCCPA9TB54VXeysuzvZSLTVXZnW2De4ePZVOdGjNQJuHpvfQff41jkWBU7/ACGGJYBCw36baFrL8pb7T5hWY54X5SAy0aPRAb4Rr8A9vwmcF48UWow9MTrZ+hnxAeqjSht+H+vQxfibgOofcdD49toA1NXhX7J1/rU3+BSqILRZi+C2ssXLYRruc+oYT7bAKZ2GlWEzTtVUwZTcLrOT1OoqzMs3NTkmuZerHFU7U7U7UasEH5A3B1HQRRGbfXf2fPQdMe9G9K7pm+UJ30HRZ9V2Y1ztFsrcYSY4tzfT68mXYr1HWoFh9uim2qVOVpcbh+Y46CWfMUcjYNTX4Nxh4bgP4uW4fH3mLY1czLFttHCELOBmoo9yNeAf2x2WOUYnjN6ncZiV0YYfx1WmprP26r7wWMlAM+Izlum4IYDD90PUfbO4da8dwnxPRjN6gaV3skrymK/UBiqc5bX7+6tdcWttx3mtdBZqdsXw+3lvj511Naxp4zt0iOVhPKVL7WpwY9MTrZ/j6CDoLCFU/gE4gtpVgKQGuPx3uGvkDUVUNqc0YdwAJb7WHY8N/b1sbk34q98j89d9Nz56AEynnXAzNN1CPc1hdDGuYDlA8++1Votn09s+ntn09sRuNlw1avz1H4gIZgkS1eNngBDZ4fE9NByKq8jGZfUPTari1BuycoKlsx3GNW+QzWnK5QUu8ZChhr5ziVm9rMbXNjs/hB1OOodQAQqIOIh11FTFTB14noJr26p879uqsVneadwzmLQ1ZHhjHVTHkeiLyL6DdD+Edf28B7TkddpQO2hj1AHjNdRBNfbEGgx34DUI11JHTUK76GHo3uRF9iGhs2McWrO86zauO8nGi9w2Z9LZY2Ok2BA+ix7i+J8NbgQzU5kDwx3AOcn3WH7ph9bf8c2oi8TD89F8t9RD446+14034Vmuu/x0HjfmLxyvJfYfMq9p3eEtuLTumBvtI9rNAFxyFqz2ErvuIF10710713S1NNr3g6j8Px0r+ytjs9ANzYSb307e1IhA6YmU2JcDfbO6TMk9qcaAxvqQsgy5x4mb1O73EaplgMT+aLRxb6FmgoetTW01+JvceQafUtHuV4OEI6C5hDaGmxNzU49AdTuNrx/qByJtXn0+4a2EFbdo18Aem/w78B1HsbP26AcJy3HuZoUmgYR7npqCBfYTh7sfLfQDc4zU+I5Jhm4eJlqBIYs/2m5gZhqa65rJriWbkJuJZoikXQrqJ7NZRxh6JVzLcKobGM3N9d+3Q+NIsy0/4q9yfTrRMbHdDAPe0aQ9E+R1Xy4nr8eW+2GffkNTjuAe/LUPQ/mvQWVeXzK09i/s7TlNzlCx1kBmlSODkYel4uJS7hRa07zTutN6K292MPeCLFhM3+DgZoCWpw8N+Bs+ze+uHjnJuvyUWJZyb1A8etTcWurDQjR6KxQsnciVAnumxAxQ/VfUYp2s9/xD4/H7NO1OJHTU2JvwB1PnqZvqIj6Iu7sOYyt9XzlmjAAQaoayI34jBD19uOpx4xF7sfVb7DQWQAatbbovOa0ZqbnArAfbzAhE+JoQKNWfJhhhjRDB+3XutZGYzc11R2Qm0PO2DFdkLJD9sB0PxnoBuPyxaDfZtM65Tjeo3GHIcyrKrYZdBrU9B+sEEXzB8x8sYfwV3cKhwdsvC+mOvyFPt6Jtoy8T4hDo2cZuHx47nEwlyMWpTVoDwafBb7j+Me8cdvp/VFwQ218G8jBANzUt/wDRxBad0n7sx+TdB82jvUuOY6mttQNzBrqaCim9LqnpYe/Tt8x5pqH2/LyMJ2NTXt4qdF11+BDrrroHInONpl1+HXTfU9Es4xbO07nbTcRysd+UakrH30A3NcI1h2YApho9vACahE1DASsf7owhhhjRRB+25voayK9z+oGiqrz6BjHxCsGxO9Xpc3jL2Uw+8P5K8Wy2U1pgvfc19h6YnUZD1V6XIHaYMdb6CJ7zXnqH56rX7faYrARvc615qQUx15P6laGbkIfx49vbJU9FPEs2/DUMHuPwa6cuMLznO5O5D1HmPCqr7PDHyOJYe/jomCsCV21/Q+lrXjplZBvsmNaAtzcrOqO1Ze7kT17rEqvda5Bj9VyuaWY5SbnOFj5iMNf9DfmrRk15/A34gddn8R8l+0n28EeAsI5exYDN7jfs/Su3iWRLy1LL4e2prYCli6aPQwxugn+01NS35gmpRjhy6KhW01K7s56k7RwQV+6NSqRl0SNeR6ctS127HyIYJi9bP0B0VsR6Tirx7T7giTfnX876alFRsa9tHqTvy1ufalKMK1Jnz4GD8FNoSWaY+H6wtv8AGo3PZB4mcegg/Cs3031X98j/ADeAWbAm9zjqvIyO7NFegbXl6fV3B/xL2TC9Ev3n/wDj/wBLB6YqCy9KYSWPVLWrneRoeJncEZ/t8NTY0DF7ZioHllTJFX3ZNfgHlvxB8B1PgOnx+HXiF5Fxw8NTvfY6gQe84noG1K67L5bj8W4Tj7Dx7jCb31303qFoSfAxoRFn+3QDZvo7Z0Oh95v2qRnN44nqo2bj7pd7aQwtyCuqVsdnw+YwCdP8ZLk02e3QwTE62fpvU2ZsxLWSMm4E9gB+Del60/8Ar459z0Bn9eCxfeXgIojQHXiNTfhqcRxgM+Ifnw14EeQEWrhLrObeJE5e5+eg6jx4lR01B0QM0yKTkUKkOK4lHp3fh9AtEv8ASMis/SXcmw+0+UGrfuanLc9jD7dFaEa6VUNacKsYtZyyof1m1Dh+o/Uj1Kj73BB8q7GqZHx8g3U9o+B8N6gy24V2Vzt0WpbhlSyamtwf9D5XwH/Qr08K8T1xlEce/jvUTjpNOzoGLIVPcM30E34mDqo2SDvpyBB6mGNEn+3TCCLZmWh7CegPTfioLM37LXzHE7popFNnpdxWzCuriY20UV6e+VsrxlrxRy96n7xtBFmwin5h6YnV/wBD0E4+1NbNMheL01myNVwn9rYpH2ReBjV6PaMFQKtjsoipyhJ2KOQZCvmIF+0GWfG5vwEPjv2h6/1BD5gzjyhUjpqdkzigVrTZ5mGL1XwE0ItLGbCzuGBQ8fHepVQsPYdMLP8ApX/5JcjCa6uuL6raob1K5gnqt7U1+o30svr1nZxm/ky7OTufFRMOocclFqsxyWNtQatrGqavIF4ewYTEi5MigiPXr8CtxiY6X1PU1ZX5Pz5YycmsKc2sesrkBoq0sLqO2Pzj2mvDiQvj/W/MnoDqdwWRvab6VY2qbV1NeSNxLDlGIMP597OjqHoR0MaGLN/d04HT/PgeuvaEdpOlQ7llv7VX2VQ+pXbIW1P41guVV+oYFqh6jjT4LqMisw9DBMSa6P8ApOIE5THHNkxy5yezU9ro3lvU7zzc5E9AeJYhlnffR9/Arqa6OUVe7ob2ehEUbhHvPn8XxAJw6HzxQ0K/b2BxON/FWgKW67o4xa1aPWqn7Z7T7Z9sYwkQPAQYK1MNbJ4j3JcgA9cC8AkLqGBdzu8a+vxF/ljjRBIlrcq/GlIu+NgQqg4EV3HIzPT/AKlraDh05FncSyxlanK5pbWy/hH2kZPJkVQrHk3lUdVRF+oDJwMx3OrcMa1w/wCl8TkYrcgwE10+Y3nrXi3uOOji19y6xZasHluH/pb9oephjQxZ/t03N+P+kSuC6sGz7WJ31RuLOu4YZVYabLcdMmvpi5BpbIXn0xXKu/sxhhgmJFXlGGiy7Wz+MwSn2i5C0Lk5BybV8Nfmr9oy6e1QFqXk9p2/h/Q9uiruWFd+H9a9ug6IIU+0jUM34aiIpit9PKnNrclqOexFJckwT/XxaqGliUw7WjYNqRcOyPX9nQCdsz28a/tWfEA5G1e2/TfWizt2W/tNfweNTHlZkilVu2a7PdLtr9XWpb1YccjJS6E7lSGx8mos7Jx6Ee3lqYfujIVPlvSSh+3ZevKdzUFoacUmXWOXgfDcRdwp78J8QCa8NT+oCTOQ3tTUfN/tRtdNdU/lmFYuKv1wl2profDX5NQwfiMMbosHzB7nxE+SG4wsW6NpqvCn74/29cTKOLbfj1ZTHC4tV6RyF/pH04u9GfuZWL9KGUksNQwxV3MZFWe0PpLtVkY11NVv7iUYV10SvtNZtni+Hz1/r8QM5ruyzmVbgD1XUMPQQnrvzBEOoo3PgXPtfERftmPq2ErSLrmuap+LPV9xB2lccifHibmn1DLBk2bbIsZubGI5Xp8QPOW4PceH9Utxe2w2vSwrHnWBcjUss0RV4IhsJP0h3vqGOurVJ2sCn729QxRc2NTebPTXSOmh54tpptvP3fPii8i3z0ruOm+Z3ecL7hH3a8eMCQ1AyrHLqyFZuA8y3TfuSRAQ0caYT+2HBJ//AM/ktDaJh6BSYfYzfSswtGacupggH2/kM14nxMMMMWKRvlKivN14t+GldTJQK3X4maVZtwDc+IZjqhKkUnI9Ta5K82yt/VbU+mHzZ9/RoB74utTZEsybe3vuu9iVzGNuQcbj3kynqZ+zkF6xX5n4/H8ymg22Px5eDDoZuH3g/GJr2b4PiBFYiJYwlrlug+RYSCW2VO9eTQ9BBPhU+TB0HtD7jolfKLVXYvaZH46LfaPN/abMT3xOqJygKYWOfuPTUqTc4HkaCs5LTBayvTmLk4s3Ksu2hmya8mW1GsjyQbaxQ04a66nCKOAb562judFMM5RjvwM3NzcotNUsv7hrrrte3GfHmiYKmJCfd9MYMR+bji0U6ax+TxP18BAdSq9lDgMWXXQHqPc/TDh8Tl4anGBCZaOC/wDYaNGgg+eisLBZjvXPib34gzUYzj3Eto7Sdf3q7Jjb6KqitQUQktMfAsyJb6WtSdnnhVUGyW4rpFxXeNiKBZQvbxOrLyVhwEBInp3tkG3azEoF0yMfseI+T+X6gmk+P9UpzjfI/Ny1Hf25b8g+h3YbCZpWFS7Y1NBjnV9Hbj9dzfQw9RP9QddB0/oSqn6iHHZSfeINS+zlXY4qTzQbY/tMd/4ugHI42MFGY5st61DZxsXuT1Ozs3dce8YgycU1NNdKbiJkY4WvzNzGfY0KFYDNzlD1CTv+wu+76VblOI+9Vorfg30/v6orHydz6qzZyHc9x9/UWR/5D1UbIXVXiIr6j9CIvzP63qYiI1D7V1UPEw2c1+nDi9WPRWclI2VW8OURO53I44Ef9cnYjQQftANwFUldx5ZWO1T+IXc1EqBnc1ESvKqel6zqaEpsPbLtOW5T6ZbdBhe+ZSySsUUy/wBTXs2WNYfS9H0pqStmKzUrkZVmQTEYocDtPHxQWNbBjiDGxLH64rcLrU7N/wDdbFYj95WQ1mATtOBj4KXrkY1mK/5K+HFvlfDW1r+1dbNqis+ImvD56D5ce5E1D+HHbTohVVpZq7KRbRdj8GZeJ8Gh6CKNmzS9NweA9pSPqaXoao3V/T00/cLbDa/nV8H26UDVXTGFWOMnMN0J3047ET2bAI7fqzcs3pSnOy0/yMa7cXJq7b9VsKkWI8I0T1URvnpXfPpqrq3Q1nfVBydtjrXa1TLf31vTsjf4QYPknZ6CHoj8Yumh6VqZexR/ZoV15Kdxpvw1oByJ3Q47wSfWWxrXbyt/kqH/AFjNxo0Wf7LOXTeoLCCRy6HoJyCjugDucoQJ8SsucafbK7u0foxdUDTjGj1C5ci/Nax3bl11DlPMI/Xtn0dum6vjDADMSb1PTzWaPVOVospdOiqTMPHsex1xbB6ljpikNyntKmIJ9MqpJ9TqomRe+TYrESjLW2q/Eej8nxDK24zmsCUugxgxPp9lVd2OVFOKQD8/iQaMqG7MleL/AID19lWr1B60q9QbWWe/U1juHGm1NTU1G6CCV6FXUeCKXavLHphGdT6pPUcBrkOK2Mn4d76IOWGZQnOx35vvqDqJxMTsk36mQ3O7pi/aG+cLLBqyD7+KPqUYVeSbP/HchKdTHo5LcNN1VihN/wBSjLxPShQY59+tVnCG8uWXifwn9J/XiPY2j3rrLyxlxa97M58oV15Op1NQDc/XwP4EfjOAI1/09b6GNDK0Wxu0yk7D+AinTMoacZ2ySP4ZvZ6r7lyPpSpXpTU19mbYqJ8nXAHrrhLLDYxiO2PPT/VO62efT0Nt9KsMyxTTYtsQ0qcjO7q5FpsQWMsoCZLNcKZh5LjIe5iy5DuhXU0ZiAUrZlNexHhiZr4xycWvIp/Coh8N9FusSYXqRFuVTRlJl+nWYx8FrJNuh4AQHjOY1U+rM1OJ6b8tbhGoDrqrkDGuZ1samXKlw7ZnbM7ZnbMLbhggin+IeH9CKORT+Nrfd6azYzZDIlTcXtXhZ+FvnDfUroN9toFUI4r1QQnfTDZuBPvANyx+Kyqzt2ZSgw+IEqdlODnOi3ehvbamG1WPYdv4fBTIn01d4alkZ9CH38P6ikOHq4r4DwcaWDzqTvJS/BmYs3Xft4izdZHErWbIj9gueR6/1+FfdP8AomF9iGGGNK7GWMS79N+Ke8s+ys+IIrBbkcXKFTWnDaYOFQ8s9Lsay4V0xzvpqaVITvpWnNsmjR0lNJh6YfRF+2z9In2hcvnKaGse3Hr2GRYXiXms5GU91PQWERb+M/isjYbgemZX0t2R6fj50NDCynBW9rqXx38NSxWpnLw11rGyCQaPUbKg+KuRDiWA/wDFarZqao1xZmBbqIYT0qOrM7/GfBANno3wi84y8T1WXZeqpvU7hnMzmZzMMaCCIP44B1r94FFc7pAq9x8szdsQfOdXzq/Ao5G9aq5Q4FleMNV4xx3sbm/lj3ml8kffF4JWfnpWfY+3go3FQSu0LFRbalzGxCuSuUlo/l8lYqReXUoYRrqPDZ/BUBLWFj666gIEPEzieiboqtuS1fD/AF8vtIe3cPjr2/CG4kjf/RKhK+phhiiKhJKkdNa8av8AJZU3b+medkiGoianDjNF52261LwWvPP1uXjlGcRKtzmYetFqUpWzXXZL8rDD0xOlH3Sz9DH+2VLyhB4V1cqyuivT/L6fvw3KMhqockWlfn1DIa2zHsNV11lN+Ll4qo8rUs9mM1b7CGmv6w5GOca3wqGyfuZ/4l6VWNSyep1nGys6zKfotpUdNzfVf2yhvG8FG+o1rfGE76a95zOvM9VEJla8idEnfL4lT8bH9nlXtTjjdp9zDMTV/pXlv2Rdwarh3EUs1/Othcwp8xCndqK8TZDB0q/e1SG68tTuTvGY2Wazew4YtqU33oVu1NeW5TlTIX36DwHz8+fsK+p+OqWcZYNM9nJfFOMJ3D4CWDRgOoT4L8/H4lbjEo7krw6t/R1M9mCa42OVJqYTWuhh8qlltncczUMI3CIRBFsZSlgeMnGHwVeUb+ItyVPmLkKqC5JfYFc2kyvIUBculYzKzLw5DT3fLY7Jk4+Vjimy2zl4mY7cIehmpidAeJtO07YWM3N8Uco+imOy4+NcvtQvKP7Ni39p8nGNLdD4J9tbHZ9OrSx/p8f6Gi403dmnMiWUY5uRp8kWcU415lVtTUv11wVa+Kn38CCYfxD5yP8A4fAfr+E+bQwdFTakwQHoI/7zeqah2/DFP/8ArvELudrQC6na5hqyJg1f+1mLu22rtpBXuNVx6n9oDo126jjumzwr/e3W3q2OHXUCwJO9xxR7NXhNmY1icCYfHXRXKzXOFddCNeLeRO+nx5oQ1f4t9EWM25vyHsX9z478APfLq7NcUbmLRVdL6EUn2g6YvasGX6ZZjDwQbaywN4bUxxqGGIOUI09VHKM8IDHrXwrx192dARANl27fnhsPoasZrGNWo1C5StsN4V0Pe1+Ia6mw7lUqYemL1f8AQ/dCNTH2ZYmkzU7fp9+kwcS8VTI/k6UMcnFI0emur7+kmDPVLfp8Kv8AfL/9ddxLSs481+VRtG5BmYnx09lSMT2/C5hw/HZkNZgHw3NQ/PRJqIpdm/iJ+fNgOi/NOO1jW2QdB1YaIG5RT3bbHLnr6LcqWZNfYvHUDcVPtKamjNHafyKu6rbKlLPWNmpSyVc4mN7W4KgNVo8Zqag9gjcWuGj1pOrss/y02FYChnYVp9KYU1OEGxKkS1bccpPSchqj6lV2ryIR+AEgm/c1uctwj8OoF3PiHzq/yWDi/h8DxE7mz+A/jtQmv4nOVWFC1ws6HpvUw/U7cRsjCT1BHVkM+ZZxC+Jg+ey1huTsulnEvaXEEVVefTcQDXyyquJrPGNlfxheR9qpowCFdQ9dSi4pW13Oczuu9lLonqIdDW3RUNjZFv0sLmV5VlM+tIhzKGAuTePUGGpqPjsuPx1CNnAx9m+g79TBL5D/AMazEPJmHE4F/YyctCtvi5/9Kf8Ajo3l+s3d3JwK+eR6rb38jomxNcnfHaqYVnF8vADqo96sZrWdDW3+vVF5NkN9w/HVRyxLajWvXfTXt0HtLfeYxCQ+5649HeP0qz6VZ9Ks+lWbhU7EosBqZSh6DoPl/wBqx7/VN2GPt1qPGP6LkeoI/oOZWtlFlbcGBpoLEYhEaiHDIDUFAQVlP3S6w7clox9w5EOTZruMZub1BbFKkt8xnBBHVDxe+ytpVZVxttTubWC3tzVdhGFyDVFTrRoPeSlRVbn49dlbpolYR+FW9puH8A+Gb7fwL7Nk6Z+oGzbW1Z8P6/1HiYOm5rY/Cn7Ztlak+81GHHpvUJ34U5FmM92Y2SKKRc9tKVx0ZD5VpzcOMG3lyb/bxDSmxTh1qjNZSqM7iCBiITuB5aomtdE4vUONb2LxPKcphuRf6t6Z9RVdhXUxayxqQYUd+4/QwwTCcofqHM7rRHOTiXj3pp7llDV4sv5WXpeMq/JX2SICWyk3BCe9g/HWnGNkeymuUYpfAPpbiYmM3puD9PfkucJfTa6sRcpLcezGbkRAZXYFP1CWwtpsa3i2dipi3d88zbXkhtcuuOdW2Hk34kXk31nBi4zJbiMgAmpwgQmJUYVi6m6wDkVvWnatFmO9bfHRF5sVGLX3J3J3J3I0VvuYfYIrT48Ut5I7c3c+x8MSrv2+l5/ZP/LjufUUWS36W81YmLBjosyKk2FBTJWcObtXtbAJbZ4Hx+fO5O24PtOWp3IriYuY1RWqvIX/AIwNKcB6S6Lt+LJcObMmofxcTqGHz1GPI/hJ311K2ImQusfwEP4RKG4gjR/BiV9y/IO7Zj183tbk/mB1OQzk9toRqBCYRD0G6Zltzn97+7fkh2EG7GnCIPdhpoPYb8OUW7c+nDEUBYE1Xbmt9NZkWEp6hYBeNWQqehhgmJ19L02NZinlThfSI/3sc1fpcbINNlmS1y1FRBk9tRkNsvjVpj5Q3kYxpaYmEbWX0S7JCYeH6VMnJyPU7MC1PTbPVPXO3LFU133G50c1MuQM6lgRNRa2Mt5IeHbVMjgUf/ksZ0NbD5atbPBfb8dRQQ5HGb3F9olhUtYQ1Zrec0qexteKe8B1MFHyMY4GIWuwfT2GP6W1LWY117/8ZfP+Mvn/ABl8/wCMvhinTb+0QSv3OuupWwrqHlj2fS49TmNcQVueckda7USuv1JtWeo33SnK0v1HdHEbduIusjH8h+4GCINtc3KzrroG1KM81HE9SHJ89DLsylo9i2NahY2DcdI34Q3GaDr8jwB0TAu/MeFdWxi1JkFh91ND3t/Hin6lVr5l5vpqewitqN8zjtSPIRDxlg++HwMHT02lrbLMK7nR6Zbaz+itj0WVMjEear/H4b1EyLK42W8+p3GvMa7uq59l+T+/kG1N+C7eaKwlWBGup8Mapcaiy1nape4DBGxO9jmctT2eMhWMvTD64GS2OyVe3qHetIOq7hww+idbvfpj5TUSv0IFarhgjM9VZ0GZUofKdq9xdWrmZzfRz9hW5rL7d1QGNyqLE8d8hKrO29Jr9TpdSrD2P+UQe5fQ/HYgVePWscjcNMpnHlD7nruJ7tPTwXxL80q2JhY+Jh+pep98i0770707070M9hNz56CezDUrVaxZxM3uf0BuETjOM9Lw/qbezuVVdtm9KsePjvUaaA0Vq6cd/ZoDK7Zj+4yLPextnxEI14HoDqN79KAedy6by+YCRKPUSssIsGOTC7AdxLBfXqPNfhrbTMuifjXgPhAql0KeZ639pfTaLDTa3uzs2Fj1rygetZRWbo2KyMClHT+o3uYDCNeSLucdTsGxOxuPjkRkKw9NQVtBSZ6RaMW1Ti5bX+kLUb8/ti/+QN5g8KfIjoYDot8rP9vL/Wa6q3tXbwlSVXPkIVJ8aqRVLs1L7cXE+qex+E3vpTktQ2Q3NpsCLcBLaVsUiYnXERa6cX1xq7NV51WZgmoZlXZXonQTXPEo9PuyFow1FluWmPhZWS2Vd4hRYp6bldihrUNVhPcqQcsf+ulN7UnK1kVxTxNo0alLORo9N+J6VUfZY3uTubginUOnQRG9iNHoelf7Ee/puM30lr4VT5WXdm28JpZ9k+yfZPsjNNwEeAlQ2nOINp0UTUUTjMXMOAtnq22syrLImVZWf+VtYNkNccpmSgHksBgMxn1jZFm4T5rD5f1KDxN7b/Av3RvY12ms90AV5H2O0rsJa8e/jrxqfkbawtfVBuMddB+ngPDHB5ZG1auprLLrhXbaWc/M7Xs1phY2J0VfZ9eF3ungIn2wNzZrE0yadbuMssRlsp4xaxFdFNmobDK7fusLUsvq2Uk/5CjPWnGwKhneknQxLTGrKnoYD75B0J8ztlhrp8gjXRh0b5Wf7eA6E7809o9vcVtGFetbrjjl3zbd3DvU34H9IYYthQ81tmPWU6InOZV38RM9IyijX5I7WQvKvWuiKTO2wEps7FV/qF2QB8lyfMHRdg462tyFX7Uvxh9umumHdwe/EaqzscZ3akXuAxd2S/Gaj8GOgL22bPz01B0RtF10Vlyfb4A6la9y8evLUL7O9fN+R6CCDoJUfYjU/WsTWoJqKPYL7N7k9DAJR7R172IDqMNiblJ44Vjb/APnhymteKtx6V/tafvYe/kG0Wp7qwGLuNtIGlh2vmOtfzZ+nTW4fbqx6a3CuoAJxn9fC4FYsyfqAbXsLWek1d++5RTY33RE5q5J6V9VO6a/uja4zjOBama+2V19wvWaZo67hgvYSy1iO5NmcoenMwt0J5L1Wxqz/wAlkyv1EPDRXfY+JajPURCujmjbQTHQWSzC4R8RjNFGsvLTutDcdO3OEEif7dT+FSJ7GaKxLwZZjqYykREKL7u1rAVeOjEPahqqtFtD1Q9BMK37X+2b7OLZ+hmAdWZV+0W8KLU4wTGt7c+qBG8djltVyLLAfeDzA8GO0qH8lmlvf3bwtssFUP6wHUwM9QmZjrjsAjRl111K6jY1ti1LvyBie47WpdX/AAsvE9VWY/6/xpH/AG15noOg6j2gIeHdjcfcj7lHRfeWL26DNQia6KO3VVea46ghW9iNdHcrifP4VbUf7x463KEDWZQ1P2/BVZwmQnvEXVGTULMKb/Ggm44DCfHX++ikCIysbMdeJXUPsH+BZwCe7T00FMOw7I95y6ceUC6ToBxpgleOZaOyASDjXVXi3C+08BMUhTbm2WNyJ6IPusVWo6qOYI14A6jJoeSZlyD6pjErxr6s4cbNTEr3ZlX96zHz7MeLmII16E9pb3OMFY46NC60Ri5GtzX3fk30B6Y1nac5jCHIcz2qhJY+C17nf7Ydi53KssgX1AEwTFiYrXDJZSln6GYn7X2TezRZxazE5DttX1vH8mp/X4EGx1Qjlf265W3K+9ffifC8aeH56D2nc5LEOoSdLZxK3vtGF1DjTeatKfdqONqZ2KaLCuugj+7a7OFFp2O1WsLIGJSclnJZyWclh6ARl10EHRfgv7el4rZGRmenvj2cSIte4ifyZdmzNQiGen4X1JuJ5xT7yszXuzc8f8StCvKFdeG5+rZNvdafPnuIQ9RGjiseOBkJxyKwrfhC7gqMCRk9gvGMgVetGKzSxODT4i+07gFWSU7dkv8A2iQDZNZDN8gkRulJ0zJpWHFpYf4tbNWP2l+rcqzF2TgzXU/TrVc9LcF9QGTZ7+FLch/fQGMOY8E+fwAR9OOM5/ZNzQM7LrGPF2ua0mPxWM3sre+9t4nwJ88Kmt3yalqsSs2NYVU/x2RqGCzW57KWO/FLWqiWVMcn081T/wAf9O79lllV65tQqez9DMc6DPyaCU5Bqg55ksparpkDYh+OupxmumpT+7rxbrle8wP/AKL3It8HPKjzVO5FPKdvlGYImLdp8n3b8FVnFjaUZ8qvN9NsKbaL7s/8ce0vN9P68m6CDqJuVERGTWN6icKW+uWu5y+couAcKvBvnfQiCovFykxcK8hn6P7xflz7aH0n4wdQtyHhv2/r8KNxNq7mNOPCzMH3fhrbRNTGBmEZiQq7NybHBhFrLFXqx0a48t/VV/HTcdvtdvZRylp5WRf8NaNY/qDGvCg+XHvFOpivMzF42H5rqNq1110i+7mam0/RjuKpc4OKyNd/l8K20141b4czOXImvc+Ip0xEYa8tKoMwhUxyUShwZ2dxquMPylp03ufickpjmExfkfMPt11B7p8Ejc+IYPGvG/iJLFcZwtmUAvSm9qWseq2E+J6GEz07LbFpxfVC+P3ZYfq8az9DN6EEHSskTGyBLaNTI0Ktz56qNwLOMImpxgX7r/361kXU+n1cDkaN3hv+PzU8ZUlbCxu0CYjcG5ch2dwoR+BTo4ZqQ5FAEsGpV+1jcm8N+Rhggg666J7RWjzcV53Ya918jtD7VVc5c0Vjtx79FHKEaKmV+48d+Ymv+hVbpal/kcxq/qcF/n8Gpi5Va191CrNsWOqIWneMe4sN9EbUYb6Ga9iIG0NwDkbF+z0x6cM52eucpGoPlvnpXsN6gzJUvuXftps9XXi0wscXR8hKpjWjVv8Al8EH3Za6s8tzmxm5VkmsXDb8DCNRVJnFQBrbETc3O5uvnBYQbX59Km4nnCYTyjRoIPn214I3BnCtH+fLFp71lyU2lbMPFGVnWZRdSs31X9j8+RmPj/UX5ty9z01v5ccfzK6UvkL9RWeg6DovRLWSWB8qgYBVWqpSWUFW1EWBZxjpOMCwL72JChHSuoue2lLnLoNb+zdTK15/hTZmYNW9K24lrCIX3+JLGj/fPjw4npoeRhggg6DzEM5HpVSWhZgHMpHK1/jq3v0R9R/n/ogdD5Ov29azDXEstFH4f1SV2wWmKTabPYwnwR9T5PVk1XTQ+Q4wsb07Gy83upy9qzxsyq+NhXgT89KqGYX1NrtGpfA+6zE7zFqUUWuFS0afwX2a/wDlr/FyI6czN9P631R9RhxPgYYYYYs/28iwIas9R1pp7zW211J8k/bB9oazuVa6gcR7PGXiepPT+qOWNT9mYaqTRa+FZs+z4wVa7Rxb+x4L1wLDj4VrmxjKb2qn1SNFfHMStGnZRY+Orp9KQDXqAalzACy1pzM2Z/Yf+XKThb4AcUPz51/YpYsem5v8OpsCLZXFsoaWVKwPXZg82h6CDwHUTgphTh4KeK/UmNdylAJP99R79W9x+fXQTjNTXgBK6mIdDW0ErqJZdcuIrVhxbz+B/wDn0p/yVOqNcfvPiIRrpoyqsR7F5D1B1Zsw3Sx1K8hCRKMT67E+bH+YPlz2FLkktyHgn3RELmqxFjW+/cGi3NPHHtAJ+eh/If18COVR8NwwxofeCD58QdTcSwqz18l8NkdOWoPtla92x1VF6uPaIDZGGj0M175K6q9UBqGM4D4/p6Z8bAvqoqQ3tll1UAXhlKMPBep7dWDeAYZrruBzEyXSYnqSlGeu2WAoLPcOPE29ynoBuChFDk7/AAWfr11+A+FettppW5payrkJy6Ew+Rnz0EHUda03AFnH7WOx1Y+G+QPhvflv8Yg+YFPAHyVec7v06JlKxuxuQX7SrtLFMJKrd9/4HGj/AKTW4FIKsoNp5eSzn0rTcuPFen61b6+l530K3+o13i3HotRsO1BTjsS7F2g8Vp7Qe4kbm5uVvxmTRVbR4V0lo6qUVC07UYaM9vzqfbwJ6GNDBB+x6gcifBHKM6deGlnzP16Uv23Ll/BiDXxJg/jay4Wxh1xPTbcoHEWtM/IOTeJ6ZmNSbvVzdjYZoonrQFlcyR9w8F6YlfO3Lvax1aH2678dyty87DJG+fEKLIyFTWBTO772aJ6Bftmuo+bXDHz1Pmam/H/Wq7tR7FsldnE2rxOvwsJ8dR5IZ8Tc5DZGug+SdnrX7tr3I1/1PiAhoaQUH+MpB7xk1OM10qbi2YikTHyOBegWTsMsrAtl6lbKfvDKUbxpTk9x+7f2om4LF7ZfYgOvIQdBZxDuW6uevZ7CltmVW8InqdgmTktcYojHfUYRIZUxC7mxtxVLTt6g1stXMV0VCqT7RDqYaJZbmWDuIRvkVJ95y/6A6EeBE1qGGNFn+3QT48FGy3yLTAosFfu/qOkmuoGy68YPaHrfre+u4R0WgY+F6k/0uMemJKiEZjyPcK0c1Jtr7tUHQRemM/0+M78z8T2dfwY9LCr6k2I3z5Y+QurvTG7cUbjqvT/8PAQeajkW/Ale62r1OPSkdyCoQjRPQLududududuGGA9B0HURUE9jCnEQbHQCamtdQdGz55c4emvynqPhpuC0yo90/wBai2aBT21CIPlF5VMBsiWWtwr9QGjYm7uFw+jauWf5PEHsVb5EcVLWb6Hr7a1NTgZx9+HslMyU4RunsJvrjrtncseie8Ua6KORuX2nZfiDxndOugXlPt49aRtOuAu7LjysVeRsxPt4MsYa6H2/GPFfeGHqTuGGNFn+3QeK9aX7di0otuRaLrXtBHtPabnaDKRx6KdHVbn/AI9wcnHND9d6npGC2Zk+oZnBcvJORYemEITvo50hlbFTdu9tERRuaMWY9Ytsy/Y9E/Zl4t130M/sXFEV+DLhLlJbX228dfbjZdmOcs1XWdiyFSOlXvGHFpvozfx9P3h9unbJWVPwfLA5edGxXkcmioYa5Sa617XKEaM3N+JhHReg8BBFnLwE7h0WJ8F+9R7E/jHkJvoZqVtxd/24zjFJSGsPOMVfcnhSQIYi80K6Is4KT3KKc3SZGu74V1bDo5Ogk+ZrrqAah9/Gn97P3B5qfH5nLgvgn31GllQHjKrijU4ldtnqOSG6Dotf2Ed0LjmoWDTQVMRUeFPX09kQ5NXBweMS7U+sJlpW+GsiCEa8teHHqBNjprYKmdswiGGGNBB8+f8AXVvnpvrvUJ31o13bqLvT3NtGdi3+gnsn022uV4WFKPRMMRFapMh/qjD0xfbrZ/j3qY6qwVtxDFrVpuumMK8uUVpTbe/3Hqyd5SCp6Camoy9vooCzvMHyF3j+WoBuJY1ZOSuSpr0QShs9zNTgyi1uT9VrGTVXVzN9mzBCdjU146guYBrC03N9NzuCcQ0Pt5NDB0Hh89d6m/D/AF8nPL8WvwDpvpvXSlDbj8SpqsCN2S42ao/Flx15WXrs9vbcZ7oz2Lu49yrGdla1TXbavOvrTV3C1gSPZy6LS7T6azXxNzkfOj2a73dN8pvw+PLGbipvLDtQEVym4pblU1tWev8Ax/8A6IoNcN9uhysi4NrR0uxDeVfE119PQGW2kuYujNQdRpvL+ugnuJxLT4iPxh4xLVEbIEa5jC5PQj2MMMWD9vwEzcrHJumvwV0vaaHysUem8L1SmtGOFVkBcWmiHjVMz/yAc6cjsEwxBs4vuelv+Myt+2givqVZRSWXd8r7T02xbKH2D13qdzmWqKzXUS07KxjuVqJV6gXORT2bfDepvl03NwGdyC3nPpKSlFdeK6ihqEfEWW+mVMzYtaTt6HpeLRecn0/Horub0yqf+pkNfhhWNTLNHx+Pwg6guFqF5znOc5zhEPQQdB+ERvb8DDj+cDc15CYWV2JdTzD0Nsco6coNpMQo5uTtq0SsmX2Isxk+olGF3JTgMl2epqysZxytpKXHHcQURmFUJLEUmB0rjXM34q13DWYBsjVcs+enzCOPlqA8FVS7EFT0wNPdfh3C36a0nH9Ocm/MHIercYc2DLfb3dyJkvUq5J32qsmPjWIaq9tlgYWN5qeLce4vgo3OM1Pib6b/AAGGNDFn+3mIeiWdtG+fw+nMiYBynGJi5uMRZTRfWtOXgvXcbh61deLExnMzqhXUYq8o7ATE62f4wNk+7INzsPGXh0QmKxAK95SNHwrY8slCjzUPEA+5/qte499vLozG2ny31A9pWdTepTnW0TJ9TbMqAZpXXyjlhKw7vfUcc21kt2EB/wCRTGotsa1qleW74grvXvw6ny31B0e13R9O0+nafTtPp2hhgg8h4qNynG7lmV6a+Onx5CXuLX/6+LlmuXspsWr37Y4dk8mrNUy8lri7dyEnXDiBc4OJlduynL5tnYIywmJZU2Pjqbb0pMuxeEVVUfUcJZYbPxqheCs1K1rMQhaVpMnXDop1D7+IhQV1zD+6epoBf09ORKJdlPn4b52Q5LFuuvBaQAb60n/IXGJmGZJTJjKV89bijjUB3Itdax+1OBacO3O+RDYTD4N8+B6GGNDEn+3lqfEPvGTgYfuTx34em2q2C12vTnLcznfY2RzXAufT5iwZKZD5Xp9d1V+BVu7VRmH1f9B7LAZ3n1vcUbmO5oltnM6YNbXzTwT2OQe4u9Q+/X+l/jT56VP2zYQ5FmhquwOhRvH/AFmuKzcpAbAewwMdml7GxO3WGbbJiXstmItI+wnipn2Y2LmZlORWeqgE2V8PI+KMVneed553nneeGGDoPDcHivuzMVsxPV7Kpn5aZVra/Fv/AKinRu/am81MvqCEce+t1TVn+qF5W5V67stLHp6ae6l2WKpbZbYRaVG2aWP9qDYOHY8ZSv4NdcfbMU299IxK3uLFLtK9+4x30HilZeINRwNxHNbWObGmNSLrsgm+z0Z+1d6zh/SZs311rrW3JXTgyaUM7GAxXDqy6OoYJXU1sOKVipO8UHehYvKsQ2QsuOGYt034ASyv28jDGEIiQ/t56M9l6r7FwAfwejr9RVntxrTFONUV5mjH2MrP4O3qDWp6ZZ2BjeuWVtZfX6kuX6e6k1ETF9utn+PX8UUe/wAmYtSVYl388tp4JziN72DT9a13H4MnUQJ9rHkeqNxa0guDxLuLUPj/AEg3Cd9K1DPjZnZOd6ZwlHo2QZXirTXdZVTgfVNp7meEvcasXm1P0eEmflnNu8cYiw5+G2Hb+GobPCcJwnCGGCDx15L8v+0HQUM8ZCh8P26Ga6e2txWADLrz34767jPz603NSyZ1WVLsQqdNSjOW6qpeYuR9NSlndPJasN3G2ecdqW9lcqTkO5q7d8yMY0RULdEQ2Mnp9rSzH7E/Yka6Y67srr71+aum6Kux1PxAjNP1nNpswDZK6MHvD7Sq3tVVW9o1XhqvUH+p9P6CceCnrX++UwawnwRVsqI0Yutv/GXt5RbNVgFjVikwY9dMvyAVPsdzXhrorHhNwfBh6GahjQfP+3meo6f1+DHtam7HXuHLy++2OqsvqFnbRjylf7ZV3b9OExbjXbk5dyOuc89MOLcqenK5txHqlq/YQeyIOiLyY3ETuFoHhX7d6lo+7oteo9nKbh/k6D5JlXC2nwHvCffoGm1acddOPspWFe2vTFxjaWwrlFF3bl3q+TYafVcgH1N3ttb3KoTOKIP+Q7S2+4g8jktdV563DWRC2vEwwfkEu/fohlduo7q8euox6ynhYPaBdziAf7CgxWAn2drXcPxNfgPlrwwc/sXeoY6eoU34F+OdRE5tVquWWe2DUbn9TfTuOVQjPyg4iMy6TGayGqylrM0246ZL1Q5TNGu2Krmre5+bcunzFYVivKl7pbLaSkUe6t9x+Yem9TfjTxIZawNSuhVTmgcvWxDalJF9dlRqaU1bNrosLcj03rxC7la1UR8aq2s41kOE6w1rOysqxKdJRSJwG8i1rLVfUtr5JAZx2OinUYaKD2I1ApMGNaA1TCdsmGsgGEzeoYIP28z1X5Y7Msr0vkvu9DE3WZR+n5mU2cEzbObTCxTk259/etB1F++Zi8WmHNxPUrBS3B6m3Ne8E3xEXoDqKqmX2Lw51mK1MsJLdN6nJbIy8eitxn99T7eVdnbN+QLIfeCMegYg4rWuEytN9UK2u+ntlNdPMjHGNc9RL76JKl5owg6r1CkzjuOuuupqCsa56hbl5N+QQDc7RCuQy9Q87kMaza9d7GvdalprKtO3Nah6A9NbmtflQBwylT0yR28hsjddXqFlNvDGzZfjDDU2dMR/pqMnb2DZDGVUNZPpajFrxKIfUcZJd6pban4Pib1D7mbi/dOBQjQm9knl01roeo6GV/bHg6JYUleUI1KZ9fa7bO3I8tQDnPpiEYAeC1l52dTmwCYvKfXpRW2daYzs3XuHi1pM5mU4bZAtw2qi2aFie0B1Cd9U1u3eoUamjlCenIwww9Fh/f8AKlpWOoB8fgVvwdz3wuPaJfb20duR/vI5YmKegYqbuWQn94fV/wBEPI2VlCvvDT9MnROoH2v8zc5ch4K2o6cYf1EZOI8j5CGCJe4Si4JY1u27zGY5r+iybTYZ+yRfmvaWWoVc+I9hy30+Z8Ra9whK53Yfc+bdPaa6joPHH9nzMjvMPjxHVHGzSLBrUq0sN7Oe5LTyJ+Z8GCKwrJ92PlqHyDQdtoKMeuZK15VC2fwH5qMycjcV1aV0Ioa42Pa/2dxe3XeFltzW/kE+fEPogch+I9DCdnwwLdHLxC112MyRMR3i4leOt+Q9x6VpuFAJ3dAfOJULEvvNp8S3tE1PqCq02ktdR7oeEIV16fE0ANhggaGtTD/87U6naYwqVhn9ajQxDP8AbyHz51AGMuvDjOAZKcK2wj7BzIF776YVHfvzb+/dD0JIXiLDi9bP0H7d4KmOajMlyzjoghHRfhzybq3jSV5Wr7jHYxcOxk/4w6YaP47l49KaGtqxVrW9cR+42O2K2TktfFbU0Io9+1ynZIn9HVgtGl6Abn6wnfXUrWMd/jZZw+37YH9iPL+ugJEDe5g9/Pc1uIzVw5DPHH297UNhbyWstKwN61LF4/lUbLfO5XZwrFvtW47hy17R+naFKoR9n+OMd/nsTt+aEqf7/Ag+5KmsAo0li+3jSe2X9X7Ut9ZawW51toVyptPM610rVexYSxT9qaC5PGqszUCEzQE2sJ31HQNqYrcnsP3o3GfJi/az2o8qprtjsEnKLc1cGWsuw0trawgEKY66BjQxfkftub3PaEiKAevtojj5FtBLTXCwILEwGE9Me5sehMjHzwfQSZnYb4rNjntNV9P6f4IeQUabG/YwSz/Hr2Dfx1Pwa0LkTiVIiTfRjwHgD1HSqvm+Sw5KOU5FYlrVtbwtT8fbOiEAw3ZTyY2ZHqaLTdc97eFb8Cfh14FB9+VQa69RaxosAPBIpln79d+Zgbgftef2SHHQeG/yrF4CNWrSxmaCsmLjGdmGucJUgYvVxgY1EXJZDUDXyI/DuAKw4HpvU3s79yd9AZ3DNwDZLSxuX5dz56WHbRW1P4yG+dxYfxYtRta60JX9SSK7OUdSh8AdR25+FVRMt9jUoMLM7dt0ajE5vYoxXdyYWnMwn8G1lOud+P414f2W2am/BbCkGXyj9uyOuo0aGcvbHuVJc4sbo6cTP66Kdw19D035j59SPGb1MbMtqtyfVGtpwzhqP/IajRd0PSlNs+uWONjo362sDB0Vvbf1C/ETog5Nkjjd111/aampy7SNNdNRDozaTsowqoUtkYFdUZSpgG41ZUROKkZ3E1/TZNmD6Qob1awUuPtJXY8aGDIfaKp4vycHVcJ35D2ijmbEXk1ZX8RhinjOOwIumXx15D8AeLcNDIUBcmuUujC7Ub3jCaiVd+m2vXQHUarmPwhZyM7jTnsfPkIp4we5J2fya63HfUH3f5m9KD1EPkN0K7b6i0xl9oetP7cJ21lK06ObRjobVY/UERcx0g9Qs7eHabcj1LX1CuVPOKtRn0qNGxXUmthNeS+xow24l6OVS1XG/Cprn0deEmVlte3l2zpdCWMtosqZIY0WD9uqMCIvuevKD3nbMGgNfgzm5vK/2ZeWOVpw5mUr6vh20GsuNRQWZmAiX8Gtp7g9Pr7mNrXRh/CeqwHUDpaHVB09Mq5XWtzs8hFAKF/Lft13xnIzu9xmRN+k9kZPqHqlSsLjzZi5M3MLNfGu9Rwhm49lRWJ8svE+KWcxTyVrXbiSWgEKHxReULdsblVnFmoptL/a/mZx4wRTrop9/wBh0HRE5J8QH8y2jQccsXI93PIWTW5xmCdHJQRvZopKkp3K+h8t+34ANnikvAWv8G5vqRwHgfD9hN7AMPmBudl5ceC+De1XQQzWvwl1UZTi1fBbnWLmERrJ9QTCisO17CtmiYOgDXS12S/bBLGr/wBSqy82205WpbXuwrrxPXc7p0/vGGysH7da1LM9TIQDuw+IOvwgbOWOLxf2w6u9j5ncar0B+WPn+7K3KWWCsQyu1qj6WGsbIQB4w448HQQQSleUZSsos+mxvEQ+0X3Lnj5fM19vlqJ9sPiBPQs5Vq9T9Kp4ZFaqwXmGQjxU8WsdAtZ2eCmdlZqsTtho68TExPturWvwFpE41sDjbhrZYFnGcZxnGFozbgm4OiH3I6CfM3oFyw147nz+DcDmDIcQZLGC5bDXV7vWQcduFpL3Cyhl6AxLdFqdr5E+3lXQ1iipIRSs5e/yeHNNaP42csPwL8hBPtEDJOVcOopGzSY6duB9QuhncndDCz3PUfLHfWs8XPz+Jdsvhvpua6V1mw64AGGyutbGa0Yy9tcmwsYsdHcct9dQjXgYJZ7lzF+f9oIBs8u0O+VHPlDB4gfgoIW71xEry4vz6M3324/dzfRw2JkX47pmZOEa7rsVO03GHp6Huo5a47M/ES/9YOg6CJEs4zJ09pA8m+4D289Tf8fTXX+1CrWTvoPDGqFhRjz9Lzhm4+Z6OeV1ViNzZYLlM+nqsj4diRKGaFOHTFH8hEZNwpqNORlSKiWWd1m9vDkIpTRb35mwX0cF1OM4zjClcZNTUEHRYP1Ya6foPDW58dT8icfYr4D28A858zSL0XvTYEsuQrRkDVi4zu9KpCwiWlJYB4r46JnAjoWJHhiOrS5eF2/ITksHE/l1DB4IgCP8+H9ddTX2/m9P/f48NdT7Ko2UPtyCR7ST3TGI1T9osYNNiVsjMv8AC2aiHppYliLLNMT0PVU5wqlk4lT/ALdB7LV7s3z8AweJP4B8+ovyum56Vdq1sZbX9X9apUYn/kBAzMRM7HWsq+RV2rFpeyJjLTKckv1f3qYag6jovS2vaHp7TU1DMY8VY8j4DwPjWmzYwPn/AKLxpPp+cFa3JNdFF635OX6Jecj/AI542JcsYFZRk2UT6um6HE24x2pnc4x7jGYxVNhDJTCxPnuBzEyNSore30ST6JJ9Ek+iSMsK7gHQTUWFdBfugWb2fEmCa3OMAE3qE9AZpWLji3hyImJnN2LXNkP8cc76biWCdjdepSvKPVw6pTsFwkLkzf4wdQUW5q/8RkcT6bdo0uk1FG+uoPj8Gpx1+BBti/GM3ltdFfYTl/0KX4WZVQrfy/YhdA2bllk3NzluBzGsJmPdxNtCGJdZTZk5ncQ9NRa+UYa8DKW4B8Tc4CuEbdaiZ9NZqyIvbrSs2Mx94PEjy10xKTbde5e4e84+/peMz3esepcUZen/AI9n9uzIx8c25fpDO2XlhCfeYfV/8ZPsRojoOiwe8YHtnfTU4TQ1FfUY18RZqcqyrGmdusqwAQdHGvJn0PLCwbc63LpTFM9GXu5XqN5crT3KE9QdWexLoy9t7VPZvo5JMEfyWgWK9Go6anaJi1dqp01+MHU7hncM7hncMLCfrN+/DmoggE93muMY7TzAmugA2QOJ/EjtWxJMLEzc11S1khdXPb1Ff2Neo0J0v4z0rqa05FjVsLrFlfqN9cs9QusP1D7W2rKFtbI3Q+Q8Nze/Ov2Lfhe/7MahMm2+js2Q/iEdePVVNo8fmcSsazf4Nyu0ocoh6PHe5pZob47h/Z291sKQtzn+yPxNWTwlrbatKCOPAefyNbgobXbImorBSLKGn0QtHo9S2X+oY7Y2Uvzh4PdXO9RWtN+DEscO5srCccTMPq/+Mwe8+IIOlOofae+0Yk2UcByLEe5Pz15fb1qI5PVwIpYixPt6ib6jwxPT3yp6bdTjjMXna9Jnp+8PHbdsa/aMw58tTEeuxj6f214iojAwLZSorfMCLVYdg1bXdYW6zUd+R/OZXaUP7HttWxGoIF5RfsPcJntAqmPSVHhrqJqBiIRCPLc3Nwe5tTg24eitK6lsn0Latx+3KyUZsivdeYWlpHI/k1uV4F1kW5MOjfkuW4Vqhcqp5a8wOu4PecOA9oHGte/kD7uQU9M4pdlvu7f2n8a2boKkdEbjGO/DXQ/H4VHuX3+HcEKxhEOjvbdN7UNqVPpjNdNeCLuF4iDj3eJo9VapX9SVicnFsn/qrK82pWAx/XaL/Sv+NtzMxsqzwJ6YmSca71gKcqYfVz/HuCK3sKzADKcYsFxTL1NUDpDYiy3ZnxC3mFJldXOEIs5wWsIpjILh0OO61eQGy1pqHoJL52TgKJi4+Kz+rGpDbk7rL6gbZ4/bRxWZl7NXjZP35CAPTe6sH70uxEsCDnMjHKTI9oPFRDUR+JpuK+4ruDbyMEVtT+kGy3yDKb+MNAePWU6Dp7QQj2VCQVgh6mCHrqVj7z8z5UDcrx07egCb2QdV/Z/vb4Nai0vWJqEeI6CVseWWx5EaXzoco13avS3GAnab8fxX01KKtix+bdAdHyVdy3jovpYfAwfgruXiw8ANzepv8aruPpRCd/hT3su+X+F+R+2+nxD7maLkqUMDamx0HxYOMrwxpu0YK6Ye0sW2oHljmcsaFsZlXKrxGyXfNxmQN4GEdKajY2Tb3WmJ1sH2HoPed9lFeSysch75iVWNMpGVui2/YQTD5ljrxU+7J35VQEKN3FyvTrEjVukEXDtYL6beS3pl4hrOH09Iu7PqGXk904TcZncOJcSyz2D6i2bIX2rfQTFeqzIJ7mMecpsXl3PudRu5W4Z3Hda/dfQa+qoXOPgOUeinFH/qtPoamn0mPVHtxVHPFZO5jzuY87mPO5jwqYRBK3KmvGsdTTxPEa46nwOu9TuGD36bm4JyhY+REHTXXGr7ttlYVtATfQncprLCz9utI+4n7u8rjQ2xDyy0cfFV5nYgHIhyst28b3bz5e257xbWhrIhXj1+fJj9o6KOTZLdqjqDD4/61LyN+uYhm/bwHtN9dTUYAQwe8+PLXUfOvKpdnX04ZuR/AZxMUBGyakRnUKFg/bwJ3N6nd3GX2gG+gbRtb7rbDYfHUTHZ5quuY+cKRl1rNzYMVOTN89OfGk9MPrZ/j6J8iuog8RNyi+ymfW2FXsxnCYyWFacUTLqFbeRm/ETcx1NrU4/Zu0FLX86lFnL1PEGGnP3NpncbeSjZWJEJD5eFarB+3RkW8pvpqD2Pfi5Mw88oL8g5WVeByxV/kfYnd4tdYao2YlzKmNjlTj2nOw3xY9tqz6h5yPQNqDJ0j2Fz5MYvHXa3BtTzJm+gnz5DqomugOoxB/HgvXQtrfd0B6b8UHQ1fatZY/T47C30nIWWYltUfHFabqrjXkypRkC5q6wtnEr/ADIo21jee/HjqU1GOPvCe7BBASp7iMv2QKjDtztGdkNHqNc9px9h7k450VI8/mMuohO31z5T56a6DoPDfgI3QTXnUO4xpIJGugQkpjF4w7Ksxc+G+nxNzlO4YW3DLDLBuL7T/bzofi9yKrBuPTW5a3EcA68ddNTsO0NPbBtYw2MeiryON+xQq/x11sp6Za8zAqOemH1s/wAZ6CCf3Em/t6KdC07PiBuHrvqOlSfT0Y17TIqbjXbMg91EsazCcaPT/wAdcOnq+CuJdjoa66btDM+yljvzpsIanI7WTflhmx8vi5zhqzMmfeRRLLkdb8VqZh+qtQuflLmTWvyGwQ+037joPyb6Ha/lClGPiepGoq8jb7daV5Q/NWVZVPrrTHrQzdYhyBqjLdLvUMZWolNnafIqC+eoB0C8p9qwmYicymMWN11al7Sy+PIid1iOU3voj8ZZASIbmaH36gbmpqV/vY9fJrSfA+0Ub/AfDW4YFhXX4aS7MybjUiWY/bNly47O/M+0WlDCFBZvM9DN8hYvAFwx/wBvDXhWRcpTiZUy1zfvviTarEY/OV4yqlmVa0/vqp0P7KjKTlFx2IXHri2Y+IMr1K2+Hrh9bP0MHQQ/MXwI0GHt4p7L54qB7XtSx8ft6ssDDQi86ZVxsmRgNt6Wr6ek3dq/1OtrsVbTWuGS9+RjJlJZWarPLF1VVNFoFaFX6Zn81dVfOzNP8tVzUlu1bPTbqMSXYmP6obampea/CY0HgPyk7/J/fL334vqAbKotcFqNCSvhU3EsnE9MW8VHKxO2OlGUVrtr4NK2JxvJU2JXVzZn94o2aY2eMeE7Ph8fmrErUFrgAaR7eJnwIqrGPv4keGogliTXAzft1C+4RWD5XA0jlK3UH1Cxu8fdYsf4/C3tDK/8mYOEWD9vDe+oG/H5hCkbiXNUe+t8bjacjFavpqGb6VtxfNs7N3Mu3c0rHl0PQTE62f44IOm4IvUSqv6pbhVSXx5omAGdohZ7cRUpDV8TqamuuIeE+Wxd6V2llViSni0trNbfUBhZkY9i3rXvGqYPdlJP/WaVGlXbNoSzJ+lzXfGoSHFiYdjFsTtwVUmV49b2Zr8J6fx7w4XPfimtNWCJUeONcyS3G2MilmbpTQboyPjO+SM9DQ4/Eeo/B89DB+QweAHt4ia3O4R0B0bQN+CjvI3XBzBUHwFsdcMMaPRV2/pIS1PRm55CNW/A+CIDCFBqTuWH0mxLbqnp6AFouBdwX+IFSPH48D7fi3FYBhYqlm5Fn0Oo1qH56b67811DoSse5+2WBfA9FlXzVTu22/sKWLGk846MJrcWvjHIPgfA9G94ZvR9QPcCT/b8qtxJ6b9ksKRL1l1InLwrXnZ6r75sPUw9MTq/6GCCLHXiRKk5w06m5i44vZ7zqmzcttakh/dPUFAyLRdbzh0YR4fbwHvO4TFqL0JhorC6uuPm1zGzkeWBLjeAp5nltpWe0C5Y908YHJBQsMcgNk4+qf1ndfXW8HKpw24X+o09q/uWQ32iFiZVaUZ31hJa9c724gpsbHqKR67mmVhtjtyLTZEJm/NjDBBB1HgOmv8AocpyicWTWj+DW5QgEsXi3XEsFWTevbsmpvU/ulE4rkDEGRnve2Fl6s9Xs5Z1Z4ll11Ah6Bys+ptlIWxnyPurVraq2HYTM7avWlsal1HiPljs+Z8NcpXQO14CH56bmvyV/LQn3bw1AJz1Bb7MSxlR0yEM2QPv1qfH4D0MMMpsWxWXtuvz1Pzr8vx0qaZC8bOioXOOvC3IbnZ0A2WGjD0w+to+09EHI/RVpUr0uv0RYLivXHrIi0M0uddQftHqasQjXVPnqATE9m5KI1jMrchFrZzwMr0pbOdR9XZyfLLQZNkYlj1HyrmsgBmus9utbIAt3A4r15VOfhpiWY16Xw1U0TJCW1/ZNrMXK7lLLwaYmP3W7HblCsJkumSLqTU0rwanqzPTmxV8m6DoIOg/6pg6A6gUZEapkPx5qPfZLNV3jdWKn62qbH7RWHoygK26lALHH9Ke0ZGFXjzPpbjVil1fHdSuI0OPWkyKRX4V1dyWdNmUHjiWWdwTZ8h+VHKNfd3FPifnh/FP68h5V/szwmb35c9zejzJLKsoTcrpPcyMPT219tm/FuHjHT2HzcvOceLdFXlN+/hvz1NR0ULiYVWVUfT7q5dQ/DU1s4/pl4D+hlTn09q7oPYn36Hph9bP8YRrG7AWLYK5zG+77jKsEXMtmJez5OU5a3pR/kzOHbxbNKcam6WUspg1Pg8U48TAoMP2p/XLQgsJpJBh49CfIdRB9kanlD7eK3NWLLTaVYqaN3vZguwel0PEwexcd1EXkeJtCbxpdeTO9Ftryq7MG0E32Vlc95ZT3JvxKRvYiCCD/qN7+QWcwoxt5DW1lT4hZx5TgoVbTu7HS+tkZJqDQjWO1HMxQbWr9Ks4ph8pdWTdRbj47ZnqRtOyzeoKLvTa6yGa98TDssa1orlRWtFhOKTKaGusurTHR331xBzUfbNSsDm1VdgI49FUtOywYemC+t0atvwmDoQnb6Hqw9m9qq6+4zft5a8Ne0qH3Ee/9DyX9m+emJtySVoB79GdjreHph89QmGGU+zWNS4R04uQXUFicXgHs5DwMA/ArkRzuY7cYn3TunS5rax7q+5lerWabJbYv+x6dpvoy66HpidEQuXRO02VxTkWg6DoswLBTl+p09rIgHtj+1qILcOy0uxJ2uXZpXTINmL2oEDO9upvpvwqOiy8T4a6fHii+5YsQ5WPd3YvAx6011rKx6SsDFYuQ6EeqvrHx6s5rPSraX/49xK/Tm3ZcElt3KM3XFv/AIMg7u5Sm5q2XEbLcekGf8O0/wCHaZFK0N8G9fuA1BB4D/og66b6jULdOWormFfBYbFhvgYGaG96mTzGMNT7ZVeBLcAVQZC0DF9RsqR8lmh9+nzE+wjMtDYFCZg9SrLl149OJ6I5RqjRSmTVZa1lTVmKjNMDHadrCybs1Ozf7QamOn1JGLi4Js9YcBiSUcpDYnqFd1D0H8XzN9FfSh021VJFeH3WfAdGtoPOyg0Y/wCLU1quYacnf9vwHoo2e5xL5z21+mZRrnqHLTk3TU1AIfjjNThuP7HolLWm3+OswfNbaneCxeFpdCh/IuOzgjRIif47TxXf2t871C2x0wLu1Z6jhdljOZAPtPkjHfeDjOY6e/YNeLeTZWKFRdwdB0Xp9Z3qhUxdqlrXaBvTl5YtmOeS4jOprKziY4ayE/hZ1sUoPMeC/p+BEleUFbJsFqEa6einWX625GVVmsqrlchfpjxBjIR1+/ja3vzmKWL25oV0ziYM0y71BtQxW9ig0IP+lr28EpW1O0wh9vKtgIyQL7ipjC3bQeFQ22Y3eJBXpg0d18y7uWKpaN9o6AbIftNvcHvK8qzFnp+bVmV5l2ByOSFiZ9iywo9lF1NLXZjWWM/JlvdZTXReHynlOSwx+68sta9NQKSe4cHHNnOEddzFz+KZ2F2fxAe3XcB6LkWrPS/UK7TmYSZxyMWzGbqPeV1e9h2egmoH1GcTCYu+QvG2Hz+Zqb0OlNjKws3U1tKm6oRaiYuPGrTl2+EYzl7N8xF5sz/Tyx+ZaLPhl00NZEILL+TYaM7kYN9DpbjtQ7+7FoTvxVST/wApaldty5Ep7JJ9MW1k9Mx6UyrvqL8DIfHSk25d/qN/dusyX7LHcEHgvX09q1xM3/KP2zAaU34B9SxV8B0HUNqfE3OUWzUb380B7JX7Oh8K6/a2zmRMbJOO7ZSZcswnWejqfq/Xx/LKn97ATDtZU44vStkrxXsYYHFM0MlqVrZKauxSzHdLErswdD1PukHUflB92bl5IxtjJxPnV9xyDo+A1C/DpjZlem+jZ6sBPpP+M4y2wCN8wLuEqo6YtXNmp/lyeFaeLLqvortQWuFq0Y/s9KJF42w0PQK8x0OXa110+J3Wgv8AYJVabMSyqem5ta05vpSMqVcpX6b9RWwKnwStrGYlTy66mum5rVasVlXqHcD4BYJhWu9npyUSy+sQWHlYhA6LCeuCdW53tbD1AHGD3L/svufCjXLKyjkGK5B+raG93n6jZ0QGBGow6Va7dj8o0MprdpYrJZEuKRciom6tbYVKn8aOUjAQWE1OdmHwrUGXXJwnxGJMVtSjhfRrTYp5H089ppZ/j6CDoIvTW4y9nByZvi3qFvcgPgfgexddL+Bvnrvx9oFguC1F+VPVa2M7bThwD2s/jXa1c9NzNn1PG+tqes1tK7yhvu7sqj/FeU9UOWzy3VhxsEXzLQU43aDQV8JqDoeqtxnHXQfmA2bAqnyHtLG+qUjU+fLHG5dS8+mYTsNDWVgUtNdudswoR0rXm629s4d/dW+hq2YThwUsSD0E+oVKsckhiWPj+9EReTO23rT2t95ZT9nujNc7qPY5/wDIN+AMpzGrHdS2Y7muy+03WekX9jJzxjXi2g1GY9D3ntcZ3OMrwvq0K8T4LoVonNrW31xMt8SzJ9USlLbXuPQ2Ep03N9cX/N6iNP4a9untr4h8HHCb6D5sXTD50rBcflWUKN3uRuqNXQ+yGNK6jbYtwxZl2HIub2PUPGGj58SYOIgFZPaSEBDybtG72s1s9ePsehhPXG3vsOZhNWJ9QserQs/xmCCb6CJNSpOTZg2Lzt6k7lmWedgHh/8AkgWC4gnRnz4qnI/S9kM9bhqPA1lRy3NQ+C+5KkHU3qbnIzfkj8Zjt26K8449lttGWbMAGW0PSaOMs4KS+5vpTgcq9rhJk5feG4x2erQ9BA3smLuJiY/FMFLYcMg9gztkTWoPk+dZ7A6a6cZqa6cygBFqka8Uq5TlLOSuNT6hWldqlnu0e4ZXkpLMurtfbMY1izX/AK1B42WV15tbAVs7Fz48uGP5BiIo5H7aYJR+loEyGFSXLp9dMZhdXZS1TdDB0B1G/iWenV08PW6aacPGyO0n0tDDv1lbEZCILyGvx0yoRxPQLyL/AKsvZXqnzx/Hin+b1bYg8D+BPsBmoIvzbSLceVvqV26lrK1bid5tDiY6B0MPvKsfsDmm8YoRkUVXSzAdJ9O4nZeBdRzyPklZsOvbwVuMP2w9QugffqYR0FXt3uEaxnmH0R+MvGlMHQQRVLSiqdhSPTqk7ucLFe0aGN7R/FByRjuAStIKCV7WwaSBzQLXYphsrxpbY1zxGKyxEtr+2CwCcz0FkP3Qrx6BSYdIDN/jUns2v7cuM+oOq856zfe+ZDWwmugEr9Rrrruua5j0E+eph6CYlYtuyxqyIu5Xj0XU2VKDPgSimnNXJwrcRvCvQjtzboDqDgZ8ddaEFArXns8fboB75BrSqhdvevtK05l7eXkPY5RDYlWMeHEVtk4vKvxxsJ8g34zM9mLbVOJ8RBOM/vGQtGr53eopv1H1J/5gWaFSs+DkbycfoRAOuZvuz0xSz+uXhnw07tmVZ/JuLadOnsfjHu7dnqNAPQR9L0s3y60nVmQfu/FW3F/U7Te3hvcGvAe6yqo2Rjs9V+fT691W4mOHfGIib0oYx6jHGunKWDcqp7aPcXLBVmH6jTiLd6tWzN6lY7LnM0szrQbM/vIfJay0WlaUYcD4/KVVB5ZjdoCr3uPv4/Mcw9MTrz4o6fbKaXuK4LGfTV0z67tw5T5ME4z0+w5KZWIy2rT7Wro+FHvExtwVokpR7C9qUsti87tCzpafs6s32+SNDUQztoQzX46jyDhhD1pvamDL5js8q2xuM7BjDTeO57Q9BBKv3vrII9pzldxqUurQ+46BiswvVzWMz0ooD7QRBtrSC3iBFGxTitdHb7gdF3Nhg9ota2Q1JXKSjNbU1L1v25ff3QlfKMw48YF3CPDU+obtGzcVyJTltUcjETITriY/1Ft+W1s5GJmWIq5+jZl0sqXVyyjjNRULFsfhGXiAnI4WP9tdXHKv5fVZTcraLBVbbYMyqen3fxWLxbwEzj/KPeejnh6fkv3bvSj2Zkf54BK/tiVGyNU1RxGV683BNMA2Ew3ZfiHwoXZdtv8AiUbbKo3VrXXfUjrUeLv+3ILi+GPjjWRk/YjezP8AcG1FbodWw8Fa5qXWqkMbyCFXgbAQ/wDt130+IRrxovYVW2FnU7LIUPQe846lOiz/AD89Cep6k9tYYvvMToJZ/j9Lrruh4K3ePBX4CCVQRCFH/JtSy+pX5Irryu5m+mM1VtLVnpx4TkZXcazi8LTbkM8s+Y55dX916a0hmvNXIDTc303+IHU7nIEeK2soxruJBr1dVu3tHwI11bqJgcfqMi4O8ReR/uBiIfCjNuxhdb3zRjparVBnI14iCYdBudskV4hPkDqBplWJbj01pbCqIS/I/wBczNxG5Fl9/jowS0LqEFG5QPqejPxt9U9GdL7cW2pq6HtjOuJT5Ja1cN7mV3ur679dn3NhY3dsqyEEZ+2Ub6nGyBq0DZx1dXvr4MhKHOHM9acZUiv3HzsNGxh6Tfyzw2DgU+m3XPlV1Ydf/HfUKyNW3JpuY94RrrUtqDzA/nsvQYUqyGra5qrV8Kn41fjxvZ0zRs9m+XY7VHjOM4QITDX9nGACJalb2XVtOCZKOpQ9MejvvcwSWtPZUA2SfdIB7pR9tvy5mGuqDZya+7VgyA8PbZ2C+W4RrwqfkP2hHFkshqJm9QknoDo5i/fG+fI9D0xIYJYP48Q6yMmspYOolQ3PZY78uquyz03NsaV+m13153oKhLqvpw9RqqmKvca+5aj3q7BZ+0B9uGxFP2ysbfIP3fg/pTo8Zw1OMKGBNTj+IGcd+CxQJbYS/QMZzQz7JtLAylZuNDB0xFArPyJSvCr56Dy17St2rcXbjBSNTgYR0qG2Sz6dsgcH/B8pWPY/dCmog2OnwOo9jz1A62j6YGLWEh/gOXmWWN33DjLbIGtHU1r8GInfwBgO9j1DCrDdtvUcsW49OU1VVtpuZH7bNmWNKreZuvoUU2LlVW1NUwHI4Xp7Qf8Aj7PLr8b0ig13ZTek59ODZZ6y9nqPqgGBT7s2PkNjvlMMukiBSZXS7H3sZ9VyvLKTLT/kKZXxDPV7dT7J+JHrCPezDpXYZ3NFe1YBavF28f8A86nKOcSmxP8AjsKmX4GHZFwbMGkYN1zD0TItmTgZFBZSOiblczF+nqyIZl/+ngVNuy/RtSH9vPft0+R7oxbTcJqL+ngw5o0Y+Jh6mCYvW39KvdrH5wdVT29h048oAdcOmNktjWNlVMBlhly6VazJFmVZ9LWg48qiCDFsZYHFwIIgfUB7k4kPZjukrG3tO3/F8p5DUrtSuOtTg1iMCOiWAAisjjAPdvnoILuMP3HwHQWT+MwxosExcWyzB+iu3h+jPkPnemNTVwI/A6aXwB1BlWKv1dmxkT6l1LNyjH8PL2671AC4+AdP134KC73ccHHLEwr/ABSrXLMwynRW1OIecPcjx/8AH8hmNiGpctbDZd7r6h9tnhUeNtg08wrGyHT0QYkPqAxaM31Hus+YhruyHvO5Xp7fU845t0I3KrSkC6Ir2C5WWbDN79MbJbHbLpry8WKxSMoIlY5E+5/Cg5NYoD611pXcb2ZTGGl8NwD7ajq2qvdfqHKy236P0lMvObJsW0iDIYTC9TupK+uVWS71JO9X668ps9OsbNx09QbK9Ly0mH6Jk23ev2B/UKE2TF+f9vJay0FQjV6FVIaZH7NR3cDpuVpz8VsR1sHEnoPk/OtA9DDDFmN1cfx8OA6j2m9xeletO3v1wh9BitlFmvZhUzljK3KNaneDLxPQWsA6hlRGYo4eDIspbHvTKRiVJbc9vwj8e5x5TgevLp8Tf4AfAwqWi0sZXT7+mZSVYiUY2erYIwnv9Q5G9GEPkJcdLry11Q/h1G6GDpy2EuGqaq3W1WU+CqWOM6en2W3rZXViA0PYT1ozGrV/ZvaBgJXcsuo4Q+GNYPTsfB9e7svxUyRkYTd3L9rvD+sleRHpdvb9IqSnK9c9RXExiSx8B7RkBXpylX84B4td7y4fxmHpi5jUNl0it5UdFxxNaMU678AdE/OtztCgFtTc30VtS3RAMb76/FBtaV520fwJ6jkDAjF7TxE+yclE7pnzD03FtdTj+t3YqWev5Bnq6H6j05BY19ZqsX5/28VWctzkOLncMZiZiXhZfX236VPxTqBPiWNyHgYeh8MSATlLDtFt1Lqu2/QdE6b111PT6Fl+Y1titymXZ/F1X3w2+9eqsUhtYwN3R2WuFWDbwsZgQdzcCch034qNkjX5ORnPcM2RBCPENHGvP7ZW67ZtHuGUt3J3npar1jKrPew/UGTHwOOZ6XbSfo7QvDXXcoHcsufnb0NR49Nb6aMIg/APw1v2jY2yQDCuugGyMhaACKlZzYdzfUe8f38K7ikIW6OhrMrWWXG1lbTemZZNfqN/KrLrPPoBuEcegymxRdk25LCb34jojlC+t9FPFrf8g+6sPzpPTXTFIyKvpnDdutY19eu4YtX1Etpah/OgCtXfrrrWRCvE1/N6cG8KzpsEilqfVvqJmZJyr/JRyNfpttptFVbd3jN7i4i3D1Giz6XD/b1av71n+3gtfEWWcoG1Oc5bPJdE9K8j+IpO00pcIczD7Y1E1snr8+R6npgIXNp6Wf4zKLFMuRUsg6J1RC5wsSq1sfFOXmeoW11JMUiZnhVc1RZ0aNrfQWhVYBolP2FyYHYT6wZIek1zYMDBYz8vwNv8Y8d+atGTj5NDFczlAY3v4V32VQepZO1zqrkXE70+mtBavRxP48q9e3dE3KaRctmH24+I4FbdstczHutO+Y3vCDD5D8GxNAwFqylqWSyjjOJjKaVrQuciwWP4hCYrKo+mDx62rPRW1C/cH7Nltrr6c/EZdvIm5bRYvBpW/FzkIZj/AEzW3WI78hP9YPPXt1t92xV+5To+FYJfItayyN79EsKGvJqzqLUFdnFWhHXRlNHOX38/LcBgAcU16tza/c+3XU0FVV/gtvHb14amjO17CxaVOXaaz1+Ji5juvfSpr7hkPx9z+wnGCvU7qrGct+Er7WkU1rZqUZhWr1ZwzdNb/AerRfnCtNc30s96zP6tHFRN9F6BdQ2bGO3BFcY9BJYmI3Es3I+GNSLLLMNy9VB7l/ot9Qrw7rZ9GlEyMnu+FWQax/FZGq4zimgqeSAGbi18p2uMK66cdfm34q2oR1HR6zowQdF94y8T4gkEZl2hk8oKMex7jysAmKRQjOWaj1J1U5aIhurKpjC2ChIMdNtcAG5CNXNfl3030pv7dJzLCO9zLsaB4hAsOS2oG4lchbVesp1X9lxDVMpu5b0xjqu6zbTHdTL8U09af8pEA/Fr+PrjcC9tio+L82oROJh6U/5GGmHgCVjP3OiGMTFt1Kb7C+brIx/wBpjwUrlpfUUfjrpX+wHJs77IBuLSsZalgZZyXa28ZZkFpuGCHwVuLZ428WH9oo92Oz1+PPEsFdt53brZrptqR27idAeMceB8TDB84nVv0i/C0JkYoWduJjM8XEtj02VCLQzL/joLAkv7amtdAYRrp8z0vF+/+BWX1DGrCZ9OVPU62xzc5ZvJToiqrIl+O+OfDXsZroDxiZKMFStmXB5LbjMkK66a/wCgPu8eUdeogi/cn4K/sZwJrUdyTNwJzIrZIljVMX7kVdszLGaKxh8RD7HrvofD5mNj0PQw0a6tzmOXBHj0snQLuA8fJb2VaPp8g3en20Pg4aY2Nf28kXLws6BuNe99asn2tepq9alTcLb04Ww/PXjOM101KxtD1x/a64fyYn/zFz4D2mR72eQOpw+we87fGXOFOPd/HYum/BRbqUZT4lvqz02RiOlK8ibODF+RJ6H8J6GGdtczCtpeogw/tORCeB8w2i10+rgzXgzEZrgrH48DBG6GahUwzjqchMRdziR0sT+MzGetGxK8PVgR3py6KwM3HrlHrHbh9bZmryvT8iW3LlWZoAR1HXZ641Itl2DXUKK61NNR7RyGQhqcgCr6VrLfqlyKBt69fg7zcUxmumtQR14HyT5KGmNmWTu13FcQu2RjNSngR+Me0I8DOWothETiZ29dEM4w/PgBuHivTGrx7arPtg007G4y8Yp0e7yWV65PYFQmb6/PifcLNT+vEe8to+mrRWsc09iX5Hd605RrFhrI3+DfvX6k2Lj53qZy0FxVs4d5ejHfjj2Cq1r6cgGkq+Wf59+CrOM4wianGVD7m+egOjYBfXWopwvGw7OvNW1BWmrrPYyqzhD90NMK6/BUw3X2fpr6u0TKjxXyPmehh9pVZ2VHqDmcMO0Pgq7jDZJ9I7T2XwP4Lv06rGb29p7CezTtEzWvHcR+EduTTE9pjX8pbR28m79T7dMO36axrDY3So6mg8K6i3ukNptqPv41puYyhAVOVWtBrLZHFcvHN9GPilJdcLa/qWx1pzO/L9h/wJY1TNkran08v49zyx/2ucvYv8qFCsB1E5XE4jGcCD/0dQ9RAxnIwGU5PKFWJ4mEGLXGCxdQmbimWvyXnEtKxzyaK+q+UB1P6M1NdDrxpfjCo2Ts+WDUohrxnf62iiXXvmO4KnoIPdfwem0LytuLtX99WKEdFvFS21aTz3K8hkmRj2XWfRLXO1TzaplgWIs4zjGX3CTjFWPXCpHSrH5zHNdNmVkVZFfjx/j8R1xlZrX/AH6VtO6YW3+Hc5s44e/hqfM9vwFNAwwy8aZopImLmGkN6gSyZyEZdIX8lo2PDiWmtdOJMG4QxrPhxjGHphyofe7ljZ/jMC8R89RFiHTZWuUq/XxR+Mqba2ZhdkuIlWQSv1tkOeCl7VlHffRt/TGsj8WH+94/l8qjxh9yjcGyPvHsJiPxsY2OMijS+B8CZuamumofAwwdB0HTZgnI9BD7eAPMee/xL8tq2FD1HXHoDDIvDxRym9zl25cwea6D3n6DQefHhvpxM7rYY+lXOlCHvNh2USv7m4q/p58j1vubHwj0qymrH1NTRXx2ldSseFIlmLsnGKxk1F+03PqNYxPcboh0cT3sYcW6GAbLfPQ+R/iToYD468daisAVuRYuQrG2rj11DPgfgB0X+TPmZA1YfkTX3dMci5LMGyuEFSfw/NM10LjS2abu17+rUS31EsPrnn1DE2fc02sNntvZMPTDi+0Gt5nbFda82ucO46iJ0qHeUqVlR8q6ty2/nN6gtYRMp1LXu52T0px+6lVW7GorC5Pp2pZiMjcNQ+dTcLcw/dqah8COI6U3yz9qn4MLgUNvIP8APH214gTskzttPecoSDNanvPifbNLDG9oIPIeDeAlo8d/j1N+wMSzQtqI8BNnpvcB4ymsMLQE6oPucdOBsTrqY9fctRDk+p5rlsj0y1Vsu9H5zNxbMaump7A1jczUL186F53Z1lJtuHvrw3A5leZYhr9RqsQ8bI/2tdGHgDo3v3T0rTuFkWtd9Nw+KjbWe79dfkrKoHp5V1WcZbTw6bg8j031s91MT9nPJjFmMqkZCKDEbRWzuS5fqqIYOg8f1xeXlvqo3D8v7GGb1G9wemF7yrGdwF0b/gfaB0HQReg+1TkOZjHuRvnrh4ndOZcLbOqDkWGm1Fp3DfxmAMe9c6w2ZNWVbTB6tbHenLFycGHm4btjYnzCOmoi+9vuerLyq1E+d7mgwfXiDA05mczBrXZ5E1NWzNvpqdv7TWu2rhgg11H5D7p4cvM9QpPjW5jJroIycOgG5volvbr2SOi/tcQ04GVWmhmdbIRrrj+mWUC6sekR25ODo4/qL0zOzj6hMLIxqpn1dvJxzq21eNnlh/xJbYWbfIee5uV7yJZWa18QdTtB4ELMGFa9wRh79GXQ1NdajpmO/wAHxPmfHk0qyGqDMplbhgw4t+DU113D0MMWb+7qlnEvbo/RNYpHE+VSc5Y/3cd+O/AfEY7PXc7ZsnAzC/jA2W5C+ixQ9Ltyggg6jo/t0w2Auf8Afpi4/cmY/wBPV1UblOPymXj11VHIYwknp6awotzadXTXSu7lLMbSeRZjBYOHDlDsRfefE5ezHqJXxrHFLo2GwHvK8dpYvE/g3DFy91stIHerj3VtPrWSfXtCYzb6CD8v9TXhx/Cvv4qJ8Hux0/j9PTuX5b9y/XVE5RvYjrSf5H+1uu5rU9Jp+o9Qz6RanrGT3beqt20ndPbrevllVNvyuu7FDHlAeJcD8PFsOmy7uJ5b1KrK8lcv0+zFEUDTqAZd4GfA80Ut035tSePDUK+049yp1VQddQm4EXQrBiUKYaYV1D4UVcq39iYs/wBq6+6ev9YOQa3uwVzaLK2qfw+YF7eNAdQlWBXofDU46Q+B6b0a7Pq5iruJQWQWdx8ph2Oo6rK15O/7TGG73/eY2Och7b68VbL2u6cfaD2np33z179etu0rwq1yMHJx+0eqZLVjhW0dODdRCOglbqQMHuBlKHw/xjfSm9qGXKS0MrLGb3g89dGPt1PQz+x0H4v68Pkdfj8I8f8AXpjOJVrDCsoZ7OfT2ix6YfbojASiqu2wem2AOhQ9dz/xzBes+qeoardzY3QDSk7MB1PiUXNUzISZxOghYjHbdGOu798+lY5DyMWPcWFNgUv6d7MNHxI4zEzikdVdvp7OoHcTqPc3P3Hm9QDl1asqJi2cWtXjZ5L8sCyNUwPD7eHuXr7XYYwjpub303O5oFiJvcPWhSXdhQtxDOMRmXhwb/ZTo2gcuo9jVlFFsH/IY3gvzfYDj9fg2fc3hWnNrG5GHoehhmHWEmH9NnUPhdnArrZbMg8uo6DosX2hPKfEwx7t8y0mpT1U6gHIrikytWxcf1C1rOtK8rMk7s9NtXWY3v4qdwYrWk4GQG1qVV85cnE9a73qPcTKQrxPSteb3TfWv9rMkFWXR/CvxP68O/LFDkoVg9+g8QPDj11OQnvCuxwM4H8+uq/Pz034b14YNa3Otl/pV99GNlPmeg20xcAJZTg4VrVek4uOL3enHyt24fQDZPz1U6hUJjq0Q7iVLtslMaV+oC17XrNdjb61twsso9+o6KvIn26e1UxbmS/1GrteI669qsh6TY9eQOBlb6J+YBuKGof++isUa2hSlSajuXMB1H6a8fid9jCxm+quyQ28pw2PEzXUzGuaprLeZReVndIe6ruR0KPB7+H/AOe56daUGXWG8AJb89f73FI244npUddSIZr2hgSZNheYRINXq2RTW3qmQ75S8Qeg6DovUj2xG43ZCcbVq7U92bwP2zcxr2cZbBrulP8AGjNyIbicheVR8qn7Z9N9U+31bA/9nBxffOP8vh8QWpYGwyQQVKqUV25+AEMX7wy8T+AD7DB130br8TWx+AQbnAwTmOG1i3oIcgzumFif+gT0C/Z01+CrFutAvurqxqlux60UQ+n47HtLWLcirBTL9a+rR7+3h9B9q9T0d/sgs1FzWrUkWH03t15vqrVX45O/AOVI/khrKzXVD7sdsPYfMrb6aJf9ahUqfANqft03NwNqC2Ky3lsOozEarGmQmPUjHEupb0xBHprWMgWemen0ZCZWPhJZZkenKRTRkR8bRapxAIPyGJYazZYLV5+J8Kx95g9or/dSszhrIlY5PcurJuKemGdWZFh5OvcWIkX5c8m66n97h61/t0MMT57e20inlzZ/nA4hbLDY8vqD+ndRB0SHoKCaUPCxMVjdd3Mi3LCVv1Ht1ps7T5nFjKa+4bD79KbSI3z4IhMqqQSiouKvULMVvqVyB6qpXL15Ja1ZOQMgP868N9Pib7q68wpMtUV16muonCN0HSt+MashfBV2OM1Pjr7+Q/6BgENvtr8NHHvXW9tMnL4WVZuNdXl4leTXQcrEZne6vOa62+nFO85eOVEX2duR8F9uioWn07bb5iEhu44NlW/LH5ObF4PFHuzAdP6oEssNjq3E5H3Hy+emp8Cb1WGImL6rdjNl5RyLOLQV7R2MxKHvYKTeagzLXUjZPqrMnzKRYsy7QW+0gDc4z+vxI3EtjwjXjrrTxWtvn/QfuN1zLPK+U+z5P3WTXQ+8xmAsbEaxqaxjx8cRta5aTwH3R/Zuh6D7FPvCnAPP69hL26Ujbt9z1exn9emkWVWJwaCDqs+YtMts59FueqtPUndmPJpvyrHKkroj/EZvoJaPATu6nemNmmpryjpU7YlnqQ/9gzXlvUqsQzIqCCHxBjMHHkP0/vfTUB6tNQQRF5NbsKtYaAVKG7cFTNP8c77Qty6iL/1AJv3VeZ1B7Sz58d9VOmuuD0+q2+9TMLWzja7XFzh5D8bM9FFTrlz1D05LFuwqhHbxWP8A44raLXMelFBue3BNNa7lfJTfXx8BKjwN/vZy8DHPBOlVvAN7wWCdtbZrR8WgGy3zNzK9qy5lDHmuMeT2L9IOTlcG0zJqroUcTKEBszchcNd8vCtQ0deB14mDwVmWfTG5WRkPUGGo6hx9YJlSlmXQtQm1M5eOR0H8lHj3DC5I9ORWTHxHyC1dT1EaPgfcdRPmfrN7nzG6P7pKjqJ+1XvZ09MOrbPd4PCpOUWvUFfKFIKtnOQKFq+ycdw1kdT1ps4y8B5rSTXUpyqekia66nGBSJhPok6NaNl0umoYfNLCoIBhHn/r+UkzcqxnsHY4hVIH1Ht3YAbImH9tlwVd76joIg0bK+B/Bqa/EBCeqah+fwYVa5FGcXyLb6foqxXK6xjiz1Fldstry2ScD0zE9ddBeleat2C9RaoifHUS4cRF9uijZuK4iW5BtTXGc9xfvXwrUCX6s8AIw7S+FTgdEfibSLW8TB9q9KAAcW/6mZHpj12Y3ot9L20JVT6lkVKTl2zukEI1hx8MPLM3EwKLXNrjwB1MSlc6XVtTZ+Gr4svLkZJIKV2A4zaKagrZo9NtMO4QhwsjHZS+0n9413tmtyv6UNp2Xi3gFLken3T0nAWov6a7L/xqJXkemWyyp6/ClAwdOLdDNClD7k+B/Uz4Rx2Zi9BMRuFufR2MiDrSkrUCGcysDC2FCsvX6wXVy3HKlazEqJL4DCNUVhHVJy013x4ZDduuu7TcFJbFM7BnCcYDKk7ksoKz0jI+mv8AVav5CIfwBtHucofeb9iPxamofIynXc59o9zZss+yutnlOHuKKKJk2m8CfM14a1AdRieG5ufC+GvDfmIev9Q/grXlZhX2saiuPTdcb3qVSmff98xP8nq93IiYmQyq+XcrfWsy8cO+v/jdpZjtUeMyAfCoe7XM8DTnuMvGVn7iCpgGyAKYW5ENosu+ianLUvCPj+A67nKfa41rprUXi4f2E1KcNnq+nuxnryzhKfU8l2xPVLy+TyS35KJs7x6zZnvYli6PkjFDfccn8AQtCnGM2+u+myIL30mXbWT6hzFjV201qe5l4nvZi2pKGKS88rSdTcqIV8j/AD9aq61lmQBK8hy/p+SlEyvVuUw7uRzrWDpm2ENWjDsCNjOBy1D+zdMUjlfy5nwMb9JSa6zZZzfE670Lg+XR2nBgla7lVJCVU9yfSQ0aOuJT+SNb2VsvOmciC9hB6iyj/kHIa5mnKbUzgpjjgYujUy68O2tmPVipu6laQPYI+i9C2Q4hUsmp7rKW+oXs9uzJxfqMWyrgSIfw1nUPzNfh5DRO/M41hjYvGCtSUorJTFoULVUoc9qvZMqeX1cCIDCvVZr3I2kSpnJx7NGsidsxkKT46b6/HmPnqp0ImuVidtvJDoYbtWMzI5srnZt4V3tzsmFT267bGtsVtTHTm9v7dFYobPUWvQhSj7IA94BuMfbqGlQVTfavdV64WTj1VuJ+x4RxM5e3gfKnI7Utt5tFhOzuI5U0NZw+q5omWu3Sh7MZKjM9sVanIYnovwy86CPD/XoFjCHrroF0O4Z8+WvDIHGbnp955ZbRsn7x2ricWlx/xFsHozTK9Ju4mlwe0xNOA1KXexlVTWWZ7LUQdSq7i2TX361mMC03qC0icecsHupjIGm9TulgR7noelYSxX4KPhdzE6t+vpOQcRjl1KbfTMPLFnoWGyV/+PqpHpi6+gFcWnTXoFDqTK6+Is2wchIx2emvbruE76bm/Dk611uRGYk8yJ9QSFuMxcjtP9OmWr+mHdWK1NrUclpQ/T5tYWxhDD+P+vPU1+BrnjGLEOibDvuMYGYxPTiy2UNTBZyj18GEDa8K9S3ltRs5Kmg7hghY+IEs/YflWzkCNeRmPd2mas2GuiwNlZEJlFfdtz2K29KLSj5KEnxr/lDKVNVTXPeBT5aIh+ZuE8h4Kdxl4lvYqNl14N5Hy/qKdQ3MyLeFoS0hktfnmPTRRazM4j+4ie8qBII8P6nss3vpx2IlULIkNh/LcdwzZBryil2VT3n+kt5PU9UW50BYmYvqN+JMf1fEyRh4NArzOLRsR770wKEVPU8bEGeO6/TDuOsqjhZW/Cdktc1S1RGPPfvAYegO4y8SehlA27kMznfTE641asXyC15ymIr9SdYmTkWV41+SB/zT9zJ9WsEo9Vs5Nki1WU7B0LrdSxt/k+Vm+lp/i8BA5ExvUeDVZweB6WS6mso/2pkgRwDGSN7fhRuJ4Bh/UPgwmoPaH8BhggnLkRK9LDkNKm51vQylHAFq/b0E9lLENFDcVqUvlfzqatTsv4AdQYffzHmvzxBq0R4cY1fMpg2CsGGwyxuRmAi11u5sfovyWKk1jj4Uniz3gEFErc/d4Cb14KdFvbxp7bKUJavHfkcBuNuD2avx1+7uOLw4xNVNa2UY+DZad/SS21rnDbGooE7BMFZUg8S6iN1C7m9eHzANITv82pahAMMH3pU7zHycioLnX79SwDrr6b6rZ6c/qTj1JLL6fSsYnZX59LdMim+rs2ATH3bdktUjFtP9QEPvY3HSQCb1D11zUyurnLahVCdCHpidK0Nj5FPaUY/vdSznbpKzYxxqXDXn+RW3AZVbK25m5+IufcJ8ta8lOodGAdMgefzEcrKPU+UscgJe/Pvbj8bTbUyx5r8KNxNg0T011WIktQh+p6noRPYQFZ89RBOftW28eBvtAmpS4qZnRitFfbd5uV5LVlMmpjfgmpnt5zSmMNHwI1Nnp7TcAGuns0+PFRGbcW4qGYCb3NwxdkjMOKK0x/UY/oL6voaq2zGKN6jX9Meon+RF908D7Cw8hj3cDbSGPQQxPcu3UwQGHwx0ljbZV3GYyi81m9Rv8SqSTXG47rsb6bEtZLc71Xbk8j4U2aPHTa0a6y8YanGcFUM2/FRARrw356ntCZufvW0MxVNlifxsoLmzkjen5BaepYAtpm+gZqwTvp8KpKl7E9QlitvHcVNdVLBpzF+2uy3hja6nwUdxi2gPuZvkwTUwhOEwdU5Obk4t6vlIhr9VtrJ9RouH1FVcpt4Uo2x8Tc3MA8jkuIzb8wY3sfDU/qVez2AGs/Pkv3R/tNOQ1RVxKsjkbDonI3L19vEweCODLa+PgPeceM5GC5hCdnqPAiEQQdB0B1PtmPxl1HaPVFLt9MuOLLeR34Je9cGSrQoHjeDNyK/bD7tEHJiNGHpuezgpx6/E35+ngHLy33crlZgeoXUm3MGXlY30eWvqXP6zqBKkHD2WWLxbpVxUsdt/UVyptAtXripzfyE10VeRd/YwDpqb+wag4E9lJjYiXNkYqKeiIXLoRACYjpVBnmYtGNlNj+mV1Y+debnU6jLryB7qN7xNq1tMZuHkJzlaciUViyFfPXTZ6npUfuuTgxlFvYvzq9svJSAXbDxlSepetfd0UbNp23TluEagOjYTfREYFshfuFRMCLL7ASd9NeNJ07/NfsT7wjpqYUCy2W/oYYJSuzWvfq/Uoem56d7te+yT+Bh5KdRtblp/ibzB0Wr7y6itqKxncg+WO08jBD0Hylf1FLrxPRRqE76Cf3047jLqai9Diw0OJwYQCDxpDMfpvpaxZRKqKskfRUtdZx9NFtpsPiFJnDUrYJGXvllK+BPgWV0g9167gG52zDrj54T8Mq3/ACTG9mqr3l03U+l2+uYAya2qKk+0rXc7kpyAJbjms5NfOnoR9vgjlD/FbLK6wkx17Pp/mIQoDNvx+J/r15aiWMhUo0KpPSbceujM9UFxS4oJubnomeasj1n0zgXXUQcx4glSW7qLy7F2Tww/mcdwqR4pSWV7NzcxrFDX08G8T5mchYoxi0etayOQCZHApkozZnqnKvqiHh5Y5BDIVM7x48yYG9392/B/kD/avGMPbpgSlYfeWj7D0AlA+6nI7b21hjWhjDXTDftozb/Cp1G0w8fmD5tq41fI86X4nIUHpjpyZKBbgn2PL2/B/UX5ot4Jkut3QHUJ3130CwBWjYhWcZqf6wkwXuIuXsG1lgu5w1gk18ZXjvYVw0QVWhDmXswoQ3Pbf9NXXYeS39yrt+2vEwdOUFhMM15V1FwUZYmwW+fDft4/30xF5XWftKP3epjiZHL6nn3PScr4BWwW28utV5WV1MVsUKfmP9o89TItCYviBvog3GbfjvUPvCNeXzNT9U8NSsfd6fl1+oUerem0YkZO25r5AqR40txa5llgApFamGpBD252gYRoqpc/TrTLbeXUGV5BEft2xsZoVInHUPmZ8QzZAb5os0mSxa7xL8V8B79a7Nxtbi+x5aO9nqfjwA9/YTZsbLxjXNTW5hLqORXjS0fxsJqVIbXuU4piuVgctFO4y6NJHD8StGWa8T8WuvZ+J8/gpPNWXicS3hZg2qt+bj9qz8OoE3AmouxHGn7XIvWa+qqXZ69NrXQH3qf7e0DV/wDnr+GN0EBi9KaeU2wg4Sy8JLQXFf8AClrF2ErYg2VPXN768TD41+0/s+/ii8z3I2QYTseX9efonbObkjV8pP3em/y430hysPCDWenY+M9hGIVtzKKkHt0A2cPVKZC0TY5HzU8Tj2/yEDfiDosvv+o8R8yw76jqvubNVqfIVhcfCvfGuDV+p4uX6RYqOrsRawgsrefSK8fGeufTtxYcZUvOy0c3IjV7hUCGciYeOOGPPxDiIymK55t/LMirtvqa8D010PQxAyx9l/D4m9+R+IDqGpnDDiep6k+2uu4v7cATidqi3M9YxrVufHZlZeWDSbRknby3/GRGE9Gx0rHqBFlkESD2OtDGXbH5/EG1Nhh4K+gPxK3E2DktHtbaCHu96j+FTo64opUw2KhJ5xkYS0OOmPi8wbRSVyamDW45XoDpQ/2KOVd4CrDP7EWMfeoaKt7NZ217h2r7Le5rYILCJyAlXbslbcJk1hLJ9sW1NN89RFOjxATtqwI14MdBR/HD5L8k/gwPbLtbnZEbR9EuG+3VhH1H1zm/p/riZFnq/p/JFq7lZXRTFssAFWKttzXHp+/4Kv8ALfVxfoNTXXnxx/H+h1PjWugx5N5MvJqra6j6Xms59RzOFeMqZ1b+i5CKfT302Nas9wac2ygG3HyZi4LNflUkTu+z2kwkxK+QNqhSdnyB1FciJkwIuRU1XEka6EeBO4YYYZXYRN8mYQU2MO087DKPP/WCU5BqloXk1nt5nqPaD9ifuf8AXcU7Pp97Vp73FrPcndeuUKiqDIYRz1ToGlLcXccW8BNz+vAQ+P8AX4qHAPHi9plCi7EsGvxenkPPpkMsqrnZUx29ywabrAe0t4D46f1W2pY3IwwwQe0rX3/xzn7s5YgzeoGgsInM7x7UYW0FZj5TVnJye+/QCdv7eo6Lop9JG4iMogpYw471lhyssAVEQ8fIeeumMjLVPkImz6TR209V9QbOs0IDxPo+Yt+AuNRbZkenLjtkZbXGHw/bzRSWu2zQiBTOMOuiWe9hQQWzlVCaSzJXqz2I+FH3N+3gBHfkfETB9KfKryeIeeh/bXk2k2vV9MV9Qco/C+V6VssduZGOaTPSRpr6maWU6jJBQzGxNI66/GrlDXcLY6++oYephhhjSqAfcoi3OsN9jTCoORaRxPXfXep7GGvS1Vc3sQqG/GehhPsYJifFeS9YZuRIbt1t25Y+5vZce/Sl+Ec8xFaW/cfyb8RN9N+PHadVMs3ZPT7xjNe/O38Cr7FpTkERshoLthxwhMJ8RErLxmCTcVCRBTYwMMEVdkbSFyfwAzHvKNnaFvgDDpppYJwizlEuKh/cxbOITJ+37efboKWb7XmYqFoaDx4amtRLFWK2PZHw+C4WKuTgMpQ1Ls04dNCZ/qLZbdQxWVsUfOJzfTvDfX5J8ADttxNg1A2y5O0oJMHhuM2/CgdwcPfssJcnE9RN+eL6aFhyls9Psq3DS21b6SoiW39whhOfGYYoyFfBOOeNShcDDWUAvLf4xZ7k1qrWsvG23UJ34kfgpr+ox7BxhaEw9TDDGmOuzZ9lgfiX/aejqDkufvh8vaB+Mx5bYdk7m/wnoehhr2OBExeosK194R7Finb2Nu3XvFg6/wCkH4j034D5I2eM1011qOoy8T0G4i/bXVxfKXhkeaxD1DyhdnMI5tN+I9i9pboqFyU7aV/ToP8AmgIZqa1EOiYPwr7Aty/DuD3BXpv26sdzl7K/8c15AaUvucVrVch0iesME/5FZ3sO0h6Kjh+pVY9uV6ZT6xTw/wCIayxrW8vScrt2XJwt6HpvqTznbYAKTFx+C2cAgf7udcFgLWe55aBPnxgqHHaic53DEbjLKxxiqXN1DVedSc3fILH0Ks5GHk4daTCoxGmXcn1l+QbWts0qwrMZ1rOXc3ewrhaSpWzDyG7ltYeXYwUisXLk0lJb8+IWPWU8qsdrZ6f2kOX6at8soKeJhhjTFH8faVmvoCTHxu/bX6NQVqyBj2n5/CDrE3tep8j1M1udr34HRO0xere1BPRGKnfch6L03voIfwb8dQT46IJv3I8QNzH9o1lWQbsXiBFdVjOYuXaFtPdr8lHIsvEL4KTxu9w34EQuftoVmLGbjahaD3g/EqRzs71+KkQmHrvoDroDqLWWnx05T21K15OVNr/TV0qeyZwp1yrEW6rXLHgfH2zYrGr1D6ZvUUPcZB466Y69sOxdprpqa6p8nJsMqy2ScnvLonFh1a3mvHU+T4/ELE+KnRVuE+n5mhVrhT6lMj0+2lijKUQuRg2mL6ZcZ/xl+7CKlnomUaEyLeZx2AoyuAsLjdlnI9zUqbkeJWe11eLRZjvyZbKNALZOfsF+/LUhcnXcor5G2o1MBuFGEqpe2VenS36eiCnGsi4VLjs4tEa/H5W2Y2vqG7fdIlOcyj6lLJbiKQ9PGGsicTDDDGi3NqhWtlGKXh7hvw/RMq4+q+jWUQ+3jvwHvH/x/A6n8QMf9uZHTF62/wCJoIIh0SNNrUX8w8VE0DO0zSoahWahWcZrop0bq948xsjhLccNAhEQckyRwNOtkcT40e73aEU6n91VAx26Box351KHZ7RWCeR6BCYYYIOi+48qKu5HsFSfh1AhmMqF7ETb6HkPYn3gYrA/KOuugX2mPZxsLGpnPI+IUmDGOi1aynPV0vr7L7nsYqfb1tff4a9Rkp0elbmt/rNs5x3NOLUW7WM4tHF/Imb8RA0px2vTErVZSe3bkucgUp9SfU6zi2iwiGwzHuZLfUaGV56UC2ZfiXUS+3jLbNtDNSs8D9R7plHeP6iypjN9RkH3esEm3cqt5HIyWpVHrzbBZiKK66M2Ztd2IxyrTDc5G+lNmpbk+xJPhrpyMx7G3Y7AmwmFzDDDKqDkXNimh/T/AFf/AI6s+t4mVjU+rYuIMr/yW62P6nkMN8oeg8jK24HscoUI/KEMYTtwzEboPeWfp0EEc81GnBGv+kBuf1uJeVitsjez8o8Kah+T0x/uFlXE8ZTb26asiqyNSoltaZSPjNWcknfijcS78oBufbXN+AG5ozUPgDrx3Ghgg6A6lad1O0ZqARKi0XFJWx+0fLUBnKBjO4ZuVf5C3uw/FjnmGCicvaUpze63uO1exqCBZ9LZCBSTaxhYnoqFgP8A2MUDc31rqa5k9NZZaeVn4R1B9yd9UOo3ufHXhvwRS7EjHOPYzzKRklF+2yvn1BjfjdcNa8z0vKx/prwrY4Vw0z24v5blNraw8sVQ5Q5Jle1mcONWXvI9StJvxmK3WmnJeyqzGfF9RTKXL9GNdXUHUJ/BvUGQl8vq7ZhhgQ2N6d6TwpsQtMjBFluXiNSeq/sZryJ6qxRvrHKE7J6H8JeEloW9j84nQRyvbLQdBK/uGtRfxGDzHQ+3Ww8jxjD3rbhHTlCs4++KOMcc2I1Kz7MNGp9LX99WNlqJmIFbwRDYXpasKvKN4ifE3NzmROc5TlOXk3UdR7THDtO2GYUAuKe3dZlBF2CQFM7SADiIW2fIwQexH3E6rZjs+PwOgOiQL0105gUgxHNbBkaJikxkGPXddZcPAn7a3NbXVDj7vBjalVFMOdVijIy7Mk/iUe/j8w/azrxbxP6eA64mq1VqnallAubkOGzzasdpbarsCzboV6ej37r9ZqLE3Er6SSbfUcEX0+dn8OIJwMAaMrCYp45GcnO7Cr5PY3N6sgoDWrth+sdlMj0tLl6a/Aem4rJ2bKGEND8OJJ9MqrpxbMvI5I+XMfMakHMxsl870bGSyz/xhXx78a3GaH5/F8+J8TD0PQnpi9FEt/QwQQQRjzC/h1476jw+OmP967KxdFmpGwTW3DuIP2avjS4nDU1xloSyEJ2qLjW1+uZHOnr8xE7Qus+0uW66ntPacvECamvMwmCCJ7xAJUqqwymsdVHbpuUm5m5sNdEj/t+ADfXFHM3/ALeO9eGvFdbYCcpTlPSVcM3aS830Gpprw9P98h8hgVMa32/J8eSniasVck2vXa9lDVrxJiqTGr4T+20x7KzjNTXgDxxUGzVy4e9gsSymVqrrtqW+pTlfbj2hkUtgDsPk5NZijF3j211FfUMekvj4tjvj0BmxWiYLtGoSudqgjExUsbJv774hUYiVpkq1DoeLw1lUxrywsxvpmtoerrTV9Ti1224dl3HMjVMomvPl7QfaCZXc9J/5TIATI5tiZ7YDtnLlk0fVy/G7VuQxruwPV+zX6h6zyU+pO8atLIeuo3mIfwnoepgmJ0+A/wChg8BF67/6mDYtd99QMsBld7Viw9wJtZTStpev3s9n+S6FFTja1eMy2fSlGzk7IoYBsqrs2fM4GVIapbZyKI1h7PE91En1LxnLnqPAdT5MYffqJX7xPvXFq9snJ0Iv8tTK0VCSAEDe5/Bvrh2dq/LXV34T7+QfQPTcS0rBajS6rtnl4elL/wC037fmUciRowDZ4BZy3K6EXHe57TSwtFl7yu0oR6ks5fcrz5h9vB9CKeMDFmbHNhpopqP1SKGz03RmJYlqJYtvtORK/eYX7VfIxrOXTkWllftj6cZdPafkVjWM3Wmw02ZdPFvSypPF8bKt7zjv2TcwrtW+rHjjre6gWqZj0U5EXA7cbFsyJbU1DfMqHde79vPscUJ2ehh9jZ96fBxvXrFTOzTmZGJ6cc3D91lh9+gJsScfasgF+O/+mYYemHEqn0rCWfo0HQdV66/Kff8ABh5fbmQfb7tpUSpB2qFI+WpxS21W0oGLWstvbiZhssF9V09Qw/qqhUyO9LZLvhaV6ba4EaycKllnb14DzWs67ZnbM+ZrqJzhHgBBFs0zWHj0oJWV9tg4LQCfH5drl1H56jpr8mugMTTBho9EqNgxyUrb9uirvzX560Um576KaQWqyI2BZGw7a17cSkKbX7jSr50bVsQowXcPUe69eJMTWg/u7G0ty2KmI4yl+1Hzni5dixspifqHI8BqJYQEUS2w2t15pwoyjU/apy0uQYV1ATPHZycV81azPsnMA23fW43TCrFKtf3DSewMpVyoyFCp4s+JXmLl4hxLPGtBQlthteHqYtnbOQnEj5H7ek3W1ZPr2KtDn36blFZtfPw0x42/wt7HzPUzcMMPTEhtZRT6wLV9TpxBiuvQdBBE/B8f9ASx9ol2pW9TBl5B7rBBYWH92UVCux1Ag9p6e/cHPguZmgXpkGW5bMe83a5Em0GH8I6VnTqSByMssIQrufEOugmoRDB0EB0eXMKxWKdkr71V7TDx/vswyGYcYfxAz7TGXUx24Pk18LOvHS7/ACaiLs2Kiv8A8dXbQ2FdVL6HVtSihsi1PSbrVHpApaxDW/RToeQ6V0tZO0izvewcA94g/UWRbWBxLuSMST0wyN5Wu+lqdl8RSjVlegAMT9nVBOM4CWQwsYPY2WFhtTPbpvrvyUcoNRqSPJcl1jHkarWrb636lLcC2GthOJlbcGuT3oH3JSbGssFS2XHaZPBnWvMWzHeqDJdYuXzluOax01uVgUSyxrWPgYY0T+SgL7/7V2Gp/X8kZONNSqoOztX6QrubH5mcec+PJep/CephgmJLTvo7brmoOoiQe/iByEUDbLrqTP66b/CWHb6U5L0lb6MxL8V6DWPuvyOZJ6+l/bMzL7l+LSGjIkJCENuA9qV5ltRszDkBKq7ZZjtV0+Oigsew0deMHQfJM+2ZDDc1zmuu4xhgg619RMPdgssKP7mzPxF29ehBNeW+tTKlbdti7JbCupXUbY9S0R3LnwIg/ArmH3KuVp/VDawH1psGHkiuZPqll8a8kd4WC6k1dBGGj4pXyH8Sy7MeyfPiPY+lOtjXJwsmpS3brykFMZy0DFCMyyKiZIartNWqR7S3mPuT8Ri+8G0WJc1ZL8ioqaWIq+C8LFatq5yMry7KifUu6Mf01c5T6ewh9PsWJg/TocjbW2NC3RWKHI/lxCNGY1jIcf0hrjX6XRUezW8vV1sh6noYYjcLLdcj+0sYkdMd/o5ZYbX6jU1o/g1+I+GHLNcI36SrSx1W0HFOuJUxejDa9OG5rRCloPlVLz21NeGvA9N+e5h5I4W+n1X41tbVP0op93fga33ZaTjYi7sqJ5HnwULynBYdQHRqyqraamWtmeh5/FK8vszIymKtc5hYnpWmobqzO5XGO23PiWftDNxoYsEHgIkryDVZblPe2Fl7pzOePfaCwgHTX3cZqcIT1rx2dbz90U+6qVnfGgiWKRo/jHuTjtxhGioBa59s3TlC2+vp7rdXlYrY1s5FhERrCMcz6WxR2yTfX2DwsyXsrrpr3vyRzW1t/wBZKaDYzqgJIK2V88D6do+L9vGICHdSTvf4Efg1nBnZdeRg8H/X8Cha5j5Ku2Z6WFq6f+Pt9mTaUvGcxByOauBvewykdVSxhZvcwfaLnfyZOe3axbzULsqqxLMfS9D0MMMMqZYa+4xqZZaNCU17bIvN7eO/+gYep6CYg3CNpLP0+IjxbIWMFnKvUXore0x6C5s9m+Z7w+/QRzy/CYPFPujAqehXWNjZbCi/1Lkz4VGVD6e+OzW+9jbPp9Ye71PI70SwpP6i4trrX6Ze5rxUwTbk4TRm2fDZ8A2pyE30H3QghyNsQBG1rUPQQQQdPkCEwQHUxrXU22IAbaY9XFkpJi44nbV4QUm4zfb0or5x7zWCd9EEaxmnHmOBBZSfyA8YD7sx2hp9RxipWb+7l111r+yf8re7OyOaFocL6UDLKcf02n9mOXYk9P8Aeyy5rLnyHf8ACPnnWtL/AL41fdsy2Pd31B1Fb7nA34GDqDubm5ygsjDzsU9uxdeYUUqzcip4yrNsrjNXmyzEsrnoA/j9SHHJB1KXlykQGB1IfHEowXsN+M4p7brK8ZbJmJ9LiA6juCuzqAkQ/d4GMIw1DF+VcqRlOo+qW6O9FJe57PzJw1NTU11PiYeiftjmuqkH3ln6GAQRW646B4aPaIvOdxFT7JZoQnfT46AwKJbqamvHXny5QVAxMFnhwuWJjWe1v3NRYUluSfp/tc/TPzLrQuxxqVYFRibK6D9RYSbXabP5xqciT4N0E9tSvoo2Og6Y9opltrXPK7Sh+raK7WN8Qk6K8o010P21k7MHvHrsWue8TJKyvIpMsp2fj8I6pZ7e9bWsVh+fGoIsvuFpmyOlT6OSq2Yi/b05dr078VKc7Mn2yLvd8O01X5jfzjwb5r/a1eH4E/fw34+0A1LMjktzcuutztNrttP8Mdi5g6D2lWQ9J9Py17fq2C9hI1B7Su0EW1Gsp7q59682xJ3LXgyG3gpzX1V+5DXoePsZw3DNQmGGKYD7mD26Jx/FwOvDj01ucIoXTiHoeuoYYDqYjbjDXSz9D1HQGKZVaUZ7K2gQFdhY1onIzfhqCcOBZSPHc3+AwZDhce4qxtDOeMx6MZVfHFkbEZTVzqX5Zm2PDf4uJ15K3E2NturdBNa6L8nUX26f0Iic2Y7PSobJEqOn4Al8b7QWrgIulqGox+uBR3LWvWxbMBk8eXP8IXc2kAqaduuA8DYWE7vNjrl146m99dzfRAWoallncqE7wtFlZrP4NT0+vlfed5FkxVG7PuceFk+1FW72Pt5V0myNWmMf47Wekr1VeRYdub3NeKgtNdN9OR86m3Gt0mP6n2g6498f08x0as03ezFVJbc3Kl5Gn09ZblDEXIv7zI2j5fEc8kMMMaCf7D5PXf4KUDNdYt3RVLQ6E3PmCwqFsKwoGj+09mrMPkYJh9bf8Z6DwpiJsNjjXMIpgrJnbnCaipyJpKxW7bfxWztNov468VXl4M3Ka1N66i2M5M5GcioduaeQ/BuM38UB9xWph9j0Kw/PUwxPk/g320moJT++bSAZXZKbffJ4uD7Q3M8UrLkGpXWbXStaA96oMa06tw67nbCsWfTsJ2XEGkB9z5LWSjeIb2ba+B+weGpqcBXO+whbkeittep610NYfoXWNQNem1r28gPyt+fjGbxI/jMVdwV7Q06DUzt9tmsWVMjyzK7A6U2cWyK61m1nc9ixMB1O4Jx3Na6CsmORDNzX4av3sZtWtuCwpPqDFzdh8bYKEdaKe4bsoY1bMWJ6D2h9/EmIvJDDDDBNfd8DqPwH7KxOwMis/bOOjaAF6qdGz3O9QffD1PQ9cTq/+MwQdB0r9oH1K3E1W8Wukyqmsy7HQRgsI6VjvVvXNaiXPVHU2D8XOcxPt8t9F/Zjtj7D8+h2fFflW9z89BDDFOj8z249f6i18a/Cr5FCvivjUENSa4u4EYhqjD9pitOB3x+kVWNzNYiNV6jXWz+qjYz7N/WsR/yFqtflfUQ+3lVjNY1qqaT7eT7Mrx1cWUrWa69M55N4qITs+KONPXw6VYr2KMFmHGjHn/JWrGzr7gBACpqU+o4xxjyar7LBo+CqXpXGXWlQV1twa9OFTK/VP3uP8vQSxug8R/KFQg2PvoRAPxj71bYh613NUfqBcDimHH0a/wD167G5v4b1NwaMYEdK/wB7N7MMPQH339x6mDrrwxqu/flsHya8X7TmpWrXs0ZNoV5UdPdoTAeMOj0I5Aw9R7k9MTpuWf42gg6DonWvgYQkxjXyZazLEAhG5wmE3bvyq5YNGI7VnQs/COh89Ratr2OCQ+5899R47+zrx6b9hG6Cbh6bgi/OtQTUqP2j5ymHgBuY9a4xysjkxPGvkTFaAwHUKK8V0U2dp2oqAF2nijirgq3XfX+vjwB0XyH4Fog7gI11A3PaJp6f7g8lG47e3T/XoOi01P6TyQRrWshf26L8iC1KYPVr6wcq7LXCpyO76h6W1bshXoBuf4zyMrv4irilNtj2Q/KniWHvAfez9+jjjNfg5w+03N9N/iVuMZuUI8BDYxXFv2M77rBWYUI6geG9T7SMdE3ZX3Cy6m9R2Dlovz/t+PEv+nuf9zYxHQfcqW8KN++txnGj1MDaLCHqp4RmDdMTrZ/jnt1EEXruc9xLlriZnJGsDzj72JxKHjZfavO3ZM3K7eDWVHz9h+AVOZ9K8ZQsLblYJQjifM+HMdvqfETtktwgRTBV7MnA+07DQiEQLucNQVmPXAsXgsx8haj3kD20C1euJj8g9vJyeT2mD2Cn3WIsent1N7Hfuw7OKj/cMghnvSyfxQ63D4fMI11B1OXOr9x8TmGU1lRy1Cd9MU6vsXhYPPfkYIZhfdW68WHUQH35gQts9EtauYN92TSfScW0eoeidk2IQ96dl5jKrocrVrPU0+em9xq4ITtZjDbOdt+AwH24GFdQLuFDFXUI8N+W9zj7dU94PthPI9BZqcqzAygsFsh9uh6Yw+yxtsYZ8mxDtZ/sfyE8vBTolhw7DTsO0aplJHUwQQr7GKsc+5gExJrpZ/jmoIFmoIvT+z89FOoWWUZBrnertjUkDgmq3S45np/asfFsrmgJVb2zYAfI+B6ald3ZjWMx2euN90zK+Lv8+WoEhXR/HswweCq2m3oWRu3wNgsXlyPg89MLHIfAxrW+j9Pqj+l0XvfjvTUnptrBfQ8gy3DurchuibmDV3785gXt+cak5OR6reDdQw4/iJ2IJx3EOjv2KTUb9Oq/Nq7f+z4D8IOoZSTWtnu3XiFBK9OPtozjrp6bn/T299Es+p7kdFxXOOzuaaKzkVs69FuZY+rlPtFsImu7K62sL1Okq2PyP7+Y1BcnGxKiRXuH26CxSGCTjB010U6hu+3x/oGdzc7amNUyzUG1p7eo8M5lIx5RTP8Ab8I+eg9i68W6BZoR7FMKlZ9x6HoYJqfIK+7HQMPTE6Ftx/047nGKsX2BPRPecNxkKeO56ffXMixWgZq2awwZFgnKVv7tSZqJGr1NdFUue124Spnt4B/byDFS1v1FZrYntNNa666r87/IPaHxXYWzXEHRSWfaB13BCPt9I/8Ar7X2UUf8j6hmeoY2Etl7WMLiAMplmL6xbi1f83UyL6p2WT1rvDDyPT6nyPTO+13pWYH9H9KuxLLm7lnDjjfhFMNQ4tXo0VCcitmfjinruMn8XWv9mYZEPUdD7fiCbjrwHX4h6nXDez0prN1j3/SVi9nbPcrN76Y9pQ3Ufd1Fxj18TUriMy31VZllRsZL8QuRCdz2/D/X4tzhucD12TPicpvqIR4b6iV26hWu2d+pSXqulq8Tw2GQwjU1qf7fgMXwK7WCceUK8GK7IYaCAS0jnx5CHoW0Jv2MPXE6sPs6BYE2GHvF6ElvJW4E39wtb7cvCm80luDztss73KMuj8RHIBO/zUWnDqHq1qlPVRu7NoeF6zKq6LxapR+mvby11LzY8wNksd9z3tGmQ6Nn3QeAmvs9HpNuUH2nqWZ9NOJM4rPtnMQ2FprfXkZTdYCv/kFy11erXZGXdX2shKO/6f8AH4E1Wd+7tqN87O2O5VYuRSylTFHvY5NHQTXsjcWs+evx+H9ZzPStlvjKUbyJ9h01KR9BjDIJak/yZz8m6L85PtXYB4CwqBawbfKHEd42JZVUzHqazrpvwMUbGtfk5sJy302Zr28U+WHHz3EMPv0O5yInejWbhX2+G/KZvUVg8pfsW2Hbzcrt1LFQt91LP+3QL7vYIZ29x62WHpidBH/x66fBR9Rhs6ieW5ubnuE6bg1BUWnYfbUusVysNdZC2US5Eh+PyamFi/dk39+zxXJVg1AZdFYfyn28AhM4zlDNc1HtKV5QjifBW+zDyh6dW/qhGMSWbyrrNsX01lUtWC1v216LVYZL+qUmvL9P+cxAl3iqkkAVRm5EMRO5A0LrCYDotcLquBnaYTHKWTKxHxrdQaC9N/kqrLR2LnrSa8iH58lqLBMakYnpmEl8z8n6i2Y5BXIP8vWrJKRyi+BuDQrDX2RyJleQ9LPamYChqb2M7nGE+a/Lf9Dfn+4K8T5b0Ohhhmvf+9/d+cxfDcV9jualpVlgOoRyjfs/sNyu2W4/vrUxegj/AOOcfYQ7it0X26GA+GpqWOen9Smh7DwaopmMi2ZLPN9W+9CYF5TscehHkRqAbntBd2K7LnuPnS/bdmbLFmLZWsP4gBr++la8jae2OhgM4B5hV/dkV/d1A3NDdgHK+7vHw1ApM7aiNfxWzIsv8FYofqTk4teWlYJFhII6ATjuBVWG7UJ3+CrQdatvk2RbJRm8rM07yegH5BO63Gb6qP5bvtsm+moBP0jOWg32Mi4JX0R+I8cXGDq2HZMTCOQcn0q/EienX2DjViG202t1XJ+3jU8avidJCEC+Ohx3ygq5ztwjUHvCNfm3475DybqehhgMHu3jry1COI6amp/G6shQ9VfU5bj1FTxbRLCD3jHZPRbWSd/cxZrpYfsLwPqC0rDYWM2Yp6EQDprwtqYNwM+DFtKgHmbRx8ANm06I4WztMsZzbOC9tjs+G5x10GhGs50N9q+Y1O7xn1LxL/dx7hZua6fPj3vs64qrXUx5N0abitMZuEvxO9U6TXRfZMOruX5Dc7VTcFSSztKOawMBBkcI9rP0MHx4YdnC69OFomzPnovsOoEPgYOmPcBVKq2sdkspS8iwTUBEI0ZuD8H9dQei+xzMdSoXc7cTDseNhX1BufT6Z1l78W2sZ+U11H3TWuiryPpeOKk549IHqtCQXU+op6h3K2Y7PlU6oy4a5EdGrPhrRmui2Gsm6u1Kq0aPgHg9DISNTXsP+h8jwEJ6mGGNFn+3kF5joemOmzZ89d9NxK+MCdxrK+LSvKamNkWMS5nIzft1PTD6v+h66GuifgwqO5bmkG0noDPiJaa4zlz1U6Zvdu2dfEpwXyKbKWrhESl7FXHLBxSsWutwuN2gSCyVpbHO2A+0+58d9N+FZLy77TO2xnwVHOduLTyhXR4ztHRTU1OEbIYg1MB0boDqJZyr9Jz/AKfI9R7a3nXSpftF5E5TcHX4/AOlJIszMcZasjVnoNx234b89ypyrd8KfrGi5rAjKqZXTR8R4anEwAmaCzkGhQzWprc48emA+Pyu+mqwSqVT67H4r6nXTD65YYnrAi5eB26P/ZyM3TWsB13voJj4q3LbiV1NjIgN1bJQMsiFKcgUt9Ebwb1upALJrz3qd0vDiv24F5T486E5ttqGOY3L+O6DEbi9fDxI/GJrw/roehh+IPn/AG8CeiNxLcbIetNLdm1fOttQjgxYrHfn5GGGGamJ1c6Tl778U/ArMhsbZ67h8V/jWBysUl2sufdXq9yrZ6jWxbuFO2RAlPFXrR8zG79MR+219W4W3+P2lf8AJFp1MnHXZygivY1h67ncM707xhvZhEfjHA0tzpGtV5oRuggmPxaXdrIrdeBhbVfUdBN/gHUZBorpzRYbMTCyIfSW4HFZVbFZEJHiPKr/ACXf5Oq+8Z+R9psTW52j593ivtNQEqcdlyxxZUh6VZJx6Pnqo9+3COMXKsEvbY8aq5We2l1BvlS9lhkH6jPwn5rX9LXlv3lOa9cF4yq3JJ/BTe9JayvIdaeMOuXlS3BOX3MndXjqBisWzv1viuBrX/S+J3NzijBk49TH6D5/26iHwf3glFfdsccZcJrz5FR+Aww9MTrZ/jgP2DoOifg5+x8dfZEQue3VGAVncuelTcLLAeR6UOFbJxe0OmDmdqX1hHmJZD7HxA3CNTWyR2o1nISj7JTdxmbct+R1PhrxHgeoggYgnbjWvH4nt+ADZK6PSkbtb5gsZZV6hakGe2xk13C+rtWfip/yWj7uonA9eLaTlu4NrrqceMJ8KTxBPt0I7Z8cYgWWfvD70eNNmj3RWv1LWtXeQVymn1tm782uxMll0zcjXvnlrslNdCPwY3vTrz5armLZ27L19xxicFLK7HJp7beB8CYFLQrNdAPIHQmxNDZrQI03BP8AbqwAQjXTXXh3B6ciAG6oS9dTXmfxHrh9bP0MEHQdF6GDw/vx+YTBoRrSYJYNp4J/Ih9uuBkis5eC1LDHtMq9PyXNnp99K24dtdr0thhvduoBMNTLAGSWY1qqFVHu/wAkA96UPK+0u/h8Q+/lrrvqeqz2ER1EGQAEsS0PWazBAJ8k/hU9aF3Yfnog+3otYza7MSys9N+anRyOmtQHUL+9VgWC9Fi53E257O5zbDFu6giGyf14f608S9pVnoAEZi7eXbN1etTf8PigFMsta071Bcwgy3C9xj1bF1XgUcrTRS9t/pxUnGZYy/bvzwnC2X/vrxUbLdN6i3B0MDane3LH5g/PGa8NQLuNQYlbcCTOcOmh9uv2zQMYaOtwzXBTPigw/I+f9uiruOSYep9uiuUhsYytozRtTl4j8R6GGYY62f4z0HgvXXT2ntKkDOfny+etILS6rtN1R+2+bWK7YJ8RMq2o1NZktRfaZl+rB0r9Ycn1fVSBzuz56AkRoNgr6pkqLPVXtX7bGVGxjRmNK07jp2SbsUD8CniD8+Woeo6CI9Yl1Brlbd5XrNZ3qbg9vMTfRf2s92iEovXHGjYArCV2cIthEzahqaghg8AJlH7t+W+uvtX5MHQHUI11VS0OM/bUdD9qefI1E3sZ+2N1A3MehKK7HNr9a15CcTBWK4Mn707C45Ys1edfUE9WYm1EtjLxPkg21wMGx4alY1G/boDo3IAYp9ppdv4fE5TnOZmLf25aa3YY7PADXCdwCAe7VREJdv2MX9rn2xg+6swxfef7QSu1SrJtj0DdRPp24j7Zzm/DU1HHCv8AGemJ1f8AQ9B0HRfAwdAdTXfhBH4S3EWbsrap0XrYeVXGb10WraVnS2ZDWRKmsn/H3avRmxEQmMCsCkz6V5bjvSvXU49kNaziq9qZ6exbJdl7asVKcciPUam8BD8/gJh8Fh+Vym4bXe+8g/Drw3019vXfUSu3U58ntwbEHnWmhy3CpH4BD+oOoYOn9AztMw4mb4ypijXldOq1KSSfJfct+0pYHG64uJuZ13NuqLylGLymYtWLa1zt1wStVNtRrM1ASpV1uF2OaPIHU2YXVp25/Y95uFofnoq8ptAqip2fGaucGY/T6Rhr8G5uI5rezIW4N2UIyEDd5N/X2T68y33ean9zj/GY0Qz/AGm4rR/Y73CIvT+gdHHqa2k+zBOU7TSvAdx/x5CEUCMlBPcqSO3eh9vI+Bh6YvV/0I6CCDokOteSqFne75ur4N463Nai1loHCR6GyaOgWVsq1G6Eh4lL2H6YzIHbWrDMN9OHVk+oW3z0+lbPR0d6mxyLZbmCHJtIS4gLj9yW49lJmPiFK7dCE9MNtXsnbuPsRGJyqoYOleBfZV8fhMPQQSteTPUeXHUI1AdR6wYwUHoBO2JwXQrEFKlTTNcfAR6iMXw7e6+p+MHJ+3O9M5DxVdtlfYsVtQ8WnE9D4ARxw86rWpY/y08Pdquygbuy9w9nl8xE6GY/+Pph4vOZGcFjvz6FelZ02ANr6v75vRF5va57mRjrbRbX2n6D2n1Bde0jzWvARvboIhS2PgME+PADkxbrj5bUxrRcln2Anf4h8sffoDD0QicAYeiy4hIyxhFE192uo+4Gbm/fpqJksinjdFKVxc8JG9TtIe57fD4mQNqPE+Bh6YvTUs/Q9BB1WDxA3NhZuD7S+W1zMvgINAfYo7nuU1EsaqFhdUJwlLrWXxHi4wqOL6oottzwtl+U9p2WhJMA3K/UTjJVUM1sqkY+OycfBL3rOFhV5s9QfTN89Mddvd6T9RM3C+heLsFSlpowsS2Gj0/GmRkB3py7KnXNx7xdxNvmeo6Y/wDksUvO20ZNytVDWstsNLgdNzfQGM+xyMHQdMestLbtDXJ2w310rYbI4nqrcGTOauZ9Aavwq9jmWdy3rSSHI341r9pOz0HjhtVgS+ijPHquKRXWGrXzE5EQ+/QD/wBMylDZZa/N+qtqJXziYpJd3x5lNzyOmKI3u2LaltGSeR8V00XAttjYV6LKqeQsGj1pynql3buTrSm459+tDBTbcL4Rr8X+vgeqHTWrxYLucBj1WObH3qNp5rU/26g6jnprprUJ3+IxG2O2R+IwTF62foeg6DovTcSo2zWpqb8BEP3WV8TNSsATezNTZnImN9mB0A2ch/pccnZVdeAWO4JmHknDfGy6vVJl+jhI9NNTrdQDkLXK6Axuyaq6bc52hyuUr7NxIx6Jg5I+osyyXuy/q6emHT3jnUJVD13KjgmvLwfpx5GHqBFbhO6xm/BbWScw0Ka8teNeSy0luUxxqU2neZVws6fI6v0x7d4mTWFfqi+7e56g66Lph13/AAeBHWn+J7zysosep7PWL66xmW3lxwbz3P7Ye+IQ1fAs5HYX4Xqo5EmAkSi7uKTswRj2q5jPwty6ylniBMbINDY2euVRf6c9F1OP28a07fwRyjA1WmzEdRr396Y3v4a9v713ARrxHgw0sHnxNiY5CtfabnMMM5bn+3htXphEq41lztupPt+AMRNbTqemuh6CYnWz9DBBNz7VEXqrFCL+UdSG8gxEH3RgKgzFvFVCRrSTj9i42+nIsw/TbqLLqLLLGxVx5Y++orjNy6KOTX1lDVUaktve9vADa9KeAYdlpVy7tuJajLXxJ+xq3r3kZCfTTcBWL2p2EMPsfSrkaZvozUjUGDey/HVoddBB5/HSm81G5hvlvxPgo/jitxGMdtl0F8XpQvKEdNwHazGb+A2kW2166KvGb0vhrpvwX9PBfuVK4GVInvD8q/YEX5zqgr/huoNcxv3posoFNPdusIL9fgdMS8VtenCyV16Vvnothes+KV7lSViCt+GP6q9Ud+4tg1Z5U5L0l7Fth8BN9A3Ev/IPOqvuG/XPj4KBGTrQ3ZW4IAY0MMX4/wBvAe07fcnc7UJ8f6/Cr8SfI9D0xOtn6dRX9g6L4tq+nzq/yW/49TiZrXRV3G9+vIzEtsx0qz+5mZNbLYwipyPICMd9cUIq9432ZL7bxqHJOqryPdapByav3UuoyKY9atg+G5XkVivVTNTlX45zrUW7CyTTl5np2Pkrk4zYtkMImteA6jxrPKNQU8tdX4148PxhDldc/brPzMVuBcaYzUHtDMYgp9ExOkSk0dtnMsb28FHI9TAITxCqXYw/OpSQLHb3lXtVSvKxjyaE+61/VekeW4F3FQVx2Lsv7HLsoZs1rKPMSxedepZD1q/d/Zuo+2d2C+YudqZKKZhWullg/kImvINqVNXbMhODwwddxWKltE+WtVzfQjU30+IrAxxwa23dUMMMMrUEEcX34v0GoT4L+NTBUzSv0/ItjYGQsalxChhEMPTFm+ln6fE3KU5m1gzwRZqamulZ4QcboV0T89QIv8Ja9uHfdoGThxEtrrqZrA0q7TAU1aKjktZZ/cXf7dr63Gux2R3cKPAmYp4uTs+KP22PylRaWIFFA3LU9sZFFNwnpa9y+xeL4VizOStep6A+waVOZY3J8LF+pdsFvoqb92fQVtD0EWsOv9gdB4DwVmj4bcdFfAe8NTLFHJs/H7fRV/jwm1Zm1Pk0dAZeOSeAOobDvfM2Iv8AxdWJqvIrVl8T8+GtwnjN9DB82f5JvVFHs3XFcr6X4/MRPuC6hr9iswqQcjMX+V6+KThuFCvU+xg+arRq5ds811q/yW1Bi9RWa66gWKCIXBwUcq1tDWoV10PjroLNgrNdPjxbyY9Neeg9R6GGGGA++/u+fCse9jcj5D2L/t+HWzajY1ZucxLrFatcjLXIS+stY0+Y0oxhkLVS1LdLP0MrTkWIVR0ErQvCCnULuMZVW1jufdl9+tNP8O+b21e0A3DxrDMXPji1p9IlZd0N1My1dwT4/MehqKPwO5ea1KGIli6ry1Nfp19ajDryWqfKANngZrq/tjTAOpnXdj0yv9voDGhEErbUGH9Xj/hEDdpe63IZHMtSrRsfjOJEXHseNXZUccbyM4LdHx2RmlTcXxP50zcE0DpWS9fjVQ9xr9OtL4+EgwrfS+a2enjVvpttZdSvgtSshHQD3VS7WFUHi3zEr7tljbh6+kIl6WL238FT7QuugsZZoWjHf6fItxedr1m5jQwYVkhcfuK+E6QoQT89B8VN91o03WjRuybCtlVuwKg0bGMNJE4TiRAYtBtR6is9HyB2s2rt2kQ/gR+MZkPQncI1+LU1D51fuw0ehhh+Fg/bqJyEP4D+IfOTa9izYEx7jW7kPGAMaGK5RvS/UK7Rn+mnGm45/jM4dtR4L0UbnDccdqH5a7Ve4DqdrkBQ07K8sjlW1WtvcnaigKGJYgbmteONf2sf6opPqGJx8rstkYS3DwDJgK2bYxTP2A+NDRjEBKibaDWZqLX7cNTt85iY/wB99fv6q3vl2cq5R/NWZQvKXLxbxs/+KehUrkZHrt3O/Dq7t93E2mGDpRe+O1pDsOg6jotZafrCST03DAxE7zyrNtrn1vcbJ7T2Y1fM2Yblmx7EOHkNWM0m/C30xWAbqo5FexUtmSxONcxNWdVj4t3qT3vXaGx77mW/6prVelJ9P7vQ1U5bi/P9yg/wt8+Alh21fuy211UsfbrjWmo5uPZdb22UQSuvcFBE+mn0pE7XGD7JWi2S3IMuuLw2ERchkJ9Rbi2dY4NhMDQcDBWCW6WaII11q/yZFCvKsWoixFrsG1iOsOKHb6ZlhWI5rIUZCYlfbu9Tw+UZdQiH8Kn7Z8zWvwD4LaX8CfvkrxthhhjxYPnp/X+o+fwfI/Cg5NloKQ3v0PTlH94YZiTC9TfDmS9N07LWI1DJPcwdB0SCINtioldl9vcs67gYrDkWMFgRcnCSrlGxyGOqySWIYTlNgyyvR10WvlSiMjH7W3A+pgW8cj1j036diIB7YNX3XW967xru4gvXvmoK6vpvHGYVXdtxqErmQ3LIuZMmzKGulTmqzJr+7FvFEyeNuP1XEseNjV1SnDXPwmxnpb0ms4WNc5ybcTFtoVO4VYwwwQQLqEa6CamoBPZIXP4qBytt/YHjPTbi6ZdvuueRDlV3D6Ku1x6Nbuv0rg+V6VdjntNK8ay52xPpq3+ZgYxttyb+9YG1MXI4Nm0FCsYE4gbUFpgTU17oRt00AxWc+55ca2SzQLeynwoQ2P6Rn/xNk0WS30jDte70HFtan0Jayvp6A24yJX2t1ZA+1k5txKJau5Y4XwI14A6nz03N+FpcEOeO4LSIbyxS5t4uUqR/TxaD6YxmNQa41H3XV8671HIiMPyH8Go/ufwu3KGGGJwrGVX3KVg/bp/R/CBKVTj+HHr7t+Sd2yqvuPcdv0IhWFZh9ANw2NWOTszOl7Giag6LAZjkI+bYWtPTfkjnt1kiy13aa1E94fmCFyZ89FJEM2t0NFkWlt0rxlvqzLh35xtNV1EyrLWf8Po6g13UHuUr2mZizWWp2MK8VXZFyWKFiNVSO+tkbszGItSxHrb7oFYyrBynrxvQeMz/AFY2z0t3B9Uy8XHX6NeWdn2Zb8zDDN+6Dc5a6CFYo5Ra10bAJyJ/JX+9n7SlyjYWTxsyME8/+NyOLK1Z7z6mL6xdREz8LOrGKmNTnBCKsBnn0+JigesVLL6DRZFOjS/fqNRWzfOunHa6HjXAdViJ8k7ToPv8atLUD7k78cLjRTRkMrHKKlfUbIbskinIyK1xsrvBl5C+0S9uTcSCz6W63QY7/D/fRoTBEG2yG5W+AMS41tiep8Zj5asxaoy+moNafuuUI1i7jJG/Cr+zV+x8V+T7HU3+JKzYasbvRho6gxxXAlNQuyDeVMHzOMTjG6a9vISppYNN+DBH32/tXS9pGBbjUMDs9ddDsTm8DWcV5GAdB7dKrUWG2mIaWm6lNlgtVrOSfgVuM5kHl78jA2j7PAIVGup6i1lmLQbarckmJu4GAbN1DBIGnDc1Na8fQ8laLzhqT6ktYoJ+20cMPzTKW6V+ju5rprRf+ZvqluZ3x9UtVTXO5sZ8hc31H/8A1cDezQwLNwQQQDcf7R+ZVPKxeLwHUbZr52Fce7IqlOTZa+fgviXdfTPXTjLkYgzPUPU8+vtz+vs9R9PI0RpZ6anesybEsWqziz38EUe1ilEiibh6A6LL7SrH5CxOMJn9ah64mMcmzh3RVjiprMe0Hm85PrByysVvZcoPj3XciTqD5vs97G2fEe8I14HorajCCUf5bQQ/nXe1Rq9QW+XO6yi953tQory5Ckea/DU0I0fH5FdcPt5nrdhin03Eu7Nj/tS4w6DyyG4rxVeaIjbG1PLoDG9zFb7T5KJqPVOwY1ZE1rw1Am56EiV2N6clsOPlY73+ofblD7mmuupqFYg1SF8tRfbojQ/h/qa6biNqIVYri82tXix8cejutkvU7V49lx5CpemLndoXKoeD2ilbJdQ1cPh6XTytxvWabm9RKZNORUalzOa1+Gt9FUvKcJuZ4Li5Xq9r3MxduqsULg2DoUMIRTvkRB0EX2j64eWvHU2ITNx/uXpj1G3HosRV4h5WzJdh2fUJ61hdtJuD3nNl6sZi5DYt1iJdCuzj2oFtpNbdPg5V3cPluIvIM+wBteiwiAThPTMhMJbLsRS2dqV+r2LPqcfLZ0NT+6NjZPGE7rPt0ZuIus3CfMfd46mofiY5mQF8xOOxvUpyisR+1BcHqZuBF3da4aP4l1bHXieqjlD9s5HfvYvgPCoJvIubS7L2LVRZlZDZD8zx4Ezv9iNcbZ7loF3HXUPW5RrwEq9jvuNxWpfdWDK0tqrKtWVK1bi0pHQVwuJVceSZ1uPY3/kRsFlVHqC0ejZHDOwrMV+JnHpqGfMu9qxOM4e3TXt1EPz+AnfnSxQ3sGhQGa11qrQK7d9rGQGnIfGJbZ6n3r61ZBSNWrAjXQLHuCVciG9Fv5ZWSa2ozS1g8cW2muN6qK61y7la/wBYysirwHRH4GxR0cnUEHVPmL7r4DqYs+Jvqeif4+noXvdf9l2/aj7rMBAp9dsbtdKf8j/tE/dxrpQxS3J/yiVDZb9pX/kyPZvOr9Iv+MfMHRIJb+x6GA6i3d5JW/bap/c+5mRfuM34B8n58V90lX7Xfseo8Kvmz95v7FYz/VPi/wDXoYPOn981QG6p+p6P+vnUA1uOoGbk/wD1YIH1Z+6y/wDbUy/sBExU29vtYG3P/wAf9T+vSz/D4J8sYPZUYmXe0/tmMLFgWM3ORIM3o5TE9AdQZNswMu3JZMDHmdUldh+f7f5X9s32vixP1Ye8T54jhWohRYfYmHxP4P6n9VE7uQKR79K/d7P23xxYfH5rh61n3uG6BMVR9P8AJnpP/wBGSf4rPfFbpjIHbIQCvqvz+L//xAA9EQABBAAFAwMCAwcEAgIDAAMBAAIDEQQQEiExEyBBIjAyBVEUI2EzQnFygbHBNEBSkSShFUMGUGLR4VP/2gAIAQMBAT8BUiZ8QhmUzjOXhN/apvHY74lN47JVD7RyHYMzzm7lQ8L97vch2nnKb4pnH/6V/wAUMhl+9kEch8imp/Cbwgpfm1FBNUfzesJ+0TviU34jsdwhwvqSwPCj7fq/7Zqwf7BqbxnLwsX+8vpcz8RD69yFpK0laStJWkrSVpIKd4VemkyN4fdZSiwmlTNLm0FB6NnId/Lk4gKMENyKGQR9msvOdbIdgVZRscy9SY4BagrR8rDDsd7Tvmimke1w832Rb6ivBUZHGRWJe3hYL9of4djuFEFhxTpAfumenlWFYVhWFYVhX7EiZ8QhmUzjOb4pv7VN47HfEpvHZKofcHYMz8s3cqHhfvd7kO085TfFM4//AEr/AIoZDL97II5D5FNT+E3hBS/NqKCaovm9YT9onfEpvxHY7hN4X1JYHhR9v1f9s3+Cwf7BqbxnLwsX+8von7J3cO/TRzqsya3QNq8ms1HUUGNG/a5C++8rWpF1IOWpalaCtDIZWnysbytWo6kX0bTZHGSmlNiL3erhNjawUEQnavBTQ4D1FBoHsXk4eVe6DADfcfsOx7NYUeuqKFp7dQpNAApeU5gPKcHR7hPldNs1QaBt5Teex3C4UsZd6mcpsrXD1LqR/ddSP7rqR/ddSP7rqR/dDS7cezImfEIZlM4zm+Kb+1TeMhk/4lN47JVD7g7Bmec3cqHhfvd7kO085TfFM4//AEr/AIoZDL97II5D5FNT+E3hBS/NqKCaovm9YT9onfEpvxHY7hN4X1JYHhR9v1f9s3+Cwf7BqbxnLwsX+8von7J2V9g9126B9O6iu1KaamCh3HJ1pjdAR7CVatOdQRkXVWu0H0Ux9oFc5hbp4NWmxNc7W4KbTuAo4eqFBG6B/rHKO3GRV7+0M2O/MLfaJruc08gptOCoKSEOOpuxToncv5+4UNtdZKBtE0h2Ma04l4/RdNq6bV02rptXTb9vakTPiEMymcZy8Jv7VN47HfEpvHZKofcHYMijzm7lQ8L97vch2nnKb4pnH/6V/CGQy/eyCOQ+RTU/hN4QUvzaigmqL5vWE/aJ3xKb8R2HhN4X1JYHhR9v1f8AbN/gsH+wam8Zy/FYv95fRP2TsncIHMZXvXtUqXT/AFQGlad7PYRaGZQR7SiUXJ5cR6Rf8E9s7v8A6z/0U1mI/wD+bv8AopnWHLD/ANIE2mgg8ppyBQKainc0UHFoIKZEZTugA0UE4WKUclClrCOo8JrCPdkAZOH/AH/2NZVlK3WKWl0Z24TDqHYTpFrC7zyP+6tWr9u1IUw+kIZlM4zm4Tf2qbxkMnfEpvHZKofaOQ7BkUec3cqHgr97vch2nnKb4pnH/wClfwhkMv3sgjkPkU1P4TeEFL82ooJqi+b1hP2id8Sm/Edh4TeF9SWB4Ufb9X/bN/gsH+wam8ZzfFYv95fRP2Tsn8J59CgxAeAHcq0Mh7sk5LQI+Smt0iu0IlBHInK0SiiUXJ8lL6Q7U+X+n+c8X/p5P4H+yhlKjcmlAoHJqKJHlGPyE05HhObqUI0EklB6v3XsDxRUBLfy3eO6/dvJwUXpd/HNxDRZTXukFhQijv71qQph9IQOZTOM5eE39qm8djviU3jslUPtHIZlDIo85u5UPBX73e5DtPOU3xTOP/0r+EMhl+9kEch8imp/Cbwgpfm1FBNUfzesJ+0TviU34jsdwm8L6ksDwo+36v8AtmrB/sGpvGc3Cxf7y+ifsnZPOykPoWIeQ1hCwuI6rBq5TSj7xYNeru8qaxwhwjkUVaKJTinFSlfROZf6f5zxn+mk/lP9lBumGk0oFA5NyLQU05aSDsVI6gjiBH6XITaJf4qCcOJam+3pW7VqBTgWSAq7zc8NQB89tewT90SXO2U5lY22Js2I8ttdU7elHExj5bISsIsFYr6iwSaKsJuKxj+G0FDLM0651+Li+6ZimySaGe51FJIo3ekJpVoZM4zl4Tf2qbx2O+JTeOyVQ+0ch2DIo85u5UPBX73e5DtPOU3xTOP/ANK/hDIZD5ZBHIclNT+E3jKX5tRQTVH83rCftE74lN+I7Dwm8L6ksDwo+36v+2b/AAWD/YNTeM5uFi/3l9E/ZORKkOylf6FipPQxYWYaAonyP4UzcV82O/ooMV1D05BTvdezUUE4gZXk40U71OTnaRajurd2Eq0U4pykX0TmX+n+UTWWN/0sv8p/ssOdkxNKaggmZjOTcUpXHXTliWaQJEw9R+tnKhlJ2PKbdb91q+x7tITcOBuE6Iu5KbbVqC6kjz6Amsrnnuv2QE4KQ6RQ5WmmoMDgnYdv2UeEaD6ghHWy0CqWJLYWWOVgv2/9PckmJKA1qN2kUUxBBFyZxm5mpPw743axuoZg/bIZP+KZx2TN2tQH/l7VL9O0ZuFboG8pJA1Qg6d0RvaDr7nBAKsyucnN1CkBX/6Ui0BkAijsbyGROkWU0eUAnNtBpCop7tU7WDLphAUiHCdzI1Bh+n6id07ik0bV2B2selDZfUY3OZqasLL0tnBRStKLgBaOJiHlNeHi25YqMYyemnhYdj2s0AcISlvyagQ7cKSZkfKxGJ/LLg1OwDprLjz9l9OjOGJhcnJ+4U76bTkYpMV+jUGGEgArAu9OU+GEu42KGKMO2I/7QIcLHuuAdyum1GF4dbHIibwupOHetiZig35bI4jqvEbMyiiiUXBFPUhX0M7y/wBP8pxWoL6g8Nwkv8p/ssE70phTU0oZR9pNIN3sp0TSbUzNbaUYdA8FpQe0+ocqN2oZEq05Aq6Ue++b3hotMf1iHZucGKtfyRj22KYXN9LvdcXfupst7OFFPlZHu4p0rX7MKDSX7pw3ATe3FxdSkHfg5Q9/Cjnjk+JytWVatWrVq1adRIUaAB5UvVjH5Tl/8viI5A2QbJrwRYU029KH42gex0QHramyg8oZSAnhN47HAO5WgUmuvY+1+97LNrClk0KGIvPVf/1mW/ZC+4SDXoze8MFlN9Xq7B/vS7x2yNcR6DuuqRs4IWee4ixSDXM4WpGSlRf8u1xACZG7X1EZmNNP2QIPCnl6TC4LCxafV90Xtahb9+wDVuVVZD1FY3CsnbtysN9KkaLkemYaNgrn+KoUmxNYSW+U6IO5KZBHFsAg0DjKePYvj2Kh6bRq5Knb1GUmUGjSpKTjSkka3cqRwxLxGOPKlY2lINLgsE8AboyMHlXakYHiiif/AI99/uH/ANJr2vFtPsuV9+KgZPGWvCjwGKwwuM2oca9h0TiirDtxkU57W8lOkselM+6cnKXhfQuZa/T/ACtN8rpj7LHADCS/yn+ywTrTU1BDKM9gVXm5T05+lvKbhHeSmxOiPp4TpQNkZCeE1rr1OQcW8oIhMRRNIW93qQaBkTSaL3KItay35LqB3Ca8O9wttGwPUFLBHiWaXbhRYGLCO1tTCCqVdrtXhCME6n8qSFp9Vbp0TXeEcLIPivw06/DTr8NOvw06/DTr8NOvw06/DTo8qNWjIxuyljbNdBNxWIwjQzTYQxLpHh9KP4iu50bX8oslh3jOyZPqG4opja73t8hMdq9lhsk+zO4s9QRAkG3b57i3ymu1IvI2butN7lDs8/73SBx3EWo5bPTdz7D+LUez+4Ns3lLE2ZulyZgWs4WJixDSGsfa/FytjstUEe1uNpuWpaS75Zyv0BQucOU1hlfZ8dzz6gMybdSfE1x1eVI9/wAGDdNEzNi5GPa73UcgPpPITwHDdDp9VwHKlUnIWC4RYDyujXw2RnkiNSC1L0sWyk2CfCG4Tf6KLEiZvp5/sp/xEbDI13HhYbHxz0Ds7M7ZFwbyon9TkKu05SHxlJG2UU4JzZMLxuF/8iwhMxE2IdcfCbha9TlpA2Tn6TRTk5SlfQuZf6f5zx3+ll/lP9lg/wBompqagnbhQCsgN7yHY7hRwhnq856GO8INA4T7JR2R3XUF0UMpRbUwbZzzshHqUUrZma2Zc8owMKEDozbCg8/vD2jnp0m2om+UHNbsue1xpNJPI90ndMK3K6albJG4G9lG1svpcpsK6E23yoT+WED3lnkLrDhNdqGZ7HNI9TU12rvkGr0prRGNI7SL5WmuEX1zkPXLXgJsLGG29t7q+4s1EprQ3Ydx5/3jPzDq8exIP3xymvvvkNNTdTXD0rW8/urq1sV1q5XUaRYWvUjIBsEZ2jlA3uMn2dTyjh2uh6QWHno9J3Ka5F+rZqrsfCJHW5THRHso26WAd0oNWEDYyZvupDWyDt9lNLodZTXalivyyJQiQRsp/RO2T77KRTfILA8ZuaHJ0AKLXNCw7NLE+iKKOGHWAKic/CsqXcJrg4WFLKI2kqOSR7bIQasQT/8AXysNM6Rvr57ZfsviEwWdbsypMA2WbUOE1jYxpaiinAHlOTlIvoXMv9P8543/AEsv8p/ssK4Cak1BBBE0oTkRZ7gdZvwhmHeuspG76lKXAWEybw5BocN1qMTtJ4KsImzWd0n/AJ7y93CY8wn0LD4hst9rdjQ9i6W7lo/VaZB+8gH+SjaoeU1o1WOy/tkVaFZ0qVKlSpUqR5UQTWhBoTowQmNDH9J3B4T4C6MtJUD7YB5CBQKB7nxB4UYMXpKvvpA33Vbr7PPYRfKZt6U0Vv3OZqVUgewmkw5VaHYeEDY9qR2hupCd0n7NOZiXDZ4C0YprfnZTHYj94BNMnkK3/bMEXp73HX6QgA0UMrXOV5/JPj1BNd4KHY99JgPycmutxXK6Lb1eUWAH5KKGt3Kk+Jr+V+DafKDABQRYSKtPLYWhl+VeyxEDnu1sWH6pb601tdoUtOcGezTn/oqoUFPfhNFOpPZ1pzGfsmSAP0rGsdNEWsURuMFTxiVukpkpFxP5Ck+SwPCHYfVJp+yGyxw1N0oQk4kMYdrTh6aKcx0TqgPP/S/C3u7cprnR7PV/Zad1JC5j+pGoJ+sP1zJpUSbRLnP09hXUvhcIoopycpF9C5l/p/nPG/6WX+U/2WGIOI0pvCCagvKi73b+kICthleWI9JDgo5BI2wiLTmp8VlMXKLQiw+Ew2Mp5S86W8LpE+UQ1jdIVU/ndMxbmmuV+MavxjF+KjdtaY2t+97gwWU0ucNRQ7CLXxKCOTj4CArPpNXTaum1UG8LWta1rWta1rWtavdRlNQtaig0GTWUDYWKxD8NMCOCopNYtAoZDuI0cJrwV4QPaO4bZc97xw72qzc69kB7A7q7Jr0GlCHXvkSsSx9a2miFDrrd1oOXKpYiEvFt2KZjZMOdOKH9Ux7Xt1N47Hb7BNYG9hYEARyrVo/ZBPe57umz/tBtCiq0q8rCMRlkDvATzQTTRr75ONJjfLue/FR1iGvT3yOFRhAS+Ubg9cf/AEoZmTN1N7ZsSIjpaLKiM4OpwTsUWH1tX4iNCZh8rUM7RNK0FM7SFG7e1hfViHyf0UTdU7pCnIkRSafunbLH/lETJz9VFYHjK82n88j9MsbI2Nup/C+mx9WTrHxwn0Gm1gSJAXjKkbYbC1DYop4OHm1t4KadQvKiXWcv3kcyo2eolHIopycpF9C5l/p/nPG/6WX+U/2UYqW0xNQQQTBaGbhsg7VwpH6G2o7qz2419jS3lQRS1uaCjMrRzaLrF0if0QcR4TJL2RVgo7bqeU/FqawAIAyO2RwzHDdfgIdWpNw8cfxCdCCmR1yE6GN3IQAYNu6SZsXKc52IJaOFHYFO7ncJxLh6V+felesJoJdZ7iaXy3WkrSVpK0laStJWkrSUdVqOYtNKOQEIOpA2nsdyxRT/AHWLAkasBJbKfygUCh7Ghv2V0ayB9klat6Vew/dpUZto7fPfVD2b37r7JTTCVFIbQ3WkJw1LphEfdA3m+NkgpwRZL9Ndce8f2+ygxLJxYyKa2iXHvdwpsQIW2VBZbbuUAgKzcx3IVS3uumAFDLod0HJwvZCNoNon7LTq3ci6ldoO+6BBz1b0pG16lpHjJzfKlYYPzo9lBM2dgcM5ZOm0uKwrPR1HcnIi+V0WHkL8FFdowRkVS9UJ+4QmYfK1hfidTyEHaldLGTgbKCWwVhH6BR8qJo1EpyxLS5np5TXa2ByxMfUjc1NdvodyFgdx2F7RyUyVjsQRe64X1g/k19yvp8fThCxZPTNLCRdFulWtQRNonSNlHig46Sp2620mSS4V3q3CMgLdQUkztJLFFMJR+q89krtLbUQ9KciiiinKRfQuZf6f5zxn+ml/lP8AZa6fqCima5NQQyjR5ztMkZvupKkIHbPIW01qbANVp7aFKNtBfonDKkxt8r8O0m0/U1p3TPVvaLv3bTJWtdp7qyuu2cilGA3bLVp2dnYXKLbFFQn937ZXfefVt7RG6ZHq+QQgdXpTp3QEByjxLXJsgU9A2FethBWG9D1G+wgU0+ycx7BTd9/ZIsUom6Bp7HvDOVFKH7Hnt8oco99ZPkazn2nt1t0qOAMzY7UL9jQ29QUokLfy+UxkvLyo5g8fZXfZSKlfTSUyP8RH6k0V3kKWHXI0p7Dp2UYdVOTWBo2RzIHKYCFzk9h1amqjXqKY/wDdKpUp6c3SFhXTYTEOYBYUWJc69TCE7FMG3ldN+I+ezVVbd9ZY0iI6goTTbKmm6bLQh6w1FNdoaWeVPG2GFv6LDvBdScppWx8pj6dv5Urx91iHNZNqHlfTHa22M3yuedMa0RwN1zFF7/qEoMLaDfKlxM2FH/kDUP0Tsa3EYgSP4X/yDXD8sf8A+FC3EYt2qTZqmE8R1xm/0WHxYn9JFHIglOjB5TsMDsEG0KKmApYIuf8Akv8A3VpFUn4fy1NFCsjlMNTKQGkUiiiinJykX0LmX+n+crX1CRrcLIP0P9lDC0t3QwlbgqJ8kezwhI1NeFrpRP1cI6zwELXqK6Y5K/DtDrCkg/ebyocQD6Xc5Xakf026lEHSnU5Nbuni3LgIJwR2U0ugbKHhBY5+mOvuo2ekKJtklGJruV0QPKDSPPfddjm2Ezdu6YiLX7IbLnnsotn/AI5ef9j5UYC0A7J0PpUkL4zbUZ3x7lDHdTalHI0+Uxh+TVG8ACkx9pqHsl1GlaHads91x7W2bnhgsp8kbfV5UYc9wkdt2ucAgfZKkCabHtDKd22geU0UPYJ8ZuaHcrp1wVafO1nKE7PuhKw+U6Rn3QPV/gomlriPCHsP+6N6dkA7yvUncJrvui4Bcntqk9geKX5o4Ke8gXIdkNUh9OzUyINegE6MOUV1ROV1ygb7/qw06XpmMAbuo5n4x/6L4+lDDMEraT2hwpaQE5toxMB1KQatijhWPOsqeJjqbWy+ntbE2grHKxmPY302v/kJpDogahgp5yDiTQQkbFUMIUmGknFSnZYH6cyAvDhuhG+TEOwvi7TQGigudliMPpd1G8pr7AKJTn/ooztZCpz3epaAsTC6Nwmi5ChxLJxtyuVpdFuN0DqF5u3NK0ciiinJ6+hcy/0/zlIwSbFYqNrcLJX/ABP9lGmqkwWN06IHhMiDm7rDRhnHa7LHEGevCbqJ0ajSbhpYPV1a/ihipcQeiPUPutcrG+ln/tHE4oDZn/tN+oSA/nR0o/qeGkPyTMXBJ8XJ/wBQwreXoSxzDVGbRd1cVo+yiFZTH8RixH/xWnZQtqz7RQyJF0g/1aSq3W44Vp247ZCA4IH/AGRO6jTU3Yp0LZOVLgdjpQwbeDsVF9PobFfhnRjZMfoHCY4HhMJTPaI0Gx3EIfZONL7e0+YGTog7rFtLWNITeFPP0aAFkpkRd65V0Gh1p1WGhUi4N5yr7otCbxkdnIdxKO6YdqV9xylkETC8ofUGHhS4ictJY0JmMnMlyBRTam2gbV9znU7vACMbPsg0DwnNF6kPeci6vktI+QQcDlXYdt0534qTVfoH/tAUFKfDUEd1I+TDyavCa4PGoZFtbhdTw5A9uMDTCdSc4grDYgfEBcuUbT1iTm5OTlYtzVNyFPijBK1v6I/UXu9PhRYSTGNa4CgFFhHtO7v+l+EiJtwtAAcZPa7ctUMIa4ynk5H9FsVej0otd4TDr5V06kRvkW2FjcOWu6sfKikErA8ZOGn1BXfCdsLTRQ3yKKKKcnKThfQuZf6f5yZdkkrGb4aT+U/2UaYnKHbYqlv4WFvz2UncZfUrbKR4WApzrd4Rgl+pzmT9xYbCMw7aCpaApQ3TSd9NhkHCh+nRReEcJF/xUv0sE3GaX/x+Kw7tcbrQ+oSYf9vH/wBJ31yP9xhK+kkzSyzv5KkfoaSod4x7LpK2Cc81ZTX+E4nwo9nepY7UGhzE02LzkdoFqI6mA9j4hIbKZYOl3YPe8qNNQQCBCfAyUbhdJ0P8FLvsF5orpXuFFqbymGxt7ThYTXeO20UWOcmk8O9kkNFlRQO/EGYnlOFtorqNY1QAyuMrx/BPDnbBGFp5UpOzWDdMkkkHFFdPV+0y85DNrtXc91IO1boy6XbK3chCYj5JswJpDIyNC6w8Lq2sQ3rRmNSfT5GtthUck8ezwQsK2Obh1ofkHfhNdq7x6pK+2V+wUPZBvtKLAVJEQ30qGTbdAg9jntYLcrdiP0amYeIDQxYjrBv5KYyhvmWg7FMaGHSMtITow5aXwnbhNeHbjsxLTiH9McBTYCOVlELEYd+EdssLi9JDXLDayXa8iinJ+6nIjm1fcKfG2+oW6l+GxGNeJNH6KH6PiHSjWKamNDG6W9zgWnUE12oWMiLTow5tKJxc31chEaX2pNng9jgDyq/DS/ocimu0nSVI+hSa8O2yKKKcinJ+1r6FzL/T/Kc50pofFMaAsZ/ppP5T/ZRpuVaTaCcwO5WGYG8dr+EDtaxknVlcPCwmGdNJ0xx5QboGloXqK0nyVoHlaQFS/jmSBynRsxApw2X4WNpFBMHSxmkDYhTi2rASHT03cj2C7egiwjcIt3sIZWi0OGkpn/jWHHZA3xlLVbqP45Eq74QRbvq/2XlRpqagiK3CYbCoFdLwnQ2bpNbWyfVUoftmM77ZG2FDJqFdjvsE0VlWo9vOZNCypJGOZr5HKgNs1nypZdDC6lDGI2WeU02iVbnnZNbp2R2debj6qTfSvObBTyO0ot1Jzb2CEGhMJqkY75TYK3CYXjYo6iukmxlqARCbZVBS4Bjjri9Lv0Tvp+Led5VD+Lwuz26h+iOOA/dP/SjxccnlXeQRGyg9QLsii+jsg4HI7ISNOy6gXVatQdwh/sCLXT0Gxwg5p4VlWjtuVo6h1OTmjV02hNYGCmqu0kA2e0xVu1Mk30uykeGbeSmx6QqpY6LU1QwW4JrtD6KvKSRrOUcQHGk5S6ZX19k9uk0FgePZ00bHY3kp49KdT22gb7Jo+qwtUMz/ANk8bhfmu/RdBp+RtBmjZqlBPhNxgDunLsVyiiinJykX0h19Vn3r/KYyssZ/ppP5T/ZRFNQXIUe3pOUHdKdMdBSYSCJt1usHhxAz9T3uIA3UuKMfi1C2WT1y7IRhUpWzXbCpp5I5GySN3CkpzbCh1dfbuuuUX6jTU2Ot8qWlFloNrJ8YkFFD0fwTpdIshH1blGQ4SQH90pmKieaaVz/tTyo01BBAIkxG002LGTnVSjkDyR9lpTW0fYKGT05xbJqCjdrbeRQH3zGRNBCQI7q15XJWK1GMsbyV0QBQ4QAApfUnODGMZySoQSz1ZP1D1NQut8nnjNw9YKeCRsgKNq6Wryjqa7VSEzDwUHW5WpX6BYUWIa/crd38MiAmEFxAVDvItVp7pcNHN8ghFJE2mbr8WW/NpTJw5B4WH21t/XJzq5Tvzd4kZnxnTKKX4rpiymzMeExrQNstKcWx7ldQIH3i21prhX90+Nr164Pkdl+IYPkurrcB4T3aG2o2i+p9+50rW8r9sKI2XTkj+Dtk3EC9LxXYWWmfqm+qZxOeJ3aoIt10tXKYdGzkU5oPKfCwp+HH7pTIC1vKkbRWC49knsqjac6xQTNozaYRp27WWbJy83ni8GycbrDBw9MnKcw8hXXyReE5wT5mDypsUw+lh3X/AOPR0ZS7nb/OeM/00n8p/sot01NQRCsjlRSUmOvsNu2CmPqa1Nis6n5WryLgOV1mfdW4/FGMu+RQFdsjBI3SVBGxw0cEJkLWcIW3lBwy3RceAumD8lVezJYOrwv2z/0VKeMO5UUbW4jqeFYOYN/7IndRpqaggi21CdJ0ZPOiQWmno4p18OQNoe24qqNrZu4y5zJrMhPjsJpcx1WmutDkph3K0p/GWK1STMDeGndNRNZuOla/UM71SV9siaCfiASobd6jliMMH+tuxX50IDpBsow2QamlSASERtTWhooZu4VFsgPY4HkJp1C+2yDv7DmNdypMNKHa43f0WFBDTq5yntw0NUTBG0NCe1rxTgvwm9Dhfh/uiHMZbCmvfIOVUo4chF+89XvQRtu4Qdfu12SN1jSU2NrRQVDhBpadLtx28Iku+KEY5Ob42yCimu6A0vQcHcZEhvKOMDnaIt1DHoN/fOfhRMXCewPbRWp0DtB4RIIsJydumutql+SwXHsv237HN1ClBGN7UtMjKiJA4V/ot8iovLft2lObaKduinBp3Ty2iViIy13Uav8A8fdqEn9P854z/TSfyn+yiTUEFSeNlPOcPprysFjBLseUHZFA0EzU+cuPCtODzwtDzsShGKorQFob4CbG1vA9kkR4gfr2lwCb2c9/Kw7RHbbXUY3kqbEgmgEHxv24UNatjlyqr/ZHlRJqCCCCeyjqCabU3hYmAStDvIWHO3tE0jIV1Ai9NdtumguObntZ8lJI9w9I2UMgeEcitHqUMelxJTfJUXxvJx3ARTZg7TH+87/0htk0ZPFhXoPqTHWMmtp5Kc8MG61OnP6Itayjk5m2yiDybflMw4f8yLj7KFulnbKDyEDY7KLTYWoIEHjN/CB9i74VaSrI5QG+dEbhdY8EJp2RATnhgtyaz94qsh3ecygO/EMdO3SzZQamN0yHdPmDdhymM0jdGOvgU6Ux/MIODuF/BV9+6lJh2SfxX4t2C9GI4+6xmN69Qwncr8LoA0+Fg5LthOcgsoNoZFPaHcrpOj+JXW9Wh+ycVdPe1S/JYLjs1LUrVq0/cKM2OyJwDi1YsgRqH4Dtr8zI5FHIp508J+24T3aTX3Wgl2orFMtq/wDx46TKP4f5zxn+ml/lP9lEmlBBBEWvw8cla1JhGw4gOHxP90xtDnJxoKMatyqH+wxkTpW6m8hR40cSCk2Rr/ic/n7rmsc6nBdCIGw1aAjA0pkTYzbQtQ4PcOyyrVq1atWrVq0Ruok1BBBBVYTXaHaFLuNk021Yc16UOwdrm2EZekdKM0R5QlZWyc8FMJbuus1dW/ihh9Ttb+UG0pGFrgWq7F5tbRQHlPHKYNLayO8gU87cPGZHLAu6k3U8nIpp2y5U8ZpYWV2khAUpJC11NRie8+pNjrlPFjPgp+KjZtdrEYnVQUXwHa4bKH4dxaFQbutQR3CMrWHSU0jstFVq5yxEJlGxWHGn0vO6NIucEwudlIByhsqvlCOzuh7L9vUrtcewZHTP0s+KfKyMW4puK/EPLGBRwtZv5zIsUV0Gs+Gyr2KUzW4iSvAX4OONwe0Is0lSN6LxKE1weLblWRRycsREJWol0WzgmEF7jal+QWB4zcUXLUgVatXsojQ7JmG+o1Yh/VpoUQ0sA7a3tHI5HIoqWM6tlG3V6kVKLFL6K3SZf6f5WojhBxKxn+mk/lP9lGmoIIILSXUpsM+UabUWqI6Cgn8UgKFe9eb/AFehdNunSsRgC86mmk12Ihab3TMY+Qbr8TTdlE7qttce279oOx1+E0XyqVKvsrcF1BdFX2l1LUtS1LUtS1LUtS8qNNQQTTaCCcwPTr0pgTndLFegcpnHsl1KbCiY6+EcM5pQYUxgLt0AtKDcyr0ms90FV5PeIxZUU8ZeQNysRhnYk+o7JmEZhvWxNdqFolN4zdwsKx3Uc5wTjSYw8nsYbG+WLceAooG1ZUsYds3wo/gO13CwxsEe05oeKKYDGKpWfstQRJ8LS/7qkGqsnAalQya2sniwqVKsrV5V2kXsmt08Jood+Iea0N5KbhpwPmvwA1a5TZTIxE3YKOQO27HcIOsexi5TFHtyVg2sEelpT22whSW+LZCLbc2i5sDmgee0oopyeFiZm4WXj5KR80rraKCwIxAC6ro/2i6rTwnFErWmvWtakXbJkgTZLWsJznEekIMkI9ZX4Ng/MBTDbe2Q1QHceEUVIS2yobDd05SL6IL6v9P8po+60rGf6aT+U/2USaggggo8nEVaEgQ7Ccq9g2gbz/8AszoLpMJuk/DMcg10Dx9vcfs+0MyrQkBRlY3ko4qIGrX4iP7p0zX/ABTDYzLgFqvj2vKjTE1BNNOooIZOHldStk6UamoexaHyycy1SlIaFHuLyrsIvtB9VqbGsjaS3dMZJi5urM/+ihiji+K2R3FLDk0QU2zuUOM5JC07KMv8hNLnu37f3sp5tHpaLKDHPNuUcJa7dRu/d7Tuh+U//YeexwBTT4Q/2B2WgfLyuppFuQIPbK5wHo5UUAb6ncomkNuV8t/CLfVq7PkUW+QgfB7Bl1Gl+jytfWmLfspYun6mcrCzGaO3coSytOkt2TeFPG6cBrVEbbvyjmUUUU5YstlxGk+E9zbACwG4TgDyjhoz4Rwv/FydBMON1+HnO5WiWIrr0aKa+1ajaLTOOzT6aWHdzGeR2Wt3WUOMzkcinet9eEU5PX0LmX+n+c8Z/ppP5T/ZRpiBQQQUapGFq6bPst4P4IZXlz7QoGs2ep7j2Ruu8pGCRukpk8rTpItMna86fPtTbUUNgr+2WxVIwhfh2L8PHq1Uumz7Kgg0DhbrStOQPs+VEmIIKSWuVFM0jdN34RNJ0nhdNzhQXRmJpyjdrYD7HlfvZlOZr3Ki+PcVqHBVq086jSbEGjddJvgIxNHhNiDTYWgLSAsfMcLMxw4PKjxEUophTciowX+o5cdr9hYRlHDeU7Dmr8oR7Lpo002gQ7jtkjDwhx7/AJ7dw/tr3KvfIi1qMZ/Rar7thuueVMdLLTBZF9jXb5SWBqCjkEgsdhKieGh8zl9PcZGl58qVmttJwxGFPo4UePdLKG0pndMWFh5WzN1NCkab1s5TH6xaOZRT04oxdeV0t8os0OpYDjupT4ISGwvwcjPimNddEJrCCm9pZ6tWb3Boso271OTdxmciiiim+SiipCvofMv9P854z/TSfyn+yiTUAggEFFk4atlIOh6mprhI1AmI14XPultm828ZlNY/VeRCexPaSNTeQo3a2h2V98vqIAQrx7JTeO3SCtAWgLQFoC0BaAtAWgLyo1GgnHTuom6zqKdA16a90Brwg8OGTH0merdM9LtOY7WHZfvZF4CFlGO00aO4qsnkqIb58vvPhT4cYndyGCiHqpCN2Gdraf6L/wCRaDTguuZv2SGV32OcGiygXT/yoNA27CAU1rsLMK+J7CjIXHSxAaXJz6XrTT98qVe8Re/bSOV95KHYdwg6jSvIS63aRlaGTm6hRR2z4QbvqVnwtzyukwcLcc54z6l05OjGtUr8R0HH0qGMRtoZOYHcr8JGx3UUuGOJGolYZjsK4tfwVYPCgcN25HMlPWNeGsDfumhobQCmHqWAFD2Zdm2hMX7FN47nNdy1CYcO5RaXmyumgNORTnerSjkUU7hBmlOTlIvoXMv9P854z/TS/wAp/sok1NspoQyjy8rlCMA+lOZYpMNel3s2rV9jzpaShuO8hBlG1M58R1t4UGJbN/HvkOkKLf1FccIOB7K7Hoe9dlRFMQRFhYf8p+nwmlPYHoFzDTUMQpDQ1NWHma9qkG1jwmOLmgnulfpFKMbLyi69gul6rzIvuKKBtaQqrK00ZE0LTdUxt3Gbm2UYWpjA3K9WwQFZE0i+YkgKOJ7t5ucyaXrVWEIgFNFq07oNd91p+6ApYoAxrCsDIwnNsIbhcKgf9gcrV9l37B7XcIKrT/y/UOE9w0WsE30l/wB1rGZNJt+e1g0c9vCcdItB/VmLvuV9PiLyZH9jhr9OTxwUY2ndeuF1ncJrxINTUciinqVnWl/QJ7Q0bKTlYHj2Znu6gbWyexo9SHHfNCJUZ8Rhn6Zd2/dNeHi2p1+EA4eUUR+ZfaXAu0pycinr6HzL/T/Of1B2nCSn/wDk/wBlAdQtNTUEEFHlJJpeg5xV1lMaH6oBx8qsrCJR1FepO1JvUrdNLj4Q7J5Bo2UDgW12FRkkerM7ojUFiIns3jWFxfV9D9nd2IdZDUNhkW3uhq73O3oe+WNtMOhRnZNKtOPrCYE0qP0vKfho3oQ9IkBNj9RpDEODum5R7sHbwmt1u1FcLTr5QaG8dtXut1RW/wBlZVkblHW5QgtJBTcqvnsm8BDNwPhF15ONC013S+Svym4psjtLVV8rSMy/fSFWk3fZK6i3sxbqYo9mhOdQQdKw6ihiWFMeHcf7JyHt33HNw1CiunIR001mlulNja3hUqyIe03yhvzkQCizSLBT5J4m1I2wsLiRI3fsJrcr6j9QaGdKHclYPC3pP3TGCMUM3b7dnCcQh6PiuozyjIPCdNGBuUyZsu4WKdpbsoTQT1L8gsLJpoJjtQvvJWkcogVun9aEl0W7VFMC2z57t7TmhwoqKDoj0p8pZu5qjnZLxlL90023IoptElyKKeK3CLtY2X0PZ0v9P8rqW7SMscP/ABZf5T/ZYQFuxTUEEEFFlJetNc77I6j4Q1J0Os2SrexMlD+4ttDO8pHaRqTfzTYUbNKlkLTTVDP1Ns60uvsOyey1i4tEfUHIUEwlaPv2uj1PB7Sr7HbBRbjUch7pfuo3AoWzjhNNrVQUfqff2TU00nur1BMeCLTakcU5nRfrT4mSKDZunte83smyE+FRPPZa1LnulI0qPdoTvuguey6Wnye2U6HNcmzanVSpPqt1MJAwluwKwkAjF9jn2/StJhBcN11TI6iKUe22TpdJqlqEr212YuPUN1A41RVXuiy0YQUIunu1Bx8hcqvausrTnUtIRICLhaEgWu/CH+xKGw9qRutpCixTondLED+ClhijnuI1f/SbjMTh3+rdqix7sR8KCmNW6SdSPfJ++aQmDiGNRH4aON/69g337Zmmw1Fqe1SelRwdbcroBnxWJo+h/wArTW7J/Ck+SwsYfRKDXxn08Jjw/t4TDfOXzP6KgEyQCc/bu4Cu0b8LlPgBOpuytw5WoFNc29N5PcGC3L8XG40uvCymkopyKxOqN4cPK+jTtBka3k1/lR6GCrWoLG/6aT+U/wBlF901BBDKPKu6g5EFvCbK13lWO2+w7qNoA2yaL5TvQ7UEDqF5t3zfxlMNUZCiBBBamuDsy4BN3ce4/qmAjbM7hM+I7He26IFM1t4UR1coN6ZvwpZBp2UJ0ikCfCCaUxjCm0x+ykIIUDrYLQd0378HIZSvI2CZHe5QACJA5XVvZoWqTw1fxVDvKeNWyj9IT3gBDf25RZatIK9YWmzZTm6hSja+F9X6UDYsZ9WU4hxaPSjim3TiutGnTsG4XXld8GpuI8TDSmaWTar2V3xnizqIATG6W1kf0W6orfKh3ee06vGRZqWlGJrkImN4CpV/spHhgpDf2sTj4cMdLuU76phZvRI0rHS4f4xm0BId2v3U7JWHU9Dm1Hh5MWaHCh+mRMYA4IxNeRH4GbjewXHaW6jaKITowVoA4RscrHxGTRI3wgdQT1J8lg+MiAUJCPkg4OFjMpg2RyJ6h0BSQNe2lA8lul3I7qQOVIogKRjAOEY52m9eyn0P2msLpsxEumLhOwFik0YqIaQV6zu4p1fvNX1COQj8o/0X/wCO4XGSGXfTx/lRfSwP2jyVIzD4X0hxtSOkOEkPI0n+yjeRyFFOyTYJqaE3KL2nxC9SaGndV2hHI8KM21FaVidrWEkL2b5xOtzuwfZO4Kw4UnpOsJrg8agnOpcC1GKHtHZM47dWkKnnytL/ALrS/wC60v8AutL/ALrS/wC60v8AutL/ALrS/wC6JdfCYozpQJU0XlqwzuqVH6thwjrJpqih07uU9kWxTySNYHp2NDmURusBKJIQPKmaHNUUlRanJuI1cBanJrdO7kZWN8oSGT4rpA/Lf25HUhKibWk3uVG69syaQ337j9ytN7lPkDG2o3iVuoZ4wXEVD9VioMok/om41rh6WH/pSOxMw0xtr+Kjw+kU4r8JB/wQhjHhaQtFcItv5ItBFFOYYbdGUzGg/IJ0zXDYrBsc+Rz3+w87LXpKBvK1adxa6gQeCufZv/YAq1p3tN+3tYqPTin0eSvQ7EV+il+l6vXGvw0kb/RymTTvGiVgKmY1pto0lYD6hhmN9exTvqkB4Kwk7S9+6BBTz9k1tdrjSArZOtdc8Um2RZykkazcovD/AFBSamnUEXahal+SwXGb/isO8uG64V2gz75yO0t2UbQ0ZO/Kfq8LUDwtQ9gqk7JwDuV0I45Dp2TifAUjZQLCbusROIhXlMc8AyP8r6GXHq3fj/KGoirUeDiDuoRZWM/00n8p/suu1ppYdrZj1CEG2haGpBRd57HF0Z24TXavYn+NKNmhtJ/CtYhwEukrCx6W3m0aH39+w/dVYQ6sZobovmeNwg1+GF+EAX+pOH37t+12+RtxrwmNpE5aQJPaLN1ZYN014BtNkLgoxJ5Chj0Ien1Jk7HcFNdrOUkWoKWIAV9lDI+F1tQndK0enlTB7wAosO8bgqJ0vBRaSbKaxvKA9t79PCtzjutTRstRPxTnWovSbKG+R7i4DlC3O1nLEAj1tWCDhHZ85ztdjHdMfEKSI/TZRLHwmuD2hw9hxc52jhNgaOVsE5kcuxCZA6H4lNkDtu+X4FNdRTnjkLp602It8p0nSQJfytIVdnCbxnfcPatUuE0nzlVG+6uzHRXPY52QZrxRB+ysRN1OQhBt3kox1usSOt8Qm4PXtSmwowzNQQMkJD3LDzul3jf/ANqIbWee4jdvbLK2MWU0mZ+tyDdPCc6tqTyWG1Ju5YLjMqP0upV2fqvmb8ZkWg3pcKmv3Rj0eppUcmvY893lEoG988TJGzEBx/8A9IVSdwnz6Apwx7g394qSSNm5O6+iTSudJob9v8qMTynfZaQAsc9rMNJZ8H+ywsX4p/p2b/dRsDGhrU1BBHdQbK+0I9hNJ7q/Z8ps/h4pWDx2HU3hB1rGS6XNamOsImgo7rdYplEmlgptbdJ8ZzNtqadQvtpUsVvGVBiWx4dvkose5nVed1G7UN/ZKOwV6uMxkfkPaINpgDxRQwbOWp7JMP6hwsPiRIhuVIabQWHgATW54805Q4awNSErWERoFv3V+Ams3Trugi+aP920yZrhaDgeO+85fjYTSdFhQMlmdcmwQaANk6LWU2NrUBWY7HP+yLSd0GO85jLEuLWUOSgfw7A1Y0tmZQX0nEF0fRfy3KsiaQN5yNvdRP1ttEa/4ZuZe4TTkCipJS0ekWhJI5es8ldNaQEXNan4gk6WJkJu3odxtBxYd/8AaWq++Z3TbGx7b7PqWq9UfKwrdHyTZziZq/dCL9OwT3PldoYsPhg1vqRhY3cBYoDEythUuFjeKIU2D/D+pihxTwKcE3FNQkBROZ/a1kVSKmY9+Is8Iw7eleoPtyeL4U4sFf8AG1guMy7Vs1CLSdQ5QN752i7U6u0i0waW1l06OoK/uue1/wBs5ONlJAHN0lQSywAh/wAR5Un1Z0hLY2bfdSy63gyWoYmYiTrD4hGNg+DV9DbvLf6f5RdWwWInMfpPlYz6fLiYHukdQo/2WGYImhrUEEEEFinTs09FYHEPfccopw9p98BMjDd/KLQU6Le2q5fsgX1ZTpA3wjiKO7TS/Fw/dYthllAaVG6SL5BCQPOWJZaZO+ElQv6kYdnEeW/btL2s+RTsS66axYyWaQHwFBiHsj0NXUmfu5Q4ma/SLQxYH7QUmua4WM5Lr0qPX5QyJ33Rf1jpadkBXa7ava8qNMVWpME128exTcT0BUqw07MS4aPCApDJ8ojToes+ypGVQCZH1ZiVHH9kG0rLjTUBWVKaH95vKw+J1u6Z5Uk7Y9imzxv4K6jR5UuIkG7W7KIvl+SutkL85TOpuykeQwBiwt1vkU4+RnWR2RcfAVXzmUHffIq/unAF1nwqDgpIafYUQ6eJa8ecrRV6jugdWbuFFHoG/bI3S7WmuBCtHcJjHcFBoC43TpWhPnJ4TY5Z9/Cjh6O6adQVK67LrJ3yGbuRmc79sZnZcqvPsv8A2Ti7dS3PUbNlHCIm0FiPCwce9nJ/Cw0YfOZPsipAJGkKD40nMa75BTYPUdUbqKczFsHgpmM9XTfsVqV+u+x5oINACKeLCdbXJ6Lxq0/ZYI7KwFZl/gg2uMjtuECDwig2lNGdQe3tKA7C0eEX6fkhIx3BW5TmWhZO+RNLEz+GoY+naSFOY3uGvgprWAehSsa/ZwUD2suNOOy+iB1y0Pt/ldGZ3LqH6JmHZEsV6YJB/wDyf7KFBNQQQUacy9xz21mXUg5zkBXaEcnQRu5Ckw4DxoTWyt82rkhcXOCbj2k1SdNHIE9rOGrA30qOcbdD3DscTJswqPDtYdR3KqwsXHq9Kw/08R7uKli1CgsI3SaP3RaE5oZuENdW07IyPHhNkL9qpMK4Ku09uppCjOj0uQ7Tz7Ru1CUxBBPgbNGSoI5oJNcRTMeWj89tKOVsgtpT36QtJcmMrdYyXpt25WBZUdlBpa/9FzwgKWgHcqmM3UmKDdwo8dFL6fK6TdWtUixp5CDQOERqFJrC0V2Fm/qToWv4TISw7JhePkibTgKpcKwmuB9iRmuqTWOH7y3buU5ssp+y6Q00UIWjhH0bFTs/eaoJxK21afqkFNTI6+Xsula1GF827zSdcEui9kMV/wDymyTP8UgJPui2X7qRry35LoyHgrpTcKMU0BEWmksf+i5y+Ku8juhtyidRoK05+la3/wDBBzvsiXLUbojuvf2Bmd0BWQcWOp3e7hTD0Jkep5ejtsnU55pYdmkZYuV4HTj+RUEfSYGoi08VwsM6x/DsfEyTdwToj4QNK9snGt1Vm8inJ4UzTwF0vXZWFgY6rRw7fCafHYWb2EDWzsufbItMhZH8RkVVZFYiTfS1SQ+g6kIG6aKbE2K3Nf8A0UtPFaja/ByTS/5Qg6Q5tfQeZf6f5ydwvqNjDPd9gf7KE2mpqGQTDS1fZb89mpawiSeEBXt79XKVuptL8O7qHUOFhejKNuUcOzkLoSN+Dk+bEx8ttdbFv+LP+1JiMVhz1JG7KP6jE8IYmOtV7Kb6iJT041h98nzMj+RWGc3FzOl+22RFqcdF2sJkgkbak2Cw/wCzCpO2CZaO6d6bITdwiAVwe2RmobINJHyWg/8AJaD/AMloP/JaD/yWg/8AJaD/AMloP/JaD/yRO6aCdwo3XyggsKdTXBCOn0umHMoqTClpuM0sM57nESboUVwnN679X2UTwPSro0OV1Gt3JRm1nTGLXTxPhwX4WV/7SRN+nQDc7psUbeB7z/0Vk7EI7r+GfOQ7nEONfZN++dWnQN5ClY/Du1xpj+q0FNrxk46N02YyOpqAORyfJpXrI+y1NYuo+U6WJuEYN3boNDeO2spp3g1GmYh4/aKg7dA6DRWoZVmafsmnTsVabJc5afabz7xAPKB07Hu8pwBFFECM+lOmdxpULC425cI8LCuMkj3u8bdm8braEDY27ZBY2TJhw5Oka1uoqJxnOt3GZTk4KQ70nEFYPIjyuew7ptj0lA2UU1++/ukZFOG6mjBb6lQaNk6mqSF+KnpnHlNb0xoUi+iD1SH+H+cjwsZvhZR//J/ssO6xumFNQQGUdHM34V/dEk8IRk/JBoHHukevNw9VlGN2Hk1MRxTwL0pn1OI7PBCjmjl+BvPE/TcPiL2orG4OfCx821YX17N5TC/CM1SIPxOJbqi8ofTQ8fnOtaY8C8FgoHZA3vlMAQon9J9FfNRHTY+yjkfNuNgg0+ShkU3YZg0a7HGhaZHt6l0wumF0wumF0wumF0wumFe6iTWgjddPy1fh3v8AmUyE4eTUxbF9oOATp4i7SHbqBjWp0YcnB7ndMnZaQ0UmN3tdJt2UYmu2QobD3D3aU6x7YNq6Q+3diWWFHiuk3SVFjWHyvxerZm6dHM83Lwo9On05yOo0m25aQN0ViA8uboTGhooew4WhGpG2KTHmLY8L9oLWkxnZDIoEO8rR9k91bUqd4Kc1wdqdsQmzg+QtTvsmytcazOdLj35AXbBa9HyVhWrpWqcDYWIxTo9tKZMybcFaSo21li3O0aWclQxCJgYOy6cnW34ocdjuF0wX0VNh9J1NUJDm2EUU5Epym8p4ohYLjMbdsjNbaUdgVyiZfATzPq+Cc7EtrUNkw2PcZYsFFYiYxubSmHUjILkcezR+qie/Es3bSDQwU1PF8p4IX0QEmX+n+U4uYuosZ/p5D+h/smendRpqBWqkBfKiFZ0nlN498uIeM5QNJKL/AE2ut9kfzDVJ0v4ScOA2UWLhm+Lt8yA4UU76e3DzCaEbfZPw02NluXZoTGNjGlqJpTwCeIxrAyOH5MnIRPgIitymRPne5z+FCNLaTotRVBgQdedKs3g+E2/3k9+kIdS6X6e15USHCYdldIDUQVoBTmAtpDDMtDDfqmxuHlNDgbTDr3QHvxkm7yJpX2E2PafwnzevptWu3Umuo13PaXcqLCxHcpuFgbw1BobxkBpV3k8HXYWoNCc5ulSyEDZMj6jvUgVqC1fZUfK0qqzOVKdvp2TPiEd8yNWxQga3hPvhhTG1yqVJ2HY7kJrJsK707tTZI5dzsgPsU277LF0t7TSDlSqkQfCrLT5QN9pQCq1oF9ttnk/gp8B+/Ed0+THQi3DZYH6g2b0u2Kdi2xyU7gqJxmxTvsB2vb5W7mpnCCORNnZHm04WFocw21NkD0U5OATlzupfksFwhnVdkr6GyhZpCP6IZaOi6xwfbJpOxDbq0KPqu1iXN00V1YqDWjdMwLI5DM/yiinFSFfQuZf6f5RFilWl2lYk/wDjyg/Y/wBk26WHk1tBQdSGp/Cayt8o83HwqtM47K7rypUMnt2TTYyO4UMvWaWnkIQhvCiL7pyxLQ7ZatBIKwz+rC1+ZIvTmdzWUuH1nqM2copK9LuUWl3K6b4nXGmHcjJ/hDZWt1XbPIY6UZMjbQFKM2PaLt+FEQmEcJu6aKFJqCCpBF1BDZNQ99lVtkRaMXlN4ydXC4PtYh5aPSFFFW55XTCeyxtymvvnbu+JzJA5Us7Rso+LUjwTpRlZC3ZfiW/EhSOe5pLQsO18rA5y+O7kCPa0hPbsmF8fPCD2kXa1t++TnBgtxXXdiD+Xwo49Pc6Jr+UI+n8Ux+rtJN7JrQ3jNp8HtcLQJHOQXG3sFYIfI/rk8AsTYIXybtWIwgc10xcvok7SwxnnsJUrtkwWE1wD9GbuKTGaAucnKRlHU1B4enJwU7gxhJUf7IEqX5LA8dpVouCDLOpyCvNypaAiyQcFSNlIUTMUN3lMkDxeUj2xjU5MxsTjyuo2tSI6o/RGGMjTpUmFNfknSsa3GMb6l9M6YZf7yO6PpNIpykX0PmX+n+cpYy7cLFnVhpL+x/shbdytfRcNXlRDXumoIKPOk86eE1rgN1rI+SBvjK+y+4Ipp0u0nN8L48RrYNl1GFa28BYyR2qlgPp//wBsu6aABQzbuS7Ogtwcp9hrHhDdUh+W/dGT7I6vuo9V7n2JW6qTPTsnGgmihS5VBUFQVBUFQVBUFW6jTQggmoIIZWCaRQHt3ld5sFXnSbl5RQyPeDqduhsryItA07T2yC2qyqf91JA93DkzAsvVJuV0mfZaW/ZaG/ZdNhN0sS3UzQ1YIaWaci0FOiceCtEzeChK8fIL8S3yuq1CRrjQ7XvawepPxD5XaW8L8K0qdjYh+qw7ZSNWpetz/wDyNwo2tA9Pf6vsi0ldLTu1NfvRCu+O97b3ydwgb7dRCq9z7OHGnUP1ydwi/TKFHhZMQ8sf8QpWnAT2xQYjqAfqmvB2T5A0IMHlGMOXqw5r91SEh4eE06heTtiMjkcpIr3Cc50Najsnbr6i52lrB5KLdLdKlG4WB47nC3INrt5RHHZWTmh2yDHjysdhzLFysL9PjibbxZRaEc5WCRpaV1HfT8SWFRTtkbqCfuEDfKKkX0PmX+n+c/qDf/Gkd+h/smusCk+MOkaXppCBTXoFR5vkrZvKa3y7JwsUmf8AjmvCbI13B91zdaJewJvVPKe4Q87hCJj/AFIwNKbgmB/Udv2SuLWWEO57dbS1Ndo2euURapc7oey5vlC3HdF3gIupa1rWta1rWta1rR5URTUEEEMidkGOPlRAtdR9kdjSHEqvYOxzNIHft1AIEHdF4CE36KMavU7tb8icyaFoIey1lG1HH03mu4xtKDdCO4Qa4cL12nShqMskn6LSwD1qIBx2T3CMWUGmd9laAG0FJEHKO9IpA37JQ/RX3SP0hCbw5aweE0dp9lx0i1hTqbeTuFjX6HBygnaXg/8AJfWWEPa77rDjS1rinBrxaiDOfOZ3U7jADXlQOsWrC+TsjmUVI0PFFaq9Lk9gxEgd4CkUvyCwXGZTTadwmj79tZavVWddhKPqyPY4r6lgnYkGRvIWGmfHKGOdQULwPTdp532RkrlPeDwV9B5l/p/nPG/6aX+U/wBlBHRslPIdMB9kCm6j5TWO+60vWHsfJFwatckppuwUcQZ2FoRjbeyD3N43TMQx5pakPY5yOU8ercJrvt3UCe4frkRYTBp85gV2k127qrQAasVjWCUi1+Oj+6/HR/dfjo/uvx0f3X46P7r8dH91+Oj+6/HR/dbWok1BBa36tLAtMh8psJ/eKa0N4yc7SbTXW20PZv2zvwiHfdab5RjC6X6oCkRYWst2KZZ+SoLpNQaBwunum7bdhQzcNQpD7e3K8Mq+2u2SWtgtVblEa+E2IA2Sgd9lKdR3UL2UtQRcEZukdxsgQ8WMy6k032lDZDtJpBv7zkGKqyPuvbqaWr6Wx0cRY7wcjwvqTfRaZNeE1DlptYjEx4yLT5UWNYIum7ZwWGxJe0hASarOyAyOymd1yYwosJLH+8mspN+2RyORTlIA7YpjaZpBTrUvyWB47C4MK+XdeVb9x4WnW79MrRyKKn1OprU/YL6rAzV1GKDHuYAw+FHjYizqFWHtsKaNp5X0JkrDLoN8f5TXTfvNUs/TG4WJmbJhpD//ACf7KJB35jkw0muTbKYmJzHSPrwg0gUCt+zSCnRIMoJyheQSDwrVq+0lDse4hOcG7ppsdtdxzld0/VSik1ouAXPt07dOD3DlP+jxvNr/AOFjX/wsa/8AhY1/8LGv/hY1/wDCxr/4WNf/AAsaPKiCamknwgEEEMgpoi71NUJ1MCCHYMgwIt92+516rTePZ1Kjz7+LFsv7FA2PYc5EXwgzUUG0qQaeU9pcmsR6YO6fG0t2Rtgp+4WGc1rtIK5VH7p0WrlNbp7pToRY4fAoOP73ZyVLxSC57x7BNBYRoEdjzvnjowWlNbL1OnH5WB+ksgp8m5WJwMOI+QT2yfTpR9kJxKy1h5Q5u6fiWsOkblFks3OwTGCMUMyPIV+D2FFORVkPcE5wUvyWDtbrfKYBxFoVWy1N+6u/cef3Qmt05nI5O9JJTmdQetYzDRhpNKOHrv1Vsp4Q+I9PlM+pSwMDC3dHFvfuKX0LEV1NTft/lNxUR5NI05Y7CR/h5S3Y0f7JhkibvuoZXOfqpMGoepRgJqfJoWHfr59oxgqWB2n0Jkh4KacrV+waWoaqXCfLp8IYgHwf+k6R9Etam8d5zq+UGaCdKDR7rQqW63W63W63W63W2pRJqCCCCCGQT5HsfpibYRxOIH/17I45zOWqPGMfWx/6XWZ90JA/4IZ+fas+fYfwgPugO7SFuF1WOdpvsHuuFilAHtGl3e/4oWStCa2s6VKlLGHik1r4P4JsjJQo4GMOqux2rwmnte3WUXSxplu3KohOeWo4ktO4Ubh8giHOdZT36RQ5QFD3bVrFS6I3EKOtDaRResbOXflR7krAYI4ca5PkheX1LBuxcelvKi+n4zTqsKOXEMf0dPqKw2HEDd+Tz3j9cyiEU80i14cXUnSA8qU+pYFxpWVveRFrpAO1FHSeV0mk2EIavdaH3s5AEOso5M89pQGRyORX1H6i3CNpu7isJqcNbzZOX1V2iGvJ2WGjDKUjndfSz+qdCHM3CkgrcL6FZ6gcft/lAujd6t2pk7YTQ+P9ljCPwsh//k/2UmIi06dSik6ailUci67WrWXmysJ7j4w5C2migfadwmht6vK3UfxyefCwUjpIbd2V2UnFwRemyeED/tzyok1NQQQQQynxAhr9VA0htu5ORaDyEGgcZSYUXrj2cmYgXpfsVzkPbrvcLQ259lrGm1irjjLmGlh5S6MalaHtFNfvoPObzp4QPdd7KvZItRxlspPjuIVXkbteEOERaA0nIi06IOTW/uqSDdbt037BRciZD4Rk08o4yBp0ucuth5ByF0Yj8DX8E4Tw7/ILHXJFqiO4X03GsxEYZfqCcaCkdLiTWH4+6wuDbh/Ud3Hz3Y+NzSJh4UMgmYHt89lI52LpFFEpxvYImjSe8Kd2ycZSaX0+9PqX8EOyt77HixSaXfvJzyPCBLDZQIPGZ7DmVip5QenEP6rF4Xpt1vNkqCQBoC64bypXtxc5H/FWAdDeV0wFopqe1fTIdYl8cf5UT8SXmMbhFviQLGYZ7cPIWO2o/wBltpIIUDtXKh4sJrwTQTI99lExYdunt49jGbNDhyoJg8IezKdLUBpbsm+oIANOUxoL6a0tw4v2KtV4U1NbQTG1sUAB/tS6kTa8qJMQQTUMi4N5RxEh/ZsTMOTIJJDZ7y0O5RvDmxwhK2XZvuuPjsJpNJeVppFg5R2CHcQminLFM6voUMZYwNcqF37jowXa11BdHIi0BWd+6T4VBD2XcIE5EX2ebXKe3UKQVq1fY4+AgAE63mhwg0DhSQRy/ML8Lhx+6vwUHLRX8EMM5nEpTsMH8v8A7LG4CXDHrRf+lg8RPjW6JdqUcbY26Wcd72B7dJWAb02GP7HsvI5EWnTUdKdOxqdOZHaY1qbGwucVG7Xbk+K/KdHXJTjTqK+n7t9gu8BP1eEGfdUMiD4R/L9TeECHCwia5QxQMmlDfue4MFlNaSLcvqwIwrqWHMzqIWKhk06i9YDDuaDq8psIbwi208KUOtfSGW6W/wBP8qICN1HypohoUjXMwsv8D/ZCi21Whyjk0esFE6hqCw83gqA2FH2ucutp2KDgeM9bfurCllEYUsb5xZXRxGG3G6gxVj18prwfYxJ2AUbw9qJLZARwjJyQiMa8enlYNrzHUztRTG6Bp9qfegiEPeMhXUcuo5dRy6jl1HLWczyo1GE1BDdDZcokN2WGoCk2yT7D6IQw7mO1BRiZnO66u9V2VXf+92SSan6AgNIz57rTnKNoFn7oNrfK967AiVY73xhyG23Yf0Ve3ae/SmC/V7b/AIqPhee6qV2iaTX3lVrTkSFG4Aa0XSzfHYLour5Lpv8ADkI/+RRgjPK/DjwSvww/5FfhKNhybh2g282nHoTkeCm/dvCtX2yyEekclMYGN0jtvMmkBQTgCKKLdI0tCxuHxDiHDevCinA9LhRRNqRTsDnbrAMaAgK90iuFfT3apNThblIG8hQfUmtd0yhjoSdJNJ08Y8p00g4anYiYj0s/9rrYkfJg/wC1DJ+JJJ8ZYyPqwOaoYwACFiQHUPssPEdVkrpoMATm2pWbL6HeqX+n+U/S/lPxgYNEifMx2Elr7H+yP5hpq6e6a1MBYmW07hYR7APkjKNtBUWI30uRkaPK/ENukZm1Y3Uv4h59LVHhcS/9qU/DFvBVObQB3TYZZeSmYJo5X4JgdYQjaBQQGyfGCn4YFaJId/CZIV1FqV9hAuypo3j8yFH6jGRXlQythZrmNWp/rQaNLBuocdieoJCxRydVuqqzruKcCDqKvUPeKO3bfZ5Uaa4AbpsrPumkcBF9ekcr0s5XUFelBMNWm7CvYAzI2QfXKFnc5k0gQcrzb983GgoYyHandlIdtWVJdKLZuQ7q7LyFjnIrn2Sr7pDsmNdLu7Zcd9qwtYWq+EWlw3UTXV6img99ZEArVoO65Tnac2U0ln2Tdu7qNRe8/ELpF3yT8PHIKcFFcDtByICdqrZDYZgAvJ9koxPvZyDa5KNpyka1xop2FY020lTMnHxKkw0mq3FfS2aGUeysx3FUsQ7QLCkxIkbUmxTa4q10aJICB6zK02f1WAe+KUxSqlWUmIGExHq4KuxYUjwxtuUc0kdtezYKg+S1GykUUSpF9DYLl/p/lGIKeAFYqMQ4GYj/AIn+yw7XaUdQ2TNV7pkdhYdhvSU3CNG6OCL60mk7AShuzrWHxBw7unO1Ag7jscLCEIQ27LzcLFKN4vQeQqHa5waLKZ9QD5Cx+yEoAWI+nw471DYr/wCKb++4n+Kh+m4eHcBBjR4yG/sDIgs+K/ENHy2QN+4TWy1FWfsrP2Vn7Ijbt/ENLqCgEjjumQ38imujbtalexo1tWGY1w13aApSAxnW1XY2TG+UPata65T5dabI3QCU2Z7/AINQDv3suk27WgIxu5BVkLWbqlUjUwuPIVI2CuRsrkZzumyB3edk02i4cBNbQ3Vdp9sZH2JAatq6hHKEgK1hF+yfMQLCiBedR7L8ZVnWVZtCGyBB9l7dbSFF9iqyc4NFlRsI9R5KNt9Q4TZA7hWi4L8UL0tFoB7j6uEABxm40pmOeyxyEx+tgcrGckzIhbivx7pTUTVAxzG+vn2xwinJw+yepCpfkAsBx3ONdldl0t5pC/x4U7b2IUTn3Se0EWgOm6ypKdI14THWM/rMReAQvpc53hebUxPUo8KaMuJLuFhXBz1SKKcpF9C5l/p/nKYta23LGxa8HKD/AMT/AGUEGydh/sm4S1HA1vKwTW9R9ZESmukU2WSPab/tTYePEt3TppvpxrkKCUTxh492SJj93JuqE6XHbsc4MGpyx+MdONMSdLraGysOyGImcemHL6fjOn+XId014eLHY3vrsLWu2IQaBx7tKlSpP47S1tqImP0udSZGPO6ZGxvARaHN0rDl2Gn0O+JQRbqFFQ3G/pHsGYKvInwFp++WIs8KSVzWgqKBrfUfcItNFbZ8ZudStA2n7NTYhW6a0N47Ajfj2B2HIlAo99hSTsCB8rXp5UL3P/go8Pf7RUFSIedgVpPBQaB7BycK3TNzSa0M47ueySP95vKGojfJzNRF5BGNpUjnQ/qiXS+rwo3NI9CBvsIs5Pa6N3UZx5XVYRdove74Ck8P8lNwes25RxNj+I9zwiinJyepDb1geM6zdu72MSfQhBt6dlNGQdyg1t0qrhEk7PCkjP7qixDm7VajxLX5Y2NskdFYdzo5A6lQO6xRqN1KnxVI1Qy9aMPRRRT19DO8v9P85SVLKG/ZY5wZhZCfsf7KKQeEwpr/ANFajIw7zfla9TdTVhiTyuUIembjKlYyb0zBHC4jBW/DusfZYbEtxDbGx9mldc5UpGdTYL1xc7hPx0bFHiI3iwV9S1Sw2OFDNE0BqfihKdEIU8hN6husHhPxUdvQEuAkovICmx04eDDISsL9SLwBOwg/+kCHCx/vn8dp5XSbK3S5QSnDv6MnHgpqCfGHbqJxHocgnbv28IdzieFxunSagAxNbpGTjspNlHhG/J/bx77+LT/iorpSbuDe4ZFOaXbIAAV7Vpya+tkDa4Vdjk4UUyJjASQpd+F+Gc9tgbrDN6Y0OFLzk5M59oZSfErDO1C/aJ7iCzcnZUCqToCDcZpOjc31cH/0o5Xt/aBA2iew8LBBpjv9SitHn3yncJxTipN1iDT6buVgNRH2XWLHBvK1gL8VEdrTXmTjhWEBZtEPvYoaq3zvLW1TU8hqugp5W2i9rk3E6PS7hOIf+zd/RRtkA3CMPlfghdpjemNynl8gpgTMJWyOF8Ap2GHxCZgDWzqX4V2H2jeU1kxu5ETMzndSTSHZrURiDzQX0SOQmWnfb/KeybTTXbrBhrma/K+rtvBP/gf7JkZ06oyoMT4cmzj7K3ONgKWi31BNnOGf6eFg8WJb1bIPa7jLFNcWW3woMSH7FPg9XUj2KD3n91Wr3r2XG9s6CdG1wohNAcDG8J30xrH9XDek/wDpY+R0T7qneU3XO7SFhIDAAw/ZYmBsmxUP0xkb9QQiCEPT3i2Qf/y7B/tL7X8dp5UalgZO2nJjMTE3SKKd+IAuwpZcZWoupQSYmSHfchOxGKP5Z2P3WEk6kYIWot3KByCdr8IA1uU9sgZ6OUHYxraey1G9z9pG6UDaMrQvxEjnaWsRcNi9DEx6tJ2KBv2Ab7r7KRaunk1tdhGQ4zr2i20An2g29imCvKGYyKcLB+6kcdFKGGzqdlMPTabKPK1hFryg3T7sFRSOZ/saypFGEeE0ujNHhDfslfoasCNMAHvlNfvpPKKkNcomQ/wRFLGF59Eac0MoLDtJqm2o9I9JFFV4T8LHJ8wo42xN0tVIDt0+q05eloWo9S2BOjxD7tfgneUMFSnwQqwtGkbKJwYNyuoxzdiusxEdU7jbIgcopw+ye7SbUo1NsKMyCXSinKRfQuZf6f5TntbyUJ2MlJadivqA14OX+U/2WAdouNy16DelQTslGyCoOFFFumbSV9PA3Rja7kKSLSwlhXVm8ORmdX5jf6rCYvqbFfqERahdbiDyO/hGYvOmNAUO1+3qTXBwsKfDRYltSC1FhYoRTAvqDpWQdSHkLC4puJZflMze3UKTXakT4C8JrNPn/cvdvXaatR2U1AgKRh16/KZhzIdUiZG1nCniE0ZavpwDIQzyMm2Owbdko1+hqZG2MU1SCVz6ZwpGaZW/qum2bZyEb4vjwmSNf3FD3HO0C0XmWTQw7ee0oK879x/CBQGyHYcvSeV09KacnlPZYUJ0NWpDf3Z4tYscqF+tvaOFfu3eUgUOw05yyCMJ4e5ii+NjNxoIcd42Gcjwwbosme7Udgnws+V7rrSM/wD6U8kkgosNLrgDdOlc/wCIXT0BS/JYZ9VugRIKvcIYgA1JsrFWhZ3zcNkMy6kdwtDWrS7lCUXpPKLifiF605rz5TYhdqgtDLukcyiiiLFFPFDZMbQtORUi+isD3SX+n+Vpb9lisKWyaokBN+ElEh2o/wBk+APbssPjZQelJuo4nOfrApNZ+qDFNhxJ6hysFEY7vKd7n/lxrpsi+ZTtUuzRsm4cx7tUE4fscsXG7qamLDYmTUWy8Lnte8ynQxMYIxQ7/wBnJ+hQRRFilHI8Y/T/ANpooZyODRahklxM2uLZo/8Aa1Vz7I39sd+2ulSpUqWrfhQ+oWgmGiXFQnV6k6RsYsp2MkkNRBQR4l27zSwc4MxiTzKDsF+NbHtJsmySTC2DZNjnPyKi1x+iQ9kklekcphAzlFysQaGnKWPV6hyoHmRlnn/ZsYGk1lfYFvrr338JrfK27yAN1yMgHDypneE/EtI0KGerb9lBKJW2h7N5aVZbyj6tlHbHkdhfZ0tVdgVewXAJlkkrFNla4PiKbLPw5ibNTt2r8TFdEp0zGiyU76iXuOhtlNmxx3WGe5vol5zPsyTtj25K/MfyhGtAC0gKkVjaELi5QgdMaVIFL8goYw4glQMax5KkaJ/S1CCWL9nwm4gcPTXtdxkDYR+W5VnwiHIA3ZCrNwAda0n7rTWZzORyKfwv2iJexCRrxYTlKvoXMv8AT/OVLGUMNIP0P9lGnwMk5Ca+XD/qFHjonbHZB/lB7T5Ub2pzttk5+n0NQj1OsqNlLQpMMb1sTcVo9MgycxrhRCt2H/VqBDhYyMjBuStfV2amMDBQ9iVnUao5NYznwh/HslYOec3XSDXY2UgH0BMY2NulvGWnyE1337ihkPaJ7v3u08rqNiFlPxkuvSRSBlcBpCiEmjbZfhNe8hsqDDthC4UMb4Z3TVsjMC2wsORLOXHwhlynQH/63Ui6WIerdTYtsbLBWHa6T1FNbWeJOwIPCbKyZuppWoHjJzXNdqYmyNdt5VgblP8AqGHbtqv+CDnPbYFJ/wCLhdqB1D7KDENnFj3dFO1ZWLpAjMHek3dxKkcapvKAoV7d71lIaCCrvKGeIuramHXIpv8Ax5L+6w+pp1MUchdwh3X2y070IQBvxKMW+q00kJ0gAtN6sn6BAAcd1+wUBSl3oJ5s6QiN0Yw4KTCtIoBQ4Zo5G60IsB5TpPw7qdwVsRYyujv22pH6f4qiTV7pkLI9x2FFFYlgljLFg303pO5CkKmcNSwIDgpvRiAPBTW+mggUQCnw+Y9lE57tiEQ6qBTGBg73jUKTHhw9k5FSE8IopzQpI74TmPbyV9B5l/p/nPHsDsNJ/A/2UcunZ6YQRsgEYI38hYpjsK3qRGlhsViMRHqICinkj+QT8TI/0jhRRAhNGk0UBniYnGUFqjcTscnuDRun4h0Y0whPnmfetR4Z8TOpawuJB9Lsgj36dL7z/ezlfqd0R5TGNjGlvYQhtt/uD8hurVq1aqUnlQQtHqO5T42SUHDhNaEEEXBgsqtY/RUsfHJGfy+FhJ2s9PCika5GRrPkV+JjBq0De4TnBgty/DdYulB2tRiQN2amy/8AMUrTsSwGhusTK59MA5+6dgpdPpesGbj0u5CpV9li3hrb/eTcPNiv27v6KLDRxfEZHdSYZwf1YtimYturpy7O94tB5RjamwyM4cnicD0oSTNHrYUzFsAq1h5TPJY4HeDfZav1brUCsS8aaCYfT7IyJ8INpdMNNhYuLWFhXGF2k8LW0btQNhWiUDujsrRdSZxnLN0xY3Ue51Zl9ekIMB5Toz+6UxxPPul0g3AsJsgcuszX073Tvko2ne1VlN7cRH1GUsPivw7jDKo5GSC2FGvKtOOkWmSvlbcYUsxj2LCo3tcLDSo5DNMdI2ag9jNhuUWyTHfYKqFZnIpylhY46/3lPiBG2ncokvOpYE6RusS18sjRGm9VoFhO6120IavKs/ZaiLTar2emA4n7rduVhF4C2zORRTzTgEUUUVIvoXMv9P8AOeNJfhpA3/if7JkLdO6qbDPuLj7KDEMl45QX1D9iV9K/ZFMbqT4vKjbXCLT5QkDdnK7ykmEaYT5yxEga1RYam391+Hbae2xQX4Rr/ktMkZ9O4TXau6snN1iiqlZxuuvXyFLqtdIBatGZt0Nyoo9PqPJ/3F9pcAvkNQXrXrXrXrW1pkgHCjHlBBXSaPugiaTRe5WNwHXdcWxUH0zpga3lMhYzgJzWuFEJjAxulqdhmP8AkmxtbtSqssRHo+JoeVEY2imKRgc9rjltq2RNJ87WcqAdd/VPAWkLha2rqMuryngZMKcFBiPwz/w8x/gUDfHs+VfYc8fgW4oCtnJuGxmF2buFh8YH+l+x7DI1qe8kbJgzOWi+UIx9livSzZQG2eycqzfVIM6z/wAtNwn/ACTA6PY8IzBFz3fEIMLRvytR4KbSoWhlI6hso26tygKyca4QFJw+y6tfJdQcprg7j3C3y1E18lisI2cahs4eVFK4t/M5Cbxsq7jIL0jlNja1GFrTYCkw7XjYLTioxpZwnMxMkga9yjY2JulqAs6lipelE56w0XRjDfKodxRT05Y5nVn5TR+79kJHRvACwLtYs9tWSE1pbyryvuq0MqRaDsgNORzKKkeOoAtVvRRRUtL6F/8Ab/T/ADkXdQ6WrFNDMLJX/E/2USDQUcM3lvKbNLH8xaxuJjfDQX0h2xCi3T22tWg75SMs2mh7TTFLO6Pal1JHHVSZiLG4T5W8tNLrGaZrLyLLN9hHkdvCsns5ToI3ctQw9ndxr7JrQ0U33nDUKTIiw3qJytb5X7UkTpJLBQAAodvWdI4NtYdgATFdIOvhMZvZQynefiE1zgyisPHX5hQ7Wn1nNvq3XSa06mp5ll2ZsmCTguT2FotqY8SCwi0HcqAsLPR2GNruUYnN+BQxRZtKFicPHixaidPgiL3YhIZRcXCxM02DIfeoKDExYgeg53k+TSNkw6hartusrt+U2HbN/FPmkwvzG33TvqTQ2woevMN+EzDtjRGyY/1VmUBniRbFhfj2kb5FNFBO4Q7JG6tgmRtjFNy8IMYfCqlVr9Edt0yQOQykBLggM5cZHE6igb3CtFoPKdhmHhMjki+O6D/v7nK+H8EaMn6Jr28dz7PpCZA1m/YRaxMOlwcAgdqQoBYj1ljP17jmU77qTZX1J3FDm/1UTWuILlhGAXSPZ5yB0nfj2LTe68yE4FGKzqRaA7UiinbKVzvsvoTiDLt9v8r1O54XCxn+mk/lP9lEmoL+KxkTHHR5UfUwR1VYX0rEnEarFVWTmhyDjCdLuE/cbJqpqLSzdgQFj1LHbcLBxlx3C9TUDfad16gg4HKvv2HInIiwgCPZc+jQyrO7RNcrUKtaieE4Eik3bn2Ly0hDY9rsMWeq1hJuoEx2kWmEvP6IJqGTYGh2s8qa3Oa0d7vS8HJ5pqAoKR26YU2Wn6UDYtX0p9Pg5Qflyvj/AK9gycwFOhHIT2urSmjSKCxbWyxlqw+G1PdpNFNn6dMl5ynn0U1m5XqcgFK+RrtUKY/W0O7T6np5IGyY3SM3gObTlB9Pa12t6GdC7zrsn+CwTrBHbe+Vqt+0nSLKZfJVZFRusVk5ugp7ntcmS6kYw4KOQ6tD/CsIG3ZzSdNhchH+89MndC2vChkbIwEdhrymn2C6kW3yjGfDlpk/5Jod+8U4U7jZU3ymNrssnhcdlKlOdk17z8QuiHbldFgHCDiw6XdpCKKcnOWIfpaSVG75O8lHagsLGH0SoRobQV9n7yc0v2WnalWns1Ba2qSVrQmOfiP0C6LRu1W+PndNcHbjJxpayTuiFqXhFHJ5peqkUQpF9C5l/p/nPGf6aT+U/wBlGmpqq9ingOkrhNia9tFCDRXTNJjpo+Dabih/9myNPCZGQg0DI8KeV7FDC6Y6nJkLWKkBXe8cH2B7bjpFpkAHrPyQcDsi7SLQs7lCsqyLaNtTTae29wgffcUIJWu1xlRAkbpuyCGYTafIT9sgh2k0LCDC427KUEuUfkrDs13L9ioZA5qxTHl7JfAQU8RcNbeQoJ+q28wjnH+ZbsscwSOOrgL6VC4zkk8KVjX7OTWSWY43elDDBu7eU2Q/FyO60AghaX4X1N4UbxI3UM3H7INLd0wlx1HscaCDtXtzC2FfTnB4Lgj2D2Pkf0yvI8Iv6MtoG04WnMQjp1pqq0W2tLmm0Dac4NFlOc+V1oQf8ipaI0hMOn1NKjxjv3t1+MahjGJs7JjTSgA3vkfooDkrcdzedPZ8zXdaJLjQQaB2EWKQOmg49hKKmxMcXyK/EyzGom/1ThLyCsZFLK2mlMkDfQ4UUdysDsE032ybEFBFwCfKE6WiFbhugXkrpC7KfEHBMhDnevMoRubJ6StC0AZUEWAqiFq3pFOkrYKjdnJyKk3X0PmX+n+c8Z/ppP5T/ZRJqagtLw5MaoWhFgRja4UUWOg3ZwmYhrtlqCtSOoWmR/iT6uE1oaKHZVcK77Xu2oIXW/dz7hNv0ZYk6fUOVFKHbkrVqOy/eQHYBW6BtEJpNb+8epajY4in8KOU4RwB3b/ZMcHCwgmoFBPxLnExwD+qiMzG1Sbi/VpkbSGJj+6ErHcFah2ErUgsQ/Ta16YyVg9TMMT5KwTNDE4ahRULuYz4yLxh8Rp8O7Lzwxtp/jl9QmazY8nhfTYdEes8lY17Y4rKw4/LByIQJYaPCB3pSNDhSw7jBIYzxm1pHOTeyT4lQtpvtncLDDTY7t+x3p3Q3UjyCGtQFDsdwsSTM+mJscgbbnbpj5BzunFOJ+yDyPCY8OVgIEHhXpTnmV+nwqDAo4y/co4WM8pmAhZwEImtFAJ0I5CaweQuhHd0uNu5+JY06bQD5akKafv3E0U8Pd8EzrE+rZHWoxQ7i6kO5zQ4UVq6Tg08HKSbT6WiynvnbvstE0vzND9E2CNnATk/ZPd919TczSHjlR4rYauVgsQ0hRPDuO2Q/ZSPf/BH/wDop8o+MYtR4clvqKMXppRCmZsHqJzJQG6Pc9upayNnBNajk5OT19D5l/p/nPGf6aT+U/2USaggnA8hRvvlQm+x8TXJxc12mtlrc00/ZFxl9AUcYjFd1KkCRyrvKMjxkVY7B7mD9euX7lTSSN2YEMK13qk3KDQ3hSagRpU2wtQSFzt1aJpDffKvtkQeQm357q763UYWgcFazgXCviUxwdwmoLFSFrQxvJUcbYxpGWkHlGCNwohNwkTDYToGOTXmPZ6ErSnyhotRz6xaYbTn0LWIxAtFxdD/ABULwWaPsoW0zKb0PbIP4ILFR6gHDkKGQSNsdplYPKwb2vaQ0o7L6gOpi2MHhRt0NAWLYZXNYohpYArWsJ3qUsugWosQJQsREZPisPO+I9OXj7p8gYd1JO9lOrZMe14sdsx4CaKFe286W2opDG9Nka7jOsigc5CA3dMkaRymgOlL+2Vxkdo8KGENOye3dAbLlEIogUmssbpsDWnU1TOc0cpgryidShlDtvYvwe2SnPqk2qpOFhNf4dnf2W5UrLb/AAUbtTbHsgXuc3DII5fUo3vaC3wmNtqDQ1V5RR2Tk9PZ1DS/DxsFUp4xq9K0TaxoCinmwz/zBsVBimyBAgomlz8lSdpds5YhlbMUYawU1My4NZjZ1Zh2p3cUciLR9KKKKcFIF9D5l/p/nPGf6aT+U/2USamoILSodu2lK1sjdJWHjIcXIl3hW77LUFYyDr7HNvhSB2nlRh3hN1+cum3lNPj3juo2iP0DsdxspAHgKOJrTYXC0eT3HstdNp3Q2R7jyoghXlYuP8QwtC+m4jERx6NFqPEEtBcwhfigTUYtRQOLurLzkM67CLCe7RLob5TDpCxU1DQE7DenWFFWILY/6qfSyYUsO4OZtlLM34BQv/ddyi9vkrDkNe5gzc4MFlOL8RxsFNNBgm27crDR4meQ4lvptT/UX4XaZu//AKWBxcbZXSyndSY55bcY/wC1hoJj+bMd1I+fCm/kFDO2duoZabUkIcN03D+oH7IgLGNJZTeVgz129RyLQ5DD6XCu17dTx7dhSPD/AEBOw7HBfhnM+BTJXN2kC6gWsFdQDZF17BND73W6oldJtUU3DtbYCfGYfWxRTslCJAXKxMpjFDkqJhqymNpBtutH7ZOCKdLbwxRoLEu1TiMItoWom+gIwtK6Q+6a2vPeD47JW7WEaq0LrdOYHiirc0hqrsgBbqb9jkPdK5U7dUbgsO4ltFHM7p5rlObe5R22UqlG4WCAI3WOa1rdSmbPKeo0UFhsTNA6isNL1fWoZes8uHGWIO2kcqCDpc+UcPRtqBEYopr2u4yJLStQcnDzk/4lQ/H2CinC9kTWy9SdaJKkJK+hXcv9P8545wbhZL+x/sot03ZNQVgIKMI7IZlOTBTezpN8LQEY63CD/v2YjZiibQzJpNdqOwX8cz7f69paCi3T8VqcPCbI794IFXmUbVkZONIN+/but1ut10qN2o+r4RkANSFMY+T9ooI9NpoT49rbsU06ha3WquUN8r7cY7oYhOx4YxYdr5/zXIDqekrCwtZI4tRYCQVQC0AprGs+KmaCyyosLGz1cqaEk9SP5KPEAnQ/Yp8jYxZWK+pN1f4TcTjMSajasLgal6mJNlCZ0tiELEfTjiGHqO3TMIxmDoDel9LY7EPEknDMiA8Lp/h5dTfKv7oupPe7wFdN9KY0ndyMYKdqwUpePieVHKyUWwpzdbaQ1RbHjsG5v23RNebKDQ3jNy02N0+Le2oxt+Sbd8dv7ydVG06nPN/0UcTpzps2tL8HuZVDNNina3N4T5MQ3ZrR/wBp2KxbeIwm/UumCZ2EJn1LDOF6l+Lg069YpO+pYS61p7mkagVgz1tUn6qJHbdYL/yJHTlSj0lRt0tA92wTsmvDwgF6laPIPbq9ZAQQ9+Xik0UiqRRt3C0gJ6kdpCkdfCkvUsDwnNDhRUkEWFeQ81+q0Ndu11qK/h4Uepo0xtWmdx3dS0ugOobpkgkFjN0X7zeV1BdFbJzf3ghK1wX4jT8xSOIjc30lNcAFYPHeUUUebRTk5SL6FzL/AE/zkQsbEDh5Cf8Aif7KGMg7FNDvumE/vILQ08oRkeVG3IbK1eXTBQ27TlptaS34rqEchCRp4KlcCQCupewTcj/sRs4jMu3oIg8pupaiOVZQdfZaccg5D1H2jyuq2FmtywrS+TqSncoJpt/6IJzdQ2UMzoX9OThBVa3bwhIgUOz6uG9P9VG/S71LDz6xQUQ32WEaQwl3Pa7cUojbBlj3MjhMjuQm418zvWovp8r3dZ1BR4UgetybhYmHUBugMnseBTVBE2FtDLhOpyu/SiHs3Cb6haYbFLzk5gdytBwk+ofHP4GvGT/sENu85u2aUz0torc5y2dk02EQmD1dtI8hP3aVOSH0Vh5WwQGY8rC/TJZj1Z/KjibGKCLbWkKZjZPSn/S4H70o8HEwVSfg43DhSfSb/ZuITMLi8H+zNhN+q9HaaMhT/WTIwtiYV9LZowrVO+qb7Rl+yLk19p+p3Ch2FJ5czFD7HslfpNdhKdD+83lRmxmcufZsK74Wu3aTmUd1SKcpRvacKCl+SwPCcQ0WUQ7FyF5+PhCPZRWXkIbDI7qyx5A8prtQ7P2R/RF//FPYJPW35JvqasThvUHxppsbqh2nMopwRRTlIvoXMv8AT/OeM/00n8p/sotk1NW44Qf+iDgVHluq7ePYItGHewmw9Tdy/DBvBTA5vyRsLX90JAr39oIoZuu9si4cBOsbpjjJdINRZadYUY83ad+iY7UEMrC1DhEbIce0cQy02LrNuZQxssOanCcyAfupoAQQTmNfyo+EBa0hPhD0xzovS/hNIOdpsX4iTquWL+nRyjUBui2TDv0rD4lzwWN5WHvpi+2kJW4fXr4TMTPiD+U2m/crF4aeVhbyvpv0qSKTqz9/7I/pmQCpW0NbeQgdQtMGlxCZtIQhm+NsgorDnQTC7xk4WEx4Ox5T5N9gmuDtx7AGyc4NFlAOkOp//SA7CE0aXIqg12pB9mu15qipn6Iy5O/N3cvpuFdIeo/gcI2qcfK0/qtDVQVfbsc9o5TsOyWnPCbh2AnZYEmnsPgrHNcW+lYeXqxg91ZXr2C0FqDKKCvKaITNpRyaKjfznJQIvMrnIN0lc+5q1HSqRT2B43UZcLY/nM5ORTlJwpfksEdlindaQYcf1TYwBSe3SsOz1X2SeiUPPCsD1A7dhc0bFBPZvqai5wd6QpHz3q07KGeOX4orZOJag4EWMyiiin7BWnIqRfQuZf6f5zxn+mk/lP8AZRpqCCC0gqIVkT3tNbew5MFDsLQVoRFOFK/9gRaAcNnKOPp7DMhaA138UJKOlyFXtkURaaz7qqRvwuo4eENx7BjbfCiYJTuNk37JoQQy/gmEaqQQyLQ7laDH8VG/XzkXa3dNqDQFWyx0W9rCQ07UsO/93N0zWpkoerA3UbWyfmEZea9ghNGnbsZ8Qn+kgp1Bwd24mJzvWzkKOZ0rba1aHu5KEEZ5WkjhS6h6gN1h8Wyb0n5K+91Sv/gmtrue3Umm080FE4F47XCwsQ0SkRu4UuEisRxjlRsEbQ1vfI4NG6fipdXTY3dRxOr1ndBgCpPbiGbsNqCfRiSHCtX91iBtssDq3vuLw3lWZP4IMrKlS0KsnxB3q+yBIRlo1SkZqG6hxHQcYpOPuo545vgbThfvyydMWmcb9ksYkH6qK2tpx3yOTk4Jymft6Vi9ZIN0sPhHzU7V/wC1g8L0RvzlM3UFh2lo37CLQh0E1wU0UKz0DlURwur1XaWrjKSBr/UOUJdB0yLbwtKoI5lFFFeUU5SL6FzL/T/OeM/00n8p/so01NQQQUfskWg4jZ3eVXcMqHtDvH27HNtEf8lpYN0N0U7ZMXJypGQg0mzA9/Xs1Sw7QwUE1NTUMus0IxiX5L82Lg6gopw/bgoZUi3yuG2sMPTqzxTdRUDKC6PkJjvDucixpRgYVNhvQacmRUOVpAXnI9/nsbTNlMdbdk4gBupX2PNNtMFNyG2VLEYO3dWP5KH1M35Wgj4rVXK1govaOSjOwIz9f0xFMYGCh3lO52Ujjp3WHvqBDfMmluTZVl0h0pkQZv5Vq1eRkY3koStPC9ZQi3t3diYw9t1wmRRytDghHpFNQNcqxluvU5CNo9onpcqFuo6ytNqWNt6isEzpahmTXuFAZUjtnH8nZuTk8/dPtye1Ysa3Bi+mN0MoqxxkRartxLiGFMxrGM2Cl+pYcsolQ/WSXdN3/adjwPg203rYj5GgmRtYKHY5rXinIxafgV6x8lRPlFh+6PYU8auF4T9XhOLq3Rkadl9CP7X+n+Vqyxn+ml/lP9lFsE1NQQQUfbXaRaGZ9k+/q1nstOj172msIO5yBGb9Me5Uc7T8eFrvwmm/CKHZpB8LTXHdTbUSagmqwFTnJrWt4zkgD9xymzBp0v2QIPGUkjGNOspmI/E7D4qFmhukZyi3KNtDKWISBRTOB0SZy7MKBV+1dP7MQ3UxRRt02sQR6WphI5Cs5yC2lMOpoKPbW9jJyBRDRupCCNhymN/Dy7cFDf2CFMNwgBH6imStcfSVqyfwnPACwwcAXPRP2RbIeEIifkUWNK0NWgHwmta3jM9pCwzgHOYO0u8IbZ2hv3zMD2EFRuGgbozxt8o4jU74prmE6mlA3vlVobdg7yRx3O2Kld05eowrqBzdQRmaDVqTEaN076tHwQh9SgcUZ4n8OT8SHuLY/wDtOe18htYBoIQZS3QOVWgfByc4N3KxmI1+lqMBOxKbgI3nm1N9ODG21fT5C0U5RuBG3eRaML494T/RRzOd6ZBRyKJRzcUU5TwNduvojHDq0ft/lSGdp4UeJ+6xTw7DSfyn+yjKjNhBNQQUftn79w99wPhMdqHZKdLVFx3H9E4uaEBQsJjjyQg8FFoPKDQOMiqQ7B3loJ3UbHN+JTJ9LtL00jlb+EAgh2UpsLqFx7FN+pBh6c+zk6X8fPpHxC6JYbWHk6kYOenU7sfEHrS+MendRzB+3lOoghQG4xkNuzUrQKtWpPuhuM5PgVC4OaKWIcOq0d0QoEexZDq8I7ION6VFHXKnjFgqN3j2Xs1LFMLISSsFpe8oCvOUrqTGCt1Q905Eqdj4pROxR4xjtnbIODuMiQOUNzfuhkbybahDG3gIsBTsMx4opjDFt4QIJ7T22UXgcoEv4WgLdq67L0nlFwG6snKWETCisV9PmjGpzvSo2O0tbHs0J+DZJ80MBF5WJwER9VL8JDo06VP9JY74Gk+FkDS1oTGUbIX03492JfsoJHvNFykH3KkcdewUWiUbKTD16mpjnS/luTojCdgopfBTHq77yAeVM98DbAsIStfwnblNsjdFFFFOUi+jH9r/AE/yotbt/CaGnYhY2ADDS6f+J/sm9Vo2Cim3AOyagggo/c47HOA27j7A3zMe9hNN854iXT6Qonk+wAWIfcf7I8qJFjXinBRxhp2QQQyCCCCJDRZTYWzOL3DlRYZkLiGilo/dUZGGkrwcwK7pYNbtbeV1CBpfssN+zCpHNzlqWpAq1aebCaexwMLi7wv2819zdvYItFpZ/BRtoXk5ociKNIOcgb9iZpewtCODeSCfChceHZOGo99d9q83NEh/gnxNeFJgHscZIyjPPABe6GJc7co4oik2nC/cj+TuwoD7qlSr7IucPCEgO3cRqVZzxh7VDrZEByUNtsiaUjOqNJ4yKKcpG1uFq1cKVYgaXhfTfj2yOpS+ook6rjTnOOzgmmNrjajnEUtjhOxYxB0jZNiDSC1MAcd1Nhw7do3UTwBvz7RgbdhOL2UHKIU1FFFOTlIvpH/2/wBP8pmzVINPrCxMofhZP4H+yjTmCRqZiC00N0x+sJqCj/2FBOZ9k0u8q8x32ht2cLUia3Rfby5ROAC8d/P+z8qJNV1RQNoIIZDILGv1EQ3t5UWkt9KkFU4eFiGFxFGl0h5UUgEpi9ikRfKbihE4wgcIDESbk0ujIG/LddcNOl66jTwnFFy1pr9lrWpOfSbImvtawpOo74KSIub6ymYZuHIcO6/X7M2oN0gJuwzcLVAqq9nhPICEgPHb5R9myOUM4+MyB5QiZXCdhWncKDUxxjd7jNiR2WtVBCRpRmjHlfi4iaBRxEf3XUDiCAgbz1BXaHY/4oCleQeHkj7I9hTxtSjbo9JT1ieQvpvx7SLTmFz6YmwaG0E5ikjTYXEbBfgHP3IUeFfGbtAZdRpmLk2TVlfsYiyxROGnZFFFOTlIvogsyf0/zkd1ivy4JB+h/soxaEZ5C9QdQUD3at03dBR97tkHLUrtFDstHIhD9FIHtF2hsO9+7wheV5uHkKZxlj0jyhhXV6lG0s9KB2yHaP8AZ+VGhsmfcoAjdqYbyGQybM1zS8cBQfnt1FSl2G9cac4ui1NTJZX+l7U8+m0Y3mYTDwmkHf2CVhy18jpSg6+Mnta7kI4aM+EcL/xcnQTjjdfhZvJX5kexQxFmk11rm1E0BDNwtTtLmbKJ/UZfY52kIA1vmO5g1HWcwj233FoPKMLE6FjhSa4sOh+d/ZcL9fZ5TT4yJoWofhZzf8SmmxYynbY1t5CjxMh+QUcrZR6faP7WlYyKDAEWgil0AugwJsEbeAgxo8IgFBtChkWrSj2lEbKKPRueSpCQ3ZMZoaGo5lFOWIBHqbynTNI3WIIJC+nfHs4XU6vpjTGCMUMyAeUOM5nua70qWSm7lRwTT2Wprp4NpQo8c07FNkDxYQRzORTwHCioGaPSirycipCvoBsy/wBP85/UIw7Cy/yn+yg4TEY/VqQZ5UdK1F2XS1LWfspJaF0mSNcLGWlA3nstJ+6abtFBONnTlL473SNbsh6t0MrpA3nQTgq3QCrtcaHvX3eQo14UZtBPf0iD4TXA7hBBAqdxawlTSiDC15KwwqMWsVB1W7ITYnCnfhYDEuxDzYU8/RP6KMhzQQnXCdTeFz3zv6cZKwuFIYo7G3eW2pMACbC/DSM43TGOI4TGkIdoboJzkk07DlM9Lt0PYcaaUz417ldjmB53Rf0X6fCcA9qY9wOl3sjKswKN5O47H2VExzecnNtSN08KjG8PZxlavI9tXLZ49p2TezjNzqT3yctamyiS68KMghHc1mciinJwtykAWLrZfSvhmTSxErnHQxQx9FmnsedtlG4OC6rbpEuds1NYGBY3DOj/ADWu2+ywwqJuTomP+QX4Qwm4uPso5P3Sj2lFAuu6RcE7Jyc5TG19AFGX+n+c8Z/ppf5T/ZR+l1phtcoKt0wEKIdlKlSeLFJkAYbC9Y4TMU1/pOxQ2Wpv3QcDunTAO3TJ2V8lE/qCxmxlEk5P3Cbx2lSRgqMdMUEHffIhDN8pbwmnULVDttF2nlahI4Af7TyFGuAo26ECfstId8k2MN+Kb+uRdpGoofUHYuTps2CwOvFG5t6TRQrJ0TXpsLMPuzypcAX+rVusK4xt6cnhSUWFQu1MB75ntfKGHwmVWydtmO+d3T3CjeZDv3nWzcbrqhw9PKEfkrpobZtdZPa9tikBXs33hEB3KEYHCey+Ex2oezatc9jnAEewW2mM0qSaTDnfcKKVsotvfI6kxtNpWWqweyuw8rlDbtcSwWE3EMfwh6jaJT2XJqZyOUQXO0DhABooZnIopy5UimaC4LAChniJvAWDGr1u57HcKaXSsITiJDvsg0N4zxDev+UoJOn+U7wuc5GB4QlMTgx3GR7Dk5gJ1eU4OC1jhPFpykC+hcy/0/znjnAYaT+U/wBkxmvlMjXUkg+e4TcRGd7Re5/ApR3W6h9kJ8IkJtNhIO5XQYhAxvCaxn2RhjPIQaIzt57Xu9O2Q7SLQFZDbIcI5Ytzo2WwbrDm20jsuuBypMaBwvxEr9mN3QikO7nLoP1WHIRE/NdID4prr2Vf7I8qMpw1NpR7ekoIIKkD4K+pydLCv/VYXUDY5WAg6bB2VqIdlQ1bp0QPGybI6HaX/vuJ0iyoYtTjI7yuMh6TXsxuL5TrC0hrvYmw92+M05Q4uRjuniAuU4OPCaCOTlGKvta4P3GV13SSBlX7LZPUVbkDvWTj+Zsmtd5KrK1Z8KnFHUna/CHUCFlDMuAFlTv9QCYdQ7JNQFtQNjP9VOzW1Hq4eXUzhYfENnbY7gdc+ejewtxymnUL7gdTvYxDdI1tTJ2P2aU+WpAweU5oaw0omj5/fsKKKcpr07LwpVM4Ai1gDqG2U8jh6YxuosIb1SKhkTWeNFcL6W0hzjnwojqJcsa1/XBasNMTsewtBRjc3gphNU7IoooG8ipYw7dSvmiTZWyhSL6FzL/T/OeKOrDS/wAD/ZRJoVA7FHDAGwo36naSmhRe0B2DIiwqICbxk40EynP/AIKi3hBw7nBDdV2WiL5Ri8tWl7uSvw8Z5QgjbwO5/peHK/8AZVuExodyntcG0wqTESx11W/1UEzZAgggnyMjFvNL6jjDindKMW1YDCAPr7ICsguT2WnUdig/Rsuq1GQJ+JjYmPDxYWId6qCidtnJsL7wifCDQFI1rm05a54Nnbt+6Y8H09wvypoRM3SU1hjFNT8R0/k1MkbILbk/0mx2OOkWmjSM3HRuhvuFYCY/XlK3U2lHekX3lAuu00u+y9RNr1IQUdSL3sG4TXh3HdpCCOV5Yh4YN1HGXblNbpCdO4Gxwo5Oo282DT6ez9E6MEqb/wAaZj2+U1weLHYVHHTy7tANbK+yUkDZNFDId0l4kmNmw+6d9NdhniWA2hifz9Um1L8bG9u39k0U0DMoo5OTk4KTcLGatqX0m+n6vuiQBais28+UOw+nhHqeAvUZvUFhh8jnMaYoRTVi4DINTeVh27b9zm2pJHxC6tO+sws2eN0yRsrA9vBU8mkWoXahkUU7dS4ejrYi8OC+hcy/0/zlISG7KffCyfyn+yjTEFVikyEBMPhReyeR7LdnUnGk97pXhsaYwMFDIt8oHusA5HnK74QFe2RYoq3MCBv/AGPlRKdr3MuPkKHEMxDTDiBRTGdLUInKD6hPBtOLX4l8zLDg3/2pnNj/APtJKJdYdI5YV34mWgoz0sVo8EIZE0ENh2VaAJm3RanNTzWyiwodu4LpFrToXplkBbymtzIsUml8Q33CBvteaGybxaJpAat3KfSIzqWBf+67nuJpcrcIgOXR0nUwrURynFpCY9rhscpJmRfIoYiOQUU3EROdoad8+VZjkLSdl1WzHQ3hB7BtasHICu+lXdpDkT0+U17XcFX3VnIAW7oNAUnxNIt9Kid05K++ZQ3zPyvLFiwCoLaduECHbjMuCj47nDUm3W+cg27SaOZdq2CiFIlFjMT8h6VQAoKLa2/btKKKcnJ/lSjdYfEMgppTJfxHHCJ8DsJpAeTliANNrDgCPbNw6jv0VVk3VFIWnhDtJTt+VjcNG/hYbGfgmGOXhT4xkwthWEoxhwyKKcipowTYX0R8sJlvfj/KjnZJwt3H9Fi9sNJ/Kf7KJNQyanN+yw4I59kn1AezJ6fUr6jbUDNDew89z2a002iaO61dQelRsbHs33n8Ib/7A8qNO+rQxu0t3/ghj8HiT6xX6qWWN8v5Z/qmMkP7N2pOa+N1PUZ08LC/T34kh70zBQx7/ZRMDn9VDL5HsGTW0dWWm102k7rTXCuuU6Ix4nrN4KHa4fvDldWvkrzcgKC5KOyaOt6jwp4f32chMfraHd3GVKstIKkYOG7FaJ47t2pYg4f5S2CsPhvxHrRwJvU07oHEjYuTAfJtU0/JtLGwYm/yzqUOAxUkY1voJv0yED1klOfCx2iEn+iYZQN0ZdItwTZGyC2quzf2eVoax1rSO85SGm5FPbspCWuBCjfraDlJs0lQm2DKkRliB6FCNkXdJ36HJxvZO+yAoV7T+EMhk7cLXewWixTinbCkzhH8w19lXjJz+jiATw7bsORTk5OCe97pCG8KS9SimjjID0MVHVMWGYWss+e9zdQoqFvSJZ4ylLvi1NFZvFhNO3YU532UjXP5KnJi9VIMbMAHDlTYMwG/CwJ/J4yKKcnKRfQuZf6f5ToRyE0gLFm8NJ/Kf7KJMQTUEE1wagQeO9xoKNrrLnq+zleoK8pnVshA5hth27T3usH0oMJ3euO08e3sz/YHlabYQsM0MNLCsjla5p+6k+lFu7eFh45oXaoVrknZ+bHatsLtbRt9lh/qmEazmij9Rik2aVgpmmEC0CjZNBNGkV2n1HTk4lvC6zncBDYZPmYzY5Aui5Q37ZzQ2UTtTQSiaRBKa2s5NyGICgiE1wiOgrUCtQO3fa8ql+9k+NsgpwUbGsHpXqPAThIw34TViMT+5HyvXHHoG5XqP3RYZBTiocPHB8ArpPxTFDE0DWRuVp8hG1v7hFrW5hoob+xI3W8BDZO2Np3CsPeWKNmhtZO3Ci9Pp7ZW620EHTN2ATmyTely1OhOlx2QYVXq7SD4TeN+wleUdkLO5TVapRgCxlMaavi1Q/HP6q38rX9lE4vYHHM5vCedIT3OPCNNGylO4WDa13IUkTHjTSG3sSnS7UmP1BfvII5sdv2EWtCMakhBC6fRdpPH9loc5uh6w3oaWHlWrycnKRfQuZf6f5ykhD1iNTIJQ/7H+yjTECmoIJoBWmjY732duzfsLQ5Mtp0lFlvDu51nhN1EWUO2/VkUAj2D2uUXdMbr8QfDCnYss+TCm4xrvBQnaV1GrUMvPf5UfCii0yelfTmB1u/Upzg0Bn3TYGsHpVCP1KaIynUAo8AJPCxEJhIjZ5UMpw76esO97t2vsJoACCrMpo9ZORQynxAjFDlQMvc+Vw1F2oUonEHSewpwtRcUFXZ8dymtPJzcwP5V6NkWNciDD8U1weLHcE51BN4yNDcqCSMTOYgpjTU+e/RwohGZbj4CM8bBTd06TEEEhtKCOV3qkKICnniY0hxWDwvU/NkH8Aq7H34TS+91faO1xHla3A/li02drtjsucyLVubyEDa63/lEIG1ITWycLZSl/LdYCgk6rA7OT0vDu6ssf4N+VLiSfRDytBieDe6adQvt89rnaUN9+y0PkcpN6Ce4DZRim1kV9SFwFM+IzKKKfJvSe61I7SnSA8KR1vWCfQRkt4aEEXUhJ98xm9lpg6e6Bs9p+ZQeW8rV2EouWIZ1RpCGwpYyUYY9WlHM2UW3MpykX0LmX+n+c8dvhZf5T/ZRelMdaagUEFHl57vPsyNJFjlDff2qycaTR59gCj7b5Ln0HwgnGlM5+m2cqHEPk3LEDeW6ma4j0lR48aunMNJQPaeVEsU15k9HxKhe2FmorBuM1yv8rqJrX4g78KOBoG6LGxcLDRjEYoyH91S4KOXwjE7DP9KixTv3wo8S12yDw5XnFuScjvkeFh4naiXoxkfFRXVOWlPHB7CQBZTrk/gmt6W47CaTPU6z2vbqGRFprOnwrHaCuXZyDVssXDceochDGvgj1TJ31GWcfCkySNry6S1hMMxoMj/3k1un4ilXkouJ4Cklc9/SZz/6UH0v8zqzFDZHtqt0CD7TgXmgmsDdgi0FdNzD6Fc32C3HKMteCvxIHzaQhiYnnTaET3TOc08JkrmbPCY7Vli2UCRysPinMLW5ybtKjdqaD2uma3byvxMh/cWPdK8anlMxUuwb4WuVp1OUOJn/AONpuKYTTtkCDxnLZ4TNVb5l4aLcm/mnX3X6qyLgPUVF6h1DycysUzqRFq+nPcYtD+QjkUVI5SOolGk4hTAfIJz91DbiN1G7RsOUx7xyEX+U+cJuKcNimS6lqV5Eqtkz0mj2winuv7p7QQtLhsF1HtXX+6El8LUiQVLqbuEye+VjI2zMorAOr8v7K6yKcpF9B5l/p/nPGf6aX+U/2UdJsQ5CHpTRaaUFH38K6V37MZ5Hae/TZtN/2byA9AqrThshDo+K/ihnLhmTCnBDq/THb+qM/wDpf/MYdf8AzGHX/wAxh1/8xh0eVw3ZYmmtFi02M4qTUeAg3Sn/ADoLBspuU+zCvp8Wlmv7okBTAGio92hGNruQjgntdqifSP4qM2Rf8FBimzbeVqURN79jvV6QqGRCaa2KfWlMkD23k54atJfu5Vlej+GThapMjMctjg9p37dNG2oytb8tkHg8IAnlOZW4TN98i7SpcQ4PsJmNEnpcEBE6Q9TleNliI2ubwsPM1zd1ac154C/DPkH5r/8ArZCJjRpAUZ7bycNQopseg7ZnKsy+uENRXHcUQjh4z4QgOs6TSe2XSW8pszsPQeo8c197KV8cjU9oPwCjstF5ObqFKH4Vm4hosp7TN5oKOJsXCeLCnw34h2m1FhGwjfdYmEuFrCcf0Ce0UtmEL8xvm11Xj5BCiLQ3CGy54UzNQFKN17HuHJRKlhEm7kG1Q7HjZTYqLAzan+Qv/mMIfKjnil+DlrH3UjwFJOC+k6UOdsn4mkZgdk83spqDgsCLCY0DdM3WkLoxnkLpsHhUFSLFTgmX5yc31odjmObKSFK2QhRMk/eRa7hOaHbKnxo4gtHrTZWv4VrENr1NQk1DSVrkimUcmoWrVpykX0LmX+n+c8b/AKaX+U/2USjVWmoJqi7zwqsj2mBzZDfaHtc7SO45D2Ch7VSPnP2TRWV2az0hVmWhwor8LB/xC/Cwf8QvwsH/ABC/Cwf8Qjyo9yApdjZWHi0tWwBtRN1m1GNLcpC/ESiJvxHKGy0gqa2tNKI6hfZ0mXqrddNwNoOR4yLvCArsItPYXbFRwgN9SMLChCGGwgb7NFfFA3lXtvY14oprGsFBWjvm4gJ7nSPLQNk+Eam2nwtLKKawRNoOJUgDzbHbrC4BznayaCazpjZNN5HlE6Zf4oHs85FWSht2alrC3cq9uG/OWKiL2+lMj6Y6jwoWQyM1MCOGb4QimZ8XJ0+JbsWLVjXbhq/GTYV2mZuybj4neU/GRRC3FfjDiX7cKHi1anxccLSSVgWgx9Xy7JzbQd+Hk0+FerhTmhtlSutxwm3SItXpIGVIfbtlYfkExn6r5HtdsLWJj/GR6k3AF3KOHlhPpTRiIzqa7dSYnFj5J07/ALpsjwdlK46bKiN0i6hakdbl9OvSmN1coZ+e2u8Ot5CcLz0BFinh6oIepQ6A+jhDGuATsa17acg8n4qXVrsLDn0WUHitsiVIV9C5l/p/nPG/6aX+U/2UajQVhvKCCi7yd6Tfv7Vb9jxr87KQt1VFyhuO3n2pRYpQ/CvawxL7efOU5cK0qAHk+4eVCiwOFOTXFvAXVe7YClh463QUz9EZKwYPRDjycrTtwonFnpPHdLbfUEydpU04iG3KhBrU7nu1crxn8e1wtB226bwnmgmOvY8947v1zqyUY29QWjwnuDQsJhHyu6ruPCafGQ2OT08mrCDkD2E0g68972RcEdbuEI/LveYNzkU6MPBYouphzVbKTGPjF6FH9Shd8tv4pr2vGpuRaHCisR9Ihk9UfpKxsM2HkAk4WEjdL+zUmJOFbodyjDipf3qCb9NhvU/dQvbBIcP/ANZzt1cLDy0NJRbqFozaItaYHvFvTuKzIzItNN9ktkaWoDSK7sUDI3pNPKbGGxgBCPdOiZ5Ce0tNtYpw8/uL8G3p6gN03AQgWWqfDgjhSQUdScSE/dy+lt9CaPcOxtBHKMeonuKlw7XigpsCRsnYQ6jSGHm1WhFI02QmOA54TTe7VqVqThfQuZf6f5zxn+ml/lP9lGmIKr2W7UD5URtDsG2yJX6+094YE9zxGXqB5kYHFEhosrrGY1Fx906F4FByEbYm2mimjK1v4RBTQBk41ur73bqPbb2ZjpjJKwuIi0cp2LhHlSYuJQzMeNlft72ow5o+6OM0upwTHNk9TSmtKjFBBTtdPKIxx5QCCCPCYb9KFh1drxqFJkLXDcIxdF1nhN4zKBRK5NdhFofr2yx6vVdJpJGyJmrhf+STQag6ZslS8IG/bcLBCZekXl1nCUs4U7hHUt8KXHivy90xhm3kFZFtqii0lOe5pWu1+ib6TpQytavAVdnCJ3/2DCdRBzf6S2k+SkZr4RHUBsLD4v8ADSOY/hRTxzfA3nNCyduiQWFDhnYFzumLB4WHwLnP6+I5yd9lj8O6QCSP5BYWbrR2r1cKc9OM1yocM7Tqfym7tQhFpxpdQdRseddhsHZAqRxPpamB5+XCG++RNK1a1KaQRxl/2UMwfGH3uU6V3BTcWzDjTymYmOXhSSBotTvlcPsowWDSUU8KVl8LEDSFp3X0wehDuvuK44yJoWVEa27zsjupsKyTcbFdN8J9Sk+NpwaumRu1Ne66KtSL6FzL/T/OeM/00v8AKf7KJNQQXKYdOxUJ7SnEnYJjv3T7WNMjpmBnATd20VCzpt0hTkTPEAP8VtE3ZU9w+yeKZ6io8S1w/VF7n7AJjdIpHLg5EXsr8dxK1C05+g2V1fITZgg8FDPUF1B4WK/NjcxNhnjb6FF9Se30uUTvx1/oo2dDY8JpHj273QcGN1FQxtmskKXBSRbwFHE4vD/tWrCYyOaO1HjGWYzyvpxc+MyO8lDIKkfSdkebyGXCbvuhsU9moJuqEfomuDhYzpONBNG2Yypcc9kpLzpCaKFJ1oJ7Q8aSox0/R2X3udpFoYhp21JoDVK9nUGpFzJ7jj3WGwseFFDue3WELIQ9QUjy0AhNctdLS525QFdpNrT5Q7K7rW6r7qlSeKN54pxZEXjwvTiGWunpHpUZcR6ljGW0kLDT6JGkDKsgdRzG5vJ+HMZ1Q/1UUmoelSR6xvuo2vjOn91MNty/eTA0v1HKj3SHS20ASnbNQyJVorUpm9ZnT+6Z9N0WGu2KZhWM53RiY7wnfT4SbpDDBu5Np7WyTNafCePK5T0/ZY4bIMql9NFN7ym9xyduNk1tPQzPY8eU02E9ocKKfHR0qWHUNk1tIsFWmbGlIvoXMv8AT/OeM/00n8p/sok1BBBFlqBunsOyFnJ6F+fYcdlGGudQN1/dWEy5nOIPpTI2Rn08opzwFo1/NOaAdYzcaQJvdec3bSdzitGndPa8vs8KM6fSUW6l03BQjS60Xo6nKnB26DAtCZV6SnYGCTdzU+I4T/Sx88qXE4utPSUGNdC7TiBS/ER1doStPBXOQVKlSpUvKm/YuWFbUYQ3UzQRuujEInOA3WMwrcO3Vqsr6fiGzQN09lqQ+oIN+6ifYI+2b269kBQrOlXSN+ECDuM8S+gG/fuvLhWi6+E1mnfygrz8oi0WfZaZR5U7JyPQd1GJoRchtBwOU+IZD8io8XE7ynyBqMQebcnQRv5ap8LKBcDlihiA8dbYLCdMRgR8I7oHwe57C06gm+rcI3emk2XQ/pHlMb5PfSfZ9LVTm8ISeHZ32c7d7xYUbvBye3U0tKw7H4cnUPSi9h8oyCtlNrmeWALCYFmHbvuc3GhaYNIz0hC/OR9Eo/XJzbCidp9JReTsEdR8qNoaPYeLCaU7fbL9EVacU51JmwQzKlOym/Lp7VeoWnek7opy+ocAIt4WA49gGkCD2kWgKyYPVaHYex7jEbC1B24ThacjpJpOai3dSL6FzL/T/OeM/wBNJ/Kf7KNMQTUF4QkDKtRvDxtn8s63z1BFAq0Udlhw9zeof3t1DEGAqYiKNz/ssDIXxAVSaKUhpMp/qrJ3CbxlKOCqtqBLqORKkIFOVgonJxoJsofsEdLUG/dGMFdJoctC0gdmkFaciN9XYQDyjg8Od9C/AQeBS19P0gcJmJjd5QkaTsUHK1atWvKcAY3AqH4BNUl0nHUyRgUeBdiIzLLysDO7Cz6PBUcuoJjwUXajoagwJ8IeKTHvYem8KNxik/jmPlXbSdDXxKZIQ7Q7J9yYsM8D2Q2yUBXbyvPZWTmauNlpd91jMEZpGkFQ4SKAekKhd5DLHYcYiEt8rAY0wv6b1G8FP+4QN9zhodaJt+yijaJXOPKtakHK+wvc40xNbpymjEjaKjk6foemua7g+5acy9wnukGwQa9wpxXUaHaHIQsCdhwRsoMKyD1Dnse4h7R3ysLtx4TZBwcqXCI2TePZI07hN5srVqTTaJycpHWdOVoHIqU/up0YIpNBi9PhPFop26xY1uAUmxCwPHsEWq0nvvZMfqfZX6q+941Jn5btKKxDtIWIcY52HwUDY2TgpF9B5l/p/nPG/wCmk/lP9lEmoIJuXTbJVpkfS3bkewZG05p5CEr2bFB1ryF+8nDUg0NFJvC+ouDcM6/Kw7Q1gy/VAVsEfSnu2Q4ylNCkMnyadkH6jpCApTQu+URTcS4fNNc54tqktrTqUGGbWp/KDGt4zlLg6wgbF5uvkJrg7jspatJoq77nwxyfIL8NG34ClL1460C11sR/wXWxH/BdbEf8F1sR/wAFtaldUe6h3FoKThdbpYjdYeSw6Mcp8ZbjtKhqNyc1vKiDAPRkE5oeKKllcxwjKiOysJl8nvc2911QBZUMXqMruT3E0uQn34QFdtK01193C1Ibm+5x2X1LAOj/AD2/1X02bW7RI7+CjfYr7IE3YXUHlBwdx2PbqFKNmjlRkOc5yJ+yAcfKEZ/5KnoFwO4T5Q0WmiSbd3Ca0NFDsc1pWgDcLrOYN91HM2QWFd+65mh+pNdv3NA57ShlI3UE3jnIi1Xbe9dptabUjhEwkrC46N5LbWoFE0tVqMa5NX2ytWgVPK2FmorDO6zNbucij9lJwrobrEj95S8hYHj2SLQ9KDr7b0ur7psNSEnvORUzfITXWFOA5htTwmWGgd1hnu005OUi+hcy/wBP854z/TS/yn+yiTUFdLqIPtNITHDhayNghnJK2MKGQPGZUjbIRD+pS/fQ3kOTjshsFK9pe4u4aoL0C8gK4RThacd9JURsZPFvGUs4ZsEYLGp6ijbGPSjqQnJdo8rSKop0Zwvrj+P2UdYh2vx2ytsKI23sPpNq77OUBXsWrCsKwrC8rGRdXDkDlYX9k1NT+Fj/AEP1BSYrovjnHBFFTyCaRs0YshPx8b22zlRzOmYC1Ydrw6nFAUgnODBunxuxe4UWHez5G1poIb+xMwOahZ894kA9JQ+57bROTeT3OUbbOo5X2050v6BS1VFYqIQS6oysP9SOq6TcXFsB5ydC13Gy0zs4Nprpf3mqTEhjqdso3hykNNKYdtkDSa4oAoKRpc2gmQG9yqP37SwFPiRbQ4TlA8ltO5Vq1fYVz2l29FB9Oruru85FOk6TtNJjtQWoe27hEOA5UsBlGhxUf0mJpKbhOmK1Ixmk8uiIAaodm52tQbysc1+JcG+Fh4+m2sz8k8WnAlyxZ2Uh3FLA8dw7S3yO0i0fZKK+DlLu1Rv2pcSm14T19C5l/p/nPG/6aT+U/wBlEU1BVa1BrvUvQeCoQ0crYDZMeRutQVhSOkl9MewUcWnlSR9M62prtQvOt0W2U/Zyi8k5S/HLFaZ56bxYBTeMmnOZm26w8tP0FNOrdPOkak+ZztmKKLyq2pRim5ULvKbENDTRWC/Z90eziO2gtNLUW8oG8ir37i48BAfftJ3Up/KI+6ibpaGoKtl9RisLCYabFu6Q+IWDwEWEG3Kxn0yKVpcwbrCTPwk/RenSj5BMlDm6l+J1O0xi0IHSHVIf6ICthnxwgb73C2lQuOkWtQyIW+dNMmoq65Wtv3V9hyCHafzDsgKFd4JArynQB/zX1CNkLdVLBwUeo5YqNzKkhTPqry4N00mYqQ7inBfiq+TSmYiN+wKLQ/5BHCBu8RpYqaSOPcLDucqam0gnPJdpamh17n2nRBykjex2pqbJaacrV+w6k1wdwgaTptP7qE18NKLnkixQ9g83kU5gcN0xp4QaB7h4VbIc5FqLCTupHdLwmhtWE8J7gwWUz1HUVQITaCOUiLtSep222kd6WB49wdp9k5Ss1hWQKKZuLWMPSkbJeyY7UNSevoXMv9P8543/AE0n8p/so0xBBYiJ0g9CMUo5CwzXDlerwmt07Lpg8oRC0Bk4WEPSjnadumihk46nj7BYmR+mohyoPp0kfrtNdeQ5zKIb+JACoNFBPHUdXgINGYO5GUz9DbX5mINkqWEhpasD+y7mO/NPfS0hUpYy6qNKMFrqcVqCsHI8/FAlAFUqVKlSLt11PzGD9U1cJ0mym141/Th/7WGgGGZpahl9R+nyTSCaJOwGMhbqBtYQzYo9HgDlRsEbdLch2FX3OP2TQ6MbhawUHBalZQGTmh2yZGGFENcugN0IdIoFBjwfkmbbHInZN47SgK7isV9SJmGHg/qVh2hjdOX1P1yti/qoQA1Q6n6v+PhOhBPC6Rj3Yj6hzuo3V6J1Bid+m8pz2sFuKxmIjl2aUybTsUyW02QUvxI8KMnlMJLvckivdqa7MexImgAekJ3F54x5ZES3wmnU0Hsrsr7LUQd1K/07KOSygVf+w8ohcJ79PKNSblNAXhMNi1aKKds5PUrbCd6XUsDuP9ieOw9jjTsiinjytQbssS2ORvqTQA0UpF9C5l/p/nPGf6aX+U/2UaYgidwm7IstMjpFg5UbtSCHYW2E0UOxzqOyJA5WL+oPf+VhBZ+6ZhXucHSFacozplLFq3pN2zkeGcpsjdVp0ovSEBXYebylDC238Iy0fyUdZf6lB6Rp7nDRJq9urVUtIKoez1Te7ViXuhe2ZvCwmIZiWamFTStibbl0cRijts1YeBmHZoYEEEEMj/4eK1ngoZjs4TSDndL5prkX2pSf3eVFrcbciVz2gV2Sg8t5W9LW66pNdo9Luzn2Jnz4k6G+lqfA2CdrUyUeF+KawepMqZpmPlNPU2bwmxjhFiDFjIf32uoqF2Jlb6qTo2ybP2X4d7PNhTOAAICiN8obNvwg4PFFRx0dlGz7oNA7b9jEv6UthRPDxY9qXchqJpVabt6cvqNmIgfomimgdl9lKgeVN6naQmjwRlXvaiCg+9uxyMIKEVJ1NCZuxXsiinhOKl4Uoty+n8f7Eq1avtkc0jdMlDxkU99J/qNqR1+ghQbxgJ5X0LmX+n+c8Z/ppP5T/ZRJi/REJqCapPVsFh20O+96ze+hsmh7jadhw424oYNrPjsg118qj90A5YyT8MOsoXCRvU+6bm+nv0JrA0LSLvtItB1i1Jqm3HAUbLC0GkWHlDftezUFCCGUffPeWG/kvwbZGn1J8OJ+nS6ov/Swt4xrZJ9v0QQQyCGWMhEsRUBuJuVdx+6E4KdiGNQkdNuOFJK2JunyoxbN10f1RjpqYbQHsarRDiUGUqRRHg8IO6Ro8ZSSCMWoMQJNj3yu/dbygygvrJcySMhQNmd5WKw79Va7Kgw9RaSmsDRso27ooalJFaw9fs1jIhpQ1NZusQ0FqHoUUuh1fdONG2rDzWouO4uTZxdOQIOVgLqMPlah91JOQdLFicK+Ubcpn4jDEDlRYkOQcD7Ez6kv7KwRaY8sJDuFM9/T/L5UkeNO7TQTWNfGN7/VD2quZEb+8TS1OIRcvN9h3d2OGncZHZORKf8AopOFL8lgOPeOb3V3uNKT830hHD0PSUJHwmpFqDuE5oPK2BpOpyI0P/ipV9B5l/p/nPGf6aX+U/2USamn1ZBBNFrSfsmNLTv3kWUBSc6lZc5DbJ/gKs8ZF14+koMA+MNLXUi/ERO+4QxMZ8p0rGt1WoqI1ffvfLp9I5XSv55UqTm2pJJMM+/3Vz2OeGcoPd8l1F1P0TXasja3/wBgYRaiwtCg5MgY0UsLJpJif4TLb/BAoIIIIJ35run4Q7bzd9lScxr+U4OOzNlJh8RFL1K1BQztcgbypmqwr1e6VVbHha3M9LVIPLlI5sfqCw31MPFEKPGwybA7ozs4bujNKP3f/aM2JPxYE7ETxtt7B/2oKe0SffL6jEHhjj91GzTspGh79QWHipqEaa2loUrdkCfKdV6hypscxwp+xTZWFgKe3WSRwjHS0XsFRrSonUacFh3sqgU6RrRZTJ2P2RlaE3ENKdKeGC0+PFu4FKPBycylPw5bwV6rppTcK+Td5QwTAKUeDYwrSFSfECn4W+EOpEadumSEoPWrtpvlYjqYX1t3avxrJyGxHcp+LjwzKcd1N9ZfIdMIWBxc7H6ZGbFA3nWVdn8F8Dv598hBUgED4OY++ZTuE06mrVacnJykUnIWB494qinSafCcbC1eFud1rWpXk7cIExy0eEVLGHhW6HYozAqT/kFA8OCmbqGyL9YX0HmX+n+c8Z/ppP5T/ZRIGhah3NqldBPDnC1hARzkRaG3acy20IwM+XZvlo6G8pra5ye1PwbXcqDCtj4yJpAEmzm+YMdpQndLbWClHEI1yjstY4GVSXyp2udGQoi9rACF6kLTrpYfXK4ulRGy0FAFqpcf7Iv3Ubnu4CZEPKfhWSbjYrDOPwdyMtI8L1WPshnGBWyHsOFoRPB+SArN0bJQQ4JuGDPiVJFO4aQ5HCvZuCo707947iqU8ro3ehTTMlo3uq1toBBvSGoKZrp2WxtFfTZdbNDuQqVJ4ttLCYprZDh3f0yxx/JLG8lRTvNdRtKBlpjaGdo7rQE6LZS4cErFDRG1gQY7Tsn6kwOUkVt2WGj6hoqeDpR2xMbJK7RalwU7W202sHi2k9N4o9sjLTIgO285RbbCie2QWqHbiZujGSOVhsc2fzujKKop/wBIhkf1WGl/8TEfluocHBAPQ1BoHCOyGRyvtcNQopxewcWhiGE6bQN+4XIXytfhBfxyJyvMrhyc3ewrTk5SKT5LBce6SvORYCnM22V6m2ECnN1onT8kDsryxHlMJIvKRoMllTYUO3aV05YzR4RYWO9C/FadnpvBK+hcy/0/znjP9NJ/Kf7KJPOr0BRM0hc8JrCfkgo8zZ4V/dWtX3VouTpPCZJb6XnKz4VffNx0i1E0VqzdwgbCbxlr9d5Oka00SrvhdMHlDbK6R1Hjsk+KZ8RnJ8VhPheTntHJQe08FA+P9meVEgtRugpAY3iUf1VoUhlNjI4R+qZPNidoxSY3S0D2j3kclDjuvevYkkEbdRUbHadT+Spx5pYdzzypI7+KhPTNFQ+mYlA3n9Qic3EagVgZutCL5CaXFxsbqVvTGtxWDoj2JC3UGeVLhw+ifCEApOwxtNwm6lia2J1rBACEFS/AqN7GOtNxDXGjssVgmzDU3YqLHSYeURScIb+7JA1xsbFROIOh/PZPOzDt1OWLnmmeHNCfLqOstIcmzTzfvcLA45jxptAg7jM8Ie14WlrtyFQGy49sBcLShmUWArSEc5B5C1ahaKenqX9VJ8lgeO499dtaSQiaQOydTuVfT/gg61an9Z0obbBed1LXKa8OCkGohTscw2poGzNsKNpZYcvoXMv9P854z/TSfyn+yD9Cic3koO8NTBSGUWRKA7OEVH5Tm+Qm775Dsd6tkBXZL6W6guoxtAlbosBFIvMGw3UTXzy9RyArN79KOtx9XCOIY7ZpUZPnJzg3lTHUzZNGloGeI1adlg3Fo0FHfhPj1iijhh4TWPYbCEgXPt2rztWvKiTU0brnZMuB1O+K6rRwrld+icxzvKiwTeXJoDdgh7R47iaCa4OCika8bHKuwCzfsT+uQNKdBt6TSkj3pRhl8LdvC+R9QT2uYbCjxbgN2qKdsmX1CMfMDdYB7mnT91pAWP3Y2vuonyYSQfZA3uO47KD8x5lTpGs2JWv9FZ+yDr8KX1NLVBKIgIysU40APKghLZAbTmB4pyDHxD07qXDQ4o0dih+J+n1frYo5GytD2+zX2WoZFOiLzqukZTF8wjj49VLrsqwVj2nrMfJwhioQ3+CfiHzNL4xspHkmxyv/AI4SxB3lRTyYa4pZCFHj8Uya43agoMc2XZ4LT+v+8rsd3FVRR4Tk9SKXdywPHuHKs+FiSGgOQeCERY2VmP5Jrg8Jwcx23CJFJr/VqTXUtV7q0GFp9JTmljg4lSgEJhG7VKdDrX0LmX+n+c8c4NwspP8AxP8AZR29RR0mrUByutH90x2oWFGq7inFQ7Xk3jZV2c903wKbC2gVq07OVl3xQYAKWp2FdVWEM8biejK1qZiBpC6UbtytLWp2Ijb5TZoZzpvdSsLHiuzEOpiwrdTNTkBSKvPZG0DfaezZbBawtYWsLWF5UZ8JqagsXtA4lRNGkIprKzHYPbtEfdO6j7bAmxNIFektUc1vLSjKGCyvxURFgppJGoqwg2uFUg8rfK1aJAWsFVqk1J7qCfK3Vsi8ctTcU0+mREOf8Daa19UQvw1+lNwYabCsRirU8ckwo8KLCjgp2FsclOwoeKpD6fqbRfshC+P0NemRzFt61rlZ8haMkzvgE1sx+RXSk/5rFCVrLvZRNaB6ViWjrNJUrHw+th2TMTqCE1+ENd3SxIaeVh3ueeimMe11uKsZYnXG8SDhRStlC6RhOqPj7IFx5CtA37Py3zoKSMEWOU6OPEMqQWvwDsLZw+4+x/wsTNoeWs4WCgfiZhsomaWlp8LEYNk59QWEwLYOEYmkUUGOi2Zwg4HbP+KH+0vtPYczk7mkU8KT7KUepYHj2wb75o+szSgegdLk2VqOl26sNOyLgVM1zd28IP8AATdhunEN5TA95UrdI25TsRrjtfjGyDlYSQSl1qdlil/+NOP5rD4r/K6rL5XVCxpc+CUeNJ/soG0g9oQ1v/RMhb53QAQUfe40tYVjlOc77KMaduy747j+icNfpTeEHNfxnILCwuIGk9R266rPupMXCzymMdiHdVzP+07BF/79JmE0t0l6/Dt8oQNadgnxNeKIQgbVcr82I/cJmIY9F4rZSyOlmEITGhg0j2D+Xugb7Cg4ZWq7tbS4bqNNTUFjTqZ0wmcDIe6662THh4sZOdSAeflkQ+eT/wDgf+1wpo9W4TNLvCLbTsJC7chUiFVcIdjW0jV7p7mgJvUo6AnYeaQeor8EfKGDHlT4TQbQaQ4BNkaz5FdRnK6zfCayzrdkABkQfCD9LqKlYeWrDF5B1dlp8sbR6isNO39nf8FjY+oxRS64t+V1+kfimPbILblOwPYV9P8A2jkQHCiujH9liWujALXJss4PpcpMQWDVporD4jqjKW9JLeVA5rm23vLwwWU17pTY47iem60FNgoJ3a3t3TI2s+IX1CeXCytkHwPKjlbK0Oam8ZvH7wQNi1ZKcNQTW6R/uXv5Tce150gi/wBUCDxkcyitBa8utOTlKpfksDx/s5oWyjdQxuaaWrxSkeShIF1QTS6DOsXrTR1L0ndFwbsFpHlSRCiAFNhACVHI6B1tTsZHIzVa+iSmMTaedv8AKY6W7TJ99LmrGvP4aTT9j/ZRMLvKiiaw2ggggo+4mt0+UHZNYOStmhF4I2TSS8ZlAV3PeR6WIBTWG2FhnfnEN4zxMvSZtysRhJIndaXdYfD4V7BIxnKbGxnxHZeb5NGy0yu52X4SMmyjhm/umk2OSKTUd0x4d7Ezr2Q2FhPL/wB0pvVV18l1AfitFrQh3ltlQm22moIzerQ1SA2CeE3hDImuEMh2Hjslk20s3KjieDchTo2sOphpNxEo202i6Qv1uYuuByjrlFcBNAaKGUpAHKu/zGqPEMd6TsUTSGZ57NXgJzdSAA+KpzU2VruFqd4C9SLHHkpkYAVJrWt4CPaQiA5O+yADRQ7Ok3VqTmNcNJT8NJGT0+Fh2yOjBm5WKhcw9SLYqHFunGkjdQQuab4Wj9VpATouk/qMTZdRpE1uVKHYg7fFflx+d0Y3zchNa7D+oKKUSDJzJInkxrC4hzm1Lz2ucGiyqOINn4oChQ7qvlReklhzxV9Ilq+jPLi5vjsxM7YG6isG2d35j9gfC1D2CaQ9sI9zKJKnwUcvhYbBPgkJvZCxmSjkUU7ZSKQbrBcf7RoAcnNDhun4N97FOa6HkKOVjtgnfoj6d0xrnPJBTIw3IrHtr1IRmU2mQsib6+SvorQTJ/T/ACgxrAi23WsdthpP5T/ZRzMj+SikY/dpTUEFwojed5uFhNcHFPxFv6bNyo4vLlLGP3RumxO8prdOY7CaRdq4TD9gm8ZMjbGTp85E0LUJ1kzSf0WKqRi+kT6S7DO7bzkZqCjfqTj9kGffJ7L3bymOJ7CQ3cr8Qw8IybWi0PQjpN9KfKGBdR02w4TIwwe0Xm+FBLXIUWJidwVPjGwR6hymY2Z4qBu6a7Gu9JUMmsaTyMgvPsWEcSCdMe6DXu5K6fhaGoADPGadTLQ4zxIBACh0xxp0HXNnhBk8P6hNxDfKDgUdkeEznlbqnJgICAzaKdQWi/Kr23mt1pLt11DH8kHAix20ECEVJh2OOoCivxMsO0jbUeMik2C1/otTXbWqDdwpDqFFPkLxTeFFFumNRjBToHwnUxQ4rqO0EbqlJE2QboSujOiT/vIuA5TpmN8qut8uFx7Eo0kShB154DCnDzy7enxlup3iNupywuGdMetP/QZ0W/FX3Hf3L72eciii8N5Qka/g5FFOUn3RT1LysDwj+mRFikDWxzHZXs6fVqzcA4UVLgSDriKjndeiQUU94dwUyMNGRTtljR1dgo4OjEsVbqaF9BadUo/h/lNZYTqasZ6sNIT9j/ZRgFMhjBsBFjm7sKhxOo6XK6G6abUSkmZHyUMUH7BNH3Wq+MiaCaQ3U5Yd+t10hk4oGxfbYCDtXC0jytIyDryKBtTN1N0/daBp0KeEt+Kkj6cjZm+ENxkU93gIensjH5pI7ZtTd2qJ5cd8yTrooRKRqaA0J0zQpnvkrppsT3n8xR1poZX2fxVhWrCsLT6goRuui1yfhbNgKKBrfimtCMYKjm0v6UmVJrvHZdZOcSdLU1gkHOyYxsYpo78fCZI9TeW7rDSiRgIy1gp3qeFh/wBo5jvCrzkWg8qSNzPVGo9bhZTmF/lAAbDvft6/sg4Hce0EVy7PSE6Ingpgc3k9j2fvBMnBNOyoFOw8TuQsZLLgSOmUJcQ4BxATpZgLATZJJTUiEO2yZ9kBmyJ7JiQmu1C8pnMqnKbFTV+XwvzJqaUY3YWqUE4kFecz3HcUom6Njm3zmKxLjfA7SLV9p/2bfkd83JzLWgtOyD5Ag8O2RTk5OOl1KRS/JYI7IIn7LkJ2sAVuv1QcHce+TvmViYOs4haZMLNqbvSgx0Moq6KsHhEqZ2vZMjNBTUGqM9eXV4X0Y6Hyu/h/nLTvZWOv8NJX/E/2UQd90JA0KOaN/BUmFa92pvKMYkFOTcMwfHb+qihb53XSZxSji6Z4VXzm+ynQbbFMjew3SEg1aVa/VM4yCOVDtk2FjlNdL5arP2UsoGw5UfUcLcgyQeUQb9axEexpYWbqRi8nP0put5TW1nyqrtkkcfTGLTTIzd+yEzfLl+JjGw3QkJ8IykfulSYh7eAnTzeVrPJasI7VeyItX03LnLWrz0haQtIWkLTuoUxNTUEFi4S8am8rC45hbpk5Ca5rhYKsZSyiJtlXI7etkZ99LoytYa3VSgJkjMjv3v7Lq7VGEyN5drkPsdIMOtilxTfiE1jiOVpDd02OV85ezhXIPCHWDuNlunXSDuB7PKbHWwQu6KsKwtYulz3tPqI9gkDlaerzwp4GObVKGWbDPp+7VHK2UW3L6tyFhQDEFJH6V065TB4RB5Qlbwc3TWdATT98sQ7qERjyjhg1ulRQtDrUjNZQwjb1HlN6kZp24V33Vk+PVvauVg3Frrjhyika4uoouDRZTn9UUxMYGDS3/emQNVEG+whFi4Tmb2jacnKRtp/CxM3roL6c8ObutQQN5kWuMgQfYPa/7hNcHZh355ap4vzLTcMx7KITopcL+yOyGLdN+W8UhGqoLHWW6GqJjY19D5l/p/lDfcJ72sFuWNnd+HkphI0n+ybNM4eiNNw+Kf8AvUo/pzeXONpjQ0UEEFH3gAZkeQg8VRQ4QFcoDzlfsONBNFbZkXsU+A+CpA7Du1tUWIEjNQTG+SqtHZOmaE1xPYSAuqPCI1/I0uoyIbKxifQhg2eU2JjeBm5gJQjC0BTTNw9bcpmLa7wnAPQOg0ctlVcd55UYTUEEFwg4S7DhdNunSAhE1u1J+F1bsCd+M42Cw8Eksv5xsK6CY3SsZ6yyAfvIChQVAe0IgXveCmbtWJJjjLlh/wBmO0t1NQ9POd9zhtedJzQ5DbvZINRUbrvuJDRZTR1TZ4VZFgdynQFnqiX4lzP2rV9TmZI4BqwDtUIR3CczZMfR0nJ0YTOoOOFNiXcAKN8jTqLV1gR6gpJw3drlgn9aUvOQZR7Ko2O26W57KBT4I+a3TMOB+0Or+PvubqrfK1a39t3CjhOvW4o9xyJT22nudHuVqDhspya2To7dZWDirhMaR3Gzsmt0oHuvvItHqeCpJpbpoTjPG8S8qWpAHBDZSgFCLU+ynM/4qSZ0bfUN0Iz83cqRtlfRWucZKP2/ynMJHKZABu7crG/6WX+U/wBlGmIIIIKP2qtEaQhuNlXtn5WU0ds7LCgkETnNKZO0lGVoUuMJOmMKGEH1v3ObjQQei0v5QAaKCxLum0vWGZraJHIADtqzeRT2dTlGJoChk0bO4RIcNkWv8FDjfMkg0t1ut1uibKjTEEEE5nV/go42x/FBBBObqUcfTn2C2Kuk0a8QXfYe3M7SwrD/ALIuUewpTAGM2sO2owj2BP4THVs72HHZA2O3hXnSolNjDTaY3STna1O+y1H7IAnd3cQDsViYGzOOlYbEuwjtDxsocayZ4YMnxhyZLR0vTuU1ENcvW3ZvCLRyVi710FgojVq3DnuIteoIOBX8FVdhQXOTm37QfqNDsJVnwi4N5RdpXqRaSU3uOf8AFaQhlz2HIhOUlEUjA0G1KdBTm+pYEUO4u08q9Q2QOrY8pr7PvA2iApW22l09qC0n7qaB8h3cgJh8StcvkKQlxohOdqFBObS+hcy/0/znjP8ATSfyn+yhFpqagggo+zVbtPfymih7WsMbqKfNsg5Dteb2T8EZXofSwDetNwcY+W6DWgUAmt0O2ROWIcRwox5yL9LbKe8ybBRbNo5XXKu+F6lX37SLTmelYf45Eq1a0P1Xa0u+60u+60u+60u+6IFqEUExBXSFnlBBBUqXCeaeEwyO2rZdBnlGNv7uyjeT6Xc+zaxkullKH4BgTFN6iGJuwrtbtaDC46inNB5Q5pXnqC6jVLOGJsbpPVJ/0ujp+Gy6jmbPQN75OdSYb5RC1drifC3yr2ZANNprQTadhmTBDB9D8yPkISzjkWmYljtjsU9geE1m26oZP42Usr70qDCnl6ZGG8Ijb2Kp/eUPblsjSPKZE2L4BNcHCwnOpAfdClyqR3VFiai0h1hD/YnJ6l1IucwpzQ/1KU+oLCSBtIS2ta1Iu22QktbOFFGEj4lPe4fMJtPF+07UOFqGdALdVmWhVSK53RaA61IvoXMv9P8AOeM/00v8p/soimIJqCCj7APUTkd04SDhN/XPhD2XnS0kr/UEHwEYQ7dGK2qNwcO7TpdfY9wCjOtPdpCDb3eUHs4CdKGbNKinMuwCZGGoBUqHsEHwjqTZTG6iNldi0TnLO2P0+V+KP/Ffij/xX4o/8V+KP/FVuokxDZM9XqQQQQQV7IW/lAAcdjm6kHC6zCtXSlxkbNhumPnl300P1QEgPKxUMzjrG6gna9uyjOy5k1Jvb/8AYRk54CMo1ISHVpQc4Ia3D1IRAKSK9woImj1nnN7dQpQseNr2WgLSBlQWgLcIO1ZdS9gmt0oIq/ZeLGya1wO4TG0qtaAnxMfyFqfh9juEyYP4WoK1O/SNlBAHfmPyGfHbwnEuI09/PYfYYdZLspX9KT0lMkbS3cFHz2j0DJ224Q7bruPeU9tqWMlTRO+6ljfqFFRNe0jdR6h5QTSrU7umdaZJaGRd0zZ4V37NogHdaGos/XI5FFFOT+FVBfqpF9B5l/p/nPGf6WX+U/2Uaaggggouz/7Owc5O3RCHsyEOOhMZWZYDur07HtIsJjvTutZ+ykfJXpCMc8+3xCjhdG2g5dO/kUYAfKODYQKXRjjF0sFqEjrRAWiuE/UwWF1njlqbiGnla2nz7E07IdkBI9uoGk4yt/eUeMlLtI3UuOk1dIClh8OB63G102rptXSauk1WLQbJy1QiSrcV6yEzYIIIZ3eyGQ7HsD+Ux/qLHc5Ole41EP6ovnBoUhA6TeYpsbWfEIoovrlYp4im1ReUzE6/S1dTSd1G6+zhEnVbU5zyaJVtabci90zqYNkMP5tSx7WEMncKMU0Z/omisj2uafk3lF2rZNbXvPtpsJrr7XQtuwgZCSKXVI+SAM7r8IChXdQVfZB1fLKQjTuoyCMuFYPePYxL+nC5yw7OnC1qcZZHaBsmYWNm/lVSGrXXhOdpkCsZF1bZ1WR9Pa80ECDwq9kopycnLEMPNp4N8oRlzx6kG6f3kzdcIOUw1RlQOIUe+X8U4iLcIG9/YOZ7inON7JznF1ORRUi+hcy/0/znjP8ATSfyn+yiTN0EEFe+lRCvPZ5zCPN5UjuuPY1t+6JEj/T2v3cB2eVar2CHOd+i0Fk1+D2ljTyE7DtPCEenZdFvhephRk/RdVvnZPxLRs3crXLIug3Vumspin1dQhYeIRi1JEHKAmNpBTZf0XU/RdT9F1P0Ws6hYUXCbsgmoDILlE/ZNFb51uuEM5YnjGB5Oy6YXCArsK6HV+fCEbG8BFj2n8pYl85Zp0rDYuSH8uQKOdrwrtE+EN/lzkRHJyntBko/FNPgIZNPjIpnFZE6eUw3ur9ikPt2Uq9rTXHfOxr/AFLDMdGxHX4Vu8hagrTigb7C37FTB33TQ8D0oavKq1oDeEDfYfakYJBRTOOx21Isa6TdEL9Ag0N7Blx2H1LQLtX2lVmUUU9OUoUjRqCwkTXVafA0G6XRI3CLtPKjf91sQo4wGWfCjmZ4V3kWWtZi2cue7nve9sYty6t8BapT4VO8qq4Up3QdqFpykX0LmX+n+c8Z/ppP5T/ZRpiCCC0i9Si9grUQOFbiiHfdU9N1fvKkH1s5B4JoIttaXDgrQf3inR72EwV21vfYwaRR9t/Fod/C/VEgcqXQ9Fob8V+Ydk2JrEXjSpQ27XURkCMzY3WVHiIz5Qmj+660f3XWj+6kbqFLDm2AlDhNQQQyCCHaFaCxIPpcFGbaCe0n7IM++X6Z40iJ9tHKfDODqKweNkjGl/CbKI4tblAXOZqdlM0zO0tTYWtZo8LoafK6jW7Jrg7jIP08qweFVG8p7pDj2iL3Wq+ELW61FGyheZkaDpQ7NQyKvsevNdhAdyukPC0BaSzcIOB7Jt3gJo0jNztKbZF1mPc47DuqFrqOulreOGpryRuFavMoq96ycbNICu27zFoon7rUiinJ6k4UnKwfCIQZW6mMZ2kXTYf2ZXqb8m7Lpvv9FLE0jVRsLD/iWN9YTZn8PaqJRbfKaNB0jjtPbYRc3ItBNnIoorENJ3CgfsVWyevofMv9P854z/TS/wAp/so02yvUmWRuggo/aHbMfCiNj2j+iv3pRqjcFhnaom953K4Um+66epRxALpojfZSHZYqQgoSn/knPd5cuvfpkWHbEQhHEunEunEjyoHAgJqagghkEPYCd6nJu2fCou5VAZa96QP2QJ85YiBuIjLCiIY/y3GiunW43UI1/PwrmI9IpCKV3zcmuOH9JGyuxn09DramyNOTvy9wnS6h6N1+Ka35ikZWvIDStbVftDbvpdFqbG5vlepA5GMFBhb5VFUrV5EWtA7vORaCqc3hdWvkg9p4WtuslB+pD/ZcpnG+ZOpUmxgIOPlWQrQzKLt6RWrZNHnupFErUiSjugEU4WnagtRPhS8KXkLBcZUsXhhILUcbWK72KaKzcywjIYq1q7TuE2W0MnPDQhqfytAHCpV2nIoooqcsw7tZ8p2PhaOU/GRnyvoEzHdU39v85WsWbw0n8p/sokzIIIKPu1ezWtNbXHcb8K65RK03z/sYnFjzHW3f+qe7dafKYFWWlSNBCxsDnfFSQS0ofxBJaV+GlcsLh9DAChG1dNq6bU7dMZ0/U1R8JqGXCYPJQQ79QVnwo3a9+yuwM3VVniJhAwuKigefzJOU5lC1hBe+bxYUbyNvshvm5ocKKDtHpcnPP2XTDHa2f1RAcN10OjNqbwhR5W3+23C1/orBytb+e0i1xz7Dm2jFo3ahhg4br8Pp+BTL4KJIXUQeCm+2eze1avVwnHp2Twm29tlUQixG+CaUYpqcdO6uxlaryVqBRG49gnI7qynHym8IpycnFPU3yWC47NDWbMCa0cquxzQ7lBhbwVrI5Cc1rkHeChuiLPslHMp5rdemeS+QE6JnFKbCxHal9BwcIMu32/yuiwcJ8D2nVE5Tyh+FlvnSf7KJNQ5TUEFH3kd5TR4Q9h8ep6OpotYfE9a7Fe6Hb0c3UPUU12oX3FwukGXuq7SukHI4Rh8IYGIcNCmw+l7aWiuze1H9lF6RSaggghmO1p175yx6t27FRv1D2SayZ/5U2vwOEWClINqWGZpGZ4UZ6chD/KadJ0ns1turyLdO44QfI3YNtGWWI6pG7foo5GSC2FHbLXpO/sOtD3dKApWr7iLCab9h47S0FaU22kq/ZvtGTmauOUW626XpooVm5odymtrb7Jsgds5NrjI7K9SawVkS4IS707tKJyJXhOAcvirRyKkUnyWC4VKsg8FxCpeciES5vhfimjkJuIDkaK6T79JRw1+d1EDxaG3tFFFSTxxfIqZ78U2o+E2MRN0tTk9fQuZf6f5z+oQsfhpCf+J/soy6LfkJj2kWEzjdBDKNX32h2F/gLcItPhDYLnvIIcCpjTdlgmFodq+6o7e5MzWNkHDIixSArsvI7H29N7osWhaFoR5UaYgghmFXbJJ6tACHZNFq9bDRQ47rAReT8U9j/wAQCSscZJnCCP8AqoIRE2hlMw2owWto9jmh4opsWkaSezQAKCJ6Ys8KNxl9XjMwaTrjTJg70u5VfZaQgB3lA/7cjyEHX38nuKGVD2h3O3Q37HM8qmn5Joaw7ZFcIcJv3yfHqQc6LZybIDmVvkeUSAEHDwjk7ZFFSBSbuWB4yvJnGR++UsxaNgmuLhujGJDRTWhgpvZVONJpBTttwhIXboEFX2lb+U5EHymtb1SE48BFOUi+hcy/0/znjP8ATS/yn+yYLG6DHtfbOEzEOv1DZNkbV2m5Rqu9/ZK8MCibfqPYBXddL1Of+ic0vKAXHafYkjLuEyx8u3lV7ZNLdxyPYeVGU1BBBBDuPcfiVD8B22qJ5VUr9bn/ANFDD09yrDsiL7sXJorUv/kGMq1ifqcNXG71LC/V+vs8UjjnONRsTInyeqU2gAOx0bX8hdNzfi5DV+8tB+6Dd+21RuwiEdfhFxbymSByJQdfvV2kd47ufeLq3KadW/b0/Vqad01xOxR2VjIi097ItnJkwIWr9FfhHt0AoikV+udKgtq2RRTk5OKkUvyCwXGZNC1FLrGys5cbKt1I5rRZUR1b9jjQUY2To97YaVvHIQFG2pzXOf8AZAUMzlwt3b5H1osAfshvunJykX0LmX+n+c8b/ppf5T/ZRi0wBNAXTa7lMcBstXgKK/Yqz2SfmyUENsz3OTtlES4lFBVfabVdlqzdZ7FD2Qe4lGTV6Ryo2aRvkewndRtTE1DIIdwIJQyCOTiBdqGQQyab2KLkJ2fdS4zpcofVovsovqMDx9l+IirVqQxHUbr4CgLXjUFotaaW4zI+yBvKSVsY3WKeZ3UEMOCfU5N+mxuGyxGD6B1MWCl9ItNII273sbIKcnNni/Z7qOTWP17R2VaMDbsbJ7H+Ctc0Z9YTMSCN011q0f8AYee0/wCwfbfUECDuOyYnYBMO3cU7V8SnW0bJriB6kHB3C0BVke4I5k0gQjlVHIpycnJ6m+QWC4zxJeW6WrDsLW0UB2V2uIA3Q4ReWncLUFLLKX/lNsJuPivS/YpuJifw5Pnp1NFpxkumhCL/AJFSNLdw7hBz5/4LTspW9P1BNotsI24lFFOUi+hcy/0/zlSxv+ml/lP9lEmIIHwnuaP4rDmwg8M5Qfq+IyLHfuFetO1jhB9rWEZCDwmytOy3RdXKACMuk+oIPDuPYJ3R/VM80qVdhQ7a7fOY7yPsr08oOBytdULU8nhNYGcZnsPKjTU1DIZ7oErqtCou5WgLUW8pkzHmgi4DZCzzlicJ127GivwTocQ3rnZCN793GkcBE7cpuCiG9J2Aha+6T8HDIKIR+lM16gdlM306WNWHZpbVJo7SViJDexULnSN1FymAAtRyEO1O4QY2QWE+ExG2mk1hxI3QBjdVKGUHymvv2C206Z0T9Lxt9017Xi2o/oh+vfM6gmB+n1IMY8UQjCW/BOMrTxso5dZ/2N9moE93n2AMitBZ8U3fOSa37KM33ubqCG2xQB/2Ni67CnJydspFL8lgeM9Q4TePYvIHW79Bm86GkpnCkiZJ8gvwcVbhW6N2khfmO/ROicTeoowto2g92ClDf3TkRfKBMLjG7hUiinKRfQuZf6f5V5Y3/TS/yn+yZ90wk8Jg+6kOkLrBoLisP1Httpq1hWvb8zfdS6bfsqVDIi00EHLpN5CG3YDavJuonZdOz6iqrMFE0gfc5RK1ezPW1rVv6V1Ta63r0p7jewUd6Ajac8jwmuc7kLdepbrdVuogmhC/C1kJrw7hBBDK6QaL3VZBYqIkW3YoarDayCLqWjU7WfHa70Ju6IBUYpxHdI5Oq7KYXg/ljZOOr5Ba4hFSw+L6I3BTJRiX7lRM0ONJjGkbqWDQ7WwKN7Ts32TuKKMGkegpznE6HIChXe/d4yc7om/Ca7VlM0XrUeIP22V6v9nQRbW4KaT5V5jvvx2jZarU79DCmHwo3ePYH+yI89rk5PpSKX5LBcZ0q7d7yc/w3ldOQjdybuN1VZuGoUU11bL+OUrBI3SUyZ0LulN/Q54iESiioiR+W5FYlupt+UOEUU5Sr6F/9v8AT/Kc7SgbCxxAwsv8p/soLeLKagnbroulPoWHiEDNAUfZfsHufvsg702mOJO6kdpbaYKb3HJzqTNVev23FB2+6BvhDttOc4bot63yKe0RimlU54WEALzq5QaBn57upuopGgboYiIclMxUbuF+Jj8KN3qQQXC1BWUOx25AQXKJrdMOsas6zlZrbSj4y/8As7pAKtMhMh/ROjobJ7E6Pdfh5DwEPp5vUVDA+PkoCk9wY2yoJA0WmuvIHvtYjZwKa4Hjvq3XlK3W2lE6tlotGMhW7dYd5qnezScaQctQyPbeZACo1sqcHgE37Dd3FC+135e4WJYZyNPhfhT+8o78q+6/cvI+wUU5ORUqk2csFxkeO/hVq5QAHGQtr67ZfR+YE03vniIBOzSo5pIBpmH9V+JsW1pUn1CtmxlM+o9UlrmVSZ9Sbp9fP91DP+IOt21KwFyiipjS+guLjLt9v8rfyEPqDA8tcCFiZ4pMPKAd6P8AZQcC01OxMUeznLX1AdKiprQEFH/siFpdVJjNKLdRo8dhvwh7xtC0dlyo20e4o+rZTXHSAdLsFHG2MUE9tj9U2TbdA7Jz/ATb57jELUcLXcpsLOKTImNFUg0DhFocghutKa2lwe6VuoUFGwRt0hSN1kN9h5MbrA2QlaVYL+1zwwWUB+I3/dVVmQOewSO1/osXJ6aQwmJLNTUJ5Yv2gTMaxya6zfsTxiRm6iGy47XGgm8ZvjHKGXT0oNpA7K+20XIPI8KSbSd01wKpEad03MAHgogjdNNi0cgdRy/+3vMreAghlqCGVZPCDUAq7Sd6/wBoexycnJ5KlHqWDBVKQO0+lNdqHtSO8BQvJG/ZysMHAFjvByJypTOcNo0+5PTGosC2J2pSYaNzapYGN3Vk6nNpyFN2Tk5SlfQbuX+n+cqB5WMgi/DSnT+6f7KMdNthRMe71S/9KQRwi6UurRq4XQbIKUfWh+XqWHeX8iu8ff3OFLKI26uU269XaDkMh7hyCHaSiAd05gPKY0N4yPCLBaAbSBHf5USagghyjwm5DJv2yCc+tgjI9hst2WsObqHCsHdN3N+w37qgnbTdjnaUdWJk0+ENtuyR1brUK1ISg8KnSc7BGNpbp8KTDugmDS6wc5MPHKKcEIXwcbhRvD+9xoWmEjlar7NScdSbx2M9GxyIy0lNFdgVKlSljD+UyLQNk972C6Uc7JuFsEZGjyi7ZdceSjiGadimmwDk4WExuluTuQR3EWpImkppLRQQcDkczsusdVL+KrstWi4BM9RLv9uU9OT9tlIn7OCwXGbgWepqZM1/C59gDyr0OtRy9Q1XZ8Xm11QhWTi4uocJ5DjpVAcKfFsiG6bjjI6mttdXTP6tipZQzlNnY7ypJmN8o4hxOzV1XatLxS+hcy/0/wA544gYWW/+J/soTqNlMKABWK/ZFMjoh2RlMVULUM3Vv79w93ogSCu7ypHaU3hH3tNprd1XcW2tH6oMAVuHhSOoISN8ozBRS603uPKiTE3JvKq0MgguU+Uxc8ITNcLCbtunFQspxcOCmNMhJdx7DjQQ4ymb62uzJrcqacuOyw7Qxn69jzSmxGhYJnUZrcb7JojiDrHjhQziQDK8pIwdwoZi5xY/2BG0cL1BBwKIVLShmXeAulvqRi29Jpdd0Z0yoYhn7u6t7jab7XhdAO38psH/ACXQjql0WNC0N+y6Mf2TfT6ewmkXW8DvLU3IFHOrWIc4SBrRsmepqcS3hOxLW8p+MN+lNknldTRQQhd5chBI3hyEA/eNrRo3amnUj/sjkcinDdPKepPksFxkTSILk+MVYUEwkF9xdSv7pzyNwtF8pz5MO+wLamyNf8SrRKkaNTXOWlq01wpcbHHt5RxO1lQSNdbk8zS7MFKPBHWXOTWNZ8V9QtuMa5aw5qxIbKRGPKjgji+ITlMNQor6L1GmXTvx/lNnIFyNpB4I1LHYgzRSBvAB/soG/dMTVKNUZChd1IwfKbwmNDk5vTOtoTXB+4yK6jTsCpsU6I3oJaoZ4526oz7r9djShuj2XRT9yArpMcX7nvvuPCaUCrQ9mZtttPcHHhGQB/KZIY5NTTso5dQtNN79vlRpqCulHZ3KCGYGch6EgJ+KZKJB6VE/qvLPAUlNpRs0Noew/kLnKU29rc5jJMdMY2UOGEW55VVlq8HJ3CxQOqgvp40wDOR2htqMelDXHM4+FBJrbv2FgKLHt+JQN9hKbm+Ly1daWJ3rGya4P3HY40LTaO+b2NeKKMXSOoKJ3U9wCh2DJzbRtqGTyPKiAc3Ut2rVfcRSCrstaQV0y3di6Zd8ivw0X2QjY3gdzPQ8hH/YHMoopydujtwpFL8gsFwitP3yq0WAoGtu3SXbrpkncrRXCsrcp4YJWit0V6k+PqCivxJjf0nCyiJZxR9I/wDamwcRj0gKPCtY2kBp2RycV0Gnd3KxYOEBLOFhpdT+o4oPtOUhC+hcy/0/yuVi+oJOlAjpZhJNXOk/2UEjTwU1AgcqeZjW2So3YltvjasBM+cES7FRNrhbqRoO7dihjpJPTE3f7+EMDJLvO8lQxMgbpYEQCpcO6N/Wh5/uosQ2Xbg/b3Qnt1LS77rVM11EWEZiPCGMY91KOYE2pJwTo+6HtuN5PNNKgNt9kZ7uNp+DY82pMG2zssOOk8B4QY1vqCabHb5USagjZeGoIIdrnBosp2HOOFybBfhZcBqMe7VgsW2I6noTtmIAB/69qqycdM+6Cldpbtymt0tpVmRadqGwTurXCiv1FyhGlgGc+5DUOFicOQ/W1RDa+5zfspcS+AbttM+sQOeI6VqWWjSjNjscA7lCLonUOECHZyuI4TeyRmtdINGyabHtfvewRYUfFJ7w3lMDp3En4/3XGWmuEDfc0i6zJpfLsHsPbqWog0R/sjk7bIpyesQ5zBqaLUkjXELAUR2lOFikHFuzla1jyj+ZsFXYdk0HrdQoEHjKWRsTC9ywzXOcZHclcInUcjleq6TWBgoIqRjZdnLHYHpjXAsMMc8XSEUpFSO/6UuHjcF/+PMMZmF7bf5ThKQaUOF0HUTusTGGYWWvsf7JjGu8JxfA3U3cKOMyeqY/0U0DDEQ0KONoH3XRa13UbyoHfdWFiCZSIm+UyARCmIH79mIwzZgoZ3wv6M5/gfaPbWRiY7kLFYIFhdD6SoJJoHa5mf1WHxkc47S8BR2d+y0RqWk/dSN9O6wzrG3s3StEXmWhTxhp2TGyqIuj9D1rC1hawtYRbRUSagqp9oIIIIc5Xp5R9Y3UezVI8NFlNha5wkeN09uptKN2poPtN4WJbelwT5REy3KO3+soGz2OKArLENbq3QyJpMbZ1HKRutpCgcR6XdxKe1pHqWKwrXHU1R/VGMYGTcp2IbJID4TBTe50P/A0uu+LaQISNcLamgndy47POTgWmwmyWa9lpsnI973dM2pG6wmgNFDs89xZTtaBtF4Z8k5vVG/CaKFDs8+0dnX/ALA56d7ORTk5PU7Gly+ngNbt7Dtt0z1O9XcQXGkBWwU8HUB0GimDFN2LlisTM2mysTcdG1uyZ1Jd3poARRNIlzuFVIqR2kWopb5RL5H0OAinJ6+h8y/0/wA5OO4Cxn+mk/lP9lGufShh9PwTpWsG/KhlfwWIBx3UDfunRB4UMDY5CRmWAp0V+V+az9U3EtJ0u2Kx0HXZ6VDi58L6Z9wuq0tDh5UuKdENZZso5WTN1sO3cxzZNwq7Lzea2VCqUuDY86m7FNndD6ZkMQw+V+Pt+lm6a2WTdx2QjACaQ3bMoIDJ+7SsLeohDsdfjMXac7SgbHYVHh7f1H5Va0BaAtIWkLyok1BGtQQVoJqdturLtmoMB3KeaQ2Ca3V6zkeFhX6XuhJ/X2TsLUTpH7nhStJbsnzHZzwnziZvTjTG6W13yxCRtFQn06Tk7U51DhDN48ob9hNJzj4T2E7pzjG8NrlOwzcQCKRgdA4tpRn0DvIB5XSDTaDggbzPZQ9iQnhqjaWNoq87RBPC9Q5WoZOqV+gqONzDzY7fPf6gSGprK57vPtEAiirrb/Y6i51DhFFFOTtuFIpT6lg3BA33yfEpj26hZXWZxa6gKEgKtar2CsN2Wtuch1Fz/spMIOhpHKw8wcKPKBT31sFpGRRU0b5TQOylDYmWo26W2inKRfQuZf6f5yl2pyxn+mk/lP8AZRKLf1IupM+VovpyadSjy/Z4m/BHbSlhbJyhCY/iUePUFhIWxtseVMwPjLVEyWKYCM0sPOXNqXY5PcGtspk4e22qi7lSP/D7tUMwmZqHbIaGyGwTfzDq8ZvY2QaXBOwMgl6cfCgwscDaGbmB2+dKszwoDUpB7SczfhVfKArs0j2Dyo0xWmBE0Nk3ZN2Cans1BR/HJ+7wFKaaUOMgp7ixkb2+du+k51Ld/wAkKTiGi1FoeLpGJpfq+3sFatD0DYsJiGb/AIqNwI7NNrQumFNhw8KIG9F07+6njdJHxuonAsFK1fdSkg8sUJ20u5zPYQuO/cu7N+xzNSYbG6YyiXdz9XLUAQh2sOVIDsPtkWnS6NqtPxEleiMlfiZANToymYoO8ITArqBXkO+R3hqY3pt05FO3TinFPKk+SwbA7lOYW7sTXWh2F1IfmblNouK44RicXakY3eQFEwuG/CDAE+EndpRw8rvKAcBSdrpOtrGh33XhTB8MutgUExkbdJjK37DlONVMRRTlIvoXMv8AT/ORF7FYvbCyfyn+yjeTsxRjS2lKaoqKwaUgdNKY2/ZQneldUm7hTxa223kKGcSD9e927tCaKCxj3sb+XyurP+IEfm1LGJGaSupLh9neoePunMmlHq/6Ubm/HgrhFlusq5MM8n91RyNkbqb2XqNovs6Aht2AgIe0VD/qO08+0O/yo01NWqjSaPKCCGTPjkN32n0/0jsnH/lRH+PcTS6m6Jta9JTXhYp/5JtYY0wKOTW4lWi+k197HMcZUnx2mflikzsf8SmX4TZN6K1Z2iSi5dPVMHfZHcJ+JbhpemRsUx2rfId7mhy+PKBvIG+0dw9lwIdqHuuPhNFKu7lN47q7CsPJ1HF2RNKeWSL1MGyile4epqG6OU/UZ641h8dHN6Ts7tea4TWkGzkUU4OHCJ+4TyFJuFLs5YA2FJLp9Ldymt8nlAkc9j9b5abwjsE1xHPnImk1uv1HvxTT+IAPCkmDBS6l/uoSmA/mfFCiLGZRUkrIRbimYgPdrcCvxETjptEhOUi+g8y/0/znjf8ATSfyn+yi2TDafXlROs2sI7XiXlQerEOPhGIvrSVD6Py3ZSgQzB/hyBvO8211nZYpYCPrYjWOAn/FYf8AOOt3hUnRhy1aTRXBTm2FG44abSeDnuXV4yAGo9sbTqI9xkLWYkuA5Q7KV/ZDjfNytOcGiyh+YNXs2bCjpA7J0oYP1ULfJQQQQyYbykk6bNuSo2hoACGf1KNzmhzeQoH9WMO7CaRdug7wrCsJ3oNhOqRhaUyQgdMJrz8WIPdW4TpNO9J02/pUeKcdqTX2FatWuU9thRmx2Si2ELDj0AFSMBRD11XDldceUHWtSNFSOdGdgo5g5fUIWvGv7LBSdSMFAoewQDyhFXBX6KkD7RK59h/xKYbbfb57itFf7RjgHUuVpUjA4aUIyz45DPE4GOcKHFPwbuhiv6FNc14tqKKbZJJyORTk4qQ0ppQwWUHdQ6/usGy02MNN+ciiXN4C6xJoBU+tyoJNQ0nlPGrZNg9Wq0TS3furRKDr7CaUsYc4OchEGotUkQIooOfgz92oODxqCOT3Bo1FRRjEHrv/AKLQFLh45OQnYUfdHDTA7PUkTq+S+gSFrpWv/T/KvLGzB0EoH2P9lE61GaCxM1KCUUvp9AH7lQN9RKjWIGkCUeE06haxcXViIWHcCzbub+3ccvrBqH+JC+mx6Ilin6YisAzpR6Tm6jsrpu6bM1/CxLNTbWHxZadEuyJUkzYwmuDxYXnscdItQja/ckl0zWeFHIHmh2Vle+ZUe2ynBdTR2zS9Ndd32XXd9l13fZddyI3UThSantIfrCjcHBDIIZM4TuNkIB1NR5TRv2PFpv1KDBuMLgeUz6rhXu06kyVjxbStYO4UkoC/EDclCX95DEgmk2XUUCCpNtgo2Ctk0BqAWkFCGPmloaOFSpFiIcE3jINItD9c3CwQomPbwpGS3sUyN+n1cqneUWa9wrewI4nSaemyB3Cu1KOm7ZSOMjNlhJntdRTXXugUD7JG95j2CgN79l24UFhtHsJrlMeH7ju8o+zwfadwVhmPPqfm03vmBXZJFHMNMgtR4dsJ9HCmkMbdQFpkj37ltJrmu3bmUU4J58KZ2kEqZpxUYpPFEBYHjuIUjHCcPYnl4FpkjnCwmtP7yK0gqqRamOV3k/U1+ocI6njhNcHClSLbWKaDGWrAY7ouMM3hMxUUnxcnPA3UrjifRFx90AGgNCKKKcFIvojQ7qg/p/ldFoXTavqLRBFKR9j/AGWGPlGUMbqKc18/qCg0sjP3XSMEbJPIWHKjTiAPUoHV6PCKA6WIP2PZLMGbDlNZK/d5pSzhuJH4U2fP2X45h9MnoP6rETNxuIbGPiF1oYW6QvxLsa/RG3byU/EGB3qb6VHNHOLYVQVfZPYSNl0Xs3byg2xupo7BtYWd87Az7LpDTpXTfCfQhdb9kwtmyYNIr23HSLX4bULQacP6io8Q1+xVq1qWoBOeECjfhU8oQva7lO6jDrTJmvF5uOkWUHGd1rQtC0LQvKaLCiO9ILT9k02ggggjHpdzso26QmDyh2YiTpM1LHYTqesL/wCPOm/K6MzNlH+JiHocpMRiP30ZXFRPfSJOoKE+Vq0hB+9phKjZ57B28d8btbbVb3lVrQi0+FPh2yDU/lGSSEr8aQpMUyRNc6kzUDajOkCyg60Pa1C6yHsWgKHtAVnae0fJ52UTrluPjtKHslSizuh7OIfojJChFMAOUz9LdlGNLfYOfRa34bIa25FwVoqRSfm2wJg03Gn8hYHjvdsbTj6UPvS1J3CabGR+3bX3To63ZyjMRy1GUu2ATnerSNymYZvV1FCFn2T8JHeoBRn07ikVYKKKcpF9C5l/p/nP69Yhd9qP9lBiBSOJ/EO6bFF6RSZhndVtlSRCVtFRQtjNhNBPBRg1G3lGFtenZBuIe75bKWA0HM5ChnEg/XLEYkMFN5TvqcUOzdynYnFY/wBDNmqCGDAtrysUx+NaWhv9VgfpevUZfCY4hxw8Y9V8/oooxG3SE5oeKKMJwsmtnH2QIKtOe0JlOGtatZoJ0OrlOb+Cl6oHpPKa4PGpuQe5n7Tsdvt7cgcfgulq3ebyKcwFBgITw9u7StL3ttMbfa7wiLWKc2KUtQxeKr0EUo8VjWn1ttTY5so6RFFMmiib/wD6X46H9f8Aor8dD+v/AEV+Oh/X/or8dD+v/RRu00bJo3CagjtumlDIFOBe/wDQZDtlZ15AfDf7p7AmxghGNn2QD2k+hPjc51ObSfgm7ABMwcMfAUkFmwul01ZTW2VGxAe5wginbNKiFN7Lyq9ipcIJOFiMEa3TcI7lqiw0o5TWOYKcFG4AepMNbprkPZLbVlp37iLQRK+3tPko6W8qeR8Wkjym8KSVkQt5XrnF8BdFxduVpDaYFWVrdObabldGkO4p4tMO3ecsbI2No1fdMxMOnlS46NgJG6b9SbNJZTJGuGyvvLvVXaVJCx/IXQYN06HbZxRi+5TmdM+nhOCl5CwHHeRfa6m7qwVThuue+eQzSdGPjyU2MNFKU6Dtzkb8L8R05Cx/nJwtOtq1g8Im09fQ+Zf6f5z+tQtmwUhPgH+yEh+KwPSjHp5QFuUB1Tn9EEFHnFtY/XKaBsu/BT/qpB6QKfGcURos/dYfANa7aP8A7Rw0jv3qTYGB2vzk64yXUsPhW9d2I++XCe0PCbTW6Si4jlN0ycIAXS4OT2axRUgkwUls+KaQ4WEd+V+z/hkdhabZ3PtscXE2FebzQURsbohXSGw7KTuMsYQ2Z1hRYUENesRiZ8ROYcPwFgsD0hqfyjGF0l0l0l0keVHZTdk1BBNsFApznPOw4TLAtyCHKukFa1LHYjoMH6rqV8U9+saXpuPY30lNmY8W1SSluzRui2SSUNcU3jfIhPjUuxpQs2TB3FA9xFobZSkaaUZsd/CIBUuDB3j2TLYdLlMAg1pNLS5m4UT75TfaeLCabCHaU4uO4TXB3eM4uo7FOkPClYJWUUNhumhuKkL/AAE91U1qLXnypXiOj9kJ2uFt3RDpf07BkR5QN9zjS1A8LqhholdUhNmBQcDnaLwjIPC+oxmdg/REYjDjV4UX1B0npUWE170ovR6HIfp3ka5K7Cjm5OTwCnixspeVgeO/z2lvlPj1KR0kbVE4OHaVJIZLjj/7UeGfEytSnn6DbpNbq3Oc0DZhTlG3SNF8IogqSMnhCQsOiRPNL6FzL/T/ADn9Yc5+HfEz7G/+k/6W17dTOUwyYV1OWExQfWvlYR/ULnUggo870zV91LjIoTpcd1LiXFvFWmYd80/TaFBC2BgY3uJLD+mdfZPY4ixyo3iRupAaHpxqQLznJE2TYqC4XdF3HjIixSjNilIQG7oGxtnXaMny+rQzlMbtSAVZOFrdrsnDewgbzGT+Fe1rGzt6xTG4uRoA4Kgw8WFZpYFq+wVu+y9a9a9a9a07qMfdNQQQQTjTgAg3yjsRkESgiaWpT4YYs07gJn0+gAXcJkDGeE6Bj+QvwEQNt2TYWxCyoGtdI6REUbzIUzblpQspAd7kO7zlKLCiFbew70obhPjDxutBPKfD6tSa37p7ABsoj3X2yNrcKN5Lq7HGkP1yPy27T2SkVuaChojWnyNY0uKijL2AyFRhrRTMup9kIxy7lABjtvObnbpt+eyPZxHaU71bIt0iggx1nUg6wjHaYxzTaZJac8+EWuKZflBgTmbbJgbIOEfp+Hdy1fhJsIS6A2PsVLNjH7dJYXHj4Teko4iMeUHg8ZFDdEKKiS/LhF4bsuUUcnFE0nlPOylvUsDx3gV3u32TWaDRQscK83tdMa8KjFUbTumR6OTZRF8o5FFfvWiinKRocpGuYv8A8feHGX+n+cnO07uWIi/8eVx5IP8AZRBY7Dhwulh4fWFh3aXUmnKMgcrWCaGUrOq8AHhRYSKI2Buig0DjvIvYpoLNvHYxtWn8WpG3TghleWJj1N1N5CixDZG2eV1S74BdOVx1cLQR8t06mbt2UU7Zdhz7EziG03lRsoLjK83CwmusUUVE7fT21ae7RGj9KMnqc9RM6cbWfYex5Uaaggm5OG9pptDd15c5AondE+E3ZDIZS77Jp6cwaOEQgf3c5BeICYK9g8LVXKu+0i8n8KMbId5FoSGM07jIjyjSbTuEWpgo+wc3pnOd0hvvmBlaBtG1eXJWKeWRGuV0SGdMprA1ukL6hJ0o2gC7KjJkahsnu0ndNAG4GT/GZFSJ+26F3Zytag1/8cr3rJ79Ca8SKx8WrQEYgUyNoJC0Kgqz0hacgNJ7HMa8U4L8Fh/+AT8GW7wOpCR8TfzQm4iNwu014PCBtYY7OZ9jkVM4sNpuK1enyhiW/vIkOCbEBynRtToxyiNPlSOAT/ksFx7pvwtwrBToj+4U2Vw2eECCnODjoCNMCY23l/37CiiU/wDM+B3XUkZ+0H/SbK2T4lFOUq+hs9UpH6f5Td1XVm/gsZ/ppP5T/ZRFYgWxYaKnLpEnUFE69jl09dLoEGwVU443WHElajyVR8o5HvJ7G7OKkPpKZ6o03YdsbGF5eBl5yItYvCOvqRGiFh5XSjflHUEHX2PkDBajYZD1H99J224Wu1G/8wppvsLvAU3IavzHbtTeBfsHlRpqagghlRbwm00LV5TTtkEdkx2uT+CCtA5k6n0nxB6Y4j0uTm+UDk1odNftObab6du66UriG2FAf/a49iRmpQu20nxk535gBULyzEPYfvlXtuVfZNJB3y5zObgSnNcNwmTOvS5A2hym8lFmo7p3GWNIdPEz9UwUEdlWV6UXW4DMm3gZvlHCjPU/giAdlNHJF64zso8TvvshrKnBIDRyo8NGwUqA4ycdkxzmydjjp3XPYRaDr273YeF+5aug0fDZPfiInH07LCm2l33VrEupuygi6bKKmwkc2/lPw7z6ChE8DbZOkMTfWjOSLATpX+Wp7XS7u4Tw0bKQ+qlgOPdrIjKdmttL8M0/PddFo4W8n5b1WnYdr3VwjFr3cg0NFDKWAE2zYpjyRT+U5Sr6FzL/AE/ynTtj9HlQNcHEu8rGf6aX+U/2USl4UDE3ZPbbduVHiNJ0ScqF7X/HOI+lX7Ttq7H3Wyi6j/kU9umNwUTtqKsK84jYyHZo0mxk4LZFl+UYmVZTmmKQP8Jpsew4KXYKXVG7UFhZxK2wg7IpvCvqYivtkZKK1vPAQDyNzuqd91pd91pd91pd91pd915UaaUw2gggrya1Y2dsMe6w2MZM3YqwUX0nO9NrDsoavvkCgUFi8V0aa3kqMDTtk4bZPV+EBplHtuag6uUDfZS+QLFBHoG/OXHsOBY+wgbU7RbSsXC6xKxQvJG/tE0jIEXJrt0TaDiTXZLO1uyY7UMuUVoOtQh2rdM8qLi8neEdlrBAd5cdkEaKblILCa6ymmxkweslXSfNrOhi/DsB3TWhopqfqaLUcnVNKSJko0uC1Ownpdu1Qs/fdz2yjSQewoek12v4v2SU22mla0C7ORVkIytcqsUV0hH8U4ilTjveye21KPVSwOw7h7eKke1v5XKhkdI23Ck94YLKaCd3o9RnO66rbrImkbcqrIooqSNr+VKyVouN3/aZjA/0SbOWBxnSEoj5NV/7TGSRHVd/dYaQyN9XKxn+ml/lP9lEnC1G2gggnwh6i0YfnymStk+OUOxc3utaleVqThMNjsg2tYv9momgsHa0VIfYLtHKOy116UAXEgcKeP0qHYV7MjNQpBgcNLk2B+GxRY3gpmrygncJvrTYw3hVl57/ACoymoIIIIJ1nhEOurU2DGI2eo/pcTWik3D6fKkjJb91qdqLCE3hUrQK6gajA+efqOUQIFZtTk0b7qz1h7hFoDSe2vPtuFhRur0lTeCr1NWHO3tPFjZB7Rs5ENPBQaAeU40o3UaK1BOeGi0WyzO32CEYqlXQdQ4XObRumt3tONXSjFNAyd8wnuaxpc7hYRofOHnjxkU07ZEWp2+Vhp9TN0E+QRndPe+T9AootKkFtzApFwbuVip2uGkKP4DteLCi3Z26QtNDZa/+WThYQPhA91ucgsUZBvGoXulaNaI+y6lIP1eMpI/K4Cdv5Tw6Q0VSkGylsELBcZc9h2OQNcrlDufP6+mxUAnTN1EMO6ZASdUhzlibIKKa2WPa7VZFFFFFFOX1DDtneAvoOADZnvJvj/K6fgpn/jy6vBWM/wBNL/Kf7KJNG6agggmAHlTQn5x8pkvh3KhsvcqXGZNIuWpAq1aJ2UXx7HgxP1DgrFv1ANChsMF9teq/YItSOeDSY3WbKATxqFLTpXUrlBwPsOFhYkSOAAG4UMpOz+Uw2pOEwaR7Z5USagggghkVSbkW/ZdM72g+naKWkJw3T36dhyowiBVpubtt0DaIT9qd3V3lX/sHx2dQT3elNCD+hiCwlN49qeCRztTOF03g+pNFFMa5xpAeF0wmxgZuFoGts7QKIvImtymH1Fzisa2XEjpN4WFwjsKQ4lA2im8Zvqt1hGtc9w8I7JrdbtZVDNp1C8sTN0+E2J8nqcbU0Zsfoo/gO13Cw5tvfS0hUpIA/cbFRmm+pagrCLgFqJPCN0gCqVIsAdYWlFgKY3SiVKLRaiERScpDspPlusFwt+1zdQpN1N+Sb9++eXpt2UbpmCxGnMxc5/MOlqgwrIBr8prg5VkU7hWijkUUU5Ymboxl6hjOnU/lfRx6ZSP0/wAqU/l62otdI31rEnpYZ8bjy0/2USaggggosnRtdymFkEhaTyjigTpjFpskrv3UyUOG/KtOKJWpNctS1InZMcg4HJ8gaFrfI34r8PMHaydk3jtedPsvoWXLDbssZvGoIMB3QbXtOY3lN9K57NQys93lRJqCCCCCG2YQyC0jJ8oCAB3TApDTE3nsbttk5tpvFf7In2Gneux4Qf4TmRGRr/a5dvk6NaAnAM3TNxeQ7HNvtDiXUpJWQt1PKOJxGMlqIUxYfC6HanblUni2kLDvthQOtDjOSVrdiopG2tYkNDtGxIyxHSbvIhI9xpnCjaXEhyjNt7TuFF+W7T7dA5aQq7nNvcJpsdhRRTgnKThS/JYHjvog6hwg8ZnOSQRi0yN8jtb1wh6tyjZNIM0P247CSdgjbeECCjkciET4WI0zP6Z8J+rDbg7fZf8A49KJRK4fp/lNxMf7MobttfVSThnFvNFYc6gCmoIIZRZ4tgmnaz7JjQwUMpImycr8O8fFyLJwnPe35NXUefiE2ZzXU4L8QEH2ibUbTwmMatAVDIt9FKB2pnbeok/ZDj2H+o6EABsM69q1uix/3RbM34pj3A6ZEM6CPf5UaYmoIIIZDMOITXauOwiyugE2OlLQFdvG+Y5/2F5FWrV9r5Gg2muDxYzfIKRuiVZedhwgbF+xyV+9nJ8VI1zgoh6UO4G8rCkefCax1bo4NjhTt03DiPcFMa4Hcqj90AVLiPwswZ4cuGpuRTR1SSg0BBtHtd6d05waLKkY8+tyEey0m0BpN900ZO4Q9/z2FXT8jkUQinJyk3UnyWC47jvk5gcKTXUdJ7aB5yq+Ud089Ntppc46ewFFPOj1K7RRycVGbc+UrB1Jqk/VYppLdl/+P4t2E6rS2+P8puLhkkAb5T3CIWVOGOwsjm77H+yYTHuOFGQ4WEEEEFFmOo/EPc3hRX5yvs0hOhY7kLEYJwdbE1skfyCYQ5M2Kae0M0Sah5zJpGVzj9gmgV7LOSey/cffhNsfJPaJBSZJR0uypWgO+t1GmIIIIIIIJzq4VuQcmij2NHZwaQ/2pRyLhqpEdznaV0+s6zwnQEfAqOavS9HcItamOCABNqP0+j2GlfvZXSJB2CLXFRjTt3FacnvrhRizvny9Vnj8L+KIP2UWDfEba9RzTRu/N4TcRE7a1JK0bBNAaKGR7TJ1DpYmxAG/OVKk9tqGWSOTpS/07XyBuyaXXRTnALqfogb3y3W/vO5vIooohORRUikHqWC47Ca3KHY5ocE13jPXvpGXC5ykZrFLSG8ZlAEOtFwCdTxSbEY/iVaKKxWOjgOjynYgvc7CtFLDwiFmkKVfSMO2Tq3+n+VH9OEUvUCxAml/Z8JhLMNNE7mj/ZRhYWqIQQQQUeWIfpZQ8rDxNY1EeUN/YpPaG+oBdVrvih3FxZ/BBwcLCeTJxwunsmX5zLt6yvsY0gb+1fd5UkfU8prHM2CeywozY9ondMTU1BBDsIQVIDZDfMDbsfsLV7Wrv/aco2EJKdVI/JByO26DrWpXlI3UFh3EWx2U0OrcJspZ6XLqgp56aiILdlJ6fWmkOFjukdpCj4XlOdSLHa0G1kR3FHIstNaG5tz6nVOliAoVlJHq2TsCw7lQQiMZE/ZNFZnEgE0OEC/ED7BNaGCgqRIHK13wFvWyAf5KnY9zm0PKBd5C9SFrEuexlsKwzDp1P5TgVQchtsVp+3vlHK1fY7dOTlIpPksFxmVz2E0EEYwi4sIBT9m2sHbreVeZNJp1I5kKMnhyrMq07ZSSmbEF33KwjTPMZ0VIvoXMv9P8qT1DSEBQpfUGB0Dyfsf7KNrgPSVC/Q+nirTUEEFHlO3rSho8JrdOW7TXszSNLxEuiGHZDjvmhdeqNR41urpyCjk40mud5GX/ANnaft7BNC0PYc+nIPvhaspPR6gjIfshwhkXUta1rWta8qJNQQQQQz1FCwmv1FBbFBE5A58pnFKtKHvjMoZFg5Uno9S82FaLP3gtXgq8jwnOp4QJQTGN1EFPwZ5YUGP3bIo9cZ9PhfiWv9HlM+I7iOq9cI6jwgytzkM9+VatagrWpOlULtV2h98tyqzldQr7prQ3jN226O+ROkWojuby6rL02j6l0xzmXUvVe/ZIaLezFmmqMU0BOdpFpmI39Q2Wpp8oH3T2u23XORR3RCcnKRS/JYHjM9pzkbrbSdI8s0VuoozGwNCbGRuSt1vlrLTuFerjJwsbIl7QjjGEaXbFRTCVto5kWvqWLZhoSDyVhsNqIP3UMIibQTlIvoh3lr9P8qqyxm+Gk/lP9lEtIcKKhqIaSUKV0gVEpnljbCw+++buE02L9gxhx1FObqFI4l0DtEo/qo36xfde9KbDsmHqCw4kjbT11WfdAg8ZP23TTqF5Vk1vrLs/irvjLWAaykbqbRWHJrSfHsS0XKKm2nOHhB6kEjzstdbUhuMqVdpG6iTEEEEEFyqVIoN7CtAu0AB2H0nUuR/s6yGTxqaQm8BWrTgHLWW+kq052yA1Pv7IEoJx0m0DYtFmolAFknq8qTDW7W1Q3oAPa+SjSa5g4Vl3HcTfHdJ8Uz4o+k2h3VqNntd6XgISNLtIVXynxhwUmIextD/tYOAj1O7C/wBWkK9HrlRmD/gUw2N8jI0GiU8a3t7MYHOCgk1N3RGr+CdHa/DAcKMOi5QeD7l5kqiiPujyi4IuC5Tk5OT1J8lguPcHfWct6DSjlhxjTG/laJsLKWA2FH9WGvpyil+Mjd+z3UmJxm5DQFN9UxR9Ir+ikc17hq3cVGzoCIvRTlIvoO7pT/D/ADnjP9NJ/Kf7KMWnuIIatKpa3DZND5OCoDJh/wBbUr3ytBbyom7IZtd0yWu4QIO47gdeRJPpC6bS3SVE6pTF9vYJpOY14ooQuhNx8IPHlEBwTNhWepp9IO6YKb2F5hfprYp8mkWVEyt3c5jY5X3dMHcoMDeFXZoP3VlvyXPd5CjTEEEEEENswLVIZ+e9orb/AGldkjgyVWCpGFw9K6gbsVs9N1NNOUzqaonUN1roK1s4UUxjuLUY0PIUzWkKMh7AVGdLi3skk0IML01lZOka3krrM+65VKh3y7hR7NATqpfoq7Oe6cai0IRBu7V1PuiC/wDgpIg9mlQSPa7pOH9ez8X/AOQ5iMof6UIo7tHSzdHFxBNdFiN2qIFs2kqxni3Hwo4wAgjY4VlHL+CNju85lbFWAtk5urhepOjcd7QhPkrpgLSAqTkU5PUvIWC49kZPND25JGRj1lTNw05DmOAcsbriIOr1BPke4etlhfipYTUewT55pNnO2Xqk9ESg+kGg8ndTQ9UNiKKcpjtsvoO3VH8P854z/TS/wP8AZRLTrcP0QWkFOgDlFF0hQUW/KxrCyRkjePKbXI7KWjT8U2QFXmVGNkUBSe4/FvKfhA0amchQydRl9tWqrKlSpaEY9HqDl+IlDqczZSvknbpjcAnGYSdNjtwnNxRo3wmY6QCpGboTyO8LXZ2csdPNFvVgeVBi55XFzWFyib9Rf8iAv/JiFveCosQXD1hCRruFY94i10zG6wdlp/VaVpWlaUTuok1NQQQQyByHa0+wN/fuvYxMHVpwUcun0lNlbSOlNdSNO2IWID2/wUbtZ2Q+wTngcKJjju5Tu6O7VLidFSKTFtcy2lYRwkhBU7TVhRyBzNRQlb4RlQBfu5CgjIOG7otc/k0hG0ePae6kHhE1wjb9iEzjsBvvI1HUi4NFlAh24zxdtjLmqLExaB6l1ox+8pcY0CovUf0UWGNfGv18o4C99ZQw3/8ASOHZ5TYtHCdCyQ3wjAK2XUkh+e4TZ2OFgp79tlh7xMpJ4HsOFilq0HSe1xrdala5VZV2HIopycnKXhS/JYHj2Chk5ms2U3j2sYHvxLurvvsugwzFjfssThcQN7sJsk0TgXbp8mGxTfUCCpIhH6gbC+nRwlmppUk7QsPIXvfaKlNJwJ3K+hcy/wBP854z/TSfyn+yjOyj2Cuk2VqjOrdBMCIB2KDuma8IG+17RVqBwc3bK0NRXGT3aG2omV6j5yaBHJX376zOTxeyq1JhY5eQocC3DvNIlrU9+nct2TaKfoa31KJ4mBc4bJjwBcYAXVeRsF+DfNJrmdsmMawaW8KQt8qOr2RvwrWr2azO66nTOkrrNXWaus1dZq8qNNQQQQQQ7iaUk+hvUWHxrZXfIV/7V98TSxuk/wC4nw4f6vKia4NtOfstZuyuqKtB4fsVh4Gxpo0IALVqNBGNp5CxEGtulS4fSLWFxRw/PCdiI3gUeVNM7QGMUTpR4Uc+rkIlxK6OrclMYGce25wai/qGggxoCLgE9/kKC9RzIvvDi91DjLEenncFYJxMe+eMc+X8iLlRwNwk4GIFgpuFgb8WBABvGd9jpCTpbyuk93zK/CQjwnYYfuGlAHw2HBAg8d90idT90ToRfIeCm9TytQb8lq18LpAoMA47Rx2FHIp2+Uim+QWB477y4TXat8hse6uzHRkYguQjvEkN+yAGn1L8KNReujRsLGRsu2coYdx+BT4XwjU82osXJG7c0mYuT/jYTfWNRT19C5l/p/nPG/6aT+U/2UdktTUE2JtporhXXK0iWqKYzSNKttUUx+k6e12+yhGgkKrQ2z8p3rdWcjdaYC35Isvgq5Gc8Jrg8WO7zldnOWxiKvkJrAi0UhI1gWI6jzZPPhBu2/CdiIWmkzEOkNRtXqAWpy9c02hhs/8AoLD4aWJ2p7r7HE+Ex+ruHa4A8rpsXTYumxdNiPKiTUE1BBBDsGR4TWhzVP8AT2SbtWEw7oG0Shfn/fHdR8KSISBHBvCvpGnhRyNfxlKdLCoInVymMDeM8Z6HbKPDl+6jZEymeVoDiqa3ZMbunbFDExt2dsg4Hj2LzloDUg6mkqKQ4h3oGybEGp0Vn0psX3QFZHtc4NTje6aTtk5oeKKY0MGkZTyGNlhQgRN9XJX1JvUYaX03E/iIB9xlWYN5vGk6wmu1C063bBBoGRbpOpqabGQRT5Gx8rrg8BOd910w7cLp+FQapMQGIB0x9SDQO4nwmP8A3T2lFFOTlIdlN81gePYsLc5u4TSTz3HP6kei/qDdYUan9Rx3KfOJ39Fn9VegKaWvS0bqDC6h6l+DbGbWPZ1iIWeViPpbHCghDJgjsosWxw0+U+QFfQeZf6f5zxn+mk/gf7KP5gJqtN2QUz3vm6fhYT8pMk1OWhOG1phtoPY80m6w7Ue0v30hAUK7HCwmAhu6ItNaWOJ8d7j4QFZPNDZT4bqerysLjdXofypfqUAtgO6fO6R1NIAUbJJMQC07BdBv77iU2JrdmikNESkn0i1J+KxLqiCwmHGGj0909s9Y8LC4gYll+faeaWpalqWpEbqJNQQQQQQPceEzjI5GVreU1wduO3jt3tUiCSmuvvr2Wt05yRtlFOT8LJh/VFuo8QHD1bL0yOACDQM3ODeViITO9OZ0wAFTpJ01pTWeVdGggPJRaHcoQsaKAT+pFu3hQziXbyi4DnJzgwainYuMJs3V4WzRugbymNNT39KMBYU2My6j3FzRyuVpCoI8IG98jsuVIzqPF+FJH1BunxEPo8LCN6GJocO7NWo0EPsM3/E2oGkN7XFzH/ohvkbrZN9e1JsdIst26JDU/EAIzSSfBRQkHU9DcZX2Xk4DUFWTuc3JycnbqRSfILBcewMzl59maNsjHOcN/wD/AApnaABDyVBh+kL8qYuB2WFj1EkqqCk4UUevFavsnLFRB7Co8PE5u4UuFZ+7svpH4iN0hj34/wAp2Mc39o0hR4hr+FjD/wCNJ/Kf7KKtaaggr0i0yIHc8qJgCLUDvRVKM7VmX3sxNZpVL4beMigPupNUcgI47ShxnS9Q4Wq8r+ycHchA6znPMI0MTE7a1LHr/LYatR/ToGDhSYCA7jZYJrI2dMIUEXAK3uPoZ/U7L8J1CHT7lM229joNjf1GD2LpaweEB5Pbe6iTUEEEMq7BkVF8ec3BOjtNa5vCa+QfIJrw7jsYfGRNKzkSQiCeF6tf6K9I39oe1isJ1WFywkz8HJuLCixcMwtrlac7SLT7emM3tYp4jbqKwTbaXnymHS/TkG6V6j5QBvcp8zWcrWyQbFMwwjl6jE6FknzQgDfiSEI6O7rUkTXiqUTdI4VZcJwL9inwf8VE10exTJA5EojZDIexJqHwTTJ5Cs/ZPlcXflhaXkc7oNkaOVpu9SkBicHDwmPDxYykkobKNrjygNPGdX2k1ynmSX4DZNmkjd03oTs/5IYlp2bug8/8V1XeGp+Ilv0hOllPhaj/AMVEwMYAE5tqN+k6TlSujRzKBtO5sZEgIzRXyhICi8LWCaRTk8J6kO6wXHsDN3CGwyY+zpPe/hTN/L0pkA6pICLfBUrNTqWGZpCKxU4hZawsXTZZ5KeLT/SoTYsfwT19C5l/p/nJ2CYX9Rmyx2tuGk/gf7KGvKYdk1BD1G0FHkRacXDZRMdqK0v8OREvGpMAA2z5VOZwmm8iL7R3PZrUUJZ8nWgigMi21O2Np4ToBWpq6BeAXeFF12fPhSPlrU2lc5l/L8qNsgH5ibWTlIdLg5A9hzJpWmuvO8i83wtN8oCuO7yo0xBBNyCBzGR2QeCdKbYNdhatCH2QZRvsqjatF7pHbIOC1q7zIX6LhX7riW7hAgixnCdcZQip1KTBxys4WrEYb47hRTHEn1bUtGWIb1pK8BQU1ulGgbTVJK1m3ldeQf8A1lOfiZdgykMHiHfORR4CON2r2qQ2zd6dwtQcjZ4VICvafv6U375uYHcp8BQkdhXUeF1NY2TQAFSJ08rrAupAnsc8N5XUv4haWndxTp69LAvwr5Xa5EMLGPCa1reBnoFoRgLSFLiWxbUo8Q16cyzaY/8AdORFoCs3/omVf6orUJJC37KlSKLd0U5OUgUp9SwHHvOYHbppPnuq09uoUh+VsU6aM+VEzqO1IChSOyj04iVziPiiingEJtROIUnC+hcy/wBP8543/TS/yn+yAoWoXhwQ2TJOufTwggo8zzSblSqt+0i0117FDlFNde3sV2nIp0TdVqWMubQQZQXSaFLr6/TiCgjDOecuHZO4T6e2io3BwsIdp34WnLjJz6QL38Lp/c+ze6jTLTSgghkEEM5d20FhoemNz7TmnwhIWGnq7T7OyEQaFoTBpG6HYUWl43Q2HffeW+Qj1AjLO/4qF0kEml/BRZ+YhwpAoIq3Kc1w+CfK4+ho3QjDAmN9VrQ7Vdp8Rd5UcbWce4e4ttHY+6P/AGUBXbimWFh8QGsDSo5w5OxDW8p2IfMdLdgooWx7jnN7qWonhdOzbkeFiJCxwAHKiiDB+vcB5ydfhdEEqWMAbKOXanp3q3CBLT6uyydlRBTtPla3Dwv/ALeo3+qEl+EZGjlageMin7J33UilHqWB49+Qnxyg6+ywtRadxspcVGzyj6t0WgmyFG2ssXN0Yy5YeHpM35PKcinJwBNFSOLBuvoX/wBv9P8AOeM/00n8p/smcJsRLiOE/qj0OOyw7Q1uyCCYczymihXYPt2yaqtnKjO3q5RmaOU7Exh1BfjRYbXKabHuRuu8pJWxvAPlTue6O2jhHEM06rQmbOPyzuoYGxb+UW3urPlErXXK6gK8oWw14TDvndLlDbO08po9u90x29JupBp+SaUMhnxnV8oj7ILjvpcJwa9CFrU070F075KDAO4vA5Tyatqu/U1Mdq90mkMns1ORZ9k9p07FDDu16iUOuOCg6TyED6tRC+aA99jtW/e4Aj2ncJ0jWENRls1aY7ukGvZN+ndTclR/TWsN6imYWJm6LQRRTBp9Ku8nud1E0BoTuFJLpQ1SOtDIuAW69SArM5FtqcULCZ8QnC1xk7cUE2N7fKfK9iaNW7lSfG1/KOHcPi4hMxL4z08QP6rQ0nXGV6grtPTlIpdysFwqVUt0L8okjPe0DfcBe6cwPQaRta00jnNG2aSk+GfC+pu4X/yoGzmrDYlkwtpXWGvSV1etien/AMUUUU5Sit1Kbba+g/8A2f0/ygisZ/ppP5T/AGUaaPVaLdQURdF6fCYQdwgmKsgNR7v45HKR+ltqEGrcjsqDt06NrxRUeqN2l3uax4QLid+FiGg7rS0N3cocC8vJeaYVHEyIaWDte3UEOdJTTqCcfTv4UEoe6laLzdNQBPPa5FM49s8po1JmpuxTEwFqahkMh2jId5TtRQc4cpgaPUtYCMwXUQetSe4gbJslotDxujE9m7CuoQ7cUVQ5HtHU1ahlVqq4VfdAVkVoGRNKkwadv9gwUMiLX5gKbxkUPt7U8gjG6jjLndR3K6ABtPZp9YTXBwsdpTBp27JHgKPi1I48BU1ot61scOVLiNLTRTHGdt1smNA4VLSFQ9inKS63UU37rh2vxHq0R7lMZe7lXY5gdynYfT+z2QMjPkbQcDwjaepE8eu1h43OogqNpYKJza7UMvOZFbtQfn+irvPCwYu3FEWFiMNHIz1BRYFschMTqWKGKdcngL6Q/qsc93y8ooopxU7qaiTS+gH1St/h/nPG/wCll/lP9lh2kcoJqpAdE2OE3dR5ONC1AbjB7+MrVGQ34QV5WnC8vUuo8ctT5XAWAocW+TfRsgQRYyJpB4JydqdsxHC3+8bT+vC30+r+6xX1BxFVuvp7DI0Sym/0+yO4V+D3Sgg6ghvuE4i903S34oW/ZAV3HdOOkWUxzqtB4PtHlRIDUmmstwduEEEEMge8d+lGI8rouJ5Rgfzaka8eVHfBKGyaVadJ0pNJTH3kRaa/T6Xe0StIWhq0+w4XSKAr3bzj2vMjZN4yqyiPPtGpSmtrPQPCB3rtk4sLUtbvspXTeAhhppjqeaQjcBQcukEcMx3yX4RmrUsRGGREMCwV9KinMDtitJ8JxkHAXXe35BNna5B7T573cKXEtvQ1Bs1bOUjpYhqLlFipXeLX4mTEuLL0qDDtiHcT90XjhP3VOj3K1h3CcU9S/JYLjscCDbcnbdlZawjZN+zhW6Gkfqcn8IODZaWqXE3A3b7qB7/p09HhNmDxsrtPIaLRaTuVLFqCEmj8t/K+jO0TPd/D/K5yx3+nk/lP9lEmpuVWtL4/gsMXH5ZY6TTHo+6jbpaB7DiQ6gg3791cdlWqC0aB6EHP8hfUOt0vQsHgZCA+R1LpjTpQAaKGVLE4Zk7C2t1g8ScLIYnpjw5O4TTqF9zmaTYUmkgWmNbaAAVrUO1zqQbr3KpPZYTZZWel26bu0H2DyozaagmqrTSRsghmXhrkPfMZ+6LTXyU8P/8ASb6TymK6WpYocOUDjwU3jI0eVq0O0+z59kmlqfvSiJLjq9muweo89o7ODlwUQh3krqM+6jGo6x2t3eT2Bc+yGl16lA0sJae0xtPhOw48JrPDl0R4QcW8rqb8IvaOSnYq/giJJR6io4WatlQaLKk/8h9JkQjZpClgvcJj6aEDfaUUUU9g5R22T1LyFguOx7g0bpsjXIlM7SPZJoWoDbbydwsVJ05GuWH0B50+V9XbUtjysNsGHwnDSdTSgwvOp5TkVPG2Qbr6QWs6uv8AT/KhcS3LGm4JB9gf7KNNTUEEE11UmuBUrOtK0Dgd43RTRe/fe/fad6vSh2kr6rhXF5nYFgcfLqEKheSKfyidJQcD2uFikxrifVwnihstTguo77K3nwtZCa7Vk7Eb6WC1E9z/AJDsMdrU8GgUJq+aD2nhWrVrUtSLd1CK2Cam5DJv2QzAvcoNA4V9tIexSLQjCxGADakYywJ7/Ca8FTN1MQDI/UmStPGVJzLGyElHS7vA8975WsOnyi9/hqBld+ir7rhatLrV+fcDQ3cey5Fx+y9RRD/uqkQvyiD4QkHlNdrRbaDXja1o+60EFM47Cmis3jUKQ9t1Ag9tZVm94Yr1fJH7MQY959XCY1rCKU7tZ0qFgaLyKa9jToVeRmSucjkU9eE8KXkLA8Zk0q6hsrpB2606UO4+xKCWOAX0xznQ+vnJ3C+pt2tNm0QMmHg/+l9TLcRGHtO4UczHwB1qPFB7E2d2umherynKRfTqk6rfO3+Vh3TtG7U3V5WK/wBLJ/A/2USamoJqCjTmXxyobazhWfPcPSaR329ivV3m3OoICu6Z5ZwnAaaKx2FOGk1x8LDfURTS7kKJ7HDqWtLTujERuwrrSM/aNTcTG7hOla1B2rjKc+nZA/dB1IOtNWkKRxc7Q1MZoHCb/Dsoo6rQGxtaQw2xRS6iQVatWrWp98KFyaU0oIZDlMOQ9RQ7OOUMwirQd2Hfs0rToGykMLj6l0vMa34eKTI3A+tSwm7hb6imHENbvVpsjnbEUUAU5gdymk8HtPbYC1DINA37cQ0t3UbtUYVIdpVO+6Or3bQ7XOJdabx7Xn38X8Wu+x7bzG5tONJw3VF2ybGAFoCbdqTfhMBGyo/8k8PaNinfmD17FYZzvg/LdSMe5NsZHZUnJ3CldpUjns8WnuDisDxmdyn7DZBc94HsFYRulhP3JyK+oR2woTujaYSLBWA+mSmny8LE/SATqhNKDEPwsmiXynvBbYUb+o21JI1nJU0zpNol/wDj8IaZS7nb/OeM2w8p/wD5P9lDumpqCGUeUb/UQhnatBTCyKNJooV7z3UmAjc9/wC8SfCdqkHpWLwpcPU5Rwh8no4UsToovRwsP9ThEQ1ndfjGfY0m4iJ3DkCDwpYWS7Ffh5Yv2brQxFN9YoozNl2C0WmxhABOcGItfJ5oINA9jSE6G+E8OiFhfin/AGX4l/2X4l/2X4p/2V7qI1ympqCBya6yrpakBSHaBlatWVSGRCtzU3cWe2gViMK3qa0xoYh6+U3Kk5h5C6tP0OVqQ6fUmyas3SVs0IN1bvQaBwq7K76tdWPDHpkr/wCQhurQxsX3QlY7g5E12efa1X7Dtgg290B3epB33R/RaR/sJG6m0oJC8eod/CuytFJjK3VKlppaQgwBTR2PTymSuHplTo2SNUGG0O1Wqzc+lyM3FOKxA1mgn4ivkE9xeQsAaCLwOV147q0zzac7W79E54YLTRt7t5YiUMjLlG0NYAE5EhfUJ2tYbX0/BanfiJgr+yK+s4XW0PjbumTThnwNKH6gGgqLDl35k3P9k7ZfQ+Zf6f5VZY3/AE0n8p/sogmGwmoIIKNcIEaiUK8ZWtSs3k5toB90Tsiy/KqQHYodXe1rkutKBJcjkw3fcG2dR78Tio8KzXIVh5Hz+t/nL6k7RCSsHFpATpNEnS+6dhGOF0msfFuCgdY2CY4a9Ltv1UUtHpyHf++WKPoTCWG02W011rqAcoya3prr9si1oC0BaAtARBtR+rYlNGya7SaKCCtbNQIPCaKd7F5klAm0Pac0PFOQFccINAVK83Ma7lBrm8brX4KLf3gtdoKrPvPe2MW5Qsa8a3DlGJh5Cfg4X+EzCQs8LotRZLAdTTYTHtcPTmPbrvfvsh+vsti9RcCp5XwMLuVFL1Ghx29w/omu1ZkiM99goMr2XxhwUALZCzuO3CJd4W6c6k87IhTsDwnDS5YLhObqUkOpRtoUE90w4V6tJd7HlcIytWsK05pI2KcyYcOtfiTGalFL6jI5kdjhYSZs0LXBO4WJxRjOlgsrDYNzndbEc/b7KsiiqAFBYuNsGIbM0K9QsKRfQuZf6f5zxv8AppP5T/ZRJuyagggm34Q35W1JwA3CbLqI2VABcIdlb9kgNWE2TVujIBsUx29dhVd+IxbIPTy77LGRyzVJN/RYd2lgTZAsZWJl0DhqbUabF6i/yg06VVrENkYLjQxms6Hs3WoybAo4vGs9LlIS9pdq3WGLi/dMG+6D6NBU+91Gy01un/YHldMOCZsNQTXteE3dBA0vkLQaEFbgmSB23s2tIO6BV91KlSOwTHagqQyIT5CzkL8U26TJdfCeA4IRP+6fhgPUCowa5Q9zhPxcTPKMb8TIDIPT3uw7CdQ2KEhjOmRF3gd195PYdlq1Ggt+Ci037BCaCHFY7U5ha1YdtMA4Vb2h7bmVJrCDgcnNtAV2XkPt7TitPcUUUQnouT1KPUsDsM6o2i21Iyxsh3udSDfunuN6Wrp6vkpcA151NNIYJzR+0K6GJZ8ZL/iv/Jd6ZGA/1T8NI4aQNv4pxn+lSam8KPH/AI1lQjf+ygwzYGV5RRzKKxMInjLSsDfR0u8KRfQ+Zf6f5zxv+mk/lP8AZRhNQb5CDwgQnzgbKOceVERJZRa/wgxx+SZQ3XK099gJ79KBcVpRjaU4eCg4x7O4zEzC/TfeTW6DBIdZC+rANw9qDFk8BTzYgC2t2WAEjtTzyVHBTtRQbaIpXvVKXU5YeJocb5U0G1qFxLfzFJExwtFvT3ao8Q5h34Tjp9TVDKHKLfuJQkHB9ryohaDa3CDWHlRUPSEFVoK6CbsFVp8RPCbKW7OTXh3HZvkD4RcBygUewIoZXk8+lDjLyiaT5naqaFZIQia827fsdwm+kbrlPcYxaa88lWh37p429Sw4FIbk+xK0OG6j6kTr8Jk54eFrb9/b5d2Syb6QmN0jMi9u8upR6rJKDbOp2X6dgR9h8brtqafHYVVqvbLqTbJvLhHsOZUxobLwnilL8lguOwfrlYagQ7ItW+RTDfqKfiTemMWh1Rw1F8v/ABX5h/ROjk8ORE4+yrEfoqxAKdA/EDTNVKFrMNK6MClqI+WZRRRUzwwKOPpt35KkX0LmX+n+c8Yf/Gk/lP8AZRJqCbE0+ohGFrhSZEyLc8pz4xVqBzSPTm6PfUFdbexQ7iPDuEHdL0nhSSlw9Kc3QdQKgxjHelx3Qe13BRRxEY8o42EebQx0J5sf0KD/AMR8eMvqEfUwzgsPD0wsSNVBYXXdeEGlMZ5RbaLKCLt6Ke292FOnbI3SeVCBpUw0+lqlYaWjaimk+VGRq/VYXVW6edlFKH7ZucGiypsW0Gmpsss59LV/5DdgV+KkbsV+Infs1NZiTuXLTiQa1LRP/wA1on/5rRP/AM1on/5okWoymotB5RmY06fKZJaDt6pA2huchnoGdZ0gB3X3TP6bLTHkhblVkBSkeG7BM47JDtSA2pdNzT6Ct+HhAFuwTIzdu7nHSFR8omha0h25UdNspuw9gDyVQWyLB8kHgoO1Z8dzRvaORNC1A3XJr7KQ7fKkNBRXpsooKvPbuVXZaBJ5yK59k98hpX1vimjSK9gop7gpSXDZMe9wsBOJKk+SwXHaBSq1oA+KDt6ORNZFtpg20EqNgZx3FOmaFb38KfCmQ6gd1A8/s5OVSNjhOdpFrwiinM1Ps+E5PX0PmX+n+c8Z/ppf5T/ZRJi8IPlHhMs8oIRMkrWLX4aMH0bJrMQw7kFOmezliMuJO6w7y8WR3hV2lUpiGCypJuoy41ZIpxQi0v1J2itbXUf0WBxBxLi2XladkIwtApQubBMYvvk8AtIKw+JjI0E7hFuuQqFlKsrR3C6SMCxOEDlFCIISVETVqd3p3TaK6eoWo2CT5JuHfGLBTnYib1MThPGNZasLiWT7SOopscZ4NrpM+yoZEWjD6k1gaNu+t03VdBNkrkJu6a0IIZDMIIdhKvLlAEe3imySkDgKNu2ZGVdrj4yEm9EJzwBa607bcW+lR/UID5TMRG/4lNmL3UGr8x+3CbEB5UjjD6tSja951vRZqG6d+W6jwidkxvnvrtsKSQfuppGm0XfZAuPIRAK0PB2K9SJe3wta6gXUI5CbIH8Ldat9KOwsITD97ZAg9/CBtOArdMulS49qu0ZFX3yegWhIECDkXAJ04am/mmvCDQ3YZnKsjuiEWosCLQE5UnHwpd3ArA8exK3U2xyonOcERfOV0oxqJefK1Fp34V5ErqtbsShJrNNQjAWlo8ZOOnlT8CVvhagW6gjRRRTiBuVJjYm+VCXPBe4cpykX0LmX+n+c8Z/ppP5T/ZRJiCCbwgo1W95uFmkwUO4muyu2R3Wk0+Ap4m7jhQvbdUnx+R5UP5ZpOY1k7XtTTYz+sNLXNeF9PxTp2U/kKVwe7pqSOyQ0UFh/U9AV3yMFWpIepEWhRYcgKXD21fhT4TMN91hIgZHX4yZG9pL4VFOJPSdisTgGynWzYrCQHDatR5V+5oNqLfZMH3TUEMh7gIPulwcEO0Zg2idIspm/qOcpqh90FJAyTwvwsY3aN0x7+C3dU88lCE+XFS4drmaVg5nNk/DvykZrbSheXeh/I77RORNL1FUsQ7SKCdOG0B5Uccjvmdk2MNN92kFaGjelS4yc20xEA8oRtHCGZNK1af8AFMa+k2MDnsG6J9y6QRKDr9mQMAQf5QkKbNqsFMjdMPsmt0igt0ZHDgK3FAVz2lHJ6KeKKcb2TmkHdYLjt/h2PBjOocIOsWMpGl+3jKrFFaHN+KMun5p87nOoJkETfVz2FOFlFajA7QfiiE6YA03dPlk8BPZPOaJ2UWCjh3PKKenr6FzL/T/OeM/00n8p/sok1NQTCgo+wGyhyR3O5A9idxazZNjexu26m1+QmMIPKs/xR0ScJ+plKHFtr1JsjX8HLHxa49isE9sc1/dFgeQ4rEgNjcVDM6BwPhMeJGhw757ke2PKwEXN8oFnjLDfludf3Uj9LdSww9Gr7p8bZOU3qx7O3Cxsc2I09IcKPET4H04hvp+4THtkbqYdsr9mt1EmoIIIIIdo7qrIe3SrtbaOyLi/4IxubvqQAO/Y9t7oOvjOeIyC2miFBiNZ6cnyzlgBcHDlRv1DfnJ4AlDh3ufW2T5NI2TW+TkTSk/VNwhm+XCG3bz7zz+8nkgbKMkqQ8NHcM3F3DUBtv7VpxTHfdfIZV2E7bIucNk2DUNTypNq0p7XVqCwbG6K+y4NZFN57zkUd904Kf4lMIO6l+SwXHaNsye3+Ctw5VJ8TXinIxOi2qwgXR7s3H2UU7X7DImux41NIKw7Ooy3G0WhvCLLKquEUU5SL6FzL/T/ADnjP9NJ/A/2UaaggmhBRdj39A2VGZJNUrfl9k2bhr+VYCJC1gmhlvdoyOB+KD7V9uIGqguAp6uyi1vITHxu9J5Utjx/VMeHjcLolvATIp2GwVEZK9SmkaW0N1FA9f8AkDbZSdVzSHnlNw0zm6dNhQ/iMM3QRabPM79xCfw8UnYljU3Ea/i0ovlH7ifM9rdWhYZur86+VjNWgaV6426huFFOHmiKVsKe8XSmja71BRz0TDL5UMjQOmeRnLKI+U1zJm0U2E4R1x/E+F1WH2jyo01NQQQQzC4yHuhHsPfa0A85EWo+KPafynV4KGeKw5f+ZH8gm4pzBUrTadiSN9BUv1J1emNNx5czqaaKd9Sbp9DTahc17dR8rUOxziPCBcRwpH6G6i1D6gxzPUCFE9kldM5Ghyji4tWgGyj+YQfCBB47eewb+25pIWhzuUBpCDbOo9hvIZ17Rvwt08obpmrz3FP41KSSmbKOLqnfhAAbBSDT6gmuBVhOffCbY7TkUUUU6lILFFQjSXMPhS/IWsDx7zhqFFDNzA7lOhco5D8SqzKkdpaVgf8AThORRRRTlIvoPMv9P8543/TS/wAp/sok1BBRutBNdpQlvwq8lTzGIDSLJTYhet3KlZ+83lMjbJTncot2TsITuw0oYzGzSStKFjKs99VI7bLQAi8Nk9SdiHuB0BGOR/KbhXqbCvbum6o1ES7laRSpqeNfpag0BaBd5FoBukHBpUwNWoZrfoXPK6bLuuyKoHmLx4WIbqjpYOTqRlr+QtEfldKM8BBoHCkjDgmtvEBrk6Nr/kF06+JTjKwXyppA6uuxNfEN2bKDEtmCoN4RA9mt1EmpqCCCCGQzH+wpaU7U1wPhc+1K4ndvhMdqHZiGGSJwHKiOtod98rVL+Klc++aanQnEGv3VFhWRClisP6S+L5L6eysO0lPFiigfGZQyLQ7ldGPwFIXMFR8psW3r3Ty1j9LRuntPUAcnYfWdTNimvdHtJ/2hIxxoHuKAoe5dcp8p1iNvPaUP9g/hBAIdlolaUWf8k2hk8Aik4ED0qI+kF/Ktc95RRRTk5YphYerGnO104LBcdg97nKQKJ2pu6OTnBgsqd2pm4UTQ1tBFFPNBcopykX0LmX+n+c8X/pZP4H+yiTVencpuJe59NC0StdraU3EgbSbKKdj/AIlNeEZWhRtd8385Hhf/ANjkJrw87ZA3m7jsNDlO3Gy0uPyKDGg6qQ0nhOe1q1DwE+3CtKbhWnlfh2VSbhwPJRhYgABt2fwTmh4RJaKUbN9Z7HhxPpKMeoUSp2yQSHyFhMQ7EN0kcKeJ8XriQkll2kFBQFzHendetU5TwaJOsE12oWMsRN0xQ5XV1/IKVzT6QoWuh9SikDxsipcZIx5Cw+NE5I+ytWr7PKjTU1BBBBD2B7gRyO6JMP8ABNka4WFz3u4VABCTpiio3l7bI7I3BjaK6gKGTSSbcm1IbKJDQpceyM0osVJNwxYSUWWJ84ad02ZjvKdiG/u7oTSO4aoZC/Zwo9j36Ez7nnKgpRczExmjKh3H3XNDhRUUegk9wWr16fffwg1ALjtpaa3XIWmhsgTwQpXUnyDT6VDiLb/BMfrFhDtOZRThafaLr5U32CDtLtKwJsZudSr3LRTXEkrEYmTDvG1hfi4n7HYqOVmqrVomlNjYCdTjsEPqgPDFhZNcaOT8inKRfQuZf6f5zxn+mk/lP9kxzWiyU2Un4hBhf8k1hpCPwUII/IUWHi/4rERNbES3ZQNpgzl+Kw+vUdRWIZZ9HKE0se0oTJGuy3XIWp90FqCLiPCHqdvlWRYA/UgCOAhq8+wcyj6uEJK2cue10bXGymMEYoIgHlS1ELaLTMU1pqQUmyMduCtQXKaem7SeE51BahHudynVN4UcQC6SMb4HW3hDFRlu5To43er7p2HZvp2KZMW+iVakOwu3UO6aggmoIdg94bdxctJO5U9QjWFG8OG3cXfZaqWok0nRhRzPidok4+6Dg7gq0bQYwSEHlaQiRGLPCfj2XoYnYmlG8CO2i1LHPMDewWGwQYPUqAGywjjHinFye8UhEzET78BMY2MaWjItDt08zMGwtCcDZ4pSStjbqKje6Z2oprKzxB0lrwjvRGTya9KbI9h/MGyBvcZOcBuV1GkW3dHGmJ35zKH3TXB41N9316t+O4Hwhu+09+gIcb+6/hDI9x4Q4zxFM9SADpER0pDq8rCzOiOm7CbJkVatHNy/inJ6xHAR6red1K13UtfT707okNFldfUaYE1lb+e0I+w5oKaKU4uk/wBPpCLBadhm/IKaOTTWoqHAR/NdFv2TofUHDlCWnaHopyu0U5SL6FzL/T/OTnBosrGuf+Gk/lP9lDh9R1SbpgA4TUEEFGsWwyQua3lYGTqRC8rU3wpOcY5+mPKZGGj0oAUjh47ukWvh+O4TJ9aLi0bBNZe7++TfhA2L9xzvCADeEWg8psej4p2scJr3/vDseHctTZAdjyiAU6FjtiEcA27YaU0smFFu9QTMfHI3UwEL8Ww7J+Mb8GBMjLt1HHXKDc8VFTtgh8GrWpCx4pyOMbh26XblN+pN/wCKH1Ef8V/8iP8AioZHSjUW0E6jssMdqKCagggghmPeI7TfhBuVXyiwcoHwewrQeUIvuUWkKyqvlQaTK7SOEb8L1J8RPqHKjxZk2a2yui6U3Lx9lPg2Pc0t2TYWt4Qzd6tgjhoyKpYuV+H9CwTw0c7prry1DJzQ4U5SCaRxo+kKGRkY2TJGv+JyLgOVi5m/FvJWvFwM9IWGd1Yw/wArdG1M7ojqsRnxGKFRDSEz6c0m5Tq/igANk5odygx+DdbBbT4//wAKOVkotp94ss2EWu8FNfKPm1PxPTFkJuLY4XaZKNKZKJZKHj27XLssQ7S1M49kIomlo1A6k3CsjdqWOgD/AFBYOrMbwmgR8ZlDlFytF1IDyiEVK9rBbkPU+1IpPksKL4XTJ5R1sHpCa4O3Huula0+pA3uFfhO+SYLJcUR6kOEQtNcI5YyPW2xyFhcT1RofyEU9oKO6eaUkza23X0Sdg6tu+3+U13/9Lqh8ukeFigGYaVzzvR/smSOcaiTQggggo8vw/TeZI/8ApdQBupCRzzYVOI9SxjtMzSOUyYULRxAadt0Hgqwm6WWgPPsta5hICDjwfbPy9lzvAT4CRZO6gYY3W5yBvL6kPySvpjQYlJhQTaMGlRWBSsjlNcDnLprdSvrhdRYiRundMa5zdTvKhgBCGGCiwbb1OyPKY3e2pjj5CamoIIIIZD277XyGN242XUaUN+54J+KDvBVovaEBrOo9rzQWHHTB1eUDfGWKl0N0t5Kw0ehtJxDUN8yaRb1BuqpHZPgjn+YWLwsuHdqgWHjxtDVshCXfNydhYzxsmB7WUeVLFLIK1KPDNY3SEG0KRiaVI+aL0Dz5TYGfv7lSQtMjK2XTbxSZG2J3p85FwWgYqXfgIM0/FXnSnwlu6kZpywuJMn5cnyHtE795hjdy1Y7CSMp2GP8ARYbEvwvpkZShnZMLb2XSfJ9kwbZlWi290Gn7rEgNbZUJ1NHt1vecjA4UUWU+mIRzO2Ubz8XJzwE6ZB76srVq/igiLKCKkdpGpOb1ueFpDU9TH1LA7hG27hB4KsA+6QW/qE1rR8FiopmuE8LuPCZMJQHhN2C0rjMop5AG6OBic7qP5TY3RGgdlN1QPS9HGlgp4sqXHTSO6bG8qOIxR6btfRYWSvl1N+3+VII8PGXAcLBxdOPU7l26xkLPw8h/Q/2UX6JqCCblHniw8zaW8LDfABHhYciRxeq7C27ATCfPYcjnVrnKkWWhY573EdQLV6q73v30tTGaeUVNAJW0hA/D+piZiWO2dsV9RI6K+kn0VlI3ZMIGxQo8KRptNkczZ26fOxg3U2K1LFSANabTscW7jdSY3rPDEMQOFhBqYCmtzPKjTEzY0UEEEEEEPbI2Qbp7nAR+sBB1ix7D/TwoRYs9ptBurd2U2GfeqF1Ifimtu7Kfi3db85tL8bq9MfKYwndyGRNIBzjvnPJpCbJ6FBqedZ47mm3HNzWy7O4QiMZu7Clm/dYLKbI937qdqZ6ihKyX0J+Ga7lYeMRspuegIxb2Ci6WPndMxDJP4rG4Z7niWI0Vhse4ER4gf1TpNPG6fjei4CYUCgQdx2ueGCym04WFXZed26kQHcqTB6Drg2KbigDpfynYqNou0zGPl2aE2J5/aFFgpMcMygM8ULYsL8O03eRTeN0dh2y3WyggEW/nItBC/DhdJjd6R3K2tbtKu0Cipr1UtIbwnKRYh7GuGor6c5rm+nJ0QcnQyAekqN7o9nhBwduPcc0OQJ+LkWDXpCaABmc5HEbN5TY36tbyinC+VQCkCxGqOQOtP4X0Eaep/T/KxY6gbF9zljP9NJ/Kf7KNNQQQQUeR2QPUxBKg8qrFLCR6LCPZ5R3TXWaPsj2d1qXTJfqQbT77C9v3Wtv3WvVs1NYG8dr2NfsVjcNQppWCm/DP0ybJrw8W3J8Qcoo+nak+6anwMf8AJOwzQKpTYJso3WIwTIq9Kw/0tkkutD6Ywb0oYg1uyAVKl5UaYtITTaCCGQ9u6TC53qPed0wdA6fCvvmNUopG77rrNPC6rUHgokBXrWsIOBye7Q0uRZrAb91iYumWysHCila8WECtWo0EAAhn0XOfqeVNsQ0eUAAKHd8ZP45ONC00UE93hR7JknqpbOCbGxpsBFYT0F0Z+/bSkw7Xm103M4UzQ9ukjlRRiNoaF9Qi6sX8FhDiIi7pm68KOUPH65TStiouXUv4rRq5T8T+HdVWEDqFjtdZdQTn6RaYPJzxGHZiG05QYB8jvX8Qo42RimjMMAdeddk/wWDNt7b3z37mnV6symGwirc0m06XS6itQcEY9O7FHIH7ecju5PTtliHiNpcVJGZ3W5fSWCFmlDffsLfIQN+xdco6vCJkHha3/wDFbu+QRA1V5XTHITdVb5HInwFSKKIRRWJpPlYOV9Ea8mWj9v8AK6J2cTuE2SzpPKxn+mk/lP8AZRJqCCCCjVp7qCw5rU9RbBPdobaw40t3RPZ++nF3DUYgQhY2Pc51BdfqHTEg2Ru92hL4eK7NYdsFpVodjuLQde+VXlpHe5upTN1yWCn4UTNpMZNh9gUzFkbSBMlZJ8SpdW2lM1HlBqrJ+K0uIXqxLt1Dh+nuqQ2HZ5UKYgq8rr1w20cROD6Ytv4o4lzD6mFDE7XSEgQeEDkO946p0+O21avLSHGyiDGduFd9r36VX7xTKIRvgLouH6p7HAWR/wBJse3qK0BPhf8AulMw8muyV6lOJC2gr/Nr9FLu2kx8mGdVbIEvCY0N7q1S39u8gFEhosr1SfwRUvyoKMndQtMjur9iVG62qxlM0xu6zf6pkgeLGYzItD8w3ljHy6i2Mr6ZJNLPv4U0PUII2IXXmH5dWV0pLD3bpjmu4R/RGIEEKKZ8Hol4QN7jMmhabzZQd1D+nY7havsh7U/7MrAUbIR7B7DvX6cyjwmSGOQg8HJ7b3T2WmBzXIFGMXqCdfhai07p26esVN1fT4T2v1BQBwIUMskaZi2O52XWaV1WouvhNFDfve8M5X8e1zbQ35zKcbNBVWRRRye/wE6PV805gbwvofMv9P8AOTm3v5WKN4WS/wDif7KJNTUEFqA5Qk40rqkeFjJH6PSFhTGRsUw2p96Cb2uNOCCJT3IygFdSl1ATS0vJtPYRuCgx8+x2CYxsY0tyc3UmOfG7SvUtBPK0jIs/VDblXfGWoBC3HfhBV7ZA17hMaqvldEJ+FY8fZRRNw178oPaeFeRT8HI9xOrlRxiMUEMiuM/KiTUFM8sjLgsMbbaCJTppo36asFMe794IZySS4Y6gNTVBiY8QPQe19nYJjdIrMi16xwuc7s1kZS81GLWmvir8ZlQh7nlzuFK6m7KI7hmT3aQmsrc9x3FKAETO1nhPnGrSBasvFVShn0u6cvPdNimQ7eVFM1rbcmTxyfErUO4q8pnBtoP0sJWDdWFLnfqsE06PUqa3dBwPC52UNQSGLMFE54etG2WNcGgkr6XFTTIfKxLum3VagZ6dX3VIxjlMdvpKH2U0ettLBykXE7xm2zucmVW3ZKLYVCNrPtvGptLBRiIaR28I347DzlI/Qmiuxyxj6eKTMRMW3SE4PyFJ9JxaEJAgbR5Tgjtsp5dbumE+MMFpxc51hRYOXEEODqUf0+Ropzk3BMaKTsK1qZhYymYQRm2O7y8N5TpDI4PA2CB1d37ykkLeAmT9T4hF/wB0z75HIlFONL9U5SL6FzL/AE/znj23hpK/4n+ygdvpcmp0jY/kvxQHLShO+TaJv9Svwuv9q61BAyH4Zali2CE9Zn9VBiGlmpOk8qN19su1FOmr4i0XvcpHMYNymxvkANIsdptR2Wi84/kewDfvc3y1CQEWmtvc537bxW6aWlDOSISco4fSbYurTtB5Qn1cLqhDcd1LdeVGmoJ3xULxWQanRCQ7prS1BDLSDysR9PDz1ITTlhseHHpT+lwQo5ONBRggeruKJpSTtj2TRsiLFJrQwUMjui9zOQhI9+zVJraNlG9sjbant1qKLp7pz9KAN6irRKvstdFus3ygykWhSYdsgpyixD4XdKX/AL7MRN0WfqVFh2x7nlaQnYaNx1UnYW+HJmHlad3p0cnLXJkurY8q05waLKEwdumm0XUFiZt0+TVD/FRaejpCgbpYpWdRhamNOHeLPOWLj9bZfsmGx3YUejL6iNWJYwKFuiMBY+5NMf3UP7MZv34TpAz1FCQPFtWIDmu1s5WGxQk9D9nImk7EMaQMh2SmhSa2m+2TQtYeWnkOV3nWYOcm4TeFRdNfbNMb0MUMFOtye3wg3ZFtohFWWCwV63C7QEzTubCnkLfCAIN0pzey2NALA8d932yxNL9imMAbScK3Ca4O4zKu+FLYGpNyOZyKKcNZRTlLsvoXMv8AT/ORWM/00n8p/ssVI+PQ5ij1kWmxC9R5WnUU1DZNRTgXHS1fgWyCpjaODhhOoNT34fTRFLDY5rXljlHI142zvVsFpCfGHjYqfVHsfKjhDfnuUzjJvp2zbsSM7t1ZX3loKH27K9oi1o0odpY07qeLULbyiH3so5KYAVrHYDeflMTEFiNXT9Kw8Za0WgrACagqBQ7JcNDNu8KKPpbKWZzCAG2hIQ3VJsgb78RKI22hAXzCRAdxCIUDHxyOrhSPfGgXu+KDay0hUnDSE122YL2Eik6+SgQ4WFSLV9SbbPTyFgfqTHR/mndRzxyC2uT5WR/IoNdiJBIfiO90bX8oRNCfE1zeFfSdoTNgsTN020pIX/M8IN1hkbE5vRlpvlQn0ImlK5jm0on6hunAOFFYU6bYfHZJOXemJFuhuuZ2ywuJe2VxgBLEfqENW41+iwhbisQ6aVS42KNtjdQPkxLuqW0PC/GdE6ZhSDmvGppVNVfZTRFw5UUb2PFItWL/ACm9RvIUTjifX4UkIeKUYljIZ47ZG29vuTbt0/dOwx5ah1Ytyo5myK1a1LUAg/1K1Z8J0b3tolMieNrWp8B9XCaQ4WM5pek21G0u9RUYXLkdlWyeiU6XfT903dUsY78wRhObQXSGm1JEWu9KwHUATdX73dSBvskbp9SO24Q3Cczy1a/B5yqsjvssOfTpPhHI5HIohFFOUq+hcy/0/wAoIrGf6aX+U/2UguIrDOD27IIIZN2W7uE1tZlodysbhoxTk/Gvid+RwsL9VcXaZVHJ1j+ibIJHlo8ZTnQNQ5UUbpLM3ldORh/RMut8q8rVRo5Ebg5PNNUPF+04WtS1K0HBFw8K/v7RCuuwpxUbAG56QtLx5XrXqYbQIdxkeVGmoKZxLmsCbk92pwYEEEEO298nNDxpcNl06+KaXA+rLUFeTyAN05nWFqE6m37PDk88CkNt6Qdacaz557DutN8otLN2LrEfupzy79Ah+b8RQWHwzGAil0mVRC/Dth9bBnfsTu6WI9aOLa1uolNkOJdr8IjWNDVg8OWSklSQNe8OKZGIxpanN1jSUMNGFIzSNTNlHFMT+a5SMdA/qs48pkjZBYRNblYnFt4vZf8Ay7W+mIKOLEfUZAZ9moPigGiML6hhJcU3qaaITPprGYXq8mlgScU9oaKaBv8AxWwGylhbM2ioGnDv6Z4KCJAT5WtWzBZTbfun4cO5WHd+Df0X/Hxk/UR6U1/7ruezl3tua8u9JTYmg6vOb2DlaNrR6jDsiw3qJTR57f3lI0ObRQxErHHpHYL8Zi5PgVFi8Wz9qy07FR4p4+wRxUUYqj/0j9TgZzf/AEocXBLu1yBB3OT6Uuygd1nl6iRUX/k4h0v9FO30Fb6ACpeVgOPY858LZwWmwtStH5DsKHpcUEEe0opycpF9Bq5f6f5zxf8AppP5T/ZDYUoW6dkEEFq8BQ2ecrpEhaspoGzt0lCCRtsd4Rw5BshYeRzW9NihLIG6RuV13uNMYtVPuZAgjbIsa5FpjOocIG0WqtG61AttMmY7gp5pqYKbXt/vd5tPY9/lNMjTRWs/vIEHJzSeCreOVqRTeOwx2htt2nIsX5iPKhQQUs8bMQA4oYmH7qf6kyJtgErB41sjt/Ka8FNPex1ntpGCMm6X4dlbIw/qV0WkbprdOyA9nT2VaJDSuULbz3uIaLKj1YqTW4U3wtICB9eluT7rZYbEB35Z5yLbWot5WryFfb9XhaB1vKY4SGnrDuYG6WKPY2sHu0u+/bILYQmG2g5YpjYWmdpqk76mcRtdBDCGeTXpJasNg+mLazSmYZ4dqc9Rwsi2YFSfbWaCFgsKMLHQ85A1spIw7dF1ovr5INDt0yiENspoGyiisPJJh5ui/jJzQ7lNJB0nJ5rhAV7TjQtMJLbcrvOQnwhuEQm7mj3E7hSbsKkfTtlhNLGGd3hR/i/qBsmmrD4VsLaTowUYGlYrAxSemkfpUjNo37KPBO6ehzypPpbeWk3/ABUrMe0FoNhYeZ+DGiViix+FP76xn1PDMjcGusr6YzThQT5WIPA+6kUvIWB47y8BGQoPtSSEcKHi0JeniOj4zpPdp7CnMc0mRNNi8iiMid9kQiiinKXhfQeZf6f5zxp/8aT+U/2THakxNQyaKUeT7tNG3ZiT+LmIb4TYA0KJrS/ZNaAMntDgmO6dtQN75mNpNpriDpcnOaBuntLPWzj7IwxyiyFNE+Bwo+lNohAUt/ZPuXXK1DOhnXsEdh5URA5Qe1GX7LFwOkm1tXVxGEPqTMUcS3TVqLB0LChcDyh3xCyXd95uHn2h26a4TozdhSSPaaPCYQRt2khosqZr8Y2m7BRxOY4bp+IIkEVJrAM5cO151+U3cLdEEp8TuWlRy6vS/YodkzDjJa/cCxX0nR64lFO+E0osU3QXDlYfeMHugNAtPhHHRatDNyvqMj5IXMcKX0vBuxEtuHpCAoUO07priDpdnX2T/wAr1+PKIDgo7HpKjPqIQznw7ZR+qw8heNLuRk8bWmnULT3NBAJ7K7CLCHGWsymm8IC8qyc21HYNFFD0uvucaIUrtLCVL+a7UFgoTi/y3fAIBsY0tC1HwF6lTvuumLvsq09jTyp/pcU7g8BD6TANWywTvyiz/jsvqDiwah4RkEjdQUvyWB47nHwFVbFUb3TRWQA8LERE/mM5CifrbvznI3UQT2OOTRpJ7CqrIoopyl4X0LmX+n+UT4WlYwAYaSvsf7JrL9TeVBJrG4opqCCCjyq+zFyu2hYdz/ZRYZsbaCLdOyw7PXfY7acWm+k12FodygwIt6e44XUbGaPCfio7A8JjW1tmXaec67XGggfc0haftlsj3UmnvOq0GupRC+U1gTho9SbEyUeoJ307DvHFfwQjxWEGlnrCM2NvqOjWGx8coo7FDExk1aDgcwpTpbaibpYBmHi6QyusrCtH/Yvb1NkwfdCwgbyJpGEy+p6oyHQ08INDBQVeew7JvY+MOQLo+U1weLGT3fuA7pkQYKCIsLHYcB2pYOLS8lYd401mdld5GBs5JJ2UUMcIqMUv0VVx3uaHcpt8HNwsUmfEI7OBRbpfed5T3C/rNH8V1mEagtb3fEJsUl3qWgeQnP6PHCjkbK3U32JSXnSE1ud5vB5CBvdP4UTtQ7XiwsUDIOk0qTAdHYOsrDwiCMMHe707qTGxs5TTK8Wdl09XyR2T8SYvm00sNK3rPa0/LdYu9KwjraQFJ8lgeO0vvZqYykRa0rTS0uQGT4fWHjwg/wC6L28KVpcLCw2J13G/5BWnXwO8oo5FFOT19FeG9Un9P8qMfvffLGf6aX+U/wBlEnMcPVHyoHFzbcE1BBR5ucG8rE4iVg/LClnGHg6hWEjkkd1peTlOD4WG/XsfE1/KDXj0O/om3W+ZYXGygSOU6T1aW8oNCLWnYhfhjCdUP/SbIH7LcIguQbXHsCv9hXeR5Ca6+7yo0GhAIDakzbZDN0TJPkLX4LDn9xfhZYjcTtkcR0/2gpdeMjlNfYU/riKidrYDk5SSGMpmJ17hNxDSaKe3UNihG0LptXSCG3KBHHefYoqyOUQHjdOY9m7EyW9nBWECJT+gT3Bo3ULCxtHu1AJzXO9UZXWLf2opNeHi25kWg3RuFwLKw7b/ADD5zxjNRWHjoIRuYdTUw6hk9uoUhC8cOUv4gMNKNj2ilR8rzke+9+xmwoqc7bIiwO15AbuoY2sb6Rk3JzA4J8EmFk6sfHkKNxe3UCrc3lXnYUsunZvKii07nvKstOykfbCsM/Zc9lkmgi78wlMiOrW7utdT/iix0h9XC/DxatenfMpyxWGa1wmbtSlie8fKwul0WUFId1gOEVaL74WhzvkUGgceyHf8vCYDI7UUWWpsMHPLl9PaWg6sya7yinIoqVfQ42vMur9P854zbDSfyn+yiTeVD6if0QQQUeWrwEGBTDU5rU5pmk//AJCADRk4WEBQ7ZpSxttTMQ0N3daklGm2FRfUoZPTw77J+Jij+Tl+JdLtEP6qGHp7+eySEP34K/MZ+qEl+FbkS/ucSOFXkIv0+F1LQN5X71dpbe6Bvt1jUFEmpqC/VNdqCCCGdA8r8NDd6V0K+CMs7G1I1R7MARKnBlcIwmtDRpUmCa462bFDDucdRG6Eb7sJ05joELqv/dCMz/8AihESdTyhp8IP8FX7tZVlJFrfYNIYZl2unp3jTQJac4cdxcTs1CBvLsiL5ToXRnVEmvDuMzwnYgSeiPlQNLWUc5hblGzbKVrh6mKKcSbec5fgUET7V+rsn1htsUbHObuVPw1McCrGcvwKBsWj2EAprdHHGTggAjH5JUsTA1Ya4ZdLvZLVL9kZHYd2/CikDhYV5P4ROkLC+q30iaTpD4CBkdwi13gqnfdGPV5KZCG/rmeEciE5SCwVBsCw+FKpfkFgOMnHZAV2c9+IYXs9PKiFMCtPkjkdVprdDrHGZ9SBypHMooopyk4X0LmX+n+c8d/pZf5T/ZRIcrquhm34KBTXozAcqPER/wDJNkjeaDrydK1p0+V85CQgCBQQb5KvOvsgbzx0/p0hfnEaWo4Sd/JTsJLB+YFgXtlFvUbQBt3kWF1JYfmLCimZMLb22hmRadC9pthRc8DhOxWk7pkwcgb/ANkdu0tBKhd4KbumoILyEEO93qFJhPCu0xoGVLXpFlF7XfFOY2QUVpDNgnGgmg/vFBqLUO0ob+3NNM2QGMWE02N099elvK0Gud1qe35BNka7ImkRfPc6JpOrypevCNUZv9Co8XFK2wVisS6eXoRn+Ki6kGwUbtTQcy3U5VWb4f3mqNkjXW47K7Ug1MIUTtTAch2WrV5WnmnA9kvwKj+IWI/atWkdnKh+Nd5FrVvoK/Ra72KjaXbuU0fqBTDY9mVl7qWBuIYWr6e2VlxnwhfnKQ0EGahuUGgCgqyGddpyKKenvOGxGv8AdcjKyQekqQbrAcZUC6/cIvlCPw1xX4f/AJOJRwzPCOHe0egqMuA0vXORzORyJRcEU53/ABUjTza+hO3lv9P8qxljHf8AjSV/xP8AZRKRsjh+Wd1M/FXThSi1NAj+RTsPM8200hhp3bOch9O11qch9MaB6Tun4fGxUI32o4zA3U526wpJJdaaTnQzmkMe7VHinybUpXyFSPGuihC1+4REsR9KMnXGmt0yPoHdQynwmvv2Ok27CdM2P9psucmnV3u4QcJdiE3DM8Lpvj43TsQGjdQzNkdQ7QfbPaeVGL5TWWtxwmvvlBEWg7ZN4QQzukNTucpnzxvtvCZ6vUUduF1f0TXakRa6dHJ91YTWEu1FAeyNjRR/RX38JkvXdsPSnFrG7oSdXaFRQiPc7nOWAPOobFMEg9LvZpPwTZ5S/hYXBDDud5RjDhRWFPSJhd/TMDtlYXsLQhFLCbu0JA5uyw4/LCrscVqVoFWrTzsm8ZkWKTLicWHhPJknGnuYKHsOH2Re+91Ez94oKRmpD0oS/dA37EgNWE/q9XqNUUmsIJ41GvdORTk9YhnUICnwjBuzZSOxTH82F9OxTmtqXlHEtcvxDW7Lc+5Hy7sKDfK3W5RsIyAcqweEUUU5FSNDkRpFJ6+hf/b/AE/yp4q/MZyFHLriBlWK/wBLJ/Kf7KLdMU0fXb01GwMFNQQTRa3ag5OiY7kIRhj6CHa91KYlyvoOtOlD9gU2GybWHmEUmgnZSzh3pj3UcZjda6LZjZUmG6XraoqLb9lzGyDS4IQOjcS1dXwdiotWn1d83CjaGtoI/lm/CDgVVp1RiwEMQ395ageP9n5UaamqrQaFSfCG+tiaWhBwQRd9k0u+yNoBUiFG2jstKdGCmihkW261pRF9wvtkZe4QJqigO/FSOP5bAg/EMbTGL8NNLviHf0UcTMM0NamkHfsOxv2cbK6hEzkqOPSBSf6Xtcpy9rhoRiLyLUcluLDyPYpPha5QzRxt0E8L8S5/7Nuy1y6dTmoSNKJTirWpNci5ak4pr0HA5STafiLUwfI3ilBDJC65D3avVp9mYtazdN4ze3ytAQFezS0hp2WrtvLfz3nZarXKcnJu6kUoBcFBhhIQU3CABOwrhuFh5CfS7x7jOTfbYGZI8p1L0h22ZRTneFScpF9D5l/p/lP+Ka0AALGf6aT+U/2USabNJqCCCjThYUF1vlJyD3ObakFFMwwaLPKdGCnwgG1+Gj+yGEOoGPZRCQO9YTW1kK6pA4QeD7WI+IKiPoHe8Xtk5uoUofTsVueFiG6m+pNDG7UoZbNezWVq8x2HlRJqagghkAMg0IZDsI0nUP8AZO4QuP5FBw7pZS30M5UMRb6nHdONKq3Va+eFEC2x2fJWW89tZWFobiSXrruwuztwpXDRqQxDJeOU/YWrc3Ehw4Q9mKJs07pPCGUkDXm+F0JBw5Fs4T5HN+QWqX7Jk9D1ITgoOtO3UTb5QY0LQMnCwsRs2006hY7CaCb/AMvvmO4fmGzwOwjtvttEEoxvPJRicBbDumSatjznaH39p4tCkU8qPdtqRSbOCwPGcwMbuq1MxUb0CDx7XEhGVorSfJTm2KXTf4X4cnkpmDAJso4VnldFoGyHpCJRsottO2RTlIvoXMv9P8p26N0ptf4aUv8Asf7IHSLWHZpbvyggm5R5PPTOrwg4O4Ug4Q7XvrZvKji0+p3ORY0p0DCE2JjRwqAykm6bqUklNtCWSzoFqDGXsUzENcFqvdDvkbqYQFhxtVq+4GznJF5CZwpG6gjGQbQZRsJnCtX22uqB5Wtv3Wy0qiFd5+pepHlRJqCCCGQzGTewqM+O2vcpUnMs2mPB7aHOVAbqtXKkeQQAmEu3ObuE3LUGOrstSv0MtOcIMIb8rCtDYhSx0bi30qL6jp/LlbssLOyd5DVJIxnoegxtIPMR0v49iV2lhKwrJQxRHZX2UtIT8Ox3hPwcjHelDUz5JvqFhRodhFqJvTtub36Baa5zzT1XsONC0zZo7L777XhzjsU2TS7Q5SMv1DlRyasqR7zmU0UUVLVLSG7BSVSl+SgLrFKFzjyMnC9k5mhRHoSafBzOR7eZjSruIzcayCcinImtk5SL6Ht1f6f5T5mNO6LrGyxX+kk/lP8AZM9VBNTUEEFHkdzS6LRwphoqih2YnEaBTVhozG23cnscaCabCtOkrZu5Qivd/KxZniNH4/dYVmiIKSCKT5BH6fF+7smtlw50v3H3UbtQR72lupGu1xUfYCQ/Tk5UrI4Tb89pC0rSFpCNrqaeUJGvFtKa2srWvdB5WvdRJqFpqCCHsDMbHtrvGZIHPa9o5TXXmHa+MiaVZOj1uBKoA5u4Udt5WoJ8YlG6a1zPNoG85sdHKTFGLUbz9RoEUAmihSItTYNsiwuFGDsrEw4iSz4WEfriA8hTC2FRkOaD34n8xwitRsDRsvj7NBPqHxsmPDz6e47rqafmi4AWtJebK0HlNzDrNZXnILFICva57gpIWyblBrhsntIOoIGxfcey0UUUVIfunqRSfJYIbdjmWmx2PUvxTWHTJsgQRY75HaUxu1lXXPYcjkU7lFcIopycnvDPkpHBfQ/W6X+n+VtSoxSengrGOLcPJGznSf7KAUmoIIIKLJuWJBLLHhN4znm0bLDt6z+oewmlJNpWHmfI8tZwhC0c7oADjLGgys6TeVhpPRpPIyvJ8depmyZPbtDue8NAWg3YK1VyhRR2ypDsfqefStT496tDEDh4pbJ8w/c3THWPZpBOw9OuPZNMpNFdOT/kmxyN5cvwzXbuX4Rv3RG6hFJiCCCGQQ9q+y/ZPa4rldP7JrvVpKxbtEeyw7dEYtXm51IbhHOQenZN3G/ba+oS9HDPcFhJDG7X9gvp0PTZq+/Y5utw+wy6Y1FPa+tt1A8Vo4PfHH1ZDIUBSItNvg+zqbiXkfZMj0O276tSMkhJezcfZYfGMn24OTifATSTyMovPYFyfYcQNsq72yCytSB8ZE6H0E1zieOwvpF7kXp8hHhdX7rVfGZTliXgPbujuLUil+SwXCe/QL7cVCHttR4p2Gk0OHpTHh41N7idcunI7rdqvuKLrdQyKKKKKfR2U7Pw/wAeCvoRoy/0/wAp0oDtP3RZoaT5WIaehM4/8T/ZRJqagggok86W2m8ZT7RlN+IynmELbKZE+c6ncJkTY/jleRWM9K+lcu7GU5xcsS90OI9PlQS9Qdj4WvOpapG8pjtQvtBze1w3ajitGzggQ/cdvz3VZSRNlFFGBzE0g8Jo9sdgyPKj4TU1BDIZj2eEM+fe85zNOz28hPvEECtkWuIobJrNPlbrdH9E2Tw4ZuBPBUr3xtul+NjvUNj9k1wcLHZS+s4pr/8AxhysDg7dTk1oYKGZ3NICsqvKWNsg3QcODlqCLgOUZm+CpZjVKKtObzVHvCcmxBptSMLhbTum4zfQ8UU02O4G1iMKHetmzk1zmj1rrR/fMnQ7tjbobWRFq9POYeCaGU7NQsJh1NBPeU0gOukHtWvfZa1pk1aiuq0c50qyIWjdaQVVZlYggNIJWnqusoAgKadoNFOdrIIWC4RFpl1R7OdlJAHFMP4OUM/dPa5RMqQuPZyE3YdsjtATW0MyiiinLGuLvymblfQvxGFleZNxt/lNxPUxGr7J72lqxIrCSD/+T/ZRpqagggo0d1VcZYg/EJuTAJCZEMyLV6eUZwE8ieUNKwkbWatIzlNMKhFNWNjdesLDDa+4itwjiGs+eyGLgIvUueFI/Sonaux8TH8haHwO9PCBvN7tItR/cdj+EyEg6k037R7zFuoCW7OTHAobboJqCCGVoZWr7KK2QNFagtQ/2R76vsxT3RN1jwnMhx8dt2KilxEDTe9LD/Vo5dpPSU7Flzbgbf8A6UmKxcY1OoKT6hiZjTjQ/RRNZJLTAoKjnMZ+2ZNIdhCBLpNKcE79E+R1IQum5KfhCxuoFMbJq3TG1m9uptJku1P27i7SEN98t5P4KeNro/4LBv6m/sXvSkhZINwmNfDtyFrCe290OMiUS2VvpPY4BwpRyuDjGVI6/Q3lNaGjIi03v5XSatIVZlrXcrp6fitXg93CtG0UViImyDdaA1TnS0qWMaUH6HaSvp7g4WMjtv2fvZYyMOLXLDvI9J7CUzi+w5Ov91A2M5RdZFFFE70iEVI7wOUxgba+hgHqj+H+VJ9Pgkd+XsU3AwNFaViHasJKD4B/sokxBBBBR5grEN1R7KF1ssp0mv0tWzRQ7fllNEGnW3lYcUzfOT1u0oCgiLFKE6XlhQ7pG6+VjcBvbV9Pxf5XTk5CxU/2Kwo9F9xY5nxQxIG0gpAg7hFwcdKa3T2HJ3pNhA37J+QGR7fIUdpiaPsmmtigggggh2bLUOFstB1agqcjE48FCH7rphAAf7AZE+oD25J4Y/S9yMUT36sO/dTSOjl9B5T3OP7Ri/Fzj02uo55uUqOGXFOAbwsP9M/Du1gpsWufq/bM7mu5rfUX5Flp2Ga8oAsCxut8DmsG/wD/ALWAEsUn5o5QHYWhwoo+jccIPBV5vQ4R32yeOt6fCdF+Gd1I+ECCLHaRa4zpFtoxoh0XwNoYmT/7G0sQJJvUH7KF08jrjdsgMTE/qBNxrztoTZZD8v8A0g4n4vWOxk8LrIpQS4tzPymc+UyHHEW54CMk0OxcCmT2PUg9p3tE+85gcKKYwsOm1p7zlNs1OUgvZTNpqxB9QtfRzcf9cn7NJUZtoypEZYkW1QsFJp0HScnO8BHhNFCuw5V2ScZFc5P4tOfQR1uH2TmhoR4X0XUXSAfp/lMYGN0jLFPLRMw8Fp/so0xNQQQUaGRlAfopOGppCdO0MoKPpws9Kw5e9ut/Yd9s5Ga20sPqA0O8ZSP0JgzkYD6k3tc4BPe8/FSyBpt5T8JHOF0XRHQ7hYBwMIrvcwP2KEJi+J2TPYrQb8ewXAKNxe4uKtXmVq/ReVGmpq06kx++koIIIK6K1K0PZP8AsAiUI99R59qXVodp5Ucet35u58qGDU12g1Vp+GxEbt1h8Q+F35gtSjDYgaxbSmtbG4CQ7fdYVsUcYc0qScVsVhHXC0nnJzvCaKHa7fbJzw3ldZvhDjJ1EbrQw8JklbO7ptLRaYdTbyJ+yAJ5zlP7g8pjAxtBObYpQ00aD47+MrXnKrci0FT4CKYfZYeAQt0qx4WqnU4JoCxErIh+qJHT1St3QkIA01Sc+RwpqhwAaS+U6jlIWHYrDxkC72W6JpX7jhaEvgoG+4oqfU5wa1EbKQ05TcGlJ63r6SKj/rlJu2lBs2uwbKcEt2TcQ1g3BUrzLWgJsx+LxuhfK027tJrdNNjsKd6iuFq1b+EET4Tt0wfdOU5pqd6Wr/8AHt+qT+n+cvK+ugswzpB4B/soHa22mJqCCCjXCMngKNmnfzkY2vcU7BNaPQmihXsPOl9oGwj80OyM9hWhdJTYYSDdRBzHafI4T2txDaI3WCP5SCvupSMeN2qGQuNHIdpTQW/w7z8sqytHPyoympqLqCi3O61lvCuQ8FN1+V1Gt5XzQib5QaB2H/aEqvuidIvNnFd1ZuFilHGWvpywEfJH3KkDSyjym4URik2MN5WIibfp4TMK8n0FPa7D/qSsJjHsOglR4mXhzU0eT2lN+ZyIBCbG0ZSyiIWVHihI7SjXKfpcFE+9j2FSDWFFs2lX37AfKaNR1HN8erccpv2KLDy0rW5nzXPc1E0m/fKlBZc5pN7oNClA0p0wr0cprHdYWdXlHS0W9OxUQvSoZJJTsKCOoKVxDeaWGhdiTf7v91Vbdj3FvCa7VuO4drmtKMwjOlyDmuGx7CF1BwecjN+fpTipnUN1N8CpQGSWvo5uP+uZ9Eg/Xu0BaQN1jHODmlv3U2IbD/FNfK14L/KuxfslHZH1KgjtxkUOSipxdBTcL/8AHuJP6f5z+ui8BL/BQUGgJiCCCCa6k59rXSDkZKWFcSSSUX+oDK6QeDmM5GalES3Zyv1dodpeU2QHlXnatEgrEtutPKAsbp7hh5LJ2Ka6+Mh3uYDugTwUD3+feoWowjM1mxTZtXAWoHYpsPlNjBVhoRxO+lqjj1HU9AV3ONhMfq9m/bJQzdfIQ9nEvdDIWR+fKwobCy72UUn4l3U8DhF/hPeZjpYEzBgt3TcO2JCEYrF/o1Yj6U1xtqic/CnQ5R4pknCa8Fc9kZ1EnI77ZE0LUerEOJemQiN2pXq2Wmk70kHteSdmqK2bHs/igeod+O2RpPGTm6lGDGNJ7z6jWct8BTxdD8+PlRY1j26ipvqUMjfQVHK6SSy4LBQyO1OJoFDDx+d10xVVstTWbKbEFuw5/wDaZhsTipLfsxRtDGhoR7CLWIlOF9YCie2Roe3z7T99gmRho3RhA3ag57Nnbrrjilq+6c9reShJHJwUf0TtYnc+kyZrtk6n7qThYqP1r6Q3TH/XOVtttNNi+0kNFlfi4vBX1DFukHpGybjWNLSBZX41znAuUWNj4Oya9r/ieyVxadk11iz2EmQ7cLjIooryinbuRJkt548L6FzL/T/Of1hurAy/wKwEpljBPKYgggnuTCSgtIPKILNwg4OUTvwxcCo3/wD2O5UcwIReE6QDcJmKaeU14dwhm5abCj+3bCNbnavunxbbLU4coTjyuqFqWpEJ7tG5TJQ5fUIetHQWAk9Om90Ch7BFrRXCG3KpA+1avvI3RsN2UbdY4TGUFGwXaLw1PxOnhXNLwsPGIiuUED2WqTQNRz5PbfZXeezzkPYedLSQsVFGADwpNUr+nH8fKjjEQ0tT3ODiFhIhpyxHxX0+PSHP+6KxELSQU3DxEXpX4YA2wq8XE746gvxtOp4ITJhJ8VahI37Hn90JsbW8LStNJptPGyBsWMia5RJk44QaAtNikD4OTr8LTaiLmylruO0/bs0r1NV3ldo6m7pm++VqTEta+l1opgWgp+HGJNOOw8IYLDtHxWIwMIFtUGlzBWTnUqmePQ3T/FMwjWHX+990w33uaHbFRRCD0t49guAQdfCArtIBRiZ9lJh438hfhNJtrkGyMe7TupSNJtu6jxAr1IzxO8rEgOINr6YKYgqTwS0gKH9mOyR8h2iTISd5DafCwDYLGQul9LQoPp9eqQLEx0PSFhY2lqdhmD1DlB7gatdU/vBCZhNItQ4QRWIBoUo9On05lFFfvEpynEj9mmgizSAF9C5l/p/nPHi8JL/Kf7LDlsEhs0CmSNI5TUEXUnSAu0psmjyuv9yursrvZO9CDOodTkyIXaa0FGII4MHyvwjLtCMN4WlU4cLU7ymerI2HoG+zW5khUk769IUUrpPCO+xCc2/imyuZyhiAUHWtncqRvSNhdTW1Qz9GY7cpj9QtAoey4Whlfs6SqrvMzL5UM+r4hNe7/ius+r0rrzE7LXITuFH+Y4NIpABObtYUL9QoqsmuzO26tD5ZOka3koTR3sUHgrWEHB3Gde0exwvJ11smO1i+925AWIaHmnLDQ6Qi0IR6nalENLcsTJreIGeUxgY3S1OFqZ2lqj42zLQ4UUzBticXRlW66KbQRORNIDyewjyFIXEUoo3aOaRbJ4cg19+s2OwtDl62/qhvlp3vtHdLDr4NJkekbm8nICsnNB5Uoj1FoC6Ba4Fqfh3fJvyTXTNb+ZVqZ0o/gsI3EufTeAmgt+SGR5QdpkLUD2ec9SB7LVoknYLQPPtFR77p6x8Q06qTAdyTsU6DjdYLqRimITyt+bV/8jEj9Sb4Cgx8V6HbISNPla2gWVJixK7QxRbjKSQMbblhGl/5zvPCq1JHqFKB/Sf03FOU1N3VWjGDyr0+lNOycEHFuxRF8rpgGwvGRRRUpcw7L1uvUn7mlIF9C5l/p/nPHf6WX+U/2WLhGIGtqZh5CNlDjcVhzVqL6rimm3bhH6uXchfjXcqHFl/yRksagonE0mkDdPfq5TKB2TbcmihnfbVZUq7KaXJ7QUAAtIK6QBtGMfZTw6wQzZdZ+HOlybjRVp87ZGbJsukqRw6upYZ5LbQKCHt+fYv2eky+FEKQVAhMjFJrAEGgL8YA6qUcrZFprcJjtQy0goXm6/CjqtkSALUBEo1qkEUB2lM494so6m8oG+4fdTR9QIPDOU+WMj07qCLKV/TYXLCNBZ1vLs5WBzd1A4fDuf8Alm01wcNk97YxqcoiZPWe6wbXjKkPT2kVu1Agi0N0TSa7UL7x3eciLQjaCaCdEXSAp0YIpOjZpWGbLLIdPAUbWtbTcm7Gsn7KQgU4oHu3cqy1UcnP+yAe7laB7RyKaE7dSCxusRACxzQFHJ0/SVgcRHW5pNkY/wCJRjY7kIADhT4KHEbvG6m+n4mE6oXWFicVNq6b9lhtQ+KbiGxR25OxczjpjYnYHEYj9q+gsIdDegeW54mMXq8qCXU3dPbr3RkDWayhI6TgbJ49NZFH75keUDaKOU5puyqhuqpPX0LmX+n+c/qz3NwcgZyQVDCBHSjgaNgvwbTyuhAx1OUsWHJoIfTW6dawX0+M3alwDK2QhMZ24QI4RF8KNiY2vc4PYwetzu0otB5U+D1AqTClu1ItlBUckgdQTN3epQk/FNNJrk32XN1LUW85jsBy59k8qNNQTBQpBOtybCAE4aXW1NlB5RaSdlGd6OZ+63cN02wiW3tyjI4N3Cg/KJrgoPvwuo3svMhD3jwrIfYVg9l/ZB+kepOxUZdptEclBg+yYKGWKc57hA3ymtDGhozcgAQg83p7ZRYpNiJFgoh7nASpo27SqvYdh3Q37ZNYPo4QcAE+ZlboYtt2EzFdR5ZXuP2aaTTqF5CYaywDdSPcyRr3ccKbFMjG6r8R8DsmMbE3S1afIVok+F1QOUXhyqxSa48OQzJpVfPaTbkBXvFBwNgJyeFN6CFO1urhYeCB9F7UcLD+5tSwWKFmF538dmNwDMY3fZ33WCacE54m8JkU2Pl6kmzUBSP6LHNfC8YiP+qik6jdSJU1RsLnKESOHU4QFtXRLvQeEaYFduDciVV9nxNZSv0psnU4RF7pycnr6Ed5f6f5ye4MaXFYmTXhXy/dp/smTeFBI1oqQ7oBjt0RGOVLI0j0NUI9OlyibSIUkae3SFG2yo2oDuvuItCwjlCeR7DmB3KlwVeqNMaLp4TomabXTpN1R8KN4dsmq/ZcLCYbFFDtP3TnJjgR7JO/CjBKaHJuyG6CGQbacPzAgi3e1eUjS8bJrXjyjK/VpCa1UnwtenQyN3jduosUHjTMKKazT8SrcE0323aoZb5EnPccrntKDaRjBNoNPlVSrJ1eUcMJ9RCe6fB/LcJv1Vt04UopQ9moFNmDgfuFg39bVKf4dhXwcjz2jcpgolTR6go5C3Z/YE7YJo89tdszj8R5TBQpOKAHKliD+OVETWl3PtkgcrX9kNX7yexvVu6WIY1zC3klYXAU3/yNygANh2ysvcK7GpciwnvDacUCrWpx4TR9+1xRBPtlEo3kU8aXJycsa4MZrPhTesghYMho9SZpcKCxcQbb2hYLFmORo1bHsIa8oCuMuSiA4UU1j8HsN2/2TXCrUzS8KN//ANb03dorJ27k2PVL1Ptl/DtKedAtEWbpO2GRT08r6Gd5f6f5WpYq5IumPKmgxMWFlj5pppQQPdWsr8BG9MwU0X7N6bFK/wDaJ0ZdI1jeEWkbhQ2ecqWK2AUDSmiu8jyhv3ecpN2phIch3nZN3Ckha8JzT8CpIa3amC9ihDXqUR8HuCPY5pG4TH6u27WkIxtKG3seVEmoIIIZAOUmrlQy6+R2FwaLK65lNM4UcYCrsdE1/KMLh8Cg4t+aHYBpCPqtoQ2FZONC1d5DKlu3hBwOfPsYskQupYdtMCLQ5YvCRS/IKPDnDxF0bv6Kf8Vhz1HHlYLR0G6OwlPcdQC3KY7UM5NRFNTRQzLQRSYTGdB7J3aW95V5OdSa03qKCOVqvVaNo611HeWqbEPjGoNUM7z+0bWbnBvKa4FE0nNe/wDQI4QfuuIU8uIgFlthTY58kgDFhYhG2ybJ8ohA33EdN36IbcJ1OFFRyfdAatz36U92nYLUQN0HB3HeTlQyKJym4WrUE5YtgljLSoH0dDlg9JRIaNliZy62tWC+mbB83OZNbqMUN86rhA2iL2KYBFJo8ZPBA2UTtqKLx4Rc7wFGzyVSKPYVMLbSCk+yKOyepCvon/2/0/yiUz7rF/6aT+U/2USjQTjQRPSfrJQ3CjGVLGcBRN9lp7iLQut8mD1pveRaD+maKtOF7otC0DwjdUgKd7ZTn9F9+E06hmd9kBWR7LQNq0cjPvwopWpjgeECEEEEMpC1o1OXW67tLFpm/wCSfLJCfkvxUrY9Zamasbu87fZMjDBt3EgLVae0u4TT0hTkHA+wAWn9MjseyldLWELuz7GJbqhcFH8RlNwpH/kvrwpI5ccwv8BfS8WYXdB6EgcLQTzWw5Wj7lSxE7hMmDxXlQP0vLT5zHNdrmhwpfmx7BMfIXURlK7qYlsY8b+wVuSQg2u3leeyr5TmBwopwc34LU77L6hHO+QAcLD4Hp7vdadGHGznS+p4QPi1s5C+m44O/LcmutO9JvuIvYoDpupOrqKODVO6R2WqlqB7XSBp0prK3KpTMJFsNFRSah6ufaObqUjSzdqkmDdqT3ucPSFJpL6KwkOrcFOgeB6Vh8Dpd1JexzhqDD575gQQ8JrgcukLtaQN0RtabsMj2lFH0IbklON7K908qRfROZf6f5UjvCCxZ/8AGk/lP9lEmIFPOydCHtoqJ+kaXpjggbyxLdbgE0V7Lgm2093CPCjfqf6eF59iRupQuI9DspXaRQTpeniGt+4Q3Wn2ypY9TlC10ex4yItAV2kolzd0JwdnK1fAXlbIgWmRMPhDD1uEyNp2KEendqa8jlMkvlGVjBZX4h7/AIp0ZdvIVhomg7KRwjbajh679Tk5gql0tDw8LXXPcM6WgDhBX3PkDUHA8J1Idtb+ziHUyvumcZS8JsjRMWO8qLT0i0eFp0YzSoPOpHUzgqOOvUTZzkiDtxynvaCNt0wk85N9R1exahjLpnTdxNZONJra7aQQPdwrXyN9z+Fi8O/CSdQDYrAY2bEbfZNdrag+ig4HtkbY2UbT8nJhOt1IvcEHuPhDqeQtZCBtOcGiyus6T4BMZp5zq0+EHdN1s8oTj97ZageFfeUU7dOTgDypAsQz8z1L6WA1m3cG2dR7Ttvm9nlqbdb5O4RFhVXcUUU/hG+AnAMbahnD9k8qQ0voZ3l/p/lNBfLeWLP/AI0n8D/ZRG0wouEbdTlAev8AmILSDyomgcIitwmmxupAdQd7bgmn7q+0c0o2u1keMuPYkGkhyabFrEM1MtYpjjGJANwsNN1G+2XIuRo8ppsUV1NI3THh/GbnBospr7CvIqRu4Wsh+lfvUr9eXlRpqaEEE+WtgvSeV6v3UyLVvIoiGp/5jrKjaGjbJ4BG6ZIx+yArPUEO1+68IDtc7StH7x5QhCAr3/qesQao/CgNxtOUnCxvolBX4gQTj7OH/tYnSzFNnB28qWdrAHhHEBzAVh5ZHbUt/OR2WJuR2uPlQmbhwpUa39g7ilNH6dkCeAO4i007Uud+48ZMFX3OTLeb8d5eTLoWJiZMwsciJMDNssP9QjLudimlg2tGNpRZIz4FfiHN/aNpNmY/hdZt0gdSkOlpKjOluyB+6D6QcUFQCGqY/oh6dgO0tKcHBFg07ofl/BRSa22rV9pTj4RTk9PKmpzt19PoN27eVVcd3nI7rWG+koGx3FVRvMop/Cc4jwsT1ZmaBsofp2IY4kFBs4HqUwNWV9ElEZkBP2/yoRTbyxn+mk/lP9lEVGVj5nvIijWCBYzSUMo0eFZugpzQAQ49stBVFp7S2zaPtOFhMNGlLuxRkFtKPZ5CHsuFq7NFEOHC0OdygNKDmn5KMsPxyln0nSwWUIzJ+0RglaaZwhHODeZ3KLfVaJpyiNkk5b2oymobJgpOKpNaXmygwIsDQm7BOBcmAoNJ21J+tvxTxq9TdnKB5c3flfwXqRjddodp3Wol2la3N+QQN9g3Npx9QHsFD2MXvC4JjdLQMnCwvqcZ5WuTEgQVuFg/pelp6+9rF/S3QtL4XL6di6d0ZE6TQ7UECCLTp2M2JRMs5obBMjbGKbn8fYk+BUT9QGZtXnpuTnvOYR7Hm9gmihXe1wAs+VJG9/6LHYZrRqeVg8PqdZ4U7n4VzXeAm/UoHHSN0MYz94UhNG7hy2KkwzJTfBQjmh3HqU+Ka2PdQSg7LR+qawBABOfp2HKEbidTigK2HeRaLQU+BFxid+iEloHK8zkU5OUnCmaC7dYEaRsgfujKwcla2/ddVriGt8+x5yKliEm/lM1VpCDPv2HM5HJyfuERta8p4Uo2X0aJr3yWPt/lbR8oMWOH/jSfwP8AZMNKNxk/ghC07qIIZR5V5Ug1NTTYv3Ch/sJWmratWpqj+6lcY5xtsUw37WMBb6gus/gJkj/uuo5NG1OQBHxXr+6awN47D2PFpjaGR5UaagidkPWg2tkxtZVa0osBQaApWPB1RlRy6tpFLA1/Cgg6TaJ7Ne9HuN6tYX4j9E20CfKMjQusx+zTugdLd0wlx1FOcL0DvPfeUzg57GHycuE52y+oS63BjNysBhG4Vuo/IqyiL2K+o4d0WJ6sbdk6eaNtysIChxjpgIotyocO2IfrnWfx3He5wAUdAbrZArUFqQvzk5n2TA4/Mos/VVLvuh1QN0HSXu1M35yJ2TeO0lNbp78Vj2QOETd3FQai0F/OX1T1ObEoYwGEJr+tcZ8I4RgdbU3VFtyn24WAsOdfx9LlDMJNvOX1A2KUTwEyS01y6oamOs6imm/bc0O5T4zHu3hNd3FFOTlIp/ksEdkSjEx3IQiYOAsTKIma/sgbF99WuFr3pSP0tTHAlDvORRRRR4R5TlKvoPyl/p/lPhY824IChSxxH4aX+U/2QGtQtpM4UZ2QQTW6k0adsnBR7CvdrtOddt+quxwTKZssXEZgN6pRN0sr2XHekApIQUIQjHRtNOpAIdpTnhqa0u3dk5wHORlYNiUeVGmq6QpyazSghkOylLEHBYWyzfu3C9SKDk5UnRh26btk5lp0G9r1adlrmDkytZ9gIuDeUJRa1XwrvynMc7h1JzZ2cbpuJ1HQ/YrEzmHEM18WmuDhYUhpS4iWV3ThFrCYNuHFu3d9+wgHlPAc0grCgYbFFtUD7HHPaSEKTqIUhEe4UbtZ4VAbDuArslOj1LUuoDso3WK7Cq758aT+Xh9yug5mJBed0x9ISN8pzfxDzOr/AHGqOLQKCIK02sQZoTqZuE3FCYWGlXIfXE7dOxWKPplNKUhtOBUfr3TNkHucKaUxrr3UcaAr3ZHdGXT9006lSpHMpycnrEuohfTvU1Ft7Jt1vl9RcREa/RM+I9jdFupTf8QmMHhDZV7JRyKKc8WpHDwvoPMv9P8AOf1BgOGkv7H+yZEfCiY5VTd1EKYmoKNHP97/AGR4Q2Vq+148hNOoZmk47p8ltItQHVGD7BThxmWqU0KCwwOlNHcd02MDc5OcGi0Ha3cJ/Xeaugv/AIw+Sid1GUwqrTEEEMh2nfZBtcezSOyBy89gFLSLtFvqv2CbNBBtLU55oJ0LXcp301pdbXEL8G7xIV0sUwel9/xRbNIPzGD/ALWJwUkzNJH/ALUGOl+nSdKTdq1f/IgaPgmsawU3v+oQa29RvIUbtTAe2s607hawUXAJ02o01M1F26Ldlpk8IsNW5M24VWgO+0ZDdBeo8rStA5CcNX6FMeb0v5yJDRZUcrZOO+R2hqbCGr6o8QzsIUOJe7YBYmXFDYilh4n9ANUUQYExllFB36KZrng2sPG3RpCxUZjFsQcC31LEwt0pjy3yo5yfQ9F5jKhkDlHx3F3lNeHd0kzY+VjOq4awFBjXRUyQJkodwrRyKKcnqRYo/mLAvc0bBRS6rDlNP0maxuU/6lMDTG2pITMwa+fbO8yqj3lFFFFFFORkTnBPG9r6FzL/AE/znjv9PJ/Kf7KIJioO2KaNGyago8qrI+zXcVzk4qlfaTSl32bymskiFhRT2adkWk+UGjhOw8ZOoDdRjpuLe9xpA2ndhAslR7Iew5wbyvVKUGhopUqW9qIJqCagggh2l6YCOVXtSeEAh2kXmXgcrY5aVvk86QSg4Rtty6z5TTBsvzRwFqlv4rTIfKMcl2HKp/0RbP8AcIDEAKTB9capqJWDcNPTGxCa48O75jr/AC2prQ0UOy1ebuEIWDwn4druFTYhUYtNc6920mnNsek/orv49/KAHaRsi3VsV1tOzlKXP54WroHlQ4uKQXaDmu4TnBu5RxUQ5KdjYhxZ/ovxsPnb+hTAXnqHL6pAJXRlQs0qYEyFyg1lu6DSmMpaFIKGy1A8reN2tqnlZM22rS0tUtk0OEWfdaVfpWHIJpp3UN6d1K+two5BILCJAQc0+U+RrPkU/Gf8Raj68vqqkZMQxHEytNLqYmX4psU9fJRtnunOXRbqsoxhSYVp8IwvZ8Uyd3DtkJLWoIuRKcnJ6ljGu1hi2OgpZw3jyhoEYc9Yj6nhoxpG6wH1GOX8slD9PZOyb8iSue09xRyeLWyc21IvoP8A9v8AT/OeL/08p/Q/2UKagqsJh2tA2o/ePaT4VkLqAbFPN0g5fqgVavJ24UT6l0uymi1bhRzFvpci4Jx0utQnULUl1qHhA2LHdL8VHZRGUkhHCaPJyLU0V3yO0iwmxl+5QAGwzLgEeVEmoILhBDtfJo3KYwvOrx7ZcFM5wbqpMc9NvuO6CLQeUW1uE115E+Mpmam7INEgTRXcSAjMOGoCR3KkwjmnqRlRP6jd1S3CLt9I7I21bj7L78IOlvhD9cntD20V+Hoflu3TROwerdSTygUGbrqYhu5UZtvfSrtKpSytid6liHudu07KQa2blQtEPKld0fXAT/hYF4nZr8ostBgU0bXsIWClBb0vLcvqBDYC77KLERS/EqKPUo2UFWVp41BdFOgFKbBtLlMOjE0BDZvCfQ8JlfZPZpGoKGESFOZJhmarRZiibG6e+bDb0sM+LEDmyhBGPCEbQbrOVlpkG6oDjstFVanYANSaARstAVBOTk5YmUQsLz4RnEpDgm/T/wAa4Saq8IfTMVh5Q6I2P1Un0/E4jd7lB9Fij3fuU3AwNN6Vxwhke4J7dS6unZy1X2nIooooopzlac4Jy+hDeX+n+cjssZ/pZP5T/ZRJiCCjGkkLdpUBv/ZEryqT4g5ObQRrkIJzfLUHX2TbG0x9hWpI9cleFJDIz47oSOPoeEx74HVymzNeFABRr79zxqCa2kSvU9V2FWr7SL57aXlRpqCC5RcGOFoSBBWi8BGcXSjbrFuQ9ilQWgKlJ8SgED7UwLSHtTS4rTvZykdpao49DQE19bOV5Errs+6BMg+yEbQg0DjIvANI/kzA+CrrsfI2MW4p2NB9Me5UYpoB9o5lAVm4XaGw7ifHZXY5waLKFzW945UrGt3F7KBwdtSli20qDjS5YRoilcB2Ylz8PjNUagm60YeiWzHU5FpHqOywgtvsSMbaxGHMmk/ZCA0nQb0mYU2pMPUZKwTAIw9TgGMgpglhaHM3b9kx7J27KfBvgPVgWH+pB7+lJz2Ed5yq9inQvi/Yn+ijfrGTk4KVwYLcvqX1DU7T4WoNdcDtvsvpeKLGU9yw+IEnY7hBX7LgHDdfh23qCAoV2nIo5FFaQiAER5T+F9C5l/p/nIrGg/hpK/4n+yiamoII+n1Ju4UftBH3GDSCFqQKe3Umu07OVrUpzewTDpFIFP5Dk02FI2yE/wBLwp8O4+piwziQQe1zg3lNka80EXAJvaVzlS0grStK0rT3HlR8JqCCC5UuluwWogLqnSjJrZYCZAXHW4qivUhI8nheooCu8Zcil8QhbxshsO7nMi0CYjR4V5aSX6nIhOaHjdU8fFOnA2KDzM7S40FHHHGfSO0DdPaHiio5DfTk5Wzd117+AtPll8L8LJObkKhw8cA9I9s8d3C5CadQvuHyv2MRbzoThI0bbqQO4Kjbp4K1Vu5aQ421a3RvtR4uPyU1wdl9Ri9Wu19NkDQY0IwCSvqFBgH3KweKMT9Enn2GfmTF/wBstQRLfKBaeFiBcZCwrtMYYViX03T90waWgKSEO9Tdig9zRUqxH07qu6sJ3UOPfERFim0fv7NdhFp4f1NTAhK07FOlZdAp7gN19SkfJK1nDeU7DwEbhTNw2r0NtYfDNlILRSGGxELdcJWF+pYhzdJAv+KZ9cLZdEzdv0UU0cwuN15ePb47j20iinIhSL6DzL/T/OTisZ/pZP5T/ZRJqCCCYNOyj9m+2sz3TekhyoFGwE2Q/vKg8LVodoKPCa/U9NK1Xwr1bFML2bIF+salLGHBRXpr7IHS/fs4Tnazso2b7oNAztbrdV22rV955UQTEFwiT4Ti5wItfh2sFkqzqT4yOVC1umwm5FM49kms5zpoqLju57L7XXWyBPCpSQMk55RaQNLx/Va3Rc7hRSiQbZX2YvaLV9k2IclOCbHvv/syNSkndCCxu5UbZGBpjNjymSh50+VYCJA3Qfq4yFtXUcOWq1faRc1px2T9OpbMOyY6OT48p7nNNltL0yDhdF1aQoo54zymucBb1iz1RTAoYXitKd+JrYhTMkkAFp2DnkHxCbNiGDSW3SbNMRehDEN/e2TsU0cbpsr38NWub/gsRO9gA08qCLpCliA4zAXsnPfCfWNk2VrhatnKDwXKaINNs2TJuuNLvk1MlbJxnJJ0Zv4p8ceJbTlFqw35bvj4QkadvZ05O32XCljbIKcE7A4e7pTRaRYOwWLwgxTRvRT8K7DAtxItp8//AOk6b8M7phfTJuoyyFCA9ixf0/qO1M2Kwf03SblCGCY3dmx/RB72bSf99o94o5lFFFFSL6FzL/T/ADlsVjf9NJ/Kf7KJNTUEEFFnX+0xTC+P0qJ54cmEJ8TXm0waDSdRUkjo9k1+yZxZXATXBxoJ1xjUnzNc3UuuHC2rCu6hcQpWkhQSdRu/OWoKRwk9ATGaU5wZuV1L+G66bnfIrotQaG7D2DmO7yok1NQXCPpNqZ/ACghs63Zfs3fomkeEXAKy47Juw9zEM1xkBYc2wf7AtB3QypOjDtxyjG5vq8qOTWq7MefytIQ499xoIGxkdlqJ4Cqk+VzpelGP4lNjazYKRpYbZwmRM+TU9gcKpHBO/dfSrakWrjlDfsbZ2KI1bItDQmzBgPkqSWV42C6D3IYV6lw7mOUbnsIaEzflULXoCDeo7V4VBNZpyoN8Jj/CltptYeXW0/oqB5QY1vAzkYJGlrlh5LGg8hY4GtbeVbZodRUfRbsukzkBUFiYrZYX08XI5xRiY43S0OHxcppZYU7Fa/TIywhPHD6mFMkbKFwpD02lyj49jq6naWqq2GRRT18DpUgBFLFfSWOk1MNL6Phhh49PO6xGMGGnEThs7ytjumDMgMcDlfhPBPCbqrf/AGByKKKKcpF9D5l/p/lOk+y67T4WM/00n8p/sok1NQQQUed+6NvYxGH1+pvKhH/Jemk94B2QI5RcHelNw7hMfsgN7KMYduU0NjCLNfKdhgxpaEYpY70lYPEmB+66gc3U1NkbCHPPKbid/UmyRv8AKLms4WqQ8Jmu/V2nvLwta15XmVoRO6iTU1WhujHY2KawXuECgpACna2kaUygr7B7VHDv2+PafevIp9g2EDYvNzwzZTAOcLCHGZNd547JZBG21FLLKapASw7DcIYuP97ZNxMbzTStSdIXemPlRt0DJ/C2jOocFMcHCwia5QzOx7LATr/dRb/zTQGchCuQjI0Glf6KRvU2LUzCs5KOHjKbA0bHddJg3rtNpzAdwnE8KNgYK7NL9XOylgD28rXLh3felG44mMOIpSl+ENgW37LqYedtgUsM549PhetaSeVHH+Flvwc8S8ynQxCLQLcpB1TTVA50Gzk1wcLCIsUm4iTDEtPAWHnGIZqHaVI4ynQxMYIxQyKKcnKVocKWrUKd4UmxFLBcL6hFG+K5BdL6VO6UdM+EMqUrwwW5YXEumvb0/dCvHsj2CjlSKKKcpF9C5l/p/lBjXWpPpxjOuA0jJiejKyXjSf7KE/dNQTUEFH/uCmNpxTor4T2ytKadJpxTI4ytAByZLIXUOExribdkd1i26DqWnUdlhsMTGbKdCOEzDtC6bdd0tICYRx7jwaTgCVpCYwFyBpcoXnaPKiTUEFW1IDSi0O5VEfFNd9054BWIm2tpUeJBAKab9ul6ggbUzdQUD9TezVZoKvctONBMLiF+MkjkLJAm4mJ/BUUrSKByllbCzW5Ox8MZ18lH6gZBp0FMcHtsZkX3nJ8rWbFdRx8Lp+f7osJ8rpg8ros5pGNpHCxEdOZRTQANs8SDWygvp+tOY/XcOybiHB1ShNeDlZCdwmueeVqWo+QmfdBUimMDbAXq8Lf23HSjfITZRwe4wtKAoUE9jXinL8N0DqiP9EzFx8P2KD2ngrUE9uoKN/7rlKdtITpAwaWJrDIfUUyMJ8OoUml+HNO4TJmSfEowsPITsPp3i2Ucwfsecya5T7l9LU1gYKGRRRTk9OU/5b9V7FSO9WywXCe0PaWnyvpMJhlljPg5WpHlotNEn1A+rZg/9prQwaWrSFq0/Lvd2HsORzKKcipF9B5l/p/lRiryxorDS/yn+yjTE1BBBRrjtJrI3WyDr769kNOq85IWSDdOimwx1chRTtlGyedlFCGhDPHb0AsPh9Eepw3U8hGnSmudwUAXBEUiNfCfh45BuEzDCE6o06R8e5CZK2TjLnI0OV1W+E12pHIoDml6lCDVnL49lKt1EmpqCCKCGU9M2pRtDmmkKDTHe6wmINaXJj72zv2ZA5zqYaTeoNimtdHyg60+QM5TZHS8DZNaGih2hH2HNCCc0F6+TqCEYJpfhgz4bLEwF+ziSFBgWRcBCIA2umWElijkD9vORQN9zn1sOV+Y7Zqjw7WbncrjtO6x7XMDZG+Conam3lakGt4CgcZLjd4TWhvHCLQ4UUcMzxsnOfDzwmydQJ7n8NTYwO87ODvbCOyNONZOja/YoNoVaJkHCY4n5DsdqYbCa9r+FpCfh438hDBaDcbqU2NOFNTNsIYtvNEIYuNydiuqdLNkIaCYweEBk5ocKKh/LmNq73GUzGu3uipvqDY9gLT8dNJQYeV1JG1191EWub6MzkU5OKcsQAWELe6KwPGTANzWczfxP5fjymMEbdLew34V37Z7SiiiinJ+6+hcy/0/ym3qN5Y3/TSfyn+yjRsqIuYUyccOTSHbhBR5A0az1LnlEgLxYTnBtFwW+V9l91exiYTqJi2KZi5IpQJzso3te22nOWTYhqa3UBae300EwCebbgI0x+6ApadRsomtgtTvshflEWpIJI3h7OE8OeKaaTWzN8gr8xPw/U+TlDA0GimxsHCAAye69ghHIFokQFClS5TOMgqXlRJqagggm5E+AnRCRulyjgbEKCxGHPU1NCw2iaPcUoyG+nsvZWrWpAZvla06fKiG1nIouB2C6R5KLnsPq4QPuHZCZt6XbHK7RJolRtoJv3ypAVni2ujd1WKCds7ARlQBvJzwwW5GYLrsOwetYG+pRP6tvb5WpkLatMfJI7b4qq7nNDxpKji/DcH0/wBlLKGBNLyNkAQbKY/TiXaQus3ymz76aWpOIITSB6Qqr2HN1CkzWG0g6/bbz7Li5+zVNC5o1MO6w+PLn9ObY5/Vx6goGB0YRwoBQh0nZNJpcGwg4HNzmNTKrbLFUdm8o4b00VDhG67U8QkNFRwSsdraU2azpeKKtFFFFOTgpFO12q2rAP0CnoSAqM7nKR9DblQxCId1e+UcnIopykX0I0Zb/T/KBp2WM/00v8p/so90GoMTAEGU6wgVHk4b3lNKGikzcLjZbIbZFNFbD2R3O29SBB3GYNyuapsODIbUWC0jVEaKbiZoNpd0MYyUVHyhGmCgsY8tZTVgouknMDszPG004p+OhbwbT53YoaIuVHBi27hyaCBv20OylRVZHbdAgt2QNBAlC1a8qPZNQQQyFoJoQVKaNruVGx37iayX5psmoWUZAEZjw1anNQIduEAmt3zlfp2TYg86ygKycf3UGAcK9K1AppHHuVaP/F4sINFelOEuDl13bD/6WoHhVtS09z/V6QvwELRtyU0Pb6dSlMzd2uTseRsGFMknxr+mdguAhh43ep7VjNmiJnLtkyJrGCMcJsTW8eyVpkLyTwE3hTv6bSVhwNF9hRG1tTSfPaOwit8qVIs8tTT3sI1OTTfeSZDTUBQRF8p+GY9APw3G4TMRG/yvqx9QWCNxBUpGqMgqkWuvZNmPDgpcUxg2UUzdepy1sdwU+ZzFh3/iJr8BEWmtoqhkQDyh6dkcinJ2yefspFLyFg2hw3RgYTa6Bjssd/2mtmkH5hr+CbGxnA95+rbTlatWrzORRRRT1Nwv/wAfD5JJb42/yjljf9NL/Kf7KJNQVIILUW1QQl/5DJx0rQ5ztS9SZZ+SA7ST4TL8q1fuVp+KMhHITsU1vAQxOmfqOGxUzNwVHsFKwOTIR1bavU1ddmnUVpMp1uVG9lIXcAIl4GwQZJL+0Oy6UY8IRsHAVD2v17Ta0iu3yo01Mu0Ef0QXCHZLGZfQFHG2NuluT4w8boYdqLWsGwXKFWg7Tymq8h6nG0BWbXsLiAd8tk6EO4KfFL4KZLWzx7Rzcz95vK2eKKjaD/DvkL3bMUUZj5OVDKRtjZQlzJ9JKdvtlXUxV/8AEf39uV2hpKg3jc4qPZqxDBJGQsO38sI9g4T+FGdW/sO49rdE2mRUSSoxpu87XUb91rb91+0/gmtDRQ7CnwtkWLw7tXoX0/FNZ+W/lXaItPjI9TUyQPTuU0J+GjctETfS5qMIpYp2k6VgGlnqag/we4gjhavuinpwvlOUilG4WCGyCO6pO1ePa1C67byJpF36JxdeyGRyKKdsnJykFr6C2jL/AE/ygbyxn+mk/lP9lEmpqCGUYUkYcE1kjeCi4g7qieEIz5VBV2n7hatQtqaQeO2vZCMLCbpTRghaCGgIalLLiHGmpsxZy1NxDSLUmh5C8bJrd/fsXXeW2mCh2eQo01MNpuTb8qshk52kWmhVk40LQUgsbLUaTZt6KNP2KoxeocKNweLbk3754uXQyvJTYnMPV8puLa6gdu2tO49nUAvWiZB4Wt//ABRGobpgaeFo0j0lC67LvjspVk4gSApsjXekcrRIf3l0yw6mpjw8WPZtYt9RlRCogxMU5NaAmeltI9jPK9Tz+iMfkIb89z5AzcoPdNu3hfmRj7psgOx2OZNblA61VK+1xDVeVZUO94r1Wmss2pcF1PUE108WwTcYP3xSa4PFhSRfvN5QBcg2spDpCkxZ4CZAcQdblDF0xSc2x3FFAUaRTk9ScKT5LBcZD25HED08qNjo/kbycQELKr7rjhFgcd05gK1EcoImnVmciinJyk3X0PmX+n+c8X/ppf4H+yjTU1BBNTU51Jsx8rSXGwgi8Ba1qVouoWhICiNYX5jF1G3bUG/vN9ou089gbSu1V85mNBgC0hUCbTW6Xf7AD1k5HhF7h4Q3GYP3Q7DyouF4TAgggggggh6zqQQyk4WGlJ9DsnsUkfKg1NO6CEYbwnByicbo5PeGNspz3SnUmxOcbep2C7CjxL4x6t03Escus1dVn3W7uENu8vAOnyh2lvkIUd+z5n9O21a1F/xXSafkgK4zc2jqb2DN8rWcr8Ux2zd0JT/xKxr3avUPSoSyramLmVDtB9RCCJpF9OQls0hJ91r1j0oMd5Kka5u4TIOr65M5WagoXvPpIVOWjyVpARFrQfCuuVzkXhNB5dnfsyfFMDbKYKRYHcrpBOwwvVGaKbPXpk5QcDxnLJoCjgMztZ4QAHCGR7Tk804IpxTlJupOVgTsuew+x8nfwRXVML9PhDfdyJvhMJJ7HbhNRAKPoyORRRKcpF9C5l/p/nPG/wCmk/lP9lEmoIIIJiLbT2nwFb2/EIvlHhSSPCjmceUC5A5PPTcmvyfEx/ITSGHT7en7LSfBXq7qyPCbsEN/9hZ113O4RCHYeVEhuENk2yUEMgfugtep2gIdknC6rmzW1NmmB9QTZGv2OyNLU1NkCG+RatQrdavxBRAjCDHvCfg3vBAcm4A0A5yOEjqqX4Zo2K/BxEKKDo8FDukmawWmOcHlx8ob79zdk+YtPGyZIXi6T32E0UO4obbdzmG9TSmP1ZPnYw6eSjigOQVc03HpH/tfgozu/dDCwx+pjd0SiQ4UVIRg5a/dKEwqghJ6kw32lwbJujM790K3OO6e9urSzcpsT9WtPa5u4zdwoviMymDI9p/L3HCc8EbJjayv3D6Tum14QzfG2TldExn0nZCcb/ohNe6f+c7SExukV2nLcboG0VJ8U0Ck5OKcpVJ8lgRt2BHvmk6UZesOC2IauU6ffTGLK/CuedUrkImtQdTtCvTJWZoZOFrdFXWxyKKKkNIqRfQuZf6f5zxn+mk/gf7KJNTUEEFHm/UOArf9lMJKOyaZByExxKBpaliRrjUD/CYbGTmh4oqyzY+ych32jJR3XV1u0jIe2f07a9XZeVIodh5UaYEMm7oIJw3BVqAck9nCle6fYbBYeGggLcqCLVSItanN2BTmvcPkmdRo9RtSvJOmlHbfCJs25NIcLHf+q57DuE2JmrbhAJx0boG+MyaW6dbX2fOZ7iaTW76s/Pa6SRuN0+FTz5TY2s4Qb5OZ4RRjfL8dkfp8Lzb9yhBFhz8bWJkg0ekbrB49r2gO5TXB3GRNL5i1Q5T4tR1Ap+p0nT4UbGM4QRFik3jIhM4zab39nSEOyvaLQ5AaUOwoMaDanio2xYXZvqReg8HMnsItOLx+qmc/ik1+kbolP3RaW7kp6l5WB49zERdWMsTfiEGNBvM7FOj1SIhHbhBvl2ZycLX6ZFFSDVsi0t4T19C5l/p/nPGf6aT+U/2UaZaagggo86WmuE6Iv8p2Gp25QYWrUmOsJwtpUUZoOTKGVJ7NQopjxwe/fx7BkaPK/EN8IEnwg2k+g60DYv2B2aTq1eyVrFLV9kXOHhGRNdq8LddVvlE7qMppTXIPCjcrR1nhSwueOUI3lvKilMZ0SIZzzV6AmMpqApqjCO+yITk5yZLrfQ8IcKkD1Zj+ic3ZGEEUmxPZ8SvzEL893Cu8+Vp0vr7r4rlaS021B4dsFSqspxcZP2TDqaCj313lBYn0ua5NOoX2nhaSeUBm6Nr+VioooJC5yH1DEMPp2Cwn1PqCn8pjgW63KJ3Ubrymc5p0xcoQWyjyg2Qc50mv8FFAUcpjQTRQ9oje1qCDkXIPCLr4CB+/tV9lfY7ZHfYoChWZZ9lpePKIcQgXM+S54zKxF6gE0UEU5SEUnO2sKX5LA8Ie4BW3Y4WqOrUuq1dVgQka4XmcnJyvekU81xk5SlfQeZf6f5V5Yz/TSfyn+yiTChsg5NKCi7iLVHypYQ/jZdN7N+U2QH02tb/gntfGNbXbBYbGa27hNnjfwVZPCfHrG6YSPS7uHYM3x9T5IMa3gKhnP6Vh323dN477Rd+iBv3KCCPYXNvdbagms/VR9TVpKYwtO6Y3SghmxY0NERcUzF4iMWHL8Rjn7sKZjpom3OxRSskeZSnY2Nvg/wDSP1SAel1qPERPbbXIEZOpYqQRRl6wrSGhyj4U8ghiLz4WAiIZqPlSg2K9sZFagE4Wq8rVkOT2HhMNNAXj3igpKedKbsK7LJ4QDvOWrwrCu8sbheqzUz5BdJ72/ddDRyE1xnboPA5Qma1tNFoSTP8Ai2lE9rTT/lmYmlNuM0eEN0WBX09invDBZTZGP4Kko0Pcb9u/dGJ96rTHSDlF9chDfIscNwUC/wAq0ew7rp733ndaPstZHyQkaSijvJf2RfeT+FIwO5TxWylHqWB49o5ndNOoZl32VlNYRuSrBXpW3YUT4Tvur2tV5RTlIvoXMv8AT/OQCxv+ml/lP9lGaTCgVymD7oBMWquUHB3HZSpYuJ+zmlQscOSiGvCDBwV0Yz4WlPb5QlHlWnfcIPBzLg3crXr2agHDyt1vnp7yAdims6LiPCD2gLqNV3neZ9079zqJQ+QTEFFubKCCCGTeVj/2NoSbqSX8HhtTfkVhsJiMSQ/EFMiawUF0wjA08qf6dFO/bZD6ZKHD1mk7A9Qetx/7R+mdM6oTRWJix0jdDtwocb0hpnbSjx+Fq9YX1HHxYhoghN2VG3Q0BatUte0ZPsg83ug+1LIeOFpBbSwkxl1NPjOkHeuux/GyAMOx4QzOQ39rUmnUbHZyhnvq3VVnI8RtLimxfiHdUoxBoWFaCqylYHBRy7AHsMY/c2TX3ynuYdimtdE+ibBT8NHJ4TA+KbS/dBoPCqlv7Pn3NVcrUM9guVXYUOwjMhPZauSPlGKQ7grS+PndA2E59couCk+Kcd1guPaPYDRrIrVpsFatYsLVXKLStZOwTAa3RdR3Rz02bTkRujwinKRfQuZf6f5zxp/8aX+U/wBlEmoOQdRTCgo8gAOO5zdQorpaB6ihH5VdkkQkQ1N5C1tdsunp3amu2XKc0HZAV70rBiX6CdgjgIj5P/adgDXpeosNM3YvQbIP3k980XyFhRuDhY4zvf2tK37zsEGjyizdQcKlDtsUEEEMh8qX1CQRw7rRTtQWBw/WqeYfwVj7K3eAvWtJ+6DAOF/HOgpI4yPUEfpETnFxUn0+KGHqAbhRv6kYf906XpYkXwfZdbxsq8JovlBbVugKUjHRP6jOCgQ4WMimNAkvsve04ahSZxv2c+z8uFpGT2ui9Uf/AEmuDhY7wEc5P/Kl6d+kc/xXRFbKT4rCtoZu4UO7nNKYTwewsDuUY21SqvS5DEMbs5DERvfTtkGjMPF0c67XGvd0hVXGWyvud90DfeQpBkUaTgE+MeFIyk4+vdYHjb3gqRBbu1SN6rNkwU3KlJHfCa54C9MgTeKyPKc69gg082v4pzqWtruE5SL6FzL/AE/znjf9NL/Kf7KNMTeFpvhRmtk1R99ZbWew2jIB8l1W/dCRp8pzQVreDVWiybkKNz/IQ921ip9tEfKgi6Td+e4wlpuI0hKQdMisHhD/AGJdSv7rSjyozoNpqcdKYbFoIIZV6gViIDjHVdAJmABlDAf4oANFDve/po41pOiPcoNk8oR76in2BspMSNPTlbSwMgfDp8t2WL/VYdxdGD3EgDdWZOE1tBFoK0IhBpQCq02IxPLh5WseV1GnhTB7PWzlQYhk7NQKtGyffe8DbymtDRQ7JBJFuzhDvc8N2TppTMGeFjsS6KoovkVhIeizKYEHZRfDskhDtxymh5+XPYIyN7Wr7oP6hocLSE+Jko0uCax+H4NtQcJBYW60XygO8of7Cu8+ncIG9+88ooopycpTsn8rA8f7F33HYQnNo2FovdpTQ4H1FFOCul4XKcFLGeQhNtTk8/ZfQeZf6f5yKxn+ml/lP9lGmlBMpUgo90EFXZatMaPl2SStYN1qa8bJ2HDj6RSZA1vO6rNvoJVInSurfHsA2iVujH1XlrymRsjAa32JGaxSaG4f1FMxDHmvcN32PdpFqMa/Vn5TB4THFqxDtlh37UgggrQJ5KjJr08lQx9NWhnYWoBa3HgJsVnU9MhZF8BXY5ocKK6Ahm9Bq0/DuefUUAWABA3kStVK3O+KEf8Ay9l96duUX00uULP3inMUuG0tNcrCiohmT7hXTberz2u+BUe7Q7Ks7XyQaAjXUc88BQxlzupJyv0GTm6j3TzFhHhNxEfFrEYkQjWNwoMfDiPgU7GQsNXutUuIFVQ/9pkYYKHYYN9TDS1SN5CD9XhW9Auvfus3uqpGTT4WtA2igb96u2q3HYewo5OTt1L9lIPUsFsPctA6txneVSNN8hBwcNsynMtVXKa/UEXN+6ppR+yqkUVIxruU+KuF9B5l/p/lXljB/wCNL/Kf7KJqay0GA7JrAAgqCjGQV5X2RyNI2Wpc5GME7ojTwozq37DsoxY3R1x8bhawdimtDNjwtTtWliaK7rvjI2eE1mmRDc37BvhdO+V0WJ0W1NKadkT7PS9V9k7nPfoCaNIrPymBNapBqsKCfpvDHqN6tBcuWIfojJULdLAi6l1HfZR9QnfhaXfdEHyV0dXkpkYbkEe3EM1MUTtTAcqGZ327CfYmj9bXDJ72sbbkHRyO53UQLTWZB5Q3yr3TkfKw8rgek9E0tadiGN+SGJhedIcm6P3cus0/FRNsWqcg3SrzO265yLtKx0pkNBaZ5EcBM7lyMcuDN+CsJ03gJood8jXOHpNFHEOi/ahNcHi29vPY5gchHIw+nhPe9vhNxY1UmyhyBVo/7DjbtKKOR2T05SKX5LA8d5dpO/HbM6vSm8I51lXkJz72RdoG6a8EIqSASfJCFjdgFpH2RaERWRTk5PX0PmX+n+c8b/pZf5T/AGUSamppN0ggo/YxMuhhDeVhbDN0MiuU6MP5TWhvHYRsm8LWLpcqTFMhfoTJGv3QKdIxholGUA0mmUpzntPFoz6zpYhdUE574/kmigidyQhsPcfTd1Hv6stYyJ0rX+iMmnlBwK1LqBarVrUmxAHUhI0mhnW6jTQtFOtY3CdWLWzkLA9QxgptoJ532XSB5QCFZD2RnIAW0sNMcOTDKmuDxYzNeUwVv7kjQRuukXD5lfhm+TadhW1QRgkafQ5NdY37j2WtQVgKyeFpI4WoeVdq6V3li2z1qi/6Uf4iTEBrtlbn3pGy/Cz3bXI4J8n7RyH0tgTvpx/+t1I4fG6tGv0+VL+THoaVhbawbppPaVLO6I+lMxEkgtTOf+8VG9rpN1+HB4QdLCfupG/iRYURER0qOUlB199WumG/BddmrQecidO6575XaRapso9TUMM2vSV641+IbdFNfq7QfbPaeUUcnJyfypeFKNwsDx3uGoUm6mbFDOWVuukw97xe4V6huqvkJrQ3hFHIlFcbIopykX0LmX+n+c8aLwsv8p/soxsmBNQQQUfsENdsmN27KQ7T6zpyLQ7lOpospkba4Un06InUzYpmDkbuHlN6eo6uVrB+IRdLewTmyOBBKw83Sf0ZMnt1iiopKuM8hAV7e6f6N0Zb9TlDM6qaEIC428prGs47dA8Lp/qumEImg3k5upNJuk6NruQhG5vBVleVEmoJ+pu7VD1IXE+ExwcLQQFv7R7RzMIlcS7hSYXQLiTMRi4tpN0PqDb0lCcEpuIDnaVR8+2/4lRfEdhTW6VuqKul1B39Oza3VqgeVMHYc64vK1NLgPOQykhE0gc7gdhOy1oG0YGHwom0a7pHp41u3Ucoi9CkcJBsUYR0rWFxLdNSFOeZ3U3hYdvTNIYZj9yjEYHfom0PZkibKN+UGPhbtujJq2ahdb98g1OAVbUg7pmnK7RaDynM6TrZwmztJoq74985m1orhFzmoOtFHdOV+VNwpTuFgeOwodjdtkVK/QwuTSDuVH7GkE9pyKKKKcpF9C5l/p/nPGf6aT+U/wBlGmje0E1BBR+xp8odt71k5waLWuT5BqBLgmtDeM5G6mkJhFL9cpWEi2cqDEdT0OFOzxWG6lOHIUTy5u/OWIZw8IcdxNK7XCB6nHCDK85S+pSRarYBawsToow13PsX2n79h5UaaggqBFFNppWrwm7du6HeTSDrzkNMJQ4yLGu5UmEidvSOEFbIwPiOpRP6jb9uT4mkw7dhWocZ6m8WnafKjq6HZau1XZINVBAZin790wJbsmcZcSd0jNrWgvOgLotYKCfEE6BvxK/DR18VFhXsdbFAHfvhNbSfWndYc7akHXkPYn2k9irdeWIZqaoivUnaiKcmljeBwoZNY7R2AIkBByvInttEIqk6/Ce9xdpKKm3UnyWB47ASXFA5Xnq0crGOcaa1dOTnhRG6KvuPeUUUUU5PX0Mftf6f5zxn+mk/lP8AZRpqCCCCjyCPthGzwhGBvkw04t7Xeh2o8Ib54uAvGuP5BYfFCUU7YhGaMcuT8Zh2jdyZi4ZDcbtwmYmN7NdpsgxPx+KGwrsJAQe08IlrkyaMnQCi5zmlR1o2yKkcK9KiYGt/2R5UaaggtJPBQiJ+RWh8e7eFG4PFhBBX9kNkPZI85ymmIZuO4zLzhnb/ABKZiGP9o7hQ5ndBv3T2F3CMTz5RwtjcqPCNa2rQw0aMX/HOigz7rz2+VJqDfSow4N9XKlJNNb5TQGih36xG7SVa/f7nkyeliawM2Cq0Y2nwjh2E2tDR4zE/q0rFy0xCWVrNWnZRYwEWhMDwgd1XfiWlzQQeFF8VfaTSblVoxlrgQgiLXTqwUxulDhWO4lCUJz23SFLStwuc/UrI5Q3FonJ3qdScjvJ/BOUppS8hYHjMmk0AcIZ85Obq2KDAE8IBBUq7D2nIooopycn0voX/ANv9P854z/TSfyn+yiTEEEEFH27rdSPLQh7UhDd1G/qC+x7dbS0rDPL2erkbdjoI5BTwpBHANIbalijG4busP9P0uJd5T/pzAA5vIX0+5HP2oWi0JnFHMgFD9FsU7A4d2+lMwDGHU0rdg9SLhN6WlS4ZvykKe7Q38vyndWrY5RzniUV7BFlDj2Dyoym2gggtLzvahlD9k4dM62pjw4bZBcodo7HcJmwrJwDiB2TG+Ewkj1Ip7NScwH0FYZ5sxO8ZlDugGxKrurO96TuEEciLQN5khvKE7NWkpxyG7r9ihJyhE0L4y12E0pZXyu6TExojaGjse7TlYReX7MRh9Pp5TusZenKEGgCk/CwyctTsA2vyjSjc+P0yJp1C+9xAG6jIWx7LTzeybxmdwo3E7HJwyt3hN7OVS0rSFPFr4UYe0b7ozNb8lYfwgKRROyD/ALJ7gG7ocbIhP42TBTd05P8AS+05SKX5UsDxkb4CfG4E0U11DdDIjMrrNukd1pVdlopvqcT2lFFFFFFOUi+hcy/0/wA543/TSfyn+yiTEEEEFH2nIi1fS54QIPshtm0ymOpNka40Oxg0vcFqVZF9O0hPFmgmQtYnSNZyvxkV1aic1sztHlOcAhRRIHK67FHM2Q6R26upsOE2NrdwnxNl+SxbQItk0HV+iLQeU7VDu3cJrxILHcPZI3USYggvCaugL1N2QB8oAxu/T/YeeysynstadI1eVHimOOl2x9h7rOkLTXCsewUOUd+0rqAHSVqCq/UVIA4aSog6+mdx4TXOeabwEAB3nYIcZSgiVruyfELCx6RrPJ7HOpSz1ysMZJ2b7BCJjfGeKDnyCRv7qZIHjbK0aPKc10e7FHKJeOe4i+VQQa4ebWvwcjsqQahmTSp5NomRosbps7X7HYrU1osldWz6eEDfsEZOaHNopkLozcaHVdzsjC8itS6bqpzl+FYvwg/5FM2bRyJRT1J8gE5P4UvyWC4ypOCbuqrhAo5kWpntjkDPKG4Rfp5XUan4trV+LBdpburmPhB0w+TVokdzsmjp7dpRyKKKKcpF9CO8v9P8543/AE0v8p/soimJqCCCYt77yS7YLp9Iago36hfdau0XhqLS5NlbBJod5ztPDi8eEIv1QtqdI1nJXWHyChOs6lJiR8Y9yhFLiXkSKHBxRb0sXI5mOaAnNY8WVKDHTYTuUzDnmV1oQxjfSnRgm27FOl0fMKOZkgtpymxAc7ptTLKArLEi4yg7WzU1BFACB9ng5DN+KhY/Q53teVEmoIImhajk2Qcmm1V8pjyNgmaiN0MrWsrU5F5RldfCEg8q77CmyAzHft104NPYOVioN9QWFx1HpzdzjQUHqJcciLQ1N5VjIdhKadW/fJG2QaXIflv6ZWpCTqOLG8ojRQCiaWs39hzuBnN8mjPE4jT+W3lQ4Uu9Uqa3TkDk8WFizRpfT/8ATjNztItRtGlQzOjkLPAUb9bbzO66IadbeV1Ht5C57Chvm4Pj3CbiwXaXLnjsJoWg3znNhxLv5QjMbvVwmerhAV7R4QG2ZGbgeQi4jIqT7IAu9SJ8FSKU+pYE7Z0uEFXZadC151FDVHtyEQ9/hHCF3LkMDEDZTY2R/Edh3URolhR7CiiiiinKRfQuZf6f5zxn+ml/lP8AZRJiCCCCj7iaVF2R32TcO2MUxA+O02TsvU5aP+S1JzGybOCoxvADstSka59afCbiGcO2RnL9oR/VT4FxZr1WQo8IS31qKBjBwqA4QAHCOyfgxO7qP5T5DhRUhUEhmlDzwE119jomP2pYnEyYb8pYNtjW5NrxnMaao/qHRsHcLDYn8U3U3I0RuiHRi41LisTHWlloS46bwG/+1DEWt/MdZUmHjkbpITsNPEdMD6CjsMGrn2Dyo01NQUnxUbgxB7UxycXEelRh0e7kJW3WdIDKk1vlBo7ZngVR3Ucd7q9LbQxLb3zeNtkDY7HDUE7CtfsVhJS1zoHHjtk3Cw7NDK7JAC1A1t2vdvoQFexiWy4v9h/2opZsJqZOsBOC4uJ5TyHkAezpCG2RP5+6CkcGNtRt0t/XsItOfp5TpxSa1s2pzgoG6YwM8QeAm8KeN0cn6KAaR3G28J2LjZ89kMTC46Q7fKSStkw2OySBkij1xu0u7JHAbFNG3ZK0uFBRxmLcLn2vPYcyni002E4pzzM8saq0jSE8J/pTzblgeOwi00dl3wgK9t7TeoLWDt2FFFFFFOUt+F9B5l/p/nPGf6aX+U/2USagmoIKPKk6QR/JXavtKcNrCY/VlaeTw1VQzpUAm+rE2fGZNbqFvXlMzggKRN7dl+AmNIHqyxMAxA0KfDyYH1DcLD/US790psksg2bX8U6OY8OUTn7tkCfKQDpaooJHvMsgUeFa3lCDT8Sn9WMW31IGeXn0rFQHpVqspmHAbR2UeH/Dv1N4OeIk6Y9CwsrpL1hCuyQYwOJa7ZYfFdY6HCnDv8qJMTUDS06uU2NoQCAzMbXchaS3hNdftvha5+pBtKbw1SRhYeTW2jnwexv2ymjqYuULyRR7HnbZDbsrI2N/HZX5l9t5yettBRDS1SsY9tPCZ9Ohe7U3Zq/DxxeqNtEJp1C/aBsLEAtc14WoAWUD1TfheewmkB90QDypY9BpnlDYZgdR2rKZuphWHeHN7ipoRKKKmwroJNcfhRYxkrAbUk2uWrUYpva5ocKR6kfG6ZiGk07Yq/K2k3Q27r0Gu49jTucjnXZYY6lPZCbGGN0hOKcpOFI2nLBcdvqa+/GQKfbxTU0UK7B7JAPKOzqyKORRRRTlKvoXMv8AT/OeM/00n8p/sot01NTULJ3QUeZAcKKMVcFNIIsd5aCjsm3IaTWgdriXbBCMAUputGC6LdMxjz8o1icbFK3p8KOVjG2mzmb48JjazL/AQbWRNBRPDt1JIJHdOlHEyIUwdpNHOTWR6F+a35J+nR6lHiI3CrRfa+QtPa+vSVDC/ql8m+VIh3gp3U8LquHLUNwsfG8VLFyFhfqTZPRLsVaOKhaaLuzeworTE1NQQyCrIb5SRB6iaaolaa7R2E+oZEaiphQWHlDZqPnOU1SBypVveUzfzAtALFG6/SecnOvhVZA7byrsPyHa7Ypz/ARDnc8J22yHCLerseMjwsLIXAsdyPajl18BTfHV9lJKyUhp4UknTZpiTAQN+znPERF4tqidrbZye+zoCHGZYGusdzn0nuei9urQ7ypsA2T1M5TW6DT/AAmG2g98kLZBumsdH6bQ7ayItN9B0n2JH6BaivTblfYSeQtV5zDqHSEwvvTIE5OTlIpfmsFx28rXo2WjqfNDt8+05t5nIooopykX0LmX+n+c8Z/ppP5T/ZRJiag/1aQggo+0XFJvx7EnxKZ8la1BXkTSG2ekLERsmcSRYCfhCyDX5UD2ubsmlOdSolAVnOXE6GhdMRN1KBlDX9+6TZwPY40Foa8+pekOpbEJpML9B4OTXubiCx3HbSfDJqJDl+YBT91JBDMPUsKx5Z+YbHhYqESQuYsNjJ4CI+QoZmzs1tyPKiTTaaghkEOwZOFeoJsoch7DdT5b8ZDkrEmmWo263AtQynGpN3CGRQU9hwdS/EtG1FW90mtgQl1jjdNH3TG732uNbdpQFmynENFlD7lDhWpAS1NArJ+7wFKdLU0UKypOf0MaD4dt7BNJzi/0hNaGigncL8PHKN0MKGSAt49gpjtLiDkxDN/CZx2HddNdJT4W/UOVC5w3A/isVG1zOq0Jh9IyvuItSCSPccKJ2pt5nsc3Um2Oe/lyrO/CIyKc0+EHWLTWeouOTk5OT1KSH2sAbHc375G1XYfv7bgeQi9rfkVJi4I93OX4uA/vLqMPBWoFFOTlJuvoPMv9P854z/TSfyn+yiTAi7SFC0tHq5QyZlavJ41elHVF/BByHZaP5mwQibqtdJg3KIdq42VnxaY98gTWEKTqA3SMkvgIONbhOeACVsWD9SvC6n4aWjwo5g5thNaSbd2hTixp+6G3c9uoVk54amOLjuFLtRTHbqd5L6Yoz4WPdojD0w6mgrEsdtIzkLCue69YruIT2j4pg0tpYqfoNurQxQ649O6kiptxbFfi3t2cwryo01ay07pqCCCHYMy0chNxDb0uVg79h23CEjSiaFrCS67OTneqlihbVhpGQSacyojTiw9p3QYFWkJjnfi68Un4i3dOLcqF7mksk7hx23SAvcqsgimfEZVclqXcV2TtBxcV/r3udsi60H70g5YmUiI0sMfQE1+pxrLUAg4O7SnsN2o3bUUzsk+JUbyAmvDledouTiCg0/iAWpzQQmStjd0iUDeQ7byLKNtQP3V97e4eyfQ+vvm5OTlIpBRWCGy47HnZMbXeeE3j2jsmETOJK6bPsnxRuFOCkMGHNFuyjdC4elGNqdsnLFTdE27hf/j0jZOq5h+3+c8Z/ppP5T/ZRIGgo2lxtwTUEAmuDeUCHbjMmkApHtY23JoPyCaeyWT19MeV8RQUb9ycuFu87cINDRQ7p3v6wiT3hrd04RSbErDuY09OqVdzZWyyWDx7LWhqtSgHlMNutYch+Kf/AAUT3GdzPCfC2QU7dQWG6T47R2N/auyxe6wsfVxYd9k/jZfih9l5UR2TVptfifw8gjf8U1DId5b1DQXTbVLo6R6EJHN2cE2bVsAtQKM0beSmvZILBUxqMlqwpdH42TZWuFofdSC2rEflOWFxQlOjN9NcHd0krIhbin4yOrG6mxLzOHP2UeO0k9NqZizuXKPGxP52TSHcdhe4O2QObnBospgc46ndzeMnP6bS9MbXy57PqDnROZKzwmHWA4dpduiby0NK3Yd1M3qxFqZPpYGjlNeIxSEoIRePKM2g2E3FMcg4FDMp7drUdEdkt9M0oWAtBKkjrdqMhG6E4QkBWpXaIRlDHUU14cvqMJ1iUeFhpNbLCBQ9hzdSDXjICld+3fsScK7CKKKepFL8lguOwrSeT7I7D3FQxsYSGooglTxam6UGluzgt/CITwp2Bw3X0nByRulfhjR2/wArCYwTflybPHjLGD/xpP5T/ZQqM6zSAQCCCZk40tVJp17oJsdu1uVIi11NOxXVauo6rpQ6XDWFJdbJsb9YvjIknYIANFBE900XUlDl0A757rotAU0HUFFQ4l0Z6c//AH2lrsWb/d/um4WNvATsJR1RupFs/hCXEA0Woulr4qOUPzc/elqta9KxE21qJ6wA2c/7rDspzspfy3iTKV2mlG6x3M/bu/pl9VkdFHqavpUWmPV91iZOnGSo9QYNSPKiTU1PhZKNLworaNKCAyAQzLwELcqrOsiAV02Dwn4WN/hfhdAOlyg6jWgVYUz9IDmjdMxLAN0Jo3jYrEwted1hqinFfwVZTg0D9uwmuU7rPPp2CZC0D1bqaNoCfhZJprAUeCbE2yN0+MiUKKNpjC6DYzbNk2R/8V1vuE2Vr9gqpO4zlH5nq4TeNu5goJ/CMb5H+o7fZNG/ZMwSCisLNHGzpOduFrafOb3oyg2QuuuuCupfCPqT3OZtaZCOVHGG7oMBToWuQwbbu03CsagwBFqOoIvKGTLCG+b/AImlFK5qknkB4THOe26Wx8JzXctQnLRuusCtSc0PG6JMLqWIfrYsDidP5dJrkCh7JG9+2eQgCTv7BT/ioTbN8inJycpT6lguOzyj7PB9p2wJWHcZSXIZclUnNtUU5qlB8L6JzL/T/KxOCZifVw77qFssXpebWPkazCy6v+J/ssNI1/CY1NCAQCCGTjQU7nvaNCiZoaGjspFoPK6LBuAj+qLjDPtwU6St0JRVoW/lUGjZEFaVRCY+1eTn0+nJ7g4bIbjIttYuO4z919OxvWHTdyMrWKft0mclRM6bAz7dz49RscoNk+60u+6dcTzqKiOrdYp+hlhTSveoW6Yi4qMOhax/hQG7ykaHtLSoX7aTyFPEZaoqHVHIY3dhxDG2hPJJ8ApMQ7CYga9w5NnZIPyza+oPGJlbhmqNohYGrETxSnotNkp3TB4VbqJMQQ2V3wm7pq5QV5buQaB7UpphUfCItY2MNdYHKw8fDHORwgPldB8dFtL8U+MXI1H6lEn4/U2tJUGPhlHO66jfunzxxt1OKbiOu6wm8ZYufQyhyoYum2jytNqeHUNlhpQ70oppAmARFoxhF17FXsnA+E19mkWg8rTp47rkadKZZFuTdzaHZK4MbqK+oYT19RvlCCZnramfUcVG3Taj+q4lgqQWpPqjniqRxjyKCjme51FdSn1ahO5tB2kKw53qUZTG3z2DfspcZV2sDasItF7qkWArpBvCdGPsp4HOp7Cm4sx7OX41vlTyh+4Ql2pRv0u3URNC0Ch7g9glN49mkBSKcnKTW+x4TX9N/T5UnyWC47B7JUjnWKPtTO6cZKhHoCKkcI22mCm7oqkQnNUjF9IaWul/p/nIlY1gkwsgcL2P9lBhw1tUooXxCrtNceCEAqQTQiprc3SsMwNZp+yHsOaNQKeAW7pjGN+KtOQyP2QaBmQDyhap0W/KErPujI3wpHXs/wD6TPp7TOXnZRYUR3TipI5v+WygZGG6me19RcQ8NUUo07KR3UFJoDQUyN/UDKoFYmIyR0FFG9htxVpwlkNcBdJzN2lDqqcTscJT/VMc54tq/MVkfJPxWGa42pvqt/lYYbrC/TxH+bObcVjmsN/h9nfosDh8TMeo01S/EOo6zqddV4WFwjMONhutIR5USjV0mi+UBk07q6Wt10E1hPyKDQPcf8UzjKRocKWJg1NDwocUNNPX42C61IOa8WF02XdZT/ToZfU3Yp+ExeFcS06gjO+d/rKwpcOAn4praaOV1sVOajbQ/VH6dKfzJH7jhRSiVuoZHhSN6T9TUJA5tqtLw9STNiq/KGp/yRFuGTkNnZn09sll4aER4XHbitUsjYxx5UsLXCihACE7Bx8lCPDgkFSRQPOkKaDpmwmnSbUTCom6RurBQbZUbE0e4PsqRTtgoRpZ3OjDxSxGCvgKbDuA22QbIPkopJCN1GNt1GS4bpjqTXIeyW72EH70UO0rlX7RT3hqkm6VahyrsWnbKWZ0m0YUplf6OF0hFQHKkG6wXGV/ZO1IZXvXeVIE3jvOWLrSL+6ZwpJGM3cUcVHNIA07IZVkQiE8OA9JpHrj/wCx3/ZWrEX+0d/2VD1f3nk/1KDVSpAJ8b3fFyEcv/JVM37KpSN0xhjO6aynavZcNS0g7FUtIRFrdqJ/VAm9x3mNp5U8oY8RRfJMgA9R5TqjOooImlFK0uLMq+y1VyrV32/VIXSx6m+EMQ74ArBOeZDrPhAbpnqnr7ew6B0fqg/6T/qTGivKfI9xvUv/AI2GT1uvdR4bpEdGJdBz36pDt9kI2t4CYGQlw+6w2D/8t0vjItXkKJA+E0IIZcJm598kUmHU3Ii02tRatMYPxU0cEnyapIGRjqR7LCYpuIYN/V2Y76WJj1YtnKHEHD4aq9awOEfq683OXlerB4mv3XIGxa3dwsa7ptoDcqFjmH1eVIzUKTYtTtb0T4TCHEnIqvKGR3TT4yfLR2THatygPK89uImELb+61BifMXj0JksR2taWKmLFQByI/cfyjAWyBRx0gLR4UTExvdwrvsGTggUVL8CmEFu3sPia/YqTCOi+O4UbWO8KWJvC6fhBzm88KJwcmq/ZkHlA3v3cFPeueO8ZFR4gyYpw8LExdVorwhwp2HEyaP3Qn6YmhoT3Ov0tU7tJDipnCwsFTgqypDjIt3tDuJVpr/C6oQeuewouAX1VznNaWlNxjmbPC62HlaQQosJvbFBuKQypUqTmoxoxXJsmtpUgFWYQycEPZ85XlSc204OHxTp9I9QUZsd00ugU3lQtkaNbm7p8zI/kVRkOrOfC6zrZsVEXFvqyO/hHUzcKKVr/AEnlDsx8lM6beXKb6bLGNbd1gw+GQueFE8SFYbQ57nM7byLg3lSYluk6OUNbpqHKg+nRtjAkFlNaGgNHY4BwoppDPRm5wtQ63BRtpBBDLlMHqvsrvtWt8qTdjWc0gjkA+6lY5xsFWW8i08BzFiGdJwrhfTcTrJiJvPhaWn1ZgeVPCJ2FhTHPj/Kk/wC/urrZqmY4mwd0yUPG4z8EqCPRbvv30nHSQEG/YI7EDMq0StSx0L8UQ1njdMixRAQwt7vKf9Ojd8dl0Z8OLDrCY4PbqC2cNJU0Or0uQsO0v5Q3yA1FRsQHedvZmCiJ8+xdKlJADu3lObrRiLX7JrdSMfTGyjNj23WzdNOodhNIbrSF8Dt2nskLqpqijbynUAmmWZv2UULYG6QntF2VIdPKkh6u7kY2xu0rAgAbZF1JptDOJx3HaVIvgFbpDZWzhaII+Kjkfe6a8EJzwE6Rya4vWgqSIVunYWKZukofRgzeNyY+bCGsQNvuFL9Rg1WzlYXEsnbbSrGZC0pzFEy3OctOVqlWYyKHsjvkaHbFRAt2QcRyrzke4nTGmjpDURumNed3qWFkwp4QFbDsGzux8Qdumvc3ZyBvjInymxl7+oVViivqcVQjT9//APKhDxIFhgGEgd07JX10nUhgC92vEO1J2HicN2qL6dh4n9Rrd+9zdQTCfi7LpAlMFJqCCCKCJ3CGY7T2jJ3yz+q7Ma5RepjSVW6l2bssW4kC19KY3Xqzk+JTfiMncJhvKVocw2ofgEVIdk3jJ/xUPHsSfJuR+QRyOTso+MwiLTo+kbHGT26x+qkb984Yq3KA9godztnZScKPg+w/hM4yrdOAXlOUXOYR75OFhia7HcoZN5PeVISGEhTOJgLv0UP7ELFk9E/0XDdk342nlReoklPbanhJorA7NQfau3ryhzmz9o7tdwmhHcpwAUe+QAQAB2VAqlQBQVAqEAXkQDyjDF/xWMw8UI6kYop+Ln/5LCyOc0alaKadkeFhjceRTuU05OWo6qRcUJCgdvYPf5y8p4FWonE8o7ZP2BTPiqubfx38OrteFGakoIqcnqsb4z+ofsh/FQj1hM/bJuU7i0bKJxLt+x3t/wD/xAA3EQABAwMCBgIABQQCAgIDAQABAAIRAxIhEDEEEyAiMEEyURQjQEJhBTNScYGRFWIkUEOhsXL/2gAIAQIBAT8BT03YdBTdtauyH9xDod8Sht0VFT8R6ShoUd9Xbqnsv3dbkOk6Vfim7f8A0rtkNBp+7pG5TU9N20qfJqKCCZ8nLh/mnfFN2HQUNlxy4TZM6f6l/dauG/shN21qbLif3L+n1XVqXduFBUFQVBUFQVBTlGE1jrp0qIKo0ubhUu3BQ69yiQmDGo0Hk9+NjS2ZTSFI0PtUB0HxO+SKB8WzjPRTzJXpMI20KruGy4X59DtlTCoCHPB+03G6kKQpCkKQpHhem7DoKbtrV2Q/uIdDviUNuioqfiPSUNCjvq7dU9l+7rch0nSr8U3b/wCldshoNP3dI3Kanpu2lT5NRQQTPk5cP8074puw6ChsuOXCbJnT/Uv7rVw39kJu2tTZcT+5f0n+2fLEHWI1JhAqdGtuyg0DoCKHkhHUdUp9Rrd1dcZRdGUHkvgIUy852TWBogIhGfSAcPkUGx4nD2pyg0TPiey5Mu2OjhcITRAhe0WgpwLMhOqOqYaqVox7Teg7aVGE5bum1ARlXs+1ez7V7PtXs+1ez7Qg7eF6b8R0FN21q7If3EOh3xKbt0VFT85Q0KO+rt1T2X7utyHSdKvxTdv/AKV2yGg0/d0jcpqem7aVPm1FBBM+Tlw/zTvim7DoKGy45cJsmdP9S/utXDf2Qm7a1NlxP7l/Sv7Z/RlA9qpzKqGGpogeAymNt8MaOUwU0zpE6nRwTabS64qpGwTKfMCosdSd3BH+NCvfiGrT3lviJ6iDuEIKhPpXG4bo03fu/wC1TlpyUDPUwA13BWBWBWBWBWN8T03YdBTdauyH9xDod8Sm7dFRU/Oeg76u3VPZfu63IdJ0q/FN2/8ApXbIaDT93SNymp6btpU+bUUEEz5OXD/NO+KbsOg7IbLjlwiZ0/1L+61cN/ZCbtrU2XE/uX9K/tnRyHTOfFChWICFGZ6DlDoHhx7Xb9rt+0+PSgyg2D0nQ/RUloymUy/dAQICIkJj4V4RuKDT5XgMqh33+hjoqNuCgsOE3I6CYEqhmq93353puw6Cm7a1dkP7iG3Q74lDboqKn+jO+rt1T2X7utyHSdKvxTdv/pXbIaDT93SNymp6btpU+bUdAmfJy4f5p2ybsOg7IbLjlwiZ0/1L+61cN/aCbtrU2XE/uX9J/tnR2yd8VSrXAB2/QPK+rIhm5TRAjpGg6xpCAVb1q35BOQCjoOhj2iz2EDoURKpdpMoOU+VzbxCokjsd1T5Z0cFTw7VxDRJTXF4kKl56ib8R0FN1q7If3EOh3xKG3RUVP9Gd9Xbqnsv3dbkOk76Vfim7f/Su2Q0Gn7ukblNT03bSp82o6BU/k9cP807ZN2HQdkNlxy4RM6f6l/dauG/tBN21qbLif3L+k/2zo7ZP+CrYa0hUKnMYLt/0BYLrur2qkjZDbwhBV/WrfkEBK26TpAKbpB9FPdARrBmCubbU/wBqlVDjam+OFkKQnCx4KmdXOAQ/nykqS44VU1Gt7UKtb22VzD9I12DfCFRpzK4jjWh9u6bX4p2wgKlUqNN9ZfiKabxDXvsb5IVQJowOgputXZD+4h0O+JTduioqfkHWd9Xbqnsv3dbkOk76Vfim7f8A0rtkNBp+7pG5TU9N0qfNqOgVP5OXD/NO+JTdh0FDZccuETOn+pf3Wrhv7QTdtamy4j9y/pP9s6O2Th2KuO1qoDsC/MOyqjiPkwqjxF5seId5XNuKCdA6CYKOSiYCZMSekajSv6RMaDdNRHSdRq/IhVCbocq7LRzE03uuaqdQnBTZ8bjAQogZRp3e0JCuCve49qa2N+qfCAiE8xsogINBCdRb9JnDCe4IMhWjZVy2m3G64X+95A5ObctsdDim6ubcn0HsNwVOoH46HbJu3RVbhUj9/o3D2hnR7wFT+OUR7Qd1EIKOjfRzbhCGP/pTnUDTbPQTGUB7QCIlWkKCnmarW6WKIWRVLWKlRsynbQgOgOv2QXGsJbIXD1OXhyp1AVcN0a9Me01weJGnEMHE1oHpUGva20BB5HyCBB2T6rWbqrXhhcAjwZqgyVwDOQTSOkSnG1vcmUX8RE7JtIMbCGBpWoCp/tc80sVv+0CDkeQIiVYEaTgZaVFRX1g7uamcQB8sI1uY4Mb1zoNK52TipCuAVE4R6T0nCAzJTqYJlVW3NhMBpPkK4HITHSNJ0cgVKZnVzrRKa7mwdXOtUXbos+imEjtd5XF37U2pODhOqNZ8ijUa7DSoJciEOniKfMhT+FqBztkysyp8TpKlSpUqVKlSho4Sq/MaPyyj/UqzHgPGFcCJCq1IdCp7dLqYHcEKgOtQE7JvQQCrRCafF78LMYVR9qpUy48x+pCHUH91urnBgkpvdnoH60u6Xgkdq5hHyHWROEAW7KUXwou36XGE1huvXNa3DsIEFVn8tly4enGUXAId3QM76juK4rh21W43VD+nvGXuTKDG/wAqAm0wwy1GmHblMpMp7BAAaVWYuZuqVgE+1Vbe2EyA0QnRvpzAN1I4h9g2QYEcKQN1e0e9HsDxBRP4J3/qU1wcJHhKnrr0W1mEOTOD4ihlhlUuKc02VhCBByNS4DdXyMKn99Ff0olWBRCoGdY0KPgKqw51rd03h3e02maZ7dkagRefSDXTLkCRugiE3QrLjlBoGmyb9lHKut3V4KDg7yESjP7lUpMrshyp8JT4Y3tTTKjqdPpBgOXJ9IHuRptd6R4d4+K5FVciquRVXIqrkVVyKq5FVciqhoSn1GjCqsFXYLn1+HaGWyFzy9wem7dTmB26LKlLLE2tcMpo63N9hNdPhaZJ8NV1mQsPGOn31FvtNdKLo+KiclD/AOhgDqIlMqZsO/gdsmfLqAnOlSm2oIcm8I1uyr06zSA10r8TUDJIVJmJchpcrSd9ajrQqTnDdNbzHSfXU45Gu5hOptOU5zvi1NbUbuVYqT57fagHdMs5hA3QRRRaCuVHxXNfT+eVU5fENhNpVeGM0lTr81vbuq3OY0vB2VDjGVhBwdToXAKm6/dR1BOPrRzG1BDkQ/hxjIQ45pTK1Ws6WbJnD+yg0BTaY1KrDbUbqiO/pcJCAjQDQdDkykG5962tKtA2Tt1tpeJhDSpkJoxrVrNpDuVOo2q25um6NJpQouZlpVx/d5YjIRM7oOaOo4QJO/lCJTpKcxVWvY4H0mhtTBVbhzSMhMPYPAW+wuaNkDOp6HCMhAz1vE4TW2CB0kSohXRvoO58JtJrTLemcqeq24oNA26jv+sb3m7wPH7gmunrecJtwOyucfS5kYK5kbq9pEhXXK8DC5wG6BnR0m5xRog0+WqNWDyymlF92B0upB5lyq9rMJgtaB1VBiQgdGZynn0mnKqVLXJhlVuwioED7T+yqH/aCcvWrmyjSCIc1UW2tToIhcgc0BUy6g38zIQIcJCqVAwSmPe4ZQaqxP7N1QqF7e7fpf8AS+ITBPceh3BtqVZ9JjQwQ3WJ6K3rUbqmQKsI9Dip0I6gbj0B3dGjxmVULhkJtT7QAcMqTTNvpSETmNZTvznlxTXGke1UawqdIwY8Ewvkrf5UPHtAO9lFQPaDRMjon66IUKFChQoUKFChBQoRCewFBoa7lu2KqUS5haSqT5ap8D6YemTTwVPXHXEmfARKbjtQHUW3KFPQUw6R0nZDPie60ShVL/gnNru2dCs4gD5SmurfuQL/AGpd9ayJjrd3YCAgQNJ6t05lyB9FDoc6E0eymuyVuuW2ZRYAd0ynHyUJ1Nrl+GarQMItxEp5FMBs+1OFWoucbmKjfb3pojqfDiG+GHPQECFVn0miHQizm1rT9Jju61cQ11WmQ1UDLAnsFRsFUapnlu3CK9dJ7n2oYXFi5tqFImuGtOE4dsFOYabopHdfh5y7dBxZh2luU+k5rr2KjV5g/nognKkl0dIf9IdI0retRuqZBr26HU7+B30EBHRXwbkx94kIpzU+nJTFuoRaU0yNKtQuMBcsn2iGsEKIcm8S5pjdfiWr8S1fiGOxKaIz1uNolCSJKHQRK+PQ4+ggI1lXFXIvV6uVyuVyuVyuQ1KJVoL7lK4mu6hVEbKm+4T4iLdkHzoD0jqjwuH7vFGpMoeAdUdFSbcKkHTnQlV2ui4FUr43lArfStSvGN03in0e3iP+01weLm9Ds4CDQ3oLUJClSignOc42NQECCvip0lGmaj7vScYCBgx96EpjfZ6+IZFZrk5zyIYFFT2jNHvZ/wBKlUbVbLempXFPtGSqZqg3OCPEFh72rnMQqNKuHQSpQVQwqbpyuGJdWc9UhNYvOg/Lfb9oKv8AlkVUHXCV66QfzSNOKe1gly4FnMfzD6T8NXCEPBcNIRlpkKfaKcDRq3DZA3CdIMzp76abe4+Ct61buFEVJ0PQ4dDggZ2T3WiUyYk9PFOkWhUqdSMmEw1B/KJkSiUCR6TXoqQjjKq1Ds1NYAEAXnC5DTuvwdObk2ixmwTqQKayNwjSYdwgA3bqfVazdFxrS30mSB3dRTpI7V+bMLuCAMyevdQoUKFChQoWVzSCg8FFylVGu3am1ftcUA9q4R8t7t/HaFsY0HinMKPA7ZMMt8kR+jqGGqm8yt1CIlWKPtDOr2NeIci2pwJmnlipV21RI1a2DJ6yqlYUxJVGbZduoQEalp9KKntWCFTqWu5TkROEGNmUSrZy5XKZQcgZ1nMJ4/crfrQtVRhpfmsVKqKrbhq99jblw7e292503XLYfS/C05lcpmyzS/0ua0q8Ln3OIQMqYXE1hsqNSVwrrRH2qQyTpVbczG6puvaCqjL2lqpuxaV66C5o9ptRhrHOn9TP5Ufa4NllMLiSbCuGp8ptqlXBEyj2hM4gONpVVtwhMfU4c5yFeLbk6o6JYqVUVB0vMBUhjwVvWrdwnu77gm1A7pK99DXt+0+HkDprPIwEKQulObhMGF/CI0hNErktJlOkBN7syp9Sm1ADb1Rpt01YhMAbpdbg6yt0ROFSP7frSes92PFCsu+SNJ3pVKxokAptdrleFXgGUTe2CqPY9MdI0B8J8ZQznwnKpi3HQ5waqdQOwd+n2vfgjRzw3fxPbcITKQbq03Z8FomVUvI7N0xtTdxTKof1FVHQCmM5zO5NHXCqUrngpzcYTA6MprQ1HUgJsjVzTNwUGMlNf6UaVYItXDmrw9YsAlU67nbsKdxDBj2rHV/lgLbw8V+WbgqW0qpVsbKFLmiSmG0We1VptpUm/YVBwJjR1QMVJ8FXBVXNa+5U3XNJGrqhf2sVjKTbqhRc/jagNIQB7VSvV4cfnCR/Cdxba9cPfsvxjXDsCpCvxLrn4aqoq0zcxUeJFbBEHQiU5kp1D0EBAhVBhcJc78p3pRiE6jmQm4HRUEtTRA8Ff1reGkIUgRlHh4yE1z2YcFeCrgi6FfOyNyysqwLktDpCfR9hU6wPa7fV7rGyqc1Dc5AZTxJWwQTgjhVKlipbacW61kfaY3CpiSSjTBXLH2g0j317dBbITdspqIlf2xhb79G1X/env9CNHNT6XaqtJ7DITqr2br8XemvafaDT8gmOAGE10oeImCp6j+hc4NElOexvd7TJc4PPSSAh4SnhDI8Q0qn9oTRA8BOpAO6sjZSn1Q3dCsz7QqN+0Xt+0PzP9JjS0wh4HIzGEAfayigVIW/TCc24L8wbJziB3nC7nnt2TaYDkE5gcqcxB0mN1M9f9RFsPTOKAGUyo7infwtu1Cg0VGwi2RCAAUJrGgyoDhBTOHa43J9NrhBCDW0xAUhcTxjW9sr8bVebaTUOFrVSDXOEHtp/lUwn0H1sVDhcJwTaN0oMe+ueH9SmgNEBbqtRg3t3TXSJUov/AITDiSu5xyrAq9JzCKtPcKlXZV23W6tdTyMoGddz4a/rR7b8KmwNIjUoCU+mDshTDm5TWBm3S7TiyDVj0hPxlChUpd3MhfiKlY8sZV1Ro7Wo1+IH7EOMeD+ayEzj6D/3JnEUn7OTuN4du7lzGVBLCi7mcRb9KmI0qHncTZ/ircKkIk+UkTCDs2qFn0pTsjpeYcEP0Q6H02v3VXhMYX4Yf6TOCjZch1NNdamkFBDxEWmR1Qh9ImPG6oC/lhcSLWghN2Vaty4AEkptMu7qi5TQ6UYkDQkDfSPtEIaHB6yjlNOFPgqPFNtxQ41p2VStWtNoTOJrXy8JlS4Sgetzod1wEWN+kGgJzcz53IujdWjcIOnq2Rd+IfM9oQEBVD6Gr3PoPn0muDhI0I+lf9oHp4kNNI3Ikg5XD1hsFuVTB5pJ6Qqe5CK/qPEGjUt/hHjXux6VPh38SAQIAVPhnN3K/DUzk5QAGjmndqpUocah30K3U24Ra70mG7dTDoR30IlcVRLXcxm6pP5jA7R3b3BBHATRA8Nb1o2ZJKZlw1emfSIRTJzPS7bTj5FQrg4c6SjSqcfVL/2qhwzaIgKFaFUAiEeBpPGypcFTp+keGp/SqcADlhhfgq9E3schxj6P91iP9WZ+xpX9NJq1KlV26e61sqn8B4XPjCLjug5En0mYdlcXcAHNQMidahtEphlvQ5gflNmYPQEfKOgqVUpNqbo0zS/0qk+l7RpTkJkt3TT4iJCB9dRRaSmk7HwkxkqnRdzjV+0RIyr2tCojmONRwTgXbI02ndVCdmJr3vH0rJ+fW109TnQg65Gpa7Cl3pCrG6bVBxqXgLmhcyVWbzWFiqcE8CWFMqVmYdhcOGVdjK/sn+E0z1/J/wDrSfCPDPSUWgp9MgdqpPxlAjoc4NElSa3/APlNo04taq3NDfy01sDOpAKYA3GkIsBUOpHGyDgduisOe6wbBVODp1GQQqtB3DuwuH4i0gOXDXEm7qPZUDk/i5MUhK4uhX4p19qpf0ys6p3CAmtDRA6nCO4IGdXMBEKmS4Z3REOlPw8dBEoDkVP4OrTabSnugQmuDuoIaV/Sc41DA2TWwmfIaFFEQZ0e0O3TWhvS7ZA4lcU/mVHBcPQdVfYNkG2iGhdyg/atCgdJITmNrCCML8OwEQE38vibRsQqwlq4N5ix3gLvSLIRb7Q0lEBwgpn5GHbLfSptlM+OhK3QRGZ/RDpcITTIRyuXBTqUmUGwnxEKn9eN4kKk+cdDkBpFx8BMZT3tc27dUjLbiqlSxhcqTAxud0DKJUl2yAhHBnUnMIY6GiHHpKi5ETshStTSYhFn2hRjZNLhujJXLTWFqhEJuVCqcG0m+n2lO4PiHHNRUvxPD4e2QjxY/wAT/wBJnEsf7U6BFUsgnUugq7Qq9qvC5jVIO36E5VlpwgWnU4Vl5uKLRNjU1oYIHVMHPRCNOMhNqZg6PdZj2U1kBQuLpy1UqQLgmOsfCGheG7ptUEwgsVHwfSgDZevDEHHQ3cpwwnQ5soZ6KjOY2FSqO/tuGQu938LlA/IoMtw1PB+kziQHWVOoacWZhiayNG7jQ6OyhjtR66mGQn8NRptmMrhqIos6zjdP4iz1Kpio/ufhWBQqjakywqrVex7XvbkJ/cJCpXc3HVMIvnDUGaQoVsoN0ewPEFDt/wBJ1S0Sj3ZReeHfPopvEU3mAVv+lHSQnE0zKBnKKc6ITHh5IVqaIPgOrkSQ+4JjrhOo1GhMIPCKnTcriJLC1vtcoDAQGFxznBrWt9lUgS3u0dO4X+9HHbVw7pThOyAjKmFcjIMoVWlB0lSqjrRKp1g7JWXaQE2CSAo64lRb1VKDKu65b6YhmV+ILfk1MqgoOVDFw/nQmN078zNNcxzDbUX4iwShVa4JoAGNIRLWZKvCHmIlWqftOYHruo7nC5zBuuZc6PScbRKY39/31GoG7r+6M7Kx7PiU2tmHCOgtlNTe6qda/wAVRZBXLDk0lmHaQCuU1ckeiqFKBui1evCejYynOkQm4YZTSIx0szJ6a/DNrDK4e4dr1b9IGN1cFcAua1Gu04buns2J31buOgpwUn2i9NdPR8tlUPcAhTky7SdS4Ddcxv2pcdkWF25QEdL2h4gqkxjhb9JtIN2QkKRrJ2VgO6iPC/BuX91yhVWA7qmwCtepGoz+iHU4SqZtNuj+14lCaVcz7W/kJUQVhu3SdSE5ibc10IOlDdNOVCdtpxEvqsA2BQRxqTarsjWZfGhMBOrAlUpd3HStQDu5u6/NpCXhMDXiQU8XmwJoDRA1OygteD0O+wgZ6ZI38BaHbp9CoHXMcuHBDc76VZcLQmMDGwE5rXiHL8Nn+FyftEOa2WprnPCioPaFP25TmAjIypn9C9twgoMa3AUDZBpBg7dRJOyDB71ewPGUDyu1yDgdtJjdHiQXWU8qky0zrV2VNujhcIQc6ibfSBnIQQVEyEV68LsZ6CJEKiwZlVIawqngKein7Gg6CNN9IBUthVGEOvCqG4DVu4Q6CE8YXF1jRhcLxIqYO6DtCgcJsuqz6Uo3nZWP9lBgiFaFaPQQY0evDhlb/fTcAm9G/gogMkK9o3KqVxMAK5jv4VOJwdN1t+iCHU9ubkDIVb0uIoioJ9hUTjxEwi9XhXoOwmgk6ucG7p73O+IVN4cOi3uVNkOlN9qntOhOQNBVBhnsoY0A0eptPcmmRo0dxKc4N3Vxqn+EWhudHNxhU7yZdpVaaHfT2VJsN6ag9hDI6MgypUzq7ZDwTK+JUx0RGy5vohNKMIut3Qb7/SVmurNhqpXNEPKfVDcDdNbaFZHxRqFnyQM7aR99b6LXr8S7heytt9rieK50U6Xtfh7Yt9Lhn7tnV+SgI1Lbk2mWfEptXMPwgVS+TgivXRKlTpKfkJhkdFMwSFxJ7FS+A6QO/wADu3ZH7V0YTWS6SqjZCeYjVu4Q0OrhKq0WP+Sfw4pVw4fEprY96OMBMF2So/QcTTNQXN9JnFenhB7XbHX5eVzWl2QuTTGYVoXKaU2m1hkKfFKlSpUqVKlSpQQ6jlA2mFV2QyFRMdvicJCNSwwjVYd0KjYwi4JhjK5oXMn4oUbnXOQCe0tdLVvnUDKA9pwTRAjQ5eq1UUWF7lwhvqX+zoU041qsMLh6hgjR74dAXLc49yayE4SNdk7iKbcKvXugKn8R0nZUvj1EKIypC3RqNabSgeqJ30r0zUGFR7cPOUYRc4JpLtHgLZb7oMndDwux3KZW3gvdVfDdk57aYlxQ4jnOtamUgzPvUid1ymt+PiqhtZ/+l+GpscHgK2E8cp3MCa4OEjwPpioE0up4cqOXOyivWpKlSgVKlSqe3RUYZvCrP5kNCpi1oHT78L2GcKkJygjlcQLYUkbIEpm41PRUbcqtB1QWqncztKCchgfoX93arGxCrcHcbmmEHVqQ+0ziXPGVz4Cpu5gnyO+Y6CgJ3UKFCkhXjY9Uq5XK5XK5XK5XIaHWdXMDk+bUE53Lr9vtDbwkwqvDiobkaBaUGFNYJyoUIN1K+PTGjnhgkplZhdjJVaga57jhN4dtDuammVKGrtlw7XXuJCcYTW+z0NMjTiXHYJlEQqjAdvSZ8R0nZUDg+JzQ7BTQWCIWVcifpWuUIBRoQJUDQCNHCVGkdMdJymiNk0ddZxi1qFCqB8l+D7rqhlNZy24TH3Y6DsgZHg4ipy2Y3XDNaGQCnNlsJ8vp4Qp4yi4USI8A0fVbw79t1fUqZAhfnQuYWfNcxpRKJVya5XKUSmvQergnF37UGvI7ivwrfmmbdLz9dI6HSASqE2514gTCAUJvyCGh6Do4oPCHQfEZQzr+/WFy2kp1BrkAaLv48jsPQ1KlB4KNRo3KPEUxiVzmI1Gu2TTOpIU/XiHTMOjocFf6TqgkeIfLQtlQqhDQmZHURPSDmVV4prGktymtfxNXmVXf8KnTZT2WEchUSYIKGd0NXvIKYXfSBLjnp96VatuBkq1zjJTKZBymH11f23fpHCU0+v0Vn7vavgSUDPTULgO1MpW5duiYX+18sqO67o3KI9hA+j1XgusV3MqFv0qlOzLN1w9U1WSd0KjwbS3CGyrMdVENVMy3PWNKhFStH0pEYXpEAo0GH0jw/wBFGjVG2Vyap3VtSmVzswU18qUxuU3otxCon9h3HSO6ShoOo9zo0Glf1q35DrcoRptVjVml/pDSdN/FgGNW5cehh30e0PEJtao02kJtVrjb78VX0hhTpuoXKXJauSyZhWN+lAQbGkK3QeEdBVV8JtUEZW6JhPqKwkQuVUJgpjrmz4Pa99DmXbqnt13fekp3cm04C5YRY0JtMAq0K1cXVPD1Wn0UytTqCGFDQpgLsnrdtKNT03dOo4n2gzCsRhplAg7dL2XBDbz++nId0x5I0hSWH+FM9e6qGGymCTnoBzo+QJCY8PEjolU3hodUK4I3tLlUbcERX4c9myZxjqlQNhVHWCQqFRtUSE9p+Td0x14nqC2TKfNquqJrS3CG3VCrcKHmV+Ge3ZNa6YIQaQU3pt7rtXENErJ7im+FntBDSv61b8hodDqdHC7Cf+VkIEPCk0zHpb+UjM6t21Ka1106EJzE5pIlu6Y65s6T11O4hD+PCU3bpgFWhWhWhWhWhWhWhWhDoeYymtvNxT6TXIONEwVcHBFByGcodro8DSvehcAslFkoC3qKjR5KpjOv7uitRFfJQ4WmMwgw0DcCvxrQe4Lnc3+2hpM9BIaJKBNX/SAjoIlBp4ep/B6Ci8ntagLSnOhdyB0jzkecodG4QdGNQ+51o1Gjm3YRx0BublK33XLb6W2vE8dY/lsU1HVuS44VNlggaOYHL8OxpvT6Br5JVBjuHcWu2KmVRO46677W2/apAAYTggMeGpgShVLsIbdRB3ahUHvdQXZKsQEak90dTW2oa1/Wrfkh1HT3pYBsi2RCYY7T53GBKHXCDIMqq59M3NVKu2r1vMKn9rbZAz4HecHocJCp/lutUp7A8KS04XOVTAkKjVa9qqDEppubPVUdAhMGNCZwFy8zqc9ZUyoCiNQNCYyhNQ521c2SjSCY23SbsBARqX1JMJlNzs1NSYXdoKYCq07oyoP2rVELiB2Lh2WsCIkIZC2Ufp5nwHpOyGj+zITj2yuFGC5Xakps++lnZ07ImBKu5lQn7K4OmXE1HdDhdjRw9osBXdSM7hMcHiR0BBFvNqf6TRCK9eGo43hsYTmgZQ266lIVFzq1B0VMhNcHiQjPpNBHvSO+em4E26jSv61utymm4I9J0e+HIElTGlUwF3H2o1JXcVlG5C/2gSemq8W4VF0t6CmEkZ1OURcFWpvZli4fiOZ2u36qxkgIaFsrPW45jz2hTapUop57ggpTcOKfQY9cqwkIM7lzzNjkzLR1AXukrZW3boNA26Y9rKysqVJCNxVKQcoaR99FT6Q1cPpEzo7AQNm6lN4hr3WtUSoGpdmFEGZ6Khgjo4kw1M+ITjAQNRpuKFdpTXB236IofoTqRIhWPIsTWQIQY1u3RDgZQzvoRKLbRgpz6tMd7ZC4euHjPQcbrjuNaG8ulmVw3DzB+0xgaIGp+ujZEodmy5gV49LnMG6p1RUyFVMNVAoIp77U03DrJUe1iMp3MpEmnkKnVBEnqzKIBwVTpcoYRqFu4VOq2pto9NMjobB7tY9ppuVf0r8wNBuFSBbI0PQdH/JNJ+kbj6QuTqVxlS5qbUDuq1DpebRKb+YZCY2FUeQYaqVW/GsQeg4TmyuJp2svHpUqnMaOkslwPSek7KntJ0HluVwKMtUynFDudOkp5juCDwRKEPJTm8t1yfTa/KpYbHS92UHk+lBO/RKlb9TzhMyE776phR7PTUNpBTalzoUJ0RlVQ8NxsuGpBgnoLu6FaaQkZXMvMEJn1o6pB2Uio4R0cQyRlUSYgqJyi2UaQQp2ZapPsLfxzGpdCgI4RcFeFd+jHieLmwqfEGm7l1wqlKmytNM7ocTXouzlqp8Ya3xwqpiXPqp7nP8A3GEKkkNCI5DGO6B99NUbBWohO7VTpcxMohmyqZ7H7qm3GUEU9gdlAOYcbJrrunZNM6fJbJjwKx+urZTOrqWZagXDdSCmkbToXBokocQxxhCtSZidQqlzHAhcTVAhrd0y1oiVITfkF76naR1QCiC3ZNe1ynwnKY0RoBO6d2G4IGROo1dtpVEsIVMQRCDgdSU3J62iManZN26D4+Wu9uyGVFhlVXi1MMKTGNAg1qENfhVCIVN0sEq6x3RUcRgJrJ3QEImFzJ+IVz/8V/tR4HCcJmAnOACGfHU3arQu4K2clOEiExrqTontQzrzKhrGBhfiBMErmMTqrRkLm1HfFqFb1VEJsNqXThTOvEG4wE0QI0Kyo1x48+tC2VajTBQptCj9HUdaEPFX4ynQMHdO/qHD1e14XF1KOzChefi7KrMqNMuQ3lU6L+IMelS4GmxgDgjTDyGehqTOB1RcZ0iUWAoNjZCVxNK+17dwqZuEoIo7aEAq+N0HA5HQ1HQm82hPotc2FRcYh248MaQE5rQNlZVBm7CqlrsVZQY2s+2nsvwchM59MQCm3H5FY9tXE03kfln/AITqHEv9wqf9PA+byU9tHh8AmVwxeYKuPsIVWvwOk+J1MTcgAes6sMhFQq+Fwz7mZ1puknpOyohP7e4JpuEhOMLZMGPEUzbputUP+1DvtQ77UO+1DvtQ77UO+1DvtQ77QJ0mFlVqftqpHmFDuwE647JlO3JVeTlqrOe1oencWHNj2uEqX04VVoITHxTuchWu2VzkGxlyNRoQeX/FcsH5eN5hCojlQfaY6cakwhnq/lWzlOfYJTHioLhrxQ/LKpf1GnAbCHFB2zT/ANJ7q9QQxsf7TKMCHFfhqP8AihTYPSgK1ETui0EQi00ssKbxQ9o1WuGCuGY5zy93gdsr4KBnSdHbK8IOB/VDS3MoeLiGW8Q6Pa7TXj+FU/p93cxch7H9u6bVqvFtRsqq1rT2iCuD42g1vdgo/wBQonYrhqrS92UDKcU1sdJKGMIrm+oTZ3OhcGDKa8O7goLTITHXBFHbV2youLt1st0GavNoTG2jQ/luuVwOyuHiOkA7oUmMf2qT6Cc2puEzIVSqKQVIui93tVy4xK7j7TOGph153TPkE+sBhUw2qbyi1GVnQ+NxLCmmfBV+KY20QnbaVnAVIK4dlonUC13QVuvzGbIuqu3Ch1AT6QBdlEffjdnQ9xhNEKdIh/itTiWjKLhMq8kJof7CYy1bCUKrDsUHX6VKdwhVaYAhU3upGWoVjUA7VVD3ABMovGQVTNT2iJOUGjyOdClzjlSBhXH0nOlU8GSt/AXAISXXHSsCO5q4UEMzrVaeKNg+KfTPA1BUZsmkOEjwG5zrUKLQsBFrKm4TaRpfFNeDjrqfFB0FFw9Ky5CnHtOfy0JdurR1D9JGgn3pseqOji6c1pCDbuII/hTy2yUKQPcrIyq45uwTeFvxCqcOKDLgu+kQ4qhVNT4O/wC1T2k9XsajR9QMGUw811xTRCDvSaS1yKO2pTMOhR0/IzqRKt5eyw7KLLMtTH3dXtShnOtZ7G1gSmrZc6wJ4a5wb+4q9jdyuIqvdFjUwVqm+FACvaxwkqlT/EO7firQ0QNDo5bdZ6CU50fBCt6cIUz0ZGyBlcVUtLQmOkIpm2VxDYMrhat7bTrVEtTTInphQq/wKo1wygPZRa9zeY85THSM+I4U3ajQ7jxBQHCCjwzfSqMfRz6VKuHoqqe2AqVGEBrxhg4VOhiSuY1hDFLVPoINyjM4RfVZ+2U2qHCUHA7dc61PjIQPbKotqVTL8ICNk6ncUGALbrLvpQSg13vpruhsD2geS0BcURVbAX9OrFzOU/cdIzq8e1TfcERdq5k5QOpT3x8Qg95XcVYrQiWhPr5hqbTMy7rMoEtP6WNTlNx4ePndm64dtm6FXn1I9BF0YCc51Q2tVGgAMo0mjK4gc+o2kqnDscIhVeG5OWqlxDhghDiGoPBR1/8AyaFDGj2udWn0uXjCZcHZUKMJvxR21Lpw1CnGQgZ1lE3GOkiU0QNLIMhSt+l2rtk6kHCFRq1KU3bBO/qJfLWNwnVL3C+Vw9NtZ/NGwTWNHxaq42lF0bKtVswfabwdSvUa559qmwUxaEenjXVW28pcJWc/sqb+J38JrLcoiUaftqmp9IXe054C50H4lfiKX2uJbzKgAKY59P5BB4cdK7ZTazqZKpOvYHa0zuOkua3dOrumA1cTUqvH0FSrOYy0K+q7JVKvUnAlDiQPmITXB2Rq+YwmXe0NJRdzDAQEdJ8QQ0Kq8K12WYK5/J/uKlWZXPb0PqBifS5jpKqNjCYzmVZTWfSDYUknCGNIVWn+5qo17nWFPqhm6bVY7Yq9oVSs8ZDVTLqm6mEJ96VDAT3EMhq4eYzoUfvWNSfoKPvoDtZRALpPpQHBPpd0hUxZXDh71KmTlDOrtlTZaOl7YdcgQVK3TWu2KDQFsjUATqxOyaypWymUuWmmQo6Z0O41O/6EanHjd/bMqpNWGNwmUhTbAVb0uFZ96O2VBgdWL/pFPAe2FR2hFrXbhVOGuyx0It4lo9FM4nusdgq5T3T0EwMJrY12KCa4ZavSkKS//SAjQ4ygZRQCqMNwc3pKA6LQrrfkg9p2KyUWyhJOdJhVq3pqHGZghVLHEB2xVMNA7U9rXbhcO4M7ECuInELlVDuYCbRZTVPDwEEdTo5Fs5HgJhAkoDpCOhpMPpPoi4WoNqN9ypfSJcUOMaTCNVjwnBvpcJPLg6sFriOhxvw0plENM76cQy7Co8FZlyqU7hAXDCDn7RARAbkIXbgovcPSFQu9JpWxUpwubCYbcFDpO/iCHRUoiowqmyrSfdTTeLtH5rYTajXiWqo61FsprYyuKqWNxuuEbDJUEPW6iFaDuoazKfXtyEzi6dTC5YuuUK0HcKAERIhNaQI6LftGmHbJtKzZNLv3KZRGI0kIGfA9t2yDHD2tspzalQ/S5YiFywNke3dVW/uaqVUVBo6XiGprI+XhdUaEabqmXFH8mpbKFf8AhNfVd6hQ/wC0RU+09ry3dcqofa5dXZMENARyhLHLfTZTqMImTo59quf/AIoE/Slyuzn9CcoCNAbTB6zsqnxTWXPLlsndzlRbaNOIqOHYzcqizlsDUQnCNlQMjodTY/LgnUz6UwgUFMIffTB2CbT3T6TTuuS30gfXQWewgfR038ZEplNrNhqNNlVfkBqfT7cptIQmUwwyHJ0OESm8K+rUTKPLG8qqdtCjgtcgUdTo7Cn6WeiVcETOyAjx/v0qNuC5JvNw2XD8qp/tGi30uS9vxcnVK7P2yubxL/i1PrcRQ73tTOOpvQrsiVV40VDYxUc6OqNZuVQcOIqGp9aEKqOUbgmvDxKfgKh8AoTsJso5R7coZCIW3S9twwgD9q0/5K0/5K0/5K0/5K0/5K0/5K0/5K0/5IIg+ld96FUTLXBWQ6FYHNgqpQLT2KiXk96EHRw5r7lTMdqnKvaNyjVuwwKyv6cvw9R3zehwVIboU2N2HmcpOxW6/wBeM9xhDWE6kN1Ua6i65iY/mNlDR3blNqF7oCAPQ58LuKua1XvqYam8O0ZdlBoG3XVqvmGJtZw+agFA2mCrhpGph2EDbg6NfNYtPibv5iAUDbg9XtESMo9hwjVO1qpMJMu0K4cl73uPR8HSEDPS8YTKo2cjUaBcqZNY3HoCCnKGyOhHvp3QxgoHKKa7OfLuhod1UaC3uQAAWGp1J3EVobsqY5fbpxAyDoU3dMdIU9JzqZ9KftSTsgwn5IADbykd2pGUabqL5ajxDom1N4+mfkITKjKnwM61+Bo1vUFcXwtbh2byFw/dgJpdwzZerq9dt1NDgQ7+6ZVrOEeC0YK30qCQqbuW6CvkqZiQmPfVzsg0+0NCm7ajeOgmAmsxlWKxWKxWKxWKxDQiRlFn0jRe/wCSFI0KktRgulSE6tTJtByqbAE5gcnB7jYUWhoTW5XLbMo02lDG3kPVanSPGCphD66q7ZVPiOWLSqfFNK/EThuUWVXGamyZEdur3ekJcrQEVWDiRYmttEeAiUGJ7ZEJrjTwV8xKtsPQCCrU50KHek4EG5ybVn2rihUBx17ed4nCut+SlTpKhwMqtXLMQm1WVNlCYNOILrYbuVSYKbA3onKMjZDoK5YugqpRgyFRgtx0A67Betdul7bhCZjCJqegnGrPxTjXbEjCaZHkZOQdKtWxwhPF7CCV+MbaqLnV25EJjQwQFEqCuIBwiS1XpvyC+JnWUTC33R6HFN285JDtag7SUXdq5qPeYhOqfh6ocBhU+JpVfidSARBR4IUaoq09k6hV4qpNTACY0MEBEwq1EVaZYuEe4flP3CJ9IiMlNpuqvLnbKkIEJ1OSoDQg6dY6HT6TZ9pzrQhfML+PENCgij3GUWgpzQRC5DZXI+kGOHtQZlA35/QMk76E9O48Ttk6r3WBXd0JroMdTmk7qnw9M5KHD0m7NQAG2g7Vvo75yFIaE4iFUeQMJrLzlSrlP0o+1attTpCrN7cJuyOdSJQpAJ87NTGwoUJ1Frtwg2rw7u3LUHsqboD6KE9E+l7QM6QoRn1rageoBRKtE9MtrPVXhP3U05/F0skLhOMbUw7dHiG03wVTcanEH6HS4L5BN26Jkr2iJQaWGWpjw7UDRmcor10bdFR0DCpttCP8IaWco428nObO6bnulViIyhUp4A3VPhGsfzXIaDSv6RzhbOtVP5QUZgqm+5sqYRl2yDY0OpPpRKbt4p1jR4wgZGhyqVTmiDuhSA2VMu2KrtnCutMFUH8ym12pObdTkxpUo3G9vyVN/o7ogndWOpmWJp30ehhTpHTVfZCYS8SgEzI8Qd/CDlIX+lEdEaOMaD9A3bGm6NP2htofpbHxVnEDCpsjJ3Vicydk1879W2swqlYBM2T3A4XMZTC542KeXOBLQqLXVG3FbboEeK1ObhML2b7IOaRKub96FwaJK5rqx7NkxlvU6m1yss2TXXdJlNAbq0+j0kSpPk4UbnR4BahRpOfkKtw4c01C5f0qs20s99BKqHCaJCaYdbqfpNbb0ObHc1NcHauda0kqh8AivXVKuVsm4oKdSoVqteNinioQqTeIGXlMfcNHvDBJTOKpuO6vbFyjmD+FymREJ/D4/KMLiRxQHcv6dZZI3W62Og0r+tKjCchMMuEp0jJTn8o93tN7s9B1hONqa1wCuj5edptMHV1JzK1zRhXtVwXEvN0Lg+C//JUQEYGrcm7WFnSrjuGo7HZRejcmXTk+CoJTMYROEBA0hQoUKFChQhoR4CQTCPmnVoiegae0fEDc7KGpygYMdLxIUlQ77T6TnbFN4Rsy/JXLarQrQrGzMKuLm2hcKIZGloRpn0VbUGxQqOHyC5zfa5jUHg46XODRlOrOqOtbsvw4KrNbTCoioRdK7i/87ZMaAMdfciCVy7chB/2p63NnOh2QM9MkKJ8NEWyP50dsrragTOHfWcWu2CqA8HWlipVrwE1wKc8NQb9osBXdRMek8kODwgbhOjup1OchBzqZFyC4sm0NHtMFohFeup2XICOqOotBwg1w9riqJqU91w/BMpiXZKtGg0e0PbaUHng69qpVQ8SFEhNKGlf1rb3ApxwFVph1QXKQiVcpR1c+MNTR7OjhIhM/Jx6TXtdsfK4XIl7Qm8w7px5W+UKbHdyNJqbwrb73Z6KhtbIQ6nNuEJrrcO0IlQt0PCR7W6LvQUwrlcrlcrlcrlcggj1E4VpPtUxa6D5WmSfCegHpuCBBRcFzf4TM9x6W/KdTgIeIMjKYyxxjqLAUG2o5QDhsu5OqQi97/wCFa0DuVMBxTnBgyg01XSVbAgJ9OUybcIHwlBT1PdaEKvpyulNHmJgSqBluh2XFOscCqNYFwP2v6o03AqiLWtJRh2VTDd/epVYmkFRMidPkestkQUDGCrec8O9BBFetSgZRTR99MaTmOuVv1SuN4Q1xeNwuGquZUtcYCouA7ZU5wg/7VwOyretW7hNZBlVTNWEV3Kw/ahyEjdEgK99Q9uyYy3oICLBKDnNTa7XYUoeDfQ6VmTlNP11YJ6hodkwRqB0z05USgIXEcUwVIX4tn2vxbPtfi2fa/Fs+1+LZ9r8Wz7X4tn2vxbPtBDQ6Oe6YYEQ8+1yz+4oCNtHGCgZE/pTlQVb9osC5aAhESri3BTZO6hcsIABWZQ6RqRcI8j3BkT4n1IwFMZKi9CnmSgfpVMnKpubCuCJCNXlnIwgQ4SNS6EDPSUMIdJwg32UGqI87hc0hf09hZTLT6OhXHN7U2pPDXDdpVauziqdvtU+LaKdjsEKhXL2wgH3ScIDTZVDzTYFT4aoz2mthD68BAIgqkIEBNTl66C4NK+Xg99cXO66txw1HAXH0W3XtVDjC0Bv0qXFMLbymkOEhFjSq7KjYtKa6r7aqlWzcKlUD3BBE95WyuWSgnItL3R6QaQMdNso00GwE5U3EGDpPUT0uMJzgMobeM61DZ3Qqb7kSB5IKIeRunf0xjjK/8Uxf+KYv/FMX/imL/wAUxf8AimL/AMUxf+KYhoVJ+uutSnIVI3M8FoRb+jMzKbt4ZWfPxI7JW48BKInZBslAQoQanNLk1iNg3TmAjCMtHdlUHBpgHSCjTndBsdVTtVrh8SgT76Nyn7Qgt+seA4XDgBkj3rxbAWlNbUvsZ7XCf05tGHP3VbhKVb5BObU4GoPpc0VGyqNS5qfXDTARbUq74TWBggdAPgYSHFNKKMrOtUBxyhEK4KfI4+gmtjr2JKsL/kq9BgEwqVPnPuVSkHU+zdUuOfSaGlqbxLn5EKtX2lqHEU0e5Dh2XAjCl9NuU2o5zroUSMoRo99qa+/fxFgKqUjHamvOxQOkqfAVcJhbJ1S1CsD6KL3RgJu3WdY+1bacINHlAUeEeN73Mfaxso16w/Yjxbm7tTeKa/0VzWK8O+KHlk+B2yA+0B1WhZC5jSbZ/QkSIVG5uHdbtkMq1AdMKoy8Qg19H/SD21AmUmtN3QbkD0uFxRNRibLlEJziEa9pyEwjcIgkyU91ogIY8s6cRUtYSFTiwQirlxVafy2ZK4PheSLn7rOnHcMeJZDd1T4LibZlMqV2u5UZKoUeU3+esdUoB03Qg8IkKcKTrC5YBlGFywTKFKJyrHzuog5R0b1AdfGcaOGED5LhZIuecnTj3W04+1wzLUSedDP+VypauTGQq0kAOKBcx3dlqZVbSMD4ppEhV61OIlNfYm1JTXo1gFdeZTPfkewOQluD43bJoEzozbRxXCvL6efBCJIVya9A/qAj4K1UUlSBDc6EA7oADbR/Dib2YKbWHxdg6jxx1kShjwtaCuIljCWlUahcwXKfIH5tOrjbsh1TKjwkSmMLahPrqIUaZXpBESog6ESnMBTW+k+kstifDKJf9IvjdHiaQMErm0Xjdcqmfinc2lncLi5fTuprgeKZWYG+wnGAnuqV8Uf+1w/DCj3H5dXGMIIqhUniqwPHgB6JnATcFXBFAvITZjPVHvocJEJs+0XEekCWmSgZ28derUmymP8AlcRw9jbnZJVF4DQEK0bpz28RVP8ACBg2t3QYAmsgK1cfSuaFTdXLiwZCLfTwmUHNeC12E+LSITHSmK/MBWfSY1AR5eJw2fapVA/xVDDUMBDuUWnSrgLgRFAT4IlQqna2AmiN0BH6UuhEyh4HOtRrPPwahRl97znrIB3RmiZGyFQVMN8pProOE2XFQi0InrhAdy4hvM7VSYWtAKgTPkcwE3K8TB0K21nyn6UIeEqdI6P5W6cJCGkqehx9BAQndxgIABPpMqfIL8PR/wAV+Eo/twhQLf8A8hRoB37lxXBvoHm0/wD9Lhq1bim2VMQmMaxtret7Q4QVwjeW0s8ESjVAMLmtCNW82tTSKbZcqLr8lctNpx7U+kNvBKdPpBqjSF8O5qBDhIRwhxAL4Qz1OdaJKY07lf1EH8OYVA1XRCr0n2yXLgqJAz7TKYbsg3TK4psxKpgU3Qfaq0xauGBaQnQQnC0oPt7gnG7IVOr6KpGUeklcy3dAg7a3D7UhVKlgVRjqoyuXXoZ3VHiJHcg4HwVzsEx1zUSWvxsi/cojinDtXCh1kVDJTRaI8VXMIhDzF5V5V5V5V5V5Vx1HSdCnENVHaEN/A7OEKLmmQmCo3+VzMxHRHX+7oe+51gQEDxEpjQJKtjwT1uYHIY6Co8jnQm5z43bJm3XEaEwmunSJUaEpjsXImpV+OAuU7/JWP/yVn2UaTCuSPRXI/kr8PBkFCiBlxlOPKrfwU37ap6qj47QmNsEeA4TQiAVbbhoVehXdDhlUKvp2CmmUE5oO6DQAtvLEbKbMtT7nCXJ8bqjxwabChxlKYOEarB7RqP8ATVzqp2YhVrjdn/7VJ/PJJ9acQzmUXNVJgABCrQ7/AIVCmZlBiY2Fai3C4iZAT4duncUGC164Wqx2yqd57U9mVCALUJachUHMA3VaoP2lU62bXIvaFzmzCNURhVOe44amcPXd/cKdQt2K7h7QpVKm5TeFA3X4VsygwAQFCcwFOoAq19LPpNeVerukgbqqxw76S/HMI/lU6gpNuqqt/VQ0Ws3VLi694eWpj+YJjxOkdxXy8xR8I0kDdXtPtSCnOjARLWovESNAhgeCNSrvtDOdThTPSNTsqTCHXO6I6oynqnhug6o6J0E6Fb+Eqep5wmtNTJ8Mq4KUWl26ph37igD1xoRKm3fRxjVsAlqb1XhF7jsFYT8k+ix4yFTmk6w6EBGYwhtri6fCVy3eimiNAoa4wU3hmtMgq2r+0rkP/cVTZY0jrHXCrOtEp9cPbD8FNjZcqDMIHmti3K4NzqdTl1FCA0dWHDVs7FAzlOcGiSqVR7MObhDueqbY0GtdowuWqtGVTYKTZTGuhPuXdKskKk0zBX4dqrcKXfEwncHUAwVQrcl1lYIEHI6HCUKaGOsiQmOE2lQOkuDRJTeNDnlrkKmFX4KlxfdsV/45v7jKpcDRp5AQY0aDPgGmW7LnNHywgZ8hKkqVKko7dLazThNvJyuX/kVcxuFWexovCpNBF26gKoLDcETIQb78l0bp9S5B4tlCq5/xagD+7TltmVaiw+ipKvOyh4TS47hQjgrcYXe3fKDwevZDKLh6QEDqPjGh8DwYwryN0Hgq4IvTqpAkJgLjJ8MaRqAhhAz4XtuEKn9FRo42iSmNI7j7RlvcEHh2hK/ECYGUL3HOygDbVxhVGF7ZG6Y65tykavqtpiXFfi3VDFMKi1zR37+MbajQJyG3UTHgmFmq+70qw9EKkXTCc2RKAsOU/L2uCYZGv9TplwBC/p1U/wBpxTyb4KqMJMuXDODnIdNf1pVLWtkoU7oBTKKqUF+HlCiAuGAvfGlYVD/bTaj2Yq/9qrRZXGU6pV4Ix6VKoKrA8eV9Nr902aZhx6HENElcXxLqoimjUuFtRq59UmwOXBcTZ2VDlNcHbdA8cA7oADbywoUaO26YCks7S5cse0KbRsE5ocIVImhWtPxOjhIgqnLHcs+In6Vv3pWzsqlRwAVOiBnyESmiNdtSYUoFO2Taf2gANugIz5igfBKfWaFPtXQqbnOTKM/NQFCNx2Kj7QEeJ2MpuSmtDdurfoez21CSNHNu31sCe51P+UbqmfSYWkdqBnoOdHgsde1cxm6Lnu+KcHeyhwtxlyZTbT28jdRoFMyvXUcnwVz2oUsYVVhG5QDVtsiZ+QT2H0qVdzcQqdcPQyuJYHsyqDix4KAnKr4Y6EA+n3hUanNYHdNf1o/8yoG/SBDSJQePSlXfwiU08lxn2i6Wy1NJO63Qp2GWFVGsq9tUI8PX4XuomR9KhXFds+/DCmN9XtvwF3U98p/FsamVmPEgrjrqlKRsqVWm0QncQKhtpBVnkzcMrhuG/EMlyipwb4LjCq8XVDgaTyVw/HXACq2CgQRI/XO26Qn0xUbBTahou5T9ajAUwx2HR2X49dbp0c+figIGhT8JnDj5O/SO+0/ZU5hPyQPCWl2EBGPFKcg6EDOkdBTsFMptaJhVM7LkFwkKgLBY4Kc6FN8Q0f8AEqg67PiJ6j2qNDRgyxOYRnYplRw+YU9JXCgFkoq335h1VCAcISR9LmFhAVwC/EUziU19+2ykKPaN/ooXe+m4Kp3EBTAVWo1FzSm17cO2RN/wP/Cph43CNJfhBMpo5YyU4veIamcPGCuR9Fcj0mcJ/wC0IcOaPwcmNqn96HNbvlc1/oJvOO64hjzEOTm1bcFcMA5t3tVhIH+1YbbmJlf05c0IlzjhVYIyhVNB2NlS4kVJlBwOlcOLZaqNcOwU6lm9m6DnH0pU+vCc41gIsa4QU0AixydwDWu5lDB//S4x5pv2hyF1YwFw1E0gGlV6LamCqXANY6VYEKVmaaDvv9a7bpGlek2qIKtr0haMp/OAmQq1TiYJJhU316lP7Tq/Ef2zgrh33skIut36HXekAfZTg+3t3U8S1sPbKY4u+bYUyjUaFzqjnQGokYLl+IZNp8IM+KEWqzQCOgjpjxESgE6UBKaI6inZT3G2FTpT3O0qjEptRXBEOKAjy0oY8t/QxqUaQ9JsswUOio61q4QW0gP0DH5t96bJt5QCql57KaDbRCqNn0mQO0iFCdw7H/JMYGC1qhR0xmUVgKTfLQiys/dDhHe0OFVXhcSFbaMKmQ0ZKD2kYXNYo5m+2kaklqeLhIVIvFSChrX9IuDd1zmtqdpwj3LhnWywpz7TMKnVbUGNHCRBTm21YVADKLGncJ9OGm0rmVPRXNdHeFw/E34OtJ0uzv4DUuMMQEdL8dyBnZVaFOuIqBU+Hp0sNC401GUr6e4XD8Q2u2UzVwkQmmUT6GjWR+pc710hZOhKqN7rjuuTebnoMazZVqQqsLVwYDaQb7RQno26Kgu7WprAwQE8PLobsnttqNVjauCgx1P47Jrw7qPlcbRKLjUfa046Sh+gdsggEOg6YKstQOjk5shUja1XIZ8tWneJG6pOub+leqW0a1Hhidc5qp7Y1OyHWNXPDUGVXuu2CdTbvK5r2fynve+OxNqwMoPLviqbLAiqjo9oG8QucAYfhShqRjoJhbhWgKDuhUEwVcf2ruRDj7TaYlQgxszHVC3wUcbKmIE6DTiWh0SrQuI4ch91NcEKuz9lWo3DCp8VUB5b0Kbi64YVv8q1VqAfkbqlTLJnSq4u7GKxtP5FOmphowm0SzIVKsHYOnEMN9zVQrvmKinpc41O1iY0MEDr+D/4OpyEx7hxkf8AaG2ryGhUn1K9S5mAP/2pjfwj9F+7pBQMooYMlM7pKe8MElO4p7/7YVJlc5eVw1YGoaaqF49L8U1mH4V76gloQZVO5TLmdr+h747Qm41qCajUAG6VGT3DdUnXtz+ja0Nnrzf53bIN8BA3W40AIVR3pOrg9qpVYlqo1BUCHjhTG6PdhM7HkdBdJgKPKXQmySuIbUa4OplNqVf3NTasHZc+nMEo1WtEyjxxc7tblNq8Wcqg4jtqb6nwvrNZj2he5BitCDQNa8coyqEWCEE5VmBxyqLQxxTwKuAhRqU/hsm1vTk14dsihkI75KlGUAZk9BEGVarY8Z2Q71LmJjw8SNCq3rSEyA4aVaTH7hX1KP8AITeLpuwcK5XhFwROMIvt7WqyTlMbCtT6Bm5ibxFva8aFodgqTR/0gZEjQvaPau5mAmtDRA8FRt7Ux9w1rcOfxjKjRvvq5Q7iqkT2JrQwWt0j6QP31jQfoP3dIT3imJKq8VUutIhTUcO0JofbGydw13zMqnQbTRKpsdSquq+kaoIlUSKlUu+td06kf2OhF1SnvlVeJaxshUAX9xQEa8QcJtRlUSCrp20Ic03NTXhymN07jaLcTKDnOEgJ34ik64G4KjWbWEjy2912kiYWNQcpuTKeTsEMDxzmNH4CCjwDWtMS1N7nqr+S+ftUZaZamPu28j89qFK3Yo08zKBKLwBKHMf/AAEBHVPhAhVMp2TaEQiwFPoAiAFToAesq1FoKL+Se7Zb7aTBz0ynOjZRJicplJrMjqCqs5rCw+1wb4HLduEE4rBCq9tcD0UBiAgiE6l7YqZecEIgxCY23rcJEJjrh5DO2toRZOyDXD2qvrW0OcFzLcOW6ITqLHbhcS08O2+mYVHiK1dl0Bc57PkE+u92BsqdOQgLcFAa16ZNQEJjpwdHEDdOrFgiknVarpuTKDqbL5VCvOHeK2186/u1e653LCa0MEDoKGOofojuOkCp9ptIAyd1VY2pEhWjVzg0SV8lC41j2Hs2XD1Wt7Ux4Kc9rdyvxDNpW6cQ0SVyObNQJl4GGoVP8hGjq7QYXEVHOhoG6PC1Le1y4UzTtO4UKPpcS4AT7Qo1OI/vOVOgyn8Rq+gQ7mU903iRdZUwfMWgqwIU3t2KcKwHahUqAdzU3iWgRKo1DVfPrrBnolTnKkFV34hMOPGUGwrADK4mneFw7jTdHpXAbIHQlBHClEpu2tSrYMJmTdrdGAg0HdOYfRTTO/lJfuMprw5c1t1ko/JMb9r2h01mXthUK/JdyqiZUa/LSsaEwJTajqglifVswWpjgRNqY81ahjYIPazA3UPq74C26zSaTcN0awYM7psvEqYGVXa6o8WJvMA2R5ky0IXe9JhDw2dyyNJRcB4Ce4DqretQbnABctsJ3NoOmnsqdZtTZFcd/aK4D4J7ZTqftMCgq8NwVM6PqBiaT70rPDQqdCGz9rktlPGIC/DB26tfTOMhB09UaObdhRUZtlc6PkuYC8aGq2YCpstyd/1pcAvlkLuXcu5dyCLx6QGpMIN+9CYCGclcVwnNdNLdUuAsHc5NpsbsE5ocIKawNFoTqDXbprGjEKNKzLdjAVOxuGKo0FwJ0/dhSnVWt3VIc5959K0aXNV7ZidKtFtUQVRrch/JqH/Snw+1PXxnCNrgRum0OK4fDcqjxQf2vwegvaE5xITRqdLZQYFXw3ComW+ONXQrea/sQ4b7TQ5m6NQKXHZBpAUnYoKENHmNkwXZKiNHFAQiFzI3V43QIO3kLfYRP+S4jhm1hI3Cp1HFvfum7KOov/aEGNCNMAyAn0Wu2Ct4hgtanMrveA5yYwU22tQyZXEVOXTLlQp8tgCgeEKuy+sMql8YXFVHMdAXCG4T0kThAFu6nwRPRCAt63OF4CDpdqNK3rQm8w1U2hpEaESn0Bu1cyoz5hcZXY6nAX9OdgjRwlTZvo9uUA5vxVSsWYhXvJmEytIyE6oP2lc3m1Q3S3M9BHvq36XUmO3CFHOThABogeZwkQmUywzdOk+V9Nz34KAjA6W1XP7UxoGhRPoIN9nWs/8AaFcQ3Kos/eeoHuOozlcsDITuZUw3CaH+ynNtEhNeHiQi0KiWlvb0FgKNMt+BX4gtxUCr0WcTlUzW4XfLUHmoJpqvVq8MQ7cKlXp1vgel77RhM7hPVOky7SpRbV/2n1X8P89k7jmgSqXOqjOyZRDEQmuzGpQ1riWrh/j0kZ0KAgI7dLxdhMYGCBra0rZb6bZTXhyGjxLuipxTKboK30IB3RoNKax9PZB335N18UYL0HN26nScBNpNbnoOVXpQQ4BA4hCAq3eWt/nyUzfVJTNiVWaHHK4ZoEwj0e9AbTnwSh1T0ZXLzKth06DQk/SrO2wsu30b8h0O/lcXTY42pt/CmdwuErmtdI0LQUHcrB2TsjCasIgt+KAn5Li8bLhmXHK7gh0nKyg6dI6D0ESFEeEuzGkayjjdXCJUk7IgnCGN/FAQ36eQWdwKo1bwpgIG89BQpCbjuquXBvWcPB0cYCAgJ7sppQqQ+EDKnl1o+9KPZUczqLQU6l9J7XRCaIC4loqMIVGhLjBgoVbIbU30q1rcM3Xc5Qqjng3U0x14npOXJxIGE0QNXAOEFUeDa11zkNY96x0VfiuFMyOmc6x0kwJTfs9DHToRaU5zmlNqXIsDkx5m1ykIGTrVfY0lBn7nJtZ1IR6VKoHtkdBhNPgmFEosPoqH/aAPso4Kge01sdEz11dkHu9BcsHdcpkbIEtNp8Mp7rRKoO3P2m4EJ7L8qmLRHT+5EF2FGIUW9Eq4J9QNCaX1v4C5TRkKXs3ymuDttCYQdJUKUOg4QlBAaVvWrfkOgiVUAL0KbXjKqUrPgU11Vn8pvED9+FhwTWQoA0KrVHNVKk6oZKZSDdIjrcPfgHjcYEptIDuO6DpwiYC3yVjSNC2Nk0ynj2h55TqVRrrmJoJGVHUIc8nwHAQaTl2lQSUxUWXTU+iqbwQuIa4vbU9DStTu7m7hUavME6joZ3ydOLaHuzsv6dTJrSfSqND8OQa+bGOwuQG/FNf6ct1bKh3D5bsmPD23DUlAEZTJdk9DjAV0+Or8CuCddJ6R4Pkegq/lVJUynCU5qFODKaolFsqCDK3RIaJRc6o5Cl9qpBwEwxkFM4o+1+JavxTUKzKmAUBHW91uAsjqG8dHyMdclxhBoHQRKHbg9T67Ke5Qr1Kp7GoCoq1OpUbDVQqWmxwgoZWwQ6X4IKCLoT3hGpBCkjKBcuXmSnUwUykHHv6AxzX9qtVo1tBUQg71pf6QGZKGg0r+tW/IdLg65AKEWhFgIgotdRy3ZNrB2FcpTzATWc892yAAwPE44wh/PVv5CZdbpXNvcN1TqB2SVM7L2h0ARlAyimn78wvVrj8kKh4c5+KBDhI6aldzpZSH/KYajBshxGYeIXPYuY0+1cOiVOlZ8K+1hK4aW0FwrbWoi4Qqbv2H1oXCjWj766BlunGVWsx7XA0rGXHcrinhlOSqI7BoQgbTBQOYT2giFRJovLDtqBG+jeh/xVJsDxlUBbI8TsZQynuI7QhjoKrzUdDE1jwJJTXPG+U5E/wg4hMcCpWDsvinONR8elAaExhdkr8Ow7pvB0m7BctowE6l7Ca37XKZMwtup1drTCAfU7ym/wA9RMFOuPxTeaT3LuTBA6iYQ6iA7BU8shp0fUtMNElF9YfStq1PkYCZSYzYa3QuLLYDxuqXEC3K5zSFTfd0vP0nud/pH+SnVP2sCZRkdyNPEKnhurBknoAz1kSriBlNb1V/WrdxqdHj2E13S6m1yJc10RhXuGHIuNTtCYwMHXCBI3U6MI1noHk4buuqfZVR7xhoQ4cHL8oNA2T5BEKrgKi+XaTCGdI0IQn35Ro5oRd+Ed/6oEOyNeJeQ21u5TWBggaEA7o0mOwQhw1NpkJ1JpQeWYeuY1OqBolMrXCU3KLoCr1hKLiaSpv7bPpUhDdKva4P04hkw4elSfe2ek1Gj2uGc1wMFHC4wX8S1gTBa2FxDTUc1qpiGAKVcEe5VH2CVTrCoq1Mv2VGs6mbKic8NT6rmwYwmuDxI6ah9ICB43GBKpvLHIPDukoavIjKa9sIAOfd01HF7rfSp0g0pwygMLdHQhBmMptJrTcFVLgN00R7U3KnUDseCel8OdCbCOyDvR1lZT2yEwyJ8IE5Op6eOY5zQWpjZCAA2Ue+mwvTKLGbBPZ9Li21Lu1U6tWg7vCpcQ14QIRMLfdQja7DlWbGGpga0dqbpsdRh2oMnxDHQFCr+tW/IdRb11AHiCqLCHEo3el3fSkKdAZ6CJ2Tw6N0wH0hd70sCB9eYpjQztHQdk+HAJlMNOFsrfZ8UqwHKGPC6FxbOcyAuDrVmMttlNrG2XNK/EAmGCU2kS6+p4SJCebaloTTAXEVYFoTqGLgqcVi1irQ2qIVFwLcaVKo+KpO9FFwVA2uc0aucGiSjdW2wFVqUeFEuyVQZXqvNcdsqrxruHxVbn/9LhOJY2oalQp/FuLZYP8AtUKVU/mVTlPfW4fO4VKqKzbhpCfTDt0KPcCjC4lssgbrhTzm3lEAoUbTjpc2XDxynuDuwI0WuC5Dm/FNqEYeFeFcFfCLpwELllQSuW3ZNogYCew0u5qp1m1ETpXqWCAqbMSU0IDMo/WjgijUl1qYgq5urBiIgJje1Gk0rlj7QEdc9FQYlGIlDZOYHbqS3CjooiJboPPVE0yFRcSM9OyAJTRoURIyuLDQLlVbVqG8YCoV6tJ2VQqczuVKpzXE+tKxxaFRpctGjmQgQwZQeDtpJBVwKOjtlS+PiiVPpCVlAlSSq041Dg0iUMo6k6ORx0FFMEDo5Y9K1FkZCD/vorfFU2wNThA3HZf78389JAURsrnD0mvPsIFT0GVto4wrenKysrKFOF+YnvAPegx7/mqbbZ0ezGEDInS778HFHk1k7jA1qoh1b8xyi/tK4ek1r3EItBUK0JrQ3ZVQC2SqfDsZlVaRJvZumVge12CnvDBJXEcc2U2vxPEGGBcPwkVL65koVXVJFMKvwRrt7zlN4ZreGgDK/p7HV3B7/wBukXBWcmpIU/aJhOefQWwwmtJy5WAo3cLUuHxKZUbUEtKc24QhLMHboG8+N1MOMlAAbauUSMp1P2FYPkmzPT+5OiMp3c4ymUzWxKh3Db1FTq1OINxGyc+sPi0J1fiW7MQ46wTWbCbx1Aibl+JpW3XYR47h9rk5wiQuF/Nl6p6cL+c91ZVB2pgtaB5Zk4TXXIBZUo7jpu7iEEPME8+kBHRk7ICEFMIH6RJXpFocIKfSp8O4hxVjTlplU5+PpMuaIYFbWduYUGkbhlMeHiRq6n7arxMHRw9hCoCFzrfmEazCO0prgFIPi99Nf1oUKYLgSgwg4K7lJ96OaCrI9pzdAp1sCGOk6RKtI2V5G4Qe0qoQSAr5Q0P6EYMak+lBQlSQpQPSToCt/EFUqNptuKotLn31DnSZf/GjhITKrqTrH6FEEbK/q/qcWfymOh2VRrXhUxlcMCG56TsqZlo04wtZSLym8U6oe5U+CqOdzThMoEDuKbQptMgaua4CGqlTFJsDTZGHKZ7UQ5uQm5EphnGrm3K08NWuG2vxOj/oeN2ybgZ6HpuQiE3fqO6d8SqpIdlUajaNI1SuH4B9U8ysmUwwQFCtCqsa/tTv6fSdmEzhabBEJ3DMd6VT+nT8HQm8PxPDfDIQ/qPKxVYVW/qd7S2mxf09tvDtVZ8QPEX/AEiU1ydcdlT2hOLm8QProqOtMdJpexumGenfwyFKuJdB8BblNCK9IkASUbuJeXelZhU8v1K+LoCaZHR/bP8ACL/pOYH9w3Te4KvQyHsTTIyseMaDSv61b8h0GRsrlcCjrHTt4CEaWZTad+XLkRsmhzd0Veg8L34yhqVKn6TsZTXXyg1FsoyEwfynJrrhrIVwRQ28XOYjT5gmqmsbILU8VTUAHxQEI6OYHbpuyhQE6kHJpdTw7ZA6yhT5z+YVxPAsqCRuiH0XWqjXLgWjdUPhnqD20brk2vWrH8tsBcTQrVGFu64H+nPpv5lbr+B/jWJVRsC5u4QyJTRBhNw89DmB4gqibDyjo4SE104Tn/QQIdt4AnENyUJeZcgOghN7TpEG5B89LsKq6xhKP5mSuB4cvN79hssqHK3+VaFA6XOARosqdzghRaJXCE97foriwS3Co1OYyfBN2FbCtyhrUpio2Ex9sMfvq+Ac9G+gEHyzJjVzA4QVTLh2u36xoV6XEO5rxRH/ACmsAEJwtVFvdPQ/tqB6kDuG3QXAYKCc32Fc4HtCc+tM2qlVZU2RW6JLUDPWdk0z0VvWrfkOg6ESiI0J6xjHgKbt0EAq1EQcKf0BEoAjDkxlmNSFZBQfBtKETjQoiUG/a2RlXn6Q8FgQaKh/hHU6FAieggFFpZ8Ux92hNxsCtAULjKeZXD0odKov/bqarQm1A9TCYGv7yPGBGOhnxTu0gp0A3dNem49zNwmVXVGyArXO3KFFigjZVLhkBUeJbU7Tv4HRUd/pBsdThKBlP2THAu6XbKs3mGw7Kpw1ObGBMaGNtHW9wancQ+bGtymUzHcUGAaObWbluVSq214cIuVYYXCXZ6i4DdSXoNjSFCsUaOpg5UkI1IMJ7ZGVSr8lxpvTKrKnxKInz1H2CU3bPQ9geqchvceoIv8ApVrjmVU4Z1XMrhuH5Q0qtkKi0jfoOUKdpxsgI1tCiFzOY61ur6LX59oVLTa9YVqjwDoretW/IdB1d4SJQPo9Z6xpH6EfXQWyiP8AJWtGUEUcJq96Qi8hCoD1irOITGhohHoKNUBOZzPkvzKf8plUPx71KLfa2CoDtnXiBJVJkBcr2mu9O0LQVymqpQ7cFNpwojxe+gduFUNwwnQAJU9DjATcDQa1uFk3s3VPublWkbK6N1cEXNC5zQjV5vbTKYwNHWUf4TybVRm8dBW5lTc8wmMDcqVOpqNG5XMadl3FBmZPVXZcJTabKjZCDLRAQMbqdMrLkGDxE8vdUmz3lQqjBNxXCsskakx5D10/kdBrMLKAVYXdqpttaQVI0OequSGJvFNa3AVTjqJbkql/VCXWH/tO4sD4iU3mVtzATGBggdBaHYK5cfEoXDdQftW/z1ETtp3elLvaDwVW9K7RvyCHSUfFEofq7rj0uZcmtI96SNXQzKZVadlcgUUOi0KI6hCHQTCMuQaBtq+kHoVYMOUzo97WDuKbW5+BsqbbGxrUEuTG40qU7wqdUg2v1qfAoHx7O6KzZaqbBaqxGGppP10PEtTTIlHpjM6OQKIAynwRhMbyan8IeAhVFAZkplQHZTo5FwAVAEAlyn6Ra8oUydyiwFWhWgprQ3bwEKgQC5o6SfXTv11G3tITCLRlGqwe0a0u+KDmnLSt9IlDHQOuRt1FVHWVL2lB4IkLmtGE6taJQ/qLPYVPjqLjCbWpu2KFcPNrFcHOKDQQrY6IQPo6Ehu64qtdgLkk7lN4NjjuqvAhrZC4J5GHJhBHgNNzM0yqdUuw8QfE6k1y4hrgBBTzVb6TK/2qbwSNNx0nxnqHncPpNdd0VDAVPbrdcEBATXH2g4FFoO6AA0PltlWkfFc2Da9boz6UdRCq8PImngoceGdlXBTqn4yrA+IXKLDKovvYDrEnodTDla9g7cplUOwjkQqRlg0HRKlSpUp/2hq/4lUnS1Vj+Y0dVMQOsqYdCKDjMKmyN1VZlMPrwvZK4httIlcLa9yAjSoYTWiFH6Cqx9OoKzUziWnDsIEHbQmEM58oYxxMhCmxuwVoTqDHCExpZhAg9J6ZReBupLlaFkLmtm1EwsnR9MVBBVfgqrBJOFTYbQKeAncK1/yQ4OmFV4Ome6E3hqVsQqn9OYfiYQptottAVJpEyEz49Vd2FSe5xiU8fae43YVO2oMJ9GMhNLqnYU6nyjgKnU9Jr/BuqjnUhMSm1Gu20bJ36+JOyp3uz6QDTum0gHC1HmAYCFXMHU6HybdBP6EszITc61qkYTHT4B2r+R+iCCewPEOQphp8JIaJKFJtU3EJlBtN0NCt9JhFB8ejqOqpRuNw3V5AhyofAdLipUoKVKcUD0Ecp0+l/dqz1DwESi0tTGwJ0cJWyDnIGfBUaXNgI8K4mVScdjoe4/oiLz/pPYHJ/Bua69hRq1qQHtCuXZK/EFCDnyM+R6CgFChR9KSEHg9Ryo1qsuCpXtpj2ggpT28wQdukiMhNMoKoLSmfHpeVUyie7sRcThwQNNrjKZWFOpI2TuJFYwMJtMAghNAO6qUActVNwAzv4uUJkIl7MOVIQ3r4vYJuyf29wVKoHEaVGh7VzrcBB12p/QQnN+k0lTqOuUOmUTCLpcSqZgL1+qGhTseHi33EU/XtMgjtVT05VmlxEFcse0x45hp+EiUOIFNxpRsgKz8nC5bwN8rmgGHK8HZEolXIOVylOcg9B0q4J/MPxT6ZLe4ptBtAyOqe7w1bg2Ahtq4SoCjw7JxhXg+eT7Q1ZtqQEKbU7h2nZUpa6w+RuCeiVdCDwVzWD2vxFM4CNZivkghDOtwUyh0O2QEatdcT1bqkLcFBVdkz49JEpzS50NQpWiAi1PYhScdgvwZfkpnDuYZQGgeDUJTXz4q3xVJwtQ6uIzGtPseAt0WewnSHQExxuzqes4QcrlPWdIQ/hPDgJlDrdl3U4ewqhNRloQ4d0ZTG2YQOP1Q0KH2iIyFM9JQqNc0uCpfnC4qpdQ7mJxLqchNqPdhwTj2yixxqCoPSBnwEqiWueahQM6OaHbo0GI8P9FOpVfWV+Hqeyu9m6FZNct1TA6CJVVstwqbr2z0EwEAYz4W5Nx85aCjTajTa4QmuLTa7WfIDoTCp/GdXfFNMjSs2e5u4TK7/ANwTKjam3iP9yFOtoCiRC5QXKaE2ixuwVjR6UBARjS1Wo9JXpUmW5T5jCY2wRrOoT53CZVBTyCE349N/M7WJrAwQNSAd0NarnB3aqj4amUqtWS1A1qOKgTOLacFNeHCQh1kXCFRbb2rbQdFXMa2AlN0ezMq1NUo9EqVcfpPfhMeHbaWoGeiCmmdSZMaVPXWXgId2UNJQzrCIUIBR0kx+kGjtk0zpUdYZQM7dFZ1rJVapyeHj7VEQwLiaPMaubX4c52XCVzWecKtV5R/hNILQQjNLuGy366r7GErh+HIamY6y2U/gwTIXIe3ZNaSNk0EIdIbZq99uAm4OfC7ATdv0BaHHKLuU6PScA4JjiO13mAgzoehyptc3fQtT2xsoLHh7fFu+fEdG9G2pMJzn7tCFQP2TDIW5jwblQq2yo/A67Ks9zjYxUmctsdDimOuC5jZhEudgJrA1cVQLPzGnCoCKY0NNrtwvw5pmaapv9HwNJmVdoNJTjKqetW7hbOUp2hCAR6Y0cJCbSDTIXcNk2u12DvpcFcCnVADlNqtjdU3XidWtgknR2Qht0lPYCmCwYQd96Qhq6pCBkKOmUXQpvP6QaO2QbaiSiJ3VgG2riGiSvxruIfY3AXC3cQZqZhDA0dSa5Cm2hlvtVODvzOVQJY2x/pPy1U3XNB66rmuqWH0m7I48VV1mQmOvOes3N2XMBHarPZViGNWmSelwnCAj9AEQDugyNk5k7JpkeGepzgI8BamthPqvonOQmVBUEjre6E0QIWymfAd+txLchNrNfsh3ZRKc2X3NRBc60bICOoaMQTgoga1qvoLhhPeegqrUtXDE1nnOFAG2tZvN/LVF9n5Z9dD2ByFQ03BrtvBYCZXcNkHDSFCretQQHBFt26sTnvo/LIXOYfac9z9sJsxnxBOph5yhSM5K5TUKLRsg1v0jTYfSDQw46XOx1kShjQaDXiCWNloyqJlqOFzY3T+KHpc6o7DRlCm87lcp8yHIUz+5cuPigZx+jClPEthDHaegqV/UKnL4dyoSMhcJSsZ0RcbtIynUx6QeaWKn/fUTAkqlTkl5W2gwY8LHF9Q3BQGu8FWjPczBVPiHtdZW0MlNBG+jMT0tcHZ0nqe8N8IflZQOY0ce/CAPs6yp+lBWU670u8LJ6CQMlVXdwCaZHQ+QO1DPRVZc1HmUalzVRrCs2R1A3VdbfYWRugZ6puPgrC3uamVmuwCnVIeG/ac21uFTaPl1hO2TNkE4wgZGlV7h2sGVT4f91RQNJjXisL+njLj0UzcZXFB3NBaqFScHotBVhGxTSffRKCGjmXJzqtNU6gqDSt61p9zkNCJ3T6AGQg+4wgEfEB1ESoITdHGE2HOURsg7qIQUdEoid0WewrXO3K5DEKTBsOp2HA/owi0OVVrohpVWvUp/3AqdUPHQ97WCXFcdxP4h3LZsuE4aHQttdz0ug4QdbhcxqLwnV2NTXXCQq5zAVM41fjPgJQACeGkQ5XVqWHZCY8HHUP5VWmKjYKa0sEBOrWfIJrw8SNHYOOhxgSmiBqe3KGdlMJr7tKjbhCpzbnrKBMoE/S7iu5cqDKL3N3Ca4O6rUOms6wZTGE5KaICdVIyEx94nVuMdH8JzFV/IqtcPaa4O26CmMhxd0gKeioYGEMDwPmubG7I8C6g4VKRQr/nS/wBL8WxzcJogR4YQVeYwqE2GUTCp57ih0HGyN/oLuNXuVAbnWoYaqQhq4ileLgqIx1ESnPfTG0o/1Omz5DKY8VGhzVUfaqTrul1GDc1NdKretHmBhUckdDhIQpBNPpHwnwjDkTCc41HWsTWhggaFvtT1SAeiZ2QEeMiVJagf0I04hrnNlm6ZWbWHLrDKDOXcKblT42tRxWyue6qybrVWc1n/AOQkpxM3PKoHn1ITTy69n2NSY6TlATUyiE4J5jCp8OHZcuXANqxUeCN00anIhAupjKBnpcYCGyOEBOSqsBhlcI79p6pjWJXKtMtKkjdEghNcHDGj6rafyKFdj8FNrU3G0HXdSWPLScLmNq9rdkHN+1M6DHXHXaCibN017XbeJ4BGVCf8VGFTdY//AHqVvqd504kSAVSlpQIO2tyZt1EShtnV/Sd9S67ZUxCJRa2v8hhQAICp+2+AIIboiVUrto9pTanO22U+ujZD70rgQqIAZjUi9yjRs03kFDqOVxNBj9lw/E/hW2VNlV4ptQS1cNBZI6QnUwdlXdUpROUyq1+yySmfIdB0c36Qn34T8vDUxlTe2VSba3oPU5lyBRMKb9kxgZgeZ2yGf0A0qf1Gkx1oyjxnDcQe7CrVGOqdhQbUPwdKe1zDDk0wqHBurm56HC02ZCY0OdzNfkeoN96RKsBUfSmEaZZX5g2KHS4ewuZG6nUobLdbIfmd3pVqf727prrmg9W2kKNICe0bNVtVm5lVjR+VSQVRoc7vX4QzcDlA1xglNBUD21cXSrz2ZVLg+IezufCbwFMDuJKLqTTbTJTeYBlcy3Lgg8PEtUeawMMqB4XmBoU4YTyWuwmOubOj8NlUjLdTpWHaqYwieW7QmcI/SGPE/bUaOyFd6Ctn5J2AmbI95X8aF3KrAnY+AaBzy+Goyq9VjDDkOIZENVBtrZPW4XCFSHLNulQnZqaI1eJCb0l30nAu3VWaeYQY2qACFU4Y0XTC4I/lodVb0nUhuE0gJh7h1uMIGetxhMDpucp6N13KdKrvSFItPacdJ63YOEGk5d1Hbx/H9AE9stIVMW4VFrKocP5VX+nluW7KkyrTN1NFz6rfzGSiRSNwGPpUv6hw4ZuncdTfgFcLUbywJ0OTCAjpOTGjiQuaT6Q0dVazfQXU90OmqYGFTNzZRMI5QbGr8m1ARo08s2lSFcPF70cxrxBTGtaMLuOyIe0ygq1f9rN13MZbuVkq0vEEqlQZS+IUwncQ1UqYi6Mq36WVnyESrnNMFDwPbe4BbI7ynbKQ9xamNtbGjsqnjt6XtuCuqt2CIfVw5XOpm0oNKjPSf4Tf56fegk5KapUJgiRpUPatgqfx1/qA/Lu+lTJcwE9eyucUyGiEUQDun02uEeGpgymuuC/ch0MOY6N1arAn0gQrOWYOytcRa9cN2tLSgpQ6K3rR9IOVGWPh2p6HhWwZ63fXgIlNwYRbLp6nfwmyclDpnOoHSPGTYFzj6aU7iCz5NKbxTXekKoKvCuHhGgp2vwuEZd3fyU90C37XKDRhEBmVWpmoboTODD/Sr0jTIY32qdQ0H9yovc7LXyEBA6SgO46FDStWDBhUmzkrYIulUyQYPQUcqntAUdG2Smj2dXNDt18cItBUGnsmuuEjqCJhDTbdUnsFVzUFUMNTq09uyphhqSz0jWYzDcpz6xBIaqTKju55RAVarTa3uK4Xh7/zH/8AA6XT6TS6c+Mke1c4HsCbVBwemSEDK5n55CBlPmMIiWwqnY6QFSfzGzq/tcHdUacZ6KfXJ7aasNNwMoGR0++kmEM9I3Oj8wE4gYTBDdeNE0Sm/EdRerpUwmPBRcroCL5daNLoV+o1c1NFiBk9P7ig8jdXdEq5VmcwQE3ZcRUFA8xUqgqCQghoNK3rUZIXxU6Tq7T353iRhDyEwmjwDfxufNW1BEwqjnRLFSrvfktQM6ZVUOI7UzjBdZVEFA9IQXFNcX9uxTHCkyVQcav5jkXoB9c/wm0WgZTmtp7KiwV+ILz6VXhWP9J1M0HdqZxDv3BNrtJhBwPRT96HOh2VGmZJciwj4qnMZUJw6CY3R701vLQ1mEzJk9LxOhEoNs2Ujq3dq8SuIpSyRuEOKdRZdVTuNqVR8YTajGuLnyuGoNAvd7QbHxChFx9J9Rz3ctu//wClS/p/fzKhQx1RCBnxEFxgINDdkWgqwtPapqfSyN0akelzwPmIQr03YlctzqhLSm1C3DgmmdOJbAJCo8Q5pA1f8Uw3NB6XVGtXPf8A4rjHVHCXJvEVMBvpXVGmSqVer9Sm8Q0mHYW+tSTsm3RnUuDclN/MN3V70kDJVPIvPtDXiG30yFwLiadjtx0vci7KCBCIHyCuVaSd0x1v+01zhui72nVQm8Q4YTakqVOhUJuDHTSEOdKcAQoIwr3NXOQfKuW6fIyEytK4hjarYK4N0Sz6QQQ1retW/IaGn7XxUKdD4JW/hZ7HSeu3Mofo3EBylbohClbtoNalBlUQUL+AOcs//i/8nRX/AJOiv/J0V/5OignfFcVhokKw8Q+fSiE/5wuHZDdK/wASuEZa0u+0SqomCmbIsa7cI8K4OupvhH8QzJyqXECrhXJh6HZ7VA0hAxgp0QmvDhOhcAoLsu1m3RwlQmsLKk+unfptjIRqNHyQcDsoJTmxkJv3oXWqpXIdhN4q/tIX5bn9+69YVZjXN2VGqHDQhx2XIc8fmO/6QptbgBMPW4XCE1lpx4C5CStuuEaLD6QpG424Tm1LSN02oaGHpnFtd6VRzHhOAPxTPiJ0cJEKl8Y1JDclOaanuAqdNrNk4SFWoc51qp8MKW6r0iRK4bZOaF8Su8LmOG4Qg5QyFtpVbcMJjpweoboqpSvy5BsY6HbKrxFPhKlzvaH9T4c+0ysyp8SpCc5GsC6FzJOFzwE2r6TTOE6AokJrQMpqgLlMPpWNCgaWqCE3+dCO5Doc1wqYTxUhUmv/AHKHBFt2FDmLnEDuTKgdsgVWbHcEHyIV76dVU33BAoFDSt61buNAnCeg9ZUT4myHmekOBMdR8RQ8UPdVP0gI0nOto6CA4QVyKX+K5FL/ABXIpf4rkUv8UNK2CqdO0J0ZlNbcmCBpULq9Sxu3vQhVpaMKmZE9BpNmYyrCCgdSfSAjoIlOaSmUhblGk1CmGmQgZ6LI+KBnSPG5gfgprQ0QNDqSAnkvcQE6kJEp9JtuUG8tsAyni/LSuH4NxdcTAQZYMIGdCptf/tA9HvQqSh0XK4LJ8lPTiKZc3CYywXuCpNpPbLUaDfS5dRvxKNau3BaruKdsF+Kq8O6KrU3jKbk7imUxLl+KNd2NlT20rcSyk3dcI3s5n3oWyg7kvhTKqnGkKYyNk1ESvjA0hD66ajf3BNatz0nZVmfiWXJvBl265NSmcJorNNwKdX4j9y5ziqb3SiTGVRMwmH2iZTZtTWz+gDu4hEaQrVaqtLmAhyeHUT2pvFGF+KDhBTXk/FPm6Vw57ZTXIIaVvWrdx0ExvqesoffijPQ4Xe8J5F0U90NvPUEhUvjHioEulx0rXYhUgdz5AgqjQ4ZU24CdUc7AEKkyNKzrWErhv7QJ96u2TCWY9dVSRkJtVpVWsKYwqQMXO36p36NukiUDjKanYCa6cHy/zrGUWNvEo7JzgAuH4Z1R3MOyafWgwdHJ5xKBU9BMK6dcolG47IM+/M0b6uYHS1U76JhP4lzM2pnHUnfLCa4PEt0IDsFVv6bSflmCuLpVaD4fsuGYanwT654dtrt0aXEVPcBDgaU3PyqThSeaP/WtZsqjUgWlFtwRqW07k252XJ22p6GnoqSRAUQI6uIBeOW1NYAwBBmUabEWkHtaqgcf2ocM2y6MqnwdMZIT6LSNkaMGU2VuqQ7SgPIcGUNWbk9b6AcFU4QhfhjdhNoVA5NY9pkqmY32TCDkJrk3St61buOgiU6WqfaOekYx5HODU4uDC5UXl7biiYElc01TFPZGm6IBQYKYlNGNcohNGhMKetyZjw1DDCSuHr07d0eIpj2n8TTVKq14wp8YXc1VOKh0EIOa/LVCAjSs01qgZ699BQzhZB6XCcJtMEZRp8oyU3boB03x0EIdNRk5lCYwian0vzydkHVQ/wDM2W/jcJCbtnTmnmFqqkMipOyqcYI7MprTUy8aFsqCiCUXFqv0HaYQ1n6UdM5/QNJkg6v7SE98LmTsiLxkKjxPIeWv2VOqyr8DrUpMrNteFSoO4RzrBM7Khwji/m1tD9LjKJeA9m4XD1OYyVvsqvYwwqVA23P3QyEKYlOMK8XhmsdBmcaPd+0Jgcd1/OmyBUqVUqBjC5UqtzA77RqHYpvEMo4TKzKmyc8NEqo6o4fSptt7ShoWyniAmBUx2nrnr20JgSqZjHhfw7X5G6DHUj3J3xUNQYR8VTcZgpmlb1q3cIaHQ5QMY6iiSU13o+Lir3VWhuwQyFSbYLQqsVXCkFim3C7yE4Q3uKZXa4IuLsAJrbRCPQc9ZKuEoutMrmewhVCDwhrcFeFxH5jC1NpVmDtVPjnDBVN34v8A4TGcnBTY8YTnBokprG1ZJCq8K+nmiU+vxNH+4FQ4plVkhN4lslh3XBy5he730FHtOE7o2QzlDBT23BCaf+kHBwkdDjAQ6Y6and2hNECEZQTmhwgpgs7fG4whWafaADU97bxci5taWMVDh2cOIHU9twQkhDuCe4tEoFXQoJ3QEdJMqPHKyo0hOwZ14hxbTLh6XbWZKstHamSR3LiWyDCoVbXtIHQDOoznR1Gzupqm+4YT2XDKY17DHpNyNP3JgaXXaR1PMCUBKdgIaFSipVVvNbYm8DZIacJnDtbvlctp9I8HTOU2gG7mU4NfUA+kQhnXiBgJjMJghvWUPA7ITRDkOspmUWzgosgwn0pTArREqngxpW9at3HU5sqI6ChnRyHgdsmQTAOykJs1XGDhMYxhwii4BW3/ACRaAbtXGEJ99Bw/qKttynBxdlMMYVtyscqYtKLkbnLIKDQrE3/Eo8LRflzU+n+G/sM3VSvxO3LVLi3UjbWELnMiZQqNOoUKFChQguI/tFUhDAiq4BGUaVMU3EDK4rhxQEgrg6ratER0Ep5yFH2qbpkaubfhARrC/tmfSBnbWu6AB9+DZSp+kGxlBTr7UIs+lbU+1VbVjsOUzmUxLzKBnSrWZS+RTOIpu9pzw1GmHfJGkx24VXh6gH5TlxArhw5uFw9gYAxHKH11OaQbghnZGZthNqWu5ftNHvrhOk9rVBCv/wAvM4SEw+jo4XCFRa6iTdsi5qL8YVS6q4sC4bhG0G5ydSYEpogawh/Oh7an+9HCQqbrcFXE4CM/aY2B4HCQmlOzjU6EomEzZDQaP2VTs7ghkL4nXidgmiAht4NkDPSUMaM+SHgJNMoOuEjT0sEwoQGdK3rVvyGp1KqPsTHXDXfWM6yEUCpRRwqNzm3n2qVO0FVDy2Fy4R5dTAiEBCeU2Hd0aHZDbSoPa3CBJ0JTyBBQROhMIVA7AWArftWArltDlaoA6ICjQj30QDujwtE/tX4Sl6Cus7Y2Ta7He0HicK5SpUqUFVE0yE34jSrsnklj2hN4Q1mGpU3XC1Tw9az0U2pIQcCnOuNoVoT6QcE1zm9jkw2P/wB6/u6YRpf4pryHWO0d38SG/XhAkqI6d176I0cy7ZWu+1xXCGq8QVS4anSHaFHvo4uhz6ZC4PiuU6xyY8FO+0M9RFhlEy5U2NFQuO6lSrukuJMNQEaVGB4gpj7O1yDg7bySnNnITnPGFDnCHK9oda5Ck1Oog7Kjw7KORv0OJDgOuo0uyEH+jpGhGE3bwkRkIfZUygUToU8ybdAUDq8+lYCITZp49IiU3+dKgDiBp68BEqLT1zhMdc6Sv58DhKZ2Ot0rGBCqusqsPpNMhRpW9at3CGh1KqsFTdNZy8jQ9A0MotPpcxzcFXTp7ThKAgQm7LjnAUHSqLYaNYhHCc7CG2lQ41c+3CDrjAUQqtI700K5HzQLnCQnyG5VKgIudug0N21qEzIQM6lAz0zGFPU6kx/yC5DB8cKpzWRaJXNrf4rm1v8AFc2t/iubW/xQVd0MTdtKmyNXl1sqk+QWJ7COLhU4YcpwG6YGgdurgHDKqVC0hhTCpCb9nrc2crmACSqdPuNQ7nqOjkBHTGgM9dyH31OK4/g3M/NauBq3G17kx8hAmcK8e0HA9DxcITGWphDnFyKAcrD9qHIT7TqgaEA+p8k1tu3QQFaBkLmloymVWvEhTPlcy19yaeoAb9J1eJCbtoc9U5jpKiU9wY2Vw/FscS1SCiYV0pgufd9agoKrUFJtxXDu5jbzvq1HZNOMp4/civXhIWynp2MJtOHknxVG+wmGQqoBYZVSkalKBuuHc6IchpW9at3CGpMIvV0p5TXelcRgdD6gYFTeHDoe2SEQ6+F+5bv0JwhgKo5pcS7YKlNudB/GhROYKpmRo4dw0qVQ3AXKnucmMDBhGVzSTarREJzDw/czb6TPzjd66ajZCYZb0HtMqZ6YjwSpUqVKC42nzKJhUf7Y0fsuN7XXKpxHLcyqNjhVqgqvFRm4VTjGOb2plV1RghUg4O7jq5waE9h4jZU6D2blW4Qz4KrQ5qEn31h4GF/PTKOg6nJjZ7j1wXVP4VSIgriKYo1JYVQ483Sm8RTwB70dSB2worN2MoF/7gn17HQUxwcnmGlNOMIGECUAUE8XNhNon2VB6bQnU1bARVJxIzpPVv0l3ooOh3k96ufyzCaZCuHjOyIcAqlI1Ba4pn9NpglN4ewRKswnF1MgQqWGqJ0lXAbri2uruA9Kgw0xGvvT2quy9L14y3pifIOwp+WqmcJuKhQ0retW7hDQoiU42nuRtOxUD2sek10ZUhSE9z34YmU7U9lnc1NdcNYyiMp2Cqfs6VPjpxFtarA29obaNOtVuFRqQ60oGcpxtyn1XOw1U6ftRhMw3SM6VazQDC4X4dTMEjpgK2FcRupnWeok+kB99IVf+2QgLRGhXH05CoUKvEnljZcPwlPhxhcVwNOo0loyuHqv4ary3J1T9wQqAiVz7jDBK5LnmX9G2ymet2ypEwJU6Qs6wL7ipVw8p70BHWCQITqQd8lxjGUm3QuGowb3LiKZbD6ab/UHzbEJvEP33X4j7am1mOxKLQ7dHhwP7eFxFV7GZCoucoCEIJz5NoTQZ38Rpgp7HtNwTXyhpPhMIODtkDCdVt9Lmz6KLnGJHjLbhlNB2QHkOyjCG+hCtMp55fpNAhOCc60SUzuyVEpvQ0yoREiEMtXroj9Q9l4hCYgqnkSuI/Le184VM3CdK3rVu41OnEUzU+CcyoNwmhyyg23CslctRochDt6JRygI0Jud/CrvdbFNUeCezulAzoOghvPACgAQE7vdCDRqN40qusErvrGSVUpkNhcJ/b6mH8w+C0KFUYXbFMBaYcVcFOh32WUJUKFChQpT397RocJ74CrX8W6ymqNEUG2jXjuDfVqcymncHxNJtwyuHNXiDytvtNaGC0dR63H6QBYMq4FBwVyyhoWymsDF2lcoIU4EAoMeDum40Oybt0lAR18Rx01RRpf9qi21sacf3VBTVMQ1UrnT9J1KVyyzLUe4bph/bWVKvmxyc4NyVxNZlTDSm1IwUyog/C549JhO6ac+R9OchNPjemgAdqP3rxLy2mSPSaZE+CFJByqju3CY+UP0PtRo58brD00IYCZkT0DBQULZev0JQ65g9B+0DaqrWPHcqYFojSt61b8hqU7fRzJTmQi0bphu0HQRKAjoc6CpjdcRxjn/AJfDCf5TOHcSC8q3RhioWq7MJur327pr23J1QTAQEdB3nSoGkdy5kH8pdxd3Kl29vURY+7ywFA8IqH2FxTjTcKrdlRrsrtuYVWqCmJcjSr8QfpqpUm0W2s6Sj/8AGr3HY9MdAIOswvkmlF0qof8AFU7j8kSt+kCOioDuFlXGYhNdbh3kquq1+0YCdRbRrAJtT6X4hrRlMiqOamnmYGyDArVauJp/uaYKpGvUblFgfh2FyHN9yqpEAgKmZQwJQN+CmMzhMYrQPLXdy6khU3h3iqZIaiYUShjGnGyaZA/hNwPBCgFVMutTR9/oJMq+cdDkaQKFOEYATPih0A6OCbt+hKlT1PI9qm8P1LgFuUT+0hcP8I0retW7jV30navT84CotgeJzoGE0OcZRo3GSUOGa34q132oKgrin8gc1U3B4v8AtN1d3OtTWAK3M9JCmcp81NtkxuFai32t+l7bgqYNsH9Nb/7J/DNqD5KpSr8FVmmqM8UA+r/1oeriqQqU1SP5Y8H8rnAp1ZoQeau2yfUFMQmZblcv+VZATTKA8EyjcSrYUIoj7QPLMetHvDBKpVr+t7v2jdBq/qZc17CFRbVK4ii6YulUqMU7SmsgJjcorKfTlUY+C4qnhC5rcqsAWodqp1LDH2nGMhUaspm3UXIVRsUCNJV7ftXBPqwbWqvw76gxum86gYVOuCgZ8FR0PlSCJTXFpMqq51nZuns4o5GAg0PYMz44mqiM+YlS5Sv56PfREZCGoUIIobeY6uMdZwnfmYC5MDtKa91Mw5Agq0e0IGFhyHa7/elb1q3cazlO1flQU0Fp64lBEwsuOr/pRrxVPnM5ao8G9gFroRdWpu+whXZ9o1GgSqcEXdbqlvaN1y5+WkKE4SnvfQfP7Vv0Fwbug47q9XoGf0fKC/DxsVyWtEKi+Dy3ISFPU/8AMdZ68J+tHNDt0Q4/HCfRrU6l8XBU6rXaw2ZW/lKhXOb2hP8AtyqEM7lQ48PEEJnF0n4lGs3ZuUatQftRq1z8Wo1qzBLm/wD7VLuF/wB6cbTDrSftMbani50hUacBWJrYVqqDCBPtOj5DdVeLaRD902o2yU5t+QixWzhZiFTMGHBUXtjBTnholNrNcjUaEKwKdU9NEp7OJdsEzhX71CnUS3YruntQ4d78uKHCsAhM4ZrSrQoTqYKdw6F9MwU15Qep6YCrX8P3jLV+LbVhtP2ncSygyHHKq/1RzzFILhOJrNdD24QM+H/S+Bz5yEFCjoHS0yEDKGg0K9eYqCi+E4ypW+UHKVOkSgSyp/CCey8IF1LBXMBTv8gqDgU5twTX3BVvWrfkNCYTcmUUTATw4iUyRM6HqOpEoM196uqQbRumiN9HhO4Vrt1SoNZoUAdzq6qGmEKrqmGiEymGabK4ad8qqHFhCp3BoBCysp0wqN9Qk1FCtK2Ufow5S92y5f2qnDsfkbqk79h0hOknoYBGPC4ShTd9qNSxlSQUKAZ8Sn06xEAo8O9uQUyYz5SoVaoWHtVWqyp7UXNiEG8vIVVrqrZYIXA1Lm2u3CjRwkQuH4gNeaLtOLP5ZaN1TrOMXthUmymiBrKOVaEaaqUQSuIFrGtCDXQn3JoKfT7cKgy8qrR5bJYmtfUNsqpwlZolq4XiWnscIPS9sptMDwVBIwqbg8KOmvV5TCRuqHFtq/7RqCMp/wDTab38xhhf+Opn5KnwtKl8QgAEUPCcolzAhWaTE+UlCVd6Q1Ok9Aw5R7TTPQV68p1LQUW4U3CQgUWhymN0DrVVMkhSnAXiU/h5y1BlRhgq0td2JvERhyp7FVvWrfkEFVM9oTW2hHOytP7tDqdZUouRf6TXy6OiNSYEqmMTqdlMhDbS7vnQva3BUzsrPtDSUZPQ89qbtq/ZcN8Z0LgN0HNPtD9GNXEzhVQWOFQIlSNa3EspBNrVa+GBNFojxHrI3KHVOY8D32NlMaYl25VUKiXHdPZOypmwwVS7apKBnXjabhXuC4SrzaeUCSTO6qCwXOXDQR4HkXBvtVKN8SuUjQyhw6qU2imVwo/KCqfEpjmtdKFZpMbLiOFbVFw3VPi30agpv28z6TXZGCqZI7Xb9FWq2iJcuIq1ajrgE6pcbrSHIVa1X9y4Ti2vESgZ1KHjtBUeSNIQ1KtlWjocPYTTITUNAivXUfCNQLSQpQKMFTYg5SqndhNwgnfaY64JwkhVGlplPoiqJCogtkFV/WrfkE51qBbuUXfS21OhKHRsimJwQznqd3YQx0VMCQr2tgaFgiEXmjgZVNrqtS9yAjVzrUbie7ZGs0/EphPvQuA3VUyzCaIEa1ptwuGcQLSjnZOp3CCuQEGOYZV4W/jnqCCKjKKE0TB2RqNR5h/hOaXe0zhGjLkABgeM7dRMJpkKm8PG/UMmfBV7nhqNLHaU9mUwNlZGy+XyTmuaZCZxBAyFTqh+nGs/cFwbi0x9qAuMy0Qqbn8O8Lfq2VLveaic9rcFXKUHT6VTuaWqlUFMWKucCPapUy14Kc0OEFBrqfxyqlCnxG+Cvz+D/wDZqY8VG3N8MKdCjTLzKLzT+YR4xl0LmtjC4xp5rXvQ4imAn1nVG3MGE9xJxuvwIqUwfap1X0Py6jyEzjOIbV7DcFR4ttTDhb/v9ZHQesCDoNAivXmjorECHIOBREjCks3TXB4RBacbKcJru6U1yBlAprSPiVFpBJTgCFSjLUTa6VW9azaZKy9BkaFwCNVn2g67ZOUdblSxoNlHiqfAptIQCro3Uk7KwBS6gYiQhrxdfl1AE2sLVy2OyVaAjWY32hVp1e1VGljhHRWMNXDtltxUaT0GfHsrlcrlch08V/aJKaBCKDY/RSo+0690iihTaQIxCZVl1pRqBq/EUzsUCTkqQojZd49rOsrZXBfJ9ye6AnVGyi4ek3iGnD0Q53xMpodsVyJwm8MGnCkMVVj6og7Knw42KPDz7TuHDhsvwVwguXKeztDkxlQibldUbuJV9V3xCDah+RXLf/kuIFQNmcKm1oHaq4HNBKqNdS7mnCZXkLmfwhdMqvad1Re5x5Sax7TJKkaV7mOvCp1G1AuWaRlmyBd9KVM+HfOsBPYCJRYys2HiV+Edw+aGR9KvUtcWt2XC0XV6oVNsC0qvwzKu64fhBS2RptOCgw08N2QcDjX/AGh/9FOYQQ0K9eMGeurT5jbUPyjBTagXaUMFF0qoHD4prvSZgZRNqZc8p4tGFzrmSm8U143XCPFQuT2yFdgNK5jVeE0l7wmthF7Qjc7+Fyx7UaHrcVcFKLj9JmMdE9bu7tQ2QIdtq8YXD1habzlcxn2n8RTb7TWms7mOZ/2ncKXfuTeGgRcuSEKQacJ1NrsEIUWxC/Mpn7CZWa5XfSqPNSoKQTRaIHgPYt+m7WOprh08Ybm2Ibed22E14cJGjjCAefloQ+q//wBRpVZdlNgoiUeGpuyQoRCiEOhrYR3ynEAJt8GwJ1Gq/dfhChww9qtw1plAQQmva3dXt3XNb6QbJuOkRoZ9IOgwqjTuFQLiDPRKdUYPkVQqj4SuKZe1U6l9PO65vLOya8PEjSs29q4P5lEA4K5bPpVwWCWlB9UHBT6xaJiCqFbmDSp8SQqRDhI6y4NElBxqbbdR7DOlXhaNY3PGU1jWbBcbVqcPUa8fFMqNqNuCbq7/ACQKmURcg2B+pc7dN4wOMSgZ262tIeSgggivX6OrSFQZVJhBhXQnOJKDwuYCUKLeZcg2DIWCrowFYDunUxEBP4eJVJ7qTpCbxLHtmVxFQsb2prqibWzaQg43CEG3e02mG56XdRMJ9QbIMG5WGhFwIwgSXDoAjqc701RCqyGyFQd+aY21r1OW3G6rcO+m7mVMqjQ4d7Q9rd01jW7Drc+xW1Hb4X4Zm5XIb6KDH03ycprg7wVDOEMBOLv2ocxTG6vH7VarUOuE0yNCn1M2hVAZk7IbauPWduio/Frd0ym8GXlOYG5aYQrVBiJRc8vuc1c4DdG6pj0gA0QNKhACme9qZWacHdEoanou+kRcoA2UFqbUDlLvQXci0n2msAUINDdh1EIiUfpAQI6LBMpzA4QU6g9hNioh5YOYuIpOab6e6pcS6sIIVKk5plWq0I0+W+9qbUkwtlUDqxxsuxiLHVNwg00chU6geNHNfTcSxcPWLh+Zv0khuSoNYz6Qxjq3VPBLTrxE8skL+luLiR66K9UUmyVwwqnvdsfSuHhH6JuZVXhWVFQ4V1J8zhCfCEQvX6RohyLQ5O4Z3pFpp7hU6jXYCK2TGlziUynGvFCO5MZzFSptpt7lxDQYQa1qjMoYIXNaz5IPa7IOh0KOdZ1cJCaZKdWl9jd0yn/kns+k2mfaAjrmEXXbJp+kNtGMazbSYVLuJqvXEQ9q/ptaC6gemdXtkJjpTj9IN+9HM9hNM9BIG65zTsr8ItDkGQh2p1QNV5q7JrA0eK4/SZUjcIV6bsSuI4ltJkhfiqj/AOy1TxTu0qm+4Qd9T4TWzazKDXHdWK0KI14m2WShtrXAIVK1jEaXOMoNq0v5CbXb7QIKOEdk3dZUFNEKNQMwrVHjcYyrScq8s+SDgRPTCEIp9FpMgZXPqU/mJTOJpvwFd/ClpUAZCeZGU592AqdNNCslGk6llip17zbGj6bXoVCw2v0JA3RqtCjm77eGoLSKiBnXg+HNGtUxjWq+xtxXD0DVPNq/8a5GynqP6Nuh0uDd014dt0DQIIr0joR6QPo/oLczqROCn8JBupqnWPxfhF4OyYwAIabLiPzNlSo8umqsmAqzTgJrZCMBMyRK3XKZuAntcMsTK8mHImFuin1WM3Qrh2Ah/KmdCYQNsuVB1xmENCUM9MgKZ2VoUDQGdRlVBc21WdtqrUi3ZPZY9tRqGrnegtuhg/MJHTVkZCY4uOdSe6ChTT2oANCdUAVR7n/BCm9x70zaB1SpUqVKa1AZTqYKqcPOwTaQGQrU5gKbVh3LfoUD66J0c4k2hBoqf6TWtYIb18ZTL2XN3CoVBUbI0uTsuCo/NzSv50IB3T2FncxMucMpzS5ARgdbsdyBnI8ZW7tbQjTnYpocN+hzfYTaomDpEp1Cm70uJqVOEIsKFSs4SQE6pUAwEHvqGHoUsJqjVtNzapIQNwnSq5sQ5VeIqx2LvqwCix3D7KlVD8e/CciFTFuNW64rn+B0kKf1Dfkc6lFqDSNkHVAmvBx0DDoQRR2QU/S3CNwAjQEHbwjxVqXNJCh/D1JblUeLpVcbFAzto91ypswnxConnVLlxJtIOluZKE3CFDvtF4ahVY7Yqrw4ebhunMD/AJLkNGyNIe8rls+kynYdlE76uko0vpNY5hlB+bdW7aDWOl+0hAv9hSfpVKkYG6ZeRLkGvHte+5VmfS4erewaOdCbc5BsdEdL3k9rAhezL8Lmt+1z2BB8+kah/wAU+s8ekatX2rj7C4czOEQpsOt3RChQoQCHVxVIuEt3VDi2lsP9IODhIRI0q1BTElfmHMI1s2lhV4aLoVKXsvd7XMxDAmscXXP8HLDDcxVOIbsE1pI3UBqayo6qXt2UvHpDmg/wsozCB9eIMjAQnbSVcJhb9bT3EeAmFF+6rUWubEKlUq0HQ7LUyo2oJbp/UtwuHE0wns7VZ9poRCFQbauq5tCB+9KxvNi5AAhU6bQ6U9txQ4YTcd0L2HOQpnqjRzLvamowfa5w9qm8OJhXAbov5ghia0MED9aXgLIM9EK1DCLc6DSJQVSpGAmOBblXBTOpzrM+Vya6dQfziFUp98plBrmwVy6nD/2ymcS6p2OEJrU0QuIyLQqDBTVf0hnZOcGiSm1jcIanVapw1iNHiHH5QhwTd3HKAtEDU9YEakfSDsZQ2X+0BpPgcYCA9akSnUj6KeHUHXNVOsHtkJo9lQjhOqgIGegmFzB6R7vkr20xhSK/ahwzPaFNrdhq5uVYFaFUqCj6TeJa5EXIG0wdIURt5rhUwFY2IXLaMQqnD3fEJ34lUaL6lT80yETATRC4rvLaX2gIEKB4hTlznSm5CrksYSqPw6bZCHbv4T99BaChjra8XFMMz1ExugOYZO2paCnUS3NNc8t/uBcfVa8i1cG6aYRynNTHQYOhYm3qrXdsAmPe0yQubjIT6obsVwjubULjoGx0RHTK36IlOos3hMoAfMz53NmM6ys+M7KnSN9xPihXOZumuDshH+Fy53RpxsmtjqycJojrnriV3+k6rUmAEecx4qJ8PAcEzAThKbTufKt+karmDIymU/3O3VslcQ0mIKLSfabSAy7KbuOs+KJUQEM+Q7ymjprNwqL+W4gptYFGoAqnEk4YFSpA9zsnUmEHItLt0AAq7rGlyoMuF5QHTE6FObejTACpvswdkYcMK1/pDbXOyysrKygRqdXN5iawM26HNuTadlbZHOg7q5P0PHVda1Uf7ZcmbQqkFmVREMCPQE7ZMMYPgccIZ6dumChTtMpotOsqT9K4/SAJy7qMHBVek2o7tVCu7hjY9U+KbUdaNHMuTakdr07dBEArubgIge1xM3QFwtPEqSN+ohZCBB0joPQ5s+IOk46JUokDdF0LKIJQ8VqGg8Bg4QpBbFWqMdRMbqZGEDdvumunzA6PEhWYwg3+VUpOeclNFQbFNdUjIRJJyEDOAgIVb1q3cIdR6Lu63wNEDxXBokp1RA9TjKdwpqOQ4AAzchwrBvlWgYQbYcKdKxKpj3oXwMpzi/AVPDdJhTKyo++kiU5uFR+PTY+ZlWn7Vp+1aftWn7UBARqTC/31FPMOTS8+sLksRpj0muJw7fwyuKqWthU/iGhNVXu7UOke0GyZKLZQ+ui4K8KpWDE1jn9z1y4+CvLcOQOhdCaZ3RU9J/hZ0jwvGJTQCZRoNqIcNyu9m6FSsNwmV2uwcFPaHBBn2oGj9sKpUfMKjw/tyawN2RHgju6z5KknATabafxQIdkJzoQH2hpCOVBamoiDKH6Q3JpcE0BxlEpz4XMV6lE4wg+VujSj4lOc4fIIQ8T4jI2Vw1iNANbUBGgzlAQ6dK3rVu4Q6j0R3akPGybrsh4XG0Sv7xH0EaU5RpyEx0jqiDPQ5yYbk4wEB7cg9uwRqW4BVOqamAmMAQChQPBlGU15YYKGeipVbTx7X4g/4r8Qf8V+IP8AivxB/wAUNThDJnqlZfuojoc2VI26ZVTimNwEx9apmICh4XEUqpN4yqNUOGEzZbvlDp/edHPARflB5utQJCFxGUKYCfTnIVKm35e9XCQqTXDEq1QBpAVoWQgZ0vnZARrPhdkJodOU0KFaE6m126l1HB2TaodsrlKqut2VKjd3u6dunZEye39G03EnSo/lvwmvELLkzfpHbocbeUdcSiwlcs/aNN32q4cDumXD2ggVKqnl9yY+UNCbCt/DKiVYFah0jQ7ICE370retW7jrPR+/oGhRCHheQe1NbGpaCpjpKae3KuP0nufGAiytWxsmUnMESrJ3K5QKPDMjC5TGCYXCyHulEK2Nk65uQua8bhNrNKuHgq1W0k0PdkFfmD9yZxFQmBlVOKfdy4hUaH7iZK5YXLC5YXLCBCcKm7U0PiXJ10LbqJ9dbmhya/Nh0NRzjFMIvrThcpz/AO6U1jW7BFFXQuIeKdW6mm178NV9pymGeknukJxcTusD5IuNQw0IUfcqoz3qdkwdvQ0dbh7CLpwgI8zpbsmunpNMboF+RC5h9oDnOn0gIEdUKPpTG+jyLcphEaz567rKTnKi2ym0Imo91owm8OxuVCzfHpE2v1LtY0+PS4wgQVHkCCLSfag/a4phLt0Gx7TFsgVV7mFUiQmau/Lyhnwb+KTOFLi6HaDSt61buNTqcmFHR76D96Qj4bgjD3Y6XbgdM+Ey4/wrC2rPSWtKNEIMtXLHpZai9cwe0+u0Yar6j1ymzlMbAT2m4qhRsEqpSDlRlohF6vV6vQcfYQWyPUUB71jPTUpuHEh3pWBbKOgrlcz5IMaNgi17T+Wq7qxbFqocS+l2PCZVa8KVK3+WhDH7p7ZfnZNQ0H1q360JhNznwwh9dEKPFEddZodlUGljV3KT7VwUolDPQW/Sqg/aaHDZZUK0DZAz5nsDxBTdug4RaC/KIX8BBsdW3RurRv1x0jQaEJ1MHdOpNBlcojIRdbumOW4TGANkplRq30LVcafy69+tzwwSUKk7BXVD6QB9oCE8pjrghpW9at+Q6i0Eyj4ZMbLJRDvtQ5Nu9qFdGHIOkwFCtcNlafZRZnCbjp9z0NECPG7aUPCYCfa5EAbLvTWBqa5BgOVCtXawyUajPtc1n2uaz7XMZ9pwlpCYZaEfMdOInBCYZb0lW/fTxRFN0gJ1KsDcVw3FPZhyFQMp3uVGS2XaVWmq60JtMBti5Me1e0IOnbS6N1M7L3pV2Q8UK6UJWVJRkoTqXgGOmdZ6HL3HQQDuuWFaFbZsg4Hoq5cAgIGrjCbJEx59ugqArzsrnD0g8+wp6CivehPpDHTOo0lA6jQIoqFbCqlhw9WNPwKyPkFY6f4VSm0i6MhUOe1vchUd+4KCUWygLDHjuGlo36arTuFw7sFNGNK/rVm40yjK/wB6nxDpqFU8jxHz1BLCFQM0x1nJWyflWXJlOFYiMqcpslWmN1Y77WT2vTqdNWU1ZTVlPRhkY1Op8bsuQxqVBcojS7MKfpZ0rUW1mWlEUmdhMFWRkKkL/l6U1IwhTqO+TkHGj2kYUzrZaZag9p0d2ZCNSR25X4gD54RqNcYCuHjHXC5QTWFvtdyB0LAgwhZ1nSFaPAWyu5q5kfJXAq4XSg65D9GzbOu6hBgCu+1JUodEoq5Ae+qNZ03TQNcphLkEV614igHiUxgat8ICNXNlF5pxcplO2Tak6ufCFz91aAo6I8Dy2ibj7X4ykBuvxLPtVarXRnVmSEND0HqnwxcgI26jPpTG6lR9/oaZtdZGOv8AlOKt9poUaQoEqnA3T3NKpV8wpantaSrArArAt0W2ZahqUVHvw3BZTHXZ8FueivVFJklU6Tj31N05sCVw2dXCQmOIx9dBAdgoG3BTnn6Vgab2qA4ZXK5dWW7IZWP02Qr1M+HbwObK5duQuQCFybfimzsVkK9XBDxnozKlTOycbJTZcJWQrUf5wmCAibc9Ee1cCo8E65RKahoEEEV66LGtw1ABR0FodugwjYq4jdFocg77Qyjv5jhNis+fQXLZ9J3D0z6VXhaYjC5TfSfSeO6mVRqBxE76++g9cdZQ+kPA5lzl3NCo1+bMiPKDmDq7GUDInqJCtnPXMKQu0elVebhCnoGgxjyg3Z1qMuy3dMdcPCcaM/8AkVb/AEFYITxiFQbA1KYbHkO9odpjouExoRbsg542CNSpTNzxhMe14lqONLrTnwOQ8sIaT1ESmmfA7pLQVahgqf0Dmzsi24WuQEDVzZQbGEHg4Kb9aFTKDRGhJQqej4QsFNwhoEEEV66A7uIUakIktX4hoTa0rBXLdOEaE+1TB2nzOqsZ8iqjncQIZsqbBTbaNa3rXlte4ErNP/SvBEhDoPglDoLllEfSHgMyqhgLhWkAz9qPJVZcMIHQiQgOidNvHE5VqtVqtQ8z35sA6atOe5pyh1bIuJ+Kcx3OBJXFl9Uiiz/lUqYptgaVWGUwQ2OhzQ4QU2nGCeiwImwSUw8zu9amlBuYm1Q7tO6j6UKOsoH9OR7CDp8p1j9AcoZ6C1QDumhrToVshsm/ejmSg51PBQeD1bKQE0/WoQQ0K9dDNtDpUqEDATXFyLLzBTWhuB0RBMIGUcIPLkDKHUNIlNAvK9gdFb1q3cIiQi1zXy1CsZyMK9u+rlHW7oqPtCpie49AEdUrJf8AwnC4+d7Ltk2Rv07qPGTCy7qCnyHqOypfEdMrJ3UKe4uVKnZkqZ0Inq4l9sXL8Y1sSq/H0t2HK4f+pc3Dl+LJwxqbTc/NQoCOhzGv3VjhsUJ/crf5QbnqgzKKN3pF0bprwUSg6f0ZHWP0hMJvdnpszcCgftbKdIlOcynhyZVkK7+FKPTaCtumFCAHQENCvWpwqdS4KTrCeQ0KnnPQThM2RZ7au4boCMtRaXO+kBHUJdnT5K0B+E3Oeit61b8golQoCcwO3QdGFd9I+CJPQ/8AMfHiKKp5KKHVlR0znoHhHUSi+7tCY20dQUdB8Eg9B0JAmVTqCk+2cIuXOb9qpxPL3Q/qNP6VPjaLv4XOpxMoV7xd6VGHCVaojoIQM6PqBi4hxrOgLkg/IpvAsdsq/C8rLVwtTGUCOtzQ8QURVp/DKpvv8O6NETITmu9FXVGHuCbXB3QdKn9D7/SuluUDPRVPpN63TsU6WjCDiBlAg7K0KPIUNYIQ6QnL1rXuLbWqiwtbCHRHSTAQ2RdG6kKpUqX/AJbcJvF05h26bXpu2KdVzAEol+wCbT+ynAjIKBfW/wBKE9tmQmEW4USUOit61buOiVUcAqZkKo4NQfOw0LT+0ruRuCDlcEXmdkKgONC6EAFzI3CDgdvBOV/tN/hQo6D1R0+/FCmN0CDpKvClxOyDA3rGh1PTKLwFBO6tCkhNqteYCLoWfelfhucMGCvwppVm83ZBj3ZOEeDplDhaYyncHSD5hO4ak8ZCP9OZfIOFVHbDAqLYGyA6Sq7zOFScXtklVIATHkOkoNa8YTqZpmWlNbzxlCWGIVOoCmu8BEp1V1N0OGPtNeHZCP8ACHXVdATQ6O5BrXekacfFE1Adkypd+lmT1e/ANCrbfihnV9XuwmGetwkIY3QH6HG3UEEEV61uGyb4J0BvOr+1spmydTY/5BfhacZClzDBC7z/AAjTcT8lym+0HHhagb6Om6BNN1hQ1Glb1q35DSSdlH2qptEp1UNyVS5jxLUxrhNx6oVjVCjQiUBB05bfS26JnVtxOFZ99ARwh5ZU+GrGJU5wuZlc3uhOcZwEybQsouITXE+llZWVlAaQshFxHpBwPScKAVGvEU8S1AmQI1JhWS649J7E3KiUwQ4jqeUYmSmlwPZsnG75BXU+WqHE8oZCZUFd2VTbacJrQQqlK03NCY4HA8O4grlQOxOJJtchgdb8uGjjysoOnSq0TemVypn9HCIjZCfanUdc9IwplVnWtTT6TD/9AEEEV61hR0+9C701WP8AtNyMrbVwkQmmMavaHiEyq6k7l1f+9atIVBlUjb2HSq2QhkdBVb0iYQMoGCm92Tq/KNJ1Q9qpUhSbaEf0TkDiU0knKeYCYIHUdCU2f3eMlXZyh/CHTKJO6I5nyThYIChzwuHALzKtGhXvqD1eBujXpj2hxDHbI12Jrs6lXBZ6XZMakwmG4XdVRtwhM20/f1PAhNpF5/hFkbJzU5mVyXlDgjMqnSczdbJ7rRKpPACDp8VbBBQdPXGdKjbmqmYwrZRYQpdlUXGM+ImECrtD4IUKCHQT4G5JQ6XdmQq7DWIhfh/8kz+VP6KUPGEENCjtoevZRKAA20GHdL+3vTc51rUhWbCp1X0RbVC58iQ0p/GxgMKp8bzJBbsmcc23uGVRq87ud6QIQOgRMKq4mMLPsIcY0OLXAhUqtN7oBymbaVK9NmCU514wmQBGh/RQrXJrbURceg/wh5iso4W6YIPUUcqrLIQBfhMYGCAnNkIPxlSnO9Js79XLC5QO6NJiFNgEQoATmg62qIR6qgkQmNDBAVQXQ3wOJYZAQqNKkXdLnBokoDnZ9dBA6A9138LiH4Q4auWyEKtSn8wm8U1ya6fBWYHtVMY6iYQ1cwboaWQg2EDhT0yi5Bx+k+pacoOBUL4oax9LIQMjUGTp+/rNQbIayh0OCAQCjp9x+pCCCKIUJ4dGE0yPE8+gqTiRnp4cEAtPo6TrULtmIy/tYqXCCmbk6gxwXBsdzH36NxjQIqt60iU2lTuGF8BITWudmoqoZTzCqzbdsnUWvEJvMp75QcXbiOsfflfUDBKbMZ6RoP0AQ6SiJRaDumADbQotCAbCnrHT7TttDr/GrnQi97TJGFeCLgpQznwD7UJ2KvQTCN1d9vpbdD3RlXCJQqA7KC/fZFgLbU+gaVUAmQdX0WVBDghSdS2yEx4d1uwE0kbqZ6JRyht0M7cHQ6QgOqNKjA/dNp27JznMEwmVW1dlgIvai7C5o9o1mxgpuROhyE0QNHbg9W6fTBKGBAQM6HUrmmdI6JUouCZ3G79SEENDtqQW5am1Gu8IHtTaZTKl526Pi4q8IRoSS6ETcYQACqcQynumcWXmGtXMtrd2E+pbumVmn2jVaEKxnZNqOutcFW9agwZKBuydCJXFf2ygzM6VqhZsFTq8z9HygHjq9p7rUNvPEprVHUWyrP5QaApITzhB7fa5gVOpch1DoK9oiekp7+XvshUByEPtOKpsh0jYpoLzLtvA7ZDbSqO5rtSYVWqTsqDQ1vQ/Cq1rVwrb2XuPRVpmsbh6VKreOh7JyFSqkmx3gsA2XcEHAojSENS76XL9o08dphc4sNtRc5vrKlxMoePlA5TaX2uSzZctrVa1ctn0m9uOgonuA6y1DQFHWFWc4PDRsm5CJhOrhu6dxWcJr6tR0NC5TvbkKT27OXKH7lbbkJpu/UDGgRXrQmFBcnMxIVGoHieqVKc4q2d05z6LpGya9rtjq9ouBcg0KI2T+LYzC5/tUHh2U41amGiFT4Q3y5NaGbLjJHFByDwWqsBUIZ9qlSZT+KCIDt1xF7Ytym1iB3iEHCJQrGrVAGyaNawlhTHXs0cJThYb2oODttb2+iqvEOpn4YVOqyqJYfK66cII9HtOyQFMJhuz5SmqdB4agkJxBKLwHJtQsfc0plS4IGekdBMJuc6npeeU/OybUD9kx3MeWfSfiExtgjwP9a1DLmt1ql9Q2s2VKgKeTvrPo6O2XEA3QFwYiiNXm1qZ8UL2VSVSfcM9BaCrXDZDoJQ1dT9tXNqU3d2ya4O26CYCGc6uYHiCjT5ZuCpm/wAgHU4SjIQ0cQqYkSshT1HCCjolWhWFuWqwncrkU/pBjRsOpva4hH9MNAgivSKjTdFoUxjpglWE7lWws6OtFRojOmU5l+CueWO5bslRUqiDgKpw1MsgKnQDBCaI1lCi3d26r/8AxhLdlw1S517imOnTCretOJvv5dJcJDIndNe0+9CYVeoxrZJTTXbLmBcLUdWnmbqIWU8TkYK/Fvf2025Q4R9TNZ0qnTbSba0IgFVKLmO5tLdU6zamNj5QnCVaftXVGnIXNj0hxLXlMqg5T6o+KHjcdH4aqRkeEa5JT+Ga4yn8MM4VEctwDgg1re4Jpx0jodl1vgcQ0SU6ieLy/AX4epwk2ZC4XiAw3OQrNqkDxbaExV0qOhuEBa2OghGfSdzPpU57iVTEMGtXMBBV6JDrwqfUW/SqV30txKb/AFOk54YpVSpBTMjoIB3XL5RkbIGdahITeh7bly42QM+L34DlM2TnW7poNZxPpbaWwgeppEx0b+RwlXEbqf0oQ0c4tEhXgoZHURIhAkfJSrgj34HSU0fm3oEHR7xTbc5UGkkvd7Wymej5JrQ0QNHNFTtK4ng7BdSXDfi3ZhMp1CO9yNBhT2lmE4VDsqfD2GScqmwNKtB3VS6kLm5CDC/uqlV6TTTIaE1gARptabwgVKrHmHlj2m0hTENX++itQbVCpVnU38qr/wAHxHrLGO3Cr8KC2aWCqL6tE3VWqjxLKvSXAJmc9MSoP2nt7cqgZ8MqUc6loVVgacJoqKmXM7XK4K4K4K4IBDU/Ken+NCYTu4JmAnuDRJQpBxvcMp4kJhubPiGyrt2KdUFNslM7+8qZPQSgI0rgShocJrZNx0e25sKiT8XdRKeAd1xHDtJlqZ/UGsaG1N0a4e8FNEDqNL/Fc11P5hB7XCQmyclDqPbkIPk+FpknwvdYU9twQECB4i3NyBlFwbui3mb7JojHmOD+jt9nUaBPaCgIGPA77Tcuz1QXGEBCq0bx2mCmDiBu5cRXqiG1GpvFsDcJl9TLk0RpKydkNHOtCpVFLnvgdFf1oTkBN+Q0dntRo2/BPqNaMplR2xaocVb9p1MOVKi1jyRqWhGnPtfmN/lCu3Z2FxdHnMwqfE1eHxWyFzGltwVTiHUxcW4TKjajbm9TSH5CjonVxjCj0qnCtf3NwU2s6l21FzmL8X3Q1AVH5OyDICBAxqeh+QuH+UdLtQnGEDPQUyjLr3aQrQrQrQrQghq75aE6u+0SXbKwblPWwQF3cdDsuHda51I+E4yqZe7JVQEtwnVThzwnVRVFjE0WiOupTDwqRxB0NzjjZDV49odBRcfScwnKLixwbCNBtaRCNI0TEJh7R1kSuWGlAjoPRHgeTsEwWjPSVn2p0dFR1pTGOYd5HT768zDUGRv1e/ERKn1+hBLnY6Aggii5Az1v+JTXi5c1v2uYFeDpdOykDCuGrzcS5O4b8m0bqjVDhHtApzowrR0VGOqHGycAxkqkIb0VvWlTGU3cIJucp5hDeU58OQMo6fCvP31VKQfuuUWfFH/2C4akGNkKo29haqbalOrDDCo1S4RUwdHkASU2qHCQoLt09/IyFTqiq24dLzGyGAm95nV7WvEOTuEfzLGbKjw7KIgals9Z2VH+5HSdTKid1EdFvgGpQTjC2XrR7ZaU3bR2XgKp8eitNPimOHvrhEwsu3QRMCVTtcJhWNL7vDdY5Aym9DtkwyOiFYrAqtEOCpgzbOVWY57Nsqm4Fo0nrfS9tVM+jqeg+Dd3gLZTTjKa2CT1OncLbpKboR0nxkSnVLcRKdXf+1i57wJcxN4gO9IVAVeFPhefQTG2iOgFSpRRaDunNty1Ayh0Ewh35KEErbZGmSZRY72FTaSEGAJ1M7go0ahQBARuhGQ0XL0qgdSqXsCo1C9spjY6QqgmG6jSt60iUzcK4nDUBAhVcZTZlVAalSwJh9KoYTchVad47dwqVUPHW7LrUMBcU5zR2brmVucGfyqjA9lpV9Shg5Tm1KnyTCNtLZMlS+g6f2pjw8SOj5FF0m0LbokBDxFU/wC90+/0I0OhdlAdBTdtIl6f3do6Kw/+RT6iYV6mVfCDlxDvyzKoHtTH3E6F0IOnUauZKb2YTeh2yZKa/MFXdBKLlZNQO+kchOrihUsPtNdPhIlfHdToD0jqHhIh0jyuKAjwN28dF97idCVWqPZ3NCp1HHcIZ1rXt72KjxbKvacHpccJrSMnog+k3O+gTsIHCfUjDclAe/aGN+h1znwNkcBNdH/OhTRd3Hrrg84D0n1Q0K+f2oVDRPfshBEjpdUbTEuVOsHuuIQr0yYlSNa3rVvyC2W6qQmukyqDrq7yqfdWcfSrUy/4ql29h0qAUqof9rfWdW/3TpxC4RnNrX+gnbKj+Ybjo5gKm0wV7RCYTQq2nY67nQRd0sBmPI2mG1y7phf6Q1OhNokod+fCDoU+oGBMb76hpUfY3+Smi2AOjjmOc0FvpUncxgd0k5Qd6UqQj2nCMPaWlNeYsCa79rEHGMhF8ZTqucJnEE4QfKnocJCYeh+WlUfjCe0FG5cwjdc0e0HK5bp7nMKZVlcbSD+76XCvvZPiOVy4X8KED4p8Ltk0yPJbH6RjhMLdQntDu1BhbtoNa/CMrBUq7uGPJ4j/AIKaQ7I1bJMnwXhokpjrxci2U1gbnQokhc2dgofGVSfItO6cJwhS7pRML5qUSgeiVUYHOBcgy1Wp1MHBQLuF/lqa4OEjUkNElUmc781ytCdRY/cLkD7QoVQcOXLdG6qPIhrlOjaoL4ClelxNSFTqBcJACpN7iUVWEC8ekM5XE0+ZTIVFwLepv94nT+pmKS4FllNcQ62mVwbOWy3V0LYZTarXbKu2QqPEkG2oiU+q1gTSHCQvfQ4wFSGJ8j6kVUx4ccdEdTMKrJgdNSpYua5c1y5rlznKFIRVRpDrggQ7pKbsnLki+47odDxKHHUuGJpOTf6jw7jEptRrhIKuBT6gC5wyUKntCuNkKlyBlPxgJjQmgBAK0IUmfStA0hFqIKGgbCGpEiFTa8bJ7ak4KYx1vcoPtFl2Qpe0LnxhyDwdKnYcJ5L24XDVHNdCaZUoeEjxlAZnwnZUpAg9G26a4OyOr2j4dvEdlQa49ztQZ1GOh9NlUWvCZQbS+KqPLBMSmPc7JCa4OGOtxtEotPENEKIC9dUJ7XCsHNTi4CU15cJQaf3aQoVqaVOjpa6Vlw2TTKhQq7ewhcHxfLcaVVMr03/EouAynu5/YzZNbaIHQNOIaDErltVgTmilVBVP7T6lrZVQPrdwVOGsKNM0mNf7CpFOTiIyqTv26Acut/voqVbcDdBtR2XFVKwFcfh8/a/Ft+L+3/arVRxVYMHxXMp0haFzzxTrGNwn1jRPcMJlVlUSwqAo+k5pIXKczLUBIyqrJBlcPWdWYG/S5YiFY+kexDbPRVy1NwPGTAlci4SrTQ7imVg7BUqVcpCLgpRn0ocuW5rt069huTajXCdSbRKBNV0q1Wq1WoIjCBzGhC36SyDvhNEBAe+ms/ltlcZw9/evwRtlcqq3CZz6fwKfWrfuRqOKpucichUj7V0BB2U0pjegeRjrhKjOkSrUW/Sq0A/LkXvpFfiyE/iGvQcYTbgZTDAQKHikbeKUBHiA6HAfJ2ypmaks26h4SqgnxVnWsMKmIbpUdaMJggeAnXlBvwwu8IKQgUND39oVEW9mnrrd9ontQ/0rk5DI0PTH2iz21cwjcLmTsi7utGSmUG8y4ptNn0ncMyZAVM9u2k6jSt614uRUb9JtYQn1+cbGpvaIQoO5glVaYqNgptJrDITwTsuVce4rlj9qDazjvhVKRgObuFSqh40rVwwQEePp0tslOr8RxnY3AVKlS4Rse1xDHcU221cJ/T7pNT0mkhxo0x3SqbAwQE4B4go0jw77m7IGdC4BMh3cpuMBGndui38LU5g2O6aQ4SNA4t+fQc48b7v2rlz89Ci0FBuE69uQoc8SmielyK4hzadQhDieIjtKp8RxYPc2VU4sVBy4gptWnTC/F0v5/wCivxdL+f8Aor8XS/n/AKK/F0v5/wCigiML3q776XAucj1VGc54PoJ7QgxFjfpQ4H4pzHOdDmp3CtwAE3haTNgn0cyFy7FJTRJTGoeTbV2ypiG9UTgqpw4eq3CmMpvDu3Cp0Kg3TWuaIKY4AdyaU1yHhIlSWnPUQgifG58YG6rPdTghDZPqNpiXLvrfwFynF2SrQ2GjWVlEIaTmPA7KaceHinhjRKbXpxuqnFsYCU3jm1HyU14I8BPdHUaTXboUWrlR7Qpj2UGWHCARXrriekwFMqCPBVear+Wzb2msDQnm3bfUVrKlrtIWWoOlA6V/WvEUhUAJ9Jz/AEuG5bPit3JndVP8anWn7GlSiKmfaf8A1Eg8sJ7DxEW5+1Q4NrT8P+0aDz+6EKTQ6/3oZYSYVHhxzTW02TmhyENEIuI3Qh6AEwtjo9twhVL+FfLNk0yJC3Xw/wBaHAlN+z42uJJU6uMJhkIhTCGOl22nEkNqmVToSA5Vq9atVNKjsFwvCcvudurArFYrFZpv05Gji52wTZ3drKlSpXF1+U0fyr4+Ke+4Q9DjGDBTajX5CfUjYIh73gEpu2kJzFUxhU24TR1g9REoaVIiEwyPAQCqnDA5Ymy3DlVhQ04Vrm5Cpu+03xOEhAodTpKa67rGtO88QXnZVGio2ChgZTQOIff6CcYwEWvPtVHBmUKwcJajdU/joGhQM9RKmdlzLTBK5kJtQFB06yi8IvXGsNZoRFeiLlT40vwqfDXZhU+3tch1nuf4t0EV66/fSQnMuT3PYFTcCOp7y+WMTKDqbYlVa3JEwmtuydalJtQQVTFot0gosPpMqFptfpX9a1iXObTb/wAqr/Tw5stXfw7oKocQH/JUH3kmNTr8asfaqcTTpGCcqpXcW7QmUXVa1jQqVIUWWjqktP8AGsJzTEjdMdeJQ7XJxh696vph+6ozSdyj/wAaESmH0nkAZQz4Bo6pm1qaFGpErY6OGZC31GjttOKqjmlMHEvAA2KpUafDttaFd9LuXcu5dy7kAoR6XmCFCduNSdCpVagOJMO2TeCgQXJtJjUaLH7hfg6Yy3CFIU8qiAXl6ODPRVbNSFSb4D4aglUxHgOEMpzA7dWn2nU8ymj7TmgDCpnxvEZCY4l3Q4whp7x4akRuqUEXJzw1pcUxhc2XlMDQIbpf9IM9ndAWnHvUnKb/AD0M3I6SnZwiLRAQa6Tcg6QiyU1rgU18ouKLXFNn2rQnNxhNh4R4Ogf2r8NU4czRMj6VSrxT8ctcPxg+NXBRrM+0HA6hEKmJl2t0FT0g6BFevM7OEG2mChPpTq5pqGPSjlwxpymU7d91E9I3noLZVpYqjgY0cbclUmd1yC42iHCVTpdwVMw6NXEDdXA40e3mOhU+Gp08gZ0DQOsiUBbjoYIlO2lPEw5DorsuEjcKnWD2yd1zJ+IVlRxnZW/5ZRhuWqnVbU8FRxAwmN6nCU0zuimOzHScpxtYj/Ti/uLlTbYwN+vAOg6uHtAyt3SjodCUSh01EDZVARQ+tX5rJo8BUx1ETo7ZMGEOsiUH2GDoUYQh2yITRB8B1cm79G+dQNZlGVOntcQ4tpmFyzbYUGw2Fxj+WwACZKYS9qGE50FNgZ0d61PzTsZQmdJUgP0nMaOdamuD1PoK0I0wU1gCtUKNbQo02PQWtdghfhaP+Kdwpb/aMIVHU2/mBNrMcN014OymVw+xbrVJam8ROAhXHtYcMJtOFYFYE0Qp09eUz6WQsFOpn9ibUOzwgQi4E2hYaEwdxf1Snd/x3V72fMJlRr9ihoVXZkEIZXzqf6TdxpxAlqo08o05MhMdO+lVly5JGxX5oVEPi4qCj5RglP8Aim5Ym4HSxjS4vA096RK4jhnTfTMFUKhqDK7ggZ6HPDRKY0vN7vAfsK6Ux3eUDPQT6Cq7gLvd8UNs+AdZRkbIQ0KfaGyOhTTc/SUNSbnQn0w5NJ2KI9oaNbNWfERKbjHVKqGGyFSK28D2yqTv2nRx7wCqTy2s9p0jxnQSN/ARKcCNk2oZgoGUN01Fs7p22nFEOq02pogI4UaTCJkjUmXxq6p6TO//AEiAqrH0+5myZXzldyrSRamUGNEKI0dsmkh/QTblDoIQd1uoU3bhckD44TnVqbvjhcOZaXaVnQ3Co0+W3KqcOyr/ALRoOPaUKbvSvNMS5c0kSAua4btUOqboBuylevPGlVt4XIH7kKTRssv7HKIwOkujC5d2XIANwNH0Z7m7qm87O30Krek6sGdvtUg4ElybuEFW2VNqiFUbIwm1o7aiuDttafx8buh0xhU73bpwhhVM+ipHRTONB0WwZGjgsItn2jTbEojlvu9JuR4CE/AVSWG4Lh6oqNkIHVuym+tH1oX5V7jsFDoUO+1DvtQ77UO+1DvtDUGdDqUGri6opMyqHEtqNUouhOd2yqLY7tJQOnE1+VgbpgEY0OjlPpAW1PGQphAz07gtVJlgz4nAtdKBVUCQVxFN0ioxUnEjPilF6lAqZQJJjoqVQMJrrhqVb3KkHXZTfap7TofSOFcCA72UEcoaPGEDJQMjRg7itk6pebGrktBygLRATrgJTH8wp9NtQQ4K53DYOQqTf3nfpqCM9BQ7cdLtp8JKb24Uq3M6yQr2lDIgoUwzZBNkoBEL1+hrve0fl7qk8vbLgnODRJTQTly72/yhUExpsslAR0uYH7pzag+DlS4kO7X4cv6lxXLaAzcprX0zcqDy8ZTdwgqmUBA1qUw9dtDf2m1Gv20pYJb1yp1fsmmR0UsSuI+CpgWqOgYefATbujhXRhAFxj0qrMKlgR4XtkKwEQU2k+hxFg9pt3tBHZN7kGBqjwjQ9MJ/8Jwd9qrwor/NM/p9NowhRt9qoyQiXSWQgo0BV4CNF1Wte5UxAjUIpv8AKn80eQhRB6Y8ZEhMPpVfRUy1UTjxOCD2jDlAOxQEe0TCY6N1IRcAiKlU52QYIhf2nY6AMoBHEpghuh+YTnBoLnLhgHVg/wD60KBxoRKrNVCrLc6OeGFOc5/8KnThPEjUYRIG64iqHCEz4jpcJCp5b0wFEbK770OyBQ6pJQVc1BlipOdUHdpeg+dHM9oYW6hz900IIo7dR30/34HVe6xqgBGq2Ybum0iTc/V9MPEFNFRmJnwhcTRbWfCrcJbUa4mVZ6Kb+TUn0U3cIKM6nRwBVWl+5m6ZU9OVPLndJUqUCpUqcKnt0OBpvkbLiXXQ0KnhgnpjPgIlPLgYTRfkoJwkQohXwg6fARKrh7ttwqdQnDk0yn7JogeMeFyITdCPpWfau7rYUfSIT324CYERiU3U4yt0Qnej1R1n9C9kmQnntTQg7lVi0lN28Vai8uuarHA5QGU0FxhR6VgTWAauEoH10BETpMJpyXFcUKlf8tuy4fhjw5DiVMooauiMrhg0ucjhBtxuKjUGROlepZshTc/JKqsOP4TPiOl2yont64VoUJ9IOymGB3KRoTCkzsigDrb3SFarQUxsaOEqEFEIIIo7dThcITZG6HXWqWNwmGozZiLeIq/MwFR4dlIXJpnoO3hq1OUwuVBhtl264odsqoey5qIc8dypHluawnrOjmB26aW0XkE7o8QCYYJQfUd+1NqSMqUSpUoFSpROE1yDtHPDVc542XJqh1xOE3bpcbfC6BJKoZbq4Sg2cq3xOaN03C36J0z1DzwNH1IQAOU0J5hqb0D60LZTf0R8DTmOhwVyc2mXh3i3OdHMViMMym56i2ekOkwqlRtIS4o163E1IpiGqjQsNzlCdlsKi6WoG5DV9QDBVN4V15gdIwdK3LGXoPcTDdkxpJMphkdJ2VPsdHjjSB1uH0gZ8AQRXrrgzI2QcOp77BKYxzzc9bIZyjnCDbXY6JnCyNkDPQNakVXWH0u6hsn1BUaHBCuz4FDZVZLmlu8phkToeg68Q0VawamtDRA0fTD91yXD4uRbVCc5w+QV7jsE2oQYcucEHSpTAU1gVoUDSO2FRNzemZJQ8Dsm1AAecsf9otqDZNeRh/RHgGp8NxQdd0HJXKCDIVSAOn+dRv8AoipU9TngZTXBwkaueIRmFNx22QMifBuv3av+Ke0uCpjCHUDOr3H0mtdGUeGaRBQohmxTWmclQVBVSt+Hqhn2tmoagcwygIQEdJxlFwaJKe1x7igxWlAWmeqqychDzjfpmHIdQQ0KO3VvoWgiEHQYPTE6R9rdONjU0kmOhp0cbe5AzqFKpHudUK4SH3P/AJVVpIwqnEu4eGkIcTSe8Ae04imJKohpILUZp59IG4SOk697qzi1U599VoRpNduq3CmZag17NwmkOTd03pDLXyNThGo4/wCk0Y8Ldyf0Dp9ISN05oeE18drtI8I8TjClynKGD0Do2wh+lKOk5hHqJtVnMMlOokfAplWO1yOQi0JpUAlM7e3wNK96kyiCUzGOoq3RzkzJzru5RrxfD/iCD9Knwz6eQ5MqVWH8zZCvTPtPqAYCaABA0PSX39rE1gBnoc2VSqPY/l1OlzwMIEzBRcAr0DP6E9MaBDQr10Ewh0OaHBNOt2YGu+j23CFaG9ABulSEe4Qm0yzYoHWtxTKRs9rnFxPDgQuGpiky0acXQD4TOCFOpeq4q1PhsuBJa7lu0pbEI9B0rOtbhUaYaER7Q8EJzQ3uAXMadkOoktQcDkJxv2VibqTmNJ6GgjxT1e09l6a0tTmyEwyPEPEVuoUHUoYHQ/aVPtTP6TdGQr8wj8lK2yg5Sp0eJCouI7XaVaV2QhULcFcwFONipkFuE/HcgbhI6nmAmbL2iYRabkGxoR1FHS2U1sat1v5hhqj1o9k4R4RhyqVIM0J+kBGprxOEC6sPoJrQ0QNCQN1dKz6QD/tVmuJbCBd9LuWVXc5rZaqDTbc7dOCgFbKP0wKlBBBFetSt+gmEFYFJbunYC4aXS8qdSYTTPTTnY9M6GoalYu/lcKOdUNVDSt6T8iAhgQrQXtKh3opjrHQ4RodTpVHNqAfSa23TY+Gq8FwprlBpwh11KZm5iZxQuseIOhQJ+tP39J+vAcIeBzocg6dlOj+3uV5+kNSVcrlcrkEPAUSdA6dN9DpPQ36UW/pBoWBP7Mr2pRb7Cu9HUpxhwQnRrBJBTuGP7SrXfF6Zcw9q54d2+03YdRHMctkZOyDY36cqdJClXJz1SdO6GmVGtQ4hNEauxlHQmBKYc505jZiUcqzWYWZz0POR0cQYamCGgImAm1s5GFcCgf0R++kBBBBFevAdXtubCL3FtvtU2WNtCawjc6Z0vIOQpnQ/wu8BfiW7HBVKoKgnp43iG0KZB3K4ahcR/Ko0hTbrxHqFGjRkIJwBEFMimLVhExoVUcWNkKjnOrtkDI8BYCZRbIhGuaJtqD/lMdcJ6pzCq0WVd1RD2Nhy5jftAzto/GUDInoA7i7XbW4Axo8XCFRJiD4KkFypwEXD0g5PD3FXx6Q1jpCGh8BUdBVomVAHQe0ytx+lGjhLYTdlKlEAq63BUolfJ6ygnG0ygZRbJKAtflPoZuCpfHPS5/pNc0KZ6t9up+ybsj2mUOqLjPS7DgEHtJtCid09gIT6zmNgLhqRGXdBdmApt76iNQP+JTdtC9swn9zx0cSHEKk+4ZREoslcj6TLqe6uGk+KdZUHSYUq4IaBBBFHbyDrjWpNphMqU+JFjt1ZV4eoWgyFT/qIvsqCEOKY74ZTq/E7hoCqcfxB7RCcWvInJVNvJ5Zd0Vc51b8hpUJEBEJwRcQoc9C+iqjnVGyFTGENQ6wwUDO3UDdoTOArBEFUzFQ0/rwbJzQ7dCkaRliDvtEXJu2twOAUwQOgu5TojdOfaFTbGTvqMHwWA5KDQFHRaftSRv1j9B7624x+kjoe4MqKQU9pcO1X27rD0JBhyqGGqmVdAUr5CCmtO0pna6FVaCEwhzQmGHW9D32oNuQbGhqNC5rNY66myZsnRC/jx1RJAXLjIV/2iC7/AEnsDm2qk9wPLI6PxP5xajUDsIU2TKMNR4hgTXU62WqmC2rBU68S76TGADQyp6DjxYUxoWysoscUKZ9lBgCtGo0CK9eNxgeNz2s+RVRtCqZa6HLirqZmcpz3uHc2QufUpGGI1qlTDiu5/bTVD+mmA4nKfS5gaxDRxVb1qz5aObcUUWyn0Q5Np8vAR/lcU0te17f+U2Nx02x8UHg9BTAigITidgn8MG9zN1Tfe2eqI6IVqLLe6VzqgMFqqOfWEMciaofYw5Tm8QYMpnFvA725Qqvd6V0n5Li61Wn6/wCVS4mrUcXNbKYONfvhfn0x3OBVOuSO5B7Sp8xEqwsMgqFarVarUEPMUPAM+fbwV6PM7kypb2lCoEYTTCPcqwc3/SY644Q+gnOjZU2uO6qu5eWqpXth6fxILZBXDEPpgqq3EhMeHNuK5jVzEAX7oYRePStc7dBjR4nGFcET9Iy7BTdugZ6yLjciQBJQzka8RLWEtVOvTtGVzWfaqcU0Yp5Kp0DGyPBz+8oUP5RotQZanUmvMo0h6V76XyyE2qxye7GFR/PqEnYeAiRCm0wekmFPlCCCCK9eAoaObccoeLiQ51d3M/4Qot5toVahWGZkJr6tN2UX0OIGRBTqYZkGQuAZStuaUarVw7y5zpQRMJo9lVvWrfkNBsiYXMagbs6OCIBwgbDCBnpeBCpODhjSUJK20cbRKpsjOgAY+PvxHR30oT+Hp1NwqXCCg4wsBOdGSE2CnWtGVTeKsucMJjgB2LmOOy/CuqvuqFMaGCGp5b7TInCM+tJ8hyr7MFc1q5rVzWrmtQ8xT6trb1R4ptQ7jwU2lgg/qK1EO7lTBDUXYVxlXiJQcH7qjSDE0WrCunARY1VqVzYT6MCVw/EGj/pOrMcBB3VWq60Naqbqg9JlW7cIklcu7JTWhu3jLrUXXmEGtAVwCc76VLc6kT1glzo9aVsb7LhSSzXinOqflU0yi3h60VhIKbw9JuzUABt1l5m1q5bnfIr8NT+kaH+JVK6lhwQIPXKJl2UTai55Tb/auA+Suu2XLCtA6R4Aho5evDsg6dBg+LimEViUGTXMfSaBHcvw+S5CnBlcSxv7U2gf2lGk6mLnFUeJfTdJVPiH/UhM78nSv61buFuRrY1bImFVAqbJjYEKRCY6029JVPtJW6HQe4xq9tyaC3dFsqXt32QcHCR1e9NzrUkV4n0g0IgIPa0Kte7JO6AxnZOrUgYTaxfhgXcFJXdVqWtMn/8AioUalN0udPQf4TXXeMgHdWNVjVY1WNQ8J6TsgAWqtwTH5C4ei6k2Ch/P64pmyfTDwjwzgp5ZhwTHtdtpUMNKo0z9prY14rsKZRL0xrGw1WAlYCa3KOEK7G4dhAg7eCdamBKDoEqnUNZ3ahTATmSe1Np/aGOsuhOygTo5ocIKaA0QNKr7GSFTAptzuuObezC4GvzqI+x0zq4Qbgmm4SjJwEGgaFtpkIGdSnPDN1zQdkXfasDlYoDU+sGqDVOUBHUSmu9eAIIJy9eCVvqUDO/h448t14yuHEuvO5Tqoqu5Tf8AlTaqlT9oCo8PcO5DhmsMrim8yKTPaq8AxwTab+FKo8S0iEHhVvWrfkFPdGh1rPc+rZ6TPy5THyVanDCaZHQ4wm3A3HpLswEMdDhITMNyiJTWlhnrcVto4wMKrQvz7XD8Xd2u3VTjqIloOU6sXuhpACY1768g7Lkj9zpQpgfEIWsT6toT/wARXMU1w1EUGW9VWW9wXD1xXbPifhSpUqUEPKU3bQ6cwN3QcHbdO3TnQiUDP6ANt1ewVBBTuHfRzTTKwIysPMBARqSBuq1PmuTm2CFBfVTWlBqmDhAeyi0HdCk0bBPvp5Cp1RURcBo5waJKdxLAm1OZstlM6VDDU53LZCoGRqTHUXALdWhQNAZ0Oj2XuH8J7Lwn0yHR6XDN5VeBseibjCH0NXbKiCG9JLmu/hDQ7JvdhBkItlyJATqwCNV7/iqdODc9DOk9RAnU9A0CCK9fpqjGvYXOVQ2wKW6o0eWJ9qoSDhcM24yUBCdsqLLuIu+tKzA5qpUaZGyPDt9Li+ewgsyjxRb82kJlZr9kw5CkX6HRxgShTG5VoCtQOYUJm0al04amtjT46FAJ9zHgjbqGsLI2UzpKMqbjrVqhiFemcKoy7sad0zgqLRsn8HSOQuEa1jbAhhEqXOPa3/tfhrzdVyU3GPBygx17fBKuBQHs9I0PkKZtq5OYgCNk1zxuEHB23Q0+tCYU6Eoidl3Xfwvjv4h4uI4fmMlcNVdwz8iQqfEUqvxOjjaE+XJrcriHhguK4Vsi4pph1ugbCyUAfZTqoburmPGCm0Aype1OpNf8kKIGxQZHtPphwhMbaNlGpBdunUfpU2uZgpj7kSiMeN9w+KBf7ClOqEnsCtdCAePaj7VQGm4OTXh4nR74GEwOKAjWJ6SYTi+p8RhNqvY6xy5rPtCu0/FXH6XMd6anVqk4CdUqK7+FTaGNACIlMdBtOsxjUoFHfSQN1zaf2g8K4IOBMaBQhp68Z2Q0a6TB6zsqgFkJtIcwkK1VG3GFw7YGleqKTZXD07GydyijhUDI0r+tHcKwvvbhC5rghHRudDoRKJIwqbXSVa/7RFT7TYjHRBbsgZ0InpHU5typ0i3czoUBpCrBjfSdRxcFybhlU+cz5bJ7qkSFNU1Oz2mB4HehGjk82kFA9B1mFKBnpu/hWzugI6h5SrxMIYPQQrUPpBsHojM6F5e7CkK5TOsabeY4ygZ1pG5hQp90J/DMqNU1qG2VTqmucqzSs3mvj0qUNELAQT6jW4XOeP2FF1eps2F+FrO+T0zhGMN3mONlcCv9aDGk+B2cJupbcnUSg93Dug7K+4YTRChEwuaJhCeguAV87K0HLinVYw1fh3VHXPQ4dgQaBtrblBgVoVSuKeEys16LZTXejpErbV38JkaBwe8t+lGsIaDQobeZzJymn763NuEIfl4KNRn2qbLjKaI0pxWqFx9axKZFMxpX9at3CcIymOBRQfzT27au19pusRnpIlAyhuig6ceU6FOptmVUYXNwgyArGhVLudZTVJgb/vTY6FO7mwUx0ierdR0FylzlZ4Rpnx1MiAqNLljPiLfpB5bhylOk4QphqtTRCHSRcMoYHmhG8I1KrtlSL6L4dsUW96CeFSpxkogj4p1Rx7Rugy0JjcyrXXTKdTJ9pjGs8h6i2Ucfo+IZhUawDIKZVBRrNajWfVMDCp0ms21cYVx9KyTJRVZ5aQAN1TphvVGhXLkp7BGFTqenJ2dlkHPRJKghOj2riPS//Je1B6vCBnZDUIIhevO/+EDPRKuIOU+uxvtHuyrZMwqY0r1OWyVQp8tmdz0YJhSWqt61b8gvS5ZJKq8wdp2VIADGrtTum4HQPrpfdEt3TD9o1AN0a7AYC/FbCN0DPkYZnR9QMcJVUvLJCNZtsoVRVHYqVIU8+0RKz7RKvjdXg6DtwmnPRuhjocUB4wVdmFlW+/FCI8MaOAcuWAgcwFZKDQOouA3TiYkKf3BNM+U4Q0c2SixOabcFck3XShzRsg5/0gcyV8kPO113W4SPE7ZOeG4RqZhNPU8XYTeCvySmcCG/uTOHpsyi0EQm4xq4m9NAATtk+pasvchoXQsrK21OhEqsICbsiJ1ORhNY4e097mJouyVCLA7dGif2uTK7mOsrD/lBoPcwruTTOgQRXpR0ExrlAz1Ae05gcgCo0GlRgqvhOpVeHy3IQ/qIHyC4eu2qMFCoLrSg/mV7PrpOMomRKq7DVu40I7pT23BMJp49KQdtHKNBnxPdaJVIGJKOFAKcwOEFMuYbXeS4elLiVWaCoAbkqlwji83fFMY2mIaOlzbgv/UoGUTjKo1A5ylF30oJ36XIpu3jCIuWW6Rb+kKNyDiN00AZVwCNUK9XKU9xAQfKID91Y5vxKvIdkKBuPEZCkaQohR9oDW3QmFCaIx+gaMaESu8FDQr+PFWeGDKYwude5coTKc2O5NIOR0lNEY6HvCYnn0FAaJcrmuG6qVrQYKaTWCaANlCtCjwZT5hU6n7T0ur5tYmN9lR0FoduuTHwTb2/JAzsgggo9qowu2KY0tGdWunpONkHdEdZXCiZJUSqtBj2wQqXCBjzY6FWHEHv9Bf0x4qMLz8ul7oCbMKocgajcJgI3R0IUcoz60OhMCVSMsB69tYvP8IdDs6dyvcNwn1CBICpcQ9+bcIGc6hwOjrj8UeHn9ydzqTcdy4jjXEbZXBtLwKlQyjlT66qgg3BDOQic5QtGy+SAjqOUTaE1zoQdPiGhEqfSKOD1T5oRpndcs/aNJ+8p7XBMn2ghoX8t9qY6dN0H29p8UqFaFb4CJRUeWdWe9YQ203KP34jFQoCNbB6QOY6X7SpVx+lUNT0FyKlQ3OMIMcMArlhGg126/DMuuVZgZTIauFnl5RaCrfpEvC5rhuEKrSrh1nZVK7ZsarasYcnmozJcqfEVHelz31zZ8VSotpjHXcEcpoLE14dtoEV66HAjLdD0RpcFk+HhxaCP50dsgYqQpqV/wApqoPdwVXOyZUDkDKJAEoAndGnITH29j1xLrajTqPmOgoiUWuZ8U0uPy04t8Mt+0wWtA8BJBwg376o6N1AVlo7EHO+lxnM5fauG4R5Fz3QrO21AACBrXoNqsIXC1zw7+W5NdKcgZ6nNtMhPggJgEqIUq4dLjCAuydHtkIVKjMHKbkT4ApnQ6FbY6XOg/oCz+VaY3Val/Kbg7pqmFK4gbFUidkNtDB3V1ro/RSpd6VOS7PlHd0jo2OsIdZV7ftM7jcOkfLoC38NpM3Ki0sJB6SxpRohBvorlD0g4jdX/wAIuA3TuIn4Ih7x3FMpNuwsAJ/5zoTaYY2AqlGchMd2hAz4bBumoFFeuhxgJrwUSm9JHhJhUcidDsq77HgqjYHGPa/qLYqT9rh9moiMtTGl2XHQJzA/dcWQ0dypOkaDLwND0vMIGVUbzajQPXWEUM565z1ynZx1Sv6jw5LucwLhOMqSKapuJEO3RMIOB6SJCa1xOU7AwpKvKl/0riE0zo6tmGpji7cdBYpeChVj5IOB2UqVKlSgEBGp0cEOiEGxsp6Y8MItXKajSARYWpz/AEmulVRc1Q1mU2o06uZ9IPza7rA99bqjWmFc70EDUKj70ugz5Q0DPhKkrJUO+1D1n2iD6V/2g65FsoNcMSrftWkJu3QUBGrhIjyHBHic4NXy3R/9Va5xymgM2VU3GFSaBoU1zW9qj61lAz0lNTQivWuyi/JXLlWx56gJYQF/T3OdS7t9DsuOGJTKltFtUeiuOisy4bhU6jXUg5Uq4cxMquu7UJ9oaf1CHwFRNUDIQuVPcdZTmzsqUhq/31DGEc48Ed3WZLoCAjqqvt2TgIgri+HNB9zNlQ44Q2d0xzXC+VaCrCPiVzHt+bUK7HI1GhB06VvjhA/aBhXIKAnkl1oTW2jZDogo3ID7Voblqp1LjBUqVKlBzvpBynoK9oHT5Hp26BpKnwWqLdk80ie5cv8AwWdnCE1jge5VKXukMlNNZoymvJwQoRYDum/R6T0yFcNIHTWaRlMMsHggoz+jccobeL35+J2B/nwe0TCcFE4TWAKxBPzsmgjCg/acHAYKPeO5UHO+LtMpzXFNkIdJNqBc30pBXrU5KfgYQ8A8PDNhk/zrxjJahVcwGmdiuC4CoYdU2Vb+mjekYVCs7h6ltRFwIkKk+9sova3dOqufimqlINgnfVuHBDqOjHZIQ1nQKqJIgoCB5nFNH31+8o3P+K4nhyRkplIOf2KpTNOn2qjx9IUxcvxLfpCtTPtAgqpSZUwVyajPgUK2O7C5oqYCtlNYEAESGohz/wCEBHgtTqcp4dTEhc930ue76XPd9Lnu+kCp+0dDoUDKOESojqjSVOkIaEKSE3I6YCrcOL7kxoavkm6QnNPpcyHWnR5jKa+dXPjAQbd8laBt5N1zGUDYV+NpTEr8VT+0KjXbHQmPNM+B2yDZygOrKn7RUfoHi5sKi8uGevZTKthNao0hWoNAVVk7JlRwxUTmNe1UqFpmeguhDPQE8XGEK0bhSXIGAi4Bc1kxKb7RNzkXBolDz1qljCVTaGsAGkri6oa1cDwsnnVAgdP6nw9zQ5gyqdSsG/EwqPGgAqjRLu+rvpX9at3Chekeg6CLiVjSVcpOhbKAfMHZFv8AKh84KHMzKufMQhJKOjc9QGZ66/EM4dtz1Re6t3O0442UiVwtO0BF9r+X9o8M0iU1rqexQNw2TD3Wux/KZUg2P304g9qYbTKbUlByvCL73Jp8ZEq0K0K0K0KCt8E6XQYKKKKw1TKAz4J1JKkyh4nNDhBQH0gB0lococ1XfaLfYVyCiT5nuDMlU2hwvI3RYw+k7haTvSbw1NvpcpqLKlE3AyE1zXDGo8cdbsoeFrMyqtR1Jt26p1L2g+UGdSQzrmUGx4XMBVIEPLeqI2WdJXpNCLQ5RavScJT6UpggQE41Bspugu8OyNQK4aEEjdFlUbGVzy0xUELjXlrJGy4aqKtIOCKr8RYbWiSuH4YuPNrf9dIAAhV2NpVhVaE0yJGlf1q35DQ9L59IfysIgDKbUuOygDQdEZ6HjEhB9yvATXZjoPgrcS2lj2uKZUqd9VUDa0IPC4n899g9IdiFPN3tAGFCrNe0SxDibjY9uVJfgFHieKbgp5Lm3XZVC4uym7oPgwFDpymNQEfoAnMuC27grg4IZRUwj3K0DQlwTXg48MqAUCp8JwmOuCjUhOeW+l+IGyZUuThcEKbvtOoAZBTJhDybJ3EU2+0WOrvBft1mi0mQg8sNr0T9eUno2V0nCz7Rb4CE3BXFy5paFRbDAoz5C2H3KQdHCUOifIVb4wUEQvWsZREp7ZCHW4oN+05xm0Kyd1U4NrzIMJvCkfvK5Vduz5/2vzzh7QnUHkQBj/amr/T3yNlT4z8U2KQyqFAUWx0jStSFVtq4KRStPrSv61b8hqR7CLgpCfVAwjVVM3q1ytcd0xbqOuU59q7irUWAoj7QJZg7aiq0ujr2QYH9xX9RAbRlUuJPpVatcCQFwYe6XHcplKHSVaiIU5VSSqFMBxndVaWJVN0jvT6bSJRbZkJlZzd9k4xkKlUlU+ooPG3iChFsZCIad0yBgIojQmENtH052QqEYcg4O6y4DdAo9Q6HbIae1KdVddgLcIUw7Lug7JvaMrdOJYg47lT4XDGVRAhDfwVGghMvpmUyqf3BXDx7u6Kj82hNbA1OeslMmSSrcyfO5hmQh0FRKjxkwhJM6beF3xTNkEUdugaTagZ0hZ0KaZ7inV/TAhzBsFdU/wAV3lFj/TlFVRWQFYFGi6sLauypNbQqOYBCDiN+t7w0Kky0fzpW9atORqVy2nJTqTSEKbaeTuq72DdUXNIxqWZkKY8EdRHooO5eCn1C74pwtNwVHimuwSg5p2OhrMHtHiqQ9ocXS94/4QdzvjtpxrL6DgqNKwKuJgLh7pQaU1qtlFsKfRTmzlqNZr22ndUgLVV7cNVRphW4ymk+0wiVw8pxwqdQOxqSG5KqcQ0HCbUqVtmr88e1+IeMLnVX/FNZXOSVFcH5K2t/kra3+Strf5K2r/kgQp0c2U6q1pj2r5Un6U9VoR6YUDyVXWNlNcSFnoe4DZN26H7IDCsI+JWf3BARsmsMyeomFn2iYUTumdsobeCFGhYN0HSgZ8I3nUmBKpC993SOn2nmFT2k6BR4wfvyHreYU83ZAQI8UhEkjCpPcRMJpJRXrpiNLPpA/ehMaESmDFpTGhvW6oAu92yq8Pf3A5VFx+D1Cyi6AhrbL5Otf1q35DV2yLqg9IT70qU2v+QXIYD24TW1m7lOqubu1GpXOVReXDPmhVSGCSn1b2SxTIyUKdrrkbYvaYP8LhKxrm2purUGBWhUnNo1TT+9HQQZVGuwi0nIRbc9Umwo1K5aNJV+HDlTpCjTJVMmJVU9uU2CrJEpjQ/dCi5gkFE1qnc1EVmdxC4eu2th5ymsYdjK5bVA0hGllNaG9YCN0wFf9rdWjU9Z1J13QkePiA+oY2TBjU6R0uPrS/MFFwAlcyqJcW4TOMpH2m1mP+JTahcdl3uxshTATyaWZTA5xuci2d0ewwdkdk0eSU949JpxKLvpAuKIlWuBwV3KXBXK8K8jcJrw7bSfS22XN/ywgZ8AMp0e03ZR446RofA/tEoPCnQmE6qAh+YY9ICMDwQoVqAQTQmor14KjZGFTcSFE76SmCZefautOVOvMaNyg+7AVgQaBoTCq7cwekHAiVvrsncXTCoEuFx1r+tW/IdblGZ1OUwdRx4Xu5r49BVabVTeJ2TmewqXYU5obWDghka/1MQWuC4LiDWZD91UcHOsT2TIAVHuegI63tESn0r6ZaFTowFUoyF+HTaH2uHpgvdPrRrHAl1NU6ofg4Kr8GKhuZuuGomhNx3U+QNW+FH6HB8pNw8O6JgSmZ7jrUMQEE+ix/pfh2DLRlNc7aMqHH2hT+3KpRa5kLhqpD+S/R7bxCpvJ7Xb+ImFkqFWdGydVAj+Uxjz8tkGAGeqAVY0ZUakSmqJ3VjRt0TGrtk0OhBn30BE+UIlT4XhoCDkHlNqXSCmsdUH0g20YWUXuHpSSgPvwhRCaZwgCBlevC4FhuCDp20eC7HrSJwrCPijUt+SdVJMBNosGd+kidAeUbT8VCNUDAyjUf8ASLatYwSqPCsp5Q1r+tW/IdI0PQMlDeOp2/grOhuE1jmjCqXe01se1lG1+yfc1UuIbHcmva7bTjKd7FwrmsqyiwOMlV4awlUqrqJB9Jrg9ocOut3uDNJARI9oFvrSh2OdKe61sqh8Z+09jX7ocxm+QuKZVrRywmVq3CdtZuEx7Xi5vjCCP6GPLHUEcIku+KLHDMqAeh4lB07a1qd4lpgqjWuNj99alEF1yY64aOEVAesujGjn2hAezoU9DhjU+WyA6d/M4+04mMJhlP8AQ6hqSdmoDxuKa5fIaR0ThEkJtGRLyn42Tmu+S4ZrbIXuNCm+IaO+KoZyivXmk+1CdTa8Q5cs08RIQlmW5Cp1g7qcJCoNvZJKtAGFZJQEaDWt61b8h1noe7kmUy981Bv9JtXYO30lXgmBpmZReR6QdKnprCYC2CrQiBuE17Hdp3VSR6/5THBwyuXGybTqsOFTL/aqvBEbqnRcvzhhP5hBDihQqubbEqlz6AsIlNq1T+1Ct/kIRrMCFa7ZqL6g/anVXtbNqoNu/NndcTdZ2ruYJGQqdUOOQpYU5wmFVY13cEyrH5VT2qbwBYdX1AzdBzaohNpfhzLPihUb4h5Qj+ptHvQpn0ek9h/2hrxFAv72bocQWiKjTKNcj9pVTjnRhibxlzb4go8cLe0ZVNwcLvtXdBdHpS4p7rWyQhxjXN7sJj2vizQ43R4inNoyUe+CgR68I8ZGFaTugIQGZPQZ6Y8RnRxQymz76in7Snv7UynzDlAAbJ4juCBBUounZNBHiCC3wuGFstKcvXmInoc0HdGmUx/oqOhxtauDxRHgretW7hDUoGdHutXMn0o9lVqppjtEkptMfJ26e39zd0xjX5O6IR4YnLTCpMLGwVahjpzKP0rUXhr8p1ZxHaFY926bw7lV4dzcptzFTJO6gQoCcL+1qDQFbnQgboOAVXZUqnfat91Y366KcUnctVhcxcM+9lrtwrWe1y2KAE9gcE1s1g0pzGu3VkbFONRo+1UeD/damupjLcKlXFQKIUeEfrYUJ0gg+vHUcf2ppkdFZpfTICpm5oOk6vc6f4Rpmt/pU+HbTEKvR7S6nuuCbFFpThKB1KGkA7rlM+k+5ohibTx35TiGOtaE4d4BRo3G5mCmuczD0HtOAeooY8m26dUNwY3pKH6B2yCAQ6rVZ/khjR+RCcCBhU9pcpW/jCCe0tPMYgbhKO3QP0DwqZkZ1JDRJVQ3N2VIWtga7IaDSv61ZuNSY3XPe50NRbUabgueBh+EazXbIORqAKm0/J2+h2X/ALDdNcHbaAzqejCOQoJ+SDQDMIWnZFwapCdnEIcO07rksiEKIHtGk1ARt0locEZAhMb+49Dg70iydyqzX0X/AGFw9Z1ZsEKrTdT7qavqVMPwqVzHdq7llVaNr+aEDcJ0rVLBC5l26qEHtCpNdSyqbw8aO4h7XEKhxIrGOsf/AEBJpf6QeHZHgKiAg+wZTHXiT0MNogq8FDQEkyUIeZWyqcW1mFTrvqbNXD1BJan1Q05TarSjWb+3KFR7tmqm8uw4Z6HPtTfs6Qqgmq1MbbpHUfK4Bwgqmy0k9QV3dHndsg1R12xlbhWxsgT7VRyc8W4VKtITHXCQh48oHRhtlqmRqTHna4kqtXfRcMYQ4mm7BTKjZ30lVOLpEyTgJv8AUAdmrhn3s1KGg0r+tW/IIuDRJXMJ2CLS7dWmFZ9rksPpGhT+lWphtMxhUWw3Wp8VRuuNyrNk9u65tRmKia8HQytwpdOFKJKGTpGhbD5QBGwWffjKPdsg+N0OksDslNYGYCIlVIpiQE3iGj5iE17XbFSFummwwUTCkMyd07830mUwFYix9EyNk3iGHcoU2Oyjw7f24TX29r+oOQyj+nGOolWzuqv5YuCY4HqlTCkzCLAmVHU3Wv2+0HB2ylZQa0PKtCJsEp3GMm1qNeExwDO0SqjKtUZwqHC2DuWAFwxLOIcSnOwhTbWq52Ca0MEN0LQcpxqt2EoVgMOwn1AxslMc6qbimtjWtghwW+Ro6Y7UHuae9TOhIG6vESMo8UabvzWwE1wcJHl7rv46ghl0pzrQht5XbanqOyG2taG9ywXo/lvN3tcPVNM2oP8AGE/bCaKgTmumU3bKJjJXNuw0JrYz5iJTRCqiU7GArAjQG4VRj7YuVHgmfNCkFy8hwTambX6g6DSt60c60SmudcEKMm56gDbpK4lpfSIC4R99Ma1finOLKtn2msAGNDRZui11PbKbVvVxAwmtnLut+dkDI8hKAjZEAprLdkbhsmud+4dDgdwg+cFEAo02u3R4Nu7TCq1H8OJdkJvGMeLmgr8S3ZO4lvxamsLspjI3QGtWn34CpDsChPY1whyNcURaco8aP8V+NH+K/Gj6VOoagmIW4VM4yj+njpKjSJRaN0D0FWlCn9oghSVH2qVvMNoWVlPpk9w3TOJL8NC5Tqman/Sq8Kx5BGEKQG3Qe7ARoMIiFxNR1DsXCuAG6aZ0kaOAcO5PFWocbBUnsYMJr2u20LgN1xNRvxG6v4mk3AVB3MYHe9Cqp5Q5jUatfiMUxaE3gWkzUMoYwnNBQa7hnS3LUyo2oO3zFuZVrvRQfUHyCdXsEkJvENImUyphNqcx8fXjlfu0rOgJu3jJhWzum8O1jpXF0Q7K4aJseE0Bm3QFOl0Juc6ueGbpnc6UEU8SrCUbmbBNIdt5TUDd0DK/hH5Jgkkle0FCA14llzZC4aveLXb6Wg6bLmt9LiKrRHcg7/2XMD6kfSpgNdc5cxzjDFCPQdORY69ivESg8uMhQ4jK4oxVaQm1RGUawacIOBUhCGoDwhpaTCDvvxnfwuPoJ1IkSSqTSwySpnTjv7RXANBpp9AEyjShU5GFJCDhr2zlMChVojKZw5Ilydw4XICp8M3c6BEZkIOP6Selzyw52V4KGep4J2Qd9qUXgIC4yel5gKiLAZ9oZ04ipYLRuVQZY2ETCGdThReMrbR1Flb5hcTw9Sg6aSoM4qMoUifkU7h2HZNDg2CqjKjxEplBrW2oCBCNNpT3VKfaPabSb+/JT6QL2xhWNTWNpnt96Eq38RU/gINt26a3Dyb2YK4evf2P+Q8ROes02HcLi+GezuoH/hUK7uHw9qp1m1RLelz/AKTRjptlAH7VcACVSMt8cZ1e0EZRbDu1BlQ4THnYovRqoOdElXXIBQho42hBvN3TW2oIrcIyNlcCpAPlyEA0fFcRTqNIq0jt6TKoqC5N2UIdJIX4SmXXu3TGGngFP5g2chxZYIcMp3F1Xmxrd1Rp8tlq4mm2oRcE8MosLoXDU7GSdym0m3godR14kPNWBsqHxCOyokPJco6C3cJpPvwwt9IRbKGN+t3zCnujrc70E1tulWlzBCFF1HLU2u04OFxxHKX9OPbGj2ppAwUIOye3Ka8tw5OqtaEeIkqgQ5oTnFuye/mPDUANlUAnoGvuP0RCAjqcAzuCBnwPwqY9nqDbsnSrQdvTMIfiAN5TuJdzfzGr8VPazdMaT8kNCYQk761n2hB/aqVzjcduoGXaloqYKFMsKqVPTBJTXud+1GWZKFRtTtTqDSqLAxsDWwI0/YKuqM/lNrMeuKoPLr6ZyqHGOBDKyc+Nk7iuU4CqIBQM7dLnBokoZEqOvd0IgHdP4a3vpIcQBhydxDAJTeJdUw1NpvPzKLcJrhqUNeIEtXD/AB6TM6FN2R6akxhUqIp/70IlckLltC3UKYKGUNHzcmthBBPc0blNILe3RzA5Gk8bFMc5mHhAg7eRzQ5A+nK0XWhN6nGNt0ym6bnHUAIhVLqbwZU4VXELiReBT+zo35DU9B02QN9Yql7W4hcMy2R1FNOYPhHilWEuuQbDuguCuCuuwE1ob0uYHYK4qhiGrhavIdD01wcJGjqcqmyxPTU6k1+6FEN9JvaqvEGnCouL6l0q8jMq67PQNSJUz+gmE0k5PgaOSbfSnrqmITHtyua07LmBBwKJhfJXBXA6ONrZRZcAPtV6dhbUb6VOoHCQgVdcYCjo5Rc65yqYho9oCMDq2fo4wJTRATnekzCa/ML5BBjWmRpw/bczphPotcrHM2VRoc2CFTYGNgLjafMprhzWpzYf+EyoH/70qVG08lXzsrZ3Tq/JMRhAyJ6Tl0JzrRKYPZ1rUW1mwVS4Nzz3bJjGsEN1DYM6x0VfiuGMjpnOuepvdnUppkIqSN0akOyg4OCsj4pjw/TcoIJzwxtxRYa2XKi0UmEIdBb7QM+CYWfSJeFe7/FCXbhQLoVibPvonrqwuY0bquHmIK5Z3nKa+Tad035BDqOj3QFRPycqeAnOtbKoiG5RPR+5OJ2ajTBCEjB6iYXNvxTQD25lCp/kOi4HAUKUOgqeiB1lsqoLnp/D81qYyrRwCm8QRh4TKjX7KpP7U247oN1fxMOIWa5VKjZoNugIaFEe06rGwTq1WcU07iHM+TFz59LmBXDxO/MMdMqdbZ3RBYf4Uz0ufCj2U2CEf4XKcE5hAyms/wAlaE6k79pTaL7pJWVVvLcKfzIVTLYTXPoOiMIEuCaI6ompP11kSiYysv8A9aVN4CYVTBeeYmGRrVBY7mt/5TXh4kajoHedOKdUm1hXAPqVKuVVpXkEbrm1R2Rlct8hzsprgdkUacgqnVdS7ai3zqTCG8lA3noKn68dX4FcH7I6R4Hd3b0FMfZUg7aObKcyUwEOTVYJuRn0muLSho+pzDHpWuVUOCp1HsTeIa7dc1q5jUTOyaI63ODd1/vpIlDKGpPoIdE6X+grLvkg0N2Vf1o5sqnuJ6iQFUf9LmEelxT3W4C4ewjCZlVfSb0uMEIaOcjUyr4V42UOJTmn0UGuq4KY1rBDdCJTXOY61ZVpO6tGlqGN1M6SAsuPlIF+U0KJ3XLTuHa5U6baHtBw6HcK9ziZTGBggdG2oQ0KrOsYSFR+OjinVarHxEhNefY6Kj6lAyBIVKuysJb0uk4CaLRGpEruG3RuY0NS4wzKt/xU6lUw5ziTsqhgYVM/t0cYCayM9RyqUiq670n1RMAKS4bQqVWHWVN+qrXbTx7VOqAMptZj9ipHXOlUxKDrWSuGMcOXFcKO3uUAZQMrdUopPNPro/HGnFkAElf0+nALz7Vc2NuVFvbd9qEWDdNd6KCqsubC4apH5btRnJ0bt0PEtVMYnxuEiFwrBTEDp2Rn10HfR77UMdBXEuhwhMrVSJhCqD8hCcjCa8JpnSE0+k+pcbAmsDUJKr8NUrG4GEzg3gQXIcKwBHhwE3h2FN4awy09ZcAi8vIcBhA3dX7k95bsE2rfsFemffW3Wt61tkhNdmDo97WfJHiAPRXNc/FML8Pd/cMrlNpfHSVxLeUea3/lUqzS25F/tMPTU9J1X/EIuc5Pc1oyUGOeAUWmEz451ZuegDPW4ewrxCAnfzOxlNIPQ+mH7rk25auZDrShVlcwIHHVGg6H7Km7C3UJ1MPKtI6CAVX4K7vp4cqHGXHl1sOQ0JgJkxnqKJhPrBiaMIjCa0NEDUuLdwg9ztk+4BMeHiQnNuVOnZlF0IDMlSpU9ErlC4zug2EWhVKLXiCqdZ1I8up0VqnLb/Kp0QzPtQE6gwmUeH+im0agOXIsfu0ptSd9CQMlCpdlAyi6FXq5TnzTVOOXAVIQ1VGXttTWmg4Sd9OJZ3NqJpkdXDjt044XV2sVJtjAFxn5kMVL4DV2U54blB4eMKsC11zVQ4i/tduiU6s0EaDoqHEJogeM4Co1IdDlPhfkJuyiak9NWofi1UqWcpw9INwiERplmxXcRumCo05OE+oR6VOd0TKbEYXryVKbS7CY0AQiI2QcHdE/SqTEpu3h+R0CKretW/ILi3PZaWoXEKwTJRbOr0U4E4C/CB4/NMo8LSpZATnULciFQ4sBxaUx4cMazOAoTmB2yrXMwUymG/LdN0GMajBOsyY8JbKHm3VsIdJYDlVaciW7oh8pj+0BXjrHRxM2dqpMIGdCYE6kT01KFOrl4TGctVKrmGLZQfAuep661SwShSLqoegOohQqLXMe6Nk9zmIFztkBGlo0cICB1FzJEIzupuChELjmy3t3XCcc1zPzDlMrMeJBTqjWfJBprPDzsOtzA7dctqdTaQv7brE3AVerY1Ppu+RQF1rGpw5VSB7VM9qlVC0iFTdcMoicLh+2WnofVJxTRbaLqpwuHruFRxpCWo8bSiXH/hcMRxFc1aiqcVTYJ3VFz67uZbAX4nlm2qIQIcJCgKFVplwVNjmOEItXEfltvG4VNxr93pPphwhMFRht6XiXDyVdrU6gd2ocynkplQPUqVcrgFdlSpPpFjnCCU1jhiVc6ke7ZAhwka1anLEpgu7imBblbKEVKNTNqYgq57wxBsBU6fblcqNl3gIT76oU9D2x3LbIQyE5vsK/0dI1oHEfWg8db1q35BVhNMqk4ObhHUp+FvsmtjUgHdcVQYIKdxT6bvytlw/9RcTFRMfzE14e4getKxsEhU2OfmorHtTds6QroOdDvOjsBU9p8REqVcpQcEXfSn78UKY6CimMEawrXD2u5dzUCDoNDpWJua0a1Dc6zw+9HNDha5WR8ULhvpcFOj8BObzRKp5E+HYp3+lt6UomNd+jdRO6ILctXN/hFxd/CH5nxCo0GNBwuW2IhckU+5g8dZ3Lr9yPENa24przXdd6UXC0LhaJZUMp9FrnBxTGBggJzbhBQoMCey0S3CZTqn+4U9pou5jdk14eJCOFX4lu04X/AJIN7aYTKdbjXzWw1B1OiLGLjOHqcQ2+IhN4FrOH5ntcJPEPaBho3WwVSm2oMqiDRdYdkFIT6jQsNElN7sp1EOVF34Z3Kdt60dMdqa79rt+j343B5OChTAM6uaN1aje0osMyU0e+n9ye0OGUK1RpPLOy/FcS/wCJVPieIb/cajxDOIeP4R4imwRn/pfj6LN1S4mlUyCgQc6GE5UDzXF6p6Ufz67qnpPHaqc2iUV68mHBRIVylHcdIwSgh1DpretWbhP2TRb0F30t99JhEq7SrSFVsFCk8SwrkkGYVF7gLGqlbRbC5z3fFqmHTVWDtoWgq0sMhDKIXxypBEptRrvaccJuB4/fWZTmOcgXhXH2gZ0LSfa71KKHQWShjpOlq70EEdKtZjawBK/EU/tV+ObTEgLh+La92VcD4Guk9XKYTMLktXL/AJXKad0BGEPDHRCm1boS3frJAElMu4h9x29KAge60aPmMKhWDuw76ESpLd1d1f1Kk0fmprg8w9USwNhiZvK4bLS7peJaQm5A0rsFIGsDEI8fzsTAQ4Y1n3WkhUOGsGGwm0HXS5yZTbT+KhOlrbSFwvDjh2RoMYT2B2VKu+0Gg5TYIQxpVpCoMqi99Gry3baEAoHMHRxjZDHiJgSmkxnoefpDIRCGTHUTlPy0p74dhcNDWmq70mfiONMnZUeHFJsIsBXKBVfhKb+2Ef6e9uGOTOFdZaXFO/p7dwSqjeLaLRlUKjuGFtRqo8ZQd+5V+PosYbXSV/Tm20ASqjsRoV66y4BXlBye8jZUtkKllbl+uhxjpLXNN6aZQ8RVX1q09wUyegqEdHTKA6K//wAiqQPSFIAKmBcgANHCQmOslqBnUsBygSDa5OcBunNLe9uyNNjxkKpTdSIg4QghAR+mmN1cNY1jyBTCLwnPXFUXPq3tTqlbhz3IcQa4thU+GjIVNwO/WUwSbvEfEOmPpOYZkJ73NMFNIPSSBkqqHcS2G4CZTLXDKfWIfy4TWjWpRa43e03I0iU5jvSZUntdv01WHian/qFxH9Os7qap1nUjCp8QLSRuqPw6qRiWn0jxdO61uSuNe59MtIhf0/hjWqS4YCAjA6gSDB1j6T/y+5ESEz6TD3EdFWgKgVF5cIduNHDCBkJzgCJ8BQ0vNQwNkB0EJn0ih2u6nYKqGGkqp+YbguFpniOx3xCAazACk+gu5QftWBbawixp3VTgKdY3Jv8ATqWcLgnDllg9GFxTi0XBU3B7Q4Ir11E+gohRnKGNAAq1MnvbuFTdcM6vEkHoOjRHkrekfpQm4IRZ7bumPuHS7SOjiahxTaclU6AY2AiIVFvd0HFUSh2mOggHdBoRFn+le1hgp/EMkfSaB61ujfwHZT5ICt+vDCB6+5OaYlASMq0J4tyrGvGQn8DQd6hWcRwwhncE6pxU3liocWypg4K57JiVM9FTtbKY21oGoeJjplSj+hc2/CaPtCQp0OEaRqZcsvNgKDQ0QFHS3ocy5SWbprg7I0cf2jdNphggIiQuLoi6VwtOHSqLsaypnQ0hWJJ2VOkykIYNI63Nu3QnY6kSITfiEcOREOnprTSdzGrmtIkK5x+IQpv+1aPYRfy9kx7aglvgqS42hNb1O+wplOTHSOlwkLiAXjltT+D5eAZKo0hRZaOs4yncUxm6YXuEqyfloaxYe5q4Wo3mOaPeVW2XBuxCK9dJdOAmthRKtUKCo0fS7g76Qd9q5qqAuyFQr3djt1KdPn4hwbkpg/do35BBVGu+TFTcXNl3Q7Vzg3dV61Rg7AqlUUaV5XDMe882pudKoPpUOh9Nr90GuHaUNs62EmUDG6c/NoQaFaCuQaRmkmvDlkIiUGxt4B+gjrI9hB09Q0LQoRQxjodTY/5BHhaP+KPD1GGaZRrWfMLmsPtByrd1MqmbmA6OT6hYU2vdkJtZpwnC5BgCsC5YQwpHngqSN0QHJzHNyxNqT8gpCBFQpzg3dUm2tg9UgIgnuYuaW/3AmuDsjUiUG25C2ElURPefevEtlUWQgwsNwTTI0c2RC5bhsVU5wbhMa4CFC9+H30MwIVY4REx0uOMqmxrW40GhaCnUn8O/mM2+kw3NkKSOiVUqRhu6p0436yvinu7VQct+iZKJ7yUyn3Xu6ZUq/wCkWl57lyaYN0Z6atBrSKjcLlueN1Tp8sYUr1pKLvpWE7lAAeEH/JMF7pKLZVSgC4uXBNIBnzBFcQwOi7VvyCGjMk9B0n6QaqgktCLeY/8A9QgI0cJCAgdNWoWtwm12xkp9QWy0qnx1J/b7Tq9NnyK57qn9sKnSs6H0w/Ptd7f5QfPpS5S7qcSv5RdCvlAzpPmjpI6g4IdB+0DPUc7rkU97UaUfFGpWaIe1Mw0BEqtNQhgQaAIVThWk3M3XJc4yUGPnCdVswQuY70FzHf4oU8y5CPSDvR80aRo+ne+QhQZurLfggOZ3H11F04CFIbnQiUaZYbqaa4O1OyNa/sYqQtbB1qiXJjcaVGu3YqdUPx71f8UPH+7oq3AS1MaSMlVvSa4KdanxQMjpIlAW6OCACLPsqpTaAqH5dS13hIVRF5ouyqb5EhTo7ZbBcP3S5Ewi8/SBedkQ77UH7RZPtNpgb+AiRC4fYt0K9aHZAR0b9dZpc3G6p4aFKc9jzEoC0yNd0D0DqCKretRuNCjUdTqfwVKuTqoG6NZn2mvY84OhqNBj2vk8lAEbIN99EIGdeLq4gL80i0I8NWd7TuGqUe8LhHCoO5MaAMdZEq+pT+WQqdRtXLemeiJRpOBlqLnAbI8RBTKocp/RbdMJp+9TocHwuyITSdlumtA1ut3Vwdsi0PEFRaiYCAPsoBEIdQ8dWrUa8FgkIGQnPjtG6tx/Kuc3dNeHaSonqNMEyqnOp9zDKZxNOoJC4iu6rU5LD/tU76WAmG5s6kS5Rq+l7amNeDLipTxLSFTdc0HQdEqehxgz0VPgUz4qt/caoHTT2jrIU5tX8K6cFMaTuqrO5NOPDUZKqUW1mlq4JtRss+kJ0eYQbcMoNjHmGlxoVrj8SmPa/ZFetIk+QiUGfTlyft0rkNXIcB2FMJAh3WOiQgp+lB3VYxEqdGu7ggqrXuHYqzuImCE25oDNyn0arstMLkVnYc5VOBu3chwAA7TlOo8XT+DpTGGi25xyqBMkymk6xrVfZkJnEPf6VRzynvF0FcoOyiKlPZF/NEe01nJKpVPpNd4OWJkJ1UU/mt9Abut2yDg/BCFBvpWOYjWAGVTqh5gdIP6AKJRaCjI2V2jlPUVk76VXVWOluybnJRwuYgZREqyDo6YkJrSTcUB4Rgo/wp8DKnNdjZOIaMq/mYpqnSsz71qUQ7IwU2/Y+J3CtrVC7ZcPwgokosBELhzyzyzqB01Gl7YCFOpTyrwRhUfgFHQSpUoFSpTzhDU5wmzTdaU4l9bHU3wEK53tMb+46PbchhcxTPgeMYTuZzL2qm+/R4k/oBo9t5AR4ZoyxTxDD/CbxBaPzFzw5c5owsnyM3PQUB7WVlbK4KZ6i25NEDSv6VWnHe1MqXU5qJm41rs5rbEGhogavErLVKNNrt1Za6OpzoVUkqeS6UagdgIUpJlUavLfaThVKwd2sTGFjpXKbUOU+hy+5qpwRPhc1rxDkKRYcLmfeCqc2566myY0Naj2GUHSt06GZC5wG6mdv0Y6CFA0fSjuapAUjQu+kCfpFQoRCY2DhWpzAU3A0I7pUKJ6h0vbOQgT4OIefg0K6s0Q1i5FWpmsUym2gIahno9+HiqjoFNm5TGWhOw4FVS5pFqNMvOUx8ksPhdTDlTqsY20nZc9zvg1X1IkhB4KJRKlSgVKlEoOQOj6luwVQPe36VKm+m6X9U90eGqQG5TdtXD2rFEeKA1XecOlDWnkSgiJVWgH5Q4YAJ3DuCovJ7T5GdMgayFhdodhDolAIaV/SfsmtiAm/IaTOOko5CpbZ0fuOpzZTxBTaFok7osBT6QBlchn0hw5mWKmHz3BNbGgjmEIOnxV9pVM9vW4To4XCFS7cLKrNlvcgGNxCpVJMeOVPWPBCKgajoIgyP0RQlm6kdVSoR2t3VOmW5duiYWyi7dUxbI6PkpLeuQrBX7lzTw+DkKo7tlCs2psnYEqS2uHDbxU6YqVi9DR9FrsrlPGzkRVCc8jcK6p9JtWN0KsoORyqbZ3QaArRo4Sq2GygZE9EoffhHec+cglFjjuUaZHxKY+cHzEShrS+MoIr1rUlh5jU3iGOQM+LZ8dEFFuFY9ck+ymcKBMlfh2+1y2jZNwNMq3UaV/SK9KhfdLk42iVTbaM7o6lHR5sNyBlP6nPjA3TKduTvoWBOpNKFNoUAaPq2GE98NQqPk2hUuK9FNrBwV3geLmkKiMR1jOr6fsJuyeJCsgoNjZNUqeq8BXBYUKCOjKyghofEOgph9dMeSFCLfaY8HpjTbKid090GAmS7Ortk3SQ0x01HWtlOcKXDrh2gUwuLYS3Cp8db2VAqFVlV0NT3tb2uQaIQeaZh3gqOtYSuHbUtTOmFaE6i1ydwz2nCFzfkm5EhMQ6DlU22Y1c60IOLj3eE4Cbt+gcHHZB8OtcntnuG6Y+7SPI3B0OyaIEIIqqT6VMn3o4Si21Uzyn2+j4t6qjqjUmNG9Axg61/SfVa3dTKp+lvjU6nQ5MLlN9Kr2wh0V61mAqFOxsnc9DsIGRoX+ghTnLlxBrUzB2XDttphPosqfIL8HT/bhNbUo4fkJjrh4GkXIx0uKZ0Aw6NDpkbIT0woVoVoWVfG6Dw4YQEaSrsq4oOQR/QDfpjxEgdLgN0DOoN22kwo0LLnAlbanZMxurgns5gygC1A61eLZUPLZlMd+NiRACaICiVV4Vr1w/DjhpKr06z5PpcO66mFVEtTDLQeuv3kU0xoAwtvDCdFP1hNcHHHUVfb8lcAJUFxkq32hqDPS8SEBHi36gn0mvygHDCc2DIQMifLGoQRUY6HNlNZ9rnhptfhAzt1vdCa3Cn78J30Ajput+SkLiO6FiFBpv7dimkteGNTRHUdG6VxLMJu2tWpbhUW8x156CYT6sKjUe9xaxCmBuojTigajeW1UH9tp9dDmRlibVk2u36wArTMhXRugjpCHQ652ylzM7oVhs7CwnVB+1NM+II0YdLMIGoTlWP8AtBjxuVyAclfhh9oBAR+inonwnpJW6s+k13dBXEutZhUW2sCnVzoQR1f8cJuRnplcZU5dBzlw9QsN38LgqVjZ6CLiNLBcnNfGFRePjt1sZzHl6AhESh9Hwy2u4j6TWWnr3T2vpG5mR9KjxLKuPehP0gSd9Ge+nfwEgeEPyrlOk2ugIEn10XK4q5GoQhU+1ModFR8OATcoIr0nOsz08RTuCZxDqD7XbJrg8SOqbqka5CnrmTA6RpvgpzeTsqx2RqAG1FtoJVEG+eg6lOMBN20q/Apu2lWqKTZKZTfWMnZNphnx0nXiu1f07d3QyHOLlXeaVbt9qlUv6HUg7KueN011w6Rq4HdqPEW4cECHZHT8s6vpioIKNFzECDsgPGOgaDQ/odv0XvWqDhwT5rQIRBIgJrbdMo/wg/0dXA+lUe9jV+KZuE1wd0Qv6nxDXfkBcJw0mCmttEa7lARpGlRgeMoOGx0lFwCNRvpVKh2VPbV2M+AprAMp7SRI3TeK/a8QUD1DKrcOHdzN00lo7lzGfepNp6WNtGsxvqHA4GlZsiUwyJ6yhAMoOCuzhXK191xXMb71jotUDpqEAGU0GoZVMQFzgDCm4SF6RCZMQejfCfRDimn8NUDPR6SqbYeT0twOlzrQmCBoOqu4u/LZuq3O4d7S/ZCvfXu+k5zS1UsQNT0FHK20rnYIaMh5L+giVMbo1QE4irUhcMwMmNXmGqkO1cUw/MKgPfUR9I1gz5r8RSIm5bp7rVTM9DqbX7q11I42QM6uNolM/jodsm0iDcgZ8R6+WmktwVcCj456I0BhXBXD9EeuOjiHGmLwi2lxjJbuqdStRBnMKh/UWPw/CPE3NmkJT+I4lgkwE/jK9XDjA/hU2tfUhgVHsqlh1mEOgoEufCIRTnlCk6r7TuGsEgpgfdlNEauEiE2p6d1EwhnOnzVZgLFwr78+CU+k2pumtdSx6VwThKGhKJFQYPQRIhMqGbCnunsamtt0IQ691y2qOgtB3VkfFXffiCq0w8ZTGWpxhqsEJj7JBQdcNP56P3acUy60qi4jB6JTNuoz6QyNX+tQh0E+gqTbZXEAGE/g6T3dmChwlFoiFRMnPWdQVWEsVJ0tRff2tWwgdO+lWmB3BURDNX9xtQEIicKkYcWnre25cVweZC4Lify7H7hcRW+lw47eqxzfihXjD8IGdkTcYTRHQdD2mUDPh99Y13X+/CVhXaWmZWUabvtcr7VgUfoBoTkDxvrU2YeUadNzrqLsqq9zKnaU5zj82r8TWHbKvc7NQplKpxBxsqPAck3AptO6rzPrU5MdTW912hbKNAOKAtC4q51EhoyuDFSm/wDMCHQWgiEe3KDgehyGyOcaOHN7fSdT5BvYgZE9MStughWIg0/ihXf+8QqwfV7g/CpurPMsKAr033hDinHFqbUed0CT8XLi+Jq0jJCo1OJc38tibT4sjLoRfVpbuBTasjKD2nKPmc0O3TWlhiVb4XbIIotwqh+1w/wOjsCUw9upGlcdqptEJptNp0c5FAQI8TtugJ2yuwu4j6UWhN2XEySAE1oaIGlN5HEWn31u1NQB1qcJanVgGwEyym3tVEucLndBzq9twhUJAtdo99qbq9gOUOlxhPc70qjw3Lyn8MysFynUza5cGZpDrcwO3XLNP4pvgiwz4JCYS50qVOpVyHQ4Sg6THSTBU+M/oSrM3eKpNpt3TGXH8zdUqNzTadk+hWY7Ko1nUnd4lVBQrC4YQa1joecfa4cU2MkJ9Yelw5mmJ0cfSaI6T9aF0LmN9IaHbKtaU18YPVVhqabhOh/hAH3rUP7QmttEIiQqWOz68n7lAKrcHTqhUaIpNhSPSuzBCACrVG0x/KkWXVBlB8AWoue4dqpcGAbqhk6PLDgqiwgTOFlSp8jhKFT0Vv4KklwaEF7R2R7lREMOj8iFSw2OmqJahWa0ZCqP5nxCFQ/F26EqJPScZTdunc6A3JumVTH3o8wEMBP2nXipa5jx6KabhPUdC9MbGdCxr3FO4VoHYgIEeB2HSgZX7kNSmdBVisVWgHjKp3NNvtPaKzcjK4U/loeB7XDLVSfO+g6SgI6zv0T0DocYCZBKLiNkbz7Qv9q9o3XyXLCiOg/pCVCJgTq3aPCchMYQ6CuDZ7H2U8AtgocOGCEKYbuq9Ns9uybw7j8SntNH/a4binNNhKZXqbOagPZ6Sh8joRKDBpUqBgkplcPdajCdBVN04PQU/uVPDYUffQEBcbtXsuyEPoq36KuLPn1hFD71pZc5pPtBoVQCEauOxBp5ucow3LkeIpiYVJ76hwEblUcQ3eFQpmuZ/b//AFRHQ4kJpnxkArmhhgoODtukPGx0FWa0aPMBH4p0MMrhzLDqe14/nqtVoC4lxBbH2qtZtP8A2g6o13f7Uz491C22Q0budH5gI7J/xGvFZb/1/wD1NwI6nuhF0q6EHIvhcO4kklF+QNJQcDqNXtlUyW7r30zDimvU6ypRIVdv1ugMZTnCi/J3QdO3hc0HKk+/B78wA0fVa3C5k7BEzuuWrEYanV8wExkm53W4ymun9IT0OnceKu40nlrFw9tJqpv57r/SLvSc41Ta0JvCgjKFFtNCl+I4j+Aq39Pa7IVNzuHNpTOIa/ZB46WGZOh0OyZdWJuTKVhuUyrUcHpcfTVTlu/SDeel7Z20c2UwWCD1nJjWpOwVanyvzmbqnxbXNuKq8dSeOxMqOe+S5cLSebnE4KFFnvKsG0K4NwqtcjZNoV+If3/FMAaLR0kKtUPD9wVNwe25vif9BNp2rlAZCBe3dc0fSBRc0blNex+AUI9KXc4uhU6gOEO7SqxUBDDrUEhAyJ6SQBJX4mn6K4ziHPGBhN4poIIEr8U5zpcqfFM2Ka9rtj0PcRsmukSeiS842Q6RvpuU08zvKretawlq4epzGSel7k4nSAURZsplUzyJBTHfvcmVQUXBOeNwm8QPaDwegqJCZ00xc43J1PCuI3QqhcwK5SinOt3TagK42lzWQFwb+22VKHgIlWxshhQgfHPWFUm3Ci9WwmtzKc4BPrwialTZUmCn4QBOvvwx5R4HGGkqvTYIOyfdUfYzZMYKYgJ5cCQuGp9ulbZcEyLnfaKrUwSCm0aZEwuQAZap4im7aQvxUHuEJtUP2UqnHQ8+ggwBQrYQMpwwgZzoTCMv22QEKJQPo6OUSqdweWnpPRashTOkyjLcpuc6vrhroXMp1QWynURXME4CHC0Wj4qtwlOJCpWlojRzoUVXfAR/tN4drTf7TTPWQHYKpsFLtbt4C4BTOyAjpiVy2/SdRY7cIcNaZaU0PY50ZTiLTIyqNb7TazHbFVAHKnhp1eCRAVL4Doe55xTTaXt+U6m2MLiaTqmGqlwcZeFXZAwuHYCE6g3cIOcMSuZ9hCq3ZQhshpWBjCpxHb1DedKge7DThNbaAFW9dDC2i8yYCvaferjCe8Ewnvt9rnLmYUzhO7UGcw3OTaY3QaCuWEeGB9r8M2ZQYAoUFXFNzofkgei4teU+s6MKnUL1/sIt/wAU2oW7oVgUHSt908csyFzLmqlV5dU4TXXCUCh4XDWfDBUdfNZ9oVZ2CLj9J1R30jVqnZF7zuE0XuDSFCe1U3zvoUDqdBvo57W7rmM9FBwVyDgdY8R6CJ0dMYTXXDrOYCrgOwVQpwEQEGXOlUxA0rvucKTfaY0MFoREqobQmbakA4Kbwwpklil05QhE6ge+ghPJOFTY61Fr/tQ6e49BEruat9IzPjqU79kxlozoUBoWg7qoGSWgLk2kFqdRPyG6a6q1vfuqrqg/0uHFcuhuyaCPkhod0DD4U9HvWUOon0FaPHSM6cTTESqI9yhSxujfTEMQq1G/IL8bTX45voKjxlObSr2n2r2+0/iRUNrFTzo94a2SuHBf+Y72oT2SIVJ3LdYUVVxlbqwFTbhNKIQdGFEqwDIQ6XXNOE24nK3MaVvWo3XGU+cLguS8jCZxfEUTEpv9R4gGTkJ39SJ9I8Wd1+ILt0amJCpumE0+050psA4TcoCNZ6YjrhpcnCUAArZXLCLAq1K8EMwua6iYKHFCE+sHtwhUgp7vzJVBxLZQQ/ST4RTb9IBFOEoMVoCIAR4kAxCZUD1bGQmukaET0On0mR6RxlUiKgvUax1N28xbHc1TPUPtVWXhBwbunVGEYyqNPSo6xsrhwC3mezrUYHDKpOHx6ndiBBT3hgkqmS/vPV96whjpIjIQMiUEcIG4T5fehEoMaDhGmS8JzARCcxsKgKlR+NkwACBo3eNHJ5GHFA9W6jSdC/6UOKtHlYNN06iHNLVRqWC0rnMjJTXtd8SixrtwoAVXhadb5BVOCr0s0nSq/EVbrHYVCRshWbTZlO4iq4202o8JWrf3HQFw5sbyj61rsHyVKpc3KcLleAy8oPL9k4YjU6x7CBnoqGAmiAgI0retariIDd02mAyEKI9J3CtO6dSpNdBVWnROAvwDbblS4JhmVU4NkIUrDjZAjZETsmMTRHk2PQwdxPSUWg7qrw1wT+HLUW1AUx7wYCbk9ypE/FNKDkPC4SriN+sab+EaFFRGjpKFIJ4tdLU2oDunNPpMOc6lZKEhEicIvIGQqP5ZMbIPXMb1kecqSHYU9EoOj5I8QwutlQg1NEDTiHF7hSb7TWhogalAAoOMx0vEhNpkiQVDnOAqJu3VvjoIlDpfeD2oGAnVGxlDiROE3iL3Wx5HbFAyJ0FUXFoT3Fr2vOyq8Qxm6/vfE4TGBgtao9jQn6XMAV0qJEJpOxQ1Jhb9M5QEeaUwgyggj2kJ7W/SqUqL8uajw9L9uFwvEDNN56OK4NnEj+VwrTwpcKvpNp1OMqXvw1AQiuLDqTxWZ/yqb72ypVSGMLnKkHuF6AkLll3adlhoUyQ3XdDWbTGj32pj79lvnoretHENElUn3ltT7XM9JjwMPOVDSnBg3VV7SO1qpjtgohEJ7E4WpjZTGodU9RCGNaR9eAtBVThY7mJrRMOCdTbErlwhcxMeCm+JwlNOI6inOTSI8IKyoPQdLU4fmDSMqdKjS8YQDh7RqPutQaoT6TXJ1J4yxyp8QHi2qIKayPiVJQM9MqNM6Z123W/SUAiyTKA+1EalGgK0kJzq3C75Cb/UW/uwqdQPbITaoIK4V3Nmoegr4lHfp3TRCqsuCY8jD+k7Jo9+Kq70E0QESgBuqlO7bdUydnb+MmN1d9IT+5OaOZOyrMBaW/a4fg4H52ShjpqNnIU4lb5TnBsEoFSridkB99J8srOvxcggqxtbcU7uEhEhvyTYcMLiaYHc1cLxBY8CcdBActtNyiJEFNa7hsDI/wD4mkQqrS8Km/8AY5N20OXJrLql/wBeA9olRmYWwQ6K52UriJfTsHtUKVemQxNoud8k7g2OQ4Wqz4OXLqO+aeyXtaE4RkL/AHpC4jCpNQHWQhnwP2TSbvAcIZT6Qei39pT6cbJo9FcuMqmes9DgRkJjp6ZlQixvhHWV3KrKp1L9+gkNElc01PhsmsjpdTa7dGkR8Sri35IdAEI57QhgaEwJUz05agZ138HE4pFURDAi0FcTw1OpuEyhyaZLHKr+IoG9xXC28ltvQSnHKyU0yNXycBAQNS2cJvYbT0VXWjrKnQmEG5uKHRGZWUble72FVrOYJAVOs4/MRq50JrpRTmuf/CPD/wCLiqtStRExKq8W97+1cPTDBMyUQgZ6j2FD+EYIhMf9oC7frhOMYCuI3QdPhjpeMJjrggqjOYwtK4d0AtKMFEgBV6pdLQuF4DAdV31JjKYMaxGyBlbpo5b7dHAxhUzhF4RcfQVNuJPgeJCanZxoNeI9IlM+0zcdDzATjy3XlbojSFxOwVMeEdRCH86NHch1kSg6wwVKIlEBW/SKG/jKc7lulAzqc4URoeiUDodBWQqNVwKnqqEASVzec6Gq2r/kn1H0va59QMuLU2eKy8/8JjA3qJhXSnAuQPLHcgZ8ABB/jQ79EKYVyEz4K7bqTgmfEaVdk935T4T2VOLbd6X9P4g0nclyDwcoJx9K1VKZOQmVA7HtUnWuLTr76S25fmMwmveTkaVDfXaz68OSYQEdO699EItDhBRDh8VLvpcays54AVDhLMucnMDjnWFx/Dh9O5u4XA8XPY5AyjjPVEoCwoxemUrqpe7SVPS58GE1vs6VWmO1U33Du380WmQuaAg5zhgI2nBTqV2xRpOAwqHCQ6+p0OIkNPvrqSIcEDOlglWgIjCbt4fim5MqfSB14j0nn0gmHIQ0JVTZPpXCCmOjtcnOCGdK7biAgPCQhg9fpMfLseF7ZVMx2nSo6AnVLKwb9hbqPGVUZJVIGnvoVHSSiSEKwOCp096AI02lGjGyDAd1y42QcfaDpTqjW7o13O+Kewuy8qhTaNlUcGBMp810lObiEadrrgrlPghWj1pPU54ag4FOhDpjPhrGGJu2lTZNeOaWO9qnbyyFbbxVqpe7lluxTGRk5Or6YORunPEjGU0zo3Jnw0mXVDV6jjRxhAR1g9crc9TtlxNF/DPvAwVwfFVa2PpB1wQdBUg9NQSMJgO7k0m90IuIVzj6Xf8ASvhBEgbrmuf8Exsb9DqQKFzPaFUfuQIKnxBQDugqjZPcqQhpjqtkyek6ub7ahPvQqJUR4SsrDQqNUOxpKrnZDuqTow9wQOj3BouKYed36FoKLQEf4QMhP3DvGQgeofSY03kabeB4gygZCrMuauIYSwPG4VCre3xyiUcoGRCvgZTXh2pMCU10hToU9uQriHWr9ynv0GpR0e+MBYO6N37U2mTl6ZATu8yUwADRwBTXtdhRGsjqcvXUTCt9lCmFEefj7xRuZ6VLLAdH7LiuypK5wo1R9OCrw3iG1QqlVrRcEawLZVGo92F/vQ4VfvNzFTNT9wWYz4DlVGduECfXURKBW/gbieopsuM+usuJfaq9NtVtjkQ/hKuFR41hO+6aWj2iwIte34Fc4t+bUKrXLmNmEDKebWymYGECg5AnSAhNU/wh24jpLSnBwRbjKHZ8VTfcJU+EaBOIKG2OnfwlXhuEDPXHSdlcR6VbmVG2jCocDWYSZTG1gO5EGMriKgZAKpYE6M+QUoLjqjnQxi4YFrYOpRU5hVTAQ8ZCgjpLZz4yJTTBhVPimZCZhxHiIUyYRBGytc5RagQd0y39ulSrb2tElBhf80aVQfFBlUHX2i3MomHKnkk6DUoBPRCDbirQi2EMJwuTQoJ9p9zdk4XZGCqTi5udMosch0lTJhXEbhAz0DOUT3eAoeDiP7RCaLWgaOEhcez2r31wKUZC4b+n2g87K4n+nupNLqRXBcTB5b0X2mVM5TqzW4KmpWONkym1mBrt4H/Eqm+Rrnotl+/iHS4zgICB1gwJT2Of/C4ugGi5xXC0JdJ2VUu4dzT6Cbx1JxtCHEt/dhCrTOxWCn0GVMqyrS2yq1doZlUXzhWIMCACc6MBBhJlxQEdcItlOpK403fwg+UOoBBDVzQVEDCB+0ajRuVe37XMBMDwe9X078pkxCDfIdlGE3dQiFxNNriJCwxBqA7gphTf/pcppym6u0hPEhNyPKP0FRp3CmQmKoSyqP5Tc+LiQW5C5rvSa96vKaMQUBHxXcmsA6D0OEpogaDUpxXyVqDYRUKEWhWqqxwyxMqT81UpNcqVLljOpV2eozNwXO/hCUCfaLwFzWuwCgYblNkmSnOE29Z8NVwLmsPvTZOcuMqXEMZuuD4YcO2TuVKIndcbQNOvzGDCNWqxv5jSqfFOqgU6e6p0W0/99W23W4gBMgDOsqUJ0c36TQ4/Ios/lRU+0OYBlBz5yE3Q7IbdJTWx18RxjaLhTGXFUpgF2+n9Qy5tNUmC2EH82WH0jwzQZCbdT/lOkiQFRN23aVSqh/8AvTjDIhU3gJr5QcuYAmukymmfGWgpzCzITTqOoIJ6nCJRY07hCmwbBV6nLbd9IGc9caXZhPdaE1wKHlGpVb0nUmu3CAgQgRcnC5NGjTq9soCNCEzGPLHSfBOY6CE3twuJpmqBlUxa3wk+kAn0wUKQVkZQ7kAh1OcGoAuy7QkDQvaNyhoUTCPcrY8NWmCFw8luerIWdJRUJzAcpuhbKdSzKzGFdVBTYuPhJAQqCVdO2jmk7FEVW7ZQrybXYKr1jSrtu2QNwkJ5hVK9SobKQXD8MKIk5PQRO6cARBXDgcPxBb9+UlCE6CnmzKYbzssDbqA6Kht7lKvBwmOkdB8FbiieyjkrkltcF26a+EHhEc53NU/tamU7cBEFWyq5qUzLMhDiBV/aVLz3UzlHiOIOKhhVDbDpTO7KbhBxIhqYDOUxiiPK93KqQm5UdQQQVUwm5ai2cJu2dONJFMwm7eDKLZVX/EJjR6QUea5XAqt61tBcFy/pNa5HZNHbqUdff6I6Sp6X/aBnUpxynPkHKom5gPgKOtqqGMBUNkOoprI0LoQdcdk7mux6X4D7KCnQ+M5wojxHCB6hhQi3unwEyYCiFJccI02u3TuBaTIdC/DH08rl8Qz4un/aLar/AJtCr8K+q20hUeLqcC/lv2U/jR2/FNaGCB18ZRubeNwmG5oPgi1XBSAjVkw1NuJRbhWvRaYkpuNlCjrlF5mAsndWq0boiU12bXaE2iSmVGv263utCFMBf1Bwp1mlUq73bBV6nEBUabuSGqnTsCY3KKB/hVQXBUWCyAuIYWZapBb3KvSFqY4t9plUnscriwqk8FM6p9oODup9RrN1xPMPcFR4p1OGvCbUDuoIIKse5XuAwqdScFVKvLbcncdUBhjZT6fNb3ePeqog+aVepCjKretR8wo0cJ3UW41dpt+hOpPWcKpnDUGvp7KnWnDtCCUGjZGiyZTBY4t6yYQMo9BiUzCHgc61ZqFARqEAj4y5NHjf6QQ8BcAt9IWdHGASpDBJXNfUMNGF+YNgrqn0oefaLH+nKKqtrICsE/huaJq5K4ZwtsGIQd6PXUN3Y1AWiB0zq5cpo9J9EO2UNp4Yg505agdQy0qfrwAdJCIndc23DlUJfup5RVLiabxug4HZOcG7r8RTG6PFUxtn/hfiqXv/APiaC83nTj6PMLCqTIVUS+5Uri3KtKa2FaniNlIO6+Dr2qrUbUEhQC1VJOEW/atU4VEicKlMZVR0ZCY8PEhSg4FPe1m6fxP+ITObUzEIvrNRr1BhX16myFOtHyTG1phzlyhMlWBP4cFcpzfimVjs5NfKDgVIQQ0CLBuqhDMKpVA2XYGBzlX4+gztGVwfHMqdh8WyHyJK38xCGyt0retWfJDU7IHEqUf0ZKkhXgJ6B0BU6lMdD7TpVp3ZCZVIwUSE4wVSN2U+dwgZz1VNkxHR7z6TRoQgI63m0SmsL8lbba3BDQ6nrqPtymtLzPjuVUuAuTS5N6jnSAUWxsmmdCfWlRstwgA8ICOokBGqNgoeU/hy03sKpuvGdMhE5joY2M+F38IOqfWrm3CFycdhTRWbvlPqvAgNV9ZuSmGR5SoVSoKZyqzictTxc3dUmiluqjuV3UiVwjhWbd7Rag0KowOaQuFqAjl+xpxhild9KnWp1PiVTZKY2B0OErlp1JVeFBKqjlUwAhgJ0D0mJzIyFTpB5TmvoNmUW8QTITnVaGYVB1OsN8oUWD0gxozrUbKZSQEdUBVWj5JoB2VqA0CCfUFJhcUKoqCQuJ4L8U6+UOA4ijUBpmQn8HXrfJyo/wBKpsy/KbwlEGbVt4nC5cyN1d5bggVcgqw20KZuOlvaYRkIGf0kJ1OURhfygi3/ABV3RVxlNdKlPZc+E+k9vxQeT2uCa51Iwm1WuVIb9ThKa2EVlyjpnqOeoanV7rDlX6ueAjVEwmtvy7wwoVo0f8UAgfFUFpuCBKj3o91rUxlohB3pynSVzW/aBL/4VgCgDQuhH8upPoqeh72sEuR4oHDMlMENHiOpQ1IlDzOMCSh+bL3Ko1rcj0qLg7EKpTxCo/4lcMBTqEDorl9DibmKjU5rA5SKpkotjK4cSPA9gVajfBQpGEaOU3hzKfRhhXCtFlyqgFhlMFSkA5uQmvbVCrcM6keZRVHjg53Lfv0R4d0abqf9v/pU33DQIIuDRJXFcZc8N9JrgM0nYVPiLWm4qjWD+g7eMgEZXIbMhAQh47UBCA96VvWhTQbhCA6HYzofGfI3EhSgnCUHRgqVKrGcBNMBAp/2gZTxJCd2uCq0Tu1UHEgg9JcG7oVA7ARMIdJ6LQrVarVb1DqOVVtCuICNQwi+5sptIk3E6GVe76WSojxbIS4IY8JEoE0zB1tJfJRTm3BQ4bI1gMIONV0OOExjGbDpjKc0PEFMeZsfusDK5s/EJ9Sp6X4d9Y95VKiyl8fGevcJpkdQ38FaXGxEPAxlPDtimCPaujJUB2Wq9zHJnEM9lBwOnG0+65cC8AFiDADK4yLQFw3EGm61/vwN76pfpIWECDsqwlhC4cwwNVd0CE0WiE+mHZGCg5zRFRV+C5hvpKlxbmEU+IEH78xDr7mptQbLmNmJUhcU976jW/tTaNGMhObQ/aFVoNqZaEKFakLqRXD8dWc2CBKb/ViKltVuFTqsqiWGf1A6ANK3rQlM3CHQUBGEf0J6qnaZUAoyAg8+1hwU2m0r0g6XJquW6Zc3CBdcJVRgcFTmIQMO6XG7ZMbnKtA1lZWVHVKnrCGrk6U8uIhclrRJKJNyqMI3TA2AQgdHJu3krG3Kp7eKekzGECVCfRa9FpAhw/5V7qe+QqdQPGOricU5TaY3KIQZ+jOU+saQLRkpjXsALDKZUDjCkIkBB12gkK8+wp6iJqSnFPtlYbsmuZU23TiWnIhYeFynRAVNlVntBxjuXEfmCGqlSeIhHnqqx7xEo8NWf6QqVmiCJQqVSJtQrN94R4ho2QqOds1X1f8AFVqrmiIVKnyxCrA80D0nOdSPcEKjSpargSqtODLUyrzRa7cJlRr9tXv5VT/acxldsOVOaHY7ZB4PhjTfCCcxr/kvwlLeE6naJBVbhxxIGYQ4c0QW1xI+1zOT2BU6t7SSFTAcxcTwV5lu64bgYM1EOFa3LcFBzm4f0Sh+jGo0retW7hBHpP6fiGl7O1U3+imkJ1MOTRaYRgp7yzCDk3aStk1wcYCdLBKdVBbK51wkLh3XlxCqCQqT7250kJ7r+1MZCcQzJXMn4qxztyuU1ABu36EdBTk7tMqq/wBKlSzc7Q9jkCEXQpLkMeSu25hVEyz9AWznocwFFjhlMfco6OMP5doQ285MKZ0OFcTsoTqji/lsTWNZsngt+KbTb8gnMuwvwrvTlGIRHUJOCjnCIACFUNlPqVHjAXJcUOHcqlBzSmOc0wm53UCV2hW3un0oCDY0gBNd6VSQZVF9wUA7oNA21e0PbaVRfItO4XFgxc1S2rSkpnLGFy2egoVdktkLgxLyUabTmFY70VUqVKaPEXYe2UKrKfc1Me2oFsnmwXKnt4OZJtaojoCb2mFuqv8ATmEyzC4egKDC1VuJFCqKZGCsHKbqYaZ0n0nSdkJjP6iv6Tn/AEuc1N3CCPSf0G3grUbstVIfawnPg4QIRcHYTaJFQ/SAzlFgcgAwIsu3RoBrS1GnUZMFcNX5Lsq8OEhB7aQLkK+cpr2O9qQ3ZXPOybf+7yFyuV2k9FqB6DoWyMINE51qAFOuGybAU+aDRdj49J/QFOxkIGROrnhuFUAc7KG2pMdZ6KjwwSqdSo/CAqUtsocSz92EK7HGAVcnPJwzdMbaNHr4G4bJpBEhEwhqd+iQE6fSLf8AJNAb6QhF4GFP8J7b9wm8O3co0WFCkBuuW3pKc32E4lMbYI6IdO6qUrwr6lEpjjXZJEKoXcOZGQr6NUSFQLxj0u5RO6YzkVP4OtdxqGxqFO3Lk/8AMwFRJo4KDg4IiRCFZ9AwdlRrCs24dTnGobGpjQwQOotuVIzgor0uNYx9OXjZf06sagsPrWFUcGCSuHruqzjH2h/HhHjHVW9IMBlP4IsN1IwuEfX5ltRA9Tv1LRBKdTnZObUBQMbprGFWgaNqPuhNa45OhyuJFuVbccKhQ7MlOpjZMogKwXSohMI8jtkQFATWglAxoNZQQ1KIUWoiUR/igftPflV6mJam18AoGfJlAyqguCpOub0TmB5ZTjCaXEL8U9jy14Qr037FU6jSInSpUFJtzk7jKbDduUeNvEWJrrhOp8LqjW7q9x9Kz2rZ9qwHdcpn0iwKsyC2EBA1rg+lSmzuRY6+aabWdMVAg4HSYTtk0u9qVJ9pv2goCKa2JCz6WfGcL+QhUHvqNJpQEJ7Q4ZXI5RmmUziWbOwg4H2pCcJCY70VUOICc+0QxNaXnKawJ1K4Qml9A52TajX7FGk07o0bc00yoHY967J35mGprQwQOoII9rw70iV6Tmh4LSv6dSNKpUYfWkp74Epofxp7sN//AKmtDRAVoU279Z8g6BpW9JmjR3DSUehy26SY0MxhAz+gAN06vpNeEadWgZ9KnWbU2TjhU6VvRxecBUKNrJcqryIhBzkO5RC+adQY/cJtAU8sRe5m6bUD9ug4XMHpAz0D+FlUx7Onx6IQCCPQ7orw3EJrZBhYDSycrh6x2Ka6fI8Fzu0oXhNDmboFOeGboPNTZNaGiB5i1BFoL1uYQYNlyA344VekX4ccKlwjaeyFMBWWyWpjw/HvQoGepzowF3nATKDW5OT1HK4wFoa8elTdLZ0lPFzgFScXyw+kGgbIgHdGg30i51LfZB94Ti7YIMA6zgz5CvkY0cxrt0GxhG8bJpJ3HQbmmQg4OUBOosfuF+FsywwqvFHhzFUShxI+ihxLCjxHMNrUKeExoQGhFwhUuyqZW+2lVgOfaqcaKewTuLqP+JV72/3VTLSO3rGjhc2EyYyvWjQMnWq3n9ia0MFo6P8ASn9PX9JsydB8ho+SmlzFzvtSDtodBgxrct0TGhMQTrP6KvSMk00ziX06kVThMcHiW61H+gmtuGU5vbCZ+bV/0jDXZQEK24omFc76Qn2iE+i9jw5qeC4QMINqt9yu9Oo3/IqnSAOUGNGyAA0cfSDHhWvQEBRo3bQaBBHrd/CdTD2wUyi2mIVej3y1ULajMiEwxjo9KVKuUauqNBtVMYk6FEg4C5fsq5zTnZDy80TBxpKJwSmCAhpCA14kOY7mMVGqKrZ0gAzo5wbujVC5zDi5XAZlU3cyXN9qWUhCa573fx1locIKZT5H+k+oGhAuIwoIMlNdbXMBcwe0K2YUpxBCaRsFHgcLhCbcAgZ8bd/CSXYaqtItEtOVR4sl1lXX+pDIVJoLAjw4lcqCmkrYygQdSWBNiMacRnA3R4ftgqlwwulVaYeYVOlUabmptTMOx1BDRwPpXWiHK8FMO+j3QMbqnTFMfpxqNax2QwdG7jQtRagFbDsKUdCMzpUqBohNyFtoNCm487sZQzqDNQhVaILzKp8LAupmChXq0cVMocS2oIZugxNEBcS4huFwtPlpzQ7U1mNMEp3F0m7FOrO4jtp7plLiRmUBAz0x0QoUaHCBkYQ2QlCVKGp6NtANCqrGkZTGu/ag2p8k18iU58I1D6VxapnIUIDOtR1qFO43HU/SDQFNqkFAjbybo/TsoARhEVOFqXTLSpB2XqFHU/u7V+DptGN00OHbKqGo3Icjxh2DU19XinWHAWwQosdlzVxOGimzcptNrWWekKbW+K15eZ2TdlVdY2VRHb0kYkIH78JEZ0hQi36QPW0i4ppnrkvMBAQjlPoNcgH0NshNrMcv6ie4LhTNMaPamGVCtKbU9EKpxDWqnVaXSVc07J1VzVQdzqs/SITW5UaRKGOgIIGdCi0EZRpNOVySzLXJrajx34TWNbt5nXYjSVKnwjQ7KoHvcJ2R0b8ghqRrUcRshU/y0JhWuJldybJ36p+kyVKnyRGyvI3CdxAHpc+Kt7hgqq3IKZgKo2U2kOZIWQua2JKg1Dc5QZwnl3oKXAYCtfU+a5bPpWNGwUecqOka50doemowv7UxgYIGjmBy5IRaGjC3WEDG6Gu7soCNQ5pdAOdMJ1IHZOp1PRTakYd5S32N18hBTAD1vLjhipss0gaPbOypEtq2ko5xpF/ET9Dx1HWtVLLCSmbKu29kKiOwdITtkwz4HbeOU2nBKYInWVeFcPtfNAAYHQU+m164mibu1cHxDW/luU6OZ7amPDk7dNTqDHK2m3DgjSC4h1phcG23IV3rq/0rvvSUAggiowhq6fXiuEx0zpKuRJ9IeGFWEQho3cIanUhPYHBNa8e0SZyt9kGH2oUdEo/aukSECPXmC5TZmFUYCFaQAELlUqViYam1C3dqFYFPteV6wgPPPrrIlNEDoHSUJ9o9DjaJQ1edH7YUmE2rmCsOwoNPITHB+Ro3714mpa2PZQplp5ntN4gO6YtyPDK7lLx6Vz/8VF26aAdlZAwUNuiZ26I1cQHoPacBWvPtWFncE1wdt4uJdDFTxTDU1VT+0JuBHS1Zcf4RZ7CGepzw3JQc6rluy72D7QeDg6kwgblEKekmFOkaQOt4juQZJlVOEv7gmmtTwE3iR+4Jrg7IT6f7ggCUBo8wn8SUyiaxucqVOwIjwNEGENAgivXleSBhMaWfIzoTCEnT/StndFoKkjdBbOQ6xpX9as+XW9OdCFQ+1FxnQuCuV2hdCD5RFwXexXiZagPbfETG/QBGn+9SxBqgKASgLT+gA7idCi5w9Iaz9odAQTvD8jPQ/ZUKk9p0c1PYqUjdBBgbsjKY70dHODBJTnGplCmXGXKqwekyu5gzlCuwrmtV7Vl23gLxNqHSR7Qg56Pl13XfFcse0BGpEGR1uqNbuvxDTgIVD9LinG7uGFTtiQmLeoh0z3EIIlF0FB/pB/2rrhhBp9p4c3ITaXM7n6vbIVNzjgruVv2oCKtUxvqXBCdz5H/FNATAi0FctGh7ZhNqx2v3VwOtR9qZR5rrzsgI28TjBCGoRXpb+T5O/wBacw03W+kM5Kn6TDJ6DlNwt0e3qGtb1q35BDqciE5pXeNkXVB6T3vCZUcUCUDo42OTXaOY1+4TSGm3x2q0/a7vAdkNv0M98dRRCHQNDpmeoul1o6X7LmFtWWoVavtB4dhGFIQeFvoQrsKecUQGBBrnBP4V7hAchwfpxX4Zi5DRuvw1MhU6PL2PW+qGiUwkPuPtfz1NwnVC31hNeXCYTnYQEDqKGOpzTu1Nddo+q1pj2jxAG4KmrV2wF+FYfnlDh6TO5rVKMHBTz+FqR6KFURhB+U09JID8o1XegpLt05wmG7oU3Tcngt21dsqfx6GjrPZkbIuxhNb5j2nKEeuhzA/dcos+KFYZQqynfmugJotEdeQgZ0dsmwgghoVGPJVfy2Fyogtpi7dOrZtYMr8O5xuqFCm0IHNiBh8a7aHKGkx0nCGlb1q35BDqOrrvSl30qt8bIF43TXFAwrlXFzFRcm6OaH7qbcHwnxF+VzLjA8v+un30TqUOgaRoVvq/caUhuT01HOq4CpU4CAlyhEKEQpc3ARa4+029o7jKqOM2wmdqOTLk0giR4N+goU2zjZQibcqZ1JWUcO8JwgPevvpL3jirfShyDA1BvvUoosdU+KPB0nGX5QpU6J+Mqu+lbgZXDcW1w7t0HTpsvkoCdTkyCn3OfYmNa3ZBEShoQm7atznw2odEeIiUBCHTaJlVqftq4fDcq5Bw1J6N1kKq520JrrRlAyoQBHtBFevJWp8xlqbsrQDOuxTmXPUaBv30BEIH0hqROEARtpW9at+Q0z0nWFEJ1Mu9p1CCg21SmulHLVTYYBTI1ey4QU142PnvaPa5zfSBJQEJ0AygZ8lvdPhKuEK76RcfpXoOnTmD2gVKJUouCa5Eo3HZVKTn+1Y6N0yoWGx/RWqx2hNZAWwTAj9IopxTX3OgIaA8yoU5uFyhEIU3N2K70P56tlvruotcvjpaQZCDgcKNaw7Cmm5so+cKvhzXJpkT0lWkoDVzGu3XEU6dJ5c5DjK7DjZcNx94h+6a4Re5U3Xi7SqSDbTQoy3O6DXjfWEHfaKGDpVMBNEDxe5VwQKlXBE/SHij6U9Dkc4QEalv0ocPaIJQJbuhnoq7gJogIatI3CK9eUCOg5UGZXMC5jQg8HoGhQPrQlAaEqt61b8hpKKlToeoqCqlMO2wrHMQfPbKud8U4OZ3NdhUOJvbkJtVjtlJT2XJpI7T5XMv3QaBso1q4VF0hN28FyBnyQh0khCEWoXzBVpacqI6WriwOWXFN4iswSCufxb8tKHF1KYms1U6jajjUKdxTB6P/SP9QojBTK9NwlpQI0dC4h/LYXLhwYlM2VV4pMLiuDpwy4+1UBkR4xrMJ2VHtXKUNz0FMOI/QvhxhNwOiSdlB0n0pUzpxXD8xst3XLc5v2uVbumk1hYdkKoaIaEKlR2zYVNzWmHb6lgKEsMFbotU2YKe4NyUHtdsU/OPI3ryix0zKa5/tF32ENLT6KBd7Uo9ByrMz4LfpXH2g8HQ5fKuQQUSgIRXrylNMjUn6UlNadygQVjQdP8AKlAZnoretAE3cKVKJRQGjlP2g4HbphcTTfgtKpNcPaIa4INGxXKYfShOahU+1Kd9oOnUkDJV93xUH76besid0Gctx+lcIV4U9R/RndNmVCKbndHpnK43+0r8qpU/C0JG5VDhq1c31im0w0QixGk0qtwNOq7GF+AqA/LCPCXjucUeAs7qZgqvT4t4tOVT4vli2q2EzjOHib1x3GU6zRSpGZKYLWgKZqR4r/pXmUHSqjzsoBbC4erzJafWsIO7o6HbIA0sFDp38UoG7PRv0ZlRGr3Bjbim0+c7mFGmAFw4BUaVGByZUxB6LP8AHCa6d08t2KANN0HIT6DHpodTq2uQAKiP010bq4dMeQpzJQL27rlvOUGvYmGVdCDghp68R6AYMaFTEgqbhIU/ahXE7JkxlTB0GkSZ1HRW9ag5GsouQ0OgEdREhcu35FBijofTvQuG6uBwrI+KBW6c2UBHmqMFd1s7I8HTPsp3CH9rlToVW7vQD/tPdVp7iQmEOEjyws9ZUK1M2TgmYwekr2uNeGUkWwblwtHmxWq/8KVLvpdyt/lBoG3RCexh3R/ptMuLin8FTpUrwNkx17A5OqcuuPC7u2UID7Q0Ce11N97UDOhTWw+eiU4SITdujfw7qBo4Gn3MQMieuOh//wAipZ6C5WE/4rh2wNTsqWXOaU36PQWgqwQojBXOa3DkKzHugoAa3ej4CfLaFEaYU9TkM+Bw1ChctBqneV6/QEFuWp7eY3CaIGkJzJTS4BYeENtSfpNadLk1wO2tb1q35Doc2dkNHeHE6xpeBuuY37Qe0otBVzxiEW1dwmOd7Q8sriK2LGbqlT5bc79RpEGaZhCoQYepnZD9CSpUafEyinmEDI6SMyq9E8UYnATeEBqWAoCBA63OsR4oE2syVD0GZkp0gYT64iyoIXCPupW/S4n+VRcXM6iQFl6AhQrVCgoKEKfLcXfauCvHpVA5vc1UazarZClHJ873AYTRaIHQ8Pp5Zt4C8DCdVqGqGelxdd1OKdP5FcPS5bdKoMqn8eh9IOyN0A4779AZGVP2rrzhQE6m2oIcE1rqO2QgQ8YWVbO6jrKH6COv4oGev3qNBp6Xr9Cf46SIMhW/4pgIOdCJWyGybnRzPYTKmIKmVW9at+Q0nTCI0PglNaN+h9RrBlSHJ1EOOE2kG/z0DtJ0mFzJ8AOmVZzHFrk1jWQ1vge24IAUe4ptZrjHkM9DjATBdnUIq4hV3YVN2OglSd02YwqdOzplSAridghTky5NpMp/AdBAOCuUKVTtMSnUXO3KHbhDQlSpJ2QZ9+F8xhF+JVJvsotVShDTCoCKY85Vgm730n4pmRPV8kGgIxeXFUmEuvfvqWz1VapaR6Qrs2lVq/L7hlUuMpVvincVSbiVNStjYJjAwQOg0sy1S9u4QdKlyF09UmcqIRfHpXIGUVM/o4jPWOuF68oM6zp3tP8ACBu6C1R9prwVI+1g6DUsDt1y/pVvWrRlAItlFgKtA0hEeFjwRhSt9CwHdRbsmZz0FMyjczbKvBwUG2K43Q1DqmdtDJ2Qba9DJ8BlWTuuU1Gn6CacKfDZmeisS51oQwI1GhCqiZCp1rHWuQdqd1XfawqmIaETCL3fSbeVa77RH8o0rvaawN1PTXbc1Uzc0HSNTnoPgqs7gRo9waJKDmPO6p9uNYO6nznQqjUcDy3KYVydWY35IV6TzEoW+tOa0/FU2yJUFAQp1OMrfQmFxdS8wFbWejwdV25VlThjK4axwQEdb2kjBRrGn/cCaQ7I6d+gtDlY9pwnOcPSbxAlNqByB0P6D+PENAivXWTbv01XRhN26v8ASLpwi60ZTXSNHUhU3QpNHpABR11/WrdwhrJ1d4K9S1sDdUJtQ6CwO3QaG7dB2Q2Vw20fxDaT7U14dnR1RrTBKNQDCaahRc9vpGrcbWITCc5zPkmjC94Qx5HYymZzpcNCYV38IvjdAypV4UzpchTAMoPBxqNCnNh0rjOH5lO5m4XC3lgOrzmFywd1Gh8r8thUKpok06iDg7I1KaPfRHgeARlcskfIrkD2jw7dgjSeD2lB331HolSFIUk7KCFd9qdJnTiG1ouppnOfWDXYUuf8Qvw9aZDkeFc/5lf+PaE7gT+wo0eKutuwqn5TLQVQkN3QJ6SqlY0zhMrPeJVVzvZVNwc/K5P0g6pS/lPHPGFTIpmEyoUHT4LLfiua26w76ExnwVHWiVAqDuCFBsYXcxc4TBQdd0z4z4xoV663CQhLcHoqVBdCYetw9hDuGUBKaI8db1qBJCjqd4CAU0Y8R7jboWg7o9olNY2E/gqZNzcJvDPGQ5Cye7dXT8Qiak4CLXuBkqhV5buU/RzbhCpviWH0gPI/tyjUnJVKqdmhCkXGXFBobt02hWKwIUwNHNlNJRY1yDC3YqSh0VJGWpl9JxPpNN2kS6eo+Q0xUdLtk/h7f7abW4mnh+UONbNpQrAlCsCbVH343/Epnx6CgIWVlTCvHXZJ1wd1VDqJupqQSB76H0hUeHH10Eq5AyjSafSpjMdT3J3ccplTl9qebxgrljlyuHrtth5RdznQ3ZUW2GEKDXZRp8p38JsDwvptqboNdTH2i+cNQ2z1vEmFGIQNhgqZRAO6LeW6WptZpwp+v0dqlwQM6hN0K9eFuNKjrGkpplM8ET4xpW9at+Q0jM9J8FvV70c61XP3AQJITW26vFzYTTjWo0kS3dUq1/a7B14ihfBG6puuGd9Kzf3dcwplbIG/ZBsaVMp9OZaAqFM02AO/QjpIndYap82yBnV5hpQ20LQU/hqZzCPDhGk5ncqb72z43/Epm3TcNZCdamRMDolTPS/MBDUd2eqqDbhM20/f1ParC42hcoMGE6mEaLdlyGfSp8O9plqpB37ggITojKonEq6fFVw/wRLtKzbmqmV3J1xw5AtGwVJ9w8MImFOp6t9IKkq502kIaFeugEklA9N1u64ouMBqsfuqZ9qeseWv61b8hqeg6nyGTsgwDRu5HS7tM+kM68RSLhezcKjxAqCHYKNVg9p/E0QMuTeJpPMsOQmV2ObdKa8V/jshgdEgIPB2RhybVYTaCiSQUz46FPIjCpttH6IanRzSdijSJ3KLXMy1NdcJ1lbeIjWoYb0O3GpdyHfwm1mO8RyFT13VqewnZGm4+0eHncpnDBohchiLPrWCg3q9p8gdqYCG9yqSe0e0BAgddwY6Dp+7qcS/tamsDNlCLGo0Wkq1o1FXutXEVIahUqNbMYVPigRKFUFA58FdpLZBVPZT0nCGkIsLThBESrImU1tqCnqlCoEXCY0hZHRlSUMhbabmNN3oaFetSUAPSGu+hbKDQE4IBBR+jr+tW/IdZ6crKe6Ah4nkDKY+8T0OFwhUHFzc/wCuh1Fj/kE8MpCA2VUpsGQMqjwdp7k7gmiC30uCl5f9SrQm/R1MIfxoeEonNqbwbWGWlZaMouFXAVSg3d5TnWjsTuZEtcmVj/8Akx4CJQ65Q6iHHIKZUDsJwsNwTXXbeU7JuBGjhJHRVymkkZ0c25Fo+KoPMmm7U9dEYUdUazmEdkNSJQOpIC5rboROgyZ8EB+6FMBbVI6alR1R3LamtDBA6HGNJCLi7DEaWMbp3NNSyoEAAITuHpP3CdwY/wDxmEwuZh6BnrdgZTCFg9LsobanKYZ30OklDphQrQqtO7ZMDmjKNUN3UhyAjScIP+kXYyhtodkwQNNnTqV60Kcx04KBgZ1I6OYJhbq3pnRuXT5q3rVu4Q0PQfBPL32Uz4QJymw0wg9rjA6G4c5TqX5tCdkwm02tTnhu6/E05iVTIFU2+0XIQUTC5rUyq15gdM349IMa3ZPptqfJcSIp4QBuRAO6N1PLU14eJHUPCB0nQ0hNwUH2osP6D30R0OYrYE+0ziGuNpwfA53pRGykeH2jnqvAwVKiclPAcIKpg/A7JpLzA2CAA6zgIbaVB+YD0Va0Lh6douPvocYVStG6oF9VudkKbRrxAc94e39qY8OGpzui1zMtTKgqdW6gINIV33oVChDUmFDiZRLwMZTarXY9qQBJXMk4QPiLQ4QU2m5mWIcx26NJ0bqx0QSvw7V+HH2mYEdM9wGgTl61IQUQgUdSJVR4Y8N9oZCuhXhO4hrV+JE2tU1T6QdVG7Va938Josx4xrW9at3CHU7wEzgKzl5CY6R4C4BFtybUFJ9rtZTg4uViGE57W7lc0bqkbjcn1xszJXLqV3EPVLhqdPMLiXlvFgJzWvElVAWQKZyUyid6hlCkwek6mDkbo1bPkEyqx+QdKlYF1jUyUBpXEsKDrm3DUAUnSdj0u4ik11hd4gh0OMBNfhSgZRTXEYCEnouVxVyNR07IP+1v0teOaem6HR08RSzIXD8XBsq9RMKj3EnQiUJG6nqlNM9b2B4hyHY+xXIPvNoRFkAKm0hufA53rWpu0a160djd1T4ec1EBGgOjhIXEYMLgv7I1cbQmDtVKqWPLfQTHXidSuXabm7q9w36ShqbmbJvEAmCv9dBMCUB71q0Q/KDCw5Te7ZAeL0gMdA0cDuFJQ0KZJ7kD9oIr10bIKOiU6kHGShcxEOcjwxduUOFpjJTWNZ8R008EtR8lb1q3cdZ6jhb6bptFrBDED0mSu4q37Vyc1r9woscAHaXJ4LtvSbWbs7CNUvxSCrcIS26ZKZw5Le9U6TWKI2QGjuFFU3vT3nhxD1Rfzal/pB09DqbXKvXfQ/LXDNxc5DWoYCZxvKkHZUK/4gS3Q53RuZ8FUr12fFkoVOLq/wDqqVMtHeZKfRY8QQjQrU8UnQEybRdv4B01fimkNVwQcnEkYTA5m6vbMdUINUDpquiExntbBCu33q8fSBnoIuCdw7Xbrh6hDjSd66Xqi21sdDxI6nHNq28FcVOJ/tKnUq8Pc2quDqguLid04hxEeGAhjQn83R7rWymNtHQQi6N06sgG1bnFURawDWt6CGyqscx/8KkI6jI2R4hjPlhCvSJgO0e+E3PQ+i16Zeww7oqOjCaOioCdkxhp+P34CJCYZCJVxquLWprbRAW6GFK9dEIdG+yAjxuGZCunxDSt61buOs6QnPDN1Mqekp2ya6dJTidmqI1hQh3V5PrU4VMc2oahCiETOOifpNaQM6V6QrC1VaL+E7hsqPHF3pNfUeMNj/aLKv8AkqZds9OqEbBMpPc/mPTOHaN1yo+JTuYwSMr86pvhcRSPLiU2iITKPJdI21rvs+K4eo583BDof+JuJa7Co8RzO1wh3WOgoid1YAo6Cxp3VpGyB8bqTS+UBCqfSexUX3Ng6++gfWlRkVSVScSIPQ44Q6jI6P3+B/eIVMQ1VGteIcm8DSc64bLkMp9zBlAyJ8Q2VbDg4K6BJQPMP8L30HCA+1Eqoy0w32hqBe6dKrZaqLg5vXVp8wZVXhzSfcz0qfFNqMBT6t1SEwQOkgOEI3s2ym1mnBwpXzQx1Tb4hufDNphVZIVNgYICCGkL105D50CfLsNTcDywCvceAa1vWrfkEOjJOdDqQDgo042TSCJHWQCjhDvMIADpJJwEGAKrzGAmnlM4lx3Yq/FU6jbEyoxrUKpqbJojUu9BARoTAVNwOU995sTKbaYho6SYOtS6O1fmD5J0W5TKzHDdF0rcSnNf+1UqTuZc/U3ekb/S5jvYW4XGMcIqU9wqHHB/bUwVKPEUwYJ6B499H0w9MB2JUeE/IaESquAqNQNqQdahiOj3pVHerRamOntO+hMqJMdM9R36Tgou+kQXJ2MIIt5m+2hXDvJBafXiZUu2Cq7Sn1G1IB2T32NimmiBnrrUy4SFTNzc6Odm0Ialoa6R1Fye56Lmza5VODa/uami093pNMtnrfSa/dBpZiUOsiU3tMHwPdaFTmJKnoJQdrUHMNoTLjh40CCCK9dV1uFbf8kOn34iJQ8Vb1q35DouzAR0PSJpvzt4H/FM+SlSp0JhDGsBVmMqmSNk/h7aV3tUnAtwgiYUEoY1qlxNrQrBTbKpNgXffU/BB6CYVoce5YBhboE03WnY6Nc4Vi07dTqT7ibl3gd2U+lTqbrh2OLO8yFxFIPpFqocVWpGzcKlVbWbc3onyOxkIVAfCLnVJ0G6rmGJjbnAt1qi5DboCqyDK57RiFLnPuaEKlwQCaPfSTHSUBOSiYEofygpTwYTRo/LgFUMNQECNS7lcUD6PgJhF12AmgNEBHZcllQZQ4cNfLdvAU02u0b0P2Tdug5Vi5arcPPcN1Scdx/yq7GlvMCae0eAiU8PZlU3XDU9BEoSN+vd3TGpBGyaZCYzuLjqEEE4wgZHU3rP34z9hXgbp3E0mbuQ4mkf3IVGn2gRqNKvrVu41e60JgIGd9TrOju7CyxA9R78BCm2Vy2hEOn+FP0mue8INIT7wi+p6CBMZReAJWLB/K9K/kVMplQOEhNBOXdVYSLetzbhGjnwmuJ9KpjKa7KquN0NTFxZtZcmmRKrtOHtXDl5m4dUJzR8UwQIXEVeUJQ4gc4duU+nDZp4K/EPGCwoaFFxB8hA3QrtmHLB6D9hB4KJgSuHqXToT3Qq4lqoPbSfb0MwS09JyrVEJpP4lPrS6ynuqbnA2v6h1DO/QU346bvVTIjorNB4mnPWThEq7KBVeoeWYVA9qDpJ0uhB09JTm+0w4gpvQ/4pj4TXz0SpRIKtPOBCcAQmVGsPLJQOg6y2MtQPgHUPD8XdAQQRC9dLimiOspu3jYRVdJQY36TmMIghONGicjCpupO+KDQtkFUqmmZOye9rwC06t3GjjCEkydSnODd0IdtrKAT3Bolyb9hA9D399gXxCY/c65cf4QAGB1VnO5oppzgBlO5b8FUS1vZEKOptQVHyD4WtDdKgndNMulUSHcQ5U3HmlvpOpB4hypfG0+vCP7h04hcOzmcSCnbL8QPpBBFOEo1+TUDHbeMi8wFYIhGnHxQe4fIIVJ2CkFGoxu5Qcx+QqvwMLhy5npNqNIQ+08SFW/LK4fiBUNursODup9RtMdxTuJZEhVK7ucHOwmcXBNgTeJOS5M4qm7fCBB26C8g4U6khokpoLjJ6hoXWNLk0Rvv0ca51MtqN9JpuEjpLsqdLQVliqjmUy1Mq2ttG6a4MCFQQi4e0alpkJtdrlcChqU4YTMjoqfAwqTZblPZGQi8hCqFeCrlKIRqBhyg+VxtI3CoPSoPubIU+FzZQDhpEKfIOt2yGROo0CK9dMez4R46TGsONN1Up3C1NBbgoYQ0LQ4Li+GeyH0DBXDcUKvY/DtG/IaTcUeg6EwphNN+UEGS652hyr43XMCvMTCpw4XJ+2EGOuH1oTOAgIEBHqq076gK5IPyXKAVSleIVKuWdlX/vph3EGf2oUGBO4fMsKit6QqVgYLUXVPpMqB2pd6VyutVapiVTcuDGC/7VFsOOlTscH6VDCYZHU3+87T+oPdTZLV/T6drJVd9jCUyQ3KHRUptqCHBMkCD4C4BbrbpIBVjfpP4djl+HsBgqle1oEYVV1sFoTa7QMoVWO2Kr0g7dUIp1hCjSqMA9BwjzXHGAm0mjfKqsACfw76tSQFT4VtMZ3TmRUCpsaWBckMMtQe5cz7CbUa/AUQjrUHfnZD+OpownbIsc9/ccIDPRVaH4KoVWMby3OyFcD71c5cwGSuaubKvlfJOcWplMbpjAFaCjSBQ4UTKHDsarQFC7gi4oaNkLfV3xKp1CE+s9NcXNlYKc07hCqWjK5oKlFocMqTTMKs65i4SvHZCBUoeEjM+M7qJPhdsqRluegJqKO3R7R/RkwJVFxf3IY6IQ1relX4Rtfu2KpNqMw4yrw0iUKjXbdTtHGAqxc5otVNtrYHTAK5TRsEUXGlWxsU58ZQqCJQl26iNkQVCghNcp0LofBTiHDCGRoWriGSwrguK5osduNeIfjlt3KptsaG9TmTkK1/2oP2jNN5uKpmVXfY2QqtRzlSEUySmB1JrXelSOjwHtLSqTsWqtTNSIVK5jyw9BrMCFV7/iE+ueGrC7IKFVrx2GVxrhXqNoNTGik2FWrU6h5TTkp1koIalEyh0krLlaPFUMNKZsiJXFMtMqizZpKPDA+1yXMy1c9zB3hHjqadxkj4qjxlKor2p1VjBLihW5rpTdtOJq2NxuqVOxud1Cq07hhUKgd2ooGKoChFgRd96EJrpwiAVbbt1S8GE2SJKGTKHRUcGiSuN4buvCFKq3vCZxvEMFspn9RrsHeJT/AOoF3pHiXHATKri6Ff3QqZzlB0BSHHKYU0Tv4I8DA3cK0TpYCuWAiwfSrUnOhzSm8SWYK/FD2qtQOyEKmEx1rlTJjKCH6SUMDxARoNDc4wNlRda+xFeugeEp5dOPFVdYwlUh2jR7rRKp4GoUoFV/WhKDQ4gFQ0CAg11MRMrmffQUVUkiFQaA21DwFuZTgLcprWjbR2p+kGxqQDpBp5XMZ9ovHpPM4cmcG01S5U+HDJglPZU/ywqTWASzxcaYdaqdQW4TzeIQEBNY68NjCr0y9kBU2OaZKlOFR5jYLlluWocxVQWkVCmuY4SFhEtCfxFAOMqr/UZ/LoDK4fggz8ytkri2tzyMO/hcJRr1TeDELnmDcZdMQuH4ZlEYGVAQ1JUTvoVKJhFxnCtJ3UDyO2TdtHtuCr0paHBUuIEdy/FUpiUCHbKxu8aVeBp1MjBTuH4nh3S03BGs6q/uXDlw9J/EBvaN1zK9YwxsBHgah73uyqdQVGyNCnjlulqDwWyotdcn1BTiUJdut3aFDfX49L5LgAo9dVe6o8MG3tVKQIgoUgQjwrPaDKIwU+nScYCq0bDhAwZVNipiApBQbJTGIeQfWp2VIQ3qLA4Qq3CTsFVouAwgKg3VN9QhM2ymEuCaUCh4S3MhB2YKHSfKXBu6fV5cT7QOhql2GIuqP7VTpcuIRXrSUZQ0/jwPCbt4eI2Epuyc9rBJK/EMqvABQPVj2rW/SIZKNvoKeh7HHYoMqfacKgX5h3TWlhyg2DPhIlRO6hQFErLUSpPvrsB3VapY7l0/kmUgO47owzuOhTKgJLdI+ldG6lT08fSNRkj0hXPxBXClxf3FDdMzVj68DqTmZpf9J3HNaI9pz3uMyvwNJ/cZymUOWfyqa5Tnul5x9IMaNgmhtIuCocL/APJdU9aQhoSo6DhNz5ycJpkaQhFxarWA7KpTov8Ak1PpMYL2YXDcQ2swffRxf9PFU8yngqlW5FCI7lwnDPu51XfT2u7hq8ftOmSuKdY2BuVSa5p7k9shCncbnIn0mm4nQqOgH1o+pCaZygPfVWq8psqbE+oXDtTalPaVDVDVxFEFEfsejRtqJjIQEo7Km1NHlIQOlT4phkeB1Nr8FP4Z1P45TGtKqU2qz0g4t3THByb4nj2pnPVsnOW/WNadcv4hw9Ksy9oj0m7J4Nd9voLtpgBSZwETaQSi4LBCjUaEZnrJUpr/AEuYEHdRdC/qDnOaLShxLmYcubQqNghU+GzLVSOIQ6pTjL8KeqUdCPF76SJTgR8Ua1oyEwyOqpUsGN1SD2i9wynVGs+RUF5nWtw9/c3dUySO7Q5RubsqdQOwd+ni3w2wblVeBqMFzVwwdSfLwqbw8qhaXOc3rJA3T67YNq7jUgbqjwTGs790AGiB0EB2Cmw3t1DghcVEdBRTd/JOsJuDGtR4Y8fyqjXE4Kkt3TgHNVdvLOFwFe4mmTPRAOdR9qrTFZtpTXOZ+W9T9Kq1xMjdMfcM6/ZVFlku+/ATGEGo7xqVKlSuLpOrkBvpNp8QQEOHn5FO4Jh2XKq0RgymuuEhfIQVVpT2uQ3tfqBKY1DrOPDUVMnwTChPpTkItvRpkOwgJVlgwmGR4zLE0yOgmFuoC+Jx4X3RDVSYN0YhNL6jZ2VGmKQgK0TJV0Ll8zLkGBmF6xoTCBnoYfXU9fEKS8yVghQRsmPdOUHAovhF7kHFytKewRlHh6dRtpQ/pgbljk19ThjFYY+wqnHUZ7d1w/EMqiQpU6jRmSSipV3WUPCOt4BwqYIwgSN+h7nE2sTRyxJGU0OOXp9JtXDggI26NndD6YOUHEfJAzpKay515USIXH04piPtUg8PCoANkdVZlR0ct0IcHc66s6UaNMjIVPgqFN14Getzbk0nY6ADQ9DtDv4T1u+Wv9Q+AKp5aJUZVTDVxLiQJX9PaLp1f8Shto7ZNM6VAC0yqXxRT0NkU74qnt4H/IaH5BHQ6O0Zt0ESiywyNHNuCeNadNAeAodR30fsmbHwPTNtPaIXtOVPfUeB+yoHHQd9W7+B5hphVSeST/Cpf2wuIJ5RQw3Cp7aUe6ZQVZ0BMy1Qv3r2verfmel2yCO6cAEzOgAQABwoUKAEFEqkANIlcpn0uJospC9ggo8RV/yXDvc5uShoEdlQ+GhTt0NCpMpxKuKH6Jw9pjidXbJuyiauev8AdHS5Mw+EVWJva3Xjf7Y/2qQ7k3+6hpVcQMKmSXdB8f8A/8QAQRAAAQMBBgQEBQQCAQQCAgAHAQACESEDEBIgMVEiMEFhEzJAcSNCUoGRBDNioXKxUBRDgpLB0SRTNKJj4bLw8f/aAAgBAQAGPwK53vlOQ+2VvujkHpyh7ehP/Ci8XDK3La/45LD2QQTsgRRz2v8Akn5ArL7rgGFrhMZ9U6o03uImtxuBKBbxDtyB65uEzRaLS5iPO+/MbHQZLMdQ1BA9DfiiBuUKg8XQ5v05GmGFSq0Wi0Wi0WnKd75TkPtlb7o5B6coe3oT/wAKLxcMrctr/jksPZBBOyBFHPa/5J+QKy+6s/b0cDJhAE7qJ9bQfdYeqhS4QeiGGrwVLjJWiq1cLY5cborD0zScm4UtP2uBiYRdvdRQRhO6BfB7rFOJn9Zy14lh/pcPEOhC8pXlK8pXlK8pUGh5TvfKch9srUcg9OUPb0J/4UXi4ZW5bX/HJYeyCCdkCKOe1/yT8gVl91Z+3pKXBHk6R7czvnCheG10IFxlbT0XA8kt+Uozeea1249BBC2uwu4mbKGHhOrHKjA2u+exM/MQtVqtVqteW73ynIfbK33RyD05Q9vQn/hReLhlbltf8clh7IIJ2Uo57X/JPyBWX3Vn7cieYKXQPRUE+y8p/C8h/C4gR9rtPvnkIEKmqk6oFTdU1WnNcz6a+llV83RRkAX6dn0z6B3vyT7ZW+6OQenKHt6E/wDCi8XDK3La/wCOSw9kEE7KUc9r/krTIFZfdWftkc5g+GP69C42vkaJp1RMR2HonXu9kORRQ78r/wC8jQBHPkIWrRAPT03dt8CpQBruhHlNfQO9+SfbK33RyD05Q9vQn/hReLhlbltf8clh7IIJ2Uo57X/JPyBWX3Vn7ZLcGoTsPl/16DBOevMde725lW/i7E2adF3b0QfFDzN1sbnjqMnYdVTm0RkVRD6CFw2uD3TviNKOEY/YqCwyseIMcd+iE2he7qhZ/p8WIGeJaf2jaPpWAOc735J9srfdHIPTlD29Cf8AhReLhlbltf8AHJYeyCCdkCKOe1/yT8gVl91Z+2S2TlXEiy0s3V+eaheJZu8Wx+rbmmkznKhQ3Qcp159uUL56Ilp+6NlIg9SvDeRh7qR5VTlhEEBzVRgv43V2CoMLdvQyfKEdlRDiNFwvPcKVKqThGq/8udI5OB3Cp6ZBlhcNeXPIi/3VKgUlRze90/8AF4ckBRtltXn2GSzfa0OgAWECGqdkTvk4tbsLqBEsIIWiiF5CocIuJcJxHRF5fhLukLgtGuJ6Kq4R901pe3XoU3Cw8PV5TLdvShF4wVKdEutD5tgsWiHtdB4mHVp6ou/TGf4HVQRB5tLofZ13C+ZDw7YT3Qww8btTrR9Nhy3LSVoj7c3CFE0UyiHCvQrC7yrSM4F4G6c2Z75OH8qrQVjbT+PN45HcKWkPbuEQ1pJ1UvYQO62ROZ/eE6zYeMVXEym/S/VarVarVarVa5Pis16pzrJ5LoooOqJKOXA40VK+15nrlpdI05Q5IN3g2fTV299c+O/CP7WH/gZ6ZeMS1S11M8qtDdsFwmu+YWRUsGP2VRCDSYHUoN6NoFooyQNd7+5VeKz2KizsQR/Jahn+AhapofxR1QhradlVx9lWtzWWnFZ9+iwxhYNGt0QKdiMlR0N1Ko2ho7Ro7rVbIRVeU3SDCin/AFDRQ/UocIPoWuYY3Ci0YWHdeJ+ndjbsoN9AuJR0yOVKLzIoc8vceBUC4vOpVSsLN9VShzcOSBpdw07KvN3Gy4DB2KxNJa4dF4b4gGaciqwsMNWHEcK8whccE+y0b+Fo38LRv4WjfwtG/haN/C0b+Fo38ZJCEuTrTxQx5OidZz7FHNQqLQYXfUFR2Jq0gZ4K7clo68ktKMjlx0uBfwBQNP8Agq5/Eb5DyI3Q7Zo63BzDBCqGn7Jzn2IsuktWEWjTNYChrcIycIruclDosIAlw/GZ987rDq3ZY3uhu3VSLM/lUbAWMeR3VUMJjj5JvCoUMYDh3U2ZwHYoO/tAW7cLojEOiOM8HRw6ptk5hAdTFNQnEDHZfUMtEIOLkE7XSwwqxZ2nfrcBamXItb5bpyOvPshmFLgM4b8g6XiqqckjPwwOklFj9RdQrWR3UPbH+K4Di5sO/KoVObYKhnn0ucMPHFFiaKjVAOEub0T+leRBUivtyMLuRiiUXOy0VQqXTo4qHcXfmClVJzH1gZ82p5GB3lXbOE7jFSv3B9lIIVCCsJEFblElUUG6zYNIlyFrqZXjN8p6XYnfYZS1up6oSnHpOaDobw3ZE7L7KLn2R6iQoVpZfScQvGTWi0j2XYUCDh0TiNY03U2IDHn5d0QaEIDpujBxBbI+L+2vh+Q6ZSbsDdMmE1tOkoucZOd159lO2YXaZo+Y5A67CocpbVUKLhAcNRutETkaxsF0TPdDxKHdN2yzyd15Gr9v8FUYR97qKDkr6Q2zaPb5u6a8NjsiRo6o5PbZYm67c+OTj6FAbZtJHqQ1TaA/+KrYueO7l+y5jezlwl34VCfwvNfiim+fEdeik1PJ3GykZsLdE24Nph2X7badVDCYuoabFaBSaoHCnvw0LKXYLQA90fDmM7n/AG5NOIokoypjVNtBrjQeNCmutPwE/wB0HBC2Z5HXDLi6k3F2sJ1o9oxhuykaon9QwEM+bqgGANaOillD9JVbvCtRTdbsOhyQFi6nLXkOvd7IPpXm4ipOQsIkFFpz1Xa7E7zLyj3KxFacKmMBXQrRThkKM4aOqLQfvmO4ySdB6UsHW54PnbUKOVXX05Zv/wAA2dFQzdVeG5gc1yMWeHJDhiYdQsX6Q1//AFuRa8YXDockkLtk3VBF83C0fX+KJHD2W2Qsjjd/V0xAaL4b5RntGdRoptHfhUBncleHawD8rwP9oteMpe44LMfMUGsc4Abr4dqCditF5VpyIVhZ9fMUyzBpr97sfVlDdaWG9QoKGVh/kRcGsEuK8EVLvMUITWHXUxfB83Qoi42bvMNFBuga5278h17vZRty6qFDdBlD3UbuqNa925WmD2UYpC1heZTdooRc66upXCsFI9lxOWqo5UeVXXMYFAmuM49ipb+M/Hoi6s/SuoQArnjlSFpfhePuuFDXuuDy78vVTyypOnJCPMHowMu6ocktMFRakWX6oaP+pEOg+14aNByIChnlGWHCipJPdaBo7L/qG6dQp6qJoq6KGfnPPRYNFW6ELC14h0TmHpeGjqjZtPw2UF1FRxUEg+4U4l0a/wD2tLmne8GE3ui4aMoUwXCfK6hTm7Jr9kHtq1yGSjSmnCcOKp2uJ6MaU7smTug7JVYhUbKVw8D+h3RYRUIC0P4W7ehXfIAo25Dr3eywmlJR68ocJTzp0ylztAsPS+b9aIRCw0g9kKfhRhosWH8rHM9uR3y6wNlvdLddsm6BHRYujq8mevL4SuJOLYELdaKCg4IUHpygOTKDslNN0COJu/oDHKDskcjCTIQ8UHD1hAWbTHdahwiaZ2hHBxd+TaCJQkKW1HVVyRkLHCQuFixD+rw88MKztC/w3Tsm4bdjpU0w74kfDPiWv1dAp5OA1CIQHRBoEtTbT5AMStPpdqEDECaXdlSrhqtFgPyuTQR0vx2v/qgywYU8W9p4j7XVi/8AxniytPptE+zsxNodXFDxXAE/KNVhsgX2x6mkLw7RuE9HhBzXY2HqtbqKTVEoIW7P+51UrC6oROQFE8h17jFAKlUKhw/CljgDsVpfWiq67dQAAoPRYXDhKxM4mna8NWBueumqNxPRolOTAqLyt/C8o+2fvlpou91aHdUyd2u9NQ4VDlAqpmAhwrA4TtCM8wmftyhzoagyrWBOsmnESKn0J5hedGo8uiqBdReVeUrylDq7/SBni68quioKX0ryJVQR7KLNpc7oFx8Vrt0CNb5Awg9Lqci0s/7XCtQXlYlazEaBArVdFE0UjVYAB2d2WIOqUHO4qKIWLDiKx/qLQSnD9IzE/wCqEbe2fAJ1PVA2TOIfMVYlphpFR3Vn+s1eGYR7ouNSUCjZP8h6It6i7zALC08O64TW51ha+R39KolvRw0QUO4D0Kg3nkuukJ0npkpIVeILhFChOU3A6vOix4GYutFg/wClD/8AFeOcVk76TVcVsfs1fvu+7V8D9S152dRftz3CGKydVUsHfdYbRhaUH9Xn+rza9bUx9rmDYc0nosY0QVbhlft6ehQxU7qRD29lUQgtYXbmQc83HleM4S2YCe13UEj3RTiXYGN1KwWVBvuomU9x1i6gm6gWt57cmeSGDUqpgeyaLS0d3oos3QCiJ5BOfVeY/lalYef2XDJ91hOmeFhwn/qHCp+lFS6o+m/DOG0CLTqLqqW1W2VmBU13RcTNzQDJLpOazPa4u4fNFVigY09pcXvcKhqowk7uKhrsA7BVM3BrxTcJtk08Db5WLbVVXCgb5RsrWre6cw9LsB+xuAVNOS65gDawne2SRdXRNjO06uFEA3U0TbOh/UESeykm8HoF5zC85+y87vyotGttR/JCztbLCOmFf/j/AKlv+Ll8S2s2hfpf07KtaNUAn+/JnooARKqhhNNk9j9CERfCIyQPusTdD6jhK2cq0VDKg6KnMkZ9FLeTA1TbACA3rugQjRMsWPxdXRuiXVK4eH2RdaHhOq1L2nSF8Ph786NUJOHaVBXDVE36KtLm2msKLRoAPVSwteexQmzwDpKpR+3IB+r1fGFTLDRJX1W3+l4j6I+PKMaXyCg4nJWj91ByG1NXPoOykOodVXXqnObSOis/D2r75nNFS11EDb2gsp0HVeH4wdJxaJ2B2O0OgARc4yTmwH7FQbwVw+U1CI2Txl//AKln/Yvxj7oEnCO63G/ICcpNbQ6DZa1TvbJhuohOUKFZmuI1RtD+58vui57iSeq6leUKlPZa3UyAtdx/6TpcarG4y5toghat8ruRPRQaKDkDhqECwfE6hQbgG6o31uw+ng3SEComilEoHl9lPTJJ5YAWCcDpwrADQUTWzG5Rg8PQLvcJM9hcRtW/FlYc3dSUFM6qiqpB5As7UePZbOVP0kFTZ2ng2n0v0X7ll/7ry03GVrdheZyTF2iqPRAHzbqokXwFhbr1K8V5/wARupcZOYgVGWHVCxNNxOjGrtcE6qnWL6BTrdI4XP8A9LiM+6HJg/nIxBEb0yhy8Vjos3dNl1tPdcLWtCl4n2XmI7FeLY8TfmG3IdadGrvc72y4hcM0noJUY4Yv4toM9NV52sjWSsFlx7uW12G0a73CtbOytQ5rxodQVBCr+M1FLvwozyF/I1lQHKBqiOFtqzrusTmQN/WYTQ9CoOtztgmno4TzsJ66FRzmvf5W8SBPmlEq2e8YmsZojhuDXKmlzva8hV0UXQsOKD0VW3woELWXXtJ5/C6mxU2gwHdq+HasI919XtdYu64bqKLbh6hF1icR+lECQVpoqk3kCq6ehoqfhHC0hwquESEXULux0QbuvCmQ3NRSDxL4jId9TViY4Wg/vNZgddctFLBXrdqtVVjSqMAEXDknIBsgTom4eqM5WtGWhWOy8rtW7KoouG7RaLE8Q1ODaNvd7ZqZpNSnuWFn5y0C8pXEfsFwtrmDhRB84mu3CqqUySVwiOVh+botOI3U1KNn82vf1of163PjVWceazoedHVEHXk9lMVuahd7XW5cSH2jeEXm9189TkwN+92B/Ezv0RbZuh38uqwubBRtXfZFxNTkcIyQdFGWnIoUGWllX62puHy4aXB7tEXOUsMFVo/suEIC0GGqFKdVVhCDWUHZSSgNPRYhqFJNVMrE0YX6GOubi/CgGBfIKLmAB30qoIuohaWss2HVNG2YEIuHDaf7RB1v+1w5JGQFNjh7Ju6NQCtcjXbjNF+q1QE6o2RqE8Xu9s75+WFIHBlDfnJrdVUb+VIgdl0/Cq4+y8xjku6hpnNG3MY6Oio0qS8NKmMY7KrC2t3dd/U4Tc/2Tm6tctI5et2sKi738IlcbuJdsgQA2TQo2ucbrS10srMQ2euaW1vYFRb2iIkzcMWihmp1u8O1q4eV67DQZYOWDqt1W8cmq0VBVC+Cpa6+GrCNB6TE/i3asVmzC0qXUaNSqUA0XGMXfquA8WyqIVVSmfWW/SaheJ+l4X9bNOtrcQ1m/VOxycSbaYYB25HG37rFZnG26yd1i4c5jukXOyjseQQTCgonq1Q383PN7vbOcBiU9hrbMr7heW8AFa+gwPq19CibJwcFxNIv780lriPZQbRxG0rVaqHOVK8rVarVarVarVarVa8nEPuiCgUHb8vFoqKtxHzLouOgXh2Ywtuc16jJCFUTc7uUyyb1RstGtMDvm2TDNCJuJdQLg4VTLMYRuU46wE7KOREC/E0TnoK3cTQ4Ius2w0rddVofvdGvW6ipT25RZdtyMT62h0GyhjSULS0d/wCIUaN2vkUKOOHnlTo5ydZue5w1iV3CNietR7otcIIujNOoOoUtMHZWYwxcOcbN3XROeU487iAWG96rc72zmgKxxXssbddrpU+hx7LFNUWvaHg/UmwGsVDPsqz7qNeY7eclVRaLRVWsKRUen7FC7jNWcvBAcFph9lqjCGaeozwECRgswpa3j+oo2b6g6KM1k1rpPW4BugyU0N2JyjVS75hCd75QmntypaYU4oXmWoVStMprTa8dfQVEcjG6cLV+yfysFkwWTfqVSSO6nIOSMXkFSi5zY+1ED0VatVAG+ytCdRUcrzSWHrsoc7G7sh5gj4Rnsqjk7XcRXAyfdCyIbtMI5TOnJaNFwmRe5U0ud7cmFpn05Gtcg98gE3OpDhzI75t1RpU4KblaLiOHLVarVarVarVarVa5p2yR+FKtKzA5QyxywIqmh/wwepRsrCxLidbQriWiBTCNFA1yVOFCHCUIMk5RdiccLN1hb+UI1CxdDm7j0s9D6LB8vdQ05uMw1YW8LLqaKPmRZGTuoNQpGmYWnykwmP0c+qw2nE3YqB5eixi1h/tRdii51RGiMaHTklw1eVVBUovNPuuJjT9lUYPZQOLutipFeRKFoPK7K1vXU8mfmOmR17vbk9PwtVtac+b2DeuRvtcHBYw4tOyxat35TxdXJoLsOKmy8xWqE9FutPQ0NEcIkb5AVLa0rKLeScgARzyL9FSiq4rUwoK1utmkDG0cMqbRhE9cgaDMa54Oil/CxRo2KXx0VaZj/wALF+zs8KiAToodM2E9VBy2Ni1Msx8rYKBXxBLk9+Og0RDtEGuM0kLA/wAp/pRrnhWVlFQKqYQ9s8ahcQw+yBDwZzlnS+AsLRXflNHbI693tyZRa6JWxCnR/XnRf7ZIiuTC/wDbKLZnvyXk7UVfWQsAputVIo67VBQg7ah5fa7Rd+aBkhp11WHGYQY5jQfrCljgUfFNdm58LRJX1WvU7KZyun91g1y4rSnZaVvpp6GOfsM034z10yyNV75MK1VFU4vdUvFva6EEhqH6ljYtdFiNb/C1BRaGYtymvZ52/KVVWbpmRnLonApdcOTESESK54cPupbxN3UNyk8p159uXxcXupWNunPA5MLA6jvqX1N35AaFX1gQd1FL5dwk3Brqe6M1HZYejqFObMxmna+SiPRQoaZf1OTW8EjXI0mT9SIsRDTvrfrC6m+04QZavJCoALh1HdO6dr+//EFp8yA7prPpGWmWgqMvdADUprfpZCbZMNBrkxdelxC391H7dp/RRa4Qc0DzOqqm4cl78XxNkW6nkHY6hYrI+HafQsLhBVV5a3Rlx76ZXXkdkQeYfpXlrl0vpI91rOUTSKonLw6ZS20EgrGw4rM/1me7oBfHTkFx5+qp+FF7/a9q1n3TSRXdNkUOq8RpFPlTp3zYRrdRVyxfrdAWqbBpfTI47DJXRG/h1HRR1Qc6k9FTJiPlUYfxkf7ZOyd73BoofqXQqvou3ojeCF4kV2RdCqckeUql4BaCps7TBafS7qjApkgaoW1uPCa2onqrQT5Oqk3zk73cR0ot1VUChwVRICpfKjkQqaprbbgtfqHVEAUGbupFFxD7qG2gn+S4hTcXdkcgZtfBucsRMdrneyaevJ8y803QAtcJK3G45mFQTW6XfZAzIvjqMh7XeE7yuonfTOV43py8I0Hodnf7vje/CfsoTEWdeiIWKInLpVeZUqd82+YJyjfPAyvb1hYsUnYXDDqmh3FaD5lh0yYokprT8MKWvDlN04gnz1yUClo12RF8OVHei0pdr60GJXjfpXSR5m7KLVmLD16rh+Fbd+q4y607NCa2z/QtH+VUPhWYtN2hOtHe8L9QzSW0yRlceoGQbrirVeJZj4eGoRjS+Ahi4XbrfuMwi7+VzdMYFeRW7C4Ymqkj3W/ssWExdDRJU9R0RdgNBOR7XAy3RPe4QwKcK0Tvb0FaKopvy6m4Qi09URtm97mlODtF23yNzUU6G8I+gqdVRRQOHXdBEqTkk1IQToK/k3JJUC+XPAX7n4CoteRKN3fl2ntd9Khv5UqcE23ZQb7MOcBaRopa0ytFBp7rjtfwpsHi1HbVYcPHKreXHSETdUStL6cvVVWt2l1T6Seg5Zc0YWfU5eJZ2jO0HVYrRuHcHqofYQ36h0WFhxe6iIUky9OLXUTrX53UF8nNA63zK4qqlFbWb/I8KLxfwlQc4edTosUzOqDmeV/MjEVHhAO+pT+nNm7/AGg+1jxD0RoK6rE6zg9lDWAD+1w2sfxcj4zAD9eidLTbaeVfCsGMCxGzY5ulWp4gNdHy1VHSgSKHrz8E0KjmhU0N7PbJKCKwHQotOouhe3oB7LyyvJ/a8n9ryf2vJ/a8n9ryf2vJ/a8n9rVaoXBrh917qT5j/SkmVDRCh5EFOs5opBBYiflKCwsVTdDR+FouMz2C4eEdudwtgqd8kZoCgaIDTuUWm9qc/E1rTpiK4rayH/msVpaeKfpYFLWQdzUr95y85WpVVwmFPVBtqz/yXCZCq1WdnZ6nzcgI9MsLT1sKd+VYyPK1Ypk46IMtK90fE8hosdlavYgHvFqw/MNQvh/FYqsj3VjwRAqbqqOmWdlKqpxKBdAWE6rC7VRcLwgR1vpfXS/B8wqFUQtOUbpBTS8l3RcTlhMjuiJWhwoWTPl1cnRhIpqgcAK8MHCzYJ3spiiFmHajiC3XZa82tHcmdkTEX4h06KNr/wDHJF0kuaqOcVEQ7oQsPUIxzZ+ZC/2PK0VFEUXZcLkKyoUFq/lcD13Qd0Kh+if8VvD0Tnb9SoLcSGGQoFFE82hkqVxGFuCgByYCLBU9TcWO66e6AGoEG8WhE2x8o2TrK08+rSi06inIxxiOypwjtdR0IYhhdup1GcXQVt2AXlC+lUWvrKGbo6jlBp8sFMI6uJCDW6lBnytoFC4na9FOMEIMKexsBRa2H/kwrC3y5n97xcAB91gH3QUyteIaXDICemWOqI+Y5K6qNFhcB7qnlPIi+0aAKHFHW/fsE5xEWLBQBQGw1WniWoBpQLhGM91oPwnQzpshi4rY6N6BFzjJOUcz4h4d0TZuDwq5KmCtZVq7YIoKhlNEwsTTIN42KIzs91af9tk6rwrNnD1J6qmnLrrldy5FFBqo0cu1wJRg5BNUQ2qdaayVEKSbpK/dLDs5RIPsVURyoOhQaVhs5e4/MqrdbciphATRGMskcLalOdOqBdohb2f7dp/vkR0Khfyvg6LSmTidhX1KQIyFz6AKLOmfutaj0mqpkkcnDa1YTRsrhNNtgp/7tp/QUlY3/YLhooJVrb6kNUhywvRLXCdkTC0yE/bLHzlcVVwqLihfL/wsJ8uWeuabsJ0VK5ib6rENU0s/cf8AKE19pbNxdWynCz8MrwCB4j6qH2h9k6PyqkD3Rc3RurnK0bZWeJxYRVF7tTmtPHMaQm2li4OsjT25UlR8u10PEheZw+ygH8rVo9yqWrMW0ryJ5c3Q1RwOj3RvZ09909mxvY76hl4RKl1s0HYJv/ceVjcdBELC38o4nYKyvhvbaKHCL+JUF9FicOI75jzotB4je6+CNawjjGuWBTuiSgOpQm6XVO2TC+rV4rfKiQqsK8qh1q3FsFwlbKlwlFz6KlBfBzVcAqZKVF9FA+a7CdSnsPy8QyU1W5vCHbrlwdckipui4SoiXLttyXXn00clgbwxATrV8P2RJTqBQL22emKsXAqVwuIWG1shatVQ+y/teKwh7e10TkroNcne5ro1QWi3cq3QVW9zHVnlEGoXB+FVpHuu93D1vJfCxB6eWedtJXGTKEPMIWklxPVaJ0lUYbR38qBdGjo1tAnO5EHynk6zyaOKfj4ui8uA9kxrTxRCLpiN0EC4091IMyK32Z2pkm0bP8VhADG7C7FqiGNI7ypJkqR1bK1QBP5RDmw7+K85H2Uh4dkB2WJp+2Y8ucjOlAsFsPuF/wDj2otOxoVD2wV2F0KvkGqjoF/JVuosKgghYtW7o2c4hN1HEKpJUqYrk4eFV4lUIYD7zdPLMjF2X7YH3UAVXV5/pYhH4VYP2Ujp0WF/VEXAv/C4QOTpTdQxocfqKx4Ydov3AvPjK8q8hJ7lA4AqtCnROOt38r++Sik6XdF+9/S839LUqQfSYm6jXPXS5rOqJQ/3f4lqYsm6pztB0G10Fdi2chDXEA6hVGSigZZOoTYVCqqemSDxDupb+ObRDE4nM5zzEIBtVoR7INdZAfyU+G3CjSa8LV5Qz/FON9qzdp5Fc2i4uYLgeibhd5kJJwHRQarjs2+8KlrgOzlxW0/41Rs7O1h3SV9XssMS5eJa67La7hbKs7GINpxG/ATpoiEE67VazcAeRXRftyv2gv2gv2gv2gv2gv2gv2gv2hdBEhUqL7I9ggVIUWoxhDwuEHpfg+Y6rGpOi4WmFitXYew1VbJ5+6+F+n+7ioBDfYIy81787cIkFd1U8uepoFGSCVgtNehRHVVuhAuNdlpkqvqWtNlitK9lDeAKpzzaI+GaqFI1WmWVI/FzHt+/KHOoi4CO2cEariKnxadQsLJjvfYMb8wxHIA41GmauiltQg3DUrA0y4+Y5ibhdGbEPuL6ajX0BXDsbwXiXnyhF/5utBeT2RivJqqVVVwBVPoCBrqsLzXuo8UBSxzbT2K+Iws97xxY2fS5Hh8O1OgRLvKsNlin2WC2xOLegXwLNrO5Tw92K0ZxD2v2QI1XdMPUoA8boVBGcHIAuEUWi0Wi0Wi0Wi0vpRQ4ArgCwviejtlC0MrEWHCFst+xRtAOLp2uhRK1Umv/AAE/jMFiaFpKm0IYO6w2Pn+oo4zJvlaVUXWniA6cKJPKlS2jkQq30Wld1BqpnCqtnui1pxNPQ9F5HrzFp7hTq3cemko4PwtMmEiO6nxPyEQRA3yYrTyNqU5565eLTMC2ig67ozrm9q3C/vlmMXZT5eyq5w+y/ek+yfhccXyg81pG1brSdR0TSLOmhlfxNRGyMWgcdgsTtbtITrt08dlHUZaelO97RKhVBCxYj+U5hdx6hxXEw4dxeCDBCdYWxGP5XrDZcdq75kXOMk3NtOgoR2Qt7L9tynooCs2Mq/UlYt63d+RXRDCtgpn7BT1PPIuBlRKq1rvcI/DCAjCo9AMO3ojauoOimYnop6ZqaoBpwqDauhVJN3e8giF7oURn8BcPURfUqgWgz1TskhVWJ7RGyppfRxCGL4dsPm3VDiH8VVuWei1y1vjnawXIMtm4mqGvAd3Qc3iYeoRLRxNVnSLR7v6ywUUcpF0OH3W4PXLFw5FdF2Vb4PmaNd+ZOEuHZYcOFSE5ziQwavKbYMJDW/NNTlcpQd1TnDZNRAM3V4itss+lDh5TUKqBbQ7IH+kCDAPRWjNjfi73zd4b+KxmcKxNPw+yp+UW2hr0cAmmZuPstVrnd2Ua8zzBbrRV9TXa+L55ZxGAoFGjQXV8pVOIbjN7ZJiihYoVeqxB1JiUwOfWdEWtEGdQuHmBUo9RhMrym6GjEey+JW022z0K4sxlVvkaHNSnMYIjhFwQi0IqmWAsm93JlqPJEZQise187KcmB+ire1o1lPi4cjC3Q65+iqwz2KFCQsNmw+8qLsLRJXkKwxxbLQFwWLGQUPHYLUb9VwGp+UqDSyHlF3fI64h2ifGkIgFHAJLdSoHIrotKLh/HPDh97/De6XdBstJUlEzpuvBseGNXAqTU3hv3yd7iw6EX0iiqQF5Z+64Wx9+QVNxPpMXT0Tew9CIrlxZRsivKq2crDZfDYvMtSvMVhxGEHu6brFfVkqrYXA8KkXScvCJWJ5l138UG+GHFf/jQ10VRxa59bodopa7EFXPGoPI1UDk2Z64Be7smvs48V4Go0RFp1Cd/Ewp6LsqUC1UzFqP7TrM9URc4ZodUd07AIcK3Wjz8jZTnb3DMc5zTqNivJ/a8tCiLN2CzUzkDxqEH6uhFpFbqVvde9vZOVoGdeqrdrll1GrC3S4FTHH/tVbzey1IVJlcPA7pssOhC3XhsGAHXIATAzhyln4yAcqOiMVlSbuq6rquq6rquq68ocIMIEU5ra0OUc3RQQtgvMFgbplDb45YGgCbMSM2t26qF1lawvrK4BCqVAUDVSbjP25ddc/YKWmirzwN0Re5u6eNTZlPbtVWrQeqw9FHydsgmjhqiIu1qc8hYm6JzPnfr2vGammeeR3ztsnDgdqdkXtsw9+oRfhwkagLi0XCZVQnXu9lEQifqK0C0XkVZCGG6XcT12y10QnhPZTqO3OLSjNe/MpfpyDyAY/peX+l5f6Xl/peX+l5f6Xl/peX+l5f6zYrR0dgvJPuVwMAVbtFh9LVaKl3lF8ii4bu+6ryp5j4rAnlS7RQ1VhxUBsIyVTzFaXaKjuLuoPocLfQtdsZTHtoHNByYT5LVuFF/yDX2RtGcdm4zITToCiAMZWgF4tSQD3X7Z97p5AI1WIjVaQt0Mm678g5+5zuc/QC7w3gkdCnvFA4VC8MQR0RadQtabFOxswndq4bU/hGHAp9Ol1ntk1WqnV5UlucVVECPN15usFQUeWb8OKDzh1Xl+6iFotFotFotFotL9V5s4a7RH29ZHTlxzyJwgtInlVXfJ3WtUYMqqBZwOWItgi7RUHI42z7LhOT3U+ig/IA29q8W1oGdU5lnwsXA+mydpihEKmhRceFu5VPiuUuv7KdRyLPeLxkMGJVdVoebiOnIaPyuCvcoDFqi2Zd1Kb4nE3onPFrDTWAocHtr5k+LVv3VBi/xWxTmu4xHzIRw9isOLRcNBeegCEGZ5fGpFR25uKTC6qMQae687P8A2QDrQfZHpyqUTcVecPSh9raBjjQSv/4lsrhtWo8bKfyWi46c6h5ARjTkbFY8NN/QgoOYIzjkytn7ha03WAnhGStM3crYqBpdqjD67FBpFRRQJnqUSTDR6CzB0JT51m/xrTgs29Vgs+GzvxPnCaQEW4X6+ZeP4gdZNqY1VOFgo0c4Mxfdb3CbtLy0Q1UJCIMOncJvA2iM2dd5UNvb7Zu2fE7hshqd14dm3Cxhuk+VnEU73WK01ng3WpUEyFaFrdlwcFqOoUkRbD/+ZOEVhYsFF3v0ooCbzNwsQ05mGeFSj3rdKIboRPK2U/8ABHoBqVw+VtBdQwqmbvDtTjs/7CxsONvb01OSE1to3ECdE/DwidObjaOG8ydM8zy2j5hn05QctJT8NO3K8/8AS4Zci5tnReR4I7L4gxf5BR+y/wDpBlqOE9U98TZuMg3T+p830INHDYt8rcz7A/MITrN2oPInUZJN+sBf/aGHSFXLGSVwmi80KAahV5fi2z6dGbrAwBjWijQnHdUTOhtDVF76N/3cbn0xDYptoQbNx+UKbNxPYq0D7IB+E8UJpxyLoMieqk6qqohzS0+VduUFU3e133CfHSByZUmsKQf+B+LbR7BGzsm4Wf2c9DCh1H7qXj25s5e67qOSEH7Jzm0kqOnMLJ4SpFR6OfRRdPIk3SRxdLuB5C/ccoefEGzxKr+ls57SqWIj3K8C2pPR6FpY/FxaN2Rc8y45w5uoTLT6m8nFSFACxvWFo/CAB01WgKo0NQI0Q9uRVcSoL6rA7XoVBuDprtngKG6BMkpwMlYRYz3Qw1DdFU5HxTRSPlQTvlMIBCqLCAVhNRuVI5EjVVF/lK0X0jdQ2saoNIwBHw6t5Lj0R2RB83RNGi4/L9IErFYWfhWfQjqsXXlPPZH0Gq1Wq1WvM7LFMpu/InQINIoFTgKJxCnPNo5Ty2t6BRoLp5vZTkrzsPLHL3v0vDNIXHxuR+HPuVWy/tcLWtWv9KrGH7L9tn4QBYIChjAz21QOjmKHUdvnLnGGtRceVRFz3/ZPYcVnPzaouYfEZ9Qvpoh/9c6v5UO1GhUNr3ULxBT3WIDGP4ryn3Kra17BcVvTs1cNu8f5MTWiuMTi3usnfyTgdQUf5URAjK86FSDKD7LXq1HEPlUuQX/zdR0EdCv2yjjbCxsWimn5VeEblcVrJ7BfCaXHuqtBRJaMPRUaJVKBQemiknJEQ/e7XNA6rw7eSOjtkDrZnRwQZYAuwnCYWK0OFuydZC2EjSuiLcTXf4meUWjUrv6qgleUrRYj5VQKDS4bAVU8zhUDkxeJWFpkczsOdQR6MIhpxHlaKpQhcDZB3WnK4crX75wdJXE8fZcAUtd9l4jRBGovrpkA6cqtnK0i+WmEA5rD9lxsI9lwsomkUpz46IGzGNp3UzhhNGKinxcLT0ZVC2semoycNX2eig0QDUHMthjIqDvnddqoJ6XSuq7LEDHuo6I4mF/uVxMLQvE/TWlPpUHXmgoWgq12aBqmPYMQit2A/EZsUcFm2zn6QoL4GwWp5gxGDuuEY/8AHmytVqtVrmkqgruuBgaVOFx+y8NxbEeUrBhwAdFqix2vReyIHMEVK7pwAXHafYLhH3N0ajuuigt+61WLEEKYSqOm7uqqhwHut/bkyaBU9XDjAVDOQgrCNd8k8oe3LBRIEi8AINb5W0WE+boVBvxOLWf5FcPE7foqmckGrHUKc2ab5Ia1A2toAF8MQwUHohz22fzmripDnArF1/2iOigK1Ycjw6dOiFuxuEHXuiWkYuqAaOLcr2zOuhqcRrBrdtdRWEnUXHxg47QpsDX6Haqn3CmMLo6J1menNIaaHosTGYXDUZA1oklB1sRPWU51jbNh2rTovFNkJ6wvFsm8HZQefIJHsqmfTaoubZzGoCpwjsquJWJeIP3mmvcXAheKKTqOVJoFw0uqnCZd07otHCObObteFQAKp9bpAUbKgQ+Vw1XwqSIu0XEyVIHLhSq5u+TC7yqnFc6BqIm4LdfQUWyGv3K45OU3eG+jvlciIhcZxHZqowAKGriM+iahmPfkey4hiHdUbAU0VYd7argdK4lOLCtxcCDCc3FrUIhWU6SnWTvynM6dMrrnPir6JwAkwqwFqvMLmRXCIWFybF0WjZP1DVF9g/EEGfqbPw3/AP7GqJxNOjhyqX4jXsqHA7Yo6flQWFAGC+Pwi6Ce6D7d5E9BVNwucWndAM0UixY60GrTROFv+mZZ+yc79PbMtGfTPEoIg/8ACBzTBXj2Qh3zNvovEboem1xB+bTP3UJxfoMuGzoN/SR0ve77cmdTsVPMkXxmAxGAjNVhJ4f4rxGOxTrkHMb7qOVOaA2t4FqMUdVh/cZ0nUL4bp7Zgon5RdHpAXENb3Q+f2TneWN7pwyNwuLzbXQqs+4KpMZdE532u7LssTDDl8Szwn65Uhy3hRAhQGCeyl5k7BAjoqsYTvCDpDey/aDz9RQNpYsJGiHwNe6pNme6l1oI7LhxOT5sZ+6GKzOH3RZPw9Wq068BWC1GIbqW6LUflcRquEri4XjqmYTilVF0PoHUlSKheFa8TP8AS8/9Keink4vxfqpDim2jDHWQvC/VDxWfUKOCjF4tjPCev3RcTEBOeDo5SDBWE07i4C14o69Vw8Qv7/8AAy3TYoucH2R2GijBaH7prRZueepJVBgBGg0QtQXPaXRg2TgTEaKBkqCVRq4wQ3+KBs7V1n/kETZ2niz0u+n3WJ1tiP0tCcLMUjVYgMTe3pdLu3ppCFIzjq1T0WFh1ujdUWy3WnNs7Tt6UT+VI83XL7VTj6AOHlN0LqSu2yNpbCWjRu6lfuOb7LGH429+ilcBhY31OeFrdD3YaoRX3VFooMKoH/wjhbVVFxh3EdrouqoBlQQsQJxTkeqAlAOaWvbpPVHpRNtG9dVHiA/dV03ukLEFZ/fqqOKaHsDlxWa+HaOj6SpGhUXAt8hqORitabDMWbqCsVk8tRL3kyvDt/K8ROxUat6O3yStwpOlwp6kunTk4Bha3q4ossvyqlNdqOoTn/K7TlY3DFtKlxRLyXO6BWvQNQc1cYwv+oLcbj0cdUXvbLzRoPr6Lv2W14+ZExA258OGJp9Pi3v7dSuyg9KXjl//ACsPnd2Cw4Rh+kr/APUe+icfHYXaKnEey4zHZaBo6AXeXEpiGnops+P21UKM/Zbr6QsKxCrVxmEakryz90ACboxGNpzyFJUdBkfHVaoMtagKbMS8tqq1Gy8ayJaP9IsJxryhbLCatTI6XeJafYLgYYUudxbLC6oUjS7A/dNdYmXHXN4lp9gpdnOpe3/V4KDpxAVbkiJQZa/EtXVDR8qpX1ZPTLreGigCa1Q0L4zo7KLNmI+6Za0APRQXYT3CJszjA2UPfids1UY4+6x2Yw7tyYneX/a27X228L2uwmrTqFAq01HoxJmM5PX0EciJv0gqeix6hMfrKjmaBcOuylMd165MTqD/AHzwIqnMtW9wQpZbR2hedqkNxDsVAaU3Ha4bP5kRU+y8SxksFDOvMnys+oqnEdytxsVt7Kpvs41lOm+AmiKysTtei+KMLvqUsgjsqhaXUaD3K1/C0+6AByELyrQDmblbFQRe69x7XUfTZaiztP6UiHjdq1AWk+y0VUHv06BQKX4LSoWOzcCNrpBha4bX/ag0N0BpWJ2uyk8jsaHJb2L3VaeC/RAloP6l3l7IueZcboNVQyPXwNOpPRYg7xHaURxuE7KZLx2ogLNosx+SthdZ2GIB4CiE1glpeZN9F8SzD/aiOE4DsVBHCNUGgQB0yOBGIOEItc3VVpdgfr0cp1buFAqVODAN3mFBdi/xWAtNi4aPBn8oB1QatcOvNwRdOUNUu8oRPLnnw7QoVookDDosNoRiVacwv2XE0H7LDhEXQvrd6ElYz9r5LiqOJZcY6olgi0b/AGoN1Kxmr5RqsWAYek9VBPDsM7LQfKV4rPI+ovCcfnYaFSa3xacTUCHKSJ912zzK7HTmT2v1VRK8mEp179oUsH2VaXcLyELO2bjnqsGJ4+64HupusRkuGl0jI8OiRupBlpu4dVitzWITMEQvCw0WJlRtygOov+9/jnQae6xOMnLPqHUnvl8hP3WEcLNgnYXESIWt8BU813xIxjQlY/MtFwtJU4VCAbqrOxIl2GpCM2sn2RwPD7po0fyT3l2LB0YuKxbB+ooub5H1EXVRH/a+aV/+PZ1+ty4nE3+DbDFZ/wBheLZfEs/7HP3QmzwnsuLE0IYLZkR1WLDI7IA+d39cwwFopKPLnovZQSoQcBFoodU8g3kE4aSgwdLw46KggLiY0hUMg82HOLHb9FuNwvEwnCKE3CNkM0oW9jGxmih7S1UuhRaEzsApbbsEb0UG1YfumYjxWtabIFxDW9JKp8R/fkYDVh6IYfLug2EIVobU0PRGHEfZQ95PsFQlaptenKaNcPRbctx2zOvcXaxotYUWsC06OVat3FzUOi1UaquoVKKW5DBm4KOjaI1RJ1Rw6lHEPDduOTICEzZn+lwOxeycSDrdidwt7rCP226D12F05q0CgZOGgvAHRRbjExHBZMGxIVXfYKWkgrG4AlcOEfZTiJvOJrX2g8pci60NU9oMEi6vS6glCyB4nVdGy3VFopwmLpaYX/U2Da/OwKvoXTxWceVS4GycsdmcbNxk0Vdc1KLVVR548T7LhFUC3zdbuJwQpwqR+MtdEAL66XV0XDVQq8yHVC4DPZFp4rJ3maUfDPA6oVc+I0ateHZQXeyq9F1oTi2ATnMsqjSQi5xkrCrNneqc7poPZa8p3DqdVi3UndADTK09QqDnbHO45nXYna9AnTtfD+Juy+G/CdipIoOqab6a3Qpf+QpxUWHGqPBUOZiCe+KnQbXRkg6cvhtHAbShhs2C06vhS4lx784GAexUeG1ndvPILZJUnXLigmO2ST+FAEC/E7RUqvDbEDqMzbwFhdxLE+Xn6QpFmfyodQGiwlQCviawMlCviNDlisX/APiURH2KMfDt+ndRbA4vpT2YfCeBLTK+IyBv0y14Ruo5Hc3bt6tXwyA/6SoNFSrxfPNOQZcR6KXG/U3yoyHIS0gUmCVBuoVXi91xAtPZU4hzdnLd3+lObEa9lGg2yuYXQibrZ/UMgcxg6lNHZQ1NnXKLqebbkjlloqCi375PNCdxBUMuud7ZKarHqFE4HDfRWUPDsU6X4m0f1G6rdqoe4juuD8qvRUNFsc+key3F1OROq0jkyaDNQKOqrKmFT0GAsFVv7KAv5ZQwUarR52zuHUXC4bk3YrsXzMN1laakDCc8Go7rFpCJTXQrPE3GzRzSn2ljVorh2uc60OFgW9wbbddOyLdsvuq6LteC3VCzZTc5I6ZwmnfkaZYCgaDJO9w7Lup6brssbDM9Nlpka2YHUrAzTRTo9EHJTk7BUH5VWNK/b/8A5lwtw/dTMu2VMtdc/wD9rifHsqRTcKcX2WJtD1bygExvytClQpOX7qdSpXfLpd0fabbKHQQuHgP+1BuoqGTn27rWmR17vbKD5lIlfEbi2lVGA9l8I+IFsV3yd1hbrynDtyNI5YCwD9oaBA9CoUCuWHXEHr6HBaBcNM7W6Yq8iphQwfe7coCEyy6OYJWytrHV7hS4sd+2/VROdre1bhh8zigABLzVSw90LW0sh4p0hEPq09FiYZFwKDXjC+KEItN9dFGiDR6Bqa2Qfbm/yOXD1GhyYckXQFHXquFoBWI1Qa5shcPD2K6FaQpc2nIJNGjPiyT1OcE1O2WUS0U2zUah4tqJ+ltStHKXB3uhaMf4jDcMzx2yO7KFqZ2UAQtUPDhs9cnEJIVAMmqrRTqLp0WEZXXu9suuFb3yDCi0o/6lPS+FweYqTU5K5gXUCpp6Iv8AsLiwjE09FAbA3VUcoF9NOdq5TZ0d3RIhtuOg0Khwg5W2n6h2EfR1Uh5b7rFZ2geFovKtM4TRuUB8ohqHagQI1CFoNH3Yvms6HOP8RdIoxvmKDB5WaIAf2ndqXy3zbIFSm2rfMNbxGmZvNad+VhUIvdoMxNpwohtm3D3CpLD/AEtV5lrfUQu6xfPdA6KkKrh+FJMqCVRxUYzCnMHQYKNmKg6rh0zFcYlDDLiUOnOkGCnPHmGoFxc92Bi1evht8R+79FV1NhkdZkfDP9Lhgt3QVcpmgI6rTxD2XC1YrR2EI4Ap0E6Im9g7cvsqGndRmde72ywVTLv7ouxQ/ZSw4ljcp5FPxeJ9HY2MRgZ/al7vssNkBZt7KplOxe6johG98ZIKpz9YRkfFaNVBvL3eRglFzjdRSHlQStZGxU2f4RkKKD7qL/dewQtNQ6oRutLI/wCTbnMPleIRBGXylNLmmMIg73W1oeppKJVq/tCce9/dQtxuuKo2RtbGjhqxUTm4uLoUWkZS7ZE8sBbEKo5IgSjwoMyh/wAyrmCposLoI9l5V5ZXQSp15EjKTP8A/a+W1F9aLdR0NEQeTAPIeHipFEaD8KqjLOrlV34UErjNZ6oeG4Ygt1pcMOq3WJhP2U2lD0O6l+t87Xjtf39A693tnGbEE1uh1VSvMt89aheRVVCbominnh510yCdE7soK7KBQcuKfhbcmiDnH7IO8YWZcNIRDLZjv6U2rmsG8yvCsvL1cevJCL3fKNVKL3aBYCKdla2upPCE6agae6rrdjPCsTfL2VGlWVodcMG+BVV43rC0YGdSU39K6f1Ab1U2FqPD6t+ZWdlYtDWjpKi1fiA18OsLwf07OAauJ1QH7Npvui135Wt1DCcPquBdRuhRsm0GtxkScr+/M8R1NluuMFTZuB7LS+TotbtJUiiBPssD47FGkjdaXSfKFAoLoU5HP+177Q9TCARu8rfwtIzzkg6FQqKiLtO2Wzdu2voWE7qhmc2+QQiydV4bjjd1JCkQDugz5uyY0+c1Pa7ETDQqUA0hQ4T3UgD7Kou2NxG9wRHKkKZW92q3Tul7oHTnHJWq0Cwu0XDXkiXCvRU50ZuKgXnQwvnOb6cmC0KoM+6PhCg1cvh1PVxTa3Q4Ym7KLqV5A7LYIWTKrEDVWYdrqiN7ui4jKAB1WHy7wjZ2tbM/0sbOOz3WEBbTq4qbW0BKNn+lYWM3TTbuqa4Rqh4dnhb1Ul8sxU9k+ys/NbHET2vwuMlvlVLqvhcRgKGaXBjjhtmeUlQ9uEqdUSKP2yRy8IVclCVDqos0C82YRqmgQ76pWLA0t7hQP0c920Rs22hBdr1hcVq/7NVf1Dh/4oD9PbMtf6Kw+EsHguxbQp8ErCRVMsh0bdCsv0+wkoJztzzRiyuGVhOnocU6ZZNTkrcECDBCa5jcR0LYUOs8H3WPVw0WK1fJ2CGGzLz/ACKwHgjSFBvwvq1S3iHa7CdP9L+O6+G9ruy4mkcyMrr3AUEKC0LRcN/lX/3nnkcQXC78qoTiBXRSfSA9dL5KAi6irT0gY0arwrJsMbqd7jNX/wCrtF4tkeICovqtwqZSJ4Fw0W62CAb5QIygp3vcyzaYa7zbLg4dyvAbjeAdQV8Ozw+9VhL+HYXy4QR1CxO+13e7H0QB1UKd76IsMeIBS+fmFxJrHLCJAgZJv75im+6kdaplg3y9SvB/TfLSQi43l+h6KMc+6nGVOMoeJZstCOpC+IDZv+oKbD9Sxw7pj7a3ZrOEdVa9qJ7tm8riRou64gpnEnf/ALGnITtlwu8i7Ze/J0VViAkHXtywoAkptmP3fmuacjSemX+Y/tcRhYHVsjc+ztDLYoqH0Dr3e2Sv5XmHK78nCVDVxCi4fwqql3fnmbpOiLevRN3N+/ZAYMMKuWUOXpCAsBJ6lOa469E4mRbdF2voYy4mcL9lXJ4LddS4LCTLNig6JTbR3kxVCdGmaxwDE4tgoeLa47T6GJj62cdIXhfpyTOrs/8AIZMD/K/+kR1CDkw5AQU23b183vfIHCUZcGk9FBEcmAsNnr1fmna7B0U5SE1vdYWzELwrMw9/mjZdVpK8oWsey1VclEWsdQ690ypVg8VxWYlcWicOnTkSV3XfJPTqnWlmOHreY0zDtzQ6+Qg+zENOo25QTv1JofK1EoKMj7MHi6IsI4xkkC7C7Rcb42KLfFOI9YouIU3F+xUHmOvd7egnknMZW/oZZQ7IE65J1wrE38Ko0v0VLqyvOjyNUK/EOvbODqB1yUUPWsi4WruugvhAIO6b37LdR1Qsw4iNbjyZ65CnN+6LcpZaVY6ihz6dlwsxd3KkCdgqj8LC50t2Kxjisjo7kd3cjsgjmNq3zI2tq+QNAi92pz9l4j7VoYvhthve8B4czuECx4tPCNI2QkJsVOagW7uQW9HarZE4tEI6JttZRi0LF8RuH0ESG9yqaZNJB6FSxuEZ+LhCIwh3usPht38qpRu14jJRCRxt+ZTeBoAqrE7zHQX4dWbFY7Ou4VVTmuvd7ehlv/Azl4THZRHIHfkTjFFJzToFDKjrK08J240U+Zu4yQVCw9BkCg6LE0cN2q1TZs2lGg5YySuLqn4dsoCOU2VpWyOoVDLei4gqXUatFitm+wUnkVQjROjLA13TMWijRu2WjT+FUR7r6ioaMOaJIBpRFpg94UuqqZN1tyqCvVeGOl2Ee6YegpT01ntGbc3F59k0jZT05DaT7qrpJUhmIf7XitlvUsUvtG2YUNb4jvqcpcZyS0wuNmL2XDM7FRhU4c1Qt1VcKmE693t/xvc5SIBB3VGBvtdpeGiSei4qOWoC1B9s2pVc3XNuVU3weJuyxM4ht1C0i4BjS4qTPibBYs3YoPsv/W9vM9sgpMoiVaO6RCo4LW9qcM0ZIlGTEKvmHKd2WEalcQjIE1rNAFVVBXC0fe7VeYkqpnk2VoeojLPTmNcE7hOqHCR3KpaBFrm/fJPLnMV4b2nsUQREKQMQ7KKtKkOCmjuwXFZuH2QfaUn5eqZTWqHTNIugLE5SGAqMOFQ7Tqpboq8iLZtfrCxWT8bMvfLHmHdOlv4Xmg7FUTvb0Uelrou2QZ61Wyg0UA1C7KhhVM8+hXE37hY7PiHW6v45GG1+LZ7OqvE/TnHZf2FiNLa0oOywkVH1JwiORxDB3CnVu6BTuWRkb7oyrQ5ge3ImeJdwsWkqlAiFPKY0d/8ASFMQWl5g09C79O/pVrlLeMdlUEXxzWxaOj3XE8u9zdIKxRDl25WqpVVqbtii4CWjqFAVam6WwfdYW2eG0OgT3WvHak6dAuANH2R0E9lgxa9SsWKUfEa19KBY3ODWnomQ6gTfbNog4WYqoAhVNSqrC4SvEaInoquUgSOVhLxZu76KoobqZ3ID5t1IcU7HxUVXQi4cXceln0MOqFTS8uNAjyO6g6+kljoKkgTvyQ0alBjXEFuxQc9xdFKoOQIraM/scnA4S1YmHF2TqR6AN+cf2oiSef8AyKi+eU1xmOyc0B3F9Slp9Id3LVCztGNI3KdBDEQCndIRHMs/bLRaXVWqnUb8oV4eqcf2260yYh58sFVpePbNootTAUsfKZAQaS3Gi48Z7J4cqFQ88JVDLd+UGmsIllCB5XLQD2zuRWAp3td70Unhlb+kqAVSnooTWjp68jkvtgAXxDJRxAj3T2biifLQ73VKeybbdZg8miZbl9HDiJUAOtNyv24bELEziCqOT0u46+yGBke6LXAU2GbvyS5xwgI39ubUc+muQewvotdFBqELVv35jT2ywtF5CpIw+60TgTJ2GXvmJvbu7PiHW9vtmDnmn+1JWt3E7+0QHKMMHcXtb1PL90c773H+N0EKSUI19PVRg+/IK0ywdFjNQ1cOu6Dqe3roCh35ztYfMUGA6UWC1rsVhdTosTLQ9wQoTrE1Lv6UclliOgrfQkLXF7ris2qssVGoEGFNwzV0KLcpjTQckMH359F//ZTM+6xs+4yxyp3uARA6UvCIN2BwljlwPK4uUDllaLVCXzCq43SeWGxDWoToi7OWuMNVKrRD2yh9p10apdfTJxUVAmNfxFTZPE7FSBIUHkBw1CxzO+d159r8PK8wCIkKojNpIWiHe8uNz/bPMUUT/wASW/MKqDkARd8rKlPjSUJVBheeqYcUuKA8r+hTg7UUWF1HjQ8ho/KNKKeRDhKrwleafbO3cXyfKqcPtyQET6DhosXzDpdiZ+OdGegrfVPs3niFQeUGjzTPKrm75IdaQhPXQoyETvTke61Wqb/jk8S00CLvxl91OnupccXYXCxfZ/E6OHVWnvdwuIUWw4ujgsTajtyImvvmlOvd7KOuTfkyoNVUwsQ4mayLtCoUgL9uiAO17QNLgjmOykqmapUZ6Ik6mnpgvZarhMLi4rwBUleI+XvkA9kBYDAHCTfRQ/RolYfD4ey8WzqHIdE4Z3Wgpi6qqjlEOFN1SueDwndcXl3UDTK3fLPoQqGFXXdV0XY893YcoQcDx/ah3IlaweSc8E4e6qFFxY+od5Rsi81fMAFSeQLxeCeq8Nvl6xmZwAuOhKqb/G1PRC2bo+uSic9sBw6cjD02VaLsq3uvdtCotARsVwfDft0UYVU4z2VOWIVGQVqqkfheYqjyhJkjLXpz4e7C3dTdwriRL7QYR+VDbOe5KwmyruFwS0rjqFPT0miB2WICmWVYjoOJQ48MyUdumQt31up0VYd7qbHzfQc0BNs26AXzyWeG6d1vHIDLUY7PZeJ+mdP8drqhUEXNyweQ6OnJG103GROyo3JVaXVBI7Lb3W+QADVPMxNMsO0yRdgtKO3WE1HRw65vc63wVRQc3c9ORgdtREubAT7Q/KhKDOgryBN9EJ2ux2jsLEW2Wm61u731VkJnI1qcHazAWIZatClunIjotijc68/43yFDliGnMGfTIOhcq86ihwxBUbi91QwqvOZzfuPSUUvbSKwj4NpLT8jtVpkhjS49kba1OG1I8uynfJ75QQpmq0XdaIgokj2OSN+VLUSzgtB8vRFxEDNRYgpdwnsuC0b96KHCLoOSMkdVBC0WtbpRjTkQV51Ezdhiio7D7qvMEHRQLoJ4lGve/FkButWO+WoUHK1uWtctdFPIFq8Bzzo1Osf1DQ36SFhs4cHawq4R/wCQRPLOJNw/SoQYDIblr+VVyOEz7Jg2F4RWFw4SqaZxxeH7qWOaW7p1m7zNpnwPr3udcJ0Th2zT0PKdyQetzn2n2bupN0Zz2yV5krb0kWnkOqFt+ldiZ0IVk61sgQfpU/pzgPVpUeE+396Bf/wlnZ2f8giyzs2t/wAQifMV4nzMdXk06m+Qi1p/CbjEhODqsJ4TkBVDhd3zxdDUzDrKxNq3tyO92F7Z7qh/K0lVbF3A2VI4h2XiOYQ2YnI14aTaLG8fEOgU4StPQ0oVVscqhi4TdPVtc5Fzx2QB83QqvK3Cpee45AJ12Qu4XkWh/pSTJTX/AFDlC7ECNlWC9EnLA0uhGb/5G9rgeIajPRVQtbIcZHEoeKotPTNBqE+D4ZVR9wv5J3tmgoRyXHk4VHVayBQZDmNNbqari1UurkPrQ9xbZT9S4CHzq1qPiNkfSei+JZGz2KllUB5UWWeu6ILqHULwt6uv7nMG9BfqqhUQsHeZpoc2E+VcNeRhHm6leHaVYU5s6cvVEu4m7FCGNsv7QZYmzc0/SvDoTFVhc0FuyJFnVUGH/FcNri7OQ8UCy7zqjgsPFcOp0XAxjPssdsyzg1l1FThUNcCocI58TUcyUEQTSEW3NCOX7XfyaLpU7KeeESdApa0Bd1CmOI6KetzgBx2ZxfblBz5xHpdLDRS+oUCgbTPIQfHF1uxP0HTlVVB+VhxwE4tcRFKKMXEFQ4s7lhJ/NzvbPTktYz75try7ZQ9nF9QynOQ7RQwR39D39Cw7FE6OKsnA1wCSocOJBltr26L4X6hzJ3RY5wx9HtR4cTdwUHObHYp5wYR0ukqcs/a6phVdN8j+17KlDmqiBmc/r0vD269RdMU5QulriChi1IlVMoirXXeJa0br9ljIwM7r5CFLWtlDG6QOlwpBKwB0sboiDVVnnSNeS932uIQTX6hE3h+WTUIEucEXNk+6L2iHCpGeuippngHI07jJ9r8H18Ke0GQDyKqbhBIRdJ5JbnBz6rEBLxq3dB9mY/imvHlLc7rq1CJZtyIOcnkhw+6Ld81VDdMw9HThVbZgRw27D70XnYfuun55oxCs0TWfwEo2nRq4jVQsOP7qMUp9q+oaOqlmGdiofYFjtwaZ2DLJo3ug0aDRbKZWIa9c0nrlgINGgvoieq1XFQ7hQeR2ugKytKEAQcPS4LH54/Ci0Bc55opdwDumg2uI/wAUWWTRO+q0H4QLGx3hGxsnSdHvy1EhU15dF8V2E9DCkEOHbLQ4Tsbmu3uqYQPdEOdATm9L3s+45DxGIlpRfb0aPl6lPGCGjSERy4ytucVPRE3sTvfNN+lwTnG+l4yR1zNqqa58R6IleFirqPdEO1zOvd7Lv6eHeUqObHIHLxiK3xaHhKgW05OJsgrxLBwtWbdRyBj4rVoidYQaDMlCxZoNTuV3KiJejBQBKbZt/wC4ZlUcuLVcDwVMUysHacgTQykBcYQLbiDtkgardyg69MoAHIrrutOST1Qa6rHUKLbAzGpOgX7zXprLPB9k2zZTw6SuJ5cVAELidHbqhbPEWZ6fMUbGxZhB+Y545cn8KSbuMV3XmcqGF52D7r4b22h2CxYadkxr20cFLHXtB8uye7tIvanDY5Z8rdyh8afYLCxsnq4p5ecWIzVYWofEwOhS0i0H8VW+qpS8BolYKT1Oabg0CSULMeVmRjl4jPJaCcwvwnS7ySpPCwdFRyiVuFIMLXMHDLZwPlUqSIWqoq3w4wqVUjpVNtacdaZnXu9roIn07TuMs549Ib+y4qqlRklpVIsv1TR/7r5fyvl/K+X8r5fzcJqBUp8ODZHVYYBtHfMt0CQIvaO6ayZwUpc5vZFQHGNlhtrAP7tMKA51m7+eiB1adDcK5MZ+2SQh1RGt23uob+b/AOWQAjib15UOquEYvZVEe6ooOiiaXdFBIkoOa/um+GeE6wqlDjMaIwDC2VXfgL4ViJ+q0qsTnTyJCh325FTC35PmKZjAf1TXeSuicbNDi1u4yK907DpNwKJ3rfAEryB7tyuK7FBIVOEe6jdf+RWqPX3WhaVwvr3UX1RnqpBkZhcQ3U6lE5cLC3gd1X7YP3XGwtWhunqVUXTBU6KEKqL6OWuWmcAwtJQwarYqdQh0XBqqi7C5YtloUcrr3e3PdymxqMuIihzH0rfrN855aYK/dd+V+678r9135X7rvzcUQNV2TY6rZTcbV1bRw4B/8qbhKI2MZA3ES0dFGhyT0zAjUrhoFqsJy8Ynup1HNlphS4zma4niKtIqFIBnZSbNrDtCh9m3D2EoWYaLR0VlVpk7t5+55gi7i0Xhsf7IteSChMGFDrMD2Ui3aN8VFBeXf4hYrC14h0K0osLQq1cVFwAbReDo2z4b8U8SqqmBfB897jfPTLhNdkKYSu+UINlU+64oWBzGlq4RC0C0QArRO6z1WG4eygega7fM02Zr3XH5iukKWiQuKhUf2oAxZXXu9slOVKA53ll3RTbeQ7o8+UTvymsHyi52JADQc7hQLjH2Ul+Mdr2tKe1vlaYGQuB49s2ErSVXhaNSsDPIMzd+T2VKi+R5ebF4lPjSbt0LFoBfHEVPQ3C+CYkcquq7KqhtOc29j9qFTi4t1HjgHuuGLX/ErC4YTtdIMFYbX4rO6JsqO6tR8RF7cWDrIR4DaWn9LDZxZD+Kb+p1Pld731Kxj7qAsGg3Rawf+Snl4naBTm8ZwkN0B3TiTN1DCIdbQV+/J6BYcZDUWtfDUeI16rD/AGtZub7c2MjG5wdVOh7oYhqo691AdoqCXKHDI693tl7qM03AcqibZ6g0kotb0QAEkqbbzfSiSwSgOgR976rS8jkg8lgFao8H4Xlj3KNFxDm/Spa8Emo7oNcIjI+1/wC4aMygokjiyyhBooFHZyd8tMpbhxSqledw+yk2hdvRTYkl3WeYCjGlzH1ceoCfY4cItNPdHxOCNeyIs34j9Qy63SsWmSTmPoGkX2knpK0lVohDyCe6s32ZHiARG6+IwtvD7N2Fys/FcLNzfMv+n/TDC0fNdOydZWv7doiIodFVNxUb1RbZjg0RXe59pnrrdicfsuGrt1GZlmOpT2RwtoFI1CxUadlxSolH54WMUygJvt6CAgZk9uTB4m7FcND9KibiHVUtN7r3e2aRnkrEKjlWxeeN4oFIWI6lO/UEfxauIo/MhhbA2C/iagqS4O7BTGHtlnkkAVUGh75tFUKztNCCuP8AKxN07IVPGpHmHRV5gaNSmta7yrD+pb918J4BWEj7plq1vCdU2zZ8jRPvlIKIywhd9Lt1B1y9s1MhefsiVrcHNoQvE03HLhT4ZK0jsnYZHsm2lqXNHRvUrEaAfKM42K7ItJil8ASd/TkXtYfmoi3T3XFXdcCaDUFWrS6kTkHcXxcGW3FFGuPRcSpwoO0tUbu8oMGhqtc4CNOR4m2ia59mC4GfdHDFnP0rzFQXYh3XCwM9k8/VScrp2uHtzjf7cqQsXzdVuF3UdFNzr3e2bcIUjP2VOQKSFJbhxaDtdZgsBtCJr0XEeEX8BruiwmhvKpkPbOB0UDzIOVVpVRA1u3VL8QNCobauhH/q/wBRhw+WQsX/AFn9LH+meLQ7IjAZ9lUHlWfWqd73UoVZtLyW7ItNm1rewVpi6mZyuoqJp+oXzlj51Bvc7o1vI73cVEB8o0z1AK8hH3XxGks3WGzbg2rfwtleQr26qGU7rhtHD7qP1FkD/Jqd4HG7ZONrJddIzYXaqDUIPxCAhagQwqByMTlULh4s85wpGlzXDomYXTabrRCU20JEd0cMsZsDeAu2Slx3bcEHCFJI9l5J+6PQbcou+2ftmLHGkaIruL3XD2583Rya6qDrfPTTI693tnMKvP8ACH/bGGU3YCFZs3ICccePuu12HF9rgjcRvcR1vc3cZZIXZU0uPJw5KGFHjOVXB3chYy5suqhwyNwqgjPZkbp3vf8ApnnSYKbZWPlGtF4nztQ2N2N32Wt3iWZ927IfU28HNxtDl4jNNDc5/wAz3RyW75wM1QHDuvJ/atAW6I4nmNlHTI10w00K8VlboOeOoVd1ZtFG8iX69L5CxsH2XEI5uE1Ckk+ylgn3WNnTVq1QkSsJowaNGS0PUZyHaFSKjtk9keTBQAuGQu2GYu6BSidHXSLnntcPQwKzVRycXUXTqrcfM105HXu9s5w9VDteSAVLaG4oruiepuso+UzVP97gFJuCN07Xz0WI6dLsNqMTd+q+GZB0Ra4EFDCFhszDQq3kHqFF8FVyyM/C8hcZx+6djd4R6L94L94L94L94XewlRfTUKztOhRd2hCNB0Ua+6475CdaD8LS7CNBnj5SgBWU2xb5W8ivIHIjP/076R5TuvEsrJp+qiBihUOoqcXsqjJKFICs2xWFUBeVeRdQqOkqNFDKu3UnLBr7qnCVB52DQ7rvmA5Okcic4amviaXhBv1ZQwfleG08Ay0RbuLh6Cdk0DXryiD1ubClw4TqiWXuvd7Z9JU6KTTINsrlPWUfdDvcLrMMHHaGaIxdXW/EL33SaNWBkAbriWhWOeFYgYKFna0tOj91g/7h17ZjkjqPSMJ0PCVae97mL9R+nPma7G1PsLU4WvoPdHGOHcJwdSFwMnub4Cg1BHlRwswnle9F5c+LVQOQ3OGDP/MoEarDaNrCie4TyY4a3Vh42cqtNn7VXBafkLE04vZaJqrdreCVRq0zmtxLfLzZaVPPxB1RqOaFosbG4SE1T4YlbJxNpp/a6UyUTnSMRop0y90elLhy4PoZGqClMvde72y8Gqq2VQQqqFotFiteJ3RqpT2WB/5UXm7dNGwyAuA8TCXM7BHe4X0XiAalR1WHdS8ydlGg2Uo3Rc0kfld8zHZtFw/jlVKppma7aqJ3N/ZC2cPiEUCrwtGgCY17sVnpVC2ZE9kWFFqDrVwZ2WGybX6iq315DfdOjPhBVFoebXVTnJ0auDhH9rBjMaoWTCn2Vt1pKL/ELz0DVBxWTv5LhtGlSWy3cVXCSFFs0Wg/tUdA7rWey1pfjd+FRgHLLXanrzhMruv3Gj3VbRn5TodicNKciLxCLo4vQ7qkgrzNA96qDS6AsLeQDcPWT0QIUK0s8MuFQsNzr3e2U+JoqOn3TVUKVTL35BpLnKbUwBWN1gw9IxbXjI8nQKSp+YrW8He6FAbXdB0aa52e/I1uOJuJAtbC0Wlw41Q8i3d1Dcni22p0ai51B0F5sbXEQaoNLXWf8ivH/cc7yRui9xknN2z1MKjo97ul260i6UOgHRakIaGOyJLG1Q+HH3QI0uCOac7v1P6gTThYi7e60tt+EIJn/wC2OKEalQ/iQ4RhQtP0/CerV4tmDHVuyhrSSpeyixC+tAo6I8yHVHN4jpRRvexrtHApw2PIqqVKr6ahUAXxk9rwh62LuDhlOnW517vbId8kcwyqVXjfrXYG9GdSnNs2/e9r1PTJTVEV9liOgykfe6LPzFfH17I4aIOzFnN15VLRpOytLBwwvIosFo2FhaJKiPFtv9IvtHScxY3zNqOb3v4vLsgG6rvyiHeU3TiWJleYHuPjWu2ytHd4hVXCChYDRrdEC7znpsiZvwPsxaNO64cQOwOilhxjuvKLN24CcC6QVRRUO2UipVVTnEH7KDynOXe7FGtzXHo0px78miLipB9DMyMhvCryB7eppVVFDkhYw4QE49DW517va+UcmIoe2ebxi0UdVDWtHdcYDvcI8IlaLReBMTovDqMJ65Mel0Zo6oAwXnXstbiNc8jrzzn/AGmpvw9NiUW2xqPq1CfZWHEf/wBnIbsaFWnvyI6FaifddkJ8yLvlHVU0XlBWw5ff2ySKORI84173AKQcQz43eUXfqAStCSp8LA0dUXDU9VW/SUNgvE6FbowY7XaqYq3qFDoHI7KW1Wl2i8p/C0KxvMBVEsTneU9Byo+pR1TC0cXVfF8myhzfFeekUTuHw6+Tl+59DqiORB5A9Cc8LEfwuNoIUsodrqKUV3bc693teMuqp05rjkFrsnh9k187r5mP6I8MrDEe6wTptnxE4WDquAYe/XLh0th13ywAi2aharUek0CksBQMYQOjULZnzBfS7bP4k8R0HJna6hQLyX9ghZYvBd30Wkje+FuedIo5Bzjh3UMCwlSHAA7qSyW7hS/gG5X7pH/iuO2ef8WqGW7tfmajZRAbSLrZo1LFKDToKoZaGFgMFpWKz4mojqgD5lqpKxKWuxdlJYQFAUwtIWo/Kl7gz3Ql5cPZRYsgblVagXgSoY0KdFrVGt+4Ut4SNbtcwg6IWbuC36O3TnWwhra+6LmNJsz1HRYrd6DrK3bjH1Fb+3Jqhh6KPRSLwMvvnHPqEahGt0Zv5i+RrdhOqFKKunVdjUJ17va6EAjdH9psGfRY3Ub/ALVKC+iqb4F5dICDnvDx9LV2GgvrS7SqYZITyH9dlutEKJrbKRIrN2i29JqFV0lQ2gUE4mbFeI3R11ao75IPTblfticjS1y42NP2WI2Zn+lBZRU5/GYCcMPCOpQcX/ZYSfysNpaOe36RosbPI68FN/Usr9VzXupZt1Kd4VrjA6QhyNVavdWAq31Ug/ZRadUX4RTYKHDD7rxbN/iMPTnQdDRRmaD5JqvLwdCpFEbG0Y20/wAlww3sNFx2hKqeXK1wnYrFhpvzdbp5Q7KDmHoaqDduuHIEbnAaqHjEpaMLgviVAU2dQm+yde72uxm6q4RHfLW+l8qYrfVUpeBusPQZ8McWtxIbIHVVVMhkmd8gTve8IDYXUEqrT6eSU+xPu0qtMmmEblTaOxHo0Iu39C0Z55AaEGsENbRAS6DqFTUri6KQmDrkDXAu9kYENdWB0TIPBsFgYABCHIc/5AnAUBu1uZG6cJmE1Fsx7qQQ/wDxKDXcVnsU62sqP5wB42DoVjYOA5MLB7lFjnNBIXhi1ZaWX0uQ+GId1Rdh/Cg8+jiFPO7ZTlg6HOPRMOtL6L+V+LZEm6N7nIjqUQfuE1zU693tdA0XFTN2VMzfZQdFGaeuUNKcQKDUrdSgT8MnruvDZQ5D2XCfiFS9tFQXUEoSETveJXiD+1VSKKpUGhW91PRgXS0RajUbqvCO6j9wrygKG0UkyfQxdVsZgOQ54XE0OQMALULiiN2rhdIWE/hUfB2VbjZl0NKDtXNQT56NTho4aKM7LHTqVLRRaharzAprtkbTfZOJ1aJThClpgrjGA7tQLSH2adA/6f8AUf0UWOEEc0tjFK+G6uxU0naVBaR3KtrOz8067oUgnSUGWj3Fx2RBJLRunN8zJ0QtrL9PZWnv0UWlm2wd9Teilj227f4f8P7Zh6JzOy2VdFwwAjKr5/8AdwA1u3u421T2hsXNfGoRHXVOvIG2SgXlUHlD2ury2pw6Spb+FxfhA7IHFgeMlo7ZFEAmLvLHusWHh3CfPmAyBFrTS/Va37czULULULUZrMBOr19LRNd+p4j0aE+YtW2nVB4P/j1UAie6gt+6wt13uqvIR7HNog3et1VDqrFZV7LjZ4VPypaVipKggFEgADqVIMv3RI6ocDf/AFU4qlS2xaHbrG6wa4nWER4FPdcL8HZy43z/AIrgYT/kq2A/Kw4IefKVx6hPaNZ1WC0aMW61XmCiVRC30mjgiGtqtLjZEw7pcG2vnGj1Rxn25cdb9VBPCaFTZvLDuEB+qGC06Wrf/lMe+HOjzDQp9aoPB8wlcJVaKQYKm0EP+oKem99P+DnKPRByxNrfXVTK49d1i6Ix5epVNF5pcuIcKjoV5SR2VlGiBTnjQryxc4zxRdovrXDwjtzfNVTkrmqsX4u4gRf7pvhWfCR8oXkd+F5MI3dReCy3oNfD6r9kO7uKLhZNHZUDR9lUlSHGNipgN/xC+h3ZfUNwqhOtz0RcdTyI5+mXxJpojz6qDd2XCD97tJt3f/y3EHT/AEgcWIHqpUNfAvrlG6obmeI/poEcIVFQKKYk4wJ7rhCIhVIAWBppkqpFYUOH4TMO1cvC0rxMOF3zNXZGDDDUFecO+6hwi4bKz2lSDBXmJ90Q5g91xMjuFhxl7Nje0O8pUO6Z4CrW0zR8wuLLO0Iaei4nEq1szDbcGWndFjhEZC0mAVC7qVpHqW91iwPLToWVVRGdrYgjKPR0/CB3Ugquq7KUGbLCbpOipQIOJ4gm/wBqCsOHF1ouMw0dFGixNtAQrTEZovKFHTlwpUA3VTuUXPoLg13XrsmFxl4MX1OFg1KNhYnAYgOTrO0tnS0rieXe5zyqDGVAIAXE1rvssIOA/TyZ6oyJRxN/tbLhquL8LotBySLy91B07ogUdkOcZMTzhb3UWbcR3hYXtD1PiCz7OWBts1yoCVi8ztlJu0lGzfp07LEBiZuFtkOSq0lcVAtkJ/KOJ1ey6qja7ytVqquJ9+RKk5MKxA1TfF82icLEQ2dV4VsMTCsTXQ1AecjqvKLvDtNR5SplUVeK0K8uFvdUdVYXa73sFprCJseJmWAoH7h/pSdc1E14GuvvewOMA0nZWbvmIrkDR+ULJnE9tDaLf1barzSEBhGPqeYPSBSFUQqOEqTdCaCBMLtfh6KJC4CcIT97oT/ZcME+6hzSOWFshaPLWsUNoFxHhVKrTkV1Qko3DEdLoTbCz2lyFIVl+qbUEQ7kdjRT0KroqUF0Oq3LAVaKPMVtkk1cOnL8/wDSo5pU4JHaqDSMLd1P6m14ejQsQDpB6KR5DoeZjtDgG3Urhb/8lTqdzVa5Lct0wo3kjohSsLCPMv8A9b/6VK+y0Wl3lDQtZWkLWmQE1Wg5kKOi4DB2UEV5GEuxN2KmzeLM7FSRI3C8wUwVB0UjiKl1XLW/Daa7rGHBzbqGmyL7L7tuoCVpA7rhPFyXWPQ1Hvk/ScU2scQvDGiq8D9PQ/O8db+Knf1QyUVRlrkCrdOvZSPQYb5BgoMthTdY7J2NqqKa5Tioj0GytHJ5WqKfhPTVUQBdKi0H3WJlQoF/C1SVRVvs2TKjFN9URmr+FSi1uGTEa4arH1K4laWDvmFFF8nRbDI1podcpa77Kl4IMbrqbt7neL10Xw9d0STM5qZ9YXE412UOM3AdF41mOHqL8XTNjdXYLRuP/Slxk5yx3ktBhRBvf7hWdo2hcKoi6hhYbTX6lAMry8Sk58H1KDrzPvkq3EqDDkwuGILE2ovo8wneKyoHmCLQ54jugC5xHdTZ6quinUZGNJEnZEXAsKHiVdNU5wiBonSI2U+Zu/JlYhePa8EUe8fgeubwx3y1XVpU+Yb5J2vFLqm50y0dIUQq+jYe6wuIZOhROHGz6m1VRFw3RXdBvzHVPaboCdNaLy3VaY3RY4DCR1Us13XEGu92qkM/xCBxmi8/uqX6ydlUQFE1WO4DNrlAPlRi0/peZS4tDe5UM4u68hH3XAhKdGhrfuu3Jx2jsI7KLMuediqWaqA0d151+40KryQqFQ20omcWLW7v6LC7yrFZw5rqgTVQ4Qe66xdhCjEcW8aLE39QyveEGeI11YQsmnEbOn3U2rwP9rw7Nvu7kBloZHQ7LE4UC8s+6ITLN/n7Lzx9lq7F7LVCqcZrypPFKkLS6eQ078iipVynEpZhZbf7UPEXPT/dBcKlR0UjS/GaBUrcbQ/LVF3VQtYWAVZsVLeB+3RV5EYZCoSz3RLeIDZWciJCgCSsVp/6rE4yfXRy+10koRsq6+kg6Fbje9ju6A2UtKHitruEbVjsYHS8vcKBbpyg1UNElOm2Y10aSpf+oafZR4brQ7qGWbQ3YqTzYKBFVsqBRyuynS+Qqt/CwP16FFpUDS7utFrlrRcLcXcqqx6zRUoquN5u1TuKMO61BRUjW+vOk69FiLjKBxcSh75U8Tj7IeAzA89Yvtv1H/6xT3RJ1WvKsWYYpFzW95Ry7g6qnJjmMTc0BQPPfQrDajEF8J4PYpxeE67VYm3BVBDuylzkWh64XAqHWcncJrB9zmg8uMZLdnVC+G0WI/jz3cIdI6+gDGtg78ugwuUFVTYQkZwefuqgj2Qc50/eE6xHCNQU9rr8M16qokLhdwdZ6LA2jRc+WyvIFDOBvZO9vRaqvMgddTns3Cq0WixWjsPbqjZsGBn+8tKqSmskCepRs2nTqFrli8x1QWJvmVaKoR2vJ0y6ZpABd/pcRy+ao6Fd7mt+t8nltCY3ZEpsJ2eW1byBzANk3tTJ515woZ+cwc1DFxSvEs3cX0kIvOg7X47Ordtr9VLiQ5QNFiKLZkLhoc/03V5Ok8qTrtmoEV1WmvKpzJuqFuh0zUVVIqwrt09CZqvKFSzbK4mx7Lhc6EYdqpNzr3e3LxeiwtqtMW+eZQpiRHgtM7rhDWeykkyq6i+uqja4AdVLuKCiRdRVK6qmYZgMFQvIF5AvIF5BmpnNQpxEu2VIH2XFxDYoOaZaeVPQJzz9rnWn4U5W+ywgfdUU5dFsN0W2Vf5r4nEpZQ/Tf2XDXvnMmBzAJiUBqN7vDtCcB1VHOai4cbdxdS+qxQoYVXk+x9GXGuGq+IZUFHoFTL3uj0ve6OlwyVukLjb+EcDgR1a5R05VaLflwoPS517vblgX8QhU5oATh/3Ha9lAXZdjoc2HOAwfdSRPVS5lECTFJgo7HoFpdryKrqpDuIb5Z0aPmX7q/dX7q/dy4fzngVKrkNJBU9M0nhG7lGPxHfx0WjpXhmbMn5lU4u92HvmadjkDtV1XDX3WwUGoRYOFmwvCBw8WTVbra+XFbcwShBjJwlSOF/UKt9V4TKDrl75ji9G1vU1N3E0mNCtMIuGeHel0qvLK8q8i8q0vLNSjeADxczVaDkBFRc693ty/vkHNx5I6bIkUzU6rzVXE5T+67YdFJs/7XC0BeVqMgOkQgMUSrOJoOt1VB4VR6pVacidAsJbijqv2liJwLxS7G0fKKLA1vhtHQZgHT7qGgxupBzzn7bIWjfKf6uDrV3/i1SS8KLBmH+TqlcTib6LDa8IGjii50dqowQ49umaHHDVSGE/yUNH4WJ7pd9KIw07qDeEb55GF3lRMzz4OubD/ALTTiodVw1B6oj5ipz1quGtwj0dmzurR2kuWM8Z2KicLdm3A/Oj1vnpl75q8/wAsryLydV+3C0vb+Ed76LCdeij0VaIllTkde72zYolaDkRceVouLr0yuPOP1qDOIUy0cqqeqrBX0leYLh4vZS/hatMRVBARKYewWHohXRA7rULULULUKjpPJqo6DkPswIeCug+yrm4PNuquK+KXT2Qd4p9ijaWTqFRF09FwmG3UmES2lrspN873zvdRRyp59c+HoVtCqSqO5FRKPAuKRfUzzw4I5CqXSc89csaj0IgqJhQTVUCkBBEAUKqMhLDXY5++eGiVxPAXnxLhEKq91F7r3e2bD05XmW68q6+y4RdLPwpK0QxDT+1wthQSu2WMkjlxvTkwqI0XFICmV2RUXwBovKV5SvKV5SmlOA9DaNPUaogaZa0VMsOfhA1QaOn1BYrOA7/a8NgWFtWi7G7XoF4k8S8olSq3UoVVRtcfblx0Kqb9VpK2vxRTmk5KGFWDdDvytxkccsYsXtz/AGy9lM/ZVeqOpnm6fRi6NVNnK+I38LhtDi+krZ/dYcbcDtZXAXe8KWWk9iFuqLF83L0ugUGWCmm917va7RaKnopPLrTn2Z2KtKRXTOboj75K3dF5F5Ag6yMHbMZ19DrU5aVN8qpVLg8fheI1niMiZIUOGH7o4IBdqVxOc72Xw7Ie7liDuPbJDvN0K3Ha6Ca7lfE4Avhua/2RLm4elVpyxn0XZeQLQi/daLTn1EHsuEyqhBo9LTrfuUd12VFrmm+OfsUIM3i8ilR1ukFd8jsHTpm2XDU7qvNFmKltUeBeUpwLTe729MFXNVU/F1PQi1xS7rni7Chlogg4CCqIVu1WqlYXa9DmgcuOnR3MDQKdSvDsvIBChHJPV2SQsTfuF5hKNnaajylUog1/nCMG7T0uyoRfqqZqcmHKmi+IPwpF3S4c8b3VTQPMiBW+QMaNIUdckC4+kGSXn75uEwqtjuFQzdI09BCAnC9+vsvO78rzz7p3FCrX3Cw21nP8m0ToqyNR6aeSREzuoiE2H45E82RW/CERmlRyNVV7j91aTBMdc0qebHW+HjFZ9Qjt0PLFn876u/8Aq6crCypbqFij3yTFLoPm6FS60wnrAQZZWnxB0d1UPEG+lD/x7d/Q1GJuyD2aKb6KdQ5S2oU5uqlpxcrXkDI075fNBWrStfubhiEnsvI3DsgcOu3O4WErFambQaNCL3am917wDQjRR5XrCRCp6GTdWvJcFVMwmgaBCNOYZGIHotKXT6KB6M2hcAB06nLge3E3Yo5+M/ZPAY0HSeqf+ptakUYESa3QiRpkkFYg2CdcklADzFYPm634LTiG6xNqzdV/4GDou3/Cx0XCZVcoF8t15HdV15AzRdxOwhUOJSKFS4ycjZoVVQVHK0TdZ6kpxyOvd7XYXniK4X8WyiPQYBpyzTiW559RK4fRd/UtTh06ZqXWdmafMUABAFByXYOE/UU6DVRaWeKzP9d1LCXA6dlNrbR/ELDYsw/y65aFcTK7touEEjuvKtNc0Gl1ZVFp6Xt6uAoy4HNBaqGRlloM9V0/K84CmZza59eSL4QBPTLAUdM0PGIKhj3UP6dV9Zzx813dVQGR17va/VUWLdSaDmzFTzBvzta7ekDz5d129S2Ag7AfEAWyqyRuFQ4fdUc1fX7IN8N0nssBIc//AEsJGm60i7WL66X0CkrgswVWiLX/AGRhVz4mmq+IPCO7VribvyaLC4B3uqt/C4HVVK/8RhOvQqDkcTyC4TOyqYXCQqrWPQ9+QLw5x0+VSOVRFUcPZaL41phcdAsTAHM3auKzIWJzw3ZSXT2XCwD7LCbPESei6l536LRYXQD0KIdqhlde72y/xupH3XE4fa7jbPcLqqmF2u8wnZTF1LuFwJ2VRHJoEJ19XVUy+aqrp6HVdlT8rdUMe6DiKG6l1Wh9nsrX/pxheBWUA1uN3VxUCI2hATHsiMcEKQ6f8qrCWtLz82yxWloicWeoBCwizCjRYWniUHVYXNxLh01Ul1V5eUXMeA8fIVDghOipyOCinEVxj7hHjh3dD/f/AA3F+cldduTIXf0M9OUL55f8je1u93C8j2Ko4gbSsQdh+oRour1+02dymxwxsnO/7rBPve20b5hRwzOvd7XVKpRQg0dRRQ8YnBNwNw5/Mc8EyO/IE67BcLY7+tdC4hW7FKEugp/vdrCo7Fm0uqqOVRyofxNjQpzsXFMAZCxuh1y6Vvac8AVQ8Q8fZcDpQKGFzQVQV+pDFqqFYHur0RLuTIQ8QYh1QewgjZyJzuujRwvNnrKNYdt6WC0FU5c5xsplE+qjlDk97pdRq/bkd1QDJKnobw4LxbAQfmZfQwvEb11uOxFUcrryNwoGu94QxySNIRedT6OeqhUQHRHk8GnfmUVRdpkChcLQZQLhCKbhjCKS1a3nPQLyKsTsug+6FZPKcb4Rbtmnou3IAW7+nZVK1Wqq7+1hFQqNw3ABAdAOW4dddFXPFwKnpdpVNrqpbp6eqcQ3CRyGjNhOu6di1cuEU7owZ/4QcqiqZuB6jL4RMToe6iIvxdOoQdYPaHHVjjCh1rZj7rE79RZhvZNLbUODqEFcDm+H14vKgxkOxVxDLqE7in2Qh35TXtex5PQORJYA0NqjF0tYY3TS4z2CJj0oPVdlI82SvqpTuyk6BSV/HqFTS6VE56KcUKcRVTmOaSJCLinP66DkQXQ4aStM0AIjW1/1kNcn840UxARa4EjdHwntIWkhEcihiaFe/KI3vHKPEqGTstLoyVCiERrf3N33zyRC19AT60dbuLlyTAVNMrXt+dod98s2su2AWK006NWHoiZkHUbr9MLLylut09cjrqJwxkiEAVhshp85Rbip1JWHznoiZkbFcPwj/SEPD/bOBzcM4YqSUcOnf09c8KlFUzkPN75ZU36wFhD+P2RYRxDooQH35ELVHrxZcUcZ8qnJGiwxVVIH3VOJ26xzVPc2zwPYK3y1yE8D+uxXbOBoqa8sEc2i4qrDiwkqoputFpdQT7lVbhCIyuB2zd0OyJOueZryQ37+tF4a+mxVeSAgOoQOKTtkZGootL8Rq7oi7qq1VApfatauDjaEYXlUxTdVtG/lY7N4duAnXuA2UCp6m9pRb3m4y7DCFZadD6NwMYjqevIPp9F5R91t7LzV2K0VBT39LQw/ZQ4Qo6XBrq2jeqa1nmIku5dq3tN8BVp3K/j0zeGxoaep65BZmof5kcmE1HdC0YaHpyK1Wx5FdFhGi42h47rFYn/xK4uAblEa9+YW+ZuxQwjCplarzFecrFvlcevPc5x4ug3RVVRcVFLn4ndA1UsgPuhNlHsVwNDVDtd1X1gv3O6g6KNc9FBKooJw2o0O64mkX2jWDutVVTGFvdYR+UG6Dupe7xDs1BrKdgqlWjfmJufaTIYNCuM02Gl0hOxSz2UWVo20WGKp5d5yPwqXtKI1bNFS7w3ujYqDfJaQO6jx2ttegOiw2jcJ5pxa9M7jN2EGfVR07rzIcPTZYHthw6qFHKgcgxW0QxCEy0+Zyf1KJ5Dt77R32vx2ruKKNCgcLb5F4JondbwLmD5okyqaZeJv45MPqFwHiUHIFF8hYD6TSt9NVh21Wx58PH3C4W/crzKrjma7qKesF1L9VP8AWWNSqNVb7V2LgAvlvsV4zTgZ/JSPjP6bLETIOoRPlHQDJVQ04WjosL6P3Rs2tp1OR13jW44gYB3T8I4I6KraXgBqay1eO+GsJhseJhGqqtkA7jYVjtbWGahnVR+msWsj5oqi97sRu8C38nQ9WqfOz6m849V5VIfhdsV52/lTE+yAiEbTQN68zW5vNjqolM4k5zHw4LAfzyi7rpyA0alAWYbaP6uVmLWGWoKDWQ4DQhPcXMMDQOnmGBUG6vlGqJyyeFDiVkG6dk4973Ou8NwqNERmrVUtMGwKdaS0gCbpy0MLCRxZDNM1dOWOTO6omgGbX/V9c89MnfmdlIPqYJw7FaIZpUsuoFJ12zCyBgkyqi4MaJJTbJlGtzV12Um7E0w5eH+oqD8yw4iT/FTZ2X/uV8vthROHC7rCGIOcg0MAYNAjOyo5BjuB5+YLDYNiPmOqa5ziY3R+XsF4bqtQi42zhRqJfWVTJuDqD1Xj/pxEedm3oaPcPug23HisO+qwWFs0CasW43y7KNsu68gQiiE84Li/K1/Cxsp2u0Wi0WmQjvlm6ipUooAI2Vm84OqBRHLtGnSJUNXhtr3XfPTpfCDG3ArGwyDnGFYXf2nvsfJKcI4gjm424gpsnQfpKhwhQ3PBU8lvJjqFtCJOuQZsFwwrh826nnEdfRwBGbVCduRCGHNI1UoY2i0ZsVSzLZ2Ke+xtTMfN0VQfdYWV75K1OwyBSZxEUyOucU72uxfhfEFfqVKN+pEi2aVrPdCCt0xp0mcnlB+y0wHssTPiN7LiFNCFi/TnA+PLuiwiCNZWAWw8Q6CKIseIcM0OEcidlM1WB/xLPYovsajZaIOecJUNbxb3TnCadctbxmC8JmnU36rVarXKcpClwmeigUF+AUPW+ytwKRhPvyYUCS5V8ponss3VOi8S0GKETvnkLENDdJq45CM1VFAE52OrRQJpxHCeiDsUUqne+eiia+hl2ikUHTLWqpf4gXkwu5gL6qlBmPKkKfQifMeQOQ1GAdVOEwtFpdLlK0vs2a4qlBzicGkbBSPKet0nRGKZDIxPKAJ1RrQUGR1xb2Tva5rV7KOmWI4mOzUK4x90MD1hPT+01w6FONozGN9lNifEs/8AVwDdSiHFUUOMfy2RYa98tdLsPzdb8TDhKFraefbdEkwNheRnCBA5FTVU9CFWgyNOiIueUEb/ANQx2jRi5PD5rgFGIwi2aO5PsoKGQcjVeJhxWR1H0ocUsKfO/Jh9RusTfL6fsqaFNbtmh3qpxBo/kuP9SxvtVYW/qWH+l52/laj88vE7QInkCCof+c8DzIVXEVhgjcoQ533VA0u3F0Ob+FoiYhCTRWhZoG0u8O0cRsERiB9lGgzOfsMrrpCd7KX/AIRKIRKbaOrLoQKNxDvI6hX8Toc+P8KUfEHCE60ghuHyysTViafCdq6dEMIk/WsU4273QEBMWvdYXZCOqxn7ehFKH1dNM8brERTJ+qHtnF+iZGqKaOpvkZ565WqpClud7errjaB0uZQjso5VPTlp16c2fSMbIiJvLHuwu6FHDaYsnh2lAfm2WIRaWf1Ny1QAGSv9KhnIPZYncDPqKgcTFTIXO8/QXCNGi/APuc73ADGKKfLG6/cE7BfCkWg1aTqiDrlhjZQY1zDvBWLBRaXuvd7XmEArAdSZVmCOPWUcQmULVogXOs/ms9PbPZ7SbvdeGfM/psEF4bRhxcV8jXa/GPO2+fmuG2UHtzGMJo3NVUywFh15Ot/8d1AAAG3IEjgbqnOORzX+VwhPZsc0/a+CmvGoRtXV6gLHadVRyiVxaKZz9sjPdOIouy2VCqVyVMG7B0dwojXlUVQFPpQiOYPSA34pquLVb5N27FH9T+kofmstlDhBvAGvXPVQAsGyFEB8o6X1NVJcPsVQU7rGP2zoVKLY163RqeQ5rNdb5GoX0W++6LTQi8AalH9OykeY7larhcvI0qtjBX7f9pzrPS8kjUXiiHdNjytEJguNkdH/AO0QmnpoUZzWY7k3VHlaSj2TPdYxfKMUlVFN1HQovsTijUXDpO6hwg5QFG3Mp5tVJ5QKe7tlPQBarVarW7S7AaLfkYBRmZlu0tq0UWLw/wAFYXNIKgiLmgVQapWhuxFVN+qjEqnOFS8FCSjLQQuHyrhooMG4llVUXV1QnQoOArzI5ZQHJCxDQ5KKHCPVBBrOl4GfFZuwlcdXboNxhk9SgA8Od2UEQc4G6cHD7KUM72PNNVCg6KGiBkGTCTDpXmlTve1ybb2Aku1qhis3BRFV4lr5ujOqLjqcziCun4WqcDqAoQaEGHXdM+nVW1nHA40OyH4uGHVY/mOtwpxNMTkk8LN1DGhxT/8Aqw1jTVhOoWKy/wDyG/wVpan953TZYiDXqV4lrat8QjhYKrgtPiD5SotGxdVCkqHjhjRGNE2E606Oq0LEh4mo6oxpkEonlgKIosApFVIqM9UKSV5KhYNJ6hRF8BYZknODdXN5ZcFRRlDV4Z0UfKg6i+IxvuuBaBTon1puo0i6lLo9BCjJVFrDwrvcaUXWVE4SEYbzJ6coKecGWbeLqURaefp6Ax15TQdNSibq6CqJ5Y8Tj6I9DmDyPbuhaazcM8brWERjnLPXLRQ+oVLQfdS4yOyxuOBv0jVYAcLRshxFYS6iPFiG+d19vHnDSt0bS016KdQrSAQQMKkRVAO0CqJUMbhO64uIHUL9ubROY8RZu26Ldp0Iulw4VxcDdl4j4tLQaNRPyaAdAg82snq1qsxY6PE4kz9Tau+ELPFg6Si4/hSFgf5+jr9Fg69VLoPZUovBJ+I2rP8A6Ra4QRd8L8HITy+MSERZjDN+pXQqHNjuiIlbE5Tc10I42vxdargtTZnuvGxNfZhdPu4L5P8A3C+T/wBwvk/9wvk/9xeb4OU9XFTmeP8AuWg12F3deaEPjmVLLUuITi55kaKrzCgmi29BN4RzAjVVqhB+yhwIVNEC11Vwj3UcylDyTysTqNVoCPKMSKhglR57TdcLQ0p7ztk3Wl88k8l+ETwo8CaDhbO5RAOInqFXkTmoV8v4XkZ+FRrR9lxa73jmQtR9lEQd+R49oQXnyMRMo4jDR1uqg+zrF+xXa917gNHCFi6ri8tzd3OzMP8AEXR5mH5ShbOaQCJwp+PBZ/TKr+pn+LEfhF53c5eHOFmwuY3FBG6Z+lnTXJiHVU1VTVB18hYbT90fMiD0u/n/ALuhQNBy2wZMVy05VnBhWjNpCbb/AKkTaOqAVhZRg6Dmd7hidU/0obp1zupIY2VxiqxWYlYmkTsodIUudDQnOa2eklU0OSfRSKRvye6i04gsTTK1UyoI+6p6OCV25VnZg8Y1Uj2VELOIe/iKLnGF5MXunDQGihxDfddLQ86qBa3TXPoqp1YBasFMXdYpwrDiJhY21Crn9+aOZC0Wy7Zm2trp9O6xYKQiA8N6wVhbfLVjiMV2iqKLHZmv03Ovtba0+k4fdYX8TSpaUcA4VZtxYqTmB6tMIua2GD5ivO15bqJXiOcBARe7rm/lfWqgjgKLVPUI++SQvHb5vnulT0KECVXkC7HaUb0G6mIy97iDXMFCbUCU8uhz2monUoue77dAqkBaldV1XVdeQ47LROzkt8zk5wsmyRFVrA2Co4qHw8d1EBo2Cs7PQaqMk+jB3GnKohGiw9d1RV5mEonLS6vJozG7QLB1Gqa0akoizaBHVYnmSbq0CwtMNValt/ZUyNOYFS5NwUCO10RErsq3UN1VrC/dJ901v6hvhP8A/wBjAp/6qZ6LxLAi1Z/FeQ/hVysZsL6coc6UCNdlURkmJf8A6TrRzeEaqgwt+kZoPvl0g7p210NHuUWDytFLonVP9kDfQKSLi6A6TQFYS6G/S2gu1nPIU/NkZ7Qo3TmHrlwu8jqFQOJp0K43hv8Aaww547rgPhjZQ+Hd+qBPlPXkS7yjVTnkaXB2btqsDbGgVo/TE4mOeRvdG9c053OJlwuxXnlU5IPJlvmuhFV5xyRy2YvKOIoWgEGZRcdU8l2ANYTKPW7uoJxRc72v9lCgX+103QtDKxOvB5Ptklri09l+85R+osw/v1XwXD2KjAVURdZv+pt8aIuNWrhqqhUAaOy1uNKrS4c2ov8AiCVNm6e13iH7LclNs4gjXPxiW7L4b4P0uXE2MjwdLhu+pTva8rCagoEGRcVBbKqHNQa08LRRU5RyN7IIZmWZdTXL4Vs3GwqlWnQrZb5IXhsrud+RB0WspuWTonuUONeyMaegk63QMvuc073Ym/hReBueXOcAqOg5WMaG5xFVYWjfpg86qpyYICxNNwQVKUQu/WWlIwxeb3nteTvfML+RUrBaiHfUEcPFGy0KLyIaETNNlW/uMkdcwOozwLRy4+ND4mG02cmtmcLbhOgVOECgUeZuxWNsdwUZ4lDDHZAOdr1VLULhEmNSp0CFUPQk0IioRwDCFxcQ2KFowz79CpOuWTQKGge5Umt2F/EzYqWVs973LHHD3TGt6J3tlGKrVjsqt2XEI5zsgnRDC2QmFEgarTJ7jNhd9snlCAARZQPHLwHVQfzlBnzG4VVXSOyoCWryn8ry/wBry/2vL/a8v98sQtJG4vhBn05S51GN/tGchpKnoj2PMpma/oqeXlYTdaDpCfY2mh0VOfOQlVyBCNYTfZRtc72ucyD4dk2HRm7G9gu8R/4RiBClyAiFM8R0WJjoKLm8FqNW7rw2+Qf3lImMs9csb8qZ0otUBk0opC4jdGGo3Xa4eh+NwsI1RDHYgoChmnXuv/1n+lOov3zHCdVFrZiN20Kx2XxLE6FPNp+22MSLcLWgeVo2Qw+Up3tccvDXCuIXWb92+gb7L7I1ys7U5BheyxIE+e6eSCsTULR0FzOFwVL9JKr6IyvLKmzpPRGQCD0XkC1wptpjk7FGcnZeGzCeqm8XCE6voo5mIaJwQXblV0UsqFVq8t0jotFCgDFabqZRJgOGQKE0kSibn+6axtXE0TrMRimHkdc0ajZCNCJu9l9blrOWGiUXHWE7KEc1f6XDW4FTnrW6LWUQyqqtQvMLou0XD/eQZjvdTkeLaGG9BvcHPEM3KLLMQPqvlv4ROHAe3KJ36FW7A1rJiYUjosP/AHGVHdO9s9DCLLWrT/SltWqyr09BhJ4m6JzjQQnRlA5M6FEDU3TdTlEl3A6hB6rEzyoeoF1aoR/aL8QcegaVW6T5RdGSL3N39cWnQ3se1sRQ8vDaSHLhP5XRExVTlKxZ4Ca1o01K8Zxl/QJzQ3CdffNRWRniIuwNOSLq+WVha3CE6kBwone+UIe3I1uwkBzdiuEUWi0u82WCFpcOntdvnC75ZXCoz18o1UH9QIHRfDb4tqhZyMI6DnNZoOqw2YizFAEQdHUWBxgLglW1o1sEaxyaFNc1nloYWK1cLMd0PiYjNYRjibvzNl+5PssAa4PIRyntyWhqg639lHLiVX1YvoVEQM83zv6I8gHJ3CnVPZoNuUIyQozdss9UGsbJKJtXh/6g9B0WFowtuBQ7rvklqHVSeumUfi6LPRS/icmlqOUIO6jl63a54OnMGfCRxD5hnhGzsxO5ugFT1XF5pySVWh3zyvEHzKC0A/UE9h1C8UCR2NVCtg+jSwhEcm0f9RoiTdTTYrisvwV8zVwPB91xPEqWmVpfpVbLVa3SuxrlaPqrycf4Vef5SuIELFZ1HqNY5BKOSLx6qNQUQcgE0Rl4hwRHI75BNx5XEhAmEC2GxsqtafsqNheVaJ1pXFZ9B1ygbi4ZcKgLw2xTrutbojNB09L7csZtK3SsQy0N1L8Qrtmw/hVy2NiBXsrKz6BvRCU94tMJonF3yqBqNE5rhhMKD5+hUHXkWLX+aJXDm1VCotEcLlUZ8J1bpfC+p/KYO3oJcuEFSsTdNvS1u1QyAZJ6+pnkQKuK+I0Husdnk1QfvrzK0WsqeTVUv7nI4fWEA6xbI+ZfBkWn0lTgKxHhA+pEnOH2nXRqw6N2GXxrGkeZuWdAOqka3eZR6EjljJAzTfiOmXEjPvkjrdPVcTIPZU0v8Ty2Y+ZM/WOeLQDRqLz1udVGyOq+KeJC2ZDhhiRc07jPJq1tVso5QYXHsuI0z6w7ZQRVV811Lyc1OVXOeEGd1JGE9l2U9PXxuo9PixC+MwezTrdB0Rc38XDdGRCNnvoiDqOT2Wx9ALw5/m+lTdKgGi1urou17Ze0T/SNRaP6HopcZN1AqkKuio2FaySAWwqO/pdStEA8SOyLGUYFW6Qqj1g5W6JGuyATLMdBypbnY2PLZpn6f7m9yDj0RKtB2XE38IOY7GG9OozucYl989eS62igRnkYbQTsdl4tk/xGXawqO+133yzyI5VaXlh03XnR9FrzMW67+mhYUQbsJqFI0yOvYRRQ9soPs6IY6k9UH/LOqd75v5G6tVAEDLF2uQIQFF2+Qn6aqt8I3QhAoKXYsMA3R0yUkHI/2yuPdQhhdL+oWh9HHKHLBXiTwaouJlQGRk4XAna+olDULE2LSzOx0RGVpA4WGXJw6t1RN7p0vd7KVIoViivXLBUdMhHIwhSg+xdB6sKjr1zSuE02U2dCvKT7Koi6ERkay/uq3TFLgQg4fNyBVN6qtLq6qcQRyarVarX0UZcPXp6hpR75MQvI3vja5i4dQsDqhEjQ5Z6qqrrmrmCKj8Z4GuV56gLERDVRb9kCeHqWLCzTJiKFnY1/+VxtVLpAorTfTLTqv5XVqqUK09Bpk0zjmduU3FohasMsPUJr3MwWmnZeLY2geNl8SLIbuKANq+0P8Qg4h5/i5OwwyzHRoX6prTJAn3yOF7va5x1AE36KSEPlwohwlpbR2UOb5uoUERyMR/CDgYITbWKuFeTLTCi1o76lTi9socWnCpyF2IBzf7UAQBqVDfLy4Girl8gXD/frp9R7XccFSIFwLZnqLqaBdlopCnBVNMRFzhCDttcnYZKArSFutOSTdPLtD2UOqqVC3cg6UbZro/jks37hYv8ASiaKIkrSPdQ8EBBw1nISUa06XVMLVa3VXfmaIzdouFgF2uccscuGNLvZFr7Jz7LqCEW+H8N39LgtsD/wptQ17uyljAHLHbfYJzA0FmkK0tRtAF/ZPvPtc7+WSXEqhVtZPPFHAoOXjrycTvKP7RZaeQ/0iNR0PL390GljYUttiXfTCxWtk53vovEtLMhh6JwwAB1FNnbAN7rzFx/pVsg4bgojFhc6mByDHWzLIdVwh1qoZY2jB+VwOn3CqPQQ5oxdCtFotFotPUj05YdCsTdMkgodHIysR06BVMBQ2pUO1OhTrPqocw+6cOig1BWAVVRCFVDbpdwjuqDF3K1ptzKqQZ5fdFvU6qAJKg0N7WvqE/4biJ6Bftu/Cm1iyZ/IqloXAaNboo8BkKlm1UgKpKjzdjVVq3ZDwzgft0UFqqmgeZ45EouGuWPRjlwNevLsvC4eHjPWUHu+qK9Vhwizd1COGG/yUtey0btKwlnhP6bFYHtLVorACdCTfATr3e2TRRfOhUyMWYCVXrmhBo0FwPVnMJuo6mybNPa6A8YtruEprWP+IfNCHilzu6EuMeywWFnDp8xRc44nbqkqtVWnPxDXZaLRaLT0HhSq2b5HUVHIxAR6jBq1QtVAFVBUhBd7pcvMsW+qjodFSj907Ezy6lOe8yV5sJVHgr6ioDQFXmSbyCmxye6kn4lxg4Xtr7qm1b/+otjwjRu6J/TP8N7awOq4rZ/5VTPvnxPMNXA2u5Xm/pcbA4IFjvsq8ii0+6qPuSqSuCqrqqAeiHKi4HblNafMAUwuqMaGDVNs50/sqCUA88PSVxskd1gs2hs9QiA3EW/lfuYHbOCwjXe517vZPvFbqIyNd0HKQsXUa5ZTTmLupvlcIhVAPuobLXKDyPe8nASWu1v7HqiA2jal7t1Srzq5TWO5U2loPsuq6rG9mBnRvVyDbOyLDMzkqtZG/Lp6MLWqAcZCBDQBHRU/4DcLZSx/2VbmqjRKreJRE6J764Sbp6XlzIeOxVRHLw7oDvoviFuL6Vt7LjKoPzyQOu6NelwcNViJkm4A6Lh8jaNCE0TvodUcjAUQpP2F+F32OXhCqQFSqiilaXHDU55WIcwc2nJNmTgG6Fm1vA3T/wC1476E+W7G5wDVw6KE+3tNGtRJqqiqLtRc693sicotNXym1AhCsm6ERk2CwAffLicpymNLgPmGedr66LD/ANs6tWNnkOiY8shhRc9j3u0RDm8TjQdV8Ozazupe8uOy6uUa9mom1IcYoAsXy6AZsDtCsPymoO/L1C1C1C1HoDkoFXL3y97tJldvQC+WlYbYYTuuHiB6hEkR0GSi3I6Ikod10EqFJMBQNFQwpLpUOGF24U/LfhbqtIXFkHREzAUTi73nNQLda3xkfGrqKikeZSfNZnJJ1Um8Idtcv87xKmYHQC4xfxkIss+Eck1vJ5I9NZtacQ29051vLbNoUfINAjMoNHRTdg+q4bLz69EcQDh7K0FqfDO6+Hasf91UUTvZffJCwt8ovxC6ehvl+my7XfyvonA0f05O6qIO4vqoKPW8qYohavbiLKBuy88DZAOOIEoWpA7C/jtsI+llSi39OMFmdZ1KxcgWVoZA8s9OTVQPSaYe2WtVwugquQHe80u1qqiVqccqgr6QN1oqPDLQbqHMPuK3QioQYEGDQLH1F+kqjYKpqqtIXhv1lcBwhcTWO+ypZtb3CnEV5pGSW8RRxUUg1Q0M7c04+nVUfP2Wq+K5o/2hQlo7rylqGHROYdSIUG7ioFSqryKLjccWwXiM/C8il5DV51W1H2XE4lawv3J7JxN2MXyMsHrdQSvItF0/KnpmHODhpnCxdRVNDjJ6qQp36XgTDepUDyNo27uiP/K51xs3jxBudQneypTJHXLPQdEygPZVYpwVVcnFQ7hducMNm1ntmPFQINcZCIbo7UHqhgxY+oWF2P8AC+L8vzL4X95Ht66jn+ZUVfSYjopzSoyRccUknZaLv1yzz4JjZQb2ewQMrzUUuGB24XCcU9b5+ZyxKLp+Xcr/APiWD3Um28Q/xC+H+nruSi2Gge3Ogo7KqmI5Zd+FF9FpBUilouK+mqxFa5KLiMKGNA79VieYbuhZ2YkLWFUzeLtVMx7rf2ULENM1dF/G5r/q5Q9udGoPRcPlzgqQF5aHqsMgkbXsYD+4MRyB3UCLn3u9lF8u856bZickZdwpGhvB6H0BEwFJrS7oPsvEtjRUPw+guN4IRBzVzVqtB6aToqDCP98qolSyna4GKo7LRUzU58ESFFWlcXF90HMpaNoBvkAGi4x9wjaOOJo0G90KMC8gVdNh6PXm/wAW5gi4VBWioFiccbvpCrRv05KlQ255LgMAmq/jmi6qGyropZUIgo4cg32VaIxxBebCdkbJ/u0rUKlVUZxz6+UhbjKIPFsqNn2RCgOvAJgdVTyNo32yAhbFOvd7XNMYkHhsPCOLMNlOScsWnlXDVo6oQR+VJAG6e7E0hux5re4m55GjUA4yDQrDGi+IIaEBowaNUahUK6Kl8/N19PKoFh/vlU5oUlUGeihywu06H0JVRKEtELCGNg9lUEeyo4rCDK7+gAmfRF3RE4abrtmBlQGygPCbRROEbBTNVivO4vOwUay3XJrPsuueCnZASvLC6gbqG6XUK4rNrvsha/p3e9nssFoz8rrmGSi1i/vni6cOWYQa/gfuuF8qHNhYx90LX5rQ4csKE+93spRF0zD1Bpl9+UAoboLuoUtMIOYIPUcytFSrkRqD0VLMTKYGBrrdognosT3FxzBw0XZCOtED3ulxhcOc82RcD19NRYc1bqKHtj2VHtc3puFB5WsFaX1VORPX0elck8owvCb5R/ahFh66KCIOacsKXaKGDCEOFMlsFHiBdpBCrJi7Xk6XY2me2XHacLdlDdMtCviDEuAYSoOQBQWgqQI5EOW/MY0fSLpa8hMFrZttK9ULIgl7hUKzs2iLIDhzFOde7aFTTJB8w0yAJw25RHzb7Z9CqWg+6Ac8BR4wLtkQb9LpfPsF+00t2K4vgE/hTjDm7p1jYtwD5ndXXSM2ElQdN1RcUqevIgKJXbmzcfq9LELyqMC8qkNWl+IdNcmJpnfmarQcg+ibvGeOVtOStR3WLplg9UV51V8LBZs8Q/UiTZ/2tBCGGAsPeZTS9xgdESFIVQqmFwvW605HiPoFWzkrCLILzlpQtI8cn8IzyQBQqoyDJhd9uSR15LTpLReTsh+ofxTVoClo4hUKvtdAVBK0Xi2fl6jZWretDfae2bj13CGC4v6MGJOO55BJVKZnZdV8T8hUeuOu0o2dnZtf/IrFAlSam9rsRw9QhbMHTkwdU6D0WvJga3DqFiaSzsiNjyZyyMtPQeRftr9vXdeSFpe9v3Ui+iLuo19GJJCGHTm6a5R6DyrAakZQOc3DqNU1wnvl1VVLVWCqUK8wVAviGOy4WSVVQFPVYioOhTuVHRTeMghaegAUbUveOybi+Q4URM4VaiJdP4WF4WFjYPUm+hRNmfcI73PO45NqT5niBycPPxaZx+mtH1PlTraojUBSycJ3zgo4TxFVXVarzrUX4nnCEMLpyyRX3XAfsVURm0CrmnJCrX0OqBnTov8A4UxIWi06It2VRfXRY2GRtnjPi0buVW0C1Llw0ujmgHpydYXmW68q6lUVRRcNQt1oFOGqpTOL55jhtXldlwqXypb5kZWLqovxx+FB5oyQNVHoGE6Ar4flIm+Fbfpz87ZHunMcDhdRPaQRJXupcYKpJvc7oYVLQSqBO9uRWrdka06KhzAqeR98+I/bOZ0AlSFgtfNp7q1DRwuq1eHgMjVRKh7PuF8O1+zlVaXmdlTL4joC8/5XmnJoghAUP4ggRocvmWo5Pf0tarhmFFoCDuECx5eOq4CG+6It7Rvht+5Rwl7W+ykPxNWiopHXl6XATQZQOqdyPKtPRx15evPtGxOJh5AF2yxZKqYC/bVWiF8M4m7LGwRvdqt1TP5sJ73C/uq+iaPpaBW8JluHYXM6p7LEYnn5kG27BaDdY7E1ai1yIXCJU2xw9k9reFm17h25LDu3Jre6W4lPPAGcAfMuOvYIYbMI+JGLZDxOFyfgbw64l5m4tpVbNyrIUg/lfEs8J3ahgIe3spIj3Wkra/TG7vy4JgLzLzLzLzXUPqNcKgVzYOsrWiockOCxt0uw5JcYChlFWvN8UDspwrylVafUBQu+bRUqq+hBmFwmQfQcQlqxWX4VaFYQ0T1OTXNKlrgQoQ9lRThkJsLXiKj0DW7p5OpN4jTqj+msXSDqVW5zLV4DCOpR+NZh86Sm7brw/wBPRg1P1XOvd7LtyGDrsq5NbyQ2Xd15QUZYQexTYxDdE+JXaFv3vHtmwjPgsx7nZBjDiIoXXMHQVKd7rxvKWU90RMtUFoB3Cq8lY2nxB1Y4LxbIcHVv03dVFb6I7nm65OqkMDu90jpkgXDl05ktMFVPFtm7bKow+ylplYXaehholCza4gNHRUefyvMjxldPwsLmCztOjpouIR6WVTkhpaCEGTgnqnNBxAHXmV0Xbe/29Ex/zZhKrfC9rxfiPVVCtA005fRaSqsnsq2ZZ3aVisXh/bqgDR40Vo1wit2O0cGMHUrwP01GjV4+bLJ1KtLBzy6kIg6i517vbPVUug8XuncX4XbN3yQdCoUgIHmYvLZdXlOsrAUAlzt0/vd4hHFaUR26lNZ8oRui103C8Sztmmz/AJKS0EfxWJsg/TNE1vhANQgRVUQJFFQQtZ9Hgd+V2yUv1IU6jlRNOZrlo8A91MiFr9rvJJWFzWlHh53lgd6J7bM4rQ0Ls+E8TdisVkK9WqtAPRSVIWleSN017uhTzOITqoiu/MLCK7rTkzy+3OF8XV68mixO/C4QAi1zGvHsif8AprOvZcX6bB3Y5YrK2tGn/FBxecQ0dgUOwl/1N1WK3cPD6R1U+VvRozhwWNvzibnXu9r4NRdop6KiCEyFwmVHTldr9VIP2UtEO2vDopnhCzDqBYehBlGSAodaS5WbB5WbLCBhF84luUyPKEB0Q8PqgJUO0VKP6FYXa9uTI05kH8qnEpOeuilueVTmDKS58FbrC3hyBGNdroUDXlDDT2WwQ5FEBPEFNm7EjTTlnJiOmSeQ0ARusLfzz8Lh6OOvLajeMlOSGN+6xWrsIVbSg2C/cj7L5nf0q2U/daOC+dDUHqsVgXeJvoFZ2pcXxQyuHXbP26qnlFBc693tkwtMALf7KAOBOgT7LiF+Ej2KnQc6W+YIub5uoXFqsJErE1stKq0i7y/2vLh/yKphf/i8LjHxD/V1ke8Ip5ipoCpqXZOyluiIeKFBwqw9bsT6RdIXCtMTVRDZT8t8ASgXU91xWrT2CktUjQqXkoAWYKnwoI7r9n+1+1/a/a/tftf3kosUQzutR+V5x7LWc0Tn15gCIyyfLmlcba/UFLHVUkwUA0T/ACz0UKAmhduRF+Hpd35MXgLw+ZAvjl0M+kOKh2U8sSVGKe4Ws3DPxVUiuUPA1qCq8ivEiwslhQtLOrbtFrTJhE11vde72yeeFStxwOLZ2XH8QfyVGOaVS1aPdRMndQDI58DVRa1QLWIMXhus2vZu9B1iBhOpGRltrgEG5pGsovDZY6tEOh5LBusMowei1ChHCaIAtbO8LDaU91gDwQpsrMOZvqhLcH2Wsey1vFenJklUIN2vrHGjnEIxyibpBlQmsFqPF0rovJPsuJhHupNpxbBT5ytB+EG+Hp8wWBgnueqoAiRR4uI683iRHVcVBuqOxXVZXcLQrWve8YXT2VbsSgrgOP25VAj6uOq75QfmUmvOm4cgT5TqiqXtswZwiqp5tslGkqXET9Kpw+yqTe6xcfNp7ot6jJRCRHugxpxBvW917vbkRfPoA7/uP6bBAw1wHTqpxU6qDqFM4insd0yWrHREdVNmZY7+l4up6dk0ueXO2HJjVNcel2vRVVFZwMOIXMZbdR5tliacdn0cFgtONqZgb5Z50yqehGx9PAWEGYvcfpu8xjaVDnEsPRSLQ4PZUbPuqWTB9lilD9TZ9TDhcCsbPK7l/VdJTifl6I4G8W6jNqommTtdSirX3zhdXKnD63dARVBNIKNMZIUm6roW6oIHKHZSqCEMtcmA+ZQaXE6u6XBw1XENeoUs4kS4Yjsi2cA2blKlFw/dGo3W6l3AO68xcpDeJROFuR17vblhB2+YnkV0VeHuFQ4l5TC6tPdV0R/tcAlVEXVEyiPpqEWhWbdynN+dOY7UZ32vXQXaKgKqDdZR0asPVYfpEKhpspb8N2x0Vp4zpxRGELH+mtYterXIseMLh/yIu+J+ER4YHdEaZI0BVb4c3Gw6grxLPisj/V5YatOoVPKdLnNOnTPNxmkKBQX0XDxWn9ekwqqonOPTky/TsqUHMpnqp1QbZsaEcSDDA/yU6AqbxzAN1huHNqqFaKWHCgcfhP8A9qHwxw+YaFT/AGMwKIa3DIBVTOd17vbl4RSPmKs7JwxWQ+cdU51nVovk0WihfuQditRmce10AKDosQ4m7Lz1+grhKqdNlBH3XDKBJwBDb/amHDtKaWMMDrKxeIWO2FV4gc5m9NUPj69lLHh4WkLitGL96P8AxQb4wjdeBhjD1RxbItJNm9SH4qrqidFhNR3Qt7EVbqEbQVabzHRSJB3QbaGLUaO3Wn9/8SeRSl+IaHLPzMGm4yGztBis3ImxtWFmtSo8ezBQxfqGyejUbLxA9mtaELjtGCzJgOnVYAIDctXgLzSsItAO7qIYHMtB2Kd4ogG6AJWMtwN3cnjzOhVHpTClYW6ejrf2VDnw6SqqnmKklYHV2Xa6p5spjwKEXDnSMlFSm4OixN0OUbSn7U5Dr3e2fULzNUD8o4nYGNqSsDaWeywvqxFrRhZpI6rZQ9gtfdYgMI2zz1UwtFwjqhjeD7KmgWqIqtvbVcM34nCvSbouiYXdRMLHIoVQqMRyC21cKOQKDmeV2ipKqSqlDqE9zeoXC6FxMDlFWJ3/AE9sO8qLQNtAfmF1df8AiXD5uXDjrlYXVbMFObsSMlFoXWp6qfNa/wCli6pjLUzZYvwrQAQAVIU5qEhVeT7om0o0bL4Y8Mdlje/C0J5bqKYlhtONmxU2Zr9BUlsD0dE60eYaKAb+vHWFwre6VxIhnl5/hWhp8qhD0tNDW+BqjxR0MKTrfGV17va+BqpeYPuvDcDA+ZTZnGFxNhdF23WCznB/u4IsNWO6qo15NFVcIruVhx1VZuNf7U+JBQjXdTT8LytneFr/AEpJnJVdlKDBoMhxCVRoQoGP/wBoOD6OqGoMtRTfZTZFz3bORxjCRotStEbAmJ0KIN0mjd1wuxLEdFh0PRVFzCdSEHTQ/wDD7Wn+1B5UiigHFklo1rkAbr1KAFFup0HdVthOwTXwSN1SCvKpfwDuq2rfygWOxsPXJsN1AHCL7ZDt6WRqmCgA6DOXeoiLq6dlQzdxaIUgORB5nVSDIUprt0L+y35wM1TuLDaDdSBibuEOA0vDWshztXHoq27QVqHT1HIde72UNElcTq7NXDw9xUrSf8lIEKjo9l+4UwO4xsndBteE3CKyjj8mxWKxOE/Sq5JMzdrVUGTDsquJVJ5cLiUtMnbNAMKSqLC5+EQps3+J2UOaR9lobg4eYdLobwsC82q1uwuo5UbIWGYii4+MbFG0svL9O2bX1/ZQ0fdeGTXojOat03Y7L9zqxVBF7CKNHCtVES47LG/hC7KHODPdCPiO30C4FWqsg2pAuoZc89eiLnnEbo1Gyq42fuiWEPb2WEIMHTrktGEwCE4EXDF5V8N3Fseqg3UBPsodwf5L4Fs17+rDRFrhBHTm082aUBOq2G6pp6YZMM+0of7TcA8qxRhdzSSJb1VJagK0QjZQFL3QOyjRo52txRc40Wqwuhw/kFPhtCNmTHsqmU5p4mrHZ1HUbZ3XQE6pMDVYbIYO+6qc1m53llOjTpeDtVC1OrTULioNromR3UOAY64y5RZ8Iz10RHMn7qqoVxATuuKi4Hz2yQ4fdSKt3ukFQ9otB/JQwmxf70WF77Nx7qYA9ii95oOiwxRCMlXGU/8AyNwLUXt+G3uv3Av3Av3AsPiY3dYQKkaH1tb6KNQpGWIVBC2uorPE6cWirdgcPhnZAvtMLTXuosRxfWU8O4x/LdGeuSTXssWJeJodkOGGjS/S4FuqbIw2r2zCqPsFxNi6glYnQGDUuXE+vQtCeyOGaXawvCeJJ0dsptneO4fKNERYtbYj+IUnW4C0OC2bQP391Dx99+dBEqraIYLT7FQHt/KAwyIWwWI0xczW40pHNGHog1YSaFC0s30PRSae3Ii/hEoN69b6qmu64nOB3UHm8MOO3VVUr3TWjRDMQdCg9glhuN1FWG+5TosyQv2isREYzAlFjBwgLFan7Bds4srUaUD9lhQBMLhrO6tQTDdUYgqsNI3K6fm4KOSwkV0JVOWeTLtFAbw90A2zDTPS9q1qom6VTJwki8QgG0jVdF0WFv5vgqQ4eknKYMPHRaZ+LQqRUXaItGp65m4T5REKtLsbhNmzVE5uHXe8eG6CsP6jhI6o4Q53sj4dm1vvVVwuGxCkS1p6LF4ZceklYiBKla/lF5luHVreq+GPCbs1W08ZO6nEhi1bfSlo/T2XEMvhWo8Sy2KFpZS6xdodvQ0tHD7os/VNBp51isrdrx07KHDLXNEAryhYQjy4vkKX8KnVYmmQb4H5X8csaKmsVVbwoNLvbm/S7dDHXunfp7ezADtHjoU5mux35FPyvCszDP8AaksbiG1JVbH+0Sx4azuUbR9riw7IuDcI2TsDy0nYprS9xLqLC3yWYwtThPTlFzvODROPRfZMZ2ytJ0VDPN7LhzvU58TtFSguLtaQsNoI7qW8bey0KBvkfhVot1LTh7FU03UJwjqqy0p1pOmiJ5APqcBKg8gSoGmaG3FttZi0B6qMLmN3BXwLTFKLrXhaN1DRkpU739l2WBs4+uYd7wWmHKIwuWK0cLNvdfugotasey6KXCKAZILQR7KhwLTE3cJ1lbNxMPROtf0xkDViqQ0blPNg/wARzNWwoNMsDVRyCd1QwvD/AFHE36tlis+Jp2QEKXO+y+G2Of3vpmrotmjQX6BaoI7LvkJKrfwsJQxiDHW7dcTI9lNm5vtoVXmf/CxN0QcfYZ5dRqwMbAyubgkxvc9Wlr9DDFzvblMG6b7KUw9souxDr6QsUdZyaLQqXfhV0yyCVLxTdYrLihQ4Qbx2UXcOinFCqJTjpC8PDPdRhUZ/f0MLCPvnlY/mGvIf7JtCuIQtFpd3u0ua3dOcNGCBCtbJ7vPUIgiLsRyhjBXq5PeT5RKk1Ob/ABuARU73Su4UF1LrK1AiWwc0SqiDuFia/SqLiuxVn4rcOIfuBHq36riGriKopxBr+/VQcpJUKBoLwWmnUL4dbRw/Clxm/DnCHOw9euYQqH7XcYnup+U6HKGDUoBvsmuj5YUZI1HJooP9LzOH2X7o/C4XYlPy6IAgFUEZe2aiponS0k9ii0Mhh1qsQqzdO9uSFZM7IoBU0GX7qXLtspGbRB1rQHTuowYTuFwOxZJOeFGTXPuFBGEFSpLR9lNk/wCxXEEcSkZGO3EoxqeXCraNb7o4v1Ya7/FcFu0+9FGNv5XRdOVi+bpyYFFWj8+Fui1UlaFo2BUBx/8AMLhAXRDGzTZEBtSuql32RO7lKBx8YHVdCq5o+o8iAt3XAnoghZdXNBu0u8B3/ioIzgdSLg+0ZiMwEMOpNOycCMTDqF4uMts/pOqcxg8MHqq6bqqadljsfNEkFQdb4QAQ+o5a8tqaCIPNx9emUOHmbk0rdhNW7KoXe8OJ4v8AS6laH8LSDuqcQ7LQhaKqpnoqZp6ZMRzy6gXBTuqmU+6PlOqfFRGfiovO38rie2eglGRhuee2Z2+Q9lrVA9FGpVWhSBicVicZN+OcJXUqgu0XlVMlPNzaHF73Uu+obFDhAw/Sq5Gt8MSBCJPLa0o1vxY8Dm6rhdiyYS4WVp0O6h4puNMslTEZKyFrfN02hwHoFxKcjWt8/wAyE6Iv3NL4FBmlWeAUdVYi4NOxU4vEGwRtbGSzqDqM0+Wz+ooBpa4DSFxMIWnJaOiaE1jekBDBwwIUSSqqUy266Oz12FzGgT/8JlkDODVYIxSsPRtBdHRYhogUCm2zNHa3gC6uRqgcsFBxM5q5O9x2GYyiMTp7LgcHqVplleK78KEASsLrMv6yCpbZEe5U+X2Wq+X8KH2bTyHsc4Yj15Bl2H3QxOFUKyo2zxte698iRCxN8t3CJVHs/Km2tB/izVfBs2s7mqGOKbC82FpU/KsEIjpvmcP4rjdhW5VG0ThMyo1Eoxpezl4XaKP7UDnROUx1UWg/Cxjyqtxz6cmJ11WzlpW+i8O2b4tkaEFeN+nPi2Br7ZOHTP3WwHVHa6SZvo4A91LjP+KqICh1wERF2ED78hseUUha3S37o2tjQ9W5P4ipUDhYNGrVYZlq4rNrgqWMFQ6z+4VKtugKL9EO1ViO9wdEwnQ2HMrda2P1VCOb2AF1vaGlU4q0tPpan++TCFDhCLH+VY2cVlvc49R0uGSdkTywE0t0FOULo6nKLR+myGHh7BTlEt/C8swqWeF3uvNRRKnUqT1Q5gkCBpRSdVBVclSi3cU5Xc5HXu9lah56aKIKwjhau+XE7RE2DQzuUWm0AP1FAh7X/dMe2pIqqi8E17L6fZVAd7ouGg1C4OFm1+K9p+1878qfSxNCodJZshJCeQRE7rfljH5UcOlwHIIs3kA9FOiJNq1kbrDZnF7ciITrL5uTZYqv0uOLpstuQ04opVEAmqg38XkcvgtlhFKohzHCOy4WyU6zBxWjtY6Z6FFDiXidq3T0CwCjgra0tNIhYnUNn/d8gU6qmiBGqY8CMTZyYrYx2WCws5cdgrIfqHss/wBQKYkAxmIH/uDRWdhYyZ1IQB4J+qi8EWmN5PFHRY7B+Pdp1Ra4QRdVaSnTU9LvDdVrxCLPmUpz4h2W05mLo1Q4UUCAu2+epQIZ+VOGJXDRw6KDQ3xoEGDpcMpf0F77Rd0Y6IYhKGrVwnllqg3Q6oRLfLklBw+YTzXXu9k2sTRV65q5KFOb1hf/AJHn1gFYrEfZfyTXH5rsJgt7oCwph1Knyu2XDpdCkfi4i4LDyq1GWphUM+g75N15YWhUaFVzWrztAvdaddByw5pwuHULjE91w63aXiFHzFEdNeT7JxxYVGK430y0oofruv3Gr63IYnYnbDomnEdFIcVgtHkDfljB11WFoWD5ysbhKYAImsJzBEeyxO1QcNV9PssLxj918Kzr3XgvOF48p/8AhQ4KBqpw4nnQLFbORH6eH2x+ZeJau1ricvD8Qva6nYLwfLZh0QrUuOO2e6GYugVdVQwvEAwvbr3v0UDRRqqUQt2VtB52/wDzdx6LEyrcnvy+JslYRRuwviVENKqIKwhvEommYEJvjMxOdt0XxGu95XwbYtOxTvKXO0gqZYPd4VMB/wDJAOsz7hRByMs+sSb7KxiHHiKCdGk3Dmla3Oys7Dmuvd7KY0qpySaBUOYOam2jQ6HfNKgPP3Xiv0GoWIw1vdS+2H/iFFh99yq34TAd0N8QJURVVaYuJ9HpJ3UgkFcJm+rVQrfNopz7rQ5XFreq8v8AagvY37oBujeSMxGKirhP2XkZ+FSB7BTz9vdbqgjOANSsDSHWp8x2uxOoeguE0XiNqw30UHN4Hyomz1WK01UJrPpGVh7p3vc39O5viB2m4U4cbkGeLZsteqh1u61HaiwtsQO5Kl5mLsYdUVqpOjRF0qOiOy4aKJySCvHYItBrF1Fib9xdXTlgIhtRkreSKHMUw91Wspv6dmrigAA617om7VF2IkDoVNpYNLljbYWf4UFjMO2FBzg6zdrTReJY27SfpK/ZcfZMx2RYyakq0A0bRF30i8Z9lvdU/ZREdl4/zAxkOVtnpGhzTnde72WuunNa50Eu6FFCTqL9YTX9eqi+NRsVjYI3CovDtBx9HqA77J8tDbWNd1uFp6amq09Joqrw3mQDojhjEsWItUEmFTQ8gM5Uc+qhwoiR5lXLAqVifD3/AOk/h1OqNtjaY+XIWatPRG7RQ4LHZnE3LOlu7XssFt/7LEmtPCwnVETPfMxwHnEoWlpFk0/UmPa4P6TKwtcDaO6KTrmxN+4vqJRs/m+W4OHVMPZC8fTsg5n7bqi6OhUJ0DlgurabbZgRdEV3zFNHdYDBovFZBt3+WeixOdJ7lVcuq8v5UdMtCiwnEe/RMONNtD/3GhyLToQnNPS4ZpOioqUnW+tUbN/kcqVbve4DMD25jlPRdE6dlhdVqocTTUHlutntljP9okoFAZHx5gp6jJRaqvm3UgcXVO0xbTVV1vp+PS6qteV25EKl2GeJcLy09kPiYxs6qxWhP6d/UCoXht/UzO6kDGz6mqcDo9soCcb59QCuHiC2yYWCdyvEcwEnygqTmG+WnCVBuxkQwKTW7DMoDupzMAAxganoptHlylVz0Ui8FO90RssO2U2L3R9PusJEFcb/ALNUYC7aVR8dlWMX1BFrhB5BeRXpng6Hk+M4YgEXOZgYBUovP2zwqCm6wg4u4Rwi4YLVs7FWL3CrOByHRBx1uGWXch1mROLdUqphQRI6oWlmCbJ3W6Tz3Bok7LD0Fzva7BaeXfZQ04hvnoEfFcfsvCFBvsELCx8jf7uqhBnJQrG3hd8zUY0vwge5VFjd5f8Aa1opBWG3En61Oo3vr6+DzMW+Tge5vsV+84+6ItrMB31NR8NwcvIbme6eO9+yh35UgUVRPuv/AKWq6fhUCmOfoqKlFFoI7qWOxBaL+TlQTGqkUGbRYbUYvbovhPxdjqocIOSCoCFmNG5AsDvyt7gYVWITIRNSqc6QjOyfTKIXEZimTVeDaji+V6LSNFSmTRS/hYFAoByK6oZu6aN14bNOpzy4wjhqSvD8Q4NsrrF/G131I/DIPuq3C+pXC37lV5Ms+ZYQanW5rNa6JmEQIr6B+Ax0vd7XBMpUiZzSbrR3aEaxav19sk5QHH7BUs8PZQ9jo7dEHUdZGuNcFmSptn1+lqAiGjQDJHmbsVrg91OIEdlrnqVBWvp46cuDnpRR4joXGJ7oGytQY+qice9zrR1dgUXTVYLTiasIIwlQRPdEtdQdkcTohfuURawACVUokVA9EQQHDoomii0q3fqEWtMh3zDbNLlDeG6iwW3/ALbKv5vCFpaAYdii4aZi20EhTqw9bxzBkh6o1WncLTIERmr5skBo/C9ljbSNRyidkIPEiCIOVlnM06XVcAqyfZeVeX+1OBo+yoA32HIlNfEYheOcMXl6p3vdOBQfN09A693tfThtG/3dsuGq8jneyk2bmjci7FEM3TQd5UkkqBkrkxFYnEzCoySvDIoVFnoq8jgd4bvpcoeOVFo38LzflSIIWnqZGU9uTKmdVvk4VxCilpUzVdlwtj0jhauwWnRQKrE7yBaS36VwmDsVpS7ZUzYdW7FYbRvhHo5pUESNxoj+otWgn5Ad1JqesJzds+F1WohreK5p7pw5bhkYirVa5Z3E8jGNFiUjqiG/cojlEbprgmWgqHiQQqX0Gik+gwgjxrP/AEuIRcLo35lEMVkwndcNmxn+KqaL4jMQWJmm3N4qKMNE+L3TSl3xQS3spa4OGuqfaftMJoOqhzTae6JbZVXDZriYMGyJtLLBHWEGss/hjypjcOgWmaHaKcRqtJPdSKKCuIQd1ixS3dU2VeTBq1Hwhi7csFr4OyEwVXgK4VJ39NrdVUqLj35FKm4h8h6wjRbLzBazdW6CKdlgbpygQq8kSfinpsgBJKm2EdlEYW7XlpGNh6FYmgg7cptnR+4crOgaB0apGhTbdo7O5DXOEgLDGEoTonc+UHjzdQjipPOrouHr0WEaDJQ8mHaI2biHdW7hdrj6Jzup0UWnEO6FMLusIGyPDC6EonVaV5jPbLhWq3W3Jm50Lw31a5FtjUCslP8Aa8Wm3RS7J3uo6iknkRpHUqS2iZCD2tOPssVrw9kRpCgIscBKwxycTDhPZNDhUIkHGzdq4Z+/IJKj5r4JJXCq+notbgx4ae6NKLRaKtF5stRW7/7RuI5FMpB0KkacjxHuDR0Kl9vKj9MwDd7k5zjKjIRyXW1oJazpuUZT29RUJ3iE02RgSO6baAQ13J1kbFB4ZR9RCi0tWh2ywttNRr3WnIOTicG+6FcfYKLNpEb5sXJoaBG+OZWvpAOwvi6DSUHt0PMbG3I0N1RpyXIJxTva6cwVNLnjOOm5UNPCtVFKLzgIi0hyOB1T0vaTVxpyyNwjnJuBWJVRw0MKcWiDpn29brnwn0fC3Cc+N5hgWFghoWwULhPEmnrFcndUoc8QhZ9ES0Bj+2hWHqqwWnqCoTmk8cy0cqzsvmi+KOHdcVlHsVq5q4XghecIYai8KgWq1vw7og9MpbrA5MA8R15+kqjFD28PZSKt9FG1LxebFxjYrofYqtOUDkoFKqJVGBNAYGxsqABcVUdr6ZXXdlhZtUoBU8ooM+DV3RVTs0u4WbrC3hZtdqtVUrW6UBqmY3BqkcQOy0RHIaSJAKmIB5UHRG6BRQeTQLTP1Wvow7f0ZHQrf2yx0uhU13RcdAgBrvmxdRlAQgUaU+d1xI2ljacWsJrndVjZU7LaFiZ5uo5DG7lEcjzLiouAyoOcO69b4Usr3PJCPoKtxLGwUWA1aVuOcNxdO1UT1vqVLTdNxd/3Gf65Q99PQSL3Kgqq6p6J5EqsH3T5A8uWXGAob5G0GU3S7haos+Fo/tS0xa9WlO2FFwPIXHheO4WKz4H/AEnk69+WHdclVTPqtVqVwqHCMgWp/H/BUylta5K9crgNSh2vCEXSIK0wntkFtaHw+gTiHY32g8yJu1TBsmiYcOpTj8rqhNTh3zutYk6BEnl+bj7ri1z8Bk7KFAUZAcs+hCgVGynTssJUc85Bl4abrFZcW4UGnIgaBU5Jz8Nzt1quOA9nldurS0fRoEQOpWw25Aug6GiN8rwhqczX2hOLYKBwjYKpu8V3lCLhVrqjJhtOILGyrM+qgtruqHk8VVE4O6ljhaey0XHw8wC14xp3VKr9tUs4PuoaAF5R/wAMa3VqsTdEJ0TuSJ0VNM1iw1EysH1OWH6aDI76nUuHVVGHuFjnG0/MM7bIRTW+RyWnq6qE8gMtDgd9axeZm4uqYVDNzfbL78iYnkhaqbpdSOq805dbvMB7qlVXLaGKRkCjrkKhY2n4qLXCCM2LrfsVvnk55GqOKMQCei7oNU1vyhYR3PIAvZ1qjdA0WFsF42RxVM65rLI1q4iJbQZS3odVSQo15GF4+6ljlBGWL5BWgBXF+eYP+Ocx3lcnOxcXRSRiWkX1NFLSHDtfUSoxYadUWkBzdQ5qg5T+qI4YgSpaeyk3zlkadQpApfQKoICJ1jIRyY6KHDE06rHZvx2f9o7Z8FpxWWxXw/wvIT7X9xlm+gvki6DoUQOREhaKsLVYRQqnF7Z6LbK0gSoW6ndQaFC6RocgK1TrT/us65mN2y7HLC7cjxrQ4Wf7VuLPheIPui2DL+qFFaHk1ueZght7bOY6nLRbIuFCrPEZMXtuNm4wdQo1Gaq+HxKPCdPsq5qFcVH5IVcuHpyzn0UtotPQaX6euNmTBdosLxiZt0KbE2eLdA2R8Vp2UfqLQWXtUrC3xXncIljcb/51hTaOgR0TLQaBxB5HZYtZMXVWiMNEoNc0QUYGF2QFSziHbPF27kP5UIURTkSuElTOF639svE2D3yTohagivyrxHCGjQb8zXLQwuMT3UivLp1uFzXDVAHa6Mntdat3CxDXbLGbiyO9uRJ0Tdttk6DCHinxG9A5T4kDYaIkaFs8oIToaIgLG+myLjl73GzdxNRjpS8v63SmvGhz0Khy8WyEtfX2RkKM3EIO6mydjCg0WL8Z4PKPI1u0VOXN2G6rJVABdr6Jx5eKzs3HuEGfqrFzmfKXDRDG2MOjl8K292lYiwE7hRZNAnZEu4nosc2Z6rwfrM3k5gzbJM1Vm57uGv8ApfBdJaa5ZCg+bfKEVN2L5+nZeHaHi6ORBFRy9AVxgNG7UPDtDafaFgNg7GepQFpZ8S8JwjuFPjUXD/8AzLjsfu0oBr8UVId0Xxv1AhvyNXDYOf8A0pFk+z9qrhMhRFefIWLCJ6wtOXKCom/43AI5T7XYwNNbpNxPofrXYdLnuP2CxG7GPM2QeUHyAO6adig48QNVxUWBmg1yTfKFozQ3awAtb8PTPxVQFm2q6EaVWNgGIJ1InPIMLiALlpyI+bkhoMk1ObUZgen/AAeEeXlMx+War4XC3RrQmY2hwc0EtKpEbIeG4WTlgOG2b7omzbFoPkKc1wcEJFFaAeUUuldssm6irS+mqqVLTOYiURdVUvLzoESVK8QaO5nvcK4hsVi6qphEteDF2sNWCytDgGydixYt1Lpd2QZYt8JoEUuBbOqjAMY1IR6FdOdI05L3m4oIdJTf8bpWLfLUxPVUc38o43AjQgLEx2Jn+lqjlAzd7o65KUBreURsBf8AqLN1cbCEQenIkmiA+UXNpOyPiQWonkEc6ix/I7zdkIdNmV9uTDx90COR/LPr05ohVEKrY+6pKppvd09VRRfO/JBWJtDKAOuAKR5Rqp07IQarj8642flH5WCtF4gZO5apba/YqBpmZdRa3QEX7KLsQ0Oad1TJHVBoPvfBq3ZSFDmgr4dOx5MbX2Twwtlorf8AEo0ahGALKeEeyizBATcRj/Ioy/E7YLQocBf2UQPGijR8q75KmFHL7IubQriEZZHELg7fIABom/43u3bmChWod9K+lg1cU4WZMt6nqoyjN3urey5x7XWl5/xd/pE9+WwAQAE49OVLczacg4vLFUY0XC2XMr9lURyY1CkeonQLicpAUa34nUHdYGacjt6TbJB5TLS0+WuAdSojiOyFn85q5Ssb3V2RhBHUWloVDqhY2iCqjMwXTcAmiz6iqLd1M3EZZdpspaIjJRfyymdL8Q12zzfJX/T2plp07LCOI7BfEGH2QAsnknqVZNDA5zRXZUw2Q7KcRLtyp17lSTw/V0UWfFb9kXGpObwyQD0TmOEEcqToqUCAdUd1LeE7LzM/9luFRpKktLVVMs8cUkSpinZbXt/xvjoaIjLAElVbHuuJ2J56J4Lgxs0A2RDTqsQh1K1XE0jJxKAZyV8+YXe6FmNfmKff9iiB5emWt9FBHFuvZWZFKVXhs8o1u0qoIVM89Dls8J+VVVCqZSAqhAlYsMNPLqqelqtSbgFRVVSCVs0dOSK3j1zQaBPFX9V4trW1+UIudUpp6o3BWdnoGjrc4SiMZUPaHL9zwn/yCJY9tp/iVxC4e2TEdAq39l7qDdRVq6+RdW5rm+YajLOTQL6XZI0O6Avmspry1Ymtm0f86/dKh0GnVOnU9Vuv/ui+JaG1/jZ6IWflsujRyJBgrE88Y/vk1XbN5z+VR35UPYCFZ4jg9k2LTEwmqOHRVaVBCb7XtJT8k2xP+IUWTcAVTKLnmO6w2bpXEaoV6kLCeJuxROGP8ei4XgqdR2ymYmKLizAXS5uJ3TsnOTrz7JhDS5zaUXlOTFC8qoLphaVWBuije/yqFW6qpyG7wuIocUqjpXEqLe6ih2q7JvHOHREev8q4nBfuD7qPEn2CrJKo6E57XYjF8jQ39r4ujqLuESqtu6Ko9Cbq6KOm+dx+yLmmCtZ7od1h6Xu/UPMBmg3KLnVJu96Kuul8tMHsmttAKfN1RI1XbJA0yQdEDrOiPDiVbP8AtHA3C45fpN8cuoDhsUYAaO2WhTXF1E8PrCDHVsh02XwseFfNiHVAvo4jouCgyB21Dz5KpTlgdrsOLXdBuGXNXlhA2hIPZDBaQe6HX2VXtb7leI3jEdFVpQAElY7SjrwG6rwWDy+Y97gV4jR3uI6RdqsXXa8kXQc1dQhhRPU3OvPssDqAqsGVOED2Qa3gduvPiULh/wBoNKfQAoCkqmpVV39AKmCtb4WsJptPiArE1Qqi7DNVGh9f5jl1WqnEB2XbdQV2zV1VUAvD9Rhf5c8LSVwhDFDIrJva3deDPDZ0vEIv6E5o6qqwtFV4YqepzN5MO0Udb49A0F1E4RMlTcMR+IRQKXGTcDe5o6ic/e+ZurRUGI84db2OmZWNsCdkMLS72XE0tUNe4exVTKhjuH6Si23svDdFHLxWQ+eq4jChpBHYrHa2zQB8vVfBscb/AKnL/qAIbaV+9+D5VTQqN6Lw21Mqrpdspvje+DplqYAXa917jaUY1pKJ0Ukqilqk9O6wU90yMKMwSaKplylV1R5vfJZtzU6IfKFM4gugKkmqGAiix9Vty91T1RD9FSo3VaqW6ZKV913VRwoQ/wDKbi84oV5gtJ9vTkE+2Wq4DKLi0oBayBe/9Q75NBuUXHU5OyLpjtllQ5oKcbEROq75iTyjjo4aL3XCWn7qHFrR3KD8QdO3MbO6I2uY8mGlWtm2r/MFQLjbxdAUXPMlQVqqkKlwKlumWmX29A09r3004l5oUMtYC4y20ncJtvZt4SOKBpkpxWZ1arI2Gjtey8Kyh9sdTe/9NaU+ZiLVJTWN6o2fmO93iDzm5zummedrp+VV/wDVRvkdcGjUq1svoFe5U6qbJpwLRUXHax2WJpkH04MQORQwg20p/IKWOpuolaSjPCVPMkZo5eou0/Od24ui+oleWAsRou12sjugLSzbh3CxWDvFZ2XG2q68vW+mvIw6hUGSiYCFwkMfsiWuxrCRCbThcmWIPTEcxzNumzr2zRtyi46NRN0KtWdWrE3ynl0Ukrh/tEQHxpKa+Gta3VxR/wCmGBp+aKqTXLB0WHdQU5orSb+I12VNPR73nteWDqFBCGGgQkoMc6ie7w2hza4hk2lVu91IoUCeC0A0HzKNF9SFqw0molOm6d14ceavIARGKBmdcLQ6MqnWgOHFOJHA2f8AJdPwviWNd2qbOSe6tXnzEQFBVDefZHkRydkP75XbZYxoUQ5SFhUjlwfU6KOiocQyAASSviHi2zUK+IwOXBTtmDjVE3RmrrzLOU67heUxtpZNrHF1XhMYSBurXxPNOVxu975dkBWMa9RkPYTyw1v375SLuoVLRpWE2gBR8O0D4vpfpjd/SOKyY5QH+G7ZyJecQGygNFmxujByBXiVaFAj7wqabqByJNAFQquec/ujcx46FNe2hPyhBCUx7tNwnMsILdC7J2FL63UWP5hQ3CVRVoN1V9PZQKgdeQDcTtlfdCd7ZTZgaVyu9DTS73PJka3RdVTzY+YZJ5nmWi0z4W9VifXsv2gv2w0IMFoQiLNku/8A2FVz1IVVwfhacj+XJgcizOtU6+wn5qIMibQ0Jlf9Swe6i4k+UKjVDhRB2rDoUxw+UVvByyFJ4T2Rwuk3Wlr9fDyQeucZKKQao46HcLzp5PmGsqLOya0bogUnrkFm84mOpVeI0Uujrmop6rWkqzs2j78jFMBQNLotBiauGrOmYciHdFqIXE6R2QI4ghiahioELKxloHzb5HPHy53sJib4uAR5PdAKUL3qdrne2WQi5lQtr3nty+/I4pxHlC0b11uBOie/q1/O7qRR3JjRS2ouJRv1UFSChIBVCtQVAC4zJUWbPuuJAdFhap6osK15QmvIKqPQD+NcjLRuraprj81UXbtTS0adVVv4WEDC3a/CatT+KWKlwbybOw6ip9AORG+YLwi7E9oqFPEQ7oOl3fNXQoNborOdrvMqOWoN0ASptDJ2VKDJHRCWx7Lh4gq8yhuGEweqbO2bCOuuWL4dUKnO0QCBwwDe5R1Nzva8NaJJRsuvW6l0FUTm7j0QKadXEfjlOaoQGoKfZEwx6POkKiE3gDK6qxT1RPdDvyJKouOZUWaqg0Kt1FMUXf0OEeX0OG00cITx3vIT+r7F/wDStf05BxRwoscI90RspmvZUvwWh4d9kSx2JU5EqoHYqprnnfkt9s4HzZzadZgIWjDBVdSPwvLxN/0icJgLWfdfEbHdq+FaB39L/wClMXAKvRUybrXj7Ikv/OXS4xRcYk7rDzaVQnbnhwAjkRlCIxIWh4wPsmgskKWTHsqK0IGkddEBWgud7XutbQdKLEMslE9vREdDzMSClNd1PLkCVWioJWy4UMd2J7sDP9r4VFLwcXZEQ68qLmAbZ5ugdboVFuVoCv2wuIR7LC7js1w+U6XaqM+LULhdXY5QET19DZnWCnO3N8J/6jFhY4VCb/0wwYTMprLezE/UF49kaFFp1UKQ2ik8VpsFLjy2+6OTW8cIJ358lTnwjQLTGf6QYxoBUCr1at8r3CIRcQGgblcDmv8AZVs3fhbKKObsVBHhH+kIqNwp0G60vxGjVhY37lV5NUa8U84YlRUaT7Lyn8JznCMPLw/L1RcfwqU5sdMlpD9VQfe53tdpxKJpmha0KI9bDtEFCdXib0XflFrjHupIH2Wi2UtXFVeWqryO3IHIw2gkKbI4hdQBoySDObwzSeqnFS6lwc5vCjCwgyvEOg9BbWg+VuR1paHCzdYQfhtukao2VraNDuklRY2zHO2BT7W24WCvuvpZ0aOmaDnCMVyaql1dEMDfuV5WlDhI3qjGIDohFpJ9lS85u2d1q7gsW/MnBlG9LrW22EBAptq3hxicKhxDlNGHsoLnIYh49kevUKdWHR101C7ZA3bmUUO82/NC7qjiFV7vysH1AojkbKV29BF7lDXEDZTp7J3su95yTfPqpyyncOKRCJ5JN2t0cnsoZ+bjF0hhI9vQcPUZts0dMkLiC2Kbyun5VV5VWzDvdVBs/aq8RhFozcK3wefDBCINDcLW3eG9cO6ho8OyGjRkpRAgwQmvnE6zryKZ9lBj3Q4pUnNtkw9elwPRduYLT9ScDOg6lOawYbPQC9v6fSBJWN2nREuvw2hLHfUoNqxzTpKwW1nLDssVk3GdnFOaWAbKEOoUvEqlOfi6j++YPZT1RjS5hOgaSne/J3RcSqj0NU698Hoq3D/goOmZpw0Tx35LsgJ05MCgugLzIGC53dUbhGw58qvoy3kSbhNTsuGB9kA6zY+Nwq/prIhcVi6y/wADK+FbWg/8UHBxaestovFsoba7t0KPiQbfo1S4yc/hOqx9E8bHkQdd1otFicjAQoqyEA1V5Un/AGqXQdF9TdisbPL/AKugLiEZ+3UrVWzTupLwFIOIiqc6Jnp0yeZNgLEdCofUI4DS7yrxLOh6rvyIzyNN1gc6O6c+ycI5YxFNLTIKwEhrd0TaWuD2NUcBlvlxHl/f0UJ17r5Cn5v+Bl/lCAdwrEw4hdopRaXcKa7qKHmgaIdeTRd1Poact3KpmaFDRRS94xbKrzPsv3D+F5Sfcqtl95Wjlo77rq0LDYFzGHWqNoeNrqypbUZ/FcOEaIk6nkey8yrVB1o4N7lUtQ47ZNOJcX450tqDqECzQqlXBRhUYSVUQoAlUAP3VcDP8nKga7/FwXhj7m79QO03BsR1JQw5KqlV4bqHoUQ4I9kCfMVRHZa0UuHDuqKD1UG7RcIlcbmt+6w4xaey0hTULi4iv2hCltkPyi0UG12qh6lhxDkNApCmpVaAVMpzLOmyxHgjSV4rRM6hqrymgVHo3X/bLHpZukBOpdHXMHtNOougrE3S6FCwnQqDm+1xurqoGnKgqGqvoIGqw/NzMGKO61ryaKD+b5uE6GiPy8iXUVBiQs7VtOhVNDdsi4nIGiYHQ8mui8/2vDhVDxLMFvZcIcxSbZuHZQCAVvz+GiIc3iVG0VPtCDP1DGAfUaFGz0Z0i9ru6Ft8tpW5rejhBXE2m4X25No46Cq1XmWoWE6LssOEBQThKjEHLyBrehCq5Ripkoq5y3dVzNsx1WE6rw/DxScVU9ts0scfpCizspG7tVFmPDao8RwHuq8rsiW1HonXu9sod9l3Q9Ke611WE3Q785Y6G/F8y4uErGx8qYDe9zJ+nkbLWTzKcwx0y4lDT780cxzHfa6Olw21KJ1CltRk8pjdah5Uyqm6U4fOyv2yw0SVitDgaN04jT0IzzyABqm2bDMVJ7rCcPF1HRTi9limO6xN1VmXa5A20IjunM1HQoNbSdXItBLidTyT2VoPq63a3METVFmgHRNITmvPh2goH9Cq02IQsf1InujbWRxWfNkIeMIP1hbjfJAElOd/3NQUB+ossTh84TSyzIEdVpz6GFhIa73CmOdFzr3yOi0yFvqWncX7qW3glE3Fu9zk5FrwK0qmkaHLRSeXC09BXRdriJpusDW1nzX+euy0nlTdUfbP3yS3zDotbsLdTqbqKHCCpFRug5jcTtyuJxPbNIQtbLy9RsoiVxvDTsqyVFk0AriNNvReyjMByDaRUKpLUCKqrDKhtDsVDhdRshVuLIE9Cm2n5QHRPP0tWOyqW8htn1dU3aKkqoKYe6e8brF9NU47rC7jZ9JU2J/8SvCt2nD2Trb9HaeI36OvOwvMdQpFW9liw0UK1fGK28vsqOd2Qx2mH3Kh7g4rBbtB7rEHWgafpbMoPsLQl+z1FqwsPf1zr3e2YHr6hzYmLqhcMlbIvH3Fw73VQIUzhT8Jk3YtA6qMajLVcPqqprsIIRAaMOy7qmEO0gpzTv6Aj7+gqp1WioeHZYrN8H6HKh8N/wBJVRmDYxB1IRA4fa6no5TXuPhM79VaC1Zgd8sIO+U9VooiqrrstFsqWg+61zYd7tlVcQxNPVQH4x/peZYjK8sFcElYnu/8U7EMQKEhx+6JwQD3Xne4fTCLhaOYCaCER41fZcMPHZVIb7qtqP8Axqv3j/6onGHEVDd1MQnGJfK4HFrvpUQoqu6AeMQWJv7VoI9lUU3v3LVLThK8RsNtPmapp+eXPW7hMKMdNoUFoxHQgQnDAHtOrSmv/SOFlaD/ALRGv3TbQ0J6JoDgKdStZ9kGvGJqixOEKLQ+K36XImzOH+B9a693t67i0KloWihYlop0O10DVbqXUWHRFqh1FZAjouyp5Tpdog83QKrjOFcLA7uV0/CkmfTkaQiSsDPuRd/IKtxqqcxpOmhRpHoCOmSDVuyw/L36LfKHHoDCPo6u/F3jWhr8rN1xFQ+C4aSsLhA2UyVxWIcd0TdTLLVMXM0a2EcTsUXf/S0KLjP2VJRWiw/MdTkHFVTCifyhUcQVCqkm8PbqFjHkdVFj/KUWjUFSKFQXG4A1BTGjSVGKmy4rMe4RgkHZYrK2wO7rC9rZ+oXhvVbcjE/8Zg7r1uDbQY46pr/LDYTrVrsT7MwW9lGQjU63Sq6Lh09Q5CeqNROxKd7evwvq1cJuqVCxJtONQKE6ql1B90156dE3E0FCNRosLhBVmweXdcMI8NFWgCMyVwzPpNM/EFQ0vojiXbnmf3R6aDoiLyegRwuJ6wjeeWB06oGa7SqgsduuEYx2WJzIG66LFa+Tt1XbpfhPnbooIjKcpxLgGFUdJVZlE7LzBSLSuygUXT8Kga32Cic2E1CnopyDh4loI2hdGgioTmh+Mg9FBPh2vRyguxBB3ld1XVUC2czpf4jzE9FhapciW+bZVQOyDhRzkWGubxH69AsRzgjQ1uCw2T8Jd03QtGwMfQZAG6pvF8X5rNV9U5N7IM/UMa8dwi+yEOPT/gGoTULVS0StheDXF1UNvw9UJQhrXEDqpuiUUDHN6LojpzdFRcRKoZXdQ4SU5u3N2uG6OSTTn9k19m+D1BVW/wBqS03BjBUrBSysx1PVB3jsjrPVFp5kgU3K82L+gomBs1eUfdUooxleYq2kYqKt5xCVwCkKLYYvdE2L5Gy0ycMkrZUKjot72k09lUk83CTVS3iGYV0UlS1YbZtfqClnxW9lVpWhuxN0KxHRYrT8LhEd1qgVLYDlxNhCDCi1GIHrssQ4mbjJicJPQKXHkOZHEKg3BNeNQZX6W1HztvA1KGHj/UEdfkRc4ySt1w67epch7XO9ufXRdvQR1voabIN8r+6rpmJKwtJwp+LRSFpdXXZUcsNpprRQ10Huq5KKojKMWsXADmnJOKo/KbOgTbXDLT0WJtFPMl7cQlSJCpr3uoquxO2Ck+hkmqmSuMB/uFLWta7oqmIUSmi0rHVA6sOh5Mkw0LE4H23UDgYOgz2tk4AF7aIi957gJto0TiH4Rk8SkGCqw73VOF210ur2Ww2zlvXpzZ0Ol1CpgLiMLhdiGSDwndVuo4qLSza/ui6wtDZuHQojFZuKPQwsTzi7LY5JCbBMkdVB1uiMTDqEJcGglOxto1H/AKfhhHHryQVRC5okkAUv8Uji+VFzjJOSvqHJta3O9rv/ALWilpBUERkm8LW6CnhpECtV39IwWvE2U4/p28cItcC097wXfhGKKVXzOVOl0DVVMLzqlzmPBxYdVLm4+y8jmexlauKGFjQEMI1Vb8RoFqVqibhzpKxNopJWF5VHY2rEcnbPijhUDQXyaBQJHsuEnHsedibxt7XtHS6M3g2miIIMdDdhuholdJ+mdUSbGijwymMd8okhTCqcVp/rOHNoQqjDaf8A+S7Kp/CIAVnicAekqlVixNHabgi48kFExhnmDvyZf+FhewFq8WwJc36dr31hP97q/i6DkFTCrrdLvKNUS3REbqVgeJP1LEx2Nv8AfJh1UCzS5ntdxUaKlbAUA29a6F0pc72ywa5C3e6endHsVOWTz8Kg32bu6bBqFhtWi0b3U2J8M7FTajhF/FoKoIwtjdLWFyqzCO6x23lNN1Bsye4VBA5Wi0ujqq3bnn0Qx07LBv1UCt3FQIxRQcs7LANL8WyqtjdMc3Ex2B2y4hVCzwtsv1DBQjqqioU58R0Qk8A+VYvDFegUOso7ypNs0D3QtGnxHnQXYWWjgPdOtrQksshiRtJ4iZVTymAeZza3Bu7lG2Uhx1VOTGSHachiGfE7Xa6i1VeB68sjcJ6ffuLqiQpa4exVRARa1Q5srUtOxQHzO1GWhU9eSIKihHcINtLIe7KFfDHi93riNNuc7FM9I9A6Kv2vd7ZziMLhOK8N1pcMOYToqc7iVHj7qrgF4bXhz2mdk4Xw6sr6UGis9VgbU9SqiUSXQuJxK+GMTvqd0Xnd+VV5P35cc4RdXS45cZqegWJxrdIuEm4KgyCNcgJYQ3e+oDlxNwqWOa725uF1WoEL+Rqc+K0+wVBGSqDw3TZTcR/+x/8ArlgKzaOiKBTs1dFHIHMbGoTfbJovKV0LlJyiq4+FeKwYmna/C7Qrt0N0rsi5tpT3Ws91iosLuikVzVVDN9MgyHFyp6Z6LUKv25bqXu9uTVtVSiqVSvvnhYXflV58YjC1TjpK1Kl5c5Utf/ZRLT907uq+gxdPRUywu18XV0XZAgypCwmjt1hcIN0Xz8rKlGxr4aJHEMsGvJ7LqvMW/Zfu/wBKhlCddVxNGWv4zkLEYwr9ufcoNcMIGkKvKCe/a4vOgROUey/moNQqZoAqofxWn0rTw1I4m730XfOcuucNjEg3QgLC4cOykj8L4bg5Q4QsDqtu0vkoMZ0U8meu+Yc3i8oqVwswbC+NVRVUC6Rd35Tr3e2fWFrKooiuaL9cJ7qHVHRwWF3TlUzUzQhuPQNF/myU9Bh6nXLjbobx1QgXcVT3WikXBoWGadVDKzuiCVw8BWk+y0WiryMejV2ywdFGT+Wfi/C4eEdlW/C406Z6BS4YRuV52/lHA5rrQ9JUOEdru85muyB3QqhXEfwhA/Khwj2RZZCD9V42WJp16LRQKLdaKoVK37BQ3TmCsIGcV2q2WG0GNqxWRxNVcnhirlXJTM7pmHN/yux+Vw17qGquanLde725NXfZcTl5lqFQ5O4v4XEBB2vLrUqrfwuvICPoZ6z6DvkF3iH7ZgHn7rhLh3UyHDtngLuVrRbppNlMd0Syzid1qpBXT8KrADuM4HlndNa01b/ajMEOIYj0WHGJW8I83C8SN0NjobsVGt3cqPZ+VU+M7+OiizizH8QsD7Quael0ihWKPit1RJFFpGaB9S4n12XCKrE/hYsEoyOl4R5cHzbqo059Cq5OFcQ4k3+WihFx1RObRbX6TnHMYzcp+DyAw32WK0dhb2qVhsrOBu7VaoWk9lO3IpyHXu9uVUwvMhxKjsnvRTfIRIEH0dEXOr7c2uXtOY85wua0UgZQXDE7OSW915JXA3AsWKVqoaDKIOueM1YxFFR1VcpgVB5WHkYvM8FeUn3QqoGmXiGLssNmQxvZfutZ2K4nAsOplOLBLVW+IxFRKwuaCF4sYh0CqaXTkPe+PXwsL9ehXDotRydYU4qqhC6XeWLxzA/ZGVE02vPZaTdWgUNEZpySqiDuLnXu9uXULyqgrkb7p7dZyAihRcKjtnryPKVWAvNK2RG6jmYYrvyohVovMtRG61m6kEZhdWq8lCvKvEspO4yeI4wBcFRTkk/NezdyPZSuJpndaOVNOXPUXw7XoVJ0yNHQ0Tht6G1ZPsERtm3yUKa1u6GLid1gqbMS1eG2qwbXYrUcI/Klo+H9KpPtkkVFw3Fx9uXC0WovqVTlVzSOim+oxLywtCuHXK45KKCINw5s5cK7LRRGYqbpyOvd7c6lD2XEA8KIDT3WLC0jsVj8xWB1lLjoQoa9vtKq2m4VSqLE0QOacI4t1UrW/uhHI2XmHo6LVVAKxAV2VBAGYJrB1RabPiHzBRaNc0+6j9PbV2cE2yGGRrxKcdn/AO6xNLD/AOSIdZuEdlpS7RMZui3oKXMsx1KwjRtE+dudT8IqFrc3IET6EuU5KqgulbX4X/tHVaFn+JlUdKNoBiefL2Uvc1vuVxWuM7NCmz/b+kX7+6kUcNRfIFdgoAXE0hF3MB5GHDRcJKo4XwWx7KhW+aI5FarhP5VRdhGpyUVTW4ehqt4UAUWvIi6Mjr3e2WgvoZVczmub0VGrspBhec3a0RIqBdB0yQBKl34C8sZdBnkJhjiGqNFp6oZABmCA3Q6kBYXftM8yNn+na2dwibqFVOKTo5H4DcRRwWdmP/FYbZjXt9ljaXMdEVRdYWrbWenVR4Dz7J/6i3bgDWmE490XbmOVWl8+Y7Keqs3D5xOSemQToiRR22Q3d+UOig6jpyKZGtGpXgggkDWFrVGt+qcRk4+MKnlOixNpCJAwPbr3Wsjug5gDXdQFULT01KrTk15VBhKghfTfpeOcDdKaR1RBVLpNEcOipki475XXu9r9c1TmkKWNwqMppMrhNdipUPF5PPx4QXPoJXlZ/wCq47Fv2QIsGzC8kexXC/w7TZyIdOLv6ammTEBGYFCFh/tO/TWBAnzuHVaj8rzfhdSqNCqqZOElNYDp8268MulrzBT2bGE8DzNqOTxarcKml1LvDtPMNCoN8dMkIFU0521wZaGD0eiDqOX4kfFf5SegVc1k4adVI0OSimVibr1Clgod0HNIdGuE5JFR6XVV9ETlrc2EJ9BD6d0JqEb61C0idLpvBKiLtQqi917vbJUKeWMvCJXlK8puBxYfdYTi91Q05/iWtLMb9VQQ0aDNFszH/LqsVmZ7Koj00dbozELFgxPcjaObhJ8oRJqTyC+04GDdUBWEUCGIwELSxtGvisBY4htpxBUThmoq68hrD8vVUqFUQFgtBwotLTHS7vzy6OEalSckWnC76kc86BOtJJtAn2tt+0z+ythdUo5IPE3ZHCZYem2SIgdFRAu8x6LVYmOgqoDLTcKDdT/gIOvoAtPQV0ywfsUMQlcLcoug6KW6XOvd7X+3NDeguN1Aq0XEcXZU4B2yN9r68tjmBod7Jz3GeRKwj3UxTL3zjJCw9cuyOYNFVxeVqHRo0z1cg1n5Q8R5dG+SQYK42i0LFwtIPuiZrl4q9lwiOSMXl6oNmiDW6BBNmrYT+gmnoMM8O2UIt0imbc3MYPM4yhZWR4R/ZUm45nU8R2yJw/hYHAscdHQjjHtHVTgwt3KnF4toPwpOTC8YwqPw9nLUe4uprmpqtV5h6eDzxzY65Rq1+6rk7Kgoel1GlbBTkoqgFOvd7Xzza5KUVaqMtFXgd/tSK+yBFHBYrShz1/F3EtIUb8iVSi1UuAJXvyo7ZC86qczT0TrRlchKbWE67zhUkuXk/tUb+V5WHtC/+uQOvZOGlcpPMtGnWKXQ0SV5eFT163x6JqFqzrq27ZcIlYsBouIEXcQLZ0CjqBFFvljJLqI6qjAFEcQRrTkcTcTdl8F//i5YXCI5XEId2XnH3W/pJ5wz082Uu2RzQVikEKl/CG/cI8S15Dr3e2SeWHOowKhkZeFVyC6Ypdjjqog/e4kNkBTQD3VMRR4sJ6SsVoR2G6k1XCKjoj0QB9+bELD0u0u6BeYKmfD00UkUzYUGWlLN1KpzYgja+ToqU9ADsmW9jWRDh3UOEG+iA5lF+zZqgDf8VJMo47Ou4VKjm1/CqI9lSuUMtqfyT3Mi0pFChidxfS1Q6yJ7oeFZ4T3WgXxLPEF4nhYbX5RCxuZ11KdwjPxT7qJdK4Wqnuq1X0FAOPVYuVx17rxAMTNxdHIhcD5XEAVSh2KJFV39cM8qRwnbJPIg6FUVDHbmOvd7eqxfi6hQAAlakQgx+G0b/IKDYsI3AhNwVadIK4nYVV7p2ATSGT/kvHstB5hdITbUVa7mwsLQpe7DCw2bAO64jOWtV5QtVFL5VCqsj/Fa5YcSmiQ60FMSi6PRNDDDtUBbAOHdF1nLOyxAyF0WPVqpy2+6ObXlEX0KwWvQahOPyaZHsb5n/wBZ/Mgd89NUH0B7riao6bIGzYTOql3m2Qd1UDRaDEEeg5NDwzUKvBKBeCR0LUY0zk9VKlt1DCIfV26kVCr6OF1B5A5M3NaoGnpnXu9ro5oGaboQabT8BdVW8OyQ/wAh1WNpx2R0de5pq1wghcPlOlzmHQ8qtXbLQC9ry4NjfqnOZ5TzY5Mj0jR3RuoVGKiqFh0RHLbO+ab5gwqSgTrynOyR1zVRuGaFjNB0G6klaoOESv3EA+Cd0MD5AuGHVBsd+Wex5EXdjcKKWqrtVuN/T7BYmuxRkGRuamqc52vRROLuEQfSuvd7elhVEqPKO1zXZcI84/1kNnaVs3brEzjszoQqWbvwqWTvugLSz4HdRWEGYSZ07qHgi0KnJoqiF7oPLCAeyZQzGqM1vGLhCO3p6tlDCz8qHiD0Kg86Lx2rkd7XiDFo3db+3O0lUEIyvLJQhgROEey1hcVclM/HojgENRe7RqJOpz4gKjXkY7TXo1STdqiF5jfjW6LTaNDkQjI5JBbixCOWQb2kco0Uwc0LqFQozfPW73OQZK5pF+/pXXu9udry46KMgcOi4fK4Bw++SWPLUXOtcA3JUG0LbMdUA01anNf5X9dlYVxPLdbpApfqqmTcB4hIHQrC5jY7Lhp7rE5oI0RbZsEnZq+IdOiItLOm4KJsjjA9PBbPdT0KwO6aFV503OP2yGsLhMi/GE22bodfflAa05U5ey7X0WKLwN68gRQrp+FijrlNradOiLjqch3u0U2n/quLyfSjaWLpEfcKTquG0Md0PGaHhYrIyD02UZxGqFZ9s05ZGmSvI1Vaqgwrhqtjkr/SojOt1VTQXFu1cguqhLdNkYzzyQOprznXu9ufTz7crCgdSgSIByWR7RkxE0UnToFsNgqBTgKs8erKA30WiDiKHLJ8/RVMo4aShNUfqlUMLC7hd9Sg+mwu4mqi/l6jssM8CxN42bjkYtlX0OJtRdhCxDUIWoAa8+ZqBdxPdWNuXaN++TugweVuWipxP/oLzXus30NrQIg30ooeK7ofSdDmkLVDhwqQZ5OGK7qDLFI4m7hQ0ElHEeLblggwVhtfyEIGJftqW2cfddIQ4GzuiRocrnfbIMtczn/KKFFUWlxc4hoG688/ZDDa07qgLyp+bbnOvd7c+Sa7INdroFBHI7rdeIwzh1bkcIxEGVoFsuFsoNiuyDIqsVr8Nv8AJNNnruVGKAnkiqIBTnWzBgaJJCixYLMfkqPEdHuiHcTT0XA4Hsoc03eK+n0rve3uix3QxeGgS9n+sptG2ZI54C2Wt4cThJWs5/MFSuZtMpcOmQLCV4lhxUq3O1o+99KciOufE0wvFEaxS4PcOE6J5OqMUGnIJvtTFIv8R1GjdYbH/wBswKfeAvZNfIL3CaKMmB9WLhMe/JgjCd1iaZVcgCi+NW7KG0cq+igqZvlBse6pW8cvCNFM4Xd1riPZcNmPuiBAQxuJjK1+/Nde729BKm04lPTLUwtZXDdLXQnk2Yp815xVDhClgxg9Wqbd2EfSNSsHhhlm6lEfD0HVy1/AhVM3+HZ+XfdYrMQeoTrMed2uWcX2KFt5R1HdFjeireKJpbwvPUoNfUkdLuE1UWowncI4v1DrOOyq536g/hfDYLJnQBYg4grF+osQ+03FE/CIbNBzQtZ7XaiVxVCAaYUxIzwMzpHCVhUKlb66ZhBTP1DBGLXNPbLOUv25P/5EkmuBWVp+np0LUxgaeBPJHTk630Op0uDVrwjJ2VK3WbGmE8zNb3O2F2sOAjPVHAMYGyLjZODR1i6cusjYrE2hyEjplkqDyxy2PeNdBuiTkHJrzMJU9OY693tyjh15FdF2vl2mbCNXGt8Jlg13vdOSTQLhEC7Gi0gMev3Gj3VbXH/gq2To/wAkHWTpB6dUMVo1v3QsrImAakdVQ07rja0/0od8LvqqfGP4QPhta1Egl3dxWFw426G/j0TMDgZ75WB9k7FFTiQex3iWTtHcyi1y0KqK9lOo5Zb0uLuoukaHODcxvQFS3Q8uPmyR35AJ16I1lAscWnssLodafVssNraOcx26LduXaMPuoFUR85zU0VCgXjFhyYetw2PIBC8O0riEFOGHEAdQi6Ko5ZVeBS3jbuFCia5568pvJkdF/aLjkCGXD8wvlwxdlOQcnVE9eW693tlpU5ZFCuICd0Qdc9Cu6BiSq5ZK2TW23B/ILh/UNM6SjaQ10CkVULiMuySaDIAjaTBCxPcXHvlPa/jmOy4SZ2chhEmUeAwu+yIXGKIMsxhk1vqFXEqWn5udY237bgi+xPis1ukWZ9DuNisQaIK05Lskj5b3e2SLj73Yh5TeTy3ZSpccIVBLt1OtwLfP/pHvcx7fK9s8qrh7ItmrqJ7gJeFitaBGNOmeHaFEDS7GTG2SDWM2wW5Re0YQ3VYXwWqWAEPGiIz0KxYa8nENevJhtQMtaLe8uMxops3zOozDMHThXw/z6Dsu3Kde72yYjyBA+INeQ1feM3bIAHFrnrBDcJkAwjN5pkL3ujZYY1WDo2mZ7fvl4TB+rqpk3eIPO3zXMe3zB0HM0GyaaKWcB2Qwo+G3A4+b3Vm+dCjaT4dodtFgff05uErtyQPmNwUJwd+L/dHKWzBRONn5WB7pnZeYFvQ3AZZmM0BQFAu2QpK9rnFBE3vEcVmcU8nEa9lJQVAJ3RD6uPXkgi4czC6rSgCYHyOXguOuidTryYIwu5NOfxflQmMH3zBD2zRnjlwdFwgu9lDbMog2ZoqtK0yuvd7X7BcPlGnIxLZ2eTr0UQK9lAwj7LVpd/pCQw+xXX/E3RMHujicIRg0QCdWcDbgQAHDqocIWFuYv+kZ5u2Co4FEdUVL6AmECizdqITrN8BrupTPDcHe2fF0CJUYsPdO+KCzDMqLYY2d1Lbdgb3yaw7vzINQsTa9uqg5IP5Wn4QCb7XE9LsVMjHj2PIn5g5eLbcLOg3TX2dOx5kC7vebo3KnJ+qjsOW2RI2RTZ5MdFI0OVq0jkODq7IVXjNZTQxvyodUKnp5+ZvIHqQBLT1XnP5UteZ90SLTiHRcWSGn4nfqnte0tPe93tfDT75OEKCMsN1WF2u+U2pMQpKaNhJvrVyk5nW2pjCQqCYQIBaF4uPxR1jpngtdJ7cswgFYd3SrN/zHogWcPssY0dXks97j0nqnN0xUCErzZXWrK2jfl5cmp2UyuMYlwOA91Jc37G6jHfhQWkFNDt15xiFKqIUXGsQPyvE6G9zdq5oY2UA6G/dPYyHnum+JaTGqaGmAFQYx2VRGSpgo9b4Cwt+/IbZ9OqOEQ0aZLaxfo4ItPTk0EFMci80Yp0HS6gUERnjKydJRAMhFrtFE5pFzrIicYRBEcvqPTAbojOMoA9IMVb8SJBj3WxvkJ1n+qbjZSvULxLL4n6d2jrne1wPU8mOvW4WbY7uHW+RcBin2WA6BV0To8xuk0Kk53t1krg4fZarEPuN14v6f7s2yxAdbnUnoqmfdYbVgcFUEKRahef8ApbjcXzfF1nZ9GhM9rnWXXVtxpK0jNZe5uDXCQASsPQJg7p2GAMocx0FYh16c/VeYrXEO6biswTunHGWuTmufibFFwqrCjAqnTqOK9wipEZeKXv26Lh4BsFqsJdhUA8KfWoCdBUP4h3Q+Xv0VHgqSKb5eGA9GeQcLePq/LIoV4rLJ2FwBkBeU5GgjVaLRGbpiihRtfGHkDI2d1stYKwz91riUOoqLe6inqhXDsV4mKT15kcsoRryQjGmWLh6gBBszl3yORbHiWR1YViYzAfpCdhE0QkKvId4kU6lOcak5aFQXEi4z52fMolYZqqGTuqrTNLdZVfvkb9KFo2rX7X+K+jG7p79zmgjE3ZeQ/leT+03C3RQiDsu6Y0CKq2s9Xg8JQua4ahYhRrqhOkTKbat3g5BShXG4p2AOY+z02K+K0sVr+qeIBEAIujXojbubha3QndCo/PN3PLaL4LtKwnPbZzuvLCcHl0Huosn/AGNwPiskdJWkt3WiwtbKwnXrfJ8gqUYEN6C6tQaIOilzjsbv/hSP/wDl1Qp3VFXXNiUNUZcIQsnHQLw3AELFhH2KmzdgU4sSkouCJwoRC6QuG6noIJKpfUrzQnMe3Ed1iaqIghArdGPTe/PBPE89F4hGFw/u4c50ieUxvdOrN0Ixmde4tOEx0Ukk+6nCLP2Ugg5g7oFj0nklu6ELiFemWclFuo8p3XlJ9lXh91LBT6ymsHFHUpuKzZ/6r9oB/usNpSPlGnKL9uiqpTawnvxBzg2FJkygGtgytQp87lDm4RuOioXFOsRQmrZRDhBu0TI0IovF/Vvhg36rwv048OybQQmj9UGvsd7TohZObjxdJTcDBZWWDxMfVVcS0aZqXyDN0krhH3K15gvmYT2GoO6lmhU4JHZQQWlRjdHvcGu+LZj5SgHN8C0n7IYAPdGXAO7ouJGAdVNpai0d9LV4VnYBrHcLiUWm/C6qIRZ906KBupXCZO6Obvlc4/YKc1pan9zRgUhaqAgR/tYioOqjouwVFrz5vCOYHoquhDFxBcJCoVTy9lSvMwlSK8k8qidBq28OtT/4rHOI908nygXC6pjJPJPJcRMhvS4BrSSnFzYcc9DC8x/K1P5VXHLxWc/deQ/laOCoHFCKR0QbtypGTv2Wn5VHfbPQp1raz4I/tYRRg0CwjW9r/wA3VVM5a4TiWMtohgbBxLop+p3Iw/qK/wA1M/D1lR4ZdHVYGhgDaCUfH/VT/FoWGzZxTJeVVxKszqWiFZWPzkQfa7S+uYHnhHrex+nRfuLhtSELO0wv7wncJ8P5TkFjbDHZdD1CJxRYD5l/09hHh7i4oOn41nQqFVEk4WNFSjhFR1UrAyk6olN71vjJPS6o10UCCVHQZiOgElDp0HsuMSFiwmLtV/sbrxLPy9Rsnbj0opKM8gEHRcfA5a0U9FMKh4uZCjkHlWTvnNSnTo4QUVjibV+k9AnOKh1pHsntb9lohIzEckHfk2ge0GRqibNwnsgQ+gQD4RMU5Bn1PdcdVwuWmYF3DZ9XLw2v+GBwhHA0nusP/wDpvwP4mI4fL0u1XEViHEzL4rvJZ1RY7hKDbNwJxTS6zY/pUZ+EE+yb4gwtlSYwBqcbM4WdEXHU1ySNVjmb9Fvnjm6Xh17j9BUFkowcJC1qjJl3dNtgwMrBjJhnS8DZB7fxuja2ev0bKXUWEjhPdGCHNIpe1qYyPIIu3zE7LzEpxzvc8SH8KdUxFAFwM+7qrihw2Kg2fhu3CLSsTVibp1Cx2fl22u7+jNVTTlYXVabq63V5kaHPMqvJl5ptusP3Q3RH7h2WIiBoAoFBdDIn6kHaHrCE5wRn2CABB3ULiVDk0Wi4TBhBwNVFpZA/4mED+mfD+tm81UPjB7qHDOxv3Pq5BQMSFTJjtNNlhD4sx/Sizr/IqWOiVJrk7jJHRSw/ZVu7lCybSNe6kFOxaYP/AKT/AGTSa5neNZ+JtVeH+mshZA6nqjDzVeE604NhyMTdLteQfQG97dQRUK0ApcJRgINmk3t90fe4XtgwjcUbgjyH3O5gB8wu/j1VDQ3wNPQG9vtywhePRjkNB6lNbHDj0TvdN7SUZvbFJFxQ9rhcL7Pkj2vrfW8e1/7jvyvCtXeIzZwX7QRhsZAvsMhvm406XD0IHTZUF4RVPmNc89c09brZ0cQ63u/xRRvqJQgc/wD/xAApEAEAAgICAgICAgIDAQEAAAABABEhMRBBUWEgcYGRobHB0TDh8PFA/9oACAEBAAE/IZo+cDdw+GUTqHAfyuOp3wbOSPJzowjbh4bcbTdGHC/h4b/fxeO3xtGb+P6ON38D/wDAw4d8nHcPgwjribzuaQfMF0TR8IrVN34nSfxM/lT+bP5HI8L+RxdP1NnwdOQ+7n+ZP7o8VmdD3Xqeye2e2e6Hknul4NpXwFtIOfVwifVGDaaxGFxEhogtTo7XAjnk47huO5jEygYhmm6K4NzPhvNGOPh3KlRJUqYioIiU29fFU0JcqhlDCrYuYbtLGk2gTJshydupXLyw3wsfUYDc8bgOSPwfKWX8NjjIPEoP1GYMFjKiVN57JRKYcZpenh41Q6A5gvLFz7iqeiexPYnsT2J7E9iK2K/4NyfynI8t3D4ZRHUOA/lcdTvg2ckeTndCNuHhtxtN0YcL+Hhv9/F47fG0Zv4/o43fwP8A8DDh3ycdw+IjribzuaQfMF0TR8ILVN34nSfxM/lT+bP5HI8L+ZxdP1NnwdOQ+7n+ZP7uGpUuXLlweMzSDwNOI4Ls4GpbFjw4bJqGZhbinSFWpeGHg+FQJUBjsrXuMorh5L0Ptl8LqXEmDiomqlgz3n8x5VLvUDX1AzWUQqwL3LwWyvPmYZ7KPrg3PQmRUxB+OsrWjwfGuNzbjM6RkmsTpSAqMOQGCzxFbcWWViJqswjDvN9CdASHmdXTqKpm1zJQtbXTDnpDUQQHSyQ3zXVaT+/mo6vFa2L9t/8AIlcCmRbJ/wDJn/yZ/wDJn/yZ/wDJmyfBFXf/AAap/IcDXwbuHwyiOoT+RP5XHU74NnJHk53Qjbh4bcbzdGHC/h4b/fxeO3xtGb+P6ON38D/8DDh3ycdw+IjribzuaQfMF0TR8IrVN34nSfxM/lT+bP5HI8L+ZxdP1NnwdOQ+7jufzJ/dy1XwON/Ag0x+Ojy9w6mR6iAsp9Q7goZxLByRjCovuGWIrf4iC0IUA4vhjrcs+8yTSd4YRZGUqGKarb4JbTzBmGoMuMh0OYrF+ZcwLtqZPzmEuTs7Q/1RthtZ++NoozZhyweUgQFCc078K4YcaCNuEl7dHmfUqVy8fkkFOHcWISu7SsV9D/DGAcystH3liUJcuXBDQoHfU9+e/PfnvwfvFtt3/wAV/Kf8YzjNx1DgP5XBO+DdwwjycM3Qjbh4bcbzdGHC/h4b/fxeO3xtGb+P6ON38D/kPgw4d8nHcPiI64G07mkHzBdE0fCO1Td+J0n8TP5U/mz+RGEZrn8zi6fqbPg6cg93Hc/mczeuMUuThr7PlSpbi4IKvEKEfRqNc/qWHBm1juEqW7mbc0R0QxHaDGXLixhYuZsL6IW3NsH7E2qbyoLi1Da7sNy5cXjv5l7e85Ium9jMvlNVHbWoonTHodxwKlDaegmMLEccsDPLD4BnWezEpzxXL18NKIS+HnPDwKMGWvpUXzE7dRcKoNypUrlBWsw+dQT38QP+G48IpFy2m/5NEnUOA/lc98G6PBHk4ZshG3Dw243m6MJ/Cn8XDf7+Lx2+NozfCf1T+VO+CMOKlSow+R8GHDvk47h8RHXA24/gQ+YLomj4R2qbPxOk/iZ/Kn82fz4wjNc/mcXT9TZ8HTkFu47n8zmb1HNUjkuIoUz95cOHo8fK+GVDgzhl6GYX+EwQK40EuHIKMLTZBzEtmox4ql8j/jjFufyEsyOpqOiZHBBg8ZQVMxhBqTUM5pp04XEruWS5W36mAvWfcuTG3wr4MJU1wLzeR7njh11DMZfDpPfE+pfA8B4qVw+ZuaDBrhEJ7P4gS4DOzoj13rK9QlocCvOn4n/CRiRfuRfgbfkwyOoHAfyuOp3wbOSPJzshG3Dw243m6MJ/Cn8XDf7+Lx2+EQ0zfCf1T+VO+CMN/BeDfyPgw4d8nHcPiI64G3H8CHzBdE0fCO1Tb+J0n8TP5U/mz+fwIzTP5HF0/U3cVw6OQe7jufzOZt4jnA+4QAQBHTDD34IU2jZvi4vNcvF8WdiXYdcCKlcM301itpDzyxY04LHHmf4f8wq8xn85Gp/iL2xNzUPgC0OIgnuK7NwocxpjODgZvx4JYat/CE6CyxxLvioETmxj6g+w+0NNf1QzRVRiegjjckLrctEwGp3FvfLiEblcHNRvJBklS2HOs8xxtel3+pSASvZcwCp4mUcfCp/X4yDjU1cfFIoz+J6P6RCjQP75P+JgT98jC57eDnASErErgP5UqdTvg2R4I8nOyEbRjNptxtN0YT+FP4uG/wB8V8e3Ighpm+E/qn8qd8EYb+QfI+DDh3ycdw+IjrgbcfwIfMA0TX8M7RNn4nSfxPC/mz+dwI8L+ZxdP1NnwdHIPdx3P5nMW+Bx/uH+qIN8ykAX0kWgnR/EmJ6NU2vCfNlzcYHBh1Kt6myAtaMxGtSxHEtJl0y4JV+UqjoKc3bwvCl7hO2Y5tNfxlqtcZ/elEVam1zJ4IuQfQS+KF2DdSq8Jdn+IR4bYAyg14RV+d1AGKzzAgcAlcBlHwwS5cQx53HbWYszCRySoyHSzOVke5mGZNT0CXzqJc3gf8F1JRhPzoRwhVNTM0OjFpfUMN2qaMsszDDTKbsf+sFVMH+nJ/w5jLKTbFJmHPChGpUGfAx7g/cd3JKuUVL84MeDm6G5W6afg6aahVa9jhgx5OGbCGvCOWPUeG3Le4uIw9QLh4PSIRfsEPLrzPOv5Gsyjh7hBeCIq3BErUvuIyzvlgfEPmfB5d/8Fy+BLmQ8SyXmXkyYveiODwEQ9jK6x6XHEd3UytJFsFwW1XReViqKFUcNCkOnsIlBLzlhx6ZMtkMJuP0qWEVl8y4tndxKKtU9Ra7SiEviJVk8dzJY9w0DctqsfeeWsOkpX6AMrQqeEPLUpHLhkhhWToX+ICEo5GoxZ3HXNdM0h5tm8RG8l0cXGI2gErUi0KmV/wCHmMXBsYwfhXDxuLWDUyjZqrnuP1GZXq9RGQCNYNtYzA09lwgeOOxY74uMeCANR1xq/uP/AB/zCFlDkb19To0Etys+yCEGXKdyprnNQiOiCdTtjG60pN01G1k9zJh6HURx+iGUsZYES/8AEuKTPELIcDxLhBVgVXAGtenL4MA7ZoG/KlNvJ2TCk921AlcMPlfFbK7QXUb/AN9OpWEhoE6kRhUXAWufxqZA8WIcBnr2fmUxDYuobbFqrn9pVwwyo/U9z9T3P1Pc/U9z9T3P1Pc/U9z9T3P1GOHWJj73CmAnmc878S/Kg0kQFjzDS8QJXBAXrV6iOFOVMcYE8WoubNwmUuXtiic1GG+QlqOriwsfUvhyXyNrn6OperXth0O4f9OasZEFBNPyUDq6ZUTX1DNIvaol20TbGDwMD5+bwHyYQl/NhyikV5cMdVAm2NvyRvCRl9R6C3zDiuDEUjs1Mofq1PMyRXdnkY2bnXwnfFcLSQWiG1PMI0j1vHwiN2Tz+adEpigKCM3p5g8pLvjcIH2YUytrxesxAd9iB4+MollPQD+kpta/NxqLardRWl9rRO/rNH1NyYuEkjP/AIZk4+tE6FR34iNkssrbPmlbLqduPUG8jCrLb3CV5eoPiivE0bfiKWSoEUjxCagc9o8R08umVF5YcMPcc4nDLzOuHQ5ehjI3cHTFh7NNkRBSSoxTMzDsfiZg01G0UEFKnj/MbtvpMe0Au9MFI3FCMkMyywt5hNQaZS8FQoffNrjwCncXeWvMbOPSFFMSmoPuCxHtCNo/tjYv4lm0CLgLmWTnOepsG+FAJseH8xyZuZIGlKPZM0mPMHipUfg8tYS3ahyWAI3w8oC8AX4/zDRHGjUbS+K4qvP1FiG3Xc3yNlw81fSHvt3/AIgQhCEIQ3c/fKcENWwpROqnigKdzAnVg7lqHd83CVAzohcY6A853LQALo+BKBxX4GZ4y9SuUgVyS6ulvAI74LHLCBfTEyqhqOW5qXO51+BwIuz7Ie4Cxo3VrPDfLtnZLuHDJKiw5r4d8sOdwPg8nFLEgLBr43HuJUBnQzqVxdsqOocLD6IwBjSPwH1caljhaAFwN5hvaXKgwsL/AIiegwZmquZ1bwEu5YQbbgAvMoQF3CL6CFvwIQRzvPKubU7rk9vgTOF3eNbWyplD0e9f+kqAAf3H3GQi3bQLpz198NUb3GJuyCqJRTX2vj8RsinrpAbJR3PMANn1PqFQl/bInAnGf9yuGVBbNR0puXxS8wfNcC2CXVMutspZxeK/URjVXpFDreoTw5SF6MuSzKGcRK4HMuPx/wAxeHZ9pcwqDwN8BvS4eMEuCk2dwmB3ZKg84xU0cFlEXCsRLIz7CZZYTp6YOlY+IepUK98Swpw8bQPfJkVCmrxNkpYl/wBEAD6EDVe7is0vCUxxz3yR4yPJwlQB3Gpv4V9RMMhuKVJTGHFwMj7JX8tlSpUqVKlSpUolvomiZ8sZbs8TZM2dMpWLfiyp8H7TpKCxE47hyYjNtTr1MYU85RKkp4WO2PFzpR0+I9T8a4HNYaJvYZYdRb4OyxFcI1PxKNqyVWGEMtnFeoLfDS2fBUu/nLjMv46OfJl0LeDiVK5mcV8UmpvjXyOVl8LDg6EGMBZOz1LhmGY8Eq5cJWs/UbIzCViJTKjDhlaBtfEK1babicV16CwA1h5xLnMemWcwabr+ogwH3P8Ab4qYE4togyv3GS7TfcIKTyskp4xFa48EphNneZiu21gB7YcsXwZ16vzLwepVuJhnSBb6RzLqFQFuSUXudnCehlp2Jma6C8S82n9EZeZrWOU28HUM7LzaXdK7h6leHLZEaYGxp3KuUy8C9Qy7VJCvhb8IZVvcyYPAI4QtYTzMlKd2+DMhzU/ay9DTK+4R4Hh1LoREyPcSO4XKav4A8fjL4/loBk+Bw7WoI0lQ1HLzx1wmeK32X0RcivQGmVCR1fmUE37qVmhL0xXctkP/ANCIuURFjrmkDbEMVhU1B4KdQAqtl2GuahZqMD3rmviNUTLRT8wPafiOQsYsox5lW0zzU9RwW2XjmlC6ItlGCGJZwH/HQHBPKnnMIo1G5A4OjNhpnqz/AEIpjnMIlQ4I8Y5mHQnebESCvgTOhyS1L+NEe/hZSq9w5dWNMFAHkrpiBHA+QMEdxGzJidhqBMDPCgJ2F8D0ll4XLmmWoy/mwjgbYPhXVp7mYogvansSCy89wDTe4ehfqI6b4SLOmEHBzuFBEL2ZWVC7FKAfaYTHCzF0sbPlwxpdi4m3wsniftE+Zee24U8lviB6BnCBXBtpGoDvbFu1mAs22Sk0T16iqhPkiALTqbZw+BMye5lMO2Y2h4bjZG/k6nxV+/i1xc7nhv442wMeSxupePZqVJzOzqooS0wxGrNQcOjSFXaYp7I9pt+pvD+CKbYQmZ9I+pcuG2YMD5l4n/2jGWdKmIoQMN8RT0rGXrf+jEZH4C9QoVvg7ICpgHgSoijxb9wyC8YeIx4q3xGow841Hgoo4ShU9c/ykudQ1V5m3E4ajqDVSonBnkHYDR5Y7JaxtDgAY6s6yNMuXM5H2G9QFvcU8MA3eGL0llWVrjsn1fUccRPZMwvUvdmsN7gUpPOo12JfcoXf73K915CNroPhfC5m8hRESa9oaeB4RWTe6LmXC4TZerzFZeHgu4BSzE+0+8+8+8+8+8+8+8o6iY1B6iDkgOp54csLB8TARk72Rk6kTz8BxUqHRhgKlUdRiNIoL4qHFwcMHg3LEq4v5+eD4p2j+8eXgO+RqYs3KuVBe9S5eFzcqJDExcybl1Biwbi1xG+KlF2ss/iKH8TjLekW9JHqGgp6buU61B/OZTyFR0z7J7f0xQqKeC+CPMJWjpoD4bgD4SJ39GJGsFWV6m8SsK0FywCcUJdKLFSzRCFbsj7yXTwcrzGVmLIDa8Hv5VM30naow62DNGYIn6iUWDVQZirpWnpm5UqVBI7nZ9Tt6ZSn3UeI/wBTPtzcKe9ERR3zcmTDaorTOcSnpqd5chDHBYgRO8VHrpghsG0fniapGBX0RLhz3f8A+Tiz0MH1DJsJ8kB9rlEQiryYRBnSX/gQZRSdRsHc74ReibYs7jljNOdOuHhlIOKVyeRgQf68/wA5HyEVwkIWFajLpiu3DKYXRlyRj1O2XPgj4EoRR4RRXGwxLPdObzP1BwnQztGBuyeoqDJ5hdVBrUHmVub6iPB1Krdw4DsljofZc7rPesbyPqY61R9o+mGUM+47Vn35+V+bsYIVv6Iy7e0+4w5zp5xLGHyCKrGfFP8AMW/bHDox4SVwJUZjWa7n3T7p90+6fdPun3T7olVV7nVnjxKnlxkWIYLNwdXkQM0MA8Mcob6Xc8kYcfJgSoq9fc8lZc3DipfDASuLD0IU0PKeJNyudQeLH7JT9Z4vlwfcvmuFVoKxqMTm4RlTAYkCVAiTaVya2m/6g8ZRRaV77YVU4e4N6B2MZhhwMeXZNFxaD7SnAO1cILhjK2Pn5MoayLPU65GW5YteuKvmMreKI3DrDFrfqgxK1QNBqPW7V4mV6KBmQV8VNjDyg3RpwwkZMsvcdxXMJUFlxpFS1HJ9xVNtS24/aAh5HZDZ+0dQ1O45uelZuEdqmIiKm8MPzwwUjJ9RQ4DijBBwvmFtY/ZBWV9qlCZaEaR/cNlLURh0XiLd61wAj/q2Ix2qKIuUvJ2BiI0rEOd8PxGYwSGRe4NqIwnYP5nXKwxHdCi/UI3u/wC4XhqE3ljE2bKxBGYLexEB4CagP/6IpDUkDWb2dJ50ZGY88viZf4sINxxFGDlr+PP85NwyrdswBQ7JhCXWIpmwW+ovB4Rw0FI3jI2m34ddTEvMDQDUtVdeuGFKt64R84ghX7JdAGM1BvIVU2hS3t7VKAKp1NQEKaF4RJUDkeWZjpqeL8JpjCVLtvRdO48qxblEkme5ccCZqjyyt8QwgFXLUPiQiqEWEMqAsxBlbbd8VKlSpUqVECYlbHqZ7b1O0AV3E1FPMG5UsCuoxXI5uVA2VRiojFQOMJfF/CphwNSuMRhLl/DE9oEL1mVys0m5VQlX4S5NoXwwYn0G1ojJW9OpV/HgIqSb5I5hjhlSmF0XuV8blxhEM2QoMu2FmiV/cOXg4yOJmRbdQGTf2ygR57wJSAC7xFbETkpCSI5gXxBxCrpgxERXbzfDxRDdymDqCLAw2IBgy86dBohtmRri0WxEzzENJuHAI2MqSFe+owFDeUV1FwULpku2BRDZ2xO5e8lREvriAS28P/pEZNrm/gxfFvLFhIOwvqUKYGL9kYYl2VMiuUv1L3709VFeLJTxEjGCuzOqBpDdnmL6X6hYG7AfE2xVf5Y+SFlG4A/BBZKcFStsseiUFB3f1AC7Sq2Nmi2X+sZmmn+tm0IyMkp51hHce5hBwSKh8D9xRCxeo6nFPcIi6Ujp7izvmCIVdOZgSrdcMZ6Al4dtyuDNfAz/AF/zxZLCGAjFJYcXiEaQ7tP0eBcVpdx6mI2hAsvn5h/whLGGZNP8ZQAA3iKEG16guOppmJtr0lN6ibCfcYrtlUa6W7mpLjyxiS0aOPHB8QWYv3RZSyS1uaJ7jmeLZ/tU2CxSEHzhL4qByWvCVCVcQ0ZazZmEE/aM7JYdx+huIYy9xVZbjxg11j6YEcn1w5YHB/yOKPUdCfmVmy2jqUltDL5lcT7dQGix0RWxTzD1oMF3Lj19yhpYa6iVxUDm+aAFkKNlTCo8DKg07lcBYeMsVleK5rk4Sg01Hg8VrPOg2z8HDCvi7QLEGnqDH5CYMqEFBlE9/FmocGOIgVOD+ZauSyvhgWO5UftTCjrKuo3aG5T4q9XDNvEWpP8AE9U+pYBPTcaljQW79zNjLgcMHh9edzO3p4jWkPZzFDCn3KDbiLZVfJOsx7m8TL8E/KK8EqLXiXbvPPEuKOzMsFN9K/8ADBptmWUeIgUtHURh3Za4V3DsRVk5VykTUGoMgrMXL0Gdieag55kEvatOS9zZt+2XDX6S86+JAhqGZRYsGrMLEGJY5iilwxCvxDD8A8Q/JecE66n1TAP3t+hLlWc/0zLzkerR2g7dCA2LWdDuOwvCqediolGmEgZNAo+txGs82Uu55fwfPzP5maTZb7jXAEoP8xFs4Zlu3BHhImYxeWJ+P+eMCG/JNdFsRMSkQSpX2TvMfPxUihHqxH6grx8a2Hsmo2a0K6I8tDTSXyZfWmZCIw0OL5t/+kMCZ/47lBaxmbYdpcGCdMbmZCecIlM+klizslj3LLarfpHMfMJUU5+L4SXL+Cpsmbx0T5semR4+orzVDZvE9MEjhThhKkMEtlGCYRuBEqBcquDLly/ma6iUmEVh5Jo15jl6y6SoJ0GO+ng1AYgJtIJ2QFERbPtKDe4aZ3Dg+IliA241ExTs4YHGUIbDhb+FiuAp4ICKlBnW5h1SfUzMZtp/qK107BmNneENu+zxwepl6iBtz6g+gPLCNdoLS7lQl5pVyuK8fK6WUu9ktwEZfwLv8n9XBLf7LHoS8CsxyDuVRap518r4ODE2R3xhzdaxLe37h288Git9syipsOpao8VxXARZaW61L4UYyWpBpWJTDfhWoj5jiFGMuXBMBa6IbWrSdPUdzACvweX/AFA2si6Lh49QPcOWkp41Dcb9DxAo2iU55WCibWma+QdpbHCuAqvME8lR1GMeUfgf6YoUZg8PolIL6GJTIwiq8TZe224lEnim0Ps8MtJV7IrRa/tjKpTqGA/iYzLCHg6PqBTo9z0q1M29cGEbJXUuI7xGPrij2/ohUjhIPeMHGoYDkx+Aqo/w/wCeL6MMl7hM/NuQiLgAKjgwGKTL3eOLjwNE2ZsYFAlG1xoqdGdpivGghu+JSMJdzFUtdOSb0PWEI3J6QyblHDMlqMLjswsMqL2jcaAUw7n2dBQqqpzdTcSVDhhbE1uQ9sJEo8QLZslaIn9IhoJofM9YNcv7M1U14l1NymdIunmEv6zT8DuvqJpHgr/iMuoQI7wxalmweGYvhNPcdj2bmFP2I5231L+NLFogfAZeYc0rL3zQUyuNwymAzCrE3Sx68fBIcZSoLO1B2kV/Y/uXoqUQyvK6gBAF2kZ4IoCBUqekGJMAdpCLuC7EQAD7Nxn+cSp04MR6XpPhcLSyGmVlrR2kjCG4tdmoSbEVk1vgFzSQFViLGx9wcHnw/SQx1WmoN6+C4iE/YQGfZ8pfrhZXwDqIC2Mpz1ElTCKmY9Px8rhElISpUrMSNJZDExQT6m499RTJxcqyWm+IhRdearEgNs04uaQFKJq/cy62/F84oGIQVwwpKvH6liI1Rq0Ymjk74qFoRAKnv2l3/QYlqHVKiSYJBRT/ACRZvg5iyiYUiO8n/U/8NwmI3uJ9A6+pizSJS3IrWHDCVOwMFcMwgtJgy110ksun+OWbvIh9Y3NKMdzSNR0cVb74NRK28QgAHcP3t0dMYy0bjBDMHkYhv3xNQ96Pd9yxNvKfzUUUql326mDLG1XEfFxXFcqVJJS3qdwesYu4a1ZWF2f6Y9X5synp9U2yfzPbMQl6eOMuocAblEY9xb4Ve50RTPhIbXQzcsC/vmpXC1DMVv0/mA/wIa6OpcSl0XGh7iR+yDw1g7imhSdPByC3iBLSoxViGzaVWyZfk3Nrm+Cu406iSv8Ajx6jyEGRaIyJTNU+4+eHK/T6iuuZYROGGYEY1Nw4eq/a5i2VkTlhCF5WuDqCscvOTB8OAu420LRGGasa1cvrmG+Ze5C/QdsFWq16oKC77eo9auIQd4PY49R/jyHFSiy5kuyJiy+C7iq+FTKBpmM0TqgnqHtBtURf2lSlc/hVNgWz1YmNbijuVguJiTc8CkOkGt59M/L5uV/qhl+ZbKvGEcy37AxaqG4LSow+PF40IOsepaHZEqdUshh7xBK1n3HPVg7Ispj0zQepqX8Eh86KmfEL2SiBBg6QH9FFaw+GYQpZFlnxQnSV15Ef3TtnQalw4up52auzhZcVWRv2RBZI7PEMviOVNz3GesdCKmZRMnTmetEw8t0JVpvjwN5Z2q9S3dxbs+BBZovKl6/EuDLl8EuXKDImvge7w/3Md04g6rCwOKlzusHUbRu4crxFRR+gRLZrwRXsHvCNYJ3olCKjBCXm4kYxcQzFbAoVfbmOztbeP5qMCuCEmIHtbJlEp5XxqBfP9yZrm6DRP/LjzBl/BxCILUZRVoonUF9LOmHsTNzBbIzt6GMANQ4ORqmUCuN8FgwSoWwLMvqNRqXL+ZdmXLmqi5gXeQFbMw0ub1dssvvkBfwlsXnalOdxLuLDXFcXF4Wb/wCWCHEDKIiPiGI6fUf9wmw9Bw+GhxVzUHhmLBTxSMY6y8DFZQlkLRrgMzaGJjTFyqoX1U8xnxM2VN/ngSb6eaMfzLRXkuMRzcvzivbOJV2h/iOYkFdssQV0jRna6fFy/wALMoe/cw4wag6iD0/LMXBdoZaBFu7uX8TMp0a+8xLVPF4iq2uZbwstC8RHqEuoKz0zqC3LMW6N4dmTivhsR94llLbyEbLytpKLXtnDBqKwbZH8S44GS9SrDo/ZCi4YRWn0kShb06mQx9sEdy9VePENEpyysRR9soxBhywJUea5cefURsRDtczRjylY6Vq8QI4TeaqXvtOrvtEI2twhkOzUqVK4Ga/Z5mTGnxklFBb0/wARjzxDT8cBhHlYAUT2IvBmYjvmUApXeoEbGkmjRxD/AHWQNIAHjEE4D6i/AiQ4u+AlSpcj0SuU2vSOCoZj0WQhPK955qVAFl0W8KweIkcQlq7PMRKj8ghbF0F/QlC6lmhrPW/bK/t9zC1dUfvn+SiqLMHgqvAnhmktxaRVwOB+ACNfx7nWY77sylvEOG+H6I7QfZEnMwyVHkse5bYtTcqEc1Q9QzgljdUoSqHUx9nhgOoRVO50wlCgPqK2t8VEr7lvKyrhNmC283GjGnl3MhjbbDUVtIRRsBOCyWql81Hmv+I1yKEIbvDH6VAwNKAslQsD+6Iwy2vhuBxUJdkpeMVZoaioNjVwXiLSo8YgiUwidE3NvS5WdYUXXUw/ZFMfUXh0FE0v2i2wUcb5i5lGA1GjfcGU/cQes1XFSq2yxYogWwe1S5zHlLe0CM1X9QDu+AKPpFwQlBngvbGoKbYcVM9TK0bHxKlcM87vxLv+UOGJG4Od+z/gdtie/e2fqZa1GUModB9e2MZasENDxBZBLtbmVqFgoU7aD8EvQtsLtlNSXbT/ABEoCZR2mSdd1UYT8pa3wfB3GXw44uMXcJfnMVVQLIlt+UCAhO5jczoHsTJvi4wFUZmX2gSx4zi4BpQu3lffsi9OeyEQoWwx2TEZRGStS+GOky4EStxAqpvExnGXxBI0OuGcQ77D/EzT+BwwmpcObnkI44WemWFUZF4SiQQ391mZihtGVLs/iUHbFgwmrU9Sqq1yqVnYYltGYNl4mAyL7jWCOpl1Nrji+N9xlvX+ef5bgOeSrgo/zHm/9QVeRMkqoLBGashiUfZe+kH3idyfolC7q6lrL0jEaH5aQIul4MNp9C+Oo7l7ckuf4KJwS00y7+5ocxfwOalVvvxLv4dwitZL+6yzNwDl16iTwi9TZl05RopOzwNIRwMIow5gf81GDPC+C55vExcDldaRaYVIypMCLmVycDwcibFwswYmC0e7KrQ3O/8AHNaVeo3KaYrUyAbZJtKqYRQvepTzG0vhdVGnrVNxfWIezUu2g/8AAy4hlL8d+YMoX9yjLbuX/h4EA1uVUXMw5NHiZStyXTnLKwBn4gPLsTUSY1fZR0yxNY/BGHNxlEiMPDCUSUO43UZeo5Qp5/exLg+YXA0V+JRs1NQwEIR6pqCzECXUleGeKH1EURZUS/MULq10Rgyi3XwZ3EEp5gXKqZPANx4IcVtClURpVkBMMb0KmhjAg4GPDEBpf0WFlKZe4D0JVYxfxKR8z7sp+GJAKL1h9TJfJDsjVJLtrg9S4Qw/C4xlgy5Y8M2QgPwNwX3o+I/iHSWq0eGYJF+jiuC/MOHBWG9d8VxuVTUAJ0Mw+zlOK0+nkx4ZeYyFhhYLSskkRzPcKf8AiLieP88/yHEQwhFUXtYLpgAuC7sippH9SrLqLg3mO4mL8RzKlcPCy+KzHgJcPU3MWC4pX2JwF6gcnHQ4R4uMOV4uXC595FPazGE8ilDSK1B7EG8wqUYR4eAnThTo3CqgUj6p9E+ifRPon0T6J9E+iM8RMIQzBEYz09DNAqADzNBaN3UMEOTklGwTE5tsn+3zJDEBpDoxIIqDdr2kqgeQ2/cVXHQt9yzisTCVpErsTOlKyjO+LeMo3RB4xD5y8vg8zMQ+zoGITXM6ESrIQW2iAghAqaio0uJRqeS5ZadPbKNuubC76gT9OwWF5DP5PwYiDdzBewZfwWoZvf3NTk/E6L9MsTiyNmHuswHUqubJfUsdXKYH2czL2zLgbEuAxNpIB1SNVi+IHgWFtjWmHSC11BPKn1EcI9Y4Y2LbzLhCbY1zUADvJF6NSmb/ANppxwBwkISmX46P9y9hfEcIvyQLL05fDEiGklGKG0zFK2Xcrlhg4Yz45ojkIm2CitOzhbXGS9QrDeHh0okeHgzGFXkjqLy9xnlQd/cVs/ohxc8O8ohwLTER+Gzps8Mor1rzCPKF4uM1HAe2VaPdR4XUW+LqJAhNR37FzKNuMSl0cf5mS/YmgcT+ajDfE4Eyix5h/Cfx/Mz5SzSb8U6rvg4dS4tFQ4vkiX8CoRY9eWUq2zc2hQBcrgNKT9ialKLLLnDaHmKq3PLwcmuKiNHt+BWSioQzYDsMAsQP2PE6ETJx266ij4XFF3Uv5l/Mv5l/Mv5l/Mv5l/McfEh74BhFzXgSJtoZobjAiLVepmq11wr5rhhHN6JuK+5U2AeFpsqp+pRgpmTcQUvLq5kiF8GmbgMVCqXcqyvl8Q9eAXEQ3X0R1P8ACsWxuMJpm0u6xcqEuHUWyIimIaFXNqDboWcZwMNhMY+lRFZVw1Mn9viP3TUmaYiS/gy7lcXkr1BNATNy2FjCH3DZ/ASli7A5V/M62IuDMY9kbi2oXeIxCtDvhbRplrjaW7W4seR1V+ZcOUJNkwEk6Q3NLowQ8xZdy5uVMd7GtsuylRhHN0yQD10VmAnTXFYgR0lXFcqjqBxfN8UKvta/EoZXQYPqE/m2T1MCQnT3L1M8RlkO53GLw8PCiMK+rAu0SFdhqQSwwaqWSgdtxLLKupdLR+kSFCM4xbFRMsD3L9V+5hv+Jl4PLmIEmDKUf3w8KKHqP5n8cMuWjfDA/XLLLIosDwrMvB6j5LKLbmf2uJvmITaeEFuj27JBTRqJzc+obiMhFQ43DlqtHQjnWeLlPbf+pcZpFJljnM7Oz3K+A7Phua4YR5y/C0NPNzFONTV4eSb9fiLbg70ELRnXYwpiPQ5iLjFxm5pCF0v/AAgAsdPAhEgd7QIEJlE15eGFQMLqO0Fly5VwOD4CM64xMXUbtjKpeJYeGJQyzi4RMybVixYZYAC7/cYonDGzi7YEQ1BXaW0GZYK0blEtrcNPlmijS9wgoPNxyqP65XxvJpm5lpL9phCpqk1RllDyfEoPiDCZzHFc3HMDP/DhFzcqIrPzK0EFWIMYPJanfwqVDmyAlWS/HpNCLVzEPBzb6j+ZUGjo7jeI7YiovgTdTL+ItiytkrjuYvIoKPXKVlv4KDFkKoPcuh0MuDW7gtvvlQsjZTkhoU+yZZynvB9hfSVArl4m+AxLxq8TKDKwP04SUryQasXpcWMZL15yJ3nD0hQEw2B9OFiuo4VjG4lzb57mn3huXP8AT4l8OZkozxEdsYsS5fDGA/qrwcHLi/rLxKn8tHELQQhCLwljWINKs+YSDfHUpNAXRpjLO+BvqIqiGPti8sMEvjrgWeaxz5qs+e491YTXBMWaTyRWpZqWSq/rRmpdwl8vFugC4FqJjtDL4j5YvzBBaJ3KVXGxfeLysXi4o2pYaIh9EBWKS9Rs5idJaWlpaWlpaWhghX5hK9wrvtXCBD6EDU4fcdgblIVD7iJugm+LUMfwE+ofA4Y4Q/LF+7io8CWQvzLfnjmd8BGZMUMl9S0Lu4TLgm2XvAaiIo/M6dPcMpg1KDGwj0F5akLFFR05DQTO8H7RStmAIypXCOySsN4PL9E2EdCdQ17/AAxVij8xF/JKUFe+Fl8A3qL6Ll8PA5fiwY59rlcmCCY7GyC2BKlQYVyvBlRxBvmq2YgghxLiKyBlPp0RaGVwQ8dLUHsz2w0O4LgX2zqOJcrMXPrjoDjiNBTlJaCfgePuKho+yYcshimnd1UFVrH/AFh/nU6lMS2PUXSzb7i6vTpm4xjwMpIZvEKt955jge2vEpg1AcHA1BGlhJ4JZ/kZQRJ8IXLlV3zU1EUbNnpiWjCIQHEP2xFudEWJZwd8PFXhQ4cyp/V4ufyXKp5z0Jf4nSVLaavqyZrHRlJi6UD8o5iLcPcW4nNQcXB4vNr6jiG5dS7MDggXmVbT5eI8REHU2+GoQVA48oLhPUN8vDO2Uy7jHhUGtxDxdS5co5alXHBHHLDFxPo/U+j9T6P1Po/U+j9T6P1Po/U+j9RPDv1wuSAtgKyT3KjYOu5vykgyMVl5IKfzh8n/ANLi5cORYqb39TGcGDXVeUpKVSA7APuZiElcs/RFLiVbBN7mIeoPCqu8su5cDQZYriIgqyX0zpCMKYAQbbag0rGktitPA7nHjiow/YNBBqK+wPQmUJvzyrAT7uKwC8DsOEiTKWmp0O4SmnuFs1KNKYYqRfqXqo2+bDiufUoPRmDDlFFcqPA8MMQYWR9kNOGzzz3EizHs/UoYZYLw2qLnkUeWdBqESUyB5HTvqb/HcB2T6ijyt8xJVbxnBlwfE74uQ0H7DzL4b8liNLO+G8M3ZTVQiiGoWcmB2VGqCfcZRof1NS4seQw0C8+YrS88B+MwjrgiSoMuYWa2RUH0epZd8MGMJkC9dkwUt69fcs5b2xQ3BWCmMqZXE4VUWINiKuq5jc/w/wCY8U/KhqvcMwr3YK74JvwFv7gqsaZT/oekcqfiBQe3qVcuLyDL5YSxnqXO4txi9rGUd838FEbvsXu3Y8Its6BB5YcmHRGX7hWKr3PenkhMiB8DHXpMl4iSoSpk/wDDUalBxmFpVRazFj+99TFgBNQR4E+ZYwz9S4K2oYaebIlNkgRKVV8nKYmMpeS7rDCeDR5grpb08XE0jq/jgSyxemJrCvfA1NLZicOA2wE8Leott8Jd2MRsx7iOW4wzApYMdW8IqJihs0d/Utu3H/JLuLKqo+0aCrP1MgF/cZzX6l4zQYFgL0sxgJvEbAdC4hpg6aJkYHA+ybbjyJpK+Nx+OyLDk2L4a4bfPXm4sH9fAlb1ELjBBaNRDBkYZaO9oIMAHExDSG56a47QDzMZ/PhF4lLqZGbHQvF8XKgxq0oIBdCBgdk9O2OW5cuLX/qSyuVnmIxSh8ZxwmDpZUEmVHnrXcdERbdVLVZ+Zgk/p4HfxeDEpoekFs8BLXvD8KlR1GAZxppgnSTZ2xigJS7/AImCI8r4yftwxjHHsKlfCWwuDidzX8f88EsF5b+p3AI+BCE3hL3WXcVrKyt8ViamfZpk8xB/fHCsRmCY81UT6MtMzGF+olT8JNa/SK4vAMai+qbS0Ai7IMWEptkmeLZZzYGLaSoFqz9Siett/aa5rgmS7EunzwibLqWaUiHTcqJCESGIVWr7lj4ixeHpLly5cuXLly5azYipQMNlQlKTKJiM9MRY195CFUVeIAoeKV0DijK5b7RBim2OK5CwEEPuQGRar+49lfPfBfqir1KOphVn7JRRf1Csn4qEg0TeImXR1OqhMWGfMzxcBZa0fcuVZfAqbJb7FXfqO4Qjg8zfP8OIWD6R7xZevA90rPFyxD+YKqGtI1KRyc/l+PNJekat3aGAtEIqrUIYQ8jDFKuaiYs5H/gMMrmo10/tMfqX/wAFROBj4VAsFvJdqG4D3f3zEG1vOYYFoFVU+hMOj9S83LVHy3iVoyruJLQNM2J29QWu3Oj6RayMkquKgIF8CNCSdpfUrOwP2iVr4Z2etRZU1KgqIBlNFj0H4QtwT8R0IhMhLh37U+pkVcMYEwKX1Lng8DwxVECjggC28KlGPeY+0HKdvni5cvhppJlFHiZMjHTMbAV9Joh8mzh6MEA1wvMTMuizweGFw2PPiPUl+HzMGPiP4KeUCogntBAKpng4QhNyEoLv8Qmj9O5aVXoEz3bArtfUrPuOpnsfccWwa4uoowV7jOVYbnUYJijl1GDYqamtWZbuuhUSjZx9cXEj7Bw74P7CObiWl2oYRVhQYwxLhuUZYH4GHOWo+GYlSuDSeZSxvg6cXxX/AAgCLQT6EI5r2Q26lLE08d/qLbWYqlx7j9o4rFYXVrAwhtCQPpI25g3CXLlwSjbz8RNcJaB9iblcXTUG50e4DIy/qOeahhMY8w1HzMx6gZgVmo75L/B5jXTP7jA5r4vV6hmg+fFL9YPUWUivENg8+IiV0cnwCB3H+IU7AoogUReyHhFgT4gRp0Hz8Exn5JVYdukah1e57Cd8wiO60zJ/kIK5aVR+vkBtjuXEOKge1SqYQzxmi5kViELHPKEM0RGxgLx82D8hcOA8cCxLHo8ReQ574Ze9A6Zgllg5XqFzNUoxJWw09qFAFlaY/wDMWhzCj+TFf4U4wjbhGJS9+ZEpp4q4bHgSpqPDH0NS/MyZgWZldaUmMExuiGJttmX3rfrZcFamzDklLo3iWA8MUiwwvlRCzxDqwElTAO156jYOWLKrCmyDPCuCV7mdmWY/aIwgExpmfR9I2hBIZeVRh5j9EwSbnuRknLClYgr74HFxKIF1iYqdGr3LuyuqI7yPxFX3pgYblH3AqEJtLIu9xZc3yU0UmNFvJBLW2o9Dwy5vhhBvhrhpI9yTbMU6MYgCrYZnargbDLusOSXxgzwqOMRCt3DA2nfiZlNsdIwIZdYhqVV5lRYPBXcwby9QQp6JfFg8M3/LwlwQip7iUw/4alz+5/BbxCxUUqkQyQ/c9SYIEP0Tb14lDZhgV3mt1MsKO4GrzMEK8RwFuQ+pcYRNfWjzFbgjbsQoIDeFi5gY3f0sUH+zPci/JlLomohx2wkEzK7Ooq8hcfBqVLl83XWZKbNniVkt9KuOPV57McjsjQWsD2isFJshxZQ875mU7bJMlF+Jro7uMTv8I/3WYD8SheEtd19RtpU+IxGUtwTmYboXUYBpge36MC6iomtpZv5GffkZiBmLNn7lU4tGTT6j6JpaqZRYp28mKcZjO/gvLD4FLzPztLAoPU3KlckrkAQegZdET/QSwyetiLNFv/gy1hHldwNvodSqBtviNGND6msArf3z6MRWLvio6PMuXXAnP1x74LTTUuUW8sKf2QWxp29e469OotxZJ/GjEl84ZSJfTKW0x4D+5cTxMM+JYuUj8H/MthDQ9zBxmDxHfxLYXE+wTw6ioNypw1AWF7Zfffz/AFHrk9a/lC1v3rggkLWv2ljnYYxewwP9o0ZFAmsuToQ8bAdO9xqtOyXLI16ATGLK701HU09aYF2UCCDKLbMuplBni+VgwMZlmal6nJwlgk8yokCXBcPAoJfkyi9+pRzp0rGS74rzLT1FRagzL7RCndzQjy2TfibDCptOoNYmFuzDhIEF39Qrh4sgsBLXUrh4MMthRdlgQPzLuer+09X9p6v7T1f2nq/tPV/aer+09X9p/wDHgEWwzjtlJgzMhZ4i90sB7mghkfSy7XJ4lL4zXUyoayj3eoTjtJX0YNV79M1bHuoIFv3FZ06wmcvS7ZVtn/3mZxndQrNy6hmPDUvhMy7KqMXVhcu5rEvagl2RkrjktBKYP3wyuAufsbZQbu/uGFC/RNvZ3N8PTLmbHXh3K3+LMOLDWFftYans/wDZidL9su7z5cwVtu+4rQL5Y+Dp2krZYvI+hmYRqWW5gdavMTgpy+NZ4SWdnqOUpmmO8wOkvLeJZm3DpT9xfJUUFXc3A64Szys3MH4LB5YfBZcUYxCCoOo1iipfDA+KnMEANOZTBdF1OgYA/wB4uAC0PMuHbvzUxwIInah2NJLNeuVwILmaoNqxmkqWvhMQafAziIrTGTLFbYUpVFMGoW0ncZWX8y89/criad3EZa6m5MfqlzcNwS24CsEQ8v6n2nmbnUEBUMsytwa4yv8AxNTav2gpYk9cvApwS2FCjDt+uE7AwqAOTO+j0biiNzWeoVoxL0UGr8viKNs+ssXWfT8otsV1bUenZ01Av2ol/NlSRu2V6j5APhjfY9IHRfkmDiPJH4JNRSokMSnqjuGqzcv4Ftc1Lulzs0dEwN6cRRTudtd6RcejpwMLlaFu3DARYVplG9jF+OHMItCXnEUNvj/Oiqx1MqV/Kb+FF+GPgcXGVcp945YMpl14i/RGS7D7lnS/uYK/+7/iy5whuty6xBmGKfYepnmqjEsOduBi1kZ2Yrx1CWgoYi1n+OUKtG/EzeWKW2FQtgsQC5aBZ1cBaTvtg10RMltl8pcDlhKgNVoIjNj1FDrKmJ+56wKwwJvUR0y4msRz8a8N9xjIrf8AhjM0YPxjQQvslRne3p/Kf1Nwwh6exyxJUs8QMzE6ysphKeCBW1Y5a+izHOjI0w2mXsly/iN/n/qM1H6h3+GVOgQdhe0l1rTL4mLX5ivavuW8x5qFXBIwY+QhFlX8ahlOg1AYPlD3DuYP0PgzUYOXM2Mv5i367R4rctjHZ49wtnBBT3uWhocvSXh/kIlFi6iQNo8S0sB6UMoUItcklVKGeEWMShfUubmTtqORu8o8xrHZ2y5gkHgA/jSoRG+4nWFU1owTc1xpQtRH2t64qLRPPAiw2VeQlceP2JWOWhj8XaXXEqr52xeC/lpPc9SpCUyxHcEFuWfAe4iVgBWdTBX/AGfcq5PkruEba8W/xMmzUHuevSZ1qX/My3Y7X4Sp6i3wPwQ/HmvmdaUaq8hqWgpfpjok47hKH5usM8J9IdOL3T82lQuvcqpUIgLCVDDud98XKM1objr9NSpUECpkEHKIS8I+IJa0rUdR2qD5Rd9Z4WHxeGHHPT0JdxVMok0/qH/CD3Ld2IApp6go/wB+577yI6fUPRh/RLwPu45uEI9JR0EO20cDLQ2yS0CEmj+NLIWcAJcJ0YYn+RmRbN9ocFV7lwzBOp+RKcUQ1Q1IbyniXFKu2pc1bMMF3z1Mz/CJvKqKoK5IC2Q+4qlPWWaG0SXBivPffGV4c0fFlYHomkbtnkyGuoeAy1iFj3Kly0k0bDkl5W3fiZQxKjmc3j7J+kohYZVH+YstvpENlebmGlmZ5jXbMAOu2WeL77lrzuLLm0eHg3FoD7u5XwuDL4rkWlaS/lS/CIK6cBdx1JEaK8/B4Dn2yvQM4/8AaiCra4GvAEtGkPzDO0Q2armH9RJp1lrSkDu2JGDuZ7tgj3vlUXDsl42ogU51jZeBq0a1e44golJcsqKQHp3bfUp8JQeIdJi5j9XNICryRgwPAjUMDPC6NwkpfnHLK5omMyKYNOJS6/8AES/5CWWRJd89kxeAxFuMoFFhB6YMvtrGQmF/Sj/aTzE9hXNgTJtXlc0vOMt9zbB8ufpJU/BHuWDjTW4xtpczQcgxyvXb+b/xGOkF2l8X8WBDZSgmIWDUa1gRlbv0aMRdHh7Sx1PCTZmJC8muhuOn0YdRJWOibCpeHAGuoYaVTeMkXi41FyZy/GmLFD9kEdG0Y9Q4qt7gl4AJ+UzBWwzVy3SPA0x2l+4RgvpZUrBUw1pslRaRbcamuAOkeTXwqfW/+L7y8NxkI0kwUWAmkAyuphada8RTcvgk1o7mQbHSKs6YarLUOm2S9zVMErYBvr4ILxiF5mCu8yhDJpleNHurjn7lTTKvLgj5ql2QrcuAhmVB7nTb7YlVBdlnUDVBZUGMvRfiO5lCpDZ8Db2iQyAn/LzSl6lXYaeEG9MVvI8xriXT9TC8JMw+2Mntk3GLGo4WS7gbZf4l3xdmoNr1AQdKPKLLlSoLugOFivDFvTFS1qd1vk1NrDKhmVDUyyTr0fqMqZWxD8pTT+YlQg0wqx+ozNnqXLamL96jCvlXlqHQyotS4OeD4vX1zcqIqZb0fCuDirQNx07d7e+4NbyiaiRXfUsgsxeZWcAYCXe5hCPdPkfuBXE8JmHsXYvuL2j6ZaRPww5kPNCe2nbuol6gdS7vccM8Rn5VfSPaWBqK9xWkC6wevMuV1DWr19xDA6igCblvKH+iMirYsRZU9MYoUxUMvSh4Dh8MwR8KbdS8ZcYKagDIumOml/yitfWqjVu4d+pfKx0YwtohplesyxFfQRgRO3avUfPkbicWwsIILK8RslPuYC1j/MRDa9/1SZVQOFR+JtFtI/rlOBvU1MIhbnYSoy88r4ecLm9TWMHiVAr4GMuHBSPcSXlox1lVtwP1F3tnvVqTXmcy2BQ0xnWgP2igxU62qHCzaiALHp/5nooDUEEs7MyoXUdoWFLMF1g/ygXFJkgenSEZ7bWIBuXi8J44WgZRTC69y9LKJ3WKZP5BmcT4MKduJcuXLly5cuXKTA6MOA4gcNIXHoGGySkj/SRQyTvZ5mXteNRy9ZWa5FKk5CopHA0zyH1FXMErElSmZSrnSE1n7FVKHNQ5cYi1bGv0DB/2jFMbJmvby2RtCG5og9owkBIgnuBJLrDylNepcBzFc+ZmqpmRUDjqPBYMEsAlWlWG+bSzdtqpqXeHFppArRTEQxmdGFiaOoVbKqY6gl4mDXqH8zN5lcXjg5y2Hk1DPNECK7sPmMloHedQ1t+nUW4VemCColW63364SL6FjJFUcm7lyXjpKaIMA6D+0bqeFYZcvSduIm2GyIYQdq6h1F+nMvf8p27PqO4W9RxLvi5VxreHy7g5ZqXy8Cxx4+ffzrR0ZZZZ2jX3FzIFX3EAxGVwppOzvhDvH29TDNj9DojiEhJotL85fDNZdxwxsstuzqV0ldNSgZMqOruPBi5Dcyz8EvHbayjKSLMrZkpnkxCueGCHR34cEHL8PWV8Lju1U0wCi2JcMo/wIplY3C6oUMQde6TPlBu8YxvM3MsNC6wuf6hsm9qaf+pkEi3UVhax/mVcFQEnjPsJQpMYRR1cGI8QrtLwROFXBsPOn+IEf0PHCQ4rlIcHYyrxbl0bxAKPHIyrRsQiQL5l8WkqmUxQt8X8x1J+JMXssGotApe4XU9AE/FT4TIwFwUJaY3Fb66JcSGbWbdnZHbo0+YxBrMAAN6zLkVo0xCAZI94/HV3BeTtJWQzWyZdcMIfceyJwI6f+FmZmZmMNdo8Tc+7DECsEnS03SFmVmU4+BiCTYh50/MLXti5nbTqJaxQdxHIPUgGk2xPpW7sSl55K3B4EfblcP1ihweK00YfF4Jg98O+bYJ9krD+otwv2ja3czfDWm+RHMOGJgxBT6QOBKxpgzIPqeC7DuA0WepcnJjGyDfTUq5LpuKwflwLmpStUTRM/wCI0c/Aahsx/OEsb4j+V+4wOLSKe4ZYYf1ROtTpngVQh0dkpvLi6U5lXqGZlBX3Mo35jDqWgG1xlsWBLolYlcVAgKyBXDD5qJTGI2kfUxwoWj5OB7ZoYalhodXUxG1tFMuBT+URWw0Et8P2tyrZWYXcqlNhaMg7+JAbdxKMYVdWYB0NwZR1NozU+yaIgnZUt+Li7LUFq5qJuMQi7dHUpPLNibIasf8AMvhZ1KlQTPBHjJ9w1uCyhbxdRdW0T+Jc1tlVZVMEFmpFMyud3hCXM9f5lVHRn2ElGVPPAa4KiC5Z+Jdxnh48m5deiVy48/sYpaP3w8XLl8HxpXm+XoMMPqCboO2pbDergwW6quNAk+EJarGmMEoOQu/zBh7Y0/UYdBAn0JhEwUF97H1boC2Li37y2R2EpOAKNPMDN+sGsWxFHP3HcxyzgYNhfkjtxiebleG6hA/mJxTGUwLCXp4LnqT1J6k9SepPUnqT1OBxAamKWk+UyQTTjFAf4jo6dxDatt9S/vNYlb47YkWMWLA7DEofrAh0qr5ZgiUXQj1juIks9sCpfxfjufjUEpVTtjkOCG+WVAgWA3LQ8RdC4wz+h4lq8PL/AHozVLBhRKnST9gBPq5/0xZx2rAuO5YvVwvm3gxNlR4JkGMyUvTV+/itE0tamPMuHn3GozmZux0lG/cvuq7guYMyDgKO0DDE5aTR2PMpuEee4sbh0aZvvHQqK+q8Ez0+A4E4Yam2dRZeT9M0uInFcVDFmdfC+SWapkftaINKuO5ieQSuz+oG2A4MtSA14JamjjoykH7jquozMTqJ3hMHg6g1wTFRyZjah+G5soqLzqgEsHJcE6/HtBTKLxw5xNrrgwX8Etcwf0S5cUARYPFNQO1pmq1ck1lp3OzqeWY8REP6mrjJionwZqXL4eGW4n8uLUpSg2y+WjgXY7lKe1F3FPTMbh9xylqCyGpazZ6lszeP8xXDT4iSgwPcHDL0Bubyswh/r5gP8kuF8FcBHPcsMevkzcr40sBW6mXWrYE1LmMzNZ8TPo1fUsWgBSJNVBGaaR0y8az3HBGbKsTZCvmAnf3NWdmmptDZYpBthNLwDuGAvlmJRDILESHD/pyjw9UTRdZL8zPuVHseA/Uxw3HDyvfIFN0v2PmY5TuWPOsmpJ/4Uf8AFfgBNtSikZwETVrAqGXcSzNO9y41+QJ5k+CBSh8TCf3F8DKzD/gO3Uotqo54zsXRLeIlb4q4C6Z3L4PkLPcuRkr2gUrhVTo1HEvghV5i42+0tFCZqWJB1cXt32y6lEbsbjFVsBbFWOoMrLAH2YPW8kBIRvA7iKxD1H2wGUCuu2IPR7zL+D8RTtbjrivbNwqheBP5EuTC5JUrthDQrqUNIxTc8IGjxx3xiFZjvO5VXuDUYD3eREwK/ZDShXqdxITo96uBS7eI6WJeS4EcffmWYBsr9R7EPcKaKlERsl8jLH1LsGoLMamWMu4RgZg/ompf9sEFoX0gmTMQtRZK8kGmxD5pL5GX+CFC6+oK9meBx3zLqDf50ykO2nrvEy+0Ca4bYMzEF3ubEP4IIDCkR94hA4AfysyJgYD1KXaqL3ZBRiHT+YHFcWYicKlSscZNQIENMYjcbxljMke0j1OZlEwpMF+3N87ghm0xfjEIbJQGzvLkbf8AUsGi8srMI7ItRuVmv9JK9AD1DjfM2u5nfzAj8VVF4H9fcoHL+pQ0fuLGWXNB04lqcKl8MYb3iQdi1qou6oyvM2o5zGhHz0YAzY9cLhEWqpLjL+/g4znaz29SsJbUKYw40n3ErForWoylrh0iTWcxLp9S+2Z+qNVzcHMphqbwp5l7VE9DKWW8S3iW8S3iW8S3iW8S3iFCpZX0Z23rzUXkS78Tua4CIM+tMsRXLoDsIkObh87ntGAFFWKlxHYxlMLe485cGXhMK9nBx3F+LTTkp0xAncuy/bGbcmPDjgRvtXkhglwEjbCipqJsr0Qz+DoiYEHYoMS0uqWzUecSyYqAqqrO9cpjxXG/gHVYfuDqD8QRR0+mW36FSotr+uDD16ETmtd+MX1Y9S/gNalkgmJPsJT010scvBEoF4liWoKVoo5LB/RxsIzudjI9TYLeIcKyGzcHiocHCoQKeDFXCBefMpet6ZpUAoytQYMtRp4Vw7DQSDjU+JibavhJ7UuuGhCTY0+JizHT5imUzpqkqBgDUdJLv6OKjwpgxRE3o8ssW/sQ8qnkVRCrcHjC/Ewa/gSzu2HxKtDzJRsbE7JqClt0RJmrdRPOhknmTkJVV50ag/8AoD3BrSXu+pjZ1HUD4og7o8FCf4f8whGUpeHbePxAEB3TGAAcWoF93cG4EONQmEymB2yuHoY7m2ESJSdPDAcllXRFv4iKoL26OQ2m4k9cdktgqal7eMRf+FsRyimVZUCKr+33yEq8RLWuBbfqzpgsJTDlzdO474S8s9A7gUWO9wwE8vgqepupZdybzRlnvCW4S3mW8y3mW8y3mW8y3mW8xPmOo1VbBwIHIQF7j6mWLlK3qWW++RwfElm6LCMx3zUPh4YUtOzpgRxfzLmOqgp5LPLiHF/dEtSNBDGbGmdSu6ZccyolCWJfaZUrXQQ/+uV6DEx4jLM65L3UWbzfcW/2QcF3NXD7sKcouhnshPYRjFAipUroeIpspa1QPtjqij3ycHhVK7KbqLwOJkbhuL1Tt6lE+rc/uXwW2ZUr4FndSg3X0TKlxJDoeIQwQbqEuCXLx8FvTwGLMYZ6itHm4vJcL6Y+yACGHcquTEd/BEW1Z+uK0uWXbRmbYDk/CVhbr9z3KxBaEZCUcrHNOjUt0dKJrqcKP9IyOx4/BL4eSx6omxUzA1UosiKPOL8x2Nq4skv9EvlghNQc4uJu/wDUuDHBKnk/qLb28kaaxwKw/ERNbl9EHFGi/Ea4DgNsBVtu29x43H1p7IG0TL0ypcNTbQEtThaafj/nhgrOl1+plSgEw6aMX2i3ZK9QuN+S3R78zH0eDK0kw6Am/wDKWqwHfXwqap8A5ym4ytkzmzCqC+0RaH4EZ7mZmGaEqkFT2vDwa5O2bvuD6l1LgXxia6dQ2zm/KKVOI+sWsv3GZrzc3Fg8EqW3lH/Ai9AiG6ZfxF/EX8RfxF/EX8RfxF/HLDkOBuUJg9sDD5iAEMtEIcDFt+CwcS4RAMC8QQtcsX8IRlTRes8bPqIXixjVdwICdc5QVS5AZXYs7ZSlkMJqWcX5lwjLiwXvlxGVl8koai38z3GHDRqK3AU138GGOECfco1w8Q6qPZE0wpMQ9sECzypqVpV86j0tTZP30hxvaoia2GUzDjsOfpAyMnCcsrPCxDhloebB3KzGXUM8Zew2TST7MU6E8DZySEGvgcPXnip7nVGU+j6lw4Ql+lS8JoTw9yy71XO45W+YhTfgyjePAVCJLKxpjX5Edk8IO5Y1GqfaPHI4eLiUylsXXc8Df4I8RN+Z/AlR4U3suGySxEHiotTExuViWPFfwMIt4lsq69tEUq+GJcs9y1kmzaFe5b5lIrKJRBWGwHpeY5izH9YPDSjdpbG52xWwrD+IjuS5Dv1KSj81myII5nzcoQQHUbocEcrQ0HJEsLAMtb1B6LuxiE3S6YKlsy+vlfC/JiXKpTwBC70+JcG7UOFOUhCgDbd8vBhhN6cULFqv5x3CXrlrxcC4iDqMIQhTZcLtHnjVZqPm09WfVn1Z9WfVn1Z9WfVm/ExxGofMnWZiZnIAr2MRyuUxcwmQmIydrqOFJcJUPiRUu+T5MuFkON3uOoBPMuWGwGqfcd3/AFFBJu1fELAvtgHcwfy7TMq5ooMqrO5XIwjQPLCdkVt9vxeD4FEvT8Bw8Nw5uwL6T0TpERSJeTqO5i5gJE5Jx1PQwlNg+oztx6h+deR4Y4xL1fDbMGC5LXT1w8BPou4QGmIYMVFzZtBw8Eo3/wADkbIQWsC8LGUh5IFXnv76j4IVUUQtG8tWIlFlB9WagagmRhRh1n8o7wG7mbTTyx4OIIyFCO7Nb3GP9EuVRBeQrHwXMyOiNGd/4jxcGVccpVE0/Yxl9cHjKA3gOLPUV5cwQKjGM88Ch8zYlGR/ilQlMX9wc9yldXNwpTMWW+wQC/i8HfUEZD4ZoTZ0MF1jaFuU7KkdJG5lr7nTRjt0m+EfUHZ+Z1E36DFOrlxYQkqczF6BsjTK/c+rwjlHiYRhuW50RXaXLzLGamFIkoXvgjKo9wR3F4ri48DzwMJTXR1cVZhNhiWKeHglzcri5cxqaZYCxEzZlY2D6P8AE/8AFP8AU/8AFP8AU/8AFP8AU/8AFP8AU/8AFP8AU/8AFP8AU/8AFP8AU/8AFP8AXHCEsgghovgg+IS6+BjA8pb/ALEuPIlQxPrx6i91g8TfBHgjMmyal3CVLBzUSHIWxowg2Vk+N4rmoJ3j7gCQvsleHkNx+Y55N65n4S5JfyBbNrdSsD3qBZqLN3LXMJUGKY7nJpgaenUvl7OmYg+Dph/Xd+eHqsZ4CEhRIwjDgNtkw/2NibVx73MIHFtf3hb0uiHKNI85+A8XmXVwthxcJrijCXCLwno4GectReKj94GO/vtmLT3ZIWVTbHWIsTFy5jsilh9kAfqYojpvwaJfAaYqKPA3Hh5F2zSxbmFQlhcV6SXGUf7GBA1s5Z/qlykT7lcaQsxZgffxJBTAJWYwYCMWXF5UHYcxoQvDcMzyqDd2KSERtyk/mdK5LNy20IPTBAyqrIvcOsTvK/4j0LEDBfKH+YPLtc6IO6n7ij8Tc7i4Ll2z2GIc0eCXE4Fn00ONUqslwtKIRicMY8VMxlSpcb1KrPZJQp+zEdoB/r80m7nvJqK7D6RlwzzUdfbESmnjszeYCgoP3GnR4ly+H4MqVfA541Xf/CAAFplwIcAhjgeC5hRsnmU4+yMyw9bjhttWkuBfPfUWwf8AOYOqhKhlxuXL+BxmVEHYRK4X4VLJNcHVUPjqY/UQv/kzKE3oGSKd8G4KalQ5v41XPrBuMIuZJXF/CrDMbjdzOlrgyywR3Fe4wlyQbJIDXbpA5MHio1gfaWsa4MzCbj2G6owpYbJgwhFZfiN7EVCpCmQMZ7n0QdxD7iqx5VfFRMHAZcVC2iW2w+5e51wgzcrtu/viWM67Su5rct/cHTPt4coytBTW8Gv7hAEuxTxUbA/DJw/C61CzNOZVR3xhFPqeWLNkbpiDyYeSYlzcKx1K3axRTfzwvb3G5AtqG5m/YXCiRtQv7mAa/Eq5QMvQ0g1mm0YKjBCFyuS0wA0lzcSBUEqW0/PPQipBoA7+4KZS/wChNfzGVcaQ8D/zEW6KKyydMBzS9s+ZZBvHZMFmyVj/ALQjlRYqNz32l6jA6mQ0WRSnzBLKeU7Ge2b/AJxYMYHN81x+1BAWKhlI1Hl5VNMGVS11BDRvxGJFS19EmoEfW+EmuA8MFVOSCOUeiWC9nuACPGJW4BXFcnIy+Lv/AIQvWfixFFCPCh2naaJTdQbzUJZW/Rjdsvct5qZhaf8AQy9F12zLKkp4d0eIkOGXFX38ElqpzMPXxMy17mgwO5WfkQc4mXWCtOFNwdILC1h+Zc/qKuB1Ll81yslX6Yj949ciMOmL7iQ8BwFt1FDB+Ipw/JcUqndyuX8KlYDkgLV+5Y2qpZnK6auPN8RXZuIvnh3ZHcOYzR5zCMx5FRtqLFhgtGXDjcSKyor6IdSvcisPUExhGcMz27WaS3VPxPMB6nc5FbQdS0NYMYQme/YO2P2/hG5uKxjYgaVS5qMXxuhxCVfYdS+EtlP1UxGqHqWL1GMF2MvdOWLa5AKbpRLBMevgP1csYqWdkK7Noe4LoYS9ae4tQp98MPbqK/qPBHhncQad/lL15fNjcEFGKKseNrl46iYEuLip6PBMwL9yhrEVlWqysdzuC87gGuanQShTLUREW3U6m9x6C6LuXDJ41MKfxDMFS36yoHNU4rg4YQd0mSJcekSMVww+KGJcuC6qHBUJ4V3rxwRj3/ZOhA/g4YEYCuTxEuNMJEXUXM+jXUfdlgqDLYPFw4YnHU2r/gT0PMMYl5lKphCBMIRKD9riFXRq6vuWrJq/7IQeb4XtoQEB15/cA+pTTyweNf4lcb+GN8DhncshAJtRIyV5E3CiVJlvxBZPHxuUw4k7hs9rmN4zUat9rr3w1Ll1Bv57Vi6j+3EFMZSxErlAI74r5VxUoyMEyX5hphzfwY8DqAaRpLHNwbha/DHMfTN177mUtdQfIWQTxEV9eIMqLt0S/Kyw/EsULndo7goBHo2mKDyo/wAw9P4I/mdHSt4/THwtZ3n5RXmxcJfKwieUlz1W39zUuZcF1Bm4rslVoWrYnsV4ha06PMCqTx0JWvHCkuBdX1ME8hU7QUv04b/KHDDnYVTKVXqrgXQV9RSW3PCHyQ/s+MSpIhQWwcW2YK6Ysv4GPzPiZT6iYRLE/iN2A8S3ptrdEqUYITBA1zLV8TIWDttfFygHL/aE2t3PUxhiV2b/AFMwY6iiwg2OHcRBoKNksVSRqGXWPFcOgksn4UWpSN3CWl4fNRLa/Uoa0bU7KWTMAAb8sNvoRikmvg8+mim4adskIzHKiZLLuW5YaEoACgLL+8SxsZ+VZ+DL2iU+yJg4Yb4qBww5C2PFtPykklLjPI4u3gQlq4GxqUMH5YaXXt1LisniVC+zwQ4qHH8yIefoe5lxgrHcKmhp74I0d3Fq3cqiMIy4Ta3m9S74SVYx1EdSoELyI/FgazEFgdRaH0xY/sRIEqCNO6scPxoWHwSHLt4+FBjwQ5PjXIUtGSNroNxl0qGPlfA/bNzVDN/XlYTUt+GK2lrLUTTDyRKg9GewZWIooyuIRigCPn0Q6ijVtqVixfU/6kv+4kQ/pKbkJNBE2X+jMocvI/tD2Sp8pDaOrXnFEacJwqAtrGdqHR1GVKrlXBrLqJT0YIaUiRsAX0hNl1Z/KMIt7Ym9/k4BbW9S9Q1CXPKQ4NXFvg7+A1YJqLJaL7SVmemaS6uy9WS15fen5nsLXKp0MG8BCKo+yQJe/wDnuJU79h/DL410NQ5mX6AZm/kDGs05qhbzU1kU1ceqVt7gsGn/ADLdKK0vwKmFW1i/Uu434GElYX3CzfQaTX9QOT0O6UsT2GJYva1ZHdg7IthzuSe4pFS2mJ5Bci1K955pKms3VSkn6Ihb3vEqg0QtDOyohY3Es3fD1Gf3Aa7bi2IV2P1Ow/Ca7jTvlZnRrYJgNOlzImPdWJjTobfcCN223MyQsOz1HVSd1Jcvk0hzk5aJY8Jhe4pR5ESHN/KriVKlSoFfC0N7Ji0Tqp2f1QcVA6vuPfCO/PqFi36KhKv5Rb9PEFF7UO6lD4hCHFy4bjq64qMDOIpaKep3A9sCfiOqNzYlcMVBl08IOCIqPMsXHHwUVEJjiuEqP2YRuyWAFYCFOmDuqjhRqXCbOB1RjheMAbMzFHbEp0JkY3M49+4/GuXQirB18tsblYjGzqKSu2M1EblPjgF1mW8QbrhVgRhfmKtQtQcoq87hHhdKZ1EMdwL0yZSIqmYaK2DWYrHrrxUTJwSriVwEgpouJkf5iLcOO2YSDvoxYg8LmtdnhlymtqIrUwctMBN++HhhwxioMwRSLUD4OVYn0uVt3tNwMw3nuYIQfMIRgTH28XL5MxlweWbRzl8uufRH7C3AGnuzKsq2sbm885kMRDFCr91HLcbN3GbgrF9dkZgsYRg5WrKh/AsP2hEXSzVimvAFWlT8P8zyobVoKuZf1A0QAlAIjgo8XBwqQR1FXDQyr4aYnnNVkqE+k4yQWxRpi48FB0zMN8VfANufiqajCbG5YnYK69Rkr8AZ2oydTYzT3KRUSo8LwCtmSq5dL9ZNn+6G5ZSq4OQxwHfU/RCEBRdu42mp5yiLJXLiHCuTmlkHqHwltJx18bAYISHfO7lQeQMP2aFABg9l9Rfm+Cagjarl4Xk9x6kgXoc3UIuXL4OMN4gqro1KC8pr6l8TLmEFN7pthMV/sncHanqXOih+Iyj+k0gf4iCqLqhzKot2O5/R0lj/AEhWi+rCjWy8k0H8Wv7lvoeVZNfIOEsV2YjcnsYbP8or5hwWlRY+4wrjqHBwIYgoK50s3Er5VftNRqAF4SdDZqVVZGSPcbL8k8u8XyIgiy3mJc2l5ay53MosakaRqH8/EfYqOSB8a4QfpjtEVwz6Vwm5M1bNHz7lXzv+mPgycUdGY4bavQyi38rSLbRe+BhZGif+jKzLdwOPKVXWTyQeDSm+53LBrcM4Dkl8sJcYxONta4MbSGuFbnZWbn6nhJUqE+u7jVxIcB4MQToyxHD/AOYIoCLVOJU9Fb7R8qXuUMqFYt3giNjHO75hS2AdXLOfaV6vLv6ITrLzfqPR2sx2jwZ3F/X/ADx+bb6JumA/SI+ULBYwObnhUqvapCP9ViHf8v6kySheWM+/XG+14fJwy8y7h8ajx7YB6Y20Dj19kTjUTg6gIaDehN69MjIlgHcZkK95mKyqqcVxuZWzuVNPNQlkuDwoLfKqb++3FRLmEN8E2xjBmAg/Mt5lvMs9zT8Uht+ZXq9pr3N5XwCFA46WEwtkqz+8o4IFSOIa2IUXmHBxUqMFN8WGg/mJ0fabYze8xIAvjFagHNRLncONQbeGFxjrh3ZMLgI0xd+Xs9Nsc8SrPU+4zCQrU3ww4NyhhLhXolniMQr38dtUMubhBe9RbnZVzemVAzHcrPj3H4W8MNKt2ZY9mWokmw8EGU6TqIlqWGostz9y3pCyHpGymHhiGX5XEuCokYnY1BVgxi1NReSfT/TilxYIbX34gzlIpeBleyXF1HDNFMro7HMqhXhdSyAGIIBo9vwoJ7txr2f/ABZkDTDeIL/hb8zYM85Zhsv1LG/pGHBF+LxTQiR3zb4l2reY/wAfCwtzYPpFvhIE75ztXS4rgF1GA5e4oDTqOkN+MWDe8dxylb8zvT8wa/qSNUxCXvcXKUYDuNRwRLBEcygG3HtE24cvJ8BUP9eEYjAfUT1dcSwsvtgBFMQMh/Vx1iUCBYrYzDtRaCEjSdkMBBrBFAB2ePxKDtQssgZWonFfIag/Ny3+ObZ4UQ2f4e5WMNrR+505XkZj79TENpefLolLhefaA0dM6ABnrwmFdDXUH7GGz9JGWzjN19wVCcOo/wBxG4tiRyHwuEYbiTXB0jj4PFy+EloJ0wiwcS4uGn4mVxj+YwEGv+ybZhMGoZwX5HaDL6DqhLly5fGaW/CCAZ8QjNljwsZl11Opi3Dd4M4l9+KZi2/AI04/fzIPxqVqsRk0XXnUeAKZVQVqku3judcromUDAA9FkVVthyyvcAcBc04mmpsGiUlNvmOUzLY4YVcRBL0wPFgKYWrK+YW7Q57EEkEZdkp971wbgVmhrlYPNQQWxqEx6oupPi5S7eEmUv1xUrhU+ZqB/GKHMst23GanAGyWas9MJWS7VrMkVZlpfUYvFX3QCt1x9RRc5GVyk1D4MeZ1MpsxEXX5i/KX0ph7QmlYb1lTUxfW4Mqw+2UWW7blSVsunUafMUXr3MQ1wFeTpca8RHXBQ1WZiuGqsIMyVXS6i+Vz0wh7DUQZrZfxVQgqjYXmKtL4VFvZ6pCNG+gncoY9RvaidjcRaEwAhLPUJUrSegYjyas+M3Px1ZBrbziwq3vBMYtO/uWcVtEZglg9TUMjr8QUCjimSAI5aVm+FIKup7T8Q9jomNWM1+tRGlJUeJS+iJvO2TJsXXl+SP1f15/zL2GfKW9XDww3xdRXMkIbYSk2/cLXBncbunwKYGf5z/sRCCFr8PQ6jIB7Oomi6A9QVOJsyqg9UymKcA6fmbLU59/rhgMG4SISuDwc7R+L8FlxlQxw8NPxvHcwE8tDF6AzWp/xLFydh/1Hox6KWT2ML1U6gzK/vLMg8PUuQ37ncrgrjvuFCYeFuFG/5H/uUFfMHA0c2wRWsqMFlHN4wZYX/wCiVqx7mNwxbXdRFSU/DRK5xz5WZSS5cu9yoav1F24RbbYvpSqnc6lSglYZVPClM6r+Y5cGDLjLjqE1PAuBeCIt3fqD5niAaXf3A9/BtMXOpm7Z43D2JXzLv3CcV+I1mWnadjgdsp6VfU0YeWDlZceCPGnTG+a52+Dbi+Hgajc9y5ok7NTFAU0cMLm+LzGoOK6g3KlSoydgtYlM5EP6hj5XzUIvI0ilniIOXUxlAbhRku/DGT14NTG5N20dvbB4hAPoxdKDHlGW37i+cxulvcUYC5yRCYb+AG8LNMsl29ww8rCvTftHE2NsASq9VOpb7YyibKCV8U/KBwHoQpafiKOve4VthUvQi22x2GOAWBYxD+S6ntl1M+hjf8ytYK4GWI2+v8x6nJZrK/T4jPchEvV8Kp1E/GROFbeuAmlMe8Laluz/ACeJqIeIZlLWCoYwJ6mGI3OYguYWZRNGVEutK/j41wp1Mhg/kmfqjxL4uJFRGjS/MdBTHCl2dM7qYziEN0P6DO3DJaE8OLlPZPNTXNmRhZEWF6lPCJ35+RM2jA/4KmuGXwwn60JUqVKh8JVt5ZlE+nmZAFwMx7kbe5Q5pSWhydkufeauqn5fcuyWPZCeEwb/AIlm/wCIEZSalmkOvdjO4zX2PTENoCHq9QZgXkzAP/B9kzmF1q+QwrfK74ErlzKC1csEPoDy1F3DfLqBUHb1GXj4K4WHwumXcdCFlL9R3LcXoOWGKIFjCFVNnq3HFv8ABcwRLsleSF9MvCNHk3wfKl5wQwkevcug11CXyLwzMN8XGHA4qJw4YEYHAKR1z9ypcxnB+gmTmDt8Qqpbs5qTpYKYa+Bzl+ETinGDtaJVdU0f7o5a1+Sdrf0/7QiVFCVGyasf7j2dn5sQ2hwDRNiYCv2nia1TQNtNH4nUU+5iGffNTMF5b18pS/QgFBl6jkLTyQv5MdQMpD4zKGAdNR3f7QmoPCxZu2Wm8gqseDwYVGPS5cg318JhMuD1ab/MURvZrMXHoPZBq+SrxDZV9rTDynlrNoaPHBAjij3BCgB6JZ53qN0plv8AHBOs/KxoUPLqA2KbaV78TaJ64ShEMFnjQg6iIJSdSuQth3/Iy5V+Dxww51B/ODqNuD9YyzbK1uh6lhGW3CISeiHngsV+cXl+I3Er51CDOeNS/nfAN8VwcFEaTXx+07/mYypkwIwF+5Q8BCLG5f7tXTco3+ZwmKYjBxPZogEbYVKQg3kr8yu/UCXL9Ls/cMS5cxk00eUYtoGh1wzBc0f3MmzBMs9eDtdp8nGEu+FRZfN54qV8Fm4YlvlFWxhFSuMan8AxmviuJweSuNMbyiIuoFfgcMmjWZZ/JDI39z+AZxMVm/SCTfbbghoKJpSP0VNotQzxUCJyWL6lo2Yh5p+JQwQRbIShM0ylVK4qs7o7hyxj6+CqHyVKmtqvuA4U7hX28FknYHzb/MI6ZvF2S37UJhO6WtQ2I9jbHgTM2sswwI6Dl1b1Lvi+VnctU6SG9MAoex/wSwYo1gD8Et2P0FSrychrP2FwNXm48wHmY8Vd6jEHShKToYdx+sbVP8xVry1cRpBiDdpoZd9kxRubMYBW4xJ+ZQKC3zMuL4ta0ZrzKHSWf4BLXvh1GMzhEhjlrPMQnNviI8Pun4Sk0wJshuY/rxcKvEWSIMuLc6S7LU2Lrs2/E+4PLijS7wsp0h5ylzKPvE0uvXmNmIBsCLLOZYY4l7fEK3lluWMXDa0QyqfxywOjZLaFzJC+ob0eozEj2xal3Di+VFxRk8Mxl2dPmHFR4CjtvqbblHmCkLPuZFAUNfcVLmKy4WKaeeyHCjhYcLMuXGkuHxqJElHydj3KlSpULME+2jF7Vmx0lRodupkH7Wi1Mu/8ky+6K3FENyr4+HUvnKa9ADsJXBGKRlYjeckuwfWt/MsbIh6b0Qqvgl9hWkaphQ9MoWKQa1ia6j8UwJ+SIEApoJ+HKK/uYD45df3KwXVQH6SjA/QHz82XwkCaiQwU3fcdxR6aiOphxeHuIoqdsrNeRLq5gCjo+DO4fEurcfo4ayjbEIZ3wcYCEpl3xSLTHiCqh4Dv3Pwgu4rpgr3OsT3wEC4mIEqbQKyxtLlyxppj7m4vzFeATs3MUaltYPMLxfhdR1aweblkP+CoWoq+qXI3cKtfMf5T6ltr62xWlWri3YzPFQRwS0OkRYUnUGo5OQZqXzVxWxUuHDIpUUL4ZMHqA1iJVFyox4CNv1kADxXQRsPUAg1iAobyT3HRF+5U+maxSZsvm7IAE34g1VRa+mgmpcqHFncpR+EyorIvXxSajibeNJ34lhtk1F4ONZPDCer4uHUewR3+kIkohlKyW9RlTAUdMfRn8QDDfnDyj0dqyFS323ipO2GI5L+yZ3xtOJzKiFHRbMEOsfXrgvaoMNwAO5pBW30x/QatRglRb3DjKCHxZWtmnFbw4gxnDPQe4ZqTjPFDZNBjyRgQOWzw5+A4OWD8kV3tVDqWlpaWmY+gxi/9XGvqZOvKbbmENbmbphizRBWtuZNGBHceyB1U3pGEQPBEuSt1ERbIXVrxNubDZ/MBLByqxL2lnhihpKZfeFdqpg2trWsvy9asSXKND09S0FcbJakUfQRunOuVYyt55YkTDi3Nn+GXy+ev5Dheb4r4C31LXHcpA0QQ49EnsBV7hcfkVc87IFUfi1pyJ5oqh0+NSrY+/NeIW3NkrEWUS8qCqlA+GVyNzHwtXCzLSKzo0ldikpw3czTbNMyATwDLw4FYycZ8+YBYjvLhcUr4SgBkYzXOVsapruY/ocxqvoVMYO5ECVHgflfH20QtSn0msgxdN9gan90pOAaTBfmGuCsOEO1Ews0UotLUz2QeT8RpDEO5qnr7EqEGhFn2BwYdDdc8EqA59CD1bNOhEsu35GEbJ3nKAK8xYRZG7FFVKOBUAysuojq4IXgUwOceyWf7zcDwDuHZ1wy4RxLjCCBQ7PERKFtwHQWPiZn6xFDeo5cxgZjGJwARC48FCf4YTcHsBSgJTB4jbHPbMsfBq4OVzpVF0OY2R9IqukBNwB3EW6SngBTqXR+LG7lFYIh36lRNSuIiqC6L3LMGenW/ZHzZHSd8LUGVLrgZm9H3H7AazGcAvCZICXUUw9T3Ov15lstMH+blal3Di8VwcArgZ4WX80h8WDDLKHyOyfX+Z9f5n1/mfX+YgqZ4QHgCYbR2ylrweFORBSenmKlG0u/qUKt7JlrfT6D9QT5KGWsHfuNqVew2RG/vLFq3cFGxqXwRe4+PcaA+07z0Hc39yrR2ZE8qmGP5kUerG6dCaa08MQ8D4ZaWW+p/LypVQ+9Ex8LUHvzFVCn3xfPfwHHXCxcjjb2UfVAyOoBQcsySvMrgm8DyxDaxFsYPBzMFFS6yfpFjnBaLrcM0XgG4/A4i8lkd4jiOcSnMtDtdDc7qfKVop6QDnEDaASqKUogbf77RjMJQwEPHXVqV0uquLvwFmjcX1SmwWuoLbTxMa8eBJUBUOKlVO/lqDh+OtkQPsr3Gh1tKZk8Q7Ia8BFMW/j/9XI2CwaGiO2Y7Op0/lUikSOkspXVmKZKe2WDp/RF6jh8DUBKFUYy/iBnjvUY/GZFqqR8WSv8ABAwoS+GEpzZKsofc9WoxgjmBXDqZJg4ltbgjuACOSEVYJyxjHawywXdx4YMyg/rCB2/7I7K20UVsYevuEaaSzqSqvKyKCV6gQm2am0L/AHjYozwL2SjKP5IaFPFMzCASxuL8x1F/NNBypNwqp7jJG+VQ5F/EafXng46J2cviGebZin1MX+AErQLRl+tEVNPauGcR4qOPkcOZZtX6GHBn3Q3KSsAbuUN1KiSpqX8KhxWcpRV2/Fz68wk69RwwKoggWhdNz8/XlhwK6pFrLuoSVX/uhDMIOMY854IMXe37ltEdLsgWV6wV9sNhq87/AMStxgK6jcaf7moB6gayqq/FY5F8yntKn5xmmBUKe3MVtPIYZjnmV16sd1DZ2fcP+HFN/crSJo7QIxEUMHGGcSJazphbiuRbVLiLsiVAmFPnNMHPKsTCWAbYl+6JQ3io2bKack1DM7pi43KzF3FjisS4yuDAqLEfaXqFXDZLWZg1Eg8d0HTzMoj/AFxatbiCMhZm5QagWQs2vV9QCkx5Ib4uPaxF3iMGBQukLEYKTqZF6jGQimn0SyfycSpb9h8CMOGXOjKgpI0wM8fwMDdnvSY9bHxNRhwsxaU0+5rzwjlIisg1GrSXmNoBcu7m4xH2OIcMZ1Kjwppc0J/A5Dv6Exoq74CO+HhyIbnR/K2YiNdwViVxXFTKIWSrJfCy45CKRIsxv1Ppv3L2DYuX97GO+LDun8JjPXti/kfWCJ2bh/Ylo+F1OrqIXh6e2C58cIR/iZqv98XoZakCIoBXm5g9QBsRKv6RuWJZ9tsF12trlTtpmNrs09S4GahnhiPEvb9kADs0k9sEemByx2zKdktlPTDpih/RGXLjK+F81P8AM1wC2FmeYjUXMwNfaNZm9ErLA6YwXp48RxCZQOKXnUcPAf3MdLqMF7+NLQ44jbwORiwhmVq7W66hyOfEWqvo7leiUPvg5XwhndZ9SpUupbs/96qfzMXCwVctSLvZpX6m0vf5K7xB+AcwCriP00AYGizPcVhtWABUy0BlC1KtDIdh/mJmFcCXfllWjMcRFoh1tjVhUu0OWXL3HWvdj+lgIcNOhcVM1GvewLl3A4dx9OcovLSncV3pD4FbO2DHBKQpXDCBFPcx2O+zyxhQYRx6Cxhhh6p/aJRx9425Ld7Wx7jgYfnijtKQdrwywbD9BEoJT8kh7Z3BXavDW+ajSPznjmvhUs78jBwFP5TUJ41HyYQ/ykJrQ35kO414lZbb2xbhKueVeESreGOXAigyEWHd1lcDDFo2MbknP0/UcY3/AOpw8MYXhIuIMWz0GUxFDSxEAPeS4n9RCnNwbZetJjQfV9S2LDMC1FO4lTuYL2QfvKAFxwLpZGvtArvDTUT4Un4ivNRMxqBcuPovEFLaQqGlwxgpzTvwgTSfpK/crxBuafjL4P7UGYHBrBphQS26NRx/Kl9rr7ahSr5tYnOEujc7AEoGr4Bb7THMxDDV+hGj12CGZccLY91EhwwOEAHfDUvhIHD0aCmVGLivhcue3GoPqwDjET6mYpDuVcC7ZYa/Uti12Y+pbdw9o9MHA7grSj9Erm4Z4vi7+VwRhjTNhlj/AC9mWoQhCLmXJ5MITfAxLlwjKHlincxbgRfQEpEqvGaebuBhMi8zuxS6xLWHc8TZ6e4q0J1K4fImE7y+zwHgSGrxA/tMeIcsE6Q+1UYleUinkQYlB8mHZPyMsM5JgAadiFvk4INmHaDhhcTW3ax5YAc9TKvqLb8j4fmMV+BeXJhHjctwnHXK1fZ4IxgKmiaMOXwRWEpOCq7zLWw2TJBreIry3LhYXuOwwxuYRHS12yv7QDLFmttxKg2qzN4vBGs/UzykJVU7iWPNy4y8wbRDahGmiyoy+SjZDYHe47nUGDPPF65uXwYytEd5R4JfXNaOpil8HXDHhUez15itZbWDLKfCVGi2KMMfiP1onxBVLO9Sh75YSrftxUIIJeO4Z7z0lEQkKfZREEYMzFV2SpSbkzMiuXhWhnxiNNCL919ceyHYP3FOz1MYfYRg7CCEp0G3zMOF01Hj8ZXH8lwshMJWbKpjFn0lxKxBlXj3Lf36hgXjHcF7QyvKVF3CA+14jl7NvAOHR+0bOLlxiQCVoV8e3vrkQ3z3CMHPD+Xf90Etq2hFn3hEkq/qCLBkIyZ4CEreCM8kcw67iDbp8DipXFy5cuXxQqxLtXPCqlQ+vcSMLphAgSiXIDINv9SuD/KWjuY0k9ubdTHduREq4Sw3q5mJ+CMdjKfUbNsOjqLsRcw52b6eyMBbJ+DqC1cNoU4J5nafxx1yHpGCDo6EqTyI9K7iD6VINRhlYsNjv3L/AMSEA0k16VS4alHcGkUDXGpG7Pg1BsZdB8wlc1DME6QOavU3tjVb5Zco2w38jccyv52XT5jww2SZDD5Ooxd5bGMP7qMThZ7mMtX1ELP3J0s0BuIZF7jkEZ0pSn7iYWcIMiA+pRZAUJSWFqUtL3GN/sQ/E9cyhvs+XhxFF3K3ItvMEVV/05OKigMpmFNltV1MRctvFTtHlcw42HfwOEWDEX0SpaPN3QRrABvsEZiRu+36jbCdOIny/in4mAf8AgzEenMycDlYIhidGBjGvMqW0Svh3nJeE7TD8I7sDP7Jnd/p2zUC7uNqEtSdGDq+dq8pcqFpqEOLi8MazawnmI7n9bEufSMFxOX+H/MDj+SjAzwIN9TDVrEyEIcYK6eIdwB/IlETDXcWQfVRGoyokHgR3Lfc3enyl3SUwsyovDgziJdc143xGHAcLKh8AwgAuu1lYubRl0/mK9Zeb9sXtF7hC0ApXmCz9EdBn0ntEVBPOuEzKcxlb+SauHcOM+OA3K+KQpBUiRPCZJYBSQww6mENWfaRWCsJt1SlK/crF+wzKPC7IYZqq3c6QVu4Tvk8J6MEoVKI8w10r+k23c0Sw1iyOh3whhmvyGz/AN4iqA9T9h1KkHwC2jLFdXtKhiDs9CuoFY1MAf3FEuftniTU+1hh92gmI+piU/hDs3l61E36kdbkCBUv1eSLafmCf1ZcrJJGsV4+Fl3SOx2wZfKvlQfbDIVhgHVTKpXL+EGGxKSXEuFbJ6JkBGFi26+BHyW3F6gS2ZQ3OYi2GFGiHzFEo57jHEDgIbqHmEu9HmXEfBFsAvZgRerlrqJKgS+FHZLthmwQeCVM478Ru79zc5Hcrt+/2cVcsQvV+0z6g7xcCSFsSqZ1Lg3GVArOozvmq81iNsTDgyx6sT/UUelw0m7XF0vzHhOH8KCLKpfWBKQqvUev/miUhhbjfFPJNiiNrKGO+69TLa37udQPMXUqfVbxFlmeof074Ryr0qLBmc+kIZijZSjFROBAjGYRi9kYosdS2afjz/NRPgCMlOSbRU1yLqf307m6tl3BfLXoi2kfZPBh6iWyBTFz6eWXcPUxpMr9xCrgQDLH1MNTC0Oo/wBGE0e4w+NfDZLstfaLfiMOGfsKlBmRAWm7lbum4/wSRS4Q6lzKM1Bl2GUUMaSqxlMJcuXLlyx5mSYgWzssarlYISG+iVRPTeUC+izD8StqL3P9YQhxcGXL9y2eGMSzRbuI9MQPWCfjyPSXR5D73Dt936jSdgWoFwlJQyXLwBb7Uxf+BEZyH2EMM7lN7TMD6epd19KCP9sQ6+omd+eMTwOyYrRf9xCCg12C41EAqmoWqzrzn3ABiWeDJauPEsini7PDDMdB83LkMY92UNZPipT0m3hh8K51YcxoFNWc3NnpemAgI/cdzj6JPKRRkipBldhG41pX9Qt3iHn3llNwVViUrOLYlS7VSdS/kPXU0CWW2KivzrmozTeppSsGiHNtEbWmuWCG7swi7R3UrN0WVI9x/CGKgdFV7izMfWV6lxlQ5wh+TglTfuiAf5Jk9JeIyNczQlzWOFhKhbSftqazNr8y6lQK5filTKCOHuEpZtDr3Urh4SNblGVrccv8wn8peRqpi1DWWfcqoD4mAnKASqTy9oCDqf6cGjt5iAUXgK/McLY1CH6RQi0JqZH9nUXyY8xjwCVKZdXF6hHiuHhjFyIobCWVUDCDaoi8kXr9ort/hEWPSMGH92f9QO+47YcCLCB5TL5ldUFLl5mVFY8xfWxHhKsaYY7BPJFmB/ExwMLtV9S6c8XP4G5chqVLl2p1xM9iAwyJdwQRh8HgJVcD+DKVTvgeFCZYqp/YTTqH1A4FvModjFHUCMWZsuFEY8cLvqUtAqOVZXFO59p9p9p9p1wfU7QiQvZdSpLUeUvrxFzdO5laKZKw3lwumU7gnMKRycVArmpT2jseZUn33DqXkkc1HpKntlRVy4zh5ii1v7mUKP1H7WkokXr89QphXHlhVP778xm/gMBqfxNCH4ETCwdbWWjPCTLNWN2vyiSS4vlSYHqSqEpqK7amBdSwpK09eo7sp5NfcbYweruNhyGjcqLMI/uMs4HaPDL7vZMUCv6hHy56squcDvt4IkD4vDv+iWxKypYRuGxg2qH3HuJ4qQJK7GEdW9fG7Z2MuHc4lVatsonPfHbECw11JlIcEwR07+KP9xdPZsVHnhf4Jcy9VmLl09Iv6hulLghZeqSEWar++5mQJDtmIufzjP2cE4osr4JLl/BUMeDoQeu4Tts2JEt7xcqnuerC/sc9wig2mP3BbxMwOK4OeCXxvjJHFDwdfuUfZGM3A/CCN6ng4/ghEGVHiWzP7mqnqNmRYkMWWCa+4rTeVaTW0ff+GFTUzT/mP6cEgYo9IxF37zglauX+JqaC0rJMBfEtgE/Y6yyv2imUc0LvqM2rubUSMvh4eHuMEUtjceCnc0/GJKmrhnFjUDqV3UFdz6Zays974D0OPEqho+oCwEdlB7JsGYJjTshR7hoYn5XcI878LrKWx8m4A7PEJZSKgtFy7JvBFUwc5grh+N18LjvipTqmXBKv0CIJSF8pnrEqNJX1FRmx7lY4TE2jN44LwTPmafmX/wALj0F/gQ+77m/fCgBd316/cIZLYmd2xrhiMrJjD+ZdYnRa/R4Obioct6lphbsYqrblZGCSWMJ3j4+pkZUarJ4v7jByiLVnkmiVY6FJbgFd7S+/8IiOXLBl+RiuypkZgoPRGUSEmIt2OPEuhS9QrjBKXwXAG44lqVSkCuecSmncMNkctPP7IzAFBdSyr38XjKNcACil5CVN3agaS+Nxn0y6aodTyQB3tp+DCAWxKDdIBFaCfExYWvxHcxSr0EQG1iR4ZdBpqDFIVXaXnf8AcO/yYfiwyJl/Pm4Xo2wqMZBRAuBRgiYF2JD4klcqQe3RBwVozcINflC45PMDoVbmR7sB3XwfGAMrKizctZoK9PqYEb2GPFgY7VLPY78S5cripXG/udZRoyL8EqKmryfBiXL6Rcg4uiWPibk/hwG5GgIxmefWJZXMyRszLDigY+ZfLMfscnFQtWNMXbX9SECkxjF/E9kClP5ItiTJ4Zk/xR8iN9n7OL5YxjCjBEmPD/Dz/PTKGGKYnB8ILVJc7hMZZ7qaVmyWjDg3L8KhxwwUmUqGJYJj5D3KgSt1FICznFXtCFftMrUr7h6xd+Jg/Br5sr4KvglhKo5YYLB9o0Xt9periuvEBJ1Ycu3lMQ/yozDtFqfw8AuHUQpwZQpk+bh8lEujt8RyS4ptZnvPvqEURy2fiP8ARo4imZcG+ktfN3mOf/IBpjp2fUNPadGLop74CJSjLqCdb909S2ORXV6RnBYhoFdT1L5MxcCKjAfgxPdn6D8woNrKsVLXzoUB8GBDDZAMZRfuNHjQw2TqXy6Yimyp5y0wvGFR0cO4wYSAKAxB15QlI9RjI0S0gDCl2S4ZcJUSFjcJSdwGWZcS/wB70epa4jBhxtUztwLo+Qe4i+HFRIEo+qKVuD1ATLuCWEz/AIJYZf0nbX7Z6D+J4v4EW2oB0uUezizonUFZXxFXmKjG9ol6LMXsxDfYVPPptevmGYImZ6PEAf0gAOkd/csNY8wVplcUvAeyJkp0OuKzBXlBqOJUCtSmHfcfDUrnYr4DGt8JKqXysJd3vRLO2HmfsQdMweOvIiZjLqMY7lyOU2JgAuI9ZyCmV8/iXU23HC2zA/CHNGIs2Y0xxSnlwpDslxziH/6SCgGdFte5dfmdIocnXMJHp/Mbkyn1PUcQY8MeBN9QO0XATX8YPH89LxDcOJG1YrLiXMccPxGmYr3sl8VA5I+QElVFsMFfj6hDxvX3FGivpGzcPlcS4FRZYwi4OEVn6Y5U93+sbqhTLlxBslHsWcdTrbzBqpcXNIN7hQNBj278wt/RALofZMVd07lX80kp3KQdP4JdZmUGZcM715iWdCniEuDGLVStye5est6SHn+Iisv/AOuJ2sMLWpQw1+YzLeZ9i/SYMqGXQPc01+0BAVdQIYOj33NwM34l1Bly48LiDY0y7hXb3yYSLb5h8tVJf5rMweKlw5qdvUqlXkc2oIfyj/EO0RqHhz5UVKEgMB0aWJXxqMlwP6IrxqVK4HHtjs8zUba4Aqvr+4S+UGKttR6l5J8vcbS2lwfhcwssbjafbLz+o5FLrtLM0PRAdxA9XmIO2CeWVhCzZab8cXLiwbm7Gb5PR1GeZcsdwythQqrlnXBgawfSLY13cpcVkxEaxubYG7iVWPDLV1mLL5ri4vC83w1IhlWgjFisYIxjNGbWhjzghg4VwXhZ1HsX72Ahvk3BSvfgiEAAwCgjD1wcxrZ8GdqmfUcHZ4Yroq4cYx4BO0DMD3sdeZkOFzbpCmEfYR0kxilu5Y+onwLiXmXXuYRzCDX6yuD+5HENw4jxtxfwHNnydkAbDv1zfw8/EcoMWDfFTHHHul+Zh1zfFcDcHBbiHDBTczxKGXcSaiqyLS5kF52xaQ2DHU3Wh9w0lUnqV9zwIjVZYuXdREaZUqVKlShajKd4tcRBw6ofavI4IyINoLGJAfK/wIZVHmsGKPOhmCtXG/FBDhXZsHuMLk7ktXlMdS5pI/2SU/gkjulZl5nmJy3wSuGidvw0a3ueGUqYFNK4oy8MCAhqA8bLxwrmVCy4/Q6kzjun6gfY+SWu5kosQ7IxWgX4uPfMO3uJk5OLi1xE1AkWoQMCpN479xIW+KAIjyPcNx0stQQJVocVHUPTjaiNpHzhDcv0albqHeYWfMWZUqE7XutENS9to9dB3WfTAbIPM9iVSpbxAKGngl3uEq44lrvm5UMvFofqVsDtU0o8vps3HJ1T/wDThmEjuXwyqjxUrhmSRGLwPJmMq/eWo3bLHfDm4MSzY7oM9ysCxaRyCFT+WYLDSLbLtxLJXZ8CDPf0InOrPQSjIdjoeIQWs7dehh1oecz/AAVn4IsRFRlS6Bep0b2wZj1+slTQ+9wV0Yl5icVBCdY4hUQulIqia9wXo8xz+P8AmLyIz+UmaBwBwptwkOHKDHi47xK7NcO/gwBE4eXlFtm+a4ZUw4q5VS+CWP0epuExDt1GAbsCVTIb4AgpMIqRoUlqB4FllT+dMSpQtzFb64rj/uUQyuVK9SvUr1K9RBmxN4cBmoLhP/zm5E8dcXLoLML7m870/kIjlfaESmHAS9m3tCwjotvwa1/XCnsKSdxW+VR8spQ7JRPD4XUHMOSz7fApjpVKWw+oykNj1cSugdSgZy9RHV8DY6uesWIMuagVNl1LaFxZBj5BydRz+5je8wp9N9QWDw8MuMMcViXpcrlfRBqolPA/UmINwFWuN+e4I9CEZEzBXjCXdJT1UzXg6wTvfY6ilv8AdhHUXA81hmXjYhxYm/UYz03LB88JwUxM8EYw3w3QHtqYyL0qP4R6KJW5fvtmF1/GKw4SVc6SUxfk4Wor47h8KlBA0dxgxwmSU5uEIJmqTJbJb0KmfmzR/PQS4Ge4dHivj9IRmt6+LzOpbpeocvTqPvMqzU8gfrga/wAQ66nrxGUAWY6CvMFFYTQz9QVQuL35ZKlLtwMYR4ErGmVVvTS/mCFiPpOKs+oxjQPaZRKjFDlV4IUfDt9w0ZpojDdW/EsMrKZTBcDgSh1cu5cvjaHKy5uTjirgcdxq/hUC8R53O+SMI0bUXyLI+eFhCI6m51NMsgRblxBwjW1GfuECOW2Ow+y3cDFMuyby9iM2i9sczGHXqYMPgBuHxQlBjj1MbqgWh1BOqzDkzYuFaIPKooujCY2Ydb68TMudf4JbDW9h7gLYWsrv3HLQ5PrnHJluXCMFaJ3UZHgzaHcuNsYATV9cZjipV8BFMOCtvslSOKipbqPO5YLpMXKswllbTO/kmkMUUddstZILmHmYAx3FH0Y+DKlc2MwcMXb8pcSw57qK+swlsriVD8CWvbGEZfKQPgsUYiljwflIVabPIiFOezhnguLDb8yrlU55Yc3NS4MogUsBT+yYi13f3COZ7zEbeVWmXusu+Dc1Hjk8KNUVKPPFfxikYXXU15x46mbzfqYabiSlGfcbUFl5lTk7DYy9QGUsuDD5PgmqX+UKB9ARhWOmWmIE1nF4/UuAhoVctdC8tREXBLM14/3MpUCMEPLYd3mNw661EAH6EIMeLMNbTp8yrgfEO1qXWACq8RqfYiZdVMH4XwwTsamHj2O6CnGWMMa1CfPWYseRhFfxf5nZfVqYkH3BoUtnvU3h9yU0h8muTPjNlRh86mmJvxcuaxibS4sM8LfC5cub4uKkG53LgVfUDPJam0JaToPcINH1BcCviNrIQViEbARKrrhOCM2VxX/DeGpb56pswcgihAhCVDWpqAzaUE2nke6PYtzuZUO9wIqFe4JTAzLkrg5srn/EBAG7RuNPMadxgUfPwSSc3DpL19RxPwKr678Jhl/QcXL4uXPOCB28suXcJnIaFHYx06DEiGNTCHEeZw+oH/Bwol7U6lPAKbXCucPXBEe/kNxs+ocXyRgpzWmqr8Et4q+4W59OSWYTkIiK/IywLu29zUmviDh+FRjQV3+FLy4lytPcwawqUFQL5wfq+Kg5s6ESvhuAYaYps5ljKRhWslPMAxAMB3M03cxK/cssbi3uGnxLLfB4AgvzKtCEGxpmMdjKvrf3K5qGrg8yOVp0G5W/QJTHi0vqCKLSuoVZ5dSamRlPxXeIibC7YG4x1wy5XDwLholpctu3D2fmJ0rGOIkWLF4E/pf5iJfMP29MBWnPUSEHoWIgIdTct7cJdsI2XcSHNYvkPNVzrqNk6PtSe4eJer6hjioJWZXxVl1AqXmE6Ioz1FIZWCgqmiOzOrlCjRE4YRxwul9w+AQ5c8XxfFy5cuJlmCFPmIJUmeBCEGDxcxAP5MRDHpmMS832JfEdeErW6FJXR/xLqX8mEJSJ2QcIB6DHv1xuUe+mXde4XR7SWMpK+FeKQniaxLe4q6i9h6ueRD2sv2k+IYCY3eUExMtEZUeLzKgu7j6l3LjNxluCFYguK175vo7RduW24fksymQUqWCleY74OOxi85ItmqlQ+VIuvYhrFVxcrh1/ilxhUs3MbfpB4lTg3XJm+X4CfgiPI4boJjMusQ7EEMYdW3KDz8saNzSYiVRYCwY/3AncPNXcYcEi9bmSZWIdUTcVD5D6lRxwXcdTAfENh4Gc3njS0pi8f7YsOWVjMYLmu1HZkOjwQmq/lLxFTxKon+EHCbiFWN9ksYuvcMtdwxWJmWs3HGpkpXLGLEuMoWqUNXDsldfAPK6/X+ZtiAmyIFvJ94mw/uABX2w7JMVGqUpm+5SQ4kp1K5ol3xBGG8S8VsSxgzDkxgxzKcEdJQnf6sW1FZ3O4cvAU1tllmj65BKhY9SG9KRmfNu7Rj9Qi0PfSWpcSoOd8BqHDD4nCo4l5hr4/WM0IQaO4YZPErqc+zv4HhJfCIfc0yTamB2Xr2EMtUbMzaX/ANNN/wDiA3bsXtHZbIIfBlRQDcBXXb3FxYlMct30ysEg8Bhux9Es30qsnUiX33KIlpJjWeAZOWnRNnOchr1mMrWx8nOUas/L4hXhXJDhQZfF8FjFZfl5KKblcWPCq+Gs3HLVQpCs+Iu76Ya9X4OBMdtTJFSL4ccXUG+bFm4tF7ce/GpTqOQ398bBG+DfvQepXZT0kGgw5E74XUG+N/G6zpQl3/coO7YqybIHS4gvsQNsAxlBBOiOyPzLAOZe7GNDKNFRSVMpcNcMGbveJgP8THB1CE/ufqIpi9Hg8cPBqOuKyLd+JWhXyTPlwTCXAVRmUK+Xmids+OiLBghSMstW3l+1V4XuOQu9sow7aOpS2gtxJPxrHUQhUsIhHlOFcyWT3G/tCu8ohzysigfX+eTxG0ate8zuLnyRABbKhaNbnYaYMxhx4okCFoqYUusxGIv4lpLOEuVM4ud7mGpeg+iZ8zSzul1BmU0Txy1K7gwuzjXNyoIhU21Nh+Mu8JoXKpnMuDFuLalUIqSwzuMZcM24ty/DXySXBcPmOZcY9b74UgOhUaop4EqGl/5jgVSw6CGzsVC6yIKOhYaPAepmSx1bm3rtKfEPv9MFw9fNCyy7+kJKpx7iSn2PmJcquWFISRZVRhUw7/ixKQEncWVSl/C6jEcjX45uU4fzLMIDFRhHDwSJDn7qi+yjKzKvlfBNRjBubajmJiVO3j3UuQkmLfknQ6Lrjs74rPNQQxwviqtdcYXuqzFtt5qFZiqh3L4maRTiyLzO4wUmnwG4Fx/6AEW983nMu+L4uU3G43hx3Mu9f5lxzHqJo9XsLlA8Z9CS1g+5X4A8wjGMeDtlPd0iWkfmXNqqn3sP7eUdEVBeZjp4NDwQxNyph2YmU5Mhm9Ae1QigumgZcBoNEyIf/SRkPVJdRa/pGOBh0v7jmjzwuFTXDGE7QHwlwl1hglopllU/gP8APFT+UmPGsezDwCuBMoF0S5IZ4sohyJIAtYu5Vhs/EOx1RJUG/wBUVsZhjI7zUyOHZMkfxBw7lEq2YR5zh3KBGr4uMJUyykXlslDTgrEqLyI43F6amyVwwRFMT3AgmXfFQGGGY1QzNHMCLCLCVcrgzy7lcXLv5Fmg3KAXThmV8/xjXIvJuJsvy3A2a4AFaoPc0e6DVt1L3Nky6YTbGFCLePqETAfLM8pcnYy47DMrXnZD5BRbAp1Fba2Otuo4eRwkqDLhlRGh1KS/tywYxVqOofX0/cen/pfqCDWngWTKpwE98SuTL/xI+3Jww3KziJajPBZp+5t+IyeovbL1Kyg+SFYFqZY9TK7l8lwZcq+P8pTtLg5m2IJ5ObizHfNgzEo+O5jyleor9+TuX8dSvbg8y0Guof2RqK08M1yZ3Hu8QbXGq3nWYXcGnfXR+41X5pqdu5ieItwM+55hp+Zge5ey2EZd8JDLXKqXeJjFVkVb45sDYzSNsli/ECPFXKHU2TNgnwIpdzwyjoDhDo8OHh7lCjGKmTseJvTd1v6l8PDwJgTvcdAvyQ2TPlKPSeBxLVUd/h/zwxTDZmGa/OWxsNE/tFyjVVPcR6TPQhCYHJFzcHi6l4jjK32XuNALrxF6wo9SsP0Ea5oh2B1uWpdl8RpA86lZhuXeIXHbk6hLzwQEm4kthQZcCzmXUxhJkF1Me0k8sNwb1ZGMKiQzeHbxEGjJCpBbDTFPk+pof6UUdlphG5XFxzDHN8pNfEPrFp244DpFCEXAzo/UxJa2/EBEFn+CYXn+Li4NxRe9kqJS1MJYj42/cpGrsufxEppw/FyDLiXjSt4uK7ZmVZHXWk3xsr4syZmpOfvNFfZ8KlSowKt3bqY3u2+YVQ4YDkX7id/vwlw8FfBleVLlzCD0z8HhsQUvMwZfyIN7gHUQcC/cN6Mwmaq3g9SiKntuWTbPJBEiJSK+ZnkFrCyttNopeYS2w6RVuBsRkPFyoRYVi/ERzxysPlGKWwHR4xFT9Yg38CwmSrNRyzJ2Eqsq+4/aRJVQ4rME1qC5cvPIeCZ1y37gS3kYrFB/cVPpXQSkuFae3nKVUY4jxCYCjdwUmZsWjJilweAEIXvuVLS28UEtS28UMfhMGGGUWmDcEIyazDgyCU46I8tdxon2LmuSI4cQr6ncL3f8cLjmEVBz8g7kJ2P0sPnJCNfx4Y1TT/hHBuAUpjbJZTLxLnUaj1Bi/JZrgCANHw0Jcz5N3SatUdS+PV9lWPqeqfMBKlciVudc2yENwta4CJfSYP8AOYWj/bMcAHgmVX+Za7b47m4kqnshYYa+RL+DKlSpUqJ6m+blVdcmLNOZkMGMBVEDgQ54/FwugeZpEMtLQ+olzl5PybTfBZqFskFpCZuWG623KvKYKn0qVgoeYBVJiCUa8QW7xcy/FLCeOVlwgna4JuWH9ps6YVlStvk+psQNcXxc3Mh6QAr9eYm+0EG9v1mmfZwR/BiOOCiEC4zLzkiFML3CtQSIgZOoRXd7DqGJRdI05pMuX8dUcUa+50D8EMmJ9S/MmTiHR/nZVhjyaeLuX54wmoY+uK5EVVC++p+spToZgfIZfUZ202DvihmB208G4zP2aiEuKyWnNK607jLqXEDc3uA3Xwq2OXQVcfDMqVx1AC5echLlSuNrBP0eWXOMwMECilYK5RDz6QU+rjpbXhlxjwxxNJzM0QqLjpl9JCm/tjmNsVDhV++4WByNRn9VB1/0wS32vafb2rz6KZZeOoyI/wALNzZMODiXxa8niAGTt0nqm01CRpLTGzGwZlVGWqxplthOBR9dE1/Hgyw8oc1eUvPAlE1dR9dE6cOvDKmpcOKzMMXUuKxJcqbPriuK9AamCiE0v3R+HYeOKy2vMCr3H42gzS2Zg3hMV4+CPBxW3DDPwYtaGLRvTGfT9fB4v4HzMSVfNK8RHrufk+4wUhaN+bgJ39mvxAdJKwJNtbS4qvDha7hq6KdsdV/hn4ctkqHGalh3pSE7gncwqN5npR3AxIsRaWnuVGMqID03L4bbNGKqf2dy+B5ncIr1epguhMJP70z8zCUgwnekSEVO+D6zQ7n0ILIwyp4XQ2S3pkRl9JnNfJZGPBKbeiAhsxZnc0RH743FJYqlLuGZGw6jSsnqbFH3BEo3KtlZomuRzMdYlvMWXDfJj3jwwMB4Q1KEy9z0M1GXNyq5MBbGIpluDwUUObmHGDltXTiWYSnjc+oN8OR3GJACFSNMSBMKybjxiEWEHMHMd3UNmL4qXkPgJc+TmxQtqKG19zSSs8THSLmWbYQFjZ9898JHhhMoC+MFQAIDs/8AvM71RiuphF8CASnxP5lwCDvFTsaAfxwQ31FFbLpmjKqBjHUDggmr8wbanSsc60HTFtNGLnd3CMeQwfhvM8eHeu5XLjrQzsVW/Ua15QQ4GomZV4PcYoPxElcMDk3P0A4BHg5Ybm0PbLXTB3FXLkhjBcV8LmBBWZkOmYXK2o6cegNywFvMuHA4HmXGal8pKlSmD2VAunHLxXNcX8vvKtxAxOg6Ysr6XrxB7X0UBFyVRi4CGh+Zej7LG0wPsstUvvohYqC+7xwF8IcHAKCVp/u4HqzTu2VWJ8yu78TGo67f1CqnZ8M3iae1cW1w9eZjvm4PWZcsH72IQFrGDu6P6mz1d6ZbAz35l/HJSxKlpaKaZEMJq/NMjzvYgnBNkH7iUDhnUsKpq02qdF4idI96iLV8WYFLhpS/bUfXwBIxNvGcsWFgw0V9DM2/XepbkoFYlniLcCOEuDzeeNHuVEVkoGnRG/bLvcqJCKI3NOOqwTBTAYcuZVIdqe54iHHHuxjnd3Em0zES0r/JK2PR5B74o23Ha3xlLtbeElSv5QUjhly5bMLogqC0NRn+5Sq27XbK/wBqYmxzGHojysHLwRLDfkx8zPvpf25SPC5GKJeaEaSsEv8AgtfmdK3RuUpBAr4DX3yw7CU/gxTvjPyaPKXIxwxtmIw3zElcBL9q9TXsCtWt4lk12tuKGiiswbbQZlXI64G4k/WVTA0K1Fj1EseUXEPgBPrUZUkfhXGF1HENGV5Z95iMC9Qzzn1Hqte5czs9RKaioOq5mHjr/mI5eKlS36Q+TWGk+3d2Yv5cVmVwbnTwwOL4YS4rn0P3Nf8AC/OhoKLTrcUuTvxHc0QPuVZB/TD5yL8oC1WlbIdNTxmNTnY3JRCLqzcFnhwqipYarMp2REdcHGn1AtjnDijWItuhEKmDgxwnXlLI84MLsfljJHZDi+DUVCQ9Mj/TzLltj4GCEdQ5XDEO6xWuGBZKDf3LmSo2B+3UeHEJceFB4LQeW+CRl4YxXoWYU2r8EBgAszdxHll6Amb9eUR3gIpndrV7i/FMLmv3KEuEHUEQEyXoP9xC1Ve0MQFu+yJn9ETzX1Oo64Oal1yrisjV2ICov8zv4Zc1gWvaLJB5DZC6LpiI5C9ajdReOGWtn1E+I4jNpUyy2QxCzCS1FusMzZTBaWJlpaSDIDUX3w/HEO7qVq7Dl4LCp+YJUSmXPL7mFG5jkn1MdH7lwt0QhZdAsVy9s1BgBj8cLOx0LX4lngS5c7jvlgxySnEYgewrEq/BDAIb4GpbCarLLBdsYPwWEwTuJS66nT74nGp2oJGXwMtXgHpRiU4OjWN0G8rZK5uKsd9kThojwJr+P+Ysx302YzNOyOMSpmhCXNA1E3nuJXN8MsDxLziLxVG9xPLlkqRXQjBd/lkOjiNaX5QprJBgXGEWYsOYyhyXL9FRc3TBt5/4HhWsmMou11BFnem5qFbtB10PIYYbV+kSOq+4hSTUM8Ay5cuXDHAYoqmT2xGyGm2/qAzz/b0S3czuFCZl15EUYU6olKMwcVD6WNuobEIV14l1B4q55Jf4lxZdi5cVxoz7RVgYURye2+IDf1k74qYMsiQ45k3F2jmEFppP8s1h/klSpaPCKI+0EUsdTTT6K453EfgbmYj0xmmmCLAALXqYifPanmNuUhLTX31k+oMMah4JVE/CCeZiA1+YMyXeLGxgxGf1Qm9nTt9EMJthxdq4l3VPZmG+a4GeV8MS2YJngTKGjH3KlSUxhEqyU78rol2t/UoADP8AmYaJtUMwrDEVZKNR9zbDxceuuuCpUTMJgDxLuCxkFTL3btYWeCWRknfgdxl87Pr4DRGuBceBvt4VR2ypn674qeipagw2yitS5eJtlbz+J+ZbljBrEta+oVaiYaliMGUxKB1PeKiCngZCrTqa40XGphQQWmpgazxUvjZjWncab3wqqMRBu4eMu+hg8wvkMxdUApYIPDiPgv8ADK4JUayiFqv7RDMqoYmXDMxeLl4vlcTg7Opfy2owMF3hH4rLg1MXqaVojHesRxOgRZcYEYSomVri+L5DxXF02Wniy81EBOizqM0FsKjLcyzT3K6WMjO6dJ/qjqkp8SpUqVHNovIKDcjqLdxL2+1iijpoW0pfgn2U1dRqoLjgb1EyFvDwQItrwxWu+027/O4LWabsagqvgZiWv7JuOq98Gyq7YLXoZcFkrDgMQvCTzErkwFrojTOD9E/9g+oIQsxKGiAoC9sqHKYczbcdy5nWhFuky6cwjxQET7l4YX8hA6YafXnNBtunb+5fBHoRE6G3v3FZ/fop0HrbCrD0Zi+BCsH/AEE3ri91TIrtglVwQslsBbN6VB4v4pAqbLPUW5LKemYuzwRo7fCEy/xGPY/ZlqWw2U/zLyaO8omg3DzMB18MchhJqZlNs2hPQRWbqPDUGsz6VPjmx+DJSKvxITSC4MvNgv4lyQXhCdlwDFjUemva/wARKgj4YcLCo30xYuvqBGVFYYTVCWjcu0fXwcPtXDbl6J1OVY7e2IzUYTwuMqSFDUN8LwlOM1KFWNsSwEYgTLLKAITFoz2kwx4KYtHpgGDT34h9iDSRc0YvAZqLOuFG5jYmeL8nNcaXUBYXC4g2wo5AdRb7eIiwqVdTQywyVywdQbvUNYoFCBwGuAzP8fP85KbuEoPvFawqoIxG5ZBN+WErgsqCTKbxXA+F8gIeR+FTG/D4MJkzJHfceSDgJr4VlwIwIIkEOaCWjNRFnEOluMm2hNEg89xQ/hssaVO+AayA38efIAAEqDSPUOwU8N4goLFfgeoNFbPmKmAOa3FQ8wiCW3obj1mjDQmkJeWL/wC0GBpbPqAUG3hPWbXEbKGgf2gNPQdPA1gNFbg8gT6PtFFV4UxshA/OeJoh6USpP2JT4lMqhlYRPbvuxtLzPF+HmIqnDLjFXcPoNZ5Ev4IN9y+O4I01CmVDT2Q62/mjoau4w+UA730TQbDhVQ/kwkO3mCDKRgC+8XyxVrPcJq0Ul4D6zDcZ5fsZn8R5N/Wpa43asrpMiXGHJaMU9xE7Q2lVFFFrgb4sFA8ss4hLt5XxkiqKrGmaCVRU2GbypZ2EjQX3XiNIHqJK4Vju4q2tMxUFd1QY4OxvMd3rx/bhi7Jep/hzCM2sGg0RzzULw4wb/MJ0ZhbzbMT8RgsEVLRwgtM7mP8AVNk6BrozIik3BJMguZKCMAOQa4aW0r4WD63GRjFzCU6HP1EbbZfOKyhZc5+SLDA7DF6++IgtIe6joxPp4qW0llSpeD3UUNKxgxO0e0VfQiz4Ym1KMdvcA7YVihKKLrcu7lvMXbM7pUY8HAFXd4gHJual8KKAKZpg+4UortLEGDMQGLeYmsH2mJyXRKpCqefQafa5+Vx6lGzXXwGM/wAMvj+cim8RYi3CqAJZOs74uVyqLDBG3Ey8rB4qHFC6tHhhwfSdk38ANzWDhUrhgyzxFqWceYKRK+TB4/8Afa4ypfwl4upj3cbLB4LsHIk/+/n/AN/P/v5/9/xwvtwTzYj+JoLABTO4y1FU/wDuXUDMolpPdFsjPmIiUvyli90Dy4dCbiWdLJit3AZeHFsHbPxzXJHeJVikpY8V1FSjmwuGMs/vm6lDQfzTQelhLFnw2zqZSpfFy4TQjxGTE+eGa5ZzFmNDMIMyXLMEaMwCoumn8SteY8kUgdMiYtVeD7mbP0NEd+uGyA+h/wCGZ4Rly4uEAcTzrjPZEgTKCdFyvZX3CMps8JDiuKlcE7CwDgdZFj6lEZIETfMC0+0Qd7aah4ArC0X7N22EwurrVH22+UHrXt8TFeWjr+ggnqNos5Y5poj+2XFBvMskPK/MvUKZaNAWx2qXlvd0b16nVz7j1L7iHNmo7iGLxB9lH4Vk4YnE6IfZRcVK4qFEbY+ZXVkMDM5U1ZekhoO7rUsBL7hTbAigI1Ls0EpKIyDgOGYSXHcKm78zIbijBW3y5x4uXCe0cS6jiXL4W2KTM4dM2lowZWDjdHVzGY9imqhO+4hpXlAckRRfRqAjxel1DsSnZ3CLeJ37hplYmn4c/wA5HkVwt9cYTuS4PBzU7Zjx0nwYEr4DK9XHioV1t9+vcssQZO0NA8/Awx0cYrkjxeYGZVYP3LJHlrfxZc3KgUHmUSWA099wn4qrnHXxUD/g4MtSrzMwb+IaF02aMRocS4WiLMhML9EHcIQTEFyDLBRz8XZ+GIER3GxbJQgdDRx3yWlqTO028XUMLuMOKnsOwymubpmB8TBGfUtZ1avr1L4vipUEPiKx7hH6lB5pUL+43O8+YeS1F7sUdTLWBH7Bx0MQ1CTKlMXhsVGcy3O+ldElJ/KLsY4afk3GzPwGXB+dpHjjYhnEvZ7gKx7HMoeOaageJYrWO1OodUXYwdocqhSTBJ7tjAkZVmOVQRArMF4Earr4Z/cILfl7pzWYB6nh2K2HtfauiXeEcJtmKjcLM/gZjtePqJoNcoy5Cx17iXj8RO3DB4q7xux0l0QuyONt31K2lH5t4I0yEsCEtDw1EgBg9xJQdoxCq3aJzkhp4iYPH+2XfA+JzHqLHf22cAwlVTRfFw5jBF3tnqNxw6iJaryxF2nsahQI9tJjct5hj0aeJ2InVriCz+pz/IRajwcEaZRRK8pcXvLByJdMqafngVUC2vNxgxiwZSNDK+Cb1G2HL3LpqVZitsIDuIJL1L/c8FXZkPdLj5UIJ6nkW+CGb19x8qr6iZntFWRpb8fGoZ4NN4lMYS5cYOZcAyyIClIuILXV4CI1/hlXoYl1GEvg+TEybOs1knRhBKh8b2GAqmI+fhbDR+bzLtvdwcVDiOLnqOaHROL589rqIWUYl/VRmu5iyXwLlcyRUudDi5cvWQXnSEWDxfBOl9M90sgZIv8Af/8A3GsETAq3B3QfaWRKl8vN3wy+tCQ+R8fUBepSXL8GYBQaaGoQNG6sflKV3whgPUctsbHZ4Zf0k84y9EbEzUvQ2RGqtITKMYSg0E8TBL4EhlUwhvcXOfhXDK+VPiUreZbRWqeLlieg8sUJZeppjFF3RFam0tLVe3THBGLl2dy8QNTfipZVhPlFuFLPtMphU+nzFtBkt4lCRmVJZMvBMYnn7mhdMPUwir9TPOjMHPoQfzwFZY+LiLrrlVVQ1EH7hiQrXlNjW/CdDXb5ioZYlfcGy03cERcXw/uAftCVD0xYlSAPMyBLhplC1dSgu1IR/iKHuesip9RDxI79H+2K3g46gxxs4eHJBLEW7cIUNjEqAFUMRlcvFm2Jksle0S1v+RFRgqFfjuEDd7eELWEgn+Hl/scVfAjvcxpDRcqVxWYqx1K5MMfJ+mX8hcHFQLFg9RL+EbIvspmSLtfPmWRE7WNhHPpolqr21J0fYfED9KyQnJHhPOb3EjbrHDENxWXXNy+HWFwmJbI7kxQ1bII1YzqIg1wFwbSZ2QgCmplaZbjsQHSu1iFvM/4/+wCrYZUsv8PhU18jM66VEc0Myh0Sq5iInc/ZjDUsAfE1K/AYTyMwYQiqM8Z6j9hxqaY8A1BawV8zcX0MRBlIUfpMVHQ4MRsSvJZU01F4ECUsf+iJmBEuATk/djqbWVbFx58xeIBqAlwdcVxbxEqJKlRxxuVQi1LM1gTpHW7IQOTd1f6D3LK+YY4rhUqLZ07gat7oXuQNBWi+Zai2rFbY++Ioqz8CVL8writwZQmfgqalwuXNoQpvMx0VEdtwqy589kTPGhK35dRN8mqRpVz6SxpRf0SlHsdQmDKB6jjhcTJ7uQl55eM7oX2nuNn2dVEBePZLRJOaMJN3svbHMoEvKMnmdHwGVeVhZtlOublm6YyMpi4mKi4qMxrDbCS3x6vML6S5+UYgHQVBlln3Prcc42Enadw7jZ/3Smx0y7SKxZ3AytQUbfyuDzU+oAwhwR4Fh+eEGuvUHrL/ALmx1eeFDPDwWDD9MIYGAq9BLC9VfUBNY7RJ6NwqxqBP8M1BuH9yCCnkIwpPREPocXwMUoFZZc7W1H0HLDcvxwlS+x7K1cJieY9dI7qhy6L6HWIKt6DqX11DbrHmdDncR8jkL8xc1yWL2IGUvinvow52mK5Y6cYBXZjkXqmbRG8qU3AKhtiAuWo6NKZNQvcEJeoBnNWZQGHVwMn7Zd7/AKJmwK+jEvZxc/qKjS2RWhPsiKD1CYzH5erRWWkt/lRWKaYuE+iLfYN3GIV1ZPBAS1MICahl4SuzajRhdSWSuEw7cS+XuXiuFKe5S5pp8yhlMupcVozljv4JwIAYtcudEbqRCG6VAg0s7iaf1KrCeNRJteYU+wOox9sdo7ScKrgbZnUDzFWjGStRaA3e7HHIbraZkDqp/UtYFpGvEDIh2xLlJ3dcXL4IdxDTBX6X1LQewjwRfRHxqDXAM/GeY6I+oiXcba2cPwMFPLrg5xUSAp13Ox3rhXFKu4xVYW9Q65N7OZh7Nk2w0+59xlT3Qy26GD64qHY2e47DhxW7vwvji4OiPpD4dQG2zGE9mINqqx6xgJgzvmpWsUbe5qHVIFsTFvc14Z2Y8yoaTGa41mEiZ94V5Mo3hlaDB1F4Hm9S/wDFx3ylh8MCpsD4orJolQ3Epgt2pLoPqESVXDyV5V1YyOhB6QUh3LPHLKVuzcNRDE/wxlVH+5G53NpVZ4bTEF1KWKm5VwM3bHPClYTepiuoTBXGoZpOy9Q3xtlXBTp7az/NwmdMTQsxkxZL/wDiNhrwhpdfmZrsPTUaT6eZV9/GTxIbWrmcrWqjFyYet2VFKRuJb0XxTkuQTqoBejt8RTGMLw8IIve2KcsTe6ifN8GgxQjaKuzTrki9ovTKUp9tw7M8JZZbOFhlhasmspNMzyTFLy8vLz6RGKQw+8twZ9oRdyGTBqWz+ZYlU2fUIB/2x/JuIhUdHtj2EPN/ud7klLJTxcfoGviNWYYQFB5IfCrUe4Eqb/A/A5SCY1WG52W3zFhnhUWr5Yv8r4WeiDUQo666Tp5e4PlYsruZynrggtj6crn9QgYKpSXZ3EWyk2RDbUPcuxgfBUUBRtfSYck0dyxsguyp4W4s6lcbmZZ1RW+vEIeeWAhcpxGS23k+JdcsOS8MvpPUsMB9IFsj7EFGp2O/qeKeowESGqHXwO+FS6KPPF+pcuVi+FSWdPqVmvzxUEUhaqNUKhKzu+b4v4Vb/pY6PYTSu5UDh4NHuKN16Mylrx1MJe6O2KQoxfrfzH8UydEYRelCE/ghw74rm7NR3BbkMcBe9Qq3qCNaOVaP/sGyLFcPwEsSjPjfZGGGwvH9RD6h+qZekWFdcP8ApLjP5yKHFYqEuivoXGKjwZVMwyxXDi+oTNmOoCPcEUANESayzshG/Iz4iIbS2EKnWI9sMhWJaHn/AHBmlMdxUS17mK7n49i/ZGInQXLFZcfRAU+GkSyBo0/FM6JWl5YWAeoBpEEgq+45l+DioZuiFv4QJUzdDKxFZ4YUZn/mIvb5E0f4uIuE7IfrdJhn/wB2f/dn/wB2f/dgYp1thiZsKGa0XcXHTbOlPJLCVu/EuJWmHFsjW0zhaa8QblQ2mpiHs0e5n6RANRilvkfhnr2EMQWiQff6+WDxXNivMCo9ShXQI7zzUWo9SNmotL44WZcE2lnCUpb7lwOGEWjxEQCqmf0hikdm2JUlM5KtLdRTKfZNuEvhmoWdkwSh1HWKmVMXcvq4vGJ6ZaVl9xTC8Ey8DtZjALbzGacmIphZXD9BiNa/W6ldfyRr9xu/gRl8XRUSYbQngD0h3so9+ZfNQLxKWgCscvDBzqCnhbzcuq+K7ccoOeLlYvqIDox4EqKjEt/HD9lWU8hGDZLFV/Ey+4roLlU+9+pXJqmD23NNEufGE7i4b35lTi76YKJoHUvx2IMNQfwc1DEuVzcgaRNuLlZly1LPevEIvTKcFMvR3GnDGEeHiElpWo+Om4gyKh6maFPL/Dz/ADnBct1GOHYagYVtLjgVmWPXNCFeTM7KOMMzaH51R6WYWexmmPlRJS95jWfLGmNfTNGv8wA7b78zJrEzGg/cUSwio31GurfA5NM3OojKswr0EdzPmDqM7s8xc8B+4GIDSOphy/rt4YQDGz2ODljLlfu/fGkGLOfBFLJyINsRds/8AnUtLS0tCggLvD7lMNVfUwjwjuO42GZ54dwvGXPUGl7GtESyqxcsgVgrwPo4MhuL2mQGVjCtvMuC0GpcqHyqEAcZiNV2fcsXxKYcVMkPAbbalD+RjxfGfE7i+kVHgHCwWlOQDb2xm0PheeXHohQULhIXvYldMsgQG/8AxG9bsXCx8RM/YEXZP8Es0j7qikED6UVCI6uVpD6uPnNxpB6qb7uGSsOpXd25eNu/TFJcdwaiky0/zPGLLBRkepdjyWHEOAhTbvi4szELWpsYjLYcPFWxo1MPrxL4ri4tj1xbL4hhY2EvSGVVffxGJcqOIcM8lEdDj9yuj8qYXMFJ5fMycbdSgafrKZG1YhubABgjTN1wtUbibUrDHdReo8Ia9jLpiihflAWWALd5lBX4+G5XmCuGagprhB3yxdWr3FNuFuPFcql2IewG41vccdrzuC8VdZYOD/Fwz+S4jjnogq+kWHE9QUW/Wal19wVLT1MN2qCdo+DxGvzHswdHSY+K35S7WfELZdQB5psNTJEw6jKMrBKlMkGhc/U7RPhXhlKr/LGt3bPFJwSZlQVT4lLSwUT+SIijpPw6O5/QuWr4Sw69cbhghnWWVEy8EBFbfZ4rkyjDDeFl/BYy2RrBGPBUL5Z8oryVLg8I18YfFZf4ID4RcuXLmSAFjvfUZvdk1KCo37jK9mMbYPXYg7BqJAPD+UcAyoGmBuU+z+pRkvFWvqIrVr5l8ANOvcd+TyQ+S5aoTMncSZqFpLmXTLK9xzAV55PUMQX9S8v+KWlcuyDGGOBylwguSyEdVtjLgy4MGmLixqpVAeSr/aCkFLPqY+PDfccLkWpmAaQLarHtbFf5ORBUNrQj4u+mZsHbVQFW2UZSvTiRIsRe51xAsl6hDEPJ8GEuJC4kJmdSo4SxENOzpNStSuHDgxwkqVBmoMBtumJ1r+0zVnsdRNT+8dzJYFTLjLh8M323wNMYrhejuWC+zxKS24sOO/gnFQwTG8obEOEIpc4eIKmQ/EQFI2Y0+oFgg6SuIlKl5jz5m1xnx5ojHcvtqUDZ0zD6gFmJcnW5/R8Ckyg6R4uEMMHSal8MBhI/B4aRijHt2InRrMtXRCH2V6jWtxI8fhwkNfYjnmICWHqoF/ERqlO9Qa3g8wG6U4PXFYHBHXFUkw+RwWBSLhOZiXXG6xYxojT4/LjH6DTpDpfni2YicWwblm8gl+YtpawEvh/iMG2Y8L4/Bq+0mMMrnuzNaLJhLVVvHxqZbLX4ROL4qVXAqrI8MXMPb1V9QM1mkIg05Re0Z8R4muNTABgDz9RF6n0J9CfQn0JlJiFlsf74G4goq1mhp59sfKjEMeDjOuAej1LknjpiWxqMh9pcadrww4IwA5jo+FzKgUavuf8AbQnQteZXz/KZsp+ID0wTQYOO1OszPdCq4mn/ACI1lOvYn1VgVUAC02m07IrRAxP2E/n8VL4IZYt6XwnCRlo3KCjLy+2IYrwNFTUszZ/3xR7hTx2tYbH7pSbQHcCpiVqKvBT0xrBeHn/rPRwgldU7MqKfueFuVnbB6TKsGmoxS4RMwIw5qVLqf396leenUqo1fnlcZ3zUDQTZulJTGnS4lNPGiiH9SrdIcJL4DfCw9yZ6/ggJsYzUvalCcfriuLhGPF3NTbLrHngnlfeoh6iVaq+YxKr9wWAYy+Y3iXM9wD+lShjwbbDiRa78RG3jEPifAjwcmHDFy6EWW3yZcsa2ZjGNRXl3r1AR77hqmBNbig9pdw/05/kI4JWeNh6RWSzQZ04utyO6qrzFyXCPeQsZRFnUuC5V4lICvUpIDtgPYuy5mKs3HLcw9nUKhwwLzU/oPMuTSLEq3R3cuXLjeiIqD/oJaE+kYPF4I3par4VxnDRiJWHcSVxcZUOCC0aiK1VmiU9kcwMXwcypUqVKfqVpa+UtF6F09MA2nqEFU8acco/8QhCDGBXELMsd3NYhw4hlyUm2mbzTp8w4syiglrqW+0ZZ1B2tiqdxHMLV9pY1g3xfKbcsM/bPE0DiUHMjkmd9g7muGBS2LcYHwqG02Y4ncq7BolxokBBF+CdLh+VZlf0hfymcdIDslGEJ8IQ1Ky25cCCXeUgXCX5UEKSimPcD+olME7QT9okvaXKl0gNLiVyTBfUqVyx4XM0/WIwitxeSV8A9eEG5d+0WkqmWG4Fvq+FmS7PfieGEMGObGKP1Mm1X4gqW2o45YxbYmIS2DGXDhnXDyM60yio9EeXhQ+rs9xukfSNyw9s7hyjFNRYSbQSouGPwN/Nc6uBbEqW0jdz1US4yoS9B6YWaMhFUzOhlRYGwYILjqrtgAN4zLE/xx4/nJ/LgUW/E0PJCBA21K1GWA1C2TuErkJqPuXKfELzDNblRj+UNeojMoScKVU82dTPksytYbvsKL2WA0hxL4KO5om5ywu0xjwT6R3Fx76VGlg6TqKxTHuWNufJNQoyyOb4omPdIuXx1FhwRg/IyRUD4hZ/ki5X2Aw4h9H80zF1PYPBBVV354HGoQY1C6gmMavri5dzBgwzwl/iQOIXdQSM314lW3Y9Yyr2xBXn75KWz1kRNn0xgq8sGa+VXEnLb4mY5fUJ0It7iK5gfhpSoNSLphM1eWVP0DqLUsh8CWjz+3xEWeDs1Mn6qLbOAX2x/725c1bK6eYiszBpflHVceCIAt/2zMadjA5k/ymetVA3fpA0S42XMTJECmYYHNQ3Ejq54m0R9zM0CfqbA4y1m+o7oxdeYJPTy0M8GlCz1HcnJ8cjxlVxtRQjAOntM1kOz6niwBDP7ikUWw0HibPkfDw80jFax5eCSocPxZdLYFIY+4qacs/IsWXfFPxaZhcuPCnE2iLzmIwnUIy+VxZcHh4qXGVTMKVFUdRUjLPmOIuTaM7N4g/fEcG05EpJQGhNzzeZd62MAtrj6YtR/1iwn85yGYdzM14l54E26PuKq8fBK8PSMSHIjA+eAd5ZpMpLB4AJ6wRL4LLp+sNS6uxGt4dUbGHIYPEHWrzhUQkENZY4CuJtK4Ijd5Lv0RqcRx/2RtFqzFy+v9x2O8WhGHCR4GZopebCqxxC8Yywc3KJR18lfN+CIdfomTdGnCtVE97Sg7hyhRtdwXiBUJUCVNBav80u3kYlfBs/ZLK3ccWqyp5kb/ulgZ3g5fklobGhqJBF7Ro1fUDB9s254IkONEcw4rhuUMSVfzNpF1NRwDSEILvFVudRBWhRiazDKgTaT85iw/Ah/bD5t0r/SxZcvArlWj8M/LStXpvuBTADwTIzEsdS5qbO3wyyGZuHwLMvoL5aZSPBxmHTlbYVMCo5ArPU6PHqY9J29ksrK2kJllgxWPUFvB5Z3a+AQbHR+zNCtkKxS7B1eurqBI/QxHH8MShmPJTbMQrPcETFxMH6GY3oYPcsKz7IRqxGjcSu+VhuHj6l3VKsw/cGNDpqAQxZohEMJVku6bPDLQspi9JcYPkFBa+glUhVckukVxXxB4eblep2caTzLDo5VehGaly6DPagufh8V3FNuCv1SuElVB47jBLl8kWd9QRUCwJO+pV6GMPmZSEszfuNvrzGzHpMJnpbw7fshlz2SqwU77iLslKe9MlSl35gdp4HkinZgs8kzPwjCfyEErx3D6ElSFEIjSHvEqW2uGU7NfHeLDiErla0cGYP2PCxnx+oJYU6CMMrBQR+SUb9GIrzE/wBob9leS+A1fcJehdn9ypFoqDAEGA1Bb6hmI+8Ad3AAu9lYOQjmbn7aZp2voRPSPzCE2FjEdgUpVl0aDKdCX9zGR+vmvOOOpcuXLlz/AO3Ayh4iYkBp9pr/ABS8f6KKLbR7iURdSEIMkfiiKg4ODlhWJcY/mXLXjlkhWa6l8+ipPWhlwQ+tqJepyYu+Kt4DL+DqE5VW0J5hmwQFWA9O4S32q8CV4h03NX5k9MIIxbDuCclKzz98bDDN48S9HlWokZBc1H4HPHYmWjVthjL9y4HteZeU7mTun3BO083DAtTiiaIv7RT1aePzGq597xL9y9jEuIystRuVyZShdsqHCXwCMz5Q2fEbLPs0xcVfhntgvF2l4OSKzUZEnSQbzjXqJo6EVPqLxN0MFq3cw4HDBxVbiWxjGyMcWhl4+LJLCO+XEGblfIsPaajrzAm31PNATJqOc1LoHs/MX98VGIzvGA7XuX0gwxymE3IfwcMubmoSo8iEuRp8XhpNQ0gwxGaiZ56g9MDmL9RTKDdxKgoecQ79zDqBwA7hhSeYqZA+qUPEZfJYixXdGf4+f5iaw26tRmYSrq9ETV94wm8eDDC7lXTPtFi8gl8YiezES0BaH+kdrlYENix6m6CkvEuex1S40w1L4qbiBmzqpv4sIW2VHEbtsdJkgThW9SpZ0ZYKAPFFz55qcFL25N+aKvFZWZWlXqP4H4j5QxEsv4L+ZiC1KlSpXDCOLUD40/veJ5VjpiVkx5g4gX7gSEw3M9mdfWuD8DmuP6OSKu88Mo/ImbeKiSoQzLWjhJdEuDGDO0Ry+J1EYefcFUW6dy9rgyVqJXJ0qaFmQWgzHqeXS10gxXuGcMR/AlCf7H5j305Hb+ZY80ncfnfzWG/L4jGAczKzxhiNdy01YRCuhC093HNS1nE3HZI3kqMnZjwQ0K+uoiRKThgpFv8A4GC2fjcFus76fEquLlvCGegJuE6XJPvgyX4WLCwYeFS3ekcQp4qID19TZlQ5qKNmXB4FgA9MWw2+ZYt4S4lcjHLCKsMsxOozUMS8VDcFF14npPrm4YqdNxq5lDxwnSa+qHFS+W+WXwNS7xHRUD8uOpxRlCyKzZtVE/T15lyNoOR7QO4QFYgZHS4r66nS8x9y2qrryE1A6Yv68r9iCs4PMZWQ6m0qf3LPAYnSVMFuPKAvDnUt2Y25g9IrbMsMT6mEHiVwx7/qR3bK5otxd3CwNmTRPyIVLkgQ2sVxFJgDNdsVK7g8XcqBcahtNvUsxB5m2BxuL6RLkT32uVxYM49VDxFSS+pbpaqwxPYe4xITSQeq+k9X4YjenFfCrlBxR2wbrMTzKlSpXG9w44hqsaSHGhwn7wQ/YzUHyaISOH4J+zaKVJ55MJfB8Nd8V8K3ylSr6mYhQcnDSDfP7NjmMqVDfLcMbq4Nr3y4YqDwYTL9Uz9D/wBJM3/VylhbGKKaUaoQ3CCHQuGpdn2RIILqRwfcGFE/aIyKT41EYGVl6DD9kYJRtjUyT4g3Uhmz6cs2qV7gvBtY6SstOpATW6z+YSkBKHaWP1HILpyMsgPrOaWylxXFfAXmZ7yRqsyS5eg3Eme7wMbwfjspG9LobldA9hRFkgMgZEHLp8E/DOKP3Nap5XAYCobdfuP2O4EFTwWn3JitPsjMra5uXOowiQ4uGDy/FirXqHF0DHOXyDuLceUzFjCMOuTebEc/VKjDhXC8Xw8LhF3HEyPcAyZtngZbq/abxo/qWUz6jq7VxiB1xUPZmW47QIeJ+RKA6hmxHZ3KMsblvIXuOapjvxTD9Yy5sUVGobqMoK7hIRv1GNDj2JZ0NxBrP3MXADGzCPOkLpGY+oLuN0KMxPRL5O0bXPx/kwyuzHUTmDe9KiK7+Es5XQOothBle53hwofaaBo8TLk7GDQi3M4UecJc6t7CXVRaMpeoK40q5n0pkjbTJzAvh9wAxa6Y2y5jbT+URR+GdkvnpUrZRxH/ANCf/Qn/ANDi0swhZ4WApWrgE2pSjMYV1wcEJUSXCdfC+KxCKC0oZaKZl3zFf9xaNgf9fcIIFatiKYPslCkPyJdyw56TtZidyvMo0p8wa6F+409VNoN0XFaBWP8AoIp2ySVBdzFbVM0ZHcqUp25Ul7Yu4sJf4lOh0T82EQSO+kg1F22ots7X3HpfhEuC/QdRKju0RXVbwlP1HZLkJAH/AN5P5V0EpY9KIrCpZgYoFeGNwuWnUxMdSbitQD2xu2emVk3fNSgHYddMC9PC9xm19R2Efjghq67dy2ZC8McOPyXpgmV4Nf8AMXSzemNW+4w3ww4aTcr2O4kMT2P3LFe0zH/Xi7I4uGP8NPYWm/ZO1vR2wnpbF9PcBOHsZTPwHcMqDSRZYPy/ZD9G1Ub5LXvUTSGCJ8NwI/8ACsInDqJNTcLMpneeHEuLUcxYxuLa0R8WMhFv6518E4SVDi5vhlQIyphGzuFjF5J39EMMshel6sTBRJQn60lOXTc8A7EdXDWVS3iI9Ox+oDL8MCF1phIsVz6eGAhIV49we6h7g95CpaApf1GUzZju3BCxbetGAibs+JQb28MmMqHLLEoMRxG2YzQ8GJ6+/hsYeCXH4EM6eJmpnpM8M3mUGV1ZNwlIW1hiPVEtEAUzeLQ5l2YhDFDJsXAAPKyGFaN9pl/SxUzPqM3vM3H1enRKMnjdPyRExZrsgKoTwQartmwQvipUdw47mamwxGqSn4aMYiGpVQPOovphfmZmZmZjVdYuYbghK1jbfI1P3MMQhDgg81DEHgmibHx1G414eN5uu4qrJt2bjKzqPh/uWq3LBDmw5P5RpNiec66WQeCNk+Ygyv8Amh7G/fOpcKDtUzH2EtWfuXTRBj5Ou2I5F/EtYPyx7O6fUif4RxcfiV3oZ2AO1lc9OX2wmxYZjQLHsmSL9oG0B5jJVe6O8TXF8Qs3CMyKD1e4WVy2RmAyzgiypnSQmciXHe8nMu0JsgNQdkDc+rkR39qwRVlfTK//AFpEQIN73ElZKfXuUgpFQ+FVwOG1lB+p4hfwqIAzpPJBx1SfyEsTOxJ0eomp4I89wEz9G4zrZHMZRiaBcs0Bejmvhai4w/4K5WXyEOyx/rHiCXSr9krCL2cki1HMWZ7m58kMMOZon9f/ABdTfzYbW130Z2qjVZGK8mA27TBKZe/ZMxSTESJaepcbA9xMP6Il30rEUZNR5I5HxAuA2HxnWQf2mdOJjMC3uCGyQdBqOtZvJLWx4EUyhxtwRYZlRVSYZweY0Ma7/Mq7pgmvcGcOYy5v5irPF8+UASiY9sdW7mvAqkiTRt5IEYoJZLynjWW7gFNTDU/sqOUvgDtrhdlHbKxZ+iGVzuqiGyfdJa1Zu7mgNeYMuXNwjKuWkGmwZ1V4joL9G5XyPZNrGHVS+4pf8Ebldwj8WwVufxpCKf7V5HU6ln2ZjtvlhwGToxCHBjlhxVwSSHn2h947FCPQ51pIcipuC1UtvT/MvKkyomIy2D0ywiJsvGJVuGF2FsmP3ZXLWWnmVXGDlWHJDcq8TPwT5iwvwEWA2jAw4GHXRgQYGqXDFhsByloLcq6zBFiI9+5XFX1HEvmlTYxHDhjAVszEDWsuOZUDA0EBJLRmphl5JTruyMxYLeyEGtkemUrIH/qR736gu2D8ktc1RCBa9TAXhHUCwrZFEurmawOo7iwTE1K0RC2YGEuyV8BIWxbS+4hlS13LjOuRq1TCdqGb+3BN0L9jp/cr3qKOeBawH976EFWvR0/iUrMPJ/wWKlNNcj8Xi+BXxUYcUDwsjpl7GDzKujLL9YYy5lNTvgNoOJWQz9EcTcSnzGHL8Qy5fDMmGJeuh4QYV15iCsevM2VnuOwWViR0obJmJhVeBKLGOjgA6XmD2i7Jf16f5mK2wUvcWH5f1GoY66pcuSfZA4kuVGZdc5kCOIjpQ1VV57lwwMW7ly+2NsMv2oJuvcLqH1KiqeRzUV0QNFxcg4lcGrg1qZbA0HFL5Toz9lYGVZbi4wVXXIb4vlxqLUrVYl8EAVqjuOxNauZ5EfxEcd6npFEHMJBbKHC3uBQfonXn2nUBG1rNQqBL9p0ESupcuXNcPwSkLAuV21csBbLf+ERR2KK9BOga5LjbJb9XAT9xB5OL4WvU9RTAjQFd/wDgllU/IpQ7xG1uXGNEGxqBLpfHSYheKUWBHSh2YswK37QCVA5No9lEpi/lMTx6iU5Q24WUHZ6g9dExDF1AdFEykwY+hcUw6PzRS3r6gvMZ1xc2SoRYS8tR7gcc92WcHlOGNUA6mvhYG9agMo09svo1KVl3nI++y+IFS+0IX1b4uoCUvdRPai7Ydr4am0oZvU1QfURbGKiOSFcVahT0BUt5l/yMK0kRnJldn1w1+kJpvcwmCrHt8RKVyyiGfk6jXSQiDCCQmEi0iyB174o7mR28zAKuv6qXCmmoLrJ4xT2Q5JfEvkPzSNoUh8cH14UuFKtvqdHR4eNjjSIs8NELfogETB8y6fE0My27hdH2eOVAKZzwvDfDxcuXLlmDu7hwNoDsloHWkTnDx1LmoMlIuzM3FKoLY8qs9S4UaKQpNBH1TYH8y62XxCdMHbAFYrIs2qfUQqDzGArfTDFunfKQWxHTAsYyV5huHyjCaayxtV67lRyCMhYGWKLPqOpvMFQehPQnF1BtTcGYFi+NiranqO8mOZlukgSl51GkRKmiWJbrmvAhFK2Jl5gs7EEEvNSWz0yzrk/Wq+yfoi8l7tXB1FNy5qfc9G5gL+yXnmoxdp1tTJlYRTiK/SbgMrh5TLTEzxcLf4S/iX8S3hlvDEekf7VNQ15GOhT/AEMcI8GXSuoHsHTqOOQ09RR13WblBQz7hK4HoXMJW1tgu4aaqeIt3lVSq5qVG92np6YGtZ4IDyxdMoQdLNyOO23cCokKL0ym+tBVoOiXYHguYoS1lxlQlyx6m4N0ovzHQUNnxrPF1DltmBdZe3F1rEt239wn+dMne8dcpP1ovUqq952cK4an6JrhlumhiLNV7RyK60iQ8sMpYr0jaowt403CYQp2SZduuzviqQSWxrWHiAFweGrgIdOnUR3tdYxzBww5qvBhkDfjk160izKXcyh5gqrcvNz7g9R7muASvgub/wCE4g38SZ5SL+0q4YiLzC0/iUft5ibPokHonhR5PcNpvNiE4jjzADjHqCujFxMDkNxpdJplmZYF+YrQqUJNS+K4edLMyuKnZGLx1IviWjg6NStLqWkoCLwwFQICPyYAsWLlRveqhuKSk/mOfaNet2+ZWo2URre3WZjWF8zP+sajwDQp6lrK8hB/1ZLxX8RcWyHTMQ8M6u4W9fcW2XioM76CYtYYsI0ppm3EVUiXVXmCItv2QsBXF+QeZHMuXBjMrTn1FqT0TfofmEP7hvqX7IasYgAFLuAKy+fJLTdJpiuDdThJV5bh1HwMePJsisluXxUCUiuo2ZRBW7epQgHvyKCKT+oFab7zGb7BRUygPbHST6T2d061GUC2gxtZlyzaYMqWy4vZPZPZNYjunqBTUJbwJsy3J6ni/JH6SwnxCAf4IFTJS/qCyHyYRY3eFNkBiGk3cI0Kvjzl1OVyXcVhZ2bYcMPhTBt24akkHNB6hvGrMEYFfAaIKZL3CJbnswiWwv1LhTfc1gfXqN3ncuMuEuuRISLRH9Es/gQTtEumU4pT6wIkDioEqgVTxcv4VgWymNOxeoRuhVwbDBGY1/cJ3C8eZaeEiqy0hQ0pMwcmR2Shll1DUL4blKvlWa9XmUrUdcAKXFw0pQi0zWtPiUAHYGGEPspIwKSEWGeFrgV3+pUaH2MM6vjX9x94BDM/kkDoTolSBgUsWvVkQ2vt5Wbhjhfy5puajh41Fg/BhwIOFgwy1AWjWWiW3Ow74qag4FWckqb+oxFlH7hrgZB2JU1KqhfRBG6QXKPhcXeonIXpmotpQWVcCMOHhhw8MRkVgYr2JoSoz8gkVsZELNO4GpY+KB9DPCPGVljw8X5lY58AiSptol2Qt/EJM9ExKSytFT0grKu8yxM2j6quMtzCE2lx4IHfUum49L4FJf2DMZCARcIGFR5Y6WD9Sqhjdx9R4dQg1OpWD9n1GCMHAeoSowJSQ73eYINXflcGO7xPTn+ZfRlcUroxU2xHURfrgJVRlRO5DAoJ+OF4v+oYVOr/AO+o/r/ObPfmKrCZE1KNXPYmgcH7f/JrfqwgcMFNTqVBUzMeH5J9fJB1FQ3MoEILaMsoG/pMvHVZWweyu4+g9iXEIhraEddIvkRvMsYsUHUuQ/z2CKRabWJqUnzeDKRgjtHdkwL1EAeaYzuEYQbEoFIhKKmisSMETgxl3ieFfMF5jLWb6ZU2b8fILhjn5w4Y7hqdwEFsMnHsnUSxhErgb9oeo/wWbCoUtBLZ5ZQsHsJZXUbIOYwhibqD8Y1zSBxKPMwH5yP0OqA7O5H+uCGcBx7YaYnb4/gy+Yc9VSZx2X9QxNGuE3fzC7m+UmvmR8wwHCvT2cIZWadxwxKifJLgVDYmH567iyRxwyowU1GJDuBJgPzEelk7hLsRqCFYjOuagJQCRAYeGgM58S7hFWZfcLKs94gU9+JR5lV8WHyPHl0wUAXypgAPSYuiJoq5/MRlScG2u5YCy2hZxSDNe3YIID43mFhuB7mt/mY3R7zD0hikxuD9iJRO4PITf4BdIrwalfAE54RA1wp56cMqVKlUHvj9gf4ILQ0cLN8bzqeYlcvaohhMqapnzTxJ3vglRcc95Nft5ZdS2bZGugmJ+qeyFZT9y+Knohfpl4s4oyBiEsHmeYBztCjDcLD2xBmohL+nc/KfnPzn5wXaM74jLmdC8kXqyHFRARYou+Ki8R2zY1B23Kpsf0B/38ah8ftyZFcIzH9lEbcfhy8fmJYKFxDiDxCzGVxUSVNMdxnEp983Blao0huYMD2Q7VfRmdZdG8xHPSMVLhf1CrT9Q3IkBsa7XcYIMuGIUjH9RXNOr0S+LyyPxLb8P8q48gOxg7w/OHSv8S133G7EfmAXwcG48CniQVql6uD9QTxA6ZVxxDlMMJ4YCVt/EriQr/BF+niVwqnvwB9jLl1sWKz1MPqO5cuV8a5aWouplAxFZXZv0Qd0EXdqUdlpneC76lzd2eY8OYcUb88dRPtuWN3K3iHlkhtyyoxh4NwUhrxEUuz3DK9mIkmNu46PSXL4rMCJVky9Yx3xDZcbWfgZcOK+GoZZWJYKuPtxUUp0VmI4Ag3FG6mx7ZzmrXtHe+lIkT9FPsof6c/ynEMwQIQm8rjublMtV3wFtR3ykFeIt7yZjn41cBhgSzxtPEoEDMoeTi/gPuMtaOki2R2WomLDsZlrLyuOG3Zx7RRtkNRxHSqyZIkyxY2T1Ea4sqCdBXxKal+CX90TVCvcqKpZmThNsmCGquMo8sr7Eq5SB0PxzERYK0SzZ3wd0QryPlhuEYPC5hlQ9OJinUg1KtkewSxlfhh/Iiw+H4LCLhBMxlfTsYqw93XgLwusW8w2rbArhhMGV6ShxXcKX+kV1FXLTUFqmeqvsnlp9y+tO1dRgz3H9SwIK+TLHso7REEpOFyceUHMp3CIEuNVYw4uOF4j3Pu8PFg8JwqXKQrW2ZY1aTGVr7jM70nxmUwj5cwcaYekdkFafzFO5uUpWYFgZusQjrHiP3FSwyxEhwkDhdFtfETgXpddRWOonAxlQ5uXKlUGD56mXL6fERhTMotGZrECC1pBNsy9VeIjsaYGL+7BavEvdySpiSuL4upcJv1Hjqaly4xguBmZPQ3mYkFygS9Iu0QQXE2IhFQamB5hZkeiJMKKdu0CXraZY3vpFv4VK4uXEtP7QdA+xEOqixZBzXcaBWXu4yHqMWAVnUVbmUwA/MNdjHC/pyv3IbYcCECbxYM1Py5eKBnYj1KldJcyigooqZwca4uXygy1dR0Sj8HiImodzLOVhlqr9QxhxcuX1sZ+ABqYruUJ13DGX8pZZzZiIZ2TEU08Aq/UXzrNTjjX+p7HCcXEuBBqUcP1OpSUiHR2jNHZFlxgdPnLU9L9T0v1PS/U9L9cTdwmajLK197UIS4Z42gjcp8zFKq5d8k7AlVBY7ffLmFIqoLZWgecohbr8eb7mNl9iWN9fZaaDk3uI1mrs2hqnLCLeooRLnUy1vTqG/PQVaw8TN2+qoYGjoly/wBTK4vAVcrhVEpQttlGgPxNFccHmSlV09wv3CvOvMLYNymw9E6ahoIqivhqblcryThZFpVenUVefqCVmGX7bl+UPHUBp/rGMVDBeHjahiuLI7izKBDHBVcLLlKoLmZ9pgjlKlfC6V++U5OocPJ1tH+qBAp/Q6bkB7iBNsZcFc15ipvUuqb8SkYi4xWIKfkByMruExeXhjPyy07u5ZX+SbLdl5O0BYpwXOpnFzg5Iit1DDWYGIGAYp0lPBxfKcN5fEaqKt37zB5yX6ifp8BjqXcw+yX7tZgeE/qD+nP8pGd8CEqpuQLZVcUwd6w4Worf1NszKSpuYKXUMzp8sK40MVHdys8C5fZqJALBdEJeIwYuVLuaFe2OogyTwmLOEu5rARikPBBmqXzmaH9EU818S0UNq7lvzUXlc1DMoRfRAtaVdzVG5498k2TijFZgJycGIqDD3H4l2S3Mcy9n65j21nkMIF0yqeyeyeye2eFKIw3kwDWPbuXqDxcs3zCEIcVW66m2BLHIS2py2tMI3jT7SrjYxdbvz4mKh7wyw/8AJP1LAj7Y5VYvkiFyyt/iMh36MyjjPLEWh38BKgt9RFYs8z7eVAAeO4YdKBFwh1qENyygmzx/OnndNTfAURc+C+alFrxsh1Ompa4S4Fc1CPwOF1xLHqOuCCqxqZMiecp6r7tGKNOogIEk7rbE4SoMuX8w8FJby+ncCK7EQ3vgKe5tBOTfC4clxZUJUqpZ2m79RFzIwdE+ke1H6n1DCoi1nMCSraq9Ru+2EQUSYfcbJjyYswxHs354QK1/aJTGHCrFQK4blcsqLGXFuOufAv2yjuEYF/6kMuHtBaiEvTDFjMGhygK2MNcQQEbhjY+0ZKwmIR5rhiNi2O4krl4YIBnW+SXEaNvDNg5j/rF9cYfc+BDBnQLWdSyYvqX+OGX5d6hyyS7lVCgPMBUlkFnddyrgTbhnUCY7G9wlXGY4ufhVLxRK5cV7hjdxt8H4WBatep/QZqmuDjZB+Z5JNFRGh4GSUto9EV6fzH+58IH/ALqIhV7JZ/VkeyiWMjfxPCHxHKKoot1vijnbNKvBDH6PDNQZkSplLnoRaB8UIM93c/SOODAggK+XzK7qz1SWWUfHo0cgguaT7lqM27vcpbejI/MHVslGnicSwnFLJUtLYhXcx32yxs68s2uzxkYJF5n18y42X3M11Bpsmi1wsUNjqbhiLULZdB4jFTvhIc4ywr+ZbLlzCWf8N04izFKgcjTMsDiaiO4Y4pdEFNj0RXk8JPTf1F9kvp5jun4HY+/GdCdjM9fglThWHViOSoaRMDHAl/Cvgko5sgrNd5v4VJ7qyMdLauOMAwr8EFpdaIvBcMkFHo3wGGYktYZTc+hjZs/UMfAAZLlpqonCROL++DJHstiASomb9pUUvaWhulViH1Oi7JROwwqqRTR2S0cRIUf2EgUiUnXFfDBjbvx8Fl8ZAH9QWix0ZiG1+gTtPtcfZf3Aa3Cr0hqBbP8ADHj+YjpZuDgEb2zbqWJykqGOEmCT1i8sUOXwqd7+UEdP7TtQe4U6IIZvPhP4FzxE+4LEYQF5lt19koqbGIkOWnMbgVFFRb+DLl/BUiQpHjgjMJcERtTIQzWUeGs1OtmFpJxtlc64Je7QffRUtcU+4Urlb9xxIlf/ADuKuzQ5+oegXMDDDLga4HJDgzjhOJmjU6JMfg3ASWHDDkZitUlBX7xW4avqDcFVjCF42vBAL8LC0lxEZqoOUM0+vcQroj54uLlle/xP/PHqCchrbqWAL+mVAVNQAZ+BlihT7luE3HlLHmuTi4thFL9iJeieO2dmyL/6S7t95do+nBGYVO4qijxitKPM1jMBcorHweksatGJdt8o2i9S68jykL7wfRHAAmoyZ9hBjLhJ9P7juxlx8TC5kHceXgQJ38XgW8MLFd8ritcQqFqJNx5pBd4fqJa32j0MxR1CLHGW34iGjZuMG3FV8VxYVpibcsCoe5Wmi51txKgmMUvMWWo7YvwpTFuFPcxHSOEyPaqWi38iAUKryySzToaJaXukYSp09tBiLBD3AGZ5VHPwYZamTK5toXF9/wBRpv8AiWrWbDuLwxep+uc+1EuVaMRuZfrz/IcAKUvm550/MAI0hCb8EZcvgTNeoLgqHwEyM+Imyx5GuB5YEGUWXmKPf1xc0+dS4vAs5BajkRmadfBIEqK95xAtKmkDwjc1mD1KKhNlFXTiUltq8RSKv1LdQH71MOY/meH/ADPT/M9f8x2RGClBZ8whDmXnHBCDDggukZkOxoma4uWIgoexi3l4F/QgjsfUBCzPfW1pJjY2BYhVA7wxWdlpth4mQZv0J+6Kth7VrlailHZwLRqJu8InXXsyIkyY/VNxK10Wk/tizHXLphwijZUuvnvhCPx8qlHRhhGqdVGbbPREnP0J42yXUrBa+Gbuv1C3CuALvE2xLRK7mwbi1LxEzjXxGbqa2fyghp/X7itKfcoI05Wbgm8TMMIN4miua/4GTzYE3CZYGVcBAR+iAsqhqK0v0hubZ6hiWH2RRHiDhgUxXiv2kqfT5LrcHOoGzUZB5zDGd5EswlDuQGz8TeHMP4JcuRd4IHtMB3WcRyq+yZhvgIhGpLle8vpLNJUwO/UTKsQU8JTYfLPIedBcrPZM+iK/8cMsUtqMeFRjuMNFX+kwpVLC7j1LdLHURMVmJhWZVe7Q3KzAbaiuEJvzU6qj7lSoFMMqXB2vMZXITUXrUutvxBuHwdcF+mULbPlEwcTVrXcV7l1MOD41yGeRpE3Adf1XPGpfNRughIapgngnUlr4LqpoWBEfraFeoZqWnDEFHKeXys0ssQP/ALZKFDgqs8kFsCgMf3CCBwQ4C9EF6o9wQW35qU6A7F2chNKJfBshKzmZOGLs7dQTKfYeWVHmwKBxzQRq7VFX9SwHriofWkga+fwSiPik3I/+RLOlepTaiheyHoEz8sXyP1xfxOFkcVGD87qHdn/Eyu1+Y7JDPdS3YT0x2W+opjDixiJmj7PgES7iRVEkKqsioAwBOX3tLStky6ri3hyizjUJVOz51mVydcB4R2MZaljhS6hHsKfqJ4wxFVuH1MFZqYgwzPxkA510iqXZHLMouDsEwvdSpXF81ygYS3W4xncoTvBziaJl9EeLpxGn0aPKGx0S8yyRxCWJFrECAl3APf1u5tTThHxLmhvMWIysW4w4eWd/75UWIwFrKZSLpuA2zQQbekb+VBZ+ZtB9Rmxx3WJUguJrYNwlD2YHJtwZY7xyqdy0pPzPp+VdtS+znwQt5lfPAminaAdl+yYhEXXXqbRcS+Ll/Pc6d41y8Fay7MJiPxwDD4jiMplDhI6jZKO5+ZRhPC4o1GMepCvUx6mPUoy0Bsjxe4PUIEGsHFQJcOLgtiKs/ZJc17QRcmNCM7+Q4uXj4aVBEVGZtW2WuAEINeICW5h9dzHw41x35byZYlaidPgE221LRhkiCDIH2giCjRSfgx+n3QVxuWkBbi5p0xKc4jwR4YUN7htXFXAiweDfF8HARWzwzGUcPxfL6vuWcZJfFQ5uZi+Pg1D6vEHGIoElus/UX5XyMcMcLONcE8XYpYlp56ll5ZjwUtVLQylm+mMiWTsnq+GFG4FDtuX5eIhzqHZREageO44aZXwCnB/4wq30zRjJKJe5h88DU1ZlKEir6I8FxwOMqmEq7cZoi2PcQ0yVdjCbqH0DAtjX1HVcSjo9xNAaaUAMY9QPjl4qPDmal4jKPMd9Sqo15VfcQS/4OAz/AA85O0tagqA6a0zIhd3NXQxDhQWh0/mP8fIsw0g4WGZboE9lPuKNIVjqPyLpnoJiEPSUbvoidm9lHrhUuVD5kKtbQ2SDFEblD33HgJrcwib71HPG/gkDgGY+o79z0z6z6T6cXMvPAKgwlw5alyoXQgvki23DfNUL9ZMhVHUq48XLgmjLDVpTpAMVjT8oHBlMvPbE7yZ3LALO4X1B8DahILmNRNL5mD44GnV+ooJdynapQQCme/34ly44etWyDGe0Jc0iqoxOxn7mElQjxc34F1DjcriowYwlyvgqV8QrbG6Z6vN83F/LyWHFzFt49ks74uLLhnham4ITNQ4SPJVniF+ssYkupSWytkFMDx3GNArOuKoDxBgVzCiDUprIixLqEXVnFQxLhYJAY3WyUA+lS407S6Y0mpnxcu2Y1N/RKhwWxu64zvyhafmqSt0vJKQvSxWxu3m4JcQqYUqM/sSp7Jti5iVD3Kjw8EvDcA7/AFAa5+WBe4DKrnWe48Npn+sYT+UjmkbYRRiOwM9obqr4jhrhXuVoA/MMx4ZcJaydFxsrwxQAg9Q3KlQl8wFFUc3xUGoULZtXepjGX+Ii5ZkYNRzCVyMPkhqOJpDXualy4Fsa7XFU3wfOpbxAWp6EuL8DLIviG4uBuBDfFc9zS/EUuWXCMJZwRYlzpHpWOFgXGYLcEf8ANsVFlAHJ4h4t6TxEtpl1wxa7n9RK5x3K7RSuyUMg9vbMPsNzT6IgXrQf7SmhnTmXlj5Z/eXhbYHFTf4eOpRfziCjUOto+AeoCyp5TqpVc5alzK3mFeS4gxGOpgJ2lCJCZ9c9Q4ZVfAkIuIZQjDivDDhjr4AtmbK4eQ09vzSVMOKuam44bGaFut/fBKJhuFwBa6T8zKXMC6C4g5IFRFcYtgWuouz38IbXSjoH0hKti282mRqGi5lywC4vUbS1l6V+Ylf0jm3cSOIzeC+DYh/ByxjbiE4LS4n2y/GJ2G+4NrKKXKIt/BSnllhDqBSvlHkivOvAjWWdIVmFceo9zMxlxZlUZWIdht6jlmcVfcuon2tomHt2xg4afjxc/lJh0XKncG7TcomLOz6lMBiUyiW1XwqXC15Sob5zGKV/EyF75Ic6lX8AXK5vUI8MAbF5xBiAreZ9rEWDzR7n1JjiporiYCWtFY4C4zScV8l0zPEr44iYYpdoOIoaiRJUqVC7cTHTEBkaYagzOXbDgQm5UQVEHUYZ4eMqp4QaqdqZJ2RX/aDWkC7SL0m+X3MODvImZFBFAxYxpS6ChXlPAIb8wE/sgtV39cdGUX/J08EbKmON+I8sl6lVFfFQazThe44ri3hcrPwE0BKA/bqfxNSOgcV3NcUvGqlSq4s7VMxAPMXM57WoIAvikW9HiM9QqmDzXDxcuOSV8F4Nl5GMDne5lgc1Av8AHFQxN/DqLKeiBlCk4WdSgrWCVOGOKo98n2HiEfkRLfQO5YaT0swLUpKEPTG7Hhlhjv4CB4/uUIVfuM0zCMQrIxlxeHbgMkP4OQrqsQmIL6lzxQzepc7rh5IG0eCxzBVsHaOJaGQVX4fuWhrSXBrC8pL3AcN3Mu16w3AX0lppFXJ9TWhou4N+83A9AA44OY5osmaY8CLH4xZcf7kVs74iymYydohFUVZHGwryqBbI8ZRemIoPtFMW7iSeR+yaxvylmi5noHtOoHmYKngseJ/WTL0a6uSL0n2518FipseZRB3+nmOi5d9RKZVyqh/MALCOIcXEXhn5uKXmGGK98S5tAV8L5HUeHrc3pKl3qDmmbvAZKldbDRy/GoFshcNztAhR7hS+CAe+KLehlYebfKFje3maQXiPDLkih6I1b35Z/UpjtCM/uJZaCkwQAAPyfUTUX4ZjBH0mB5fljKyYdBV6Ui4RzgGb8XLXa8VCMsaqJp7xKYPd1AdKeidHy6fM08HXA1JHZ+EL3VNjg6ZY8QPgPKryeI4UA7m/EZsEmQb4wXSHyob1F1szH3AoD8yxmEx41Ijqs8XDLlzqBMeOT51wPbi4Ny6UjiDFhxdcVy+K4Msqam5cuOAbeu8N6hBCBeWYIx+SjYCtlJ35RLxU3y5+dy5aBYJhuLc2jk4HjhxwSofoS+CgY74pAlzI5uWrHFbb6fBKl1EsHKpbbqK4vshdvnBJLMV2QSnZ+iUwf2GXiu3GoWaP92nbiC2G5bF/9BGrwZrwH9YwENF7Ss0bnt3gj4KSuWpTKH5EaGYtai+mu87l83xfRqBWACU53OvmUN44ewl4N8YFG6yiOtPw7G4dpqEd39SJr+wyxVi280A+ZZo3MzP6mpTlzfDQHDmVw4VLZSrMxKmkqolfBJoN6lqdCeDmvEFQONkpj8TKwy55/M+yGbw2wvRK9pXvK9pXtF8ER/pExWCA+XklTsfMcqiVW4QhDKhDQzLmYjVxSWb4Jq8qE6lZmX1HUE2qm/mvgNrIdPwkCrv1FcNT2DxXNZgYmLIHKx+krqZoJQ1m8ESm8y3uUK9dO5l7Tc8MMYmq3YxzSuj3ytQblfBI4kbls9IaWNgVlOoiAFt0cLLl8oj1Lzc695EdB4c4orBgcEPLcbvLzfCQlcJXDuDxuGOR8IXbg/YjuFc/wxZshAtUOfqBK+IhCWzRB4GbuXzSmumWWNLfUfJdEFjnMT5FRR3uHNQ5GpU1LjBl8PG1am4isTqPKiOIsxDP0SoxRR4jNy+cWgmn7aBQree4soByYiO1t4WIR2S0FsLH/EyaNcKwGunTFNQ/D9R3GD2xqEqsaTpjBCAKXuLkrF/WO/RLI/uPqLIjciBuZMFwbi6skHqC2HgmbK5wyxzxUYNS4Qa5GuTc7NTOoOVXqW4h2uAw1x3CMcid03M7wZqFIGhvtB4ri3pjzOydwzwq5kzKLjMYdEq6KhTdpd8ahiumexRbeY3AJj1MqLHTeoqnuCxixtmLbNpkxQ38Vrcoyv1EgFnWZhSPfmHu6TaxrfKfE1CIw7KJQKH7l3wM3FkadEc0bYislMcAWsyDejXmHG3NEtsMKPFdOMh6eL+BCLmXJbzEf2Zm2tm0W/MyOD6YsCWdwIoh0w8sQaNRFbOxqHi+hDtuMwIY4JcWG+GE66ZYjDtw8HLU8uF6bTFFS/A6gqepW4A7izZLlUGgS2BjwQZtjUquWOy1Ooy/3E7Tu4VjnBhtKzFKCAYr9EPNjL3wPgwlqY1KOqZv4ABWukKlAKuFyGXMZXMyAPqY29yoOLm4ZRy/8PUu9zBmkWfg8vD8O5gtJj9UuGkjuVK4qbZ1GCY7Ri2XuGJRHs4fXBHjQK26/wC0FnUcj5jwAGf2I6ZegMRGp9oYfkAzwH64+paNBlov7RnAn2vUvmP3EVOE4Opd0QjGsaQL/l6TqhwI5M5Z1iUU09xZgTTcqwSqDPbLzwvGMQm8rgxmOV8VKS3FfBZfIga/MED1HOL8mNsw8wTyK7vxFmdSpk8IKcagwSqJhmUQzKrhcZfJiXMynvEZlancMoz3FrU3w8PO4txfuHIswm5HkxFLY6PEUBcoKKsCRXcWrYIG/gLly1olUwGoTI9oibPmdhftj+GY1tgnS4rFwcLcJXBNH1mH9RptZejqdYh+V7jnPNQ5G/jCZ22pjETPwuHbSyufAvX/AHimq2vcWDCgIEhyouqMdy+725dtFJio7cZln9BIjmyMNS6jCVxeKZW9Su92CxgAwxJWecDOrxGXLz2KzMFLqDF8J3HKbY9iokDMa5NyyWRrhVDfiYjdXlHsofcGRAoQ1i6qFeYaJpFnRC9zL2DVwWZxHOEpD2yqiUU7z4ri+KlEwOpUpl1U246DHmVoG5cERV23Msz4xLMxi/gfwD438iXiCHK/gZcXlEM2LxBepKeCJFKPUdhK53PvkicWioMtLLllR5uwnUJahw8aP9Rja0eZdsRK33PsFLM1HJfZN+g1LocHxJURybb3qLypgdp5BHgUUAerlZhmpH1HsvGFliJl2Sq99sZhB2V1PWza9xEh8I2fUbFHuMojm3viD8nBXxGpcTg48O4+QIegJiL54do8koJV1N/qGUyQVxUIsq518FuOklqUlJ0wVkr+YysP8fCuIF2PEsZp/rRGpmIVuPqe/E2GZpcW3mpUR4ig8FClxBnBZtwlUlAP5JfFS0eRgLp6HB/MEbAbhVgp8Tq/lXy1whBbqYtpdytO31HPKPE2KL9o1E2uV4qbTNWSYZ981UrvzUGVX9YhkbbuA80LT7I5Vlj1DC8dOSWImuDULengwPgTiC9soh4YyxRuDcTOIRafcMzfJhuUB9ZmpSVF+JUpq/cPpCrjXCv6mlQltFLVMU0FCoI8IUwMPXcoHcs4TK5cjoKY7zD1CvLxwyxrsZcIlLIzPWghmMtMFji6l3HgBgKu+lzAwvEX2JqM98VDgnkh2QtYipvhGWeo4RTBPJ+0vPCwlcX874XlJUdcMdyk2rhkk/jctBDQ0w5HzE7fArijcMsai4FrcQbjzdw2AvTrhl3Ewl2P+5Xl/CEb/XDILNJpWu47aV7iJdmMvVLuL2GvWvqIYLOlLm6RCm07qWX6Vbh7BPqT/HwsQxaqGmdhVMNw1cfSA3KiN5ITD/FvuW2DVOLl8ZCK1eV4qBzUuXBlWMAHY4BKlSo5M07CszH7uNcVylwnXNWzUNxJrEdx8xW0eQl4qY7KYdv0ua2j4FTMFO0FpyNR7u/BKJR1mJRTDF0YJqXyXHMobhL3LsHcS9dw5PSJMwkh9Lxf1x8HYGmIi9x1jvt68TQhO19ESHxSUBN33NRsGxHJQC1nh0WwyjT+PDCBVBpLAADypuVKth8BaXgYD9HJIbs+oPY4nscHw3ElDeoUXMGL90eyMx54LSO3hY5SahR+phg6LQlxmdtmdEDeiBL+c3Ki1qXzcuHGEHJLkthYbLJYWEVAMW/qW5N+gI+YHuAgY7vcb5O33KqUVmVMBL12alRhGam0sHiUvEGjM7yKo7naFlxjtU/uQie5UH8JTAsElfbxHFok6Ce7RJ4Rk3SwoenbMH4MvQKYpUrlIcvKS+DhjEjw4hay48dzE+hjh9YC0f1JQLnjPURKuwniOHm5cWEuP2mgHuZUx9x2MuRxDI9hUy9fcA2/qYJAL/iXsqPv/wBwpwmbNYiBzViCdS7wufT31/uANH5f7YzWfXUv2sAPMZCJT3HXkJrWFNLRUPxDLQUztJjOR3NKRowy9llVRkhfjwqZki8wY2mLzD9snkiF+nU1PcBQHbdMrjTGJEhC0iiObdpP8pbJ0eH65r4MubjqBwVa0wPMFImRqOtcn4EelPRDGggDq1P6+Lvh5fAFYzwbJGjBDKb8nyULFn6QkI8lFygk3v8ASH/ALuWcXC2fIsw3wrwJYGGjcOS4MJksxGOE0K9Q0duaZSz4Cte5buB3HL9H1K4SHLAXNYUTJmOY9/RX5xYMU5GwLZh6nFRaW3WCXHuB2eIESFS0vowm3gBdwlzwRLl6lD6yihv2ck8oIhgL+kuq11FB4VSGlwSsJYsn3q+TB4pLq5db3xcuDUpu3+JUDkTFRtwMXk4ZgnY5CXrGM2m0uXNWeImfwXE3nhhYywQAMVoe4mn6IqycJK4JQRirjdtwh3K2L+IFQ0TaLxshYrG8ZI56Z9S3vXvPDDhJT20hb/5GVKjvh4YsZhMGzD5mTd5cx1HqD+iAXOCNcYEu2eHLGiLO4IpvvgoTaDyLD9R7q8sAunsiciP8RrTf3EwulCu417f1MCdZOyJtsaff/My1DZKMFJxEcVBaZcmoitv8vDD6iErpIwDUD9pcNn9tSy44I6Zj+v8AmGwcwJStEgUYXUreIJaC7hEcFxGSrpI82llNl9xOOyy0UmXmDT8aUxNgdfc1slWsvcfEvmI2MzdVntPU6z05j/rhxBl8MqEeXpM2bYonc/8AZmHn65QCxgxg3TFuy2xiYVwrTu/jUrmu4EvLpjhSBeZdhiZjLi5lXzfA4Wkz/WDOqXqxgZbnmp5mhLee0tDfxAIRDkH0snfKg3CBD5tKCb0JTV+oDiQVwJK1rtmJjkAiR1Dk+ToZVNQbBssGYYXrIvUs/UyeXdkGR+0zqr9QBfflpKCxGpuC28UTJyhCrLghwtS+AwFI7LD5U0riDlIJall4SzJUri+MvUAML/MWpKjwK1asSqBvm6tWyg5qYiOoRlRxBzwwJod3Fl2PXL5lSo6mFUaExgtnmCJKkVteDAYPmXPj3AnuavhoERUFsa95W23kVXuVL+LM0cvZB4d+GNL7+Ky/+Bi8sHauowzSjcUy7n6LhV5fUAqVjuDfFcYZlcizsj9mPDuKvJCksZmxPXwYpFys3K4DCtC0k3AXFnjHIlkga+3theIlVvcVsYxAEWsx/AjhedQGZ8QVBLA/eWFP5P6lx19FQUdIGjGHyVUS5dv/AKRVwp4NRfIV1cycjGh/ERueLyf8RaasClT43Bmy2ZpDPVLXWbPb0Qgbq1gb08Mvi24xpMIVgihayHP2IkPgsObGBuJfC1yMAg1UXeJXi/MTmOxWZmx4xCBwZgIrLzNWQPATBcF9faWwuAlmInZIxeDBjDgOzUtbuVV76l8emIwBQEW7QpDKqmI9TPcnuT3IeDQe4s4i4WeJbgQJUSwOCgC2G4XkSIqYINVrL9t+7O+PJ5lb6HH1Dg+RshBzyBlg1l26hDkXnylJZlA4Zaq6I74tbXa6Zcl3HMdA2wVBRupc8BjmPECGYsYHHfEIU+oB19naAGLsC5iDpnbl0fiXYYSWpV3cUNt884q0Wu2eSBXG54Qwzud1AS1yuWDk0z7WXGbTXHXLNsOge4b9BcZq02vFysxT6uK+GegHmLQxQUcdtVFFVHo6iq9sW4cL+sJWYtQeUlcCi9vg8VwwPg81wpQ0n9/JMYWPeY47RVcqjDhbfxHZVNZSL4FdymnpcZE2wFMM87vj0xRMNRT/ALRdZL2KI26cO7eLvU2HIuK98IIRqGjFxd8YYlXt4dz/AA/54s8efykZai0jl7lHA+Pf5lsQTanB+Z5BjTmIUJfpMkR1o9Uhs1bbV6hO549+yZl2ozlrzaS8ns6/cz1jFPZCqb2FpS3R60VD/n6WfuObZWeGHFlo7ihYMJ3GVfAJdT1jKUkjyJeSyf3dhslIvBeWYWHpK9sywQ12xArg5iGWPFh9yjYVNIzuER9E2lwh5+yPai6lwOIweNMJ0T0u5cvpPa/c979z3v3Pe/cxizFFE6aYTGPUdvGLzkqgMYtqWNaeCGx/cbxZWPRVb+YNTEzDuw54Q4qHOtxiANscMWLziVbHKfE80NYle2y9kV/tfwvFchIDYazwxMUdL1GNuGO2YLVK5sYLhsu/RAKHkVM7djyTPiLyxBNdg/8Acxw2dolcd83ACqipU9u41zLXC1FbHi6l2F4fhUuLenHQ04EodzHAmM4Ug2K+5V1w8Vuwpl4PLpw8MqVM/W4fK7sXiaJD6ODqVDfBaRxVs1Dl4YdhKVe+D/jX4PgXKHqY+o9x4qtTOXJKS8czklRIcFai8xi0vXqYRAu0i7apkrSy13DxB48xY0n3PrnSKow5JnEbzXZib0aqYeFLYDHAVHDXB3wq9ILwRUFLUQ+T0euAl5mv48Vt4tJ7hr73HB4CX1dC5UaUuo1oZLj/AHTeJN/Yr8jDkzaKZCBqV8cMwxGcXuWsEIWG3liHU2Q2x1fa0RJQuzfpwf14DEFIJPqPmGl70oWEpoafgw1dEzK7YMerbHiEYNSPZDpK4AbTxYGAZlTcgeSh8QxMHNcIvEeCk/QnmxKq3O48GpFgxJUqVKjqO4bmb13LimoAW8rEsMBglkUbN/UcjR6l0umE9tuiBZLzFa8vC1LFAYvuY6+LHFeWW8mJSsL5MOS7gEMrUTiQ6GW5KZvhYPwWHMUNFYy7CKz6fAyKOsS+cUuQgNT8I30LGVKy0bBDa3UeFK5CMwZRX3gzCdxeOEhzO4y8xwp6SqflpbVl1L4oCtwWuUx34MCzyiN0R+WvEbuAq0SwwgRgtqNkKo4HYuWMM8rS8RLV/wADCWPPplH8mVEVNrYYGPCVEMWpX6Mq1n0JhMfuL246PC5cqOIsH8hURkq9Hgglp9J1tReHYhpURTz69pcVhzL5dAdxXPlt8S52p9y3dgAK6Xc7k+BZPPkUVX4m4D9RgNF3Aajxo8yxCz1Nmls4mcF99+olEEoIP0J2o+DB0cMeHP0I+4rbjxyzDX68KGBJYe1QyGo9iz0LFsJBw4mAJ/TiXYSsXCMBUCwp0kwkXJ5CBwp3CDUuje6i7jL1mY4aTv8Agl0tTIURgXJkxYf9JdRc6ytmoukLmnngVhI7CkjyCw1uIuIhWV3yGaJS3g6Ji0f8TwlrrVFNR5Jh9o5lR+NcCBCYmJiYmXcXEwVFs0G2X4wHDBUqDMzTw1vJcYGsavuMuXZMeaU/PMqHwb6wPtZnRgsO5uI6hXJca3V31PD1bKzUKamw4HMxVSuAWcX+0FJXGuMfulqsfUFcwSwXzSE9yrUO04/xCk+GB2/wAi2DJwE1Hh4VNTrxAZn8RFTKp418G+FdfXJHi56OK7bl/LSMy4/JbZcHzkgg6jaMcbdRm3wuMCMJgMard3B4vi/gCWAlIJgVxa8QFGCPGj1UDjcoblkGEswdqWDXr/NElcMPIohCAHaxjLpnWp7gHdaZLeYabhLxPOYq2+kxKmyjTUYZ17jiHHfRIZoadm35jnMqDzK7RcNxhzUfUHdTqMcALvEZiv5zcY0Ouy/CDCI6YxlRlqz79Rcrd7Fxyn7mYPtAjkhqf451wb+//UCsyzB7DE9dwez1fUPSx9UW69UIbNw+mMajYXBGHfCXDmbHhcW8KLIdy/oKsYOsN51MVAVh/iWi+GpV9LL6QLK6ij6hIDv8xLU7m2VkBt+o2u4genw1BG2xv51yTY5sQY+BiEMsqIy/Tq+HEotM7XBRWsQoyNvuK08nNcdKzG7qHCInVsvUsrEEinfIhKj2DLFEyIcz6jI70eIvBAlG0uP6G+C5U8HuUGusJY6l6rqW8TphvG0YJFmDKHpGiEHTE17lTxfKVJWYuz7ilszFHUI/Ila9TKjfCoEJjkDGSKLqNO1RjI3iRSXxGhcEtUkPGfZJUvSxRxM4AVr/AIiNovX/AAgy5YRjle5g95bBlbjUqBXDHE3ArgwXxEEx7MylfC+MPtqekni4wn8vwqEWJYGgjE4D4jBGESBElZgcm5YBfuV3lOiprd0llT7E9Jnp4kFkQRT5tTK/f271HSfEkGVGz9cpUef5gziC6YY3C5izyF3YAG8vKmQtLhdnUwAnS4haU3kZSjo7lTtfwnqXzFzVRkJO0NQTAoK8Z1Lp5Y6iqHA2XICy9x9n8eIdiCFrMMyauwQOOgkdcAXaUR/U/dBPaPZK7GXC8zsmcvpZb2KfEWvOFjsizqEbRn/Uap9HLg+zCHW2oWDsDUu7BuPM67dH9IzmyebWzwxg7PXB8Kl+JLldogVobMII3swgSxK/mVKYUNIYAEa6jw1LUZJ4mWluX+uI01CzHUw2qEy74vXxsxZK+L/4bo6FwZouuGXR7mXBa/cuOZkjv6IQhaYPiZD5+CovYWe/Pfnv/wAT3/4jmYisE/UxPcs3tYz3h2cBwIMJa13KLOMbjZwmAO3zMGXwZi2qJn0rNOI5QQ8Cz0oxJmCvZAAGYl7xIpYU3MZU+jcZuztnnT1LgW60eZZHZPO4nQYlYiNyaiMslvMF2lWy5plR58ecazwL49JNwFE/UL7AO5osF/sl2sf5mbaL8xLwDeJXoWsMJAw8O5S28aEchhu7WXA7+BXxfFcMQ8XBADUdQ43j4P8AIRDX+Cy8RzNQjEOiLVQ4YRKhbAWouV8TG5GVK5KX6m2ILvxDPzXiibq4IWmX3MnBbHjgWjUbN3LhKhF5+I13G2Vors0EsVHaxHavZGPDiXMOohBdpVwU+2sRa+THP1/BgpLN7h/qNDu4A/zndyXZmot/ytmTwi7MZolvmWsVPJLl3RrfiDc08EUaYyIwMbhALpghLP4oNlmsXco1ek6jP3P9R9kbYx4ObSuU4/zFA7HgSlsziJZbrZUop3HKbZpCoyJsZJ4gl2cGYLwtnuHMzwpkqbX/AA2CO3K38jqVbMSvrjO/sdxHqrU8F5pML6pF/uEK1aH6Swvn4iIcAP5Kf0NlPuX+3nSCImcekU6gY8gXX1DJh0iXCl59ytR/KI7b6gmMGTuEeSx8CdpPZjAqLwcV8UM7YjeErECyL/z/AHMyO6KxdwTqWAGYkbx9xBgN5/iYg7M3BTU/pjas1BjanT5I2keuEDYzGUGfj/0jHlioeivcXiaBYiOKD7hwS6g3+W+peAq4NDMoEqaji4vbLhLBtgGjoEWIJPJKZtGDtL1kHxGLyMTYbbjADKhP8TAZtLK2LVeWBTakcbwSzDUeDc3vqXLgwZenFxw1qXL43gcdS3zcWWGCxcQmaPuAwUUnmbsFLR6j4V+u4EUfJgyIPpDcAC5NxcMjWtqaxKYzqHF83UGYF8uOk0lw4q+TVe9yx+BJUrg4eg+IzcEtGXxDMh07lsx2PZNfAXZOp4hHk4cQZvHDTCvcsDXxZc3wGuXJ4IJVAvUIV2B25suMqVzfl1HLxbhoGW6JRoNGI32mSqyOS8PHcdleiQ30Va7gx5HXAlxYPFzJQwp2xeQd+IsMU/TGa/3GYSoZmZaukU9y74qs6lA8vLLn/XzSU/FiNEuu0YAvg2JTrRgU2BnuXVLc3DpJsj7gTIxHgZtP8fDGELqv1NeKWaIIwiz/ALY0a0Ff3MTmipeJVFZZRLz+VMK/Jyx7v2iM7Y4q8PuUZYv+WffppJPUKMB15hBHh1giuiNjGTdGjBJNmXh+46H4tuXtvcH1nZy4GiBER3KT2DPsijfWIJ1mPgNWaM10mDmIS79EFe3j3CUMZGYC9Qa0qGdjNcv6pwPFc38HH9pUogkUvbHsitMM/ZMgL/JEfwpmV3hcVufAOiX7+AofURWT6jrSPVg64X3P52WSrgFiNM0crnE/zPd/7+57v/f3Pd/7+57v/f3KcIfSgo4U6JjRgQivEZqs49EbmO+R4GlCxff/AGS9tuEab8ovdUVKA3idqjDidtAEUfrCKLe1eZhXQCpbhn3Fj1Sz4dcJA4NxwxZgDZhiqKVP3LhNRbicDERqoTz4/E06XFohgMfumF5wz6dhn7/vctKMkwrepiy4Z+FZ5fDp6jeiiOzxHUYcZyGmzTLEvf8AHwXhRxLhNnabDcqiCDOahAGpf+zL6iDB5Fo+oKPlJO+8g5Xrx9y/Mp1znVy+2JUMFsaZVXv4JKqC5czwlcDi4opcDthuVS1xSvPGBXyoKAZiG/hcOFWNRK4vHFk5io6+kuYd4fWLdrQKn6KGSgl+zFw/MzgfpgQlRhxskbS6g3LqPIz7ZdT7N+EIRZlwYrZfCsrCDIX+WO7ZuVDsz/qZLKWaEfLuLmYYYKWRvPylHudz/Dwzae1+odME5qdtprxMFdz3bfqEOTPzH+jhDA3NDDwEK2epgq1j1lMELpmfLuYKALddW++F0ZoOlRWcHdP6jAwdmpZzE/IF+4KuA7joIwu1vDDZiUxSao1Aoo7zY0qibhpmEdDrgUx3Ll99nliQ+F8O+c+pYeJgWxYT6WGdrKmGUQuzSxrrxcXgKKiUx2phVSlAqth0iWf6xMf9aAbXL+ZfzL+ZfzBmUvuFvqXtDXBSI13IK67lNHbWYSZzdPcbPXRLxlaU93BMHEe2BnmCNpZV+pUI3xUMUtm2ZVVPZBVWwzbJU7ZSzyiXKNZZWVct6zEvLCXbwcM8GfjcJxlEjuyCg1AqMLHlixRseA4vi6mPtKBLB3Ko/G9zBm7DZGKmXiaOMwGGD23fUOeGuNS5fwqvEuXphOCowJlRlAFxVvK0y+XcIRWyoEA2V/eoXfLf7TLo71MCnt7rohiqVi4ZX5FCKa9HoihyeUrH/Bi2wawhjMtYtrwwJ0x9+b4qJpmLZFkijSAOy/EtcXBLTEUJditOXMPxD93Y8xCqLR2lSoGbuKALGU9j+SBHy4XiuXf9ZVykjwx4EiKqaPcdRikc/XK4vlImAyuBuKxTwQW7Hhin9Zp99IuL4ID2YneElOqvECqYew/UttGMFN1/3FbMZf2jxArHZjzMdn6m9b9zHWRjTO1EVxSbIaPx/wA8VMWVB70lIf6U2gH+JmgBllWKwy6uDDlSm9ylZn29Of8Ac7ugwkHN2sY6NlF7rUbfbB4hwwOElYPT3BUIfUhjrD5PcdDdaTs88Q/pMGHGLLg1CY/AH98II2TGfJjqXFKM4KfgvhOHYvXAW/mBwcQwoDqLwLMvxJ8IoCRkUN6iMPXFfAEPNBK7oMyxAj0DqCm9FoPBDL+UuI930T7frPt+s+36z7frPZGrjiXCEUNrKcRAUDHc+g1mGY5ZhiCWEJ3o2vUFBH8B+JsPxEliInufjJG4PEFWJRn7Z7jsltyiUZh+ZcNYlnKweGO2mYPwThLL+IkHKQn3VRri8wzwwxKmu4lyX78iFsZZmWgVm0NzrESLOpXbp5WpuBH4sU3eLhwM8XGX86gJP2lyht9R9csp3LuVcqA3TA+Y7j/Y7h34wS/cq7rBqPKhYzuCA/eZSUeHzDdtD8S7lS0rARYoiYJfFcPk5eM2O6TvyUoIMWptkgLLf3EQPYS1Y2puKpQAA8kYB9xUttssq6Eq5dM2xGaA3jOUDBjQfsm8fDD+5ZewVpCbFhYBH3wTFl4Ijfm/cGoUIMvT+ZcjAwRIRXW4h1GO/tFqX+j4JyTb4VKovjD0lgjoz5MiGskrjAZ+ksigOedt8Eeo+uD1qPkmE3ziyyYPqMXCwDOzZ6S2OcMzeozsNZo0S3bUgrsww5r6QgIUoi3+DzLKnEJuRmjhLuXMQvoQLTdQBdI3Sgatl8sOFNKSYFrsHfwVK2klfp1EX/0J0e/gJ16n1PMhHpJRH1BlCsdzpFj/AOB5mOB+LhK4WNnCpXKSpQjug1/Q8RbZicBTxVuzxD7zqbTXM9++XiyPibwKFsw1ZxmZif8ACVtw/wCBrMFCVyVBOn3F5I4K5Ud0jYeeav8AKFZaDMyFgjBwYFNkC4DYeCWJgBh3LhFjZYuXnhlw5dC5ZdopU8sIi8niM15D2x3pBUYUJU18aDfjZ5lVPxIGU6gqDhLhmvhyXNQ4eKU8CLbGMIQoafvg3HcdQ9wsozE2MTcdTaVBVj3LZVenoLlID4ybWDc/G2x6/wAw6PpEq3crAofmI2ehlQX+eVxZnlKpbV6uOjYbncsB5ZT1m7KfEufdXD1Jhn3JRkh0eYr3R4OJXzhxFmv3Ltst5lpcD7isW4h22/0+HviCqBhWP3FKH4lRqAe+kl6WHgjeRe5RMqAoHuXA3iE2yP5jgVmkizX8Jsr6iFBPCJfSDV032mYQVfoSkWxC7IfwQ+A5v4hIPW1FF/yRyhPnuBJx7RDJFAUDsbYFYypmI/7TviuNxbpjO7Pv3FC/i/8AM2UHT1MYsdTsJV/mUdH7mHMf9JP5aCV/AKz0sjDyJ/iKW8Lupj0PcP0QZhEiAoSxg/mVW9ROTLgcVLBeD4F5FiIr7hwmLjXxXqVxWZUdAnS+EUDvcqLq1Fmh0epQe3OYDbzEdH5EzxZ6hY49uialj8qNsw5uXwISyCwoW6ht3ZGSXCVBekdeYcIzqAVvu0uAX7GuFfOxQihCJVjmEW4fzCmiFTmfXEwR3RMwR/bVBHnKiWcOsUv+PMvj9+Mrs0y56hOtMFhIRhuVE5efsOalYJcK/DGLoWYQOm629z+kqHxrMZCdQg+Rrwy52mVmZDE/JFmmNyuL4YcVCLfFDcRXhLCaSE09xhDwjlhM53NYT9QGq8T+LxZqeF7gvm5utGY7l9AiBcuYt7lhvUEKGkwVBhTZPx44qOv2qXMn7hC9nqYR/wBUrRR8yhXrDc6UXaO0ixZPE8lgyqg6dCKcr4sh3nPZK5P9HESO4HCy9KIbPlqUZj7hq6e9w1Cm8QfmVSABZCzAdQzN6iO9EHiN5X7zEt6quBqPVb41r6helLQi37lEC1dAlJmXm9BCqLCdEUX+jUDYZeI0+r4VCMfjcYuKRp9TCGGTsilBOquY1W70Tr7VVtJW1rK8MWblWDud6v6ilbTDTKFXbgwdbXh6g46/jKYFS1VEPmg+YP3IY6bLKI5UCkLsjLf+8kvFt9XzUsVg/qGUMQzU3KqXDmger5uE3e8Zmw7vcfPYT8EfOrdeIJ2iV2S4MrHoE4NUMyoxKxB3lh+kcS1/uWRQwdg+yUKD0VFfTbIjDvm+WEqjrPML1q1VGh2deUVSkgtqXo8YjVDddG+AUgs8x/YiEv2hzFJUHtz7c+3PtzjFxMhEdXcCa8DFXEKoI+BiUZuo/HueiUKf6lXRUevv1PBn9pXPFMtPWu628SnfSosr9IlNTUQK74Cj1qT418bleGbUJvxvECFEY3uU7/uGoaGian8pVfA4IXbCYiDDl6ShmG17jN14fjcvihK1pKGoq4iid7vBNvN2lYwO4yAgZgWiige8wXbC2UxIoCuhEuBBQwBtgwyCH7/mbIhhjN9rqDKTwxnqDqcGmb9QwjMDpTXlD65AdR01sNpWd3ADJ+lL+O73KQGjaHkmwfT2jDjUZ/REpcLKMyjP3IicdwmciU/8D2OieYBDQsDFgMBLuHSOKNLuNVy8o1hpx6m9TC2FW/VyuC25W4+F8EfgPgsHMGBu7ZuVDguMYHDGI9FbU8fXYeD8zKL3O0rV+SFBKPEqF89B/wAS1bLjEuM1gNjpmXE76P8AEzw6rv8AMMNVpP5n4WmH+0zsosufzkcskuIcCkFpmHTyfn/5OuJU3Zi/jEqUpKlcWYS1lcDQvWpcHCcWvqiuocPt/ULRH1FXvhISwdptFl8VyNNzQchdEQB3HR62e4g11r6m1YLzK5Zn4dWVErY3iEZ7AHhlhdqIxUKFRFBuZuUuFGov1Ll/8AmNcVA4w4gVpVVGWTTq5jksyCeawkJLTfiZUoro+GMS6mC5mLWpX541Lqu6wY1sKB3wERYeMx1BBDENQM6+QQK3Ep+C6zZ7+I9mPEH8uLl3ElSuHMCULKXYi9NmZkurlqqhRx8GESa4xOyVbMAdv4isxmKSCtl9I0FeZTxX3A1m29H1MHVxGgAViVb3M0TCBQS27cJbganUVs1KiYyD3BZwQPM14E7oGf3O4LEocJb9QnazajHH9BKWrUpZ23AD/oJtLf4I3msTPKEWWwL1MDgX4mH2fBalu6mKFG5fN04lDbl9ythgRar47iWrueoGO6YZgfEheJXgjX16mOwdJHVQ6XUBxpLaN+ZRWz6ngmdqd3N4e4NxQygpVceZM6y71KMfxoZgtXwEBWLDs1LDuQbQQcJwQb/sUpvVzvN9FQsaYezE4FJZ2tMDtlmlZLNYIsZUeHS98qz46BWMzloWNmYOhqgHpeS7HifyEMMUhykVyfSCFdJe0S2U7JRy3gffAbQlyxw78ZJGBBnXXNR2YL8iaDizEqrL5YR/ILKtlVw8LCKrGoDzDfuGKrbGZUUuV1WeJhtV6Y7n51FLOIThH/Do7TaYuYqYWlm9fBeC0e5cuXL+UKhCBNdR5SreZ2QgukVG9KhMLm0b+oN5JbFVx/yRHA0HU8iuJZ3zmdnUSpwylyXGdCcTSny3cWyPA8OmPC+LpmEI8EealVxcEnf8U0zOJnfMySM98zaeMTUHhJXDwJ1D/uBDHT9ISjYn0IIFm73OjqVCNoxsTNAfc0Z4NtiVMaTaIAWsoavgbYCruBNSlcuZGnLUqZ54ZXDLaLbQ/iBI8wC9h+4t21wNNxG4anYswGoXRiKNFAnzHfOublhe5eqcncZcvhJqFfU7FvuXvcvw/TFrzCyoxJD0p5m5x8QDYqWsZjBlBJeOmFCqfcsxv6nSCrMNSzxpqbama4vhO+mGbFTveJY2i/hW7Rtbe7iCjqHnxF5eK0QZLMK0hpDt3WuoxMx4Lm9MPwOhenDBSOGLwx4ZsscvB3MyM1bqBaVUoK1PYssSVaWFSNUDFcLzwIITaXHc566gFAWLthVg0LLL8Gh6SXp8A7l71yFyYIThmLHVnWcCRw9xzIR957GAYvzDS98MOFA+FzWvgy8w4Lryxn0CuKn27cZdjkPzHFQ50RYW1HqfuPI3WIeIj9xJUqVK4+nBcCbQ4GoS1K5YbQqw19QMxQQT0zMoeo71KD1mUUdjL4um4/zy4tZ/eS4fHrhgcMGXZykuMOpcUFhrm5gP08VxlP8A6EVcIPTTlpFiXA+NQLjl4PmL3OnuWMMeMvEH1otMycXBqUW8rcuC4jNwSt9I9bWlVZqznrKQ110EdFz108XVT21XUte+XWRNkvdMUW6Cy5fDWvUVPFbc08fLiasDxHc6WzmuFc9y+/2cVA4uMqHJoIlspKtXiL88OPtw3NTMyOXp11Fr74YNZg4Kos/54nJK/RElQ53AvsxuBdW7mQjweGpNG1epYCRBqNxZXPKQlv6EvbWIeHcHZeCXi+o/zEof3GMeBblOrGri0p/pFEp6PMeXIZgaDtA/hL+1EEL2/E9MsOEhCbEZUZGMA8xO1XzMI9qrYWQNjvzxPJmU6wZpB3q5RHGYjx5QWpbC0IaunqVkLZVBoQK9blz9J5TESeWMh6gp8LBjA5ArcjR9y4JX3wvBsSoTESV8DC3BBGrgm27wMscPqIXp2dnwYquEMvztBB5iG/gNXBbGpWSXqW/FfBAbqBlLcbpAY1idMrnAxVQj4R8T4vAxKhbi9PwWmVxZ3X3G9fQhh0kWZQwxXQoXCxDp5iK4RqHDzUZ+9LunhjAqfRTWjMv++ZchwopGsPFnUXbk9VC4J5anjxVIQHu2BgVN+5hbDF6pKGUN0Wwrms9Ts4FiLb02JLlccC6jyTL5bJSb7eiXGALttQdRG3v8Q+43c1xfPevhjpEvlcP+BhBYgcVDBKR8pm8JGVrWeGcVcByT+Nwc1fdT/JJtMqZ1EFBNV3KRplcBAtUXuuMNYPmdiW+GIQtrFmziF4rJF/Djc8+UVgU8MNwuDziKJ0t9mXJKeNJY1r1FCgKH7mtLveyWS7oX9ds84lwq7mmKDocSEJtK4WbMr8zqlOq7guFOCWIPg6A3dsx6vw4mkAxA/UzfGpztl68cswZWZHYddRTXctcvcuOZVcErgV4FoxczZwri+DgLlD3GuuQVYnqY1Tzcpr8j3KXeLfCVTmW6xKvNyzgfFzSBmDgQ4EID8IvtJ2Fqmra+FR6Jc3BpxMro3MJcJ3DR3xZUYR4XfFxlwzzUqXSodNk3cFVqUOdRKajgizXGsbhRoyPqVC0g9gdkseIN3j1KWLpLlJtbMm+mXvi4sOTcwhqBS8S4LQuEnB5lqVTxAde98Vni4wTDBkPMystZQKfDfOj7Itly8y6DKSxQrphhtW4pZDiQ9RtR2VVxALXgYvqblRnUDGEe37fEr6t3RLXcstxmkfcrdfufzw8GZl3aVLBbZJrZvVJbWlEMNRrr5sJ1K5vEC5vqLTwxlLLs4DM0jyRfo4DBi0FsuNJVc9wgin1LPtmMIOgjuAqgti9N+ZcH1DqUdbhtOKss3xhNQjS6s1M+HkmnKuFiSst5V3W6J0MAsTcKosyrF1/mbXHZFkzf4i8ZL9MukjLSqeJCE3hAMHIBFSleiIj+RDaEcHJOBqW8x0MaS4IiUqaruK144WDGEOwbttMt8P7QC8v6TFsNhXcZUV6hKvhXGQIhp64qHDLlUTS4HSY7Rwxia5qB/Lgif7cqHTee5iWV3PTi+Lly5cvgGDcOBwcDEWptDPEcDqp5Fnrg2JdsSagw0/RN78zTi1Lg55SVXCXNQYwjCXzuFVot7mLwNbZQAevMOWTeSUU6IxmjF2JrHi5wVqRQ9xI+7gOjntKHj7hICClPRiEPu8MIOkpPhXFF4MssUdMyVwNwrr6PMvjjvZI/HWO2ag4MsFzDEJgBoOMrRKAbWl19xPKl5uMAuRmBGFajFdowd4RrhXhyy9juKGJ06RsxMqzAqWVjXiNNi9QU5PpO4D7g6oqVcqXbH/pqJap+Y1fttNwBgl4CxxCm8Tbg9RxqyV2a+d8VyxYPC6lmYE1GXxe3HfgMkP4I83Ym+KlOXUFbXAlOHuYfQQPuouq2P3L2RxglRSDLMfNvcVrmD5jBpgAxdJ4inuLxhO4/+QLQ8zV1Qh2wDPH0MzWG5/hhF4yB7Yqm1uA07eIaQ9ygAav9CHAOGxOoRBNiy2pfNBMqyPgDs48yualcVJOIIeIIrfDyHFjW67ZDUV3Zs9Rscy5p9oIsVglmJvb4MNW/r4KjylIv0QI5Krpl/G4RHTaxK/0TO6bqEodBfpFmn6hA3Tvh+J7xPvPvPvPvxdcBw64ENwigwDTGQHc122fc/BZTcxbzPBwxW0qEQE2R2PslDVVAzKh8TLlcGZXwHAq38TpXAh2ICUz1NOZJvP2CeIuDflHbg1QxuguYAngIV3An7piDFX44Ee5lrkSK09vkcFXsjVX8YB+hcaS4Rcwz5lemU7hwNXfiCaai8D9yt0z7gioX3MAECUWcpdxoi8YVukIlXLvgl71cRB3FzFMbZc+LyJcqKWkvcJ5LZcuyOXhV6NsXC/7Ev5pUdflnt5RzG5Yw1QUtkm7JahiDld818VUqBNSoOiYRRjO58NuT+qJKmHxrSrTHjx/3MRTu8RD1tUVMOWq3bw/KFHChMnsXlLecviO4GgeIUK29VL23c5mH6NDEi8C0l/clmoemCx/iNBvPDuE30VFAdGuGWeU3pD7vkIqMlTHt8w2Bi6w8DAiWVBDUbgauBqocVD4cT1Bwy/gBF8MdypqPpgQV98+pjNo4X8MRbvUytvvqxQHq6l2v3EZpF4YSmfuesIsOHXsW4hBphSAKfiC1WEmIKHB3CJjSRLd0t4v4MI8MD3BhJW9Q9tR7ZW7AiwtfuKVAHzKhumuNKg6r4g5dDgTSuoQneYqimLb1G13wTcOGVdxNiw5rewMwN/A+DCMSXNvBYb4ZfAjcfiZZno1m6mNGWMmSWWa7XiAI/Z4jTcvM80YwG4c4jN3Fxq5mR25hd/PFQVf4l3nD4XDttdCJHKVLV+JGDg6haA7/ABIrcOYKOJly5Z2clyx9suW5Mxmw9xM80qiAurW2OYHFw+gh7zDl60vctYZ8ssmjhXcyHjKgxQDFEWLgc9C6g2Lsj2lsrfcPAo4t5YS+JT+XwYqLjqG6rFgdyq4hHaow3P5QIwP+YcuQdkVWOp9j5Fo8AJvMs6zKlS19Sry/MFbQohjO5aqsz2pmntx+vDcn8aMPkFw8BaERgaRl8rgsjDFVuXlGwltkbXkGQr3EwJlGtQt7kYG5/wDAmTH3gjK3Vi0MritijFUv0JHgEFfof74J/NTJFCaJDXhnnp+5nvyiUDkiWX0d3/8AJmWF7YFhydM2lTJL/DSo3pLwy4vDCZYJoGV74FMviBBtSoprLWEZXF1DMcvCjjctRXqMU8FI9CB7TxmMtG7Iwym4Q3W5ZUqU8WmTqVsDlYTzhMHVHAcKpV+SWZh3KjDgBuWIqK62pfzFPFvMBKU9zsqfEBWcS/j9OAzDgQiZxMpWDBzGBwOMF+/kNNkueb8T5DfDLqDwzSXxu5ZTep5bfXcNpUwAF6YpJ4KNxVhzAd4dGooiQ/pEtmx5Tb+0vtRM9tTziUSLKogKpqAuVOZw4LLjo/dLUMsSAv2y90vUEs1eVqILylTUYHqX8SUBSYs7YaqMyjK1eo2+pfFXLyD9/JCtjqCsbUU7nmuDWf4SW5L3P9qN4HFktVbU2261Fa0nQwnRwpsL9KGN1HiXpXq4lvDGEA0Q3CQsWFm4Nh+EDWkoZhusP8xxpcAUY8JVf8HaFmIdwGUrMDibKi92B0tnQCK7rhG4Fs8duO5P4EfmPUsDgoiXN8K+FR4ZLTwuV2710B591TUH6fKD8gW/ygVeOGrZTu3EAsECHYX5ix5eGcdIrHmv88/yXD2IUHBZyAamNBOorF0pMbX9kuNhL5tSnUWmVzD4jx2PZw1w6uVvogtzolv1Df8A3HiZKMdf4RgcuQ7OahBKyPcZiUxts/ModcN7yEjPtQKY/wDnA9wp4OiOsQU7IdTLpo8RT4T6wOvYpFL/ACFy8Fnas3uMKeR2x6vbEbFEbGKE3pQw+1B09SreJReWIL4I11Cfyly5vhxLhmO47sitsHsgGK3Pon0T6J9Eq4nIcLhKzArioQg7hBhhL4vlzCB7q3hYLcOH4VxUqEs1GjwkDioKZ1p2xaL7EBfbGUJiV+cw5SXKc9p5gsOZh0fsSpe6uK2vcszsYQt2wILBh934Q1MFSR17JUA/kRMkUwK1nkSyibOrjtPeMUCpfo1LeLjKhy74ZTD7neISrqtVCnq64qAqjLKHvvh4OCglWtQ7HpXiWzeIjIkNjyyrvp1KQI2xQoC37wW58rVf1Kww/hElTpq7jUgbbyXD2/AItKfoY0vV9Ih8Z2Vx+o7AOzDtDXiUoK+5/gVxxUrjvmkpLgFG/jeabl+4olUzuKe5bUsdx23viotRmmPPgxTYl/oiw+DLiriEslpbTNtVc1L4YcvCcbqacoz2U6ZUSVpS4MbgPcvHgy9g/olqVOxCyi68RG1sykkDxnjYqEfvZ/j/AM8qz9v6lAOu47EwdRXRPxPMw729whHBf4lW/g8Qw+ljsJSQZfNeYS+IfTgfeCLGLYm5g0ooH7fqXQVjAgwnN7j1NvwYMyM5jiJcqT4lxPUINYY1mfJkmGdcVpMno8rLNmtQyi6lDq8p1KGmTsPUH1w9mNKt894MXS29iE02ohV6SsXpcRgR5IWpZ+5b0/TDHwHCTUKSrlSqY/sL4kkv/cxZ5CBCBDhfJLFQ6gV7uoxybRafZKVkqPDB4WZtIhjmuB/4nGvn3O5mir09TL1e5cTL6ltgQSFNTZ4l8IFEZ+QYJgrY4dl0QAiK1USu50R7PmUulKceUeEpAGodvrrUsdh6iEqGCWvLeo0Wg9RYXqXN8PwWHDmCaxDLKKgUHqDtSmrVncIAC+eLm2bitfF8jwRYRZweCLB10o/0gNRaEHmVHE1y+4j8b5t4jaxL9s/KuEYwEo8waeO0V3jUmljQVVIJPfqpl1DjfZEMKly5crkaCLXHehslPQm6wf3DHEm7ITyB5qbWvsJtwNM7gylRiQ+BnFmKZJH+KVK+DC7GsDfmK0axX4hpj8hg8VwzqMDzhOyX5mOtj80R2ZdwHmJrHdH7GNaLmfIMSXVu8J0Q+guppUYqLI+3iWC32EvMX9f88JMfuSnn4CEoZUXhLK1tiugr6jHgtJQmHSQqDcSr6E75IKBF8BhYDUt8xO0HgAu7dEeYrEHqeUqNU73LcXqTFfSp/ngjFW6MD4JHcUA7ylxjdBE6LJY3K1Ny5BSbd/UR3Be4Bj+YqN2Wn+Izwd2glMb1Kror9wcUSpDN7JAQOY9U8DjcFepfsD6EC5QcVK4ENcpW6ntntntnt4rgcBgy5tzDghoR8jp3EfsOYRxUKzBaNTcrgIykc8LXDudyr9HD8GHLvi4cGHhMUS3eyBmvRKdV/cAAlf0j4CMGxbcu3uGdH6cCVDEyNVaYxRrw7l+IWBsclZ5QUeohNwsBPui1IvZKhwGL+DIXLmD7hj3OFpfFbAczDmviDNS+vMNbiLN1UIq+olc1EMEJh+SDVKsXHJoRrvC+MQ+7G1eoeIw8LhvUUoZb/uPDcq490qal06i2RFOp2Ww7XHqIZnamBU8BUUfqz3EmsJjU/eZp+EckRHSXzoJg65SnUUzF4E1xnIZIffrl4WosXGx4samX1Q+I8Zqqpo7lzzFsydkypZ8FiQix1Khgaxym4FPYPP2ozBwy/wBxbzEwCXb3CrbQolu3vzEvwhPFzAQWYa+aw2HhY5kYX9MNS5/NRB59EJdlF9EI00SCOuS3AUG3qGNXN13K+0PwTNfZFfQrdvMSoblQV1b1DFmfERVuHNQxGlnJhOaHzBTThl/DP0mcvaO7d8ABV2j1K10YSWLxy+Uu2VthyKZVr6lI/wANpMbTdL/uKfYTELCoaCMG3vJX34h8t7FsevA+kQJXI0y5Rrz1ASyca+L4q+WEWVI0jSNIv4QgQlQygQ5IqLP5U1HBi+6U40/EoQ44YcFr/pCkQiB+xN8ytPN2zHTfCw5VNcLxBmEdYaK4YXqPjzDcy0ZS++A3FPH2EQyy4RahcItC2OFimdrFzUWDOJjQ3BHE9yP7y/OvTL6l7n4ccEptl3LBDBtiUw+FvREm4U1QmpnBNOxfUSojrodx8cLyzu0Yh3BuDnU1fNxYM3HMjMeC/qe4RbayhI7LcITD9TJUxR13wdx74QUHWUYeZ3U3Egge8aIGtd9S+AtZbccOxQ9yxl82WsJiKjmeiXmVAuA9r8zLlTHi2beHWbupmQSlO4LiUd/uLlQl+dTSzJLqXURXuLPpCWi6mXU9OamF8cHA/ol3wN/HGvrm2Q74vWs+fgkrljVxoffaCoAYdvqMRxiI0QROHiWgwKxFSpoxMQMst6/EVMzK5UzHGGVNQIE3mGCvVUs7mHe+Kv6mcY8pg/aYf2YprCIQ/fiVidEFFsQKcks2PMMT3EMfacjXF07MR+BoOoxYX+nmVK0vUMY1eC/aa+AtCWkuLF7D7EBJ4yC/c8nGFsPUzQu+/E8AOBOKiZkA8REcUyrMI1Ttiun40JJ3EpRKoNETmbiFVG3JXP8APdQD6jLP74NTDFm0eKjBRxNvELslZjiXxcuDBQL0+5Qs+2ZmZmZhghhCEOTPJxv78TJslQxCG5YK/jgCls92po308jTcwnXBniZAHGC5WhCH8BLHBrENnouqghCNMRLUxE1BuVK+MHipUqNA9xly6iJ4IMwfXXoMxNusJihjAJTpgqXMObmrhcs0/PUKo9VSneov18RHTf8AdRFfeQrX0YDvDVkbmUNIZqHp6Crjv7yv9QHEvbZ/MNCjTmFdXpCWCho5aoH6g6M/BDQXSparAXlcxhhXaslLVriwwgtJatvAxYMy3QMAtmaalKYKy4ekuxD1iPaXf9q4ras9zF5ho0LUqEavazEh+8a7LkZxtly7lcM6FsJts+ArZpu/E6Vb8wx9C7hmq/khXf0c5lSv1CrJlBAD6XEbd68RnCDb2QcyhxH+kSuLB4n1koeAERZIvSL1NkVO0n3DuQu88LJhLri9MR2sGSAPogR+FTuDMrh0V1AVCiEJvb36eX4fuLmY9h+4286/SbMhGptJypiOPNVL0S1W+urHmeJmUV6h1PQfudz/AAzBsww0j4P4RlhvN/6iqif8uCqa8QXC327hOsJf9R27WyBl5h4EuOH6WVAVGs3Gq7Xvkss3KWH89H9lpJcRRyvh0fJbCk7GLJAOsuocy2joiwAjUccN3mPZj1cWKXeLFZ1fiQWQv8iKlFKrN2RnZryKlDSqSo0a6nggVTLBUZc2vxFvj6GUFXnzErkfqBHUtwoVGo6P3jK0r7lfN3CEIQlZgVCXwZYLjlSvqUBu++KmoxC2/wBxujnuKVpjpzyZv8QSDuWIEx0uKLF+JatfYxuq7+oISkrqLntBOjcWqZUYcd/I4QXJlMoJmVO5afKRPAqj+l6upkWKWhGa3mXbLllNj6jYrfLMEx3csAwp2S6BQ21EGn2S0JfTY0tiIlWw4TIm/izcI4fcFpEovAvMYzA9IQxG4GT9CWwHpLmZUptwoR4XjhUKXX8pai3vki9HYw2vfGOKzLR7lU6HUbJg6JbtDGFeEpMA9s0FngLlTXJV/rExEfSE+5lMCVnPmCoVviZ117Ybg1O4zO2qe9mXjX5gpbCRVrUwtqBEdkDOqZXDwG4pIfRJqZ3D39RV8BMVTM4GOGDJDURww+DljwU8LCWhtKWCz7fK/tZim668zQe8QAKDdoxIJV6RLmGYGVOI8eII7mEQhs231A7T/Bzj9yZ21fc1XHmBQBa9SqERxA8y5txcStqPD64EQ9jHhlRMXJ0zAyamCgzJj7H+Dl4rlcIHLMib4OuoRrD1idQa/qJcAH1F4hQVgQGFH1mGNJwaITS7Mwixl1abqb0Bgol8DQ+ZuAu28RcXKfaJbMZF4iza/QRywZ9RWPnm/iI0wtWGWuVAmEvgcVCUIL8JTazNQsjz8KjE8Vm4IViNzsbhayJEiQIqC90ag6t0gu0LhrwjFMGZubZ1LSNxniPcAKSjzNc1PtMIcsIJge6HOOhmyZqmHe/6h5ocm6TQd3Mkx8Gjt8TNmGo1WL8hBQxTIvwHU2ruB4S+bidqhmqmOVHWogf8e9vUX4AhyZaUtH3FuENxy3wkqBKgprga60e5YPC8XU9imrQOptIRpGVsVbe5SMDQ0SrjhjXeopdBNcr33L5ubn5WiESl0NHF8BAXRLB4cANwgBrwjxUZ/wBadSxsnUQiDHDXAxdKVQuGXqokA8kpWnkGIG4s0Gypa/uZVsA9JGKQffG4yYaviMc1eJXfyy9Pi55YR6DFbX2EeNyzvB5Z0RdpnDhjaXVMjWsyrwHZNCMMs2p6IbuOCjXDTMHFPU1aeSY/r/mXx/KTATEAeUlWXS6idtFCE91KJWZmT7MseFww3MykJcHhtpH2bJ+qUX7NzrHl8xkZ9yhnULpZkSHLK4vm4KRo4IiIULcpf1YNWVFu21UWu8W9/XmLr/BpXUWdSz+hlIVp9w9kivJU/nDT2jtKTHcThFRKPZlzMqVfcLy2/fmOq8fBlR+KH/2Z9p4IUMl+2BTRCKGDL4ITGm+NTKYE7jibRaP4Y4ah8cYdEsXIeSNBzBxk6lHhfubhx4JcuMCEEXIIrXHuZu9C3Tsx8b4qV8GLggqLPcTIz1KqBleYhU+FS21WhSNs97zO+ncMNc5LlXR+MMvPFSuNypXBazQFi7OAu/XLEgmpd25OXglx/cpXi5ZuF0npH2lckC2GwK8Ecg2m61Kafk5Zgj4WpT6igpl3Ci+LQPY3LXX1MiJhlKIdjE5H8Iw5YRYoYNviWoPCKdAo8cLCvFeXiYYz90RRLs0yqlQFh1CrCu0ijoeU/wDTmNoxmrxHZOcOiQUedjmN2R4ZiWESmRsZtO01iqcvoitXLbT6fjgFcj7Ro9yrg46htiXyQLZiEQa76mOAs9JEO4j3DEZtZcXDAPKxczZ30S+BRJNQgbDQHrtjGMuBHbqGvtP88n8hNkM3dNxwbglfQ6Y0BbgvzNKqG4lPY/iXNxxBZRE7P1Hk3mYnqFfcReojQbPcuRX9x0kD6uTlhA5C3EWBq8wGW7vBKAG29XBovtK1MRvjsfXli/2jKlcZjm9dkwq1dRLe0WlSYF9I3mlXo7ZRv2+NcwDMdwJcvlVypUqVPvGwNQLOjNRdoIH6SqZUHAw5D8N8X8EglQTTEBqV4hCidLKF1FjqKS0pO3AvsCflJ9vgvJG5mrGfjXNzCVI+z3NuWI2bKmaybWEoYMRk8UMMkbSqIl40ajMfTMbJfN/GuHXAh/ifUUHFlxYwX6dJv4b3V1B68HHcWX8B4dbeoJXLl8ol2wdSvSDJPmLVB0/C5YuMDHGOfqM1W5oupeXViTpHud+p5JhWjiv3r6h5knovdQsv0ol3QfiYen1FTK8VzUqEsMq/TKRVwkp233jjljAW7J2SH0jFu+bnR31E1T7ljZe4h8DBnE0ridDV3ARLu2UEmqo47mj064DPi8wD0dMYyNOSdmmFOevho+4Nhg/og1ZuCfQ7mhiB6QVNsGJnCOPbuJypYJC1AE3KFMYH+YlwKgG7RXEStCOrhEfpA4wLLzEVTuLMuYEu2Ur2qVxV8GDA/LgJagKC30jaWjngzV2VUEvJiGDBC0H62gtJasblafCoJFJxYomcqU3qHOFfcxgKXq/zGC7+VLa2l0YPX/ynqJtngLv5MKniXO/p4SpckbEmEQPc9h0ju34VAjJc4YpmYgl78iVKjD5Fgl+4Khklhlge3BjgITMuBwwZXBl/JDoYIYT13Kb+8xtnmZpaoGsFsIY6gjOmJTW4RT4sy6xhY4rjUHllTJPEp9SqzI9y1H5KjatzCO4xxL4Z31UNBLRl4qVwsODk3NRyQcrgH6tvNJmDgQT+GYvYjuXUymzN/H3oXFkJqJK+tA1F2a4y4qglHGrDPUE9AO2Ca/hL7M9xB5AmpnoMAqD8Ki6DGmoDCdB3FrHurUxSg5pl+P3APBK6LcZYp5JtH+op6gV8WjW5nh2VFpPyXKenlI8Fj0Fwcqqy9PxFrD14m2Vw8UuJRZQ+2XconmUIBNzjBu8VFibE/gfD9vUcMJRHEriw7gPRj4b9kG+L+JhyNR3zeY9fRdfiJBZbqM73GL5GqHruJsCtmPMX+DF3gqC9YXcyFJdf2aCL7h/MbESk4s8hbgcnYm4eBR/JMzL5uBL+21K37Hm+KicOtF6mKh/lxuVRKgZzghmfghwEOjczXaAFCmnZLKmvYxEMngxGNmnR+Jat1rGCIXs2xcC1QduEmde2xEESkiMXTHccR4DjUv8A6jNbO2YEZuZtMy3TAdSvgNraqXm9tlriKfYPcqiHZ0MAE2IX/wANQtjwRWxFjEu/UotKOw7PiVNnwRvbHJUOKlS+L4vgaYimT5gxeUOzl5R1b6zZqlcaY9hRW01DD3DZxYlX1FJrb9PgONcblMQz54SB8K4pCr9ELzWbKzAne9w3yMXxx3wwRcGMA5i7ZfquVj8rxCPGnycNA8TbePcOB8yoY57jFQGWWoCzE8WvqXCPFe2W+RbKtVie2LfzC2Gl7MvMK0WXbz8LTTNA6lVDuSpWoh7ISUeKNb5PEYBVfEyVjwhf83mY7Sps4sra3MrP0OjO1cTArNI/uXMyuK4VRu+FDMq1qO1D9zCk3ir6JcvgWHcUXY8k0BmZMmYSpUJnHTwxhGJrlzDK1LnTE3640RqPLFitsRW7Oo9SgVlP7QcT99zMDHlRa43X8UpYDVnW570Zi5jMd4R+ULeuo5khY1S+68weGBGZQqpgoPMAIyEZ1wssC9xUTFffNxhFxULxOJsaizwRJXB3yEJ/EMl2A7n9o0JiXfmbcZVS+fXEVrI2Y1Kgj/SUl1/MSeXomVTfmPVVQL1ExbaO53E3fFQUhFQ2JFrFEbr+ybl+0R+IV5CfNRs1bNoRVg1FMIVA0xigMXENQwatMM8NweDjA1FiuA4vi4M0wzlmEHUFRwc5zCNj7MTYke5sWgAPIi1pwg4gD+ap9qLscVDkzNJr+/gsHhcKDsogEDHohuE/qILD955HcDluNRdHccYjBnfwSVCVUXC9D4JKhxUPaiokb+ksdKiTP850tCa8RWwo9yk/Ulj9qWAaU/6xL95MV0R8YTxEG1E/mJtc3mVyLHOMMmWHU2Pnk4Zcu/h4k4Dh4LBkLMW/xPDPKW7lQnKPE8iWLjz37hsy04l9WEpiRJX9owQ1Fg0uuKyp1wxbioSp+OGo/q4EoggL+3tiEGLdxZ5MuEsPgyuRbsqnqUjSGvfCxltvcXLTO+MLOzIQUw33C59iMow8blT/ADOO2FcLUQ/MVLNkIm9kvvxev1HgQSoJtLgHNlSxNeiuoB2fcupfFQxA1usQ1v8AiLxcIkRsmhG7OiHg5DcIrVcAjuO/iQVSkwBdEcJAVSS1wawZjwy5RxCu5eyY6YDQfwMSWVvVTA7BXplnmV6lJXcvMB6EHUIcZg7bhpwQ1bPDAOU0E2GJqkJTD68MGUQjE6hB4PNxJwuvX5l3/Xep/wC5n/mZ/wCZn/mYz/rDtIfWYOFxYiDTN3DyNMNz96MCHANf1E4DTEaSjuPQYi7OK4fhcN8DUobijrtvuBd3Vxq09i2NJC4MVhF6wY6rvqkYzIHGEMr3VqmA1+8SuhEVqF/XwcTK/Xx6gsrWoPLGj3Fwug8S+buXLNqesxyjDlntHyv3D3D88MOGEWXLlwjcEmuC5MxDl7XAjHm8cXy7gnUA0QJETi5d/PUHMvjKsYgZVk5eFcL9hPrpr0RQ0eqljuZJibzKAu/Uct4qSYlRR3DAL03L2We+0pKzQn3PIz8TY3CAon7cnMWszcP1LyvS0lWVfszK2YxA4Yz21AeKEOUP2QcmVBnUS4+pcuE1xZFQCBLY+kYUYTX6l/pXaCkwvCDWD943ZRiZbPuPSY2RFFp4hTiPyhdjBX7cu43bMRZihDgTfjEeiGmC1BTnET0J9pnDQQrTL2leAjmErgYlWxY4H3yOGZjqdQCPA/Cm9t2CPdPywUA9dxqyDHhCawLSdsoaVimhnSPapMuh4Li1BPcQd/rKNUst6v1M61ple4HGELKR9IXUI7leOtvia73NIaC4NEuMub4qWGWLuarMuAdT/wBkn/sk/wDZJ6X7JR0/qeQemZpVMN8D1x4MFjjnqMxwcER3mZdSo3nxMIxxMWIy748hcDD9kBEodw5uCMROilsGaiCu3cSGzPiFkcDIcbAxr3OrfnhZaDf8R1ngF1CaieNs/mF3P8qE/D9S15Ve+a4YRHY0xStKtXmCZc/0lL6lWHEstBF/7xq5ubTB+ZfxJUu+j8TKLdO+Ll1i/jUJnBYD3cHx8hf3LbP2PEPehF5rA+Iw8RxwfNhyhCGlPEKJm65vmpTZ1At1Af1EcXcHwWoCUvqFTcbILbV95gCiAZXgRWzc2gaFfEu1w5iVHBdF3gmyh/EsFlfuXUa9p0Z/M1/0JVDsFJ7g2I8PiJxoyviXYlBHlXFclYlSuFOQ47TKbnzidHmDaVGXRldEzRiylG2ZVTE4YZDn5kf3EJo7PVR02tTlf6iVbmafj/mXLmf2ouDmMCZOJwJtAqjcD1JXlAXCJ6l5btCJdj4rh6nVxTK/tgJnXa8kyienB+omi8xzDCHooB1kujPOJmfm7cVyFsq9HcvhIRhAd/y6EbAtV2+omY/bP4iVsxVFtFnX/eUd+BguR8YmA1FdYgqIzaYg2U/KX+uLSpQzZBQ73llG+ovTEdAscD75ssZcYZlVzUrh9Xje+e+e+JekvUEW3IWXzsc1TbC2A3krhVSuLhxV8LlCjDkjoKsEzX4VNQ+Bms6SWjVtSOQhhuEAod7tqf6M0egfJFylefpiLJEmJQHJLjB5vfKgzM4lKc1LvuOWFjWN+42J23QyoOSeRA9QYFb7IuP0sQ4qUEYPNynwsSgyV9SvfyRc31NAyvuJbn5mEhIg5yZ/c3q1WyRLQAAblRQbjL+VSlloV+Vrkgowc1GPBxVsZhUeu4+Eu4w4qXLhFlGCVMqZd8stHEqRt5h2MToajV49wVdEx6hdrvcsDAr6IkmteluoJgIpYkL7HUbBeL5jGDz9SofkIJS+wZL3HcQebjTSHmHUD5LHK+4H8MFaD9f0i1XLvNpxTECmoLbDPUouYm9Cru2/PDLr7jlryLGrjULdeIuNJTO5p+MqXP5jhoPUzsVFfIJYNLx9wMmYGqtFmrQ4IsS2kBkwTxNnIpAYVXlHMqM+hZiXP4iKwEd3EM/AWxpr9x5PFTMcXoSwBYHaWo7XA6hVQVL4CFehb8EqX1EfmqBV3cW3X+wjgwfSeO/VbjlHkoAVt8dRgN9w9MubX6hVJHQ/3uWIfRRzA5TFypXBw8XL4cI5x3EPaYkWrI7IzyVeZvEGKCUQ8NzsuI5ffRK/8hzK8rzkIHBuEBTKzBWYO6uC4GCckpYGajLjma4PBcA2xXG1eGOEFU+ZdSiOgg6jNXWxm4l7A+WGC2yu7lgnt9RYCveoEtr6YezMbhCPFcpDjJW2Zkxrtxp5saPqNm3LzfN3zxtzDYP/AATIv3E28aYM3MN8vwvy64eAtExHGzPhnkHlC1JVfIoZ/KdBLJX1xJCUU5XwGJcqHzM1bY7E2MMWx0yx6jxUay0cYlqW3E+VSpUs9JpP4R38WMYoK6mTXfmVDnMoc44T9BxdT8U3Gm2MgVM3fCoLnZLFuCVYNe4xPi6OzBtUfVxqX6aRUL7afUpRvP8AwmN/gcf+0Zve8B/OZhmjGt9kXEDfb1jH0NAIMY81xFsXkiMAAx1w8fj/AJixMz9w4bTSP8Mr3TXmWqtcXLA8wnl9MIKblH7CswCktuyosh/CWWxiKn3Dh+GQ68zIvTu6iFF3H/xmhpHHCe13ElL2dP1Lp4fLv3GMr4IQLWXINlauH7Y4S8LnllI11AEwqdXdlcbwnf3KF+IzMywAlO+7EsJ10eYqnN9RWeOniIlWRlXYzqWOxGAgiiidMS4oQlkzKPwTHYwqi+Fw4qVKlSoI1ZT/AEeEyZTyZlEq8URy4PUaVkuekit1qIQcDagS9k2xjgQZaiLzLKG/uJm19nqEajqUrUrhRXwJUOEZvj+DhekmI0Z+Uv633mKrbl5bgy3PcMI+JhtYWAvW6dy41Uoa3A+FLzgieJQM5fUoRt52hcbfq5uO818e4cEYY/yGYQisjMKvWzGEuXOowjLhBUdLUub4XuIyw8GpUCpVUGvMW1fimIqj08Mr3B6SFgavqJKuVydw+WRD7l2TXFxbWXN1PHLO5X/EpvcVHtti1KPuHwSOJccwUPcVEamVvxNE/iRgzBh/4EGGIMszgqXmWsly29nGybwuj8pehLp2y2idBJD1fedCJRYJBNq60wDq34gSeW6hiteUF8NvBhy4DcpE+ASpg5hldVPAsa+J3DZ+P+YEq5+3cDDMwG2VjelLc0O7EKQA11GtJW9x4IPuOOCta/ggtooaoweeWHAYvqYC4KxM83Fo1fyTGFD/AOkP7ssOpf8A1Uzi0Kn85BCrRLMfggYGE+4hNA7sj/MA0Frwi23Eu9wZV+mE3sHqTKTgdzEmsQDKL+Ep3vCXTu8grOoIcVi+4A/MnbDOlcQ3FNdxllXmIuUNpPupmEh6pl3AiJ1Lul6hgBcZRl94XDabl25MhnqbhD1cqDHcpB3WeZ6X7f7np/t/uen+3+56f7f7njRfEwmQogyu4sNfmNjNDgqhmPawhwLRSUmSvE9kDEbTaJuWPqWcJxUzK4OQVEuFOVJx2ssg4dx8phRuOMmog3MODyuK3bdcDGUW8ZjYnNyxzSA2VPOGKCu/G4MMgz5RbZTFlxY9HRlY6DR7j0J0L7jst1bHZWmD5XCNKMealzTFXbKmWeGO+TzO/wDhLvepjq/zM8mVUGYg++SkbWVgA6alchVMOPhWJjfzKSmUPpwsHuVHDHN7biwYyogat9zLxGMtGgX+opoeZgRRba9eI8vxZ08xQsv40Z5iansPKXa7iQI4eOuGMGZd6+4sbsfUWrRiOKZpsT+BEgRlVKeswemIKxgSbRFy/RHGI5PiaAkjPF8EqVGCep0FG8xV2dhO9Cy8xFuwzXUW7zNB/IluAp2yog1GMz6S/pXDuf4/8xhP5KMMR0c17l2b+5YpvszSp7hq24OlLOlv7h/yemyBKTvWUrPsSrMtU8Xxd8MSY4Xj4bTFxGmyUMWg9EbjdlFEA6a6+oRKfrr8zU8YhR+5cvLu5u3B5SxW641Mwkqr076XeIyaoWakWsc8CgwdB4igAyjCfmUjMq1BVOiU0d+Up5znUHmDLNZ6S6KtK/ym6Sv/AAl996We042TGC37ym6ucWKYWbfuOYoqVi2Iz54vm5cU3cved4gl+IuDKw+J5yvuEEdS6+4PBwkPLtpWOmKhqWLmRCowfgw53LIUx9ENiW5cq3qONai03wwJcer6AzBFzAof1NwqDPuWQgHTaJdHW8Q/UqgYD2kUAviSM4M+ktyEZHXtitlHO6EvJ+I8P3q7JQD5zBDuSqhxcWXwF5MxVPcw/wBCJjOVVE7O6kF2PFVLwTCVebL6WTBq+EKuoYmseY4QaadTXKINtfuFaKr1LGlC7eoqwD/3UZpKfndJ2chKOTsXf1PoS34AKb/fA98dQlmhcEIsGYRJVy4Livx88TLcYFUHUXYlMJFR5NJ5hXm+CKFV75D9Rcz6RIX7RPgljQfqNHX6jLLHCKOq3LlNRWlr9cPjXFeywCH+SmsT7HXBYBlZXxhfaWTiNyraVCKtkeiF9fDmCBQGiNyvtlxaiMQRWrQ8TNSS7vmXGCqCviFWb9wKcFI88An+H/MWE/moIEFTYjhBqDN5f08JLu31FDN44Z1wMuhNvMSHAeMOL9SjaGbDKsZQHo0HUz3CuH1Kq0DFyk2lVJLE5QrtDwz6BtpeJShb4Y9ovX2TX3LB9st3w/C4cJZ6ILu1JXiKW4CJCwt+4d9mXbbbDZW4EuLQbcoAJ6cY3dOckzsNn5r/AFHQlMqMuXzcuXL4dhMQeESqkVNpXAIEMagQ+VwRDUAJPBzuV4h8Vgysy8bPU24ri5tfFRcEqIYWso8RsnbxdRsnS+IWhfdqVXeRN/qV1w1f8I3RPdSoPc5f3AWhwnUrWqg9PHYp2Sways9fBlSo8hliJ7kVYA0Y0THhmvaZcHtxQgzCVxfBqolI22urmDiK2b4sQhbNMVtK8k2X7idgco6I0Y0IbPzCYCduswyiD1DgLYLVM5HReZR5mtRMXzcJQa4cwhZFdEJ24lLEMX2RyyujcfhUFBpB2FupSpj3UyCD+yVzojemW45gM7gAqfqbUnyQnEC+WMZaVM5uN4QBVkA4kP4JdfAAX+BLl5jiaY9HzHvYd7uGdbr0xWXcGsraInzobrT+ZSl9dIeD0aiImXNS3S0yZ3FL7v7hLZK/KXuOt7zVfYMErJp5zDa+gcWXUX9Y8L97kIIacCYvLFvd5n6s4WXxUol9Ea5CdzrgBWxmoXz6bJRR6ZuohFhrMdtK8MTobgF1vSNbR9RpHXudwaBPRmHl4HqIc53PFZlyqTr2QsKen53VuM1Vub1mW9z0Qho+zg7v+KMWloWLonsE2tMJ5O3J+E/JmDV3/cphqw6uJx2B/wCM78Tb1xISuBCDKlwzwPxpF7J3mNXj4MuHNQyJaG0uXzgphrJGqC5kLX0dzeiKNqimDo1ystE6Kyy8WsTedRI7Nh/2oQu6b36MOPOIDud0cz9S52LL4X8LmWanqpWVU2zMH/LOpQzaovs9F3Fg+fhuBb3zUZcuEuyubrjcvsdlsQ7hK0rgCgUo+45eeuDmX+SBcqFj+6CungIMZUYriypRBlTNcL8MU0x4ihsp8R3ierPnnurmjFQEVsgU+4F5pfEChN2sMKsA2BqBsPfG0ueKGuVl8MZuCzwd7lqiC2K6ibn8D4ajZwkQX0T6m5XF2i0WV13McRnoeoBShheoNhwW6Rosjk0MSFphHDhCmkdyrHqHkjeQVqMMVWtx4vAf1jLn8lHvkI2bixNiHADL+pgi22ggJQZPd2kvLjsfUdAuC2JHResD3HXSLTXO7l2p4BliOLsbuI8yxyIFs8IjEn9xE4sGrl2eX2jDGVqr+pZqSUV/lpLE79pk6fTO1JZ2yotgyXFMq06R1dysrlS94EZFtZtvtPWCyXT6W3KE/lh6r0Ns3aUVuE7FQbih0eUvpiDS5So8bwwop4UR8Xcuht1FkvEQLwZokPduzqVx9XIcYWQQAR8/8GWmGPAiVHhfnYY4EIYhDi64BUXE+B/wNJXFyxPHFSucC4WQwk/Sbc5lRKjSfzwyoSzWcj/w1FbGESdtHiegTWn4hpWFVn/USfjxcZtTS32CCONDtNRGH4v3PBT9PFS4r+yg8sO0IZG1qyO8BsS6OjTmdxiwvBCgStWVMM8BOo3mPuVK5MPcrioXDmub+FPFQwrR5IqXP7iXty52Kv7hudQJnDvzKg0jNHuMGY4hyuMNwaicJKuLk6jpnLmA2LL5UJn3lmBVUb6jU6GYTYOj1GCFfMysCvwZgai6wQkJTEjF64vgZ4eCxRjBGMIw6CyGYOpv6JXK5hxVxcUa4v4P3EQ5lzZN0w7HUGbJ8pSgIPidRRibicVnwWx42gCvqGHgseTuf4f88M/lPhKKW0eYpnT35glxoK8ymLV6cxJYY8tx1r3+jGJ6nA7lzceevqW6D6P7m4P0ICOH5z1hvjBrmXfDECLfOVGDuOzQnqLAAHipRxFyZm1OoTqv3Txn4IlgUeJQNdtKhFZnthhZp8xvwMRL9cf7S4KxT+yGZcdXUzsw0ncuCz3EG4UFPUtV0PqLXMfc3wYmiTp/pnh7TCPIQ/aV+SYQX3F8jFb8DNXnDUvLLbPMCnNd6ZfD92Z2g1i/X+Z1crQkSeNkd19oE3MnBly5cuXyMnkHPIhKxwu5tA5Hk5vmpU1DyzN9EAw8yOBrhgfDf3EhZEgRXAksj38DG0H07hDZLz8y4VLcQWjUFPJDVG2miX8+CoC2QYuXroH7eZqIQ9xbQH3NA2PCXM3qVXGoETt30xT/ACKWVgt8/UbMNIQlDhFuVjisYu1XuJRjZpzNRu+z8ROoO/kb+Yh8TcHOoJYW+Ii6ihtRZ3zmw1AW34i5uaM2hiOZXCwOA4Ny7YtfPmBpukGG6UeJTlIZTBBixTyll3Xm+pcFVEqJU2Q4Y3AMMO/MvFc3mo/A0hqCHBux58S9fTFf1S+TlC3C8sHllzTUq2VpB4BTTEhLhM7UQQ1IzYa0xjiUfliWB4jNYbmR+Mrioz/2phDcUAtaCaW5ppDPRB6jVJPG4ubmrxFOn5mcwd7alZQHl28wxHkfMGleweDCWLowI+LvxCLFYHUcPKFQMSo7qX6vtCxqDrUpwIBt8ylCSo0cXjNywBboTKtb6QIs/BFrT9IosOdRHomNtxUxTPy3+2fcYQCddUylS10lzFbbQxBM6KGyfVtG4OurCllRCDeBUQOz2Sown2sytcIPtQ8MzVfyj7ZupnfHyzpVh7o8x1NYTd+pkG19x+FSpetxzwOAgRSoQ1Dm+LhCVCMOCu4w+Iis3MSPq6h2NJF/Kb+NiUyo3rzMy6IJr7DMIqt8LUHMc2Cv7x6+Za874LK6wucpyyhGTLPrzKpTXKeSZzEwzOoEc3ocyvKJj5DvCUz+BaJgaY88sZPTvwnSl/J74aqvHiGl7A/mazVKhYxYy83L4dW/C+EgfC5cDPQlSgl+zgEqVxkIFsGMVGHyJweavjRMNFXLcyyz8bhhGUMuhrpmzvphKF/WrUfY9w5QW1MUrLCUgitl1L5qOOElX1HLVks8JRQQoWaJ5em8TB+pXD5aG2IMP2i3xUYQ5lV8EmUMq7jqWGSUM2YthIT9uJbnK8RpslgDKz6OTUPKLlXARtYA32L3wx5fGY7Ril2zT8ZcufyEuFbohqP5FfnUTpH5J+Yte33XLAEzxEbs+RUTVr9ty/1HoZhF24i+EUJYxN3DRhEN184xNwXfz6iKisSoFtqJNMJb0S5wUe4ZrlqCqhWNGTb4gqD98YUKytMkVwB6mXBfcsvXAajLl3yWbmbYu4a9DojLIs+UCqSn5RQoqoVmWBUxsUVrJrS7e5ZD+4P+uibu569D5Raeu5XUa3uZG3rMnaDu7gKnTfmMx+pJfL6XipZCgwrZCy9uAhzfoL4vlRBwIGYMIcEqVxUPmMW4fdQOK5vytQkUP7R0QIVMo4Y5uXDM7dIXeCWN8nXmHFNB1A7h5f8AUUp32TM3ButmQguH7me7Q0XrU3DBDoO7ipaw6NsqaPL1K1N2XCorFVjBEBSvcwqKobnYBg9Kmxuh4i8V2sqOtnan6KKyHgjuBWNe2Kjez5Mt41HgEbB/fUyUzr6YJmSfao51JFSFJ0xI9TPgXMBW/CoVQZgWfrzFJ4yua+DL5DhB2zv6juGQxPQ5wIW6OxKkXzeERY0a+DLzNzD88VxbKscWR2IphBTE+OEHny8KGBZj3TMa6LusrvGzEFO4ISomIRLiTLbidBglI4iggsTEHr6hrqti51GillsAz+DJjgfAJfwPBXweKjPtiX41p0RpRp73B1kU4muB1ZAjfd9RYAee8UlbRaOxumCtx/ZGU7feJUH1mMMCafjKn85HqaqEsmJrqd94VZGCGuFQZhTjgbnmS2vJEiNpmhdGn4mfpYPcplD0IC95g7/rLiTYFmoyF0swZHqFje3tinbfFvMJdTD6ZoFvDPQnwrhUMpWeGG4pZijKXJWzdhEosHhL9U9yGtY8uUldvj+RAb/UiljUvhGMnQWaPCYYSXjAC0N0aLEz2Zg1DqFBax3CzJiCiiGsQ17vZ98La/x3BYKLfbg5wZ0gAaAwfmW+MhfcIyiihCHI4IcBx3/wJo1eOMIMZUX+kV+oZn0II/QYRks4WENsoGQO73KtYj+X/CdKv3C4dvuXFrFD4ntH1LGrYDZUtNvuPgEoJ/SL123v/HiUHJkgmk3tTMlwgWxEAXpGdtkeYAWnuDdi0JequBjbhKU9JuTSvMR7HSSnIvfG0PpCqQt4ARWtfFBhm4bPyS/BlzhKN0+eZKiYspY9VREiraxaxqH1Fa0PH+0w03rp9Hi5cvhlfALTbUdwRJRihd9GMh52NJCBxi6JLWRDxRiOktgHb8qlVykEzI29cJegNI8Soy4blfEcFl8XtH43UsU+CFPFpP6BVQ5QjwQmR+YGis4jBbHaNEWMTFwLZUnbj0Q2CpgppdI2oe2ZUD/uBKj/AMVifYLD1BE6YlHRgqBuLpcKe5hpQcPQ9S+DyjGktOHlNDFAJsSswKZSRk+ILOPbVH0Iq/e4hRB9Qyw+cUbjk7eu3zE1OtbmZtGLa4XwJvxhQo8oe5SBmCC8o1QaKvCV6VFnUXbp8MQ28ZFxyn9I9LACqgWrGMCjhlwmpvgZXyBR7lRXYS+AWd+otviOuDxUDd4x8zgk1GBTvh2h1RazF2E++NirvMtQsLWZReYjDj+2LFtdz0X3OoshwIdB6Yg733wArTP+xs7YdwJqUF2OuYu+dPiVCH5g1BCEIMIf8FwOGD9HCRhPcCvcd2gd9SmrbDMZVcGCNoL/AIJ2p6GI0lzSo3LhDsHjxwq5UZTeIFIScxQV4YOZabK/xnj7ojOJQDlCDbMlRP8AKKauVgtUqCbmpbQ7R37Zk5j6j+ZgQPef/UxR8MxyaF+kU0T0JhtijGIiNyywBo7MoQtW878JmmBr/shJgyz77ijkv1Gx3gt8Qs4zKRTMyNG2zsz3zySjWSPAiYgpvq+oXmiO3iJxfNw5yfMplcNOC6mV+ggJQJ8/zMUBxv8ApFKyu5uVwHQuI2xrqDhKJfAzKHcC9B7iT9dRLgN1Kr74Uu4wY8gYOJhHFd74GoKh+LTcfVLdGoVAZFEY1HSte5VZ6Mxb+pgF0QrYI1fnjfMonWOkZrbgbSoKT1PJHSRPV+yZYK6TXNQl/LUO3X+DNSOjeI0uxZgqcRsNCNo8Etr1LnCR4KuFfpKTybz9oF1Rhb9J4O9uYk2xmguNlZQwRsAhXTVn2RfjGT1BP/DLudXrmMTYW3kIYhNjnoDmPUVg7YhO+TCC1oop+JbzLjBjBijFTcC3iVbEicHgy8TQ6ZluYU6PzNNH6lnR5EAV0+epYWL+aHCqDc74NeI+YGBR1MG5QTKFMXxBkgf5qCkzBnGooPJVXUtGMW79wfE+eETVwvcwGX4JTBfgcRrwXNPozUU/0UurRmdzJOdwg3CjfIw3O2Ci6KYPA5HFQOTmuaipZF60eDr4jTAdOrFjJgSVFl3AjDilhp3HsK8SMIcWOblbVe2XBHwq2yA/25RWaG/b+IWidpizEHUS2YZj+p5ZU839JcJm3HlHM8JjFUDvyEOLvwJcgM/iLkfVpiWSSh7fUWE8ihxDoTWL7l8hGEFnTWplEBD8cCrDUKKw/ZDPPyF1j95IjfoamXJcNuoBu+9weSb82YNVbUU9SgCjphwcVLuGbKSFucoU5CvfCN269MpdFQ9wB7gMCFqxqshlvBaLzjtpYHzCGZtO6Xx39WQGDxL4HFzDMSUt0goPMcRhwiHEZYMPWOAdTdLAXB6GAIuahih1+HcYVWZkjB2y8RF5RUxz91YQZXMqC+o9o+0Ns5t+4QrRp5YRZfDLj1EiuMjhXc/pLsi1t6vMZVxxhLjFjtiO0i7nyLElujU2jFWckFGZFmUbFDQzADxExdo+zg/uXc/mowmvAOG/BYE6gco1q7D/AFLiNkpa1ylkIwlvVHQwazgkriokqJbP6ObhD08vC3OX6mE1uqhJT/VAixLmkbMn+Ka2er5hILDQaiQZuGGAYo9y90WSZqWNFeac/qNmeyGOIJl8osw7p1MFQHUMs34GfyBn9edz/CGh7xiC66OAlccjFzHCdbRT8kGaQhya5ObhwpDKypFoZe/gy4RKBGsOOoRVKgOuEhw+q5dtWeI/21AGrfqbpRCgnkz4+JZB7VXnh7yrVcqxdqVZZe9dGc5IzJe5lh0RdEAC4OuWWI6seRlzLEvzFCKbWVxcvihXtalciEvDNqCBVvnEaoMNQbBhIwcrqYCbnVx0eSHJZllEP6gxSk6JT+Upty6Cgm0aGmVkJKDM81eBplSgYAtWBXQbCD8dwsctRR8CYhywjWXBHINfcFH++YRzHj/qsPI9JiHL0wOL0/fBPEjyQWlyzVQkOK4HnHhKqbe4KrJkzcCBbRPqEMEOMu7xeYqDLjaqzMvmis9jEMEH8iHWL+hZcsfVzNmkI23oiFuwtnEzO0NvbLdD1w8OFvofh1SuUgmhbKAqsVZ9nKPpPtLt+lUGtr+iJQEmNudSnDFNloiugKh4ZIsWaFs+IlWuWW6mPaq9DuABOqMohvdr/afzXwhBwyYKUIi2NplLrdmieBrzDo06JRw8b+kGF8dB3H9N+TUz/wBUu180nXDU2lFLnDuA1gaSYbohadkSt4eAmhJ17h3R1rUxYPNxHeIoVfuNOC3mVmEfmZTcqVDEuWdWbIJ7IB7mtq7QlGTGTBluBPPmUSv3DrnVXMwgPRC0I+lRYNxo2n5UMzCTFxMz5jCPA1DjXcWQCNv1vG0U6EjCG2OoZGfxmXa/MTf7TJFAprg4qXMrAtgrFuo5YkFD6lprwDOJQ5G7I8ABp8y3T3HD8Gfg7Y2zb78zEWx7iDar4jWKfUGBgnkIKhvKdzMNfpKIopvtFWbB9QewPqN0XDSu55/S/g/7iCdkSFcxct+U1Lwua4Woeyu/HLK5vad4YtZazAt4aK64V0ZapeN1Ke4u+4ldbljtLi521t3p8Ri4SVwptwkJWdh4ztIAajZbz/5RSbdeyNIvtOX1D2iR/c7ZWhkYc3HU4dQZasjdxFChhOCVEUW76igX/RHm2pdeou1lbf8AhuUffAjQHfJhNTGDioy/g8z6f8zJzHg0wFcWTySpdrqNev1GY0rhJQzFajS6jTGRpT6E8ZbAMwsqe4RuKXmCl2e0cMvWq47Edz7hHqt9Tr6qHhYjzfFxsHRaugjSiPbHEvlbeHZLim2oszrgl09HliVbuMWK5bElAa2WX/am91P8HF5T0CBYZVPn4Azw1hcytjxuGCu8NJlwD7DCik4szZ98EQJvWdl5uEMfSkn4ERY6pWGM0pKh2i1S3uOHPU6jlVnsho7UtwRYpPPCuGFqB3XcUQR1vuL7b+5ZAGxXqAVr8MTYrjTn5gpq1t8RQlLhiXcrll8BmYIwGosyKZdWqglH9kLa8TZPKe0rf/yahFHUqAmSXiBWrsilb64G+GNSmVw47gQxWAF7jCRjGITzKlsrSbuaBv1G7qWeyFWQ0IlU4+0+sNmUDPBGA2/HRLwfRzf8niUKs+dkS2LHklKQKZ9lHLLh1LcyzczPJG1GubgTKGjKH+YTxPueOMTdVnMboOjhPhjjZmUDmUBmCSI1bmGGe68mDQaVMeElSoIxBzjIWKKtlKkOmPnSuXhcyTLccR+REQnKtSzun54BQ2FdsX2HU1ipaQwkrnP8g+QG4Ae138cW4fXj2lboMvLM2YNURsOMdCktG2upUVt/wwsDeJmJVF088C4gTeMvmG41favhZurhi+YSuULwjLa9MQ+FpIv9A51KpCVEVorWaTXXLwWfXwyx556EtUA8Yf1wFE5EvrV97iuLi5c7mlzcpAHxD4NXEch3LDNdD/7UH0Tq6VBQ8CGhgztT8Yv2QMTAs18suGPMqKMaR6H9zcYa5Vp8MHRI15Q1DpYDcRoAfDMD9UYxzzVqlyWxhy1/GXLjXA6sYar3tfUIgMbb0RlFp+8CiD90FdCeC0S+hoILl5asRbYvSxMQKi6WVzXAUW1VU3BPjuHKX0RvUd2tTBS8MxP1JfEANfpziazV8hcorcGBDmoKfhviYYs8NVKbRO4LhXhlQ53A56CY7lvgMGYDPsS3InUDQNqp6i16JKZQPDGVKqDNTPZcv/6Qx3yavM2G4h+Z6StMtEyP5iWTo7IwjFqpgefgIZ0qTfowqpKYpSXqUTTr38CURrlt/CWjVK2Lmr0IdqX6l9y9y5oboYJ7AKpX0/h3G5ZYHsjQ6fPmUtDZcWqGE7h9zuF3IvEoU7ikvnS3BKgvIfPJ8xS7l3vQ6YDdRYzUeMSmO/0R3wAtBPejy3xM/EI1P3KXETVYvZmM7zsiS3iExtYjua4hhO2bRsUS/OjkwXjV2ls6PEd9NsfiJRaoNnf+IsTICmTzEM/HJlp8qfgmSiHjCpZ6J7XYDWrwfbiUUMipTEvEtsCOKYbg3gYhQvEUOozPd+n3HSvqByq7845U4ZfZvHwuevDg4v8A4PZDK9rArYrnBxLvigElxJcIMpRgpcvn4lzF9ISApAlPdxfwYybW33MO4LjJAw9UCsIKs9wVd3ph+o5PxVmIMJWA1CQD14lUW1cV/HKuBLqZSh7hsOmJ9IPw9mPjMSweGGVr9vMeA6ER0PqOoW1W8wpVjfszUsy7l/BuYCh0PiPGlsWyv3x/mOIp/MTSc1/3hbotJc/iYRMLl/Eu23fDB43tKdeYXIHRbEIPf+2YAjNVSeFrPmKxjgzMQcujEuwMWO0mqFZVlwfSwfnwhKeljBi9IQc4Fw5MORVMyw/PJfAT4VK+COzDHCd8FSuUQX2R/wDGpP50ItkTT8o9J+DKrgMyxD4BzwL6AVlUKtiBmKJtjtCaF4DDjchbpFBFg/cxqDh1f1EF6fa4ipKfip0lIXouDvOGupd8WJH7I+Kg08R5Oz3KpLavBnqHgh2houWG7zMGmIesoi5YUygruY1DCIKTpjDQDh6FcTD8Rp2iETaKUbwQSQ6eg+/jcGDdXhyTYAvdFRGFuWudYK7hsrUWwQavCYvuIWwR+2Y0oYTp4lpirzTFoMst4KV7EOvLo+YpVBuUTAKEPDNQFglQ7Jpz4wwNs1h34uHafjn7njBk35hpC7ODRTFHFOpYLVLwAzwZ8w9BDurZf6r+o8HLn3OpalEzJFC0nbKmc3Ex4VaX4le31Etmovxr4DJ0XLzKOyFrP4mZAL1i1TaW6g1hEOmPcHdQf9JLS1Q4Co/cx1zYHcRmh0weGG3kYImztLyiKEbmx13LbxXBYtRor8yo64LX+iVJRZ3UcGBFIwYnXRoITYnvh4OLhWzxMJ6eCH9Rme8kG1FsuC9Qyxv6gmUO3qU6X9ztPwS4gDCZgFZRY+4Ybg/aajmEYkWrrES7bjwMQ1+v+eAlTe06eKzMCeXEhxZtQ7X4Ii9eINy8xG2IMasrES/SNS+K67bih12HZMPrmHrhKgH6Qpm7Ztn7UeUquj9iIkQXRm+WwCOYF/vJKlBfMoegc1yc4g8T0S64FIoZQ/MPYnjX9RVghH/xS4Mq4tQbjzVblOHUAomZUqbVMQh1nWItvAt4eGYd/jYt8JHAvCxXDgPcVQwhRmMryzZXC4NoOUMRY4CHOF3hE6LNhAd2f2l3t5EcpWWqohAbiEFsVnjZZonkRg1sjuLUuBLlwl0xfFhGwEAoLB5ieD9RcQXxNQti1Wy7ltxzxTN+Qlqr/CML/E7gBTF9xkwJoNQCS2D4+0zosMMvC37mEVURkXuFovYhGVA50wKBrfLhWB0+SBe6dRjV60xYAsh5TbXTErzh5h1CfRKuk2f4QKZxl6yhOwvphUwSMAXCT6k6mHh251CXK/GXsBuOoIf5YIPAaCiRWrlsltK13Bi1PEr0ymdfMYfuaAuY1rlj+KLZRtTrcbyfrHxd0G2O48E+ZCs2X8nwWHtXykDm+HjUv1mYWG2QYEHtqCRfgwJtM6dxi8JbH1wfFyHwzzoS6XIwzC1wOhD2RaG4YLhVRj8xxRQJN08Aloa9Fksh7MRIvBoiupbO2N5YN1MsTIKL9+oVnzHs1lMGZ/D5vmuDIMWDAo6vFwMvCQWBTMi6RZFi+vimX0fzBWJ/RNyqjwKri4ixQS38eDDHb+0ttDNGqspjiQhNmAKXM3BLE0B+ZYLsnU6XHJ5gK2Smd94lsrxTMozY4O6noUr0BELJdWMrofdgjAj4eNa/suLx6Zi5uRI2kAjDUTuV12Wom/aVFCusxGO+L+N8dce3TzcrhmLOIXj3UA9gwPY8TakGUaz33AGz3O9J6QjC78MNOblTaGO0ug7lc3M2XUQw4eGVko+njjFFLOn13Bun7BFFc+zM8AVhizURIcDBhCMx0nN44XRqHCy2Jc3R9hlm0zGR/HCGQANBiI74SBxUYS5coaYsGGYLSZVXtOczQ6rEbXd8RxLhT74vjNG1BMJV1/oTaMuvYPc++Nt23A9RvfC+xPSPiKNCU/F+vebGp4jpn7R0nPiEE6b+6+PpUsp3hcX7BSj+EnwSpYtJOpqktYpdP2OcwpglBoCGUOH6EYPuB2ug4o+Xc37LDFuaykvnF2x83ErOHMwj3xaEZuNRlsDc3HLX4nUb9EYaWo5Y82pXwZcN82o0LVxqcmGIncvMJXgeoL/uWvuF48Sub4XL1PVgmfXYHqVcshCZeZckjFcdTtZpVKxywllxTCmEJemr5vNjdEAhHU4KOvo651nezcbxpcHEcqDwsrMpqn9fFRODgS9PcpufwlAxiC5oTQ1MkbMvZFuXLEQIOs8LGFrUobbCCsJmZcaLmEUsb6OCwcizM/0lYjHX6tDZpW6aZcIZldouN+Pz6llPEzFhmJbLsIajcoX4KjxAY2rLhFIeWFwljDwkPXr6LmHB+iAat+Yfgf8AoMbIo7SiaYAqKun4IfXG3klHJ8XT9x5H5DwB4PCJ9oFcC+5TRkYr/wBIvzDipXwol/ChgndZ0n5Yr0FtMwQ2O5R9DqCj7xFRQ5hIKeLgQ4ySP4rMyIHyVFs9xNO4vFSuL5yYM5lQcLnuITORjL8LiOkeLtiQmVmiBQWaNTqC2EL8rrOn8y0B+3zLmnUTGHStQ1qCHkfzP+0R9W5gWHZ2Qd9c1KSf4B1Dws+EGhs39zKcMgZZTFu5fwsBW51LNDz3/UKxmi2f1D2S+QfiIMMwOa8xylrK8sCO1wl/pJUMQEFGMbP/ABHJ0koIFvoppwdzsDR8iXQU/T64yLwMV1HVUrfLwvhlQzFwSoywHA+fH7+5cajwHw0qR0HPt8EhEKRxDMJ1McnUbwVS6e2o7sWVgdeejMw7c6F/tGmlHgTD3UCOeFHcz2uJ56VXNBK66hNw799yua0ZmFtVTRH+OV8CAV/2o0isRC/qIlW4l+4Fl+Uo2vVepbHocKtjYMJljGEI33EVUr7dBl+eGay5itzwrgxhP8coLn+0GaB+Iz1ee4Qrv/ZBIpHswhjh3zvad8ZSh7baehETv+ifbJR4BCVwXcING6jM/qTi+FLUY2mOVdfKOfQwPP1AIVrgn+EpGI2M/In0IrOafl8Bnl+EpgRl8d/AgdUsTxftKdSxhgWUfFBJtG0vioHKF6i7qCXav1Dyyi4LWZmfAeUdsDrpPWxCz6hM57aEyvWshG4F5QrchAsjSVDu47mc1BqUOoQSlcYJVQa8OIvjimeL5SOOA03HPwqJXH9dRrFZ46nV2iQEaolaOFJtgbbtX+WJV/6jjXXj4B+UeRKpTxcuM+TwzSfRKK0w/iX10VfbHGc7YBJZ5l1UHmDr8EqA9xqVnixUXY4Zv0i8pcI+2WBGKl1at8s3y8r122eZb0XrxwxgGkbitvNpcrLlMg3/AFm03yuyNt0Qr0DywS5U6L/mPuIbKCI+usRlRK1/lI0IP54qVykqXElj/eZ2sr3KicDhF+MvxLIZmZpSh6+OH84j46cF9xETbWXNG2h4Jcu/hcqt4QtPNFWB3BIwrxb1Mm8w2bXdSxyUP/MMRgVXCEiwYO4sks/FLizcpuUmP0wMDREeGX7hIYmoLLhgjqpqZ85FKOvMzeUOUR+DFHUA2K64Fl1GKjwxiqLGKbi9HrD8xRz6cfzxre0dQaleg3DvXPgb8LK9cw4tGa1/cBLc5WoDEndeV5juCaUYJofC2Spv7x9kabkAAfIbmUp9RLYA0e0w1qaIqJE7uYc00Az+Y2DLoS1qmZE3LijL2TesyuFly4OZYW/BlcVLlxYvjgVFv5BXR/UdeR7PmVTzrlliDY0zIQIQidwAlqXhWRIY6al5eLLz+odU/UVBKrqZFLI9KqEodXBmbOKfMpBUuYZ3PMmdH0GJZLD0Khmzz3NNmECp+SooyHnE24OXk/IMzl6jspeFaYurxmsF8RRq1wGOAyeCaaMvpKm4KohKlQYZmDFHz7drMJxzeqhLy/ExZcRyu39MMPc1OusQQlS2ZSvcqLrXYjKXTpgwWAh1UwZp6mAq806jTUWWaS8j3Hk8By4Xz8EPocy7rNJTssTKrwwIAqm4uv8Ac4zY0alQAkGwB+wlTd8HcBWr+GIMyce5CS2w+X0SxTpB6+WHEDtXRlRsS9wV+TUF8xeNpmnfR4nh97bgP9mcKgVxZ6nVTCtDfqEGOq0lsW+rO3iMqbXE9CYF3AUjtV0hlaHRBB7PUCb9dwXG3ZCyqJRr+4iKqEqJUv8AHLNIkOiYp/3LTv5kTvC55LZAmfw6KF4YJURc8s1E4ESo8M4uyNBJ3G2ZcFr2hgZuSGMIZhgTCTHiOBoPEuO+h9ytP4J4TOorZmZcqVXFcYXD9jGIx0Xtnr8qP2gJoMGKPc/fnUQU/wA9/LEYAteBN8VHzBdyb8J/kQR+TJgWlmzbRDmok6IfcsZKgOg3FpLF9RozcUL6jzUSa4HlhwwfBRbPtKHhcxcAtUfNce1Q9xUGBwcEuSV5J+nS4S77k7mLaFMk9jLgIoQe9Lartzof0LlJSH0tZjDsWm4J3A+HqCRbF29zJVTV435qKxNs5ZSO7NSwbgfFUOHgjxcYuDrzMfUtnTh4ZQdPGFBX/wBAgL/yDlcWGYZbXruYwB5DM7iWKmb2HXaH8MOujwcJkInZTB2h8GsPUuZYAoeyFheoOTeG+YcUTfG5qXmHLZPDXNzHtjqMShNIx27aU/m4tQq8zBdUe5h2QZVv7aisbGAXPFcOWNSoOQ7jHqihlO6GvUUZCLlitriDStCO+b4uMMTHFj7EItaVhB7ilwNvGYn3MygSFuHcYfy0FbpWIPYt9jMhPxYri9LK5f0/1TKaR5zwYxlCHIyoO48XHcaJTMrnqV4zLj4n03XCQInffBGMON5HpLLdxcALYluurWC11NHioX3lKJkZUWXfF4Y8DMbRY/GXcSOvvR3AX7bxASjyekyV3PYY6BBn+JudNLguZtaLmI0Q3T/3G6xhtACZazLbFcDrT+pb8jp4DpESDjMKDHomBPkSYfU1HKUdVPJPBGEZUp2rn+Du/DMPl5syc641PTMnkqsiP6iJgFT0j3lDpiO1RIC5hK5CLL+FZh8LmBOzPFXA4WI3cvaLICQ1yfyCHwPhcE1WY9/oTKN09T1rohDD1BrVfcVynlFFC8LEsre0xWabQjFoL5biu3UFgcO5t8Fi91BglSoR+AcBau5SYcu9w3SnmVXHs9yrrdJ0Snc7JFVu5U2Fp5gjy8sW+a7hM9HgLIc/m2q/Yz1Sm5+ZrSrt+TKavT7YvnHCyujfwQAD6GGjFpIvaeoxPX73xXhXAmEtJUtDU3uCmuKitHnuNe9sNJXZEKW5rMVh8RYOKovmuczFywAaNMVPDsg3YZY9Ey43nyS6K4+D8LqBcdKZpKG4YI/wwTsoxErUvwxwtj0gsRgxXRxqOYyoyo8O5rNqMwC3DXmMqfaZiK/qh6jZN/04M8DUTDllS4xKpO4ApVm15/mNatDw/wBzDto3RLOKbrD+5fXJ22RPyjNY6fgbMdQVpGNp4cD4j6n+ZWU9nmV9usd9zsCSrmTWzHce61M9V+RLE+MDL9RBojVlQaerwxFkvC2WmvO8wyeuGZjLC3/onUcBoCVwaLuC6H5jvi7bfBNhPp1BCr0gynJi7SgIqsxsZUQ8SXmbMQ/YoZuGwUyxiAm5XN8amM/qZYkrlGyWxSvuA7LmBUcXiXxfNQWYX9q4bDR5IkU/omoH8whXTTEvg4pIFRhxXF8JKllPBri5cLFa5eojeG/JEvX2Rf8AJEJVR6VBDkgqnJMy5upRoPkncQoR5lXS+z3LmW3uC8HzcM6fSJcS1qSiojdy3bdu0ooWzfcr1MiDUGByqVCDKxmIHwi6vqXpEhHMqECgMr1AZ3lOkIBXiWay67MUhB6EZqFi3P8AFLoQ7amXwrisTUMFbiWC2C4kOH9Vw0lQOsGqTp88Bma01wcZKgs/EX+mvuU6q+4GFvOyMlpfFy6Ek5ocVKeqgz5YxhMxtT+1LpWyPeJXwJQ+gIW5eLhLlfhmSD9kvGNIlZcSt9yp1ZMdwTf51CXG/iKhy6O2L0+CTKWyLbfwWXcXR8GPAuBXHwb8zfVVUmptGEE9u9ox3Tgb8y1/AZVJsNMdGXtFviuBwvNTUIUt2fgFaJWFTXglM8vqX7kr2JSspIt0lMY5iVFj7RSND3mAy2srxqXtWcRsMZSuyXkpfQjtq7T+SZWX7lDXk1GzWvBCeS4YZiKUPBKdRBcTzFFSpUZZlk0hLXyWMELWh2MfLmZ6xgNwdJpp9wemTELRrNwxZGll8Ks7883K+AdI4uBwBVYbmFBhvJUIQCG+/wA6JuKhMow7kr7iOxR9TEyC93AMLfDHBaqYvGpqLwkD4VLg8in1ElSnmOMCYQmyQfcJ5iEJ0MpPzFDQ+J3/AMJY6S7LpKQZPiIDbiD0cFH3FBrEuhQH4jXSekuGAvqVMAXncMdS3ZFu2JlwOD8jB+Asd+KN+5zLBmiXywl4cY8Ew770SklAgszvHgiBbgx4fyI4OL+DEqD4P4IzrLHkv/Eynl1O0EyQpNGX1+V0zXyeGr/ICYYSFpGv7WXUEyBhhtFLngIv4lfA1n8aWTrGpS6JdwPlRSvlkNxD70cvF5mdmM1OvXDwsWeCIqqrzM/slSpjW/UbM8lh8rJZuFGo2XiLiuvgYLCtog1E4eamIxNjfhhDG+TxYf1cHMKTtu28zViMgvskZRfOxOVlRZfBdICOOGEWYFjCoaTfRPsieo6qZjbpixlLB7f1GunfEZp+MRo+5aWrxP5qZRCZvUFVsJfDeAx0MWwKMVxd9C53Lm+WerIV6iZXolagde5RdILz7UkbQwdDGHvmCdLXHwW6l1KSO2d1xlVKwwPjcSWT34Tuda/nhlwfgxWMY3plalthnxCppbL971fZOtXgxqg0t8Oe4QV8KCuFpc6lQswZgcXD6mEUJhDXAmKraiTuXlLSKvDql4lQZW7emVTUXrkcfAN/BIHwvWkKzmJthsHECXVnmLyYRMD+RATo6XsvkWKqNGiGHoZf8Sp9uQLVGsW0paePpiKpKfgwMoRIXVzT2GSsSgEy6EFAeRUsXoFogbHXUaFj7DgQ+AxKgQxKZX16l1t37l0y+zwTqFTI7ZaL7E/ajVLFLN01AUhJnE4HU4h3CjK19SztLfMz74iGTVaI5qlVxUEUA2wlBpVjzyoPAcurAb9PU3wpki3K4ofuMV8PIzKqoA2X7ZQWLHlMF7tJHgTFijUx7JfGovNZjM9U7NeOFKCEnjFxVX8zoeJXCQluVfqYUgK8PC5fFcVzeO1iLcttxCilLJgKWUaMRa23dMzA34n8/AJRWD9RWVluIQFe0TPggHVwCFtnwf8AD/mOim9TBGGkcj9s6Wtla1/w8SVyMVAEDtCpV+Edxhzs9G1/iPuDq+/vg1E9uH1Lqp6Isyni3LkuGx21Bn16y4OCsYoSqlrEVQb4WXKhBzYCeYLQWWVMs8NocExPFwivve5XAUQkUvERZFyhDRKmPcE26jSOIQCV4zFXUrirZDpb+JQwlS8H1TMONy7S4rsCf+Bx/NFxIQYfBcGHMDgzFST8Y4JUMMSmuGXCMqXDnL78TGgV5iDY1EVYJ2Yue0CVEuCLGT6cLqdeOGPYaQEWWWL4uhBuEEg3sPUSuW08I7hqFQ1gDUuZbbMG2p1uG7RYTiZOnuU7r35wHZdPE1BBfn9kqub5qOZ0kOn1bqFeuuowFc3NMH3AWVXcoGapvjfq8y5BSeZRXJKHmohJhIPi9clrYO2VRVJQzTwFzUOKlc8sd/eYzuJcOFxYQjA9zFy/EeLbcfdTJTzPEzvKzxHVidKQai2YZi3O+GVwHgzuIx6DhgYL4ysxzYmIw33KsV7JeYRdiN3yahB0dHngII/FUUt5tEW6x9cXUMseMZd8De2qmXpBDvg2WbgP3UUdy1J6n6ML3FoCW0w/pYn0dHA4Bw34v01cME/dGZgMJNkwXO4Ye1s1pxP+YES5qVJHIlSyYMRhd7mY1n/guYrb/wCKZxbaE07eLsmmPAhrI77vqLkKHgwJXwxiOqd8S/ylEJabiaiojxqAR6swiqMFygcagO07lXwKalOe+Fx5TO5RMXZUtmFLW5eSiPx6QazSMsIPZDTmEHzEuqhXXA4CHG2HBwS4gPJL+HhNxlZhHkPF6jUcvIXNgpF33wFwRD5cE+h3McGIRbVFTLekcwZihqAo66IKXUUWLhExGr/rI0DAuH/KgO8+YiBvBojIRbjDO8QXSjMoz8VSoPJGmX4LzqIxhIJfJwJseziCL1jlxB4TggY7ZnZU8txVa/Ejl4WDGXPMC9ZvuY5p79Tt92wqU4ZmVqLAivdxg5He0DLeOKhwwiZldptiUbZYt/CoMfSPsjtRagp6RS9HUtVKly+Fly4l8GnDN5lKUdaN+OfCoPA9dRb3wRgqPYrJpElg1fYRkBR08blVzqYXuZvgq8ywvMl8PGXDFzM/NDDnU+u4Y4lhYYBtC0lDkqO2b1XqKwq93LZA2HfoxwhAYWiNgHoTDkITrwGh8cE9Cxh9nKoeloi6vf6IRly3Uw8ZnQiDuh8U2o/cYEvP5ZYfYvIxjFVBFH37JbXFv1Nwj8GLXdVNkPfA5H9S5TKYS6VUBYlhyLcTSrvh1NeaZtKBg32lUMrn2osHbBU6jhg8alweSFTMclMkw/MbrvemU0FPZEyyCkhJ7/8AHFdBK9kqnguCEIOZuBwRxLhNQOZiwOcmBXFfB4GkXHNQ2zSpeYaTsg9EP6h1a7Zgn+yAo0NEN76iyoj9eYSkyTwuh4cMLsdobb5al8g05I/igjNkejMFM0v1UFLY0PhX+j8Dis9Dp1GBR/YfqYGM3/ZzXIW0QBiR07li4lm/URWp4aTWYHNRKhljWZ2vERXhy8hBOxpl0zde/uXg3a8XDsEeJo3+oRjjr4lY3eX1D4vFkFTxHDwr4XCMp8ZuN2T+JoIQyrpKbgirfqeCO5V9QR4gslc7SI0p9qnnn1i5w83LlSszcFUmZivuZx5IP6JgTXSaa4uGQ73AVqJRODp7ihsZGDxXFWgPam0RiKxpgL8vuKOP0iI5+Cox3ynUUYxj6jLElDSRRspWssVNPH+YFzyvEoQrEEx9SDN/+8RgZ5kJsQOomy+o6jUDC1R2tdy4PL2Z/SxEuGfa2+FZbJUdhlaeZSrSLruHG5YP3L3rJ3Gv6eQhEeseYVrJ3N8p0kYNxglQReGZCLwCRMorEuPDLbJsu4plwa6OLqMNaYQuV9pcu48l4OdIwABuiPA5mdcZ4qoifSeL+4YxwGDDHBCEOLusqE6lQM1ai1L4G1m5fySVFU6+FFM5dx3wG3g/TLWAipt8zunEJam+pj3PyiLBCLA7IekpYM++S1AZF6kpoK2vnJfAgrrxAT2el9svsRsRxyBc26iMu3hcOmAr1AWT8BIozjo6lJsmxKoq/UqvOmCu20GXK5rgPR2SocXLhwOZ+n4zq5Q7/EK5aL9PuYxeXF8suFNzN1g30R24F7YiItLyLiVwaeDhYNwUEtvw4IZa2MpMe5UKUB1CXTdbCaWDh+TMhCk3QMNb+lwJlGy4KnUQg04YYimW7cYeZTAt9zQfpBK3MFkrPGDzaiE0EvGm5QG9C4qpQdMH9EpOp9gnHcuoqmYZA13l8iJTmLB5DXWS8rBQTcoioAfuJUS5XPGpNNSsRy4ozCKMiLaMRTvGr3tcRGhjLAzWodTAjRGHA4XM2JdjUD2eZtLRDAe5e0NwOWVge5Ua5V2Qeo+GdHaIZbMrSvXjmpOrlhWjUvguwTMbDTXO4YgYa+YcKN6NkVXB4tFJBSdRlVcU7hLhBc9Rcp9fcuDmm84ka2ODwgFtEDbzqtdRhFm5UuHFsFr2GODK4qOpUReRUdOejMk4eYwA76ZVMEIQhOyEIA6ZYL2SoEKCpADSaHiZgMwS6UrylEr4nC838OkYwjloi7S+A8XL6NQeLmlHl1N7FlfwSl9IWur8SlnVYNFuz/C4dwbr0v8AUjFnUGpm9UHjxzTEdrx8LFMYhtQZ4moGgZWuqysfaxgrZU9EZBbe4yp4yvMdeXzWxHEuXBcCU5omavUC2D7T+JXKovYjOtJYHFzaVcqo2ofsl/EeLlyeXZhiej+SYJwTfEjqgtmUNGKTLpuVXBAMUHXVBP8ALAl4XnZNzuYfCrhXuxiK7ipdvCluvU8keG45DTx38GXBCkvkqJMi7lWdTe+J+yP1NjmXGBX2S+Nwz7KYQyPmIEYQZ4MIr9TCrohF4GhMnPcxH7SxJfFz3dRjLIamV48LqD/eEC8DA0I+IsZIhA+N65di+i/SH1nIrZ3wOATFl1NzOwzf9nCyCOKHsPMtQ93M3DgtalMT7st5lxOypQRAFGMJRzbBLFYwjZGzcIcxajAhAuOSg+pfTENFS9I15tdx7HEMSxUqsVE+FqsxAB6xKEPEbjgFHTLVQX8o6t3A57pa4w/xRaGJKgVGBfITI1wVSpcMGXPtFLjN4f5g9opZb2QgcDNR2c5yn6lghH1LHU3x3dxDplRodMV+EoirlnkHCFGY4h8H4HNy5uXGeiS5V8Ar4VHivB8EvoCohbfxdw9xGtWvqBJOB+umkqsEttlPoWNEidpt+g5Nrtwcm4KePv61hiPOId6lxIW7hGdcq+0CLWAlzPwu4jKkxW/KNIjiFuavulg9x+51FtbPsen9pe43Lf1HKGBOahE1noZl1G3Ur4jq7iDaj2TCtdVVGM66ooh0d2/iWY0XS6ZhR7MGfMu6c8AZmGz/APfE0BXkwbGotnqVOjV2fxKCH5uC0G60R3nI3Z4RhySg+YhGuoFy/HF83LmsxKwqmocBn8kbYqRplRhFiN3CPcuwxRMY7PhLWcTHh7uNZ8f7eKu3cwUrPBFKnTxWvMAFOp3aGvFngmWpRPaDwkCaX7iVH7TLlG+qYxzBUMri6cQSGg2+I5ex11L5/RHXDlVx7Nzt/wCDU7lxrUPpMRzKzD4DzwI+L/FoCDZZKcAoqGsUmLZ0hC3l4rh2jfFJA9kJ4YMtrG8y6hYMcMLb59TFeIkrgmhMeYlk/SGVOrcS2G6dQrZQEO7loWZR4MPhJAgYOjczwh+BpwO0Da01GjTuPNVzTUbhrdI6l2YR4JedSvEd8DUoJ5hhG8IQhmJr1L/ctdEX8pa9y4PlzUuPwsuocMvMPgsGDiuFzLz6lRjUu+O/gzRlroeLiUY7oY1XcGaOd6zGdLOrJ9eYQ5rcwfqKhByJLc+WWodpUovAtuianA0crFuVsTjX3zo1lJsDIcAFVFRph3N2SMGDxdNxhOncZtumBcD0zQc+eFwmlD5/M3BMcx1Gkl7fuHwWoPiL23HhVPuXLUeU0LUfsT2xcnLqDFkfbOyJJPIlHLO70xoJqXVx03ul3G1MGAVMizDsxtS8Hg+43ZLWNb9Qdh0eJS3+TFHZX3yYc1mXDMTkEre/4lmsP1LjwkRKjCI5qhPMdtJujZuV9VyrjSle5ebvD+3jCKWauPA1DNuFQe+51MK9IWWizea65CUqnYdwjQGJjg3j4noDfcPfcuPLITaK3llUt8/UVV5lLpiZN2zrNIp7jMf6uO95YafXAWSioKe6iY0qp3wEOHUMqlpQPtHoYwhO4o9Fp6jCamgnvBjD4FhmbJvqM4lTDDdxQ4KklFKbPgQy5nsgYQU1EYvxNvzFjzQ0ktLlEo3uG+KV8Syzc18fCMTY8aQ3HhYhk3Lgnt7j8mV/ol5O48MxeiUdRblS0eRWeI8srUyNT1tn+6BMmf5TLxYOM/c8VPxF2xz2PMFsripWYfBjB4YHBykvmFhUURRfmNIsGZVayiQOO5fA49VNy2FVIZT3G/HcuK7GeI+D/gI6NXVQAUIK9yyCuo0Y0Vdw6rwMshKdSMFdM3L4SC2vURWe1jGFVMaRx4ow15l0IVu1wenLR/o4blcbSrSGx4MphpUYMIcAzGWTv7SpUGqKto8sZ48TCCdvcc5KNyVQ4SJDk3DQRgCY/gS+FN1W9/Uvbmh7G4ywcgNwS40Hb2/xB9CDbH8K6gOJ14Z3v2yn8r84aaqmj7vuLSrajuHGHs9MWx/EIo4qV8jGGfCAhoyi/wBSpKvZwwlDkslFlPESnOGeeFZDVylHjKxgEKvMIQmkYKVj/byQVLU/jipUWEaKOZkTEtkpeowT8BE81AGIRlsxxfDF9DHLMMwwZrf/AMRa3H7omMf4FRn1RQXCKDZglyypg+7v5Rr22HfAhCWfqFNDBKtkrvbFrkGYngmoy8D3WOcafMq5qAyoOBSb9xoZ/ES/gC7sbl4mZbhmcFHIYc7qviPaJbUMikyhW2KCCajzUqWzl6YN0+PEwSqiMWbhwlhj8b4C5riq4viFpSIeyOcA+CCsH2xRZX4S4YiWpVfPOoTD7+YrJly7mXGxPHMayren438yoR+BAvBL3OEAEOOpZ4XvxBSPgwMw5rRKdD7P4gPLg8Polm/1vgjPhD4raJLQu5VhnUEHBT6gnOSlBtJx56pmVni5sQaymr4rZZjMmVbUowsbEVrUXYLT2Ri3Rcr4UH+UjIsDr1GEqJdDPcEEbXfiVDmpbiptY0nQhTMMvh4ti4PfcRjGmdNDDJ5j9pgurjKxOqqE2ZmbkhefcwrHOjKjX0dTAv0VFzvy1fuMUMs6n8xzRnravcS+3awQOb0EBnZ3HbPpPjXLCALYGYg9RMGVDJDzNTKYPQjZH2E/hmIYDnTUaRMpA+gfUoSy7gYMp3Fq0wq35ivfD+2PCn7IZcGxr4lVJ0QNbflAtYMmMsHgiHMcKVgHygbXEaZ9nLF4qOof7Gi5rgZAhuF+nQRwwncYw5vdcG6u3DqRrft8TufX+Y8DRcCT+oG7sx3wIQHIiEp1CEQihQurXK55EXiWVi2L2zDCz1L1W8JfGX3LpzI3SVEovhzBDOuBoD4mQeQp7i9odwuip6iGEemNZc7jG4p2Yu4IIqwafphiKRYw7xBHivgxriGjElYVKVK89QJUJeIsuHNoeWIsUQhzcb4l9PDEbJcehxHLdRkTRWophHYaRX6GSoGRYYqhXoyxKhqGd/uKhFPGz74ZeogqrWYj9w1xaUkZcwg3HHxFtTZrXLb6HCuqK+FSuKhMLHL4IbKKr5KZZDI2mvbExsi5E8nUdqdzc/k7ZVw6Pa42oX6NYuX3gazAA15qmB2RdYJpne1laQZaZF6BB5/8hWONrJS3HsKlwTbTKa9YRyFJw1Qt9TNU8fRHRW2JeModXfrjIwX4mIJKlfwqWpfFhxBnZ9kQFH9DL7EpXGYneoNJ0KFdMmeLOhlLljgqGIAbjvsBZ/BLq/kgjF0ILaz2zTA+aj7U/mJePMaD9v8AqUIAPCJ6qLDmowaoOyClwqXwgRYPF8sUE7iJj065KRXzLuGoGmHxFyV9ZE/N3EOU8KdRg4M6IROyHENul5IhZiMqsf7ZYhAkKD1NzVt8LLzAqLxsYZ9rNsAW/aECpMqKil7alKZevURBFbHuWD8mWY0kFgfWuGYTKrb3UMRMVcJcC5rpsJqLyfc9I8PB1+XKtqeufuvaI1tZr+MqXMj7f1FF8pF4jmSfqGOCsjpY6lx8ILt+pkUAmoDAYZ+cxTQ/uXOJD93ELmoF8y1GMzyKDu4aipYymI4eW5GqnQ1L577gLuPrT7I8FDLWUq1BwavxqVS/1GlYRFSVC20j6g9BhUa8H6iWixX0jeE4z86jBsJd8Qxrnri+Egc3A9G4q+a1AmyL6zKgBAFXsgv7mbp4nVMrpli1tlKDqUCXkilW8kryZioEyFTo7jCvRKZTlUL1PsnXV9w8y+mLB7JfAYVLlRO0CPxz4a4O5wEPzTeL2PI+aGtYhCKIY8StMAEF7RS/tfg9S4YQK8Vt+AiDWrZdMQArGyFPAy/Evgaku1UZPesy+4sMdo+nORVLRqfCo2Q5aWAeo/A92Wyh/KCwU3cbvO+VuI7T6+o1DuGYZ4rkLYvlcPT2yWx11CMxbmYjGWRC5O0SqjFV3MYdRb+kZNnvueH61gg6dMbv6n48fMvbe5USu5SWVf6pSwjLg0vcvhduIFWcAiS0BhWP4iH+CPlHEIyuGHg3H8AGmKNNSzQNPaHRAGyLfF35jGjKrwl0EeehRzeUDV54AYAAUrihAYqCnRKXWaHNQj0fl4NZswRUR5FhdI15kZrXa4/yTCI15K5ZRexDHpB4TfuV51cpASGGoPEs7I3DZCMsclGIzE7+4Vsu8wbFhoz/AB8BF+9EOQijKCfpwiMzaqKij5XLUESuWiXze93SUgMjrLCA6A7hAghWfoQ+bgGcw9zLjmJAnF8FJ2d8FCrxww86GSsKymRMO7ibVg0QFV90pF9CLwgXrxLMDcyqCZrR4ZjFtA8y6PaVqJeoYKY4gy4S+dR38F5l3Lqb5GkYrlhyqSuVvg5JBbxbDAW9Sy29KOi58EAdFRkN9GCN9fEUfU1wkYeiyybGbcE3UB/MJVxJEEYSuLEIMvWOT8DDw8VZ74uAObomyK/8/FY6jfUMtmzOWeLhaJc0cCE4tUeZ3rWl7ZVwiZ0hj7n7h8BTUC9sP5j+lQBaU6QPy8Xnm5sfuLPgZM12RhKlQ6/UfER3AwcErLPs7+Nch4ObGtZncXMomKAJWog3C4rHklJSAugmYTOOvxHdu7iqfxbg5E0zWD6lbEqLwuhAVIunMLi5VQLOmBbXcBciAK+w1E6o+iXe/k8pGZlbK1TKAaNPmLt0ZuGdwsmkWrWtiPfvCLAL0hEVRPaztT3kJ0GYtjMRbIOYAaPvPeErI40mDamWAOMBH7WdaO3HcyZy6YmF9XUu5ZgVxbQjqVTVNRjeUimDcY9BBl4wk/0jUPBIqmfoFqzGZWan+H/MOF2VBPNYJ1BOJcEe4BV2Kgz7YjrDJgwf2UXs7az4iHQFCsEAlX3NgqecRYQy2rxXA49c1nhj1Fn6kWoWhKbjguuLxccyoqhwqGutEfKdjUGJcMZhY1vEO0PBlq3fTDPKOXDCwlcsOMtQPDBpefE7HZyGEMMAyamUVZkvwWDxfEY1DULhrEbDrg0vbL1XmoGRKfaGCFK09wK/Yg8Z4q5l0+0EWNfwiA3eTK0hesZ4MeSZse4/IuJW8RlyweNQRJmslVH4M0v4GI8aZtyG5d05pep+CDbkecJKOo2maJh/cypVwY4lJRrQ/qIw9vazquMTM0cyMJg4XzWpo8yvkTvuWtBi5LFyuEgzP4UfD6KG3khL5QDchnfqZji2F1A2Q8VjxkBEMPiWt0N7qaxKz8GVxfFyotGjPbauAvkovct0BFrdbJUv2yxXwdr8xOj9wQ0+ZToMFZ+xDRXLBKVv8R5mvwThvpAe7zHPBXmYjK9wiviuElTXB8WLDTG8mdL1wdZljArZ49SoB9UOC2/mBAV1uhXLhNialQjKnf8A+yXL27/3l1CKu1Hudspk5DMRYTaPnsiJdMGrKIMK2qXjxVXpjLfWILDRVcLK5dsuabU4sY9PcqFfvhnZW7TCMlGG2GLX1bMR9HaGmC5TD/WUwJrSiMDgRUKbcO5aQH5hjNGDC1vubHK0bYNkdtiIjndSt3FUywhDcuS5+HUMxcVHh1GWoRsx64DdR7u0Bng+A1K6TbClA9jBC+98UfkPmDq5CWxYMVCe01fPAx8Lhygs8KMFMThrhWKjKeIkxjqa+AlTQ55d1sFpv2hlDUHMLV3U2lyLleCXcW1pbphF8H7z+KCbCXR5lrRjoeI33Cmh1lGTl1UzyTo7ELDD70wZsTHbh3x1CLtRM24NuZYdWRt9S0aX4jRA7Y4A1DlTuXw6hMl9TSNSwvoZSUkVswR3EsICyviX6aMlxO2W9IDEnREL0bJkp0MC6qP2PwYMSysJmChvhhwMfcVV9VG3+pdr27xM8YMVkCIZYn1hZuKKB3kmGowjDvyxPMozSxhaSlk14goynI4YHN6rj8WdQOaELZY4UooVPMBUTo6PUuJiwYmCG/2f8R0RT2ypUJmd9rz1FWkTtLTh9dhlqWXBcTPwEMVh8VWWA+0dwly+VSq4uGZ7tRp5iw0E2zBCdwIcx0KWhFspFqtWmWa50VEWjoQnAqHVy+FygC7YjVWvfF4+4FtRkSYFjj3PMVcVPMuoWrOahJZPJyGILa5lA0KtS17pb6ljYxrt/E36hrm5qG+mWqugJ5flmCixLRTuf04Qy88mPEdg26hQxe/9ISqgdGErQHlVHbfquoQtdg89wm1ShGaEDuZP1DLDLkd83z3tQS3ynAMvMqOlv7RIMt1ApVrhZv4A+00IJRfKLmr+CEgDGKNzKEVDX8wORcu4EE2+BBj9xH5OVmSOFZiC6CHVd/csF2t8s2jxXwgoQQJcyXLfY/M3q7zOD5SXDixMqAlS2ePqMmcTL4Ol5UKyHmPKfugzmVx1EvesQ3rC9R4irbo4EF3LY40IwQ4hsK843seThafUq00rrio5PgAYFzFHF4iOI2wL0uJciXJgxDduZp/HUrl2WA6Jkn1wslSqjo1nUvnqLpLphlcxUddTm5oWFt+I5ZXFSuFTMyyVHgNdVbeUMQblXCBnUu4uxf5jqNP7jVfpMxvS1j1DVnaiVxQBcxNRigzCrfFNCMAW+qSWYtr/AHQ5FhrtGrCxcH/cyh0xKux0/EhOMHUeuL35mWwVS8JkvNwBdjtjn44TLcumiUfzRHD8yo/BgNtS4ttjGCyMpB1hGF154vtkiqlG+iULOocdvMNDX6UveSKD+oyooBtgkGmnKHh+SXd2bxEJVJpJaLlwH8wahBrKQhp7rczQfQmPiDHgKBReUJtmLw8Z8qoGzNp0/mZPuXXDBPJht9Kl1TBT+Ya+5wwZlKO9QCkq2mUOyWsuEbHVS4Jk5WHJLnGZrnqXLXkcMyIGyUgLNhOteIMS4Y4eeXoxqFIxejBNS6rsxHmgIXykCocYTaCngxrIDZ7iOPFXKNvxG34rWouUTghYwwgW+iJmN0I5tHJWH1FermEIQhuVsVgy27ATFvuO2g7MS/d7swQCXuyfqL1QOa40JF6j8xcekK2lsKUoZWLv8RbhLA+FgcH+eDZ5IypdQcHVp9xotweZeNh3KrnqXnnA2kqXbt3NTYHPiGl0Bv8AifRdWIByDrL27LIVUz8xEp0EbzXhqAiWrH0DnFvp5dw4WHedkPidJxaXavyqVMIjy0ai+vompVxONVd9RcHe+QmCv2gGoJvXqDEEaPoGVTg5COCPTLZRStqZ4YGMelghYGKmey1NuWH3ESowzK4tCpmJabjC190rWwW0mVbDqZ0kr4YUD57lTUYIigLlUwmbps7l/HQcvDGCFjUjC9zI1+VzDTxS7iXvdSsZNymDdPJmrcO+NQsM8Y8zHwuoK1MyE4xk3Wo41sr3Ait1Vuo8LEjwk1LxBgfuU7XbBFKVwCViYfp/mbUYCzcy770xGb4tjoyxX/RPYmnZO0flEdQho9KXIkOHcqVzezDbMQy+A4rQ3C1NRrrNEcJ2SuH4MWRoKMAdPHRAP8QlBjfhP+paiGp+DDhhHPtNS2UztYZuI00bIcRYOESrZdD7ZPmWX5CWNk0lpoCkA7T8z/a4yds6heIqHUXUvhh4ZUK9Uhdf5mQAbDUVCPpK6swqX5MHHX/cEr5S3t4slWx+EaMr5FwQ7nhRP7TMXohFlw4rzBW2OZCCwH7jgiSq4b1hh+NUubVV0f1mCvfGMbyfSC7UgCwqLfdf7iv2J5QE5yOo/wDaXEhdquyNBh3mMILVELjbMvKcmJayygGWE9tmvzL4YcaBudw220Bcu/C46O4LT9RxcuMItourlrWrueuDhOCDDTNYRMb9yjfUxNSONj5Jmz8IpSJKqXww0FWyUk3s/cMQ3mxnNk6FUHdv2SjYj1LgmeJE56Llmh4Q4qIQfSKCB6vFmU4n7j9BGYLYuHjccS+DQ9zeXVgO5laBvxhEBW1/t+FZ4sLQBl55Xg+iJTxW/fwl9JcpYwzDcbix4YEhg8JCBS36lleT7lOduo+yIJiYdT7p7nX+Yi9eVP2uYZgxZzqAlDcXPzLm8VHi24CNDCrVnmI76zv4JCdfCqXZORK4NlK6czx1UXaPfuVysOBqGq7NRnUsw8aak5/PUWqiX1xUflULROE2SYawy/vz35yQFr4l0S4gdsqFOtSpHpqZPSE/UxIjtSoovBtdQJmDcfLo8QWV/mVFLyEE0qZhR2mIbayxS2gSX8ZPMOGr9mo1504uHimDXFR4VpkfiLgyoYnaUdsRhaE0rxFRl2w4Zc6lbfB+FEZfKumVdoRxVGD7qIyrQ93lVMT7eophhqG3WVMEfeJfA/bxVBuNKhF21FwE9BBTSvctbe+alROEEQe0RwaY9K/hKOm5fFSp99G1VtEwdu5fF8JcFz3copbYWOYOLriIhl5fBFc7h8GA9BHkA/uYuOh2oFqyv5ggH6NR7/Yj4L/66i3D+HKJUgvtcFvRK9dz3Gy5eiiZvCNl1PeMsPiGA/tMXij8JsAw/fCwYVzDes+oJjc0ko7ufpFewhqo8SR+A7VgjHF66hzDRwPiKjUxXwr849n75rnIveni5e5YkPEtSVH4LxUVFsEbSqlxwlkifnhqW5ZGE62+nxFiBumCVYnhgz6zP2SqQBAJLCfynDkljb06i9bvzCCbR0MqrWvUqItEkNM+RmJXDw7nq2Jn4LXj5Iro6I7hiLcZbK4XhrSGAiEPUY0rPUu9kMwU/E+B5NMuADKerH8kMtmD0IHSzMgX44Bqx539Jjyg7dstz/RUNBKYcYjmaliHc79CDRrMQK6y++KxIEGSWxmBfqWC8eoKULGY3HzsRBCzOpQym45yajRUL1cYJm6esa4e0iujsgruUO36gnRz2wCkY8Lw+gl04Z4SJ8UjA4AD8wlV5RMzDEqoc1FFzCOGXLnXLwCLGp7eGMo2A9kX45K7lKofYsFYZXuhWjvjwhXRkhpHtLM+D/NMtHg6OLibG/E004l8PHXDr6UqvhmblyzeJS9JRu45YH7Eup/cfhqBLtjoPHA5YfVy8h4Hk3HsB7epWH3bqE5yMKFWcQ5OwHHEO4umhLRZmnEe0oR/dMsEvp3BdS7ZZK3AosI383Eq1POi3Psjeje90dlWvNw4SKsRW7hiR9IoioarplxiXwVUYYi8Os+kUowiXUuvM7aV4JaBfS4JqYq2bHDLh8Cr+b48HFxnK12jErLxGAAHqLwx5eSQflGlpSofmB4iF49k8GQS97imttcogNA1Pzv/AFBqgtgvbszf/rcb3XlhCBXBcyREs4lUHQnoR+NIxuGXL4wYc8HIDD86lcd98zw2XuMqpnbb+ks5PgSBw81wIjIU+0A4ZBV3aXXMDX3NR9I2BgjeVxeXwXFRukovfhwtz6zLh2S4rm5gL9QzN5ZeJZBwi3fELWZmLtep+ND3EwmOxlQiNAcVcC8tSrQUjvirgm4iqUWrqXHA+ZDg8eZhqr1NTX7i6Mrsi7227gI1eyWodRfbFtjuHFRhzE4epVyoYYoz1AVqbWG/nH+eAsjQwIZVoFdXQaI+aMCUNMDsfYqf+8HO4vXTd+hF4NPrDkMvgbifTAzyS5uV8QNfcmY32T0MUzHYIRVr4p9KsQTSrORuVAPU1HbedNpcvyxcG1xsaVCACsebvgsB5ZiHubgc3PqL6mAl8JCPCy8mUb+owlWstwwy7Gvy0tNqWE2C2RGY9y6jDtZr8wb9z007H8sPDx7vjLBES4wrn14bjSQUB+ZXeoD7xZcWVHEJuVK4viqAW108pncBmCPJTKHEFTLcto8TeVaMQf8AWQ6lEZD6y+Y6mxqVEl18RcCZJUYLPKOb7YKqVKrio8seBjh2rMjk4P8AX+Y3TN2wyxoeghmqy0DPb/jgNGphHohiEsPuUlNcEbjAP0y4PxOK4OLyx5ZvV1HKLN4N/D8BxuEdKvJklyvcoq51cxVXqMPmSzrqXax9TB2GOqZP3Mk9xnmvlzKa8od2dzpUbOnBhE7OERxpZuRDURzDg4MS4RCEC8QWlgnHxQ1FY7QpytwEcLumd4ptXczLDycOhFPrr6ghgJFIp60ZXmxquR4uVNTIuI0ELZ0xdIu9w9GWW3X5l7+XOJjH/OCL/CS/cFHn7nuGXRsYmIudROJzwCB75Yy0rEa8yxGpb7uHOOXMSvgpRF+oqcwzxSwwZh2zPiryRVq0bkuGTwagNlwFKtePgInQPwjKiwWeN1GlIBp23Mibdw5GLY9OowhzUM7biUGSZnqY4LmNf2JSafrvLGzpqZlLKhqCugRmbOIHeFIfIYjHlsVrqGVTMGomhV0N5LNXOkfWZ2biu2JK4JRKlcsWGImJXfCKkqZOReZuD4a+xcFHUVgcJTzGThWQyKXN5XKokOKmum5m4/LqNT1xB0JJcuOuNS5fDyx4X8BLCvqGmT7jx4Y5wQF4NqfcbqFTO4iXiOSE3jqzzK42uTKmuDcriuQw+DEMRHhjDHKrlhJtGpY4gw2xKCpa4lqWGL1MQVB8nEF5dEsB5zxVMwUwsZiorVEeuBKzy6Grp1P0AnBGGPRcSzfvSVAYDFFEMb8CbJg1BCBCEqBKlTKX4lDy88HzUw2dSqqb4LV5upgvdS+Etd9jE9xUBuV+uLjDbR0RHRg9S5Z5fpKmwHpFqmjCxD3Iy/manv8A2zL8F2V/3H+nGKv0y/3nVwpjlgMh7YpYmYc3Lgy/oA0ZUulCXLmUqmEDcJS2dIzCovhSsw315jQS4XgdwVf0sxisdLMpvjqPQ+orXzuFuCOv1/KeTioOWX4SniuyW8PIi4B3MbD0I8B8K4uhnwETXYiGCBS+phBfcwpz1kW+3TogFcBoNEsfcVm6hlWPxNnBlWXa3kJven6mWA5sjslTuZIwlMMmKYZgg/aEOKmNYEeTLLcptjHngeagaFHalYQyG6P8xtsiVGPLHiphOlZb6Wu4xAOGgvTOv+oL0hdWfpCfYAKa81Nkv4nwDdnCoVrymIs3yI8vJIINVF4WXEEVNo1Nfw4WL7I/1KWOZcimP0m/c2gzeXU8m4zRzBCLB5uLwu+GVwfTqGWohcRVq4U0lDKiy+OhuKr+Ql5FMWTWhmDmUG/3HlMC/qKQdqZjHNZ58Q4YPL0EbJ+iYr9Rc8MQLCtuJRg2MMGokPlSPyYvsJa0uXg8o4YigQhCGYSuLlTCLrzDAFBMkct/A4uXwSJ6MRrm/F8gWck241wNEuUupdTVsuK8Fvi6dO5pGaIej74Sja1+Mqu2eCbuC/REVa/Cbwxv4hxX60sJ6m5nnJdyYvHnNths3+H4PKw/tB6mVPIxIwEeAK47UxkxG7ywKCsY7iCX/wCMQSfWu49amoNN9wxvFt8xsGGx5SHB2iG5viuKVihgm/8ArHMv5BYFyzq71GtJ5CVJ17JZEvU2aeAy5vR0JNAu6tR/ccZ0fseDG9afmXDeNzM8ul3FnV9qy0lAdErB9sj754mAL+iika6Y1jCtTLI6Zp6dwKC5uRgAqk7o2oyibAqpiPBqLoXBbWEUyg8SyjCXbDC6PEP39BcEEJ8uZpWB7Y/F/wBJcnL1ZqBaAqniHegoGQHR7uECsW11Gt/UbyR8EKfACwTwgZWjF1ElO2DRAsaXhuWXVkoCA9G78ksqCPvhZfyBs6DtiV6nL9wcHcr4CMeHUThjK4mzHQZZt7gr1xzij3giilCy8XcHGLwsu+NypuJwPL8mH0hrv7gSwuoiGwZOMFW0ieIpeVTc7oEWWB8R3at1MFWofmXPb3LEmoDVvT5jrgSMYErgiXBAolCKX2iCKx1GVSoFO5W51DrK+VpKxBxC+PEexW8gXHwPAgsOyaLhwcETEvoSoK/w4qBBhwciXBFeorQt2lkYB/EGAbrmuEjbozSLZJAJhbh8+puZnQlztzsQ8C3cWxzCETjuM0EJoTzAUsdMDaDA9RlfSSfjMTZ9iAkKOvhXqD/J8TlYrI6W4Kwr9IjrUW4YAjpgPIuCmY+XtuBnB+TLwSzb3DUH7cXLl3xVsSEXzcco1iNxj23qZ1g1K9E2t6lOwo9krGvgX/cOALmqhOIttLBY5LSsl7hoeDbtfWkxtwd1k1zFji7YOC23BN5U5xDAJVeI+MjpKs9XEzQ58xAR/FAvA9oibv8AjPefwUxrWfOyXV8aLzKFZ6W5nVZcyPAwQXl472ovieiO2rhw8NQDuOsuOD3GxvwjKivnaWl1b1GAYM1VsB+P8TFnvzECUT2OWZPRuL7xjEWTa1zbFUvl3DgLmX1H8iwkE/sZwCcM1LjyxjEmBida5JYzsJe4gByYi+IGM+nKOMSqeTzEZR5uBBdG+Ah8biXKhKicMHixHveCYt9zen27h04MAIN+YWBSnEbOyCBfF/BKqWZEBLUaYhoT3JPMgy1Cqdsa4sO44gCDh+Gf9TrS5lo9szWT2u7zwuYRNIlLPUFPwR2qfiImXBcCJpHp/aYLJbxEZ0dyotE7vJlL50XLpl31FMon0ILX9R9Es9ymX+ISr3KW+GHxrg8qKuGOyOvFSnLQyeCLtx0wwzn8TGDMsa8xQujyGIeql6yETyj6xFcj9y4o0hoW9bzCiwuaVLxKhx/qloI9rB7QcfXFcXmHNTUzW/EuXKITbipbN5dxK8VGGIQsOlRLlVNHAYw1BLtNEJDb7MB5fhUxkDTc0mT3Bd58nMpCa77jvgaRl5/ay19RrVBzFWROH95/1Khdy6/UQT1Ftv5YRlRgWviC320YZe4IUhmTK4odJRaN5DIJdf8AkEB5PekyooSiapBmu5UCLxrPhcYRgmJSaZR/I9n2QKx8A0x5Crn6JdN0PtS3VWncqJGYd2yxY+uamI1fuC3gcVKqEslwlkZeooDvOU/MN6C3RHbgrgTUGM+4xixijha6jExLzZNMfExU3lYubUyvB+0VsOB8k5IpU44HwcQbjKgxc74eLiqX1AD3NwaR7IWvzM+uJoRdinhlHq7PEyxkawAzPuCVjuXfjI7kzZqpWi9WEYSAyF1M0IS/hTIxhq6xFWNdsdtErPLAuojtBEt5gLLHhmXSfUn1J9SOXm+AyrWoHAhLqzDMyPHMNbp1DN2HohInyGoh8ot1MgjGDdRcVHSks5X2mQiw+ImkSI2Sl1YY9o9poijxxfJEP/CpcMxySa0BmKl2Bne45au/FM0d2wlMyQ8xFyCFj9oExdvbEOGBRKSeZ2v0+yW4z+xwqBZ6Mz/LlZYPt21wMi7uwYRYPI/CwSpUrkFgS0V3twsvmp3NsY8VweLmtojlZvrJLIfDEG5C9wGb36YZHTCDjq+oFPsCackGVD/FY/08RbPDqMHSMSJR+dRhG6aRxLS7V54JoZ9w0tG0QY09oVvWSewVypVv/ghxI9bSJn1tGYbrf44iNOGb+TUv1MPqCnPBhU6nOnMAq9mkHkHlUQQNuKglN1l/pB/RUjCm+iqHm7NlMz3mA4qAsngo/RlBOXVV/wCp9Cuy6zFb4r4ahEhww4l/I8ndY1yaP9y9nUf9OL25/JfGHUwJ7QZ4OUgR5VAi/A8hjmXGyyJuCFlQdWyYdC/ELTyYna+jEKQDs1BYJVDcsNEaA2hbsGZRkK8jKw30QjCCChBoyW/xwsuAqjcILV5ghtm4NS4hlxKzL/UDuv6mLpYqq0cPFTBKSkQPleasVwyd1BaibkJwDLcGPWh1Gmxr1GWEMvOfEOxkiwX2XwZewzrm5fxGoRwy6Ia+8Iw3wFsPycPFwF71LZUqXU37n1DYOc+hm2HbrKZXzdhmSJPqfqPihlTW+FvheVB5zAGMRe2y+ipjnhhxUZcI65Gwy5fO4RbMInZl/qnVAiNeJWRfwI6SfqKASuolCj/FK0wiN4YxLDMfAqINj8RHTLXArn2hXHjthhLeGsYqI14E6mvEtsphsQAQAOjxcu9/RKiGepTADxYQPAB1C/maS/8AeskfgzsYTICc2qAmoazjB5SNLgDgdzvLDQA+4CRHosZjedEpF6Pkix74mMbGo7R9INprwGdDcfMu3yGsK5LaGnlUza/JLXw/THb+Ml+yWhh6DxY3xfDDhRTZGCrZajLbllwe0aXrqwqXBo0IhmjkLJD4XpD9O0EW91lI9xjfS1V2yrow2rn+qbj33sqHn5CkZ8stz+GCnVc4bz9SmKgYic1NzbhXLGMeFzYtkMWZn+v+YSmzpj/Y5yEIsR5jLjnB464OEhHgOETZAjwEYS161TMQ7qp6KUF9Zj+d3iBBonh7lSUXnEfUJkZV/EtcC2rl5D8pimXS9x14vENzPccQTRhq9sMtTLMpSNQXtCKQ9D1NNKE23OtY/cu/+h8QBsr+MyJOX4HEyJTKZh8g4DE74jCsvhh790lG61FtqgGDcW24BwlC17lsC/UZcpdvLDm8zaOeB2iw9lNchwRhwB3Fbi/g3cNygy44ErPskJybdbxYZB0mmKeKmpUFhCdXUyf3DB8rlxlQl8nRdPV9xVEpOKosPbElk+paTAB4ivbV/chhVrR4lZALa36YkxjJ1JUZfmLP4vZbyWWOZQrVPiW9JfA5ir0PTKJS+GZ0Ce4fHlGKQr9JdazAhu68JY+zVXGkoa/3mVzH3KRmFtCuaYfmvqAN3mNI9+IW2nzE6XkljWNRe1smIIyn0z+Rx4ItlQ7jwnxAOuNTXQ+o6g/RFP5CXXbcWp4GYtkFZlHr3ZJRCPbTFAO7Qna8HaJVnXtnZxJe/wDEturadSoAMDUu+LjDHCKwyqjrsxbmLxlMRJpHhDjRpOyWdeneCIaNfy/7numAe1/3Nko8BjL8Zd8GZNTyK3MnJ6LzXwXGqjw8vLEvhmHJWZl+n+Y7gfCJimCyhZB+9BxIoQZmypXAKl/OuaiXbzXwZboG7dkMCAPUTqP1GT+CHXlKXIfMuTNhYah2kpAPuZ23AdXPlKbK2H9xpsphrUIlSaxg3TMEQ7eYACKeqtl4VbszAG/uS9b4qlBxW7fg8F41NypV/AAshZL4AuZXoVK4wlZl0FUnUpG0ds6D87lK8feNzo6i56roGuF6Q5r/AILpxLi3+4mFOL42lfBfF1BvlhbiXC01KmeY2Irmxgy4UtVrF8Af8TB+zn8UXyweKgE/ACi9h4nbj8jC79S4Yv8AcS8Qe1LPf7Q1g8FmHuyDS9EMSixasq5ReIXk8TIMPJGdBcNOG4NS59h8AL4PMZBNeJ408uWFHCauDB9BhMx2thgL+6D5p0xCq4NYJ2yPCJdlYCi38EZfGpdY/hirITN07RytaDwTEeKAzHawA33zBsjAh8+SYCTeE9f7v8Mpam1nMvTLocYE1J7leXtWd8o8Kx5EOlv2RrkVLMw3TbUqYqKBtXKdxeazEow7lfALajYR7vcfdvXiXwdRmUXFk7PMJiI0rr1M4H6JjAn0rmoU1C/ZFa4sJOZW4CZURmDpiVZY8/8AAFwtHj4vD8DzMplyUTE/CdW9ITR4KGMCC4ODE8CMMPAIIJgy/XNx4qJaLL+F8sH4u5gzumIrEt/DdamrI8bmP/BUpr5jkU5ijoi4WlR58xMxKsxMiz0jWb1iWDhFF7l3rWgigGGdk7p1KSL7DEGNcHG5Vc1cHBBiHdfxPf8ArLkc8YIWZhlqpgRZuE2jNXcw4Ewj2bjY0rOJe4W+SGmJ5hlPuxcB41GWdsUdzsNGVjMyZfwDmpWL6nkLgdz94j8nkgs7NZmJZOK4Hojr3MNB8Fg3EmocJKhnEOIAVgx32f3MVg6QSoXZnEabl+yDYgNxVEhgY+03GDzYe2pcuLysWeB2gd4gjVv/AMHcqKz6c/ctV37QWd35iw0B2DUEtn5iIWmLjEdqtl8HxAzFWqIMoqe8GwemZ4lnsEeypqdrT4Z0dMOqLercPcFrL5lhoAO5U0wgrR6joY6VAqxmWlkKdGPcH1GHkt8GpcI2IWkorIYuGOB8bPkjVh0iqlq2sDJTKlgSjGz+Vmx9x+gPslZeL6igyvazY6ggGxoe2aEDrwiQHGqTNWjE9S4NHUu1hdWzqixM4xK8ouhZrmEqBX1AcshnEf6i5ZlzKps/1OyVZECsFYmAkwmAgur3Kjf1ADbNUTFXRQXM61YUU0Pcr4/JG1mDxfNDMZXAeWMYkcQwKjyqZH4T8HwQFu0aqPjAm4Q4LMFfcqozN8dxk6hQ+SJ3l+upt7WnmiU5eeF4bgRhL4vPDj5Jua1L6j2XcZFVQpplpO53u9/UevRqWQ4IjfmA9MxmDvQdw2ytIRjp4uIUBWJbBhcfRTqDaatK1mK2JtXx5OLfRjKAFZTSw+ph7z6gd1iblqVuElQbqlwzqssGp0dxo08kWnwxCYbViaYSxAao2lRrPU47mOVe3iWB+wyy8ImYOCVCJwFFv6jbnIDYF1H+IUNLOGYb2I1X7M0l06vzHKZg/EEr5mKXG47JiLVs88ejxDIu+4VHV90t6XtOFmJddCLUol6mFNhBBlRuG6KvN/cw3XFSoypeE3FgLZmzSKHxyaqtbZUeKjzbmaYD7OoyRWZUuBjcUUywAnM0vUXu6b6vIMvGqVhNW+Wy8Ghrtgy9r0mCPWJcZb5hLqUdMNseUV8KlSodkrkLVLMuSN5gReyHYJd0QDZ9TIf3HKSoMHr3GSmHT5gXcvhPzFAx5bggg3WS6DN9MLAbFDZUCiX0OpcDo3ANLLuDKVUreGFCMFDCcWy8CLZUoO4qXbFzEWL+6GgT2jiZQ1yY+H3BCS6sX6uHmTUXBFhmVywtH+5ZMVq8XLqJCftGB+BnlOS/BiR4EYxKn+GC6W7HiVcx+5DN21HU7jNQO7Ja+iXmNkl7hN+KA/nioeQX6jaqx51EMEFanUcXF4Lidj5HD3uEuJwDlVLuaQ5DHF1CmYnNnZlNXRncKmehHcIFZdwV/QjK+4ifZJtWcmPY5YDuO2ZjQ8sa1yrqpWbrFBMMYesT6EH/AJRU77RUF/hBLlObstfzGT00MEqJ3rLxUbQ8jGRyV3PalEfiE2Lycwl0bvPDrhTzHXAVwIR3NID0EvjS9QFINtol4rszLwZc0alcAY1ZEUIaHExV1UtYPFE4Wlgp8UHFEZaq89yiiHtFlH9iNQlJAlRg/wDAMGpojyO6ncWpinaizN9R3+E1LEZ27l8YJXdvUyLX0JLlLgm4TOQnfX0GUDSK1GuG6x5gl9PlL1FA1P4JXUXo1FlnhYcpdbsYWY9qajXsNyj6+hcpTAjbuE6hIFuL01+jFrZds3Fnj9xtyZ2TIEdRa4ZfF1yxuxj8yBWpTEyc01fUGurh8CoECN1l/wAG4ZueouTeKYK7iW4RHOHhCnRWpUWDpDJatVMpkdievvTNuvwzZkOCVQ6L1N12tzcu0lzx0F0PEUB0icpb5hVN112SovH4H2SpUUc8HHBfeJTLaeJQ1xrPmbgloezEuFctogNStT6c3GEtVRp1zeYajyzcqMY/FeLFmPhPUCq7DqVP5yLaUstN19RhZ115g0P5dQkU8ZtCU1CbA88SYwbgjfwl+0aldwjBzmKj+CPqXAiw4eQlTXFQZdnX3KAUnTAl1GMvaIiARz9b8/ubOWdxPtkjuU4Ts4kcDtPoiE2ViNWUeqXmCB3ohy/zYxXUlWqy3/iHuJ4KqYT+rPjQUKEtdqwgRFGCvhxXwdGGqblyEaofJUDwEeN454Z8BBlGymCXodEyiRWzd9RAQk2jRAf1S1anknQyiKyxU8F4gnb77jnqdfFzvi1kX0YheryxfFIrX8orlAYv8LDTVUILs7ZfKcHF/BFcCn2hX6Zlx+5uKygsYPhm2DAwyLpjnc2/Fd5gfzGqaOK4hS/2tKlCF+ixK5X9JpSRNTKPa3Dw98KXuhC3b1Fn2yAnR7+N18MBW5Smrlys1D2+4QzkL+opWxgHjkxlZAxAO3qCyWStxIkIOCxZv/xLVXUx6P1MqwfqFSF+k7uvnU66ln2OGXTBud8Agt6Us3zEVqoruniI3TyBuJtr7mKIiGrqLa0txFECsQG/0dRbMwSB2So0X0MLwACMeIo/YTNH7Aj6/wDCEdYggJqXPuK2gypaV3PMYnNOp22/UWeAOqKjeyNlkS1EwYg/qKb14qP1KW1GtA/HwSHyrhMwq4aau/cY8TjsiUcrjGPKkGEVWIBYu9ype5U/lJnwYRD3Djoj1DyveKjY53LGWg3GrUP6MGms943Mt4aj0VvhED0y+ASlfpLUdOiNfUZqviqpfwGmNNXfDFaueMJUIb+X9TJ8VUhRnRHkmUvUC1t0eoYi28y8g6g4lh4Y1sTzE5IaxMlF7Im/9gxG0zeo/n6UW2r9y/8Ag20RaKfGqrmJAQ1Fy3iXWipfAlZgieU7lyl3C4mBrjXAg6FH5I6uLhZQ/ca8Ae4IOh5YonO5kTYauG7/ABTwjR4Y/Csy0WeCaR3EYXgpkxCaE8MsrE/kmGg9KmI4OOWEXlizEpiSj/YSCp2dJDKyhk6ZbbHCwly5W2PYQlhkqVMLFbhHQfuFxHC1M1iVfqWN3m+vgd8ET4d/ZjdwRFb9wH+cy2jzFfDCWHcZhsljDE2xIHARIww7jxcITOIw3MXmAoNH+9QgU+nEC8K0nUuXWCHewf8A0Ry/2AilbYxcZvEoRU/zKEO2E/uVjdh3FVOGJWIqnZdl6dMf4ZgLNTDWMBqLvekNUT8pn5aCuzAZlAPqPxvs35J4r174ZbwTeYe4czGUJOiNTOYLly7ImMVK8Zic18ejry88XAsgQTnR5ZXjMvouZlpRzFm6hBrUXwMyH1ybW2C7+Eswp3j3MT9uAQ4EomfGISZdo+4z80sywOh1Le/gwp3G5XCWwJaG0WCIUKeoI9P6+S3mbgSudZlw1UGEB4Y10xuJX3VDfH6ICYVaTVRf0n5OpG8YFFMBswJeBr4VwG5Uqa4r4AYq6PLxqOYsAuNfARK4YDPHkcQh7EThxV8DEPywsGmoOeFUdlShqEEMqfSLgSriKiJiYdOrzl9HthmNEto4SNfMVzMyCzS9zQxLirvkxBYXoxKealcpFs6G2Cbv7II53u0zZ/RzpL+obaWwd3OwLlSrUTMJVxtvL0llbwtcg3M8q/iFjjwvcz6do0rbXrKed5E0/C5fBN8FSdTJmL1cwgNa/tlme2CvgMutidtbfxFtn/MrnlfIXKSBfUy5VqUgodOvuKZtbdZIJb4hHhKNou8AxcS4xhyaDrMv6/cqeMt8xoq1fcHhIEJcsrmcEuqtJLIiuxiX9JdONTdHerpiFCi9g8x0GTwcZZgVrNoEjUUeEe5+5Q+HCTuJy8XsYZS1M6Yz7+COSH8EyF4JS6NdROCF4H42dUGDxFcQMWXiJUUoIX2pGj0m2UVUZ7qLPY7GBaV6nR4gCTTcPDuMWLWYsU2Z4fUW+FdnSig28CHGzDLUHuZhsLPogV4m5LEVEEb4hLKs8QU7P4R7r+RUYx+EfgwcXwu4vxERpKeBqDTFMcVu+iUpT74umVgfuKR80obbzBVVbPcuX8Egr5XLh4RLjeV4IK6g94/iGwGwlwywU7TdDimGXuariuBKhBhwRwHv/wCOWkdBgg/OeGEwUxAdPEaVCbruG0zP2spuUGVj3547gO/ET4OztZS1WjDNyNVuONzqO7nzDvI+yOZdPUyBisfi4gxQqBq3uBrr6cDHjzL+kbXYOeCA97+Dm5vhZah7nwgNFZ1DXK2PBs6mfViU/AEqFh36gu2exoIGw8G+pKr+JoZM1g0hRnaBTUrhYQq3sY7YkPryR1sQBtDGHMdQr8p57MXAtFeYJk7W5/EVW7z54e9+DHME6OpX2fzCtGNp+0FXWWFU+yWcFKkrh7P2M9Ad+YqhabTU3K+Vc+zcxcF77gKNYiz29R1Oz3uH9UeyL4UxE6hYyhppiilzb1LAlffEuL7QbaeOWPAlhoZL8y3ETNm5Mvqn7nhicnUOFg3wEjTn+OGxERdN9O4bD8QVWbjGVcQkYr3SCk3rSFwVGMESGyMqafjNyp/NQ1yHJW3PMZRyPiDID8RRWv3MSfZNCTpQyU3iWnW6V3iNkvBBshV0w1w838cjZBlUPcRvw17QXd1inRUIsZXAbgGzVy4dXKAd9zGpXxOH4dwKn4ix1FPuHF8bZUyL4GKhwMbn14ZCFwU8vOEq53EtD8yqY/S9PMu234GzKLlmfCJ7QavpmO+RcoDDnUQCfth87JaC1FHeIsclwIae/wAQIKyuadClO7SUkryXUXd/GoLUX6uZ+3+MrThZV/XwIkx86GB6ZxjJYrivhmt4lKG2+I5TnDWZaNg8GWjlIHGS/Eul3zcvj68g2Rrt/mIz8iOol4X6wl3X9YH8z/KMfuI9mEy1hZ0NJLg6D8kawBFb2poe5tN81wftf+kDYPTAq17XL8ADC+YVXNaQvMFJfaPH82XYa5Gb6lyF/FuGIywrqu5e6jyiKrxCWSjiuCPCXCE1C3UPiFq4Lgy7L8Md5+kKhpBal8rvqVcj0O57Z4qVUIdEpFmn847nXng2Lo8R2Dg8cTiyYx3MSKKsYil/EeBEgVPQ8NeIXWwJ8MEppz3BS99konmn0VGXGdO5dVqLlYuUlcFyybhj1BrMGzbvhhLjCtR1HUG5r+P+eX8lFc2mEHgTbkBnXiW8MqBtx7l3csT8sPWNVlGUNdpTYxfXMi1qolojNEYR+RNrqd8A+NcFRov3NIKsCncVl8oca4uoW5A5eDGJi6vHmYNfvhlmnSDhlquBCnklcC1Ms98CMGO4ZtY4eSNsXBjyCDSKSU0fCwBtlmSMeCaBx4g+BTOZcQ7xFoJabjq8Ms+MaS7pHhm6D93LPwaKlje/ES3FtgoUIyoTCX5lDpm7PxEVmXDhjTZA4QeaCwi3G046uK0FPLxQ22+pQNmX1GG3MSRZfDCI6mGDW3zCXGm9fmVeuTLrcnuk9SzZ4FpWnA0dEfK9vfAXBjL3DRuvWephHL+YR/MKuIAu1kTx0NMxmhXCuiVbR5HUVvb4J9uVpifk8J0y8y9DohyqU46lWtXmLKg+JufaEMzE/KNmVDfJK4vq7uHprkvhd/CvirwyjeuAOVTLRVD3Nwt/LK0oR4ii6Pth11Z64Zc1HDyJ4fxAzrfEsDYdJL1yPdS3l/aV9pTAeNQI1HhH+KMOEmuKzzcYFPbFztXB7deSRX5VBfY4zAqUIWZR0I/yzaLLuYsawhpQo8cmZVM+4e/+w6lU+SP+vP8AJRB7qekCEEEwYRYVdQGrHNVi0iwiJV1PF/Ext2QGeBKQ9DBoahMPc1TJcD2vhyHJAC8nol8VxfFXgzNZCrq7yxLA9Sdcp4I3cw6rZzcX4ZSpfBZW6z4Bc6qHCR5I6QVlxbFPM3n8YPYWGDor9YfaXZXQbje4tS5BfSXzH5lWw/TN2Qlgb+YRaJdn1HIChuorBN+Amtw4tegMbmo0SjdQaqMxfiURVlrUMityM9RRURj+Ctl6YAXqZ4r6mTd4MS10fmEZL5Dm2oxXTzsRcyAmKfMG2IPl/Rhqi+mHQH2xNm5cNDy79z3iqb/cqouKlQxxVSx3Xw2VxtBBWO5cjKh8kZ3aqYcqEC8ET2No1jubl3H7clj64NxiBp07mTnaeIZ2mgO2Pbbdq4UGeyNeGV9IYq+gjawRKigDkIwWfRwL65wKmsWpls81yc9IF2b0+JZwwvY/cXogrGfWZRtZL4qNIN81c1iBFRSz8MkZaR1W1vgsjLAPDG6q9CXY/Mw2zXj5gXTjjCXA/VZdVrgoDgXNU+bE/q4E7+Ky4cuDsYfh+axKJHfUopxbuYYUDEbJY3EIwjgGZUuipi9GbS4tqAqsEy4/8MLmH8Sqn8lEuJAhuDWZjrgLZVQLy1KaalQLq4EbFvOtxz9IgC3os9Sy2TE6l0dS659Mr9y9sXw2Srbl2WRJ/BMulOzzBcxdePiOZtwPIJpGsC3fqKlW4sZTzXFaEwpsjCpoxFhysG4W2/lAYFVd/XxGXL4vi4F2xruKXyktq+4zp/U/+aQZ4drQQdmYrJ+CBB5GV5JnJ1j8qPAMQOqLymRJaZj8xMqNum5hRvqkH+gghkndYcbg9cUUqCIT3z9QzeEeJjJ021TUsw/iZvxf98POpfNcUHmXFLuhTuGJ07JnTi9yjQYo6ivw5lRhuKvulj9s6xZm5XAzHDGXLlwcx48DhUWrwMVnlxcMzIPPgijIPF3wS4DT3Hy3GUFrhB1MfSrHQmMzTpOp/wCnDGPrq+yUpPoH7gQsdJqFy6g2welxVc0mX3KmgqbxmzByxan9KEIlgqo74v5vXHcbPhUePLcPTR78ywCPDAVfkYhVmXAlJ5hf+aGi4+nMJTUqmpbxKlm5asUyPxN2UMAKNfccyn1GZweTJwY/IsaLZtxMhU+Y6VH3lRrub+qJxXxZUwFcv3HZLoMnT6l8GU4jMa6dIZ+anqkQsN/TM3DwJgy1XBgUrK3mXia/jBqUNfqO/uS4xLRMQmTMrdEu3UqstTBg9JQVq/hcqdRRd5JRKqjWKl1/RcM7+vhi4gJrMHbebhYKFhJnHzjjtZlFcacCFJlHaLATH4GflMdHA09fmIU/JUW+GHAy4FJGCs9UlNNmKLvOIwjFeIkvhGzfySUV3cqBK4W1TKVyQgFQJVuuEV+/UJpjlIIY4IVyl4vEQl+JQ9gM6cNV6hGwK7ooVVbmwRrIfTBvdNmI+9tjcdV63qzL79YRu7YMgiA5llUflCC5iJqLm57VTBeI+FSuElcEC9RKtnpNFa3uNVBtK86Jt0DOt9r7ncuDijq5cLxS7Rlg9IC3ymLiJxRIMsoa32lxlcEDiuEQdvMSyb6V49chbB67itzwbIgqRuPCzYG1MUujQwgG7EDDkRatZcoRQep4TaQicVTcQgOnO/3KhzyKLZPROuGh08z9M2UujL70s6H3BV0Int8zgdeK+FcsJ7ZJ3/i7id+ECan/AGI5bEiq8RTDin0lGsnK1DCXcSKpd8nhjVF6Itauow0/nqP645UEpZjLxMh3eYH6OL+HfwYRg8NcdVKqHD4THkOFe4LP7qDYse5hMX7mXX3MwNhfJl78k6lZmbKt4dSSljpqXW3PBg1P8fP7pH7h7jmcpmbzKKQJvxUWNeZXLw47JY6DI5I/k8zL6iS4MqEEU3MBpW4Wz8rhnAj34l6b+ohvmChrqO7eDm+Gd8uJcMxuUGLdExSnxSJ1Dukb0Ibsmau44QdAWMPIBzSEq5g38RlwicBcwlcJQdEEM3H6x8qggoEIvUyBplJK18A8DhJjFPWJhcVlWZihlKdzENVsyvE3H8kUmbvgQT1+apRpfeZ55DsZ8c0aWYuq7vUTBeCssHn0A6qXn3wVUcBHo8MD4BMz/wBEa2cnUwRYaPEWTc2VT5iWvPua7DviMOLIB6hxHjKVxbnq5uK2/ROvfJ+0ZUPklcmXph0foTq3cd6K/wBkMKkp50S4b4XDkwVup+R5CWnL7gUfGZjLhxriersjplwe+C+EwsSgHcKjAfyRAuZMgT7nsoafuWm/5g4sz+JY7/ifwMdcPJhwvI8DmBFl8HwMQ7GVNDPkjOi8fAI8IwdMRUy5VyoR4KRx9EVrjHSrxHsVL1X7TIGs+pYp/Eppqal/8CQ4rhU1epbRiQnqT+5p316Zb7u2XXFcQeJj40rRKvJ9MRYd5jMVKtBGLTiYXTvDBDH7JkaTzwCafhwIa+xGNpPDqNaxuYhFQKxK5JceQ6mh1FvLuViyCIk5JaNCamf6m0/RHvJ4ZsSmY7KrRIJ8bFkNUNeYsuEeK57gy454kjstYP0mYDGLxK4uMMM6XFHRFtebeybjCO9OOEg8V+5pxBjxVyoXBZOF5m3Tfmuanj9MMZCLPEtTxCHBP5tDVBL31BeqomOFYtWXBv4DGMCvqJX3GGlgitD/ACwHeXYxjeVmIE/+xH7mVE34dQWNtt1zcubIKAqzI0Zzs0jBdwM3EHjiykNwEdcxufyIUG47nbxgTqBidibI02VLvtxZcwxK+F8XD4UxbL0EUpbDcczUpmekd/cGA0RjqXL4Y2pT2wfYYXguXCreXT4pYJgwHgncrlD5llLYc9zu12plgXC2vHJV5aJqEcCpa3V+p1orPAi61sLtOfomQY2H/uF3iFL31BXVfUrEqEWDLiTCBvPfBwlwOVgy4fHOV8hNR5MZB+Dzkv4i8KAYZlF4ztF4ijBXmuXEuXcrluDLhyY4/wCiLUcx4AeKvwRYBg7mUhTuMdYgafc3fcFDvcwg78umVNbeSL2n+CVwN5u0r3PBLOi4W948RPMqzcyYY53FwOoRhG8q2UGDgyH5hmUu77jkV4gaaVY3H8DwGv5l/MVdty5VplMiIPqEcbixlnwSqYh+YfA3Hc/7kA7b9EF1mcWr9xebqvr4VFhwoBmKVn/n9y0baYjwOLA3lvhxLjL4Kz4i2nhIpiYT9mWjjhypuWrG3dzYuKwytJuGIMI6olWULlhBag/LHBWiJUqGJuD8TChB5X+MwMJDPlDAOMW1wkCFFF2RrvIewimIM/L5m4OLu5m3NmfRK1D9Z2IEqYHz8V2Rj6RNMmUgtr1x7BGN1ipf9zHx0D0QjF344ublcVxUquLzCOXUqZRe/GLDKJx4nKTEij4MVfBVgDuzoil3MXNj8J5pH/Iy74Fk39zXFQLibcDBwSoeuU6RDuxYX4YxTq6WX4z8xjolf4gVj/uLd7CMCo9Tjpdkbjc8H+oFS3ssjftTzGGXhOvcOKlQZW+sLMwYxZV5ZhrMdQqqLvywJXJn4DF5Mvgf6JlUxlwmuHePEYvBJnEAs0sX4HFSuHgHCXAqb4PcMs8HAhTmh+LKgOEhiLQc+DPYbh1KnT+oMrAbgZhgLWmQ4JNix4ZYVAz18QynXuftkqj/AJyoB3uKnz0QWBR14smSJiGUqVDLDWIpe4huHU3EBs0zJdvJF3FMWpfkjzUEojCvERg6DfUOQh9rhnQSeYItlgO4WDXNx4YRef24K2F8BA1KMSP2Q186i2fUFkbSnSuAH6Ki51jIiP1PTgNGNxYqMqXL/pQed5a6jMu5XIixghWk1cLOZsrcyPTBG+PUnEqaDe2LlWDRO60TebPEwI+xiFecvUOFK/lHO56am8weMCHB5eeSXPADhXcxegwHhV3FNivqV+ZnF41Ltt4SXNTDHBxhwqe4k+I5gxSQsLPTMAG6dpULMpeMuDlkx3GHwqGIWbiTBUJRAa3E7qnuGJoXEr2vc/obErIgkKD2cYFxsGWUGgL/AOEDbyvc+iS7rP1HG8cMyYemKdOHhCCZFW7g4RK6qIh7yogQ2kRIvpHdYcdw52Dt2qaLX6UmYhwTl/tRLhwMJn0wZb5hF8A9aQl/4RgI8DKFK4qEvMvlgQ5uXH+kxlTXGDLJuMHDKZzNJR+CV8KxLh52HXmVwoa442WdwJqe5lvjI6IFsBlgEQLYjAWeSdwl3Crsjoq2NdoVVeI2oYixjrguYn+EFmXMHReUOVCCrCXgNPiagzblg/DYQZY0fATxcZK6lfhFloPmX52xeUQdMzPM7c+ULWGmV+DyXcWti8Ig5JvjpZZPtxhbPm5mbZUB6as24so2y1ibKO47mrfSAawjPX4rwuZc1KCp9vUNQ0gXAi4B24i6MzOzR5Ztn9sQ6P0x6ncvB7VE6w0zD7fkhNuJgFQekWmtypcV9xlybxkbJYvZvSbqLejEtXxrFjNSxoWgvBFO5vFthBgiQjDh4MATVruVkfgBHKS88m0N6G688HAjUvPw3NcCvninTDdz4R/3G5b/AKFTPUqqdQlJWmqBl+BjjHF2fXHc7SswPLUrOGDXEQ6imBWHmXwiaqRqFZwepfYqC0JTJRfBFWU9fDqfcZE7QWZ9wDH2ej7g6a9NzMCe1VwWmv6i2i8YEoNp2rZbAKtYy6UfmG6P3xaOJZZjDbBV7eEsthuBA79y7ZeniIVi8Mwv8M2oZDe5jjceYpiqBKl8XwJ2NMW0/wC6ZNW17pTrUJmq9scku/fx3Kn2GLZ7Z4h1Su4KNpGBVOri1v7HiXyFyllcBKlcXwkqPp1FDNS5cCkxxwuFHSi8Q/ol/CjE3GMdQq0/pMVS7476DnEUy78xOFv4EoTWTUK/ZEVsZUThm3j4gaPw4uKww2ja0wYNwxNwK4sublcXwARSPt4YEKHC5uBwHDy4jK27l/YXuXEB6Iw0TAphg6G5Im13l4bhNKtHbq7hbN8T/uY9Nza7gZCm/Dww9Uv0diumNh0R4Zc3E4CiVAO4o1b9w6e9ymZNTCymq7YFoXczLQq9/ApqL/5IiHhQeJe2H1Nx3vDDUdzcNapyQQpXnCX6p9we48MIjznUosXg78Rr2+KHz4OMJcy3MmHLykHFuo9S2z4neylIFg5m2Ln57MYg+zU8YF2SlQ/L8HksIyp2cYTEzz8C+BULN+yJ1X6lGi/uVNjXqa0LvxKr4XLVl8BkqFnhYqJi+DVuuVnWfbbMx1ggKxNNFvhLVbljKlhGUSx1L2Ijsn3Mq3SOZUqVKzLkXMD+EgGl5FVxe4iahV+0V1aA1D3fm6hAYRqOmpimajdXmYko+G4HwyvsHpZkYWymCaYF2bl2Rli+H41PoYgjy7lHkrZFOmP2y9MPGxx2jsqN+oXf15vPCQ+FTXLLaplSoVlL5ArxO2/hRPY9Rm5nMMHU7hwlfqhNcYZmTNEGDAyDc8KLmLgUcBEV8QsXK+NzEXvhjHhjwODg5i/rz/JRZleeeFUcK+AjxUZY6EQ/HyO9S4REAfsm6JzIIKdAoDrhnrpin+5hgyxmeTqHXuOH/vS5fDnJX1Jess/+nGHKCy+mZJ8ldBLadkEQZWGyTiPxJuGw9yn5rwvGNA8VwoFsvx8Ay4Zix8V3Djg3Lm1Mk5hVcWy+DiqEpZYh1qG/iTAGPuPUp9x3jgPNQru3fG5CNZF5SZ0K8Q28dVO7TYw5rncqLLlPEjIY82iwgaiQPUS/JKgIpaIOBdBFuXxZ6gvtLOL4T1FRqF+6l1KuMla7c3zXNUq0j7L4D6Kwl/BRpFZQsJ2mIP1MkwjbXsrJDNqPZUpbWxuYpA73HyRZpLdRRBWyeYnjGYCBXwZuVDWyiadYjRcS4y4c2ztypWjjBOoUefMRbfaUN4+IScfvipZ0lmmnkhBUObGagijVSx1xZKlYlxlUxMUcuYrsJfk+xiC52KqpnDKbEr9XC8HyZS1h6NxhyoyaPU3LihLB7dmJgyjeIVt6iRK5YGZtNS4tcMYxi4guJTwv68VP5aDF8hwOLwd/ALhy/EyqJpqeePEDoHgjBlAN9PDibhG1l2178IT3fPHcrpw06Q19hcwqX7zCd7FESNtMj3luZtDEOAFgTRHZ5ZjxdTWphV/nSrov0zNQO2McHgfyy2dbyQJ4lzAz5GAltWgeKlcD4XFFcVKlcDHD8FhuC2BsbmNofc68PKIidZqfqJy7XBLlTRysM8bgcV3S7iZzvj1bJ+I7XFS9eBvG50MZ6MVCFfO5qPA4rioSjfDMM1V5mWeSA8wFtQ8RWlR8Rq9baSxIDpJj6P4S2oW8EVxgiXnUANsH1LsaTN2+E51TpywZyvKOXgiN5gXXl6IwVpbwyocajQbwIraGiu+K5MuIeBf5TMgVaOiX0ZqnLoX4xG+uT3LXvihDijcIay8x4BxVw6FvqMBLJR9fgWbgcG4si+mKkOIvxEnfOCmDXAlZANt69TBjPEy9E1BSzMGRFAPmNGa43wZagRaHcHgKeoDNwpsuWMFMsMQVli9o/clbs8RDCkgtJtFB3ag3ErZZwQ4v9HFRHgmEOo7YSoF07lxiymGhdB4mTc8+EyYjC3wwgwviVHhIxjFjwZliBuf0f88r9rhqOEIMepcq4U4PIle8xqmLzBS4uXCamp/KVwvjb3EfOvfNRklKvEWKv6DhYLcTbJ+J9SEOJVwMuxO1k2dyo01jcbxorLM2NN/XNxOy+oBxi4S5qUS1DYe4rA0+p92rMWqLdKYgAqcBFo20czDfjwXMVUu+1ncWSPWV9zuDzWyLB+QgVczb7+JV5zMeJbigGYVyEofzSUFPEzOeRGoQdEsxU9vAcVKqMUODoMZU74EHZl8CsAJTHsBUwnZiVmZIyp0k6iowIuTCWME2tW5dKvEqXioa515qeaG84a5X/PaYibalxmjXLYWALBzN/wBPDdDs/wAf8GcU91Ccig3gOOI8o6InV0sXbN15fFTUwwumpUs7Q4/ENsaqL0elTGtWSsnuOGVN3K1QdZQi09opheMs94Z0ZhqMr4MbY1iLvTGoUdxKgS3iVbbm6MqVTCW0XxX7Rc2S62DKdMJXDliYGIIiV5S1hXwy8a2o9VFVhe4oqIYl25Y4ipm/r5EEl7HuX9pm4sVCJICvwDhZbqw5hBYZr6oMIF/pCs/0XLg6LwMKb4xUEcvAtqUY8RWjCnh4bkFLCOxL4Xh4Y8MeDFX68LP5zjXE4EOeLzwor4RCSpEh28orSIyvOJZ0S/gU7hhjgPu4SbUUhOtOLhwsZhun9aYNz1Gigo4sawaDzEYrEMWv4Ajm6a6j6m5JIM4vTFLOpZbpjNC5huFF9TywtCpi6PHuVRxuZfsKuKay3cQG/B4luZeSWyluv+ZVGvHuX8MkjvlfJyfiK5eYQgyTBzAR7NxJZ/mUpvD+ZliGNy7ly5cHiuFVxqGGeFBawvNwdcqmarmNqhuYr9TDvir5eARaFxbdh/iCXs8kHhmiXcqMWZSnmFd76mTycRgpyQZClr6lzVRYtrykKpSYjtcs0+6glgKHAPcvS3D4uoEybPvhhbEHwUFl7RfGn7eFgy9FQ4MxG70YbdV4I25csqPci/0QeNcrEleSfXtO5dHP0nyR2U+Znu0rmg6bjhS+ktio4ihHfBiKtHmd2DtPyhTJD8U49PQEOkHSaEv5lIZRawOEi0C9hUx0EK7l818DHop02lFFAdVMqaz0lCVZKJ3Mi7jBawR1IEc0Qz2YmoJYWCW2TDFbN2aZ5TNRPuehfMVSu6npn3BmosFS95qhWh/WcaiM11OmD8ELDiGaDcSVwwTqMeYzC/x/zNRn8pNzD4Ale4MpcC5USBwFs0KGhCqL2JaIE6mn4XBaRWG2e3hjyn86FnG4i+I1MMeCKyY8/wCJSE+kBEwQ/wBgVHZDf0uUV+t/Ut7LYAxK5ZVDF11LY1daZ+TS5JfHoQsTvJmLePZplbB+ojcqhlo/3Ez3Bpg4qnWEXBGxBYeJYb1KQAx5fiAh/wAGf1EVThl8V8jxIouJLxwPcp5PqWz3GQm4vVG0qVEpjUJY6gmVqdRbiu48a3wsYFoPJP2RhmVNp4yty+NwxM/e5DgYsx1FEuIIt2FuJUHiuKqEebL4I8a8Qrf42fk+uBCEqWsxl05OLvgnaf3M6g6BLguL/ZgYwy1mMRpofjl3DmtJUMVRiO+FjJYb/PFys155pAbKapERChYVfnhj68wKldAJrzmIpY1jxCXHAlS36Q+2Ah0eeclwJajqCm3whsTxFhGFUgs8KskDBQM6jdRvAVLjx74Y9WKSXFuO2ybUwpbs7gaMX3wmEWXwcmpkbwQ11wyhm8dSt07uZXR4ilw1dLnUJL+0OrVODKQ/Q4VBis88uGHBpl0vqE02hxB3GjMusHQxFVtRVwvg1D6LoLrlgqsaSUV0z9xZlxYvJjHkGp/jlcP5CKyVnkITaKnyeJ3ZiXUwxJdohgmXzG0VC2ZxElCcXpJ0M+XCwbm0K0FWBl2m7wQtZV9xVevuP5P1LAsXTE+1TDafuFuw8a9y2dDZCVzB3XJshGnJ7nbU0blkTiRZaL3N6r9yxUP5g2wHfw1jsXRh1LjfJiUwn8gwZEBr/Gmdb5sCLtGE3Y56lPEm2hiLC0FWRLdxCYLGfy86TCrvcY/ZKzFuaOf3CQz2M81o3PuJO7foLxzfLK4sJSGIVoaY/pWG7VfbDBkHhgZVHRNGHzPymTga6lruNs3LgjMYFRLuvqK4kFQmMrQrCyMHiFoFrqWrnDIQKlwld2GXpFhLpjNLqmJS5ajzxcvhArBrVVDHwF1+YGByuoypUJTiV/aIy7jFil3KhCV7jNB1MYFaHUJkT+4qEPI/4FndcBX1YeJW3Y3wCjuK54AdVFzjmhTldSx/FDFQHNtx21fZ5IU9EdjBedsLl/eU0w4uuBSaeL5lwLsKbCULDhsDUuzm4vAAXtSVTHh+6i/PcG+b0RDwaZYp3GEZU1B4YYiA3buXHRGBngyuGua05jjVz3CO2NwTnEU8MWgzBoh/BL5RYiXLmhwAX+kX6eOU+DK5Fpzp8RLhfkRIkThIxjHjRZ/i5H7kUN8DgTYmiZSvZAuot0lMtvRDw4yMZtCwVPfqJiz5ES2YRSvH+fUbjqJcKSruCNy7Dhv0OLjEMrEEsZZ5mWu2Ier1FvnALZGP1fnh4c115lwxLr/MMytLpVKkQ8C/7qVRHlS/6mlC2wGAYT5jONAUOn6gWJUFPBaWuKF+b1Ehb4qpD1iu6LmehyUn9OfHIZQE29TudLr6Sxv4LyGQ+1ZYw5pHXpjD4ngQ4rV7+Y78X8y2EMQqnDxPD/KGFPsl/FtAqXyWNI6mJeiWgtZg/wD2fl29mJcubmXuIrVRWM6UQZm/XDCYtkVjxfGRDP3LRYU1L4ORTiik0w4FCxyHr3HYp3t7hVjphY9cbmR/uIN5Ba9xVNqpcYfBxwMiUOfQ1mI7XgJ15i+iVkvcOGYjqDrD+0VFBIq8u3qXL5YzKCY22y7mVtJTEV5HTEpixgcWMQlx1EA0wBog3WELDLQdNyye5XwBj9Tuc9kwmgifJGgo8qivcCucPaCloiprLFMqVwwc9TQNxi6lVuLLwTfCxLL2mag0WufgpPEVRxIwXsmWzx8UT2JWYlmNkoD+2EgKPEYPFnqxxUuoMeGVB0ED1PILcMZhGMM3jMJp+PDP5SGDgQdmm2HKoBWjuaiusXYgwwK4udzUIPSV4lekVHoadTevxK5q+4VfZ6lvGhohtjyj20tFYjp7NUYiRTeozXqJYxgg8Yrfvir+CErAlYZWuSwvMW+2HFZhxfHXAjX1f2lFqeBVzAehRRot4lJdH7pZA01mUtv0m87p9Gsy12yx9eJ3X8MLuo/M3Br0zBeDdNXL8C4b6ZWgS1bCDWgz4ipii67/AFE0cMGVKeKgEN4gxfUUGEJ1BzBluu4bnRE2EVVPFPUJvUrgihdwjMnfjhMPcCvBcBgBlvfGpm6sFKGOIR9AzxSOqiw3Zepdqp8SoYt3Nf2VzXH+EJZ+H5VnAXwkNPsyQH6BjcPbOhdRt3ksduBRH3Iu22WMDMyQLe++K4PiZlK30vyisgAos6GBSbR2o7ZrSdOK4Gw880CvEwGF7DBh/TzzFbzfDLR+DgkrgLi0uFIU+3UqCFdGKBsbtMsDeoiP4plV8gOjwwRo86xUKuqicXNo8GsJSlw4PFfDA3R2zcqdCcKqblRWF9ohpPpKm5VtNtXuJaz0EmXD6TeavuH8HxSrIjAB3Kuk2Sy2t+4uODjb+4cM1N8MWXNyX2Iab7a5cyo/ACafhz/KRyw3CUhqFoIahzvjWYnvKr2RK4DOYRhxmXllrXmskusqcxfBdsHmK+LpqVUJj3K347yVBxwgAK9MJS37lUag/M0Fny9RN2+CC0rgdsrhsw9x6gH7XyqzdRUqEag+4UFwZ/2QWKfmbPZEA1oeTzEg56zATl4rQgipvEco+ZklhlrGMjGLfl47B4maKBfDN7PxF9F7E0kqCWd/tDuTg1yJuCDCVCBkUMU2e01B5r4FVu3Hjg5+qgh2dQTdIdsRCkKPEcyyyVgyge4IQrDK3jUZ5uvPcccAXON1lj1lcqWnTBapuO6pvg5PAYTSkvlcyt0QhsYa8BHKzf7S2aHDbGavoTc+h4hW9XHW7eKAwhLVvgeJVfFlmXa1HRSnSOM6y+DdxPQNlu5SIrAMnCwebizcldFQzNosU1UUHi1A7hs5qM+3mFdsCUW7CS4tb3bj6YRXWGUrvplhlnHT8WeJV/QHEsg1wJvHfK5Edo16+TDbatg1HhQFYePLHD8JeeE6Ab+0fgzASwdys3cMDCOITChoOLDLUyQzK4W6blf8DKg1Fo09Ljdm+8RSx7RXA+yF3CeHlqvzMP15D9yMbSht8rMKViglvFw31XISFQ05WGCDCeanuKl4hqL5smAV7iDKUyzFEADwYwW30lQIUB+2WFrnRCqprwQpy7iDoobmOeWLhjpt8zV5Yv8AiWhppuVUoq+2ImI8yqtHb281KiS8PJ+ZYPnl3DhgEQqsTMv2MGqN6JVLaiUVfUMVrG/NToKjnZGuF49qW15Y0CTc3u/HUOTuJSINwY93+YzncLeTN9E3v9Hs1BxS62mz5kHScUvjjHodpVU7nk5BKnfIhHFH3SiGjjKFCFPh4YRnQ8eE8wPORPaDUwYOO0qOvqnmFnrGo7JYLx3zQjAGbv7OK4uXbJYUxY2xmxwZlir7JtxCNtbwy+NNzNvnmpo9ywJsH2y17nlizMQ+5kvnj9sRljACxlxpJ5hXfV8HF8BCUuCtS24Q/Ewn2US7Cn3Fd2LDgc7ng3NCVcxygLPwg/8ATkNNXcbQK4x+yMf5JmepY4eKsZlIqUPVjXbDB+bgXM4YwcMuPCqnS532QzyIwbiMXwMIc8nFTQeONLZc38GWVqxfZFasWW+HvgWDxMbb8wDzLxiMtL0S05SGIsJi3NlFEv5vBQPMwDG0NXGrYquPnFkPusWLfudtzG93EEwinRpBUDWB9yuP5ThVkBEt6QQJjOzK3Gv5Uu+qmZ+BOkwQsK+sLAo78owi79nwIEDq9xTJaz9XCL+oiogCD/DLQ2xhLeMzfSeome2xqeycpRK+KZW32lr8UVRlhQJ7XQJXNRZcuG5h3B4ODysxv2UzE5hGI5s+vmasjrtP9AdGHwWgYOFTDat4oC+l8CPnBQ3aeYxLRcw8F9zKXa42zNQ3gC0bZ3ncIQ4rjrjaGVXR5TU0fUzJYVmUbYdOMcF9ker+o1To9T2SFZC416ZB2llOJOweJUuo6FNQjFTZ+udhwV+LqXcP1PYE3CyeTpcZOIse5kGN72dx5VZ3ti9MvZDh3ANwdkpaNCXcsEr9bMpPZlXwSpUO72TcydXZ4IdYYw5ERCsLPZqNsiqHIXCPaWLl3FMa+pQoBv3GV0OSBii39y/qPAmsR5dZuKiFM5Vkp1ZgyeKmMbTI4jVPDCEPo3GNW4uFuD+JjAYMU1NuMYEbnngDKERyVBL+h7JZC/Dwjmvgsd+TxMuWfUS2+oONS1KgcLxuHB5gmYbjv4XwwX9RPVjUSLzVtNifwOO4QDKqH3O0TiuK4uZ1GEYR4OcBG1YFSvM6LmbTo8O46mnpSxvkBSS/lfyEYuco+vTGP3KZRybuhgQhPVqW+bl/BC2jcxnKvaVZAexGlbjexBVH4iDSe2UNK73lq3irT7iBeyBBTpdS0dGjzFaWs1IqLhwEFnG5PEzr1exuZ9T6mALErpEa6X7I++QtA3KUIXkfUl+VQVt/dUkQmy6zK+3pxFpj4WLlh8mjk7eb1xWwGoiLXm2PTGFomOXXAjjW8D64YtqXf2TCH4yp4U5rgiPYTuXxlT+oplPCaJcukExzohDMD3BCNQLxMAjv4PC+BL4GYNdYiD3b4liYcEWi+ESzb/bBa+rAaxXFMxpcHoxcUayWPcxtdw+eRL2YsC+VN4MyBLGeViUBbM5/FEydTrGEoavazKi67WOft6lB72/MXFM3hhXZ6t1ACbD1yo9F6vUKzr1TJLXPUqZxIMZltXYzjLLlHPByLQn4TEEBXNKbf0fH2Hoj5thYLrMbxA8pHEyjoxmC+cTPSv6iBcg3Gqgv1PAFeYhaveJPEx+IEdIXwy8ExwHuEi6InbKdlxbSpijiKlJdQe8P1wb4QPpS4pZ9rYpGT+CKJKN0qbnssjS+IgWqep6YHU/U/hlKh2X4mX8TZjW4TXyqVFgtxrudy9IwYPFWQOf48Cszl283w87l1TuHbWsjHhlxwPSDJcxq8R4raOI1RlSuHEG5jzLCP6ZuVK4ZUqLx7WamfdVp4ivKmAGo3LiLp5lFYV6ggznUBr6haj0TL23sKQqtQfUHVC9dzJcCHAhglcDSxs0FPoiMrG5vkQJ5i1oPqKFjYxGzEqJSYXiLQndywAbZjpVX4S1q33AbhtoqY97mghx1VqS8xmVOgsLR1KS9MsaTmbdvANYmAiK9QDznekZnbPyX74okJ9UFhlGuzgk025qSZ/yRZFFaJ+v4gAbf2HiLtPCHTCbiy6lDLQJ4r0pgjYPHFU8EM7Azv14InqObplcoPPczFBWMQ7vK4aMa+x0lo/fARXFQEUKuJ3/1LmNSrgxMpaP4iBv/AARfePE3NQlQOK5tCt9y946sahIj3vErED23FcAeoIT0keYOotoj91iPlI6Ylc7QiO2S+peYXeem2VGABKuVlTO+oCi6zxFgEBTsTaEwpr1MMR0YAqJB8GR2u5aEHGYaY5isDXiU+p0jmVRUCHe+bg03KZ2ZpDqJenRGGY7rkxAQ2spGag8RR7LuC2XbguWFOsnUBUCeE2oIAp6lWxWj3MKEm6iYcHiUwtZjZXmEUMxblyhZYrm4sL+XF3vhRx3NJzphs33FLdz2MsWSIwz6hYaH4wNRksqaB+5csP1NqMNkQwupaVqdvRt1MEqMuHF8VDHwMH5DAKhGHBolcpynNA9HDLhQrzGiA/mCOk/gcmVHgIRK5IzUu5cxWbViVT8WXNyowDV5JNyC++K/rt+oVJR1GVMUs48P1/zyGf2MquoFVzyllNo9b8wKRhwDKiriQWMi2X+JbmBsDBHn4lhNRAlPA7i1eWroV6EVtiZKmC4NHiRnMXgrl9yhlbemFNgRiBNHuC47Cg2iOHHfSMWATyO46Jo8COrNabV+orT8IIR4eb4WK7NK9mXScrqK9dlRmynZDhzd7ticl0pqmJ4JKvcs6pZf19EX+ciRR/Q1K5Vey+JXUJp1PND1GK4X8KgLu9FFP9/BiSY6bfpAy7q0AlDF7N/rK1rMynufeHPiZYalr1KYftBWZOdSkAW67I6ogKkmDP8Akn/WfI+TrJUVuuBYX0itj7MncuSZBZbiksdJU/hxaXB0f+DmFPWiP+UfM407lgK8qiJzyMSjcfbUOBFZ5phf1WuQToRi/EZHXfmOf4IuSBWkOwrysVE9+ouBlHqV3xlRfSJysKTtryTIixycO+1f7DHTUsIqr8R9Ayp2u4uaV2DdQDT/AHhOttzoYxENqFzTUYELAGXOK4uzhgZ4Idy6mVDuURSge5fLX7g1GJKlE2R7Espm6l8BsDMeF7heizN9RizFGnKIMi/qGMY9Rg1MGXKlVz3yAwKe6zAL9O5kDwweKbagwQjZeDHwZcIsuDKBgG10QSK9tmKl4bqWWjcPAurDv8yqV4jqOhWGe5kJ/ClTDRFO1fqUvXDh/CJXwS4FcGO5+RcMGVGOIPDJiSwm+H8x661REW9R8QjuafAkoZvoxP8A2pnd/tE2SeL4QKidJduS5RFfuqTAK/c7un4pjafZURWwrro+46lUrIxlQ4SHG/BJEZbK25cbiXEVbqFe39x2M98zLFf1L4yCEpDfgX6g+4YOpha9vxMmYiVlsSoup4VkSLd+osacRe0rlJ0BEhS1vFU62XxTKndH1E8lia+DAhhswyrHwBs+/M+nweyViJaYuNnf+ZAwXL/YyjEuAlLuF/BLA57Yn/Ed0ZmO4sEMGl2iizKi8CGNGCCCUPcuywnfBA4qVyfGrlT1bEIu2zi9q+oQGXc7qU+Wepp9+5SGXlFZWCNv08Vw1LR/4cRgjOs4T1HE6NyvMMNWXBKoAI8ydMdFsgW8nxFy+EBLuTyJl2fMB8bOLUahAnFQxsdCK3GuGBNzW5XCC5NUB3L7OpeA4InUCSpTMwLzHgikXXV4i2fUsSBlpqU41A7WPzG3Nps6QwJAVlxZ9kSgn50ON58zODUvItsvlxB+U7ErnaM0Esg7NQTzVXRPKyMPgMrsmeN0mLXkTTNOx69xzZaTE017h91LqXZsgzwMR5v4ZL6ZbdOKgRhufvIjvcsw4fg74NzdlSpq5956nfjymNGSWeOhfklul7ufxgFyndtfZmgUo3R2RT6+oBVpbKEfHUdrVX0cKeTmNd/MM/EuDbBLDBOkrgWXEuEP6kUgYV1GPqIf6lppcdRgK9U3BMgtVqJdlcGVwcOEa764KlQJUqN4YuyUNbPEXXFSvixMfMqMDGBGCvKKLK1cuQGswqGn1FLi8EsBQ5oBWUwlACZRoIpDN76/+JYuqlTsb6Zd1tm3iBfdSr1Jgg+4QZjsgNmvgaoGRfc9MevcGwR9FMorbcB6FKDw/EoW6iB3cWpX0uLRaF+ZREL3qqnWzBUd23U++GBCL0J+aX1Hi6XSbsuOZwEILhBXcaY6hCDLl/EMBepU2yjy++ArnuVA5FTZZX3FYlLNcVh5lC9t3FHUGjZAuPo4XL4WQG4gyGRwFsuOiMo1bWh4gWc20EpYQys4rwYLXjQwxKtlIlJRqMRSAEdV9xo9oEd8iNTRZ2lBaDqZgzwuZap5ZacD/aDupXds17b7miQHsTD+QDEKIt3/AOJUEp2aZgbiIx7UCZMt+SKlzKwDzO8y6VxcG+NR6McPweAYeI6lFGg7PMtXtLM83yxUwCJG6AKP8CYFOdx5ffRHwP5JeCweePvi5uBO/gNNxyCKPwvYgLHc9wi2UYxcccrMuEvhjoDIDaEKW3IepgJadHcfii50CEhAUNBG0nkCXDyxYzC35Eq3ZXs8xbIrXcqOSBq2Tp9cmw1nxzYAF1KY2iIybs5lvtplhQ/Ec5l0yoJGkDS2+5SIX7JacSXNn8iLWr51KJ3zYiBn/wBUZZ+mN/xLww6fM9UVcrkC1SlXTUDUyzLKQsJWOC2EqEYL+47/ANOb+A8dQrmokCuMcEFynuZl/iMO4S9L4lywrt1KwJnUDHax5aikiMlnzyFxVZy1Xwsk29kTbHeO6FPGQDPUT3KI7QCuVK32N/cCCC2pqaChUeSY6mbtqwpXmI9nHKjJa3vNz1B0auXy8mt2dnmIDZ68PC4Fu3mIcV2sJZnfL8QXcu2MSz38WYvOTANYbnQIXEHfM8kzHuhzHbreo8CZ2/tzCWOHprIMwm6YVrohr7Ibmf4I8LzFYQ5YR4/UYq+4mYhuYE3BhgnR0TbjaOrJZPx+4M7jLSMUwefcUFrBLFmEsY8MYc4/FPAyOnHBv8Zp9cnc0+CZOUILZCbRYNKZL8p4NPOAmIlYjO4zBJFbO5jX8iGmGJYIyuLCftM/t/3FIhgP2DUVjJWYE6CU/mYvFkqXEYl4q6h4oaQ7nb4J/rf7465zlhC8R1JhhGW5kpFrAHcN2uAwNQd7iHa44sEaYi12OFdjT6lKsBBz0UMpV1sMSHEaTZF+6EpCv9UuKbMQgKxxlF7RmKuyUPsw2hNOA+Ih8nThap1FNbb9I0wRaOSJUAFyLHi6GiWEw/ahuLg5osflyOEBTAuFjTN5iE0Auotl8Yfd/simeAU7NQ6e+Wyjg+G76fj1Dk7+uP/aAAwDAQACAAMAAAAQwRsw7RM9/r+rGBb3dc6fStCtJKQKX4rZxw22xJJLQmogskikSvSdKjLYO4kotYurW3TObN6CbSnhAomAiNSgzqXfqdwzEPcZ7ozfMmoQCT4vuAEMkglqOUyTi5JNK222Q+r47ZM8PriqGja31cSfStCtJKQKX4rZxw22xJJLSmogskikKvSdKjLYOYkotQ+DW/zObl5P2rpPBM+4pOjkUp3x50HNFunjCqhi4rlAG8qkdIi/jF4BlyQuObbbF222Cg4N7ZDFISjL7ybylcSfVtCsJKQKX4rZxw22xJJLgmogskikNvSdKjLYOAkpt4+HW2rObt5DleCzd9qHzfFyIg2OEBQDLg5LvlJi9Mg/nTwUD6RAt2BMuoSWqaSQO222DimC7d3KolOHibb3lUSb9tCkJKQKX4rZxw222BMMAmogskikNW6dKjLYOgkpt85Fb2omSvWnMtAoCiQa8VinjN5zYPnkeNTGqfKd10liGURfSE6Qkw1qFWtn5IAb2222LM/zzWVoAfpjsD9fM8R/9tnsJKQKX8Sr8zWy6lEkAmogskikNWYnKjLYOkdpl9QtK2DhioEVHvCEgHAlQ0W7pc5grfh2FCJ0r/ytAw1QlS0G+0t8HsVDZ3nLa8i72222Gef2z63s9/fUYrRcHMp+0sPsJKQHuw3L8zSX4QEkAmogskikNWYEUNLYOkc6sGJkpze2KpPTex3AKGATWmEHWRQDR8Tu05MwkZz/AELtPwFrYOEAxL/+ABtKssGgu9tttsO0xuINcX6XTl95yqhbdnbC4J0BmJsNy/M0v5wgJAJqILJIpDVmBEDIBdZnPUCYlL11oq4fX53LoIJBMVXbSpNhANHiOKA7QgNVJIm1xDZNi+BMlT3GkhuLuou6u9tttpMp5Y+cnfbXQMV0RIC9krVnVwYh2BjIO0Nh5GIEBAJiJsAouCTdTqy6jL99UekuhGwMsjNFvGfLVfZJYjbnb9RfyqgDpRx83VMAIRFfhMJTRIMBsZEApDsD9FktY02225xIytmjD4vYRS2WQIAcEB/9JYQoFtEkLTBAYQhA6NRoAqAJL6wIfYgPEJj1DAQsiylz2An0J+T7fDTblbNNzuuR+U9h4HKLIV7pcE6qhGZCBta/tqUArfbxlBs5ZrbbbYBhtk7cqsg/4Elc0EXTSBqjdmAtOmbPMqjh6qlNRGhNkINYJJdB1VOH8MUUSAZbuoqoFxjLwCmYvmsRSGJGPHWS0Uf5OA4r68Nvh+AyvCB2Ap0raJhsppKeVoqRKQAAAJKiB1k/CAXOJO8pomc0s/YJ6B9EJPnpPgUoAk9hBpI2DUYZLbbeoki5cGDJQFEkslVuV5b5hX1mOhTjhUmtnRMaY9xltMzH95qYovxWWOQAFihEglAIN0zeSAqclv8A/wD/AHDdxoNVT/tVqpdpBUAVpIakoLaMlK6FIUEAoZKxeaf5RWONcx9DVBlwCdHvDpRtMnEJQ5bZ+5mugEDUW+RnQ2tjSW4zLbrcMK8pBAJEunfOmAkpNBIGybhx8SQ5HASSSTqGf1osXxjSqJMLZlHSAAbYu5qhfS8jPpcbLGpDHwferoxInvMsEaoA1rRHxDorLc5sEWyizkAqYFMy00ETADn4qgoYyjSAjsDp8JtFYCWM5AxCP4kFeUpKM7kFMLbbbbNI4dXxxBmm0poQhe9gEZMKmRMsP9PhDYte6Ahj4VletzFB5KydQ2OQn1bADefr4GWVTSXfLiwNE5jffWwE5j8RCGKKop0I0eUrqBGx/seREkbKZMHM+CvobdgWnVNttt6gpxG0IbtChIJBB2cA6NRNQGon9Yqzq6ABZWDjEtAPCfhhBQ4ONWbnzAcBHoz7zfNK16VldKBN0JkmSkyw/l8ysh9SI4tKjDZY0lSJZmbDJ/bYgvby/wBD9p6TIgAAAABzAIQrJuqmB1NNNaZjSmJDOtxJSG2SAE/QRRUcGwUnSKEtqRZTmsiSTNKjlWA5m8a1XF8X4oxkxR0jMmVBjMGdv+Qmq0YxYgKCSDu6Nqgje4C2KoBeZhwsP9PYS2bZkkm5QRkKK+7e6zlSocSSXGyX1bMIv7iyQVj4/uMlgImk6coifD6lIBG5sZReNMKa3Rac6hflq4vcqd9tG51cZnJc+t7rTxNTpDSQy2cDuUMOb2SOUQV8yYJZyQoR0vpJbbb16+JLZwrYOM1aIA0CM0g77jkkJkcAJcY04xtdIPrbYNXQebLAAQp258+7SVnDIOcaLj+BPa9FQwQwQR9mD6dtEX1cB8qGHgWBERbmRGyBFZiAAtlWP9DLtB1LHlf/AP22HonMmh1LpntLYVFBIi03aWTYFG2QqkSPrIjXkdYbJVekTuPwuSAhFAEXC91/JgJzGfyeT7WyI1kGuiYvgDSiORR99f2j7Z5IA1r8eGBclBNUYuXFdvI+S+vsMX7aAASSCedt/vx2FwMqFO0NfVIfQOReQzltjK51zVmm8CEG5P5seKDjddgJoQgkbvMm9o5EbXGNlotKIc7QfmUF0HToJEyD2eXt6dtT8O/aqruRyF59TQKy1gqNLwq6gVocAACAKQC8O4pWyRI7+4WvPzs/CZWEwxLweMBKZUADDVEEAHjxGsYDiigCq68XeRd6ROgfx41HP8sSFsvqjkZU6zpZ0AHSTddSV6Pc+WSEziUzC5seeISPwCmclXD6QRMEkkkpOsTpyxsSc/ZfnUjiXi0CiKb73kdRUApECsNQQytgQl+A4moCAoSsk2obemBwEeUbJWLYObAZ4/iEMhuqaTih8F42B38AAabAgcRNQMhA56l0RYR10DpzPnaxGyPO22224u9lnNJ/BRU58lGiF9+FAOuOO5S0AKqQebyVwJKUSVN/yvllJQ0GXlFHeFcdMDyt7P1YONuL0cK/YtxNas8zI+t1A89aD5lmlUFwjtEWxk2u5FIFGUNoAhxvBJgl/wD/AP8AL5iYcmMciUgdjlQ2wE7wLPe0iYgjWZISSAWUTPDHAUqiMQ9djUIkm19V1MuE95T7tyaVCQ3ggIXOdWpoO/2ADWxyYPQaTp8UVz4lxrGtoiFiQmAFqxI1KlYIJDA8SSSSebZmaFhaezV9NQa3gV28hFtgdgtUsLKgiUo2/ggEkz0PVpvXk1+gI3cvuyd05+EbCQ5pd/roAtZIjFHcvr3nUuBbsEEW9A6NY6wJ7UAHoEDExikb3KsYcWbPuxbqJJJJw/JPWzrC9Zu6alia5SjwplsmGrmvYEaiKOyf2FSA/QCqAVNUuPoEFzSTYoOi3RQvjL5hQs/ZgTqSl6BEbd4HdLfsRSFmRKqR0FpfdSYJ4uJsLRZLfiWTMyVNQAit22226L/UOSji+RI+MoskbyHF6JfTOileinkAdBDlSVmEjAAf6gfoYq7MyYCM4NiVKLJbBUe0YO/xrIymcfVFv8QQhiLANqtTKvM6hOpRfzUStVAEWq7JKlVTHD34bqWmkkkkgTA52qUHu7jJVUEiWoKXCrk2Ksz4TpSbZiZuCCQoVG20qJBkkSQGEz2iCFy3hRHvQJZ57xTMvHBQgudFfC8GxP1ysRg9v2FZT1aBCkvdRqNpuSBCcSiGWGkem3aV/wD/AP8AzU3ioAqHaNOEnnwwEvmofQHsGkg6bIRQv5NSVREQQFRtvIVAkwlkTaCEUK6BSVJ0kFjNHv5U874VlbmKIyzrw9DNC7KRHrkJI8091fOTsCfiGM1qCWZVmKN03CsckkkktWsF4h8mp0sUP5icAFHEURkRkDECioYETOe2VQCVYP5Jw5WCGDsiwWEpzyGGL21rYUfDeGLJPM+8JvlwMdUQy/ZE4ud4am5sBJyVO8QedWp+obfB7SjNP+5rrncdSSSSqP8AR4Qnn2eSZr8IFE/eobUgbAWUF/p1mknjV8RMpCNgM+cYtlAkhYljEvUoAJNSdTNHOGYkmroMODAdiHAWX4h9Im3KdPbB78Co0fKXc6psYi6XctpYsuC4BS4U7QAAAHyY0jmQdhYEBVlojN7ZixrXHRVUye1PqA7hKHQak+6gjqwgBtBAFEPRXQswIJ7fztqqeQVQHXBcYyskOogECkx8og15Oqh6nWxYeBUPkJJIpxCQXM26ggM1Ke6lQAAAAKuYQauSvEfTIVUKqbbMqAglsxL7VJRD2RjpaIXiRonlkG+JBM8JZFWiUFKgBpOlZwE/SH5snycNtrUpfyc6/oDyxe2B8hsQ41FF+Bk7po7z4eBDdVUslPUEgi9oXAAAAAC8kfDu+Gd/SEuJ7rBt3QKd3jF+6WsOi+FFICps3qZgH4BfJulCgiNBN4EllCb1yiC1D7C0z6HJAK0DyDU9w5mJjiGvmWFYZuZtFKaKyjBsIeRKItaoRZVrWniABJJJJDpRH/FLy8l8ht3FLObxBTukYCFQa4eBKJ21aVdkUZtR8188lTfkVELYHpIthVmNALvd8XiEDjfaxRZ8sLW+vQmRbCJucLzgf3Ga4jLDUngvpaewHyQCE3jgE6Kwvm2221bLPE8tDCtkSUFsnXntMwwBXXcmplqQrUNSArPpVOy86lVP6HkIhAVgbegAAGbZLmpCFyQB0QSzAJTbL37VODUbqSPcwhHs3WE/fxTxgBxlqq3F8ITzhmBTy+FLzJJJJDHAJyNEDqtjWlqtUrp0CNMM75aDRqVykNoPPA81v6DphUPirKQ56hDLjY4IEj2jg6gG3HkamIqRNRrVi43y98HVizeAqc/djMIyastfBBa4PelOaSAAF/rctRbUtLbbbSpb9Zk79HyH2igDBYztowNRqPaRcalu+PhHFNA5GvRpqvEusYrinLipCliSlayIYIdHIqPgYygasf4oqsDEjf5kmLLFSOPn+DzBVIvDxIcoo/Rli7GVL+fKYIB4OgAAAFLQAxQzy0yK59JzNlETRwIszuegTTYuaEevwCyhO9ld3ZCaNbxhIynE8ByrsVo2M2GOtCyT4IQJcfougi7TA89jhAehA1lVYoIwhv0s9cRbK4Tz3Anhttq5ixFsDySSSduwvR/Upg7UKbkZN9ApAGar31gpqAH85wfOJbeA54IXigvOrGiNEDGHhKn7o2kqQNem/QMr6T7Eo9PM6A0CIW5OWwiNp4fkYh9z2IxD8Be1AED9DJCRkSyNVVS29gAAAApchiAfh/nEP0oso2VRMVf0D7QrDooNaVBKIlEBHOlS2EtETyiOrYKmrKJooGJVb4zht4kmma6GIUcvSwyHWCduTWqwIBEzz5CO2fAfFKAMV8YojCyY91AAqMUA3W222+KELLkj51mJxPBNsevYNU5oVJUpxRIIg5YhC4vOTvF0/QM1kvTGDfgC1HtqJvkotgashmc06oTaduYIv3CI36iTQ1yfGI8zIbxPOk8kKh6fp0wGro/cNuag6Dq86ttttkWpthWKi3PIX0tmguwvRkXnfKsBoFI7J07xppxzCRwC/mwotsCbeeXMsoIMp7Wy+5WCwjrybeYoIeRCidBOobP/AD0n4O5qio65YfifeYvOv/iYSVeYbR15TSyXABFJJJIzp4NsrPTwkdxV2oZ3BSkAKIIMlVRQVcrXYDRU9O4XaydJBQCEkFUmyIVF7AECuKAbysx6hNr/AFInNXwa90Y9Q0lc/eAFQ99aGWVrYpcFELhFtBp24CDn5tgQGyRiSSSSsHjFv5ihp+JbMg2vBAmUNicmfmRUkS0QAUmgMY4CSe7A2fjCbVoP08UFl0518fMdlcoWWE+L7bYBXrEVol6M63loEZuewGWVaVwqrUbdQHcI7eGCDYd4+t+FQ7CASSSVBCYq4UYrFtWFBMEZwiR5skEiSOrzVGUVkFlYzMaS6F+kBxr11BnTzem4LenTgzqvL9o/QeXpZfqCXiyCOjvcR25g/dECxjKEfAEYghX2BYAmSA+GAxzVlxLmUxbAAAARG8c/IQiYJ+SDTQig+zTHTAAwQEHGqAkFxBqCJAAiK03UmwE+xgGz6o2e0EnNwZSmm+Nm5hgY0xvVQjeZR4GapU5x92SC+ighGyNeCpwIy0gHDZ4kQhQl5QbTsfkLkkgS3nZRWg6DnofZSWbcTlytvigwlHp5KEAg6hLrg0gEuG6SAiMttHoqhSuAmNkfCTinfEWn1fvrB3IGwhttiy7n8ScN7R0kMJ83bMwF2Z7fqhA27lKjYxVWmrWkYgiRAASSJ7Ig8+2EfITespBPQGAkeoUE4O36n9WtzmsmgNUAn/k/TR4bsXkKlYb7vVhissltfhvxoUJT3eTQ0puLy8NGn7KVAQHkNLrrFma4FADqSKA0XuSJKIBUgwAQsVk/AmSSZZYOGA8zyoLB6q/wyUaWAixQuwIk80vYNtHkUFxv8URJCzH+KWQEEkQJYWAVPiBqumAumcMbH+QMGO0NwQ+qeiLswXeQceUoOKXFqSGwJYmMl6gh0lvzfQmxACNjS8SSbzEvIeserJCoWEGQKhgIQDh/sZJUiUs6O+aO8nqpHBejACPtgpoFl3eK3X+YbVITAMzvH5f2T0V4G4ljNFnrgR3kb7l32Cw/KJQwgE1o2P57xnx02WC+P6ky0BzB3MSSqsperJd8pR3XS3qDbm06xEgGxWqXoC8Zza5kbeqBdG8HyhJMWvW0Ds2mKRZRr+g8rUvB4Xer0DxjGLaAE/jaH6EanuwYWLKCkHktAGchWJ1YQha0rtxcG0gGQRzdmMSSDow445ghTStaADgFoSmKaA4cpNNdpzK/49VENXunUFMm6D0OcGkIwIQNUAUQtntkZEDQ/TIbniML4ciiecKuQm7+mPsf0eVjsxllNq4HMMuox+K7WwkklpyCQESnsrttWz9T88aY/wBGUMwILhIqo4h2mgAr4QlTFIvadDKTc8RNFcAApN8xDZrtlc3tcY53pb9ICZaAQm6R6KKoPQHy+v0LGpWVzgGXxJUPR/wJZLjYvtsWvRfIIj+GIJEmkxRUkhO6FQjOdppMBFw+DBDIALsVkcAZhAHtLOpDp0pzGVyUpEoJyxwFTJONqBQ5n95PHc/r5SXDkfTn8gl4NzMYPWUrH48PQervREYqlvs3uQxhNQFk7g7ASIJGxsMWLgIQAKKUs63IzVK9ul1mUwoJGFqmx6F9EMuuoOEdFQYlR4OUDHMfM5afUnfJLFhkN6uc2EESBboEMqoa1Ye1tEDVHdRCt9d/ZkacJUB7GUnBwPBQHzna6ta7Go5wqsIKJoEG2+hHvj/ZYncYpi699KCxA4gdjMpY0BI9sGNnrJpLQJLqzhi4FRNIfnPEApAoEBKc73cM4Y5zv1KUeXLLjE4mnAisYr0OwHY80t/LGJMGFU+yEMqf5O+ttsrNoBFOFOGLbVi4nt69YrYcr+VCeFjxQwBFkGp11IN+PSqzAyJVDRUQmWz+WRLJxFuogaZ+rnIuPcaD5Hu7fiV+W9ho7J6d2KHmKUGTgXgJP8jKciRnl9ZlVN8doM7AJ1ZtgFDUAta7bU+2Lovlw+Ucu8EFYbORbVfQFQm1Rg3/AKQAysiG6YiTxwx2MU6HbHSBCuUHFLSmWqvc14ANMbNSu0Ko/wDoMNQYtXzZrstseh5nHArZ5hvCAgPTkDsoyYArKUBKRfI/qnAA9Wk9Ss+6miTwfrQCuQOJ5SMAwYyT2lyxgFISWn5PclT1n0OEwjkSAgAkjQGYqIW+kwvrmeoEFqOkvzvz6THLZe00v+4m7Jy46x9smkCmoV4CtafkiABrc94+UiGqy7AAqytxfl++g7Rf2QkLVMJ9+j70uAES4CCtFNg6ip2k0eqAyAOUk96moAkiBsnktSUTJPJTnqkvNKsClWbDiJuL574BCjfsld0oYbR2LSCmZeqAgA0i1pFooVjT78iE8A//AOaEwvuAwxtSCuKGppEIWa7hAWuFAQoqHgA8FkpNOzIg7shzDQPqeK58E6LJFUMkn8l02uRsLGqxFEIimzGcfwb72330SAGqCewCRVxotjkKWIcwYwxpMfJ7zMWJp2/ttign5clmhNFnkUOGoL9kqaV3stCJKHvgkIpfLzieNQIOO+akH2R3rMttFfFBdcs/NA1bswmoXTf+QV9T+RVQrg1kBNy5gOlgkokBq5M7JpQ7BrYoLxFK8cDPsRMSsq3JJEbSNdKXQ0oGTjjCTTmjx6selDQINknpAJpqIP5Y0vS4bBCTvB6rZQn0ptmIUlk7Byk5YtfGQmJNe9v3we/djQiMUBIC09gtJppMhl15brHeofHkpM5wcdhC7p/gAedkkh7uyYiAUX7kY3/SpJoDVKePbTDRPKqBBJUUhhAJNQ22e6APhILYqgLimOHBVGQR16CwS/6bO0XEoVxARCYlpKNOSZ91Dq3dwNMjbhIhGne31gIlPp+wlM2Efhh21gBEkvLlR3H8pm2FKEEBokVtg4Q50GZdEYAlYiuOYPpMZLcV1mleCcI4ZZ99RAlK9uRgVT9A7mGvZT1yUCicM2D30cIIqTuLQLe3AoNQDYu/tRY3kAAMGa2XuiXsPeshMgWJJKw2PtlMhgjFJBG1FANf4DUDad4K3HJKT1gcGKoLaaPGzcNH8WEAAFVCCAcSBWQjQKlKlpmeVlgrJHFhw3TaJORkXtHHimFU6squl7F+EWtnJzFAFrxdtPqOBdWI5nQkkkYN4VBKIKFj4vNiowgMYJ2eQRIzgahImo0N0WpMpO8BhD8A57OUcxTj9UJW7TDlG2oOPYcf2t7Q90KV7FtMtwl/tMuCbkKbeYrlAFQFhME6AAUpNLy78L26smtr8K3CSVFxDH0FM5EHUT+RofnpkBM1JhBDHdhPBaFNUr4rALLKkRjooZALrHkpDjiRIipkAOZJ015ujwV06qBMBd9glBwotzcWZM8EZUfm9YiHMLkYL4BgzYHSeVaLf8i2gBaW2+9nzkxJJYu/ZzCPu7pINpVdMXHopmRajFb8qB2ks6hwk3FvaOGrk0Bo6CP/ACxI8EOyxAjxqI1MPmhSF47pdxYx2IbZ4JL8+SVU1kW7X6HCKdgOKOgBgTRGZxhxwpAOKSRG4+JvklGhZauaQKLUY1wNKpRB4ARHAB0BV++kMyrLSpeZefuIVnEAgWgTQ9g17vc/aOhvuGb3Hw8TaP5NpzSHxMTJNqHV90lZpAVW4W8n2auJJEngga0iRqVCzZQICSTWqWD2NmuU8n9NEOprvZeCHib3QSp3vxQhJIQBHZWRYIY45lAjr9QYwy0kSaGml1v8X+AIEb8p0INzJzRs1KmUTXV2NCTOYj0vQ7ZIK6MhPc8CTVHX3AISB2hXaRT3JtufOLbvFcLLSh+VME9/n1vkuTCxeZ4AfzO6PQAPicQW4760hSedCGCPp/fTgAkGqy7M+eaXDBjCb6TCJB6MnXFyltvM6uob8v8AmYgJKAIQJ8VmAdAAyRuz0HKqrgA5vdSS3U5tRAkNXsrpgEb1Edii1VdAMch49lX5mCNgjEIU01jhKrS1AjDyH6K+6UsBR/Q7qYxAaY603NknMOViXorWUk4hAHpC0hRZWrmUjeUZSjEuw1+Uk4ffYoVESyGl/YSSZkRaqNjtq6YlWAfdhD2p6iFC3PFYSsvrmaXCrmU6ggSRzQ4dosbFEIaWIsyFFW9pQPmE/BYSdhEzfujYMFpZEncOBWxG33kq46GOhDQ4NGuv/C8icEHcOPcVxa2BkdAAOQFz1SQD8Dwk2P6hcEjHErC7WnHTjFCgsdLqgDtq0deRRttMEls1tqglJZFTt1ZdxBTyDWZZoVgufm0fOY53A1g98XfACwLc4VM5Hnm02Zf40izxp3VuFNw4wn4jg6JJq59XyG+eYyydKncBQCmaA1rdlY1AQO0Et2pCqJQT6UqUZx0PWyyW/uWlI0OZUlsXBSLFwqIQl8exjWOncVke5hVD9doiu5bRGjQBsYBhQTEsje+lTSzVkymNSCAEAn//AM07IkRsUJLqu8uv/LQw8BwvBRDBeGKIxtYrhIMAa75MCILLB6oWody8FWIqapKcpGZoLTt1/wBPlMyZ99RmDMZ1J33uP5OtU8eMooUIyQYNniBIAEoAsK/zZDCARGBTIABxgGCoBEgrlc3nInzzVcbO55muvdqWRXfTMUgdLWJDHClZ6qtRLCNzb2hfBYCpEpOCFI7ihZOzChreTqdKM9UNuDhBL3q840m26oONlaAMi3URaavnubOiKivKVYBgJJJwjsWViPpmTRLptTZmSmb7sSSsiqmxpIyJbYnY29vCJHAjJW2PKSWk+AAK2WYUVMFy6ObeO6xTXqSeQBPfhn3oJcJ0CU2WJf6yrOMjSmb+ZZPCIQhYtZo1RNToSAASQABD8xUyrm7RjdKwJ3Vak6fvygXs5BR4r/n3ZW38S9mzHOwIgINKRj/YPEZQAZTMJ5A0WcIpFfqjn58rcNQ7l/6yOTBgu3XxTFr8QAlEfSK+ISX5kEp3yFwIBRs+freUQkmJATpE59lsoR7vaR6RHPwnr+SAWvNHRIiDQVpHxRSirYFnUxxwiHXAmKGZgVLGARxxBpHfAR4X2XwbJJVxiBPvjciVBMGGn16RqwQbSiD+qIOFoencXlP38cGRxeq9skkTaoCu2sg7rONp/SGx4imhWFXoA2Hf8tRfB9bfUZRQ0aPN4DaFyCADCRIAKzf+z22QGmNG2fgCq6rJpGezWQNRAja8IwQVAXuE4zvWiDydJGqTA1ZyCRGZ4XSdz0S6v/8A8perqpF41nQrIL7EuR7piWY3CYjmIvFEBr0Gw4EbcXcoQ578x9mIpXPP+/039WK9bLchuzGv/wDpt4kIiky+Se5paecW9m9KUwDALZpsuwwLFbBuZusKmsBrN5xfsPoySc0qUR6uDhGJSlibSwMQuhF8qlmzCrlcIijomDCyLgDYBhJ8gefJIaTuPeyGgYRinVwtZzckb3D6gkIAjdFmAbUYi2Gk2ihuaQP8pxg00g5bWkhxVIDT5IICjPlMEFQAAFTLLXzPTGY5pkq6q0ZgzlgY9xRJXM35wLMiGAJGHfHoXBJaRoTpCtoqZPx3aZZW2J+rTJI9/FiqBDBkT4XlhUzJDbyYohA9AD0pQ5JJfulyS0r3YhIAlEAl+i8+Jq3JJDJQHAa7um4Rp33BalxgGYR8JqnELw8i3euWWr2uiEMpGpIUoQDIQL7RH1/mgoYuNtoQn4PItXeGMH6H1ucTgIcxXeVFo7NkwG4QBIBlsDeAkocdNkJJAy68IRrOkhYAAJkPeyoNahvjeoQUurpVHqGMNz1xCnorrFpguoJJVdukmLtwvCW3g+wLoP8AgiY5RCk2NeG1zs5CWTWhjYe2Z0yVEwyfPpZBhW6ZVPUQMzSBo69QIgZCXxxGH986RAmDttsPYhZDdeQXGITL+BNwDJ6gItJTmwvjYLgODoIALP3eQbCCWcZQzkl+bOCD9pspUYgnSTpCXX7sOjWSAhQjyLPxKlHoJmZdCiAiQIDPBdyhgOgBzBHOYTHHEAn+VWuW1JL4OacDtvVbZRoLi+qSntLlWOHEAiLhgaybo/heXFzdQFxNxBDq2JKrKGMjRUKxxX3HRmXvQenemhogEtuzZ5FHR+V7jmXKSzF2nCY1Nhri/K07kdM0mW1Fy+hWICKjaSS0oLUdZaTxwBQvWWoUYCemTuhdvBCXHDiA1jjAsLG74MC7ekeNyClQVLAZUsc3BL/6ixOQlzOkkT7SAMqP1KRcPADdgZLJbjZRRWh1IhaOet8wXrtHH0R4MGJhwQKQFtsalWc/EM4g1pKQ90A0QQsf0PVhvSCG1sShAFkFa7UbHAla7rhXiCyCYbTUiKxTHSgq5jUi3km4eAX0L3AeuiSXHWhQroVn0WlunGUAO5qsBaxFoYjlM+RbZRpIVkCSsAfXQav3zvew+21SWml/Tfa2XgfRZ99bS9G/ZM+ya9XEgsRqAXBoWxBZQLRDijIAVlryTlmUH7LUsSRGPba5ZDgZP0HJZCZPUn8H6wazfuLeQdIacCjgRCrgLeAEvMHjQBsYREDu/wDa5TBaJTojDhQanaEDQgfOC/YdDCLaYF7raLVw/oxgER8BHBgMCiQ2V0Odqe71lIeei8YqHgekjTh4RfOZw9DilroqEd9zOVYaqKcCX+2Y9RUumPOKdG2fiOskRpA9z/crZxO8H5MIymy5gyG7IEADhFvWxm5lIqEOYEfIpA0CmgYtjvo319vu2wsHhpsnzTXSg6MwRE0oG6QEMfWqIG+AE3XYZU4zh2hBumQmrEYM/awtllEkUTgE1q6SyYiRa6SBHk+ef5tqVg5nlzKT7kCOdx1W01oAcW1GUAAQ6SkgVIo2gwxQggIGrQM/ods/8pULanftUoAUXAYgBe4upqdY7yNuxp0FxrNQogpIZLtJ6yRHzWxBstAiRopJRDukB/IGmfnIOwnQiAuQAxH8/wByoqL2V6WjryiUJonwI4zPgH2EhZSHbbJrLZEFGAFsR3VhpeOvK4qxFnHr57MrmWGIL9ixFKkBIx5lmCgqsoEOqKF+QDJAMsEhgsdPbX/mVbKfBZ2mHKPKV2AXFIrYxTzpR2dGyE7PhTSKw5cJlqiUgJ1+cv2jhAs1JrrBXNrAZ1SKvgdBOYdUmkTanzGwMuP42AAg15fSJp46fBHH+oBEamREFzmPbKr4gLOv/wAYNP4bpcddRd29W+YawPBwm7a+iAIsDRJGBMlT79CQJYRVWTRoUIHESFLzcMN4GL1mC4fqYHWEQbQmObCdj01H7EdxGETSSrasRMbBkADLyNVtYDwELULXnzBihA0vySVvavjJzFFpLb7zEddIE0NyceBdU89JQJHr7eAqZnjCASlYRIM7reVRZZggI2RLRJHMvx/+YOZiOVVreIqzB5NdNOXBXslgsNYWSIAe6RKxSKVArL2UuInfBUUKLRSnEW07pGHyoYP26/pPamzSITJLIhwDxfQfb2imrFWSypgwAeR5VWqiIV1yo5JSE6AIQTEpTzbfJ8vX6qB3nKyNYr3Eroh0ueh+eL/mhUMfzIgVBR8rZuoArrAeqF4eBQgTRpvrmuqia3yUpKDG4ugZoyS5u2RFMCpbh5F6kBQmuYuG2pg+4QD9MRYk+CYYAhIICKOliyLlxIgJ2IAQAeIy/ffEB9pR68OZ3NH3r1WGrYSJYePpBzAQwfeMvWRNw4Q82f8A3VSQgAVBuToeotXl5FYEl6Gh2xlkZyPBH4DHs3+FnGAmsqtlx/lWFi8gmTswgCSzodAgAxR7KyRPonEjwJ+5IathD1I50/5eWp3MHDHMGThVCLSbFytZtI3OdWW06cf3MjrRjcSrqupByYz38Db2qpEvKbj/AI5QRAGq8qoEYrqBovppAObV01Lf7GHBJAtkTKiBuO8TJWlN+pHhbK2RyukrhVlE9UQSEivFd2EZly3E0qrsJlaIJXNjmNw/9C9e0mWDW676qEvbJciHG5QdW9gurBBlxMg4Eg+g7NlxwQwZ6cmNQN7PsXZUUYKJCrEEvHUpwH5ikiapxvNSsyiHLw5Gr9IbLKyDIK9XMiP/AAa66108O5DBTu2rz3jm8KPvc7+RvpNrPsJoaZrbscICfARfjXpi0ORtSdUFuCQaQcSuavVWVGg0ptbANLKMhFoAJXupBfgIbc72n1Tchk9Y2EgrCzzqrKnLAP8ADzhyPDjd7bB0rl1vKiWC5mim1la4yge2MWXLtNHEs5X60toRxJxcAH5RQGHA7oGZbDBFj7N8gMDqTNCQIh/KAbUkmdRpQSrduvgWVbA7gjwjwmuFwZwXeVpOivUgg1NHEsWsms2CmTJiFdHQFQPg9Nn5wpt3+QJI7DUs14GASxFdgk1AFq6WabecjRHgrOCjeN8ZAiHAPEVuBrU1LNscejQEyKD1XqRjUL5dbYxRArEDX9GUpzzj8PZEf25AAJtKEVDMfEc/AGEzq2g+B2MdMNU91B/QpVp+IzYvKllFma0CwMj3ipRCpZD51bABoaTVM0DsAZssQRE2j4HtFWl9+MABLmrhRdQiJu14kxaAUS6njMJkWt725PpziHUA34NC/XmIaQYoZQOg3Mt4CKglQF8tRuSY5sI4f3nO6WWuXSWuiMr8WszjbUZvDuQ+KhGLs3TJCi/hqTq1DxXuElEnh6WVz7oiUm6d+yO1bbwXIuYYkeZqKHwJk52iMW1UX6MZans3UVlRqypP7XnXh4FraApG8khIND6EvFmROwFFF/XevTdq0Jg/PgU1uYwSElsVct4A3Cezd6RkLtwmsRWcFOsN9ZJrJ3veS9pClHcgtVt59WlKreZl2xwzJED61v2J4tYJR2vy14yQroWQkkGnkkHtzlKsi/BtLafc6Eg6Q60bLzo9f1utMyH15abE9zHkAEkFF6TY9fjEmphJIv61vkSCQVOHq6qrzJFAKyI5HmFBkhpHrR5AqDN93jvNY0nlE1s5xBaik8QyzgyKUiCsJumB62790Y34qY2yKxOZB4Brx2HimKwmlCgRivQEyjmN2gCQKAguK1VGbhgPKDWgkrQmxw5/LuBqwTpIcrFgZsMfWbyjergPjsQp4oftUs4f5wvTd6i+gswA0y0CAFJqugDvhUUuWWDog6FRXSocWvo/hYRvcfiDnEcP2EssMiMA2jBWwRReokRsos1kWkiUqlsBltr54CyUBsBkdFGWH8+XUu+uvTqVnPNoPl0U7tE2yCZDUqwgs1E/n2gkEsWgqCAkPISpGbkEJT4ErLLDrj033wGTp48Q1c8UDgkCYt1wA5cfTAIYSCG7gRYHPkAwNAV4EXWBwheloOsKftMQqUyWErVhBG66cY6M9BFGUttGXoAOAAB+8QANGn8yYg18jq5hW7OpZ9FsVUXLXrpxeuVqEHy97kSoQUEqWBrUj111oSV0CYStQcXwHgjbnCEAST6UyycS/Yzr4cfbW2SIPDEipqCJo7ZYN9wv4ipyGkMsqAUVgdLaQkE/ciN9UgkCDSFqBmQXHOeIQyHqGhphj65StVos6ksXWkWxUGSp2S+FajkauiOQA8A2EGhQSjyj89rGOx+GAuMN0rpydl9FNHbdntx4sigdtTD/AOqSS5IaJjR9FDBnscJAMed9PIwIIxM70gQAEggqIDuJt4FoN5gI8cHqIFSB9wHsG+nFa8Pb9uGta+hg3HYu88d7uCJFBeo8f/lS8kaSsJbVMf4XohQwU2txNHVtJofLBV8dhv8A2zSkTTOCCgWULPLTW+ouM3ngAqifOAQfQb87SfWwG+nKzBLiJQrz4GUYaoiCPpWHeENaKBSNUktVZnCXXKKCNIIUgBTSyI6UWfB5YTmhLRO1SJqrDovZet/xh5AP9Mma4QYrUacXeDIJC3lj2LF+R9T82AaBtW9+T1KMwrPcFM/PakFv/YDAuN49HMJcAYQ4SAaSrKmfRBW23EXzU7avJKO7MdSIiShZadM9WDkMv2r2kyObchMWN16FX6Oosx5kz8TacUlQifoREiLhWWKbSa3K+o0Dbn5i4PewIndbKzfwcozdMCIP2q9deAU4RDzZeRG8Br/IUC6OpSQ3zYmJKT9QZyhIABlgE2+o86RW+TKM7YDYT/PMPqgEajCk6q61CaGxBe59qX4XgFaQy2ALI9VS1URUhUYF/WC6KFHwQSs1c6Q5JjiS4z33AFKyR5XrZAUJWoZXnSN+fI5LHjMgC7mgPApOzNkJ7B0aj4solJQNQWyKFaQS5aTYKQANjiu7GYoA4TK1TtbfY7C49fHSLQshgiBojV2n5S39nUimeVcm20yieRCBXH1QI+//AODB1IUNh4HV9oTvFIhM4B3Uuwg02UTX1IjqCSTrAqPCSs1X9BMYFYxIQeeovEy88rtGvoItsAAgGSn0s3LQn0RwZCnGMuCnN2KMhxXm2JZg+0tGiEiaUbLEH6utsIcQgjgBRS5imI0t5QSwLrthUK52rAjcT0vNAnw2ibFbA021Rxh3Q8EmW20PP3ZBChd/TQxFbBKVKmHUHWYFtorlK+7gQxlnxmJSzWJKE97bS4/N4SzNXqSvtXMkVg5Aksy2Yoy4pun1jBvg9gt03GX5lWaDkIf6EtNAYMVqighdISQtmhHrDgjfCk2TStmMB1Pn+UlgA1hXqGx0DEg6BRXBjuyUhCkBGEIq0yQ77k76BiR52GIEtInfXGzfeDQ62WKSxUp4vq0ukYMxIVnsC2eM3F3x0zR3IyDjg2iCQAUtsnJDukGSBRQ3DnJ9wqQv6j4S4Oynz+t8zBxoicE3Sys1WAyQH237RY+mUnKw9bFtwyY2iyL4NSYZxQ7a4SXKV5I0Nj6nUGuYFtSJ3T/kHH0OGuZ4DIUNJQsCrggKUgOAQrggHJHidlino/f0s5VpjvtxcoEgQf5vOW1EnPQ2CU6MSMtcE7G3S/CO7Cgo5wQAQkdD3c82bSyaWW490bs6vs0wZFq6Altz1RAd6NF2jEMvA2BRxEUowdOhatwBUySL4LO1Ihj1ZiQGpESygPQT55L7ExYD+44mL2+N76urhEuERxjyaoDqPOj4pc1Q/kVtQLtq8OOPp9RgfK5EgnGPiwMOSwifWmgbrk6rCGWTkoS1+BSuzAiE+qOhwV0WKa19qnkg/NuXEfwCeSIULR3ZAa90cW7UyFgKo6Chcj6jxZQASr3LIYoohxDXwfMow7MANAeVQR99B0arHDEECMwwrjXUReH8/wAlaswSDhcRAKXJhIHUlA+h0dUKB7AgFDBlObEx0GRBPyvhTBb63UAYgFBwLycc5rSd7fkoMblBhoJvNFkg04MJVasgiOKlJYSL0u2BsfgV5ISUHqfXflRdis8km9Jau86I7afBSYxbntQkQIPVAoc2oZu+AqVewkc9F0RlEmLieKnwxhC92j8nwXuPZ2KPyzV+6+9ptgZ4XNrr4lglbNAgWFNoFZhGsnEif+YEqsE8PyBLAsC3S+nt1Vkn0j6qY7f6AAFYeVwNKEBkIPGAnapHhrJYJMewDgGASXt23mFtBH+BJHvoqObNP06PVapv8SBRRQitopgC7OxHD+gAIxMqhlIx61fj4xJ9s+Q+SgYegxv1vMdP2LepVAKYiE7lBrGeJMonx76DJOVI5dl9lhVFmavrywAIKOsvFcR7ItneEYNghsBZkVAJQ1cpfccIq1Fn2YtyZzFhtBUGxbRIkT2BBFyp1fsbF+FCSaaxHG2cW9q9fg9rNFzAKgSrI5RvEF4V5nIpcrzaUORoSlg3VWgokFJYpWoJtKGDCzRCRTqTLQuMFaHjVdv3xvB2Zknh1kmrTb6VzQXRuUumh8AIoVkIAItRYWQJHHuiSXnYnWYfnZdq3zpsGALJla7m9T9OdM3a5soRN7XJCfJEqACgeipUffZJkRWulIpIbGn6Beir4+32E9FAyEyez+83j102In1uNJAKD5AV24+rSMeI6gBVdF1zAPp9eRaW21sYiuLYr5UvbzdyEAPUKiJtPVACHfiALJ7lKy/k3vADUc75YeLlTLQJJpTI+cvqZjrKFXPoQwl8IMMrMa5ZqTwIi/8AIRaYrjYBBKSFwbaP04K4mVTRWUEiRa3SDe6QBtvoZtWV9nvUVCZKwaRqCYKpZGSFCUfzvqA6tZLgb9hURo3F0Qk7zMwYBcRbsK3pofM8hu118qYbTALiCBVS9LymGtpQXWkIltCUcNCfBACLirWIAphaBABQSO5AZfGagABXK1GQSY0Pw2PqHZRqA5AGK/7WAQtZHpRqAli3GydMY5AG+2CLBS4c8BkCs3Dc9dtvxEN57tjdqwAGQaiJN73dZh1GQxajXptKGxguxmANWAZaUkYvAuCgSZ1e3FjQRJIvxZEDLmejsUBAVVZ6yfpHS56SCBQT39aESbIA3KJHvn+jPn0kPcsMQ9BOHCmim6tksj0GuT0bJQRfBWMB9h0/ou50w4yIt9MIJl1PSYbRZtGsZxkuHTJXLnkrJcRxXbYJeZ0Y+JzgidjEMBCjibnyhP02J4ET6i3ITATfQqOaEiX/AHdwvgSwd8iGgLhV6l1rNUldA4spKdmVdXqs1plu2Oo5xtL8gcT6sUuopfpUtP8Ax9ylUmqQ9F+hV0HXYrRLbYNmi4WvQBHNwi+VBAQxflAU2L7EASd7lIXlv8GR9k7UErR9KY1v0KJkqhntEX0RUHV90EhpY5sRBaUY95RKWQo0FqHCetx/j30DUoHZ9BMrI6kQqAYhgMgMBnuJKgRttj+hTBbApwMQjuI0AIuW8CZQoVBJMPO0BowAtVl4jonIsR1rdYEOQ8kxAqgJksD/AJDNcx45IMh0g4CAw5Ie7q1ZB9XZ6uvNFMwM09M1IjM4eq3TAU3zFOIDVAIUekBdAknmaAnr7noLwR4xWCC4adhZAu18gQ2CvG2YTtSR4lEqVJEiJpAbj7Zg1pYw7Co8KKXeBtzJow6mdTACXsxl/wD3/EnBm2qYG4OHLBrKeLIdaRoBbU7n4LDhYX0GoVnEKiSSnpkmCtGh6xtq70kcmXmQ739f+6C60G5EwUOo8MMQWhNJM5dIxgc9wnJUvS1TLUqdvoh6rjtACVTglwwMUpAZXw/nPKO9WeLM8cnWvGCnsoamILPv816cGvCpnBKWpC22vYolWofz7mzCxcWB9S04SFkAc0Err/qAFo9VUzikxG+QDKwtoSStbOpY/splCWKtaLor5c126gA1S5Xrk/AIM5d0ukP3kKIh1BsTQYzCG7ufYjbeCQuihy+kG1E2A122f0UpRNtgzjBAZaEUn7keUOR74mWNj52WSgJ3SWoE2gUVuKTfB9UZlIt7ayflTkSst+wiAJmC2LuGogbOXHDXyK+bt9sMHF1ViLgpAUexkSMhNf4mouAip9EVa5bGoyJJ6s58bFhCLv6kM0ADyj1RmxWfqB55hZbgqEN8A0G39+SFeE4dL8Hg5sAaFz3RRaq8tW42ym46Yeevk8QXLhom4Tz/APoxFtFO4Q+uInRzvqKoLs1unx8wWxeiJLeMcYtm2+LTfMelRJF9rEQoO3DXw2f+jYxWsvNXrBMg102HP5VqmIktLtkJaNOgKIgYOOxIjSMxbPVTTuXVcEhSC3w+gUxpeZFw6NuvSvjh8DP+KqpQuk2wdtDl0PhNJFaSczSpJETKH5yAmRDaxURpJUGjCharSPOPVqquvt7xhrbRIoIvdJrIrBTvKl+o1FeVaumU28EckuEAVEItVaJZFCKw/gmZwtZngK5uXl6oaBYalAsNNmkvmBFwJ3z9cLG65UICSSoqdmovZfhE6+gOCoLW6ajP0THtcP8A+F3YcfBJHBHT5xHDCxhK52wPNsx8U6QIuIsltLhOmD5oG0VZ1mrNOk6nHRZHDxTE08bAuy+yrp2VwJe6RgFiKG++bkIZ68BrdtucWxy4IqeqTrz4VCBASBaCSCn9IMtmMJ9Nx9AFI0sUNGazJCCFXu0TPG91K/UbkYX7Ey6QPfq7/KifJexO1QH4e501GEa/Me6hpDb65MjsWuMAbwA215gy0tGhtUEFQkkruNSJEz/NNWRDepIVQWwavQzaMuae1ps/QtLVapRz7GxgQvb2HvXwGKRJTFzqmMoXamgnLfQ1REBODuACtpBzx1xKc1jva/i7QQcx2ypQcrlAHDQEL2eTiBLK4RUVJtsVxpiblo1xp16/8C4ACEZ5VBWeCnU9N75V6J6UFtostiNID4nIuHVtgjXnkFVVOkW+hL0eVe2HQiiKUQaOuV5XgBbqsJOcsjzzOCBNRfwJKBwj0BY8VQmwCQzGgiuYRJIU9j3pudTcD2k5SswbFc1yiIZPXLN9/wCnPHNTXpsl9SSqZVbYO1HWnDkTtqQ/s2jXaCaiMU7ReTOYEuYQKdbf/hMHzXl8P7JBeboFvYcw0ztUm35CJptufUi2QnlgWm92gbubsT84KlRTpOR6PAPWcqlXKSsd+JM0ww70SgWuft5OggEZ8AATfLhZkGnalecF2xYrf1Rj1PM9Qnl2g3fkV2iPka1QlWaDmnkYsdC3BatBrk/T+6G23gXT5+3haRqSIzdtdE/XPPULofdtZy82ohiyEcYm9xUjV6AsVCtIgL9MbjnpgztEXvRuX8zKZAz7vTS6BGxMqL2SgQGyq+6kG8IU5sN4WSQ2THSHC0QGGuEhEUeoUNyEdCBOs9FCGpu2Bsyful56q1ikc+zQzHOaSDUgk8RZ/wAHdAFNoo5DYpadkEAFKN8uD8YTdDNjyMpuWhCdExpzTlCOvycYE1wuQ8zCpNLUw0BMznMRLtNt80goBSQNssti9KnekIB6MTVPbSXzxVumt7/qTZAsiR1iJLhgBu7lix+3Z4ERBABPxhrvJBsVaSRFL8AjvOKW5AEtVzV39nOCP6AtoxZI02fP33Zyr5LYW1FvrZtvxyjbffNrxZktUhIIlJ09UBDL+L7UksQq5Fprrlw63K93XiI5GrEwGnUtLdgqyMghIx5NlK4BDCBkGJn8Cl8A9EYFr2klWcFFamHph94QFqOknZBP1mliIQcTPIkXkq5RYopKqNcpzKcsJ7ZrGBhrjBIGMnKGSUtZPgEcwH85/FPqDA8uAqC0hKXhBNXOBz8nF7QFZs1jmasT9ZJqDbxJFjzAG22PMpkIKViKgpXtkaoZlyKzuEcaxv5UZfWhZY/Kzk5IKtFg3bnM4df7bhxnTW3ESbMWv825dSGLXorv2isRmFg+semwCKICKyaV+Ekm52gGUC//AOoiD/yVQAaLRIbgWzafI86nxsCJ5ePUFjEH2Y/P1jobc68sRQE7ZZtW+yFzgWwh3xPXASNvhqVDZBe5UdFLrf8AGwybPqAiDN8FV6msKtrV9gjMClCDUnobrdlOu74tzXCm5g4wS6ORigtqC+ggXny1403L78jhvi0OiiksEYdf3pfCbUeg8evGH7O2UKiprkAc2TmDqp9T1nfZ2jTtrRIElkcy5G9OPQvQC2kf/Zg6uFeh3iQmXh1oScS0Qk2eHSsVNoRhGcdikC8pAoQAFk9dw1qslYb1J49f3nn2OmDQBnR7Le6mpq1t8oBg915OozA3qA06SQ8WKZzNGoBKcef27W1GM5rGlB6nytUE66RobqfVEdiqAOyAuUAmEcgn2ACDlEAkRfwAU4QEkgc/kJOjH0pg2lff+w92KUn3A5b/AFNLP/iv+fITNjtsiIefv96Iem5JRYN43z159HyomWln/gQ+i/yDwMZUhVS0DBkQz8mqSo7kNKjOBkq54vAxlEdocgaJJNSwJc0ILNpkErjrk76+CbwHMeMZQkiTU/BUR5l0QI31AIM0E9j/ADqqSnG9/cGiDGvRu2SqdFlRRDHRrk2nHnkYd2HME5sH19iKOsmwU6WlQDA4AITaOZwlfMyOTaYFiAaAMCGbSCSXzdgoGW8xVNF3FxBskX4dZoTITKwRLL0XquLXCY8uUUBILM4UbNbCGoEK2Qk21yi2vDBQBImSI6DaUT5FD+TAfiBsE5dPbsAEr0keqoAQIW69YRQXh7AL1LNrgBG20cm8RWJgVruU7nLTj4QAQbbIExHNMQP4DeSJA6tZEPi2n7RSI4TUMUAk+wR4hl5aoG4EMpbd4rtlVTVkFlvlmD+gOCJUpOLDsvwDxsCiKDOQAVJZFw7LYexAJAvFEOGecF4m12AaEsB6uht645Xp1YCQYOiV3ShgJ5AS6EtWVjeixroimbsEtykkSte4bZTWdbtdY1i5Yf8A9E6oac5peuyhU6T50DHVm9G5Yaj6dmVZlRq3CEnh18byqEB6DnLDAmmDaODu1AQARWqM+B7LK2vgwh7uReA4Lpyuy/pQQllZSLyZGBoEgjAjaowPXAACzaloXDEBKer3CbB2Seiwxq3kOOmhC2EC44HORFYiQzUWfyqpyEVqLj0Feg2+WOyVXmWLgowXC1oJpqvmLgKX/laSQnqnSJRY2UYtZvLDQ7Kp0zI5p22LgleE2NoGLIrblwAnEglmhlSSBM4qQYeuoCY5S4GFBgkT1TTV1GPz6qAeibReAAzENtEH2q2TwdPvFASTTSpwjDs6JfLPoR7f5L4hCmAIyGFhUy2sunDErdSwcvNu6ZQGhTH0nPb44mkHor0TgtitS3osrc+2oBM060RcpsiCMyY2GTUCTUS68kl2F3bMTxEA4ESPsUgjiJq2rb0iBg8OkkDQdkEF4JdKdxwis0mM15O2aRl0naN0dU+gHVsi4TcWbYw8GZwG3RXinttmw27DByRqRTtK3Phk1uMsmgMGHiUEsVswWyKLJD0aA1hM0CiFEljwFACwjKQSkFI1HQtMRi5MSuSjJx1aWb6GYw9cWm/RM6gISXVTj12xq87XpR/Gg0X02wIsH5wAYbT2QCOh+U1hp4AsxJTDCEoabhFiUFEwd0mz9oOeor6wr0lcP48csTEm76TbZDuyQb+mRBweqAzLsVpbp256jbKj1UUXcLpYbEUlPoRCPdLgaxAKlIZhVFIAxqoNRdL0aWmGMCJNPDZOtgf+gAqRLoramBN/qTkw5ULzZ+Clv4BA+DQ1h16rWnUCysbatB9qAF+1tTXxGUhlr4kgj+PpKVqASmmvIglp5K4xP1qYuOgGhQ/DjvF1SRhkYvEAdgSUmpKAtSamQxQzAKkt0AlajXUjmEt7jVse7yu2+pEEoi9PDaCSMGOVu5vowAeozii90UiB0nt6xqLiA6Gh1xQceh0ICpslDBGH9t4uasfiTByRqA+mo+SLLI72KAFA/gmYxrJvFNU3+zhTf50nKidO9krdiBFWwCEIUFdunxQTONiwB8M6lcBnIXJ5AmpizgTPjE91tDS5wXYnUo9Lq/GdUYPUMCVfFQCFKz/ECEP9S0tyCyWWYu4oRbAkm3iorb3tWt7HAltGtkPLXXXa25CqacNw1KRmGBVkPKjBhTnzOkkaQU0NmWABmE/dzkXgEYGd94qQUHnHQqUGRJnbzXajgDsiHQ2Bv306wSZCqXZvS7L3XaIklmoMmiZh6I/Ho0UtmJg7JPIg5NudjXY2NyBcajPg3o3wMAtIdzShafAuRwmlhD8/tbMkay0qgq+WltghKgQVooDHdG7Xd2UkApJVhCFt3iA2Ty7iHJYzLl6QkZVO3gugEOk1q9BPE52ELUCowXrMak66N+WB+JmvpiRrtGZgikzV6GxEtBVRK4spfcx2Yt3SPSoUk+mS6bqYLRAiMUCtQSrAQk3IyS4fiXvuy9SVNyQu9o8WDBIoRGRk3b2uf33SydfEEgC8gAFOksDJApghxxo1bLMJ4CqziJBI6MthYTxEC5scO5Chz/w0gRrlLNAFZwPEQ5sDplY0aSAFMmSECFJFu8v+UwiK56SAPxHJ11UQOvSntmRhcymn3P8AvW3QEJj5zLwyEzFgINDnwBtAEiaJarOhpCLBjN0iIPRgiId9AgpmUQ8/qow8XMAB7ynBoDc1zC4+Dpr7TxOhJW84BJEC5EIPYXYIpT5mX+aEiCjVo9f8gyv61v8AfpuHrhQhrtj+Jtm+GQAOrSLe1fnXyKQYyODI738Eb6EJNwhkg3d4TXXBEb5bzoWjx9jKTFhMCwyDEfF/aLNE4s93USCXiCCA22p0m9tLjQQrQjDFep1QDerNrnvQbhF4e7318u2/HligigHTvDVKXNGaAcLPVcD1i6ECR/VLROSa24NxN92+iHDA3OTDQaoQ1GUA/wBklE8EWmA9cJ4FTDxC+w2dsA1uWr/U6M269qwIj5E5vzm3sZQ/U40qybpL7D2MV65yFB9LXIBD8dKrMEgFioGgAT4xFIJG4WCVBGyGWS1AZ7JBVVEwgglD8DQjBUJvUo4MWbjmSBDpgGCtJWFNKsbQS8gya7GkYEj7w39JUJqExAcHk4MdDm7QBdjHOfbLgdILGOIUX0LWisQbRSnCFItz2SFzVOQQqPBCxuhC2evRqVV+tdgwbC4SyGfxiQnwGFU4SrtAU4tQgkoiEYEqVj8Ooog5Gvee50i7fPYiPUjYwaVsbwT3hwZxdz4xqdkSH4+CRA9PYlw9UWV/e+9WtIQYG09Fk1QgDQgg0aJBysrnYeX30g6cD1ECkvEykTwXCfm8OWb/AFdJk2I2lZJW4NmJixMqNPSgME+TF8csMlGD2QhNPNb1EfLsgWJypjGcjdESYnPXHHQArht3T8rPa9YP8Yu1WQs59MBRCd0yDcku2Nj7aI40ABiEIRhqvREqdPFhDrAAo8omMnUxAMHiPiDYu3lhZsrV2IT7PtemYRXyQqkt4icVLU6trgiy7vFCvMsIkrHltxDPXNv2NNr1xKQKDCdtk20sDLQ1GK8AyunrTLgQjd2zFAA0kUOhXn+u+VCi3/gScmDSLiOsovD1qlnShcnolQEjzVbL5AY6hJ0zKThjYC7YIw/SF7oCNq6a0ISmWppCYNp/4fXBoNB/gdJIhHMwpDf17RUrXkU4EuFvsmiz8a04vxbtZHpP4ky4btLI7xre2ph93XMfj1AptJWmBbr0o21QoANG/wBsQbAD4x2AFP4bUWvJXqCtLOTNKac7pBCdVK623wIBexWiJv8AEQCaVVuRRrwCNQ1fPC+Z/KlH0gCGWciKAky6GPJjY806okg6eEgCj5qk6h8BJq1iCv4lwgHblwegCAwzcM3fqFKyv0qcgXTPjYB5Opx7lMOdjDO7VQukFItbaKMPEE3XhLEvt5bOYmEwFnSgU4rjwNrgEovEOMR7AGc2hBTB9hyIuEuI3DaAH0Sb0q6GcpCokwA0g8eg9QSMiB+wacJ8NbsdB34IAkThbvaPI/mE7pfEqZpen1WgF6YUnU8/AuUJeNkYx6laKzlNkCTsFew5ipWOd37oNO56g9ODvRmoGgAOoiJ3QNoiAdn5slFiCsp+nzXyy+n6kDSpVSrp1Rh90IcgNUeAtzLUcY91ALdDTH8xchlyR4yk+JYS0cm05iEAaX4IG67fPHf07MWyDrWNfWaDkhqdmA1LG6qc3JJ3qVNuL2IV6RSiRAbUu3fwLDVoerHF0R4sFJSZwGBDD6APV1URfbtIJyTbwdnm8Z/A3zV4kJK2D44EH/vNFZhbt2QBtXokBXB+qCWk7OQqlOQV1eMG6o0NUUg2Pgjt8J7fyW9sTb4SpSVigsianA83giS9zkuwilyAlvQAtt+jkAMOAUGfOWNVfeAypc5awitE+J29QntAAPsZ0aVNG86Vj8LQgnEsd1LjFAwElCGQYkHF9+3PaXnXQgljxiSYvy1oriMD8A0lEmp2KxysldXDh4qGimwMCdE6P7yImAA8oMMTkN467rBgqaWjv56ThiJqWJLEUlBbW1RPksnKSkkiu33EnhyqKerjNz0wxiGkj7TtudqOp4NrUQgqwWGkDIonC0Gvwdg8pkUo8r87CqPFj5NGKUWJqCuCa6kwAXm6fiBExfyECVHrf6art1rLvg3hQstqVKKQtp8kWLai31q7eflFuF7m+MmVIPxwrb+MTAJVbN+Q9DYI1UAQCQh8hWEQ2ods8fgaicptW6ogrsiYaEwQo+WWxdwB9bKZLaUA7CI8+rBjdmUP4SXkOaZ6bAaffK89KZ2HRCD0kUGc7FA1tdmc0TGPfy1HniRoByqpkZp4Pp/vY8NBOykiFj66CDSwmRwPOOk2C2XlHoPIZ5ia+zQA4ticy/5mGwX4+EBJMo69Uz6hVmnBr4zZ+NwgUxtUc+LR6Wy2q3GzFUa6wIOEg5a55SQwVAPm2kgAZQRcINdI4NOomQkh20DDYh/xRzizW5Dl7AH4HW2Is3u1y7Jju4ypWArB3Yf/AOCWYlKVCMExCmAIc6iwMsgf55zYiOPktkbIVg+qN3hXHRMan0xAvhL4TqesF8MsjPJ0gCHQIFxN91U8bTsr6yRgRVPu5asEHbtGIel6pBPBREr2hLtdwNRHhEBAxBrteF19CMjI+7Ucy6WUcPu4FQEgHNQVaXmYD3HxmADqoB4SQNvoZkgQ/WPF6JxBkJ7IcOPxotUZJg7fwD+ErK8fKUvOfvEtQDEBKpO30rLtorKNYjH9QE61o/AnoAyXtM6YjwCm5KhVUo0Hwng++4YZ+Rtq2vIkzPfHc6zblSzio5q6YXNZ1R/I8GmHOYYMIMuWjYQ/JEsAU6wFuWanmbp0TeImekhrFAJxIAMyVcM3gFMKEAIPCtREdOI17RMYXsBis3kEFuwJhy8k593syIaNq+7xzMb3NP5nE04AflpdhXVpNkwOsIsRjX4cdZpt40MB9w6ikdlLrtPWgJ3hwZ/F5pSOtL0CEkLGBBcprrjUKBbALMJnUYnmRAQaqnLpPFskl4Bx7/YzWW8aV5pZII4w68a85/goRMx0g+P0jIbsC3LHRlpKj6z0xrFifn4Dq1CY0IWP+3JCQYsHIFlWree9AfZOdEhtImcgRP1TSrUPWaBkfsMNOlqwFeubJHRNmUzmkL4ReL1WfrVNiWz9P/qcJZoS6Avm8zesRZNNWN5J4ma6lh8RbsD1acITkfte/KrRcsQJFBANUvqox8kQUvH7OP8AXcUZpdAJKYFMxmUCDfJlT82cYZZHCsE5WIAQ+B1ZDYDfIPByTUDbOZcJraydtmuAa2w7EP8AtCD/AHKZ/wCFPCFR47R8OzZDr+S6Cba9OSAYsBBQNDbADkNxT3j7AxEs+oFK3Xz0FqafkXUBuKxAVLRLZakuCpUDoiiBG55ea76nRSIC1IdARmXXGT1siodGU8l7xAeP1mSdZGsXahKZof8AHfSBoFYkQMufFEkntpCDeDplto4XPLJX6wvSXjN/AfXjBx2ASzyTTAEOkdA5Roo9GAE2R3FViWNSQ1q/7MlDZfb0w+xVUAI4L0cNdXXOP5uTR2Qt0gQg7E/dm2hWrBF+NTtBtAAl5GKiAAGhBhCg/jpl+RWl0dIhsvHEUbFzw8TPZBWyEbNWGN0FEQAdhJcmtKmXpXUFCC4kyWyFG/fFmQPPozj7fLkgRUQAuhWr3KEhmwa6kXPmdUWmFGLVYsdl+MihykHWTSuOEBYtAbFqSgmQ08y3+11W4wjRmfkwO7ViP2kbiMmlusQikBqyOSVJOLGwVMV81bkFTxoCS2DEAZrF0b5jWa4+zVduRS+ZFIgAuAQxNWg7o5BnA/hp1JSqNMAAncd1oOkVrhDw41KQVg1MDCAuWjcc8DUdBLNySfHmwQmsapYksN9NADVbLiH+BmgQEimSHK0mCGvAKSWUfYM2e33Bh907st6QyF1/FRC6iMAjnxan5mU29pK0dyxN6KgAR0yyE4UowgFgcWwAfHo4q7uKW7qhOwEtnLNZW0G+uDrP/jchdKL3xi0ZkrODkQcUEMbQUvTUpmTAT69OiVydv2WIJmiAFQ26d6VGPkC3EFADK7RQ2zjBXvBmjcLFeBeBAQ/wlBx1EgHzSN34kEA1ZR6QDpryBVyoq+HMGgSzP68P4v5D8xJNvnH5As6DYQqIRGPYgQ6re0YyjAghOOh0RguvlTohgOuYbVqtfhxAsclEhAb0hQzIxQRF1Qk6pglCiczl5FhtpwL3dHCACzoBw1f62sBZQGIUa9ZfGcu5zkEnveP1y3PMu+CUTYrrZfk6oAkCysAQD1/syYkSWRQNRJawwOQZbyPNWN9kdb1/cUCacbRzid2RQXlGq1ppplO6SD/mvmgDmMKiUtciNF/gzF6kknYQhqMp8Zq4H6Iog7CyuRDdVYsV7PBNCfyrelRGW4cuEoB9mEvjYWuUlJJZdhxwSqszs/P/ALZZH3rMNMEgIFwx2qY/iGYbwJMlWLoMAHk5xJIEyCFsLPkkYahR8v1MIAGYBMAYiFphgBnwHJPwgGh+/wCpliqm9+ihIiwwSzXkxqzRAjwRGFszlQThNfSpHJ+dB7UUAfvOa/Fd+R5wdYdD2Oj+rFBPXQZH4tMBISHD0LSbKAU44CAUtqUAF6QNlbADICmrCvC72IoB7KwulOyCQRSbG7ViR7ZRfADYRKwAIap4UeJyXmecsEjd8aKEYlMIMRzaFH+UgBpkIxdV6LfcU+jdBHLtUi29MrFwJ3Hhj7eG8F7oZuB79+CCfiBRbEkk9QdARDnax0Xtyh1g3goRQKKs2szqrSJARFq2yW75KyS1g0+ORcdvGF8tgBAI847f7zdhwuhw0m7KQIVKUZLhDn64fEnzS4cl9rKiLJLjmZXqgRQgsljGL2cBQYxUKC/apAJ6xVciaFNp+z5zV9o0aIt5RyRpDAcTw5bZtR2OyOt46jkqWPpVgZcnuuHcXV1VTfrdrFeb2djhd5xeV5HRP7e407J7wfFXZNIV2WwGuNG07nojJCI2J+3F0IGCQKoAgRD9bLwWTZWMyuDWJVhsgkABO0UZqX/UwSaxZKpRYk0DrvwwKhRz/s/c7aJBATIgrbPXkZ2zUPJnMAIJVxOq181oDWZsXWcpXtm32xASZU7BwT6PKOyHB6eaJK3K9MokDjafV306zNcKizKw+TCTDGH0WT3JsiXUCbQWBKgqEqp45yBPGk9IBBQXr+pkiSzSBPS1qCsVYYx3ilJg1KpphOqBcA1hHeR9F6WiLbdsRWA3SRpdlZ0ioxFYJ1AIeJs5qjwXgjKtqJbP5V8xLh6GRMHsbdzLS/OLiZSicXUohLMgYWIDjdX/ADw/Fe4ggCuorUuwaEZNUCBiIuUtJKsUMBdAlrvqw4ze7N09ltZz0AwYvvW5Ss7n1mXv2TSxqXPXJo+FyEkhs2I4a3YnsLhezVSkVgkVBQ4FTLC3NuKyh2au90o+Q3Stix6IYNb7QrGQ3BETBMO4Pynm0Gmo2sBodZTZyF4oWJbBKQl7jXsnDx75RksYmEEnIBg1Msro3icy64ijK9Yl0oSZXhzmgAtPtRa0EkTy+FuUiFIA78A5gWgDQSxA6QU0gKocdrkSojMUyz8Tao5OcfWdL5vBclYAASUkFeJEXMEfZLeNhddhL8wNFXwVZUD3SaYSP9LSwNbzMdnDUgDhr+9eoUCa88ZpcCNsgoZ1kBDUm4wh1CoWQROiUCQ144xJusA4ABGZMV0wnsxDTF4e00nc8a7OYFaSYfBgnLeFSljQexgcmVs2wy4IECwSlXGHUShb/wDlYENbUYCChP6y+HmUbHRBIjeCEpvByaACe2YFP40DwvBEeoASkYLz1WVbRZMc+hgVd/lMi6+oCEH+yFs7z3fxeNwCpaR5/EySZt3KMjCYRinL8BSw8DrZYJ4E05XeYAnK0LoOIQ6QpBjmts0RJg+dWCLkiFfgokKwa/KsEg4u1VBAgtS4GoEgrCLmtdqf+vaz1Z43snmFc8iOfAswJjkEQ8toDS2zMYunsjn1mgVhdt4nghx3ylCpbeC0ErAqNBFYNJt+Ljkxo9Hnm3KEYLUzb4iikKhNgGO6oPJZgni8rJWIfLSWSIoV6I/3lcxLZ6k4ZaYOq0Zn3vzYfQJPey2gMfC0XFMFqN+m6R4otaYNdhHsMVSVVVNAt9KOVxDpqgLpJRPFY0mA0za/7Ocvln/TtKrBsyXpFH+JQIUqUlRzFYjP8eEnD1kshO/OYgswBejNhQ4LYOJDEVl/1H2rh1JdccK8qguh8M/mHT5ZbS4gFIO4ptVtA9ugNT4oEsjlD0lXE9o2gCUDK7V6hDZZGRBkm5UO3iVbRAPQlWValEN5f3fNSEXFuyMVt80f/wDztNiYkZuAaQB6yD1wq4s/JD1PHeO0SRA7/wDoP4+V5VVCXycR/QjqyZVgSAkSmVjg8RAJ3QkV8DNBMe8KeH00Ym30yEbcYVSa0oyQrI+Xs+CiRykqdAbksi3s4323vNZnsQqAmP20oDnU0/StKq6JLaS4u0m0En1rUZVnKyZOl7zNTSos9H9BdQnBMADwY38WhITHpT+lVv8AcpXqBrkoGAL9h9FQPIeIkmpBPUJnxnVkcCullbsIAUIeaa8LdKFRXLQJZYZkhh8J1I9NvoECAih1mXi0qEhqZTdf1Vi9jubw7BzPf5GJz8PS4RcM+NK7AVnHhSV1w0l7c9Yko1UwWDYzfHXsemeBo01/YzCUxYKKjwMQNDOOr9GfRjYc2ByFPpTBAAwqoIAm9zzELBmgA/pT8PpAohKpKxxvzae7ZCO/5yklIo0ptEPubIFIVhKIFEHEjElIZKsYIsAEDqpUXj5AEqpEGkVxQBb8+fULHOGCEhuqIBTAJNBjI8ssDxgLffUR4JHdA2kkLiCIICLO6CY/xPP9gAJzb0uyvOb8j5/cVSP3wCrkO7M6SruHVIrgQr5wBDMiA91gnywO+djqG9mzox7iQs6okaIIa+96xXElJFCBKr/KaYFlep1JdaL99dscufDaNLQs3sTP7XlMS0DAiXYrsETfaPwo7ZwR+xfLJw2Isk6dhvmDe9RAKTQBKohkMUD5NFxGuj4xQPevvTVA3uV7pZr6VdD31IB2eSrtUCM1MG4CRJEHaI7APBe4NaKmNaW80lQk1WxFUGa6kiBPRr4F8DhKyNY7N5vOcWuxRJghELO5xeaOThj4I9BtgGC7IIFPF0cdmGJFRGgB5yEpdL7DmIsSvKlbZFgcMh1L/CZISHCfHMnGsTRHNjmi9pJbBxB6HNrtMmq4XbfyFIgKyQjvMLcB2Ahwmzs4aTE28k9Y7IFhNaJn/dX/AOsaSREGgAZjSYPLMXbG/wD8t78VFQICaDLmIXSrWJggtoLIiF01JOfIzZX6AHZkhKwCZLMug0xKRgkmmwwiDVOsBvN1Xzx09YlQNorpVaYIDdM0uSVEctZhg9nkIb0qk4r5LCUsNiTEJx7mwUXOigub82HP+/EtmTn23EmAOGMCKPAErHjUCCyhm6A+KMgDuvw2L4mA9YmGxUQCcpCW9R34trGjTUqty2cxCdK4od3oXUrK0Wt1VWzkCU32Ygmyj0xoY+GoCiii20Z3RHe+8D0oz1Iajh+qhdQzts3mwmyj7ZY0MA+JdMQyq6+AAIWmgCx7GZWiwECxS2YE4a9BCe8rKRNhs+JUNJjxVY8BGPzyEiJ2Hc1WVACuhZQ9iGMC4ldgy72yIq3ulIf0mH00qSiqfbv7glzQ9HvQAw3TIDjVoxKJFoagz+Fe5P8AG+IlIwPnnX4FiVOgjHEvgaC4wtarnj1YNLaG3/WQ/NqqNNanscKzSYTuwKLJDaoK5JSTTE7lpBYD2OSrjUGIbY4BB0EpCZigltZTzs/uTp1R4cIq2BQaJrbkN7kbnatwogBvqprcmBZlqLLrBDq7klkoA6DTUDQqQACivOGfCKvoggJr6Rc1t8/HAiXAT8gOMCvcgbYcKagTrxaZgFsKd0JBOYEFZOpKqI4T0mJJ1x5AFUiAmqqX2OVdOgAy5qGeAJ8lIA5ihqiZfLnAgkdRyTILVBNup4y+lds1VH6vS7ldTa596jSe5zKGS9fihBftL0DABhqEM92jHfYDDZX0sVbmg4rpB+STl2tjGSlvpp6hOUdvaGHwMRndLKQlKiTc2heNIIqIYvgxCpUW7dHl3EFnyY8keK3zzT863h7BVgFFCbYnubFvZsq5AxN2ejcTLteB9PKYfQBtkmcIgb01Hz5TZBJgJmo9cWUurN40d/G6E2bH7nCVFQLo8880HxlMpLQ1oBIjNJqwXs6Twu2hZyhurH9iWm3zDgGcOAyMpTuIbYqlYSHV7oChsK/FViERlMD8tyEDAh0giEz+QUl2khIDKUKAlVnqOlaatgh4oR80NE/CCoHUvMcxoJ91i03FYEiu5CY0q5b/ANGzA/xWwd0xrAVM5yxwv5g4XEglJIWNMYq+JmI/SnC9l9YOo0zM7UV26GPBNVNsuDS7lTAdx85sSmDaShU8idoo0QBTeCXDy1BMZfIIhO1wBCON/Zs0gBBB5qxyChDE0FR1Ya207YahlKplhSU1U4K41crUyZTg3RJhCd+D1AicbIBEJslFH+O3JTFD9TRswF6GjbQUGuUiIDZoSVi9RRv5+NBX7K7KqJrceD2sqQZTEZF8OLQEADA0tYAW0S4cxAIQt4agqhXO4aXMfX2gPFNt3dhATGICv1fuvz4GfJ6da/KkNOrmwb4CoQux83X60IlFQRZZ+Lah3ioaEnJ9FZXugEBPpjjmzwKkJmcnJ5aQZYSrgfyZ6wR7kBu5gobSXyG2LldUry2+G0/AkSt3LCHcVaFm/ebW6Uu0tIfNnXNlalobl6bT45NRBnFq0I+DkXEfiJ1FZijx8R9jQMAC9XGk0AqweZqg+yAgBVmpJGYYjopAUbbvUCdF0kIkP2CvJ29CVv8At3hkQAs4BxG6+/OuAjQ5IijJxcEy9Fr7elGiGweIjQvZAGaWokq6jKoDvKkjJcaydiADEy63EbBNBEium/8AokPmbvBIOMA9GHZ6ZnkncRC/tdchqBSqvEG/E3dmHk+Ne6LrUIEkfQlTV/twQcjzuU/sI5aNUGAU/ad7SUdYgA9euaqQEhNyinV793ETdAAJ64JZDT2xttGpLtOu93BeWqtOd60cxFvfGOmSoRQhDJaIkdY7i4i4j7shGaLkYbnwiM/OQB5E6FcdMSwpa0R2m+dkMkoCmN0s8JEvE0oxVHTK9Ce1xET6ryDCAtyRwRIDCsggsi/TiEj6eomc5dAJ+2wnWnPhyDeGCbKTADZCJR3wYwstn+lsWxEgiMSxFxRM1bT+02lEtjcql0MrIC3fy1Mx8DnJKxE12ktqB95KZf19AkYfNblMDddBfZbzjyNM1G7ooMMXHoBo7ELPr3uq7XQmjJdI9pRHr4Mto0I8NBl718YWEHk9vkB7pUagdrYBi1I7R1uqpTlqq5s2iEkZ42ZHspAoAjqTQzQQk/qbmAnlz12IwAgn4NfiMG2dy0vEYhaYwICsitDKmFiOlNfTVpzSh9lk+QwgA2uwanLbIuAl+ZiY7q+KYptR8F7awNEJEgnE1A0IkiwJENl/GPkmMge0fBOArZL9oUlZ44LgrcSEDyiABEAJLyPfnt50oaEHyAHFBRvfQJHIsOuTalmul6XAOnAPd8POKJ8fnGeQjCEc0VHjQ1ZNbJHIwBFtRbW4JuCdaBsJcpQCUna1i8fnygxs7LFGAPKb+5hKIo066bxLscG6BKRIACGSaOSOrAp+QcadXA8Jv4z1UP/EACgRAQACAgIBAwQDAQEBAAAAAAEAESExEEFRIGFxgZGhscHR8OEw8f/aAAgBAwEBPxBmrPwuDDho9Hp+eQ3x+NNcJ3DU7zQhCMOe+CbEdTSHDNOHU086Jt+WOvxyR4Z14MdRj1NEePTOuGEfU+phwcPBweuoRhubprxuxhvO+R4m83cW0/Pms2Prw/NZt5kI8bJrmpNk0I8MNz8Pgaud8/hmWrFX2nV+X3+9ts9iexPYnsQ8EPBMxUDdB34YL3IYWHDBUBqLxtio4n3iEx6WM2VMYszg4FkGIzSDIwpIyuGJElRFblSjO4BEKiopiBAlVwKRLJQhVsYyzPVyizWUUY8oque/SkIU+mZOJoX6++frCegYOlxKUiZ1skEiLmlbfBn9S2QTLYnZ5OWbohaxsYcvpUFEwnvT3p7096e9PegHT/4axfY4PPR6DT88hvj8aa4Q3DU7zQhCMPSR3HU0hCM04dTRzom35Y6/HJHhnXgx1GPU0R49M64YR9T6mHoeDg/8CMNzdNeN2MN53yPE3m7i2n581mx9eH5LNvMhHjZNM1JsmhHhhvlhq4Zvn8M/OhmV6WpiUXceEHDDL6eEHcpkQ4I2i5MbtTW5fI14itDMYy4KqMsFkFC5dYYreIxY5i3FWixfMaZjQgLLLG2eEUO4JGMqyFmK5c3lyg1cJR58SrDUSxMqBp9vH/Yu0ZCB0E7bmYJb4RS+/XqOHBPuI4wnmGLcI8pYBRUC5nuH4EiwOu4BtiNehhI9RwYlhuEK2eIEint3EVSu/n0VwXSACiVSUfz7MvOCbHqeynsp7KeynspU2EANetY8RfYijy0eg0fPJtx+FNcOOp3mhwRh6SO46mkIRmnDqaedE2/LHX45I8M68GOox6miPHpnXDCPqfU+l4OD/wACMNzdNeN2MN53yPE3m7i2n5s1mx9eH5LNvMhHjZNM1OLQ9Hbyw1c75/DPzv4nfC5cGLi64YVGJZCHPzPxRrsBKnEVacuJTnLx3BbTFogYBBQtV8xEWLF7gXqLvUZGxh2wgp3MuzT6gGoUcwYMveI7WQEM1niaHUTTdd9R5SHY1FQBxgQFcR5InJFibp5B8d5I8bYFa4GVMT59GIFgVjcC0Qw3u/3F4MNfyEClpXioOkoSzllXK4Zpmj+57c9ue3PbiMAGD/wWPEX2IpfCmiHPp+eQ3x+NNcJ3DU7zTg4OHiuHcdQYhCM040mnnRNvyxMeSPDOvBjqMepojx6Z1wwj6q9FSvU8HB/4EYTbNeN2MN53yPE3m7i2n5s1mx9eH5LNvMhHjdNM1Jumh6O3lhq46m74n8c/Ol5jrCWBcuDFwWkvpsC5ZxUQtsbtzvBiiUXA1GXKtTSoOWXuZEyLmEWOoxeFEoxGl69i/qW1f5vaBaaP9dTNrlbUB8qTAPcJVh4gkGpZAmTNJRpT6GEqhx3cMBggOoFzqFd3L+GJlFzDPJFx6EPQ+ulfaCJZ6T0Vm301KmGSVGxElL7oBOfaBYRKly4KLqLwFK+PQFj/AOTFPtEUuDw0Q5dPzybSoftTXAlZhqHc0JUOA4qPO0dTSEIzTjSaedE/KY6/HJHhnXgx1GPU0cGdPpdekLiY4r/xeDg/8CMJtmvG7GG875HibzdxbT82azY+vD8lm2fjQwIypummak3TTlhtn+b34GqM6myfwx/ei5iiq5HXp/mv58n1MaIfB2+quDEGPDjJNgNWevNkqU2+WVy5jzUAZSuF0cCxjsiYZrjYNR2PGFR0x/tSnAcktd8NkGNGJZoQa/jgmOzxmDcYQCaxMwHj2lhMmia5v0HFhub4Z/8AyjS1vbzH0G2U6zC+5XDCJxcvg8RxNqiXCqNU6/YiyoqegjnH4jIDJh/Z6X/y459s4rgxTRDnGPzBFQMyoftQ4wJWYGJ3gwSoRh6SDMTE0hy040gxhxrn5THX45I8M68qxw7Jq59PpdegL4df+bwcH/gRhNs143Yw39A8TebuLafmzWbHD81gzn43EIwmyDGak3TQ4qJO2fh8DVzt+I/1i+9FzxMuI5SXGd1feZJpAorkPXUSuKapdQi1FisuXCzSUFxXiXmKJjaKUdzvlMREI1uJN1jiuf8AyoSBOZ2y/gGPJwhaQETxADUbTF7w6kmiMyl8dojXJKhAuJXK1B5Wi4eWI6xHddkQYdw1adwovmpNrolS94AYOQvg4l+m4JmAy6IJyN/3BOt7NfuVKUP0lOrLyP8A8lQNfMzADx2y6S6I7MpKxf5n+wwNmxa/x/v/AJw/+KDbATcF+CWwhR1NUCBDIx+YIqBmVD9qHGBKzKxDuDBKgRIEqVK52jqDEIRmnGk0w41QfeY6/HFQ9HXl1w7Jq59PpdchcMRY/wDm8HB/4EYTbNeN2M2+o23NG4fvzWbHD81m3mQI8bppmpDlBglSokDLBMIHDnb8T+OL70ySmAHBMnmYmzPMr4f7hEFZ4Yfrdw/jP0+49/v/AMK4IvDg3VNzXMZL7gkpxSSwA4MsKxBc2X9eIxjkiTDEcW8x1mM7hq6ZG3jH/DlFaTLLEqo6xHFc2OSi3K4F43HA83r+Y7I2eIoE28QEkaDtFi1LiyyEMB275BVgAiPzBQXEDJ4mJvFRpMHlm6r8pXoGuDn/AMK25YZnkhqFC9yoseLW38xCD7MM2mwMSqhbB/L9P3US3f8ALeX/AMSgRxlgB1RZivgQZjwhrgjTDGFC/KVBxsDuLEfQYrRrrDxwRIEeHl7RcwFQ74Zpw5mthESLUQt6gCilzUfDO9wehXUZ4e3CDLAXfXB3IQo9K8VAixf/AGOK9VTMIypVolEqUTCB8WCJZwWGkNvnCGAKuYUYFljBPK+wRLgTdwIBOxyr0vxUF5H4R59mADwhxqD4kFKJvIkCjhYXQy2HENutS7FkoMsO0K5eoWsnayXQwHe/1B7ZhXnxKVSB2Vv5gAd0wLr6zYI5GZOYcTLvAeZSWgXXlPLn+IkyhiVvz/UW4SJRpNkozq+mvr4/UMLYwj6L9DiGcsMaglCexNOnhgi6S7GqusxdzT5xHUXeV6CBHEUUZLJYQ6msUoymIBLdN1DCXPID+1LKPUwRrwPEFDESueSrjAFsRiJVzL2swkLyQGILRuLAMyiiRo2OJhjuizUqMRroiMFB1y5nuG5fSWUQjG/w/wBy+SP/AIX8RrpxCVzwP8OpSgBa++oHRX2gJVlcAwU4oY8Jj6v+JRrPHvF6y+NP2ZYRd4nsfmW8fmW8fmW8fmW8fmW8fmW8fmW8fmUJYiCwrmjrcCbLZ+PMHtYyklzEoiwgwYRSjMx6p9+TZ4zzROVKhwAnvCDNwYsI8rALMCJTfJhrlLK42hZPNfXh8+/Nmdo7I+o1niLDNsZ/iyxhg5WU469JLi+oI816iPIDTLyVuLLnQId9QQPF8OYVzuYjMng7g4VbCpTHidei9MQjFSYedfeCirjGrej3lJW8mYhcxpAVxqInR0QAo4Rc6J1V5ksEH2lwD8i/uLUTEPmux1fmCo2fev1MYv5+sBwqMW4p8d+1R1DZtd/8rxLGvWoAhRWotuyP/wAS0SpnZ2+Hj6uPiYANRuxmGR1NoIDIYuG4p2bqTye4QuEuBwwjyuiGGZfAXEmoy3BjD2fWBihNdwC/ydQJbcZlCLhbUhKttnaOOoolGe6mXSVsf/VGSMz4mOCEBccbiS1ZjYTBwCAhyGBcziyjVLi9HGCDULP1CQpQKihC1mEENwcALYmHlhCpq5e8RZXMEb9Fw9Z5mE7i2I8n9RKImn+YyvtKy/X+I5cLNsAekqpPBf6RXBA9WuLJcPme8/ee8/ee8/ee8/ee8/ee8/ee8/ee8/eUTKhCxUetuJrJ3ME4bnmWpJW6BIQhBxiH0Y5keDMM0KlrcOXUpcy5b5JWp2S+GDFvllNalxbhCKDn0KkA44YK4r/wGtNwBGEbfiHuMwxKjwQy4Fx5uZ9b6L/8RDcEqPUAplymPNUXLhE4H0oFF7h6EgXNcLBsYvbTxnURxndOw/mCDAMW0GWv8zAtGUMEYkoM3LmWPEqowPlgzTcZs0vo83yx0pcWexCUwV5H8ylkeXX1mMePb/sRSt+H2gL75/cpAxGC8Qv4zFiiaz5lETVom6le0wIPJv6wpLft3GdZd27PENp949vf+PMYUXLDD7eYWj2H+JcIgWy7hixWWhiJri5cVZYIlkTA7Y4xM90Lux+NkHG9RGEE7MyhQlFBzCboWiQVwbL/ADaFELDgjixFA0DHWW5UYS7jHc1ExzNKLXfAXLCwLhNDMMFB7ILayR98NQeZSL4qYRXuiHkwxQiGqP3VPtM+HzBYq/JBvJ/4BMHgivJbP6lahHrdwTIeHlDgtlji5MS5cuXLly5cuCkuU+8re4gWaaLn3JdJh17kVtR2/uUZbwS4hiDCECVZUMZhtsMKwhAuCiHFRDsgCz1pgauGdJKWBXCuggmoFslihUGyyJRF7PrHZ1fXXNy5QqwDr1bNiAUTUPMuXwqDHi/SNTf/AKVfNR4Wi2K2+GD+WV4jiOIcMcQxFw/MPF3BsuXZy8Ch2xkKwe0GIL5a/uKdb+5RYp9IXtZDTdETOBQE0M1KQM3R9cRgFFY9vEV9Dvpl2Zb+8woVywNrNEsKfEZndchfLu6QASX3Mb5x6DbC+pC67H7qUo+6DT7kFsYcUZILLmweYsYSpjGBWGYmzfzNkZcvzL1tweotL8PUsKh32HvAT2MbOzqAKSzHTmBQVHXtKPr3y8KwPcxh6idx/EYzOOEruHbCIUEd4iLuKYSkVkKlnoX/AKPlPcWYRx8KVEdcy4gI8d8C1wy9GvdguJXBifcuMVa4Y3OiUI7lMS6Hx8wfTDActFsDjAUryR+uzx8SpXkfQ04YjoP/AARkxptwRTpwxi3yf9h2xfp/2Cm52ZwXRlZ5vdbwM27ilPMXlGvMo8/+IALMElTJDaI6HUP/ALwMuLeHuWh4H5ILwXEIe0+Ye8CZtvzPAvmAdQYtkNQnUZQyesGY9AVZfQBoRXu5P1BsO/UxUaYVYZ0MWXeCEILGTVcI2lKqPoqpP/AjBZdRikX7yvI+xf7jiB8FRWLnz/yLMF/P/Id0C9kuCds+INTcecEZ9HcMFQcNCCQqalmZlyhXWoWLD5lj3TX0AWUOz9SsPUbGGoqsrdyvWt6gGkv/AH5gDRMsM+SKi1AGCogG03CAv37lBstildfzCErcI4PU+4T9JXI1wkqMU5w/MAeomApmJTdS3uP74jB7IH1e77eIZ26ij6UUB/N7w4PvNEE1Hh4+hf3gpUUy1cRJfy8Zhu+Q3Rc62Dt9vvA2VTuYSs8n8kyKimUWPmtdMLLgbOGALZXOdIBljiMYkLiMIBGd8DcxIuphNI1R4iC/8OUWnr7Zjh54KYhU5m4cOOW+4/UA9EGo24aqpISkApmNh3VGgDABTEFVC7Rc2zjos/MM9oeDHHilGj7RY2h94X0iQ13L9KMHK7m/SEQ6iAB+kV7lcmaZqOmUMcKjlbmEaOEuexKup7MV4Q9s+M+M+M+M+M+M+MSkuZNx2bg8pRhh7o1/cGiZdMT8+YZwARQeBmEuESymMLyOFG7S/DCXHgUvLwwUmoHaMfSd9pDUv0L1ylyiTUupkjqUBKlc3HMzVMuFMq4lQIlQL4JXFwKrnH7l3WuOojC+C8P6EuwxIwlqKNPiaRPE/ZBT2tJxXDRZmZU2+hGmviFUriYWjtpNIgwpvpGLP7wRxmAZcS2xgv8AJAlSFtV8CHOY4dznfNyqjDv6QD9xqptorwEvtydp67r3gNf7OblwBcej+fEQmV+b+LlPcPO55maOMd3BEslxwhQ11MyDYy1LuN6rT+YomnW+pVKiKuMz+f7/APkyXGD+afh1+YCH2isfMGo8vo8/vhIlD+cRHCi1PmNLSa+NF+CMSk8Zdn8xsDIwiQB7xBIRwTxFwYRwfeMpVyy5i5tGuOmIO2YajDUd83/g+U+fRYi56dQkQUUcEugsoBpHlX0MBGvwgKuHRuVj7n9xNYyrVo34QFbDEbgqhlnSCrs3L9UuywSkTdhb+WEQzYZgf0IvZwUDHqoh5dRUivZ5iJ92Hpxt4lReYANCvP8AyHsMQHXozwAtgOD/AMQAAQDuWIQc3A0g7RzdUQo3nv118kQkw3xVEdwPE7zCFw1BqXBG4YNFRDD6Ri80IRtRuHZ9SVwKHtLtxXJmK5vhy1KpUNQZfpuFkQYsuLcGuF8sR7fuIzlhbAJarojdZiJVi6hASPDq4Mqmtvt8IEtL8kYqj7Q/j0suolweGVaeUAKIZo4bEqIy5l4xD2lqCq+YPe7H2lm2qmO8xzG0HQcnUHaWOJTBGI8Iw7gIrfn4gRekQqoPSOK278TtDnc7gdalgPvfrwAoRFQscIJ8MsCC1v8AT/yAWQmX/DEaipcxKCpYWyxmBgIZFnOVnOzGDoyfJ/eoZOk+sLzpDAlIWRgp59GnIFBYKO0zrzEBbDSdl+JaPMF7bEdX7fqNNxLc1yA5CrA+eoFXbLp7k8fECthiC9fmX/Q2Rs9kYxlhFVvMHUwIe5jHUc0uGj5/9nygh60IQdcpvLACYJFUBw+UIgGITzdNwKK9HfBlD37lKOIQbgIj1ErdZmap3iJ+YnuxKH3S13lLCBCte8GXFvipbqZ0k6XU3CPFAVb58Q+hUoqoNoY8/wBwbycJY7l6agsm5QK3hGAEYFxKhw0ZgXYxAAo/8WQXHNcRL2m8QmljdNyqaJZdYlkRx8wyY8y1CBcCVDgg1BfFXLZIR4q/RVSISZfIXKzNS74ulLgat4Iwby8dx1KvCXXpZKCyoYxywxHPDARQtLv01wcGy7i1kqotFsxXklR4xplFSmIFHheoazL7ajpRQpkrUBpDltAkAjqMWp473cMAc16BYxrVfeISskXqN4lSh0TDnioogWYLtwsNTqWUyw1cFee4CIiYV3Hi1edZlurPhjwL9lMVifa7f6PzAAGj0VKiSh1DxELU/wByg7oSduojLT1MI5NY94fm6A3m4gLbQsvmG5Z8S80NL1b/AHv5lFuDraZ+RlKvf8EL0xQLYq+/FwOJd+2O0tSj3/KP7R0Br5gtch24+6B3ByBm/GZiEdqX9J6hrU9khqQY47/EI+iAd5uNPxD26gGDENXEso9qjwXqXEUHhFcUwmO54TaKtwpY8SBplqsph9UBAjL8qZGJ5MxwIxeLid2OsbjgKmSIG6liotxPDeIoWUJl+hjPcsq4DRhKupcP4mxK72hIoW7ncTNF8xwfWaoKYRByqm8ISXGDQX3jtifmVxcXls9pcYtQHGUo2JZHxBFMp754hYGADXOQND8n/ItQwjgxF/8AZCsYVUAWnbL/AHL4YXUzRUQCskLxn4iG6s5shcZj1FepkYhjcG9y7hqEOCVSMPcA6iu+NxOFs8rkwKUem/SNk7hGN3xLN0qERQcHz6QbWElkSHpI1Mpe2mpQvpOHhzBUY1Nv6SrDiuF9GaDUuBUJnFoULZc6nxFtQJYPvPCS6iV9GYqTLJ19JgQlR4IlcD7JbTaCLWYIcks4ECqweA0I4OK4G9QuuWhKGifk/wCyrg7OpSB9zt/qD0JVmFtmYhnk7jfUXogDHFy+R6gXftL04GKoQIoVryuYxZOqUwMrZU5n7wy6mJ2cKJmrGv8AERbE4gw6Lv8AUSLOIImh37xuDU9iu3mPWqGjR8sXZLo/v+pcgDh9qgdaZXxDZ0ExdQAPHTPFqQQuKCiYrjl68QQBiLlM/smDwzNFdh2RwSZ60cp/UGgy4zChHFyzHi+F3LMk4hIUqz/KjupfqATMNKDPE2ExtkRbbr03oTp4bHB38wfADOZhqHusmGAbGP7hjL6/8REiv+dhLC48mYmSr4cQlRxvMx437Z/UpJDL0aP5ZgEqUqYNvywJQj523iuL4r0CymaTEru0C24gbe8dGkF2RC1BsvgjL3c5l2WFLc1wZly7cSoSpUqVKlSpUqAkuKmZlwPsQKjcFLLGoTZ7k7iILKsjNVrmc28SyTIgXKqHBL4IglMWIObNPBF4tKY6bcKtPQF8MGy+GIqQLf6nU2g+aX+5rntmR/L7QWy3x0fE18IqZi+BVuiWuiI7RBdRXaXEhXctm/SMAlTDPYlYIxgXKhKca0Cvy1HaIvyE9gEzczSJKJE2K5V6HMdMNcVfKDuUaqMKr9o/QIaogLuHC+hYFyhaZVTESbjBoMxTmHxA/LDIZ1G0JXCArUUqbMHl7/xCAI66nt8f9YhCClXLELe4dXDHM3GFOiOl7II59DXqEyfVyuUpVWYc/AAfyxbjTMJrUxzKHObv7wfegsXIcPu/1GrL+0BA7C5vz95jUHgVE6wPKzGipUtLzWnWIZP8RCWG4XCzI+WodEx7dyFnzlFiF1CYYPwjxO8z99xYz++eff5lBcK8RbMlyx1F3PKdsQdMFsERBrjqb8LiJxcfyoe5pEhiNF2Yymm0BX48nBoqhqVFhZlvqygQsLR4a8SsESlcAkNsy835mrP1iygfaWIP2YNXzuzcSBa86RJTj/veY8EMQlIhJ45rgZceCfZEJMRChFlOmWemXvzEbZE+0A/LkrfCFXNRZ2C6jRtPyQ5FWRB3ArBKl/8Ak6wCamJUJcoyRCVCRIeW2vxA0yQsIVK+XKviTMQOcwfML1AuVUDg4siAF4NnoYQuIZlzNcz6BiTcMS44Sgi7A9PHg+0sglMrKzrq26/7GzCEyeb7xrgmTx9Y8KBu/MGrV+3UOAjqWycJcO1elalC5X6QXDd7qJholbSoetuUik3LFNLjTqLrrr8I/wARw5TrzHqh7jUCWx3UCRl5ypfAS/QhlC1wHnvmrguZlvqri6lhSXxcGAYXTKs8zWMIxxUuXAojZNv3f6iTNT9vrKfBcX5r2lUnP+/PvwQOiMAo6iDLNwamFu77k9yeHEWsQG1ZX39psqNS2vHUQBasaSzbXsdRvqC2fGC7hFhxAD1Q/R/7HN9HL19JWyKDY6V7+ZgxKtU/iDgoOSLx98ZA4AMGNPP9ypbFPyf3uVh0xvt02nOBEMD+sYwXc6r8f1CQFvtPHnx3F64DGZjFGxQ2pqLKs9ZRt7fY9oJQUSn+3aG64BcKp1NLJUUiL5V6LxNsvld1UxA/ufh/3UqxAdRqxR+YdjL/AC+WGkTDUF1wsNwa1HH9zBmGJoN+SMZQl5vH7c3yFxxDO1HNkdEBTiWG2FmNwwxvZuPaALWOFa6xiaYQwzHTpLhTMWN4muFeoX3xfNy5fqUSXFniaZbXGCNlCmFFWTqFbyJdiwViTKEOVw4a5K2sw7GzkjWFLO+H4ZArHNhEjUWsQW0EGUoKfT2mAKcpTtk17vR94cHLb7xitUQR3BgFe7AFIaB3iPFqMFqg5HLfVvv6XRcS/iUIWX3iaTWIIi3RMAw4SaxvMBNSssIUzPMRu13fb5NTcI+Je+erP2j1fnQLFHw4YAWR1GJcyIvJr+puCskcopGDeotopRzEb/qGO2rgC3cWyGfSMeAr05uWEZ+0EuRdR7KmAbmWoguiVHV0RYxu3weCFyoIdmVGbjmCcLripUQcMJ6mK1aY4joC/wAUIL3AZEJVgY3c8aMsnvFl4ri9CYgUwT92EI1nxBhfmVEr0PFQHWOz+fQQM/2I1nxmVvczCNkcS5UBDuF2u7pIgNp+bFlIn3lIWj3/ANcHyH3JueaXuKdorxDRPfFPKPCS5bn8MGQ6J8T/ADfKYCa3HKKGJzviONRZ9BN7jeQa+kpu7n1GP9fSOYnoC4idIKIw6ouA9jR39Z28zAxFU3wxhItWZEd5/MVpww3H3cVKhEiTaj/mYGTcqUlDXA8qVHOphRRpiv1xUx9UzFenx7zJq+IpgwA1KjupqXxUrgzKr/y0SoanhCdcQSU/k8QjS7iXiWw7Z34ScdRD3h7wvUMyoQmRFZxasTwT2e0MhGKohnbh1NY0zJMXhangZgVLionr0Pu5/Fy+6EMiOhQy/jMPSYgZCUB2gjOh5OavIxLRuR7DuIFsTtHQWKz/APJi4DQeJTzxpsX+Ja1VftADBKFvBEFljNwbxw1UAIApgGJp4vnEO7PJuWZoecQDRn4uXXXziOauG4GNPrKgFdJcr3WGA6jzBDUjLStXKESIMpdpKLFWPvLWwYTkjHkiy/WTzB7IM0guT6y6aVYjXFSyponuN+0FH1HKtMWS5c3EmBcw+Q+8sDcOnP53HXD/AB94ZjHMCBZAOoUHxGMJTADREG4Rq46iHUzYi9JK2U+suLZt/bCHPcxFQYt8Vw8oIHfoA/nDRswe03KbpzcWOlbYyqULjMbiOuf1Bk8NPkm01FmHtDDlrFqixseEuFe2cEZ1/wDKng5hLq8w3uICgmVHhdIdwKkTuOjqXUrGLm3VBdD7x1Ve7MfggighNS4xQF3FqOxS/SWrOhlERfEuEsLlq4AUcXBuUc1LqBZfd9O4DYOH2mZUG8DMADaz2hgDwtGZVv0X1CPF/wDkCS55vEZlooQzGdOOoFkajxmvrEuMgn2JUGDuECEJfF8BUsJZiJvGICmmKQLXyQtg4xGG5ZrNy67EF1czgLAF3Np5x94FEQ8OY90f99ZgSpcCwThH7RCL55vS1FQmWU7ZBh/iXMy/D3FvDpjKfMGWSfXS9j/sLlQRrizQgmsvknnIIegglQSNev8AwBo3FOD0tfcnk4bitRO2P6nSzMuwxORa89RAU42tAfK/VjtMuuv98ZlbA/7cLORW86lyniInJKGPTUNcVxvkhKjmVWoe0GV5xFixiWktye3s+3iWOuKhFBbMVp5hWi335rDEBlOnx7P9w60MYJaqNWKOW8EFC3GYw2JQXKRRGBbgcF/mS1FkppgIDHu0/M0fM0QhGblR5dDwYZ4qXL7jWy67jvXGvviAtgikxHulWQRJdtfuNkMFsZcqwHZuYFsqbGLdmoeolOGoYKnv4htOf/d8o7Bh4uZ5i4R73H4r+4WvhGqXcVFwwvc6ATHzE9TJRewviBvL9cwPz92KNB8xawudcGpVYl8MqWRhFS+EHcpJtIcW983LVRKr0dcJSmUV2+Isw/eWxp+4Blb3gKpccJr1BO+uAuJU2zUv/wAq4QiDGoMVKmuBLglBshkj1TuCzGiOgu5V6h7wYW4hrglVw6iMhiNWWUtBcVrBV6OTbVQ0/wA6YU5JpBvcowK2Wo7lTN3CPuZ4Cx2/qLGJTOUVr7r+NQ0CLiUZiS4JcwVKvhEu5cFMWYmsArUCzGpenf5jfQam4zoTT8tJ/MIHa5WEXmsRIE4Iyw0MKLcQG1ztZYDL9S1uKwi26r3HJRUAXvMdRCZCShm8yELHgAK1ZYQmIKfQRgpRi1LuKjgSocPNvLDYwEsid8rRLq1ruLnV7dRe8XnqEW7IrA0zuVzdT3iHcOuq8jD9yDr16d/r/c3y8PRMpUMPf5hZYnndTMplWEKqJmyCnhlxcXjqdRb9wkhgHdwWPpDh6EHAvHhzwi5eL47hWysvaSl0bjwwo07IvB4eUbZluMBK5lRBAGou/s9QUgdDz/7PlLXmYsc6giKKLrUZ+sfwP7gkQe0u2Dc4FogBrjvnXF8EYErHAkvHWU96mAxVArB4UMsaVGuBOp88Eea4qVCIXHZCoA+anjJbWbm3TUbDByPUIs7cA37TNxJ1PjPjPjPjPjPjPjPjPjAqylTAqXGZwxTQZVLvUNLtGYYab5IrKIQbhnkQeAqiqsxTz46BhjhfEEaRiTRtlm9/gfEIVMDcIC5gXLBhjaJYTf8AMoB1MypDofzOpz8vRCDYFfZW3jEmJFiApiFWSAWZGogBhHI1LTn+pVIsTmxBi1LPBGuYtn4XpBQyrh0sr0Be4gqbhYPplEIHevEV3LvXKBqKiXVrEKJm0JEJaEa7ph94qK5SvaBRBFsOvvFWogYYh2Oz3hCUOoEeDWfQhj6gDiF4GZszBi3wPDiaODb5/wCfuVNBB+ozNOvy43DYLGCyyPmACial8kd8GExBeDXcB1FxYeZ0mGIJ1h9z/kOtYxxMmyfMZBjEaJkSsXSZGL6XmEqxCFnmUp8x4EODSXRhlqoAnopdhv3ltcVh6jy5mDRFUtqng+ZaolzGZwuVzuHk6YiEyNzMJWqjGJP83ylaIcej6wbRSow1e/8AExjjzwygRD0EqBbcfSwa9A0o5f1N4YglyNViLiYxFXzB3UK6mW4gAo5I84jGXC+1XoYIRyvpi0yxPyiTVwLRYCXfoBVK+JXxK+JXxK+JXxK+JXxExzDqZxxShc3IKlMuzULZtIFCw2LDP6ywbhmVDLDHJwGEygqWobjzJDLgS1SUrUMycmwm00yrzCGWInuNk1L6xQbdwCfHIEFSb9yFQggs7PPLpQNIHUILBLvedxKNjHB8e8fedKRbyLmIe3NcLOeyjB9JmJUudSuNxHklOYCaRI7AlzmF1VwDcISUFmfMzXUa7gNQq+BqZWoUjTRAhyFm7legBaZg7j5NsfECJXGpczaQpIM+0M0+LqKah9v1HYalxYBQwriL6a4U36D+/pBlhPfPyxiXPXyamTdP6i1u+U1o4Pj2mWJtjuPAzvADLBZk2IzXkgPxC+4ACmUANX31AeUtlMp3CuoiNmAZShdwcNynfFLXX4lxZe6uVDL4YERbP8Su+FiS+5UjGaQES4bppeppMBl0sxqtoA1MP9uUermR6e3I+YyAyrjsthzQR1BbWXHjUeK7iLgxAWHku3wft5U2Sw+Ceyy5m16d8EYR4wfIjs5VECZJvsTVJCyuvRGgWkCaXXtBKGZgmwYqI+0t8S3xLfEt8S3xLfEt8S3xGkygiT3SzB0RvPQ03EwxmYPyhZbMGlVbBDEu4cVy0mLuEDIggpJeu46/KBcKcVGHixoKIECo4zHsnELu50QOADQdRClBtdwjR2OJRpwR3yOgv+IZVKfiKA0HFSuDC94wtwdT8Mv+RJuMBLbPSKJFldPF81DEW/8AxMwkupcFplxbZBeYkIkuEq469A1L9CBbLnGvZLUWJlSGI5hxRRaittwI94EXvKuWgKlxUvipmh1LnQy97PQIkES4FsqHkx/uZgUNJOjTDHN35Z+3f3jt3smLhu7+I5dGGLEcZjqDuPzMcS7FjEJNg5+X+j9xCGogfmCULI3eHxiH2H1g7f6p4p7RsXJF0FcfJIJXAGByllREUr/hPMriog3BTr0QYxiXwSiYRJZhbOm/dnjAvGmDn/xfKZ0xVLuLrgLSVdxpm/vByop8t/rGJZwk1Adsc6lXyEcymXyqfvlPSFHoCi828MMHiCjA7uXXjwhKuVGVxcOKruuMC5lpHBmGiBNRC0uZS2kKW07gTYIGUEVXtA6YikyysCjEuJZLJZLJZLJZLI3WKwSWlzJLJiIymYKXT4iMlAFsekEstjDxA4qEBC4QPQMM2YlB5GFldCUpUMc3wKgS9Ep1GhqMQZWMoAUEa0tlQNyxyQ0IuCNpFp1Ou5rwqFl4NC4+JQFEoVwl8h7Qlxz/AIHyxHcm2Of8QF2Qm7Qy1ZwFyuGZDhK4IReT0kYWQvO2olg0wai8XELfIR3xcC4lc3emIVjMqAKY5Uv8oA2crDjsROqKwjiVlWQzEqXiBhw+2kCJyNSgWfVQ+k7jinxLYRJeoT+bV/3HHb+42qZp+SC0B15lXSvaBYxfEKa/2YcZlt+JWK6irYLHx1GC8uG/P9Rb9FXEuyatMKFr+YtrKiRqXD0hU7giWR4UJhFPHUQCRzZKmEXp4bxcEL5Gax4m5qPk/wDd8pQCouiNPCMGYamxLhkepiC1LNsZ2VbEMLgBH2gVBrm4S7lROKjwhmOIatVXnltYlyWiEvggpuae/wAUVQpeoNR4OuSML1Rz8QA5JepSblyiVw0MS5luXc64Ipv/AMQAAQrKk0zLs10Hd+JlqqM3lS7HcWikllit4zLXeT+eDlvhQMy7CZaSo3XcptxxSy1XXF+hwIZl1qahN+VwCilcKC2HVa1E6G4wSnlqFuiJAGHa2QUVxRUckTPQRy3HQ7fd8HtMSK5AjrBRZa+F4GoMQStdvmLdeGNiEtFkRKWZUpdwp6yPp1mXgdQLPQBIKlwhb5I5iVGDBbEpaVzeIBiZxiASLWYT9e5UafMHbuJC6iUAnXL2mnj1JQ1pBFmn2xBwZcqlNiC+L3XwSwO7f7/sAFQcH4RwWkgJJ2Ey8ZLPMrWrlgiqf3mK3Mox95gnhFC+PvXBUqPmVJ78G5jgalxzKmRek1GwKlAVwROGAbfo6iLwDrz8cGaJTG3ZuKUETCL4nsiouCrMAhMuHt9A7/6douvEYbigBxCbnC0YgKZbMPiBIz7uprmpUT0lHBKlYgVBQ6iATmoc2wY98exA6CvCVyehA27NfEbyHIjUW+GTgqASYAQebhQTExMTExMTExMUJQiaiRKjvJAyxWLbMC4ejubgB+IS04+YCZjeIfDHsw3vZEJKrIPUOSF5DKDKqzGR3xFC44qBtBzXpyalQg6MscwGXG1EoW+AZdSxCup/cCiuDp6YY1DcEI3q63DNHAC2Ukl6/wCyhax419pVagXmXgC4Wc0EVQsxZLYuUjAOb/QmeywcCODS+IJGfeBJGYlddTuS0l+oPTrECMXBRrhd8DUNvqCBwM0votaoUMxGCQtfkSwPiMo2mZKHMNZ4qYLm94g1mWG5h1NVYeK4SX9MFW4C4jOkf5gdZXHxAqVEgF6dzWAlj4IbQp9sQ/7DP7m6gzCKxXCBmbNwLnOj57Yg8I7PzNHzwl+klRT/ACr7yhBRK0r03LlMuE0+JSix6aIfayCkvZsfE2lXwxjGxqN3mZ91v+Jk3FWWOyyXq5rMyMBz/KleNMBUwmvNvGUB4hF4IujfBAnbETOnxCjcMTJM9G4Dq5QJh8QG1H4gHSCoEdxS6gW5XiG9IkCMvWJ5+OCClQq2JjUj/MsIUfn4m/SgTSsFAcGzsSjcL7OBjyyM1wKJVyuA7ZUqVKlSpUqVECjMVAmJYGWZlKjUm7lAKyjRKAqrmRSn2hoLIjcyZJSDZvqIQPUIMOLBcR9XUUMSJMoc9RxA5NwBLO5Z3FhYRuhGCh8Qoczs8Zox1xUTQ9v4gAAicML2IAPMIzjcBYYe4BKOI9O67jvj2JfAB2fqVs/dBHXP1scsuq2wAjwRrjcY5h6/qH5s+SE5XHO4OaZXD/4JZL5uIqzcoyv/ABHg5legqlMOBfUxdtjzKy2D6RexmfKfKVipRDT8y5vt1B6hNMuFH5irwVNnzBwsy7mJcAWUR8uYNaD5/iKlKf1hkODEuqyqjqdVF+iCwxhaYW2LPSdhctVEBVg5VLMI7huFPk9BLHFSoQAzBGxmIRpLI+w9fHtDzZ4VwnGV+owG5il9IOor2zAM8+HDGCim5VLGoJhlgMt3L8aDshWKUyJ1ob95csL/ADaIOjqZQ+jbRjSqMyzXopMdR9glBasPvMU4fDxREuEqCswBgI8ELcC51CqGJtSk/wAwrspPzyPwHg4Qj3hmFT6GIV5Fwm+GWl1n0EVGIeUG9cqx8S1Jl9BOLly5cuXLly4QGVruXDb9IosY5Mpdg231Bhq/U4Swn2iBsdwYX6QbV1DxAhKjLLELCB94niGJd8UO4gxEcXECubi5lhcVo8QpR2RFXF0hdZ5QIJe/hb5JBxeYzmh5e5TuC/rPOQj+YZObhHhKTQRypu43HpEDg15S1dPQGRC39edwwuFO4iLhYgIUbv1L0Q1wiZuL2g2YjAjMs3EQhsHMUYzBaQms/wDg+pUYZeFQsOBgSpXoxXNAtXMAw4XSe81klh5SzLP1sgDQcZX+P7SEVH4a+wf73hzk8V3+Z8A14mWLoX9YNlnF1mOnulx4cwm0KTHiJ2TGrAaDUH3hionzlFPkfH2zKadkxQ7mIPfhArRfh/UAuq9mVKjC+4tI13Y4zQwBo1C4GzjwwqpeOWWZIDSd0WYQAliA6I/ERN4+YRULGKGoJeXw6emIQbWolcTwj6l8wNoz9/NqKPZBMDAf7doKaTWO2474ktZURYEgSvQ4yXMirPeN0ZeJ7nNTUYq4lcAFMw1NEy0ZzGk2oYHTwllRUrslcZW8QbLhpeIwOSYQ344uYCMZLgXE4b6lEqEVNkqVDYTEOLqDEhZBGP8A4qAwOV1Gyi5uq68f84cgeUqVCooJgzMU6mLGE/Uc3MGQbsP2QL4YhVe9wKQ0kNuFq2/r7xZr7iQFI9qB4lenCVqQIjLmzCBqAGuVqHll+jUqfvHMl4auHcfaErlvV73/AHCuMMeLIEOHqCpKhgFnc3xM38sDdXvp+GYDlPpfzCqxcIobls8rKBdQhXaonRincAM3slGT1OOTqCuKlGkuzJArZDzZuJjIBMBMOEbw+oOSPLA7lYnnB1EATi5frNJb6MsJxHdmveUDBaR1Ny/B7+0rJXwf77xm6/zKgUZm7bf/ALNiMj9NH+8c/MoFAJUaqG6jBN6NfMwzCd6jQVNXGIu0VTl/f2hk1kjoalaJ5mrg2vEsQS8GIe/CJRbzM8ECipfrg3/Ursqte0aeEffxPePFcI2SyIMC5hrEUUkQu0FlPhj9/wBytT95Px/UEma4vz/uoFR1r2mRs98wGtv6+0K7Tyf65b3Sts2/PWIhg93fwgVufb+5RCLOFWWVU2lO06iPv+pYPk6gUiBRAkGK3iuQuJUXohRHMqyZIDQiBxwMXhVEcILSqZiSle8CxVwSYpxWLhk7uDAuITD4QiT4mlhwWSEdDNQ3EEUzvnPA1Fi1R6aYgWxmJxY8OYFh6YuvH6E/zCf5hP8AMJ/mE/zCf5hP8wn+YSihqCEsUdx7lxLBb6QTdBKPofmFwVKNlvvC4Gz8yrOZeoQ0XDEcDFP/AOpN3BF1IYt+8wUXwaPL/UKTmgBg43HELl+geCzk81KGIiC4YNj1yRtjcnNxi1PsJd93XtGTLro3DGlmuDUxdQMNL1LEn6ooo3av0Fxxvngwf3+YvsfaVFHHtEyggNlQMxYSvGJ9hPr7QbQjUXGaCXg16bxzQ4VKzcE2RQ3KSkdYNR72EWQFXLqL3wNl8hNSiegInJH01EgOSMN7ojI6lyuCPpJliH0xcLLKN5VcG8f1AEeGfifrUI3WPTpn/G77zG334jU3tKPYP+wSxiBGeu2Xwe0QMylRtgEDqYMRDLKJnfFLhNsJ6f8Af8gTpYHQmIfcmjjUdKJDpFMmCGCUt8HcZnZxMbjH7lh/uBsribS1w8JUS9zPcWNUI+UNoRLhlC4hCJzEYkwra6/7LAUlmJ2+DyxqM6HYdfViwIfH3+yBiZ9r/mA/cDn6xB/lygAXMT6Dh8+X3gijEBPeMYogSbQx6Bm4K4I53LwLhhfpWt82au8QivdSzhAJc8+O4PdvhuqJkGOAxYM0jYPMFIPwiQAzXmUW32H+IaBwy0CKrHoS4eTyS6l9NQwRUh/aBeANEpZkvJ+piYmJiYmJiYmJYKZlMJmrMw0zLX8szQKbYA+BuBXdM9VEKCCxsY8JmLR5/cfb7Z6IkXB0RLAhVUajLLGGEAwSuRlw4IyyJQEFwUQKTcwufHSMV9xAs4BeZr03rBKtHR/MIWdO/c7irQlPjgipa3Pn2nsMU9pqBSz0XLlPmPvMnU8xe8n3iHdQLI+kscx47jFsMqVKmuXSfH7ggrEkbbZfKzvEqF5mbEDzUpD35wIr5EPqOY/+DhDs7ikJMaYzTafQcEJXIq+T+kPowH5vUu9B/qJTPkf97agK0Qpo7l8bGIyzAUX9wgp+wjN+4IlcajkqWM9XGOJhuNRFsJ2I6PaAnpKTCgjDuICaOS6gFG3MBdu5rnK21AR6JqXDxYA8JQwuXbB7eZUdDfLHMSNkUFxG9eokSPa0lL0feFBNRAmClH1fPt/cHrblrnF39CWNr5fgliqd3EPh09v7mCF+8Pa/f90uK0uXv2QYKDUxiviaVBfcR1Pn0KL0BtLVj4StHJ+pDccM3LGNn5hdajXW2V8uGWXNXAYsmYrnTyu02QxPcvgi3M0YiBCeITDUVX+6mHPYBoDr/wCxfMK/JwEfSS0RA06SqiXMJczT5/8AKgxCgWRzZUecn6QoHDNiXH+GUqkAKqHiDcBqaliwuUs0RbbgzeiESMZKUSO6c/aYUT5IflfLd4lcKG4WjfUqXGGSWni/MrkB13/vaVIYmRWiYTcDSXEsivlaiGDcCQZlUtp4TpgrHF4+ggOGA/MVb2Jv+dCZRxAFsbLiu2VK7IPmGJaz/wBQxqMvm4mGlzLmSIiDMhIVUBKsIW3xAIZyLOy5SsQLlRhwMjqVEYZd+iolei3hal3mV6rVqDeCglwUphGz0HBb58RBS15cZ9v5guxnt8vlZQv9r/zgHXDtnaEck0jFz8EEwXKIWbXmJQXLO7gG4eZ1Mg+i/wCIh2S9USoUSnW4qayRDzTMT2g/4/MSJaNEQiuc77vEAzSLjhG2IVsQwVL5qVBARBwzL2ytXhCtGMfEYpdMeQR1iL3LrNomDDBl2ivaMkwxl/v99IEivd0+6/8AJaoHvW/5ln2GHwF+P9Uodugb+r0SoQJjN5YmqIjjvmyI5Xd3f4r+YClkfIyvWRYqAWsyrPlNgRS3TK9B+r/UxD9pSZPwLPuiVBK85uGlnzKwu+IQrXAm0jnt6rx7y4+zjcLF2/76TLomfCeXEEjFuIg23ffxK42PEpOhX2mOX8z8S9NkeHXam5Yq7Irw7l1BLQWkPHcIUQv0IS9//J1xK7mMKUdT8cUVlyNXF5Y2+ZUoIMXCVV5WYzsYBge0wf5iIvlCydy5wHmBFnmUIlOMS5mZOyFY47cGWfc/11HsNRGItg3gbuIhGQvUTu7f5hkmESxNc2gUxG0BsYLltTUuOjwFybgdYMH/AP2MctmYTwQ9JwZqEKssM3SNkYJVcOni4inbNcVwselrgFPMAwQ/Ufua2KZmA3LcEJzqBFN+ZmI9pbaDcYlmY2UwmAEqUblEGBWoCRcX4I03LuBcqJw+ntcrh7MEFkpf/gUC2G8Qbfp0RZn53v6QjKgpUjPkSq1MoJhel9Hx7+YwMz2yR3YeH6QugYlz+8faYI0/I/bX5hVN8DiGJF6sVUS9TFxxHINupSnfmGtQ7El1emEq/wDMTU7fSvaEjMSWspYx+T/UA0IEC/vQ21BZXEtbSP3hkv0W0SgrlBjkcEhg19+oBZPxG3BiVszBHXcc5mxKQFz7Sg+7gKEzV7+/6PmVcFQ5CtMTQAOv7Ibt9oz9B/36QZQfWP3cfiYMyu1yv1n+u7TpPfyqsxwWkBGIQbhKxyrgI6iibjuXFuVwplKiFhAHCswc0+8cFl2exBua/EQkoIZ+JhjVKHxEIkIHun78Bcqi2CNI8/1LAPkYiiU+g/S4aCfapflRG7QR+I0tJYBj239IqrnuP5i+bnzFrP7JsI1YymjPNqR8D6yvUI81SPFSpUqVKlSoEMSxqDVcNYwi8v7nle06lyV+TIwPamKNuo0ZuISmzUaoyzFdtwq5AmiKdsuzkQY9bHhBiSkE+8AFE0I/SZMBDRTMOPjMCtcOsTYygA4REqyKIcdV494IQ3KVQKBMF3AcMX0VAuJUdhV7xa1P0I7DBKyIPu/1+52pveXMBpp9X+Yabb7ij3mYE7RAXEj7sPe/xMViXXAd8POPXPiMXR4IlZNvpAGhXKlKvzBGfwicpD2P7j8t/mayxrtkYBhVEAShRYLIkVV9QAs4FKipUecCe4hnIxf/AKJ/9gnRCH5ohmVU3Kl1C1I49aszyaVANEZcLDr+vXawbYhQ1j7QN6OoBihE0HXJihvAf39IV7b2+XthKKbhM20n03KjwkDU09ku5xce4WwmghmzLQviY5jN+YDdyrdhjm0XRLgIFwhpbfoNs0+0dQYhgwwV6C+48OJ3wJplggXBrEa6nklXGBmPUbu7xCUx/wCwlgR8xRR+WI/9M+aiUjWM7H/2YU+R/jxHgZ3wMf5XwolQZlrgIlhPfCRcbYEq0DFlxBHXfAxipca9Ix4cjWKOLYbinwaF1Cm45MDLorXi4hlHkr9Q6cfAgazo1mHlafeCspHRXtmEvMsIAtEtDZi+e2VBEEB3v56f4faEDEOsasn+uIYcwRJuqgMGB7iKhmESXie4Fd8EYnnGoUWjP8an+NT/ABqf41P8an+NT/Gp/jUoMpFz/tzUNMdRFXF7EWX7hSMuSUTGx3NYZgZ6heHge8qK5ZXARap3E+ZHr/sQKN9Li4cXgKjdCvdigmJrGfUcjbfA4l8Uq1TAxENFohQUMQK4B21yYYjngngfJ/g/mJS3cW+ECmJwZnQTsjmOGIAQQsEbhZ56hMrwq4RUFsu84Qyqz57jrH3jG0wahUIvCDAGooZ4LVCMRkOmiXd8VGyXW5qMqMs0/WUdT7f5RAiypeZfFxjbLFHgj6DHKPUG4Q2hcxWvofUZXtFGhlDEtXz6buYR37QAURVadiinxUusy8Rqsy04DVwbov0WrsQd4EixiiVQrof7uOHUc4jO5dYWln56ID7ytFSpThBpceQCmJH6L5lz7TSaSw6/rhgRl8sWLcYsJgiSkuIbnvan7mIEdiFR2yGrf7uAS11NIledjM1Udh/lRzcGXlTKGWMENy4Sg1x5uZQ8JbhgecJoV6KlSvSS4iHkAJhx/UeBh8dysmxm0+4wGz+HFDhgibHZ19NQ4lLb4+SFZsRXTXzmYDh2eiBrn40R3MN8mlgEHFKS4zaYi/aCH1+ks9hj3P8AsM7IKODl8Tu8JcZHBviyC4ihtlnuT3J7k9ye5PcnuT3I4ZdK3KALgasR+YO/kX7FkPo07PP/AElEfiEbMSsZWqgjUD8PmBsJv3mLfSNki1bMIsYhGjBLvg/8cscnD4iEmKkMgvLr0XFuXQrKgxGzAuP195QFcHBCZh3el/cdRokyUq9p9mc/mGgNEWiGpSCI8OIP8o8VAhm8/HtBfAnN5ozM+OExgW2TGSBg3FUQkukyL4QFuo8uQ9TYcJaMkBbq9uoQPyDIn8QD+aJZAnszqF8MI7lqxC0zxlA2l5qCOuL4uOSiX16xJYA++DFjAuowE6I29ftKBLzh3KK0nXcLFgZcB9rE6mP33EvhcTQTcBWszIMq4nnkvM9xbjHj/kAaOGMVGY2n5iaqIwO4QB7hwlSmBddRgXEri6tT58TzEbYC6X6/8mEKD7jnzLuHkmYe/hjHliR8xO4lS55mPj/XNIEat2uoecHVdVn9y48MI4phSwO18e3b+odKiCagprJ7zwbMHJBpaVHX+3aFYdM0I64qfKILixiZjfBEx1KIT1DNS7j6LCKnUxRjkFa+/qamDbNQKUhjbJR9o/Y8QOpWAexw8uDsYqyqr4fHt7TfIahEqCEbY5NuR8O5bvLP2QStMJV6D+Z8ZxCtve4UZohujha1LLmGXKC94zcHcFsOAUeWAOGj8/8Ak1WHHiJMCXWgNoMwQWRASEskBLEfCymzihNsA3/+SiHJLK4v1qalk83jE95TzBvXF1A8s6lcOfUqmslbWfaKGl13DN7YSuW6xBk0lqdoxWxuFUQm4TTqFsWi2ILX0/iGV0Ribh9+pYiI02QQ3HqinAghlA9r94DAhvi3U1G0d4sKZlIYlvcoOiIWIbXL8yv5SkolMZwMSjv67PhmGbe8ELkrBnWIMZ3OYuCoI06iwygRiMModGPgiVi9SVw8JFRKcu4jBgNglVrlY6ezCUXWhUlH1jTgNjAyQehs33f+SuUlWG40FmR5KmC0IcYCqDK/SXqbNkXBmpjkiiVo1/cQm/MrSoopKuCgTqLfCP26mDdu/mXqhD5iCQKbTXh/7yxQljwtRYvUZUgEgPiWO99uMcYFaDf/AM+YSIvSsHx/cpHGgBmIwTJlLK9RP9faMM9oihVwhbEhqQnlmE3ORheEqViw9QI4iCKpggnbAtEqbpslQ8GwhMehI9IFmPPtLwfeYotHD3HS2hKlRV/ZzT73gtIlD7e8uJY+YR+kCCx2L+pcgrPF2h5hFdTJqpS1MNQu8+jADd/xOgLlLLc2MsJZLJZLJZLJZLItMo6hjXIgpZBgoBUtMiBcVAEzHnEFCoQtNMWanv6DkhzUfaGI0jyeAFMEaOpolRYKZo4eCHpKFiy5tW2JdSsdWoYA28MHgzKjCvYfQrOnMY5twgHHcWeEEXKq6q+5UNA356+PeKFZRh8+fEUHTOjLObm5qXy3WR75jbt+crwVM9A+83Mch7wpsPPzKOZXoQdwihBzUB+8Nce0AFZUEEp25fO84djwanT3NMvldrROLj6BYkWlbtcOAMRRU4icdqF4q6izbX8kvioJGujFN2TM2y5cWZe5AqGJwHZF779wix+eN0RbUu9oSiKe5gPnkYssZIFmkblHuNRTx4uZFRsVHoWJY69yIaQeoRX+K/mCdHuYjtaJo3MsrcQL7RfRf+S3gnxDO1dGz/n0iUODslyMrb/uiIMaHR5sc1PM40DeQA4p+9GoF/Eqh0akYj1BXHSbnDxp1sy/LMNXR5gC1ZwQ8tCiVXofaKC4zfR5R1lt8/EQbqBZJQgu8Y3BPK0J+4KCglxYb34Pg5WbSBQ64CW1fjxFQYhjw3zANFj9p+Irsx8QYsvqHvwyyfmpUzoNso4oyf8AxqqpCcQmIQ3UazwJaHN8Ebgi1EG9stWIABKgwYepyShVwxPBzbT28tipgV4jDNZRyRWSphAoriuHi2DTcBDaEAUk9gVEhLg2sVg3MIBnuPVCd0TJP6vtMYdIEVSAdI2EXEfsu6heyjnhOgYguyC08B0qYbGd4Pj0vVVKz1AQUzMf2icoD/dy0lrMePtD9MS5foWiW3pMSwTWzFcEwotSojWJXoHdSQ1AtiELJnisRHqOEkWhMkG+dw9AkCi374vapR/OJc7a6av5gHrfxLN4Wf1MoczAtuoIvJhVJLxdrvxCb1BE9wLmY+kZTUHqHMTMF30/aLZCa+rqOkJ0EPxAAdSjF3BhK5IsYQhaEqJ4hll1L0IFjxHhamTbGGOj5NwCs/k/+RNSs/MEfOYgBME8JhiEOPCRKVF/iCFsYBgimsHnuXcw1tn70oQmfytEMASnuJ2Q2PJy3dhve4Jl3M61v8fExYXHm5tv0LzdSpjcxUGNbpXxAfrPMwXIzNGJeWw2eDg4ZFaTQiX3Evha4zhVxyYvfqCCyDtAEoTFb5rvgInFQXDcoHCoNwB1KeSU8kp5JTySnklPJKeSU8kDXEupI7j7msfc3hhgGRAWkXGKXOoUwvgAIci4kqowyTIxDvkgJfI4iyHfGm4F8wbEWpY98uMsEoy+zbLBpxhVllc1CvNJlKBZLO4Fa9b7QWba7hktTr0pe51MdY1DcGInag7qqXuLSN2YS6VbC6OPlfsQorEERiznzHwdy5fovHJAzK/Ca43LxCVcccFV26lWGmAO08xHgYwWcGPQWXza+JBEfP1eNkY7pmtQPydRYHh/Ur/oK9pQJmXk590SXKCmG2Rp8yrtuHkit1YNRmlRxiMo8UIYif8AS4wfb92DFVCZMZmIlw4UX2ipMcL29G5m5nco8j2eFmswxitjXCjUYsq3FC8RWz+4wBWn/dQkKDq/7jPmmoa4us2c4G7/ACo53AhFdM/WAYFhbEKyyEYRgaDLWP8AdpAL74vhpmZzYi7ah5jo4TzGzRKHqDhIGpYbOHQ2pUDj7QbL5OGzeSMS43W3FwQrBBqMEVKDXFRa3BQPcEjGN9RFqNO4JcfFPr/yf6J/U/0T+p/on9T/AET+p/on9T/RP6n+if1P9E/qOGGvaZmYqmMUyPldf9gasfpLJazBRbTNkgEdMeLYF8DwHBBiJco3N+i+bhTUKqoNyuL0SqUqCKIdTNOuI1EW6mb28TAiO4YEWl8EWMQApyNjUGPZ6SVyeeE26tr7zXo05xx7pgO7E7ggm0QwUjW6kBgz3Imy4Yn0EKPDg3mbfpyI6pK1ZwTUW5UuKrshOWJwIaiz6GLbR/4E5pEjqWofbg5S1DqJ0u+jT+ISLlr56h7CKph9ykOWpCAVWbiDbKMKV1Csj4gjNxAeyMy1GootNkaTSYUu/iJ1Cz7Q0y3KptqUpTzvEpLi4N7NQ5ZdQwmVmlhPeLwwVaKpXD8yqMTSONQdcT2FTxru4iqWqA9n8ze5q/xHYI7ca9pVakuZcZ8kUq3V39UXgT6yuUCAR/8AqmISxO2bDHNFw5mBDU2LIgGBP04Q8uCMZLDEtLMwjhJ8FCGELQgzy6lGIKKlSsTJNqWR4EoX0XbjUQ7gVv0jI8OCWQ2O4GkRpYILOcR5vipUssNRbePiXG/t/me7+/7nu/v+57v7/ue7+/7nu/v+57v7/ue7+/7nu/v+4sIiRpiopVpcUysD5nlAuCoc7PEr3vBF1GE+Ypvhn1DBUODhhMOpuVUZcaNBBjy4IF5I1F+ms36EGsxRpL88VNevcTHKCC0GvrKB9F8rWZgogO5eh1K1VK1L0P51OsMRiDVyhd5Y/wAhM6QzEeKAGVxBQwjCPCaTLUfM1BTDMXii/wARFE7jxBtcI+ioK4MPLySLPIq/c8JwMPfevtEVU/aZI78xets1+YBLmUtZIZCzojZ/eg04nGTshd0MSoiz5iCOZMN4mDO5WzE0rzAgpgHbKgxBwXUYOhKukCLJZMR3UWiBDLDEY8MdeyVnteEuCN9cG5kntUXIr4/liAwC5UmnQjYqG69vMvLjFuqm3WNdx01PbTKlWPcr86gwpZEFeD+XWpWcXk/qeXX4hC5MD1HUElFrHbSqr0sqDUxEOLJTBi7Gn3lty4RlzXFy5RB2l9IXC3eIBsSe0CvN8pahjzUIGm+Kj6DZBEs46siIBVbBJKlcHquo24hNksYJUVFRUVFRUVF0S57TTMdTGHOZclupSD5nwitoZa8+I3a/qIpnIKjJnb+oV3AWVzLvi5se0r14l1BDCoI8Hv6VTh0O0Hdx9Oa4L+SYDl2QA1wmIrLln/jd82flGS3XrwTMESpqAMxqVKBEO4A0RWiL4z4MR0Z8RicnnMBzlLDO+buahVOiC05IM5mDLGdVcJGN7IwUsczAKuiOQWoQBCPGuLg5Thc8qG5U1KRdoCe1KP1NLgBMIeFN7Isy44J00zbBEaNd/qPUjAXgvzcyFeZeX+jrjuBiMYg7lgpajEFg7lGYK3ByNxQ/2/31mLxXzBSkoKLzL+oCtfAbQKsQ94MAGJNhXhT8TPDt99RrODxXClDBqJcvPoYqKleXbE4XwuO8EBF0Pb3Zqcy/p4ixaHhfXf4gA9oCrivh7fWVAIOPTxqq+7MIy71vXn/j9RxnH8qE7EqW5IbQQnEGUuYfY6ZL9P5hEqEXjqV6Nw3wx9rlkLhcDkqPFzdGoHhERSRCDxj7cUHuGEtgp9ud8ErlOyI6xABTNRnLzL3EuLfor0PNV/4qGWLCG4bg8w4qExUsTy4lQNOVUE7OCv1hNGMPo1AKqBr/AKH5NSmL5NfeCCyENW+YPoqJfoGUuyZPTdSjnUWbF49aYzHMIr9AuNrtozVfiU1BcSuE9Ysq4Jd/tyzK7gOuL5VC4F2IE4PRXFQhTO7g9Ny3JuLG5SFXKMIq5bg0YApg8ACmEUkItRXBqFe2u4ZzxXOoNwU3AJkD843SfWEMhmEuH33K93Pd/GpiT+2JXmB/yJagUnxDdZ9fboQx86/p6K47jFzTcOSaTaOI2GO4Nbhgx7yzmVMdzBrQ1juBilvUE214lYtm/wCoqlQKKfQnByZhvDTCmLlWig8MBtWR4VYIHmVFOTuK4hz++h/2GaEFr+KgMdTKgRZAV8u4gf8ANG6xoVL8MAA2MU6hIAu01EcQ9yKBdK2togqrVcAeghuKcBBycZMwFxfN2zxfoIxmsJs2YBJRweoVWJQIuyIs7/fDKnh/U7DKv55uDUW5XD5pVLaiHiuaBAKJQtxlDHgPRcxw/wDgePcV2xqsxPEVkcVYmDmCAmoFf9mYWz5dfSYQR9D4hAhCHAVG4dlfXj4jl/zNQhmJxvXroTy5qVLlg6glhxLFiKxisH07lhAVGOU9kyIUVDEmdQi3KlLEr1kaZIdSYNlkAShUMl8NNwVhqY9d83YbZUVFZ/4jJiGDcoehKggICqalajTcDVxJytMd80Nis2G4TQmmWGBX/eImtr5SRi0HvT/ETtL+P6TcOm7wfqf1FhardL9P5hcqEZXJiMbaWK12V8Tcq5VQFVEgqOYRpg3hv4gQrUJlf8Qo08y+ph1MhEX4j5IzrbMoD7/1CrjwR5yUSzH71Gq1mBSiA9k/biGtUI3DpGPMQLIjGOOGKf8AT4jjYxoHj9wOjTDGl0FbYpKu3mNtalgJUUTQa+JZMpOy/wCpcXAjZj+6JSMytlRUIKYILT4NSlgd0qJN+gBRgH0w+1cKihMtUv5g2mWkLfE0FvUtLWf1HEx7QGxm/X7hYYezc2oNw+xKnu7VP5/5GNRcj17e/wAwqWj1X6A0u2HR7QlR4I8XHgjytECtE9iexPYnsT2JaZ5WEDUoxPdMyoOkWAsDZhaN+25cEqokOuC4Qg44JgtsfLlmAwRoGrfxDEZlgBRLvUOCVxlrXUSuLldMwCXLjWDCuvSC6iBiKjtQXbLAhARZcVQO4aB9a99x48jEskHlGuX1EQQVSwvLCUDZ6643SlCageAjNwpxAaRjguHviCMRtHwZcI26IhTa2xMJAwY/BGuvwk8q/j9Qmh+X+43iL6xbL9yFhlsvV+WvtH3n2Y0B78IFgHm5cJDuBro5u5dTCPFRYGjLmIg3BAeO2U5+8r7XiVXtp3D1ZWrIE7X9YJB78wBRzfLlqBUfaGuUiK4WgMOyJ2OupVlWm/FfqZ2nvidSXwbiF4/dp+2Ym3+4/iBbUe1P2fzCB1aq3X93OpgLY/3NPKEQTeX8cYPKorc70qYRADJLUKR1r6YuPX70YX1IsaFygrvxw7r3j2S2IjHI8/iGacPzGvH7Q268G50ie6RSxD2m1iUkPKDU9fMtV2xqDe5W6DQrh+tiqrZ67jibUk3qoJ69GANTPoPZ0xemjsfMViosvXx8zLt5dS3SneNnv/EMAreSniuQXHnAxuENBAEmvS/+IuZKly5cuNvQ1WYHiXB0ROocqalg2II5S26uErMyHa4grgg1wQzyBmEGAqiIKMcReANuppHgEuJKDC3wiJuVnpfQhbgRzxfA2xyfEQwgrVyxbj6uUXbuVGd1xRbZRAriqp4mbthLK4XeZhqHX/xFkCAvqrVdSsKn7gAo5EqWcKG5TzEts6bltEfCgaVI9RDa3zrm4AbODcxRecEFkoXAoiXhgq237zADHN1Nz3jYg2kxq/qAM9z78HcFvsdPG53KCbwIDyEHJxqOYR5rqFSiZigidxmbEEEGPzFYl+7X2YA1p7kUci4txef4OKlehlKIno0hjK7Z1GqUPUbexL50/XeIuLDvD87+07UNN69rgaogSIVCZhv+emAuLGNGohSljT3V2YjQvEDOVME7yol0RjEqexFLSAVX9qPsbgzIVoiZzMQAvPUKoZ+InTp4NxhUoZynvxAzKQqPPXIAUR5tLxwLLuXB1+T3hKj0InojrWFrrHX1l4WHXe+QcCh1a6+CLZr5ZrodVGC5RF4GOeF6mEW4Eos8Qrjt74hmx5IlcXznl1hHweiSMZ79NNsltePEZbias+5KvNrs/b5CDc17YArqAyx3E29pXlsiXPAMCBAxKl3zR1EXcSVsaIJKp+1XEdlfQ1GL0lPtOy37wD9lK2SXIq/iZiNkw1USlRCExFuN5tGntv7T2759aMpRt1B4LYgEUj7cLRfAb4b6hG75YRiR2t8eyWmIN69SmFsAWKZ30v0wxJBkOiPj0IWkEJSDFvcpKJRiVAuDaPmJ+M0DDDF9Zo9woDUwN28M+qBPnH29pd+sP5IGKlIDbDLXwL/MulDw7/5BKFQlRziaXZj+vrHJMvUu3E4aRWrF6jy9vL6CPiNR8xYkUCUpKmI+pYrtA3GLD/f7zHseIKPzwNS5cZQhrMGOeCcJcQLZbHXA/bCSRPzCvrn6eIK7x7mUEgDzTPvN4KhSwGTwexKUV6ePliBfAwfXzLf5MfTqYc4shwwJwf2d/MPS1K+phgireUuDUMi1jTuHiL0Dzf4jNePDX18TEOemFS5KzO2P98EoqAEf/CpDJp7IQ21p/hgjy1SgiQGqxUyBNE3LTa6vDFrjd3Lo+jRls3zcYQESoQFE/M0avRdxquTHBEgZuIlJTxKE2elBKiRVOl79vmU+73i9mPxHFMTq949m9QwE1MVhsNX4g+YfEIqgweBtg4U7GDd7hREFTVChw+SViWwAwR5Si5uEagByBpl14IO4BichU7YYZliOyEs1miVHhusSyZlSEUweoXfKcabzxrhVqBWZ1XHupgWw1iXi/T70OobZSe6CSKDKZWoRK2jZAiiNc3EWnBC2E0esaiuDCXuivgihNwI8+3XFPUB7jLE8JTATcviwN1CkmyTAaYNbhGhCjohVoVBPKyg43MWn8kpMn5idUPL/AARGFX7fqDfQOqIR9HzGfHFncW4X/nvLGZcuHGZa5UFg0HTNfzwFxpyKjxArgYsvhlFPLCM1vab1sCENymST5yTWmGL0h/Q8R2nDLEsisbg0wMPxMF5YCRkGUvZYh+c3LnHzj8S7j0NcZ/WJLR/OjayYqCES6XAhbNZ7X7RER9+EQFOoiUDw5P8AkDKq6/8As96LX8ShlGx2f8/8EvcpKwM64Mbq9/f2ljh7hv7f1K7b9HEBlgfcFPqdr7S5gPiIwtduCMoweIC75ZgdJk+ow0Kea38TyhFX+EMLY+IUL6iMGpvhM3Bv/wARqULcZURlMCM2elYVCrLINe1s/TKOYcVKZEzNk0+T+/MGLlTd9pSCyoDDizTUWloqDL+oYhCdCOnvLBnfHX2gBr0LGXLycNTHCd8Xzcvg3HgMORlin3lVz3xaVm2KP2aPJuEh1Hklwvvhal54Oy5upVbINKlLus8owKRihcLcsZRwCP3rIy3hr/ktxNQIgMxWo5xyETm4sdmYwX8XJD0GTMquBmSj0oPAAAupQKqKbx66mMZ91lRCqPfp/qALJRgh7ypUFoioHR9lholVjXNxZcGGYkdxOGb1NY6tN1QhzthRlhmDZmogr27+kUrbGMxzZacD4cRyzg78wvg0dzJY/CRsY3C/MF7jAiXcsauAZ8xFMAvMAwZgqm4V3FdP56lGk7tVyqhbgXvR5jWgPbuWVd7lNJDxbDWSr3f8xGSPBn9zNAHLpjPQ9p1c+2GKKL94TdT2zLIT4kWYPoghHi/Mvt1X7Eeaj4vEdKMk7q+0rsInsx5lwyfUeowr+YRa4BDarqFmNmB/Gp4YTf7f8gLp3K8B6auBUs1+sMRl3UXEqX0KxTmyX49lyvp19JaV8w6fce7gAFqw7MNvr3/EHrshjIeGBMktKZddfb+oWhTr2+/BFd9QCiMfbgjzeIef/E4GuC3CEZs9NKseJ3C6qFlHy3dfzFRk/D/cIxjoDc7cG3CeGyCJAF7ZlYbXfzEFOJYQamRAsMJjsvtEgh93/IvNfwykwXfdwhYwtpt9sxfoHlf4JYfm9f78SmezyVAFno79G5H0oJY8VKGpaJcDRmBRRA+cdcXDUZs4Bsud3CGETmoRZviLVrAyqjQK27ER16DqaYmKFCLo3KYda4B9iUqjoMs3JU3LhyReSUHLB7xv7+o16Ar01EvEKMqbDB0zPVh66jD40ALIlS+CX3x9WWz5f3HPqrjUGjEcyqIx7mVhhhKfDgAvCZlo/L+rnebYWPSuXwf9lJbKjqD5f/GWS+eNP6jjSAbJSOiISKFkFHJK5UUOGVAExHIjtnH0gIVfEK6M7j+IQ2xVT/uAWQ4wpNyicDz3EDBFPlPZGYW6V/MG7l5BVf8AyW74WpqIAkLZEFE7q6fMIxm/2pS6GT+pUbD3SZkz44rHZDpMFyzU8dfM1UxkET6xuvNMsCnSIO8jTANpbnqf7+sYTHF8CZM3Fe/aYL0DDYJr9QAkoXH5gYJUfbEU8nZOmBs7GefNjFTJSbj32SlpHTdj1oXCP/pUuEZWK7mJiYmIqIwEwTEmE7iAregOP98wT16PENozSl6exlLqCn5j4mo5h7wZl1DSpcIJ3KdteU8f9hEsQAQdmA/bb71uU3qjGd+D/DMQYfDuPpdEFFequDEvknZghSgS0b9i/wBwOiJyFMR2RGoTv0L4CPoq8TBqC3EwMIoah5IsTMVKhts179QUxmDcCqZZpiEJdvbAMXoPoOLDnJtD8+0o136VWUy1xUOCJxcHgyReodkeBqrr9RblS1OV0eZg22Meg55sEjULz1NTqNwbJdR3PIng2ywXyL+o4ovcZinBT23AQVhuZLEPNn8QG7r76PeVfKrtvcZRruWQVm0mQZs88un6zuMR5GI8WKKzkPlLVagi1tmSu/ETqwI5GWgaCeBfSBSIAUECpN/EolM6piTCK2GyoGwmCgb22DMx1HeCJvSYQnaJCpY+mCvzt34l6xfMqbY/J9YdiI7UIc5ldhETt3X88Idnb/EL1Nxp9UhWpIJqeBHcmZRGhqCCzXoWsscfXZXXll8pRVH7v/k04XHlGKKXHyO/ruUEJRURJqJk1Fc/RAY4wRySvUtRKXqY4r/wESuL4eGwRn0g0MKiGBCYWssvmxm9TIkXuEYbwTapO4yRT2f4YUiU6vzMNa0uPxv8S0pPv/yJcjw6+kHuEBJf/wDi/wCwijPvLhM61b+mYl3xjLQ0wQNDCe/AXErhLx6K9dSqjmUIq2EYuW8ZXUcY1CXb6agx9DfXG2DAhqKBxXoEQQqCWVHc2JlpuIlh/MQviDQZWsQLjjlYPLRolCUx8FJcp48yuJln66l3zYZnv2hhTn0C4+pcubyB44Z7fVFwztL3s/THsTXsyrCPuJ+4vLUVvC+CHiAXyYhGIapWm845FlSq51HLK4feP7J0bgtao8H8r/BKBbpezf3cytTn5zPCjhiecGqK9oUtJiambcHBIcVPEncHt3tX9QzUj8QW1EXTMwwVVT2MwoKfeWLH6S1gstsaM8Eq5l24KqVYgcYMqY4XUfiOZjmLJepSbqiXOLP93LkxDqYZmacdFuAV3+9CFLPJ/mYwE/v944WLw4h1QUmMw+cfuESmbPeDfb2xNhCAVKJiG1WPRo+epQt1FVomjX7CGHsYobhtCKxsdso/AuJUfSanZk+SBbpjxqMD7Cu4YKlvUYstRcBifd9oAOhEvcaNtfqImNMeAiVxkQUVyr1kGWR9Iby5cuXEIJ5n6DbDipS8y0OmDqBe+f1/cRdKfQ+0xwtlhV6jts1/+kBNiUNoaPZdxQiGCXGmX8j+/wAwRSnaf1K4rdRpe17gHEOK6AoYU0PxDEyYl7nRrs8/9jvTwdxKpRGaWeAv6xN0rz/R/cszJtFfZ/uN8KYR2Ph/8K4Got8DW8DEQfaAlnFK6QtjjUB2mpVrfpsqMv0NTyFKYhTMcwnXoyGoUKiVxa9pEUq39e0OovaGmofiA92KLFg2xSXKVFXBADnA2v8AU3IfWO5FwLJKGzE2f5IbUJXNQajb/wABZUqQWgl/8wQBNElTkAsAwNUyvpqKC3+L/kG0WRLhjYXzcsJRySiBlamz3tWj/fMcSy9u5eaixcwO2JCIzUVfZX1jvgxv9/HiUGcErTu4AUjRXHk+IDQolmJsCHWx+Ik0qjBUfaVg36HhHqWiJibkw/MuPDfUuXeo53GwzPdFqprKHTPG7LdhmMLVf72qZm094a5dHdn70viY8/3CDkQnCTTbEOE+32gpj6R7HnxiPAAt+YLZhmYYY4NRp3WoKjSf6+GlcRFgXfxNjX18Sg1cFBpe/PGEXPXou/Vg8Xr7QLiVANM7exDIUegEpi3QcxeXUNcal/8AgRPVe8p7eZSUlJSJIk+kdPnH+PEbAbXmbITGoYxbE0ky/MC4SUG19hC6ljzDLGVSB8xvH8IQE3H7YmkGgXG+oWaT5IoFv+e0AlkyKXsX+ozW33gFf7EpV7PBQxzLrb/cpFBnCFcHFef9uA3i8MH/AGDgZUGoDaElp+z8n6epWl+p+H+OAj6L9C0YlFQ1HbEUVqJOQ6uXWqxTkX0XALo+8Sf3TK9K0Qcjm/Ma6jiVBWGUm6XBlsOc+ilxlWG2GG83Lwpn3qNUucFKJQJGBIBDU2wipiDGJwZBZahXffNpG2ZZWxhajAUNJFvg4f8AwxG8GmavCdOGUBGxYcN5eUyWKzgCPAtGZOclC17e0pxYoFi4KKUKV5Xx8S1Wvxn9QEB1pP3FHoLfL/UNRbM0d/xB1/j2ylCMTqKo6jGYGITpXR/vzcaJWlf7qBw7ZUi7h85NvglQB+sSIzzb/VxswL+ZRGiO9xZDglRm4lcMSTEA4bIobhdVzFrLWCOCiOIoxS0DykV/PGvfF38R8HqahP5UbUXc289+kPpV4O+IuVFNsFFkMwKhCtGIKy4WALOGAZSE1CouGDfM5MBNkISxFpTBK63tOz4f7gjHBErir4OJnCF3A9dMx39ZACGR/iAIq38Gfv0fWAXLuf4+DkLlVF4rNnJUW4Ecc16yPKuM6stKmfKfKfKfKIDcCrJi7TGY5hR7zGJt/UFQDbCKW/1AFf8Ap2wgIe6UJVbvO37uZlSJaJD9QsLP1cwqoIAURBMygKLoePJ494CPEJGwftNSwHvuLsQq3UFR6C/Pb9NfeL5CpbtKmlhqFy7imxH0zs/X0gC1ZxUPUrpwvgIOUrYM/wC3C7AvG4rXTimWbOcddsBUogBRHhAS1zcoLFwLCyCMSyoESoRrkzmB6ZnuGV81K5ZgoN+J0rEttLUYYihZcS2u0Fx/DAsEYGVFiZOYjRgacOK2YQqI5wYjHCZQ5gNr0XOvSzcW7qfww0Vr3h/wgb/+QLTqfeO5BIFenuOLZDL3AOxvgnXGe5ZXJHdMNnQQnU8mBj5g9oy+67izaRyTbHwxOoncVQ4zB4jvEMU0NefeMUO1RZuj9sZd0rgjG8aSWarlKshCGDUW4R3EDMVmZRuI8QBRuLiZJZwZh4o1BWtTWPEfE3ALjFpxN1ptgD/ioLCEUkYa4xFbyS2GV+spa3GKUMQXiQRLJmUtRjwwy2X4mSTu8hDJfidWDb5gAUQINS+LXsg36L2Z0MEaNcoYMzZL5rP3lqs62x9Xb8XAxAHiOMzfO4+ljC4qlS+yXZ7Rr+pbLRVqWm+Ay/W4IGohK0YlEolEohSIvu4adxlVCi4qo5lFu2Coe099sUBVR8ltNPUEJcIREmXGPL/ajoB/DNDDy5+xF4T9P+za5My+8Ko1HXW373nmhmoQ3MfqIfemoMLfuT2oT5PclrC3b/HmJKy0lBXxX8y0Xvjs+kuEQNMYd4t8QjW4g5uWxG0qCq6OBrcdHsjOZ8Gvr4jXIw9Y5rILQllu5uOJniZObeGahF4RLAzBjESpipJFZcGJwh80qdwha4IIIg4lk3FpIyVidjFW+KWgBfCVBormrC6gE0M2qA4QOsPiYRA98P3hLRp9DCPBKnaPCApgOO/0/wCR+APy/wDJl31NwjwEPW+XxG+z55GoRpiWs38QQeyaqHxiF+DP8cPFxYMRx8RfMXiGiFVrxD2LE3Jtfub2KniaCuWDkR1mH9uYIlkG8y+Lly5hEZB08M943UTKysdRLIvTEYqUK2eIZPxLsFFRwwxY+kElTpaNfLMAwCKv9uUo1BPGKCGrCw28RUFrw5+38xW75Hvf9cCUzaDo+PmIJUxYoUksrXtFJ+3qOp5y15IVHZ+ZQsm48g2laG/mO1pl+IdtuTMAQxLMEol4DUBq7h/4ABW/7c3vgtRaLnQMA258TAd1liOWBdQZ4IvDdYg2XGEhZZA0delUDsh+6eYFhgt1GOZg5igVqN8iz8fEHYzn4IQYFyocBF04+vFsyoJlDoJ4+ofvr/EqoBW0/mLK1lC0+sT0ExFbSG6X2j7G7fHUEdBHI5lI7ESIsdYHp/qXi4tDayzpxBC2PNRv3hGd+kUHRPOsCrt3ys1Ma5i8EQYOeozzhArkC7hE9R9FmhBzwGJWXCMu4aaCBHewhKmBDbsRyUxEPMFJkgGu/E9zeZYBT26Z70Jk5cwtDB5YdLZc/DO+DHT9ARFx8f8Ah0csTNZ9ogyD94f/ABQWLPpUQTDyj0Myu1qBXGsw9ggAo5Arg0jGl/E7Z+cfeKm23dLUKQ/t94Fzjp/hm+HMTomDgPMoXLLqDNXgbcfT8yzTLfGgZDbmolF9ohRolMmpnAcSwxBvjJUSxcsLA1z5e349veXcw/MvZ0X7QeyXBNrMEKILqYWXBvlOpUcZl5EzLVmXSxBVXP2f8qPBGdcAGiJkYee+LN3YbqLVQ99wuDf8feDzCWpeJoJQameDGkvEGhiMWcKNQfHovgVQ0wm5XF1FuYg23d8GYnFzr03vhE+xlfeOPYhIpZ0EQYgytU5mKqPIfN6jA2HpquOPRVa9QKCTvwfp9YaJNKJ5wwIe0OcyodYQwcLQYeeKqMwWwguuot6jo0bZerJXbaV8VUWJmpoKlPnMolkJez+/khEDPI5PvMy6uj6cJSoPzGLUcfWIg4cRTGm7y34H2+sFMI7lymnz0y2JLAltW25HqD9bygVtGFZjbD0eg7nUWlQKK9TNcla8QUE+fSJKJUJU75Tfp+X/AJwUi3xbXh2QBZqV5dK7xYsRA1DOJQjqALIi1EULXUJdhBrMO1BPMpYfIg27PpF93NsENo9VYj0Fpj+4WWwlcoJTFSXUKqdxi4bg3zUqXCF2IO+Frvi4bKUcp58/9mdzM03MGYqhChcUk15YP7haB/vf/dQOD3M5+vUda/8A7fcISeYgB8y56GWD8195QhtsYEVHTFiGKLCvMst3McI6HddXiFBRwL3EjUO4+Szwo+IponRSjRmF7cMUBUWwa1nr2jCR1Ohhh3x/u+UwohrhpHIlkJVSohzFt1Kg2Rtz9zxFfKGqUl0GOrqgA6CGJcW52QDTmoQFZWOjtL9L05GPPUYRODIdZf4/3tFjEehpg+c+IJCEQCwhxwsfeWWBFkBybjPJ6r5qVKlSoKxCbIrxj/sUBXty/L2gR7GY5i4MJcge1o/uWAX4siFq+veWM8IC+rgnUIwRrhpcpD6TOeiBZ2P31CRrbb8wW1My7H69MIwXkPnuDZZwNRtwz4cj7PAezQ+IjbW2OuvVbvqCE7z94lw2XBy0+PaUOEK0zdicQyWRs1Ll2eNUT0ASZUL6T1CwhseovNhua1B7HJmMV9EVLNTeE/qVAehAlgDKEKM+Dr+4GYj7P/ZmMYZoEYtjvIoywG1cLadcRWzg92GKiH7yysz7swREvUZhCgiuDcMrc1yios3LMUmviIlGni/QBrGC1QKxB9YgJuLY7fURzDRxZKuVFlGbJkO8A+Paa3ERePsfLBilvrCz8Ft9WeZvLl+7CGp2ErLjqBfv7QVLHYhxhtxv0WhuianRa++4Ep/oner/AHcBbiB5EKlQc/WUYyiPlwbixIkZU3XhidyD7fM7GeyMWIYQjc03j/d8plVR2c9SSihCUSNcZeqfaBxZd+/v7S8L/PEPF+ZUXFy4nCHcT1PYvmUFkWjMvpwsZIN3K4z3wTgi83zfDyG7q9gwEQNzvf4jAr72j4NQ6hUSg20/EdXaMRdfyTLUE28zFuCXobPQCY4JXqRWXEsKLGFiZNQC1B5hZtzQ+B3+IFGgg+YjwlGMqo/eDWFPknh/plNTdxGBfpMkiO4DQyo6lc8giglODCINcWJY2+HT9H9wXEB2t/TuAUv0KBbD8iDIUWzsb7Iw5nh2zXuytep5HNvwFx1+iJNxCYMmIlfongz4iHRO4ZzLB/BgS0a+QO6hN8MLzfopp7giI8VxfqFH1GC5HP5mBXJ5RIqLjLUqDUWLogyBR16XoYU0xASHUMpEpcKBIZIQR2Y/sH5hUxlASkGqqhE3VIMXmpSamUphnBPQDf8A2lUMAS2gp/fGpV8pW7EyBvI+kAO6LWZYk7lRK4YoS3TrXOhCVWYrg4W/Cz/cAlX7sHwTJtMiJtHMbj0NdxrVvdy/8lSjNzxJRr5YiU6IG6ZpGDvLWgxDCjBNP+8q32dm6PM6izS+BMbcCJMld5ixwXCwaINRVzw1y0jqEszySlwwwIwej/8Ai+UWiHHoYdkzS5vlHfEA+5NSjhAd/lOhxBtMWyFj6KGVMGn9YIvOJGISl3MjTMHbqMctQjj0Mv0gFS8HG/vCPAbO0uPvgRehuAvcwlRKhdxJhDmkWbZ92XOczLXqRSWhACKk678RCkRc3uXBj4a+0LoLxSfln0GDo/thuUgwgpVSrgHUuBlQmFqBRccNrNwz2MofAZfTUq+K79yWjUWLUVYWsrLMPOL9/wC4PRDXxdnw5jkhL50TBKN0/CG4Jg+n9+YCv8UheSu6xMLa60v48xlz+gNEeDL12QmdPZ4nwRStlWFzHY0LpisrGT5IxNbr4qEUkJjo/fpFL1Nf+XRcTvvz8TQqYmsL+0ykPeZ9wBhiyzFPbAYPzFpgjvNS/YiGB3HujaQQjT4mQWCaQz4Qhttm5ERRtU3AAridGYgHeX+ISqIKsljNFsB1B+SLWwLS+8THIlQlx4+Yl25W8TQskahiduIGKLvuUd8VxcOkr42fuXeJrUq5dRb9V8DcHzFNvaMJupRmkngR7j7wUzCgp0H5gBTUdFMob3ghECV1PZYAc15xM9E8XBKnHv1UYpjg9/LwiDtQwuTt/XxARKPEv6/WKUoy0GSBMMBrw4s0Q4vbw8NxixZ4QZgGxLXZIqXAR+yA2THalOa5kY+v/wC6VBWoacpiLHe5YlSwisvk2TC3uEFcoJTHJpAjK/eWL6YesZ7nFcDPsuVKFssrMd+YLVwFQaih6sRg3wn2SxycJwxTAFi2bv7x1lMtLqAckWEGJ4I0FhK0tL2hQVL4b6nwnwnwnwjTCslwKK+P+wlaXR5+kvnToNfXzANCEFEFsUZuVnlL2IWQiDxCBxD3hBsl2l5/EsRljbh8QVVia4NedRkGoYgVEFN/eGUKjYLrP07/ABHabavqHlofZPD/AAygHsxi82TdaEvSD7BKYI6LxNOA1bg+kLrNjwMwr7Pn/wCzX8UHvLxiZRCoFGD/AHCmI8W4Yq9YYQtnnWBQAN5wde5/MymEO41cVGfy8fMG8nORGGPF+s3IqhXDbCVcQKBgZFQFHLGjdPTSB6SVNrUurT2QEi9jAeCeHMEETTq38wQ+pL+oHaPr/wDJZM/Fn3lVyOfkLmgr+GvvUU2DcZL2q+OpcYgKmNsLR8EGSOuQ4qXLlSvQgpCNQa8ftGVQ6Bl2nuIzkVjiopn/AJHRng4i8XUMwxwyuWJZUKMRXSXcs4nlFVKGY2rSdCZNQILYFsdGO5ZFkXHYyoIcln7fSBj7Z/8AJflhOf5JT0Dy/wBQeqHsf3FMs93vmtVy50j8ynTff+4iLIRY5/crHfjuGEf3bl4NXHv9pTLgDKOY7jLqMaimWYi9QpLyZlMJkU8PGpY4Zmuf5UszUwp2hDCZxbYzFLIUS37SsUTFTEkLRuO1KYem9cI2l61FvV7Q2CUYMyiheoMFyrMRR9YX6KhzfoHP9zHDMAhDcSZaqBiwuEJeeBhAFTCShpmx4/8AIYRdSglejoPB7SoRSRr9v+RDEoVSieTh/URVkpgxMkAlLTEKvgQhKhDOVtLrzDLBLHswsMlfz6Rb5EFh44Iywx5v2hgF+CZWCaS5VrvjE+tSc/uBoiS8NjeH3/qeU+X5hLVjUAowde5uWAYJUFuXnhARVCE1FPdZzBEsjnDDH2fh4vQlXACj1VMC3lqBpqWJbYGR50GJi544iK16CMNqIAD4Yr6bCfFqPL0TvXlTDZagQnuLFbLtilK/Erc18SjV+0a1C9DiYYPGxXfPaZh4q3q4XluYd52nori5ceGWpay3cZPiMqcRYKi31Z9Bl5QgXNSgubf+mZZ3B4FlQ1mUu3UqV6bqOM9RLbPEilSkce5KIzAgeDWWY7RqbkmYrzDj8xQlBC68PdBxJZhpgoODSoeAaZji40lMrRv+P+RUsXBdA/jpjCsgg1I5PMxolPUx0zPmMtJlFqMyMzylxnh857JWpsc5/wBvaYiO+AZPtjFqsTGyqkaNk2tlIR4S5T3xDPBEJVcOYcFbdKquYEXNMX90eQmLUJ7qZY6fWMuPIKxzQGB8xGTMKh138RQaGIo5nciw6PJM6s0KZgbjgoR7pnylySYgOaj6iim2AjgGi6D58xwuu4bqXvr7+fiG43x0pglCUawFbDwQLEzZfSaRxCESbiPq0D7d/WYwvIjJNQ2qq0zzB7lc63DK40FQVPrT/cX/ALQ+kW4XMN038MoqAaN58+gjEEpluRy/EGyzjaRx/tTshCNJE6mN9ymyw3HUYHuO69nx4+nF+TImG5QFEO4PbfBKORjSVEKPCihuOv5PvKjMIhwbMUu+DQTP8QyHJFlmBseIr4rV+kqPfe8+fpKdBHwkz2odxfzmBYCKIG+LDcJhfKmvaYZZlRKtr4cxH2IXc9/PN+g43Ep1RRjURE1DUoMEdy2Nmodj7PfhwRXDMGzEuKi2N5wtMwFfPoNu+VuVL5uUUdblAlnEqn3dkdTY78j/AKpuN7mLhiVMoS4LZnBxo7hAFg5CYfh0fX9Q+DUJpMv0LhsMMHFxQbycuiUsomInkfuLm/ye/tKYGnV5/qWds9mk+kxyTIsmUMn+1wIZQ7mDyYROCWcswmMeG9TKXXH+b5QNzM4qOdghvEGpkqGeL5S8RFeVxcvmoKMShOBqXcJpiIqOkCluIU69dQai3AuUnFZvgzTCb7PP9wA6ruVKhpTFgMH7T91RGy3DE3j0pgtwdMRNIorP6zAX/wAGC4vmDr3fLDQCAGJjqPqHmF7gK0XNQTygXMCI5E1qFJMuISFrb/EwkpYIaFAUHU29zqDZwlW5v8RApwRNErr46mCLhCXErkjwCUzSa5ckOIj+0yse8QyXxcqAC1mJto03jMR6/Y/uObNeWdrj3g1odkQWobP6lHUu/TcdI1+3/IGTwMvhZQ95TzshIwQP9j0dQFGdLTP9TFu7PiB1glXEr0VM6Z6hLF+GPm4C93sme2xXUWSDw4fvEQ6834f2S5qhroL4qVAuJU2SWsFQRxKlWONEbt3CvDwi3Ig+c3K97QFO8y7pk6V4mYkQ11CVzfNcBHHFcBaF9jcDV2Y8066Gk6hzVZi4gYllsxjbZriZgLT/AG4Hm7rBGQWMbfx8wbMvLcI9kWPbkYBpJmXzHv5IBDqPGdWVhKydZt9/H9wKUcOgUOyLol0+YC2jfczXUCRWOIFzPBgxgmLF043JmYjt53wv9vaVdw4x6DSLJxU16jPvGND6Nc5Y8ww4IlcLM8vHsSvEz3zU1L4SopiNGWPBFEqYZtyqg1KuCaYGhfvFtWKlkFy1Kjsbl4fHCWPgamzgiWcXLly4kw7Z0g4LqU7ghjMXUNvtDRNJqmkgWPsDv7xPFDp5MCYbjXxoWbbyYDBaJTslYP8A2lTck2hAbI+sEi0oYlYMH/wCrPHooWcT4DmNXlAuDm4rCIA74NKlxCUwwwDTBUmu3zFVqVwk0mYeA1rj4hdM7faHgl+kIIEsswrNohc+f0xGkqoyhbA6R0QoK0jF8rvgBj5S5rD7zb7+Mxtxglha2VRAxLl8YRLlmWUh4uDrouAg2mL4liXhGiOW5YAajLqGZQa5qXEbfGa+ufxFstxGUKx3iGl2t5/jmvbDXou+GXUvgqo6MQDlbgWNyqiZH8VH5gWRBqe6ZItZMMIMdytsO/4h+8fwSppuBRUoVABRBzT6E66PbcuFAfdmCNfuPn6Spw5o0+qf1MUj+03PYjf1f6qVJqPDKwWReh+SHYKOz+v+xZcIxAEi3iOLjmLuNtiLlCS1D2M3vMC7SDdPHW/yoigjazyolCbnFxrgh9ACmJ08GvQMqweCPHgQKK9dy+ubuVLgaDR+5UZmeEJCQniXJX5morTFuIMFjAdxqlcUFiZlXT5joxDRn0d4QJqLWXLly4gUqXQIeoejhRyyznBM4MwxAqZIod9kQZ3np+H+JnFwiAHvKOL3O/pAPQei6Q4JXsivp08u37Q0EjaHnnUq4nocDzzUFFaqVKIK1zd/aHUmZkwQvuJEMbnvqSyUc3FGYwKG4HZA2mGE4wKXQ9vuPmKlnBGEqHKgHlqLWUErFkLcLTzEVOpvIV+3URIeyCN5MeJtD8sqKqa4A+JhCEYQCemwSdUzf3i3wgzJDcNwUDi4xbJ9BHmaKVMEAbLXRNq6/iDsrxAFItR3Mvg8AMSuGo+m1ZywI4lxpJZMBZXhOmAiWMtyjK+qQKpEjwye6f8AYNYP1JnireFfEupkQ/8AsHpnP9QNI095Z1wgZi33fvgGyVLJlGDLdDWR6lI8ks0biS48LAFMusDyyfTxHMM+33ixVuBfBu0dRwTBL7mUwbD7Qb7nNiyPJDSsKjmP/wBUqCZDmc90NpmVUqVNQY8XAlTGhxdcuCAqX6FouHOpvPLCOLeYPvG+Aj4iqm49HcyzMXqBXAUyqeaDFYLxD9JjdDmaXcAoVDEoxG5lv0lI+kgDEKvF4f7hAVLqMAMLY+6Vtu4NXLdwzCyEo7ICPX2Y+9YZXj9D9ZRZc77vUvi0PjFe0I1vp+eD3mzAqHBWYZ/8GJKwNkCzxHY8Clc3UYZsjw2sPUVDxcFh7QS8IztEDHPXFAeX1oO42IyJVV0x9WalO83gAEy9BLly+DGJqGK/ZKYtPUOBmIKIAozOiuTzw5xzfoCDgAmXq8J7RCm3vDrY8C2oM0+JYS7MSuCPNTcqJUpAW/E1GfBUGqpXbH2hFW4pF54YNw4GDgHtmZmqoPbqAXgTpll5PzGi1LzCbTbMEoMEuOnxhmQAbbRr4jsGDPb9/wBy9Uq+8GmTXvC/D47lpIr8yrGt3d0e0doppqJtSw0cd/wQxLi3CLEMGKWYhotkX0CK1F6ymJWXXcN5Lf8AMJbKZh3MEzzWIxhFCWC+1sjaLJKZJ9QfiVqbZguVlJaGZzV5+iL0InOv7U7ml30I9zKHh4Tc4IvoZXFxbg6PFSpsENSpUePCUyubrkWiVHUoT0xsNpUZfAt3ARg1FuV6EEpiGdQK6CADfA+jWf8AzogmWGZfiVtNeLhmMyg55NuDNsEDAnkdQywc4K9pha6jlY+2P/YI6l8AZfooEr9ovBbzALXcBFT6BhjFGGaAgJXoFjn+IWIaD01BT7xejklSowzUvG8IZeUGoTmZJDtGo4z/AOFLNtb1uOEfAqLKswxAE4vkqOIUPUwpG3IG9L8ypJEYi+IVBphhoH0ilM3AD0SLwR5uBLHv0XrBLy9pe7GN22LMyh4S70TqDevRqAskCFEpGoXEDWawx1y5q3x5lBG22CLYHtL69xKKJlmLE8LiX+zCxMv7gKRl+6YrPz/B6UFRdkARtPtNK4Hqmo4N+iGVp798RlsMGMZKsK0qfMubiURjHEZcuMd7m/YqWdf7zK9tb874Ul3EHDMqUSYABE9pEM/2o8V5lBesyhGG4YUVABUMJZKr03muCJzvnMKp3JJ7xKXXKtuXiX6UGGU0i3KxxtZAOIYVFYNsIMtLS/TUS1R5uL6DHFQlcVKlSo1WpQmVRsRqGLMzy4iobmUBmENpFrp+C/3AJVntGXeU/DLdvKu4Mm8EGqs/mBcrgfQQYoWTLpWA7IPW8TcVDK1/8ZgCmJcpZKJSAwjgW0E7gnAzwZlKhXzEBePjEXlbxl5OKllBo/cCuaqCR5Z7Sw0nNazZA0DpwepySzNigylFmHoXQnsgV3L9LK8S8pxFeb5va/L++CLMJlO0c0sf0Y/8GEYz6sYa5THOqZC4pSYKWq8EPZ+kKkjywhZKihEorpiDFpwkcRoqmOHUotEuoRNft/yC40RMRuocQlLuZCZjojSrzL7+f4PSZpjosv2CBUZiGyUNhct34opBYlFWDplRbuNBbBK0RBZMu40YsY4jmJGLBYC6Y4iiJSU1HwJTcA5IKxABGAe/2pRGEbpdMgmVq5gxB1NzgvuXyFxVuO7JWA0ioixF5IyhiC5YbI/AOGgmz0sQK9ShofQXxH96aHsY9Yxjv7/x94q0a8yqhBIudS4u48EfSypcJWI+l1L4qlwqyV+4dQBZDzwC0lJQFrGw2Z+JlHvJOqPJ0/SbEYuYgY0j+yaOYQTb3hII8HJLqCFsXva18Qs4G4LRMtkp8LHNn3hVU/CdkCtG5mE2o4iVFzTHNGoo7mYAH6/PJiDYw5drt5ESVxXCJ9D2P+8VBB6KTUwl36N4gtCARf3KGK9yeammGpqNsQFMwLYr0VcSpfCAphtjri4XUtTY5+/KqBno4clqVhXHitQlXErjXF80EJRLWAcMSsOBLSlah046tNzTCCUk9qIWkt3AjcxMQzmXwzf8y5jDC1/4IwduvmEY37+XzFGOCIG2a3NLgwVjruVJV87+0VB7laV5/r0KC2Ka2tvj495TeBcSGoJQAc13LGYKsLb0fuWaavCZIFdT7wQlxWXBHMrgvBHqcQVUqjHxLnUbEWWlYQNyx8yB/m0NAOpkVAwbhrQjBQwzAIswee5iOoktJlDZDSXKHMqZIbsn0lXuUnaMw4jHJqKiWcsoB9ZqLJ8vF+lATlj0EIY4Rsyw4xwlwDNSwg1LK9Q84AcEZkIYP/FgyoNR9RZYxavDwIIqO24SJc2iLlGSCSEz4T5faJ21RnNoMFY6gvQH78TPVfYmitLgdmWzx7kGgnB6TTc1R89QUrn8QjaDUu+SJcM0kt7Uz60/MubT5lWMvWfRVw2Gnmr2IKF2+8yhklQagx5uEwEEUqXLv071AjbqaQKhLnbtSiRlM++k7h+ZV8JeOL9Cjn0Lfy4zpW4AFHNBCZtYepXC2oBdlhPn+p1CG0PSWoWupX1gVrnNYlVxUqVLuCaKmseNEpeNMrgjbO5vrUCW+x2MF03MMdZjMTPUcxpM9xZmATBHW1CMTNz9/wDByAthZ8sEBvv3Zc1BgWtmYX1E6W32i9FHllcM3v3l57quviGY8SoBQv0mR8tr+IT0vvBwsfaOJaLGJaarTWYpgY+IqhGJXolR5v8AZ8pbxofwlUhziC0xN5MkfbgG8xtEMIGZLeMsaNxLtKpgBEukFoxkLHxMNtATySnudRNqjBanUuld8VCJLOCVbWSXnbBWtoZ1A2zXlyhfCBMkAOLIpE3iGLjoQZgcEfWchEr0uqHVwcDqPnsnRgBQuZLD4ibraAdwFWgM/SXUKVPetXAhrKiUEE3hEUMqvrEXY86mhz26SVTdzCnU3K9OYoyr3goIFrO4ZL490a4GpcqVFo+fEvOPJGES9wWLTx39Idx8Oz5iL2RD8zEDwsqxo4vgzA97BxPSRl0ZgqXKGoC7gVr0vKQyhcubUeItVZJgHZuX1xUqVE4vgRZpKiYmoaPb/HoTEOSEC55iutv44DVycGZfo3KJb7j0LIAs4I54ZhMVDYqJSoAUReHOI1UaHft/UJtzc66mGAJVRbyePtA61S1Nt9f3KkYjmLLMfJMNT2x+GCBWUYYPtBMPPNavqWqvZf74IksWIuctFg2Hf1gFGiXLlrodxrtnH5OoILJcVmXGZbSrv+44i8RjnES5tF8S2iF8NzsYZQsgzncG7JXmwW8/yotGTe0faftLuYpA+h77Y0CBmJzUThLlTCFRgxtIBeNy3Q/dgjAmRGPK0ftBuK9S2OpX5GGuRuMxL2YyRiDiJwY5OIYxNzIhbXmBa3O4iGQM4GEW+1ebheB7B/MR0vhjVISbOLAflH0iPKDyNTcqVKlTRmEULBVdx0syQwQ3AO5QwFV0ivvF0MUfLAtb7gwLjggWetcJJGGGZq9v6mIMdD+fEMlkvkgpAAGVfxANJYlMOzh1xWb9JmOCBtQYPibfF69Fy+UfuR/cwUeHpggsiFKiFVZxZHv6CX7Y4Rt6Dh8doZJXqdRaDKwQyxDirA68y5d0ATRAdRSFl3B0mLIH3nZL+JSyVBKxw2TBDDF1mCKcVwuwwAeOomTwgvDc78Joc9js9K0RqrwGuWiwrLKxBoQlx4uIwaO5XCY4qVw9R2X8RwuMQ9b+EJIFY2A+h/mOI8eZPdMJgZlCkRFblAVxNTMwhfL+pUCbj/EqN/iBIhrhd9S7I0kueTGGVqPC0uWRCJUVbyPfG2JaLTyRGDEHmMCWF6jqGmoj5TVlkM+WD0TK5s/ehcSqBaMTxRnlCUGYMxOK4eUxc1HFXuGMcjLwFDNcxja+cDgyCvrPcCIxxcvm0s5AVw6jWg3BlmupiWqviNxF3MUMoMHOoMsNpwyiR3/6XLly5cRdMvFsFri9TThNDSQGjHbNItXKLx74gOgu/L/UZrVPzCFEIioXf0cDKEzGuGInNcoFcEt2webxBLXMAtuMh9bIFTipieMGyzggSuFLsJoCNP8Ar9I1lscdg95Xht4rnUxQ1GboHvE2vpmXCs4SMBsuESCiYYhxuUKGIgWYiRV1FTRiOYbQQW8qV6dGEqlL+8TEVKZMGcwU3fELvknZxQwutzKcDHBisF3xBiVjAMP94hkSvJwlkSy+nJLLZvFQ1jGDL4zErgqUTyS49F0QgcLbgO/Ra9nEojk5lehvSO/J8H8xYHkO8/iIOxLFlS/bv1VfzVQvEEWYixKb9A2U5Nx2DCl45leTP9CMFAAaf06gat5S9wo/WPf8pFOVT6i/rm095RkudQiY7EMnKMZ0Yu+DW4RZPCOHgsgOId0WKoiAFM6FZkDbHfBonaO7X/1Q4vnYmenZ2TeLDEXiubl2jhKb50+iz9GUrYAVht6P+8mbWkpaYemmHuYi0OMtSUPF01LhmPoIchyBZBF+qv8AzXGKjMtF4jzPLDR19IdlE89eKi+N6Tv5eoVRXw2/r8MOpyOn9+PrBNENW3X3iC1H0gl7V8k8oXMpBQQb4IgUysahGMkZlVUBPvokFSwMPEyfWEFkJcJ13KCaPG4ZslcL4mYrRkPKALeNLoVS1qoeYNReWDtB2mT2gFOSCehfXUqYX8TI2puVXBg1XrzHyUmcyrVpdQmoYoQO4rcb5x2+YRQQ1GIM1ItEvz6EsnvlIEr0OdUfLIg93SnnglQal3yI6pdQDBLyApSZU4w51s6lBZKmpiPLHApdMsn5CGWXCLMoJpfMYEYmImIApaYMEVxYHwnNwZ8AzqamXo8/1LbWoAZlrSjvyn8fuFfURNntj4Y5jLXEcz2QXM+pQzK3iNWm4KR8x0TnP8fxOrT9oFkr5AWz5rh1hqCvO/3wsQfCAFEq8ShOWmI5WMqhNkVqmISDFx5+PiGbwToixlXE9sExjjCsqBT74Bt58MHVwhKf+VFzjbFiK5hCBl8EXl1wQikHqEa9DoAyStfUDTS5YyoQCH1VhvUEV3MlpD2j4gtFEqJwmRlQZuJXI1LlwOR1ECzkmvRf/gCuJiRobXvI+8FWU0sfSGWhzg7+Ym022eJcqrmQ5QqcfiogVzpFazWD+fzjgIGZ49EITE0igXBRbeEbTUNSwzltEV6As/mMSz0YrPEgjCplrlCNSgImDxEG3RARqaP5mrHIjDcr0vYII6lIGIOGO0RSHZ2QyF4aP4iBMnm/xVkLKIXj+JlAeUrsT4zB5+ozBm95P+RjWHitHRcMLbo3/E/M0qUCkxWUJguZbH5/UtTcU7lMCosMsypXNSptlkQwZdEw7hTYSq1wMYQSptzhkuZoQF1B4tGe4vCmCwg3wsKg2XLvqJRBXOzhXSCgG2AA64Goty81BsH0UyuK7isxFDcVwhtlgbX8S9yfx+oStqVbHcJScbQAUMTWJcnB92z+oxxM1UGIsyisxMM3/v8AEqbIRZTa+f7hAvOYBOa/E60WWptS+hL5GRdj5EwzA2vfiMaeTkTThzFmBcUwL4AxW7DarlCYMrv+IyLpmpdzeCWDHDRvcAjO/VC6h0f8qBxBDxZPKMFw2+F+nJQLW9exPZC+FrcccQ7syrjuDZcMD7xPoMn+GGOL4riPqIUZY1Zft1A0JV4l1L4dWjngi36CMCBgNM3/AO4swPVo/qABkD795hKGwH0iN1/lEjYvvuZAPhiVaPJbPiEQ9gktruOpmnTfzvMBLGPpEEBLgQJgiPYZ4OsXAFUQoDvhH9MsTOmJVkRAsjHlTRmJvEGAag5vBuNMMO4BBASoxXDk/qbBB1HPJGV2Q4Fq4BaeHhEjQ0FI31QQYqU59oFlBfaa+vj6bYIE8tTQ4J/u4MbX2+9f3L5oXvuVNssNNh/qhChujmJUp1UHWdw3LjzcC48gKmErPMaLfTdc3+4M/aClRUQy+YPOEfvCPgWohLeMJcuVTZ3FsKeoKifvKKkPaVlxYHshW1gPSyHeXw25OCluxAtl9KvEyzMmgmZmVqaX8540PtAoCdjtX98Vm4ZRvP6wLasGMd4itjljjc8E0DMXSvMvCKCPMAEmGEDMAAIRPQRgBbUC4iOfoGEom4xiLMz3BjoZslNw3tFQb9zuXCYL/wAZgYj7osFQYmkyhBMgYZ5NV/dM6YpirhnDHC4GAN+klgErFMCuFsVEOSKZYfQhMderU6Q0HMY7iEuoZjArzqEF4JVuCuUEpjsr/wADhKUwrrP7izTPpUqaV/X9R+qn4YylOPZg2IIWTctKQiSpUqVFxhuDVWAb+7DB8h99xw7w+DtgEGI5qatdxm1Hn5m0RdR6TT2dQYH4EzKkQcKgzXE+RVCIBuGgON0V4gFzO0DFuppERa+vQLJRpjz6mANcMWiXGRd7LlwSoAx6hDZubJZ4YZ9My4twLoEy3AuIbMTL8VsvTfiAqC6ymdn3r38SxQC38vv9Jam3tlZWxe/9RUfXjUrYX7supe1xgVjD/I+WNGDUeCsuklbfEy16VHfFcCKEbWh2X+owgo8wTIhGAKZeqw8n8yhcspdShZAUNrFT2Sw3mD2nfI+bp+vF8DUYZrKCJB6AJSBa76JVd1u37yl4Vzr5ehLagUVlnbXXCXDga+jwLe5KBOWOagQZuJ39fsiKjwR1FzNK4MC2VURre8ZwS1KgGEA8MkJjgZaHO6cbg7RVTTuZ+8cXK4sVncEOsTLvUZaGI1aj+I1BuMMeJs4afj/jDbYjnMY74avC7lwFg/8AqgSZxCGI7hDUMw1NjipOK5C7cL0SvPB6OhKOnuh6QzfCXC4ZW8CIaQEquFhGD1CT3lRKlXKm5TEri+KYHsTSYWIBDh+YNgQzqYOFnqTX/YS68nT9eoCWS5cuXBjNI7LCrWrDfyLn6x+FUX4+CLip0PBMbrRL9hJ8OYAoqAzgVT5f+TGOUPGvUThT6RKjCsMpdcbmZea+3AvXUI6aRWXtlOuUrYxpmOUeT0MkogHGPyh+B3/cHuMWjMHLuNRLlx5KhmioYiDx8TzsASz0ArBw9HBHr0ithyH0hI6vQZWZqqf4mlJ5hEXsHt1j8wRRiBMlsWq730f74IqSz3kH9stN1OjWJUURS+UuUzTQMfWMZ1y8wOmpf2QuljxC7o+X+peIX7w3Q30hdqfNWfiVRV98TIiX4n6iQEvH3tI2DbT4v/vILXie5p6cWz4G42koe7MZA6CJr1SsH5lUkzNF/XMMGv3P51ALV8Es51UBu7giXLj5Km6WuiBRiF9+gF/ZwuvQR2/0J0QE3DHBxuyXGy1/XB3UwzFW4dkxh8EqEWKu5VNssL7y4FZXstdwmTJhkiDVMbCuVMlQG2AdMuXamdGZpcrGOVXaiUYhsxNFIkLgjauKN8DUpuDjgxHnHH++sFNG8Y0bl3w7S/UAUvP/ALPlHQGIbKmsXcHKIYYpucVDi+FpbECC0gVH0VyyJ0+i5ljz6CMdTcQUVB4X02WQjUMRYMGL6BdkFMR7IJhtm86gL4Mqm5iuGsCtXR9f+J8v2ny/afL9p8v2mQguVS4PmKzqNY3rMsIlWPL7wwAQW0y/aAeKqGMxiHFQHBV7ztm0YKPSfnEWVsjdlfnuXU+xLP4hIInuv7MUdBs7gIBA2xIZzCNX3viBFBwLmIvtyhK1Dl6lnmDXv4gg+zCkDE8n/EESyU6gaqMW9j3legKolcoOyZWJ/Ebp/VAxd/EyUMu+DJmeDFoxwKhEHFcSjmGr0HQQAwRc1UzCAgfmZazAa+81/b+piErxg+Ly/mYkgllj1Ax6GmHg31MC7XuXcC4IF8E4qNLlTOIAKJfFcDBcBKSbsy8t0P7nlQYe7hIYoHSXp7lBZj2li3ouJCV9zE+GPtwFy1NE7b4DbCqMPTGww/r6S8K3xEJ6hJF5EoLR1XXz7TNoPiXen2mCNjHFGKy6XDs2GCKqYYJforcyo3KTSaOvmGQ6lcVLGSvr7XswCON+zNIP1lthlO8nhgl4WmGqv6TYPjzDHbEuB5hm13MoIAXFNkW3CwJFXUpqA6mqMKIqI2NVGmGbI8FC5zNkpjVviBbNkR3EmZWZY9IZlA+YEyL2RzKePmMaczOUmk7Rq/P/AJPlBdM0iDmYhBcSNM2OWXfJtEc46mD0JxfPQJ4I8OEyTXoVKmxGW74vgiSmBcqZisv/AMHjNdZRlynsuKue3ABUThsdjP8A4RP/AIRP/hE/+ETIwUB7x1aKfzNply3FAGCCCzKwlVmYmEF+3j69+0qKI5DDKGPmDD34PaLoAXZuVexK2iJcIQBpuF6AnMstBqDQWzrJUeGcc1cu7de3UPBwx9pRz6G6xDEuVHmlNkJHQQi2EKMQIBmYkCUxU5j1SvPZ9ZS8ebgpHyaI9ZdZXfx4+YtGX7gG5cvSIXgfk9BUqaiQsmlUKvaDUW4NRJuX6YieCANcDH03NxmynbwnpkzL75MPgRj7ElxVWfluL2XxVMr0D5czv27P4h+Mop+JMxgNQXBB3M7CCd8n9EqGUleD/jx9NkoLWJiBasNZlNxp/wBPebjCswRENRLmLthh6LVteYlq2Ij7JAzcuLGZi1AQGr/EOftm6pYYQLSsid7RircQsKpT/wBgfB13GQmYpjFRXn+oquBRXJijzXHsg3KuFMqVGD4WotEhqUO49EY1CA4lKyH4gBbuW3pjmWI281RkPV9RFoW8wJmhrn/8nylWoK4hMpmRZm0CJCPnmyA35+giy/QltxqXFoFBv39pS6+qioX0JZClcZm/QY4rEWXMVCOvSca4Wi2Hdgp8dRn1o/iUHe+i5fr0RYt4sKVdXv1Ebbd3kgm00lEuQlRcFv1hiFoShI7R7GDcIYxB4NEQwWmDXJaI7toehKlETqGnCDEtZCPNPGGXWwSK7TJM9mv9fNcXwo1L9CAx1MQwEb2qX9QmCRaOCKWQuHn6Swts4K/hlk0shiV0kKpZA4CssEQVXP0n+1AfMIdYK7H8QAMehJUr03GUI+eNIws3kip/g6lstPaBl1+xPzCa2PfFGbIkYV6un5mfFaev/sdCD1N9Ux8Kd/lgxazy4+0ZGDfwevo8mGmZ5X6ispmWXx5YSbHiGzGiJiNULAOKFRRnfIkY9jBpQA1wESozFo7J0Dn76h5UVAcSoHsg24RA1O/7nbO037SrAxo6jPbMwQVDTCcvP8EE1674IdyoYKMEZZ7uMSmMWMFNpFGC4EgsmXdQyRR7f8nc1GbVfyhGyFS4WhvBzFfP97/KmZDxAbRHEcSwJucHirl1aUS7GAor0ESDAiSwP094w8Jmjwde838scPQQ+vb+kAMqOuzKx7cIJa0iCl+0xBBmDAFo9NxxOiblLIMeAhExwKSimLN1+YgBb4GDrMtbxAOoVGpX/g4ZiH/Ea8gYazUPRNzAIMsoo2OfgaPrKsEHbFEMUWGYOIagQ5SyMlykyRVDDhVLJgzACfWeKlMoUxpiGBfNwGL8nvMFfEJgX6/8hYAPWcV4jwA6Vr7wBZ/5sJ2RJN6z8xQ3G4gYpYhnt7+Hf9xhRZ15fglJVeHf1hgog5dynu+LoSS+DKMruB73iYwZlGz2Q7MqZiMcLmGuoe3qMxajn02S3xPsw4qVcO6+kJjYEQ9peDQ9pXNu3fj/AJB7P9uV9g/2Jb97RjzcvpayHiBUQ59z+19OyAFrTDLKlLIb6fMoXvf4gouIu6IZoiLO7/HCrgh3YHfJuixgMUC33NRoddzsRLolCFuoglNRV6CzymD/AL2nslmyB53C7ZcRMlnaC6lor7H+IcVUtumEbgs5AN/eED5/ggo9HcS4Z08HBBlEgXqFhNAE0oeFjEjHOIHIncTCnuf3GiFnmUMW5fazGktTGMA5JcyQ8mf9Paalw656BTLi0BcS5fFkN5lsEOtL6CPAZeFhMZcvu/0Skg+oJ7iT4HX1iVz8QFp/ZlmXNbZXzTCRC0e7HNNvmDqYIAlG+ANoC/L1ERag5lM2JmbB8RTU7SMXDwtRLbHtRLpYkug11qIdh5i6j/v/AOR8XLv01frVUI+TBC8MxfO9nH/I2WJDZc+JcHDU2BJXwNHA1U8oyEmDhBFjhQWxWg2+8KqXDd+ENPh4S8QA2S5ZRZ2wJqKLG5CA4i3LqAO7fxCIdSzRiDEWjYxlds6f949FII6hL4G+CkToCAbt8wdEa8w0Iu2rD+32m9a9u/ji5cWXDo7jeOyN9+F1dJ+YCXEbwRZR4hmj02ajbKIqLxXpVFJXqNtTPygDBGxKMwbOPEgfzmCXc9oNtPEqJ1LIUkbPlg+9zfCqhp7Nc0+04YYrbB38QaxmCgYf7L7jKhhiNrXVR7uMfeDfUslIUQvvmpcHZBRupnJMguBm4RCXWYqLU+XxEx4K+PiGllnn+oJTFCUfJiP26auNhjKpnpsjQuZFQaEeodsdRQnv/B6K5FkSmfUqRlwrkN5bmlcVBUY1GIYQpINDF8Xr+piMEiDOoVrcWVHhHmaVHf8Atyiqo79HLMwxFlv0Klx23ACdK3MXIjrErzNQblSpp+8YeUPnt9oBiNZgax2m8/MxVl9/rKGe4pVztGOiDgyY+k2XxjsyWkXDm4+5Dm46mSiFKdwMnsgh8mJTwQdQ4itZ1GDE+HMAInNRKNRKlkiVO5U5PA1rX7Zhm/vZBzT09feCEmn3h1gwQWcZcLy8vLxqrLrDWJVfYmC2Fa2Su8zz3n3gcpPLGhZAH5ILD2mokxMJfcRLgie1Qh7wc+odSV3CIcdS1bf8Q2yyVwR20BDXovg5iq9pWrlDuwLdm4u42xLixLMHaClJIM1T4/7LSRAH3rH+1ALOB9SzEhuUd7dEIZa66/7KIJr2llJXTn7M+pw8+Yh0IAY1vJXL3XFbSypNWw0SzPlPUlyrEpMJlcAdLwNTT0Lb0swcRXCMnccAQwkI6ktHcQqEKbVrfHzDdTypr4hFlp4TCu++XoxNxwuo0Pyd8XwQbWWRChPeZhj9IZbt8wYsuz0LHcg1RM4fmLRcHNJtwoqUG9S9jtiSdw94qiazWM2Z/cKMu7o/uFcMN4ifmSh+iGj8/wBR4CPoybmlfQkAUxhUdQr+yVFI1LrUc65JEsqUQxAI0oRlW9ReW3GT2jFpmtczu4cf+bStTTg+FwrZuWpTUuoqq65A2jC+5kq4kjBmOFzqEVbZ5mGngvH4qMhtV+88LS/idcbX8/WDn3HRU1uXmXcpe/EVn44xeBisG5UBiEAaIsnTAFjDKPPGSillRYDKwXObAoj+8BrUNAiHiAeOHISAHEAIQKZ4IwWhcdsPtHwDwKEKhtYadGI6mCdOJiEzLKSkpKRwYTF4f1Ht8S0OTqLvFWfSbqWs4Ppj6yo8ytHs/U0bDFN79iBwEWUn0Anz8xBeoISw/Lk1whKYqViN3zVnxxdmm/r6H0LLM6nSgRxCWQL+0DJl8L0QpEvDDYtR4h3/AIzfi37QoDfnuOozxSUStFjJ8zUM1BSnDAlFklC4RfQBDTEr8Jk6irqKNS3ZAOpZwtbnWbuAKOTdMS60/wBwXE+i4G31tIyMbFwD5ieke0S9Lp/udJGw6uPuR7X0AEw3fFe8ri81waLmLGt4StxoXAuvcIENc1wHo1uClLJRqWlOLbBKU7UhRDgXXA8dmWBMiyvxDNRVh3D0l5+YMLzNEeDXF8gJtEGy+V4VMkbWIyY6x9f/AJEpiiYjwkQjjMWswxEv1f3BZmMhof8AM6XifW8QL4Jbi3A386P9u0AzEmcOccLDEs+GGLsS7MRXggVjmm+MWIK01FAbIMW0S8COqdQgDBGtmHeVKKlY+D9R8zYiAaMR2uZ/vMTwI+UFFSofvRrnPbBFEcYCddP9TCGkS/EDMIxJKGp2vxDcIy6II3jKjkAdhALi+UJTKBIGnpuZYVgTYPEL4HvyfSe+/wB9Z77/AH1nvv8AfWe+/wB9YtJB8RQ+7FTGJLMmfo4+8HWD37/3DYO7Pr/2NQm4RoUPiVPSWEUqBOoHv26gUzEi4FZ0vIw5xhsivhqL/wA4InF8XKlwQElgGzDGPQFw7MKFwLpwZlVCM0lRzL2JUXlZQoVbd5Hj3+IyPD3VmC6bdpdDZAi8fmb5K59ySmqtYDXCv4lmzxwOcok3hhBqJgy5lmvD+/RoS9wjMvOH4hYGn5/7w5G6hXXqqEq8sGZGuPOzxGoDj9ei4tFstPa+TgKY3FZfAUMqYW4oVAVUquKll1Aq8IJGMvqGirKO5piJgKpZs3DEreWy/wDqKXwJsirr17wwKl+I5xAJTMBgFnXvBCxSZ6Ri1eZo+eb4rPorRO0DThJcqUsf/URPjqXcSnEu+Hj2R94Gqi46olzuHxmh5r5JTDmaRdRc3/s+UABUHEggxAMtFtRxlcQ7IKOWCuZgDGXeJpF8CCA1Upp7Et7Q4obCARu8VZ1bl/FRJP8APEw4ZcrSCAKYIoDT44TDhO4FgXSviYA3AtJAxMouysd+8v8AP28Pc/qJCyde7wuORVlG1XBmJBjaYDR4IxAUwNP/AAQb9IAjWKkwyfT/ADLl+6J7ILrAjIkH5Aam3gWuyGlodQqLWYm76IXuguXRTBNI4ev+wcKUrgYgXycDyjXZn7QgJFIeZZ3HmrInZVQL+D04TBNkFQJqLfAXHRLT6cJp6aJNX5jT0zVhdntK1dKf7hM7KjEQdw7ZeTEB0Hzwyhf2m5S76ovYy5HiXEgcJoBGZZpqI2ywdpUpWHxC++CIMEmGyUx0gFt3AnICDPBFFtRxUSZj4MIxp9C1lhbliHPfqCn78U0xrGDpmbmah5I+g4qYOFUjN0Mvhc/6veNRSRTNzZQ+cfuAwXbbuVccQipagHGjcarqMWFF4ZQSUB1GCV2cQam/PouL4ivDzuIOGUsBs4eA2hXUrEfeVXCx8xidREN4dS7B0zLuA4INWFu07nUNJxk/zfKI1MyGY6lkHE7aoplc3JQuRtq4lm4oe6Pf0gmsvmfovqV4jVyri0zIkVSNQtuu2XG4nafuET2fiCl2/ogA1ri5Y5iCUyxAxL59EpU1DJdTHlHmJfd8ytlKE4qxbihlgZ9qUccHF8pZTCpuvSE2EM6LF1HHmBkcKoWi/SVojHk+nAgLfZ98QANATHEo0dQscSPky+PiOd1tZW73sjZGpjNAlsQbJ93X3mOo8P5gCiVCU5QGu5UIeioe0xBBCbi7JVcsphiNR/8A2JyUqapKSzg3F1EomWZhHkajUNIBDrioypVRLKhYZUKvJ/H2iUm9EtTv+oY7Wa6iRA7ubQD1iA0H2f5i2I+HH7hyAkyQf3PtFZc6xLdBXvBkazKTEU++Jhiq8nDKgxpiDuDQZqOoxLlhLhBbjfNy4kQykVamJ2dR3Sn4g/xEFbTeT6ffmvTgFwLMRCTgNxLiiBH1HFxtYLpCxIUziS4swyy0SAqErrGL90ijmlOuEFqGFUxwEdyyNblLBD4xEZMYfO5gPQlwKiZvmuHJFW5cTkIwY7jmajcYxTUER6mF0yynWpGaosMCtHnMNctl/tym+ZauLqEneYij4jD8IlqUUm02IyEAOAQZR+zwDzFBuAuAwZSHGGNfkYLOOF+PeZho2nmASuCWqXwBKZ2VRv4gRoImP/ZBFJyXsf54C7Mi0eI1HKYhQ3vmuLmL8kvio8XMo33UBOjSLr1QrscQ0GYhRp2iDJGNwVS/mfOfOfOVhj7G0ftiGXiwBMfWhz0/+wyVrtl9rDMo4Eo+feMQVzRv9ZmPO5d17e8GFQahNuCdwWWbmQMIcVMGWLVG2bCfEJulczMEV9oxlb4Ehk7XubIGFqFL92UK8fWPFsfEGeyKLM2pr9KXBCFErgajBiAtjpU3/wACAQ3X88Kt6y/iKhjYeW3+1DSiXtDCtbgg5zp7IHZdPn/v7lAATsvARLuOoi0QszZaVthgYESoJUWEcyublXPCmM4l3qFpLQ5xXNxgWzyyzL5TWftBEs43zIT7x0ew5r0AuNYaTEiDpubKXF8Pn0VycVxqV3LjN0guWACjUNNYms1qG1MCYgnU0uXGe+C58zsS7v3lAtGCnmPAcvN+hPHDw6gpLJUQmOYxzGV46Y5zKE98s+EbPSOnOswi1mIxYHn/ANnymbNOKIdQGkPMhIuHuCN3qCDiowqGLmgMrMSOALgNqonnG+h8S8BWauAoAhgrjBuzuEFHIl6dyvFfM7gWEK9AA/Rwg0oNQx7ygvZAJ9XN80X3wRLIS+KhLjyjYgBQR3ie1NRc1KhiXLly4mbg8xF7KL9IOvfxLHUTPq/ztPiDKwQwdjyOkiQw4X6zIuEGZSucjBMKdR4Tky2yNEIIAolDwdwoXEJa6lLKa9IvHJGBqfmDs3LG48Z/Uu+XKiBUIvpRB7nb/UPmKLvzKkNoiHeSc+14/Euupt8+0wARDTLHMQbReO5ZbA0puCJW9ovyvEvUqAo3CoqMu5XcZYTgAoQpZL9BlTxfoOCDt3BiQCUf+CPLx6tYgDdypyyfrgd7IntAHBLhDnmrmYlLipbUNIAAogIyj1HDUI44cJqCsKZVRlTcJm6qGtwrWVoIJjIzMZaY6hOCUcv9/v8A7GD5ho/P9R9LqHoIxJeaYtZl2XNaZUlopl3FTEfMZUMJVhySoUgXuJwsZjWVaX4/Mapswy7E6XP/ALvlOtGOG8JiHxyoEuNtO+HdwKhqMviogsYFSyMneXPqK2P1xH7b8GUzdCYcR2GMBLrcphGl4jzy+w7ZrEatdcHDEGIHgwg2Gr394tlfqGAH3mAGoqWc1xi4E2krkI4/8sEly+Lly4gZ/j+oBO/kE/UCjY/IfpK5U/J8v9QgUQwQ94eHxDx2ZJcHwQzCDDBuVcTgB7yLXTXxEKvMRcIhLu0QKhmITCIjU2wSVBW4JV8nK1BLBiYvg+YHaANQCVMblipzPXtN6iFS0CmBcp9Khdl+PeBAK/MxyAlMbHXggjpOuv8AsrIgt/ELeIM7agFvKwIUUn6mIMMZgX7zB+4xVUXNwNOpmpSCwYhtH0MN+Z0UzSMxHYYaB+8tLpCZWsSqqaZw7f3KIXM0H/hgvhcK5piCeyYzd39c/wAzTi9269juCzp+p8zQ9T6PoghZQjwRhLjweitcLSolikDAvDKgIViPmOZ7AgYqUUAFk6oc3CtMKEHuBrfn+okJUp5qURK9FwiZl2QbLgUvuUJULMMuBiPhiMQWS6NHmdZM3EJRvKPPaMcCAQrzQ/JBYw0EyM/2fKWxUxiqGKUXNZhERUQtIs3aEH0LiZaEIAxNlqClEqNUe4GUQJdDuPTR41ANV29PvFgaLLAt8QUJny4UDMJcIwGHb6/l8ELy1p119v7uABRAGiAlQJZeX14ggshNxIFblABhjTqZR4UFlnfIj6t8voaC37sQFBHbVXtczyTb9ohq76MKriEm0w3F54PWw2/xAGCEMS7l1wvjI90AFEMAy2A9z/UYZjxs+j/ECoafEAWTUA7TBDOCYMHI87YYj6AJUcgXGUVnUqRcsZ+tL8FPEXxfB3FO14P71Otv+e0rUnyr+iLMUdfwSG025XwAGCn3K/c+hRBtcfaK1tzDDNEo7mvMtFx7IEoPR7XLS4iyRcquESnJmalV3KUKx22CKUZj7udGh8MY317f2y7pXzFmS+Di5GlVKdMurM0nBKkQ1EsyxBywZnai4lBcVwkL4qCvNRyU3Kb7ydnlI3HYPcg8wenbWfyQ5GsXZoNL2e3mVxqr88BGnBDLm42tQt73ShbfQR/8bNx4qe6Wr4nyE1wMsZjB5gGjAsOsSm0ywSwpAVmYjN73iw+ZfA1BuJx1CL6GJWjUSLGKxU3K5qFKTEwIAa7jQj3JdkBRL8Z/uIjK9y+6IXuX9mIm8xKdtnzD3ZGk95szOP8Ad8oioFiJZ9wskrcwoPtEmta4AVLYPqBiGYxqIXw4iNnBBHIvxGNq2AGpiuLqIlYgBiF6AE8hb/ETRR2/slkm3K9rEhAtjdsgr1FEuEaYNk1Xw7irRUB2xhowuA04qWUJ70yDmVcjUtwf/LPGmVKlSpUwKH7SiKCXhdpL4vdP9mZUgqAPRiIjEKDLDcJe2fQOCEI5oanjCUK9DkDpz63+5RBX5jW/CR34qBErh1KRPSLxGMaW1n48xbYdES+r3HIce25XN5Fp/wB8xv8At0SwBAaFfpP8OL8tqP5+krl57vH9kAqeYHGcMdMWKgYBHNk11t/UroNcRzmIrtMYY8w02n3+jDQWfLjGZn2e0x7/AH5hUGPAGojcv0lhHoLTMpCAagB6PHY1Ai/cNfiH2RhN/wAf9iG1bbVtfrKQBNGjBcy4XBCcXeoNQEgK0eT+pcVHx3AFnJmJXF+pMgalxSLWa1LHEFGGVdQSsSjF8xSWgDh3Hj0uApuPMVSlM9zVzU1BWJwcEa4qgJFTMsSyoGRQQ9MMXCAcJSLcVH3Q+vEVXLBemaXMQXuLnisSDD1MhFWs7HP/ALvlwRH1IRhBbELCr9oJuQIwJlLGkfAlBrBlHUFagmETOxC2hrh0CeauVm+LV9TINuZXAXCDfyUS2jRwGpL1LGEkGkuUFsdKLPDA5dNitDxwx0rhteay6IDdUHsGBcOYOa5r/wAKuGCXLly5SszBhlBiN99D2e/pClJkiThzMMwxubhfgSvqHa9Ezzoh7Q8Q3CuTgmuITEYAa4JcJMAcXBi3GOEcDKuJErioy6JYJeR/o+IiNFmnx7yhHg/MGx2gzcewMAWcvTBXe79iKxXgV79590Zr6Qr0t/QvwS7Oz/wqQt/rzCchgVJ0GIRbUpheIIirjC7VQiS68ZdSiSnVlRp5mzuPnf5xAE1wRCBXpvkjZ7ez+fMsBh+TzLvm8O8B5YpVB+8+aqIG0r6axBSy94DZjk2qixZLY83EgUSo8GoBgChiACjgag3HhL5MxgBUcMQWXuaRqV3NblCu4FnglRqoiGwgKEwKlkxqUdwAQ6B7zI/MeLlXDHKqPQxtKrMN3FrUYdftxLlMLaUKhcAGJesxNB3iJBC2GA8YRSGIfMIdRhqjyPjgsK5vP/blKhWWB8kt7GUI4TYlzLRljBnnDuUaEJUzLeZcdhEYoxLvkl8eu4Aol83Qcx3UdEpe0WIj6tTZ2S/Njr4hCiJxi+WEKcc/P/yEbca0r42+oa3lY9HNjIp/9pYV9cwhcHkUy11kSZxGhBdPF+hagrwqalTcLaly+R1lQKiuZjUAFor1b0+PaWOz7ZlS7r42/eEpZ+sOhQemjmeJUIeltqhxnkmWXGb2Jj7cFolc3MmIS5cXkEMlLv0gCSsRip7m/D/DMVVMt9glisPMAsZsjkuCM0UftBCx0BhhwcrfxABofTcQLZS+vo+I8UlhfSqIah1SiEN2kxwV5nQlBETar/TKtWSsOnh/hjAX8stBU/cIhNj/AOCHcYGh3KuAC2Bxg+9Twd5Mn/IK+w801Lah9iH6JroYybs2rMOCDzv7QQILxAoapuMUH4pH4UxGqG6c2fx9J9PKY+jqFQwV6iMGPFVDMT/wMQAt8xzKlW1NJXDiNwEDEbjHEd4mEQ6G49iWbmGCablg+Zifng4uXwEqVwcm0qpV7lWiBNM8mh1bxLTVh4NQR/8AOEbcRa1ogC2KyNSi0xxoZaq/7FYzE3T+5Rpx3xciTUx/Khe9XBJBWCV7UCLRALTAqXEu4Hj1GrELm8xqog9xgu/Q9IUFHp/Cjibog8D6xqH3RZTcFBcftMo8Eh2RPvQqiXEljMO2fbMpHB07jacKXLCCMZdUysLPUDAlgxFeJampQbIUwQEszAFnpwpZUuYngxdM9hnsM9hnsMdcxrBxFz3yugEAgdEN4hO4XCKswYQ4VGHoDi8xgFogIxXxTSv8f3B9vQ/v2Y5LB3195XBr4n446fzKY4dEx4gC+0tWFPc/qF9sLO5asxJlgFrDtQDjrEOxZnNInBVTFNe8y23jFV9e43+yiMy1L0JAJJXRKGV4RYdMFr+8yoMSDcnwg4kDV5hDf8QwvlEX0/M0mfB/cRbH9iDM5SyspB6aHMDo615+vmZleyENmYHZfxL78Jkzv7x481kfFQ9jEG08ITvt7SnwX2t/yI9gr5/5AN11B14eCPAXDEu3hCOZ7UrVhkg4o8PULbt3/M6+syHLaSk9p0yI4Pavp1+JVIKXlFw2MMFsdP8ADHKb3XK1BC4+nUWH/iEYNcrm4xBLbpMR5ONR8xXELuJao6lDhlKhKebhQ35mb9F8DLjxSvm4vCw1cbSTqRZkPApjU3Dvsv6jubNzD2XRCK3liCiZ1/2isNkH0Awz2jNCu7+GUqFo4PeUs/6UMlSntzEGCkDSbe8MYJpMEm4MeSVJY5hRSZQ4QvQ1VcsR4S42lSmu5hlipcXGprgVayQpYD2/aClhr5ICub4Mr9o5y3WlHxuOWr2Bg+8cENdzBkv1l6KVaX5OvrB3L8m4lwfk39GHpdJ0xFlO0CAdB6DUeOqmG2u4AsfRpUUXB7j0IA2RqYmJiWQAbQ4rU1GLilZ4dYq5So8ENy3cMQYQYcEGbzwcbDh9eNU2wqkHxKDUG01s939EowIyCzf39mMEKJs8TRuK5bAABDSWgunncvouJZUShMdXe7YeP6IO2JWpQ6F1CAte38wqoXUHE6wr8SxDP6ONJHcA3GIKuNpM+89/2P5hffNJUCqAdheX8RsBkhGCxhO8QGVB8QS1nBt3KFxmpWGyKFBPjH6iNq8TYD2ZbA8p3CFYlagBWH+qWI3GHN3wwXE0J/eYNei4VjT+4oOEjuYcCFaoUPCZv7fqN1YzG3KCFaQKEE0YCYyUAt+sq8Q/9AlR4WK0rUrJByWPs6htq5c2xMMRC4Kah3LWsPXibtQsQbZkH3mn5/8AG53NcMeffipnPmJR1FmWRErHEYJG5Qb4EqgIlKnlKLZNsHiD+4CPyS33sxHgdN+X/sUza3nGC7i0QMZVof3oSWpSBnjjybkIwLjjgDaPZ7g1KXW6jMcfIZ4smIeJ6XxEALe/YgBRLvPXXn2hglIH4ZfB0C3gIHGl2nVeIPKh8zQJ8ByNTKK9HAarepfyp941mr8wZSfV/cpbTz/cA3mJK41zqWTpAClTG/VF2zLeAmtn7zFdsBW2EMEXjHoqCVynvhxKiFvft/2ByIfbvH7zCgiIMah5SwwnkzHBAqIXOuFEFnjqPqI++ZeAvuMREr9n8+IbUVjz+rlcuF63/UOFs7vLBWo4yijGsyvfvELfZcfbzOtllgzyUD6HPZMHNTDi2AVMkNXY6iqOL3jd6niTxUDYzEJSTSx8EA5hmU83F+IZk1ArSGNBKhwokZjsMQ69z4iCWjX9+8t3R+fZi+32j7U9T5IdaKel2SprAFmJk6h+Yp0W9kcvFPCPZByRziZ9AcQFg/37+mxGIA4B+YBaJXHceEGoSp1r46nUYa5aZrydn1LnVg4gVCNEcprrz7EIW2zx+vvC6nDxXqoS9W/+Ygri+GOpZAh+gxCLDB1HuzGokDrgtb4b0S+ko7iVZiIZmtwt3CPJ6CJwnPUcmYpqUiMxcRwvqG4cQGxFS0dJSxS7zGjE3hEG4ioxKAgchiWaRApBnf5UzNw1pgNBIpWYwQZgLHODF7hnMNSXELP1AcEHo17ykMrENwG8YnaXEsi6fQAtj+1FBIWrcS9yvHlxZeE95FewiYDcHDEbP54q4lcUujjeoFhsySgjsjhWzDM5soNTwoQGmXBGIVDLKIWNojYUTt7jmAvfctixBTS7hg4qViZ5uXLgw/uRxmCKVS++P3Gi30J24srCVCkzZ+qh6TEn+6huye6Bf0QO5ioEIAwI+0wXcqNbt6P7+kCv+I+2/uwAFqPBiWFVBKCVAlI73GIqVwqO43i4tgfSkdM/vjzrXmA2MvkMzVQBsX8S06qJXm5lRmIZWYIllQExXmPYoEw5lG4c0TTLjAjCJS4mvh6nW2ef9uBkwy79FwlbiMDqUrJPmCDEMgHyb+sRtp8OGNMq+0RYIYzbEraJoAJsJACmAUzak8QCQRTxKYM9PiGR3r+3AdoJtrPtmZ7FCACiBcSvUYjJh+H+oRsjEEpg2UsW+c0fEuX0jtsE2KLtuvmaiDuOXl7f1Au4kJUeA8iJ67hC36GMwp7zcEHibFiXUm25aPcsZgbpqK8rDYwCa8ygI0zFWVHyair/AG8i4rftwF8ni7lROokTiMXqIBsiKk+ILAH5g1FeoFoiTEiArKBlIO22Ju5B/U4qMYiYvcCNrr+qAAlkcFLhX20DTsAyoBsiLh/dE4oFyBUJZdQmWCqVDo0/mUSIXcQMSq5JTccRJlgeX3l2lwHRDEKx4l3LViBpEctaSojQVN2hbii4qEgxSl7pTDawvvlNua+sCsyuKIqvrROeEqbl4d+JU3QS0rqUsxMTPZC7luWPEVAVUrsmG5cubl1D5pTzPcnuQIhNGUKSAQ8eeyH2Klq+4iunyQ7bPT5P7lFbjgwlvuGIQzAZLBsl5q8vglKF9W5hGIN6gw4uDCW4p8dkTmXBDCBdAx90LB8wVnjBEuYsXLXR4iGFZjdOENoxKhL5pJrRBIljH0XxVx4U1xBQvVcIO5VoqIXV/vaYa45uBdtMsnT+Hh3CZ0bitjXTkjMF+0dhH2gxMS62DCXYplPCWUwNlDV6hGSr4vTl8CgY94q3Ldw9O73DzwOuDEXLyLPKMpXw7+pgXHEpGT/d/wCQAKIcBfCMadwYvrXxj1ESuXh1Am9dY8S6i3LVRGyhcDMTABIpbD4ZYx54DqEI7jUxFhnuJSmJdxAwuDnIBs1l347lI5Qi1LRm5XF+gzFIg5jxdwMIx4G14I0Q9kHfEuP+QDaslWWKEalCSb3BCZ6ajEF3nBgxC8V54f2olIBXmYEr8QUzRNPvmURs8TIp+C/7BOb8mBjTn2gL468RrkKwSi7ixBR5mVmWG9ENaZq/b7xDAsVAlWVKalI5xHwQxylQKzAA/JPJDIK+w/fUADp8RtUt+0RgqOJrAAsmPtwQmYqoObl5TSAwJUuXFlzcd3qI0g8nnhiyxXtEbJxAzCqEYgwh5VPA9fzBhd3TChZKiRqUeEspj6ABQVIEBisuU2wBqA3H4n+0ty0yYVRrHvCBkfeJ6S4cegwB7Ly/1HDiPZfyRebALeoWVCv38PvAlqn2P+/SfTcIvBHne4vDS7PP/YUFyzO6fEKY3mHN9fbBTd/rCxAfLP6h5kVhUQsMfuCVjglcBc1wgEYJuqpVAhtg2mW0MshYNRfRf4EESzmuL4FtS2WHDNk1+mWXs46rKF8SxhG4viLVOpa8o50PGpYjbE9kWi4W4YQIDBLOJtS5eNXlEz5Dv/sCbNcByF8G+pbMCRwx8P6gSYF8wmsploKJaP8AWmq7p7x4gcKDkLmo54Ctc2VNwIy4FxPWNRb4C4kWi2bqInnGXNw2dhN6T5goUoa2RYgoczGTrUd0YgA7hFqN/wBRJw4g6QnU7EDtAomkZcI+g4MYxga7CG6pjEJk3ggWpviaQX4Dkixku4FXDEIhNl/UwuoRRcTqjBLAUQTsMtV2lIQ+UIpdR43MFS2zEJ6iOPxNjg4YvUq8SwqYiDK/JFLAxIQzEyeYI0l3Nqh7wmoRicZ831BQs1l+YuODPREH7pt6dkJdkyd/6iNiWzNR0L3AbDhl3DbZdg2xlfxCNCI54qs/x/MD5zQxAA4ItS3bPZnYGWvb/wCzboggkcNTFjlmDzX0gxj6CouarhwS9RSkEyZ9108IRdykPQvmAWED3jvGdXiIxdShnMT3pn4MsItRBFhLgcnocFyxBm/imPMQweKmcK4IxaDCXUKQUsWjghg1GECUexxRKPUEzLYPLytFsY5PuXJqPF4IlXBQojCqEdspgGkPcio6gg8Q4I3SVP0Y5iFGayEeYcmF2JmUIXgHhja6aP5jUKzheYDepr0Hk1HnsFxeBPIw/ch4oj6Ptr67jQS6/wDJjPaOkIpvHfs8CIqZQc0y7g8vN8KlL2wPUFlS7jGMa7gsjYXKMszaajath95lFLg2Yd5t/MIA8R1tgipwWtSqjBco2CxG6lviXfKxi7iYjwx1PjQgwPyS2qV7L/yNT2JVY+iw5tGGteZcXMTYNRQypiQt6VpistqHqmMyp5Y7+0aH+TqPR/lR3NObCYEeTm4tFwKy74OVzgEjLIAcnnm+LlivD+Bo/mIFu2VxrjUTGxKwMFtZkA9+pWP+g+OBuBczxkyzqUwj0i143BAb0McsKlcXFrLGgHXCrUxPCM8RD/8AJGW9QPglgm1Qa3NkEDMWb5IgDHc0vi7qDERUqDw7h1CNTMt3FBKRRaB8S8LqUi5dVHyv/OSDDg9F+mD+7gpgA1hAmPBGOyAWMNamLRfF8XwMK4wgR5qMumYBjqVZUV1Heijs/aAQ7zM3KjTUbP7x1DjlOejgYkqOYm74VKk/c+DYj+5tLb78F8C4wxdG+emG8ZSq6glJEcAf0gTax2HKAlMu9yXN83By7ije/wBwGxjbiARfATwJhFtUojEpqpkhzfptRwd/1KlVFzAJZgRoFmHSzctaSpch1FRTDPGubDfKDGCglwpiXk3B2jRMxxPZHJiEkKXLZTHEsKfaPTNZlbm8ypXF0RzCFxSxTwwxqHZvl4qOJcWLHzw5i1uBapYuFImmCUF3jsan3nYlef8AkHMawJoZgQ7uIxc5/wDd8pQIamno25z1NUazwtFw1xuXEBTDoOWGD06jbNXKNqvXvLm1xFZ6amERi1CYRXiK2n5OJSBUFujKcEMECOmIVX2yhhp0xPTZ+YEdhLiRaol9E+iCu1wFxomHULCFeZtdx1FOoFcxvg3EXbTPcz3PB93GgCUBBRMIE2zVwJ4EQw5gKxCKh0AvxmZQfd/v5g9AX6spWLHj/ZiKND8+5wcBcSVGKEzhMNsF9PV/7zNo0l+fiKgRb9Awe8sJ8EFqDVkpuDcWi5jtZ0Dcr6LfHmFmP/NygRtv9qHZQ7gCmpcHEyxX19oQWQCVCMuVAIG2fDgw4InNxZUsEXUZaviZIQFQdX1x+mZ8IZPjGe8IpRwLRNS7ZzJmMKswGotRNGfQR4DZWyZlROBrhAbgoCDKuJCXE9NAlWr6d/iD6v54EY4ZWUFuOlER0lLuAFJFSmo7L8zqQxXwvFcVcSOZkncYlPDmPvGzM0lxUR2qrJUOoWrcFoggWBowLAMazD4MGAzn3omCj0mZ4Owx6LjwkSULNy4vUsdMZcslLcSKxzHJHXMVHBNkZDuY7czPn/8AZ8oAE8uZ00wTclSpvM+hDgUpmw3Gt9pUcFy12zAqP/gaCoFh7Xu+Y4MmONmpWOzZ4hHipUp6CAly1fUsXuMnG8S9dVYiOz99/wAQlvZSxvfcKMZO2dlyvc9rgY8DUW4lyzlMFNTMgvEpQlEu8EslbstEP/v4/wDuz/eo4JRmUVLZdW+nHwnug8RVCtpXvE8QShUAIHDgppIjLngJhGEC2Z0t4MsfD+Ur4mXBPrMZydZP5zKgKrrxALMwvsisv0MBOggwam9ZmCIbxGAEzMBh8RtdrK2tgxk8nP2ly4CqOqhZuGSHC3UVbCo14zCGIoFstiyhltguCpab4vmuUUWYwLIAiRTKNEFqSr4Vg9wNKRcyKg29SphFjnc/GWPFcWC3hCMv0ha3keRHgjwYmjB/P5x9IsW0C9kzA2wbGoG483eo5xKAMsSBHbFZ6hbl8JLR4De5TH3jGMKQMriu4kTSUiIU9Y2zB94D3MIRaDuHWorLlXiMwQAWehPRcR3MoIt1PAvvKCKPawSzqANygTNTAI5tdw2Zivk8f8OUOiXomfHKe2bSwOacjxHgLhpDNQApgpUzIlxKh3Cb9KAkJZU3HrGfMExLuNyoRc1Lgmz1xEHGEzMXz5i9zPo/Ed6P4m2UOGlNy7Nq/Hx4lBrlvH+/5FYSBNOKo3N6HjzCQI5JY+lLhVssxgHqXnjK0QLN3vcUyb2w8EPFPYnsRQ5nV32/7HkAvREoJCAR4njwG5vcSq7mGJdRDAlQlN2O+47omfkghuK8U7a+h3KaL7zZP2MH9sKoCCXIMjIW7B+4RAffDFmhB89wDfoUFsNWvFSpk9ooL94AqeULDy9oD7iUorjb6JLbFT1rn/0RwVq5R4Got83H1jpEr5huVGIJTMBZ9ptmNe//AGAKwTqG1pDIcmYlcWdR81ModItwi6QTXC29oaDK4zWYSuFF4qXxcu5Xew/LiARmgmmntMv3cRDC/JywGkQZNL+sDrEELGXeoGDcDES9w6OAu+oNlzceBJhNqMMuYjjcWWaiXmJeILnlLVCHvL1FWKDKZO8QXoftio2jpawaWREgEes/aUBodRU4UcQR1dwADT6Hhj7wKRhUVxuNMc4i5je4vE1S4HKj2461Bi5ZvmXw/wDb2hKggQ8KNDUvbQK4J8I8jVEu42Rgchg2qXFuHBO4zJTGbNdwMeiwEvkttHKoA/8AAhWm/eNRrZ9fX4B82pZmxLoDZBNKBfzR+YNoaI722ARNyxb+4/7surJnrpl5tD3p80tFKVErSOweYrngcQTEhCB5TeGWBA7gi8LEVxIS5Yj/ABBd2/Kyg4IfylRYscDZ+hDKAl+BXvEyOTZK1VkvwwGjKWm4KiLjJmaiX+SGlsaffwwgNE1qJZTNnhAuCOl4YjDFxUVCkvkY85R02lSpUyjT/wAUHDAKC7i8pZMGWeIJBFl3FbAgEPOwHTKC4As9C3dUFV4s1IywhO0pY1BF8FrbA9Jl+gYt1sVkeuHizRq4B8CAkVZOWQIESp7omIZh1CbmoBZ1NBh9oUwx4YwX3MM3LuYIu5nDeZYbq/8Af9iEzLhmIHcIQlB2lFDEM0pYUsxtiwM+YQUoAWShMwMCUAceTqCCzh5Yl86OGMS4lZjiXKoijnYvor8wDeUw0jZBqVcK7iQUISGcf4vlL4JhHxRqXHtBT6LjwNTImhgDgqdOFXNfMNco27iP8vC9OzL73fiWN2SijLDZSwfQWu5XEWwzAr1VxvgF11mKwfQEqIO4UKlCxkYFNup0RYlQIRfcJCH2ZhiNLiBdwoxnh4ePPbS6O6Y26VM9pdIe4qogvcJkT8OBCGCGYiINwPcL4Lr6RTFMvlJkoWyxv7YBUd0iVEEpjK6jHzE778Lj2lEV/SLn9/n2hAaXPFbsG3/swD/ncGsKo5xqAWokRJmSralPdcYNeYaBzfqClgo7EEMJ5YvWAdRb2oBhzK4BpywXErnJQ5m8y1SwlvoDVkoRAUUcmULlOLEdL+4N2niY5wxKhKhQYFEMyoQtjoar5ntwqi+o4Wi+Wnbp5qClMGsuYIifWIayfMGY2BMsB1GBCkKhUEXQYlGAAJrlsz1AwxywBYKLJXtEG2IckVYJvdxWVAilw/MNhlsFUwzR0M3J7ykAvcai1nN8VG46irLf5lbQeC8/XEsYHuNkNpqGKXBDfoFFw1USOYyjLDO4rsgALTTE8QVPMmOIVOoXqFMoSnPM2f5PlK0JC2GFe4rEV4bxjxUqVElEUMsXcfQq06gciXwl65Ix6cqgHmu/VcuVArhQex/UBQ3j0DUWXDQRaSzsz3XE2OWUYpUQjMlPLM+ZQtr8wBaP2isLHk/kg9uefDzw880QyNRlQ4rgs5ixLruaFxQzAlO4QhEEzwxCsEFK4qKZQRaogCjhBJHIiMQXO2HvxNEdqhc/xmIyafEZhZND+ZiAHvmC5/goi5d8+4Ek4QcMF0bs/qI1dPviIbmOvHg6gWm3zNRvkS/IbxDyQDk9F+oqR9Vxv3NybhtDiHSM8kxMsYZpoacsU6hhmV1BuaDA2+4OKfSwlzazsrPeF1Gv1BbUbC5MSziawbiFxKzNt+uucscHKUpjcNjHC1liBrBFlC2MHsM+YLEOZWIBLIuBiEgEPIhudzB6lIKiDYXwBbUzWwwommIA3U2TP7llFEFWn501SpRgU3hJnOuoU1S3RrhB3GYGUDRxcCLGZvqFjEpLJegtns54IOvCYdyhMRiF2mY8HG5nMuJ6iR6MPrClm5kzGIgPrkRzEVdy5mv5UVFRUQWoeCm5zqVm7lyi0dcVEHCcX6GxuUMIlek90u8MeYFWTZABglXDPD6b5XHKWUxC0GvWUZRCkGs7blQlQF3ENx8TkY1CS9FhAAVuABzDdQ8U9iBQRKae4xDwEDVdQaRbhZcQVC5VQ1CEGtz35YNKlqzTpPHvCEWbWwOHJEDUaOCPRno8vtMC5N/eXQ6jVUeN9C6ZLfuIAnNCY34j5hyxV3KDW6fzKcLl02/wx00lHEA6fW8JSPJ6ahGJeI9eSY0qhqMaDMB0QNIAIR4AUwdOREGVXCXDESYIrMUT80pKYhiADIwbe4lW/XeJfBBcInFh0YjTcqq6R17gfMJsFwHRmZL7jtAEC7jvGyAsIajSAkarMpxdcVHha4rmyNOYl0cSzaJcTyltRuprBih2TEc1ZmF/3FTYREusMKYwejcWW72YoqqC6lZ2Rd4QECioxjqPiJGNQYWCKmI53K1iAVamUinR4uHMP2IbhI4ZbyMwr4U/mY5q6SxmgmSO9orDjdrwHDc4cENZ5AdyhsZk2eptUblFOIDEu/XSN1WcYiz11K6vCnzXftB8QM4lPFevcTDp/fJy2oADTyvOQagO0oQI8XDZHcm0H2i1gfg/qVjEvqXdQEgMzGhYBIFHjB3xTVQG2ZYgwLzwHEIRQzD9vqUQtYpvp0/3KNcPZwSs+g3cW4Atl4uMeu892cv8EXSVzyPN9IBSjRgXG9egRbCUJEaGWyBNJ1bT9Ylzu2zXyfyTMwRWzqIMVVmQRyQiFegjFJEpfF8ET0nKFvuWLuMbcvOIJXzuVxfooZZQcjCmPX3EwJBYync366hSOZUzwEM8MM68v78y+3MofCEqGUJTQ0/pBHAk6jwhWxdwlApCxqaioJQqFJZL5WZZL6gEEwZsiZFViVqOObqFRnjHYHyQCIQxUAhqZS6pwNQ3FiO8DqMUGfBn9RBTC1gPf+IZtfug7Fq8xKzCo1Ge0SLGMWCJrgApiSo9Pa4v4hUsE1hNy9HOS+TL9UTE/tJaayXy2eLgYjpI9oepoRKC8BHErYeaMq1Q4IJp6qshAi+ZKYUqb83Oo1T94S5UuPrcF0juIwueDZS9zcpdQzAUVuGPUuIS4tFw2pn3PnLeZ8pZMNFweY1mdQwKhPZCnBDHCUcr30Hz59oAMTqEJSfcBHgXmENzqVKiC2KAbPMWpQynXtiKPQ5ft0f3C51w6w5hnZzceDiNkAZPPxDJfCWQMheuUjN8dP7fnrirxD0j46ibiGyVdoXWzpSklxhxU0l0q/RfFwiQ5vmpfXqe+2ajh5r0UfBK4C+VRBRx7Ep65JUcS4FzUUajQ1HgagrREZSmDKuWNNxuUphW2+BcR0jAsS3CXAGId1TDzEWpZiWiKRIFJanXcQHSMYqMSG5liZzEpCj8zAS4xbM7VxhXhFqVC5l+FS4NkphRzUEjMYJhgZLvoQWyFosYxIJaIb1EWLDGYVdH9+8oaJe5jGhK7JkZ/s+UKQGWE/MLgiqWQlrKgrti1xXFcMoHuBRXA1LSxB3MupfFTd+m4kRoo0JmGA/MAKCY2hji4MpCPqJt0xHXKotEL3xAhy+u5Wti0jXAlSpUWFSmiYcT1HUz3NoHcGDDdwlsEAMBAlQsaeMQlVu0z8wgRYRzo3CCDSVQlph7/wC/iJZ7XL8wRRwKF4G+W+pceYOiWKKH8E10Gu79mFhEFvv8TIF7rj+5S/DaPt/cBoIvF8Ve2PDn/sQAYPtqeSGLrqd3LvmhllAayJWGEt1mYnRMMIeDz3F4IR5GMC44cEeLMm4NkJ1HhaJgS4wjwlvWMuXfFzc1ALom7I4jLZa4I1TBfZ+kwDTEC1g2mXcEUwqwDrzMzv7RWKbA3YqJWiBXNDuO0ShgiszAvCVKCIdkGckaU0m0VTtceaJm1/viJRXgauQZdRmRRcE6gPcOyILcCKlzPoBGUWY7lD9mGBce0Gr31BTp+4VBHgeIkaFsEfBjADOoBR1HdZ8cj6lbDnw/05cNQYgOohwgl+oXeyK2SWxq7Zd83KjQ9o1zjtgT7wUo5CmJdOYTHCy2KiRmIXRF1GvUYBcZrizU+UL4uOVEMwY8y8xIwCFPpvlLlhmDfpQWZrfCN5j6iVolh7xtU7IsQlTq4Vqo61DywhCG4oBuoJqKU3LtxMkRVTdj2YJ7xWCr4ZVsX8RW3MmfriLoo95eAR87SXEy+P4nkbhRiKGrg2Xx34Mr+/FgXBQdcEuiuOGw38QUDwBXqUlhgNqvh394eYrscX1B4smfQgUzK6vaF/niC4YWcIGsaMyL9dSoYYtx4uBw4qdwi86VNRfQvXo16LzKnsTshtmOAj5l6KwVG3i7eRcaSmpr1ylBhFqWtpcKGIcKrJD0lGahG5QnlMMXYOJVzzImoEJjcGG4qC+48OW577l/rlBwlktMMo8HCREwUDDAleZYXcvNJhf6hbiHSVMcS/MzF8v93EYD3uONqvzAisDvX1id2B8ZuZUWKcqdkZNMMDwOK3UdDDPDgA/05QUFTSGHZGE3Au+8cKOfBcfY+uIGKYZGj2YFMpFoXDGdyrCzBUnmK5Z4PKlMIgeYVav1pm4OPiC9oAemZ7lDcMy5dxOiKy2MMxa1whbhCVHMA+UqNmolc+tN8LoWWRJEWrmjwXzLZGX0E5yFTrEGWWGawlpvBAQg0iC0jRO9TYVEAoMToL+IrfJsih2YPYQTUtlel6+pBDYnFXl95dUDoPHu+YwWX8sXci+cwjnH8TAge2JnwDrdsKVUQpMkuDUWEqLhbsMvI+8RbShnhN9B4FjJ3qvmUbhMCZEaLv0VyR94USoWmseZeq7mIu5A0dvXnzcFbMlQE3D6MGLftUJi8+PHFS4szwReTiuLjmHR4qOJgCbiQOaWKZXN8ONywuagsphka+Ig3EjFU1MXFVwfViI2U2HUAOL9GsHqeKiBio0ltiVHcfM9xEUpKEZhEU3LpHzBhK4blQ1T0UQwyuKLVxZbV/Y/8jKhUuiV0g1CvuQxjXzQfqGSJ03v595fg/JlmVeCj+Lj9i/OYxS1r4v+It6lStJtoZH+JgYmE8SaTWOeQsV/6co8Wg2P1narZkjccoEcwmrMos+FUrmuEOyL0oxwqbDgjTKWzcpaKfbED3x6B0j0m4XuvlgrLPaAFBzY4lS2YJd7lhj02q83HEMrJRLXTBuBmXeoN+lH6v8AEKUWJ5OIMsNwbzktXWD9cKeLQzRHi+niiuYhi8QzcIfCFtTELtyr8TaWrMCo7GMsJlqFxNQxvDJGtBVr7wazBW4AzKjttXtf8+hBwxb3iNFwSk9Tt4jTZsRA5Hn+JVqqKFobjB1Lji8TxjMCTpB3ATdyFxK9IG1MRCp6jAUSmx3CMdc16CAZVlTNMqCLOBA4TEWl2XcKJXFcEeRvgzE5c8pcWKqM7R+okwgXXC0Wx4uL6kLA1NsTh2olBZL8bcRQsQMDuKjL9NQW2x5uPKXLrfFVCJU95dZjHMC4aLluXqOrJ1TFepXLAuoEKgUq9zEc0bYU9P2YzblhYaH2hxpgBRxSw07pUvsx/T9YFF7S4g7PxLq2P1PZjTH2ldIbZrXuf8g8wwWjiOyzLM1gloUYwGZVLFPx+1D0PxK9RgRoVguAB2pBr2E3JfPgQxLl8JAjBfBEvnA9JdRKqIiDcYB5eDDMsTRMCtsKtS/aJxfFFyy6m44jUsJgxBawCpS5uIumprjeI5ITAIW0V/MY2JXU5IJWtmnGsQYKgVqOphIxCokqUSompLQqgtxPtteaxBuz9JlYoiHUxliywuqFtpwJWYcdoWuoJpBNtStrvg9BFG4hOc8LX0cV6FNStBR37+xMIZgpIhWrgG9ntGVKWI7LgCiOJJVtYsnvMiRz6XhmOnG+7gpwJ1HkyHBqoDu5iLTA3ZAyhVRBTMOLjC+5d8kLqTBaTzQR1H1BJeeciJmW1MgxaiqNABhH0HFW3Lu5qXxaxqqx4g5pDULznX+/MeAKmWJcH0MGv/GpSamUCDljL7j5jmCzPB3jh74xxGAOdRWK4dJhri+XWIYROUC0KiXGhaY4nzLjOiujPuf83AJa/wCoxjJb6+Y9WhoFyptHwfyx2sPvr+ZdUshMp71E0DfWH7P+wKFsqvHvEtGo0LI5nMihj1j75Wq/azAzh2jGNqr+7cKFAjYC3oy/iNEE939ysXMtNzl8QwUc2LUZcvkJXKK7iKkL1KIR94zaFfeBji5ihKZg5Zdx8QLiVxXNcdRzCDEt2RgzuOVMu32gXvkiQYh0MeB3f8RjsYbCGyaaYCL5gIbg3AuqTcSVKlSjjEJLWIdOJH8INTDXUDhdQK2wPdFo8QxBhKm24lpTBGgjWOHL8HX1/UMFHBiX6Mui3XU7uZQ9N0aJRHj8n/n7gBRqBEi0RqPJUeTnqU0NsMoDuoSDie0oc0wyHcKqMrhZfFQFo2fMur2RVZIMvHOenZzaD1MyVe4hNaYKHqFVg11C5jhxKjTDqPFwF5og9jcSwCwrzG4mL4A2KUelxI4hgzLl6JcG0PRxfpuLWw2XVSnXCGIlLeEMANTBMGZXiBlcEZgf+TUZXcGot81HxLhjiOY5xLR0ly/UzLYia8xgdS/mBUFYPOCX45+INy6lxVbKnuY41LiURjOXcfTZ+GViERLKZgUQrGeV1KHZ2zzI7lCUTI+GWVYafTcwElGpiZYiqNWJZfO44AuEAL8Pu4BzZvpo/uAN/QE9jafr39OoiApNI0whhT8/1GG2lbr+Ileo5fUS9yocPHlBAMmgO7l4dvaHoul1maXElAqLfFxgeoKywWSy247cQN5OSXwO9GUW8KsVBGYQVVCi5Soll1AqPFy4jWeRD3DD3At+pVyms2kEQcMsNoFTCWaLZ821vJ71E98qzAlHEzq+3/gFt9z2JUwxZ/MMcgLYK9x38QBBo4uWdwajJO+xLei/SOJ8TtlikXijjz8MCiiUO4sD/Mvh+HyQSu4kPSyguW6cfEAqiVkg4zFlJYmAOUsqOy/c3Lm4EsxcXZjcL74Fbm1xgpAaEGrG4vzh96iAPPiWGWBXBibhpqTwTKXJKs7JXbEQIIEcQvvHFSoRiP2iJre4A0HEbgDrl0ubgwxpLgPNkoQOybRj+2korgjL4rlPQHFRxFjUcsc4jMNRWYmWZSGkdCorHKyN+SWVskF0lB6UvJFxmFlGZdnkYqigdx5vwzT/AAxVoYkWR9peShtgPoQLQojK0vn/AAjbxSvr8wAO0xYIvTk9SrJ9mKpYdLyMIqafyooYw0f3/sQEElYpDYHcsTxUI9tv+QAEobPS4IKK5rm/RUqJBhajIdDCLLlwzACHzmQ4X6RqPoWiXcdQSuGZQJk9NZuXrGZ9vpibDPzmXacPaBbcKZ5+JZQgWDZBeXipUqVAgZqE0plbuCJLDYQZiDeopk3GhAbN+fj5/uXAu4KW2wEqDjPV7+frmaiygdY7YNHB6Blgk1TcDK019+QLondOdExjbfzwRjCyNaZvBujr/sqsHF1FjU5/Ijk8rjup9oBVJ30yvRU1BlpWrmfOSH4Y14gIAYKK5FvbANm4irl7f1MU/UlDs8ET3j2lkzK5qVylxJV0jWLQ7JUIruLYMfMKYMfLCmgRRusIadfqXctvEuVLlC64IwlXuMvFlqpiC4iaYbOMjGimZegbfHiogGZSALwigC4Rpm1/jzO2v0hCW3qzURll9j7T4Dx/UIWQV6RjzqMuXNwajmMfPB1wUCGiJl54G1TGU6mjgdonlo8QSHJ+YVGPaGT0hAzMYwuIAyRtGzsh9gxpErBL8+33/wDkKsE7MY/dteM5h2xe0Z2Ptmaq/LX6Jfm/d/ghtCp4UDMCEbIZ1L2bAywF3Pbl+7wCSMY+zNqX6/iU04hPV9bbS4GBQcD7CojGKZ9mWcogXHO90nk/sg1sIioKQKeM/qDaRtKv7eJkAPyfJzfprgYvCHQ7+I6XMXcLmOEZYMbEG2EJV4/v0hcZ4ehQ3wqTCrHA4TA/8QTseNywn5Rtej594tvLqGYgkEfQ6w2FRsxyRIuVaqgzUtcCBeJRAZVmZpB/KPFXUs89zz7Sx1LhF/q8vIh6CNoNQwshiHV93KlQ5vMrqd1QC1G+CjBYRoy5yxRpV3zcRQIbjtQETzOXMNqAfslS3cInBkVhfDLXSypID4VDi7EAh41KU8fk1MMAOQuVw8o3G6olYQ4SacVd0w1ZxKVjg2NI4Xbj46g4HJADHAy+EuXLIbzwqiuHZLrRF1pLdn0dR/USHZeZgiuXgbjV9OSI/wDV52lxZbUymEoQ0bhBUCyoQzTVGhjcLZiqlsWFUkR2154COI6zFFGj9w6Kij2gOEnk/UC+R/Ut1G2yZx9z2epZfCP5vTNkDf8AmojpJkfeAm29rmEKRdxLgmtsvIWtv9QCLXXiUeVWD5lUzHZOwx3DTRMQobCWnj4itHdv5TH5JqMEyieBlL2tqz4gKUOiXco094CtT/vrA80YfJ7eZu0dXR8YgmsENpJqudnQ7v38M/PVh/79Oa9Fx9BnMwmBTVcR+aIQW1/aJk1juNr34hA5ekFFHpuXzZdRahAo4Jz4mWZZBlQl16TGBZajGsoPumSUcEb6/HUqGXLly4pWLGOB1UoDW2eyePF1KqDTCI8YRwj1ndeWKLqGO0YlsFwj/Uz/AA7UDWdpL4OD0bhsJdlxgthIiOlbWD5iEdzA5AUzQLlar84kEp95a3jjUVR5uGhLlYdyoDkLlcO5VMONDtJawK1EBcIvKULLly4JQuJewZY8oALO4bIlc0KWFhsQbocGIsMxObgNmBcqnhh45xETZdTIwLVdP86gAo4d/BHoY9dyYg2rAFrC8uoAFHKvEuV6SbBhImRDfpInqeNSo44MRtHJxxcMrVzCg7P5iENZlCj3Eri+MsRVG4VT9YGsREtTH1eYAKOF4YLl4VgVNqjiIjQTKn+jqNG2aTUqp4RYpBUcM85jazuCp0nX8xAQHvifgZV+W5SM35t/uZaNN79sJGHjbLNa9v8AUIO3z7SuuE2M6evh/ubWX00H8wo4PZ/uoLvptjTFQi5T3opGfwO2DEqohjbipRD14TSbPiHbQ/U9n3gx9Aeh0QSoPAXHg1Zv0iQUnWn6Q8pUxt/8lAGnxH0EKZmz7lcMVdRB4lLhwVruoTGkCBKqESEeFaEEk0OpXD1WW5/T5lGg35i5k94+Se9PenvRARgsLh1xKK7J7ZtHFZcbhMRItTGRR1Che4rXUJP4ex/cJIu3dc7mvS6qJRctbA1954NRKY/BMsaIvBKCjbAFcM6LxAABDEAWxXPfKpVdJBgQxF46iMiEv0a6iKYmYJXKEAc1GNJTMN2IqyjyS/1y77IeEW+fKbnQqMdJfJF5dz4HB4bhMX6Newxx7uCSwcVwAJ9LMYYBshi/2/UGg/CF1ECJwBDLxAuJXI1L4dC1/wCBiL6Pni0zwpYka2rj7x+JjaxuZdNwCpm4IPL+pd8VwRODpgHB8ECsHoR6lqagmiOhH7Jik15Nw84F6yP9S8ojAxe0EoggbTAmjzKQSAqYASO9hmCsHDMjvi6fNn+75R3mFO/1+Imbx46+kquXh39pTFH2/uZIUeJlxlc1F3zQfv8AfPsUwaR9ZgUae8oj838TDrI2PhilNLvwdMFVZpXcXurtsuviELC4I8WBbAVbI1lcXXBgXKnuxFLDE+vvJXYnz5g1whApEjIdStSkhb4UCZlBKhpSipUGeNkYwQazKjSvUKlsO4hE43cwuy6PHFNp7E9me3PbjkkKkNsNRLJriAwbmZcWZmB5i9Sq7ihlSAi5Sx6hPYOpV7mUbPhp8P8ATyejeoRjKFNR0l33Mkv4439dS5FX94BHr0Vm+W0HouTES5lih+YEK4IQkoFnoIZisGorZVmGsWWUAWYuMi+bP+TJOMQb9NQ2oaoY/UGUcgLgohwl7gWQ/wDAZ2MBLb3LMB74QQi1TB8iWaeD7TZT35mzgl8FevWASbSth4gZlx4WhHgam/QVwqgBX/8AZjc1mWOh++CrEM0riY2xAX5hguDpxdnBHhAz4giC6maguBtzBXEBcZoCPIxjOkdD3/zLE8ab1aZ+lzQwbOMKbGaF36MDUG4rJruGKMuX54uDGYr49tTpiv8A25SqEzvlKoG2I9yHW6xCGJuQZ5Wl9RiekBhBOrxsmanUby+L6PERfZLMrOOmpTn+f3OGj4IELco++OQr9vMHHXt6UA2YnNHlaa+Y8O7Qximeb8EJBb5YvCh4ctn0N0uRzfBBmExGGhieHAwIwccZrgXEqXLZcuXBZJephuGGIwqxcG2FFuViyRKaqAoyiGEt9Xj0mYgJUBklSLV9kLrPpIZYlDDG6liLQjlaIBMW+0D1zwC4legixAt7wZApZSPGKYAp5ZktlXcZPBIfWNPQ941Wh1/9ivpUOAb4IvFEl3U+Ip0EuDUVw4qYIDA3r0kq10Sh3yWadSi+Qy0xKdjcAzv1bIZBlEjLhFouElnCnTMESuTi4Nl/+BGGZdyL2g7fOIRPG+owex/Z/qF3T9mC5gHXCyjA8xLizMfMTqNXcwQDfz3GxiKzKDEYwxnU80zMCEQT8Up0RY9BFWGnT+5TKySjAx0kfBWpn/kVM9J4P9+JpLjRodMaBgWG6itozBulF/uLnFRny/wwGUL5g5MsYniOMS1RpnzBPsQBM4YukitOMD0QgT/KnYnvKyPckpUZmEhLfZIFhBujGirGLZWfz95U1obJvgOGJcqY8WyiIatSxDPBopr7yvu5ilZin+XXmMl0P+WyoI9j+pdMQO4qVAWs4gJMc6ihpiEf1IAUcrRbNLuXcv8A41BYkpcHJcOWZSFehObOFUU4zMzMzHBQl7lmDNsDM225jAXccvENAhnEHwokuz3AlQKmQHf6QeTgYUqp2onJEZGGLpBpanggZpcSLfZwlkyFy42IEJs66isz6PwJUYMYjotPNobqW4Y3PX7RDEE0so+/f9wRRhiLlhLlzYS3GRyJeLgRUuLjg1fLyaM8WupVR9IPQ4f4hgnXpCscJ2RFgBwaUggrkRbhH2jhTCFInFSpUtzcVCyzhu64qRIudiCGi/rEZSzgmY33J10/1Ea0un+PMuMY3FHlHT7iURUQjuFZXFrUkBbKpiNO8whvzAVPsywopQEJ3zXfNYyqOrssfECiUFl3r6OXPDLgXm+frDozfjMMpevLVTP4pAQ18xWDcYs2lZhGIpAOrMTGDfjU8uUdSwwVweIq/wBuUQAJUjFRew/TgH1iSXxr3j+BX/I1qWmfowh58D8wBZwNR5Ol3RxVzdJOwrc+XzBal1a3A/mUgGSC617igXCSMZQiWRxF/wAhhQVCMb9CXiMRq5r1Mv0ZFkK30Iu2KrygaduCWCyZaiLUQtjFwKA5ZcvlzRRAvrKopxldQTNa+Z7J5yjBqB0yg10ssC2Gtuo85nQnB5g4m5s9Lg+TIwOKFsu3lqW3mUG5SF9ynkYtBpAuMMLFFeoKkEgv8kQtGUqBCmAdMaRVSzJjHfoQbwwBC6hZWyELMwbQhdWEpWR8+BbLCCTAmcj+YAJXzKIoeohNQCtJdMhMksKeL5MzUvhQQgkz8IY9NcG6pRegzfw9LLdSgVyw1BjL9IlsEjBi3BlxeXUYUg9JbtmBcdzHLEqsmJ7IxB3KGlPk3AmY+6eGXAsYJhmdKOveNMUZlEkDuVGiL3lJpCERjLu7lRGmZ2whdLPkqItze0DRnZ/MoPtgBWnUM2zSGj9yhPDAEC4nAbTOia+JqCDVVEwYZgS+HxCq2M8IkTtghjLeng6iOiE1Jw0xnUj4lUH4TAGzA5GKRotfvRKEoCUEGOXsRNLkX/srmOZ3g/Xv+4ADTPJpk+SGj1DZPAfv+5UuadD7RzU3GadDHUu/2ZlyyMIaVrqF0snUwDZqCTo6f7hBcWO63UOPYzBrn0XsZ77iV6X1UPsIk4CVcw4aUlQxFZUFGEGdwKK9AkKtfRtvb/cvEBk1Bb7Tan2gLqeMPE9stFoWEBENIp836e0yoCQvg63MY4s1jMGCi+RlXqfMpWWQlVihjQ2w4n+AqBVZjja3lkBPrEKrY4yQTguCMJTxEO4LphFEGF8OfKKK49zCJIYgKDG54a+8p3oxpCCGBYFalBTEu0jEWTMbtiVKf+SENo3wniJdwjx7+g2kO/o1wTfAUCDvZ6ANrELVuX6M3DMWphri+CJKZXmKWR9ZwkY3UPexx8QKJcC44QcMDAlRJcdkE688IqTToyxRQPfcFExHMSDxMNS4maDVaqIjvO81v+oJZqYn59KDFNQ7MuHxKVnfzUEW7ZgR2IDSCWjGrM8ErzAILRUWSC/eMOxGsAZjEalqqNMe8ban6wu7iH7u3T6eZ1sUQXg9AXBSPhmCrP3ZYUkMrD+9LgUYwu8wTF/Z9WLY4MnmOqPYMWSNek1mmvj/AJqK4ALwX9dMuzEG98dp+EDuiXyBgm3/AH3IfWZp9ptCt+feUTmOiBD6uTGuqc5ndp2dPuTIfF8sQaxcKopt23/cQXJhVkdu8F+IRBZeHqNHt6GQ2lD4RbgcPrNV1BZ2XMX3Xj+f4iGhiSB6iDcchgkqCxqbTbRExmP7hMMh0wraCJZwKdUwPQen0xSDb7xbvUrUKFxRKZWCacGpwX7lGrdRVXKEuE3AVSrVmXQAkrLYb46lOlD6VhqGYYUzVp/P0h2nN1L0hGLs3DNSjLlni8pEuVtx7wpLJUrg6BGvAnaI6hj2wwGExEx17wz4KN5ikiVFXFiwhQLSLMG4cL6XMosc8jcQica5dmpVHoGpfpBWcaiAtjF9sOv/ALKj5nv49OGZXcYK8vBmJUeIZPSKwfSSprhNocHy4iQDGq2cEEA4ri5czw6xw5xKtHJXHlgYvJLHIy5llGMRlMyrT805P9/mEExWT6/EFFvMGEqPAXErggDqAa3cOsIQLvEYWgAjHEsp0gAYlVqMu8S6xVcUA5PpUIFC+YLXQ7dEGztdrC3Rp9oxUmKnI8eIqyTMCLipmYhDgyFd3/cjc3BKLKG4Cthh2JFv+pns1kzUUX2x4wTZg8QGGxploKP7ntL5X5u/aUZwNjsnvL9ZfiIvyESCW2+0EjYte2VlTpfx3Ds8uqlFp18j5feBvueYmCfWE6P/AGajuINwRVjzmOpk2ldwDWUUeoDx7waljEsaj1d3Cfz6BhwTi/WEKphcWh9oAahEzB8hKgWVA8j2lNavMDFyEo9Cq3vAFMPj7/7MATAYxmupfBPtLCF33+rmXX4wn+J7P+XtPZ/y9p7P+XtPZ/y9pgVLoaSvEbeIEU6gNTKCQNMFA1slGDqYFQhqVCLft2vP/EqRQpiH1dgwGn3lH4ZbDpw/3BSu4dNmZsZlZbAuhblXrXh1DJAhmjBfB2JTk3ASDwcxISwwrpUt667hSwbgdbfiL8CZd+JQo4mWpmSvTfIZ9kK9WMMNQ3w8MKjsp3KdytPUwzKjOyP0hKsqnxb+vEShZjc/mDeeydvzGrdJ8+jypolP2nYYCsS45ruK/TdxVKOJg3LIZjxUCDhTVYSgZDpp4GCRoMUwAqAdTE79JFkFjEWMHTB3umdln3ZRT7iFkVz5lqexXj3uEMdfNFj8xeSPGmwKlRKlDBgSqNP1g3KzxBNOExiVWoxlGZVhDo/R/MLg1KRNrr+fgiUXMUVM1tMJAGYnxkiGO1Hhnc59oq/ylzwlZ3SraieID7sfDc5Hwl+c/wA8CZUaT/ZjgSjV9fMKdnTv/wCS8U13/SJGIOgiNl+b/HiVECsNa37/AIhqPs/uEW9ynM9iNfHUrTIgCxiHdYmYg3CeBJ8tnUM6nMAKEtQdvx/zhCKVO99VcHOGwHEzaIHmM0USnad8WaNMBQchfBgrhkgNZmWM2D/MeOsSn5zMxW+2IKqU8SniU8SniaIguE6QgUTGDEwSYIdDcaLfhcO5PUAEF2lcI4AxAQQDSw+8oqeAx8y8SvrFwWtXMSGOFhSoD3RLNNiVLMsubqVgCkpJo9BLGSW74HgxBhYMbhFuETLuVolMIvoS5btMA5GZ+t+IKxX8wgCYmAJetx4j6Y8S3ncqVyTTbmE7ibl8rMGyE0TW79BGMGKmosRTT18Dj77jT237R12l5bxni+2JU3F7x+CM7XJ8sNih8TBZP5gViJbmUOIQKDXAKeEAY9OoO0AQJ72ooyTsJjRgRlCD2ztImhasSq7p4hli4CWS5lMaRicK9HxADwi1B8cI7loy0j8QXqYyewILIeZifn1DUEyJcuMAhL5RDvMGO5vmYEZVcInaHN9D+2Cd1/eOSbeLNHzKvn/P/Pb7xAMMfAzcD3j3LaS/UYbmeeZTnHmUKGyIXOK6nYd8Qt+5oIPzAIaidlRpxmvmu+Ok3OG7ogntgX9TD/EK2F0ZZRbjRr/VLim3ddXuGxrki8Cb/wCIN5OH4pcLDX9QCDf48kSg0z5sRyOAhNMd+/xrgmWotjZFVqhA6ehXF8ClOGpl7PQf37RCxuAa4JBgAeIkcCVX5gCz0LxNrAMEGC18S4UIprQ9/Qhj5j2vljjkYL0PrL8D8y/A/MvwPzL8D8xCcTCMBqPBLVLswI3cI95RIiHvBiEaiWWIwA/6kdXpLjb9Zkiz5csHooZrXsxAlvlhIbdfE/ZZRVxLlmI/hVF2lHoeRWSZHovgaRwlxHt0HcM8Vj0JcsrhLCVaFjTJNBg8RjG0AG0uKeQuai3D0qd8Lr/Y5JUxCoPCzE9+SB6gVFqe8Z70fj5mKadfHUYvAWxUDfWg/uUyoIoaiFrNlwK4cAo/aVwhQ3GGoHKc38G+h4lsI02+O1hiO45xAqbqCadzQEPthShlPErudSgNiZoR9sfqZgvsyfDF9Qd3+pbrfdxcSpP3h9qe8w4MFkIrt/USyN7RQXcEUBUdNxQwQDc3Bl1sAQFwUh58y1L9BmPAaem81xni0LHTO4shfDFjMw1+b/yVMk1/bDN+QX/YnRQYjXC5qNYO8T28BWSC0wHDZAs3Na3DNnwT3qP7owU6li5EW0dP8wlrASyHvFC1TKGYFQEQo2nv/wDJl38nLEBbMoKfQROAPRHO/T+vQTJ5v7w17OYR6UQ55bie8R8zUQbPDKGV/BGyIuqgSzfz/wAmWqvHUukobJUv03O1DUWj/MAwIPBb4vCN2Bxy0+gjQjGoNuCLOY5cTNN0H2KjmV6nWWqO9StcfdDVS4PqCcT44x/c9vMHYjiYJoRbB3KADgSkWZBajmKX7lhKm0qJKISlXoqo8laEoYALOSMMwm/EAZGJGX6a0++ZLudCMovcy1axEdx7ORqb5OA2XxpKV4YwsrcOoRmPtGhbBwItCay81G6SNZtUHytRUSyqhnRUyJgK81n+IfXEIaJaOkBwLlxBl55zHmWIeobeyYqV+kFbxFnmVauDNszolSx7O/aA8EACAdyjASr1CupUW6gCAEDCb5qUwJ7kVu/sQ2wvDk/5MsMdmZXxh2VwbDKmdn9xKjKzKgyMKgaEBvUsAzJNX3f6jxxL/s+0sl4VGFvqPD5JqjyRm/WVtDulGmGLqY5jwSxl57vddEVlwEaxs0iXLi8AhiB2wgqjy/36i6rTz/T+pbJP7mUMyGDoalY2zIXWJ/Mev/KmA4IwWF00ke40n5gSzo6msTEORD0eRWHehUog8jh5AQ8+gNjTAC9o1M5qEHPouZZmuAbLLgbkSesv6Ze8BhIs+4QtxyobiV5mii6PB/twAxH0VcYsuyNTZUYogm5UZcY8r+I8pirTj3iQtqlxfVSsLRDMsQPUpwASoJrRiy2Wq8wYoyzmdkLDoRUw4gy4VXqGZiX2HzLGm5Ye8Y58SBUvl1wchGa2ubl54YM+qXWu/wBOpj17gBGKrdwZw1X/AM/E1j5HwhDJADZ6BqPF8BXCsqCvylCe4zbnTMMGIzAdQm1zEVIOksqO0mQzzf2mLrcNSv7Yn4w/uBURUtiUBIlxupnyFyZvWZUcFxTVlizSCWMR3K7D18TC3PnuDMJUbK1BIM+ZVocVR7Rdy+Ufh3BBZF4C4QhpWE9T4jlJY7i0Qmx7M/iWaUpiIrgy4nZC5X3hlCuiRYvxpIALUlnGu+vjPf8ArjbW63f8fu4ctf8AsHtq1h37Zj9i3crCO4rPz6WHrIqoDMkphhvDAha32hnmnyRzDT5NJ/tkCAMEcRI51H3gqsmMrX4lCKCOZ9cQTTLx8+5FceMSs9Wzk9Z4J2Lf5tHYQ2SVZhpRLa9dGMGPy6Y5ldckl+f3HCOWEMzUuV6HZegJ94UWh+IXlBhUXUS7hbUqOpcnYvCUtlwiCUylP8wbhJAveo5q0uG/MAlrYApzXJGWwWsYDxCrfSAksYgLlS3mAZGBw6AQ68+8E0H4QpyPt/2f5k/zJ/mT/MjkkKYhOSGbmcXA8IiJbDu4jvuFWhxhhQphNh3m6e/0gyx4lcq5DfY7ZXMBLIGy4XCNMcLbhsvYnpvgPRZkmjA6cazLuNimFdif4iXu1N8Bv1Jc6hMoXEp3cs/k38QmcD/wtVLFDLS4IIJqHzruBWOagsO4jglwbliY19bls3zAqfbBqIUPmIFsFFMy34/ExMwBTA6dRJcPiAN7IBpwo4iBbG/PRAzb/f8A2AixEy91FamDcyFEViWaex8P8MxVZfggxeNwQS4Nl8BAOI7nqCOuCMw9iGc/+BVXc1TeZ4pBHsiVBECuQmCHMBWYZSoUS0f9/wAihWTQf37wsiJRHcFHoImIs1NS4wIlcrHi2Zl1Ct9wYD7uvYiyYPzBrGmfEDJiCnErpHHcwmGGHEra617fzFCrOhZ9e/zAUa9nX0Y/WL/j5g+xOz5/r4jDone/yoNXLoEqjjjERSXc6/p/9myXwvYV/OeC7eL4oRgtLlI7dSneBqXKU32xZ/J+4wJKDXA8UU05gc3yllTEvhxCNemWzd/qY2v3luEefzcObm5Y+XDRqkyj17kFSsL3EDuFsjQSx8oGVKu3OZmZmY6z3uHnxzmECamAQeity3W6l4ETs/36iALtfE1iG1oeS8/WMAHUGlwpwIq7jkUrEJrkJYwWRlMOg69Vy/EGzi+A2i2GvSi/KJbwlwKhL9Cw6pY7IfozNJXV3DPoI+h7NpbHTFI3CKVjHDQwVoZZDLkvCd/WHuII7FRaX1MSri2WUURCVW+DLiU/Zip0C2XVYKHq1o+hwqJYIwhHPBO4COw1LUXLD2idf2Shgo/MGjxUOCsEKtogvRZM0fHptyNBW/Qg7lhRLVP7wRgV+oIlksCAe6XS/QtRRRiCsQLDiNGEYzCVSMVYREUphjUhVDAisJbmjeNM0pleE+opkJqGF83Gi3iOTEoVKUii3wMYywFb29H/AGAcRdk8SBbj46jGL/u9kUERrO4ULjKdSm54TKOtcRtlPdZU2REFMB6YRb3QI2632emZ/wCnKOgl1n0JR0pcYmAfkhPTFjTv+OCG0TihwacTDI2jwv0GR8nsx81bIA9q9DDL7CXUG88pAjDNMTbj+IxJYQDMtLSyziGqNLD1ixMmCsTr5gl2EC1TKspT0BKgWypUqVE0iHhnqeNzEiigO4bCNsnUOEZQzyagh5fEIUg7UorOmUFHAx8yhmXc+MRlUcqQCyOmMQK8E2X6gVAphGJwLMQHfFcVcLGHru+KjDtI2bMWJmKvITu8zfqOFDcxnYcD+0UEuA04i0z3dx2yAGuDpc3Mq3EIUalkN5gVAPRBdk0e0qHXdvftLWxr4mxKVTPBL4KcFYwb+sYLisPxAs1wllQQHDYvKY+scyEIo2rMFfBzXDpsvTwvFSudxDuV6JStRq5DwwrnmA9wTuajcyhKWk7mOCHEAtT4jdtYVTMvK/MCUw1MGZipmqdwUwCjAU90pSpVvaV6CeGFRdLdx8QPQy5Q24IqRb3ET7B3/wBiQjasu6mIvURO5SFbGyUSyLxPdHNkw3LOp75huYKtNfPUXuvLWrju2Ln++0co29SrAzHuACXu7SvULXowmxAhONzQzWX9pa0/bUsxqU1fmGNexKVZytGFqI1HLhCBN4y5YjMMVS/MKEIfrXiOy8EYS2PnEq9+gLlR4VSwRHQPFz5SE+UXlXqTNxzQzDnRDsw5QxcfMEgy5cuXHWor3M5nvjnKzKClQPMIKb4JczueQi4xCKSmPXbYELFLgZWOEspg4REf0JXNc98EX0VTj0UJcqBEI4fRnvi+KRvT+GCFsR0Furhgg1Fv03FqGYiuoW41ZIDViPcQLIOKiXLeNyqIDCajimI8rBDbR7e/eWTwDdy7J8ElJDXcpSuVNNy4NQ6mNwK16CCfPFbudTWBTbRBAOub4NhKqtPFy+KhiXHl3CIMXbqANEYZZUuibxLhsJko5cxPM1C1fXB3AepXxKZBG1z3FhBl+jUHEy6Y0uULiBBzc2YUevBFBbAUKo6TXf8AUr65EVjiL3HZDzTxBbOC+ZSUu5ihLlmD/YL/AFCShHb/AGIHWGbCynqxr76lYC1sJ+Ge4kOPRzU3IRYBOlv9fWHzqGYZ5eTcf5OTxb94Q3Hxmb61MQUsavgWAYls4gi6uW9QDARLIi/bKryYecwY0T2fWKw8BcSBFeUiNbf97wWijgzGAqXw3Bl+hyoiI3UeUGbwMpRT+PQzXUs4PW1WPVwNEHDbEU3zBixUItTZFwTBiEqAxLWzEGUBHcxQkvlyi74NKXH0vpJVxINxpLlLONuGyD54Ws1CV6SGdTAihuERDUGYkq2+8QjPfrJ9glVfzxcvev8AZnwuACYR4XhICq8k1EIOiWpdXGNlvLFbR9YobrmfEA2yx68jogFJmaVwqIApgagNQmTuExwzsy1XxKG6110H+7jbH6hUi53NSuAe8lkFlcEqP/gSoYRFiyncygmPMMRRocR3HvDHUyGfHEGUoj5mj03WYOjiViYgg95+PvLEsl8LFljhKuOkah0tEELHmVEqOCFfAtPz/cCbNTTgtSsWGr8HwRIRlW9xkytTFh/9QkrBh3Gmp/OjNXvgtrHnNzwmxL4HbqvtGZGo25odxfrhRBrlJ/ZFcMClzFXNzctNO3z55AKyiGT7wADUoMEqGJd8MvhX7r9QgFS6Y+gxmYtQVhffKZW8V9pbU8lnfmZdSvcwwEoh6kJmMUUV6l5mQURYijCtpW6uZNblx7wgQlisDhBwwHxGC5UZiVWeKbuESEqVyEqJXouVMxYuaiLJYYg3mGfRsuo9AEPtiuo77/Mq0eSxnzMDaho+Gvh5I8upeWxbiojJhuxhFBUTLxfocL5e5gIgwjX8st4IAlSpRHeJkUmtkQFXzN/WKINw3cvjMMBwuuTh01m3r4PMunPk/wC/UoSpQKgJbZeax2/jgZuJUwzK9QXWm1jhcVSLY5Q8vWRnd+hM4gQcPdFMmImIa3POecq4mJermAhE4AwQ5OLnUYCQiBuMQ9iaIpkwvJlVGr9zDRrErsjEk8BTsoEjuDVaeGXWkzPOU8y6W3RXzq2Jlbt/2v6gvqgsitUiOomaOH5gapbB91qAxArdLMoeAm5wjJTgSlDbDElU4MtSuBmIlyniCpvf3goBmGjmoRiWS/LuXyxEahZoRAqPeXUAPZg16CUXDXC/RUuXmotbhbUDt9K6waZFeJnCz3i3GyYZ2S/PoqVKlSpSZnTL1wCTHETCHiBiYrmRMCLkRnshFoWVAg1O5UfwpqMCLIFyomPUNTcSEYR9DiN2vUGfZFsqLqSxruBMHgTDkCx5OeviDDPbEyFvEZKuIPVcCg9b+ILbD6rnyw0IG8oAbYgLkgq+LckH07QUQzEeYpZwtQtq8YC2WRKDv+oMFYqAlmGYIzKcEIxjaLkueSFX9viGrHvO369Q8dBCzc3qoWUkX3EP2RhBQPiLa/LM/B+YBtiio+8oczlSzqJrlqQMrUvp9dcXxuGcQORqFMREXFEfEuPKXf8Af7xLjUViMzM1QgcDRhjm4SOzJEtmJkxHuIaB5+19ogLgXl4AWsymASmGTUuAxowR0RKjq4bwxRhmC2WTzb9DU+mo+CECJpjWGFe3HxCIdQDP/ugD7DCa47dP1lHJxfDcl5iIGt/llerhSUw9i4z1L9F8Why5iSwap6b4oGp7OmO/jf5hSWShq4hqDKc3x6CK6MfUwrmIxLHcqa9FcEIwvJMNnDEbvHmBZSheH14F5eXl4mMDAhMcTPktAzLauKUhKFkTJB4jRPCZKSD4gOuLiApmKfUu7NRS4vpIkGZY8dcIjwm6l9MoimkCcsTYhrLnSwN9sNIM3RmG7qVLYr3HC3LmDEGUS61OkoPYagoDwcX6G9ggBgG8Yzst42icAmjBaSWdEExEhcDdsuGuo6Sl1tFlpRiUMwK4qfNUIASuG0rGASGoaKCA8ueLGLJAjGpQg3BA4CQygT9eipe/LLVZ8WQLEQZR1f7gXAlxHMG+a9VcC9S4xLzLi7IQlT2TogBUvoYVlaZkK8zR8wZcylehtgEOL/vPhVhN1Uay+DCWZ3MSweeoMeHCZFMTLTiZAnqzDCpczLUSMLFI4eFCNsDSDygiwxjsMwJTvgg3/KjKBmM7IdEXj2PEa0wO0DdxClRHJAttjxddSm4EqVwRQJ9nktWx1YOhp+fDMp064r0WcE78GnuB1s/Mr3T5x+4Lavi+OUkGY8PkP8cJZUbFriFF6cIjcxgNKzH1CMKbMx5mNRdGbLDUMOhAmyioeNriLufSfSfSfSBSKgijtm8OeGcClkyxAQtUSqqgyiBWZsEMZNJzUvW07i6IMfQR4G5U0R3COPQxjUFbl1ie6JNY2blXDKk2UE/5YX1KIo4IwR4zDPzgwBTZ4HgwwP7lG4MelqOoZUWKGPMMRb4NxQiYyFFcDUaTMwYJW1SiPiCk67goivUGzmwLYuowahiLy/BL/EXPaRZqK9qu43z3g/z9xt2wIlcOUcwbcfj2jdQbI42QQhjjf29FMIlQyREMCKCOgqJdiYa4l5Nwb9S1DWeFSV0y4oQCLVTAGoSWgC1i+5dPee7iPJmZlRqfmaP/AAUGHC0XC1bt4qJGMQcMoFEeCqOYAdHFPn2lee33hL9dPUzSzOg/nX5mKKeW5cuPf/6iYnsLcAVQtfF64io/MULuM/1fKVMwMNK1CgEaaxDNMXqTGT/h/wDYxVBpIlEmkuYZTr2MJsslQI4l3LrLN564d/LFgbGEg4WIS8S5uOIYJZ1LGdStNkrbfYjixXzxItjrhZdQRXFyzjDhhqx0e0C4tdEQdzhLgulhMvRqKuov7JdUlIAcURVsc6j7QTI9TWJmueHjcPjmyalRQQL3M1wMCCoVxamHvDg4QSpV9v8A5XHPASonBHcC+FShMwxuV5xZE82CQaWPmBv1ElyunzAdI3kMpQbmJuJ5RKFcZcLdx2stB1LV7ycBKhAO3UzjqBKhKaiJtFn2goxiWdsLrlelZZQmYR23BcCFM86lbPqFTtimhgDBpiFOP2jSsG3YI8VGdPDcJC2JrNE1LfwQ68X8/WP9FXPchGGQ2gNSl3Bio9C42alnFQpaSFOIS269XhCXNI90d2Kixj0tqVSYlGw7A6QXVRsVLaqXbxMMR4zFq8y9IckeU7grMqA68alxY8MWMc4ZagD3nWhCJ+o3v8iX7yPdQYV9z/f7zFbSvfH1i4rW2Yt97/5GYabX4/35mGJ2jFNmBSc2h/u06w9oynvgSYdmKxgthBr2/DTCg7pXNHcADWvzA/Dwu+BdShVHRRDEZ5n494cx5vn5gk8PZ4fSgUw2jiCJZCmoJiHcqaa+I1mX+PtMIDyv+KjLyytylJ2Nd/7czrXL5fMLofZGboH5/OIKhR8If78w47RTGXGorYNeP6gN/wCH2hnA+Kloo+GyJUsku1LUwQUKhffG+KmpcC5UxCBgxuNbZBOY+c+c+c+cwCP2hgNT2y5x0g1wDwGGuF6iLk4C+A51GteuAiEeC+/RfFy4xouDZfAxeLi2TzkQH3xFDUDFmaMUQC3mHIcz7ntlwG2D6CL4ZslejEQlz1AnuKs0mYLxeYtyuBkCPwAy3se396nTTwZj9mXnuAckv0HAS5lCE2NGNDfKgWz6HnEeFXOgiF0Ne8uvRADITXAcafzEWgU7YitH3I8JXwuvdlwoTtZt8H9y/a76QbFUUVZ+sDAEM0sdmI3pfPf3hbr7nf8A2FoKrwtov5h6OuMd8EoCUTfoAZSjqAZ7IA6jUR3LsxxZqDzFCA3H5njKlwt1BcDG4MIEeL5qC5SLiYtwamAPEcyvQvLDtUKDoIOjdvhE1EFrq+n6lvI8e0pHwrv6RpGe/IfEpkf3A6uIPVA+3/Y9sp3LT0czS/5tKLEKI7gTbPLnTwDuEpbHNh/MZqMABIkrkrRKcNcI6gTLABREyMBHK6lu0SKEY/cjR6amGoZg1FbUqBRdxGCQ7u89zcu/MwHc2B7oSEitC5aHOr794/8AZGoIVX84iVYpo/2oTGh1BlUlj1agJeTGhaSn+I54JUSVBjmPIAqHgPme7Pdnuz3YtkhsuYk68TPDhhD3hAgwalCyNbEqWYsdOA/DuAcjB4JXCYlqLzzfFf8AjcMmf/HFSh+ZgK5TapTcxHBS/gS0Zhn2ZZuBs/mDVZBvGDUGhs3Gqy8YSZxYdwIFE8qITylR0DRAO0wajK5GooyuAjwLmH4KV5IvTLK8sSR51GBRXpU71KSY/lgR4U0n294wNBa+ODMxjlt6Jrq63p8ws/AIdRrkhblviJcpncB+nwQufVtiDOvuTyJb8w21KlcXygWwrI6T9J+pAnjEczGOrSdhfvwgrhMVOsxYRYsErMyxMoz3zNHcaCwNHvNfzLr0kQFwtywAVAFIzPHvi+CPBK4cwOZFPyE0taflhVqe8yk3r2Oj+YGoin8ipnK38/iWn083UNtB34lGyx2IxPUeIZbNz5f7cpgXE2ZiUpAFQE3hLHQ8e8uFFJCv6dehipaB5CK2gMCVwq0IKK4NwxiXBFMDp3LlofEuXn+R/frwXFlQDp1xUR6Q0d4epQ1LAdSnLadePmAWfQB0Ln8QimI0f3CuF+xPyoQMxIgZSAryx/xcZjCVVd2QjngB5QDSU+JdS2XxcUd+gej6f/RNBeAqA7mUtBkqC9SqxBhc90I6SwiJhhyFMSuW+/EqIDi+GfMsdcblM64ujHB6CPJH0OuCCmAKkYmmMXdkX0HuF3lEpaJWPaOFqoJFxLKhupuElNwAgoRzBDAbikoYqIl69z+dQu1cvlc1M8nSLUqZt1BR8bldbyYFktjUn5jm/wBoxq4wXqDfoEzGCteIkAd8OTwwqNBwj39QPbuX3hKygPfAnxDldQNOKvccfqwzEsffZ10QcR+s7ItjL8yjBDLcClzMtOpdgY2gXcw0EOAQnHFR9pvjH5QRs+IkvqMTpljUrPfA6iLY2RuBBMT8/wDhgudsquAuG4BhT6zxTHZNXizB75ip5h/AS81h/h9Ymhgq8qK9e5geoVGtF/HcL4GZCxBCagTDKNE3HH+P5RrZ8xWQQQ0ri7GhEtsW6/EdhKI5XNZ1GQ7PQOAWw2u/b2g3mNVLi3GREqkeb4hA2lWmGnaCJZK9GLlVDuAKOFd2gG2uR7uU6GuH/wCzMWYbeM//AGYupl2X1M30j/5AKY81mAFAIPQPLj7dsZmBeVxRCx25Xy9xZfKXAFeYrnTCeJXpvgjCGZbwy3hlvDLeGYM6XG6mZDPLisyiDeIEMwgQWgiKzDBKqbfUFt9LbvqDeYSzhpTqIYYRpPzNF3zVFwvvgLjyublcJKuCH34GOSi1tPEvGQ2MFQvt/iE4gcAWoh6HvjAMBolTNoTJYiaW2ZeyHUbmICbtfgz2IlSLcESP9JB8Ny6HENisQbgqVdwaS1mVqr6hSRAjB45qBTU1DcpnXBPbgGiKkwTThOUGlkGyxl9eoFEEskHaYPzNQYsV1kRyoE0jMdLZ9YAFErjEpvaOlwxMztLhVntYG8IdoFmaqI0GAM6RAMpNQEuMdSl07iDBAkpApuJAERcMN5lPFcWfERpKmoNkOETivSlu+aWLxTl6LjmMY6lXDJv20jABZ+C+4F3L2+8NNMzu2spUahnP9W+c9/1DcwZmWTKdxGbI9/4YCevXTAt/RMfcxMOszL/5tEL+wQYxM+KUUwHlG8QVs3KYm1kB85jl/O89H9wB5YCFK3/EuWpqIkbTJz7TfoVEKAeAiXWJSi7PDAex4zajYIIVit8WQYPMeHkzKqGq9t9H8zNrvmEp2COHfd7YQwVCLv8A37hVIvwPpdv4i1VOqwHx5+sd/bAuJzfCCUwSrLuuyXAuVxTK4RtBlZS1hiYmJiOEiBh8RwQswzDcLEINwziKE0goDb3g1NxEqVG4heEush+YHlyglMyL64M5lwU1mW1bFNYlbao6qMfrcQysQRLILNxKly/SUmCXLiwRhxuAJhFY4vXxslQXw4fzAJiHcl0vcqsj7qneGEsmHMb6h5dxEsoQ9riKeMK8khxMI94uOWLfrBvyH93HsQeGq/UsYX1FqKPcqtuXh7EU0n5i42l8GJelImMzFZHxvMtRcqUSOIg7lF4OKgXEqFyu9kU1X9YWZihO/g/3xFnAXt/2Vij9KiABlmr5XBacMhmzLoIIrkjaVxcuCLUx4e5muld+3mdmF6X9IsthVpfriYwCNU2jUjS+548IAiLJB1G24SFy4bLJUuMpsJY6hlrHR7aExTHKIysQFUwEplS5gp5IlEX15F8i6EKAxuoibT8nDyxiB3CMGGj6QtSCqg3A2RgYljuOMkW9B29TBPc/L19IilyjqCfuL6amvA0EphdLmw0/JKLX/wB0spygZR2XKQULRMpuRhmC1MsWop7+YmfwEv2w+IFDK4QFMudzw/wwfayqhmGCvRlnhJrkBTAkT5ShiKVZgXAFMLDk6jmVMCBnROpbSj1e/rGfuP8AkAg5yr39r6hZ39sywsOCVc8NOH+JeRb51qBwMXG+pkRYblJZLAINkiaEv0pZJcPaBPmOPuCHmeHFd5hmB4RtiU1uG88cDDMBjTUA5ahpFvc3w4mIC2G8QHvdSzSwF7x1DZCMsbgYhQWwCWcvHXGjkjwxVfnjRfBDelhoyALyjRF7DMIW6QIYgUVKsP8AZAcYmQQUr56mSOXRlifd8VEyl93+pamJ6CFAqnvh9RNcXbEO4AUcUMCIJSmmLBFApblWiMtdcBGGIzuEygd7+JW0EeCah22yH87/ABBAd5Wjcq5iPwjWcsZs4WuWXGyXLT7dQtw+JdtSyuWzMJVEKiXiZkzSTvqI1t8RcKq/MsBLF2EWAMxMTU3wGurA0sAh/lT7ypiUuUSA2qGPzMi2XEoIeY7Pz/UeCPoCjls4qOGidxRWLyzXDZT1L/zhsrElMjqCgEHzBIRZMWCjo+aywUSyWx0MXWVsidPRPL/TlDompjjEC2Epr78/8lSGDJyiqhKXhDG+NyuLh5GGZOw3EKCYQW9j/X6bjCU4eQtJCC8LGhFs1syfuHUsBI2/VheaX5xALHveHE+eS5iJ0RW8orwlVACUSyBvJA0mgVAdjAormpn0IDClVENsxVcd6jmG4T2SxwusQYVEzO3Hr2lWj4nvDxyEQvi7xFFumHsw9wAww2hxAz3EaGMBCshAUzNTTEqHSBzbgqWS3x6L4GY+hiOSmLKIkwGH0/av6jLJmXwwsiYUgZe4N9jBbWfDqLlRbfHxMbmtis4VDuZcZ8u4vNSvX4ECtehjiMKyUMAOHUCiuBqXcWXBss47fU9vaUKOA4ocMvJioSapgdqU09x8e0K2dnuahmBjDEGZsFymBEWN6x18yzVwTi7ihuUr5cJFQJruUUZnjTBQ7YHFZNk1Eslt6eYWRk94yiqYJzY89/aGhew03/8AIHZEqVfSAbVkadw7lxe5dwiw0zFgo35l9epwekxjkAOpxCBeHhjRuMrlyO4RTXzcIwOOBChcZQBb0HbG+WfJ/rUF4mc7RbChZEutpVx/u+UK5y5FobLDhAkRURhINyypik3GPk5KmLaPoJ6b8xfAupcBfswE61k39pcJj5FTIQ9N+mohDsUjNgmkSUFCe9N/mHOhIZLF+PnxCUZe2XKYYBpLigYzhMM1GY46f1LoGpZEZMt1wQGkWLUYppgBfn03DMT0JTK/J7y5ykI0z7S4mZCJIQCFqvMPeFsrhtKS9pZMxNiCOp7enLMXtMbAFIjeljDQyuVjGa2gNhJg7jZAFnLxRzfoM5hC2OyUdQBxLW1UAxLlI2zWYTxPyTDoiqpS9zUq9Neq+WgmXSuuFri5UuZVKArl8ep05cjLKVUfEyZ3Lvi+FqMEEJNIGIFmjOFvlzK8YlV8I2UcUAmGViYtIZLMsAQ1Tr2ixFqYRcy1kK+YHZJ2G45gRBKliV/RAEBMFEuBZKjVN/ELKBfEXzP1PbNLzMR9Q394rwDXRh2T8aj3UxaRMylZNRAStNwU/MFCAcymk8GCBGC4W4l1EzXiBrK5cRaLlq0ML6iVsICAO4ARCEw6Iy/C7/HUNJTOxNqz1BKjAu/rj+57eN5nqIpxiO8eYN/7co7QghgqYzYv9YLZZMoVSWG44hWeP3KmoZiES4LqCuQMup58cxhg6wMqDctHsdP+8eojL5WjMAbyuJnCDxNJ337xs2qvvGcIsLp+vgfG5QwEuXydXcyW4g0dkCyPL7RyPH9QExhcWv074hXEOIxlSpXF1Lly5cwErZipgFKjqOoiY7hmaZgeJhA7gVN6g1j0BzrgY/EtIw2opRHsS9VwKQWUl6hN5VoQyPZhlXs8MGriD11caWlk15gjqdDMNRZIIFQgsqMACVLgazBCNQb1K/8AOo4gds/I8V91EBnE0SprRFWfD66hVUZnl+CGAZl46N/EALZ6KgEpgtHfOO4JYyzZAVvYXZbLs0+ZuMB39t/MLJGDY/i4lgFwNVc76gGji+b4cyhwy9lIw41d9cJK8zUNQe50T31KHDGoXhKGX0QlxPzEb0Y6LF1Egx6OKokzEPHxNxvh04oqNIDhwxhmXeUQueLjhjmMZe1RCTawUHuIAWOAx69ogKDNN5gqrb+Go6lHM1qVEtElUalamQ1FuNAN/wAqAecNhMoG43aHPtECxgycXa6lk954uDUuFRIs2RAXEno68x4xKQxwIZ6jdYieZFtJ9KjlakzVHlDSYeAFsxplm4y/I6/7CKpLs/rULtJ9P+pnCDqW5XXT6PMBVCr3eo2Vyi7/ABLUwGWrBc9gIZo9LiBgGhnxiM13xcHEd81KlRFMxQBUF0wp3ClBXFXcs7mlQMyhqYhcJUGNmSeXrQ6YxbXGwnN0xnEORXK4Dm4hwwrLDqXIShUthV44v13MMewuXZCVG7fvCgojCHAEZgveOi5Qqe8vl9LNwaiOS+xbzYiaIsQMzQSo4hqa9OV3UCVm4nnB9o9nvgxxdssd4zEFe8o3NjeTCf6NwNgHtF21bhKJR94vndVXXmFktKv+/wD7MRbqBURLaduTYiFd1NBFhLHXpAq5i+2DBQSwGFrUH0iE0jnz94FCM3wxy7hBliaTP0lhQS+hj9RIbVxGrbgoJ5mY9H35QyRIsg2XL4qkVIRROhFvl4YkSWs3X7GMxcILsSUNNYk9+peHLD/czZmr+kobiFQOyvaYC5b+ifMdrWDAgs4VWa/lcfbxIAUzfVj0xZr4jKAbYSzejmuRjAXbMlq57E1mXbwvjcVY51Ht1MVVFqb+HUrG35IFbDzW4nX2H8xqFa+YYOggXwcwsYfEcrTUEEcMLkbINCEqo8JeIZapiy8xmk0Ma7IN6WrRLnXKMJww+YHQU79veJY2h6Lly5c04gsIQgHDAmLholSosXM9wQbhCF4lEslUXDEODG4S7gcV6EsqEblbqGoOniFsLzQtltIKElWdTYMkV24I1ATWnUOCPocSlsvAxfVQu6jkEYnbETmoe/oLRK4SIRNJXvyQbK5NT7TwFjE6i2S459BAC2UFogakZXot0nK0S5lg9iBXrWi4stXXtH9Ma+PQg7m/hcCYLlLaSJILIBpaA3RLlGzzEOMmd2j0BLUNHCABTkjWi7gmyXcuPtFvgA6hLzCQ7XcGVo6FZ4XcNiVHhCwRhgVlgxiPFxhOeDHDwO4xhsupVDvP3zGPKeDBlMpjcMix+xMgaB9/+R4LOIeP7gjqIAwAjWL5gwdQMQivL+6O3gplxsQHaA4jb82/1ErgiwjiIFkdCxHf0BEVqFDG1eahGBm2IIDJm4KI83wYU5v+4oAN6XqYNU8aZljUPwy7lc2cDQYTJS5EuaYFYxnbGELIoZYe4fiWGCuLiXAVx0wPaWkFe5NyuJMenLCKpBxIcZgYeTiglMWbdRECXW5eojl4zLE3CHFl3BUGXL4rioh2RxgiMpE0bdzTMeYIUaYBuBUPZERO4PS4QmYvkTG9Pnp9TiZLb9AXErgYsroihWiGQEGlO44Yi4AJSDZcI+kZcZdxxDfouXzctVhcCgRSeILUdxQ/uCmWZUzzKXVlJTBPKmEYH3h57YNUYgCh1L4IqIFuWU9zSv8AzszvHD6FRDuLRACCX3KP3QJgGUaBZKVtEqiNVCUwEn7xI8gG4JpHGIkuPiYlSqNkUEJqBV7/ANUbLX8wiwBbF0ODUEWIEVAVHmoxVK4eGVGMzlGpf9Sj9JshVRCvqFvdT8sfhzAJbD+oBLIRu+MTdAYqOnHS2JQcN5ADVAzKA/z7TpFwcUymxKqqvKVQWe/mCaSriVy5jEvvMV6w5YMEq5eYAL5OVvlMRl+vAGIaj6DA2Wo6lYzQ1ZPaKc6H4lOGnWeo6rcS+xdQVWHyZP7iNL8SizBwigIwfd/ca4JZi6RWZjs1E1z5gYs/aJb04C4xTuEqmOooMYF/2o28np9MSrWGV4ZZrgLlVAkWFOyDjM+iOBqDCW+xEOuKUagapljUM8sDTxfAYeEjfDAWKo1wsgEsE8JAdlTr+yW0L8ahA6z3A++oKCvk/wBRz78x94rKzDxmdHpxxLv0dxl7Q5mWJIMsrmpZHUqB3iGHB4YT2Q/+SIdz54eCMC5UqVEhUQb4Po8ARiE5rviqb9ChuKlgxBHmq9Opc3ExNcYoaAf4g2X6lwCRQxNy7jJoFTFcGSpd1BtGZKIcK3KOGjvqDtL8R9op6nskA0kcwMI7hmdiNe+4TbR+oFb7+sZWvMXgJnRGxPEcoMebiTseC9SpUeHxMRZeiNj8xqASohOIQW2Uc1Gq/b1cLjiAUxGBdUfqu/tM7Xf/AB5NJ/lRUE9JE3OKLeliEiFxE1Bdkt4mEc0lEMzXoWaIHcMsDzH0VKl5seMyvRZBDrfd/iOFPeCS9O/MZueGPHxPZEVWcTufeVKCj7wu0MGr+0Myh4f7lhcHmAXX3iNNjUblzDdQK2bP4G5kQzzU1xcoqOibkVItuf4XP9Ln+lz/AAuNzmKMIo46lUxthSErjYKhCp4MMQh4nzA6jiWHWISgZhZzCBQcWaYgWrjSCo80R3IDwJ9LhgBmARTUKYeEMai5IXMD/HCkKFpCKG46LDF7HtMJhKSg5AaOR4IxApiTnXf0idM2tZQotywLYeTC+LxG0eu4Fdy6gDZxRKHPF8u1h1RHPiOPTVt4lDWMXUHZnh8wzn13wRb5N0X2fJqNShPVcsNRdEEMdwII4AhYl5UW5V0Zjj6y7jYxLKTohSa1FuIckHIRq44ZZPMz2V/3+/cEogxSDuIInfHthRiS3lf0jUhh+YFXcoyhH0jw74WMobjPEomp4CYFwRAzZ1KKhRg/5C0KHaxei8f/AGEnR3WP1Bwy9Hd+KhldvIdD+/P2hBUd3z0lTD/blDKTczDFzDE3igtjXae4mZQfeUlOoLSscDZhTQp12/MHRH1iQGh5M/eE2o+IgNHm5mWDxPCDMh78XytQoFcDFhGNvgHa+0FQooh7e8IHdJR8sO4dS2eS77n/ABg00Y5YTw5j40x3GVr9BTMX48ev+uKkCZlyVLlQYMhQiTRHwOKhHjri4vAYJPZnsz257cGHEBkT2haR+uZlgmEsmIU3MqpYS/MM5hyS4wOLjaWSlbAUWYB6Lm/S9KxgUD8oRiPaHSFRitjPnuB0vqhZpqHel/iAGGEcsAj6SPNchEl4KIjIqvPjqF0P2m0rDQC17S8TP3f7jpveUWfDL0r5u2sI81G9HoAZYcM+fUEUlXOFQaMettIwgH8fbUpDh1AMWQa/7L6gdRK4T12q9oA9zrnOHbBvgjwobjdGHlKIc3K4q42sjGMVPYjGNdxLwkKrihhFoMRNSy0NHG5S01KcCOxDEHSJbaiFKF4cw4rhLl+ZccQoJesfwy7AKzLC0xMU/FQWy9iV+T+o3n9+z7xmVvDEVvBHV2GHP0S1VrS1/ZlAqsRiziBTMQgog5ym347iQ0MDTfD7lT/F8osEWSyrkbhrhpFYhWqVwQdxV4lU7+ZmqzFRiHGeUHcXneIFalzc8ikI0i4m4Y16FRMtwOH0Yxk0I8vK0PEqL0Re4rFofq3EB5cBKEbQoEuLFTtOdPcBHHtzEV8er6mVBPNZihb8u/eJh3jz7koCIqtmW3dypqoQhFvkc0y5ceSMxxUGMNDmND65LE4Y6WM0zB33EQUHkl6xHOoZlBT4Ye0ITUXuLeZeIolStXUU4UxDDC24tFwlQxN8DgrYw7w3DLMV2SrhsCVU9pqBv7Q9VnnqIyo8BqfmBqyJLD6YVHnXoGJxezMC3fbP6lZwZDv6wAKPV9QgS7+On+5dWVYFFcbiVLqZYPXRg5qKlsHAMqJlLxFouDefUlYhB1PJolrFgMfSCEnFamEW5Ut/8FFKKyTQPAZsqZ5shaUJTKW+HruXLlBiFcm5V5jEjmNm4KxKa4ld1DQsqdYjC2Ej5goOKuaLuFIW7EwKlkGKS+NMqUbluZEQz58RABr9a/ULpR7wwa/f9wsvswfyVMFK/wA1Uajts0+mJSBE5HT9dMO6eY/lcJb9l3c2mDG+o1NIam+CsRnvNIq3DKCDiC/9uULExJk0P+3NFcytdxOjmMTSOB1LTgxOxVQ4BmU9oAY8HocSLUN/FwO2HebAgJTjzGhLWnx88ohkTcLJb6ACtEcZj+uojrkSpRCIzB5Bf1D1LJbf9qWqgkJjRFitE7nIQzuKAajEm4JuzqVTJbIngPncpBZURx6S+sY2ZjKjxcWXLlxbJKRPnO/eAYVG8RiNWJvqOhCgPALbzEgc8eItYiWYgQilkQVR6tOvmO7g8QuXCC4K4PBblSgocDXymxKOyQsnErFhqAGDkF71Ln0O4IMRAJga2VqyKy/S31Be421Buq/nUddykXwv/HIuRlqM02Zg7agVGVKqX1DmuGhHZyMqG5g+5Li3KmVQKK9I5hCCz34i/hIEEuCXLi/8WVpRlxUCioqMTyShr/xqdy5TBa6ntAVPZHxMxaMQXuMSO8RldoF2dy4xWLZogXEqJZAhDmIMwTEAqpZplH342mXrzXxNwkoXkd2wBRd+SBtr8v6iTS/H/YphX3i3dPrBlaTqPD9nb/yD0DSVCiaOmNMTc2ijmMYq5dRE94/MVzAma3LqV/7cphmaxAXF8pZTBX1i4lvff2I7fW948S/K4N8Jm15IBUywEtd8keF6hdaRAhrlIVJZTGW1p/idOkbGJrgJrpiAtj9P4LCrPoC/xNw+QP4gPPH8/wDIFFQ/a7+0ECOCcGU8/MsAAjOZntFWJ8xLO3LxmEetR6iVeajPbf6iTZWY6iGKMHRaWo/YTOBzDruSKG4I6lmaIlS/iZsnuxkPfRia6XHFRMmxfYj/APEf1P8AAP6n+Qf1P8g/qUmYd4ZpUHgDa/bBBh+0ZyYeFVC+xDMTphAHcFbrMSpdbhAdRogHcpZJj0lItwai3yaKB2DBsVDOGAo92QAa4ri6juFmmYweH+4rND7wiiyIbUPUMEs4qBBshscO5GRFJq4Nu5frtYWZSAOpf8iG+GdDUrxC+5jkMuJNhyNl1LJvoVdkealTHF2zOJMsksHbF3EpkhlAROL8RE3jgX3xZBK1CMKhlgDMQ09V862QRCV6adkEi1nmCAlxVm4z2jxkSizyonpqYgI5dVK0rzNXzBrmxxLHtEbRqOEq0IkpWwyXCKeZn6GGDUI5jLl3EiDNzuY+GgqqdeIewipqCy33jhTMzSzMr3MZ4G09nhekONEZ/s+UtjhWm4hRciI1gNxOjTVxucvtr7RpSfFMMbH4zLklHiYen0VyBzwfSsmZ0oP9iDe1BKjDZv8AveJhg9ZX9CIG00N0nxKtJ4M0qj+xez5/7xoRRuB6WLPdazDBdiEPOBCoYhCKIm1hOWJ2ksHrMReZZYKd/wBy9gYjClQDMXso6v8AiBbz2/n+pZEJMivDqXf5ku3b5tjVqGIOUvTXcqwjMR9CUhuNAq94QzEw2almwhqaQBmDRqGMQm3BEUhC4RQ9wGp3KpTMQsC4noI86lBEH7xAjArjwQb3ADdcEZXmFZ2lJqJqv1EyZYVLLjLUB6/OIHYvxG2B5f6iXLD5gOVfyxJeC4H9EDNV6DqFQ1gqzv8AEqSRFOh6auBwQ5WtwayZv3SgtioNd3xMfR9bhNMyV54ZTcpFs4QCXHReYX7gO5ukcI2slEC0gGjb3/vUEsfXQrl7Hc2WCknzlHC+Fbs4WuLb4oWhuMCJUcyvUqJJTXrWU4IoHqAWRSCXCLdRKwIpo5VYnUcpZPBLXcCquLyMwCT3ReU89Rtv9+ZkHmED8x9d5oagle4uOvCBbKTVbHxMHs7/ALgXUXHAupEWqa89f9lsuV8w1BEgi4KBe74gcmGDITMloBoijVq8SosrXddcbOp15kZ3/wDKiMTSZzWZhYSYJK8A1KCC4DhYyhcNYgx4JXDni1B7/l/omGKnN9RV2XX0gVVjb5gVpRN5DKh5IVu+t/SVPr7yeZebR35fb4hgvkf4JV5U9b08VGwu6gMIxCdwssR6iwN2jVNxJMjVdJv7zBNOx/2YBib5Yfi/7gEsl8VHEXl9CBpngxgBcMcyzBrBPdCkqEGEPbggQiXhneoihs4CGJfmPB6EjiVAmnF8UTSonAZENNBLmqr18cVcHF2lKqLWi/NEshgd/wB1AWSm8/n4hn0fH/ZYV31r9VE9P7ijaFj5OCbvKTxEquSWS4cgzmD7MARUgV4CmGB8CCAx5rhwElyguUqmAacVbNwIUwChZNLr4ljDyAthYhZjpMTkh+YhbtjwtEVLlWHuWzDuDmvSKlvGo5jsZhmKalimNtMKCX28PoZLiMXbEzrlUWvt7QZbQfGyZ4imPJb9YA1THyyZUajHxMILZbBZiPEv6cP+YjRDd7zMRU36FVrg4m5s3A7mFvUotbZ95RVdRDaoEB66ZrimEHoe4oUt5cssTEd8qwgErqIAZafHswdmCVSt7fywRgD7vGixlfCIbsfQPr/5UFFQ8qUMUeTkgJXUfwf54q5XN0kL7hCLN8+YGfiU4/MDbo+ssQBYabB7b+07nMaezUDR0zOXcNdQkPDWD8wyJ4GjKc4fzNVb66h0Nv8AECipp3Uo5Ec0iOovf4B+kbN2uGUc9PZEnwSb+s04yu2t1X6Yfm9MlXuHri4VF4uX3Fly5caFWDupeZvF4nsiF4BbBvcCEFzWIc1DonWJas+mvS6lahT05G4wWsxX3yisa68wcWeQlWhaZlc/3/7DGIMMdJP8fEZAofn3OcbQ0z2M3xtY74r02KT3hE5XEoyvFSya3FNr+f8AyCgHo1FpDHF8JK4Sm+avmrL6TylCLSMoN7hgrh5WJtuLUtO331GAK2PJAMpBvUrjF8GMkF90EaoazNrvHPVzahGzUvFt69o1hXUWmU9jMSdnCCUONZVUdx4qJEzBFKtjxcQKTEszRcn8TGu5ULXczErnKYgBRwNwBqVe5rUvhEIGUKlnNyjNyxP75CMidtkc0J0y74C2Ss3GDACOAU34YJQme6lTQl5jFMeNkq5/r+UGg9DoK4bHKrgmarvo2/BC0UnC6DQ/O5U4q/cNhiMjDc/8Qy7gW3xKE2PIkqiDBeIIy+Wo+YVFuxCZszK9eUD5x8P5JVZWHu1eZpa8TCUjArfiKU7/AFLMCq7p/uAi30rqWuPI4mO2WM69pcePvDGyvx94FY3Fw+yqa631j+yyLVW8PEpu7SNID88ejFQ06lMMw4xPtEZYwGAlrB880PlFQCPUcFe7w9yFTO/Z/qWJFJZOosX0UrF3M5Y1KccNcAIYMQUUwYG8w3EhDg5PU2lnKpDi5fLlojQojlC5gwSpUaLcS/EJfDoG3fh/7+4aIRi4lQEja4LH6wGjH0/uCSlHbiGytLWR9nuIQglpWpaK3/K+k80uXA7guGywYPzEVSnRmJhn3IrlJvx/vibIhtVGr2QF/wDJmWLTHL0voIyIsuX6K5p8xABEgSdBGDbmOuLmUTXCxcuOWEOIZic1CMS4TAIuBVEF8biyBAOQiTHNQ3RmoFvaIXRuC0UTExvcyXcQMsTEQLaT357nhMx+Irh7ZhfELfBEYZUOxMBXmXyajxdQG7fUMAJiVURuapLiOQ0mElpHJ+ZnmMvgSu6hSzbf3VuK8T2TW5fjepapknGT/Z8oQC+WwYIBmUNliywg7g2k+nUJLlQfz8EJRt9/1KOsfn5haLGaen2P5gYJcWWt8f1MiD5iQxKnmCLRAHONmmClGBLWXtYrEvBPmZXdniwkVfeM72++SAFSOXCi2Ax8d1+oLQQKiOMyobTCHERQXCWjafkiBoQCgXy5xE0ws/Vsl3DKsjfxLOkM4JgxEYYZ4zMqslS9Lz8/uVwH4TKDuq/P8TN6zp1LhPiI7KRxMS/EvMX0IrPDirl4EYuHuhibSoFail3CE1weiuMS+Nx8ZpVxoH3QQWcURZvnXCgZgyP+dShfQ4dUs+TJHU6D+JVRu0ZiHcaSFXQHXbKMK/aOa2MtMqifJ4/qXUtSDIvyM8DUTAhmLcwRGB6T4xCuRYz17/SHi7+8FX1+ITXNoe9a/mDZ+4a+0xVjw/mZwn1KiYj1J5lVqDGuUHKAJtZXoP8AvUD0YFxWRaKIHUrMuPF3wEfQ31KrEGxGLjEUKZfvkajhMkSrTVylr/7gGgqDepc2mNnpLv8AhJRl6S+PeOIvmZgV4W2TLDHRcLe4uAt37nme5jAg9GkUPSZiVySo5LIuIpkRIManYxMskTxGC0QCbTZOo3UXtPCAy9RaXNeAKgCrnVq/7UF1NSBGgmTYvxFAluzzF6Lfj7xbZUUVn7TG99EvYbfg8RzDkESwGsCeSPL6iw8zUYEFWINl8oLjaFyhdR4JU2MvXSA2y0HZ7TsA+kTaY8TpH7sTxV4v/MWYPyypCvQjUZQZlhMqWx/Ub6h7xgxohor9TOCn4+ItycF6/wDssUz2dPzEq2yzGYHHR3BWaJY5ZSHdbIB93BU1rr2h4Sp5lj/Y7g9U0hH0Ka8MLJTDSKdQgZfFCcRS7BibxYm1QY5GMwuEIHA5Hg5b64eByAKZnEv8yAl3K7Sq9NI2RWq3MSRmG5iU5TFQAuSz7Qw7lKxwsajoliFywOCVBl9sy4ury4iSIJ19eo2LlezCLIyzN7ZliL9q/cEaT1yQx5XROy2vx7cFl1mMY6X9S4++Y04gWQ9WVHor1blSo2Oxl7Kr2+IReLnUwGosEEd+moPUfQtPG2PdsoKlAx6aRuUxMVytBz7y/hQ9GLYsy2FtitSEDjXDF1Ll4SaRgaiDeZT4SWKFMCj2x3fTKZ9+Qx7YJKcQA1yESGIt+i5hEbg4GJdF3xsYPt9hlsDn3iGALdR1Z0B39IeCJB0VSlO66gjjUClRKxyWyy2bjrEOP/NpgePeeNfLj8ZYBYv2cH2394Sl18EuFbiCrD3z+4JwCZXAbzCdt8yuA3RhBYkuITh5mGDlwvft7wTDBHUUaLgkhGBRKDLEPCKy2oWuCJW3j3S+0AwEwaSnzA4JVyqhXCpqYFkV6kzRQdwQWemlNx4NZuG1BDdXU+rD6htNPmPlIgKlxsZGBd3LDlfxHT4fz/8AJiqiKqo3zRbKmJlPL7ymrZMkdGp6emIcRQeRBYygsgjme4INXFBbuGIcCEG4HmD6D0MOixWXL5qwbg236QUbGL/uAFelxuZKhpzKWu4gbjPL1/tD7Jm0T1iZnFT/ABMdVLhUPMewtgEO2XBfDv74lyPa2/1LEc/mFEKJicFaiMo5DQ9YtfNQDSCXHOj5mGHxw/n+4oIT5/vUdxfHV6PaVLeNRANo/hwza8fxFDcs65nZB2dfMA2WQSB2ge8yNT2z/wAj0RdDIfNah1LHvm/TXAxeBD+hAjh3D3mOCtg3U1LlC3xC0dvQSsTUu8eiy64dQqMQG7iuD6c1DgcgMX3qJF+38wCOouCAUGDcUYcqnlFjQWxVELuAS1WS1A0rh/mG2xGq4YQPd/XGATXX31Ca8r/YlV6FEep4AupSg1eWEQOX8Q+RFOUfZSOz38wSEv2YVFCBoRE0D09P/YZ7PMzI9THg2lJSXfGhGELw3nb/AG5Up7DomlRc+MeYnFUx9Mzyh38wYgamaDuj7seYgFPipZMl2xFKxGUUfbEMFP5IRQgWT59v4gBg4o4S5aQUtZIZCb9Fy45l8ETEBKd4hlCa9BxTXiUbz+3/ACMar9zklwbXXTHdfhBaSAwBtH7ReYPsDCxb2/qZiVa7KgQyHT0TJ3LFvFWoaiDhjLRUdA+D9Sup1NgZNlfHUV2nloeXMoBq+/p/f0gS3cx9piO2ZR1x8OHgQhyIPcOc+sHZririeISxqAMxxDdDGmGK9DwEYwIW5blmboDQXMOY0VFIqwv5ZhiluZnxO9fDAmkNbx94nLhoa+vmZcndeJSAwe0wK4UC2FK1e86LRUOR0xY5LcI3cuohi+G44mRBav2hW2PLA7s436o0LnQGWBunsW/x/EdZ0z/UryiBksgXFBs8/Tz4mWO7d/8AIMcjyhICgh1CLd5PYfP8iZwvJ2fJ1xXpv0LRcrG4OIypUGOyLJo7M3Gsf2jA0bhBm2bXdvVcseRGIJdNHBBTm4rLLhKjL69RQuWB2jkEoAyRVGJ3H6yuXZcWoiLRlCx6yo3PqIh1FUvRh/cV/U1G1X/yIpHoiI8seJrhPGoTBb5r/wAaUEPPX3gGyyAt7R38IxDNyxTIQXcArwgI4yxx/qJcJXm7OoYoPZECyAFeo1Z/AuMERZilhY25dba8upkCPp5Yhovq9SoF3z4cNzjOGHL5fHhjaGMBuFqqrxKjXpB0Uv2m6g+BYDZf2Z52OwGVgOWeCVH0q7hyEuA08qG51AohHm4yg/8Ai554n+mdRYhK7+kDIeLpUlMXMHw1Z/8AIL14rAO+c6osL2oeTBO0cvfT+P8A7BS3PfQgCzx/ft+/iVFRYheqX6yTwgl9zHgO5tBghqEJ7wlwJ78ERdcDD3jBmR9+PmGg5ltsR51HMrlZJ1tMSFzaMpdBo/mJL5No9BSruAbVkZTNWM/llPAmZdq8gFZgdXr+4AURUuXLcaJuYPX10R7It5yn0lJc/GD8Z/MzqV5F/mCHEd+Zg8HdGf3LrNf7cIhM2lPtGBR6Lr58zFX7z/UdsAtV7mvrAS0Ig46e8WssEXcxCvf7vR9Nx90LYeKiHc1Wuz+Tsl7Sbjz7kGMrmvRoSyXwFxKm5igfoQVQtrw+kEtq8+/vcHpNcoFrACu8Qo+hZzUXYkK7wdK1cBKqEYctmSXZMrJUS9xpDviGXajxCkgl3K25cebUq4FzeMAAEc0yZbkGVKmIiSgW9wAM8w4Ithq5vm4yvU5miPY8f2RJ09tfiOgXZaT+5j4vY9MJbCl+WBpGLUSsWY4ISlf6S1O3nNfeWD+A/qD2+wMLUfdLFs/v+InEh3IGqAvUdNlb66PoSkzPz9tQ1RwY8cuNzk/slue4aRvuJ69xlmbQ+8pKqEYK2JpipdFwg8DgRC47u5gWxL7m9jKu8xpW/oOcxYDByFxK5cGxjHK2ZFMJa5v9y8W/aKfcI5omYCnKEzBaRX8k9yir6mM/kS0LPiGFGLnYP1My0/Mrc3v2lcPUKggeJUqJrLIRajF7M8/hwWJar4EGEIQ4vgiNBqFh36UHDHIi6jmqjA5uHyg7BhHmgxL8qjQhnXT9I6geBK/UP1R9D6xNM68TNNsIFEcQflLBgeOGYs3BcNwNp8OVvmleOGCoX/LzKq/YP7gWK9rr5eofSz6n9xUxUo7/APsC2r5lnrtX8/xwg4Yu3HyY/MEwr9mBVdeDuU0k3KOi1XRfDCwKvBE07Ru8+/iE2WRhzdfEAO6NeRqNuKiB8cw6jcsPMV0xVhHTGLgH7qo/dkNhFNEcxxHiidErjMVEuUCEeFTWuMC5anaOxg3CJwVTdg7stvDIZfpYYAWSyEShTMux0wDuYKYokBKFRvRMTUoCMwAuy+vpGu53dSmW/MKvfOyEWehhK5qCS6hudz3D+4FHjb/EoAxiTCJEnYi/2YbYe0RA1RwKgpiK8avsisLN6zLoCv4Mv6gVif7vlMari+dTc4VLZ7ZQBc1b+5R1LnWMFcEYVbzBSo1trgb1L4ual3BmvoS9w3Uvg1wUYiX+8Uw4qLUCDUM5j2Ey/m6j67QYk1HMUqJQZXR1PPD7feXasjmEUQMHcGINNsyu0RC0oB11URBa/pMD17VG7ae0BAolMeBLMqhMzEEp7OPrBjE3hligQxmGIQgZhAhwgqwjya+PTXABTDqmWoBLJdZi98DHgtvcHowwzncULGatgts8GohFqHPBUmiXht234Mv9TysR6wwGtw6j493FLDPBjjMGsTo/uAD7V9IKCg5rm0TocX8V5K1HRECiGWRKTkYKrMyEZZNdJPhichccJfBEYOzwz2K3X3nRx9/rDwGcpsCNoGvHY7JcG7GCKNDcRBc17HUEND6UHqhXo4d7ypDPT2REOk+8BVqi3xSPDmeUCuSrqAheSPF8IwhMQUtmIglMMEYtxayz4rqVjhYRhjXxMhlQ+iLSwu4psquuopTTZG7hErqBWo+keuqL/E67Lf3lDO2/wf1Kjt6BvQwhf/gk2pY2AhFgfrUu7/cgjVP2YOv3fMAVkuZgrmSKLMuxnm7hpgHiLqGiYramE2lWwPczKrY6MY+3/YTYR1/U/wBXygbzwNww8HSRgnWEvOw0j/rl7CW7Ms9Gqe0Y15lGSnzwgKxzZwF1yyZE34Iy4T0/xM/YY8QRLOFgiLTUN7mRE43EFnUAUg3wIS1tJVa5vEeKHhiPYTjY619cyj+rNQm4PY8ynRuIbYQlkWv0p+ZQuhL9JlhhaHhjHWIc1NJjAr0ZZInuIBuV7BPpDxW8mf1Cck+j/U2kT6MY1Ackz1HZCklckwbmANDcMFEIpEepXXIt7nYBDjlAxZDPLBEK+X9Q36gRTC62J7SUkX7qY6Fn28TFWfvLS7/MAMYiDSShvefiUr44fV/5AO+4jGd6/iVvJcAo4I8BcfaB+X0WR4pV6nWCZQ1wXtvZQVRJ0B/vrCs8SzAyoX+P4efpA73fIjGBBFGho4xClW9xwajPv4hq+g+8F3NOxwfP9RBm51/UE8+zuJqo8hIrTdqE8QCaHk7ksM4TIYfv0IwWAqpFHqeahWjxGDbIOCMNt87leg2rrv8AqBWCCRE3T+ssY51D0Zh4JAKOLmKBQUsJMoe8IqVEArMkmH5YwEAhQJ96lrmzxuE9nvDWRh2tTUcfzPVUDHtiCLY4Thgb7lGmxAAxEgjdn2+IAUR95pDF1FGZHOkI9vbqYo0czM001G0zl+6YYnv4I4IbUzUXFWX9piFp21o+9wm2V9K+n9y5EovMfRzUY7emyGoAQwEYJPME1TEGCZhmVEOtYi19H3hsKJiAMxzWx17QF4IgzgeiU+YnUJNCB3cO2xWh/aCMDUW2VL9FQizN0NypsYk0Ig2TzJ5MTbL7m9f/AGbBAMsiRxLSqS/dh/q4Y4Z2ccpjB1HWpfcFi6hCMXFK9ZlJdR19I4Mf+8ym2ArfUppzHak2dnx/UuOTsdn04GahE8smb5qR2USWC0lgxbIqxqFExGO28EKq3hVtyqFmHAajJ2nxgz88Zip548HF8ARdzIo4bjAgeTUd8elplTWLSafj3icDL4ITnqG48BFbbIsgtS3uWehlHDKmoZJeO9QnOi55LW+kQ73bZ8PUSYBxKgK0y59bPh5olnDqNfI/vhrqO/L7EUtV8fBFp0phF+XJiGXKbIihz+4y1QlnuXpwoSyj8RyVAK+hQCKj1BF9Aou41Go+gCEsciJD4g3BodupQzv0aRCScqr32yoGX4+86Tccq8zz4GkFUht3Fa0Wxr3lvSoHcMsAqkv/AG4xC34KlkZfeKLWIN392WOHtuGcO/VjlmLqyY/mEbHi4zMZQW8kbpn4ipFxvFSkaUw4X3HPB3Ei8ShmAA+Uc1zwupiW9Un7UUG79w1BxdXry/SAhyPaZkfYPp2w3p7DB+Iztndq6+fmKkpDeMf8YfLuZRb8Qhj0oDaEmt/ElYOCGt0wUVCdDX5jS35Db78rUvukY+i4g937nRD4iOGoNRtzcedRebuNkIwcEiSjzxMt594g00v5+IViLI6Hi5cTjDTK8o6R4mepXqbLjNYClmIPcCI1qDPZCCZ3BNMcETGB5EikdJvT7kqWMSWFSy7PoZaRFZlw8Stta9Rwi5i0GVzo4RYrM3AntmWIU+8NlWn2YIbH6gr4YKbWsDaZx+kTKckCysXzRaNyxN2bg4VHFVPtS9oQWx1wM8FYeA+WGbHt7Z01CIowRmGbhEF2PDCGkSnmIEwQmruK4F3iBgvzLAPZFQuiogDHBauv3Dy4x+pr+YEPC8H4f+wTT0rRbKHXav3Y4LY+fY/bPbkgEO34MywL4JZFKzAeJIz7GZdiyCwjElHXn4gKmKTT31CkslM0eis85VH/AJkinaNzAac5GZVcWNMqDUF5FjBhOA49+GJW7zERLfMQQ6g4Qge0M1CG4re4i6Y+0ZPslfzBMZzY5zHJcDuW2iMJX5l1FuJcqtS03Gmk3AQnoSWW7ywsNSh2EFvg+Yg3LDCEgdOfjuISyNGYLMygxEgjl4VC2UCOD88ffLCxibpFOoJ/u+Uox2Z/iIYTPt/2di+UDk1BQBOxjtJSVAyxDR7DBDSEOi/1LJf0NzAMDj4gpXC1MytV3/UE908yhIfEZDW4DMl8iLpwBJZuJAfVI8fRIIRi+CPLrZMcpUqVwRP/ABAUwssilxeXbGSBgTylsBhhG6OvaHfiDeuFxAFnK0WG9zpxZffUtzbMWo3TNDHBJSTCVfBFQakAIbP1Hw2vXXzKlU94Ash6EjL0dxj6z9blXqBikIzTzMwQ0tV+epV8sd1M1sQlTODE2grKmZLOPrMoRiAkhJMW59kpdRUcQKBH3mUqIYNZC9v08emokzBzKLGvdiQYpX84+I924dLbEG1QtxUX4Jm6z8XzLQeIAtlwOdnyaj37RFoZRdakjezhayxKi3zL6kN2xjrbDx5q9fEe747bv4lZJWhftFTYeM/qYrUS3d91Kp7cmRISsDHuinAxK/hAx0d+J2ksOBb/ALlCtpZxDA3+h6Vrag0cV/4vB3Fa3MeIX8wjDnxK3NZXTFlLAaETVxXAiCvfiWaskL3JO4KWxicE2z4jDuZTmAs9R0xuUwYEupfuYB3+kdKWODcR1jv+ISJFCjcFKq2AYU5iWnBw8UW+4OEvh8QUGCtkWZjuSmVExqIvdQKxwQK7jq7Cfb/kolQWoIvcd4jiLqA3MDE98908KivgyisD/Kl2q6yQ74c+MMxiLjoEM4iVK7h1C5axi5R9OLSy/aXx+sKz6JmtMH54O4T2Q5F0weD+5iN+UIPeCOohTtKyFEsjVeERIL9/m/Vm4gw0ygZYBaCNeuErS4PpUq+FrcMxK9FjqWZIsZhk5xLiZXU+UZgVjhTWJmVeBTKQO4IZalRY4hMM8Je7Zcblt+D/ALBiFTq0ZYMVwwJhLm4cZUI+0f2FsYsU6PEo2kEq5e0MAxSoyViGB0fn7wA7afkhqBcqo8BwlwPrQrsMtmyYEEhl3qWECzSUamuLDErYzj/R2RYCvx/csc0RITqLdvxKOKu5cS18RZTXxBEsi1AOubi84SOr01wZNwYRbSrjK3RQwUm9b6nVyX+ljNpfzLZLd1+/pHzg9u5Qi1p2e/8AcMvuAXRL+o7Y7M/mMGj15nT9iiJAMj3fmKk22uZvjUxcBSGCVQuXcvV7e3xEOptGFZdw80l2mCaNcFcSbXi+n+JfcHk49mP8H49AZPEqMIvrulJL0z5PC3F6RCApGC1jDnCh7mfSOvkiqGCfyaf3A+K/iEYh5Gv3FIEyNnf0uCLHwv6maIPlBEmPOH7My0e0W4NLgAxi8g0fBMmpUtgwWDD6eJRRCpmamsfM0/MOK9KYJCJFtFw8jBEMwaqUYSyX6CPcv8EXmAzMI4isajAmOJqCo8TBHG5ho3/KlMreIWLTzibUWxJjArUTmyxmUWql5jHtjSi+lYrrMpV+k7ROnxczc7KLz7weR9Wpb7T4JYFZxvCW5XtA0YDuKaFr9RyzEDALhpcIBK/8O+MHy9F8EyYjuaHiLAE6gulE1kSLXAVhie4qJTMV8LjkjvcQRTfowIllMByYljAk0zMhCEnQ0/P9wxX6LDRx9qit3gKAzEIX3CDOrgKHUvgG+EOyClkeFhjWPqwDX3pjrPysRKbM/wC+kI1wMXkjKlFtgROEbShGfiFLGGU6dku+EvncS6SZ0Bp590/UNAlNSzt8e3zxn1uL6RjgtNzTylUgB9IYQJ1kKjiG1RLvZ+1+myuxnwAcWhOT4eEh14R8zENe+WWFPsFEIaF78v1jhmPT7YV+I0LKthLMe4iACty0huoNhBp5l3UJUm4IS3gvqGNQCo7Q9Pn/ALwhwtZQqX6ajyjguoYCmC0lSoYqHXKok8x6AuJCCho+zMKKqaigYko6Kwf9hMkyNQCkhJWK7N1CrB4RowXhr9T7qlmGmYq3DLpw8mYTdB98fuAzUQDOdR93swwt2D9XHjMz8VzX8+l4drbLPiEqguH1lHNa9zEti/rACVEMNgvNxUXNmBykAg4mplGrEXAxmkYKmEeM8dILUKWTvPAA/wCbQkUa35mnKK6gaTc4Sy1KbSoFxxCswYWKXAoGvr+4wBpgKiBWozEuX+kqoZpwNRBSnyYlm78PmOrzLd9/5H9T7gERWU63UF4wx+0wlvf/AIC8w/8AFCUMX7XmD9xR1yWW4gDAR5s9Fkp5wKwDLMFVswQdOlNxAb095qa8GMAAkEoZOo1Ie8PeGGD1KqLRAFl01MQ5IQtwKgbQK/8AC6I8YlwY1KKmS4dbpheY8qBGVUuOGoIxdt+rKDtRkh1Yvf8AXv8AOplH/f8AffhGoNGBm46W4nRnaQMD4dEV45uXpnR7vcbN+kXMzNxQXUWAq+vTSrepbfdPps/DFO8vGvvEQLdVh+stOOz+IBBQckWClT7AHzLlXF9ql2HP+L+n6lAdMzOiVe/mywlRR9j7xb4Z/v68XUbMkEBMpD0q4GAhLoigWxewefn49pStgEeAZSwkCFzsPXoIwEMBDVSmaLWBZzKh34L/AHClAPBHyH4lvwRbf2f5lKW42HkhTkjnMTtDmpKEAeMX8xAMkgcJHx1+IY3KA32XLUz3NfzFOa4VvbBqjMGrnWoFggBlh/CUeH80pnDscLRcLpTx1GI66l2SkPnH1jnBHMfEzx1GDiZzOaxSyvHA7Gu4h2sBx/8AdFpj/b5mboGk4ZxQTY4Qsx1xdS5RffOz/EAnX+7jW8IilHlHRP7gcfD6CKgZqXKPhC+ctf8AY9l+6mvvEWzIlSq0wVX3z45OPQELOCPFepYrsmOXUL7lLcQQR16Uoy0p2SpqXF5dUPYzKdCKmLSyAS094uC5N2GF6Q1bSf3G4mvvLqU9OH8yqDfzNAwl0wQGcoiJctNx1sQ8GhgjENsB1wH1GYxLKgUV6RviswIVikXvEGFgG2N2V4PEVWhsn6JVGGVtyuVsw1YNm+KlQX3nkZL4xejc8gf4JqWR3GUEVcf2FiPYl8IFsBiPCLrOjF1j+JSqI0ou5UUPQR4NqKjtOQdaYaL2lXO8QKemHoElr9j/AJA1LHxEXX5cfiCoAu6IgVf7wRbUdP8ADAC2PF+i5cIvg3/UrBZfiDyYCt5BNJUUXLs9OV8QvWUy+0EF5cE34d+7EicVxVxgpAW2ZUjLpiqX11MGCNr74ZhboYP0n6hsxZF1Mf8AV7eYWtQIPngLmpZUuwTNgjJE9RojZcTuVGUq/b2mC8YNs5iZqTUBpDo/mU8zFCqxEuILNR9ojwGLeKTGPxDcqS7tBvIJjn/DjY/zaG6qLf8A2Q/UfEXnmGTgIfbqEk8+f6jrK+PKxg9/iOiEYWIFFFckLoS9yHb+GAA25UN8ExMD2v0IPNZglCpkmjvp9IerD4laGYRlUFia3LxzUqJZKmj03zUqBH05NwK9T32QT6kxqG9x3VQjqAwH0OIwPEHo/kShSD4KlCtHT/cOonu6+86T94AJDTHNQh+yGIhI+xZu4FnwdS7WYFVHxDaq/mPQanhvPvHkKA2hrh5OG8+tVw4gDCUTKZ7s8TppgRdxymfyMypS4PmWBtjLlxItRyliBW+dP+8wenyjJ/cuhZAuVDFS2yc/UTI2csQQGZ+NUE2qiRVDUyeaVSjCJoCVbSsGDyPSWR6Cn0Ss+6M2+5YY5WIHIgfBefvxYM7lxAJLr5fU/wCwHtS9QsgGWce5EAdr8e7KdtrllemrgikjEuFUxzKDTEqMsnggmaZqM7/R4lkuLNRTzEeYpaFwvSh1Kqx742lsWo/EpTZAxt2P6gtAntSxSZFlpt7iE/P9RQr1EwOZcv6BCaEWXLuV59GERiXRzb/n4lTsGoSiRxjcG1aOPiJfAC2biZiZjFjwVRQ3CVLgygN0uQrBKjo/5tHpY9ItnCr+eJmEeSKRTATbmCF5v6H/AGCBL1+72/TUwCBW5joZBLv0MQz5dQ4+8eph7fV9+0WXYY+Xt5mqiCtPyx9jf6ghSqyrGji4mFo7IV5Ke2H+ozqw+5/iZ8GJpBG5fF8ZoWQDBhbADdVDjFQK1zqXBm+Er0PB6RKm5Q4CJwMEDRUNcDETCFYS25aeyGYEQ0LJsDcUc69uokeXesn36hquglEYFL2wbTBP+1SW1U98f/PxB2K9uoxkn337nt+faLU2X+NwJWC/4uEELUKUMqQaWNvS+nfJFRG5kle5Vn39qgbS2Nbgfw/P9xWgej0/7XNQI4jtEuWW/iagmhOw3Z0w3LPZ4m4zfAFnDYWfeA9xzi5USVKxaT8y5eBs5VIxcBnM1NzU3E9BRnnmouwSwbPaGgNj+Kh1rmZquDfUqWsIRDuJDHF8G0ywnAV2y5RiEtj7yiPcCMw6fRXFQjmZrhyLuOE7Qi1jAvHR5gQwvS13DFsG5WLYh8xufwy4B/Gaw311NkvyjjUxDcY6jnMDbMiGZjX12/DqUqEbDuYGjuX5lClSuLiy+kOSJXDh0alE9pQG2dM4gfMjGF+EuKYxTwu4tY9DcUzQwMuqgwCn+bTAI2niChl+JgpZPA3PBZdLB84lKC8Dxki/DuFoNFf/AD+ZSgCKNlsabgjp4VuPquFAthCSOHFXH9JM25JsSs8W8novi4/cUb+pLJ8d87JMJfAmmflGmbXfaBSKYfuDpFqXfouBcr0DiPF8VMl8XUW+DBUqNDGC+DxPJmm8wEyhRCGIMJolaGYEualsKpgmJmPhFVMFtZlQYUAxBsNwYZH7QjRCcs09AQRUuXXD4gcEuPCgWy5E7iAipaMi1FMadmXasPJ/UdQckuaQWxJBWub646W8jD+I8STYGvZK/MxiPh39oUcHY6OwljWbL8fu4RvfAcSUcMdXCwJEBpPfMnxbxes8XwkjJaKSkYCDZfFw2b4jEjxFY/MALrm8RKUwJd0pK5vnyJR7lRK/WJNGtw46NEpBKy/QcXLlXFoOosdpFsRdI/hh6oQ80S/dOlEARg7mYzAqd3F4Ym5WYZ5sqEsQ6vhIwbH+Zca8wUfmNdwqmj98OCZiXuAEfTUEIMRUQg6xj8QveQ8v9VBWjLKTWn1PtO7B35n4RIDcfJw8MvEeIrnEBIzTGJuXYFxOeX4gjbyu0y6mNy/tSuLlpIHnuBDU40194j2ALdB/vHiNDr2uDmD3iKuh7RWr7pmwPV/3F+d323O2xju/xBxmYlGuGeco8gY3BctHtO+oAQvSs8RhweED3CxRSlDMUderc0OmUo8u+mWZEV2SnYVKr1MFFG2eYm7JAVqn54BVeK/ULcMxxxc3K4uXAJB6fQsYVaYgCmBuw8MGZ6jUfEDRj7RLLbIQY7CXLwIagDP/AJ/u5cdstmLJQ7RlqoAplKw94JVSm3k86l28ks3KqJc1Frm5caifEukBuncrNwY8XGKC2Mhgd+f+RwoCbdfv4ii1nf8AUJuClp7P5jFgnmVWpr0FS3hwzAza6RqCAqe3dSkGSMo9/h4+nC0SrMM+huaWv3NcncUO1RMhUIaGo8Uxh4jLNwCIocgy0x/HB9ovC6/v0HH3Bi1ySpUZbnaYDr3KHvYAlGx1LLDTMlCDpzXpVRyQVCnT4fEC7vhWCBRXLAI4gWXGPDGYal3uUMxYgM3ME4NwRFR7yn7GL3AQbfjH/ZQ7CYyKuG28QxyR4CVxc3Gtx28VxUzGVPcc9RPgi90iFQhvLhZmBUXmEFlqXUpBHQyihJhmV9iUjpcV7wgP+bSg+IAISjurfGf3AxUcjIpi53UsYreSUKwwAcXwSlHqga2R2QNpMDfxAb6tR+/LuCXm4zFkK13MxYa5qX6M1R7xgLFmdBtw9xq9Pp67GMNQuLg2xiBSR1odQDAC1cLTPAcDUW/TUTlB4uXGgMKVG1BADJCYCA8RVRHsvD9IYC5YNq4zzBGjcQ4oSx1GrMIFILjxAjnMDzj4lWPFTabQRTApqGJcXgLcSvQxNpB9iUFTbXoIpKhKu5gFl6424H89EICv7gNIgQqMwfoix4r0hXpcvg7+viCYQVGnD/EqSZ3cdnSeJYO/0es4ZNKfJuI8to37QzVfLzE+gcnt7TUspMcLWU3cBODaablWZ2EUNs7J8InD5GBSN+PTUwq8XA7fQBExyYrlmJly5kDCrHKPXQwxthU1xArPoaNRU1BUXGb4YjEi2VSEY84qxFRfd/qERlwHcDOOpTbjVlhAXd6A1LvipcC4hGNOxbDJy1EuWCMag8IlpmYt9/aViyISkVbYS0iNzwg8QpdNgrladQn+3aXogsetwAUcS8NyIoQaWeKHuoZ9JmKoZ6D3lS8ptiXHZfuwqUbABNII0HcPIIl4Y2xQz9eEu9S6YvpqDKiembjggROcWAoqE77lnqqN2UpTIv8Ahi/mgLWq/wBiHHUYN+gs3KnhKPC0XFiLysbYrgiqIq+QYDNQB3At1AdEIbLgdy5sifcINlwO+UNy7lwO4legYvopYYS2H5iWlzAhUYRjAFr8RVtKU8FsBZbjnr/nctTV4l8LRcLedS32PP8AcESzi+CElwo6j3DBAi/nZ/cM1rDK8sDpKfp5iKkCzrSzKNek3LikYptj3ruUME3KZVe0e3/JNyDAMoy7I4iApJgR42Fi5uE4IDmpRMQQInpgDqeSzcBFiUFhXIuJMxWVwLQ8Hv7zXAXMECubTcIv0ZahtDTHTT8T76KZhUIcIIO0yvNSgjmJ3HOoq5ZTqKmZ5ygu8RF7u37zvcTAsLl8Bhs0kxpZ8kBtWQlSuL4vmqB3NRF0SzggTdkVQzHSqOc8bFb8zIWtzFGq1AgOWJWCHuqOrWEMFRdQCQIUgIGZCbha2Gs+qKu1f6ol27L886xDM2ODJtdoRal31TT0+dLr+/aD3PP+pVzaExoqUAg0DioZhiKMRypFJOkxmWMZWgguJXAcXwjKlIxZZJhhlw1HfJXcs3vlqi5i0EFrJwxZyiRphbUM8K9S/MQSwjD2UlrIxHUFYZkzKCVcvYSX4TRM6hN8h4A7mENw1lguEdEuEILGpiX0weBjmCNvBK4Jcq/Rdbl1tYhwwAOyHU4+YsuDUWBOGeDIbj8TxNybGVsGK5dQ7K4QmYdQjwUl5Dgsh+bdykVYiOFJ4C50Rxm2jpjK7GdoGn+GXfquE/0MKLE2hSLfNHZFuoOxZMia5r9SqJcuBcdlS+LgGmKOm8f1yFiWEo8EAzZcqDUG48XLGDShEKg1G3pYXFdTNT5hxRKg9otrmW9Yg4pTEXEATLBAAqY41FhmZRLjuUvMV00x+ZYxavEQAaisGYC/MFRuAVUSrjh6QOkUl/Wy4MUPQYtQHxAZie8z4iXFomuRjH0jgruNrMpH4gEpiK0EtmUSnnTECxYitP8ANoYLTTnym5xT2+4K2PhmZTLGp6EqLZ7pJ/r6Rbg1Ny6SASNxA0sBVQy8q/HxKL2tD+fENFZcs0uzYuvmbwuh/MPEwQi+k1g8l9SzEStQbjLJWUQUJ6HS1LuCyYNSykpacXXCDuW4iJ7UxhUpUAqVE5iIGvFOogYbiTIfeKriKyyJZ3RvfDwlIeYQzCDe4Yl8jECviVwQzPOahLxy8E4UDtDHKhMCupQ4UC2GvA4DCFsvBaUQQA3mGNRJkhhRJSahAsfuAUUe+4EPFiTSv08eYBYPV7YZiAKZ08U88uAtdEtDwPnEATBJ2etaAbf4gUhBPvnkzE4HhIoUkwn7HUoekCuK4IKVFOhR56/5Mu4jFm6kSmeFhIOoNRtytLuOM8XyRg9y7MTW5bpAr0u1iRgfMKs37ytEqxLxzUrg8LMmM6iGHVTXMCw7RbuaIy6aO4SLIFalxhHMKgXWoIn7HpliLPWO0w9jmVVQxxDgxTcEvQ3L1RApU05gJCLdD/vpEmHEwDokgoExjV8ni+zx8QELS25At/iCRcvmK8+nNokQ2kYr2IZmeSsIfRmvmPCSpfGCM9z1ELyeWaRUIo2oacOB+nBC3iK7bQCw/tNeoKgiuo8f9i8TKlkvkSrbi7uGnlayzKYVNn4KI9sN8y7Lc0dX2iEwzE9FcsC9y1zBv2+0pjRLrWBKsPiWhFZ4FMGU7G4hCUl2KZQQgzBmGYQb3CEDi8ysQizglQzFv1EqOswM+hCgLlApiDLpj33x1dogttx8IFS4ZzG2M8vHLL7R11zKlcJ2QtEVU1R9cRQH+S4oLeT6LB7ny8KNp9oFCp4d/eZ4UdP8efUtFsdc0uPj4lWiAaYhew4LGXfNwjiFq4wgoeoxApgI/wCmolUo2PAmrGDaowJl59G0vMdeo4pU1cNYlPQyowVnmF9EtbRi7O/xEV0hfc6l+8T3RHUQNQaxPxDsElBBQYiVF5jwwAaUxhQ0KIcA8w4XMkMTCXwhHCMwJmf8skDpYxOL4Wi4p9N8AFJAZpsgUzLHJLzFsjHESlTyARKgYcTEzAzzgFRiBlayvi4YJCnvSWDlblmMIH0V/uYV6dtNiKkYiobiLLWIaDhJu6mfgvPcqDECq/ngI0y4LKl5vf1iPGpVsrJxk+INHZzcEIyajcoM0yuErhZYsCMUvr2l6I4WVDglCo6YAlSs8fAVP3Fw69SkuEeDh5XMIVVSBwmIKs4AFuIflMAYxCucxFRBqDyMwlU3LeKzcuLarggVwgKfWMWJfptcyGuG/wDwErn3Jc4/KMezyFqxbKVQPvC3Lx11LatT1tiwRspWOMFyqmIhb7gYuwtfgmJtUvOAImhruAKOEZdxRJQNunshgfJLHTMlQe1KO5iRWhlArlHykqVyQE80zEANePrH/o1+JQXvivRRtJi33CEz74Jip84/cHs4f2HgLiVFoWVnAIcQ9zPDZLqMqNhqOIz6iYjE10cWsdpYpLCHZSBDW/MESyMASgyqiRTZZ2CJGI6i3lYc3KdUVs/pKixRZR3n/f72hs7HMOEqJH5A5q8RALmWES39nwwb1AicWqP2w4eEEGNrMiwpzwuY5h2MyHbKsjniaYjrjjcFT7X2/wCy3FtPjNIYlK6xPmN3n8qZ16rYpCCmC9qbJUIWLKURoI1CzRfglkvkDTFiO4uDBYS5UF/rlWEqV2ygOzTMIlMMl86jncaEFdUAV0+8EF6QDbKVw1GVCakEbSZuVxZuATySq5CutzyzKedwjAjjiuaI2wO+HDyb4wMw0zR3DL4JnLEFblooTBxMsw1BXqBcdwWWEW2iXNrMGYxiG2DNDL9deuxuHDQogUUSpUSuUbESuKggrNpa/wB3s+Y6UzBXt5lwFG7ljHzw+7/ExwvD/wDYC+zV/XcNXm+2dxEJ7+eaFsFEvlks3M5UBbF7gSLAvUr1KipdkIbWdxDjUJcuu0MGR76frDMqVFqKzMTs9xaLYnsQ6szkPioYu5hFgyozUu9QpZKUUboftILvHzKdNzVBqAFs3AL6lAVLvhQi4ATZ3FV9rb4JWjkWCni79F1G4ByEA0Sko4No3CjOvbqFHTN8Mqowe0bQUnhPbAD0lWiWjuOX+zLPRcB+T+uMgJXGo4+ZEGMrpibpXDwRgEzs7jKiVBYkqjEKLjLRI4lD5RIeClcKDEcDKwzQyu+18yyiyaMPcp/qtlPWfLl+8TZBv3TADg+a03JU1MiRkdjP2jlAM+/MoBTFctBbC8nUo8QpihTtaq/nhlgOjcOohsu4OCJFiBcIvC0QSgxKLUpv1h+Tr/sOgglLbl81KEpiyuzxGch+IDZZKkLrcIURb5XRCqgZRmyXL4IuOVigCC5fCZ4TNUuLqVrMR2iPyQy0w3wyh6qDUGKRFmANo27mwQSXWGBWSwEoJpDgW9Qj6DmvRQQUVEgnZlcXFv1XHKQ+GPTHYHf9RsW9jX2Y8PxJv7wPVh4Y2Va8v6JgAeJQUkMnmFY618r/AFy0xrlg2XxnHeog7hxlEoAYI80VV9kUlQMQDUrmuEt+EhdjHkLGGgTNAAUT9v8Af2lcHuP5hpMPpHaY3Yg7gV3LQBTAShSG5E9P+xCXRX3X+IPVrmjX1zElDTWz/suvfVOceJSLL8TM/wCPrP1Mh/yIMtgR2HftL899mvzLMT4uL/UuGACKYfXCAmI2mJb1C+4tSvPFc1Km2oAEbQdpo6gzNxKlxY4mXcxMcRvNRCNRYGpUVLkvEFZ9wsP+UcO4l6ZcYuL8cUr4YhWTP+HX9cVeSXNsso/DgajFmp1ZEXc1H2jcs4y8TTMEEWoUo2QLO3qPCy+8Zht7gLMeh3N8cnO0gj5Ff4qYBFZ6HnBk4MXhL7RhDZHOJMMdh3c7AN18egUjXF9DVv8A0iStQWupUWmeCPUMkyDi+FqbyGYVGWNDKKLnEb5bX9KgMrqDfBHk+m4jbCmBllj6AuVEEpiq224IlnrsrgMUGCVJZ5TWNy/ajqTWydYCrY4nxBUmSC4s1FHHcdwFwHcyYAamJQc2wIPpVceaxzfBEiZuUmLEoUAzcr17LVGvmoVnkJzDciQEm9l8xeIe59qI/cGgvQz94ABIdGaJuIt+vDDTcfNv0BWJah/xyBp7S7Z4KTSVEESh1CJzV4YRIhke4tbjJyyGZpTP6QBIGUxFnT46j6U6ZXSHAbipS3xNgR+VZ7MQaDBE2jbGokvU6RLGlj7/AOYOkv5r6QE+JqB6S+9/b/7Lqw3nUKCXdOvxKPdshuvrEKdk8JgXBO+AjzeJVzUvivDuumbBGJHMYuL4JuP2yX4lGW5We8z7hGbrRzMcf5RxlPuDP2Ql44FqlpF03Exc+JSkHCLLGJ+D8QpsSgL16GZsZmMSpUxMSlDqICUuNIL1AuAmpaKrSyCodsxiJ75eMISGrn0tZ9YQHSTTlz4lUqOFytozAsttyofXXn3hQaN+ZRDrivVQ9YdhMsoLicJZAbD0JcEzimOQQI/5h4jmkfxAKeFPiKuA864bFMyj9Ig2HG0ahwFwDhitHrBtjuVioA4oIQX3ADXDVZi1GxEvq3Kr2jgO2C7v+kJyCX628TLzPdPrMwENQzHOYiocEs5OSJyvDyNSiZFQdiDeol2RVZs4vjr0rJdyu1lRk0vudSkGWD5glF+/n3gqHEejG8p2H2lYeBm45r+B/uKrDexEjnllcjHRcLa+3DgYEIcWUgeu/wD7CT2Re4lPuI86WTAMdI2TPMESaiKrUsS+JcuM7q8oK88ykD+PtDFzPJ/UEFnpYrWELZke7lQ/RYOrzmeFNpBVdrT1/wBiCSlrxej7ZitYv4giFp4ITfdHMWpIts+6MyueV37D2gDQxCPGSFkAQWpnm4sR36GLcMGJh7/uXq6OIkSnMu1uKOsSxyMVY0YgpcK/bqMWHMvVbXMO8b/4ObK6w/ri+AIwsbINoTxqIEDlaDbARK6Br6+0AA08VHgwsWMWpfUohllXUaqIGCBGbgqbn1LGChQWdSm5kHn+oQHiPHOZaXSJpG3LFdSgy3cqsOjuGpXaKUcq7Gam4wzE1MMLKDUW+UoMrCKa5ARMEjhdhUIKWx5Sw/X/AKQRauCxc1xdS4/TD5g45JdwSBNROCyp6q4WubvloSjUWEt9pcr60s2QrpiKZhspq1sfuoQxAuBNQIuMcQQq88EPWviw9ahlgBjMCosMTuVeWKy/QRY8+0stmj299kT6Hn9stx4v5P8AEA8pok8wdWBow0lJfmaJMthZDMp2kwLOXJG+hcXoOLjwh6RWoQBqUCjiCZ59DLTb5ha27fzCMuKb0joDCXHmhdyaKhidAeuK9BTqLL0cEbDv3HVVDfue81nDtwQ8XGdxIUHRjHtAnUY81PNv3z/yWWA8CJa49jf2mEPhv7Op4el337eYGdAVFL5oRK4jv+4rNnpXXJw7VZlKyYs4li1FJlyfZgVrBiWD7y3CalKZQG+aa/cvG0xMpsPvDaJg35hUH+UcgnYyQTHfpWLRF7y/AzRAO4xQDK7uU71mPM+WMY9odYPDDMEMrU1K7I+8UpWeNv5gBi+J5RJFHD8vEFjolq/Ae2r+sZQSIxBm/wBQs0tsMxPRlMEcJZ3GEqLjxLAe5uHlr6yi9rXxMkwytd4hVspDeDWoi2uCoiIojFVs5vjCvaoD5okowxAvcLyjuE6hsiNYxnb/AOmYyXYbidxXD1GYIpjtlIiy3LcRZfFZuBKjzSI6gdsfSFVYrv8AhKJAfTMwXcuUTdwxcVGqEsSWvcClMsZ3CYPDZqAYhmoZJUqoKpeuCPFJZxUyiV6lRcNZ5we7gJt9F+hxFvXzFVS0+9mYNfwt/BB4UQouP7gAs1NkvNtXWsQF3Ged/wC/MP1WxeYP3It/YOfszC+SlH31ArVyvcwB2rEhw1djBCkQlQ6oJR2S2/jMMkw8AbVTA4fk/wBQmiIuSt7v3xcRgzN2TTK9F3DmhMxD2kFG2z8ymkUMsFrGvY8SiS44obZcqURy6JUF1Nf8n5lLDFNxb1+oidDAf3FA8Qxi/oK/j+YKVZb2+x/LE97W/L/krQI83wHTZEKaefh/7FgXErio8E2so4Q8u+GIMoIJT1Ht1v4hFfYxHNQyt/1+f4msRL+X/fWEBisNQzgM2YRHv/BAJcY3sM1fBX25rEwIfLGMr+D6RDgi5apwQDgfWZbARAJ0P3I9TXkYh52+e/8AsqaU/MyhTrOJZcyxiQim2K7qaEdFx1PE5av6CYlwz3x5fb4lG6nS46lQf8qHpgGnGdMKIPvEM1g4SsGXCtokgWoOZY2Y3K8R+/8A4lQ+oJVRZUfgMLjiKqOwlRhFS2EOD3O9K5zfVsFaCCNKlFgsUZ6lwGB5wwxYxooXG61ji3nqEAr2+YJcF367hGojqaRPELY4ri6l36FXeIDA9WIMrGhbAF2+lf8AIChT5f6muAQ2yQYHX94Qol0HkElol57lmHcHgqBABcYWNMsqyB3VEdj4Zro+J+0OtRL4QtypcG9R9WB6FRXDDd5409nj1kY839oUKwt+upkaq3X+9owfJAxsytOHKW7vg7YXKgi9ojL1n7RHsOT681Rs94iCnro+IARxLWsygxwAtji7n0XvZFRxW4QQzv0EQcRCqxK4Ipg4XD8xBsjiIpF8rRcHFR5o2i8kqxkeYJFZRKFQIfQjsmNyqtWyk4l30/Mrf5lTxiutxBlTvHxcK7v4lKxLhDCXBpyfzLD0OYrhGiNdMGosGUYiKUw2ZSqm44lxYzUckcSnUWa8syMzHNM/7/dw7S9H5g5Ny4DGJvPmLuQ9pstpPOIm134Fj01rd+8HsgcSgl8bDfv/AMicjwlbBA1fY8HX3iNoK+U+GB/T/DMowFsSogZmDEO9Z5/iFpqWWjKzJcoVDCRXCN1cHc8J5Sz6sFAKhqGiWNw8Gztf5UI5E/UuTSpeDfnMWlZ1r7QaqZco2xr2e1x1TVe0daqfiOKWoCDQjrawpjBBqORLTzUQYdHCFuUhZyPqFkoLMQzBGQqBmOu7R87kAEv+ZTJmdYlHczgxuVdkhVli8RWQiSvUehVxKlDua5SYYN+gjygWkKgSkKBiMiFUECtCJxt7wijDBvth2dwjsSjeYN6hCG9JtSyU0zfAVAMEbhGXLiouLZjwR5cnotHPFRm/rMDT0kFxpGkh1PUc5WxiGFsDqAh0TBnZ9OiXUYuIEC2FfaPNxB3EB0lgUdpROhh0cVj0OAgYcJYbV54eW8r9ytNR0uVLIVT03wLiV6aS3XBYsfskUTQDG6/cIrLr3ZQDNl8/WAAoiWVGpwWDEt4a+8JLg3DgLbYoEDZqANSiKoSKBcc1uZVUfmAnmUGuKjiNsdSp3OplcWpapVfgiiwpd+ZWwqLW9B73DmpX3CcDHrNfcIJQon3Ejf8A2Dsmya/+xGfTrX1iUpcpgj7lS7ZXvQRD6QQLi8HydP24dTDdIGVklT2Zmm4Fyoal33BAYFFQ4hPkSysxJRZ3KNkE04wotcEv50TlH5IME3gL7KPim36EJ7WRiiL7igTHxNg79ou6/iIUPX8wJAgN+8cpqK3aCvCXgMo0ehM83jghiBM09MC4lcXUN8GGoS5Ri1DcGoWsHcDF42hGBYIrkuZWrqN7iC7ivUCMvkjxQoaYsA4l5vhRIlRjOHcWolrhgPQETiomkeN8WaOEYwYNEvlRRPUP6MeKqPfbD2hMCDJdQLTkgEP4Rw6/Gfxuea5j/eZ5yda184g2WQlRohyiTApl36ndHoS4cbomBjuGo82Hcz8o9BqvrAJGfpmZAm5gvPfO7fB3/UMHAUSs3xpMe2QBRd98VyjgzL4xIjVg4hADXoGKyaPmfQaR0jK5JkWt/wBkxHNRFCn0f6hGKuDA58MMhFeSoNy/Td+m6NqlL5cDtQ/mYlsl9dP3JZFKIPcJ/EMHQRQxsbIzIjCAqIZwj3S8GNQYVAxLjcyTAeYAo9N8ajGwjmXUR2xwRGiOEpuG2yWGYrS7x893CFbZidixpZfaaj6EHZ2Pv5m5fBZwNfwfabw9Pf4lRUchDFEvVbQjr0fDpgGIt0EXRZDVKePJBCu4jHwmBImxzv7RgE82pStsYxTxGOSUKNsZV90s+BqX1GG4xMcB2RAMGZf26PsW/cuK4lYV4VRgN9Jt57zFCkgLEB6uAkC7UdllZKD0dxgHgjDcKhCNaYo+YFWW3CPoS5dbmiWRWtd7GL2niGwROF0SkAsi3KW+L4rkh1T2Aisg1Lm5iGmkMJdbm+SOJcNsJhUoRiVKWYKJ2Qyi0Q1NqpUfTFARFjZMGVlLVQvs+8os38Qdu4I1Blqn2x+octp0tk+v96j5Yn7RBkJTuPHcYDImDMTxKR7wElgKhbmL0QyqxDCyVwb4dFTcdytcMZtcBpEOyAEQF0iaNuIHQfufmPETLgTPXkjEW1HwegLB2dx0U4NR4WTqAQgyCrr3g8JZAjEIsP64E1AiEVshncKqMJSNsUq6gjRL2GYJeHRnjlv1HDybahQoS4t58EQArbrt95eF0A/356lFajReP+wECiXLjxS7yBpbJZATwba+8uJUMwbRx5imdvTZgiHxDUZUqVxdS/M9oxBPBLrvECrtuFr3iWmmX2szbgjsfvEulhQzZZj8wzJdxgpSqc1KlSpaEuoAoY4rL4jArGWGcVt6eIWhtZV1r8/eOKOQw1iMRpUMRFb0TNnsfeWOmPsi0S44jCO4SnUWjl5m/wCY6xBbCQwxFWmwWrnGIQwH2P8AEEwPj+5Ttu/dYxaV4czGUD27jKUG36RimNMaiHURVMOJ2wVDKUOahx0I6egZcV4Cwq4lHXUVhfAX6W/GbRKEmfMEdhEIHcoQAIIq+gqosU09DEyFPocFw1kLFil1AADkI6hxcXGPBcXmZ5ZWKeUM63A9xihuU6qfeAw94V3E70EKZ+XmAwB6MUYrnCD1l7x4xL5OgjphMFFr4ap1CizjZIEQmY2XpNBvgLMSwXKzfFwwx5YvCZsZqEZhxTFc0XXT+4q/HwlB61+XL+ZfFQCVATDPkTEubgtVSgGVm5V7jpzqD0+iurah+Ya5upcxBZUwaZcA2y8fevaKISiXUYRTtAtMALKX7QvpD7QmpIKKBl8G2pnbgC1jtD+Rf6gEXD3v9zBhdn8kCil89Q8zeW/+HtLmzqHh2epEEyh2zJa/SuYaxfEd9ECvS+JhqVDMsMdhGUIMUqPHc6CJcS6iDBipkqLArfEAaMfiaTk/7EzCDhe8yqMWMJut8MougIh/cJcIKio7LfIzlKmSoAoxKAMiz+SJFLFzTUPhWzOc77xg0r1AeIqxFiJw044I4jxUzA9v4joj0hvcouXGKmZl47/25Tz4Yx8EUtxCUJlCSo2mFHmVAwMchHllBmb9FSpjc+YjqXJeiDpiQai36KEPrmNtQWdowuUYgQMDyRb5I6g3w6JuWX4g2HFhHakDTgK7gNQblxrK2Y9o6MQSCG4ebmPUNhY7YDUHmbQc1LQYIY5XvPO4aMn7wUEnzn7RqU/Bj7+YWBD0E2MDoMBSF6HzCbGXmqgVFYFW87lPOCROnhZVxG4rJIWUblL7Jd89+jNFYv7ZlCrxxnVig70fzL81mCsxG2Ov6lQfEQ5JjbktAa/JGDwdkt/tZys1ya4vSPkD3gKkcN76vXco7gkXELaGZqGeMqiBmx4WpmuExYlFseGC4/cmydqo5Hrx1B2WuuuAuJdxkVZMdkAFyQMIqOvcG8kCOORMMo1A7BmpdH4JgKI9kNB9NYFrCXdEMxRHiPXid/8AJXDNywzAbWXG5rMA6jnEdxdohRY9Ryyv/f76xWUPv+Z1Uj/mETCjJyZe1q9ePR/oCuMzPoKS63AcMcylg3DWTK8oKSN8KqMTEZk0wFUyytcSzuoGCNEzxStzK6eobWYYlX+3KXwTDi0fMMQQN8vFNwjcYofmUoMeDUuXzaYioOuKhF4XZiMoNFKb/UpLdS/UMMVEFsmvji82Y/MZFx+Qf+yguOVnoI8EYFPFapmIvDCdsPADTkGXRKYpTJOvGBdTaGyRQxAIDAV64BRmGbEglGBoqXxjjGjqG5PtLVKxRoCgTBGge6YJUIN5IPpPCUjc0uWmCHmMCVHhMuZ9RophouPG+KFiOYei7L5B7dD7/wDJly9R+EdQ2qNVmn/5BSHvqBKxPmdlHf8AUqCRLWNQzaXhsNBbGJyGVwzBEBaxEmHB6GVNhnUYY36RXiFsxVLLrmu2EYEUuoBaNQjwMWIWMxZNY/xLo0PZ7gWP1gVOoBYzcrlrtiXUcxDLFzQcMW0LlIhKlkszRL6VHn+pWtW8LcRC3lLaFj3mKZvxAFq5VaJWMyo5czq4+Y4gGeU2VHYkZAWkDIERFLOmVny/g9VH06+Oa4WiDZZGV9DExDLNCDQwAojEjiWOIkExjrcThULdBE0BoRRZZNi5bTMENEuV/wCfKXLlhFiUEEhcOv8AeYZsCL4Rh2RbhTCdMT03x36LckpxByslRUnOlA/e5VkOnXoCPCXGEINSCwaSXrsv9wxs4uHrWoBLI8PAakNp4coEhCyriL0QiUm4KQTFDqDj7IJYdHCFYaKguANko4YSqgDvYAt4jprUbxBxE8QXa4Xhp3KdDFXJ1LONcEoisvi4cCkwxRwS45lT3gm9qbjAVQK1ySp3LzXpvnzsh+ncRTsODc5bqCW6M/Rv7xgqz/8AUaG7eoEe46nD3h5OGG2CkWHXbUpESnNCqx6R4JciZN2WeSDDAlruVErmhUHZqDfwPSIRBHVQKDzwYi3zgQNUAGCXiPoBHVWw27GWhYH7kVDgfZ/7DRBWAVVfEEu72f7gHP8Al+pnFXziI1suXw5QHaYILCMlEjmGJkq+qHHB9oZ4qJHmGHURgM73LClQdbhHWr5FuMYEdSzBhxUVLj/f78Q9zd5iKKs9wAF3/XpvT1gwjggqD1GyZqKG5cWVEqDNytDcVirBDm5QdwcYaAs/WULW/wDPdePiVsl/MW8M3FvHcXTS1/25S6n+L5cGAuMp3n3h4eIzYhtEsBQUGiyKwnqWoN8HAFT4CHoMuxBWTuGolwKhKl+gamKzgUDgCp+AYrPS+hBiUdKl3e4DyqU93HL0lhxcrx9j5gedsuAfK4SSY+YFRziCkSaUzGviFqt/HCgSwmUQLZUmKiYOJ1gJUoI4SFayO+CYxaEsApjqv57g1gUPVhjZFowRuSNAEhwFxhpiUAwy5WHyQBZCLwVF9IgTUHEM5lyubhxBRGGZUr0DIUpU9rQITGRx7IHV2w+PMvDsKqP4o6fEWpyagBoggR/YlDfdf4leOKg6OphLPWL+Fl6e5ipRKNZlk1LdVDBLujDxDxD0bYolEN3B6AxV2ym4Z9DrEodn7oHY0/P9RE9CG+KENlrvuGFU+CWKb5H9TXH3mDzN8+QmTKH0Y1cHw7nmD4lVGBrngQ1VcE/ozUA0Y5I8DAFMMqIjUHiaQiJLCXUKRSLURqICpuMCUDMduCGoMe6MJrcbUJ0J8xPZ+8WBb/jDivS3XxxbZBLmGowA+sAVV8MzNOG+DmCsxQMzwgtl47S8pbGFU3zl/iANtrr/AJGC1lf+fKEbYjuMVC4AcAiBLgjqJGkvFMkqx6W4EqniudIrOHlUcw9d8v7RCwMBVJ9ZBKGNel4I8UQ3fiVUj9YkthAqrlfYZtdQG04Q7CUHIphALuFXBd98FUBTMaF9cMsQjB1LinuKO0MYMQCBFMBXACVDVR/cPBphY7dTIBWEGoqGCWKFQ1ZxdReCVnrqVStonmHwJtIAZBj4xCNXK1sv6gUVDkhFiDfFy+GUcRQLZri/Rn+OFtmGQgPLr+4pHydwgBQsYKUrdHc9ygJ/yZbXHse74gxS+67eCMVGJRgpXp1GtsZzGHgzyMaLjbRGrpw6ectvpBjH8y1sZ9YagTrEAaC9xyKj5iQsO5U0isvF80GIY92VwMYVGewwvHuwIF5XHMqNtbfg/wCyoEplu9X5/wCkMEkrise/9y1BEtarrp+kDtg7P91xgFJhh4GHhClkTWsve6PIcBLqbjxcvgahMCX4QkxFqDiyDTGJAwlR5j+kdiMsmvMqFzU3juZgmL2J9J7yC/rAId8XKuVywp2zANG4bJuYVFYy5dx8x8RjMovmCKtS3cAkFUhwZnZKBMgmKAp3WYZWv5iQv/6o+PX7lDEFWY1E75rR7Sw24V1As/RXLxfoRKT0aXAgXwcejH3OMEYI3WHcoX6jc5AwigjXrUAghnMzdQ7FozBWAQekXMBtifT4lF3Ew7QidEfmWAx+WYTBuUK7hCAjhvMsMPECBPcRChmPC5Gb4IRBgUhmXbETMlM6QJQdRzzhpXAO4DNFZwsLslqcpwnZL4waYRaiaF59mHVlNIrLPhX8kyDPnhgUz43+Iv8AlD+IAexgm2KH9F6PeWku2v48SjkWhcGOxnRsfqei7lcqCoCzEccWG4gqZtTGOYBk+JdBSKKIrYBNcoM72eLgRGDXcLFxU3zDubI8rNEKZgR9LqHleiFym6wxuUrUsRu2j4Gobbe/aAGPM7RLumVBOw/qUwk3UX4Q8zTh5CWIp3n7TIKACOGYSp5hLPaAKINRb4YNy5v0peJvmPwhCxiJhmWMEZUyl8yriXLjZ/cQDvP9SvbUxTbgDOVEFB7HBLgx4uo++Y2ahBC95Xt5gpUNoxO4z2ixjFpltQR8Q0zxhEMUNoM/NRr/AO6Eq/FEloIVFiZZm5BdMu+NCEfS65vgiROHg3SIFcc45g8LUJBMkGwgXEqMFMvYOpRGTPj7/wAHWDbKlHF4g3ZHTZLBfM2SqjLxyKJO5GXLEj2EBAHsbljdz5b/ALmDUqqWEAMxWXXHCeMIMQw5g4gy5ZRdisX/AOACKxLd8VVjlBmYRgVkwZZFKly5Vweo8ABbuCOEO/Ms836sQXTwyoU784+zNNfFX5P6lMb9X9RYBDVZfk/mVYfA7JbKi26X2IbKg9NRJW4qX7Rm9oSpUMTcYSuC3o7JaoZkFlhnqAgsRbU5iRowjKUASXbgGT11WiA/j/zKgB3E2jMFZ+Qn+CMqONRCld8ZJfotEyuj3gQhCGyiMzZWa0HBmAK0HfcVh3Kn2hpjN1FyIYjk3NImB00sBiZmIYJ3nXk/5KK6lRmC7S/Q6lGEwY54T0JAsvUKrz4jSVv4g2UwlmOJSo1wRBdzTcRUZPiCTFcYApJghSsfX+L+sA+OyUfe8RCFYNGrOrho9TzcDp6isEqajw+ZUpXDKezgpS9x0KwqtI1GVUG5m/OF9n9qKhxqdEo+E1qBm5KuW04GdQYnqDhXNy4OyOEFgAFxsbhYlwIg8bDqERtRdluYbpjnUv7gzaBYGRcOT+fQnIm2G7JRCGuLIRGZdolXHcH1MNuAyNSoOFItMvRYQJlw3gqZTLBCGYQfEAwbgirLMoFFPqOWiDzAqaTfFcIMTrMS5u0sbiDNrGAXOuFFlgsxvb7vML6EPmX0BXzKOQfBPxzT/srd/lFjf0LleaWYFBrH8wx6RXiKxU+gl8Wr8u/juA9ZLgxbhwLfD0NsGqK1wf4g4xeD+WLI48wb4SymJjf6Qqr7oFFcjy9ILqNHoupCRhTTKF2n5mFwUFaf9Q3SQy3cLtomxD6P9Slp8CYVWn5B/EJfRPBwofKfiCA7lpb6DxXiFc0pRtlmL5s9mqbXZ2eYMSAd9y01JvhYiGSLcjM00Nk3pqjallZtGKUQfolVrfRAlWfeY27jxUpNzAg83cXlw9jP4igK2I6jtoi9uGU7HnuCLl8BLuXGIFluprF25tilgSgFbgVFmvp9s/xK1ZbqKNatL+n38RCXpzXFehGEAHUv6iWvhjLm3C3HEdRmGbiXMYhzKB8QpDkOohV3z5u/2oqwwVx0JcRDyJucBKrleBmInFQ9TNSO8RXZiEFcwVFbpqDUCSm+AoEsiz0wlbtgHZE5uP4FTNYQNv5e0MuAi8tBXmNMy5CYC2ADo9ww7Ig9QkxEtfrSsjes/cBoxypTApi01E8c9wbR38z3QqEGDiELMS5v+oQZ7yu+CVDhQLYLUqm3tKA1iJZSub5AaYEMwOhcRunxCxjiUvlKlr2MwIrZBNEeB5EtY52MUFURHaXZ/UKjY3KTNhuOEPRboK9n/gQUs5j6OPmBiqihqGLSw92Zng/CXLe7qWgVP7iEpXoquHEBH0g9RuZgpFykzkJzLH7yvd6glWXot/4g5t97zUCO2RSnUXe0+nTwgdoT5GZnN4cP5hZOaWYGUhjgFERVEvMR0pD2JxLUQixBTYo9BmDiszMh63Z/veULo/abuLlmuGx/qYcmvMvvEL46ELaAaHHxL4K8ROxBjNfruWyaGVdQUalDE13NRY+8YDE62Aw9m/5giwzlGGmvRgP7lc/6piEvxKCAxBcrkOI8LWphCHuaiaYGB0l8alXMI+eTwirPFYxDr4jhZqaQZhKhL6mHmIjCn/KiEEixNeHiHcCwajrMYvqqDUuMuDwEQ4A3DozMplJjUSyrqJA0ZUUbfpNJ3BxB4p5pKZg1qVD90y+KagxwFD1N4gFW1wejCTvyrWUnQlEpVVwFxxEG4GIIN59ACvQYhjgsdGWdbh8TSBgMvTudyMYA2wE94CeG8dQVwTeCJcr3gkS584tuEKEtijhiElcEfXgQzTAMw9y4vkyuD5YCOGInG/uZRaIIXK2qX47iaxH5f6gVVAMOLkisTr+H/sQqWVm53fGKYmHLNVF3is/Por1YBUqVAJUDTgZQXiHgsqDGMCzyg1Lub9ByxG+CAKTQPb3n2uHNzHMu5QqWdEZ4X2mou4a4SyomJszj+faFrHs8MUZK0f7uVoANHf3gswKK9SXuGCu4xpLYgK1FbCAwJbzTU2wXvhQJK4t7Hx7Ttg7H+SMXp8QoNTcWBBSBXNHOUYgOiALYdL+H+5vCk87Is1l0SNQRhD4p7RxlTt18SgBb6+CB1d83BauKuDzdxvqBUqMphuV3U+HH2iWGBRTGXUc8GaRMdTSHqLZTMJ1M8+CGmJ5uUrMsq/8AqluVho4mNR0NxFhNyL6Uri4kHKvSlwO2CrHDUQbGJsaZbUxXA0aYsRjDCMXYwAixhDwIAJMCJdCe0AEcZx3NuI+k2+GAnMFFssrkxEGWCaRB3KRdfcw7lJSUhj0VEUmrjnBxowSe7IVV9wGxn6xQzPHcK41a9/MAKGWC4AC58zBhqUoHqUYgi7jdC6gyX1hwLbxXOoKvbhxANM7Gu5Z0TrUOnDR+2YIb8MxzVZBtD4jP2Qd/WY0nv3948EW5a164XXYYafJGxTUexHnRKyUPiFsklAzeYR9BH0OrcX6FBbCvnlbwC5UviyvohDi481JaHcEgPwY9cEZUNRY2HkzG2qmcEQBQwaxjCClXZCke5O2rAC6IFChf+BXdYEQTMy1c2KTeSIdtICTRGqbwJ7MkRs90/nzE448mvqQ6FTVuJ0FrwYIlkuX6L4fdGzO4U5uVNyCy3T4/+zOFJ5neSAKcReNn3Z7jALzBEoX0XEDjXZLkz2iNEeaV8lRMMtV5V/cp+HsyrxArLi/RuMuJPaVpxUQ4ccKuO4k+Z2uGppMrqPBlCBOHIxP8Xyh5TiG9xm2x1Hb/AOS4wI8jkiwKlXNNMBeVe4juZsYsuhEEu4IPovmKrSxXRCS2F1w0MGVl+JYRRHcaTbcIgmj++AuVFBbGbaMuuKmXCNVbLNykXqRuVqVu5XNxVy0tBV9QwjXYzDcbuaWxGIIqGArFjfpxDiym7DGPMWCiErxDUxlMiBTwSpUr0AODKvdQhjGEccLUTR53KLRKl8Vc0pdkVPaw2x8u5n3NU3/cr0a+zf1JfFw5VwHBsDTlfiPDMvmUFEotAVg4I8kqPoSypXBGajBIKHxde7PdZjvynvHtsOobzUMs4hXdPMvF3CD3BlN9EYN0QXZLNy74u57NCERqLdyrzgtqh1/tzMgv6MCm5RdCSoASWEAn5Of1HkqT8xJUPp/2OG6exuBlBNN5+0KiQy3V/SBHg+8bgK94nQfhNp/XESaR94kECpfFzC25gMp9vpDQD5TJEGwqLrMRg9vxK3cX81Dss+OSuSgfSVVsg2L2ePZ/iM0u/hP44sdcM1wxiFuVjMVqalAomXD+PrFdu923BJmxG3H+zH24aSvtTFNdSqHz0+kbYg4ek6hg5b6PYlvCvmX6QDLGN0+9g/75hAV+z+Tr9QbObvUu3cZfo1GqhFjEjGKK441HOoHZKVKyt3H1NVhqE1LSmAH/AM2mIQQcwtubEJUISuLzXoHglxeBHUW4cMIynbEM3TsssCB4sQpdQi2R7gHuuZHCSgFalZbhuswyOsx3YQ2ncY1slG6NywYhhZaQrZgemVNj9P3KeU9j+4vhv7sJpo5Kj6MGWSyUfUjWLUpZADBTFMmXPcZl+VD+1kKqOkwuvePKgCI1MQtCQKhCEealeYYm4+8GSDlXzfDCPCvUCj1IC2SyZlQWZ1B5f35iWGHjv6SoYpgTJxc3LW2VL+LmJPaOWb9ZLj6FuC4AJwqXUG196F27gzE+x7fMPR3MyBbr9nvAN1r3395aogXIPGyVpJBiWitJTCVXCWQXdMuUZcBii3ZDxVf3lyOKr8ymWfeUgZ8/xMV0lYY0Wsypw0fzFiqgK4nUbxpAvO/EqK/aEQHKo6qdQc6+mdM4mFC4SuXCfmBLNkBwJQVUJMaQN4CXjl5jmJ9cn9wQUEe4v2ohFyvD1Pa7K0lE67JdStyq5uLcqCBbHA/rKGSzwl9wiU6Zu6uT+oxUDZV119Je7lb8B/EoUFZ7tU/iaZCuNwk4NPj24c6ZgHnMTV9DwysyiMfMYx8RjjHBuLOY4IXvh7ozHIixa3BwiRxYXXzH/t7S5V8gviKm5Llwhblf+Ny4AUc36Anjo/MRaGYOhlKEScNVAwoUsNRiGAkcWqnZdp/iAFCtxE6u42xYzbw69iK3t97lYGUQDNZj1CeFrlhwDjfFy6zLkpKTJAO5XCQxLdsw4uocVHTC0RgzAVRlc0IxPnNr1PdiPXl8ylQpzxX/AJEsplYHL8MMl+jTi81zXFXHEuXCNGYlRpNwWTyWQiHcSVHhbdQGIvF/k/P7mrgmN7+hOWiT0Kk56jzR5qiK2ni7ITDt7wJdXqJM0wx+60QaO+/eOZcCGpfyI9nzLF2MAXCstI5lTAr0LM7haIzMNq/1D0pIq4KgBdxI0KP0XmyIA7Z1L92AWPyf6qXAaemikihiZj9pS31mYcKJxhEWvzcKxtLD/DK0ZO570l/IlxYP0l0MjU+iIEctaX2+OajXW2PZVC6iVOqWIuEz0zKSkGYrjiXyqMy31HbwGW7qCIDghu55U6g0GlV+sx5TuKxMG78Lxf03GKrrb4goqBcYfpgmLYnHkfHtqAf+BwRiWcscxxFjXAZiRS3DHeOOkSbiGOpfuMUp8MepYy1lyi9J7+KxNopkkr0HI3k9VckT0mpkTJIRXFlYTE0gWZQyxviFA3qLKssS2UHGYDBmIaheZtDBRw1qVPfCbSOIhAEzgweHjU36F8y71GOmdknssJVeMxcGUCyINMY6hKsFTKrmvDIqFqIaC4AEIbER1qZy4gBqBLC4YlUcQwVAYcXLhzeaIrYxei4co4aMyhvi+EbJmW2VXIRKg1N+i44Zhsst7hjcSdJ4mXyfDKtce8G9RwtBLwt+jqK8rZXXj8wx3c3PUEBwkJl0GV+kLdU/L9jH5l1EW+cvxqAVb6ROGf4gKU2ecyoUgkot98wAcki9XBeLIsVc+jT8kOV3z0vtA7Hh6GJ2EzFQlFozELwSiWcyzsqBG4LKjmV8soFEJXZlQOampiMqPiBkuJZiwRCYX1Htm4BaCVol1wPLU/erX0YXYP1lrQkBBlxoT8xVLmflbCrZKdVBZzPhioLGW7Zcw2sZrpiWrx41AFqJbaO2VbxEuUDMSZZkxXqWzGkFL6Ce/UsFo7E0pivvN7VX06lyhFCwEd7jr/cQ6FBG6zDLe15/uFJZE4qPFnE6iyrgjHOI8Hg0RQjNccJrMS+Dh9Sbhqr/AOqXKI/MQ65qMFpFXcG4TE1LNRFIzTeFh2chcsujjfC6i3CPNVwB9K43uVoZ8xCPozLGZun+ZeoKjw2UxCtmLjZYuAIuDRYFenmVyHZBxnOIFlHtN9zxRBGNqoph2zIiNTWJSm4gh2XKgy7og7lubqDZZy2lqxaZeWZvN4BqZTBgYzGjoftKR5fx/wAiW0D+YkLcBwai8BvgfMuWrRArnKwDMA4GNYY6qBBdx0N2X+ONKV6ERf8AgpsMwUVMrNEdFglkBFlp+C/qUfaHf1mTsuVwQa9Xmuo6vA2RKiq2+pVv0EuXQrXX8sXNF+d1/viX2U2sAFEu+bgpUY5TN8Pf0gGGXKLRDT8LEUVZPmUgYqhZKKX+DFe/lKBPMS1V7zJuXy80cJct7iqHGmXHm6ly2PmLyxXKNlm4FYhyEWoqjeN/P+Jg6Hm5aNZ4/qAQp1CaKBdPZ19mDDN2YYqgJ+sUFyX4pjV2HfmICZI0inhBCygUPXxAA0PBtaOmDtoGWCUT8CZLZ+P4g1Vk1AxMzMXxMpZKhDELHRlrEFDaJDj88HTArn3rEC44lqrh/hAhUEJUq4BmAC4RY8O+GaixIIx1GPtBFw78RiOjUwhuiMde8GZ/7coqCoMf6mHMtUJBLLJabk3Ll8XGl91BphmC5i3sQBwVrHUG3twUxH2lQa9ILlEcoyuLzyl4YPDBL6t/tARkfEIxbD6x9wwgyIkPthxANEV1hNcuFwSmyAqKQZGPln1+FTD1PcT9XBZoPqv8EINyv0D6RAupYRpSVm4XaZclE9iVKjGQxqRNcC+DaYLnSKHvgJhMRvIzeSOwhNgx0LH+1GAGD7wfMWWLVwVnuDWmZRzAlBREri33SMdx4NkxdbLGwX3gmh7jqAlkW+CJ/wCCpc/IB/epuAFkIXLCNgqNyrBFHPd/97xGCL7JXFWXQqdMa81gi8zICsKiluyD7HcBnl+WXMUPuygxwR5YjY4YmFn+PqTCHLLUd+YAfpiERMLUAsw+kHcTzTUA5/iNRhhAAxwSvSTvuA1rqajvmzUS8RhHjUW4hZ49Tyh1+ZaiQwI6HpgiWcC2l5lp7qLGolH3T6VKwVTUPKSgX3KKaSpUuywTH2wAZggzQeI4pHjqf1AH4YgJ8oL3ALnifOo3cde8oQq2UKZuaNlgnSwajVZrB9f4NsVg2uV8vNQxGU3CzfNYjy+OGPtGLHgrl3KdQ1Cw1iGiACNLKcy4/wDT2hoVLZTncM0xLip0MdvGEeoNlkRDL7bmCpVkER5SukAKIwKYgFge/FwI8HJWXwy4/pbhNmJfAqeCFgww7Z7Tj7amH6nZLPZfiXGYMOzjiZ17jJZC7AbIgEfBH5he97ZnTtnsxr+SJADOlgi9vpsbSUGuFqJSoeSC88W9qILTIsSWlErbXg1WapnPfNYLhEGjUy3KMu5R3EJCrwiVBrsg23XXmVOCOYYlcjCuOWuFcG5ssMEu5QsbgDbKFcWNNs1aLeckR4YJb/Hovh9SDTA18g/smKWPnURlNtHaez2htsOSOATSoY4vmp7v1BqvuXmGLWO2mK5NdUfwS2UT2YrGrb3KKvERQL8EoJBKfHf2IBGBUXaf753xvnfoyKZ2dMZ6uPciKmj8wQBllcEAlMeoZPzEELmoMEjFGBAmglF3Mtsx0xrszOh3y+i9XK6eHmrIlcaitqDuEQQsYP1mH1/j4hOKPhgpjbAedEQkJbY5WmIpgkqmbhvyalQVsWeyALqmOQTyS5+I+8IUxckyWxSoamUCragjiJ64I2iK9IQ0SwxDiYCoieGD185rI/hPvDWD4yfu6+hfvLxzPfb8u4PTyNR9S9RcS5loEvN+PaalCIY+2MMW4iNEEccaZ4K3Ao0L/wCe8FnH+T5QAYi4hcz3T3QdlRxqqCOSUsEHLVmJOWQA0HAjiVEIoQZlZUBYCXfouXcr0JeGDV/XAbf6ZlwIp9D7syjADp/UNBBimFqPoUH5jVZmUJKrruFK0dEQo6uDq0TCogJg8Dv5gSq/aaHPoQDRw+rcaC2Bbb02alFlpgFCSl3NcLjEITEuWK57YkDtKpbFEX3PGBATENR6yjt9oSDBAgQwgG1YwargOVQWURsHPKFjgItLlGjhxlh93w4bYZnEGDrMfaULA++vuQRLOSMqPBBiDZZBljo/b5jaOM2aYIVWOA5qWH13+oY5FlxbZAKipDrd8kw0ZdYlQf8A0/4PU+pQHaLgpI5JVZBXBGVcIHI2SlZi1lgxeGDUGPOHoSDi2XHUzWIoi4R9QfvHoXcvNSpQ3G2Etia9n2X/AMlCaIMTjIhaJLlV+f6g11DyV9oAWQBTFO0heMPZ4hrHuFVEylZigyOsbibJR4j1lnhRgLRTLqVFjuPAGmDX6lNkdYrMsecSQ2ZgLe8xMzCZK4VVK+Yc36XEuZTK8xS4sSYNxUzB2ZloUNYfMQm4+0XRHxBLVEYcFKjEKM6mY2aiuv8AypvH1FHxC9TMXEZKgw+8ouco0JU6/EC6gBs4GiLcsiogOy+kU93LyohiX6HOOEMSsWwfiBTmvMdchGJhP4rliCfSYJsYoU2lFnjfNRKly/WtlzycbhiEYtL6Gs0zo4AmaVD2mDymkIqZd6gXI4Z2wgKmYdRWRF7QGruHYKYDAuPaex/Ut1ZHEIjwGoFV6SA8a/78zcgwA1ylxOZUESz1jUcDtlDVRYwT5qeH8yLcaYw1wYndCpiXuHvxqDFfdAAo4C4xaJU7sRSh/h8+JjXT4JbNa7vv4n+cHprla4GRmAssVxw2v6lAHUV+jo92aIYfmHetlsIvhagjqKG5lzEL0vvz8QKF+3zFafY5MwLXUVmSiQjLjFBe5SXPJlECbqVwYixrgwmlEtTkWXhaTvuVaXXnNzUdfGJfGyFeqCrYmFwKi2E92R6O4MmQ7nvw5OaQiVW4q2xKGp8pQ+Y1wjAFdzMRsFJas7g8JAmInpr+zB/vaG97bggjkgtsR24mRD4IYYJ+INrr3EOfMRlpl+0ZjuMFw9ss6gqdA5j2TCuDVH+1DVENHpRZMXL1VTLFCNnYuIDiAsAwDCucKdMTrsPEOgvY4gPuw9/QNcpfBaMQRLOEvEa8FpLW4VZLFYRmexNUjOXh9Qxb/wDBB3DCHRwVQRSpVCnDguKMaVzcWEZBhMxcWzKCCoO3gaVo1/cURFhzIRdk18RYF2QEWoECsismLxPaAxeJacbKRKmevAS1FB4ggOvxA+j/AHcG3XzB8jcsxDbSgoHpMxKlZ5/zcZfvN+jN3Q4ZExCagvsPzzU1woFsfafMVCLfeGa5JSZ79z+yCOucIsuE26jlFvBuNaQ+kUbgd1f8/uZEv3jxcVt6qOy+ajEv+0oQ9oOBgIdkcwIar74mfq9onbfzEYtnj+4UFHArW54ddyzuo2bbhoYiCrlDaifBBBZwExliPJ+oFxKmk3NS/Tctai5SKp/EcTQJVjcF/AEZV1+DBspYxqKl5mlYdeYbQqCnMWC+4KYYs+YwJqbg1DL+I7JQ4msespU94AL8zb25HkROAuJXAjvX7f8AyZYjQS1r2/5KE3dRRDK5gm4p5hKEgoB3NwR7Oo6ijiNMHGjccpbfG9S5h/tynn6GeBFL41uvqRwoGARl0Zqk7kZllUyi8MNg2ShSUjx44P8AwwlMS2Kif92IdVAe2MOLhaJUaKtwUjLJZncv/wARvjqXwA+lR4rjUs0JjmRcThcxY1PZDCoxMro45wjCkK81H8zmkIQiCVsddQYgng2TCSvDLl9okiMTiUMC4SYgVukUnQdRwhmVjUrq37TKEHjEFRC4DH2mDz92Os6eGUc+m6inavEKvH4SmDi/RWx7xNbp3K5dQaAq5VnIxeHivMFKc1KmJqk+OmBc7NkJUl+Az/w+sXr7KBcfkz9nX1nbX7v8aj9QGn8SiJMoylXwfMEUtYRS794Ax6bl4/zHNYfMclxDCAkU3+oyL3A43wJzeEEL9RzAqi+x4lAeWDk8FIt8XLjyR43GVDETL4KiQyjD8lIgR8pQBqFEcSjPXFxzEqASmI6GL5EM4mWIlWanyMFaiXX+/wB/qgTcOPMzD7wE35gEr0hL4GLc9pj89RX3Fvy5Y7lDzg/uGVj4MEIoISE9/aFa+4kXqIbZWbYApmGGCzMu4LZPKLhgLD4hSVx8dE/3/KYkpBDBNJucptxCrMsomk4mbNheC74zL6WeQrxBotkP/BOidVwX1iojEw/M6goo5F79AXErlJg5ltXUy74JQt2nJE3UYpSX2R1iXFgRCCZlTRcNbg4uKlzDcfmFCYXHBV2wIMIoLhS9H5mz3Gy6lRb1Cu40YAqFP2kpBSY+58VKZpfBFflEM6IVF4q5XiWm5ppBMiVHgCDqKytHywaIC8e4BtcjFrRKlMCvrCqqFGIB3AlcESVbZsO+EuClblpubjDMpgpFfPhlSkHwSxRuHdWeFjilRhHQ7lQ33nH2iXP3GahkoEwUkQGoEtcALZaFqPzA9Me8yjH7kOdsb+JpGZai4bKIfhAuWCTWeMRi1M2BAl5jwBHnuCK8O5UqVwSv/EimOqi8ReRZKTNxsEHZL37MEap+0Sq+ai57kfMzBxYiBh9ogvtEIEFyECa1ClLKpeoMfma/mEeLm+L9AES43/GYxo1UUEz5iRgDU3iOeaiBQxIraItl8IvBR1BOSWhbjWpWYkbLjw/3Fd9TAOf/AHfKY6J5IqmfJvxUbG5bZCqgrsEJR1NMzPJUQ3syzsVGG+G0dsxKxjffvm/Qqa9KuFDLNkJb3Zv6Qtm4xHqEQ5qHF8KotxOHFOK16CYuPFwWMBssqlZTSSi6b8RReEfCUYsMAMuq5QQFqZeYCpTAmKlBMYCrMmObEw2PDKpcIS6HayuuXSRbtiVWXEsSguJZf9Q3AEmY6hwHmYImBMPEo9kaMM8EY8UZEALJfCGEB4kKuhiAzG9sdkcdhG22AwJUYDeR9J76kzydTcDNy+dyjv0ab4HEUV5jFzyLDE9xzywrhB1YEEKIxIVRmgGriYT0WddTPdftFGOs/SHUMOuCLUvtMu2c37/1H6H1ggZYN6lBU7gLoeCP4eHEO2FVzfqLzEAWIdyzRANwO43/AMURwKlcWagXErm63N5ihuF2D6MULXuhEOuKuElOpgAGVhY4mRBDCJHDAxKHaTNmuYFW1BLljFQx3FY4PqC5UeQvw3wBhiGKY7lW1zKsZYyudhhqmskM3ae6GKikKdzDhtDaNMsZ/u+UWIi5jRcZxLN8FTNxaMQWs8Kmo20NeRCM1RXRR7RDMPuTJ1P3MSewf4lGv80zEZvDhgjCYoZmRrT01U09JZZCoLB15+YRUANHNsgwy68IVs9wIlchEqNNFxCFF+ionFSvQt1AGoJXJUbTUqX5ER5PHmXZ2uoAqoDuKFwzmZiPmKXqEMR6c/xBtRPiaQjsT9Q0Glow6+0SrX7o9QPow4Jv3hcCXL8yywYiuv3GBtz94rhV8Cdx8vvPn89VekU+0CCUbXHmEBJi36hbZBGGuZhtErHgGJrl1DJCVykOBfAh8Nw/C5WpdowDa4oMBN7gZMz5YCZlT5FZ+n9TbiGFmr7z2gJdPBiC3S8r/EZv8nv4jXU3MzVfEF/taf7lNIzcMC48sONNJMSL8w4f/HG/WfGIsswajbEyT9xGREiDY+YTWPUx+o2y4NlyyWQ1qDL2FJZ6PmOUIDaKG3U6T6kxZishGbjCX8RbijVcQhQojJpgofPN+q4LKeTSo4rv+ZUZdZKLWrjW5DbMxQ0n4iIg+8YoTMshWRQbRGCWXj84Iahpcp0wJ/pygouDDgqxLTKVEaJRMmFTe5XLCmX6LNSzIU3v8zW7IkROYjrEWqGSYhisymvYQiDfBFtEuaceWKZt9J7p7nhLxErdv3gVrgjwkFogrOWoAVmTcqLIRhliWu4RlXAori/QMtv2lxSXwNLhiX6EhYkuhExLGdR2bCZQZmEHZAbzFmQil03GXWBY3jEI7RN0/wBQgGos6geFxBXA6xmaUmvpBMV9X8TNUO7uUwAbxi4JNr3sj6i+WpcbBc9pQiAPRfpv0KGWDdG+EELiS2HmFvLJ5B6+kqURDDcueCXLLNmOmZdwWWweLCJFqJduub4eR88IBTNQaLD3/cOFAiO0FGOHWICgUVKgTUUEKtQVot+kSKYqNiG4AKDi9JPrjN8dUwRat+PtKqYpuEb7gDpL29oZeD7RSyKwviUVqghVwe3reK2/8SMTxOrGD9xlXKgYQN2wCPAeor3vkiXZPmPmdUrWTEspBXYm+MvHDMkh1X+4hQRkuqajw9XU3wQ3qGYnApF3HWJk6Wfp/wAlgmIUcwDccJv8Sp7wKsCaSsRcRCRkYjUPMoUNSswgv5lcHP8A6ntEVPbCcJMJUZJmTc40KL6QSBgXZhXwjKiQkFqm5nFx7SgwnJr+ZZaC6RwUAUelPXUcQygytPbqC02fKFyrPLLdNX7MwGXyf0xz5dNn3gdz4camVCblcDw4g3yC1IgcQ9/U7GIL2jUqO6wCZJe7WyriYTLczZqMFCDZf5mheGoZWUwXQea8sCwL7S9r7jMuwl23x5acObtkxgzCq310RbRGzzZKm6D+I7fAYNlnBF5zFrcdDX9wSUwzKRlhKqVgELSfJ0OcDoinsw4cS2TUvfOCgbc47icLjw+gbZYJdvMxdEJSs7/pAGp9YXcXAxta2kafB+IhWC3Jn3mlrhNv6+JUdx6ErGYiwxG3odMBVyeBb+IzJtqyvtKhUrNMpNRGk8EfQIKCDf8A5EcxfZBq1C+5W1Sl8vIapsgGyVxcWMZZAcQKKIvM7orccvSKstVCK+cYj3f+FQY8XGC8xDuHo37f1L7VlIBKuNswM8GEM3WGKuBydRMVOplZ6YIg00bEFUjBGQzSpVL5usY/6co8TS5llE7NShaIcRAkG9csqBGKhcrgJgl5piDADEoRUzHdfvNeJ8vBb7D+Z1f4jis0Vtu4Er0Xz1E4OCjzvGOvmYFWsr7+lzPpyuofKl09RxWMFb9Nze5Qa5upcUg2XwEcQIr04aKieGzIxMJMSvmnc2l4RkOb/wBqIWQ2hgsGoFyqhnglQBa4hPK+IgyhGwxPTbAJQSrTH3gEt5H00/UmJYjoOvRU0y9KOBgTBTIJEOouiBcyjcaKiDfDr5hQaMbArZkf3e8ICvv2YW0yh8EDihz66j6K9uWjzCWiMCuLnP4ePiJoXcIRJXARa2XxFqA/vUpr/Cef6mEcrl+e+LKIaFmecVOnRplCij30nmHDdYnai7hQqAbSxfn49oDgI9EjHc3gcpLqRrG2UDdy6YsYSpUImYxKPQMvkIkD1Yal+oL6IJpwsczUY53BYluoM8zdTMahAPlhwprMBO436KlVLlcFRIkccFS1dsq8nHUsip9YlbULm5k7Q3DLe2FBg3WA4nvOWUcwm+3oGdf4co8CTPTKgC7gJVQNYI86mYsgDUFxgjiDHgz+zw4RmpbnDFLIePkQHs9/61KQA1xYb5gEzFWdQLgbgix9DiCMQCK8BFbEPer+ArEFOj0hySqKebH8/wASiWngjxlc643zXCaCBRXAwLEsW1KKzBImNSw8IDVXMJIlFMwqXrhQ2x44jqIVLT6QQu13ART5lyjcQWsqyR8i9RpTtvgYsoTZC2Q+OrmGKfEBJggaTE9iYI6iveWtq4Aaiy5l9FQpdWodBljl7WDSsJWNrOv1KOttZ+ZUIGuamuL4vmsRJgll5flKiQeuFXsXHeN2XwQtS4gIqaMENqoOkAfX/VFpZa9jo/3c1wGDNTfKhuDF1du5aFt57loQNl5ryf1Aj619fM3T8DLLLN/57H5hfURhNwh2D9n6Qwb/AHP6YwsXw4YeCJJpO48XCIYMRpwRFlTLcCEBcDTkiy+KuPO4ncrkR4b4XxWIPEWMMlxWVM9TqGnMySjhMIPMNHF8kuLfA1HM1wBdEYz3RfEsxXg7JcoZrfABjDHuZO4NkNViKI6IaaJnmVmlwslMI6GZuF/p2l5A+iZ1DRCHUPFCEqVUVRwhHCXLjgzKBmEA6mlMLSncxbZAPSZB9CBcsHtAln9h/cMcr5irkUS3T9RBnfpCdR+vXCwOJdd3CP4YjuPqsaRGLsl+EiqQHzCw7IJK8yyJbmBWublSn1YhyQ0wAHLrMUoMESjszHxC+/EKi4BiI0B4lLF+0rVUu5qBmPS5lkH5RNx+MVmk9oh2AebZo9+8YIM8HN30kutvEYt1ATUsmYECsHAwDLDOfQEeHdReYYl4KIySSJ6dcLRcsSqXN8HBCEfRccsC5qDBm5cugWP+jT7QdmoMPM26oeA3Eth4zxiG3oi9wW8/zFCtcRBuCOTgOLUEFnBC2bzxeBWCA2zBIehhSTMAAmfV8IhmNx+TIy6VjwPI0g1FvgGmWtX7oZl/SM6IXYyyUuD00yuMw3F5ZUqGWXC9RY31CpRuCtTwi9XGDEV4jfOYO2YBPMSifPovMqNzBFgg8pUARTcscEATUaNGY1SIytvLk7nlFxbjw1AOBrgyxbn+Ilw3KBwFEJPQZgxMf8OUeAWGovEDZM4EmxyZieg8iZAQFMGM8DslwFUj0YcfEJQzATaOYgKZfT19oJRPpATEMVlla2vxMy0EHaKzX8Rqt8LqoDUqpsOHvxKku4juHEGA9ISpUqubg2ajrbbLiLV5gWZniLLOlDXSAWQERauAj4RJuUxtblgMkvhwtStSyOV7l0PeeWZpsTvcI3M4OO8EF7qdrAMStzAqEq4Qiwl8mEQLuYDabH2YMWzmguBt5cMzKHcr0am5UT+OY4j7h/UKKT5NxNCu/eBHB2Of/kXBphnLxVPHXC4r1LxbEGWCdxBax/k4Zat7uBYwlNGI2l8QxKCW+f8AL6Qs6bts/UHj5z38HiJ0p7V/2X5cdVErF+8OXY+v8Qjzdl/iUznGiogLRHf44oSmUGoRVNY14lRgEcLglS+EQXiymOEuhxUzBCjOIe0c+pApIBsV7dQyevFhW4oVqFgfWMpd1ROQSjLyeSNHFBvWuvQtSwlwi8Xw8XLgvJuDeIxK1Ei0lmB1HLYSlYlts9zUVIYFz5gw+ZV+gLzwaKITKeYLlVxkWUhuCDGVyxx3EBKG9HzBK4FiorwC9xeTcQXFfPkB/wAqVgiJBUzJixTY51L4rgxUI09DZueDK4u+GU/rAAoldSBaNEOrDcTXe0/xAAB8LZ8aiGiN2Tcv/ETU68q/qv5lLm9VH79cPn/suCsmOH+iHl6KJiDFi3rhvqAtxmWXFJuNbLf32gFGvQg7lPhL+Ue8lafvgx7xlnDjO095ThI64mhUVT3yzO+BG3XedwgI6Kmc6l1DUIQRxArg4ORihMbYFd6EZFR9mJlWW66mDaZb0fYlE4YWWvQR4CMJc63hiVn0MMeYgog9yWbZZUzpWWPpQCUPwzGktENCbcWLHUsv3/SWQXligQRtv1X+IAFHFxixLDSSjTC8RYV1NS5fF0SgoiUaRFdp7ZrgUGxz5h0ErWZ917zFd6gjuZuLaEDNr6NS/RjnRB7LmKMPzM5QcWPX0lA7eu8dRL4Zc9kALIXQuKeJbIeamMFcVjgY+nfoAZ4ViWCVy2jWaT8wD4i8TxR49ohIp2lhPmIrXoyxFRNsSJcZBFYgSMyZjAxFBqXyxjGyeo6ix4xyRi8S9XMpnMICr7gQU4if7vlCVLDPvivHAWTY9V8IVgJ61ekVH7pl1wQ2u3Hc9zYA1/vaDeUJqUdf0+0BNI2f1yWgQRlS1b/vjJtG/iKw+oBbBASKC3UUdfKXbsyqjokJJW8dTQS4vglgQ95ctwkrgZ9ANahuDriLhXFw0iCWkAMQhiDUG8EENET3LvnE+OKFsAWEL74QjxCADjQJ5Q6mCUonMre/ovnUu4EqW+JKgeikqROZdxTuCOC4mZFRFNggVglRlDuJ31CnFcEl+YVr9Ily6zGFcnNc3XrDjwInv6jVaB2VdvgmKIkwQdg18xxDCJrg8S241gGiZXWCJPsQdIZizFv0uJcQTqz+YNnBKjyn23GTNkx07iO6Zfa4IkFSuHxwRjjMXfowTewEuUZc6oVLzEj4jSE4lAoIodxgwtgU6v8A3++YTVwUqYGvMWHz6Gg6iOEhG3F+Jdg8RvVvMFonwfncGgxDiXBuM3wiGCMcajiMXzBcvNoLljczMQ3qMNud0v8Am0zQ9P5TY4y9JaLhj0rRcBtnaVGbNvvHUuA9+DMxGE7h+Hp+uonNxyExeCPPOhxB7D7kxL+jf6i7zAcX7ZjQADerPmPC7H5YaIJiVc2LFaVzYuo/Gp7xBsq9X+CYlKjFRmXtrfaCnt9KXDHouXL5CVxkbj1GVGG5di66ouu3xFl99juCOQ8IAMQu2BDEJUIYiwl9eEHGOL73x94KA5qH34a0xnS8mNkCEa+SuAlROL4vg3Eyx4mO5d6gRhqKFK4YX1A6xJdC5gq7HfcFSl1CM4Qeoq6iu2VZhqhwc7v9I/KwUO+0K2vwO3/dwRqOCXHjcLNw6gHUTf0qGWL347evg8sPp/7K7E2UFKQxgSg1xc2ZzEzYhwJg8moOKl/zhDwE1FvishYX4gwTMBBnXIC2ZF8IFMdH5mRB3l/IxUBFtBsQbmzhxBIIXcagu4zMQLES6h3sKVsaje4PXMdRiIEaZUzO4jxTcFFEe3p+5V0ShmK/mmj55MZmU7wUY4WtwQWSoI6IvdTDqd5iW7l5hyxZDzwxiprg7uC55T3TeaQVdRDMVPKP+3tOkyIYYYCHJKl1Fvh8Jc5CXFZfFSqjw5muTvOGPogAwkrmwr5H+SBFozNmJXC/SCbZ6DUwsX1GA4gxe2vPsyolHSBNRJYtOBqbAlcgoiBSRRpF7MQWuzzmC1yDxD7AmfH+3MFKHlamUGML1T1/2AjK8Jj4jqsHXj78VXqa64KB6W+pmWRIYzqYJWp7pQjYNfapYLZF6h2S5QFtsBom3DfBLmkTxKqEFohbHDg6zw8ICl1MfUwWRjTLTQw2w09z/kuCRXBHgjFojOgW/uAM8V3HwTU36FmqKsIr5UPeaDs4JvEoUq9ePvLK+eAN4Y/v/wAKzWyIYv7xum2V3D35AWwn29+JrBOBm5YL1x70/ZfX/YOCry9/eV1JX6J7QmTBHLK/bH6hko/myJU0mnpg0Iwl+hi6QtlVGGoNxZSaKaOTYQh2nFjAKplBWkt2cX1wYZmbcQ4g2yUMqZTHtDbwiQFZKFRBuVKOl/vLRrK0NKljcSOlsezZzPdKh5YhxcNjHQXmZn5jEmDVv89SgJQ64HawxwqLgnngrxAR52iIspgxEjKjFyLcow23HMzMTu4XJxhB/t7cdJv6JscVwFwVwAplnX1vEEsZd6lPcr0NmSOTEBn8RsWDqJ3tOagBG0fuV/EQYgFtb4cDt/UAdztmbC3ywjKbQ3OojFPetkEpjre4LamSri5MnJFqNr8h8+0TppldWwjMFQYfD8wuhcpPxn9S+PpWi4aPU8pXMxMQYIpWC2laJt9o8IsFZQ8wziECVA4ILLg3wRM44EWd81cRfFwWTaNy9IxIG+JZ8cXw8r2DiABAzXceBm5VS4ZgxLXIHAhjUeDLBmzcRlplBdwDp+I/DDCJkdu8dWeIzasV9r7QmiPpIxFlacCDTY/x6BGjUF+ACJKsEpFt8X3f6mogAwS4SNjt/mFlb5AaFkXvx4l8aNnqAUMTBVS1YAumoBWIlcEFmJyZubnjxMVfwjX0hjQYI1UZdxsiVfpriyJiPjsYGbHY6+kqo47AzvD6Re1u45TA/a4UNhiK3NBH0RUZin3lciaMdzESriAi5SUEyXFhL1xbdSpUEBlk+kFaM9wiBdxKmVBqfECZr9YY7fZ3O2B92Pl15/uGSJUWLNuDH3G3NaZjiHEdLCYW4Yjzf5tMx6CphuXsqDgYtS7g1FvhQ3MY48xaLjb/AMlEGybPSg3AZdT46G3olY66P98XW4kj8NEr57IB2g9yHXVF1THmArcQGH4szRF4P5ZQizHCw1C42y6EagWyd5fsH0/uLUF/EOYjv+GZdh77JTgwSrll78/1CR4iLPAs8ZhjmEsisGUSo6avwvJ4GEF+3xeoIlnN+mouOIjExJniGqZdwNDbEaA4SBWksisO7isCpbbxgblDRBHOoLqBpdjmsGHhhmJXFqlQRXGo5mKNx4SDIYDVzEbBmhg3Hi+Bk05pxwZzEFZTzcKox4oLmcNcEeKrihlkxbqq8xKIQmWG/aG9eEh25fu3yR5WssJQ7hqEQ2s3f45BGVeIhR9IAQ1wLqLfGoqhQX35JVAMrcSgiUXBI84KinhUQbviDSyBcYRAR0GaiXhiFtniFAqFZRUOLrwgXR3KIFQamBLlkPxEO85QhGBK4eXDEmG40E95cVC6413MSBJUo4jWLW+Z8zFZLR8zAly4hiXg4VZnh2Sg1HOyPOPgmIKENBvpCFjUvEy98PngApng4wkYx3fDXhnPFmcvO9RjDuXP9nygBmnOYpuRLMQ1TKuZIMoWxyGBUFUQvhh7b4C4lRioCzuU1BRGhQuBSodkQa2l1uNHUq4CFrBV/Pt9YYVsdOGF5S9tH9ypFlZd+0B93o6lCPubhiipoEVLjz4R4jS4dM7wivrKeOdwy1Pcwx1OWsPt7+8Ue2JEEZeZljFOjKfbqGmEGs4YNFVMUcS6FnhmKd77cQnAfu/MpyNtf61GAklsHhc18X1CS7oW+Ws/+Cow1U1uU1DUJey4c2VfcN3+4o6alYFMtguPy0+GEq5SqgGIRTKWzmIykSoNRiTrQuIscscg6jaYjFvh228qmEZVkGV0EtJOnx4m5UrgNBGueX0ILiZDi+bCO4Ao4CJKrhmpYFAMZd+0czqyPmEer+MSTN+uolmZZ1LYOo+SWVGjDwdPqCTWX7Znvm9ZuUOsMhiV5UI8rHBEQe2CgTRbTZKCtc1wg7m9rKMVnzDIVdXwLy3KBl8UQzJT5I95JdmIcVvdKsJVeiAJ9yCCyEcwIs3E5YKsdEqG0mp7uGJqEaj5NkEZ0H4Xx/2VLQQmxhb2/EIH3mj0AMwNSpdvClUDl3yZlyo8Lx8wHblyzmWOYx8cLQQ1DxNRAqAFbfP/ALPlPJ9ODFTcm2YSqdHuAFjKaieeNwxPZGwLSAM4YNEyijvfx7wqEGotxD1EmpTqhj5eKgFXUDZGD4IAohrwgVvlzcrAFreA67lGqP8A3E1qHsS63vdX6v8AiDWN/DX7mqCdmkiIjXtApWmBdfMGa59lqBZc+tn5nbTVa+ssg0+7GqxKr/HmHAPYEvV8x/PDHsGX8zPYqqx8xLXNEA3RaK6vBcJO9D+SEfRUXGYTS2J6mgTBWs0BUp1PFKIBqZayG1s94DpwwhCGeBqXcp5MrbC1iuzTKAniN2h+uTR0wJUJhfgwC7gDYUhPafnlmVBpXFRiGrjiXwQZlcfgcjLxC2PETh3Nh37+0IQK9o2MnvKbPgzT/wAiatoUfh+YAnvl9NRwMqJ8BEzfRKMa/ll3TxF4IQuJvaCUIKtRAoPEI4jqtGoFYmOGTMBVuDZKhiLwqjEYYalWRT0U07lQcJQEv0K1AVy+7oiAtqAtjHUxVFvm7YglQVzUESyXL4IuWWSCDuXeeEDccxHccxabV6gx8Xj7wn/9PmVZJtcyVwPZslQV6GAnui3Apl49e8YVCJXApYy8cOOGXFI9YioGokEGLjiYZmeZZxCLDPZHjOfG/wDyo414CyHrSDE24uOBsZutXiHNLFviuNxidpL/ABiRegmhl8rUWldBcf0QMxqFbqBwtnNlJUKhxMkKihncrgL2sIxhMsIYAZBZTaHtxeOaANvJCUu+49XHkjsVRUGU3K7WvMKAdy23e8sRgY+W7x8VKDUQ5ln+CI1jNbL7MVSlXK001/PtEQc9ezEBa4gAGft99QRyRJcUSaKlqLi6IKhWCuoTSGkKICSB+H2gLZSC7QxuD6FFclV8yoeTqNedRFBfGO8ssJuMNOAlPJCo7lKzDhHWk/Jebl8GAOM8Xs4WuBiTfOIhht/UVLV4QlRgIaBGb/1yqAOpmpuMU+nX4/8AFxlh2Go7mIRhWxtKU7UeoR79+hLC9c2ApIghT3EiUt+YapXBNb7h5JcvhagaZY/N0SiW3SWyIPfEa8Re4cQb9T6mYgLD3iA3Bvl1AcGaY3oOuDi/QGBbNCpcz2y73K4JguUVJUWJe4x7dx+Ar6j9YrlCP2l6l6P+3NXpQFMFatpLiz9IAKCBmXHjpHgxHLHmokY4wwTXcTuUqLc8JpCdz2zdj2ej/wDu+UFZgoJS5fQyZZluYk2OK4c4hcLPXswR1wuMRhHjBpWtdlyhmWFkA64PTcNLdy74yXUKNZ9m/mZkaUpa47PfEAussgG2YisDAIxg+15mbOoFptz+PUrvWpcuMG5jdmwddfaLSgTS6gl71e3tBqNJkWfTcsdekpiZf3B1l57jCn8MNlJ+HS+WU82RaFZ3srww9p/Tw8KjrzD04Z4hxCuuDhklQxFDMbsJMN3MpUOBqW8lHRj68PAxnh3WHuBAFhKZjWoqUiiwWVLdwALFVAhlPtNcK3fcwwjsRDSALv6UOFzZfJGBcJtkVaIr9yHaAdZjRGqhrHeePmf8RVqAY64LFMRZwYe+xl3n0koJSuWo1fcJa4C16hkzWGpihGzgLiV6Amk82JcyW4LiVxW6xWHlxA4sbaimXNIhjeenfyTZEbgNb0Qa4bOXgRmZQv8AKVy4GVqHFQBTANeuukjaUTqFlEsbeAJmFy/pCMz7fEc5hsj2RZb3O6ZhKmMEq18wIlcuJna7lSjRBVGXx72ovpfQxD2TVB8wSjX3/UqiGmb4MdBiHUpDWZgt6gWyacP/AG9oLpmKarc8xMvELmKQSMMLcYkLI5/zcBMRWehBGm7HceguPeWVFv3ZbUgfn6RK7BPJKqU+5E7uIWQ9opBhYUborOpV2VV/coXcs6quvFeP6hZ7uXb5uXARjPavp3BQDkCOOBvQEKZjDLKYhHZNEvFxLmQH6XN1oCGxIvkSEoLgo7H+pnvpV/WPBwhcFKjnzf1DAdROwddzfpeq9ncW2+H+ZtUm619IhWN1K1CvFn6ivJHnEtFmC2GcQ1CYQnULkplstJ3194Ao8BwH9CdzT7wm8JlnbLgBO4uH6wg1r9ciyojTWT6wl8UQUplAsgEqA8yMfeV6P94mSBxkKM81xvEwp6Nsom+CISpnXUoSiJMA4+hELQ7hKhZPGy344fQtZYNqiCU2MaXDpcXKckAXSLUdyaTh1iGS5dSyYjqNxjvkVlwai3wL+KbVcxko64MShAIBBYTDfxGZUeZ5kvx/zUrYgsXBEhwwzpNisEOrgjqVwkYlOXk98L0RPMWoxjjMYnwPwYGMRftEk1hahsalSHmEi5nSKwO2EoQSiTPAxbgRmdCaLbicVHhI8OowKympNGJUUH7EYlr4gOgu6/zKESLKCE0JfUShz8bP+fEpwSd8f7vlL0FQbmMdTUEMswREvA7JVTHC7ncRLiVLbHqCl69CJK2KJnyto+kCKC2DcVftKg0QjKOMStKC7GZRq5dmX8y5bzV6fh7gA4ORDLGAa0zm5Z6KlSo6mfNzKUvhDWFGtAhA07/iOd7z1H2fCEfQuO+DbPg4Fhq668w2M5L7PiFG7EZUxlQHctio0VCnqXfUyLircIKgQbhA6hwmiPMNDiKoVTfL4gK1fuVDsQix+8omSN4ZN+7Zx/MrphH3QWGChq7ftMk5DkeT4+/pNzAFBu36GCcj23UEVF6+JaHan/yCF1e5/MGt3Hg1HVbJYF4uVUWi5ZyfYRFrh5pgTUCnt6/iNVVrLDM64PLK/DuDpCXHlazHZQVEqO7LUKxgF7qNmWsq7K7m2w7lhhWFzEO4NcRVHFyq1NR1FYOWMLtTCZpiI3EyIqMoZpmEpGZ2E7kwTEQjV/wyqS55IoeoLhj3mLaZdFO4mVwolxb4CuNR4fEUJlggVGPDGLcvdNmYUEg7j8w5uAdzauo1Ge5q5Yk1LLSEGMv0ioEYcCURiRgshYVmUrEwqQfMZSkT2IgOxOmYLioEosWvTHyrv5HtAuVV/wCVDRcuaYOaHcE2LlHiUssaLdTNOupasktb3wOiUu4W0QoJdy5mnziKmZd+fiBI2ikGEUNx2ux3CGglGYI6gR41HCwhj3mNT6uviYgJk7Jp7HzPGrXlN65UC2WQodB+T7QCqPiNYl+IEtDLc4IP7QGtJ08XAKep1SmTAKodPtM52mA4O388FD04frp+8M6jbK3O7vm+Q39V/LhetKh/cB1uKH6JWEr/AHmLGZRxBmVMJBY9afJwuzAriFYZVQKLmEYtEAKJioSkKJtiXME+kzeD7RV4BMnUBw5PmoVR2zjqZjqpcBgK2IaLh4EqOsYQvNQjcKtTzdzth2svATPp+oUiWKYWoOJG4re3cQoZHWn7/wDIYW5+Y3dnw4ZWjLOEHEc4lNrMUR6a0XPqMVQVcXX8n35GZUrHYwUOxKumrx+INoF/MMxxDCKI1MNsEVdMLSO1YBSz1C5xz3QPJBKZlEJrUAolmoNTCmSGy4l4iZPDFFcFS2phlOYISxPwmiDbSEdx+YeBB9XUOwxcCeGZctX5PaUNAalmeFX/AOARyp4qswR1w8XXoDZEPSVU1xXHUSCZIiFTJFIbJlh3H2QUKdxAV5iUXzeam40Yaly+DMZbKYQ1GXyuKjKuJHgNSiNZ+8GKYtShGPaDgNSozxGFi++bgWrQlZRHbHBV/amBVkIMehwXMUiy6XqE3dMHz/EHGA9CFtgdC4LpDC6gf9D7+YWcjqTEA2aPEKARWmFNsb9aiDMfCZngysQO5+MRF0pdytMGMNS7wDm+8wS8RA5iu5ixBO6B6ag2VeUEUn7f9ihX6yn4HM2kptt/ww4QwREt4i9KYWeHzUCDNLaS45MDNUqv+JdrFCcXeeGguSahqGCNjyJj7SxFDG2ja+8fjqGe4A8d69pYlvtHDcNGIdrCkcFWEdMkXiXhUVQiw3C32nTQxDgl8DzZCUrBNJPYUX8ywoPGITmzB47HtPyqL/8AsAWf9hphJumVLAdQXUYEonTdS7ZZdQu44PljGt9mI2iX4Jk+kMW53/f2ZnmADaMGE5cV34lJ/wDpC2UEZdxkfUxIgfagrrmollS5GfEAPkgXcFRrhnSkjKLbMIGRjQL6k/tYR1g4hCWlgHyi2Wh57tl8jcEwER3pAori0MRUvmohhwoalEzK4bTMxWKACjhAFCDM2jNAHUe8UCwpQLM6m4TuFuOHA1ceZuEqOPRcfQInPtyOW9QJR36LjLlsY2juCfKC5cDA78/8+8UQ0b+kJVmrlww5WMG+XjcSoqMQuKLl2emonD5hp+IRgqYRwt/zHDtBUYw5lkV1LW74qJXEOLfaVpSU8jne/j6S8KOIpATIQwKG35r6ysc9u2HHFencAk1FpFQLHfzAOoqLisF4d/OCYgVwRUWYMEbBaeP6iy0nzDGdvtCd2XpuEhl0MMBL92ZVtPsfuoey327frFPQVxXAQg4vuUQ9Qhb3BKriFtF/QhRgDfeI7sCEWdMrX5IHynw9y27A+8pWQxTo8wagkweoOpEA9xb+8c5bxjqeeUb6gCb4cR+ajD3pV2y4lXwvl5/Mv4C3Lc1Bi1LhqWq2FE2pMyQK0R2iVEm2KUJlvoEpsQhe4EOa9JFECG+HaLhDKTxidQpMBUXzLgiTqd/BKIqhf2f1MFT+v2jkT48RIsT2hoW3VZ+0yV83aWrXMDVmoXXg3SFoMwCO4YR7SoZOARaFHiB7KM0gATuX1xTM1BvkIhH3WYAQAUcVyNZ8r9H1hAsEZAYgsk/WDKy5+KisGP8Af7/YUBsm07YwCxK2SPA1tlHoDOOVxwmISrly11C0FRWspCIMINSyIMSasw26ou3TJhqYax+YDXY8y+KqjLMB3MiV6euWQ2Y2HUwU4InF6sg0uIlWB59TjhJhMi//AGZ/B91//JQoRktQB1u+vpF1FPaV9g5jV+YaHGelxLBiFrLwC0DfoGotzSClkdnglVyZgqVFTpSNwFaYCkA95fgH7lUwxImoiTwy2NR/gp+o2/1feYI/6veJaLwp+FlGoK4F3KShmUofiXrp9v8AsGFK+5CiQfeKTK+/L8dQGG0qEIvIx40ogouVqglDqCKZWG8e8t19kF+Vy4gVKm5gRcrQX9g9/wCIxuW2eGIKIAtloK8Sri9qDwMolkBpL5GCEqBDlagZaW/ZLDVxnsX79TEEpl2leej8eP1MC+Ne8v0F9eIZAnJrtctRCUaypf8AcUtFQNfVh1EEEuBX98St+rZ8wiXhiSFkMw3M9s0uGyiAuINMwjDAxDUMwhCBLI+gmpesEEK4oRB+e/i+pcxptjWxdFoS2hQye/F8L38h0/0wEbLFVkfeBbt9DAI2gJbCdx7LsgUIuCBO8lBDqsdPeYFELImpWghsdY4d6hRgIZ4AKZlvs4NhYNxBUh+5Qq2zcKG4Iy5ZDfZAfLBKb7fdZV1TBLi5ZmLOodkw6fDHX6Z8/wC/2YbBhf4hm2fQRZBLgXcqIFHoIsA04ORUtybjaYrmGSoQgj6El9MPT3Mv/MJvMiHKGWVXKK0Yp0jx6lckw12SgduLiwjU/JANaglX0AjuLNJmeE2/OD+fzMyZQn8zXZKKa2+69fBOiD/mZD7mJ0dvPthr6SzKbhAjAktuiNhIapd8EjxgDXrlRxWalDTDdQSAidS6ihEXkA5PMo1V7r+xhlzYK0aiQbk+8ARIw2zGLDMKID9cPGE4IYQIHCikqmWlkHf/AIEGFhCXCGWdQ0rUp2i4twwL3EgTEZZ5K4I1zLlgZUXo7fiBC/8An/f1CzfHVDBHc3FTqXEHExDRKdO/QpeIh/C/URECVnzZ/Uvp1F3E0/Jj0tMBBXZCrYfMODuksGbv5uebA5gM4Cj6cEWKBsY1hXj3hwAUxeISjXEvUGIYLiuZMZQAIBAIWlVCDDMqVKHcs4CUtsCKcS7vlCdf1/8AYNozFxH8S31iGw0vGGMp0LLlSo0LYJw3wtGZVflMHN6ex8xU0GIBFFwZiPayEVhGnEcy6JYp3DLu9/xFEmXWIsOUO57oxhaAYvCcB5lbuHjKGMoZT+aYkLttfHU8wvRg/uZCy8kcULp/uCuyZGlhhPPT/uv9uAB4afP+/wDuYLVMB7R6JXKvQw4G5DJfoGXBbbhLKQ1KtbDTzXoSyLVMLEZCofmDue0DdIAySke03HIXNRYJXoSyoMbJDBPRVtic4V1UApi7zyRTrM1HxMU5fPR5lpJ7D7HcCVcQSmL33/y4pS7bb8s7YYNnpDuuPEMvJeL8QiDvgGxd5243EKdPoYkiUQgOfLBkkrXUoqNzboEoliOESWYmGWC9zQ7LjssMTsj7lkVWeoY+p1Ns/Q19eDBBzMOokobjaUFyxGzRMioYagLBm0IumBN4RBBRXrSuAm+bly74KoijekmAMLa57Zdroj5m/fKwnGPg6/uBrAQTRRytQW+H0Y4ZIgDruAbXFIrARxnvXsRLFLZtT9Q+nkmKK8+hxiF9zHit3i71X8wm1GjQQIBRqfW0ua9BHg6u4LyH54p2ppHFkfiOVTUwMRCiKyCw4PBUI6qpQlMoNegzEpzgmEWmdksRhMvSHi/1wSpmv5hw/tQ0B44zcQZ4KDeJuQCRAVFZWMFMgs3AIx4YRgze8IRu8MwIzJhiLMZ2Q1yAUy13N+3v/f8ARiH7DX9QEsZP/kCjM3llLslcOSPOs19BwkK7hFWMGb3hGEfQSHjGIvFXZAlqkwR6wjvnNkdm98kF0YKMR1M7ow4uOuNiOpSDGI5vn6RB8B+oIB2j6KDGiIdpbZZcrltOPaZkrBrM/N/qGdTJGDQm3k19D9cd842gIrNRjlhMDfmUBFGSKqVDMSI8QYolKlCkhgDvgChZMppn2iL3+Kfi6lpb9R+VwsRYeAy2JufL+4JGVHYiILBixAhbEBVMSme/4lwWG2EfQf8AgNuAG0IiZ8wfK4DIgxKjxAAfMozlTHtcTEOGGuFaWuDjuAmY1xhmkzjldnxAAAhMvgfphSSANMTri2uo1t6NPtw89x5euP/EACgRAQACAgIBAwQDAQEBAAAAAAEAESExEEFRIGFxgZGhwbHR8OEw8f/aAAgBAgEBPxBms/GhHlo4eHR8zWMIz8SauO51O815YcvO0dQ1DlpxpwnGibvljpyR4eRnUYzYjwap1wwj6n1MOT/yOSMNzfNONmMNp3CMeFtNOA3PyppNuP5rN82cIjCaM1TU4NfQbn4Hppvn6Jlu8F+T39/9vi9qe1PantR8UqbSWsx3BYwxRjgKFRjGAI6uFiHJ6CMYZahtsYzIRyTAjFiO7hng5JcGXxmbixGoPXoZcdSnGrhnLPeiizSWsjy8Q5OGEqEH4zJxC1f/AJfVE9Gi0spUTMtklxFzTtvgz/EvexMdidkYciFrE3CDmR7k9ye5PcnuT3II69bNZ+NCMOGjh4dHzNYwjxNXHc6nea8sI8PO0dQ1DlpxpwnGibvljpyR4eRnUYzYjwap1wwj6n1MJfB/5HJGG5vmnGzGG07hGPC2mnAbn5U0m3H81m+bOERhNGapqcGvoNz8D003z9E/Lg9c1K5xK7jwl7hncblMiXwAtlmWZNcWluPEWsM+iyty4WQNZhM8ErgM5lSpUqCcsxloylnsnzCMeKECylEOoitL42d+3iMe4lG6Ce5M+UI2QFfr1LhAfcRwBDeWOYehVwQKKgSnuAPeYafrATcdLVcAj1HEPZ7gdlniEth/MZVK/KbcrM6QwUSpeh+faW/FNk9lPZT2U9lPZSneRADX/hrPxIR56OHh0fM1jw8TRx3x3mvBGEeHl3HUNQ5actMONE3fLHTkjw8jOoxmxHg1TrhhH1PqfQf+RyRhub5pxsxhtO4RjwtppwG5+RNJtx/NZvmzhEeNGapqcGvLDc/A9NN8/RPz53L5vi5fDCMcwh6M/pGssCVOIiVuVJwRhDcc4jAjEEbv54rghuZuoGJU8okPUtc6mkGJQaiBkiSoHqN5uMFyhdzeNRfJXcV1A9moqDkERHkiSuCMTdPN/iPJGXwFcDKDi5fFS9ZKt7gDRCBa8o7JyaH7IUruPEHSLULZUqVFsdD/ADPbntz257cQ6gVg/wDBms/GhHnocPDo+Zrx3HiaeHjvNeCMI8PLuOoahyNcM0w40Td8sdOSPDyM6jGbEeDVOuGEfVX/AJH/AJHJGG5vmnGzGG07hGPC2mnAbn5k0m3H81m+bOER42TVNSaM15Ybn4Hppvn6J+fO5pFYXwx4NHFxlcWBLJUqI3G0L3mU6JVshxcFKZhiG4RzBeYkJUqBAlQIUcqi60+8HRP3mCmP1iWUUKYVKlQODqVWiDBCPjCLQS4GCaeoU3OiYhsrDPoub5Ti4xi+yDeSEvk9FZt4rg4qYZJUSyJMFA507jLokuXLJdT6VS5cuLH/AMahxPxoR56Ix4dXz6qavR3mpywjw8u46hqHDDXDqaYcaJu+WOnJHh5GdRjNiPBq9B6iP/kf+RyRhub5pOpu8G07hGPC2mnAbn5k0hs4/ms3zbwiPG6apqTRmvFxhufgenm6fon5crPBjchMsvzX74eB36dyuDEuMIlZijtKz15lNa2V6LXUWppGDRNwhwJUOD+79QlVPzCClg7JtKlcYRbi0gViRj+INxUQ3iC4rlpMmpVca465Iy6m+DsRFa0jCJwbZ7OK4SESal8niahlUczFLMdP8x4QJQRdg8QIo7P/AKcnD/41BiH7ECMrjoRjwavmaxhx+JNXHc6neakOGHLy7jqGuCMNcOpphxom75Y6ckeH0HUYzRHg1eg4PS8J/wCB/wCRyRhub5pOpu8G3BGPC2mnAbn5k0hs4/kM3zbwiPG6apqTRjx6Dc/A9PN0/RPy53BAyjUlJcdH/SJHUCivQ8XycVxoWYRZcvlsQaAx8egIEIEE0n7P1M9Qn5BBhCEJuV6DmMQjCjUTbgVDPdOHwu0cpySgQzKqPFy+VqET1iO+7JcYYgGmFF8XKU7eoWrgK1ySo49JLgG4gqxDTm3Dup9v5lSKx+kor5eRgVBUw3Q8dstXxkagUlYv8z3vwwnkxa/7/frh/wDG8w8EETnocMU6vmPEZcviLCXLnU7zXlhw8kdx1NOCMNcOpphxom75YxfFy4ek6jGaI8Gr0HB6Fl8p6z/yOSMNzfNJ1N3g24I8raaTSG5+ZFiGzj+SzfyERhNWapqTVmnoNz8D083T9U/LncEZk/LxRpYXT7MEgcdVh/cH4xefceb9NTUIvDg3qa5iQuCXLJvgMMHUvmHuV/jgODgkIIan7IA41vvHZLNxlVw+iEWVKgs7RwD/AHmMCMkYTbhBsiQLFiy4ssgxYHbxUFllQFGMAVNWYG40xxNhW+ZUqa4GuC3xceHmluXEo1swq3uZFFD5QLA9mGKmC0uYy1/f+7qNbPj98v8A44tSjBCLrhIwS7iwcMAUzYee+I8MeZE0Hm4Am42seUhH0peZ3XBCOoahGUYRgsixG3qFLClzEuks9GuLtQ3w9oxaywFX1wFiAAHLCXyEWPpT1HprmuCVwRlQ0qBWIyiOIipG9QjANpf84BDEMCAZYpvy/SJeIG7uAhD+xyr5fiC7tv4iz8pUB4hFl1AHjBRU7/kCgUzVMQLMykXhsmssBLpuAbgd3MeoHf8A8htqYFy4HB4qJB5rRdfWJuLkgSoqGhrNQB15SVLmobPmOYKI0NJshWGvZr6+ICJZCPpYcagXlmEPF4dFPhiJirghfXtmJux84iZTe32hrioQhALUOF1A/KLW6hjLi0+SWSoxJUbJZ3K4KjFS2KwYJzLSkHLjuBu+BcMWNJZYkWb6mCNIsllcGnhHSlcgs9w3uYKQiez3ly+CP/hY0a6YCpt7/wBytQBxCaK+0CFzMwTFrihjKjYer/UKryx7zBZPGn7cL6lvEt4lvEt4lvEt4lvEt4hHgRmZbT1uB3LZ+JUNhhgGKyvF8MUrzCqWuUDwgxmJziWOJUtw7g83CPKwC7AiU3Km5prlLKmyKFzyI0ePnm3JuJunm+TLpcG74xUHFONk9ZLjxXrqVxfJw8gNG+CazFl8VJDAyQF3Hi+HMAWmGyJ4sHpbBZnHpEWy6MVK/VqAWMtgW9Epr25Zj1l1cquNQLXSABRxTJonVnlAbI+0FpPqb/mWFVEmC+upeWZ94JX+PeaQqVHstfz+kx1tbXf/AD4lnAANEsKGSX3EfSJHuF9v+wJQQIxEiKo7wgjqUAuLbebJ495bmzgPQ8vqHlL4JXIRfHtDaAeu5kwQGzEuE3biTi25UIzJB7/qHdme1A0o8RU3GJGGUqIdReEhfcS0eGVhIEC2gYgTFxmkZ+FB6yISFKhUWMDMMOdBwtLYLwZgBUvhKPExBKhLl8PJyORhiBhfuRYVjGNlpX7/AFCVzJtgBzfGmVK7YlhmGVtEqsHzPffvPffvPffvPffvPffvPffvPffvPffv6FkzHlhqgG5hj5lapzUZcPoRiyzwzQKZXlbfQyleLPJKtO5cOBjmVwy6GpcXgig8kZEkEKGDivSI8A4blGKkyYe8TDEqPHc1LgRl8XwwPQR51L5uHDzg3Nw9VCpclw5quCJx2eIES9w4eEgq2okVlYxG0/ebK+6dn9wsrjF9eJiJayvXCCg7lnPHiVUYMwMNxVZpfR5vmguV+FEb4fMGU2+eo1Q/b/sulrmUbaSrQuMdEPtw0gKZsSIsqmLaFPJCssWJZd09+0Mke48PvFkvlVYf3Ciey/ri4gLeAW5nIpiJXFy4tZZRLJVQ74rFcvwfykKuKhqKE3wCiYig3CKfzP1DgWD3iCFiRjGYgj2tlRBV74VwlcaRle3ASytQ0Euy4xLBgljqLvgtJKcuKm6HvEIthlhENiZ6qYzlfMCwKhnXqYSo4a5W/wAMoUIjT3LHJDmo0YLZqFckuXLly5cuXLiuUYh2QU1DA7Zl4+HXvFr0M3DeIPnl41HMO4UNsMM2cBBRDioqmZs9QRMbUAZ0yq4XxAFMHox0RuJWlh+5R6r4uXLlIouJXF8tjOITQmCEuXwqEeLlx4Jfpr/wqVyyo4yx22xo/uVww4ZdSt7z8wcHcG8wbJcOGCM8xDL4IOQf4inRK6GFxYho0RSCMYBZxQ2Lo/iPxgqOu07nbLEwoqHJfUdRXQ6m65qVwnkEsBOMS+4xQ7guHmAS+0pz2kafiXB5SnjyMozSO0JUDePLrMEc3N6ZcsuH3Ekatz48SntDvwQwljEa3C6KZ5oGide1b9OYDvgRdvBxULXf3gQqCXCI2hCJDn6pXGv5nvhBGMZRqCbuXEUR4rPF44uHogROCH5y45XAI3tYykDcqUWtPj5gmmEgctC2FwEuvkjlzJf+ebjXcZQ/8KZMzk4IvpQ1vxgW7PpA+eB4klZjxbUBm3cZTCH/AMwAGUTBhtMJ5NHsywl7ygHZh+nC4Nx4eMQLO4PBeZR1Bi8Bwyhkg3K9JkvQFNx5AUx7HJCLfMCPoYKNMKGIdGMu9QiouWGoRDuGoyuRVGVwy+L4OAd9RakfWDUK9i44Mr4qMwD7/wDI0wPvDui3uELl8wZuPBMRL6u4RBg4aEEZaal3My5Q7qEMYZnhpK5oxq7/AOJYXiN6RZd2UK+ZWsF/78wHiZ1My6rYEpFUNps+Bc2ssNVQsG0E4OA5J95ft6Lm+KhOxggAOoKFMzEHUsmx/KGNbJ+XOA/2iiREMNI7QJ1HhYWggpUQB3EKWfPiC9CBKT02B5gLJa7mKLPP9y7McCN8+IefA3ytGYOHHD8EIcXiA4g4uEIEDgzKz786/mKPCOuDGdkWrvgeHHKX3oAogxbjEkGkhnIWUzBB0RNBABmJSqgtTcb46nkM5+iUnKU3k+0uBpC6kYa7lrsg7PUENn1GYvpFZ6AFM2DphiPCHkYAo4CWlEvEMM+E+M+M+M+M+M+M+MV9wfeL7y6YiG5QLqNyombMPzBkPaHLxcuJe4hvSFA2SzHFx4FLy8MKHAXuPqKzsQ5IkvgiXiUmpdTOCCglcsuOZmYlTcqVcSBwTi5c+3/ZYU46CPwyR0LK3cSKjWOhpilGPD9kOpY9zcphFSzMzhv0A6ahCluMForaJpHeH36ihk94CMZgHhBthBOH54DGHK4qIgdrGXN83MQ4dwF9xqG9FfEvNqdp69veCG4uXLjANvR+4kAr/tyuIHnc96aZnuQRLOaJQI7Lle5YfKdQtEUZnX0gxngZHz3FHRdYfrApRbUGLz9LD/PCF6D9xnKjQiEWautHwRiWeCO4kQaYBIC3tw6E1BrtcG/BzkDUIcEIR1H/AChNT8qHyUvHBjGtwmBRjglhDkLwPIvJFlplfEJRAQ2r+r+4uBmUaOEEtMRuCNDLOkJXdLBLGsES1HTN/MAlkazCgz4wWhjmo8UIssbCv7RAPu4I84lxUtoFdSvMPmjGEIw5UMsBzJeXl5eXl5eXgnMwTBbuURDubVH1LB86+SIZIfEGb9VxZe3UWCioqw8blcDni+FpCOpueTD0ETgWyVDxU1LncrglxzEtqVDUIMuMr0DmXFlxYMuXyyp/sxGULgJLteIlbMRVYajBZyuCyU0X2dnxC1pfmMWoibn8cVyy6jsxx8tpZQAQBRAjY4jcrMtdAlFLt94fddS5bUFgzKMG4KoRBuWOJ5IGkeE4NwR7QAXpEIW6jLhe4f7IRhMupaS7HhAUxJSI4QT6xYsQG7f4QFdxouI8JL2IUVALbcQqdQyZnKDU7gR0dGT6Qge4DncrWFIIqo87QQmBaFe8cFsJA2j8T51AVeIifD+I0iG5pERSRxgYFafUM9oqA4Y5hqeDJsmb9vRbsqu9xKgQIQYcfu5/OiG5moMZqOeKvMeK1w1FhLCCKzNeil3srO8oBK4Qb4SPUQ5rMzluJHc943oy+TKNyWLqgkuXxU9kzpl6vLwsFZ/iYgxKKqCXT5hnUYnUuBKu5gVvDgCRhEhw0bgVbUMYJf8A4CSXFCVqnNDcI8ME7lGIatLojBJuC8CyuKmubmUZVwhzXo2IywlyuAlcsFKldOuWG534irii5foGYSzm5cI5lJgjxaX6qhGA77itk0RayytwuEqPGNMrpMwJueF6grFftCLREazBHXDwlwVBcdRT09u9wAA5rgjEMY5qo91RVMXqCUTCYc8ZDUMC3fDissiJVwEQjWM3K1KvOpaJK+GKAv2UxUJ9nt/qAAD0VK4o8QiNIxUV3CXtEZqZb9jX3lDew+8cBzRfzBh2dzY4HX+/iAbZQTslmO/6hemLWWPP3YrHxLSJxFq9y/aIBR0QYuQ70feCFA6M39ZZKzslxWOofESBNMFgJKAK+4lfofbqBIGrGwUDySyJQBwQm4Q4H8v1xYYZWrypUq4iq2bVHmJrGDQ9oq+0u0Qe0bniZrW41BuIZ8k68HmWVBHTDZ9QcQ1D7QkaLZ2HA4xtxNECmUgcqpj3BQmzgWl94xZ90ri/QtvbhiwqmVa7Euj4gimU9whYuADUOKbzQ/JLhjgYi8P/AKCAJUFKZdkXPIGHWqihSWy9qHWtfMGUlvEVwzxcWPFc0gkA6hmHCS4qzL4zlgUVxfBHio8CXUOVN0sqEzoHH1m4y+M4sY5Iw9JGZS9tI6H0Vy8MFRj0bH+JQBxUr09RDXOswqFC3hyMQksE8dFdH+GYxpjr+phCVFlQicHuWV2gS1mCdkumIdU4YlNrHiuLuAG4NDKCkPzL6B26hgYfm/1BaENZgTZELlpG3UepAacXL5GB/ClxcroUIHVGi17YTRpCVXcpQzHqCXWvudWTT4RidZjRdw7QRsNUoReFxQtodaPmDOQ6P7jxNo4faoC8Kz8QAGCdhgGWHcoOrGhcYFI1PL1AweJZif2MB4huVdh2TRIWFp3/AMgGzgjgIcjCBCan7P1wItKOdkI3CJmAGwYB0YAHklh5ekNCRzGIwN/MLc9dZm/PlqGKj51DHv1f+QFQff8A5L6o8mYm19DB1LExQ/TP8QookuTo/mYBxVHQv6swoRcjbxU16K5SyoamJUdoN1uUtjTEC7itqGc8EYdzeY7ywy8Xz366lSpUqIYNMcxwwbCArc8StptShSuIFGMcF3M4bjbxHZw8PpQd8EXmzXBF4bFMweErXoDhg3nhl66Qti9NQfNM0z2IA/cAut8dE1CpiOrlQ21UtdRHaDuo7LlxI+8L79JFKma0pBjAlQjKjvUf3URoW/JFIftmKziStRLMy5fLwgD3CMq+UvcPBElU+0wQEAwwq74PQcblC1KrhIRA0GYhzqHu0CDMSVK4UFsY6rsHl94QBEXS+fH/AGCViJZUvEtQG2HinMFMSyXBvXJGDpPCUrhVAyseTgAOCEOCr338kOIIF5tj5Ypdf5QXiMX3EsIeAisG3us0hUqXVswCOUJYyRTBm3z1ANwvuwseUHSHvBNMEYRBA74FvuRDkisY2TbDgIQhCXZP3frjMGLlvkEDhoYjQs8RdG4DykqJFUGUTQ5lppMwSYLR71KuRCVwWY2zPspq4QUH7RSw/aC9pd33F6f5NRpSn/fMwRJ1DaHa+3NcX6AVNxgpjFBHFKWSufMQ7kZUchuSqYE1FjtvpGFvP4hN8CrgHcDxKg8ZmZn1quMYKyRCwfGJZz/CFUZS0IlQF2cYSX6UlejESvKDiXwRZkwfLNB9AxJcODPREMbfw8H2l2CUasWhOi/EaDAmUzlwLJk8SuVY3cHmr47l3DhzAvU65qXUoXKlwUBfmIZhNMTLbhFmyY9BGjUfWXX8jLeFOvMYpR8MGW13AaHPlKd8VzXAiEOIQPpuVcZkZ/8AAYWbl8XBgGC0zMU0hGa4qXLc0Rtmvyf6hFn/AFKjH9/SVTtyJSRRJEuVdw+mF+r8JmeS1GFqyPv7TcAambMR8iuJF9tfEDghiBeYxTSZ+n/2I2D29St2UVv5e/mBMTtWAzoOSLwj+5DNnCDhiufGbDKIdxWJthDUDaBV/wA3jcGw+ICAthlGHxCEKhUOClUsVfdNETt8/wDIQoMT8ggcDfFXJwi8rklzYy2VuVRiEfk/H/ZRkA6jbVEO6Lt5gWiV4gunjW4ItY8/tIU4xDha/gMRAlruP45vkIwBpuIrMxFBBTMG4WYq1M2J/WCCzhFnWMRUIQZi6EuFMxp2VNcL4mYS5X/llCMYxsiBZCCmZAwsDM1YEKRVajwZjFl8OOTs7lO2zioRLglRnh+hlVzdRLlVFqAFdTDdAv7TE2XMwBb189QajLcbPqDcFoKhmiCnyxHi6uG9QcpK4YUvm5gRfwlaotvvGUGoLFyxMAINc0iWYBlBZAqU8ROlvZ38k2wJ94I39oJr8iFYygEuOorIMR+8v8cJWYoVAOZZMMwZocxGGC2BbUOyGZUrkj683LIFy6OkUw1BTcu4gWz2D0RhL5fBKR0QO2VHiogXB4JUQ7hLtjNPMcQUDMCzbgDUsphCZhi4r2cbNOnpTqBWLP5RDRqVlcqJzUeKhmdvQNEa74iF4ZjpfFypeye7Xd5IG5PyhjIrAFlH3jDOXkmp66fME6lwbhDguIdBy39sQgHU1PziDFGAFRuSYQbvmuU1O2bAx7wcv9cVxXBGBdI5EVtUQ3taO4d2ZhqJpPhlIJPojv8AuItILT7uKlQJUSLYj/JKssqUlTUZUdw8RR2QJo0xMgJgtqA8n8XvMgz4imDADUqPF8VKiQOH0j6RGMZYSg8ncAg0wWQF5M7ADUeCPFzcTgmUHHF6njRuEYjFqB274XE0jmULYrbBemaS8yoHdFD7ufxKLoqCAIx9IfjMIQYhKnCwvaDc/MOKlB8owvaWrdxAtiNsWPs7mCGBTKTHJsyFlVRADEaLY5QAzGVcHrhqUEQKhZcPRiHY589wtynvAlMPxctevmG4uCwmP2lQysWKt1uJwUeZgLIy7XuYYlErdyowSxsiHJw8kXmvSKgjTLEHZl1ZliYt6ZQjj3G/aG76hLjTyvipukxQIuXeeHP5guWfj7wiRIMHFsF16quRdIMKtszBjqFOY4iS7qHcEbPZt/mAEcKoMWVy8XFSHoATygINw+ySv6c3LjUvAUrCGZiiCzeafJGuVmIZL6uUrWU9y+e4p2cv1z+UQzEiQS6JwBAmozUVw0hU5/EcupSXxsEH0I6GeAoIohxcYpKOGU+DMnHZzBostizSXLdwGnFwblHJwWprv6QG0cEzKhvgZg4a17QTTwtRVuVzfOpfrHlXCMSMWDCI9dSo3pIujZn8QQWTHo1F4vipYcSLUxAQdJZNtwjFRbBxNwO5eY3FYOISqZqEqBu5uPMrERiOV8pMSOlwLquYlLi5atolQkWUiD8DFnU38ooLh7dfMAXiEX14ILBHi7hCxZfITySqMeCOSCK9S4w6hHGJ4f7iDzNxY2bWEuuVAsiMBv3TSnES3R9fuxVTnrqVsX/24Wcz+JhQiNGYVTfoqGYcM3xUCVGV4hdEw2jEuLGJY+1k9vb+ph1K5UMswOvmDyLeKlMEci2ef7hNq4xAtRZR5PUFh3wQ2CUFwAgu4XWf4wiaOGEDD5f5jxHbl4qPLoQZjAl9Cmy4rTX94iQxYSzohbuVKjS3p4tWYQly1s6g0WxwxBzrUD2kyUNQUdMFJ/tRhPyjgxjLuJg/d/iv7hamEwS4qLhAuW70MfMR1DBY19iCsbgf/wBY30EdsynU7nUCseiopb2K4Yg7lMdiDFvcqXLlqogVHgnUYllMpN7jqkdYJAtXb3hDy44TTqAv24MxJtmv/VcEixiRJXRMxEY+8FnEEwuMCXL9CcXIjmo1ZY5UFxsGWLo5Ht1DhwTGtx1LvccwKmXye5QtfcI+9LhQLRiVPl1fb5+NQUi4lWYkFlS9WHOqMglxhzEUdMSrJau8KtJrhTsbPns/cyXbuEXlqIIBOCMpQ1A7cQGRwzbFZforlxLYEp2bislxABeGpaypa4sEFLIZuTW+2BExArk5FumLLuOIESHLxeOq0whuJOwVqXltruLydfxHbOPMM2or1LPlK9KXuDap8mH7kEben9v7mcrfwJhWH5fMuFsnmEIKCVqgcGKZlvoSutaBFXVv+eLtxfCTiRfDKCbHi+D7e4JV7riY4Hihp2Q4IPBKiQImOEbQaYjafEOJVfP65/OOCxRYwYrK3UeCsPw/9hGCWDBsECaIFcd8mOL9FSscXL6U5kPCBmZu4cbjWBrgTqfMo9IcVKgYJgihv4njI3LNytOYm6cQm5iEYTcBuNxQ6nwnwnwnwnwnwnwnwnwgDgsYxiwAqZf3qBQkSozMtkg3H0Pow0VnmJcGOMMRnSWtJEismZTt/B8QQqCMUGkLKuVpgXGZs3KvhgHg/mdPX5YZ7gr7K5405DThjsMkC0yNQEMxiysbbL+IBzLA5sSRnK32iBO3hXyQihiusqVKmpuClSuZYN3GhUBLUN7l3wyy6ihLPLEMTKqJCguCe5MhiJZSBRAZfiDSohohq1fzCEo6lRxwazxcuMQuoA4heBmOdwYvA8MdBHb5/wCTHBDc/qzzTy5EUMQaZBAoo4uPBHgJSdn8oFGOtRv9mUvRh9yBnsYQM2wYckNDs1BKLPMY4tDO3BKo8d0YZcYgJ6Knp3LCIqnFcbgZsujghKgVxvEA7w+MQUz85+peqHbi+8QjwYxjUpqJLY9/1LtOOGZUOIlx4K4C248VK5uXHjB7pdjxENCPEa2sYUr5l7SsdTIsQoKOSMYekPtV6GhiMoX0xTtj4xFq4XaGCPoqJGpSUlJSUlJSUghwY+0yjEm42QBHiHFwnBj+U1XwnrHCZFplsG4wyRhdIWUlahGTk3LtTplXCZvEF7jZlS4EYislF+BDg8m/cgmyIC5rcvhVAKMdShccXa+jAOzgPvzNOIvXdcx+L0ajyloe/oeDMSpfAdNzciWOoAckVwJa5YqquU7hCSpszOypjuHeirhCFMpUCo01A8wZc3DK5XoAKZpq5Se8TqBElcXM5FsrgftAZF+OoOAD7Q1DXCwChh2HoeK4db5YIUvfXP1jONzIYMSgrgXo4fEJXBwQggdTwF/MjpJ7ygqplIDX8QBhl0olYNxEc4IZhVdw3Eo3FGE/jhKFK+dxWXg4CIIbfqVwSpSCcEQkuDKaWEvEoB9/1CqncCan5hweDGPF8wEuUquKy2HKqOoD5lx9SLgxFbDHgu3wcEQ7JaNccNty9LwRhHjc9orIcKjMDsmEcTRkSNjGrLDWtwRDgUWkD7S3xLfEt8S3xLfEt8S3xLfERCMYwVzuLFjMV/eYWoPHVvF1F4fQtTBQh5EKFMsEdLAsgVO5Uag4M0VKlRxEWnEy4DxDgQNDqNVI+UohO4BLi9CKzmvhcIq4R+Cg4qVKhh8FjwJWr6MOr7I8PCWVByuni4w5XHHXrMsSalwBTLMtkC4kIkvg9Ny48tBcouH0TWYGnDDikG1hrdACAhe028ImgZfFTNTqWuhlvk9ARJajYXKmZMJUSodk6CtxdY+WY7d7ILxN7jl2Ny4t8kIqgwq3B/LDGUKXCKSJXh8Ygd59ZuX1Tew9pkXJFGhwckhbQAYIcdcJ6f8AgckujMsunRNDlUrghA+Ab+YQSoP5fqMufmHCxYxjBcq7ijNwcqpS5b/hEOThBAdscoEeDipfI0HfDFf8Y9AtO74YuALB5l5Ygm5VR4uXzUVGDMy1HEKwgIhuncpbhT3StsiooIDU7gPxFpllIFGIhMyyWSyWSyWSyWRQjcZbqLimYeXTBBZCFswUReHc6RpxUoJfQ87sx1ZqXExcorFKwxGdy4RxACkWR9kagGDUwEoIpotliO5c6gDJDStmam+k67mvCouXpUOviABRKpuEvkJRuBbk/A+Yj2WzFIBdweYgNr0mxDhKjDhZfBHh4IwhedxLB3DEXi4hb4IEeTMTm/EotpKjYpjmC4CLJc1FhxgyxOxHcRAMjcIkvEPDh+DSwHNxoLP8D1FR7VluRhaGNk7/ALjBtiE6zTAPU/M0qpqEIQilgtjXGFxAFMsP5iwjDhLuUZuFW9xiQVGDLV6U0G4N54tCKtuPHUQhU7gQwweThWrywRYlxfy/XFT8whwSeErzK5Bk1DieJf8AYw7R0hhKqMCoNTc1Lg8VE4v9iEWCrVuHDxiWwcQJdCC50KxCZTBqMdxm5ri5YJ5z8QAcCJeoCblypUqWDEwylzqPCy//ABqqoEJ1GV4LYeILrM2wJoI8VUrUmeHZ55/viuHlaJcYmcZUUruFGYuCy5XXF+hdQIZl1NCbUrgLawJUUC2YZ1qLVyiVyeOoVCEUAGPLBRUuIVE1wRwtBE7cdfL7v9Q8QlcBDUL05/svAwlCOxS28MXQlsuMmdyo9pVQjxfofVcjDUeQEiVLgx5McJEhgzFZbLly8RBCWLQbzFgt0b4WoO3gBbUwCdS+HGZoIrogIihsV8QXB4Y7bxBfF+PiXdjeEYY42U8PSElTxPkRCAFjBsyqf5m5UIQhCBNfpDoZYShxhwwZcZU7KkiYipWlcEYRg2z6TOMfD+otpgKqNvCXMIQZc3AiUQwcCOp+z9Q4vT5Io4zFWUGuHmtCIJmDLxhwIo6xKlSpUqVNS5fiWOOaqC66iEE5qEOG0CDYA8QitPiVK4IwlGBbfcbygeBxXJBZDUOGXDBMTExMTExMTEvYNMWXcJLmZ0ZRlUYU2YSq5lGzwAGH3llOzMcGVfLyfvJRFU3HRJFQ8VB2h49FRlAgIucwHC80Sq+ACpfJroQKxwFECagjEI2Ka3AFHCgWxJUPH/ZRPafb7QKlXLVBcLOaIllM0EtHCmB7tMttwOkBR3AMcYjJK66lGa36L5OM863wx4GsS5vga9QegZ36L2qBDMQdwNdUMQ8R1vbKa7h78UHAYDWZdbhTBouHmpUv6YTLRBO+SEjl18TRUJUC/XuGCpYi6g1mPiGa/Yf3Bj2S4ctrgWOsIJoJkTtwnpJUf9YSu6ymnBzfFUuzTGivdhx7GWEJW4RmHIQhkWt8DREOuP2fqEZRC8kIEgjwx4soyZaWpxQVuAh0hlcJYMyYiBuUTExQkujCtVAqBGXCPa8QAIkIy9YnnMjwKVCoYwPSS1XR/PxwzPBHBcrBQEYCHuFdzPAxjLioMCoEqMr/AMjpItUkyBJSMqYo8zA3AQhq3FLSmAIcTIpyalNbfcQg8cXyoFsdNUUEaI0L0MqwUlKWNkslhGwpEdhAoGZ3eMmMdcVG0Ht/EGKJXCJe0pHnhXJuX8cPcAljiIA13O9j4pczBKdylyLHXP1zDhlvW2UAPEW4ijIPU21kMym4PTKlenfocmZfNxmzfoHquDLjnnUuBUqHBMu4u2x5lHfBM4JUqVio0zJ+ZYXAwBTLRQlf9xNkFizL5QLWIjS+1aPrLzEAuAmeECXxf0QIzI7zPLGiENqFWx6BpZUUxXBiZpM5wSuSAEqtoippPojXr4hNMvFegt7IahMY/pC1evbM23Phw8DFm4wrCdcXEd/rgmAiCLJUcvP6gWtc3AIe5LA1GCMY8GNcIvcaJHREuMpuLCYjT78pxVxDuANEZcGOZkMCgYm3Puqg3RSfnioK/p9Cse8OQp85Q0XmuajL86zzXFgxB8weyXw6TLPafQr/AMwhbwLuMn8QolJCWOoF5gAn8o4iFVEPr3AhQFFuuKlSorYcQiLN6eJqLxQidRHfE1rgZcWFe4qUgqj1DVxbxDlEF2BF5sdxcVCUeWUhs6xS4rqUhCPF+eiKGZFWgio4JUxe+noLMgrOvMMCgwiI4EjAgU3cubmpcYvRDhvcVF3qLC2l24hVAOHMGMQbogvc3xXDwR51L4XMM8LQsFGeKlRlem0LUwSDp6fmYgPDq5f/AOtAmoPK/r+4ATfjH2CHOT3u4PxOZZunP1g3k4uo7Ivg4QQ0scMR6lttTJUxEhxxK525T5lYNprFiXqipN+EMXVfPFRxLe5cNZeMunUAFEADZx4hqXL4ZdIdEb2QpgoakgHaBKcQ6kXCMFoJ4Ye/MoGctQYRZqFLKdx5lq/prgwbTDfyECrEYtxYx4IspAlc1HBSZCFKHMR54Dm5VxOACmAwJqZkJFNQiHcYllR2V2SuM7eJvMCQyN5ie4cCNRWsYRJUfaOcMa2xKlQWiazgagx0WQzElSpUqVKlSpVEjZhqNzY3rKP4lpTKIeYtSLxFeGPZghhilcxRA3umVCMM8sAXA6QRbFqkYo4/KUsU8QK1E9GY4lWkCQy9M0BqBUrhYTcqVybL3ikvBuZIiymikIAmuNSx3F3E6KoalnbE/uUPs/x95j2Q+n3hRZCKErN1yvXAXTUToxXmAk3slDXorhw8sFeo10l2ZIG8PdNnNKQBqVXGbh6SXy8VGBKg0dsQgnFy5XpYWe/A3ALvvZr3lDMrSdQZLfDz9pQuviI2XKUKEzwJ7kR+mocfMIFFHFw28VFdci1JBxxiBmI90+/tB8iCDE2QgleIPAwGB78KQ0XM8ECiiWTYN/1KlNajn/cQ9KdkG5XcBKqXbI8dpThPhj+dwOkfk/H7jdGvcQAOtQa398wtar+IFtx5IUWT6v8A5iVyDff01Mgx9pVHLO1ZnpRe8O4FC+TJEZSYlRxHc3KhLgRKj4hRGVQMkKsJQOJcvioNRcLRcqWYErBZxFq3JcqVP3lyriQxiG3c0MNu4glqZpESlsov5lQYsXUeNSpUoFymBwZ1NTcKEfMUbw/8f/8A/wD8GN1qFqS1ubm+k+mRngH5gdBUrW3KFOSV8zLgEghWyMxih/8ASbwiihN0mDuWwK93+psZM1xuMJfJDhXZIqYlTSsgW8OLlC2XyebjFqPlLK2/4hqi66IR4NwW6ZNKbouHW36pgUva/RHzk8GD+5ZsykoxIoIE1ByNy5DEvPpuo8xplQyTU6ahHm+COnClWbgaRo3KSyKrR7mZQgLmai9xhk4JU1Lx6CJyR4vglRIh1LjayMqjqXK5fQwkrY+mIXmUbSo/a/qBQ8MyqT8IpULp0z/jNMRbfiKLe6o+IGjKjE2HfocZhBXmCgIkLIIYNHkgS+RR6ZlPEKwms2SuMXAE6RTaC6TJma4fDuFg4r4Th/uG0uUtLycIMIMcpAhtDhLQioALnggDU11Ek1KYuf494dfGPaAAo519PpABLH2uCgv3RB8hE8sxUGnHv7wExiAHvF7kc7ghj0DNxxylyyGSKbhwcLXNmh3K+1y7hBEueYXcH3XDdUTNvfA8DNkSlQtoD+IJQEK032P6gNXDMQRVS+UuF9yuCXLfCGInwIdogalLK2eT+P8AyMMPFAqHM1G5YlmgVGvaQ24WPYjBbpFncnbaZNZ76jJddTWCW0Y1Esyjy6gBglTXFxeGEeGxCCFMQNSWa3PgpGMm4ILJUQvM1xXOZYRJR0cEHVv4jR0WzgjVqG3z7T2ECe0F6nMrkZcRix5GiZhyxAh1WS+tZMiwypUqPKp/7uEFs3It/wDceXYzFngDqUQjPaWBHZxcuPpOH13FxDs7ihGjDM3Kz9PF+gh4GCjZU/iC10B+8o2s/wBUsBtyxCtMg1dyxajGQQbBf5mW+mIV7cC4nN3EtXq4EIC14TKjeE1DuHcoMJcgw7ismyXGW1KMO5tbDhm23UBLocXAxYAeEoylyxd9PMqo7N+oigZjWwECP+5Kvo+ZVLI0LiUor3/r+4OG0LXONzdsY1cTOXHiMo6e0qVb94eQZ3LGlBy9vtAs6DkwWVALS/HFy5cHkcAblyxmVJafiA0fQ34WTwqiWu2UUdCy2QgpS4iDSc2ibIBDvi4S5k3ES6B4gaOCfCADQRfMxwEZUzMw4Zgh0alBEmEub3/kHxGgLl+5wTMfMQWxBQICkEIvAPaoyIniAlza7mwErg4IoRo9pghPkmxR4ywI4i1uFo3KlxbCNcykwDqCaEyTiY/cA0lxLg8PDBQuN5DMpHBLgVjhLzOBArdRLtY4/wCHCVEqKG4tuKlpTZAvlnOv5hjUZYpuYqXMuDERTshNVUBKW5nuUQWIjOs7xhVYgSo8jTqVhMMv0VErm5cuLLvi+CPFtag3fChUFKYEUvN8XFhxl1gy151n/bgKznz5fKx6/wDe8E+9d43TqQNCL/EFLCWq4UKrzLoLlmIuIOdges8LFQAohcdrSFLYsckvkjeFjc2eglnuhCzi4jbFHpDGPRQqFWRLhY3QHeIVpKrm81FkIEJdYRizEKHeyxdHwagKhZzq+X/kz5fMv+pj7TQF/EWu/QP2ysGAcd5hXSRRYxjMUXu/xX7lkFHPyc1K43wS5fW0PJuDsRxspleg/wC+IgWJ0q/BHco81BqhdhGPmVBZ8QhXAi2M38eJ7sHIYenmuBbdTKNPMYhgjwdt3K/XKbqVMAv5ECtsjCdzL3LEV4ZqIG2Hd4PzKEL9DpP/ADU4IlMylDEj1i4bvglBKjNxOzLgVEsehGpY2GYLE8wEKeYxh0JLrfHwgfDHcYJaqLYxGBOyBuOoQRFZFbCYRt0fQCmKEU7IJh4VrEwZ3wi6gNO4agcpKOkQtOwZqXF3DL0iddSq4VKIg9w5WNV1DICJRIboJoJZkwq5cUgmVEDM3MlwtN8pcaYYTGqVKJqGBAqPF+Itb4q5UYcVw8Dc1wqXBsslF36L4ri6zM3zG3+osr8vMIQoOTLG41M4JBent9P3EBmMIW4hlXR3ef3JjT+F/wB9ZpfyQFXL6oZOCe+HUAU7geJQ7gubTKMXQ6iisxAtZRxj8mCKIEC6QTYwWVKZeLJ+YZL4rjwJQVwRB3FETCRI/lM6DCzWIYzKg6wjsYgAMoEiOeyvf3lNGIIgXFlABBTDA8Hn9QXQ+xl+7/UwpldrlfrPs3mYxVubmUNGwl3CVxUqMGOvqUZZcXlcKmdYEeNZhHR7xBuLv6QjW7jCZ4c/EwB0tRIkMbvPAXNGYpaXv/Uu1t5YgkrdbhES/apcBRFq6I/EUZJeh9oqlo94t3jFLJ1RqxlHTLzyjY8p1w8EyNypUqVKlSpUqWizUYxjc5yy1f0dRbG9xklyLII92JvAUXXZqZBthfGp4DACiKbjYw7IMU6viWglNP5gAojpDDUKgMplTECuGOV5w/pEVrELYPiokNQqKBRXAYxF5IkCJHYKveMZv9CN5nEoOB+Zs/5garH1grXbuOPghlihmJkD3Mx1L4rvm4TArmZUB4I3ZG4I0ToaoVZhWwHsRgXmgKYO1wCCqgIdDqWCzhV31CxZLiWVFSmYI2S/JA2It/2T/wCtHoCCwEM8VKl1BtqOONzR6DXIpUAUcPf4df1676bhqh7QuhYggYBQ5QkG9X9zsB7fL3AYwuNtsU/crlQAppnZQ1ywuWrO4gWwW2hCEASmO4wyhTqWqIk4S/LfoBbKYhFiaTWOL4L7l+ioAplviuDUWAITAzHoruCtxmJW/mLnJ46I7x3/ALuBkaxl3/8AZiD6kzB9/wBcPEaZ0n2lxfBjD1KjBmMqtcJcuVjruJEeTxfpY3fHiEsQisgQaMNxbeEsCn3juaPJ/UOgnviIFw7rMKtaYK1xOkvmYC8zBDLlZ6zE/bwDDpt7+emExEIsssykxWEazVQGE3CPJAZdqYHARi+QRQLX/wAQAAAFGUrMLYwYxBGY2LKrDWktDpjsdpBgI0EPGwYg0pmJKG5slcZ53v1EtB9Liu/pBUfsK+7HBHHtH0nDDMYPDK1Y5ggBE0dQqqGJrgt3wRhHgjPAMsd5i8ISmLwJ067IgDTKhRCIxRUP16gNvC1xdoI124h0cxZr94tsQOhCLxQwAmoKSoRiOTG6iWd8UGya3xUoy5RLvU+yGUQKiyrl5l8XGbGOeCMv1JDgCkmI1+khlQkNICoy7bLpmBV+0AMEVFzpZaPipdE6jVZlqDh3BFnN8I2NwXQxmnBK40GjgxDgHcKkjFMpTxThBvPNxAUxq+1LFNJpaOv6lcBzcJjk4SFeohCJJlDs/mUol2YixaG2Uh/TigXv+pdzIjsnvKhccmJbFqVig1x9RKENgEEymkRhzUr0nFh5KquNRAWGBoTGKb5DDbD4cUJTBFbHZ/WoBSjv2+Ybm2YL18wxCD2wUt/CNAGN+TUEFnBUJHfREv7QCmiXAwvHxCOVwVKgyzDLlIlBly4aJH25lfMr5lfMr5lfMr5lfMr5ih4g0CW5dRTL+f7gTX2eYYYRvBKibQlqEVphFMd+8oJNxilhCaSENCiXcr0Pqyx6kJNmGS4cOvQMWXRbAS4jaBcPrArEYS+DDAvdR5F1M9NvafbEIK6Yi1DJKGkYYcQRfcWKhWjefiEA4rm/Ez44bCBbMQIUZSVRCgSGS+FAzEVvE8zEsBVwByr2g0KTsyJBGs7Qs9mN9HxCMdYgPfFQIHMEeL65cmP/AAQ0mIIAljAMWoJ0RoLftM8/OVKrT7we4Jng3twgp6/zK5wq9w5d5pmVzpBGN3F6jxEJ0lcGMzNUGLmvMooImUqVAt7RgRON+r3lx294C6H6/wDJq6j7y2F5VmFA9BxUrg4IfIx8cJRYe+puxcn01LLdmH5gy0Pb49oFPERgyjTcTT5/XFjS0qPN7kT2LDUuMHFMBWuajJiUQnF83CalxPRYRW9QRRjioBQmE9yiUMTZGYvjAhKgG/HcIxEFjCxeyf1PjEoNOggC2Izbk+ZaLKhpuAGGLXQJ8HxA+aYI1CdHCzJzK5CL2iNznAthwD6wD4Ef/GkI0MRWXEG4QBELY5pKLVKuUnw1KTOBpN1KloFeg9d8rFY+XFFSyDeuLqKeSdSvVXCqKjne/aLRS67mQbZuVNcN1iEvSWA3GrC4PRqVcFk6g2l0QKEuGY0Rbbgp+6Ir1bgA3EdRehLO0p2sAFEN8W64bRGGuAjNYl+ZRpi9kFr8yhnfD3RKrI42OuyZoU+8wXB2RnUGXK35RXCoWjFhACBEB0zWoi7l2Hh4SLUpyxG0CwJVcEWOhsMSu3phuUEdcQ8wyuGM94j7v/JXKSvJGxe47MIwlKjqJQZQqLU+kta2bJuHAanc4O1Qikq4ECdReETtMS7ZaqE90oSoC3Y/b0WQRhLly88XRcQo0YDJaHrpBgxWjv8A5EgivVYP++89kGKXiK/u/UALSllqNp5pQEokVEi2W+hLFrcfRKHVMaReaiS5cCaiJb1KXbAGiVNqZjgUSErYYYjAV0+YV4ywtO+4yvZKlVAbvHBKQXC1gKuVqeEF/hA0Mdly5CVCWaDzAK6mTVSnqYTN55qNg7udBSiLZMG5ZLJZLJZLJZLInlA04nVcckUE0cPiIiShAoqVLTXpqPrqPtxVR5PCApgDRmqVGYjNHo6hK4vg0G2Xti3EkqXsQAUp5Myowp/PKRmYpcyra45Vi3XUFUs1dTGRD/e0KLZRvzFDc9GWc3xqXzTca2Yj2ikHEzUDi7NEKrDz8yhmVDhlXuEUkDnJr3hjkO47AQSiM9opew4djDjqbgOzgl00xJcuLw8JZGpm7WYiAIwpcR5ndHUY12uXzRFvTGB6g++5zPdDNEq4RM3FfZDMQIYhakEss9w2SqXFweGzJC0RqFDaai5XMyo2xK9MXYK+IopBn4SVAJm4nejgm7NiYTaL6S+0pFtk+Oo7Dg7JVYt7e4UKYKR1CDj9n64odpKttZEoEIVY0gc2pVYjHm8KlG5YFzB6PrBEs4uPK1ggBH0DEuIv0pvhvWW/eWm6geBlcDfiAdt6E/mEQKCXLgsXxyhywA+3BQbh/EGy4lxYe0E0MXlX0nkUGXLh6MeUMVYblQShzKSkpKSkpKSkBAgXdRYxi8qLiAO8vWJQFcXGEfRcZZ3CZa4qXE9seEsqYleIwzSUckGyVGBzUYSwBUFRYQApnsOVxcG2WoTAATwwtdMyXDpqUlVAeiK2i4q9/iF7WMUjYOfZB6hVGC7i9JXoeLlcKikKTCtx+GE1s7Y8faFa44vi5cWWnUxjLJXMZaNMLFjKmalZmuNQvEkBqF0gDHPUTxHcIpC9S75q4R5IEYt/PFtI1Xmbm57q/mCOj+J80LmEdwjG4IXkwWqnSW/xOpiGA7lTBHghwEFW0yxFjiK8k8pgQRPUGJWXoIwIBB053xvBEWHjlgW54Jph9oMH8ZWjIhUYKAVghwoijQxM8F/iH2wx0oyZKeDP2frlFHyS2qIPSUFEo0z3EA69Fu4xff4BFMrbL8fEwEE5ud3xvh5upTxuYEXFkpUMdXfmYFkYrUHYsa9o8MdAtmhElcOOLvziGIjkgbQAShLKXxcrgic34bhbF6gXBKqfOfOfOfOfOfOfOfOWiijGMeKrRAoi4iJcY8JKr0BElVGBcMkS9+gKuMOMGzjTEGDdS6ljNcI4WCWMF3bCxhQuLmV6MlN8PIygYhfcD0kqPtCSm1hktT6XO508RQUoxMqoLc1UC+I/ZhLZdwAhLlHQyBroBpioh3Dv0kuPAO5TrU0xzUccHR2yrBmBGJ5I8EYl8kYTPN14QyT/ADKm6MD1Oih/MFT3iVC0QlUzL6IZcolMVBkdSltBJm2sHJwcBIvd8Pph92CDEcL0KkdCykvb0BMnMvMq81dw4qsxrLuVqByS40iR/AeSBm6GEGQdXFPllWDUMdT9keKJPkj2m4RB0fzEGmAnDLcsusRhukW2NNhAm++L4UZmWNy0rJGUYTzG7RMI8EeA4YGpYb4VhdSkHD2hkvkjEtvJGOYnTwLRAxuBjijEquKjjcSIPcIxjG0wQDcdJn+jP9Gf6M/0Z/oz/Rn+jP8ARlODwY3OV26gjr9IM3ZBk+0z16gjJkvh4ZXoWXKNzcrm48XAiiK6YWyuHRwrAFEEUzziILlDMvt4mFCO4YUwy+COoAU5KxArHji+SVz7yo41tqai8Er00O2BhVpYQgJKEpHn0JqmWdxeLhAQAk4ISzN31FSUqzg4WKkS2ZuWIwIajwcMW9el5NHsmTNQlw4ljY/Qh/uEBtr5hTAqpjjZIEJSABbfCgtl8VkKzI7Mxy5IQhBirREFtQJ3cp3MW5q5QnFwbY1D0XUHHFYMJXcvlwRdTogVggxYQ4wNy/iaEskp7IssqxKaI9w3qZnUzEcszv6dxH90rihFkeyIqX+WDswRqEMTU+Ma6CUJQvuVCMRFxiWlkA4SOdHUHEIuEYTqUagUSpUpI+5ZEaR2H0XbEGA+ioMjw6lsFiBrFKWDZZwTEeb4qVLbTEzL6Jdj/P8Ac93+f7nu/wA/3Pd/n+57v8/3Pd/n+57v8/3Pd/n+57v8/wB8AuJOos1CeYyo8JELvlISoR4YRzO6B1NQjDhhLHXFRlxaagx5WFeaKxfprN8HCeolrIe8ZUqvVc3EjLiIBaI/mDQ+i+NxxmY6mxC1dSlUpUS7jGdToDESgKuVWLMxfmZrhmGeBhbo2sOAjwnSOZDSOYReKLvEeHlHiXa4R9IlQKeXlUtnnAX7voADvvT2jyrH2mdyeYhW2YEhh0LqDsy9Ed6fz6KKOzcsadyvQQhAPq4dTKFDUDtKYYggF1GBWpT3KOSXMR3FqEMw9BHXulH5hDgJXFrn0lXOvYjVaRwpR1ETh2+kt6Ji3VTPKxruIDT8e0Y0tfOPzqA2yRWbWa/qLG/xHPZAd1hMGVysrEtSq5Oag8JwA6y6wpl/ByXwcXwDuW1hcLV4hZAp7QT9EvF/rUACnl5uGyDeTjPGkGw4BJUeXk4uo2wm6WNSmUymUymUymUyvUMRjwxY8Jw8UDLXXtGrXX0imaFDs9mVF3AuVzI4uOWVK9WOpcEMku51KeL4uOnNUdlx4GLxkuFnkmHZQA1w6g2XLj6Cb41F5uIBLXzXoveWVQPUr3GEoIgwBogoiMYzGKmY+Bl5uEZMy4zzdzUOp0QWnJDkXMGsToYwGBjhbDmdHOooBlgpUI8a4uDxeZfChuUNSyLtgT2FRNImonceou6kVl4O1UzbBgj47/iO1XEXr7wMzayvv/XB6KvcbVPBwZgTEhEsGMw4nWi7VLICt3wh3Al5geEiYLK95kB5jQTH4greIZnfzxfK1Ksu5U1BiwZc33Wjx7s28Agy7G8D67/EAB7Tw1Xw/wDsAVkBgUx+RH6lCyOpaC1+P+fxHIOLIDtzadTWgOInS5l7XEESEXmpni5uCe8Sd0G4QuHJHi+BKJmIpTEJ9sS5QV5uH3cU+3F8VErgIjZOqiAazFcMsZcXi+U4IypuBX/iobg8jGJEjCMHLyuiWjdy/XjSrgtCpR3MU/wvyalun+CWOTgdwjwSol+gZS7JmPFSuKkWSzr1usxZxFTZCMOTRnX4lNQIkIkT0XwllQi1nlqU3EOuV4WiFlVAHBGPFcVCFM7iJXouWZIp7lIVccsS3aDFQMGA4gFMFpIBbirhhUevcM54qPN3HdxJEZPyidZA2ezCVRlO3XwwYj/NGpMnUvLRUkBFjfT9kHci2+ipqdGGZpBebgSuNZIC13K4GiXcLUQ1RCatlE8eJQ75uOSiBRTxXFb4XDMJ4Vccx0hQGGALXK9ECocMOCG232EpnsFrCQ6hZQTGQlfPcEP+TjKGpbuAS6S8n0i0AdsR0PciysjF43CEUZ3YcWZqUXogbuFTMy4Mvm6c8X6CMYR0hm8wBlcEeb4BlgxhMW4BM74TYeH+IvmLfzwS4McypcYUSmMDBc1hA0lG+KInLweh/wDAvlE2lIYl3GMWMYAtmNu+Wo42h9j4jH0i0Lg2Fdf1MkfMrgicbl875zEXDh0uL2UGOHEtXKC4Nl+mo2JUkilPcyN0Q0GYehleoDXJDqDBGAYFIPcY0gr/AOGpfFxXhuUqorjzXp1uCWDcbHoTMUCDVNMRalKiTgi0xGAiJvMG4LQTXTAMUiCot7KRuyj3p/UZtd/B/U3Rp3g/U/qOA1W9v0hIKCMrkjFetntE8VKqDKuJwgUywdxNaxYqNpYQ3qUVpSbjaFLW5VfzCrjLhHlzoJfj+dRatYGURRrUfidkIaIjJihmPMWxAZXoCQg7WApeICopKvt5YvvTtHMJc1ErBEvjUvr3fqVAi5uDmy/3Llhu1FY1VCHd4NStgBslSEeTFGVVaQW1w4meqQbTBsMss2N6l1LZ/iKJiw3EMyvVgDcMnuAH5IODMq+z22Rb8+vr2h1dHoD1BpPMCj2mnDDm48EeVqAcT2Z7M9mezPZlxyuKqMYFxHGGC3MCQ3KiJVSynrh5vmo7MVtlmCcI0C24ZlgAolwjDndJXFytiVUuXGnDDiuRLqOGIgG2AVuWEHNQly4MU7lNet6+4tOK4tWIeUa/8SKEHvCRJQZIyuHg53zQTvkIyrhRiCOohwQdsQblNp7WXAG3qAJZuLVAABh8EaqPwh5z+P4gtJ+WLOQ+spdv3oXE2x+x8tfaKxBUWWeIBljzcuNQbWCJ4uXxcvhUuAFwSmBJ9dHaNOtf8gAF7DA04N+UW1ABjkY8O6gVGdehSuFqjDsnQEFaTbSMtW98ccNnB7uYkd3u/wBQCyfj+xNQ7VXiGJ7wDNSCQIDvKVKWbmCrhaVYRDYM/qaQqMNfTEC/Z/MrRC2Y1KmxioWD3LwmYGaGQbFmoH7QtsnwbnRR8kRsAj9CUICuYpKmXVsTqN7lMIBOF6yLqNw4grpJl1Bvr0WLGpljPZ5ioLR2PmPWCy8/xKAXFutO8bPf9QxKL8lcVK4CMvhxqBDQQQWanxCMI816SCCmXLly4t+ikZUtTrCCEGH5TAbWLuXAxHSptcQUEfTUYAzxcAmoMxLc0ZUQLYDR4ElxlRuLw0SSkFL6EOYCOfQNsytEhiDIuWLcXVys28PNFt9GVkzuAbbgPcwh04v0XyLJWhfVmVKoaIAFHG4OJfCncsiDue/LuiAIoIrIRja8VMnNyg2cAMxbJESyU7gSrwwV3X7gAxwy641G1DKTASC5SnfW7gtFjrjYldNoaA8gmHJ6CPJBZUbbpijLcDggDcSKPrEjG/MczkjKN5/RGVKlSuMpUrkjDCVQ3ECURvS7lnGR+J2oO3EUdmvb6wCVKJiqhUx2/wBwADUZxHX0Wn2+IS8m5A4DFsqfnIiFsRADs/mMuQDDAWUHm3KQrgWe5S6HtEOdilm+YD0cMuUIdwAo9Fy5hhIPcvMSQgBHm4GIydI4+IBaYA+4QQBaeWL5L7zQEdR7cLGDHi5hFuJemzxCpb6sQBjkzE4vgj7c0tR8Uv4l/E9qBMvSrTcF9Y8S67CdoH1JQltdn+1D97PcQKqMevuDadxilv0VKlSuHix1E2dJTxqHKZ+4IvK+kYpRh9pXywLcKDJBGozJbsnUERVRNSYl3RecU9v6ntvzL9Ay41lHS2aAtj0MojwtZ4HDfpYRjmK3PHslphl3zXOUNsAWK4bxsAFIQh1K5IotEElEGot7lJiZRKgQrb8xQGk1Fj6gVQICZhwFIAO3KWOjshFjLgm4YO/AgsY+HcAUISogxOqjJFMGXqeSJyQXCVitVrLK5IyoQg8arhCUu2EtM8TBxgy5fFSFweKicMQLYLXpgP5YLYE/Mt+v8QA7R74QYg8lAu+5RbSa9vaVo468REmPBAadwUQhDgfy/UrgCZ0FP5gBEuyZtTdy3DTGUVg83EaMeGvr4mEvhmULt3O8GXCYlVxcebhKlUnJpgNcHT+oPKp6COia6qVa7NJuFnK6vEw8R5gtr079FxgVwnCehc0quTEu4+k8RgdykpKSg9UMVUsFK9L37fM7cmJ2BHLJ07MezGA3ZFsla+OXi5cuLfFOMmCd7hgjRUJ1Ud+0q22wA16EolcNQKjwApmhwlwNOTw7hhmWMdOAGSzWo8MsmZU0SmEtvgmpuHGuF8QKi6mSo4LZ1LhHmvmFUNsKHug3Sw1TI6hnujcCMRp3AyVQelC1hH0VBqLwBe6LHAIc8PP48VA8xl7pvCoCbloVpuoUw2kVxpgtuESFV8JeOsAQOFgsXxtydn7JYFrmkUeX+ojCr9uKAKMI8MPScJrMuHA4VQhtEgRKjwaTxDEJcudTviivmCZ6YpsYJpIGyT51FwqhC5A2TDaYqWR+C4VTWGBVRHaAwA+3C7V38whCXF/L9cIvMfyikqLIjS4pBqLulQAzA8svhq0hoUxcAPHUFKD/ALuWHv5KIKGx64uHpqUlMIM6lRzdUs8Kee5T7+zKYIF2AT6nf0gC4RgRrtxEKAIS7YUpPSZ+4w+J71/EVm8lY/5CSWQMvF8VwcDx3E7h6CMrklF3yyoFR9UokOyX9sdP9x9ozKsXyT8kSVB+SMqVxXCvRqKBbFIbsOonceMR0i3a+OoAehQmXLL4v0MfPpZeqbixIMjLCvvNEPQSrYxjKiAAR5IMLvhZeeC7moypmaxKLffBG4VIKImWTGU0jX2fePiFalpIwIrX0Bw8sVmeBcKHoMZuVXAzJRxcvhIHJcQCalAVUZFq/tMP97sYnVHv1CxiL1CBKgsY1B2/zBiZvI9BNxx6CCdwxCCDVwFiAKvtE1fuiy5vxmOZLGh98RHeqF8AtYLX+CNGlwvzBe5cES7l7VwhPzwLnvNKZguqCW89kGqCLer+kAoW4di0RgFHl3Lz2QrhA+WJLIr5jpQh4P8AstxQd9xxHT2i6Q+zFMPcHRJfKd9HtLwz/EKM8H5m86H8xYLT46jp2S7phBGJo87TXUwDVV+5o3gyFpmAmBnj/wCD8w7+/wDyUuncrfoHNXAqK1frCjj2I4CKhv57Jaj2tr+pbG0ZOvke4SldsBDZ+YBTZK7yeIEZlhSr66+0p8X/AHfBFd9QBbjyy+LxDPpI8XDm4vL6qkNTtLAVQ+W7r9xVAfT/ALAlR1RMtbDtw/NkYIAF3nMrwu9xhYxPfkPYJSrJDoY+7/kHAW8MpzB7gBZNRn4zFiueV/UtJzf+/wCQyyn3giWf+G5L4ZXChLJUqUJYVA4zArBD+XNyxvg1BsnvCGETglQ3Gb4WHMLKqPgxE5uCckdT2QVawzANy4Brj6FAqmdRNuTbv0EXklVxcYfdf883yeiq4rglRLhRlSs3B5mQ9uuomdHUAlxKly5ee+J9ZI5/8bjKhxVmIClpCKC2LJgGEfMpUpdvg/uDSjOwvz/8ZayH4Y9CAY3KeURFQZqC3k5qLKmVMViNdx3ViFIq+IgqKtsINkvkf3BDimXoATKIwgUUQN3wi0kUtJkSUCxX/wAlu4TqIKfP6meVQWbFv2YAgZySj08kLMn0nlTxGA0Cs+81J46+eJGcgn1jbc3IG/JG8gmHJEHcBjVh4Ob4ENxe77lCuK4ILA6hm4zOwICVFO0v5O55CNnY8GVL6KecMW+yI1UstvrxcIw4xw+jczCVL4ZUldzExMTERL0ajAI7mI0EGf2ZrE1IemdbW/njRhjNRziBSosJZ3NsrzXiVTxC412Yatr/ADW4keubBfg/pmK0+I+nSBRXoGVE4GXHgbmoAoDL+j+4HDxpFZF6hO5cfRUeHirJVQXC8wAogjwRYmYrUxss1/ENMZhGVTL1MQCLt8wtFy1GPpsOcwUP9Upl3GVyNGZd64rhhEly4cbIwb4EVJ9fxGVBbduiHF2xDfRzNcOkkVgvqqWCDwTbLA+o/qJKqzsh7T7b+0PCg3CswPe/6h+N33Dou145YUg5Fp3Daj8feVq7jXLNypcoa5H5RurUF5ywvrEazFBpctBgmkp9IBKQAVUBQL+Ig4qErgmRUqkBWoHyGGZhFir6X+oCVURYFjETBK8wncGUFtPzDYRZ2oky5lBiEzJuv3x+fWGtXFIPIZCezg57SWZUGoBLPRqOfeZTj0XwRKOv5IVUYLCNa0uPkd/XcNCEoloWJ+tLv6JXDCGZXqYrea9VSoESuLlR4aQVKlSpUr6lS5hEI1r+I7RfLGauPMsaJ8TYJO4kpY+YoBswxyHtx/2W1R9/+Rpdfh/XFSpf7P4jBRnnO9W/xFMdxmPgGo92KYZUqJXDnH/kcuY5Qq4RfQRxHXG3HoOBjDluVN0LcEGooEJXF8CGkKg5Ki27Jm8oF1Yt7FQGjNMTc1ysOVrEoSme1lt+JTAyyOpd82md/iGGfQESa9VwNoWK4ntRE6mnb73/AHEyuVYB97I0YjLN18ECEAwfEJUrXORUr01xZPMvAizrR4P7f0Rw8P5+7Cqkv5mgIEDqV9OowECKXCFocVPG/cybvw/qCNCMCtQXpj2QVqexBVggvYy0CUrbMGeCGLO2FG7lFQ4ITBBm4cbGBHghvZJZCCOphMvu4otwAe8CszypNGn8n3imRe8Slgst2zrs3oK2ztg78oACpV1DajFpQZQ5h1Fk06v8yGWhihuD2iOpx5laIFxKi8VyNHZk+Se1c6Rg/Z3NS3qJq1g0FTfv8Q6FBKixvGOmFMeAicOoKK5VHmuLhBi3xXoDaXLly5Sd8Og2zQA5zEjQzFgXvn+P7hXbH2PtCcZZQKymlplRMRmQUey8XEBTK9J+RBCtPJ/UsJl1FlLWGeaAjSNwDrSiqEvc6ydnmLVp8RItURra8Av8TAxfn+v+y8EmxK+z/cQ4Uwjseb9BKmoMWdVBmThCAiWPFKIFbwR2uoaBhK4OGZ5ZhBYoKzEKZjmEYR4brEOKZXAXcI1SszpPdDU2oggixalsUly4t4IFcVK184G0RXKuEMkqCNs/shiiJKhKg1HlfBHhLK4gsEeQ+YAhAdSuCFWgEDVMpbNRzFa/H/IILyI5hiYXKl8XUo6jkNnUs93lWiJoZe5dtS+CEUHpiMq9DFDMRFLE3GDP0htSiK4DsntD+IqwJAagnG5uVwwieJbIg4HJuX6DgzycNV7oEIWXUQZVMu2IeVg7EhdZjzBBZAdzVzHmE+0GJPpG3TnxFzEtwbpeo4NcX40+IhopIQ3DEr1i7nlWVTlDBifPBF9RLJ0YRl6e0CJDDc79iHDohyLKYtGDLiwjNODEub4YPoInF+i1117SyWSyWROK/abteTFhdTc7amsRiCCBzqISpsi26nhUH3BbAiLAQCRUuJlZReBhK0HzHAugRLJRmX2zEazyZWK2eCiIXhGUiu0F9Oq8w68HgwQcAIMS5d2vwfmf8qX4eCPqvha1KIRC0i5Ufcp7y4UWJr7vqFHR94yGn55qPF1ByJfF1GE1tB2GBilhZbDnJL5KjH0bgB95jhMq9RE24xl0SwuLAIgYlQinUOETggRdtQrLvlud0yitii2GOKFJFlw4fTXIsIPzNBh8MpuFuTia18pVpjs4o3HgXi2s8nf/AMgdJi9oNlw2Uo4V5uNm2/GZTiPokUj058v9S4Fe2IuLQAFHByQzKkUO486o2F3BMKF5yfiUQ2+sboD5YkYS06l70RlWTcJUZuVykSYuBSOSNG4DzMAsESoYhFhwMo8iDmoQgRn7uW1myLVSDLnudTDqnw8BCq+4G5DMCoYUaYsUwkQCzhymVBFQjkYPm5QoWQUhiKyuCUl/Yf0/3COJcIkGVwZQswsYD7MwWKgMHZBCI232z/8APrAHc2/7rkJVcVKzcGMItwj/AODwRZjiuMgstBK5ubm5IQGMmI5YxlS5YXmxmYgA9kMkqCCx800T/wCyP3lERJY1CBhd+rAaAgAoiCUyuLLsP9j3iALEF+wZdSwD2jTqG2qhoWMD57Y9EyblTSzrFzcajc6Tdn+IBLIyvUReC+CJNcImF9wCwJGKPklnXONuYBqEFEThTL3KDJcB1N8RBZUCJw1yZiPUthlfOLMLgPmdTxLg16jtReViK3MG/khGIuIqLFGWZaQgNOECjcAVLsm4jCcgITa5uXzXBHhLtpgGle8AYtSQBXDD7xXhAECub4C+yXqGXuduG4LGiEr3ZgzO6YUCghLbPY8g97t+WWNpwSuB64Nw4B4Q1Ansy4HX9x2W5UYcWHoy+VNIQYwai3DjBDJnih3EJTEVGpfFQhwKSpDgmRHEf8v1GL1XbALygQxSRHQwxLDyS2mWAIijcrYhd4QyWS+zGqf0YFbKZrGwCFLoZazwbfMACiIYYJcuWNNwbxDm6luk1rmhwzLGvxLUu+F/vb95XGiOM+l9LwYlmGrlgL5VLZaKupablkJc3K5GXGAmgIB6PSgWC/eGkIwLYrY/1MllsYxq7YUoqKbbenhxLjxddwx5qK9b+I+neX9E1fw/9j7FISg0tNRN1t+98XEGbMgWiH5ENQ4DHD5Hk95YDHn+oi25pK18Q27Hx3LhFBrjKC2IHtE4uXLiDcqCp6IwzOPKaBflKCzB5BNNAqiW3TcZliDPNjDFQ5sDAzNMRqGYphkhE4pV7lGeGqzDMCIDEpTcWmo5UmaIuEKoFQiVAgu6sNQQWS+ppULox8TCMT33LcCnk9JKndS4gKYDjs/iP2H8s7zU+IR4CHpveO9nm4AUxJhgRQxD4NC/TPJDi4cBCXRc8TEfyFl0nwhBXBwORHUDwII5IN5l8XLlzCMbB5qVNQDCBKqVpKpeyUD6ZnrgNTrQxku5TYUfmAGAn5hCJFlBrRnQKx0pZ43M6Cq373/XBNMVb+j4jLowYjwkypv2lK/sjr7o9ozMJ2RWXNx4IDaUdNwFWmX4h2eLhBDEXqUSwLghV3Dipcv0GUZeTiLRMtMQLU+AgS6QizLqoMxhHhusQzLiTNZAlOvTUsYgeCpWxi2Go8MWIN5lLhdv44eKlcFI08XLKAmZ4DiKz7yhcBR1/OXKagWz6xI8ESOXAM4MRa3f8QCCJVlf7gSXNpi+n+oPcahWpYU4gTLH/Tv3gj5+ggx+J50h+9GEY6WKM2cEQYIvFL8uNzCByRdwwHUedRtQg5lwQqvBwsJlCp2MCJFxCKdkckdPeXU1CFdwD3lydV30zwMBU5p0t6INW5c/WdxCBuS5YZlh/wCD8zF5LEGUn+5C930haao8x6UItQMx4FpqAGCMIEqJHUN7vnEc22d5gFD+33g3S6f0yochK4ICGqnzKgbUGyh1ovoTB9o7lRK5Jko1LNEu+K6ifcsrDVp8vn4h0FgjqfxALgYAtiUJREOYVwx2cE3FTzLy0zLdyzMSpv8AVwz8wg4lxhimIiq/coEYWK91EKGnvAYNvxE84j2LxDUmDUyMMTTqULxMkSoUVBjwS+Cwjv0jF47Ny4RIcdR9Fl4Tzl2wE9iDcwvqQoyhlHco1GVzsMVAbIuDnUxK416qIiS1G4KJKEYxjDUonNYjHi+KlRtgXFRPpGOp1L0tyq20r4qpeyaZJnzmFViID2r39oJ05EY8Zl84+nCi+B+YsTAx9YsB7RzZXd5+gwqOCdxNVP4YxUIy+tacjAXbDhgo3FVRI+iC5h0wK5rg9IuyERKjwRgJRwelNmjgY5mkdnh3ACyUJZPgcWJQQBiVwg0sjhRguuoK52Shqg3rMq9/iDeSHljO1ANHDySo9QtYbGDK5S8MeThwxcDRzUqXUGLgwcBXNBGKguf54IS5ZCIIBq8uCCzZCiHxn+YSUD/fWYmWIR36bBef5gqELYojI6ZeQxa2YlGxcJwRTa666hQUcJcyBQwttgXFHiPSghiWNsMIgaFxv8q4VFU3BX3frk/cIRIxgrJcz3qVbuKbqVZsnYPhHvKAlJfJHR0Q2jEJcWVWSCOuKlQxDUbxNeUuX6HpyMeDhhGXDM/L+oygJQnYCDdRSEYAeLjLDADEA57iJ5eq+epUqVKg8SJKzPbEElld7R/qWhsjFixYrZP2H9yiofxKb1fie5DWjJV8rEXUZNSqkyToheu237w398vzCRaZu2f4QiN6zPnuDZcqDF5svl/ngi2Vo+IieYY26IQ3nP3lWwWJ1LKFFiTeE1DOY41Hs7MuaI8DwBQzIvBxuHFy+RZUveCLxU1ua1C+TMy3ipfUcNrBSuSOi4h5Kg1d/MC6Psxe2I2iMEnCoHcEMrl2p1wibOC2bjkiWHZ7wDRUC6INUIvg3DKonFctL5JQYE18RLjfg9AAsNdqhRgBGom4ljD0jtBRLlnoMoshdGHUJSfqHzCdflBH0g395lsnnbEmYdktxh+YwppixCFkI82BsjOm0/MwpkfYYh2geZhoOfqblam5Hk4IZ94MAzKswg1Bhx+z9c/nEIvBjVC0pl3fDKJlKqEDklmioTGoEJcuJwgynXAKOSLRL7XDjMo9yuLeTCLwS48Xw852fYwRnsfX8RO9Xvo+kBoRMH2+kWbuIw+JfiIOZ2cYNkI12emBMSolS5cuXLgIlxWExGCnJ1BLI6jBW4r7wqOuNKh1GVA/M6enyT+RIJVO4wpf0eCO9y8Yig6nyJIS6U4MEw4sf8P11+f5gRSDKuAAYeOWjM2UG2YWzszEDM8dDNe8rh1PfTf0IjHREESmLOotDqB+HxEeqQjmHT/cYLZ9fT4hx4Xm/RXXnCAjKlcsrmoDrqXFyMxQ8h5jMCK3gagmqo4ZjkelAWGFS+kIpEpcMRgAoQnyTSF4UqWQnJbqXGlcLL4qU9RF3DKnl4qKf9lBUN4R3DTCalXUpbxMybMwTEWsy7mLlRKhwoSxRqPB1UCswbjCLpgf8wBbfvNKgFtDgeBNaIRX3IOzmafiv7ivQwlEaYG0tSHEMKMTUvvKttnfsSpaTTiynzCJMg8xjiDj0QZcvg4ISrZkzCECC40n7P1z+YQjGMYA2TVy48od8dt4TUXRBG46nEB5i2Q8PR3lMA2Clw0YSr3Mt1mFDHLAjKmub5qGIBJcFjf3hHgtq3DadyyRehuGexhKuJCVHEOKlCLv7MsM5jn1FMCUFsuD13HaqFzcUAPzFJS8VX8zvl0dH9sYxOKicVLAglrWBVcYNrNmz7yhdGX6anTq79yXPS4vmZJzcpL8nmD2wNCuz4Y5l3LEYjxwWk8B3KWV/mZfI8WElK91iYM11pfxLzKaPEYR+8gwPpPgi3cMoXMY6g8ozaWT6RAzuviobTBFVHpJ71NTvl9VPMV2+Z4xElrMz4PeZtwYxEqllHshLki0j2KlxbMTfki33yBCNPiAZWFOox7WIdiV5lrU0pAArgVEYT8sOMQVKS6LZaMKkyDANL7x+1kqEvn5hlTwzc0myJQLtAKi8Vu5R3yxL3Tj43PaaVK4Xk9JmGIsLY5W6jMFVycKRtcQAxDECEFKQXTUoz7A5rzK1ZPmCFuP4iAmGD395UZA2sEK5Xf9QSzXtKMvvMWuGy6gHDCNPji16gweb4ODis3EGmDNJawYFsj7KEbXv9cMQl2RGkFEYwDCxbg8Swg2cjExzKGoS4g4Zt0gQyssdsDWM3riphGQeAipbLytO4LVwYhF4YR4ObvhI2WcJGKaYnM2zYlayt6gHUWESeCK0WEoQwzDBUuXG3U+E+E+E+E2BZ5CV8f9hIeXR5lg4HQfvzB0SqKhtnT5ggI31Eawl3ri4vNy1rv8SxGWPMAujE1s6jA+IAwEU3B6NRSGv8xyufF9QAtH8nj/ALFPpsSNNjmtEwxkpA+CaEjFuopLeniYnKZ+ZoKNB7y8YiM0Kx0O4UxwVWrYOE2zzBEEKBvYePcmaYmTYuKvJ5TfOS4MJf8A4PhaHGWAq4nAIF21EaGWKiz00lpmukoix4qNDY/MD3T7OYVOmnV/zBQ+4f6g1g/WXSfpslWQLhfVL9D+Y1NiJT9v46mEUBWZ4baPgmVFR6OKl81K5S4RqASQLUGgl3nvIsnNRlAzmLg4i8XCHNca43BUuMdy5wcKtYEP5cGZPCbVxgFjKyw5G37Qo/Ypd4rc0PPeCHG9iLwZbvfoCWOp/mV6L7yhLglln+Z7u8dw1KfmWuyBUsNBhK9BwQjYUhCBxt9UGC+5mobJaIIDcOjGZdMy6shDbKxRMCmUIMbiu50R9AxjhO0s5xb/ABQTDFgyiomsGCVjEW/S8BcrjMSHFy69OGWtIkKMbZcplnIS0l5gy5cIqbJThhnfOubly5cERrgmRRaPB7RliTH8vf44eoZU/C4ZuAcMyMVd4ZaFvo1BUhHnsKgxOhuKU5V/ng5No8wFHjg6cmvNweZ+CYEpNJcrV/xibffO4ARJfCx8+/8AU+/Pi1Y1CFQXvSzDEpclD2QEWoQRmVGy5g3kjnDDEdP4hLUdkACiHoOHBcu+EjSXMVsBcsqdS7giwTxQ2a16CVG0IRB8RydMTcT18zzyzTC4RLPJESlkbpT4lRGFVSLawPQ4mNR4mM6ZivWTb1D95mB7lI81xfDxa1C2W7iq+IxpxhgqeRBzuCA74Cai0TdNQt3DhLKhrMpV9SpUv1JbYW1LBqTXuQhBqVe4EIRmxKiaw3jJKCBKe33gcCWQgUSoLKgr9lTLcXMO5Wjb8Sws3AdZ/wBUZlgVFN594FAgGFdPqOCJjgcGfs5P3CGIxIMkLNk6HFo3M3KEI8/hNwhEJUuOZZCwymwCVeZiJuZJg0xEu8dc1xfBiXwcBXDLiJDyiXCzAsOu4ypoiDOxHh1M6trgTJAsIRaj2TJVw2LMBLlSo+oow3CdKOjxHha7lcD2/wC/1A+XBBxC6Er9MQxbfFK74B1wsSbiPr0H7lEq8o+TD70alqdu5XFRxAzcdDoG/vmO/kWKALe/f1lVArRv0rEvDLc234g44TtGD+wOyIIaZdw0EO4cNA3GTp18f84sCGLOSVJYhDLV8ExyMaSCimCQFfx0f37ygzCVGWQYfMYisZgKjklx2GCj4jvjtZVK+x58/SNdEU7qe5TzlwDRKTUG+LDcGzHTKNe0ew3KiFWfnM8skqO3fBL5qONxyjUV8YIsagqWEG9y5Nmodh7Pfi8Rg7QzLi9sRyhrMtnzN8EbeBl36K4q56gBqPg4kWD2NPkgwlXCEJRg8VpCwMoMPw8fWCBDSTKhebsGDcECZQb1KjErJRMRL742dvn/AJKgijq8/wBTf8+O4KzCozhkhmyEODgltIkBCLP3fqVKn5hKjHgwNoGkGUMu+SMQSO1uGXL4ONYaMYPG8lYgsFi3EKZXovm6iwOGU3wODCrLPP8AcCw1xUBKlHND/M/kGIWW+NonaG3AdIgYiOIVgy+D0imSLLMNe7BRRKqJMOA9QjDCxlSoZTMpFGkpj4huetv6gCgiKqbSEhJs7HUG5cZrc3kQLXEvQK6+OpqLaESJXFQjwglM1WuWDCo/sMoR3DJfF8AjVkJuD98R638f3EObancfeDRk8RNSjslkv03FSNfy4l8XzXlfO4qUIBzrgWiAc1BXXvxBWkm4noqEZcwt0/h94G1z7TMRPEbVB4cMdvIL8n9kuSMFLYOKlQI4m1S1gohmVKMTVEbN3CsxHxmTUA5zcoEbgMd5kDRkZ3tGFQlempUYHNcDiL7EKB2hCENq6TuGtYwlw8QLhMNwNZsBCp8RnP42wrHL5hEkCvoAFMtLZdfshCiPGZXbBazI0G338f3AorhiuPKLqPDKWSZbgZSQ4OAnUVNQhiOor+79S+PzCEdR4J6FTXF+ihFHlqa5yxAjCJxc8uKMrxM981xc3KqDw4zxqDGkmGUqoMq4WDA0L94roxWWQXL6R2Ny7+McyrFE8TeQbyeoVRZlScFjGYZj1G4IHB6rcSxGvvv7x+xXg8MFyjCOVIHuseDqlwkQ4blQNnjbkX6lztIYC5WKzcGMrl5Fseioj4tF7nlHBwRYipAiPAoqXEshDiOmbop7ijOUwgebRiK1g/eGUI5eKlQQt3tLwdxi58/wwRlVwqLYDc1BdnFbZeFIs1NSQ2F/EbvBLbNyqIa4uMHGtIU1fMHQxMBAOoviWJeIaINvcrxGXNyg9FxE3xmvrEfkjfMLR9oV7bn/AOciLhklc3zcvgmkAIEqNjCaZlbsfxwJqDKCFsaIZMU/MLzj+p0ECoKVAAqXePQubol/oCUSh/hmAb0afVJhHU2vaD9sojUWEuE03L9b8k7Ur2lzcKccBhLgxDagKW4idkALMx1xgfV+oC6ePzJgRcRjwOJxjgMRhy9ktp4IwYwy3L5eHxAx6L4Jcvm7lS4Co0SozMuAhVE8RG1MYNpi3EuC5tHccp2SiWCy7ZXzFRiCj0W9QIxLfSDrgxiQt4G8E06blTMGHzA1b56frAaMY9aiU8HvdwgOj0RQOCLyRN198qklgJFhzfFehcHmHFQXVqpXKQlzm7+0IUxbeCFyoiBK+LVjglxzMaJYbg7IG3uZIRABdxLzaKy4w4PSlEPMEdRE84Xgx4qMMzdWr9uopjVJEs30mymOqniUTBCowiWemwqddTcc8UTJB03Aori4tQvJhHgjwasNIK2MTbL/AJGz6SCCzjsZbBlwietcbBMIkGOSX4lRFYPcNwkljLlmn3nnhAtJLQs92Zg36xzkrvqGW6xEaQGkpIN9cIYl9nBlqUZuApLdlO5PUFozL4cJDg4QcM6deHX0jXGLphCFr7QxBhDxM4YYYeT9RK8jzDSukoZ7JdQckYxjDcqpXFS4+nDPFxedOdcLUOdcVwwiJazAHvwEYjpFpxmL1yi6Yh8xLDMLkYY9Q5mgQTBDHCoR5IsfSAUkM9Y8MrWUupdLIliNriR5SA7hfWsx9/MYr/hYw5sr7saC4fH8QzG+d+VXDC8zZPhLFYTqVRRmPAori5qMslo8CbPCKy+Lhv4oBBDgDEx6LA93m+dwDuKsGGVGumI76lO8mBRg1yqEuXL4o4jt9V/JLkWnqB2hKVEpFMyniEYegl+gIwigTuAwntO3HvD7VyoG0Fr8XZjiuH01ElAN/E1mfBFipahAatkUruXGbhwNTcB7mZbxA+kAWYJVMPkmMmlgm2Do1Cgl7U+MTMuNvdRi1JvtmzL9YwLbXvMK08RldP5lCNlllgykEWRhpfP9QxLjwsUwY/bxCRVcbiwRXo3uo5bddxPMQrs0z3Jd+iuCUYMp1H22R1FkjncYRXBCHFR9X6mRBihFBVkndEuGL57jmPobhHjMviudy9HipUMxCVKjwnUqVxU1NyoFsSuPAWJwdyo4l0OWMBgxfSllMC86gK9EAu4wjwTB/wCdJlKoWSoi14iRixjLjNxhqIxvD5I2IDnE7uMFj8T/ANlxcQVLlx5yPULRV7wW13AI4Y8rLKxGGbioSV6GS+X4majg5qEqGiovRySpUZQqXDeCEHlBgnMS9MBqJFy+H0M9z5+YEaY8YiCmEIBLl8lRxAojxUrkYvJnev5QekiZA+0tYYGAiCVm4RIvkjwekJb59FqxLC3ct5meWKIXalgdy716QPMCFEyQuG7WTUqjk4mBUyzKBbAkCjEIQiQX7IBwzOHcVr54vi4oTLuIWNs1QhAsxgTADE9+Bl2xC6MkrQrwmeCVL4OBqN7EsqMouz+oGxb8whAgQlzP6n6gAhA+yiIeSDKR2QSclSljEquDKqHJLLrgzKjwo8XMwNTsVTs5lNR4Vty5fF8oNyhLlRmm4FxCCsVU3BsmS0v01KtqPBy8mOK4qVKlSpUBCiKIoxRyRjGMSJwSLVrp+CEqr+IES6c/DHBD4lz2hgaqzhPTUCEKSEjNYrxMuHgbnndr/wCTqplbLiplYaRHESEQ+nBo4xUXQw7ny8XzUs1NfuVXBwRrlAO1hoHO13BCUNcHqZcGrhiDmHovNR9oFS4w5eKHwivPN7X5f54IoySldbiF4Mbvp+muWEeMZ7wlcIjRdTso70DFLrxB9wJDEQLJUWohFfCeXCcNHUCh4gjNQDGj+ZcMwJUJVKjWbXC1Je1+YR5AZik8v2IUzzEpbCE3+KKgdSrGzwyozNZYndEoYhncukl3yQgQagW51GAOBDg4Nj8/qaiWUwjnn9yt442RViHRpMMeLC+5fIXHSXbJSAdRaIOIvIzKDUQ5YLI/BiCgnUeSMQJCxoZqXxfiJ7k1kWYzXHzEt18yihLg86lw8y4kI+qpcJWIy5cuXwJiXAraKvwwJs4eK4OFgv8AEyS3mPofMpXdlzxT0j/MqomGo/KELIsfQS4AWxntuPiDpBuBULi8hXxEN8GVSO2BWguXNMsjgkNDXNSo3mEEByYh3MAHbbyESVxXBu+h8RlQInF8VUuXfo3AKYNF/mVwV8T7DoceyGDMMtyuDirlVL4QSmE2HUJQWXotueXSYApwgGqCLphFvUJVxK5uXzSwlCWsS8MEWETBcUuIdaJLRcNARQpJWpC0jbcBdzAuGTEvhJtE0mU21jDdoYn/AO8nA3wAo7SB24ZjDN3z6FAtlmprb4/7xAIkEoSgYl8UrKWis16JeYHkgFlMFJKJcYcjwavTOmqtRvpBuLgi0RWXz+uKiH8kIFE6gY4lbIgEjliOEeMMsTElq0pDUGtXKGUMksYn0lXuULumYsMyvaLC3LKgy4tPLzuVy3S5i6JhGINxK4S4AlxBLmUah5yuCMqQxzqblQmInBEg1Fl+oYjpTKCMpnpxANwx4RBAA7wPljCd1EaoZRY6h40CWjV9iakWXNq2QaWeskH4+YJbzCimDUW4cEq4Apl4anvxLo0mMZapfFzcJKaeanZDnV/MIZJUuDHi4rWGiQJeJcvioRm5UbdSpqHOmV7TI4tCr4S8cXNzUuDHMqVx8o4zK8wKxzdKJkFiVLpswCHDhOBqLCMqHC1Aveqr6yq1y31NTcqVKl9E0TSPNXxqVCGbY7Z/ELfDZ4gjTLr8Mx4IcECF/DAOyE1J+R+jlQWy8GWCZ+vzLua4KmmBg6mozEKaPLAKO5f+5Hj4hHPE3C6JhdWOx/UB6mJCXyQi8GPzKMq8kTLIEmkQ19364ufnTN3TC2oLIlOI14xHNsFc03mJcYqDUzWCWVC4rq0qAER7gCxikUw28FB5lTc7gRht9pdF8VCJLOCVTWSYibMQZiNs05d0Ez0A6lVzZEXiEbZUQ0ZhEhzc3xfBzUqpcuXL4VMVczXzLGCCaNzbxgumMQJQTs0FPetXLxbKiDBGbkl9sVRm/fTWp+yVU3zJXpF5P2lNIdiFJwR4GXxUaiZ8R7cOSVwlwWuR4h5p48QS9kbToeFnsyXL4JXgNOL5OOrYNlsuoC7mDUD0LKQWhcDZiNlsTHdkvqVKlSokqXXAZY64S5VRAPb6E53LCFj5iuln44o1NegzLlEzqK9bIAY4JuVwTENio5KgUUc7jAaL/wB1BrUyWmCCOBNvk8QJi2fPxCNEYSq9AqK7eApTAIHnmpU1Lfb1GESYmIuU0IGwgWhwMu9DuJd84fTqDZZLlwHMy1Lv++Tg4GZWZleVGYdxL1Dym1wU/V+uTDuyW7mvmmfkh3DOI1SkUCbjxuVHhLlQR4CEDYQPqWaPyyviNsIypQ/zBuK9S4yrHuGCHBGYl6BVMQcRJHJNI6xKuZ8oxDOwiRJCQou32+Zkq/YJVrPEQ52SmWDDXlEly+SPNcjxUqVK4AO5deUexk4YwXMGmWO8pX3jZHIUfLKa998VEqABdalxF7NxRlXx/U8UeH7hqyLL5BoUZyso0mEpg3Mcd36TMcTBF4ntl8nFy4RWt7sr3Xv5giWQ6nEAyuMFhzqEsRqMQb9Bw6D3DPoH0PcNwXuJBmEKpfuAVNEpFMKt3E6zDkDDsLhVkqBKxwapqHQLqEScrFc2ioPKZEhNPCPiaZPZ2elaLmDvRCMaMLCxDNkGXzcEoaOK5qonDj3i/iJlpjCmfwgKRYTto+3JibhCbRI63FYJhDNsJ08yoRkfwj2bPEyCHCttS46h6dxxhWo8OC5YOHYxVsfnLHYI2WDCt4SoYjDteQ5dx3VkMJuJP3cEQF9P74JCFQpHM9ygzBGEr0pialCrzUN8AKZXwzIuVKEKayH8y3tQGXLly4y4smXAKjHUaYIMMttMRaPiKXZcw4yg16BljfhliRlSowlf+gJsIDdXi5RYU7NMHIxYxleQe8Uhsu/LCvdQAUcu7omuGncWsMRKlApglm2Cz1D7WGSbipT5INCblTF7YNlyoSuGE6CaTjY1Ut77+sog28VK5tC6WwJE2fpmXRvhpMGYRg3INRy60MSgtYiAqy40YiXCioBtKlenSBsSrCJdVKRDEuYCNnxBLOa8cVcoNvBly+BQG+JMMxajBDrFcJZCzOCYtgVuCo+DAbXNQWVPcSPFRcXGDGJ7vQnkQ1HBGVxfF01Db7+COSfJFtcOl4lshfo196gCOCVDkhmFmyZELM0dm/0QArAhKl/jqBq3lIEwpFECp9Sebn3lAR7nJNR3DJzXIdP9kwzHhH6wlypcqXBlwlCUzof2gGfu/XCO7TIe5K4ZiIKdnZwWEvio8XMklRKb508XxdjqVrYN+o+OcFjSC1CErmgHuYi5rjogIeLzUOHi4QhGmI8lkFz6SVzXBL9KgkthhqLaw2P6hBQS9/iphKnSf31GuD4Zf6/mB59hf9UGEteW4ojBDpawfSPFSBRLjwKUxKehH6is2EACizOlhqkGSYbIS4Rl3KoLPzAFkrhfEyxEqZh8xUvhr6jUtaaTzCLL4YjaDeZkfaINMtj3t1Oo+03Spmi6hCrohehPMynNcM0ogMBKizDfvBlAgdGJBaotS/Q5nulED0V5jk1Ey0gFq5Zwcal3KlQjGlwIYl7VE9ZgVxBGeXiCCyVxgeAodMuE1AbUItRGanZ5jAjKxKhGrphcIqMFg+Hm4MVcGZBp5lllBLWhP5f6hUGI6s6/j0kITKYRtoYzGqHOf99p7VDkCXGEWlwdt8Iu9Qh8ocN7BABRKvEp1h1FCEvhahNuKCjYOIGXBKnuhCEIoheDMQUz89QfLMvSwQBR5gxjM4OJdmALi5fBFlcMWBCPBH0YQ9SlTUPVlyxlcAUeSVxVM6l5XcsW6hV4wumpUThNPNXK5GXGW0ipZycXzfJLJZLJZPhLozGAtfGoIq00sFYHydxxA8zxEOH8QLpmDQx+pXhk0xSusH74UJ9k5YazFouVK9vCdpeyS5tLbR3rM/3EJZwnGKzPkoAY1Mtc1RgqkS0UFuoRi+H9zThEMk3K9L4EG+FInUW2RSYHyQvW/aSoiDzf46hZhC8R1FFVg/mE2385grq9yLS0/GvGYQKr0bn5MlTO8MYzGAyjVYP97S/FxtuUwKjC5UrmuNsuIO5hRhhuqVWpcHgIJFhxJkuZIQVQojNymjcV0CKS5UFlQbl31yqBu6Xi9SGg8oAASoMuLmoNl8EqVKYMGyKEVwgsJdDYy5pXAVmplYgwDg3AAoYh4l6MNfXrm+QhmGGYqIo7gBmURzOuWLaWufQ55GxLRuOuPczGFPIQQlehZVG+R3G7CBN5zKQwbiVsqK4QhDgjl7wDVAKgNHmAyonDGHvAFnFy5cvijcEuzUt1M8OI4QpvMrBuAA+5bviM0Ql8UxHm+Qi7sUsuBUxqXwxVDmahLicHNQDHpm/Vf/kB7sYaBkPzHCYtR9IpZCPT79x1RTxhg33RdQsFHwks70Vnk3LEuXoQDRw8aYj2meAbC4DopLADw1UWJ8xYMiISyPFcNZCAoEBNQ8mMNxpde4AoiCQVXHX9S7JBWhzyRlS5cLWVAtvFabIyNRjoFQsqR/ELKjfp9f8AncEoYatj/vMSFV/vEs2he5QWy602H+qBDotxyGE6S+BuXHm5Vx5oTFGIlLfRcvm5H3gUqYiEXzBFwn5hlwCKIC8EviqbjUjmAEBldUSiWxweYNtYD0w72lqraPBFlLdigWzICUczJomW4dTpjGMIGMnc9rwGbmt931hrUoSuDglW2RQZYoo1DQR4h6gYWqECiiESXN8HCr8YdhHtwTkbQSuEYLnFQkgL6lp8MEwv3ltjH/5EQhXCEZ+79SpmDDKXykPMuKMZUB3AUIN+kl1BK5tvEQ5E0yzP6QTfXCeiziAXbEMY4hGAXCJZiUbic1ZmLFc1CMODhLwzbZ/mLYV+JSUr+sQqx9GLJT+YPBC5uOGoSpUqVKimyoarxWYQfgQie/wO2Yg4gKmUBCNtJgTV1EhensgXwCsw6CVE4updJUnxxQIAIykZMO253Aw7qUaqdKuubmUNKYsuiANcrUuRbdzxcFqBKrUHbNx2dniAXqLiwxcKGdwIoL0meIrZem/EBUJFlDzfeveWBALfywDY9sykB8xwwvGpQwv3i4s9riAOjf7GJL4YdlTKS2Jd64vi4MfQQqG4uPmLoU+8sckIxBKZbpLJQuXWupQuMUFsufZLFaZW9+R9m+8JcuDGGdxAlgZoElYdr30Shrru5XMOamuBwlw82ZLeEuGpcw4haGcOWVwwlT7Q/mdTxyQigShAj2ROcyIxHEQgylgNxgZ08E2SLNy+O7NTIGoS+WyolT0lJdwgsVHynuFEAPExJjT8f8gzTwUODP3S5cIJ8kBHtAsu45VKjyqCdx5rN8X0SvPqWzYisuEeK4rvhJmV54OBS4HKwjL6hBcJxUqVEri+M/6mnEuQyQDAgdZg4WhUmoT5C6ZYWS5cuXw0uNtGWtXW/wC4uZVHx8BGna6PBKrBwS0XUGQQRROsnX1Zb3FO0jMOSpHMwIxS64SZrfNfbgWp4dJj8zbMupQiccxikl8gLWJc4wTYNdxRYtRGUS6S5fInM0VAEceE8jKvUTkbl/Q4JinUZseQ+kOhV6DbNvx94hHefevbqEaEJhlbYjBv8EcpY70P7Zcb6dTBRFly4xLlMmBox4qVxXBL4gEUJsCZ5Yhbp+YOAXCVCfpC7aPP/wAjFcvtDK4P44tDd47wRlm2n55Aq57oHNcYQy+CK24/LLh0dExZVK/7MxzJ1X9cwYCvf+4ILGMJY9kItlBElwZWpsNeJqF9x5HM4WL4JnbP4dED3CLPded8Wo8Bxk3KUxBlYTLPcEGizJFJVoyoZhFrCONUxARKuoHbAMuO9TIpmc+b4yJtZSGVqNwxEgDLCOGYbikVwbhYOGeYmISpekcUVwiz9nP5hLNQFo1HosQ5hRpj6t8LRcQEt0gVF9FctydMJXOWONcEY6mVkNFQfXZcI8LBgxY8gbIB1E7QgxudjUBd4ZkQiSoMW+d+v/E+X7T5ftPl+0+X7cGippcEpmFPXxmNzaPX9xJohtBbgWRiBGHSeWYRuHR6f+RWbjl5JdB7EshYAHtv7MedE2cGtEiTfFnT6wAo4Q5jKGbcP2lkNvcGn2IFSsTy6/iDeeACqjEOXXpRwlcoO5k0zEqoNauGQxPJmVozwAtJZQ0Q2+ygNphq9fSUaI4a2ZhW0uXesw7D7tf9mMSvGB99/mAY0sseuHla3CCig3fXLuBEgSpXFZguUs4gAol86gxzEJTNtFrXhPII+sGAiiOkvbKyuvaWU3qJBZdzA+GPtwEMsqdy9juA4woLmU/x9IVlb8REOoD7SJMkoI0e3X/Jn2JLHX7ShTUcBMGXeSKDsQBRTCXHmimICBXQaP3CAJXOSlDXDr2YEOP0ZmjZfgYJPEBA52pZqAlEzD8kOSAZqaBBZcW6ii2LlhPYlES6nWYVODtiJNzfKhh21MWvSLKckC2iQU1mZrSDWpbwFrvcNpKh9FGfulTU/KgTSEIYIlxW6fSu+RZGw4eAlQOHg9YeXheXJNehmxwS5fBGUypQzFZfoOSPHtZKkuUa+IRqeCBRHhQNjPbfYntvsT232J7b7HDaBHQupvNxA8EB3uUZFgTEXL9fWFBUBlixRjsGVylEC7lc9TPRFUxwI+XIIwNpYjohAZsT1K1QBjmrlnar+JpO4zLMvlvqHLKlQKm4OGiDMsQoxAhGYPWCVPBiGLHns+sOwjzcBWb92oqZZiv1MRlKkubkUPj+RMHBKlRUVFksgRgxZdRBuXaYi+CAGuCPF+ll82TqIq5lt86CyEY67VcFrb85jVl8VTKVifLOij3A8OYkaZHAQjaWEQLlATs5/wBSoQqUZMfr/kobJVQMsDGZSMBarYFmCoIRDmLtuErlbsrzHtbsifGTuXywSwnp5hC/Rx+7sYMyuOFcFcZborMuLVddymyRYdleYztgUVKhMjTzXFeJuVDMqVwD4suyQlGV6ipQHE8In4gRe427TGMsROuJnag1xdkufu4Z+VCEYW7h3wqJCMHhZqHflxfBGXw8IbQ4uNiUG5RaHiKw+h1Clv8A8KjLAlAjr/xWi4R2n8cIfVlB2PFcXL/8GZcohi7Df1gTZe+YItlRCYHtxb8sXqMIoY4Mhb9RhAWmBXJdEV2HoqJUqidQ0RlXEvZCPFyrjcV8kVlx5J7wlei+BjL9DQ8GFlUR3Kf1CYMZjiNHq2DzMFtkYLuNbIoAXTMMLQOA7gCAVc7Y1BPmAYG7zgVwc1K9dSnh1AX7yRUxiHWae0CyfmSyVnAlNkZMd+YAyrTFwgxVbVREK/lYYWM8sXODfweKgHBmfgCWCzy9/cJj/SZAhqJiDEOjhLJYZly4JKDewFSAGuCJxYyl2+Dv7wWFQFUTtFwm2ka6ncVQGBy8sEBp1MhjGKqd4Obz+iVeu5vggQQZRKjBfFrMIMcyqYmDuWRsiSvqWR1KwbhLKozDOyO5RN+FT84gXCMIUy1Y4lEIUHDKmS0WpdiwwV6wlQC2PHCZx4P5gfsgslBD7ov6hwmo97MoJGKEy1ESrgGJcxGAWvTcZlibhlwjDlJUJp1EG/ujwZfRhKzLI4BhzUfUFgBjMTGgw+0AWu4MMwhjgh65/p95VErNxmsZZTBBxxXNWHwMzsQmQZXDiWRcQLi64qVLCokwxgROLoaV+Y1ilXBfr/yGAE+sTArpWoNLlyuTipXBLEI1PaNG4jZo6WOZze/h3/cQHI69/pK2ieHf1hrEDLuUcM9SSzhldML2eAy7jnUHZlcVHGY4VgVqMvm4S+E9Akt8c6KlEh3X0gMbqNXaXCSHtKrN2/iDWLDhhcGWpD7HzLV2vUMEY5dz+3PIJWyS10o7ht6lEnl8TFuKs6gGiUO7v8S4q6h5QO+QLaQRiLTuaDQQzlEtixZEErGT0Q7/ADkz2YwS+Td7g1uYwhHy+8Q2XwpZWgSJFhHzfogVw8dxhlTwcjGmBfEWAyhJpRD0HGTUw5mLKigCzzAZ1GyCCqmGYrpIs/dxcH3uCVwYaVM1RRupcvi4bzMQExd3oIy4b4WMEyZ+WVpYPWEa17vx4+sSkYAqalyWMqHZhInYJUpt8zwnxABaOACmCXUOa4IilBlcnEyNhGNRHcQuOLiG2PUyz5YksJ11Fe/3iXx/9/8AyNgYYunFf+KiPUQzbTzc6ioqn+8S42ZaPDU84jXwajGMFwoMDIzqEYoLYrRkQIV73BBMcOZQNywYaLdw4GLG0Mbgxl1Es+p8QAE8RiaRmeGMrt+Hi+LIN8XLhnincQoMI3cLQGoQEXt6P7fab1L27hLlxeAq7iQOyJ9yESXmXkRA+1RBOPTYqN8wcS+a4ublcU6jbU90AMEbENQhnj3kkEG5DxHiOpF+VJHzpYQzK4Fvs8EoouMnDeU8/EGgwasoy3/MjpYYjbbqopWyXfUsyqwQvuVxUuxsigb4ORDLcYQhURlPAd/EfBUV8fEHC6PMS0wtQp9sRS2p5iu91fxL8nUYLgEDEXB5iEWB7+iuRZMzMYRhwtIsuBoIvyzSuAjjg4KZIqwBB6uupRKwxQzqFztHkS5+6EqovvEGotxjGDkbg75vioRUXE7yqnWtywU8kdYlPfF3FSpphfY7PlnRGjQWvlN5mAcspuOVc7jjxCRMn8QL4wFitek75uL5hzcY+oZhuH1YlFcaMECaHEZW+pWY4FVWKzUpWIxaMkcoXEpn7ZrWv5ZSr+dy4keevvBABT7wSxg2XGZesC1o1iVT2gKyS0DEAqeXeYVar5jj1KizcccKVXDGAPgZfBZNShRKzfCNRGltANqVwBO0Q5uEuMVXtKVG/nDv2Yo2xLlxLES7mClUAdE+I+wQDe8YgjHBuiYwyhxe2I3l7dTXb9JcGK6ZoY8xhNEAIm1cVK5daZnvBlCWTAVNid71JfFKQr4YAxgw4vki216cwYyBLzsJUNX3DoVfUXi4CorQ37QZ9ZX8Qly4jHd8XK9S3CxJr+XFoEC11kWUMtxh9IRt2+YMWXfouXRAqiZA/MuiDmibS+LOZhZ3MpvhZFGs83+I6nzL2aYEAgwcKKceAj6B7wdPSBww0qOoCzKlkZcvg4q5eDUKwxEvcasvUGo3uXqooGOZ+zi7n5BCuV3iM1h0t3DuOL7i3rrggG3Ge5mq4kiVmOE8CKlsPmVa8Zx+ITDarC8OLP8AaDz9YXzjDiazLzLub7js8YDwiaZQvUJkoii9RCWMAo4qXHbIvzsA52jJQQOoakQ8QrhbZKjACEJXljgC4jaY+M+FIVUVYd9S8ME84iclwFykpKSkEJrwx/YiwPwmxarh85azj7SmIWV7IThgh9eV4qIiopT8PmK9mOFQwjkiRCUxhtVO5Gzi7Ghf15CPoWWt6h0ckuBb2lZPoKROmBRVJ4h2fhEHZCWzz3EXhnglQqXJk+Y+nJoWBKHUVIReSEI0xKzxMhkUdRZqHkQRl89PYZxzcri67hWdyuRhyR5wirQzBCDifae9Wn+4HNQJFUQcy287gm08VK47rgQTJCvQ8JW40FwMnuUAHNcVK51SGlh1mpcqcG3hWdlg1KOC5crDuxuRBVt/CAYuoI7vMSiO0eb9FCbBBvlcyotamViJpKx9f/kSmBsv1DwHctMIqeX+Ypmwn5JQMA54H8v1wT8ogjwTNxjqUXjDycTc8CBHikWeCEtWoMBshC8hOpEddQSGiJbMBuxUKt4IzYpACiK9zNmiEEp5gUVKh+5MxZgBUSXU+OmY4Um/ENPZEpcxzlDqEZeIE7hlAYvF9m4Zs5Ig4ZV2gHXorjPCwPh9EL4Xue6nup7qe6iIGbShM7ROLJ6MArZ+4br3f3jUbMPhiYijUuKCPvcTFuJFwLYZeGHowBsipgqN/wAMInF8uswRBJeqIAx6Kh2ZcOycVKqEZqUHMstuL4IsoIBdd7PHv8RnceMywFyTIHEqOk1L6UUVW4AnCxeGM7gGZrb3EWxiXDczao8QBXC45jzMuOCFsLPzwoEoV6GErirzBmRrjyA8Rbxr0XFrMuPbk4s6g2cDUyhgyoKVAKlY4qXTUAqCMZcLS3M1sRvRLGdsqXfCBaWy/wDqXL4FcX/YmOcoEq54eIBhgClNeDFidubj6bILvAuuKlypZe7i6B1CVWSDfJwSolHRNpBSAS4alfyP3Rlz8o4JHiERgXbUJOAArfLRdzEHi7xHVRIA0aqU0+IWntLlSYACOZhr6u40WMO4Ka0iQiVCFIaOEcfHaixqtVmKYHphUzLFEyxlrn7+HuRl/TXvCXyCMqHgiQYGmA0jCMQcMBp/4INykpKSkDFFsZPpLZfEYYNYhakW+moV95X4gJefDEQ3crlFyg4uDB7FI76/7AAvJQwipZHi+blywOzMAEUksjzVkQu1C3L04RY4FLCai3xUwJYYEuPopE0/mWLRNQl49ogI9n+4LM6TcD7PJAuD54le/ssGjqKXcuBLqwGE1gnYmkVBANwo0wGVwlxaYsRoFQl2wSby+AwjCLLtRxUSZmamAAejUM7iXzfFQK4NaYlsw6memSuGEY8XN8VMVUAIzKgMzZ/vHvMMdReO4RN/xAYO4Q1CANqBkaZmYIcFl5uAoHUSCs5isWqv03B4OEGUNkOSI2jDiqhxfBLlCRYXUA5BQRUGOzj93BPyiKPCpUFwYgy0RG7XMCH0TruIdxExnb/UAU5ln/5SgSNTcUiW4R5TEDaO3joO6/mESV3DwUu/6hAVrjZwl4lqEl62iVaahgfUwBjzEvu+ZTCCg4oW8xogsoxx1Ll8pZUKrK4zwFkIbBlmjiA04WoWeTkzQiHu5qVFGKe8ffEMR0TcImYHuRy+LljgFrtlczfEYviGpAraLXGfb7wsfHg/cACiVwirgEJK4vkWz24UC8K6lUlMMRehEGVlbVyyXx3F6jqGcwjyMSkNQABDhJUqOYAGVgt5P4+0YDLUuCl39ZrqOKI7uNwo+2IA3H2j9KPhx/MJo3MqrfiIyx9pcoK94O3WZixFE/KwIVPJzUGNRL40XpIgjslwi743wcXEjGWMOE7OpYpb8QGn2ogKB3n/AG+Dh5uOEeEuGhGM3EEuoHrOLjbMqQtSBMoktyRazSQVQlfbH3IgJngCRZTCIyHFYxCNzKOqjoZ29DaVUTN+hjmDW+K5RGHpOBhAheREFDAEa5RYYNWDDn6v1zl8xDHJYEO0xlENdxL0MYEUyYC7gA4IhMntGBFpubQmErcVGcPywdC1xfiZTo3XmGCuKW1LjGkpnYBGBUC4mCAKrlCvDgLU8IeI4vvUKG486lzDe3oeLlTLdQBKDFENiG0YB0yybEkUZIEwj5T585jM70v/AMjHa4NkfRzb/u4RG3uZ88DKhMRqhTo3/ExhQ7br2h8aDgjXDApZuXZN8MqYIlULmLPtCboTIwS17QJleCNRh7XuJtLhcpZfuymTiIFufEGY7i5jymQmvRZwQBRK4GLBihljo6zn9CAR6/c3FXdZf1DQjU+eL/2oKFJc0wKWrhg5jphZOenz/wBg1tE74zHlZuG2iGMmWFbYyRgR4uEZUzxcq54Cy3Eu4XUOT0XKhbMAbzL1bqDeTjcmiIa7ODiuQjTUxGkUUWMxXmXM8XDh5ZVTc0Su5uM8IhgAUQtUVrX4gSlkSEBfBAWeYIlhVyGXUeV4fQ816FiUSyBKI8HDRvuEGbgdIKonc1QhaTUf8uKn5hDPJ2DqAGCbpC2goMX4gQRlRIYpjDMpnfCABEC1Hsg76E+h0gKqGCuKHKNwAUcgb0lIk8hMAVKlSoKP0cWXUiaBiNS0qGHm+KiBvJL5ri4wjEHcACiLbJ7EMR8SoYly5cuWsoR/LDmALEatQS9j/MkHFQRjwktVEaPjGbyR4Mxw5bDE1MeECW5mpSQRiJXlC66QFrqUrHFSuA04uEYG0g0zLYPBovBFtohiEX0rp+/2z2h38wqhsnLF7V+14lh0u/MxgIs0wu5j3iktlU8puHJ2ivKPhYKgJCyYy9kYIdErhZuCLJfoHqXLj6TDs3AxGAQPVfCPIRKUYgBcqM9cHsJgUntwS4M3NS5Xc7kdQgJQgVqARlcHDwTvl4SwIWYUw5BgmRqH2hXKuMWCECbJYQzEYKfzHi+H0XwcVO6i1BuUrMwOFy7g1CXFlQJQ5IF8otzHW5bEpWzEsn7uNQfehxlhDpjFjO5e8rofMCuGXxUsGl4sjJ3lgahqpitpPhhYOkwYYeWLQLrcqZGnUWeWd+A6iKU9NhAjwhNbA/MVtUHVEXAYNL5rjCQg6JUeKjL4I8VzUcJLly5cuXB1t+P6ig7eQT+IWLD4yP0mt5/lv9SgKOCcMYkZDsyS63xxU1LiR4QPcQRpr4mDvMSWBfu9QFO0S6RGzTbAGIDmGoy/QtQawYgwtfMB2gCASpirIlItte03ECh4JTAuVH0MHa/HvBCER5mDUCDIsevaGOg6gVBAbQN4gZ21CLe2Cl9kDEiCC5jHcQ6qJlY+yWLbhIGMYYR46n3Jc0xGmYiDbBND7zBdxzC2WFVFccnbMCwdJXqJjXVQ8EhA8dTDbv7mfavm4dOjfv5hrmuDio8fYEDL0EYS7jwR5oIMXUXdpAyB5IlyHUquG3g1DgduBepa9xISpUripUTglwZRl2Q1cEAwBIYxwHKpczknqDN+SC2Mbai5GgqEvNfyIz9kCM/OIRjlGIouViMFMRLRLQ98EeVxG24KIYxLyYFFHCVB3ASoSwHcRUR4gSq7PMWg0uZvuDAZZcUDMJcOCQFrr9sLC9/x9v7gBqUNQEpBLZyvxBBZCbiQy1KYTDH2TLqePLY3M+i+a/8AEYq2FFKQUTa9suulmitkp5l3GXLlxamG3m45ly48ZnulAUQahLwB7v8AkeZjxs+jDKHMEdTUBq7gpzgmijkedsMR9AxUaYSyZg34hpsyzDpdAp4iNKPh3EOx7ToD9f8AkoKT5b/gjkeDr+xKne3LgE2D+U1ob7nH2jPbDGAKJV3NKZCLitoE0ahY6Rk6Ip1DQlS6we8owVixMboZhLnXv2iXaUsKB+YkyX24gSwTUzqlgTTsShEIhmUIDkwztEdRlXEcJC/UFeajls3Kz7odnxFKbcPiFiB68wZKjfbwd/7coXripVcVGXw3dRdj2lDll8kea4I82bmlcCziC6eRasOKlWVPmDlAghqaS8pfAy7iTXBF4rlK0RAsY7MOZQGoVoZTggahUh2hmNFSpO38xQaJ4AgaWxohLnMbDvqFi2YfmYfdwz8whCFsdkG6gXMqT7Q4CowCVCzHqBiEXCAN8MS+Zjl/hFFq2BU7YxYjlhAqIIh5CbLuKLl5f1LJNu4lxQWxuozBXqUlnEdBcWvIdy3oqAdsQSMK1dOI2KJ70B3zMskyYfRfISpczzUqVKlT2X7RxBRKYXbMQV5H7jU7SJEXjEBQ1GMYC3b0vJENDAvjCnJoYRSH1v8AmUK1+YjsQg9uKlSuLqEqVyQXiNJh639SgdnqJYwxC/uUOry4Z/8AbiIYAQnhqqTX9cXZt6/uUS4++IQU5w4YKjVUKooxNU7ZS1MEaxG0YxIS9EJlZ8v1lzLfaIYx35mIRlyjGL4ebi8Z0ZMy2EBAjz4UMQHL8IOkBkfGdovu5WE0ZNIR0XwxF4uPC3ghghCjCGLJ3y8QRLOTMSal+pc4lmSLWNJY4YYxFUE6gOLhAMeYsaShcGDCaTtzU1MxlwjCMSKiF3K4VywwETBXEXxkKxB8QY6FgphlHNpAzagBbGHVlgEwsOSts/dB4/MOCMkFBE2IuyrjxIwK4lpuXKjTKQFhmETOxNtGpcV0T3ZlZ4v11B91lcG8IDnqtrjXDAlLMEJSDRLlAtiqQxK5qTMz8SuHTubfJl1DrVTSiIuo5g9cMqa4H07IazxcuXwMxlICfAU/HmeAuWNG4kWpsFs0IHayl8Y+h5vjTjEYARhLCGBxcGXGOAcDxUTkmct2uDNtFmpWdCHbz449hMAWcVFSgf7UQVWmPmVV/SHdW3/sS7PHI81KlUbfxCCySBqo3SGNy1fEAQKuILtQsS/jcvQfkVEGHzJnzgRLJcIhwy487hw4pZ2RS/D/AF81L7fHvDakGZj5IhDSs6gxwAs50amkv0XEuBUqM6jloMAFEACjgal3Hir5IkBVRwYl99zAjmVm4qIirAOaiPkIN0wihiZcNqMJcqGOVcHKTBBm4tcdJZjRphBKNMFrqWEKkz17iQBE3mVr2QoAS4E6EC/Q49/s5P3CIMT3xLMG4FIseF1Og3AhngnzKNCAqZ38y0s2R8AvfJOhqAwPRd5NwcsyxFkQcA68Tow/xAFETjG94bYxgdZJqLjeqgNaUY64uWoip/2lhUYouJaJUDZBd4mBBdMvl4upa8NmphuX4ly5cvhThsYBKYrLb0+PaAcZfaLLp92XRZuMQFoo4eGVCPovauL4eKCsC+Y5apUCVUeBZBiEuXF5IxH6EIQtxOBPq/D+mYVCmdSJbMPmDWM3BaLJFr1AVsdPsx0cjuCCzkly4tLZW4voiouWF9DUUdRFSiCg2wouo9WiqOB8/wAShNkMpU8P9xpC/lheC/ykKNY8X6kJ7JXTxQLYRLVTwh5IG26801L7K/iE0njoYlbsN1mLig87ghFLxABxSXlB8U38LqXZfA9kypX2fR1wYOLlSvQPNVCVyTcrkgBHPFW1AErlvUMeghARO4b4HKbcEZcuMCVKncIyplKm5VMJTzB4NG00WrCAED//AAiIRa1AC2LlLWKuiXvSZFGMmmUXSZ/dCVAh5CFlw4aNQtVgC2AF6SzuUcMrx6Lj7xNQNr8xqMMILvlm8Qo16pTm6gsT9Y4v3wAnmDYsfiaXyDfcUPeFAMxHZMdlG6OfEYhhSWEEeLyVY5gDUcRR1LfEoNkKMEAyZg2XxuVw9SucdyzSU8SniU8SnjgNtEYlRlQzUMUOobxBV8PCxZcuVHl4ri+KXRG0U8I8v6/uGmfr/uoyB9eoBaNSpcCK8eJgxAiKzFvk/qFtws7lxHcUFrB+4Ao6xAsZnSIzOA695kd/7RZTEZ3EtCSAAVXolRK8IgOiEG192UIwIC1p4gEeBruBdvxDA+kj1P5mqT4/7EWx/Ymxw2eSAUYYLTVrzMpvZAKyBe0tsMQZBGCzWR8QjhQTTwhlZ3KVBDe2fsjtivn/AJAOoHT0EeAvi7+EuOZ7ErQyZJXyPeFxLdv9My9LacJ7TFGCK4aa/qK0Y/eUAQsgQt+D+mYBvjUWoIRl8PKwl+g9AcDL4vjUWiW3XBwZ4DjIiDgahagUuL5GXxfqFy+L6gPDdXOrFysRi1AwqC3r4luO5hduoAB3DcqiDc8/zF+YS90Ehk7lgRTsC4i0MSqBFYs/mAJiVi1wde33lDqMxly48HFE80BVk1dITiGMyaPUq4IK0+sxy6m33AqMtt2SqYz2wQuv3IP2fBlm/B1pR/MVtZ7GoxtNTDlX6y2CE0L8wFivy3EuH1P0zt6TzEVanbRDPURl8EYTqYbggs9DqoBOF6IDuNTExMTEU0MCMWMsQZw+24sfiOeHllc3HMebZKXMm5pm2EUj6Sg1BNNfkf6lBgi0G/59ozQKTqacayGGFQmW0i6eUlhOpRoJXmKpsdsFL/1BHMFhQKl1FFbXt+4DTmsM6BbMb54BpwA3GfYubzPejiF98aiITUBuw6f1NfuEILGE7gcjPpLp2SoKncqX7qA0WR6qfGIOTU3z+ZaJ9juCKxK1AmxJfXcebi8WAj94fznUqVyi1pgwSVHcxlUywMpPFdwgt3NJUqFEBaQEslnjUrVMUt83xXBXXI8Y9N8krlYrStSjwJsbPswRauHAwLhiVLE4YoosTWduKmvVfGoemoSiQ28JbBMzHNRxXcxDLvzhUWYFTKHsgCxbDIsMND7caNDus+ZahlvP2lywuJo2Op0XFGVFqbiRjyIwLjjgBbEPuhFCXQ6jCHKEqOoGvNTcfEcQ7YAUSwz115hUGkD8S4TGi1oh4qXk6gU6+qaaPg5GXG+CwqWsqRVptiRTH1lfqeYBElSvRcvHSABGo2rfiPtmW8MuxGebYHywBiMOMTExC5UoGMEpOd79oUZP7YgoEeEKqMeHkquL4cQ2vHUcUD5i9z+DGbfSgBJX1/i5QLVfz/UA3K8u4QhuZA0xqNnfvE7q8GU6zLVnk0iehyqPOqGCcwyjMCU6i1OKOXU22HioTqUcJNUES4Zlc9hCOYVaQyEqHC95KJYh5ruKjtqWLoRDeYw0HqfNgEbq3coqRQWzIlH8yzobYveKeL5ajjTwMCmEX6DIAS1/MAAa5vlAUxLLWvjhmObTNeTs+06BnHBGo+b/ALD16yH+eYWU4lSvTcWi5es816SVKgR9DxVKofdZjdLwlW4SoM3wQTUE4JHChmal2ZhHk9BzXJibgJUApl61ZE+jggFiEulsKi1cDLuFhCGAbjJalcBbKiGM/qE5jeQy/JCy2D4hNJl8GKsxGk1LmGIsMwEINxLgVH4lIOTCWzmD8J5/DmHh5uIFsT2JUIJelxyRVrvhoWL3hR8RJBuBiKNkJVxK4pdS5uZI2ZlNHZECtoe8mUdS7pY+0uCRMQm1C5tFNkonuMpQm0NtiKtHuGDipXrC/wCplCVHKUffH8xM1viBqydrAihSdw+obOFgtjy8VGWQ2pbz0f72gef6P7/MCFXR7Yl/UBgEqVMVvcYipU1CA9yzFxbDs6j3/wBIg6QXDLZDM8IQ2Vlp1Ke7iDJmCNy6jmEMYuN9sqSiHpuPDKmEQ23Oos8ygHE36KonmJYHU0zMenkQwVHk3FbM+HEa7US1cMEzEqFEc6SZLSDVMTgx7q8QzdGUQCkzAv0X++Mqqm7bfaZLMABRAiVL9JAGTD8QTZGIOGChS+OLeoTLgmyJsPXzwl7iZc/aAY8VHgXyRPVcGDUW+K9GK8CVGRt0PQpMkYmOOswKWMk2ZlhlEHkCK3wEr01KlSoEmwhGiyMy58QLXYhdLOoSog4sFsOBnCI2xMfcC/J+pQYjpuBceyUCkgC7ENs+kDVMAW6ggsjITnF4lC4rgS4AthBioNak0iG4wYioPFRKYkdhgZvZmBaIUQbHiXG6xF0j0HeJQA0cBLqSXMgYMZQ9kKx2ynvlNkagVmVxiKv68rEUcJcL8ShuWHtKhqYeVXhuXpY8SlQqpXiXW4PFRpuUlJSUgjCjflwnZYh9NShmWr3DdM9Pn/sTxBeZe33GXwg3LvUsDXl8QSrf2lYKINy4cXBhrY3/AHAKS4BWUN4GPuwcQMnhBEmMFzxx4isiI0uIBhUOHjM1I1BJo9N+eNxeCWrEFC/HFXuUajLRMarlcXM99MVbp/nhOxNgbjpiXTmEGL9ovQGHExLLG4S6TMOFXhhZNHnUrIJdhLQwKxFa1buCirvcP6eEIYi8EeRZDu/Ku/mBHELo5T7v/IAFEObIdGDF46jOub9F+lJfoZhsfqXUcwMu3FbhjVkRth8QhCL5nDWJFmJdxQYQcxCZm934lU3cBuLRm5XFx4YJji+Ll5rg4P2CVZYbhhb2HEEWrigWxSnURBAKuiEnQ1GNPP6miFoLA8iEBGZickCrgn8wytIbdPhZ2T8mUCUzC/AjBVSu4sQY8zG2tmOsQS6KMCxWFKMqUjEslPEPEZUSWFslcPyyjcEqF9h/MIgp8RpUfaIuCPSwAHZjgDLd1ULN3HhLxAGCVLlxam6D+I0oB7Q7JcQVYuZIMCmJBccYQ3Z5v6a/cBi/bhSY4oNS7lxBlZWVlYplhouLZcZRGPEplmOC0195ZGyC8XF4XKIBXzv+pVqntcVUzFxrKh3711KmT/BL1fBHgj6FgKezzCA+WZdSFRN5gs/V3BXb6zUh9UPMjsKi4RiCViVCVGBcSuEvDDN1VKm0UO4B7l1DMQwYvNyzwJvmocgLZfPA4IZH/wAEuBfHQgUfEuVRJtHqjqJvuPbb5s2Hiahke8RDJglqE2xcyR8o6nzO4AWcBGXK4PtLV4McoHw/qUIYrAlXTENqiXH3uq7z/UCHQQ4Ca4SBUOMVNwjwEfQR4GLwEYtZieWVwBNxLE9QWgtghfUVwjgTZHZctURU+Uo04gdIcCDG4FQGkuEeDgjwcEDVmyEfDLhPokhXphlOY2NHhiReMGpQqNN8swWoRsyivCW5omTCWZqA2vrLUgeNzaL5agh0R9E4YvUqBkcJKMwKjCJAEBMqANkWYNQ94TXDEhMgbhiLP9xeANMdDqF2QXL5yUdy2ZqJhccWHFy7gZMswLgXar2I1kbPFZ/33nunFFEYKGF1z2ZXbX49puBIYEj9Qy4h6hJ8+oHtgRjFjFouWOjuOLCpdVhAyoYcwQPmMMJ1cCQHeYqHvn4MsAholDYephGdXAPtm/io8pCD4qZiVGHCqzCagQCl5olwYwYwlQ0cqJuZbBl8PK1GL6UeANw0gFFEZhUiN1MB5T3IHLU+DTFUStSknUNUZXgbPeGIiEtG1UzFZ4YvStEagK+FlzJZDOprnCZ2jzTYicKPkw/clBY/f+tTU1yP/gw8RmhFPXfzxbLcBzmXD1XUWOLS8PUSyocEuEQdwgxvqW7VkIEjdQCyoARRm2wbeC3E1wlii4wVlpL4JfAzxXofgiAtX8y4rfRf+Rqcuk1j6QdgwQLaZiY6iwyplR9p4YjaWo4EbxN/qHZUcEt79Rfeg54SMY+jcWi4FZ9FxUOEkQLIAR4OCXfNivD3dalBbKgTXFmEHFo1Qwa1imZ79Sgf9HA3CGZ7M8AgNEapuvEAx3BHBKjLnuyiG+FUxr6jSNGSNo9iFpe4z5ihB6QV3DkkqPgtH8wKjHi4QpjYsGIxdRQ1DY+D7v8Az1PpsWYs7uCjBQaSsTDgjFZM0MFaWLRCXCXLgwLXEATmoy6Zg3GVZEYpCTygoHeZm+Gkb46BRCiEIkqOYFZuhUn8ygmPI/zD+59/a+DHvHWh89MF4StVA6SJiRP4gi1mK0olK0y34zXDwSzMUr3BLGKuCAJcuBPZDEctcYNNTJCVxcvm5bGkqVFzEEs6IrlAr7y3qo7h1HimHBHhs5TzKBL1mJeohOTggXDG4jtDty8YwSeIUXcqVxcW4JuKXKaGAlinfcPRXN+jc0QmUOah1QIDCIbUy5qdnfM01cLGiCYWJ+7n84guMWMY+nlQcLWYa5uIJTAoJXJ6Gaj5vlZuvEtbWDZMzXOpUVl1DAZUatvyYCoYhL0Y0hiHqtQKt3MMB3pHdNkCAy4kWstoSvbBbUuBGiY4g3mdmEt8S7lxB6H0pJClBKlcMDJjb7IxhElQRRQmBaRZsv6so9X2jCVD8/HoqJwxQmUsezDfVb4qwfrHQBFvgjDX1RLr6QhTMG0s4cFzsnhZoN+ICYfb+5jRVDtp5gJZwWBliPrAGSBccMHhogLeGYQwlcEuXKhXRdRRo+IXmC6CmvriZQGJHxDPdUYMoB1FJbZMhYjhzMRFgjHBmEeBi8AL+T0jNzSGAIPCQlx9NAarx9O4DjX7hkMANswWojRG3UpuAFMU41FZcel3FCPFcVcqozUOdyuCEGXiO1GormWRuDWIZRYB1AMCxcofBhRpiZQZBh6TM94em5fNStYuCFuIIwIFWQtcwBYSpVgQYncg0O+D/Lk/eiqMYxjxqVNwyPCWVNxuWbuVHBcFzmBXpqVGbhKmBY+D3gMUxJuFV2bIR4OK88hBUsXMl3FVX6SzZCe3L0LylmZQ4yds7LlHc9rgjKlxY5idGYcykmGIFkDgJnGV16QABCozFbL3fpGMqOIsaFwovAgMAlVylaaSDPlyYixAWzMlvgzET6pv7QVlKmJgOsn7zKeKrqKrT8OOy+DhgIHkhjgTzIhQsB3MNjG12ytoYIHnyZfBsMVdEq7m4E+Yp1LvaNGMwTiXWWWwMr7zAuJXoPJKlwKBBIFwwjbDKtQ2jL2zyhdwBlI4yhdt6gQixp3Pwm+KlSzJjlAy5foC2+SPBGMIy4ZOjB+4sS1he5qm2CFy175+I5xKGmXcKLkbPQy6i8pL64y5OCHB2mIrqko4inMPZB94T3MIaNRg0qKybxFZTEEFnDCVycFJTJlpqU8sAa4IQmUqbCVAgu/Lhfy5/OOWMZd8Lol8A5HiPAQUo8VSmWlTMlRKh6KhGZMASypuLXWYJgt3GHmEXNQWVNrpGzGEyEvGPnzKm/GPno7yxQElNyyFqlIplgO4EUohoubEdriD9wRl+rHOWG4gyvgysUAose9kEW8dz2fSqrCx8RtguX0SBQIx4eLWkwRZZyze7O5c9p+SajzEO3X08wFAP3hmW+xg/tgNEQSxE7QjkXYQgE++I1EIfzKVwjwtZY+DeJTGvtFe195h+PMLCygJSGuN0qHFxy1KDh4ri4q9/wDMQlKuVuBjxcuPG+L5CXFGG5XCCUy/UiXYNe//AGAHVIgLSBUly5uJxSMCqbhFCBXC0wDplTUbqHDBjwEuMuXcrjogm5oJrE8n96jeFvlyyhqDcP8A6hj1LEuXeoBg3A4KalRtX1BhHghcJs9QlwhKhDkzhSFGIsT1/uIyVZawdiKwAn5lYdMdkZYlMQK67iBZGHqR0gwl8nBBi/ZKkKITTjze/wCoHH5xCbgiRIzJjTuVwcHghpi7jZGC8kGmXFhL5Z13E7x7gVHjMukl8mW45VAD1VwS1DRKpz9fTtSN1NZ1L84S3rZB8MB8fmK7GGCNEd1bDEiTHt/mDd2wVs3LtdT2J8J8J8IZ0E0i8iRlxY8YhnuYx4dQzGEaraJZvP1lAxCnDFjlctYfQS8Ar3jFj5JU5xLwMA6jVo3A6MzO570/MAB2e/fxEABNKlWR78IESPHsjANsdFQfQMecoqbc1Mo0/wDGrxC7ELuLHhmDLPd5MtzcW+AgOk9yAlRcQLPQl2qg68oF3hczEO4HwqALjDdwIyuWXxUqEQ6o7Houhns9ASKsC1hKuJUIkM66hNxxEvmWNMMGsMc+hF1CkHk4EEqyD4haiUgXKKEoUpeUuY0mYZTJFlDBBZK8wWBAGIIlnqq2deglcXRiZuwxCs7u4GARBvxAsiuOJ+7hn5hO6mosYs8gwVzcuPAxzKoCeqnQhV/cwZzKDf5IMhv3LDff4ljd0qsIbNmWDGHAXyLiNcYcLzXF8kuuszIvh4qVEHc1MLcWRhpt1OnrEeAg99wKItFI2jkG4fpHwp7Ke2lMbjKZkRzKixjyx4cZ4uKA7YPZmICx5YuiF24Cd1EiWUzM0uvmMOzww+tT+I6T/eIjlSyp0B7f+zD2IdOEcVYRvgJ+EqLUoLeeL1rzBRXNy4egIhR7IIYJ5YsBdTyqlGHPDAjcwLjCMrdE3G6lrL9AxZKERVQZcBoSnWJ1SyucI4YkJUCJCq4qCcxUNJ7cD6zhaOcK/MeKlEqXNrmCrSOMSw7IdmCdRgcA0VBSnDLSClehsbgHkI5jLXTKdwbgzKU1iCioKIbGMhVm5oiGd96U4DXki1nPsmYHRVlzST4uHar9xshsNQBSzEdTfocFw9FhuIYuDcURFsDggdxBDASrKFT9nDPyjhG2Mr7gqXDHmwlcVHha3FHm460dRHJQ8J6GLSZg3K4rv0kuXKlVCMV2MF43j0DFlzAI0JZWvAG0oxChAGUuND94AGXdaJcNnmHdx889+e/DUEDSKVXJYxSvPDGMZcYg7hNKsENK4qIIItwQAo4SQE5EFbgMYT7BFYWJyb+kuBZNCW0IfmAfiMRmAAWcIO4LrOyMVdPvEJ0mIV2adMwKW+4eeCOv/IIpxXouPunh3BqIQabnk4XkwzQsTsxF1L8ykG42wwNuD59LvgdpWhshdhUDYY31uWppwmYnc236CPFSuMxxy5KYnDY4XuK36Ioo6YfYZgtQh1AJcXAxbIka4GEu9QFxIqahKs2gOoBKuFXyRRsrhrHaVKGEB0zPdQa2Jeo1wgxRRKRqwosmUBhBvgDZmewkNQ4UcEot1CEGXDgjfEfylNcD6EKQO4JVxSritGriSXG1EqMfTruXKrXARLw8pCMyM6yV6R3SyqEBZM4CsEqGeH03xUXHLkpiu6DXF8BzgyjjUEsbZSVK3cJHIAxFNslu4wQj44+OezAokXwu47IxgvMVEFdpUYvDHhxuIdxUNSxZz2crKzmVw6giao4IibPXuzywblp4QNFjK4gymrQbL4uGURfx/eALMJR6XZ+40AuXbc/ERSyYYhXT6iPCUjLl8PoqEZV7j05JhlIDSONwTogOmVXDwlwdHkiESpcS4AipQJdy1LyjDFTEBWSDdy9t81xfFy5UILhHiwq1EdyjqESdQDUAqI53E3SgxLuMvCCJZCXUBtDQY5DL5rm4wMcy+0Ublk4HIoY7QjKEzCyE3oiXW4VGEUbiK/QY4hqBTFW08kAggVCPBK4J1yECIFstEXo+YUVX7QCsJ3Rv9QDSvhYr9i5mpFixgxjbFxjNZUfQAxysmvUmsQ1SlKxF9da3VeIti7lTQKS4EripUr1eEPNMvUMh3D02qYFRVQjKlw3CV2yA1hPoQp4FyzMzMzLGZQlMNbdRO4xYi74uLw8VFrcI+EqbYotrzlKu++a9BW4sQLZfcQnsT38v6ilOIyXIxA1XRjyX44rgdWySioqXTsgaXnVtRDlvFtfMu5ZF2lDF0ZEsckOHkiTUsyuSVK4qVCPCXMFNxZtwRhxUxKGeb9FQXQQ4GEQuI3CshhlO4em5XFxzA5BrMIptUy72yoJUqAaZmBpJe4UlNHhBlirkzkCsQOoA01DOT0LLgy4gKibSWxi6hFfK7IgqBKlQUBqZS6a4wQrBZHcG4Dqs/eKFMLV6PeGbXfmDvo8ww5hXJycHFQmsCU3p7XF/EGDghKh/lxcTBkTMt7W/yJlK5arY8JHUvuHLxcaRWZ4COJlomEV2qYFQb9QWQAsbDKV5U35lsUwlyuH1oSqSC4XPAUMrYc0uoRBVW4Y5vggxZcWG9D3T5T5T58DErGY4ixjKjw8VLiVsL30ECsR1zTxoWAuXzUqKC2KFPrGsUM11MRI5Xt0Q1g4RYY5LfooxEOYGvPxDUWJiiAFEtEwR3b4f3KlXB17+Ig4RKO0DdsB1Mjww50lk3HHNw5YRlcXKlTWJcv0J7k1HfNTUeAtlcBNcLEMHFJnrklRlwLmoMY4xyMNKiIqDKuXZNx0tTAHgXEYRCu1MMr4gHTHa4uOZTcpYqsxBbqWnhKshY8hlVw0pcWXKZVx5RZtUwK0qB0MCpo5qCVkQhiXyJnuiCMMVy4cHCe5b1FbMeWK6JgAQhHU/Zwz8ogUMOHggfukwZQyXGWlrtjjhISoytAwKK4GBcyl2S6lx9QuICNZGFyaIAamDcOSMI+phlUq8aiTRcLgITXruEWULYqUahD0KYIRiRjF5v0eEoMEqJMjTxixiFu+/mdwCLw9CVAUlEZfRFslrlgHRwCL4G+X2ltZHiXqMP4lbBP59mE6QTfv8RXle7qb2e3X2/uAKJfFzQZd6/fMRqwMt3Gxep3cuXLlhliFDcD0yluEzjVsKoGHBwvoYcsC4lcEeOw3DMOGXGaeh4cvovkly74ubmoJti2cMzLvUatQ/j7R3ApimTAumLcQKhFmOoHZ9p0pMM6Spa6IHNDhjvEqmIruB3AlBKO4G9QBiDDMOCqDwdpfCorGZDFwTqV5hjDEDctjFW24cEqTDVmPdtP4g6lntAVG+pZNIQomISoEwFsQeH5hMHOoQGRggxn7uKn5hMkpUfBwQMvUbNZMT3MxM3yS5UaEedc4IYKOUXUunMOGLUvio0MxLPUXUTEuBHgj4cM83miCwTE7iRpgQzLi83y5ixmDfp2TI2eI+TfAy5cuLxMyC1TGJMJWIx4eLgih1AjLnlLvUzBGG0wD3grRRlexcVtQHf1RJV0e8sSUPuxV7uZ7bh1Rs6uDZfHYblDgrLwgG5SBXlEZ17hpBGGJXqeHhh9qvh/uCMlPji+uS+5cvijBmSq44muCEDhChox1xfJxXBiXH06p5lS+XxxfoX0alc98anUAWcBNsSwRWEc8XfKXFc1TQLlQMFixyShCNSqycMYQi8oC2IDgzBG8cKhCHFTtwRsDfcuBgA4SyZNyjwcVCRYcIroY8zFdxdrBt/qGt14Mfo2U/PpY+4imWfrK+qB3HOgfmGNLEO87IkOss1TAqEIw5gJU/KgUcMTdTBdy7e5S3eYn72JWMwbdECvUeouXmdyrcBhh5j2UzOzKEb6YPMyKhNcnCZuOqJe0xXpMtyhDMupdz2QbODMeKLcIHDkhUVH2hb6K5Vs42k4QT3piDBmYDPorlQJhmNR4LG3UbCKnUt2Rau4wmrGI7pcSNkgMICj2ly+4dfaXh2nFXmWq06D9xG27+WOtL+YCyjK1R8YmYgOvMGLXkVS5cYRUXAWVMulhU7lC8S8aTGpEu31BXYTUMti81K5E+8A3Vfsx5gdswF2gaL3H1aHcLfIgdMLv+kJLchNL+kCVw64uHFzPoJcS4PTxUSVoIZlcPFXFSubqbjjMF54FkHl9kxXEixFmkRQY+nDROMIfEAObl/wDiSpQEuwtwKhDEGHDLhmZlZSuMioKOB4qGGuaLUuWNaP55Q1dSmkIwP0hhAvmq/iGRh1nf/Zf+TLEqvBX9SwTK/OY4N1fHCApjrS5IA1CHBj/lBixfcJfbOgh8kwCAPU5hslDNmvRXCHZFqU1woZDgBTGoeMtin2gPb0A0i9cBDpBrbuABRyri2YsTcsMc1xeeNS+DLcaS+mDcCXDPoGP7yGp4lu0GXm4B5CWJ7EZd1cDzT04EBO4nuImJbXGXGXeuGMVIMtI4YmYXHRgbMzolVrLxDEGEFvNfWMIxLxO68RIuIwT0AXxcebpiNEZeZQ0RJFwEuTqWFY8S/wCszwnS7uU3KEZfJEE0RbCp6iwEca7goCXKlegAo5xLXgwjjgAHUQmLGFPNcHoG9eh4c81cTUV2qjphAOoxwWx4uLLhHlC1Bm4nCtUqMS3TcqLEHARsZfpqBeY8HDy8VK4SV6KzZNQG88EOAYJeo4UuEA2wpKlc5+PHvjFhWr7QYFABRwEBl3KVtkMZdwit9wAlnXl8w9oSoCILda+OCF7HEdDAhCWh/l+ocoBhg+GFPR4iVHEeSxAUB3cBtgmPNS+iGMcXwkCJEvgiXK4zK6l9UrEW6ShGPDwbqZYmpXCy9onFwlFxc1wxlzFiGiELlLG4l6ZVce0ckh4PdVQ1W5QU5hhe3OftAQKhjhhFx9WGtS4uMlp56jNW/SZdlE3GII9UtNpKrhODRBjMEdQDbKXyjCVzg24h2zxdcK9CEsqRgb9/YlKhMNJFKVAlh+Iy0pm/XAMIDqM3tY0fMHNRz6CMGG004hAqVDh5LX4BCCrbibTsYFgaigbwzNRjD3l3yE6hMOZSDeoupcvPBLsjllxBlikwxFsDCPoIyirl2al828KBGpFVaz7S+AVMsS4PFTUWGuHh9PcqtTLgnoOSEPQSKZLhUXzcuMdYhhE5sBoVNyzDpmoS4w6S638f8i7L5cvfUaIQ0hcDYn0/7FV4yykOQmX5lYJ4438QUhWlQxUJLITKdQjWjcWj+CDRDtGC7KSvvLBHcYvtvW5aBr5lOHMv0V6hgrmxa9G+A4eG13FMKErEMe8VB1AxzeE1mDmDcfEC44lyvT1GBrELbjBmbUzOEq98hwMQ6jFgdxOm2HghXGzUJFswCDBukC0m5XoIW7ihVXKUFTrEByTO4ixBAwqS4+jaxazTBPVFfQ7+D+5rHGpcecjA7nYSy5xfNiJRF/3/AMlAUQIxSKcXwBnlua42wC4PiGg4zuswEJ3wyub4oSXWT5l1PEVNkuXHipc1vipePCayr3ENruBlAowS6hyzDDAqCq4OwUQjDEMQFx3mNxMQDtEyXKli+JozMn0S5dseji+K4uWUNsFl1CMSSyW8IMANTFMOeLDkjFwi/RXoTmoMX0nBwEK9IMjPlATG49VcDxfgtlC3PRVlTszD6bIEQYmzMAqoYwnlYR7O2eSobKyafDLjuP8AmJiM9qHBNS1295cRgkvAbslCpLdt9dEDN3QT253/AL2gAFPkwwHWP8y9tp5qJXqGXlcJUSVB4eNZhkl3gDuYTvw8MVy6zNIkMEc8XGBzfIRLJZeY7cQN5J1wS4oGXcrNoLhLJgQTiUFwFYl5qVUuXzaESMSNvtigzyQSmFjaVLlugtn5k2ftEdMPcAljiZn6OWEZuahW13KeJQAxZ6DOYKZw3AABN8WdwKDM7PE0JfpHHw8O5ZBiXbxjzDBKHcWQXYvB5IB7xOL9CUSZgYgVUSoPmLKx3mPC45KiupLgtuBLuIxuOIXwFblZvgFQCoI1jHuYItTzL2MEXcAtDUs/Ey9jFQJVZhaCV5NQNDzxVyqhGI/CJPeNLQQY3AEvhUXNGsRyZlORJQ4A3EJ9HIc3K4v01NQORlw4IXLcjqbOWUr8k1rDOpQc3wl6i4zCytyzrTL0KBzUHK00/qXYGNa4qnRuAPWA0FQ1tLSGA7Br/MCvlNHGPvMXQf2Y6yL1D/LggF5CMtB0S7gLJBYSgPxUZS5LlREpNkriuHUCjmoy5fJxUcywGjR0QixY8ENlNUZfJKl1H0LUu4kGpQ5gDXFQlyu5Yu5ltTaZ+ZapMQS1wRln4jdQwLh1PNm5UqVKgYYjxSVtA2jHjuAcRTYvy/uD2XBRbcBICY+r38x3qNB+2DHh4uDFSZo4HM7rkBbHe3xPcTvgjEiyJeb4HR1KrXF9xE1OnyQRZcvg+kxGOTvp5vipqDC9rPLkgGJkxKgRgo4IGtoBb7iOQphj6wp7vBKZY9pdM+p4q4krEapwncoEdxQwgagxCrBL26wB9suZvEuKi5aTUuEYT5jLi5esxLcToYbL47jbDCJ93t4iDY2ZArhGmcCUA2sA7PpBks+YNsv8T4XxAFkSpfoGPJyMrh4IQYcGYFXcOOkduAEVZaIdthKaxDXNSokgjLBZCNVwBG3v2gu6XUVdS83t95RwQk3a32iUX9os7vtmagPL/REp793+odQiBaCGkgyKVs2EFwy97fvwMqOsbfPUsD/57RdLiAjgn1neysRlEiG6az7MFouHvMMX0ntCLUIpBVLH2zADZ7pV/aZ3D/b5v01NQYsGOjr3Mi5gwmOFqDgI0XFCyuK5I4l+hQ3wsLEVCFxNOXncrg7eyWoPzFlunzGNgeodkIWeoEdZjKlsvkjK4VEjGnDCJVP+YOruX1r/ACpV9CCI5PQRNjqDZiGIFJ7ypUoztlnZEAF1wVYLAOUuMkcj7xlS8YYNixdEbzpcIwyJc4rIR4Ajs5v6GUAYBuKhxcpKgHNUOELdkCVKgSuHlMx1RKCocJiGoSnB2YgKxGGw6gO+9Q7ckC64uXL4FrIL4VRGMstEUcksW/SMt5I05GHBBjescxEqVw/+BxcNeghyqymUCoYYmUaGIXyyqJTtFFJBZOAjFi2zBBkFnEEYSFu4SOR/iN9TPqVrfiFGfB/sR2hb8/8AIrKk0+8GrL3cA0cEfCIwWu4FDtdQDyOj5lfcIo2x3936iXhgDXCWniXr9j+ZjTKMAZYogUX9rxf0gwFB1HqjSCFaIDyBher9pkzbrRD1IgFJPrsHSe/v4Z+MDv8A7wSvSwjNZm8zCY9PCaW08kULV9otLqMtrjkO2CipqZ5uWS5cuLLAonUQizNsxDm69JjAtOovpLY90zbjFPwdSyLly5cZBYxjR6bjrlOLixQ2CGKPQe3vFLup8pF9ou7gHEt7EPPZ6H1BsTZcY7cJBieY6lYJVcEBKZXjKUDUKgcyqe03NR2GYBLS4dw4GPAXK4Zzgw26XaSuCK1EVcIiOhl8k0LgraBNnG4oBqCyJUJcoUwBvYlW4cEvhOVhuwJVPJ44uClRNh6h5Q0Cv5/8gAo4dhLOKjyhdji7YoFsL+MCsHI8V6SbZuKKELHrfWQI8EsNwinkwlWL8xPdxCoxK9DmYhDagCYiBaz4SUBRxfCAuJZlgVNA8NGoJv6hoWyzxAqECCpDXGgmDbJ1GnUAaj3lB+0V/NwCm/ux4TZmvPUARh95cOVt/qEw8kddE7Adf9m1F9Gj+4MQuDbz7yutMtu2UjAufwO2HMNQXXoZxhNJslmbv6nsweK4qBHgjoglQjAlcOWL9Ixarxpltq1hhuGnxxfGoJctk7icMXNRXtlTtAU5QwhCBKhEhHhRohbcGB1K4Qsvn2yvQbipm957096e9PeimRg8xIwY+yMYvA02jCFs2kogRGOoFT+Hx/cFyUi3yzXpdRrlLK93XAFKMPtDINEXglRRtgDjb9wUAQxEC2MnbxZQIopIN8rx0QZJR/i6jB6QqOGEIS+WNJTMWdMvVceSWhuCyOGo893wVQYCpcOCMr0AIy4TvkmTrDG8lwi0EqVwAK+qmtgCyCskKPwgGkqJwFPNRIcDLjFSupXJxc3wvoOb4CFGy+CZQ4ZZITnlL4rgjwKwhGDDBw8Z6jYNQBRGRuOyYMGvJBcFfWR/qGrHxGWv2gCjihLx4EFFHBKsJG9w6YHMAMEJ1P2friryJ+YQlFb6yxax4/qVPJ8dymIPt/cRWn0htSCVqIlmg/n+Y8KmJS+82o0jHc95gHnYxqrJvwQASx1LHa7yX9oWex5eLAth6t8yXwZUqe6ISxiJfUCUGF/mDF3EqKyPWwNEZIXhQKgVwLSWFAehIYhmVLq3qDW4Qshzszzn0cUdz2p7E9iexMppEiRFPbjonXGKRYjqu5YmRipqYga2DqOZlFqMjZ8P/fQ87McICprwOpaNjMuYA3LyVf3gievRWb4IzGJnZIzE4D8wIcgJCsuXLixUZjMQxZtmqlcw2hZ3HrtnH/JknxBv01BNMbAMQRiDfFQUQjKuVMhwS5cuXwE7Ytat7lrMyooQLrEKxV75GrD/ACCXCXfGPQeaKhuK2E7l8rQjxqbjwcgaYUb+t9QehQaH8zMIcBe+DqADcHTi7JcOGVIFAuamWjKCYuGBcsMx0SBj3+fZPBCsPRvVpmXBp1Cg4NwwL1CHAkVCPgagk1lywhKn7pUtU9Md/McMjNMDbEe9MU6gjjc8rB/JEjwSpokAZfTqZDCiG/x7HiGhpIOsM/DUpr+334Vrgg8ZQhgDft5hPBH0MK2ZbJPgSMIqKyAbfLxAIW+ZfBseGJcrnZFTTzfDAhwg4MTwoDA4vHFLuBEly5cuXwIxwJdxhgtgIt3CiLWARzKJSPEGjpgUBwE7BqvpM98ryZYnWY6XiI0QmWiAzFxIpk4CJL4eFxAL7wBZBVwjLjzYPBXGcoxlTkgNY69yI7oIhHiDwG4wjCVcv6WMHecDFjglQYgJN69OpmzolclrnUQ5LPuM02IPkYR9G2IIuCMZcIqzGJjhHUDEeRi5dln/AIHJs5F7QJbv2IjtPswKxfZht0/ZgsAyoeIcVxuBF99gmYMshKNwEOA9RFH4ZWomkrkRbBXo/mXuIhplto+CZVH8TO1CaCPTS8xMFhYu5kUZlH2Uv+ZdWjjA7goCXBzcvB6HzxgViHC6xHf3cIFMFEeSMjRw8O0QIkbYUL/MK0RqVEgsYXyCZU5Nx4CdRm5QD9YaCD7ZQzQXtX3laZiHVwef+/MHVUeP7mOynxLoxGUsQWoHfh4VBrEMvrQKUTc1FrcNCZZea9AcjCSty8kOCMcwS4cd+kYxmfSOCXmEUnY7jE74ymBONjxEXTMJUqpkK8/xLjxXAQpWPZEPMJ0w7tIAa1LN0S8XFi9TxWJpLiWQoVLajslzcqb5QYIhDRa5tiEs3HxyEIQ6NGR89wDZCDwc3Lh7y3CAuSdQGVLi44NXCEYcCt8b1K9TBq7h6gqVE8RF7gVCClEMErleGOSoAoSpUq5UqVK4uLRcwTnXFBKO0dkDGuIyjbglMt7E66Yh9Bf1BlwhEMI6puEJVynaJFGoUGIrxFSWOWavYl5bEJBI81/zo8ERN7X4hiKi5/DPVcE9yzC5u/GYaLV5amqV6Q18xg0QhLhL41FLjxjFSoc4eaCOoz9nKr5CCaQYYq5cw3WgEaI+Fe8rrVUS17YQga3+YILOBjDwinujj+ExDsz5Yc5nPdY/uIQHMH0D3FAXDTjADeSaltfUKCAJ74Izcc154OLhzc3NTcPRlg+hyuLiA0XwS4Yl+IaaIUX7gUVwR5vhOyFVceJXO/Epzcsb64YxjsYtZZa0+CGOlDhm8NXD8iR41FqDNiW95QlBmVu7TzAIMYwwsVKNQdINqlnliViVLqBCmCSyOWXkuKdxhLhRHhhApufMQDWYY4hdWEsLI+UaiwBZAkLDOX9wCGIMH1kAKYBYZdMUMks3Ll8HpXREkywxH0VxvlCs6lQjNsr0MZUKwgxi+kS4RhFgy5fLqAdJfSX7gmGJ7JnuY4MQdzJMPmD8h935g1tkol1L3R1LhwTUHGYtFkb4nzeOVGIPZ7lXEaZmwxBKk+0bCs+0LqO/7lVgwN1AFszRGiUJ4IKQLjwgmkL+IekRUDQwx7HweICfDDhxoIFM96PBAOoT3S4wydCY0q/GM7OYB7iwKmkheDUUkGMFvUSV2tyiAyq3fw7/ALjCCeRTJ9IQCEeK4Fi8BAlxTtCVqm46TxEtEWWRIqXTtUBpZmXNkJHV6f7gBcQO6gp7Jj0LJn1CJ/4XzknWpQOBKWYQi01KhiOSYEhUXuBRXoIhWWe1PantT2IYQIy8gxl64WMYsSmkdlE8s/zEGZXDMCHw4X4zBZ/GVbJKVjcJtiwmIGSxDBKr1AmtpVrDgcFsUwkA3BrEo8RDLdQJDjhkxeZXFx5RVBFDZNkzGnvKOiYIiWYLhNjLEpgb9I5NiLG4lKyEI9FS+SAt8VBuEePf0DJCt6FSoclUEHZiXwxQXBNsuPDDfDTi5cYRLlMqKL/wIy4qhz2fxAolwrJLiDuAwJUeM5BGOp4isqnjctUh7yyKzghCVMm4ap1EJ/X6wIENvQRBj4wx86eOK43Klq2OIlgDUQWx+5lrilJYkWcYq9QhuVCUsZhQaxL+lqG2cRPvT1/2AeohCEEYCB5/UCKz92WlJASYU/mKy0JnLTRMO3r6x3ODPvMyPeYrgF1lWOjXxFgIXgX/AHLsl3wHcg20EsUox4P+8wftfR9pqud+ZnTXRC8VNrj6Ttr7JkQlm4g0jgGoqszcUHaBURA7wfpCGIKw9RtO3oCoQ1EW+X1kygsrMO0Xj/faPaGIICINxLLDOIBiUKrbRBw1YKjNdQzaDZZwSKYVoPV4mGvCeZ2EEyOWVGrwUp1jXaGIsvg1mmAzFPJAKWUaWV6cEq4cozECTPibBm5asIpZzGGU5eGdT3c1NyqzyZzK5xKNLcU2j4xAgsLMxTUMmHjeY2xqKmLGEVsN1wG4cPNcbiTZzBhDcqJw45dmUK4vg4uEeANQ4UC2OVfYSs+RN+h8ym4+ozEqaQ0L1BsH0V6Vdto+sYRjHp2cSjOEhLl80YIa4BPyfeFpeSIYliAykfMBdPn2hW8P4nUrKVxUCPApPCEabh04VAO4gLjAqOJkh1ACVXF3iWuKjSyrl+kViafeA0fcdEtQtdwQ4UxG0lguj4iwDCEUdT90qEKbsn8zctVK/TBhbgnVi3PGD6RltZslRzLjxGvCk1LOfv8AiXhvyd+08OTZxePP8RxPmRIFXb7QoNsr2xoKHS/ruH3qqpniKX3XzB8lAT6gx5gadxQ3DlWUvDqeOwxUMIdX9oKexiWNReu/foNjhUvh9QQXphcKtIFagshmSA0LIAtuVtqh/AlejCmASmXJgABXWOupgUPaXQl/3U7r9B/qf4f0T/D+if4f0T/D+iWlkJjHLGXCnUuyLGWQmXggMHoeGtMuvL/yVIaW6g9WgsGMwADLwdO4T2wmhmF2MygzB4MV67lRhmVDNGBGKkygOAgy45iAhiGYxUvaa7gi27gdbfiKhxMyfEqLJ0TMlRm4npHKFBkQw1CuHiwqK8O5RK0eiuGGZUZc3wGzbXtGoWXhqCFv7X5jRMk+QpUZSUvaX7ZWsS40sg36LqXccQUxMWXCM3wRJUbH2SrYCgteBgsKCHkgjqY5rkQKDfFZ4oSF0J07+7Aih/eIwj9Yfg+IV3MSDnL4uHFR1MqpUSpVw5SUN194Ku7PEEdcJAolcASqaDb9H7hQCWRFrqGI3WIbY7hnJEM+xC03L+P2frgm/hD+Yl+Mr+UTJUfsgfePp4fI/wB8FZUOyIFLGr/cWy+x/upaStdwmaDoI8Rfk/qVKhsNaha+9Qi3uE0zM+pgNISsMQCrEyEG4LqDtXqCXdEBTMoP/jiliWTsYR9FRnUOLsKBmTiBGUI2TfBYUQAojwFyoggYRi4N3umOzWJT+5V2ruKFSsrKysJaIlSqjGAiOopVxx1H5hJ2dQKlZuNIWlImEYaUEqqWKmSqlSbXmDYWNUuWU9u8SzR2So+UublVBUlRKx6CN9Szi5uGIMDBirEWPKLuYx4v0bmSYB0zrBhWqv3AAEgzCWbPpHdIsS+dypUedRLyosy5cIscNkRWEDTfoIy4OFiPMtfEU/J9pgWiW14TxfbHocQvD4jpumfmBAWDBkfmBiJnMc4lAo4At+IGnpuoZuBhR9rUVHaQMCBGUIHbB6ZURaM8AEKuXAawXMpiSMdcBxfIA9pdSxhwQgwYDuIDMNlzWGFL9IwSLlxgEFbjDeZ5PNyzDiuGdo/PRO+9/eOKbePb6yp5/wDfaAGocKWsN1M9SzFx2VmUYw9wQiv7v1Llzv7T4EunSS6DEi2ZZdM19okebfUtS2Bf1Mf1Cl5dGWUC4dNf6pkkt/HmFD1yRY5jkv8AiDcY+EfYw/1QBMDV0yh9yORCBC6EXQ/8rgAjLC2yIbVEASXxUri+BSnDd97ej/seqW4A1KicQH24kQCQaWeluYIlx4AtTCSBTWh/5DP1Xb8x8CwV1Pon0T6J9E9iGGYHhjElCO4NbWJKo+ZriFYqYyA0P5jAyhvH9zKhb5csIqFjIvaBKbfLB3l1BJRUS4lxoFIFchE5PZDJwRgy4NNQiDEzjoZvio87xLu5QXCai5e00+opjaEDaWFPIXNRYMYRmJTuggeKhOhApbw2y+fQ31KqXU+Y1lU2/EwDTr46jYYCG0N9ShdBGjUQtZMO67gaxj+UrhyhuJMQOXm5zCM0gzEWDeFawhvceTTd1NZ3NYIBbCmhDqlNoOtZNqPpiW1y7OfoxTQHctVfNi4NpH3gtjw+ZlKC4SPt/iJGxiSGUYRabgjBCEz4hxBO1yvQ8AGuXi7a5F8GPMo2uBdy+M2V/KWGQa/tgG1fkw7JXoyqYQIEA0zpNkrRvM1BFvwSsvalwOmYgyRrh7htFiWRm0S9RlVKktUZr3ieZ5OWLRmaAickTgBTGXh6AZPNw17EMB1MszUvhfdwmuA2SxzP4jYUUGaW/wB1N0T26loGzZxcvm5cqO7qOFQxBlxb4oVFFbE90zOZwKUzHG3ES22ZvugfYqOZXrXFvMeSzMeE2CHxDE8Jd8LmaLYHcwKIPBFmWHUqkoYLI6byokNBKiuHio8izEqcwRyckYMHEAyMSMv00IvQy7g7jCX3NxRXiHgam+TgN8azXDi6hlbhcQjMSXRbAaRaE0l5qZYrXlwfLiVJLKqGR1MzACvPcNLiAFEsl1AFCrlxn3S+BVvMuKTMXijLq+5ZAPAZtmVHEpczgBpCBdyhqUYVwp1AkMQDF3DhhlJPeK7P2hFv7Nk/JAzLYCAZXAhIqVsWVFEmVMwq4khTrLyEIWqvvDwwZx1EYXiAG7jqO0eSPpvkLaHdBwwWVTDuJGaZ5lb+IthwEduWOub41KHcBgq8oOq08n9TsqZQILnmAv8AUubZV66wP3PyiDxFBuNokiXBSRItc6li6GIWEY1DlYd8ClEI8HDxcWkPQVXmIFLtbADn0XM0DXB2ZcRtGGoS34Jsi5NwRnExxYbjJTTHweCBUSa5q4kKPZHuI5RCEqMuP7kUbsGJcBtLl8XLly5SESMSMYBKYFoYiFcblooUPMxzDx9EGEKXLgUuoDUE/nl7TcVkYDeBAqDGHF+g4ywcXL64aRWhda7f4/8ABcEoxE7CVFfcJ5E7PhCbgLxKlcGI8sCuHZUBvEaV242w4dQwRjYQa05j6fAyUVrLd5Zv7TBVOpUfNr8YhUE7IhoSMz0yle/FwA8JUcFw1oxX9kQUmItffYZha35gPIwADlgsGYAYlxVHt9lx4ZeEQ5I8BLCWKO5fp3uJWMYpWtvMz+IjBVrFqMhswAMl3DL15E2XjSQ4GFRpTX2gxpdQyIGY6L1AOFsUWJBtR9GeDh5qBKiGFkrTTeIKF7ftMgafM2DX8J/twBAwcEDi9TLLuz6EMolXuAtHlGBh/wAzB4fuidnLxmd5k/OIobBKcwoqW96Zf1PnzM+91yrD8/zFjl9NR5VI81BZ2gVXTK/8waE1Eu4NyrjLGeF4Vly4RBlauGZYQLXFG0uExxOVEAkfXfMxjKGIIgLLHUcFyhaAZGnCiAh0h94Lk0wAyPtP9Cf6E/0J/ocCLBFxeDHOoES4F2x75QcjT4lFsl6BaKT5S+QNykZ1+CVLAQ2QbLh0jTHC25SPk9N+mpfkhqYGnKxLKYV3JGseeNTfBw8JKDlhccrdy82TcBHAzzv0tWoN0MblytiRKUmua8QrCMu4Lg1sQuly+T5lleUGMUe8QLYMDns/X4mmYAUwuokugwvZM1wl6RQWx4NZtcOhiVaOxWDcyWEUD26fD4f1MHa/BCLyDAQyXwQDFa2pY8sw9iDef/AKqWWG8w6pALUqokMhhi3mEiF4xG5trhh3fcwxKXDCVEg5qalxgRl8PN5zHULUHhQH2dexF24fmLscy4sYc4gCiVCDxRV1Bba/Dk/uY1o2dfSN2Qr8QdZV2+/9fEY9yfnEENg4xjMox7tf0/8As3HhexP854NsuXNyw4lpcuO8ZSPA8Vo92PP5IoqShrgYw0POZUeLl8JZUw7YgHfTOzEIi/GPkZh6bYhC1OEyPHuQUwlzcYK4GyNBLipSVKzf/gHgkXhzwDggDRS5icqgGyJEAWi4S5alTzKgBMpfAlruNgTqIa4WFLGGyBVYVol+m5fiDfBwDuDxejcRdxM+g4vm5ipS33wMolWW5ua9DDhlxZuWGyMwKuKlkZVoy/TDbWWlV4/3MoICRkMuy5iVcayytsjQBqUBxmHsxuMBmOi6pR4tf1xgS4RlCIZ0kFnYahdZlwe4/Wko4Kg8oLBBbVQYdXxrjzeEVFsrmhwy4olxSgzGMM5htEAxFfBy+0VUYgDEJ8MIuMRMkqbGWaphrMC6ExUxKUMsh+M6IKl6mzgyXzcSF6jkxBrENMGPBHh6nb29H/YBj29+yGEt8Q4/PmVmB7wK3AhLhCe0IIQ8OyCmUur+kRb2Qvxx9mfnRRtZjHgzYERTGPzAehl1V3KiVK4VEecYYckXf0ECy38ylkNy4ORGGV9pdFsu+DiuAFMXbEdGggCWVpd5hqYEDLm5XNwhAgHYJ18wzvgWqZUlUcPASoFsqVKlcCoxjLjLiO4Ll07DE41kYCC4O1KPvEhFTPcDCMu4UEVXLgILJYYlx8M2X6lQKYegXB9GyZHgj6NS74qKG4m08HetknZ59A+hihubEkcJ+0YsXDtsQUd0UuVUIFJVnO8Qg0xDAUqogWy1neiGVV2fMsgGviGyUrMxMS+ClAsGBlRcZxgDNcJZUKSo/vTfZglDaszH4vRqKlL0eF9DLm4juU6JSM1UfaFasyruCPcGL7EWSdiBEiCxmNm7iSmZOYXK8+cHUBxuYGZsqU37SvRaQjqSpb3GEqVxcskZdQ5Utj7+ziImXzuDrK5OxBsvglcEITClpr5me7eWJUGTP8RilbK2Il1Dq9wlRixY8QmiTzFhf2loy9tS6GhWL8wi0fEpWONirxsufAxEB4IszDF1vzCgFIrLwSoS8e83v0EqPCgUWmmXLlf3hiCnBw81wmbi2hBnRDs+hJPeDBLly5fA94xIxjHhLjKBvhhm490XEAZMxLK2BxVhGVxVlQ1FQo0rxK9F+m+CMrkYqSVAjUd+jIUJfGJvTAhWoo8vmBBqLfCc3FqGUgOoO4ioQh0vzKxA4qJOpuVRAhNRMLEW1gg+g9vctUthlcN0WXtKCdSlFcp6bl1NSviNwKlSpUAgfPFXsZpzANvAE8RhL4FolE6vLCVCXHlDslS5uoBxtlTXFudiVLgXPiEq4QgXBjg8S8oMuPOoAmy6iybZUeTvQK1eCKC2DBES6alfXCS+VKkrLkeP6gGyEOBKqWXV5g/3DAC1Z4ZqMbjC6n4x95RvESWA/mUUOuDGPAlwxdGYWkZh3l5j+0TxTLe0+MzfapTypY1fCbNRzS4gS9yzqUYCOou8fKmObYMbbxMgeAlcLN8Jq/WC0HASpVS+MwYvNxc1EWIKI28Y1qYc03UbcEqaly5cuUgyuDGPDXD4jqA7LlCz0AQizZDhAKnQy+XDF3KxDSlx5I+o4SDcWuKWc1zcvhajRfJAUAjiERDYhmWKslCAd8nDwTb2lVbhYcq4JQZhGdxZuJAw4UmERaWq4utb8x22PrApsngYBtloa7vUAwTXhwQkppgioKU7hMenQKDvftErJCwi5XoqEQdhMgWVGEqMvgj6AjOiLxqOYWzzMOCEpu4TCC4Ymk2cOOdZieWJUvQhTrHUvhYhWnGTcPQYVxBzxDjqBfAavmALOCKpgXBXMfqNOxUYxnZM/qf/AGDTrA7iZWXElD3QbDDGMY8blwNPXX2jEjUWEZQ7inU1yBnqJMYZcUWObm5ZanceEC2I0Y/KAUJQYlQxLuVGXxn7iEJdS/Qx4WoXD3hxcVHdyhMR9hNyncusVAqEZUqVKgmmLFjGMY8OMRDqdCQ2eg5WVwlyr+EF8PFVnim7hmPFSpUrionBLl3KGYsXNRLdBZiDeYZlc7zHwwgV0R1GskkG8wsqmJ8NfHJHm8YlhbNzUUNwBRBqCoHN6SKZZZglRiFuh42eCEVxVHaKq6euopKvmbjNEHbl8ZgqFxGpqXy6ejb+jzLZy+8olFUQJcl9rvTwPDiedLD9SbmPapUuWxu4XDi48kfUWxIZOCELSq4KEGI7QicALZRLJcuOogGU4hGIe1woFsDaVGnKCHtMHGsMJ4IltgG6MxNx7yzDuEuX5l1j58wfJO3/AGoI6ImIHY8/qGT1Mgf7RkFN3mVcYAdLweHixaVlwSnmYBGRwSpqDMRJTxLj5EE0cwUcESEYrks/MJsxGdaSyVLhTxcEEDweHVwwuEuPBxeZdtRQ3MtSvPouXGBmqmHGyPZ2TEOyX6AlSpUqKJceGPDwkPc0jBRcG+MCDBL4qYexNAw2HFRMR5vgZuJDgjKlct7agyQZeRdCHWIiAdemZpbPXxLlDsjJxtrK4gC1wLD1v4hhoeWXz5qA2mMG4kXqWLmZZqHoqbTAm4tZgZnDiDKsItZZdNfn+oAIrFQGvuZgZhdBCJradzfIoCa/MBWeQ7YCGiVm5sELsDFp5TsQnAUYjf5TL2hTbEqZlJkUSrIhuF4MM7GD1xXFyuK9J4lRjNwa43CUSjrguGsdvQO01zQuKyKNmItDSO1h8kZQhnLwAtiyl4hkhEuJEQCBxVw6MWhZcjcOr8EwI6n7oFu6EIdRSDslR/NBW8e+n6x4LHheY4Lj+UAbmEphdXUqZl83zbXLENgUeuuWvJ0x8e6sjo1ce0wynN5OMofScIFsQ6lTXBxUZSDPcIV3GO4N/wAxshKDDimX8S/iX8S/jgIkYzuPDEhZFZCZMks5nxGosil9kA8MSymavjLK+oMuL6SJLm4y+SMqKrUv3KiGyBHjNhJpLXugL7IOoM0iuIqWwfMbMuXIrckuuh1Ka+moaL24uPKewQAQH0l61bKgSoyrWQ8iW9ENUTVwF2y0aiXtMm2LLWsShmVUqVjyxBNErhNIQgnGSQxCy54sRyIHWUGzcNS4mAeAT0VfPAlcbifFEO5iCKujAeGWEcwb5r/wS5cub4VQZgQhANegaztCXHPoxL2EOLqMb+EYwqIXZM8EszMFUeeoLWEKmVS1XTLzOPkwwyIMDhB3FZwIRkdaQ0EOElNm4AVjAbvJKaZWiyGycdfHiKtMDaKeYh1xgYLbjxZUrHglSuCOCWvM0YtsHQ/cyzXNc5QExz5gZbJTunziALV8WwSqglcfOIxLjZu8QbLOMgc8CqgEWpv0kYEYmfeJiEWmpcjUBgqKwZcrNxF3PpPpPpPpBFHgxM3GPCXuIS6UQpqXHjYl0DUjxUvR13F0QjwcEYQZXDAjjg4ZU1BW5fUuvKaA6mWGYTcwalnqVkCh8QVgixmAPnAFzBInjsNOFlgmx6KjDTUAxLOgxDEXg3FiuEBWOBjTuYMEreoRMFAgoj7Q5sMsVY0Qi8rxyxSlpFQ8KjzJeBjjugR4UmE3B+opUmuTwCxzAUdb+3NyhEYQaiM8StREHhB5BB+4l5IW9LLrlUlZcuNCWdxA3MlkDu57kUM6g5NJshGXy8LmHC4uaW74qVyg4YAKOQu7G50P9iHZk+8znXmYa79j96mWA924IoPclpbfLcqCoWvi4Qix2Pl+pcZ+YSrMx4NrUcJRqY64LQYrO7/UMPkckWicty619MI2rJUqOJdy6yzceuEcl2VjDQcLEJcvhxDBLiwPRuURx4gphUAQpRhFlpzJRly5Uw4Y53J+EzC2uiKO1LqJcELqX6LirqLuya2UlBMSiN1nAzOSPppCMSMYy8ZmDBGJKuJwxmWvqS8QUjXNeq+QlRhCOWVyS4YlQe5RnSECggNkbtHUNkjhnbNA3NNxCBTphDem7mTRGuWy71KhKhmu2LtDlxKm2NlDctdSl2wNyvRcZZQTEjOxLcCBUrhm8vqBrzAuIDBpiNOP5RzSH7XvCMJQf08LwwzE9rRO+v4gFlsSaqlIRiFEAVMwOiIaIrxG3FQrshnUsrdeiuO+XUbGYmcJhjVp1AnMDO1LwwHU1Bb4HDWO0JceHlO4EqE68aly/RcODLI+YSN0IxGeP8y0fnIXCh7xK2kLfvMwKbRkekV+IIRAo3BQPn9c6PkhKPwcCjAMqUwXpBuxf/DLAhUeKHcqTTibm+BcoGKijgO87+IAaH5+ZXaPc3xfCCUzwQbgVqUsfKV6xEsHf4mlR5v9VHJj43KnUfzNgUz9ZR7fZHrwPzL0FH3CEDkGafbUaCzUOtkmc59pgWvhuI0Mp1LXUFIX3wZ4qEuVK5DBjcqvEG5ufKfKfKfKLgxjGMqMvEXi+GLqNXMfUR2Xmo83zfFy4xaXBsvgZcYRcTEGyEu2NKgeZlXEYJAm8wxEZebuBgbZlcSe1jc9mxueCTcZsUkE4PMG03EZomQkBmlm+0dlXtFbDMqVKhLjwc4ZzKCFhKjHhcUMsXA4eLzfUQOhqWooiDZZycBMRcRrtiJafvCKFvBcsFIu1y39P7lu8n0g2K4spth6BAlKrsxHHR89/eZVf5IJYym0N3BhLlwnXG+KVLV6dyV6gjLtxACYiENYmpbCE2Q5MiDj2hE4IwlQcFmX0JiVxXBHk4KMgcOgiX4b+KYpddD8QQ5+3tK63wRn3t5IqgYTAxH8gPtwoXEYfu/UeDSe5FosgSjKls96dZGA7YxbJFamIAslei2UlR6cI6gbMAFETMN1KK9sSOFr+UxzcIkqtQlxZqVBdKIdwjs8zdC4uPubprzBkI7JgGA6vuKUh7agJoX8xAvlaIMKggCou6ICdotFpAxzwEqJKgzcSXwKVCzqnuT3J7k9zgEYxjGLEjK5YqLj3SA6qenDfwyx1ySuElhrl8XLlcVH/wAQ9eFYSWyV2qVXXEcRLQg9qCfaBa5lmopIN01qHU2biNOYFNTEAXRPICHskeTRA5EPqKmuCXwwI8EMwaEpVR2ZZTDVnnQYYK4qam413qUof9QJrpax8e8cj04lwmC8u3xCWkLemBY/tBKFcjLmY5xHUMwN1eIDf7MJM4/eG76jzAbGVKlc3MC2BfHQZqX7Two+Cjo0lm1hqQlzZU6islwgxhwcNIHDvxceSLRC3LA6QjZGC08y5fBwErk66U/iVvFp+WBfSAum/wAHR+4dQltTnuonqZb015uoJSh+0p38wblx1eJUH8v1wT8ojcaRLlytSgUQBayktqWTltGBa064uXGOymEJEdoA1zatENdcEMS4BpgFO5asalm8+UC/RcYg2J1wEQKAdO8StqUkZSlyf7MKmRQA6O/xBKYDR/c0NfsR/wDJgBsiZmoHvcPUKqyq/iEYxoQexTNS2XLlwjwcE16n+CMY8JKlcr4WOkw0JiXA0x2it9y1cNS+F4EdRYFyq4qXXBHk9BxXLquAJmAKEqGmLXdy8EbcJnEq0SFqoJxLjmC2u4QNbg4BYRyRAxm4hDFUoLl7kziuXGdS81xcuELUqVu9QFXjcqBa8wnOWLQIgZQ0q4xLg36DOYkK6jAA74ZamGioOHbZCS8ssJHKAx8D9OK5LalzcqpCAjX7k6CIJE6PuMLl+YUwQ63AmFzNSqXLIdWANzCwE1IOsqVHnohDfk4MwhwVRcDePDwROKVMxXBsxGHlDkIMZUJRhbx1evzL5fJ+glrLD/CBFMpcpYtu0pKG95H2hoMMxpxDTaYjTEP3R4/MIJMMdECiMSDAI3ILcVxKI5XNolSvoLAywWyDeeLi3LIwGjh4wECBtKFRD0YN5JUrnCyig7gAohGV2hG+unuUK8NzMKIW/wBBuHsIZdky5vZ/8hdAHnuAVMQ7Ne7+vMZwQvN4xBQ25X3iy5cYlwjXklU7MJ49N1LeDhAl/DL+GX8Mv4YODGMYy4sXuPLBYzRwIx2kAtcXHhte0u4Yl8YNdRLiIRqprO+axLe+AlS+Lm5XCSrhB9+CVzmS7PEvWKQTpfcPSVGG2ovjGUggqGiUM21M1sRQLZk7IXQuB1RNls95jO5gXuFdRFqIFhlqpwcw2VBuEhVwxplmYqoRAio5qBTU1NkzOuJ7EAi0KQRZwqzDJcC1rKBQwCo/xizUuMcRqI5GDWKB71ArBziVHtFZCXtW5YqLe7hbSkuA5moidGKGRipcpNQEvivEvNMq5UiQJUTYEMQ9+QhEcBiJlE4rl4M8tYXis36CXyQlKc59jUc0lsO5tuHGkt+6AaOLLHt/mJiKsZmf6xNLR+YBWmcaeoV+A/ZiYRZgXe5DI9onBgSI87G5URdkotjbER7hyvkeYPzgEM66ly1YiJmbAdpXNRaIEOAiXUqpV/MDwqtEO4wpViuCoQHmK2csy6xkvbfRM6u+YUjSRK3z5YAYIJmYS984H02/iWBaNVo+I7SETm+EEzB86XfvLhmVCVK4obgzEsYYmOVCKMeHjcSuXliS795ccwKVLDM8enbR+ZuHKWVMiuuA2l0KZeLYo6xE2VHw6fW4oFWIUlkFm4kGL6SkxysG+agod2xtavjcMv6Lh/MGzEOxlkubzEfRLncxLxhjfUL5xGsagG8E9jQxQzrDTErNsDzH1/u4qtb7Nf1LOCNRgyq28a1HaxImN5gDEGxVVMVkbC8wusyoUkYgyjxwkCJCh5xzo+sEOSVVn8EVeQX2gtUYlE3gI0MIDhkM2ZVxANHKNpU1LhAFsxZe5n5Iw7pUoLBsy2Un1mMIicJcVVNb46DETjEHcLLS+BZLiMQmyCJiJLVRRuG9xLz9pQG4ZgqAYKi4i2owizr0D3L4N0IEKeHTefk9eLhMOHEMDR1KYGDa6mW4c0t6JjzsfmC+5Y11BBPj7cfsiDhgh7eDT9JQK7ILWy8TZcYlT0c2AIdTbFPde/mVGJuVrCADlLwz308Qz7yoAhg4vjLPqMUwNH+UKIsTslRCUxYNmAoaYInc0nUyCvg9x2P94CH0vefrnMa1wCrnhXTxLfFTSoHCYsNw7S4MslkVaEGyAwJfAeoxjGMuLcZUYg3BKdwtTxc3BY+MHaDZM98tKIoFsDah94E0spftCi4RjbMDqKC2CJZL4fR1yRlxroX5gGyXwB/dhiRMpMxxXTxMI1XUBWJVYlSHCEJjZbDWZkTl6NxFu+0ril7sPAnwQ6Fs98M1xcv0M2xB3AAo4Qhc4QnmKuIoCruDpFlnXARhHgmo97+JTZHgxmM22Tep/iYHnBNEoxN9SyuJbJcuuN7LjG5ayPbqDjWy4amZJLmLFRjmVtA5SexE6lxQNS9ZMzuixGDAcDkNXtLFXc3wcUgcVu5gwihkjit/MeCMPTUbOKgM0SIlb+mpVsuYNro9vY6hVxB8wTRHBGeb0fPmDUNRIpl29LcvGJ+z9QOMvmlCsF3EBbBc0fmPiVyqKUJSljEGNsGY8XByNzOHZFaJpcJvY5JcuMJXDyFqoTKIKLZSMMkChgRG36wuhl/EJye5jNMZrKpACGoZgcJbwqqJUlSwgiYhmoaWJTtYFFejPoULjFlRYscyo8MuMuuybhb/ABHd+i+EN8XGS1UV23AJhhtDiBD3K6GMaYrIQFM8OsRaIDAVLlvouXDXDyxexpiymSeD/T+2Oc+ZfDNomBUDL3M7Yw63HQqW/aDxktATQ5lAz57jH1vFzwJVa9CxBEIslXADh1DHA1LuPAiXwO/LAoqMrhLlyhLEk1bCLWVnp5YDeT5l1N5h4QTAm4ygURnDaviA3WeKmoswbhRXhtUQKLuEptMGlgxYEw4Z4S4ITqCLMxGlUwxsiCUL2fMt6ZThxAFrhWZdR3XBppXL41L5cHpIcJAdhggvfOCUNSzpiHU0lECUsaSnMI7gt6jUeQ/M3CbICFKuckyy9/1xUw+QjmKFdMFj2oLJThJBuXiYpNwVE3KiWTFtwErgiFj6rLYD9mXE1rf2lVtX5EqXD036ajgPSkYWbMdjSUn0blNfcLCtfx8+JbjK2y9ZuWNJYUEYgmJplnbXUug4UMy34QELxdTvhBfF83CV6BZh5JTcsVcjcZXozeeUOGYMQ1HGSe56sotbmDgdSNkSwy8BUqEvhSoJ2ZkdvZKdnBGEqPF+lAislBqGeJY2NQiEuGcdnvO3H5mDYiNap5moK9BzfFcXy1MhquFr0XAySqKlcPoOFTiZ3lhTnxMudy5mXwtEYoIDwoutsxDC33liGIa+2XbUuVwmHgWCSEC9sKiNU/iLEsgYLLWald6gdowIgmpalKkIGGINEu5dCE6bQY7YnkwpNeg8IfWNPidGOfgQQZlpGGuTWOFAblBqZgPcQYLhbLqVa+oAx6VAlrabCCauBIg7gCNQ6HUTZGAplmugr3xFeuDf9QhDgqigEdr/ALqEYfvEvNQAQSETsXAS1GWZtfAHfiVwRIlwvTCMICqeQWMEMlLlGbliljp4H0HF8rUqbygguCFDpO+43i1UQWjbDT/wmOYly+So7ht2EI13CujWftEQeICLdG4Iv0+kC4hxGMqVK4uXLly5hBGYuJgYpgkjqXiXHhIyuH0a4rm5ccuUYFUYvGSxVwLAsrLAcQSoc675hkAe/DBq4KjxfoqJ7Sye9BvUy3MFEskAEIlkTKqUIYZhFGoZlc16b5qOOKuQTYxNSVNag+pUrkAqdwn8QLBmXw9bgolnDyLKYDRzqAzLJbFK2wtG2XkbUH+N/MMqUbsfxc8IuGFXPYgDRzUqXL4q+GXsY90/WHoJ3n+Ir5YA1zU1iJ3VOyshK+0eMza+Dkw9dEqCuPFHh3xUDlIOHEYQ8Mbb4ud+i1Mai7YgUxKJi42HUZSgmPMQW05+mocEsI1hEgSpPv8AqaixpRuye6ILjCuKobbgiWc7hT3I4uDLhElxdxQLihen54WQxLhBmI1iJ5RfSxIqyZQzyhgHfCgWx3DLIhr7pQVQ+T+oehH3/wCygXB1L2jo6P8AsAKhRtznlRCUXZCwi7cl4dQBRD0hgkWZhILrv0PFSpUrgSrUSNpRlgDXDwxm1ReCJLuPmGfQ8pYxyi7fDDeGPRSh3GMscQrDvUtcJSXAa8egJXJw4SvZO+pQbthQURmKhxUZiEVFwoVxcYcX6HgaiOKhT2Wx4bE1RYhAZglRxDXO+CfQIcLNxDODFy74McblijZEle8p3FvZDHp43AT8GXZVuFJduKfBVQgcvcxBahNJFG01RfFzdwfTLItyubhHKYAtgAKCC3IWtE+0Ww0Pv94YPQOMGZc0S+kfVyTdIPiDM0jtNcqfchMS4cblKjZAoqCaJfKXD0HaXS/mDMEQyHdwM4qsX+pS3lhguPmFpLEmUUxVy/3dPmOzrJ/EESzh1b5hHkApiVrEtIZRDbqWh0c1xcuMIkdmXGpfC+NxyDi+E7TqqKo+yUS5Lth5hRnsiaBahoMQJUfIX0xS+mGRNMDVmyEbISo8VeJ4QmcEXpAaRpuCela0S30SiCgYYVXh3EijZ6Lly5fAKoiVAO5VQWVLXbl4DPCnUTi483KlSuK4S4w3CiqUqusHmTTLwCgJ26m86jvgRqAE9OuTi4803bLlxZfpaFxzouJDvHJzUIcEC4kqJEKx1K9Hbg4/JwFNx8Iupcc8XygLZWXBOgfRuXWy+FomG5cBXqqLUFrR1OgLXx6Kvc2pHah6ZRlJE6yIBatBrUsUL95oQTPQlplqWuAwYGSKWE6XN8BCq4AZk8oKKZQWzWO0rhhusHwwKzBjHNxlmeCHBB5AK9R/Kz9+N0L36VLquEQP+pcRaA+8XOiuYdEC4oVQhYOrp+0QfECMM6SHC4xjD3hjEfSHbE9LEJZFRcLl9ASlahQzKkvioRlZuNJSYVGMGXGE2Ab/ALiC03pepjjTxLdk0DLuVzdEABwQ5ITl7VQSOwME3FrcHHtl9ily45gLcagcHtNA/WZNRB6QtwsLAjEmGpuAmYm6YRihKLbAV4R8onDx8oFS+blRlRDuA9RTKRZA3BoAUcwRuDQPZBY3cxgyog7iJ5SmhTMS4voyWlchE4uXL4I1RRyUQSUrmjEVMIlwbzDlhxcuMuIo7l83Ljxc1sLiSUSm8RHUdhQwwihlmBrqypZPImCYQ81y5glSh1L4IqJmcs4hquCPFSuL5qjzjh4JXCDFqAENvuWL3wJgkK7WPBD1dEEslkBUSuzDMbhEDXAJc7hMipiU8DshtCLFBbFPogHaQEhHg4cRalei+diiMsmpT7cbppoPi0/DEd+yHRuiXrxMYLJecGiUB2X+pXlqFGWV+pCMYvC8aS4PmUYGe4K6SrlcuYhsK1IegglXLhQPtDheUoiN9aBBH0IQ2Woqpudz2fiIR4YfiVwKdRyqi6/uQx/qGSYglTmaJKxEg90RgdoJ1HZmO6bdw8Uu+q4CMfJAFpioqgnSv+1LDYekAwz1EdxYyoMxFtGdx1M+xCLHhXaDfCXA1mNmptlgdPF8IvKRtKjKp5kIWyhPDAV2HUvJv4jCN+sEIhF+v9TTlg+2YuE56PQTCXCPFG2WNDMwJUMsqVxUuxqVwgQjwwjDyxHvgjDhhK4qPChCPKxW/UYhOaN8Vng4UNxUsEM8VKr06l8JiVUuYX6oS7L9Fy5cC0ypiZL3FzAqUqFu6l1UG0ZkqbwlytRpgLe/E+JfjNLiVMnIhDOGazNrYlW5i1ReAgdETA8RywY83GDg8MqVHlqsxmXafzCJcVAhvXBF1DqOW+8dSiWGGZgEZV1MDX/EQy8s/bkWvciHUYxjHnT4zFZEI2aguyXwQFExE1HiozqE2wjzcrKjFuzDhOK4su9IR6e7FS8Nmh3G7mS0OdVO9VeampMAsbgFEM208P8AcpdbHmOUXMVjUVuA6h9s27SDkcHNS5QxFVNolCLZ/tc/2uf7XP8Aa5bBmkUuKpc85aiciC6hRHh4cwHUcSw8FQzMnMAEongYjuribGPNRTc9iJ9ICAZgDLIEw8IZhKhc3y7lUkNeFDcVU2xMpIFSjkA5uMIxAUxMbO/pEYC7SUFEsCBBbvi45SVxfpqpdQORxUq8+i4qUwVEPiVwR4q+4Vawi6IHvh8zfD6CLyvJoi5QzSS/TcsFRaqDGIZmIJUCRDwii3TFKvrMObIjtV1ArU1Li7EdL4MQbgj0JrZpVuWI+ZtJuKMuWY9QYITUNGYR9I8dy5fA1h4DwM1DARxmJC41HbKOkmpbol3MsweiGHU3X/IWG/HcMptaPH/fMACibfV+pUqflEMrNwbs8GMeKgWxpGoKMQfeUlOoI64KzAFK9kt0iUDIe5AbUfEQGnzcWTjgMWXF8rUvtlTUGLCMat8HbDkqGkP7lweycHywbB1L95Mvj/kPUzFrRPDExggtS3QazHt/Y+f+xlFDuJcqWKhMA3CBNEVwcMOL4qXL4Dae1Pbntz24BPaJRWJhdnIrKI0WxGsofF8VzdRi425IAzAKTA5Jc3Hg4THZAMDEFqJBhUZnkz57gTDfzC+DUC++ATEA5YBGV6CPBw8HA1tR9lfw6gtI+03MFgHEsK/bPcCSs/Rl4d8pyvpqN36KGWNS/UUUTyYax620ijLTGdMOoCJSmpcDqJxXFcHLdYlf35Qy7hy8XWWJsQ8pVQjNS5UqVCaSM0xK5JQmZazC9SW1mFWDdiBV+YJmGQl2oJgaxbDUepQuJmB6fmXHDFBLe5drcu9tMrBSZH6o/qP1qNn3jcLW4kt4IgMxCtHRNv110P8AsA1wSrhIGCCtM3ALQw1Nvq/UuVPyCEwtmHUcR4cFbULSoQjEoD8pRusxUMTTPKDhisuoYl8J5BCFxYCwrr0KoF75fRieXoi42VoPEpT1HbjLzGf1ZUnnqVN7QxGLSp2NOvMFknszKlgfeZPE81mMEn9okivH9Q1lERMy3LcvNQzCLL4HqXL9ASvQISeYKPwz5aIGJpEPMuMzqELnSXFbYYxeGLFuXiOcSlXFl1EMMLEWuKhiblQJUoLgWBCBvEq5fC1bHtM9BuDqY89QkKiymh+YQuIEG4umHITUvkZUqLS5jWz7Zg1Uch/cAMHNcM1SfaXJx0/3OnJYY5Ti/HJN8XKMEYSosCqgyqEveItE36krECp1PKklRSmoKzeIYi3K4fW4lx4hqM3Bygozwy4WlCUwq6l+q5cuOiFMm4a9JCEAW46uWsV6lxKpc4WgxkDqKipcuKcE0yko3LMwADmIOa/j+IAcj3g4GL3/AJhdfjD9k78Pn/kfFts/TEcti6dP11A+eL6gTZ7eTgSozW4+4pOB/L9QKgwfcJUZl0M0rjRdx+m4buAlI2tUwRjUoZDMpgIxhw8oMM0DcELYRsiElDEVFtdzc1E5cwzwvoUFsYSyxDXIlRtAWYiyFfXEzlbCzUAVMKVLdaJ2YQbjcZTrGRIB7YzWS3E8f8wd5Vjjh4IiIbb4rm5cuXLihYjQHdJaeJcVCx1KkFZRBjZrMRoms4YzMbrEGmmIVCO4IXL4CJwcS4secwK418o0lQXkFsYlugYxyS1ywdIIIYpGVolKuDZcX0N9QuNuod13/EZnlite0qPoeMjhajDFYqmcL3CMqVwRhK4aAlcDKBs4q4sFKuBRXpGCEFw+IJ/DgQTUOLhHP/hnuOsPFQxFRPJKEv8A8blqobHUC4Fo+gYSoYipMNhZi1NJsgRxEuCjMZQZgnEoqN9ShxtM3T1GvOZQvK+WJHl8kO6j8xpofiJuEfvFOz8xctJ1KsHs2zN0UlTEa+YPJBhmZlvqbLbLxj936l8feiEZQLZZStZWjEWEy+sobVveJYHy2d8wGBlgJl5I8L1A3cQJ1L4SBXSzEfHTAPCLcVNFknekUMx+n8GAWW+BYjt8kfqDux/MCioPtFwgI5JwZZhGK4Ge2KUpe8bvbLguSMEoRGUD7qLFkdUEKk9VpZhzMwNwHyIvmWMMsojkziWY946SNtsmsCINOYlwfYn+gf1P9Q/qf6B/U/2D+p5UB1HMIUzJN+yFWRmSrwthKmVlR4QdzNdTCLKqVEKlIUZJjl4GLcMReRdQEwVEsqGcMAI7W0BSoRIR6eYGDL/V4YqKxRDQsjEv0gTEJUCGbgbKALYnOAWENZbl+muC7bKOyAeJd8yCJ09SvEL7mDk4SHZHgmUymXyjdkXO5eZnSUsktIssmYZXKjx8RFlc2QbcREwqGYlZlDqEvm5fOlwRlQ9FBYJF7JVCEWHoIQZVEQIGH0MQyVwdpcYTeIWRB3EGcZlrCVAFsM5ghJlJrDBcHN8EUnbwR6RWURC3sgDUoZGZpMy6FwhOlY1Dj9n6hGfmEI5gtRSi8tLis3KOprzG5ze39RdoT7QPI/EsKUeJchTGVxXIDmVK9DLJmdICdUwTEiVf75jYT4O30ilWmhvJ8SiVPAmOqiA72fPAC0qHKmDPdQHNiTagAhiDKJUTdwVtilpLD6iLTMvFO5YwMTJWBzHyK8X+ofthF0ZkGeGpZfkTzlx8EKIlblja7glHFekHUqARAYJFDiUdROBcqokY8XFyWmCRiUqDAsMyvQR5uCNBFBcJUHib3AcvAWdpSagsCpejL6HfG54Z84maBlLMfMS/RCMr94o9/T+pbqvbxDNKY+RfiKrEVR6l81AlSokTkDxIVtAruzYFQBTMpg95XZIryYgauOiF3EcCbqN28aFjUAND6v7gZHouHFVmdCCmUDU4UEqXwreOF9FC0IwI4jmU6lRVL9FcvM0RQN4gHJFIIuCj1GpATRXLAle8GNMF5mW4GAagjNsdYYbJWUY+q7djUDMeE0LZfBVsfEtRo9wDqXFl2gIrpx56geXPzNESoZthQD7viAS4ZUVCKC1ljTfxEp0v8Qlz9n6hGfmEIsWOoZBYnIMIbBACMPQqXBqDxUThzLliT3vL/wAmYCi/aNpt1CroYFSqJ26x5OV3u+tyiFD8nmXK0fzDQYef6lUlDgjL4qOsxG7RFqjGJ3BXZGqLgXaOsx9cjryf3ML0bGaJR7FH4v8AuFskuEqV6AlSpUUyMHYSwUx1wxjH3lx9aXiMFENnFTXDwcXAjNQaIa4viocXBMiEylsDf8cVcD3k0mQRfmiWsQdweWL3hlNPiLdo/X+phGPuosfMZexU6nBGHFwYvAbQfagCMagcEGl/hCQfRXDuEsUMz3Sg1xX94UwxAoXDxEMYeUC2DcG2OmzfIQxtWx4cRWSrDLZh3LLrmowbONRYtTyiGoX3HMMEvthH0XJiFt4mdcpAhq2g/cmIhrFKLQFqmMZWZXJCEKl8MjXcZxSlcduE5VWjipudSIBvKHxKf6koqogK1AdLU0sWH3oe42Mt5cwSsc3LAShKYp7Gnx7Sm7qMU29pvAPzNcEXsW8CVcH8v1Dj8whGMYrIvGpfCEqOl4xhK4uWQEPeHFzfKeZOzpnsVGVmTL1wntufNRU+2oKiqZRXw1o0kNeWGAig8HGKU/8AqawX0Y41LH62wKKmhcp5EU5HHyhgp1hS/tcBoZ89ka18zua2Vd21uv6huV1TNQGtjxfpPQK5GPDGMSXw4m4npKcF1n0EqPF8OpSoEqVze24gWzH/AHyhtxAA75CUrDJKJGsQihQNMRsB/PxE4JDZpm02blQQd9ypUripUsUnvCBM3MZkeHRia2yp0/KUFHDxqLyvhJUZWb5oXmrOAgwyRqibhghzU0m24tS72SgLcxOLhAOoNyozFy4myA73BMENZm2+erjsItSyyaxtR6jBFvxHeQghRzorHkJXBCamUJufERjlajtK4ZuBRXBFBqMupfFUYgLQmWblALjbH8ojLKnXZG6PtBi1DMrPAOJK61Vn2YUQlrGEKIcCMf8AKHH5hD2jGMCio+gq6mUt312xm2n26DQ/MocNfzBDcQ6Z2BPrAgSrM9pQEGC8S7l8tU8wqCTaw+TM6g8oFzj4fuUoy7w35l8UoVWJQW/EsJ3/ABLICP0gz3eql4EeXEwY8M6lr4+8AaZQ2xuPi00X5xhfcSitFQ9xGuR+SKyiHgSkGYIYGKlMaMKYE5qfKNVkYjja2ePci+/wwzyEr00hHMYxjGPFTJLuDg+ojyQjuXHhaQ4upcuEd1FolmRcxogsqNruODhjrDS+z/2DEIxASjDommCx+sJsY+n9wSXo8xRPUxkfaPV6cpWpdzb/AJUp6G0TAF1US6qeMxbRXuTNtpvxOogWqj7nsEyJguI29LmXyhycvprinzHaROEAaI6N/BxkslwcXCdwhxDMTglQjEuDpAUuFVEHTceolchHjlTmoJciB0IBQmLh8zPdxBuPiJkEnvyR4IQIK1MogFdxmjIzSaVS+Tm6lO30HBmmAmJUrM0qP3nw9x7ryfmAcs1B4vHuHI3n+Y5hAhCE6h/l+pUJ+UcGMsGIZsiwtiFiCgmAA0AP3AO5yrogEexnPTMNOY05fxLHW+YgMSwgiwK563UFGUCZWXF9Rd+WObsyzqBEIb386gJUjmQ2sBCY7/qAUEqW4E0LiONQLYILhckQNCANgua5S9Byfsl6R1XyS7pB8hDUIgNM8BWaHcvtH5lmAitu9q/P6mXVHTLtA66lFzAlQlSpXIhmMYxOGMZeYyq1Li8p6alc3yx84nkDZZwRT1WBEFjUqn0OLTWPk1GR7BlR6EQdxpMxllA/djtBX844riXhVV+p4liNqQBTLsO+BiljcWOKLgOqfEYsi+f5g4K3vM1KxzUtte9ah/aCYCx5P3Hdj1KiGnoJUTzwPDwpIhFrleg/2oHowIrItFQDUqXGEuMrm+KxKoh2Ii8RAqe6PAxYuYhWmrjRqCCgqDcBYlklqdsozHI9BDg4K4+DPcOtA2lc6ReA5InJKm8y6l3mVwP5xiJKl4MQxW3ZA6CEMxaXFYMOHU2+qXw7Z8/uEYQXSYks+JcMt6g2i02e6hpiY7vxLOH9PaOYGwRLAqH5i+WpcDSMCGiyGeLigtnUla1iVfhwBVsuBDftLnaRlpidR+YzhV4v/MSa/MAUKlco1iZluK0Zndz/ABwRiEXUrokQZU/EdZphepdtn+YYWD2xmMArHcFZolPbKgLrcMB3wdDK9Q6dVPPER7ncwhhDpoX+Ysrkhw83KwxGMYsWJLjGPNcVGPJy3DkjwglMyDn+EKslXuah6KRsjsxKUERgXHpK4InUEV1ZDsylYjHD46lwsxQ26j1MvtL2yvLKgQfEWGFQPDM4ye0tBPtDWgOonJHyvU8jLwDdRgnv/EtPvHVQBkOK4rjLHori4vorikGJkC18wi8XxgSwZI7l8kqDGEeLqbm6ZrYUlBriuaj2ImCUFbSzQqEaY5DzLUW0lMkFEq5Uvi4cDLqBCsvaSmNpRPjEyGXNw8O4CmcQA4uESHNy5cuovcSAYltWfjzEbKfeX4DMG9TAtjDxg8wMtSDoSunddfjggsqCiEEqp+z9SpWJ+ZLM0R8S8uPxuC2b9nB9twKl18SiIriCm3zAaMec3nMAe2VNQNkhILFRQfrEBhWef7h+GDcQ0QckvppKhuCdYi3sLXBELbwPuYBAxjMDmrlVCMrjAsitUGaNEQ5PS9RCEIQpgDbYzXyOoNZMfNEBUsdTDFy5sURTwmIqJmw8FDQwWpd5mW5PMxt/npgRPRRsmDgsYxix4eb5uPovmoNGN8XN8U4NwStQldjuAieio4j1I1S/DuMG4++N/aBWrhlFWoRO2n9ToqBYaDzLjIwiHcvCfCJLU8bYFkBQCphRFhsV8UHWLX4hwqCXGej5h+D4YYgCp8x9Jz2alDPGo0taP47jomItRX0zMWYezqAFmoQy1RLfwUUCppMn18QM9jzfpqXBizqDZfB3D3mOFmoLKamcC2XydypXBKmpd8ssuuHUDjEBu4rgxhzkpqOSGHzUBz+ICwi6GyGgwjLl8DCXWoHcIIVAqeo7lGIVDMCP3QDAayn8QUrKypUIkGLxfFegxqUIFBgGDliDqX9T7YjlY/uAQF/MGAFROpSIay695VcXKQilz936lwLE0arTHczbb0dENRFjGXHFXzWJaHcGKDUyZ5oiE6GGdivmAJUU0KfaB26fmGEIj0i9lgVriiPGSCnkQAfRcuXNy+CMNKO8QTQm0IOLx4m9lLVUSuBl0X6Q3oZhEh1CAbS9osA+LMLgHtL8m33KhgHL3MpcxbRTDEc7leBUoH2P44OoB1tPJR86e/l01dX3KEI2GxEMYxjGPDw8vDzfGuUO+KiQllogY4huYhpuK4d8BGPEL7uWbXBMZmDMbFRcNFb+sfCU9zIOMAbKY9opFwdNfXzMxr28SrOkMHFgWwos4JJA09xU5LubV8Vd8KAYiEVtX0gG0Bt3NTZIoMq0EA9fYsuV0zMxIZLg2FBs8/8AYJlHbv8A5CCn7sAKGIDSRcNmU7Hyf1Lgvp2fJwEeThhw4JUGM0MQOyMJ9mNYPtF2BgfOFTzyzHi5Yy4wY0l2MSoR05uIQy4SuLm+SMoTCneJCblCTJGVkHcRrKDFixN0xd5lzBBS0qEHF1Es9dcNItkIlzqUsSQS4WXCVHivRnharh56gCyCXDv4RCWYluOyUYI2SuFLYS+eh/EIoF6giSwWxouz8QINFv8AUJLpGht1try6hJcqf/IgH9Zpbvkx55a7ynn4id7FwXMg6qUwt1CDSbYR8CwWye9HchmdjwcM3KhEhYsbCJdcmidQKIR5uIqPor0qeWbwI5WldwGkYbhQUxMMQXZKOU7EZuPDbCXBQrXEFsI8l6+IB7j70An2+SkFikixYxjGMfS81F4Ii64IRg2mXfiGky0MOUuZTcnQKYkLmyZS6jr9xJdS4cA1TtcQLHilWtUpII5l1fKBbHE18SgURaLlw2E2DGU1wvzuUN78YPxn8zKWHyLCSWkwrDuiVItQQE6DMeGHovXzMNXzRrwF6gBVRiaQoQQuVyZ3e70fSLtg3K4QdzK/un78xb4dh595cZXFeg4FkvgIk+Zp37QAQW/4Qa+PfvCicXwobhBXaMUeWW+IrK0gnaWPKJ4CVXDCPDZqXcys8OY+IwucPyqME6SEG5U3L6FflEjdphA4ykD2DUqUcHRmIIzZgkME7m+CXH17xE6bI46e0Srey0kCnHk8QBaFYKOB5IUzBd/wi9mnzmvvGH6SBHPsIHoe6ISbYvGhfXxC4AMx/c1+sqg7grBGMYx9ERvGfmGidxPTuM07eFVDgFDc1RUui4MGMIwiZjfPcoFxL7nylbeY1VvL9SMkDyBcTlx74wy2xyVBPXNzNd+0X2veKve4S1KGAlcAe4RG2phy/iX5c+IN4xqvomXyJVJvftKAYBEQjLijOoNNRIx4Y8XF5ebjxYUQfn6UvcwBDFnAXKqMI8YWu4SdnpbNSxGolHo+0V8C8JUJpV9vvE1yqZBZgAojiDAe8DxwzAG4bjuBfxuNRebg8clI2SwDZ+YN/SHXzBqafaOqaVe4DnUu7eV/PFDhjbcS7AxBk/gwyrp8MN1hCDpap8vvNEW+08AIbv7wBa5eLU4hCHcacEuot8VFA8JjRct6Xx0xxxpEaZjj6xS7IJCGiOY4msHXoFLnKhHhUeOMCWpcdCw4eAqbMJXa28CEZ78MmtRVJUpZZmCuvEQrIoRUBCOJlBU18R8qy5juaRqFb/mEWPnZBbXJxXJKh4gwDMT3v5iT+RgAo4M8kcVnBdxBlDuA1BTEWioWFsNbPmewR9jLNT8whHgxY81pcu3iELHllCqWfeiVGHBVsFlRXwuBl8jLlzT0JDxyTMWRLhDbxUuVLqDws9+ZPyxazcIk1NxuiVBM9E6vv7feWpsjmEagW94MXBm2Z7eLUWlxhqVLdzUqMAsWlxeWJUOj2QEJGMeLj6qjwgWwu7evj01GNJTCoGWoBLl1F7lweQ2dw20NjcVLuaRgbS+mpVBVDng08ZdO3b8EpD4PWGB0mCPgUANm4RjBVMdEIgbVAIGOalcW19MuWMUMqUdRGBDzRCh0ysGY5KZmV0qfDE5Iw7aRBSs953K4gKWkMkYzqdoAXjsQYQdsUMZWT7z+EEhp9LQECxFDsYwj4c9Mbjov3gIKi8DThGeTA5KupckeL4RhDgUtkQSmGIxY4yxfD1AjFiaiZFS0kYYSwQZt1XUxhs2cFfDyMEwS0+SXh7v8Eql8sC6YZU5uXzcQLY3bEAsBh/8AURBVUTo3v5gbUauYsrhfBAjRArLvggQIEwWwRW01gM9fEXR3GsYgaAf7E/MODGJGPG4CLCHysFJLiGu2ZZ6P0iXsmQb4BVY5s4MXcu3Mm/aKbBmWqoI8LBMGuoRpwcVC3qBSyDKuIS7ZKmpcuPFX3j3jaQaIDa+srPqjUDtx42lSoQ2yqgRqnSko96JbuJZTDVIR5KPC1pFSK/GoMXJ8hEsx8ZgBdvszBpgzLuJiGS+Hi+MELRcdwwVBikZXhcZR3kQAmYELIZ5YBhTzfxM5UC4ELDYvvLID6NMVBSzFUurslfgErrDQPz8TR4n8v/IBl3HQzPUoWoJo4OGBcfhHJL5Gl9QDbUzhqGXv2RKWo56CkONji5U/yoefpDiciMYlwiJoZctaBVvcemoZ9/EBRQ0wZcvka+soSsf7EL8onRAB5mDsXQwQA1DijcuIILJo4rhlUsDqArmuCMOKhuiMbFkeCM2vi/Vkprv+oYgxmkVNzipcLaDkcRWTOBSwHaZDqeUKMsVCf2gpSVEKE+9Tv7PG4d0YJph2M0lEGeH0VCbgRb4VyO0oqdkGOUWQAohAgVCBiFds+bNcn7P1LgZmzUS6TZCPCxm8mityxl/aYNqdta/cYVXX4+kVo1QeZ4HpTwoKigQjJAAeYJZMQZRuF5dEOWkXsoPvKXUSiGczFFjC/tHYSnRKfMW6YkVAdOHcYNh1CJBqOZXp1CL4mSFStxKihEjZC/D7S0yb851/9i9MseFRxLk6VfvDUDhmduRBUWKPBMQhuMo6lS2NRJqhW4isbjpj7Oz4l+c+O4vJGkFsN80I7soZLSWDFuXAUESop2zAqDKmXwqLnxVo69pkPEzxnpsN89y4SgSGw5wiixPJGuyeXMpq/BNP/YnFy4wWmfE3E6UXdxpJe9wcsacMwmy4N3cBF1POG2Ku123EeEHSUCmWbrZ8PIxeGMfmf54Vqv37RT1dPiYQ1UHJvJiGWKbiL3RFpBaWtuNcOJdIxqoQocHFwEZs4rk5ublwnUcFUfRRFnoWPZBuBU7YaZhwTSUqBtVe+5jE/h95S6iOLlOmAJXUq9SrLg8a2I1CUh0xk/3mOtrwVKk5jd1Bu/uwryQzh4uVzhVzH7U6hCzg9ABaIBZHSNiIBsqHHuhwc3RcFZ8w4/d+uS2GmyJ5f8xhtqrhQv2ov+5cH9x3r8MEL2efe4tcRPGMVs7mcW/EFMcJLlxAJ6ZRiyYZwTuxKsVUPd3Uah25Gfi+Lb8PouKef+YJaXr4DUXglx43CPJthAsQlRJVeEbrcxHcQsSWSwMJcuJxhqU+YoajGbYLCInvlwTWoYbkhQ7xwwSmE7asiQECr7PxKJZGXFQC2/ptiKlg8SrLyygeYjQZQipUc47m3KmHNfMN4bSWdl2Cm13Clsr6RMa5IBlR42olrbM3BwqIKn2A+0KrY6eDPB3m2D5YNbK2z2pgWmGmcZ1Jhuz4YRrBlw1SDgZcgC5qLL8O8RV+KV5EUNXDK4w+vX7gQcDWIRJDjfDiUY9q/djgiDeP5Z7QwNLt/jMsA+JcUrMppMjlkdw4eYXXP5+IA0wcdPcKSyUzXor9yUpzUOHm+FYstdjmAdc1e5XA20yoMFsWFSzpwelS7vMQbnEEEKAQqZYh3BBYGc0uOMvwgI7QBwjEHBGq9IbS6iyrlRs3HOSCMr0IbNu8spLUqX0hFnKhuFtJQL6c/EQ2Jg4CsSuDjUDJ0Q4XKzL/AJfqFMZ+YStfe/1EREzPN2E86lVqPIj3xGE/AiA1PB/UtBPoZi7Bx8QcrhxN+CVff5htKviUDc6ZlsvKPHBHSBKhAfWPH0KDUXhhHkFqY4ZUqVKiV6Ll+hAUwvsilxeU7GSFqIsKGGOG6Idkw6hFxBvPpJiMRfaC75iw0UNcBsQjHh8Cp3CCGoACt4/cSkogHJ6UYwrzFTrP19BrggMYGjSmegRff4lLyx3UbJRVTLDHrMtZUSZGZmGagATgLEv0TTYOcQINuZxUQMK1X36aiTRIBWNRmJLKnnEe6HQbYs3DBO+o/QmVcfj7y4xAWy/nPXyRbNoRVpioq0Ui+Jdy6zF6rfMs6o94jN8h/Xj4iFQT6vtKJcaP4isOHjP8S2aGr7vuV+IE1Bz2MZ20SkXUGljudhL9mXKFxbhDQbJfoWvBqbf/ACV1bZSszFiFh2Nyt8KdxRTA6xIXFNI3+wh6rVMvku4QSzkPKjpDcpyylVi0xChUNRQSsDb/ABLJmHqWmlk9EBDsxV11AWGY3rKhzco57hbHDGEwRNiLJFctMAJtlLAEqIIjEW9pPtHJUWKm4YjCDKHcAIQjmO/u/UIseI8k1C6zPZDgx4I2mcYARKlQWhLR1K1qxdYuXH+sJ+00VfyhAsqfaGK3evY/uWa2S4O0EiFuaEKJZA0HDtSG/d9Tz3GGGmVDLALQcwDpcF0qVxqBcSuHhR1G2SKE650uNy9QHzgBMRLrE6VoHZJS3sgtkqKGeDHdk2/SGsxiiNbZom4nCxebuhw3Cxi8FUaVrLJY0MBFIhF1BAaPzHX2hggSqjKgRm4H1YywyheTAWEib1LgWbJRNcNjEr5Iv0+IoQX+J7YiQlB5dvxCSm5eUIvzXxBEsi1BHXBLjK46iI9NS0ERAwirmogq6xNzHzOhcstTGLS/mZD/AM/qMLh9u5VG1s7Pf+4cWIFuoZ0DbGYFkQ68ykOsUR4CsvdixZRdxiNC6YtgFRK2LlrLWvaIYhuA5YeUS2LEzCXCfC8r9f1wX5ItmD+XoC7+JXB/4aTEu3L54WO0iUEUjFTZMhYnaM+ghikQkYeTy7gHF9oXtPJiMAIbWd/S4Covq/qJMH7MCR/wzKGXD5Q1FE0NHwR+YYzMQbGD6RBVCO5UcN/Rn0JmyESLTFgGAzwqAgzelnv2O8wTUu4cDfAzAgRZT8uHMNF7koUvcOwRjGMNbRW1OEbQLzKLU7i6b6SzqsV1mN0+2d73vxcVTl9s5ghH+uJf7Z4IIXw35GyrO4jRgu4i0OP4m5Yh2BcIdwghK4eCMCM74cfPjfF8E8Eby0Ruksh1agaRIxZAhyT3lRKZjs5YvaIFPpwJVxvkxLGL4ZwxJ1Moif0Za6/Sojd2BIIx4qVGMBA5rhB3EhZEx0WfViTS+8oVZ+WO1Qhrgi8XDipVbYROEO4hYz8TCxiAMr4qJKlcMtBMT0dPPu/qBaJRVs7f1xk0imkcDwiiWQb9BCQbhLVKxYhq6XY7X7en3EGO17cXUmT4Y8Qh8R+ZnDfvlgbV9gqHIKuMPRjZj8RgDK3wrR7wiUK3Gr3gOEGhmZKhK8Iae3q+pqG0xj7P3hGOGWCleklRjKjIDUYU0wV5cKhUSiNB5PRUqUCGl7TACqnXoRNRPthQnGO0QkoF8bgdkJ/OdU7wfLFig1ncv3DyZnRT5xBkKGqj7Y5lA7qQxNZ24vl4UrcbPENaguEo2u5iexcAJRKIbB4CEaMxhteyEbJhw6xDJctWiHtAgwhBiful8AB7x1jW5UYyzggD0ZUXGEcRlzDsWQ0BHsDTDcECGwlyz0YqALOBiXR9pej4fMCjIPuP2S1Qu8W68Q2jDF7TPpv0I8XNyvSRJVxXsQTuKOuKSy4AwEeLlnBCJKl8gDLD9zDiVAym4C6fiXdaKAS5gtiGTlY8YFwki6j6Ri3AqE2wP/C8RYxLgxlFTFhVnMKaISVCMqXDVMRY38jKI0NQSWX3/UFl5FDAiobjfUX2hsuNi0IPXFxZQnOj3YuX9JZJN2gaisNVcqVK4pXOpWRsn06/DFK8vGvvH/LdV+5bIf6qAAMckWJZPtjlxzFdpZB13/cCrzLlvqVe4hthw08xn4p/vi6xshXEKFxcJXoFlSyEUMssMPn5+PaWGYBK4vlhVBA2Xj0DGIBYLniUzhawXMbvfwQgrB7RkfRL9/ZCy3czAiY4A7IVhCoKPbuHqwzsL6OoA6GdoE0htFOc8M+WFlO5Zp0hLQA3AZMShwwp9Hi6guQhGJdQpLl9HzK8cE3ghiEuEIRn7orablXbCCDsjLq/lGvSkwkY5jNcqMYy6lmm+4HbAgTLJe1jL4Z0jC+AypXBtQM1LVkZow6iSb91Y+8eXpEqVEOo+ISo8XwwgtwRhKlcMzCMW2TDOEL7lDuKEG9S+DhDLsO5U1Li8iiFomIEZXccTHEnvAUzeTExl4On6xeDrxuDWew4YLQb+YGGOIFxWKEJEuKm4hQI8XUsYg7gPSrghGJeIY4Iy4N8VWCCsWL3IBixUtiV9eCIhYG39EoRDK3cqPC1BVg8VKhiHliAWR9p3mX4JqBGQYKkq4r+yDj44uNC2AwOFgbOjF1KACNNDKBR6CPACoqOzkkXcOD2lCXuYf3Ampd8ABX5+ICtZH99/qGbK3uogVbCNprw/qEGs4X0XLjGmO/6lG5dQZcYwpWwhTZMRm69P0iXKpf4hkvjiEfrfMqVXoqMLBWWfEs0q/MFW0qjEfLV52QL+MX8J+4W1lx1nRAym0qBKqWS/F82I2leo1I33BG5URC1GDpEmlgllPUJqgeoCJFECVKuGPQcEIQJqEC0Z/UB9zCbnuQXBPZ/MohTw8DgIBahh+9N7n+WIf6g8QjC4CipXoAoS6znT+mXBw3GyvxExgfN/iAzWYipJkKjx19JajhlaGJizU0mty+CVKjmUGjjPBxfoCPPfHlKqEv0ZOyF6wL4lCASkmL2cPBFA/JKFVPiA8Pww6jH8feVsCClkw5up8ISpRIyxc3WKXcytQ18Qao9JPBf3my2Gi4a4eSPpvlswwgAUzJl+016GFV3LAaP5hGVXqLcZjykcR3GP2186YIqj3MkHtsgcGJZg5JZ2yGXL9SuvDE7pUdwwzo3uDD4ljbKaMI+hgxYOnoCC6lArzKGUwYODghsEq1eeMTO5cJRJff3eUcm3LeS4IzHXFPMQ0WpRvJeKjzUEVVmpemo4QekDiyWqNT4ZEez1LlxeEEpu5ZaNwc4BCpn3QhLm8QobHiIqFPiJXCUgi4tQlHAzLdyFo4uXcr0bKYt10v/AJEqsGuFqZiWLtvHxwRQLYcnBwQYcMSUIXUCpUdB7kUXKRbmBqMq444qRviBG2Gb5uMVng93z+oBxCYKYol36EScwl7feYAX/PtFFYOK9/aa9IIrH5f0Qgq2u+bigGh2Q7z6ImNh95kwR11G+b4BkJQ4Rc0gBdQI6gFr1b4eDh4IeK4tybg2cBHhzUDGMqGsIJsi8PIBQjbguJvr26iNRfjP/wAh+A4BgnywHXBNKv5QqdsgrKv4ioyH3/39xWm6411t/qjIa2pbpKUCllnouPB6ahwpdkzKxKe4BsZjUuL+GEwaenv/ALUZvgJqI427b/jgBSTvh46YJibjN0IKZ/Ecdx6Aq4EpqZerA6l8OncUWGX016BpHnmuNbfsgoPhjMrK3UG4ktZIAJFoxxfAYMv0ahA2yxUBbT7yi+YVtDphwRIcpcyw5DzFyMQjaxgHiuHmKSwKVawBbDuFF8K+ZtH4TDT+E1Rfeb0vzKqETGIcEJcKOmN0/iEI7hhVL8x1FDi4svpCPBElx31agpSgW8NH6zuXwjN2GXAlVwOCEIpkVD/KVLhv5iGom/aMxz+Jjhc9uZ4PPHnzKQK+zxmW/CFkeK/+QChUQbS63BHXCtnIWpW5OA4uI5qTJGSW7d5keHi5QqOj9w39SDWR9GyQxL4Rgy5MySCrSmBbgHUWXLhLlwOalS8R5rhpXKlxeApVSkqFHkyovmPofRVhAGGpdKqoBGJFCzE1vMrjA1AxM4blXcwzUFzNIchEisl1LjAmocPF1lllJ3GBSp7xS3avKWqNnki1DmXGuDLFbQJXFyp1a+TEY4E2J/CV+ZcSnw7+0BKDsePaWdB1fiVnn6GKEqMRXEwPgQDqe5hzJasy5c95QjN3LlkqRBsvi4bgygR3ALqVxcSypc9pqVzcublkq3biVKcTUJHrqYTLuFzMOL43EonUQncTTC6Rg7QhDMWxbgCkAIwKzzghLhL4J1wNWxcD+2CZwYgUo+8BaaOHHCXAr0HFQBTFRGD6f1De75f8jnozGnpfvO6Z3N8bzwRmnA3sgw80RuF/Odxz+J98fqVdMupiDyQeZmGk8yuULjWPvEGxGXqPpPujUwJgyty+6VJYev8A7FmS33mM7piu4e8xKGuGL5McoGIJujiQECK27PEoq1BZO2KmUtMxRl81zpVMph1fcsyI31KlyvTcVQi2DzG3aoDw2cSt/BxXoF4cS5fFcXwlkHp4qVEQGxCKhkC7wxguk6lUxBsvlmIqhfeBOoNC4v58tpmIOmO9QBTKYiCVU3DJ51LSZJ5JVRLiRalc3EoMCkAumVm4MYS+FAtiMDH8/wDInVRDe3ASm13CMRGo7IQ32eZXN8Et4TGYQb8EgOKr2y1DUZH9zhlWeXhi1L/cfzsg32hchCHGJUJVGXiPBZSPAcgCo0aOoa3qXyRIKPvFrklcMuybjfXXuZ+xgBKF3qWe4dEgNJcv1JlvDQFdPhgD3hKIhgr0BKqB2+g5Got8DO545NzoB9osF30uJQZv8RpbqYqxDZeJo4uGY8B6LjW/z6MC5e1lh1Mpb7pU0wAseCDCBCVRCCX5lGj7wuqkpMa4r3mIe5DMxUsh3UqTwxNIuR1C7mZ4ZgKhuBUuXLhKmIjUDQyPUJUzChEhozDfvDC7jZQyExMzfTfopFZHq8MzoGzDG7V+kvivRcwhAJ8FANkQwSU6AgqQjKZd8VwMuMOLlSo8IPFy4IRY5gO4loiEO6p7dfaBgvM6rgnmVYFyzekC6gu+AJAYWJS8wC4Kji0WjnGimGGoS5c3A9xPQxNhBFO4FFTuHFQjH0pe4Y1S5l+AhUqjDZErhjgMY8V6QIV2+DuGAQ+PcP6lVTPmAFUniWItP4m+SPBKnXU+SMszBhmon8xDr38TRsoOJrKy8jx65XBe5YZZ5VGRUX4G/HF81MaZ7voCJzg7LMBLlzPSA6hxHprigwxdYVNMQO/ReajZqC9y+CHOYCqJcwhHZ7n+eBDMZpN0iFjdQl2npZXFwlSokW/LDlgXMEZco2xgQW39oDqEJZE6IWzgk2+r9RA7gCH5hDEQ0OogFEZUeJUCF0ZjMU4r0AYiBnwQqHKdZNgZ94VKWgiCQB1HcDKbiRMBmDF3LzL9VylV0zF4JUecUgUVBRdyyv1G2pVGRf8AcY8kBKVXFcMGPIdypTUo8LRDUXlQiRjmO4xlLuoCVNhKCMyzKlx4Kuy4F5eUzfNdx9Ax9GtMAZ2QbHcDh5YAtRha1KnlgGUeviJY1cvhaLhazqWM5JYlnF8BEmBR1LT3l4Wz7kAv1MNgnSVGVIGnSmEY+g3Lixt6uUME3GKKPtHvXyTfAw/OMszeOENMHAZZMTE2Q7BA+oVKFQIHqEQ75F7iAtjaH28hEmYsrgWowalVKgRIYl8WkGXzcu9QTDUWID3m954IkOFCB2zK+3orm4ShU1ohLAtiX3MzSWCXlceCML8zU2fSALGEqV6Lm+KsglmiOcELrWW0IVUNS/bGUjcsuywJWNSwDuDiIoJcygIcv2fqEaGN2TcCHnKJewluzL88r9CFxo7gmyG6hqHo8xUHt+X9ShidkH1C6CGgcVKiomIpWZdYUnmWQZRpIETgOL4URpSMWNpLrEuEeVa+KjN7ZelxaiLtcy1cXrMRdQgzGN9S/MUJcpY97LWRlYdiXcolXL3JfjwzicFjw8PFRI8ReHEFzZ48PDBGeCVGHAei63Mm1iHcNQbIBWosuDFgBus8UZI/CjFuYkVqBNRVCHHCW9MI8DL6EauUfm3cBA6iSaBg6uOuqP30eYuu7nQN0/3N81zcJPoYcrHjMGLcOKO4p1DtS+zoipSRcisl8XACmIXr1HgrmVZ/QgDNkqDNx4uOxhokJipcXkjwRZmfMOEadEe6zPCBBwcMbYAj4hjHJLhElQ4CnhhM0PeJRDUE0h3CPKMqIEhypL/twMWEfRqApXglO+KuOIcZSq4bSGCKzglCUxKgQlSz7xLLESLHEefpjTIY8njUpAB4QZh7mR6FFNsT3Ef6iwm4qXCBGWEIdrMnKv4+JUG+r/cHAy5miWO6y+Yh9Y/uFgjDi/Rkg9vaWYlVqDFlkoKIKOLlxnepZDZKpqWiQ1vi64q42xGTwTBqNXASpmzOHpxSJEEK9H3nsReIliMb74Xh51Ga5eAj9TXF44IwicYR7hgly4zGrrjEUMsFeBww8mMLUCAJDuEZmhhbkIQKMIdQ2SzhYgPsv08R6rDqAYRApnQxXyS+C10SuOzDAUgkeInGYR42SjbBRCDlcGYk1B4S4hwkxX7HU8ayq4DgguK0UeY5BGULukameLgpDqDF4IlB3GGeL5OB7l3qa3LdJVSubmzELb8wSzcailEJcqVwErgxLl3wcDEsEPQEWsmtcMEZgpXXU+3qALWONS/Sdx2ypjkcVyEwEbTEqcEM4lDE5RdpmUdZ/UQUCYBXsPHuTOIqOei/9UDJyxjGMeDENvCWbFM08nini4jCVKE7sNDHnxFryYDQhOwjLzgcH6QgxzPCmGOLgwjyMoI5pjxFYiUSyXMyrzF3cNcuNyz1qb4hzS/KXbc9/la4ZicblROUg8y8yjPtKoKl1rJvT8S/bc91wbwy7MRicMeHheGGZUZ3HXBecCLfF+pVmBn0MUBKpTEbVRPLiO7RjMYqXAMals8p78FV2i1MypXCdkLRjt1X3xKjdfyjj55eKlS/dGfrxYnTCUV/Mo3LHT+ub5usx1Vzr4gGoAqNLhULGXzfGodSYQ1Dk5ZQKYoL/DUdqUNnDDhCMKjCmXnkhLtZ1GX6DisFq4axK5JUqOIYrhbRDOmMe+3H80hfcNS6iiNuosmaBZ4FQOBB1K75zFmYLmEOImUrWMTcJUcIwb6lSpOvY83xdFxXj8IOGAvkge4ImIc3BnxSEIcDuEoHRBQ3pftBA/P6hNbdS3dsyt8EI65MeN2wHBhY9QUTjsBNA15lWYAa4BdMuJZUtFrPiPGsygJVRjJhCuLjEhmTUyaXMhXCVCMVrCMO3fSW4ArJXJKHSAEqVwjFDZMXNRDEeD03CBVXlJhxhm4Ik8iOcxiRI55eHju5cZ7y4tqgXA4SymV6bgy4l8nFvSHCu2SyOHcshUUbuZ4FqxmVqNMLcvCMqpYEvPUWRqdI4gFnFcI3CRM3bUxrqBQ4IrQagCiMQ5jSSmbefEICZljplbqAWspZWxYeUoYzczGoi+CVKjCMqK+UvTQ1/wBiX+qvxLgvfNcpF1MRV5wYSaqQeE9t4CJFouYvhLjhtuZ4ZU1GYJsimtyvRfGBHgo8yxGcKTBDwCAHSCOSbhSUHFXLrmDbiBgg1LxwJKpYESmN46gdgMdpYReQOTMSipkBGtPa8MG+ElTWOv36EEpl6jUG5cvjMMC52w3BKhCGYQBC/wCE3sVnxqoZBx0ijMGd7Q5MeMYAUwHSbmBixZWiMCAvo+kLS+QFMUeCHnkllNFy4S6SUBl0GzTMAMM2Xxuam9xDMBLhDGFfMEFkEXKdw5IowP3gBfN6oRLioS4FVTyBKnvCMCPFR4oibDhw8XDgVYYZEwBgRsl3FjGMYvUYy03KOJcuLbRLPcxctUxDbLMEvnPoIy+CPFw4bWIFYlSpXNHcSHA0LDcvNXl2fMwUya9pZjc8xrH+J+f1MW6LH2Av67mZRvuU3xBP3y0XMD0Gyzc6DoueeFNSilyoXCMrLIIWsjjEOL+CDS/iGTiotRZTuYLdy6zEfhF19ZHxANnMIsvhmpdwo0wKjGqF/wAIJvErWTQhAC2bLE0VDMqGyLgWWu4istdviAKJcsmOOL9F1G4A6gTqUSscD0Lh2q9uoUa9A4GLcrlZOkAURWSWYzxFCVPMY4fQcfIlXAS9MUdbwRjSZWe4yoxySqMQ0uXklcC/q4Iorl01CEp8kJKs+fMACeYuD5E/25WV3y7ikbDUCuGMY8a4yJHZNmftEFYXY8ygimKjCPvC83UoiZjYwX3bDi5jRAFEAqg7kQ1AhGMWoBRJVDRbrD8nUCgUwXzDmpQlMUqrICpt+IAtXBhHElx4XiFVC0IYs9BHm4uJAiS4RM8qeyY7j4MtGoYvDNw5wjaUGkjT3NHAcZqAdlgOoA64thH0Evl5qCsSoBzLi8XxcIxqqPhicZ2B3ERdeyMfbT+4Fogimw1AJipV1q/MD2yvlf65VA5dQycZHnHO4MZtEoDBN9yv5JSahIA1K5sQlsWvEEsYvIsYKEyQFYJ/MPf2mHMdkEA4eb4RtPdNwElMFxEJQpB87fDC3TT3uB0KdGvrGOD/ACf9lk79vaV238TI/j/2fxin/wAi2leBO6loS3t/7L4a+8Ur5DDBCtMwBxEJiNsthfcWpXmErmpU3iABiCVDhquodrhiXB4CAVGEdZzKCwJkBwmNXl/gjHepcFlypdnxxYH3jFZMkYdcUYJYPmVHAZcvNQbJUIcF0hwN8LZHUqBg437StBtnZPlNb9uN/U6lUT5HMOFjHgQjFIFYjAbIlxJiO2rnc918ejBXN/CZuJUq4LWGi04JqOSZkGXyO0X4xhwIMSx3iZqaf1BoN1L5XkOjBtqiYGWXLm5UqVEuKoaYNlnFy5fKV3FTKDBKSzxqJ6l/HCsRjuWx8Q0bkjGM1uDCssqBcoJREN83Kh6Bw8EqPF8EqJmEVEMi3Bvioeknw418wr8tlcwsGUgk8ueY8sMzYfxCVh9IIcSVG2Y793P34UaShncvioYl3D/HBbzF2lqt4Io0iRojYNQjHirgIUhCI43E1DoYGZo3P8QjENhlDbf8I+gIkqtcXLtlSrt4juETFUviEDojrFxAVl8S6phEKG3mISlfaVSh77ie5N+0KCXHhlQu2jx9YhTsjTqVdTvgjzcqOIMuUoN9kHaVDgYLwRTE0UzRuWvKN7qVA8v8HGaoMnqDLxwCNRrAuo6E+0Sow7l6ivwYE2kxV69KyhXyOHU6gVLVmplLBmRO3JMQmZhrIrC7WErMKjVD+YIDvhjHg3HBKcBmDdbeDC6gISMqICV6DhV9JQsjnOCJNTIqK7D0JcEyi5WIFlpr3PESFAgFPCxS4MfQllMyx9IjTY5MOAgEpjujXrDfHcrFQK4waiXKrikGMeECLmNVxNi30ngEcHaZ3nlgdOWYnouPoIR4JcGPIyiNimHcg3EuyY2dcX6KjLhEGVvsqOjo+51Oyjr5lxF+8IQYiqQfrH7Sj7WMzFR4GOr6jqOHZK5GOi4Wx4IUw9IcWMhqm4aXGc91HFy57IKUxYHUyg5Taupco+JcuIrKZj5IvLV/EMbL3liWS/Qx5iAtmZ7pUqXAGlj++BsYRRWunqPAsbXxfX7iK3MxjaeCDmg98yjSRBY90eFcsr+HxCijUOGZULgmyXL4uXCPozzuIT4/24Vavg4S9SxoYImJY+MG4NzCrTcCU7hqPL/BzbxsIcXMMYG2yCLI1eKA05WiGUFdDqAAnFcECl5I5xGhJvXUAQgDcIKkQfUR1AS3341CDfn+CEEeIRjGPBfSPYzwShEAtWBU3CVIpXKuyam4+8QTVg3I1L5HUYLhlOaREURkHuKgI7S6VGH1/wCwhlcFhLhxUupdxSmGAYgZuCagTUeNUhwnpupXF36Agaitm2WdSFUoFbJVcxDuWU7YvcSgwSpUccOpQhmu/TXouX6CPARjRllBiA2Lx3KIDZfBLhLjKhO+rFuaPb36gs3g8/yy2GmD9v6gkawvMKwY3BNMn+Y5pZZGyFZRncw65ckuwJng4VJhW6uIAg1KFKmEKSS/Qz5PMC07uEZcU2xKHXoKiUdpoqAYnBV6CuojxOBiR5orpob9yaqh2ylq/mIAUQuhTHmeSfvn/ksLAPER0x7f8mBGfHf2l/w7+/tBY4Iy5cZZMVWO4Oax9I8kYlaMwhTlipwrFaNkL6t9mC4cM0oRegwUqAPLUw+zmMy3AsqZ8ynHl/g5FXszKgd+mxFEVxZNYh3FUKsru5UBqPNecYxCbJ5IySlRUDvgdrHwZBRDPBCbSEKt8RLaOj28/WdB7/qEY9Z5P5Ix7NM6jGMYwRkL7juxUKxA3PMtec1K/I6gGZWu8QBZF4gnDBLa5ZE0Rl07JXoxF2wnGIqEEZgvcIqwDqFVgnDEf/CRGyyQXcXNy+QgCmd0W2lludEWXxXcPRcsj4QM2x9FQEotBUNQqxDGpt4QUmiIRi3K9xLmSXwxxqCMQSXOJUqoWovgjxZL4qZRIR4IxwQuucDwPRfocgthyV0+5BpeNv6IbxkEmoALmpvlNW1QEfB/v/sGdsvESP47P9zBH+RUKtykeQdrE5Su5mviUqeCVadkut4gEGuAFsWHD+UEURIplD2TcDWJizFpl1K5qZYJXFDEOmW+cn5lNJYbgtJa7EyI4sNy6tESTaGq3V+2UwEO7TPUY2h1LAgDH4y/iA8Pv2+x/cd7d2VJUebhDKLIrRl+GMCJxXIFsOpAyd81cAlBmNt0+0HqGQIxyP1eYRKQY+YdHeNVACxgDe/9QLzEiHZNDx6MAHyxltt+IbFUYCv2hjEmUOCJROj+INqp9sR0yfPcFdOfmLbNPviN7Z4I2sxalB0vMEx7w4IQ240XAcDt5YYs3+r9coKHuQjBKc+YEsHDDEpNnX2iDbC1BzMFmWzvE8wS4eEIqoqVF4psmnlaqI6ZTsirbwUxlm5XPt65kjE0SqjS1BkizBAM4gCxjRqH6mOEbgkK3v5hhwFK9BLl8I0kNRIWxxXA1L9CzvEAa9JwFljXkMtf0gSyvyx1wCNbIFBFygVUsLJRrYiQXqW4dy4swbJZVxBc0yyAWoMwVqJ8MBsZVyohblS4Z1Fhw84EOWRXCCdpmu/WRJ8xcOzP3mWqr6jh9p7hlGRY5O3b2O2ARwR4db6iHDW/vyLTZH6c9dfSAE0lTrMwcKBbEFW/RY2bgSMVuVuanQ/EgwzBCqxyJphocn5ggsjiJpF8rRA5eaWSPklAK68wmZUoIEKwiMwlsIuV3C++n5lArHgLdbj/ACB7x94D5SlY4oYS2feT9wscEqJcVGJ0RN0wiwZZFIiwG3ma1NxhL4GE3GBZfMAcMxE1HtdBg12loAnvFnKe02Xioptfgi1jbgSyKBVgl1sEsMvDZcEOW9h4Ih3BaM4+39TOIJ2uUCIKSHwfMuMSy0jUXcpgwTBKYhwEI7WjEolKBolZn7uTh8kPYpcLxVUuBPzGZwPprLKNzN8faXKTJK1AFTiGwdEfiIHXUIUSoQS081EuHRwhdyprmwsyQ6YgmIiKm47ZNihC248LMnRqoWUxKwyRFRQcQicPo3CE7hKlSo45QQZfJGXLgYIwcQFMBIdaZapWVoPRuLgG7uLA2gJN8APhKS4YFcwAqIMCNwjDhaLj7R4IzHDnglTvior7PwwGnpCC40jUEpxhnbEpLYEFX1MZ9v8ARLrhKQQHsI8VLiDGK+obYyz+J0IdHFR4qKOEDBGIYL1CMuXG8uDUjsjpcOhyS5cYSuHmktwG0UozHS9DLCmxI5ri5YPGiJeIqS4VZgHoNfeYINw4DNxagO+pQ1KlxpIpVxgwuGStEC3MGvRng5GExKlxUMRAUwjFVE39eYX6iaEY9ZP0gCgmbzee40VF5NRGXTqKqty8FH4loKvfRG/phMxW4/Tr8Tc6lqm4WRkla/GY6pKhQih7gBEACo6gHPZBxw08kIWQYMCYkLWJn3Ci5+79R4HDaQ/OX6QRAWhGbgcsYOz2jkbm6Ov3AANGYqIqK0WPCXAMrVxfFZvnqMIQJmjpgXEjLPP4qmoS5lEK7Q0otgCVTE43RHJYIrUbmg1EPeF3HcCMuVy8U6GKQE7vglRxNka4ZcS0NeupaDFcRqFNRhGpRuoobIN0YhdItjaJxhmYc4hSkxCoWY1/Dme4WSWdM6Fr5l3qEqLXKJDBUG+L5I7r0OeLmsqUfMA65UJ7IpoVCA2jksDdZeIufNMfB3AeoxKzfGsBxsggy4cVw1JuWBEUBdagChqVL4ItkrAcVxUjsjK5IEYdwcOaj6FPowKSr8b95flFeZuX6CK+glxjxKrylQB1pMeOQ/XX5gNqUOvcP9QOFBFjC3sjbEdiJNRsKe6eI8BCO0MS5mZI2r5gCvQMub4fUC9xwBp4C5RS7xNxtHMpiCy08NRzlBxbs4HjM8HT/ftNzOnv8TNcNQBRL1RuHNfXw6gEYrRH0AQ5oePaANdxIakcIlbTO+Fogdpa7eCfUIQBRuKq+6AI8I9Qalkf8v1LI51EFDtj2P8AscaYh9KHLGEXpN4olDyQSAywhi4zVlRBUr0MA8EYQlkTgxY+YGbWw4eauXW5uSKnJ7Rmyg8URhdEqAZJg+Fxb4uVw8EASyzqDcuXyabIBHb+gjiXDj2GUtRXbNYjuJEXUZRZUHTKqJyqPlFJQFUO7MwDMqLdz2QXVMDWX4dT6gFqJngYj1Kl+hgHUpUStSkSki2qoWy+iF5rEKFnJGKsSnLDo4Y7tAaRBgEYCsQZuAUfyRCAiy1zMmSKTdofB6AsHbMC8EZUG1wEkGAv5JZwlkBIwygfXA4IxOyGdwjCJRuZUDCMEtU3AN4dGUupxfpuLyIuCuBLS1GgOW6l3FdCUN6Orx/2AFBRLlx4pdhANPUsFJrlbUuJQMwVjiOZ29LvBEVhxUqVxcvio4nshb2ge8rGIiD54KCQaSJBIAmTLwEFSzHG1YpzxUqJ5zUAFEJWTxAYMMsci7/hD2G1lAWvzEFPNYaxEJSGIih6m1dj7yx0zPU1Bvmo7oLgZRnpAzGoIajfl+oyV7cI4C6qvvAhdfELzv5iN4fDDFoHt3G1MbfpEULW6RPERUNT5jYGVEMS5uVzRkjpwRgy4uZcFsq4BD9ILWeKj6ExiuFUmY1dxFAmXEAhMS6fRVRYPJm4pAceSLRcOmVu4puoAAHJHHNxQYxIxYwWYlDuaU3KFCnh4cJQS/Q+XmEJVejQovqgCs4sYl8kaI6uCCg4ah1Ci+DbCIJGzGoPCsYmkqm5fGsehKSZxCcwIriOlF46jqQXxKQ1r/76AI9QJhn06XLlK2VBKzcq4RVG9F1xXFTXaENS5cuXfAsmDTLhi41l/wCRRRKmpcQmEWoCWZhdSy/VISOVL4A2sDK4gLYlQ0/L/UHCCpdFfk/qAQ0v4lz2Nr/tS7JAw75zyFRMQ1nIl0vpOnbxHVwYnXoZjqVzYwFhA1g+ki9HADRCEGoSy3iEDwLtxFyEO5TWIklsc+JVggiEJcoKiFnbni4LZKGSICmFR05P6iQCYvouoDA2z3J8xTQWARl+JXBxckRUxHlDBFUcsvxFR9X6lEyyiv5iEIzURhTdEwLlUqNpjRKQYETgI+h1ub5JUslq8o6lyXqe+JBi+ihB6hjBK4ouVMQGqgQsrgjyR1BvjSezn8QjZxdR2pAaQlr3AxL4aS0ixUQYHZEdwwhiCOYxjGdGyOB17xdyouGbL4jG5RPo+8BoI+kNpTQYZRGo08wRYzuoEbgcM+ZQzgqEIsq4iK2IHRKEvcu+a9GYKx/EoUcZUY4GxTH96OQrMUL8Qmko6lVDbL9sEtyQVeBsnnQ44qDkPFQjCFMdDJCJi4r33chHi+GmCwOIPDUONqJWTxcuZNseBKnc94NGhR1UUil8dQQ5V11wEQxwdZMQjZma0dzpBuEY8INMwLqF4Gal7PgmAojXcC69I1S2UvZEIuzpI9GHb1G15OSDL1uGODTc1qfeBHAygsmm7LatXrxzvhUqZmfQUFqGbHjcCGRUtT5goEOCDDgZVwL26llhDhMzFl9TP7v1NY7mGJ9yOGuBGEKYpNs6mYgXGIZ5lRLjzfouMRtTqblcXxdZYplAr1JpuX6hhGOl8mvji6DePzEa1/AwoXN7JXJHgjNPGlMwd4g1acC4A5Bl0Z4E7MzoFmWpeQmwRQYE6CGrjBjMRdVQRRnaKh9qJYUQA+gityhXcWWaOkp4XGkhb0ka4QxK/KEwo5rlgGaZiRTDiMHnC0eDkbL5tB7x95nyQ6jCYj1iYXg//IaQtxHrdN29yVBnQwhQaQwzGgtiG5jyyqlgWxFtOCV6UZPCDHp1QLzBqWXxUqEYFQFyi/xCPAy4iwzGYmP6l6KHy7hWswTqBLGblcEW7Yl93RieU0UJA9osqSorLhtqWaFHmbeTxcQZmO5eat8zXwYJYzLBA4ONQzKhmFrwsYTAqKtMdQzeX6PUeytc1NRVkg3nivoY0cLpRGqmFFHoEWoROUpklJq5S1hqG0ZdxpL/ALv1CkNEufcDguyJ1oIQL46lTcTQECFw9jCniPN8vpvlWGDzfGCqdEA/eUJDp6KjwlxiJDshIjSQMr/wwgvi4Rly/QtRJLZTBmZcJY11wwmUyEoxeiDGe5YATEiDge0EoOpcpAjAbiHEcQ/IiFFmaVEYJUJntiUojUMpjdHJMmNcsjJfFw4Fkw0gV6FleD96b0AqlR4JU0y8w9fmBD9I7bsm4bjBWpcloH3P7jcsXmGnuAh3HsMe8L4IFsDXZ8eZXCiVuQ8HNy4MuAFRtnz7kAAJfmVEri5QhVXiGd9HpsIoE6gKDzwYi3xUxIEKArh9Ak6q2NQwyyLA/cjO8P5QAEWxJVVBLs9mBsx+Znx+8SoZduWELH2nkhEVCkiGTEylfVBgIM8pEdwCAkylsXQdQjrwuDDg4vqEEDxFLMcQg/d6lVrm+TCnAsqCluSVbl8kqVm4AbINTfAdyollAYuys/WBSr/sypAv5jLwgzd9b1BatrMup+QQhRVXeZQrheIsqWQJUD5iEPWN8HAssy/RcOxErMNcBUOL4DgjTGRSywiKZUXRDJxfFR43KlxiUtNTZLgTLUKJltYlfB0Wj7HzAe8ZplQoqfmGIxLIzoo1kSkbeLQcRYsXKCOyiUOI9z1MVVCFwIVIy8EbSpC4Empd/MKk3yibjfUt6IhuJAE5COILMS4nDL9YvJA04XgKVGAGoOIZzLjvkZpBUSGZXDvk3aqye2JDgHSkBuyYlyVkqphCnUanyQjOoEQnZmNAK8v6gNPI99TeuT0ZfBKtmKlEaalviX1DUUtUJ7QjxU2xZoh5gjyMddkqiHDK4dQ7plgVjT8x4pIDYIeOU+sGIq+CWaD8prX7zBHOj5IZCqfRitwfEHyPiZN3CZngQXuYE+kgCj1DEJmAKipiI2NIBGKyEGXcJuAchAm8gmJ6ISoCIbH3ic9rwepvg3shnHJqIgn1g2rmB6iHBFvEA0hYPfBSIGJ0OX+oA5ddSgtlHyEQLYN7h0GYCMYg3CmJGyZtMkVKeluBNPFcMdRY9BFR5fTfKDtJnjBiyY2x2j6a9BHgjxUHKML7xhliZVSjyYkAbS4mhIEqVBTwGbYVcue/owYjMsSoombkVVQhASjEGIiACiIXUwcTTDbJiVa8XUTWJcolTq+LqLwBvVKuNo3nhNtAblQCh06rlCXLDHpJpBlwZcuMslhudnj+MyotoASrFwkKQoBTSFlq3R3LwI81/wAmYhY9j3YYLns+eCVwyq3yrnUUXGAwhXUH3iauZ6Ils4tPKXH2jEsyIhkoPjEAMF7iEUnzLorHcdJmYmpfKogH3lTUGLCM9iEePmFs32m8SpHbb8EA4qDu1X5hEalAHD3mKEyb0/Z+kBpwNn+6jMQpJVBvjFVkR2suX3EgJUDgzHi5fBNJPCMwy4RQ4KgQxFMpY1Giud3U7cmQE+kL34gAHfFypXOW5SbzAtENacxjEVy5d8X6CHBPaCioGbhwzR8/qNiV+e5sFyg+SPj1K4FFzAJNx4t2pUd1Alio8By+h4RMnJNLgQJUcejCRwwhvplRbqIGFNytIRr1sIJRuZyoWN1I9mAQcVykwncc6PEou44D3CLUN/PA4EJSAaR4eFvlCImoqPV9KDDQZi3wRWHXiAoIr5QUVwauDBHdwubslzQOK9JjEFtiKZz7MOhLHTNunxUzyPxYVU+Bnm2sfxDsLGAMxC96vxL827X0CMIzGxlAKMfrK4Jdyo8XRTAuPFhASZtShmAaX8S8MIiVCt0c1EGU7zCXCIwa7hcuN62YVHceCLogdwj6VE/I9EF3e7CEp2y9bto+Bh8rv2hEj2CWWZRryEIsBN1FeCPM10eQgULzKKADeGW4qeWSyAFEGXyNy/SEcw8nD+IgWQgISpqD6BSJnPvKFtS1O3BkMqEFE9uCXLjxfifOeTUAIEpWoKKhFSuDkhCVDggRpnQZgr5/XLcDsijaC3CjthBqDiPEaZfGjCPF8VHi5fBElegWVBArhlHMvi6gEpshmyBcSIrMtqMqRk8CPorgjrBDSPKLsjB2QO8O5UeLlyyJAzcvBG2JeQWQhFnNj5bihSXcIkMlxYy4x4uXLmakLMf+IBFYlu+EpvmociVu5QBBlxcSzjFQ8RIAcmXxgE85+rEKreGV5E/j7MoYfir+IBTPr/yLbAazn8kyRfF2S5Zi26fggwaInBKlSp81kdTsOKhibiROCyzUvaGO4y6lUixLZzENUwDjiqC7AGSMv01Wif0hKkB3EsDMv5w+Y/kfzKgp0QhXfN+jIm+obghrNjMQrMalDiFA1XfcFKlogzFbqF1sri1BdbAhGWBwJhGDNp15jmtStmZGEZc6jXCaxhK5uYTZlWu3xFFrYRhg3CHByCZBLIMS40kxktax9Yc+wUfeKKKcNHkhr0nouI/QisECa4Iw5IcDBiAuAq6lyMKXm/1cEF/QhaEA1B8KGonCpXSDGEqBK53KlSuCXLuDsmyCwjFyrNwcS4ErhdobGxh653LFFMczvoTKPBMzwA5P3HgjyQthLEzCByAll0ibilx9QC2B7SCaJRKInxBW2CosYxjHh4udBEC3bKuBRXoeKlcNKEBXKpUYi6nzEubWWC5VzzGAHMxKshcuY2D90NQ18yxo/OdwH0lu/wAErdkUMpD6aWYaA1iEGRhGfLL9F8X7su/juGGohBjL4LKmleYCqKZwYESX2/7GDAeYXCXiNhcQsVOiuSPDnEAmtcXxYVBYbmmUDsPzMNgMHeMBOEDtXArVEdgn0Z3j4KYrSfKP1CH0DglPKfiUaiLa+iFklEqWy7FHlPaqmbizsh9YHX3LCNHCUImyKczMdR5OpsxS8EsBEG2JUM2mpTaj9IGzD3g9XcVVTNzEhslc8QPY/qKnMxSN2kV2oNopgzpGEkPA4LVZudEJ5UuCoOSfMFoyiC9Vpf4f1Cks4qVXFR5UwhoCmJa5fJHg5HghLMQmEA7lOiK/u5yL7kUSJDaJZREOpnzVc3wPCcVCPpyVHYI4CxDTc6YubNQIAl9wzDZRL0c+YSl2TyPFZiXyhBB3EA05ZfCQ15jVzDaTAZgM6Qat3EILqNF+paBEIgGuSDTBCKMZik3iPDwwM2pYeuLix5eVDcR1KSL9pTusRLlOb4IKVATcSZIjv7IOHFDFS+7GYIVshGjm5vgC1ljbBIrUe5XZDr2JU8DcUBOCMsL2/wDgS+xmIaYL7gQlbFitH3zAMz8JfDf4loCyMKlcVKlcgSpXIQRtuD3OV6YmLcohfbdwAuL0Wn/IJfyvNQGeFHodRf7H6cE62hPkmdyeHDNl6eAohLhGokKg1qJ1IOzOJamowxALsIxqzKt3Mgn8koRZN+EtV3sMwRClDMQ8cdKDeYAojwQeLJTKa/iHDASCZgeOTqCl5sTqGiv5f3BDB5Y7dT7YCJCWmBC/EorRiBKjDh4WtQxDHuRFTFgGXwTcqHJCEGMO41KaNylQmxvMCIJh8xDzLuMYLPrgXGolr4uMPRUJcZcIwInChDdM0qDXGo5atRpAxFRruC2IOINcUXkSmMEsqnqZvImukf2u+oDABHa8EeVNTsxVrM60olKrioxQ3ASwg36ACmX6EJhCJwYg7gDbcpdMsik2MNbKlHx6N4lXKruDUS58olhKggbRAxLMQh/4MH140hnbfFwm3B8wj0Y46HgsaZleNoDkR+WAqqGIHAKoq14frEDTKzc74sFRMfWeIgHfpebm5hrioBIA1HiosFHJGMWkIMvivQLaCBAd6PaOZvZ5mCfKUKtkRXTNIsOHOIpFv2/cHSvfsxUz1o/3cajADRCtgVwcXxVwqX3H9lBUl1EhMCWpaxBHZYCQBNuU7PiYvk7Iqb6QmNRcWBG0CvRUIwiARlsqzy/TEucPoECUEpD2suaS6eoxjW/6g9XzczVwlx4vh9oFSoytC4BfT4cfaIKuCt8DNxOSECEAmYAmSDU3+qZuaSwLsnasSMZmJESz09QzEhLlQOVRhylyu4Ws1EHDCnwM8YsXD1xGlJMYgdkoiWMGTxhC5hBM0keD6zjubAD0k3DcBGYa36CKssEdRBgEUb7nylJSUgVK5qIl1uLGMZQUxYTcdxmCuRTBnxNL1alIYYiQVowjVhqFFcPN8DGJYjGzXiDCYKU8vIq+3DiUKZ0NZa6J1DoM1BiAVxz3ZCLb8RBU8CO4j3jK4WFk8QLg8Ne5HaY+SPOiUHAhaYoLQzDMYR5fQqJcubmpuKBbD78ongJVS+LLYe8OLjzVBwyvD+EYuCO6MZYbTyZl+yZFI4ChmZHggNx2QkHuRR5QgnbNRT0CY4uFY0YI07meri95skQ7xBbeo9fbiVPhFPrn9ykOPJqDbFz8PMQRycX6qmSGdcV3MU30xLZp94eXQAtY7Wtvn5jsCBXP8EQsB9pgs9pZIHlqvkjYB5HX9yjMe0qGDPF8VCb4GM9oYxDMrk5OCCu+CZZRO4P5cEYmHzHBjGC5denXr3Di5cWBGVO4cKiMCo5nsyoXq45EyAyteMQRdwZ/QjiLtdEQ5hZsi1RitRcsRojiNXtpiIY6eAlRQLYrh3BDIJgLZcpF6EygLuPNxWWloKy+E4qAg94xxFRcSwREWmIKLl5WoMZJuz28x3ipYY4UpkeipXoWuGABfEHT0sS+DjJo4uXKuHBDMOJ8oXkz5mRc8JQoUdn7lgUuXmuA4Fl6TvxFhklRRM1squDm4cPFcJZUrgjLqFKQIfi6+ZQad3+frFXcgW2CWuIORrzLxuAfMraX6Zg3RBeyWS5XHsMgBNFblLbhFuh1L5a/mVWTMUREarIhbII8N9ZcHSRoaQ+kAK6e0NFIndw+VBlvcMLH5iMFXvNSX4m5vriINP5Qcqi0viblcTYqkphJ5hN3DaVDMmIDLT+JReT+YBlnxyXhIqhZB3HV8ezE6P4eLHUJXBHii3CLemoAxD6Fwdtn8spEUbFuPV0aSNifotHydQd8gd+3UJQc9HxL0FSzeoOoti1PvGGHgX7n7IOONTLUs7jB9LUJfJDg4DkQMxRJj936jUsWph83IxjEzxJUCJycnBLl8COosHhhxTdiIZZ2GNWwpWFXDrZPMMJn1JQLcTYWZLCxiNqQGHcXBuZ7Y3LCJYWBYyjmDQw43KmY9iWYb+7BKGOcR4OHfJnm48BhiPJVuKjYZcglv2UQmuaYnUAXFBRCimVXJH0VBm4pje5QZvm+GHNvUqvQSoCOxC3cqBVzImGI+ft3KpioE4vi19iX8XMBHfFemoS4yuGMLCAFk3FS5oD7wp3AYY7fHt8wSjHbwHdfyQrbb57hCxEnOHjqGCKdS0KYUyuEhsib0ZhUJta3DBVf3luLKlDuBj+f1MV0lQY0WsNjho/caqqFKdRslYmbKap9pfgaY6Kadwx1pZ8ZkKGySo1JA9skAzChioa4EhL7qJ2yiGfv5hooJ5j697Q21rwz5FK0liNSylb5rjfAgZmmQAohwYmRTMnr1DCmI2y66ikbtX8H9StkNj76r+JogFcgZwa9uHOkIeXo24w4Pf1HJBrghmEJc/Z+oBZ0glINPiP7xFwYkYkxl8XLlcV6bly5cAGOb9Pjz/MRaMMdwKBEF8RpphS6sNRC2YoRjahI70yhMVGR0dxteyOfbHbXlOGUX9llIwJc+EqXwRgRm+bg3KysyQDK4b6l+2WQjLijThmMcygzLA43HUvjK+SMGcx5uPFencogZfzDJfFcacXeODHNSuSazEi1wMSy7IACJKiAtsIBq8fsiwlwmIeeSPKQs51Fac9RdpjzVRClTx4nYW95miZWC/8AyQKu45lgE6lnYN/3L0WMAWxWRJUwHLFHvAkZwW7gKNCYbNRI8o50Q2GHzMEJ0v5YdSX5ZW2HFc2MkFTFNLuDQmYRizdINNt/MMnlHD+mEKhlGPKf1MeUsvDnpPpixSls1fZ45rDdRjIj6ZTaZcBgMu44zCCMEv0LRcubjtgniIbhDEE5il2GP+zAi5TLMfheL+kS5YMFQzwUrgmMbceRAHpVK4WoxLPScEORKqEIS5+6J27jhy9mLKWFfLmeeMZcWLMpU1xXG5csSBE5PQRJXoI5ONAFwZUkl2nUym2LLIYM6j0NdRi2GoDBluuoWGVVYC/GpSge0jjCJBMguHDCXUu4S5iLwVeY17ntsM1cXBlDkidPDqEK+DGZQEqFxmHvGDAipYqAb4ghaiE+TPIxDEr0LL4ZfUR6in3gQ6hqVl8XGN9iVe+bgRIPDxcuPlADcuLuNgp0niZ78DKgEG49TBLZzdHURrr3jrxCE98XBbzXIROKEWXruGjT8v2MfmXWxb5c/iKFQkDKAN0uJKohjVW/eEASoRAXq4cKyLM018agjUfxDbGbitidkXmoSq0RLSVSzmWdwBuCyobDMolAJXZlQIcVc1wyoxmaxtxYIzGLOvSC2bgADUpxmfieHU8k++oNYJc4YNTMXeRG3mD+alodytQQEUpGcY66WVLubxSddMVvjw5UyY13UdyuMDkhyG9csPz1LTEW1NRCVO4pxhEZYCINF/z4gM6CNlmJf2fMKZXFc2cHJE9BCDCKLfBwZ+6Cr+eAEruF9Q8ohjFjwVVy7hMTUsRzGPJNLvkLll1wEqaiwjKlSuBLpNTe5XkjE5gDym4QhcCo8NBCnIuVveMwwIC4mixClahVQZ7tZmaNntN+hKGVEC1luFcz4prhqswIvW+LAwQZbl1Bssl8NohyMYzKuGNMSuh+0PvH8TIaCVzPLVQiy4Nxgy4ttECuaJQ1CVNTSMe0FhEapR5/rgAkrkYvF8nJOQgonxKdYxEtiLLb8GUiHtM2LuIWEG+z11HFYGyJUVWyhxcuEuWgLWKd5f3qXOQ2sANS7hxcFKix4Wfh7gEJcosNDwsZXVn6ypBiC0LnsXxGu3lKhI9pr3mYcsqEojKlvcVJcS48XL4ue8vgmBcaClm5qCUIgox6tzHVMri53QeJr4t1DKgFW/4QZVPZE0gD9YiLkuNWVUpsZIoxKODRS1YUQQDwDo0NMKSxCHhmYMHO/wAQ2vEMwxHg5EtFEq7Q24MgUrmBHEsVcd/1CI0EOKiI3BYhLl8PJL4D0jCagwhBufsipJiDM/kjjUEEMMBdGoBtXHmsiXLjS4NMkAZjqyHU5cTN51Kh0j7SoMuMOAuVK9DDhOoDFNQbtPtBrWQjFpigbMIAgKjUewmAKIqx0TQC5kqLGASo0eLP5luflMVX6KlvYH3lVtX7V9I8FrjGgJWbhuGWYCie1KAYxlGNwSVBK4DgtxjGEYnUbxyhCOUtzDWICrqXFi5gtnuF2uDkBCkTi9HMQ7DwLJhC2WXZEap7iISyLLhGa9a0XDtb3m4BLIgDczkPc2XKMAKJXHeqDw575iwO3U6A15rBFIM4EsYo7yj4IXJz+WXoKP5lBrgI8sjsY2A3/H/k3LLL4IAJ5jBZO6hnMIWlTzTKsQkAEgBwemoKPuE5d1NZ5xqJeIwjwNRYhR49Goemyycit1PnpgiWcA3ly9t1A2qGEShKwJpIvDqhmamnFRblqYG2BC6hJRWlHjqX07fj7y5cCGIQQQal+8YXlzDSliPeDUejNYIyBtcr5fSyu4Wb5qNQ5OL4IcHI4ETEqovmJt8y5+cQLl0pgGGLsVRh3xiHqDcYDL7TEU2QShMdQAURlnUAaIe/F8PBGEWXDi4voxAseQT8EGhhh3D2NfaYxp5luMpYZgwoe7iZ3mUlw3WzhIMhG19oT1s9mNfuKgJ7MYLWy4R4o7IAajGISoLzLHfFsuoESqzEsuCINrwpDEeDGVLVFlGe4wDLlClB9YNs66mSYg9parNmMOYCQwne5pV5hBugUVw7x7g+IpZyRNCbei+H0sQFMDVdPP8Acwjx/EYlPydj7Q3GGJomtc3L4pg3/EHK5d9wHLjtzEsr6QloU9o/GrfmYoilZfiVABh+nf4hImBU1hPjnXDxqOTMsuhx8XPDHR9EMKGWVyglMSo6jVF9S+GDGBDgKBvh8ot28zqj6rjKTwSvQpPjzKNEJizp4TUGtafDCQHMD2UQSXNsPDTEVEVRpi7V+0Lw5gGYW3UxKWSx6/ygJmIWZS7nxECklnXUIPJzoQ1NIiRF+j7MFrvhyf2TJnxMv3f195a1y99/f0DxfJxfXA4mSkrv49uCGDLUG+DghCHC48oRYZfqCzj8wmEWMB5qa3FuhUKSydUl3rmJBsJANEII4lRBi2wZlG4WgJd+i4N8MvhzC25QWkwYl/3cM8gV5/iDQgwQcajKNVGuzMreKuu4VlR0SiiqAosjaEQLnR4O/mVFV+0NMPpAGiB6K9DRlgdvps6lQtgYKlXuVXClxYNm4kvVG+FScbjGM0cdwOeOCKYX2xNSAwFmouKnnBuXAWNJQqVHG48A8G2GZFJB90qUJ8wRycnFchExLvJLl7rhBgil9GoBWOAjxU/IzHGW2XLNkACIIf7HmYqMusRAL/s/89Nxl+iyYTt1wUSCqld0SuCMpWJdsbJtzUGXDgeFn6KiQcZ4ZnqKkU4jsdMap8y81KmG427ie417D+YbRCJNTIgqJLZdwy2k84hYsiXuOPcQXG+yCqQFUTKVmNTN+IktKPExG4njsLtioemkzGGlQmGom2LgLI5JhHLUqU1F+fRceSdhnipeYsSYl+ZQ2zDAMK3Dshwc3TCEbYjij5isjZqb3ucHkxLnmiAmBMIKFOiVOkqTDgai8FRSW/Fx3yhxUCVEIYl+mqiuK25QziBZmoqZCVICfpSF2ifSUntFCkVufRcq5VS5c3xcvlK+fIXyQRN5K9AzGXbxpiJEAcxl5jBsQoZ3K4ALYN5IVfaVZbg2CohiI9iPEAvsjiUb4DUCt4CFp0w4WABjgjmIgET0XL4uJMdyhqoq0frU8X5RowqNPTXCrUXcIy6lsIADgL4VEqAHuO5rmNdfpLitru+4bfoVKlc3Ba4PIMyjIbGVMRb4Izse81CDvQy2DzrcslhM6Ygmjz/qGJcYwphwAtha6isiUTh5JiykueTEhsqVNQYsZUoNqlyciy4Lk7lIn3mgxA7bhXpYXbKe5QRDZNciDsg1EvJ1B5OKvDLMOJhCDgiO0cGIWFu4MYkDhPTWt3BD+xt1BHMMWxZNQLMzWkS7g33hixnmN1OoocECVeIEEZ+yBNQUK8kCJUYx4ftcsVVS9Ql6DiCBBSsoyyALYMBVE6rCHSHsYL73LwMfQMrHJxVxYG9SlglYlmYQQ8UzEdfDxXoGPI81KieYAT24ClEUqFYLKjggyNK5uKUqaQxFlxjHhgZejX98XGG2Rh3n5JuHdkJF1C6KZEw2JDrca+BjJPHPU8UfEIiNTo9Dd1BNMuxcbKUCioR5IkBVuMv34rnLTc1Erhgq9jipU1LlhmK9qKtm2AaOXo89/EG+SLwTajltvg3ENL+0eLA91f7jyN+8WLjdvVRWcHDBWZQIBuDEVTsimBDUzLviZRuOh7PH9wCqODatzHeu5S7mbauBaxApVy42PEsdQgjGWH3MC4lS+b5rlZUXLqVUQJtSVIY3W/EVU1BoMs6jKWY2g/lAFCEYlwaw8kIECkXwIMFTSXSuOXtwQjwRjAlcFI9fyjNEta9pQRbkIlw4uAFMFAYhCpcG4cDCLi5+6al3PyCK8xjGPBuW6ljBFwmYwjKJN4TsxGWVmVXhlsGyZa5IiWIkI8VycYSmIdYJ4IQaqB5YwIcVEqWFUNAharPfh5uPq65F7FROKlcXrExTIuJNRcxQgsjRG3sjwkGlGbIf3KVWD0KoVA1CJUTx3M6KfeNLE2xjMQoQLgpAZMX7BGFGZ4ZEVC/aNRZDxiIFBLlCYrP3ZZzp4YU55rgai7avEWDj8IZ9SliPKqncr11DaBVyoJUOF4WKgBR6rV1Pjpg2OzcJtV8CLV9lKmHzb+027L3f1EaQkaRD0MCg+KAAssArdywxA4vi9eEY1i8y1liV+aGmm5TK7hxtgocLHxK88Po3AqAmi3KMvA1F4vh4Th5pQI0XBKlQ6jBOWIgR1uULNQoapSwS5dxiXhlPmOwzC04edNQ0s3wWaZlDUGJS1wJUYR4JcYMuew5HPYW/LllmQ92CGyPg1CaCGMHvKa2+L6lkB3BSmWMMq8QSphDMqEQC5lEqb/V+pcqfmEFR1GJGPooOGIU5gJVFZSMiQWgO+My2hjsmoFQgmJZCMOXlOiGoR9Ny4RRmDilYgUV6DjuVcSuKipiMhcy74JQX7jwRF1GJaS2yYYlxZUROo4WxmmIMJLgyRcXHLV2+haLYarRDybiZJULYd3GjASoVEhdFZ3g+0VRS5fpGWGCAtEJcZVyq1Lrc02QTSVyBEY/NhA0S74QAsnUIBLWiXNXD/MNQoxEHcCV6EC5nvyWVua3wwleFI+/vLMLULUNwLtvhYsSlRBFXvKVW9/6m0Pyh7sDWKhsVQRs4U2l1u6IBmsTTZ/EFC0m5pWYmoBpjsgSwqazxGXUWUDUuPLzTZFe5UqVwSvRfpE5jyosvhMQOglD19ktdvEjpiMcEozDlDaN2CyULYMrAMHSWYbbaISaw2hHgeb9BEa+5RNQrBnlAmtxBzUUFEWjG4l27hqVKqZQEpnc5HFO5WeP+y7If5fri5+YS2e6LGMWZxlRsS+jAoC1cRcGa5lS6huPaWbiogbjKuImQlQxMqHpVWiVxfFcLW47EWeU2BU7WYwjqALOalRIPA8VwrC4mOTh4uDcotcQwGFXpuMbqo31KcbQICUEq8Ky+Gt0hF7kGx2gv6LN6jxZrtZsYF7Eu2ZIILJclJcXxn8wWShJmeiIA8xTBMXimPZLJ5SoRjxRkQQWcppA09MVUSzMejeyKo3G22AGpURQ2Z+0rPKaXLuHmXGal3KGPOs8EYrzGMHm4JjuPKQNYgjOIAURIkBoTwIRQY9LOpliv5RjwVCrm+LeZftMC8e/eNVBQZglYlBUhrWDwCnh4QK7ZgPQw9BEaCIdy3qJIBuK6RXhJXFwLiVDi63N5ihuLXXowIGi7gADhplplUPOQalmL1iBZwSomRgvgEUDMrWWTSdoR5OSVHkMON8GkMHLcdzbWFiME5EVJhTLGCVtG5UZhidE/ZFzx+YQZZiqL6mW4zGbi0YhdZlxa1AsNLkm12l6xs9oayD7kydSH4g2P6mUT5pmFWfEEcEo0kyDk9NQ1LjwRZcOt8eIfQlDRzfMMS9uBbPcCJwwIkWtZijqIL5OHiuKlcUeoAiSuLg3MKdTwqR5bEGlWsCcRfQsJ4geigzFepYpJ8TXT5E/iDA06w/1F6/ImI0+jCYW/eB7zxZYMBnqGL25mWU6ziJ2GX3nzFzXoz6BTCJKi1gAMwbQtsgGCuA4yGUETqBxfC44OKlRMQ4S4Qi8YMHou1ALl4CMAG9wkZnhvqZyz5FfxN9KGDUob9/aWUNeCB3U92feDe41yxt1jphWkB3NCYg4k1kyiHD116MLIR4vl8Iu3KFKMUzBCYiRNuyB0j44ibzLxcuYYKVB7Js9LuolxY2qgeDMWMuAZ6IXaJrwTiwhQYhmlLly+Llc3HJnkWSiXldT0eYPJmdDBMxUXAxll1HDAUuXWQhKn7phKZRqCvmJUcykCNWWGWVWJY1MXD0yqZS12k2EUruaxcQIiV6jVYZIWDBZlNKbgwN8C2VLYj6wFzaZme3iriFu2a4Iw4E1BFXLUDCsy7lEshGD4nzCVC4FFcXCXLhM3LikuVEvEMcahwxSxgXGxDUa12Io8JEqFkQZPiWX0LPoPwEivELA1BW5tSI6YHXmBOdIZDPqy7a+SV3ANwgVXvZGYksSAue2BKl4Hpvli1lidC4bEMXEFsEPEI3lFcsA+bgJcuoNspMhMjMGMdjHELVupXpXi74SCmahKhh5WonaBWuHUBZworgI40EwQgri2JmsStalAolQi0mJyX5iQvN/upSrY3Fm64cSzXt7QDVPtHiqdLKSmCG5n03w8VTxc36ahGV4nRhBO4zcoIZgbgBHhvqCu+QiZlVCC5UmRVkr0dzZlwTCymILuKyXYztxXo64qE9kInAJF3F1M/QgwgMKEXdxwBcCPeVqZeOF0QkWMpsDTKGCEIk/dwT71Co+0S4qUNRWX6IaEuJwcHUwpqyFdzGDKlQiW1U1Rj2lOHepeXBdICBlCiEfUzXBKjiXGgya8wTP3GCMl+8tBKv2g8Z/JFPrJuGdMeLzXoIxxBl8B3EGoMo9KouBS3cFTUV0ZYS12uMeBmUEGRxcwL2xMZLWjo9/rKmA/EscQi7CWdrhC1vmjsh2MDDfXRMECLPNyt+wYjXThg3k4I1zmLEjxmRRhl1ozBipRVMIanSl2QDZwsQl7Q4cEtdstvKHAdymM6j5csD0jfDiXbnsQ5Czs/qGQ08b5eAXceLjaz5jy+PpEFCFsTIRl8QNg6ja7CVK4RtIrRI29bpgBTJEJperK+0pYiZqU9QF6HgJXoIQhBvlgSpXoI5inUvkMJW0pfqGLOowWSpqXF5q4DRDBUIC7gWU6lOSFERYqpXpvkjDhgdyh3CKL9v6lzowhJUym4YZvl1uXWJco8ZuWCQAsYbzEGyYdQizf6pUWK/kIM0TZmBsjopgmogm5UqMqBKlQs4CYJfTKMRDEcF1MF0msZ8zBDknQviMMMxZth6blcdSpUMcENl/iYhWtvpck+hg6gAq9+pTFXBXKQlze5VcMGpcUg2XwE1BJTviS3wJlMRJRMeWYsaj/AMkE2g2wACglRPQkP4QZnPEGLWAbTGhNsA02Kt1BINuL+vuTAsQgpxUqVNQS1i6NSvUS7j4xWiBsFbjYqMI/CHZuK2K2ZvzBrZ7+YW1LB4gSpQy/RXAei5Sty6IMDqBUq5c5PD+oOC4S+alRnyiwAf3qf8Qh5/qYpy/vgNghoejqDylVWh+SEuN1iLsthUqAsan5gWiPbhF8n8pLYphG+BEJcYSuCJmI69BLg8pAj6cOL9KKs1BFnrq4DgQxFLolEVlTKfMfRUqXMs1CJK5Jfe0M8EqL9wgW1VMk8BtBY1RWWVcb3Jf2YDSfs4YvuEubZjRvuBpAl1M9wxAuJUIwi8Mzu8OxmpeFA+MwYGveHZy95RADXFxe8ArMU86gViXcEj6NSzUWoqwEWxa+a/iHgrh4vh4Ktj3kxKMc8EZUyvtwZlQlcJKQwVwMO5lm+pQ7lwQXiaKXMSpjDHMYwAtlgvEaXdgFXK7ly45moiOYsTQupsKJfAxYbRZC5QfbcVxJ8QJAYiHUxKJjGPa27gBqLLmX02Pv1AHXMXO9h0rBZg3/ALUzNtrPzwRTUqVwPouLCVLGptj5SomIPDymK3eeAi8KEVFGCAVPBwVFR5fg6JrBwTJqb1ytQwunmXBQZvAbLzXkhJf59vmIbHwZlXC/7/8AIB5Lh2el+0Maz4/7ENh94eGJZanc3NS4RDwR6CK8xnuBCogNODhfQ8HCQJXNcNlIZhKjyazCVCDDEC2o7BEpS5cvglxeBqOZqXLNmvQWAhM+HZDFnAxzAcm5htk7gNxNpgPeYtYIaKhBmiQBlTD7oszcxfnhD6JgWBaiERCOBqLBzFly4+/BFXU0pgrhiGFxA6RZ8GEVFwUVgaxT8k8I+YVh0xHbIUM81xU6h9YRYHHsuAs8cPqsaJTBXFdkZLaIGHiIJXmXEtzDEuHFSv1onI/VCEPQriVhuOeO5iljrjMkswXjj3WmgRatoPzGzGHxFdwHYfWaKMIM8sqWsvTxGUYWalzMBKrE1BiDcM59BHHCuuvMJbWiXMygUrTrhajAWLlyo4gcPouJbAmpcGb4siLHPTpidoM95tFSsTmN7jxk2sNsTxFv/wCxXGuHQ3LvXFsEEFnBm2Ps4pArEAuKWHDAJTMIUevRpn8vmSHX3fpukGLfBlMLt2Q3MKrqBWMsl5glwl8V6CLHmpUKGCXy6gVycDENTWdua4uVFXhyTbKB5yoKjx7ECuKpuHwiMySh3O51N9fvCwIF1E3cCm2BCEIEB+UQmsRV8xFimIdRlDTNxPSTkl1vQiqUwcJ3LuYmQKEOSKGYxnyzHJmXy9faY4kEdQJQWK0yzItEYNjuotQ+74gFAqptmHvxKDmKqfhKCj01KlSq5uA3R184tRNq8zZmeLc+SC4EWSsbKgYv2jSVzvcSo5l8CEFnCb4uz5mTcMBN8aTcdhcRKDU0gURiXGDFhHgjCERdzAlTY+zCLbOKlKtgF+UIsI24edTcqKfCP9Vf1CmkvzGFFQc4/DLjCmHvxXfHXJXqXi2INwaIbYwBljcAYwlHUUNy2ISqlxl9u/pC0OV5P4hc0eXv49ohgvaW+cgqxZQullpm7tynhWpVkM74oTMoNQionimUiFRJcqZ8IlLhKnCXyepmGMCBDL5rhBKYAXjDOa8JZuIYMg/+AC2piMqSt+SNPBD01xXF1CxLhGX6SXB2QTipUW0IcBwEyYE0naVxvgLzwFTGew8wLlVx8GguCHqdOwiKIG1kE0Q4GXCGoQhLjv7uSE+SFSpSkY5movoal8VwGjDOBFiXCVNS+EfkTAUTQoRE4JeWXcUWr2YaJHwt/qMPQblVdkXQK+f+QipvxE7V0+f+xgIogwn+EEzwkORjFlxV1AXcW2WL5RyLlo3xDqNS+KiXuVaxL+Z5iL3wHzlimbwnbJ7yjZwIxheiXgI81BFnB8Rw8OZXCqI+oYsJRuKAuGKtH2jJX7pgSmWZnVzBXlHi4R4CPPQ8TML6GGI5oh5EpbZZU8d83w0EoT4jZLiDQnlU6l+e6XAvLFAgK4t9f+QKwQ4QLlxplCDYilU1NS5cvikoha9IV3kgykrHMvAFajwDM9TLtsTc2gA7fRqXyQjDNYe5h5hM9KcXcsDtH1Va1EQvO2A0mFFxwwj1ELYZlw3K4H03K5JRshLjbiVMkv8AkgwcYTyeFiWWjwRziGDhIxGEUrHCIZLmMCLTUv01Kq3rghDk4IcEh/l+pXH5hAjhhPMu2Po1Hgl8UVYCem9eAFsaX79ligCjgl55wiBvLCdAGv6hJKnZ/UrgtUGxi06t8azs/iDYPGeL4RkwoEigtiDw8y/d3KirUuoN+OpuqPQS6JXni+ElRKiZvglQQ1GMfDAFCFlEbNQAxw8XbLTBC9sfUtLZSsnWeGR7QAK425PIkp0MXpmUHI5ri4HF8EVA4rhqUYXiyXtXmKmUjK0ECpUZQiICuKmoRxBdypdRB8I8Vyi3SDGahQvfivQaLDZC79iYQRhghLZiNVaxHaHiXHEsM0TN6wRN9oDgMfQcXGA+SDZKhKjzWzxxlDZMcTKmUOiE1oldeH0MI8kBvApcs64VcXmVCXcQWYe0A1KDBbBDSuYyscO3BGVFEcJDEvmzBYiml3B8CvaW0GNsS4PJLmnIcHBCVmGII8D+UuXPzCDmo8GMeZyThaIYOLl8OC4BtnYRC3L7x1HTTgzwwF/b8P8A2Jg4NYJa5OxmST9yYcfzGXszV+0T4g37Ra1Z/LNR5q47DMGri3Oo0Cp7xevF/wCqVpRGKiXl7YIvfN8VcKOLl83UeA9AjFRmNupkqIg/ij19nZBocMehNIXt5COOXi7MHGIS498feGDi4qD3jH3itZbhNjXzjgJUYc3wLCZ48TBLvUR0agqpYCQFWBKiJAtmBVZdQzOMGor1FNs7GJkODhm7R+agQVsQG3+HbCLUcEuPJdWHUEckTfi+VrcR6e3/AHcCoyjsitkCNQ1CUGuLUjM3eINLYKWgYjLPlKjK5vglQpuDFJSXw8KlszL4bFMEqmRBjUhliLFyqy7mHjUsiTNxCCx+aAOI31CjOoUuY0alJmHfco2RgJFNoagniEEg4fBLEHEGJ24uEbhMwAjNQQWcEaZlqntTx4lu4QFcEYuQl83wQ5IQxBKi/l+uKh+4Q4SMYwypdRb4fDgmciE4qV6LrgnvKEMEuXBd9yv7ir5P+QIoZZsxAqBga88BMMV9R1Rhhws9PMoQUNIgRoWZ4GBbJTIMRBKY+4F8Yl0l+8G9mELvR34mA2jyzNjfesygZXuYjKBZ+0MyvUiuYAcLDhuWynC11G4nCy++glz2J797IJuEvcqolvC8XLhEicG0QtjgCPWYR4SCi6mIaYmI+DHZ6YTYGvjgYoR9C0RFOssoZ4rsj7c05swxwijx9RLMO5UJuWGdZqlwW+GODgY8VKjSyaK/vG6716FAthbt78QjqIy+LZepc9yfyhAx+t7ygpN/R+IIBiO2d/aDFRfiLV0nfTCNkeL9CEdISyqjDUG4ssj0Jq4uClRwmxLhtgYpmGiX74vrgzuZOYmCdT2qZouBXjENDhlCotbiDhCLxWlagdxpYj2u2GI0R7xCGY6KmFRiVohG7JWECOpUy2wwcLRcHoiQQAcHBlLIrhoxK4Dg4IckIT93P5RwvgxjxvkInCCUz/BqAFjL8SnuBwvDZqbMS0uNawRgtpHioQ3lv7kSYIA5eKCGYShvtmdNwLKbyOveT8+SEFRQAWzruImySuCXUb6fL3jFipQUuoKmEKHqoJQuVdx4/qWA9K0QUc1xfoSGJUYzSGSdesFItf0x8xzqVxUqPFy5d8pnHAijmriLhGJcuybmnMIE+EeKl+hjLXuBBAzXcTgm5VcpDYgcCGI8bYmbIq1sruAdUYFhgVZRp7+Isw4L7X2gFEfSR2LKU4QH3j0GqNQE3QwIkpQAkW/D8maEgVrgALMmAkhLgBQjNuPEvg2bOTiogKZZipZt3DOhUoSWHgMYKOSE2HEs1PwitseDM80RqpxLMkrg5eEuViMQsjo+PDCDaomkm4/pL89zEl6lhWzi6YajglPuYMMEcKVcSiNslUmTEsJfi81KFQsmWT6QUMe2Il3HKZYQtfENiv1hDu9p3mn5iZteYZiQZfBB4IcCOIv5frgn5UXUYxjxbqC3TFlwY54aC4uJiNS2O5XI4m/SobgjmfCxB4lOqvTLl1EEIo0JUCdwPvgl1RWy4gJbEBj+CGlPj+5hWUHbiBAm6coudovsRKw38RAxidyPfqExCblyr8wI9ogwlq8QB0pcGwY5IjavwMuGYyobEL/t6gjk5v01FwYkSXTBody71wAJTBErCMrSoXGLRuL0Ey5iyApaCtRcESpcYjJKhw5mIzcYSoGUYLSzETBnDBuPF8VIlHqEDaI6ylO51BjxccJkprgjwFcUexMB/MolEJ3yfiD0EBCz/fG4EebrMBQdzqEq3M3+uQZkXiM/xQ7hwLF4hqKWLvePAqsH6olSkqGImpcyxEpiUR43BsuBGERFZfCXuHMrPEpvUKcxUOLKBukqEw7DLnmRCuKOGBK4eXccYRijylzSEB5JVRUFQjuiG22eo+sGKLEXKXLiXEtyVZnh3KXU7JRYUsmDCiAE3CxltgvkiCUx2HUEqVA4IQhCEZ+zi5+UQMy4xjHi5J1TKmSDFS4jvAqJSiaUQ9O+A4YkoJS0FEaGMAlTCXQThnrcfiUdQ8cVX8ynZY6YZkL26JRbHOf4gjs+OoNQfduAFCoBoi0XGez+JYCzpigtLqVccuYHSfaXoy9Pt/cZPdGJiHFzmXMkdHUNcQMMYqUFHEIWrPDKai3vAcAPuzKXuX+tRmRI5f8AC5/xCTV0Lfes816hwxzECudZUK9xhcYlMxZYJuDZM8OZRVQKxKinUqbXMG6iVBixIOByRFxi53qMetxeES9pQuEZVwoXIIy1unxzXAUoj3vLHgIC3BTDxfNo8oAKIQIk1y4loVA7juXWR8wQEFi7l8EzzUTGZd1LbRllU0QhM4AtZZTzbk3K8ADccDcE4rE3CJQe2GgTUcm5VK1GEq5mNM2Yrh2YaIr1cYLqOly+d0Ux7cTfFQKPuUGIlQlwWoEsg3khGEvhOCMG2cG+LxCXL4hckE7gitbfH/YQ9EAGYXeISdpUrhtCSpeeFVUByOK4JfBEO3Aqu4PiEOCEIQ4Nk/ZL4/OIEYxjUeWEpHWUFkpqJ5hwYnsgcjcA53LmUZ5IUVBqLcoxAQnRDHy8oCsPc2viFFEBQHLkmTAF7eLXlWixqG/EsP8Ag9rjiwX8f9meVJ9mAK7XtHwlpg8QFpn2WBuofmfjHr6wcAr92KVqv+68wxED2CZ/y2fvmnYyzIbFdfMQ65ogIDJorrohNqGz9kOalcKEYxSvUGkSkojHMZsTssQVp3K9FQYt+gk9wYd09MKrI3YEIwxTzyTG/dALuGDtIJ2nLKMIKK4qMS6uJUsiam8yuK29uR4G8RJcdo13CICo9ET3lUU8fP8AyIqYIRDvgjzfFRwRXBfi0paVKJ6S7p4jwR0uJvaIFJBZaIFAQj5iI9QxLOtkxiXcqHK1BQge21kSDSmu5VFxKE9CS8IDg/te8QFwp2mJgqOebtiWVBOnUGyz0EX0O4ETuXepUrM1wEq67gwu8QHIXBCmILmLVLm+a8ay4jMpKV7wNDwnAUvF8nBLiy0l0enBCEIMOBGfu4Jj8hFGMS4+II8LlwFCybLagDQxfRuMyiS3xjUtRDccPF1GZAUkX0yM28VuDApbm8QkjM+cStmJxl2MMxlgwVgDpYyiYOLxHigDvkLTfvHpY8kzl4qDAFyk1qFEJQyzLBrox9d4lBqUMHZGawlWIlApuduL7x8LqiAtgYP6+8M5OLl4Kx1mL1EjGPCRlG3BHhhi5ZMe4Y3L4YRqowjwcAoGzxGPZxuYL3gzcSJVuLS+0GrKFmHDqjUwOGpcvgyiEzKmnha4GOhjmDbFstHiAoMQUERJ/wBpWCupmTY2k+nX49D6XzDxbEFFmDMbVSnazGHt36EtvglwckUHaJHaV+YKK50guHtLlxiwzWWIzdEpUtdTeIkWpoqEHA4vioThHr4RAbg+JcqJiARgCmW6rrg4v0ZaaLS8LXi4hkLlm5c1KBM7+0bYFa8Qx6Bux25eEEpgr1uXFn6QAUQMy48dI8HpCVK+NxWV3yYlwhwcb/Vz+ZDEYxvWiuPElcbgQLPUG+FxiXCOZUwTKaeLlCVSyAeAjybm+PajGwffcXPaUpd47IedI7hnMwLYDSPBK55maupkDnLi+K4V7L4YRtjfizx1FriYFQm3g/qDNrYsm9ckqMAjLBqYvzD2sAFBr46vyyheyAkVedkEcAwa6mWuHhjNRYkeGFi+d4rm5fFwo6HCyGIjGYYYFFMJU+I7CQYsSypbuAJLJULL+JpNXnuYIEeyMbJWvpMKq5svkiouAoHcivPaDEA6jHTUALO+F7pEaoRiagWVGccNS75vmglC418UEQJa4Zg1A+h1wEr0E0l4Mud7gRJcpZYr9AMKdRUsaRAiFvTv5JUnJuXUPUGpcODkRmYA2TM8DNOahmmEK9ZeiJcrgbaOW5nHKJlH0iEORRktSxfeVE4I4mVr3w2agRxL5L/8DgN9kdvXzCrKFiDMCxCtMEhw3M/uiTUf3iGZU1G55Xb4ajqXLjDCiVzuSCmIOPQtbljZjuKaLj3jkqv1ZY0IPzLl2T5JWCvmMXcSXVntFINcpKZjFdTKwq//AGUKuXcTT14h1bivAS5cA6iGO2BRRycXAsQsMwMTLGaaR2FomJca8qA/mPZDPwSMflO+U68jM7jW/rHghELiEqMfJgGIuNftN8Fqr2Y9hDdRPGuA8M6MSxLi+IsZcudR4Yy/Rplw1J31BCx4OLEOyzLDwmefMuGAbjYJczyllRvSMw4uYgpUDWSAOIenSTCV9nojrI4zGEqVK6ZgVxXG2WCwbwhqe3UMTISYg4rL4IWh3DjU+QD+OH0LUO0VhWixYSxTKRDMdcI2ga8ZqGS5cCmI603HOwRWXBl8bIg3cDGWOuDEpEnEAYnGYpxNhxk+JbqEXBKhLm5a0MXuDOrg3K4Ti/LCXDWeLzRKmvTbR0/zAoqBD0CgiFrmTUVgeYSoSU+bjwzImgWV6zi6LYsoTqDKB9pSlXxBRldwsI65MaRSlP8AWXpDP6lxY/vEIZuFQ/EYsym4xBalVMRrOxi/RA1fiXF+h6FdyikmTyNQItFsM4YFohGUc0hguyZWq4L0Fj17+r7+IUPSIZYlBR7y+b4qVGZAl3BpBpHtqBHm07/Ua5LjTsYQjyS474Nu+Dg3TuuoOxq1/qFukeIVb4VohOn3PiMY8X6GLqDzNoSnnUwqPxDdJ9SodyZwfvDLBiRvGbnBzLWMA+6WZDS1dv2mQcnIPMY9Jllkog3a/SPEp7bqCTbr4lwFrBcre8NtXHlLSyFquVFouXkn2py6hHnXg6HPUei7W4cMB7K/DDPujjlajMNipqO/LSlsgkbijkilGV3E7QTlDuLmEgC4sc5M3jqIsIwjGi7UwwRmIjfMgkViGowhDueCUGCOIxCrfhlWlwgebl8hAMwzBxUFlCxLi8By8PiKS71BXJK4I6b4jogYHAm3F2hwxUl24EuPN84cMIw9LqNCbJTtC91AALidNcSUBj2wMdOoBpdn7IEH3CGIXisEUWMeONypmdzMgalql59I8Ss3AQh1CPcvQp8zHdv+qBUbRzOkUNxnRZ3ALRFWYN6lR5UHFE9z+ZSwTPXJp8MX+35ehayxujQ0efdhtBUUtx/ES2HhgAD/ADgNaTqXLh3TqZTshkjpZlW1DaHfBSdaf1DOY9c1O8uHF829iiVHbUqH9wre2UJ4lbdv+4oZi8JrxB4VGVGMqPDlQUwAUR4qFTaEr0IndU+0VYw8QEA/pBFI3n4mYdQiwiZbEPQHHBIzYwI8kQLY6VfJ3DO7yy2BMtktIhLJhYKJHTL7R1hn27mtoTIGfERRmZiDiOcSi0q0QehwXKodQEfYH9+mCUYlTFiVfV4g6gQjDCLAdTHbKqrhaVHyZixzBQ7fmBMkLpmSMYuBKI31E0MEZhsvhokGK4KgbqF05gWwsmLYg2lSztIIpBW4XlWEfFpeNX5PaUdAal+YRlK9BL4IhRxrJBuEeLqLzogkvUo9JHjaRz7QhDHDJuaYmy4Rl21w04uXGESZlQwzUuXwS+Di4hlpUwS4ZVhUrWJcwwYaxG/lGgNOklDXeZfnWT+YoixMBRGMYxRZkGDnf+4Jaj0ILcSUkFXQy2mBvoIGQiqDEA2KIA0IjTCu5kVLzMeHimoIYRZKZYTFty8gCRQcxHYgJvRXpqG7KYAUn7RcqOuDNllT5P7g4hiW2vEYJSM+z5l1xZpAZbZlMMyBVXLN9WcXZcIyi5OMLoGz5P8Akv0itWjb8wi3UIWNgeO5Qin7QMFagXbGINzpRWZlxZZLIEFPBAM1NTceL4uPFgJSkAUw6RvEuKfxAM2gsAs9pnftwBYw3LU+zAaumCaZjcj1ddSzZg1Bp2YPmIQr7MS7j2YJmGKc/wCv8zPMIDaMSxGWWFf/AFBszGDDLD4TCsB7Ut5qVZUszACJbUFR56HEsZ7YKKjFo+4lQgPrCCQFKWAGNZtAz7mZO4Bgjq4DqVLaxBs5qIYY4olTMrhBRuKZkoMRgA0Er5tFKIOoh44HFSsyioaLi5SwiLMu4So+i48EISpXHtyht8QuTcvk5vnMhwJeYB35ikGx/HB250wZWMv0HCVFRDC9Ev0kqalwUZViri3gI3DhQpw5W+f1LlEHGyyNUVKo+puCsBLikuC4IVnbK2zUHFckeCCzUQoxLx3BHUVFwyHCv5QNIFcbCFuDEbQbIVWghzK2Hk5eiKTF9EMH308s/A/mH+7vtj6McVKgRwHcoBah5ENirl2oTf0IUSq/iPlsajTqUJAyy337lmwJmaDDXR5hBccewgJsLE3a/EzBbluJEn8j5jT3xW5aTN7D5lzAW5d1wJVGZUS+UIGJhqF2kqFtFUEMx/aVdf8AobeIaF8Eglw8STxMDuTGVX3h1uyZ8F/EAl2d3Z/UWYD9ftEw2IFWPaUw5dT64BlhdGQNWQg3AsqHooCEKFfaVjJdEWvREA9ozWACncvrh7GpuXLgRBUcCAAqEqMuH3W/oQsGIoAhMws/wSvWftEu0j1NxO9sfNKGSJAlthrm4HBHhMcVLlrqBcSo6TKYiXCDLiXHHaYLZUUasyhZlBANNveXh6jm4a5mRKlzcrmuGRLSKm1QhE4vVkGy4srB7+phK4IuFsGP5S4uWBbLM/r/AFErlHtAI2WDEcLj2E8ctWeBzA36BqXcYDFZ4OL4InDAtFNytKjwQEb0g/mEmIc3CFnC4L0+0wtH2gGiMLmNO5XiZOv6TYr9po0fvAGkH3jgyvv3+IanuEJcZcGOZU1okUJSqlTqIFMrBeJZ3CzD68uIHLhCAFFvwe8U2LbLvRDBFRbL68MBYTRLIB1Ll8DDjwEciPC4r9kFiovjPSS4l4Z0v+H08TFHjXvLxJfUMjTk175lEUe6x6mKB+4bQEOGBb++JmOmT5hF3h4BOg3PJixY2xUlEjwxeLl8vpWoV2GaHDYjH1H34HqBjmz6sS0HHZ78XwjXynT/AExQFn12fMAkbdQKjkBLVXtPbzBEsi4SAQWmIKVh6mGIw561KkEJR1jhQpmB54QSmZ7b4FYdbjmxRKLW2dxQgjqXLIQdlo+sCk32/MpTpii4uX5i7qfEuvaOvZ0+f9/sxgKwwxbwPBMIsrIGJXJFqCOudw1CXZImmLc2ZqANeqrl9MMQ3Mjg/M3ZmGKDLKrlEqGJUM0l8E3K4XnoQoIJcuEZtD6hVE9BrhmkuXc6GsH0nnhCTRKza3e7/wAhSSb1/wCJa/59pVyxtIypLbqIJUNFcCiADUr0HA4ShV1MmYbqXcDgYsCGGinXmVgtfX+4JZLCtZGRbJKGpcHi4OYSgQxcuLGXCkdzTLiyB3zfJLhBhZcSBHWdQIpUqO6JcMCVyy4M+pFmTcw8wXAB/wDz/v8AEzxY1QF7G4tdSw1BkET1QLp9Dj42DsxGlQqvyS4E8scfb0rUFdwW3UMTtqGeNmDAX2hjUY4IsIQxEuNQ4obiPxCioxjMI1zAhXhlSpXF8sUluiUvcCNsSyPi4RPT+JaqJiUsZdaxBNFHtuK44WXxUUC2Dsd8LRDS+Ue93fiJmg78wIUbghsPbEEkIjnjRLEWCGdrjTqZfaL6EHcunnKnAEVCKgSlw8I0jKb05fWXAF22v4m59rBM7ixtqXh/uAfdMJMPM6YEqZO/MC2pgPaI5XBUvionI3IZOCMGXBywhukJquyXxXoSyKVMLEN60ncJ4EhnJHM7eiAuai8MIxLIchqDcckqXC8piqoBV6BHHF1whQy/iLant/vrKHeoeGD95ba1ys8gYjaBWWvHUvHk6vxABRctR9od8uquuSMZZKJT5mCgJ4lDYxQmkMshQ4smJWFG5W1suMgwxGwfJcaWugY+pKVv9H8yxspAS5cUui5f6ORXMMSg0svi6c8MJhBR604Fb5ZcW+DbEVbZJhIu+GdoPMTNF+WGfgIUWKgCsObqB8DwcYVuPgPrAFnDsuiKme9e0rZJat6fwxkPMbD0M+Z0YXeLuMTGaNEPA4n1Xzn0EeAFT3GcFdRrrgxjNKlURoK9BHkiqpQ7lBrkjMAnOI9jiZfJiIyKgIpf1zUOPwIaJxviDPBsJpYLI0CpmHgaUNi5QR4rgjBEguyLEdTJhNozshCEAUy/0P8Av9/Rx80QUtMkCiBeWVZdyuVyR50mnoIxUa4STse8OCPoBUWMYheE3iBCVmw9B9DsjxmyM5PJMwQMR1MlcYcXOox2RmbAxVnP9Jcb2IAB3R9FBgqI7JbMyypigC1FZ8xpNoZqDb/wuEES4LoxTBN1+YgEUZJhSAdkpBmCCAFMMQO+ECmO+v2nyzAp/wAl+7dQQ3TSOprNka3fL/MqCWpGocayogw1UwtM9xWWw7hw8kfWb4Au4QNMwjLErJCJGkOLKWdDH1jrl5tKNR9BEjaGuGRsNwAKITL/AA0wKx0A7j64yJHFs6514eDhhw8f/8QAKBABAAICAgICAgIDAQEBAAAAAQARITFBUWFxEIGRobHB0eHw8SAw/9oACAEBAAE/EDc/cJ+w/mazQ+Np+1D4f5T4z+GbRjafqP5n7L45Th7n9k/UY7jv5Tf/AM/3pqn8seP/AJnd6n6L/E0+H6M/6PU/U/xOfjr42+NPWcoQ/hDU/Rn6sNTT7fxP2H5Go6m0df8Ayb//ABD5OPgNR3Nvgjb4NxK/+ryR+tNp/K+OU0hqfqP8/E/an8Hwftp+5P040j/pdT9Z/c/Rz99/8H94n7KfuT/q8/8A0L+l/gn7r8p3P1c0/wCmZjt5iNoKxo1xbVFE/wCQz/iM/wCIz/uM/wDDYX/4sAwUKpxzELgtVhj8xpLbDYQ+qkqjevU0hcCcLjwoHUrQ+2llmkbB+m47AiPPwam0dylgYe4Wny/swMS9uJSmBSZLjiMCrFYmbgYgQ2Vg3EV8pQQ2yn5mmO/hNIw+UxbgF3GxcyQNt6hYO5ckYgbUj32MMAiauVTN4U5giHBcr5qqYp+43MDR1AFgHMM4uIKXx/UHmiFHe5rBpi3GcGBaxS3UpFvEEpnD5WIiHUBIcrf4j4jMFm9OmcpEHXxXyBj5VfOCvGYlLDUM6zGXtMdxVp+mCW4Ir9xYW0BpO4svEoMOocQX6X5lJvS1J+gWG5yg5mDcDMlACyV1pBwFshYKKYn/AIk/8Sf+JP8AxI/6Sf8AmSust3/9m4r9xP8Asd/DT4ZP3P2ofD/KfGfw/I2n67+Z+y+OU4e5p9v4n6rHcd/Kb/8An+xNU/ljxNv/AIO71P0WafD9Gf8AR6n6n+Jz8dfG3xp6zlCH8Ian6M/Vhqafb+J+w/I1HU2jr/5N/wD4G/8A4OPgNR3Nvgjb4N//AGeSP1ptP5XxymkNT9R/n4n7U/g+D91P3J+nGkf9LqfrP7n6Ofvv/g/vE/dT9yf9Xn4HH/xf0v8ABP3X5S5n6uaf9Mz9x/MqDlPc9X8yvn8wH/MB0/mB5/MW+I5Z1FVLl05iWKkjVFFX18I7FHwwKNfl3BSkwELi1CyMOe4K4SrcbZlMIO260cR/QeUKIYYNkYWxVTNzQIXfUwAtsKvHUolmDx3BEqjWLK+MNYlljglpbKgkHmJvLEBzDLx3Ll1HllEctfmBdCppJUAU3d9xN8HdcTAYMueoa03i8Qgtgj7iC7J6jqVtYUfmWvKUJcSEJpiZIEc6jQf6gcrJcsOpcMJWFWxtK/Uscg55lDQ7D/MI49ZRM14lZv42fBQiUgiEsirbip4eGIF3Fo8+pRDS3XP5+AqIl3LhuCmQYtuI6/8AIJuNRXuyN6AKK8cxoqDbkDG1+YuLUCD+URubomWRWB3AxFxMgm6qAddoCk+YjTQLRAU39AGCaMVF0QzC6ZrzKLQL3xFVLXliQhUNq4gIE9or/wCpznOda0Da2RW0r5/+xzF+Qn/Q7ijhbJuT9iEaz+Un7yfwwfBtP1/8z91Kx8OHuae7/E/VY7iYm83hv/41P2Jqn8seJt/8HJep+i/xNPh+jP8Ao9T9T/E5+Ovjb409ZyhD+ENT9Gfqw1NPt/E/YfkajqbR1/8AJv8A+guJRDf/AMHHwGo7m3wRt8G/lqQ4/KSP1ptP5XxymkNT9R/n4n7U/g+DL2J+5P040j/pdT9Z/c/Rz99/8H94n7aftfJPj/4v6X+CfuvzGP1c0/6Zn7D+YZhxusSiVAgtlVKhzCxjdy5uUjEDEuGPgLcWyhphaehA5QpKXco9poaUn1zL3jubtZhVNWuLuoai5j3HKVvdwEDhipgEbnSHlmGDCxA8/cGIYx4Z10zqGQu2CCUv7hay/cwRfmWJXXmCIRK4iCzRlUN9Aa8sapRGNxzetY+DCXMtTHkWyMJajVISQXr3DdKrBnK8cKGmn9Qd0IKJtTxY6itYUVeTFqXRXcYmm0Nr4i238NIkG5mWRtEN6hgqw3HLQZ6Ghir+NobJUrsLmKi3WAlkumLaBauIdYHyaJaONQY43hnPuWcWqwOJUWg4uUPla2SuniMIOm2gP+hWiU4qNFKuYQ+3qBKG62xqPWoBjQgVXEOVCfrM/wDSn/pT/wBKf+lArwe4jIqbV2//AIDmKh7I/wDo5iix8bnuftQ3NCfyk/bTKNnwCfrv5hv3o6gxKwmk/osSaTf4G/mFTSfsTVP5Y8ept8msTd6Z+i/xNPh+jP8Ao9T9T/E5+Ovjb409ZyhD+ENT9Gfqw1NPt/E/YfkajqbR1/8AI5/+KgV8HUN//Bx8BqO5t8EbfBv5ak1z9yG5I/Wm0/lfHKaQ1P1H+fiftT+D4P2k/cn6caR/0up+s/ufo5+++O/x/ZJ+2n7XyS4/+L+k/gn7L8xhfjz+f+UX5H8wxNGiWPDDCGB+CHMoijbaqgZ/+CVAfuImYNSvcpDsqVBWRslOAIqxLfuooIDQNEMjogYXiviyKjyiGAXyXGJSh4lLB51DSaviMo4Wq9S8LtOpdvcdFkuLCc/Z4gDUtHP1HKS0s+RGoWzq21+IUA14gQQItaEJqIMGrgbratVTV1AkKSwip6i3opEiiLLsjCqokp8y3OKi+e4rptqzasDFbhigOMwVuUssw2E/MfbSc4hvRi9k2TIRWPcR+BFUSq1FsqVC4plKRkR6PY/mOwKTcYWgV8NrDFRG8QJUaaw7e/g0g3FLgzErfTyTJqKbL2uYo3L0vk/xLjNRC3hjVLEfc+9EMARQAQXRb2zNFCpELZbN/wDxwDNP/wATIn5An5p/PwLEuPD3P24bmhP5T5q2YkbQ/ifzP2XxxOM/5+p+k/BL+c3AuYPxpDXs+RePXwzfjdTd6Z+i/wATT4CYf9vE/U/xOfjr42+NPWcoQ/hDU/Rh/DBDR9v4n775bTWbzfyWmEyYXAlV/wDB1Df/AMHHwGo7m3wRt8G/lqTXP3PlEGzP5XxymkNT9R/n4n7U/g+D9pP3J+vGkf8AS6n6z+5+nn7D5zc/ZJ+8/mD83yS4+As+L+h/gn7D8xj9XHj3j9x/MucWVYEoiWMBzsW+gfF4H0OUsh5lWz1IlRyzXxdQviEImqihgojEITHfUAhPqFkwHy1ANfEFB0RszT4GkiAaWKTq8+JoaDARtJcPbOEV3x7hg0LdcRU8xLmUmIgYju93/wC/gr6AoIv+bhmVCuV8MZStGI5D2Xc5HUsCWYvEAth7h5NV3MsoVuFWsYDJ+I2cx/LC5W0XxEKi64l6zqjeiGgZztzvFy5CbX1Fttyxai3Cj8VF+AlkxC1TuDjUo4B4Q6YUgdtlPkihVC3wbHnLhgjNj2xo8PMXVajqXQYiD8nDERioLZcJArGoecPuXbiOG/MI2aGuX+/5iSxH8roDMAZmAqXWIZATKwDk8l/cxMRqsR3NP/xyT8gT/mOfieCXN/ufvw3NIMfZDMP0gywfAP438w/nSsQIrD3Bj7z9ViR3D8QgVB8Jc/c+AZx49TSbvxuoK+jP0X+Jp8P2k/5vU/U/xOfjr42+NPWcoENIMT9Wfos2mv2/ifvvltNP/moItzV8DU3/APB1Df8A8HHwGo7m3wRt8G/lqTXP3P8A4Q3Z/KlYm3wJ+o/z8T9qfwfB+0n7k/VjSP8AhdMP439z9PP3H/wv3Sftv5n73y2S4wagl+h/gg/Kw18LH6uae/8AKP8AI/n4aDPxb+YRdx7BwickOtrmNvhfJ0/nyykGK5DLLpbWXGEGGYlwJ8XcFRcQtDEzFpS2O8fiK5dmeWIdn8xq4HPi8QXAgWh5rEDTFww4UYOZzFioMX8RYXKI2ytmGYN5zGB33hUbEpbWo/8Au4YAC8mOkcaERQLuW0EpD4BuPMtquJbEWtIiqNLxKxSmC24SLVSq/JzEryAQLa7qJC4CAZDd/Uxa+p32t5jOQLusR5WuooJB8LWUEav4Qg/Mxa0NJA/olsODd0ja8RBeHmypvDRdwDt/J+4yLh3EuJUCdZmsTEHEPb58RFaV7ZZKGOkEYNIAi5+DEGJ+ooFLNVcREgXd0nUogDCHIxn2xNhyxU+HSCJNGROmyMCm23lerv8AUQEXJw9QLbin/bGDnLpTzisTZHGQIDb6Gmf99/cxCo1atWp4Mlf1WXUdzT/8ajlguTkhP/Rn4MUGbHufvwMw4gx9kP53xMkYEH8b+YPzppAgMPcH8/4h/CwRIYYGZVwfJv2Q4zbOHqaT+Cfxx1P4mfov8QfD9tB/28Q/g/xKz8HEJVwMTX0mrDbNM1n6s/RZtNft/E/ffLaaf/EtRb+KPfyNTfydQ3/8HHwGo7m3wRt8G/lqTXP3P/hDdn8qcTabQ3P0X+fiGvZP4fg/aT9iH8cCP+H0z98/hn6v+Z+y/n4azSfuEN+9P2oIhKsfFXBIfgfwQflYfhSP1cVHv/KfsP5jCowzLw/mGy8f1jKCNEeYKsS9b6si9jLp+qlJEx0saRrhP6iV8UVCv/hiwgYleYmIqQscu17IwqyXhqoTlQsR9NAlzJXuZPEyobGiIf8AfdP/AJFOq0GWiWwnWeRY4PgvHU2RChE1lYhEgrjubJ2tM/Z/tFUJQW2ENPv+BmGYJrDFRgERyuXmCDEcwl+EuVBdgOOYFx8IsQydMpL7QKKZRePcyOwZT1VxpcNNu1Q9LtgMVqNwJmhPvzKDnqM2kVgqoo3xL1eAysNxbo+FphyKXwDuFAGjKeyb/iCOPULLVv1FDF2gahjJLOR6lysGma9vbN4uPi+TKEHFREiQiwJUStSvti7iu7VFUUC2b9RlECocELNBuLYmuy30j7A0KvJTklBL2YgkHFjB7hXCl9W8vrA1CMAKgGApHUdzT/8AEyqvxMIwPMLZssM1mF3XMx1zFcw1ubnuG4QSsxjYQxcRa03FuZNRYqDAzqErhClpZc2TRAtuG41szJZ1m4ifC6Pj4IiWTSVicwJeOVD2xZNQYXZ8BTXcWXwkWZdAwsgtZhhiARvVdHbBHlANU5lraJunEbMoc3FppiF7mD4MRwYCQmhk4ZUgt4eppGaFqRsWzD0QQ+dCq0ghAraEzFZg1FZEGViLUW/ij437+RqX8HXzlAqcQQOIosCLUvMuo4hylMU3LR4jYpxMzy6EV3UDg6lAVgKIGkLWGWhunuMUUzJiEKC2o6lgRZoN23xDAhDNDUfEjTm5ninklW0FOR/Rct2cRhlNRKWBXUeq7l1Ytse3PiXKhYr9uD9RR+4SNUApa6guCpVgCEDQBS899S9cKtqZfDeqsQ4R7pK0sWIUB5IPaWgGWJgHYV+EtopuhUshLoHcO0O1Iij/AFGSZ1+xUQFC8kPGQi97I1a51ZQ+2Xy+KGvq/qPEn0K74ExaMWVmxPEZKT8QqgOdMFRAvu9zVbAMBwxb+YVNG2NfzLB4fywrsYz0WbJxk7zh4hjSaMH31/KNqeh0jFUslsGLcQwMQQxAWBzLlmH8xqtbe48oQpTqOtQ8iYUwyzzZzAQz20NfuKVNgy05W9Q3Y6Uit5cfUdILsapddR2ntuXi+I3/ANfDE8TIzmM1A69Q3/SCrviIbmh3zFGFSpJCcTM6Tl0JSwIDDAMw7gcQl9dStFalTiCWJVZ1xLRl5uDM3EFKa3UFMM7HuOxCw8in8QHlgaY+SW7lM0HMlD+Iaa7djZ89x0Fs2NSzAzHqCcBDDAKSrlZRSmtkuDjxOmMmXWKwnM0boha8OA4i3Fogq9GYpugpDZfiNl22N8SCijmPF8TL8EqWWPiXR8GfjT8LijQ6oPY5iS6asye1kidzNbg3FzqUXF7/AKYytc6cJUYc4TKDO51CzUXWLcSsuf8AnCf7Q0A5QGUFW61G1yhlk3QxBrUMFwzX/wCOIQhCEIUhiK3uHXHx3DTZ8s4l1A0VppVS6HMXvSRwjU0oVHCGCjav9zJChqBmOnySxgqP5TxFry15ERGnD5hKDkFOn/cVP6IjuJcqoApHKRpTb3OEFd9PUslIxG4UjJdgMRMS26iDuRJTKM50hZlgxActPwFShjBvu5OyVLS6VohxBSa1XrofzDcWJQk8BeoCidHceWc/NZhorbYUABm+d8QaygNiU0VEk4gB7XEAE0Ad/cVNzBLmLt0p8JMMbGGszbMEck3+KPiywmol5PhdS3M0jSXbDUSDUWo5jqZwxFNajRiLEblF41AVqWejdRLlT18H5CCB9kf/AFBU801GqrEvUZc4g+0RmlteZlpXVm09+I3Lg3ZC1oLvoIAUIo8E4hZBmUiQsCwQHQ9rhF2MQCz7Nx0kUEEYRa1jKBvX4lSwhOgi4I5oxKkz7bmRXbGoCqC2Kb2Lh6IoZFq7ZVoHMs0QmTGIuNYvWLKv6it6G2fARsQStB9gWAJPqVwcoUvt3F9EXeEUp9rcbsNrZQeHBg/EfFQ5W38xviUxioqbcmxMCiDR8Eeb7lKuhOLdkfIrVcuYENCoOkiVyJ3KtmNVkvqedMS2NvVGa9R6gV2bt8xUpYaY/ErMoKcrYklUW1wleZdJUeMQiqSUmiQoHLzvMaJVI0wpKINkHEtc1+FMqvRLrDYztiURwcDfhDiGjEmwb0nMQsMRfHk4JezoUtPX3EvupH4GtMIHlaxMMQco9e4hV06dTIhTNiWJW1EigyN2pjZaznUMHb8dYYUoVWJR6n1fCXtDQC3qGFKgqOApV68z0nJe4XbyDqUo3hMsCNYNVCVZDbSOKvcWDZqrCfqQYYT/AFMaicNxlLpthUQkJh6TH+5URMgtB6GUWhAxmPuq/lLtczvhEWuUOptIVDZcxdWD38ZklgIY70du5xEvI6Zd3G1k+mESMItxnqElh6JiWR3MiYtxMGiXBghhqBi1+oYA/qP+HzL8qaMN+L1+YnpafQ5E6YdhMcLYP9kcmlteoBtjVx8XPwoSNIFzaxrCcneFH3grArwrZXg2xBf6IhUhTdX/APExjGMYxuOT8SyAhAXnpDgb0AhLjlq69xAqEwr013z+Y6OtVesqzpQ+4VcujmGEL1+I3qo18dBgU64oqnt7j2lGxqoSqWKP7YlsCmEFpGh/UCEXPitgAvJTJjiDctlCDfwLs2uCVAS4L1biKWVpFlUS4iJmtws3Bv4XhHFw8fuo8CiCeKP3LutuYtIOFMZs4FIZlEcRQwzKksU8RSp4g5mAASMBpBSCb0G7FQvYN12xg8yqIrXYzONm5VgjWJeoGI2ZYTcWoO0GyGGCCURa1EimcRYHyS/g6ilo1LBAUOCOGbIlQfgASvc4fSA2OH8nwcEGgQtmOofEsZZuGiWii6PPxG4bi1HuqfSUGH2hVEu8xTtASBzi0m38/qLtLSn1vtqGSpAVCWe64gfYmZcUthYczaiqvwdy9zU8x6IpZbm8IALkWV5iAb5qK7KWbK/1fxtjdgVHW5QriA8nMpnMK9h2zrllCPlNh66h4zUWKaaDX3EcZyQ0+YtkDJdr7hANTd8jEFgci4jgpVrxcL+6JV/uK6LcmoIxwOfLGmlfmalUwtr3uVwsXJvb/MfGWrKvzKoiDbJsp/JUBje1Rv0/26lusRux0CqjJxUKBeKcQZExAzk0ERVMA0pVbDuNMgqmI5g3EuMpjMC11AsKTDD2YN5/9m3u4A1+9jyQmkAMG5R4fEE8zIyJwweQOACv87jmFGgAf4uX0SjcWCckzKzHa/3AdsEHkFSRVZd4lwcfwMMBs2qU3PvisgfSXqVsGtMSwG7p3qZvUDURqjuWvMJUSg2d1mNiINMNRIeDa9QmS12eWG4w4iOKWF8S8M+WLKu2ccxo0JWLiV47v5IOq/DnX4l+Vr5mERax1FR3BHBCFNe6kFhw1ZQTyJuDcUBytS3IPaipJaCyVZ/qfpxPw7I/5gXSUnDBuLcph1Bbm0wi03CKvweJVk2CYCcVWfT4jK1Kq6QePNS7LqSppcas0RoZigMi1cTCu13RqJcoIFKuX/8AxAFzqOxXzO2FCCPZM5fJbEdgUDXoqKN2DyTh+yIkAIKovDDoKis6zK3AIczNZIQq8waCCrLMRpIxUNr2/wASsuPJSWuBsYxSUhcyUgVHylw2+rlxMF+xIlyqgRPgtQtI3JqK0dQUBwThZRPSc0ZYVUA65mIh4Sx9zEiOzUZB6k5PqKaFI0kXSGtOtv5IdfSX93P3DNxLlIZwuDN1r6jaCoki3DcWoZiEwNgWhxFa/wCCIiwVmIHfMDCrAWUiy0sGFPhs3KqDXzbmaTKlUS7eIM3LBiRJt8gMCnxRFZLqBQCroIuMnS9Hh3+JlalxFs0+YPSaQusS7uFlfiK4b45nPqIW2NCNjFSoJhrmYeoBxBTAua/MjQ7YKVAmlnWpyXgge8VA4sjfT7iArNA2wZblUlSwCDo/Iy3JG0+ZrCtWA3CstUkDIE0voBShb+Jk5QVguEa7GDI263lz+SMqpGHjCy02+YqJWZEpGWJZquYH0JkULF1yzGKim6LxKlEoxG3xsgqjwjDEx5TiOALYhhps8xANmI7eIDUqF35mbUBXq/6mDZyx5gXSIHNPJFTLWnOoaITA52GvzKnOEv3BjdbNwoprXXtjwx1RAUCEUJvMvqA92FqCucRSDYNlDRCmFLRqGRTNjQBT/uIRFg8wFaPUfugjhNweVB1DmMfxS1XDQ4gAjJGlqlXogNAjK07FhiLUu/gQAA4HuKpZk0QE5mHPT0QV/uOab5NJPdlW4mW8zKv4lj3GG1TOICn1Mj3BBLNT/i+fgITB+v4GPTp+JczhKRXDS6CezN5i7hTFd8niJbcvHww3cC6Zg8VAWcFNeg+/8SmWRLh4Lwji9TaAAL2Vz6iIgChKL8sYweajUGJMQYiBrlUOhTuMvtCMUNA7lixSohi0oJXMUgWzQ+NfUVT4Q25XyS2Djw9mDU2TaYja+yJiVbYynmBRD4URKghEuCgtYKxWUswejn3C1gN5F/ua0YsWr+xnnRa36qGXVwwBS7Mp3MpRsvYQujH4gVKgCRdBtjCQLddvmDKNWyUuyDWyI1YzLies9Z6z1nrPWesVIv8AEYCZ7gnFPUs7PcTAhsRgsoGdo5O5bTgob7D1DpjkxvkPxr6iFKxGrJL01yR8St5iltw8tvtThi1lmzfsjdEz8JqO4uJm4ypYpQwW6idw6YxbBi1Et8SgIKteU4uL3Ny63KEhGxtgo+GXXB1FofBwckugUCLn5vEG4DgFrysu25cDFct/sRr1MJwvjmDdRCeWoKUaleojcu7biQu3MTURcyJkVXbE4s9zIxLr4rMNfBqGyPMEe7aL6F/qcLeqXfN2QuvisF9UQocsP7JuNW64R/zEwuuGh/Fx92it4/3NFlfURGbRdei+riLDE0+HBMuuZjAosVdtxjK7DlYxipQNVkuZRQ6MDio+oGhuNtGZRjDSDx5/UGlrSMlPV6YJWe0HYwdEeR7lwLlZiI1bLwQFxDjsxgNuHqo1Yr6TNAtEauZG1YD+1xhi9stvIXmodle2GNnRBRT3C0oPRdhA8Yt5JXqpopcvQHAF4Qx4sisMMUVrBGgGhIopfh+/q46Vess4i4glwfEdEo8R0WcH9XLt+HUbMoHcE6mL5uK0vvMTDR5vgynK22iiEwZBdgYNUAVbiJUJFA2FZf3OZQJibbPdHeBW9SpJYaFCcMJBkAsbCNyubKjy5HyRtTGEj4ax17ZQQYnEwl1c2vob/aSze2CmF2QPpzLMShSVqH4Y5ZS5Mi9QMDeJ8vzrNkxoCBePLysSTXK2F8v8xLBVcMXiNAqF8AoCLA11q4vTAsrMIBmIM9jz4eIhzz+QYr3n4bhRzly8SzN2FZvHEvZgJ5TL/c4JRRc2E23BYL7/AJgVGyJE/wCKY9EMDbDeJcrNCGyGo0uZNy93RphM/EKNQofzNENy/E2X6I2BVq/EoYMMYYKaTyQeXL2HEQw5Jat4YYFkVIsrzHOAWuiXRiuoStcFXLMBxRcNjtWpTrmU6GmnD48+YOkZNwZeTDR4OInkhLN4uSvdfmNepb2HqBXgyrMAE6UI1ILkLr6jCCzIGViVh+Bj0myMRwuS+vMGLsmV+HUFgb8y0lk0xDQqVklreKSuSNytW5aswo5gFsFtq9JgavQaDqXGkUdP5m1T+Yhw/mWCtdZnpnrnrnrnrnrnrnrijFfqL2xDj+JoL/UBvTsgQiruajj85+ot4irlzBvqpPyX9wPGXFxhaagLZkdWysEDKYCpkxmKQyJwwiJnfcQuyixmBrUBA/hjd5mkeYE4LgqLmKiXRgsTIutE4CAKKeUDcWpZBuaYuJhIHetDIwtvuVmBMINxEQYNy1b5isR2QSU09wXbLLrBLhn4LiPW7iiFotoYSxisPUEBMQhDkhCwlL8gNGUIFkKuolqLIF8pYarbulTC4g0DCXSC7EaR4gTGaFhmAi1pMkG+mMScuZQ7hvwyy++SbHpP4ZWcslIywIBilQDSezECUGpA91Fr58AzKNQmlc2s+pY1hicEmuQlJ7l1u5iBcd5no8ypAciVKioVBQYIhkwwVaYUbW+oM4hbNP8AMQjaZWlZWzyfyxXdxc1ZlOCWzasK8mApZEuBRNzEzjv1IXA2/wBfuVWywXSZeJvlrLH4AeJd60DLShYs/iKDSw5DhGDSOEJwZgo9yXQ5ZgGiZBzyThq9XRyUsqxmOfwY2pUm7NQ2KEBBhd5iYCwLYNF5hiMQ2UsDG+4VGxMECxSNBq9ErFLSPYvxmZHMrZAjmX/ofiVLkf6i3oIoabPx/ES3UTnzKza4b9vwgGFBBuMtSNDgoX9xxDgOrVWFq/RLV/s9g0eLYBasVUonjiTmvzFWZZrbiVQWex7Rh2eriGS6pxL+Gf8AFQekVUGjNHcCJ2PkgLlVarRZyTZ8WC4oQppG7i22FM9q8TTx5gw/mPF3OdVActQAp/zMcfCr/gxKVCGlK0W3cMlYixMWPiZx+TMcydxUQF9ajUxIWcuyo5VQfRCU8nUTySzvzHUGJDkiuwlHo/cUENWINar/AMixceP8COOaC1f1xDTjmqu7/EGW6RZjMOHihFKlXrmC1zSKGWOIbdQZ5WPWz+YHeyjuuCXA/v1DhVNhAgcM6gN+9y6n9GiF3s7FsgKrci1GSlxlLJ/EA+3mCjTsgXFCbmNQdZry6ll6tgFPmuLiDgq+b6iqvKC4I0wMwtLYR7hxgvCWBHWHkENKrODYkKjkNcfAywMSlwCVIt0RoYAyDPN+c835zzfnPN+c835zzfnPN+c835wxs8uIL2cFV/lHjfRq5e0+kliwepaBLFtRm25HhhYbLt+ZPJGfciLp3HDDMZbBgtSTCE5hDpg1xBcQemU+uqukVU5KeyCGravUBUVXEDEoQtEuJVmZ2TDiGob75JUEprtEAjR3zEgoSsRLixYwLIHFDfuPVZWD38bRLgVBhO2SYYgjHqbwwXEbhcVkocE3fcuZWagVGniZeZtCxKL18TLKSN5XL5nBWGJZM2uRi+UNZjfJX9w0AtObmFYq74x6IF5TjOKro6MSkJTkyMx+GKxYlJBwSENHg8onStJxLDmYV65lCYbN/PqBUXMHEvMR1LO+LhnYXG0T07kUGLh0nTbLvL/Mua2OZbkUwAUH1HcypSaxuOEjFmzyTAAOJEY3n3LXQwQ/MRiuDb7PuMRg5Oo7TZECjySgB47BSk1qMDiE5OZQOuQ8SgCGyCZcY1yNr1DgLChWnLFCNcm9wCz/ADMRM6zLJU0/6GJgpYphNkwD3MrTC9QNNHcoHwHiNbfa3FVtbg1hcjEo6DBnuXpZ4KzbkLEUxtMuYBik87i5Lg6I3Gb5av5lbSvZD9GZZqVGSmHRM8OfW1DTA2jfOqjyWpO0Zt9xiandEo4AlVYsjgwX9NP1Fmtexz6gomVpdcwHhHlly/gq0+2KPxXI7yOoGiULAKKaaqIIKugmzejgRVShGTW9lHMX1gz0G1i4Wjbq1EY4/ES2QAZXRNoWKZermOWCZ9kZnljyRGELVh9QIkrTzZxFrJt7Xy9ysvmgJ/mbrRkCsVNe4xzMPYu4qjXSog3GCU23HZuVQNzNzH/jzNvx9/8AoYiqwQtHRM/ciiypwJSTIhXQp5Yl5/cxOIQna3KGolkaxCviHNGgkRNwTfiLYu3L8JDdQYy2gcsx8LD0Ij4gT7dR0p/MFfJ5Ea7grsl4zKpF90x+IzHpWMr9nVRtaQVPVmGIDQ2ZB1KbVSPOJQkl2cIcCuXOf3iMWOE4YK5TFqIg6HtECKIyYmFUH7PUFoZlOPwEQCxMyvTg9lREWyQ8puGreyFSJSYRgXDP0ITmPFV3AWUCHJ7hfw1r2fTZBT/MBDkcjLa3cQU1LmXaqCuIAF3AKvqU5PMZkVNqxL//AAAMyA9wNsGzj8S+DIyjHqov1bZXpUuQHhx7lkB1iM2HSziDpaA6OIFgs0RHHcHfEvJ/EalcsSYVBwQkzA1HD4i1ibgpZx3LtYqJgRSyZSp8CrnTMDFv4bSdKiZOFjq8wrmDUuIMLCOE6PhXG1cQkGKeiMOZgiWh0H9kFKAKNq0nEoB5+Fv4u9MjuClytkuHTcWyvOZXmVBaQ2Y2LpVwwRhAZRWDReIIUd/DqDUdSlykbxBHfS2vsT+4jS1e2OUxSC1aCO5SAa72/FXLVS/DZRGgpE5GZSmy+3Of2zaxYjHoGAWuzV2pshsOlzbWtPiPUg+ZkuDj4NzoH3OQAhtZ4DcM0cY5zRfrjqMoVFe5fcuiZMNTaAxjTmLmpWNh7qEWGxREeTpqB8fqYYA0q9BGu49RsWT4oKttOiVg6Z6uZEW+ZcWtwbCPJfmBhjpS/ksb4xkD2ijOY5KgsyHI+iB7xhX1evMNGZKbfBaqYpfCiD2F2w4gK0eu9v1FFKUuWLUuOJsm8HE41jyzyRCRUi4b+mo9lKFNbjBKCL0czWfXNUe9EBihlX5jjZUJa0fxKaxPY2LlV88YmXx7cBLkwghBrtgq/pjKLvNClLFMIiM/s/cSlEDPFH9QnQdRBBU0BzLvb2W33/iFAqCNeeglUAVd7MVz7alxyZRvzBvmGqmyQxWPXE7nVXHmua8xFvX2hwlOfbKgH0DwppJSIljSvC6hTaDkzANridKLHqFkTC+fDM/Yq4RwIycqCEkracTD3N5HmGav48r4qGFSyU0cE2Qf8xViIVTktxdwaMBrLuWv3NnuXTOPfwxXqbYwV1LBBJCG0NS3nD5ADO9viY/Bg4VNUU6iY4+oFhvVb+kSijrMyS2AC1fE8YpTcshGzsiU2QbdQ4WMLSiM/mLPKLt+Y/kcSunmUFdprdb1UMBQ9VP0SKmUtIgi1DlDy3KKHMJI7bVl8de4D01GJgphAoLhsFY20H+WM4gLNBLQvTcfNOHRUsuraBFqS0l7ZX4Y9ouLhm3eKtlBYShHJFXEPhLl8s6Oz5BI4Fq4swB/UunwgTWYBYuXTRAaUkrgFWgvIRAaCgzL/iWhl5YqINwzGqD1Xj7H8yz1MtW1XFibqlPwClY2G2upef8A8m7gtGh3KKM8jcE1OCz9oPJTibdQNbSwdQzNmMkEMEPvywx6rwaLTHnPsoS+tGaePUcU09Qlio5c5hYi3mGvgygy6zAIXOG31K2weSEFCrIMRsZZMo7odiKGncC2pgBoRXKlbZY/AsjS0wwolVFIpWZciMq6xLfcDER70tBysqUStaGdstBM5KAvH4lV8BcNxMMTg1LwVpTAv1HfVPUpHMq2GIlywYl7zGSEFGq4vtlzo0snwtS7Pg2zMUZqK1ywJrE264HfGIq5W44ID1LCHKAEu5TL20hx3ArXv4WpnNbI8egMjzLEW2bor7lI48DbLpjVHsl3BV5epgGdkb1V7j0RKo5UG7ur/UPtmvFyP5H1FBUS7LMy6ajQl0W5bbWsadRMa4pTKRGsbbFCF90LgsHtUHZHyV7lmlAWuEMlcanES4KFXZKpgbF9OoaEKcEOrfJaZVZeWst6TEIrzmf4jM6uAn15fqK03A6PUZ2XTL5mcdXR3AxwNA4f2MI5V4g6q9OGUZBjG0M5T8ZoaJQI3IPBCq2opp+4XBqQ2n1Llah2235g2J0DEDLn8ThYApTqWRmlrBAIG8t2YBDKYDLfUokuhqEVQIa81fiZ8eLNl3zC0kNNFrWPcWWHwMxcoUuUJ0tygFbNHkA5Y8bIEkHf/dTAKol5s8iHiK3ccG9n+UMD0jiG/oGWUDlm7Rfq2N5URtWI2OBvzK2OtsezyQynLpezxLxvyEtkDldEAIdwsPKtxma20K41M8ctRPWvno8IkzeckeG/6lt6dA6zGqmc4eoAGh+4yjUVjkM37ZizLLOKuV2gK3Cjgi1zDQkFxGCCqBPeZatwmAwypLqIBb+IpUrqLdcCDC/EraJsVv3B0QsGE3LGqd1/iFSpcaqLhTn3BVeklKTOE8uIIYC6bQ3v1LlKv6xCZukrKKY6ZdGhZfT0XGh23DX4UV0wRrL0L/cO6SpgrxhiQXjaZVio0PfCfzSbWE/2od1LQPAsK+7ghtsSI7jjCQ/k/cRMy2hjqou1z/CRxHKJfwCIBl3AKlVEPYZiUQ5hYx1SjHAvR5gHLKu0dzgOzOajvsvyMa8XTEQ6WrvEFxsaZxiLGYiG6qJcbhGioEx7uCr4LFczoXKZLFcRyVDTBBLdS3Ut6l+JfiX4l+JfiPVQQfLDeVTXMS0N3Va/mPNSriOsy1DAk58sKwTK3JNMxxywKm9NwZTtWEDOoDCdwVDxuUdYGF0mpFoiuXiVnxAlYlyVPiZCc3hiWu4egl1iFWNcuiKGwlU87JYxfuJVdlHwFPwA1MsksMuC7qMcW6pXCmVTklRiiYuDRWtXX1AafBEQvid26HbuBxioQatr+YtOlpvUyQNlbWQ/v+Za4Be+Bcw9vQSrilDk/NwRZwawEtQI5G5QZjgL2HH+JhuXl7hv5TESoquE+LjqCiqSg0xghSIJmyzEjLzW4Kwwmr0v6Sm6bT+LGc+mLZ8rK/jXIVeGHlwqzmHYovEtcCibxb18Ebm5zuvEOXwIVeGDfwJWlGkhAhpptCQPtaKj6psZeRTbcGquMIvzSfBzDKBj4OcShuURpYi2JZIiMtxMBcREdVt5+omGHKzfVEMuE75enUEUUSwG2J2Kg2Rc/EtH9OoNrC9pUFch0XliRKrm5d5fZNL7XgQmAzxqVygGxhQG42cHTpPEuTcXkYKNjTCOJ7lU7B6TEdpdOo9QphiXm4DiCoYZpHdwFcAUC3y1xEgFVrLUv4FtKsnLHBAAAYrzvMFu6hx37mtY9MN63NwVv8p/qYG3JLe3O64fvWYtYzBQXh/E3P3AejoqFB/s59QFkohlHeauJW0ayS1xCCxChZX6aYhSgXXdU0lg6LScMYt1ypdNpSgtK0/7hzgwUlfuKNWd1iG2rN/ctIWH7gBabJhcS5omlbUEilfZZH8RC7h8qw2116YY1ikZYC0BiKTTzwH+ZQ9xazXjUW1/UdXiaJczd5iMxeQ4HUdkRLQCXcTmFCH+kywR1AvUtTgzTpmFDU1olFH5gNgZwWjOMLYDqpVfC8sMAa0Zf1AYtXAiE1kYdRLR6AzWqmvVmHIUvjqLA6DM0Ll7d5j1ozWscRNWKngFgeEoQumd5UO9YFHpihqqj+pH2koP0tf4jF6ySPzVRrwWJFzn7jhmEDRFfVkFVg18URMaSyFCBuGpY+rrbBvVMZR+9TfJ1RK11/ctb34ivkGjh+k7uYAo1X2kd8RbL3DBNQaC+FzOaLKrL5jBdSDOIdIW2hDuLuGmLJA3luVTBg384P1LC1XGVVt7haNpr/4xMTExMRu5vmTKmy4Pm6YBmE4YRT5WIyrjHIevUvq2pfNZ6iK6rVJksG3mIBQslaeqhJVY1A5hNmYtGJZMaRanEq4h/DFqFpb6lqPwqo/AFE68wmJTl8wA76uZi/gbJmuOypSOSorXC24wlmAgSaoG7AfkT+JfWh2S7HgFDysvfkXJ8eaMTKovBX5hQA6Av8wYo3+Z0eIrNVc9nT4lWM2lwlb2sC9PaKclQDYxZmJLreHD6mCsBGXmXi5cLSxiUK2aWZcdAWB3PMyELPX7YMDVspjG2oUGDVcw0utVS1x1qAl6dpRHqMu2Bmcbt/Ed1Gusb/uTAeKge8szuQj+USPi9lPqEI8DgHZEuCN5v4a6hIXFrxBuGak0HlDfriYhiDiU7IEuZq8XUsgSP0yoRsjGCxvKyDc3KI6xLqVuIWWssxFc0MB1EVCSX3KXLXUXPZ3WIxVeLRi+YVi3lw/ErTD5+G2IQAVDgj28gVmvJ5YnjfAbGuDqOiPR8dim09QR3qrQQ4K4PEGmtRb5gFAcy6ayvcTLDfYME2U+ktUP1OofTe8J9zBC8cElWRp4i3owFrUZ3RWkc/biUBW5QwIXAeXsjOoWg2gQKokg3TL8zfUXpFV4MTfydEUgC3SmZiSFC0MJ+RFaqBEfJHESLPcKXQ2m+EAQXwq1RE0JI7mkdzWEfhUUEmkp6ZTgH7gqO2qYT6MGvkCQWtjyZFw+mz6gDrOzxBvixpedQKG7ZrAsqC6M4jMFeE+Qea3DcMr/AHB6qjzvuomTL1X6OY7Ra5P2RW1Hj/sRC+TqHy/E0zyS7/Ucf7gB3i/DiMgCr98xSJmEwf8ACuI7c+05jWzL/UxBzcsiPcswtcHmXUyI6l8uCkclSyQ5VQG6/wATfwTEVcpStC1HU5toj2cgugdV6qCdQRIV4NPW46rIWw7VWO4C6x/lBuIcWV/M4jiwn7n7fouuNfO5cC+S2QoiYAr4iYyaA7ikOIfwhWULKbb5jYpQFaaB+CNG0FprmBdDSOAVBiRuzAhBhEIDrgcPpANQCjS5mGWVeYTC4uyZIi8RWztsdSqA1lL/ADCpBnoBXb7jUHUhSRLjM4qvf6l7DXSeIVYvArVx2hRyDFbsuyOPwAW9NRGxmou3wRmy9TgK9ssxCrcupvmV5leZXmJ/836IMZ+G0sf5jmyzniNNjhlBEyJ/MK4BqiOL5ZybJDh7gJgtVDuat3moRGnYwNwGOiYsygJYwaQstGvhVsCrLgaRyrLwCRZdstWJYaCHqeJLtqBmR3ngiGTF8RKlURSYxLzylq25ldVYEDKzE9stdG74pz1vUK1rkXhhftth2KdGq8/QDLE3EwAwfqKgtmmvCJZYKa6lkWwS1enqPSBwOCXQ5yX9n/dRKsS4OQhR2xsU5Kj9PU2g4l4sk89PwGPBEuFIWrliNbDjqXghTF1c5rJQUCJyFqnTzHWe9GpjeuXvwkpsp2iqmT6iiBLZch5gB3ZR7jrK5enbeYUsT1EG/SM2/LSj+QmDy7d69O5guxlInglH3LGuXll/cdtSUCh2JGaEZiBjKRQOlqKc2Qze8wayQhYL7lrGg+8YobKQiKkph3l3L8Dp3ZrmOis1YLWazUaPJbSyxye5fS7Qq4V2Vi/XEWsLku4ajklU3hmLfxv4q5QU3eoC0n6jpaescrzhyOLgkts3kSwtIW8lQ2LFARI47i2vQ9Q/dbpjkV6P3E/Lz/xqHX/o+IH33NYgFksiGW1VsPHq4OI0MYASmHG4KyqECHy5gFS05WUuJbYX0dr+pbXSBolCAvbuOE2aNpdqbqZ4SW68l2B3DeErWJXiL1kZ0EvR8JsJSobZMkBU4eDRoftv8Sy3pdhfzGljFf5Yq7l8YRFEm/wyYnO2zkOoMXEIiwMEPiDEILdfOJUlblXPUVDduJ7ibmEQgolWnPMs9u6jVtpdpER43b+LMvmWyvftywGmVu/4hC46Io8k3/Om1d11B4B7InNh/MFHB8fumrP3oM0Ecgp+Kl/rF9kBW3LD/wAXDM6y4sF+47VjmBhU4ebv7hUz8xhuLUyiZitK3GXQA2OJYYUosHngiTPAnPD9qlEHcvEv4bDrkUBKDwpSO3PEwCeKFN0c1KJdmhplrFtyy0GZFL/D1K2oc2NJ+T7irLYFZmYhES1l1/34iZWNNspKC5a1LaOoJVkWLc+2OcnUmeYAf2gGnJMQF4q/EG49REUmIo1X0kL2OQmxXLf7jnasFjCuAaA4+oTQALSNUrcwglRix2QfQF4wzKK3Uo9xWn8RV3khfWZdcTb4RuVEW0Nf/NSpUqcMTLmVqpQ4H4UiY/mfzYE6YWilQ9wQv2jKKBbwMy19K/Y/7lSWVXUapUP6mDnMMx0MqkKXUWYqm5rNOSESq4zAOOVt9DCvqnEyhPdHcdV4eO2VcwTzLNZdCSmCASVTByiWtA5GJgOOVl/BXEajWVLBwMuTI/SNmVa8q8RwCkr9yis+NKxh+WZPhd8eB6g2d9yqvSzR/wBUeQDg7j1MdWKEWwKjlLbcOsYW00jZ5gFUyruFAtYjBaF9EYNFQMP3OpAKbjNmVahTtXqFR0OMxAZ7VW0sxGyuTzY6QrlZUDHqMzktP+9zCCjohlliYQ7CMaBSNC24QJk7igAPRvv4tczXwK0LrUyY5sj9MvO2yWea4j5vLBv0jzNlJN1CWhlO6hUip60IXaheKqByw0tOQunrzFK6jYEK6dvqaRBdp6I3B5OzlycRekNDNEUsUBqR5MQwwbuDn9wDdvVCVGduJQVBFuEKxLmAZyxYlwbjB+/jBsHlqUge91LNqdO5YrOWQlTBQUfL+YmoVUj7LYLWoEQ5VR7QoW0eWUkOA9p5SWF8xsSgQagXnUNFW6YPfULYHedHl79R0w42L26P6iUZtwQ3b/zUwfgVOHMCq8OEZXgRdBtjLMChi2+fWJUBYyh0qADsUEwYUUkJIrgG/MaECYRlSkHF4mIC+pbE03hX8S8ilJpSoyUb4RErbT+WY4Ufh0TJ8TGEDxa/PwczUpEpLTpjbEFkjqSQJDbjeoShRXpGjUdRs5nSJgFIml/1El7AZOstzJ4jVEqh4QsHSRRkrAxy14giiBQBqUe9LtuGeU8N1DE6XQREIi4ABYa1TYpadEujUJ9du2Nu4FTkf9DKnwKiJcNKwKdEpQO7myPYXXcV4rxG0OIF8w2kUsnB5ZbwC1fuCuBZjgyeoNLEC4W8CsRKEqfu5GaZu1P5iJR6yfvUBtZq1IkWjarLDAMccyocoKIXETaqUBDZs5LrdykZFAKCC0ggFMS/VV2ZJmzcEBdp3yavLPq4mX2y0peZthAjI+EGxo6IHM5lEUJVUoDoqldVuIRDbf4OiLQ5hk2BL0cscC5HKLcHZmD2Zq0i2SgAtiA0cXiNIMck0uU5hUS4VlSpUqVKlfL0wRPGIn1KmOyv3CW9xQqlTMn9g9yzqou1Rc5WPxm48YmQ4sj+4RTZNDiAtQaCXiVClQMZm8FRdDxqDIoCGSXM53lHgZy29SxVr1Aq5eZtiDEPZuMt7iq4ATJGYyA2W/mICE1ZzLSVZXUOpSiH7l70u35hxeqgedxr0zn4LgLHVzIYEWvt16ieRSMSTLllUGTR4PgEA1h+AMbtzLpRwk2gwCkAdSljbkaoitBmyrHNQcKmSzb1cRzWCV4WsV+x1Dcm5wAbF7jz+5HUpMg8kxx3W4ivCplhb+KtVQNQFIwLGTziIuENQdxaeS7jINg47HDAS8RWQEGklrQTPx68QPhKl/CXDEuzXD0zFSLcFHGWP3EgEHlrMLbExsLiNIR9mK8Gg/EdPl2ql82LVFX7gkSSm21/zHCSEWLpCx4vXiHWOqDF6HPTkC5VLQS5TpSFfUZRg2zN3e/crQjY967hD2Lu+KrH/eYrCEtpGxiV8LqNVBpjpDl8RQtAn5H9QYwvEFGOdRkwBNDz58RIybBT+pooEHMCiplUHQd7sgIgR6fhyqJCEgU8EHtviC09xT3n0PvuZd7jSOwo3BCAGoPa3frcaAWxiCAV9QS9JG1TQ1wRIxNQpw9fcaNs7Tw+biWOs7ipOVuIsRBhcgVAV9HcYo3KjNOubIKdJio0Ux3kpMXe+oa9LftjaxUzIzGoWsePnJ++vZCquoMpinFt1RFOmEGiscTNayaBk/RMj1M/qKhRPJuNAWXvRUpcfuI5jCxB7EwxcCyNAVpErkhtjmVHWwaRm+UuKNxiXHJqO1ANicL0y4w4DL2I0WwOY09ht3HEw0+DiJS/6phq8/EQm5UjcbhBVoplYl0VSBHuyG07gDrDGqpnTb1KLKKNRFrUFxiV6zNgU7Zjm9XfJ1/uK7yrMn5gcN4f0rmMJpTSt34lwdaQXCbpum0JeYZgJC0rmJHcGJi1K8w2W+DX5lI/AbkPUoM47R7E9G4aBVDTl5/cvEqyGcqKRXKNiw8xcSsXG4GIo4EbjSgNyojGz+I0SdkdEVJjOavawrQRF0TxWoU1JjaWnGZVw7DK/Ur+jk8yridJbuYDtYO0oZog3/8AgnwhSxA4zC1LMLqGtwBWpkManJro6uXaKL08RAVA7OswQx7V3w/mFT1uqq/qK61Ags5lYpmAil18u1C3ScwULLISztexAb6NLUFVvOyCgFynpzDLmJTHxkW0we4AlaAWOz3LxsIlYdQXKqpVPMadXyQdjjG0INABdtzEqoaXdsuLAVYkUJgMuuVD/MFBQWl6hhW8DRcHlY39y7GLZgVu5gIu1r29TFBGcCfSD4AWQp/EfC5DFS5W0U2vbAD7O4X0ajk8mWHROZo7I2Xb25ljGi8ceYod660o4IWhGk5I6bZwsZF+SjD9RxipmYE1hjuVLzKAF8wxkR5+C8S5uGmjC1UEaE0O7lonU/BuPHwrfcTYU1ZKQzMsSoMqJnER0FsRoHnlGoBad8S0BC6WyEGDIC5lWkQ4MSySF7DMqKOgvkbCrxe/1HuiMGRT6gS4GzjzAWFtTjBzDoWNKG+V7mPa3xcY2+5Ws2+olzXwkMQxlmEBTazo4lio3I4SDAF8xrVy/EFEdypFEVrbBzXtsUx7zZGM8RpYZZwEZ4jQAgcvbCTXGg++YBMOmI+IGkFRmVgvWWLC54bt/MbucvmXLlDtqDTUZ4ahUXGAC6bCJU1giO+99RBjSCgHXnIFRVgKSZsErUUq1Sao49y61LViec2Kg0MVZMTNr+Zb2uy5kymONHIh0YV0m4QbWGqSXFkMQ5Av6j5G4Dt0/lmJlx8I7gB1KDVRZnKHBzp5hnpkSohiVLmrXPzAVac1jFMaJ4jLKWBcNRF2wD5MxQIG/EH/ABGr8T7SwHSRGRZs741GyAcLBQgEtwe5yrI+3/BDrKLFDJS7UVUdz/rdMpVDKH4TmHE0j7nj2iXV1/LHC63bLP2LGZLXNFEK5QjLQGbNxnABabt7Z+6Bjq1V8wsZaU7YuYNxWtmkM4FEBcNQCFmGopobitTlTBKs8x1BajkniXJmsgfDugr4gCyp6bKtiX7gqUo8zHH7il69TSOmBZKD4Mb+BnMSF1QcdTmENl/CDbByXuFHjY0epXGZMs0n9xTQbIamTDFMCN1VxY+CqemYUcQNNnd4gWzfqXyo9JKuqvM/4s/4s/4s/wCLP+LP+LP+LP8AiyoHMsKBTL/LB2jhV3AK/cAmElhtqA37lIlk1V2xihoKSqp1Sw/8i1XF6I7evhVxmsoSaYsRxcl5I+4g2aY4Up2MObI+UpbuhiUKBHyXqdsULpIHAW0tfUUAN3+zTKzcThVQ5IeJQHDvuByjZ0EfT1F1NgQWkGaCy6a5lztmbqrmAlqBoDbJb/JFZIem7K9SwDSK6U/YWWVWAQ7lCGmk9JA3ACZJ1YfuJ223ixyQkKTgm5IrlayQziMCt9HEQwQ72Mp5WsU8lRxHURoUIn3dH6jpuuzL0bY0mbKq/PqOw1NYhj4dE0hBUChRcJxZqErZ8LcTIwwEnDjIYgo3kB5blNY+hmlCCWwLtczg/UFC4niLGRPqOoS54sZ5iUEKcJygs1dlrLnguyHmVWmQ0+ecH49TJXHZD1OSgig4HpcveC5WhHkrUv0jNV0QJePpGI8EUBXP/cy2QXtgSMiNnBUazyaJQQ14KZnEq4QDIrArNkz+itMCdXGLgvJb1fcSVku5VNpkgFroIlEKk2uX/lQ41uGD2x9F3vqnFfyxY2Wko++5RmCP7G0UjAQo0Pl2vMcpbCC7gQqC4RBLeHqVK8SthuM8D1cw5OSFf+xU5NkpOMCY/wB2ogQKFSRJUE3uXB/cFY0Q1jUAF+I7vLA9yA0Ipf8APXodxzGK3hbaIgJ2XC/r/wAsDFoiXJMZiDdJW1DvUsNQLZzOBRiPwxBzkX/V6ZlHp092K/uWkJo8cRa1Gkym0vt4Gr6IYOjtlBGnHw0s/UaM58S9Epvn3LKzjUvUiNCyHhjMorcDaoPew3ZzHoNImFKkYP27whwf9UwZ1qZQvzNZtCVFdMVW6q5f7hGlOfI8RuK5WAYUQ4qBsNBNxCiXBXwnIyEssrB7WKyX8LuNssOfhFWAV2xs8epUphF9BKVCwpgpBor8F1AxRWDLe+/qWcAa/aiLRt0WVj9xXw6yu44RXbDUS46GArMCLHLBBRKMqasAcKqEtjFY3IO5XmXtWPVccXqokQvzkIxDZypRlpnJcV8SDPkkvLKqJ3GoNfDnY7ni/meL+Z4v5ni/meL+Z4v5ni/meL+YfUsGZJPExONr9TOXzke5kNVKGZtUPJJbCiop41EsCy4o3KZCZ2vIsqtKVPSOLfhEq5hqGJtBiEMLKt1LZQyYCh9mI9yuAgEiss2JacAw9+Y5Iynhl2DWrl5uOYr8iLYXsOUiQm14lkvRERsGsV3M4m6hDSjXEUswrzwCwR9A59K7Wt2xYftMvoBLHJEPHr62fcMhQ4gyyOLmNBxmmo0+AZlLyx+hHBot1mNlcufUGICiufLFtuVmXazZBaWT7uPzfwgAZ5tTWPuEdOem4yIQE0YqzWD8/F4l5m4SaYpqZ2qNOFdzkliDcI1HULKuFZzBHYyq5mqhbVPJLSAM0WNe4jTXRv8AExKo5MwZFTzqHpYEK8AdEApcrRGFW6rk044/H4hXRJyDKMiPZMEshdxii0CXM9t3eIyVwxH9g5hK1ZcBhAVAKzd28/ULs0+XTpLIQDwcF9jmFQrL6IxGydPmCbhDCXF78S75eGHAS5vFF4X6uAdYFA+oNsUDS2IXyx6UptTeYXeYJhLiEKjo5jMSOTySj4coRxKzZMjtLKENW8uJe99VQGARsCGeYTcrD+mZ4oHEHjUzEDAYIpI3nWGy+qmDmCrLFxiHdd3Eo9w3yx76WWNud11F3aPYxLFwRAtr0n7lyT4v7eYjo0yvy+YLFmUUcbrqa6Dmpz0SqUR4xgAxgNZjDjMII0k5ou4Nl2HVwJYRdWCoTXA5M6l5aAFDPdROWV6Dq54lirh6mYF0fuVHauMq1UXCUDmLFRGzDtqEGf3NDiL3UFu4AXt3Flzgc3UMBvgjq9P95eq2V1KUyqL/AJemDFGYKhfAViKvqZCWzwYQplAh1ShiWZIMZxM00/AteAWrHqFi6jKA8xtDUaI3pBUvMFquPU8OBMfmUJYuXUH4ZAeUfSvhlP0SMx1lqrxr+oZXpKXMEDmcyyOo1ymI3G34hxceIXCxiQDDrzYQK4uYZIzgcSkVWdsIUYL8Eom/1W0FWygPZFgJpYaz0xNELZ7HU0wSD8xMLWI2H2OIdyCtBzCWWvqUdpR2lHaUdpR2lHaUdpR2mJavuBQd7jL/AKl2bgZhM8A8RbHOJReI8WUTvosIKGwBXm+4ScInbNvMUG2Vx9xVLsxBzMS8ugys0ygWaYmaoIfYiizFuZisbGylrEvEGsVMy7nqCqG4qUwEPEuBLAwsQy8T3DAQ9QGxnOlmyuPEbFGQqg+oBFB6joCgN1HtCrrVwUwNt4lM7zj4G2iZSgfpK7IFFtpl+pR7xX9iLUYJu4ohsoV0bgEOsLoBpdYlbAMlH8u7jgsQREU58RTNtZ6XiG4nwIRj+Vzvw91cx15lIBEqbTJiUhh8BcWoF/DqBcqKbYOUq2LHEuvvAc3KB1q8PJKhy5gPw1S1WZj+5kfxBvC66huNRcxtMWYQcxahGFXRNym4G/KuvqABRotofHuAFJmOZix1DLMejt7XUqX1MD7R03TlGghQzRMq9xShqUt3Ste4lwKvJ2RrwQJYAg88YPEs7xycnk6hBemHk8PmPUwy6jjL5b/Z3aC2vEyouA7oaE8b/ME5fT1P9Z6ls4RjeGE+ADHOrMn44hvFQC3PMOG8uxRKr9xFNMuNluJbepQu8xaPMcl8dEeM/iChxUVaR76i0p/Md6sdRKfy/wAQTediESVjzfLAilsSklhJthfziAO1cH9Tvm38IzEC+1jB9QBTUoXd0ZuV/hDtEycQT9rhFmRfKJlPZi18DRemDq8BlYuwG6NqFo1MAYxgaixBS4CDTA+h4PolCtKXiD/yMRdbjj1DuOmv4lnjMJBbtjTt+9Syt87ZTZ+4DLEbf93BI+Baf+6YkIgsBbvxK9zjMDMyMENF2uDBrSF1KVYLECYrND8RoSF6KevMYAoNIx3CLaHmA4PL3L3oUYhEMxxErFsgVqVmGIvMyAFWsa4gXDGr3gvB+j4CUUvVxp0EJ5qGJyRJ6TZK3Y0IP5Kh2pWuh8nEeIsZtzEiFqViBBWSGTMJxorvu6/uWSJdXMmATgyyqBtq4Av03E1dqblco0UqIgABRXUNWlHkX3G3p9CeXCLCNMi3mEqz0OpgB7ZhewK8vES5bYJ0qdep4GeBngZ4GeBngZ4GeBl+v4iDUucWfDSlWvDmWyWxXoigOxgR6aGyNjTVw6SM5Zhy2xR3e4FvwY0vXcdREGwbFZH8S1GIRahVfAKgti4U57HqIk6I3NopewoQd5ARpjDPKY6+YCRWJTMI3ZqIoPccRDdB5lJj9Q3gCztM3iCwEZBTGCJyqDLPGovxL+OGnEBQs9wCqJ6l0RjNkqTFJberMTmqkwy+44mVagWyWNF+vqogRb8yyDdamrBrMCBRLUILaGSs3Mbm5P8AnH3qNW2ycLi+/cJqOf8AnuWgmbuzEali1wLD+YqOeBUuyUMO8uXK2pO5rQLK/MJJriNxdwKZZFB+C7ixxqlAIFWVRDcGYjc0cP5lgyhjh8KbcS75ikMZkEEqRU+ImMSqhiWVzLWL7IWYbTMDjVS6UBu1jGprk0zCVcoZhiqqMwAKM0fzKlZRg/gjL0Wy/mLjBMsiuHzAgXT5hYp/MMF7gmzDk5huBLKq9HhlOUcKVcrMYTDSaFCNWt43OWMHiohBSy2gMiy2BYWJctXADI9I1LaF52QOCUwWXwwNwhRBXvmLbVgOzsj0mkT5HUGBqNNa8y2sffuLCNeolrVh4uIhUwBy9Sw5ZpDJVL3F8VQeSgUEKFPtlOY5mEdRFHbE+GAGUqH3ELycgbTgjxgnhOJm8QqWmkS5VTaMZyweA5/mKglJsSLEQg3t4DuHxwpUX9whVtuXmJbd2alOImaVFVETliXjVEzjXcSgqu/vP9yy+jEZsQbzA9/95QTLUb/xaYlcwcrgh1kqAqxRKNYPcu1QU6l1tmWuKBRwrAe5ZoTagKxRkjCQ3fIgMKFQKTiKssIt6Ed2y5gUVLxA9TBARlyWnxbrR5gWSGwauK2GXeCN/Bl1UVTFRaFOVGa+sUo3QNA/3BMPhaHD8KhmsIFi6+E3AWglHV0zQb4v9xmLJxCowDuyRHAnuVLrbCzKEAvsqJQadEEc3D4H1sGrLnjl45eOXjl45eOXjl45JMvwwGtuIrhigb0rBDtynl/xHDJ5MoYENsIcuNp8S4ib4WMQXja4YhjDvCIdWHJl3b8Yhr4Nn403DUUAtXBOJgFU4gBaK6mSp7DChsrrXUQccouMDyMPmUWVmbRaJcFksymEpCoMAQdj+5bBiXjctJQYVzAWbIOENm7zj+IpRgMCjQEzoEU1aQSQ2Gs3MOs0KoafEoLxAsDqVB3Zn2PEvhu27ZVk5BtHbHL8BHcPrkS0WkFL54F7ddR15SVbLuGXcZzK2sD0MoQjineH6iVLGIQqClepcKJe4upR3bYDi8zIGeuWZZaYbYyI8UlLwDzANCRTVEqoFsQIEwROZdYJWJgxcQcwtwlxaaisIr+EoZaSOcxtLmCj4F3DZEqXQQd5S4LlNqKx8BY6gMqx+piLMtXYMVCtQ0BtgqKoHnuOV7iLI59BCL/y2KV8MEF4l3q7X5lVh4i0xgH7P6lPLAF4YG7z7QcsOtKlnmn/AGJYB3cfqZIq4WmMJUwrdLM7WbYyjRx9RHarS38DlqIIVYCbzxH9QVQrzUbjK7lth5hNLfCoJSgq2aU/VQW/qNvdV7ndF/xE9YInV55bgNsjChwv+fqJpbS6olY9phlkKwTHtilTBzBV+F8XKICXWa8Ww7PM6mo20ue1/DomSOLMGvslPQdeYasz+Hw6MTFb7YxFq4zAL3Aw5pjbMNugEDyyz3EOabjR3mAWx9Shbb4iLQTioL1DDdXEw1llKSEVuc34ghLkaIUgFe4Kr9XE8K4CDUdzVKI9E0IaQGkaiZsa5H2lSXngwUjgeV5lDZvqOhwSmabjbUyzCUsW8MSLfxK1ilC0tp1FrfExijBTzAVoNMQ3LgxmSN3iJcKIxKae5utsniMSIT34PiW9b/8AWcTsg3KD4LEaMxkouoywRw9o6rUKK3+Y6aYsyE0g0SltjRgjmcS9xgvNtMqgNsS6o0ZpMm+IlWtypUqVKlSpUV22CDpIMPY1Bq+O4xUZhCgMoN8GWyDiIy55HULE0xK8q+5fJTsd4TQbkKhzIVuhedcJxe/ZCZIitXT1PuYuIIE1HcsFB5liN7na8DlC2V5NEe4DUYVQtENPJBz8NDqXbBYt14gHWJdqzgsNTNMqaVa7lK7gg4B0O2CCFAUESbZ2iEIRco9CNYcuYLvmOQ4VMV4wcQzWTltgXUe7nAidsfrnrqU3AYWsSVHZUh4H9yvcaykddCNtrbFLDXMEJzWefVQ6r8rhcAyUbo2S9BeKBiGy4E2FPqe4K/tRRoh6LX7YlaF8FSgeQoBfuAyFAFeAIlTA4XxHFibOyNC4sM0BV1ALAp5CCuG5uVXyWfmqK55l1EbjKbJZCw27pjKLtBxKNRYUN4KNg4firi1iEcQAi3L2VHdBELMCbZqYYmvdskSpyaj9sjOIIZZXi8ajA0FB9wUxCNiluZUmhspoiFcuhDMEhC2oQAsNrbAX3K3LWb7jql9ShCJ4ZlWCFDYG5r4DCqJh7hnqgF1q40wHmKtSgs7e6Cv5h6A1NC7xFZSrY0ZnWIyRaF8ncSVlXK8xDUHFxklJQ4qf6jsfEt+C3U2FBWxOETZ5jQx1Btr8RPEqDdczQBVlzvUIhxWwCwMOe/uMkBcxXK5IN+r/AC/CADkplVD4YKIOagtfR+33GykfI+o1VbKR3GKRLloTh5TErtsHVQyWXw+wv+IrgaRIkIRwKm4TDH3/AFUNw7yXoiRR5S5clq1RgtbgO2NUFuiKIKNjMHl8SdRWTHcWtVG0ZBb1RqJuC85izD4hpioRXESAbG2giQJt1gg4lQk5hlUc5yb4GSgaM0I7gB6mcutRXkh5XdqgtKHczqAPjUGUF4OSJTTGaK/EuhdLLXD5UEpYrItksWZgGFlQbEx/JLDOMbCUQWSoBLNMyCOZK2ZPpsgRMzqw3D7Yu7OSBL2ZpaRQZblWt6/yja+DMYS8RMbarji4y7arhK5m+oyLHkSUdrqppK2D4BCUE6NuiZIKcEo3LGDiCYalZSUlJSUlJSUggtyC2MoYrbb6lJE6xESqshiO9zGal68yw1W0yDxibl0VKItNF1MzgmiyBkJInPEo6i3ZUcuNEr4SeGYZmTAzOIgi1aI5uRb8yorlysdwU9bYYXrg8TMdRgLRtgCC+qQJaV4m/Zx3zEW32VZl3ZDnK4Yy5xsY59GZb6lIfUQNMb41vzAEqwQilZSFm1ti4jTmVzWLpi2oyi29wuwbjI1Gmo1Eyx2hZMVdVyC4+DQx/V+I7AtWGYWcOhFc+YNIhOWoKubfDE5fr4YxYq7pfREzVXkB15+40SD0kWvhGllJZ4JhqOoTFTtahM0rD7mZE5ZUedI5fDEFWLBtwsdj9wGtYqG07OTqDcWiIsahUq/irgVEuNJJi1UBOMQw2Qa1WYBJXLgQIaPBjaVccQV3DUWoZcysxtLZeCkHE1xHMFe5khMDepoUUS6Jg2MIp7JaTbu+Iq9uTBkVIACvRKobOb5nEffGdgPjiM14xmv62TPYsEt2+Ii33AVYlnCnsJrJxTzi/OIzpbANJVxaREjdwVR0aaBVYWigNb22QO4bGSgKtc+ogizZcuFIC4W4B5Yq5bfMMHMb0c9kWuKH5gGBXxGEhesNEC4g8uOZ4stcSurNBSE0+v3MeGsby4iKgur0eP8Auo9r3cB9nExrB/z+YjBWBINTLUuiIsG4bJiN0beoBWXBXPmP6L2lm4svijGePF8wawt6nl5iVGNICLKMFZteiLfKxUwZKAKYG5isggSfeZQKIsI/2SqmnCt3OZPZXUeMSxKI7cBFSoFU5d/1HHxoKu1Yz5Sn4OR0IFY6N+txUBcGq0cMsQH7/rZryN99RAkplcR3Urz8S8IlN2IqgYHOmx+IHIaMCX5C+AqW0XztAHkG1kdSkCs20++pSMdCsYVbTsii41LaBGwCeEs0nyxJBmLWFCLiB2LoUz/mUi+x9dX4lL8i4DNcxVPnfjcBsvY5fT46YNTaVlC1Ozk/uXFC4iV9inq8w1SKgir8rMkOaW/15Z1LbQvEUubRhIYfEvMuotwWQ74FbmC1Xmo6pKhSJAX5VFdgaV5eYEFYQscwqEq57z2ntPae09p7T2ntByFeAiy6UZtjOwvp/tORX1KNgbgoHAW6f7hEFg8wS03CRoplF0I+phsRB+pZ0WZ5ZiqOdznUr4pVPx/UwlCUlnUaDYH2f3FIssCXFVE2WvRGrXuFZeammVd1DlAG1VG8KHJRCWrzHES5tEy5lzwaVHwBHAGvVbw8MZrmzEQiwlVoUdTUW46Zoy9IZFTt7dwXvmUM17jaEc53b0Rf4gIGtlD5f8RUpVN1BrAbhGqjIa01jWW/cGhHs2fBRqAwSSzhLITLcD68xCltJX5I+ojnDccyh7Cr7gjigBwFzKuKENnMft6k2jCCBeE+oqIdBKWaDDzLmgvzGwcBhJRQYcFV/cRpXXYxHR3yUgTXxWIbjgQrruO1x6+GQBe5jyzpjuERYvpsDwS9yHNEcqrtXmFCy5p3CgxulUltp9MFksmmcS+PgxBuOpZuYWXWvgI4gorm4WwWtRSVartgoCjB0JRFVBMUuXZFY4llgjlk6kgAxlQgXY1+OK+SDKx0YQ3aRRb4EKF78ZNDLCys+xyax3+ITFRdC3xmrU7jmGQK42teZTRFHrJ/URgpGmVcygGZUr3e45XBFf8AHwbETCcygQ40eDre5e983ZBVQdgLTz4lK9DhKe5SYQZzriNip09Fu87h2MrAiFDF5qdVs3KPZcn1/UP2BSmxL5jBVg22Z/iYHmKsFixBwr7KmCAAXGBVyg7glgjQ+gEsIq4hJC2/XYeKjCEzeZtmOEbJnBqGSICuzgiBsL0C6mZ10kqWqUp8Zl+YcWB9kKU9FWShwgWquHGSP/mg7WVuqUH8vH1HD8xAN7nIa6JSRZoyxBoSpQ1yLWZkPnTLoQ1foAwAagi++haWP8TMz2ZgukABVrOJqMUygHKAMAvceej8s0jl4+X7d1TEga4rD9Q9V1gWJD/VQK3iL44MAMbKgaRgRyLE2TJhQbu9g/3DFbANSgMui2VTyAVvG78QFaYvqDcYThiCiDydRtDOIr3AjqBasIy07CY3Cwbs5Xc28aAyoLIgxRYDliu5D7Qo3KJaxalzwJctfa5gC4DxD4Dc8Xj+4lRtH8/GBKSIcRgPTxGY6mn/AOIRARhpstPJhHQODdxT1W2p6Hv+ZXHq7vIlAHUNURUVtQO4ZWwtQJmHoblOCoxs/mVIz0q8MvxQibBiOWbSVAjoGb5EMqm06Sssb/L/ABMILmuYu2XDNpWr4gQtOQeaLY9OjsH8xRVDjZMVYPcZtW6OYZVBuJLx8DjuEaAa8zvuKj01Wblgt3LcS0V3LqLcseO5yR/tAEwIfAVKCwzGs+U9xUYG1pOo3izk0fWYCIK2n4PBF9pLuLEpPN+wbauNwdSbGIMSlcbiVZnMd+O49MgjqlNeDTRqWzo2KmCqRfAd+WE47fKNK/mMDlIvE6hlEW0NkFrTEKC2NWSEGEIZljToS+yWP2Cn8Sm2XxDyXtZjCj6jjdr1pmramUE5nMupxEJ0f1OJRMDNRSwOamOHxpmoHBjvUCLlFeSZ1D6I9VXSo0I0UZ4jdq+2VFLnuDUGk2Wm9QYxC3KD8VADz8VNvg6lyzg1FClwRekxsGVlHqEtSkYFsyqalSXXypHUqClK7rXQ8zKQQL1hkGnn8R6N3MGhzBUObJpI66QwYM5w9PfXiBLUuxT8St37QunRFNa3NNuTUGylDxZn7r+YtwtwQbHhx5eCOgtNrNkbTN66Myhi8g+sED3EGmvoilhBzFKB4O46A55PzM/cMdvcBYFUUx0v3G/bmrslH9pyFZJnnvDm+YMYgkbDSliRxhYW1U+O4uq+UWUKDRKWAGhwo8ykG6VKpeTQiKszLmCvx5f1NHIMsDu5TcJc7mz/ALuIKWNckuJZCo4dxMhZzcXomkigyeVQFln0RF5Y2yrwy+xzLCucMEq5wUvObtWZz1AaPxX9GDjaWjgK77jzRqDCjtByuq+alIW04gE+uqPq8M9VcfsFGG2tECLtFFqRksJDZQLH8EwVXgP0lS3stjtcyrCht2H5xEX0GQPzL4FvbCiBYAVQ9QzSLi1DOLfxU1FSEp+hAmVYNvMwnSgWwYFE/wAzKHLdxGx+n4UGNCJpGNyqI4gtvEKuox/EFRVhlgGSvWE8bdRVa/7uMevt1yOYFRVCJy24+4siqLhGkl68P5RlwBqvcsqfuXlYVLNu4JdIRL9WP7jajquJb4jV/n9/FhKYNiYExJxDGplmDUqxGEWrQQIBbFHEC3GYUqxIlkUErrxIK3BrcFLbXeGf8B/c/wCA/uf8B/c/4D+5/wAB/c/4D+5/wH9z/gP7jkqj5gI0DobgKWMaNkCm62oYKhATJ78RTO8Epwx06c6Hc7lZLt/EQcBh2ZvnQit1iVzCqUr8QmmrLospLAVaPH6jte3fqVnFWxhi0xK2GmjF/cVRo4LiAWAwbKgASoaAgV+uMFnnh+Inyddy19sQ2qrtZpGiPbRKOP3CCGKiU4ubI0QbCFWFxUFW7kPMMjAl5ijQN35i5iQS1XtdENeVN9oNwXGAliiG7c4L1z9TuYz0y7OcPUVtPA0kMINQC2dBm4R9pRZs1EhI26HomdPtx0YBUfprD/ivD8QVYMVWtepX2jQGCwqgNKpT4FVEOQVkV9EEvBu1tl0h4pFfPJ4Za8GcseovpfQuIQJQEToikCARMQgalkYADzkWaZZRWoFW9RcDXJqMsF9TPVTHhV2wrQo0xzVppwJQgptcEVCx/BE2l2G+J+pUusS7iG/hMIKziEupuVS+XcdRqs1gxJrMwTJlbjNxhW4l5mfIc+2boUu++JhB3XwZimotsdQYCV9ctgXzjPuAUwZM2Kar3KM0ASlahzMLFuOU8Z35h7PgYHpr+YS10pPOkLI3KnhIsFpOplB5lIxopgLe6JYEvMB9KXbHWBrO/Mq5VMVDxE+KIwO46OItEEvBQQ6g9kNiyXXUqCRzbbEDENqtrR7Yo8Co4PVP/cTgD18iOhey7IVLzPwbXuYQftKDdFxgFCqtylIs2DTiL6APBr1Mq1tgKg6laBrPjj7YgUcAvULgeYLV339v6iiIHAqU0otRde6iVEmOSDxBd4Z4a6+EK7viBpqbTEoY5YkAiWkaj8TlLpKiK4PNVwQhJC3tULlCos3CDRajLaH/AGIjjCB8uvBq4LuLK1Z9H8Q4qNhfsx/Mt+gcodY4hsG/4paWA2N+CbqiTlx4NZhJ5gdiRXeZilsRkP7f3KJkdXNw3HbiA3ArcV6l7NZZ8MkSxJWdoJ2dSm1eRhjl7lphPz8NJLFC2BTSU/GyKW9XrMR8WngM6iBVosvHmYxW1BMrhqHJHmFyCAg/BLxAEGCKztIVzXX1HMuZglfcB4Yo+k0+JdWpaAN/qLPRbQXHRMZC+ADv3Dpk/wCSIhACzpFsrlfiz4wTopCKmYfMH4OhglKirTMWaIlOYYZWwzX/ADM+Ry0V1FKBVlt+ouEs54Si0aQqgf6gqS2Wy2Wy2Wy2WygZuRDLJ4dniGgrUI5SJUM8vUqxTgXUZtAQPBUDQFKm0eCOOFhJaYDlWkStu4Z1SodnmL2xlg3bqLSUhfPkeYb3MjpueMYmUGm4VVy/6h6co3Fgcqix+4JI0x5O2ARUzY4jFjsYZwzNfAoIlwxE3iV25gloLYQOhcvliqlR6CloThhnEOLZfqHdt5aSaWpZ65jUaYWIVirnEsrWaJcJ+5oAWYFKyrkC8PGpZhzuT3VTY3+fzLkV5vCIUl9BlgZj2OwdiXTFciqTEutSrhGmXUH4CwrChNkq11EpW5iExxB5XxBW5lVf3CILYMwrWM5o/TMJRTIbwcQCxkEMeMwmkEckImZScPR9oengvKXhou2TAcCD9vMuLQ8C45nQNhpDm46sZf8AEMqjpDVsjsXcotmv4gYg0ibJbDtbiOPIMCpZMkNJhlxMzRNptHiUHiAVysQwxl4jaGkWjmWBiLgmltmpRMmm6zMD0lXLbvCuSblFxCoLg0meo7JsiVHRrq8dPyy2gUamCn3FTWqVg5K8EadsG6u79rl+oNAnR3DbMBagRNzmgu3UzK8alVDzZbAbD19R2rjVxeaTEZ7EL232zkQE3LIBWQDg0QvVzBE3jL/MA1FaXGj0woVUafygBBXZHt1AbK6DbOpQ0d3MoTtVdnIxhKpHNkF39Ne4wESWC1Qzy1uP1F/gRzFLQtQzqFOjGxxKUXQocDr3DOXLMmZUjliEzPQf8xPS0IrUGolRUPLZuX2b1+/T5mkAinEcxDZEIWY4jRC16gDJGnV9fU8VxLZUCiptFL4YlmRYR2QEVU4jzaFs3mfD4IYxF12UdZc3mUw+3aVlyuYaYMF4jGPzFFCn9Lw+5fVDoqRsq3WjFuopzHYULpHLjTGpMP2rDLiCj4Z+k9JceoVXwdRNuHmWGipV/BIbIa+FqCMZZUwaQpQhfSM/OA4e0YyCj2RKILFhEaTTAko9ZvZ0+YlMLt3OwlCsU3UcSYtAZBULcRXwAL881CAcbuyqmUYfAP6lG/gRdJ0KcTIQvbuNmEYMSxkfuGQ4YgS2kivB0d5gn/cSk47WVD96yq5+ysS+3qAWUIp+qfuVREuJTPxcEjuIldpYblwVduYzXkvHlila2wbX+4xCdRVlxN5t+4MSiUSiUSiUSiURoC8FN0kYFFZd4JLF3c3Q9O5YpW/wQREzhcxk3F4DbCJRadkzFL2w94izG52chK5gbXAjB78zayQ5LdxOE8wwwhnPKxBv1BlSUiWvqG3Zotp5TUStXCbSAi06VcFE5iCXPAjSIh3C6ginHSCjfuKvrqUtYiupeSiul5VEwwKgHgOa7jB7O1h0jKpYjaymKxm63CFsYCHh+RbQWwJ0+i4YTJZ/eXZ9s9wVxhEwkxbtuXfxQJeGgEPFlfpB+IaCqUNUQSRPAxyX73DRLDLiJUI4WumYZR3Cwlu00iJEfAdfhh0OKlcfHmWdqr2x9o7zlnT3HcgsgHMQbGK1iPpljVwKYaHaV8xgDWY2DdC1RpzV7ameLf0IVWrUZqwYQZDpUUxem9uWUS8Vdu4qLNS7hWwCscQKaHIKde4oUax0/FXxfw0lvwu4liCEsd3gJkVhMRWQ+VuFy41bDS2j9SjCh+ZcYM0GfUVFkbIbyZQ4uJL+HGzcQ+OIglsOesz2pxC20BJ0AWrgNsoKTCsznOvzFAij9zekp1jiLGgCq0PEtVbWHEtK0pQYBliv2LwxzCJZ5hMY0sCeYBhvpZEOwMaj7DjiWimLg47hRDY33Rn/ABGkpMwLFgZxNhfZlVjczGsvNVL+07zuEzDZNl/iM7Fg6gCaW1cJEuEYW2A017fm4CjKy9X1DJwaQ159xVu4TScMSKuBNC2vBD3eauYCG5W1hR+EimcML0lFHqITGVqlibXZLICdg3ZDWY8lQk6SNRsxbXFQBV2z4May5ZmXATcynuO9AO9+IwlfkoKcrqHtSRGGgvlvxL8a6Kq4csVqOAyVlDyv8ShDCgun1qAHl9/0QLHWXc9GV+iCCE7pBha3Lh/xKKHiLS4b9SwAirRm6JUIME4VKC5+YSy/8UclZ20dj73CzUoqbRZVjLqG4buUQCLOWC3rWjeaq5dXhyDAhBKL2Qur3QH8xIMNL9uonQ3Ih9XEdBIAQvpSoXnNjL3QxEJC5FqxH8xcNmVXuHTu0hmj3EzHz2yzXNzfhAjwvHhhlAJgVXiGYKrHMNdUKXamP6mD4WbIbb8oYPbol4e2Sj71CCJBSiEWsB2CrICV2FlMMqQUiwVk6xqZI9jB+6YDStUKjxBjEZR36HuyMk33Y8RSNnzUEy2BaUcyiqHZeddxGvLeYAFOeYZhgmIpzRd9f/kTEcGyC4RsqxHJFzGZNq9wFgFSSynJ9X2A8xBNt8Qq8HEWtRcxK1bli46CPUdFs8u2YPO8lcTIcCmwsZIZcECJY4bUduqGtBLLmAtU4iK1VghZtFbqIUBANZ0kJjRBKXi4oDhwsfkg2DakaPa4gchZYDsHSzLRLg0nbHW2Nrfo5jGFH2fiVld31CqSYHayo0BTODB4zBV+LO/S4ajildqtT08RUa5IMSNQBzhCVONxCxavlfWCM0kwj2mX4zAsJddR/PAagVHUvzIZI3A8Yj74INo4/L+pQbVBqNiGI51G8U+lDD+oNJYxgGVlULvA1AAZlJdnt5llmYZaEMHSHbM9PVKXhqWO4qW6grhY3BVKdQSU+p/gqOlYQ08xIABrB6wctjoxAhlNS4incWQl7dx5YYaxS8zpUoGCXiUbPUrKwOmXc6eoDaLMS0gM1E/5UseIxw4GDmIlhk11LjrhT+4jlbgca9cwbw/ARSweJaol/EUYdywjshjuqiMOCJXMGo/BuBRAxA2wOYlVpe4gDJOQ2uq5hhpjAuNpVE2lFwZC00EI4tJwpuvu47dQXtt4X1Uylhc8HggJU6AFp0QMBPgeJZqrWYlNeYeFWUYjA9DdEF0WPsql9l/7jhCBWcoX+kidgKui4oDCLf333GBNUgH5sp/Ua1M2rB5eK8y9Gh3EOpYxp0fcSh1LotkTJKVzcC90Vh04+4sQaicEzFcQBV79TtIzgJUBysOVilAIoMg3ZBmrDY9sXkKgCO9mKMv47Y2RG1ZcVcJUBz6PDHfMPCdkxgNN0x7h/EvvKLviSdopqGpeYtQ2yg/cwBVt1MiNvUzKT1C4B0jf46lrD3Z/TuHHTqz+UNFzM0YCKwC+EeTzLqdPMHuC82RwQFwC1cAqAli2/Usb0yxt4g9aIQB0XedvqXsnkgRkCZpOZbl0C30Y9ErvSWQ1saX8D+0hV/a+g8Pf5ZssYL0x/O4MMAjkylwcEzzr46EVhgsq2fUaimoro1X/ALPMavjhjogmFov45MGZxwcwsQovnGqFOhL18S6YNxuInaDuxzNwAArHqG0VRz+XvUrwoAxL5UhpkDVVctxAG1BgPFkcqaigysJgAojZ6iWQp/iotTnqIVYYQAUn8zDBJaAKuAOZzjewX/T1FdB1iPuLwuGUdcmKjuUREFq/OJZZZtdRHaYty4rA41nhiFP4bZ8I8fxHhijFH02R6GCImnbTf6gxOuGJ5z6/cwsocSrIo4mSdOUlDXY12Qgs3a5R6jUCVWIjAl3E+EsC0Kuo0ep7z3nvPee8957z3mYplYHYekjz9y2+JUNXFIsH1RCl2OeuzuMcuNHqZwsDhLLTD6YgIZv4oxyNANBDZi1yxpQ0sS7IEK6JWwoH65Jmic56MsTawewW0Bt7lYlTgA/cR3iokrirsfkdRz5GRGXH3+pZhWALs7yVIjpmbRy/cc0SyVj4x/MZWs2hHLIZZc3I7ZX7lfqSkWq+5SDYEsBGU66IeQeIjTTyMZXBcSkyrog4tF1iEhF5mLPwYw28zCGUrl0rlgX1fcyRDIT+4jAuFl/qWhsaQN4G2u8TDyGMgLWteYPTKqkl/io4GpkOjshtHiWmZiL5Gk7laBuNVaZAW/cyy3X+Uq+iPNwSNTJFlB3ljdeZZ3K+CwrnwD7lef07t8eIyGy7gPY5qomKeFIHCRZfbruVE/Zx/dwsUO8P6qYObazylFQnjEQ2PuFQYS9PS2I6ikjiBOoDe8xaWxlkrCh1eIdgpIGZ48YTkqynUUw2xdROR/gZUxReAHmDV9ynmZwFOgWNDy2NfzK0OEsrHdwdxrqH2S65mk5psuVoiHPMW4Y+LKlYiNIQglBBhA81xFZZYNI4fcqI4Dsf8zDMCozZAqUXLmKyh0QbD9xDM7VF0Gq/hiALIS+VUzFocGWUEw6I5V9BnbqKOHg9cJ6ICByyyFeBeOIRqv0vRm0vcW4GvP5QIMFbVYMSoAyqvRcINCJWx4nUqBYW9BL9LtaDbKa7gQvqPJ5xGzAI7I58sL5jPnnsKvEReTNbz9xuC2LQuoo7ldvHhmpcVQQEaDXp2RtegvY/6QW4jEcRWvbCVKtqI1odxUGXFpiK4h5iOSFAHcFEvdMIC3UfMOD1Ezi4BwL4bl1NtoAr93MogaFlBn+I+waSW++4RQjQ/bOILCj9ruGCLB42Dh2/iGiAK6l7byvlm4m96+AA3iVM5jNUxP4T7mmLgtUwPgNLSGIub/c5wqGLq8EXTwcPTNhDKNFTQEWXgurSKLkhhsxPHRSXmAnmWuDePgFRLnTBR8GkVaRD/wBjuG9oEKl7IVXgu2Dmzw6m4kBCl8MqhJdbcTo7QvyglT4KioKq70W/tqBGWUK1lL2SiH0MwxiuIFzLrGFn+3uCqBZ42/cSzShtiVrSiXRMPKXSz3cF3Gd4hqG+jMnZ+TyQ/bTXgdkLhYZdTF70ezRdQNQ0TAHLW55JbA2TGCKUNWVUIVK0XtKTKp4jtiCW24Wjn36iNAS64jYsSonHJWWPajkn/A/5n/A/5n/A/wCZ/wAD/mf8D/mf8D/mf8D/AJn/AAP+ZrxH2h8qR7JaEXcVr6YaahChX1cvaz2+TcELasRi2nB1Fyzva/mX3VbKF7j9ivsfmYsFTAGVlOEWrYPEs4iYWXPH5jsCuGy3xNOpilbYZob5yeuD3GAkUj9yVGe8oYz6KlaTKB0PcvOeas8mppK+BqDBDMWagANrL4hBavLcCmDCgdOFVeSJHimliaz4nQiQxfMXmyqTFxLQx3fw0gzb8BpjoIbIlwG27rlP4/MEBxp9yqWENuDSMr0TFouUKUYLBrAsZovC0eWFKsbWNNQwYGmz6h1PMn01xAFQXhOZUNpEtB9t4FJTduIMGSZFD6hajivb9IMJcA6xotuW0zGNdwwQzBRg+UwIBavEfNnBqgYXYLs6idrSyMo/Lju8wzQUWr1PUdS/OyG3bqWpRawAedVynBeZNn+YrFQ+Y5I5Bkb0kbtsZxbEGWoupk3t3CkTHwo9wm6q14WKodzKCVAqWLHLcW4WQDCWR6NxJA5VyqiJsDWVqw/mD8sdRuBsV5iM0wrzD1apC2JV0Gi1DxmPASova8xAlrE7xqInamu7A/RBEbiFNUR01iVInRyvQvV5g10JYRyyrjEOtaEKGoYDiDWVAEL/ANSpeHRz0eI6GrZfA3FleZftLSmv4lqE4dmY2jAKZs6GmvcGjcV25YjouIOYlnwEKo6hhA6DD79MS/suZk9yoGWKeOB4jRmjzKIZhtCvxbQuoKvmIuOo6poUkZgKdyhuvUVClH8o8PRpvD34DMvvRiwpzI3jqXVeAJNr0RxjdNl1fUyag3LJU7YHbEuCYuAM0CWcYgCANh5O4obZoMRBUDLi4+NLAbdpd2t/DUN3Sh6l1qb7Pc5e+AuUw2lVa9S3J7UC5hFuFNxJAxcfJLiXKhHA02sC5Uc5acWKbmM1QYMeL8xW/OFH93Ah9YtPFXuPHBAqut1+fgkKBsRpIN/FBT1hcCtYQlNZF3Bb9miBmw5se13DzMgBd2+ID09oGSyoKgtoA8DT9xAyqRl3EKhsMVBEtGvJBNXB44Y9aCXdq/xDiCUuS8HXmAS+ac11HBu8cwdQsKmqarktiC+CFgjTMCK4HkilXEig0TWICvXMGqtxto//ABIiIiIkC9fcqr1iZCZgGIiXRQo8My30DP1tbL+oBggZT7nDzEqgrhd54jStzha2MSaNKU9blZgGCqD1H2TEsES607uR4VIgdOW3Offcsm6TUX3HS8eYwNVqW/CBFm2UkNQUbINznEW/gW2ujwwJQRq2omYUy6ltoTqWjj9EYC3TVkd/DXi47tm4LjhiLcURaaIh2RVZNuA3UVbrDomKC7YXEmoFxgK+2cx8icH0ZzG3rrQWFDukLTwTB1q1cONwh0LaLlklTDUO4ApghFkTXsdZME/EcgjgoMAtrR0dRbYNPxSW0Hizcoav4qUi1M+UoY0OuplS/wBswjBRMf7QViNYEWe02czILw1BuBQVtARPviIkCAV5RQWwo59IbGB/2KgNiirraazkmUcw8ffqDIRa1vzf9QQATWY++pmQPrK1+wggGrwwcWQqoFsoBRQijMbqrgNNHkzDMEihgl9EVqsw2YA4lOVNd/DUI2Cb+ACoKR0+IYoo2KQ8dxuANlQTCnlI6oD2xzDfEPBvEXvhIbVS6mbzi+IQCKpsuxi6VJsu5kRYEAlVv3ozX3MZn9APoqJasX8C0qWcFcKq5fkgewgoqA6eJRLv4ObgzMPHA5WczeWo5hjuNCpm40y1FF/qBQG1xGFSuXiPeHO/U2GwKpjxMbZWVceH8srUDd3CBNMPkiG5QS+MufU6Z0wYcK2Or4/3AL6NAg/mES2WDGWVOLQSOHfLLyQeEqWS6xLsjMo1tEbjNW3uCiNiRj8AejZ/FQFKC2M5js91XUoaKtEBA/SxrxczLWmVU6TLyDiV7uO5/EDgIllOa5jbJ+CxN1jiEIPpkzRvAlz/AKA0wqJwmtnUQI2xtliOZ4mf0drRLUP22xri61KK5iGy5litzG3RqB/2gjr4EIlyqhpgRYYOIfNxoX1EJT4Zjq1QDFdw2IqMKvfkC2V9sotJYG1XGgBe25dz5Si/UaUC6oCV6R/Utt8Fad2a+45gh8kJ0nYwzU1JtnEc1zGdraIBcXecdRFirHcBO0oJt8AKKKT8SzKLKYHk+pe2pzKfSaAmk1QtCxWCEWNBuVFFvKqFJFmbgZClrBKltLgSmTQfuUPWwtw3FuJknIcQ5nbka1UcxjKwD8wJZjACq5WBVpVg/wDyLku68x21VkFCC7Zd9OuYpYY9Mosu4ZUG8QBXDu4lgpSIUBLhq/nNAHlRU2tmi09xHrpBq3YykfuGObg3OILIKBiV8LmbgRqJiIIsW3GjWIuXaF/CFiVlEByoPUV1tuot7ZnoLYRW3bZdt8wtLxFhiXNRfgZbKoC/qcDfF39dShjr3a78SpbKl+IBJEE3NI/Ah+u+sCAkHbLs4PUEZIAoH4nk+DMEsYYrSBkkzbt1BkBaspb2WyocX/2oPBVgjkV0AkI29I1rAODLxtlU/H4hUNtxiUlT0hAgfTBv0V/cwh6XtFsFPkMuCXbDSisCyldHMC2D6iAZKhnBV3csWctiXmJdmwXfMpeHHmWYvMPUbhop5IViOzAj1FBw6liWLWXiWQRQDAeSLupadjZ3Em4ljKHmM6McDMtRcjRLAXgjrZqCiJC+32OoZCdKGj3BA0YGzuMcxKHBum4mQD0SmgDFqbgU2Xf4lFVWxUYlgs1KhmMpxG8MkwYdupc07hbqG1lLUf3ErS8QAKupZttwQ2R4Sk1k7CrGUxFcGWPp/qXRzatRrVNEo8aM3ReaiFRWBDbwUUBLE9puAZcuUOoVcnWA4tXbZlyTanqfnD3mPiDtqO7dS8NaEQQ6nW+DSMrocMkWx/cFZNxlHGYldheS41gwEX+CJEHkzVy663hxXLErEI5mBBLcd+5gHcqiYmQ4c9RLkAdLjhNdjqAIA4KgFGk5IRNtXBd+QjiWeJrxKFgpDMlEFwoTeYX4incEYavGZqgomoAGa3cr3G6lERSDzLSy0vDTy9BDpIIKM2I0PX8yysnlcsj5lnwjH/PmPTTWMX/Y5czKsKa4bWTlUImgvMCoCGtO4IJVoIQgTQP/AKRfDTAxc3IwbiVcKNXAKjwl2rVBiEsagtTCDZKuFEqYWuC40FoPYIbwIcI/eUrSIccRq1MACvAJg6sxKnGdDE/gjQEc/wBwcXCcpQhQq/IgrggENxLaaM2XiVrkLxfwGxklIo0jl/r4coVDGTc+f5iZlZqk2kptceoaVy7A5p8wjYNmez1GNgKIPQa4hOAbrpguPxFZXEBOQVh5g1DK6WKsL7ZgW6ujUQi2hoqJ43fn4s3NtzpvHvf+I/qBKtscw8RuujMNwKJdXohqFzzp5086edPOnnTzp50MYR6v/UsKQLamBmDbbCIFhjob/cyHLQaItu9y6blxvUYc3ZXuXXF02D6DMR6W3UVyuZziIBSJ44iYUlS6IJfU2hr5w13CLRF8R3nTxzFbdTIaCjYlFZmkMoHxF5qQ5k/N/GkZgbYg0UNruO4fhw/HwCpMvj4VI4fMNXfgg8M5OiCUp4l2qVE46fqL4jPgezZBTDUtvNouYkpVXW8Qb3DcpDPb1DxC14gRZpVR32ynNeYvvYAuTVEU0V54Wy8XxDuFK1DdtZG6Me4IkBXZOTJe7Li24thdv7lhyJvMA2PwOowoQTCekoIFZgygDoMsC45KSnZAk/ZFoA4WgiAOV1ERpKZqSRcWW5IWbentlqwXgaIJcx+Biu1Utiuo8JHQGNRkt6iQkGwriCi0scTQA0R6AQIVhbl4gIuA6INS6R6jgyi/B5JWIjtbII3FhoGpUduxzbUEKkuxP/C4qVKjaCxPEoPkDOkahDRqCmy7/wBy0yNPcXKOI5gNXlMtJVesxDUb5uW491Fi0qUBf5jRhSXbQxQu/wARqKXmGO22twDirb4dSrMlyqMfiIFF7A8vE1ZfELlOcTBiNn1Hwsqbn3KGgnRgeJRd6nVs5qCIBCAmw2vEplZs5hZ1WPN8sq5SoywEjC2sYeoTaY7i6Rb6JmOQUmUdeJku7GAW5VsSS9uRFTiJWpfJcCBqei/ie0ZKn5Li1acYNt/iOACZafgqfgNsmmIrMaRFA2yxAC0LqDN8GGYPTsEG+tLMCx4T8RyXvLK/yfcG0ZR0nN+URQlhUTuuWWAVGRl16Fp2RbxN0or5mmNEtocTppwxs2d4OUHOs1qvuVWBWWnDf1EEebmK7fg18Tc+FBguSHVwySrfQRsOuEwp3AL8/wBvruO2dSFIxIlyoqLUuxh9wE7iK9cUaIbmpeYA7ahrZqWR5l0ZQORjdpqXiOqxU7AAvZjiDBm5GJSDyq41wYvThUeYdDYO0p55irzsrV7YXZTOvwKO0f0RqBcqB+HEtxTchpIZiBLSFAJY/iyO5w1Ex4jUoAFuXolq0WDZ4xMhsJoiMwB2rYpx8S3NTaKnBRFxDUVcff5Hi4s6aLlfRfxpLkKtddRKBTFzyp5U8qeVPKnlTyp5UoZT7iJpryRV1TxeGXsFVWYctdxLHNQKMEp4ohsUaPcucAquY0mAy0Sxba7goOcME6L9QZzFmUKGCfKpzk5IETbCEFmMwTwp6iVliwAdA+4EwIpDNNx3ScokxQbjlQXFQsKyvEWtlpqZpcBT2wM5l5qKFZOZTv1oPmYlZWwIS8MORhiwZwxf1AJrPcH2l7mt7IbYJqrVnMDBrNTLE1aAKwrXuPqxKw1ccQ7IYj2qRvSBSgv5qWh5loNlQ84QC1tV9yhDIIBbrI8RCzvwinRoKrWGNMmGKmadMKUHNR4gJvqM0NhOZyMmM1cb14pIfXOor1NfKhjvo8GI6ZKE89QRIVDBqEjmEm45Ts3CPqoIxlHSvraAojIu4f8AwVAzAdsCV5YoP3G6F4ZT5FCskPJAWsJfYxESqYr+YoAVo46gApZG6P38Xn4eQEpK6ezzAVRRKyRWMwCPuULLxFXd5gpVTs3BEgFpklag6TtIkHcWiDEqyOBxBqZuFTuM4af1EjO6XiKFgD9Q9LNZIA25ZdEwEih+sRgjdFDFZLv/ALcvge0v6HV6A3LUMIHUphStN4VoP6Yl5tLdu5X/AGheGL5gKjhb1/7Eu4bKi0bhj34lLjE6J0CwntsVhuO0zWKqJYMGPDGYrGWq8stzVSQ5d4/yws1LxAuGycERE0p2iyXHAa9CIDGb5gadMokLaIBj2Gu0Q7aD4IEDMF417lNPY8sG4m6GHKjqWmOlMPyME3PJl87ixAGD5VhaG8BX7MT7lnUURzRLepSeJQyGyOSTkm4wowORI7WuRIorMJ8kczfrTaG9g08PuFTdgnj/AHFK5Vu3mDsnkmC8nSTbH3xDQ+XmuNDbohZFc3ctJcyIjcWveqU/5pdhVNbt7g2QamGXSzUEa1qjAv4ckSLUcyioc9RD8l8ke0GQANyrKY1RZUhzIyAavhgjesWMwLyASJVxJs7y6mpvDUtiKOoxPTyxADIb7gFdHpiOJkeC/hcc3KdnJH6GLcHuOAUcMfbVcYN76gqQvJL1sDPDEuamBV46+FXyKriI9pkjUhIz/CcJGhxcN3R0mp/5U/8AKn/lT/yp/wCVP/Kn/lT/AMqMcDbMvUrTM7E0NXFAX4JlhuOYrvhixNVhhrxB3mx0EuOykrMoFS25Vp/c2m5VyqlRrj7TMjzCNueeF5HzL0oOL5SDExHTDShSUXuO4MRyhWaqIv4FrXCuGBW0JNOo2Gw8y3i4LavxKv4pEk0NYZXAS0riHtfgZUz3zbd13Ex17Clcs38TaKUuoVMu7QKiVANsYI6AyYQixCnnxLCuXtg38XE+QKcOY8oNVO7jhdNldp3QZl0Qbhv4O1ijFSkhwsVq0TEsmBtZHE8ucEGGR4Tcdr9KI9UQXeeIj/bQcGU7Qll1+J545PEOEUrkWJWXlYwW2R0kebCWDyyQWi1qx1KKw/TKIV8ay3aF1EGUiCvWA0VuNxXLlcpasHUvWJeFaViJeRC1rEay8tFDKClvhuX0PozBcr4FiO7HiBFsItzaJAJS+0D4VQ0jb2wfapCqsCjHqvgD7Y0t6XuPABVLTV6YIDsUY9mSuoykZ3hd69RKdlbD8MUsFkCF81uLNGZaZ3GNQaTFRhNVgPE13FT2VY3OUBBX2zhw6jYTNTislf5qUL3HVlXuCXBumrOSWoXMnR6/3HCumUr0vlltEPcqd5EC2lYfywpAuoclxMwQBU4KFCHgZwE2lYlpQepUdFGxXlivjYG8wKIvUq4/LHc2ig4dRCpKt0q6PMAYUCQmY4lrWJSClX7mXobouwPqXzMss5cbI+Ma6HhriICqtW7+pWA7dD+CG053WJ1P+X8DqIVqMV6YFxDZa+Ji/rcy0z/MQGh5JiA8mItW/caiFs3BSE1prwV1UKZy1mZKSH5gSjKxAUBKqUQeYMxPESqpSNh/MfLL4jyRtM6qyvPUvVqsU7jVzTUqBiIwYtEVc2Sjb4PBN1nACcyi/ELSDXIoHaa3UHiGoZIl/AJTsZFcjWD+5lbcvbHcWIaiQa/MwUy4eHqWTJyU8NMHVL61caPFSlix8IGGIxaiLiXoui31FyKNpfELcTc0lc2x/wAglqmQBiCC1toIf2iinA5Gf+q/zP8A1X+Z/wCq/wAz/wBV/mf+q/zP/Vf5n/qv8z/1X+YTsfuK4lUxzgfiCck17a76uJ4MpcFxtZXbKHUvHgXUVqbFzDwdVSIIxgQzQ1cRRPeFmCKDBsiAyrj+jtlDUsKVQ0XNS4riEQYYjKt1CyGHAzKKFB1GHttCsEU01VOoHWoSv2j1UXwKI3V1w5GIMuLfPxGtIFLtYgI2u243xpQHKDRfUyVpimJU6FFmogahnwyo3UxW4vEIR0NzIeslw7jmYiWsYyNFba4lTcCvhVLxcssC0NrHFnTOY8UVAugTP4YZJRAr4WuN5S1wu8uIZYpAhLrliinMBqGzkgdjEGFu4KRyYDXcFKbLULQhCpyKXEXU+mWJyiuoM1W7Z4jW1oEQuzXwDua8EpOXPxiNEYCitxWc6YrbOBKqOolyolMLRyuiCYnfl9wUemBFFLQ3NlS4vXwJaTN9yisXeD4GLAv5pfzB2NkOmmCrFM3USmVeyWW4gorPDqxa92EJUE2Sx5P9/UwQXMYHOSZ+g0AwsxDsoGZDDVHJ9scIQcqy4tEeVVquZhUAtqLeoiDGBr9eoQJPPiJeoD39Shl1AXi4KNVfUwPUt7Cyq3LlcM6GS4qoHtMCUMjUszuuLvlgdyouD9ymbggZCAwExA8Jcd/h+WTMePUrIcRAdEA3c0DxApiNiDlBiLUuQRAl6JuvZHalnOZaiSoDFDjRcEvjHKDNKKrnn6jUvatlwGGBQtOnxLphEZF4fdMFSb33WpgAVU8ky3wXkPpgOj3b+x/mXZlyivbKZAsyH6YVZ5U4plgZ3qAAtYUGhXcrUhWkhYqu2EVeQYD1R0Sx0CFMqtC0FP3HBAt1X/Ny60B5flNCI0UkrKnTeSYt6QQ1K3wrt9aglpRSAPCEDvUodVGsNEVvxF6XHNsHLL63ggPiAdPiAZ+C3DDKLwrQvUsgrLEcHyVJd8h1LGlnfmCthREz8HHwsboWez/mUxENWwlzIKwkNURMK9x+ny4iLsOmCTMxKbzCmdTwlAiSCwrG+CXLKAsYBDIDH1BZEYQ/Rb/8cMMMMMMMA9/lI+UU6HkWL1bhVIVUK8u4c3uGLMVlwa/z3ENx1amjqSi9iYz6f3FWrzAsFkTG4IpQM8QryWkTQugoKxgZMmmPEW1uVjr4CJiFI0JRFgJZZLpBQn1GoN7gqTTvbLpf4W5UHcOt/PhghRZhIbmz4GW8EYtQS3CloQtVUspGRNPqIq7DrmajlEVvPwN/C1BuJNEZsNVmGZU0AizBlz3VToocRpBiWRylY+KIMRMmHTiLkIFB0RIWzAjxEVJb5i4ziVOYSWcW56iNcYFyQUi8c31ADaHT4SUxs2h/8oAJlgad3EWX7plRlh0pAy+aoiQTmojjXmK9x0R2wwRbDBd1eo8vF0NUGqjrNCZKRHz8VURBRTs5rX+Y45L2vEFTi4iBTAXnmL4UrEKQtHFfAYGTDFSCZgk2SXiLsCkAutU4sL/dxLFM1KUrc5yuZdR0QZFhAGu25oKPre+OIUN3FfR4YwzEeabRBJcRGmmuIEmeML0dudEfgdhC+bzLvquNB0E6RdylnbXjiNQrNmz31KBFRwzIj7mHvzM1iujzu9QGo7laRSmBeLPcyB79QqVUZGFYZ7gjpo1NnBGfEsrkzGO7MrluAHMFDWnUWlBwKl+oiNQ03+Y1QW+Jmrj4RKVx1Abhgj8Th6FvLGwAdD4UdQtNUeh+Ytwv3dY6xVfqGF3hIL8H+YjWkA4t6IrDZDlMhCiJyKh0GURpgkve+I1loCJHiv7lg7UWBpwxKcFqXX7fqMqGaxhIJLisIVxtG1OAbt4SU7gK4sfIQlTTtDHZuyrii4qqFo/FS4bJeKqq/wAxWW/B1iBWIGpYTIw2bbmNu7XmCUtPudTLey9h8ylTBy9xMF6l5dYmxiQo3zFW3EBHrLQQy7mjBoWxkxcGW3Yg5iDAlDo/MTivhD95m8tQGxxbVVrUXKAp4+IooYoWbjA5wQOXFlRmCk4l1nqZsm1D/EeuPC7dsA1yUDiOG4WYOIsw18DDZBEtAEqXjERRG5YM4xcriC54P3PB+54P3PB+54P3PB+54P3PB+4a5WvMIJvwx/cVYl+fuXpzBgGoh9Srf+ZWLr8R1OHV/pIuS6iPzUC7ETgHWY1NFVr6Lhhi0GV9kNBqWFW+kaArHBUokxb3FyGgsKblElS81OJtLKcWwE5V9xDhajwouUq4m5XwF4KIt/Bv4UYrDeZSK9mtxAax5e5aswwfAfGZmGrscahGmnd5/wAEoVLkpV8RFUrFuOyR0gf1MJcWELcqotxLKgxAqLMX3UjvxK+g26+vglTCDcqyAG2AJoM79MbVXQIlmVYLiPh0ie4mpsGM2K4vlMqkpdOphY2wq2Wgo4ncUyTBe5ZhncoN1HbjSrNkW3J3Sc1HXwFviIoCGFoQPEVl605lQFfRzBI7bOyEgbyVcAKWqKXqogK4JkTuCSQtKCcQZorN0rgIzG84+OB8UF1kjqpiw1NWbiUyxOqgXKERFi+IqW3gTQrMMmqwY3CDYDWy2jEDpwxwdlwwXwDPAe5hPyhy/wCOIVo+fJELUKvqULlHd+cvECVmQ2XnG0tEAjQv2X3AjS6a13vl5ZdzAjdzNQv3LNVXHuIA0VCKFI5jOFSltuZL68xlozbBALXkwfmW0bxFh0MtXxXfZFqA55agGc1wL5Y6g1wVKyAsibQiWRopAOEHKjHHwviAJB4IuNxUYArWRcQ8ksr3SU02WmU6qLkBRwpwU7qNlkTmMttuIBQ4X7m0oRal2y5Tg5XiIVcJMJ9ped/Cs8xd+PMdKfdeT/jMRW0WsNWrlsJcXNZgu4pYfdIwMF7Y/UQcDtYZ1aMDipnM1OSi5fWkUsHtA4BOMtd0hEz+MgcJ/wAuBggrV6eIEGwAZx4mWHcWrjFLjIcw8CjIKmU23BcQjfcwV/w4lRLGFZ3RKJTfwqAI9xgxA6quFcJDZBHHD5lp14JQGbriNGqitl1HJC3BjMxHnGhVd8Q/lLHp8yphvTcdlsAE1SXGNgBdTzmMItaSrC0lYgMshQw34VDLAujxAh5k5iHYCA2ZohKg4qOt7WNi+CArP3Bt0TKJUWorY6jibLnI7moqmcH/AOKOgrohp3+YEL1BkOI7yw2V+2AXd6x4mAzuPFy7ggRlAVtdB7lzrKGgN/bbAko10ZsI0aOVcQRFTrEaGQ2D2UX9RSAuVhPJFpQbEh1LgiBqnvn4FmGphNNQbWf4QItRbIt2QzyhoZabD4gZiVL+LcLmVC1heiFDEBYQLmVEYDcuLBnOowKZHZHIIqwHEtkQhSt4YFYE1l4DkeYgVHdGuYntLGOoFcLEzfiBmMVAqAFAHwMG5GgDd/MCaZRhrAquAlZZXwS5gg1CEQ3tjAOnCzAaWyDn4moTBOktuGcamj4jlH9V3CBz8OYtYpCluomTwFMwITRBcqhhIAF1OCksBkwIVVBzLiyMsCoBSmDlcrtckt1drLuU7BZNo0wDBoHliIOyK2CIsQeoos4f1KNwle+IzanIuogsk0SX0Zl4CMtdOssaFXYBQ/Nse8MK/wANTMm3N5furPzAr5Gxses5IFPlNbsSEUlFYW3T5mQZWiPs8Atk6fH3NRbDRR21tjqX8JJiCxLkYWPJ6jPEqPJw/iDc2xBmUtQKSseIJeUCrC5cYHCl+j1MnO+ot55WPWZXUERo4csBQiND3MsPRwTHgpQ1Uc4xpu1CsKi6xm3/AFAquQXlgAKLi2iLFhMlVvYdRJUNTqMk5HZFOa6ZPES2pvkQcSdUU+kfvPYKlwWS28Qj2NdIkIi1BRPKczKEjBASV6ehf8RV4YFNDN9xD4FQ7loB5C42bx8pTVPV3AKUEYK6P8zfKmzQEN41awzHMGEYlL1B4Q03Yt3+9QocqqK6hZo0Bumf/m1XxT+ZWc1bV3xcxAHiY8L7iJ6tPhXMY8oKpgIq9y24tjtr6jYzKPi61DPDJslX/wDE6jdQ0R03Trt4rqKAxrbxKoyhBuBuKJNfF1BEwNq6DuCiCQ4RuFSxuUGQRC9rz6WXRLoUFRvSVBrdM2CGS5pMsujRdyrI5x7UgfRlCS7e87dvEoJNUlzcWtl8xRDh3GWIafgUqIiPknERGIvlMv8A8DPfalMNXt5Zqu/ucHc1mYzHE343Ao5l+GHzA5ED2sTGLJn4C1uApLtbDlX9RYlDDXUFPMLQJYQeGDU+qvqQqaltoU79RVVW138YMslC06lOSU1g8EKzRGNTFeYbipgRlv1A+KsPMGFC11H9NFaIEnAprbMN2KoWs8qqjqbgRxEGzFRgdykRTRrcHugbP9eYWrYPNW3RHtdXc4Ft/UyXNytpnKcIUKDB/wDlgIEqWLGJctUItTuWAUOiNfrxcZI7PhFjB5lHSLzMhiFrn4ONSriZjj4rAJRmc53eYo7W7DzENqr4ixcG5p+Fso38mW5TqPhyXLc7t8jMz+SKK1qX8HXa2z3DAqEZjD+BlaghWDWOeCIYKeowA3HWqrcW2XPiHJ3xauVO04CKMJoFnZUcvL2xLJ9wBJbBH2efuKZzIDwVLiIT89PoIJjVUfnHl/UQm7cPG/pfzDQ5ICzlG6eIwYLXDxGh8HMuoixVHCCCuYYW0N3TdzT48MyEEKl5/mH0lmadJsTzDABwEbgIORVkaPso3ADxQFfkiqQOFTcR9WClZ91N0Fwbn8y7e1ux6lMpwNPtlgXNv4gam2CplAqbgYUVYG2FKQDQLfzEsA6cGvNS8Lo6ME2LhBR4d0dbQrhZehepd6dJCDk0ENDRRMxAFJwkF3ARavUW49MAnLngHKwTQMud4y/bbDxKl0qsPuWGgoAySzcim4trjBLpwyjyhz9wKpcBeA8E2SoxLS6Ftg8CXWmIBAnkbDyjUy1yeRFhkHBFBjumnlK6ypbiIE4U2blsE89O40C0G/fzid6QUbiYEp5hFhagTDiG4wlT7n41xBt8xcrMZJRowroX0QBzuraYkU71aibGVDV6xBKUQ5GcxUDL2z9keB3uxUl/ERUvEC34Ev4qdVFFQW8yoNrb2RNWtddTN5Cm6v8A7EZIeGBQ5UyfuNo2kOXgPg1LHqK62qFKzJG4NfFYnJLxNwCIAV6o1TcEe6LnuIV1fiWdwo4ix8CYl5R8P4YqYlIHMSrwyXPO/JPO/JPO/JPO/JPO/JK9sTvXzUmYF6iJ555hxX8wQoPIxAhhlriFgLdhf46iO5D1ohBXlFHoIzm1+hcRcCTWLxKxNpY3C2VCUMqgU50u3cLEABuLt6lYJWAz6kczYqALouAidVXLGgu3iWlpjBX8GkaomG4cUMwVmEQGD3OYxhWZY6nROSBG3bm2XmLmDmVcXLhYJfw7ltNOUqs3CQ06OX7Zkox5jrsqUcYmKWkKcSxisAq8ESyRbcCoINy6jn4EGzWA6lbBypxNRW4q2zOBTruKXqdRNwJrUsjzMjXw1MPwbijBbFilKRmKCog2sVEvYymvgv4DMT4MswbgWJYWZakkWDKznKJmEYcS6S8a3uUdvBcXoV5hnWbq2MKws+HuM8xYaEgsl7zqWU5JQm3QvMFc48C1lYASRase0sT9iNfRL9g8EEU0N3i/82htqlOpPxBArsoH9QBRZ3mzt5wAvbAAl3kf84lgLakbGmFc40YHmN5L8mSIsie5U+iU+ARPYF4DuVHC8BQOAJSVZmm53mP+o2RKFZq1ojrYcGMEbIFlMYLVrVfXBCJDAT8hkvHcYtFmE++o+0H6Ii73cEbAw2LiwhqZHbKoghQBUqiG5ggqLUqJb4JVp/M4W2EytuVNQVls3QOPDBzKgZOQgxzFGQ9EY3StW03xBKi7iBzbq4gMO1+bqOKasKPayyPlXH7suK67Y1n5BCbCXQWe7P1GrsWsC9BwEdlZc6ugdC1cvLDJ9x9gvL0hl/qcaMNdzoseJRqTmMQGYDEgcdRY2qgGGGIGmR58Uyv40USx6YOorYDy6lSbqm3Xn4YE0O8RM0blYhsZ7YZduB0om6q5n5QPppr3f9Q+FWD3K957WohdqKAfxceuQowarn7jIGFMAe0zFFH1RXlEBcMGXqa0rbZ5RNQIXsgn5hI+of3Kj0NCz7nTXFtEDcJd9zAXiHUvnJ0jsyHIocRylm6lLWWb6TG1cbgcLHEJRLI5MqhruOXwDNX3sm4nkgXpa1iZRMkqfpgwxE5aLgeXmHM6yi/y0PMSDKVErmz4PnHKDZNCOyJcCoLmj2yuM1iqdQ+KGEeJSqsT8wK5mCbxyYlUQym4lwPqMWpYxu9xIK5n1/M+v5n1/Px3uf8A40WNeZnQSFpgoC7gTB5ja78EKdQwFNVcuBHQcAoH/dsFvJlVsOmYQaGC0WxoEe3ieCgOBDiCvEE47hlCxHdIwLWNR+N9LsTIoKL5JYN/00Sji5egBXPMueL0PMYp/Yhboi1dYjUxGs5iCCg3KJqCQdLXBCjlE0mA3Kr4UNRQNO4Tt9MbubbhKLG+YXwBVjGZQEbyE4mYc12wkaPBLEFXNuYtmRt1FLq/EaRMhxuGG0vwwDoy2GfzBRu8yxt/UwmIpqjVvUcQALVuMiEAl3b3EBROTe5dFuPMo6Iox1NrgS8l5OopAv5OobnBeairRf2lt04Yk3NSlZaVgqi3JkAfJ9R2bS1ggWshMTc8y44GMaDxGna/UdQb9S0G1OLg6gE4GYQZzeSCUi5BR5fEuabeZqLUo8oKIIwhpdcxcMxQvApOyOIAWHJ6i0U9xuEAqyxrRgiMGyAO5n5rBjbI8MpuYQxefgLbRlgAsJIH8yrqaula71iF6jhXd/UQrRyl+4jvUSyPdfBbTkuUqXsDY/gghLGw6JuBFc3KbV34z8CBjxAQUTiCnEvUuDIfuBKAKM1LQjmDbwh5uJXxqoV1XSlwuSKSF9mY6NbVIvvUAvIUDMD6aTDk/uXGvM1lFgzSBQCJXEESw8wZuWjYdUC7gaz7Ellv4QfZBR3gbKzzLktNMjOmzqZotyCfCYPzAcFpL20M/wBRHbP/AH4j0rCcxVc2+ZcreYF8CP8AFoVIx5gjjAHa8S6QP1ABQXtHfcJq4SGu4zztWXqrmUtxLrmuWmZXbwawahQRwAPDGmlwrYAl/iUoFWCM2K1Q1B2IZhhWEdxbVUq3iXgpWlfyT6cyBd1fdn4liqLYBfNQ6iJvpx45iDEp2ERbb+JJ4Ncxl3RQRclrCES4mDuiIitMTJpCHJ5y79nSS5SpFYthibIFR+OoEfdo4VPTRKKV3TNapmCvTLu0pafl3A4aULSvPctrVw0C58MZRcgeorcCsDEsbjtBxMNtHM4jA0SpuGqNSVntUSbFxs4viU1klllYlBHMFLlzFGOVw3GU5X6jV41AuA+Aa/0gw19s8T8zxPzES0B7hAanl5/+VXMlKcQe7RtX2E1AMg0lrF7AcFB+Zv6GR5KGaX6gDFxVHl7i1hc3ECW9+TwjA1rN4vMBym77gw8fBk1HGyP6QcBAzs1BAlqYXLzHdICpUHmtG0YBVMaK7mTONkYs/wCYfYQ7r/wICWvPcKmOgqfe5cIMt4MAdIrn8QXDFxbFkjsC/hLxEKcoxoTSaQr3cLB1VcIhcMCWnplnQdilOSVjQBlXmmvxEqU+Mn2RFZK+HUC/gLLmB5XUGt1Cv3KanHWQYMavljc07EArb+fi6AZY0fUMRs2P4m0Y2XLtZYIq1N/A2KX4lByWRUS8Vs6YKcrlvERkddygOmyKyyr+Fgwc/ArT7zJGyzTlRhpWZeZklB0xn6tXqaARiGQCcrZDqCS2YjuXgUcXzELRuFNYfcAZYBgnS1LF23EOEfcLb2+ZREUCgAocQcwpuITpqdwZiMb+KhqK3MPhSqqv1zAWaXHEUlAOsRqH3b7dBysZJLCft9mPFjAjvy/zGEiUvFwVkqxG2AJw5gGno3LSX9VB4NsfuG1XH4MIuSssTqgV6HFPW4ZqrK8DhmstWcpUoZuXplsUH3EA9/hIZLXmyXd/uAfjE2ixKTfMFyi/4i0jf4lV8E4K0Sw1svUulP4iWHlXnuFtxmBUZQ7lWKxVYmPbAmea1LjCzCOhfpMijF4hbiAirx8eEigiFjgIkICu8OjwfzH1MCwfKfmIcqSKK8n/AHmZ+Sg59RyJBkvJ9zBxFGkf/IHqEs7i1cXdiVznjqYbJELO4aeIDlLWK3jgrmOfOitremiG4lMjZms/eYtixXfJDiHHTMChe8lgbdS7oC1YypslyKGuovdGFyzzMZiXQ5ijpvCxhZxErWD6mlamVV2wrd3+oyMHQw5XPqJsbcNrxHiMPhV9wUckDJwJALjoxLFosFzSV8t1qbdRZnEzpa5ftJmfLnA/g8cRBbKgXFgpZh7VhlPcDrVddxblGE9CoIDOBi8ocxwkNOh5xxmL1vFlX8EFEYtQBGKyiHECIWLNTCKoOIoZYRRCVkxhC/UcFUwLtiXCKEwQsGSCm4oi7YgiasMdy73FoKK6IkMvzPO/M878yqik9/8A0LKNcKyIilax9XIytspvEqURUpKfzCkmu7ggThxyLL5YMEqBMqNTc6DtqLHf7lePxCyvqGvEJsl4RiGICKAvOH0hrTjXJqK2LbCN+G+pVLVLFhfu/wDEcRBTZfcVUqeWXuViaRqiKG8sslhKG1jLuDcDC/E67lMMXs8x1Gch6YhU0hDcuoDpiXVEwriVbNG6dcwSa4Cr5VlI1Oh0fC7gKW0eIlGRxMpTRTVvE+lVf7hosvPBnEB0GEdwLjiDd8Qa9TGxwXmNJcCmChdbYlwDRA8viFYFDwkVgilUwXnZ74mQKpdWggVDcq4/66Yg9GlwBOgE/aZmN5GZqEHbCFic5P3DQseyo79Rog3aLimtPITC83BS8QVVnsqGlmtHUb5YFQ3EuUR4Sh8KyYKuVO66gpCOiqSDLVFBApKHEFl3BMBEKMMZG4ULsh3hslOxF3LYZC27CivuOwB0tynY2CRzXVwtTnzAmo1uEaaz2lnNq2l6vmB/CGzfYzJwEdbPcRjjhixzALX8RaDSqnn4vMOzGv6mFu9W4Pyy7uxuo9v6EGVk2avtiV4CilVGBDYnBDibeI6ibgDmWV5lzZcX44S2vuEMwUVnxEG8Q1k0XnMQL+lh5/UWVP3DITFMsWdf5Zcr+QFS6zb8eZoAHqJEhSnSGvjGbFGLqCrkqrR4TJFyOXlNsuKoVoQiC/GnQ+tM84sygeSHUK0LnwxsQcqzL+ogCJkeEiAKruGhGhFJYaEdi6O7mjhj37g6x7pgcwogqnil4cy0zZU1ZqWJTMMMpWf88wLhODVfx+7/ABMGoIZqm48DBg3eIpjeloxCfBdkP7JXKY5Uom4Y4sG7/Ubfg0pUsiN3dfUQM6xKRmD5gvyPP3D4gHMPt+mICW7pA3w357gI3/8AMh7PgDEIFzBKjX3FWFPUo0ocjGyizyyRtAUmyGWINIpKNKjPpLsQG1n0HD7lyrGAFZ6zmByI7Gn5MSlp6y+s8xPirA09LP7gzpvBDvdfuXw0OT7EReCf4pmD6p5EGGjZQnYTY+YgKCADqnH0zE0HSwj5I0dZFzAxKzBqMZTHMyygJC1BwwEtqCm5cLfgQo/+CyoiryJMEuAkLhK9EvwFE0f/AKCDlsjgWU1w5Gfek09EKKiI1NKlqgeJdDoL246eJ9cGLLBsKhv7/qOr/EHCkMMwS1BWBeAJbIeZcAlqkNgkIfAjcOWHRKi5BYZlUMFbwIBov1GvI7PqIi5Xl+Aix8A/MoYy77RPhMXEuCkpWKjM3HDFlZl4hVl68Qt48wNoId8vmVKFnA5Y3FrtBfMFJQS6C+X8RsMcEGDwm2VHHUwQcOUlLLoIoXOQET+3tqN5mGVBiooTYr8QAptrMN4lbzBNOYZDe+IHkPEqYGBuV7EW0oPECivlblFhdtIMXeIqMv3A2UQzmIdVcpD/AFh0BMOTZ5fmErZKRT3MrWgUjwn1ELrWqFqNQYm0OkYKt9fDqIPwDMxs3OzUDsMkaxbYECui2JeWLY1VkCMdQu4FkDMVlbOZdFbXbFJzwrDTR2mU38jqJYgB06igBSgH+0EhiYxG1MM3cz42Wi98zELHS3jupfUWAvF5+ozBVQEWB3zEXjXEpAfcG5ZOgy++qlirLUVFxZGottuWcQXDKBAzLiXSCzE0Nlx3L8ZmXFRPbxFtcECGuOWcTYZjgYjngfcINF328ephI03b0QQAS1tMuM8/5gvaNMdMUPfiDLF1QQNeKAf1qAmU4MX7uDBYKuhnny0Lz3OFzVk5M03xc8G4YJnmonqv3LBZ83DOj9xImDioiEyywdwGlFsVuIdLF6jGTeOTGV4YtZKG65WhPHULvW4FVpOY4peML/M8xyrp1GbrkMQRgSKPucO+Y28vMrKNLGiniJn5FZdcRkqqIFawEE0qKH8I6gxhdcC3bBUZEWLDrUPyDuf3xCVjUpqJAfrFH3uoOBlzLIrWYV7+b3AlQANXMf4iB1RarbVUBzwUhPcLmKzPEAEZpKWQXO0guo7dhqvXhhMK6hSnM6gHHDD+f1FCozqNJeNmzS4vxDHt7JUuK3y/ET+onD8pwHCJCAFDVOPfUrsxFURIwcRRQEd109xXa3K60tgeXv6lxVVeWBJUAYcCg6DGSR9yuLoW29Mal8Y4ujsTH2JWDUaW73UJ6Yt8mVRTxLX7s5eRPsf1FJHklVLpJWIsIi3ax83goF1bZ4YiKtJcAPNsamQioxHINvHBCeIa1mChVp6guJWplEr4sYcyoUPuVc1BuX8AIB8UVBLDZBwI3FdX8dH/AOglsD1As3zSKqUdS4ITsjpdPzLejYDH1C8p2Z4Yo8S2h21O4lfjMJhrKLXCto8YiVLzfVsEUrMUpQzVE01ClVHeRrogKgdUuHQbYq3uPYAzCHghK4RGFoznhZfr0YA4xeWFTO9MNCJR613mUP0L2ubX+JewrYixrnWHcM3Sh7PIRWoNjLqepVxcBt2whLlDiKrLwLAqa+dEL6VjuO5MJV5lIGwcM4X9pq416l0cXFZLXaxQDEAMYIRVwUbiUp2YjgQGmRJckDIV2xpEyJiRTcLRVmBYIOYOxANNHmGYIPPJM/14Q6zbPhORntuAKwUx9Sw3EplMAthTZLix6vMeIsYKzQvzNtIpmAiRkxsPhLEu1RMadrARJcwvlAbRuxvRFTQ2GolxamRiJz8GpRxBoX+IriYjRHmPB2IrCYb/ABEr4PgYZawwG4Fyg3rxGrwGAOIYI5y4sy8S0I0ws+n7JnBnYzGECo5IgLugflTf3BFOXQeRAAUqtxKEQwoR6dOMkhLq4L5oa+k5+YwWB8V9Ry3GLFpAj/mZLixu3+oBhZm1WQLg5CkrhhoviUhbcBApS44/yQIvNhGn1KsKLC6/ozcXOBwNDojMlbrsfOz/AIiVdjbZvCuPMVQ2m1mYarg5mFDhZV1qWG2rlKP8hKCvUrUt7i/FiJb5K6jIUJYLdcQG2FeoYPQau1jVcSjbMu8+CNX6LCpVTZvTAvCIUt9xHuIG39ksTxsKn1KM54N4roA8hqUbb7DoGM6WuW4Jj0wS67xGHAU1uUUDkMFQzu6LsROpYJqG8j2mJnMR5IQBgzYJLHRHxANbZl/EskWh4w4mTwCtVjS/n9S6zhSZSHrdD0x1UQ8DxMMyCqCNnMbZ9K/sQBEW7YfZB42Vb94ifOXBLhlTcrB9yteATsatElnhNeJf2FlNckdwCJpZn6NkFWOpmpVwq3LjIC14IKoLBt9RGo1A0E0g5+F0pzCWWAa/uMSDhhgyomw8kcZKxbL1qDptlWhs+k+5d52R4iMwOzmGJtMNAxyU7lSVqmbP8xlMBqhy/UGDQuwIYA9TzjbNGZVwMxfgI6IFMRrzEqV81AqURLK+CxCKuGCiVgDAvtvqW6fxLdP4lun8S3T+IpC0aBetwRWX8BLxBrtaIoUM5s+HcuLb9568RG0hwws02tZZbjvqFoMH5IVNlqxkDTK1dnLFAUAt6hLgYduYioodDRBGZlQZaR8S+CxpWcL6I2Z36I4QtHAO2ERpR+70VH6imteDCvUHAo4DD/N7P3AB8gLX+PuWrMWwLgV8XLT1LVeZqVca+FohghiA6xBXDEcTelA6HxLGw6wpERnZUVVZWK7fJBepSBnFxxVxY8xc8wV4WYFRzHrAolrUJuOIV8GRV1xLK3axqV53W4YaEbt1G7nfmXfoDcpGO4bIFbqpTi9wcjRslfegKsv6IHERsX5EA02dxbDPD1LNrOef3MACpmoeLjNRKhW0hGHMFQ3KJccsrE4hfqDUvEE/NczinklVs8+kyjSDfxbgsdZld9PXMWuIpioisg5jWJfwSZG4sQ2bGWIy/Rkcj2RPMdrOOYZ7Fi8MMEQRG5hbXTHwWEMt8teJRC9hpDT+KlWRKuBjABrqBigaPUr4RGaUyqIpdcRFhkoariMMMbhMQ8Jr2MYiI1rnypda8er28woWyyKhDAMmXi9ouP3MhVwbfp9Ixea4OTWNQqEQgAQNAu5TRRqt48YghsPHJ1CVGdax87P1DJLlBVREUZs6WBUbhqdabgBGhjuGYpaobpHgh2LxcSCWzWvyy3C3d1U+oVzDq/aGYlvIfRK4CagXG1rrDRT3qE5Vts5mQJ7ueamFX4uXgj4Ygt77gDlg3qO3bFIz7MRFRI6OI+Nbd/8AanE2HOPL9xW0PubK/EoLYSkw1XCF5Zwl1M2rSe5TgN8LSDXcRVKtE6SDgOiw5DGiNjGgZT/EWB9QFpPEAAgDV9tsj4nPC9ru/wDT4OdKx9kdbxrD9mEFC1TX59y6AWq5TzFV+ZQ2QKIwoxxRykfdooq/Dn2RUzKUZGUmpbGAC10EMH+QxH0XAOiLUSy9QKYZY2rMJDcifD/mmBEckWKj9IMElktBFlvGT2Sy8XDQxSgXE5BQFrKuisKubeTiWdRXGh9RGiI9Ms7gkczUvEq4K6OYSlnlOpmXBf4u5g+FgxpzKiXoanpNRLKIaMgjuW7fzLdv5lu38y3b+Y6FcNcoyND3AgG1qHXcKGXy+YV4WNhEkCqzUGX+g7R/UZqLTjH6iKp4brXEvc+tF5sZUal1g8o5JofU9f4L+4m2hvDB7tgdwZNh15DArz6jSOUs2EoMPRfXmY3lWoOiVmbQcQwJ0VuCb8J4IMxGRTQbL/mUugdk/wANn1BuMD4MQZSj5LBQGY2hSLU3FqIQYtlplylbW/8AuJm1Hq6n4wHMouCyeCZNdKFxXUcCiyl7lYhEx8bwKsM/IFQYqN74fhRReCtt4Y4sA5gg3HDBtiTaXHvk9BAENJsYwVEN4WMUIVtVFejiUUjFlLpuqepYFrsHYRVBQFF6McRHYcikCtb+/hKAxCLZRGiBcuFgQuS3iJgJ80/iWKIW7X6icrtYGBAtVjbZioaHEQzU8xBbPHjzFUivULFJRuUvjqyBUHMNRqIZV3+YxVgLVAVGWwfa++5eHlBK9lhqv4hBot5x+GIHZ90GM3jE5/dfwkbhTe4ZXuU4cdnq2odfsjZ4WYCfzFQoWuEDMGpVy6BpJ+I3HdEY0I5hiW3AWBA0t+IIjlJQ9d+ifYqe/TY+2EEReQuagml6i/hCwlCvLErcqL4iqqzXQPNSwI3eMHqEKMRAZMMDKldtwQJC3CKVn+YThtFlWTDFYFZPbw0jHD5RtE414ilEetMJywHeyMDWaOD7lyJnQu4enOVG2uqj7rdO4+dQpgQs8XuVTMDSxtFOJmAfCrHBKEm4qt3E7g/aK2JCDyL4jLiBEVf1LHMumQtWYPA3NghgKvnYvkhzcLTYeGG5D2Sxk/3DgT/l/CmEJyESwgKYMNEXEKTNynFTCLR6m3WZ/e8I6YP4bome4VaP6ln8IL9kqP5W/MEuBty9IysJDr9/hm+LbA3Ea0Xmxl9bmLC0CzSEVpXRbgIGogvQx69WIxRKBkcN/SxVq6TiCKReC4oRJaKKPuEKNpft5ZcTNHAdEqQvgmvhUW4bW2MWJU2fcZRbzTo6YKZeIlk+rCsg8U/mLckFllX+BFXacMHsq7gt5Z39xri2dqwq2KPZCL/kTMcnMCFMSS8SxjvcshAXJLMFC4lXDQruCGOyUEWDU38GaqXzahcGvg38JQaD/wDPgq0jkieCLteIjJ7OxdnKSlt9KnhRLC87QfRb/iJkkUUh7EvyBgyU8sNe0lFTZA0lmgpeGM1AxVSw42E1gfF3LG73thaBUGkxBczSW/Zj9Szmm7fQA59kePzMMniC3qBu+WN0tdRaiuVgoNuzD9MFCsoYXSMWlC1fb0Rb/k5leFFi/cTkl8i6hbP8fcZmFDtXwSxyZaYH2v8AUQBogZd0v5qC5yHM8n9fiPFdDvih/qV8Udw+XUJq5dK5sPTMDNMNrGooo2t6MzL+EttFqMWNgWGp7Z5OJjgO8C9D3K0srkujg+RglMaZiFDdrs6m4gEuhi0oBCr38WhV0mE+0pU1EJdNUVKw4RSLPxVDocwCXTnMPgSvUWVfbM1rHKBbXt4jcWaDSrNwXQQXGHcZCpWLnqoB0PwHAi7j0UXcWqMWUhmnGg7ibfR8jBNXt2sAQ0ohWIYbO9KKEUl/WZoNZdyvEA1G7sfafxEtrgOA6PEtYtsSA18CpgETMTMLz8BEuUDxK63IVM/IDCvMC81gqVfaTOoNLg4EHapIYrVDbB9xToexTwly32o/dAyDNQgBHq7jp3UopID8JT6ij+sD14gFiXKI6gv1FMi8w0yeiZDo8zFb0v8AlN4/BDX6co+iCwsXUdObn/O5YcwXDRrPmNygqBs5/UJa1loHKPkziWZCok02Ai3Ahq/LEYFHIo2xzqNTYl4V6j2FuQZsd8NRxXA2y3GZdafC+BuXqVwqv1LIQCjUB6ixkRSzpGDFC/JuBXlOURDb4EVqoiMq4xCsVAHETRKZkEc7uNIhi442bnVE5faXW1oUpupdlls5zMlH5FlqWqrWP3ccZRZTX4h7f+X8LJaKnrkcMsi+3fqN0KkKSUlgkXE88ERQGQ59O5gnPQ+NT+TUTVfhme8Co/8AUdHK6cfUs1tnoxVznxFa5pE1QZys8FwvbFRhQ5RHEq5Bw3VSxG8jzm5TGg276F7jItbFavv8RDVIG+16i/mcUpgjqaYOJUFsxQoq3KzJCF6jN7for+46S+AKR8haPrc5vrPBwRIkXRmOewzCwRcEDVRLlEcTJIrkNQUqIhiNwXuJXwd/GBDcShlMuVOoB7BojPmer8z1fmer8z1fmY+48F/UwEWaKPvuXoCq6u9zf7C8zNxzzDBP2/8A2YrOQbF8GHuUOSzY5ixCChXkGHfEGJrC1L67ImEq4qBwS0Vo8wgscga91DtpqRiU0AHCXM61dDWHtxF9WC6zuCjIC1P4aZdsHCRHrCEp4vcWPRsAcFOt7ja3jkfutEPN2QKHhxC6yh9SgC3JhIHGe2tOX315i0YXa3ZwR5e29EviNjURAUo0py+N5NMNQ+1a/wD1kxE7Mkogy4Q5lLgRMy4GTTLHItOPis3suuLjQauAkxLg65d06loIcA+6mQ5tgz0XFUOvROKSIcNL8wycMvM1NwPgMALWKpinErE17iELWvEboIqHcIWTnVm5eYKAvLF7wgb8QGY2EsWlLPMSoMBYVldGPUGYKaeS+fEqUqUDiWmcF6jmFtUtXipSQqZAlpnv6iwusg0eCI6UjEu6htlzsA4QlAAON3KVJVYzLppcpAcDRUEs3LCHUN+I4Ao2nLLxLzczqYeziCVKEUuz3LC2U6nkTmMQk2ZPDK/hhczLCL8HcTEuvgWodwUBNfpzJ+4kkGtdD6iyQ7Gkll/UYA8hlBkgbc8xbSWrFy3vNQUMNQQl4Y8QzBXYQetwuZk0hsWrVuXm8E1J2PMe8rjaXwXjspm/ZVYXUI1oKsh0i8fXEAygpEP3uPkkuA+sXmYRc3rEX1bEx0jCjhQb+o5mAoV5alRVltGJdGZaql23+4q8tRiTFjYxUuxsJd2PDNaTqIV0+YzUUEMVARwKvu2N4zSLWiWUNaup+pjetu5HkykQ9BpH+YaoHoJENCbLaEY8Kjol0VU0ZhHZEQF+CseiZwVPK6hyDEHESr0hBFtXaQVDoWsSIKRqKths8RCCvqCUXP2M9wxwZnqPcybnfTD2v/38KUBleIOwv6o5jxgijAIweGEq9c1v7j9VlFWv8TGVWDV3hr9xg1bitvu1i7wF4vUKvo0ND3H5Uqqtk3OOziLAs2VErg2MXMPprJzWPcESWM9uYQhE8R1RZlWiFGmXNFGIkMWbJmWlq7uDj3d9TWfqXzcQNn/GqhIRkKsHZAJUl0Yfg8y0dwQIzY7H6mNWOY+45P3MssWWvEvUiCrI/wCIpVNwWHA1rng5+gxFVovg7Vtd3HEM/AdECZgwvZkNRKm0CsYFxJmWgxuAELsC/lwQRlXMVRL+Ll5g8x0o6LMt9QG1iGg+5XbFdsV2xXbHMC9RwVszzOMEK9RAFzHPfUoU+A0S7RApTVnn3P4Shc8y1cs2r2i7MQlgCqfqMSmwJnm8QApa3Z+mIXGZFDGdCHFBnL75hfCQO8g1dzr6LNxitra8wwhcI6his19eRwq1fXMN3bvWvRGl7syLtGBq/a5Y8QDydwagehYLB3oAe5xYiBwD52/UGaB2kRLWbT+GZQjtDE2qbSIU0bHzPwmAfCcw2KRqCNTy3H6TwgpIFRyqOpxLYNR18CIcLmLLzcc4xi6ir8GCXcBL2XxXUcrYbduEZmzFunmtMUYCPTCKbolIP15KKLlVq4p7klhLGKit8RFs6yXB4G1ShBfZWYCnVlTuEpEu7JR5mD4RsgUWsSoVcyolJxBuvBXACpRxcxHRmF3DEtx1uJmR6MyMOnW4POOWyKMFtNX0S/mmI5gVopb4CUXHUTbWYAM1z0PJ3M0sNywz6qWEwwA7SbEOtxYHcSt3zmJcRJWdf1ECrwDgOoDEJSmKCictkRzuxyVx89+TcV/DYhC2LxLmyJBiU3liAkDJV6XrxL2SFBVPXP1F6Z92hxfhlQRP1DHEsBXtiNy3bLiXEqBHE0W7d+kXZOUgep2YvgHphRLwCypZLAabnLLumW8v1/mKmaF6oNB0EzMS+V8RaVWU6BlfwTUJa+sARGQ+Lg3zKXxCLykFZDniDR0+GD/xGFn3FhKtc63LDGYlHDj/ALmAZaE9Mvho1vFn9wv6AhVbzM2CwwZishTQ9RJtgG3PLBqFVt6gtevixxBSWJaD25gjTDCV2BBpmAWrguBYRe8x0nBeZUDsoMRBrXiJRFpJW4lvuUcS7doKjauP7mBuZy1hiN/OKf8APcC0GV0RsJRX9o4mDcR6pgD3Ciz7iYuF0zlhS6r8Mp9tQsfiahmi14li2XNgeRBxxLHFe0IxSNJFoWh2Shk41r3Faq41sRnKU21MiO6AQt2OVh7hZVBYcO/O9xGKptWInXcts3vc2gYleOs8uzzGq7WhFFgCLcsqFrqpmZ8Y0e2JdrqDUoXcMpPaqaAykJR0mn7lJOXlTeK2PIRWA2sT9s5mHiBGmGo2gtBslUTcXEuiC8wLYRY4hDCxQ+hil4NAWErK4z+pabVgXf4hH6AgShvz1L1dYlxCnMvtMubhUr5C0CU07VrSJpHiovYLUtZb2y3tlvbLe2YnzeMPEBcl4QeyGQyy9chYfrNILXb2MFy1ePGpmZT6gpSujp8+IGYt07++amAQP+0oWYMXUuK2keYE2ghDQP8Al1DBiVlffyeIcQKuSdmscFwSwpXICKBuUFZYzKoRp4HCSwAUG2GFKFJdR9MQSokEUIPcVyBZTGwI7J9lkuApRQP3zLZdTgCPQe6dnJd55gwCokMnLj1BPURB9F39VCepEv0sogi8HY8EImEgqi6+oP0bp2RtpuMZSgwFG6LZYYrdFo9GX+vgLiK5VwXHAqgHx3FC3m4hUjghlro9woaFCUQ1jC2wAbLYnniBSZozJri4K02xamkGzwKIOgK0BWI2YbIK4ajNFrY8zLxApYAzmFQzgQhAIFeIbdqdkSrOJd8FQWrOzgj1WoOB0QuoqjS2KgfSNNsN3JduZjps2R0hDddxAwDC2/0ipNd5j8kvWcRMQ14D6qMzK1kVEvYbyVGCe4/BVK4Zewg8y/VuqagNRnFkJXuln4WKhR4KT2Ral4jmDMtWJbmGosTBiCNu9+42jpgbEgbWnkMU8+4wYSuLJ99Lf6jxnmjlG1SI9Mxl0iyiUDBYlnt4l+1TAgJUxURfEuIj4YypGlJ0jOmOKL6ieKK3QTNq6JWUw/LMiMwS8zLiVWn4jWoPx3MZsL6lFh3qENFyvSazzAxVC549VK2Bz67ohUE7r7o/xDjUo2BxcRQPgEZCiWiHH/XC0Td4igYxiwfUvAobJb5Jv41iWcxLjVxM3cZVA5TccItfBaIBzNqV3co5uEDmWLRT1ARWnYLEDAVbr0cTMwlBZnHEui2UMRJZ+41qNQeWngTUAYQ3QvcsyXUCpdl7YtbLtZd/zYZRf7ltQ8kOqW07TsiNW6Ts4MSxWpVNdq/WsTky21+T/wA1KhJWI7AWRo8jz4jryaYMfpZruYJPVNVLgkwDB7hvzuq7+jid4poCEb1Qb9QCiuuB9iHiVSKAqCXj8EsZeL1yn9MENdpnrwwQ5+7f4gJR/O+4gyqI0uNk1zFWjAaJUq0FxZVcstYhXwMINC3XCGqGnpmELQDMIZJVRImhANWroIoscRu1Csug3EpC2CzetZxBNw4My9NM1liIXYd7PzEjEtm4WbS0mFDC7gwqUQ3Ejp4QiG6hYGyvcIcWrB7jU2Gkigb50SyWSyWQKBclZIIKWKWU5i6C2gDbLDGNZcWM9yr9ywzAFobagPD1z+SxmGH9/B/N/U25IPc0Quws4gSn5I7vsTDcuI3t6xKSyXLmPU4E512JcIHBa94/qeJWc5C8l6IJDrzMJmAdjV/mKbgwbiol8UYg8MJaeLIfURrPS6xxxFvLKrlms5mjCSx9WDl54yfxBy01Y6x0/wARSmnmHrHw54A7jUOQs4fqWgbXMcMcuhtzcsUyAvJNotTfwqIFueCFLIFhxBbofCJhHMCAZe9wZRSHsrIRi1VnO5R8bXyv2iYhiLoGCWeZYwSNm5o+HYdnw0QzBQMmIt8MFB2PkO4FMdt1smF3pIBD8t6JwDbD2MyS2WUdxFGN/IlxTiJqIKSv2lL51T0vg5iWlGSn4jxEjrDzHsG4t1bs6vUtUg+SIc2HxBJRIFUbYXmywdreQBb0yqt3lQvklQERhA8QajnUICqR8SgcYWgoGagXCK+BI2maaGV/rzMJI3Yt9oMPOwP7DLF0+LV/EOKU8v5QBMv7S5QqtWrZI2OJXYyga+iCmZAMstBIcdHtlgOKAwBCKiIQYy9qHYG8jEDSVwO+TdVj8sHPKDaPuUdGSgv/AAijGT1H7DxxFqfpHMVY5mWh11BSK3nMuurhssWuiUBucKDF5X55Y5sME1jiCunhLr+orq0ACghQMUhZqBQBFwy2P+I0ZDDTy9wG+33YyztQbOYICMPMTaOhKCMjV9MEWkNqYhwyOIkmrZXhXfgnIEgKenU0gM2qHNcSxhUI8J2RCjLsO1aIxIppCiNtuRiFTsMQHUbvv3M/9RV49SmOTk0IQXjCZTJhR5JURghe0dp/3cKsG5ot/wBTKXxFsV9RUEGODmVOWIKr8148xgQVpV/cPVv5C7q/RNfRh/whta4sBreJca2g4hJ4tNzZv4ii1V5YaG+He+Qsr/UOjp2Fjwa3cbuJzZQPuNpKgr4FxDzDBGiF2DxmNLn4FmGpZALqIrRLKwqg2vKxwipxqcMW/ctmDTDMZT4eM7CX6L5Za21Mq7uU8vQas2e4UuVUoDtNpZ9QHXA5FQzKv2Smxeq4TkM9y2tWG2QwS6XbqLQBb8ypUzbZ8Er4UMVPkbiNvzEoS7Oz/wCaGRGzUNGXmwdi6biWMmMCER27XdxadRSp+ZeqqvBGCbhIlKjVhgx9sw7+FQVb1PIQ0grohNH3qIEpoos14hqONyvXWUKs1mnUfG+gBWI3+oaZHZ0VLyNNNUXR2wCwo1TK01Cwu+gfnMY+1RycVCEr4c2GpYqtwFmqG7C/8RLdwRbRcFiZjJAC97+4wjheB3Hkc/NT0svBUKgxQFPXqOyB4Z/39SqtP6IY8DFzQI9mRq5TGeh4ThifAgtOV/RLxgoHiYcl9/j5BcNocS7YQ5dvcRl5lxag3FqLFibgVLbjLKupnW4yIM1lXmptHUFkFVGp0MRTbZ1HPAeo0FqAofqPUNS3cBqm/wDdMpa/GXi8xqxqg58H3GTKpGOXTuJaqDIy3gmNnOHEIYcSn2FiVajsuIvOmvPE2BDBVVqmfwUSCdX/AFHVRNG0eYGIlYHLDzYw3eXpqoZqMGXF8zGkuilhGrG85IKUF0yP+JV4KwBgCOvg+DAg43ljwvQeWNiCsGx8wI4mDLsg1GJKTTLTUpKdwLhmEUQag4L/ALRbbdxjSXY29xQiGGbbQeZRDR1iCLos0cRfcGPQFV08+I6ZYrmT/ieKmBWuYx9dRQ24lscwHc5oo/MVkTAAeawReoC2FZxY1/MJ8OCV3bh/cdK7jOyIaiDTkiBGAmPbHzbSjuMtDzAEbBeqf9xKXcNIVi4iDHpGrywG4E+N2maYpmboQ+4KJqXa/cGLnsyMWBRAT6vEsgUyrtlcRSRpISVamsG1JeFL/mWZgd0qNvOYYqeIjZ4GRHKH7RGEz/R7gCF3jNO69QRtq3L8xUaIpacQM4HEioVj/aUmiP8A4uGXpbnMhuGxZZH4w/Gr/wBR2iA2uYW0+rM0XpBMR5cNIGC0Hp8x+96CQJYWdcx6IdeVD0rVbIjQchNsyItwUXBka60uI9Sffw0heJcG2EAg23hSJa+WB2QgMzUckGoqfV4eZdyx+SCyOoxrLBE+CIoc25WrR6KPv4BAIxbrydMRHbtBqC0u0DHPmJyJCZpfUaipdgdsI6L7XUy/0txKKg9MIGzSkvK2ZeIsIlykauZPwCpgy3j8S3j8S3j8S3j8QxhnyhNzCmZf4/U24cAODTiHAlSNMPOr4+OriWMb9S8YN+fC/wCUHohVIr6qqJ0R8NrpiQUnN1sl3q7aiugrkgXEaiWRjrvAyotzUxYcRhboLE1LiNFnq4xi+gXjZqCCOHmOv7iwUAMC1yhRR/QMMArnpw8l55PqKi2Y+CEKLrUWRJSVcnebLOZZAMGxQujzifndbMq+YHdGIvA5fUaKKiNAYoiabh6lmJE8XTpFJ4bS28rJrIZdpGssJAjagLhS1VbvlgU3KVAg+fuGSJUNzRWWGKou0+GBj4WOSUfC8/DdM3HVV2Wt/WYwx18CVC2WrR6zAEiXqoMajqAJtypaIpqiv0sH4CK7i10cfAb3BFIFXBMeLKN3Sv3GcbDYewUxzLoIcHN72Si3L+DMRAzQWogXaWuBZTqqcmNzCG4USukOBUEWAbvmJ8SstLL1LXtPUuLnq4vlhawqksWeIp0PqMHVu1laxOramJp0LErhKVawwKDDPBBsgSy4bjTDOj0bn+H3KLZWQtfMBBuaM+0G4lzCb18CLUFDqGrYctW78yy+AAPh7hYFuGQPiCNB0do7hkjATB5nDA5epaUqMEMpZoUIupcM8wRzkGoFFuqizKB1ucrhmgcItfDn3AgqKVv7Sv1cMUQp2Xgb+2EPRqD+jEe7W29sFUp+J5Z+YZLR6q4f1KZKAaXKdDF07YpC6cZiLJUI18PUgAlL4hFozIkL7hE+rBX0QyKG1VHASzkewqvrUCsztlHiJTNBCvFfDFSWPwZlGNIzXgzMLYyzAzDCZOYp9QHUY0CW9CD+GvR4JhmNEm2FgCnPm4JdE6zLxggKrJBjqf8AS6Y26ZV4fHWpyzoepmYXcFdzdxRNwazpiba5VlkdsJQ0YNFb3zAmksjAeRIYUVbF5iw2XjFQQ+DxS4ZQg6gDaB5Egotz9vhlooOGIIGVxBOt0o4YStli9MFW9dhiL8Uosv6RZxoPkCyZIMAlXUFRLhTiZutR2wOxWyPOj6hAhoE/d/ROQDxx9plihc5VxIIx2RL6ciml7mZsJoYplzOPiZOv4Ib0AOT4X1s0uyKnGuLlqNmzpLeTdxJa4QRcy+yYbgCMUymUymcq/wAxXvPuJLmI3SQnHMDF139XFxsqmaMKdrLiSiDVQFh+ajEXXL5ixnP7lgvcpp3AtVByMaxK2pVUT8o8GjIzRH7wQu0jzR1cRwHMD+YtiNFf8kdSWBP8w25dRN/bNQadmrcUqIEtd7WjMVJWI1jde5nZAD7l3AaGaXgwezMMqlndRvHK33FyZ4GOAd9wcfCECmAOYSAD0h+YPpwliFK0xaDDK8BMRGeygYIj611YkVH15H8W/U0ytAAkomq7QWFO3COzrfYwGdvdB2D0w8By2cwcihje0GlVurYA5WOnABq7D1EBPrWH1Ly9so2c/wDwaJi6ZyGyXEaTaOSWvcNQaiysX8KLVIjyrapTscsGorVdMvES6irQUlkqzmASFQs/Adu1AZZa2FzN9TbMk1NxJlBt6xsFQztJlr9BHZbKxDPW4RGqdkZLbBcSlW40ZCfcFOUoN4iJbFXAXiI+pYhf5q422dgGF31LbVVL4z3C8S3IeoYwezM9qjMLmZRGkMuoYH2EBZZeETcsoENnJOyOWZEtHaMNBceULtaXgSveAHZDFCljg8xzBaF+pXtHg7/EWYXreBNsqpKodP00w6FNNy6Fq9S7DhJlXNZlz4hgiaVg3AdVOY78QKlzCoDszgCuwywD2PmK4sQzOeFim6eYVUM4ynHEQV7fiWDo5HPiLBC7c4nIGNQLXl/UWIVPHfb6h0oBfYHggqHoha7mO2+uVf8ApBXIZKEuzMzWFrYP3EvzBE6GDatBCmVupt4mCpeT+4DAFy5PCRhXeKHGvMbkDwH1NUPJcy6IBoStyDiVEtYEG1d/Tk/uDmBVGVwS4BuR6l24ViDBPgSaeep6VL7vCdwK0WV468/5jR6YlZubpbgKoTBg/wB5ZEuD/q4ZiW8zFmBM46/zCjofmLiCVcxZWnxdQgLQdnmGq7bEGLR9joGENwqHQxz7+paWTsdzCKX2SneTiMlP6INfAgAH9p9MbbC9z9SiWMGrqLfYqwLsfbHNdmAEchHY40wwR36keJky6myVULY2gUQai3EYICAo3nMfBoA4f4Yr9xLzFKuGC1muSpf8qNdS6AByOaf8wyJWx/UewDFIb9vMsG9jKhLGEol3CbWrENEG0sm5UFGiwWwY6mZByHCwJz/9ALXf2Ior34lehODMwtVMciXng2x5NQ5jURaPJX7j7DkP4BMR47DrxBw/c8fzEZivPmLWSXl7XEEZGnsl0bT7YgqiDicgCDl/dRqVGhhkUVW0sQaV9so3YClyo2/Eby4iceLop/UqAGKlW+poBbKrH2OrmeM0DB0Y/Xj1FSw7sUrJIC2uB/gmxs5Ildhhla8HEypryDC8R/ahnFz9viNslALStq4rqBJFLGh04r7gB4EyMPx7iJVkj3i0RNpSgLTWis8SzYwubtHmcKXKwHZ3KBy48yqWXuDUWwpyS7xo4PJ+IFG55sMQENtvgpxGLaQ4OQnioEUU3iGUsBbgG5qGT4uVKUD1tiEqogYLYP8A8ElgQYQxkIblUWEQEua3VcxC1znITihsGh9MSAVbf9iUqyrbUJjg81KAoLviCrdoUvUGn8BrCG16bhmOguvqA5FQGiotq4BTBOMhVnowMdKBtRyugBmBKRdJUJ0Trch7hArGAzBD+4GnHcK++uu3gjNyW4NdiAorMMOsGm3l+iNd211Hsviph4zNzYXiImJtniNptNLajaytguIFV4cISIXtxH6lILIK4K+MjY0wFC70cMSiKCLXgslboAq4kvRddI/L8PcKvTrJYk771YHwdZhgOviXYrl7lDMqqcsznNcr/FykRpRVLjdcy+JzEoO9xdsG2ETM1LtMFI90GepWg974lZTNDk0wlYCkNZaPxDLH5jpPF6gv6hrOupY8HK6l+11+P9xPae9ROYwZME2J4QnNQ/dsq4RGC3cp6VEPpV9WwqlcGVvGO2N5lBguqmFX1+2vaty8TmHiUPjO53vOh5VzAaG25vz9SgGdYR+cwgJeyHlUo9rcc0zrFkphO4KOaCP6jw1AKt081BANpiLiLeI2lNxFS4q4zFxKfQzHQrxQTY/niIaoeCi5ln9DLEp6pU2B+CkqB46t9xI7l0aUxWjRaMIKGyLHUjiJKG3ggIcnwSrIfabgSkVVMTMwQgjpmEcO1HBVFS3R8AYAQGkYoBBRVde5kKeDLFKKtKT7grB17H1BIBHpi3FjBQJpPhU4RuoqslRAxjCW6uUVDgch5mQcF33Gy6rxLiUS1xURbh3N7nhFYkUweS4mI6LappdDFAUGEZx8AZuW50U5zKpSLG4v6+4NNmUGEJS21ED75mOzMWMXpRKo6INriXJN4AX/AIQS9vTLGwBwYjXOW4GUxFQvsnu/E934nu/E934m+OJMI5EegBo/UJ8K3a+X+oI1oU+RTh+5bUapfSWc4VhpGSEDFHZQ7Ir7Bu4JaD9kwFD5iCB/MK+51ICb/cpZa7iDTsW3jyyyRTawAiZEbt78xPWlqrD8x4Q7BZM8eKgaoowsNmf6hBb8rioICrrANAUDo+ohZka/J9NRohigUvzGZsomW8e/JzA4K/7Jx9xRQtWYEAFE5VHJUqvNnYcYJUXopLOB4uJbR8Jbro1nMaJVTyXLxXiB3CiGjIr9QcbOOqjR7VgKcjmZi2/JMnnMU039ic4HJyToibpUQg5cWLqGLDRyU9QdAqEeXuBGyTIcrscTfwxsWPDD5GLfB4HKlOTP7DXUUqSk2MrNwLZo1J/wSkZZPgolVFg1Bv4BcXkpbtDX3EC12xQFmYeQylpoJD8coDeZxYojEcAa0FURJR49szDHBiD3GA4zp6YWSintcSoQX0LXUQRNA0pci+mtyoVHRGAFyFlS848gPNxbykqlX4WOjVpx3u3jqHB8YoCfUMqqlDUKw82IeruJ54xiNy65lXl5/ZjGTcyiNB7Y9P2vkrYqYWohknAOCOINuolyjMEQDBtlHwpQsSmFvxLXUdxxOA7mRwDTJxBqU8CCZWdhiXS+4RRmj2pljHUWEVFolwu8ri0GCNE8ATsljXMYWdQBQbDMwZzHDiKErbE7SsQwJ3iKlW12y3gwo5eEStcnPU5MSGJti1eosGzXH7idXTrRM2rpxliXyjGwhAuuBn7l4ENm0QKCV17ZfCAGmKwEeAhyc5le8EFItXSv8wkE5s7PBfWZYBpWm/KnfCFf0KjuUWmN8Jz7lISmksZUSZGnxLQC4XK+EjmQNFrfs2QQVuk1GD74BZ2QoUpo5r3ZBuff9Ew+kTZlRw6gnq5DHk94RVMo3TMJxqZsfxGUOFsj8SxTEZmO8xiyq4YtMv8AjzLphE+8ZtLaZcPMZicFFjfFXegj8njDUXJ98eWQBEOecMV63QfxC1ngOCARaPU0Uf8AyIkzkdQ2mDrcukbOEtWfgNRbjLroJfMQtInJCoPgxflLeB16/cqdlprD6inlAo13AlvZSVKhUyRxjDNgUd3Ed9jDXwqJ8V1EioNwyRogHUx9CXG0eC3Pa8j/AF9S2CoN9v7HzK6N2lwkt5atjkIGquxi4WcMglNAaYs3usRExFyShii0xu1VuUqOGXjy06Y0hY8IYfJqO/8A5sShHuMvbKF9jFowivBt9OIloq1hR6Qs0F37L9QNabZnAee4tEbgrF3h2+YHYydywtJDimsVibOYt7BrkgJc0g/iNMtqFnVb+IAmpza/cTuxZQuYVBShxpgO9XBUt/PyHxuynK8MZShBXS2fzHUrgKB7GyVzsUS/BC6irr+TzbzDBZQfuM4lbG40FxrRGFFOVirDLgG4Q0jy4/HmJ0oDF0aPhhFoaXSQNLVjiKotpqbdMNvxoQD7mC7cBzHLECP2TkGmEmzmMEJpx2TNMZXJM/wRWsA0jxLElJpJQagXX83sjolWLFel4uIqtVqzmXUslhFcupjBleJSk5PhT7JsJcSwaoaIFStmURsqJaTj5O5XiRduoChowjTgANnmbmCWxoyxzFOclARlKCD5uL6CewXde4XSg0gNn6uGQZWPJMYrfuLhTdrNewVyV8QJNPNTnbFabsDqfSYsqAhE7bM5QEar7md7xhPs6lyzaQV7VcEFJHCG6tr+Jc1mdCBuVw0UC80/BlG5S6IhVyyKqCBbRAUKixI+iP7n9/UyaEWhb/z1LsFsPJ+JW4QY71AlBAjAXf8AP6iWx1LqLZRKOKY0U6lOJVoxnG2uoDimqBknJGyICjVjkYLXlhidiDcIlpeKg2GS+iNYWm9yyWW4QwAVWEAWoN0Ygt4BLhf0N7djePqDL4x7nYIlDTu4EVv3EXLm5lfMK3+IctQRCXYWqmK+olq6/wAsDw4O1Y6GzFu5rDuMYKd8sYxrbbi5c7vLUuA4WDESc7BwhRfub4Cs8SwiGICg5GpR8EderyfuAHPs2n1Hb2YgXlpPEwtU4fc2qCc8WfERABfKyONqDrMRANrnJFG8B6jaLFLiOMS0CufxL7v1EEKzvzGt4mK7go1iK1mJn/25uai/6uGW9/EMGJXW6AP5JgQW5qvceUGMmSBRZUF4H2aiipF15wy421FBFqKrGGIoA0Y0wWRwkYqGOLqXVMyJmioIo5fvaY93JG7gHa5KtDxG7Tq6cxQgW7Oo0kqNnlzKMdJylLwl5fwnzXwbYUIRTBuM75goxWQKAYSoFqGG2Qudi+puZNtfgxKZA+jzCwPPUZZN9HMuhRmRtvwy0Rk1a/lLLEYWcSyYjkNJHo6inBmZ9j6mXVeoagI4p7mXd3K+Gsd1GuZiYmJiGXcqYcsILizc8HEvtEXJhu+mDc4I2D04fLqKbfwEWd1HKNI7IN4M2zKmsDRemUFUhi0QugB8EMLOUYP6kstnZ5j/ACNBxmV1KItYUoVuG9d7anLomXVYzFc1A7gWchh82KMBvMfIpq4tiOcuXA4GYuKAb7ZXFADS2y+gi5eitHoGFw9Nw7XZl6pmPT83qC8rHfcNfG8Ko0kpGxlBDOVRX13GQSkxUCibWV0ly68lj6X0/qURC1XYwaoM/fAMjlI9TVu6JowFh3gjhnbnuuweZpDfWjkOSCEIzM/TMZcE5ec9TqrFmE7O/hYgrgbmkulGNjc1sZS/kueA7YLzTFhX6B+47iwttSxEuKOin6lALFp1HCaW1ziG5qn8wLjGKUMNpRy/EPNUAovmHeliXYcwUfWuJwtsvnx7moz4D/cDfGNZ+CVG/YJ/ljpQdAH6itoe1in5BuYqImkhUR2idxIBAsNA7gn6sQwgkkKWrgviL5aAKjl+IPOlJeI5uWdxOJdxIZRKmIgahsAWvUAQXP8AYl0Wr8qJ0KW9kvnTEcRTkuIpLCj8wJrEhIONIvMX/iGoBF6gnmoNLrJzCpEpvJFLAIFXAEVK2xBBCuGex9qcS25y/CYlDy7dRzLISYpuBXwImNFtLslbUjsD9wlLcEu3Y4fQ7ElkOdNo7+m7PcQo5jQxfdxFnfEzavHctXRsn4O4kazxLrO7xFsurirFoXT2wxrVmUC/UX91Ew1ZK5b7mtxhuBVchpBUQmL6IaKXihRyS4rMXheyIwlJhGXUIx36Q0xUwrzLxVekyuIFyiSeDZMUIAD6XkzzHU7Fu6RElizS6tGyNj5ia9cDs+f8wCARqzIzXf3G34gu4DH8xVeZh9EIR1/aZXK9U/zEJmsyfcw/58/Dcf8AxcMpDLTWD43QwOzhl+LrWJagtnBdXBYbr4rMYXEBNjZDDPwOGWvUMkpAGajmJKiJVxLqZLohL2WEuDEtktdqJsBlufL1uWMyVymaBE8RDGBUcvxYEYX4QT4FCDUb2xZbwTnIJ0kGYPbLL7X9RepRY8YjDXxAaInJBeqkCG1ywnrQ2P8AUKoJdpojbLEWUvxM2M1pqW7SNj7lNWO2Go8sHujKE8VbgAQUAc53AcIARb/+Xr7S4DPsJNmg8wWVeXzLUcUYJx/xDwKYZHcRRjb6TiMnIWcf3+Zw7gruvxLIBQjphHoOZKM3/qUYF6aqlzG0wQNh4ceJait4uMU1q8cxFQcHCLHsVFvTDo7rpORdMdhH0wtqOSDy6lMAEtBiORCgGVlGWgqF5084+plqqrtZR0cDywslvwY1mkYJuBwjTK5jSzl3BuLMgbGOOAWzUoxr8gf+y4RMfjuC06xKuVOJniYwZOnLCPYyqFAwZasHDKcHxa+6YjpVYqBXqXrVXNT9S5UyxuvTxFZu5f09MUUieyFHUwfLmGcHIHb5t19xUYeEKEbMJFQI1qW44B1BvzC1HMZVqJM0cnwm0aS7lZiqKGbTqKqC8eBW4d9OhQ+DG5mvUv8ABChHWLUHMdRQxeVi26CAdZG9+uVwODK3ryw6w3sIy9tXRDRsBSb5Nx86gm1W0Tw5+4Qg5LvFSjITlw8RK5ie4XYx8B+yO6x+YCFKtdPC/gAq9QTeT5jp4I4ojaJtlt0uW1Vxw7Cpq+UVuPGrnioxJGhOPEasK3MOlb8Khz1m4SQ7Qhf4gKbVoXhjXltjVjYHc25jQvcWEUwblUMsNRBKElQkNVB/L4I85VrtDn7nCXKNFTCC3QjWfTKeXVWBouG/EWEHPPiVCx92jKGAB+YoShexfqYCocxV8F0RqIfI3jn1BwEBuxg8w5MUPcoeS96hGLO68wzExEgdAckr126Uh+Twy1Id0Eyi1EqG1Tze1eVjuw5M5iB+C8cdv9EtFlXuLi4vI9KWHrqK25372uorWExaRVwVebjENDsZVrf9SxcRaeiJz34Y3ef4jFAzHb1KzNjEeUdL2SuDz3MZ/wB3DrEqf8dwzFQRu0WI8ZYN+4F5uGhGpizoblRK+FhBGI2LMJySz7xHftNQOYi4Z18XiJB4/wApYnuWEq+BRC7EILqMQKHUdKX6xLRUh0y6i4nrLVhSLR8BXJCxl0G2K2bILIhDCRtNONavmKFMsIM2Bp64Tqdwgt/juJgiNVR7iGqR1NrmV1hUKNUMRmKmsOahZkxBqxHzVEXyxelQjoEThhH2n2n2n2jJWnLqXYcMrvEDriBdckAIqqUQlteJQAJa+D3MMiA/Dp48wd6OSqa7agmjVNYXw9MQrmYM/mOrIyPAmBOIiYLovqXBaA4QVij1UFQq4bWIBtm0yBbkLGO3L8nlDSI23pblLVjrIfpjOauhpR4fzBSSq2mZYXQdBUKUCkZ9f+/GUYtRgG6g+FVB5Rc+oFSvhKLUCmc6l4iyGzVwlsbDiy67gLhL/L8sssNs5SOCwk9GCG5hCuglowjCZlbBaO68nTEB+8HLiKT6wYa4O8Qa171UeIRiwhW49Nk9S3Eez2S3RbowRGcQXuL8hm8QK5t52eoZYFi7h4LWoePiA2nwAoisi1ouAVoeLolhGIC1NhAoe2PL5gnibBRasSdylXuPGb1Sb/UEaRw0/cW4O9B+Z2hoWUiDyvTLG0F8EbEMphUY0ipRVw7xWPY4RrmURJbWqi2VZspmxAhjdvqWgIqAuWJv8xODpaIuzk+YLYcUAsGfMNhc0QajlRFzANU42tjtbhA5TsHz3FxbuMzKew6/Ev0tYKRu78swaSK4gDBysKM6m0GC4/kzAQepnAE1C3KCckcrQYAxUU259xpuM3KcJOkQQKh14gsKt5jdK84qViIFBFwxCMn8ywYoLV0RmE9hg9Q3Nr74lAghJl5v9QCyoBz/ALIOlNi7Y9zHEcRA8q8xqbDnxBuNT7qYmMNj9HMGiQQMrQB/BLM2Tkile4IWXbrfhcZg60iVVVXxANkcY6PY4/Nxko9t1BJMIQdK+VUGHms39m/uHfZbtHik5+o4dJy/olIPSgr6hROvRKHd3Ey+o4N3Nj/EtgVyYQlhKdjiOaGXZmjmO3NhNLA1mF0mILqWJ/ZBTB/3cMtbQYgaNkGpUEC9TNkiw+LIkZdEXCXEEGn4WBJeGuSCxsR1GxeOXzOZ7BlJluGOJrBNEdNtEZnuBw3KzGEO4LIGclYjgqYIGG7UReMww4HgcQtpYIFM4e4ObYcwLM1fX98MBpi1jb4zBtALXRN8j6ibFQVagYL0bfUEWzSEXi3qU9v5bfxH3LfPHuYSx7ag4Wxgg38NcsuCWGspawXdQJVtvRPZPZPZPZKt3A2xBao7cEzQIhjiI01NwOAdlYRkpGr4eiBVMKIBmUoB4UdMwNfl78OyvOo+GBqhUMIQwDdsqFFgdHC9zavqyy5dSydXGePhKuO45C5EmbtbXlObJVbIxi0GkvuOeyI/AwSlUZ9ylZeZVkRpEdIvhLl+Mv62O4OI5VMqV+ziDDAwlJglfaLZ+IiCShOYXIuWAsToMdwo1U0pxfqXIiLScnEIIsM13KvPw2YiuFXOKx5ICbKbqDZJnCMyjOe79RoGC26CBVMWuXoi4lPfdw+wGIbiqCsVEBcoxUlZTCwhp+aipeoDdZ/qIhGBSAlGJL02liUc1CZed14lASBlrygBf80yZyyjF9Ny5NiiTXmKeQBQ9CYirAUyAa6xDM8mdKOFXbM3huGsJsgohlhgmzCmVaDz7Wr+mBGGoAoWupRWqXN6iwJuV4qMzQq6ItywiLRHkBd9R+ChoZdg1KZLHFB++Io2EQJjkayj8jEAJ4AVZxf9xC69jJ0bOISdikhZAVynL3GRhTHRK5jKUIgQ6KjhBXwfDD6680xG1cRc5JZFrc14hUsK7lycUtq6jI1aTJ15GN+zximFBV8r9wAQlp0QYglmQvUeqtoi3vYRYGOTL8R6TIe79hwPmBRliyF9f3DwElrA2zDtT3BUOXa5JTGq9pcxvI74MpaeYc+vgGWrWC5W0AtQ2OoK033C6qGuncOMZp0dx9XE4CbIjBFxxhgJM2DE26iB6h5ARcYAGlOmn3K6cKpY5Ei1dxzTfCGs7mbic46DqCy1zqF4E7xjIoyyQ42VMDvcogmJjmX1BzW8QVujA+mF/WI2AnMFgzpBghDcqsLdy7uq8HwrLsjsho+KzKJlMlQhS+yLULJR8BZDcIHjEBvMrE3CEQNs2rgxEuBU2zvuOEO5uBBb47jScRsezyeYbMiw9Jolcxt28Eeei2r1AWUXqtRCziCBUOrX6iLKvw0hVq6hM04DFqRq66iAvZaoHFQeroYSB0p2UzzURGOE2pjBZtblaC64Yozj54UCXLly4MQabgHheL8nMQFG9/zqWki9VzKoG7Aa/LCgashzNB/ETcMvPcMMbOJa2x8sK1TAZmrChKtOV6mWzWpvxP6XAWlCdlyDjHPmAQqAQLyE3HTMrrFsiR3MsKpupZqowsRWd8ERe6Bj7JjH9uEEePgo+RlfuVKUfiagJsu2NcTtBYER3KeIqxFZl3Awr8eRgdY1KiLgOUUL6jwMqfzKDNwHumIr38ViUIVe47S038RtgMSvgyfCFqmKyAyo0VLs3sO6ikbRnn0EEiAYDn3FZygyahkVZ2RwfF1DcGwwlZjdYiYTThlvGOXFJ/UoOcHVNKvrn8RQ0kbOPBAcAYoY9iBoMDEVss93Ms3LRuB4PhdFzcsJTHBKB+DqWMyIJDBdL1EDpUOA8PjLUGO5g7DyRyZcMfAYdeCGtwo9StEusCvieK8EujBLfi7xKuajlUaE1l7CFuQIMcFxowWC6n5hVtGukSKnqB9jGgFczg9cQJdxV3KzL4GbxEUiTNgye4BXi4ARqxhnN5ltZfiNVgfqV7MaEjVjCRo/3FHQNEqnrURN0zdf8IPrAghCILdqlIsLVaCJblQbiwNJeqYPTBBWuruWHQa0yKuudUHG4YA0pA/lLPKtpE9YxKMVh+4GFvqhJPrSFEwBdnd59xLZwF3wB3UqyAGmP7QUdpZWxTEGKiIurgFPABy+pbZilFU9cw1UuMWI5DYFOxjE04TgRCM+Lm5Zi0Ha+zxEKryirBVfgPzD1Sc5qZWm7jaLuVUXMWby8TaDFI6ipiSbaF14YuigDSMaVBVpsuoSXYKe3deIDm5lv9zKDD11NUlJWmcyJKGtul4YDEFNirxDL0fAZSurV5I7BeS1XpJYxqLWYPpDBiGi4DibwXuEfgWWRLgIFCbglGHkgVNqm9QTJTnuWupuGfyywCy1RKzaWmUpXnj4OEYh25lCFEZTVdsJ6Y5Y7R2eGZUua3EwpXftCc0aDD6lpqVIOCXEuBmMGBGyKwKaR7jl+ImzxcRkroQ1LMwCoAvEEyCzTj5XUcvwP/yQXVfRKF3ZCNDUr2dPcsR4BxDr/cofczP5j3EY4hN88SzKoKCbYYRbBgO4andDfLJFuMvFGz+Ybg0xioMcr/YqIglJimXZTGXgipU0qOvhb2VnbeYC+hDS+oSL7m/tG4PxLloZp6hfMbWiIlpMGCYFqa1QHiG6oNbkX8RgcvwkMOGJ9+w8nuLmeWtWDH7Yha/IlwpiVbdAC/RCRSg/bDXyARsgSMJ4mjfUBeos3SCMsuqbYSYMCaSFXLNQsgrKuVUvMv4K5hXEPNZxuEYfuUUUWvh46i3ka2oLfMFTSwDHcS5ohuJM98xrS8TUYGAmUv4Li43U8pZLk9H5jbj9SlYU3LsPcFZdaCLmVTYF+zcXAxvUIOg4+4OQmjGTqPl+g0irv+oTQaqwpm/hCKNdy8R0QtYmIVUwyQgZAbcsdQcx3MEo9Jt5OrXcEI2bu2WArc8y9MFUPJHLYHCtcol6Avr3F2x8NS6hlRuGbgzh5jrKW25sgEuMH4j78TIvmNBPygqw8rzHuJcs0llwmgVaCHxUJdi4l+8ywSryubixczM6YKKvO4SbPEy+JUIW65lyHYMTNp89yq5P8z4VUDEYBcvUyKbGHzAIK5HsRcVDj/WIjY3bsyuEH8uqAQRjNHVUKtyXfEJCsrPNxyoqXp7mSZVbiotunE3xHRC7KXHqChif8y1/EqhXppsxHDBZopVoPPcQiA8JZu/3M2NQgzuX4huDEcGbiR6EL5hmFVbgJQa+XgmKkRXZVMzXDpdzgI4iPq+J+yKQrKKMPmDBoPRBSI0wyc+5aniXQZgYiZijBiBcGZgz8iV3XiNKVcDx9wpW2msaLsDRMVJcVm/MCrYtvJLMF9jUELEUwuWECvxVRKl37iKhdZuZBbfMofA7JVzccQKt2cMMZQAEPLt4FeYJLdBxFAczKa5ifIqSkLpatRUd5csckYl8xB+Q0yjGsxw04iLjqGeZdT3nvPee8CZRPc5OjqZDFErAp+JNf4ihQNiahrPEvxHnzP5SitS1hrmC9SSNLgTlDXljny2lUEybhNZj8lwJfBUrbuNx3FGjLtF1CuLT53ECBWESBRLqLUQjxWsSkipJhyBTfur+4UYlip9XiDJAJ2W0PMFi/AeHqCP4iUjEfQmXTUAlVcA8o10xG6GAkXcCKNs75TpPdGpZVtVGX1cpjGNaoQxEhWe5tXwDeJdGY2wKgKbsCtDuOz9EMo6l0SBgDmXFmMsCMYusFwwkbWTmBcQISrDT48zaCDi4o7fFoWOYbiX8oF3HFBsgpWDmPcrlOIFV3XBEm0S4AfqDtm6lBzNcPTmN4MRQlLAogy7Sy6xKFzcKx4jMt9tsGvhRsr+J8LcSvloAwdjgKL1iEQv2O4EKKB3Dcu4qiClhj4SsACLqAsSNMK8UVH0Sop8UtRYNIRyTa5zcTy5duYmahlsqvzOOSfH0hCCcKT+4SgHYO/MUI+BHAsbNAHapVEXfoiCFHcEVXLuKuItZrURoV0Xuu4Dak5SKqVpgJclq/eYWe5ThjuCPnqFHn3DFgWlWeYqnaNnaKhu72xgVAQ37myCcEKIrhd/BVRniV+Na1xAP5l3H1fZwEYT44pLVULQ6hdNXirAro05u4wZVirDVkxCp0bQIAtYAnCkD1yQ6gENBKWLL2kEsNRAy71HcWOYxiXP86DzWGYF0V+oB4aUVVeI6Uq5VGY4u2B3c/wCsGnjcvnGK1DkXKxEqSyEWFg1SjKLYgZ0NTECvIPZL9hKf4QnUz5ivjrEU04TiO8TYiqWBldZ9wZmBUdzQJilpu2EKdjKapGzicaQj65jrdy41mN8XUWJh7leiiDZtV5ikF9ErxHeMssKqVvVtKipXbcyQrJWZRFBgbFlS9S66lwmGbyiUq38S4EWNOriYigsluotgpAKiVRTDvP47hgT4WgB+bgkKZ0cxXi/Ep9ysxajjUJqpqiCiXFUdxA+dkwE7ljr7jdvuYJaVY/8Am5wPomMoKhNUsqHiowGz32S4ByMgO4OLcymeoZo6iCks0GVxUsIm3L0PcszFBkOxfeY2sSuc/h/H4l8O0muLgqBNUyPkYfuo6kydt9QRxS9UaYFqJSMUYK/+BiZszhJojL2wWlFv419R+mmNgmJ4bYgfBh+8qVdfy0/xPoKf9qXNMYL0uC4SEJWrglSEuyZZUuc1ToiwF6jEu2NvmXmvhF8UnAkfHfMqBbUmxNJBuNRXVrPUHm19A7ZiJPUEUSVfBkwKhZqG4Z9gAbt/xr4BqYIlxVZ+GiBASvJG7hv5EIFuJWoWTJaPEU08krYQcdOcSA2hg+13BSwK0FsBkQ6NxVAUaCWNArbHOoFxUmViBBgMxcRBShkYoVA0uLGAyh+UZYEwJyBXxWIJ0vH+YFCKsYYxBV+2HZB30RofdwdYO2BFfxWJdEEUTEqJTieeZarALwf+wstVi7wle3wCMLayQnjtFahtR7Iud0bCpkWnmU/pSXR1OMTtQ82je5ZMwYMQW0WnUXEPSDQB55ZSpyo1nmBRFMS4KYFExQw4vUoACDjhURnpRzPK+Y0FFt6GX9QNArHriHgI0PmKwNE/5YArc8xWGvuZF8eOIPyVrhdseg2j2J9RhQGuPMKWiNd+34CbQmKmDZqKW/N6IGR0AUHAHBKJkzArh4Y3FZlW5XPwvFqbirATEI5BqUyYUN7ck2PK4jqn+oqI4Ku8u43e5yQdIal6iqLZKc3qaGOMVdxiwNukY5tvk8Iuri1m+mXEfxPqeYtFblM1EIG84IXJt4WiX5gTaivOrGUJeCNl7mIaGx5GaYgI9WQhDaDQm5UMwUGfgQSoA/piEWssG97eLcQzNwFn/rgbxRfLFzXtPED1L8MYSlV4hRk68EaTKu7gQ2hAjpp6XEuJQh5BaS6jiMIl1th+ACm2NlWVgvLSH6l1EMqiDULfBAfOOEQlR2vnxGt8QxNvekGxZ5Q4hDjZxAlXNl4glzWoImHdy+KoN9zM1iK2lx4m71KQpQy10R2PfwlfFxdnyNQykS2FQKlDH4mbMqv/AJw1+v8A2c+n+YQb+2XMA5ELzA88NWcn/dxqgXSTB3nuUv8AzALc71lKxgY/c/nQBgaAqLxaSnVxQBlV1oY5FXAb7SYGQG1jTcUx0NqrcMXZsprI1E7lQBImBKRhn4zLxFuAR/pmrgtv6he0AUUOcYinLYdAwIOiJcvEtWInJhoVN7hIibIlCM0pc/3BrsHiYg0vMuaOepUTErxMl8welQO72r+ZqLcW+B2urdQsp8MB99wqqZGbHMcpbKpe5eJUqjkXLAAFITIYKMUASwmUbSDuGFpa8QEqoOUX4jawDxEpWJaEhxGQ0K+MwT7uFC/UFNgun0nIxYzdcuJcNYYquWL+B4jm4/E5hWMwsCuZENy/VTYvwwHjpfJqOyKraszcNQL7DxGhPY3caMw+5lur1fHmUUN4Zx6SyJSHZiXvxrQJfHwlh3UM4XStyVxR7uIrSswxEbGAywOiUTRRErUHqDAylQvGDzEb/OoAvjJo4m3wi0JSwAb9PiKYmLwG1wEDdpAWR7vqDJV132hhoCuKUvFwV6CqL9lr9RWbolLgmZrEVObqat8dTSPPMYrbe+wEYQvxS5WOk35IrW3sQqZCGQtZznWYxM3D6LogIQh6x82vnqMr6g5IPgCJSk+55UmR9sRsLR6HxByOTUjrz8zBjYToMRWRh8Qq3G8u4PPV/DUP3cNuVtLCJmWYUj0ixL/mZNdkE01VLXrJ7l87otSWA33AMiX4jQv9Qy+JeHWuozbJL+A1/wDQzTC7XZGJRByMqE5xDyb7lVAx08Q+1EwzqEpa5cao27jBDnmIO43DxFYaZwwcTN1UTMACFsd3L+Y0ggea5lUpfqV7UPKgg5ZyEiak6JCSl92Q8sY5Vb167lDWXtl0HdQqSjZtjslKoUPAubml16mjMzxcwGPMa030dwwHX4GV5GBUMRWTP9weLxNVA8EyJzxPLcDIdy4gg3LwGSklIcRbyyopMEVwxhoxEl4F4OIgzRndcxhixfxNuMChHG5QRKgoEyT3n4OI1If/ACYH+5T6lWCg5P7ILQ2y4gTu6Ioa3NX5QMUOz/KUF/Idk2y41FFgFyqaCNCCwgAdDkcWx1hWCtXu8/TOoWKnzGxtGkaYqwCW6Er0BTUPMSPX/L1nM2Mc24qVaCNEwm7iog4l5m5SMHEvbNZlXr7liROWZ4VugcnJ/cK4lV3DJUVal7gWS+YMowwpCSlrCuvJHd6828dRMt/DSYIo6FUnM0MVcp2P8Rm47gZHymPgqCIk8gYAHjqOX4RWrSqJojY7gCNEVFxQDcFllpRFLpfj4r4LUNkOFuIhr6QdoOZZZaOY3A29orctsWoNxlEXGwx5DAqlwN2IZYhp+l5PUQCvJxJElBxMm40YwuXTJg+EtemNcGYW1t8GLdS8jtgk1mFbyEMNMaI4ReVEFKULBqIopU3RxZ2Zqxadseg8ZiDCFMaCLmXiopAHvcrgl/aLXiGpxDrwX3FY1XM4hvUClsMoVBZG4pIWOEQKZM0xGlrmBmcQ2pALGGVghSGS/wAPcKIByDInYw8Xmf8AUSx4XHBvhRpHCxrNGN3LRFRKQZQ72VGS32sKVGcx7GiOpRk9TAhuDALv8sPjBpvUrRuq6YPwN1+5tpCft+aZyhLMBxFIqGcWxFUVEHMITlDqLJUAYHda4OZdY3LKg5h41Ud5/wCqN1NwM9D8xsaSAsaalwycKyMY0DOoPCKunCcS8UQ8x65lA69S7vNk1jn3DztgKWVfMch+IbSvo5JiHgVjo5PCBPKmN8CVEQIC9a1Mbc7JaxBDk1BjrjRtZPF6gSe3gebmCbWAb/PcKEp8VE0yyZqrxFqZfIPMhe3UspJWxZLVB2JHHK5WPxK5Ylg2hFcOQn81EAJcDQ/USA6WDBIaF9CXCPJD3BLgIcENglshu4c4xDaO7+AMTCrPMs2WOAJucXTNREGiZk3zHSppitpiE0yuNl9S6ZFsFDDUQBomTlMSoojcEFLRkYVt7jD18WMloHMWEyhQp6NSmsWyL2NwE2qlpnp/EyGWKt35E7wAXCS5wyqQp4gVGC0hjfwMKIqrKslkwe56T0npPSUhNSDyROfs68MsXtvoev5irmPXwOrOcPTKJTQ02yRPwm0zP3UxWpq/q/Ucqz0L04g4lDzGdBGaBqB2dfmFm/1EmqXTTTANLbR/QZiCFTWZefPqKoUNI8QMSpVRykfcoAjiIrqpctDW4jaV5ZQVRNJDM1VdPxb0huofHEq5UgqLiYg9+Tw8Qs7J1MhM2y4t/IVjqHVtF89keIhuSusHVeIiBDCMvFn4oVL6e5kM2vqdBioFRa+DYBMLmByvk/TDRGmmGcSqxKqO4qmyKErgsp4i0KvLBBXcAv4SBXxm4JZczarufnXqIprYpiLENLBZCPZlK3MJi1sMdERw7jcYB5IAwzrEGhXi6iuzuoyqZlQf3Eiv1YqEgw5MkJzf1C8ZEdthAN5hiklNUpdc7NMGyNmoQtO0Jb5Rz8klYnMypAGF7ibaF0kVoAJueF/uJQjOYEsU+AuJUITBzJ9ZbP3GBcFqDDyRJalorOqC5YRughULgCNIm2Mh2xs2xBC0Cc6jd1iBKuE1rA9DR+YZXIUYt/8AJU5xqs56Ijolg/EVHmLMjNl/wESagdWWF7mzZUVvuvMo/KYSGuzCGaiUQ23ZBmrPVQuFGU+4XVga+2FpSy32fQQnBC6X0cRbpSl29wagVP2c+poVnqXCjMCwB5OKgmUVFqKOPgtQIu1rEC1Cyo4tZPZlSA7crKzcBmuIMwNaDghR9QpZXBoulu3UVGNwsZhpHbomv21biKnOPU8YimQrkLj29WqLH4paHslh1mU6f/cHMN4lr7cp07QKU3F20ajIgyJGL1p5mTQbTklk4cBlzaFKCLcGG4ajqHZcxyAlBYq9vcbS31HUGmJbsvcYUsicPMABT0OFgVwWh1CzFsrBHEqOo119RwSV68vmZ1LOyYYcRuQhIJSmSxUri6ckaOGWSord3K0uV0G0srzolKdRcQuE0PIzHgDmjPonQCAYlYKS8KuKFZOVW4hVxWG8JTGyaf7IVPTLkXL/APjSbfDuGf8A7ARV/hcvaA2Esja9hlA4x5ibZU5xUlb9w55KbNTo3Arn3C4UxH5J2199QrqIocil7a1GhjoxhgIsezuXjE75jwlbvA6l2gYYltZnHwNnUdBWg4pu5cdXByWVGqfDDadfR+Z5WV6jRW2HxHe5kj91Bbxd2ssCUvcAvSMA9xENqmDUTqUEEkV/AxxOr5eomq54NTyYho6fE76dYW238SlBqg/xFqGcuoRVgMsVAoAF7eWVPQN7mGkhJCObF/UVCAWOp/UcJF5yPpgVKBaFaCyckTEYupuUOuYt6pgtvBg/iDiWmRp8REzWxLdMDFhIlRHFtDtgKGov5S8rV2HJ3Mn5AlRmRUMRYVXwLxWX1DAajYSoFUgcrcb8sLgStQat5MQq30sKoh0EVQsdsxRsMZvQwE1iK2YYVZP4m4JaIocXyie19saJZLjMCDLuVVU3f6YGqqGmCMTFjFWLHTdaX4GdlaqDV8SCDUo3dcQ0ICAfJz9xYoeJVPyk+SEhDXcMfMVZHUELYB5O4FYckLEFriPmTFa9wzLi3LmG3EBrVzbqLfA6Zk1CKzG47JtcEbglx6iYliJNw4QtFDBahrOyXmKNLwQwOJSIGBd35gTmgtnOzmLMhh3yCt9TEelSvMw5uUrcbajDNa5i3X5i5lef3FZq79xhFTzshTeHJ0SnhccGbJfMxBXmBS2lBM/4FsL4fcwBgxffmGYlS9Y0nJD4Kf8Ai5pKrk/ViAWRksPfjUJa8CxarKqXcRFWtmNfcobk1ELPtLgdyrgNJBfWuI5ijKVeo+gRtWmPG52r+OoyrjticYlskRuyyMTN5bhXTNbqWJvMsL3P6wMcGklYwmyr3H1Jcl9QbCv/AF8KDkz0iHUgX9MWoYpgPiFsbMxkADioeDBNHDDbBhiuoWiAm0yJWJnCLFnAU1mNCHymyU+HIRRN4FIkqw2j4i1t8SjDwI5eOjG5ewsAGgaD483rOkcS5ckFIDZF+DUbKSILpY9F/wC5cV2DloeIKmhK5TP3GbcHAaIsS4pqMDTEGJMTBEqVEI4cWk/Z1Gjna2i/cpCpna9QMSiVXwWiF4fC5iiZhKJRKJRH7IhvIS8lXzfMlzydh4AS0F5BesOjuVJa8iNcUtl7b1vKXkMv2kwlgpKDhGs/UaEY4Ivmv8wE0lYhcryEgOf8MGoWxTNBlZfuF4hyj45niMZ2cdy5QCRsKsDGrvmOBixQT8oatbBZpDv1MuIu1/DDCne9mbuZpQ26EsDxn6jOYOGC5Wb2CFSgJrBm9mo8yF4yHoxprU3AotQ9bgBpZ5lKxdPKBCcqB1GIbYQaQ5drCjjKtByv1B1v72v9yyUMYzGCt1iWlBrdssKv6VAAZHHhhl08nETzGzqVgMeAV+yU0S8mYxXV8SsgvEHEm9YdrxK+Fzi28Vv7ixKs7KvX9wBq0BdCxFwvdaim2yFMVWIRYHvHuu5nA13aAlx0NRgzCDkYhjEq0KrFyvgYJSFB8M6h6SzNmK7Y4TKz8GUDcbSu2YfqP0l8h/iIvGjcSLSPU8ovilYETfMEdTSXfK6Rq8Rkp7RDZBtIdDDx/UJ7d41VHJ5xmLUMxF3kfo8Q0EGkeItwGPNav9y61GjQvahMFDZvwy7Vi6eSWEe6MszKZcEtZKSU6xBUrjuUCmKW3A5LcOYrUUct9y0G5SW4qV8IMoYHtZ5JVMM1RbGupr2p5T+pltna1u2/8VGoCvUoBfTrU2+W8dRyVsvbcMU0IVjh/OH7meYyrhbMShxqEb8EV6M/uLcB5hvxWsyjBXIkdnTr9xK84kNmYFOBAVl+ccxxonF8rLXcMRbhtwrUAUHI1lfDFzLZkcdRrAAgKKBFvEFMpBAW8ocERJay5JhMkW0iTm+yOLeyNNRX8APxGfjuJGRG4GKIUhQXBt9yBDA+3Nwz7wBh9Qk1PajEN61AVXX6ivUsuGpdplIGAA0ShPpmTYzY+cgO46GuAYHUsJdfxM8FMNMUALha1MmmAcL1yJXoq7p6lk0g8QzPmDUGyGxHbIA5OYFYxAYeXiLG0+oMvM0gBRfARBMUENn1AihZG6CGsxgWwErTTLubRKg/BAyQQKHiKlXcLE9Aps7jMAdKL7agivlCy+rjhUVMCNQcCCWC5dYXY5+LIHmFIxiZA9MYgo7m5cTNsBKqLbMmBUpOZUqVKjVMGKEC3oM3HKmt+ndS90MlW00nvUEChyc9VnmPp+tJuqeYM3GpzHsP78SoKmxkO4fsQALgJYtsXl/EF8Ajlxvqm/vxDdRcAzN92HR4IqhnmCkSUFRQ5qIAWrqIjzKHKatfxANkayEqgmwHiVTlLRhYIaFzluBCItgf+o1x4KZdbg3BuYF2lwu1s4nLDBdU9QtaVTScxbVgNw29glfieRmZn/RG7PoDKsd6t+0dIe4VtM0bIjYwdBwkLvwlQZdNjUWp4wsZ0lTBu61cUavEQyRD8cxFwi1s8I5XWGCHhy2RrGZVA8hBg9PVU28/4PEci1gCBHlVLRh+rmL7cn66YxaEyBp6bv6gW25HIS2OJhDjYv2buXBg2As/P+IIdqqdeyo9vOgEeaZSCwC+z2NMQHWrMPk7mIa8sSure4PGnxCTLQbhCRbiT4cMcEZWsSmnKKu2AER7I5d7u3Z1GUcXmKBsEfIZ0wUTBFYQsJUQ7sCv4hqZwxeEwMdUUcJsjerwG35/642eViSrOJVQkMAkJSrNxCCwjhwcPqOg/UR6aM34lCGqWNC2rvBslcQTPwOpZ1CUvjgjtLRX4thSBquLoMtzYwa1j4YHiVfcNILC3rVR2GrviNejW2CytVvuEqAxpLpNKlrKq0foJf2kQKw/Nxw7sHzA3m00+5nzlP2b8xO1m1LVmxhn+Zmfi2ygMPFDLzEq4iQe688xeHMwdYhQ6HJ6jxduMQg4v13NAMnMcMq42YtuZIgweg/wkcSripdPPRBByoVdG5gIAxqbo/4TcSo/FJcIYAu4OGoWMdWcIGre4zGnHVSxgGEKQtlxkVyxAY2lVLENvRMKo7BuJitSlFsrvRYMj0QLdcIItpr/ALcWEbvRMU1AKKtAriKLnIgz1DUPFxXFiGnr9xrLDID/AEiRbTwYYx/8hhCuUYNQlgphxibR1GWl4XMVT8AqBcSptcuiUTacvRBDMpZVN0jW6L8xZjal9QhoEbtGe09giqh54RlKCOFYwYIxEFWeuyUTESe8tcFKFg7l5dRR+DU3LCTKr+InAXZmFK19u4KCmKim25YYMqzOSsQGh2b+Csog5+C3AupY3FjjEvmla/7Q+kMyiV5jg+TXyEqWSyWSyNKf6hjH+0gafEsAJMtQpp/7cCRtObCmTncdcdroL45uMopVdWFhfdfzHtOqh9tViIcQR3h5/wAQbF6qQd1dwEpGgFeDmItnU3ABZ+I3hHScIYA7mKFdBoldwRa9wvZFPcLZnZlPr+ZWbmSQx4lQ45oYAgjgOvgaAhUqw4O40pdYOfcTIr22t8wAqSkiYXCkMmOI8pQw1Lv6uIPYV2aglKXjBDPYVzBL1eoDFMF/L/EbJVdsURhIo0rOKtf0+pjLjwtTrAql/lNIbjYVkFVOTqCGUoJd7YBZkXKI8S6isgsaJY0tFsS7npmej8v+JRe24O5DXSQXBapo5eVwHmU/Nq4ANEAm8dQ0N8Z/MF+FBtnZ2+oucZhB5ruLkVaALgktAh2G1dVEcJW79r23KCZojJ2MYWHVBgSzyhX7l6kOURYGGPcbY3Y6JkRMQyjgmolnMx5VjnU6QboFy7PhBYIKChuES5QjeILMm/rMVqVbAo/Uy+JYR1FJdPj2jIo+Sniblsk4VkjNGETfJBZEFoUjTPB9SuikzTT0wOLkAAe5mHTSZ+ic3Lg7xyMCqp3eYdgBKfJ8G4o/G8qWvhMYpgXtgy7j4iKS/fN/ZhILWGt3de/8JapyuyNJsXTzIBtXvJlrytLymP6iagrRJ9FzYBsWAAkOWusFiyqlc3ERQqEWWG/1K61Y1QxtzHSioLWvuP1epZsY+Ug8MGFXRibcoVf7mlkADQHBFRZi9ROsBVi/qGs55SN4zcbci2OotyrlS6ZVDeYtMccuP3G45LY0xGsG7fLE1iNlXDIYYYkZqYbIxxCMUPMRku/MOAJSWupsa/WOf73EOjkaXk8kOcUIpQ/JTALen9QC24k85j+Y7YKjUsYCNNd16gssq2Ew8QoV3BrEpBdcwywxlstUG4g2ciKh2OmLUutfJQqa1gHLHIirYq3dwbgjJoYDmdqvXwksb7HTHbRoaHiY9ArfBmO/hg1CoxCvEjRMelTOo7CJEWC5hHc19Sz3FTCJodQlodSyNQqDvFG+JTzAu5j4uPyQbhvMW4pI7JuJo+3ie3qr/ATjkcil3W96Zn2zFI/uNM2lJ/cvVWc0qLQWdIxtI7MQCvIxNRCWlpaWjBqpbUUjdxXiAOVP5uZcAX5AjGjUxxc4f78DCyRley/9/ETblVx8yoFOmpSniaVdx5UWSJf3Mlj67+w1LgKq1H8QSKGAGAmaA1AjshAmiJ+piSrWebuYIBgN3GbdisGAjGG4U8QBUuks81zCS1jgwa1eSowy1ojD5gVpAxGGiwXNN3UYPQapX2zKLHRogpiNuotB9yywBtqPbFGoKXtywCQzg5USmGHpYF1izmYA1ati/UxIu6AS4HioB9ZB7OH4EuM0QDRFggYNq8EU8+Q6lBHZOoHMok5UL4GMY9kMmXnbRrli4gWMvVDsO44KV1Be1Qat46gk4MOPOhi9msTRexUXGAOl+Y3K85P+Iv3aCodmFAe18D1nkl9GJAJ8ERTUmk6RhNbKQrcpsHwS+sQM/Cs/AFBHUaQzERjgkpgYtgni/EO0Ijaeq3cUKDYlTExLsNpT/MAQ8A/Riqk8tGbsRbedv6l4hs7iqk7dvgl7yA3eUm/mmlnr9/uWEpt3EoPgmoDYZUbo+riVMmEKwaM7it7MDILiEZgSxaY/cIRvLQH8Ea5fjoHFu8Z93KpbGBycP4mBLQ1HUyrYq/ME+FLhM8uo8kqxA2L/APIlrLW4bo7g7joZ0TFTItUw+yXarnSQQFXAPRUaMLo7gLeX4ZZhVVVIrzmGPUvXUeK/Myu4yBa8VxCSYEV/1LJLYvqMqTf/AMiyFdpLWKt6iKyUMHlgC0aDjO4ubnMshdMEQZSjc2pwxYigZTiBe4ozIxnRqVQGzKBoO3qNMoRErEoOrumEESAuqzC5NpxqKwSmCIMrHMYdMK7d9Q7kXoZtwSjFLaebggWCqsBZfFh+oNxaqOG4c1Xhicwh7mRDbjcxMG/94XiCO7Li9MomDutRgTEvVjoG5YazBAgbgMNox/BZjr4EDtyxMQKsrw5jdaKIZlA4+Hc0RGFFPrp+mL2BPgFxKl/CoHB8FV8cncU2wOrmaAeCcIAy5SwmhBFJnKVKpasTTMS0jjqXOEwCsy0YWi1AMWoglhiBcc5WIq6M2Cle4aWR9RcOCoV7mLl9y66lhFnGY2q/kbiZm2HIOEqi7nK7HhmEYWlYbzy+ohQDSiqlpaWlpdiql0FSl1KlcsbpCjPUMQ2XbN5BweJmTIKrDf0Y/Mx7xAgkMCsEuYlZk33EFsMn8S5TQG8GPz/Ev0NymIc6qv8AOFa3ZFD6qPONCZiQ2umonFiDZKEeTMq4FrD4GIUeDx8A0gIhzmUbgQPMRUDpHJDRgh5B/c0nEJSyw91/8HZsoC1lhAru/wAG42UJBbiHLKpOIUjEBmOi+fuVlIFDKysFfHMtpsjj6mUW1uE0cEI2rLHPhiRwmLCyLqCPTFfyRGaealKllZeyLcNkIIyKOhzCSEW7qnF14xEOXXgm85h4OKwgE5BeLrmK+eFss8fiYo1tL0sPAVX1FbtyW2+2A0H2K/YwcReGz6MH2kvdgVEtzWsD/uANIAAsNAc+YllaWry/CCK+GQm4E0EFL7aslkoIZRbYhRLgYlkoQqL6S/8AUpoQBbo6jqWhsLip1zAy5Tp0X5uNsCP+xgAo8Zj6LYHfgtU+qXAueyhX3UH3lQpA7PywXAFr0y9fYDmFq+oNzVgopz/EJzNKxnsOooEQkVTHUuvk/aCRal5lXqJULM4j139RdH0tGPtihpyEMx/JKv8AtEoWwezyw6aTI4p/zBxdaFfyzHxW5CkiuCWgXcLlVwFO2ZQ3JwwbEfFMHEBswZSevBHJWVuAmIxXhD/T4DETBbBaC4CxTad5/glzIt7YG7hozCUpGt9QGRA1odOvMV5Ed1cJzKtCswCDbMkJGgtuzRGAQvVVBqReXDM4HAhu+yZnJeOpWo21BdGMkd6CsAA7wQ21BgIcdN7Ke1+vXcHRS/zCpC9jmZyIbdH1LLqZiKzzHvg7hABOg0xu4mITxBTbIOWNAWuW6HbwxPDZRaqMKOvgkUYNzkXpgLRTb3epkIUtHMwJBF+MP6WcpMAa84hKqJUqcUepcyTnmAW3mNSx/wAuGo7lsf8AwSlDY7lD0O7DLKj2DMD5nXUI8jySogoQSKhA5SJcQowjCMqzOnNRRTz0RPXg6lECo5mo3YWkCpwhfs5juDUW4UYGgDTme5vxKohVl8RFKWSxunbkTIG1Bv6+EKlmWEbiYgQTiwMGYWBWKMwYiaiAf/AONyGIhvS+ZkbHURNhYTBYoBQJlKW+qBYIOQ8Ru3uCjZF+5wOGEQ0SqI4a5/8Amqqh4I/3iw1YykArgY6slHvEvSKss6ovADa1HfIFJTphMdlXuZ53DYQKXL1FSDfbOQ7bvMFREqIIQ901qv6J9zhvcNrJMvYta0+oboDoH9MoOJQUzkp15IoAd2PQ8+4tuymUzjJtg6mYI4Uu6xHUAi0af5fURiruKJ5guXgZb1krvRsnHILsdxysDgbEieLX6jU0CFQAXHfVwQoOvBOUxeQ0nMAC4Ayn9fMcAg0jxLlRkq2IqeblAwBu+QYWY4J4+FCLZQf3M2LcRYDyrwxMxL/IQIMeBY+oiJ4FVGLGhlrbKhqL0I9kQN9DFZlHcqvNXiIJL2WyeMTUVcNgH+6i8VuiDmCedeomit5XmBVeUaKeIzJm23a9vczWgXWZbqlZfqi0D3mBNarblcmA/DKYeriOq6gtwEEibpmscMrMQqaN3BmNNvq/JX9xiAtYAU8j7/qFmSmUTJ8DOKC3BmHcByYIs6s/EtJb/EtAogolkQwlTcDODSNJKTKCrvNdT6+Upqv1HFHM12l1Bbm6hCm8R6xtwuN/+y8j1pQ/cunEpscwJwAfZeI4QTykKWfiWbgW1Wg/3MEAhpzzXTuPKEcFr4OYK9EXoJpocWsauryoH1B4aWwSMbagCvcA0UwFaLEIDeEU1BHXlL5UvT6lBADbnPT/AJldZmYwvQn9x3U+g7l5+ZRN8iWegtJmAq2qmkj0ZW7HP3LKUp6jlDEYygxoK9xis4P9RBoHiOjwR37RlcSxlsT5qCQlpU1oOeCBcHSH9zMAqXixAGsCoMdFL4IzyKgDZEYx8FOc3Kf6HImZBU0DFmf+3LECHDT/AJjlmQcnMcuUtfbMFzRpjuX09RcS45uVIzFS0MnlzHaf5gCNrjRQJ3BIivErGdI9xOQHNzUVcPIiqpMwtHcIVMqLKd33CSX7ZrKU9oNQbnIyxfdRZONb5x11K8wwjx9MprAYK89YiBZXNaj4U3ExkhjsIA00MZr1CTgrM4vsDqGCCzkbmZ5vUW0NyxZKgAzCB/xzKRzB/wAHEEsDEzNHESKocI6gYADxKctNnqFuC4HEAOriBjqDUxNdMRQVUkuvUbLW4Y38UwUYtyw3FcTMvERYbs4/7xE+Lsj4juGS3/YiUaYFR0fAFmkMTcxqZe4hSuAH3G0TAqGgqMMs3+E4RFehQUkZ001mAqUTUW5RCqiolkMbhRQb1c4H93Lx4hfVsLUJSPNf+x3BaKeoUBwFFl4jKdrcsYFxzi2dI+5/2n9z/tP7n/af3P8AtP7jqClcGJ85jXhTDsDj8yqD0dqA/wAy6FAyfMEGR1qLiyaGYEtfJitLCs4rjzGlJbauWCF0HIxv5eDfJp/mJTse80OJZDJN8xSbZZHrrbLW4Je4q2Hk4bmILDR5gfmM7OA/qKjABQDRGrjqCpalvZLkK5bC81HdgAYYiFEo2LlI2shlN33K6cOuDFqDcu7Gk6lTQMGh++fuObbGqf0+ZvmBV5xAJslVANtGWolMEQwhEfDUlZVJFUnaq1jFbmyWLjTzFIM+4SmahQKZ4CVRMKLyv+pjthd9bCnO4cF5I89ZTAukzjMowuxxXw2+LqAlw4EwdBxKGmWR7IWYQNY+nY3L4vCfuBkHwwhARg5XM2jEUeY5v1wt115JdKYrUi4IuiGfpXwxNSyfRNsPiDe5QWRs2QiqiGOXialLL1Lq0iyF3WdfA7WN7oyMv7jhwFCivVPqPDWgwxxG3KqqfzG1Fq29+yEWVrYPR3KUYLRD0tXDEoVkY0I69yrkF1LKnI7GYhZwa3/XqLkB+AlJSb1RuAxlKcEHeDp1aH7GC4WDxAbEiqolhF1MJ7MP1BxhtI7JnUPJxXEdcC2rg6F3xUpr8HTVtCmNZhUYLCjKg9geo66QeyVxKwIYm9eGK3QS6ity6Isvgt+HqAkNiwrPbAUQRz3LFFxlYljiCgqUR6rRGgUFuBIWgB1hSwJ/uPjIRAw6nXFilfuHcFzuHm1sceYVm02uKaL1csRAFs17941AeblU4rjHcTAJJY5jKYa7fLDXBfPMd02svMW4AGmNkWpaJuKPHSBVOfMLPEsBRByRtvPuOWJuKlDKHIjyQW5P5I1dt+YsEaZmCL8ysl6T+0ckZ0B/ct+LKoF4VoGgceJi4HOPuUVizG6e5WkagGhe5kkNLqely6HisFI+yQbeIWtepe39PuUrDEfg/wAE5Zuuait8SlRwORkGZSWOE4YGyyr0xuCKGWRLIbK54iI1XwGAWoJvAjeOV3/UolTUFym4QkMRLntcim2YagRwQBX6u4Tz/V9DuGUoEB9zfzivEu9MrAqBQ5juJB3Msxxmpdi4LBOKOHqWjDsw9vnD8xEGCkUAVVYhRlbuv/ZcWZ4V/sv+phXRivOWVCjLI3Vv4bCLf/znBSFUAYg68celwZTC3JmLdtHe6ithoDsiw7zzCIUYh1cJlkZmsUtumA+oaiHKHeobRorVeMp5YjAp6ZdQlSqlk+M61AlnJDiV7Jwg8eYrzPHle3zGqxmUxxLolyoEjRaDiB+yEG7IyJs5JjcUQY4TZA+NJIZop1/r6lQc0BikQnlz4gUKaIZRtepk4l0Ro1Ks+BCXArKxAomFiSrM22HmNkJC7Ydst2ofMfAg5owg+/6lMUDOWoCqG2CgGKGYYHuUEVzC5+oq+oda1/wSkNRiw2blImA3hQsH2kTAYjP4bElQCggADEZL68w3EthcGq6H2RBAKcBxEgmpoIkDPfI+41iVe2BFqLO2Vv4Fhr4SJcCoZACru2ASmaemEg/8QyjDlO7VgjXqVAfdzk/rEO6v+JTmqjSXn4Z+8FJIb+N55Ihn7hL46cOx5PMcgjgxlg73Iag4G8zIPAsotQlU9D+yPAzlwQt9lMSoOSLYMbKbBeZ56YTxLwviWYVvuHf4hs6XAH8RriiC2b1G0b2ygwKU4wCQjwhxDOZTKXbJ2Qs+2Ceokr7jywgZyLRpVgjOobNqIplcqiP4FEqGX465x+1bfqXHZdw5jxfWE5j6I2dzSSa1IWiVQBS6tuNl9mX9xuVqBkatmGGDrYQa7I8iJNScDcWPdsLCWqJCZrbHJAIlTAYkoqOVzUEapziDAwtGz+SXsaYy/BngOUeZpzE4c3vxME+iF0haBAb9ohLCeR7l4mclieMzU75q9ofpqAUz5ZZ1qCKf8kIMwUQPbzEWoiz1MiUwuWXN9wHklUK/5cSpeYPb/UwlV4lsS9RewRDdBQvMEeqNjHuJmZQu4sZJsaY6PVaTAi2sVlly3bcRv4QRK41EsIEBqr1EuZItKgw8dzB0AzHQMNA1K5DKO0qJ2SjtXQRCQyZXvn9Tl5xmuio/FEUOQeoHdj9xDmG2YduoBWlmj+4bFgzRsF1SiWWuYBog8n+rjqqw8pfylxO4XCplF15hyF6eoSKETcaGYlixiLBhNBVVXz4gwqb5CXiosQaWIZ8XME4Nb31LlKBzDW4CMtUpFomUWpbLZbLZUNXXFwg3AFFnmDuZGXAL4d7h2ocvfiDTpQEYdO4F4rU1fONC2vRcu6y28xErX8zpBQboGOlIS14TqBkAHA83LthRzDM3BNgUZNXG/U0Dou6YQlZwViZlnzI5WYQ1Li1YZSMQTDkY9a2sXMCurqIi3uNImswBTJCdGWzpgolLLCOIYbtcnEkdWN+UGfEKKkcUtfiLwKCSUwgwLBwMDa6OtR0Sqjl8DPysJdFwogS0ILaSeLzBFLbd22x+pjRPollroqwDi+oizaKqRnfG0+4Fskf8pYl9zKI4lnK+YlUtW1YXou9TNuz0NkYaLt3UxWnOFr8SgXTZOJbRsv7imhU7buoi1Eu8MuszdvCcsUlFHBFOG6iB3AaKY3EuXhlSkssrYN/AkbSoKYWgUwc//FRdg7iAxelM2DQur6l0RQkPkzMopT+2Wf0xbELNfnE6jxLAMu3gzIXZnvKTMeNGU9OmVc0nN2twOk5PEs8WlKKgvz7xcCATGCtZr33GVuV2xsAmZdXxB8c4OK6I4Aum1pJk3WhYdK5V1ySn6qwmuNxVLBAZUgER3SKndF7gvuGdAoFQ3+iX0UIzUvAADrmDhm2dq1cPiGmrNE0wW1uJf0g1G4UKDyB/cxXWG+xLrzVESo1Kf8CWGJfp/EuKTP21LqsMabFvlYAdxNNu5noNXevH1OhFEaYG7g9HcMA7ao0Z9xUVPBjp+z+IB14RRVw4I1t/bRcAhDZQu526EQpChH5UAlTkxBStnUSCBRMAzFjUTD4iomxi+5QyrZSstEoHiqFDruppDKYMfC/EbNQBWThgWhhjfB7ko8dTwO6aR4uZwh6d/cfRaBR21uDjBQmSLrK5zz1BGh7YLQuJiYVX+U2Sqh/9GmMtrKbi7R4meIohSmFWVZnzKhVcb8QrGoti4rbcNDESuYSuQyrTHKLcGFmkrNzFdRLYVbgR2gDizfStfUKkrKHGYsPGKcvcwoy8Kxsej+YEYG3XROukFAQhYFAr9sLKg7ApXfk5jB4bOT5jmjVazEVLyBqy42rS+5bqmIeJWI/NCc5u2fA4+RIADfUKVd7viUkhtHZzj8TlpLFJAiIlldSyR0Zg1aFwyxRqZv0hE6Hqsy5DS+i83GN12SfgSF7qiWlP+5iTkx0nKdncIioNQ5lhEtYfANy5cuXCOvqFQDi4TV4jC9eYfQVIaUfuUyyULTadNRwgbGRXrMtgACLLtm6wjsSK/YQmPzFcZiFxYGzB2g7lCI2CI3VQN4gohh2gEpwH8iXd3kjMKHZBZDwDZ5iS2UjBxUVrGvUSlzGDaXT15lozpCzBKuJxiMbi3EA+DC4SiaRMahoOk/xHqyllbY8U4jLLw5j0VWJMMfNNV/cZatQ+M2CVEWGNQrBQuWMUxk5pf4iOkLNNJFdFqBoJW3GyyWmz7JX0gHXzg/gfmYilV7nuuXzHMqxpB3LwYFcROSAUMVs4ZiNqV4SaJKAoyH3FUM1FFg2MBDYi9mXIB4IbixbgtqKaBYqhy2igVzBRGjFSEbmUqkc4FoWH8wILLK4qXRVXk3Myy7WZqjHcU1bgJUjqJUt1pEDaH+VSjCqrBZxuGmiqCrEdaxHf9kR7qUmozEte1Au2JSRgTMnKu1yXi/xL+GZjCr9SkZhDPALtdjzxGza0vMR1T1MYIaC193FqNfl7HMM4mSBSk7YDSLCXhxHqwhOzX1mWDa64hkB2GCyKsSSLqWEIN+3051KSW3drh7xFSQ2IGgw1BUMg7jBplyxXmFtm5eFS4JadHfI8ZlAWrBVRYlyzhtE6Xcv8DtRgBCqgp95jlPzw+HqB5YiaLw8WQFlDTBku8VyQRVlvHmWpdtDHBRZXfiH1Kbq4YTgJh8sS3cSiYEtZd14jEM7ZIidJkR3EkA5gErgMGXMTfcMNTsVMOqUmSrtvzubwpgArEUqUtxU8xNyhH+JU4eLWK2KWRqMHTkSV9CRB+4TbrQL+UYlwdK4qCMvFTbMT2idRRsbmQrv/ANRaTQn/AC3DGbDMwUzGtzf4UydjZKg2PvXwwxApBaLD8RaZbjzeAtqWJvbhlQLjZQzaiUAUdwLolhmCSRFwe4FxMpj/AIL/ABGllTmBjQmayB2apz3LKnjR4CJAlxvxKqajHCNJUFPrey44sKldHX5lFmyVZEQN1vrMtvNLzOC0kYG4BEFv80wZgiQKYsCZiMCZupbSqRHaiGjR48VLRWKrmzmUwohq8fiWYKgWlhuQC2+n/MxsHbA6BNrmUZbSnu4oF0MFzhoRYQOhtl9QVjoZAnFR+TeOoY6+YFr1b4h5qKcM7P8ACFUvVqyeNVKMIKlU3Nod+ExM0p1KdSnUp1ApmC2I4F39RBylCdZgGmI7DtVGsdLzteTvcMFOSPbLmCIuywtxDmBTeO5cgqMpY31UJaBY/uBTR8R+FB99MPCVR3GEbN+nMR1lXLX4bi04gAqDmBDhvuPUQLPCJMUygnFnfVH7lFMa+KmCKu46Rm4V/KIEpt1AuXL5fUPvoIK0dvbL1Nw1hC3mZaDMweggxzONfYYo6SaZfiE6p8gJfqoGJBrYuDEvV3F3bi+ripQjSS0lNf3Rg+4YcIkwzCsVpQPbMKBKhfAuj1GjhZK9iVV24A8uj9QzKlyj5JHPt8JwHRMK9J3LGNKlcMI9pUZd/AZtBXCRM4HbPpFao0mK1wkSjqNcm6/EO7KxY1HJ8mWUhXxcGVbfVzSuD3KL0S84MXVEoFhyp15iQWQVwMRamRBFArR48y3lv4LUNxEr31KWMAgdOoTJvo6l5i4DQOJmtOlIrXipQgpKtf3GQINENpCd5osFKvCkbqAhGLz/AITNYXmaKqFeICg0PoajXwBRRcZEYAhMjw/FTansLnwHhH8walILSFrfHky5h4mUStxYMGwVnxXmWGsRb8JVGlLnIxUh3ExBXDbBrS8eY9q5WQWVsre3b9H8yjO2Xo3LH1EoDAcRFayy9QLCyXCFrGM94T3yw2iQVuDR/csA+nmXZihZWDBEyJedR5h9wR7RaOo6pxdRrBZhnMxi0Y17mgJhv2wzOJmqIOJcHv4B4c8RymIhLi4YLcJpSS8oLwGCLCqu+Yy4C4Wa7+5iOhpfqWuAw4It/Bx7lkTC4GbVxRL8jHuppwncY6pqRndFZ2Vj9yi5XlGdbZlj1dTTCv8A1BZC65ZX/wBDEHNYl2rxEgeSOIGHMEIiIWcd15v/ABLHLHM2hgO4dinEHXmWV3fwHLQ7O4kiFLb4Ynm1zXETD8xbV9oB0CEHgLmHzoA8scAzheJb6UIwtj9BioQVo0cKQJFmIbt6etQU0NDUpTYwWxbCq4rcY6siOpYqVVpPcqVVTM+5dQx5doeyHT1nxGnOU1io6jNI48y7n9Af9xGUMJUstNMoMrk3LJtmjEYKy2mAS0dLnl9zHm/cGhyit1zCKm7uJFA6NRXhbYEvF2QWnMwahBt7InKPvcC8XGzEViSExzIsJEuGUNr8sq/8NpSIAne5BK4yxsEbyL7IQdItCKNDJPFPFPFPFFZoTEEmvFtM1DoHvMGPPUJXPn1L5g/U2f3KbZOA1yuWOpjXum76X6l4CVimhwf9zDouFikqVDWJ/olity8Qd3B0LGBAqrbFuzsmUEKrNnUqrvCQN9w8NZnzz/cCVHcHEIIhpI6Q5XP5jFhaKo2JRCthvTNTMckBuLRFcW5WJYyyEIctFp1GVtyJtYFUaiKDviIwQaYJXikqvoj8AL+0CBAKt11FFaOCMrGk5IQ5eW/ITUSZC3Yfipe2hzS3AfxFoDYek6omLla88X6jqWuCuXVIPYlAbTwkuXyrpCLlD2Lpiofhj4jLmAHw4bIh9hvsjYWbNMTNQRHLuDrs8QHJ5ko0eDiMUoZczT8AoAteCMLtnTjtl7NDXSJuJEHVHJ1F1rqg9EHKdY1CePgZVxVFtX3CQGgqViGGC4KixB3OCv4hc2CUwqBZAtSYe42tWBwxtssz5doiGEAoYikFunFzHeAMDVZdvx5/A0Q1z2afx8Bqq73CglGe49IfkV8V1WTlGmGaQ9kwxzH5cSrNqswtGAr+4ittK9xLIbi+3Eaq45QbPggEMArgSxQGENxRSX0XqIYQLRiiYs9XUcaVbqUFZ9nEYKZg91RBdXe5nNRCOdO5uxGQKH2eCDVDdmyLCgAUwf7xXS5cwFXqynTCIUyw5EY7Sv7lIuRSHWcf5ZhNnwBccLPgi2ERVWDDzFQYuYkynqXCdYLnqUrK2+5Xj1NOA1jEaLebF4iIjJ8n+IpzHsl5GhgtX5+D8RYp3BHVFfNNf2glWWdIH+CPT1nVRxaOBxMdf+Z+GRAn/Nhj9QqwVLLj1Emi4m9k2S/iXX8yoMDDu5dhKSGjqli2KOpmEVUpcfc8SrOWhhvi/wAS+6CqhxBLe6vuIzi8BKx9rUFgtsLo3EXII7WUGoB9gz+7hDPDwB/mw+5YfAYGjKXNS11QyqJAdam1lxwRS4yDg6lzt2rfuC5zsSZcnLcOUXukZ1GYzBbtjZtK8YqAscSuX3ye4Q4ESC8ExY3R5dRvq+a0cw6hggK+3r1FbjfAfiGSFxixhzlhrFdJ3FS2qlHwuSpznD3FBbLE0ncytAiq4wphMjLJhRKdkqKpepVRKYVHLKnhgKx+GKl+sZmYgAG07S+J/wAr/E/5X+J/yv8AE/5X+IMzcqa1IWyGP3AuYrd9y4mDnrmVxGe0s7jKt7dYE9nUarz47U/skTskbv3AD9Aw/McKgoVQOg1GwB/xM/MqtKGnT4YPO8AxyKjcl6zHyNnniGs855eWXC6gm5dYhiMXrhu08P1Kz/EVdvUY4qqefbLI6I2gVEble0LVbxNqSRlT7vV28RwqcxL+Fo5lyPiUEA0FblN8zW5Rl1DjwRyzFuF5m2VSLWITXa2fxKXOSEFzJCWjTKkauXXwOV8y9XQf+L+4+VqJobyfUrRXK69ynFdgz9np8B+CZoxLKsldMtAbt7iVqyVq85/MziPFTkpPQwvDVSpfuF3UciyMgGsi8wXQMqwEwhalUvsluBW4kojVY0+IJ/Bl9jHBGGd2Mbb74iW9XlH0wTXKLDmXWdspiYlIxRUQdxFwZZqft8ylvmPWJ1MG+oY2LmTZ5lg2ynyJccpdBlYupWimEgdzmLPxUTbw9y2Ls4eyXHIrTBw/ULCLqDmYmZ8xbJj1EVlTti1Ady7g2q5esUTDkgSJghhbqVAN9ssgATYPMxCtGNYPAmDJfONS0TOKyYjqG12aeB6lQDsWb/plYkQJG/8AlS1KGGONpBbqX1hTo3ZOZYRg6d+T5l6v3BCZTxFdOjee+YlIBF6GYxMJbolocGW7TcrRwjUFev8Ay/FRvBBQ9/JajEzAMHzC7FG/gp61CqpjhNoI0Brg/lgBUOxTiv3EWoU2UNMbYqM9o/EDXmULuNPZBaWgVqoFrbyTTiDyV5I3tczDZ/olhkylmyY2QAd4eJmf88wMSqn/AFOmZrMlQTJobOpeIntUUDVL3PGNeLqesk1BplhU1JQwESvgqzGcZ6i9vNeJWSUpSMzQL1E6x1rxKU9IN6i6+p4qPlTb8agVREALJKPcc7lF/M3xBBaTLqxfUs2Bkbdj8wUtW8QrmqAh8EW2oOlbKqGcRvXcGWpcoDu4mBGmkOgKjIG4zFHf3KRWrVNfUFpnkK/EdtWQvK4I1m7qHpUPReaRwe3uO3VQPoHliXcFsrECHeltW8TFDO6cw1FUOsJDbG9dR4IJ4gxNwxwVTK6zTUG4vzUSpczoWp45454545V1XmU2/QGhX81HwJVwC4Ld+pT4GGguiELkpnlgB+CEwl09OPyfxKuwF2r5ImMxXIgFjvZr1NmBeqItR7KIFggOXNX9R52AKuj6lFUlq/zEdHyS5qILKxCGzJNzYlQpGzaY4wH+o8JZ4luSmBH8oKsgY8WOAxiZqy3LE33NS0EpucnE23VzBY3DoWti+7gSnRL9CUxKlBGt2QgALMyPFzMSGyGiLGBcAqCfAbDedU/1AuAdgYwJK5h1fuGfpqrWMr3iW70VdDoI7QqOTEOCMqule9kvrYzfJ45gH5iBGJZditPqUWu1k2hDcqmDuMYNRSpReiBKXjzLAQ4tYhv+KZZnvtYn9xifgHB+phienCfVTgD9/BcIumJwZhAAPTURTY8HUZWNpZx9y2g8F7Ma/mZ2BfUcqlHj4lctEXVxFYKYOYNPuIqUwLrZ4mVGQr+I3Q5xfDpJQPwNQRAWrQEIUreUgxS32Si9SvkRVOVX0/8AMplFDSL/AHHaCpGfqPS09TKavpECDAuoD8H6RDBSJmBVxBmg2viGZVkyywJf+gLPDuVcY6gTQaFNdQXdrNmky6+9y8Q4zJJUcxgDQ4t8eZcKCKwf35lJjTXhhuKR2EuOo+a/0fcXxZJv/wA+oWdQ8ZmSuTL0xM3cHwxoJsYR5Qvp2RxG6y7utEqygxvvMSgArr2xKlQ1Ks1B1YomAmn4ymkdFUkuQu/1DTPgy43BmW1gFAdnUK1dGYrT3L5lCv1CsRuG8WvUV4iLbxBOMVK0KVAMp3O0Ciu4JuwnNwV+hZSty0N5lW+WZHj/AJxiomf/AAYYBaQUxWEcRrk7I3ujceBZnKYFveZcoYo+0YCx6LVwt4bC1EwLHWIfrllh8v6mJRN4R6QgZN4M/vmW8AORySgl4ZhnFCw11MSRS/moAACdqcm4F2Ty5drDlAgAevQZTBpMlMiqgB4tfsjQ7SV23mJcuJpIYY6CFmny9MEqQPQLb/UpndDB4ZllcHviY6By3BAKEYe37ZguLWExwBcDQRLlylwl8P8A5CsA9AS1CBwr8viXNNanL3NkKRbl0Rwo0mYgkSo5SGEW/i9VhlUXocxKi+Q/UsBqZpG/HcJDJLp+Gdk1ARpUFsdSrma1Oc6jVwHAyx9Cnq9s9mezPZlu5iZuMiXqyABX9EpPtOvLcCg99RVpMwxeAenuCVp8e2t+I4tJVXOLeWomC7YAOnxSzZ9TwjYZEzCQ9BiALMxOHhpmmPiAqk+jv3F7M5VuED+JdAgoBf5gK0TSWMBxLiXAnE1DuaIvrMKBIOnuZARKdQWl96ilgDq5tA2gsXHKDnTazuK2VvC4ghhFEWoAZsfMX1mF/USh57iUgsIzl+JReHcu7zDn4S5oSr7/ANBiCWlsUxlhcTctlAnGYmQtDtwYPMsuDuP0MfUM0VatpuWQN2ZPCBnyCKmqWH4y0AE4G+ZdjEQV/RURrPhTZn2SzqKE9itfcG6c3VmW5EqkHkT+50ejiBmhMQjaVsCId3Mm4wVdHuNKr/hG3CLCqfF+WMo9UzZmKw3H4GssLNTmiDhiFjTEjwD1K892BHy9Su8j2x7mKNHB1GyjnqdhmNHmVcFMYY27YDFksEa4EEhrDKdtoXslESQ1kNkGsNdl+G4O0A8FPmiDteAA7c8m42YmWGK6YsC5VMScDYGM4uaYeYscJ4lYY2MwywJKTiCS/LfwXVZePkQbl0BqN4yqqVyxU21zKM11EbwRr4lAJ2JeEB00/mU47ayBDC2xsEY0HFkzZbOpykbeAlmJO6ZUuBs8u40NjH+xBnq50RANk0+pegJkNMb8trh5lZANJxHG2QV0wb9f+X5X4qoylmaS0ZtMo6WWrQ+IiqRGFPikqadcSpamEEjgi7xmY+ol3cRc08wAblDK28S6TkigARD+pr5gq4+0mDgBkiWi2Wsyo6ZiX/mfiyf9G0xooA9xoeoLLjOAuH2HaGbihsOeiWJqyp6mAtMom1eguIcVAVVdywJYYQyRRavuOSO2pHcLhMtu9kSZcHbCXGY6Fg3WWpQtmHuWiWjK7ZbMpAAFub8sCM0Tso6qU1095cox1Kdo4ZlLqJAw2pfJR/iDCIC6tK4GzVO0Z8q1eZxR4OoGAcqdyzDUBugl+TH+JcdHaA+yv7gbiYg4O4a8lVhNRhaRS2KWDj4WpdkAMeuWAppZENQUfiamREZQQ3p8SgtHWQ/cTVv4Knm8S6Xf8/qMfUyVMwgsukqF5T6iPkfUJRFI9camOj3AoNuTQhrfQZX/AFSv+qV/1Sv+qWlePcQQQm2ih+iyxhzLx3shkTMBGi40W03XJmaF6FuPuXbBGi9wMSr5hAwCozfH7lh51yp4XLU0swekNs0a9xqCiHcD4pGFnxMGzCdeZcVMjUSt7iwjSGASqU2x5eoh9StWgN5GhkYgKFl5AzFHG21xDCLxbRKgNDTdsSCxVDAWVBABREHvG2UQLwWP1CnlZC5vOM/ct00oovSoC8VLtu8zYAWEBK4ajFLRZvslLiqootUu4U+A3EdYZDuLEtYX3AuZ4FEtgEFWglAxet4J14gICTHSAMHoI1Fz6R5ALX8EICuFB3LPrN3mh8nLCWhXDAGkieXvcsbqxyu/LCZAdgL4l8BbbI5ru34hpgatLOZFNtCdxQpORy3gJwOI5rkqo5gi/MWMGMEJFWV/JHrFZEYwQ4xMGXcqUorccoJ2NMqVX6swarVlo1mZi8ZjC4MRxGU+CMBjMoSYsQgL/EHXZAHHBLhaXfAsr+47YEaSVM/pmFplmGgUCvQ1EuBGhiGWZQikQ1MIDTk3AVOT1mUQWjOeIFiquXhlM5CWUw51ED0nDD5F8FTBxGithLhVV5lw8BmUhPPcccjAizptwm4/ctptjatbFTLERp/21Gjatjom6b3EGOouXVfxArmCjJK22T+pSIZ8fCW6bRNoTDS/tjuOouYFzUdtdxdkZVsFRQcxNOSczFeYLmOaF1dXLA2NR6g2B9xW12R54+DGZrVpzLuQuf8AVxO2TMFLgbFq0RHChvXMCgpLlRK5jcHE2QtD6mBj/wAuZqDTMv8Amww7PUbcIOCFwYBfEUtLUQ5E4qOmzirju4aqIFl/SVsJMMG41aipGciiWK42eYBZLLnMMKj/AEhpywi8NALlS8rvFWLWjxEBYUNi/wDEYhK7m+YqoFVr2GIFGDutrLqqqgeA4+KCAMy+517lPQ5YMayclim+CMU46jSHwbgoDxwzKWCKAAyxhfeagfXP1MKyrusP3KFWw/CfCVKIU8RCpoBlz5O4qQoNIywhKVGjUVk2msd/C+t9GovSNq5mrf3FVbl9SyVyvMqWlTaLjuXnvPee8X4TKLGrqsVdkD4nKYOxj/n47R0HCAF7XeZ2vlcDgCDX8R+ZSod7z6jAUG7JUIPJwQyfiZaikap+Bk7lBctowf8A2VzLpZN3WI+JsLBs9GO/hKAhWnnOPcZjalnrhDksgLlJKEVcu37gGhcmeoPGbADp7l3GLgpDC6oVcSomJYl8Rvrl8M5M1EIjJsBM14nFXKJh9SrVzBuYSpyLojLLGrEWGo7gYmWCUAqBIetI7bjlRhqWsY9QxULjEbOKjJHd1SArLi93FpKXeHY76jhhqkJUc8kvrVeIYQhyM9jxA2Jbnw2kwTYAFDplL2cQyxbB1vaqgzZ+ZixOKKTd0YavydkJYoLBhqGZk7tjaI6j9iuJWBR8KmaEuMphn4NfCywKJkQrSv2YxAR5xBUis2SkbiuPyXEp2FMXl1F2bZBYmMod8zmUansLiwZUJ06xzCAMYjy/Bv4OiCkG5VZ/UCUogMl1OkO/MR6CHU5AHEdFbWIAuAoisjovHwIlF/8AgS8IWMDMh7JVsLqabI1zjtait8T9QQIhZqisQYqmhXCNb7gcJQbWgg+8Bwy63NM05qUGgltQtJSR6RC+YqpzERjZiCkrQx7YsfALjg+AgiAsxeIlQfgKQzlXRqMQbcREjxMSmTMV3axApWSIHEUhqoGQl9QdwK5a6WFjTs2EbALLwXPUgpje1flgrI2HA8ytfOEGN1LQ0oFXcUXZS5Jr/wAcxfDr/mxHYqwXLg8GB2x7bMhlJb6jvRhcppsHmDvcUTHRXaaRuyqIUaNxQhDHhGzqL6X4l0ExDgg5xGSKxa25J8sVJwAmuqhLVqafCoJh51iMQZOnU219JaPqMzsSlb6gJyqVuEO47XBe6XlT8fuPG6Xu2WsyW2xURKwEloQDeinUaZNOSArchsevfbFVTSlOPfMUzYcuWLtdgz+moyBVdwbi1AMvFTri8zA+Rhwpn9wD8MZIlfgRU/AtzmDj4vMIZdFy1ykiYlSpUGwr1f8AnA4Y7Pz3b/E36tudVNH2b6gTx5RSDNHh3MjCbeVx0RWBxAznEMP7jV3juIa1AJH2GHFwzAExwywamJ1GmCs4iEVIQxsqF7Z7goXRdB1DhJarsj/h75nLMRgIuPwlgU2afpIZJT4q/EGjvjpiVc77Ce4BXEQu2GahiBccJDJAqCYG2EUXdGOrLLAKOsuYyoTfBNmmEQypFFsVuUyLYlU7PMtQlJBrbA4CE3AZR+0uUy5iGLDLfwvVff6QjwrS9xfQt3DF0n3/ADMOMaRRmW3TTakujuYrbFZw6ePqXotlVtYjjbgjk9BC55i7wH1MTS3Qq2LW3nrkMI1VPQqc9IFpH/fqWG483uoApXFI3FoJqij0P8Q8zLSZfAwrKeI1CJmba+A+Ase4JurWyDo37GyP030KhRyJ7lIMrRS8zDPNbUTSAcXuKarJCwblfo75ZzxQaAYxM0LoVcUCYl1FuD4SpccykctTW06/ERsXWZwWjrbuF5D0wyr8NS+qGlLDA0szyRRZAqink5SodFJeKmbjuW/CYgpYvxRA14IsbKLxNNYdvBE3AszDEePgiVLwfCzCYlErDjmPEq5MxopXSo4TjJ7iUy+I8R0p7BjZe5yEyc0ypXOTuZmW28+J3z1L7r6jVTPuPZZNjBSzKCmxpqagFeb5Y6YkIVJR+MPr4BDLGB8AxGXgZOnUVjRb0QYOVZvcUGkXL8q0wiCY/RgFmyZO42AurjqHe50+Yh6IE5l/xFx7wFlRWNWQc+I8dWZZEMaMkDUrAdYlpiqwzzFqMoq03fh/mZuVcLAbd/5TBHcVf92GIFuZMADVta6I161GL9zKq3LwWVWZ/EXJo7X8XDCBwttIMssgol+I5JwNxqrfIdRWQC9gQCIFy7aKynEZRtWXZM4aaHtiIt3MsqNhB5dzT5N/YJqIKshtVYG+JzNLF2dncBnMYA8rqHAMMnZzAlLFxCqhLqKHeZQsro5YwwsoN+nT6qM7W2ZUlNMoZ3LCBaxS8y3C0zDxYAVhE6YbJSS7EMobi+D7mTOssJN1LlBPbLi0ouYhzZHmfwShlMRA231HGo5agV8k+SwadyoY/wDk+M68FCanSgKLIczByTPPcTFEUyjRGNUcBlHp5gcXWWs4YcncMgYFZ3B1e4V5xat7Mo8f4lkVVc3GpkQHCUZSBX+pdMxuhSg5t4igiptuJOSK/MdsjJK45UGQUBbV/wCLlwGVko7EiNInsllALXqA3a7DIeLgwQTngTKKtW2OvhQwVFqKFTl34jsOmOhVzKq/hqAAWye0I0f7QHSdENvZBVx+SfL5liRVayHnqAa2OFl4PUrQZR+kwYT1t+jbDRd5w/03GioaoKg9zqFv8qQD20Wv7fL8POSId1L+rfqIlOc/uOWCwOen6hpfmguIphWMQwjTVxDQmMKTDyRql5BLCNYU43x2XGAtUpD6Yu05CmGAOxe1PFxIKRo5lG2dm4oUquTh5hMdXS/JKKvTAF8TaN6+i/6jM0aw1MqfSkGM+WXX8woOgCvBdgZYfRGQJfuZaZmj9EzDYwDDW6iU7anY8yuLG7ozPJoA4lealRFX+IqiPIzRrCROuYOU1Z5GGga9NiXZFyhD4GEiacwAa0wNLeovwBGqGbB28QATYpzjAdPmX30V3RoE7hWHpIjgFTKOyUHhy0ECwWVqfI7eolPlkWvTGMEsfhyqGSJccGJeqOhlgFxOq7zsgkGnbNJWfgMTAiXHB8ggV8NIyNIaCdl7jTApBu5bz1ARBTo2Rb5m2GFxlDcNq3Hyh4wkEGgTDpm2ZWRlS6mfDMF9msxK1c+tTQeSNvT/AJYV4gXLowpZYkcQJQRpKLH4TWX0NfcqsFaxij3Awe3bh7jYsL7EMX3fMvNSOujAnOuBploaCJdqgXUQAXXmYbsxv/mogolfUEjI5OYGsPINHlcwwJp4hRgA5MwB5cFWYTQhSNWYSc/CfJqOjuv8oBgCHL/1TEXOooC1UQAmihCYBupt6XmKWK8FzBrZddQKgtMnUYkEJmViJFrUSJPyzNN+oLClWRAls44YhwRwEbGPhDcG0tiXKIjiTYyuj/MqB4mkRELlCogC1RZ9S12s0MSAG1a5LFasrliO6Da0QOT+Ux3DUw4HDy/E5paLvpJiIFUE+CD+9yi8js7hRSaBay+JDVOn8SgVHZAlWdq+uoEAajNkwsCkG2AbW6KPzDq842/qPHAKGmO9MUKPiFlVNvmdb9RwB5F3BhETjhERGjnpFSDUG5WfgqUQb+KodzJN2OI//P8AKWBy1/zDRFwNj9x5FwVbERDYVYH8JnLc4raU+HxGtQ7DfPiaTxOC+YkqWWJQGVwQEJMgoMfz8KzBUou7gx8aimF31DwR89PqZqgdGiLLtj2DA2/RHEqSua2nsgIctqETPCG0wmtxhKq0PEuptuUEDAwoihfLLC8xbzC2oPw3FCxFDfiZ4TnzxH/MGF7hUIeYOhDS39OpbIUjhaR4helA/Nla/BBRWVAcRYREl7iijXqF+iBuVNzAEJqhxLuGvHLlChHyUdRFWLKEvFWM1SEXV4ilHVnwSMomgZ8QVjmFRCpTxIY4QAw3dbP+o6ktwAiqUsW1pFldRaRa2zay3LSwtFsmJpiQXaTIB373KwwWUZJg35g/Xozb+plFhGycZDrMGjYxRuCJLneTUbXvY9S125fkAjWOuOJbiAVvEatp+mpiZ7GvyDzG7WcgsGol/FXwiFrHQ9sL0LKLDjJzFNhcgPcFSmIOHk5nQuZ9UITSW9Q9EaoHpcRa5YUB3L4alrM0TEQbj4jkgDYuzBGuW2MLSR54wFC+HUq8+hOi9WncUwgaRKpiVvES4ovj0hRg4+MWdfBV2l+4EYULo2MLLWI4LVYeZcRkeYg30dS40PMuZa5zBW3HAhgQqmyOY0fMDWoqG+zmpSXSjpORK5gtm/EbK7N2zNV49VL6rybJbOBhr2yyLEHcQlBR2TeCEDLXFiGltUXHcLDRxFPcuxZbGWWEprf1HZKW9kuSZ+tzGYFTqgt53ddkEgpe5fTTuIq/E2zlY4hJMCIBjZeZnRFUxRuUhXFNzJ/K03nUz81GmncI5Iai0NxC/rMlVuyOymP/AHEhiH/m4YqGfqFKVgXuJnAujEXzNjZqJFNxkNRLqvcTSNuKyaWeF6jl/WwOLJElTqsf6iKGi6uHvQmqTEXMY4vcHlSZu4AgCqHqZLu4oEeG0a2A/Ne4PHj4KJsf2hArhfA8RN1BgWlDhgIjYtEjaLvMcsLcppyTx+P5llVUzVCqMPuVw1OtXFqaIiots0uoUIEApgCY5U1lB6/3FVb7S4tz2BHQoSwG+ZdwcylBaaPEyXaRTtLlmgWsaGhdC8QYPurUYGI3TZzC5czAyjSHDHOoYjlC0NxJr46jEqzcJAUOanrPWes9ZZMrLtLuWVKxVGEzKW2KOgr9oDZpVLLMM66XCEVFYArqBAucKKlwRRQz4uXmZder4nRD45irMG5dsoxxMFZeQH1ESZgrcrbNMFsGUlPasXFrMo7gXHOWkuQMKnafkjSSplPJB3LfhQUTGBiTQ5YtsMtuXK8rmILexQ9HWbi7sYDTfGYIx2yseY7aGk1GtnQHRWIsBKYy82TGV8gl2eLjZutLLbt4mbtrYN7tywhbZZgDlZh5Y56FJ+YrzBsiZg0RqD1FqIa71tNCYzWpe07YywvMrHBNLHBV+JlspdypXYK0YzMpalK7mzETA0HL9TiYHn5IQjmZygeoQS41QTV0+WO2VSPDACNjGIihKr4L4jbwwKzqLMjEcGjzFt07IMVSOXIorYqBcaYlTItZpcsGWfAUeV4dxwR8V1LeHZAaxtsND0ROZgK6XqKyPY/FJYKi8uxBidjKylxlYmGSCNpdcMsmXGaIJRNXL9JscGJlK2rdxGS15gV8aliBjmJvTspmGOIkSyrLPMVncsOnxiXGzmArKhQSlDJFwalrUocykr8sQClKKIVhrSUKgruJV6iDjxK5xWXD3LuXGkitfZEvBQ/uATIVXqBRn1ArbsjdG9d+2JYmCOMKMs6gQmkVWFEURC1lqwisWupgQD3KlLCNU7Jw4i+TuJhXOtypVVeKlOhTBIAV2XZ5jqJrhh0moR1IFH8SpAVe4gpwOBjE0Cpa0DD0Vn8xvXoI3puLFzyFgM5RPA+JSZ2CtZsP5jV/3zFjTKv+bDFI6+m/UALSwCvzLlc81dvgEBawSxs1K0jtpFLrMam2pUogoYLlVEsmXhp8QODIdupiyw6I2gJSheIqoTouKLRsp7g7hlKu+PgtRvEA39OvzEKWvctcDHiLZqYAGQi6qL3rUK+yXY0+TASnxRQQsJJuPVe+Yb3B1vKrEatZlzEuW1VoQ/UXObE06Pce5IXkMEC3mivhFHDcYLm3J1mK1tfyfhzMrkJjEenAETrhNwgBZfV9x7WMnBZ/iKBy9ZT1cSUbQDV27xBcmmw3KnM45Pilyq+RVrccZtY1eIEqibRbqKNCk8SsrKfAZMB6IEsUdwjsxVKwNg/iCVIsYa6K0Dh58Ty+boDzUohp279YZ/cQRsym/t3Hj0qqYmyICriVMPcTUbWYi45I8xobhKb8QCYsWMIxm+sQbjiOVtVMqCqyNzDmyUBZdfUGXPhBcCoaZdGD2xWuoLIvmArzCw6gcy2yhTFoycYz7NxAK4F6PuYfLyqE36mkAGTweyai7e0QCPSMX5IqNZHP5jNOOQxAiGYVQvN9Ro0IEqzS/qJlcNARH59US0mJai5B4Gj2RfS6R4fhL+KYUYZaigOZnysB2rcda9aQ+5bV+7bklbdx5HEIjHho/hCOuB1YFJzOupDkIVFZPbRqKdexxQf6jNy5P7jQXjKvL/hHEc1b4TpNfUZloRoN48/mYSzJsfI8j38A+Vj8NQGkfcKK/vEQjpzYwruIAqtBFR1HKuweZdORWPoXDLjXmET1cTRK7IA22wOiMJVyr1cP9NJ1ru3H7j66CzfUUw4bDZZfcsLBkRLlUpi2U6BCMqCeUnN8nhh7nVx13tP3AlmmJdGVa9RMECvg/Bg18bNSxiLQQFBw9zH4D4EGpcvEIbIMFs0iqKXDoHiI2WZEXMP5i7UCdwku8wXKiVfcow7lHH33EdLVDzUd4S1ueM3GVRXsjHs9Q1ZnMBg1jv2wpFMow0cwqpxS6zLrOIahpvqNCCHmNkSrunuNtcfygwggO3iUqlDWcIwgqZlOGHMuqF/y5jwqEpwqU/aFLH+0aCldZMwhkAXauJmwrL6igRy4CXgCGlFq2vtGwWqyq1mDbRHDL34EdNWypQDbha4/E1Eyf5R0QcI+/q8M/BF29xQGDxGLVzikykxOnXNVGAG4X8IiUygdzDmpYK29/JxKhvDcQLty1GWyqKOISALhAFju+poYqrPwXHwFlBdg5mQVwcTEW4VTceLit/mNpd4ONupkUZIiXjuLgIMNavnqJxhGoU6mNqeqE7DmCkDYNXO8WVciYibxf9wRsLabepQeoB2YhA3QO5kyrV1IG0Gt9DWtkCVDxeQaqGonzURUlPULvMozRfdTHOi4EHqUqrrBXEpQqK6jVV8gxDjjklFbX2R4FJ23MqLYpkisfp7m3wNM3E0mmrgnbHLKzjcQKH4hsEvbP/Y/+AAAdYhpsdEdM3G9R3SyrevLR3+o1Qgu/Mzliu4beBrMPqLErG8wsGIRlmCSpTF0x7lpBuDSMaOINkUp+oK3BiiYU36jAqtvllbgUzI6Xx6lHpBFhenoJbKpwnmuvMCoGgT9wUNVho7sh9rg+MOpcLVHYwyE1gOOpzAe3miiniGwRtpVY9EvZq8MDqtcYzHKRdcwWsaAmJbJvapx1gMtwWmJcpjgDqBWVXnaRW3sIz/slAlAxT7ouowYGQGhEB45NDnuXpppFi0FuirP+1A6LSw9EoLNgDTr1HE6abC+6lOWVut1LrA5V/BRLbRifuBiUxqAgam6xvJXp5jBTGwyf+eYjWR3WfglMGmE39xsJo3pqYYy1znxWJZoIGZx5OS5054RbyQH4bRUXul5FlYg64n3HLGW7BLq0osF/uFN12q9Iv6GHWV5REzLZZliXND3iDaiwcVFHS0Gx+yNqBhxj7FDsQy4H0zhXo4mkTF4jofiYnBai27i8Csj6Ov8xGXRTTG3w1tHlR0aB5zCRHgDg9kWYL07xwp6h0Mgw4YA+aHMIkgobaMB0gaXZQ/IyjsPCYJdI2rtFWraKRjjC6QF3yez9ywOEoX9RWNqA15hGjmV2+oIaDGglAy3AvuO8QLiVAtUrc4CMXGoFy6ly4mZiIV8UTKWOJaoXguJYzKjlmNg3GgeewhdxWhYnEi21XMsTf3Fhpu4A5CAaSm8fiZOuLmGkxrMaeHmGBsxpgoBqvnllna7iQag3LYFES7l6gBlXEIQ2XiBUFkcpRBZCjcUtUIPDO3KbH+scRAW4AWpdFox3NLcHIeSPCM0pqpd43t8F8zDFx1azUrmibwKOpiAMH+4iVhgMV7gMjis59w9QpibRjye9KoazGB/BKgyjdR3y43VG5YJKpNXfUMbyosrYDawVaZ7dBX1LxQRWMPbFQmytR4eYoFdGE47dzJLPlixmBwEFbwxdwpLqblwxHI8xc1XGJxONQ9JSUHMryUsAOYtRLPi++bQ3MmCZhuViKBX+ZhBS37fPqC5WeleYlcRdosi5TCNXjCOjL6gBOQzdcyzR7Cf4gQJ5wV2rC84D5TboPuNh7tRftqiVSXSlF9zEUBw6pn5WV1cRBdtS/Zpi68OQX9xC6sF0nvo9RwRt2yAGU8kykioF9H7iJ2pQMVCvj4Xg4jY4aYuCgZykwwSoTXqLHlw/JiGmU6MUmHuNyN2RQsV2ZqIEdntPd/M938z3fzPd/MoSAvcvDazL+kB8cQ0EOuIIBcfD73Ll89+46J+agTOomv7g1e5xMCWf6mRmWXUxMEyZi1NIiU4A7Lh8x3vKjCdkcTLpZ2H6jE+qMUPOJeLlotl1z77+vt+oXQptWWgpcirA8lygg0Tk3m+bmBgeMbi9GKq2VFTc2WpmSpFWFPB3BoRTfwW4NhNkEEgBYL5j2dk5A7hQlDLp+4C7JC9/uLJoZfysfFpsaRBbYUN/wDUvxuU2UeIzrY0eiAYPQF/iFgzqygYEO0BaJcQSlUd0wzDAuDUVEHWZhLHG8mNuR2SBVxp2ZxqNSYKYPj9SrgQ6YsbgAqc68xO5hKw3CRuJTKrT3GFRhQsSOrw5SOavxdQifGyz5IqQueYCA9AAcTmIKjls/c0RmekxUIInb+pmOOw1WepoDMJYg5IMUq3qDsUNiNicRD0c9xI5ql2SinhqD25RWGJTMZm5VkKJuKldoj0rdPJ5sSVW1zFg8y7jlcTos2OU4PuVqOEl+DrbYX11E78Az/MFy4sAA98n7iSSQKiunUGoRWRSngNWQYaSm5YmXAG69ytFhw6+M8CrjqvgFRbhrEUQKwYif8AxXwkymCCTJGA8xLZmBhr39V7VmVNjqC4Ab6/MZGjSVNwOIYal3qI7r4MifuH27E6T+4JYY/7/cQuuZfS+dS/kvMVydf5Yfn4MwKly5QxlSgDz1ceS3FqGpRcdSvEWokKXEMKWLsHmPmzMHBAOxQFOfuEAoWNSxr4WAIIl7Lgay0KaNn/AHiEHztQq3zMwzhGCNGwyufBEjm6ldRKRhOmDNdx2j7lO7FScxfkYMtja9VAIIDVzuy9QxWEEcINMuDTGazDejtmVCOBJfowYN1DlAQ0ymsM1RYpV8dL8QyNrLHplXCN8DZ09pfo+mOaUC1MMyUV0cnTLDkhCC6eBBDtA+F2/ANi+juOVAkM1YDxECXF1AoLk8zOQksk1comEUKdzQBCFODjiw/mL5Et3pKrcsKJzTfyhuOoMWGIrAunEtGMqJ5bg7iC5QuBAZkAC1itsQoewf2IDxubAuE8e+4lGj0mDzD4UFNPgoVHKariiZopXVfcJ4Xgvd/1CFNVof5EX0zrAfqD6Xry/wBS04TpbHOi+IUsrcvED8G5bLZbBUByPJzKG0P4cRo+O5qKiY0jRw+DxBSyjvOh+BPuANeRuUqXipbbLaDl4lhgqJi4bQqGopOAbXcS7giFxXVlt/EOYrvLBT6MzUiq9P8AFQfqLRn6DcwL32Zqq0hV4bVp3hYQLvkzwvD6lop7aKhiXynIRGi72DuIKGAPU9mz7miB2pY16IYjcNfks+RcynFMA3DsrFRWlTAUfQQBhsmx9wCFd3QYSBhQXq4zZyWgh4yJVXXWoCXHFrNS0A7GmACq1bT8xgittlxRWFJFICIApGZnA/UNEQQLjHmo6pVqzHFDBBQlp7WIZ/MORAre5fhRs/E9xXSgKy546JQ0YFl4TpIimrQoezEzkF1/cUY5LuKi6elREjgH8ozQwY9tR4jqBtmkQtDmauL0Us0CvEFPfg0u4ehRr9RF5ZbTUFQmElU21Yr5gvNg1eccV8KItS2ovd+oVw2waeYsRlq5jSWWBBiBcKsDSQk2loJ4PncLuZhHa1NLVv8AFRlsFVLd0BvmK6ubmBHiCxYOWix5Xol7Omumg5VkuBrBlq3R56jiCPMsIy4sC4wiEIdjFsLi1LItTbMHwoM0lLGjDGzMCC46uNMqwL1cBi00jCWsKFFaupjVU7mLMr4IRSqAmPErJlQa13cqCsOuIw3/AFHvH4mdPPMq0TT+WeQfUCmDRmFQNO4molMwLjiaQFlQxFEY0haP6gn4OJluIAyD1AyabR0worOqZB8QVNN9QXlgsOoZfu6eY1goNr1A8z5DncKSL8YCWbW9wVz5iSOCvjzEMl3vKuvuXZjtKc7f4Iwjk8wkBaVEYqbzEsHBge0tPkDIeKeYoC+GIjDUWI1BL8tS0GXTcW5VQVnEz1j7mSty8lF1XEuPuxr4iOK7Z3WAN35iV02rv2QkTDKrqLAk60MzLICGWB6gHoYvwcpSRYKhYgHRAK9jC4DqowehV6uXBVJm5RripVHcMyprLhidShBy8g+DqP2gNJkLkHCNL71ExMGUokqtKPPMqAUWnxHSjhOxmzhWePEa7VXPoiKIGADNe4XCV7ZncNby+RLM8ZIyMz2t9QjNxyE7voCDXltekaU4vgERtF9rhgit2FTABk15/wDImUVrELlFYwt9sQzRdE0jVqDv3uNCzIy7z/8AI8rnymKkrs/YVMSowwrvaNt7Z6CuM8wTQVG0HuPc6F1XLe5US+Lptp6TqDqsTALLlpyc+pZnl6gxXMydVLCOBBblxNS1wGNazmboUA8sJA9rXfbg+iNPX5f5MfqZwDN0NH4ihaY5yiWOAA19vDxzCay23cM5uDZZZbx1Csa8i9/3M/DKXAdMNssrx4DqMwc2NPqMio7Jaqqjg0kQpvLhdwu05+sTKq4AUH3MoTAYzczEQx/jDa/momxdcdRIJxCeRvmjkYSv6S4uFX4FShVq6iRxFoS24qUu7rcUsFEQZVj1Gq7gQqmmNwuk2v2Dh9xIoU0iOKI+YNxYQJlf4pUGZQNxgNk5IsG1BsIzZpds3w8TksGf8wRriRyu/ZDjQzSx+Ym3eDBzAHDAMl8x02cXB1HsYVxoiHI6Y6AaxOIJK1FeZctA8gLVv2kvq1jWdS0BDbcoSX1B4I5exLzUDDPTMplbqcY/MQpDIBgeIgSjavPwHaBFqDc0RzDFoNhBoOrFhNVUVRC1FicMHLmTKGhe6X7gFbJfsvogsFQvL2xcIziBcnT/AIllVyvLEdovEvGNwc+SKqPkI24tEtuKzMpACpbX4+FE1jDDJCiO5eJVxKlkuRh8LjmGIxqLOscR2oWG6Wtw0WTVbff5hFuX7zOWIjTz1AlwPrqVDxB6nW2yyXffZLmDk3A+Brp8swZWS36l7wsQrzCyOBFZNLfb/iDXxW0QGw9nUcSiDupVJgguVRGsLFnEMowgHCDIgEqKmCxMwE5H+WkFUnoZfmCh9hQhqrlg3F5lmWWXjzxApyaAhAjKEbI9YFAaKrcpBdfh0EzaRVLsgqIysaC4aIAtOItRi04bCWCd1rM0Z5taeIRawMZ9xuBlsZDuCEPoCKTyOYwUL6gOxermITdgWFAeZQh6dxII3Ja/wl6WbH1/EpKR5I3JMlwzRPGoEd4ibGuoRtR5liN2SYYiKpeoMGhzVBG0NSWtwW+qwhCCPbG7qvmKF5QkomDyYY6DVJYjZKsocG3j9pG29l9RPYi63DlODkHBPMZbCInwoQsD1eWXlHZY2bV2xLlN4lBKUAZQqWABQ0SiLbLXmckB5HqJOQn1TFBVuYA8gwlDbwk9RkCAoXLkczfUbCo4hVtHU94Axq7/AJISSXnBbZanywKAWeNkarCvLTKEdQCWHGfEHOz2o27/AInl/if+dP8Azo8FyOAgy6yCRASWojeQ3l5M7h982N2S8vlxGgj7cyHZUU04MxZtPEsKUhsEUoUunv8AUfOmqmhjHxAL6hE8noThSvcGhFZVfteo/HQgX+123H1YbeDxG0HnO5k7jBuVuN5UUbfVJs9MbbRF8Pk8Rs4lxmC6jMLfGcl3/ROAJZypj61AsXlX3FIlJCx7TRNDU0AGK0xJQ/OTX1KFAty0Rg61ZhFZD4GiU5nMo+NR0rVAK7H7jn20hkYFSkl2yiGgLfExqUbenEFlnwLJStkLziC+SDwKhqDYpXZKpezSm40CTy7/AJGPD+cOX+Jdw1LIiOh/xOoGo6wF9viLXuAF14j4AtkKoaDALVXbzHNIFW/Cpeyi9zDAFhKPUV0YcjUMXrgeplDnzNsFINI3cVn2k6TnrUdMlY1DhPqLUtFQd78RdijsBXmOe44A0V4icC/H+UIdlDID0xYhvKoFQRUzZAqVVsndXAIBsDUqmcTOhS/iz+5QxWDvEo4sgdjft/qMEUbV5iQG40jXoAUqVu96gWdsMPhAL4+SRQfjNwLlVLxNxitAhJVeYbjrEFuYqhkDh6kYCm8ymBfdypCDjOOogewa7xTeJyH46l4B8p/qKsXuZXz5h2eOCExtSl31MxxiE1XkiWsplRyzHlujZMRjwZfUJ6WVTk8ROTYuHAfEoeAVDt8PiB1tB/JcWMW99QATNiXE3Aom0NRIYgiNMOIdokbM4GtMUol8wDt2laaqIduowUA1hhkzyGSOgDhpIZFq0BFzQctx4IFm1GgwSxnVIZ6Goc2an3aZkMIlBatlY5vVMEXZJAGqw5h/sjaObjMGjFzwAv8AKMfpFW7V+4cNWiBW+KcENARrM/IEf5Oo+z1/cSlxZGB6CL9DuUt/Z9zJJRrV+uoqKqvLB7MdTJSnB8+bldalsivPbB26IJt4iPKvXnV668xwswwRC6LiztjkW8ywahBfES+GJVm/MQuA3hqZrbgBiAlrOzcH7Ewkm1EsJ4FElxFVgLdgy/Ua9q2ohwHv+I9iwwOPVQUdUQlBAsjDHLUYThzKhQDHPqEI0FhsXnMdCSbP7wJbcuY3Wr1ccUJ5YWYgyhLXBbDbOfzr1Dd5iwGl67T8y4Uo2vECNukoZRheS1REO+T+FQZqwa3u5RDiB+xM0/cfEZBZrUIBXkRqChgyiQNN0l6i6ER+CQDTEuWeRPInkQGMK41Ut7lFMSzGajQ20eYNRsNR6bxHiEnAF+bFn6lIaEIN5S7qOy3Cgb9R5ZRlRJOJAQhapN+MQ5saA3Dmzb/UGvFYdHkdSslZf0EIUXID8junEcWJG19GvuonQpQ7ycdcQoy4n4jmO5aZMJmJmHQrX+zEz7DLN+YKGMFNfggrKIBUXceL7eZate5SAzTY4+oTYWriPtuEpR7f94ETYCBPuCoiVrIEFrZXcyxU1+KGMhsuXGSpGxuIzxyplQnam6VDbEO6ipZXqyK7x0EyuTKIzKiJmOEomy/9Iqph3GALGBTDBLVPBAdKTAuKcDefMJMxR+xxGCNo7B2PwYivsH/sV1YlRl7iz6Y1x2jydS4ATo0wlCgXM3YOIFb3AVW5h+P+BzDpWASnJeGAHJZX0IcniiNjt/uXgwprqW72BphQ8rKUSvltlr9K2REiqRgjjFSVn5WjNvSFyGXn6eIpt1UY29P8RATYS5lcxmNKc+o4KKAVfqDbWw6poZC6u6iDE2/8ai5myUMWAwNTaftEpnEUgO0TRAUlUzKpYwCvioqlImYjFJm5V8RQBa4qWhgKLEDbObGRWBvglZ1G0qll/UYjqfZmasu+bjiUBbxrctKtJ6xEHfnuHDk8zA3KpmDNnD3Fo5psM8yy/lU7tgGS1VVeckoLWc0N17lxmGUjuxr1uEBtsp6lRgL6mbQFnwtNQRxAuoFEazAlE0moJnxlBx0w+8mOH/HqGMqLKD1i8Gbh1aZsgY9yLx5hdfZHZfqAT2Euzz5qWxdHTMZcVWIASs7ItHI+BBjtVHW40RjFZV7jw1xw9vEWYbrg4dIbhlAzfP4lFIeM/iZaV3H3u4x9vb0Q/cEFD4GXeIKmJen8waDcDCWiZimFPud4WULSWkuXYZ/EcSlze4qFHjywHgegQMA3UJS2lEdS7ZwS4xAo1xF2guUGS4G5wuP8DRCj8OzgIDxbWVmVdMRH4GImbZAw7uYgXadK7htoeGJqjaMF+YM0KuD9z8rMRLlmI3VK82xELnlZelfAPRHr75UwPEWs/IqrzcICv7XeZo56wPxMoVZrDKwCioehDMl/un924y1Arp7BVfiGAhhHCQl8ZfY7l4JkK1mIDMh5JV2qw/Mu47/+HBCPZLzTUw7MdM1A/wAwEcQswBK5ARbw9sUwfKFzxEPYGz/aZlvtg/UaXjBLXXqDt9yIHh1/MrqqLVdw0Caj+0EGaKJt/wBG/qIleRtXNwSS6Fn1LpxLxBuNjB+AQIDa1FfNLWXQLxzcBTbStdzfkNjsLxHTcU6mWvgZjNUGBy4tz7lPsF1zBBHglsqY+JfMCpvFgpvEoHamQ+EZU+2UikB5iggCkLGVy+SlM1BzXccQYiALWPpyl1PYf2w1NJYi7AML2fgiZBlVkIltW1lTIwaoSJbxQM36R43+RKPFwWJbW7xsSNxTKXdMBjAQ9ciOMwOY+pQFyDqWUoNGmLAFwIs+Rg8Oyg17in9Ksf8AcS7QnJADTiwR7e4QgubRHSiRuIXCYiWBcpZVRBU8juunxEVCphmiLcvpgNrojTV7cvX0Qc8yyAR2V3hqNDU2q78hAUDQoHlq14upYm1eWBVTfU5z8CwyhmOIEU6l9QKGAN6gtpiEVEuW34OYls01sA4YhpSZgIa8xZuXMCotEG/m1BjxAbhO4GoDsxsbi4H0wWjuO9yvEoYj1quZnb93MQpYO4bDqSSsM2BPDkiKROGH1G2yDijF+ZWGC1bc8wjdIGuLlJ6J5iBQu11HWZfBKc01LaywwQaDkioNVwoS8LYLuFtfkRo2M5iSr/3G/J+YAGRfEu4PcrNxMeZVuNysiDsOIsIZz6+n/MbYI0ADi8X+oVDACg8AwxigXD/PqZO4GhW1Abnk2Bz0QQOcDuvc4osYdTzAF6Icrti4BjHcdiRBbXhUAUao9X3D9gAtXtj5L/0QcF1vMayJdUwj7gQaJanHxslBEK1DzLXB0fBNeolQFlTi0dxKCe9Rsiuy+SEbx4g5+FoaD4NkCQSxARa3WRDJGTUXwtA4/t+IR1dEuUEGk0SmXfCOBYAA4xVspUHklXuOAmKWUvYeCPJBaODyxzHJfMpQuhZUtlXNx9HY6C5ciXfENrBi0nmdIwJ6Q2H3dK/gNkBcBUBXoiNZJvib3DeWiNm3hf1f+Y/FLalsfJ9N+5R4Ti41Wr5bjUIJ06LxA5xLcjDL8w0ZCj4/nPSfSfSQraA6gQzpi1hqfhNUxohoBrW76XzOebgrUNmYaD+INtzDws3hqoaJiAK3mEKLFLdOLiaRJuiHfCElNEH7/T4I7cSrZpBUS4R3CZkBRVwhEWNrMczphVTF1djvsW8oVmNdwK+BgiLkTITzHShyOqlpdou6fMYzX9QXCnwVlsWeSNYi8CM6J0KYtwaj8AwDlj7YIcIWGh9xFfkISIIDmEe2t+UQMW5RUUeUVephqg7ZfmYLq9XAh4EtfxUulsxAV46Jktt+WckqhZgtqzqKwzprlCIisC3wPEZEnNUPQ2EU5Zls2NvuGNQldPjIE6iB9x/S8kYxzcaLxK4hFvBLAXlH34hIE9j9sxtrJVcey27Fkb9IrWsfUbIoF/CZhKhewslfCmlb+3JLx74TI+mXrzri7lDwNDRKLExEhoWPUCrW2WSPAepaBRfU58iGzZ11N11fNSkAxCyqm/hMxd8EDIdvXqZsSi8eIFld6jLRdZhnGuzMULtz1EgArabX0QK2TxgIsBfMU7lwEzhR0wcRcIKIQAHGxKvUosvEBypk1xEdWdZI8vLbKsDsOopZsSx7Igtyq8w89RBqZljiUML/AKlMVl2y8ZHdu6i+7xNepZJMUeUDi7aLsUVKHywtm4Ot4jqN4q1AneVzKG2EoQlaELd1fEHuxt1yMdzjMBuWYomUqGcSOGMtFmGBo2sYCU1zN408XGS5UJN3ejw6uUDDNDFDkQVWu9xlUVYrz93E5i6in8RGjwQrM2VFwOfMuc9KjBf/ALmWX8HX/wADL1beo4o+LHUdkOHwrEV0lzTuJbFVs+4RCG2YMGwxKuXRjfcthlVJNdGjEGyGpRR2YFR+DcbAmBowK0Q8Sramo4sqp0S3H4SyCogs1DGW1MOCMGw/6qf6wiwViBkdh/tMoquyu498X2SI5dRWupe4EW1dNflqUhrFyNvMVSyoCNoGlqoIKiBunZb46lsF5LbjfuHWvQLWJDymVPfEoMr9Ajfc02sKJzOBFozA2WRrt5jlcCKxKQPuXzHlB9YnmOwgwKUfzFq5VZvHMf8A0J/wMu/2T/gYrUNt8QsEC4m9iGiEgLrK6JbG58WPqFdr83KJ5iQuOMMZ3H4zLfwXtPq+YYgGcIhxb16jbRSkZfuoh3Esbx46fU1RxnHSINsXMNSklrGFEQBg9iK/yTQVKf2Y0K6EOvMoFcwxNB4nlL6Wl2wBBiIriumhQ4RSM9oPb4PEZpQ74MosozAmk8xLU7nkEwC0mA2SoFy84QyxHJoHaxSkNLC66deWAE7LSoOL3DTPGa66pjxsZHCQKiHs3ogA6I/iLEPXMWoaR3DL1EuAMRmVGhleJyM/DX+41EUOCGSYE44ZlhCkKtxgR4EQsPNTME4V5esa+o7SJyixmauvsvB+wh1mOEMAkoL7q9WQs23YCRLbtG7VfZAfJlYUi7qBtkLan33OhSDQljfqOG1TMlC2v/wLIhLCD7mheMkwsWoNzZBdwKIwOHJ7BuUcAVQNB1ArUumXzLUVUdMNxT5K40RRToE5LTETKhyYPUMSiMfhOyPRA2WWIIqlLWaQD1qNifU7jaCE3RqFXBpIa1H9kJDrDO5Qka75ImQq5g8wQxupYYZJcvmFiKnDUwsxgHcxHIMoOLjgzJmW46r9Q2eWY3dykFbdf5gbFwkfgykhRVhSv+YBQxR4/EwYtE5ilQAYLjdKeycDUK1Fs2OekGNIb7hAiixJlcsCpeY3CFpCPF7+phg+b5EgJarxFqD8IYUfjBsjVur9y6VuuJPQpGxJs17Epl1HBDEN2w09EqeilYKgij5u50orqKl9IFdxuxB+Udq7Ht5gqXVHfcw7/wDGEL5lH/BiK2Ms2rGMY+DoIbCVRUPhtaNxAoJfLCprufqDiOTVjeYsWpaqgcAM3EasVRV3GgF07isZky6nDzFqF42+FqJcI9oAiqVM+53LbIunMeuqp+GXbbMOR8Mvc1hiIuGWIWi1qdwbjuODzLMKvULFp8RU7zzOCM3yRK1fEClWYKvMBpjZqGHfOseYMlXvuMIbzxrEKPFMHqWlBK7ywJwHkFTHo9NQ3mWQKJlz8CjUz7BvuLVt9uoa1oOLSDRJtqlQ+62EAnQmi3HmDherUPR2w/3+H+/z/wB9P/fxna16lXhe5jAmFjUQxDDkvj6+K417jjlmMxuA+5xpbuMgEGO6fEZCndsssqvbGoIQQcKTX2eSCrdAll9MG4tQy0E0JwQfpyC/MZzDQw6K/qYc+tIMtshuo+DWJj2NBoHTcMkzEaWk/pC8SUdx8QMFEI3hnm8/3GXcSaVHiVgtF+0HPgOo3iWVS1OYjsYZNiC9LtDW/MQlJgGyL0CsbRz3GKI4Th4hxqszN31YiMR4TJkUeyBbAexg4rGzOVdpu1LIdKKyDSRGBaaDuY4AZf47lEhFWkEaGhK3FpBpmA4jiDKINkq2HwFyP8wnSslp1Ha0O4FYTTEFAPMtRGV5XslPKMOzsgkbsETJMw5PHEyDxc2zBuPiECNr1MkLDjG1RpOSGeUP5RSpKfgSZEzyXQTCdQFyPcowbPgRdRzmGcRw+3K/qWRyQh+CVHUbQ1GkSzcoYBleS9H6z9zFFLHQK9L5IauIAQX53HCamzUuSC0y7juYloPHMAtR+WUAtZpuNUmSDEVVjh4l6RJxKIczChxmVvqVHBUyOMRwA/UwagPBWIsPP5nKLvGDUzzC1rMUCqpnMv1QE5J6lyVPLuDsS6B1DDKK49Ep14OXxGtGgFHmA3qxabxUYYLT2QQFO18S8JdwQYI1lvxHrgwjEuDEcEJvEu5giMRlbephu5kcrLBQG6wP0xWXnDK4XDQYCBR4iaNoE/piGxZkcQQzmOxVoGo3OpojUaxynKwW1qlxBD/rn4WZf82GKlW6YIqpkHw3IJlZEsZnBaDMOLfcuiooakPzMFwIZlYlqGTdYN9wIJMGDKx1e13C2jzCCgAeBF4gB8CMSU+gOFH0q2WWbdwKIIFzwX+EyeaZh9dQHcUg0EDcy+jUxWUbp0yxHQBFixf6gTNKQWB7hRgndYYIFMn3AqTb39v81Dq2la35hCkXn/1A/tA0KoB9lDLNwqzPOl5+4g0gaZDqgxveckQFCskWzzaB+oEUKEVbZj9xrWyLCh9ZZgPpkYUgcJLSxPcWmLfwSWQnEcJwrG4HXqQLmKOsprvmOr2XX6KgONYD2suPUvH5jHle4Pzh34dueZKGafRCd3j49Ru+UKD5BGkOlrzLTKt+I4KArcA/xM9QzzHc0Jk8+pllcuZ4M9ShaNd1L8y5YRfKGs4PUB62ED2U+yKqBa6CXE/wvWzj8GXQ6tsCdGDMdBPhT1xHv/0/EcrE1xXiNJugLNbeYREKoh7GdQc5HY+Qvlj0ih3ESHmNcQkpOBbHJ/t5Ss4I39haPRL6QVTl9wPLClaXy9SstRKODOcVGrIUDTddy4Tu83BqOl1hEeuRb1LimVyMXRKELa7hkgzLx8LH4I3Isdns/wAQkBNg2ncsUWoMOAi8RL4jYhr4LUS4FTSJEeENkv6bjFQbjYYQjkamUb4MIa6AAOCM6MS3WqhbP9TC0bWI9dpcySr+Bd9fAHShXVzusJ6h2sN3wP8AMQKTM0bOZctbZGEwwYfsgG0zkl2wyltEAWLozmKGHwFwUfAFplYI3nglTLMCbGX9EAUaAUA0AeAgZAndD5GU+yUID4T+iWJK8twrAxnBsXNniUDVMViI1EG36QvQbwX6itHjEWCYTkmOi+jbLpgd0BhWLgpK4ZhLLc1DQeKrlj1GPJA6uXSMBmOV4YbI99Sq6lnG6zHBmQ1UeXcpd7uYH+tw4Ok2uIoaspYdGU2sGtA4rmppa9pMQV7mkCO+TZreJRK7bpfcAUrMygJGzk3MMBUqDfVwGLCiYGfjWYGIIlyihWYqtBrOCBbbWXVO+Y3F4mRnXiJbB5/Mw0RgUY7L9e7Y4LXRMd11EiOYrd5mpxzAMNcfzArFHxHMLR/6GWcD8LuYT4mbMZlk0eTmFoHokbFUDo+FUyelYdsZ/qO46m0da2w9Mu0Skig8IYoDf3EZkZQQqitVKjzH4VpDJRC8RgQRQ4OUl6XmEdSggWqVUQpKlStUrkwA5DqOKusU+YJ/8hqBfuP2ALNbWRODUC2q1n4px5mzFubRUyNMT+iipKedZh1VZsAg5IaVW3LQsKHAvySzsBCdD7Phczwuq2rPqFAeh4fqDoceOqiwSrM6mjfNIZCC5pvxH4mQLxfqKsm2lU6T8kFD+aD/ALoH/dK/7ocUBQbayyp8A8xQph/aFo6g0NNMcYj/AAQVeIGlZggrhzL1LMLx7ho3EuzcyQgTStxdmulEVqv8RY+DEDIDkxl+IrRUVZI/BAFR8spNMUNQXmVeJcIvjehY8BLPMaCqHwQ6YYSUHm9wWU1onQoxg/YmddaCMUfqVxV5I1rXzy+iOROQa9ktZbONw9xwraBf4UECMs5NaEVZaXZzcFqqLgilgTTExgi7O+SVxbHkzHEH9jz+4KQ4xOCHpwH7ljK1UMfBLholQwy7Mob9RKjF1TV/AqWY88EwlkqURKh1Fg4g7lSckZ5L2S51dyxr5qF1zBBucL6l3Yo8D0xWAGNWYgXZt4K/MAXYxS/cSyMd5EPYhUq99IjCuvMH4cNmGDBKqLUkdZT2MxGCi3ksssKu8WBHUhIAlU9R0I1w9wfuIEyXbFDzOkSyOCFyi3HEGiDmXSvlrsvHMJxS622OYqt3BuVzCvuuP2f6uENzeHUUttyopXKu/L4hjC0Cg9EKxjSWsIOL+4gHSO5ZlZPbzBKGdOYrJXGOJYGbKN/vZCuaztuKlMuzBKtjKBY4mAp6SwlU98zkcfUB88x+/wARt2nR/wC+4GkuuJflvVXM0XJkgVqBx3MhNu3PiK2EVeF/fMVwFlFXcVkervlCxG5qrO4nLLG/uGQA7Mj6hN0lIzMKmPimTk3AwhLcC+ai9kUrZEuFGMX4LNBDK4eJdQ09xLYRMmIBMSwW9DtY8SKUafiHsdu0N9RblBsVmJWqraiDMYKaqXIsNimyMBeS4VC1HXh/tLcQuswf83DKSbQzEsJHKvEINgJF09zNAK+Blk1g+ALDYGqdy7srwI3LDwXOeudruWMaHO4I7lI84NLYjIIdrleIRoLaC5YOr2VaW/uVIxTw+jLBUbUW/uC5Le6kj2XFrv7lrBVRYixabgq5uOoLN6hargQ7qMvHXwGfhVDCOdQLIAEcMc+isBq7l3YVSQG5tBGyo3MRWxpmS5ZfTXcpwrxMsu6nq/8AMIFMZQuoSg2afxBQMABgCLQvLYQGoKP4qPkdwC8oxUecwPa94+iHH9M/1WEF/wCLH1+4PLD+oullgnJcuTvFQWHJDBOGdaCjMza2wK1xi5Zzpju4K5gStNrl05NS1jOAuA/9DErqg6IZl+icFWd/OpVLaQeXbBc6Xb39TeZli86Hl+EAQPiHRp4205a+v3DGWQJCbuXy401LO/EVdfK0Ta8SueDxHMW4/sanT2XEJ410UH+EFY5a1RxdSgMrbUyyZeSD/pGqwDzPiLbywgqZlkVni4kxGLYNywvcW5uEBUfgtfCoVVEvNwBlZEbwWwGg5tqEQli9XBbx75fUIq8h0fgivUS6ZJaPcVxNbG8IyqImYqgxIsXkRposPNRB2+KhUcqgSs+JZAQuIIhucVi3TatrElMCmGRUbgK4FzECvOEggdMFJCEPuZfHhYO4DFAFwZCy4K3iVuDghsysUOWNV+IWUGBqbljKiFxePjUK3LmpaxwLytZnh4+FKMk0cp/qCcxamRGENPiDObBz+Y8zvYR/xKkQtBcgKO0hF+oyqC8MwCiGiVQnCQtcbpmG04B47gzEWs0RGzL1AuAIj9MFp02uIphVxypLo1KHAmyVXDELqx6mACqRGjvmGqcwHP8ABMjkHEsMQsITyQwUaceZQKhwQlANF8QShGUFog5nVnD6ih5Lp27O5fI9SUL4YvDrWjdlOSPEPh429hd1FsAEmP1wx0Ku3BChU2S7cVCFWcMcfDBREmDLLo01fUYFuLFAJZ4JbJSNPAhXtnqBqVj0Grm5vLmLcW0mwBSRFyuS4l4KAgTpmH6wDwRJ03G+T/ecQbi/5uGO0ujuchX0H4mSgrxd31C4od5ZrbHmaIXE3FULzaaRXxcVIqoV0FrwRkjhHUdMW5ePi6CC0qqYrLaCy5uIrIMIsdJKuOGJ4iMpEAVZcO4i6ByrJbGkL0FrnzH4NTUW2ViGVxriKvVY+DaEZFiWYlykIolm6KmCD4jqXtzHKXEFo5GNWc89RDBe1Tl+X8f+xVK15NJVyFOy5sJf1E4m0894J3UPVwsU/wAR9I9qK/uFqCW/0v8AmOF36Tsfwh3fwnl/hC1FrcY0i6YzZQ6lotdwXv8AzMVujmPDMJyg5gCya87iCS19+Yoh4mbcq2+YJeWp1CswE0vEHf3KDuZ9/G0Yg/MGhpyGD1Lqy/Cmrd0RTmLjQlMp6pbhYA+4stHzOkkXAOqAXNXhx7jgnwL5rBRAcpEtClPu9TJh5UC/Nsp7q0onsLqUJvC0qOOvUKOkpPhC0RyMxXU2F2dP+ZWZqu8/IQOFSs1M4Si5BcGY1Y4p7cACC6BPwYcitAy7gFS3pGYNl5Jkg3KxKzc4mV8Qi0DqMB9iFrjBzLuVUSyKuyUC0HKRWYwBFV6iUxlaP4lWJrbvPplSsoUAUT5YiqmtLmKHiIYuHk3FL2NjMF4rtnKFe4bAXtHDC+IoHJQ1HcGiLCG8riFhFRSRqvaYv1GuK3MqFSM2CpRyuqdwSsGuSVXUohCo0M2IW6epSq1Y/Dv4JTCokRdfCWRQmJUvMu4sBBsZdmCCOL2fmZWMoGVl8BdaiyoMTKNL4jFJa0uGBAsF0/qYd1MFRhyuOB05gKk4nfwamlr+plhcOGOUMuRJSFxscRSX1K7nESVYpDQy6AyE+L1G7/cfVhhDhhtGNHENGJnLXO1jZkE6SYFeAmSZPBu9CJiwpezUtnEw37YIIKxX3GoVcFCmNczDFddon+pmYF0GSZZVkV5OIqM1rRLUQRsgIxWYZzxm4qIQ1TGUwu0vmW6AnhyQ6glLxCj2C2iBU4DTXkJUB6gjYIPoiuj1SKu24MwrJdLxFXqLO6hWYHiGx/qKuUuGPzENqCFvPPqLs5WlNwMD2QQiB76zmPZDokprrtVWZalJsBwYYFOPHUbqskAbIc3zLCu2McbhxAAgXcNxC5al1RRftHCeLQhSKLBxFoKLqK5S/hKlj5YZsLBBIdTUWMTaO5m4ag8szmj1BsVdbH1FUl82ahgA/IYrVKvLBLDUFtbLiq6hoizFXBiza5ivjYYFzUbGA2MIp5KOZVwOnwW2BiCZQ4G5YQAmTD5lBODdmLhGRd8+oJFkghJ2UEtTnm2IIF9odgxswsMIEYWYMQz8KBBVAkKVZfcsHRYItbYGMJxTBc/CUkyUNxKh+4KqDbypYxXrUo/uYqG4Krua/wBzB+wJWrc5xP3Bure/R4Yd5K5jxL2Rb9RJa24JjoEQrzCIGdDcTGnCDRc3DBG3FkC0DD2rwRqxQA4DP0ywlAhr3D77h5g2X38KgG7wjkmEi2CrQW/mNuSqWRLEKs+vxAABS79/8MYGabxfct8EFymjb/qUlt2pbm36L/MSsW9F1Fe3sjXdzzSWdV8GCV8OJaOLuKi1Kz8FUslyhjgl5jmGCDYjSQHl5atf4lGVSqoZlLcDke4FUBdrREvLEBjNAcCdQDK/KpGso9jkYGAUWGai/CQhO4Pf4LENIpTxDlCMXDUjAddVKNSmA/ZizXMiVUIiAOXcViBII4fUvhpkp1CKELG+/hPlK+MoYIrY2ZuWlDBsiMgCgvzBoEP3ULVifhA0aCvnQZz9Eullf6uNGV32xumqqMxQ6Sn7rMrKLxYIXo3p16ioqSkjgNDWJSLm8YlcuDOPIsPJC3mOVzUYI+csbS3PMoOZUW7cjDMwbkWUIwzfiBQVrFQaVzLKepfAfomeuf8AtwQxf3BHLk5iwc4fyxVBgyVSZEgdPhqIOMbi1VAoR3Cy1zGlydy3C4lYqahSqs5GEbGMNfrUAHVXjQjTIHbcidqgLA0Cl5jvW3BmW1fyzKCotRYg7+GZucMn8I+GLiu5g6qXuI/JdAcwqNNlACg+2/xKjqc3mtDyljAgHLWrIOb/ALe/KXF5xgfbZSJHtkXKFcsUtdkpcKWhSjwfAmyabmiXUrQtHcpbhxNEu49Ypa2vDcof7MR3K+RuFBSFykDGLBZojaEOahQl4+KItS7lBtfqBSNCOj1en1CxZhbg+pS3+Cl39uNRRREfMvA8QK6mKuOcIWvhK+AmTTiABekbPzNzUBspxW3xHNKbD3NIwKYNTemFeBattgUYxmovLUWF2wBLgrK4x2yhBljjpkBFulA/cs6Cqij4uXa4QGC8XJFVV5l2MoiRXwXuumMVTBN7rEsQeWAMoaXlhmyF+f1KKbhaDfUMH+J0/UQAW+IrqUC2/NXLu2IF2lSclGq8jwy3d7S0mT9T3HwiD+0MsGpdxLkxEIXFXUo0DdQEBOhmEpkftX2Rm2pluBTaGQXzKGI0RhY0EFgIyg3YQycNH+VfCwcSh6NqtkMjYkpdvQXfuJoRZunxmPAxuin6PphV81hhjLoTRzBlV9Mv4iU2Dw/1FYFjYzXEFuZfAmZBRUmBQpTaRbjZKJVLIuPgWoBI1BEqXC0+SWVK+SFWULLarPPyET4pFysDxLtVuRgmJcQwBF+BHMqOzb+Iqt9yrI5RGGIt1Y8osOS8MUipt1XXuXrTHN5RDZUEiZxNHyiXcUsFIi4KYIEF/AuO4DHX/geGFaBus3wYPHNhVq40YTajplRZIBgNh1FnBsrKQpEiglyxagIxRzxGmO9TqVOwOLgF8tNYuZgHZTK59lGB9SyAiNZgJo+LDqUBspYC1rm4qxpw3hKOoRoDU8iRHP1AIAJW8PqAJG3UCHedkvVZW8ROh3HSv44lw5uLwcP5Y7uCl7gPcgtovqYq2nMb96pg0XcYLV03iOSJ1gjSkb7lFXxLDXsAWHVmYFErq1HVtZSovtY1c4ldebl5hilgJxAM97iN0+BYql2TtMIsNj3G1FxnZgjwvwFK/JxGLZ1JYbevqKzZZbgdHiVcSjV2R2Ll/wAotypaRLHaw8S0SrX4L1FMTdNB5lCQSo9+YJVTBUQKQruD5O3oQW4KGoETEMQL+HxEDLAaI6lLHSIrUFqzJQi+jMoYcHDMCZcdREDWS8Z+L8TLElhEqXdO4vLxb2nDTupcY1Lll4/v2soxnfK27u/6l0LKx1MG4YSiynESoB8VDHwVhEsout+4osVkTqWNlRcaGkaldVK4E0+LNZYvJjxOh+48TXG74l3a3AqJ0lVKx8KyuNo6CLnWODtBvX8yvX8ynX8yn/uIKp/cVoaDB4gttNzA5JRWcRwzy4j8/cWmDmtwwgRSUuLcLSaLAHXbHZNsOM25iVqXP5wFq7HiJu9UcbjZABBpmkAwyNjQEGw7GdfvRKlx2yuVbzWIoEqkHkj1oiAkisSspQGOi5lvwnBdQLiSsxSyWT8aFEwcPiWQS15HiGrgmtJm3M72QGA4x9QKHgy7eoMQqzmunwc+ZTiNaRpOYkKbyPuYj2y668PTLjh+o/QeIijCQNow9MAZqKNhZGUVzWdy8N2u4iMuItRCCuokwblpkm0WMzJhlNS+oUf8xsKcb+QYlkIDK242M2e7Tpm5ogO5VnySx9fU2gyhiGViBl0ZYSpFpw0xZyk85lS0X1iY2Pwqi6llAr4A0impYhZPBuP4Z1KxBsK5IjVIiy+piYlzcKphnnP8nmLDm4On1BAzMYKy8+pQ2hAhXgPMELHOzUAUDRb7YmjHZYHUcEBbqjFVkK7x7hZiAX+YYDh4j0Di46LmB6iCqjbeogi20F59QtiabGPEtzhlgrkIKauuK5ld4av3G5q/4itbOSDfMY/yxazulLJQbgDnEqC3Qx7jJEgFAcuj9MYgs0SwYFKtH1GZxatwzGxjSAEVRdVxcU2dYEID2jFlmTSxIKZ6mUJY0cQpMIwSqpRozN0B8QTbo6bYkVN7Mn6iMEjYtW8B0BEwdBZZsx0dTLEIpczFhX/qX4nG5/zumXsCPEqnGosgf5gl5I9Fe4AG/VS7hXRSYSKK2T9RSqVl5MDoRVBgjVriZQ121vTzLMyrbLuXe4BYhlepcH+UxSy44nkXLtRABRFqNfBzMr2niUghqhQ4nJX9+JcMGmJvDqynUYW+oHLcF4hnBRiXuNupfEdQfhYMdCGcnioVuAPtzKtmNJlGAP3LGBKS3HUqDE2pi58QYlyrJVRxBpcVjJ6iRlFUae2MZpcuXBxeoWaAMXzGn8oy1eJsA+SC6LKmmCssQyDAuYFTzAdogVLRgYgUViiUJEEzrNzbEAasFrO+IFF2y3IxiI1dRL+AIlGFatgaFzvZHc5ZlZfr3vzRryRumMvQ788+2Ea34Eu24B4UqG0dtxH2Ok0wbmICcqPEUPRxCO6vX1G912xyTEJ71qR29n7gAbm15K5/3GFCFsvF0Li4OGVi1h/D6qIFJyyjMW2oYS2GW75eyYg2/wDAqosnQoFPxxLBQgqmoIVLhoIOdquGiBmJLoBa8EDRwodDzc2CPcYlTsbtim1ugdxxWTTwx+RYwABanMcR5MI5lWwYioVx18JsjZRCsKCKLcqXNtn9wjnxW3LVE6lQbjtNhiYML6m8GItSxeDHxS5ISrlB8WSqSzpKYuYyoMEdaIXFtRxO/C0agyy2opzTAEcr0S4rcq+lCpvAeR6YoUt0SsKfXwiYURwxO5gDI7Y1AE0pS5IAFsYMt/gjuAHI3CPFWoyLtm5WYNsLsYguThtu4PEC5tiqXfb1KTm9xlUXULAViNctyvpGbhOqrNrAXqX5bl7bYsAE5uFfGuP9SpWqmQbzzmH8L+WEweGAraACZvDFaahq3eKiLE4cxW1LQmaWupUxTa6JeqGaUS+aqLLzHJH64CWYaFQJWyTHrefTL87cUg+yGWlBXeOD1OariOP3FWBlUGkO6jqPP4gKVgAInqtyI+tQNAW+ItAJGX8BLWv3SClbyHphs8yh/wAzayXyf8z8HSK/+7DM98F6hcit5uFZyedx4WHu8ymwRQEMGUwYy+oVtPdkQHLfGIJQV4IjpKmCOT4lZeR0lS8BFGBFxRd9InOlXKlZmAb6XEohjjOSLUV4hqVLdS5N8Lan6zOGfhOIPLK7XlgrVpsMzZQujPEpmRqYRQIl+oUbHDAYzFLgzVVHoVKvmDq6Q7hdhpqzcaCojCkO4izYJx3EpKl4RoNrGYgPEq4C84iBz8ekCvgoMoIaSzNxPvHJ8Go7gtvNTEI1BYWskBVYeEsJlnrPWesElHamIqfTMk5rLhraowzMPWWKsO4LqswcsX+ZpjUAjbGb6lkccjcSEvD0ici5gF545lhZ6G8w1lSNgOzuouWl8CqGEWDgs/JEJ0xWC5ZW14WhX4mzuWXk+moecsCyy2gxZ3OF0pFVXqrIDFy7pzs3Gsze7jAouD/KWFFOdIuJkqH4ePJHrG3IaSOGFiuTWJU53LUpa42s16gBQO1PqBunsnTBFh0ri4ABsg0wsTkgTbAqX6vYpZ+GAkPTtO4dy9ddIRwODEfSGXVkR50L4pjeB+AYgMiMqgvgzHJOU2PwmtesaoAkAu+RKsoTcuQu+pZRlEdzSGIlIKSkrBAqw18BUoYtlzJVhAc1FidsCviwhii4NkSJUq/hkPGU23GOiVRrZmXj4CVk6iD4mKhn0PT4jQHUjFqXYhRT8sQEEZO2V173EOmKOCbQ+0t3uDLmhNrmDWCUjT/UYTm0MrfFRbeAY6NeZRuze79Q8M4hERVV5WXWJIU22cRJR2Q18OSMuIKGIBSuncVgFpVEZGD4CWN0yh75xCsa8mCZNIcYjjZGrm63Lg9+Zj2Xr/vcNW2PXiModwbSsP5YlfByqLXa8PX1OVig3THeXUQU1zEMteSN4FbgZauW5cgKwQO2c4nDBWAKWQIDMvT9XuD2HVSqKmF0rlwPUMkCxyn1Ge5bJKJVSuSOGtQSrXPL9wMNeVH+I5VtarwUiwUfFC/R2wUm7NMn3Bg0qMEeJlsDT5lhVKBNrAsOVuY0xVc2vXkhbv8Al/CViL8H8DEdcu5vpNI9VoO3MaFYwr4l56noSatbdO16v1NMYse7+MEosUGsy+NTFAfJpgGEOBojg4QWH5iEExYGyoiVAZaIisarqW5koc1qCQRUct4YPJ2VN/uDycBQc4hA92UPyb+pZkdCo7+Bpc38rehTzFqvN9S4Ym8LmI1ABuma4YnAB5JaoC3RLAlVPFTCG0pyLUIhuncNuw9wWw3AKW0QwwEewRVcryZkc35haFkqXbleNiVctQmHcqBUWvg5qViXALAoepbneSJ05LdP4hSpB2wY3WXYTPOX+2GpVFpodErqOAi+cwIl6lT35gAGPBKsMNjxKBbrERS4kLEckTaFHUWyw7qOoC8NTF4Sy4CLUKuH+CXx02DZH6FlqUPplZbfrH8QV0Darn3UVIKtP9UBcw9lJrN+TgwAIkBc7G/3CyAbQ2yDry5gwcQAPWJv5NVE+0LYaTtEKXp7IkB1vJ+ZfKBVHhYDmMIcsO/nqEsjkIbgtXuBEbuWYU+KlY+pzliiP7ZU9ACu25x2F4AjgOKtvpGtrMqV13oWteZcBhpVi4SBQyC8WcMTtErE2Q0a+8owZJQS5dS1l1HcH1l29MRUXdzKvsS5GovmExZS0DJzUEQjWhc1xFFqbYjKshUp2DLVj82rK4XZ1CxDqFRYp5r8kt9BRoPzDZVUyP8ADGC0Bs8QFygBfuNjFIkcMJD4dQWCMQdykVlqyqSYw6ZohFii2LCF4qYNS35SxFl5WAeYQxd5uFs88nxcg2z0iWCIIaTqGWqQDA99xHXHJzLmDRDUBtxdYxjuIC270kubgVqXFIlQjmlmk7ImEBm7pJaAAw0wxHLdfFBlEBUTPUCrcvP/AMUXOYuLuNJY51MgtPZLWHCjQsTLRFWDM4ddQMUZ7hq2AvS33FVP43Fajvu9xl5myI+v/LBrHJLSCPTkis8fFkogjA7lyeTEGBcRLhNXWJXUfBDum+19wBGCRIHJY0xXoHUs/JwBPUsV9i5DsbcynM8geRWa/iLi6We7xyx9xVeH5a/UtgKoAb7xEOR4bI5PbHAORshtqHUogfeKx6R1bdPMxMfcezmZZTgeZSDf/r4FuZm8h6g8BVoNxQNgb5vzCtCtsNv5iUDuvMJ6mJoAOQmF6GlJZBzNuFf3LLAuBTE3UFT+2Gw+kDxArR1FotjlmAW9LxLvcvBBJnB7uWmRp8QVBqDh+YLYbba1EpqBRAtoLY2IrkdR6tLwTcoJ9aAFXV/comXZRFzlyq5ZdnmZuMw6XiUyZNQAEKNYYruIuxusxAptD9fFpDKc2wIXlzUcRQUYF4hXaL4zCZ1AAtK3Klv7isBVRAzvgjbFQ38FyyI94svuKBXRVBiWUuMKOkRsWWFNLQnedxQMFXZIhdINHeWYEZqxGqDssgAxc0R7Jf8AmfJNDNHqGXUahJosASmh/MYaaOA0EcsWzydkLa2PM2/iehFRqLQYvnoidIKS+JwlwVmiogEslT5AKx3iCM0KIclX9VMyCPqOyDQ0RNWA2updYa5MlHrPw5gRASkgWFxodxiqBhOEvDLwwghKU+yYfhUT4GKOXkgAMaU3WI80JSbfBgIBa4p/DKFTUq0cxkyaoWz5DkjCwSC3l3CFoAC8UR7wWNL1LBQ5DtBuJYyh8QrEuJEj+NMRrMFTsNIdXHL5vLq66b0RTA9CgvolQJQ5haL8A7F0u8wQA5u7hVEnwEhgYFLNRFwEp4JxDq46h20BPSphfZZqW2vnUcaahZ38xmkrMR0ysTCLPitAg1WzxKG6leAgWoX2wl7X3cX+gKH2S2qCvg+5SqF81MIxjbAsGsMS5hT4COGblNCDgZlIwzQYNxwJjCj5JWZV18EB6TVaGIUBYTJi4CmgSiUPiVHcNRQlJXo2LjUjUY2IUm/ix4mTgixRnaXY+Du4Llp7mYDbN+ZaC9TNq3mPTUPpGcK1NV5qUNffmUYu/JCcyyATVY/ywqxTK1UpqXcX5m2PgNxIGZZaxvCRKlEUy918X67gPnZVsfUVs4kGCJXJlWXABKtja57I31gs59hlKmjywcEIZXk7DkTqVL7ZZ9/CNKOE3E15i4kH2HhjWmzWxfvwP+ZQ3t7lx0cdA4Zw3TqA5ix4islmVpgXVv8A9x1VGxWCeNXh2qBwVQU8OZfblc/rqOOblwNw8wX8yyolFV7lF5BNMFX7mBKXBol3GwwHByxOTAqIYMfAXxHcvVw4Y4jcZ2bi22zwzAlpQq/uUuq8i1BpYUptv/EK+haVAEVy04YGItRnuKGwviP6eu4NvLLNkQt2hBtR2LmWs2Qp3ccD3KabHY/uCenUVPgWBDcvlzBCBqOBhbDkhNLKs3uJLIVxDdEarL+5kzmNEqgqU8G4livBEBAjYzjkOSq1/LAagRltTXFwXcKhFQLDf5zKfirwxEVtW2LCN8ULyRuQ5YrFf+ZbLZrAvqJ7SWUvEWUVWD/MsyCrFz9ajFOYAxMEguRx0IWtVXcaeo9pWU7yPOZlGUZcrFJtuP4fgO0HGGqmty5Moy12w0J0MfkigOZWITs0eX+IKItEIDc4hAbBC6w+Y7jRv0gXDKOVo8QI5TZD4z8igMzVMWmfoeiWDGRVlA9AiADZ2LgSJAcB5+o/UrAsipVI/OqKUW+4I1qy9EICky7jnKPBEJQY7mc4gIXE2jSYLiuG2YhdleQplviv7lRqteIrM2ZuFPgplCXe0qETZo7GDahZQ35JG6hXhmOJWYrljRRi0fJGdLk0PfMVY1NwUwBzqEVl0vcNT8c3GVOIJverMEAKLVwFar0jqhTCpTxRFe41vXEbOGbmRfEVUKL1KGRqELXtxLOJN8n3DzKDdlwTIjphkgVKCKWs7ZmCDIe4QKbbIlIVYEoK5YWBG27loRAyyh/yTMkBpSqrvgy4/mBCkDOXn1KrRbF6qLWUagRpHCXiG17ZVEuLTDJGvgjFx8cymI+yL7jiOkRIASYDuNX/AJm84uWF44gs4riJezM094jt6mXrctWueI9GJQazsgTquG/b8Kqq15gRdwTqXOIlkMNwD1Jcg1oIDo7Tg4Fq4hDCK56F7HxAv1Hh0iKxVAqHFxRQesD8RrgqNgGyJqbcxvVcBw5lcUBy7BcVPPMr/AmFK6sp9NRjEAbvZfW4FeG3B/C+dQkKVdQ3RfJLiqtWUu4rBRSJqHcYckILK9sIsE6R75hiqXQ0H3AtHa4+M9+I6wEtyyDm/USArbLZl1DN8EdKFoyPbUy5YchdY9xv67sKheKgWGh8KxDa3H7lkWWVj4XFcOBgSlyhhiBEvEtWoTErDd8owcqaOwDZX8ShWcAil9wHCg2BSoi1bXMMwpYzjXoMJduEofhjWpscwWtgrERt2MRLAyhb4ablteI5fiR11KtjV1EilYCJkDMugcFx6ZYMj3HLO4lRoQbY4bQHUcYJcFmbdBRe7/xHniiyiUy+FwIiRWuBILkXxccysRiPLl+lphY0xsJy8y4tfJSWuHFSrXVMQKEmQYY/O5b5YpWz27Jc8SUjBWaVcMvdnnUIrAchiP5oOgmALCP1FnzEMMMQaggeljzohghCqlMQvgHAeJWwa48YvwLfdRrU2ravMMESyYsFEI7gtSUFQ9XxH3IHZpluJM7Kmo7miEJ2dQECgjkA+A7/AIRAyrVtZkqfmmVcAFgqVULUDLKFAIhpWVmRQ7RKUFFXK0jLET2OSKsuW5Y1DQRbpiV+Bgrg7hTicR4g0WqW4QKmaTTLUK1rqUXLECVKjALrmuJUq4VFU8IFq8opgnuCQkbMWAdy+OWedkfsVuxNQUwt+pTDUNjX3LLB4jqqcFurl2HJDi47CrdDeHDKESzXTuL2Oo+EXl4m3s4TNlMSoweckJos01UcK1UB5lOUNQbqGlkRXeWITfYxohAd0b8DEvEBccTAg2Qa+Y7aaJvzC1nYXELtmG4IJRctQopDn4ANO5tSmrYOFXe1l5XY8w1YL6iODUWuYvw0JQkwUHy/Lj4wxFuZuXBlWPqCmOhyS3WSV+44l6bjlMcxVOAgo8eI4cfUz1G0xpQ6eJcaKfuUXm74jMjbcJKMGfuLUVB4mfIEsc8RISvnmEVNMLTtYCHAl0eJf1KJT9Mp/wAylaIOx8au/ExrcRozxESpR9we4KyVmZrg/nU/czdEQaDtajSvacy8FU7Y+MKqoT2vXiJl6xp4sly4Cpiq1GSSv65RI5wtUsZGXZERXIFjDdpxNczrAJGZfglAVc0/czhkCsiqSW2Yr009wAUkJ0nmHlWsAXLz49TXTYWHL3AMpedoALRXeLl5EcM+QOIbY1Qz2ayMaM1umit2G7/UuZom9/Ldxzima+DKx8XUtWYe5Z3TKjDFRlqzEphr/wCkvUDKBGb/AIiDDK5g4uIWDj4wSUDxxBEVecRaGsJiZ1CqvLKEW41holMIBUUXcDEcMNAaOe4rro5hQEsBBiaF7jJK+cJzFwRLJe5rv9wkF+V6mEi9XTVwMJ0DcFZEuClxHEl1Vq5qNQAqsO4RKUtqwWTUyTiOGJfyUcIe4zvgon6IsZhLuPdE78QA3rthAXfkmY4xiBjsgBKR1HiFbANMOFxOeI7GQtta6mfno4P15QyjlObCJVi00yPUrYpTI5eHyQcRzDEYRYG9SkUO655jgFHVxNs8yikWVFeCVGyU8YurjJmmTx2qKCUo2rCgiGWaGYu+QQlDKdB3C1YbAs9kOKTpF+s5YnBNid+HxGotq81YDi+olTa2yzYq8MAZ0vsOkZcuSz9nh/Us7sByMVkCswS6l4m4rsEUoC5gjsRfecVAiEO4GC0kqori0XMG69xAXk4itdxJVRJByMJPcQVzEVSVGUPNwGnaA0NTjHsIK57lgHBADDbLyYxAVGmouulRK3tjJrbAlaY0DEIUhUdTDQR0FgkrLMFORm2B4BYOtukpl2ZutRoELBDPOItDolreh7lzrMVKXMSlGCZURmann0CClReSDBtgqxgQ1imNbc9RyZV1XUS+yqii/UHHZpIo62xulUC1Kt8/CsHMygcgOSBIbqJw4ZbZWB9zgDA20WglMOCKugjJ/wCS6loGiNEpM2VUoTZKqDT7xHDKuajnmDY8SrncC2M5Km29zIGiV59So/0RCLumALTi8LMB+U04r+ZoGmzTAm9w5vn4tuOlRii68PiIUU6TYIXIpxFK38ESB8gwFjEzyUzOEEeXcTCttLTojiVpDSDxFUbo18UY2jh/LKYu9i98xauOAYJm41BdU4A2xmW6jqf5j3spWwypLkxXliIoacg/EVqzaste/wAI4J4Uj8Filr1etwIFaFB9xEShf9NdwxsuGxw6iv8A57gwGLQrAemdbATAdH+YKp3GA42p3LUckXxBt6yzP1LPMa45eS/8RBFV5VNP7l3ChM9fGAWi8weMX4wTJ8MU/GGIu2NJmRhsaTNxvgOEC7/EVDLMwTqCY0YkTwwQ2AbO8GpQB2gyt8TtAv5XUzm46Y6TNwYAi6iWSPCB0BDAu4IKj0mCTBQcxbiY+ARRARh3tYHT/oKlVQnCELXEYGV8MPWI5dMO4gqxZSvo0crqKOJ2PcAxQX/5SOKbfczW47hLckHMdH+Y4uNsMMwWKWC8rmbd3xDJ3LCpS5jNH/cWslcMPLvxGSENNlTTvE8+ZeclqIqjTKJRzatrHMDCnOWFLE4Kc9xFW5eWDBv4CMy3mi8sN8uWYoIgVIcaRr+4b+GkKoCF7nFAvmccDQux7HuBRHxHbBi3FDVvDBUFCLSv1LXaq9vwxDlagEYGc9D1iF4VMNYSJeGUuUSlJtFZGVfScvk6g3NIlfC1D8oN+Y4aqLgSssjRkfmXUxw8MCw6eGLw3ZCN8RBfiqXDNxyxEQcQaj5SrZFezMMU7OAHjuXJ/wCSatxWXNDA9DiCsXaPgEMxt2xpGFfwLDiZThmAfMFACtgNbPMci0g3Kd0QUxKZXD/CEqFsMWsQcAKAVXLYt2V+0bKqmUOlrqGdxpKWNAeDNwpMlgRjXiDTG+4kylbURLW6setWPEBeCEgl2VFpViCODJFqbghxwGBwXiiO/BavUYEp3vcwtOxKqUh5tV+UCc9tC0O3q8xjum0TAh4lceWbqVSy6KT2xBNk5P4YRkLWZcfCql3LWYE38ZZ55+EuDzMMERYKPMrnmKPEwQGVp6jVOvcxcSoFXBjL/mebT0zoN5/MK7jeqly00Y1yzcW6G2ZSXSf0IrLcTlvshhFVkI8HEPT9QzF+BZxmM9R2rByZiwzKnUGqoNU5j9mYrpHzKYbywfTBb0PKKWldCAZAMZcq/uW5aHljOjXQmB/mWJEuxeVMXQ/M4uiA/hFCu8xkDXgNHygPxMY2rmB1yQcqtlsPRCv2CmrYxb9xLipW25d3h5X4BPuZU1ai68DEu8yzqqnpOkjEJ9UrfTZE4Cja+ikL+opA4jmFbXQXkcwAAsmaWXS0CBsHEDiklSs+GUGzZ+kddMNy5Iquzo8DFq9wuk7HmFdRCUK+JzKRa9LMNs5YORrQxTthOR7WkmT4yzAr5UDcYHCNeYxbTnm7af3PBDKKFk5lTBXywW4xnSsn7mhAV2LiMQFV4lUoLbCnbqDUMQYkdQrMwxQNG2XipS/DgFtwnmpIADxzO1Dp7gFoVfBEplURfCZjjcGyXUw6FZl7TN2ZDCOszAQVc97RTNgDx0uMkiDQxlhZr4S5TKmRUtXmY44ICsfqLY3gmARLBp5JTUockd8vuAC0F4lt3HdESDKGxJS3OG1q2/mpe68BS5r+odmKi7Dl+qjusjnJvv8AmI3dh4AUfohkRaNRFgohLzHHuWUHfuBQFMFcTTvQdlv9V+5TLZTAxEA68CyrpKh2nmBlwaF0dQGLhqtHsjpI4C8yhS+1DMFwSRtbXwYBq8rcTcbtVzIO5kV4IaHqTJ8ismKh9Wjh1HqUKw/KGLK+XZEJgzEuUpKyGBl5ishEKSgos+4HjShyHqpWH9TKVqDmDtQX6iXUDhjGxncCLXIMFTYruESbwozbi1AuVS8wbi+NIT5kRQrFp34jkFW3B+8/BPgx22MK6l9qUrejRYlzy5g3HiHQGbcTOYPiPK5kao7OH4MUfCVlTCFuTq+INx2T3juq+AEHiJBhdcoISDYHcLt1zhD/ADChSChR9ainIcWQqVoNWF59wgqJuOSUMAZUH6dQUX8LCX8am4k18ZzCUr4LqLOz3E3HXd1LGoAXjuoy2b7YoWQ0HJLW7ZDzP3u4q4F2bmzAw17ZY3TuAaIfelVeBymp14Atj7mAZuHEuog1LrA0ot6ikaBpq9/uU8DmlwW2YVoiwkdpcUqTTrGDTAG9irQRvRfIxAo7wOkUrquwl2zc63bVBQ1WlsUgnsh3W3ia06U7TxC4Eroh/fuO0T7IY5lnXce1FeVcdfll+jr/AJD2xJo0Myaxf4qMEKri79PGYud/EywGZb0x6gsUpkiFBzY0kT/oJDhe07lU5MzkgDMgRuKmkpuER34JXBA/sTSNkYO8OerjmKlEw3rGpvBWqagsD7DMPLiXz+ORhsYlut8LRKkPQE7yeZhrVa0cB1LOCo/dZOXRofDshVL23+Xt4ZuKnyBmUesFEEMTKhzKAoKcxZKDwQ6hoq4eYphZ6lMqgNK/SYhB7RhDVYKZZeu5UWNpm7qogmQK6s68x3WytX/5b5YMCjELqBLIjIbqIuo6clajtrVxGljdHmAAoghKW8QtbijzLo6UMSqg/BrUTcBUDLEtior+xBGkwIlqrWXGCOMBfEA5lKQ0qZ+CO0o2Lz8PSek9JeEKjmYVDkrEZq0aTl/8gLZc/wAysUY9RG/DEKlDJriAvDGGIrMsbYFYBbotrsEKzbl61b19MwUk1R5z0x7BYPl2BXlzKErmNRX8cQZxmCAVhlcyvDLOuIX2KXYpCsfmKKBP0TD/ADAXXdS3g0RDYrxCmOIASn+ZZ4LpY/UOQhq7le5fBqzZF/zqAMAoA8YjGkplhbXzHd5WLsYqcp1EXGFcdRVhifAAypQG008HiV6tgWX/ANhMWrxBl4mEG4qR4WcwQ9jU2mBAbgAgzaqHG4k3CRSOyafDQBs+63EUc18ZMyqlGFO4oqwaY7v2PZDlFTFbDvKaRoCyDEpVIgrVYrW5TKsPBljApu4brgxgpHEazEG0BffMRFK1RA8Z2vDvnt8cR0yLV2sWtQyoIq3MPJYdx25l5+RTBq45zOHkb/mFqSg0jV5h5zcBbFh9nRGVFXlg4lxrKwLIiWGBcrMoI6mbGQdX+2FwjN4P13HYsByZJWCUfDUoh8FqXBuOJUWiAHUoxAvNZjj1MwCIUXS31BSlkDuiYWPY3GbdnFxBrdC+i4aSzKcoyNpaHlibRIu7jmZe0NSN2VfiKg4WtQeoQiHuEGJoDcOLBY7nsfUSNRarlYhFTiOCAwlLIUNXWC4EIOimH1MkT0mjZW1gE4AWrP2MwCK8EbhBbrfqLd+IL9xI4/cP1uDQHn3Eil6AUBwEyepcNqTVef8Au4qZTDLoA/X7jYuK4U6FlBYaa990D93FAOwHT1Uo8AA7qTOPUMiFNwX4Mxba8qvX2cfuVwIJhpXUtHFMh+IHNxSXwvB9QJfZdznNfwj5OLlK7PFweqarEGdXz9xoaAE0kNVV3ePUG5B3UdwOgccZ3n9QRnBBPUQKqPYRwlwDBqYzl8KRGA1ZwD+hnXEs3iCooS7IZJQx3E+LpeNe4JYmBAo+AXZdzKDQIBCGDpW12f5RuKnI8PtiFteyMXGk+CqitVZi4Q5YTBpIpZbqblmoG4OKhtB3dMRpGpc05mM01bvM4qpbzHRuUkotQYiXUtWIGUSxpr3AwAdkMnGvhFPn4GS6AEdISjKEMUw2am1R7RVr5v8A3P8Axp/4E/8AAn/gTp/EGoQjS8YjXMyJaVTj6qek4Wyz3NjQQQ28J5mDnMSInUAlprXDoYwDJgeCWshRxHIyGjRzh4P3UakBdJocjAzVlu9j9RNRyTGblYhHMVGAseGUlriGAWheE1/MwjDZqEY4bDzbojgoy52EpYNTIYDujt8y0oAYAKoi3DgDIhdRNtKt9zBibmCi4ZANUbeWeUu+6FDk5g9B35PDFLdxBgtgwwRGlgiUNByWBbac2z8+IsNgyl7DvNwMgaBT3H3ZW5WYlEuDcRnUWJxBFQKDuGRZpd+Bl14NJMEp6snBbLq1b8DiGVSg1V3BkJ9obkhGuKx9wziVBuFuUFy/gUkZilpTkzArAkIJqKwWvVwYN/B0BXqKpV1+oqNpW0qFkfE0jay6mcLQBLixN/IbhuXjQ2ALXy/X8xwNJM3JkkEbtYgVSP4wSZqWtQ38B8SqI6c4X8xXG0Uqlkdw1LGVgQiFhDXJFzUJefgFspMEF/DqLZUrOPg6zEvMAeWN+ow6uCCEZAz7Rv0SrxTBVrkhu+F3jBFZtxxK9FhjEerlJSAYK5YdUuiUWoWbiojxUQiKyx5cMVzXLZfERVW15hTCM8r6gm49MvuJCVtZamMkI91cDvisbHoHExUXEvb/ANjrzAO9LqHf/sDg0NdsfpjqWy0hai3xACTg0fbFcWqVnP5mR6C9UrDVx8FWYwo7jItmVY7XuVOJE6lmFhA++Zb/ALtMNc56hQigBpO31AQU8dL00+9zVEQRXthF4cA9qsQIU7rX+UMyu7o9SmqMtoZURKUpgAowBn8wRUsNPZCqv0zGbrlZMElRhW/an/MNCUWpseHEe8hlwh0xTqeMbSWu+TEstFeoztjfg16APD8S3roDfk7IXBc1+AMLVRK9ivcRxL2m0YYtkSo3RnKUrt6JkGV2UzIhLVunsYsnIOwppJt3uqqXEosa14o/EttNFH8L1AGho8TPMO3qNtBzFQQSuA6iMsu9TJVUWZdlseKiv7TSNkKyMcgtVdwAg1NqMyjHWqJlvguohqxWGCycENQCVmwjgxX5XdH3LXtgzJOcf/KIQhf0gGOb6ma3RBarDG0lkBfHUCNYliDL+oKLXhiFwY8bEEzZ1CLpFoPJqB025kfvcUBRu14MwOBaoDlhFVkFyuvBLr0lMFbpibXpgDQvVlfiK/hw+blCUuhScR5gH2lBG1DdoBrJAd2AnIeY3CoVBau6YDANqwp35hpUpQ4jUojUK0a5iXEqK5i8jHcTkbBdxMG0h3ZoP9xQMD38AZmIswMdVGEgRK7H6I2WNwu1TpZPuXNVAOHDBLhEp8hPeYzd0xtscUhlakYbzL8W5TAhGo2YrRGcNSiEm8n/AHlgtnsjUO4lfCraithiDQjScxLZR4fgQKgXEqFIxf5HyHPiP7NZboJzreI9CovcztNdxgWu6afqbGda5xsCs6YFmYwyBAsTn/vML0orK8+dSrtgv4iuIA10v1A1rEsjUNy6gZsxKlUdMX9xGarf3RDk/ESUurg4Ei4jwcU/NUApF8bgbg0ZiwVBN0Js6l0Skq5QRiXD4qNDLx/iK/BuGDqbjxisYDv9/wBMaWnLUS6e5dGtR4qqv7uVe3dTMo2v4i8TJGFCU0xgs3EcjuGDtdwRjqYKgp+CfQ4+4skUBlXaW6iFAYcbFiwh+h5IYB6RAeA5QBAC6NHiICjB7SsN4mTT9SiUimA2l8YuCKkuogaUuaH9R6SxTp6MRzhhPKqvPidcGYWeYL4iraLXEVHgYgeZiqM2wF6lkTnCA8QOZ1QB5R1/x5lsCsyh2M0yk9fwsuLGqdye8zvRH+IDODEcW8svcf42ZUnWRBhLWCVoOSZEiP4Pgu4VHUx2m7aVYwS4+NP2b+5cK2oLAv1DqdNZLFm19xzgwY3WLheNkbszBbUAWjyrruJjULC6hsZm0NiNn6icsStIyvMEalcHKPj6NmjhLg186Qumm2oRRowE3IHI0sh7nG5lHfzYtTUhNrDmMHs4AETJy/ChgRoeHucQKg9yxdbljA8zBOLg1YVbLX4Tv4QU4GWXyRscR+GWEYqC4N7qXhLSsNJQvcMEAJoAq5XCZbPWPz7AoxllCpl9odL9kO5wMDMNM3Xx48xUaVPiYANc8aiUoNWyuJTyM1zCkZUDrM84C4QCrzuMNGtkdFyjmBfEe0YoMwJhQFpfFfuWVyrtg38BUuC5ZUoxcXN+kByjIOCKbCsqx1yYHm4yyUE15T3M30LLwfDEuxKzcrOYMa6mB3MBolX/ANmCBSUkCrRRKNajbiZUFM1bVkFHDYxpLuAWXqAqMHRBtBZ5hnQTD6vK0xMLD8gTxDMXW8h2jyTdBQcLFsa8kvUTMR6jqGY6mSYEGCYeJhAv5Ai6ttjFKZl8UtqJalAlopKlnUrALxTDuKS5cWo5Qiio/hiDGMS0My0Xb5vREUVrr4Spmnm/oj7LkfEbmHY8ufga+LxAJUNWGgusdRsGrTWIfC4e41iJfHcdajEC14ggoUARaYAkSWa8R0zOZeMROAsMtFhGpiofHMNfBmazeNcAHehjOSuaD6xmDHKxknmo6sH9uDLKO6/9EWNRnI/uKKC7pMCunobi5gADFktBYthDZnRGcF1A2HcYuF0OiY4A8RDiCOF6n2F8RQoyzTKHN16mK7t5JUwG9y5oAtdyhwlqWk4X2QsoBxWkgFjTn4blZg0L4RCBCh34j3KCNXAsuIMuiGLVY2NYyI6qGLO2Q0fmNtGsAK06XLvZ5osNaJcaHqJ5IyGfBjwFdS1A8T2dsfUuAaEtRR/BuUrLmEJKUNV2l99f5iGNxYE3AwAVGuOj4gvL5iFSq3d5tYlgsYT2wS4V33Dh6mEpcMpD/u4VHIsWJHeyi48MOGEzTbMTILA8EXRHkcFwgIwGuCARnoOhYsKJeUuqlwdKqvuUjBW/Uy+Rzjh+mX4mqZE0koxKqYJYzrGVmyKpWtyvLHczcMKfiaXwPESZ9Na+Evupnpyq9PhmTJvyiJkt4qAP+w0r2OIrbkraX2bIPIqLh0lU2xW2s8cBLB6w8Jez4DmVeDbK3VBF68e4/pZXkx3VrK/G2IgLXRMO04AojOq38ai3DUahlYsL5i1KEeGMNDXQWUDBBsi3Am48IU7N8Sq1UpAmoKbg2MMEMsu6LlVFYwxauV2idp7E9iAFN5UBdxW+YwKJywlURk4ICA0A78yxthKWTuZHcqD0jDss0/oh+4FtTaIkgtatP9zt3Cj5mEVomfIqjhxmEdPyzMBQ2xSasUOZi08XHFjAx3AKYvlNxkcxwy+IbhNCCgb1XiFsKpeswebc2ihzKlHW2ZIMoL5hoaXAPIQQd1M4OuGElfM9kCkoiDKIu5ZRd117hpJ/KORYpojSizmJW4gztWN0xbtQzbQUrAMr+ahbNDAbEIKcMvPJ9RLlGUJk1VVLptBuFyzAMrLC18npmiV7fErBU0YtnZFMqaoXDDPsxcxaIrm0C0IAh0ES4gYXwJlAHc18G44IDFt4nZGqrNsC44l3Bp8RUWMCFDwTlDwsQl4DggzCQVbFy0zV3UpMmAWUEDcpZeoKxyNjEDYLslEG4gYIxoRBBslWShgPNCgswCElG735iZYwl07jRrksjXCREg0iv5R5sqZLe+ooLWVlWrYH3Hs8TZK2SA9NkyzAiZ39Q17g6zvCYPwthf6mBFRXMMgi3x1l1iVdV4TCeEibjsWzHIZ3y/ccgoo39sUmi0oy6O/qWFu5KMRbhTQz7gtTNImZem6qnPtOouJaty5xsOi8ofo+o7K2zL9Wq5TOnAA29DL2ZZgiWysRu3DUxXVUqH4jOVhS50MF2/YVPbUtSSSFa32vNMNJZTgRix2Q4mSkGfXUqs5aDA7XiUpkGx9b1R7jopxjH6gj/BM4D2QHCo1+/wDaCkCrHxuX9okst9sAouLGDp7nEACwl5Qe8imGajtHTmUDK5eIAqrv+SaOD+j/AFUNkV5Yd5U5PpgB0HNxb+NUwAIRFEECuUq/5jcqxg3bHIRlVPAoLNe9RaWlfbxCc10VHTyH9wZtWWPUqu4oKr6e+x/iL3S4ui2rxA/EociMgUMJAQDbDNgoF69xqVK7e4qlsaOLhkiVNQVCYSap5Z5l2vliwzKzLxNkDMMo4lXFTHYtAJRd/wCKgH/wRLxCD3bWWJpJfDaolzVLXSj+YoFhXEsNOghJGDV9pwVasKYlTNLlHiUeJTolHRK2fgK3ESjXLDyCl5DmNkogKAgUaPl7ZktBDLhhhuoC49nfpMRC2LEKJrLKHF+ZUevQaHAHQYhOig7gKyoSj4a0t1HNyj1x+oLmAg3FIEQNY0yENauhXW43Rh4l4DyqIgv6nhm5WSs7gtLYacrebgmtdG4gMXpMksLYyPCU5PIo/vkHqXl44DiLg+kxij6irgWAz4pLywml8TaqLs18NpTBGsCdlxWraDiWKCUncKBG16j4A4BDUYGgzL+kniWNhjov0MOFNafMMMkeIdbFpl7tjWWCtS2nBDRaqZmJTmJcqiG5x8X4hplHUAjwVsS2DQsRYZS9w7IZEtXLImBy4hYz8AyRkXC5aBi/9BLJtywoQwRMy6hZlKRAXSFfThgAGEq+vgpMoKmdJnv1Br3KuJUtcVZhCU53ELrGs/uG1lbCfkl1KGJKxEvdJA3ChEYx8S2EIa+NXOZTuVQeEbi5fUQKkpChj+8AQi0dP3LVqAeclrRKTh+KFlMcM1yA6qBhcxFPI+L1CSRppRXiDRRvljphbEa3g+oUrzHlzOPriOU3EG7yluJS+SBYV5DmXep4OIo4Mosi3/io1JoNiH9SzIlNgXbLFg1eHzEC6OyQtq/LAvzFiVoAmtHO4l9WVy/RqDzSdUEpwCk/9/xGcHuLeYS3OCKi/Slh945lm6VeY40aHljYq4jpKgvM4hKhQbXRF0QyuCDj+Ynk9lylKrxqXDdR2MDJJpYxxZGJqsExFm5Vl8Rr1cdwu3gDilm3riPuK3Qy32+FWMvBNl3OMGIz6gmn7lrdZhLOpogUWSm9cRKlHsiLQW9SlMrB4LQ2aqMqaal9FDd/BFA7Mw0SyIUZBWyHX0FJ5logpeQGjmvVuPuEXTojHswt4jgj6DYiMfUeXiUYlfBuMQB89TR/UTcGmLZS6sof3CZWtnd8wGxCU+4EFEBwCD9QVambTLOWM5nLKVtvEeoAaMMt0QtuJWFVHdd9pamRvxAmg0xLj3FUiV9z+43NbqBKuURAOWYg4NPuUI1KEc5jf1CHwl/ATJ5QC4DiCBSH2p/xLi3Eleeku848Eck8MYfMaNMGNcQoPTGwlUCjiPboCdu4lFVVyiJUMxAEdjnwT/1D/M/9Q/zP/U/yn/uf5RxsPM3/AHSJWi0LVeJcwhWaqLhQCxLKgcMrfEGMGJ7S4nSxtBQoMcVFrU5W4JakxCqza7ZaDy2wHcumZCKtU4f3AZRFtpWfxzNntj8IIxG2rNsq+hGI29T1BOeg5iVCp1q2LiANfgS8AVQaseo5W+lZsiJGhKDpcFUTLDF21BwrHsJjkZZmdjESd7FljKijPEV2o9Yoyow+JcURaBq9xagMhY1NLUPLkdQd1VQllg10dYYHe2ULzAxBVBh6h3WhpEwx5Ultu8dRyEciP8iCtsNKmHOnloHGdR+ofW5X2osY5E0YZj/aKj8PuEBmorAleqDpJVdYjma+MJZ8av4OJZY2aO9Pc23KMOuZS2sYsvhZBPBAqMGpUKWUSqAqtQynuA3mD8UsoiYIEK4DdpdSktA11iJUwYoec+g3EYYBeR+4rDfw7+EKpu4qPvjcoO6G2IVrTMpS4FpNmtSjZcQ+UtgI0EVLxxMkCJiDmOoBcxKoZINkiPq4QKhC55RXPwZCiBp4vMSNCiMlRlW1t7+Cv4coSnh8JzAhlgTjoDBx+IweK4T2rDl8zaDpP4gstsNMTzdwt6IlH9RKx+InTFBKNcpqI9VQlf8Ak5TQwsuLOs7bIxN6WKx469s0RcwK+DlijDpp2lPpv4ZH60LeaQ+zgVt2v8SwIMWt+Rg8/Mwgj7LllYykUGuzEBWRddSu76JhSbiblFasVUvQpYax/caDMwiDPHUNhpI6skpxXmaFxY1o/mBuYqKgc2Rh0VDl6mUA1iinCnDyxN7T7lh0ZIrzxMLgGtyrZj6vxXyI7KhQi/qZuA0gTHlglshbl1gDT4lsSozKfFUsYGMYl2dlMrf1LdLFNK4T8QwWnGyHZKIp4mE4JzG3VLFV2/nf5ij5iLCwDKF2/f4ikB4SA8Z4MTMqjA5wfSBx6gtrYcVoQYGU5DBh3BWcW6p6cRaBo3kVhdefUWyZY2PtxEbEIKtKyGirhgIwBV4XaFkuilj6YIT2agqkOoFNW2mAUzH4BUtfZ/CPYjAbHMDlOM0Ut/EayhMA4mXvBdA4t8QD0oXZBx8nJed+IfbiSpEJdzDcolIkrECvjcsB6JwXbavuHCUyfGINGEyC6lpf4hshIIcomgjgIBgsXkEV33MoeEFUNayhOpcM1NAHTH9wzm8Gq/Z7in2lXoYQilUnUWDda0R8AzAqmfX8z6/mfX8z6/mZGQHiYiUuJj1LXYiCWbiNgjnqONgyBsqUuD4+41caG8wsG6fEu4sMy7puYyDBAwBx+IYvByR1OIxMoQ/FMqNBlhvqBZj0TVr7DzCxpZW5l+8MAt9wx82CFQybaxKOHhXL66hHzOOj5cXe49szQeOKlo3AHJ36IpqCP3HbR2W5jCyh1FBiCyXCUDaMfBwgrEMjUzWaeJpp4hbESyyNjHDMLMC0IiuiEVZqGKUGvXwZYJYF05zKWdJSoS92y/SD1r6hnMFY2E34QANLWKWuQYcLha4EbLrEcaHCcQNAjh2wjFhM2ZIFsGpaXmAQtEhRTsGD3KgoCjjqYNuDGKyJcKMbJUMwis8vAjoc4A4OJUpgyyGEKRr4Vm4JwAEUqmYSNRoBll8xmg2vi+CKYI5ei2/UMK+TcQDm9RqUYFSgkAYL8XDcrMw9xI6ajMIXZcUUttXxURYsLh4+FqJ1LxUsOILmBAVKqbFiii2/ohaoWlYRxW+UXmtEVrlmoWixCz1CnqLiOZm6HNTN6uVSJhOSOFSi8AwXE5ow1S3EEbLJXUNo/ARbTcDUrO5dLlrqUNCrBrTedQtkDeGOy3wn/ECtNFmoU3sd+2ZQXmYSiAxYrSUgy0EoK1cgBXMa6G+PLVw4odwIMC/SXi96gWAW9EBhg0OYzaljVnfcSrheJ8O2Noa5BmVVrlZc+nUatpmrB+qfqJ+zj/Ijgot/trg9xNqG76z3EVr8K7LhHO1WfzuYVkARsXz1r6lmkPbACsnKZJy96h2dRbYuUeP++fi9x+gUhgFZnZ4lM3OBVJsjCLZeFFdEPGsAiPp1MfUJvNvcvqsKiritu9VVKhWIuf0EsDxtFPHSbIcIO347daa8zDstjtePLzLcVzg7QzFWmfMZTM0HvG5Ubb6IEGn+JdDHgOg9wiuC4hnC0QUYZoNFqqTwxCd6DRmihi8kagBHAHoIf1UEYmNUbz0+GHiba6dTWlRzQUBtgwrzF0/UywqvIaxvcpL7QB0a757T/EXH1HSMV/BNt6SBuwPBtICkSk4YrG4gupoPKxsZZEshlAmptBuOpuErOWVZZ5+4C8QBYdXGySvcVUUa4gJEOwWYCaPfIe6gyoXpEKYpvyi4cmn0Szyv3Ke5USoFnlafWYbakY4C1ZQrTvTLq+rqy6Fau4jCLsfkoljbHiJopqIa8Ep5vD/5+fPnzOXk6lF0sBJW2THMoW9xU4zGXoReGWZ1LILMD6i2reYlzTO9G/8AvECNdvPuZcm2aJdM8kq5Sro6HePCv1UO2hOyClUeFRs/K6IWp8NVipDOgqlsz4j9VncLev3D4i8ZiDEBoeXmIwqLnJEQeWcJWdId7iIhr1LWWISiJU4EqmWEpZdQNW5mfDhywwRlGYxoKnDGrgrGIQNK6zLJkxNYkPoxpRO+cJeySW8hzXc1jlt59QqtGxTX9zLylC39VOKwcAPhMUbU45gPiFQeebygjiDcQJyfHEvhnctMVm3fJAjheCQ5fC9y/EI1k5IYeCjYMscgaAp8Bn4CN3cRahbDhIqOWyHdgvohn6U0qxV87F9M0o2i4qKVho9rxAwAIwXrQP5mJLbPL/iB7ozWavF/v9yiwqpRZAeVQpHnUVUuYL5DFeZOtQoxt9lDxWP7jcWF4g5+QZTSMtQw0jCDYt3L1LEa7jiUWUS/4ErQdhQXRfbE3MOcgH5g0RUYb3VwnGjTD49SsYGkYXhUzcDGYJHCZFxbfEXKw5qXE38UtgvVzeoKBDWxnhSBCvsl+hBunkz1Ed/EoofpmDJMIrjnPMYGsoeAArRqLbtF5Xn1BRy3Npuv8sywUTaAqGmLUXuVuZLyyylSWdizCDhgbD/EzLYwGnuDMHgDh9koQjA3bkItjue2PEcmGVjLZzOAJzK5P1ojIm5RLQFkavgeWOwZzzMMnlSNoWj6ZQ9wKQpMMascdPMT67Oo4ItcI6QfTn4Zn/fMxcAzN6O1fKpTIEKnPv3Gu4THQhumMjnAwXcrvhWYZpFk+Bca3zWUOQ/wlEe60Pfo6fUziBDRzYI2upSio4fLBuSKlR1cwLMWMKboJpKAh2Lb9zJhAzsr2APGbPuAY5oXX/qaRhubLc+JeNUp6sbVw8v8ws9RWhl9M1wQSO7fkgUqkxbqMgxNCMKQiSgjhq+5aHeY8UwM4uRlC6BaNDl9xwTc4qLlDqR/MYHMAE3KIuMfIVC3BpiTg6aT/qHAPcBwBUxeJQDixaZQiBgVMFAwFONVUJWCOlasCvhXULRwdFfVS4OLixtTXdc7mspoyopcZdbFAdPpAolTSMRwlnzPLnlzy55cuBn6jR5fLiXW2xo7mawegqpjtAhgmLUUmvzMvHw6lcMLdKPXcp7nJl/4eowaCV0EKBytsVG69yzizogHw+pAmoMH5iViyzWAUcEtwUBnI4zFXBfgjwqayTiUofqLGwo3bqvVwZByHB19TBoYeA6HVRHYF4ZhbRgKiV0aqMi4pFnM0lXDWoh4DubQ32lXLH4Frj3Ls0wMQXcpWwksrcwfXMt8dapSMS5RcH4bYJ4gDjHTuXpVsGEg9BFJkfcamLLKXyR/jcC0YNE1jDEARc6tRtawsHUw7KRplPgllxoQtN6+FsiXMkteElMB1HEtKC56QpMjEW4sdrUzUhd9WTEBGBwnwvM2QsaQZlwzKPYBaxhrHgDCnmrqU6ATyCkhc3OgzCzShOOdn81KUgrcmFbnTaw/BHLQhNLYl3xcX1FMEAM3FWfuXi7Yi2pXdRLyzu4rEzVdxIK1MafxEALdfF4+F3LLFgFuoeGnWHbUaoMBXnvXRK8Fai2bjQXTFmomQaX8AVhggr4I7SX1KS24uUEXUIbr+ZygOBF4ashVRU0fUNSgNTF6qbynkmfLjFzigWwtLqY4jLltQdH/AFTK9xRqBdx4uJuVQxllnvxDLqICcXef4ik2NJfmcdlRCna8NR3jrzfLCHBCLFgXGWKAUXY1mBI4QJGheJZniwiyXsqBFOHLCxfVLFs4jK4Bg5jxiKYgxAwKh0rvno9ypk+sENlYJlScFGccL+5UgF8A7vny/EcuxXOJW6qvEu0arGR93MwkVb7Yl7p9pYyDz/rGFbYpbqLzByM12P8AUZHXIfuNYlVwS4hjIIpzL/EUhRhumMJw477DE19ZY9ypUtVYxaEpY8RZJdylAo0cRJbrbcFP2Rz6afxrv6lWHyAAOd5ZRMCj30DliHFTJgcEEXMeJewESsRGaq1L82KkSk4YKlOB4Lz+Y0Sjv8DyS0cd6SZB7INxugfXcIqZvGvEuHt+GSBlobwx2hYKsvjxvUGKbTWMEaa6Gi5JXYm6CNsNbGJbEojRl2BcoiowT6Fo+yGZbZoo2vE6PMYxtMkAwb8Ra1go6vUVEmgt1u4otM5r6QV3DCpVS7+B1KzLpG3H6ihG1EF5ZRtWDNepwBOkhX7JUVMXBXABeiHgf3/gi9e7Sftlf6L/ADK/0X+ZX+i/zK/0X+YgX+sFMztc3FVjP4lLs1HZ48xY6+ph/wCIiqE5GlBP3AOeYa2fuEpMpZa3LKjbzFR0FYj5ceZaaUmmOdwm+YHd5nDxTz/Ufkprp3Q/uYd77MW+iG1pYiGJvgj/ANoS9OCoPMd45wYTTfqZc4NvN9QStpEyGXAOYtbZeIo0VyS9V3K8xxKSXRbzNISWomPEzQ1DUcwaw6gX3AI4YUcJgiwuVEzjz7laDUKae2ogkW6ixrGCBUUVhljpTB3ECVTLv4cJyRCxNOx6iKJKJvxLBGree5mlOBgJVk9EupuVIYymJcME2Qg02SkpxQbI0oFU/ZFqZRUQLsBGKsjJ7Y2rVtDxAW7HHxWJZajFsNnRDJ4LglAFXAEt+xPVPA1y5xCDXiRy8/tj6jN3oO1jGxFuTCl6+prpwu2oEWcgFm5Mt6vHcuSzktHRYxOOi5/6P8wgwV7AqveoA7QdRh6xW/gQDyxmOzErMrEECviCTpOncNiwOUNeYciZoS2iuIwYop4cx0WbyJZ9vgHsY5AyBG5Vog4WoIsDRmDSDkZjksvuAVmhaqXmAAxrIPySgCPQX2MSzf8A4t9kZ0CaanWEIieVLu2bikMXdJgoVsFMpGkhtB5iauZYmnE8fE4vL/ERXPAMxuIGoRZEeTmaczBMN4mAq4cBLoBuPt5FueILw/nqNYrhYvPmAtuHqAx9f5YsG4lkQzE3DMQLXWJVRb+G0+6x8PPXLCSycQ5S91OQd4VBVpdsmbbiBwQKk2BA/wAwpWJS8mgv/wAlbmwWgPPb5iNNRUr2R4MMrbfiOumpQtKj3A5BPL0a/UV5IUQGIAdiJlDGU37IAezA65gKoWsoxBtux8Rc8BesK/ljheWSu4KMbKHDLj4B3ZLqFKvK/uKIKIaI/od0XUSULq43aD1GCzEYu1tc7r8xqesqPoikLthpdNGagEmCNQWR5ly/ArEhCgsEwOyDHUDERtkD0LUtLYSvniWOAaDwhbLtHMcoUYidNb5W4vryDytfcRhbl0noliAeIPqsn5gAluFn9NxjpWCPs59Mt4rGY9PmK3DvAnxuB8B6nSc9H3NaHXCeiJd+HycpLqIodi0zfHP4dn1EuGCECpounENy6lGIXFP2hIZOBtpRAZGH6n1P5h1Cn1cdQs/Fy5cuHEyBdXOYE88x29cQTuMGcykNCq+fURjCOuZZjDJ5qsH9/cCPAIBE8olTJXJC2jUoUrgsMJV6kvuTLGaVEWIsNDvN6jHBgejXljC6pnO4rwZibjXNLOb8rEdOZaDM0jZiIsGG4Cc3FHBSpFJKCLceI1jhAQytRUsTiwXJUJAUR15/mAyVnUvKrCBuO4uIwoxaWxyjxCykqolWW2vENErn6l3gA3yJhl4LDuGRSVkuG/mBK+NZi0ljiOxAxLsWkYsxDGF8kWMzLMVUZjtw8oiO5q9yjso0dR0lLIu1cQ+2Nr4jcC043EOuNznrmJPIqBwsS1aR91X3CwcIapOvuXqKUva3LL0TUby/KIIZ36cLFr3Fx85eVTjVCNn1FDVRSC6sQ5hSXBoS778QC5HJYvqBctsu4q0NygJeoipuTJ43/mZtvxG+CDAyRxt49xw8pGCVFx3YVGLKGtBGMOI4oB28zB5vaDbV+4DhVe4g0t9PcsG4wUkOGI3qKsstwxctwstuChCpZpa/UKQxLKZVf7qMzEE7XpTO4t25kT8kI3ouhUUPuZgN0pyFP8RBziEKLImya84B9wQSQyMpd44jsBC22T/EAQFOVOIUitabtYpdkQl5qEAz7IrlL6lYFpWKiujE3KZCH5/qYrNjxL5b137fgvUHEUtcBDJuLR8AGJUMGeZbVcTAJ6TcJFieLg4LZqALXdSv9oRWORkSrOPYRaRQf+oJQRwAbVmddne1XuW2xEfuOPTLR6Y+VMVQbPBCQcJxPp17nCMeU+AY/NRkUzKWvTOiXx0Ix1mqaeIoXbq1fxBgqFl7Lw/7uDdm/wCJm2JnYGVgaEr3EI6iAtLLpbtMEO7/AI6/8xpieP8AKHMi50SnTRBeLX7VZhHeVCRNCjB4ZVEj8LGJbXxJMIhDRklNxLgVCYxceS7GZxAFXqVEWtzyRXELapqYMdRTAsVvuGPp42cS3ucgrP8ASNGP23pDvD5XyHiFTMyuOk7lFZI2dy8gPZKpdNagw0E+iBbnvGHbLSW7+hs8dRmqJg3NHwuS1iZ8gmxjMeRQ3A/TJWaYaJgYl5iuW6hy+5bfgRuGKdV1LsnUBfF3LbVsk4vHwKs4P/kvNpP3l77lSZbjEIfHOoZpWwzZzF4z0j7SLl6l0rtmzDVWG+YtmsPNTDA81FsC/uZC0AHYGZaalrcUlGBIs2CnNdykGzSsnsTVo5bfp4lg/EkXtWnuZoDMh6VvVH+5ezMkVTT4CzKPUC34RAahKAHOoiNO4KsbemYJ3C0KhejzAcECvGZgVv3D2mvUpJQWPzGnwW2XUs+G9ottKuGCB2H2EwhhcL8Tk8ZqF5lY3yH1USw5I1rPn4wl4gWFJsi1mErGMkVuIUWlL5kW7BTsgohz7GIs/C6NkzLqspzEaaOGtRuvfYZHqZ/bU01ELeIAoctrKoclxkvSU3ZmI2WYeDM2/wBQaZkcQqh4sz5l77MrEAGYiUmZWNfxKGzcpTutkQAeajyS7jlMYwBiBlgDwgFCaVCGhy30gkZzRhijGqPETVyoFWAgrkIMoC1YjuMt4LweI/mFoBDxLEr8vxUCFeYbdI83VicRuwIlylGhuuHxASoNJKWUSiMjsSk7IoAGxP4lYmPnbMoRpOSV5MSssdZihUQg6vuOLtBXL+kMWYq08qRvBGDWuN4ZrzcJ8HT0AiVXWSpLLovwzTk+ooxHgDLXSEGCwFM6YShv+JTEcDoWpl51jUcFwmjwFtM3xX3AhHdmyuaP7IDL6mVB8H/cRwRTTTXmV9zj/LKqBfwiUHOoqeooN/DgzMV8BJkwvdnTElpDNIoTk0dPmCF/lxU8KWQRbtJV66fUV7dQ+qP8jzUcW2xteYgRXKov0jW1HLz6ibUji0jCx12rLIUE56lg2MrH+vZH/YYNu0qvqAtVr3L4L/6wWZlinVWzGaNMsrn+ps/+hmZnHRNlwtsdF9QGUDjpN25yc2/yTmscFXW/5i18OVwYa8PjAuvLivEyxGlBpCCLj+W5lo+otQYklV7GhEYAKFf4Q3JMfaD/AIi2lhKahtNG1KCVsg3SXEjl/EJR4GNs3rsqBARKGLjyqHMAKR7lmOQnlDZOSMtIPCLiMhlhV48SwNdV2S/EOEg/UtcbRBYXj/cGdApn4cQhcfAshqUav8TV6qi4QsNDJ5iOELAxDipzIhgtWJG9cPUe1M4SgyzcHbAqjGIRYg5y48To5VZ/CooHBtsZOtT/AN9/if8Avv8AE/8Aff4n/vv8R0u/3CbbiFmLpzL3GAiN3GKvBE0zbBruEayzqVTqBzK5APXmEuZLsvn3mBazjMeXjcEgSutIxIlt1s7uCViwVy/G5ThQVQfb+ougYisy0+GVcRCVU4t73Er6aDQePiY7W2E8S7XEzBNtLTwwrQZd8RV1SI/EPiolTeGItlQK+Gku8DMxD1eYwgply6WlBcQzCNkRMbJpi+H7m8Ps15Bb+7grsjRsxyO42U4jUuo2sGIoShsmNhru9xWXDuLw5E98P/dS+WwLYOPuNI5a6hTADjMpWV8HwLQCKaXTi44p91FrEIqrX8w6mRwk6QrvirLtjuAui5UGTNUr5qU9G/zLqfqcFlgDpOfETegcnLCQDVHDEx90R9xB6An38QGjhC9Wh/cJi0oO1gIGCwFcnz/SIWMl4uE2pviWaYzAYJeRi3aAwpPMnEdZVZJctIsr0jgFngmGhstr1KBUms5X+Igd3PcdKqrDPiLKwaDp3LHrhDgcicwrX5VXK9XJAFWTOnYsJUMSoZWOYRwXbeZVOmvhiMgNJySwo6FtrmbESXiNsGo6XkwrzxGYSk+N/AlyolS7J2IVbKtGvgbrmGh82F3L8bV0bWZLbJQ0qnDzCx+FZxG7LcSz963zLDhsoUv1XcrSvkvFv15uOAmxj+iXQXjGLwcVmX1Qm6IlG+al1u8D9sSDUZQRdmoxugX/AN7gOEKMJYQL68QDBRBcohP0j1KQaKvcBSS0nHEzBna0HctWwA7gua4IYKV4V298RYeAuZ7uNWIgaC1XAQLwi1ZCOlvRgiBq46sq2NbFpEafxEhQqfIdI4fuBkkpT5gZ/SUmeBbJyE0ko5UVoyo80QS25vYFzRvTcwR0o0y3/ZplBLJxcegqajoj1OdIKYUs951whcH5nwauFBUKX/RCkCpKTD5naNm4FS7jU7IgxBPEvAY0WSR+HtqVUtlUS04DUoli0IDk7UAQjVKplVN9sq5lmOITJz1xvUQfME57+EMAmpX0GuGJe46pZRC5gsMAykD5oq0SFaN/zEEyNtsMlVuahDmUE0xCAXcrqGJnCzEY0ItRUaWVDHiPMwJWwO4nJfdw3It86ldFlpohRHBGiKcAOgi1bhVnbEITHcx3MdzHcpWuJkcu5Y3LEv8AiC7gZKid+oLXP8S0NFA5Ylf7pAkeKGJFY9zLLdDYCIF7TOmG/kxOG7szLUvnI4/iBvXq4tVqlilGHzDRyHSr9ROFkcwsvDhlA8w7gHhYm4yFXvn7lS5a6IgyicsmnsQxFw7lMZbe/MzBgXu+/gL+KY4iupajERaiXLqiNKt8QQBgbgR1A3KqZInctge4Il2wRahTJHZdxmC7hQl18FEczVyuCwyhpjXcnMOpZJpBs6gqYFgPEFnqbgRcx1MwmCFqDiCeRPxBqwFkeVqtwsQXkJoER0UxfiwACaNbhay5cQ9wORkP+B/cV7AuBSEIQY7hfHx9SlY4IBGn3OkOfFykAQFPiHYNirNGyvMroyWupVNwJC4SvC1rxr9RXY24U0SyoqQKvJ5u0G08SpSn1gcRJEtS+RFEAdf0YnLgfL/UIJ2GhjXDvWqYaa7BpPLFXA6CChxbDTUVW3LHGTCRd7Xf8f1DyfihcOABKN0REPepiDQ4lkMTbKE3TlSEANtQPCXARphiDuSPZEFqtVuYc07pUyDL6PZGsCDhgsFgKRVFmvcIcIGIsCNuiC2nEJMfgB+47blwOCKkFpoF9MW0lUkDxZtlDYdg1CrVPWsBynsdxXgMOGOpwR2dGax5+o2pJQ9zpkaf9cxJzsq5DOPzDQbbwZCMacvMqKy2bmGvT+ZZVLBUpjDZOIlykvyQI3iuSGil2zUv2AWhiozYFpK6iMo3HMoYTAgNsjB51dTLUnAH+JiqmyUdwiada8dDArE0wegvL8CQcHFWjwXqW8KdBLCjcsL/AFEbuDgl+MJEFDvruBPEIvhhHdrocqOGXtWRsWR+Uh3yVNbYAChEByPpuY3n/gw1aJX4rhdyz8DNqDdquK4PynsvdRAe0BYkqUQ8GTK7jUjMDkzUSzAi6sTGNTLSEGpcy/iNhxmXUMYfCX8MawlxXePZAxkCzVlf3Mxjg9yglwXFUv4Vx+iFIC1mROsSphcH4UsGqWmnZCNSuDhcSvVLV5gFKpL3NXTM0BjKjesfwRUUfuJxD4Gvmlx2sWyeJplVtF4ocjUXAwgtp4nKFdfqYtMR8vwL6jfEPikDqOUAzaz6P/n64oPolg78SlkRxqZAXUFLvqBFBagam8NlEQJgdxlg3ZVxgEcxBR0MLhIYfcsyL+ocAqHHYbVmquMloGqYNC2y0XMXl0TVhUDATc6YUwqEF1ZAl9QEqAWl5iA0NjBLF1mYBYNu+Iihsamvm4UKisrlT33C8QUmSGoFDgiWpn1HEyJuFJi0xxBEqImBBjC3iXVJUsIm4ZqpS8u4dthOOquZpWji5WzwCvse4UulOlal8pYfFswJxmIuBGSit0VECE0BeJmq1wXFZZVgA7hZNDHeZkJQu3LE9rvpl+Id0VcRZbm0rVFk46NZcwbbV1FZjUUnQXS1FBsbNRmCUiJ9RncvoKgItixcKz+ipQSzdb92w6goTjhE7zf1EQt1DcKvEugKAEewlRhmXjCsHkIaObOoQNqotxDL3yhqLWurxEzKLoxF5rI9jkZcUGkhcWA4v2y7AKrLffMWStHX/LjI8iX8bRgtFY3GqEYPPFQI+IYzKEsI9ImQq7GVMx+8V2fUaJDIVPI7IAGkoXiIvBRpozcKyh9RQXyrRLkOzgG67/LKiN5DOSU5YIuC2OC1SEQMWnO+P+5iqduxkl7jLVIguZgFDDov3LTULLF7IAePpITRpS7iKpZ4uoqdBd/4lSXSXDdXqWNRp/MQclOSsBM2GSUfDlmDkZV3Lw/wgYQDSnL3LtikyqWeIOK4l1MpTcH03EEok4AV9HBCVU5dj70VMPADI113KhQ0L/EEuZlIDeYAMPwTFc2NXPuLsmRN+o4q8e5djC5q3GTzalacr8RTJoqIHL0u4B6BVau6fzUWsARaVGNt1gr7mMcbTRsOKjXmFtszSGq6nNNY6Eaw8k82tfUfzNdhkX8v4n+IlyUpblQPlq9zYAdccMGqo9wwlwURRqMBqO5qUnEpxXmWGZWM4T3RG7qm5kwneE1zlDk6vUTHIZB/wqdjEVcVRWRA7v1HQUFvxBBtfcwRal3GjB8I8EHMMSu2LRdygikq0yrmMor6B4ljThTqGQpKjS3FUG4Sj5Mkdd8moLbrw58xsbtXEV1zOxBTDfxQNhZvxKLbTzDGlR+Ii3LS0tLQtZSCtPgj/Xxy4iwiOb+mXdauOsbmv9xAXGoYCp+0eIs1b4gqL3tUJItC5ZvI9Mj4qMRoAl9aj3BwfwIh2wsM6gQRDCO4wLXbPuZRDwcMLxYaRzixFl5gXFqDb8RbmksYFRSjJMy8vcqiYoqWRzFksN1UvzF4+Jk+yFRa+F7wiFHDEYZ7hqKqd2/olK0GarC9R/hAgxipYq5WUIxGDFol3EXEdEdpUVYccs7igNTtBG1emZghRuLrByYnEZeIXalx9SmDgJmOa4gNI8FcQbBEg7u2qj58oBj8w34pFDC+T5hn9wYX2x7WNxg9gwhUABQdMR+nIYVZSrdu2Vc1qB055bDh9S+aRSUtRomEU8PMRytxghbmY5DbutfzMmWrYVuYBlUXY/IxxmUItQgKH2QRMpOxzDMSvgFQVeAwgFsg7P8AUTHxpYlTapnCk0lfAVAaoYA2KPZB03O1kSUtPcCY7BCW6lqMSgFLSDrzDMb2XZMWBvbuY/51FQNeSIGbq+ZmXmv3BypOLDMNrQ5o8IRNV7gUUOYUx1j/ACzphR+F3FqDaoNjQLacD39VE5YiwZa7lgEpuJYvheYFIRwwhoEaXl8QKFp1GBAfd8S7Ln1vhmrrJirHmCJzEojWHLN8B9jAjXx4h9P7jYKHXB9R8fxBbuIO45hanaYvYxujF9S+d2hrYdX5f4nCicLeTm9QWDSjA7pJzVZgDt26me4UVFGsF2uv3EvtwPZ3L6S+JWviKPgCCGW5C3GEGX6/uLny7WpZxXblEPqffKB+m5W5R2NJPOrsKNNyMNn9QzX8pzG8IDxKFNJX9mzcAEQHxKf8A1CuPtRcXUF2rGVwJAZ1DcuhkgWkYJEuBSrvmZZYSXdgGr/mVXReLiSgzLGIYLmWGPjsjS55P1GT02quCEoIK4hXnFXO00lIbaZQYYJ+EuJUfIOxgB094g/HKQ1PRhG77jQdh/IwUx3AvU5DVVVwBus0Ram5UqVKmi8SlswQLslXmUQSbNRwi/cTzqZv/swYYHdTEsuCLsWRmDctLDMr3DcGoMkrsZgQ+ZbUCFZAzLvxAbBmmU+LslrTyEvtFTApN1KpjjuBFhmDCXMEC4lQbl7loTOXqJTzELXBfwLJpwsvS9ZZSv8AMx0QNn3EmRsiXBdUX4R1nALXTLujplLiFYBayqThvHEOC3F4yNVcBWfTXfQ9Q4bJE0+F8GfhbiBg2Nvgh+MoLlizcVkud240wK2tSziMh7v7jTfMLucTLHEtarEugMwzLgGDNoVcqEKgzm/qHBo1moX1agYBE7iUlH3ZHFeC3GWS7JQZJyTM8dWBHqR0LYQAA2Pcu/EYBtYmscrkvQ1/2YiSPSxKCGgjomVlITAgUDSuxosg+km9oOVeoEEb8OQifxErK1bZKCUc40qIS0UBmpdo5I0YNxZSuxbOncA5sFCAYbiojlLrn4CiLUGLcFv4dEVkJF5tKmWVXEyvH1OdqGXV1+aZZGioXXZCvr1LXjZKCNr7uLLXENH11A1MeY8uvEoszmdOsOu4tEQxKPgtp+yEciurfyS2V0wuXhZc489yzs9hl63CoEemYxLJSx2gDDC/EYNclvl6lajUs0HlJs7L3UxPFqoHlYnMUR7n7EJohtcuWlZS/N1/MqyDSMbOcdPx6WYoG1QIuYi0yrV/gIkxDAoKW+/bD4FhtVUJEyhYjyfqLXgbCw6SKlGYdLepZnohXQzDbYRg6ZYltIylTjHRHZDYgVlUzeMhM1ZcnqZpIL/Ygxcj4ixmbAp6iG32xAtCkrw7iVLjbzGkkZtP5TPzMF5JUaXtmO3Ilw0xLYYhPMg27b/tDEXEAmxQEue6rwf7YjdX44jQydo1grGQ5lajZgEqm9geFblBojQGyGcIsIwKw05xMJsliBqH6RCqP3FXLG7hABNKlYNQLy36/ubQ2VpDpg1N70fMom1SjgOpzDnLLpWgogVmBLZbLZbHOK8zhiiuMV5mp+pb/wAmf+5p1GV/iZPc4mJ3Dm1ccyqBVLWsS1IFVZ1CyGorZE4QBLjDCMSqTkiKWvzCO/jhmRLzJaULRRe4YNe24cxxIygQPwwixBBHAVHLMiM3DSu3iKgZM4jZoFEVsiaaj89GZeUfcyO5YzapcqZK9cy2eQI6RQh6sn3N2HPTG00R0kHlBEoIhRX7h7MLpdEbaLMo4lP5KYaj8JWS8y8QCL1eZjBKbeYirLOoZxumXiG1TvapzzIMMytdOjzEnJMBCDZLWtdxZMQo2i4WuKhm0AXnVQ+NXSnMNxhTRy29GCIMWm4Xg3xsD6xEr0i3b2TFq1qSs07u4xA8m699QEXraHwL3HBItblURrIsbY5amB8N4biJZQmkOPA65YNyCgUvL2+7lFCj3Fy2XcapS6L2QzXVxXRwZlcU+DmNkfKMpBrmijqWzAyHdxLGw5gaK1l+WrFzJu4hRV9wdzGBbKqBKjFcGJmhePg6hVxtSozeC1cJBmHcY/5g278zbGNURzGXVfx4ittc1BXC52S2S62zDftmkqZZDlggrZYa+KCAoO4XiFKVOdxlZClL2wo1yQTDEcVysUUuCXndBCSAeapD1Bu1XzDLtso2XUzm3wdWf6iFbrUWmI1A2dzR7vfKQpVxu8fzLBgtNsx97W6/TKCDuOPc8FVAbzFtIeMjfIYKOgTElhff+Y8A2ANHiUYbOSOIq74jew42PEQI4ELr7kvUlrClVwdSzNiSrbYeaKW/ZG1HZEdTA/xFhFDBhWbrR9ylgtBiibmq/d/sliXZsqKybEEsC/jbj8qgfP8AM5ZAR4XxHKMiX4R61ltQJQQGco6Zlo6U15h4h9Y0Vp2RWYmu4Qq3ZUwCOkVAcEEyttOZjRN4UIxFJdtSy4DBej4Qsw+F1BEWC8wQFgdRVW249IeMsBoKfAbm5tAsl3DdJelX/mGICo5A9RKkY+1QxUywajbOkusdRBFNxP8A8/5WZGMzZiKo6xDRUB+4cQ63Kn7ggYHEQcbvzEQJmYnArLQgTmDMADpYYmrn2QYBl0oU2cQv2wPcV2PgBrMpsMNfFkOiBj4TlOOZE2gzDRGsEWO4Fg5jPQdtfUQVTSJWYJwDcpXjuCEk2BlSi3mLlDwPcHVjwkysb6lo5yRKiiF5lT0LF18AwFuJtYOhHoOZZKKM10ijUFUFtygmtAVRAJbQ3Y4f8S0pnQSJUQWAHwqJgXM3Sy5cD3LC6dr+oHgHBy8oipQy5WQWdwl2Y8Si4lyu4txI9BvPMTCXmOaPEZFkxTohIV+orQKeO4F1YAiVCiCq0BAzM3hO/LxL4drhWju4twrfmYyrEIccxQz0NB1EmogHfBt9QVSLUG5uXHHtwOFr+JZ0nN89O39RRA2GV7j2HXiAIHal1HJMl0bf1B7IzzqNa9orD7VBteYKx7ix/mNWk7cCN5h02m2icFlXVa5y+4AIXBjN4FkldkMtoLQefMcbLgW4NTZKl38NJcQyqPPxer4Zh/uIwKqF+IpDLGGGIYiBzup1uy9EuwCgl5qDnVfx/wAQaVqILG7/ANy7BeSGsNYfyylRizqWuFeXcVWW3v5ErQ8w0qnuYX+NbXV7hK3jbMes2CE4QuIUZggHPMWaFXlOY2YZSnBDI9FxEANJm4eQsXibxTTDdxcXGg7R9VL3czZi4vvuFv8ATBTPXJDnbVQxko1sMvu1lUAY3KZpr3GKu7dw3vmfm/2lwDDGC0Ru7cnysYcCOQ4bsmTPl0n07lntAlCt/T1cFYrPUOK+AQwqi8sq2kIUd82Z/iOhcbwRoJScxpFZnZ5IahSBLax4gSBUq4iNYLFBksy28+oWnKvGvxBYafijKrUyyhi0HcyfJ/Lj/EdZK9h4QIAiORlrhBlkXzOB/TBiZAVsHMCvhZoxDQQwE2v+I13EzAxD4FqBcGqboLZRm08ku6x6jbtuOGOYYjSK5eMhoqZhbXW1xNTIXkqKmmIEz0LuSyBeFEAihAHPmcKuJjb8w8UTtlZrNZrLOLlyvMu8Q3ioaeYQ87qZXMfSYGBQXqIAtaTUQScqKcv3CuT5nRKtQX14gAvPZGhQg6iKQcCKEHJuONMdxtAjESpLEiDcC3mI7oZvuUKZYJRuGmcwcS46h3iXMwMwTCO/gNy4y8Q7OUYYCT5IK7JYT0jxCKhls45V7iWhZR5i/eKgW65ekW2V5BiKJ5JYZKZcxZGXY83wwMFSYE5jtxY1zOtav9LEvNV6pzE8kdi2PUqYRCyCI0reR9x1Ez82rRCWkLeaJdXKdQYYHei5W1yhu3z8bYIZmQWSHFzHYKeYC4AC4UoDIsMsikbtqBFHmxUe0pWsKIQkhs8wBCmrXmUS6S14DBKPA0GoqZ4lzRItfJqMUs3lhdBuWMHkLq5Y4ASWK8ytuznRHtTEX4v9/BylUKvYiZ/oYpvkCByN+WBUYJgLTQQdTXI6PfiELXw7QGntqo4jqGow6AZSVJyC/cLnJ28Qzh0HT0jDrWhI47BLLj62ckws2ORm2XULpUI2l0xLmVzGIkSxKT4gcQyviZEQXs8UZ9SlzkxcVv8AqO+X3MjrzFeV0VnNEsjTXLML57jtUuFCbMkrlddnljS80vMu7cKzXuLcFvUGDTRW5UCm28y7JyyWj2cwcnXI7brz6lrzYBgaP+IXERS3P0RKGVvZWoV3n4qWdiw1uLZAcp54/wAQgD2617l20OPdqDacS1hlQqwStdjyQJRAWZqJTUQamfRFrwsqu5a6TY7WF+a1BwgSHHj+0pVHZdzVIN/aK3Mp87oiK00DiBepvQ/rYFWjk6hsQ7KZgqUMKjPszFm9ktqUbtQqXq/VLULdkY9sPdcQ8IegOIKMxzHamS33G4hY9QaZ4QoQswbmkZAZVlglrquFjiVW07E6itOdBO1yTQU4Jp+EHwMSyJpFtDlXcH1mBnB5Je98vI8wAJLr/XGfOAUwVAbfUKztVKiWMS47qLj5NlwVEBNkzKijgstyWpEiLT+omB3PBMXOoxFjEpAqLp5g1Ac/CnUC5hHcpp38J3qjpruOEaU0X9SzriLbjqMKbYY6XFg6YzqJLGmVnJLiAEzBw8z/AJmf8zP+Zn/MxVLuAuoacS2OIcmIkszbXmaE61niC4YPJFYlL6ijhSEG9tcMhZ7iX4ixW/DFQdGJkzgla6DVkXRku64mJLg3BchVnfZFrwTDBaw1HXwbjTUuwXKCGNRGFglBMoEir4Wu9ygThhebkIqlKrqFFMPMz7QavjmIb4w8UCYALwXUso5Te3BJa2rJb/1grSpgncCvEQvjbKx2uO8RU5ZoHZGjETiJhVg9iLd3ruqmhYwtjvYdx2bZWytwZZMRi8YKafxZ1DQCNXYEESpga69zcsofg2oywLNaMWGblihVxKgpLEkfEvLPk5jWhUMRDW2PbEbncd9Rt7ughLOEIYNncqoswIrGVA2X8RtogzUsImHuCuqcAulP6jf+rX0IIOI3zSnAxQs8IYYU1yG05PUuOSgYDxGJZEiyk0AcdxZQpxj2PqM7hijcaUpwRLnn1BGVFgT0iXEAgW9RCWotgkYnbBqBLYDTeoLAORhKBx9I8bs3qExYUrZBobf5PMwKQOklMAJx8G5uuDlgBa15l3NoQWnAdSq24mQHETT2Ul9uy+dPxAQU4OIL4OL/AJlAGrFHcVuw7WKIUuAMQ2taOYrM5f1FRp91DmfEBj6fyyhEMrqXRHMJqPZxcJQOOmJiebGoy3eEe/MVMcYWg3mMIWocmIhRTKu46i1EbEzsOmFMcYUXH+8TJq9W0M58xdZqsRXipmn7CHHQy/RAmEhERejLv/yftHJYADT5hRajIfON0c5lKPhrNma+oaIaWXvmJpMN7isxdyn/ABaYu4/HZFKKo7s4/LHKNj6liYPQuKldBoRhJCl/qUic3A0Q2VRm6NUeLjMcMDnTLS0EW4SUxYpU5O48A+GmaDxLYLinmvzcbTJCRQWxmvUyswkuLnyxecW1qWMBDg/f1c51LLKxUYaPMzODQEsZSjzLwQDQtWQuDvKo8WnmI+eWNODEG/qZgKHIlMN1ALBfwC+swWHhccaroOJQXTTLYJMSrvqKIU5gmMiXnUeIlx07FcwLt4ILsM9wOd/BHEMTFnLqeU2x8EtrcLv8IKEWiibM5VWIoZtEAuW9wA2h1CFNm3zuG00bj9MQAsYqGEtlstlsDix9RcRNowouKzG4vXxTod4l5AXcIwwtoi/ZiJfbLtvUReIWwH2yNSxgZlETECmOSUjYkpUlGcczZNMvEUfggyqIuZVkaQBlOIrfgZYlkHUw9o1jhRCGgihHZMkbomPTNP8AUXfg/wBSuYADhGhUcBCw3swPiMiZGwffqOsy6I4oB0PPMbBHc1ENTAatzAJQ4YTXCzC0UXmflgnelqnmZnA0QxnMUeBqN1wy8VGGCcRW4yt/glKRSrePEXc1EVFpLGoGxVHAR2IEXC0dOIZAD3uLEIHdFXAMI7nErMNmMkF/AdurgohtbIi+Q3iNh6WHJlZAC1/BYJUSxoW7gEVW1lkE6+LKJ3nk4Y6CpZc0eJavjgJ7ISQuw/8ANsdthleyAMalovJ4eD4YxZbFZRxeeYfkCf8AJNK2guvudFFxeI6F9KGLEyCk2ubHUU0EPkUuX3B/7iWzLcwRKYttS1DYkHEZstXKy2/YIlNT0jNVn0EZt+lG55HMao8S0yypwyrYwZouCpRqmqjnMqBrUyuB3EcVmlq4cuapmPLf6Y3LCnYYqIhjeV34iQKPyK37jSxlxiWQr1Fo2LcQjR4K3Ag4sDcS07rWp5fxAdRZKFLeH8sAl8QA+FRg3Fol3GCmZQK1z3HKHyvLRqOTc2ikhWGIlzZE3BiJbTAwVaOgji7l6DwpiLpZtFq4OYPAXcoKaEyXLq9QUy12zxnUQXDLQ4xwfVTDgeZVHbFvpxc9jMpjD2QHwZfqMo1a3MRhrjC2eWyjZOYC85/jZW8MpVrUjo5X+CGkRjY3dS/xhm+YteAANgeCDcN7vE5wiXNufsoYg9srM2+CmZRDYplCsAzl/wCJiRNZyQd1m+olaH3UtlBVlKlBdgQLuwxc+BgCCaswP4E4Q/P4vSIBqZhuSJTSIwqo2iphNKYqALaTERhKSUqBfyj5TyxREo+ouKg1tGSrcJ+4qMUtA/FszM57qv4U/mXuTTI9p0cFS4YiDJ+39xmCt2PgVuVcTtYvw3EnmsR+8tfZA4yUaAZUrqo7r9ADxyy0/qk0t7zUIDYx3fklcGu8XsgcB5TL7hmoHdxIIvqNEfBBzNzKPCvbqKcrCGKxELzDGWFy1vcCJTBKMpKVcRFp/wAJ/wBSf9Sf9Sf9SNRRCA4zDeIC65gNm4KIK6n5xYziFlLV3NmWHSJMQWRwyxqKbkahm1QYwNwcywAmQt6L3f8AiouZgx8ArIRDg65lQamyOcrEt8QEUS1fLLEu65JVSwmWBUbEwDzAea7vofMHEUWWP7lnI7dCX+IWLo4XBCLoPAsXF7JtTvxUp86UA+kTUK8TDTvOZQENMlAABgNFwGMQ8lGpV4T02CTLMBwjHqwt5KjBamazAlU0Oajk+4AUVXWKRIDSsZYcRwKrz3GDSjAdy+A1mP8ABtjKUqbH6DC540lD6ihtZdQK1cAlDL38FlRJ4RHjdTLwDhMli5Y+3wfDUvr3YYCLHKGAs0ErBc9OoNwRH4VmoCOGAZr/AHEwDwDwgld0drEdBQKSJcGoHC1208WSw4DZQOTR1Lv16r/RMLcTOuaDuDpGYoOLd/iE4bCLtX5izAgUR43LedoZcviFVoSt3LPvFMyyjhI/4SmZIthdByRVALXMr3LBmtYRi6eFdmYlzIhWJULgLIqXU54Gqg86WezuIjSUy7lTiNcLFnuBWLPRmOgjbxHKw4dzFWhYzqHOfmN6jcUeIiFhzHd8XAe36j755IsJwwFPr9QYZju/1G2F7qCz3rv2/E7IVEuFRFTeXm+SJzxEWVxaJt8X1D5kVK+FcdRTIlVFzNIVC7noaTW01d/iDffQBDD+f1CA/cAFFtVuBcuglNGM+uIAU1Yc9G677g1vSMh7l3N02jsSWC7lxcs5OY2wA545lrcVLfpCBHi5YVMJaiwKC22BtFMqtHLBKttB4OILpvpY43ZF7Rr6krMa772qIMvhpTB/ClOWZqTBJQwi73Nn7xHoLOS9wm8K41qbZYKdlww0mi8PuKMixAE1mNp0MsoIPwkUpI6e0AZvz9P8wWy4NfKqWS9XqXcNsNxVLhr2ibgh7wPmXRBgo5TnPYxlFPgWPHEwwOmB+4wPCkUv7YRS1TmFmMzpDzKY9AdW6XnlJT1iVqLtKXtjogwFKeLQ/cD5aEoOH3+omabTmEwUlrQcy7YvRrNMADXluvqXxxO0B+4jmyNotQXcjXUu3MXUFj3cUlzBpFGJyVvMaMQjFcxXUeIfued+J534nnfied+IaSv7RhGnqJuDJCnGZ6qg0Q8PUQe4jN0vmbS75mQgz0QBTUQkjFQX2zZKgbv7GvuNUi8kGYahmWo6lIUunTzMX4T581ElQNyqirHB8BcwS5Y7lEYEQv6MqLmViBElQVEvlxOEQiX7kz4btdwKSUu8hgRpFanH2cXLeJLtDUraKW11MpQYAxXNTNKTQxUZsfnyx+2rsqoLTzDz2SsGDAi1hUTSOGAEnRYXJnySyo7DweC/BDxagvIv1NiODpI28tP0qj3QLutn3LeFKDglZXwKwEdRWDUpYby6lHM3MDqEqMXNWxPdAOmKjxcVtJSQShTmHYIYesxaczIiYnv1EVbYYPhdzUTAiteI/qFTyDa+dR5oHwvDn8H9RJjfAUzcIdIBkCiaWKVNgZAzapeHOEsfonmJgX7mnws1FGFDzrBUa4hHMQwZXqp9IwP1K84BtFfZMrQyK3pIqtF7cPJnz1KOntA1uBuIZS7hqJmAjbESt7cdRcK1crEL/Jg9Eyq8aEH7jL9AZI6vOk4I0qI6Y2rC9BIOX5gVKNjVwMXdSgu8wpLaNxHLBwnEo/4qOqvPEOXNXnMyN9SxY/EY7zMw6slMPX+WZMKEHMdzZBZUYQ2w1BYc9olzuJbSVl2fmD6CEFRgOd7iXN5VEGahiDGWRLPMShjsGbDp1/M2Q2AXewv7jkkQ3VaCFAiPMH+gPTFjXg1DiLS636lHIYoEHi5eRZQrN8Qt2YVP+bxLTpXa0TjUFPHGl9QgSTVcuIL/AP1TKW3X6Cx5jAjSSiXWwku0JtZ4eULl25qsNXr8zAuihqAUG1cSoZqs2dkSoCIx0nMH3D1KjdwwLFyOOqrYl0waitSiH5gleUSytsvcEIZVbkiobyVC+JeXVq7EPECAUAC2P6hYlNI2J2QWQCXUS/jKQZTFThkHRxH4DXTaGIKH8MW6adS+lFKTuEsXAKtzTn3qMFQ67ilGixFhVZJVf+XG638l9lzG4DeZv3KEfCw3+oZOHihgIkG+3weDG4JhCGiArB2n4mUx38ECp7diJYAbGzycRVPcZRwT0jZh6mk0eok3LMPSeV+J5X4nlfieV+ItS6++4b5lSAq2WPZEN/mcEScRxLV48QpiXLb6hxcUFytXCXHqrmPmDDa7ISbBA8jEJuHTLtBpN5WK+K1lbj5BA+BR5gnhcUKXfmBQrY7qaYniGoF/FuIG5XmXRHUDZGkUzcxXrMMtwQ7EDHSD+phe9uBGzbs2MwpEeX+E7c2bi2pGKWMYUBr3GWwVRpGTlDO4liYSIrIg2DWriUREF2+niIU6BS0+PoltW6zEmkNqmxsKLYDFSluAL7iiGprVXIOWIT7CMVF3MPi1JAPyxSsfxKuVmUAs70wcB+JYItFd4jzLZfTEqTVuo8476mnq4aiLRDJC1LJgKaQ6gXiCoSztuXKi38EBT7nUpdN+S/EVYii7blFzLsVsZaaNvgySLadc5g3azoQc+2XYs7D3H1Kq+EyQ9LMCFWDF1RGJyS6glJZgUvcLLQFwPM3prD2Q1I/MPb4m0r0wIxRROeY5ITs/hiIqV2S7puJvHZ7SCwH3KC0u93K0NGrYv6go4NYjHoAeglOaIXRQtVoqEStB2eEVLx0SmPCO2lx/EW1fubm9lYwsbI0UTPtHnuOcZg+/cTYzgWeIF/4gVnPqZGsUwG/iZM5rmMFOzWJkzr/LBFKSsysy44+Aw2bjRWTNsLBY3bxFJuGsLx+IQ0tx2EMZ8s8eIxZWZVGWXnBqZQr7A5m5VeFEPzMzS0t0rJ8wq/aZzsng/kiS4G3UaynVFoIScpBiZCnJXbogptvWWoRsLxbc5f8AcbKydiolnWPPiPKVba1FRT5/mO7fBXd/2MUgtxfPMwUgHhRlvqWiAOA4mLKokw5BJywdaruv8RBASLxUdKV+ZeUadQ9sIVAr5xoHa59QzSQTOGB8R2jhMJExRYAFsaR0KGjzjY2oEfhbAmqKHmG0ibp7dxqH5jzsMry4YjAhsZUYNx18WE22xARChg8xG9qOpkFF+R1HtSiufU78xa3Re0hLwc74lyqqxtButl8ToREIrQvUazjIuDbfj/MCAcA5z5tVLac4Lr/r1AdBQro9E4yNqt5LQ+5krkm/QVL7y8MNaK7l7DPfwSulFum2q4YACAAwPfiAWoNSkWNEAIahal5QhKMt6Cf+lP8A0p/6U/8ASjqYg5mmH18KITme+YJbNYisMAGJif4g2YgfiCiUVwwqrvoy4w3cBDVrLhVobNfmWC+bmalXAqOZYmf7QNhKSC4JQMeVqUQAGHt5j3rkpgLGBvb2TFeYE1HUUIRLUw7fhyIuYg/DaOEpFFu/i5JeQAhU4huIuJt4eCTiS2SQ+juIpAFbBUnbHDYRuxRytc1xHnONouo74bV8ELa7y4VX9w4M+cBctZC8sEFdurWbABul27YGFnCxNUA7XMU6eQ+okgporp6YG2jdGCJQiVwzIMv0Fv6IZUjNrA0xiOb8ERwV8HBOQnCK6+4oL5g3uLYDQCrqqjLGwllBsa5GWIUltw4UKB3UuYYkllzxDpKxhbwcRtLwHF4UwUE6GiUtqtWwmmratgMoGqglo0F5NFwKLCNRV4D/AIDsgUN1Y5gTKoBj7im6ZUbcfiXSLcTBABXIzjbTkzJwURLhSyEAMsDaJauhEZcrGbYWsCiy0nitxkVJcVbUYIVVauI6FvJq/cSgYO1XEsmdXyxHY22LFcO5b4ABuWUo1BZEdXYzJ1ehMx2dmY0gzADQuFiwHMWhHMqSRlt+Irbd3u4hAp7I6oAAXpvcQuHglVyrwwMXrPe4PthGDW8RWvDDDi8zErhCpX6X8sLo/AIlfBuAxLe0u4blgS0VRMjE+QvKDcZVyxiagES5kUQcpHaSxrlLq/EE0AnocDu8xSizQD0dyjdzzoPMGnj5MPmPxasKbj1cu1medCsdm3PqaXTxMeSAOcXHIAWAQilfqbh0hDfdkKD91i+ma1FZfFBJjVqYotjhH4i0vv8ATEHjRPoI157iQYqy/fxwKXtaHLMcA0OHzMaldR7neOpmig0eTzGQaN3M4AL3T8XbqE2d1v5OiGqAlYwI+KabuBZyMI2O5hxUsK+Wai9FcQrq+oWM4YtqcMrF/G5WcBlfE1ALjj4IQIKAVulqi9D2cxtyceYY3R3BlVbSaYrAhWW3ZGC1kvhlMsmBZQZlacuCLdTtXH4jFULMwpD3olrX1qIDCitdckunA1ucp/1yyu+uvqArQGn3/B9waGAq09E/aUDpPAVXgGdEpghXPFyhqK/p8NVC2s/C5JE1UsCt/BF9MKruPHzC7HUrGzMBHcEsFPxS5xnwXL7P5l9n8y+z+ZfZ/McyW/UZKiXDjzDTMJqOuWbSDXgIimbIZrmGKJr6lLogaIWHHaMKZazbTEz3NUH0FG8lwWigxl/UCA4LhM1C7H2Gz7TJEgxujI+mDfw5ByQy2ouVGwbrKy5Nu4C73AAXxmCyS6cGC4zXRAWqU39S9UNFc6993GugKYDjzEUKTdxgIV5vcsHwEMCSsTmGoniIlruEKYZZjM4Fj3EVDKEB1KTONEz3CA5fF8S3MraAuxLigRE4Z7816JRWKjJa+YKlbJh31aTgIOHUV1iHrIDHXcVrVDfmPgtHQ1BKq7XR4mRYw2uVJr0mJDdaSmHTu6EG/wCvzLg620W92S1Iu00/dIuR6qei/pByWUibHxDTJLO2ex5l658IO/fcHMFQLQYt4hqx1qmH1BqJ2TVfOCUBIFovmpgK24UHh6fETUTSFwGsSxMLYGXbRuENwqeIQiq5ZknAXE7gQCXRONzEHVcwQpOFFfuNXjA4f3AB2rp4QQ191KEuQUZXvWOPxHwuGUOXqiLQwwYt8x1rJDnr91EMCkyQTqCcBylRRTXhFB1F7K0eDqGoMUaBvkI43CFJRA7UwBLk0WrQeGE8Xtyjs8x6BjR5Sogl86epQ1/mD9XDldeBX7qBbLkaKPqWp9LLikh3hYQFBuGtDAQrm/cRABQB5iCHcS5UwlFw52qXPEDMzLfZLGqU2JyRrZeWn4lEohNU0DcorzUUGNNgLvh+YENK5ClwOm7ShLh2Si+ZdTecpqbtbMXufxFbi8ywSsP5YF2a+AB8bPgqAjFXKEKQ1DcUNy5AOCUsvXiU4rX8KXcqoo5JVN3EbhQlYCUsAzmOAy4DTg1U3NcHNMH9wzSjZD2gIwkrBgu6OIlf7gQBNhQWVXqKziqpYcg5d/cPN6swBFFkrmJjdgXQyfmKQ8H/ALuCJEGxGkgPry6PXRefqCtS2C03aAGBhBgeK5WGCbBQxkAW9SqhBpdHUESMKPeZWE7JVxlcj4i/wEOm1UKwhMVv7lGO4uL7bi+2XyvzLol3zEJEGRIVCU6LPYiI2eImCWYSpDY7YGJU3qYqo9pC1gzbOJiNQRoWPslFIC0W9xXFWKnNRSLCmOiQ2VB7dG9q/wBx66NLJRuGo5OfyGoWNWkK+mMKTQoJ7uD4OILBi658GYHkbba+gMV7tgFwhbiNmZJ9Idi+wK2fjP1HOniKs/Ahg2aXUVNwYZdV2ZgADy5mU2LjLBcELdMcc4KcmIVwo7TgpVqNS5cuXLioMxppvMEyNR94ldx5blasIOj3LsVI3uYsV4lQws1KBWKsoX1KEoKZWsqE2+MAoiDvwNkAjE7HPTEFY6SI6wU06iI0nwZvQNr+oKTJol9B7cLQ/wDcQgK1VbfcWNYh6Gdxmoo1awwA8w2zIVPCZgAOFTmUdtOCIRpOIUIm6gisRy+G1gYgBHJBEphJegHkYgoD7GFCDYIpKGRCiqIQFmzMBGJpzo9Qolzig+pTNnaZK0RTV9RsvcMZyl2doWw1dOCZVoNk0E3CqVVZ/cr3zap+4zZegkfYZiyRMPR+2oAheilfmiPWs4D6GGUqVmGJdwUy4wgyu9DxN4r1HAysLuA0j7jIoY/lImNccmSN5043MKQI1SNYC+wqAI1FX4PiiWWZxViWAX5mmILBMS6eP43GWJdvbBAqNVHACxjYsKVQiF3IqMePMUOC+y9EXuBo0EpUJOnJMKB2NPqB4zrxhAkAHgxKtmnCk/tCAIK9z+Jhkjey83xCnl2x+5bGpTgPZ7nRHWT+WOvYlkawyE2ZieUrjxMMMeJhTFg5lVrHZb/5Aulz4dxcgtkhg123XDKZbGmWy8s0xpSZHmfxBaAiHNOhCxVobgQSnbVqo6iBavtYzesxJzXMSzKeZZFbb5gbyf6lhaFdEd9w1Hd8TGlcN+2NHsgXFWovgmLiyfAXUIUtPERGnDKIhwlFsT/uYyZWRGT3DMSMcZip5jmClp9S0qVb0dRSe6IsMxoUQVpfmpc2g1vEctuWIHeJT2tOKXQ/R/Utx+2Ft0YuG1tmZkVQew2fzMkVeIAt/wB3HcS48PH+Jjhxg6Qxbw10xaiqBtjbqNXXz5mWTcvcdi4NSt1MmDAuNSlUMfUGyVlNVAvB0UzCjTBzBcwlgBhMATEVtvyPqO1tceoKCF5/YXIyyBm7iCBZ8Algg4lPgSVRBl1TD0wZpgOwX5zKi4XTy6iYBJb1tqJk5wUYt7BJr86jJT0Shfo7gRYjX9h35ipgiFaSwVCoWhxHykB5HDf0wFKYJ5jA1WY9pfmG5W2KmYOZuHaYK6OiK7Ya40iUBGYkB5YQIRlbfMUXjWf8xEAFLgojiLzC8xMTHmY8yg1XpjJUTuoipYOYYgOdQpjUybgVnUwovcRWOPgFQzhDuNtk57TTspe0uFO59RbgU9SsSrYfEIq8RLggQKavSQ3B7sW/UqzpwlREzg26qE1QFKF8xFKUpRaYAli6IrFI4FuZmZXGmtpWZkRlKryqUgINpcBULuxFZdjs1LtfnEgzEbhfkPbPVMiDcS/AfA5uVQQ+35Iw6apkfi4KqpbPl0A/mDSwCgt5c2cRC9hTMPeLH1L9eIxWDwXP3LjViGBO/MUShRhXT1LQgKrSBqKGwUsIEYTbYKxwuqMtsCLuXG9RKtw3Fi3LqGo2GmCrpPhpgVBlo4dsRKtsCmJliVLHxMSEK2TMMdF7i0Lg8xll+AEXguJVc/BrGhiWOZsVHdbMSrqFvQqNVflfctjawZRN1BMTiBfaTV3CfQAlKsLxGMgvZBXklYlPvW9XkxhWziwLKIcHUBAMqtdQN6TuDX39i4M2ZWatGlk+DmWBoode2NXiFGbgEsbGt+JURVaXubgnIHEpLC0OWATUNiyoIRLa1f4lBUXL1HKs/UVi4nEdasdjG2yZWpWVt/yzEjNcgeeoVgTKv2IArpwqNWaRiauywgOaGbz+NypJbBUXHfEVYrEWQ1vfBLN23WNStbv7uAS28kQ3Sv8ALLVhjuXigzNyqmCOoNmk2PwlQjtfMS4GZR6ofg59zT8caqiuXjWYDhSysIs8ETB2IhVniIEfQizomuigaDuWKD2Lqboz45h/EHonRgZVgAU/HDjPlV+5ZdovjxB+PMctRck2KvUXnIW2BhGRs5wgg3Bf/dhiuHDcHR9L/OImsym1u8xGnJoZglEuMZwThtnDLwE4hPZUMooXBHEyIqQ6gCqpwnTL3GhLIwJgGha9kNVnEo2Xt6lyGgMP9wdQQhAXgfcVJukKcXomPMcS6YH/AMAwgJuLUIQ4QVcNUn5GPETAi3R1FwYvCwEvpRmydVlH5jmRiQq+js9RULyhq217WpSlsL+ors69KQANyEZju6N1K06OGUo3SEUOxyccxEYf6MZlIwQFr1C8NePREu6VChsgNo4CvqYlcDG2ZbVlvkcQfAUy5cuXBrUo8IZRta2v+oqyVjBiHYagbvqL/cxl5+oUPEMpX6gr1KBgzAQtXKBeYgBW7ghdovzGsZtriVHWvMKuJdnECi2YghEzCahkOOpZzPtCV7cxZ/cQummzLBhYbGiaNgrdmAo9AntC0yJawY8eIHRtPU6Oc1pizK8o/wAxRQcivhyeYWEbqWIFxsQqeJR8pMDjmEgXFThImBT7gSPIcskygVKkHGHOhmsWCMD1Kk+0iB9JCjBWgGW241KzBgrW/Ewc3AqCSoKMQRAWQ+C6iUhV+CUTEGYKRQNbMlnxSV0C2DmV3FZWpb7m8l4qLRN23LuWR1bEuGpp8gW8fwlfDkMMC2g0TrGnyjSXEGCiHUtRQO2y38Qm1ywKa/fqG62XMnuWjyVI+4cGDd3uUQAbB3LFRFYetsdgpv1wfZFqwdArEqnNghAHIC1QjaqMi2sHeP5lJcXFdC+pflitMezGgVTkY/cQ2XlCEwDiEALxHGJ4QDldRVd3HEGoGyGMiq2NxcDhgKbDviXw/iIhIG3MuthSf46iGo9qtGHAMKP5vmZNu4orbryfiB1cLBkcVLdTjDY12TPwGLgemboPG4doLkzMgUGc3Ejgf5llF+a5ZQc+o2hjD+WHwwMzl78xQCZXldSwgQe5gIVfVmzQOoWro6i02DT3FgqvJGRxOHuK45BuZJzyxpdhpWmVltVTkadGJkxH3N6mWVkwb+3b+t/cCE/K+xuYDGQOz3BNoUKbjSUqhrzBZV7S2hYf9zHc+sdeogRiTSxLdMSvqWOcSgVQQYsyjr/mwygxrgliAYEJSKeIFLyqL5Y7Eh+oQln5QK3Q2eJZB3MNgLZk/wBo4xi4xGM/yhhI6f0jUgYjULCC8LAJ0a/Y5mKjTmGnBTkXO6QU4HT3Ea1W8XY9Mflc3MSBqJcDEcxQBa6CJgrUGYrjrs4/yQTBsPPhcNpuBf13qHhQx43bRq9e4odcvB4DQeCN2LJTc0m+HM5JdNn+Ve4E4o14YBmDKHI4qDiBOR4f8RtJYcgogkut2zPwmY1UIhn4mTuDzLgacy8aOvgCXcaP/nytEG1A78kBwKYIoAi3dDncNhcpWxmQafMazRM1/iNdQJMAHRBuVFDZemUcNPTFzcCLYaiUQUG/irlrCvINZy1Gu0GRzfsgVIrlc2G7eokUs9ReadCZYyGj6nA1GzqWyrgdwbUNOo8erwjp9y+A8Fr2RTamlBwBNyq4lY2GOYsGoUkSwKi1DaUDgjal6Hj/AAlIrjBQsgWk9ipYEpOossB21M0QHClrHZduo4GMaTaOyoitVY3CbXxAXdJ9CK7aApyCuYXahLozGzKFhr4XMYCoqT8Hpo5WIqjHCU9XQl+Al4mYAlIysnhBeIqo0NFRhC1RwlohCGQ7jh+N3iXSOpRCxLv4uoUJqilFuZdquCV2MSuNRwJdRGwoP9oh5MhG7hqDUpGENIxvWTeuuJs+EVoWxIm0v1GcVtKzcGjbEaqaGRrLBrRyA7aGcEbABvNWrZOSCKAlgjhekILVQ0BEUOguAh1gSjKOlgXHK4NS7jdhQipuAoDk0Rus3suU1wM2DyxW1DMFOWJ7ixAn5S8QcXQK68xXlFzuJfUPL9x5Uvwql5Uisc/mG8+RnCJkzViNZEWCq64It20f7jVij2L7icw4F46/UAj4o1fmGJZRdXmHUlIVWxlYhPYMbNMWRflaeQg6Lw7r1AiTJuUA39DHCG3bKbiSrR1mJUMkcwmfVLib7ZGMvgag/UbhfkvF1EZorMQlXisywpFBNl79JEovXbBLd/RGHxHl4irG/uGiSggvmY/Xdy9rJ3nSBFL+47bl6Uw4olB4mKdJTMHEIU0wc9x3wYrBA0jAp8HPSIohtrP1YxVRhQIUcRBlJSqmu4o4hsCrqasHSacnuBVZsg7trqWedGJtOPKpaSbieg1EZI5bEjD3mPwqYJFlo3WSXZ4sJa6t1GSLpGDUYwtYGoKXkhgOUM8oMCe+CGC01af7QQQM1s97JSQOmccMYCcCZur48DcMbJ+5Y5Dp18KSi41AtgzmZvz4gefByfADx0pS2N6uEbJzEwR2ir38mvhY5lhYN9wHKFimpzEyLLND6j7lI7QNwtTX/wA3DD+IBQtrwM681VBF2I2nDOYROSWBWivJDkO4O0M1zMBj7gIoS+5V67gRTFTMHCJCLTg8yopKMKCOINzmBzEaQeSH1XW8vtEYKmFNsTQHGwxHYtAYQIb1cQ2ArxxFEaSlKg2MvdyxdMZ7iUpMjlOagDjC7kzUSsOJtAsixbLl3BLsRvwZfUDV8aqlZLWENxufeA3L1FPLMKYmytsswUihmRmMANu3VwLQC8q1iO4YcVC1n14mDDfwZZlTT4dzKi1fPU2R2QWBlljJRMDoi3KgpFZzjmESiE10Oajw9LiXZggUJXljr8iWKO4QyEpcdzaYlhBuVbW4xDds4uApce/EXYmAGrZ+HiAqSKJp9wqr56ibMBufeFynBHd7uY3kjSlEWwYLVoXH0VOxqKAfjrjQVcLs6gYD+IAMdZiNUewu/uWfeLABSmnyQKjXSfRSH4h1QrYX2894h7J1hZ+GP4s7QiYK3xBaMpgYWDD0Mu9PKmk0CX1FGRPcv4JUz1baJblZozUuWSmwHzUL3L0o52tFT/JDSULV9nb3ELyxQo8AjeT9wW5Vj3BjGYnmWQC+pXC+KrhE9QOo/IVWlXAStZL0y6qKMDefExDVfuKyWskxy3h/L8Xn4YA4GnY9PiVQG/MYtRTD5hsjhGN2aICoioEZ92opaAMqCRBYtCagoGM2QFnUeRBxFigPUxmqHjGBLOsOYfF6TUvfocFFBy4hcMKddXWY9wm69/8ABEkGO4bWV/5lGyxW7YIPFCArTbk7rqCqFV7TSIrIpHiXCrbv0puPPmuZezMIqjl0NJGxkxQPtHMyvOPVf3GJRK8YdGIGJAH5i5+DKcTKUZJYqXclWdnxAw5MHb28Ray5eJrTviUWEG2VO2E0aug6loGZ0ZYVnJ/ggtyPaxhRALGir8y2p41l/AyiOrPIfT9wNMUQy8JweUfUo/zHsrtOYpBxXEeT2CoXoGexUZ8ukYbL1sCOx3FRLVmCBUtQjSckTOyX2SgoRcERHoF8MYFtJp/kgVv4RRAr56mkN3YV4YFa8wBa04Q6fEqNO6DyKviPOEFyDVzDCJ/851SPqPcvabmcbgJflUTdoXNalOOG6iuQD2wz5j1qLN3NEXAnkBuLQt0wWGT4NOL8QCruMFYqXCsMwjbKB5Jjv0OY7gDdMH0BZAIUOSm4nWFUolQE4YCh/REiFrFhrZ+IXMLkUqEAdwK5HMDaiosF7VzEtIamkFsq4EbgWwa3KFkN2/UCpYyn4HMahCDKkd3yMBogAe2Y6y3LBb7Y69ioajudufDCXCiJZCz4UTFmNjEsgF9AZ+plw8iX5uOpQy+1kix4mU1iZiaWPL2QxE4VMFALVQOI9krT3C8J+EbX4GBdEIOxoO5ZrVRiBEACbu2LCUWptBMEI5cwQKlSnI1GAxmNglnjiX+jgIPy7+LlMGL56gLgjbVxxqPtHDjhefr9waJtnMs2g+Gfi+WyNCmOaIc4/NHMcgdeFlaYCrTHa6O000spHB70ijjzKVi5kyylwVKGKNErXM7gRYunDqVihVd0QJFkz+0WpV1jcwPHccYjy/iVbqVMNEQycXiLiuHlhqmuqiDUzTkg7gGSFJN/ogxzi9zYbw/lh3hZ+FQOFtWHuFCWYCyVilGJgFuSXY4RozSLkYNfDumL4CViu7NSsRKljIwDlWYQQBK0BX9Rcy/2w3hoDE1XymKDQwi21yBZ/cRwxY3yfmALScWlG6mBVodh1KnnzApLRA0pwkxgb5byjDkaw1c1IOwNxc1TmVClzUyYFuIqJ5QckewaXb7mpQ6TUc0Cs12RbKxcCyhiTUyStiYvMoAyqIoNjKcsVvyVMsC+ThmY6vUEqmqZgRahUq8sU4S0nV37iBeiNrNn5ljVtW1YDxFCY5y8ISsZsxT37viVvPkifHmbDKgJb01FbCTCiOMd1Dq+A3HUcXauoAdlNDglWCsBnNkJFA9I1Y/GDKopvVJUsUM1ossKCMAq8Ecd1Ey8zPLrKqqr+fitzUShjHiDQ7wXaZYSBdhg+jGqa8KgS1ie5Pcl+yX7J6rgVn5mVnKsYIj2YjTNp0Sx34lzVNOzcwpOK9PUGdTgrBMYEWjG1GphKiqCz75lQaH7+C5lcDqBDFe+46yB4IwCwOZVEXcHEVeI1kEd3Kkt9saxDqE7vBzABWe2H8TCIWhao7ExyCRMsTT2R99LI49XHhbV1UuimW5UdQ0DYrsJYgHV+X18NiCotRbhtXcKhgW15XmXmoaiVKGXRogy2F3Ct13GpDd7Ub5XRWEvBesJgVbFtjyhS7ZzELMGq8w3VsaxFRLIjBHEvEtY4YhVrmZJQYCzmupXj4G5bGcI6iVuFYslbGkDF0Nsaay3miVCjGxXECjfPLxCZ/CK5RiVh0TzM+hclqr3LXpLQcHiIQCBvAzGwaimyjkzuPQG1Y5/Mon404p3EDcJ7hnuGCLM61eYt3FQOZpL1UyuYtGhKHiKrn4HwqY4QsgRAK5mmVAqFi/If2S7MQJuBMIZxOJixjeKKi+FFQ0D2LUDAKrTeWIlvPSb0DSz7iEdrRmGOPAczsyEYE2EGqW38RNVjTS6AqZGnh6Yikuo3cLaGPS9syK59RyeWOKbh44YLkWYx3GEDHHDGWiqYXlYAZvO4n4f8sS5QXGJZWoy4JtfUYm1v3zGSfNR7DmDF7+BCkVr6jJZicTbCvv4ZLLvmOZTKimrCWQqwvKswvDzMxu+BgqBuNA9HjKV7Mf+S9Iq1QPC4/vmPwPYaLu+YI6q9LxFgns3X1A8wNJD9Ty3BB7iZrH7OX1Ga61rTxEolmniJXJ9BUbvUxhuUQ0mCYCoxaVohqd0LFMEyg9FRgWYF/BDF1MYAM73MuAjQ7Y12/JCnEZwQATQeMsRtwKPqOouK5f1EG4mJdSsIAqHZPnxLg4OA0QrBxMEcwJjRYFmNX4upfVczImqgw051PfuVU00cDaH9fcRMag7ekMER1vD6YbF2XhD+IWtLjf9P5lqNapb9TR1tcMBUYqWfZmcOX82QuHPNwtS0L18DMsCg7hSz9wRmLGdnDt/xHyGqxQfVzCLN6OPyRSOtTFmAqbPuXSSi8+Jb++0QeAtYZHUEFFjsaNZ+K3RFuiLdEYS9p3gyEODmPL0bqJZeJgEf0gNgzuV1weyVCYL9eIVpzCjQscWaIlWWmYCtw4vJKsNIZTv1HVJmEIrLI5unqHAZQLVc1HWDRsgUSscQSuRxmDJgXDV4vti1NwEFNsNvcpBT22RfokPzhgRyk1IdM2EYmL+JSmhAJuJAApRrjFxphER/YTGXeVMuVKcXZEG3YHbki/FTBEpBpcRHInuMFqXiDFEM4IGveaKIPI/UcECr8DwRribl0TAVxMBA4yypZtXWYyntjdy7Fog4jzMvCYhoMvNhheJcu8FEwIrilTTEbKIXmG5nF4v3Eqv6jhLBl8QZ+C8xbgsHcsQdgYJ6m54YLcSWEXiDiUacjE+Msakr4JY41g835gGTHcGIPUv68HUWG/hamGJiBGOhdZlnPfwk2tM0IXdumhjdOGpYQbgsm0MIAR7wL/lKi8D9wcAQoxuDFkCi/ma4A4Bi1b3haIiyrMQkR8NjdxCm59zbWUhU+5rhlrX5QAYzMYHk5grCuBgYVoY8RYvwG0bAGcJRM2F9VN8VSKnWZUMu5k99SgDEA3WVf03EkGkDL/EXAGysJlmsqvFcsslUSl3H4EftlCAXmLV0w+/+EyXxFRjn4UYoZgMAmZhqEoeXHUwY3ZkzZ4SP5hoitktKai0QX/MOJVJxLdi9L5h4AnRVVkfFLCNZcFAd/eP3DhoBYJzn8QIZjTaVcYJVplGGrfgm1RGl1LMp2DL8BHIC1Wr4LLti/cNEAqXpxGQEnmjxFiWYUIsJcpGiivWL/URSbhv3KgTyIAyj9yl64IDAzUGyrCfmIoDwsHiW2/cC8fC6mQ7hkzinIYhUNFeYOZpEuDFRmZhtiNmvK8vPwUudEWCahObAUZKaphy1LWseldRtXQzVftjmgyJtsuFchLo8xHtKQYHNeyWCbtmj+UqEmcRVGN5JRSOAjLiQKcR+mCJYy7Xn/SLeztFp7NkcGTNKvf9SxsJdqq/MuAIeuJdt49vaWmh2xvKPNQfBLkV3QfBX4ighamDEbM5Bw9zYnqKC3DdxY5EBFDxdzwv+PM8L/jzPD/48z/uP7m0idwd7kcFTAW8tVcVRs1uM0DMyx+Iw+WIptWO1ms16fMcIxbPEvW1rBcRLqofiwnD4ilr7R60gPQ7ojZdxRYWooLBWo1Vqy2V2CHvcuRs5rZ9MKSiqczeHxcNwwoxEF0MWOLNR9BdpzLpd96Phm4CwavnmXAN/TNEhpHHOaBVdB5iRpxKPolF5dzAJ7IlOIrQVgbMShadRVBF5eVErQjkIPYB9I7zG3bAzBAUhoXUWoajdgUQ4jg1wtiOYop4yhlkqt0ZaggjuqLZlbu+R4ZlgpwbiyBVFqqCUCs1yzZeZRs6iG2mAf3CFGVRDLEr4IRv8Rw2FFFIqgbjYcN5uBUvVXiLsEjuuY0wKhllS1BS7Qjlxzd6gaqRzfEVkNRhfwqxDGkwihUVYb+kGkqTTz4i6PqYRWx25YZdJyTK6mFRbmCDcW4FRqCyGh8wKjqO4TeU2w/qDlY2sj5lXNfKsQT6hgWCFRc7LS2fqGVxSipx8IjcUZMQBfEVFbrzMma4QoBmc3GZ3ldr1CAqMiblpD3sMWxlATTDVcPqp+D+4y/wim/qC2vMVNlepU1+JV/ML3uKrIZpthXrItgQIUMntiZQeyFmoNruoBDBqUkK1cCW0QLcFrQNsNuAB8RQfDbJHUFcTDvESbXpmUxmkYy4G6OIiwf0DBSy4f1MvTOpk8UKWGYaVOJ0HLBaEQKsaxfOoKS3qZqIaESpCWAQwF+JYmbFYrgzTiOAgsV0YjXcH0Btt7GD7ipFXtzDWOVxl4/+FpgFV0PHqW6cg9k0jAnpNJdFQaVriHFtVDYLvUdGXkSGm4+Iu2DUBqgq8sTviiHUBrKWa2x+l/x0biYHQ1p/EGlQNcO8hiCQmIA9EIFBy4p3ctydIK6SNvC/DGyqvUOjohbhncsMS5TBuIqrZnLAM38Rl5a4xjlgcxWYT/qCJSLwYqWJdzsKR0Zn/H3LCaUVAcHAq8A9IuUCr4WfaUbl29xQHEalczMGgrdxLeFy3yP9oZYd/M+z3GzuDaNJ/cUcnkpH8eyL1YOMTAFkpwdQwpndxAQDL4qDlMEu2XiJcwuKaIixK0GeVPLnlzy4WLs5W5YWEJhrHiHAM3ACKiznyTEUddy98StwG5UgviZJI7lQKG6U5hhBbg1BrNJcvFRMIlyqw54hQTVZuHgAYrzEAOGJAqMrMCO/hcy8VHeNgzrDxBdx4qgurxHqlwxQsyPMo4lklm7kZk+olcjW/wBhghCDUUtDUFz2RKMHqYFg8RbtFLc/Dn5H1LvhbgKyMdwZUoIly6rbQQnAmgMcvy1POzLQNM6JvSdQMTcTVxuHlHv5qDeNLR9cC93FQVaEovUEYaMWFqcrCkRYZIlZj5QIVfRCWEc5irC1EnIOYoqgSc/N1BudLFcPuWAB72zEV2lVGG5VRYFsY7LnUY8HmKryjcRC1QsvqYoIGrRyQQ2YqZVdw1KBC7Lsl5m2JXwDmWEhbKFpBCKa6KGVcGoXOpegOWCq39/BFgogwdFugRgkVkde4O8epdb+NAm8So3KTaIaahJPq4lFpKvX8Syy2u45a4jzU9ZWth7GYYgXOXG1HRcdm+2IAti7MUgFGsZgAGswVtis2tF7lxPMCm3h/LLkanMAEXDLuKFr9S5sFWYVrkFasdYibV3Fcog4g15Oogv8GO0WH0eoSAVeooG6hjg85xEhd3malpQvIQYITbEH8IwcpXKgf8dyinldcPKV7/bDJxG49NCKoniCmTfEbymEA/cpEJW/E1gjU0e7Zi3d7mbgxzFsRoaY7lSlyrLx0l2GR+of6gHSYjo8z/h9x5yo1M/+7DNEhuQWU6jgLddVLEwqUveJliaqpSql+0q7NvfMLxGFi0PcTpcHP3A43VLcyk8jWohRQYGqsi1O47Y0xRJB05jVa3PSJJWd8dPD+YooW7tYqVKBmm4NygK5qVlgxI3iNs0cIf5lt4mh8A+A2BqaCuDtiZnBc0Yp68RTFi2fcTsb4jtU0doce3+Iz77iCABb1d/b5iEJ3W7IGsRmAXrjfaHMM3mdp4rmDK4F+MNdcy2P8/KJV5xQpw+6Y4kAaONEQQusvfuMXPFG2YgiPKDcaHoqo6OuBBFHuVDDLQNSsYr4JZFUt6np8LZYh/UqdXwDVRRRVljNOn1AKzMhhI9OCD1MjE4A7bzGULnUWs70S4ALGsoVSy7AEsf/AMuziK2ES4bBNeZjFhjbpjNYllZNxLou98EVoa/NwVYC7Rck0DZFcge4KY0cwUxDHPwywUO2iiEVx5sjtD7m9acTnGo91FEpamE8mn9zOYWjdL6PExT9c6eoQyCIWH3Ch7NmvqRLMUIsHVw40szgl7uPBxCNlSxFEEwkKePmgWJINwQAUaA2y1plhwHeWLhcFV2C/uIyKNq7WFRcfBzA6gIA4FPTLtDWefv/AAiAewmCvRFsaq24hGFszgAvmDyJRwcwG7hqD4rFzcK2gLiG46lrjkG2EVy6OWK2l9qGqWClOoxChWssbKdmI6lwuIEszmsQQvU4nEPqMzKd3RXLAzBYZRVF8w5AGxtHivr9w2tlQWiEgDbKPwB8UfNMxV3B0eJvo4lryVFga2W4YODTWK+BuDcBfqPW5VqUaqJe455ljNRL+NRLlyHwlcoDKsYpvEtqYrPqGYts29Roc+4qwYfEJqHGm4/Lg34lBRhkg1bXEZjIcRCosaIW9Vift+Mm6i7DeBH8ZOmLlCIdXxAOgy6eIpLC5bqUNTHGouZm/kmfKTLDeIPtH+1oGl99R7fdn+dwdI0kw+o9GpYgeFKqFOK5xr1Z+LiIC6G/tIowUAR5sSwazupfJk9OIvtBXjRwNnmLsBrAA1iaIsurl+GKZxEvEtWZdcI8xKi73kd1Kb87m9kLcYtKBf8AoYpzWZlHJ1w7Xh4iEGGQGGKoobKgZ9zAzGSx3oalj5C703zHgMeRFMwVysEodNZwYHpg35Y2zQtGqiwMdzSGSB8CoKGVYIDSoFURf3uO7Qwq2PqOlAp2rY/ThKojK150Ipm+2fYI4DhJdwCLK8c6mGHco8wEwEW4FR4SqA5ZRQNW0ll95f1KHVIuyuPW/qGt2jQfcCMliJfvmAGNQqFtr1M0ft3rtcy1TgTsU7YZJZrN3CNi9E4PxGVgLaDyjhch6Zajou+UmJj+Qpz9R6glRDnX9sQCq2R7OTxEhhiku4EGXDtMFpuDA2wVCZfgQq5Ect7w1FxHKKXeI2jL89Qu9eZV1cIn17v9I0XQp4HqVHA+hOaFtBxxNKiYvqIYtL3LNkMHqI4bieOKTZM8PxT/AFEs3lAgXCEEig7OoSuHuCYhVEPmiKWvKEvL3LReMVNwGOY2to/MTccfjYkzJe4UFzVtu/ESxVztlERWtu/pmOOL5ii1B5X1zKHNHA0zElMxWxEim1gWfAWIIQS4ysp78nxM0uC2a1BEiVhYM6Q+SXAaHJKPiowYGobqFbZSDeoYFr3BMWacleaXUcgBw7NeXlhL5X+CLUMziJGz5LaN3fiUgcxBSu24FQosU30dxBR7YwRWxUwpnMz3AW3EdRXMIXcwQu4uX+vkcsRRqG7jo8Q6Id4ym7qsBYxGNrcWaYNxLnSYL4DbFn1blW78evEsHhsYuKO7epooJrDOaFEKwt4l6zFXD4MG/hYNVmkhKMsapfmC03LFwxMUlg7bgZAOWOYye4NyWFmOoaYNvxzH4WmApcpAQNNcSm60NH6ixQLgfuaRaY5fE1VQnKYeImEXHWruGpdOSbrmXaG1HMD2iAgBycRJaVh/Moii4O/EGwYeHEYekjFuTR3KIiGkSKzQH1KCgEBhVfFkpSzNR0ybaJTInY7RqG0TmhSkCnUr2xWrpsuyNNwdtCv3DBqUGKedS0f6YP6h5T39J3pQ8OJqShP6G09wpxoyEt1fmFleb9nruUn9dRMxv6l6lmdRrf1BGTOMAbthiBBygO2IZMxGSjmJj/quGG8DUcCirSiY6FKd8sOu53CnuN/9yQmeXlncjNPe+pWHxgwKzLHcdg3IOfD1EXZC8+oqGCo5L3AohuBgqaly4MRVCAxUNBcc1PJlXAgyqxDBKzUUBWdd+EDscs4HnzBoMGC4TUqGA0zRNnmKGR1YQECriggAZevwgtwq0ln5mWL8Vg3XrKVALEdN3nt/UdlzBEAtXzZVRf0VR8kpYsLbu2vNQlRFZsHcrmlfcFZgsrC7lCHDD2JXN0NyMc1qmP2Mdu15n5mbBJUIkUKCrwRndvjfJK8BUoYSFCX0NHmKK751QFcrqNZG1LDCXKDRFWgtm1RALjwLYmMKACfUalUrMfiMmwPGo2g6rgskvUG3GPU5oazv83EAQYFHnuP/AMSrVq12cAtr8TNeoYUFxjqARIpOjBeGPRC+EM/UQOzpAqeYzQEuzj3NowWvEVzSmFWwBsHpqDtpbTcrsCHan0vMw2qSCbGyJvbRzESC9S7qUAh+A6lqxuFJp3MJuC/AITchuKBiP6gwDQQLKIcp/wCQTHgpKTsgvY9IW2TUZVjaA/VxApZQrmosyQZgo+NpeIBYTiVi3eEfs0wgNkA/gnIAazbu5QcDVldxE7ZQ5E9yjMM/iajAPQCNtaFN7X9YhkMu3qCKAN0LfuCp1p0QbVdh1KslUQjqXPCK0xbHoTu5SvSnqGZatZmwDCRmA30AwyjWLydPcEqb2qIUzdxeouuDiVe9zBBc5JelytJw2ziFgVDDsQEsLbPIq2AJUqiW428N6lQT8kXMzcMRpbmCWlXAlSGu1qokazEFC+JTRT7YAtt/qUVB2i1mI6gxZKLnUshm+n4lhSU6qUvGDzBjcAQpt0VuCpIt3T8QUHUKCqeoAERvZ1GoarqALcivKbQLYBg0fCrhRmpqVB6w3UsAyOZlH5QYbeLVKMUBBm2mIeBWiWVAG0uO0uJcbi0a54naCzYeYDhvxGupIDCrSoKQKOUX1ENXRBXsNlwj6XFcsFlBBLITZDG6c4WXVd2Ti7AuyX4hwhCzThi0mZVIqjF9w9NiuqxKatgHOI5VgsixFvmIMxZmgSsWtdWWBXf6gvOqlQzzsGPycQkABQp9iP3k7TP5grDvlp/GoROyaMQZNDR5jKf3DV/zDmBzSHBH+In7QYiLxBU/6XTKrOyWu2enEKOA4XbCkRxggtjRmorozWwur/L+Zg7rNB62lmmLQk+qGYs1Ydjwdzh8V0F1B+G2QS/HwsI90H4C4VzBQ2QfhajukQtIoOUnm+5lMpdEvqEZOBKS4WacjBtjLuM8mgCnwqplM7dqFX9iX1t7Vt+3mOCOz1ChbjvMCEEJ9K118PiiibscRAxioRBCMlKzOc63m42y1YybmLMUsBjVQV+yBwdRxw+g6lXeh0bSVRCpujMVi7b41ZG2pYWLmFwtN6jiQl01HmNWe9+vR8xsyYVpSvbkO5Rq7VJXiLuB8NC+JzrlYnDs/wCuZSqKLQ1ZYXxGpzu22ZZWqvmZGYVSIH6jVdOC4NeoYMXMue3wGEI5P+IWwhpI3Xdyt35YCL+YwoiwgpvcaS7DAjEojSZuUTqcS59Qf/JhHUVcRSoa3+JirJgqdtiSrZow+JlSIYBTuW2mzGjWvgGaY6hSXmyalWqAWihs7j/cXqUrTGWY0IFgWuINsuFygW9TcTczQ4H5iaByy16lip7I4nu2w+ovETV4BLqegLPav34hhG2zC/iBS/a7H3L2oAFgPI3mobvCDA/zF+L1X+qHq167bPBVQC5nlewNExSOrLX5jMSlAr3TIEOiAxugXwfIWpSURkRAZ71BYwaBb1CnW1FNtxuBpc7i4NFB9lyspzxtQUsnhHuEXpO8jEJBeA/TKjIttSFRX4Kz7hWsViBbI2rGCGqyymYUG6yW7iKtCuT/AFHpaNXYwHXJY8pUptqtH9oiUGxMnytFSvlQFZNVAIDoXtlQqXgzGAFt9GoqsQpIuOj4LOpWZSqZLE9cRqA7BHmtShSueD4J2eDxNstefisitWvMzRbUYIpeZlJ9pUqosuVmab6jViztq493QMPogkGdMCCFwHcA+FqCWaUEx7YhE8qV1ruMsFTDcdt+pW9b9Rkxi5cRaecy9f5iWLB4gHLT1iRS/DK8vOrlvDQUnJjMdEu3O5WlcnuLDOv8sbBqXcq5dMtAgZE7OkhgLIIsYd1IxSkr8xzVigDbLvhKiy7afTFhC/cdn+JqCJwwdh3HoYN70VUh2wuLjxzWj3DATsNV97fuFACaEamV8znxCSCroUx+dRpd4HZ1LgqtM8Q3zVifqFzBCXgBE0XmUB/mcckIN2/6ixu4KvmCjrKqK6i/6+GIjmXPcqRqXbK64UJ2x3lxEsBld8wqXPmO0uhfMJnIFfNQIW5TAIxmKLzzBaFwxcM+LlLYkQriKwHs4C+x8v8AEpgMNLgCz3zGIV7KbZo57xFTUU7QW6hbIArD0S+bWAE5xUbjBxKiBMwA0AXIwqXKa9mjyQIuwKiGrLzepchbaB7H3xNPKyJscYYlqDfwNxCGJg4iwm0ZG4ZyofJKtfuI7Jd3E8Ko35Iogi//ABuYB0k2bA/mNu5MRo6fvaZ8NXCFdyb9HphwN2U0aPU9T+3ej+UdKA4YVYqIu5qYg2zO6go2Y/BbC8Fcy7QeHmOULLN3LDCAGBiv0TFnFS6vB8yjOKepk9zbOIVD9QwToxWzcWWXMp7WL7hly1M9xOW45ZVDUrMVgX8UGJYzIGr5hJJS5yxGrv4coFQfeoXqHMG4WiIqxeSPeXQEBjeBOSvUCpdWKepm7Ym+1CJWrb3HyeIVLd4Yp+g4x5tdM5jS7XyqaH3NiLhxf0Sx7KsXP7R61wHCOq68SqA/qKz6g9Raat9pA3jGe2yKra2x3CFYKZkaWNODzDiOAYMrwe5cboroucMA4ME7wRO+GJYXJGGMYjBdEDxqqg+ZTIZ3ErmaTRAriLjdRMWDVMQztDwvuKswe4JaLyze41TlOSCqdmCAynSUktK24oL+YBYRAtnErDb/ABMYZm3iE1lm9HmaAzIg+kxumnm+2NOYtxgBq+5fp1KQBcqfqLLyr9xXdQtDqKBZHruFy6ha6m0CQrXMWvgNRgCjyzuFTIVW3LtsHcrQKh+5c9PBUySxjBh8GpYbFHwyyMIbS4t2CUu+ZxQGoCNFsKpDYnHcDMAhU7vNQFC2cMwSrzEYobW/ECX60uCBg47i7wH4hl3LtgxBmVviFBX4JavPFzEnWrlShQuHJBi5b2PiMxhRvcSu7r/LEQNxbhGlw1o3LcwtSz7iX5ORh6y/bjwj0CGs/wCJUoHyIiVwyMJtb5CCSXK15uUICreZcyVwKfUwch1w9kcYOxaT5hFWdK+txgWu+YtcxzxBtvBG3CUAypCC0fMrKXWcn+SAilJVi09QQml4T6G45V7of5rYFrTatcfr0219S4OW48sHpuYOH/uUZolhP/YxcxWx5l1XBIN+SXMNHxWLmWCFYpsfURvKBV8J/wAfAECyoUlRC0ueO4Rq33EsipLYKRuCGFFV2mluFylHZEEBkLIQZwpS4tA+o3fuEnLYKbPzB3LN24xzD47x3hgNsEtKOIPxebaincZCG381DcjDLcxoo9OtwWFJbVSViXtBKBUS5r4bGBcA6Nt8KZf3Uc2ytwGimZQuo5W6cl1L+YcpUNlF+IAyqSw2vREHkpTFGumK5Tf7Y0W0Zx9JD7q7z5RkmbnI1eRetJljI12YT+Ivv6HT/wCRLiIgMCXiY3HcomJZ1L4AL8R3QUGiYMOfcu1nmGA8zEP7iFvUzCYkc9QwXqNIqRUZeQbxAzKZdYuYA4D1C8lXmPkV5hmrwQG/kkiuXmVcKS1DuCJuh4nOPk2SpU50LOYUcngJcmBsUvfUzHLlaXeYNLODUuXDaA+5ciKtx5j6NSi28PpjbVhwRmA6vpPB4SZTCrsgrYtVW4jlOsowqBeMgeens0wpFYaZPLyf93BqOUGKPyez1aBzfETWwxGZkLTPqG5dVQ8O4rpK465l+NXLwRdlhZ5jSJyR2atW1FuVUWZxMsuretdRLlYiNwQqS8yIXemSOpm4MIcwLQ1A+0rZLYh+oLDlA5lII2BxMfUV2rqOxiYg5h+UvOJsKLBIZ8jqXWFSu0lKfmI9g+kl0FkOk08xtAoYxVxCXyXEGCczp1Bqf1AwM8DAwsZaI3XBfaobaKzYEpYqXsOzxDMfECggrqtQL+zEYhRWJWohQW8K2tOFy2R6Vw4GV8TO3RKsSDblUyxZnQLxGS7HH8RIi2mOoylohF35qWvzL3eIGI/qVTkgsW+O8xkjAYc9RpanR07jDl3xEltuG/bLtgYhlmHkuuI6rz+o6jDFGRuYKHDzzEUra+ZgxwQA5V2bht5FY1CAoocPEP8AcDmdM2jEFG+tQcbqeg2mmDCGsrCLdOIt60Tg/cDDzmWV58xAZLRrmWL+Bq4G/TcYOTysGW6G9RqpPcNeYZcv+ob2Skp/zMLChUFsF/42FpOMYjzKMxI9jOD4ChZZsqdu8dpXUbwD7XqWJr5jYD1r6lvlyjKXwpxNjroIxSnSTBdLYr0ogoWk8stZl8DK2pNNmwqyzzERJ0T0qH1f6YtMjfTBDaReIGrpruVjIorw1AV6XceIDmsJr6DuoAtYvg9kNtNmjVbUYgB2tVKkdXWTuI1wY2QKXoAhFh2eLwf5hzWIZT2t8xV6wDo+0gHG1fY8R9cw/wAulZieHYcAYItbCzG/K16H0wYlOk1ClrTP0yiGV5wq/mH0UFdvUFBqhw783v7mesQbBPFQOrKBf1MTVwm0U5/X7hKIW2XMYmba6Zm/aivfTHSOO5DcSJfT2eHqKHO42TEK7q83/iVGVRpGVMrGoH/VTLlVSLT6uJYSmBvTLCUsG/EWv/i5l6htrUNq3LVgjzU4xYVzFfuU8wOpajrEAGqXmabiXR3u5TEECAVKuDNTFaz8HxpjCj8Cpr4MVWBAuXZc4iRKNyiIt4jKrAcM5VMtRSnaw3eYwjAUG65QCrdcRqUY8EFFCW0QDk+ff8PUSjgMV1FiZwShUH7SiMsqP07X6jQFkLgGrSih2rUsYF/PCHWSJ6GpBdAZi5jtNO2Xc3ZJagLUTPwVdXXuVoHu0zgPwfi4NgwpA89RnBoh4OXvEvHK3c3trj3KpQig6C1gpEAu3jf6lERZLCJrP9HmWRN5FfJREuK6sLH1DK4l/AUXJcDGZQSnXwYzLK0WS25iNSwAu7GWpLfBEgRyPL1Ei2n8QCwEk7QZiYcxQxIl621MEGbbXiBGusQLQ248SlqAjBLoNxczLmNq2ZxZGCJg9kABKa6jiocGClrFVKrxMlUn3FChYPDKvU1EuL8xKSwFF6irK0WaX3MjjaMrKZhVdb8qjYmtVcIXHsHNEsLKOjUDBF1DQLLqyHWbHBW5QYaYqY1HCA+2CNR2YiDf6ghXHPmJk1grEBbtlqwyPTuLzLaKF5/dzEoLZuArQMcHtgZUAE6ly9xN/Hq+4dMQ/b3DUfgsuoPYB2XCK7dkaytTuxiy3aFa9kAUOpX0eoDNUqxfTAatHNEWnuIpeaiUR2x0IaCzcKgALV0AD9R9X3Gqu5dzRLZix/UFbgmhXiNodSW4Lh3/APAxtu6gPgArLDS6igpCwNnkMoI+oLeruPb7stB6gwTbRl/iCOXWX6Hlis7NmfJeWBZaqPfvygTrIXHks/jEaq6Z0hNYm0YfZF+LhZYCVXM8x0bC08MsjQnI7i7ZjLgBRdQ4TuWaRSgqakUAKhEXXUAEdWBbx+2Z0cBX7SlVeR2MBwG15+pgdpoqPVbxDe2JVie4V4QSLQRnGIO7ExqfD+ItulvcsHL5RUTuJGgYaL8xKnVlWCCEI60WDqtazLj6/uB3njpIO6FVFt5gNxYJuEJxEKaPyYl0FvB2TJPGLobB/E2WfA4ixZM0JakPLG0gPZiCfadaWw0hajj2IiMbGy9Vj9QcHS7YB6uY4OD+cLgxxRKQGTbQQNnhiBYgq3J5lJEHURSudsLNXfEXJlhnfHUby3w9oiZx9RU3PuRW+flhvPXmCku5hV8RfWdRtfzUEeVz3Fq59Ss6hLr4CiO4pqX8LZmIdwAS+ErKAPJANn8UdZahNIbjMhQ6fhJpiVplUZ31FlwCl47dyjxEAJjpksmdLHu7pAS8wLgVD+qE84v0Yx9E9gwmbFtQuh2y0uthqBLJ4zVZRCvyc+4mHYZLB/mIYs5OHiNS2G+cw8dxbMXwDmDADFDCS5QdhOIVAgKXjkxtqmpe5SxtSFWw1FsDVU9PuHhasAvj7SwGTRteXbHJBRd4Bf7mUxCXJ+woPTETQ2H0dkBb85Nfbp9blaSLWjNQYvUrv5QTzGVW6wSgm4lHn4XEUKVDuXyiGm4LcIKo+sAtGWu437mK5isVRi4SqFHBCL+CUvMSWVGBbGV2grrzVQtaCkENYYJbiamJAv4QG9cxvOrgVdVhWkHYpCDiGkBaGY+Ct9lXDcdy4jIn/rmSuYtrxLDW4LP3jPnt3HxSmH77rJVNdS7omR9VUp95czFZcpiHuNTPPEp5hh/zLL3LW8f3MnryxKqolsfzHVkp8ksYbhqWALLaX3zGJ+z3ASdNShBv5JLOKNsweoDoi1BsjplpEuIxJqCHxFuWyFDpwxTUZJlGIJTvh1Kc0Qb1ez6biQx+Y3jf2UBHzQaGx89XTCqsApSJh/iDxOJilJayYG6tWoca8x/aJJ2G/wDf4UQjFZc3DszcRbLaBasMGladnmjcrc1qZ+hmoUb1A/4SzDvcq3/JLSoPZimkpq0JfOpv7hVDSGaAFwXlA76mESBODCHTFugyw0St2uokiLcFxaxBYdMd/FArX8QLiWNgkcypdFeCFb8svT1jEJBi9NtMLt4LVLR90jBw0LKNnUdHkO1WuYkG4221/qU80rEfxdfqECqVXg/EYknKy6hmVgkpKKnNbnNf08xbl11/qIpIi/sQrt9R3dSwRNC6EYN9sl9sz/G6gORiAFCbzZPXmXbIaYidj+ICamIWy1W7D8/H1xC4aXBhjSN/8Kg0NVDQeFhdU4fjKR5eqw1mY9HhCq1r2wmkNVQYJuL0eghZRbTUUY3E6PaGUeXEjavZFXdRukG+4agSnxXIffwYYJdSWxPyyhxLMXC2oKSolR1mekDGYNePBC84jlBzA8xgVNIMS5iTpiYS1xaIlYlPgu6DkjWQaX8nDLoIpNwXZnskFyXMSViBXwVNnhnmGWOoXQqUejUI3fFhrzfmYiwLWswfiKh5G44wWA1TP7uWDmLy5qAO1wZSOnezd9RjDChpWCQVe2IKSW1kPaQIKlvUEwc4Zpf4lm5jTbdVdxlkVJWo8IaSlvzGWotNf5Vc5yoejkZhLoiGNVgbcwP7fEAi2pZSu3mVKlqurYjk0Hn1/wARhFG7/MdgaTmIhU6YoS7lAmUIFjgx7l/C1qZNQ3LZR8OZQMaxtqMv1EiIIckBbc+osxyWg2BSUxqHolISmDb5j4g7bdSqgXEo+LNXKc3Fx8C4MCFvJx38K7i4Q/IHJEVN7myZi57l2xIFReOK6lYWxRW1jZwV02fiNxaOaMPBol7XOb0R5jrjAovJNnsMbd6z3LO1AW8+XzN+5xPB1qNky1AsiW6gvpg8C44Gyh6lnqYnhtXUA0aKZTLLeTJMgE7OPqX9pks74hHGJTh/zMgKsv7Y3hiPtKVrgCIEZcnfmLu/Ua+DAhQUhAc/CDv4VI7MRmkfCpcZdLfVRoNiCeXxxKGMuKn8xZY0Ddscx7WHsgQ1FAcw3oAxBeL4xOf5qB7iRW8wFMH3f5jdTK6myGL+kO3dmY68yo/xAJeIQ/48xgSxtrn/ABMNaFDbC1cNl+awPywjVTLZXGgfUr/zVX6qVFJpYv1A6wxSf5CJ+H6n5iiVFKP5EqIksmAlO4wxJFIlxSayrCVsmdFVG11Tr6hi77fcO/GNcxHSI9MRpfOrI9YijhJt5jGn5l1aDvCp4bVsFd3HDkVeSDYzhxGgB4GT7l23zHNlLXA8Q5qA0qMXI5vULHHgvUS88YIrtFbMeJc+SKxNSiEJPIjHmZTY25JhSFl267ilQYRKSEKiHw9VZuyF/SVXggJgdRFOCaq2Fft/EsY1WD3B3HQbwxGGEPaABYGDkoBtjhgJCBz6IapHlQv8w6bBsuv/AGMoY8NTPkJkeo6Byia+02CjljL0d3+pX6gLQ8lhgUDGlecrkjZp3FF8EXDgwyZdBwjM2ZMyzcw/qGwtSbGpkO4K9XMcjEr4fpKWMVglIqagVLnMq5x8UMrABdBCxni9RL1GQomyVTzqARZu2YsbacLQulYSAsi4RfDDdQuvks8EOrsOoloQEUglWhFug01Pf8QfPeeB8MRsKDxeYxY8JiHggHSv9o2sr3EDRQufoS486TYcV3LPABMvkiqnadB6Lf1BytckPyX+pQbXOKPIRgpTKuFWPmwKM1FAeUSurhm84OLVjFbtdsbMpCKHLHz4ZTn3uP7M/qIf1tcgcpshzcjQEFzVaKsjuYwqm48lKwsTn9iERqWiZCMtcbeprnllF01+6l7W2kEeHsiUXUhSRlg9pwIT9EpxWl2t7G/1Lj6nH++P0Y6TqWkYr8bwK+VAxLg6iBmGy9XAtou3GlP8xQBRQ1fcRdoELl1H6DWDiCTYX0BqCH2ZBQdtTBC6kc+ZeJdQbgoloCmZYDVGkW/hqCI4Gr+GethcuencuAEJmhxpmZgZr4NRl0DTe+pY9jbe5Yy5k3sLcb0MHFhaUA4T1FhFAti9eJcSOA1fMwWoLLuR8Qv3BoRRPEtXUqFH3ELszzC5aBtghR6NvuHImpP1BIMpcPUMCoG4rzcRbtBZUQ7tO+7YasEZPvM+AgXGglX5e2F2Lcbg4qKxrhhKqVTiGooFxtKKIBb1K9vQQJVC89yvS7pyfRKKvGC4gMosEP5S4vi6NgfZ/wBiOMOmsHsldmU2uoEcEeFOniOnsw+z1xKWhVHTJdeZR4mFHd/7jJb4grmGv+PMO8BmW5UoHa9QVgBo206Vz+CW3JU37oIxOC3U0vwOF33HpD4rJUA4v6u4ZAvUKZH1MlxJXBzNUFgLukwHNYBbVP6ghAHi3xdTJkDhGoHpyNF+24uNWGp+IUpgbwyqIG6N39xNqmHZO7iKonlYtkbSkVrMV7zLZG4GUfA6hGcdHhiKXkmYYfhpmBGjKsADVxIjYQhsjYYpVx6Rg/zTuAurxFBSCmSec5gtAVoT/MSFB6VPDFuBLoQ5on9MYeJ2vfUYLSVZCY5yMubeEFv53NRw0g+lv9wj71kKe6hp401fW5gqw38lagAF2Ok/65lOqu831Msv2R2mJRFHJLUgIFn8wGKEXs5RBRzETsOtPBiuYRthb/uPD+P/AHP9T/3D/R/7jx3kX26L4L03UqxRVxiygD8SoMsr8yjFYl5iS/o7mTUGjiK5xPLM2nN/A4IQTfMr4u5VS6jyNRamrOpq4pQXZcHJkhRmeP8AKCVrpGLLRFlNnPLFqVdtZ9Q3I+a1Fi3De4uEsMrWiCI2rq/CAwNfaxUsnLRf4TOsjwglmU7Zw2ewWhj+WNOAd5RrC7MVEwHrNHVL5h1dq2lDSNOTmC8DXF9DhKRWTVgsXXP+oiLqKH4l/wC03MCIALXRCX0ux28L4gUJUBwHR1Gy0JqtTr8fuIRup8Lf9xEtKdwFwFyyFHqaw4hcylW34Y/DRCBho6IpmNYFI6iYm4Goty8TgvC5d8cXoL5lYwTAjpULruorYQjDwN8w5APDAM42upd4ahl4G+uyWj9baFOF5mJ4QBB73EapaLVh5aHhg7aaX8nfX5Sxk6eS70JKvMaQ+AYLm8IkGotH2sRwQwaEstw+rlUPlkZi2K2B6ZazFVS2PEQAXg5ZlrgBOCIQaPsC7X1Ch/8AjcTeovYqU1A5igKYdMxpzzADbL0+LDEK2uY/fkg73C96iqzFOebx18XiWx2GKqOUho2vRENn8m9ygKNVy9Q4wCI02f6jG8FrE9H1HKlahS+WOIdkqc6iXYvxBGweHUajdlpLVf4ihQb5mqCV9xbqo3tu5ieFGMdwANZqct4jujhhSjuc0kpLicq0QBEwLMUC/PiNaDseB2R7m0VS24NkaIMqJ8M8BKqIYOn07+o0a2QpJ6gL8wMWFIsECBw7YJqyixOstzBH4YUe+C8TIzF21ALAizCWWfcIGehunaY0ZmJ4xBjVkDZBJ2b5lAlcEVgpoKdFbv8AzLErzag9ItZsg3X4j5nHIFamJHEK4m1O+QC1glBsIm6jwfxCkVvwNiEqMG+uDsfxBbVOzJXcMK+Fr9RS9QFgVuow+UOAcm2G9gsrbPEpYKzCnW2N2Vcgn8x3DBlTM9kHoxTAseX3BKzuZEKTIm0v4Ic1GB1Q8NWeo7d95qAMR3EaBe5d6rCO1Tgl2LFwSrlblJ5AoemCku5YRb+Eb+Cy0S7KbZYgdOSnmCyi8lKSvWSNgz0KgRKQo5CyW6Fiav1HNIGldytl5cB6Y0NzBvmei7tHrFXdmYFizJjbpgv6lu1u2cq8xS1Zh3LyVpkP3BlrWWVVa/iAVfxJ2vxIf1qGWOh788e9QWmj1KGo+yFgh2NE9kUfIsv4DzDRKXiIR27mkEOYNwgUwrcvG4lMcpzfAx4iOBNQIF9kduCiN5jtvFGDfH+JfrKp/wA01vRaIuUF4llHMdwc7j48CzflNqZrZ+JaA35gCdsBgJhCG/qC4lFmBIkj4i2hEbhbg6/MUnOwpPgC9UXCx6bNsq2xORujg/BKEGuWVqinB/M3l2xKhB2lBAxi1fNdiMUotXljiOYXdIvb6GP3CaBQyj6/cKNagR6av+I0FDB0n3/SMXG21n0gJ9SyyRQXuGcyjBMCy4srUP5mGQPBeIgga3M5AGVH8ykPhX5Do7vUWXRRia87MTFu1UwK8qlPAGwwD0RQxadziMAhdEMUL8RLQD/wIvR9w/EYxsSqh9JFFxG7FGUunz5O1sYE5PAzRa/V/dSyBUQNRa+N5pH4zht/EQWyNm5r4ljBKxR7Ixaqq11BObUYUcDcHCNRrQ46EI4LhhO5pDCaitMuguMwpmrbGLYMLEqJRqw4hQE5LutQ0PFZnZUbap8xICtoNSwynJIoHUpISwyRmWuBNSyT3qNiXfmUPkUltxnZHdbGzFzXhLDEW7uW8vIygrzpsCUHM8kYIwLehMzxaDtSKxu1216uOUC22oOIJ3m4yNqcspC45UoYXVwdaKY/ZETEld7mGwjlFuLieDVyeWZFPAtPmDLodZBiIw6rsrkjnSUwbI5jjqCptUdEuMSEpo66hpZJjT29MqKECqodXMZCHq1D6xK47J/YICbRkWXRwKDqZ7xqMvriCtTmEglZGopAuzQfYjM6hOI8ulwAM/Gzve4YzFC0Xf1HOJuoHxKdgaEAq3y1G1RYAqFLLFVyjRIYLxW32bimreLIp3W/uJdVFeoAbjmXxOzMaQFWVBMFjN78n8wqzbTqmOpWxTtqJVUNyolXL8wbtX3BGHCkbISw7r/2IRbkvZ4hVNeZujEVYhUgRjogx9MeyzuIohsVY8MqlO9i4WQv/CMQs8AZT3Dgq+nZ8BjMKIlQblEUxYBdQV5VV/PwSIvjKkGCYlfjS/XcF4dQdQpBpigFiido/wBQygmIGxE1nT6ikBTyQqYK0GN0MF4O2UyoHQ5mFVtrG4h2WjFle2tfRgAt1VFfcCp7NsJFy/BBYIGp3uCzj5p/6o5ORcPOY+lknOCDECEVEYSgLzAC49BMXfqWAjujiO8QXV54gxeoJolr3UqIMGWuc4iUkyYFEWoNRzkeYzdD0VEXEv4AIoIomkl84FlMgofeoHFqkhSUHxVR8RXU5sZRKKr8Ivc+mw+WKAv4LUogLwQnyh5DxBDYt9wSWyP43cVFDWdvunfqLlVnBz74UfxGydbjLwRoNtIKijIsugNxI0rWoipne0O1RtNYuHC7WpQeIVm/EIRBwAdS6IlkQfgtTA+Ut/1K+LzyWTIrhNI9RaNPH/H/ABBp2M/iDLCwItLX5EXsKqc3FRGAd/OP7iFJUU1Xi5lSgV0DOe9/cDEtCLxDXVdiwxb1hBf2ZhAv0bf8y+XZhrC1E4F2iFU9gwLbK/iKBj7c+gywMzhXuN7/AFFCSpCkluYlM0lXBN+FrWJc+NJE+DcYWpTUIrCyCXnt/ieTDMSu4+0F/fECikpWVHDhnHEoSDZoeyBwQaZV9xktLvMEF2v3BRM1EIWdExvPiNm3bHJBpXcLIlztyXmNpZIkZsma3R/UVTBVjb6jNu22YqMeWqggtXPMFZjuEcAyx6gzNP8AlMWjcRcqdOo1Ch8FR9bvLAYgDjpzBRW2x1BNpWr0/wAGXLs54hZfmmGjH1UPUBq3iNjIc8ssAccpL2gx28zLgKN1xGGUgKUtz/My2W/EDCY2CKA8nj8Sjv77PzhiZpcMwPyyZRC0NRQpC5Okx8D1oKksEQWrybl/x5jNl7WaG31r9w8MndS/gymBqFPY0MfBKUgdx8sC4Hb/AEYsKPmZHUcisMAmRFOTMMfamwgvoLr6zBXlhuv7iFJVtcsH/Xww1d4PiEgtywg/EOEAjmbWoAxkVTOebjp6u7PCoI3IJL1EbKjIVLEHzAbL2nVxQeGFFIMNaiyvCU9Qq/G0sIoi2QgK0h/UaqDUYQcMonI7iJWMsp5lBB+4CcKdXA4DrKJxNDTaPniKqoCprCWC3QSmbMOsZwNTQuTpS4VF0gs+TggHDQ6H1OYlbL0goTjqFLwMlKg34qFejPcQEFQNP067hw1wILWNMALmjkuYGDoK3X+IS00Obi01A5qVr8gLuD6UpwP4lhTZu7tedQgguCt1n1ClFDl06pmakpld/wBSsHAUVGhr5DoxcWxr3PsdQZtFQ/uCMiFianZBgm4M3XMrfLBYGT+5htBqH6iplwxMppBICKigIfdRK/evWpYFjXiZC+Jmr4ijSZRGUTkhKyE0y1pi1GSNQHMwvAzKuXQ0fDguLVXfESJUci31GkR9Kn8SxvG2mdAd1M5T1KhwUo29oDGt5zK7XixKshsNGzR5gDia3hDjaZfqC2KB87HNWL+IHYOhUXGotTpPv3FS3WHR9QYuCyyAZY/N9weCIrCKr8P3UR+NotX4alb4m0u5keiidUm/1DCVJyy6XeaxKuFFn7ZfhfwAcERyYPsv+YSRuBOGV6Mtc03C6AbJSgAAYyF/ipZCFcSqIWGmUVAbtk/EQi9jV+zUFgvMpMDT71EmClCBegMBFzO29zBehxbWa3WNxwBJBbC8ONcRyPMNWheUBxfEs5CdhlnYWGDiKgGWhy6h/W1EUx8ncLwFsnNqiEHScfY/AEWYBLGx8kO7aOGUi+5tto/EqgVqCQEG+1dRMTCIA/JLMcRzAqMlC9ReDlFcS5Ufi5vReDuXSFjuGd+ElZhBKTIxWt3eYGR2SmIQWuAJVPMp319ShislDbbiGFtHuN1jAKpC65Hx41MRUYaZfviZsSxjBiOeUKlfbzMqExfoll7lWtTUOKl8kPDqLZJLW+4OiMZxO8Re7IbaTn3L5CSB+BcouP8A8ESikHJe6nEq4QxVfFkscSA45zhR67gwS4uAfQxb/c/xUADFU0rH3ARDMK33oHIRthEFNjK2oC2914LlwUN8yvr4ViFq9voldYNF/uDuUr+iZ3uGkHRz3K3ZA2c8RCCbKAOat4iOMWgdjTFcCCCwbC9bL1L2RrkHocM/5fTK1ARYhXRHiKBCp9CJtyks+CycW/1ABoZPBgiotLJ0dzKPY91N+DBMalUNK03eAT/TGZB8pf4itZ2OSnriLQQLXxF2OYnEq2oYii9QzoYAsD0SkZMHB4OvOpRHtZFPIwscTSpOTzHdBDYzKyxA2yi3Qg7B3yRxWS5JZYi1EuGGAht1dx2LnNKlymr8Nyoo2wTIvzBYG6FMmW3z8HCXuG1/BVsApdJGepsBVxfUdhCo2R1uIDaNkeUZm/2BH5wUi+hkfsjM50fd/wBTAJNMOpQ8sVwAdBAzcrfPzwHuNnCI2tr7l+wfRqFJ2IFXFBSGyGvgFNzuXNuagDd1Lgj67HxK163IT1U41A9ZGLWfG9v5igJ3j/LEKjDGD/mMG0DWCxVGH0wKWWalmNEbvEUGzMymEMALY7C6B27rxEora5VlhKmNbqILHCNV79R5MSgbv1GKco0BttsfD/3M16EHArVd+YJgiNPEFhFv4DiN9AWmg7iooHQU+8aM0FUsYISsq6bfuOd+yzyxKrUsfe5wQhW4E/z4jfEriuY/XALhdpGD5Iqgdxf7AMFDmZZrjJLIeC1g0Z+0L5VwX9RAVqIA8DfFYuOio2NnuOUNsdR1AQriXImHVx3T/f8AEG34zg7gVCoCag0dkHM1gjfleBYTi1marCXAY8lwQmVVyQwhuvdBcfiLLFF1UctAOUxLXjHqXngfhyfaIKSskMJkhTOBxELGa0mzi9H4iKxtygp3ZnG4O3P7FDA/UfMIMx4OnzCblUuqGRmzi2pooUKXeCCDkMz2Lh5XoliEABhBxniReVRZjVGxjv4MZi9rwSiEW2vcpiDaHED4C4GE9yNiLSV23L6tcfC1Lt+FhqLcJtAvFiTV8xXhGhWGJuLiWSCquKiKBq4lrEfcsahY8y7p+owgVA6oc/4RLKtW1jXMGZcjcYpiVSweo91bQCxrF237lukDtHv6lufxMnezSzbUrSZ0RGu3sCvEtdrv+IEELwAQmIQ2cD/MNLWxAI7A4YHXmUoWb39Mc1HuNA3tnxK37ggtv7pcV9zZSQYoEovbBDEu/glEM4YTM4AOViO4aBy+PUyQhpIRYDeJdMq1G9G6jt1tcy4Jqgb/AMD4jt7U8i/EIHGPcpPwHCNxYK2wCrhpbefEQG4ZV3BR/wA8wIzBj27O67OIf8c9UpnOUqGsRtoLj1N6Eo4d4b3cUJRwv5RyPJaB4s0n7hzsk9v6nrEueGGrst02Q52FxKiVGkNty9ThV4q0f5iaaYC9QEBbHzfB9w4mFlgoRCFepYkmKF/iIBi3QGfWdBILX2pfdOUey0cB0S27vMsLA78wakwIv8Ys2pfFFxcgmnKoG4XWRC0a34dzDYis6YxE29DEqdeZUVt0/CBeLnHqSjPMuY+UFMykbwxLuYQDEuBS2juPreoxZ1XTAMxOkxC1P2hgc/ZK2qjX6wzGeqNsN1GVUOFmxVdyxkJYQX1F5Y4WQC/1GZA7q4IsYlmMc79xpwDsNMwcxLmYuq8MZcV4mI7I45xN5dGncT8XwVR6mVf1LluPJGIYzCMMJMKe6rfiDMVDiFLy/UWgVzAP6+igce5mVW9R8J8LAQBKS7IoRgv7g1oe1/BKlTsXMV5Xw/YRFC4E2QYvfcxGyAciNoviJyWqxLeQFHvx78MUQrlBls3C/wAPE1NkQwysVwxA4NUe5mAXyDRzArCKBscP1EhqgRZ0o3CQjCAL+3n4RhqVmJiN2QBKZPc1N7v6Zr/IWndGYMQO6KZsvf6hFas5wGWtnmWudxyxGGPcFm4mTKJTW67hkSlSB5usw8gbDI/ZAH9EsORPZES2moquIkIlYLLhMWSxvKaRHeAtRhEUZD3AKFuBrDczSgdaNsFsnI4eYQORqDhViJww2Sl0P/V4jj3FuWyuYIqDxBSgsDpCTmVYnmZO31csCy07XLBR4TtHhPuMzzeCG/tYuV2wPMA9Q2TGR31MMDVVCiKYJ2QUKKHHlcWK8cbuEnsU+TxLBemWoVCl6mz4Nw1LcCHUXTC3fj4WbIFRY6gxCkvMqOjRI9ZjkgMsUViGmOvi6ijBiJpq02TfmDcSNQKIsNnqUhdvE5wE+pduBwHgjKGBgU1uHfmtDZPJ4uOGiVpF6Ss/USyg0v2ssadGjeIxYVunFx5AOBaiP7Kpiu3pqLbMYjpOQ59y5RNnHmNyAqv6PEGRrZeYYqH0gIFV/wAzA3BxRrEi3bCxrAeau/qYYhq6r/UWO0pK/wBVqWq6bvaQbJXwZYmJfYfbwEpSeLYG6ioXOuD6naD4EiTNdl4dYgEswt9CLlKEpO8cTa3vJ6YALAKRoY8wOYbOIjnsiUe5iU3GYsFOoGBnzMf+PMZEygFf03I8MIwCGxvoYruL2BF0AusrgmF7VYC6FKjPCWNd7dE66Sk57Sv1LhvLutXdGdEOmYXFGeyYIpMqPVwqJeWsRVJRSii+oYUDQzUMxgKiGtQBatmIJwPdhV9QhAbVhJyvlsBy39SmFuW1A8SshTBU5clw3wGjOv3BzHDiFqNruWPwiojmcOpZMk0mCYYm5bhVjYvv1C2SyZV2uC5oYoZa2eZSlyFQXMYm8x1NRwlDAtiXEyB68xuVO/jR8OVXC82r/wAzeKVCkYeat6Z83is7jCwuYyN9MsIKHGIz+1H8y0yMxlxQcE3HaS71PMhO7+4FpBRKcR0pZwTZNjBzd3+cy7uuyWoqlc3FnKkLHxK0FHgJQq7Usp5lmOtwUhHTEAqR7R2eYngtPfjPHcTqLYkRKlFoWLXURjWNVT5MCiD8bQQzMiEDJ8KZYsdwRg0u9ZqCdvTRjiD2kbA1EaiBaug0S2uOoWAg1VtAD6uVkOWAWjfW4HEahtHTEO7RaPZFYona81eT+osbnQRNQBlVQfcAAN8G3x6i4xhWx5lvhfUXdQ1AgwHZrt9QqyEV7ref5iWTsOYlCtlH1OTkeRIG8obzmo3gmYqadzUezLhdVp91BtXDHhYizef3E6x56eI2koYWx5m9iUsQNh5LQc4cMJvTMlhzXuJKKK7I/wBUAHc3xZrAa9ygmTEWzboa/cWqilgBI5aHNl2d/iCNoK6QB2QZY2j+4E5DEWtL6f2lbUSIwEOG6+pcXY8xxXmBZ8hAC1cShNYI7AiRC1me4AWayfzGsbXqNkEKewH8y6tiH7niiRRuO2p7a2JnDizMFk+XMZmrYr+agg1OBt9DiLwVwA2suVCRyh68+IVAQaR4hshxVm68QwSpVS1NNsTiFx6isjUpGZuGoNfFc/DgZQI/MSm1QtfUUye0XEbsqJLZOUg+Udj1D0BLmTLpwBmr6jDu1uNkqtunUqJccE3uIDwGpYNZTZVHF+YS5sFcP/MzA3kL/pgygLV2GJuv5hsKDOw/mWMERI71G1wh3y6mRwbJHiko1CW2WLyeINUXZP8AEaRtci4eCoLzcZu148sFFULrFHsjZls8w0qPTLAFlnxBxq1plpHe4afhve2Clf6ihNnNy5Xjt4e5XbHB0Oz4Li4pkYhiVayY1mgi1uY81X3FOBOOpQrIavqFq8jEOzkvMeL+Zdjm5a2pefPMuwc3LQgrQz5E3bcxdw1dTBLAln4IC6SmWSn/ADaZvnItV85dlRlaMGsfUvQ2N378ryw4YrfSCZFWbeYLSCyvETcTEc7a6JXhxQDTq8TRCphjrD9SkZ0PwHcDbPFWnpGuo02amoFUCrwRAYTZ/I/xFCg9Aar3zEy3alv0wqk6/dHjuEZc12++5yG+R1ArPMQ1L8BSKiWsfdCLxTf9xLDMcnVqiIQ4JQRwwcRoxrEuaYCKA4p1Dns2P7P/AIODmK+AqJcYwIFswQbgF6OZqEBljb4dMMoU+BpGUFxkMHxHZpEE3bio9kqWVpr7mkKkaskLowvExSpEfMcyo3qNU/UXwPx6lg4jwL5xLEbIOAjWKqh1LvaAWqRqzu+ZyjGcsp9RZvvqWG8TOoFah7Frevp5hgqR2r7X1/EpCxNpfYOaj0DOODyV4i5AYRnEFv4GoOmCsKziI0HmFa357xKhUTpVbteVXiOq46lDFohmGImOWP1CUrEERpnUdxEVRRpL09iL05jI0W41EsI4TTBlAHqBt1NMGliM1r3LgQ+ogrb3xFBiHK6JagcZ5jOLNSFRzKKQpmSMIOGHGovaF4xFqCkCvIzKl7FkhjsxMsUppX3bF7wZHlFNvg1DUWvhSJqWspFK4j8DMi6l2/BCGMbzuLbZHSDwhktV4IiwO1jiojSeFxmlOhskPxKzJRWdFv8AuZebEh2FwkamgliER1tKT8Rc62VNO4hIIJLpSY0Cmf2MAvA89SrIxQAtcAcwTQNhy+/8RFqNoPMok/c9Vd4rMfLgUWOTHf0VpJyrbMpFCgTvMZKZg4Flzu9cSoD3ClXCRkGMnzMYKPUAqg8Q1fNLvyId/KTR5HxLUYB1OM4roUw/UzRN7jqEm2ssHLTdtcjH7hiGfkKGYC8vwgUiQyw6lEo+CSqPizMsZaXglkZYUhrfm9n5i5UOAwkEaZYLBEZWLkEtYS6upbVthVL/ABHZge1xArzHDd/coySUZ57qDszi1lzEYaOqxRZI0hVSyLxCjQy5dEM+jGke4HiZUjthOqhnKXv1CCSCMb6lJ+8eeozDR5bbiiPFQApY3pt3MxOc4e4VV1V+ZaBeApqXBgSlTlzKt5UGmXNYXfytU27UfqVjEr4bLWMmcbz0PiazzQ8wgbW2QdU1N6rydRADMUBHmGkHHSDoojRimWwJwyioVNCmT6bipGAbhjQxlUUTekq4dt1BQDHnMGouhbdEdux2w7h3/M3N1ePhYrUqhLO6z6Yx1uA6SovxIp5Lq4aY13NJhllYLqoslX2LL2lDVpwonAbIbanTEF7Btf8AsQ/iegtXv8zB5BWHlbf9QWy1kgV+e7Zwa8xbzdsJZ7Ov0eILFFazVk9bgEnkAx2DzEeng1LKRRLluOZGKrQNPIlJCPUQHZROkmBiC6AQZLuVYCdBiNfDZhZ6iCQV8KS0+7xLBaCNqjlMaQl5wd1k/qIuE+4MQsMZXLoX0tv4JVKsLbIariWQSoLfiXqm0GJbBMRQ94nm7mYutTIOn5Mv0RVZlnxK6wIa8REXbmCniVhQOG45vQUtw/TDfnSEsZHyWX1Kkh08Mp3EDZ8JEwqpdxC7/cc5qB/YeQGMaGF1FiG5DAv7YlW+YgQYUn04gqXUqJfEuiBctVSSk8RVb1W2S7WUbIVXOK/9iUAzD3oKnDM4Ji/LaoL/AJnHpKji2I2PcdHgwlmRju3wM5R8GrEOYUEiHbZkV34JvTAWuX0QiwbTjfmN4oOVcKgAu3MRaJTyQAoLUDRS6Sq1xdaYGKlRdqBVgjY4MqIeUHvuI/iqkC/VR9cV0ENH6zS6XNdEQ2CzKAi5oco8wco0dqPo719xYLUaRjYiX5m6Dz8DZFka5z8W2dQSIGM5OCZUTSErGpaPMqsMy1L5mbyJWdGg4/mKaQrFbBvepiagWFYI9rX0ZmRNfco5OUhYwteikRC0PkK91Dl5ltv0HMFWEBVvLp6YtwKWsRUDYA2w5fgZntAEPSTQEDWixSe8N5wKxlV54lWs7ZyOB3fiWeN0EaQVx9x7QRRObL1hKjhKcrmIl1m09mdCcvJMmcZXc3N6RyMgsuqDeY8nA0Sg+5VYue49QICDYqsy0vi8TQOfMpKU3qoMGHRvc8R24eLhqW3M3EIuwOg1Bpg3MEogRahA3FNyi6UihW8kM4EFRfcV55lCK09RuorVth9QbQOUpcd7HBZ/CZiBeh5gFcpbThZl5muZuOIDwCnuN6rTBzK9zEsWazZ4i1h1wJ9PMK6iVu8aIl8Qzba9KhjIUwP7lBISk7+xi3eEQ74TEwqjKtliDSU9RF02xrE1XOjzDBAY1hzfoo+oArtxG1pbdEvqJDdj+kCrZp9XxHl/aBxDQjmyyBPV/ljcbGF9wCbfhULNJWPDEtJfFxrbGBhai7JFYcNYp7jzA5pnDX6ihltbFcX/AOSo0EW2pgNy8Em06LYmu1LEvoRfp8TR/wCzEF/1Klm8XRA2gEdnfxVcxlyXCrP/AHMMmY6mrrhldFXi+mUGAKOvH7lzXKLBzHGYir+QMzCG4qrW3zEAbQt8EEsQ4XiOSnYQDNfqVxVYhgckbIwrPWViiOsRsVp6as/cNdKlegD73HmD6pGADdQzXtP6ot30uxg8V16h5G5Cn4pK3wX8oVFFgp4MscZjJU4BfDWSDpZRUu+YNFClNsXAh7D9Q9CKt4qKxaty7mDmDiHMbh3GAuUW7magogLbHNRJgnYUZW7lYhYXlV4iu1MNLjwRICbLSfUFtedUYgmj9yiJSW4tQmZOxzOgx2z9QPUfYmiYZTpcUbGWAqFdxoCTzBqhXMMOyOIMYNvYXCyzENw8uUi6yXjAQF8/ZM91bcv2XAvxKW5uWhFUo1SXH2IurI/bMHU2BY8VNmuHAndSvun6mMSn3C3WYYmDf1EX4K6i2KRGJDESjFMubLyvDzKIlwfLyRZ3Hip/Ee142vH+9QQBbXjHgxqPN6BvBSq8srcrCjNxlx8dYhBGCiUGLWLZLIoxUi12uMW0dYP3F2babJoJ8lsfXUyUiPUaSoptqXnPwGmyCCgA5YFY6qx0f+YsKqdzKusV4bp9I6uX8CUtQGVI0si7fV/C9PnGGax+UXArhMxOqdkSoVCogzLIMGtHOYeYsBwqZ+Zd7VLUKQEu5V3Q6dgpEr4N/DENNx9kwK4BfuOJW14geweQOGBDKrVfsWX8guLyvHWpgBxeVYfywI1cVgiu8Th0QGCOBGkbGHCoW8GQ80/zK/OPw1t+47I1VHQc+4zdGEXY7IR1W05s4qX69xstlxQNJQcu4hAGNU0xxuXhIBX7IFpFa3zj7WIpXK7WYuB2tJAeC9dn/EVEXq7abrol5QHAcEQsKJuUEUIFwNfBBpSWiKZNCGUgBeWL4RVJbdEwi89RC3YbdyiprgkLIVELnPJBXDEXEWMLRrTCvzMQXarvMOhtj7spkscQo445q8f3DRoXXK34jx+A4CFOXuKiV7GIFxElXYymy1Eq/J5lmjK17+HEcDiUCT6IZ5avJv8AiM14yb+hi7ejZ38Q6kC2o5Kc8RFWKt4sOIm3ufkI7Z2zDssi7Ov8sxGMmI4Jd+L7rt5TNkqv2jmljx14gdMb5Uv3KdE5wGOJuASd5D9Yj7Ny3cOZG5NoIbKu/wBTMw1BbZAAbWpUgYZyu7fcqalpHMKrZVRBUs59Q2HF1BOteP7YryuYVee4jlgxuG2ogSuY6V4/ygGw5vJ8KfUCt9MVbzyhL0+dzZO+I4bYhyZPUoLfRNUdQDEzVt7mhUYQaVbUql/aO6i1t4c+ZcjDYQ/RFOuTHNauNucrLFu2/ccch2Q8QAEO6pv9xANE1LYjAiwQPV6hygtDm/8AhhgTYGKj67CMUrx7O4BOmVs/cErrjIaT3EIAwcjMYul7CoAMJzWYBpfuYic/BKmpeYsFByCsS1yrjiWfCXAqMXEQYI/xNuOy79RYELtL5iqkp8wKlGg8HklWYN2OyU9IXDNr8y1t/Hgy1aa7+GLRcVPI4lXAVEahfcSphlQdPBcAwAcsoJgvOgls1Fa0JxDw8Ew+k3D7nLLMA+Vlx9wQQbMT3Ecc5hRazLFypzCBBphpHLxLTKiy1C4kQaplZhNRC+ohYUJ6RFij4BdsNlXGCkWppBuBZLYS46aAgGCoGYcSxFKW3WoOg0NBFpWKt3+YqaVp/NAGzO0v9xKwafgJeIutIByxFKQYU1vNsCEEZdt7lrgzAPDbjwZY9TC4d/4HiFt1BLMjpiVDjN0cQQSjgG8cRgyr4/0mpd9/+JZiL3cFA5v6ROvMEoGXHUSVBIprUHKuoSul7mAaGrKW+yFxUsmfCDFCtarupj4ui20xax+Bhl2SyB7rxLz8tkulfsoOorKmd8o5liIs58MTHS5KOwNEYc1Q5WGD43+ND2NINWdRsrK8ijlG5DT4mDmGkaYiwa/JM3fPHmDm1wa2GfcropScVLBPBFQwVgOWzK0mEYCavDrLNvEMkFKK8/UymU4ezuUxmEHm/wCpdYlWzAgrgllWQpqLtAZUJVXZ6hAFGgDLEdJS+DjD9OIxMbVuItrbBTKOQ0QUgYpIhWagMC9oXDqpqbYkxagRnAIDUvnMY+4DRTpORwXLzKGxeJ0vglqt0W1YYVM4FP4xKTQ9BMyqnLv8VMKG4qIWHL06isCJ3ExdsWwz7hgttAxAGctZ4LzDQAQmFusxQRSjAor+EEe7Qbx3D6tcuiIMDs1LNFmO/bBXG5Us1BGRpuGvpCFa4Dn1EalFBykURIFUuvEAAb2KIANHXCNNfSKW7grbWy1XT5+CgRsBOjetEbS8rEr8D72DXiM1sg0ivA5MfxNHZcEcvcxMZ9SrX+BGu+niB4ljO7ivEv8AUMqK6Y+9/wDuZ5ZUeXUtC08X+YmGmReGXNKry9kBQGYoDs9jiHhmLz3EOVg3CyXBuAaO4C2g1Gm9HbBNzNGP75u/qPfa0cBwBwEF6qZruGc6CvqDvn4G8bjwcAPJn+oXKwIOPjAhmNazpEsfZzMgLwYJjIOUaw49yyVdlC3faOFRWgm7puU1WUDmIGgdqS7iHf0FRgTYTX07iI0lJsjZFDFSViBn4NUNVmOlZYEylUVQvFuLBr4YMzBnwzqCCDbpSTlbXTNhF9cx1by7Ilb5lXNMVhETYJiWjuBlZslZS/DDiqrhWEbljovzMSdlNqggWyaxMQkyKX4hcKqup/UUOwpIdNxQUM2DrL09SmDidN4eIntrPvPKajaoMpVLqwqXGWVbCWIuSIJESbUX0YJz9MKilviGssdheI+5Beo0EdGmLVIjMKaluNQDajNZOZg3bfFcxBGkdS6+FwyS4gYUYg0mkiurtmotwm0wx6uYeLnLqb4JyRAQ90L+3UYcuviEXWOzMqbYa3d8HmGBKhzJunglt1VD6S66OZe1d4wDwcTOKl7bbe5pRA6zEsl6hriPMYVNTeU5/H8S8RNzKfTl0JBsSNocP+I4eXfMItt12kpLobDBcXO/lHMZ8VoeJSfigNx9ArhZNjAAy3Hb1LWvEqMYMsFGy+5dxPsHO2LQOLL/ADGHGuo9Euo0bGssX0ttLYJFkahilkWoJgmh5nEGfycnyX8ME4bg5Isy8tzcwh9aYy2XYvtElOiJABikAc38mvCYh3201B7uWo+Uj7YleJ1Ro94/iNiQ9B+MQk9AQA/ye4wcEtMeR2S1gbgD4S4DDOLaHlMHf0lwJRanKzJtyy1h8Aow3uhftG2ogenx5gaRj4QlhHMrMfQQqGU0yvsMxCMBWIchEZRU1unR/f3ChC6o68S8xwajlXEaqeibIzLC6qA79R2idZIvNLDy6eUjxHLRZu1gk7yO8XiMd0i2Jf0kU+oHGpkzA0DhM+VQBHVkup6/ywHEog0i2GZVC+zmJUhWAOpdKoG3p1AJ0bbhSrS2ps8S4pi2r2aZfLIKy+rPUWpUrNce41QOxo9wganrdnV8S9awZZyFzKKPKR9SBZ2fMdVXNssVvMuLNOyZr1GkwAilx0ZzMs19QOVWy5YD3KGzfc/KYaORVYCMKoNB6fcdxYWv6mZV0w+yKtyu0/UZhShFXZcPEDUFGK8pfxAnbsaJRVjTKAW3/hB9OrMPKvoj9nUVk7T3/E81zNEGg2QSqFtce/hGo3B7A0l7JdYRpjH/AAyQCUTgYZJqFzXJSrx0BEcN6YgwWoDfQeO2OALkcHqOx6wKyNTvgzxw3Gf2ckjZPcrUd2BsSU63XqfuFG16cxKwxiYIO/hVYaZR2IB8Gfg3Cr8KuKCCuISyLG7hpK+5VcwdDW/PwK+AuUSiI23gYBLWQZBnECcxV+EpxXiJmKJqpZygnMP7CFni4RjeIyc3TzFv+WNv+4k0y89cZAYEWAu4exxNGctx2hHAgLEjP2itTDS3qJ3SpWKiueuJkscRU+NhvmIYRpR6uNITZwIuAe86igY60xXmDkJqwSItAGr1vJLT2aoC+pftYKeVe5YhJoUpxt7llqQyG24cVQLaePiuwmG4svE3lrlJh4irUvuUJKr4W/PuFQjvC+hrS4gFgcmmFKmNYCYegipXfiBNu+uZ4/tjJU9RxDEoAaCsRccxuzCUQcd9RG0fBqGVaUI898+oSp2vWn4fqIybhr7lDCxCSLBaWHyECO1kveagO2HI/P7z9wTaO6uCPfYyqFQIsDXoYr0P2k0suD5a2wkD/BtlrulDFJmv1FCEVqpYRQ7W4C/doT9wpG/CvUtcSgiQKil3CaPUBuJmGKmN6mnXZNwCAathc9QKyNxFB5YFfBListZJd7VF2AMQcxlPS+BLRTeGGXnPt6eyXIbS2HlE3kpiJilDkiBkT2QyQTIn1NwUrj+0Yp0V440RWXiGYtS8S3KWOYIIOOCvMcKuWLwQcBQv0i0YS7UNZgmlK9EuHEkH9mLQo2DoPMZ3Wqwq/wDiWi/gO8Q11qWO11UAuBE5/ES06RDncXAplIevURdLp3DZrmLt88S6BhHFSh6FRvhnZGovpsIfIMEpmkpA4IIA2YYNkGP7MdbD3FVQCH+Ey+orhvjJCAFYLfgFFbOiAdEViEUFcUjYx+Qzrkar0LjugwTw8dEATZlRlTQsHp9Rwe4VLFugxqoNJ8ayWvE1HjFRaYq4u4SI4c9y4MvuOCI5n2PE1iRZQBazE29kyM2RkrbKxhqqrfhmJK1siuBhorcBtAVjeLSj8fB0fEwkRcEABW4OYMWpQCiotMWDdk/q4gMO3jx+zt+ohXra8QMBQaiFaol5R4imXp09y7jFdFx4V2cngviGnG0Q7VjBcW+rlVO6gRqAlNthyNcZiqCdKH5Zj4M3FnWg+rlfPEUH9ntgsLRCdH9TZ9dfUoLHsP7TP8woGLpvr2bPxCyteQKCDVVjp28SltlnmAjkqOXxMOIkXqzGuEeNGETMywzRbVxylbtZK/CHqCiViEKWuZt8NMBAYFIrcs+Qy+bg0TLHZEzLlkUUNiuHkmPuyOCLCsoeQ8RdkAtyQ1MSmOCUouFHxDABWFw9wELrSaZUDUD6n6rmDiBYKOMiUwdrW2xgoNWC1/uPUmKs00FZ+or7dq/uO/6lVyABt3+aicK0RrMVhZQfo3ER4FcRfVtP7jwlgoL8ZRjvaClOfLVOHs8xNgnAbWKBre74iad3KOWAuPXAjM4KXWOIkHqgTdnEU1zCHf8AiCG0moE3EExdWy4s/G0wxzLCfhBWFnGJgHDpjbn7QWNq2Hkb/qb46wAJ9lMyVaqNh5P8MyCDLDFr/J4hqahZlMssQnc7L/wmo3renllrZy8sKMLkambVNbm4rv1DIm6rD2MqpmR1YWXUxnC2U7DcG2lwdf8AFQKg5l83uMsbpR7lru8wE/PKlvZAHf6ufMMRbjlLLUPpiW3KpiBvl9xyg0xKTAgGNPhLIncy+4svE3g0IleTj7jF03oX1EvVAphQq/3LEhcg2wa7yMLgNGxxBuruVNAbHmE/ShH3DIqNrKuPhEzLyl4iO0FK5Ipl5HZ/cAEFZdvuJV02bP7lbCC6CiomCWHVvcFId/C1DpFhZhuPBmIXLSUtH6hUgumueo45oQVOwETERA4qb6ggvgtguodoyYPqCg/cBtJi3l1UStaGZZTEcUX7xK0CJQpPcpgjJnflcyKXBftLLKvuLCv3BLiyoMCai2/qDN/qPDmOGAkeoGFK1MjhT9QPDznctACzxEPZa+eWPPB/EUjZyeozttMB4I0zDiPfmU9uhHtg+GBFbKgiLIIWV6/cVxCwergiTOA2zKlUWaOMQKwliuuw6iZ68RyxEDOe04gMQWzuOUcrEwZeJjWM1mPYSvcw8z/qxY6mBiqpkmUr/t/AsQHZ/pmbmUDStxWblxgtsdHs/uJemDSMbOY8kK/AuoIr8Se6llUyUX9yzuX5fZTLoYwKiBnPAj+IyArb5YsY90bg2Gd4Nx2D2JeIFStc8+kcN5XYRcxEG0J8Nkp2G2QpxAamKTXu40lVlmCJQLVmQj7N5rN7lKmxX/wAqdHTzFjMUKW3l/oiYtAHEPZ8VYO6lQsQLRSp43iioZW5gVBi0ko4IBaMr5vyhUbpVrBxHKgnFnEIyaj2rqW4V8EqVZAGUSt4yQb+HJHfNZbKzcWplqNFLBD4l4mSVSpZzThgras44iFInuK/pCrqYl5YUdW0FGi8zDhh5gf8Qw3xUZ7gEMPcpcE2OYb5gEkGuVRKgG3eUfCo6KKANYiCE0TDiphVGj/WPRkIgHjjfcbIgg5HCZibW9VmKyNriPcxlsVdMZy9wsyOBUEUcAauNWu/ESDR8VTM3oj5F4H8kUlwpKAtXUC4Z1NJVu4ahqIALWAlqeoA+Akqs7gG4NseX0+B5hcN0jbY99zUE5aX06nHmVMQpBNPXbl9RkEUZC09Sxba9sGLcfoiGYlJsMb2Dp9QiQaUxTGdi+kl37d8OE01KF2psI0eAy14mWPby2W0CVWtR2K2BfU5lDUIy01cdF5bi1FTcrdV3kJTuyhkyL+rhhRLjHZuJ2XmI6JbjaAEuaYHNdRKlb+NjKIjg2MlSRFB5YqrZiVxHOIAFqFLIEdLUv3E5Ag10MaDi6vEVdtxLIVhwMKuEAWQzdqZlxxLx8Uu5Vk1NsA8JDLIJwNRUpencQRji98mWP0p+Q8eIaSLVI7ZdDSyqIlwAmspgdyvxLZkAoCBeMnQZEg+Ft5HlemNWxPUPPHmBVLFKkLEIMkfMO7INV46MSyUOAJRLFaYI1K58wrxDKDHMarE33EF54xCmOSrdy6Asuo/0hmb5Kr6v1CJfaphz3G+4lnvj/LLDaz4jOk1YycvzEqBXAeZgM59RXZh7im1V7YrJUruK5hHGIUdYHIwWhDA5nIA/UdV9oVv8pf3EJDSLVvudr9NXrtHOdrbL/DEuJ/hArbBor0eY8+MTNhyG7ZkHmDlCZSOfUYHnzDG8vIq+qj5Lkp2+v8AMHDC2XLPc2yRq/4JccJ2Q1Bb4lIQHmMPEZMAnUFCOXcPJH45phlXVuYKDIWBejg84LZtv8rJ4/8AYQu0vSBzdEPivk3V1x5Y2AM5i+2XhiLGV4IqTcg9TdHthjetDbBzzG1IJDAr7uK8MxRqauLRcNtsZsRpwt7nHikBuLVgq3f6hkKyRBumpTstQOZjHVOH7ohWxQspL5/1MGBzAVKq/wAjEDzmqisvHUV+C6+N/i1CNMGSlrPXphdA6ey5U6lJRfpKFMnGHcprKKLV8PmFnx8MWk2QrHEFi1DENm+VdhLkKoAFp+T/AFKoi7pUwvQbXml/r4Xn4VfarHBXPXJKUwZncCI6lUfKyFY7Zjh9S63OAqHwWiseWFowtvKNcjZJigLbXb6lk0ovbZFo1McOgppuC8h7hJRrzAa4nqEhhgaYQjk5rUSVLT0RtNtu2WJQDQPZ3+SJhgbRyv8AENAuF0iGgeiVPOMUmksNWQitLd+uoplwl0nFykerf8OzUyU8r3LlZEBcstYlmY1shza0S81GNtzGX8BS7t7iYGR1MJpbQ3MVURbuLcNGYKRo/AS1VALVhiUTBRuHz/EeGWA2x2GDAUnQR/8Ad8t7e4LgwZOqXrpXDMYiBrHm4tWxtMQG4GPgqagQU5dnXwd3LYruVcIJwLwdQSkIOhbLXqokHJK0QsFCpoCj7RalgiA4kRWJl3NIlT7CGNo/uOCll6LqEzU9NFzGnNgofUqI6PINMG48ImaSk1NjU63xmK1Lq0WIwry/CXE1tgfJGKHgtmWa6ghmoVmn+0crmCXcSKLcxSHoJm0YC1hqVFBjniJhZJTm2I9gOI7AVC6FAy9OYTArflHll9PJFxFbpl9hE8/A5l4+AuAJgICcm+JdcMjkObetYigpKBql9nGK7jItuWN3DUJnbgkBBsoQ57huOTMsI91UXiK/7jcscR98u4Cqu3mom+m1NzLoofJ7f+5jYmPhoHUY1haX8HEB0wgzm3+qmTdQf3AgmgN3uO6wGnhEVsr4Ko24OJRLbjklKgQi2EPjEWbiqzuVzCAhjYD+ZnBC4gAtIuOiZNIRjpgiQGnJL6w4SC7xrzDl1PUWVCMbJbHEVqD/AES43K3E2bQ0pRcR9wWrEO8maZYFbWMc78ZqJjF6daYnfL+kXBjWIB3CCzq6uNV8ag9EGC+LirYrUoLOl1K1L3m9Qw3QXEvIOkV1FTbcbygwG4JTqWRA3MFkAgLOMt4WFu4kR+yHBtQ9QCvAGrIZcWGn2gGFVXWeP1LoEpXpOJsLh+b6uMJeA4iZZt38LUAsM7lYiY+Djw2qaSk/EImtUShj9xRD1spatmzdQIgUK5f+VAqXj4sZqXBwUbl0hGiuCVRYmuwjEddCDBjSqqBWOirLX9x4oB1L6jQQqkYowuHMciZJY1QkulFwLjd/B4RQssPl1OUoe4C7zcU6fUTxEMpYreIzapyNTJ2PbVwbdr9ynOaT0v8A1A9VHpFsLFWUgKW+kRfZtsKwmUcDnj7j4IMlGYhbPawxAArmXMU4NwvCqsMusr/24iqc2ZMPheclg+4JohIaHqUl66zhkltUarG450S4T7DFQMezcUTJDBBIIKLUrPMsZVyj4eAZE2vxB1mwFwceIYAAuA4gtmG8RF5ZdhLqCyFXqX8/mCrlqMyNkCNfc+xMcOnavUfhcU/QV/3MFlBHZevgLzYfcb/UBYKPgtDUKgwWSzVfdXS+A2sdAo23ct9Uhd8D8U/U1CZIKvMe88OwTqZhNKyA2D1MQIwLicQwS7MxAXGkWCjc5yP9qkwE0em40kzI/JrmP7kjFCGwb0MR1OyJlKgAS8xCytGLpjCWbjWlRkAbWY6QJYuJzUF0i9BLxAFtAPceJcKgH3FoN1ScdUfUWVEjDPj3HgbhRZ0zujZFMDH8oMVRbMRCK5Qa4itzF5jsnARCTFprqUY0iYpeW8MQA3XUNLVeJRFFbAuJj4GoxERDtIybTOSCQWEdRwM0fBHMR1A58w41QckI3Xm5Q6gYmju4tv8AmOnr4JYrHceIF2V7lAG3NaiKviOnDW5usoB82f2sBsAeob3BqClTyd9B/UeoYVmrgAc4dW+ZYGb9MN/CljAo+LIRVBMG8SkFFFeoMiXlnaWsqN72raIiREYU7zAlINqNQ40bcETQReW+JcYKeoX6it/uPEX6hA7sLmDVHaHHmVYWUaP+5lhqRyfGZcNbo7vLE7P/ACZmXllB+7mYa2y8FsxIZ1EJ1NUA67CeIApkQaA6hmEZyf2iIiNIMDmVBJTyRnonEwsYWqY9mL0Han+oOEcR8/ceoiomJWfmFASNhHI1VDruJhDhd3C4RROSCqA6CEeAO2OW0XobjdoowcS8y6jUbM6ZnIsFqwzKqhre6xajxFEb4C4gBCjmIjtblp1k4loNsVmnuAhCcI1MF0Q4FaP4g+gRB5IZsp7KvT5jiLcVIcwsjZeIFwjuAC1DCLZprcwrRcO0YyUI0dS0uLXw1afcFtS6uIFbqHB5h6SnUx9+INfcyl4lwiHxE8A1bdQUFv3BqvxErLUL+EFeIwwhDXLv6imRSNSnDXMHEXMSx3xKppI4Y0Eurz7mQwLjiCs6ZUwcQbi1LEQwKoxMbjVkj96/MZFC0gxfUS9V4itxY+DubD6DtdEPSGrGWOtIZ0iFIXEEppBYHA7gxF/QN6hRiYmNSqxeZLojddj/ABOvUcIDYxgAy6JW18aLAiBSjqFxLZ5FyvnrMVMUP0Dj/crAvams04lJT8MXutfcVldFV4g6ySFqDJ+I0ajbglfFYmTMow43HgcibuY/CoHWqyvKKkUB9XPo7J/zEDSRgFPAQnvjEL8MagTkKnR3RzBLJfiU0qUsC+GyM+yMw4umD8RwKvWIoUpPLLnRb+JRKKj3xEeKIYNykBWtcXAatKCCKU10eT+YaqJUo+JRYJmWXDctqroWJdQqrW3tghKY9G8yzMIalAp9GIOoU+ElZ7iQVD1zLIHILUtuvPCfqU45liPPmY4eGvUNLCO4Mdsxmsv5YlHN9+CIMSrLqLlLH+pisxpGswT7RlHL4lHQnI6YBuAOQGKjox/qILlWipmZaitoVPFVMAbu+kKZ1V37YI3uEbkXO09MLTwlK/iKCnYUxQrBLOJRZrUymp5mX0A39Rk1vqFWh55j2JZI0Ubm7uEhVwhLZBgP9RABuKrKhWbBQu2IwQKAikpeCbmTtFf0ldHZU3KR3KHYazwbl0tGlqNXLmBpg0ytKSbMK/cu1ppf7iKF9uSaPBM+iqV4OX6mttLqsHb5dvuYRYgrhxDSfA8Iy1zXJHKUcJK+F+8veyswXBUsuXMzcOJfjsw1FI2MMD2ZbIUi+QhFQ2x/wj3JOgJfvcMv8zZdWNFARTB8D/MQMIpQXP8A5HK7vWJKKy1ZLoKUxEVdSpma+ATib/CqJC+F5IkUwbIDms+yWKCzVkaYgqCVEqC0ignK6jj4IFGlCtPMBa7VDxKKhZX2RVHOw4ccwhIfsYbBoyqNCWN1KwtX1zLAaS4rjLtT0XHfIHiAsqWoMQWAtczKBRqyE6lGErUMF59ymPmEEiG3LLsg9sCM0rASnd3uNjTqBwbi8Fqaq5hathG4daiD4jeSCl6itybg2ZY5VqVUn5mHTdg5+Oqg9mVB/MIRrC471EVuFjF7IQCjP4gEmLRMiB4hR3cQSjGEwqJTNuYlBtwhsZaguxqOkGFAvJ/EEsALLA81qK7hSUJTuGUw1w/EXOdSjKXwefcUJQ0eX1EUSgVXV6l7QTxOA8Ro5i2WShC1b1CCvPcTcJQ+uZ4PnmJY5hr4tRaIRkOkM1NviPhOnoj+pZnvxDNsg0L4uERVgUXehjU2aotlL/EVLVVWRwnfOJbLXokkLLN/4eIBVzCO5tUMxLKh41FEpsOi8sqEE7Vtb4lopSpHHUNfjN3Lojth6ZqWMqBKl5hGwaZzmMxkqxH4TKFMil0KPEZXiVm46Pg6dixI6d7vKml/7iDTFuHUoL6CM6ZpW0eaOJgSi7ZsGI+ElI7ZxCjc5noP3LXUWy9RYYLFKVMqowlTKKsrRK1uG5aHcfMkaLSj4Fty2LSMQQQKOxuHAbVci7ImumIM6tmBXHUqrcaO4zV25iLAvEzIV4zHjG48ylH3HO1TCgDWqivCVLFcrWdZiZGbFwjG2D8xkh5xsBtrEA8FmJQE1T1PMO38jMNEgUbLCfW/qJcVY45jomTFiy7YNal57CDgoyvn+pReJSsI5bW3zLXOHZBocdsotDEqoINUR2uWYuOIALzEgW0ZeVgSyOP8oq1kYl5QiI6rXp/xO74A4Ff95S8ZaQFVqnco5VEKSGCZOPJpmRBteXf6/mO5iYnnLDUN3MRFti2lATWtzYjVUX8pbNpIU3ZACG8y7g1AVRlgVAc6AgMgtTF9+y/1KPgIwSrTeIjZi4ZeKo2hG9A2eX0cxmZK6XK7/wAINJrb99yAC1xOqiuhVf8AQcRoXmWEaOBNSo3Jx0yuc8RdfkFxEeJggDxMPxWYtMOyO5j6gzZGCDcbDDZqHAWRnVZUwVBWKmkCUqzD4maoKBLZonuClllaihtkm4DAQgrpcYZWWbm16mCbRUe6b4xBLrVamUDqsDRFWAtvEb78Lgq/zMonIIMx9lxSYSMlt0VAtxll6CZmo4nCpDAGe0AMG67uGphcEYhjKFbuVVRxywZbX9woPPic0H/ML+ofZBZEtzeMZmE4mMbVUrUrE5gL1D4cEoWtwaXAsHOnwG5a5XBsgZiZtv8A1xqKZiQKjWwtRgzAYHGNXEVayyHEYqBa8QjXFYdEsp7gq1WzgRopp3yxRRQxk4D/AJjpFy9bJZWtvcoe4RXlj0y5FSnshmgHtCAgBkVJcV3ar/CbWk4TTLJYo/UyE66CbHBoriKCrorcHT5jIWrl7hR0OooVi4WyUl9EKOfxBLBCC2YhUU4MeotIaDahOoddoJ1mJDP/AMLXHUZ5PZJg7c/iPi2skIlybr1w/wBRaamyOVZVko1MjGDaQchJkRgc1Ba3V8eYzEmMn5ibllSmWHwqWgcjpghDIcdujuOSxasV9oArtr5YyrWK7gGxbcRf1LNyhgrglkpZVRQ9Sm9qY7rH7hWFC7zv4ANxRajeI1QlNNxurbqIgD1HZvQS3qjqXUG4l/CigxSLEWqdkL30vID4ZcRN0wRCdUxY51Gz4NSkUJ5YW9RgOEcsTYYtZT8xjpuCOVG/Mqmqy93AmTtD2D+5o2XnENO/MQnYZIS/qm3liK0r5iWxUmYzL3DeEQ0ZtqqwTmjmNTKkKSCJK0lBFz8VaMqFqoijHksU2xYLxmz3FDT+4mIYYz+ohRIKuLhGWrAWShuhzGascBla4hK4vqCyvXEKJpKRjirOHP0cy2FR3GxbPGxnMGI2smOUUYQQuikWhziF6hgtj+ryxDEWxFLrczBfwd1NIc+ZcYFGVGqi1DWZtQb9mP3UqE0IlR1CR1DuUhxHv/shxTFUHcC1MMU4MdQz33W3iWEKgADXmN2idrgWWNjWC/KLYXo6yCDKRFgmJhOSWCJgV+Bj3YOFvvUs+DaXUuoN08kFogBvg0QIvDnq6qD2vk0kNcRO46UAs4hjmCqF9yq+FoiVC2Bx6CEGRfSqPFY9/qOAHZuD6YmRZ0VuEyU6lDwS118L4jsDJLpwlZ7lxl/8CgEcEfOGOORpVHFeETrbq26/iNWaOUq46Pdrj+KhpGeS2FRbuVFscyWeblIKYDztvc33LOYZYaxVRGMSl8XLO0HLGpk/qPHPmPPuZai6xG8wtOmVV4YryRWUHGe45JYwFXQczQiQsxa1NnwyXmIsFXVSkhQnXMMtxL+BuEseYIVIsTUYAyVVW/JC6IByMGvDKq5eaVJ4DBEXAHLuMgaDQTKOQwMqcEVIhpY23gKupeU6+AOjha3xUG47EOyLrb+ZdsGoAQsmAmVphmVKixyB/Ed6lpjDJbeKhOwrtEJWItQRcZggHYmcS/mU3DBbkTuLa/6T3tDeVJ58OH3EtxAv4B3MRCC1aCDdasDnlyOf9RbgD4JWwDSuSANvccj8AJybgE1EiH4FgDcbKlgLpwMMK1o3mXa/AGZJSyiCXBpIa6oR+lOYMC13B4LBzLU9atdzAH2BJsTEoAFEMfC3NIog8gpGZrKlYgVHcUrEMKM1F17jVWlYME7mTllxLgxjNgCdZhVQqP3UrsWXWY8YwwxQ1QtV/wAS3hOClEs1T2z8HuNgCrwzeleWLLHDiIduvhWgpW+rlcUUz1LuiOdXfERV8RCMZ5I9jAFPX/hAmWh1tHo85lbOC4bTSU/lmMrjlgXqIquPgQxY66UZeytyyND6uvzGUvR0jEupdzKVUGIbZVRSXPv4EFByMBE73C78RYU9lypCmBqIjNxwliTGqPS4all8HEEVtHrcwM13bBYpnMF2baKRgVgyEEPHMbpjrGFt7cDuGkdzOdr5gLG0pTeAr1+0V3x6hWgtYmsceIyCIwm1ODmNcjgX1FwgRhC8DL+iHjFvBKRuQU6wiy8KBiV7SNJ7LDGjxDURSdlcQqylOJTFlO5o4YS1UDP1/cxi1KWBtxLfpRYvmZZi85atM7JnHWfjcobI9cKxoRO+tHIS6povSSKj4AsxEl9cKaljmYEGWd0XpCY1G1Xcf8K1krMhg8TWUQKMUy3mM5Yo0pBJOy9xCQ4JvsjpJWMhUqg01ZMz4LU0ZgzaGvgva5nQRPmx7ivJzFqdiIKSnTMSzFU4sNTKy3CmMWwB0uGC9imGm5QepcT8kMG/Ey+/iEzH+fEBlkexseoQTrMvIZn7l+qIzRiHoRt8KCUMjBLc3LrErFwiRLg7nBxHhXm4NRWC1KansFaj4ajqYoKVv0MLBZTlbxdQm6LEo/zMLuyDX/2JflBOhvsjLsuCz8QbeVWPyHJKQLduICMLSu6RpJZ0cg0tVanEUMWOODUTAicxKLglhc5xblQdBhVk/gxuDUm058p7jhWrcXEW2bgNj15jh2lrAauCtL3EsJatMSlRyt8oT1M86J+hKVKfUGwldWW/Uu03BHpWXUuRHZMXF5zwQhBjjMv2CNIuItMakLkyYWI3NGV6ITaowi6is+CDA78o+hUwx4RwzEtNBT4pfwNwXDEKoWuHqPXyCr04uANdslPSwAEbofyRVSInECoaFmBHEr+NlAFdsZQAKAFGAP6hqO1Ab4S5TuBoZx2Re49kouG4vrNs5fqYmS4FEYnsluzPRBpileYRZUVTA9srpNFC7I2BU7SopWFbAL+4MDC8g5qK9kLee460qWq6+oiBDCJqC11b5ihWK6iUGlRXtlEX+EwosZTBM7fRihFLtbmgz6l81xF5qGiWJV3zn8xq1GSrb5ZvdW3D+YLYEyho85jWoJDJCw9N+2I4XLZMBVqXdPJFxBuFURpIuAC8dx4MJqnzGMWhHdemaRSdxOJgzLuEquCXolRHLfcM+Zc+iPSgbHzCIgkDDDqkrxNj4McxQmW8FRgl4Saja38RT14lxtZYpr1D16llKLgelbLL5DxLQjgIUF1dZjzAEJRY2X41A5cXPBlRignBTUADWIMwjVwgSgQyhouKlKtkI4dURoZcYRDuyCEov3bLoDKxJw0WLXD6Jslpv3AuJUtZ7HSQfin/AERAyDY6IbVgCl48ecRsXiIrJmo5gihoW3iV9Z6HiIzU1UONQHz5cpEt6RJdSzyidVPUGL23sSk9bu/JLpcRuH5I3R1KKRhs2WMQlIVTCsWCWhd47Y/EGwpu1Qu4yrYO4t/DlJa51B51hPUAsVmJXcveFtqUVW3DcsvKeSHEVPxAxhmYsVmITJhgItCfa4vcZ2Bjkm0yD1j4VfkpbUNtX4lIoXDJ+SYWxj/J4g0GJWYa3LThU+sEy1WPMX1EO5T/ALJlh5CYm6iMZ0o6lIGaq1ZS/cIZ1BsDcXCKzqJbHYxyqa9xc/FxTcAhTKj8Ai1LAmVV4eoIkWgXjnxHStrGjEEtnFwim2WKadksajLXUTYQtVbp+6l6K5pS7ULArm6N9giCFbt154IKApbKd6VH2y2iqoDPeA/6po86hd2UpY/YMK4OCuJmiahyzb9xAPhxOZQDTAdECmCJHcPapydeZdWKPQVa+4TSnhcSoF3iNrmgUQJQBMOfMsIVQZwL/USaKr97vX1CQV37gsogu4zOuDs5nu3A9xuXaJSYRjRjaYQV9sEaWjxmX6qO4bgAVLyxSAtYIlUNmoJDqBwV0y5y6wSvuXdRFiXNqnJV0QS5XxF74emUoHyZPqGtFIQJDRSvAPtNRRoJyv6Rie3DAAjZbLsQSpNAXMto6UbN5iqcBYitsS571rslxpt7RJme115/wRnaLaOiVRbLRRUpV53EWhMgDb1A7jDULtS8NewxCqXXgqIqtXtm1cHZBb3HPMioLweo/wB/uGlI2sD6i1jmWpD9RU6mHiWGfgLeY1qYllRSBA3eaaY/ObdkFPVs46iCYaDvF9dTNquhXl4MEREMurf8QLjtX+SINy84isErxk+aSCNDhmJJUnJMA7hFWdwCHqWjI02dyghQRUsSiDcuBSjG+q+TAm2gwIFoJsrpjK1KwXYPaCG+CFa5Yg6PGEczBrEomfxCaxfd16ERRaOoMAH1+4RY4rSblwDq7AGb3RiONT1lHVN/cCxHG8CIn0jGu1CsJvM55SyYEYOGJQzNkPywUVfT+ZjUXX3AB0LZlcS6u7uuXiNkuVmEW5QgtcVEJf5OvBKMiHwxCKtE5EhgDZM4C4sYl7lIVxuqO4+JKxn6W9x5A1a4embFShFZEYKIiogDOmyRSAVbC93KUfUd8EnV6i1uKVmCMnmXcsYGPi8ysVRmyUagpw35iqpLuo/UUGVIUkA9hHtcQbGVijCYg0q/FTNt5i1Um3UaH6e/g1PgNlyDU3Mo0xE6oQvqJ1FVxojwxwlQd/BYtLjqBAWuX1D0IDoFTlgO6TZs8w0Z/MuhgB+7lxVwaS4l7BwzWNVDuBDXJHg0u5iS9hzKSb9w1NwMunEEsRhlDgRpjFkHQqPnw4mQV2tllVBIWXZWoul/EBlTRAXDHxbc4Ram4NDolkqF6hdqFYagusbjhCD8FeK+KshWCBUKi7Q+r9wvKCcV7TMKDkSsR4R1A4aDalhTlKekLChar6x1FT4CpX27+4uqqqoeiOqVavB9xUACu8Qryv8AEcsvgIRDBT/cMRyXFVnUsTZClDUANmy9i+A9RLsaj+ckDV2+nkl5cqsyANZUZyB+0nrosCY4j2bcwfgBhvRFjEAdrw6Z52YZPzL39sXNGjUtuMQxSV+p5kTCRwV0tZRKlWfYT9pW6A7Re0bgCg0kEuVGjcUuxYdiS1WAC2uYJ2NJAyQY4xKGinlZRCE5MQ/2VdENIg3H00zCF26A9Urcsbac3eNMfUoraWo/Y7r+Y3ALUCxhI3Oys/MdsX4pf2qhYWGA4/djKusMjJaEc1UbmVGe3VBqPC18r8xUUKjWfphkBVS4fVRFb+5l9RbcJwwOvPxB7fxD/siYRrRgd9xahCXExKDFupSTd4IqVzCEWryWS422Kvaof6EblQop/mLrMKTTVTsRC4xWU/UuHDzEJVmb+o7dpydxymqYslCBXpxf4jYE5KH9bh3vDMRNoCoQwF6DUcQRqXJppiI07JXFUtrGlxsYhGIxw47qVDwMdHcoXd1wHbMH1c11LuXsoh7WEsCqqXoGhxZcsrWNVVfZGjWYQNtivUxWBoU3qE68fiYF/ZLDeZ1fqWKHU+oTrLdDFfO4jNALDQdEeKKoLjC0V7f9JgS4AVANARAw05JdF0Q3F+R/MHDBEFCFj4+AwIqzWW9UNh+odERIYwwgUhY8WTAXKCgOiHzckZacwCvglSr5GvccldsqY3EHIx5KGukIty0ZifNeKlZQVDx8CyIRu9amCqk4uWSkCoL8ThLkoWu08QYlAcIx0sHQVfKNl/8AagUEgVQc15jDjjPKRCLiKmAlEwQCpXxKiaBofZ7jvsA1bdRAtKiVFqCMTTGKpiq5iIDTHJYfvGYEDSPyq/gzcNSr4KUzD4d/AMuaieWeorfUq4IXp4uN+GO7mm7+4qo6mVNbjaFidMQoTVp4iNw7c0k/5iO2jMPMGACviL0ydLDBteCaotQjQ1yqNa0yxTbHWC0sGolygwygUaxiJvM1LguNkd0/Co+BCWxySswxKpYzWbl5U20dsTTog6b2+4wolJDCHxKxUMEvPwfuj41XX1L+hItQrK1ndwPvRwGxS9biCtocBE1YeooUIrhwXUeHvA1fQ0wrs89qGJsFjMW5sArErxmIXQBmvUdy6PdcHB0vBKYNQCUbDWGEWAKr+H+fqXbmXpR8LmJIXIsIMKqFl1KrRdP1B/Zaq0fcp3Eo2e6ho8xPgEuCANJySvBTDYIFZNaajOgV8QAaHS9y7Mwz09QLbjocEEUxKNHhEStIxlKjUBCwqiZH+fuFWDxHUPgOIqnudAdoGCW42mLgPcqS1s9E33ywwB2+MA9XqV/hHLFeJ5hPU/jcSlXlUhfmBGx+YRamlxC36DKyyjIh5GvNS0u0oBV7eYjtyEu+VyHohDgMF3Z4IcFVXLyyjRhSrHhFTUugW8P5gA080bXiKyF6CCWj2o3LrB+G3iKHcWyN7TCJ3mHErM62nDemPL1Ltx6Rrlh2uOe4BImZaygrl4iAxmXeOJdSCczYwVCAXfNf1AMlYNniWWuGTAnYiY3SOgkBbBzqJKC3wXBTQXYVnmGyckCoBuBj/KICqpRYnuVq6Cg/TmOORIbeJQuDmx7zryRy8jjH1FqA5n4CmJiMMiiTaq4aAMRs1MoL9RUNMBWNVlWXo6iMrBANHYvTr3GzFZRuFDauqJeWibK1BUxObZhnMd3eZwerK+jM4QIE4EworYv9/AA7GYktzdWI/SXMlyovpgxrKGZhBsKhItqArOO6mIMz5RC2bhfctYqTVEEQLVUywjrVKeE+4jO7o6+Bv4ummUTJBzQo2LCMkQ6Sa6RO457l245jOGqY2EUMWopAxcxZfzqUVOHAQ+lmXoZLmZjGfwadS4LTLf8AkRlLXtgJYn8fUtVVRUeCXibZVEUUQZE4latNPt8ykQ7veYNw4V3A0l1HxKxKWMCIOSCKFsosNJMPiFHMwyiMHpoMeka2HKOrx4l3LWobLh2oPuIrW34EFg/glWbEYsf6htmYYDawOwaBUfK1skVAY4VsfYfBP4gVZXYaD3DhU1by+o5Ai9GDUj0xcDNP3AjqwsExYZRP1EQKIrMERoTm5smZpFbKoOIvhSiK/hzLvctNtAWsDiDqMQlsuj8xnSS1zDAKw8Dh6lkpiVMsYEbsXMS4hmEx9MABtQlbywxmSAUXL9zGqrzV+fej3GC1wFwWAPQB+Y0S2SyMBB2i9MFxOK4JFWXgH2IHRcZllP0CnlOfc5L6/FKRACDpcr3EDC0qXS87qBuLfAu6iicLMVG2Nmpdwc/yJg9s6nXPaH9x7TjoFuYsYuRlYBzVeVyMEaRG5VoljFZWX+Zo5qc3GuiPfLLrd5lkCoG2COXbA/UC1CYNC4+viZxssZBYvcZYC2CHVVpop/ZDERKizxT/AFGBWKRgMFS4kFiXgKuH1atBMIIgyOXmNCM6aHDhgC/hGosnmVQmgDsqUupdVXp6WWDSfaW2r5wZ4nR+QsOBOuDozQxaaTQedwNYs6r/AIg1aUOzgsiPUaC1Zz4S0MLV2szwmB8WzFG3JfTGtN9qx+5YZwdyjX5ZWe/htBmppHTMEq4dlbb0wyIkMDXlz4lmGLCqyBiGs5izmFUDmTn6jAzlO08JwxmAhwmpuptVY5x+INSFmooEq3ADzLDHUJZhlV38uCDralEwqXXMweGvGVMqpkwhBQasnF5IZFB5g9Jtb5YwOBmTYX/UoIR1H+3xD5a3HybDz+qg+0qjyRwRzlzIlyau0VuLmZN4gAr6O2BovmJS3PRukuCljteXvmKUXGaHiZtxkvC/aHHUJ5WkfZPLKxwoEnuhI0YIzbxF4IQ8yX+2L+YKM1jqOyXfEsL6SsU56gbl6g2Mk0CqAlZOKeazXjn7jXUE8mClxUNMuXnYbTiEYSpoTBAsXgjpg9zNQdOYbknPh8YBNah3GhV0zE1JGcQMtMQ1PaK5H5jUJYh/EZwttNpD5mkDiKMKjtws7w/zD4lwlMA9y4lW+A1FxM5cjhNB1S0Nra3HS56jYYggaw5lMco6ag3AU2NXAGvi7jr4vVXOIr6OViiQz5hbCz4YrZqvcTfRPNyXV/UBLLqu1guhljAsjHQa+5j6t8cEqKR8YgFZFICEyo35u4pYq8xrzKjGZgpckvOZRLi5WXkzQyv1pJiGYSpqYcwbIJcq43YUY6inLuDEQ1R9wxNuYtRXEYFq0BEcdHLAn6zFtuJjjlzL7i1dncrhsHD3NRb+HeCKWmsti5s3EQUGXUrkDSx3D4VFTtx2UQbgiMtv+Dv8Raql0MClK8hcvOWmxqPKFAZt8xihFpWNKjCY0LNxlnVsDzMmqclZxMrVesTQFQcD8FTdMIqRNeRcRLIBAUwD3MswFKCs8RuFqIrHMimXwj/UaON5p1FioYfbl4Jk38mGEr9O3+JRgMo3faXCO9wywTYCuXUpRG4Kc8y3PwtsdFbEeyOVnLDVNF3iVEgq5rkiIGG/lQD6EanQ1OyK4cQJjxdffmORujNvDXXVQKdK/aDZAFlB4HdViz3zFqDkJtvL3Ly4b0RWENtfzG2QugGHtzE3elinpcoT1yKD5WIEUJEdjQjLKCchimOE6rxGHos7W4iSj4JyFQ0LrUt4/MeGdpVQb+BIuYhzCicQZlgnaqCfqWECAH35iSj9C/qZubyZQStDLYfxP+NjuVbc6vb/ABACZaIGOQzWylI3kIvcrFP4jitMZDqCqqq4qRyF4bPEYoDbOTZjiUJWFgr4FQ909CI4iBqUvpgEWpeblVGKJQFrA3XpVI/zH5AmSBK/My3db+3EBIqa19SyqoACopad2xCXl0xOYZJjFUI2jFM3MTwjiREdxwa1Cq5WYfOWiqH7ZbO77gug3G8p7vuE/wARmtgUcs8SpHECD1JOMqzToIlUZXCE3BiOS0ueFj/MTa89d2MW6zWZ1DRFsizGJgxV1oqIFWb7iRy9XLzBqlZ6lX0gsbi+FjSMKxRlAVtg76Mwzi+cpy0l9GLtYYYZUKvPiXZrySohsJVECtxN3UcNA6hOQB8N1AbhqBjzhsRDqDCDyRhcHOYavF4le3DrEZVmW7EeISVs7Irt0uvuFyU3iMiEIcOJHxpib5LKE8RSeEcYMxMQhIFR3FRZOfXTL2AMiHMDlrDczHINxBXaYJa/hjTi5XUygRhkiVBwQipweZpFB+5bN/BWXER2KfghEZVqJhYyTLOAi5A/NYvFNDABSds/NI1AAUU6kl7+oS4iw1xmIsf0RqKb0wATDwjLm3Aggph08S0incLknFbP1MM3cotHpEAUrd8S7ZMTNxh8QNwQGsPMeBj4UJcqclfAVINkKjj4q00LuUAsWwQYSlAVFlw7sArDubI4lXMmIIGPhX13HfY/iOE0CZGgroq4UcihNuhiKXXdbg2o2LscQuQs0XqPKHBgKWlAXF2SgyWVTjf4CXoLjJLx5dcMl/r+IoW4UHF+SCsbqQOarEuzmAV9gzGCpQWbWNkwCKwTcs1nxNmuf9BLsS3Wq4iwBuGak9BLA00LqKdBriYZ7hFYWNh/EpXgF35I751IxagZrcC4qmHVhXvy/qNGRtWDqyTEtswOcqowwWjGZQ0AG6ivuEGK4SAZVHybQACHlmEW5QKROoK3Zy0waortv/ymHYQqgromNaatpgcg8o34ZUGzGUzXR6JjmIDCu42hOe6M3X1FkkbuDv0ksSttGhf8QlVZRzofMulIvDd5oeIMOV3BCzqxMfK/0JeB2griGKvqHkIH5ze1zuNWjbOepZiHE5jjHEOhfn4IgCxKqFwObsMH2SiVy5ihEpBzLhxSuiBpng3KEY0QjZKozEZSkcOWOLipf2rmFT7cH4gk2Fbg9MBX7ZdXkd3CEYJtHFe8wI4RrkKWvUfUMhu1OI9WXmD8QuClCInM1lApYNRzLCH2eoqWWUGWS7w5P5gVAgnCd0mH8jxKzOb9m7hwneLStyN2jwc+pdVF0UgqytWcW6lcMJNq2/cchYwKp9wptMqsJ4RxXnEsIRdCX9SiCrA1eQjolDqBtLztiChRRUrtVgvdQeGdqFEp5PSvEoNjETHol9xJH4hV15lD0t3GBjpdjORy+GOm2G5zH/txEBxBnNP96OTT9pEEPNx0FNi8QIyMbcUExLumIjWG46o3/wCRukjVtP3KEpMC5s4gVvK2OIUVbFOKgY0rtIpsRZayygnejMI2tPMrTQVln3GtQbXRrqM2vtAXA9kfDykmYxvDCotf3F5gG5Sl/UsKrmuoMVuCcKLnAecQ6kN8sMFqhhIRPW13J4ie00pAjuyIl55OvqUVpLxuv+IrSukj9tpDtVG3n3Dd308faJvdDXjfGIjDOGItt5ld8PUtg4lXLCO5VkqcTEitUNWbJS1W+5SU5IgpDCzU2S2pSxINRgXmJ2VctzDJmBUWoIj4j4mYSKXExlrwcJ74Ip/AzlADUfmWK4iimAV6bBLYY00EfZX3Ltq5VYlYtsZiSSMajUXctpk7I4L0LGoYTJGMTJhe5fCbVUZCkwee5mpEep6pYTDqpsuK+4XaBxYJSv6yxCAoCs2MEl51LxEgaHiKBrHEuxUHIuVQXAAhuJbEolgNcxLvmB8Hw3ZQdsw8QrsJpHUZ8l4XZAv4XMS4FSqhaPC3bo+riCmq9G1uBSg1XbRf7WARhKojAI7e54ipNhiDJBd4wF4wd+fEQOmz5hgpfNkJ2MoDwlTsDfO4fC5pCcxH4nT9ZeXs6z4gAEZAeJhn3OCXZtBmZW+ZWhf9QbYZ/b3HHwNwmCzNdRc3eBV7Y94VDvX6irIHQAn5lFdJVOOQ9y9l6buX5l3Bz1wjpOmE8rezf5P3Eh0I1RLy0kOkTEqpXl0crxGda4hcGGczE1qMI1mcFdG66DxENuYa04I7J9SiXVFxhqJ2QUnVYz1L+KIOGXUepyjq5eCwckFoCj65gWLazjVobeZVkpCNaW2K8uPET2o0b+z59SomvZg7gclrUNMvBuuV/P4+J0mDCLIbVRsw6JTMXjuCNZwn9wXM8u1Kpe0wLUzjmwIsk0rMSrWebg9oh/1KJjXwSrITnqCJXiUeg4hJL3CZLjNp0SHDJqZXWqz4dy6vQKh047xBCGURS3AvUKgZLefKy1qLZVPBiC4L0CleaZVGBZWHpYWoFdaUVZ2YjYg7Jo5SFsrZDiYfXcKqVc5FlWRwYQUQXgQ+SBS+jU4ETTsnLuX9RQ5U4u9YT7hv1cFmAO6KrmXQPPEMCWLHMuIXS0fREVXAhxCLm02cSwdawwzMNJAuYYXiMCw3YQhkWNczLW5kXMpWYZRF9S2kZXg9QXKhq5rXlYl/57lKShtjUm+L0xAjYgVP8QUkpZTWsxim8kp9f3FUxpk9wwMukqXmQs1MpGXC01/MJwCFeTQCd3NoWUYOqGKjK2Bn78RqAxA4fEsqXWgjBx9LFf0HwBAIb5lh8LL3GojP7RHdOGLli10RZzcRLSnxLBi3EAWSunPEraG4rFi6nmY0XhEJV+olfMDnzhhiEDy5/wDY8VLDchrDrGzuDcY2FjBoIuHAxBwAKDaKbwUwleZbgsdS1bKfhcU7JZZ5fBbgXAjkNMYLxavcY1ggLSC5ckv4vQYlCjuHwGG5YuFymDU0e4eou5tuXSbWWOqWCm+5alHggpRvAeZaaLdlPdyqlvQMAHnT1CBkbDSRDxC6MrlqF2C+TcC1JCUwGw8SKgEeOmJm2GSMVRC3hXb3EXRFFRixSVpbhUC+IGMUs5ktlRDZsOYsUysRQ18cZjLCGLnhBlLBacfDVgvUWiz+PHiVJMOuDNyvhaJQS2BaMo9wkcHK6f8ArgEBWlJi/MPK4sLR9biJTbizmIqu2MhYQ+2GhMAsD+yVSvBAl3uL22r/ALh551btHJ/cDNHxWYraR8TG5mpYElzn44kA7WWTiMXLo8RwSzBLIFgyhpWnZGUc5g0x27mCgDmjKfBRtHDqAL2wmV/iDTQeI5rdC+4dDdcpx5iRlMmQHCSyUBLLqJiaYgRIxVjaQSsxKiTou/Ea2LitKd1cbAYA4Kt4gyBIjOBth/NVgKRrWqRh/EY6iaretoiaNRuK4roioTiAJq9q5hggNV1gjT7hd7X+LjoVF+JeMMMCLyw0NwSvIviLZbir2w9QQl9RqY+EVYwvLKUDcqafiM5DVUBFNUr2xqOLqWO40eJeK1E3LyTiFnXiOnBUUBV4YOXUK3iG2+IwaywORNQA7QFZekYtASjQ9EYqLu4Dbj/u4AGnSwMDCVIR/DN2WkKy1epeQer19Qo7Usp04xKAmWhTx4jCSGNAihHdKh9QMMOSN06ivOBlHmoBIOjPhT7uag0GMdh/YyznZYHbkl2aDbNYZxUBc+Zq9e69rlBlir1qM1y3cWLHEPMBlvURLf6jDDWhe0Yl+IM9V+5g1mUIbkV0FdfcZ4gWqKx6inR1O1yp3krIhUDyGm7fyNE20YHVaIbSXy2dQuQ+2FND0j5q48B7YLQ6LikLo4Be5ugZ2hfkCBR96lvtdMh5l0xfVRWWB2bgKVuA4iuMxL+CVGGfhEzKxFQNRrqNVPUomLTbTXJHEsTKVpkrNFwUeo2sc3VQwtjGmJnHhfHUeVWXTRfqJPVFrPHcr0FVyiXV9rzcqCFpc3/sehVAXtXv1GSDw1KACu2JsZ7mWASVM/FS3ETcuxmfMlI2TDt2jOIjYEbJLsgIhHd3FQ8R0cXBUqCI85itdrFb+ECUMFSOCNWA4H7luQfMATy13EqC3BALCzD9EdVeigdFRVx/Ln3G6RBQsqeezOEx8DkVAXEI1DpX7IJl+s0YgWr7IPTbjV9Q6eqAxeM6/iGwkoFhrFjyalgCI1V1BgEUuz/gxWgUcJEjFNXAdYIXXcUZjymYKb2RWhY8xVLEvOovGJVyoVNIM1viOoFxxHtKHmIMwTdMCYGN0uz0yoXB08MuK9QNhP1FGVXp3+IYKQKMRzdyzKbpjQa7Yq4DFgVXucQgDqArVV8CovIVFcA/n6l+qa1WrbqWFRvbKl6BzCdhTrYwcwpa231LtlPklK8EFyp24o0vZ9QoQ9NodR2Npz8AblExYjhfMbwXQm59xLVrcWotkKxytkwg2ZEmsa8wbJqDBqiu3b/MJ4GhIL7h0Eay7/cYwCkGK0/xFo+YUvZPURStkdkE+RcAQqZENxpA1USzpajoIqpNNMHEYD7wD1CCcdRyFHpv6mz5FL1fqJt3vBBMWNh/Mrana6MAQa7Gjs/zLnGPbTCEg6rSF32cdQFpURzg5tSnMqEuZ2PTCZjcQGIrobXRADbsmTO3mVXJAG8o6DfiIgzk1mozTV+Ybm0NSyOEW0pXcsPmMTeal1xEat/MGsS+1D4jMQSCzGaphrglgSWdwiooBjen7WRyEDhRQgbCen8BMAda5q6cMqlJqgeaNCVKyER6Yhgoh3Zy9X2cMKdsphhiuJ/dRspRAqTK9eo8dUWYouUCJXgHqmzzRH7Gyk5lJAHXYRXHmUAVEOaffc5vOEUYC4aykaEo2eJ2uxergXMgtB3LVC0GWKiu1tOmLibMHWAKK5riGyOK8ytkuTHrMrCtYLZaZu2LPRwSgqGD9xHRliZkoIqU/wC5lWiKyHI5VjhtI9NFfgvB7iBnm3eZqg8Nr5jSwuEpjBpqNJiRcVFHTBLQU2Xyf93LcbqZnD3HrU8YnAhsL1BVqmfctafxMBFogxLlUJVUwgUw8xixDUaiXIl35HmMj84oZkBlcUSi6eDyY29XHUDcCURiu4EXt1LekaRhedSh7lt5TNi4eqFuruOqeUgmJTIIKLGVohTZ1DaOOkbQQ5JWZfFxBELCo6nEjTKFrHLLkJbCE4xVYHKNR8cWw+YACaFg4jkiUmGLBuJJmZgBuL31ELmmxPCv9RQsXZRHR/En6iUVz1wT6E5jpIB0DjO43O1vqFIPEyUyDOpYVxL8xSBZoTh5iXW2OXSVWRULAXyDb+4tNaztntFXD6XHpAH8oenTQPwx6+t7b66mc4q94sJ3/iUgDCk/LMG8RBmTpQgUomI3cbdoW9fXctxJV0NxzBDqICbm1Sn2MBFGHEu0A0O7jFKFf1BAyHUzRTjiXcKE3+MLTKWXNDbLJYGGQLbpsjFrM9x+09Q6hB1c3CsM5Kg2Ym5HiXX/AHDKOUDs11/iGyovRFQEWGpbaIY8epXMH6yDYL4P5m4blkFLBAzEDCSBU7eZUVM1nMpcr5TqKlNfRU6OSw6SMnpyph67ilHCbGGqmGpZ1BxlJ1BIyYO2Eooo2ht5fhS0Q1E5ml6EGys7l1hahX3E0NVjlwfmVkpCHRcskriJvIvPEBtMUP8AQzLVvinyPr5GpcSXuUtIhKoiXAS92IPvDGZhWSuZ81ATjYZu39GVXOUgL5TK+DLAecaluQLp6zGglalq+/iogbjGejBHkmvRwcPEslKWjwyzC1T42/iOgmpi0ToIrZZnh8QodXFVcNyosIGPvUVC5NRoiWCXuWIWm43zDkihiFYFYFhcUK5p5jfSG7xCSirwSjbIMtS4uSy+SIbZclovHc1FxrtM8+pdeFOPMTsAHs7/AIhO2C1glX4dwxKP8YzY/wC5huYTOYuAYKYGx/UcpnKbWJcLhKpV8GortNhSMr0URq4dY2RHpusIdpiU4/TC1hFl/iOYHAF3TZvuNZ4gHII9hKdIpVui2OzcVFK9CbmASfBmGphxbLBTcWiNBuXGxT0xrgczH0xFWtjxvkuVEUlAraoX+5YLlvMIreVtjtZHGBo1/wBuXViMSZxqpqWUQYszoD3NIrMIZ2CCjesMfgTDXdxfiDK4qgB+tsy0kaKdvpGppUjumZaX3iqj2XEXGvUBO12Y4Fg1LlWC7SqlgQvFwTUZRMnbLQ48QwjCuSGwEPFy/Uw1Fr6Lp8THmi11eYAOTF9TB7lLB4QI6go2SmmyrESG1swkUl0AOXJBhJVbFQ0uDdF5K5Y3gOV0IUZBNhuDUW5gTZW4lxLuW/CVj40yzKzXSAkyaT4WBi4KQ3CGylh3FLhFgShqjpcbfgvfwRwLTXuAMGWVeOY1WeqK3jENPiWblX+5a6uatkIEA7JfPpH+kssDA26IyK7ZtLdMEPuaFwcxaxAWVjgHrEsfnuUVa2jUFixczqXiuIwXLFNR2IetMToDNlr6mGq1Lm8W5RtvqH6CgAKoNQQ4+UbTs6mEBTgHgggR861HzxERvDzEgF/GY0GXBIw10PXB9zLNfQQMQMu2GKruzh7lmp+G1wZIFYhqVcViy94/vEu6N5Zui49btmalz9CmP4REorOKt+K+o/ZNiQb8IwJ7Cz0x+gQRCDbOAxMCODPmWZAW9xDKQl3TErMEQYdQe+5TWzZLbu7JYk2RUwG8QG1mJ+wi0wc/C+KvQ4pQ2N7Y2gVEsSGI2McmaFfZ1LjKAUdrgCNqg4X7PUsvhlyLicjtgEaGaqPDBb/WkoinngyoWb0P7IMXIDaDzLYroYsN13FmyDDbX0Fx+zE7ILQ9CMWIZH7PK/qCGerazwn9xYnsspejlCVkCC12R2rCg8j35MoCvAwWzhEGoowoYztzKION5Y5i0p0K49oDp3lDc1PcGYqYw8XI/wCo26tvzVkqAyeIogijRKyAKriYCbfSFii9DIxEGIDcCyKEzIzbwA5mmAMxFtmT/M0qriI3Rq4UepZ6WWvUUN5ILTEKFYv6YVYlQSx/64PZqJThdvuA9sHXmKdtQGiUgY2NILzEZlom8Yf3HawT5mV5AI8YhYKuufzcSpVwk1tBZwFGIYAWKMJEdaKRhISE6LxhPbn8REI0ywjtmrj1rcaPIlQ3tWwuOothQtczC8O4U7itr8wLhmFMPMpitzMltpBYWwo34jKlC4lU0Xh5RQfz+JbK2rcJIoDB6lMRb3C2Tj8Q2nB/zH93EbiQNo5ZYz/oZd8RMLogi0QG0K9ide4WTYjKC4RS4xKWCImGUO0CxGkGOSUYhJdEG5gjOcB5gOCUxMxoi1BnLCyhR2QDN6XKjeeJkkZB6Iy1pSKufjGLv4GogI1MJG0naTSZcyv1M5f5EjlFgvzC2Vb8xXhUsOvgCXERfBLmDEdi9czDbIFy8xGsgps9Q0kThjdy8XWLjyYtauvhE3dhdBeo51XZAQ1uXDMtwHyRSy9FwbnsYikyTnl4L3NyiG2o7cJRUx2DA1GzGmMutQ5OplXMGk0cMBNbBV9PYxIWmbS/zBFoUV8FSov2XM4oCBmOXGGJFbb3PyQKZVxtM1qMUzMCp1lHaG14zca5ljVfU8aQSIDQtxdWqYBtW047iEuw+BuCiI0nMcCuymh37iwXl3a8SjCrc5SIsWx2MQA04dfuAonecSjmXK5uZqi1HJBLDBMXQS8TzXFzeP7i2MP+ZtYy1My25l4xZaFVf1BGD4K68AFt9yn2VEUvmUTzZdkQBTEdgyrvx7iK0XFqyqjDdmPRbUG8dPTFu5ohovcxUvuA6jPsv52RUQUnsdMtVP6K/EDrKsMOS/1Agn7f9jHUGLUG45jhGjiNQm4huwrr2zS0HxH+4tMOeWUz55hAEqpZwpQ8zHtrTAYEtOjuKt0PyiukWMBNtkJT0n+JZjI5L+KhpuEJQrFe5gUQQvmaOYHT0PH1FjDACKPZKiM2fhOZxVkEVYYZQ4oP8sVo7I6llD4GmByTFFYBDRSLAsQmEph21cXzGzbnmMMS9M2GHj4VK+GTU1Sz6RwzrRyxTCkRCJcPkeHzLC7XIB01NszE46iXmI1gfxMOoRLgpMfqVZq3qLY5HqG3dRbEuuyUl9ZFjaRIyul2x6OIPc5vbD9XAN+h6islwFlYhCAyauX0UTFRVVXEubiqjWEO3RdRW7Xcpmy+oYN3fFRa8ylDrXxS2CuYUvH7jAMvkmTOkgrcc3HqAjYW6vmWdaSytvM1qI04huVUuqwx+4Tn4ucQLg4o0kaVCs1litOT5GDgrOBjDxnKErx/zAZI151FQCW1qEp5/HSZORzP+RaYCxA12QSO1aIPWAuVpIRaqdp/i4t+prcFqq2JqbQh6EW91j9sRm8vynXwHSKPg1KXatQ+YGw5lhSNGP6mG+oJBP6EUxte+pQlI+tWr/ERyFjHEx4huaQxGn4KwkjSQWPSTs+4Ym1iGOaXUVQFgZyICrIkyNncdwal3NGJuDiJSYbiCtwikYA4lgLrQbO4npC6MPdQIxbVzKi3BoiuIVCJQ6mVQywW1zDNgrKY+mELabbFkfYJY6mJQXziHE17hhEdxUlk6yleFbYxFTJ+xBDjVgv8yxrO3TM4B5My9CXeAe5gylMAS+4t7mvcXMu3lwwYcmDQQ3QBR5RFq+1uWkMd+bQyfZFI3d9kthcmxKludw3KgRNYiby3LBLkIlMsNb4hLUKFLWVeDcDEGax38JI3AMOe46PKViY6CsuktRQJ1BZLIWQ1Ett02RwdsW2GSMa67rmUymKCijTWln7qeYG2bgQSE61js1zAoUR0X3nzKHcR0DpeoglvyPh6hQucdXNfturau1hjUQb1LEDM+fZCaYp5DMoAOJQgqtARXWyI3l4l4gXMkVrE4zOiCKtYLopQBthgrAtLiFiJUCwURW4zotaCW4pmG1gJlYBgKDonMYWNmI5CsCgLpuMFuYouJ5QJtKuDJFN86jBxRVQWKJw1pfhLzA3BuEwsygUIiYqUVmVtpijyRS8qAC3dvHiPGPguiIB0PyjNZ5J9HwG/gOAVJzUdW0sqrgLuoHaswYXaQm0+T/qaSEbQLj4FVZ/ERgpGCULgAgwar109MarFpUBExDnFR3XcUISKRMRBG7InVkNZqWhp9f4nYihIPSm8xVcUeJU0ltaxOzKndRC1MBTB6jSALeTULZ539x4VgHLFkCu1YtMtBxHXAV+ICfCR2QL1APgRWxm6gXDfyErOWl1cRhKTEunzFRQDQz9MuD4TI7jDmrUR3ctrG3hc1NPj8swMog6WNtVisd6x4mjVRk6UivVE9LhcxwAjoqhwe6+5W9p87IKwgrNHRLQRTeFFxkvIbfNTRslj1/4spQx9KDFMNdrGVX3McHiHOLZbdMsDpq2bCbYZPM3sdcIq3UX2ZPgt/GQljfwxYZTfxdS3Tk1BVNvNRY5PhFJguCFviCGoGDmRsqcxl3AisgefLj8QVpsi0ex38Ez8UR3KJaxMBOwXLOMjT3GvkU/4wjKr2WUsX7gkCRlEv3GhcUNfAZhRN/BhiIIkSlmGDnTkYpcgT+YJ8Mg6mMKzr6r/ADHz8O1Rw/cSma9RaaaipZRGQhJ1ZrDeWxQUrvEHM3R6CNxk0QoVEr/UvZZ/3EGS9I6PFauM7u1YkVvXJZc9SU1kTeDzRArYdnEwWWStrPeFGb5iQYNAxCqlClGHSIADZmii+x2QXuKWIa2g84iXAzSVbKd2OMyltjfkiro6JVEZMmCkelB5Rhh782XaJ0rqXoyxWT8wofAhGVVnMxuwxbPg+FUXBz8FqKNApY+dV9wQiDb6GFkofc6eoO4I3lHKyH4RlQMi48hj/rivQ4Ep4iKW3GIjXfALIrUb7WKG4xO01UpLNPVnEEYmOVAh7GOjNkW2Vg38NoRaysQgBS8JZqYCkQZVYYv8m0LMqdT1mNcQbhDFE8MkMlwJerlFe9Y4Oo5M18NjFeI32Sg/VF5EDd8xLnCaikSmNEvRAuSWOh19xmq2vMBg4zLCO4Ep5IKMOLX3r9yxWZBwOR8RObxRo8RnTVjOds7r+4EB73KdsBv0D+0Ds1SVt92/zM1YWLR4Riga4BfqV8nFkwIy2xFsgXMKKADgCjErFK7xNBfaFJXomZNOo2Efx/cR2Mwm/Ql20W6DbAHB9SyKMAylkPYYNWwyKqY0gXTBBtVMnvzFNv5YYFNmSKH9T74TMK7ionOZsaQvPMbbeHmVWpvmb1mBVSU8wZrBnKLjVCn2/Bag2RyyyHHgmoBAghVTP3MaGV8hJXuz/Q/91LiOAoaZUBeXMPcdnhlksGu4CBXUSEtg82ruLWzWHUKGLhqprVHkVX6qK9quHCXknkWnj/uY/V6gpRqmLNOOYzGBvBnPONSwRI6f/IZMtjVlz6ZT0RC9HX8wAW+yCxrDn+mXOrJlBn1G1uwuXs8/UUqfsILqcm4Kjwo3P+XAzHzTo0YiNFIonXxqXDUcwcJd8PPxfiGDMOI2dS2GgwShErEFv3HcZAEGlpnZGsuxL63Kq6mSyVtRp8BbcMfAWsBMnqCKo4fDCVvgPLKkll0JZ1u7aIjjFuBccRYrlS6gyo0cDfEvtG0LambIbTUXKLjhDM9QMRQY96ZzMXtfV/1EvUE9/qof3BNGEKw8wmoYcFPEXwgQVuGvEXLXBB2hdMMy2+5UH1LAWqbqxaxMA3tOFlmYUUD+JRpiWS0sWtbjVLYFVKwCHCLgYCuUcRmELXqZY87gxU3lVkOuIKSn+mVCzQAMDnotBRhCXoqfpyQS+CqrD31KkGCeolyPJL1tfRlMgD6UEzXEVQbJVMoAXADKKK9y7344X6YnaGb/ABpgmBtC/Nh0JgGsEdjCdd+42RYrj4cxpApepZHBqKnOTmEQGzhmMLQLXjMKi1GRJCdNGWbAo223LBUqzJepeeDLfEEmUyR8J27/ADM5iKngwdJ/MVQZYFFp+aILo4SPiEBdGvcbQIjEBWuZR+ZrptZB8uCW91KtwdBBJglbOYiwBM236jbAo4YCXEwzKg3LDV8X3KKNp6lDkS4cNdkr5X8ESwY7lRgeiHIQEWFNj0YqK2q2wO+YCl1Eg3jUT2ShuFHqYoYd+DxN4aiXDZA9peY6oXB0TZlh8C5gjGBvV5j8J1Vw7bglhNH/AKD+oAMsoYD7gPsrGxyRym+HXYOsxALImZDkPMdqkjHZTVwjBasSfkiZtTuxlnU5TpXviG7J1z+XZKp1YJR3ZMg2hUG2ICUNd30zNqPGo1u/5l8ANY2vqansItU3HyZysG4xQQW2yxalTLgkZsB7lSLopvmOAkDMUnNcxtFlVGSNWMH7mYariYr/AFGr3DfEodDC046CCs/mYK4kbNPqO4L+5eF2cy1YSFoxb4gAOlhRUfuGnw2lPdajdKbrbcfDSFq7dY68xbWKEq2LXxWYFtoPVfDFUoKvqAwV4WrPJKlJQeSK0hcPiFXwQWQHuPcZTUusTBKiALFu1BencOy21MwjyEUG4WXd/wDBB/EzKI7HJFCgr4DVq9RDXVlu7lIdFP5TPcYAmpucyHggarTaVUY4Ls2S8Fe4Ks9Ii0iJwzG0qzLONymmo61qmWBzEuVLIgZlhRLM2z4bzJgX8Gm4ffwgiXEqOUavzBxNQcxIVHE3Nswh3OEHS7rzFiQBIYgUyr3MF2Od8rIrCX5eoNbg3EuYJQQbhxAr4qYiy2ElbkUqzK+5fLcIg9FagvzM5VblBrcjXf8AU8AVnHuZU014iJv4uWDsxFjqF54JYSYuMarHMXLsMFFY+CeQfcFvMt/qNp9CKQ/kPMEw5MhIdFCXccK3puOBcxS5XGUZvbuM2bdx4YFLnzgiKq8sIFLqtyk86gLbcaI4lDuoIANq4mCHiDU++UEysTPaIOGoas927lwTSsruJyR2tEOUM3dIgBUswnMFUBgmsdwgIbeV5mzk/oHqXy8/BpDcaviGyUHiOLz8Chd/EVnMLHEEw9oaBbKxQpsdbz1F4imMpmDRKh3eowK1gPM1qy2jn9QylnyGI/pthhGWrHQVt7q/ctRw2C7OK2h1nCvT9PLH3K4H9hwW8zb3MDEWXg3EsJ0u/AxBe5WIvwpOgZhBeiOOI9tdppcBupfUu0UAlUvcMjUNUZYeFdZsqo7h4K6WL7la5t93LGiORoZOdfUq9YqmXGMTETNJPv8AcF2AULOpRsAFKFyksIob7l/YKITqERIpl/B3umVhEcB0AhaVcqYKIW5aJkubBZwOZctYFdACl9kFSbjwqxnl5a9H8wZpsOZYC9Yr2eHZD2BaM8dZjJQrAj4qBx2yrQcMQbAQ0Q3YMkcrc0B09PiBcEScaUa/78wBFvoREiNOr5iRAOMRE9coxDQ0FLwvMZoYAh0iXC25gxHmNCBlgHuI3uAGoyZlChVgt9opZbnmORjNwBXR1CK5hr86I+vqWB5ja2agOVB3LqXVxElPcAg8NS2hSm/bBLEhU7pqJgF3eoyUuFVCFgiZihi/xNxWXsjaZZggFhUcwba5KYNKpcjqBEi1TCdaCsdTfF0ckVB3UUsS6u+41ndzGYXFCXc+sdOS8xej8wHo9xwLmJzktRduoqGo7qtwtHizfmBVBQvdyRLXPQIIGmYzwxbEBh/7uElvMqCysIayYRCrmZxaBeH6mNA4LBolIcHDDKbQTyRqSyai5lXDEV2RYiVn4rAOcQ2QHxKzDJd/UEOCoXdXUsQ4ZSQ0SqniBcZYQVMtVL4isRUNE8etefEVEvxKzB1MUhmuIyFN0dCCzEuMvEH4siwamYcGO0ViAnEVoIxuCpyaXmGGzBTcwhc4X1KW3UQ5l3mPD5oU7lF2s/6I/qWUDb9MU3MoYA221Ftb3NbeEI/qC+/uUeIHOIMMpeXqWXoiOYKVrUdhlZyfzFSfxDMIpSoq8xApT7j2edNwOFaHD/cu/wDMEX4V4ibZL3LKrBxuWNnhRHac3iEoCi6cXAKus3E7hx+pbSeA8RyK5l3uYot6slht2yufpHajnUNlVe2fviAdQF+nmLUW2/gGGFOSG1ZJsJFQdu4fWrzol6DewYvxmIBU01nqo5FV0hI/WnGJ9KSLWsbM/pySoKJaW24HEEBYRlogx3ZGoroFIxuJbGJW6TTELqtyjbDVRVVb2xQULTxBicxQulJWxKT8TIHIYV5lytWSy9sua+ABALUIGR6hugX2/ERAU9RRjUu0TUyolWrwYuCgJpKjMCrhZ4zLYbDkoeInWNAsG2rmxdvUW1XmKTiAVeOSCRLAsjJzGh1EIuoGVp7I3HrH3GGBcmo6kqqDTMPhKnWDjzHSmOhzHcTc0juBj4XnCrJTV34IKM1YyAc/zEFaPMob1Yom7FtGVf4+oClQY/4sExhVRVxElNbdLcuSzq1lwAgWj7P8QQkLBEdpxMSxqNTmyFOMLlPAXuAANEq3zb6qDnztuI37IeIrMUp5VzPFTANQENOmMUyyxhQlEWfE+g8xkgM/GkS9YiaI0nMQ3rpDmniJ7AZZlLPDqJqjD4jk5J/wgXbfuJp76iuyUVvfqVcVazUSzblr7ZYooJcdze+hlxUIi3RCIbEX9/FoN3FHEaEW5TF6hXJ/aUiEOjXyjlB5tSyBaa35lioBjRGXdzMiQoM9y7+pUM7i24hRP+M3Opakgly78Rt1f6jm38yq1m/Et+l2mmUn6URU/wAHO4HxZQH8E3qTFCrh2G+JkTaYmJ2VVWp+QmJNU8aFZghmmXX3SJFbmnwylRdzEYirYkwgxVKNzJHBAvWfh4zTcYO1mUCtQXsijJkjqDVBbFUA041FX1PZERZFFuI2JxDtNg6F/wDIVk8pwV3n3NVgkPDMpRHXxfEpmCX3FmWA7ilPqJiCsGPXVGiQb1KFXKslePmKWppFMA1KZZ9AKufEN0WDAp5/x8EAq9QsguoOlJYAeAgApCgwcYj2XVe4+hZ3Mj2TCEXhhc3HHqdvHcqY+AZ8SleZ5RIBIZypIUwHljVWb42g5iol2QlkG4fBgKoYgVS1F1DAuBEqBZ2ZH5OJqZ28D9QF3s4eSUBtERsNMO2gwWawxQolwthxBDY5gwPDHL29kohx1CMzPCh79szwCwu/aS/flNi9td9Sml7FPcElw1DYBfX+UEum6h/vONMYLWbP4mICYuPpr/2NNDqRfMN/BFGgpXGYoonw0Ja52zekK4FIRtCB4BxMNyoRUxBQplCWMxBGujm9Pcogr4qGBn1NZYsW/SUNWqydkVYm+HNeIKI+KgmKuujVvqBQJwtDuKKUHqNhVo0wfhwzZAqJceV7F7Y8FZwUEetxUoOe8/mIRAE55l8quVqJfZaV1FU0mnbV/iBuC7b0ETyE25iIgu4BLqbfh2BnzQQOdNF4PUDz5rKpv8/1G7fy1l+pjiVKhjjMNprLQGKe5QqChUHQTZc4kYbo7ZV87NBVlRDyP+I5SC1cV4ja6g8wUaOTiDjOQMIq0co7+oZAJcJ82cPmXlGdgrXJAlQ4uPwLiItXUwhm5VQUEa444eoGL3ycGLQyx8fDkxMYWJeSBDqs1ZPMtoTVtNPEClw7jNsLixsgEiYcbiVT+Yi173c03dcTo2xaV7ENkahMgC8WwAlwa4SGDFVciJy7pw8XGDpJawvFbYppzNZx4GBAd3z8Hcuj4TEtcXEq2JZLBTKKfu4FGu5XMmpXSVREBFm4WnETENTKu5viLZW4EFd/iVFi8N6gXhzliaamRGIia5gzW/5uDKIdkzlfaWwtkfCAKTzUwnjJSFTXnMdjwikJsgDw7QNx1ZQ67lTHxKCYIt/BRJshlCQQXKVUaTDTfhuBNaZxDZZXOIIKg1BKwFwVpw5PMcpmgznHw7r0HcRdg2LzwEWAjSjP6l8DYrcFVOcjHCPXwgDGFA7ZhaA37ojeQvabX8k0+FLItMG4oosLzBAzLiBV0tIlClDmBRQWuiU6UP7DCYQ3HMryO5kxBiY/+AuVOoMpolYGw07YwW14gw38Qiwv1HJh6jq3LPBNd5isGm/U1GYIMtZ8QGIazuFmCMv5ioDYuheJXEdZ2+YOwjCGL2Q1B2R18AqWIWjnMTWsvtK3OSHbhzBplo5QzHVLDJFUoo6iWTkp9QVVAXjqX/LpILSVorPMMUDwkRKawwbuJbODcbI0eCFiXnbbzUDldmsH7gglxf8A2xw9jYW80H9xoxZ0k+kqWCl2KhmHvZaqVzqO6zTYs9xBwoGycBghJIHZAyQjIN9rpiVAblVBdTCUkvldC6el9xGrVgVbLIlSjcs+NCXUNm5+II7VOg4DqDltqBK4RzDtGrFcCE5dUEOXr7+pTOFRvDmVAaGblTBgBx5e417vpuv6i2BVuuo4IRL+C1LUW3JCDdOmClXPRAq/gFRKDBxKYBU2cTGZbS1fpmJRmVz48QMJBT2nJK/VpTh1HwJsohZb4FyvGXLv4uZm6pXX6uNNg/ouikVDHT/iOPgyCpl0UX9/uIEl4fcY6ZM0hwWyvjo5CX4NHLKgo6ICBzUD2X62MphHGriVae0pVv8AEENQ0lieyMyuPbsmf6a4K7lJaoNoPRtDicdmLa+opwXEWeYVkAZ3pIxOvR4SYJ14J50oksbxlF1GyxsJRLYbz2dZjIJpwralll6ENq5jcW0bvzUtp9MF2ruE1N0Beri7DIYTwhgWxKInxeJXy9Oa8S2Ll3V6YvwbpW5WLYMtVXmCarimG9/iGuPxEHh8ROgHHLecxwPWL7V+4QHbB2NRrF7QhNWVjnj3DTYGsia3KHKzSA2XXfUDQFyYMsgQK/CIRuXUFsNhKILsDUaW7l9TPXj46YjDDz3v4DEHoghvccO41bv8R74YTvay2Fp5lr/JLgUF0hzHZTaj+Y+JVxB+7H8MuVNxsjLogWMyuaGniK0/mUCCMoSo33qXEpCruVDGpkZ2ysRcwVBLqOZqbPMtaQtpcvqKZRUDa/qKA9sBr6lnDQQ8zOuy/wARnoB34hFMK3EAZl0rqNjUNGkza4QvHn7loTktrOpr+L2Uy4zHBI9wCbHcoB4CLuNnVxfRh5WKqbQ3KowFQZNlv5ILEY3LzzUwQKmglepXV1Kyg1Rqc+/MarJTAuL+FYlZmsMslkuVNnG3wf8AcQsjEo49vN8RIx9r8GILAUw+LhseZS9TAJVc6lRVsM1jmA4H3Hbmc8+ItQcVMkrfUtb39sKWtUr8YN5jdhglZfgEbxFx8VZKAi+CMFoe2VIhd2NTIpwU2IYH7vmtwKlkNjPZ3FLFEEqp1GBBsV/mAhFXNQaSxB3Rysomtbi4ZKIuk7KRe6nuJuZYi1KqDdDMtDXwRq9qnV8xLtoq0E2Bmt+w8eo9OZXYSCW0T5CGUWF24/DA4MBbK/IZL1MNmh+Qx1EtgYYivwS5rzKIhDSockX8+Bb9yzVzy2xFarLGJ0NjYmvuENu/gpJlWmrIn4BiIC0a+riVvMWkw6hKc3a7g1KMQEyXdwbgqAuWpY/Ab+GCypqWRSuyF9DmUiuIOxbHYnuIe9dI/KWYXdbVjGTqPiH7/wAk/wAJm5FE12mWpYg11RUvFJ8xeNALTz5iIFkH5J/fxiSZuDYfTT9RBfQAHLxk1ERhkT0YjWjdXLrt3LCLYAxBxCCceoKjFmPhhFIblBCiqWLqG4zkMBZCw4YmEuboblq8GlVTHArMjmHoAi6XrLTz6YnJqUNGMxYUOClAxLPdOfp5WNlHKBCq9Rsytucaq0NxpX1XKRswy/zGzuOouAOIrQvMVxbK4hVsjSGVTRqCdlKnZyH3qWD3ciUwoLUMCwgXj9xArvcoWVT6lq3iBwFyKHbXBEh4i058niWyt+USwpI8QvUNmM/5leBhYFGy3jPBCW/gNx7lSZWGFOT1Lam0LV8soRuQ2xMRGHZHUG6tAfmXx0NBHY4dvkgSoZ6PcNyMpY8sN1F5QueYb9ykYtEVtQU4/metvmE7wR/AJYvMVsgWo2mmU1uWVug5OI2l79tyqnR4moLjGOR/EwtkVevgXHqaGZbRgEvoxBAwle5WJa7r6hYRFhqLUHHw4lVnEmDHZM2/gCiNNRLhkjJRothQAKev1LiGhmyHBswS1+UpbWW6+4BkRZ/CZpXe5kiRQDJ77l6iK4TmICioNnmBXuZm2pqAmhSksFtzM1Tm5JXmnKV+5RN3vus7iWDn+4hApWBqC0HwGffwIQ1FqGj5p/EthpUcDQuCUoxYAMHm4GwxbR38OQ7zLCwV3HLS/JCtSzHqRKw/FSofYIgmyyvkK+AAuDkQdEyx24ua9xgcHUdR5Cy/x9SiioGSUqKs4qY6n8RBBIygZlhyy0XRGR9EEqvBMsq2wxzM3AzjerhkbOmVFBPMQq6jGnPsiAo/FOBH0izKGqsKjspI6dkX21NQFeTaxOYOfUXLLjEpmXBzEJvHwqoHNTvdJs+4foZzVYqMtUbaPL8K0M86DKwHgogcRi02Ssvkf8xT1FaRipfSCLy1hD7YVZmdn5eX9R6kCuKuqI0UXarhAkoGcxjBebfLXqJ2A3XEvqou2FmXzdRhq84FxUYDpf0RdMn+r9Qb+DqMFLuJbG8SCGwBMvLMYk3K3aofiNG4ga2Lx1FJeZWJa4VPgSxxnkuBDZByMM5ZBFVKjzBgIS8IR7Kvg1FlH1p5WvcdCUbEcjm/xASD4uyvjqBWd25i/cW4l6G3n8Qox3EJRmxuH2K5y7HcOtiWR9MY8UVK8gTLFLCHQVnH+UewAhK0lEdFtg3HcDEQuDUErGmBqPSI8zAhuBgvB+ZbiG93BaNHGYkpE73LqjRtQxEp3Lb3GRpMs7OYyQqNJYe2swCAchg4RIEVDct7fOISO4twG2IlEqipqI7cwzNeZeNw/SZGJhnvGZW4vh9hhE5l82cHb0f8EfnbLbDhIjnJWoVHmtQmrOtRrwoZGMGBSNHh6jOogvqwXEYZMj+yGUrltJmm/nejsxx+5Ya3MYQjGxCyMXLiWMaNEMoizqGCF26lkZFGxaoZlADZxHiA7ReCblspPmMsEEBpeIWsTAd/HpXMG4HR4m05T8R8RQVfcws3HQIp/wApVpWfMLiRTSjFqscwRkUIKzEyTOIogKtB7UjkLEKpBmAV8EXwGkUSnEW8RNSyo2YGICUDBXRDeNJUcKH3LCXAJsx2RycJcpgMUNXXEogqbYZrjB3HqFdhZBBqGjNuomCfiV0gpNpNcEdJ2m4HSdRgzYR3EQVnUJ6AGOHOpQsuEeSLSA7ziodxBxEsen/D8EIkuiKBt8wGFlFrz/xK+KGUwBBuLDB0S0GvjJlYC2V1EualqKkO8l7QuWBgrqW/9Jb/ANJb/wBIrHuXUthFsEZxHYKO4g1zNYXiZ1m476hmxqIOYLI2d3EDqFun8QOucpY1zgnGj1aVY/jiW1ArN+la8wyTO6YLYrnmYyOs3+5e2HFsRsYAwBoiaIMXBuVKlkSBjYoCTBk5c8PML2By8kZ0L7Bx8YNQZcC0VbDwNvceUztJ9swtJE5I1jvyRohHBmFNa1e5kSuahGg8cxAg4cJHUhRJZTFQCxvH6lECmuoOR7H6B/mVoQ3d09GoK3FguJY/UU/eSu4eaqIcJs+4dg4bPRfEWQ5uxQCWLgV+6wfmKUgZVR+j/MV0DsyxVfFgcEuRsolkQuLRLJVZlsvMAy1d/wAREDeo0+EqCVatBEO+g14mSqYR7HJDcEYBlXAqB9hatvUpeNQ4jbDG4m5whKpmU11Mw1AF2e9w4iMLC54lU0z1LUMLHb6ZgE9v+YH1ci7bqUrz7YjShwks3Eo4yhaiM/UNaKPEJyVwmUaqQelCDkZavKbr+YZw/CX8ljMpRSGQ5xg+iAFN+I7XtUjgBRaAi43OkpKmwirR5llWGtqiJCtt4AmLatp1bKKdpMHlcMT120g3h0ynAyda6f3BqNGirdgc11EQINI7GIQCUXAjmVUSAnBmOqv2OIiGEGyZQyNWVLO6VGYsyL1zAoWwZ/ylgK6WEbmYA5gzVV7Llv8Aky9GLCtTWgqOSCkdV6Y+UqtSaq/p/MIHKBWT6g1vA/2DH3Hax1I8cbfmdUtFB9OmXQNmZYi6c5iYIUlkW4mIukyZSxOpaUx2s3zMULOfh/cGYUEW3qL/ABP1BRvfUAjFFNczW2jqAuCl77TWFFallFf3uA48f5wbjMOIrb/mmPOoYMQMRiKJquIYNNX35jAxHDNIhDcslEUqyKubZgBiUQab+GyCpm5l1DM8xDhYIfUUTBwkZqcotDmAiPUlkWFVd8JwzaNBffMU9Y7rHxXMRtFbH+kIgiML3BwQVdb1LYVtUe9WUYb96E8R5BgrgUOYg2ocOqj6aAcXzLggqb6MK5lEJNAqaA5lRTys2vUaFa7sNUy6PwMECALWDsI3O0p2znL1AWnojiIRqy6CDfNxSo2YDZ+aNuJf/wAXGOPy3BoVqU1zEL46lgwHl1MuF1asLiaHcu7MAwh4llhqOnuUmO5uP5QENkVducx8RS9VxHX9hCIpi6dsfQP3FaCvjOiGolE3hjBxHTAbmWc8RYyj+Go8VuZRaNrEu4qLmXyi/YXwXiXfuGyUjCxYZDuYMYPHxKRSsxGjSdm8wfCZWYCUotxpbhIsNu3+4vyM0uwLxGxV5wp2tVEhA56+mbQTZg7jRLxnxCWUwNGzriEEPaCuYluqPMYeENSzVVXl+DZAkqyFIW5mUwSnt8G4wjSRozSKpAicCZfC36mtpCrHgcvmLFIQQMwHxVZmpcAZt7mWO8LjcooBlYyxDSXPtCwWzJmYyQBOX3UX3PG26K51b/UvcgUoLHafsqAIx+ZtVFuUmxPcPGAtuUiC7vxBSmkSyrjfHfuQYoFmb6PDLk0N2nrzE3Erd/RKlMxgL5xFC5W+XzLDwxW2BYQ7b7YufCKh0R7jZTZQAv8AEIwanAcG/wAzELMxXi2ogYTRr5pRiZcgT9pTctkv6igQLSoI1T96FoXlB0x/cSKeooM1HoGA6Lg/KoLDVbTx6hpCX/FRSdgQ7iR2WpejtaFyltIiYlVuMmHMAdfUA86Fg8Mplo+YDFvKvBx9blxEZBweZlyMugfdq+4EFb3/ABjGzEdAl6jBrPqKibdz+Isb4EI7lw1lF4O2IEU2u/cePcEMj7NRUB3Qp6SXUYbI8hzr7jAX2llOxHDMzlVO94st4cw0CBa4A/cYFRsrovPqUhSEoH0x0IMAtvpDrS2sEOiNUDf6fp8lMCgKphnrk+8+4nKaqosVsAtYjdY30lOFLLbmBfMtZqbIQmkC4bJk9+YxqJj4X1Bcy/3HGtQKaibdwUMK9xhE1KWJs/UVlplddQGPouI/9mGVbmUdRx6ijDmYFsUKETCWFy5W1+Il/DculgzNpV/D6jgIX3KILJm5Q3BZAjXHMBUCVbRfEARCtCov/wAggBEKUxccJZRgtDwxLYW4NH2JKb1l0+0omjaP4eIILApRqqhwNmEyCCQFtLtlBmYpy/EQzUeh4eITNg58iTCy+qhO2bTxcEhWENJzLYvuM6+oXAn0QlRg2hFQuIi3yqLwD3z3EdZLChjXPuDpIyMlvwy7EigJr2f5RVlusf6jVy7WCRsb6lrl83H4UWwM8k8kagckGYYlfFQJgp9zxRQNf4RUiRQcRvslIIqxuX13ADIGhUQk7xv1EEbR3d5l0pVX5OJkR1b1DwKLtghswcIY0Q4zZVRWTUGKfUwhuDx8UBeYKiYrUFlZqZBKRV2MQai2EaiVEuCSoqv1FZG1AuWr0P3Fs0cHR/8ABczUKrppW4sBsdRk300w8FTamvTxH5t8ZvKM16crsIrS4OJuLXcqkwz2wCurPjcCpy39x2nc1BuWhFuB8LRRVzAhZ7jDDL3PEwPC+I75FI7mpVqXloIgJGktWMCqVQq/fcrWrsO6ev5lDQUGAcARIpW3AwlmPuGGPo4Z5D+8wE1M2UqJmjUP8tkWI5lFiarXcUwdrUKjhPBxFO4yoLk6mXlIp2DzGVsYQsuHhE2gKjiFIvR5mvgDq/juZ4nsN1LmGKpYBCWgeY7YowNa/wADUsZcRyuXlkNg7jKquAjIbuxcDgSs39oQCVW8xChtYnMgqnQyozbxaPMpfBKdV1n3GpJGq6f9xMEPLFwIBQoMEc5gZbgdjV40/qUvT3slo9ZlpHZLqnhhYn1Ku9h/FR6BFoZJGlasJsTKLbWsANDIZl5w+hoxUEqDwn0wSiNob+T9Q3h2Z1L7jAgNGPBhElFTX4x/lerCkl06u0fySvwsL7LSgvlxcfKmdHmEEpmTUyJgiv8AqFgFX8yhK2ORjtLXrjxC6i7JcXzE4A2IkSSKGHvh/EanIEwIwlbwvphw9+4YtoLunuFfKpzgAPt/CK7WVKStwlDZhlcQoq97D/EXNVmMUKGDllUV4gSsELGB8MbwiwayQsix3FmEwi0S+5lHdxwVDjcbpEByZhtzKJia3+Io7OYECsyaQjF98YjRNEl4r3KC5/qYeU4hqC5TiZ5IQUzA+RK/AQMC8y/gJUo+CQMwoDc2g4I4K+CzEo+LxqK6xT3KbEbZ6ZobthmMz48hqEjEN5VxDCHACbBL/EEDlp/8jE1NrmvESdwIyTPtVaug7lGJI2Zs6g+GkNGSZLBByqKK2JqYXZI0wMHLdNqv8FQS0ZA+Rc5glhH6jHg1mz6IUBOwJjXYZiqf9S78xLIFRUYm1sR3DMuB4ZlhrmOIC2KLTmeJniZln6ZmTJCLGZioIm0AYCoiFr8y+cZmcMEZN3UbMCrvkgVoDIj7mHBtYFmdBbzaRxzL4yNUIrU1Au2owulvCEUQrfMwL53O05xGGFsNYlBLhllVM3MMGTgjYwqh40mC5vvxBctjDubTcNn0/wAfAYC0DqWG4tzBjkilKES2IxJPZbIWxHuG9kusqWNYWdr4vSepsYQxQheCBVp6PHuGwFQUej1n6gFHaJUdSmroueY6gTWJeZV/AUcl5FqJiAj8HTCINe0NxcyKn0YhfXRY+2jcUsqhsuur6lcpbIBbR+2CgGWLtgto2HB17nQZLY6iLhA7iwBdQAd5V3f8I2ZtlECuTAcoGLiRYYy7pSPyFxqAqttB42YBeYtQQOL2WxppUWh+oD3hG5XgReBFSS+M0jIK9Fv7XKhJsBTEcXV3x/E5Tgu783KMZyAf1Nm8vwC5fBmaUasOGCLQSnMEJYZ20ZmFoBwgwTDd3LuoYIV93EU/UQz4sFVLqDiqqAazCQgp58xKlAFi32aiiT1n+GZgteR7+pY6N+JtGwWzco+qv+p7gUo/F6fkqtNNcRFQuD+RgepQbViKhgDYwbi1rjp0QPklCrW6AUClgsGr1GElBF8RKBa6Ca8Lft6iG50GAdEdqilDxi1fMqG6xzEqRMLkE5rjaW5eTUudmLMQSkrD+WDlbZlMDPOT7mVC/UULfGYirbKiZKgw3G4sXzZ5D3XovdRYNIoOB8lf/CZiIAli5Y2xa9yxzHMET4KtZY53bGqlFrnkh0gbiqKHI/zL/wDFzK1zFp93KdM4MPe5ZE5wezqUBUdReCKyWMqJkiqsuN3gfFARtAXMhnAzQqLQlMoIWPi0i1mCaiqeOoajqWEGiDccRjvAqiKhZg9GxH5QTnJAyLwTmaYf0S7eAoYYtMKtgqoUqN93qV4tA1ctzjlbgl1qGEUckxRS2r0krmuYBDU4Kn/wG4IIpuKA6IyEEoCMsx3TxHC+xWLoJLEWPcQ2HuNxtR3AVQW9SkOZVRghqJWHDLZuOM+oEXZlEYn/AIqX5A45W/8AVwQU7DmFUokuAHQ5iblAKXEvGSAh4Rgw3DbuG0f5Y8HDnkggBlp5jVyMgOJeMBVgp6sxBhKMDNPacwpQrgFfqL8KEJpv6iDwbVFvLDUK6hWKhMOPGYlF25hTEM6lUQMVKTUSmVCCtp/lBBDPemK1a7yIKtE1oY06KXhThlO2KXi4GI8oMcO4XbtUKkBfKWxVVW3tjTKqFcGLGBSK5RAY9YjYPqE5YXsNREGcGBIWVK6Pxa1CKy0El/uEQotnh8x8Aj5I9B34OWWUkMSu65jYRLTQlA+lhgoovs4SXRKgsxYZdcwEPgbYNEwxOXxyyvvtrEra5Q/YynolI8NnvayysArlsq+42oeCf2nXZ5H2EwYXF3+Y0vNbBrVx3VnLqAuMqJHgm4qvCHCLAlmAG+c7CX5vsedEZ7dRLUkAQfCGH7gsNDA21iUCoZxYRHF4LZfqMIMSjjPqMZwqvPuaVg54gNfQq/cUSyniCoqGafMUUnKm2IN7wtADS+5kzuKguXm54RBcVuJhk0ibji02E4jWizg6IsXIR+Q/v4Kr4fgAqLBq5ZIZDdrERg3UUnLB0++4ayVznS8IzDtikb0A2qg51eTuD2nnLeRg472wQsPQ25HE4ecBb7mRoPN4jRWrI8k34AtrPiFg+gsL4gQcEAeIzec2buSDgMrKPvqMbuHnvQLWAjCbHN9sQobAcDogkUTs9xMW8kAfjRGWruWL8OJ9H6gcYuPFP0/UUixvkhlNDH2xPVIjWRuVHqd5hZ+YKtMUuT2YQIIBteI0G9lKpNtc5jSTLWrOF3VG6PDxC9lTd2/TzLQCMsizaDfwlU1RZFfuMOiZY5NynMVsX/kF/XwGjGeIgb3LJ/cqMFnUsw/uVSf9zHV3QQajWYqpfDArOzFRmkYjmCQw4glAg14Bx3GxI8RRArLRLbl1HS9l4uF2xouTCAsWKOYBAr4AwRRp5mpTM4kAQWQUTCXeeIXUsm2Zv6JVI3kkTqEWrYx7RZMVhTfV8zBmFosjBMXJdDLHlKAAcBObNPhRga8CKv1lecHjzAHFNotPXWYCpU2FW+Ii1OxmxZQ6j+YaWa8ssXccunVdSzNiCqCGeqWIOBjMY1Yt62ETMstXoYqIAauAgBG6bM0tst0lOqpt4itmaPdsVFelKfC0ojA8vj/tx3ZKEBnqIwUjTK6ZqCFQkGs+JWqudBjb3HkxjzD+SLoOzVwbDjuLPMSCOeyWGBZWRe3vMwGxCokcPupWAyo70u4Jxd8KPaFKmcDMZDiGFykdwYyRUsIEH8L2iVHRoOJZBuP8JswVupfBt2THqYA433WW6FHJHogG9ETshTmfZ1LeywAUB0HBLYtzN+ItkRY5NPgKZePgLlI2NRQlDhcdF5WZcrHTTqCkzTXTthJBBsRAgarBK83V3M/+JUOoyYqi0REDN2vMoKFOL3P8y6rKAx6fJKEDfjF/CWVr2GGY2hSBnnPOUyV6DlhBHLVf3UfcoKUOMeb7jhScrawY6T38Lm8oalOExMBIdhbkHd3GbIRTxFDFYwIg5Aayr/ECo/4UAV5mbUaDgPEOB3IGIVggDcS8HQdjF2S24G2BVmJv9DqH7i91GMED+55RcwdbWd/Dg2OyWF/Q7iX3S4byf6+BDEQWNioElWABMD3AfArMQRziFcrQHJzFVZVc3B+NF5ifMbRX1ccKcBc/m4gBThwPfwEtY9DEH9jmXgGQdejNGyAlPikwN4UofsplxtCpO87gmC2w3fjMGlyDPbiEHxttjhNiwAaGOaRoRwzJtzEuIcS4YRygigWI73F8NUbGXU3ieCxGci1jpeIQMiNcvVwuQt4tf8kNOHFMJ4ipOoxDdHMujGfUFnXUS4YGcZlFbxFLQoWpdHqH3b2KxHWY69sckKelaWloHGWU4jwO4gqVD4Xn0I/acC1BXqFgjT4hgqJgbGOg6OfiCwKJzDRvqcz7l24UbmiJEsIlFEcG5lfMxEYOcxpOpshS+pWOxxvJMqH/ADM0NyPvPEYG3/1TCcw4idArKMg7Y8wSiUkeCDmCGgDwKfjqgo2YZToOKdyrlepaNi6V08+ZmlfRSyeoxOK84KmQM2y8e44R9q0jxfPiUKZDYYrimWjmEmC+pY23KLLJtMEbuBKmIOClIG4rUrJKLfGSMgKJpJe2+JmArXUIG9KZHae45sKWDDBamEzkdDtgvRqAdy0VdAljA+TFGyApmm545iVFOI5Cx9EID3dlsGk9BF+oSqsZHqPwg2MxtggpbPziBkYOFR03mJ3a7SC+kIvAfBmfdsQbhdr31/UoyA4Iu6smbkq6s/zKG5DRxN9MvMSsEWLX4jYoAez48fF58Uq23XH6lTT+ZRrrIriGIHcdy6i6QVSgwH7nrTN9k2rLeDie0Wu468x7BXgmQu4dvT7reo0Q2AeJeYr6qA0a9F1irqFhCgO66GI7uoUPARvKjOo5b0Jl5tywUS6vmYGoVdhaKiyxmeJyeEvMxwj4HxR20OGJq/uPAglddqAv6xKH1krQ+E5ixiKR4lB8HRKGGY+IMColQTmNSqsDldB3LSiZTL2Nn4jiKaeR7IQI0VdR3nBpmGkGifqIqnCQFQ1CHsPcIrFy5iq+SmT6IXxmctGTOo543FkoNFCz7hTcVIItDiZecYnzV1XmFFqr2g++ZmYOV3+EMlRM5yiGIK0KUfBcqtffXshfJcVLxKyZlw38KxAPsSY+wvBT+nfuZizOqmPoFF5/iXx5EydQFJCQg6lRmWsO44qOjB9XF6tvgsOJfQiXqDQdtTNMHRoilfOF/Bd/CT4TTqW4HBzyhoreSCPwWENOZcVs4uWzcDLVmO42JS+ZzuKe6go1zNuZdal3GBmGplUQEChZYm+TnEdjwxgRBqPq7I7AhseIEzcl8jXiXRTZbvzEYRgvD1CQDRoB3CvCXd2pamViq313xBibhpyblXp139RPGanzZjMtUrZKrVhxfEDGPpfpUfONS3vzO309Zm30TNy/68QRLKqvyT9krvH3KHN9wTeJS/f9QV69QAzriYLl28OzBIXCkw3GCqZyf8ktLyt+I1ozC+tRViC6lfBC69uj3D+jaAdHl8xxKKuIGK48ZmImw0MOQV4jjUvEVCRY3MHzLuVEEuHpOHwdY4jxBbjJGutwsNYjRf1FXiOXC8vSy1q7OuYbGQUMueYCB/7tTPO4mZgkKfcIkAyRod1GgaaVb6O5YKIF6XMYL+CKgKIvDEZYSWevQ1joz7iw7qHRBGQGCZcdxwKizHFkXK1lYkcS4A6W0RmBcCgMfUqNXp73FOJllESy6iSDiK2oNXUzZWkG4xjFbWtQpRvBmWFsdEoWWd8OYLtF0+JelYgKTo2lKMWVR4j8hmtu3Eth5vZFVtTGj/liI2FNRXMcLCglG2BcMEjlYnw4z2PkjtzVD+Uw54ml0GLeFF4C0tcBxGrMUe68vPwwZdRa6IGo/vA38Lm+DLELanXEwENpn3FxAvMHqArBb0D7mFrCLmJe9QYgvSQMCN2nwqylRg8xIxI/qB3dksgHnuGqDxW/uFdPPMriw6CdkYxEqKqaXZv+pYTlfkvioTRpd38TfwUZCGh/GYFmivL1BQ1VxFA6Ypp2QgmhxGsDBmNsBUqQSC8xCNAmh29y7ZliZmAN5Q8uCWC3N1WJmoHiq/wQPaWV3/caOFmbt7lCLiVfwhRFcd/BI4bhmAQCnDkfDMQAmbo/we43vtRr/OArGZTn5IsXLW8VFdFgPMRbyvMUReZhjl8VRG6pigxfgjjmlFrqqdwTbBQr0MRP8cl+Sy77VBuC8QkusC3t8eItcpFDAQqdFgi/EKiwbJbh9tRz1l7ZWBCZWUqHwaPqOVXK8swMGolxsqHEXHwlioJTAakKUOqn3EwQKquCoaAcDMZzfEgRXbBuXgBERvEC+ERsXzEiQZs6hcXUuiDHiJNIwxQBiET2XUUz7XUGKDPR/mOw9c4XHXW1UEY5RpfXxUDiOINwJdVQVY7itSk2GoMS8KEFYyoBaw7fXTXqMjtXl1M2CexJbDHr1wMT2jpsIVEi1+u0LWmFYBeBRMPcSsMEptlYIrY/ydQFyC4phlWKYAJrYv0RwDYW7lGILR1cv4AaFyjE9BYuiK1cPg2b54l5VQiS65jQCA4gWqvuBgDSNRHOlGPI/wATDZxLncca45nL+IigKujmUbB24/3Gba4rqUQeYqxg0dzgGQrQRPLjcayq3yfc4n6Uv0XP214ix0r/AIYwRLLNfxNsrFS+YOZUSoRz8AM1AvcLLZCA1egj08JZajVsgzklDUq4uVHN5xExC666jl2ygEF+b6hKmEKrKSnE/I85jROdIHJOkxLk6CNeZgw5/wDqmBWTEocTBKAqhof3NGnELqOWcGBd7jnXPEvqFQEDSPEDB7B2wN0QjgDkYxFC1hWD3GKqTIBV3AsiNXqOSKGhMNx6xSzvEJOjm0FQFKsLCKwdi8xOrhzFSriV8LXTFAsqbw+HRGBGkyMIVo10p/kl2laB/wBJbw1G09Al2Kg1JWTPOIl9YK6qV1rqGgZpubQvMlPPmMikark+5k2G+Z3fH3MhI3RVvR4i4e8NYLRTEtT3CoMVop43NecVktWaa+4nYJvIfxCADNXP7gtCdJYwNQbi3Lv4SyVXEFELVqH5DL2ymJdeolfARMu9SsN1BLj1jNyDK/vJZbefjBuDs/3MEGtsNu4Vl7wUS6umptu4oiaW+rqG6/mb5mQVMaahsQU3Lv6imvxzxLovmFwtZDf3GVT6GZkw8GAhpRRxMsEYZQIwdu1QvAAM3DSJFXFKpzGulLKZZALXAHMVAlQkGo96O+JwR1GcAasxfUPeqxj6Yogo2MKGMVE0lDBuXRHUwy83uIg7JbmGxqN0bexmbqXyvHuFnQhGzj3VRtVV0lS7JQxXUYQMDCbkwv34jNp4XcrAgEdXF2Vt8ylZvmxWMW5/DT+Is9SmvcU1AgTAGEcldflPiowXCYgefgCUSo5ZROD3L46GgpKrE6dsSx1MAF4gV1HC9fECvgIALCd9cQA6lNxzLNrqAgBdy6URzEGWwPMpR1cSmdPwGowxi8SiuUDeobFwbsq8RABpe46pecKARlliayH3C1wWX3zEq1/Uc4UCK8EJ0svcdKyctD8zDq+XYn+7ExvzCkwy7ibRfIik3RbZ9IKtnDALWVzBCVU/d9PiITQwjxBSqYIN4FDJ5JhTeyA/7iCitOEdApodsoPCK1BjUtSswUkpf9ZCBEc1fuJqXeNdRi5p5HuWvxLrEM5iZzGxEcwAgH/OzmZkzGhX4czC8U9SrVV7X/swsJDjLLMpXNZhV65iYXJuc+YbzyxLuq8Eu/PRLxIEHSsvzClrp0wLs1LJuOcMRLmomYU21aFi3juCF3EOBiKuiXy2WP0SrgKOYPTCLWsH3AIGNl5lGJWA3EdCmKMzJW2LjDnqO7DiAnKRNePEbcTw8QB5gUXiAwVZVRMwOt+4dJrrqNaVoKgU/wBTMwz9SqDENe4vqAKaTpiUqdqltsDBLVcqLiN0NnONybYAuoRoTQdEVb/CISqjWI6+Mrhdg31LV3O3iWkjXr3Hxk6vfYioy1NwW2LcueIMbRvbMpfhR8Far6lliBaamKqgKV+5lsFNOIDlhSOF7ruNqtsLRX8wagyAGuiCIErKPpq4wHKp1+47RF1BpuJHRcrjMVRApDDjES40jRlmvkI2OIK7/glNSn4vJJhDC+IFTessSNdYhqFe3UKr5hB2ckpJVCXZA+ETQfUupcF1FW7Ka6iKVuUQMXLTg9TJPkY5lQ4a5h+50M3MJiBxaaA2spFjAHqdr6hSQELWhGWEambdmlJYgjc7zXmMAqtKPzzCWpl1cOsXUULp/wAyiJZQcOoFAbYiVgH3NS+PiNhKNgHu2N8ReWWD8OYkwaFYoO47k+uoNxI1CNJzCS01yH3EccJhIyrIQwE2SyH+UOA/34iXUrEW+paQesV+yBqj7UGvKiKIvuuyVcBLQrdvcPBm4plRKFozCcCvcEsqC14IAKLsz9xR/wDCGpUhnEEJhNIOs7GYaCGESo1QcwuUhgwD9EbTUyqbtRc3UBEoW1h2PMuO/hwzArFqKBaoOYvRWvjmX+i4lm6o+4KPbLw8oD6CbqrMpwbiZhmWCoKy2vD+yCtQGAMH/MLc+wR8MAXAVD1AXjMYioy9RA2IkXVP1G70BUu/EXc4jC9NepmpBd09oOf3KBFUDmvJxBWoF7gQrWiPmN+OoeZHZqWN4KwxpFZEuDKe6yK0EsNlOEXEXGtDBDiX5j7n6KqCyrlxFgRjDVrOppHwwKCIFkDx3OWzchnk/MIvKqbdbxTFJk8Ih7hpW8kFg8IWERupxogO6V0xBnB0QNUtqogOQhYJS8FtxRYt+zKZf5hHesl/EZGPjcaVWY5xX5gkWWWMFt/OnHJ3Eu1PhipctxA7b5isMY7uK5KyS4a3h/LKBViChdEudiVLbqU+PcGmNhOI2XmK1GuoblHxcQKWJUo4PLqHShQtvS3X13GsJScMZqaLfUryzZHEVwUe8sLBcK25/EIkZZBY7KaywwlhNt9QNG/SABkqm5lcTA6zFbXxHWvqCtVEQPzDBvPUxVeIkShvDcKnV/nGAsC4rlaL6pmBaPjFfxFymHYdOLuPbXxQ/wCqBoTV05iEwKrUX2Nx7AvgjxkjwGCdTBAtXEC8lQ3VzLSRUC5eAfcxe0sPwZ6jdqwhOpW8Nk4gyhlkFfBR7ll5lqM4vbESA2JF4lkTZBNAU1pgFZhZkidsNbNzcPMlgXTDoGgi3c9MWRqPpMriRnDidJvC4NxYCy18LUSB8NISxdqj3orC61DUJRQ5qc6zpyIF+BB7Iwqy9y4WRhjtqo1iJWcQYsJVDb1AYlm07iJU3p6hQ0TUSOrmqjmCnW4QXVblxXQPIHH9mJepYZYFzHVgkd4bolg3GS1pFBaNEAKci0hETZEVDnyH7jck+jFxVwmFe/iukVlaHcJjcQH/AAojIVLtO0OIspcxsnmjxETLZpj7OJWSwQyDGkT6Yn2yDcF63oDazGNW3XUTMGpcu44vYqGSTK6DmMNNOj+UuvkGoqGt1fLsiKw1vxOTFqZYNsB5s/8Aryy/hrFrUXdwKBlaimakE/tjjcTRiPGJ8DEHiJSr8Pgf8RKkr3KuNEzMRiCYybcALWDtyk4Rb7olqaJgyi6dIZY+8vqPdoICgf7fcqAM9QgCk35KKlPy+Dj4DRNtEprzdn8xGVteWK4LiUaUIylHAuVBbAPJlOYK1WH4gtslak9Q0TYupmiFLIY6a9xC0ptTm5T3iEru2chBG7argT+3SJQS7Tf5gVOl3UERYcN1BkHXh+oZqeA5iBCOGJiAEvN0QKXhUrC+2W/iryl0l0hWag3FCFVEtgDJTAcMQLCkU07WPyqfMyCrpiEcjy4XGipxrplcqF2a8LKwvQxSmkEAKosuIINLSyXefUQPXKiYYsWh4MEJeW1Sq89T3Gc1nqKjCvmJx+SFYiO5p/mEKP3iLLl9koNW/iNoxjghc2rlmhZX+WAJYavRCCyUMESo6hZgyr5GSwrerj8p+iBETZBdVL091wxsQCnW86hlUL9o60WQkV7bgIIWGO45LDngmkjeIogpe5hwPpXdS8l6hq8V9QV/25kxAPMREbqWzAUU56n/AEe4NqX7ijPENk/9DMwsgBh+K8QIuBHpqZo5d53BNQrJj8x4tTIGGus47R8z1VSGWpN1F2ZVt8y6aqbNhNJGbRoOXzHzaS5IUStA4T1C6sLNmDZLQMTUPhdxKissqInUUQQzmiQdpYMHo6KRlYPedsTVu5oxxFO0afHMM6rPEADZVfUXKxf3l5YVw1mOfwtE2xLZt8h40REadx0xti1bl6i+B6hCLW3ShiUlRrzLxG4G6wrRDEthoIKHAxUwb1BrBSrQQWSgGyVbo73UTAWwsOA6juApBqkAqtmnERQZIgCm13O5dsitwxAsvmESkK3xKWK5EXkiPP8Amdo7D5qrBAuE8yvZs+4a9HgGFDpKGioeoAasbm4wxqppzKSpWEgEUVDxMZCW536QyQ2W8f8AkTOUqgyhHoycLkeoN4TT6rPM1nvABBxV5ED9x1lN00fxBKpOLx++5mFA6dGLcr5XS4YbnxeoIUgB2vcuyEYRiFTa4GPgu4kdUkv1AelluH24jAAyUD7iojFuw9zMNi49fNkp9wJa9QXbEzpNsC/hhkVIui8Y+/k8MfXDXgEeIUdu6vlbrl+iAb605Qdtka+5bvsLL9H3Eul1QH5Mzlh3Q1k/YQKhjEBtFIwEhtSaDDGPLSpLd2BsjuoqPJLhmPwEBRWA0CMs8SaP8sCqFgeY59gFV0weYvgFO2O65gxFJuyL9R5eC9EHuaG7EJgKNNdxyfFQWAxWLV5hkgzOIJEIFrMPcq3LqHi+fMUqXmmL4jgW9v8A4I4qNolGJfn4XXwBRBMqzZCaxMwhS/MwYKvgcUR2FjDIo6cbxFELWaHmsm4gDLhWY2wdiA+or953lzEViUj0RDiIxVJzFnIXwpBeLLhNn3K1lwGR9MylPMKm5siPI6xqDjjrol+I8J1A2vTKObbCAqzGCZRGuPtira2wwhNoajTAOJhBLfgKAKc4HJ/FwRApDX+AuCmYQNh4DB9srfDu+xwS7BbgoDkFdLZDf4m3pCN7NTaY2YIEDNcHEDQUBFwCJSOmBNlyriWaKPcCMtLNQ7Keotote5geIco9quojSsjA0wy7ZKqYK6zXUejOb9MTLqBYUNEcxiTVHLAqB8J0IKii0mIa1jFBtvxD8TYKonfDgmPGvEqhqKUBKZF8QrQOzKTx8MZI6Gy6ckrZyyWMwPPyikHEJuIEs4WwVuNqe4LifA1EuVccI2jZWiqBjm79ku6NaxBe4NBe4iFa8xKgjs+4AEb8RzLV8OyBCku2H3DEpllKqltpTbr2+HVRN2Q75T/UyjqbMFI6uUQg8jELUFdrBnSg5CVcQiCkcLqDZaCKAKPiPv8AMJQ0cRkLfEsMwsjAFh0VvxLR5VKE/YLVwMQ35g1GMZKqD0MQp9hHYwcFsHomM15QgiGzph/MMRcbzKc/bUq1M4sgVIO3jx4igu52ErTSzn5YROmloB7YhZ7pyold7t5WPEesike4mDYKgtFIFeU/qDKSoscv6lWFe5kTacYhT2wgl5idoDTdCzubo5YjIGR8vEToWx+FmmKO3Ed9s0cfmChnOivH6a/MvZGm9wi0XuZ0U9SrPcDNkdRNZlLfuUBgwEz4fAyhGL056RD39PMWmqisjohJuI7HCPFF+5aIAww35ojbWscB4OJkwchuLhqUoblRzC/cuprteJnKbYQL52iQIOE33rPtg92iLC+OZl5C4avcfoR8FAvy6IlE3zD0c/cqRBbFofGILJGEFP3HoE1mfJ6jyam+E8QMyy9x9g4dxrmgUPDKJTO0MabAqvhzG1mCxXdSnjurPuNczEmHwVGX+A0zGtAUl7PMuXk9Xs8fBhkPMAMQLlVEzGEqBcuoNy/VDs7h6ieGMXZTLGBXxzNXi4K1wDTzAMKywsHTEsUl2Ny1MuqG4srDlXNbK9wXL7mmILBwm7gsZjgjtFjGCx9FGeeCkhbarEUiMGrDtLZio5OEiSzlWXmMkUjkiPZc/R/yxw2walk0g3HZHUHEMo31LPRIIFFiXT7hfFXqHdxi1rLYvuGZphWxrc8aa/MOULQHEZmt4KhX0G0N+CCwDtu/Yzn7zKSFmMTQu/JCC+y9xBeHI4Z+s4RMSqbu44pPA5MoYVsxBFrzZs0zEv8Au4uIGYf+LhgCOCGFXXt+ajKSYkV5lEz1HHMSNCpYOgVlSv46JSJeQOoXKrLyxcjWRuIXCofubxVd1tzbodphuDeqdMJgovOpVxdZkW9QY5lDmBUUijHMH+5irtcsI2jRALAgmAp0E26O0qb7pWeKZwI6Ev7jVoIrTESBgDshw0lMqsy7hnGINkS4agpBEGMDNw4RFR/DEVFdS4NzAiO7G5c38WsUHdViJQMAaCC4LBtMqIrwqgarosZPqNhnbnMCjzFNoZoFktl4eobAs8TE6lE7TFpo5FGuLBeBjokA8sLQY4VH5i4Gq23pfH1K5hM+Tq4fgOTfkiqrB6istg5g8Rc2tCVVYvxLlTK1i6lFVghNmMDzNrplWnqBWGKCRR0/7gIGr14is6YF4ZDOGBVoUm3iZV01yiQJbUTEdW+0MZX8SlMu5aWhqacS4uzQvEQlSMqmGohrtwXDvJq+aiogC2XtVeY/dDYOV/ZHn4I3fqBy3RbELT2hNRt/WrC/rD9S4Nr+DKiHRqISdQrr2TJJglXMnDAlFB1ibgYgR/kVKqBYwQ+7k8QZ+GmldP8AMN+kKvkTMojE+x3HauEqj7iBLXMECrghd5h0F1cElaLRvvxuE0wLULZxHW1GhFzceaOYLbW3PRGQRg1YvM04mfNqWkeO5dhKz2Zb9xGwRGwj36YWW1eMRVSUxTdE7IVExd8IXmAyVtdnESXqFgFxGG+I18GUL5iDNJdSy5RK7rMZe1DyqDqsVy4IGDZqhuKULFZkvmz9wwdoZoZUb66fxCr1BuCRQwc/MjuDBKgtgNlV+4hwJrEKCuC4GJWZUII+m4Yaq3br6jj2hRuJBFE5IRSnDv7JmB82XBLyemvxL1C22/aPRUcMG/EyZPxF3UKrKNmkgeQahbYXLcEWKzBzLku5eH7mZC0O6iVlXHftgbhog3A0RzCoEql4VZsy6jgjAtAT+P8AvEAdzTFsis4oKE4YDFsh2HuVztnLxZpUyV3+Za7cGQhGRs8QLBRLN/qeEZmZJp5jALcD4Zh4QWSiZnKkwS9ohnieD/lzJgv5fF/0umHhEUbE3AdD+YJOVRZvKJqUEKKhZlDcGzfCNoVnCDlYecy0BWrmPJAn4BfuchCBAfsjCptpC+tzeXDNa/MaD3sx5HMsAZN46c4YBSCwDfZMdh6ZZkncUYHTE14hvtCj4u4lQEBuO3WjES/gG5wlzcs9DtgCGkBtPg/uJm1bmUoDpYEvCSsj0e6gJoqHyyy1jl3OuK2cZgyqXK3LdCO4v6R6pjJWnOkcnXiXmMHEsjTcAy8ylS7gjTHFLnN3FbSvmURTyzZ8Z+HWEYOsvP8ArKqpzosyvGXBaj8QqZLba9S9prSOiYs9z7CGa/UOWFXyGwbk3Rmg5WNB3Cz9jMtCixq95ji8roQ6Qf1HT0EEtxl3KOQbFb+Lh4iFtp6MzNv5GqusOpeNIMqIWOsx31NKIMrpWi2jk/iFzStq6GAh16lCpl4OWCcaIdAr+ZbaAg70xNyhBuIstUAwAgX8EhWhri3qLj2dxvrTk2+owSwhn2W5MoX4CBKqPmWKfd/+fB0TKLIOQP7iXylcu8xsYNMyvMD5LB7mRzCwRDCEUWOJbc3MzBsrPETA1YzScZa/Uy5e1wKlJkALWUzlZG/mOxDpX4USYtX5iyVvpZYtcA8kIVkWYBDe08LHiDQeCqStNPjzMqm+nQuIzWlSyxp5zF4mq78CVNTpJ6U4gcEjJPezl8yhRglYo9koR0AWmO8DkeSWqReSogNFN6377iQcxAoDxGPpY1SZi/2jhEMQy93LiWXZiFGpc4mbmiK3AuaU6zGWoBAuu4kHMc4vcATSIj2Q1LHuppTlmlPdxRQeKFl0Rq6eXjMrAqFaxD0BtN+4q1VV2oOQcjBXsis3xFJSMCh0wb6PggCIJVkcN+psiy8Rfx5hKBzURqUWUDrjsfcdLR/6uXabn+wIpvuCJSNW+iPvV3mAsCJGm93uEbV/z3L6kvK1lQOSGWYNY/ywJVTBgXEqKfAsgCNRsNkHLHMzqWYTkhPuVOVkY2YYJeVVVG4qGqSoprmGjFtlU9ZgNBvkRqXhDvb+ope75GV8ebqo7rUuIXIYhceB1GS+H/ri5gJv1GFwbf8AcIwUwVg5lv8Ap3EQjSSssCG8LgZf/ky3zx1KA5ihGoopZ8QTQBjPM3KHghwCtcbjkMeVP4h+TFgwbYNQhUgzK+pdWmbGz+IEhLuaj5UURueyCV6ERhJtty4eotGtWq5ZaEHK2QQQynYY6hSb2D5rh4YksQvaS7V38aYhARpidNefLK8j7t/mJwseaIvN+2LfFRCQSdLioWreG4itbYZZeFDMdRLgpGYJEYfSpw/iASQt4lqbYlyFRwxUTOVguOjmUKp/uJUCAqrupZLa3HJAzFgQITWZSMq/1HDEW4Tg4l8QTgZkV5hR+HEFy1ABu4YqlhiJkeYJ1V33I6IXgcjfM801f3Bo7lDgljqI07GvzOoG/wAkb+lBrp7vnmBUtkNYcX5Zh1I1p97ZczMV3Kxb8w0r90Rp2ZaPEvUbl7BoS0x6cIg+0uWDytqf0mo3AwTJ2kv3bjF9O4wbL4J+yKhbHWRtrWP5i2ahF9XGAUgegX/ENRtAEKfg2jZ8UQBV0EKAjy3DCuANvuYDvzqHaoWaL8nMOtmXyRVYUA4t/iWtoo5YBC7mGFCPAu/gGA3iMB2oGrriArZghTx5qJcFV3LGGJQndWeyFAMsJw2ZXXiUiuGWY6gb+BK9ShSZK/ES2IQW0PHzFZbNB0YW/Na+FwQxy7RWVbDcAk6vMSgAbqMxtlqZVlTBusIihZSS1kFOI4ixcsD6Ik2zh/iWQLLMWpBStJCoAoJvKWkoUcPMZagonJDZ1Wrr42h2otE2deyK+SWsviuZeNw4Z0PvjzBwMsV0rrMty6BqhzXIwg7nSyIfSGItUr4wwA037lxKmz4uiK4sFXIyMzcIWoN/KqJeYooYUPBCm07cEzJFqTqMYSDsYfEoBVH0jW6AQ3FUMN4mIthlXGUAvhshK1bpqOfipMcTA3KTRmOw57iGLkymJ3Ah/wAYAGjSq7ruEpoMDpeooqm6CNxwK4M4uoXKSlJk99QiIoeYgfRhiUViY7b5Y4+G5VS8SljJLsibiFbmOtfLQtjA75itipnHpfcW3EjTaf7QEVpgtRsfuLMQGFUDkemLAa+EfRBtDoKUhUlJsbqE1YzEDmYei1vqCNUXuWBYds/cSktyvEvN6nGMOWJT/jmJEsqLb/xTCjZRvEKFrC7IiYF4zDReQ6lxkz8ENCLSTTBUWuiFWFL8KoZi1UP3KAbEwh5RgMBQq3fiDsOFwRxvuNJYxEWZHJ5PMNgZwQB9zAbRhsRqA1AxfuPaHlowVpb9QxGGhUZpcfgtRcQtDUUNDOevirIqTaau456mDAFoPOSOE63tfcZ3dwyvNR8ZU0F94Yne81j/AAkptjL9fhMX7jgIaH6lpbSFpaVofzEhiHxZINRFRuK2xKR1LJBCgqpfKHoIFVF0a4iuD/4wxhKM7dRoERp1CAnbEK0NhUZA5mIYAAVL7z3Ka6h71AtbiOqhscVBZmwxLJB1sDP9SndIzpHbGW88qavwBuOS1uwWU6n1H7ZZfmD/ACgX7ay/mWggPFVUALZ27lZzuagnC+4Ed6RSnuWmSYBHawaJuaikr7iEOOfDUtAAIZO/1cCkKTCRzLpGGPxYxFAysAATif2gG5kPhBT7lLtmIsTebWABgcMVOef5RKzZPgeKiIBGr4fJNwBvAdxzNFQ58sxPg2DuNiird3ti1t1IecznYVXZFKH2fjKgNLHxbpvqK4pYKIwuBFhki146zgO4IpFOSH8xuzZOL3AMuiC68diXjCCJcXrUUs56lliw+GZ8QZg8TlWvEAXYTDR0cKtHpgFmzlVrfbOol6TFNoMVKlsUKJSgOPJ5qWuAts08/KhlXV8JdeuocqPmNU8G2qc17heRUPtE4hEiyMW+AajiTnjaLiA02MS5ge8IQsc/L2JVxoQVwLggmjHaJ1UuZ31FgiolELxcRW/GI6l1Y09kQU+x3EUYCtT9yt4bhyHhxB5GQz8JcWYkl4ilXTVvDxHIVXxRLTUNQdwacfmK2uY4HIk/EsVdruHHRBIu2ahmGuyC5GMhc7g0CcVoMbIGnZ3uJhKOH2xEC44Zxn4AuNRYizEiizb4ahhhhg60Jq66wx6cktOTG3YcJ6jXKw2xfKWLrTKnmHLiCxA3bM9/uVCDF8CRGACUNCwGpQ1b4IjkE6ffMayWqzFR0VQMnEsynpo/uV6k1TD9zajccwj4mP8A25+LSLg/+TEvOSVS/JcMiXLDc0rFFFYhramq5PcBl0zGBYypKZdR01C3KwmAlLhZtYVVLmBYb5HcViYgD0wPqvJe46hbgG0mAbpYD1GUAl2bQ1vW5iIwGwDK+CUcJhtPqF2lBtCylUTlEA1BRfDZCjLYtxGiKeSU4hYgpBOsw2QzcwTQhPdXVlv5+FB8MpawaTSSphlE0HvmIa15i/uGaJgUrMFgiM57iXKIEW4NDtonEr8xHbc0gsYU6gsAp9xVG0ajqUsGyZgGpUNQHBZIkcrcxTH6hbsZO7xNDmELvMwzdZJdTPcWWVZN741EcOhp/cqx8L0Wf8TJIgbPl8biI1ELVdrDGpUl1BjYZmXpiosOEbep43Xd+DtggI0mLgoRK0b9oOhntqDHbgzWdNMB0IDxf8FiVoZGpt4YBJWGhniXUWHSNWo8ETq1AEpkpZN0y6vl5hKYHiA5MRbM1TMRtABXMFMOYpavNS9aJ4mgvrMuAocDTHXFb6YWM1NS73cYNG95aYu57EVLwb6ItuYZVzFdgTJUlU5ikEjaFVEkyYFRZWYeiLD+i+3iO+XawWCL/CWwodCsutYA/UEYVEtln1BcFGFmDFnUMoRS9ECDwoLfRvB3EatYbBoPXLDAFU+hwHqp+EC2Erx9wCA6hNMNxIKWMMx9paySmsRB7D/MWvi4ncpmUgPWAocW89rMsB0sxMYATm0vl6l4V2uZzeoHD4TkgVt+Q9uuI3GjfQiY02lYwRZ8S/N7t0/EbWETsgbuKVRYhhC9KwF7Xlma3KPyKIkBGJMkVcVkW4Xc2HFSg3mWoPBWIo9RLmpUqGGzcuQDpt+IIdI1AzUrGZcSZhGsXNUqykFcY8saVNSq8VKlmBNVMELL8y9Q1VGIkpXXK+WPVU9LAlKe0yZ/csiITUEoUihLsxKn4bxXEiQYhei55XDGaOUxcRRu7hzCkTEQ0fg+JrLim7PDAgii7UcFxWsJKL1fUcwU0edZIlOqYdgpFvXEOfNw5kYnTC4wBNTryzX/AK5hAoC4fTfwMeGR1MrgbcpuX1rbC1i4tcGguIN/B8yqXFyszGu1bCIDHUK2C2XQsDth14F0RFzO6tUJY1KXfLAJXUNvDO4fOYVV8RSXVS8+9mC8oraLyw0l1mgTdn9RAGOjAYa5kaujdlsbh1ABRDS+YKhqJcSoLB2xQNfmMsYDa0StX7nX7gMwsBjcW2V5m6EVwBeDiBQQYfCiZSrleKGGa74wYgQK617plhRx4iizcv7iAltCteIAxQWmExx8BUqBS94hdg3FuZ4dFrCGm2jjxC4SPiIqruMVdn1EANI4qGZuXRhfEqqGyjl8QByBRsrMV6dxGv6IHRl8ylivZols6irS9EX65xydBzBggej3Bhdbg2GAViNMJ9RMSvqCx3k1fiMtftSkymBA2EXE9TNNZelpmS7UunMRPz9TCnNtj+IqIyndm9DzxG7nKA+YPAJlWPT+YomdWMv3EySvxb9TlF/1LvivESYqLeIF2EwbjaEtm88fUSQLqbdPMI1dOBhLA10mimspfha5XAfiLcFyoksyWXCF5ZjZqBUcr+HOFEWWiwsoXRzFV3hO3cphAY5TinOGbSM7TqNEAHortR2x1MlQslvcqgS9AM0yEUJZ2RHCjHFqgfWHMSjTz/0K/oIJOT3yxbbgEOUxHNHbTKUjh6Zv4K6CI0KXtnamX1FsLvoPGKkSnF/rnniUXqnqJ/LzDgeFREdtyuA68BOGnP6RPs9tYllmWJsGHuKxkcQ/DDROJH8j+o0K42D8SkCoysN+opK9KXxzcovi+0CblWxhpHx6o3MvqYQjzWI5SCzBXiDGlcWRsIldy4uYhQr4cQCTNcQscGJaMcOoxszHpO5RmF2D1LEIXHmCUFMpv1cbBHRuXuLFf8RygWhGpTAogW8fUs9+JkMou7vviUWcXnBPocdxVZbsuCnLhv3AuIYU+Cs0lEYsUMxL0S+KLYDpZGdHBB6ivFZjfWZhtwdzQWis9dnHuNqjhEcJ3F/MZYGFNizmGJvWLCzGSoSzkx8FLVOCOCBFZMjasREt9TIuFUb/ABiyK4xNBSR6KdL9xgXVuopjrpGqGv8AAxqFZIO67+IuFZaxY+Kj1AstFBL93MZePMLW6i3uVJRFkIQC4U1MAN3iJAH0fCZBAd3EA2DdSpJuPHiV56dlMIhs7ctzI6WbNnwHMYlZharuOuwHpDJ5hmb61FaB5L+EHAAAx7TjKQNe4sTRwDBzqLULxEeBEkOWTp7xUf1MqLlVfmOShUUVmJvDn9cDMoCoOfhLhRLgz1GuzH8vwo8QyzcG9QUo1ZhXcZjsgLWBtdEGYAVzzLAvW8wcT2Ym3EKTSWuBlVVV0nVR1gRIMrRkNURTrVfwpmkpZWA5hHraOGNChsch3FzCWyIgPuDXgO5cBpDF+5Q+yp4PcUiypd2EZWBcrCGRUgbU7xAix90CfiNOc7UB/v8AcIF7iz9KxFArVaYY/mM0jqv0Edy5mUgmTvxKizaFIrKOmgdkq9g5AbP1FAmHXTkimBdiLMB7EsDFPydRSIq7YlzpikMsQaXfMauCOXEVJlKTU8bXdufVn8QtlbvmYCoY4+4tkYvBf/cyw8dMZ9rz8GImwUsL3MkWcJySqm8FEZb3C8Qalh8JGWscMrhbiEa8DF/uO4O1+cwPxD8gfTuY30TcoD4AgRTftmVs8tC9tf3OpOXELaNsCsyGkt1iCyjJdQBSeDLEfwsBA0GgNQv1qbYC6CumLRKLw7m3pjE6NjLph9qvUxSECMYmR1NYUtufMJuDdQPuEOfbtcS98qZYeMw+ablLzMVC/gcuIGYYQwswnh4YiK3Nx416fcYKUlMJY331NM27xMFYtAxcTLmVSpVGBvYQYJ7wJS0CUGUcmqYLWwW5N2ajrJLWkvU+DuNiAInbXiFopChmZKWaRLgVGLDZA0SqfsjxUzYFI/r+I8tXURXV3l8xygrFwgxDgM1vUKtt7siVz1VQZTyQC9dde2IBTUwe5bAmSZi1HjzF+FceYq2amCCvJiUGBY+YFnJbuXMQ03KTIvxFUNDR1O4Z6107SWApQvmZ4QRxEwW4DDKeOoKIbBV9XqO2JamIkXN5mRp3R5iNgbxLmDHmOHLbBUMIU/8AUMqOe5yHPMupWRR6ZvlfcrCalXeo39G+Xuci9S+Z/B1MGKsNRKYtxbqOuWNZqN0QyqsQLQUQagFmVFUpvgxOuyBZ7JdlEFW4BWYQNoITENga1L2NDUxGNQHCMXaCKCQ4OWMCXsTNAfUWkB0cG/cyNBeL+Nw4Tkgh/EqXB3Mrykqur+WBrR7jSz8HCC4qtvEuq6ur8TGzci9vEbmSsN/FkXEphAVOCPoOCLcDEedRCkpQH6RFQBdBVvmJofiWFCtwj8ywEA5rcToriuIFQAuy0brE6LiwsI26gDQlzZQGxF46iqVZ9B+YDDHAwm5JxhCjZGOkfUuu45cwBGgF55iuIXTXwP5mNqBd9n4imSlJV4jNR7G+4Ea9lMrKSgLzUQyu4rFy7XllOIoUwp+plLGGkgsgCG4wZlNYCZhZoiYqBVs7L7KqOEikFS/hBLW8ENVHm0f+YjiDFrUa6zAEVX1FwZlIxxGoKhpLHiu5WDwkWqI5XIzY7JRHjEp0D1AiFV0L3ZzEYb5DDXmOlMdsJYTbp6i4iXBwuiNrQFr2JtAQaHVylUX3Ntn1cBDjoiWdfL/LK1LXFXvuC0tV2br3DdPYqYRH1HPLPV7iILrR1HsHJbm4B/cpS8cBdDUVXYCS79uzqEiWA8POIAyGWAvgjFldOMUnGUO9kVSoruotrFXFQjBgLnj/ABBUYuikbaL1PMClI9kLBW9sdFSkzT3KMBwJVn9x1nMMVLzjy7ZlCgEPWXEFgC6bJdHfrPfUG2DrHo+IirpIl3mWn9GpgTZEMPyDULPxdUHIwkgaEYf5lochlYLQ+YgDyLwwvF4BMHuVrlFAaYNzUu5bEpCkUqWfpDwjhbt0kpTyrFXNIlZo+mUdMFAKrBE6V4qtGLubIqoHVuNTEWPqYEWWfBEuodpv4NJQOx/MzjTm/h+/mZe5aRhEuH2r9y8gZSWOCNViMWt1EdeFpxn/AMh/iNAByaiZysP5YMuoDvj4G4EEMojtKuWfEFezmniM0cJC7uBiOoF22zX9QBobaMa4YmhakSOG5d+ora9h09y/K3sNJKCbfQwrTerAF9wY6xGLf59xKlxvDXcBmGXBFbjM0eI8eYJ3pg0f+5nHwQmjOc4YqUw8QGlqAitRrHTKONPcpGq6gp+GBNIAg0Sq1HVwp25K0xPaYluYPgRDuPSY8QhIpLqBDjojabeX6iqRU2rzK8aKA4TzMTUj/BDMRoQr8QAHAIg97jKONsHSZ/mYqM0JTsTh7lUOF7v2Go166Q/L/SY5GcZ9CiMjRbF5vHggEeSlaguQ7XAMjDTTABF8LEt3CxEICzCJm4QB3DxDSidw6zVhQ15guiCWbu9x4qCzWDj/AHHwicJRePx3FLM8sfiBc1FzEVpHxEBowodq9wT/AJH+4CjwwOA6mODawj+aiwtGxUjmDctLivGWzB1TKcuZbL6YpWg6Npg5StvMH3NWyUrA5CUFbZnxgxhNHtrmPBAdcwta2vmLnR/UmRPhwRcPixXgGWZTrx8MBLqL4CyOsaIN7SFFMDijmXdAE4HBLQiyNXvMCl7QuPC+IsZSiND1HbMXvHZAKzDwHUJg13shliXEqPOJaLUqxE3BbEMAEqNj1mAcWCL7i1BxBuCXezmPE50AH6nIHukK55ypjU7ypWAVWCFZYIlViVzEuVUIAgVVleCM2shEi8PuUvctiXhqDxViAuFsCuMMR9B2XuJaqy9yh0c9zBbZmCmIIFr9uIsIpm2KFnMHEBir5CnMyOFZL3CVjd6RCtxd3ORbYyAmEygTG0HrcgoZYKVApKdWQogJw3+xhg8AIhCGbw68zb39Eiy2CueLPxEiaSx1vMvNJp5DubrGlCBHUUIJFMS4kdQFQYrbjiyGFd021XHbHbjSgKHfiXQi6m1cXCKDUsYuPjS9tq1LYbvbzKjusDIxAFI8zyMxCDFljwjqIxyu3sTTE6DmCOKxculgNjEUbrBOaZSsQ3EuaS7S7PjSHBjuPTWojtuZiteMROKdZRDE9i5hBLG05/cCuPdRwwD3MtEIODYe4C02cxcXZFFu6/ywTpwxOpnwsO4FXv4c0oRNwmm6zBVSowmhbxzL4JvwYiIAtYjgwNRos5i5myaiLqYFSv4Iau7YLj43A0wW1mz/ANUW8U+oByB5gXjJ/E2mRjFLxCcNf7y8VFmP/FhjcSodWrKW46eIygPzLgrviDFxWqO9zYjFlL+CWQzioqGyAaTUdzhlks+G7maAso8vcBcFGlzbqpQCR4F9xcimCws9yoAoNQOj4BTbT1DaLLoRJlrwp0+oL8xSkKGJW18GU+DyTbrgbPA4ZtPMzZUbhUZtlPeQvbyQmIhoehDZcKRb+MMqFEBWravggrtpWNQy1VB2zCULbZD3KYVW7NMtUU5pZs3HqRJTVLumssOh4exWf3ccwqwwTRUSzQbWO2hKvcTEpqVRIxQt1p17+Fr4R1MfCO2LBxEgHMBJ8z9wFe9VbL91ZwxLmziBXiVPZ8LW85qAchxQbhFPzQVHBF+GUxZfiZwLOLY/MwmKujZKFLV55l4ioyAJ3FY7SuYqP4zq8RpeVtw9xlhW0YYCdhjwRrn8oH5Lmb/C0TaFJWwUTpXVdxVW1X4G5plDiJhFqwijUXAJfECIlzVfmWgjkAYBb6cpDliq3LGDMNZP1CBEWZb1HxdEStQdbuOYKGg33zHuWVfSFlwTo3Gwq9zJ4hbuLUDcJb1MLRQtA8NSoLUXPcMxE4J/35+DWcXBuVGMG3HcAZNBnxeIqZTVsHggCjkZsg6IFCJRLpUuTSa6YplIXD0pULbit/yhiQgFUwKygJtS2t+zABW3mZjv4i4g5ikQZg2ixjOD4lGX8Gv4jOUFu4w8y1xr8VBoDufC5CG6NUwwKKrc2lgTey4hYwtKyfUKwKWtkpUQSD9JFqOYm4Rw4vmWEsa5IPii5vN9wnZmpmpd1iWsqJiZrVgRyzGttRp6i4/Ut5O4pUXrPENFnuOgysYxcateSGoSFWXnzGm7vmCVTMq24yRBS3j/ACwK+AYkgoCCCIeOYLKiDAlYpcPEDbVdeSEreaqTOyWBKi3BjVO81nxHy0cq7e2MsmVUbljVfE2xa5mUVozN58EdI4SwShJQviZdkbHmIBDw+YF6w9MahIhkcQLp/wAzKz8DZf8AVMAdorYcVeYIse5VGCk+DqII3BqXKo36jUXcplR8Qs4hcivLENjw9wBfuEwtWq6v27ZgNys0OLpgXiU8mKqOYPAvTt+m/wAwehuz0qLcG4oqDhF3DRX2SnprmPoUWh/gh8GKujHtlQeGWHgZ1uITY3o7MQHIMJzX96iFDXR8MxkmfUEtQO+MVwQu2W/ED8WRBiAdRYDq9gRups8DLnMsFJdEGzlMNY7lBhXQDEzD4KxMzC3cRGgOCaSmCdCxzZvKQQWszSz4PRDbCWi1GZzAOCCI05KMJjPauJWfSHsiEsbWxO4YN8wLrfiUGg/LFAt1r0RkNJt7YNsB3KSorQQibHxetRzQGtl0xhmFsx8RvPPQLljNKvw4TQSio+yBGgVQziUCgCWHuNVtqf4ymw4eo8zSO2KVAbI3ExViIfsEhxzCD7zKTArFDKm9S6EExcIBorK4MEDTwltjEpNeY6PNhalJhPR0BAyDuSZTuMcUysos5qWTUcBBcfdlTIeUFW12E2xGG6ghBpf/ABVK3ySJn+tNuu3zDgw+n+svfgZceBu1gzMlhmIRcQVCNJyQMsIcz5SMoESIgWymo5QwQSBqCvRMcUsWk7eiAVAVfh6CD8g+GF43umFgpMnIiyR2h2E+2DWoWW9iuUuVMoN9HqVjSLBTwZlV2UEXbCSE0kTMZeYq4NkuonELEoZWJTug3rgcf9mVsH+nzKA8s3ML8APhQG2Gi90RahtqRsg6asa28Qihggq1F5IhAlQvX1Gwm1UYlROGLAxZGYLC+IqqcQyQLF67CKCws4ZSFrjBuH2tlp0RCy5Ea6uICtTvqMroc3zEQZeDmCkfedxrKEAKV8YWBCIDvMMwPcVcYoik8zE0u48w7qOTC0+juMqW28sfW4aNId/mVFVzwykczG9kLev/ACzZMocbAeeZTgA0MXNiCCUAteCayCdrlpHCkVFQlYXm4jk7Xh1AWvKLiFsCAaM9/CWo8zI8zw/+UbZgvG44mSUPBHle5+HWZkuLuCx/L8HSlCcxtG5zOPmIyf8AkwbOJsSwJeVqBMvwIOZxIYMxtzHpjhBty3BATELRjMGo14GZLwdTKGDBtZuVtf8AlGkbhpJxW6DzCMcgjKcMcsqEJ+PDtiByVR0Wn02fUG6i1C14IAOau0PjRsfR9Mr2m1A+jzOdhsWmg7iihNkpv8zUtDQvZ0ZzEcmtKDV3BTRG3tHSs8Hh5huHCxgNUy9UC82ogpROFVUUtUAA0cWlxkY53B1EaOJYv3GQJoobc3X0woV+VQVnNYii+23xy9PWCVVQygXstkUBNTpd10dyjxLZxNwK+FzF4U5VuYVgU1EqB8DiAWHpEXInQQmKV+ooVT1zN+F6zHjoWJ5iKc1AHU4W7vx4lLoK248QBEZ9x4ZiBnImmFqz3LOW4D1q/EcmM+41twcxswqjR3KAuWfFdA03TqKCrkeYTCH+6z/BFgyloJvSEZxDgn09Q4qHs7qHot2nE/58cXn+o4RFjG5RNItxUTOIVF5mvSpFA0Y81qKmDajB8L5NceIMlQIly6e4rC6PEG4JBRJlQczmzZLiazOnwqWWYEPZZVG0NMcpqdEqWqEIO6u6hFXG6+MQGIC0qHGP+M2fARCBK+CmpWl3xMsrtFsrWe042UcShrXxeIYC2C0RfTRHatSrR4PECiN25lRV1DgypM9TGpr1jcSFvf7R0TPF4Onj5Ibmi+gDUXXQE5gotLME/MCAywcu2zcoxsn38ideYgIDHGbUIAJh+Lb8ByzCaQaGqxTAsO9koOPuX8mYjLzZgVGWvEQqaW4IeEY3V5mQwVjJcqeqO44EteGNxWlpAWrTsmGY43e4VYTUWTkgq9nczA03d1MEpRKXEoniHkxL2DUdha3FYYgmx4i0x2NMdUuYhAuGRhvZKEK2WNuWBy0iueYFYLP2XKkG42AC74jcsF1b8wX5WFYKJvhsiVd1Ha3BKg7IiFxj/LLpss8QNcWvYa1M1klVvqI0aZrLiLQIBdm4lFZTFIZYiujc+JcdmYq2blzbKmEtTEoGm5wiFSjfRo/uOdTRGJdm8y63Gw3EXVZhwpUducRZcbMRlwW7zAVCFKP/AHLuUYl3t/oYBrV8kMnOIMwYiWDuFSVRFYQcSmLg/CtUjcqCB0e558RQMbEiwvBGzQeYpOibJXxRpU8MGF/MEwLph3ZglMIBMhxf/cRizK5H6+C1LMSkh96RD8MyqztWYvk08su4YZ3gcOo+l1fcoxCABAYJZ4Nxy4vVqD8wIAijA4ei39RADS2QoWipHUBpT0QeyhV5h5F4hgYtsoi3LFbYuYGeU9vPUPGLQe4ejtpM1FLJKlspuIJoSW1AggbEpi1bwFC8UN+5l2Ja4HCRge5ZLYKwZWWHJo+Kj8Egfi4SqL9xll3AekdwDUCp1ZggyLwzq4g1emOCrdlImKw6T9ILKwkGVKqDy5h+EQHxuln3G0LcRvrb1BreIvCXUF9f5gXGOhoN7quPuBZKCY6j3SmPgKnPRLVJw6YHIRg49Qni7LtryS6olMu5WECDmUYUYhs73z0S96hd7eJRYe8JdEuHMHZAQAmOotJc5hNJEEFp9JZFzBEgs7WYhZbqOVvCNvscTOGPmGn4Uyr7IzsBW8xcaJfSRcmrpxcOYZq01Q5dgS5JAGeDgixNMG4lwMx0oRy1Yld38P8AWvm/1BzKiXVbiliBh+Y4dcT8kDGZVLoZ93CvpeOYrENYpKz7lLVGkoPxGqim1bYpZkCvDA9ojgXSRLJa4YOdJTCNoYXQ99yj6CxMvuYcw1H4uodQeQNJKKtludzGogKlnvMe487Z/ERyPpgWgCcRyMBKjAqZjv4VQgMnLRHWI2Xf1BiklX5vT/mZbNoyniziA0jyIACLxQU9sFKdczFqGSOQoqLUWDjcMSrWmWG1bOZYXcukjbRd9Hd9x23JR39yjScSHvjEY6jL/SQoiDSCpKxSqnI1xGIMHwXxKTTMbqomsXcKpW+4AAaIo2rAK2v/AJKH/sS4w7iDlWe5ZY6c35YPu9S4sKuUVlgQFupcQDwMVW7IgB6l2cyhVsnEMerqE9oCL4CHMu3IUYQitcqGH7LeTMqSzwXuOSVB1dbruWx15UA/MSCuE4vkQu4obAwuXz3BsJYeNeINm5Qljc9IlOr9zLiJZFw4m8Lz7m90U9RpMUMl4hYI1Zhf/wBEwWSlzDUGIIIC7HqItWNiRsq5qKCpcyqcRAAthnPnM8rCKaQQFvTEaGphCguvMu5YSyUjmH3K0J01dSjT0JxHYFOG3EZWwtPyHZERRlOIK+JwAdrKKDMrQlOPxHQoDFVMADyOX+IRZ3VjH5j6kvQeVhGGWeVvUODgo5PQhopVu2dhgy50A0sHcwBfUWk4NR/BlmTMDaoCsWtSsDZTXl8qUfRGSaKqwr1DfTSTXSXplF8GYXqnf1HFdXbwg6I31LBVh2PCKyWOVywmUNxzF50vmt43M4OctcTlCyRBthm4ppLHyn2n8QEUdxpUSs5lT2+ajybJ5qKAQwiZPgtxs3A+VolyrmDfcKZmKpkHcwUlvG5nOy04zOu04F3HuNgGNmgce41mmGI9wsoNtVcVlBDgm7hfuchr3DBI6lIGc7YbZa4uSq0ljUh+iOS21MXMdpTjBCCxZ5ltNUuN0P8AxMWqSLLtUuoVJtFrmnGImMTuXAUpGopHMEeuZZctIweUjNKpOGXfB8FIdwJymRw9fF2V8lpilDndr75jmooe0ptHCRGBPg3JUgZlMqUNPmLcWiOWGVxEKAVKKDhNg6TkmLKJVaUVf1BIKtu2XDFsDXimOcUoxd0H7lHsAtcAL/UrM0RsJqXBuDVC14iri4m2LJXLLcQqgAu4UV/DLCFotFqx0fOeI6amu+6gKhEN+T5hTjUFFLWhp+B4MsuJIYcohcF86w0f9z8Wk3arcZYCwV6qUSRYwGo+lBw/CXGkOIipNjdPiHAKfZGd2qZVFZBepSBcpRmmXbEYlJpJTiOb4WUsIoNpL9peZVxNSDccfdUHWJqgqLu1mxHbOPkH4jWx7RBHUHY4uxtlxlbjlBMmXfzSMS9MBeZMvRFKyXi49ccRURsHHcBdOc+oiF5dcBxFFVAuGWXuMeIhxmMWwDR3AqyQ3Yjj1HbZoOT2Rrb3AOLJknJrhv2wgo4jiNzwBk8xgb1MinJBWcIZgkXMocynsUo1mXe2UUHh7lwNAZg5yy2QatZLYd8o6IQAlYr0IlQcw3B7EWI5JTcqivA3G2j8RLsixePueEz9x3ZdXLtxv3LGNkvS5f8AKZbgKmP/AAYjUr9wRluHHc4TI8y9w4QBULMpwxpYAWwOI3QV6lGm4g0eV0QxSzcM93AQIlBZuP0JoAeKilXrqDBK4kAMtRKBsS7hmJ8H9xszpSKs+JkJtnD+5bFo3FIj9fGseMGGWcBtxqLC/gsyjRYS2dJtwhGWR8uausafDLaBtsDrGvbCScLT9LN/5jEi4ZDxuj+IBDtYh+wDLYhtasQF0KyuMQ5d9TeMq5V11LsY4dLslxAcAAtj91H5SYlXMljSdSpJcK0PIzNGza/0QVainQeCXUXkzMxA3CCoQDtcG1JOqbsb58zA0HAzt7mYSrzAag1TTMXCyVL2afc8bgWW754o/Mp4Yuj+DmM3Hv5YrK/c09oZcOJrS8PCDC7zLWw77zqfRUTqXRCLIN/BVzcx+xmdxC6rwQUqZtVHKiyLBTeDdqZg6lxYQTQVLgloGdFzRUZXiISqbvsr+ol6jZg+4YppiG1HqHtMws9QU8lTMxQxVVhKEvIiiyMcQlTYC7KYWpCQOHFQdRXOge4YnPIG+6r7mRe/hmQkhfD/AN+pceacJzMUznvDhIWXUr1KrfDCvDo+K7ZQRVwhbI2VZmBYUFjBXwMW5wDdHScy2FYfEgmbNPgDeBz21HzVbWYEc+FolokZZQMrMFhS/XlbhqMqBZxeWnzEwUUTAd15hEq0aBXBvy39QIGY7gDGpYGINxgol2TjJvYs2g/hYsq4lEi0LZQU/uJucivK6Dlh7RgC0HRAVbHEq5ploXM/sRUwHK2R3plKFM+ogmooGd5+o7QQdjWINRLIZpks9x7PK3KQEMMNHBKq7WjL7iuJGGGaRSFxMdA/lg5ZLqP5mXYLIPuArXMbCwZ7WlNwsIMevMpg32liQ66+fUVU7PgNRNRTdP8AUsEeUGGBF6saJVZsV1RWChs+LpitgmJGXx8Cxl7dQmLe/wCEREK7xB5zKPGFu228wXzLBKRKpw+YIHZU++ICTZE9ra9MDjHXdyk5dVKCOmh/UMurmdQmctmokv679v8A8O9plES5dlDJal4gUQHz65sfBaOhohqXKmolRcw1LJXxSjEziVbW25SsvtEcaSk7gJAqJKh/uEGPxB9zzgphQsVmNf8AqBfxmf8AqmIYjcrmpLVArBinEEGtlvUGs+pXE3TSnNRYoNiSst7GUXoMbl2IrIQs6ihqxOQdzSjFmYSUkG6puLHB2CYfH2juGTo0eIEXcXCrS/MJim/MdkGELc2PzLqOUN23QRmNKaWttMcFRFSTlbYxR2uvMJUaP3Et+BHiqMWvdEu/cDK2nL8HGHAfKo25azBdF293iFlYUenXcTBeVf0ug/cu4vgP4S1uGpC4S/3KIArkQ81dQv8AqFFdj1vcJca1vL2tQs1qU0+yZ00mzZYYB5u/EYDm7ITp5mdD15Z0luzZ6jYcSIVzwcTMFkRteUF8yrcbggcyvQOLfdE8QxzVYfyw7yjyNjFElhLmLYCRyJooPdtS5OVWlchwku/K6l3LJXW4rf4mD1G4rUu9SpxHVcwynz01BXaHEp9xuc/RG4WzxQ04i/Bq1X7NQKgvDj3CjDMMGYpLKlyVYFlEdxLshT4VxGC4uItQA1yxDDtG2/cq0FjQ2HI+AjrTed64iII1EYpVqhGuzEVkxM7etuGKpaYqrdTFQIzIJfdUZqL3DcMEZGyIK8lLG4GmRlfNAvTFum/jeJbRss+q+EsluZVMp6BZHmVbjLHFzEO3Yl10La3yjwqyKbiReASo00U+0VKlXouAcUwfcl/TCFcNcx+AJgu4Wh6Bcp7u9w69F1arD/UWHrQGYrC5IPuINWhxDshbg0RYi8AZXomZf5H8plKIIxEjYLkotfqW3tGNqBoBa6IK6hbd9RuV2wsYRr0PMxQyg0kuJS1MmJcNRrqxFIPI1+JZZZqFCqI47gglxmJtGCsHuGdgUkpdxKPgbmVOnK0nTAxbzAGLqnnYh5IaBm1TGAsGLvDwxFpXxKuYWoaFnaEtkitKD8xUCkaRm8Tc4jZkuXKxAyYy1AFHvMbfiNtplm2iDuOM6IvaVWZVqtRRDrQ0R1RtwcZSKJVq8I4A4JWUw/zLW+KxcsAo9wmp5PeYKe1f5ZXwNwMkyGWQrRmtfh56hXIhtqlKNlRWe7C+tbaSOyZ2brxF1LPjUM2tBuNmIEBYqY5Ic4jWbmfBwyjFibV4qLV1Moq3Exm3NDBxcVwVILTcd/7S6+GX/dhlO2UPwoSKghS/R4J+UySUQJHGpsGyEVsKq1jk/wAQo0aHh+BxmIhcLSKzyytAt8H6hFEAyJzFbb1NjqKXYDgYD0QyxA+DrfbKBC0LbBrMA3ARigtMN+yJjpgvsWBZHUdgS+eO63LLOscv6lYA5Q2HruXYPDLNS2I4452fAS8uAKOiO1iBrtlllVaVzAaVoon1Gg7Fo0dRzMIU1Es1WPbxLgtjyXaFRcjvxcFZHRPoR/UFl4QDzqOkS12ouV9vxbI81MoyiIAArZXmLdqwrUDLlm38Q3RruAU2trUWJfnxsMUMfqNcVmnB+LjV7YDTTufoIWsnWZVFXFVNau0GWWN6oZuEqrh3PGzEsCGEdnyDWreVx3bKUtZHyaRXijqd2I8OLgL7I0ZTGx9S5OGZhsKWJbXmY2GVYCTZCgDA8xLwTxxEEuHiLlI/G4xGIzD4K4IsJBqIlXfIx26P1Y2wEBwbd+/xEzLi1QsQxGOoov1FTkqQjnVlDzqJ8zZWmUNsMNDyTJo3KDi9DxMnFoV7eolfC7gUVL4Au7fF3KvusxMxDqpZw3GVIqo65v4V1o5Y4U4lTcFG6fF5g9lRVk+hMgqy8eh3E+ay78y6dsVBQq2Fyvt/iDU3YXuHLxTFhTpGiUfyP5hljDiK/h8RuskaxMwBa4IIfNQrkeIWrA4Xf6liaGC4RGIZ3XGAZZWi0nQRD4JHJ3t6iSqnDDiXKtwtjO+UELe98vEdjnd/AzdxMqir5SJukyQbiIYhLMszLuYdRTYql9QRcCBnyHLL1Vh6P+x9RssDigmGopyrSopZiwc1AJRLrUZHD5BgdfO5yRC4oo5xEqYERTmLVDiGdwktJxCOzoH8yoIEzlViAy4hkX5dBBiZ2qe38wW3EQ7u45X3Mv8AEsSt0tEFUgLy1LU4bOInOB9RkBH9XK8qpBQ8U7hy7fMHAP55hS/23E8s+cyr27/qfpuPL8JDfwL2EKQVk5zziBtUIvC3uuojYnNpZkWvLAYqZeIisSgM84huC4ECfIgzS4F11jwRwBktRAiCeISGmI8dwDxEv1DSzJf7n/d7mNxbn/e6Y/MzODKU+6T2+iWsUxGeCbkWFCDcFQOJWGRoSs3deIzpKY5JT2OiDHmFSXuWzKNCPqYxJYcMTFUzFiolkxEuI3g5VwREDpCKwRPc7DTLALQjNlSC1u0T24iZOz6RzOm6mdttrtZS1KoYMrolsmhQ36RZWfawcxgwZ0rIqeCVSJQ37QRZc1tDlYQI1LqXEA3nCcHX5lSNGGmcTAs9BLor0CvANiDqqNls13+ZySNYyjTwHWoERZVQVezSYf1+5sRL7i3AqKpYjnCCWqC73AKp5LfvZKEFIME8eYkugJ4MHhcbiWS27HDD9poy1zm38QrmQTtWkZSAJbj3Kw7uyS0UHob/AIluAWuKi0/iFxX3HR7jjjES7lKVvuG5hBCOM7rXkjxeg2hjkmGupZMLAtr4gIESX1CF1Y05+2CrMH2pnsiGLTBaF9yz6wLA847l7mbBxBAsaBN3T1Gc3bipYSpjmZp5gFtmTxMHl9WsKlIzM5NeovV3My+8yiar/hmx8RNHlVHMFQj9HHyT4R0ABF8VH0jUIc5idEYzvGYyenle2CFbctB5htyjS9vLM4D6jAXwvCFjJqoEcS766XQQgr9VjvtP/YbMMjZZKkrZx8UxlouVVORyNP239TPSinUuJcCLUSInE1Wqeibd9iOtVYlqxZNr1Fcviqt3cylQkrbdl1DeqBgHP1KJRLcTN+IQt8YzeY/DA13LCHEqFtDh9RRqXRLj2TSu5WERvmKRYWQuplgPJBVWPcA4WY9De4R7or2I/ghkj2OA+HpiNRBWWmWWGKifAuIFscS1r2cME/IgPuZdJ0+JsiS4YMolE2hl6xSdk3azPSbZUuMYs4jI2sQblPGb7iPNzZK0EdA5iBQDybj5gqEUexlKc6D+YoTlYeE4hVkBo3bEyZamUtP1EW3uDlMxC3WDiEIAhsb5YgyyC44zxNwcLPLFqBBMGBo1FFBlAdywpNKuFJWIFRplozZHMQZjiZHdwLJckQyMRaxyn8IxGC6rY8XuGzNgUp+JTsrqiKthXNSs7OYEzSEoPM0mzK4sQ3/6hhBsl2f/AMGKyeIWivVCeAlWYNaUocvlgwEYs2dxmQV1BpEDUsZyPEuYEAaV4fG4woCIBrwPO5UCg03xLBd8TlFuBTFYBdwGI0Xr2+I+uFI7gYK8X8qQDf8AhPKyrgqz0hH4LPBrAtO7HXmYIxpAIiGSA4DnMLBitTHqMDuhWIsFUWBCLSpM0DFEvywf0Frm7mgRXh9dxVC0g1GS0C3ZOPjNgYhtfR1DxQQtfT9xWW1Kvw6iYs7gXCKvCJ2O4gCi4LiIwOXEVH4SludOZU/LZ4uYVukP1HcyiDJ1+5VRSlQZkaOMFy1Vr4RAwBp2n7MTzhm9F/uBqaYsRwDJwQuFxECoSl54EZa1Xc3KNgsO2KQyZ0ThX3VRCwzeYVqnZOyBcLpOyX5/iELLvxKKXqarCdQ8MXdEDSQcUoqBTjHmDP8AmW8QsVUDGYESjueX4hyVhg3xbY9TJ/zCQvjkj0SaQpGBjLFUVwvGV9jz4l0uHY1h3ZKxclAVYkNOOIVh0WsdnxGiW5N2NwNa4aXS1PeP1K40kCpRnDEiFUPTX6jqGUrmKcXi9RBakmcIJUaGaweCBRRMNAmb/Es31nl+jo8wstECGb11AuKoXdfF0DZPoJlY+AXBPO/RCp220EMuRWLl69QOwreYVo5ZIgy37iTtgZnFNrx5lVMzpfhcu3ZDV8NTe4TRYzzLb5GRpK5SRfDCx1QWxRjGf4l2dtFS/wBWreo4raW+JqMtQWlhsNvFyjq2BxmArXMWxXuOlcOk1CqlE3qC3amZrqIKEZWzPaLTyZCKvgSxBhYrXjuZgrvSAULtuVcmPgXi5ddn5j9QU2yiQJd8ifX8xCUhy4PETAU0rKBbjV7mODyDxCXiXMMPwIV/ASsa9Ryt1IMgr9JF6pgSlZ1GG4zWfiSN8kACbS8RcxxFcZkkuRbB+4w2FH7ZpjGfuBo6cyqjVx7ZhcEgIKX9v1G7iZN4iyqCjkd4Nw2FVq5unHniVbTWDEJeQp/LHw4Hc4eCJoCjvlgyy4S0uoLaPcs7i2zLDSUMyouXQLzqPLbZCHaXiXUxcsD+4pcuCxgbig7VEUVvIZ/iB7E5ViGeEwrimG21VOziWX+lI3Ljao3o/UoriZzBRb5qXPMvWOh4Y84LUIUMDE/53TM7biG1Xa0Rr4KBw/fyRFkv3GG3Dh5/8mFhrQgk19EKOddS/soW5ljRTxLXQsgquygcQSATks/M1AxHEakYAW5cRIiMspw0W5aXofoPzLrrHSAgtdERihYXj3I1a+LeuCLGJao6La9/DlY1LUxkVSvf6I4pRgKhK140cc87i0M2LwGLqI47i4jqAtw3zDAKYAgM3PRwC+5c2J9TUu4glEMLmbMjX7jKgOio/Evk+oyNIDwzOm9pYOVI6+jcLc3Bw4f2nONlEp0vMQZSr5Oz6ZfiNzZCLCvwfioENaBPAuP6isxEuu/kgCTH/YacEYpDCNhzGjiW0LpLw/iIFNV4IiVY6JbHcSmle5U36OE213FRZ0cx3vEoH9yn4gXxA3eoPTKis4lgQsWUqaefEWvCbBYPUChHAz79xIX2qB9y1vrjf6lELR05DBiV0ir8xJc1XMwxRAcUjcfKjvjRoTvD+pdYFoTUtTRbu8xi22SUM9V7y1V9zG1kiVl/vEdypgXkDYm6+riXAi1AvHcwjue1MH3KQJ2BolTdiHZxlRo3Zvx0VUOaBs2U5fUyYUCf2G4hLmkYZvKslmhF0SrweomZD7qXiqOBdy1tHQahO9QUaV8dELXNRxLSkAMYoUg/qUoDaxhqWRLoLX8T3rt67XlauMDDczcNEcOA1puYHanv6ZnDBKtlsDcF4yS1IR9fELTEVDw3tHTgTXtAOEoWqv8A78S61A21S9G81MATsOA6jPcXCZJXAaiwsyzkxDkfZlwIHCR7glxs1BXcLffEpC/ookOq18WYUmEFAvFwXJZ4OIMI5BeXcCprqmCk0alhjG2Laa9zELEooNeSU02CJLEPJBjOHJ3aO0T8R7KOmmCWnMTMS2Jc0lWzR8VQfg51DzAcnaCp54hWhY1bnzHCIMCOgdYi06jhiWJVwVfTMCupgtfXMVr/ABxAqHfUVGYbYucRXF1mTrzHuctaZL3CDMN2/wA8QHIjecQhkyuOoQ2OSeaYb9sSpbD/AMzKrzqXrddnlgzCDDELNsKNxtGWiyPUSMTUtxLMvxFbiQlWRIrA1nfU0bCTxBuQg8yiZu0xlTRKMuI5frdyCUo8BYzWhruJrxGwCN2bJdLQLoBsP3CiE2/9FJQS7/iwxKrzKeqNArBnfUe7f38RxcNVArk9GpSgoD3KcsatBiAKtqotdSGlazVfqBULHeoKEigrwruiXEsHviXKAmxi7KDPJ9Q81Fqigg88aWI+9QJXcdDiCdbUsN/9/cVQh1rx+INoL6j5Ybqu0V8+1nhHiMUlRJFZLllAWwCQwbSQq/8AuoYnBmkjpYkCOU4YVJWfsORJckqq7Oa7gJYKTdxqoBEAWmgOYAMkYF80d9sTNzdq8+or4fSqt2QEuFaaBE9U4FP1GmzmwphoIdpa8XE4hSFUAa8pay8QxIjNsWAGhoDX9yvtBQwdg0oL2+5Y9FGgoaJVQjLd6hf4C/qZEcJhmZ+8qtzBFgMXHcC5XqaiiDpGnyY/3EXElXE0KcpWodH1gfUpwtMPcCA1K3AB/UTHk4YqjSKjGhCYU8xYWYV/UqimRFdn0wAbuNY7MRBKcxQOBHAwbeo0UHoRA6rA3NVFChYkba9wgEDeGJy8OVYovRte/wAOyU6RxANnJxKRU/CUqAH6ot40P5YeReoNEDldKLs7IYXOrHHn6hbYA9XmveZbCWxhW+oAU5uObIYgQa5NBDUKeuE/uHHgUgPpK0jiOxI2DI5x/csVBxgs9S0C47ZUexo0KsHicSXKFhse4EDuLwenN/cRA0ci/lcCAwDlnVkKGuVTECl+4YoaGLmtwVQVlge4AmF3u43UteYamSJebZY9AH1KTTWr7gH1aFq99BHSXVsaZQMG4nSgRI4Q7iPJfu44PmlIS+wj5l12yjkriZyKuhbXUBiDsoiNrr8Jf7LFZYZfG8eWSChnnO3HUNArAE4aJaAA0FRuLa22zFZfMuGfAY8ABVB+5vY9sS9A6Y45niVizLcpXHFQsE2RFta23eEZZydkLwblqFUpurgc7tqsvqOrGqQsfbK2vTVtVC4xgXqq3E5/K2GeI40rSaWOiopeUQUUeGHbA5thjAB2XfiXvZlGqZdg3gMXzFSCo5xcsS2WQPMs+G3EocTNLRByB1PCUFtsSg8zC6lnwijklESoMYm+mPMssobVsJexywqpxqIIogx4xArLNx06sG0ryqA03DRcVDuYARvfuYUn4ZclsfzmA4QXzAWglNe5tKiwcFqYDyu536yZmzG03gZKjs1C2xEpZ9Jc1coVAMVaUqUMwwwXK9RpAJdnc4Vrt9zFVHsHNSxeIsYWvpV/mK23uFbB0bgRWueVQgbgUtlCFFf+52l+q8nTBTsOigd3/rmKR2sWtJalsbWPh3UvIF1LiBvxBg4gtli4uoJlHHiUQIoRr9wlkKAA3OM26I0KwVzG1cCiO4SGjaCS7NqmKgS1Yf8AqgXOuS4aFcewxcStHRcohODgJAp94GD47ip78wbsfDHVh6wvxTwiYh9R0xgzg7ZQcXEUVdxjiEIaIe6jBWW1EMk82ckuThBGMStbilRiFxW5QheyeIHpSPceDy+J4oW1t+NyiWEsvcoWsXovdPEPFAyjl+iFEAcKqFu9hHV6r65g4HTEvNQwrzR/cTyV2FpAA6C10zlgo7AZC5P8SgiBaHsGBqDMIwtPj7maAZF0PH1r6nhRvFX/AJl97ouEa/I/zDp089S1THcOuCIeHmDl4madyo0ltuzTem7z6j4AtH9JfXratr+2obouBbVsWj4IChoXvNalG1J0v8xBQZ9svFhjEr/QXLOJWhbLF1t7QQtayZ1CzEwKil8VgLNwbeCNcQClxYQ4lUl3jKjb4aiTJCEPADyUfmLJur0tw6pGcMyJPRuhkf3ANEULpTzNvLpthAaMADB9yqHdBBb5uwiUAGq2/KKJClLL6q5fW92fph7hmskyrammD7m9AWhk6vg8RAVcEaoTALnGOXMJKmjVXD2yipo8SxtD3hKYYcA3DGX2fu46mXqAGKErtwhHylxG3gorPFJmSLBEtyLLi1r4igTT2HMMocgi3IvEeBjSreYKywOKjVy8Qs1KYcZi17RlbTbYrur/AHHYbW24xpoIXcRYKRej9EG03iY1Kb2pApYOxcFSBgVg5/aUUDTzBwq6JV5Crwyh/cbQhBCja3zUMRQgFWGli+tAGlH/ALHMHVJGrLkpqIQDMrmOlcrCAG9QqRRLIuIC4hYwEoeU3GhasKJaq2Tk0wYWjuUjEmRKlNUdC9xQkryxotw1cHZLawSXcMLuB2VmZ+0LlZjl7gSrZdmEyVzWnuCEuALyZlfq5g078y7Ow4xQzLsqArUaKMaTWJWD8HMqxCL1zDGJeZegRMdzAZlqDctHETF/OcR/hEdacD0TSaly7MzQO+oGYnmGvERsalBdgfqf+Icsyxe0lrVqix8c5Zj+kp5nHZMvsRP0v5fgLmA5MkKvwWzGuJkZyQcxgNsEaMJVK5hgysyQMbuVQ6fhiRbPMsPxSChcUJQQWgZWKiwdIpr1LjBCnLwDcTANoDo4gr3EdTIliK6LlqXCSS5eogUeeYq15jIVWWMMNQJZQM5auVthdXlzo8zHi5jYmPERS43zKsw5AOMOWO7cUgGtHqMxdRELW4OIBKOpexAUyMn8JahRyHPiL8NC59EWwfYh0m3qAEXQ8wbjJQV08sMKsMBK13XiHNxMoDjoy2ufPBMb/A0+/uUkzkQE7EiYdtBUSBfSVex3KhmbdFcdQ8OxRYvtMwCjvCo+zUz3CgDB4DEK8XLXnEGaRu4XcMJdRrjuhZ8uCdZ6GiEAiufsf6hssMJrzMF8ytObXUK3bcPIbittLvKGBQLy6hOx9HHsY2UjkSvA96lcyd3YpKzhW/G+CmvUGAhESplRzJkfYEStFoaQr9R8y1VLHD4xBacVGh19QMRCgV1Z8xIAQMwVJX3+IU+WRQZtLjZjEv0pG5S8LXMB1criO0oPqAi3yjsGmC5sMAyw6v8AtMgrHQW8IZwWf7EphrmK1BwNyqxQYbt61ElKBzWH8Sr3mLmDThhTBCK//hKlR3m2l8MMtqHmBKWagq4dzGiwrsxYMPh44WquJixtIai3aJSIuMLrG/FxZWXvc07wLmuuUKRhS1ek/wAoxGWGXPm472JQWXtiZoySr71F1SyP0RhLrQypcajAbMnk4ZdRhSx8TBsUjKoz5jwdDuCOQObs4nSgGQlGOMBkrIH9ys6thXcTmIr5Yg2HZmYHlqBTfMvYVbTt8SpR2fFVOKHvKGF25SZ2W8ES9iURacRXEIXATQxVN/rUezhfUK4rdHnuXhOLvMecvIBd+oAWOA35IcQa1dP/AD/v5vPUEDukf6hGqDoKz6/H6iIB4o1APIN0Re0ZM4i4Ccty0eWJfyUA5xiVmDGIhFxoUmCjcVshNOG0NDz8CxgLaQNSh9EvbBGy5jBKbsuWNxdxKdkshc5c3LSgaCrj0S2ggri+Fip1mc0xGDVQ5HMD0FOQnOZWgrnL4RtmuYuBQJysTNgE+RKJn4LZGMMxRT0wSoNK1MSuqpfMWyYszTEWLdjc8Y4Y6ywZdS6+BzONShL3GXT+pURzqbIlEyF0Hlm5WFkHnszj7JZuyrCBYqtBD31ZbtWEaNmI6vUwK7+5ciCrBbB+oGIHJHb6w/lh0LgANgWC5gRWwwYXFbVfcLvMRp4Vw8VLv7hv/wCcrLiIg2OnI/UQdVlglRVLCYSjECHFxDdAkWmKfRSlyzoZ4TUx07f4hVLMDZKoEb6gbS6x3EUYjiXELVfti/8AMbc1f8biXQFVwSXjCmjKKxf1OcRrUYtVAIgG8aD8SnA8WkxhZs3R/FRZ16tz81B4EBL2N+LxDtssKlRV0y3EjtcVJdc/UzbhsglgxKblxLj8WCy1kBqIDXI5l6TLauYVS06cwlgTkiJE6ql+pl5WrKD6jRuchT9dx8y5yMHMtUYGiFCrxBpEwkWFtU07hJ4ex6Atvyzc8r2B/wBzMrrlHAMq+I73+IxBBe2G53gWonL9SyxiA4Pu5+HYotbzMQKZhmoFysyyLLAFvFnEqHCMrEdSCRxwP4jVXARUZNqkd1C1ZhOZcGpuD4EkiDYjVS6VVT+un8tzDcoZIXI3MH5CoYmahekLv2gALgXvWSOBjG4SdcDTo0BOMRjZXg6guXOPY2+n9RmyrM0pbP4gEhwBBVywoZas8dQtk67ZQhsKluf1MAWHqH/KgnQnkjyBSnHJC+YMTsYGP7m1xwg1ATMdQ/8AgSoLiKthLWqh30LJYy5a2AjRhWUKMDsGvuvqBoXREeBph4PuV4/CzrSwyYdGxeQekjqUu4YIXR4efB58IAIipK1tv1coFk4inBjPuLVm2McTQnB3ByGylCK8mAmxgqDEguCM7QdSn86H9kYsRWjyO5bYqy9+I5JaUeWVpkNvGoEqFduCXgAdvLCAsDAMXERqg3cwFA2Vs7j4ndApq+2F7LWtk2UaKL5eWWB1a3EVFzcFS/VwPiEgAyXQWy/J7K0Fx93n7majGmhuZKFBYCGSLa1UoL0Fcqy3yP8AhM54s7SJmU2G3zjrs/qIBC9rELPzUeJ4A4muZcG42v6EAxgxH5BLSbQbiXBA46hFQjDdwwy6k/USMIZXwxgLa1KSZKHs52Ggq1lNn5+AxniAMojmU4ckxy2H5I/6zZwxrKzQJKlcWLaHUUrabZYFFvaZ342zHuX1kzfcuNTacHwCpdyl/DVRmatHHtnPFxI3lMwPMSxgj8kSTCuBgI2zI+5cWXhjcOJQkFCMcRu6ioUlRxbnvIEP0ytHK7ViWfhBgLAscx4k8harw8r/ABLAUFJq2tTMtkVbnMhqVJS3bXmiKItHOJS4KHm2zkqdCiAzg0WxFMi9ItAORoIk7FAPSf8AsTOYAeob+LJdkS2cqQ0YcLziGLWC02PUVVE3fcxjZ0xexK4K0lKVurlEvslggt+88+xvUqSOcpPpt+4pUDAKF3WJsgIUNtjaOXpmhTwBELmEMcxS3+o34uazvzBW5U1S+9zM0fUK/wC4Pj9TFCNCblRU1i5am8kygU7VmPasJxcS/gRog3HMCXuA4ktu8VBzBcYZgqvuHwKeOoZusLq/uOduY0x8ymL5fmAOP3BSyKhGpmYUlMADo8yob4LLrN/5qCgqieUrwSzRZILP3x4cxQSjq7mFUxmO9bhTFNMZkKgNJwQ1r7XHZ+oP+JiqQoMrJxtgPk4iDa/09Sq+OZV8W9VrwEKm7CLPvxEuiBZoH8pEw01HpieNfYtvmL8EuXAAdzQCPBYU/hEsQAl0vqI9woFUfpDoG0To5nmKCSbf2xY6IixbLbEY/V61v9YIalIoduiFkB8YY3S4NQ48MoguNQMsFI25m0VDLTAllQpC8C5k3KAlkSCXavUCCZ2GUhZr2uWNoHgKhF24Q7cSn6iSsyiECvwN/qXgVhcVAw6EGPGGgltuRg3f4zMaEarLYhr8TH4AYtNB3KSPYpTdWfqOpQAWuKlA6K9vLAUL/wA8KC3Zc4uBefcWjHXP0SwWLFiV0RT+dVKunziosHqKvvLHMAj2fMq2mIBlW1/9iAbD0qK9U8Dgl5lCGlzDM1HbSJ5ljqU/LA1C0KzhXV3iNrFD6z/j4NAcFS2o1Mt5Qyo5h4Q8Yr7G0j0ojMDKXRCA7msiPFaJj9YACiCNoWVfC8s/9qOajtsEsTwiP3DCl90lj3NAbK1fh6Tv+RyEFxths6/rzjDLdZf5gJdr9RovBt7epaF32lx7ZtEqICWItsvYxKKhYY8y7EocxhTjmBcBAwjhX3BUErSAF2IglVv7aouVTnEwTFqGYHwUniEzmszE6ScSJlv2IpB2ouxOJjwzVaI+z5yn6lkRhHK4LgULcIcxqRaYjZiJBqViEchsYZZpMDyw2ne/hYtEUSGdkL5B2GVvFUWFgsj8XRMkHJojV0aijB5iB5iEB2JeA8HbBx/MRrFeACUNiQDKvU1KpFrpdv6gMNl0AwEGbQodX/bAIYSuovHVHMdS2twE1fgNXGWoS+lsYqOi1teCUua0zSVkMJCQQb98zmViIkLgINQdhjbhmVdxD6lEFVWPzeI38R/XhjCZbsQTsHWD5l8B5j+KDlYTvWMqIvRW9CTDuhXEPeNBT+Esy26WXsmEOUo/JDFFgQPkwkEellAh9P4i3qxQEEzp5hFZVSl1uFnzDVwB7QmqLscq6x+YCbKNSopSRcfYQ1CsESwWjCjmHMvWIyMf5S6QC+MCDLjGyJRLRl7KFgAABwQIsAMtYguV9S1yjy7mKp8NPJNEXtGSJUBYEKWh1XY+oGANhqPlbjYSrN7aOCJ8V3BHs1GxKtVlhe+JuKqN9Q76/BHn8kNRS4Na3CFsFHCTMqF0afEXs6GagK1yjguOhu7c7fWpa1K/MsjQc2z/AO0fBOZDVkzpAucAURN0Q1n4KlpjuOSWrzPwp7d/tZ+I7grX+fNc/FU+jiWWGha+muPEPgkNkXwLBfi3AiQNtK31Moi5HiJhsfi9YuLrEcQBDI7g1OWuZUC2pQIO4ZPk7YeIUcRYghpdEGS7VwRBlPt+ViG4t4DU5lZY6uKCTLzOAFA0ZhW27gOWjcLdiY9RYOqqmWvibgNheG4j2VRfv4xUw3B9Kv4UQUjkXI9kFMABwEQaajyLbC+IAgoFR8SXKqFGJoFspuKcrBY/Mcx4jjZ2EqfZN4tFqyf3CCYREwKxiORebuBqgZ9R30AB18C4jeUBpSaY90CmJZXV78nt5c0eol1r9F09n/f1OjEBsBkf9xMRnjxAP5HuCyv5HuO2cxWwc/KaPl0VCEGvhNRYhuALIu8LM/wRIBjkt/ESuVBQW8xPcMkfkO4mCGBeOoRUcwYi8rChLgMXDGXmAkKSZhl7+KPhpDXwdTPxfAbjtmxJcBSVruaQjWJxBvcRVbe4OMFXAS2D8cShXEcNGooS9M1DXGDsXUIiC6LK4Z9EqBLH+ZHEm+mml9IMdusqvOYwMoFBxHDisNMfMaON/cvKxcemMYPJCAFFf5YIGq+4UcpTb3mNNnGYBSs9/cvMHERZbWDmBlHU4gAHIsECBxGQqYUYKHA4uO5QcrrmDFq5g0GEzVzSkBsjolM3vuWy4BmVMTEDhIptbD3iOoFeelUkpregWhmI7crGfSln0wJwVWxeTzBtBwC0QAqKjr2EQEGIH0IuoFMekBWpnri5UKiKDZcCAA4Oo4YqDiZKTVN+Zg61X9xS1Eoy7tgAKCK05qoqMTQ+DXxpN5p/8movzM5iqGhxEA5BNr6lYFdVFyPAwE1jMF+hE7zGXKqDovUXzVCvWqv1GhiLl3L+LtjhgWQoR7bg4mxFiXiX8GYWNg0Zm/wP8S/6BS0N3UdStXcdkdsljZQriGdbiuswqpBLaQMR4AAun3CQHOD3HCy7hubXTH4juCnMNEXEdpvLg5Y2hw6S5//Z"
+        },
+        {
+            "uri" : "data:image/jpeg;base64,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"
+        },
+        {
+            "uri" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABAAAAAQACAYAAAB/HSuDAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH4gMQFzc3sTKNqAAAIABJREFUeNrs3Xl0VPXB//HPnS0zkwBZIAExLCKCtipHXFAQq6WAVCygsqq1WvVU1Kp9cO1Pq61a1Frbx2oVbRUkiqCIFgEFVKgKCFZFLYLKElCSkIQlmZksc7+/P56nPA4TkkAWvhPer3PmnM7NnZlv3kPHud/cxREAAAAAWMQYY6gAND8PCQAAAAAAYAIAAAAAAAAwAQAAAAAAAJgAAAAAAAAATAAAAAAAAAAmAAAAAAAAABMAAAAAAACACQAAAAAAAMAEAAAAAAAATAAAAAAAAAAmAAAAAAAAABMAAAAAAACACQAAAAAAAMAEAAAAAAAAYAIAAAAAAAAwAQAAAAAAAJgAAAAAAACACQAAAAAAAMAEAAAAAAAAYAIAAAAAAAAwAQAAAAAAAJgAAAAAAAAATAAAAAAAAAAmAAAAAAAAABMAAAAAAAAwAQAAAAAAAJgAAAAAAAAATAAAAAAAAAAmAAAAAAAAABMAAAAAAACACQAAAAAAAMAEAAAAAAAAYAIAAAAAAAAwAQAAAAAAABMAAAAAAACACQAAAAAAAMAEAAAAAAAAYAIAAAAAAAAwAQAAAAAAAJgAAAAAAAAATAAAAAAAAAAmAAAAAAAAYAIAAAAAAAAwAQAAAAAAAFKUjwQAAAAAYKfKykrNnj1bCxcu1IcffqiSkhJFo1F16tRJRx11lIYOHaoJEyboqKOOIhYa5JAAAAAAgE2MMYYK0pNPPqk777xTRUVF9a7n9/t11VVX6YEHHlA4HCYcmAAAAAAAwARAKqipqdHVV1+tv//97wf0uP79+2v+/PnKy8vjHxGYAAAAAADABIDtrrrqKk2bNu2gHnv66afrnXfekd/v5x8SknASQAAAAACwxKxZs+rc+B84cKAWLFig8vJyVVZW6r333tOYMWOS1nv//fd1zz33EBIAAAAAYD9zmIrH46Z3795GUsJt3LhxJh6P1/mYG264IWn9du3ambKyMgPsi08XAAAAAEwAWGDevHlJG/Ndu3Y1e/bs2e9jqqurzTHHHJP0uMcee2zfDb+EmzHGrFq1yowdO9Z07tzZBAIBc+SRR5rLL7/cbNy4cb+vV1tba9544w1z4403mkGDBplOnToZv99v2rdvb0488URz0003ma+//rrB3/WLL74wv/jFL8zRRx9tQqGQycjIMCeddJJ54IEHTDQarXO8Df0++9ngbdR6u3fvNlOnTjVnnHGGyc7ONoFAwHTp0sWcf/75Zvbs2cZ1XSYAAAAAAIAJgOYxefLkpA3We+65p8HHPfTQQ0mPu+iii+rdEH7qqaeM1+tNWi7JtG/f3qxatarO1+revXudj/nuLRwOm5dffnm/4/3LX/5i/H7/fh9/xhlntOoEwNKlS01ubm69v9OwYcPM7t27mQAAAAAAACYAmq5fv35JG54rV65s8HEffPBB0uN69+5d74awx+Opd4O3Z8+eJhKJNLhBvb9bKBQyX331VdLjp0+f3ujnaI0JgLfeeqveyYjv3kaPHs0EAAAAAAAwAdB0eXl5SRud5eXlDT6uvLw86XGZmZn1bgg7jmN++9vfmh07dpjdu3ebadOmmbS0tKS9BOraoG7Xrp256aabzLJly0xpaamJRCJm1apVZsCAAQmP/+Uvf5nw2LKyMtO+ffuEdc466yyzatUqE4vFzJYtW8yUKVNabQKgoqIiqfkNN9xgNm3aZHbt2mXmz59v8vPzE36+ePFiJgAAAAAAgAmApqnrL9G1tbUNPq6mpibpcX6/v94N4auuuirpee66666Edc4777ykdcaNG2d27NhR5zjWrVuX8Pjvf//7CT9/8MEHk/ZSiMVijToUoiUmAB555JGEn02ePLnB8zJMmjSJCQAAAAAAYAKgadq1a5e0wbpr164GH7dr166kx+Xm5ta7Ifz5558nPc9nn32WsE5+fn69r1tbW2u++uors3jxYjNt2jRz2223JV2N4LuGDBmS8POnn366zufdtm1bq0wA7Dueuk5+WFpamrBOr169mAAAAAAAACYAmuaoo45K2mBds2ZNg4/7+OOPkx53/PHH73dD2Ofz1blnwb5n3w+FQknrxONxM336dHP22WebUCh0QMfu77u7/bp16/b7O2VmZrb4BEBdh1yoESc4TGU+Pl4AAAAA4NA74YQT9PXXXycsW7JkiU466aR6H/f2228nLTv99NP3u36HDh3k9XqTlu+7LB6PJ9yvrq7W+eefr0WLFh3U71deXp5wv1u3bvtdNy0trcV7l5WVHfBjIpFISv8b8/B/MwAAAAA49H70ox8lLXv88ccVi8X2+5iamhr99a9/TVo+ZMiQ/T6mqqqqzuUlJSUJ97OyshLu33fffUkb/z169NCoUaN07bXX6ve//718vv3/jXnfn+3cuXO/v1NpaWmTeza0x3soFDrs/o2xBwD253RJR5LhsBeT9BoZAAAAWt748eN16623as+ePXuXbdy4Uddee62mTZsmx3GSHjNlyhT9+9//TliWn5+vUaNG7fd1KioqtGPHDnXs2DFh+apVqxLuH3vssQn3Z86cmXD/z3/+s6677rqEiYXbb799v6+bl5enjRs37r2/du1adenSJWm9tWvXqra2tt5WwWAwYWKkqKhIeXl5Cets3ry53ufo1q2bPv300733v/zyS/Xq1Yt/iDgsvaiDuD4ntzZ3+5b/KwAAgNZmDmN33nlnnd/LhgwZYt566y2zZ88es2fPHrNs2TIzcuTIOtet6+R6+64zderUpHV+9KMfJazzm9/8pt6rFOzevTvh56+88kq9x9yPHz8+6RKAdRkxYkSDx/j36NEj4eczZ85MWufee++t93muv/76hJ9df/31bf7fF58uYAKAGxMAAACACQBLVFdXm0GDBh3097eJEyc26mR44XDYPPfccyYSiZitW7eaq6++OulEgZs2bUp4jpycnIR1brrpJrNjxw5TVlZmZs6caTp27FjvBvdrr72W9PMJEyaYL774wlRXV5t169aZiy++uMGTCRpjzNixYxN+npeXZ+bOnWt27txptm7dah588EGTlpZW7/OsW7fOeL3epH7Lli0zRUVFpqqqymzZssWsWLHC3HfffUmXNWQCAEwAcGMCAAAAgAmAJikpKTFnnHHGAX93u/DCC00kEmnUBEBDt9tuuy3pOSZMmFDvY9LT0+vd4HZdN+nSe4297WvhwoUNPsbn8zX4PHXtJXAg42ACAEwAcGMCAAAAgAmAJonFYmbKlCkmGAw2+J0tKyvL/OEPfzCu6zb6cninnXbafp9vwoQJdV4m8OuvvzadOnWq8zGBQMDMmzevwQ3mHTt2mNNPP73e3+c3v/lNoza8991rQftcwnDu3LmNep6pU6fWOVnABACYAODGBAAAAAATAK1m69at5oEHHjBDhgwx+fn5JhgMmoyMDNOzZ09z/vnnm8cff9yUl5c3ZsMv4VZRUWHuuusu06dPH5OWlmYyMzPN2Wef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l9XaGO2lgFNNJzrRiU50AtA8G3J1nL2+oqIiJca+cOHChPs333xznSfg23cvgTfffJM3ngkAAJBqjU95ge06v+PLisTDVozJ68RVVpOtl0ouUsgToROd6EQnOgFoNh07dkxa9vnnn6fE2NevX59w/8QTT6xzveOPPz7h/saNG3njmQAAkCKclrxVuWnO2NwCJ91b6Rh5nJZ+vcbcgp6o81LJWGdXbZbjcVwrxkQnOtGJToeoE4Bm1qdPn6Rlc+fOTYmx79q1K+F+ly5d6lwvPT3xainfPWwATAAAOExVuWk6Lv0znZn5jjV/XQs41foq2ltLyocq7K2kE53oRCc6AWhW55xzTtKyJ554osX+St6cJ8hr165dozbsd+7cmXA/OzubN54JAACQJuZNt2o8XieugqJLFDdeOtGJTnSiE4BmN2HCBPn9iecU2bNnj0aOHJl0tvyGBIOJVyYpKipKWmfz5s0HNc54PPkko7169Uq4/9FHH9X52H2Xf+973+ONZwIAQIpokd1KI/Gwc2bmO85x6Z85VW6aFbvWhjxRZ+Xu052P9pzkBD0xK8ZEJzrRiU6HuBOAZta9e3f97Gc/S1r+2Wef6YQTTtBvfvMbffzxx6qoqFA0GtXXX3+tZcuW6de//rWOO+64hMd07tw54f6SJUuSnregoKBR40pLS0u4v23btqR1fvSjHyXc/8tf/lLnc/31r39NuD98+HDeeCYAAByujDxK91ZqbG6Bqtw0S2Y5jKrcND1fdLH8nho60YlOdKITgBbz0EMPqW/fvknLd+7cqbvvvlv9+vVTu3btFA6H1atXL5111lm699579e9//zth/VNPPTXh/k033aRXXnlFu3bt0rZt2/TQQw/pnnvuadSY8vPzE+7fe++9Sbv4X3PNNQoEAnvvz5kzR1dddZU2bNigmpoabd68Wdddd53mzJmzd53MzMykqwKACQAAh5FIPKzzO76svMB21RqfFWMKeyNaUHaetlZ1k9+poROd6EQnOgFoMe3atdP8+fPrnAQ4EJdffnnC/aKiIo0ePVqZmZk68sgjNWXKlDp35a/LkCFDEu4/+eSTysjISLjM35FHHqk//vGPCetNmzZNxxxzjAKBgHr06KFHH310788cx9Hf//53dejQgTedCQAAKaJZdyetNX6na1qhMyLnH04knm7FrrVep9Yprs515u0Y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LYRQpVhaC0BoUERhxUShQJNmTOzETuzETq3ciYhawZw5c5CVlRWy/dixY5g9ezZ69eqF2NhYWK1WZGRk4JprrsGTTz6JH374IWj/K6+8Muj29OnTUVxcjLq6Ohw6dAhz5szB448/3qgxpaWlBd1+8sknQ5b433vvvTAajSdvL1++HFOmTEFZWRl8Ph8OHDiA+++/H8uXLz+5T3x8fMhVAYgTAEREJzkCNlzd7gv0iNkOj2qWYkxWnQOf116H3c4sac6szU7sxE7sJGsnIjqz2NhYrF69usFJgKaYNGlS0O2KigqMGDEC8fHx6NixI/Lz8xtcyt+QQYMGBd1+4403EBMTE3SZv44dO+L5558P2m/+/Pno1q0bjEYjOnfujHnz5p38nhACb731Ftq1a8cHnRMAREShApoOdkM1RqcUwKuaJHnCVXHCH4dllWNgVtzsxE7sxE7sRETN1rVrV2zatAmTJ0+GXn9uV3kfMmQIpk6detrvWywWLFu2rFH3NXPmTMTHx591v3vvvRfz5s0LWglwukmOZcuWnfOJt4kTAETUNsK6jNWtWsRtyUtFB9Mh4df0UiytteicovjoKHHUlyx0IiDFmNiJndiJncLUiYhaUVxcHObPn4+ysjI8/fTTGDx4MDp16gSbzQadToeYmBhkZGRg2LBheOKJJ0IOAQCAV199FQsXLkT//v0RFxcHo9GILl26YOrUqdi5c2ej34B36tQJGzduRG5uLhISEs6473333Ye9e/di5syZ6NOnDxISEqDX65GUlIR+/frhr3/9K/bv349Ro0bxQW4heiYgomjjVY24yLIH1yV8Ks2JtQzCh4PuziipvglWnZOd2Imd2ImdiKjFde7cGY888ggeeeSRJv+sEAITJ07ExIkTT7tPYy8FeMkll6CoqKhR+6alpeFvf/sb/va3v53z392USxS25OUMIxFXABBR1FGhw7gL3oZOBKBJ8sGTQfjwTsV4eDWjNJfVYid2Yid2krUTERG1Dq4AIKJwCcsrXZdqxVVxX6BnzDY4A1Yp/nCz4sLX9X3wrxM5sCguKcbETuzETuwkayciImo9XAFARFFDg4BZcWFMagG8qkGacfk1AworJkAnAuzETuzETuxEREScACAiai5nwIYbEz/AhaZy+DU5XmDbdA58WjME+10ZMAovO7ETO7ETOxERUZvhIQBEFC6t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"
+        }
+    ],
+    "materials" : [
+        {
+            "name" : "MatBed",
+            "normalTexture" : {
+                "index" : 0
+            },
+            "occlusionTexture" : {
+                "index" : 1
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 2
+                },
+                "metallicRoughnessTexture" : {
+                    "index" : 1
+                }
+            }
+        },
+        {
+            "alphaMode": "BLEND",
+            "doubleSided" : true,
+            "name" : "MatBlend",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 3
+                },
+                "metallicFactor" : 0.0,
+                "roughnessFactor" : 0.800000011920929
+            }
+        },
+        {
+            "alphaMode": "MASK",
+            "alphaCutoff": 0.25,
+            "doubleSided" : true,
+            "name" : "MatCutoff25",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 3
+                },
+                "metallicFactor" : 0.0,
+                "roughnessFactor" : 0.800000011920929
+            }
+        },
+        {
+            "alphaMode": "MASK",
+            "alphaCutoff": 0.75,
+            "doubleSided" : true,
+            "name" : "MatCutoff75",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 3
+                },
+                "metallicFactor" : 0.0,
+                "roughnessFactor" : 0.800000011920929
+            }
+        },
+        {
+            "alphaMode": "MASK",
+            "doubleSided" : true,
+            "name" : "MatCutoffDefault",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 3
+                },
+                "metallicFactor" : 0.0,
+                "roughnessFactor" : 0.800000011920929
+            }
+        },
+        {
+            "doubleSided" : true,
+            "name" : "MatOpaque",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 3
+                },
+                "metallicFactor" : 0.0,
+                "roughnessFactor" : 0.800000011920929
+            }
+        }
+    ],
+    "meshes" : [
+        {
+            "name" : "TestCutoff25Mesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 2,
+                        "POSITION" : 1,
+                        "TANGENT" : 3,
+                        "TEXCOORD_0" : 4
+                    },
+                    "indices" : 0,
+                    "material" : 2
+                }
+            ]
+        },
+        {
+            "name" : "TestCutoff75Mesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 7,
+                        "POSITION" : 6,
+                        "TANGENT" : 8,
+                        "TEXCOORD_0" : 9
+                    },
+                    "indices" : 5,
+                    "material" : 3
+                }
+            ]
+        },
+        {
+            "name" : "BedMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 12,
+                        "POSITION" : 11,
+                        "TANGENT" : 13,
+                        "TEXCOORD_0" : 14
+                    },
+                    "indices" : 10,
+                    "material" : 0
+                }
+            ]
+        },
+        {
+            "name" : "TestBlendMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 17,
+                        "POSITION" : 16,
+                        "TANGENT" : 18,
+                        "TEXCOORD_0" : 19
+                    },
+                    "indices" : 15,
+                    "material" : 1
+                }
+            ]
+        },
+        {
+            "name" : "GreenArrowsMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 22,
+                        "POSITION" : 21,
+                        "TANGENT" : 23,
+                        "TEXCOORD_0" : 24
+                    },
+                    "indices" : 20,
+                    "material" : 5
+                }
+            ]
+        },
+        {
+            "name" : "DecalOpaqueMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 27,
+                        "POSITION" : 26,
+                        "TANGENT" : 28,
+                        "TEXCOORD_0" : 29
+                    },
+                    "indices" : 25,
+                    "material" : 5
+                }
+            ]
+        },
+        {
+            "name" : "TestOpaqueMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 32,
+                        "POSITION" : 31,
+                        "TANGENT" : 33,
+                        "TEXCOORD_0" : 34
+                    },
+                    "indices" : 30,
+                    "material" : 5
+                }
+            ]
+        },
+        {
+            "name" : "DecalBlendMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 37,
+                        "POSITION" : 36,
+                        "TANGENT" : 38,
+                        "TEXCOORD_0" : 39
+                    },
+                    "indices" : 35,
+                    "material" : 1
+                }
+            ]
+        },
+        {
+            "name" : "TestCutoffDefaultMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 42,
+                        "POSITION" : 41,
+                        "TANGENT" : 43,
+                        "TEXCOORD_0" : 44
+                    },
+                    "indices" : 40,
+                    "material" : 4
+                }
+            ]
+        }
+    ],
+    "nodes" : [
+        {
+            "mesh" : 2,
+            "name" : "Bed"
+        },
+        {
+            "mesh" : 7,
+            "name" : "DecalBlend",
+            "rotation" : [
+                -0.47185850143432617,
+                0.0,
+                -0.0,
+                0.8816744089126587
+            ],
+            "translation" : [
+                0.0,
+                0.0,
+                0.4090209901332855
+            ]
+        },
+        {
+            "mesh" : 5,
+            "name" : "DecalOpaque",
+            "rotation" : [
+                -0.47185850143432617,
+                0.0,
+                -0.0,
+                0.8816744089126587
+            ],
+            "translation" : [
+                0.0,
+                0.0,
+                0.4090207517147064
+            ]
+        },
+        {
+            "mesh" : 4,
+            "name" : "GreenArrows",
+            "translation" : [
+                0.5,
+                1.068150520324707,
+                0.004999999888241291
+            ]
+        },
+        {
+            "mesh" : 3,
+            "name" : "TestBlend",
+            "translation" : [
+                -1.5,
+                0.0,
+                -0.0
+            ]
+        },
+        {
+            "mesh" : 0,
+            "name" : "TestCutoff25"
+        },
+        {
+            "mesh" : 1,
+            "name" : "TestCutoff75",
+            "translation" : [
+                3.0,
+                0.0,
+                -0.0
+            ]
+        },
+        {
+            "mesh" : 8,
+            "name" : "TestCutoffDefault",
+            "translation" : [
+                1.5,
+                0.0,
+                -0.0
+            ]
+        },
+        {
+            "mesh" : 6,
+            "name" : "TestOpaque",
+            "translation" : [
+                -3.0,
+                0.0,
+                -0.0
+            ]
+        }
+    ],
+    "samplers" : [
+        {}
+    ],
+    "scene" : 0,
+    "scenes" : [
+        {
+            "name" : "Scene",
+            "nodes" : [
+                3,
+                1,
+                2,
+                6,
+                7,
+                5,
+                4,
+                8,
+                0
+            ]
+        }
+    ],
+    "textures" : [
+        {
+            "sampler" : 0,
+            "source" : 0
+        },
+        {
+            "sampler" : 0,
+            "source" : 1
+        },
+        {
+            "sampler" : 0,
+            "source" : 2
+        },
+        {
+            "sampler" : 0,
+            "source" : 3
+        }
+    ]
+}
diff --git a/automated-tests/resources/AnimatedCube.gltf b/automated-tests/resources/AnimatedCube.gltf
index 2f78e20..807c07e 100644
--- a/automated-tests/resources/AnimatedCube.gltf
+++ b/automated-tests/resources/AnimatedCube.gltf
@@ -1,4 +1,9 @@
 {
+   "extensionsUsed" : [
+       "KHR_materials_specular",
+       "KHR_materials_ior"
+   ],
+
    "accessors" : [
       {
          "bufferView" : 0,
@@ -197,14 +202,30 @@
    ],
    "materials" : [
       {
+         "extensions" : {
+            "KHR_materials_specular" : {
+               "specularColorFactor" : [
+                  0,
+                  0,
+                  1
+               ],
+               "specularFactor" : 0.5,
+               "specularTexture": {
+                "index": 0
+               },
+               "specularColorTexture": {
+                "index": 0
+               }
+             },
+             "KHR_materials_ior" : {
+                 "ior" : 1.0
+             }
+         },
          "name" : "AnimatedCube",
          "pbrMetallicRoughness" : {
             "baseColorTexture" : {
                "index" : 0
             },
-            "metallicRoughnessTexture" : {
-               "index" : 1
-            },
             "baseColorFactor": [ 1.000, 0.766, 0.336, 1.0 ],
             "metallicFactor": 1.0,
             "roughnessFactor": 0.0
@@ -301,7 +322,7 @@
       },
       {
          "mesh" : 1,
-         "name" : "AnimatedCube2"
+         "name" : "AnimatedCube"
       },
       {
 
@@ -312,7 +333,7 @@
         "camera" : 1,
         "translation" : [ 0.5, 0.5, 3.0 ],
         "children": [
-          4
+          4, 5, 6, 7
         ]
       },
       {
@@ -335,6 +356,18 @@
             0.0,
             1.0
         ]
+      },
+      {
+        "camera" : 3,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      },
+      {
+        "camera" : 4,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      },
+      {
+        "camera" : 5,
+        "translation" : [ 0.0, 0.0, 0.0 ]
       }
    ],
    "scene" : 0,
@@ -382,6 +415,30 @@
         "zfar": 100.0,
         "znear": 0.01
       }
+    },
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "yfov": 0.7,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "orthographic",
+      "orthographic": {
+        "xmag": 1.0,
+        "ymag": 1.0,
+        "znear": 0.01
+      }
     }
    ],
    "samplers": [
diff --git a/automated-tests/resources/AnimatedCube.metadata b/automated-tests/resources/AnimatedCube.metadata
new file mode 100644
index 0000000..70b5b7f
--- /dev/null
+++ b/automated-tests/resources/AnimatedCube.metadata
@@ -0,0 +1,17 @@
+ {
+    "images": [
+        {
+            "uri": "AnimatedCube_BaseColor.png",
+            "minWidth": 256,
+            "minHeight": 256,
+            "samplingMode": "BOX_THEN_NEAREST"
+        },
+        {
+            "uri": "AnimatedCube_MetallicRoughness.png",
+            "minWidth": 256,
+            "minHeight": 256,
+            "samplingMode": "NEAREST"
+        }
+    ]
+}
+
diff --git a/automated-tests/resources/AnimatedCube2.gltf b/automated-tests/resources/AnimatedCube2.gltf
new file mode 100644
index 0000000..807c07e
--- /dev/null
+++ b/automated-tests/resources/AnimatedCube2.gltf
@@ -0,0 +1,458 @@
+{
+   "extensionsUsed" : [
+       "KHR_materials_specular",
+       "KHR_materials_ior"
+   ],
+
+   "accessors" : [
+      {
+         "bufferView" : 0,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 3,
+         "max" : [
+            2.000000
+         ],
+         "min" : [
+            0.000000
+         ],
+         "type" : "SCALAR"
+      },
+      {
+         "bufferView" : 1,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 3,
+         "max" : [
+            0.000000,
+            1.000000,
+            0.000000,
+            1.000000
+         ],
+         "min" : [
+            0.000000,
+            -8.742278e-008,
+            0.000000,
+            -1.000000
+         ],
+         "type" : "VEC4"
+      },
+      {
+         "bufferView" : 2,
+         "byteOffset" : 0,
+         "componentType" : 5123,
+         "count" : 36,
+         "max" : [
+            35
+         ],
+         "min" : [
+            0
+         ],
+         "type" : "SCALAR"
+      },
+      {
+         "bufferView" : 3,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000,
+            1.000001
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC3"
+      },
+      {
+         "bufferView" : 4,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000,
+            1.000000
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC3"
+      },
+      {
+         "bufferView" : 5,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            -0.000000,
+            -0.000000,
+            1.000000
+         ],
+         "min" : [
+            0.000000,
+            -0.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC4"
+      },
+      {
+         "bufferView" : 6,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC2"
+      }
+   ],
+   "animations" : [
+    {
+       "channels" : [
+          {
+             "sampler" : 0,
+             "target" : {
+                "node" : 0,
+                "path" : "rotation"
+             }
+          }
+       ],
+       "name" : "animation_AnimatedCube",
+       "samplers" : [
+          {
+             "input" : 0,
+             "interpolation" : "LINEAR",
+             "output" : 1
+          }
+       ]
+    }
+   ],
+   "asset" : {
+      "generator" : "VKTS glTF 2.0 exporter",
+      "version" : "2.0"
+   },
+   "bufferViews" : [
+      {
+         "buffer" : 0,
+         "byteLength" : 12,
+         "byteOffset" : 0
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 48,
+         "byteOffset" : 12
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 72,
+         "byteOffset" : 60,
+         "target" : 34963
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 432,
+         "byteOffset" : 132,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 432,
+         "byteOffset" : 564,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 576,
+         "byteOffset" : 996,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 288,
+         "byteOffset" : 1572,
+         "target" : 34962
+      }
+   ],
+   "buffers" : [
+      {
+         "byteLength" : 1860,
+         "uri" : "AnimatedCube.bin"
+      }
+   ],
+   "images" : [
+      {
+         "uri" : "AnimatedCube_BaseColor.png"
+      },
+      {
+         "uri" : "AnimatedCube_MetallicRoughness.png"
+      }
+   ],
+   "materials" : [
+      {
+         "extensions" : {
+            "KHR_materials_specular" : {
+               "specularColorFactor" : [
+                  0,
+                  0,
+                  1
+               ],
+               "specularFactor" : 0.5,
+               "specularTexture": {
+                "index": 0
+               },
+               "specularColorTexture": {
+                "index": 0
+               }
+             },
+             "KHR_materials_ior" : {
+                 "ior" : 1.0
+             }
+         },
+         "name" : "AnimatedCube",
+         "pbrMetallicRoughness" : {
+            "baseColorTexture" : {
+               "index" : 0
+            },
+            "baseColorFactor": [ 1.000, 0.766, 0.336, 1.0 ],
+            "metallicFactor": 1.0,
+            "roughnessFactor": 0.0
+         },
+         "normalTexture": {
+          "scale": 1,
+          "index": 0
+         },
+         "occlusionTexture": {
+          "index": 0
+         },
+         "emissiveTexture": {
+          "index": 0
+         },
+         "emissiveFactor": [ 0.2, 0.1, 0.0 ],
+         "doubleSided": false,
+         "alphaMode": "MASK",
+         "alphaCutoff": 0.5
+      },
+      {
+         "name" : "AnimatedCube2",
+         "pbrMetallicRoughness" : {
+            "baseColorTexture" : {
+               "index" : 0
+            },
+            "metallicRoughnessTexture" : {
+               "index" : 1
+            },
+            "baseColorFactor": [ 1.000, 0.766, 0.336, 1.0 ],
+            "metallicFactor": 1.0,
+            "roughnessFactor": 0.0
+         },
+         "normalTexture": {
+          "scale": 1,
+          "index": 0
+         },
+         "occlusionTexture": {
+          "index": 0
+         },
+         "emissiveTexture": {
+          "index": 0
+         },
+         "emissiveFactor": [ 0.2, 0.1, 0.0 ],
+         "doubleSided": false,
+         "alphaMode": "OPAQUE"
+      }
+   ],
+   "meshes" : [
+      {
+         "name" : "AnimatedCube",
+         "primitives" : [
+            {
+               "attributes" : {
+                  "NORMAL" : 4,
+                  "POSITION" : 3,
+                  "TANGENT" : 5,
+                  "TEXCOORD_0" : 6,
+                  "COLOR_0" : 3
+               },
+               "indices" : 2,
+               "material" : 0,
+               "mode" : 4
+            }
+         ]
+      },
+      {
+         "name" : "AnimatedCube2",
+         "primitives" : [
+            {
+               "attributes" : {
+                  "NORMAL" : 4,
+                  "POSITION" : 3,
+                  "TANGENT" : 5,
+                  "TEXCOORD_0" : 6,
+                  "COLOR_0" : 3
+               },
+               "indices" : 2,
+               "material" : 1,
+               "mode" : 4
+            }
+         ]
+      }
+   ],
+   "nodes" : [
+      {
+         "mesh" : 0,
+         "name" : "AnimatedCube",
+         "rotation" : [
+            0.000000,
+            -1.000000,
+            0.000000,
+            0.000000
+         ]
+      },
+      {
+         "mesh" : 1,
+         "name" : "AnimatedCube"
+      },
+      {
+
+        "camera" : 0,
+        "scale" : [ 0.5, 0.5, 3.0 ]
+      },
+      {
+        "camera" : 1,
+        "translation" : [ 0.5, 0.5, 3.0 ],
+        "children": [
+          4, 5, 6, 7
+        ]
+      },
+      {
+        "camera" : 2,
+        "matrix": [
+            1.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            -1.0,
+            0.0,
+            0.0,
+            1.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ]
+      },
+      {
+        "camera" : 3,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      },
+      {
+        "camera" : 4,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      },
+      {
+        "camera" : 5,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      }
+   ],
+   "scene" : 0,
+   "scenes" : [
+      {
+         "nodes" : [
+            0, 1, 2, 3
+         ]
+      }
+   ],
+   "textures" : [
+      {
+         "sampler" : 0,
+         "source" : 0
+      },
+      {
+         "sampler" : 1,
+         "source" : 1
+      }
+   ],
+   "cameras" : [
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "yfov": 0.7,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "orthographic",
+      "orthographic": {
+        "xmag": 1.0,
+        "ymag": 1.0,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "orthographic",
+      "orthographic": {
+        "xmag": 1.0,
+        "ymag": 1.0,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "yfov": 0.7,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "orthographic",
+      "orthographic": {
+        "xmag": 1.0,
+        "ymag": 1.0,
+        "znear": 0.01
+      }
+    }
+   ],
+   "samplers": [
+    {
+        "magFilter": 9729,
+        "minFilter": 9987,
+        "wrapS": 33071,
+        "wrapT": 10497
+    },
+    {
+        "magFilter": 9728,
+        "minFilter": 9986,
+        "wrapS": 33071,
+        "wrapT": 33648
+    }
+   ]
+}
\ No newline at end of file
diff --git a/automated-tests/resources/AnimatedCube2.metadata b/automated-tests/resources/AnimatedCube2.metadata
new file mode 100644
index 0000000..70b5b7f
--- /dev/null
+++ b/automated-tests/resources/AnimatedCube2.metadata
@@ -0,0 +1,17 @@
+ {
+    "images": [
+        {
+            "uri": "AnimatedCube_BaseColor.png",
+            "minWidth": 256,
+            "minHeight": 256,
+            "samplingMode": "BOX_THEN_NEAREST"
+        },
+        {
+            "uri": "AnimatedCube_MetallicRoughness.png",
+            "minWidth": 256,
+            "minHeight": 256,
+            "samplingMode": "NEAREST"
+        }
+    ]
+}
+
diff --git a/automated-tests/resources/AnimatedCube3.gltf b/automated-tests/resources/AnimatedCube3.gltf
new file mode 100644
index 0000000..807c07e
--- /dev/null
+++ b/automated-tests/resources/AnimatedCube3.gltf
@@ -0,0 +1,458 @@
+{
+   "extensionsUsed" : [
+       "KHR_materials_specular",
+       "KHR_materials_ior"
+   ],
+
+   "accessors" : [
+      {
+         "bufferView" : 0,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 3,
+         "max" : [
+            2.000000
+         ],
+         "min" : [
+            0.000000
+         ],
+         "type" : "SCALAR"
+      },
+      {
+         "bufferView" : 1,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 3,
+         "max" : [
+            0.000000,
+            1.000000,
+            0.000000,
+            1.000000
+         ],
+         "min" : [
+            0.000000,
+            -8.742278e-008,
+            0.000000,
+            -1.000000
+         ],
+         "type" : "VEC4"
+      },
+      {
+         "bufferView" : 2,
+         "byteOffset" : 0,
+         "componentType" : 5123,
+         "count" : 36,
+         "max" : [
+            35
+         ],
+         "min" : [
+            0
+         ],
+         "type" : "SCALAR"
+      },
+      {
+         "bufferView" : 3,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000,
+            1.000001
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC3"
+      },
+      {
+         "bufferView" : 4,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000,
+            1.000000
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC3"
+      },
+      {
+         "bufferView" : 5,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            -0.000000,
+            -0.000000,
+            1.000000
+         ],
+         "min" : [
+            0.000000,
+            -0.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC4"
+      },
+      {
+         "bufferView" : 6,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC2"
+      }
+   ],
+   "animations" : [
+    {
+       "channels" : [
+          {
+             "sampler" : 0,
+             "target" : {
+                "node" : 0,
+                "path" : "rotation"
+             }
+          }
+       ],
+       "name" : "animation_AnimatedCube",
+       "samplers" : [
+          {
+             "input" : 0,
+             "interpolation" : "LINEAR",
+             "output" : 1
+          }
+       ]
+    }
+   ],
+   "asset" : {
+      "generator" : "VKTS glTF 2.0 exporter",
+      "version" : "2.0"
+   },
+   "bufferViews" : [
+      {
+         "buffer" : 0,
+         "byteLength" : 12,
+         "byteOffset" : 0
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 48,
+         "byteOffset" : 12
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 72,
+         "byteOffset" : 60,
+         "target" : 34963
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 432,
+         "byteOffset" : 132,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 432,
+         "byteOffset" : 564,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 576,
+         "byteOffset" : 996,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 288,
+         "byteOffset" : 1572,
+         "target" : 34962
+      }
+   ],
+   "buffers" : [
+      {
+         "byteLength" : 1860,
+         "uri" : "AnimatedCube.bin"
+      }
+   ],
+   "images" : [
+      {
+         "uri" : "AnimatedCube_BaseColor.png"
+      },
+      {
+         "uri" : "AnimatedCube_MetallicRoughness.png"
+      }
+   ],
+   "materials" : [
+      {
+         "extensions" : {
+            "KHR_materials_specular" : {
+               "specularColorFactor" : [
+                  0,
+                  0,
+                  1
+               ],
+               "specularFactor" : 0.5,
+               "specularTexture": {
+                "index": 0
+               },
+               "specularColorTexture": {
+                "index": 0
+               }
+             },
+             "KHR_materials_ior" : {
+                 "ior" : 1.0
+             }
+         },
+         "name" : "AnimatedCube",
+         "pbrMetallicRoughness" : {
+            "baseColorTexture" : {
+               "index" : 0
+            },
+            "baseColorFactor": [ 1.000, 0.766, 0.336, 1.0 ],
+            "metallicFactor": 1.0,
+            "roughnessFactor": 0.0
+         },
+         "normalTexture": {
+          "scale": 1,
+          "index": 0
+         },
+         "occlusionTexture": {
+          "index": 0
+         },
+         "emissiveTexture": {
+          "index": 0
+         },
+         "emissiveFactor": [ 0.2, 0.1, 0.0 ],
+         "doubleSided": false,
+         "alphaMode": "MASK",
+         "alphaCutoff": 0.5
+      },
+      {
+         "name" : "AnimatedCube2",
+         "pbrMetallicRoughness" : {
+            "baseColorTexture" : {
+               "index" : 0
+            },
+            "metallicRoughnessTexture" : {
+               "index" : 1
+            },
+            "baseColorFactor": [ 1.000, 0.766, 0.336, 1.0 ],
+            "metallicFactor": 1.0,
+            "roughnessFactor": 0.0
+         },
+         "normalTexture": {
+          "scale": 1,
+          "index": 0
+         },
+         "occlusionTexture": {
+          "index": 0
+         },
+         "emissiveTexture": {
+          "index": 0
+         },
+         "emissiveFactor": [ 0.2, 0.1, 0.0 ],
+         "doubleSided": false,
+         "alphaMode": "OPAQUE"
+      }
+   ],
+   "meshes" : [
+      {
+         "name" : "AnimatedCube",
+         "primitives" : [
+            {
+               "attributes" : {
+                  "NORMAL" : 4,
+                  "POSITION" : 3,
+                  "TANGENT" : 5,
+                  "TEXCOORD_0" : 6,
+                  "COLOR_0" : 3
+               },
+               "indices" : 2,
+               "material" : 0,
+               "mode" : 4
+            }
+         ]
+      },
+      {
+         "name" : "AnimatedCube2",
+         "primitives" : [
+            {
+               "attributes" : {
+                  "NORMAL" : 4,
+                  "POSITION" : 3,
+                  "TANGENT" : 5,
+                  "TEXCOORD_0" : 6,
+                  "COLOR_0" : 3
+               },
+               "indices" : 2,
+               "material" : 1,
+               "mode" : 4
+            }
+         ]
+      }
+   ],
+   "nodes" : [
+      {
+         "mesh" : 0,
+         "name" : "AnimatedCube",
+         "rotation" : [
+            0.000000,
+            -1.000000,
+            0.000000,
+            0.000000
+         ]
+      },
+      {
+         "mesh" : 1,
+         "name" : "AnimatedCube"
+      },
+      {
+
+        "camera" : 0,
+        "scale" : [ 0.5, 0.5, 3.0 ]
+      },
+      {
+        "camera" : 1,
+        "translation" : [ 0.5, 0.5, 3.0 ],
+        "children": [
+          4, 5, 6, 7
+        ]
+      },
+      {
+        "camera" : 2,
+        "matrix": [
+            1.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            -1.0,
+            0.0,
+            0.0,
+            1.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ]
+      },
+      {
+        "camera" : 3,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      },
+      {
+        "camera" : 4,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      },
+      {
+        "camera" : 5,
+        "translation" : [ 0.0, 0.0, 0.0 ]
+      }
+   ],
+   "scene" : 0,
+   "scenes" : [
+      {
+         "nodes" : [
+            0, 1, 2, 3
+         ]
+      }
+   ],
+   "textures" : [
+      {
+         "sampler" : 0,
+         "source" : 0
+      },
+      {
+         "sampler" : 1,
+         "source" : 1
+      }
+   ],
+   "cameras" : [
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "yfov": 0.7,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "orthographic",
+      "orthographic": {
+        "xmag": 1.0,
+        "ymag": 1.0,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "orthographic",
+      "orthographic": {
+        "xmag": 1.0,
+        "ymag": 1.0,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "yfov": 0.7,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "perspective",
+      "perspective": {
+        "aspectRatio": 1.0,
+        "zfar": 100.0,
+        "znear": 0.01
+      }
+    },
+    {
+      "type": "orthographic",
+      "orthographic": {
+        "xmag": 1.0,
+        "ymag": 1.0,
+        "znear": 0.01
+      }
+    }
+   ],
+   "samplers": [
+    {
+        "magFilter": 9729,
+        "minFilter": 9987,
+        "wrapS": 33071,
+        "wrapT": 10497
+    },
+    {
+        "magFilter": 9728,
+        "minFilter": 9986,
+        "wrapS": 33071,
+        "wrapT": 33648
+    }
+   ]
+}
\ No newline at end of file
diff --git a/automated-tests/resources/AnimatedCubeStride.gltf b/automated-tests/resources/AnimatedCubeStride.gltf
new file mode 100644
index 0000000..d44ac0c
--- /dev/null
+++ b/automated-tests/resources/AnimatedCubeStride.gltf
@@ -0,0 +1,84 @@
+{
+   "accessors" : [
+      {
+         "bufferView" : 0,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000,
+            1.000001
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC3"
+      }
+   ],
+   "asset" : {
+      "generator" : "VKTS glTF 2.0 exporter",
+      "version" : "2.0"
+   },
+   "bufferViews" : [
+      {
+         "buffer" : 0,
+         "byteLength" : 864,
+         "byteOffset" : 132,
+         "target" : 34962,
+         "byteStride": 24
+      }
+   ],
+   "buffers" : [
+      {
+         "byteLength" : 1860,
+         "uri" : "AnimatedCube.bin"
+      }
+   ],
+   "materials" : [
+      {
+         "name" : "AnimatedCube",
+         "pbrMetallicRoughness" : {
+         }
+      },
+      {
+         "name" : "AnimatedCube2",
+         "pbrMetallicRoughness" : {
+         }
+      }
+   ],
+   "meshes" : [
+      {
+         "name" : "AnimatedCube",
+         "primitives" : [
+            {
+               "attributes" : {
+                  "POSITION" : 0
+               }
+            }
+         ]
+      }
+   ],
+   "nodes" : [
+      {
+         "mesh" : 0,
+         "name" : "AnimatedCube",
+         "rotation" : [
+            0.000000,
+            -1.000000,
+            0.000000,
+            0.000000
+         ]
+      }
+   ],
+   "scene" : 0,
+   "scenes" : [
+      {
+         "nodes" : [
+            0
+         ]
+      }
+   ]
+}
\ No newline at end of file
diff --git a/automated-tests/resources/AnimatedMorphCubeAnimateNonZeroFrame.gltf b/automated-tests/resources/AnimatedMorphCubeAnimateNonZeroFrame.gltf
new file mode 100644
index 0000000..48a9d20
--- /dev/null
+++ b/automated-tests/resources/AnimatedMorphCubeAnimateNonZeroFrame.gltf
@@ -0,0 +1,288 @@
+{
+  "accessors": [
+    {
+      "bufferView": 0,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3"
+    },
+    {
+      "bufferView": 1,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC4"
+    },
+    {
+      "bufferView": 2,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "max": [
+        0.0100000035,
+        0.0100000035,
+        0.01
+      ],
+      "min": [
+        -0.0100000044,
+        -0.0100000054,
+        -0.01
+      ]
+    },
+    {
+      "bufferView": 3,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "thin"
+    },
+    {
+      "bufferView": 4,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "max": [
+        0.0,
+        0.01893253,
+        0.0
+      ],
+      "min": [
+        0.0,
+        0.0,
+        0.0
+      ],
+      "name": "thin"
+    },
+    {
+      "bufferView": 5,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "thin"
+    },
+    {
+      "bufferView": 6,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "angle"
+    },
+    {
+      "bufferView": 7,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "max": [
+        0.0,
+        0.0198908355,
+        0.0
+      ],
+      "min": [
+        0.0,
+        0.0,
+        0.0
+      ],
+      "name": "angle"
+    },
+    {
+      "bufferView": 8,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "angle"
+    },
+    {
+      "bufferView": 9,
+      "componentType": 5123,
+      "count": 36,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 10,
+      "componentType": 5126,
+      "count": 127,
+      "type": "SCALAR",
+      "max": [
+        4.19999743
+      ],
+      "min": [
+        0.03
+      ]
+    },
+    {
+      "bufferView": 11,
+      "componentType": 5126,
+      "count": 254,
+      "type": "SCALAR"
+    }
+  ],
+  "animations": [
+    {
+      "channels": [
+        {
+          "sampler": 0,
+          "target": {
+            "node": 0,
+            "path": "weights"
+          }
+        }
+      ],
+      "samplers": [
+        {
+          "input": 10,
+          "interpolation": "LINEAR",
+          "output": 11
+        }
+      ],
+      "name": "Square"
+    }
+  ],
+  "asset": {
+    "generator": "glTF Tools for Unity",
+    "version": "2.0"
+  },
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 288,
+      "byteLength": 384
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 672,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 960,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1248,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1536,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1824,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2112,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2400,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2688,
+      "byteLength": 72
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2760,
+      "byteLength": 508
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 3268,
+      "byteLength": 1016
+    }
+  ],
+  "buffers": [
+    {
+      "uri": "AnimatedMorphCube.bin",
+      "byteLength": 4284
+    }
+  ],
+  "meshes": [
+    {
+      "extras": {
+        "targetNames": [
+          "Target_0",
+          "Target_1"
+        ]
+      },
+      "primitives": [
+        {
+          "attributes": {
+            "NORMAL": 0,
+            "TANGENT": 1,
+            "POSITION": 2
+          },
+          "indices": 9,
+          "material": 0,
+          "targets": [
+            {
+              "NORMAL": 3,
+              "POSITION": 4,
+              "TANGENT": 5
+            },
+            {
+              "NORMAL": 6,
+              "POSITION": 7,
+              "TANGENT": 8
+            }
+          ]
+        }
+      ],
+      "weights": [
+        0.0,
+        0.0
+      ],
+      "name": "Cube"
+    }
+  ],
+  "materials": [
+    {
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          0.6038274,
+          0.6038274,
+          0.6038274,
+          1.0
+        ],
+        "metallicFactor": 0.0,
+        "roughnessFactor": 0.5
+      },
+      "name": "Material"
+    }
+  ],
+  "nodes": [
+    {
+      "mesh": 0,
+      "rotation": [
+        0.0,
+        0.7071067,
+        -0.7071068,
+        0.0
+      ],
+      "scale": [
+        100.0,
+        100.0,
+        100.0
+      ],
+      "name": "AnimatedMorphCube"
+    }
+  ],
+  "scene": 0,
+  "scenes": [
+    {
+      "nodes": [
+        0
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/automated-tests/resources/AnimatedMorphCubeQuantized.bin b/automated-tests/resources/AnimatedMorphCubeQuantized.bin
new file mode 100644
index 0000000..7520d98
Binary files /dev/null and b/automated-tests/resources/AnimatedMorphCubeQuantized.bin differ
diff --git a/automated-tests/resources/AnimatedMorphCubeQuantized.gltf b/automated-tests/resources/AnimatedMorphCubeQuantized.gltf
new file mode 100644
index 0000000..9d6d364
--- /dev/null
+++ b/automated-tests/resources/AnimatedMorphCubeQuantized.gltf
@@ -0,0 +1,259 @@
+{
+  "buffers":[
+    {
+      "uri":"AnimatedMorphCubeQuantized.bin",
+      "byteLength":1700
+    }
+  ],
+  "asset":{
+    "version":"2.0",
+    "generator":"gltfpack 0.13"
+  },
+  "extensionsUsed":[
+    "KHR_mesh_quantization"
+  ],
+  "extensionsRequired":[
+    "KHR_mesh_quantization"
+  ],
+  "bufferViews":[
+    {
+      "buffer":0,
+      "byteOffset":0,
+      "byteLength":288,
+      "byteStride":4,
+      "target":34962
+    },
+    {
+      "buffer":0,
+      "byteOffset":288,
+      "byteLength":576,
+      "byteStride":8,
+      "target":34962
+    },
+    {
+      "buffer":0,
+      "byteOffset":864,
+      "byteLength":72,
+      "target":34963
+    },
+    {
+      "buffer":0,
+      "byteOffset":936,
+      "byteLength":508
+    },
+    {
+      "buffer":0,
+      "byteOffset":1444,
+      "byteLength":254
+    }
+  ],
+  "accessors":[
+    {
+      "bufferView":0,
+      "byteOffset":0,
+      "componentType":5120,
+      "count":24,
+      "type":"VEC3",
+      "normalized":true
+    },
+    {
+      "bufferView":1,
+      "byteOffset":0,
+      "componentType":5123,
+      "count":24,
+      "type":"VEC3",
+      "min":[
+        0,
+        5451,
+        0
+      ],
+      "max":[
+        5481,
+        10932,
+        5481
+      ]
+    },
+    {
+      "bufferView":0,
+      "byteOffset":96,
+      "componentType":5120,
+      "count":24,
+      "type":"VEC3",
+      "normalized":true
+    },
+    {
+      "bufferView":1,
+      "byteOffset":192,
+      "componentType":5122,
+      "count":24,
+      "type":"VEC3",
+      "min":[
+        0,
+        0,
+        0
+      ],
+      "max":[
+        0,
+        5188,
+        0
+      ]
+    },
+    {
+      "bufferView":0,
+      "byteOffset":192,
+      "componentType":5120,
+      "count":24,
+      "type":"VEC3",
+      "normalized":true
+    },
+    {
+      "bufferView":1,
+      "byteOffset":384,
+      "componentType":5122,
+      "count":24,
+      "type":"VEC3",
+      "min":[
+        0,
+        0,
+        0
+      ],
+      "max":[
+        0,
+        5451,
+        0
+      ]
+    },
+    {
+      "bufferView":2,
+      "byteOffset":0,
+      "componentType":5123,
+      "count":36,
+      "type":"SCALAR"
+    },
+    {
+      "bufferView":3,
+      "byteOffset":0,
+      "componentType":5126,
+      "count":127,
+      "type":"SCALAR",
+      "min":[
+        0
+      ],
+      "max":[
+        4.19999981
+      ]
+    },
+    {
+      "bufferView":4,
+      "byteOffset":0,
+      "componentType":5121,
+      "count":254,
+      "type":"SCALAR",
+      "normalized":true
+    }
+  ],
+  "materials":[
+    {
+      "name":"Material",
+      "pbrMetallicRoughness":{
+        "baseColorFactor":[
+          0.603827417,
+          0.603827417,
+          0.603827417,
+          1
+        ],
+        "metallicFactor":0,
+        "roughnessFactor":0.5
+      }
+    }
+  ],
+  "meshes":[
+    {
+      "primitives":[
+        {
+          "attributes":{
+            "NORMAL":0,
+            "POSITION":1
+          },
+          "mode":4,
+          "targets":[
+            {
+              "NORMAL":2,
+              "POSITION":3
+            },
+            {
+              "NORMAL":4,
+              "POSITION":5
+            }
+          ],
+          "indices":6,
+          "material":0
+        }
+      ],
+      "weights":[
+        0,
+        0
+      ]
+    }
+  ],
+  "animations":[
+    {
+      "name":"Square",
+      "samplers":[
+        {
+          "input":7,
+          "output":8
+        }
+      ],
+      "channels":[
+        {
+          "sampler":0,
+          "target":{
+            "node":0,
+            "path":"weights"
+          }
+        }
+      ]
+    }
+  ],
+  "nodes":[
+    {
+      "mesh":0,
+      "translation":[
+        -0.0100000044,
+        -0.0298908409,
+        -0.00999999978
+      ],
+      "scale":[
+        3.64900689e-06,
+        3.64900689e-06,
+        3.64900689e-06
+      ]
+    },
+    {
+      "name":"AnimatedMorphCube",
+      "rotation":[
+        0,
+        0.707106709,
+        -0.707106829,
+        0
+      ],
+      "scale":[
+        100,
+        100,
+        100
+      ],
+      "children":[
+        0
+      ]
+    }
+  ],
+  "scenes":[
+    {
+      "nodes":[
+        1
+      ]
+    }
+  ],
+  "scene":0
+}
diff --git a/automated-tests/resources/AvocadoQuantized.bin b/automated-tests/resources/AvocadoQuantized.bin
new file mode 100644
index 0000000..7cdbdf0
Binary files /dev/null and b/automated-tests/resources/AvocadoQuantized.bin differ
diff --git a/automated-tests/resources/AvocadoQuantized.gltf b/automated-tests/resources/AvocadoQuantized.gltf
new file mode 100644
index 0000000..2be992f
--- /dev/null
+++ b/automated-tests/resources/AvocadoQuantized.gltf
@@ -0,0 +1,221 @@
+{
+  "buffers":[
+    {
+      "uri":"AvocadoQuantized.bin",
+      "byteLength":12212
+    }
+  ],
+  "asset":{
+    "version":"2.0",
+    "generator":"gltfpack 0.13"
+  },
+  "extensionsUsed":[
+    "KHR_mesh_quantization",
+    "KHR_texture_transform"
+  ],
+  "extensionsRequired":[
+    "KHR_mesh_quantization"
+  ],
+  "bufferViews":[
+    {
+      "buffer":0,
+      "byteOffset":0,
+      "byteLength":1624,
+      "byteStride":4,
+      "target":34962
+    },
+    {
+      "buffer":0,
+      "byteOffset":1624,
+      "byteLength":1624,
+      "byteStride":4,
+      "target":34962
+    },
+    {
+      "buffer":0,
+      "byteOffset":3248,
+      "byteLength":1624,
+      "byteStride":4,
+      "target":34962
+    },
+    {
+      "buffer":0,
+      "byteOffset":4872,
+      "byteLength":3248,
+      "byteStride":8,
+      "target":34962
+    },
+    {
+      "buffer":0,
+      "byteOffset":8120,
+      "byteLength":4092,
+      "target":34963
+    }
+  ],
+  "accessors":[
+    {
+      "bufferView":0,
+      "byteOffset":0,
+      "componentType":5123,
+      "count":406,
+      "type":"VEC2"
+    },
+    {
+      "bufferView":1,
+      "byteOffset":0,
+      "componentType":5120,
+      "count":406,
+      "type":"VEC3",
+      "normalized":true
+    },
+    {
+      "bufferView":2,
+      "byteOffset":0,
+      "componentType":5120,
+      "count":406,
+      "type":"VEC4",
+      "normalized":true
+    },
+    {
+      "bufferView":3,
+      "byteOffset":0,
+      "componentType":5123,
+      "count":406,
+      "type":"VEC3",
+      "min":[
+        0,
+        0,
+        0
+      ],
+      "max":[
+        11086,
+        16383,
+        7194
+      ]
+    },
+    {
+      "bufferView":4,
+      "byteOffset":0,
+      "componentType":5123,
+      "count":2046,
+      "type":"SCALAR"
+    }
+  ],
+  "images":[
+    {
+      "uri":"Avocado_baseColor.png"
+    },
+    {
+      "uri":"Avocado_roughnessMetallic.png"
+    },
+    {
+      "uri":"Avocado_normal.png"
+    }
+  ],
+  "textures":[
+    {
+      "source":0
+    },
+    {
+      "source":1
+    },
+    {
+      "source":2
+    }
+  ],
+  "materials":[
+    {
+      "name":"2256_Avocado_d",
+      "pbrMetallicRoughness":{
+        "baseColorTexture":{
+          "index":0,
+          "texCoord":0,
+          "extensions":{
+            "KHR_texture_transform":{
+              "offset":[
+                0.00678020436,
+                0.00298196077
+              ],
+              "scale":[
+                0.000238270484,
+                0.000242341906
+              ]
+            }
+          }
+        },
+        "metallicRoughnessTexture":{
+          "index":1,
+          "texCoord":0,
+          "extensions":{
+            "KHR_texture_transform":{
+              "offset":[
+                0.00678020436,
+                0.00298196077
+              ],
+              "scale":[
+                0.000238270484,
+                0.000242341906
+              ]
+            }
+          }
+        }
+      },
+      "normalTexture":{
+        "index":2,
+        "texCoord":0,
+        "extensions":{
+          "KHR_texture_transform":{
+            "offset":[
+              0.00678020436,
+              0.00298196077
+            ],
+            "scale":[
+              0.000238270484,
+              0.000242341906
+            ]
+          }
+        }
+      }
+    }
+  ],
+  "meshes":[
+    {
+      "primitives":[
+        {
+          "attributes":{
+            "TEXCOORD_0":0,
+            "NORMAL":1,
+            "TANGENT":2,
+            "POSITION":3
+          },
+          "mode":4,
+          "indices":4,
+          "material":0
+        }
+      ]
+    }
+  ],
+  "nodes":[
+    {
+      "mesh":0,
+      "translation":[
+        -0.0212809108,
+        -4.77385511e-05,
+        -0.0138090011
+      ],
+      "scale":[
+        3.839089e-06,
+        3.839089e-06,
+        3.839089e-06
+      ]
+    }
+  ],
+  "scenes":[
+    {
+      "nodes":[
+        0
+      ]
+    }
+  ],
+  "scene":0
+}
diff --git a/automated-tests/resources/Avocado_baseColor.png b/automated-tests/resources/Avocado_baseColor.png
new file mode 100644
index 0000000..38630ed
Binary files /dev/null and b/automated-tests/resources/Avocado_baseColor.png differ
diff --git a/automated-tests/resources/Avocado_normal.png b/automated-tests/resources/Avocado_normal.png
new file mode 100644
index 0000000..73f90d5
Binary files /dev/null and b/automated-tests/resources/Avocado_normal.png differ
diff --git a/automated-tests/resources/Avocado_roughnessMetallic.png b/automated-tests/resources/Avocado_roughnessMetallic.png
new file mode 100644
index 0000000..97c7f73
Binary files /dev/null and b/automated-tests/resources/Avocado_roughnessMetallic.png differ
diff --git a/automated-tests/resources/BoxAnimated.glb b/automated-tests/resources/BoxAnimated.glb
new file mode 100644
index 0000000..69481ec
Binary files /dev/null and b/automated-tests/resources/BoxAnimated.glb differ
diff --git a/automated-tests/resources/BoxAnimated.gltf b/automated-tests/resources/BoxAnimated.gltf
index afa7afb..82e9702 100644
--- a/automated-tests/resources/BoxAnimated.gltf
+++ b/automated-tests/resources/BoxAnimated.gltf
@@ -14,6 +14,7 @@
     ],
     "nodes": [
         {
+            "name" : "node0",
             "children": [
                 1
             ],
@@ -25,11 +26,13 @@
             ]
         },
         {
+            "name" : "node1",
             "children": [
                 2
             ]
         },
         {
+            "name" : "node2",
             "mesh": 0,
             "rotation": [
                 -0.0,
@@ -39,6 +42,7 @@
             ]
         },
         {
+            "name" : "node3",
             "mesh": 1
         }
     ],
diff --git a/automated-tests/resources/CesiumMan_e.gltf b/automated-tests/resources/CesiumMan_e.gltf
new file mode 100644
index 0000000..0515126
--- /dev/null
+++ b/automated-tests/resources/CesiumMan_e.gltf
@@ -0,0 +1,2640 @@
+{
+    "asset": {
+        "generator": "COLLADA2GLTF",
+        "version": "2.0"
+    },
+    "scenes": [
+        {
+            "nodes": [
+                0
+            ]
+        }
+    ],
+    "scene": 0,
+    "nodes": [
+        {
+            "children": [
+                1
+            ],
+            "matrix": [
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                -1.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0
+            ],
+            "name": "Z_UP"
+        },
+        {
+            "children": [
+                3,
+                2
+            ],
+            "matrix": [
+                -4.371139894487897e-8,
+                -1.0,
+                0.0,
+                0.0,
+                1.0,
+                -4.371139894487897e-8,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0
+            ],
+            "name": "Armature"
+        },
+        {
+            "mesh": 0,
+            "skin": 0,
+            "name": "Cesium_Man"
+        },
+        {
+            "children": [
+                12,
+                8,
+                4
+            ],
+            "translation": [
+                1.57554005397742e-8,
+                0.004999836906790733,
+                0.6789999008178711
+            ],
+            "rotation": [
+                -0.0,
+                -0.0378035344183445,
+                -0.0,
+                -0.9992852210998536
+            ],
+            "name": "Skeleton_torso_joint_1"
+        },
+        {
+            "children": [
+                5
+            ],
+            "translation": [
+                0.02855719067156315,
+                -0.06803914159536362,
+                -0.06295864284038544
+            ],
+            "rotation": [
+                -0.0,
+                -0.6898291707038879,
+                -0.0,
+                -0.7239722013473511
+            ],
+            "name": "leg_joint_R_1"
+        },
+        {
+            "children": [
+                6
+            ],
+            "translation": [
+                0.26089081168174746,
+                -0.009026050567626952,
+                0.05167089030146599
+            ],
+            "rotation": [
+                -0.0,
+                -0.0941137745976448,
+                -0.0,
+                -0.9955614805221558
+            ],
+            "scale": [
+                1.0000001192092896,
+                1.0,
+                1.0000001192092896
+            ],
+            "name": "leg_joint_R_2"
+        },
+        {
+            "children": [
+                7
+            ],
+            "translation": [
+                0.27546030282974245,
+                -0.0014317259192466736,
+                -0.014104830101132392
+            ],
+            "rotation": [
+                0.0,
+                0.8666408061981201,
+                0.0,
+                0.4989325702190399
+            ],
+            "name": "leg_joint_R_3"
+        },
+        {
+            "translation": [
+                -0.06681963056325913,
+                -0.001072264974936843,
+                0.026351310312747957
+            ],
+            "rotation": [
+                -0.0,
+                0.3269147574901581,
+                -0.0,
+                -0.9450538158416748
+            ],
+            "name": "leg_joint_R_5"
+        },
+        {
+            "children": [
+                9
+            ],
+            "translation": [
+                0.028519999235868459,
+                0.06803944706916809,
+                -0.06295935809612274
+            ],
+            "rotation": [
+                -0.0,
+                -0.32463353872299197,
+                -0.0,
+                -0.9458398818969728
+            ],
+            "name": "leg_joint_L_1"
+        },
+        {
+            "children": [
+                10
+            ],
+            "translation": [
+                0.20916390419006349,
+                0.009055502712726592,
+                -0.16426950693130494
+            ],
+            "rotation": [
+                -0.0,
+                -0.5294369459152222,
+                -0.0,
+                -0.8483493328094482
+            ],
+            "scale": [
+                1.0000001192092896,
+                1.0,
+                1.0000001192092896
+            ],
+            "name": "leg_joint_L_2"
+        },
+        {
+            "children": [
+                11
+            ],
+            "translation": [
+                0.27579009532928469,
+                0.0013972519664093853,
+                0.004122479818761349
+            ],
+            "rotation": [
+                -0.0,
+                -0.8377647399902344,
+                -0.0,
+                -0.5460314750671387
+            ],
+            "scale": [
+                1.0,
+                0.9999999403953552,
+                1.0
+            ],
+            "name": "leg_joint_L_3"
+        },
+        {
+            "translation": [
+                -0.06558381021022797,
+                0.001090653007850051,
+                0.02929146029055119
+            ],
+            "rotation": [
+                -0.0,
+                0.3130458891391754,
+                -0.0,
+                -0.9497380256652832
+            ],
+            "name": "leg_joint_L_5"
+        },
+        {
+            "children": [
+                13
+            ],
+            "translation": [
+                0.0000133617004394182,
+                -0.000013373800356930588,
+                0.14541690051555634
+            ],
+            "rotation": [
+                -0.0,
+                -0.6573964357376099,
+                -0.0,
+                -0.7535448670387268
+            ],
+            "name": "Skeleton_torso_joint_2"
+        },
+        {
+            "children": [
+                20,
+                17,
+                14
+            ],
+            "translation": [
+                -0.2505168914794922,
+                6.072219775887788e-7,
+                -0.00007290810026461259
+            ],
+            "rotation": [
+                -0.0,
+                0.6227028965950012,
+                -0.0,
+                -0.7824583649635315
+            ],
+            "name": "torso_joint_3"
+        },
+        {
+            "children": [
+                15
+            ],
+            "translation": [
+                -0.00003830249988823198,
+                -0.09098774939775468,
+                -0.000062032304413151
+            ],
+            "rotation": [
+                0.0,
+                0.9909319281578064,
+                0.0,
+                -0.13436488807201386
+            ],
+            "name": "Skeleton_arm_joint_R"
+        },
+        {
+            "children": [
+                16
+            ],
+            "translation": [
+                -0.03554634004831314,
+                -0.2154989987611771,
+                0.10423289984464646
+            ],
+            "rotation": [
+                0.0,
+                0.8961479663848877,
+                0.0,
+                0.4437553286552429
+            ],
+            "scale": [
+                0.9999999403953552,
+                1.0,
+                0.9999999403953552
+            ],
+            "name": "Skeleton_arm_joint_R__2_"
+        },
+        {
+            "translation": [
+                0.03137021884322167,
+                -0.1430010050535202,
+                -0.11761169880628586
+            ],
+            "rotation": [
+                -0.0,
+                0.3792171180248261,
+                -0.0,
+                -0.9253078103065492
+            ],
+            "scale": [
+                1.0000001192092896,
+                1.0,
+                1.0000001192092896
+            ],
+            "name": "Skeleton_arm_joint_R__3_"
+        },
+        {
+            "children": [
+                18
+            ],
+            "translation": [
+                -0.00003837469921563752,
+                0.091013602912426,
+                -0.00006143339851405472
+            ],
+            "rotation": [
+                0.0,
+                0.9959768652915956,
+                0.0,
+                0.08961082249879837
+            ],
+            "name": "Skeleton_arm_joint_L__4_"
+        },
+        {
+            "children": [
+                19
+            ],
+            "translation": [
+                0.01322161965072155,
+                0.21549950540065769,
+                0.10933209955692293
+            ],
+            "rotation": [
+                -0.0,
+                -0.0711694285273552,
+                -0.0,
+                -0.9974642395973206
+            ],
+            "name": "Skeleton_arm_joint_L__3_"
+        },
+        {
+            "translation": [
+                -0.09332461655139925,
+                0.1430000960826874,
+                0.07814791053533554
+            ],
+            "rotation": [
+                -0.0,
+                -0.02254222705960274,
+                -0.0,
+                -0.9997459053993224
+            ],
+            "name": "Skeleton_arm_joint_L__2_"
+        },
+        {
+            "children": [
+                21
+            ],
+            "translation": [
+                -0.000002366030003031483,
+                0.000002413989932392724,
+                0.06483621150255203
+            ],
+            "rotation": [
+                -0.0,
+                -0.660634458065033,
+                -0.0,
+                -0.750707745552063
+            ],
+            "name": "Skeleton_neck_joint_1"
+        },
+        {
+            "translation": [
+                -0.05204017087817192,
+                -3.3993298842460727e-8,
+                -0.0000026607899599184749
+            ],
+            "rotation": [
+                0.0,
+                0.9996904730796814,
+                0.0,
+                0.024879230186343194
+            ],
+            "scale": [
+                1.0000001192092896,
+                1.0,
+                1.0000001192092896
+            ],
+            "name": "Skeleton_neck_joint_2"
+        }
+    ],
+    "meshes": [
+        {
+            "primitives": [
+                {
+                    "attributes": {
+                        "JOINTS_0": 1,
+                        "NORMAL": 2,
+                        "POSITION": 3,
+                        "TEXCOORD_0": 4,
+                        "WEIGHTS_0": 5
+                    },
+                    "indices": 0,
+                    "mode": 4,
+                    "material": 0
+                }
+            ],
+            "name": "Cesium_Man"
+        }
+    ],
+    "animations": [
+        {
+            "channels": [
+                {
+                    "sampler": 0,
+                    "target": {
+                        "node": 3,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 1,
+                    "target": {
+                        "node": 3,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 2,
+                    "target": {
+                        "node": 3,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 3,
+                    "target": {
+                        "node": 12,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 4,
+                    "target": {
+                        "node": 12,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 5,
+                    "target": {
+                        "node": 12,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 6,
+                    "target": {
+                        "node": 13,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 7,
+                    "target": {
+                        "node": 13,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 8,
+                    "target": {
+                        "node": 13,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 9,
+                    "target": {
+                        "node": 20,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 10,
+                    "target": {
+                        "node": 20,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 11,
+                    "target": {
+                        "node": 20,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 12,
+                    "target": {
+                        "node": 21,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 13,
+                    "target": {
+                        "node": 21,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 14,
+                    "target": {
+                        "node": 21,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 15,
+                    "target": {
+                        "node": 17,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 16,
+                    "target": {
+                        "node": 17,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 17,
+                    "target": {
+                        "node": 17,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 18,
+                    "target": {
+                        "node": 18,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 19,
+                    "target": {
+                        "node": 18,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 20,
+                    "target": {
+                        "node": 18,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 21,
+                    "target": {
+                        "node": 19,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 22,
+                    "target": {
+                        "node": 19,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 23,
+                    "target": {
+                        "node": 19,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 24,
+                    "target": {
+                        "node": 14,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 25,
+                    "target": {
+                        "node": 14,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 26,
+                    "target": {
+                        "node": 14,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 27,
+                    "target": {
+                        "node": 15,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 28,
+                    "target": {
+                        "node": 15,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 29,
+                    "target": {
+                        "node": 15,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 30,
+                    "target": {
+                        "node": 16,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 31,
+                    "target": {
+                        "node": 16,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 32,
+                    "target": {
+                        "node": 16,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 33,
+                    "target": {
+                        "node": 8,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 34,
+                    "target": {
+                        "node": 8,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 35,
+                    "target": {
+                        "node": 8,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 36,
+                    "target": {
+                        "node": 9,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 37,
+                    "target": {
+                        "node": 9,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 38,
+                    "target": {
+                        "node": 9,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 39,
+                    "target": {
+                        "node": 10,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 40,
+                    "target": {
+                        "node": 10,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 41,
+                    "target": {
+                        "node": 10,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 42,
+                    "target": {
+                        "node": 11,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 43,
+                    "target": {
+                        "node": 11,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 44,
+                    "target": {
+                        "node": 11,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 45,
+                    "target": {
+                        "node": 4,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 46,
+                    "target": {
+                        "node": 4,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 47,
+                    "target": {
+                        "node": 4,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 48,
+                    "target": {
+                        "node": 5,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 49,
+                    "target": {
+                        "node": 5,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 50,
+                    "target": {
+                        "node": 5,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 51,
+                    "target": {
+                        "node": 6,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 52,
+                    "target": {
+                        "node": 6,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 53,
+                    "target": {
+                        "node": 6,
+                        "path": "scale"
+                    }
+                },
+                {
+                    "sampler": 54,
+                    "target": {
+                        "node": 7,
+                        "path": "translation"
+                    }
+                },
+                {
+                    "sampler": 55,
+                    "target": {
+                        "node": 7,
+                        "path": "rotation"
+                    }
+                },
+                {
+                    "sampler": 56,
+                    "target": {
+                        "node": 7,
+                        "path": "scale"
+                    }
+                }
+            ],
+            "samplers": [
+                {
+                    "input": 6,
+                    "interpolation": "LINEAR",
+                    "output": 7
+                },
+                {
+                    "input": 6,
+                    "interpolation": "LINEAR",
+                    "output": 8
+                },
+                {
+                    "input": 6,
+                    "interpolation": "LINEAR",
+                    "output": 9
+                },
+                {
+                    "input": 10,
+                    "interpolation": "LINEAR",
+                    "output": 11
+                },
+                {
+                    "input": 10,
+                    "interpolation": "LINEAR",
+                    "output": 12
+                },
+                {
+                    "input": 10,
+                    "interpolation": "LINEAR",
+                    "output": 13
+                },
+                {
+                    "input": 14,
+                    "interpolation": "LINEAR",
+                    "output": 15
+                },
+                {
+                    "input": 14,
+                    "interpolation": "LINEAR",
+                    "output": 16
+                },
+                {
+                    "input": 14,
+                    "interpolation": "LINEAR",
+                    "output": 17
+                },
+                {
+                    "input": 18,
+                    "interpolation": "LINEAR",
+                    "output": 19
+                },
+                {
+                    "input": 18,
+                    "interpolation": "LINEAR",
+                    "output": 20
+                },
+                {
+                    "input": 18,
+                    "interpolation": "LINEAR",
+                    "output": 21
+                },
+                {
+                    "input": 22,
+                    "interpolation": "LINEAR",
+                    "output": 23
+                },
+                {
+                    "input": 22,
+                    "interpolation": "LINEAR",
+                    "output": 24
+                },
+                {
+                    "input": 22,
+                    "interpolation": "LINEAR",
+                    "output": 25
+                },
+                {
+                    "input": 26,
+                    "interpolation": "LINEAR",
+                    "output": 27
+                },
+                {
+                    "input": 26,
+                    "interpolation": "LINEAR",
+                    "output": 28
+                },
+                {
+                    "input": 26,
+                    "interpolation": "LINEAR",
+                    "output": 29
+                },
+                {
+                    "input": 30,
+                    "interpolation": "LINEAR",
+                    "output": 31
+                },
+                {
+                    "input": 30,
+                    "interpolation": "LINEAR",
+                    "output": 32
+                },
+                {
+                    "input": 30,
+                    "interpolation": "LINEAR",
+                    "output": 33
+                },
+                {
+                    "input": 34,
+                    "interpolation": "LINEAR",
+                    "output": 35
+                },
+                {
+                    "input": 34,
+                    "interpolation": "LINEAR",
+                    "output": 36
+                },
+                {
+                    "input": 34,
+                    "interpolation": "LINEAR",
+                    "output": 37
+                },
+                {
+                    "input": 38,
+                    "interpolation": "LINEAR",
+                    "output": 39
+                },
+                {
+                    "input": 38,
+                    "interpolation": "LINEAR",
+                    "output": 40
+                },
+                {
+                    "input": 38,
+                    "interpolation": "LINEAR",
+                    "output": 41
+                },
+                {
+                    "input": 42,
+                    "interpolation": "LINEAR",
+                    "output": 43
+                },
+                {
+                    "input": 42,
+                    "interpolation": "LINEAR",
+                    "output": 44
+                },
+                {
+                    "input": 42,
+                    "interpolation": "LINEAR",
+                    "output": 45
+                },
+                {
+                    "input": 46,
+                    "interpolation": "LINEAR",
+                    "output": 47
+                },
+                {
+                    "input": 46,
+                    "interpolation": "LINEAR",
+                    "output": 48
+                },
+                {
+                    "input": 46,
+                    "interpolation": "LINEAR",
+                    "output": 49
+                },
+                {
+                    "input": 50,
+                    "interpolation": "LINEAR",
+                    "output": 51
+                },
+                {
+                    "input": 50,
+                    "interpolation": "LINEAR",
+                    "output": 52
+                },
+                {
+                    "input": 50,
+                    "interpolation": "LINEAR",
+                    "output": 53
+                },
+                {
+                    "input": 54,
+                    "interpolation": "LINEAR",
+                    "output": 55
+                },
+                {
+                    "input": 54,
+                    "interpolation": "LINEAR",
+                    "output": 56
+                },
+                {
+                    "input": 54,
+                    "interpolation": "LINEAR",
+                    "output": 57
+                },
+                {
+                    "input": 58,
+                    "interpolation": "LINEAR",
+                    "output": 59
+                },
+                {
+                    "input": 58,
+                    "interpolation": "LINEAR",
+                    "output": 60
+                },
+                {
+                    "input": 58,
+                    "interpolation": "LINEAR",
+                    "output": 61
+                },
+                {
+                    "input": 62,
+                    "interpolation": "LINEAR",
+                    "output": 63
+                },
+                {
+                    "input": 62,
+                    "interpolation": "LINEAR",
+                    "output": 64
+                },
+                {
+                    "input": 62,
+                    "interpolation": "LINEAR",
+                    "output": 65
+                },
+                {
+                    "input": 66,
+                    "interpolation": "LINEAR",
+                    "output": 67
+                },
+                {
+                    "input": 66,
+                    "interpolation": "LINEAR",
+                    "output": 68
+                },
+                {
+                    "input": 66,
+                    "interpolation": "LINEAR",
+                    "output": 69
+                },
+                {
+                    "input": 70,
+                    "interpolation": "LINEAR",
+                    "output": 71
+                },
+                {
+                    "input": 70,
+                    "interpolation": "LINEAR",
+                    "output": 72
+                },
+                {
+                    "input": 70,
+                    "interpolation": "LINEAR",
+                    "output": 73
+                },
+                {
+                    "input": 74,
+                    "interpolation": "LINEAR",
+                    "output": 75
+                },
+                {
+                    "input": 74,
+                    "interpolation": "LINEAR",
+                    "output": 76
+                },
+                {
+                    "input": 74,
+                    "interpolation": "LINEAR",
+                    "output": 77
+                },
+                {
+                    "input": 78,
+                    "interpolation": "LINEAR",
+                    "output": 79
+                },
+                {
+                    "input": 78,
+                    "interpolation": "LINEAR",
+                    "output": 80
+                },
+                {
+                    "input": 78,
+                    "interpolation": "LINEAR",
+                    "output": 81
+                }
+            ]
+        }
+    ],
+    "skins": [
+        {
+            "inverseBindMatrices": 82,
+            "skeleton": 3,
+            "joints": [
+                3,
+                12,
+                13,
+                20,
+                21,
+                17,
+                14,
+                18,
+                15,
+                19,
+                16,
+                8,
+                4,
+                9,
+                5,
+                10,
+                6,
+                11,
+                7
+            ],
+            "name": "Armature"
+        }
+    ],
+    "accessors": [
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5123,
+            "count": 14016,
+            "max": [
+                3272
+            ],
+            "min": [
+                0
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 0,
+            "componentType": 5123,
+            "count": 3273,
+            "max": [
+                18,
+                18,
+                18,
+                18
+            ],
+            "min": [
+                0,
+                0,
+                0,
+                0
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 2,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 3273,
+            "max": [
+                1.0,
+                0.9999808073043824,
+                0.9944415092468262
+            ],
+            "min": [
+                -1.0,
+                -0.9999808073043824,
+                -1.0
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 2,
+            "byteOffset": 39276,
+            "componentType": 5126,
+            "count": 3273,
+            "max": [
+                0.1809539943933487,
+                0.569136917591095,
+                1.5065499544143677
+            ],
+            "min": [
+                -0.13100001215934754,
+                -0.5691370964050293,
+                0.0
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 26184,
+            "componentType": 5126,
+            "count": 3273,
+            "max": [
+                0.990805983543396,
+                0.9880298972129822
+            ],
+            "min": [
+                0.014079390093684197,
+                0.008445978164672852
+            ],
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 3,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 3273,
+            "max": [
+                1.0,
+                0.989919900894165,
+                0.9510763883590698,
+                0.9196179509162904
+            ],
+            "min": [
+                0.010080089792609217,
+                0.0,
+                0.0,
+                0.0
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                3.880559873437051e-8,
+                -0.02000010944902897,
+                0.7110069990158081
+            ],
+            "min": [
+                2.716890046272624e-9,
+                -0.030000129714608194,
+                0.6420990824699402
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.0000519421482749749,
+                -0.02146764844655991,
+                -0.00002414094524283428,
+                -0.9980905055999756
+            ],
+            "min": [
+                -0.012384946458041668,
+                -0.06042621284723282,
+                -0.0041049933061003689,
+                -0.9997026920318604
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 552,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000004768371585,
+                1.0000001192092896,
+                1.000000238418579
+            ],
+            "min": [
+                0.9999999403953552,
+                0.9999998211860656,
+                0.9999997615814208
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 184,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 1104,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.000013520900211005938,
+                0.0009866129839792848,
+                0.1454171985387802
+            ],
+            "min": [
+                0.000013436199878924528,
+                0.0009865909814834597,
+                0.145416796207428
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 736,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.011148878373205662,
+                -0.7106494903564453,
+                0.0006061687599867582,
+                -0.6787928938865662
+            ],
+            "min": [
+                -0.008564536459743977,
+                -0.7339289784431458,
+                -0.025856714695692064,
+                -0.7034341096878052
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 1656,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000004768371585,
+                1.000000238418579,
+                0.9999998211860656
+            ],
+            "min": [
+                0.9999999403953552,
+                0.9999998807907105,
+                0.9999989867210388
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 368,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 2208,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.25051650404930117,
+                5.923209869251878e-7,
+                -0.00007277730037458241
+            ],
+            "min": [
+                -0.25051701068878176,
+                5.58793999516638e-7,
+                -0.00007287789776455611
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 1472,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.13804565370082856,
+                0.6359269618988037,
+                -0.003375347936525941,
+                -0.7641801238059998
+            ],
+            "min": [
+                -0.06163197010755539,
+                0.6227141618728638,
+                -0.0653248131275177,
+                -0.7824262380599976
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 2760,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.000001072883606,
+                1.0000003576278689,
+                1.0
+            ],
+            "min": [
+                1.0000004768371585,
+                0.9999999403953552,
+                0.999999463558197
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 552,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 3312,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.000002384189883741783,
+                0.000002458690005369135,
+                0.06483876705169678
+            ],
+            "min": [
+                -0.000002536919964768458,
+                0.000002384189883741783,
+                0.06483828276395798
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 2208,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.0364987850189209,
+                -0.6327536106109619,
+                0.04193282127380371,
+                -0.749859094619751
+            ],
+            "min": [
+                -0.02380962483584881,
+                -0.6592763066291809,
+                -0.028988203033804898,
+                -0.7734439969062805
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 3864,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0,
+                1.000000238418579,
+                1.0000001192092896
+            ],
+            "min": [
+                0.9999996423721314,
+                0.9999995231628418,
+                0.9999995827674866
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 736,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 4416,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.0520395003259182,
+                7.450579708745408e-9,
+                -0.000002585350102890516
+            ],
+            "min": [
+                -0.05204005911946297,
+                -5.96045985901128e-8,
+                -0.0000026747600259113826
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 2944,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.04680187255144119,
+                0.999507486820221,
+                0.002036086050793529,
+                0.09058715403079988
+            ],
+            "min": [
+                -0.08794279396533966,
+                0.9954165816307068,
+                -0.0021752140019088985,
+                0.0184526015073061
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 4968,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000003576278689,
+                1.000000238418579,
+                1.0000009536743165
+            ],
+            "min": [
+                0.9999998807907105,
+                0.9999996423721314,
+                1.000000238418579
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 920,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 5520,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.00003742050103028305,
+                0.08800023794174195,
+                -0.00005880460230400786
+            ],
+            "min": [
+                -0.000037621699448209259,
+                0.08799994736909867,
+                -0.000059304802562110129
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 3680,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.2908412516117096,
+                0.9301012754440308,
+                -0.2866462171077728,
+                0.3823933303356171
+            ],
+            "min": [
+                -0.13552021980285645,
+                0.8065234422683716,
+                -0.4443180561065674,
+                -0.17752912640571598
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 6072,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000005960464478,
+                1.0000001192092896,
+                1.0000003576278689
+            ],
+            "min": [
+                0.9999999403953552,
+                0.9999996423721314,
+                0.9999998211860656
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 1104,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 6624,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.013221889734268189,
+                0.215499609708786,
+                0.10933230072259905
+            ],
+            "min": [
+                0.01322161965072155,
+                0.2154994010925293,
+                0.10933209955692293
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 4416,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.023567700758576394,
+                0.02101488783955574,
+                0.176296666264534,
+                -0.971515953540802
+            ],
+            "min": [
+                -0.057475991547107699,
+                -0.18002526462078098,
+                -0.15063291788101197,
+                -0.998132348060608
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 7176,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.9999998211860656,
+                0.9999998211860656,
+                0.9999999403953552
+            ],
+            "min": [
+                0.9999991059303284,
+                0.9999993443489076,
+                0.9999994039535524
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 1288,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 7728,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.09332455694675446,
+                0.1430000960826874,
+                0.07814794778823853
+            ],
+            "min": [
+                -0.09332473576068878,
+                0.14299990236759189,
+                0.07814773917198181
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 5152,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.03372078761458397,
+                0.0026474546175450088,
+                0.207317128777504,
+                -0.9705979824066162
+            ],
+            "min": [
+                0.006105833686888218,
+                -0.12215615808963776,
+                0.003784916130825877,
+                -0.9994208216667176
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 8280,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000007152557374,
+                1.0000003576278689,
+                1.0000008344650269
+            ],
+            "min": [
+                1.0000001192092896,
+                0.9999998211860656,
+                1.000000238418579
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 1472,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 8832,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.00003894419933203608,
+                -0.0879998430609703,
+                -0.00005919210161664523
+            ],
+            "min": [
+                -0.0000392795009247493,
+                -0.08800008893013,
+                -0.00005960090129519813
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 5888,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.2242162525653839,
+                0.942186713218689,
+                0.37760788202285769,
+                0.2007839232683182
+            ],
+            "min": [
+                -0.2700891792774201,
+                0.8755274415016174,
+                0.2710656225681305,
+                -0.26554200053215029
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 9384,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.000000238418579,
+                1.0000003576278689,
+                1.0000001192092896
+            ],
+            "min": [
+                0.999999701976776,
+                0.9999997615814208,
+                0.9999997615814208
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 1656,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 9936,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.035546209663152698,
+                -0.21549880504608158,
+                0.10423330217599868
+            ],
+            "min": [
+                -0.03554638102650643,
+                -0.21549910306930546,
+                0.10423299670219422
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 6624,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.00792065542191267,
+                0.9315358996391296,
+                0.0024673622101545336,
+                0.41479358077049258
+            ],
+            "min": [
+                -0.15234939754009248,
+                0.9063802361488342,
+                -0.08167753368616104,
+                0.3280625641345978
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 10488,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000005960464478,
+                1.0000001192092896,
+                1.000000238418579
+            ],
+            "min": [
+                1.0,
+                0.9999996423721314,
+                0.9999996423721314
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 1840,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 11040,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.03137049078941345,
+                -0.1430007964372635,
+                -0.11761150509119034
+            ],
+            "min": [
+                0.03137030825018883,
+                -0.1430010050535202,
+                -0.11761169880628586
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 7360,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.2138674110174179,
+                0.3926030695438385,
+                0.08935829997062683,
+                -0.9178923964500428
+            ],
+            "min": [
+                0.055695075541734698,
+                0.2793585956096649,
+                -0.015314305201172829,
+                -0.9438881278038024
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 11592,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000004768371585,
+                1.0000004768371585,
+                1.0000004768371585
+            ],
+            "min": [
+                0.9999997615814208,
+                0.9999997615814208,
+                0.9999998807907105
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 2024,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 12144,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.028520189225673677,
+                0.06762184202671051,
+                -0.06295985728502274
+            ],
+            "min": [
+                0.028520019724965097,
+                0.06762173771858216,
+                -0.06296010315418244
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 8096,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.013129070401191712,
+                0.10440785437822342,
+                0.004284336231648922,
+                -0.7730374336242676
+            ],
+            "min": [
+                -0.013805897906422617,
+                -0.634152889251709,
+                -0.03212129324674606,
+                -0.9994977116584778
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 12696,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000001192092896,
+                1.0000004768371585,
+                1.000000238418579
+            ],
+            "min": [
+                0.9999995231628418,
+                1.0,
+                0.9999995827674866
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 2208,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 13248,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.209164097905159,
+                0.009055494330823422,
+                -0.16426970064640046
+            ],
+            "min": [
+                0.20916390419006349,
+                0.009055464528501034,
+                -0.1642698049545288
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 8832,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.009955321438610554,
+                -0.2965533435344696,
+                0.003957682754844427,
+                -0.1911347657442093
+            ],
+            "min": [
+                -0.00983923487365246,
+                -0.9813112020492554,
+                -0.02193812094628811,
+                -0.9549583792686462
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 13800,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.000000238418579,
+                0.999999463558197,
+                1.0000001192092896
+            ],
+            "min": [
+                0.999999463558197,
+                0.999998927116394,
+                0.9999993443489076
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 2392,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 14352,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.2757900059223175,
+                0.0013972820015624166,
+                0.004122554790228605
+            ],
+            "min": [
+                0.27578991651535036,
+                0.0013972449814900756,
+                0.004122436046600342
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 9568,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.008959016762673855,
+                -0.8448027968406677,
+                0.03285584971308708,
+                -0.162771075963974
+            ],
+            "min": [
+                -0.045710742473602298,
+                -0.9865565299987792,
+                0.007757793180644512,
+                -0.5345877408981323
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 14904,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000008344650269,
+                1.0000009536743165,
+                1.0000004768371585
+            ],
+            "min": [
+                1.000000238418579,
+                1.0000003576278689,
+                0.9999997615814208
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 2576,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 15456,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.06558377295732498,
+                0.00109061598777771,
+                0.02929138019680977
+            ],
+            "min": [
+                -0.06558384746313095,
+                0.001090570935048163,
+                0.029291240498423578
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 10304,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.022798636928200726,
+                0.5332140922546387,
+                -0.006220220122486353,
+                -0.844382643699646
+            ],
+            "min": [
+                0.007516560610383749,
+                0.22626954317092896,
+                -0.04913739487528801,
+                -0.972984254360199
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 16008,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000008344650269,
+                1.0000003576278689,
+                1.0000003576278689
+            ],
+            "min": [
+                0.9999998211860656,
+                0.999999701976776,
+                0.9999995231628418
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 2760,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 16560,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.028557300567626954,
+                -0.0684543326497078,
+                -0.06295845657587052
+            ],
+            "min": [
+                0.028557060286402704,
+                -0.06845436990261078,
+                -0.0629587471485138
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 11040,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.04037770628929138,
+                -0.2803998589515686,
+                0.02151232957839966,
+                -0.32386553287506106
+            ],
+            "min": [
+                -0.009615562856197358,
+                -0.9458208084106444,
+                -0.006491139996796846,
+                -0.9590301513671876
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 17112,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.000000238418579,
+                1.0000005960464478,
+                1.0000005960464478
+            ],
+            "min": [
+                0.9999994039535524,
+                0.9999999403953552,
+                0.9999998211860656
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 2944,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 17664,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.2608909010887146,
+                -0.00902603566646576,
+                0.05167100951075554
+            ],
+            "min": [
+                0.2608906924724579,
+                -0.009026064537465573,
+                0.05167080089449883
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 11776,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.02468797937035561,
+                0.19154119491577149,
+                0.017835097387433053,
+                -0.6250466108322144
+            ],
+            "min": [
+                -0.013421673327684405,
+                -0.7804162502288818,
+                -0.031287722289562228,
+                -0.9999792575836182
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 18216,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000003576278689,
+                1.0000007152557374,
+                1.000001072883606
+            ],
+            "min": [
+                0.999999463558197,
+                1.0,
+                0.999999701976776
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 3128,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 18768,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.2754603922367096,
+                -0.0014316890155896545,
+                -0.014104750007390976
+            ],
+            "min": [
+                0.27546021342277529,
+                -0.0014317409368231893,
+                -0.014104840345680714
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 12512,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.022092316299676896,
+                0.9990847110748292,
+                0.04779285565018654,
+                0.4428757429122925
+            ],
+            "min": [
+                -0.001671039150096476,
+                0.8965795040130615,
+                0.002310338197275996,
+                0.0384783074259758
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 19320,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.9999999403953552,
+                0.9999996423721314,
+                1.000000238418579
+            ],
+            "min": [
+                0.9999994039535524,
+                0.9999991655349731,
+                0.9999996423721314
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 4,
+            "byteOffset": 3312,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.9166669845581058
+            ],
+            "min": [
+                0.04166661947965622
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 19872,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                -0.06681966781616211,
+                -0.0010721459984779358,
+                0.026351390406489373
+            ],
+            "min": [
+                -0.06681978702545166,
+                -0.001072190934792161,
+                0.02635126002132893
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "byteOffset": 13248,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                0.003402489935979247,
+                0.4966025054454804,
+                0.1101396307349205,
+                -0.8675833940505981
+            ],
+            "min": [
+                -0.027623889967799188,
+                0.26874634623527529,
+                -0.02591408602893353,
+                -0.9565747380256652
+            ],
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 5,
+            "byteOffset": 20424,
+            "componentType": 5126,
+            "count": 46,
+            "max": [
+                1.0000004768371585,
+                0.9999998211860656,
+                0.9999994039535524
+            ],
+            "min": [
+                0.9999995231628418,
+                0.999999225139618,
+                0.9999986886978148
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 7,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 19,
+            "max": [
+                0.9971418380737304,
+                -4.371139894487897e-8,
+                0.9996265172958374,
+                0.0,
+                4.3586464215650276e-8,
+                1.0,
+                4.3695074225524886e-8,
+                0.0,
+                0.9999366402626038,
+                0.0,
+                0.9971418380737304,
+                0.0,
+                1.1374080181121829,
+                0.44450080394744875,
+                1.0739599466323853,
+                1.0
+            ],
+            "min": [
+                -0.9999089241027832,
+                -4.371139894487897e-8,
+                -0.9999366402626038,
+                0.0,
+                -4.3707416352845039e-8,
+                1.0,
+                -4.37086278282095e-8,
+                0.0,
+                -0.9996265172958374,
+                0.0,
+                -0.9999089241027832,
+                0.0,
+                -1.189831018447876,
+                -0.45450031757354739,
+                -1.058603048324585,
+                1.0
+            ],
+            "type": "MAT4"
+        }
+    ],
+    "materials": [
+        {
+            "pbrMetallicRoughness": {
+                "baseColorTexture": {
+                    "index": 0
+                },
+                "metallicFactor": 0.0
+            },
+            "emissiveFactor": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "name": "Cesium_Man-effect"
+        }
+    ],
+    "textures": [
+        {
+            "sampler": 0,
+            "source": 0
+        }
+    ],
+    "images": [
+        {
+            "uri": "data:image/jpeg;base64,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AEdybiBkb3ViQG/gAAAAAAAAAAAAQmwgIGRvdWJAb+AAAAAAAAAAAABCcmRUVW50RiNSbHQAAAAAAAAAAAAAAABCbGQgVW50RiNSbHQAAAAAAAAAAAAAAABSc2x0VW50RiNQeGxAcsAAAAAAAAAAAAp2ZWN0b3JEYXRhYm9vbAEAAAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAOEJJTQPtAAAAAAAQASwAAAABAAEBLAAAAAEAAThCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAAOEJJTQPyAAAAAAAKAAD///////8AADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0nEAAAAAAACgABAAAAAAAAAAI4QklNA/UAAAAAAEgAL2ZmAAEAbGZmAAYAAAAAAAEAL2ZmAAEAoZmaAAYAAAAAAAEAMgAAAAEAWgAAAAYAAAAAAAEANQAAAAEALQAAAAYAAAAAAAE4QklNA/gAAAAAAHAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAOEJJTQQAAAAAAAACAAE4QklNBAIAAAAAAAYAAAAAAAA4QklNBDAAAAAAAAMBAQEAOEJJTQQtAAAAAAAGAAEAAAAHOEJJTQQIAAAAAAAQAAAAAQAAAkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklNBBoAAAAAA0kAAAAGAAAAAAAAAAAAAAQAAAAEAAAAAAoAQwBlAHMAaQB1AG0AXwBNAGEAbgAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAA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IHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgV2luZG93cyIgeG1wOkNyZWF0ZURhdGU9IjIwMTQtMDItMThUMTc6MDI6MTEtMDU6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTAyLTE5VDE1OjE4OjEwLTA1OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTAyLTE5VDE1OjE4OjEwLTA1OjAwIiBkYzpmb3JtYXQ9ImltYWdlL2pwZWciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTcxQzBBRjRBMjk5RTMxMUJCQ0RDNzdBMkI5NjZCNkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NjNDNDA2RDBFMTk4RTMxMUEzRTVENjc4RUNDRDhGQkQiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo2M0M0MDZEMEUxOThFMzExQTNFNUQ2NzhFQ0NEOEZCRCI+IDxwaG90b3Nob3A6RG9jdW1lbnRBbmNlc3RvcnM+IDxyZGY6QmFnPiA8cmRmOmxpPnhtcC5kaWQ6NjFDNDA2RDBFMTk4RTMxMUEzRTVENjc4RUNDRDhGQkQ8L3JkZjpsaT4gPC9yZGY6QmFnPiA8L3Bob3Rvc2hvcDpEb2N1bWVudEFuY2VzdG9ycz4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo2M0M0MDZEMEUxOThFMzExQTNFNUQ2NzhFQ0NEOEZCRCIgc3RFdnQ6d2hlbj0iMjAxNC0wMi0xOFQxNzowMjoxMS0wNTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjb252ZXJ0ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImZyb20gaW1hZ2UvcG5nIHRvIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjY0QzQwNkQwRTE5OEUzMTFBM0U1RDY3OEVDQ0Q4RkJEIiBzdEV2dDp3aGVuPSIyMDE0LTAyLTE4VDE3OjA3OjU0LTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjY1QzQwNkQwRTE5OEUzMTFBM0U1RDY3OEVDQ0Q4RkJEIiBzdEV2dDp3aGVuPSIyMDE0LTAyLTE4VDE3OjA5OjA3LTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjY2QzQwNkQwRTE5OEUzMTFBM0U1RDY3OEVDQ0Q4RkJEIiBzdEV2dDp3aGVuPSIyMDE0LTAyLTE4VDE3OjIwOjA5LTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjY3QzQwNkQwRTE5OEUzMTFBM0U1RDY3OEVDQ0Q4RkJEIiBzdEV2dDp3aGVuPSIyMDE0LTAyLTE4VDE3OjIwOjIzLTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjE2MUMwQUY0QTI5OUUzMTFCQkNEQzc3QTJCOTY2QjZFIiBzdEV2dDp3aGVuPSIyMDE0LTAyLTE5VDE1OjE4OjEwLTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNvbnZlcnRlZCIgc3RFdnQ6cGFyYW1ldGVycz0iZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL2pwZWciLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImRlcml2ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImNvbnZlcnRlZCBmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvanBlZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MTcxQzBBRjRBMjk5RTMxMUJCQ0RDNzdBMkI5NjZCNkUiIHN0RXZ0OndoZW49IjIwMTQtMDItMTlUMTU6MTg6MTAtMDU6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDUzUgV2luZG93cyIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTYxQzBBRjRBMjk5RTMxMUJCQ0RDNzdBMkI5NjZCNkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjNDNDA2RDBFMTk4RTMxMUEzRTVENjc4RUNDRDhGQkQiIHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo2M0M0MDZEMEUxOThFMzExQTNFNUQ2NzhFQ0NEOEZCRCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg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"
+        }
+    ],
+    "samplers": [
+        {
+            "magFilter": 9729,
+            "minFilter": 9986,
+            "wrapS": 10497,
+            "wrapT": 10497
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 222960,
+            "byteLength": 28032,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 167096,
+            "byteLength": 52368,
+            "byteStride": 8,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 88544,
+            "byteLength": 78552,
+            "byteStride": 12,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 15200,
+            "byteLength": 52368,
+            "byteStride": 16,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 219464,
+            "byteLength": 3496
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 67568,
+            "byteLength": 20976
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1216,
+            "byteLength": 13984
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 1216
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 250992,
+            "uri": "data:application/octet-stream;base64,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7r8iNivKhD37fyS2C4AhNhrKhD3+/yO28T8iNvvJhD0QwCS2CAAiNgjKhD3xPyK2CAAiNhPKhD0TQCS27r8iNvXJhD0DQCe28T8iNijKhD0BwCe2BoAiNirKhD3xfya2CAAiNijKhD3+/yO2CAAiNvnJhD32fyW2AwAjNhjKhD3v/ya2+f8kNhrKhD0RACm2AYAjNijKhD0RACm2AwAjNgnKhD0LwCW29L8hNhXKhD0WACi29L8hNvXJhD0BgCO2DQAhNvzJhD3v/ya2AwAjNiPKhD35/yS27r8iNhrKhD0BgCO2EgAgNg3KhD0WACi27r8iNibKhD30/yW2AwAjNifKhD0NACG2C4AhNvnJhD3v/ya28T8iNiTKhD32fyW29j8hNvzJhD0RACm2BoAiNg/KhD30/yW2BoAiNgnKhD30/yW2/R8iNvnJhD39/38/AACAP///fz/+/38///9/PwAAgD/+/38/+v9/P/3/fz8AAIA//f9/P///fz/+/38//P9/PwAAgD/8/38/AQCAP/7/fz/9/38//v9/P/z/fz/9/38//v9/P/7/fz///38//v9/PwAAgD8AAIA//v9/P///fz8AAIA//v9/PwAAgD/8/38/AACAP/7/fz///38//P9/P/7/fz8AAIA/AACAP///fz/9/38/AgCAP///fz/+/38///9/PwAAgD///38/AACAPwAAgD/8/38///9/PwAAgD/7/38//v9/PwAAgD/+/38//v9/P/z/fz8AAIA//P9/P/7/fz/9/38///9/P/3/fz///38//v9/P///fz/7/38///9/P///fz///38///9/P/3/fz/6/38//v9/P/z/fz///38/AgCAP/3/fz/9/38/AQCAPwEAgD///38//f9/P/v/fz/8/38//v9/P///fz/8/38/AACAPwAAgD8AAIA///9/P///fz///38//v9/P/n/fz/7/38//P9/P/r/fz///38/AACAP/v/fz/9/38/+/9/P/7/fz/9/38/+P9/P/v/fz8AAIA//v9/P///fz/6/38/+/9/PwAAgD/8/38///9/P/z/fz/8/38/AACAPwAAgD/9/38//P9/PwEAgD///38//f9/PwAAgD/7/38//P9/PwEAgD///38//f9/P///fz/+/38/AACAP///fz/1J1W9/P8PsxQAMbatJ1W9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/v9/PwAAgD8BAIA/AQCAPwEAgD8CAIA/AACAPwEAgD8CAIA/AQCAPwMAgD8EAIA/AQCAPwEAgD8AAIA//v9/PwEAgD8BAIA///9/PwAAgD8BAIA//v9/PwAAgD8DAIA/AACAPwAAgD8AAIA/AQCAPwAAgD8AAIA/AACAPwEAgD8BAIA/AACAPwEAgD8BAIA/AACAP///fz8BAIA/AQCAPwEAgD8BAIA/AQCAPwEAgD8CAIA///9/PwEAgD8CAIA/AACAPwEAgD8DAIA///9/PwAAgD8EAIA/AQCAPwMAgD8AAIA///9/PwAAgD8DAIA/AACAPwEAgD8AAIA///9/P/3/fz8BAIA//f9/PwAAgD8DAIA/AACAP///fz8DAIA/AQCAPwAAgD8EAIA/+v9/P/7/fz8CAIA//v9/PwEAgD8CAIA/AACAP/7/fz8CAIA/AACAPwEAgD8CAIA//P9/PwEAgD8DAIA/AACAPwAAgD8DAIA///9/PwAAgD8EAIA//v9/PwAAgD9VoFg87qtcPp3p3z3fn1g856tcPpDp3z1KoFg856tcPp3p3z30n1g856tcPp3p3z01oFg87qtcPpDp3z3qn1g856tcPp3p3z0VoFg856tcPpDp3z3/n1g856tcPp3p3z3/n1g87qtcPp3p3z3qn1g87qtcPp3p3z3/n1g87qtcPp3p3z01oFg87qtcPp3p3z3fn1g856tcPp3p3z30n1g856tcPpDp3z1+n1g87qtcPp3p3z3/n1g856tcPpDp3z01oFg87qtcPpDp3z0VoFg856tcPpDp3z0qoFg87qtcPpDp3z2/n1g87qtcPpDp3z0foFg87qtcPpDp3z3fn1g856tcPp3p3z3qn1g87qtcPpDp3z30n1g856tcPpDp3z3/n1g856tcPpDp3z30n1g856tcPpDp3z0foFg856tcPpDp3z3qn1g856tcPp3p3z3/n1g856tcPpDp3z30n1g856tcPpDp3z30n1g87qtcPp3p3z30n1g856tcPoLp3z30n1g87qtcPpDp3z3Un1g856tcPpDp3z0foFg87qtcPp3p3z01oFg856tcPp3p3z0foFg87qtcPp3p3z30n1g84KtcPp3p3z3/n1g856tcPp3p3z2/n1g87qtcPoLp3z3/n1g87qtcPpDp3z1goFg87qtcPp3p3z2fn1g856tcPp3p3z2/n1g87qtcPp3p3z0foFg87qtcPp3p3z2goFg87qtcPp3p3z37/38/+/9/P/z/fz/0/38/9/9/P/j/fz/4/38/+v9/P/j/fz/4/38/+v9/P/z/fz/3/38/9v9/P/n/fz/4/38/+P9/P/j/fz/2/38/+f9/P/v/fz/4/38/9f9/P/n/fz/6/38/9/9/P/v/fz/6/38/9/9/P/b/fz/9/38/9v9/P/b/fz/1/38/9/9/P/b/fz/2/38/+P9/P/f/fz/6/38/9v9/P/n/fz/6/38/9/9/P/j/fz/3/38/+f9/P/b/fz/6/38/9/9/P/v/fz/9/38/+/9/P/n/fz/6/38/+v9/P/n/fz/3/38/+P9/P/j/fz/3/38/9v9/P/r/fz/x/38/9v9/P/j/fz/5/38/+f9/P/j/fz/0/38/9/9/P/n/fz/2/38/+f9/P/v/fz/3/38/+f9/P/r/fz/7/38/+P9/P/v/fz/3/38/+/9/P///fz/2/38/+v9/P/j/fz/4/38/9/9/P/b/fz/3/38/+P9/P/r/fz/5/38/+v9/P/n/fz/7/38/+v9/P/r/fz/5/38/9/9/P/j/fz/3/38/9/9/P/j/fz/3/38/+v9/P/z/fz/2/38/+/9/P/z/fz/2/38/+P9/P/n/fz/0/38/9v9/P/n/fz/5/38//f9/P/z/fz/5/38/+v9/P/j/fz/3/38/+v9/P/n/fz/2/38/+v9/P/r/fz/6/38/+f9/P/z/fz/7/38/+v9/P/v/fz/6/38/+P9/P/b/fz/4IL+9mG4SPv0LoD38IL+9mG4SPvkLoD3+IL+9nm4SPvELoD0AIb+9mG4SPvQLoD38IL+9kW4SPvQLoD36IL+9mG4SPvgLoD36IL+9nm4SPgYMoD38IL+9kW4SPvQLoD3+IL+9nm4SPu0LoD35IL+9mG4SPgYMoD3+IL+9mG4SPvsLoD36IL+9kW4SPvkLoD3+IL+9kW4SPvQLoD0AIb+9nm4SPv8LoD36IL+9mG4SPv0LoD0GIb+9mG4SPvkLoD3yIL+9kW4SPvALoD0CIb+9mG4SPvELoD0EIb+9mG4SPvULoD0FIb+9mG4SPvULoD0FIb+9nm4SPvELoD0JIb+9mG4SPvELoD35IL+9mG4SPvQLoD0GIb+9mG4SPvALoD0KIb+9mG4SPvQLoD36IL+9mG4SPvALoD0AIb+9mG4SPvALoD0EIb+9mG4SPvgLoD38IL+9mG4SPvELoD0CIb+9mG4SPvULoD36IL+9mG4SPgYMoD3+IL+9kW4SPvwLoD39IL+9kW4SPvwLoD3+IL+9kW4SPuwLoD39IL+9mG4SPgIMoD3+IL+9mG4SPvULoD3+IL+9mG4SPvwLoD38IL+9mG4SPvwLoD0CIb+9mG4SPvULoD3+IL+9mG4SPu8LoD0EIb+9mG4SPvULoD3+IL+9mG4SPggMoD3+IL+9mG4SPgIMoD0EIb+9mG4SPgIMoD0GIb+9mG4SPvELoD34IL+9mG4SPgAMoD0CAIA/AgCAPwQAgD8CAIA/AwCAPwQAgD8EAIA/AgCAPwQAgD8FAIA/AACAPwUAgD8EAIA/AgCAPwQAgD8FAIA/AgCAPwQAgD8BAIA/AQCAPwIAgD8FAIA/AQCAPwQAgD8EAIA/AQCAPwQAgD8DAIA/AgCAPwMAgD8EAIA/AgCAPwYAgD8FAIA/AwCAPwcAgD8FAIA/AwCAPwMAgD8FAIA/AgCAPwMAgD8EAIA/AQCAPwUAgD8CAIA///9/PwUAgD8DAIA/AQCAPwUAgD8EAIA//f9/PwMAgD8DAIA//f9/PwIAgD8FAIA/AgCAPwUAgD8GAIA/AgCAPwQAgD8EAIA/AACAPwMAgD8GAIA/AQCAPwQAgD8EAIA/AQCAPwUAgD8GAIA/AQCAPwQAgD8EAIA/AACAPwMAgD8EAIA/AgCAPwMAgD8CAIA/AgCAPwUAgD8EAIA/AQCAPwQAgD8EAIA/AQCAPwQAgD8EAIA/AgCAPwQAgD8EAIA/AgCAPwYAgD8EAIA/AgCAPwQAgD8EAIA/AQCAPwUAgD8DAIA/AACAPwQAgD8DAIA/AACAPwQAgD8EAIA/AQCAPwUAgD8EAIA/AQCAPwMAgD8EAIA/AgCAPwUAgD8DAIA/AACAPwQAgD8EAIA/AgCAPwQAgD8CAIA/AgCAPwUAgD8CAIA/AACAPwIAgD8CAIA///9/PwQAgD8EAIA/AwCAPwIAgD8DAIA/AACAPwQAgD/0vyO4VDm0vQO4ebgAGCS4WTm0vf5Lebj6GyS4Qzm0vQ6qebj07yO4Uzm0vQy+eLj/VyS4UTm0vQtreLgGZCS4UDm0vfjMeLj+hyS4WTm0vfuveLjzHyS4Szm0vX2NebgEWCO4UTm0vQnkebgCuCO4TTm0vfameLj3qyS4Vzm0vQLveLj07yO4Tzm0vQa+ebgI9CO4TTm0vf04ebj5SyS4Tzm0vQNMeLj1ZSS4Yzm0vQ0kebgHFCS4VTm0vfV8ebgDXiS4YDm0vQlFeLgB+CO4WTm0vQMCebj5OyS4VTm0vQueeLj39SO4UTm0vfoyebgGviO4VTm0vf2ieLj5KyS4WTm0vfM2ebj4xSO4WTm0vf17ebj3BSS4WTm0vf5LebgF3iO4RDm0vQlOebgM6iO4TTm0vfafebgJiiS4ZDm0vQ5OeLj6GyS4Rzm0vQSIebj1RSS4WTm0vQuUebgJ1CO4UDm0vQYYebgHFCS4UDm0vQL4ebj6CyS4UTm0vfQ5ebj1nyO4XTm0vfv7ebj+hyS4VDm0vQYYebgLwCS4YTm0vQi4eLj2uyS4SDm0vfq/eLgI5CO4Tzm0vQ00ebgB+CO4UDm0vfdfebgHNCS4ZDm0vQ0Uebj03yO4Tzm0vfZ/ebgC2CO4Szm0vQfYeLgASCS4YTm0vfW/ebjz/yO4YDm0vQHceLgIBCS4ZDm0vf/BebjzDyS4XTm0vf5LebgAOCS4WTm0vfbZeLj9/38/AwCAPwAAgD///38/AQCAP/3/fz/7/38///9/P/3/fz8AAIA/AQCAPwAAgD8BAIA///9/P/z/fz/8/38/AACAPwAAgD8AAIA//f9/P///fz/9/38//f9/P/7/fz8AAIA/AQCAP///fz8AAIA/AACAP///fz8BAIA//v9/P///fz/9/38//P9/PwAAgD8AAIA/AACAP///fz/9/38//v9/P///fz///38/AQCAPwEAgD8AAIA//f9/P///fz8AAIA/AACAP///fz8AAIA/AACAPwAAgD8AAIA///9/P/3/fz///38//f9/P/7/fz/9/38//f9/P/7/fz8AAIA/AQCAP///fz8AAIA//v9/P///fz/9/38//f9/P///fz8AAIA///9/PwAAgD8BAIA//P9/P///fz8AAIA/AQCAP/3/fz8AAIA/AQCAPwAAgD8BAIA/AACAPwAAgD8BAIA/AACAP///fz8AAIA/AACAP///fz8CAIA/AQCAP///fz8AAIA//v9/PwEAgD8AAIA///9/P///fz/8/38/AgCAP/z/fz/+/38/AACAP/z/fz/9/38///9/P/3/fz/+/38/AQCAPwAAgD/+/38///9/P/z/fz/7/38/AACAP/z/fz8AAIA/AACAP///fz///38/AACAP///fz/8/38/AACAPwAAgD/+/38/AQCAP///fz/+/38/AQCAPwAAgD///38/AACAP/7/fz/9mBG9v6tcvip41T3ymBG9v6tcvjd41T0VmRG9xatcvip41T39mBG9v6tcvkV41T0HmRG9v6tcvip41T3vmBG9xatcvip41T39mBG9uKtcvip41T3vmBG9v6tcvjd41T3nmBG9v6tcvip41T33mBG9xatcvjd41T30mBG9uKtcvip41T0NmRG9uKtcvip41T0VmRG9v6tcvjd41T0SmRG9uKtcvjd41T0VmRG9uKtcvjd41T0SmRG9v6tcvjd41T0NmRG9v6tcvjd41T0PmRG9v6tcvip41T0FmRG9v6tcvjd41T3ymBG9xatcvip41T3ymBG9v6tcvip41T36mBG9uKtcvip41T33mBG9v6tcvip41T39mBG9uKtcvip41T33mBG9uKtcvhx41T3vmBG9v6tcvip41T3/mBG9v6tcvjd41T3qmBG9xatcvip41T3ymBG9xatcvjd41T3ymBG9v6tcvip41T0CmRG9uKtcvip41T33mBG9v6tcvjd41T3vmBG9v6tcvip41T3vmBG9v6tcvip41T0CmRG9v6tcvjd41T0VmRG9xatcvjd41T3/mBG9v6tcvip41T0HmRG9v6tcvip41T0NmRG9xatcvjd41T39mBG9zKtcvjd41T3smBG9xatcvjd41T0PmRG9v6tcvjd41T0NmRG9v6tcvjd41T0PmRG9v6tcvip41T0FmRG9v6tcvip41T0NmRG9xatcvip41T0DAIA/AQCAPwIAgD8AAIA//f9/PwAAgD8BAIA//v9/P///fz8DAIA/AACAP///fz8CAIA//P9/P/3/fz8CAIA/AQCAPwAAgD8BAIA//f9/P///fz8DAIA/AACAPwAAgD8DAIA//f9/P///fz8DAIA/AQCAP///fz8BAIA/+/9/PwAAgD8EAIA///9/P///fz8EAIA///9/P/7/fz8EAIA//f9/P/3/fz8DAIA///9/P/7/fz8EAIA///9/PwAAgD8EAIA///9/PwAAgD8FAIA/AACAPwAAgD8CAIA//v9/P///fz8EAIA/AACAP/3/fz8DAIA///9/P/7/fz8CAIA/AACAP/3/fz8CAIA//P9/P///fz8CAIA/AACAPwAAgD8CAIA/+v9/PwEAgD8DAIA///9/P///fz8CAIA/AACAPwAAgD8CAIA/AQCAPwAAgD8DAIA/AQCAP///fz8BAIA///9/P/7/fz8DAIA/AACAP/7/fz8EAIA/AACAP///fz8CAIA//f9/PwAAgD8CAIA//v9/P///fz8BAIA//v9/P///fz8DAIA//v9/PwAAgD8DAIA//v9/PwAAgD8EAIA//f9/P///fz8DAIA/+/9/P/7/fz8DAIA//v9/PwAAgD8CAIA//v9/PwAAgD8BAIA/AQCAP/r/fz8CAIA/AACAP/3/fz8BAIA///9/P/v/fz8DAIA/AQCAPwEAgD8DAIA/AACAP///fz81fgA91G4Svmfe8L1CfgA9224Svlre8L01fgA9224Svmfe8L0vfgA91G4Svlre8L01fgA9224Svmfe8L04fgA91G4Svlre8L01fgA91G4Svmfe8L0vfgA91G4Svmfe8L0nfgA91G4Svmfe8L04fgA9zW4Svmfe8L0nfgA91G4Svlre8L04fgA91G4Svmfe8L0nfgA9224Svlre8L0nfgA9224Svlre8L1YfgA91G4Svmfe8L1IfgA9224Svlre8L0vfgA9224Svmfe8L1QfgA91G4Svlre8L0nfgA91G4Svmfe8L0vfgA9224Svmfe8L1AfgA91G4Svlre8L1IfgA91G4Svlre8L04fgA91G4Svlre8L1YfgA9zW4Svlre8L1YfgA91G4Svlre8L04fgA9224Svlre8L0vfgA91G4Svlre8L1IfgA9zW4Svmfe8L01fgA91G4Svmfe8L04fgA9zW4Svmfe8L1IfgA91G4Svlre8L04fgA91G4Svmfe8L1AfgA91G4Svlre8L1IfgA91G4Svk3e8L09fgA9224Svmfe8L01fgA91G4Svlre8L1IfgA9224Svlre8L06fgA9224Svmfe8L01fgA91G4Svmfe8L04fgA9224Svlre8L01fgA91G4Svlre8L1KfgA91G4Svlre8L01fgA9224Svlre8L01fgA91G4Svlre8L0vfgA91G4Svmfe8L1VfgA9224Svmfe8L3//38/AgCAPwEAgD///38/AQCAPwIAgD8BAIA/BACAPwMAgD8CAIA/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AOITvNCkUz17k4U+D+ITvOCkUz17k4U++OETvOCkUz17k4U++OETvPOkUz17k4U+D+ITvOukUz17k4U+AOITvOOkUz1+k4U+D+ITvO6kUz1+k4U+COITvOikUz17k4U+AOITvPOkUz1+k4U++OETvPukUz17k4U++OETvOikUz1+k4U+8OETvPCkUz17k4U+AOITvPOkUz1+k4U+COITvPCkUz1+k4U+8OETvPCkUz13k4U++OETvOukUz17k4U+AOITvOCkUz17k4U+D+ITvNikUz17k4U++OETvNikUz17k4U+AOITvNOkUz17k4U+COITvNOkUz13k4U++OETvNOkUz17k4U++OETvNOkUz17k4U+AOITvOOkUz0DAIA/AACAP/3/fz8CAIA/BACAPwAAgD8DAIA/BQCAP/7/fz8BAIA/BACAP///fz8CAIA/AQCAP///fz///38/BACAPwEAgD8AAIA/BQCAPwIAgD8BAIA/BACAPwEAgD8DAIA/BQCAPwIAgD8BAIA/AwCAP///fz8CAIA/BACAP/z/fz8BAIA/BACAPwEAgD///38/BQCAP/v/fz8BAIA/BACAPwAAgD8DAIA/AwCAP///fz8CAIA/AgCAP///fz8CAIA/AgCAPwAAgD8BAIA/AgCAPwAAgD8DAIA/BACAPwAAgD8DAIA/AwCAP///fz8DAIA/BACAPwAAgD8CAIA/BACAPwAAgD8BAIA/AgCAP/7/fz8DAIA/BACAPwAAgD8BAIA/BQCAP/7/fz8CAIA/AwCAP///fz/+/38/BQCAPwIAgD/7/38/BACAPwUAgD/3/38/AwCAPwQAgD///38/AQCAPwcAgD/8/38/AQCAPwUAgD/7/38/BACAPwYAgD/5/38/AACAPwQAgD/9/38/BQCAPwkAgD/9/38/AwCAPwUAgD/4/38/AwCAPwUAgD/6/38/BQCAPwUAgD/+/38/AwCAPwAAgD8AAIA/BQCAPwAAgD8CAIA/BACAP/z/fz8CAIA/BQCAP///fz8DAIA/BACAPwAAgD8DAIA/BgCAPwEAgD8CAIA/AwCAPwAAgD8CAIA/AwCAP/z/fz8DAIA/BQCAPwAAgD8iCY0+/Ki7uv0XZ7wiCY0+fKi7uvIXZ7wiCY0+P6i7uucXZ7wiCY0+P6i7utwXZ7wiCY0+wKi7uucXZ7wiCY0+P6i7utwXZ7wiCY0+P6i7uucXZ7wiCY0+wKi7uvIXZ7wiCY0+/Ki7utwXZ7wiCY0+P6i7utwXZ7wiCY0+fKi7uvIXZ7wlCY0+P6i7utwXZ7wlCY0+wKi7utwXZ7wiCY0+P6i7uvIXZ7wlCY0+v6e7urwXZ7wfCY0+A6i7urwXZ7wiCY0+/Ki7utIXZ7wiCY0+A6i7urEXZ7wiCY0+wKi7uvIXZ7wiCY0+/Ki7upwXZ7wiCY0+wKi7urwXZ7wiCY0+P6i7urEXZ7wiCY0+P6i7utIXZ7wiCY0+fKi7urEXZ7wiCY0+P6i7uvIXZ7wiCY0+wKi7utIXZ7wiCY0+Qam7utIXZ7wlCY0+/Ki7uucXZ7wfCY0+g6e7uvIXZ7wfCY0+wKi7utIXZ7wiCY0+wKi7uvIXZ7wiCY0+fKi7urEXZ7wiCY0+P6i7uv0XZ7wiCY0+P6i7utwXZ7wfCY0+wKi7uucXZ7wiCY0+A6i7urwXZ7wlCY0+fKi7utIXZ7wlCY0+fKi7utIXZ7wiCY0+/Ki7utwXZ7wiCY0+/Ki7utIXZ7wiCY0+/Ki7utwXZ7wiCY0+/Ki7uv0XZ7wiCY0+A6i7utwXZ7wiCY0+fKi7utIXZ7wiCY0+wKi7utwXZ7wiCY0+fKi7uvIXZ7z8/38/9/9/PwAAgD/5/38/8v9/PwAAgD/9/38/9P9/PwEAgD/6/38/9f9/P/v/fz/8/38/+P9/P///fz/6/38/+P9/PwAAgD///38/9v9/P///fz/4/38/+f9/P/7/fz/+/38/9/9/P/7/fz/8/38/9v9/P/z/fz///38/8/9/PwAAgD/9/38/9/9/PwAAgD/8/38/9v9/P///fz/5/38/+P9/P/r/fz/9/38/9/9/PwIAgD/5/38/8v9/P/z/fz/7/38/9f9/PwEAgD/7/38/9/9/P///fz/4/38/9/9/P/3/fz/6/38/9v9/PwIAgD/6/38/9/9/PwIAgD/7/38/9v9/PwIAgD/7/38/9v9/PwIAgD/3/38/9P9/PwAAgD/3/38/9v9/P/z/fz/2/38/+P9/PwAAgD/6/38/+P9/PwIAgD/6/38/8/9/P/z/fz/5/38/9P9/P///fz/4/38/+f9/P///fz/6/38/+P9/P/v/fz/3/38/+P9/P/z/fz/3/38/9f9/P/z/fz///38/+v9/P/z/fz/5/38/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AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/U8S3NQAAAAAAAIA/U8S3NQAAAAAAAIA/U8S3NQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/A3rNtQAAAAAAAIA/A3rNtQAAAAAAAIA/A3rNtQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/B34WtgAAAAAAAIA/B34WtgAAAAAAAIA/B34WtgAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIC/JHavNQAAAAAAAIC/JHavNQAAAAAAAIC/JHavNQAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/SK+qNQAAAAAAAIC/SK+qNQAAAAAAAIC/SK+qNQAAAAAAAIC/CVentQAAAAAAAIC/CVentQAAAAAAAIC/CVentQAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/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LIi4NQAAAAAAAIA/LIi4NQAAAAAAAIA/LIi4NQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/EyumNQAAAAAAAIA/EyumNQAAAAAAAIA/EyumNQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/fZbPNQAAAAAAAIA/fZbPNQAAAAAAAIA/fZbPNQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/y4BtNQAAAAAAAIA/y4BtNQAAAAAAAIA/y4BtNQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/KDyrtQAAAAAAAIA/KDyrtQAAAAAAAIA/KDyrtQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/ZWSpNQAAAAAAAIA/ZWSpNQAAAAAAAIA/ZWSpNQAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIC/WZ+fNQAAAAAAAIC/WZ+fNQAAAAAAAIC/UtuntQAAAAAAAIC/UtuntQAAAAAAAIC/UtuntQAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/ep7cNQAAAAAAAIC/ep7cNQAAAAAAAIC/ep7cNQAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/E+qoNQAAAAAAAIC/E+qoNQAAAAAAAIC/E+qoNQAAAAAAAIC/AAAAAAAAAAAAAIC/EKiqtQAAAAAAAIC/EKiqtQAAAAAAAIC/EKiqtQAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/rdcPNgAAAAAAAIC/rdcPNgAAAAAAAIC/rdcPNgAAAAAAAIC/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AwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQABgACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAFAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAQAAAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAYAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQABQADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQABgACAAMABAAGAAIAAwAEAAYAAgADAAQABgACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAYAAgADAAQABgACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQAAAAsADQAAAAAACwANAAAAAAALAA0ADwAAAAsADQAAAAsADQAPAAAACwANAA8AAAAAAAsADQAPAAAACwANAA8AAAALAA0AAAAAAAsADQAAAAAACwANAAAAAAALAA0AAAALAA0ADwAAAAsADQAPAAAAAAALAA0ADwALAA0ADwAAAAAADAAOAAAAAAAMAA4AAAAAAAwADgAAAAAADAAOAAAAAAAMAA4AAAAAAAwADgAQAAAADAAOAAAADAAOAAAAAAAAAAsADQAAAAAACwANAAAAAAALAA0AAAAAAAsADQAAAAAACwAMAA0AAAALAAwADQAAAAsADAANAAAACwAMAA0AAAALAAwADgAAAAsADAAAAAAACwAMAA4AAAALAAwAAAAAAAsADAAOAAAADAAOAAAAAAALAAwADgAAAAwADgAAAAAACwANAAAAAAALAA0AAAAAAAsADQAAAAAACwANAAAAAAAMAA4AAAAAAAwADgAAAAAACwAMAA4AAAALAAwADgAAAAwADgAAAAAACwAMAA4AAAAMAA4AAAAAAAwADgAAAAAADAAOAAAAAAAMAA4AAAAAAAsADAAOAAAACwAMAA0AAAALAAwAAAAAAAsADAANAAAACwAMAAAAAAALAAwAAAAAAAsADAANAAAACwAMAA0AAAALAAwAAAAAAAsADAAAAAAACwAMAAAAAAALAAwAAAAAAAwAAAAAAAAADAAAAAAAAAALAAwAAAAAAAsADAAAAAAAAQAGAAwAAAABAAYADAAAAAEABgAMAAAAAQAGAAsAAAABAAUACwAAAAEACwAMAAAAAQAFAAsAAAABAAUACwABAAIAAwAGAAAAAQACAAMAAQACAAMABQAAAAEAAgADAAAAAQALAAwAAAABAAYACwAAAAsADAAAAAAADAAAAAAAAgADAAYACAACAAMABgAIAAIAAwAGAAgAAgADAAYACAAAAAEAAgAGAAAAAQACAAYAAAABAAIABQAAAAEAAgAFAAEAAgAFAAcAAgADAAUABwAAAAEAAgADAAIAAwAFAAcAAAABAAIABgACAAYACAAAAAAAAQACAAMAAgADAAYACAAGAAgACgAAAAYACAAKAAAABgAIAAoAAAAGAAgACgAAAAUABwAJAAAABQAHAAkAAAAFAAcACQAAAAUABwAJAAAAAgAFAAcAAAACAAUABwAAAAIABQAHAAAAAgAFAAcAAAAGAAgAAAAAAAYACAAKAAAABgAIAAAAAAAGAAgACgAAAAIABQAHAAAAAgAFAAcAAAACAAUABwAAAAIABQAHAAAABgAIAAoAAAAGAAgACgAAAAYACAAKAAAABgAIAAoAAAACAAYACAAAAAYACAAAAAAAAgAGAAgAAAAGAAgACgAAAAIABQAHAAAABQAHAAAAAAACAAUABwAJAAUABwAJAAAAAgAGAAgAAAACAAYACAAAAAAAAQACAAYAAQACAAYACAAAAAEAAgAGAAIABQAHAAAAAgAFAAcAAAABAAIABgAIAAYACAAKAAAABgAIAAoAAAAIAAoAAAAAAAgACgAAAAAACAAKAAAAAAAIAAoAAAAAAAgACgAAAAAACAAKAAAAAAAHAAkAAAAAAAcACQAAAAAABwAJAAAAAAAHAAkAAAAAAAUABwAJAAAABQAHAAkAAAAFAAcACQAAAAcACQAAAAAABgAIAAoAAAAGAAgACgAAAAYACAAKAAAABgAIAAoAAAAHAAkAAAAAAAcACQAAAAAABwAJAAAAAAAHAAkAAAAAAAgACgAAAAAACAAKAAAAAAAIAAoAAAAAAAgACgAAAAAABQAHAAkAAAAFAAcACQAAAAcACQAAAAAABQAHAAkAAAAHAAkAAAAAAAcACQAAAAAABwAJAAAAAAAHAAkAAAAAAAcACQAAAAAABwAJAAAAAAAIAAoAAAAAAAgACgAAAAAACAAKAAAAAAAIAAoAAAAAAAgACgAAAAAACAAKAAAAAAAFAAcACQAAAAUABwAJAAAABQAHAAkAAAAFAAcACQAAAAUABwAJAAAABQAHAAkAAAAFAAcACQAAAAUABwAJAAAABgAIAAoAAAAIAAoAAAAAAAYACAAKAAAACAAKAAAAAAAGAAgACgAAAAYACAAKAAAABgAIAAoAAAAGAAgACgAAAAIAAwAEAAYAAgADAAQABgABAAIAAwAGAAIAAwAEAAYAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQABAAIAAwAEAAEAAgADAAUAAgADAAQABQACAAMABQAAAAEAAgADAAQAAQACAAMABAABAAIAAwAFAAEAAgADAAUAAQACAAMABAABAAIAAwAEAAEAAgADAAQAAQACAAMABAABAAIAAwAEAAIAAwAEAAYAAQACAAMABAACAAMABAAFAAAADAAOAAAADAAOAAAAAAAAAAwADgAAAAwADgAAAAAADAAOAAAAAAAMAA4AEAAAAAsADQAPABEACwANAA8AAAALAA0AAAAAAAsADQAPABEACwANAAAAAAALAA0ADwARAAsADQAPABEACwANAA8AEQALAA0ADwARAAsADQAPABEACwANAA8AAAALAA0ADwAAAAsADQAPAAAACwANAA8AEQAMAA4AEAASAAwADgAQAAAADAAOABAAEgAMAA4AEAASAAwADgAQABIADAAOABAAEgAMAA4AEAASAAwADgAQABIADAAOABAAEgAMAA4AEAASAA4AEAASAAAADgAQABIAAAAMAA4AEAASAA4AEAASAAAADAAOABAAEgAOABAAEgAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAADQAPABEAAAAPABEAAAAAAA0ADwARAAAADwARAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAAAAQACAAMAAAABAAIABQAAAAEAAgADAAAAAQACAAUAAgADAAUAAAACAAMABQAAAAIAAwAFAAAAAgADAAUAAAACAAMABgAAAAIAAwAGAAAAAAABAAIAAwAAAAEAAgADAAAAAQACAAUAAAABAAIABQAAAAEAAgADAAAAAQACAAMAAAABAAIABQAAAAEAAgAFAAAAAQACAAUAAAABAAIABQAAAAEAAgAGAAAAAQACAAYAAAABAAIABQAAAAEAAgAFAAAAAQACAAUAAAABAAIABQAAAAEAAgAFAAAAAQACAAUAAAABAAIABgAAAAEAAgAGAAAAAQACAAUAAAABAAIABQAAAAEAAgAFAAAAAQACAAUAAAABAAIABQAAAAEAAgAFAAAAAQACAAUAAAABAAIABQAAAAEAAgAFAAAAAQACAAMAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAABAAAAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAEAASAAAAAAAQABIAAAAAAA4AEAASAAAAEAASAAAAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAABAAEgAAAAAAEAASAAAAAAAOABAAEgAAABAAEgAAAAAAEgAAAAAAAAASAAAAAAAAABIAAAAAAAAAEgAAAAAAAAANAA8AEQAAAA8AEQAAAAAADQAPABEAAAAPABEAAAAAAA4AEAASAAAAEAASAAAAAAAQABIAAAAAABAAEgAAAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAADwARAAAAAAAPABEAAAAAAA8AEQAAAAAADwARAAAAAAAPABEAAAAAAA8AEQAAAAAADQAPABEAAAAPABEAAAAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAAEAASAAAAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAAEQAAAAAAAAARAAAAAAAAABEAAAAAAAAAEQAAAAAAAAANAA8AEQAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA8AEQAAAAAADwARAAAAAAAPABEAAAAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAAQABIAAAAAABAAEgAAAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAAEAASAAAAAAAQABIAAAAAAA8AEQAAAAAADwARAAAAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAANAA8AEQAAAA0ADwARAAAADQAPABEAAAAQABIAAAAAABAAEgAAAAAAEgAAAAAAAAAQABIAAAAAAAAAAQACAAMAAAABAAIAAwAHAAkAAAAAAAkAAAAAAAAABwAJAAAAAAAJAAAAAAAAAAgACgAAAAAACgAAAAAAAAAIAAoAAAAAAAoAAAAAAAAACgAAAAAAAAAKAAAAAAAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAGAAIAAwAEAAUAAgADAAQAAAACAAMABAAFAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAACAAMABAAAAAIAAwAEAAUAAgADAAQABQACAAMABAAGAAIAAwAEAAYAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAGAAIAAwAEAAYAAQACAAMABAACAAMABAAFAAAACwANAAAAAAALAA0AAAALAA0AAAAAAAAADAAOABAAAAAMAA4AEAAAAAsADQAAAAAACwANAAAAAAALAAwADQAAAAsADAAOAAAACwAMAA4AAAALAAwADgAAAAsADQAAAAAACwAMAA4AAAALAAwADgAAAAsADAAAAAAADAAOAAAAAAALAAwADgAAAAsADAAAAAAACwAMAAAAAAALAAAAAAAAAAsAAAAAAAAADAAOAAAAAAALAAwAAAAAAAEABgALAAAAAQALAAwAAAABAAsADAAAAAEAAgADAAAAAQAGAAsAAAABAAIABgAAAAEAAgAFAAAAAQACAAUAAAABAAIABQAAAAEAAgAGAAUABwAJAAAABQAHAAkAAAAGAAgAAAAAAAYACAAKAAAABQAHAAkAAAAFAAcAAAAAAAYACAAKAAAABgAIAAoAAAACAAYACAAAAAIABgAIAAAAAgAGAAgAAAAAAAEAAgAGAAYACAAKAAAABgAIAAoAAAAHAAkAAAAAAAcACQAAAAAABgAIAAoAAAAHAAkAAAAAAAcACQAAAAAACAAKAAAAAAAFAAcACQAAAAUABwAJAAAABwAJAAAAAAAHAAkAAAAAAAcACQAAAAAABwAJAAAAAAAIAAoAAAAAAAgACgAAAAAACAAKAAAAAAAIAAoAAAAAAAIAAwAGAAAAAgADAAUAAAACAAMABQAAAAEAAgADAAUAAQACAAMABQABAAIAAwAEAAAAAQACAAMAAQACAAMABQAMAA4AAAAAAAwADgAAAAAADAAOABAAAAAMAA4AAAAAAAsADQAPABEADQAPABEAAAALAA0ADwARAAsADQAPABEACwANAA8AAAALAA0ADwAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAAEAASAAAAAAANAA8AEQAAAA8AEQAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAwAFAAAAAgADAAUAAAACAAMABgAAAAAAAQACAAMAAAABAAIABQAAAAEAAgADAAAAAQAFAAsAAAABAAYACwAAAAEABQALAAAAAQAFAAsAAAABAAsADAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAQAAAAAAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAASAAAAAAAAABIAAAAAAAAADQAPABEAAAAPABEAAAAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAABEAAAAAAAAAEQAAAAAAAAANAA8AEQAAAA0ADwARAAAAEgAAAAAAAAASAAAAAAAAAA4AEAASAAAAEQAAAAAAAAARAAAAAAAAAA8AEQAAAAAAEAASAAAAAAAOABAAEgAAAA0ADwARAAAAEAASAAAAAAAOABAAEgAAAA0ADwARAAAAEAASAAAAAAAHAAkAAAAAAAcACQAAAAAACAAKAAAAAAAIAAoAAAAAAAoAAAAAAAAACgAAAAAAAAALAA0ADwARAAsADQAPABEADQAPABEAAAANAA8AEQAAAA4AEAASAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAYAAgADAAQAAAACAAMABAAFAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQABgACAAMABAAGAAIAAwAEAAUAAgADAAQABQACAAMABAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAQAAAAAAAAAAgADAAQABgACAAMABAAFAAIAAwAEAAUAAgADAAQABgACAAMABAAGAAIAAwAEAAYAAgADAAQAAAAAAAsADQAPAAAACwANAAAAAAALAA0ADwAAAAsADQAPAAAACwANAAAACwANAAAAAAAAAAsADQAPAAAADAAOAAAAAAAMAA4AAAAAAAsADQAAAAAACwAMAA0AAAALAAwADgAAAAwADgAAAAAADAAOAAAAAAALAAwAAAAAAAsADAAAAAAACwAAAAAAAAALAAwAAAAAAAsADAAAAAAACwAMAAAAAAAMAAAAAAAAAAsADAAAAAAACwAMAAAAAAABAAIAAwAAAAEACwAMAAIAAwAGAAAAAgADAAYAAAAAAAEAAgADAAAAAQACAAMAAAABAAIAAwAAAAEAAgADAAAAAQACAAMAAAABAAIABQACAAYACAAKAAYACAAKAAAABQAHAAkAAAAFAAcACQAAAAIABQAHAAkAAgAFAAcACQAGAAgACgAAAAYACAAKAAAABQAHAAkAAAAFAAcACQAAAAIABgAIAAoAAgAGAAgACgAGAAgACgAAAAIABQAHAAkABQAHAAkAAAACAAYACAAAAAIABgAIAAAAAQACAAUABwAAAAEAAgAGAAgACgAAAAAACAAKAAAAAAAIAAoAAAAAAAgACgAAAAAABwAJAAAAAAAHAAkAAAAAAAcACQAAAAAABwAJAAAAAAAIAAoAAAAAAAgACgAAAAAABwAJAAAAAAAHAAkAAAAAAAgACgAAAAAABwAJAAAAAAAHAAkAAAAAAAcACQAAAAAACAAKAAAAAAAIAAoAAAAAAAgACgAAAAAACAAKAAAAAAAFAAcACQAAAAUABwAJAAAABgAIAAoAAAAAAAEAAgADAAEAAgADAAQAAAAMAA4AEAAMAA4AEAAAAAsADQAPAAAACwANAA8AAAAMAA4AEAASAAwADgAQABIADAAOABAAEgAMAA4AEAASAA4AEAASAAAADQAPABEAAAANAA8AEQAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAEAAgADAAAAAQACAAMAAAABAAIAAwAAAAEACwAMAAAAAQACAAUAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAABAAAAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAwAEAAAAAgADAAQAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAABIAAAAAAAAAEgAAAAAAAAANAA8AEQAAAA0ADwARAAAADgAQABIAAAASAAAAAAAAAA0ADwARAAAAEQAAAAAAAAAPABEAAAAAAA8AEQAAAAAADQAPABEAAAANAA8AEQAAAA8AEQAAAAAAEQAAAAAAAAANAA8AEQAAAA0ADwARAAAADQAPABEAAAAQABIAAAAAABAAEgAAAAAAEAASAAAAAAAOABAAEgAAAA4AEAASAAAAEQAAAAAAAAANAA8AEQAAAA8AEQAAAAAADwARAAAAAAAOABAAEgAAABAAEgAAAAAAEAASAAAAAAAOABAAEgAAAA4AEAASAAAADQAPABEAAAANAA8AEQAAABAAEgAAAAAADwARAAAAAAAOABAAEgAAAA0ADwARAAAAEgAAAAAAAAASAAAAAAAAAAgACgAAAAAADQAPABEAAAANAA8AEQAAAAMABAAAAAAAAgADAAQAAAACAAMABAAFAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAUAAgADAAQABQACAAMABAAGAAAACwANAA8AAAALAA0ADwAAAAsADAANAAAACwAMAAAAAAABAAsADAAAAAsADAAAAAAACwAMAAAAAAAMAAAAAAAAAAsAAAAAAAAAAQACAAMAAAABAAsADAACAAMABgAAAAAAAQACAAUAAgADAAUAAAAGAAgACgAAAAUABwAJAAAABgAIAAoAAAAIAAoAAAAAAAcACQAAAAAACAAKAAAAAAAHAAkAAAAAAAgACgAAAAAABQAHAAkAAAAFAAcACQAAAAEAAgADAAQACwANAAAAAAAMAA4AEAASAAwADgAQAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAAABAAIABQAAAAEAAgAFAAIAAwAEAAAABAAAAAAAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAACAAMABAAAAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAEgAAAAAADgAQABIAAAANAA8AEQAAAA4AEAASAAAADQAPABEAAAAPABEAAAAAAA0ADwARAAAADwARAAAAAAAOABAAEgAAAA0ADwARAAAAAAABAAIAAwAHAAkAAAAAAAkAAAAAAAAABwAJAAAAAAAJAAAAAAAAAAkAAAAAAAAACQAAAAAAAAAIAAoAAAAAAAoAAAAAAAAACAAKAAAAAAAKAAAAAAAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA4AEAASAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAADgAQABIAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQABQACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQABgACAAMABAAFAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAUAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAGAAIAAwAEAAYAAgADAAQABQABAAIAAwAEAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAAACwANAA8AAAALAA0ADwAAAAsADQAPAAAACwANAA8ACwANAAAAAAALAA0AAAAAAAAACwANAA8AAAALAA0AAAAAAAwADgAQAAAADAAOABAAAAAMAA4AAAAAAAwADgAQAAAACwAMAAAAAAALAAwADQAAAAsADAAAAAAACwAMAAAAAAALAAwAAAAAAAwADgAAAAAADAAOAAAAAAAMAA4AAAAAAAsADAANAAAACwAMAA0AAAAMAA4AAAAAAAsADQAAAAAACwANAAAAAAALAAwADQAAAAsADQAAAAAACwAMAA0AAAALAAwADgAAAAsADAAOAAAADAAAAAAAAAAMAAAAAAAAAAwADgAAAAAADAAAAAAAAAALAAAAAAAAAAsADAAAAAAACwAMAAAAAAALAAwAAAAAAAsADAAAAAAAAQAFAAsAAAABAAUACwAAAAEAAgADAAAAAQACAAMAAAABAAsADAAAAAEACwAMAAAAAQALAAwAAgADAAUABwACAAMABQAHAAIAAwAFAAcAAgADAAUABwAAAAEAAgAFAAAAAQACAAUAAAABAAIAAwAAAAEAAgADAAAAAQACAAUAAAABAAIABQAAAAEAAgADAAAAAQACAAMAAgAGAAgAAAAFAAcACQAAAAUABwAJAAAABQAHAAkAAAAGAAgACgAAAAUABwAJAAAABQAHAAkAAAACAAYACAAAAAIABgAIAAAABgAIAAoAAAAGAAgACgAAAAUABwAJAAAAAgAFAAcAAAAAAAEAAgAFAAAAAQACAAUAAAABAAIABQABAAIABQAHAAAAAQACAAUAAgAFAAcAAAACAAYACAAAAAEAAgADAAYACAAKAAAAAAAIAAoAAAAAAAUABwAJAAAABwAJAAAAAAAIAAoAAAAAAAgACgAAAAAABQAHAAkAAAAFAAcACQAAAAYACAAKAAAACAAKAAAAAAAHAAkAAAAAAAcACQAAAAAABwAJAAAAAAAHAAkAAAAAAAcACQAAAAAACAAKAAAAAAAIAAoAAAAAAAgACgAAAAAACAAKAAAAAAAIAAoAAAAAAAUABwAJAAAABQAHAAkAAAAFAAcACQAAAAUABwAJAAAABQAHAAkAAAAGAAgACgAAAAYACAAKAAAABgAIAAoAAAAGAAgACgAAAAYACAAKAAAABgAIAAoAAAACAAMABAAGAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAUAAQACAAMABAABAAIAAwAEAAEAAgADAAQAAQACAAMABAABAAIAAwAEAAEAAgADAAQAAgADAAQABQAMAA4AEAAAAAAADAAOABAAAAAMAA4AEAAMAA4AEAAAAAAADAAOABAADAAOABAAAAANAA8AEQAAAAsADQAPABEACwANAA8AEQALAA0ADwARAAsADQAPABEACwANAA8AEQANAA8AEQAAAAsADQAPABEACwANAA8AEQAMAA4AEAASAAwADgAQAAAADAAOABAAEgAMAA4AEAASAAwADgAQABIADAAOABAAEgAMAA4AEAAAAAwADgAQAAAADgAQABIAAAANAA8AEQAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAAAAQACAAMAAAABAAIAAwAAAAEAAgADAAAAAQACAAMAAAABAAIAAwAAAAEAAgADAAAAAQACAAMAAAABAAIAAwACAAMABgAAAAIAAwAGAAAAAAABAAIABQAAAAEAAgAFAAAAAQACAAMAAAABAAIAAwAAAAEAAgAFAAAAAQACAAUAAAABAAIABQAAAAEAAgAFAAAAAQACAAUAAAABAAIABQAAAAEAAgAFAAAAAQACAAUAAAABAAIAAwAAAAEAAgADAAAAAQACAAMAAAABAAIAAwADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAACAAMABAAAAAIAAwAEAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAAABAAAAAAAAAAEAAAAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAADgAQABIAAAAOABAAEgAAABAAEgAAAAAAEAASAAAAAAAOABAAEgAAABAAEgAAAAAADgAQABIAAAASAAAAAAAAABIAAAAAAAAAEgAAAAAAAAASAAAAAAAAAA0ADwARAAAADQAPABEAAAAOABAAEgAAAA4AEAASAAAADwARAAAAAAANAA8AEQAAAA8AEQAAAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA8AEQAAAAAAEAASAAAAAAAQABIAAAAAAA4AEAASAAAADgAQABIAAAARAAAAAAAAABEAAAAAAAAAEQAAAAAAAAARAAAAAAAAAA0ADwARAAAADQAPABEAAAANAA8AEQAAAA0ADwARAAAADgAQABIAAAAOABAAEgAAAA4AEAASAAAADwARAAAAAAAPABEAAAAAAA4AEAASAAAADQAPABEAAAANAA8AEQAAABAAEgAAAAAAEAASAAAAAAAPABEAAAAAAA4AEAASAAAADgAQABIAAAANAA8AEQAAAAAAAQACAAMABwAJAAAAAAAJAAAAAAAAAAkAAAAAAAAACQAAAAAAAAAIAAoAAAAAAAoAAAAAAAAADQAPABEAAAACAAMABAAAAAIAAwAEAAUAAgADAAQAAAADAAQAAAAAAAMABAAAAAAAAgADAAQABQAAAAwADgAQAAAADAAOABAAAAAMAA4AEAAAAAwADgAQAAAACwAMAAAAAAALAAwADQAAAAsADAAAAAAADAAOAAAAAAALAAwADQAAAAEAAgAFAAAAAQACAAUABQAHAAkAAAAGAAgACgAAAAUABwAJAAAAAAABAAIABQAIAAoAAAAAAAUABwAJAAAABwAJAAAAAAAHAAkAAAAAAAUABwAJAAAABQAHAAkAAAAGAAgACgAAAAYACAAKAAAAAAAMAA4AEAAMAA4AEAAAAA0ADwARAAAACwANAA8AEQANAA8AEQAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAQAAAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAGAAAAAgADAAYAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAIAAwAEAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAgADAAQAAAADAAQAAAAAAAIAAwAEAAAAAgADAAQAAAADAAQAAAAAAAQAAAAAAAAABAAAAAAAAAANAA8AEQAAAA4AEAASAAAADgAQABIAAAARAAAAAAAAAA8AEQAAAAAABwAJAAAAAAAJAAAAAAAAAAkAAAAAAAAAAgADAAQAAAACAAMABAAAAAIAAwAEAAUAAgADAAQABQACAAMABAAFAAIAAwAEAAYAAAALAAwADQAAAAsADAAAAAAACwAMAAAAAAALAAAAAAAAAAsAAAAAAAAACwAMAAAAAAALAAwAAAAAAAsADAAAAAIAAwAFAAAAAAABAAIABQAAAAEAAgADAAIABgAIAAAABQAHAAAAAAAFAAcAAAAAAAcACQAAAAAAAQACAAMABAAMAA4AEAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAAEAAAAAAAAAAMABAAAAAAAAAABAAIABQAEAAAAAAAAAAIAAwAEAAAAAgADAAQAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAwAEAAAAAAACAAMABAAAAAQAAAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAACAAMABAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAAAwAEAAAAAAADAAQAAAAAAAMABAAAAAAABAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABAAAAAAAAAACAAMABAAAAAMABAAAAAAABAAAAAAAAAARAAAAAAAAABEAAAAAAAAADgAQABIAAAACAAMABAAAAAIAAwAEAAAAAAABAAsADAAAAAEAAgAFAAAACwAMAAAA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TgBPAFAAUQBQAE8AUgBTAFQAVQBUAFMAVgBXAFgAWQBYAFcAWgBbAFwAXQBcAFsAXgBfAGAAYQBgAF8AYgBjAGQAZQBkAGMAZgBnAGgAaQBoAGcAagBrAGwAbQBsAGsAbgBvAHAAcQBwAG8AcgBzAHQAdQB0AHMAdgB3AHgAeQB4AHcAegB7AHwAfQB8AHsAfgB/AIAAgQCAAH8AggCDAIQAhQCEAIMAhgCHAIgAiQCIAIcAigCLAIwAjQCMAIsAjgCPAEIAQwBCAI8AkACRAE4ATwBOAJEAkgCTAJQAlQCUAJMAlgCXAJgAmQCYAJcAmgCbAD4APwA+AJsAnACdAEoASwBKAJ0AngCfAKAAoQCgAJ8AogCjAFIAUwBSAKMApAClAKYApwCmAKUAqACpAKoAqwCqAKkArACtAK4ArwCuAK0AsACxALIAswCyALEAtAC1ALYAtwC2ALUAuAC5ALoAuwC6ALkAvAC9AL4AvwC+AL0AwADBAMIAwwDCAMEAxADFAMYAxwDGAMUAyADJAMoAywDKAMkAzADNAM4AzwDOAM0A0ADRANIA0wDSANEA1ADVANYA1wDWANUA2ADZANoA2wDaANkA3ADdAN4A3wDeAN0A4ADhAOIA4wDiAOEA5ADlAOYA5wDmAOUA6ADpAOoA6wDqAOkA7ADtAO4A7wDuAO0A8ADxAPIA8wDyAPEA9AD1APYA0gD2APUA9wD4APkA+gD5APgA+wD8AP0A3AD9APwA/gD/AAABAQEAAf8AAgEDAQQBBQEEAQMBBgEHAQgBCQEIAQcBCgELAQwBDQEMAQsBDgEPARABEQEQAQ8BEgETARQBFQEUARMBFgEXARgBGQEYARcBGgEbARwBHQEcARsBHgEfASABIQEgAR8BIgEjASQBJQEkASMBJgEnASgBKQEoAScBKgErASwBLQEsASsBLgEvATABMQEwAS8BMgEzATQBNQE0ATMBNgE3ATgBOQE4ATcBOgE7ATwBPQE8ATsBPgE/AUABQQFAAT8BQgFDAUQBRQFEAUMBFwEjAUYBRwFGASMBSAFJARoBSgEaAUkBSwFMAR4BHwEeAUwBTQFHASIBIwEiAUcBTgFPAVABUQFQAU8BUgFTAVQBVQFUAVMBVgFXAVgBWQFYAVcBWgFbAVwBXQFcAVsBXgFfAWABYQFgAV8BYgFjAWQBZQFkAWMBZgFnAWgBaQFoAWcBagFrAWwBbQFsAWsBbgFvAXABcQFwAW8BcgFzAWIBYwFiAXMBdAF1AXYBdwF2AXUBeAF5AVIBUwFSAXkBegF7AXwBfQF8AXsBfgF/AYABgQGAAX8BggGDAYQBhQGEAYMBhgGHAYgBiQGIAYcBigGLAYwBjQGMAYsBjgGPAZABkQGQAY8BkgGTAZQBlQGUAZMBlgGXAZgBmQGYAZcBmgGbAZwBnQGcAZsBngGfAaABoQGgAZ8BogGjAaQBpQGkAaMB1wDVAKYBpwGmAdUAzQCoAc8AqQHPAKgBqgGrAawBrQGsAasBrgGvAbABsQGwAa8BsgGzAbQBtQG0AbMBtgG3AbgBuQG4AbcBugG7AbwBvQG8AbsBvgG/AcABwQHAAb8BwgHDAcQBxQHEAcMBxgHHAcgByQHIAccBygHLAcwBzQHMAcsBzgHPAdAB0QHQAc8B0gHTAdQB1QHWAdcB2AHZAdoB2wHaAdkB3AHdAd4B3wHgAeEB4gHjAeQB5QHkAeMB5gHnAegB6QHoAecB6gHrAewB7QHsAesB7gHvAfAB8QHwAe8B8gHzAfQB9QH0AfMB9gH3AfgB+QH4AfcB+gH7AfwB/QH8AfsB/gH/AQACAQICAgMCBAIFAgYCBwIIAgkCCgILAgwCDQIMAgsCDgIPAhACEQIQAg8CEgITAhQCFQIUAhMCFgIXAhgCGQIYAhcCGgIbAhwCHQIeAh8CIAIhAiICIwIkAiUCJgInAigCKQIoAicCKgIrAiwCLQIsAisCLgIvAjACMQIyAjMCNAI1AjYCNwI2AjUCOAI5AjoCOwI6AjkCPAI9Aj4CPwI+Aj0CQAJBAkICQwJCAkECRAJFAkYCRwJIAkkCSgJLAkwCTQJMAksCTgJPAlACUQJQAk8CUgJTAlQCVQJWAlcCWAJZAloCWwJaAlkCXAJdAl4CXwJeAl0CYAJhAmICYwJiAmECZAJlAmYCZwJoAmkCagJrAmwCbQJuAm8CcAJxAnICcwJyAnECdAJ1AnYCdwJ2AnUCeAJ5AnoCewJ6AnkCfAJ9An4CfwJ+An0CgAKBAoICgwKCAoEChAKFAoYChwKGAoUCiAKJAooCiwKKAokCjAKNAo4CjwKOAo0CkAKRApICkwKSApEClAKVApYClwKWApUCmAKZApoCmwKaApkCnAKdAp4CnwKeAp0CoAKhAqICowKiAqECpAKlAqYCpwKmAqUCqAKpAqoCqwKqAqkCrAKtAq4CrwKuAq0CsAKxArICswKyArECtAK1ArYCtwK2ArUCuAK5AroCuwK6ArkCvAK9Ar4CvwK+Ar0CwALBAsICwwLCAsECxALFAsYCxwLGAsUCyALJAsoCywLKAskCzALNAs4CzwLOAs0C0ALRAtIC0wLSAtEC1ALVAtYC1wLWAtUC2ALZAtoC2wLaAtkC3ALdAt4C3wLeAt0C4ALhAuIC4wLiAuEC5ALlAuYC5wLmAuUC6ALpAuoC6wLqAukC7ALtAu4C7wLuAu0C8ALxAvIC8wLyAvEC9AL1AvYC9wL2AvUC+AL5AvoC+wL6AvkC/AL9Av4C/wL+Av0CAAMBAwIDAwMCAwEDBAMFAwYDBwMGAwUDCAMJAwoDCwMKAwkDDAMNAw4DDwMOAw0DEAMRAxIDEwMSAxEDFAMVAxYDFwMWAxUDGAMZAxoDGwMaAxkDHAMdAx4DHwMeAx0DIAMhAyIDIwMiAyEDJAMlAyYDJwMmAyUDKAMpAyoDKwMqAykDLAMtAy4DLwMuAy0DMAMxAzIDMwMyAzEDNAM1AzYDNwM2AzUDOAM5AzoDOwM6AzkDPAM9Az4DPwM+Az0DQANBA0IDQwNCA0EDRANFA0YDRwNGA0UDSANJA0oDSwNKA0kDTANNA04DTwNOA00DUANRA1IDUwNSA1EDVANVA1YDVwNWA1UDWANZA1oDWwNaA1kD6gJcA6cCXQOnAlwDSgNeAy8DXwMvA14DYANhA9cCYgPXAmEDtgJjA1sDZANbA2MDNgNlA8sCZgPLAmUDDgNnA/MCaAPzAmcDaQNqA2sDbANrA2oDbQNuA9sCbwPbAm4DxgJwA58CcQOfAnADQgNyA3MDdANzA3IDdQN2A3cDeAN3A3YDeQPDAnoDwQJ6A8MCewN8A30DfgN9A3wDfwOAA4EDggODA4QDhQOGA4cDiAOrAokDigOLA4wDjQOMA4sDjgOPA5ADkQOSA5MDlAOVA5YDlwOWA5UDmAOZA5oDmwOaA5kDnAOdA54DnwOeA50DoAOhA6IDowOiA6EDpAOlA6YDpwOmA6UDqAOpA6oDqwOqA6kDrAOtA64DrwOuA60DsAOxA7IDswOyA7EDtAO1A7YDtwO2A7UDuAO5A7oDuwO6A7kDvAO9A74DvwO+A70DwAPBA8IDwwPCA8EDxAPFA8YDxwPGA8UDyAPJAz8DPgM/A8kDygPLA8wDzQPOA88D0APRA9ID0wPUA9UD1gPXA7MCsgKzAtcDFQPYAxcD2QMXA9gD2gPbA0cDRgNHA9sD3APdA94DuQLfA7sC4APhA+ID4wPkA+UD5gPnA6MCogKjAucDBQPoAwcD6QPqA+sD7APtA+4D7wPuA+0DvgLwA/ED8gPxA/AD8wP0A/UD9gP3A/gD+QP6A/sD/AP9A/4D/wMABAEEAgQBBAAEAwQEBAUEBgQFBAQEBwQIBAkECgQLBAwEDQQOBA8EEAQRBBIEEwQUBBUEFgQVBBQEFwQYBBkEGgQZBBgEGwQcBB0EHgQdBBwEHwQgBCEEIgQhBCAEIwQkBCUEJgQlBCQEJwQoBCkEKgQpBCgEKwQsBC0ELgQtBCwELwQwBDEEMgQxBDAEMwQ0BDUENgQ1BDQENwQ4BDkEOgQ5BDgEOwQ8BD0EPgQ9BDwEPwRABEEEQgRBBEAEQwREBEUERgRFBEQERwRIBEkESgRJBEgESwRMBE0ETgRNBEwETwRQBFEEUgRRBFAEUwRUBFUEVgRVBFQEVwRYBDsEWQQ7BFgEWgRbBFwEXQRcBFsEXgRfBBMEYAQTBF8EYQRiBFsEYwRbBGIEZARlBDMEZgQzBGUEGwRnBGgEXwRoBGcEaQRqBFcEWARXBGoEawRsBEsEbQRLBGwEbgRvBFQEcARUBG8EcQRyBHMEdARzBHIEAAACAHUEdgR1BAIAdwR4BAUABwAFAHgEeQR6BAkACwAJAHoEewR8BA0ADwANAHwEfQR+BBEAEwARAH4EFAB/BBUAgAQVAH8EVgQYAIEEGQCBBBgAggSDBBwAGgAcAIMEXQQgAIQEIQCEBCAAhQSGBCMAJQAjAIYEKQCiAygAhwQoAKIDLQCmAywAiAQsAKYDMQCJBDAAigQwAIkENQCqAzQAiwQ0AKoDOQCuAzgAjAQ4AK4DPQCyAzwAjQQ8ALIDQQC2A0AAjgRAALYDRQC6A0QAjwREALoDSQCQBEgAAwRIAJAETQC+A0wAkQRMAL4DUQDCA1AAkgRQAMIDVQDGA1QAkwRUAMYDWABZAJQElQSUBFkAXABdAJYElwSWBF0AYQCYBGAAmQRgAJgEZABlAJoEmwSaBGUAaABpAJwEnQScBGkAbABtAJ4EnwSeBG0AcABxAKAEoQSgBHEAdAB1AKIEowSiBHUAeAB5AKQEpQSkBHkAfAB9AKYEpwSmBH0AgACBAKgEqQSoBIEAhACFAKoEqwSqBIUAjgBCAIcAiQCHAEIAjACNAKwErQSsBI0AkgCUAI8AQwCPAJQAmACuBJEATwCRAK4EmgA+AJMAlQCTAD4AmACZAK4ErwSuBJkAsASxBJsAPwCbALEEngCgAJ0ASwCdAKAAsgRGAJ8AoQCfAEYAjACsBKMAUwCjAKwEswQqAKcApgCnACoAqQC0BKsAtQSrALQEtgS3BKwArQCsALcEuASxALkEsAC5BLEAtgC3ALoEuwS6BLcAvAS4AL0EugC9BLgAvgC/AL4EvwS+BL8AygDLAMAAwQDAAMsAzgDPAMYAxADGAM8AwATJAMEEyADBBMkAwgSsAcwAzQDMAKwB0QDQAKQBogGkAdAAwwTEBNQA1QDUAMQE2gDFBNgAxgTYAMUE3gDfAMcExQTHBN8A4gDIBOAAyQTgAMgEygTkAMgE5gDIBOQA6QDLBOsAwATrAMsE7gDMBOwA0wDsAMwEzQTOBPAA8QDwAM4EzwT0ANAE9gDQBPQAxwT3AN4A+QDeAPcA0QTSBPsA/AD7ANIE0wQBAdQE/wDUBAEB1QQCAdYEBAHWBAIBBwETAQkB1wQJARMBCwHYBA0B2QQNAdgEEQF2BBAB2gQQAXYEEwESAdcE2wTXBBIBFgElARcBIwEXASUB3ARIARwBGgEcAUgBIAHdBB4B3gQeAd0EJAHfBCIB4AQiAd8EPAE9ASgBJgEoAT0B4QTiBCoBKwEqAeIENgEuATcBMAE3AS4B4wQ0AeQENQHkBDQB5QTmBDkBOAE5AeYE5wToBDoBOwE6AegE6QQ+AeoEQAHqBD4BLwFCATEBRAExAUIBFwFGARkB6wQZAUYBGwEaAewESgHsBBoBTAFLAS8BQgEvAUsBRwFNAekEPgHpBE0B7QTuBE4BTwFOAe4EUgFUAWkBaAFpAVQBVgHvBFcB8ARXAe8EbQFcAWwBXQFsAVwBhwFeAfEEYAHxBF4BYgFkAfIE8wTyBGQBZgH0BGcBdwFnAfQE9QT2BGoBawFqAfYE9wT4BG4BbwFuAfgEcgH5BHMB+gRzAfkE+wT8BHQBdQF0AfwEeAH9BHkB/gR5Af0EegF/AXsB9gR7AX8BfwF+AfYEawH2BH4BPQGCASYBhAEmAYIBiAE7AYYB6ASGATsBDgGMAf8EjQH/BIwBAAWRAQEFjwEBBZEBAgWVAQMFkwEDBZUBEAHaBJkBmAGZAdoEBAUFBZoBmwGaAQUFBgV9Ap4BnwGeAX0CowEHBaUBCAWlAQcFCQUKBacBpgGnAQoFqAELBakBDAWpAQsFqwENBa0BDgWtAQ0FrwEPBbEBEAWxAQ8FqQEMBbMBtQGzAQwFuAERBbYBEgW2AREFvQG+AbwBwAG8Ab4BvwHDAcEBEwXBAcMBwwHCARMFFAUTBcIByAHJARUFcgQVBckBFgUXBcoBywHKARcFGAUZBc4BzwHOARkF0wEaBRsFHAUbBRoFHQUeBR8FIAXYASEFIgUjBSQF4QElBSYF4wEnBeUBKAXlAScFKQUqBSsF6AEsBeYB7AHtAS0FLgUtBe0B8AEvBe4BMAXuAS8FMQUyBTMF9AE0BfIB9wE1BfkBNgX5ATUFNwU4BfoB+wH6ATgFOQU6BTsFAwI7BToFPAU9BT4FPwUJAkAFDAINAkEFQgVBBQ0CQwVEBQ4CRQVGBUcFSAUSAkkFFAJJBRICSgVLBUwFTQVOBRkCTwVQBVEFUgUfAlMFVAVVBSACVgVXBVgFJwJZBSkCWgUpAlkFLAJbBSoCXAVdBV4FXwVgBWEFYgVhBWAFNQJjBTcCZAU3AmMFZQU4AmYFOgJmBTgCPgI/AmcFaAVpBWoFQgJrBUACbAVtBW4FbwVEAnAFcQVyBXMFdAV1BXYFdwVNAngFeQV6BU4CTwJOAnoFewV8BX0FUwJSAn4FfwWABYEFggWDBYQFXgJfAoUFhgWHBYgFiQWKBWACYQJgAooFiwWMBY0FaAKOBY8FkAWRBZIFkwWUBZUFlgWXBZgFmQVxApoFeAJ0AnkCdgJ5AnQCegJ7ApsFnAWbBXsCnQV8Ap4FfgKeBXwCnwWAAqAFggKgBYAChgKhBYQCDAGEAqEFCQHXBIgCiQKIAtcEDQHZBIwCjQKMAtkECAGQAqIFkgKiBZACowWUAqQFlgKkBZQC2wSlBZgCmQKYAqUFxALGAp0CnwKdAsYCoQLgAqMC4gKjAuAC6ALqAqUCpwKlAuoCpgWnBagCqQKoAqcFrQKwAq8CsgKvArACsQJUA7MCVgOzAlQD1ALWArUCtwK1AtYCAAMCA7gCuQK4AgIDTANOA70CvwK9Ak4DqAWpBcACwQLAAqkF2ALaAsUCxwLFAtoCNAM2A8kCywLJAjYDqgXOAqsFzwKrBc4C0QKqAtMCqwLTAqoCrAVgA9UC1wLVAmADrQVtA9kC2wLZAm0D3QKuBd8CrwXfAq4F4QL+AuMC/wLjAv4CsAXmArEF5wKxBeYCsgWzBekC6wLpArMFtAW1BewC7QLsArUFDAMOA/EC8wLxAg4DGAMaA/UC9wL1AhoDtgW3BfgC+QL4ArcFOgM7A/wC/QL8AjsDAQNEAwMDRgMDA0QD7gLvAgQDBQMEA+8C5AIKA+UCCwPlAgoDyALKAg0DDwMNA8oCEQOgAhMDogITA6AC+gL7AhQDFQMUA/sCLAMuAxkDGwMZAy4DuAXPAxwDHQMcA88DIQMGAyMDBwMjAwYDuQUmA7oFJwO6BSYDKQMWAysDFwMrAxYDSANKAy0DLwMtA0oDHgMfAzADMQMwAx8DWANaAzUDNwM1A1oDugK7AjgDOQM4A7sCPQMgAz8DIgM/AyADnAKeAkEDQwNBA54CRQMoA0cDKgNHAygDpAKmAkkDSwNJA6YCuwW8BU0DTwNNA7wFUQO9BVMDvgVTA70FVQMyA1cDMwNXAzIDtAK2AlkDWwNZA7YCpgKnAr8FXQO/BacCLgMvA8AFXwPABS8D1gLXAsEFYgPBBdcCWgNbA8IFZAPCBVsDygLLAsMFZgPDBcsC8gLzAsQFaAPEBfMCvAVrA8UFbAPFBWsD2gLbAsYFbwPGBdsCngKfAscFcQPHBZ8CswVzA8gFdAPIBXMDdgN1A8kFygXLBcwFegPNBXkDzgV5A80FfAPPBX4D0AV+A88FgwPRBdIF0wXUBdUF1gXXBdgF2QWIA9oFiwOKA0gF2wXcBd0FkgMYAt4FTgXeBRgC3wXgBeEFUgWXAx8CmgPiBZgD4wXkBeUF5gXnBegF6QWfAyEFhwSiA+oFowPqBaIDiASmA+sFpwPrBaYDiwSqA+wFqwPsBaoDjASuA+0FrwPtBa4DjQSyA+4FswPuBbIDjgS2A+8FtwPvBbYDjwS6A/AFuwPwBboDkQS+A/EFvwPxBb4DkgTCA/IFwwPyBcIDkwTGA/MFxwPzBcYD9AX1BfYF9wX4BcgDzgP5BfoF+wX6BfkF/AX9Bf4F/wX+Bf0FAAYBBgIGAwYEBtYD2AMFBtkDBgYHBggG2wPaA4sFjAWLBdoD3wNsAgkGlAUJBmwCCgZxAgsGmQULBnECDAYNBg4GiQV+BeYD6ANbBQ8GEAYRBhIGYAPuA2ED7wNhA+4DbQPxA24D8gNuA/EDEwYUBhUGFgYVBhQG/QM0BRcGGAYXBjQFqAMBBKkDAgSpAwEEvAMFBL0DBgS9AwUECwQZBhoGGwYcBh0GEQQeBh8GZQUgBnAFIQZeBBUEEwQVBF4EGQQiBhcEYQQXBCIGHQQjBhsEZwQbBCMGHwQkBiAEJQYgBCQGIwQmBiQEJwYkBCYGKgQoBCIEIQQiBCgELQQuBE8EUARPBC4ELwQoBjAEKQYwBCgGKgZkBDUEMwQ1BGQEOQQ6BCsGLAYrBjoELQZXBD0EOwQ9BFcEbgQ/BC4GQQQuBj8ERQRGBC8GMAYvBkYERwQaBEgEGARIBBoEMQZrBE0ESwRNBGsEMgYzBlIEUQRSBDMGPwRuBFMEVARTBG4EOwRZBDwENAY8BFkEFwRhBFoEWwRaBGEEEwRgBBQENQYUBGAEYwQ2BlsEXQRbBDYGZgQ3BjMENAQzBDcGHAQbBDgGaAQ4BhsEJAQnBmoEWARqBCcGbQQ5BksETARLBDkGcAQ6BlQEVgRUBDoGcQQ7BnIEFQVyBDsGAgADBXYE2gR2BAMF9wQ8BgUAdwQFADwGPQZ5BPkECQD5BHkE/AR7BD4GDQA+BnsE/gR9BD8GEQA/Bn0EFABABn8EQQZ/BEAGgQQZAEIGQwZCBhkAHABEBoIERQaCBEQGhAQhAMABvAHAASEAIwAUBYUERgaFBBQFKQBHBqIDoAOiA0cGLQBIBqYDpAOmA0gGMQBJBokESgaJBEkGNQBLBqoDqAOqA0sGOQBMBq4DrAOuA0wGPQBNBrIDsAOyA00GQQBOBrYDtAO2A04GRQBPBroDuAO6A08GSQBQBpAEUQaQBFAGTQBSBr4DvAO+A1IGUQBTBsIDwAPCA1MGVQBUBsYDxAPGA1QGVQZWBlkAlQRZAFYGVwZYBl0AlwRdAFgGWQZaBmEAmARhAFoGmwRlAFsGXAZbBmUAXQZeBmkAnQRpAF4GXwZgBm0AnwRtAGAGYQZiBnEAoQRxAGIGYwZkBnUAowR1AGQGZQZmBnkApQR5AGYGZwZoBn0ApwR9AGgGaQaWAIEAqQSBAJYAagaKAIUAqwSFAIoAogSOAGsGhwBrBo4AkABOAI0ArQSNAE4AZAaSAKMEjwCjBJIAlgCYAKkEkQCpBJgAoASaAGwGkwBsBpoAnABKAJkArwSZAEoAYgawBKEEmwChBLAEaAaeAKcEnQCnBJ4ApASyBG0GnwBtBrIEigCMAKsEowCrBIwAlgSzBG4GpwBuBrMEbwa0BHAGqQBwBrQEcQa2BHIGrAByBrYEsABzBrkEdAa5BHMGqwC1BLcAuwS3ALUEtwS9BK0AugCtAL0EvwCxAL8EuAS/BLEAwAB1BsoAdgbKAHUGdwbOAHgGxgB4Bs4AyAB5BsEEegbBBHkGegbCBHsGzAB7BsIE0ADWAKIB1wCiAdYA1AB8BsMEfQbDBHwGfgbHBNoAxQTaAMcExQTfAMYEfwbGBN8AyATiAMoEgAbKBOIA0ATJBOYAyATmAMkE2ADGBOkAywTpAMYE4ADJBO4AzATuAMkEzQTwAIEGggaBBvAAyQTQBMwE9gDMBNAE/QDcAPkA3gD5ANwAgwbRBIQG+wCEBtEE1AT/AIUGhgaFBv8AhwaIBgQB1gQEAYgGEwEHARUBiQYVAQcBigbYBIsGCwGLBtgEjAZ1BBEBdgQRAXUEEgGNBtsEpQXbBI0GjgaPBhYBJQEWAY8GHAGQBtwEkQbcBJAG3QQgAZIGkwaSBiABlAaVBiQB3wQkAZUGlgY8AZcGKAGXBjwBKgGYBuEEmQbhBJgGNwEwAZoGmwaaBjAB5AQ1AZwGnQacBjUBOQGeBuUEnwblBJ4GOgGgBucEoQbnBKAGQAGiBuoEoQbqBKIGMQFEAaMGpAajBkQBRgGlBusEpgbrBKUG7ARKAeMENAHjBEoBSwGnBkIBQwFCAacGTQGoBj4BPwE+AagGqQbtBKoGTgGqBu0EVAGrBmgBrAZoAasG7wRWAa0GrgatBlYBbAFdAa8GsAavBl0B8QRgAbEGsgaxBmABZAGzBvMEtAbzBLMG9ARmAbEGtQaxBmYBtAb1BLYGagG2BvUEbgG3BvcEPAb3BLcGuAY9BnIB+QRyAT0GdAG5BvsEugb7BLkGuwa8BngB/QR4AbwGvQaBAXoBfwF6AYEBfgG+BmsBbQFrAb4GJwEmAb8GhAG/BiYBggE9AYgBOwGIAT0BfQL/BJ8BjQGfAf8EAgUBBZUBjwGVAQEFAwWTAdoEmAHaBJMBDgEQAYwBmQGMARABkQEABZoBBAWaAQAFBgWeAcAGwQbABp4BowGmAQcFCgUHBaYBpwHCBgkFwwYJBcIGrQEOBagBCwWoAQ4FqwGuAQ0FsAENBa4BxAbFBq8BDwWvAcUGzwCpAcQAswHEAKkBuwG6AbgBEQW4AboBxgbHBr0BvgG9AccGyAbFAb8BwwG/AcUByQZGBsIBFAXCAUYGyQHKBnIEdARyBMoGywYWBcwGygHMBhYFzgUYBc0GzgHNBhgFzgbPBtAGGgXTAckF0QbSBucF6QUhBdMG3AHUBtUGGQUiBc8BGwUcBeMBJwXjARwF1gbXBtgGLAXoASAF7QHZBi4FIwUuBdkG5QEoBfABLwXwASgFNAX0ARgG5gEYBvQB7AEtBfcBNQX3AS0F+gHuATcFMAU3Be4B2gbbBtwGOwXyATkF3QbeBgQCQAXfBjYFDQL7AUIFOAVCBfsB4AbhBuIGDgIDAkMFSQUUAj8FCQI/BRQCGQIMAk0FQQVNBQwC4wbkBuUGRAVTBQ8C+wXmBucGVwXoBukG6gbrBuwGWQUnAvgF7QbuBu8G8AZbBfEG8gZWBfMGVQX0BiECKQJaBTUC9Qb2BvcGKgL4BjoCZgU6AvgG+QYzAvoGYAX7BmIFNwJkBUICawVCAmQFHgZIAvwGOAJlBUYCPgJnBUsC/Qb+Bv8GTgJAAnkFAAcBBwIHbwUDB0QCBAcFBwYHTQJ3BVgCBwdYAncFXwJPAggHegUIB08CfgWJBVMCYAJTAokFCQdmAoIFgQUKB2gClQVeApMFhQWTBV4CcAJhApoFCwcMBw0HeQJ2AgAFDgcABXYCAgWcBQEFewIBBZwFngV+Ap8FgAKfBX4CoAWCAg8HEAcPB4ICoQWGAqMFlAKjBYYCiAKQAgkBCAEJAZACDAENAYQCjAKEAg0BogWSAhEHEgcRB5ICpQWkBZkClgKZAqQF1wTbBIkCmAKJAtsEnQITB8QCFAfEAhMH4AKhAhUHFgcVB6EC6AKlAhcHGAcXB6UCqAIZB6YFGgemBRkHGwccB60CsAKtAhwHVAOxAh0HHgcdB7EC1AK1Ah8HIAcfB7UCIQcAAyIHuAIiBwADvQIjB0wDJAdMAyMHJQeoBSYHwAImB6gF2ALFAicHKAcnB8UCyQIpBzQDKgc0AykHzwIrB6sFLAerBSsHLQcuB9ECqgLRAi4HrAXVAi8HMAcvB9UCrQXZAjEHMgcxB9kCMwc0B90CrgXdAjQHNQc2B+EC/gLhAjYH5wI3B7EFOAexBTcHsgXpAjkHOgc5B+kCOwe0BTwH7AI8B7QFDAPxAj0HPgc9B/EC9QI/BxgDQAcYAz8HQQe2BUIH+AJCB7YFQwc6A0QH/AJEBzoDRQdGBwEDRAMBA0YHRwfuAkgHBANIB+4C5QILA0kHSgdJBwsDyAINA0sHTAdLBw0DTQdOBxEDoAIRA04HTwf6AlAHFANQB/oCGQNRBywDUgcsA1EHUwe4BVQHHANUB7gFVQdWByEDBgMhA1YHJwNXB7oFWAe6BVcHWQdaBykDFgMpA1oHLQNbB0gDXAdIA1sHXQceA14HMANeBx4DNQNfB1gDYAdYA18HYQe6AmIHOANiB7oCIAM9A2MHZAdjBz0DQQNlB5wCZgecAmUHKANFA2cHaAdnB0UDpAJJA2kHagdpB0kDTQNrB7sFbAe7BWsHbQduB1EDvQVRA24HbwdwB1UDMgNVA3AHWQNxB7QCcge0AnEHvwVdA1YAVwBWAF0DwAVfA1oAWwBaAF8DwQViA2IAYwBiAGIDwgVkA2YAZwBmAGQDwwVmA2oAawBqAGYDxAVoA24AbwBuAGgDxQVsA3IAcwByAGwDxgVvA3oAewB6AG8DxwVxA34AfwB+AHEDyAV0A4IAgwCCAHQDdQNzB3QHdQd2B3cHegN4B80FeQfNBXgHegd7B3wDzwV8A3sH1QV8B30Hfgd/B4MDgAeBB9YFggeGA4MHigOEBxIChQeGB4cHkgOIBxgCFgIYAogHiQcdApUDHwKVAx0CigeLB+AGQwU6BZoDjAfXBuYFHgWNB44H6gWjA48HkAePB6MD6wWnA5EHkgeRB6cD7AWrA5MHlAeTB6sD7QWvA5UHlgeVB68D7gWzA5cHmAeXB7MD7wW3A5kHmgeZB7cD8AW7A5sHnAebB7sD8QW/A50HngedB78D8gXDA58HoAefB8MD8wXHA+QCCgPkAscDyAOhB/cFogf3BaEHzgOjB/kFpAf5BaMHpQemB/wF/QX8BaYH1gOnBwMGqAcDBqcHqQeqB9gDqwesB60H2gOuB4wFrweMBa4H3wOwB2wCagJsArAHsQdzAgoGcQIKBnMC5gOyB4kFigWJBbIHswf4BugDtAe1B7YHYQPvA7cHuAe3B+8DbgPyA7kHuge5B/IDEwa7BxQGvAcUBrsH/QO9BzQFvgc0Bb0HqQMCBKoFzgKqBQIEvQMGBLkFJgO5BQYEvwfABx0GwQcdBsAHwgfDB3AFbwVwBcMHxAchBsUHFQTFByEGIgYZBMYHxwfGBxkEyAfGBx0EIwYdBMYHyQckBsoHHwTKByQGywfMByMEJgYjBMwHKATNByEEzgchBM0HzwfQBy4EUAQuBNAHKAYvBNEH0gfRBy8E0wcqBtQHNQTUByoGOgTVBywG1gcsBtUH0wctBtcHPQTXBy0GLgZBBNgH2QfYB0EE2gfJB0YEMAZGBMkHGgRHBNsH3AfbB0cE3QcxBt4HTQTeBzEGUgTfBzIG1gcyBt8HUwTgBz8EQAQ/BOAH4QfiB1kENAZZBOIHWgTjBxcEGAQXBOMH5AflB2AENQZgBOUH5gfnB2MENgZjBOcH6AfpB2YENwZmBOkHOAZoBCkE6gcpBGgE6wcmBGoEJARqBCYE7AfGAW0EOQZtBMYB7QfLBnAEOgZwBMsGOwZxBO4H7wfuB3EEAgUDBQMAAgADAAMF+AT3BAQABQAEAPcE+QQJAPoECAD6BAkAvAY+BgwADQAMAD4G8Ac/BhAAEQAQAD8GFAAPAEAGfARABg8AFwDxBxkAQwYZAPEHHAAdAEQG8gdEBh0AHwC6ASEAvAEhALoBIwAiABQFEwUUBSIA8wdHBicAKQAnAEcG9AdIBisALQArAEgGpABJBi8AMQAvAEkGMwD1BzUASwY1APUH9gdMBjcAOQA3AEwG9wdNBjsAPQA7AE0GsQROBj8AQQA/AE4GlABPBkMARQBDAE8GiABQBkcASQBHAFAGoABSBksATQBLAFIGrgRTBk8AUQBPAFMGrARUBlMAVQBTAFQGVwD4B1kAVQZZAPgHWwD5B10AVwZdAPkHXwD6B2EAWQZhAPoHYwC3B2UAXAZlALcHZwD7B2kAXQZpAPsHawD8B20AXwZtAPwHbwD9B3EAYQZxAP0HcwD+B3UAYwZ1AP4HdwD/B3kAZQZ5AP8HewC5B30AZwZ9ALkHfwAACIEAaQaBAAAIgwABCIUAagaFAAEIZgZrBoYAhwCGAGsGqASQAIsAjQCLAJAAogSjBI4AjwCOAKMEqASpBJAAkQCQAKkEZAZsBpIAkwCSAGwGpgScAJcAmQCXAJwAoAShBJoAmwCaAKEEpgSnBJwAnQCcAKcEaAZtBp4AnwCeAG0GqgSrBKIAowCiAKsEWgZuBqUApwClAG4GAghwBqgAqQCoAHAGcgasAAMIrgADCKwAsgAECLAAcwawAAQIqgCrALUAtwC1AKsArQC6AK8AuwCvALoAvQCzAL8AsQC/ALMAwgAFCMAAdQbAAAUIBgh4BscAxgDHAHgGygB2BsgAeQbIAHYGewbMAHcGzgB3BswA0gD1ANAA1gDQAPUA1gD1ANQAfAbUAPUA2gDbAH4G0wR+BtsA3QAHCN8AfwbfAAcI4gDjAIAGCAiABuMA5wDPBOYA0ATmAM8E6QDoANgA2QDYAOgA7gDvAOAA4QDgAO8A8ADyAIIGfQaCBvIAzAT2ANMA0gDTAPYACQj9APoA+QD6AP0ACQiEBv0A+wD9AIQGCgiGBv4A/wD+AIYGCwiHBgUBBAEFAYcGBgEMCAcBiQYHAQwICwEKAYsGDQiLBgoBjAYRAQ4IDwEOCBEBDwiNBhQBEgEUAY0GFgEYAY4GEAiOBhgBHQERCBwBkAYcAREIkwYgARIIIQESCCABjwaUBiUBJAElAZQGEwiXBikBKAEpAZcGLAEUCCoBmAYqARQIMAExAZsGowabBjEBNQEzAZ0GEwidBjMBOQE3AZ4GmgaeBjcBPAGWBjoBoAY6AZYGQAFBAaIGFQiiBkEBRQEUCEQBpAZEARQIRgFHAaUG6QSlBkcBSQEyAUoBNAFKATIBpwZLAd4EHgHeBEsBqAZNAeAEIgHgBE0BFgiqBlABTgFQAaoGVAFVAasGFgirBlUBWAEXCFYBrgZWARcIWwEXCF0BsAZdARcIYQEYCGABsgZgARgIZAFlAbMGGQizBmUBaAGsBmYBtQZmAawGtgZqAa8GbAGvBmoBbgFwAbcGWQG3BnABcgFiAbgG8gS4BmIBdAF2AbkGGgi5BnYBeAFSAbsGaQG7BlIBvQZ6ARsIfAEbCHoBgAEcCH4BvgZ+ARwIvwaEAVEBhQFRAYQBiAGJAYIBgwGCAYkBiwGhAY0BnwGNAaEBlAGVAY4BjwGOAZUBlgGYAZIBkwGSAZgBlwGKAZkBjAGZAYoBmgGcAZEBkAGRAZwBngGgAcEGHQjBBqABogHXAKMBpgGjAdcA1QDEBKcBwganAcQErAGtAc0AqAHNAK0BqgEeCKsBrgGrAR4IHgjEBq4BrwGuAcQGxQDEALIBswGyAcQAuAG5AbsBHwi7AbkBuwEfCL0Bxga9AR8IvwG+AcgGxwbIBr4BwgHEAckGIAjJBsQBxwHnB8kBygbJAecHzAHpB8oBzAbKAekH0AF7B84BzQbOAXsHeQchCNIB0wHSASEIIggjCCQIJQjTBtsBJQXgASYI0QHPAScI1AEbBeIB4wHiARsF6AHpAdgB2QHYAekB6wEoCO0B2QbtASgI8AHxAeUB5AHlAfEBKQgqCCsI5wHmAfUB6gHsAfYB9wH2AewB/AHvAfoB7gH6Ae8B8gE7BfMBAgLzATsFPAUsCC0ILgjdBgYCCwL9AQ0C+wENAv0BAwIOAgECEAIBAg4CFAIVAgkCBwIJAhUCFwIKAhkCLwgwCDEIHgIRAjIIDwIyCBECMwg0CFcFNQggAjYIpAc3CCYCOAg5CDoILAItAvEGogfxBi0CYQU7CCUCIwIlAjsIKAIpAjQCNQI0AikCOgI7AioCKwIqAjsCPQI8CD8CYgU/AjwIQgJDAjcCNgI3AkMCRgI9CDgCPgg/CEAIPAI+AkoCSwJKAj4CUAJBAk4CQAJOAkECRAJSAkUCQQhCCH0FQwhECEUIRgh2BUcIXQJRAl8CTwJfAlECUwJgAkgIYgJICGACZgJJCIMFWwJZAkoIawJcApUFXgKVBVwCcgJjAnACYQJwAmMCdgJ3Ag4HSwgOB3cCeQIABXsCAQV7AgAFfgJ/AoACgQKAAn8CDggQB4MCggKDAhAHhgKHApQClQKUAocCkAKIApECigKRAogChAKMAoUCjgKFAowCkgKTAhIHTAgSB5MClgKXApkCmwKZApcCiQKYAosCmgKLApgCnAJmB50CEwedAmYHTgcWB6ACoQKgAhYHpQKkAhgHaQcYB6QCGQeoAi4HqgIuB6gCTQgbB6wCrQKsAhsHHAceB7ACsQKwAh4HtQK0AiAHcgcgB7QCIge4AmEHugJhB7gCvAJOCL0CIwe9Ak4IJgfAAk8IwgJPCMACxQLEAigHFAcoB8QCyAJLB8kCKQfJAksHzQJQCM8CKwfPAlAI0QLQAi0HUQgtB9AC1QLUAjAHHwcwB9QC2QLYAjIHJwcyB9gCUggzB9wC3QLcAjMHFQc1B+AC4QLgAjUH5QJJB+cCNwfnAkkH6QLoAjoHFwc6B+gC7gJHB+wCPAfsAkcH8QLwAj4HUwg+B/AC9AJUCPUCPwf1AlQI+gJPB/gCQgf4Ak8HRAf8AjYH/gI2B/wCIQdFBwADAQMAA0UHSAcEA1YHBgNWBwQDCwMJA0oHVQhKBwkDDQMMA0wHPQdMBwwDVghNBxADEQMQA00HUAcUA1oHFgNaBxQDGANABxkDUQcZA0AHHgNdBxwDVAccA10HYwdVByADIQMgA1UHJQNXCCcDVwcnA1cIZwdZBygDKQMoA1kHLANSBy0DWwctA1IHXgcwA3AHMgNwBzADNAMqBzUDXwc1AyoHOgNDBzgDYgc4A0MHWAhkBzwDPQM8A2QHQANZCEEDZQdBA1kIRgdoB0QDRQNEA2gHSQNIA2oHXAdqB0gDTAMkB00DawdNAyQHWghtB1ADUQNQA20HHQdvB1QDVQNUA28HWANgB1kDcQdZA2AHXAP4B10DVwBdA/gHXgP5B18DWwBfA/kHYQO3B2IDYwBiA7cHYwP7B2QDZwBkA/sHZQP8B2YDawBmA/wHZwP9B2gDbwBoA/0HagP+B2wDcwBsA/4HbgO5B28DewBvA7kHcAMACHEDfwBxAwAIcgMBCHQDgwB0AwEIWwhcCF0Icwd1A14IqQV4B8ECXwhgCGEIYghjCGQIfAN7A3oHZQhmCGcIaAh+B4IDaQhqCGsIiQOpAmwIjAPSAooDbQhuCG8IcAiIB5EDcQhyCHMIdAh1CHYIlQOUA4kHmgObA0MFRAVDBZsDdwh4CJwDnQOcA3gIoQOwBaMDkAejA7AFpQN5CKcDkgenA3kIqQOqBasDlAerA6oFrQN6CK8DlgevA3oIsQN7CLMDmAezA3sItQN8CLcDmge3A3wIuQN9CLsDnAe7A30IvQO5Bb8Dnge/A7kFwQN+CMMDoAfDA34IxQMIA8cDCgPHAwgDPwMiA8gDoQfIAyIDfwijB80DzgPNA6MHHwOlBzED/AUxA6UHgAiBCAEGpwfWA1YD+wKpBxUDrAeCCIMIRwMqA9oDrgfaAyoDAgOwB7kC3wO5ArAHOwOxB/0CCgb9ArEHhAiFCA0GsgfmA+IChgiHCIgItQeJCIoI7QOLCO8DuAfvA4sI8AN2APIDugfyA3YAjAiNCI4IEwaPCLsHkAiRCJII/QP8A70HAATMAgIEzgICBMwCBAQkAwYEJgMGBCQDkwiUCAoECQSVCJYIlwiYCBAEDwSZCJoIFQQWBMUHmwjFBxYEGQQaBMcH2wfHBxoEHQQeBMgHnAjIBx4EIQTOBx8EygcfBM4HywcjBJ0IJQSdCCMEJwSeCCgEzQcoBJ4ILgQsBM8HnwjPBywEMQSgCC8E0gcvBKAI1Ac1BKEINgShCDUEOAShCDoE1Qc6BKEIPQQ+BNcHoAjXBz4EQQRCBNkHogjZB0IEnAjaB0QERgREBNoHSQSbCEcE3AdHBJsITQROBN4HowjeB04EUgRQBN8H0AffB1AEVQSkCFME4AdTBKQIJwbhB1gEWQRYBOEHXAQkAFoE4wdaBCQAZwTkB18EYARfBOQHYwRiBOYHQwTmB2IEZgRlBOgHFgDoB2UE6gdoBF4EXwReBGgENwTrB2kEagRpBOsHbQRsBOwHHgDsB2wEcARvBO0HKwTtB28EcwQvBnEE7wdxBC8GAAUOBwQFpQgEBQ4HeQSmCHoEpwh6BKYIdwSoCHgEqQh4BKgIqgirCKcIegSnCKsIewSsCHwErQh8BKwIfQSuCH4Erwh+BK4IgwSCBLAIsQiwCIIEVQRWBLIIgQSyCFYEswi0CLUItgi1CLQIXARdBLcIhAS3CF0E8we4CEcGuQhHBrgI9Ae6CEgGuwhIBroIpgC8CKQASQakALwI9Qe9CEsGvghLBr0I9ge/CEwGwAhMBr8I9wfBCE0GwghNBsEIsQTDCE4GxAhOBsMIlACVAE8GxQhPBpUAiACJAFAGxghQBokAoAChAFIGxwhSBqEArgSvBFMGyAhTBq8ErAStBFQGyQhUBq0E+AfKCFUGywhVBsoI+QfMCFcGzQhXBswI+gfOCFkGzwhZBs4Itwe4B1wG0AhcBrgH+wfRCF0G0ghdBtEI/AfTCF8G1AhfBtMI/QfVCGEG1ghhBtUI/gfXCGMG2AhjBtcI/wfZCGUG2ghlBtkIuQe6B2cG2whnBroHAAjcCGkG3QhpBtwIAQjeCGoG3whqBt4I4AjhCPcHwQj3B+EIswTiCCoAKwAqAOII4wjkCDYANwA2AOQI5QjmCPQHugj0B+YI5wjoCPYHvwj2B+gI6QjqCCYAJwAmAOoI6wjsCDIAMwAyAOwIVgbtCO4I7wjuCO0IsATwCLEEwwixBPAI8QjyCDoAOwA6APIIsgTzCEYARwBGAPMI9Aj1CPYI9wj2CPUItAT4CLUE+Qi1BPgI+gj7CLYEtwS2BPsI/Aj9CP4I/wj+CP0IugS7BAAJAQkACbsEAgm8BAMJvQQDCbwEdQYFCAQJBQkECQUIBgl4BgcJBggHCXgGeQZ2BggJCQkICXYGCgkLCXcGewZ3BgsJDAkNCcMExATDBA0JDgkPCewA7QDsAA8J2wAQCdMEAQHTBBAJEQn8ABIJ0gQSCfwA1gSIBhMJFAkTCYgGFQkWCRcJ1QQXCRYJGAnDABkJwQAZCcMAggZ9BhoJfAYaCX0GGwkcCR0JHgkdCRwJywQfCcAEyQDABB8JIAkhCcoE5ADKBCEJIgkjCSQJJQkkCSMJfgbTBCYJ1AQmCdMEJwkoCSkJKgkpCSgJKwmhBSwJowUsCaEFLQkGBS4JwAYuCQYFLwmiBTAJEQcwCaIFMQmkBY0GpQWNBqQFMgkzCTQJNQk0CTMJNgneBDcJ3QQ3Cd4EOAk5CToJOwk6CTkJ3ASRBjwJPQk8CZEGMwE+CRMIlwYTCD4JPwmYBkUBFAhFAZgGQAlBCaMGmwajBkEJKQFCCRMInQYTCEIJngaaBkMJRAlDCZoGRQmgBkYJlgZGCaAGogYVCEcJSAlHCRUIFAgsAaQGSQmkBiwBMwkfAUoJTAFKCR8BSwlMCTYJTQk2CUwJTglPCVAJNQlQCU8JUQlSCesEGQHrBFIJVQFTCRYIqgYWCFMJUAFUCRYIqwYWCFQJFwhbAa4GVQmuBlsBVgmwBlgBFwhYAbAGVwmyBlgJGAhYCbIGWQlaCRkIswYZCFoJtQasBlsJXAlbCawGXQleCa8GtgavBl4JXwlgCfIEuAbyBGAJVwFhCVkBtwZZAWEJZwFiCWkBuwZpAWIJYwlkCWUJZgllCWQJZwloCWkJWgFpCWgJHAhqCb4Gawm+BmoJbAknAW0JvwZtCScBbglvCXAJcQlwCW8Jcgm8BHMJAglzCbwEtgB0CbQAdQm0AHQJdgm6BHcJAAl3CboEeAl5CbgAuQC4AHkJegl7CfwI/Qj8CHsJfAl9Cb4AvAC+AH0JfgnDBn8JwgZ/CcMGgAmBCYIJgwmCCYEJhAkMBYUJCwWFCQwFhgkOBYcJDQWHCQ4FiAmJCUIGiglCBokJiwmMCfIHRAbyB4wJgQmNCYMJjgmDCY0JjwnGBpAJHwiQCcYGkQmSCccGyAbHBpIJwwZ+CZMJlAmTCX4JHgAgAOwHlQnsByAAlgnMBugH6QfoB8wGlwmYCZkJaAiaCZsJnAmdCRgFGQUYBZ0JGgWeCRwFnwkcBZ4JfQegCaEJogmjCX4HpAmlCSIFIwUiBaUJpgmnCagJJwWpCSgFqgmrCawJrQmuCa8JsAmxCS4FLQUuBbEJsgkwBbMJLwWzCTAFFAa0CRYGtQkWBrQJtgk2BbcJNQW3CTYFuAm5CTcFOAU3BbkJugmBB7sJvAm9Cb4Jvwk/BcAJQAXACT8FwQnCCUIFQQVCBcIJwwnECdcF2QXaBcUJxglIBccJyAnJCcoJTgVNBcsJzAnLCU0FzQnOCc8J0AnRCdIJ0wnUCeYG1QnmBtQJ1gnXCdgJ2Qn3BtoJBAYDBtsJ3AnbCQMG3QneCV8FYAVfBd4J3wngCeEJYwXiCWQFwQfjCeQJ5QnmCecJ6AnpCfsG/wb6BuoJ6wnsCe0J7gnvCQAHGQbwCfEJ8gkbBvMJ9Al3BfUJ/Qb2CfcJ+An5CXkFegV5BfkJ+gmqB/sJ/An7CaoH/Qn+Cf8JgAUACgoHAQoCCggHAwoECgUKBgoHCggKCQoFBgoKCwqLBQwKjQUMCosFDQoOCg8KEAoRCpMFEgoTChQKFQoUChMKmwWcBRYKFwoWCpwFEAcYCg8HGQoPBxgKDgH/BBoKGwoaCv8EHAodCh4KSwgeCh0KDgiDAh8KIAofCoMCIQoiCiMKJAojCiIKJQqBAiYKJwomCoECAQAAACgKKQooCgAAKgorCowGdQSMBisKLAotCi4KLwouCi0KMAoxCjIKMwoyCjEKNAo1CjYKNwo2CjUKOAo5CjoKOwo6CjkKPAo9Cj4KPwo+Cj0KQApBCkIKQwpCCkEKRApFCkYKRwpGCkUKSApJCkoKSwpKCkkKWghQA0wKTQpMClADTgpPCkADWQhAA08KUApRClIKUwpSClEKVApVClYKVwpWClUKTQisAlgKWQpYCqwC8AJaClMIWwpTCFoKXApdCl4KXwpeCl0KYAphCmIKYwpiCmEKZAplCmYKZwpmCmUKaAppCmoKawpqCmkKbAptCm4KbwpuCm0KcApxCnIKcwpyCnEKdAp1CnYKdwp2CnUK0AJ4ClEIeQpRCHgKUgjcAnoKewp6CtwCfAp9Cn4Kfwp+Cn0KgAqBCoIKgwqCCoEKhAqFCoYKhwqGCoUKiAqJCooKiwqKCokKjApYCI0KPAONClgIjgqPCpAKkQqQCo8KJQOSClcIkwpXCJIKlAqVCpYKlwqWCpUKmAqZCpoKmwqaCpkKnAqdCp4KnwqeCp0KoAqhCqIKowqiCqEKVggQA6QKpQqkChADpgqnCqgKqQqoCqcKqgqrCqwKrQqsCqsKrgqvCrAKsQqwCq8KsgqzCrQKtQq0CrMKtgq3CrgKuQq4CrcKCQO6ClUIuwpVCLoKvAq9CsICTwjCAr0Kvgq/CsAKwQrACr8KwgrDCsQKxQrECsMKxgrHCsgKyQrICscKvALKCk4IywpOCMoKzArNCs4KzwrOCs0K0ArRCtIK0wrSCtEKswXIBesC1ArrAsgFpgK/BUsD1QpLA78FLgPABRsD1gobA8AF1gLBBbcC1wq3AsEFWgPCBTcD2Ao3A8IFygLDBQ8D2QoPA8MF8gLEBdoK2wraCsQFvAXFBU8D3ApPA8UF2gLGBccC3QrHAsYFngLHBUMD3gpDA8cFXAjfCncH4ApzB+EKqQXiCngH4wphCOQK5QrmCucK6ArpCuoKhAPrCoID7AqCA+sK7QruCqcFbAinBe4K7wrwCocH8QqEB9MCcAjyCogH8wpzCPQK9Qr2CnQIiQf3CvgK+Qr6CvsK/AqbA/0K/gr/CgALAQsAC/8KkwTzBQILAwsCC/MFhwTqBQQLBQsEC+oFiATrBQYLBwsGC+sFiwTsBQgLCQsIC+wFjATtBQoLCwsKC+0FjQTuBQwLDQsMC+4FjgTvBQ4LDwsOC+8FjwTwBRALEQsQC/AFkQTxBRILEwsSC/EFkgTyBRQLFQsUC/IFIgMjA6EHFguhByMDfwgXC6MHGAujBxcLHQMZCx8DpQcfAxkLGgsbCxwLHQseCx8LIAshCyILqQf7AiMLKgMrA64HJAuuBysDAgMDA7AHJQuwBwMDOQMmCzsDsQc7AyYL4gLjArIHJwsoCykLKgsrCywLswfvAi0LGgMuC/cCLwv3Ai4LTgMwC78CMQu/AjALMgszCzQLNQu7B1MDNgs3CzgLOQu9B98CSgY6C4kEOwuJBDoLUQY8C5AEPQuQBDwLPgs/C0ALAAZBC0ILQwtEC0ULDAZGC0cLSAtJC0oLSwtKC0kLTAvHB00L2wdNC8cHyAecCE4LRAROC5wITwtQC1ELUgtRC1ALUwtUCywEnwgsBFQLVQtWC04EowhOBFYLJQRXC50IWAudCFcLPgRZC6AI0gegCFkLWgvUBzgEoQg4BNQHoQg2BNUHWwvVBzYEXAvXBzEEoAgxBNcHXQteC18L0QdfC14LHgRgC5wI2gecCGALFgRhC5sI3AebCGELYgueCGMLJwRjC54IZAtlC2YLZwtmC2ULaAuDBGkLsAhpC4MEagtrCxoAGwAaAGsLbAu2CG0LtAhtC7YIbgvjByUAJAAlAOMHbwvLAXALFwVwC8sB5gdDBHELRQRxC0MENwZyCzQEcws0BHILdAscBHULOAZ1CxwEOQR2CzcE6wc3BHYLOQZ3C0wEeAtMBHcL7QcrBHkLLQR5CysEpQh6CwQFBQUEBXoLBAAGAKYIpwimCAYAewt8C6gIqQioCHwLqgh9C6sIfgurCH0LfwuAC6wIrQisCIALDAAOAK4IrwiuCA4AsAixCBYAFwAWALEIsgiBC1UEpAhVBIELtAizCB4AHwAeALMIJABcBCIAtwgiAFwEuQgCC0cGoANHBgILuwgEC0gGpANIBgQLvAgGC0kGSgZJBgYLvggBBEsGqANLBgEEwAgIC0wGrANMBggLwggKC00GsANNBgoLxAgMC04GtANOBgwLxQgOC08GuANPBg4LxggQC1AGUQZQBhALxwgFBFIGvANSBgUEyAgSC1MGwANTBhILyQgUC1QGxANUBhQLVQbLCFYG7QhWBssIVwbNCFgGggtYBs0IbgZaBs8IWQbPCFoGWwZcBoML0AiDC1wGXQbSCF4GhAteBtIIXwbUCGAGhQtgBtQIYQbWCGIGhgtiBtYIYwbYCGQGbAZkBtgIZQbaCGYGawZmBtoIZwbbCGgGbQZoBtsIaQbdCJYAlwCWAN0IagbfCIoAiwCKAN8I4wg2AOEIwQjhCDYA5Qj0B+IIKwDiCPQH5wj2B+QINwDkCPYH6QgmAOYIugjmCCYA6wgyAOgIvwjoCDIA7gjzB+oIJwDqCPMH9QczAIcL7AiHCzMA7gjvCPMHuAjzB+8I8Qg6APAIwwjwCDoA4Aj3B/IIOwDyCPcHhgCIAPMIRwDzCIgA9wioAPYIqgD2CKgA+AiuAPkIrwD5CK4AsgCzAPoI+wj6CLMAtAD8CLUA/gi1APwIAAkBCbkAuwC5AAEJvAACCb0AAwm9AAIJdgZ1BgkJBAkJCXUGBgkKCXgGdwZ4BgoJeQYICXoGwgR6BggJCwnBBHsGegZ7BsEEDAmICw0JiQsNCYgLDwkOCYoLiwuKCw4JAQEQCQABjAsAARAJ3QDcABEJ/AARCdwAFwnVBBMJ1gQTCdUEFgkVCeUA5wDlABUJGQmNCxgJjgsYCY0LGgmPC4IGgQaCBo8LGwnoABwJ6gAcCegAkAvLAB8JyQAfCcsA5QDkACQJIQkkCeQAJAklCeUAFgnlACUJ9wDHBCYJfgYmCccEKQkqCQgIgAYICCoJCgEMASsJoQUrCQwBfQIGBX8CLQl/AgYFBgEIAS8JogUvCQgBLAmjBTEJpAUxCaMFMgkhATMJHwEzCSEBkQtLCTcJNgk3CUsJOQlPCTsJkgs7CU8JPAlSCdwESAHcBFIJRgmWBj4JlwY+CZYGkwuZBj8JmAY/CZkGQQlECZsGmgabBkQJQgmUC50GnAadBpQLngZDCZ8GlQufBkMJ6gShBkUJoAZFCaEGogZHCaEG5wShBkcJowakBkAJSQlACaQGMwlKCTUJUAk1CUoJ3gQ2CacGTQmnBjYJlguSC04JTwlOCZILSQFIAVEJUglRCUgBlwupBlMJqgZTCakGXAmsBlQJqwZUCawGrQauBpgLVQmYC64GVgldCbAGrwawBl0JVwn0BLIGsQayBvQE9QS0BloJswZaCbQGsQa1BvEEWwnxBLUG8wS0Bl4JtgZeCbQGYAmZC7gGPQa4BpkLPAa3BpoLYQmaC7cGYgk+BrsGvAa7Bj4G8AdmCT8GZAk/BmYJmwucC2cJaAlnCZwLvgZrCW0BXAFtAWsJbQmdC2wJngtsCZ0LbglwCegEhgHoBHAJigFyCYsBcwmLAXIJdAmOAXUJkAF1CY4BlAF2CZIBdwmSAXYJlwGWAXgJeQl4CZYBnAGdAXoJewl6CZ0BoAGhAXwJfQl8CaEBnwugC38Jfgl/CaALpQEIBYAJgQmACQgFhQmhC4QJRQaECaELhwlDBoYJ8QeGCUMGiQmiC4oJowuKCaILhAlFBowJRAaMCUUGjQm5AY4JtwGOCbkBjwmRCcYGxwbGBpEJkgmTCcgGxQHIBpMJkwmUCcUBxAHFAZQJxwHGAZUJ7AeVCcYBOgbLBpYJzAaWCcsG0AHRAaQLmwmkC9EB0gHUAZwJpQumC9YBngnbAZ8J2QGfCdsBowmiCSgIJwgoCKIJ4gHkAaQJpQmkCeQBqQnpAacL5wGnC+kBrAmoC6kL6wHqAaoL8QHvAbAJsQmwCe8B8wGyCfUBqwusC60LrguvC7AL+AG1CfYBtwn8AbYJ/QG2CfwBAAKxC7ILuQm4CQECswssCLQLBwK1CwgCCgK/CQsCwAkLAr8JwQkQAsIJEQLCCRACtgu3C7gLEwLFCRUCFgLGCRcCxwkXAsYJHgIdAswJywnMCR0CJAIjAs0JzgnNCSMCJgIoAtMJ1AnTCSgCuQstAroLuwu8C70L2wncCTwIOwg8CNwJNAI2At0J3gndCTYCvgu/C8ALwQvfCcIL5AnDCzwCxAvFC8YLQwJBAugJ6QnoCUECRQLrCT0I7Qk9COsJ8AnHC8gLTALyCUoC9QlQAvQJUQL0CVACQQjJC8oLywvMC1UC+wlaAvoJWwL6CVoCXAL9CV0C/wldAv0JAQpiAgIKYwICCmICzQtKCAoKzgvPC9ALagILCmsCDAprAgsK0QvSC9ML1AvVC9YLdQISCncCFAp3AhIKFQoTChcKFgoXChMK1wsZChoKGAoaChkK2AvXCxsKGgobCtcLhwKFAhwKHQocCoUCIAqKAh8KiwIfCooCjgKPAiEKIgohCo8CkQIlCpMCJgqTAiUKlQIoCpcCKQqXAigKmgKbAioKKwoqCpsCLQosClEKUwpRCiwKMQpoCjMKagozCmgKNQpzCjcKcQo3CnMKuwVsBzgKOQo4CmwHPQpACj8KQgo/CkAKQQrMCkMKzgpDCswKRgpcCkQKXgpEClwKhAqGCkgKSQpICoYKTApNCskKyArJCk0KsgU5B04KTwpOCjkHUgpgClAKYgpQCmAKVgpXCrUKtAq1ClcKWApZCkEHtgVBB1kKWgo6ClsKOwpbCjoKXQquBV8KNAdfCq4FYQq9BWMKbgdjCr0FZQqsBWcKLwdnCqwFaQqCCmsKgwprCoIKbgpvClMHuAVTB28KJQdwCqgFcgqoBXAKugVYB3QKdQp0ClgHeAqRCnkKjwp5CpEKegp7CpsKmgqbCnsKqwUsB3wKfQp8CiwHuAq5CoAKgQqACrkKhQq+CocKwAqHCr4Kdgp3CogKiQqICncKbAqMCm0KjQptCowKVAqOClUKkApVCo4KkgowCpMKMgqTCjAKfgp/CpQKlQqUCn8KrAqtCpgKmQqYCq0KsQU4B5wKnQqcCjgHoQqKCqMKiwqjCooKpAqlCjsHtAU7B6UKpwqWCqkKlwqpCpYKqwqqCsMKxQrDCqoKngqfCq4KrwquCp8K0grTCrIKswqyCtMKSgpLCrYKtwq2CksKugqgCrsKogq7CqAKLgovCrwKvQq8Ci8KvwqmCsEKqArBCqYKxAo0CsIKNgrCCjQKpgUaB8YKxwrGChoHygqtBcsKMQfLCq0FzQqwCs8KsQrPCrAK0QrQCkUKRwpFCtAK6gLrAlwD1ApcA+sCSgNLA14D1QpeA0sDGgMbAy4L1gouCxsDtgK3AmMD1wpjA7cCNgM3A2UD2AplAzcDDgMPA2cD2QpnAw8DaQPaCmoD2wpqA9oKTgNPAzAL3AowC08DxgLHAnAD3QpwA8cCQgNDA3ID3gpyA0MDcwfgCiUI0wYlCOAK2QshCHgHeQd4ByEI5grNBnoH2gtjCNsLZgjcC90LmQneC98L4AvhC4AHvglsCLwJhAfxChMCxQkTAvEK4gvGCYgHFgKIB8YJ+ArLCYkH4wt1COQL5QvmC0cF5QbnC+gL6QssBXgIIAV4CCwFoAMCC6EDAwuhAwILpAMEC6UDBQulAwQLSgYGCzoLBws6CwYLrAMIC60DCQutAwgLsAMKC7EDCwuxAwoLtAMMC7UDDQu1AwwLuAMOC7kDDwu5Aw4LUQYQCzwLEQs8CxALwAMSC8EDEwvBAxILxAMUC8UDFQvFAxQLoQcWC6IH8QaiBxYLGAs3CKMHpAejBzcIGQvnBqUHpgelB+cGpwfqC6gH6wvsCx0LIwv8CakHqgepB/wJrgckC68HCgqvByQLJQsLCrAHagKwBwsKJgsRCrEHcwKxBxEKsgftC4oF7gvvCycLLQtmBbMH+AazB2YF9gL3AvALLwvwC/cCvgK/AvADMQvwA78CNQvxC7sHvAe7B/ELOQs5Bb0Hvge9BzkFigSJBPILOwvyC4kEAwSQBAQEPQsEBJAE8ws+C5YIQQuUCPQL9QtDC5oIRguYCPYLMQbdB0gLSQtIC90HxgfHByMGTAsjBscHxgfIByIGTgsiBsgHTwswBlALyQdQCzAG2AdUCy4GUwsuBlQLVgtVC1ILUQtSC1ULVwtkC1gLZgtYC2QLXwvRB1kL0gdZC9EH1AdaC9MHLQbTB1oL1QdbC9YHMgbWB1sLKgbTB1wL1wdcC9MHzAdeCyYGXQsmBl4LYAskBtoHyQfaByQGTQvbB2EL3AdhC9sHYgtjC8QHIQbEB2ML1gdnCywGZQssBmcLaQv3C2gLMgRoC/cLMAQpBmoLawtqCykGbQv4C2wL+QtsC/gLSAQYBG4L4wduCxgEbwv6C8sBzQHLAfoL5wfmB8oGcQvKBuYHcgv6C3MLMwZzC/oLdQsgBHQLJQZ0CyAEJgTrB/sLdgv7C+sHdws7BngL7gd4CzsGywbtBxYFeQsWBe0HIwokCqUIegulCCQK+AQEAJkLpgiZCwQA/At7C5oLqAiaC3sLqgj9C30L/gt9C/0L+wS6BqwIfwusCLoGvAYMAP0Ergj9BAwAsQihCxcA8QcXAKELigmjC7IIgQuyCKMLswgRBR8AugEfABEFwQETBbcIIgC3CBMFuQhUAAILkwQCC1QAuwgoAAQLhwQECygAvAgsAAYLiAQGCywAvgj/CwEE/wMBBP8LwAg0AAgLiwQICzQAwgg4AAoLjAQKCzgAxAg8AAwLjQQMCzwAxQhAAA4LjgQOC0AAxghEABALjwQQC0QAxwhIAAUEAwQFBEgAyAhMABILkQQSC0wAyQhQABQLkgQUC1AAhACqBMsI7QjLCKoEWACUBM0IggvNCJQEXACWBM8IbgbPCJYE0AgADIMLAQyDCwAMZACaBNIIhAvSCJoEaACcBNQIhQvUCJwEbACeBNYIhgvWCJ4EcACgBNgIbAbYCKAEdACiBNoIawbaCKIEeACkBNsIbQbbCKQEfACmBN0IlwDdCKYEgACoBN8IiwDfCKgEnATjCIUL4QiFC+MIWAblCJcE4giXBOUIXgbnCJ0E5AidBOcIlATpCIIL5giCC+kImgTrCIQL6AiEC+sIVgbuCJUE6giVBO4IWwaHC5sE7AibBIcLogBSAO8IuAjvCFIAngTxCIYL8AiGC/EIYAbgCJ8E8gifBOAIZgaGAKUE8wilBIYAAgioAAIM9wgCDKgAAwwDCPgIrgD4CAMIBAiyAAQM+ggEDLIAtQD+CKoA9giqAP4I+QivAAEJuwABCa8AswC9APsIAwn7CL0AxAYeCAQJCQkECR4IHAnqAAYJCgkGCeoACAmqAcIErAHCBKoB6wDABAsJwQQLCcAE8gDzAAwJiAsMCfMADgnRAIsLpAGLC9EAEAkFDIwLBgyMCwUMEQmNC90ABwjdAI0LEwnNBBcJgQYXCc0EFQmPC+cAzwTnAI8LkAsHCBkJjQsZCQcI9ADPBBoJjwsaCc8EBQzZABsJ6AAbCdkABwiQC38GHwl/BpALJAkhCSIJBwwiCSEJFgklCdUEAgHVBCUJ+AD3AAgMJgkIDPcAKgkgCYAGygSABiAJCgErCQ0ICQwNCCsJgQJ/AicKLQknCn8CLwkKDAYBDAgGAQoMMQkLDCwJDAwsCQsMMgkNDCEBEgghAQ0MkQs3CQ4MDwwODDcJNAk1CTkJTwk5CTUJGAEZATwJUgk8CRkBpgZGCRAMPgkQDEYJEQyTCxIMPwkSDJMLgAGBAUEJRAlBCYEBbAmeC0IJlAtCCZ4LQwm9BpULGwiVC70GpQbpBEUJ6gRFCekERwluCecE6ATnBG4JagkcCEkJQAlJCRwISgkuAVAJNgFQCS4BpwZNCUMBEgxDAU0JTgk4AZYL5gSWCzgBUQkQDEkBMgFJARAMUwljCZcLZQmXC2MJgwFcCYUBVAmFAVwJnAuYC2gJVQloCZgLcAFxAVYJXQlWCXEBdgF3AVcJ9ARXCXcBewH2BFoJ9QRaCfYEhwHxBIkBWwmJAfEEXglfCfME8gTzBF8JYAlvAZkL+ASZC28B/AuaCxMMYQkTDJoLYgl1AT4G/AQ+BnUB/gQ/BnkBZAl5AT8GZwkrAZsL4gSbCysBaQlaAWsJXAFrCVoBnQttCe4ETwHuBG0JcAleAYYBhwGGAV4Bcwl9CYsBoQGLAX0JlAGOAXYJdAl2CY4BkgF3CZYBeQmWAXcJigGXAXIJeAlyCZcBnAF6CZABdQmQAXoJoAF8CR0IFAwdCHwJiQufCw0JfwkNCZ8LpAGlAYsLgAmLC6UBhgnxB4UJoQuFCfEHQgZDBogJhwmICUMGsQEQBYkJoguJCRAFjAm1AYQJDAWECbUBkAkfCI0JuQGNCR8IBwUKBY8JkQmPCQoFCQXDBpIJkwmSCcMGFQwgCJQJxAGUCSAIlQk2BscB5wfHATYGVgQ6BhgAlgkYADoGFgwXDBgMewfQAc8FeQfSAc0FnAnNBdIBdAclCJ4J2wGeCSUIGQwaDN4B0QEnCJsJ1AHiAZ0JpAmdCeIBqQmfCekB2QHpAZ8JrQkbDBwMKAjrAaMJsAmlCfEB5AHxAaUJKggdDB4MpwvnAbMJrgkfDCAM9gG0CeoBsQnvAbcJ/AG3Ce8B8wECArIJIQwiDCMMtQn4Ab0JCAK9CfgBCwLACf0Btgn9AcAJwQm5CRACAQIQArkJtQsHAiQMFQIkDAcCFwLHCQoCJQwxCCYMzAnCCR4CEQIeAsIJzQn9BSQCJwwoDCkMpAcmAvkF0wn5BSYCKgwrDNcJLAzaCS0M3AnOCTsIIwI7CM4JKAI0AtQJ3QnUCTQC4gm6CzsCKwI7AroLLgwvDDAMPAg9AtsJ6AneCUMCNgJDAt4JRwIxDMELwAs+CO8J5Ak8AvMJMgwzDDQM6QlBAvUJUAL1CUECRQJUAusJ+AnrCVQC8glMAvsJWgL7CUwCXQL/CVEC9AlRAv8JNQzLCzYMyQs3DDgM+glbAs0LSgjNC1sCawIMClwC/QlcAgwKEAoCCnICOQw6DAUKdwIUCksIHgpLCBQKAQAVCgMAFwoDABUKGgoYCg4BDwEOARgKnQXYC3wCGwp8AtgLHAooCocClQKHAigKJQqRAiAKigIgCpEChQKOAh0KIQodCo4CkwImCkwIOwxMCCYKlwIpCpsCKwqbAikKiwKaAh8KKgofCpoCLAp7A1MKfQNTCnsDmwdoCjwMMQo8DGgKcwo1CngDdwN4AzUKuwU4CrwFawO8BTgKPQxACj4MPQo+DEAKkQfMCj8MQQo/DMwKXApGCpkD/QqZA0YKlweECkAMSApADIQKTQqPCMgKQQzICo8IsgVOCrMFcwOzBU4KYApSCoQD6wqEA1IKVwqRA7QKkwO0CpEDWQpCDLYFtwW2BUIMOgpaCmkD2gppA1oKrgVdCq8FmAOvBV0KvQVhCr4F0gW+BWEKrAVlCmAD7gNgA2UKfQiCCpwHaQqcB4IKbwrNA7gFzwO4Bc0DqAVyCqkF4gqpBXIKuQW6BZ4HdAqeB7oFkQp4Co0DjAONA3gKewr8A5oK/gOaCvwDqgWrBZQHfAqUB6sFmQe4CkMMgApDDLgKewi+CpgHhQqYB74KnQd2CkQMiApEDHYKbQqNCn8IFwt/CI0KVQqQCnAI8gpwCJAKRQwwCkYMkgpGDDAKkwd+CkcMlApHDH4KmApIDKwKdwisCkgMsAWxBZAHnAqQB7EFfgiKCqAHoQqgB4oKpQpJDLQFtQW0BUkMegiWCpYHpwqWB5YKqgqcA8UKngPFCpwDjweeCkoMrgpKDJ4KsgpLDNIK9wrSCksMfAhKCpoHtgqaB0oKnwegCkwMugpMDKAKvArlCi4K5wouCuUKlQemCk0MvwpNDKYKNArECl4I4QpeCMQKxgrtCqYFpwWmBe0KrQXKCm0D8QNtA8oKeQiwCpIHzQqSB7AK0AqUA0cKlgNHCpQDXAPUCvgHygj4B9QKXgPVCvkHzAj5B9UKLgvWCvoHzgj6B9YKYwPXCvsH0Qj7B9cKZQPYCvwH0wj8B9gKZwPZCv0H1Qj9B9kKagPbCv4H1wj+B9sKMAvcCv8H2Qj/B9wKcAPdCgAI3AgACN0KcgPeCgEI3ggBCN4KTgxPDFAM6QXTBp8D2Qt2AyEIyQUhCHYDeQPOBeYKUQxSDFMM3AtUDFUM0AWaCX4DVgxXDFgMvAnuChYG8QqIA8UJ2QXFCYgD4guLA8YJSAXGCYsD3gVOBfgKWQxaDFsM5gtcDFAFUgVTBZcD+QMpBV0MLAXpCxgGoQMDC7AF5gKwBQMLpQMFC3kISgx5CAULOgsHCz0MPww9DAcLrQMJC3oIRwx6CAkLsQMLC3sITQx7CAsLtQMNC3wIQAx8CA0LuQMPC30IQwx9CA8LPAsRC0UMPAxFDBELwQMTC34IRAx+CBMLxQMVCwgDTAwIAxULFgsPBvEG8AbxBg8GGAvJAzcI+AU3CMkD+gX7BRkL5wYZC/sF6gv+Bc8JXgxfDGAMBwRhDCEL/AkjCxsGJAvZAwoKCQoKCtkDJQvbAwsKiwULCtsDYgxjDGQMEQomC5QF7QsLBpoFZQxmDGcMDQRoDCsLZgUtC2UF8AsvC14AXwBeAC8L8AMxC3YAdwB2ADELNQvRBfELfwfxC9EFOQviBTkFOgU5BeIF8gs7C2kMPgxpDDsLBAQ9CyQDRgwkAz0LagzjCcAHwQfAB+MJawwDB8MHbwXDBwMHawQxBvgLSAv4CzEGIwZMC2cE5AdnBEwLIgZOC2EEYgRhBE4LMAZPCy8G7wcvBk8LLgZTC24EbwRuBFMLeAvuB1ULUQtVC+4H+wtsDFcLZAtXC2wMWQs0Bl8L4gdfCzQGWgtpBC0GVwQtBmkEcwszBlsLMgZbCzMGXAv3CyoGZAQqBvcLJgZdCycG4QcnBl0LdAslBmALJAZgCyUGYQs1Bk0L5QdNCzUGYwvqByEGXgQhBuoHZQttDCwGKwYsBm0M9wtpC2QEZQRkBGkLaAsyBGoLMARqCzIE+AttC2sEbARrBG0LbgxKBG4LSARuC0oE+gtvCzMGUQQzBm8LygZxC3QEcwR0BHELzAHNAXIL+gtyC80BKgQiBHULIAR1CyIE+wt2C2wMbQxsDHYLyAEVBXcLOwZ3CxUFFgV5CxcFcAsXBXkLSwgjCg4HpQgOByMKPQaZC3kEpgh5BJkLPAaaC3cEqAh3BJoLqginCP0LBgD9C6cI/AT7BHsErAh7BPsE/QSuCP4EfQT+BK4IoQuxCEUGggRFBrEIsgiBBIoJQgaKCYEEEQWzCBIFtQgSBbMItwiEBMEBwAHBAYQEUgBUALgIuQi4CFQAJgAoALoIuwi6CCgAKgAsAKYAvAimACwAvQhvDL4I/wu+CG8MMgA0AL8IwAi/CDQANgA4AMEIwgjBCDgAOgA8AMMIxAjDCDwAPgBAAJUAxQiVAEAAQgBEAIkAxgiJAEQARgBIAKEAxwihAEgASgBMAK8EyAivBEwATgBQAK0EyQitBFAAygiCAMsIhADLCIIAzAhWAM0IWADNCFYAzghaAM8IXADPCFoAuAeLCNAIAAzQCIsI0QhiANIIZADSCGIA0whmANQIaADUCGYA1QhqANYIbADWCGoA1whuANgIcADYCG4A2QhyANoIdADaCHIAugd2ANsIeADbCHYA3Ah6AN0IfADdCHoA3gh+AN8IgADfCH4AYAaFC+AI4QjgCIULlgSXBLME4gizBJcEnASdBOMI5AjjCJ0EWAaCC+UI5gjlCIILXgaEC+cI6AjnCIQLlASVBOkI6gjpCJUEmgSbBOsI7AjrCJsEqgSiAO0I7wjtCKIAYgaGC7AE8AiwBIYLngSfBPEI8gjxCJ8EpASlBLIE8wiyBKUE9wj1CAIMcAwCDPUIbwYDDLQE+Ai0BAMMcQYEDLYE+gi2BAQM/gj/CPYI9Aj2CP8ItQT5CLsEAQm7BPkI+wgDCbcEvQS3BAMJBAkFCcQGxQbEBgUJBwkeCQYJHAkGCR4JCAkJCaoBHgiqAQkJCwkKCesA6gDrAAoJwwR9BgwJ8gAMCX0G7ADTAA4J0QAOCdMAEAnbAAUM2QAFDNsAjQsRCY4LEgmOCxEJEwkUCc0EzgTNBBQJjwsVCYEGFwmBBhUJGQnBAJALywCQC8EAGgl8BvQA9QD0AHwGBQwbCQYMHQkGDBsJxgR/BssEHwnLBH8GcQwHDCAJIQkgCQcMAwECASMJJQkjCQIBhQYIDNQEJgnUBAgMcQwgCSgJKgkoCSAJLAkMDCsJCQwrCQwMJwotCXIMLglyDC0JcwwKDDAJLwkwCQoMDwgLDI0GMQmNBgsMDQwyCXQMNAl0DDIJNwndBA8MkgYPDN0EdAw0CTgJOQk4CTQJPQkQCDwJGAE8CRAIMwEyAT4JEAw+CTIBQwESDEUBPwlFARIMQQlACYABHAiAAUAJQgkpAWwJJwFsCSkBQwlECb0GgQG9BkQJpgalBkYJRQlGCaUGRwlICW4JbwluCUgJLAEtAUkJaglJCS0BSglMAS4BLwEuAUwBTAkRDE0JEgxNCREMUAk2AU4JOAFOCTYB6wSmBlEJEAxRCaYGUwlVAWMJUwFjCVUBUQGFAVABVAlQAYUBVQlbAWgJWgFoCVsBcAFWCVkBWAFZAVYJdgFXCRoIWAkaCFcJewFaCX0BWQl9AVoJWwlcCYkBgwGJAVwJXgldCV8JcQFfCV0JXwlxAWAJbwFgCXEBVwHwBGEJEwxhCfAEZwF3AWIJdQFiCXcBYwlTAWQJeQFkCVMBaQktAWcJKwFnCS0BLQFpCWoJawlqCWkJbQm/Bk8BUQFPAb8GcAlxCV4BXwFeAXEJAgm8AHMJfQlzCbwAdgl0CboEtgC6BHQJdwkACXkJuQB5CQAJcgl4CbwEuAC8BHgJegn8CHUJtAB1CfwIfAm+ABQMvgQUDL4AxAQNCcIGfwnCBg0JiwuACYoLggmKC4AJhQkLBYYJDgWGCQsFDQWwAYcJiAmHCbABiQmICbEBsAGxAYgJjAmLCbUBtAG1AYsJCAWQCYEJjQmBCZAJBwWPCQgFkAkIBY8JCgUJBZEJkgmRCQkFoAsVDH4JlAl+CRUMXQQ2BiAAlQkgADYGFgAYAOgHlgnoBxgAdQxVDHYM0AXPBZoJzQWcCc4Fdwx4DHkMyQV0BxoFngkaBXQHfgdoCKIJegx7DN0LnQmkCRkFIgUZBaQJqQknBZ8JHAWfCScF8Qt/B6oLowmqC38HLgUjBbAJpQmwCSMFswkvBacLKAWnCy8FfAyuCX0Mrgt+DKwJtwk1BbEJLQWxCTUFsgm4CTAFNwUwBbgJVwx/DIAMvQm8CbUJwAlABbYJNgW2CUAFQgU4BcEJgQyCDIMMhAyCB4UMvgm1C9oFxwlJBb8JPwW/CUkFTQVBBcwJwgnMCUEFhgyHDIgM/wX9Bc8J+QXTCfsF5gb7BdMJiQyKDIsMuQtZBfcFAwaoB9wJzgncCagH1AndCdUJ8wZYBYwM4gljBboL2Am8C40MjgyPDC4M2wnDCwQGaAWQDJEM3gnoCWAF7QlrBZIMZAWSDGsFwQfkCR0GkwyUDJUM9Ql4BekJaQWWDHUF6wn4CewJlwxsBcwLGwbyCfwJ+wn8CfIJ/wkHB/QJdwX0CQcHCAd6BQEKOAyYDJkMzQsFBvoJmgybDJwMDAqNBf0J/gn9CY0FnQwDCtULngzTC4cFAQAeChUKFAoVCh4KnAUCBRcKAwAXCgIFDggPARAHGAoQBw8BfAIbCn0C/wR9AhsKAQAoCh4KHAoeCigKIAqDAiUKgQIlCoMCHQohCksIIwpLCCEKJgonCjsMcgw7DCcKKQoAACsKdQQrCgAADggfCowGKgqMBh8KLgrnCiwKewMsCucKRQw8DDAKMQowCjwMNQo0CncDXgh3AzQKOgppAzgKawM4CmkDaQw+DDwKPQo8Cj4MPQw/DEAKQQpACj8MRgpHCv0KlgP9CkcKfAhADEoKSApKCkAMUANSA00KjwhNClIDQANCA04KcwNOCkIDUgpTCusKfQPrClMKVQpwCFcKkQNXCnAIrAKuAlkKQgxZCq4C8ALyAloK2gpaCvICXQpcCpgDmQOYA1wKYQpgCtIFhAPSBWAKZArsA2UK7gNlCuwDmwecB2gKaQpoCpwHbQp/CG8KzQNvCn8IcgpzCuIKeAPiCnMKnQeeB3YKdAp2Cp4HeArQAowD0gKMA9AC3ALeAnsK/AN7Ct4CkweUB34KfAp+CpQHfQhDDIIKgAqCCkMMlweYB4QKhQqECpgHfghEDIoKiAqKCkQMjQo8AxcLPgMXCzwDkAqRCvIKjQPyCpEKJANGDCUDkgolA0YMeghHDJYKlAqWCkcMmgr+A5gKSAyYCv4DjweQB54KnAqeCpAHnwegB6AKoQqgCqAHEAMSA6UKSQylChIDlQeWB6YKpwqmCpYHrAp3CKoKnAOqCncIeQhKDLAKrgqwCkoMtAqTA7IKSwyyCpMDmQeaB7gKtgq4CpoHCANMDAkDugoJA0wMwgLDArwK5Qq8CsMCewhNDL4Kvwq+Ck0MxArFCuEKngPhCsUKyApBDMYK7QrGCkEMvAK+AsoK8QPKCr4CkQeSB8wKzQrMCpIH0gr3CtAKlAPQCvcKyAWCANQKygjUCoIAvwVWANUKzAjVClYAwAVaANYKzgjWCloAwQViANcK0QjXCmIAwgVmANgK0wjYCmYAwwVqANkK1QjZCmoAxAVuANsK1wjbCm4AxQVyANwK2QjcCnIAxgV6AN0K3AjdCnoAxwV+AN4K3gjeCn4A4QqeA+AKnwPgCp4D4gp4A9kLnwygDKEM5grlCnkDwwJ5A+UKogyjDN8LfgPsCn0D7grtChUG+ANWDKQM0wKrAvEKiAPxCqsC8gqNA+ILiwPiC40D+ApLDN4FkwPeBUsM+gqlDKYMpwymDKUM6QtIDBcGqAypDKoM8wXkAgML5gIDC+QC6gWPBwULSgwFC48H6wWRBwcLPwwHC5EH7AWTBwkLRwwJC5MH7QWVBwsLTQwLC5UH7gWXBw0LQAwNC5cH7wWZBw8LQwwPC5kH8AWbBxELPAwRC5sH8QWdBxMLRAwTC50H8gWfBxULTAwVC58HqwysDK0MrgyvDLAMFws+AxgLsQyyDLMMGQsdA/oFzwP6BR0DVwMzA+oL/gXqCzMDIwv5AhwGtwUcBvkCtAy1DLYMtwy4DLkMAwNGAyULugy7DLwMJgs5AwkGuwIJBjkDvQy+DL8MCwbtC/8CLQvtAiAGtQUgBu0CLgv6By8LXwAvC/oHMAv/BzELdwAxC/8HwAzTBcEMwgzDDMQM3wKvBTkLigfFDMYMOgs9DDsLPgw7Cz0MPAtFDD0LRgw9C0UMQAvHDI4MBAbjCdcDRQvIDHsFfgUDB+cD+AtIC/kLSgv5C0gL5AdMC+UHTQvlB0wLYgROC0MERARDBE4L7gfvB1ELTwtRC+8HbwRTCysELAQrBFMLTAR4C04EVQtOBHgLJQQmBFcL+wtXCyYEWQs+BDQGPAQ0Bj4EaQRaCzcEOAQ3BFoLNARzCzYEWws2BHML9wtcCzIEMQQyBFwL4QddC+IHXwviB10LHAR0Cx4EYAseBHQLYQsWBDUGFAQ1BhYEYwsnBOoHKQTqBycEZQtkC20MbAxtDGQLaQuwCGUEFgBlBLAIagsaAGgLgwRoCxoAbQu0CGwEHgBsBLQIbgslAG4MhgRuDCUAcAtPBG8LUQRvC08EcQtFBHMELwZzBEUE6QfMATcGcgs3BswBKQQqBDgGdQs4BioEdgs5BG0MKwZtDDkExgHIATkGdws5BsgBeQstBHALTwRwCy0E"
+        }
+    ]
+}
diff --git a/automated-tests/resources/CesiumMilkTruck.jpg b/automated-tests/resources/CesiumMilkTruck.jpg
new file mode 100644
index 0000000..0bebaad
Binary files /dev/null and b/automated-tests/resources/CesiumMilkTruck.jpg differ
diff --git a/automated-tests/resources/CesiumMilkTruckQuantized.bin b/automated-tests/resources/CesiumMilkTruckQuantized.bin
new file mode 100644
index 0000000..2147577
Binary files /dev/null and b/automated-tests/resources/CesiumMilkTruckQuantized.bin differ
diff --git a/automated-tests/resources/CesiumMilkTruckQuantized.gltf b/automated-tests/resources/CesiumMilkTruckQuantized.gltf
new file mode 100644
index 0000000..70d8410
--- /dev/null
+++ b/automated-tests/resources/CesiumMilkTruckQuantized.gltf
@@ -0,0 +1,509 @@
+{
+  "buffers": [
+    {
+      "uri": "CesiumMilkTruckQuantized.bin",
+      "byteLength": 93032
+    }
+  ],
+  "asset": {
+    "version": "2.0",
+    "generator": "gltfpack 0.18"
+  },
+  "extensionsUsed": [
+    "KHR_mesh_quantization",
+    "KHR_texture_transform"
+  ],
+  "extensionsRequired": [
+    "KHR_mesh_quantization"
+  ],
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteOffset": 0,
+      "byteLength": 31328,
+      "byteStride": 8,
+      "target": 34962
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 31328,
+      "byteLength": 31328,
+      "byteStride": 8,
+      "target": 34962
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 62656,
+      "byteLength": 12460,
+      "byteStride": 4,
+      "target": 34962
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 75116,
+      "byteLength": 17136,
+      "target": 34963
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 92252,
+      "byteLength": 156
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 92408,
+      "byteLength": 624
+    }
+  ],
+  "accessors": [
+    {
+      "bufferView": 0,
+      "byteOffset": 0,
+      "componentType": 5123,
+      "count": 786,
+      "type": "VEC3",
+      "normalized": true,
+      "min": [
+        105,
+        18,
+        113
+      ],
+      "max": [
+        150,
+        129,
+        158
+      ]
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 0,
+      "componentType": 5122,
+      "count": 786,
+      "type": "VEC3",
+      "normalized": true
+    },
+    {
+      "bufferView": 2,
+      "byteOffset": 0,
+      "componentType": 5123,
+      "count": 786,
+      "type": "VEC2",
+      "normalized": true
+    },
+    {
+      "bufferView": 3,
+      "byteOffset": 0,
+      "componentType": 5123,
+      "count": 2304,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 0,
+      "byteOffset": 6288,
+      "componentType": 5123,
+      "count": 2329,
+      "type": "VEC3",
+      "normalized": true,
+      "min": [
+        0,
+        0,
+        0
+      ],
+      "max": [
+        255,
+        146,
+        121
+      ]
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 6288,
+      "componentType": 5122,
+      "count": 2329,
+      "type": "VEC3",
+      "normalized": true
+    },
+    {
+      "bufferView": 2,
+      "byteOffset": 3144,
+      "componentType": 5123,
+      "count": 2329,
+      "type": "VEC2",
+      "normalized": true
+    },
+    {
+      "bufferView": 3,
+      "byteOffset": 4608,
+      "componentType": 5123,
+      "count": 5232,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 0,
+      "byteOffset": 24920,
+      "componentType": 5123,
+      "count": 151,
+      "type": "VEC3",
+      "normalized": true,
+      "min": [
+        139,
+        0,
+        12
+      ],
+      "max": [
+        211,
+        146,
+        50
+      ]
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 24920,
+      "componentType": 5122,
+      "count": 151,
+      "type": "VEC3",
+      "normalized": true
+    },
+    {
+      "bufferView": 3,
+      "byteOffset": 15072,
+      "componentType": 5123,
+      "count": 168,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 0,
+      "byteOffset": 26128,
+      "componentType": 5123,
+      "count": 650,
+      "type": "VEC3",
+      "normalized": true,
+      "min": [
+        137,
+        15,
+        10
+      ],
+      "max": [
+        212,
+        131,
+        52
+      ]
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 26128,
+      "componentType": 5122,
+      "count": 650,
+      "type": "VEC3",
+      "normalized": true
+    },
+    {
+      "bufferView": 3,
+      "byteOffset": 15408,
+      "componentType": 5123,
+      "count": 864,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 4,
+      "byteOffset": 0,
+      "componentType": 5126,
+      "count": 39,
+      "type": "SCALAR",
+      "min": [
+        0
+      ],
+      "max": [
+        1.26666677
+      ]
+    },
+    {
+      "bufferView": 5,
+      "byteOffset": 0,
+      "componentType": 5122,
+      "count": 39,
+      "type": "VEC4",
+      "normalized": true
+    },
+    {
+      "bufferView": 5,
+      "byteOffset": 312,
+      "componentType": 5122,
+      "count": 39,
+      "type": "VEC4",
+      "normalized": true
+    }
+  ],
+  "images": [
+    {
+      "uri": "CesiumMilkTruck.jpg"
+    }
+  ],
+  "textures": [
+    {
+      "source": 0
+    },
+    {
+      "source": 0
+    }
+  ],
+  "materials": [
+    {
+      "name": "wheels",
+      "pbrMetallicRoughness": {
+        "baseColorTexture": {
+          "index": 0,
+          "extensions": {
+            "KHR_texture_transform": {
+              "offset": [
+                0.605093002,
+                0.00905001163
+              ],
+              "scale": [
+                99.8609467,
+                251.995087
+              ]
+            }
+          }
+        },
+        "metallicFactor": 0
+      }
+    },
+    {
+      "name": "truck",
+      "pbrMetallicRoughness": {
+        "baseColorTexture": {
+          "index": 1,
+          "extensions": {
+            "KHR_texture_transform": {
+              "offset": [
+                0.00295638992,
+                0.0156720281
+              ],
+              "scale": [
+                229.629913,
+                252.264313
+              ]
+            }
+          }
+        },
+        "metallicFactor": 0
+      }
+    },
+    {
+      "name": "glass",
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          0,
+          0.0405062996,
+          0.0212407,
+          1
+        ],
+        "metallicFactor": 0
+      }
+    },
+    {
+      "name": "window_trim",
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          0.064000003,
+          0.064000003,
+          0.064000003,
+          1
+        ],
+        "metallicFactor": 0
+      }
+    }
+  ],
+  "meshes": [
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "POSITION": 0,
+            "NORMAL": 1,
+            "TEXCOORD_0": 2
+          },
+          "indices": 3,
+          "material": 0
+        }
+      ]
+    },
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "POSITION": 4,
+            "NORMAL": 5,
+            "TEXCOORD_0": 6
+          },
+          "indices": 7,
+          "material": 1
+        },
+        {
+          "attributes": {
+            "POSITION": 8,
+            "NORMAL": 9
+          },
+          "indices": 10,
+          "material": 2
+        },
+        {
+          "attributes": {
+            "POSITION": 11,
+            "NORMAL": 12
+          },
+          "indices": 13,
+          "material": 3
+        }
+      ]
+    }
+  ],
+  "animations": [
+    {
+      "name": "Wheels",
+      "samplers": [
+        {
+          "input": 14,
+          "output": 15
+        },
+        {
+          "input": 14,
+          "output": 16
+        }
+      ],
+      "channels": [
+        {
+          "sampler": 0,
+          "target": {
+            "node": 3,
+            "path": "rotation"
+          }
+        },
+        {
+          "sampler": 1,
+          "target": {
+            "node": 5,
+            "path": "rotation"
+          }
+        }
+      ]
+    }
+  ],
+  "nodes": [
+    {
+      "mesh": 0,
+      "translation": [
+        -2.43091011,
+        -1.39600003,
+        -2.5843699
+      ],
+      "scale": [
+        1251.30994,
+        1251.30994,
+        1251.30994
+      ]
+    },
+    {
+      "mesh": 0,
+      "translation": [
+        -2.43091011,
+        -1.39600003,
+        -2.5843699
+      ],
+      "scale": [
+        1251.30994,
+        1251.30994,
+        1251.30994
+      ]
+    },
+    {
+      "mesh": 1,
+      "translation": [
+        -2.43091011,
+        -1.39600003,
+        -2.5843699
+      ],
+      "scale": [
+        1251.30994,
+        1251.30994,
+        1251.30994
+      ]
+    },
+    {
+      "name": "Wheels",
+      "rotation": [
+        0,
+        0.0884858891,
+        0,
+        -0.996077418
+      ],
+      "children": [
+        0
+      ]
+    },
+    {
+      "name": "Node",
+      "translation": [
+        1.43267,
+        0,
+        -0.427722007
+      ],
+      "children": [
+        3
+      ]
+    },
+    {
+      "name": "Wheels.001",
+      "rotation": [
+        0,
+        0.0884858891,
+        0,
+        -0.996077418
+      ],
+      "children": [
+        1
+      ]
+    },
+    {
+      "name": "Node.001",
+      "translation": [
+        -1.35232997,
+        0,
+        -0.427722007
+      ],
+      "children": [
+        5
+      ]
+    },
+    {
+      "name": "Cesium_Milk_Truck",
+      "children": [
+        4,
+        6,
+        2
+      ]
+    },
+    {
+      "name": "Yup2Zup",
+      "rotation": [
+        0.49999997,
+        -0.5,
+        0.5,
+        0.49999997
+      ],
+      "children": [
+        7
+      ]
+    }
+  ],
+  "scenes": [
+    {
+      "name": "Scene",
+      "nodes": [
+        8
+      ]
+    }
+  ],
+  "scene": 0
+}
diff --git a/automated-tests/resources/EnvironmentTest.gltf b/automated-tests/resources/EnvironmentTest.gltf
index 962e475..b9d85b3 100644
--- a/automated-tests/resources/EnvironmentTest.gltf
+++ b/automated-tests/resources/EnvironmentTest.gltf
@@ -178,7 +178,6 @@
                 {
                     "attributes": {
                         "POSITION": 0,
-                        "NORMAL": 1,
                         "TEXCOORD_0": 2
                     },
                     "indices": 3,
diff --git a/automated-tests/resources/EnvironmentTest_b.gltf b/automated-tests/resources/EnvironmentTest_b.gltf
new file mode 100644
index 0000000..327188f
--- /dev/null
+++ b/automated-tests/resources/EnvironmentTest_b.gltf
@@ -0,0 +1,742 @@
+{
+    "asset": {
+        "copyright": "2018 (c) Adobe Systems Inc.",
+        "generator": "Adobe Dimension - b417c10282aa66313155856d4a54e84f3f388647",
+        "version": "2.0"
+    },
+    "accessors": [
+        {
+            "bufferView": 0,
+            "componentType": 5126,
+            "count": 4598,
+            "type": "VEC3",
+            "max": [
+                10.647041320800782,
+                1.6470409631729127,
+                0.6470409631729126
+            ],
+            "min": [
+                -10.647041320800782,
+                0.3529590368270874,
+                -0.6470409631729126
+            ]
+        },
+        {
+            "bufferView": 1,
+            "componentType": 5126,
+            "count": 4598,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 2,
+            "componentType": 5126,
+            "count": 4598,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 3,
+            "componentType": 5125,
+            "count": 25344,
+            "type": "SCALAR",
+            "max": [
+                4597
+            ],
+            "min": [
+                0
+            ]
+        },
+        {
+            "bufferView": 4,
+            "componentType": 5126,
+            "count": 4598,
+            "type": "VEC3",
+            "max": [
+                10.647041320800782,
+                -0.3529590368270874,
+                0.6470409631729126
+            ],
+            "min": [
+                -10.647041320800782,
+                -1.6470409631729127,
+                -0.6470409631729126
+            ]
+        },
+        {
+            "bufferView": 5,
+            "componentType": 5126,
+            "count": 4598,
+            "type": "VEC2"
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 55176,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 55176,
+            "byteLength": 55176,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 110352,
+            "byteLength": 36784,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 147136,
+            "byteLength": 101376,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 248512,
+            "byteLength": 55176,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 303688,
+            "byteLength": 36784,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 340472,
+            "byteLength": 154456
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 494928,
+            "byteLength": 43013
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 537941,
+            "byteLength": 11813
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 549754,
+            "byteLength": 4453
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 554207,
+            "byteLength": 2078
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 556285,
+            "byteLength": 125570
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 681855,
+            "byteLength": 36447
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 718302,
+            "byteLength": 8849
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 727151,
+            "byteLength": 3451
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 730602,
+            "byteLength": 2065
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 732667,
+            "byteLength": 92105
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 824772,
+            "byteLength": 27554
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 852326,
+            "byteLength": 8036
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 860362,
+            "byteLength": 3482
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 863844,
+            "byteLength": 2030
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 865874,
+            "byteLength": 124013
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 989887,
+            "byteLength": 28336
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1018223,
+            "byteLength": 5380
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1023603,
+            "byteLength": 2757
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1026360,
+            "byteLength": 2057
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1028417,
+            "byteLength": 149369
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1177786,
+            "byteLength": 42140
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1219926,
+            "byteLength": 10382
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1230308,
+            "byteLength": 3980
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1234288,
+            "byteLength": 2116
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1236404,
+            "byteLength": 125663
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1362067,
+            "byteLength": 36946
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1399013,
+            "byteLength": 9335
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1408348,
+            "byteLength": 3602
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1411950,
+            "byteLength": 2092
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 1414042,
+            "uri": "EnvironmentTest_binary_b.bin"
+        }
+    ],
+    "cameras": [
+        {
+            "perspective": {
+                "znear": 0.0010000000474974514,
+                "yfov": 0.6024156808853149,
+                "zfar": 200.0,
+                "aspectRatio": 1.3333333730697632
+            },
+            "type": "perspective",
+            "name": "render_camera"
+        }
+    ],
+    "images": [
+        {
+            "name": "iblImage37043_pos_x_0",
+            "bufferView": 6,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_x_0",
+            "bufferView": 6,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_x_0",
+            "bufferView": 6,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_x_1",
+            "bufferView": 7,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_x_2",
+            "bufferView": 8,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_x_3",
+            "bufferView": 9,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_x_4",
+            "bufferView": 10,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_x_0",
+            "bufferView": 11,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_x_1",
+            "bufferView": 12,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_x_2",
+            "bufferView": 13,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_x_3",
+            "bufferView": 14,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_x_4",
+            "bufferView": 15,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_y_0",
+            "bufferView": 16,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_y_1",
+            "bufferView": 17,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_y_2",
+            "bufferView": 18,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_y_3",
+            "bufferView": 19,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_y_4",
+            "bufferView": 20,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_y_0",
+            "bufferView": 21,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_y_1",
+            "bufferView": 22,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_y_2",
+            "bufferView": 23,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_y_3",
+            "bufferView": 24,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_y_4",
+            "bufferView": 25,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_z_0",
+            "bufferView": 26,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_z_1",
+            "bufferView": 27,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_z_2",
+            "bufferView": 28,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_z_3",
+            "bufferView": 29,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_pos_z_4",
+            "bufferView": 30,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_z_0",
+            "bufferView": 31,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_z_1",
+            "bufferView": 32,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_z_2",
+            "bufferView": 33,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_z_3",
+            "bufferView": 34,
+            "mimeType": "image/png"
+        },
+        {
+            "name": "iblImage37043_neg_z_4",
+            "bufferView": 35,
+            "mimeType": "image/png"
+        }
+    ],
+    "materials": [
+        {
+            "pbrMetallicRoughness": {
+                "metallicRoughnessTexture": {
+                    "index": 0
+                }
+            },
+            "name": "MetallicSpheresMat",
+            "doubleSided": true
+        },
+        {
+            "pbrMetallicRoughness": {
+                "metallicRoughnessTexture": {
+                    "index": 1
+                }
+            },
+            "name": "DielectricSpheresMat",
+            "doubleSided": true
+        },
+        {
+            "pbrMetallicRoughness": {
+                "baseColorFactor": [
+                    0.0,
+                    0.0,
+                    0.0,
+                    1.0
+                ],
+                "metallicRoughnessTexture": {
+                    "index": 1
+                }
+            },
+            "name": "DielectricSpheresMat",
+            "doubleSided": true
+        }
+    ],
+    "meshes": [
+        {
+            "name": "Metallic0_N3D",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Dielectric0_N3D2",
+            "primitives": [
+                {
+                    "attributes": {
+                        "TEXCOORD_0": 5,
+                        "NORMAL": 1,
+                        "POSITION": 4
+                    },
+                    "indices": 3,
+                    "material": 1
+                }
+            ]
+        },
+        {
+            "name": "Dielectric0_N3D",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 4,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 5
+                    },
+                    "indices": 3,
+                    "material": 2
+                }
+            ]
+        }
+    ],
+    "nodes": [
+        {
+            "matrix": [
+                0.9999533295631409,
+                3.16067598760128e-8,
+                0.009662099182605744,
+                0.0,
+                0.0014864075928926468,
+                0.9880954027175903,
+                -0.15383504331111909,
+                0.0,
+                -0.009547080844640732,
+                0.15384222567081452,
+                0.988049328327179,
+                0.0,
+                -0.7599077224731445,
+                7.708760738372803,
+                27.743375778198243,
+                1.0
+            ],
+            "camera": 0,
+            "name": "render_camera_n3d"
+        },
+        {
+            "name": "ground_plane_n3d"
+        },
+        {
+            "children": [
+                3,
+                4,
+                5
+            ],
+            "matrix": [
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                -0.5564079284667969,
+                4.774584770202637,
+                -1.0962677001953126,
+                1.0
+            ],
+            "name": "ENV_Spheres"
+        },
+        {
+            "mesh": 0,
+            "name": "Metallic0"
+        },
+        {
+            "mesh": 1,
+            "name": "Dielectric0"
+        },
+        {
+            "matrix": [
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                -1.985867977142334,
+                0.0,
+                1.0
+            ],
+            "mesh": 2,
+            "name": "Dielectric0-Black"
+        }
+    ],
+    "samplers": [
+        {},
+        {}
+    ],
+    "scenes": [
+        {
+            "nodes": [
+                0,
+                1,
+                2
+            ],
+            "name": "scene",
+            "extensions": {
+                "EXT_lights_image_based": {
+                    "light": 0
+                }
+            }
+        }
+    ],
+    "textures": [
+        {
+            "name": "tmp_image_pie_dc1e_1a22_fbf9roughness_map_roughness_tmp_image_pie_dc1e_1a22_fbf9metal_map_metallic_0_texture",
+            "sampler": 0,
+            "source": 0
+        },
+        {
+            "name": "tmp_image_pie_b20b_ebb4_317droughness_map2_roughness_tmp_image_pie_b20b_ebb4_317dmetal_map2_metallic_1_texture",
+            "sampler": 1,
+            "source": 1
+        }
+    ],
+    "scene": 0,
+    "extensions": {
+        "EXT_lights_image_based": {
+            "lights": [
+                {
+                    "intensity": 1,
+                    "irradianceCoefficients": [
+                        [
+                            1.8839140747279469,
+                            1.2336689528140037,
+                            1.6815759445875259
+                        ],
+                        [
+                            1.0005113784288705,
+                            0.8691400255493019,
+                            1.4887876533795357
+                        ],
+                        [
+                            0.5603794677467341,
+                            0.2578132145126057,
+                            0.19374826573501498
+                        ],
+                        [
+                            1.3072342827477733,
+                            0.6636485650699964,
+                            0.6695344061570127
+                        ],
+                        [
+                            0.5640030294080713,
+                            0.37938937249123669,
+                            0.49194331732327276
+                        ],
+                        [
+                            0.27256774141207748,
+                            0.143343904079048,
+                            0.1155890697070088
+                        ],
+                        [
+                            -0.1381991414602802,
+                            -0.057096853570897488,
+                            -0.04879314267934546
+                        ],
+                        [
+                            0.5350810043540868,
+                            0.263230477756704,
+                            0.24531039907656564
+                        ],
+                        [
+                            0.43283339060831907,
+                            0.12637845128810608,
+                            -0.0041528480118368589
+                        ]
+                    ],
+                    "name": "imageBasedLight",
+                    "rotation": [
+                        0,
+                        0.7071067094802856,
+                        0,
+                        0.7071068286895752
+                    ],
+                    "specularImageSize": 256,
+                    "specularImages": [
+                        [
+                            2,
+                            7,
+                            12,
+                            17,
+                            22,
+                            27
+                        ],
+                        [
+                            3,
+                            8,
+                            13,
+                            18,
+                            23,
+                            28
+                        ],
+                        [
+                            4,
+                            9,
+                            14,
+                            19,
+                            24,
+                            29
+                        ],
+                        [
+                            5,
+                            10,
+                            15,
+                            20,
+                            25,
+                            30
+                        ],
+                        [
+                            6,
+                            11,
+                            16,
+                            21,
+                            26,
+                            31
+                        ]
+                    ]
+                }
+            ]
+        }
+    },
+    "extensionsUsed": [
+        "EXT_lights_image_based"
+    ]
+}
\ No newline at end of file
diff --git a/automated-tests/resources/EnvironmentTest_binary_b.bin b/automated-tests/resources/EnvironmentTest_binary_b.bin
new file mode 100644
index 0000000..ebe7df0
Binary files /dev/null and b/automated-tests/resources/EnvironmentTest_binary_b.bin differ
diff --git a/automated-tests/resources/EnvironmentTest_images/roughness_metallic_0.jpg b/automated-tests/resources/EnvironmentTest_images/roughness_metallic_0.jpg
new file mode 100644
index 0000000..8ba03d3
Binary files /dev/null and b/automated-tests/resources/EnvironmentTest_images/roughness_metallic_0.jpg differ
diff --git a/automated-tests/resources/EnvironmentTest_images/roughness_metallic_1.jpg b/automated-tests/resources/EnvironmentTest_images/roughness_metallic_1.jpg
new file mode 100644
index 0000000..d695618
Binary files /dev/null and b/automated-tests/resources/EnvironmentTest_images/roughness_metallic_1.jpg differ
diff --git a/automated-tests/resources/MRendererTest.gltf b/automated-tests/resources/MRendererTest.gltf
new file mode 100644
index 0000000..bfd45b4
--- /dev/null
+++ b/automated-tests/resources/MRendererTest.gltf
@@ -0,0 +1,179 @@
+{
+  "scene" : 0,
+  "scenes" : [
+    {
+      "nodes" : [ 0 ]
+    }
+  ],
+
+  "nodes" : [
+    {
+      "mesh" : 0,
+      "rotation" : [ 0.0, 0.0, 0.0, 1.0 ],
+      "scale": [
+          100.0,
+          100.0,
+          100.0
+      ],
+      "name": "RootNode"
+    }
+  ],
+
+  "meshes" : [
+    {
+      "primitives" : [ {
+        "attributes" : {
+          "POSITION" : 1
+        },
+        "indices" : 0,
+        "material": 0
+      } ]
+    }
+  ],
+
+  "animations": [
+    {
+      "samplers" : [
+        {
+          "input" : 2,
+          "interpolation" : "LINEAR",
+          "output" : 3
+        }
+      ],
+      "channels" : [ {
+        "sampler" : 0,
+        "target" : {
+          "node" : 0,
+          "path" : "rotation"
+        }
+      } ]
+    }
+  ],
+
+  "buffers" : [
+    {
+      "uri" : "simpleTriangle.bin",
+      "byteLength" : 44
+    },
+    {
+      "uri" : "animation.bin",
+      "byteLength" : 100
+    }
+  ],
+
+  "bufferViews" : [
+    {
+      "buffer" : 0,
+      "byteOffset" : 0,
+      "byteLength" : 6,
+      "target" : 34963
+    },
+    {
+      "buffer" : 0,
+      "byteOffset" : 8,
+      "byteLength" : 36,
+      "target" : 34962
+    },
+    {
+      "buffer" : 1,
+      "byteOffset" : 0,
+      "byteLength" : 100
+    }
+  ],
+
+  "accessors" : [
+    {
+      "bufferView" : 0,
+      "byteOffset" : 0,
+      "componentType" : 5123,
+      "count" : 3,
+      "type" : "SCALAR",
+      "max" : [ 2 ],
+      "min" : [ 0 ]
+    },
+    {
+      "bufferView" : 1,
+      "byteOffset" : 0,
+      "componentType" : 5126,
+      "count" : 3,
+      "type" : "VEC3",
+      "max" : [ 1.0, 1.0, 0.0 ],
+      "min" : [ 0.0, 0.0, 0.0 ]
+    },
+    {
+      "bufferView" : 2,
+      "byteOffset" : 0,
+      "componentType" : 5126,
+      "count" : 5,
+      "type" : "SCALAR",
+      "max" : [ 1.0 ],
+      "min" : [ 0.0 ]
+    },
+    {
+      "bufferView" : 2,
+      "byteOffset" : 20,
+      "componentType" : 5126,
+      "count" : 5,
+      "type" : "VEC4",
+      "max" : [ 0.0, 0.0, 1.0, 1.0 ],
+      "min" : [ 0.0, 0.0, 0.0, -0.707 ]
+    }
+  ],
+
+  "asset" : {
+    "generator": "glTF Tools for M-Renderer",
+    "version" : "2.0"
+  },
+
+  "materials": [
+    {
+      "pbrMetallicRoughness":
+      {
+        "baseColorTexture":
+        {
+          "index": 0,
+          "texCoord": 0
+        },
+        "metallicFactor": 0,
+        "baseColorFactor":
+        [
+          1,
+          1,
+          1,
+          1
+        ],
+        "roughnessFactor": 1
+      },
+      "emissiveFactor":
+      [
+        0,
+        0,
+        0
+      ],
+      "alphaMode": "BLEND",
+      "doubleSided": false
+    }
+  ],
+
+  "textures": [
+    {
+      "sampler": 0,
+      "source": 0
+    }
+  ],
+
+  "images": [
+    {
+      "uri": "AnimatedCube_BaseColor.png"
+    }
+  ],
+
+  "samplers": [
+    {
+      "magFilter": 9729,
+      "minFilter": 9986,
+      "wrapS": 10497,
+      "wrapT": 10497
+    }
+  ]
+}
diff --git a/automated-tests/resources/MorphPrimitivesTest.gltf b/automated-tests/resources/MorphPrimitivesTest.gltf
index a987f2d..10fb1e7 100644
--- a/automated-tests/resources/MorphPrimitivesTest.gltf
+++ b/automated-tests/resources/MorphPrimitivesTest.gltf
@@ -291,7 +291,15 @@
           ],
           "mode": 4
         }
-      ]
+      ],
+      "extensions": {
+        "SXR_targets_names": {
+          "Target_0": 0
+        },
+        "avatar_shape_names": {
+          "Target_0": 0
+        }
+      }
     }
   ],
   "nodes": [
diff --git a/automated-tests/resources/MorphPrimitivesTestQuantized.bin b/automated-tests/resources/MorphPrimitivesTestQuantized.bin
new file mode 100644
index 0000000..fce9aac
Binary files /dev/null and b/automated-tests/resources/MorphPrimitivesTestQuantized.bin differ
diff --git a/automated-tests/resources/MorphPrimitivesTestQuantized.gltf b/automated-tests/resources/MorphPrimitivesTestQuantized.gltf
new file mode 100644
index 0000000..4e3e2fe
--- /dev/null
+++ b/automated-tests/resources/MorphPrimitivesTestQuantized.gltf
@@ -0,0 +1,321 @@
+{
+  "buffers": [
+    {
+      "uri": "MorphPrimitivesTestQuantized.bin",
+      "byteLength": 912
+    }
+  ],
+  "asset": {
+    "version": "2.0",
+    "generator": "gltfpack 0.18",
+    "extras": {
+      "title": "multiple_primitives",
+      "author": "ft-lab",
+      "license": "CC BY-4.0 (https://creativecommons.org/licenses/by/4.0/)"
+    }
+  },
+  "extensionsUsed": [
+    "KHR_mesh_quantization",
+    "KHR_texture_transform"
+  ],
+  "extensionsRequired": [
+    "KHR_mesh_quantization"
+  ],
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteOffset": 0,
+      "byteLength": 240,
+      "byteStride": 8,
+      "target": 34962
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 240,
+      "byteLength": 240,
+      "byteStride": 8,
+      "target": 34962
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 480,
+      "byteLength": 120,
+      "byteStride": 4,
+      "target": 34962
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 600,
+      "byteLength": 120,
+      "byteStride": 4,
+      "target": 34962
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 720,
+      "byteLength": 192,
+      "target": 34963
+    }
+  ],
+  "accessors": [
+    {
+      "bufferView": 0,
+      "byteOffset": 0,
+      "componentType": 5122,
+      "count": 21,
+      "type": "VEC3",
+      "normalized": true
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 0,
+      "componentType": 5123,
+      "count": 21,
+      "type": "VEC3",
+      "min": [
+        0,
+        0,
+        0
+      ],
+      "max": [
+        1,
+        0,
+        1
+      ]
+    },
+    {
+      "bufferView": 2,
+      "byteOffset": 0,
+      "componentType": 5123,
+      "count": 21,
+      "type": "VEC2",
+      "normalized": true
+    },
+    {
+      "bufferView": 3,
+      "byteOffset": 0,
+      "componentType": 5120,
+      "count": 21,
+      "type": "VEC3",
+      "min": [
+        0,
+        0,
+        0
+      ],
+      "max": [
+        0,
+        0,
+        0
+      ]
+    },
+    {
+      "bufferView": 4,
+      "byteOffset": 0,
+      "componentType": 5123,
+      "count": 72,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 1,
+      "byteOffset": 168,
+      "componentType": 5123,
+      "count": 9,
+      "type": "VEC3",
+      "min": [
+        1,
+        0,
+        0
+      ],
+      "max": [
+        1,
+        0,
+        1
+      ]
+    },
+    {
+      "bufferView": 0,
+      "byteOffset": 168,
+      "componentType": 5122,
+      "count": 9,
+      "type": "VEC3",
+      "normalized": true
+    },
+    {
+      "bufferView": 2,
+      "byteOffset": 84,
+      "componentType": 5123,
+      "count": 9,
+      "type": "VEC2",
+      "normalized": true
+    },
+    {
+      "bufferView": 3,
+      "byteOffset": 84,
+      "componentType": 5120,
+      "count": 9,
+      "type": "VEC3",
+      "min": [
+        0,
+        0,
+        0
+      ],
+      "max": [
+        0,
+        0,
+        0
+      ]
+    },
+    {
+      "bufferView": 4,
+      "byteOffset": 144,
+      "componentType": 5123,
+      "count": 24,
+      "type": "SCALAR"
+    }
+  ],
+  "samplers": [
+    {
+      "minFilter": 9729
+    }
+  ],
+  "images": [
+    {
+      "uri": "uv_texture.jpg"
+    }
+  ],
+  "textures": [
+    {
+      "sampler": 0,
+      "source": 0
+    }
+  ],
+  "materials": [
+    {
+      "name": "red",
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          1,
+          0,
+          0,
+          1
+        ],
+        "baseColorTexture": {
+          "index": 0,
+          "extensions": {
+            "KHR_texture_transform": {
+              "offset": [
+                0,
+                0
+              ],
+              "scale": [
+                65535,
+                65535
+              ]
+            }
+          }
+        },
+        "metallicFactor": 0
+      }
+    },
+    {
+      "name": "green",
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          0,
+          1,
+          0,
+          1
+        ],
+        "baseColorTexture": {
+          "index": 0,
+          "extensions": {
+            "KHR_texture_transform": {
+              "offset": [
+                0,
+                0
+              ],
+              "scale": [
+                32767.5,
+                32767.5
+              ]
+            }
+          }
+        },
+        "metallicFactor": 0
+      }
+    }
+  ],
+  "meshes": [
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "NORMAL": 0,
+            "POSITION": 1,
+            "TEXCOORD_0": 2
+          },
+          "targets": [
+            {
+              "POSITION": 3
+            }
+          ],
+          "indices": 4,
+          "material": 0
+        },
+        {
+          "attributes": {
+            "POSITION": 5,
+            "NORMAL": 6,
+            "TEXCOORD_0": 7
+          },
+          "targets": [
+            {
+              "POSITION": 8
+            }
+          ],
+          "indices": 9,
+          "material": 1
+        }
+      ],
+      "weights": [
+        0.5
+      ]
+    }
+  ],
+  "nodes": [
+    {
+      "mesh": 0,
+      "translation": [
+        -0.5,
+        -0.400000006,
+        -0.5
+      ],
+      "scale": [
+        1,
+        1,
+        1
+      ]
+    },
+    {
+      "name": "ルートパート",
+      "children": [
+        2
+      ]
+    },
+    {
+      "name": "mesh",
+      "children": [
+        0
+      ]
+    }
+  ],
+  "scenes": [
+    {
+      "name": "Scene",
+      "nodes": [
+        1
+      ]
+    }
+  ],
+  "scene": 0
+}
diff --git a/automated-tests/resources/TextureTransformMultiTest.bin b/automated-tests/resources/TextureTransformMultiTest.bin
new file mode 100644
index 0000000..1dd626e
Binary files /dev/null and b/automated-tests/resources/TextureTransformMultiTest.bin differ
diff --git a/automated-tests/resources/TextureTransformMultiTest.gltf b/automated-tests/resources/TextureTransformMultiTest.gltf
new file mode 100644
index 0000000..9f37ec0
--- /dev/null
+++ b/automated-tests/resources/TextureTransformMultiTest.gltf
@@ -0,0 +1,3186 @@
+{
+    "asset" : {
+        "copyright" : "Copyright 2020 Analytical Graphics, Inc, CC-BY 4.0 https://creativecommons.org/licenses/by/4.0/ - Model and textures by Ed Mackey.",
+        "generator" : "Khronos glTF Blender I/O v1.2.75",
+        "version" : "2.0"
+    },
+    "extensionsUsed" : [
+        "KHR_texture_transform",
+        "KHR_materials_unlit",
+        "KHR_materials_clearcoat"
+    ],
+    "extensionsRequired" : [
+        "KHR_texture_transform"
+    ],
+    "scene" : 0,
+    "scenes" : [
+        {
+            "name" : "Scene",
+            "nodes" : [
+                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
+            ]
+        }
+    ],
+    "nodes" : [
+        {
+            "mesh" : 0,
+            "name" : "BaseColorUV0",
+            "translation" : [
+                0.10000000149011612,
+                0.75,
+                0
+            ]
+        },
+        {
+            "mesh" : 1,
+            "name" : "BaseColorUV1",
+            "translation" : [
+                0.3499999940395355,
+                0.75,
+                0
+            ]
+        },
+        {
+            "mesh" : 2,
+            "name" : "BaseColorSample",
+            "translation" : [
+                0.6000000238418579,
+                0.75,
+                0
+            ]
+        },
+        {
+            "mesh" : 3,
+            "name" : "Background",
+            "translation" : [
+                0,
+                0,
+                -0.02500000037252903
+            ]
+        },
+        {
+            "mesh" : 4,
+            "name" : "Labels"
+        },
+        {
+            "mesh" : 5,
+            "name" : "EmissionUV0",
+            "translation" : [
+                0.10000000149011612,
+                0.5,
+                0
+            ]
+        },
+        {
+            "mesh" : 6,
+            "name" : "EmissionUV1",
+            "translation" : [
+                0.3499999940395355,
+                0.5,
+                0
+            ]
+        },
+        {
+            "mesh" : 7,
+            "name" : "EmissionSample",
+            "translation" : [
+                0.6000000238418579,
+                0.5,
+                0
+            ]
+        },
+        {
+            "mesh" : 8,
+            "name" : "NormalUV0",
+            "translation" : [
+                0.10000000149011612,
+                0.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 9,
+            "name" : "NormalUV1",
+            "translation" : [
+                0.3499999940395355,
+                0.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 10,
+            "name" : "NormalSample",
+            "translation" : [
+                0.6000000238418579,
+                0.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 11,
+            "name" : "MetalRoughUV0",
+            "translation" : [
+                0.10000000149011612,
+                0,
+                0
+            ]
+        },
+        {
+            "mesh" : 12,
+            "name" : "MetalRoughUV1",
+            "translation" : [
+                0.3499999940395355,
+                0,
+                0
+            ]
+        },
+        {
+            "mesh" : 13,
+            "name" : "MetalRoughSample",
+            "translation" : [
+                0.6000000238418579,
+                0,
+                0
+            ]
+        },
+        {
+            "mesh" : 14,
+            "name" : "OcclusionUV0",
+            "translation" : [
+                0.10000000149011612,
+                -0.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 15,
+            "name" : "OcclusionUV1",
+            "translation" : [
+                0.3499999940395355,
+                -0.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 16,
+            "name" : "OcclusionSample",
+            "translation" : [
+                0.6000000238418579,
+                -0.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 17,
+            "name" : "UnlitUV0",
+            "translation" : [
+                0.10000000149011612,
+                -0.5,
+                0
+            ]
+        },
+        {
+            "mesh" : 18,
+            "name" : "UnlitUV1",
+            "translation" : [
+                0.3499999940395355,
+                -0.5,
+                0
+            ]
+        },
+        {
+            "mesh" : 19,
+            "name" : "UnlitSample",
+            "translation" : [
+                0.6000000238418579,
+                -0.5,
+                0
+            ]
+        },
+        {
+            "mesh" : 20,
+            "name" : "ClearcoatUV0",
+            "translation" : [
+                0.10000000149011612,
+                -0.75,
+                0
+            ]
+        },
+        {
+            "mesh" : 21,
+            "name" : "ClearcoatUV1",
+            "translation" : [
+                0.3499999940395355,
+                -0.75,
+                0
+            ]
+        },
+        {
+            "mesh" : 22,
+            "name" : "ClearcoatSample",
+            "translation" : [
+                0.6000000238418579,
+                -0.75,
+                0
+            ]
+        },
+        {
+            "mesh" : 23,
+            "name" : "ClearcoatRoughUV0",
+            "translation" : [
+                0.10000000149011612,
+                -1,
+                0
+            ]
+        },
+        {
+            "mesh" : 24,
+            "name" : "ClearcoatRoughUV1",
+            "translation" : [
+                0.3499999940395355,
+                -1,
+                0
+            ]
+        },
+        {
+            "mesh" : 25,
+            "name" : "ClearcoatRoughSample",
+            "translation" : [
+                0.6000000238418579,
+                -1,
+                0
+            ]
+        },
+        {
+            "mesh" : 26,
+            "name" : "ClearcoatNormalUV0",
+            "translation" : [
+                0.10000000149011612,
+                -1.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 27,
+            "name" : "ClearcoatNormalUV1",
+            "translation" : [
+                0.3499999940395355,
+                -1.25,
+                0
+            ]
+        },
+        {
+            "mesh" : 28,
+            "name" : "ClearcoatNormalSample",
+            "translation" : [
+                0.6000000238418579,
+                -1.25,
+                0
+            ]
+        }
+    ],
+    "materials" : [
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "BaseColorTest0Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "extensions" : {
+                        "KHR_texture_transform" : {
+                            "offset" : [
+                                0.7049999535083774,
+                                0.28500004152502995
+                            ],
+                            "rotation" : 1.5707963705062866,
+                            "scale" : [
+                                0.3499999940395355,
+                                0.3499999940395355
+                            ]
+                        }
+                    },
+                    "index" : 0,
+                    "texCoord" : 0
+                },
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "BaseColorTest1Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "extensions" : {
+                        "KHR_texture_transform" : {
+                            "offset" : [
+                                0.7049999535083774,
+                                0.28500004152502995
+                            ],
+                            "rotation" : 1.5707963705062866,
+                            "scale" : [
+                                0.3499999940395355,
+                                0.3499999940395355
+                            ]
+                        }
+                    },
+                    "index" : 1,
+                    "texCoord" : 1
+                },
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "BaseColorSampleMat",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 2,
+                    "texCoord" : 0
+                },
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "doubleSided" : true,
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "BackgroundMat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.007408552337437868,
+                    0.07486194372177124,
+                    0.4639684557914734,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "doubleSided" : true,
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "LabelMat",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 3,
+                    "texCoord" : 0
+                },
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                1,
+                1,
+                1
+            ],
+            "emissiveTexture" : {
+                "extensions" : {
+                    "KHR_texture_transform" : {
+                        "offset" : [
+                            0.7049999535083774,
+                            0.28500004152502995
+                        ],
+                        "rotation" : 1.5707963705062866,
+                        "scale" : [
+                            0.3499999940395355,
+                            0.3499999940395355
+                        ]
+                    }
+                },
+                "index" : 4,
+                "texCoord" : 0
+            },
+            "name" : "EmissionTest0Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0,
+                    0.15000000596046448,
+                    0,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                1,
+                1,
+                1
+            ],
+            "emissiveTexture" : {
+                "extensions" : {
+                    "KHR_texture_transform" : {
+                        "offset" : [
+                            0.7049999535083774,
+                            0.28500004152502995
+                        ],
+                        "rotation" : 1.5707963705062866,
+                        "scale" : [
+                            0.3499999940395355,
+                            0.3499999940395355
+                        ]
+                    }
+                },
+                "index" : 5,
+                "texCoord" : 1
+            },
+            "name" : "EmissionTest1Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0,
+                    0.15000000596046448,
+                    0,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                1,
+                1,
+                1
+            ],
+            "emissiveTexture" : {
+                "index" : 6,
+                "texCoord" : 0
+            },
+            "name" : "EmissionSampleMat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0,
+                    0.15000000596046448,
+                    0,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "NormalTest0Mat",
+            "normalTexture" : {
+                "extensions" : {
+                    "KHR_texture_transform" : {
+                        "offset" : [
+                            0.7049999535083774,
+                            0.28500004152502995
+                        ],
+                        "rotation" : 1.5707963705062866,
+                        "scale" : [
+                            0.3499999940395355,
+                            0.3499999940395355
+                        ]
+                    }
+                },
+                "index" : 7,
+                "texCoord" : 0
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.10000000149011612
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "NormalTest1Mat",
+            "normalTexture" : {
+                "extensions" : {
+                    "KHR_texture_transform" : {
+                        "offset" : [
+                            0.7049999535083774,
+                            0.28500004152502995
+                        ],
+                        "rotation" : 1.5707963705062866,
+                        "scale" : [
+                            0.3499999940395355,
+                            0.3499999940395355
+                        ]
+                    }
+                },
+                "index" : 8,
+                "texCoord" : 1
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.10000000149011612
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "NormalSampleMat",
+            "normalTexture" : {
+                "index" : 9,
+                "texCoord" : 0
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.10000000149011612
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "MetalRoughTest0Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicRoughnessTexture" : {
+                    "extensions" : {
+                        "KHR_texture_transform" : {
+                            "offset" : [
+                                0.7049999535083774,
+                                0.28500004152502995
+                            ],
+                            "rotation" : 1.5707963705062866,
+                            "scale" : [
+                                0.3499999940395355,
+                                0.3499999940395355
+                            ]
+                        }
+                    },
+                    "index" : 10,
+                    "texCoord" : 0
+                }
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "MetalRoughTest1Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicRoughnessTexture" : {
+                    "extensions" : {
+                        "KHR_texture_transform" : {
+                            "offset" : [
+                                0.7049999535083774,
+                                0.28500004152502995
+                            ],
+                            "rotation" : 1.5707963705062866,
+                            "scale" : [
+                                0.3499999940395355,
+                                0.3499999940395355
+                            ]
+                        }
+                    },
+                    "index" : 11,
+                    "texCoord" : 1
+                }
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "MetalRoughSampleMat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicRoughnessTexture" : {
+                    "index" : 12,
+                    "texCoord" : 0
+                }
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "OcclusionTest0Mat",
+            "occlusionTexture" : {
+                "extensions" : {
+                    "KHR_texture_transform" : {
+                        "offset" : [
+                            0.7049999535083774,
+                            0.28500004152502995
+                        ],
+                        "rotation" : 1.5707963705062866,
+                        "scale" : [
+                            0.3499999940395355,
+                            0.3499999940395355
+                        ]
+                    }
+                },
+                "index" : 13,
+                "texCoord" : 0
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "OcclusionTest1Mat",
+            "occlusionTexture" : {
+                "extensions" : {
+                    "KHR_texture_transform" : {
+                        "offset" : [
+                            0.7049999535083774,
+                            0.28500004152502995
+                        ],
+                        "rotation" : 1.5707963705062866,
+                        "scale" : [
+                            0.3499999940395355,
+                            0.3499999940395355
+                        ]
+                    }
+                },
+                "index" : 14,
+                "texCoord" : 1
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "name" : "OcclusionSampleMat",
+            "occlusionTexture" : {
+                "index" : 15,
+                "texCoord" : 0
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "extensions" : {
+                "KHR_materials_unlit" : {}
+            },
+            "name" : "UnlitTest0Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "extensions" : {
+                        "KHR_texture_transform" : {
+                            "offset" : [
+                                0.7049999535083774,
+                                0.28500004152502995
+                            ],
+                            "rotation" : 1.5707963705062866,
+                            "scale" : [
+                                0.3499999940395355,
+                                0.3499999940395355
+                            ]
+                        }
+                    },
+                    "index" : 16,
+                    "texCoord" : 0
+                }
+            }
+        },
+        {
+            "extensions" : {
+                "KHR_materials_unlit" : {}
+            },
+            "name" : "UnlitTest1Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "extensions" : {
+                        "KHR_texture_transform" : {
+                            "offset" : [
+                                0.7049999535083774,
+                                0.28500004152502995
+                            ],
+                            "rotation" : 1.5707963705062866,
+                            "scale" : [
+                                0.3499999940395355,
+                                0.3499999940395355
+                            ]
+                        }
+                    },
+                    "index" : 17,
+                    "texCoord" : 1
+                }
+            }
+        },
+        {
+            "extensions" : {
+                "KHR_materials_unlit" : {}
+            },
+            "name" : "UnlitSampleMat",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 18,
+                    "texCoord" : 0
+                }
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 0.029999999329447746,
+                    "clearcoatTexture" : {
+                        "extensions" : {
+                            "KHR_texture_transform" : {
+                                "offset" : [
+                                    0.7049999535083774,
+                                    0.28500004152502995
+                                ],
+                                "rotation" : 1.5707963705062866,
+                                "scale" : [
+                                    0.3499999940395355,
+                                    0.3499999940395355
+                                ]
+                            }
+                        },
+                        "index" : 19,
+                        "texCoord" : 0
+                    }
+                }
+            },
+            "name" : "ClearcoatTest0Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 0.029999999329447746,
+                    "clearcoatTexture" : {
+                        "extensions" : {
+                            "KHR_texture_transform" : {
+                                "offset" : [
+                                    0.7049999535083774,
+                                    0.28500004152502995
+                                ],
+                                "rotation" : 1.5707963705062866,
+                                "scale" : [
+                                    0.3499999940395355,
+                                    0.3499999940395355
+                                ]
+                            }
+                        },
+                        "index" : 20,
+                        "texCoord" : 1
+                    }
+                }
+            },
+            "name" : "ClearcoatTest1Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 0.029999999329447746,
+                    "clearcoatTexture" : {
+                        "index" : 21,
+                        "texCoord" : 0
+                    }
+                }
+            },
+            "name" : "ClearcoatSampleMat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 1,
+                    "clearcoatRoughnessTexture" : {
+                        "extensions" : {
+                            "KHR_texture_transform" : {
+                                "offset" : [
+                                    0.7049999535083774,
+                                    0.28500004152502995
+                                ],
+                                "rotation" : 1.5707963705062866,
+                                "scale" : [
+                                    0.3499999940395355,
+                                    0.3499999940395355
+                                ]
+                            }
+                        },
+                        "index" : 22,
+                        "texCoord" : 0
+                    }
+                }
+            },
+            "name" : "ClearcoatRoughTest0Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 1,
+                    "clearcoatRoughnessTexture" : {
+                        "extensions" : {
+                            "KHR_texture_transform" : {
+                                "offset" : [
+                                    0.7049999535083774,
+                                    0.28500004152502995
+                                ],
+                                "rotation" : 1.5707963705062866,
+                                "scale" : [
+                                    0.3499999940395355,
+                                    0.3499999940395355
+                                ]
+                            }
+                        },
+                        "index" : 23,
+                        "texCoord" : 1
+                    }
+                }
+            },
+            "name" : "ClearcoatRoughTest1Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 1,
+                    "clearcoatRoughnessTexture" : {
+                        "index" : 24,
+                        "texCoord" : 0
+                    }
+                }
+            },
+            "name" : "ClearcoatRoughSampleMat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 0.029999999329447746,
+                    "clearcoatNormalTexture" : {
+                        "extensions" : {
+                            "KHR_texture_transform" : {
+                                "offset" : [
+                                    0.7049999535083774,
+                                    0.28500004152502995
+                                ],
+                                "rotation" : 1.5707963705062866,
+                                "scale" : [
+                                    0.3499999940395355,
+                                    0.3499999940395355
+                                ]
+                            }
+                        },
+                        "index" : 25,
+                        "texCoord" : 0
+                    }
+                }
+            },
+            "name" : "ClearcoatNormalTest0Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 0.029999999329447746,
+                    "clearcoatNormalTexture" : {
+                        "extensions" : {
+                            "KHR_texture_transform" : {
+                                "offset" : [
+                                    0.7049999535083774,
+                                    0.28500004152502995
+                                ],
+                                "rotation" : 1.5707963705062866,
+                                "scale" : [
+                                    0.3499999940395355,
+                                    0.3499999940395355
+                                ]
+                            }
+                        },
+                        "index" : 26,
+                        "texCoord" : 1
+                    }
+                }
+            },
+            "name" : "ClearcoatNormalTest1Mat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        },
+        {
+            "emissiveFactor" : [
+                0,
+                0,
+                0
+            ],
+            "extensions" : {
+                "KHR_materials_clearcoat" : {
+                    "clearcoatFactor" : 1,
+                    "clearcoatRoughnessFactor" : 0.029999999329447746,
+                    "clearcoatNormalTexture" : {
+                        "index" : 27,
+                        "texCoord" : 0
+                    }
+                }
+            },
+            "name" : "ClearcoatNormalSampleMat",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.0040703266859054565,
+                    0.030168700963258743,
+                    0.16859287023544312,
+                    1
+                ],
+                "metallicFactor" : 1,
+                "roughnessFactor" : 1
+            }
+        }
+    ],
+    "meshes" : [
+        {
+            "name" : "BaseColorUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 0,
+                        "NORMAL" : 1,
+                        "TEXCOORD_0" : 2,
+                        "TEXCOORD_1" : 3
+                    },
+                    "indices" : 4,
+                    "material" : 0
+                }
+            ]
+        },
+        {
+            "name" : "BaseColorUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 5,
+                        "NORMAL" : 6,
+                        "TEXCOORD_0" : 7,
+                        "TEXCOORD_1" : 8
+                    },
+                    "indices" : 4,
+                    "material" : 1
+                }
+            ]
+        },
+        {
+            "name" : "BaseColorSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 9,
+                        "NORMAL" : 10,
+                        "TEXCOORD_0" : 11
+                    },
+                    "indices" : 4,
+                    "material" : 2
+                }
+            ]
+        },
+        {
+            "name" : "BackgroundMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 12,
+                        "NORMAL" : 13
+                    },
+                    "indices" : 4,
+                    "material" : 3
+                }
+            ]
+        },
+        {
+            "name" : "LabelMesh",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 14,
+                        "NORMAL" : 15,
+                        "TEXCOORD_0" : 16
+                    },
+                    "indices" : 17,
+                    "material" : 4
+                }
+            ]
+        },
+        {
+            "name" : "EmissionUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 18,
+                        "NORMAL" : 19,
+                        "TEXCOORD_0" : 20,
+                        "TEXCOORD_1" : 21
+                    },
+                    "indices" : 4,
+                    "material" : 5
+                }
+            ]
+        },
+        {
+            "name" : "EmissionUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 22,
+                        "NORMAL" : 23,
+                        "TEXCOORD_0" : 24,
+                        "TEXCOORD_1" : 25
+                    },
+                    "indices" : 4,
+                    "material" : 6
+                }
+            ]
+        },
+        {
+            "name" : "EmissionSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 26,
+                        "NORMAL" : 27,
+                        "TEXCOORD_0" : 28
+                    },
+                    "indices" : 4,
+                    "material" : 7
+                }
+            ]
+        },
+        {
+            "name" : "NormalUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 29,
+                        "NORMAL" : 30,
+                        "TEXCOORD_0" : 31,
+                        "TEXCOORD_1" : 32
+                    },
+                    "indices" : 4,
+                    "material" : 8
+                }
+            ]
+        },
+        {
+            "name" : "NormalUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 33,
+                        "NORMAL" : 34,
+                        "TEXCOORD_0" : 35,
+                        "TEXCOORD_1" : 36
+                    },
+                    "indices" : 4,
+                    "material" : 9
+                }
+            ]
+        },
+        {
+            "name" : "NormalSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 37,
+                        "NORMAL" : 38,
+                        "TEXCOORD_0" : 39
+                    },
+                    "indices" : 4,
+                    "material" : 10
+                }
+            ]
+        },
+        {
+            "name" : "MetalRoughUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 40,
+                        "NORMAL" : 41,
+                        "TEXCOORD_0" : 42,
+                        "TEXCOORD_1" : 43
+                    },
+                    "indices" : 4,
+                    "material" : 11
+                }
+            ]
+        },
+        {
+            "name" : "MetalRoughUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 44,
+                        "NORMAL" : 45,
+                        "TEXCOORD_0" : 46,
+                        "TEXCOORD_1" : 47
+                    },
+                    "indices" : 4,
+                    "material" : 12
+                }
+            ]
+        },
+        {
+            "name" : "MetalRoughSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 48,
+                        "NORMAL" : 49,
+                        "TEXCOORD_0" : 50
+                    },
+                    "indices" : 4,
+                    "material" : 13
+                }
+            ]
+        },
+        {
+            "name" : "OcclusionUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 51,
+                        "NORMAL" : 52,
+                        "TEXCOORD_0" : 53,
+                        "TEXCOORD_1" : 54
+                    },
+                    "indices" : 4,
+                    "material" : 14
+                }
+            ]
+        },
+        {
+            "name" : "OcclusionUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 55,
+                        "NORMAL" : 56,
+                        "TEXCOORD_0" : 57,
+                        "TEXCOORD_1" : 58
+                    },
+                    "indices" : 4,
+                    "material" : 15
+                }
+            ]
+        },
+        {
+            "name" : "OcclusionSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 59,
+                        "NORMAL" : 60,
+                        "TEXCOORD_0" : 61
+                    },
+                    "indices" : 4,
+                    "material" : 16
+                }
+            ]
+        },
+        {
+            "name" : "UnlitUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 62,
+                        "NORMAL" : 63,
+                        "TEXCOORD_0" : 64,
+                        "TEXCOORD_1" : 65
+                    },
+                    "indices" : 4,
+                    "material" : 17
+                }
+            ]
+        },
+        {
+            "name" : "UnlitUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 66,
+                        "NORMAL" : 67,
+                        "TEXCOORD_0" : 68,
+                        "TEXCOORD_1" : 69
+                    },
+                    "indices" : 4,
+                    "material" : 18
+                }
+            ]
+        },
+        {
+            "name" : "UnlitSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 70,
+                        "NORMAL" : 71,
+                        "TEXCOORD_0" : 72
+                    },
+                    "indices" : 4,
+                    "material" : 19
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 73,
+                        "NORMAL" : 74,
+                        "TEXCOORD_0" : 75,
+                        "TEXCOORD_1" : 76
+                    },
+                    "indices" : 77,
+                    "material" : 20
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 78,
+                        "NORMAL" : 79,
+                        "TEXCOORD_0" : 80,
+                        "TEXCOORD_1" : 81
+                    },
+                    "indices" : 77,
+                    "material" : 21
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 82,
+                        "NORMAL" : 83,
+                        "TEXCOORD_0" : 84
+                    },
+                    "indices" : 77,
+                    "material" : 22
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoarRoughUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 85,
+                        "NORMAL" : 86,
+                        "TEXCOORD_0" : 87,
+                        "TEXCOORD_1" : 88
+                    },
+                    "indices" : 77,
+                    "material" : 23
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatRoughUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 89,
+                        "NORMAL" : 90,
+                        "TEXCOORD_0" : 91,
+                        "TEXCOORD_1" : 92
+                    },
+                    "indices" : 77,
+                    "material" : 24
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatRoughSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 93,
+                        "NORMAL" : 94,
+                        "TEXCOORD_0" : 95
+                    },
+                    "indices" : 77,
+                    "material" : 25
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatNormalUV0",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 96,
+                        "NORMAL" : 97,
+                        "TEXCOORD_0" : 98,
+                        "TEXCOORD_1" : 99
+                    },
+                    "indices" : 4,
+                    "material" : 26
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatNormalUV1",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 100,
+                        "NORMAL" : 101,
+                        "TEXCOORD_0" : 102,
+                        "TEXCOORD_1" : 103
+                    },
+                    "indices" : 4,
+                    "material" : 27
+                }
+            ]
+        },
+        {
+            "name" : "ClearcoatNormalSample",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 104,
+                        "NORMAL" : 105,
+                        "TEXCOORD_0" : 106
+                    },
+                    "indices" : 4,
+                    "material" : 28
+                }
+            ]
+        }
+    ],
+    "textures" : [
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 1
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 2
+        },
+        {
+            "source" : 2
+        },
+        {
+            "source" : 2
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 0
+        },
+        {
+            "source" : 3
+        },
+        {
+            "source" : 3
+        },
+        {
+            "source" : 3
+        },
+        {
+            "source" : 2
+        },
+        {
+            "source" : 2
+        },
+        {
+            "source" : 2
+        }
+    ],
+    "images" : [
+        {
+            "mimeType" : "image/png",
+            "name" : "TestMap",
+            "uri" : "TestMap.png"
+        },
+        {
+            "mimeType" : "image/png",
+            "name" : "TTMT_Labels",
+            "uri" : "TTMT_Labels.png"
+        },
+        {
+            "mimeType" : "image/png",
+            "name" : "TestMap_Normal",
+            "uri" : "TestMap_Normal.png"
+        },
+        {
+            "mimeType" : "image/png",
+            "name" : "TestMap",
+            "uri" : "TestMap-1.png"
+        }
+    ],
+    "accessors" : [
+        {
+            "bufferView" : 0,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 1,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 2,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 3,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 4,
+            "componentType" : 5123,
+            "count" : 6,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 5,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 6,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 7,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 8,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 9,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 10,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 11,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 12,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.9999999403953552,
+                1,
+                0
+            ],
+            "min" : [
+                -0.9999999403953552,
+                -1.399999976158142,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 13,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 14,
+            "componentType" : 5126,
+            "count" : 48,
+            "max" : [
+                0.8163908123970032,
+                0.9983971118927002,
+                0
+            ],
+            "min" : [
+                -0.9999999403953552,
+                -1.3177802562713623,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 15,
+            "componentType" : 5126,
+            "count" : 48,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 16,
+            "componentType" : 5126,
+            "count" : 48,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 17,
+            "componentType" : 5123,
+            "count" : 72,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 18,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 19,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 20,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 21,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 22,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 23,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 24,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 25,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 26,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 27,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 28,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 29,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 30,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 31,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 32,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 33,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 34,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 35,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 36,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 37,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 38,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 39,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 40,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 41,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 42,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 43,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 44,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 45,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 46,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 47,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 48,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 49,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 50,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 51,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 52,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 53,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 54,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 55,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 56,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 57,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 58,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 59,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 60,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 61,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 62,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 63,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 64,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 65,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 66,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 67,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 68,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 69,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 70,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 71,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 72,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 73,
+            "componentType" : 5126,
+            "count" : 361,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0.035051580518484116
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                -0.014266523532569408
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 74,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 75,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 76,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 77,
+            "componentType" : 5123,
+            "count" : 1944,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 78,
+            "componentType" : 5126,
+            "count" : 361,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0.03505159914493561
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                -0.014266500249505043
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 79,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 80,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 81,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 82,
+            "componentType" : 5126,
+            "count" : 361,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0.03505159914493561
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                -0.014266500249505043
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 83,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 84,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 85,
+            "componentType" : 5126,
+            "count" : 361,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0.03505159914493561
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                -0.014266500249505043
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 86,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 87,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 88,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 89,
+            "componentType" : 5126,
+            "count" : 361,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0.03505159914493561
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                -0.014266500249505043
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 90,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 91,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 92,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 93,
+            "componentType" : 5126,
+            "count" : 361,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0.03505159914493561
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                -0.014266500249505043
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 94,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 95,
+            "componentType" : 5126,
+            "count" : 361,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 96,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 97,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 98,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 99,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 100,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 101,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 102,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 103,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 104,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                0.10000002384185791,
+                0.10000002384185791,
+                0
+            ],
+            "min" : [
+                -0.10000002384185791,
+                -0.10000002384185791,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 105,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 106,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        }
+    ],
+    "bufferViews" : [
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 0
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 48
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 96
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 128
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 12,
+            "byteOffset" : 160
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 172
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 220
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 268
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 300
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 332
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 380
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 428
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 460
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 508
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 576,
+            "byteOffset" : 556
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 576,
+            "byteOffset" : 1132
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 384,
+            "byteOffset" : 1708
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 144,
+            "byteOffset" : 2092
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2236
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2284
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2332
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2364
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2396
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2444
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2492
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2524
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2556
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2604
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2652
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2684
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2732
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2780
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2812
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2844
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 2892
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2940
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 2972
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3004
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3052
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3100
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3132
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3180
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3228
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3260
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3292
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3340
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3388
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3420
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3452
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3500
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3548
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3580
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3628
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3676
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3708
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3740
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3788
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3836
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3868
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3900
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 3948
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 3996
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4028
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4076
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 4124
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 4156
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4188
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4236
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 4284
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 4316
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4348
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 4396
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 4444
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 4476
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 8808
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 13140
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 16028
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 3888,
+            "byteOffset" : 18916
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 22804
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 27136
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 31468
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 34356
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 37244
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 41576
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 45908
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 48796
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 53128
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 57460
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 60348
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 63236
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 67568
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 71900
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 74788
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 77676
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 4332,
+            "byteOffset" : 82008
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 2888,
+            "byteOffset" : 86340
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 89228
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 89276
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 89324
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 89356
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 89388
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 89436
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 89484
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 89516
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 89548
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 89596
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 89644
+        }
+    ],
+    "buffers" : [
+        {
+            "byteLength" : 89676,
+            "uri" : "TextureTransformMultiTest.bin"
+        }
+    ]
+}
diff --git a/automated-tests/resources/UnsupportedExtension.bin b/automated-tests/resources/UnsupportedExtension.bin
new file mode 100644
index 0000000..291b43c
Binary files /dev/null and b/automated-tests/resources/UnsupportedExtension.bin differ
diff --git a/automated-tests/resources/UnsupportedExtension.gltf b/automated-tests/resources/UnsupportedExtension.gltf
new file mode 100644
index 0000000..83668d6
--- /dev/null
+++ b/automated-tests/resources/UnsupportedExtension.gltf
@@ -0,0 +1,89 @@
+{
+  "scene" : 0,
+  "scenes" : [
+    {
+      "nodes" : [ 0, 1]
+    }
+  ],
+  "nodes" : [
+    {
+      "mesh" : 0
+    },
+    {
+      "mesh" : 0,
+      "translation" : [ 1.0, 0.0, 0.0 ]
+    }
+  ],
+
+  "meshes" : [
+    {
+      "primitives" : [ {
+        "attributes" : {
+          "POSITION" : 1,
+          "NORMAL" : 2
+        },
+        "indices" : 0
+      } ]
+    }
+  ],
+
+  "buffers" : [
+    {
+      "uri" : "UnsupportedExtension.bin",
+      "byteLength" : 80
+    }
+  ],
+  "bufferViews" : [
+    {
+      "buffer" : 0,
+      "byteOffset" : 0,
+      "byteLength" : 6,
+      "target" : 34963
+    },
+    {
+      "buffer" : 0,
+      "byteOffset" : 8,
+      "byteLength" : 72,
+      "byteStride" : 12,
+      "target" : 34962
+    }
+  ],
+  "accessors" : [
+    {
+      "bufferView" : 0,
+      "byteOffset" : 0,
+      "componentType" : 5123,
+      "count" : 3,
+      "type" : "SCALAR",
+      "max" : [ 2 ],
+      "min" : [ 0 ]
+    },
+    {
+      "bufferView" : 1,
+      "byteOffset" : 0,
+      "componentType" : 5126,
+      "count" : 3,
+      "type" : "VEC3",
+      "max" : [ 1.0, 1.0, 0.0 ],
+      "min" : [ 0.0, 0.0, 0.0 ]
+    },
+    {
+      "bufferView" : 1,
+      "byteOffset" : 36,
+      "componentType" : 5126,
+      "count" : 3,
+      "type" : "VEC3",
+      "max" : [ 0.0, 0.0, 1.0 ],
+      "min" : [ 0.0, 0.0, 1.0 ]
+    }
+  ],
+  "asset" : {
+    "version" : "2.0"
+  },
+  "extensionsUsed": [
+    "KHR_invalid_extension"
+  ],
+  "extensionsRequired": [
+    "KHR_invalid_extension"
+  ]
+}
diff --git a/automated-tests/resources/animationTest.gltf b/automated-tests/resources/animationTest.gltf
new file mode 100644
index 0000000..6c7b12c
--- /dev/null
+++ b/automated-tests/resources/animationTest.gltf
@@ -0,0 +1,1419 @@
+{
+    "accessors" : [
+        {
+            "bufferView" : 0,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 1,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 2,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 3,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 4,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 5,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 6,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 7,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 8,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 9,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 10,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 11,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 12,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 13,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 14,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 15,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 16,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 17,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 18,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 19,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 20,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 21,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 22,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 23,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 24,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 25,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 26,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 27,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 28,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 29,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 30,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 31,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 32,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                1,
+                1,
+                1
+            ],
+            "min" : [
+                -1,
+                -1,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 33,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 34,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 35,
+            "componentType" : 5121,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 36,
+            "componentType" : 5126,
+            "count" : 4,
+            "max" : [
+                1,
+                0,
+                1
+            ],
+            "min" : [
+                -1,
+                0,
+                -1
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 37,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 38,
+            "componentType" : 5126,
+            "count" : 4,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 39,
+            "componentType" : 5121,
+            "count" : 6,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 40,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.6666666666666667
+            ],
+            "min" : [
+                0.041666666666666664
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 41,
+            "componentType" : 5126,
+            "count" : 5,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 42,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.6666666666666667
+            ],
+            "min" : [
+                0.041666666666666664
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 43,
+            "componentType" : 5126,
+            "count" : 15,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 44,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.6666666666666667
+            ],
+            "min" : [
+                0.041666666666666664
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 45,
+            "componentType" : 5126,
+            "count" : 15,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 46,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.7083333333333333
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 47,
+            "componentType" : 5126,
+            "count" : 5,
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 48,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.7083333333333333
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 49,
+            "componentType" : 5126,
+            "count" : 15,
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 50,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.7083333333333333
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 51,
+            "componentType" : 5126,
+            "count" : 5,
+            "type" : "VEC4"
+        },
+        {
+            "bufferView" : 52,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.7083333333333333
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 53,
+            "componentType" : 5126,
+            "count" : 5,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 54,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.6666666666666667
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 55,
+            "componentType" : 5126,
+            "count" : 15,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 56,
+            "componentType" : 5126,
+            "count" : 5,
+            "max" : [
+                1.6666666666666667
+            ],
+            "min" : [
+                0
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 57,
+            "componentType" : 5126,
+            "count" : 5,
+            "type" : "VEC3"
+        }
+    ],
+    "animations" : [
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 0,
+                        "path" : "scale"
+                    }
+                }
+            ],
+            "name" : "Step Scale",
+            "samplers" : [
+                {
+                    "input" : 40,
+                    "interpolation" : "STEP",
+                    "output" : 41
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 3,
+                        "path" : "scale"
+                    }
+                }
+            ],
+            "name" : "Linear Scale",
+            "samplers" : [
+                {
+                    "input" : 40,
+                    "interpolation" : "LINEAR",
+                    "output" : 41
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 4,
+                        "path" : "scale"
+                    }
+                }
+            ],
+            "name" : "CubicSpline Scale",
+            "samplers" : [
+                {
+                    "input" : 44,
+                    "interpolation" : "CUBICSPLINE",
+                    "output" : 45
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 5,
+                        "path" : "rotation"
+                    }
+                }
+            ],
+            "name" : "Step Rotation",
+            "samplers" : [
+                {
+                    "input" : 46,
+                    "interpolation" : "STEP",
+                    "output" : 47
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 6,
+                        "path" : "rotation"
+                    }
+                }
+            ],
+            "name" : "CubicSpline Rotation",
+            "samplers" : [
+                {
+                    "input" : 48,
+                    "interpolation" : "CUBICSPLINE",
+                    "output" : 49
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 7,
+                        "path" : "rotation"
+                    }
+                }
+            ],
+            "name" : "Linear Rotation",
+            "samplers" : [
+                {
+                    "input" : 50,
+                    "interpolation" : "LINEAR",
+                    "output" : 51
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 8,
+                        "path" : "translation"
+                    }
+                }
+            ],
+            "name" : "Step Translation",
+            "samplers" : [
+                {
+                    "input" : 52,
+                    "interpolation" : "STEP",
+                    "output" : 53
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 9,
+                        "path" : "translation"
+                    }
+                }
+            ],
+            "name" : "CubicSpline Translation",
+            "samplers" : [
+                {
+                    "input" : 54,
+                    "interpolation" : "CUBICSPLINE",
+                    "output" : 55
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 10,
+                        "path" : "translation"
+                    }
+                }
+            ],
+            "name" : "Linear Translation",
+            "samplers" : [
+                {
+                    "input" : 56,
+                    "interpolation" : "LINEAR",
+                    "output" : 57
+                }
+            ]
+        }
+    ],
+    "asset" : {
+        "generator" : "Khronos Blender glTF 2.0 I/O",
+        "version" : "2.0"
+    },
+    "bufferViews" : [
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 0
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 288
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 576
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 768
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 804
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 1092
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 1380
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 1572
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 1608
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 1896
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 2184
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 2376
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 2412
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 2700
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 2988
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 3180
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 3216
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 3504
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 3792
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 3984
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 4020
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 4308
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 4596
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 4788
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 4824
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 5112
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 5400
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 5592
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 5628
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 5916
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 6204
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 6396
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 6432
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 6720
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 7008
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 36,
+            "byteOffset" : 7200
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 7236
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 48,
+            "byteOffset" : 7284
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 32,
+            "byteOffset" : 7332
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 6,
+            "byteOffset" : 7364
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 7372
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 60,
+            "byteOffset" : 7392
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 7452
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 180,
+            "byteOffset" : 7472
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 7652
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 180,
+            "byteOffset" : 7672
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 7852
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 80,
+            "byteOffset" : 7872
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 7952
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 240,
+            "byteOffset" : 7972
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 8212
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 80,
+            "byteOffset" : 8232
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 8312
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 60,
+            "byteOffset" : 8332
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 8392
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 180,
+            "byteOffset" : 8412
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 20,
+            "byteOffset" : 8592
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 60,
+            "byteOffset" : 8612
+        }
+    ],
+    "buffers" : [
+        {
+            "byteLength" : 8672,
+            "uri" : "interpolation.bin"
+        }
+    ],
+    "extensions" : {},
+    "images" : [
+        {
+            "mimeType" : "image/jpeg",
+            "name" : "l.jpg",
+            "uri" : "l.jpg"
+        }
+    ],
+    "materials" : [
+        {
+            "name" : "Material",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.001",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.002",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.007",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.006",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.008",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.004",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.005",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.003",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        },
+        {
+            "name" : "Material.009",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 0,
+                    "texCoord" : 0
+                },
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        }
+    ],
+    "meshes" : [
+        {
+            "name" : "Cube",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 1,
+                        "POSITION" : 0,
+                        "TEXCOORD_0" : 2
+                    },
+                    "material" : 0
+                }
+            ]
+        },
+        {
+            "name" : "Cube.001",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 5,
+                        "POSITION" : 4,
+                        "TEXCOORD_0" : 6
+                    },
+                    "material" : 1
+                }
+            ]
+        },
+        {
+            "name" : "Cube.002",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 9,
+                        "POSITION" : 8,
+                        "TEXCOORD_0" : 10
+                    },
+                    "material" : 2
+                }
+            ]
+        },
+        {
+            "name" : "Cube.003",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 13,
+                        "POSITION" : 12,
+                        "TEXCOORD_0" : 14
+                    },
+                    "material" : 3
+                }
+            ]
+        },
+        {
+            "name" : "Cube.004",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 17,
+                        "POSITION" : 16,
+                        "TEXCOORD_0" : 18
+                    },
+                    "material" : 4
+                }
+            ]
+        },
+        {
+            "name" : "Cube.005",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 21,
+                        "POSITION" : 20,
+                        "TEXCOORD_0" : 22
+                    },
+                    "material" : 5
+                }
+            ]
+        },
+        {
+            "name" : "Cube.006",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 25,
+                        "POSITION" : 24,
+                        "TEXCOORD_0" : 26
+                    },
+                    "material" : 6
+                }
+            ]
+        },
+        {
+            "name" : "Cube.008",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 29,
+                        "POSITION" : 28,
+                        "TEXCOORD_0" : 30
+                    },
+                    "material" : 7
+                }
+            ]
+        },
+        {
+            "name" : "Cube.009",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 33,
+                        "POSITION" : 32,
+                        "TEXCOORD_0" : 34
+                    },
+                    "material" : 8
+                }
+            ]
+        },
+        {
+            "name" : "Plane.001",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "NORMAL" : 37,
+                        "POSITION" : 36,
+                        "TEXCOORD_0" : 38
+                    },
+                    "material" : 9
+                }
+            ]
+        }
+    ],
+    "nodes" : [
+        {
+            "name" : "Cube"
+        },
+        {
+            "name" : "Light",
+            "rotation" : [
+                0.16907575726509094,
+                0.7558802962303162,
+                -0.27217137813568115,
+                0.570947527885437
+            ],
+            "scale" : [
+                1,
+                1,
+                0.9999999403953552
+            ],
+            "translation" : [
+                0.18540644645690918,
+                5.903861999511719,
+                8.732584953308105
+            ]
+        },
+        {
+            "name" : "Camera",
+            "rotation" : [
+                0.6819981932640076,
+                0,
+                0,
+                0.7313538193702698
+            ],
+            "scale" : [
+                1,
+                0.39365354180336,
+                1
+            ],
+            "translation" : [
+                0.31374117732048035,
+                4.958309173583984,
+                29.236623764038086
+            ]
+        },
+        {
+            "name" : "Cube.001",
+            "translation" : [
+                -3.2963297367095947,
+                0,
+                6.461143493652344e-05
+            ]
+        },
+        {
+            "name" : "Cube.002",
+            "translation" : [
+                3.3401193618774414,
+                0,
+                0.008944988250732422
+            ]
+        },
+        {
+            "name" : "Cube.003",
+            "translation" : [
+                0,
+                3.356412410736084,
+                0
+            ]
+        },
+        {
+            "name" : "Cube.004",
+            "rotation" : [
+                0,
+                0,
+                -0.006683696992695332,
+                0.9999777674674988
+            ],
+            "translation" : [
+                3.33506178855896,
+                3.356412410736084,
+                0
+            ]
+        },
+        {
+            "name" : "Cube.005",
+            "rotation" : [
+                0,
+                0,
+                -0.03925982117652893,
+                0.9992290735244751
+            ],
+            "scale" : [
+                0.9999999403953552,
+                0.9999999403953552,
+                1
+            ],
+            "translation" : [
+                -3.311399221420288,
+                3.356412410736084,
+                0
+            ]
+        },
+        {
+            "name" : "Cube.006",
+            "translation" : [
+                0,
+                6.665226459503174,
+                0
+            ]
+        },
+        {
+            "name" : "Cube.008",
+            "translation" : [
+                3.3051798343658447,
+                6.734194278717041,
+                0
+            ]
+        },
+        {
+            "name" : "Cube.009",
+            "translation" : [
+                -3.2975807189941406,
+                6.958913326263428,
+                0
+            ]
+        },
+        {
+            "name" : "Plane",
+            "rotation" : [
+                0.7071068286895752,
+                0,
+                0,
+                0.7071068286895752
+            ],
+            "scale" : [
+                4.218648433685303,
+                1,
+                0.3652837574481964
+            ],
+            "translation" : [
+                0,
+                -1.7941787242889404,
+                1.0036747455596924
+            ]
+        }
+    ],
+    "scene" : 0,
+    "scenes" : [
+        {
+            "name" : "Scene",
+            "nodes" : [
+                0,
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11
+            ]
+        }
+    ],
+    "textures" : [
+        {
+            "source" : 0
+        }
+    ]
+}
diff --git a/automated-tests/resources/beer.bin b/automated-tests/resources/beer.bin
new file mode 100644
index 0000000..08571fd
Binary files /dev/null and b/automated-tests/resources/beer.bin differ
diff --git a/automated-tests/resources/beer_modelTest.dli b/automated-tests/resources/beer_modelTest.dli
new file mode 100644
index 0000000..20be585
--- /dev/null
+++ b/automated-tests/resources/beer_modelTest.dli
@@ -0,0 +1,181 @@
+{
+  "asset": { "version": "1.0" },
+  "scene": 0,
+  "scenes": [ { "nodes": [ 0 ] } ],
+  "nodes": [
+    {
+      "name": "Scene",
+      "matrix": [ 1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1 ],
+      "children": [ 1, 2 ]
+    },
+    {
+      "name": "Cube",
+      "matrix": [ 2.5, 0, 0, 0, 0, 2.5, 0, 0, 0, 0, 2.5, 0, 0, 0, 0, 1 ],
+      "model": {
+        "mesh": 0,
+        "material": 0,
+        "shader": 0
+      }
+    },
+    {
+      "name": "bottle",
+      "matrix": [ 0.125, 0, 0, 0, 0, -0, 0.125, 0, 0, -0.125, -0, 0, -0, 0, -1.5, 1 ],
+      "children": [ 3, 4, 5, 6 ]
+    },
+    {
+      "name": "bottle-cap",
+      "model": {
+        "mesh": 3,
+        "material": 2,
+        "shader": 1
+      }
+    },
+    {
+      "name": "bottle-alpha-front",
+      "model": {
+        "mesh": 1,
+        "material": 1,
+        "shader": 2
+      }
+    },
+    {
+      "name": "bottle-alpha-back",
+      "model": {
+        "mesh": 1,
+        "material": 1,
+        "shader": 3
+      }
+    },
+    {
+      "name": "bottle-label",
+      "model": {
+        "mesh": 2,
+        "material": 0,
+        "shader": 4
+      }
+    }
+  ],
+  "meshes": [
+    {
+      "uri": "cube.bin",
+      "attributes": 31,
+      "primitive": "TRIANGLES",
+      "indices": { "byteOffset": 0, "byteLength": 72 },
+      "positions": { "byteOffset": 72, "byteLength": 288 },
+      "normals": { "byteOffset": 360, "byteLength": 288 },
+      "textures": { "byteOffset": 648, "byteLength": 192 },
+      "tangents": { "byteOffset": 840, "byteLength": 288 }
+    },
+    {
+      "uri": "beer.bin",
+      "attributes": 31,
+      "primitive": "TRIANGLES",
+      "indices": { "byteOffset": 0, "byteLength": 19920 },
+      "positions": { "byteOffset": 19920, "byteLength": 54792 },
+      "normals": { "byteOffset": 74712, "byteLength": 54792 },
+      "textures": { "byteOffset": 129504, "byteLength": 36528 },
+      "tangents": { "byteOffset": 166032, "byteLength": 54792 }
+    },
+    {
+      "uri": "beer.bin",
+      "attributes": 31,
+      "primitive": "TRIANGLES",
+      "indices": { "byteOffset": 220824, "byteLength": 13200 },
+      "positions": { "byteOffset": 234024, "byteLength": 14628 },
+      "normals": { "byteOffset": 248652, "byteLength": 14628 },
+      "textures": { "byteOffset": 263280, "byteLength": 9752 },
+      "tangents": { "byteOffset": 273032, "byteLength": 14628 }
+    },
+    {
+      "uri": "beer.bin",
+      "attributes": 31,
+      "primitive": "TRIANGLES",
+      "indices": { "byteOffset": 287660, "byteLength": 31440 },
+      "positions": { "byteOffset": 319100, "byteLength": 121032 },
+      "normals": { "byteOffset": 440132, "byteLength": 121032 },
+      "textures": { "byteOffset": 561164, "byteLength": 80688 },
+      "tangents": { "byteOffset": 641852, "byteLength": 121032 }
+    }
+  ],
+  "skeletons": [
+  ],
+  "cameras": [
+    {
+      "fov": 60,
+      "near": 0.1,
+      "far": 100,
+      "matrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 3.5, 1 ]
+    }
+  ],
+  "lights": [
+  ],
+  "materials": [
+    {
+      "color": [ 1.0, 0.95, 0.5 ],
+      "metallic": 0.25,
+      "roughness": 1.0,
+      "environment": 1
+    },
+    {
+      "color": [ 0.1, 0.4, 0.0, 0.6 ],
+      "metallic": 0.4,
+      "roughness": 0.0,
+      "environment": 1
+    },
+    {
+      "color": [ 0.5, 0.5, 0.5 ],
+      "metallic": 1.0,
+      "roughness": 0.0,
+      "environment": 1
+    }
+  ],
+  "environment": [
+    {
+    },
+    {
+      "cubeSpecular": "Studio/Radiance.ktx",
+      "cubeDiffuse": "Studio/Irradiance.ktx",
+      "iblIntensity": 0.75
+    }
+  ],
+  "shaders": [
+    {
+      "vertex": "dli_pbr.vsh",
+      "fragment": "dli_pbr.fsh",
+      "rendererState": "DEPTH_TEST|CULL_FRONT",
+      "uCubeMatrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
+      "uMaxLOD": 6
+    },
+    {
+      "vertex": "dli_pbr.vsh",
+      "fragment": "dli_pbr.fsh",
+      "rendererState": "DEPTH_TEST|DEPTH_WRITE",
+      "uCubeMatrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
+      "uMaxLOD": 6
+    },
+    {
+      "vertex": "dli_pbr.vsh",
+      "fragment": "dli_pbr.fsh",
+      "defines": [ "THREE_TEX" ],
+      "rendererState": "ALPHA_BLEND|DEPTH_TEST|CULL_FRONT",
+      "uCubeMatrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
+      "uMaxLOD": 6
+    },
+    {
+      "vertex": "dli_pbr.vsh",
+      "fragment": "dli_pbr.fsh",
+      "defines": [ "THREE_TEX" ],
+      "rendererState": "ALPHA_BLEND|DEPTH_TEST|CULL_BACK",
+      "uCubeMatrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
+      "uMaxLOD": 6
+    },
+    {
+      "vertex": "dli_pbr.vsh",
+      "fragment": "dli_pbr.fsh",
+      "defines": [ "FLIP_V" ],
+      "rendererState": "DEPTH_TEST|DEPTH_WRITE|CULL_BACK",
+      "uCubeMatrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
+      "uMaxLOD": 6
+    }
+  ]
+}
diff --git a/automated-tests/resources/broken_l.9.png b/automated-tests/resources/broken_l.9.png
new file mode 100755
index 0000000..48f6078
Binary files /dev/null and b/automated-tests/resources/broken_l.9.png differ
diff --git a/automated-tests/resources/broken_m.9.png b/automated-tests/resources/broken_m.9.png
new file mode 100755
index 0000000..fd99939
Binary files /dev/null and b/automated-tests/resources/broken_m.9.png differ
diff --git a/automated-tests/resources/broken_s.9.png b/automated-tests/resources/broken_s.9.png
new file mode 100755
index 0000000..d2fd5fa
Binary files /dev/null and b/automated-tests/resources/broken_s.9.png differ
diff --git a/automated-tests/resources/coverageTest.bin b/automated-tests/resources/coverageTest.bin
new file mode 100644
index 0000000..1d0e3d6
Binary files /dev/null and b/automated-tests/resources/coverageTest.bin differ
diff --git a/automated-tests/resources/coverageTest.dli b/automated-tests/resources/coverageTest.dli
new file mode 100644
index 0000000..a380378
--- /dev/null
+++ b/automated-tests/resources/coverageTest.dli
@@ -0,0 +1,82 @@
+{
+  "asset": { "version": "1.0" },
+  "scene": 0,
+  "scenes": [ { "nodes": [ 0 ] } ],
+  "nodes": [
+    {
+      "name": "root",
+      "matrix": [ 0.2, 0, 0, 0, 0, -0, 0.2, 0, 0, -0.2, -0, 0, 0, 0, 0, 1 ],
+      "model": {
+        "mesh": 0,
+        "material": 0
+      }
+    }
+  ],
+  "meshes": [
+    {
+      "uri": "coverageTest.bin",
+      "attributes": 31,
+      "primitive": "TRIANGLES",
+      "indices": { "byteOffset": 0, "byteLength": 600 },
+      "positions": { "byteOffset": 600, "byteLength": 2364 },
+      "normals": { "byteOffset": 2964, "byteLength": 2364 },
+      "textures": { "byteOffset": 5328, "byteLength": 1576 },
+      "tangents": { "byteOffset": 6904, "byteLength": 2364 }
+    }
+  ],
+  "skeletons": [
+  ],
+  "cameras": [
+    {
+      "fov": 60,
+      "near": 0.1,
+      "far": 100,
+      "matrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 3.5, 1 ]
+    }
+  ],
+  "materials": [
+    {
+      "name": "material1",
+      "color": [ 1, 1, 0, 1 ],
+      "roughness": 0.4,
+      "metallic": 0,
+      "occlusionMap": "exercise/Icons/Icon_Idle.png",
+      "mipmap": true,
+      "environment" : 1
+    },
+    {
+      "name": "",
+      "color": [ 1, 1, 1, 1 ],
+      "roughness": 1,
+      "metallic": 1,
+      "mipmap": true
+    }
+  ],
+  "lights" : [ {
+      "matrix" : [ 0.8950600624084473, 0.0914330929517746, 0.4364715814590454, 0.0, 0.3676385283470154, 0.4026888310909271, -0.8382623195648193, 0.0, -0.25240713357925415, 0.9107588529586792, 0.3268163800239563, 0.0, 0.0, 0.0, -1.0, 1.0 ],
+      "color" : [ 0.8, 0.8, 0.8 ],
+      "intensity" : 1.0,
+      "shadowMapSize" : 256,
+      "orthographicSize" : 4.2760005,
+      "shadowIntensity" : 1.0
+    } ],
+  "environment" : [ {
+      "cubeInitialOrientation" : [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ],
+      "iblIntensity" : 1.0
+  }, {
+      "cubeSpecular" : "Studio/Radiance.ktx",
+      "cubeDiffuse" : "Studio/Irradiance.ktx",
+      "cubeInitialOrientation" : [ 0.6716271638870239, 0.07979151606559753, -0.7365801334381104, 0.0, 0.07979151606559753, 0.9806114435195923, 0.17898204922676086, 0.0, 0.7365801334381104, -0.17898204922676086, 0.6522386074066162, 0.0, 0.0, 0.0, 0.0, 1.0 ],
+      "iblIntensity" : 0.75
+  } ],
+  "shaders": [
+    {
+      "vertex": "dli_pbr.vsh",
+      "fragment": "dli_pbr.fsh",
+      "defines" : [ "OCCLUSION", "DISPLACEMENT" ],
+      "rendererState": "DEPTH_TEST|DEPTH_WRITE|CULL_BACK|DEPTH_FUNC:LESS_EQUAL",
+      "uCubeMatrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
+      "uMaxLOD": 6
+    }
+  ]
+}
diff --git a/automated-tests/resources/cube.bin b/automated-tests/resources/cube.bin
new file mode 100644
index 0000000..f5bd426
Binary files /dev/null and b/automated-tests/resources/cube.bin differ
diff --git a/automated-tests/resources/cubemap_array_horizontal.png b/automated-tests/resources/cubemap_array_horizontal.png
new file mode 100644
index 0000000..a935915
Binary files /dev/null and b/automated-tests/resources/cubemap_array_horizontal.png differ
diff --git a/automated-tests/resources/cubemap_array_vertical.png b/automated-tests/resources/cubemap_array_vertical.png
new file mode 100644
index 0000000..d6bf296
Binary files /dev/null and b/automated-tests/resources/cubemap_array_vertical.png differ
diff --git a/automated-tests/resources/dali-logo.webp b/automated-tests/resources/dali-logo.webp
new file mode 100644
index 0000000..2f0eb2b
Binary files /dev/null and b/automated-tests/resources/dali-logo.webp differ
diff --git a/automated-tests/resources/dli_pbr.fsh b/automated-tests/resources/dli_pbr.fsh
index 72a0d31..6a961d2 100644
--- a/automated-tests/resources/dli_pbr.fsh
+++ b/automated-tests/resources/dli_pbr.fsh
@@ -31,6 +31,10 @@
   uniform sampler2D sNormalRoughness;
 #endif
 
+#ifdef OCCLUSION
+  uniform sampler2D sAmbientOcclusion;
+#endif //OCCLUSION
+
 uniform samplerCube sDiffuse;
 uniform samplerCube sSpecular;
 
@@ -152,6 +156,11 @@ void main()
   vec3 finalColor = diffuseColor + specColor;
 
   finalColor = sqrt( finalColor ) * uIblIntensity;
+
+#ifdef OCCLUSION
+  finalColor *= texture(sAmbientOcclusion, vUV.st).r;
+#endif //OCCLUSION
+
 #ifdef THREE_TEX
   FragColor = vec4( finalColor, alpha );
 #else //THREE_TEX
diff --git a/automated-tests/resources/dli_pbr.vsh b/automated-tests/resources/dli_pbr.vsh
index d1be304..fa6b480 100644
--- a/automated-tests/resources/dli_pbr.vsh
+++ b/automated-tests/resources/dli_pbr.vsh
@@ -128,9 +128,13 @@ void main()
   position = bone * position;
   normal = (bone * vec4(normal, 0.0)).xyz;
   tangent = (bone * vec4(tangent, 0.0)).xyz;
-#endif
 
+  normal = normalize(normal);
+  tangent = normalize(tangent);
+  vec4 vPosition = position;
+#else
   vec4 vPosition = uModelMatrix * position;
+#endif
 
   vNormal = normalize(uNormalMatrix * normal);
 
diff --git a/automated-tests/resources/equirectangular.png b/automated-tests/resources/equirectangular.png
new file mode 100644
index 0000000..2da8243
Binary files /dev/null and b/automated-tests/resources/equirectangular.png differ
diff --git a/automated-tests/resources/exercise/Icons/Icon_Idle.png b/automated-tests/resources/exercise/Icons/Icon_Idle.png
index ee10734..e35c237 100644
Binary files a/automated-tests/resources/exercise/Icons/Icon_Idle.png and b/automated-tests/resources/exercise/Icons/Icon_Idle.png differ
diff --git a/automated-tests/resources/exercise/Icons/Icon_JJ.png b/automated-tests/resources/exercise/Icons/Icon_JJ.png
index 1c690f5..29fdc59 100644
Binary files a/automated-tests/resources/exercise/Icons/Icon_JJ.png and b/automated-tests/resources/exercise/Icons/Icon_JJ.png differ
diff --git a/automated-tests/resources/exercise/Icons/Icon_Lunge.png b/automated-tests/resources/exercise/Icons/Icon_Lunge.png
index 8853b14..3bc6b76 100644
Binary files a/automated-tests/resources/exercise/Icons/Icon_Lunge.png and b/automated-tests/resources/exercise/Icons/Icon_Lunge.png differ
diff --git a/automated-tests/resources/exercise/Icons/Icon_Squat.png b/automated-tests/resources/exercise/Icons/Icon_Squat.png
index f4f8ce3..eeaf545 100644
Binary files a/automated-tests/resources/exercise/Icons/Icon_Squat.png and b/automated-tests/resources/exercise/Icons/Icon_Squat.png differ
diff --git a/automated-tests/resources/exercise/Textures/BG_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/BG_AlbedoMetallic.png
index 45489d2..e272439 100644
Binary files a/automated-tests/resources/exercise/Textures/BG_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/BG_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/BG_NormalRoughness.png b/automated-tests/resources/exercise/Textures/BG_NormalRoughness.png
index 52cb66d..0cf17ba 100644
Binary files a/automated-tests/resources/exercise/Textures/BG_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/BG_NormalRoughness.png differ
diff --git a/automated-tests/resources/exercise/Textures/Body_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/Body_AlbedoMetallic.png
index d8211a6..ff5a87a 100644
Binary files a/automated-tests/resources/exercise/Textures/Body_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/Body_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/Body_Female_Asian_Adult_SubsurfaceColor.png b/automated-tests/resources/exercise/Textures/Body_Female_Asian_Adult_SubsurfaceColor.png
index 8df1878..3d42031 100644
Binary files a/automated-tests/resources/exercise/Textures/Body_Female_Asian_Adult_SubsurfaceColor.png and b/automated-tests/resources/exercise/Textures/Body_Female_Asian_Adult_SubsurfaceColor.png differ
diff --git a/automated-tests/resources/exercise/Textures/Body_NormalRoughness.png b/automated-tests/resources/exercise/Textures/Body_NormalRoughness.png
index 91d02cb..1d821ec 100644
Binary files a/automated-tests/resources/exercise/Textures/Body_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/Body_NormalRoughness.png differ
diff --git a/automated-tests/resources/exercise/Textures/Eye_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/Eye_AlbedoMetallic.png
index 0137f24..098bf8a 100644
Binary files a/automated-tests/resources/exercise/Textures/Eye_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/Eye_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/Eye_NormalRoughness.png b/automated-tests/resources/exercise/Textures/Eye_NormalRoughness.png
index 9d5971b..cf3534a 100644
Binary files a/automated-tests/resources/exercise/Textures/Eye_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/Eye_NormalRoughness.png differ
diff --git a/automated-tests/resources/exercise/Textures/FitBot_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/FitBot_AlbedoMetallic.png
index d70a3de..0cfd10a 100644
Binary files a/automated-tests/resources/exercise/Textures/FitBot_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/FitBot_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/FitBot_NormalRoughness.png b/automated-tests/resources/exercise/Textures/FitBot_NormalRoughness.png
index fd47924..7876077 100644
Binary files a/automated-tests/resources/exercise/Textures/FitBot_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/FitBot_NormalRoughness.png differ
diff --git a/automated-tests/resources/exercise/Textures/FitTop_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/FitTop_AlbedoMetallic.png
index f19e93c..2d7cc89 100644
Binary files a/automated-tests/resources/exercise/Textures/FitTop_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/FitTop_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/FitTop_NormalRoughness.png b/automated-tests/resources/exercise/Textures/FitTop_NormalRoughness.png
index 6c3e743..67b1c2b 100644
Binary files a/automated-tests/resources/exercise/Textures/FitTop_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/FitTop_NormalRoughness.png differ
diff --git a/automated-tests/resources/exercise/Textures/Hair_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/Hair_AlbedoMetallic.png
index 8b96834..24ba82f 100644
Binary files a/automated-tests/resources/exercise/Textures/Hair_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/Hair_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/Hair_NormalRoughness.png b/automated-tests/resources/exercise/Textures/Hair_NormalRoughness.png
index 9d643ab..23c6eb7 100644
Binary files a/automated-tests/resources/exercise/Textures/Hair_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/Hair_NormalRoughness.png differ
diff --git a/automated-tests/resources/exercise/Textures/Head_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/Head_AlbedoMetallic.png
index 568a115..6e20431 100644
Binary files a/automated-tests/resources/exercise/Textures/Head_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/Head_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/Head_Female_SubsurfaceColor.png b/automated-tests/resources/exercise/Textures/Head_Female_SubsurfaceColor.png
index 609ce5b..0f8caa3 100644
Binary files a/automated-tests/resources/exercise/Textures/Head_Female_SubsurfaceColor.png and b/automated-tests/resources/exercise/Textures/Head_Female_SubsurfaceColor.png differ
diff --git a/automated-tests/resources/exercise/Textures/Head_NormalRoughness.png b/automated-tests/resources/exercise/Textures/Head_NormalRoughness.png
index b2eb952..fc9fec4 100644
Binary files a/automated-tests/resources/exercise/Textures/Head_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/Head_NormalRoughness.png differ
diff --git a/automated-tests/resources/exercise/Textures/Shoe_AlbedoMetallic.png b/automated-tests/resources/exercise/Textures/Shoe_AlbedoMetallic.png
index 6bf07f9..d9b0664 100644
Binary files a/automated-tests/resources/exercise/Textures/Shoe_AlbedoMetallic.png and b/automated-tests/resources/exercise/Textures/Shoe_AlbedoMetallic.png differ
diff --git a/automated-tests/resources/exercise/Textures/Shoe_NormalRoughness.png b/automated-tests/resources/exercise/Textures/Shoe_NormalRoughness.png
index f953ec0..a038345 100644
Binary files a/automated-tests/resources/exercise/Textures/Shoe_NormalRoughness.png and b/automated-tests/resources/exercise/Textures/Shoe_NormalRoughness.png differ
diff --git a/automated-tests/resources/facial-blendshape-animation.json b/automated-tests/resources/facial-blendshape-animation.json
new file mode 100755
index 0000000..e4dc633
--- /dev/null
+++ b/automated-tests/resources/facial-blendshape-animation.json
@@ -0,0 +1,60032 @@
+{
+  "name": "Facial_Blendshape_Animation",
+  "version": "1.2.3",
+  "blendShapes": [
+    {
+      "name": "GEO_1",
+      "fullName": "Facial_Blendshape_Animation:GEO_1",
+      "blendShapeVersion": "3.0",
+      "morphtarget": 68,
+      "morphname": [
+        "EyeBlink_Left",
+        "EyeBlink_Right",
+        "EyeSquint_Left",
+        "EyeSquint_Right",
+        "EyeDown_Left",
+        "EyeDown_Right",
+        "EyeIn_Left",
+        "EyeIn_Right",
+        "EyeOpen_Left",
+        "EyeOpen_Right",
+        "EyeOut_Left",
+        "EyeOut_Right",
+        "EyeUp_Left",
+        "EyeUp_Right",
+        "BrowsDown_Left",
+        "BrowsDown_Right",
+        "BrowsUp_Center",
+        "BrowsUp_Left",
+        "BrowsUp_Right",
+        "JawFwd",
+        "JawLeft",
+        "JawOpen",
+        "JawChew",
+        "JawRight",
+        "MouthLeft",
+        "MouthRight",
+        "MouthFrown_Left",
+        "MouthFrown_Right",
+        "MouthSmile_Left",
+        "MouthSmile_Right",
+        "MouthDimple_Left",
+        "MouthDimple_Right",
+        "LipsStretch_Left",
+        "LipsStretch_Right",
+        "LipsUpperClose",
+        "LipsLowerClose",
+        "LipsUpperUp",
+        "LipsLowerDown",
+        "LipsUpperOpen",
+        "LipsLowerOpen",
+        "LipsFunnel",
+        "LipsPucker",
+        "ChinLowerRaise",
+        "ChinUpperRaise",
+        "Sneer",
+        "Puff",
+        "CheekSquint_Left",
+        "CheekSquint_Right",
+        "HAPPY_48",
+        "HAPPY_49",
+        "HAPPY_50",
+        "HAPPY_51",
+        "HAPPY_52",
+        "ANGRY_53",
+        "ANGRY_54",
+        "ANGRY_55",
+        "DISGUST_56",
+        "DISGUST_57",
+        "SAD_58",
+        "SURPRISE_59",
+        "SURPRISE_60",
+        "Puff_Left",
+        "Puff_Right",
+        "Tongue_Out",
+        "Tongue_Up",
+        "Tongue_Down",
+        "Tongue_Left",
+        "Tongue_Right"
+      ],
+      "key": [
+        [
+          0.05009999871253967,
+          0.05009999871253967,
+          0.25,
+          0.25,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02250000089406967,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8017492890357971,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05530000105500221,
+          0.05530000105500221,
+          0.2759999930858612,
+          0.2759999930858612,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2207999974489212,
+          0.2207999974489212,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02742336131632328,
+          0.77920001745224,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8004528880119324,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3003687560558319,
+          0.0,
+          0.0,
+          0.00038519964437000453,
+          0.001843750011175871,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.06769999861717224,
+          0.06769999861717224,
+          0.33799999952316284,
+          0.33799999952316284,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2703999876976013,
+          0.2703999876976013,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04112784191966057,
+          0.7296000123023987,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7968050241470337,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3014500141143799,
+          0.0,
+          0.0,
+          0.0015190972480922937,
+          0.007249999791383743,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08250000327825546,
+          0.08250000327825546,
+          0.41200000047683716,
+          0.41200000047683716,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3296000063419342,
+          0.3296000063419342,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06110784038901329,
+          0.6704000234603882,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7911673188209534,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3032062351703644,
+          0.0,
+          0.0,
+          0.0033691406715661287,
+          0.01603125035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.09489999711513519,
+          0.09489999711513519,
+          0.4740000069141388,
+          0.4740000069141388,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3792000114917755,
+          0.3792000114917755,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08088335394859314,
+          0.6208000183105469,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7839016914367676,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30559998750686646,
+          0.0,
+          0.0,
+          0.0059027778916060925,
+          0.02800000086426735,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7753698229789734,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30859375,
+          0.0,
+          0.0,
+          0.00908745639026165,
+          0.04296875,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7659335136413574,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3121500015258789,
+          0.0,
+          0.0,
+          0.012890624813735485,
+          0.060750000178813934,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7559545636177063,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.31623125076293945,
+          0.0,
+          0.0,
+          0.01727973110973835,
+          0.08115624636411667,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7457947134971619,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3208000063896179,
+          0.0,
+          0.0,
+          0.02222222276031971,
+          0.10400000214576721,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7358157634735107,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3258187472820282,
+          0.0,
+          0.0,
+          0.02768554724752903,
+          0.12909375131130219,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7263794541358948,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33125001192092896,
+          0.0,
+          0.0,
+          0.0336371511220932,
+          0.15625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7178475856781006,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3370562493801117,
+          0.0,
+          0.0,
+          0.04004448652267456,
+          0.18528124690055847,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3334333300590515,
+          0.3334333300590515,
+          0.4962962865829468,
+          0.4962962865829468,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2074074000120163,
+          0.2074074000120163,
+          0.04938271641731262,
+          0.4444444477558136,
+          0.7407407164573669,
+          0.078125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.71058189868927,
+          0.6156250238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3431999981403351,
+          0.0,
+          0.0,
+          0.046875,
+          0.2160000056028366,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7667666673660278,
+          0.7667666673660278,
+          0.4703703820705414,
+          0.4703703820705414,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5925925970077515,
+          0.5925925970077515,
+          0.006049382966011763,
+          0.15555556118488312,
+          0.25925925374031067,
+          0.25,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7049442529678345,
+          0.6499999761581421,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.349643737077713,
+          0.0,
+          0.0,
+          0.05409613624215126,
+          0.24821874499320984,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          0.800000011920929,
+          0.0,
+          0.0,
+          0.0,
+          0.421875,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7012963891029358,
+          0.684374988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35635000467300415,
+          0.0,
+          0.0,
+          0.06167534738779068,
+          0.28174999356269836,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.6000999808311462,
+          0.6000999808311462,
+          0.17499999701976776,
+          0.17499999701976776,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6024722456932068,
+          0.40494444966316223,
+          0.0,
+          0.09876389056444168,
+          0.3456736207008362,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.36328125,
+          0.0,
+          0.0,
+          0.069580078125,
+          0.31640625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.421875,
+          0.0,
+          0.09375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37040001153945923,
+          0.0,
+          0.0,
+          0.07777778059244156,
+          0.35199999809265137,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.07777778059244156,
+          0.07777778059244156,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.25,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37766873836517334,
+          0.0,
+          0.0,
+          0.0862358957529068,
+          0.3883437514305115,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.2222222238779068,
+          0.2222222238779068,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.078125,
+          0.0,
+          0.5062500238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3850499987602234,
+          0.0,
+          0.0,
+          0.09492187201976776,
+          0.42524999380111694,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3925062417984009,
+          0.0,
+          0.0,
+          0.10380316525697708,
+          0.4625312387943268,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.1128472238779068,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4074937403202057,
+          0.0,
+          0.0,
+          0.12202148139476776,
+          0.5374687314033508,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.41495001316070557,
+          0.0,
+          0.0,
+          0.1312934011220932,
+          0.5747500061988831,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4223312437534332,
+          0.0,
+          0.0,
+          0.14063042402267456,
+          0.6116562485694885,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4296000003814697,
+          0.0,
+          0.0,
+          0.15000000596046448,
+          0.6480000019073486,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.43671876192092896,
+          0.0,
+          0.0,
+          0.1593695729970932,
+          0.68359375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4436500072479248,
+          0.0,
+          0.0,
+          0.16870659589767456,
+          0.7182499766349792,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.45035624504089355,
+          0.0,
+          0.0,
+          0.177978515625,
+          0.7517812252044678,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.45680001378059387,
+          0.0,
+          0.0,
+          0.18715277314186096,
+          0.7839999794960022,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46294376254081726,
+          0.0,
+          0.0,
+          0.19619682431221008,
+          0.8147187232971191,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46875,
+          0.0,
+          0.0,
+          0.205078125,
+          0.84375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47418126463890076,
+          0.0,
+          0.0,
+          0.21376410126686096,
+          0.8709062337875366,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47920000553131104,
+          0.0,
+          0.0,
+          0.2222222238779068,
+          0.8960000276565552,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4837687611579895,
+          0.0,
+          0.0,
+          0.23041991889476776,
+          0.9188437461853027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48785001039505005,
+          0.0,
+          0.0,
+          0.23832465708255768,
+          0.9392499923706055,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49140626192092896,
+          0.0,
+          0.0,
+          0.2459038645029068,
+          0.95703125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4943999946117401,
+          0.0,
+          0.0,
+          0.25312501192092896,
+          0.972000002861023,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4967937469482422,
+          0.0,
+          0.0,
+          0.2599555253982544,
+          0.9839687347412109,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4985499978065491,
+          0.0,
+          0.0,
+          0.26636284589767456,
+          0.9927499890327454,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49963125586509705,
+          0.0,
+          0.0,
+          0.2723144590854645,
+          0.9981562495231628,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.2777777910232544,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.28272026777267456,
+          0.95703125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.287109375,
+          0.84375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.29091253876686096,
+          0.68359375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.2940972149372101,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.296630859375,
+          0.31640625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.29848089814186096,
+          0.15625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.2996147871017456,
+          0.04296875,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4999391734600067,
+          0.0,
+          0.0,
+          0.299775630235672,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39971888065338135,
+          0.39971888065338135,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49975740909576416,
+          0.0,
+          0.0,
+          0.2991121709346771,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3988872170448303,
+          0.3988872170448303,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49945569038391113,
+          0.0,
+          0.0,
+          0.2980239689350128,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3975224494934082,
+          0.3975224494934082,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4990350306034088,
+          0.0,
+          0.0,
+          0.2965254485607147,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39564207196235657,
+          0.39564207196235657,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.498496413230896,
+          0.0,
+          0.0,
+          0.2946310043334961,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3932635486125946,
+          0.3932635486125946,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49784091114997864,
+          0.0,
+          0.0,
+          0.2923550307750702,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3904043734073639,
+          0.3904043734073639,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49706944823265076,
+          0.0,
+          0.0,
+          0.28971192240715027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3870820105075836,
+          0.3870820105075836,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4961831271648407,
+          0.0,
+          0.0,
+          0.286716103553772,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.38331398367881775,
+          0.38331398367881775,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4951828718185425,
+          0.0,
+          0.0,
+          0.28338193893432617,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3791176974773407,
+          0.3791176974773407,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49406975507736206,
+          0.0,
+          0.0,
+          0.2797238230705261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3745107054710388,
+          0.3745107054710388,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49284473061561584,
+          0.0,
+          0.0,
+          0.2757561504840851,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3695104122161865,
+          0.3695104122161865,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4915088713169098,
+          0.0,
+          0.0,
+          0.2714933454990387,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.36413437128067017,
+          0.36413437128067017,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4900631308555603,
+          0.0,
+          0.0,
+          0.2669498026371002,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.14240452647209167,
+          0.14240452647209167,
+          0.34826844930648804,
+          0.34826844930648804,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35839998722076416,
+          0.35839998722076416,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.041127171367406845,
+          0.03429355099797249,
+          0.03429355099797249,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48850855231285095,
+          0.0,
+          0.0,
+          0.2621399164199829,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.13964731991291046,
+          0.13964731991291046,
+          0.3436278700828552,
+          0.3436278700828552,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35232481360435486,
+          0.35232481360435486,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03367149084806442,
+          0.12620027363300323,
+          0.12620027363300323,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48684611916542053,
+          0.0,
+          0.0,
+          0.2570780813694,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.13565555214881897,
+          0.13565555214881897,
+          0.3369094133377075,
+          0.3369094133377075,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3459262549877167,
+          0.3459262549877167,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02419753186404705,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4850768446922302,
+          0.0,
+          0.0,
+          0.25177866220474243,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1309230476617813,
+          0.1309230476617813,
+          0.32894423604011536,
+          0.32894423604011536,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3392218351364136,
+          0.3392218351364136,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.014988611452281475,
+          0.4170095920562744,
+          0.4170095920562744,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4832017421722412,
+          0.0,
+          0.0,
+          0.24625609815120697,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1259436160326004,
+          0.1259436160326004,
+          0.32056349515914917,
+          0.32056349515914917,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33222904801368713,
+          0.33222904801368713,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.007668857928365469,
+          0.5829904079437256,
+          0.5829904079437256,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4812218248844147,
+          0.0,
+          0.0,
+          0.2405247837305069,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.12121111154556274,
+          0.12121111154556274,
+          0.3125983476638794,
+          0.3125983476638794,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.32496532797813416,
+          0.32496532797813416,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.002964197425171733,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4791381359100342,
+          0.0,
+          0.0,
+          0.23459909856319427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11721934378147125,
+          0.11721934378147125,
+          0.3058798909187317,
+          0.3058798909187317,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3174481689929962,
+          0.3174481689929962,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0007023590733297169,
+          0.873799741268158,
+          0.873799741268158,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47695159912109375,
+          0.0,
+          0.0,
+          0.22849343717098236,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11446213722229004,
+          0.11446213722229004,
+          0.3012393116950989,
+          0.3012393116950989,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3096950352191925,
+          0.3096950352191925,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          5.1863706175936386e-05,
+          0.965706467628479,
+          0.965706467628479,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47466328740119934,
+          0.0,
+          0.0,
+          0.2222222238779068,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.301723450422287,
+          0.301723450422287,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47227421402931213,
+          0.0,
+          0.0,
+          0.21579982340335846,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.25421223044395447,
+          0.25421223044395447,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29355084896087646,
+          0.29355084896087646,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4697853624820709,
+          0.0,
+          0.0,
+          0.20924066007137299,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5920282006263733,
+          0.5920282006263733,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2851947247982025,
+          0.2851947247982025,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4671977162361145,
+          0.0,
+          0.0,
+          0.20255911350250244,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2766725420951843,
+          0.2766725420951843,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46451234817504883,
+          0.0,
+          0.0,
+          0.19576959311962128,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4868236184120178,
+          0.4868236184120178,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.26800182461738586,
+          0.26800182461738586,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4617302417755127,
+          0.0,
+          0.0,
+          0.18888649344444275,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25920000672340393,
+          0.25920000672340393,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4588523805141449,
+          0.0,
+          0.0,
+          0.18192419409751892,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2502845823764801,
+          0.2502845823764801,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4558797776699066,
+          0.0,
+          0.0,
+          0.17489711940288544,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.24127301573753357,
+          0.24127301573753357,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4528134763240814,
+          0.0,
+          0.0,
+          0.16781964898109436,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2321828007698059,
+          0.2321828007698059,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4496544599533081,
+          0.0,
+          0.0,
+          0.16070619225502014,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2230314016342163,
+          0.2230314016342163,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.44640374183654785,
+          0.0,
+          0.0,
+          0.15357112884521484,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.21383632719516754,
+          0.21383632719516754,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.44306233525276184,
+          0.0,
+          0.0,
+          0.14642886817455292,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2046150267124176,
+          0.2046150267124176,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.43963125348091125,
+          0.0,
+          0.0,
+          0.1392938196659088,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19538497924804688,
+          0.19538497924804688,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4361114799976349,
+          0.0,
+          0.0,
+          0.1321803480386734,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18616367876529694,
+          0.18616367876529694,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4325040578842163,
+          0.0,
+          0.0,
+          0.12510287761688232,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17696858942508698,
+          0.17696858942508698,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4288099706172943,
+          0.0,
+          0.0,
+          0.11807580292224884,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16781720519065857,
+          0.16781720519065857,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4250302314758301,
+          0.0,
+          0.0,
+          0.11111351102590561,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1587269902229309,
+          0.1587269902229309,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4211658537387848,
+          0.0,
+          0.0,
+          0.10423040390014648,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14971542358398438,
+          0.14971542358398438,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.41721785068511963,
+          0.0,
+          0.0,
+          0.09744088351726532,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14079999923706055,
+          0.14079999923706055,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4131872355937958,
+          0.0,
+          0.0,
+          0.09075933694839478,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1319981813430786,
+          0.1319981813430786,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.409074991941452,
+          0.0,
+          0.0,
+          0.0842001736164093,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12332744896411896,
+          0.12332744896411896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.40488216280937195,
+          0.0,
+          0.0,
+          0.07777778059244156,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11480528116226196,
+          0.11480528116226196,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.40060973167419434,
+          0.0,
+          0.0,
+          0.0715065598487854,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10644915699958801,
+          0.10644915699958801,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39625871181488037,
+          0.0,
+          0.0,
+          0.06540090590715408,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09827655553817749,
+          0.09827655553817749,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39183011651039124,
+          0.0,
+          0.0,
+          0.05947521701455116,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09030496329069138,
+          0.09030496329069138,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3873249590396881,
+          0.0,
+          0.0,
+          0.05374389514327049,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08255184441804886,
+          0.08255184441804886,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3827442228794098,
+          0.0,
+          0.0,
+          0.04822133481502533,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07503468543291092,
+          0.07503468543291092,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37808895111083984,
+          0.0,
+          0.0,
+          0.04292193055152893,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06777095794677734,
+          0.06777095794677734,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37336015701293945,
+          0.0,
+          0.0,
+          0.03786008059978485,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06077815219759941,
+          0.06077815219759941,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.368558794260025,
+          0.0,
+          0.0,
+          0.033050186932086945,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05407373607158661,
+          0.05407373607158661,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6481481194496155,
+          0.6481481194496155,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07407407462596893,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3636859357357025,
+          0.0,
+          0.0,
+          0.02850664034485817,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04767519235610962,
+          0.04767519235610962,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5185185074806213,
+          0.5185185074806213,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3587425649166107,
+          0.0,
+          0.0,
+          0.02424384281039238,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.041600000113248825,
+          0.041600000113248825,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3537296652793884,
+          0.0,
+          0.0,
+          0.020276188850402832,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03586563467979431,
+          0.03586563467979431,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1814814805984497,
+          0.1814814805984497,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3486482799053192,
+          0.0,
+          0.0,
+          0.01661807671189308,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03048957698047161,
+          0.03048957698047161,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.051851850003004074,
+          0.051851850003004074,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9259259104728699,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.34349942207336426,
+          0.0,
+          0.0,
+          0.013283902779221535,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.025489304214715958,
+          0.025489304214715958,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33828407526016235,
+          0.0,
+          0.0,
+          0.010288066230714321,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.020882293581962585,
+          0.020882293581962585,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3330032527446747,
+          0.0,
+          0.0,
+          0.007644962519407272,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.016686026006937027,
+          0.016686026006937027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3276579678058624,
+          0.0,
+          0.0,
+          0.005368990823626518,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.012917978689074516,
+          0.012917978689074516,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.32224926352500916,
+          0.0,
+          0.0,
+          0.003474546829238534,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.009595630690455437,
+          0.009595630690455437,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3167780935764313,
+          0.0,
+          0.0,
+          0.001976028550416231,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.17911234498023987,
+          0.17911234498023987,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.006736458744853735,
+          0.006736458744853735,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.31124547123908997,
+          0.0,
+          0.0,
+          0.0008878330700099468,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3433098793029785,
+          0.3433098793029785,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.004357942845672369,
+          0.004357942845672369,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3056524395942688,
+          0.0,
+          0.0,
+          0.00022435782011598349,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5567666888237,
+          0.5567666888237,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0024775604251772165,
+          0.0024775604251772165,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7702234387397766,
+          0.7702234387397766,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0011127901962026954,
+          0.0011127901962026954,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2933620512485504,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.9344210028648376,
+          0.9344210028648376,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00028111060964874923,
+          0.00028111060964874923,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2849290072917938,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.27487680315971375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0011318903416395187,
+          0.0011318903416395187,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2633812427520752,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.004204742144793272,
+          0.004204742144793272,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25061818957328796,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.008734326809644699,
+          0.008734326809644699,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.23676349222660065,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01423641573637724,
+          0.01423641573637724,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22199301421642303,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02022678032517433,
+          0.02022678032517433,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20648261904716492,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02622118964791298,
+          0.02622118964791298,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1904081404209137,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03173542022705078,
+          0.03173542022705078,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17394545674324036,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03628523647785187,
+          0.03628523647785187,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1572704017162323,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03938641399145126,
+          0.03938641399145126,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14055883884429932,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12398661673069,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.8701731562614441,
+          0.8701731562614441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10772959887981415,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5909057855606079,
+          0.5909057855606079,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09196363389492035,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.31290218234062195,
+          0.31290218234062195,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0768645852804184,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06260829418897629,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04937061667442322,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.037327419966459274,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.026654545217752457,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.017527854070067406,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01012319978326559,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0046164365485310555,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0011834182078018785,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9446064233779907,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8017492890357971,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6064140200614929,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39358600974082947,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19825072586536407,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05539358779788017,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39763087034225464,
+          0.39763087034225464,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.043301891535520554,
+          0.043301891535520554,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06239999830722809,
+          0.10400000214576721,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7892358303070068,
+          0.7892358303070068,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0490097738802433,
+          0.0490097738802433,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.21119999885559082,
+          0.35199999809265137,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.053877927362918854,
+          0.053877927362918854,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3887999951839447,
+          0.6480000019073486,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.057062096893787384,
+          0.057062096893787384,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05539358779788017,
+          0.05539358779788017,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5375999808311462,
+          0.8960000276565552,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.060233648866415024,
+          0.060233648866415024,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19825072586536407,
+          0.19825072586536407,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.31214579939842224,
+          0.31214579939842224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06336560845375061,
+          0.06336560845375061,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39358600974082947,
+          0.39358600974082947,
+          0.0,
+          0.0,
+          0.05341440066695213,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.9586548805236816,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05168142169713974,
+          0.0,
+          0.06201770529150963,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.34228265285491943,
+          0.34228265285491943,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06643098592758179,
+          0.06643098592758179,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6064140200614929,
+          0.6064140200614929,
+          0.0,
+          0.0,
+          0.1817471981048584,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.8599646091461182,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17504426836967468,
+          0.0,
+          0.21005311608314514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.37825244665145874,
+          0.37825244665145874,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0694027990102768,
+          0.0694027990102768,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8017492890357971,
+          0.8017492890357971,
+          0.0,
+          0.0,
+          0.3371328115463257,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.7419468760490417,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3225663900375366,
+          0.0,
+          0.3870796859264374,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.40838930010795593,
+          0.40838930010795593,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07225406169891357,
+          0.07225406169891357,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9446064233779907,
+          0.9446064233779907,
+          0.0,
+          0.0,
+          0.4717055857181549,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6426194310188293,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4467256963253021,
+          0.0,
+          0.5360708236694336,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.4210273325443268,
+          0.4210273325443268,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07495779544115067,
+          0.07495779544115067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5375999808311462,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.8025691509246826,
+          0.8025691509246826,
+          0.4200461208820343,
+          0.4200461208820343,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07748700678348541,
+          0.07748700678348541,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5519360899925232,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4239683151245117,
+          0.4239683151245117,
+          0.41733333468437195,
+          0.41733333468437195,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07981472462415695,
+          0.07981472462415695,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5638889074325562,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18528518080711365,
+          0.18528518080711365,
+          0.41323530673980713,
+          0.41323530673980713,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08191395550966263,
+          0.08191395550966263,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5736749768257141,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.13016147911548615,
+          0.13016147911548615,
+          0.40809836983680725,
+          0.40809836983680725,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08380129188299179,
+          0.08380129188299179,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5815111398696899,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08723102509975433,
+          0.08723102509975433,
+          0.40226879715919495,
+          0.40226879715919495,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08550456166267395,
+          0.08550456166267395,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5876138806343079,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05496968328952789,
+          0.05496968328952789,
+          0.39609289169311523,
+          0.39609289169311523,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0870136171579361,
+          0.0870136171579361,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.592199981212616,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.031853288412094116,
+          0.031853288412094116,
+          0.3899170160293579,
+          0.3899170160293579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08831832557916641,
+          0.08831832557916641,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5954861044883728,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.01635768450796604,
+          0.01635768450796604,
+          0.3840874433517456,
+          0.3840874433517456,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08940855413675308,
+          0.08940855413675308,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5976889133453369,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.006958710495382547,
+          0.006958710495382547,
+          0.37895047664642334,
+          0.37895047664642334,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0902741476893425,
+          0.0902741476893425,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5990250110626221,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.002132210647687316,
+          0.002132210647687316,
+          0.3748524487018585,
+          0.3748524487018585,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09090498834848404,
+          0.09090498834848404,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.5997111201286316,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.00035402632784098387,
+          0.00035402632784098387,
+          0.37213969230651855,
+          0.37213969230651855,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0912909284234047,
+          0.0912909284234047,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.599963903427124,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.965706467628479,
+          0.965706467628479,
+          0.0,
+          0.0,
+          0.5794681310653687,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6068587303161621,
+          0.6137174367904663,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4828532338142395,
+          0.0,
+          0.5794681310653687,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.873799741268158,
+          0.873799741268158,
+          0.0,
+          0.0,
+          0.5244427919387817,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6252400279045105,
+          0.6504800915718079,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.436899870634079,
+          0.0,
+          0.5244427919387817,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.4447791874408722,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6518518328666687,
+          0.7037037014961243,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37037035822868347,
+          0.0,
+          0.4447791874408722,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5829904079437256,
+          0.5829904079437256,
+          0.0,
+          0.0,
+          0.350332647562027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6834019422531128,
+          0.7668038606643677,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2914952039718628,
+          0.0,
+          0.350332647562027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4170095920562744,
+          0.4170095920562744,
+          0.0,
+          0.0,
+          0.25095847249031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7165980935096741,
+          0.8331961631774902,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2085047960281372,
+          0.0,
+          0.25095847249031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.15651194751262665,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7481481432914734,
+          0.8962963223457336,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12962962687015533,
+          0.0,
+          0.15651194751262665,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12620027363300323,
+          0.12620027363300323,
+          0.0,
+          0.0,
+          0.0768483579158783,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7747599482536316,
+          0.9495198726654053,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06310013681650162,
+          0.0,
+          0.0768483579158783,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03429355099797249,
+          0.03429355099797249,
+          0.0,
+          0.0,
+          0.021822990849614143,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7931413054466248,
+          0.9862825870513916,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.017146775498986244,
+          0.0,
+          0.021822990849614143,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0024055985268205404,
+          0.0,
+          0.0009976706933230162,
+          0.00842057354748249,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00927248876541853,
+          0.0,
+          0.0038455671165138483,
+          0.03186162933707237,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.020075812935829163,
+          0.0,
+          0.008326015435159206,
+          0.06759217381477356,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03429071232676506,
+          0.0,
+          0.014221342280507088,
+          0.11288119852542877,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0513923317193985,
+          0.0,
+          0.021313874050974846,
+          0.16499772667884827,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07085581123828888,
+          0.0,
+          0.029385937377810478,
+          0.22121074795722961,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0921562910079956,
+          0.0,
+          0.03821985796093941,
+          0.2787892520427704,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11476891487836838,
+          0.0,
+          0.047597963362932205,
+          0.33500227332115173,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1381688266992569,
+          0.0,
+          0.057302575558423996,
+          0.38711878657341003,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16183117032051086,
+          0.0,
+          0.06711602956056595,
+          0.43240782618522644,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.003581176744773984,
+          0.003581176744773984,
+          0.3552735149860382,
+          0.3552735149860382,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.009850802831351757,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.008559665642678738,
+          0.008559665642678738,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012358792591840029,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18523108959197998,
+          0.0,
+          0.07682064175605774,
+          0.46813836693763733,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.012761704623699188,
+          0.012761704623699188,
+          0.3133818209171295,
+          0.3133818209171295,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03242427483201027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.03113313764333725,
+          0.03113313764333725,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.001090151839889586,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20784370601177216,
+          0.0,
+          0.08619874715805054,
+          0.49157941341400146,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.025747081264853477,
+          0.025747081264853477,
+          0.25412824749946594,
+          0.25412824749946594,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06435327231884003,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.06306213140487671,
+          0.06306213140487671,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0008840282098390162,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22914418578147888,
+          0.0,
+          0.09503266960382462,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.04064280539751053,
+          0.04064280539751053,
+          0.18615755438804626,
+          0.18615755438804626,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1009795069694519,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.09968836605548859,
+          0.09968836605548859,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0006475806585513055,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.24860766530036926,
+          0.0,
+          0.10310473293066025,
+          0.421875,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05555436760187149,
+          0.05555436760187149,
+          0.11811458319425583,
+          0.11811458319425583,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1376446932554245,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.13635355234146118,
+          0.13635355234146118,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00041088162106461823,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2657092809677124,
+          0.0,
+          0.11019726097583771,
+          0.25,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0685872733592987,
+          0.0685872733592987,
+          0.0586441271007061,
+          0.0586441271007061,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1696905493736267,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.1683994084596634,
+          0.1683994084596634,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00020400354696903378,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2799241840839386,
+          0.0,
+          0.11609259247779846,
+          0.078125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.07784701138734818,
+          0.07784701138734818,
+          0.01639099419116974,
+          0.01639099419116974,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19245879352092743,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.1911676526069641,
+          0.1911676526069641,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          5.7018856750801206e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29072752594947815,
+          0.0,
+          0.12057303637266159,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2975943982601166,
+          0.0,
+          0.12342093139886856,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.28512904047966003,
+          0.28512904047966003,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09102650731801987,
+          0.09102650731801987,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16238892078399658,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29813507199287415,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0018217518227174878,
+          0.0017750317929312587,
+          0.28379690647125244,
+          0.28379690647125244,
+          0.001588479964993894,
+          0.001868800027295947,
+          0.0,
+          0.0,
+          0.08988217264413834,
+          0.08988217264413834,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16258476674556732,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7995327711105347,
+          0.9990592002868652,
+          0.0,
+          0.0,
+          0.4976640045642853,
+          0.4990656077861786,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0046720001846551895,
+          0.29674217104911804,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0067983223125338554,
+          0.0066165621392428875,
+          0.27994653582572937,
+          0.27994653582572937,
+          0.006179839838296175,
+          0.007270399946719408,
+          0.0,
+          0.0,
+          0.08805124461650848,
+          0.08805124461650848,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16315053403377533,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7981824278831482,
+          0.9963135719299316,
+          0.0,
+          0.0,
+          0.49091199040412903,
+          0.4963648021221161,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01817600056529045,
+          0.2927161753177643,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.014746683649718761,
+          0.014349243603646755,
+          0.27379685640335083,
+          0.27379685640335083,
+          0.013512959703803062,
+          0.0158975999802351,
+          0.0,
+          0.0,
+          0.08559612929821014,
+          0.08559612929821014,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16405296325683594,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7960255742073059,
+          0.9918783903121948,
+          0.0,
+          0.0,
+          0.4801279902458191,
+          0.49205121397972107,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.039744000881910324,
+          0.28628599643707275,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.025383807718753815,
+          0.02469772659242153,
+          0.265566885471344,
+          0.265566885471344,
+          0.02332671917974949,
+          0.02744320034980774,
+          0.0,
+          0.0,
+          0.08257924765348434,
+          0.08257924765348434,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1652584671974182,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7931392192840576,
+          0.9858688116073608,
+          0.0,
+          0.0,
+          0.4656960070133209,
+          0.4862784147262573,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06860800087451935,
+          0.2776806056499481,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.03842666745185852,
+          0.03738666698336601,
+          0.25547561049461365,
+          0.25547561049461365,
+          0.035360001027584076,
+          0.041600000113248825,
+          0.0,
+          0.0,
+          0.07906302809715271,
+          0.07906302809715271,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16673314571380615,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7896000146865845,
+          0.9783999919891357,
+          0.0,
+          0.0,
+          0.4480000138282776,
+          0.47920000553131104,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10400000214576721,
+          0.2671290338039398,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05359223484992981,
+          0.05214071273803711,
+          0.243741974234581,
+          0.243741974234581,
+          0.049351681023836136,
+          0.05806079879403114,
+          0.0,
+          0.0,
+          0.07510987669229507,
+          0.07510987669229507,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16844306886196136,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.785484790802002,
+          0.9695872068405151,
+          0.0,
+          0.0,
+          0.42742401361465454,
+          0.4709695875644684,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1451520025730133,
+          0.25486016273498535,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.07059748470783234,
+          0.06868451833724976,
+          0.2305849939584732,
+          0.2305849939584732,
+          0.06504064053297043,
+          0.07651840150356293,
+          0.0,
+          0.0,
+          0.07078221440315247,
+          0.07078221440315247,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17035429179668427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7808703780174255,
+          0.9595456123352051,
+          0.0,
+          0.0,
+          0.40435200929641724,
+          0.46174079179763794,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19129599630832672,
+          0.24110302329063416,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08915938436985016,
+          0.08674274384975433,
+          0.2162236124277115,
+          0.2162236124277115,
+          0.08216576278209686,
+          0.09666559845209122,
+          0.0,
+          0.0,
+          0.06614246219396591,
+          0.06614246219396591,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17243307828903198,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7758336067199707,
+          0.9483904242515564,
+          0.0,
+          0.0,
+          0.37916800379753113,
+          0.4516671895980835,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.24166400730609894,
+          0.2260865569114685,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10899490863084793,
+          0.10604002326726913,
+          0.20087681710720062,
+          0.20087681710720062,
+          0.10046592354774475,
+          0.11819519847631454,
+          0.0,
+          0.0,
+          0.06125303730368614,
+          0.06125303730368614,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17464600503444672,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7704511880874634,
+          0.9362367987632751,
+          0.0,
+          0.0,
+          0.35225600004196167,
+          0.4409024119377136,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29548799991607666,
+          0.21003973484039307,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1298210322856903,
+          0.12630102038383484,
+          0.1847636103630066,
+          0.1847636103630066,
+          0.1196800023317337,
+          0.14079999923706055,
+          0.0,
+          0.0,
+          0.056176360696554184,
+          0.056176360696554184,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17695996165275574,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7648000121116638,
+          0.9232000112533569,
+          0.0,
+          0.0,
+          0.3240000009536743,
+          0.4296000003814697,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35199999809265137,
+          0.1931915283203125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.15135471522808075,
+          0.14725039899349213,
+          0.1681029498577118,
+          0.1681029498577118,
+          0.13954688608646393,
+          0.16417279839515686,
+          0.0,
+          0.0,
+          0.05097484588623047,
+          0.05097484588623047,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1793423444032669,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.758956789970398,
+          0.9093952178955078,
+          0.0,
+          0.0,
+          0.2947840094566345,
+          0.4179135859012604,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.41043201088905334,
+          0.17577089369297028,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1733129471540451,
+          0.1686127930879593,
+          0.151113823056221,
+          0.151113823056221,
+          0.15980544686317444,
+          0.18800640106201172,
+          0.0,
+          0.0,
+          0.045710913836956024,
+          0.045710913836956024,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1817609965801239,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.752998411655426,
+          0.8949375748634338,
+          0.0,
+          0.0,
+          0.26499199867248535,
+          0.40599679946899414,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4700160026550293,
+          0.15800681710243225,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.19541269540786743,
+          0.1901128590106964,
+          0.13401520252227783,
+          0.13401520252227783,
+          0.18019455671310425,
+          0.21199360489845276,
+          0.0,
+          0.0,
+          0.04044697806239128,
+          0.04044697806239128,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18418438732624054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.747001588344574,
+          0.8799424171447754,
+          0.0,
+          0.0,
+          0.23500800132751465,
+          0.3940032124519348,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5299839973449707,
+          0.1401282548904419,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2173709273338318,
+          0.21147525310516357,
+          0.11702607572078705,
+          0.11702607572078705,
+          0.20045311748981476,
+          0.23582719266414642,
+          0.0,
+          0.0,
+          0.035245463252067566,
+          0.035245463252067566,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18658141791820526,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.741043210029602,
+          0.864524781703949,
+          0.0,
+          0.0,
+          0.20521600544452667,
+          0.3820863962173462,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.589568018913269,
+          0.12236417084932327,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.23890462517738342,
+          0.23242461681365967,
+          0.10036541521549225,
+          0.10036541521549225,
+          0.22032000124454498,
+          0.25920000672340393,
+          0.0,
+          0.0,
+          0.030168786644935608,
+          0.030168786644935608,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18892164528369904,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7351999878883362,
+          0.848800003528595,
+          0.0,
+          0.0,
+          0.17599999904632568,
+          0.37040001153945923,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6480000019073486,
+          0.10494354367256165,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29159998893737793,
+          0.0,
+          0.1209348812699318,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.259730726480484,
+          0.2526856064796448,
+          0.08425220847129822,
+          0.08425220847129822,
+          0.23953408002853394,
+          0.28180480003356934,
+          0.0,
+          0.0,
+          0.025279361754655838,
+          0.025279361754655838,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19117511808872223,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7295488119125366,
+          0.8328831791877747,
+          0.0,
+          0.0,
+          0.14774399995803833,
+          0.35909759998321533,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7045120000839233,
+          0.08809533715248108,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2687999904155731,
+          0.0,
+          0.11147906631231308,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2795662581920624,
+          0.27198290824890137,
+          0.06890542060136795,
+          0.06890542060136795,
+          0.25783422589302063,
+          0.30333438515663147,
+          0.0,
+          0.0,
+          0.020639611408114433,
+          0.020639611408114433,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1933123618364334,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7241663932800293,
+          0.8168895840644836,
+          0.0,
+          0.0,
+          0.12083200365304947,
+          0.34833279252052307,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7583360075950623,
+          0.07204851508140564,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.23520000278949738,
+          0.0,
+          0.09754418581724167,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2981281578540802,
+          0.29004111886024475,
+          0.05454404279589653,
+          0.05454404279589653,
+          0.27495935559272766,
+          0.32348158955574036,
+          0.0,
+          0.0,
+          0.016311950981616974,
+          0.016311950981616974,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19530442357063293,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7191296219825745,
+          0.800934374332428,
+          0.0,
+          0.0,
+          0.09564799815416336,
+          0.33825919032096863,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8087040185928345,
+          0.05703204497694969,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19439999759197235,
+          0.0,
+          0.08062325417995453,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3151334226131439,
+          0.3065849244594574,
+          0.04138704761862755,
+          0.04138704761862755,
+          0.29064831137657166,
+          0.34193921089172363,
+          0.0,
+          0.0,
+          0.012358799576759338,
+          0.012358799576759338,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19712266325950623,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.714515209197998,
+          0.7851328253746033,
+          0.0,
+          0.0,
+          0.07257600128650665,
+          0.3290303945541382,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8548480272293091,
+          0.0432749018073082,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.15000000596046448,
+          0.0,
+          0.06220930069684982,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3302989900112152,
+          0.3213389813899994,
+          0.02965341880917549,
+          0.02965341880917549,
+          0.304639995098114,
+          0.35839998722076416,
+          0.0,
+          0.0,
+          0.00884257536381483,
+          0.00884257536381483,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19873873889446259,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7103999853134155,
+          0.769599974155426,
+          0.0,
+          0.0,
+          0.052000001072883606,
+          0.3208000063896179,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8960000276565552,
+          0.031006047502160072,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10559999942779541,
+          0.0,
+          0.04379534721374512,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3433418273925781,
+          0.3340279161930084,
+          0.01956213265657425,
+          0.01956213265657425,
+          0.31667327880859375,
+          0.37255680561065674,
+          0.0,
+          0.0,
+          0.005825696513056755,
+          0.005825696513056755,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20012450218200684,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7068607807159424,
+          0.7544512152671814,
+          0.0,
+          0.0,
+          0.034304000437259674,
+          0.31372159719467163,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9313920140266418,
+          0.02045445144176483,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06480000168085098,
+          0.0,
+          0.026874419301748276,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3539789617061615,
+          0.34437641501426697,
+          0.011332168243825436,
+          0.011332168243825436,
+          0.3264870345592499,
+          0.38410240411758423,
+          0.0,
+          0.0,
+          0.0033705816604197025,
+          0.0033705816604197025,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20125184953212738,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7039744257926941,
+          0.7398015856742859,
+          0.0,
+          0.0,
+          0.019872000440955162,
+          0.3079487979412079,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9602559804916382,
+          0.011849080212414265,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.031199999153614044,
+          0.0,
+          0.012939535081386566,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.361927330493927,
+          0.35210907459259033,
+          0.005182505119591951,
+          0.005182505119591951,
+          0.3338201642036438,
+          0.39272961020469666,
+          0.0,
+          0.0,
+          0.001539648394100368,
+          0.001539648394100368,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20209257304668427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7018175721168518,
+          0.7257664203643799,
+          0.0,
+          0.0,
+          0.009088000282645226,
+          0.30363520979881287,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9818239808082581,
+          0.005418903194367886,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00839999970048666,
+          0.0,
+          0.0034837208222597837,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3669039011001587,
+          0.3569506108760834,
+          0.0013321228325366974,
+          0.0013321228325366974,
+          0.33841150999069214,
+          0.39813119173049927,
+          0.0,
+          0.0,
+          0.0003953151172026992,
+          0.0003953151172026992,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20261827111244202,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7004672288894653,
+          0.7124608159065247,
+          0.0,
+          0.0,
+          0.0023360000923275948,
+          0.30093440413475037,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9953280091285706,
+          0.0013928870903328061,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.699999988079071,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.6633744835853577,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9999319314956665,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.6218106746673584,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9994553327560425,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.5777778029441833,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.998161792755127,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.5337448716163635,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9956427216529846,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.49218106269836426,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9914896488189697,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.4555555582046509,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9852941036224365,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.42633745074272156,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9766476154327393,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.40699589252471924,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9651415944099426,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.699999988079071,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9503676295280457,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3690889775753021,
+          0.36272987723350525,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.36960163712501526,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20284689962863922,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.005688820034265518,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7056888341903687,
+          0.43323615193367004,
+          0.0,
+          0.0,
+          0.0,
+          0.3106709420681,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8855684995651245,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.37232980132102966,
+          0.37603822350502014,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.2953122854232788,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20317445695400238,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02003265917301178,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7200326323509216,
+          0.5189504623413086,
+          0.0,
+          0.0,
+          0.0,
+          0.3375767767429352,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7450748085975647,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3811260461807251,
+          0.4004163444042206,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.19916975498199463,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2040596604347229,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03955788165330887,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7395578622817993,
+          0.6361516118049622,
+          0.0,
+          0.0,
+          0.0,
+          0.3742017447948456,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5601097345352173,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39825549721717834,
+          0.4377298653125763,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.10321170836687088,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2057672142982483,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.060790859162807465,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7607908844947815,
+          0.7638484239578247,
+          0.0,
+          0.0,
+          0.0,
+          0.4140300750732422,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3618965446949005,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.42649608850479126,
+          0.4898444414138794,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.029475880786776543,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20853547751903534,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08025795966386795,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7802579402923584,
+          0.8810495734214783,
+          0.0,
+          0.0,
+          0.0,
+          0.450545996427536,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18165837228298187,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.46862563490867615,
+          0.5586256384849548,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2125566303730011,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09448555111885071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7944855690002441,
+          0.9667638540267944,
+          0.0,
+          0.0,
+          0.0,
+          0.47723376750946045,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05061846226453781,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.6301328539848328,
+          0.7091268301010132,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.041600000113248825,
+          0.041600000113248825,
+          0.21426953375339508,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10000000149011612,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4875776469707489,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.7458409047321766e-06,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.8893350958824158,
+          0.9188321232795715,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14079999923706055,
+          0.14079999923706055,
+          0.20918145775794983,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0980324074625969,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48754626512527466,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01684114709496498,
+          0.0,
+          0.0,
+          2.9853688829462044e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25920000672340393,
+          0.25920000672340393,
+          0.19602687656879425,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09259258955717087,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48732662200927734,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06372325867414474,
+          0.0,
+          0.0,
+          0.00014405208639800549,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35839998722076416,
+          0.35839998722076416,
+          0.17443956434726715,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08437500149011612,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4867304861545563,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.13518434762954712,
+          0.0,
+          0.0,
+          0.00037779618287459016,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7505814433097839,
+          0.7570764422416687,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.1457209438085556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07407407462596893,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.485569566488266,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22576239705085754,
+          0.0,
+          0.0,
+          0.0006263533141463995,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.41948139667510986,
+          0.4308376610279083,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3379661440849304,
+          0.3379661440849304,
+          0.11315823346376419,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06238425895571709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4836556017398834,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.32999545335769653,
+          0.0,
+          0.0,
+          0.0005805121618323028,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.41415348649024963,
+          0.42255699634552,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0009038889547809958,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.201243057847023,
+          0.201243057847023,
+          0.08189306408166885,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05000000074505806,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4808003604412079,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.44242149591445923,
+          0.0,
+          0.0,
+          0.0002616935526020825,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4102257788181305,
+          0.4162631034851074,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.003591738408431411,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06389843672513962,
+          0.06389843672513962,
+          0.05834028497338295,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03761574253439903,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4768155515193939,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5575785040855408,
+          0.0,
+          0.0,
+          3.295229544164613e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40744748711586,
+          0.411640465259552,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.008027822710573673,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.049157049506902695,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.025925925001502037,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47151294350624084,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6700045466423035,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4055676758289337,
+          0.40837356448173523,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.014176415279507637,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.480896344219218e-06,
+          3.3552336731190735e-07,
+          0.04911700263619423,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.015625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4647042751312256,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7742375731468201,
+          0.0,
+          0.0,
+          5.976877081096104e-15,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40433549880981445,
+          0.4061468839645386,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.02200178988277912,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.1837933925562538e-05,
+          2.6820941911864793e-06,
+          0.04901384562253952,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.007407407276332378,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4562012851238251,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8648156523704529,
+          0.0,
+          0.0,
+          4.561632105035129e-13,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40350013971328735,
+          0.4046448767185211,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0314682200551033,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          3.99475684389472e-05,
+          9.050831067725085e-06,
+          0.04887271672487259,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.001967592630535364,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4458157420158386,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9362767338752747,
+          0.0,
+          0.0,
+          6.125981232701916e-12,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4028106927871704,
+          0.4035520851612091,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.04253998398780823,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          9.468624921282753e-05,
+          2.145285179722123e-05,
+          0.04871804267168045,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4333593249320984,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9831588268280029,
+          0.0,
+          0.0,
+          4.013711585315605e-11,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.402016282081604,
+          0.4025529623031616,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0551813468337059,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00018493043899070472,
+          4.189927494735457e-05,
+          0.04857323318719864,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4186438024044037,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          0.0,
+          0.0,
+          1.7680248931561948e-10,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4008660614490509,
+          0.40133196115493774,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.06935659050941467,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0003195565950591117,
+          7.24012206774205e-05,
+          0.04846039414405823,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7838006019592285,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39258724451065063,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9944219589233398,
+          0.0,
+          0.0,
+          6.04331196196739e-10,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3991091847419739,
+          0.3995736241340637,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.08502998948097229,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0005074411747045815,
+          0.000114969807327725,
+          0.048400092869997025,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7414662837982178,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35051843523979187,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9789226055145264,
+          0.0,
+          0.0,
+          1.7309419453326313e-09,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39724934101104736,
+          0.3977278769016266,
+          0.0,
+          0.0,
+          0.3399980962276459,
+          0.10368171334266663,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.000757460598833859,
+          0.00017161614960059524,
+          0.04841116815805435,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6823928356170654,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29886528849601746,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9553540945053101,
+          0.0,
+          0.0,
+          4.350526161545076e-09,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3958684206008911,
+          0.39638254046440125,
+          0.0,
+          0.0,
+          0.3399847745895386,
+          0.12625031173229218,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0010784913320094347,
+          0.0002443513658363372,
+          0.04851052165031433,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6159759759902954,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.24405567348003387,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.9255684614181519,
+          0.0,
+          0.0,
+          9.886661267444197e-09,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39483287930488586,
+          0.3954288065433502,
+          0.0,
+          0.0,
+          0.3399485945701599,
+          0.15188761055469513,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0014794098678976297,
+          0.0003351865743752569,
+          0.04871300607919693,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5516115427017212,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19251751899719238,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.891417920589447,
+          0.0,
+          0.0,
+          2.073649163492064e-08,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3940090835094452,
+          0.39475783705711365,
+          0.0,
+          0.0,
+          0.3398781418800354,
+          0.17974542081356049,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0019690925255417824,
+          0.0004461329081095755,
+          0.04903130605816841,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4986952245235443,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.15067869424819946,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8547545671463013,
+          0.0,
+          0.0,
+          4.073877946098037e-08,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39326348900794983,
+          0.39426088333129883,
+          0.0,
+          0.0,
+          0.33976200222969055,
+          0.20897558331489563,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0025564159732311964,
+          0.0005792014999315143,
+          0.04947587847709656,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46662282943725586,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12496711313724518,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.8174304962158203,
+          0.0,
+          0.0,
+          7.57933236172903e-08,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39246246218681335,
+          0.3938290774822235,
+          0.0,
+          0.0,
+          0.3395887315273285,
+          0.23872990906238556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.003250256646424532,
+          0.000736403395421803,
+          0.050054892897605896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4487018287181854,
+          0.9975311160087585,
+          0.0,
+          0.0,
+          0.0,
+          0.11006754636764526,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7780781984329224,
+          0.0,
+          0.0,
+          1.346617040098863e-07,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3914724588394165,
+          0.393353670835495,
+          0.0,
+          0.0,
+          0.3393469452857971,
+          0.26816022396087646,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0040594907477498055,
+          0.0009197497856803238,
+          0.050774261355400085,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4319573938846588,
+          0.990389883518219,
+          0.0,
+          0.0,
+          0.0,
+          0.09634940326213837,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7345424294471741,
+          0.0,
+          0.0,
+          2.2998258941697713e-07,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39015984535217285,
+          0.3927258253097534,
+          0.0,
+          0.0,
+          0.3390251696109772,
+          0.29641836881637573,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.004992994945496321,
+          0.0011312516871839762,
+          0.05163760855793953,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.41636160016059875,
+          0.9789744019508362,
+          0.0,
+          0.0,
+          0.0,
+          0.08376757055521011,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6874938011169434,
+          0.0,
+          0.0,
+          3.79537425487797e-07,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.38839107751846313,
+          0.3918367624282837,
+          0.0,
+          0.0,
+          0.33861199021339417,
+          0.32265615463256836,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.006059645675122738,
+          0.0013729204656556249,
+          0.05264640972018242,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.40188664197921753,
+          0.9636827707290649,
+          0.0,
+          0.0,
+          0.0,
+          0.07227689772844315,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6376029253005981,
+          0.0,
+          0.0,
+          6.078063279346679e-07,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3860325515270233,
+          0.39057764410972595,
+          0.0,
+          0.0,
+          0.338096022605896,
+          0.34602540731430054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.007268319372087717,
+          0.0016467669047415257,
+          0.053800031542778015,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.38850468397140503,
+          0.9449132084846497,
+          0.0,
+          0.0,
+          0.0,
+          0.06183227151632309,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5855402946472168,
+          0.0,
+          0.0,
+          9.478551987740502e-07,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.38295069336891174,
+          0.3888397216796875,
+          0.0,
+          0.0,
+          0.3374657928943634,
+          0.36567795276641846,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.008627892471849918,
+          0.0019548023119568825,
+          0.05509587377309799,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37618786096572876,
+          0.9230636954307556,
+          0.0,
+          0.0,
+          0.0,
+          0.05238855630159378,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5319766402244568,
+          0.0,
+          0.0,
+          1.443601718165155e-06,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.379011869430542,
+          0.3865141272544861,
+          0.0,
+          0.0,
+          0.3367099165916443,
+          0.3807655870914459,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01014724187552929,
+          0.0022990377619862556,
+          0.056529559195041656,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3649083077907562,
+          0.8985323905944824,
+          0.0,
+          0.0,
+          0.0,
+          0.04390062764286995,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4775824248790741,
+          0.0,
+          0.0,
+          2.1525067950278753e-06,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3740825653076172,
+          0.383492112159729,
+          0.0,
+          0.0,
+          0.3358169496059418,
+          0.3904401659965515,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.011835242621600628,
+          0.0026814844459295273,
+          0.058095090091228485,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3546382486820221,
+          0.8717174530029297,
+          0.0,
+          0.0,
+          0.0,
+          0.03632334992289543,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.42302829027175903,
+          0.0,
+          0.0,
+          3.1487466003454756e-06,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3680291175842285,
+          0.3796648383140564,
+          0.0,
+          0.0,
+          0.33477547764778137,
+          0.3938535153865814,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.013700773008167744,
+          0.0031041535548865795,
+          0.059785112738609314,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3453497886657715,
+          0.8430169224739075,
+          0.0,
+          0.0,
+          0.0,
+          0.02961159683763981,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3689848482608795,
+          0.0,
+          0.0,
+          4.52691756436252e-06,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3570016622543335,
+          0.3709850311279297,
+          0.0,
+          0.0,
+          0.33278971910476685,
+          0.39272475242614746,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.015562713146209717,
+          0.0034823270980268717,
+          0.06265026330947876,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3370151221752167,
+          0.8128290176391602,
+          0.0,
+          0.0,
+          0.0,
+          0.023720240220427513,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3161226511001587,
+          0.0,
+          0.0,
+          6.221242074389011e-06,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.33858227729797363,
+          0.3547999858856201,
+          0.0,
+          0.0,
+          0.32915082573890686,
+          0.3894417881965637,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01742631010711193,
+          0.003791348310187459,
+          0.06708917021751404,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3296063542366028,
+          0.781551718711853,
+          0.0,
+          0.0,
+          0.0,
+          0.018604150041937828,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2651123106479645,
+          0.0,
+          0.0,
+          8.253384294221178e-06,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3147854506969452,
+          0.33309265971183777,
+          0.0,
+          0.0,
+          0.3239777684211731,
+          0.3841595947742462,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.019579989835619926,
+          0.004123319406062365,
+          0.07213851809501648,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3230956792831421,
+          0.7495833039283752,
+          0.0,
+          0.0,
+          0.0,
+          0.014218197204172611,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2166244238615036,
+          0.0,
+          0.0,
+          1.1021414138667751e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.28762564063072205,
+          0.3078460097312927,
+          0.0,
+          0.0,
+          0.31738948822021484,
+          0.37703314423561096,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02231217548251152,
+          0.004570343066006899,
+          0.0769321620464325,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3174552321434021,
+          0.7173217535018921,
+          0.0,
+          0.0,
+          0.0,
+          0.010517251677811146,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1713295578956604,
+          0.0,
+          0.0,
+          1.5221921785268933e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.25911736488342285,
+          0.28104302287101746,
+          0.0,
+          0.0,
+          0.3095049262046814,
+          0.3682173788547516,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.025911295786499977,
+          0.005224521271884441,
+          0.08076611906290054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3126572072505951,
+          0.6851652264595032,
+          0.0,
+          0.0,
+          0.0,
+          0.007456185296177864,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1298983246088028,
+          0.0,
+          0.0,
+          2.205102464358788e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.23127509653568268,
+          0.25466662645339966,
+          0.0,
+          0.0,
+          0.3004431128501892,
+          0.3578673005104065,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.030665773898363113,
+          0.006177956238389015,
+          0.0831412598490715,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3086737096309662,
+          0.6535118222236633,
+          0.0,
+          0.0,
+          0.0,
+          0.004989868029952049,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09300129115581512,
+          0.0,
+          0.0,
+          3.3544689358677715e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2061133086681366,
+          0.230699822306633,
+          0.0,
+          0.0,
+          0.2903229296207428,
+          0.3461378514766693,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.036864034831523895,
+          0.007522751111537218,
+          0.08378411084413528,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30547693371772766,
+          0.6227596998214722,
+          0.0,
+          0.0,
+          0.0,
+          0.0030731710139662027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06130906939506531,
+          0.0,
+          0.0,
+          5.3102325182408094e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18564648926258087,
+          0.21112556755542755,
+          0.0,
+          0.0,
+          0.2792634069919586,
+          0.33318403363227844,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04479450732469559,
+          0.009351007640361786,
+          0.08264528959989548,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.303039014339447,
+          0.5933068990707397,
+          0.0,
+          0.0,
+          0.0,
+          0.0016609648009762168,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03549223765730858,
+          0.0,
+          0.0,
+          8.622659515822306e-05,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.17188911139965057,
+          0.1979268491268158,
+          0.0,
+          0.0,
+          0.2673834562301636,
+          0.3191607892513275,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05474561080336571,
+          0.011754828505218029,
+          0.07987608015537262,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30133211612701416,
+          0.5655516386032104,
+          0.0,
+          0.0,
+          0.0,
+          0.000708120409399271,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.016221387311816216,
+          0.0,
+          0.0,
+          0.00014148777700029314,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.16685564815998077,
+          0.19308660924434662,
+          0.0,
+          0.0,
+          0.25480204820632935,
+          0.30422309041023254,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06700577586889267,
+          0.014826315455138683,
+          0.07578262686729431,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3003283739089966,
+          0.5398919582366943,
+          0.0,
+          0.0,
+          0.0,
+          0.0001695085666142404,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.004167112056165934,
+          0.0,
+          0.0,
+          0.0002316829195478931,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1840301752090454,
+          0.21646492183208466,
+          0.0,
+          0.0,
+          0.2416381686925888,
+          0.28852590918540955,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08186342567205429,
+          0.01865757256746292,
+          0.07075819373130798,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.516726016998291,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00037510794936679304,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.22700974345207214,
+          0.27491065859794617,
+          0.06239999830722809,
+          0.06239999830722809,
+          0.22801074385643005,
+          0.2722242474555969,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10623344033956528,
+          0.03352547809481621,
+          0.06575527042150497,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3276968002319336,
+          0.4956985414028168,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0009153859573416412,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.28297826647758484,
+          0.3508901596069336,
+          0.21119999885559082,
+          0.21119999885559082,
+          0.21403875946998596,
+          0.2554730176925659,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14293172955513,
+          0.06512051820755005,
+          0.06143290549516678,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3991253674030304,
+          0.4760424494743347,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0024929780047386885,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.33911970257759094,
+          0.42686963081359863,
+          0.3887999951839447,
+          0.3887999951839447,
+          0.19984115660190582,
+          0.23842720687389374,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18609826266765594,
+          0.10665520280599594,
+          0.05766187235713005,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4967930018901825,
+          0.4575382173061371,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.005522080697119236,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3826179802417755,
+          0.48531538248062134,
+          0.5375999808311462,
+          0.5375999808311462,
+          0.18553690612316132,
+          0.2212418168783188,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22987303137779236,
+          0.15134203433990479,
+          0.054254237562417984,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.603206992149353,
+          0.43996623158454895,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.010030488483607769,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4006570875644684,
+          0.5086936950683594,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.17124497890472412,
+          0.2040717899799347,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2683959901332855,
+          0.19239354133605957,
+          0.05102596431970596,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7008746266365051,
+          0.42310696840286255,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.015404971316456795,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4014672040939331,
+          0.5054956674575806,
+          0.5853914022445679,
+          0.5855903029441833,
+          0.15708431601524353,
+          0.18707209825515747,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2958071231842041,
+          0.2230222076177597,
+          0.047830548137426376,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7723032236099243,
+          0.40674078464508057,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02034633792936802,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40191230177879333,
+          0.4971316456794739,
+          0.5465857982635498,
+          0.5472221970558167,
+          0.14317390322685242,
+          0.17039769887924194,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3062463700771332,
+          0.23644056916236877,
+          0.044563986361026764,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          0.3906481862068176,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.023079603910446167,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40212681889533997,
+          0.48544660210609436,
+          0.49111348390579224,
+          0.4921875,
+          0.12963266670703888,
+          0.1542035937309265,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3061978220939636,
+          0.2384185791015625,
+          0.04133184626698494,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          0.3746095597743988,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02403176762163639,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40224531292915344,
+          0.47228553891181946,
+          0.42650488018989563,
+          0.4277777671813965,
+          0.11657959222793579,
+          0.1386447250843048,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30604562163352966,
+          0.24011394381523132,
+          0.038234200328588486,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          0.35840532183647156,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.024958010762929916,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40240219235420227,
+          0.459493488073349,
+          0.3602902591228485,
+          0.3612847328186035,
+          0.10413363575935364,
+          0.12387607991695404,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3057754635810852,
+          0.24159885942935944,
+          0.03518911451101303,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          0.3418159484863281,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02587389387190342,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4027320146560669,
+          0.4489154517650604,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0924137532711029,
+          0.11005260795354843,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30537310242652893,
+          0.24294555187225342,
+          0.032128408551216125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.800000011920929,
+          0.3246217966079712,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.026795953512191772,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40331125259399414,
+          0.4411664307117462,
+          0.2362038791179657,
+          0.2326388955116272,
+          0.07967709749937057,
+          0.09487734735012054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.31662431359291077,
+          0.24406345188617706,
+          0.1309189647436142,
+          0.1679447442293167,
+          0.1679447442293167,
+          0.0,
+          0.0,
+          0.008077677339315414,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7997313141822815,
+          0.36683735251426697,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.016706734895706177,
+          0.0,
+          0.0,
+          0.028810279443860054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.404345840215683,
+          0.4378454089164734,
+          0.16598376631736755,
+          0.15694443881511688,
+          0.0654701218008995,
+          0.0777505487203598,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3374066948890686,
+          0.24489279091358185,
+          0.4908280372619629,
+          0.4798499643802643,
+          0.4798499643802643,
+          0.0,
+          0.0,
+          0.024269554764032364,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7978504300117493,
+          0.4582267999649048,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.047733526676893234,
+          0.0,
+          0.0,
+          0.031808290630578995,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5104801654815674,
+          0.537967324256897,
+          0.10663805156946182,
+          0.09375,
+          0.05184578150510788,
+          0.0613730326294899,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3483212888240814,
+          0.24555198848247528,
+          0.7784863710403442,
+          0.6478220820426941,
+          0.6478220820426941,
+          0.0,
+          0.0,
+          0.03651389852166176,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7927452325820923,
+          0.5007563829421997,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06444025784730911,
+          0.0,
+          0.0,
+          0.033950936049222946,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7326971292495728,
+          0.7493358254432678,
+          0.06081034615635872,
+          0.04722222313284874,
+          0.03881384804844856,
+          0.04585878551006317,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.34645283222198486,
+          0.24608777463436127,
+          0.7617833018302917,
+          0.647860050201416,
+          0.647860050201416,
+          0.0,
+          0.0,
+          0.042908523231744766,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7894349694252014,
+          0.4836938679218292,
+          0.9832007884979248,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06335501372814178,
+          0.0,
+          0.0,
+          0.03485193848609924,
+          0.0,
+          0.0,
+          0.0,
+          0.004526900127530098,
+          0.0,
+          0.007544833701103926,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.9687886834144592,
+          0.9740538597106934,
+          0.025857046246528625,
+          0.013194444589316845,
+          0.02636454440653324,
+          0.03109382838010788,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3430330157279968,
+          0.24649077653884888,
+          0.7444145679473877,
+          0.6478922367095947,
+          0.6478922367095947,
+          0.0,
+          0.0,
+          0.04950914531946182,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.780108630657196,
+          0.4667290151119232,
+          0.9364305138587952,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.060333915054798126,
+          0.0,
+          0.0,
+          0.03558531403541565,
+          0.0,
+          0.0,
+          0.0,
+          0.01712881214916706,
+          0.0,
+          0.028548020869493484,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.011145789176225662,
+          0.0,
+          0.016521481797099113,
+          0.019437037408351898,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.338291734457016,
+          0.24677994847297668,
+          0.7265229821205139,
+          0.6479189991950989,
+          0.6479189991950989,
+          0.0,
+          0.0,
+          0.05619090050458908,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7656643986701965,
+          0.44992274045944214,
+          0.8651302456855774,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05572894588112831,
+          0.0,
+          0.0,
+          0.036156054586172104,
+          0.0,
+          0.0,
+          0.0,
+          0.03633755072951317,
+          0.0,
+          0.060562584549188614,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.9221786856651306,
+          0.9364071488380432,
+          0.009895771741867065,
+          0.0,
+          0.010282591916620731,
+          0.01206916756927967,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3324590027332306,
+          0.24697421491146088,
+          0.708246111869812,
+          0.6479409337043762,
+          0.6479409337043762,
+          0.0,
+          0.0,
+          0.0628289207816124,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7470002770423889,
+          0.43333595991134644,
+          0.7747409343719482,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04989207163453102,
+          0.0,
+          0.0,
+          0.036572519689798355,
+          0.0,
+          0.0,
+          0.0,
+          0.060684934258461,
+          0.0,
+          0.101141557097435,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.6212478876113892,
+          0.664219856262207,
+          0.008472497574985027,
+          0.0,
+          0.006649944931268692,
+          0.007809464819729328,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3257647752761841,
+          0.24709255993366241,
+          0.6897161602973938,
+          0.647958517074585,
+          0.647958517074585,
+          0.0,
+          0.0,
+          0.06929834187030792,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7250143885612488,
+          0.41702964901924133,
+          0.6707035899162292,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04317526891827583,
+          0.0,
+          0.0,
+          0.0368465930223465,
+          0.0,
+          0.0,
+          0.0,
+          0.08870277553796768,
+          0.0,
+          0.14783796668052673,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.42844846844673157,
+          0.4937658905982971,
+          0.007186100818216801,
+          0.0,
+          0.0046533565036952496,
+          0.005474537145346403,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.31843894720077515,
+          0.24715390801429749,
+          0.6710597276687622,
+          0.6479722261428833,
+          0.6479722261428833,
+          0.0,
+          0.0,
+          0.07547429203987122,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.7006048560142517,
+          0.4010646641254425,
+          0.5584593415260315,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03593050315976143,
+          0.0,
+          0.0,
+          0.03699371591210365,
+          0.0,
+          0.0,
+          0.0,
+          0.1189228966832161,
+          0.0,
+          0.19820483028888702,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ]
+      ]
+    },
+    {
+      "name": "GEO_2",
+      "fullName": "Facial_Blendshape_Animation:GEO_2",
+      "blendShapeVersion": "3.0",
+      "morphtarget": 16,
+      "morphname": [
+        "JawLeft",
+        "JawOpen",
+        "JawRight",
+        "MouthLeft",
+        "MouthRight",
+        "LipsUpperUp",
+        "LipsLowerDown",
+        "LipsFunnel",
+        "HAPPY_50",
+        "HAPPY_51",
+        "HAPPY_52",
+        "Tongue_Out",
+        "Tongue_Up",
+        "Tongue_Down",
+        "Tongue_Left",
+        "Tongue_Right"
+      ],
+      "key": [
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00038519964437000453,
+          0.001843750011175871,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0015190972480922937,
+          0.007249999791383743,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0033691406715661287,
+          0.01603125035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0059027778916060925,
+          0.02800000086426735,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00908745639026165,
+          0.04296875,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.012890624813735485,
+          0.060750000178813934,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01727973110973835,
+          0.08115624636411667,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02222222276031971,
+          0.10400000214576721,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02768554724752903,
+          0.12909375131130219,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0336371511220932,
+          0.15625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04004448652267456,
+          0.18528124690055847,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.046875,
+          0.2160000056028366,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05409613624215126,
+          0.24821874499320984,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06167534738779068,
+          0.28174999356269836,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.069580078125,
+          0.31640625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.09375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07777778059244156,
+          0.35199999809265137,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0862358957529068,
+          0.3883437514305115,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5062500238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09492187201976776,
+          0.42524999380111694,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10380316525697708,
+          0.4625312387943268,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1128472238779068,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12202148139476776,
+          0.5374687314033508,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1312934011220932,
+          0.5747500061988831,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14063042402267456,
+          0.6116562485694885,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.15000000596046448,
+          0.6480000019073486,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1593695729970932,
+          0.68359375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16870659589767456,
+          0.7182499766349792,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.177978515625,
+          0.7517812252044678,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18715277314186096,
+          0.7839999794960022,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19619682431221008,
+          0.8147187232971191,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.205078125,
+          0.84375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.21376410126686096,
+          0.8709062337875366,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2222222238779068,
+          0.8960000276565552,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.23041991889476776,
+          0.9188437461853027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.23832465708255768,
+          0.9392499923706055,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2459038645029068,
+          0.95703125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25312501192092896,
+          0.972000002861023,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2599555253982544,
+          0.9839687347412109,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.26636284589767456,
+          0.9927499890327454,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2723144590854645,
+          0.9981562495231628,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2777777910232544,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.28272026777267456,
+          0.95703125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.287109375,
+          0.84375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29091253876686096,
+          0.68359375,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2940972149372101,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.296630859375,
+          0.31640625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29848089814186096,
+          0.15625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2996147871017456,
+          0.04296875,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.299775630235672,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2991121709346771,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2980239689350128,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2965254485607147,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2946310043334961,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2923550307750702,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.28971192240715027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.286716103553772,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.28338193893432617,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2797238230705261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2757561504840851,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2714933454990387,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2669498026371002,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2621399164199829,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2570780813694,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25177866220474243,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.24625609815120697,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2405247837305069,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.23459909856319427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22849343717098236,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2222222238779068,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.21579982340335846,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20924066007137299,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20255911350250244,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19576959311962128,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18888649344444275,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18192419409751892,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17489711940288544,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16781964898109436,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16070619225502014,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.15357112884521484,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14642886817455292,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1392938196659088,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1321803480386734,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12510287761688232,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11807580292224884,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11111351102590561,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10423040390014648,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09744088351726532,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09075933694839478,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0842001736164093,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07777778059244156,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0715065598487854,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06540090590715408,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05947521701455116,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05374389514327049,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04822133481502533,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04292193055152893,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03786008059978485,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.033050186932086945,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02850664034485817,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02424384281039238,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.020276188850402832,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01661807671189308,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.013283902779221535,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.010288066230714321,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.007644962519407272,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.005368990823626518,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.003474546829238534,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.001976028550416231,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0008878330700099468,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00022435782011598349,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.05341440066695213,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06201770529150963,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.1817471981048584,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.21005311608314514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.3371328115463257,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3870796859264374,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.4717055857181549,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5360708236694336,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5375999808311462,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5519360899925232,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5638889074325562,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5736749768257141,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5815111398696899,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5876138806343079,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.592199981212616,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5954861044883728,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5976889133453369,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5990250110626221,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5997111201286316,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.599963903427124,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.6000000238418579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5794681310653687,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5794681310653687,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.5244427919387817,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5244427919387817,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.4447791874408722,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4447791874408722,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.350332647562027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.350332647562027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.25095847249031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25095847249031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.15651194751262665,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.15651194751262665,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0768483579158783,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0768483579158783,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.021822990849614143,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.021822990849614143,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0009976706933230162,
+          0.00842057354748249,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.0038455671165138483,
+          0.03186162933707237,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.008326015435159206,
+          0.06759217381477356,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.014221342280507088,
+          0.11288119852542877,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.021313874050974846,
+          0.16499772667884827,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.029385937377810478,
+          0.22121074795722961,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.03821985796093941,
+          0.2787892520427704,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.047597963362932205,
+          0.33500227332115173,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.057302575558423996,
+          0.38711878657341003,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0012911377707496285,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012911377707496285,
+          0.06711602956056595,
+          0.43240782618522644,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.009850802831351757,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0012358792591840029,
+          0.07682064175605774,
+          0.46813836693763733,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.03242427483201027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.001090151839889586,
+          0.08619874715805054,
+          0.49157941341400146,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.06435327231884003,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0008840282098390162,
+          0.09503266960382462,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.1009795069694519,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0006475806585513055,
+          0.10310473293066025,
+          0.421875,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.1376446932554245,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00041088162106461823,
+          0.11019726097583771,
+          0.25,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.1696905493736267,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00020400354696903378,
+          0.11609259247779846,
+          0.078125,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.19245879352092743,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          5.7018856750801206e-05,
+          0.12057303637266159,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12342093139886856,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.20129114389419556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12441860139369965,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1209348812699318,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11147906631231308,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09754418581724167,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08062325417995453,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06220930069684982,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04379534721374512,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.026874419301748276,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.012939535081386566,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0034837208222597837,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.005688820034265518,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.02003265917301178,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.03955788165330887,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.060790859162807465,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.08025795966386795,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.09448555111885071,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.10000000149011612,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0980324074625969,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.09259258955717087,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.08437500149011612,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.07407407462596893,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.06238425895571709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.05000000074505806,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.03761574253439903,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.025925925001502037,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.015625,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.007407407276332378,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.001967592630535364,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.008077677339315414,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.024269554764032364,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.03651389852166176,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.042908523231744766,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.007544833701103926,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.04950914531946182,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.028548020869493484,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.05619090050458908,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.060562584549188614,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0628289207816124,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.101141557097435,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.06929834187030792,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14783796668052673,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.07547429203987122,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19820483028888702,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ]
+      ]
+    },
+    {
+      "name": "GEO_3",
+      "fullName": "Facial_Blendshape_Animation:GEO_3",
+      "blendShapeVersion": "3.0",
+      "morphtarget": 9,
+      "morphname": [
+        "BrowsDown_Left",
+        "BrowsDown_Right",
+        "BrowsUp_Center",
+        "BrowsUp_Left",
+        "BrowsUp_Right",
+        "Sneer",
+        "HAPPY_51",
+        "ANGRY_55",
+        "SAD_58"
+      ],
+      "key": [
+        [
+          0.0,
+          0.0,
+          0.02250000089406967,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.02742336131632328,
+          0.77920001745224,
+          1.0,
+          0.0,
+          0.00038519964437000453,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.04112784191966057,
+          0.7296000123023987,
+          1.0,
+          0.0,
+          0.0015190972480922937,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.06110784038901329,
+          0.6704000234603882,
+          1.0,
+          0.0,
+          0.0033691406715661287,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.08088335394859314,
+          0.6208000183105469,
+          1.0,
+          0.0,
+          0.0059027778916060925,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.00908745639026165,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.012890624813735485,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.01727973110973835,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.02222222276031971,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.02768554724752903,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0336371511220932,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.04004448652267456,
+          0.0,
+          0.0
+        ],
+        [
+          0.2074074000120163,
+          0.2074074000120163,
+          0.04938271641731262,
+          0.4444444477558136,
+          0.7407407164573669,
+          0.0,
+          0.046875,
+          0.0,
+          0.0
+        ],
+        [
+          0.5925925970077515,
+          0.5925925970077515,
+          0.006049382966011763,
+          0.15555556118488312,
+          0.25925925374031067,
+          0.0,
+          0.05409613624215126,
+          0.0,
+          0.0
+        ],
+        [
+          0.800000011920929,
+          0.800000011920929,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06167534738779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.6024722456932068,
+          0.40494444966316223,
+          0.0,
+          0.09876389056444168,
+          0.3456736207008362,
+          0.0,
+          0.069580078125,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.07777778059244156,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0862358957529068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.09492187201976776,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.10380316525697708,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.1128472238779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.12202148139476776,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.1312934011220932,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.14063042402267456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.15000000596046448,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.1593695729970932,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.16870659589767456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.177978515625,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.18715277314186096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.19619682431221008,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.205078125,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.21376410126686096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2222222238779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.23041991889476776,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.23832465708255768,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2459038645029068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.25312501192092896,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2599555253982544,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.26636284589767456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2723144590854645,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2777777910232544,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.28272026777267456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.287109375,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.29091253876686096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2940972149372101,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.296630859375,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.29848089814186096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2996147871017456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.299775630235672,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2991121709346771,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2980239689350128,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2965254485607147,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2946310043334961,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2923550307750702,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.28971192240715027,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.286716103553772,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.28338193893432617,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2797238230705261,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2757561504840851,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2714933454990387,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2669498026371002,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.041127171367406845,
+          0.03429355099797249,
+          0.03429355099797249,
+          0.0,
+          0.2621399164199829,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.03367149084806442,
+          0.12620027363300323,
+          0.12620027363300323,
+          0.0,
+          0.2570780813694,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.02419753186404705,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.25177866220474243,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.014988611452281475,
+          0.4170095920562744,
+          0.4170095920562744,
+          0.0,
+          0.24625609815120697,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.007668857928365469,
+          0.5829904079437256,
+          0.5829904079437256,
+          0.0,
+          0.2405247837305069,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.002964197425171733,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.23459909856319427,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0007023590733297169,
+          0.873799741268158,
+          0.873799741268158,
+          0.0,
+          0.22849343717098236,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          5.1863706175936386e-05,
+          0.965706467628479,
+          0.965706467628479,
+          0.0,
+          0.2222222238779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.21579982340335846,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.20924066007137299,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.20255911350250244,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.19576959311962128,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.18888649344444275,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.18192419409751892,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.17489711940288544,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.16781964898109436,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.16070619225502014,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.15357112884521484,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.14642886817455292,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.1392938196659088,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.1321803480386734,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.12510287761688232,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.11807580292224884,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.11111351102590561,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.10423040390014648,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.09744088351726532,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.09075933694839478,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0842001736164093,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.07777778059244156,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0715065598487854,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.06540090590715408,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.05947521701455116,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.05374389514327049,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.04822133481502533,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.04292193055152893,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.03786008059978485,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.033050186932086945,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.02850664034485817,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.02424384281039238,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.020276188850402832,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.01661807671189308,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.013283902779221535,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.010288066230714321,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.007644962519407272,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.005368990823626518,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.003474546829238534,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.001976028550416231,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0008878330700099468,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.00022435782011598349,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.05539358779788017,
+          0.05539358779788017,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.19825072586536407,
+          0.19825072586536407,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.39358600974082947,
+          0.39358600974082947,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.6064140200614929,
+          0.6064140200614929,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.8017492890357971,
+          0.8017492890357971,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.9446064233779907,
+          0.9446064233779907,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.965706467628479,
+          0.965706467628479,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.873799741268158,
+          0.873799741268158,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.5829904079437256,
+          0.5829904079437256,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.4170095920562744,
+          0.4170095920562744,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.12620027363300323,
+          0.12620027363300323,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.03429355099797249,
+          0.03429355099797249,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00842057354748249,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03186162933707237,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06759217381477356,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11288119852542877,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16499772667884827,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22121074795722961,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2787892520427704,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33500227332115173,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.38711878657341003,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.43240782618522644,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46813836693763733,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49157941341400146,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.421875,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.078125,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16238892078399658,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16258476674556732,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16315053403377533,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16405296325683594,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1652584671974182,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16673314571380615,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16844306886196136,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17035429179668427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17243307828903198,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17464600503444672,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17695996165275574,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1793423444032669,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1817609965801239,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.18418438732624054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.18658141791820526,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.18892164528369904,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19117511808872223,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1933123618364334,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19530442357063293,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19712266325950623,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19873873889446259,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20012450218200684,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20125184953212738,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20209257304668427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20261827111244202,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20284689962863922,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20317445695400238,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.2040596604347229,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.2057672142982483,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20853547751903534,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.2125566303730011,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.041600000113248825,
+          0.041600000113248825,
+          0.21426953375339508,
+          0.0,
+          0.0,
+          1.7458409047321766e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.14079999923706055,
+          0.14079999923706055,
+          0.20918145775794983,
+          0.0,
+          0.0,
+          2.9853688829462044e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.25920000672340393,
+          0.25920000672340393,
+          0.19602687656879425,
+          0.0,
+          0.0,
+          0.00014405208639800549,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.35839998722076416,
+          0.35839998722076416,
+          0.17443956434726715,
+          0.0,
+          0.0,
+          0.00037779618287459016,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.4000000059604645,
+          0.1457209438085556,
+          0.0,
+          0.0,
+          0.0006263533141463995,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3379661440849304,
+          0.3379661440849304,
+          0.11315823346376419,
+          0.0,
+          0.0,
+          0.0005805121618323028,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.201243057847023,
+          0.201243057847023,
+          0.08189306408166885,
+          0.0,
+          0.0,
+          0.0002616935526020825,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.06389843672513962,
+          0.06389843672513962,
+          0.05834028497338295,
+          0.0,
+          0.0,
+          3.295229544164613e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.049157049506902695,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.480896344219218e-06,
+          3.3552336731190735e-07,
+          0.04911700263619423,
+          0.0,
+          0.0,
+          5.976877081096104e-15,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.1837933925562538e-05,
+          2.6820941911864793e-06,
+          0.04901384562253952,
+          0.0,
+          0.0,
+          4.561632105035129e-13,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          3.99475684389472e-05,
+          9.050831067725085e-06,
+          0.04887271672487259,
+          0.0,
+          0.0,
+          6.125981232701916e-12,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.468624921282753e-05,
+          2.145285179722123e-05,
+          0.04871804267168045,
+          0.0,
+          0.0,
+          4.013711585315605e-11,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.00018493043899070472,
+          4.189927494735457e-05,
+          0.04857323318719864,
+          0.0,
+          0.0,
+          1.7680248931561948e-10,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0003195565950591117,
+          7.24012206774205e-05,
+          0.04846039414405823,
+          0.0,
+          0.0,
+          6.04331196196739e-10,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0005074411747045815,
+          0.000114969807327725,
+          0.048400092869997025,
+          0.0,
+          0.0,
+          1.7309419453326313e-09,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.000757460598833859,
+          0.00017161614960059524,
+          0.04841116815805435,
+          0.0,
+          0.0,
+          4.350526161545076e-09,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0010784913320094347,
+          0.0002443513658363372,
+          0.04851052165031433,
+          0.0,
+          0.0,
+          9.886661267444197e-09,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0014794098678976297,
+          0.0003351865743752569,
+          0.04871300607919693,
+          0.0,
+          0.0,
+          2.073649163492064e-08,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0019690925255417824,
+          0.0004461329081095755,
+          0.04903130605816841,
+          0.0,
+          0.0,
+          4.073877946098037e-08,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0025564159732311964,
+          0.0005792014999315143,
+          0.04947587847709656,
+          0.0,
+          0.0,
+          7.57933236172903e-08,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.003250256646424532,
+          0.000736403395421803,
+          0.050054892897605896,
+          0.0,
+          0.0,
+          1.346617040098863e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0040594907477498055,
+          0.0009197497856803238,
+          0.050774261355400085,
+          0.0,
+          0.0,
+          2.2998258941697713e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.004992994945496321,
+          0.0011312516871839762,
+          0.05163760855793953,
+          0.0,
+          0.0,
+          3.79537425487797e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.006059645675122738,
+          0.0013729204656556249,
+          0.05264640972018242,
+          0.0,
+          0.0,
+          6.078063279346679e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.007268319372087717,
+          0.0016467669047415257,
+          0.053800031542778015,
+          0.0,
+          0.0,
+          9.478551987740502e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.008627892471849918,
+          0.0019548023119568825,
+          0.05509587377309799,
+          0.0,
+          0.0,
+          1.443601718165155e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.01014724187552929,
+          0.0022990377619862556,
+          0.056529559195041656,
+          0.0,
+          0.0,
+          2.1525067950278753e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.011835242621600628,
+          0.0026814844459295273,
+          0.058095090091228485,
+          0.0,
+          0.0,
+          3.1487466003454756e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.013700773008167744,
+          0.0031041535548865795,
+          0.059785112738609314,
+          0.0,
+          0.0,
+          4.52691756436252e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.015562713146209717,
+          0.0034823270980268717,
+          0.06265026330947876,
+          0.0,
+          0.0,
+          6.221242074389011e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.01742631010711193,
+          0.003791348310187459,
+          0.06708917021751404,
+          0.0,
+          0.0,
+          8.253384294221178e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.019579989835619926,
+          0.004123319406062365,
+          0.07213851809501648,
+          0.0,
+          0.0,
+          1.1021414138667751e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.02231217548251152,
+          0.004570343066006899,
+          0.0769321620464325,
+          0.0,
+          0.0,
+          1.5221921785268933e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.025911295786499977,
+          0.005224521271884441,
+          0.08076611906290054,
+          0.0,
+          0.0,
+          2.205102464358788e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.030665773898363113,
+          0.006177956238389015,
+          0.0831412598490715,
+          0.0,
+          0.0,
+          3.3544689358677715e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.036864034831523895,
+          0.007522751111537218,
+          0.08378411084413528,
+          0.0,
+          0.0,
+          5.3102325182408094e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.04479450732469559,
+          0.009351007640361786,
+          0.08264528959989548,
+          0.0,
+          0.0,
+          8.622659515822306e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05474561080336571,
+          0.011754828505218029,
+          0.07987608015537262,
+          0.0,
+          0.0,
+          0.00014148777700029314,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.06700577586889267,
+          0.014826315455138683,
+          0.07578262686729431,
+          0.0,
+          0.0,
+          0.0002316829195478931,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08186342567205429,
+          0.01865757256746292,
+          0.07075819373130798,
+          0.0,
+          0.0,
+          0.00037510794936679304,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10623344033956528,
+          0.03352547809481621,
+          0.06575527042150497,
+          0.0,
+          0.0,
+          0.0009153859573416412,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.14293172955513,
+          0.06512051820755005,
+          0.06143290549516678,
+          0.0,
+          0.0,
+          0.0024929780047386885,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18609826266765594,
+          0.10665520280599594,
+          0.05766187235713005,
+          0.0,
+          0.0,
+          0.005522080697119236,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.22987303137779236,
+          0.15134203433990479,
+          0.054254237562417984,
+          0.0,
+          0.0,
+          0.010030488483607769,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2683959901332855,
+          0.19239354133605957,
+          0.05102596431970596,
+          0.0,
+          0.0,
+          0.015404971316456795,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2958071231842041,
+          0.2230222076177597,
+          0.047830548137426376,
+          0.0,
+          0.0,
+          0.02034633792936802,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3062463700771332,
+          0.23644056916236877,
+          0.044563986361026764,
+          0.0,
+          0.0,
+          0.023079603910446167,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3061978220939636,
+          0.2384185791015625,
+          0.04133184626698494,
+          0.0,
+          0.0,
+          0.02403176762163639,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.30604562163352966,
+          0.24011394381523132,
+          0.038234200328588486,
+          0.0,
+          0.0,
+          0.024958010762929916,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3057754635810852,
+          0.24159885942935944,
+          0.03518911451101303,
+          0.0,
+          0.0,
+          0.02587389387190342,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.30537310242652893,
+          0.24294555187225342,
+          0.032128408551216125,
+          0.0,
+          0.0,
+          0.026795953512191772,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.31662431359291077,
+          0.24406345188617706,
+          0.1309189647436142,
+          0.1679447442293167,
+          0.1679447442293167,
+          0.028810279443860054,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3374066948890686,
+          0.24489279091358185,
+          0.4908280372619629,
+          0.4798499643802643,
+          0.4798499643802643,
+          0.031808290630578995,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3483212888240814,
+          0.24555198848247528,
+          0.7784863710403442,
+          0.6478220820426941,
+          0.6478220820426941,
+          0.033950936049222946,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.34645283222198486,
+          0.24608777463436127,
+          0.7617833018302917,
+          0.647860050201416,
+          0.647860050201416,
+          0.03485193848609924,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3430330157279968,
+          0.24649077653884888,
+          0.7444145679473877,
+          0.6478922367095947,
+          0.6478922367095947,
+          0.03558531403541565,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.338291734457016,
+          0.24677994847297668,
+          0.7265229821205139,
+          0.6479189991950989,
+          0.6479189991950989,
+          0.036156054586172104,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3324590027332306,
+          0.24697421491146088,
+          0.708246111869812,
+          0.6479409337043762,
+          0.6479409337043762,
+          0.036572519689798355,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3257647752761841,
+          0.24709255993366241,
+          0.6897161602973938,
+          0.647958517074585,
+          0.647958517074585,
+          0.0368465930223465,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.31843894720077515,
+          0.24715390801429749,
+          0.6710597276687622,
+          0.6479722261428833,
+          0.6479722261428833,
+          0.03699371591210365,
+          0.0,
+          0.0,
+          0.0
+        ]
+      ]
+    },
+    {
+      "name": "GEO_4",
+      "fullName": "Facial_Blendshape_Animation:GEO_4",
+      "blendShapeVersion": "3.0",
+      "morphtarget": 9,
+      "morphname": [
+        "BrowsDown_Left",
+        "BrowsDown_Right",
+        "BrowsUp_Center",
+        "BrowsUp_Left",
+        "BrowsUp_Right",
+        "Sneer",
+        "HAPPY_51",
+        "ANGRY_55",
+        "SAD_58"
+      ],
+      "key": [
+        [
+          0.0,
+          0.0,
+          0.02250000089406967,
+          0.800000011920929,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.02742336131632328,
+          0.77920001745224,
+          1.0,
+          0.0,
+          0.00038519964437000453,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.04112784191966057,
+          0.7296000123023987,
+          1.0,
+          0.0,
+          0.0015190972480922937,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.06110784038901329,
+          0.6704000234603882,
+          1.0,
+          0.0,
+          0.0033691406715661287,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.08088335394859314,
+          0.6208000183105469,
+          1.0,
+          0.0,
+          0.0059027778916060925,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.00908745639026165,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.012890624813735485,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.01727973110973835,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.02222222276031971,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.02768554724752903,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.0336371511220932,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.09000000357627869,
+          0.6000000238418579,
+          1.0,
+          0.0,
+          0.04004448652267456,
+          0.0,
+          0.0
+        ],
+        [
+          0.2074074000120163,
+          0.2074074000120163,
+          0.04938271641731262,
+          0.4444444477558136,
+          0.7407407164573669,
+          0.0,
+          0.046875,
+          0.0,
+          0.0
+        ],
+        [
+          0.5925925970077515,
+          0.5925925970077515,
+          0.006049382966011763,
+          0.15555556118488312,
+          0.25925925374031067,
+          0.0,
+          0.05409613624215126,
+          0.0,
+          0.0
+        ],
+        [
+          0.800000011920929,
+          0.800000011920929,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06167534738779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.6024722456932068,
+          0.40494444966316223,
+          0.0,
+          0.09876389056444168,
+          0.3456736207008362,
+          0.0,
+          0.069580078125,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.07777778059244156,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.0862358957529068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.09492187201976776,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.10380316525697708,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.1128472238779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.12202148139476776,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.1312934011220932,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.14063042402267456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.15000000596046448,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.1593695729970932,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.16870659589767456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.177978515625,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.18715277314186096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.19619682431221008,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.205078125,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.21376410126686096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2222222238779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.23041991889476776,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.23832465708255768,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2459038645029068,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.25312501192092896,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2599555253982544,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.26636284589767456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2723144590854645,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2777777910232544,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.28272026777267456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.287109375,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.29091253876686096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2940972149372101,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.296630859375,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.29848089814186096,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.2996147871017456,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.699999988079071,
+          0.0,
+          0.299775630235672,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2991121709346771,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2980239689350128,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2965254485607147,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2946310043334961,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2923550307750702,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.28971192240715027,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.286716103553772,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.28338193893432617,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2797238230705261,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2757561504840851,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2714933454990387,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.044099997729063034,
+          0.0,
+          0.0,
+          0.0,
+          0.2669498026371002,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.041127171367406845,
+          0.03429355099797249,
+          0.03429355099797249,
+          0.0,
+          0.2621399164199829,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.03367149084806442,
+          0.12620027363300323,
+          0.12620027363300323,
+          0.0,
+          0.2570780813694,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.02419753186404705,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.25177866220474243,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.014988611452281475,
+          0.4170095920562744,
+          0.4170095920562744,
+          0.0,
+          0.24625609815120697,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.007668857928365469,
+          0.5829904079437256,
+          0.5829904079437256,
+          0.0,
+          0.2405247837305069,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.002964197425171733,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.23459909856319427,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0007023590733297169,
+          0.873799741268158,
+          0.873799741268158,
+          0.0,
+          0.22849343717098236,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          5.1863706175936386e-05,
+          0.965706467628479,
+          0.965706467628479,
+          0.0,
+          0.2222222238779068,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.21579982340335846,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.20924066007137299,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.20255911350250244,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.19576959311962128,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.18888649344444275,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.18192419409751892,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.17489711940288544,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.16781964898109436,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.16070619225502014,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.15357112884521484,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.14642886817455292,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.1392938196659088,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.1321803480386734,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.12510287761688232,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.11807580292224884,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.11111351102590561,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.10423040390014648,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.09744088351726532,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.09075933694839478,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0842001736164093,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.07777778059244156,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0715065598487854,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.06540090590715408,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.05947521701455116,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.05374389514327049,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.04822133481502533,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.04292193055152893,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.03786008059978485,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.033050186932086945,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.02850664034485817,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.02424384281039238,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.020276188850402832,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.01661807671189308,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.013283902779221535,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.010288066230714321,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.007644962519407272,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.005368990823626518,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.003474546829238534,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.001976028550416231,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0008878330700099468,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.00022435782011598349,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.05539358779788017,
+          0.05539358779788017,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.19825072586536407,
+          0.19825072586536407,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.39358600974082947,
+          0.39358600974082947,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.6064140200614929,
+          0.6064140200614929,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.8017492890357971,
+          0.8017492890357971,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.9446064233779907,
+          0.9446064233779907,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.965706467628479,
+          0.965706467628479,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.873799741268158,
+          0.873799741268158,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.7407407164573669,
+          0.7407407164573669,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.5829904079437256,
+          0.5829904079437256,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.4170095920562744,
+          0.4170095920562744,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.25925925374031067,
+          0.25925925374031067,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.12620027363300323,
+          0.12620027363300323,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.03429355099797249,
+          0.03429355099797249,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00842057354748249,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03186162933707237,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06759217381477356,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11288119852542877,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16499772667884827,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22121074795722961,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2787892520427704,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33500227332115173,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.38711878657341003,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.43240782618522644,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46813836693763733,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49157941341400146,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.421875,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.078125,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16238892078399658,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16258476674556732,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16315053403377533,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16405296325683594,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1652584671974182,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16673314571380615,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.16844306886196136,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17035429179668427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17243307828903198,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17464600503444672,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.17695996165275574,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1793423444032669,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1817609965801239,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.18418438732624054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.18658141791820526,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.18892164528369904,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19117511808872223,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.1933123618364334,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19530442357063293,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19712266325950623,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.19873873889446259,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20012450218200684,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20125184953212738,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20209257304668427,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20261827111244202,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.202799990773201,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20284689962863922,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20317445695400238,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.2040596604347229,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.2057672142982483,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.20853547751903534,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.2125566303730011,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.041600000113248825,
+          0.041600000113248825,
+          0.21426953375339508,
+          0.0,
+          0.0,
+          1.7458409047321766e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.14079999923706055,
+          0.14079999923706055,
+          0.20918145775794983,
+          0.0,
+          0.0,
+          2.9853688829462044e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.25920000672340393,
+          0.25920000672340393,
+          0.19602687656879425,
+          0.0,
+          0.0,
+          0.00014405208639800549,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.35839998722076416,
+          0.35839998722076416,
+          0.17443956434726715,
+          0.0,
+          0.0,
+          0.00037779618287459016,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4000000059604645,
+          0.4000000059604645,
+          0.1457209438085556,
+          0.0,
+          0.0,
+          0.0006263533141463995,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3379661440849304,
+          0.3379661440849304,
+          0.11315823346376419,
+          0.0,
+          0.0,
+          0.0005805121618323028,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.201243057847023,
+          0.201243057847023,
+          0.08189306408166885,
+          0.0,
+          0.0,
+          0.0002616935526020825,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.06389843672513962,
+          0.06389843672513962,
+          0.05834028497338295,
+          0.0,
+          0.0,
+          3.295229544164613e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0,
+          0.0,
+          0.049157049506902695,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.480896344219218e-06,
+          3.3552336731190735e-07,
+          0.04911700263619423,
+          0.0,
+          0.0,
+          5.976877081096104e-15,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.1837933925562538e-05,
+          2.6820941911864793e-06,
+          0.04901384562253952,
+          0.0,
+          0.0,
+          4.561632105035129e-13,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          3.99475684389472e-05,
+          9.050831067725085e-06,
+          0.04887271672487259,
+          0.0,
+          0.0,
+          6.125981232701916e-12,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.468624921282753e-05,
+          2.145285179722123e-05,
+          0.04871804267168045,
+          0.0,
+          0.0,
+          4.013711585315605e-11,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.00018493043899070472,
+          4.189927494735457e-05,
+          0.04857323318719864,
+          0.0,
+          0.0,
+          1.7680248931561948e-10,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0003195565950591117,
+          7.24012206774205e-05,
+          0.04846039414405823,
+          0.0,
+          0.0,
+          6.04331196196739e-10,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0005074411747045815,
+          0.000114969807327725,
+          0.048400092869997025,
+          0.0,
+          0.0,
+          1.7309419453326313e-09,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.000757460598833859,
+          0.00017161614960059524,
+          0.04841116815805435,
+          0.0,
+          0.0,
+          4.350526161545076e-09,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0010784913320094347,
+          0.0002443513658363372,
+          0.04851052165031433,
+          0.0,
+          0.0,
+          9.886661267444197e-09,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0014794098678976297,
+          0.0003351865743752569,
+          0.04871300607919693,
+          0.0,
+          0.0,
+          2.073649163492064e-08,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0019690925255417824,
+          0.0004461329081095755,
+          0.04903130605816841,
+          0.0,
+          0.0,
+          4.073877946098037e-08,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0025564159732311964,
+          0.0005792014999315143,
+          0.04947587847709656,
+          0.0,
+          0.0,
+          7.57933236172903e-08,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.003250256646424532,
+          0.000736403395421803,
+          0.050054892897605896,
+          0.0,
+          0.0,
+          1.346617040098863e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0040594907477498055,
+          0.0009197497856803238,
+          0.050774261355400085,
+          0.0,
+          0.0,
+          2.2998258941697713e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.004992994945496321,
+          0.0011312516871839762,
+          0.05163760855793953,
+          0.0,
+          0.0,
+          3.79537425487797e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.006059645675122738,
+          0.0013729204656556249,
+          0.05264640972018242,
+          0.0,
+          0.0,
+          6.078063279346679e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.007268319372087717,
+          0.0016467669047415257,
+          0.053800031542778015,
+          0.0,
+          0.0,
+          9.478551987740502e-07,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.008627892471849918,
+          0.0019548023119568825,
+          0.05509587377309799,
+          0.0,
+          0.0,
+          1.443601718165155e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.01014724187552929,
+          0.0022990377619862556,
+          0.056529559195041656,
+          0.0,
+          0.0,
+          2.1525067950278753e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.011835242621600628,
+          0.0026814844459295273,
+          0.058095090091228485,
+          0.0,
+          0.0,
+          3.1487466003454756e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.013700773008167744,
+          0.0031041535548865795,
+          0.059785112738609314,
+          0.0,
+          0.0,
+          4.52691756436252e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.015562713146209717,
+          0.0034823270980268717,
+          0.06265026330947876,
+          0.0,
+          0.0,
+          6.221242074389011e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.01742631010711193,
+          0.003791348310187459,
+          0.06708917021751404,
+          0.0,
+          0.0,
+          8.253384294221178e-06,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.019579989835619926,
+          0.004123319406062365,
+          0.07213851809501648,
+          0.0,
+          0.0,
+          1.1021414138667751e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.02231217548251152,
+          0.004570343066006899,
+          0.0769321620464325,
+          0.0,
+          0.0,
+          1.5221921785268933e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.025911295786499977,
+          0.005224521271884441,
+          0.08076611906290054,
+          0.0,
+          0.0,
+          2.205102464358788e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.030665773898363113,
+          0.006177956238389015,
+          0.0831412598490715,
+          0.0,
+          0.0,
+          3.3544689358677715e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.036864034831523895,
+          0.007522751111537218,
+          0.08378411084413528,
+          0.0,
+          0.0,
+          5.3102325182408094e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.04479450732469559,
+          0.009351007640361786,
+          0.08264528959989548,
+          0.0,
+          0.0,
+          8.622659515822306e-05,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05474561080336571,
+          0.011754828505218029,
+          0.07987608015537262,
+          0.0,
+          0.0,
+          0.00014148777700029314,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.06700577586889267,
+          0.014826315455138683,
+          0.07578262686729431,
+          0.0,
+          0.0,
+          0.0002316829195478931,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08186342567205429,
+          0.01865757256746292,
+          0.07075819373130798,
+          0.0,
+          0.0,
+          0.00037510794936679304,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10623344033956528,
+          0.03352547809481621,
+          0.06575527042150497,
+          0.0,
+          0.0,
+          0.0009153859573416412,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.14293172955513,
+          0.06512051820755005,
+          0.06143290549516678,
+          0.0,
+          0.0,
+          0.0024929780047386885,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18609826266765594,
+          0.10665520280599594,
+          0.05766187235713005,
+          0.0,
+          0.0,
+          0.005522080697119236,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.22987303137779236,
+          0.15134203433990479,
+          0.054254237562417984,
+          0.0,
+          0.0,
+          0.010030488483607769,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2683959901332855,
+          0.19239354133605957,
+          0.05102596431970596,
+          0.0,
+          0.0,
+          0.015404971316456795,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2958071231842041,
+          0.2230222076177597,
+          0.047830548137426376,
+          0.0,
+          0.0,
+          0.02034633792936802,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3062463700771332,
+          0.23644056916236877,
+          0.044563986361026764,
+          0.0,
+          0.0,
+          0.023079603910446167,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3061978220939636,
+          0.2384185791015625,
+          0.04133184626698494,
+          0.0,
+          0.0,
+          0.02403176762163639,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.30604562163352966,
+          0.24011394381523132,
+          0.038234200328588486,
+          0.0,
+          0.0,
+          0.024958010762929916,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3057754635810852,
+          0.24159885942935944,
+          0.03518911451101303,
+          0.0,
+          0.0,
+          0.02587389387190342,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.30537310242652893,
+          0.24294555187225342,
+          0.032128408551216125,
+          0.0,
+          0.0,
+          0.026795953512191772,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.31662431359291077,
+          0.24406345188617706,
+          0.1309189647436142,
+          0.1679447442293167,
+          0.1679447442293167,
+          0.028810279443860054,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3374066948890686,
+          0.24489279091358185,
+          0.4908280372619629,
+          0.4798499643802643,
+          0.4798499643802643,
+          0.031808290630578995,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3483212888240814,
+          0.24555198848247528,
+          0.7784863710403442,
+          0.6478220820426941,
+          0.6478220820426941,
+          0.033950936049222946,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.34645283222198486,
+          0.24608777463436127,
+          0.7617833018302917,
+          0.647860050201416,
+          0.647860050201416,
+          0.03485193848609924,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3430330157279968,
+          0.24649077653884888,
+          0.7444145679473877,
+          0.6478922367095947,
+          0.6478922367095947,
+          0.03558531403541565,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.338291734457016,
+          0.24677994847297668,
+          0.7265229821205139,
+          0.6479189991950989,
+          0.6479189991950989,
+          0.036156054586172104,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3324590027332306,
+          0.24697421491146088,
+          0.708246111869812,
+          0.6479409337043762,
+          0.6479409337043762,
+          0.036572519689798355,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3257647752761841,
+          0.24709255993366241,
+          0.6897161602973938,
+          0.647958517074585,
+          0.647958517074585,
+          0.0368465930223465,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.31843894720077515,
+          0.24715390801429749,
+          0.6710597276687622,
+          0.6479722261428833,
+          0.6479722261428833,
+          0.03699371591210365,
+          0.0,
+          0.0,
+          0.0
+        ]
+      ]
+    },
+    {
+      "name": "GEO_5",
+      "fullName": "Facial_Blendshape_Animation:GEO_5",
+      "blendShapeVersion": "3.0",
+      "morphtarget": 20,
+      "morphname": [
+        "EyeBlink_Left",
+        "EyeBlink_Right",
+        "EyeSquint_Left",
+        "EyeSquint_Right",
+        "EyeDown_Left",
+        "EyeDown_Right",
+        "EyeIn_Left",
+        "EyeIn_Right",
+        "EyeOpen_Left",
+        "EyeOpen_Right",
+        "EyeOut_Left",
+        "EyeOut_Right",
+        "EyeUp_Left",
+        "EyeUp_Right",
+        "CheekSquint_Left",
+        "CheekSquint_Right",
+        "HAPPY_48",
+        "ANGRY_54",
+        "SAD_58",
+        "SURPRISE_59"
+      ],
+      "key": [
+        [
+          0.05009999871253967,
+          0.05009999871253967,
+          0.25,
+          0.25,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20000000298023224,
+          0.20000000298023224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05530000105500221,
+          0.05530000105500221,
+          0.2759999930858612,
+          0.2759999930858612,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2207999974489212,
+          0.2207999974489212,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3003687560558319,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.06769999861717224,
+          0.06769999861717224,
+          0.33799999952316284,
+          0.33799999952316284,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2703999876976013,
+          0.2703999876976013,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3014500141143799,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08250000327825546,
+          0.08250000327825546,
+          0.41200000047683716,
+          0.41200000047683716,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3296000063419342,
+          0.3296000063419342,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3032062351703644,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.09489999711513519,
+          0.09489999711513519,
+          0.4740000069141388,
+          0.4740000069141388,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3792000114917755,
+          0.3792000114917755,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30559998750686646,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30859375,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3121500015258789,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.31623125076293945,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3208000063896179,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3258187472820282,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33125001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10010000318288803,
+          0.10010000318288803,
+          0.5,
+          0.5,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3370562493801117,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3334333300590515,
+          0.3334333300590515,
+          0.4962962865829468,
+          0.4962962865829468,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3431999981403351,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7667666673660278,
+          0.7667666673660278,
+          0.4703703820705414,
+          0.4703703820705414,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.349643737077713,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35635000467300415,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.6000999808311462,
+          0.6000999808311462,
+          0.17499999701976776,
+          0.17499999701976776,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.36328125,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37040001153945923,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.07777778059244156,
+          0.07777778059244156,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37766873836517334,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.2222222238779068,
+          0.2222222238779068,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3850499987602234,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3925062417984009,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4074937403202057,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.41495001316070557,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4223312437534332,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4296000003814697,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.43671876192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4436500072479248,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.45035624504089355,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.45680001378059387,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46294376254081726,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46875,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47418126463890076,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47920000553131104,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4837687611579895,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48785001039505005,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49140626192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4943999946117401,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4967937469482422,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4985499978065491,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49963125586509705,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.5,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.20010000467300415,
+          0.20010000467300415,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4000000059604645,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4999391734600067,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39971888065338135,
+          0.39971888065338135,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49975740909576416,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3988872170448303,
+          0.3988872170448303,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49945569038391113,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3975224494934082,
+          0.3975224494934082,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4990350306034088,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39564207196235657,
+          0.39564207196235657,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.498496413230896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3932635486125946,
+          0.3932635486125946,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49784091114997864,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3904043734073639,
+          0.3904043734073639,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49706944823265076,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3870820105075836,
+          0.3870820105075836,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4961831271648407,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.38331398367881775,
+          0.38331398367881775,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4951828718185425,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3791176974773407,
+          0.3791176974773407,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49406975507736206,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3745107054710388,
+          0.3745107054710388,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.49284473061561584,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3695104122161865,
+          0.3695104122161865,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4915088713169098,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1434333324432373,
+          0.1434333324432373,
+          0.3499999940395355,
+          0.3499999940395355,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.36413437128067017,
+          0.36413437128067017,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4900631308555603,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.14240452647209167,
+          0.14240452647209167,
+          0.34826844930648804,
+          0.34826844930648804,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35839998722076416,
+          0.35839998722076416,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48850855231285095,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.13964731991291046,
+          0.13964731991291046,
+          0.3436278700828552,
+          0.3436278700828552,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.35232481360435486,
+          0.35232481360435486,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.48684611916542053,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.13565555214881897,
+          0.13565555214881897,
+          0.3369094133377075,
+          0.3369094133377075,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3459262549877167,
+          0.3459262549877167,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4850768446922302,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1309230476617813,
+          0.1309230476617813,
+          0.32894423604011536,
+          0.32894423604011536,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3392218351364136,
+          0.3392218351364136,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4832017421722412,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1259436160326004,
+          0.1259436160326004,
+          0.32056349515914917,
+          0.32056349515914917,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33222904801368713,
+          0.33222904801368713,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4812218248844147,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.12121111154556274,
+          0.12121111154556274,
+          0.3125983476638794,
+          0.3125983476638794,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.32496532797813416,
+          0.32496532797813416,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4791381359100342,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11721934378147125,
+          0.11721934378147125,
+          0.3058798909187317,
+          0.3058798909187317,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3174481689929962,
+          0.3174481689929962,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47695159912109375,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11446213722229004,
+          0.11446213722229004,
+          0.3012393116950989,
+          0.3012393116950989,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3096950352191925,
+          0.3096950352191925,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47466328740119934,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.301723450422287,
+          0.301723450422287,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.47227421402931213,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.25421223044395447,
+          0.25421223044395447,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29355084896087646,
+          0.29355084896087646,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4697853624820709,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5920282006263733,
+          0.5920282006263733,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2851947247982025,
+          0.2851947247982025,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4671977162361145,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2766725420951843,
+          0.2766725420951843,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.46451234817504883,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4868236184120178,
+          0.4868236184120178,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.26800182461738586,
+          0.26800182461738586,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4617302417755127,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25920000672340393,
+          0.25920000672340393,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4588523805141449,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2502845823764801,
+          0.2502845823764801,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4558797776699066,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.24127301573753357,
+          0.24127301573753357,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4528134763240814,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2321828007698059,
+          0.2321828007698059,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4496544599533081,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2230314016342163,
+          0.2230314016342163,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.44640374183654785,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.21383632719516754,
+          0.21383632719516754,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.44306233525276184,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2046150267124176,
+          0.2046150267124176,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.43963125348091125,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19538497924804688,
+          0.19538497924804688,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4361114799976349,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18616367876529694,
+          0.18616367876529694,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4325040578842163,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17696858942508698,
+          0.17696858942508698,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4288099706172943,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16781720519065857,
+          0.16781720519065857,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4250302314758301,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1587269902229309,
+          0.1587269902229309,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4211658537387848,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14971542358398438,
+          0.14971542358398438,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.41721785068511963,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14079999923706055,
+          0.14079999923706055,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.4131872355937958,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1319981813430786,
+          0.1319981813430786,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.409074991941452,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12332744896411896,
+          0.12332744896411896,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.40488216280937195,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11480528116226196,
+          0.11480528116226196,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.40060973167419434,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10644915699958801,
+          0.10644915699958801,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39625871181488037,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09827655553817749,
+          0.09827655553817749,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.39183011651039124,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09030496329069138,
+          0.09030496329069138,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3873249590396881,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08255184441804886,
+          0.08255184441804886,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3827442228794098,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07503468543291092,
+          0.07503468543291092,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37808895111083984,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06777095794677734,
+          0.06777095794677734,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.37336015701293945,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06077815219759941,
+          0.06077815219759941,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.368558794260025,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.05407373607158661,
+          0.05407373607158661,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3636859357357025,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04767519235610962,
+          0.04767519235610962,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3587425649166107,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.041600000113248825,
+          0.041600000113248825,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3537296652793884,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03586563467979431,
+          0.03586563467979431,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3486482799053192,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03048957698047161,
+          0.03048957698047161,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.34349942207336426,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.025489304214715958,
+          0.025489304214715958,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.33828407526016235,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.020882293581962585,
+          0.020882293581962585,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3330032527446747,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.016686026006937027,
+          0.016686026006937027,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3276579678058624,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.012917978689074516,
+          0.012917978689074516,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.32224926352500916,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.11343333125114441,
+          0.11343333125114441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.009595630690455437,
+          0.009595630690455437,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3167780935764313,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.17911234498023987,
+          0.17911234498023987,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.006736458744853735,
+          0.006736458744853735,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.31124547123908997,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3433098793029785,
+          0.3433098793029785,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.004357942845672369,
+          0.004357942845672369,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.3056524395942688,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5567666888237,
+          0.5567666888237,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0024775604251772165,
+          0.0024775604251772165,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7702234387397766,
+          0.7702234387397766,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0011127901962026954,
+          0.0011127901962026954,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2933620512485504,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.9344210028648376,
+          0.9344210028648376,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00028111060964874923,
+          0.00028111060964874923,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2849290072917938,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.27487680315971375,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0011318903416395187,
+          0.0011318903416395187,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2633812427520752,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.004204742144793272,
+          0.004204742144793272,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.25061818957328796,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.008734326809644699,
+          0.008734326809644699,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.23676349222660065,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01423641573637724,
+          0.01423641573637724,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22199301421642303,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02022678032517433,
+          0.02022678032517433,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20648261904716492,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.02622118964791298,
+          0.02622118964791298,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1904081404209137,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03173542022705078,
+          0.03173542022705078,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.17394545674324036,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03628523647785187,
+          0.03628523647785187,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1572704017162323,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03938641399145126,
+          0.03938641399145126,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.14055883884429932,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.12398661673069,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.8701731562614441,
+          0.8701731562614441,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10772959887981415,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5909057855606079,
+          0.5909057855606079,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09196363389492035,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.31290218234062195,
+          0.31290218234062195,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0768645852804184,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06260829418897629,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.04937061667442322,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.037327419966459274,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.026654545217752457,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.017527854070067406,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01012319978326559,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0046164365485310555,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0011834182078018785,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18676666915416718,
+          0.18676666915416718,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0405547209084034,
+          0.0405547209084034,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39763087034225464,
+          0.39763087034225464,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.043301891535520554,
+          0.043301891535520554,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7892358303070068,
+          0.7892358303070068,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0490097738802433,
+          0.0490097738802433,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.053877927362918854,
+          0.053877927362918854,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.057062096893787384,
+          0.057062096893787384,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.2995077669620514,
+          0.2995077669620514,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.060233648866415024,
+          0.060233648866415024,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.31214579939842224,
+          0.31214579939842224,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06336560845375061,
+          0.06336560845375061,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.34228265285491943,
+          0.34228265285491943,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06643098592758179,
+          0.06643098592758179,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.37825244665145874,
+          0.37825244665145874,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0694027990102768,
+          0.0694027990102768,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.40838930010795593,
+          0.40838930010795593,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07225406169891357,
+          0.07225406169891357,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.4210273325443268,
+          0.4210273325443268,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07495779544115067,
+          0.07495779544115067,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.8025691509246826,
+          0.8025691509246826,
+          0.4200461208820343,
+          0.4200461208820343,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07748700678348541,
+          0.07748700678348541,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4239683151245117,
+          0.4239683151245117,
+          0.41733333468437195,
+          0.41733333468437195,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07981472462415695,
+          0.07981472462415695,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18528518080711365,
+          0.18528518080711365,
+          0.41323530673980713,
+          0.41323530673980713,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08191395550966263,
+          0.08191395550966263,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.13016147911548615,
+          0.13016147911548615,
+          0.40809836983680725,
+          0.40809836983680725,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08380129188299179,
+          0.08380129188299179,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08723102509975433,
+          0.08723102509975433,
+          0.40226879715919495,
+          0.40226879715919495,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08550456166267395,
+          0.08550456166267395,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05496968328952789,
+          0.05496968328952789,
+          0.39609289169311523,
+          0.39609289169311523,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0870136171579361,
+          0.0870136171579361,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.031853288412094116,
+          0.031853288412094116,
+          0.3899170160293579,
+          0.3899170160293579,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08831832557916641,
+          0.08831832557916641,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.01635768450796604,
+          0.01635768450796604,
+          0.3840874433517456,
+          0.3840874433517456,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08940855413675308,
+          0.08940855413675308,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.006958710495382547,
+          0.006958710495382547,
+          0.37895047664642334,
+          0.37895047664642334,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0902741476893425,
+          0.0902741476893425,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.002132210647687316,
+          0.002132210647687316,
+          0.3748524487018585,
+          0.3748524487018585,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09090498834848404,
+          0.09090498834848404,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.00035402632784098387,
+          0.00035402632784098387,
+          0.37213969230651855,
+          0.37213969230651855,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0912909284234047,
+          0.0912909284234047,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0024055985268205404,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00927248876541853,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.020075812935829163,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03429071232676506,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0513923317193985,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.07085581123828888,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0921562910079956,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.11476891487836838,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1381688266992569,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.3711584806442261,
+          0.3711584806442261,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.16183117032051086,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.003581176744773984,
+          0.003581176744773984,
+          0.3552735149860382,
+          0.3552735149860382,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.18523108959197998,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.012761704623699188,
+          0.012761704623699188,
+          0.3133818209171295,
+          0.3133818209171295,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.20784370601177216,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.025747081264853477,
+          0.025747081264853477,
+          0.25412824749946594,
+          0.25412824749946594,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.22914418578147888,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.04064280539751053,
+          0.04064280539751053,
+          0.18615755438804626,
+          0.18615755438804626,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.24860766530036926,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05555436760187149,
+          0.05555436760187149,
+          0.11811458319425583,
+          0.11811458319425583,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2657092809677124,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0685872733592987,
+          0.0685872733592987,
+          0.0586441271007061,
+          0.0586441271007061,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2799241840839386,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.07784701138734818,
+          0.07784701138734818,
+          0.01639099419116974,
+          0.01639099419116974,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29072752594947815,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2975943982601166,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08143908530473709,
+          0.08143908530473709,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09142182767391205,
+          0.09142182767391205,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          9.999999747378752e-05,
+          9.999999747378752e-05,
+          0.28512904047966003,
+          0.28512904047966003,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.09102650731801987,
+          0.09102650731801987,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0018217518227174878,
+          0.0017750317929312587,
+          0.28379690647125244,
+          0.28379690647125244,
+          0.001588479964993894,
+          0.001868800027295947,
+          0.0,
+          0.0,
+          0.08988217264413834,
+          0.08988217264413834,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.0067983223125338554,
+          0.0066165621392428875,
+          0.27994653582572937,
+          0.27994653582572937,
+          0.006179839838296175,
+          0.007270399946719408,
+          0.0,
+          0.0,
+          0.08805124461650848,
+          0.08805124461650848,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.014746683649718761,
+          0.014349243603646755,
+          0.27379685640335083,
+          0.27379685640335083,
+          0.013512959703803062,
+          0.0158975999802351,
+          0.0,
+          0.0,
+          0.08559612929821014,
+          0.08559612929821014,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.025383807718753815,
+          0.02469772659242153,
+          0.265566885471344,
+          0.265566885471344,
+          0.02332671917974949,
+          0.02744320034980774,
+          0.0,
+          0.0,
+          0.08257924765348434,
+          0.08257924765348434,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.03842666745185852,
+          0.03738666698336601,
+          0.25547561049461365,
+          0.25547561049461365,
+          0.035360001027584076,
+          0.041600000113248825,
+          0.0,
+          0.0,
+          0.07906302809715271,
+          0.07906302809715271,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.05359223484992981,
+          0.05214071273803711,
+          0.243741974234581,
+          0.243741974234581,
+          0.049351681023836136,
+          0.05806079879403114,
+          0.0,
+          0.0,
+          0.07510987669229507,
+          0.07510987669229507,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.07059748470783234,
+          0.06868451833724976,
+          0.2305849939584732,
+          0.2305849939584732,
+          0.06504064053297043,
+          0.07651840150356293,
+          0.0,
+          0.0,
+          0.07078221440315247,
+          0.07078221440315247,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.08915938436985016,
+          0.08674274384975433,
+          0.2162236124277115,
+          0.2162236124277115,
+          0.08216576278209686,
+          0.09666559845209122,
+          0.0,
+          0.0,
+          0.06614246219396591,
+          0.06614246219396591,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.10899490863084793,
+          0.10604002326726913,
+          0.20087681710720062,
+          0.20087681710720062,
+          0.10046592354774475,
+          0.11819519847631454,
+          0.0,
+          0.0,
+          0.06125303730368614,
+          0.06125303730368614,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1298210322856903,
+          0.12630102038383484,
+          0.1847636103630066,
+          0.1847636103630066,
+          0.1196800023317337,
+          0.14079999923706055,
+          0.0,
+          0.0,
+          0.056176360696554184,
+          0.056176360696554184,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.15135471522808075,
+          0.14725039899349213,
+          0.1681029498577118,
+          0.1681029498577118,
+          0.13954688608646393,
+          0.16417279839515686,
+          0.0,
+          0.0,
+          0.05097484588623047,
+          0.05097484588623047,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1733129471540451,
+          0.1686127930879593,
+          0.151113823056221,
+          0.151113823056221,
+          0.15980544686317444,
+          0.18800640106201172,
+          0.0,
+          0.0,
+          0.045710913836956024,
+          0.045710913836956024,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.19541269540786743,
+          0.1901128590106964,
+          0.13401520252227783,
+          0.13401520252227783,
+          0.18019455671310425,
+          0.21199360489845276,
+          0.0,
+          0.0,
+          0.04044697806239128,
+          0.04044697806239128,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2173709273338318,
+          0.21147525310516357,
+          0.11702607572078705,
+          0.11702607572078705,
+          0.20045311748981476,
+          0.23582719266414642,
+          0.0,
+          0.0,
+          0.035245463252067566,
+          0.035245463252067566,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.30000001192092896,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.23890462517738342,
+          0.23242461681365967,
+          0.10036541521549225,
+          0.10036541521549225,
+          0.22032000124454498,
+          0.25920000672340393,
+          0.0,
+          0.0,
+          0.030168786644935608,
+          0.030168786644935608,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.29159998893737793,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.259730726480484,
+          0.2526856064796448,
+          0.08425220847129822,
+          0.08425220847129822,
+          0.23953408002853394,
+          0.28180480003356934,
+          0.0,
+          0.0,
+          0.025279361754655838,
+          0.025279361754655838,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.2687999904155731,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2795662581920624,
+          0.27198290824890137,
+          0.06890542060136795,
+          0.06890542060136795,
+          0.25783422589302063,
+          0.30333438515663147,
+          0.0,
+          0.0,
+          0.020639611408114433,
+          0.020639611408114433,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.23520000278949738,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2981281578540802,
+          0.29004111886024475,
+          0.05454404279589653,
+          0.05454404279589653,
+          0.27495935559272766,
+          0.32348158955574036,
+          0.0,
+          0.0,
+          0.016311950981616974,
+          0.016311950981616974,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.19439999759197235,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3151334226131439,
+          0.3065849244594574,
+          0.04138704761862755,
+          0.04138704761862755,
+          0.29064831137657166,
+          0.34193921089172363,
+          0.0,
+          0.0,
+          0.012358799576759338,
+          0.012358799576759338,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.15000000596046448,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3302989900112152,
+          0.3213389813899994,
+          0.02965341880917549,
+          0.02965341880917549,
+          0.304639995098114,
+          0.35839998722076416,
+          0.0,
+          0.0,
+          0.00884257536381483,
+          0.00884257536381483,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.10559999942779541,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3433418273925781,
+          0.3340279161930084,
+          0.01956213265657425,
+          0.01956213265657425,
+          0.31667327880859375,
+          0.37255680561065674,
+          0.0,
+          0.0,
+          0.005825696513056755,
+          0.005825696513056755,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.06480000168085098,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3539789617061615,
+          0.34437641501426697,
+          0.011332168243825436,
+          0.011332168243825436,
+          0.3264870345592499,
+          0.38410240411758423,
+          0.0,
+          0.0,
+          0.0033705816604197025,
+          0.0033705816604197025,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.031199999153614044,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.361927330493927,
+          0.35210907459259033,
+          0.005182505119591951,
+          0.005182505119591951,
+          0.3338201642036438,
+          0.39272961020469666,
+          0.0,
+          0.0,
+          0.001539648394100368,
+          0.001539648394100368,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.00839999970048666,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3669039011001587,
+          0.3569506108760834,
+          0.0013321228325366974,
+          0.0013321228325366974,
+          0.33841150999069214,
+          0.39813119173049927,
+          0.0,
+          0.0,
+          0.0003953151172026992,
+          0.0003953151172026992,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3686256408691406,
+          0.3586256504058838,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.4000000059604645,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3690889775753021,
+          0.36272987723350525,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.36960163712501526,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.37232980132102966,
+          0.37603822350502014,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.2953122854232788,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3811260461807251,
+          0.4004163444042206,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.19916975498199463,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39825549721717834,
+          0.4377298653125763,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.10321170836687088,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.42649608850479126,
+          0.4898444414138794,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.029475880786776543,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.46862563490867615,
+          0.5586256384849548,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.6301328539848328,
+          0.7091268301010132,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.8893350958824158,
+          0.9188321232795715,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7505814433097839,
+          0.7570764422416687,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.41948139667510986,
+          0.4308376610279083,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.41415348649024963,
+          0.42255699634552,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0009038889547809958,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4102257788181305,
+          0.4162631034851074,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.003591738408431411,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40744748711586,
+          0.411640465259552,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.008027822710573673,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4055676758289337,
+          0.40837356448173523,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.014176415279507637,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40433549880981445,
+          0.4061468839645386,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.02200178988277912,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40350013971328735,
+          0.4046448767185211,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0314682200551033,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4028106927871704,
+          0.4035520851612091,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.04253998398780823,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.402016282081604,
+          0.4025529623031616,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.0551813468337059,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4008660614490509,
+          0.40133196115493774,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.06935659050941467,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3991091847419739,
+          0.3995736241340637,
+          0.0,
+          0.0,
+          0.3400000035762787,
+          0.08502998948097229,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39724934101104736,
+          0.3977278769016266,
+          0.0,
+          0.0,
+          0.3399980962276459,
+          0.10368171334266663,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3958684206008911,
+          0.39638254046440125,
+          0.0,
+          0.0,
+          0.3399847745895386,
+          0.12625031173229218,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39483287930488586,
+          0.3954288065433502,
+          0.0,
+          0.0,
+          0.3399485945701599,
+          0.15188761055469513,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3940090835094452,
+          0.39475783705711365,
+          0.0,
+          0.0,
+          0.3398781418800354,
+          0.17974542081356049,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39326348900794983,
+          0.39426088333129883,
+          0.0,
+          0.0,
+          0.33976200222969055,
+          0.20897558331489563,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39246246218681335,
+          0.3938290774822235,
+          0.0,
+          0.0,
+          0.3395887315273285,
+          0.23872990906238556,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3914724588394165,
+          0.393353670835495,
+          0.0,
+          0.0,
+          0.3393469452857971,
+          0.26816022396087646,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.39015984535217285,
+          0.3927258253097534,
+          0.0,
+          0.0,
+          0.3390251696109772,
+          0.29641836881637573,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.38839107751846313,
+          0.3918367624282837,
+          0.0,
+          0.0,
+          0.33861199021339417,
+          0.32265615463256836,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3860325515270233,
+          0.39057764410972595,
+          0.0,
+          0.0,
+          0.338096022605896,
+          0.34602540731430054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.38295069336891174,
+          0.3888397216796875,
+          0.0,
+          0.0,
+          0.3374657928943634,
+          0.36567795276641846,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.379011869430542,
+          0.3865141272544861,
+          0.0,
+          0.0,
+          0.3367099165916443,
+          0.3807655870914459,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3740825653076172,
+          0.383492112159729,
+          0.0,
+          0.0,
+          0.3358169496059418,
+          0.3904401659965515,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3680291175842285,
+          0.3796648383140564,
+          0.0,
+          0.0,
+          0.33477547764778137,
+          0.3938535153865814,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3570016622543335,
+          0.3709850311279297,
+          0.0,
+          0.0,
+          0.33278971910476685,
+          0.39272475242614746,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.33858227729797363,
+          0.3547999858856201,
+          0.0,
+          0.0,
+          0.32915082573890686,
+          0.3894417881965637,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3147854506969452,
+          0.33309265971183777,
+          0.0,
+          0.0,
+          0.3239777684211731,
+          0.3841595947742462,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.28762564063072205,
+          0.3078460097312927,
+          0.0,
+          0.0,
+          0.31738948822021484,
+          0.37703314423561096,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.25911736488342285,
+          0.28104302287101746,
+          0.0,
+          0.0,
+          0.3095049262046814,
+          0.3682173788547516,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.23127509653568268,
+          0.25466662645339966,
+          0.0,
+          0.0,
+          0.3004431128501892,
+          0.3578673005104065,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.2061133086681366,
+          0.230699822306633,
+          0.0,
+          0.0,
+          0.2903229296207428,
+          0.3461378514766693,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.18564648926258087,
+          0.21112556755542755,
+          0.0,
+          0.0,
+          0.2792634069919586,
+          0.33318403363227844,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.17188911139965057,
+          0.1979268491268158,
+          0.0,
+          0.0,
+          0.2673834562301636,
+          0.3191607892513275,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.16685564815998077,
+          0.19308660924434662,
+          0.0,
+          0.0,
+          0.25480204820632935,
+          0.30422309041023254,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.1840301752090454,
+          0.21646492183208466,
+          0.0,
+          0.0,
+          0.2416381686925888,
+          0.28852590918540955,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.22700974345207214,
+          0.27491065859794617,
+          0.06239999830722809,
+          0.06239999830722809,
+          0.22801074385643005,
+          0.2722242474555969,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.28297826647758484,
+          0.3508901596069336,
+          0.21119999885559082,
+          0.21119999885559082,
+          0.21403875946998596,
+          0.2554730176925659,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.33911970257759094,
+          0.42686963081359863,
+          0.3887999951839447,
+          0.3887999951839447,
+          0.19984115660190582,
+          0.23842720687389374,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.3826179802417755,
+          0.48531538248062134,
+          0.5375999808311462,
+          0.5375999808311462,
+          0.18553690612316132,
+          0.2212418168783188,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4006570875644684,
+          0.5086936950683594,
+          0.6000000238418579,
+          0.6000000238418579,
+          0.17124497890472412,
+          0.2040717899799347,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4014672040939331,
+          0.5054956674575806,
+          0.5853914022445679,
+          0.5855903029441833,
+          0.15708431601524353,
+          0.18707209825515747,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40191230177879333,
+          0.4971316456794739,
+          0.5465857982635498,
+          0.5472221970558167,
+          0.14317390322685242,
+          0.17039769887924194,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40212681889533997,
+          0.48544660210609436,
+          0.49111348390579224,
+          0.4921875,
+          0.12963266670703888,
+          0.1542035937309265,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40224531292915344,
+          0.47228553891181946,
+          0.42650488018989563,
+          0.4277777671813965,
+          0.11657959222793579,
+          0.1386447250843048,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40240219235420227,
+          0.459493488073349,
+          0.3602902591228485,
+          0.3612847328186035,
+          0.10413363575935364,
+          0.12387607991695404,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.4027320146560669,
+          0.4489154517650604,
+          0.30000001192092896,
+          0.30000001192092896,
+          0.0924137532711029,
+          0.11005260795354843,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.40331125259399414,
+          0.4411664307117462,
+          0.2362038791179657,
+          0.2326388955116272,
+          0.07967709749937057,
+          0.09487734735012054,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.404345840215683,
+          0.4378454089164734,
+          0.16598376631736755,
+          0.15694443881511688,
+          0.0654701218008995,
+          0.0777505487203598,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.5104801654815674,
+          0.537967324256897,
+          0.10663805156946182,
+          0.09375,
+          0.05184578150510788,
+          0.0613730326294899,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.7326971292495728,
+          0.7493358254432678,
+          0.06081034615635872,
+          0.04722222313284874,
+          0.03881384804844856,
+          0.04585878551006317,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.004526900127530098,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.9687886834144592,
+          0.9740538597106934,
+          0.025857046246528625,
+          0.013194444589316845,
+          0.02636454440653324,
+          0.03109382838010788,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.01712881214916706,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          1.0,
+          1.0,
+          0.011145789176225662,
+          0.0,
+          0.016521481797099113,
+          0.019437037408351898,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.03633755072951317,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.9221786856651306,
+          0.9364071488380432,
+          0.009895771741867065,
+          0.0,
+          0.010282591916620731,
+          0.01206916756927967,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.060684934258461,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.6212478876113892,
+          0.664219856262207,
+          0.008472497574985027,
+          0.0,
+          0.006649944931268692,
+          0.007809464819729328,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.08870277553796768,
+          0.0,
+          0.0,
+          0.0
+        ],
+        [
+          0.42844846844673157,
+          0.4937658905982971,
+          0.007186100818216801,
+          0.0,
+          0.0046533565036952496,
+          0.005474537145346403,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.0,
+          0.1189228966832161,
+          0.0,
+          0.0,
+          0.0
+        ]
+      ]
+    }
+  ],
+  "shapesAmount": 5,
+  "time": [
+    0,
+    33,
+    66,
+    100,
+    133,
+    166,
+    200,
+    233,
+    266,
+    300,
+    333,
+    366,
+    400,
+    433,
+    466,
+    500,
+    533,
+    566,
+    600,
+    633,
+    666,
+    700,
+    733,
+    766,
+    800,
+    833,
+    866,
+    900,
+    933,
+    966,
+    1000,
+    1033,
+    1066,
+    1100,
+    1133,
+    1166,
+    1200,
+    1233,
+    1266,
+    1300,
+    1333,
+    1366,
+    1400,
+    1433,
+    1466,
+    1500,
+    1533,
+    1566,
+    1600,
+    1633,
+    1666,
+    1700,
+    1733,
+    1766,
+    1800,
+    1833,
+    1866,
+    1900,
+    1933,
+    1966,
+    2000,
+    2033,
+    2066,
+    2100,
+    2133,
+    2166,
+    2200,
+    2233,
+    2266,
+    2300,
+    2333,
+    2366,
+    2400,
+    2433,
+    2466,
+    2500,
+    2533,
+    2566,
+    2600,
+    2633,
+    2666,
+    2700,
+    2733,
+    2766,
+    2800,
+    2833,
+    2866,
+    2900,
+    2933,
+    2966,
+    3000,
+    3033,
+    3066,
+    3100,
+    3133,
+    3166,
+    3200,
+    3233,
+    3266,
+    3300,
+    3333,
+    3366,
+    3400,
+    3433,
+    3466,
+    3500,
+    3533,
+    3566,
+    3600,
+    3633,
+    3666,
+    3700,
+    3733,
+    3766,
+    3800,
+    3833,
+    3866,
+    3900,
+    3933,
+    3966,
+    4000,
+    4033,
+    4066,
+    4100,
+    4133,
+    4166,
+    4200,
+    4233,
+    4266,
+    4300,
+    4333,
+    4366,
+    4400,
+    4433,
+    4466,
+    4500,
+    4533,
+    4566,
+    4600,
+    4633,
+    4666,
+    4700,
+    4733,
+    4766,
+    4800,
+    4833,
+    4866,
+    4900,
+    4933,
+    4966,
+    5000,
+    5033,
+    5066,
+    5100,
+    5133,
+    5166,
+    5200,
+    5233,
+    5266,
+    5300,
+    5333,
+    5366,
+    5400,
+    5433,
+    5466,
+    5500,
+    5533,
+    5566,
+    5600,
+    5633,
+    5666,
+    5700,
+    5733,
+    5766,
+    5800,
+    5833,
+    5866,
+    5900,
+    5933,
+    5966,
+    6000,
+    6033,
+    6066,
+    6100,
+    6133,
+    6166,
+    6200,
+    6233,
+    6266,
+    6300,
+    6333,
+    6366,
+    6400,
+    6433,
+    6466,
+    6500,
+    6533,
+    6566,
+    6600,
+    6633,
+    6666,
+    6700,
+    6733,
+    6766,
+    6800,
+    6833,
+    6866,
+    6900,
+    6933,
+    6966,
+    7000,
+    7033,
+    7066,
+    7100,
+    7133,
+    7166,
+    7200,
+    7233,
+    7266,
+    7300,
+    7333,
+    7366,
+    7400,
+    7433,
+    7466,
+    7500,
+    7533,
+    7566,
+    7600,
+    7633,
+    7666,
+    7700,
+    7733,
+    7766,
+    7800,
+    7833,
+    7866,
+    7900,
+    7933,
+    7966,
+    8000,
+    8033,
+    8066,
+    8100,
+    8133,
+    8166,
+    8200,
+    8233,
+    8266,
+    8300,
+    8333,
+    8366,
+    8400,
+    8433,
+    8466,
+    8500,
+    8533,
+    8566,
+    8600,
+    8633,
+    8666,
+    8700,
+    8733,
+    8766,
+    8800,
+    8833,
+    8866,
+    8900,
+    8933,
+    8966,
+    9000,
+    9033,
+    9066,
+    9100,
+    9133,
+    9166,
+    9200,
+    9233,
+    9266,
+    9300,
+    9333,
+    9366,
+    9400,
+    9433,
+    9466,
+    9500,
+    9533,
+    9566,
+    9600,
+    9633,
+    9666,
+    9700,
+    9733,
+    9766,
+    9800,
+    9833,
+    9866,
+    9900,
+    9933,
+    9966,
+    10000,
+    10033,
+    10066,
+    10100,
+    10133,
+    10166,
+    10200,
+    10233,
+    10266,
+    10300,
+    10333,
+    10366,
+    10400,
+    10433,
+    10466,
+    10500,
+    10533,
+    10566,
+    10600,
+    10633,
+    10666,
+    10700,
+    10733,
+    10766,
+    10800,
+    10833,
+    10866,
+    10900,
+    10933,
+    10966,
+    11000,
+    11033,
+    11066,
+    11100,
+    11133,
+    11166,
+    11200,
+    11233,
+    11266,
+    11300,
+    11333,
+    11366,
+    11400,
+    11433,
+    11466,
+    11500,
+    11533,
+    11566,
+    11600,
+    11633,
+    11666,
+    11700,
+    11733,
+    11766,
+    11800,
+    11833,
+    11866,
+    11900,
+    11933,
+    11966,
+    12000,
+    12033,
+    12066,
+    12100,
+    12133,
+    12166,
+    12200,
+    12233,
+    12266,
+    12300,
+    12333,
+    12366,
+    12400,
+    12433,
+    12466,
+    12500,
+    12533,
+    12566,
+    12600,
+    12633,
+    12666,
+    12700,
+    12733,
+    12766,
+    12800,
+    12833,
+    12866,
+    12900,
+    12933,
+    12966,
+    13000,
+    13033,
+    13066,
+    13100,
+    13133,
+    13166,
+    13200,
+    13233,
+    13266,
+    13300,
+    13333,
+    13366,
+    13400,
+    13433,
+    13466,
+    13500,
+    13533,
+    13566,
+    13600,
+    13633,
+    13666,
+    13700,
+    13733,
+    13766,
+    13800,
+    13833,
+    13866,
+    13900,
+    13933,
+    13966,
+    14000,
+    14033,
+    14066,
+    14100,
+    14133,
+    14166,
+    14200,
+    14233,
+    14266,
+    14300,
+    14333,
+    14366,
+    14400,
+    14433,
+    14466,
+    14500,
+    14533,
+    14566,
+    14600,
+    14633,
+    14666,
+    14700,
+    14733,
+    14766,
+    14800,
+    14833,
+    14866,
+    14900,
+    14933,
+    14966
+  ],
+  "frames": 450
+}
diff --git a/automated-tests/resources/folder_appicon_empty_bg.png b/automated-tests/resources/folder_appicon_empty_bg.png
index 32a47a5..b401e49 100644
Binary files a/automated-tests/resources/folder_appicon_empty_bg.png and b/automated-tests/resources/folder_appicon_empty_bg.png differ
diff --git a/automated-tests/resources/forest_diffuse_cubemap_cross_vertical.png b/automated-tests/resources/forest_diffuse_cubemap_cross_vertical.png
new file mode 100644
index 0000000..6e6bf0f
Binary files /dev/null and b/automated-tests/resources/forest_diffuse_cubemap_cross_vertical.png differ
diff --git a/automated-tests/resources/gallery-small-1-yuv420.jpg b/automated-tests/resources/gallery-small-1-yuv420.jpg
new file mode 100644
index 0000000..c1362a6
Binary files /dev/null and b/automated-tests/resources/gallery-small-1-yuv420.jpg differ
diff --git a/automated-tests/resources/gallery-small-1.jpg b/automated-tests/resources/gallery-small-1.jpg
index 9292310..cac624f 100644
Binary files a/automated-tests/resources/gallery-small-1.jpg and b/automated-tests/resources/gallery-small-1.jpg differ
diff --git a/automated-tests/resources/navmesh-test.bin b/automated-tests/resources/navmesh-test.bin
new file mode 100755
index 0000000..f58f46b
Binary files /dev/null and b/automated-tests/resources/navmesh-test.bin differ
diff --git a/automated-tests/resources/overwritable-image.jpg b/automated-tests/resources/overwritable-image.jpg
new file mode 100644
index 0000000..9977a28
--- /dev/null
+++ b/automated-tests/resources/overwritable-image.jpg
@@ -0,0 +1 @@
+invalid
diff --git a/automated-tests/resources/selection_handle_drop_left.png b/automated-tests/resources/selection_handle_drop_left.png
index d9ed8b8..72bf805 100644
Binary files a/automated-tests/resources/selection_handle_drop_left.png and b/automated-tests/resources/selection_handle_drop_left.png differ
diff --git a/automated-tests/resources/selection_handle_drop_right.png b/automated-tests/resources/selection_handle_drop_right.png
index f66b26b..6901e85 100644
Binary files a/automated-tests/resources/selection_handle_drop_right.png and b/automated-tests/resources/selection_handle_drop_right.png differ
diff --git a/automated-tests/resources/simpleMultiplePrimitiveTest.gltf b/automated-tests/resources/simpleMultiplePrimitiveTest.gltf
new file mode 100644
index 0000000..9345fbe
--- /dev/null
+++ b/automated-tests/resources/simpleMultiplePrimitiveTest.gltf
@@ -0,0 +1,109 @@
+{
+  "scene" : 0,
+  "scenes" : [
+    {
+      "nodes" : [ 0 ]
+    }
+  ],
+
+  "nodes" : [
+    {
+      "name" : "rootNode",
+      "mesh" : 0,
+      "rotation" : [ 0.0, 0.0, 0.0, 1.0 ]
+    }
+  ],
+
+  "meshes" : [
+    {
+      "primitives" : [
+        {
+          "attributes" : {
+            "POSITION" : 1
+          },
+          "indices" : 0
+        },
+        {
+          "attributes" : {
+            "POSITION" : 1
+          },
+          "indices" : 0
+        }
+      ]
+    }
+  ],
+
+  "buffers" : [
+    {
+      "uri" : "simpleTriangle.bin",
+      "byteLength" : 44
+    },
+    {
+      "uri" : "animation.bin",
+      "byteLength" : 100
+    }
+  ],
+
+  "bufferViews" : [
+    {
+      "buffer" : 0,
+      "byteOffset" : 0,
+      "byteLength" : 6,
+      "target" : 34963
+    },
+    {
+      "buffer" : 0,
+      "byteOffset" : 8,
+      "byteLength" : 36,
+      "target" : 34962
+    },
+    {
+      "buffer" : 1,
+      "byteOffset" : 0,
+      "byteLength" : 100
+    }
+  ],
+
+  "accessors" : [
+    {
+      "bufferView" : 0,
+      "byteOffset" : 0,
+      "componentType" : 5123,
+      "count" : 3,
+      "type" : "SCALAR",
+      "max" : [ 2 ],
+      "min" : [ 0 ]
+    },
+    {
+      "bufferView" : 1,
+      "byteOffset" : 0,
+      "componentType" : 5126,
+      "count" : 3,
+      "type" : "VEC3",
+      "max" : [ 1.0, 1.0, 0.0 ],
+      "min" : [ 0.0, 0.0, 0.0 ]
+    },
+    {
+      "bufferView" : 2,
+      "byteOffset" : 0,
+      "componentType" : 5126,
+      "count" : 5,
+      "type" : "SCALAR",
+      "max" : [ 1.0 ],
+      "min" : [ 0.0 ]
+    },
+    {
+      "bufferView" : 2,
+      "byteOffset" : 20,
+      "componentType" : 5126,
+      "count" : 5,
+      "type" : "VEC4",
+      "max" : [ 0.0, 0.0, 1.0, 1.0 ],
+      "min" : [ 0.0, 0.0, 0.0, -0.707 ]
+    }
+  ],
+
+  "asset" : {
+    "version" : "2.0"
+  }
+}
diff --git a/automated-tests/resources/test-empty.bvh b/automated-tests/resources/test-empty.bvh
new file mode 100644
index 0000000..e69de29
diff --git a/automated-tests/resources/test-invalid-hierarchy0.bvh b/automated-tests/resources/test-invalid-hierarchy0.bvh
new file mode 100644
index 0000000..c8c0cb8
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy0.bvh
@@ -0,0 +1,19 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-hierarchy1.bvh b/automated-tests/resources/test-invalid-hierarchy1.bvh
new file mode 100644
index 0000000..be6cd56
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy1.bvh
@@ -0,0 +1,19 @@
+HIERARCHY
+ROOT root
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+}
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-hierarchy2.bvh b/automated-tests/resources/test-invalid-hierarchy2.bvh
new file mode 100644
index 0000000..3bb962a
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy2.bvh
@@ -0,0 +1,18 @@
+HIERARCHY
+ROOT root
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-hierarchy3.bvh b/automated-tests/resources/test-invalid-hierarchy3.bvh
new file mode 100644
index 0000000..3ff6a12
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy3.bvh
@@ -0,0 +1,19 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+  }
+}
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-hierarchy4.bvh b/automated-tests/resources/test-invalid-hierarchy4.bvh
new file mode 100644
index 0000000..3175816
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy4.bvh
@@ -0,0 +1,19 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+      OFFSET 0 0 0
+    }
+  }
+}
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-hierarchy5.bvh b/automated-tests/resources/test-invalid-hierarchy5.bvh
new file mode 100644
index 0000000..576adae
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy5.bvh
@@ -0,0 +1,18 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+      OFFSET 0 0 0
+  }
+}
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-hierarchy6.bvh b/automated-tests/resources/test-invalid-hierarchy6.bvh
new file mode 100644
index 0000000..6f64833
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy6.bvh
@@ -0,0 +1,22 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      {
+        OFFSET 0 0 0
+      }
+    }
+  }
+}
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-hierarchy7.bvh b/automated-tests/resources/test-invalid-hierarchy7.bvh
new file mode 100644
index 0000000..058fde0
--- /dev/null
+++ b/automated-tests/resources/test-invalid-hierarchy7.bvh
@@ -0,0 +1,22 @@
+HIERARCHY
+ROOT root
+{
+  {
+    OFFSET 0.0 -0.948831 1.32574
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    JOINT first
+    {
+      OFFSET -0.0 4.130377 -0.008512
+      CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+      End Site
+      {
+        OFFSET 0 0 0
+      }
+    }
+  }
+}
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-motion0.bvh b/automated-tests/resources/test-invalid-motion0.bvh
new file mode 100644
index 0000000..37a8bdc
--- /dev/null
+++ b/automated-tests/resources/test-invalid-motion0.bvh
@@ -0,0 +1,21 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+}
+MOTION
+Frames:	3
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-motion1.bvh b/automated-tests/resources/test-invalid-motion1.bvh
new file mode 100644
index 0000000..1bba75a
--- /dev/null
+++ b/automated-tests/resources/test-invalid-motion1.bvh
@@ -0,0 +1,20 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+}
+MOTION
+Frames:	1
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-motion2.bvh b/automated-tests/resources/test-invalid-motion2.bvh
new file mode 100644
index 0000000..c003a2d
--- /dev/null
+++ b/automated-tests/resources/test-invalid-motion2.bvh
@@ -0,0 +1,19 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+}
+MOTION
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test-invalid-motion3.bvh b/automated-tests/resources/test-invalid-motion3.bvh
new file mode 100644
index 0000000..0a4a582
--- /dev/null
+++ b/automated-tests/resources/test-invalid-motion3.bvh
@@ -0,0 +1,19 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+}
+MOTION
+Frames:	2
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test.bvh b/automated-tests/resources/test.bvh
new file mode 100644
index 0000000..28bd0da
--- /dev/null
+++ b/automated-tests/resources/test.bvh
@@ -0,0 +1,20 @@
+HIERARCHY
+ROOT root
+{
+  OFFSET 0.0 -0.948831 1.32574
+  CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+  JOINT first
+  {
+    OFFSET -0.0 4.130377 -0.008512
+    CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
+    End Site
+    {
+      OFFSET 0 0 0
+    }
+  }
+}
+MOTION
+Frames:	2
+Frame Time:	0.3
+0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+0.0 10.0 0.0 0.0 0.0 0.0 10.0 0.0 0.0 90.0 0.0 0.0
\ No newline at end of file
diff --git a/automated-tests/resources/test.tvg b/automated-tests/resources/test.tvg
new file mode 100644
index 0000000..78bb48f
Binary files /dev/null and b/automated-tests/resources/test.tvg differ
diff --git a/automated-tests/resources/uv_texture.jpg b/automated-tests/resources/uv_texture.jpg
new file mode 100644
index 0000000..7f63873
Binary files /dev/null and b/automated-tests/resources/uv_texture.jpg differ
diff --git a/automated-tests/scripts/output_summary.pl b/automated-tests/scripts/output_summary.pl
index dec392d..69e4fce 100755
--- a/automated-tests/scripts/output_summary.pl
+++ b/automated-tests/scripts/output_summary.pl
@@ -71,7 +71,7 @@ foreach $module (keys(%modules))
     my $numFailures = $modules{$module}->{"fail"};
     $totalFailures += $numFailures;
     print( "$ASCII_BOLD$module results:$ASCII_RESET\n" );
-    printf("Number of test passes:   %s%4d (%5.2f%%)%s\n", $ASCII_BOLD, $numPasses, 100.0 * $numPasses / ($numPasses+$numFailures),  $ASCII_RESET);
+    printf("Number of test passes:   %s%4d (%5.2f%%)%s\n", $ASCII_BOLD, $numPasses, $numPasses>0?100.0 * $numPasses / ($numPasses+$numFailures):0,  $ASCII_RESET);
     printf("%sNumber of test failures:%s %s%4d%s\n\n", $result_colour, $ASCII_RESET, $ASCII_BOLD, $numFailures, $ASCII_RESET);
 }
 
diff --git a/automated-tests/src/dali-physics2d/CMakeLists.txt b/automated-tests/src/dali-physics2d/CMakeLists.txt
new file mode 100644
index 0000000..e72db08
--- /dev/null
+++ b/automated-tests/src/dali-physics2d/CMakeLists.txt
@@ -0,0 +1,99 @@
+SET(PKG_NAME "dali-physics2d")
+
+SET(EXEC_NAME "tct-${PKG_NAME}-core")
+SET(RPM_NAME "core-${PKG_NAME}-tests")
+
+# List of test case sources (Only these get parsed for test cases)
+SET(TC_SOURCES
+  utc-Dali-PhysicsAdaptor.cpp
+  utc-Dali-PhysicsActor.cpp
+  utc-Dali-IntegPhysics.cpp
+  )
+
+# List of test harness files (Won't get parsed for test cases)
+SET(TEST_HARNESS_DIR "../dali-toolkit/dali-toolkit-test-utils")
+
+SET(TEST_HARNESS_SOURCES
+  ${TEST_HARNESS_DIR}/toolkit-adaptor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-async-task-manager.cpp
+  ${TEST_HARNESS_DIR}/toolkit-direct-rendering-egl.cpp
+  ${TEST_HARNESS_DIR}/toolkit-event-thread-callback.cpp
+  ${TEST_HARNESS_DIR}/toolkit-environment-variable.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-context.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-options.cpp
+  ${TEST_HARNESS_DIR}/toolkit-lifecycle-controller.cpp
+  ${TEST_HARNESS_DIR}/toolkit-orientation.cpp
+  ${TEST_HARNESS_DIR}/toolkit-style-monitor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-test-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-timer.cpp
+  ${TEST_HARNESS_DIR}/toolkit-trigger-event-factory.cpp
+  ${TEST_HARNESS_DIR}/toolkit-window.cpp
+  ${TEST_HARNESS_DIR}/toolkit-scene-holder.cpp
+  ${TEST_HARNESS_DIR}/dali-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dali-toolkit-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dummy-control.cpp
+  ${TEST_HARNESS_DIR}/mesh-builder.cpp
+  ${TEST_HARNESS_DIR}/test-actor-utils.cpp
+  ${TEST_HARNESS_DIR}/test-animation-data.cpp
+  ${TEST_HARNESS_DIR}/test-application.cpp
+  ${TEST_HARNESS_DIR}/test-button.cpp
+  ${TEST_HARNESS_DIR}/test-harness.cpp
+  ${TEST_HARNESS_DIR}/test-gesture-generator.cpp
+  ${TEST_HARNESS_DIR}/test-gl-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-impl.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-object.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-command-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-framebuffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-controller.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-texture.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sampler.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-program.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-pipeline.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-shader.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-reflection.cpp
+  ${TEST_HARNESS_DIR}/test-platform-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-render-controller.cpp
+  ${TEST_HARNESS_DIR}/test-trace-call-stack.cpp
+)
+
+PKG_CHECK_MODULES(${PKG_NAME} REQUIRED
+  dali2-core
+  dali2-adaptor
+  dali2-toolkit
+  dali2-physics-2d
+  chipmunk2d
+)
+
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
+ADD_COMPILE_OPTIONS( ${${PKG_NAME}_CFLAGS_OTHER} )
+
+ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
+
+FOREACH(directory ${${PKG_NAME}_LIBRARY_DIRS})
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
+ENDFOREACH(directory ${PKG_NAME_LIBRARY_DIRS})
+
+INCLUDE_DIRECTORIES(
+    ../../../
+    ${${PKG_NAME}_INCLUDE_DIRS}
+    ../dali-toolkit/dali-toolkit-test-utils
+)
+
+ADD_CUSTOM_COMMAND(
+  COMMAND ${SCRIPT_DIR}/tcheadgen.sh ${EXEC_NAME}.h ${TC_SOURCES}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  OUTPUT ${EXEC_NAME}.h
+  COMMENT "Generating test tables"
+  )
+
+ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
+TARGET_LINK_LIBRARIES(${EXEC_NAME}
+    ${${PKG_NAME}_LIBRARIES}
+    -lpthread -ldl --coverage
+)
+
+INSTALL(PROGRAMS ${EXEC_NAME}
+    DESTINATION ${BIN_DIR}/${EXEC_NAME}
+)
diff --git a/automated-tests/src/dali-physics2d/tct-dali-physics2d-core.cpp b/automated-tests/src/dali-physics2d/tct-dali-physics2d-core.cpp
new file mode 100644
index 0000000..b3297ce
--- /dev/null
+++ b/automated-tests/src/dali-physics2d/tct-dali-physics2d-core.cpp
@@ -0,0 +1,8 @@
+#include <test-harness.h>
+
+#include "tct-dali-physics2d-core.h"
+
+int main(int argc, char* const argv[])
+{
+  return TestHarness::RunTests(argc, argv, tc_array);
+}
diff --git a/automated-tests/src/dali-physics2d/utc-Dali-IntegPhysics.cpp b/automated-tests/src/dali-physics2d/utc-Dali-IntegPhysics.cpp
new file mode 100644
index 0000000..c79c495
--- /dev/null
+++ b/automated-tests/src/dali-physics2d/utc-Dali-IntegPhysics.cpp
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+#include <iostream>
+#include <typeinfo>
+
+// Need to override adaptor classes for toolkit test harness, so include
+// test harness headers before dali headers.
+#include <dali-physics/dali-physics.h>
+
+#include <dali-physics/integration-api/integ-physics-adaptor.h>
+#include <dali-physics/integration-api/physics-world.h>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/devel-api/events/hit-test-algorithm.h>
+
+#include <chipmunk/chipmunk.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit::Physics;
+
+static const char* BALL_IMAGE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+
+static cpBody* CreateBody(cpSpace* space)
+{
+  const float BALL_MASS       = 10.0f;
+  const float BALL_RADIUS     = 26.0f;
+  const float BALL_ELASTICITY = 0.5f;
+  const float BALL_FRICTION   = 0.5f;
+
+  cpBody* body = cpSpaceAddBody(space, cpBodyNew(BALL_MASS, cpMomentForCircle(BALL_MASS, 0.0f, BALL_RADIUS, cpvzero)));
+
+  cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, BALL_RADIUS, cpvzero));
+  cpShapeSetElasticity(shape, BALL_ELASTICITY);
+  cpShapeSetFriction(shape, BALL_FRICTION);
+
+  return body;
+}
+
+// Defines a PolyShape
+static cpBody* CreateHexBody(cpSpace* space)
+{
+  const float MASS       = 10.0f;
+  const float RADIUS     = 26.0f;
+  const float ELASTICITY = 0.5f;
+  const float FRICTION   = 0.5f;
+
+  cpVect hexagon[6];
+  for(int i = 0; i < 6; i++)
+  {
+    cpFloat angle = -CP_PI * 2.0f * i / 6.0f;
+    hexagon[i]    = cpvmult(cpv(cos(angle), sin(angle)), RADIUS - 1.0f);
+  }
+
+  cpBody*  body  = cpSpaceAddBody(space, cpBodyNew(MASS, cpMomentForPoly(MASS, 6, hexagon, cpvzero, 0.0f)));
+  cpShape* shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, 1.0f));
+
+  cpShapeSetElasticity(shape, ELASTICITY);
+  cpShapeSetFriction(shape, FRICTION);
+
+  return body;
+}
+
+int UtcDaliPhysics2DIntegrationGetPhysicsWorld(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing getting the physics world");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(adaptor);
+
+  Dali::Toolkit::Physics::Integration::PhysicsWorld world = Dali::Toolkit::Physics::Integration::GetPhysicsWorld(adaptor);
+
+  DALI_TEST_CHECK(world.GetImpl() != nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DIntegrationPhysicsWorldLockUnlock(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+  }
+
+  DALI_TEST_CHECK(adaptor);
+  Dali::Toolkit::Physics::Integration::PhysicsWorld world = Dali::Toolkit::Physics::Integration::GetPhysicsWorld(adaptor);
+
+  world.Lock();
+  world.Unlock();
+
+  {
+    tet_infoline("Test that creating accessor after unlocking this does not lock up!");
+    auto accessor = adaptor.GetPhysicsAccessor();
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliPhysics2DIntegrationPhysicsWorldGetNative(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing getting the native world through Integ API");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+  }
+
+  DALI_TEST_CHECK(adaptor);
+  Dali::Toolkit::Physics::Integration::PhysicsWorld world = Dali::Toolkit::Physics::Integration::GetPhysicsWorld(adaptor);
+
+  world.Lock();
+  cpBody* newBody{nullptr};
+  try
+  {
+    auto     worldImpl = world.GetNative();
+    cpSpace* space     = worldImpl.Get<cpSpace*>();
+    DALI_TEST_CHECK(space != nullptr);
+
+    newBody = CreateHexBody(space);
+  }
+  catch(DaliException& e)
+  {
+    tet_result(TET_FAIL);
+  }
+  world.Unlock();
+
+  DALI_TEST_CHECK(newBody != nullptr);
+  END_TEST;
+}
+
+int UtcDaliPhysics2DIntegrationPhysicsWorldHitTest(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the Hit Test works through Integ API");
+
+  const Vector2 center(TestApplication::DEFAULT_SURFACE_WIDTH * 0.5f, TestApplication::DEFAULT_SURFACE_HEIGHT * 0.5f);
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+  }
+
+  DALI_TEST_CHECK(adaptor);
+
+  Vector3 from, to;
+  adaptor.BuildPickingRay(Vector3(center), Vector3(center), from, to);
+
+  Dali::Toolkit::Physics::Integration::PhysicsWorld world = Dali::Toolkit::Physics::Integration::GetPhysicsWorld(adaptor);
+  world.Lock();
+  try
+  {
+    auto     worldImpl = world.GetNative();
+    cpSpace* space     = worldImpl.Get<cpSpace*>();
+    DALI_TEST_CHECK(space != nullptr);
+
+    cpShapeFilter GRAB_FILTER = {CP_NO_GROUP, 1u << 31, 1u << 31};
+    Dali::Any     nativeFilter{GRAB_FILTER};
+    Vector3       localPivot;
+    float         distanceFromCamera;
+    auto          body = world.HitTest(from, from, nativeFilter, localPivot, distanceFromCamera);
+
+    DALI_TEST_CHECK(!body.Empty());
+    cpBody* cbody = body.Get<cpBody*>();
+
+    DALI_TEST_CHECK(cbody != nullptr);
+  }
+  catch(DaliException& e)
+  {
+    tet_result(TET_FAIL);
+  }
+  world.Unlock();
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-physics2d/utc-Dali-PhysicsActor.cpp b/automated-tests/src/dali-physics2d/utc-Dali-PhysicsActor.cpp
new file mode 100644
index 0000000..91700fd
--- /dev/null
+++ b/automated-tests/src/dali-physics2d/utc-Dali-PhysicsActor.cpp
@@ -0,0 +1,595 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <chipmunk/chipmunk.h>
+#include <stdlib.h>
+#include <iostream>
+
+// Need to override adaptor classes for toolkit test harness, so include
+// test harness headers before dali headers.
+#include <dali-toolkit-test-suite-utils.h>
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-physics/dali-physics.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit::Physics;
+
+extern cpBody* CreateBody(cpSpace* space);
+
+const char* BALL_IMAGE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+
+int UtcDaliPhysics2DActorNew(void)
+{
+  ToolkitTestApplication application;
+
+  cpBody* body{nullptr};
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  auto accessor         = adaptor.GetPhysicsAccessor();
+  auto space            = accessor->GetNative().Get<cpSpace*>();
+  body                  = CreateBody(space);
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorDownCastP(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  cpBody* body{nullptr};
+  auto    accessor          = adaptor.GetPhysicsAccessor();
+  auto    space             = accessor->GetNative().Get<cpSpace*>();
+  body                      = CreateBody(space);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+  BaseHandle   handle(physicsActor);
+
+  PhysicsActor actor2 = PhysicsActor::DownCast(handle);
+  DALI_TEST_CHECK(actor2);
+  DALI_TEST_EQUALS(physicsActor.GetId(), actor2.GetId(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorDownCastN(void)
+{
+  BaseHandle   uninitializedHandle;
+  PhysicsActor actor = PhysicsActor::DownCast(uninitializedHandle);
+  DALI_TEST_CHECK(!actor);
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  cpBody* body{nullptr};
+  auto    accessor          = adaptor.GetPhysicsAccessor();
+  auto    space             = accessor->GetNative().Get<cpSpace*>();
+  body                      = CreateBody(space);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor moved = std::move(physicsActor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!physicsActor);
+  DALI_TEST_CHECK(moved != physicsActor);
+  DALI_TEST_EQUALS(moved.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorCopyConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  cpBody* body{nullptr};
+  auto    accessor          = adaptor.GetPhysicsAccessor();
+  auto    space             = accessor->GetNative().Get<cpSpace*>();
+  body                      = CreateBody(space);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor selectedActor(physicsActor);
+  DALI_TEST_CHECK(selectedActor);
+  DALI_TEST_CHECK(physicsActor);
+  DALI_TEST_CHECK(selectedActor == physicsActor); // should point at same object
+  DALI_TEST_EQUALS(selectedActor.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorCopyAssign(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the copy assign");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  cpBody* body{nullptr};
+  auto    accessor          = adaptor.GetPhysicsAccessor();
+  auto    space             = accessor->GetNative().Get<cpSpace*>();
+  body                      = CreateBody(space);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor selectedActor = physicsActor;
+  DALI_TEST_CHECK(selectedActor);
+  DALI_TEST_CHECK(physicsActor);
+  DALI_TEST_CHECK(selectedActor == physicsActor); // should point at same object
+  DALI_TEST_EQUALS(selectedActor.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  cpBody* body{nullptr};
+  auto    accessor          = adaptor.GetPhysicsAccessor();
+  auto    space             = accessor->GetNative().Get<cpSpace*>();
+  body                      = CreateBody(space);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor moved;
+  moved = std::move(physicsActor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!physicsActor);
+  DALI_TEST_EQUALS(moved.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetIdP(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the ID Getter");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  cpBody* body{nullptr};
+  auto    accessor          = adaptor.GetPhysicsAccessor();
+  auto    space             = accessor->GetNative().Get<cpSpace*>();
+  body                      = CreateBody(space);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = adaptor.AddActorBody(ballActor, body);
+  int          id           = physicsActor.GetId();
+  int          actorId      = ballActor[Actor::Property::ID];
+  DALI_TEST_EQUALS(id, actorId, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetIdN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the ID Getter");
+
+  PhysicsActor physicsActor;
+  try
+  {
+    uint32_t id __attribute__((unused)) = physicsActor.GetId();
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException e)
+  {
+    DALI_TEST_ASSERT(e, "Physics actor handle is empty", TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetBodyP(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the body Getter");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  PhysicsActor physicsActor;
+  cpBody*      body{nullptr};
+  {
+    auto accessor         = adaptor.GetPhysicsAccessor();
+    auto space            = accessor->GetNative().Get<cpSpace*>();
+    body                  = CreateBody(space);
+    Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+    physicsActor = adaptor.AddActorBody(ballActor, body);
+  }
+
+  application.Render();
+  Test::WaitForEventThreadTrigger(1);
+
+  Dali::Any any = physicsActor.GetBody();
+  DALI_TEST_EQUALS(any.Get<cpBody*>(), body, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetBodyN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the ID Getter");
+
+  PhysicsActor physicsActor;
+  try
+  {
+    Dali::Any any __attribute__((unused)) = physicsActor.GetBody();
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException e)
+  {
+    DALI_TEST_ASSERT(e, "Physics actor handle is empty", TEST_LOCATION);
+  }
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorSetPosition(void)
+{
+  tet_infoline("Test the AsyncSetPhysicsPosition() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsPosition(Vector3(10, 20, -30));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto actor    = rootActor.FindChildById(physicsActor.GetId());
+    // Warning - physics properties are never reflected in the event size cache.
+    // Have to use GetCurrentProperty to see the updated values.
+    DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10, 20, 0), 0.01f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorSetRotation1(void)
+{
+  tet_infoline("Test the AsyncSetPhysicsRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, -2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::ZAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto actor    = rootActor.FindChildById(physicsActor.GetId());
+    // Warning - physics properties are never reflected in the event size cache.
+    // Have to use GetCurrentProperty to see the updated values.
+    Quaternion q = actor.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION);
+    Quaternion expected(Degree(-30), Vector3::ZAXIS);
+    DALI_TEST_EQUALS(q, expected, 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorSetRotation2(void)
+{
+  tet_infoline("Test the AsyncSetPhysicsRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::ZAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto actor    = rootActor.FindChildById(physicsActor.GetId());
+    // Warning - physics properties are never reflected in the event size cache.
+    // Have to use GetCurrentProperty to see the updated values.
+    Quaternion q = actor.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION);
+    Quaternion expected(Degree(30), Vector3::ZAXIS);
+    DALI_TEST_EQUALS(q, expected, 0.001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetActorPosition(void)
+{
+  tet_infoline("Test the GetActorPosition() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+    tet_infoline("Test that Z is ignored");
+    physicsActor.AsyncSetPhysicsPosition(Vector3(10, 20, -30));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    tet_infoline("Test that Z is ignored. Note, error is quite high, so make epsilon low");
+    DALI_TEST_EQUALS(physicsActor.GetActorPosition(), Vector3(10, 20, 0), 0.01f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetActorRotation(void)
+{
+  tet_infoline("Test the GetActorRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::ZAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    DALI_TEST_EQUALS(physicsActor.GetActorRotation(), Quaternion(Degree(30), Vector3::ZAXIS), 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetPhysicsPosition(void)
+{
+  tet_infoline("Test the GetPhysicsPosition() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsPosition(Vector3(10, 20, -30));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto    accessor = adaptor.GetPhysicsAccessor();
+    Vector4 pos      = transform * Vector4(10, 20, 0, 1);
+    DALI_TEST_EQUALS(physicsActor.GetPhysicsPosition(), Vector3(pos), 0.01f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DActorGetPhysicsRotation(void)
+{
+  tet_infoline("Test the GetPhysicsRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, -2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  cpBody*      body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+    body          = CreateBody(space);
+    physicsActor  = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::ZAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    tet_infoline("Check that actor and physics rotations are identical");
+    auto accessor = adaptor.GetPhysicsAccessor();
+    DALI_TEST_EQUALS(physicsActor.GetPhysicsRotation(), Quaternion(Degree(30), Vector3::ZAXIS), 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-physics2d/utc-Dali-PhysicsAdaptor.cpp b/automated-tests/src/dali-physics2d/utc-Dali-PhysicsAdaptor.cpp
new file mode 100644
index 0000000..cf846bb
--- /dev/null
+++ b/automated-tests/src/dali-physics2d/utc-Dali-PhysicsAdaptor.cpp
@@ -0,0 +1,986 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+#include <iostream>
+#include <typeinfo>
+
+// Need to override adaptor classes for toolkit test harness, so include
+// test harness headers before dali headers.
+#include <dali-physics/dali-physics.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/devel-api/events/hit-test-algorithm.h>
+
+#include <chipmunk/chipmunk.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit::Physics;
+
+void utc_dali_physics2d_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void utc_dali_physics2d_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+cpBody* CreateBody(cpSpace* space)
+{
+  const float BALL_MASS       = 10.0f;
+  const float BALL_RADIUS     = 26.0f;
+  const float BALL_ELASTICITY = 0.5f;
+  const float BALL_FRICTION   = 0.5f;
+
+  cpBody* body = cpSpaceAddBody(space, cpBodyNew(BALL_MASS, cpMomentForCircle(BALL_MASS, 0.0f, BALL_RADIUS, cpvzero)));
+
+  cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, BALL_RADIUS, cpvzero));
+  cpShapeSetElasticity(shape, BALL_ELASTICITY);
+  cpShapeSetFriction(shape, BALL_FRICTION);
+
+  return body;
+}
+
+// Defines a PolyShape
+cpBody* CreateHexBody(cpSpace* space)
+{
+  const float MASS       = 10.0f;
+  const float RADIUS     = 26.0f;
+  const float ELASTICITY = 0.5f;
+  const float FRICTION   = 0.5f;
+
+  cpVect hexagon[6];
+  for(int i = 0; i < 6; i++)
+  {
+    cpFloat angle = -CP_PI * 2.0f * i / 6.0f;
+    hexagon[i]    = cpvmult(cpv(cos(angle), sin(angle)), RADIUS - 1.0f);
+  }
+
+  cpBody*  body  = cpSpaceAddBody(space, cpBodyNew(MASS, cpMomentForPoly(MASS, 6, hexagon, cpvzero, 0.0f)));
+  cpShape* shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, 1.0f));
+
+  cpShapeSetElasticity(shape, ELASTICITY);
+  cpShapeSetFriction(shape, FRICTION);
+
+  return body;
+}
+
+// Defines a SegmentShape
+cpBody* CreateSegBody(cpSpace* space)
+{
+  const float MASS       = 10.0f;
+  const float RADIUS     = 26.0f;
+  const float ELASTICITY = 0.5f;
+  const float FRICTION   = 0.5f;
+
+  cpVect   a     = cpv(0, 100);
+  cpVect   b     = cpv(100, 0);
+  cpBody*  body  = cpSpaceAddBody(space, cpBodyNew(MASS, cpMomentForSegment(MASS, a, b, 0.0f)));
+  cpShape* shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, a, b, RADIUS));
+
+  cpShapeSetElasticity(shape, ELASTICITY);
+  cpShapeSetFriction(shape, FRICTION);
+
+  return body;
+}
+
+int UtcDaliPhysics2DCreateAdaptorP1(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor handle = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(handle);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DCreateAdaptorN1(void)
+{
+  ToolkitTestApplication application;
+
+  PhysicsAdaptor handle;
+  DALI_TEST_CHECK(!handle);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DDowncastP1(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  BaseHandle handle = PhysicsAdaptor::New(transform, size);
+
+  auto adaptor = PhysicsAdaptor::DownCast(handle);
+  DALI_TEST_CHECK(adaptor);
+  //Following only works if type is registered
+  //DALI_TEST_EQUALS("PhysicsAdaptor", adaptor.GetTypeName(), TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliPhysics2DDowncastN1(void)
+{
+  BaseHandle handle;
+  auto       adaptor = PhysicsAdaptor::DownCast(handle);
+  DALI_TEST_CHECK(!adaptor);
+
+  DALI_TEST_CHECK(typeid(PhysicsAdaptor) == typeid(decltype(adaptor)));
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor moved = std::move(adaptor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!adaptor);
+  DALI_TEST_CHECK(moved != adaptor);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorCopyConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor altAdaptor = adaptor;
+  DALI_TEST_CHECK(altAdaptor);
+  DALI_TEST_CHECK(adaptor);
+  DALI_TEST_CHECK(altAdaptor == adaptor); // should point at same object
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorCopyAssign(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the copy assign");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor altAdaptor = adaptor;
+  DALI_TEST_CHECK(altAdaptor);
+  DALI_TEST_CHECK(adaptor);
+  DALI_TEST_CHECK(altAdaptor == adaptor); // should point at same object
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor moved;
+  moved = std::move(adaptor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!adaptor);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DSetTimestep(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  adaptor.SetTimestep(1.0f / 60.0f);
+
+  DALI_TEST_EQUALS(adaptor.GetTimestep(), 1.0f / 60.0f, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DGetTimestep(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  adaptor.SetTimestep(1.0f / 60.0f);
+  float timestep = adaptor.GetTimestep();
+  float expected = 1.0f / 60.0f;
+  DALI_TEST_EQUALS(timestep, expected, 0.0001f, TEST_LOCATION);
+
+  adaptor.SetTimestep(1.0f / 120.0f);
+  timestep = adaptor.GetTimestep();
+  expected = 1.0f / 120.0f;
+  DALI_TEST_EQUALS(timestep, expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DGetPhysicsAccessorP1(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor                           adaptor  = PhysicsAdaptor::New(transform, size);
+  PhysicsAdaptor::ScopedPhysicsAccessorPtr accessor = adaptor.GetPhysicsAccessor();
+  DALI_TEST_CHECK(accessor.get() != nullptr);
+
+  Dali::Any world = accessor->GetNative();
+  DALI_TEST_CHECK(!world.Empty());
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DGetPhysicsAccessorN1(void)
+{
+  ToolkitTestApplication application;
+
+  PhysicsAdaptor handle;
+  DALI_TEST_CHECK(!handle);
+
+  try
+  {
+    auto ptr = handle.GetPhysicsAccessor();
+    DALI_TEST_CHECK(ptr == nullptr);
+
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException& e)
+  {
+    DALI_TEST_ASSERT(e, "Physics adaptor handle is empty", TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorGetRootActor(void)
+{
+  tet_infoline("Test that the root actor can be retrieved");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  DALI_TEST_CHECK(rootActor);
+  DALI_TEST_EQUALS(rootActor.GetProperty<Vector2>(Actor::Property::SIZE), Vector2(640.0f, 480.0f), 0.001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorCreateDebugLayer(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(true);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair size(640, 480);
+  auto       scene = application.GetScene();
+
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+  Window window = DevelWindow::Get(rootActor);
+
+  Layer layer = adaptor.CreateDebugLayer(window);
+  DALI_TEST_CHECK(layer);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::ON);
+
+  cpBody* body{nullptr};
+  cpBody* body2{nullptr};
+  cpBody* body3{nullptr};
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+
+    body                     = CreateBody(space);
+    Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+    auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+    cpBodySetPosition(body, cpv(0, 0));
+
+    // Constraint should create a dot in debug
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+    cpSpaceAddConstraint(space, cpPivotJointNew(staticBody, body, cpv(10, 10)));
+
+    body2                     = CreateHexBody(space);
+    Dali::Actor ballActor2    = Toolkit::ImageView::New("gallery-small-1.jpg");
+    auto        physicsActor2 = adaptor.AddActorBody(ballActor2, body2);
+    cpBodySleep(body2);
+
+    body3                     = CreateSegBody(space);
+    Dali::Actor ballActor3    = Toolkit::ImageView::New("gallery-small-1.jpg");
+    auto        physicsActor3 = adaptor.AddActorBody(ballActor3, body3);
+  }
+  Test::WaitForEventThreadTrigger(1);
+
+  // Render - if it doesn't crash, great!
+  application.SendNotification();
+  application.Render();
+
+  Uint16Pair size2(480, 640);
+  adaptor.SetTransformAndSize(transform, size2);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorTranslateToPhysicsSpace1(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 a(30, 20, 10);
+  Vector3 expected(60, 40, 10);
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(a), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorTranslateToPhysicsSpace2(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using an alternative scale doesn't change rotation");
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  // Rotation shouldn't change under this scale
+  Quaternion q(Degree(30.0f), Vector3::XAXIS);
+  Quaternion expected(Degree(30.0f), Vector3::XAXIS);
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(q), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorTranslateToPhysicsSpace3(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using an inverted Y scale inverts rotation");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Quaternion q(Degree(30.0f), Vector3::ZAXIS);
+  Quaternion expected(Degree(-30.0f), Vector3::ZAXIS);
+
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(q), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorTranslateFromPhysicsSpace1(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a double scale halves position");
+
+  transform.SetIdentityAndScale(Vector3(2.0f, -2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 position(20.0f, 20.0f, 0.0f);
+  Vector3 expected(10.0f, -10.0f, 0.0f);
+
+  DALI_TEST_EQUALS(adaptor.TranslateFromPhysicsSpace(position), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorConvertVectorToPhysicsSpace01(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, 1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorToPhysicsSpace(vector), vector, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorConvertVectorToPhysicsSpace02(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation with inverse Y does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  Vector3        expected(20.0f, -20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorToPhysicsSpace(vector), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorConvertVectorFromPhysicsSpace01(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, 1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorFromPhysicsSpace(vector), vector, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorConvertVectorFromPhysicsSpace02(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation with inverse Y does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  Vector3        expected(20.0f, -20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorFromPhysicsSpace(vector), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorSetTransformAndSize(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 a(30, 20, 10);
+  Vector3 expected(60, 40, 10);
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(a), expected, 0.0001f, TEST_LOCATION);
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  adaptor.SetTransformAndSize(transform, size);
+
+  Vector3 expect2(30, 80, 10);
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(a), expect2, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorSetIntegrationState(void)
+{
+  tet_infoline("Test that changing the integration state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::ON);
+
+  adaptor.SetIntegrationState(PhysicsAdaptor::IntegrationState::OFF);
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::OFF);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorGetIntegrationState(void)
+{
+  tet_infoline("Test that changing the integration state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  adaptor.SetIntegrationState(PhysicsAdaptor::IntegrationState::OFF);
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::OFF);
+
+  adaptor.SetIntegrationState(PhysicsAdaptor::IntegrationState::ON);
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::ON);
+
+  // Can't test actual integration step runs without adding actors - see utc-Dali-PhysicsActor.cpp.
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorSetDebugState(void)
+{
+  tet_infoline("Test that changing the debug state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::OFF);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::ON);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::ON);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::OFF);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::OFF);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorGetDebugState(void)
+{
+  tet_infoline("Test that changing the debug state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::OFF);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::OFF);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::ON);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::ON);
+
+  // Can't test actual debug step runs without adding actors - see utc-Dali-PhysicsActor.cpp.
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorAddActorBody(void)
+{
+  tet_infoline("Test that an actor/body pair can be added");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  auto accessor = adaptor.GetPhysicsAccessor();
+  auto space    = accessor->GetNative().Get<cpSpace*>();
+
+  cpBody*     body         = CreateBody(space);
+  Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+  auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+
+  DALI_TEST_CHECK(physicsActor);
+  int id = ballActor[Actor::Property::ID];
+
+  DALI_TEST_EQUALS(physicsActor.GetId(), id, TEST_LOCATION);
+  DALI_TEST_EQUALS(physicsActor.GetBody().Get<cpBody*>(), body, TEST_LOCATION);
+
+  END_TEST;
+}
+
+void removeShape(cpBody* body, cpShape* shape, void* data)
+{
+  cpSpace* space = static_cast<cpSpace*>(data);
+  cpSpaceRemoveShape(space, shape);
+  cpShapeSetBody(shape, nullptr);
+  cpShapeFree(shape);
+}
+
+int UtcDaliPhysics2DAdaptorRemoveActorBodyP01(void)
+{
+  tet_infoline("Test that an actor/body pair can be removed");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  cpBody* body;
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+
+    body = CreateBody(space);
+  }
+  Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+  auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+
+  application.SendNotification();
+  application.Render();
+  application.SendNotification();
+  application.Render();
+
+  adaptor.RemoveActorBody(physicsActor);
+  DALI_TEST_CHECK(!ballActor.GetParent());
+
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto space    = accessor->GetNative().Get<cpSpace*>();
+
+    try
+    {
+      cpBodyEachShape(body, removeShape, space);
+      cpSpaceRemoveBody(space, body);
+      tet_result(TET_PASS);
+    }
+    catch(std::exception& e)
+    {
+      tet_result(TET_FAIL);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorRemoveActorBodyN01(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  tet_infoline("Test that removing a physics actor that hasn't been created with AddActorBody does nothing");
+  Dali::Actor  actor        = Dali::Actor::New();
+  cpBody*      body         = cpBodyNew(1.0f, 1.0f);
+  PhysicsActor physicsActor = PhysicsActor::New(actor, body, adaptor);
+  ;
+  try
+  {
+    adaptor.RemoveActorBody(physicsActor);
+    tet_result(TET_PASS);
+  }
+  catch(std::exception& e)
+  {
+    // Should fail silently, without exception!
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorRemoveActorBodyN02(void)
+{
+  tet_infoline("Test that an empty actor/body pair doesn't break adaptor");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  PhysicsActor physicsActor;
+  try
+  {
+    adaptor.RemoveActorBody(physicsActor);
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException& e)
+  {
+    DALI_TEST_ASSERT(e, "Physics actor handle is empty", TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorGetPhysicsActor(void)
+{
+  tet_infoline("Test that an actor/body pair can be retrieved");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  auto accessor = adaptor.GetPhysicsAccessor();
+  auto space    = accessor->GetNative().Get<cpSpace*>();
+
+  cpBody*     body         = CreateBody(space);
+  Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+  auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+
+  DALI_TEST_CHECK(physicsActor);
+
+  PhysicsActor testActor = adaptor.GetPhysicsActor(body);
+  DALI_TEST_CHECK(testActor);
+  DALI_TEST_CHECK(physicsActor == testActor);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorBuildPickingRay(void)
+{
+  tet_infoline("Test that picking ray converts screen coords");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(1.0f, 1.0f, 1.0f));
+  Uint16Pair     size(TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  const Vector2  center(TestApplication::DEFAULT_SURFACE_WIDTH * 0.5f, TestApplication::DEFAULT_SURFACE_HEIGHT * 0.5f);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Vector3 from, to;
+  adaptor.BuildPickingRay(Vector3(center), Vector3(center), from, to); // Hit test centre of screen
+  Vector3 physCenter = adaptor.TranslateToPhysicsSpace(Vector3(center));
+  DALI_TEST_EQUALS(from, physCenter, 0.001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorProjectPoint(void)
+{
+  tet_infoline("Test that a point is projected into physics space");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 projectedPoint = adaptor.ProjectPoint(Vector3(), -Vector3::ZAXIS, 200);
+
+  DALI_TEST_EQUALS(projectedPoint, Vector3(0.0f, 0.0f, 0.0f), 0.001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorQueue(void)
+{
+  tet_infoline("Test that Queue and CreateSyncPoint both work");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  cpBody* body{nullptr};
+  {
+    auto accessor            = adaptor.GetPhysicsAccessor();
+    auto space               = accessor->GetNative().Get<cpSpace*>();
+    body                     = CreateBody(space);
+    Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+    auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+  }
+
+  tet_infoline("Test that Queue works without accessor");
+  adaptor.Queue([body]() {
+    cpBodySetPosition(body, cpv(100.0f, 20.0f));
+  });
+  adaptor.CreateSyncPoint();
+
+  application.SendNotification();
+  application.Render();
+  // Should trigger an Update
+
+  {
+    auto   accessor = adaptor.GetPhysicsAccessor();
+    cpVect origin   = cpBodyGetPosition(body);
+
+    DALI_TEST_EQUALS(origin.x, cpFloat(100.0f), 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.y, cpFloat(20.0f), 0.001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorCreateSyncPoint(void)
+{
+  tet_infoline("Test that a delayed CreateSyncPoint delays update");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  cpBody* body{nullptr};
+  {
+    auto accessor            = adaptor.GetPhysicsAccessor();
+    auto space               = accessor->GetNative().Get<cpSpace*>();
+    body                     = CreateBody(space);
+    Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+    auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+
+    tet_infoline("Test that Queue works with accessor");
+    adaptor.Queue([body]() {
+      cpBodySetPosition(body, cpv(100.0f, 20.0f));
+    });
+  }
+
+  // Should trigger an Update without processing queue
+  application.SendNotification();
+  application.Render();
+
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+
+    cpVect origin = cpBodyGetPosition(body);
+    DALI_TEST_EQUALS(origin.x, cpFloat(0.0f), 0.01f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.y, cpFloat(0.0f), 0.01f, TEST_LOCATION);
+  }
+
+  // Should now execute queue
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+
+    cpVect origin = cpBodyGetPosition(body);
+    DALI_TEST_EQUALS(origin.x, cpFloat(100.0f), 0.01f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.y, cpFloat(20.0f), 0.01f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics2DAdaptorHitTestP(void)
+{
+  tet_infoline("Test that hit testing finds a body");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(1.0f, 1.0f, 1.0f));
+  Uint16Pair     size(TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  const Vector2  center(TestApplication::DEFAULT_SURFACE_WIDTH * 0.5f, TestApplication::DEFAULT_SURFACE_HEIGHT * 0.5f);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  {
+    auto        accessor  = adaptor.GetPhysicsAccessor(); // Prevent integration
+    auto        space     = accessor->GetNative().Get<cpSpace*>();
+    Dali::Actor ballActor = Toolkit::ImageView::New(TEST_RESOURCE_DIR "/gallery-small-1.jpg");
+    cpBody*     body      = CreateBody(space);
+    cpBodySetPosition(body, cpv(center.x, center.y));
+
+    ballActor[Actor::Property::PARENT_ORIGIN] = ParentOrigin::CENTER;
+    ballActor[Actor::Property::ANCHOR_POINT]  = AnchorPoint::CENTER;
+
+    auto physicsActor = adaptor.AddActorBody(ballActor, body);
+  }
+  Test::WaitForEventThreadTrigger(1);
+
+  // Should trigger an Update without processing queue
+  application.SendNotification();
+  application.Render();
+
+  Vector3 from, to;
+  adaptor.BuildPickingRay(Vector3(center), Vector3(center), from, to); // Hit test centre of screen
+
+  {
+    auto    accessor = adaptor.GetPhysicsAccessor();
+    Vector3 localPivot;
+    float   distanceFromCamera;
+
+    cpShapeFilter GRAB_FILTER = {CP_NO_GROUP, 1u << 31, 1u << 31};
+    Dali::Any     nativeFilter{GRAB_FILTER};
+
+    auto body = accessor->HitTest(from, from, nativeFilter, localPivot, distanceFromCamera);
+
+    DALI_TEST_CHECK(!body.Empty());
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-physics3d/CMakeLists.txt b/automated-tests/src/dali-physics3d/CMakeLists.txt
new file mode 100644
index 0000000..01ecfc0
--- /dev/null
+++ b/automated-tests/src/dali-physics3d/CMakeLists.txt
@@ -0,0 +1,98 @@
+SET(PKG_NAME "dali-physics3d")
+
+SET(EXEC_NAME "tct-${PKG_NAME}-core")
+SET(RPM_NAME "core-${PKG_NAME}-tests")
+
+# List of test case sources (Only these get parsed for test cases)
+SET(TC_SOURCES
+  utc-Dali-PhysicsAdaptor.cpp
+  utc-Dali-PhysicsActor.cpp
+  )
+
+# List of test harness files (Won't get parsed for test cases)
+SET(TEST_HARNESS_DIR "../dali-toolkit/dali-toolkit-test-utils")
+
+SET(TEST_HARNESS_SOURCES
+  ${TEST_HARNESS_DIR}/toolkit-adaptor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-async-task-manager.cpp
+  ${TEST_HARNESS_DIR}/toolkit-direct-rendering-egl.cpp
+  ${TEST_HARNESS_DIR}/toolkit-event-thread-callback.cpp
+  ${TEST_HARNESS_DIR}/toolkit-environment-variable.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-context.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-options.cpp
+  ${TEST_HARNESS_DIR}/toolkit-lifecycle-controller.cpp
+  ${TEST_HARNESS_DIR}/toolkit-orientation.cpp
+  ${TEST_HARNESS_DIR}/toolkit-style-monitor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-test-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-timer.cpp
+  ${TEST_HARNESS_DIR}/toolkit-trigger-event-factory.cpp
+  ${TEST_HARNESS_DIR}/toolkit-window.cpp
+  ${TEST_HARNESS_DIR}/toolkit-scene-holder.cpp
+  ${TEST_HARNESS_DIR}/dali-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dali-toolkit-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dummy-control.cpp
+  ${TEST_HARNESS_DIR}/mesh-builder.cpp
+  ${TEST_HARNESS_DIR}/test-actor-utils.cpp
+  ${TEST_HARNESS_DIR}/test-animation-data.cpp
+  ${TEST_HARNESS_DIR}/test-application.cpp
+  ${TEST_HARNESS_DIR}/test-button.cpp
+  ${TEST_HARNESS_DIR}/test-harness.cpp
+  ${TEST_HARNESS_DIR}/test-gesture-generator.cpp
+  ${TEST_HARNESS_DIR}/test-gl-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-impl.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-object.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-command-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-framebuffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-controller.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-texture.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sampler.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-program.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-pipeline.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-shader.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-reflection.cpp
+  ${TEST_HARNESS_DIR}/test-platform-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-render-controller.cpp
+  ${TEST_HARNESS_DIR}/test-trace-call-stack.cpp
+)
+
+PKG_CHECK_MODULES(${PKG_NAME} REQUIRED
+  dali2-core
+  dali2-adaptor
+  dali2-toolkit
+  dali2-physics-3d
+  bullet3
+)
+
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
+ADD_COMPILE_OPTIONS( ${${PKG_NAME}_CFLAGS_OTHER} )
+
+ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
+
+FOREACH(directory ${${PKG_NAME}_LIBRARY_DIRS})
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
+ENDFOREACH(directory ${PKG_NAME_LIBRARY_DIRS})
+
+INCLUDE_DIRECTORIES(
+    ../../../
+    ${${PKG_NAME}_INCLUDE_DIRS}
+    ../dali-toolkit/dali-toolkit-test-utils
+)
+
+ADD_CUSTOM_COMMAND(
+  COMMAND ${SCRIPT_DIR}/tcheadgen.sh ${EXEC_NAME}.h ${TC_SOURCES}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  OUTPUT ${EXEC_NAME}.h
+  COMMENT "Generating test tables"
+  )
+
+ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
+TARGET_LINK_LIBRARIES(${EXEC_NAME}
+    ${${PKG_NAME}_LIBRARIES}
+    -lpthread -ldl --coverage
+)
+
+INSTALL(PROGRAMS ${EXEC_NAME}
+    DESTINATION ${BIN_DIR}/${EXEC_NAME}
+)
diff --git a/automated-tests/src/dali-physics3d/tct-dali-physics3d-core.cpp b/automated-tests/src/dali-physics3d/tct-dali-physics3d-core.cpp
new file mode 100644
index 0000000..a87b21c
--- /dev/null
+++ b/automated-tests/src/dali-physics3d/tct-dali-physics3d-core.cpp
@@ -0,0 +1,9 @@
+#include <test-harness.h>
+
+// Must come second
+#include "tct-dali-physics3d-core.h"
+
+int main(int argc, char* const argv[])
+{
+  return TestHarness::RunTests(argc, argv, tc_array);
+}
diff --git a/automated-tests/src/dali-physics3d/utc-Dali-PhysicsActor.cpp b/automated-tests/src/dali-physics3d/utc-Dali-PhysicsActor.cpp
new file mode 100644
index 0000000..2c31d11
--- /dev/null
+++ b/automated-tests/src/dali-physics3d/utc-Dali-PhysicsActor.cpp
@@ -0,0 +1,592 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <bullet/btBulletDynamicsCommon.h>
+#include <stdlib.h>
+#include <iostream>
+
+// Need to override adaptor classes for toolkit test harness, so include
+// test harness headers before dali headers.
+#include <dali-toolkit-test-suite-utils.h>
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-physics/dali-physics.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit::Physics;
+
+extern btRigidBody* CreateBody(btDiscreteDynamicsWorld* bulletWorld);
+
+const char* BALL_IMAGE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+
+int UtcDaliPhysics3DActorNew(void)
+{
+  ToolkitTestApplication application;
+
+  btRigidBody* body{nullptr};
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  auto accessor         = adaptor.GetPhysicsAccessor();
+  auto bulletWorld      = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+  body                  = CreateBody(bulletWorld);
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorDownCastP(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  btRigidBody* body{nullptr};
+  auto         accessor     = adaptor.GetPhysicsAccessor();
+  auto         bulletWorld  = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+  body                      = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+  BaseHandle   handle(physicsActor);
+
+  PhysicsActor actor2 = PhysicsActor::DownCast(handle);
+  DALI_TEST_CHECK(actor2);
+  DALI_TEST_EQUALS(physicsActor.GetId(), actor2.GetId(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorDownCastN(void)
+{
+  BaseHandle   uninitializedHandle;
+  PhysicsActor actor = PhysicsActor::DownCast(uninitializedHandle);
+  DALI_TEST_CHECK(!actor);
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  btRigidBody* body{nullptr};
+  auto         accessor     = adaptor.GetPhysicsAccessor();
+  auto         bulletWorld  = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+  body                      = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor moved = std::move(physicsActor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!physicsActor);
+  DALI_TEST_CHECK(moved != physicsActor);
+  DALI_TEST_EQUALS(moved.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorCopyConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  btRigidBody* body{nullptr};
+  auto         accessor     = adaptor.GetPhysicsAccessor();
+  auto         bulletWorld  = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+  body                      = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor selectedActor(physicsActor);
+  DALI_TEST_CHECK(selectedActor);
+  DALI_TEST_CHECK(physicsActor);
+  DALI_TEST_CHECK(selectedActor == physicsActor); // should point at same object
+  DALI_TEST_EQUALS(selectedActor.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorCopyAssign(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the copy assign");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  btRigidBody* body{nullptr};
+  auto         accessor     = adaptor.GetPhysicsAccessor();
+  auto         bulletWorld  = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+  body                      = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor selectedActor = physicsActor;
+  DALI_TEST_CHECK(selectedActor);
+  DALI_TEST_CHECK(physicsActor);
+  DALI_TEST_CHECK(selectedActor == physicsActor); // should point at same object
+  DALI_TEST_EQUALS(selectedActor.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  btRigidBody* body{nullptr};
+  auto         accessor     = adaptor.GetPhysicsAccessor();
+  auto         bulletWorld  = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+  body                      = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = PhysicsActor::New(ballActor, body, adaptor);
+
+  DALI_TEST_CHECK(physicsActor);
+  uint32_t id = physicsActor.GetId();
+
+  PhysicsActor moved;
+  moved = std::move(physicsActor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!physicsActor);
+  DALI_TEST_EQUALS(moved.GetId(), id, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetIdP(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the ID Getter");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  btRigidBody* body{nullptr};
+  auto         accessor     = adaptor.GetPhysicsAccessor();
+  auto         bulletWorld  = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+  body                      = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New(BALL_IMAGE);
+  PhysicsActor physicsActor = adaptor.AddActorBody(ballActor, body);
+  int          id           = physicsActor.GetId();
+  int          actorId      = ballActor[Actor::Property::ID];
+  DALI_TEST_EQUALS(id, actorId, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetIdN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the ID Getter");
+
+  PhysicsActor physicsActor;
+  try
+  {
+    uint32_t id __attribute__((unused)) = physicsActor.GetId();
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException e)
+  {
+    DALI_TEST_ASSERT(e, "Physics actor handle is empty", TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetBodyP(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the body Getter");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  PhysicsActor physicsActor;
+  btRigidBody* body{nullptr};
+  {
+    auto accessor         = adaptor.GetPhysicsAccessor();
+    auto bulletWorld      = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body                  = CreateBody(bulletWorld);
+    Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+    physicsActor = adaptor.AddActorBody(ballActor, body);
+  }
+
+  application.Render();
+  Test::WaitForEventThreadTrigger(1);
+
+  Dali::Any any = physicsActor.GetBody();
+  DALI_TEST_EQUALS(any.Get<btRigidBody*>(), body, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetBodyN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the ID Getter");
+
+  PhysicsActor physicsActor;
+  try
+  {
+    Dali::Any any __attribute__((unused)) = physicsActor.GetBody();
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException e)
+  {
+    DALI_TEST_ASSERT(e, "Physics actor handle is empty", TEST_LOCATION);
+  }
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorSetPosition(void)
+{
+  tet_infoline("Test the AsyncSetPhysicsPosition() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  btRigidBody* body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body             = CreateBody(bulletWorld);
+    physicsActor     = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsPosition(Vector3(10, 20, -30));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto actor    = rootActor.FindChildById(physicsActor.GetId());
+    // Warning - physics properties are never reflected in the event size cache.
+    // Have to use GetCurrentProperty to see the updated values.
+    DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10, 20, -30), 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorSetRotation1(void)
+{
+  tet_infoline("Test the AsyncSetPhysicsRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, -2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  btRigidBody* body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body             = CreateBody(bulletWorld);
+    physicsActor     = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::YAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto actor    = rootActor.FindChildById(physicsActor.GetId());
+    // Warning - physics properties are never reflected in the event size cache.
+    // Have to use GetCurrentProperty to see the updated values.
+    Quaternion q = actor.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION);
+    Quaternion expected(Degree(30), Vector3::YAXIS);
+    DALI_TEST_EQUALS(q, expected, 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorSetRotation2(void)
+{
+  tet_infoline("Test the AsyncSetPhysicsRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, -2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  btRigidBody* body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body             = CreateBody(bulletWorld);
+    physicsActor     = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::ZAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    auto actor    = rootActor.FindChildById(physicsActor.GetId());
+    // Warning - physics properties are never reflected in the event size cache.
+    // Have to use GetCurrentProperty to see the updated values.
+    Quaternion q = actor.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION);
+    Quaternion expected(Degree(30), Vector3::ZAXIS);
+    DALI_TEST_EQUALS(q, expected, 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetActorPosition(void)
+{
+  tet_infoline("Test the GetActorPosition() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  btRigidBody* body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body             = CreateBody(bulletWorld);
+    physicsActor     = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsPosition(Vector3(10, 20, -30));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    DALI_TEST_EQUALS(physicsActor.GetActorPosition(), Vector3(10, 20, -30), 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetActorRotation(void)
+{
+  tet_infoline("Test the GetActorRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  btRigidBody* body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body             = CreateBody(bulletWorld);
+    physicsActor     = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::ZAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    DALI_TEST_EQUALS(physicsActor.GetActorRotation(), Quaternion(Degree(30), Vector3::ZAXIS), 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetPhysicsPosition(void)
+{
+  tet_infoline("Test the GetPhysicsPosition() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  btRigidBody* body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body             = CreateBody(bulletWorld);
+    physicsActor     = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsPosition(Vector3(10, 20, -30));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto    accessor = adaptor.GetPhysicsAccessor();
+    Vector4 pos      = transform * Vector4(10, 20, -30, 1);
+    DALI_TEST_EQUALS(physicsActor.GetPhysicsPosition(), Vector3(pos), 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DActorGetPhysicsRotation(void)
+{
+  tet_infoline("Test the GetPhysicsRotation() function");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, -2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  Dali::Actor ballActor = Toolkit::ImageView::New(BALL_IMAGE);
+
+  btRigidBody* body{nullptr};
+  PhysicsActor physicsActor;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body             = CreateBody(bulletWorld);
+    physicsActor     = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsRotation(Quaternion(Degree(30), Vector3::ZAXIS));
+  }
+
+  Test::WaitForEventThreadTrigger(1);
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  // Run 2 frames to ensure both buffers are set.
+  application.SendNotification();
+  application.Render();
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+    DALI_TEST_EQUALS(physicsActor.GetPhysicsRotation(), Quaternion(Degree(-30), Vector3::ZAXIS), 0.0001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-physics3d/utc-Dali-PhysicsAdaptor.cpp b/automated-tests/src/dali-physics3d/utc-Dali-PhysicsAdaptor.cpp
new file mode 100644
index 0000000..1315a55
--- /dev/null
+++ b/automated-tests/src/dali-physics3d/utc-Dali-PhysicsAdaptor.cpp
@@ -0,0 +1,964 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+#include <iostream>
+#include <typeinfo>
+
+// Need to override adaptor classes for toolkit test harness, so include
+// test harness headers before dali headers.
+#include <dali-physics/dali-physics.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/devel-api/events/hit-test-algorithm.h>
+
+#include <bullet/btBulletDynamicsCommon.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit::Physics;
+
+void utc_dali_physics3d_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void utc_dali_physics3d_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+btRigidBody* CreateBody(btDiscreteDynamicsWorld* bulletWorld)
+{
+  btSphereShape* ball = new btSphereShape(30);
+  btVector3      localInertia(0.f, 0.f, 0.f);
+  ball->calculateLocalInertia(10, localInertia);
+  btTransform transform;
+  transform.setIdentity();
+  auto* motionState = new btDefaultMotionState(transform);
+
+  btRigidBody::btRigidBodyConstructionInfo ci(10, motionState, ball, localInertia);
+
+  btRigidBody* body = new btRigidBody(ci);
+  body->setFriction(0.5f);
+  body->setRestitution(0.5f);
+  bulletWorld->addRigidBody(body);
+  return body;
+}
+
+int UtcDaliPhysics3DCreateAdaptorP1(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor handle = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(handle);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DCreateAdaptorN1(void)
+{
+  ToolkitTestApplication application;
+
+  PhysicsAdaptor handle;
+  DALI_TEST_CHECK(!handle);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DDowncastP1(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  BaseHandle handle = PhysicsAdaptor::New(transform, size);
+
+  auto adaptor = PhysicsAdaptor::DownCast(handle);
+  DALI_TEST_CHECK(adaptor);
+  //Following only works if type is registered
+  //DALI_TEST_EQUALS("PhysicsAdaptor", adaptor.GetTypeName(), TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliPhysics3DDowncastN1(void)
+{
+  BaseHandle handle;
+  auto       adaptor = PhysicsAdaptor::DownCast(handle);
+  DALI_TEST_CHECK(!adaptor);
+
+  DALI_TEST_CHECK(typeid(PhysicsAdaptor) == typeid(decltype(adaptor)));
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor moved = std::move(adaptor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!adaptor);
+  DALI_TEST_CHECK(moved != adaptor);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorCopyConstructor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor altAdaptor = adaptor;
+  DALI_TEST_CHECK(altAdaptor);
+  DALI_TEST_CHECK(adaptor);
+  DALI_TEST_CHECK(altAdaptor == adaptor); // should point at same object
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorCopyAssign(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the copy assign");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor altAdaptor = adaptor;
+  DALI_TEST_CHECK(altAdaptor);
+  DALI_TEST_CHECK(adaptor);
+  DALI_TEST_CHECK(altAdaptor == adaptor); // should point at same object
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Testing the move constructor");
+
+  Matrix         transform(true);
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  DALI_TEST_CHECK(adaptor);
+
+  PhysicsAdaptor moved;
+  moved = std::move(adaptor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_CHECK(!adaptor);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DSetTimestep(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  adaptor.SetTimestep(1.0f / 60.0f);
+
+  DALI_TEST_EQUALS(adaptor.GetTimestep(), 1.0f / 60.0f, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DGetTimestep(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  adaptor.SetTimestep(1.0f / 60.0f);
+  float timestep = adaptor.GetTimestep();
+  float expected = 1.0f / 60.0f;
+  DALI_TEST_EQUALS(timestep, expected, 0.0001f, TEST_LOCATION);
+
+  adaptor.SetTimestep(1.0f / 120.0f);
+  timestep = adaptor.GetTimestep();
+  expected = 1.0f / 120.0f;
+  DALI_TEST_EQUALS(timestep, expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DGetPhysicsAccessorP1(void)
+{
+  ToolkitTestApplication application;
+
+  Matrix     transform(true);
+  Uint16Pair size(640, 480);
+
+  PhysicsAdaptor                           adaptor  = PhysicsAdaptor::New(transform, size);
+  PhysicsAdaptor::ScopedPhysicsAccessorPtr accessor = adaptor.GetPhysicsAccessor();
+  DALI_TEST_CHECK(accessor.get() != nullptr);
+
+  Dali::Any world = accessor->GetNative();
+  DALI_TEST_CHECK(!world.Empty());
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DGetPhysicsAccessorN1(void)
+{
+  ToolkitTestApplication application;
+
+  PhysicsAdaptor handle;
+  DALI_TEST_CHECK(!handle);
+
+  try
+  {
+    auto ptr = handle.GetPhysicsAccessor();
+    DALI_TEST_CHECK(ptr == nullptr);
+
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException& e)
+  {
+    DALI_TEST_ASSERT(e, "Physics adaptor handle is empty", TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorGetRootActor(void)
+{
+  tet_infoline("Test that the root actor can be retrieved");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  DALI_TEST_CHECK(rootActor);
+  DALI_TEST_EQUALS(rootActor.GetProperty<Vector2>(Actor::Property::SIZE), Vector2(640.0f, 480.0f), 0.001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorCreateDebugLayer(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(true);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair size(640, 480);
+  auto       scene = application.GetScene();
+
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+  Window window = DevelWindow::Get(rootActor);
+
+  Layer layer = adaptor.CreateDebugLayer(window);
+  DALI_TEST_CHECK(layer);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::ON);
+
+  btRigidBody* body{nullptr};
+  {
+    auto accessor            = adaptor.GetPhysicsAccessor();
+    auto bulletWorld         = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body                     = CreateBody(bulletWorld);
+    Dali::Actor ballActor    = Toolkit::ImageView::New(TEST_RESOURCE_DIR "/gallery-small-1.jpg");
+    auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+    physicsActor.AsyncSetPhysicsPosition(Vector3(0.f, 0.f, 0.f));
+  }
+  Test::WaitForEventThreadTrigger(1);
+  application.SendNotification();
+  application.Render();
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorTranslateToPhysicsSpace1(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 a(30, 20, 10);
+  Vector3 expected = a * 2.0f;
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(a), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorTranslateToPhysicsSpace2(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using an alternative scale doesn't change rotation");
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  // Rotation shouldn't change under this scale
+  Quaternion q(Degree(30.0f), Vector3::XAXIS);
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(q), q, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorTranslateToPhysicsSpace3(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using an inverted Y scale also inverts quaternions");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Quaternion q(Degree(30.0f), Vector3::ZAXIS);
+  Quaternion qp(Degree(-30.0f), Vector3::ZAXIS); // We have mirrored along Y axis, so Z rot is opposite.
+
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(q), qp, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorTranslateToPhysicsSpace4(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using an inverted Y scale also inverts quaternions");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Quaternion q(Degree(30.0f), Vector3::XAXIS);
+  Quaternion qp(Degree(-30.0f), Vector3::XAXIS); // We have mirrored along Y axis, so Z rot is opposite.
+
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(q), qp, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorTranslateToPhysicsSpace5(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using an inverted Y scale also inverts quaternions, except along Y axis");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Quaternion q(Degree(30.0f), Vector3::YAXIS);
+  Quaternion qp(Degree(30.0f), Vector3::YAXIS);
+
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(q), qp, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorTranslateFromPhysicsSpace1(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a double scale halves position");
+
+  transform.SetIdentityAndScale(Vector3(2.0f, -2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 position(20.0f, 20.0f, 0.0f);
+  Vector3 expected(10.0f, -10.0f, 0.0f);
+
+  DALI_TEST_EQUALS(adaptor.TranslateFromPhysicsSpace(position), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorConvertVectorToPhysicsSpace01(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, 1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorToPhysicsSpace(vector), vector, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorConvertVectorToPhysicsSpace02(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation with inverse Y does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  Vector3        expected(20.0f, -20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorToPhysicsSpace(vector), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorConvertVectorFromPhysicsSpace01(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, 1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorFromPhysicsSpace(vector), vector, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorConvertVectorFromPhysicsSpace02(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  tet_infoline("Test that using a translation with inverse Y does not translate vector");
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+  Vector3        vector(20.0f, 20.0f, 0.0f);
+  Vector3        expected(20.0f, -20.0f, 0.0f);
+  DALI_TEST_EQUALS(adaptor.ConvertVectorFromPhysicsSpace(vector), expected, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorSetTransformAndSize(void)
+{
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 a(30, 20, 10);
+  Vector3 expected = a * 2.0f;
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(a), expected, 0.0001f, TEST_LOCATION);
+
+  transform.SetIdentityAndScale(Vector3(1.0f, -1.0f, 1.0f));
+  transform.SetTranslation(Vector3(0.0f, 100.0f, 0.0f));
+  adaptor.SetTransformAndSize(transform, size);
+
+  Vector3 expect2(30, 80, 10);
+  DALI_TEST_EQUALS(adaptor.TranslateToPhysicsSpace(a), expect2, 0.0001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorSetIntegrationState(void)
+{
+  tet_infoline("Test that changing the integration state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::ON);
+
+  adaptor.SetIntegrationState(PhysicsAdaptor::IntegrationState::OFF);
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::OFF);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorGetIntegrationState(void)
+{
+  tet_infoline("Test that changing the integration state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  adaptor.SetIntegrationState(PhysicsAdaptor::IntegrationState::OFF);
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::OFF);
+
+  adaptor.SetIntegrationState(PhysicsAdaptor::IntegrationState::ON);
+  DALI_TEST_CHECK(adaptor.GetIntegrationState() == PhysicsAdaptor::IntegrationState::ON);
+
+  // Can't test actual integration step runs without adding actors - see utc-Dali-PhysicsActor.cpp.
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorSetDebugState(void)
+{
+  tet_infoline("Test that changing the debug state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::OFF);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::ON);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::ON);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::OFF);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::OFF);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorGetDebugState(void)
+{
+  tet_infoline("Test that changing the debug state is reflected");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::OFF);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::OFF);
+
+  adaptor.SetDebugState(PhysicsAdaptor::DebugState::ON);
+  DALI_TEST_CHECK(adaptor.GetDebugState() == PhysicsAdaptor::DebugState::ON);
+
+  // Can't test actual debug step runs without adding actors - see utc-Dali-PhysicsActor.cpp.
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorAddActorBody(void)
+{
+  tet_infoline("Test that an actor/body pair can be added");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  auto accessor    = adaptor.GetPhysicsAccessor();
+  auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+
+  btRigidBody* body         = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+  auto         physicsActor = adaptor.AddActorBody(ballActor, body);
+
+  DALI_TEST_CHECK(physicsActor);
+  int id = ballActor[Actor::Property::ID];
+
+  DALI_TEST_EQUALS(physicsActor.GetId(), id, TEST_LOCATION);
+  DALI_TEST_EQUALS(physicsActor.GetBody().Get<btRigidBody*>(), body, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorRemoveActorBodyP01(void)
+{
+  tet_infoline("Test that an actor/body pair can be removed");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  btRigidBody* body;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+
+    body = CreateBody(bulletWorld);
+  }
+  Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+  auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+
+  application.SendNotification();
+  application.Render();
+  application.SendNotification();
+  application.Render();
+
+  adaptor.RemoveActorBody(physicsActor);
+  DALI_TEST_CHECK(!ballActor.GetParent());
+
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+
+    bulletWorld->removeRigidBody(body);
+    try
+    {
+      delete body;
+      tet_result(TET_PASS);
+    }
+    catch(std::exception& e)
+    {
+      tet_result(TET_FAIL);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorRemoveActorBodyN01(void)
+{
+  tet_infoline("Test that an empty actor/body pair doesn't break adaptor");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  tet_infoline("Test that removing a physics actor that hasn't been created with AddActorBody does nothing");
+
+  Dali::Actor  actor = Dali::Actor::New();
+  btRigidBody* body;
+  {
+    auto accessor    = adaptor.GetPhysicsAccessor();
+    auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+
+    body = CreateBody(bulletWorld);
+  }
+
+  PhysicsActor physicsActor = PhysicsActor::New(actor, body, adaptor);
+  ;
+  try
+  {
+    adaptor.RemoveActorBody(physicsActor);
+    tet_result(TET_PASS);
+  }
+  catch(std::exception& e)
+  {
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorRemoveActorBodyN02(void)
+{
+  tet_infoline("Test that an empty actor/body pair doesn't break adaptor");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  PhysicsActor physicsActor;
+  try
+  {
+    adaptor.RemoveActorBody(physicsActor);
+    tet_result(TET_FAIL);
+  }
+  catch(DaliException& e)
+  {
+    DALI_TEST_ASSERT(e, "Physics actor handle is empty", TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorGetPhysicsActor(void)
+{
+  tet_infoline("Test that an actor/body pair can be retrieved");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  auto           scene     = application.GetScene();
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  scene.Add(rootActor);
+
+  auto accessor    = adaptor.GetPhysicsAccessor();
+  auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+
+  btRigidBody* body         = CreateBody(bulletWorld);
+  Dali::Actor  ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+  auto         physicsActor = adaptor.AddActorBody(ballActor, body);
+
+  DALI_TEST_CHECK(physicsActor);
+
+  PhysicsActor testActor = adaptor.GetPhysicsActor(body);
+  DALI_TEST_CHECK(testActor);
+  DALI_TEST_CHECK(physicsActor == testActor);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorBuildPickingRay(void)
+{
+  tet_infoline("Test that a touch can be converted to a picking ray");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  Vector3 from, to;
+  adaptor.BuildPickingRay(Vector3(), -Vector3::ZAXIS, from, to);
+
+  DALI_TEST_EQUALS(from, Vector3(), 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(to, Vector3(0.0f, 0.0f, -20000.0f), 0.001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorProjectPoint(void)
+{
+  tet_infoline("Test that a point is projected into physics space");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor = PhysicsAdaptor::New(transform, size);
+
+  // distance is in physics units, not DALi units!
+  Vector3 projectedPoint = adaptor.ProjectPoint(Vector3(), -Vector3::ZAXIS, 200);
+
+  DALI_TEST_EQUALS(projectedPoint, Vector3(0.0f, 0.0f, -200.0f), 0.001f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorQueue(void)
+{
+  tet_infoline("Test that Queue and CreateSyncPoint both work");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  btRigidBody* body{nullptr};
+  {
+    auto accessor            = adaptor.GetPhysicsAccessor();
+    auto bulletWorld         = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body                     = CreateBody(bulletWorld);
+    Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+    auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+  }
+
+  tet_infoline("Test that Queue works without accessor");
+  adaptor.Queue([body]() {
+    body->getWorldTransform().setOrigin(btVector3(100.0f, 20.0f, 20.0f));
+  });
+  adaptor.CreateSyncPoint();
+
+  application.SendNotification();
+  application.Render();
+  // Should trigger an Update
+
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+
+    btVector3 origin = body->getWorldTransform().getOrigin();
+    DALI_TEST_EQUALS(origin.x(), 100.0f, 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.y(), 20.0f, 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.z(), 20.0f, 0.001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorCreateSyncPoint(void)
+{
+  tet_infoline("Test that a delayed CreateSyncPoint delays update");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(2.0f, 2.0f, 2.0f));
+  Uint16Pair     size(640, 480);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  btRigidBody* body{nullptr};
+  {
+    auto accessor            = adaptor.GetPhysicsAccessor();
+    auto bulletWorld         = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    body                     = CreateBody(bulletWorld);
+    Dali::Actor ballActor    = Toolkit::ImageView::New("gallery-small-1.jpg");
+    auto        physicsActor = adaptor.AddActorBody(ballActor, body);
+
+    tet_infoline("Test that Queue works with accessor");
+    adaptor.Queue([body]() {
+      body->getWorldTransform().setOrigin(btVector3(100.0f, 20.0f, 20.0f));
+    });
+  }
+
+  // Should trigger an Update without processing queue
+  application.SendNotification();
+  application.Render();
+
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+
+    btVector3 origin = body->getWorldTransform().getOrigin();
+    DALI_TEST_EQUALS(origin.x(), 0.0f, 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.y(), 0.0f, 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.z(), 0.0f, 0.001f, TEST_LOCATION);
+  }
+
+  // Should now execute queue
+  adaptor.CreateSyncPoint();
+  application.SendNotification();
+  application.Render();
+
+  {
+    auto accessor = adaptor.GetPhysicsAccessor();
+
+    btVector3 origin = body->getWorldTransform().getOrigin();
+    DALI_TEST_EQUALS(origin.x(), 100.0f, 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.y(), 20.0f, 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(origin.z(), 20.0f, 0.001f, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPhysics3DAdaptorHitTestP(void)
+{
+  tet_infoline("Test that hit testing finds a body");
+
+  ToolkitTestApplication application;
+  Matrix                 transform(false);
+  transform.SetIdentityAndScale(Vector3(1.0f, 1.0f, 1.0f));
+  Uint16Pair     size(TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  const Vector2  center(TestApplication::DEFAULT_SURFACE_WIDTH * 0.5f, TestApplication::DEFAULT_SURFACE_HEIGHT * 0.5f);
+  PhysicsAdaptor adaptor   = PhysicsAdaptor::New(transform, size);
+  Actor          rootActor = adaptor.GetRootActor();
+  auto           scene     = application.GetScene();
+  scene.Add(rootActor);
+
+  {
+    auto         accessor    = adaptor.GetPhysicsAccessor(); // Prevent integration
+    auto         bulletWorld = accessor->GetNative().Get<btDiscreteDynamicsWorld*>();
+    Dali::Actor  ballActor   = Toolkit::ImageView::New(TEST_RESOURCE_DIR "/gallery-small-1.jpg");
+    btRigidBody* body        = CreateBody(bulletWorld);
+    body->getWorldTransform().setOrigin(btVector3(0.f, 0.f, 0.f));
+
+    ballActor[Actor::Property::PARENT_ORIGIN] = ParentOrigin::CENTER;
+    ballActor[Actor::Property::ANCHOR_POINT]  = AnchorPoint::CENTER;
+
+    auto physicsActor = adaptor.AddActorBody(ballActor, body);
+  }
+  Test::WaitForEventThreadTrigger(1);
+
+  // Should trigger an Update without processing queue
+  application.SendNotification();
+  application.Render();
+
+  Vector3 origin, direction;
+  Dali::HitTestAlgorithm::BuildPickingRay(scene.GetRenderTaskList().GetTask(0), center, origin, direction);
+  Vector3 from, to;
+  adaptor.BuildPickingRay(origin, direction, from, to); // Hit test centre of screen
+
+  {
+    auto      accessor = adaptor.GetPhysicsAccessor();
+    Vector3   localPivot;
+    float     distanceFromCamera;
+    Dali::Any nullFilter;
+    auto      body = accessor->HitTest(from, to, nullFilter, localPivot, distanceFromCamera);
+
+    DALI_TEST_CHECK(!body.Empty());
+  }
+
+  END_TEST;
+}
+
+// todo:
+// Hit Test
+// PhysicsDebugRenderer.... Elide?!
diff --git a/automated-tests/src/dali-scene-loader-internal/CMakeLists.txt b/automated-tests/src/dali-scene-loader-internal/CMakeLists.txt
deleted file mode 100755
index 0270d3d..0000000
--- a/automated-tests/src/dali-scene-loader-internal/CMakeLists.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-SET(PKG_NAME "dali-scene-loader-internal")
-
-SET(EXEC_NAME "tct-${PKG_NAME}-core")
-SET(RPM_NAME "core-${PKG_NAME}-tests")
-
-SET(CAPI_LIB "dali-scene-loader")
-
-# List of test case sources (Only these get parsed for test cases)
-SET(TC_SOURCES
-  utc-Dali-Gltf2Asset.cpp
-  utc-Dali-Hash.cpp
-  utc-Dali-JsonReader.cpp
-  utc-Dali-JsonUtil.cpp
-)
-
-# List of test harness files (Won't get parsed for test cases)
-SET(TEST_HARNESS_DIR "../dali-toolkit/dali-toolkit-test-utils")
-
-SET(TEST_HARNESS_SOURCES
-  ${TEST_HARNESS_DIR}/toolkit-adaptor.cpp
-  ${TEST_HARNESS_DIR}/toolkit-application.cpp
-  ${TEST_HARNESS_DIR}/toolkit-event-thread-callback.cpp
-  ${TEST_HARNESS_DIR}/toolkit-environment-variable.cpp
-  ${TEST_HARNESS_DIR}/toolkit-input-method-context.cpp
-  ${TEST_HARNESS_DIR}/toolkit-input-method-options.cpp
-  ${TEST_HARNESS_DIR}/toolkit-lifecycle-controller.cpp
-  ${TEST_HARNESS_DIR}/toolkit-orientation.cpp
-  ${TEST_HARNESS_DIR}/toolkit-style-monitor.cpp
-  ${TEST_HARNESS_DIR}/toolkit-test-application.cpp
-  ${TEST_HARNESS_DIR}/toolkit-timer.cpp
-  ${TEST_HARNESS_DIR}/toolkit-trigger-event-factory.cpp
-  ${TEST_HARNESS_DIR}/toolkit-window.cpp
-  ${TEST_HARNESS_DIR}/toolkit-scene-holder.cpp
-  ${TEST_HARNESS_DIR}/dali-test-suite-utils.cpp
-  ${TEST_HARNESS_DIR}/dali-toolkit-test-suite-utils.cpp
-  ${TEST_HARNESS_DIR}/dummy-control.cpp
-  ${TEST_HARNESS_DIR}/mesh-builder.cpp
-  ${TEST_HARNESS_DIR}/test-actor-utils.cpp
-  ${TEST_HARNESS_DIR}/test-animation-data.cpp
-  ${TEST_HARNESS_DIR}/test-application.cpp
-  ${TEST_HARNESS_DIR}/test-button.cpp
-  ${TEST_HARNESS_DIR}/test-harness.cpp
-  ${TEST_HARNESS_DIR}/test-gesture-generator.cpp
-  ${TEST_HARNESS_DIR}/test-gl-abstraction.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-sync-impl.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-sync-object.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-buffer.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-command-buffer.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-controller.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-framebuffer.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-texture.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-sampler.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-pipeline.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-program.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-shader.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-reflection.cpp
-  ${TEST_HARNESS_DIR}/test-platform-abstraction.cpp
-  ${TEST_HARNESS_DIR}/test-render-controller.cpp
-  ${TEST_HARNESS_DIR}/test-trace-call-stack.cpp
-)
-
-PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-  dali2-core
-  dali2-adaptor
-  dali2-toolkit
-  dali2-scene-loader
-)
-
-ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
-ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
-
-ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
-
-FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
-    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
-ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
-
-INCLUDE_DIRECTORIES(
-    ../../../
-    ${${CAPI_LIB}_INCLUDE_DIRS}
-    ../dali-toolkit/dali-toolkit-test-utils
-)
-
-ADD_CUSTOM_COMMAND(
-  COMMAND ${SCRIPT_DIR}/tcheadgen.sh ${EXEC_NAME}.h ${TC_SOURCES}
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  OUTPUT ${EXEC_NAME}.h
-  COMMENT "Generating test tables"
-  )
-
-ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
-TARGET_LINK_LIBRARIES(${EXEC_NAME}
-    ${${CAPI_LIB}_LIBRARIES}
-    -lpthread --coverage
-)
-
-INSTALL(PROGRAMS ${EXEC_NAME}
-    DESTINATION ${BIN_DIR}/${EXEC_NAME}
-)
diff --git a/automated-tests/src/dali-scene-loader-internal/tct-dali-scene-loader-internal-core.cpp b/automated-tests/src/dali-scene-loader-internal/tct-dali-scene-loader-internal-core.cpp
deleted file mode 100644
index 7bfea6e..0000000
--- a/automated-tests/src/dali-scene-loader-internal/tct-dali-scene-loader-internal-core.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <test-harness.h>
-#include "tct-dali-scene-loader-internal-core.h"
-
-int main(int argc, char * const argv[])
-{
-  return TestHarness::RunTests(argc, argv, tc_array);
-}
diff --git a/automated-tests/src/dali-scene-loader-internal/utc-Dali-Gltf2Asset.cpp b/automated-tests/src/dali-scene-loader-internal/utc-Dali-Gltf2Asset.cpp
deleted file mode 100644
index 8574137..0000000
--- a/automated-tests/src/dali-scene-loader-internal/utc-Dali-Gltf2Asset.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/internal/gltf2-asset.h"
-#include <dali-test-suite-utils.h>
-#include <string>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliGltf2AssetComponentIsUnsigned(void)
-{
-  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::BYTE), false);
-  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::UNSIGNED_BYTE), true);
-  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::SHORT), false);
-  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::UNSIGNED_SHORT), true);
-  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::UNSIGNED_INT), true);
-  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::FLOAT), false);
-  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::INVALID), false);
-
-  END_TEST;
-}
-
-int UtcDaliGltf2AssetComponentSize(void)
-{
-  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::BYTE), 1u);
-  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::UNSIGNED_BYTE), 1u);
-  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::SHORT), 2u);
-  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::UNSIGNED_SHORT), 2u);
-  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::UNSIGNED_INT), 4u);
-  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::FLOAT), 4u);
-  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::INVALID), -1);
-
-  END_TEST;
-}
-
-#define FROM_STRING_HELPER(x) FromString(#x, strlen(#x))
-
-#define STRING_CHECK(type, x) DALI_TEST_EQUAL(gltf2::type:: FROM_STRING_HELPER(x), gltf2::type::x)
-
-int UtcDaliGltf2AssetAccessorType(void)
-{
-  STRING_CHECK(AccessorType, SCALAR);
-  STRING_CHECK(AccessorType, VEC2);
-  STRING_CHECK(AccessorType, VEC3);
-  STRING_CHECK(AccessorType, VEC4);
-  STRING_CHECK(AccessorType, MAT2);
-  STRING_CHECK(AccessorType, MAT3);
-  STRING_CHECK(AccessorType, MAT4);
-  DALI_TEST_EQUAL(gltf2::AccessorType::FROM_STRING_HELPER(VEC88), gltf2::AccessorType::INVALID);
-
-  END_TEST;
-}
-
-int UtcDaliGltf2AssetAlphaMode(void)
-{
-  STRING_CHECK(AlphaMode, OPAQUE);
-  STRING_CHECK(AlphaMode, MASK);
-  STRING_CHECK(AlphaMode, BLEND);
-  DALI_TEST_EQUAL(gltf2::AlphaMode::FROM_STRING_HELPER(ALPHA_SCHMALPHA), gltf2::AlphaMode::INVALID);
-
-  END_TEST;
-}
-
-int UtcDaliGltf2AssetAttribute(void)
-{
-  STRING_CHECK(Attribute, POSITION);
-  STRING_CHECK(Attribute, NORMAL);
-  STRING_CHECK(Attribute, TANGENT);
-  STRING_CHECK(Attribute, TEXCOORD_0);
-  STRING_CHECK(Attribute, TEXCOORD_1);
-  STRING_CHECK(Attribute, COLOR_0);
-  STRING_CHECK(Attribute, JOINTS_0);
-  STRING_CHECK(Attribute, WEIGHTS_0);
-  DALI_TEST_EQUAL(gltf2::Attribute::FROM_STRING_HELPER(VISCOSITY), gltf2::Attribute::INVALID);
-
-  END_TEST;
-}
-
-int UtcDaliGltf2AssetAnimationSamplerInterpolation(void)
-{
-  STRING_CHECK(Animation::Sampler::Interpolation, STEP);
-  STRING_CHECK(Animation::Sampler::Interpolation, LINEAR);
-  STRING_CHECK(Animation::Sampler::Interpolation, CUBICSPLINE);
-  DALI_TEST_EQUAL(gltf2::Animation::Sampler::Interpolation::FROM_STRING_HELPER(EASE_IN_OUT), gltf2::Animation::Sampler::Interpolation::INVALID);
-
-  END_TEST;
-}
-
-int UtcDaliGltf2AssetAnimationChannelTarget(void)
-{
-  STRING_CHECK(Animation::Channel::Target, TRANSLATION);
-  STRING_CHECK(Animation::Channel::Target, ROTATION);
-  STRING_CHECK(Animation::Channel::Target, SCALE);
-  STRING_CHECK(Animation::Channel::Target, WEIGHTS);
-  DALI_TEST_EQUAL(gltf2::Animation::Channel::Target::FROM_STRING_HELPER(FLUFFINESS), gltf2::Animation::Channel::Target::INVALID);
-
-  END_TEST;
-}
-
-int UtcDaliGltf2AssetAccessorSparse(void)
-{
-  gltf2::Accessor acc;
-  DALI_TEST_CHECK(!acc.mSparse);
-
-  std::vector<gltf2::BufferView> bufferViews;
-
-  gltf2::Accessor::Sparse sparse{ 256u };
-  sparse.mIndices.mBufferView = gltf2::Ref<gltf2::BufferView>(bufferViews, 5u);
-  sparse.mIndices.mComponentType = gltf2::Component::FLOAT;
-  sparse.mValues.mBufferView = gltf2::Ref<gltf2::BufferView>(bufferViews, 284u);
-  sparse.mValues.mByteOffset = 16532;
-  acc.SetSparse(sparse);
-
-  DALI_TEST_EQUAL(acc.mSparse->mCount, sparse.mCount);
-  DALI_TEST_EQUAL(acc.mSparse->mIndices.mBufferView, sparse.mIndices.mBufferView);
-  DALI_TEST_EQUAL(acc.mSparse->mIndices.mByteOffset, sparse.mIndices.mByteOffset);
-  DALI_TEST_EQUAL(acc.mSparse->mIndices.mComponentType, sparse.mIndices.mComponentType);
-  DALI_TEST_EQUAL(acc.mSparse->mValues.mBufferView, sparse.mValues.mBufferView);
-  DALI_TEST_EQUAL(acc.mSparse->mValues.mByteOffset, sparse.mValues.mByteOffset);
-
-  END_TEST;
-}
-
diff --git a/automated-tests/src/dali-scene-loader-internal/utc-Dali-Hash.cpp b/automated-tests/src/dali-scene-loader-internal/utc-Dali-Hash.cpp
deleted file mode 100644
index efd5053..0000000
--- a/automated-tests/src/dali-scene-loader-internal/utc-Dali-Hash.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/internal/hash.h"
-#include <dali-test-suite-utils.h>
-#include <string>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliHash(void)
-{
-  DALI_TEST_EQUAL(Hash(0).Add(true), 0);
-  DALI_TEST_EQUAL(Hash(0).Add(false), 1);
-
-  int32_t myInt32 = std::numeric_limits<int32_t>::min();
-  DALI_TEST_EQUAL(Hash(0).Add(myInt32), myInt32);
-
-  uint32_t myUint32 = std::numeric_limits<uint32_t>::max();
-  DALI_TEST_EQUAL(Hash(0).Add(myUint32), myUint32);
-
-  uint64_t myUint64 = std::numeric_limits<uint64_t>::max();
-  DALI_TEST_EQUAL(uint64_t(Hash(0).Add(myUint64)), myUint64);
-
-  constexpr uint32_t multiplier = 31;
-  uint64_t expected = 0;
-  float f = 1928.46852;
-  for (auto i0 = reinterpret_cast<uint8_t const*>(&f), i1 = i0 + sizeof(f); i0 != i1; ++i0)
-  {
-    expected = expected * multiplier + *i0;
-  }
-
-  DALI_TEST_EQUAL(uint64_t(Hash(0).Add(f)), expected);
-
-  END_TEST;
-}
-
diff --git a/automated-tests/src/dali-scene-loader-internal/utc-Dali-JsonReader.cpp b/automated-tests/src/dali-scene-loader-internal/utc-Dali-JsonReader.cpp
deleted file mode 100644
index 6b7e000..0000000
--- a/automated-tests/src/dali-scene-loader-internal/utc-Dali-JsonReader.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/internal/json-reader.h"
-#include <dali-test-suite-utils.h>
-#include <string>
-
-using namespace Dali;
-
-#define JSON_STRING(x) #x, strlen(#x)
-
-int UtcDaliJsonReaderStrCmp(void)
-{
-  json_string_s jstr[] {
-    { JSON_STRING(hello) },
-    { JSON_STRING(hellew) },
-  };
-  DALI_TEST_EQUAL(json::StrCmp(jstr[0], "hello"), 0);
-  DALI_TEST_EQUAL(json::StrCmp(jstr[1], "hello"), 'e' - 'o');
-
-  END_TEST;
-}
-
-int UtcDaliJsonReaderValidateThrow(void)
-{
-  json_value_s jval { nullptr, json_type_array };
-  DALI_TEST_THROWS(json::Validate(jval, json_type_object), std::runtime_error);
-  json::Validate(jval, json_type_array);
-
-  END_TEST;
-}
-
-int UtcDaliJsonReaderFindObjectChild(void)
-{
-  json_string_s jkey{ JSON_STRING(fudgeFactor) };
-  json_number_s jActualValue{ JSON_STRING(5.2) };
-  json_value_s jvalue { &jActualValue, json_type_number };
-  json_object_element_s jobjelem { &jkey, &jvalue, nullptr };
-
-  json_object_s jobj{ &jobjelem, 1 };
-
-  DALI_TEST_EQUAL(json::FindObjectChild(jkey.string, jobj), &jvalue);
-  DALI_TEST_EQUAL(json::FindObjectChild("fudgeFactory", jobj), static_cast<json_value_s*>(nullptr));
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader-internal/utc-Dali-JsonUtil.cpp b/automated-tests/src/dali-scene-loader-internal/utc-Dali-JsonUtil.cpp
deleted file mode 100644
index 41ac039..0000000
--- a/automated-tests/src/dali-scene-loader-internal/utc-Dali-JsonUtil.cpp
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/internal/json-util.h"
-#include "dali-toolkit/devel-api/builder/json-parser.h"
-#include <dali-test-suite-utils.h>
-#include <string>
-
-#define STRINGIFY(x) #x
-
-using namespace Dali;
-using namespace Dali::Toolkit;
-using namespace Dali::SceneLoader;
-
-namespace
-{
-const std::string TEST_JSON =
-  "{ \"int\": 17834,"
-  "\"float\": 3.1415628,"
-  "\"bool\": true,"
-  "\"null\": null,"
-  "\"string\": \"hello\","
-  "\"floatArray\": [ 0.0, 0.25, 1.0, 0.75 ],"
-  "\"intArray\": [ 1, 2, 3, 5, 7, 11, 13, -1, -5 ],"
-  "\"mixedArray\": [ 1.99, \"the\", 6, \"brown\", \"fox\" ],"
-  "\"stringArray\": [ \"lorem\", \"ipsum\", \"dolor\", \"sic\", \"amet\" ],"
-  "\"object\": { \"duration\": 4.0, \"delay\": 1.0 },"
-  "\"rgb\": [ 0.5, 0.8, 0.25 ],"
-  "\"disambiguatedFloat\": { \"type\": \"float\", \"value\": 15.8 },"
-  "\"rotation1\": { \"type\": \"rotation\", \"value\": [ 15.0, 90.0, -45.0 ] },"
-  "\"rotation2\": { \"type\": \"rotation\", \"value\": [ 0.707, 0.0, 0.707, 0.0 ] },"
-  "\"matrix\": [ 1.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 3.0, 0.0, 1.0, 2.0, 3.0, 4.0 ],"
-  "\"matrix3\": [ 2.0, 0.0, 0.0, 0.0, 0.0, 3.0, 0.0, 1.0, 2.0 ],"
-  "\"vector2\": [ 2.0, 1.0 ]"
-  "}";
-
-template <typename T>
-struct Item
-{
-  std::string name;
-  bool readResult;
-  T result;
-};
-
-struct Document
-{
-  Document(const std::string& json)
-  : parser(JsonParser::New())
-  {
-    //DALI_TEST_CHECK(parser.Parse(json));
-    if (!parser.Parse(json))
-    {
-      auto error = parser.GetErrorDescription();
-      printf("Error: %s in {%d, %d}\n", error.c_str(), parser.GetErrorLineNumber(), parser.GetErrorColumn());
-    }
-    root = parser.GetRoot();
-  }
-
-  JsonParser parser;
-  const TreeNode* root;
-};
-
-template <typename T, size_t N>
-bool CompareArrays(const T (&array)[N], const T* p, T epsilon = T(0))
-{
-  for (auto& i: array)
-  {
-    if (std::abs(i - *p) > epsilon)
-    {
-      printf("Element %d mismatched.\n", int32_t(std::distance(array, &i)));
-      return false;
-    }
-    ++p;
-  }
-  return true;
-}
-
-}
-
-int UtcDaliJsonUtilReadBool(void)
-{
-  bool value = false;
-  DALI_TEST_CHECK(!ReadBool(nullptr, value));
-  DALI_TEST_EQUAL(value, false); // unchanged
-
-  Document doc{ TEST_JSON };
-
-  for (auto& i : {
-    Item<bool>{ "bool",       true, true },
-    Item<bool>{ "int",        false, true }, // value unchanged
-    Item<bool>{ "float",      false, true },
-    Item<bool>{ "null",       false, true },
-    Item<bool>{ "floatArray", false, true },
-    Item<bool>{ "intArray",   false, true },
-    Item<bool>{ "object",     false, true },
-  })
-  {
-    bool readResult = ReadBool(doc.root->GetChild(i.name), value);
-    DALI_TEST_EQUAL(readResult, i.readResult);
-    if (readResult)
-    {
-      DALI_TEST_EQUAL(value, i.result);
-    }
-  }
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadInt(void)
-{
-  int value = 0xbadbeef;
-  DALI_TEST_CHECK(!ReadInt(nullptr, value));
-  DALI_TEST_EQUAL(value, 0xbadbeef);
-
-  Document doc{ TEST_JSON };
-
-  for (auto& i : {
-    Item<int>{ "bool",       false, 0xbadbeef }, // unchanged from initial
-    Item<int>{ "int",        true, 17834 },
-    Item<int>{ "float",      true, 3 },
-    Item<int>{ "null",       false, 3 },
-    Item<int>{ "floatArray", false, 3 },
-    Item<int>{ "intArray",   false, 3 },
-    Item<int>{ "object",     false, 3 },
-  })
-  {
-    bool readResult = ReadInt(doc.root->GetChild(i.name), value);
-    DALI_TEST_EQUAL(readResult, i.readResult);
-    if (readResult)
-    {
-      DALI_TEST_EQUAL(value, i.result);
-    }
-  }
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadFloat(void)
-{
-  float value = 10.101f;
-  DALI_TEST_CHECK(!ReadFloat(nullptr, value));
-  DALI_TEST_EQUAL(value, 10.101f);
-
-  Document doc{ TEST_JSON };
-
-  for (auto& i : {
-    Item<float>{ "bool",       false, 10.101f }, // unchanged from initial
-    Item<float>{ "int",        true, 17834.f },
-    Item<float>{ "float",      true, 3.1415628f },
-    Item<float>{ "null",       false, 3.1415628f },
-    Item<float>{ "floatArray", false, 3.1415628f },
-    Item<float>{ "intArray",   false, 3.1415628f },
-    Item<float>{ "object",     false, 3.1415628f },
-  })
-  {
-    bool readResult = ReadFloat(doc.root->GetChild(i.name), value);
-    DALI_TEST_EQUAL(readResult, i.readResult);
-    if (readResult)
-    {
-      DALI_TEST_EQUAL(value, i.result);
-    }
-  }
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilNumericalArrays(void)
-{
-  Document doc{ TEST_JSON };
-
-  DALI_TEST_EQUAL(4u, GetNumericalArraySize(doc.root->GetChild("floatArray")));
-  DALI_TEST_EQUAL(9u, GetNumericalArraySize(doc.root->GetChild("intArray")));
-  DALI_TEST_EQUAL(1u, GetNumericalArraySize(doc.root->GetChild("mixedArray")));
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadVectorInt(void)
-{
-  DALI_TEST_CHECK(!ReadVector(nullptr, static_cast<int*>(nullptr), 0));
-
-  Document doc{ TEST_JSON };
-
-  int ints[9];
-  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("floatArray"), ints, 4u));
-  DALI_TEST_CHECK(CompareArrays<int>({ 0, 0, 1, 0 }, ints));
-
-  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("intArray"), ints, 9u));
-  DALI_TEST_CHECK(CompareArrays<int>({ 1, 2, 3, 5, 7, 11, 13, -1, -5 }, ints));
-
-  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("mixedArray"), ints, 1u));
-  DALI_TEST_CHECK(CompareArrays<int>({ 1 }, ints));
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadVectorFloat(void)
-{
-  DALI_TEST_CHECK(!ReadVector(nullptr, static_cast<int*>(nullptr), 0));
-
-  Document doc{ TEST_JSON };
-
-  constexpr float e = 1e-6f;
-  float floats[9];
-  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("floatArray"), floats, 4u));
-  DALI_TEST_CHECK(CompareArrays<float>({ 0.f, 0.25f, 1.f, 0.75f }, floats, e));
-
-  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("intArray"), floats, 9u));
-  DALI_TEST_CHECK(CompareArrays<float>({ 1.f, 2.f, 3.f, 5.f, 7.f, 11.f, 13.f, -1.f, -5.f }, floats, e));
-
-  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("mixedArray"), floats, 1u));
-  DALI_TEST_CHECK(CompareArrays<float>({ 1.99f }, floats, e));
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadColor(void)
-{
-  Vector4 color;
-  DALI_TEST_CHECK(!ReadColor(nullptr, color));
-
-  Document doc{ TEST_JSON };
-  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("bool"), color));
-  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("int"), color));
-  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("float"), color));
-  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("string"), color));
-  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("object"), color));
-
-  constexpr float e = 1e-6f;
-  DALI_TEST_CHECK(ReadColor(doc.root->GetChild("floatArray"), color));
-  DALI_TEST_CHECK(CompareArrays<float>({ 0.f, 0.25f, 1.0f, 0.75f }, color.AsFloat(), e));
-
-  DALI_TEST_CHECK(ReadColor(doc.root->GetChild("intArray"), color));
-  DALI_TEST_CHECK(CompareArrays<float>({ 1.f, 2.f, 3.f, 5.f }, color.AsFloat(), e));
-
-  DALI_TEST_CHECK(ReadColor(doc.root->GetChild("rgb"), color));
-  DALI_TEST_CHECK(CompareArrays<float>({ .5f, .8f, .25f, 1.f }, color.AsFloat(), e));
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadTimePeriod(void)
-{
-  TimePeriod value(60.f);
-  DALI_TEST_CHECK(!ReadTimePeriod(nullptr, value));
-  DALI_TEST_EQUAL(value.durationSeconds, 60.f);
-  DALI_TEST_EQUAL(value.delaySeconds, 0.f);
-
-  Document doc{ TEST_JSON };
-  DALI_TEST_CHECK(ReadTimePeriod(doc.root->GetChild("object"), value));
-  DALI_TEST_EQUAL(value.durationSeconds, 4.f);
-  DALI_TEST_EQUAL(value.delaySeconds, 1.f);
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadString(void)
-{
-  std::string value = "bye";
-  DALI_TEST_CHECK(!ReadString(nullptr, value));
-  DALI_TEST_EQUAL(value, "bye");
-
-  Document doc{ TEST_JSON };
-
-  for (auto& i : {
-    Item<std::string>{ "bool",       false, "bye"}, // unchanged from initial
-    Item<std::string>{ "int",        false, "bye"},
-    Item<std::string>{ "float",      false, "bye"},
-    Item<std::string>{ "null",       false, "bye"},
-    Item<std::string>{ "string",     true, "hello"},
-    Item<std::string>{ "floatArray", false, "hello"}, // unchanged
-    Item<std::string>{ "object",     false, "hello"},
-  })
-  {
-    bool readResult = ReadString(doc.root->GetChild(i.name), value);
-    DALI_TEST_EQUAL(readResult, i.readResult);
-    if (readResult)
-    {
-      DALI_TEST_EQUAL(value, i.result);
-    }
-  }
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadStringVector(void)
-{
-  std::vector<std::string> strings;
-  DALI_TEST_CHECK(!ReadStringVector(nullptr, strings));
-  DALI_TEST_CHECK(strings.empty());
-
-  Document doc{ TEST_JSON };
-
-  DALI_TEST_CHECK(!ReadStringVector(doc.root->GetChild("floatArray"), strings));
-  DALI_TEST_CHECK(strings.empty());
-
-  DALI_TEST_CHECK(!ReadStringVector(doc.root->GetChild("intArray"), strings));
-  DALI_TEST_CHECK(strings.empty());
-
-  DALI_TEST_CHECK(!ReadStringVector(doc.root->GetChild("mixedArray"), strings));
-  DALI_TEST_CHECK(strings.empty());
-
-  DALI_TEST_CHECK(ReadStringVector(doc.root->GetChild("stringArray"), strings));
-  DALI_TEST_EQUAL(strings.size(), 5u);
-
-  auto iStrings = strings.begin();
-  for (auto& i : { "lorem", "ipsum", "dolor", "sic", "amet" })
-  {
-    DALI_TEST_EQUAL(*iStrings, i);
-    ++iStrings;
-  }
-
-  END_TEST;
-}
-
-int UtcDaliJsonUtilReadAndReturnPropertyValue(void)
-{
-  Document doc{ TEST_JSON };
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("disambiguatedFloat")).Get<float>(), 15.8f);
-
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("rotation1")).Get<Quaternion>(),
-    Quaternion(Radian(Degree(15.0)), Radian(Degree(90.0)), Radian(Degree(-45.f))));
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("rotation2")).Get<Quaternion>(),
-    Quaternion(Vector4(0.707f, 0.f, 0.707f, 0.f)));
-
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("bool")).Get<bool>(), true);
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("int")).Get<int32_t>(), 17834);
-
-  const float floats[]{ 1.f, 0.f, 0.f, 0.f, 0.f, 2.f, 0.f, 0.f, 0.f, 0.f, 3.f, 0.f, 1.f, 2.f, 3.f, 4.f };
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("matrix")).Get<Matrix>(), Matrix(floats));
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("matrix3")).Get<Matrix3>(), Matrix3(floats[5],
-    floats[6], floats[7], floats[8], floats[9], floats[10], floats[11], floats[12], floats[13]));
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("floatArray")).Get<Vector4>(),
-    Vector4(0.f, .25f, 1.f, .75f));
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("rgb")).Get<Vector3>(),
-    Vector3(.5f, .8f, .25f));
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("vector2")).Get<Vector2>(),
-    Vector2(2.f, 1.f));
-  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("object")->GetChild("duration")).Get<float>(), 4.f );
-
-  END_TEST;
-}
-
-namespace
-{
-template <typename T>
-void CheckEqualityAs(Property::Value lhs, Property::Value rhs)
-{
-  DALI_TEST_EQUAL(lhs.Get<T>(), rhs.Get<T>());
-}
-
-}
-
-int UtcDaliJsonUtilReadPropertyValue(void)
-{
-  struct TypeNameValue
-  {
-    Property::Type type;
-    std::string name;
-    Property::Value value;
-    void(*compareFn)(Property::Value, Property::Value);
-  };
-
-  Document doc{ TEST_JSON };
-
-  const float floats[]{ 1.f, 0.f, 0.f, 0.f, 0.f, 2.f, 0.f, 0.f, 0.f, 0.f, 3.f, 0.f, 1.f, 2.f, 3.f, 4.f };
-  const TypeNameValue typeNameValues[] {
-    { Property::BOOLEAN, "bool", true, CheckEqualityAs<bool> },
-    { Property::FLOAT, "float", 3.1415628f, CheckEqualityAs<float> },
-    { Property::INTEGER, "int", 17834, CheckEqualityAs<int32_t> },
-    { Property::VECTOR2, "vector2", Vector2(2.f, 1.f), CheckEqualityAs<Vector2> },
-    { Property::VECTOR3, "rgb", Vector3(.5f, .8f, .25f), CheckEqualityAs<Vector3> },
-    { Property::VECTOR4, "floatArray", Vector4(.0f, .25f, 1.f, .75f), CheckEqualityAs<Vector4> },
-    { Property::MATRIX3, "matrix3", Matrix3(2.f, 0.f, 0.f, 0.f, 0.f, 3.f, 0.f, 1.f, 2.f),
-      CheckEqualityAs<Matrix3> },
-    { Property::MATRIX, "matrix", Matrix(floats), CheckEqualityAs<Matrix> },
-    { Property::RECTANGLE, "intArray", Rect<int>(1, 2, 3, 5), CheckEqualityAs<Rect<int>> },
-    { Property::EXTENTS, "intArray", Extents(1, 2, 3, 5), CheckEqualityAs<Extents> },
-  };
-  for(auto& i: typeNameValues)
-  {
-    std::cout << i.value << std::endl;
-    i.compareFn(ReadPropertyValue(i.type, *doc.root->GetChild(i.name)), i.value);
-  }
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/CMakeLists.txt b/automated-tests/src/dali-scene-loader/CMakeLists.txt
deleted file mode 100755
index 60c1b22..0000000
--- a/automated-tests/src/dali-scene-loader/CMakeLists.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-SET(PKG_NAME "dali-scene-loader")
-
-SET(EXEC_NAME "tct-${PKG_NAME}-core")
-SET(RPM_NAME "core-${PKG_NAME}-tests")
-
-SET(CAPI_LIB "dali-scene-loader")
-
-# List of test case sources (Only these get parsed for test cases)
-SET(TC_SOURCES
-  utc-Dali-AlphaFunctionHelper.cpp
-  utc-Dali-AnimationDefinition.cpp
-  utc-Dali-AnimatedProperty.cpp
-  utc-Dali-CameraParameters.cpp
-  utc-Dali-DliLoader.cpp
-  utc-Dali-EnvironmentDefinition.cpp
-  utc-Dali-Gltf2Loader.cpp
-  utc-Dali-KtxLoader.cpp
-  utc-Dali-MatrixStack.cpp
-  utc-Dali-MeshDefinition.cpp
-  utc-Dali-NodeDefinition.cpp
-  utc-Dali-RendererState.cpp
-  utc-Dali-ResourceBundle.cpp
-  utc-Dali-SceneDefinition.cpp
-  utc-Dali-ShaderDefinition.cpp
-  utc-Dali-ShaderDefinitionFactory.cpp
-  utc-Dali-StringCallback.cpp
-  utc-Dali-Utils.cpp
-  utc-Dali-ViewProjection.cpp
-)
-
-# List of test harness files (Won't get parsed for test cases)
-SET(TEST_HARNESS_DIR "../dali-toolkit/dali-toolkit-test-utils")
-
-SET(TEST_HARNESS_SOURCES
-  ${TEST_HARNESS_DIR}/toolkit-adaptor.cpp
-  ${TEST_HARNESS_DIR}/toolkit-application.cpp
-  ${TEST_HARNESS_DIR}/toolkit-event-thread-callback.cpp
-  ${TEST_HARNESS_DIR}/toolkit-environment-variable.cpp
-  ${TEST_HARNESS_DIR}/toolkit-input-method-context.cpp
-  ${TEST_HARNESS_DIR}/toolkit-input-method-options.cpp
-  ${TEST_HARNESS_DIR}/toolkit-lifecycle-controller.cpp
-  ${TEST_HARNESS_DIR}/toolkit-orientation.cpp
-  ${TEST_HARNESS_DIR}/toolkit-style-monitor.cpp
-  ${TEST_HARNESS_DIR}/toolkit-test-application.cpp
-  ${TEST_HARNESS_DIR}/toolkit-timer.cpp
-  ${TEST_HARNESS_DIR}/toolkit-trigger-event-factory.cpp
-  ${TEST_HARNESS_DIR}/toolkit-window.cpp
-  ${TEST_HARNESS_DIR}/toolkit-scene-holder.cpp
-  ${TEST_HARNESS_DIR}/dali-test-suite-utils.cpp
-  ${TEST_HARNESS_DIR}/dali-toolkit-test-suite-utils.cpp
-  ${TEST_HARNESS_DIR}/dummy-control.cpp
-  ${TEST_HARNESS_DIR}/mesh-builder.cpp
-  ${TEST_HARNESS_DIR}/test-actor-utils.cpp
-  ${TEST_HARNESS_DIR}/test-animation-data.cpp
-  ${TEST_HARNESS_DIR}/test-application.cpp
-  ${TEST_HARNESS_DIR}/test-button.cpp
-  ${TEST_HARNESS_DIR}/test-harness.cpp
-  ${TEST_HARNESS_DIR}/test-gesture-generator.cpp
-  ${TEST_HARNESS_DIR}/test-gl-abstraction.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-sync-impl.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-sync-object.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-buffer.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-command-buffer.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-framebuffer.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-controller.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-texture.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-sampler.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-program.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-pipeline.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-shader.cpp
-  ${TEST_HARNESS_DIR}/test-graphics-reflection.cpp
-  ${TEST_HARNESS_DIR}/test-platform-abstraction.cpp
-  ${TEST_HARNESS_DIR}/test-render-controller.cpp
-  ${TEST_HARNESS_DIR}/test-trace-call-stack.cpp
-)
-
-PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-  dali2-core
-  dali2-adaptor
-  dali2-toolkit
-  dali2-scene-loader
-)
-
-ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
-ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
-
-ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
-
-FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
-    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
-ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
-
-INCLUDE_DIRECTORIES(
-    ../../../
-    ${${CAPI_LIB}_INCLUDE_DIRS}
-    ../dali-toolkit/dali-toolkit-test-utils
-)
-
-ADD_CUSTOM_COMMAND(
-  COMMAND ${SCRIPT_DIR}/tcheadgen.sh ${EXEC_NAME}.h ${TC_SOURCES}
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  OUTPUT ${EXEC_NAME}.h
-  COMMENT "Generating test tables"
-  )
-
-ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
-TARGET_LINK_LIBRARIES(${EXEC_NAME}
-    ${${CAPI_LIB}_LIBRARIES}
-    -lpthread --coverage
-)
-
-INSTALL(PROGRAMS ${EXEC_NAME}
-    DESTINATION ${BIN_DIR}/${EXEC_NAME}
-)
diff --git a/automated-tests/src/dali-scene-loader/tct-dali-scene-loader-core.cpp b/automated-tests/src/dali-scene-loader/tct-dali-scene-loader-core.cpp
deleted file mode 100644
index 5b79502..0000000
--- a/automated-tests/src/dali-scene-loader/tct-dali-scene-loader-core.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <test-harness.h>
-#include "tct-dali-scene-loader-core.h"
-
-int main(int argc, char * const argv[])
-{
-  return TestHarness::RunTests(argc, argv, tc_array);
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-AlphaFunctionHelper.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-AlphaFunctionHelper.cpp
deleted file mode 100644
index da40b27..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-AlphaFunctionHelper.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/alpha-function-helper.h"
-#include <dali-test-suite-utils.h>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-#define ALPHA_FN_PAIR(x) { #x, AlphaFunction::x }
-
-const std::pair<std::string, AlphaFunction::BuiltinFunction> BUILTIN_FUNCTIONS[] {
-  ALPHA_FN_PAIR(DEFAULT),
-  ALPHA_FN_PAIR(LINEAR),
-  ALPHA_FN_PAIR(REVERSE),
-  ALPHA_FN_PAIR(EASE_IN),
-  ALPHA_FN_PAIR(EASE_OUT),
-  ALPHA_FN_PAIR(EASE_IN_OUT),
-  ALPHA_FN_PAIR(EASE_IN_SQUARE),
-  ALPHA_FN_PAIR(EASE_OUT_SQUARE),
-  ALPHA_FN_PAIR(EASE_IN_SINE),
-  ALPHA_FN_PAIR(EASE_OUT_SINE),
-  ALPHA_FN_PAIR(EASE_IN_OUT_SINE),
-  ALPHA_FN_PAIR(BOUNCE),
-  ALPHA_FN_PAIR(SIN),
-  ALPHA_FN_PAIR(EASE_OUT_BACK),
-};
-
-int UtcDaliAlphaFunctionHelperGet(void)
-{
-  bool found;
-  for (auto& a: BUILTIN_FUNCTIONS)
-  {
-    auto result = GetAlphaFunction(a.first, &found);
-    DALI_TEST_EQUAL(result.GetBuiltinFunction(), a.second);
-    DALI_TEST_EQUAL(result.GetMode(), AlphaFunction::BUILTIN_FUNCTION);
-    DALI_TEST_CHECK(found);
-  }
-
-  auto result = GetAlphaFunction("made up function", &found);
-  DALI_TEST_EQUAL(result.GetBuiltinFunction(), AlphaFunction::DEFAULT);
-  DALI_TEST_EQUAL(result.GetMode(), AlphaFunction::BUILTIN_FUNCTION);
-  DALI_TEST_CHECK(!found);
-
-  END_TEST;
-}
-
-int UtcDaliAlphaFunctionHelperRegister(void)
-{
-  for (auto& a: BUILTIN_FUNCTIONS)
-  {
-    DALI_TEST_ASSERTION(RegisterAlphaFunction(a.first, AlphaFunction()), "given key already exists");
-  }
-
-  AlphaFunctionPrototype testFn = [](float f) {
-    return f > .5f ? 1.f : 0.f;
-  };
-  RegisterAlphaFunction("step", AlphaFunction(testFn));
-
-  bool found;
-  auto result = GetAlphaFunction("step", &found);
-  DALI_TEST_EQUAL(result.GetMode(), AlphaFunction::CUSTOM_FUNCTION);
-  DALI_TEST_EQUAL(result.GetCustomFunction(), testFn);
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-AnimatedProperty.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-AnimatedProperty.cpp
deleted file mode 100644
index c660a1d..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-AnimatedProperty.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/animated-property.h"
-#include <dali-test-suite-utils.h>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliAnimatedPropertyGetPropertyType(void)
-{
-  TestApplication app;
-  auto actor = Actor::New();
-  actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
-
-  AnimatedProperty animProp {
-   "ChristopherPlummer",
-   "position",
-   KeyFrames(),
-   std::unique_ptr<AnimatedProperty::Value>{ new AnimatedProperty::Value{
-     Property::Value{ Vector3::XAXIS * 100.f },
-     true
-   } },
-  };
-
-  Property expected(actor, Actor::Property::POSITION);
-  Property result = animProp.GetProperty(actor);
-  DALI_TEST_EQUAL(result.object, expected.object);
-  DALI_TEST_EQUAL(result.propertyIndex, expected.propertyIndex);
-  DALI_TEST_EQUAL(result.componentIndex, expected.componentIndex);
-  DALI_TEST_EQUAL(animProp.GetPropertyType(actor), Property::VECTOR3);
-
-  END_TEST;
-}
-
-
-
-
-
-
-
-
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-AnimationDefinition.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-AnimationDefinition.cpp
deleted file mode 100644
index e27fb36..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-AnimationDefinition.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/animation-definition.h"
-#include <dali-test-suite-utils.h>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliAnimationDefinitionStopForModification(void)
-{
-  TestApplication app;
-  auto anim = Animation::New(15.f);
-  anim.Play();
-
-  auto oldEndAction = AnimationDefinition::StopForModification(anim);
-  DALI_TEST_EQUAL(anim.GetState(), Animation::STOPPED);
-  DALI_TEST_EQUAL(oldEndAction, Animation::BAKE);
-  DALI_TEST_EQUAL(anim.GetEndAction(), Animation::DISCARD);
-
-  END_TEST;
-}
-
-int UtcDaliAnimationDefinitionReAnimate(void)
-{
-  TestApplication app;
-  auto actor = Actor::New();
-  actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
-
-  auto getActor = [&actor](const std::string& name) {
-    return actor.FindChildByName(name);
-  };
-
-  for (bool b: { false, true })
-  {
-    AnimationDefinition animDef;
-    animDef.mName = "WalkRight";
-    animDef.mDuration = 10.f;
-    animDef.mLoopCount = 2;
-    animDef.mEndAction = Animation::BAKE_FINAL;
-    animDef.mSpeedFactor = .7f;
-    animDef.mProperties.push_back(AnimatedProperty{
-     "ChristopherPlummer",
-     "position",
-     KeyFrames(),
-     std::unique_ptr<AnimatedProperty::Value>{ new AnimatedProperty::Value{
-       Property::Value{ Vector3::XAXIS * 100.f },
-       b
-     } },
-     AlphaFunction::EASE_OUT,
-     TimePeriod(animDef.mDuration)
-    });
-
-    auto anim = animDef.ReAnimate(getActor);
-    DALI_TEST_EQUAL(anim.GetDuration(), animDef.mDuration);
-    DALI_TEST_EQUAL(anim.GetEndAction(), animDef.mEndAction);
-    DALI_TEST_EQUAL(anim.GetSpeedFactor(), animDef.mSpeedFactor);
-    DALI_TEST_EQUAL(anim.GetLoopCount(), animDef.mLoopCount);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliAnimationDefinitionReAnimateKeyFrames(void)
-{
-  TestApplication app;
-  auto actor = Actor::New();
-  actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
-
-  auto getActor = [&actor](const std::string& name) {
-    return actor.FindChildByName(name);
-  };
-
-  KeyFrames kf = KeyFrames::New();
-  kf.Add(0.f, Vector3::ZERO);
-  kf.Add(1.f, Vector3::XAXIS * 100.f);
-
-  AnimationDefinition animDef;
-  animDef.mName = "WalkRight";
-  animDef.mDuration = 10.f;
-  animDef.mLoopCount = 2;
-  animDef.mEndAction = Animation::BAKE_FINAL;
-  animDef.mSpeedFactor = .7f;
-  animDef.mProperties.push_back(AnimatedProperty{
-   "ChristopherPlummer",
-   "position",
-   kf,
-   nullptr,
-   AlphaFunction::EASE_OUT,
-   TimePeriod(animDef.mDuration)
-  });
-
-  auto anim = animDef.ReAnimate(getActor);
-  DALI_TEST_EQUAL(anim.GetDuration(), animDef.mDuration);
-  DALI_TEST_EQUAL(anim.GetEndAction(), animDef.mEndAction);
-  DALI_TEST_EQUAL(anim.GetSpeedFactor(), animDef.mSpeedFactor);
-  DALI_TEST_EQUAL(anim.GetLoopCount(), animDef.mLoopCount);
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-CameraParameters.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-CameraParameters.cpp
deleted file mode 100644
index 5ad4a40..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-CameraParameters.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/camera-parameters.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliCameraParameters(void)
-{
-  Quaternion qView = Quaternion(Radian(Degree(180.f)), Vector3::YAXIS);
-  CameraParameters camParams;
-  camParams.matrix.SetTransformComponents(Vector3::ONE * 2.f,
-    qView,
-    Vector3::ZAXIS * -100.f);
-  camParams.orthographicSize = Vector4{ -1.f, 1.f, -1.f, 1.f };
-  camParams.yFov = Radian(M_PI * .5).radian;
-  camParams.zNear = 1.f;
-  camParams.zFar = 1000.f;
-
-  Vector3 scale;
-  Quaternion orientation;
-  Vector3 position;
-  camParams.CalculateTransformComponents(position, orientation, scale);
-  DALI_TEST_EQUAL(scale, Vector3::ONE * 2.f);
-  DALI_TEST_EQUAL(orientation, Quaternion::IDENTITY); // 2 180 degrees rotations along y
-  DALI_TEST_EQUAL(position, Vector3::ZAXIS * -100.f);
-
-  TestApplication app;
-  CameraActor camera = CameraActor::New();
-  for (auto i : { false, true })
-  {
-    camParams.isPerspective = i;
-
-    auto viewProjection = camParams.GetViewProjection();
-    Matrix view{ false };
-    Matrix::Multiply(view, Matrix(qView), camParams.matrix);
-    view.Invert();
-    DALI_TEST_EQUAL(viewProjection.GetView(), view);
-
-    camParams.ConfigureCamera(camera);
-    DALI_TEST_EQUAL(camParams.zNear, camera.GetNearClippingPlane());
-    DALI_TEST_EQUAL(camParams.zFar, camera.GetFarClippingPlane());
-
-    DALI_TEST_EQUAL(camera.GetInvertYAxis(), true);
-    DALI_TEST_EQUAL(camera.GetProperty(Actor::Property::POSITION).Get<Vector3>(), position);
-    DALI_TEST_EQUAL(camera.GetProperty(Actor::Property::ORIENTATION).Get<Quaternion>(), orientation);
-    DALI_TEST_EQUAL(camera.GetProperty(Actor::Property::SCALE).Get<Vector3>(), scale);
-  }
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-DliLoader.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-DliLoader.cpp
deleted file mode 100644
index d09d2da..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-DliLoader.cpp
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/dli-loader.h"
-#include "dali-scene-loader/public-api/resource-bundle.h"
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/load-result.h"
-#include "dali-scene-loader/internal/json-util.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-namespace
-{
-
-void ConfigureBlendShapeShaders(ResourceBundle& resources, const SceneDefinition& scene, Actor root,
-  std::vector<BlendshapeShaderConfigurationRequest>&& requests)
-{
-  std::vector<std::string> errors;
-  auto onError = [&errors](const std::string& msg) {
-    errors.push_back(msg);
-  };
-
-  if (!scene.ConfigureBlendshapeShaders(resources, root, std::move(requests), onError))
-  {
-    ExceptionFlinger flinger(ASSERT_LOCATION);
-    for (auto& msg : errors)
-    {
-      flinger << msg << '\n';
-    }
-  }
-}
-
-struct Context
-{
-  ResourceBundle::PathProvider pathProvider = [](ResourceType::Value type) {
-    return TEST_RESOURCE_DIR "/";
-  };
-
-  ResourceBundle resources;
-  SceneDefinition scene;
-  std::vector<CameraParameters> cameraParameters;
-  std::vector<LightParameters> lights;
-  std::vector<AnimationDefinition> animations;
-  std::vector<AnimationGroupDefinition> animGroups;
-
-  LoadResult output {
-    resources,
-    scene,
-    animations,
-    animGroups,
-    cameraParameters,
-    lights
-  };
-
-  DliLoader::InputParams input {
-    pathProvider(ResourceType::Mesh),
-    nullptr,
-    {},
-    {},
-    nullptr,
-  };
-  DliLoader::LoadParams loadParams{ input, output };
-
-  std::vector<std::string> errors;
-  DliLoader loader;
-
-  StringCallback onError = [this](const std::string& error) {
-    errors.push_back(error);
-    printf("%s\n", error.c_str());
-  };
-
-  Context()
-  {
-    loader.SetErrorCallback(onError);
-  }
-};
-
-bool StringHasTokens(const char* string, const std::vector<const char*>& tokens)
-{
-  for (auto& token: tokens)
-  {
-    auto result = strstr(string, token);
-    if(nullptr == result)
-    {
-      return false;
-    }
-    string = result + strlen(token);
-  }
-  return true;
-}
-
-}
-
-int UtcDaliDliLoaderLoadSceneNotFound(void)
-{
-  Context ctx;
-
-  DALI_TEST_EQUAL(ctx.loader.LoadScene("does_not_exist.dli", ctx.loadParams), false);
-
-  auto error = ctx.loader.GetParseError();
-  DALI_TEST_CHECK(StringHasTokens(error.c_str(), { "Empty source buffer to parse." }));
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneFailParse(void)
-{
-  Context ctx;
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "invalid.gltf";
-  DALI_TEST_EQUAL(ctx.loader.LoadScene(path, ctx.loadParams), false);
-
-  auto error = ctx.loader.GetParseError();
-  DALI_TEST_CHECK(StringHasTokens(error.c_str(), { "Unexpected character." }));
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneAssertions(void)
-{
-  const std::pair<std::string, std::string> pathExceptionPairs[] {
-     // from RequireChild()
-    { "scenes-nodes-missing", "Failed to find child node" },
-    { "scenes-missing", "Failed to find child node" },
-    { "nodes-missing", "Failed to find child node" },
-    // from ParseSceneInternal()
-    { "scene-out-of-bounds", "out of bounds" },
-    { "nodes-invalid-type", "invalid type; array required" },
-    { "nodes-array-empty", "must define a node id" },
-    { "root-id-invalid", "invalid value for root node index" },
-    { "root-id-out-of-bounds", "out of bounds" },
-    { "root-node-invalid-type", "invalid JSON type; object required" },
-    // from ParseSkeletons()
-    { "skeleton-node-missing", "Missing required attribute" },
-    { "skeleton-root-not-found", "not defined" },
-    // from ParseShaders()
-    { "shader-vertex-missing", "Missing vertex / fragment shader" },
-    { "shader-fragment-missing", "Missing vertex / fragment shader" },
-    // from ParseMeshes()
-    { "mesh-uri-missing", "Missing required attribute" },
-    { "mesh-indices-read-fail", "Failed to read indices" },
-    { "mesh-positions-read-fail", "Failed to read positions" },
-    // from ParseMaterials()
-    { "material-environment-out-of-bounds", "out of bounds" },
-    // from ParseNodes()
-    { "node-model-mesh-missing", "Missing mesh" },
-    { "node-arc-mesh-missing", "Missing mesh" },
-    { "node-animated-image-mesh-missing", "Missing mesh" },
-    { "node-renderable-mesh-invalid-type", "Invalid Mesh index type" },
-    { "node-renderable-mesh-out-of-bounds", "out of bounds" },
-    { "node-child-invalid-type", "invalid index type" },
-    { "node-name-already-used", "name already used" },
-    // from ParseAnimations()
-    { "animation-failed-to-open", "Failed to open animation data" }
-  };
-  for (auto& i: pathExceptionPairs)
-  {
-    Context ctx;
-
-    auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/" + i.first + ".dli";
-    printf("\n\n%s: %s\n", path.c_str(), i.second.c_str());
-    DALI_TEST_ASSERTION(ctx.loader.LoadScene(path, ctx.loadParams), i.second.c_str());
-  }
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneExercise(void)
-{
-  Context ctx;
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "exercise.dli";
-  DALI_TEST_CHECK(ctx.loader.LoadScene(path, ctx.loadParams));
-  DALI_TEST_CHECK(ctx.errors.empty());
-
-  auto& scene = ctx.scene;
-  auto& roots = scene.GetRoots();
-  DALI_TEST_EQUAL(roots.size(), 2u);
-  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "Backdrop"); // default scene is scene 1 - this one.
-  DALI_TEST_EQUAL(scene.GetNode(roots[1])->mName, "ExerciseDemo");
-
-  DALI_TEST_EQUAL(scene.GetNodeCount(), 96u);
-
-  auto& resources = ctx.resources;
-  DALI_TEST_EQUAL(resources.mMeshes.size(), 11u);
-  DALI_TEST_EQUAL(resources.mMaterials.size(), 13u);
-  DALI_TEST_EQUAL(resources.mShaders.size(), 5u);
-  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 2u);
-  DALI_TEST_EQUAL(resources.mSkeletons.size(), 1u);
-
-  DALI_TEST_EQUAL(ctx.cameraParameters.size(), 1u);
-  DALI_TEST_EQUAL(ctx.lights.size(), 1u);
-  DALI_TEST_EQUAL(ctx.animations.size(), 18u);
-  DALI_TEST_EQUAL(ctx.animGroups.size(), 16u);
-
-  ViewProjection viewProjection;
-  Transforms xforms {
-    MatrixStack{},
-    viewProjection
-  };
-  NodeDefinition::CreateParams nodeParams{
-    resources,
-    xforms,
-  };
-
-  Customization::Choices choices;
-
-  TestApplication app;
-
-  Actor root = Actor::New();
-  SetActorCentered(root);
-  for (auto iRoot : scene.GetRoots())
-  {
-    auto resourceRefs = resources.CreateRefCounter();
-    scene.CountResourceRefs(iRoot, choices, resourceRefs);
-    resources.CountEnvironmentReferences(resourceRefs);
-    resources.LoadResources(resourceRefs, ctx.pathProvider);
-    if (auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
-    {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
-      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
-      ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
-      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
-      root.Add(actor);
-    }
-  }
-
-  DALI_TEST_EQUAL(root.GetChildCount(), 2u);
-  DALI_TEST_EQUAL(root.GetChildAt(0).GetProperty(Actor::Property::NAME).Get<std::string>(), "Backdrop");
-  DALI_TEST_EQUAL(root.GetChildAt(1).GetProperty(Actor::Property::NAME).Get<std::string>(), "ExerciseDemo");
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneMorph(void)
-{
-  Context ctx;
-
-  std::vector<std::string> metadata;
-  uint32_t metadataCount = 0;
-  ctx.input.mPreNodeCategoryProcessors.push_back({ "metadata",
-    [&](const Property::Array& array, StringCallback) {
-      std::string key, value;
-      for (uint32_t i0 = 0, i1 = array.Count(); i0 < i1; ++i0)
-      {
-        auto& data = array.GetElementAt(i0);
-        DALI_TEST_EQUAL(data.GetType(), Property::MAP);
-
-        auto map = data.GetMap();
-        auto key = map->Find("key");
-        auto value = map->Find("value");
-        DALI_TEST_EQUAL(key->GetType(), Property::STRING);
-        DALI_TEST_EQUAL(value->GetType(), Property::STRING);
-        metadata.push_back(key->Get<std::string>() + ":" + value->Get<std::string>());
-
-        ++metadataCount;
-      }
-    }
-  });
-
-  std::vector<std::string> behaviors;
-  uint32_t behaviorCount = 0;
-  ctx.input.mPostNodeCategoryProcessors.push_back({ "behaviors",
-    [&](const Property::Array& array, StringCallback) {
-      for (uint32_t i0 = 0, i1 = array.Count(); i0 < i1; ++i0)
-      {
-        auto& data = array.GetElementAt(i0);
-        DALI_TEST_EQUAL(data.GetType(), Property::MAP);
-
-        auto map = data.GetMap();
-        auto event = map->Find("event");
-        auto url = map->Find("url");
-        DALI_TEST_EQUAL(event->GetType(), Property::STRING);
-        DALI_TEST_EQUAL(url->GetType(), Property::STRING);
-        behaviors.push_back(event->Get<std::string>() + ":" + url->Get<std::string>());
-
-        ++behaviorCount;
-      }
-    }
-  });
-
-  size_t numNodes = 0;
-  ctx.input.mNodePropertyProcessor = [&](const NodeDefinition&, const Property::Map&, StringCallback) {
-    ++numNodes;
-  };
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "morph.dli";
-  DALI_TEST_CHECK(ctx.loader.LoadScene(path, ctx.loadParams));
-  DALI_TEST_CHECK(ctx.errors.empty());
-
-  auto& scene = ctx.scene;
-  auto& roots = scene.GetRoots();
-  DALI_TEST_EQUAL(roots.size(), 1u);
-  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "HeadTest_002");
-
-  DALI_TEST_EQUAL(numNodes, 3u);
-  DALI_TEST_EQUAL(scene.GetNodeCount(), numNodes);
-
-  auto& resources = ctx.resources;
-  DALI_TEST_EQUAL(resources.mMeshes.size(), 2u);
-  DALI_TEST_EQUAL(resources.mMaterials.size(), 1u);
-  DALI_TEST_EQUAL(resources.mShaders.size(), 5u);
-  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 2u);
-  DALI_TEST_EQUAL(resources.mSkeletons.size(), 0u);
-
-  DALI_TEST_EQUAL(ctx.cameraParameters.size(), 1u);
-  DALI_TEST_EQUAL(ctx.lights.size(), 1u);
-  DALI_TEST_EQUAL(ctx.animations.size(), 1u);
-  DALI_TEST_EQUAL(ctx.animGroups.size(), 0u);
-
-  DALI_TEST_EQUAL(metadata.size(), 4u);
-  DALI_TEST_EQUAL(behaviors.size(), 1u);
-
-  ViewProjection viewProjection;
-  Transforms xforms {
-    MatrixStack{},
-    viewProjection
-  };
-  NodeDefinition::CreateParams nodeParams{
-    resources,
-    xforms,
-  };
-
-  Customization::Choices choices;
-
-  TestApplication app;
-
-  Actor root = Actor::New();
-  SetActorCentered(root);
-  for (auto iRoot : scene.GetRoots())
-  {
-    auto resourceRefs = resources.CreateRefCounter();
-    scene.CountResourceRefs(iRoot, choices, resourceRefs);
-    resources.CountEnvironmentReferences(resourceRefs);
-    resources.LoadResources(resourceRefs, ctx.pathProvider);
-    if (auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
-    {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
-      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
-      ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
-      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
-      root.Add(actor);
-    }
-  }
-
-  DALI_TEST_EQUAL(root.GetChildCount(), 1u);
-  DALI_TEST_EQUAL(root.GetChildAt(0).GetProperty(Actor::Property::NAME).Get<std::string>(), "HeadTest_002");
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneArc(void)
-{
-  Context ctx;
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "arc.dli";
-  DALI_TEST_CHECK(ctx.loader.LoadScene(path, ctx.loadParams));
-  DALI_TEST_CHECK(ctx.errors.empty());
-
-  auto& scene = ctx.scene;
-  auto& roots = scene.GetRoots();
-  DALI_TEST_EQUAL(roots.size(), 1u);
-  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "root");
-
-  DALI_TEST_EQUAL(scene.GetNodeCount(), 2u);
-
-  auto& resources = ctx.resources;
-  DALI_TEST_EQUAL(resources.mMeshes.size(), 1u);
-  DALI_TEST_EQUAL(resources.mMaterials.size(), 1u);
-  DALI_TEST_EQUAL(resources.mShaders.size(), 1u);
-  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 1u);
-  DALI_TEST_EQUAL(resources.mSkeletons.size(), 0u);
-
-  DALI_TEST_EQUAL(ctx.cameraParameters.size(), 0u);
-  DALI_TEST_EQUAL(ctx.lights.size(), 0u);
-  DALI_TEST_EQUAL(ctx.animations.size(), 0u);
-  DALI_TEST_EQUAL(ctx.animGroups.size(), 0u);
-
-  ViewProjection viewProjection;
-  Transforms xforms {
-    MatrixStack{},
-    viewProjection
-  };
-  NodeDefinition::CreateParams nodeParams{
-    resources,
-    xforms,
-  };
-
-  Customization::Choices choices;
-
-  TestApplication app;
-
-  Actor root = Actor::New();
-  SetActorCentered(root);
-  for (auto iRoot : scene.GetRoots())
-  {
-    auto resourceRefs = resources.CreateRefCounter();
-    scene.CountResourceRefs(iRoot, choices, resourceRefs);
-    resources.CountEnvironmentReferences(resourceRefs);
-    resources.LoadResources(resourceRefs, ctx.pathProvider);
-    if (auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
-    {
-      scene.ConfigureSkeletonJoints(iRoot, resources.mSkeletons, actor);
-      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
-      ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
-      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
-      root.Add(actor);
-    }
-  }
-
-  DALI_TEST_EQUAL(root.GetChildCount(), 1u);
-  DALI_TEST_EQUAL(root.GetChildAt(0).GetProperty(Actor::Property::NAME).Get<std::string>(), "root");
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneShaderUniforms(void)
-{
-  Context ctx;
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/shader-uniforms.dli";
-  DALI_TEST_CHECK(ctx.loader.LoadScene(path, ctx.loadParams));
-  DALI_TEST_EQUAL(ctx.errors.size(), 1u);
-  DALI_TEST_CHECK(ctx.errors[0].find("failed to infer type") != std::string::npos);
-
-  auto& scene = ctx.scene;
-  auto& roots = scene.GetRoots();
-  DALI_TEST_EQUAL(roots.size(), 1u);
-  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "root");
-
-  DALI_TEST_EQUAL(scene.GetNodeCount(), 1u);
-
-  auto& resources = ctx.resources;
-  DALI_TEST_EQUAL(resources.mMeshes.size(), 0u);
-  DALI_TEST_EQUAL(resources.mMaterials.size(), 0u);
-  DALI_TEST_EQUAL(resources.mShaders.size(), 1u);
-  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 0u);
-  DALI_TEST_EQUAL(resources.mSkeletons.size(), 0u);
-
-  auto raw = resources.mShaders[0].first.LoadRaw(ctx.pathProvider(ResourceType::Shader));
-
-  TestApplication app;
-
-  auto shader = resources.mShaders[0].first.Load(std::move(raw));
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uBool")).Get<float>(), 1.0f);
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uInt")).Get<float>(), 255.0f);
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uFloat")).Get<float>(), -0.5f);
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uVec2")).Get<Vector2>(), Vector2(100.0f, -100.0f));
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uVec3")).Get<Vector3>(), Vector3(50.0f, 0.f, -200.0f));
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uVec4")).Get<Vector4>(), Vector4(0.1774f, 1.0f, 0.5333f, 0.7997f));
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uMat3")).Get<Matrix3>(), Matrix3(9.0f, 8.0f, 7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f));
-
-  Matrix expectedMatrix;
-  expectedMatrix.SetTransformComponents(Vector3::ONE * 8.0, Quaternion::IDENTITY, Vector3::ZERO);
-  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uMat4")).Get<Matrix>(), expectedMatrix);
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneExtras(void)
-{
-  Context ctx;
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/extras.dli";
-  DALI_TEST_CHECK(ctx.loader.LoadScene(path, ctx.loadParams));
-  DALI_TEST_EQUAL(ctx.errors.size(), 3u);
-  DALI_TEST_CHECK(ctx.errors[0].find("already defined; overriding") != std::string::npos);
-  DALI_TEST_CHECK(ctx.errors[1].find("empty string is invalid for name") != std::string::npos);
-  DALI_TEST_CHECK(ctx.errors[2].find("failed to interpret value") != std::string::npos);
-
-  auto& scene = ctx.scene;
-  auto& roots = scene.GetRoots();
-  DALI_TEST_EQUAL(roots.size(), 1u);
-  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "root");
-
-  DALI_TEST_EQUAL(scene.GetNodeCount(), 1u);
-
-  ViewProjection viewProjection;
-  Transforms xforms {
-    MatrixStack{},
-    viewProjection
-  };
-  auto& resources = ctx.resources;
-  NodeDefinition::CreateParams nodeParams{
-    resources,
-    xforms,
-  };
-
-  Customization::Choices choices;
-
-  TestApplication app;
-  Actor actor = scene.CreateNodes(0, choices, nodeParams);
-
-  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("fudgeFactor")).Get<float>(), 9000.1f);
-  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("fudgeVector")).Get<Vector2>(), Vector2(-.25f, 17.f));
-  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("isThisTheRealLife")).Get<bool>(), true);
-  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("isThisJustFantasy")).Get<bool>(), false);
-  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("velocity")).Get<Vector3>(), Vector3(.1f, 58.f, -.2f));
-  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("frameOfReference")).Get<Matrix>(), Matrix::IDENTITY);
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderLoadSceneConstraints(void)
-{
-  Context ctx;
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/constraints.dli";
-  DALI_TEST_CHECK(ctx.loader.LoadScene(path, ctx.loadParams));
-  DALI_TEST_EQUAL(ctx.errors.size(), 1u);
-  DALI_TEST_CHECK(ctx.errors[0].find("invalid", ctx.errors[0].find("node ID")) != std::string::npos);
-
-  auto& scene = ctx.scene;
-  auto& roots = scene.GetRoots();
-  DALI_TEST_EQUAL(roots.size(), 1u);
-  DALI_TEST_EQUAL(scene.GetNode(0)->mName, "root");
-  DALI_TEST_EQUAL(scene.GetNode(1)->mName, "Alice");
-  DALI_TEST_EQUAL(scene.GetNode(2)->mName, "Bob");
-  DALI_TEST_EQUAL(scene.GetNode(3)->mName, "Charlie");
-
-  DALI_TEST_EQUAL(scene.GetNodeCount(), 4u);
-
-  ViewProjection viewProjection;
-  Transforms xforms {
-    MatrixStack{},
-    viewProjection
-  };
-  auto& resources = ctx.resources;
-  NodeDefinition::CreateParams nodeParams{
-    resources,
-    xforms,
-  };
-
-  Customization::Choices choices;
-
-  TestApplication app;
-
-  Actor root = scene.CreateNodes(0, choices, nodeParams);
-  Actor alice = root.FindChildByName("Alice");
-  Actor bob = root.FindChildByName("Bob");
-  Actor charlie = root.FindChildByName("Charlie");
-
-  DALI_TEST_EQUAL(nodeParams.mConstrainables.size(), 3u);
-  DALI_TEST_EQUAL(bob.GetProperty(bob.GetPropertyIndex("angularVelocity")).Get<Vector2>(), Vector2(-0.5, 0.0004));
-
-  ctx.errors.clear();
-  scene.ApplyConstraints(root, std::move(nodeParams.mConstrainables), ctx.onError);
-  DALI_TEST_CHECK(ctx.errors.empty());
-
-  app.GetScene().Add(root);
-  app.SendNotification();
-  app.Render();
-  app.SendNotification();
-  app.Render();
-
-  DALI_TEST_EQUAL(charlie.GetCurrentProperty(Actor::Property::ORIENTATION), alice.GetProperty(Actor::Property::ORIENTATION));
-  DALI_TEST_EQUAL(charlie.GetCurrentProperty(Actor::Property::POSITION), bob.GetProperty(Actor::Property::POSITION));
-  DALI_TEST_EQUAL(charlie.GetCurrentProperty(charlie.GetPropertyIndex("angularVelocity")), bob.GetProperty(bob.GetPropertyIndex("angularVelocity")));
-
-  END_TEST;
-}
-
-int UtcDaliDliLoaderNodeProcessor(void)
-{
-  Context ctx;
-
-  std::vector<Property::Map> nodeMaps;
-  ctx.input.mNodePropertyProcessor = [&](const NodeDefinition&, Property::Map&& map, StringCallback) {
-    nodeMaps.push_back(map);
-  };
-
-  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/node-processor.dli";
-  DALI_TEST_CHECK(ctx.loader.LoadScene(path, ctx.loadParams));
-
-  DALI_TEST_EQUAL(nodeMaps.size(), 2u);
-  DALI_TEST_EQUAL(nodeMaps[0].Count(), 5u);
-  DALI_TEST_EQUAL(nodeMaps[0].Find("name")->Get<std::string>(), "rootA");
-  DALI_TEST_EQUAL(nodeMaps[0].Find("nickname")->Get<std::string>(), "same as name");
-  DALI_TEST_EQUAL(nodeMaps[0].Find("favourite number")->Get<int32_t>(), 63478);
-
-  auto propArray = nodeMaps[0].Find("array");
-  DALI_TEST_EQUAL(propArray->GetType(), Property::ARRAY);
-
-  auto array = propArray->GetArray();
-  DALI_TEST_EQUAL(array->Count(), 5);
-  DALI_TEST_EQUAL(array->GetElementAt(0).Get<int32_t>(), 1);
-  DALI_TEST_EQUAL(array->GetElementAt(1).Get<int32_t>(), 2);
-  DALI_TEST_EQUAL(array->GetElementAt(2).Get<int32_t>(), 4);
-  DALI_TEST_EQUAL(array->GetElementAt(3).Get<int32_t>(), 8);
-  DALI_TEST_EQUAL(array->GetElementAt(4).Get<int32_t>(), -500);
-
-  auto propObject = nodeMaps[0].Find("object");
-  DALI_TEST_EQUAL(propObject->GetType(), Property::MAP);
-
-  auto object = propObject->GetMap();
-  DALI_TEST_EQUAL(object->Count(), 5);
-  DALI_TEST_EQUAL(object->Find("physics")->Get<bool>(), true);
-  DALI_TEST_EQUAL(object->Find("elasticity")->Get<float>(), .27f);
-  DALI_TEST_EQUAL(object->Find("drag")->Get<float>(), .91f);
-
-  auto propInnerArray = object->Find("inner array");
-  DALI_TEST_EQUAL(propInnerArray->GetType(), Property::ARRAY);
-
-  auto innerArray = propInnerArray->GetArray();
-  DALI_TEST_EQUAL(innerArray->Count(), 3);
-  DALI_TEST_EQUAL(innerArray->GetElementAt(0).Get<std::string>(), "why");
-  DALI_TEST_EQUAL(innerArray->GetElementAt(1).Get<std::string>(), "not");
-  DALI_TEST_EQUAL(innerArray->GetElementAt(2).Get<bool>(), false);
-
-  auto propInnerObject = object->Find("inner object");
-  DALI_TEST_EQUAL(propInnerObject->GetType(), Property::MAP);
-
-  auto innerObject = propInnerObject->GetMap();
-  DALI_TEST_EQUAL(innerObject->Count(), 1);
-  DALI_TEST_EQUAL(innerObject->Find("supported")->Get<bool>(), true);
-
-  DALI_TEST_EQUAL(nodeMaps[1].Count(), 1u);
-  DALI_TEST_EQUAL(nodeMaps[1].Find("name")->Get<std::string>(), "rootB");
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-EnvironmentDefinition.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-EnvironmentDefinition.cpp
deleted file mode 100644
index e151c6a..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-EnvironmentDefinition.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/environment-definition.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliEnvironmentDefinitionLoadRawDefault(void)
-{
-  EnvironmentDefinition envDef;
-  auto rawData = envDef.LoadRaw("");
-
-  DALI_TEST_EQUAL(rawData.mDiffuse.data.size(), 6u);
-  for (auto& face: rawData.mDiffuse.data)
-  {
-    DALI_TEST_EQUAL(face.size(), 1u);
-  }
-
-  DALI_TEST_EQUAL(rawData.mSpecular.data.size(), 6u);
-  for (auto& face: rawData.mSpecular.data)
-  {
-    DALI_TEST_EQUAL(face.size(), 1u);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliEnvironmentDefinitionLoadRawFail(void)
-{
-  for (auto name: { "nonexistent.ktx", TEST_RESOURCE_DIR "Cobe.obj" , TEST_RESOURCE_DIR "truncated.ktx" })
-  {
-    EnvironmentDefinition envDef { name, name };
-    DALI_TEST_ASSERTION(envDef.LoadRaw(""), "Failed to load cubemap texture");
-
-    envDef.mDiffuseMapPath = "";
-    DALI_TEST_ASSERTION(envDef.LoadRaw(""), "Failed to load cubemap texture"); // specular map still invalid
-  }
-
-  END_TEST;
-}
-
-int UtcDaliEnvironmentDefinitionLoadRawSuccess(void)
-{
-  EnvironmentDefinition envDef { "forest_irradiance.ktx", "forest_radiance.ktx" };
-  auto rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");
-
-  DALI_TEST_EQUAL(rawData.mDiffuse.data.size(), 6u);
-  for (auto& face: rawData.mDiffuse.data)
-  {
-    DALI_TEST_EQUAL(face.size(), 1u);
-    uint32_t size = 64u;
-    for (auto& mipLevel : face)
-    {
-      DALI_TEST_EQUAL(mipLevel.GetPixelFormat(), Pixel::Format::RGB888);
-      DALI_TEST_EQUAL(mipLevel.GetWidth(), size);
-      DALI_TEST_EQUAL(mipLevel.GetHeight(), size);
-      size /= 2;
-    }
-  }
-
-  DALI_TEST_EQUAL(rawData.mSpecular.data.size(), 6u);
-  for (auto& face: rawData.mSpecular.data)
-  {
-    DALI_TEST_EQUAL(face.size(), 5u);
-    uint32_t size = 64u;
-    for (auto& mipLevel : face)
-    {
-      DALI_TEST_EQUAL(mipLevel.GetPixelFormat(), Pixel::Format::RGB888);
-      DALI_TEST_EQUAL(mipLevel.GetWidth(), size);
-      DALI_TEST_EQUAL(mipLevel.GetHeight(), size);
-      size /= 2;
-    }
-  }
-
-  END_TEST;
-}
-
-int UtcDaliEnvironmentDefinitionLoadEmptyRaw(void)
-{
-  EnvironmentDefinition::RawData rawData;
-  EnvironmentDefinition envDef;
-  auto textures = envDef.Load(std::move(rawData));
-  DALI_TEST_CHECK(!textures.mDiffuse);
-  DALI_TEST_CHECK(!textures.mSpecular);
-
-  END_TEST;
-}
-
-namespace
-{
-
-void CheckTextureDefault(Texture texture)
-{
-  DALI_TEST_CHECK(texture);
-  DALI_TEST_EQUAL(texture.GetWidth(), 1u);
-  DALI_TEST_EQUAL(texture.GetHeight(), 1u);
-}
-
-void CheckTextureNotDefault(Texture texture)
-{
-  DALI_TEST_CHECK(texture);
-  DALI_TEST_CHECK(texture.GetWidth() > 1u);
-  DALI_TEST_CHECK(texture.GetHeight() > 1u);
-}
-
-}
-
-int UtcDaliEnvironmentDefinitionLoadDefault(void)
-{
-  EnvironmentDefinition envDef{};
-  auto rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");;
-
-  TestApplication app;
-  auto textures = envDef.Load(std::move(rawData));
-
-  CheckTextureDefault(textures.mSpecular);
-  CheckTextureDefault(textures.mDiffuse);
-
-  END_TEST;
-}
-
-int UtcDaliEnvironmentDefinitionLoadDiffuse(void)
-{
-  EnvironmentDefinition envDef{ "forest_irradiance.ktx" };
-  auto rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");;
-
-  TestApplication app;
-  auto textures = envDef.Load(std::move(rawData));
-
-  CheckTextureNotDefault(textures.mDiffuse);
-  CheckTextureDefault(textures.mSpecular);
-
-  END_TEST;
-}
-
-int UtcDaliEnvironmentDefinitionLoadSpecular(void)
-{
-  EnvironmentDefinition envDef{ "", "forest_radiance.ktx" };
-  auto rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");;
-
-  TestApplication app;
-  auto textures = envDef.Load(std::move(rawData));
-
-  CheckTextureDefault(textures.mDiffuse);
-  CheckTextureNotDefault(textures.mSpecular);
-
-  END_TEST;
-}
-
-int UtcDaliEnvironmentDefinitionLoadBoth(void)
-{
-  EnvironmentDefinition envDef{ "forest_irradiance.ktx", "forest_radiance.ktx" };
-  auto rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");;
-
-  TestApplication app;
-  auto textures = envDef.Load(std::move(rawData));
-
-  CheckTextureNotDefault(textures.mDiffuse);
-  CheckTextureNotDefault(textures.mSpecular);
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-Gltf2Loader.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-Gltf2Loader.cpp
deleted file mode 100644
index 3f829dc..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-Gltf2Loader.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/resource-bundle.h"
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/load-result.h"
-#include "dali-scene-loader/public-api/gltf2-loader.h"
-#include "dali-scene-loader/public-api/shader-definition-factory.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-#define DALI_TEST_THROW(expression, exception, predicate) \
-  {\
-    bool daliTestThrowSuccess__ = false;\
-    try\
-    {\
-      do { expression; } while(0);\
-      printf("No exception was thrown.\n");\
-    }\
-    catch (std::decay<exception>::type& ex)\
-    {\
-      daliTestThrowSuccess__ = predicate(ex);\
-    }\
-    catch (...)\
-    {\
-      printf("Wrong type of exception thrown.\n");\
-    }\
-    DALI_TEST_CHECK(daliTestThrowSuccess__);\
-  }
-
-namespace
-{
-struct Context
-{
-  ResourceBundle resources;
-  SceneDefinition scene;
-
-  std::vector<AnimationDefinition> animations;
-  std::vector<AnimationGroupDefinition> animationGroups;
-  std::vector<CameraParameters> cameras;
-  std::vector<LightParameters> lights;
-
-  LoadResult loadResult {
-    resources,
-    scene,
-    animations,
-    animationGroups,
-    cameras,
-    lights
-  };
-};
-
-struct ExceptionMessageStartsWith
-{
-  const std::string_view expected;
-
-  bool operator()(const std::runtime_error& e)
-  {
-    const bool success = (0 == strncmp(e.what(), expected.data(), expected.size()));
-    if (!success)
-    {
-      printf("Expected: %s, got: %s.\n", expected.data(), e.what());
-    }
-    return success;
-  }
-};
-
-}
-
-int UtcDaliGltfLoaderFailedToLoad(void)
-{
-  Context ctx;
-
-  ShaderDefinitionFactory sdf;
-  sdf.SetResources(ctx.resources);
-
-  DALI_TEST_THROW(LoadGltfScene("non-existent.gltf", sdf, ctx.loadResult),
-    std::runtime_error,
-    ExceptionMessageStartsWith{"Failed to load"});
-
-  DALI_TEST_EQUAL(0, ctx.scene.GetRoots().size());
-  DALI_TEST_EQUAL(0, ctx.scene.GetNodeCount());
-
-  DALI_TEST_EQUAL(0, ctx.resources.mEnvironmentMaps.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mMaterials.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mMeshes.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mShaders.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mSkeletons.size());
-
-  DALI_TEST_EQUAL(0, ctx.cameras.size());
-  DALI_TEST_EQUAL(0, ctx.lights.size());
-  DALI_TEST_EQUAL(0, ctx.animations.size());
-  DALI_TEST_EQUAL(0, ctx.animationGroups.size());
-
-  END_TEST;
-}
-
-int UtcDaliGltfLoaderFailedToParse(void)
-{
-  Context ctx;
-
-  ShaderDefinitionFactory sdf;
-  sdf.SetResources(ctx.resources);
-
-  DALI_TEST_THROW(LoadGltfScene(TEST_RESOURCE_DIR "/invalid.gltf", sdf, ctx.loadResult),
-    std::runtime_error,
-    ExceptionMessageStartsWith{"Failed to parse"});
-
-  DALI_TEST_EQUAL(0, ctx.scene.GetRoots().size());
-  DALI_TEST_EQUAL(0, ctx.scene.GetNodeCount());
-
-  DALI_TEST_EQUAL(0, ctx.resources.mEnvironmentMaps.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mMaterials.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mMeshes.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mShaders.size());
-  DALI_TEST_EQUAL(0, ctx.resources.mSkeletons.size());
-
-  DALI_TEST_EQUAL(0, ctx.cameras.size());
-  DALI_TEST_EQUAL(0, ctx.lights.size());
-  DALI_TEST_EQUAL(0, ctx.animations.size());
-  DALI_TEST_EQUAL(0, ctx.animationGroups.size());
-
-  END_TEST;
-}
-
-int UtcDaliGltfLoaderSuccess1(void)
-{
-  Context ctx;
-
-  ShaderDefinitionFactory sdf;
-  sdf.SetResources(ctx.resources);
-
-  LoadGltfScene(TEST_RESOURCE_DIR "/AnimatedCube.gltf", sdf, ctx.loadResult);
-
-  DALI_TEST_EQUAL(1u, ctx.scene.GetRoots().size());
-  DALI_TEST_EQUAL(6u, ctx.scene.GetNodeCount());
-
-  DALI_TEST_EQUAL(0u, ctx.resources.mEnvironmentMaps.size());
-
-  auto& materials = ctx.resources.mMaterials;
-  DALI_TEST_EQUAL(2u, materials.size());
-  const MaterialDefinition materialGroundTruth[] {
-    {
-      MaterialDefinition::ALBEDO | MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS |
-        MaterialDefinition::NORMAL | MaterialDefinition::TRANSPARENCY | MaterialDefinition::GLTF_CHANNELS |
-        (0x80 << MaterialDefinition::ALPHA_CUTOFF_SHIFT),
-      0,
-      Vector4(1.f, .766f, .336f, 1.f),
-      1.f,
-      0.f,
-      {
-        { MaterialDefinition::ALBEDO,
-          { "AnimatedCube_BaseColor.png",
-            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT) } },
-        { MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS | MaterialDefinition::GLTF_CHANNELS,
-          { "AnimatedCube_MetallicRoughness.png",
-            SamplerFlags::Encode(FilterMode::NEAREST_MIPMAP_LINEAR, FilterMode::NEAREST, WrapMode::CLAMP_TO_EDGE, WrapMode::MIRRORED_REPEAT) } },
-        { MaterialDefinition::NORMAL,
-          { "AnimatedCube_BaseColor.png",
-            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT) } },
-      }
-    },
-    {
-      MaterialDefinition::ALBEDO | MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS |
-        MaterialDefinition::NORMAL | MaterialDefinition::GLTF_CHANNELS,
-      0,
-      Vector4(1.f, .766f, .336f, 1.f),
-      1.f,
-      0.f,
-      {
-        { MaterialDefinition::ALBEDO,
-          { "AnimatedCube_BaseColor.png",
-            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT) } },
-        { MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS | MaterialDefinition::GLTF_CHANNELS,
-          { "AnimatedCube_MetallicRoughness.png",
-            SamplerFlags::Encode(FilterMode::NEAREST_MIPMAP_LINEAR, FilterMode::NEAREST, WrapMode::CLAMP_TO_EDGE, WrapMode::MIRRORED_REPEAT) } },
-        { MaterialDefinition::NORMAL,
-          { "AnimatedCube_BaseColor.png",
-            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT) } },
-      }
-    },
-  };
-
-  auto iMaterial = materials.begin();
-  for (auto& m : materialGroundTruth)
-  {
-    printf("material %ld\n", iMaterial - materials.begin());
-    auto& md = iMaterial->first;
-    DALI_TEST_EQUAL(md.mFlags, m.mFlags);
-    DALI_TEST_EQUAL(md.mEnvironmentIdx, m.mEnvironmentIdx);
-    DALI_TEST_EQUAL(md.mColor, m.mColor);
-    DALI_TEST_EQUAL(md.mMetallic, m.mMetallic);
-    DALI_TEST_EQUAL(md.mRoughness, m.mRoughness);
-
-    DALI_TEST_EQUAL(md.mTextureStages.size(), m.mTextureStages.size());
-    auto iTexture = md.mTextureStages.begin();
-    for (auto& ts: m.mTextureStages)
-    {
-      printf("texture %ld\n", iTexture - md.mTextureStages.begin());
-      DALI_TEST_EQUAL(iTexture->mSemantic, ts.mSemantic);
-      DALI_TEST_EQUAL(iTexture->mTexture.mImageUri, ts.mTexture.mImageUri);
-      DALI_TEST_EQUAL(uint32_t(iTexture->mTexture.mSamplerFlags), uint32_t(ts.mTexture.mSamplerFlags)); // don't interpret it as a character
-      ++iTexture;
-    }
-    ++iMaterial;
-  }
-
-  auto& meshes = ctx.resources.mMeshes;
-  DALI_TEST_EQUAL(2u, meshes.size());
-
-  using Blob = MeshDefinition::Blob;
-  using Accessor = MeshDefinition::Accessor;
-  const MeshDefinition meshGroundTruth[] {
-    {
-      0,
-      Geometry::TRIANGLES,
-      "AnimatedCube.bin",
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-    },
-    {
-      0,
-      Geometry::TRIANGLES,
-      "AnimatedCube.bin",
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-      Accessor{ Blob{ 0, 0 }, {} },
-    },
-  };
-
-  auto iMesh = meshes.begin();
-  for (auto& m : meshGroundTruth)
-  {
-    printf("mesh %ld\n", iMesh - meshes.begin());
-
-    auto& md = iMesh->first;
-    DALI_TEST_EQUAL(md.mFlags, m.mFlags);
-    DALI_TEST_EQUAL(md.mPrimitiveType, m.mPrimitiveType);
-    for (auto mp: {
-      &MeshDefinition::mIndices,
-      &MeshDefinition::mPositions,
-      &MeshDefinition::mNormals,
-      &MeshDefinition::mTexCoords,
-      &MeshDefinition::mTangents,
-      &MeshDefinition::mJoints0,
-      &MeshDefinition::mWeights0
-    })
-    {
-      DALI_TEST_EQUAL((md.*mp).IsDefined(), (m.*mp).IsDefined());
-      DALI_TEST_EQUAL((md.*mp).mBlob.IsDefined(), (m.*mp).mBlob.IsDefined());
-    }
-
-    DALI_TEST_EQUAL(md.mBlendShapeHeader.IsDefined(), m.mBlendShapeHeader.IsDefined());
-
-    ++iMesh;
-  }
-
-  DALI_TEST_EQUAL(2u, ctx.resources.mShaders.size());
-  DALI_TEST_EQUAL(0u, ctx.resources.mSkeletons.size());
-
-  DALI_TEST_EQUAL(3u, ctx.cameras.size());
-  DALI_TEST_EQUAL(0u, ctx.lights.size());
-  DALI_TEST_EQUAL(1u, ctx.animations.size());
-  DALI_TEST_EQUAL(0u, ctx.animationGroups.size());
-
-  END_TEST;
-}
-
-int UtcDaliGltfLoaderSuccessShort(void)
-{
-  TestApplication app;
-
-  const std::string resourcePath = TEST_RESOURCE_DIR "/";
-  auto pathProvider = [resourcePath](ResourceType::Value) {
-    return resourcePath;
-  };
-
-  Customization::Choices choices;
-  for (auto modelName : {
-    "2CylinderEngine",
-    "AnimatedMorphCube",
-    "AnimatedMorphSphere",
-    "AnimatedTriangle",
-    "BoxAnimated",
-    "CesiumMan",
-    "CesiumMilkTruck",
-    "EnvironmentTest",
-    "MetalRoughSpheres",
-    "MorphPrimitivesTest",
-    "SimpleSparseAccessor",
-  })
-  {
-    Context ctx;
-
-    ShaderDefinitionFactory sdf;
-
-    auto& resources = ctx.resources;
-    resources.mEnvironmentMaps.push_back({});
-
-    sdf.SetResources(resources);
-
-    printf("%s\n", modelName);
-    LoadGltfScene(resourcePath + modelName + ".gltf", sdf, ctx.loadResult);
-    DALI_TEST_CHECK(ctx.scene.GetNodeCount() > 0);
-
-    auto& scene = ctx.scene;
-    for (auto iRoot : scene.GetRoots())
-    {
-      struct Visitor: NodeDefinition::IVisitor
-      {
-        struct ResourceReceiver: IResourceReceiver
-        {
-          std::vector<bool> mCounts;
-
-          void Register(ResourceType::Value type, Index id) override
-          {
-            if (type == ResourceType::Mesh)
-            {
-              mCounts[id] = true;
-            }
-          }
-        } receiver;
-
-        void Start(NodeDefinition& n) override
-        {
-          if (n.mRenderable)
-          {
-            n.mRenderable->RegisterResources(receiver);
-          }
-        }
-
-        void Finish(NodeDefinition& n) override
-        {}
-      } visitor;
-      visitor.receiver.mCounts.resize(resources.mMeshes.size(), false);
-
-      scene.Visit(iRoot, choices, visitor);
-      for (uint32_t i0 = 0, i1 = resources.mMeshes.size(); i0 < i1; ++i0)
-      {
-        if (visitor.receiver.mCounts[i0])
-        {
-          auto raw = resources.mMeshes[i0].first.LoadRaw(resourcePath);
-          DALI_TEST_CHECK(!raw.mAttribs.empty());
-
-          resources.mMeshes[i0].second = resources.mMeshes[i0].first.Load(std::move(raw));
-          DALI_TEST_CHECK(resources.mMeshes[i0].second.geometry);
-        }
-      }
-    }
-  }
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-KtxLoader.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-KtxLoader.cpp
deleted file mode 100644
index 783745d..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-KtxLoader.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/ktx-loader.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-#include <fstream>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliKtxLoaderFailNonexistent(void)
-{
-  CubeData data;
-  DALI_TEST_CHECK(!LoadCubeMapData("non-existent.ktx", data));
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderFailInvalid1(void)
-{
-  CubeData data;
-  DALI_TEST_CHECK(!LoadCubeMapData(TEST_RESOURCE_DIR "/invalid.svg", data)); // file smaller than KTX header
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderFailInvalid2(void)
-{
-  CubeData data;
-  DALI_TEST_CHECK(!LoadCubeMapData(TEST_RESOURCE_DIR "/anim.gif", data)); // not a KTX
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderFailTruncated(void)
-{
-  CubeData data;
-  DALI_TEST_CHECK(!LoadCubeMapData(TEST_RESOURCE_DIR "/truncated.ktx", data));
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderSuccess(void)
-{
-  CubeData cubeData;
-  auto path = TEST_RESOURCE_DIR "/forest_radiance.ktx";
-  DALI_TEST_CHECK(LoadCubeMapData(path, cubeData));
-
-  DALI_TEST_EQUAL(6u, cubeData.data.size());
-  for (auto& face: cubeData.data)
-  {
-    uint32_t size = 64;
-    for (auto& mipData: face)
-    {
-      DALI_TEST_EQUAL(size, mipData.GetWidth());
-      DALI_TEST_EQUAL(size, mipData.GetHeight());
-      DALI_TEST_EQUAL(Pixel::Format::RGB888, mipData.GetPixelFormat());
-      size /= 2;
-    }
-  }
-
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderFormats(void)
-{
-  auto resPath = TEST_RESOURCE_DIR "/";
-#define FORMAT_PATH(x) { #x, Pixel::x }
-#define FORMAT_COMPRESSED_PATH(x) { #x, Pixel::COMPRESSED_ ## x ## _KHR }
-  std::pair<std::string, Pixel::Format> pathFormats[] {
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_4x4),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_5x4),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_5x5),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_6x5),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_6x6),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_8x5),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_8x6),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_8x8),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_10x5),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_10x6),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_10x10),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_12x10),
-    FORMAT_COMPRESSED_PATH(RGBA_ASTC_12x12),
-    FORMAT_PATH(RGB16F),
-    FORMAT_PATH(RGB32F),
-    FORMAT_PATH(RGBA8888),
-  };
-  for (auto i : pathFormats)
-  {
-    CubeData cubeData;
-    DALI_TEST_CHECK(LoadCubeMapData(resPath + i.first + ".ktx", cubeData));
-    DALI_TEST_EQUAL(cubeData.data[0][0].GetPixelFormat(), i.second);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderCubeDataCreateTexture1(void)
-{
-  uint32_t pixelBufferSize = 3;
-  uint8_t* pixelBuffer = new uint8_t[pixelBufferSize];
-
-  CubeData cubeData;
-  cubeData.data.push_back({});
-
-  auto pixelData = PixelData::New(pixelBuffer, pixelBufferSize, 1, 1, Pixel::Format::RGB888, PixelData::DELETE_ARRAY);
-  cubeData.data[0].push_back(pixelData);
-
-  TestApplication app;
-  auto texture = cubeData.CreateTexture();
-
-  DALI_TEST_CHECK(texture);
-  DALI_TEST_EQUAL(1u, texture.GetWidth());
-  DALI_TEST_EQUAL(1u, texture.GetHeight());
-
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderCubeDataCreateTexture2(void)
-{
-  CubeData cubeData;
-  auto path = TEST_RESOURCE_DIR "/forest_radiance.ktx";
-  DALI_TEST_CHECK(LoadCubeMapData(path, cubeData));
-
-  TestApplication app;
-  auto texture = cubeData.CreateTexture();
-
-  DALI_TEST_CHECK(texture);
-  DALI_TEST_EQUAL(64u, texture.GetWidth());
-  DALI_TEST_EQUAL(64u, texture.GetHeight());
-
-  END_TEST;
-}
-
-int UtcDaliKtxLoaderCubeDataCreateTexture3(void)
-{
-  CubeData cubeData;
-  auto path = TEST_RESOURCE_DIR "/papermill_E_diffuse-64.ktx";
-  DALI_TEST_CHECK(LoadCubeMapData(path, cubeData));
-
-  TestApplication app;
-  auto texture = cubeData.CreateTexture();
-
-  DALI_TEST_CHECK(texture);
-  DALI_TEST_EQUAL(64u, texture.GetWidth());
-  DALI_TEST_EQUAL(64u, texture.GetHeight());
-
-  END_TEST;
-
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-MatrixStack.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-MatrixStack.cpp
deleted file mode 100644
index 776ded7..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-MatrixStack.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/matrix-stack.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliMatrixStack(void)
-{
-  MatrixStack stack;
-  DALI_TEST_CHECK(stack.IsEmpty());
-
-  Matrix testMatrix;
-  testMatrix.SetTransformComponents(Vector3::ONE * 5.f,
-    Quaternion(Radian(Degree(-45.f)), Vector3::XAXIS),
-    Vector3(100.f, 0.f, -200.f));
-
-  stack.Push(testMatrix);
-  DALI_TEST_CHECK(!stack.IsEmpty());
-  DALI_TEST_EQUAL(stack.Top(), testMatrix);
-
-  stack.Push(Matrix::IDENTITY);
-  DALI_TEST_CHECK(!stack.IsEmpty());
-  DALI_TEST_EQUAL(stack.Top(), testMatrix);
-
-  stack.Push(testMatrix);
-
-  Matrix testMatrix2;
-  Matrix::Multiply(testMatrix2, testMatrix, testMatrix);
-  DALI_TEST_CHECK(!stack.IsEmpty());
-  DALI_TEST_EQUAL(stack.Top(), testMatrix2);
-
-  stack.PopAll();
-  DALI_TEST_CHECK(stack.IsEmpty());
-
-  stack.Push(Matrix::IDENTITY);
-  DALI_TEST_EQUAL(stack.Top(), Matrix::IDENTITY);
-
-  stack.Push(testMatrix);
-  DALI_TEST_EQUAL(stack.Top(), testMatrix);
-
-  stack.Pop();
-  DALI_TEST_EQUAL(stack.Top(), Matrix::IDENTITY);
-  DALI_TEST_CHECK(!stack.IsEmpty());
-
-  stack.Pop();
-  DALI_TEST_CHECK(stack.IsEmpty());
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-MeshDefinition.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-MeshDefinition.cpp
deleted file mode 100644
index 37c170b..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-MeshDefinition.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <vector>
-
-#include "dali-scene-loader/public-api/mesh-definition.h"
-#include <dali-test-suite-utils.h>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliMeshDefinitionBlobApplyMinMaxBothMinMaxApplied(void)
-{
-  using Container = std::vector<float>;
-
-  Container buffer = { 4.0f, 6.0f, 8.0f, 10.0f, 12.0f };
-  Container minValues = { 5.0f };
-  Container maxValues = { 10.0f };
-  Container result = {5.0f, 6.0f, 8.0f, 10.0f, 10.0f};
-
-  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
-
-  for( auto i = 0u; i < result.size(); ++i)
-  {
-    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliMeshDefinitionBlobApplyMinMaxOnlyMin(void)
-{
-  using Container = std::vector<float>;
-
-  Container buffer = { 4.0f, 6.0f, 8.0f, 10.0f, 12.0f };
-  Container minValues = { 5.0f };
-  Container maxValues = {};
-  Container result = {5.0f, 6.0f, 8.0f, 10.0f, 12.0f};
-
-  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
-
-  for( auto i = 0u; i < result.size(); ++i)
-  {
-    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliMeshDefinitionBlobApplyMinMaxOnlyMax(void)
-{
-  using Container = std::vector<float>;
-
-  Container buffer = { 4.0f, 6.0f, 8.0f, 10.0f, 12.0f };
-  Container minValues = { };
-  Container maxValues = { 10.0f };
-  Container result = {4.0f, 6.0f, 8.0f, 10.0f, 10.0f};
-
-  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
-
-  for( auto i = 0u; i < result.size(); ++i)
-  {
-    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliMeshDefinitionBlobApplyMinMaxBothEmpty(void)
-{
-  using Container = std::vector<float>;
-
-  Container buffer = { 4.0f, 6.0f, 8.0f, 10.0f, 12.0f };
-  Container minValues;
-  Container maxValues;
-  Container result = {4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
-
-  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
-
-  for( auto i = 0u; i < result.size(); ++i)
-  {
-    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
-  }
-
-  END_TEST;
-}
-
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-NodeDefinition.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-NodeDefinition.cpp
deleted file mode 100644
index 7f1a7cf..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-NodeDefinition.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/node-definition.h"
-#include "dali-scene-loader/public-api/view-projection.h"
-#include <toolkit-test-application.h>
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-namespace
-{
-
-struct Context
-{
-  ResourceBundle resources;
-
-  ViewProjection viewProjection;
-  Transforms transforms { MatrixStack{}, viewProjection };
-
-  NodeDefinition::CreateParams createParams {
-    resources,
-    transforms
-  };
-};
-
-}
-
-int UtcDaliConstraintDefinitionsCompare(void)
-{
-  ConstraintDefinition cd1{ "orientation", 0 };
-  ConstraintDefinition cd2{ "position", 1 };
-
-  DALI_TEST_CHECK(cd1 < cd2);
-  DALI_TEST_CHECK(!(cd2 < cd1));
-  DALI_TEST_CHECK(!(cd1 < cd1));
-  DALI_TEST_CHECK(!(cd2 < cd2));
-
-  DALI_TEST_CHECK(cd1 == cd1);
-  DALI_TEST_CHECK(cd2 == cd2);
-
-  ConstraintDefinition cd3{ "position", 0 };
-  ConstraintDefinition cd4{ "scale", 1 };
-  ConstraintDefinition cd5{ "position", 1 };
-  DALI_TEST_CHECK(cd2 != cd3);
-  DALI_TEST_CHECK(cd2 != cd4);
-  DALI_TEST_CHECK(cd2 == cd5);
-  DALI_TEST_CHECK(cd5 == cd2);
-
-  END_TEST;
-}
-
-int UtcDaliBlendshapeShaderConfigurationRequestsCompare(void)
-{
-  TestApplication app;
-  BlendshapeShaderConfigurationRequest bsscr1{ "", 0, Shader(nullptr) };
-
-  BlendshapeShaderConfigurationRequest bsscr2{ "", 0, Shader::New(
-    "void main(){ gl_Position = vec4(0.); }",
-    "void main(){ gl_FragColor = vec4(1.); }"
-  ) };
-
-  DALI_TEST_CHECK(bsscr1 < bsscr2);
-  DALI_TEST_CHECK(!(bsscr2 < bsscr1));
-  DALI_TEST_CHECK(!(bsscr1 < bsscr1));
-  DALI_TEST_CHECK(!(bsscr2 < bsscr2));
-
-  END_TEST;
-}
-
-int UtcDaliNodeDefinitionExtrasCompare(void)
-{
-  NodeDefinition::Extra e1{ "alpha", Vector3::XAXIS * 2.f };
-  NodeDefinition::Extra e2{ "beta", 8 };
-
-  DALI_TEST_CHECK(e1 < e2);
-  DALI_TEST_CHECK(!(e1 < e1));
-  DALI_TEST_CHECK(!(e2 < e1));
-  DALI_TEST_CHECK(!(e2 < e2));
-
-  END_TEST;
-}
-
-int UtcDaliNodeDefinitionProperties(void)
-{
-  TestApplication testApp;
-  NodeDefinition nodeDef{
-    "testRootNode",
-    Vector3{ -100.f, 100.f, -500.f },
-    Quaternion{ Radian(Degree(45.f)), Vector3::ZAXIS },
-    Vector3{ 2.f, 4.f, 8.f },
-    Vector3{ 100.f, 50.f, 25.f },
-    false,
-  };
-
-  Quaternion frobnicateFactor(0.f, 1.f, 2.f, 3.f);
-  frobnicateFactor.Normalize(); // because it will be (by DALi) once it's set as a property.
-  nodeDef.mExtras.push_back(NodeDefinition::Extra{ "frobnicateFactor", frobnicateFactor });
-
-  Context ctx;
-  auto actor = nodeDef.CreateActor(ctx.createParams);
-  DALI_TEST_EQUAL(nodeDef.mName, actor.GetProperty(Actor::Property::NAME).Get<std::string>());
-  DALI_TEST_EQUAL(nodeDef.mPosition, actor.GetProperty(Actor::Property::POSITION).Get<Vector3>());
-  DALI_TEST_EQUAL(nodeDef.mOrientation, actor.GetProperty(Actor::Property::ORIENTATION).Get<Quaternion>());
-  DALI_TEST_EQUAL(nodeDef.mScale, actor.GetProperty(Actor::Property::SCALE).Get<Vector3>());
-  DALI_TEST_EQUAL(nodeDef.mSize, actor.GetProperty(Actor::Property::SIZE).Get<Vector3>());
-  DALI_TEST_EQUAL(nodeDef.mIsVisible, actor.GetProperty(Actor::Property::VISIBLE).Get<bool>());
-
-  Property::Index propFrobnicateFactor = actor.GetPropertyIndex("frobnicateFactor");
-  DALI_TEST_CHECK(propFrobnicateFactor != Property::INVALID_INDEX);
-
-  auto frobnicateFactorValue = actor.GetProperty(propFrobnicateFactor);
-  DALI_TEST_EQUAL(Property::ROTATION, frobnicateFactorValue.GetType());
-  DALI_TEST_EQUAL(frobnicateFactorValue.Get<Quaternion>(), frobnicateFactor);
-
-  DALI_TEST_EQUAL(0, actor.GetChildCount());
-  DALI_TEST_EQUAL(0, actor.GetRendererCount());
-
-  END_TEST;
-}
-
-int UtcDaliNodeDefinitionRenderableRegisterResources(void)
-{
-  NodeDefinition nodeDef;
-
-  auto renderable = new NodeDefinition::Renderable();
-  renderable->mShaderIdx = 0;
-  nodeDef.mRenderable.reset(renderable);
-
-  struct : IResourceReceiver
-  {
-    std::vector<Index> shaders;
-    uint32_t otherResources = 0;
-
-    void Register(ResourceType::Value type, Index id) override
-    {
-      switch(type)
-      {
-      case ResourceType::Shader:
-        shaders.push_back(id);
-        break;
-
-      default:
-        ++otherResources;
-      }
-    }
-  } resourceReceiver;
-
-  nodeDef.mRenderable->RegisterResources(resourceReceiver);
-  DALI_TEST_EQUAL(1u, resourceReceiver.shaders.size());
-  DALI_TEST_EQUAL(0, resourceReceiver.shaders[0]);
-  DALI_TEST_EQUAL(0, resourceReceiver.otherResources);
-
-  END_TEST;
-}
-
-int UtcDaliNodeDefinitionRenderableReflectResources(void)
-{
-  NodeDefinition nodeDef;
-
-  auto renderable = new NodeDefinition::Renderable();
-  renderable->mShaderIdx = 0;
-  nodeDef.mRenderable.reset(renderable);
-
-  struct : IResourceReflector
-  {
-    std::vector<Index*> shaders;
-    uint32_t otherResources = 0;
-
-    void Reflect(ResourceType::Value type, Index& id) override
-    {
-      switch(type)
-      {
-      case ResourceType::Shader:
-        shaders.push_back(&id);
-        break;
-
-      default:
-        ++otherResources;
-      }
-    }
-  } resourceReflector;
-
-  nodeDef.mRenderable->ReflectResources(resourceReflector);
-  DALI_TEST_EQUAL(1u, resourceReflector.shaders.size());
-  DALI_TEST_EQUAL(&renderable->mShaderIdx, resourceReflector.shaders[0]);
-  DALI_TEST_EQUAL(0, resourceReflector.otherResources);
-
-  END_TEST;
-}
-
-int UtcDaliNodeDefinitionRenderable(void)
-{
-  TestApplication testApp;
-  NodeDefinition nodeDef;
-
-  auto renderable = new NodeDefinition::Renderable();
-  renderable->mShaderIdx = 0;
-  nodeDef.mRenderable.reset(renderable);
-
-  Context ctx;
-  const auto VSH = "void main() { gl_Position = vec4(0.); }";
-  const auto FSH = "void main() { gl_FragColor = vec4(1.); }";
-  auto shader = Shader::New(VSH, FSH);
-  ctx.resources.mShaders.push_back({ ShaderDefinition{}, shader });
-
-  auto actor = nodeDef.CreateActor(ctx.createParams);
-  DALI_TEST_EQUAL(1, actor.GetRendererCount());
-
-  auto renderer = actor.GetRendererAt(0);
-  DALI_TEST_EQUAL(renderer.GetShader(), shader);
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-RendererState.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-RendererState.cpp
deleted file mode 100644
index a6f6251..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-RendererState.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/renderer-state.h"
-#include "dali-scene-loader/public-api/parse-renderer-state.h"
-#include "dali-scene-loader/public-api/utils.h"
-#include <dali-test-suite-utils.h>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-namespace sl = SceneLoader;
-namespace rs = RendererState;
-
-int UtcDaliRendererStateFromBlendFactors(void)
-{
-  rs::Type state = rs::FromBlendFactors(sl::BlendFactor::ZERO, sl::BlendFactor::ONE,
-    sl::BlendFactor::SRC_COLOR, sl::BlendFactor::ONE_MINUS_SRC_COLOR);
-
-  DALI_TEST_EQUAL((state >> rs::BLEND_FACTOR_BASE_SHIFT) & rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::ZERO));
-  DALI_TEST_EQUAL((state >> (rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS)) &
-    rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::ONE));
-  DALI_TEST_EQUAL((state >> (rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 2)) &
-    rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::SRC_COLOR));
-  DALI_TEST_EQUAL((state >> (rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 3)) &
-    rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::ONE_MINUS_SRC_COLOR));
-
-  END_TEST;
-}
-
-#define HELP_TEST_RENDERER_STATE(property, resetValue, state, checkValue, renderer)\
-  renderer.SetProperty(property, ~(resetValue));\
-  rs::Apply((state), (renderer));\
-  printf("%s %s vs %s\n", #property, #state, #checkValue);\
-  DALI_TEST_EQUAL(renderer.GetProperty(property).Get<decltype(checkValue)>(), (checkValue));
-
-int UtcDaliRendererStateApply(void)
-{
-  TestApplication app;
-  auto vsh = "void main() { gl_Position = vec4(0.); }";
-  auto fsh = "void main() { gl_FragColor = vec4(1.); }";
-  Geometry geom = Geometry::New();
-  Shader shader = Shader::New(vsh, fsh);
-  Renderer renderer = Renderer::New(geom, shader);
-
-  HELP_TEST_RENDERER_STATE(Renderer::Property::DEPTH_WRITE_MODE, DepthWriteMode::OFF, rs::DEPTH_WRITE, DepthWriteMode::ON, renderer);
-  HELP_TEST_RENDERER_STATE(Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::OFF, rs::DEPTH_TEST, DepthTestMode::ON, renderer);
-
-  HELP_TEST_RENDERER_STATE(Renderer::Property::BLEND_MODE, BlendMode::OFF, rs::ALPHA_BLEND, BlendMode::ON, renderer);
-
-  HELP_TEST_RENDERER_STATE(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::NONE, rs::CULL_FRONT, FaceCullingMode::FRONT, renderer);
-  HELP_TEST_RENDERER_STATE(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::NONE, rs::CULL_BACK, FaceCullingMode::BACK, renderer);
-  HELP_TEST_RENDERER_STATE(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::NONE, rs::CULL_FRONT | rs::CULL_BACK,
-    FaceCullingMode::FRONT_AND_BACK, renderer);
-
-#define DEPTH_FUNC_PAIR(x) { Comparison::x << rs::DEPTH_FUNCTION_SHIFT, DepthFunction::x }
-  const std::pair<rs::Type, DepthFunction::Type> depthFunctionPairs[] {
-    DEPTH_FUNC_PAIR(NEVER),
-    DEPTH_FUNC_PAIR(ALWAYS),
-    DEPTH_FUNC_PAIR(LESS),
-    DEPTH_FUNC_PAIR(GREATER),
-    DEPTH_FUNC_PAIR(EQUAL),
-    DEPTH_FUNC_PAIR(NOT_EQUAL),
-    DEPTH_FUNC_PAIR(LESS_EQUAL),
-    DEPTH_FUNC_PAIR(GREATER_EQUAL),
-  };
-#undef DEPTH_FUNC_PAIR
-  for (auto& p : depthFunctionPairs)
-  {
-    HELP_TEST_RENDERER_STATE(Renderer::Property::DEPTH_FUNCTION, DepthFunction::LESS, p.first, p.second, renderer);
-  }
-
-#define BLEND_FACTOR_PAIR(x) { sl::BlendFactor::x, BlendFactor::x }
-  const std::pair<rs::Type, BlendFactor::Type> BLEND_FACTORS[] {
-    BLEND_FACTOR_PAIR(ZERO),
-    BLEND_FACTOR_PAIR(ONE),
-    BLEND_FACTOR_PAIR(SRC_COLOR),
-    BLEND_FACTOR_PAIR(ONE_MINUS_SRC_COLOR),
-    BLEND_FACTOR_PAIR(SRC_ALPHA),
-    BLEND_FACTOR_PAIR(ONE_MINUS_SRC_ALPHA),
-    BLEND_FACTOR_PAIR(DST_COLOR),
-    BLEND_FACTOR_PAIR(ONE_MINUS_DST_COLOR),
-    BLEND_FACTOR_PAIR(DST_ALPHA),
-    BLEND_FACTOR_PAIR(ONE_MINUS_DST_ALPHA),
-    BLEND_FACTOR_PAIR(SRC_ALPHA_SATURATE),
-    BLEND_FACTOR_PAIR(CONSTANT_COLOR),
-    BLEND_FACTOR_PAIR(ONE_MINUS_CONSTANT_COLOR),
-    BLEND_FACTOR_PAIR(CONSTANT_ALPHA),
-    BLEND_FACTOR_PAIR(ONE_MINUS_CONSTANT_ALPHA),
-  };
-#undef BLEND_FACTOR_PAIR
-  for (auto property: {
-    Renderer::Property::BLEND_FACTOR_SRC_RGB,
-    Renderer::Property::BLEND_FACTOR_DEST_RGB,
-    Renderer::Property::BLEND_FACTOR_SRC_ALPHA,
-    Renderer::Property::BLEND_FACTOR_DEST_ALPHA,
-  })
-  {
-    const auto itemShift = rs::BLEND_FACTOR_ITEM_BITS * (property - Renderer::Property::BLEND_FACTOR_SRC_RGB);
-    const auto shift = rs::BLEND_FACTOR_BASE_SHIFT + itemShift;
-    for (auto& value: BLEND_FACTORS)
-    {
-      HELP_TEST_RENDERER_STATE(property, BlendFactor::ZERO, value.first << shift, value.second, renderer);
-    }
-  }
-
-#define RENDER_MODE_PAIR(x) { BufferMode::x << rs::BUFFER_MODE_SHIFT, RenderMode::x }
-  std::pair<rs::Type, RenderMode::Type> renderModePairs[] {
-    // same as our reset value: RENDER_MODE_PAIR(NONE),
-    RENDER_MODE_PAIR(AUTO),
-    RENDER_MODE_PAIR(COLOR),
-    RENDER_MODE_PAIR(STENCIL),
-    RENDER_MODE_PAIR(COLOR_STENCIL),
-  };
-#undef RENDER_MODE_PAIR
-  for (auto& p: renderModePairs)
-  {
-    HELP_TEST_RENDERER_STATE(Renderer::Property::RENDER_MODE, RenderMode::NONE, p.first, p.second, renderer);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliRendererStateParseEmpty(void)
-{
-  std::string error;
-  auto onError = [&](const std::string& e) { error = e; };
-
-  DALI_TEST_EQUAL(rs::Parse("", 0, onError), uint32_t(rs::NONE));
-  DALI_TEST_CHECK(error.empty());
-  END_TEST;
-}
-
-int UtcDaliRendererStateParseInvalid(void)
-{
-  std::string error;
-  auto onError = [&](const std::string& e) { error = e; };
-
-  DALI_TEST_EQUAL(rs::Parse("definitelyNotAValidRendererState", 0, onError), uint32_t(rs::NONE));
-  DALI_TEST_CHECK(strstr(error.c_str(), "Not a valid RendererState") != nullptr);
-  END_TEST;
-}
-
-namespace
-{
-struct Option
-{
-  std::string_view name;
-  rs::Type expected;
-
-  void Apply(std::ostream& stream, uint8_t shift, uint32_t& result) const
-  {
-    stream << name;
-    result |= expected << shift;
-  }
-};
-
-struct StateGenerator
-{
-  std::string_view name;
-
-  uint8_t shift;
-  std::vector<Option> permutations;
-};
-
-#define STRING_STATE_PAIR(x, y) { #x, y::x }
-const decltype(StateGenerator::permutations) BLEND_FACTORS {
-  { "", sl::BlendFactor::OMIT },
-  STRING_STATE_PAIR(ZERO, sl::BlendFactor),
-  STRING_STATE_PAIR(ONE, sl::BlendFactor),
-  STRING_STATE_PAIR(SRC_COLOR, sl::BlendFactor),
-  STRING_STATE_PAIR(ONE_MINUS_SRC_COLOR, sl::BlendFactor),
-  STRING_STATE_PAIR(SRC_ALPHA, sl::BlendFactor),
-  STRING_STATE_PAIR(ONE_MINUS_SRC_ALPHA, sl::BlendFactor),
-  STRING_STATE_PAIR(DST_COLOR, sl::BlendFactor),
-  STRING_STATE_PAIR(ONE_MINUS_DST_COLOR, sl::BlendFactor),
-  STRING_STATE_PAIR(DST_ALPHA, sl::BlendFactor),
-  STRING_STATE_PAIR(ONE_MINUS_DST_ALPHA, sl::BlendFactor),
-  STRING_STATE_PAIR(SRC_ALPHA_SATURATE, sl::BlendFactor),
-  STRING_STATE_PAIR(CONSTANT_COLOR, sl::BlendFactor),
-  STRING_STATE_PAIR(ONE_MINUS_CONSTANT_COLOR, sl::BlendFactor),
-  STRING_STATE_PAIR(CONSTANT_ALPHA, sl::BlendFactor),
-  STRING_STATE_PAIR(ONE_MINUS_CONSTANT_ALPHA, sl::BlendFactor),
-};
-
-const StateGenerator PERMUTATORS[] {
-  { "DEPTH_FUNC:", rs::DEPTH_FUNCTION_SHIFT, {
-    { "", Comparison::OMIT },
-    STRING_STATE_PAIR(NEVER, Comparison),
-    STRING_STATE_PAIR(ALWAYS, Comparison),
-    STRING_STATE_PAIR(LESS, Comparison),
-    STRING_STATE_PAIR(GREATER, Comparison),
-    STRING_STATE_PAIR(EQUAL, Comparison),
-    STRING_STATE_PAIR(NOT_EQUAL, Comparison),
-    STRING_STATE_PAIR(LESS_EQUAL, Comparison),
-    STRING_STATE_PAIR(GREATER_EQUAL, Comparison),
-  } },
-  { "BLEND_SRC_RGB:", rs::BLEND_FACTOR_BASE_SHIFT, BLEND_FACTORS },
-  { "BLEND_DST_RGB:", rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS, BLEND_FACTORS  },
-  { "BLEND_SRC_ALPHA:", rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 2, BLEND_FACTORS },
-  { "BLEND_DST_ALPHA:", rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 3, BLEND_FACTORS },
-  { "BUFFER_MODE:", rs::BUFFER_MODE_SHIFT, {
-    { "", BufferMode::OMIT },
-    STRING_STATE_PAIR(NONE, BufferMode),
-    STRING_STATE_PAIR(AUTO, BufferMode),
-    STRING_STATE_PAIR(COLOR, BufferMode),
-    STRING_STATE_PAIR(STENCIL, BufferMode),
-    STRING_STATE_PAIR(COLOR_STENCIL, BufferMode),
-  } },
-  // binary options
-  { "", 0, { STRING_STATE_PAIR(DEPTH_WRITE, rs) } },
-  { "", 0, { STRING_STATE_PAIR(DEPTH_TEST, rs) } },
-  { "", 0, { STRING_STATE_PAIR(CULL_FRONT, rs) } },
-  { "", 0, { STRING_STATE_PAIR(CULL_BACK, rs) } },
-  { "", 0, { STRING_STATE_PAIR(ALPHA_BLEND, rs) } },
-};
-
-#undef STRING_STATE_PAIR
-}
-
-int UtcDaliRendererStateParseIndividual(void)
-{
-  std::string error;
-  auto onError = [&](const std::string& e) { error = e; };
-
-  char buffer[512] {};
-  for (auto& p: PERMUTATORS)
-  {
-    for (auto& o: p.permutations)
-    {
-      StreamBuffer streamBuf(buffer, sizeof(buffer));
-      std::ostream stream(&streamBuf);
-
-      stream << p.name;
-
-      uint32_t expected = 0x0;
-      o.Apply(stream, p.shift, expected);
-      stream << '\0';
-
-      printf("%s -> %d\n", buffer, expected);
-      DALI_TEST_EQUAL(rs::Parse(buffer, 0, onError), expected);
-      DALI_TEST_CHECK(error.empty());
-    }
-  }
-
-  END_TEST;
-}
-
-int UtcDaliRendererStateParseCombined(void)
-{
-  constexpr uint32_t count = std::extent<decltype(PERMUTATORS)>::value;
-  constexpr uint32_t prime = 13;
-  static_assert(prime > count);
-  constexpr uint32_t skip = 3 * count * count + 7 * count + 1;
-  static_assert(skip % prime != 0);
-
-  std::string error;
-  auto onError = [&](const std::string& e) { error = e; };
-
-  std::vector<rs::Type> expectedValues;
-
-  char buffer[512] {};
-  for (uint32_t i = 0; i < count; ++i)
-  {
-    StreamBuffer streamBuf(buffer, sizeof(buffer));
-    std::ostream stream(&streamBuf);
-
-    uint32_t expected = 0x0;
-
-    uint32_t iTmp = i;
-    for (uint32_t j = 0; j < count; ++j)
-    {
-      iTmp = (iTmp + skip) % count;
-      DALI_TEST_CHECK(iTmp < count);
-
-      if (expected)
-      {
-        stream << "|";
-      }
-
-      auto& perm = PERMUTATORS[iTmp];
-      stream << perm.name;
-      perm.permutations.back().Apply(stream, perm.shift, expected);
-    }
-
-    stream << '\0';
-
-    DALI_TEST_EQUAL(rs::Parse(buffer, 0, onError), expected);
-    DALI_TEST_CHECK(error.empty());
-
-    auto iFind = std::lower_bound(expectedValues.begin(), expectedValues.end(), expected);
-    if (iFind == expectedValues.end() || *iFind != expected)
-    {
-      expectedValues.insert(iFind, expected);
-    }
-    DALI_TEST_EQUAL(expectedValues.size(), 1u);
-  }
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-ResourceBundle.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-ResourceBundle.cpp
deleted file mode 100644
index 8f03828..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-ResourceBundle.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/resource-bundle.h"
-#include "dali-scene-loader/public-api/utils.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliResourceRefCounts(void)
-{
-  ResourceBundle resourceBundle;
-  resourceBundle.mEnvironmentMaps.resize(4);
-  resourceBundle.mShaders.resize(13);
-  resourceBundle.mMeshes.resize(17);
-  resourceBundle.mMaterials.resize(19);
-
-  int i = 0;
-  std::vector<int> testEnvironmentReferences(resourceBundle.mEnvironmentMaps.size());
-  for (auto& m : resourceBundle.mMaterials)
-  {
-    Index iEnv = 0;
-    iEnv += (i % 3) == 0;
-    iEnv += ((i % 4) == 0) * 2;
-    m.first.mEnvironmentIdx = iEnv;
-
-    printf("%d : %d, ", i, iEnv);
-
-    ++testEnvironmentReferences[iEnv];
-    ++i;
-  }
-
-  auto counter = resourceBundle.CreateRefCounter();
-  DALI_TEST_EQUAL(counter[ResourceType::Environment].Size(), resourceBundle.mEnvironmentMaps.size());
-  DALI_TEST_EQUAL(counter[ResourceType::Shader].Size(), resourceBundle.mShaders.size());
-  DALI_TEST_EQUAL(counter[ResourceType::Mesh].Size(), resourceBundle.mMeshes.size());
-  DALI_TEST_EQUAL(counter[ResourceType::Material].Size(), resourceBundle.mMaterials.size());
-
-  std::fill(counter[ResourceType::Material].begin(), counter[ResourceType::Material].end(), 1u);
-  resourceBundle.CountEnvironmentReferences(counter);
-  i = 0;
-  for (auto& er: counter[ResourceType::Environment])
-  {
-    DALI_TEST_EQUAL(er, testEnvironmentReferences[i]);
-    ++i;
-  }
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-SceneDefinition.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-SceneDefinition.cpp
deleted file mode 100644
index 9b163bd..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-SceneDefinition.cpp
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/utils.h"
-#include <dali-test-suite-utils.h>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliSceneDefinitionAddNode(void)
-{
-  SceneDefinition sceneDef;
-
-  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 0u);
-  auto node = new NodeDefinition();
-  node->mName = "First";
-
-  auto result = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ node });
-  DALI_TEST_EQUAL(result, node);
-  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 1u);
-  DALI_TEST_EQUAL(sceneDef.GetNode(0), node);
-  DALI_TEST_EQUAL(sceneDef.FindNode(node->mName), node);
-
-  auto node2 = new NodeDefinition();
-  node2->mName = node->mName;
-  result = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ node2 });
-  DALI_TEST_EQUAL(result, static_cast<NodeDefinition*>(nullptr)); // failed
-  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 1u); // still
-  DALI_TEST_EQUAL(sceneDef.GetNode(0), node); // still
-  DALI_TEST_EQUAL(sceneDef.FindNode(node->mName), node); // still
-
-  auto child = new NodeDefinition();
-  child->mName = "Second";
-  child->mParentIdx = 0;
-
-  DALI_TEST_CHECK(node->mChildren.empty()); // these are hooked up by AddNode, base on parent idx.
-
-  result = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ child });
-  DALI_TEST_EQUAL(result, child);
-  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 2u);
-  DALI_TEST_EQUAL(sceneDef.GetNode(1), child);
-  DALI_TEST_EQUAL(sceneDef.FindNode(child->mName), child);
-
-  DALI_TEST_EQUAL(node->mChildren[0], 1u); // these are hooked up by AddNode, base on parent idx.
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionAddRootsFail(void)
-{
-  SceneDefinition sceneDef;
-
-  DALI_TEST_ASSERTION(sceneDef.AddRootNode(0), "index out of bounds");
-  DALI_TEST_CHECK(sceneDef.GetRoots().empty());
-  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 0u);
-
-  END_TEST;
-}
-
-namespace
-{
-
-struct TestContext
-{
-  SceneDefinition sceneDef;
-  NodeDefinition* root;
-  NodeDefinition* childA;
-  NodeDefinition* childB;
-
-  TestContext()
-  : sceneDef{},
-    root{ new NodeDefinition{ "Root" }},
-    childA{ new NodeDefinition{ "A" }},
-    childB{ new NodeDefinition{ "B" }}
-  {
-    childA->mParentIdx = 0;
-    childB->mParentIdx = 0;
-
-    root = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ root });
-    childA = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ childA });
-    childB = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ childB });
-  }
-};
-
-enum Event
-{
-  DEFAULT = -1,
-  START,
-  FINISH
-};
-
-struct NodeVisitor : NodeDefinition::IVisitor
-{
-  struct Visit
-  {
-    Event event;
-    NodeDefinition* node;
-
-    bool operator==(const Visit& other) const
-    {
-      return event == other.event && node == other.node;
-    }
-  };
-
-  void Start(NodeDefinition& n) override
-  {
-    visits.push_back({ START, &n });
-  }
-
-  void Finish(NodeDefinition& n) override
-  {
-    visits.push_back({ FINISH, &n });
-  }
-
-  std::vector<Visit> visits;
-};
-
-struct ConstNodeVisitor : NodeDefinition::IConstVisitor
-{
-  struct Visit
-  {
-    Event  event;
-    const NodeDefinition* node;
-
-    bool operator==(const Visit& other) const
-    {
-      return event == other.event && node == other.node;
-    }
-  };
-
-  void Start(const NodeDefinition& n) override
-  {
-    visits.push_back({ START, &n });
-  }
-
-  void Finish(const NodeDefinition& n) override
-  {
-    visits.push_back({ FINISH, &n });
-  }
-
-  std::vector<Visit> visits;
-};
-
-}
-
-int UtcDaliSceneDefinitionAddRemoveRootNode(void)
-{
-  TestContext ctx;
-
-  DALI_TEST_EQUAL(ctx.sceneDef.AddRootNode(0), 0);
-  DALI_TEST_EQUAL(ctx.sceneDef.GetRoots().size(), 1u);
-  DALI_TEST_EQUAL(ctx.sceneDef.GetRoots()[0], 0);
-
-  ctx.sceneDef.RemoveRootNode(0);
-  DALI_TEST_EQUAL(ctx.sceneDef.GetRoots().size(), 0);
-
-  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 3u);
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionVisit(void)
-{
-  TestContext ctx;
-
-  NodeVisitor visitor;
-  ctx.sceneDef.Visit(0, Customization::Choices{}, visitor);
-
-  const NodeVisitor::Visit expected[] {
-    { START, ctx.root },
-    { START, ctx.childA },
-    { FINISH, ctx.childA },
-    { START, ctx.childB },
-    { FINISH, ctx.childB },
-    { FINISH, ctx.root },
-  };
-  DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), expected));
-
-  END_TEST;
-};
-
-int UtcDaliSceneDefinitionConstVisit(void)
-{
-  TestContext ctx;
-
-  ConstNodeVisitor visitor;
-  ctx.sceneDef.Visit(0, Customization::Choices{}, visitor);
-
-  const ConstNodeVisitor::Visit expected[] {
-    { START, ctx.root },
-    { START, ctx.childA },
-    { FINISH, ctx.childA },
-    { START, ctx.childB },
-    { FINISH, ctx.childB },
-    { FINISH, ctx.root },
-  };
-  DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), expected));
-
-  END_TEST;
-};
-
-int UtcDaliSceneDefinitionVisitCustomized(void)
-{
-  TestContext ctx;
-
-  ctx.root->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "A/B" });
-
-  const NodeVisitor::Visit expected[] {
-    { START, ctx.root },
-    { START, ctx.childB },
-    { FINISH, ctx.childB },
-    { FINISH, ctx.root },
-  };
-
-  Customization::Choices choices;
-  for (auto i : { 1, 2 })
-  {
-    choices.Set("A/B", i);
-
-    NodeVisitor visitor;
-    ctx.sceneDef.Visit(0, choices, visitor);
-
-    DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), std::begin(expected)));
-  }
-
-  END_TEST;
-};
-
-int UtcDaliSceneDefinitionConstVisitCustomized(void)
-{
-  TestContext ctx;
-
-  ctx.root->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "A/B" });
-
-  const ConstNodeVisitor::Visit expected[] {
-    { START, ctx.root },
-    { START, ctx.childB },
-    { FINISH, ctx.childB },
-    { FINISH, ctx.root },
-  };
-
-  Customization::Choices choices;
-  for (auto i : { 1, 2 })
-  {
-    choices.Set("A/B", i);
-
-    ConstNodeVisitor visitor;
-    ctx.sceneDef.Visit(0, choices, visitor);
-
-    DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), std::begin(expected)));
-  }
-
-  END_TEST;
-};
-
-int UtcDaliSceneDefinitionGetCustomizationOptions(void)
-{
-  TestContext ctx;
-
-  ctx.sceneDef.AddRootNode(0); // GetCustomizationOptions requires this.
-
-  ctx.root->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "A/B" });
-  ctx.childA->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "hello" });
-  ctx.childB->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "goodbye" });
-
-  Customization::Choices choices;
-  Customization::Map options;
-  ctx.sceneDef.GetCustomizationOptions(choices, options, &choices);
-
-  DALI_TEST_EQUAL(choices.Size(), 2u);
-  DALI_TEST_EQUAL(options.Size(), 2u);
-
-  struct TestOption
-  {
-    std::string name;
-    Customization customization;
-    Customization::OptionType choice;
-  };
-
-  std::vector<TestOption> testOptions {
-    { "A/B", { 2, { "Root" } }, 0 },
-    { "hello", { 0, { "A" } }, 0 },
-  };
-  for (auto& testOption: testOptions)
-  {
-    auto iFind = choices.Get(testOption.name);
-    DALI_TEST_EQUAL(iFind, testOption.choice);
-
-    auto iFindOption = options.Get(testOption.name);
-    DALI_TEST_CHECK(iFindOption != nullptr);
-    DALI_TEST_EQUAL(iFindOption->numOptions, testOption.customization.numOptions);
-    DALI_TEST_EQUAL(iFindOption->nodes.size(), testOption.customization.nodes.size());
-    DALI_TEST_CHECK(std::equal(iFindOption->nodes.begin(), iFindOption->nodes.end(),
-      testOption.customization.nodes.begin()));
-  }
-
-  choices.Clear();
-  choices.Set("A/B", 1);
-  *options.Get("A/B") = {};
-
-  testOptions[0].choice = 1;
-  testOptions[1].name = "goodbye";
-  testOptions[1].customization.nodes[0] = "B";
-
-  ctx.sceneDef.GetCustomizationOptions(choices, options, &choices);
-
-  DALI_TEST_EQUAL(choices.Size(), 2u);
-  DALI_TEST_EQUAL(options.Size(), 3u);
-
-  for (auto& testOption: testOptions)
-  {
-    auto iFind = choices.Get(testOption.name);
-    DALI_TEST_EQUAL(iFind, testOption.choice);
-
-    auto iFindOption = options.Get(testOption.name);
-    DALI_TEST_CHECK(iFindOption != nullptr);
-    DALI_TEST_EQUAL(iFindOption->numOptions, testOption.customization.numOptions);
-    DALI_TEST_EQUAL(iFindOption->nodes.size(), testOption.customization.nodes.size());
-    DALI_TEST_CHECK(std::equal(iFindOption->nodes.begin(), iFindOption->nodes.end(),
-      testOption.customization.nodes.begin()));
-  }
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionFindNode(void)
-{
-  TestContext ctx;
-
-  Index result = INVALID_INDEX;
-  for (auto n: { ctx.root, ctx.childA, ctx.childB })
-  {
-    ctx.sceneDef.FindNode(n->mName, &result);
-    DALI_TEST_CHECK(result != INVALID_INDEX);
-    DALI_TEST_EQUAL(ctx.sceneDef.GetNode(result), n);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionConstFindNode(void)
-{
-  TestContext ctx;
-
-  Index result = INVALID_INDEX;
-  for (auto n: { ctx.root, ctx.childA, ctx.childB })
-  {
-    const_cast<const TestContext&>(ctx).sceneDef.FindNode(n->mName, &result);
-    DALI_TEST_CHECK(result != INVALID_INDEX);
-    DALI_TEST_EQUAL(ctx.sceneDef.GetNode(result), n);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionFindNodeIndex(void)
-{
-  TestContext ctx;
-
-  Index result = INVALID_INDEX;
-  for (auto n: { ctx.root, ctx.childA, ctx.childB })
-  {
-    result = ctx.sceneDef.FindNodeIndex(*n);
-    DALI_TEST_CHECK(result != INVALID_INDEX);
-    DALI_TEST_EQUAL(ctx.sceneDef.GetNode(result), n);
-  }
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionFindNodes(void)
-{
-  TestContext ctx;
-
-  std::vector<NodeDefinition*> nodes;
-  auto nodeConsumer = [&nodes](NodeDefinition& nd) {
-    nodes.push_back(&nd);
-  };
-
-  auto nodePredicate = [](const NodeDefinition& nd) {
-    return nd.mName.length() == 1;
-  };
-
-  ctx.sceneDef.FindNodes(nodePredicate, nodeConsumer, 1);
-  DALI_TEST_EQUAL(nodes.size(), 1);
-  DALI_TEST_EQUAL(nodes[0]->mName, "A");
-  DALI_TEST_EQUAL(nodes[0], ctx.childA);
-
-  nodes.clear();
-  ctx.sceneDef.FindNodes(nodePredicate, nodeConsumer);
-
-  DALI_TEST_EQUAL(nodes.size(), 2);
-  DALI_TEST_EQUAL(nodes[0]->mName, "A");
-  DALI_TEST_EQUAL(nodes[0], ctx.childA);
-  DALI_TEST_EQUAL(nodes[1]->mName, "B");
-  DALI_TEST_EQUAL(nodes[1], ctx.childB);
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionRemoveNode(void)
-{
-  TestContext ctx;
-  DALI_TEST_EQUAL(ctx.sceneDef.RemoveNode("doesn't exist"), false);
-
-  // pre-removing A
-  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 3u);
-  DALI_TEST_EQUAL(ctx.root->mChildren.size(), 2u);
-
-  Index result;
-  DALI_TEST_EQUAL(ctx.sceneDef.FindNode("B", &result), ctx.childB);
-  DALI_TEST_EQUAL(result, 2);
-
-  DALI_TEST_EQUAL(ctx.sceneDef.RemoveNode("A"), true);
-
-  // post-removing A
-  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 2u);
-
-  result = 12345;
-  DALI_TEST_EQUAL(ctx.sceneDef.FindNode("A", &result), static_cast<NodeDefinition*>(nullptr));
-  DALI_TEST_EQUAL(result, 12345); // doesn't change
-
-  DALI_TEST_EQUAL(ctx.sceneDef.FindNode("B", &result), ctx.childB);
-  DALI_TEST_EQUAL(result, 1); // dropped
-
-  DALI_TEST_EQUAL(ctx.root->mChildren.size(), 1u);
-  DALI_TEST_EQUAL(ctx.root->mChildren[0], 1u);
-
-  // removing root
-  DALI_TEST_EQUAL(ctx.sceneDef.RemoveNode("Root"), true);
-  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 0);
-
-  END_TEST;
-}
-
-int UtcDaliSceneDefinitionReparentNode(void)
-{
-  TestContext ctx;
-
-  ctx.sceneDef.ReparentNode("B", "A", 0);
-
-  DALI_TEST_EQUAL(ctx.childB->mParentIdx, ctx.sceneDef.FindNodeIndex(*ctx.childA));
-  DALI_TEST_EQUAL(ctx.childA->mChildren.size(), 1u);
-  DALI_TEST_EQUAL(ctx.childA->mChildren[0], ctx.sceneDef.FindNodeIndex(*ctx.childB));
-
-  END_TEST;
-}
-
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-ShaderDefinition.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-ShaderDefinition.cpp
deleted file mode 100644
index e58e702..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-ShaderDefinition.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/shader-definition.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-int UtcDaliShaderDefinitionFailedToLoad(void)
-{
-  ShaderDefinition shaderDef;
-  shaderDef.mVertexShaderPath = "nonexistent.vsh";
-  shaderDef.mFragmentShaderPath = "nonexistent.vsh";
-
-  DALI_TEST_ASSERTION(shaderDef.LoadRaw(""), "Failed to load shader source");
-
-  shaderDef.mVertexShaderPath = "dli_pbr.vsh";
-
-  auto shaderPath = TEST_RESOURCE_DIR "/";
-  DALI_TEST_ASSERTION(shaderDef.LoadRaw(shaderPath), "Failed to load shader source");
-
-  shaderDef.mFragmentShaderPath = "dli_pbr.fsh";
-
-  shaderDef.mHints.push_back("MODIFIES_GEOMETRY");
-  shaderDef.mHints.push_back("OUTPUT_IS_TRANSPARENT");
-  auto raw = shaderDef.LoadRaw(shaderPath);
-
-  TestApplication app;
-  auto shader = shaderDef.Load(std::move(raw));
-  DALI_TEST_CHECK(shader);
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-ShaderDefinitionFactory.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-ShaderDefinitionFactory.cpp
deleted file mode 100644
index c1b5481..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-ShaderDefinitionFactory.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/gltf2-loader.h"
-#include "dali-scene-loader/public-api/shader-definition-factory.h"
-#include "dali-scene-loader/public-api/node-definition.h"
-#include "dali-scene-loader/public-api/resource-bundle.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-#include <set>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-namespace
-{
-
-bool EndsWith(const std::string& str, const std::string& suffix) // ends_width() is C++20
-{
-  return str.size() >= suffix.size() && str.substr(str.size() - suffix.size()).compare(suffix) == 0;
-}
-
-MaterialDefinition& NewMaterialDefinition(ResourceBundle& resources)
-{
-  resources.mMaterials.push_back({});
-  return resources.mMaterials.back().first;
-}
-
-MeshDefinition& NewMeshDefinition(ResourceBundle& resources)
-{
-  resources.mMeshes.push_back({});
-  return resources.mMeshes.back().first;
-}
-
-void ClearMeshesAndMaterials(ResourceBundle& resources)
-{
-  resources.mMaterials.clear();
-  resources.mMeshes.clear();
-}
-
-struct Context
-{
-  ResourceBundle resources;
-  ShaderDefinitionFactory factory;
-
-  Context()
-  {
-    factory.SetResources(resources);
-  }
-};
-
-struct ShaderParameters
-{
-  MeshDefinition& meshDef;
-  MaterialDefinition& materialDef;
-  NodeDefinition& nodeDef;
-};
-
-struct Permutation
-{
-  using ConfigureFn = void(*)(ShaderParameters&);
-
-  ConfigureFn configureFn;
-
-  std::set<std::string> defines;
-  RendererState::Type rendererStateSet = 0;
-  RendererState::Type rendererStateClear = 0;
-};
-
-struct PermutationSet
-{
-  std::vector<const Permutation*> permutations;
-  Index shaderIdx;
-};
-
-}
-
-int UtcDaliShaderDefinitionFactoryProduceShaderInvalid(void)
-{
-  Context ctx;
-
-  NodeDefinition nodeDef;
-  nodeDef.mRenderable.reset(new NodeDefinition::Renderable());
-
-  DALI_TEST_EQUAL(INVALID_INDEX, ctx.factory.ProduceShader(nodeDef));
-  DALI_TEST_CHECK(ctx.resources.mShaders.empty());
-
-  END_TEST;
-}
-
-int UtcDaliShaderDefinitionFactoryProduceShader(void)
-{
-  Context ctx;
-  ctx.resources.mMaterials.push_back({});
-  ctx.resources.mMeshes.push_back({});
-
-  Permutation permutations[]{
-    {
-      [](ShaderParameters& p) {},
-      {},
-      RendererState::DEPTH_TEST | RendererState::DEPTH_WRITE | RendererState::CULL_BACK,
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.mFlags |= MaterialDefinition::TRANSPARENCY;
-      },
-      { "THREE_TEX" },
-      RendererState::ALPHA_BLEND,
-      RendererState::DEPTH_WRITE,
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.mTextureStages.push_back({ MaterialDefinition::ALBEDO, {} });
-      },
-      { "THREE_TEX" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.mTextureStages.push_back({ MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS, {} });
-      },
-      { "THREE_TEX" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.mTextureStages.push_back({ MaterialDefinition::NORMAL, {} });
-      },
-      { "THREE_TEX" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.mFlags |= MaterialDefinition::SUBSURFACE;
-      },
-      { "SSS" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.SetAlphaCutoff(.5f);
-      },
-      { "ALPHA_TEST" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.SetAlphaCutoff(1.f);
-      },
-      { "ALPHA_TEST" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.materialDef.mFlags |= MaterialDefinition::GLTF_CHANNELS;
-      },
-      { "GLTF_CHANNELS" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.meshDef.mJoints0.mBlob.mOffset = 0;
-        p.meshDef.mWeights0.mBlob.mOffset = 0;
-      },
-      { "SKINNING" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.meshDef.mFlags |= MeshDefinition::FLIP_UVS_VERTICAL;
-      },
-      { "FLIP_V" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.meshDef.mBlendShapes.push_back({});
-      },
-    },
-    {
-      [](ShaderParameters& p) {
-        p.meshDef.mBlendShapes.back().deltas.mBlob.mOffset = 0;
-      },
-      { "MORPH_POSITION", "MORPH" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.meshDef.mBlendShapes.back().normals.mBlob.mOffset = 0;
-      },
-      { "MORPH_NORMAL", "MORPH" }
-    },
-    {
-      [](ShaderParameters& p) {
-        p.meshDef.mBlendShapes.back().tangents.mBlob.mOffset = 0;
-      },
-      { "MORPH_TANGENT", "MORPH" }
-    },
-    {
-      [](ShaderParameters& p) {
-        auto& blendShapes = p.meshDef.mBlendShapes;
-        DALI_ASSERT_ALWAYS(!blendShapes.empty() &&
-          (blendShapes.back().deltas.mBlob.mOffset != MeshDefinition::INVALID ||
-          blendShapes.back().normals.mBlob.mOffset != MeshDefinition::INVALID ||
-          blendShapes.back().tangents.mBlob.mOffset != MeshDefinition::INVALID));
-        p.meshDef.mBlendShapeVersion = BlendShapes::Version::VERSION_2_0;
-      },
-      { "MORPH_VERSION_2_0" }
-    },
-  };
-
-  PermutationSet permSets[] {
-    // default
-    { { &permutations[0] }, 0 },
-
-    // alpha
-    { { &permutations[0], &permutations[1] }, 1 },
-
-    // three-texture setups
-    { { &permutations[0], &permutations[2] }, 2 },
-    { { &permutations[0], &permutations[3] }, 2 },
-    { { &permutations[0], &permutations[4] }, 2 },
-    { { &permutations[0], &permutations[2], &permutations[3] }, 2 },
-    { { &permutations[0], &permutations[3], &permutations[4] }, 2 },
-    { { &permutations[0], &permutations[4], &permutations[2] }, 2 },
-    { { &permutations[0], &permutations[2], &permutations[3], &permutations[4] }, 2 },
-
-    // subsurface scattering
-    { { &permutations[0], &permutations[5] }, 3 },
-
-    // alpha test
-    { { &permutations[0], &permutations[6] }, 4 },
-    { { &permutations[0], &permutations[7] }, 4 },
-
-    // glTF channels
-    { { &permutations[0], &permutations[8] }, 5 },
-
-    // skinning
-    { { &permutations[0], &permutations[9] }, 6 },
-
-    // flip uvs
-    { { &permutations[0], &permutations[10] }, 7 },
-
-    // morphing
-    { { &permutations[0], &permutations[11], &permutations[12] }, 8 },
-    { { &permutations[0], &permutations[11], &permutations[13] }, 9 },
-    { { &permutations[0], &permutations[11], &permutations[14] }, 10 },
-    { { &permutations[0], &permutations[11], &permutations[12], &permutations[13] }, 11 },
-    { { &permutations[0], &permutations[11], &permutations[13], &permutations[14] }, 12 },
-    { { &permutations[0], &permutations[11], &permutations[14], &permutations[12] }, 13 },
-    { { &permutations[0], &permutations[11], &permutations[12], &permutations[13], &permutations[14] }, 14 },
-
-    { { &permutations[0], &permutations[11], &permutations[12], &permutations[15] }, 15 },
-    { { &permutations[0], &permutations[11], &permutations[13], &permutations[15] }, 16 },
-    { { &permutations[0], &permutations[11], &permutations[14], &permutations[15] }, 17 },
-    { { &permutations[0], &permutations[11], &permutations[12], &permutations[13], &permutations[15] }, 18 },
-    { { &permutations[0], &permutations[11], &permutations[13], &permutations[14], &permutations[15] }, 19 },
-    { { &permutations[0], &permutations[11], &permutations[14], &permutations[12], &permutations[15] }, 20 },
-    { { &permutations[0], &permutations[11], &permutations[12], &permutations[13], &permutations[14], &permutations[15] }, 21 },
-
-    // etc.
-    { { &permutations[0], &permutations[1], &permutations[2] }, 1 },
-    { { &permutations[0], &permutations[1], &permutations[3] }, 1 },
-    { { &permutations[0], &permutations[1], &permutations[2], &permutations[3] }, 1 },
-  };
-  for(auto& ps: permSets)
-  {
-    printf("%ld\n", &ps - permSets);
-
-    auto modelNode = new ModelNode();
-    modelNode->mMeshIdx = 0;
-    modelNode->mMaterialIdx = 0;
-
-    NodeDefinition nodeDef;
-    nodeDef.mRenderable.reset(modelNode);
-
-    auto& meshDef = NewMeshDefinition(ctx.resources);
-    auto& materialDef = NewMaterialDefinition(ctx.resources);
-    ShaderParameters sp{ meshDef, materialDef, nodeDef };
-
-    std::set<std::string> defines;
-    RendererState::Type rendererState = 0;
-    for (auto p : ps.permutations)
-    {
-      p->configureFn(sp);
-      defines.insert(p->defines.begin(), p->defines.end());
-      rendererState = (rendererState | p->rendererStateSet) & ~p->rendererStateClear;
-    }
-
-    auto shaderIdx = ctx.factory.ProduceShader(nodeDef);
-    DALI_TEST_EQUAL(ps.shaderIdx, shaderIdx);
-
-    auto& shaderDef = ctx.resources.mShaders[shaderIdx].first;
-    DALI_TEST_CHECK(EndsWith(shaderDef.mVertexShaderPath, ".vsh"));
-    DALI_TEST_CHECK(EndsWith(shaderDef.mFragmentShaderPath, ".fsh"));
-    DALI_TEST_EQUAL(shaderDef.mRendererState, rendererState);
-
-    uint32_t definesUnmatched = shaderDef.mDefines.size();
-    for (auto& d: shaderDef.mDefines)
-    {
-      auto iFind = defines.find(d);
-      if (iFind != defines.end())
-      {
-        defines.erase(iFind);
-        --definesUnmatched;
-      }
-      else
-      {
-        printf("mismatched: %s\n", d.c_str());
-        break;
-      }
-    }
-
-    DALI_TEST_CHECK(defines.empty());
-    DALI_TEST_EQUAL(0, definesUnmatched);
-
-    printf("defines OK\n");
-
-    auto uMaxLOD = shaderDef.mUniforms["uMaxLOD"];
-    DALI_TEST_EQUAL(uMaxLOD.GetType(), Property::FLOAT);
-
-    auto uCubeMatrix = shaderDef.mUniforms["uCubeMatrix"];
-    DALI_TEST_EQUAL(uCubeMatrix.GetType(), Property::MATRIX);
-
-    ClearMeshesAndMaterials(ctx.resources);
-  }
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-StringCallback.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-StringCallback.cpp
deleted file mode 100644
index acd5183..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-StringCallback.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/string-callback.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-namespace
-{
-
-char sBuffer[64];
-
-void TestLogFunction(Integration::Log::DebugPriority level, std::string& str)
-{
-  snprintf(sBuffer, sizeof(sBuffer), "%d: %s", level, str.c_str());
-}
-
-}
-
-int UtcDaliUtilsDefaultStringCallback(void)
-{
-  InstallLogFunction(TestLogFunction);
-  DefaultErrorCallback("Hello world!");
-  DALI_TEST_EQUAL(std::string(sBuffer), "2: DefaultErrorCallback Hello world!");
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-Utils.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-Utils.cpp
deleted file mode 100644
index 68e30a0..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-Utils.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/utils.h"
-#include <dali-test-suite-utils.h>
-#include <string_view>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-namespace
-{
-constexpr std::string_view TEST_STRING = "The quick brown fox jumped over a lazy dog.1337true";
-}
-
-template <size_t N>
-void HelpTestStreamBuffer()
-{
-  char buffer[N];
-  StreamBuffer streamBuffer(buffer, N); // note we aren't leaving space for a terminating 0 as we're using strNcmp.
-  std::ostream stream(&streamBuffer);
-
-  stream << "The quick brown fox jumped over a lazy dog.";
-  stream << 1337;
-  stream << std::boolalpha << true;
-
-  const size_t checkLen = std::min(N, TEST_STRING.size());
-  DALI_TEST_EQUAL(0, strncmp(buffer, TEST_STRING.data(), checkLen));
-}
-
-int UtcDaliUtilsStreamBuffer(void)
-{
-  HelpTestStreamBuffer<16>();
-  HelpTestStreamBuffer<32>();
-  HelpTestStreamBuffer<64>();
-  END_TEST;
-}
-
-int UtcDaliUtilsFormatString(void)
-{
-  DALI_TEST_EQUAL(FormatString("%s", "hello"), "hello");
-  DALI_TEST_EQUAL(FormatString("%d", 1667), "1667");
-
-  DALI_TEST_EQUAL(FormatString("%s %d", "hello", 2778), "hello 2778");
-  DALI_TEST_EQUAL(FormatString("%d %s", 3889, "hello"), "3889 hello");
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene-loader/utc-Dali-ViewProjection.cpp b/automated-tests/src/dali-scene-loader/utc-Dali-ViewProjection.cpp
deleted file mode 100644
index c4567ab..0000000
--- a/automated-tests/src/dali-scene-loader/utc-Dali-ViewProjection.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// Enable debug log for test coverage
-#define DEBUG_ENABLED 1
-
-#include "dali-scene-loader/public-api/view-projection.h"
-#include <dali-test-suite-utils.h>
-
-using namespace Dali;
-using namespace Dali::SceneLoader;
-
-namespace
-{
-void SetPerspectiveProjection(Matrix& m)
-{
-  auto data = m.AsFloat();
-  float near = 1.f;
-  float far = 10.f;
-  float right = 1.f;
-  float left = -right;
-  float top = .75f;
-  float bottom = -top;
-  data[0] = 2.f * near / (right - left);
-  data[5] = 2.f * near / (top - bottom);
-  data[8] = (right + left) / (right - left);
-  data[9] = (top + bottom) / (top - bottom);
-  data[10] = (far + near) / (far - near);
-  data[11] = -1.f;
-  data[14] = 2 * far * near / (far - near);
-}
-
-}
-
-int UtcDaliViewProjection(void)
-{
-  ViewProjection vp;
-  Matrix viewMatrix;
-  viewMatrix.SetTransformComponents( Vector3::ONE,
-    Quaternion(Radian(Degree(90.f)), Vector3::YAXIS),
-    Vector3::XAXIS * 200.f);
-  vp.GetView() = viewMatrix;
-
-  Matrix projectionMatrix;
-  SetPerspectiveProjection(projectionMatrix);
-  vp.GetProjection() = projectionMatrix;
-
-  vp.Update();
-
-  [&](const ViewProjection& vp) {
-    DALI_TEST_EQUAL(vp.GetView(), viewMatrix);
-    DALI_TEST_EQUAL(vp.GetProjection(), projectionMatrix);
-  }(vp);
-
-  Matrix expectedViewProjection{ false };
-  Matrix::Multiply(expectedViewProjection, viewMatrix, projectionMatrix);
-  auto viewProjectionResult = vp.GetViewProjection();
-  DALI_TEST_EQUAL(viewProjectionResult, expectedViewProjection);
-
-  Matrix expectedInverseProjection{ projectionMatrix };
-  expectedInverseProjection.Invert();
-  auto inverseProjectionResult = vp.GetInverseProjection();
-  DALI_TEST_EQUAL(inverseProjectionResult, expectedInverseProjection);
-
-  END_TEST;
-}
-
-int UtcDaliViewProjectionUpdateFail(void)
-{
-  ViewProjection vp;
-  DALI_TEST_ASSERTION(vp.Update(), "Failed to find inverse");
-
-  END_TEST;
-}
diff --git a/automated-tests/src/dali-scene3d-internal/CMakeLists.txt b/automated-tests/src/dali-scene3d-internal/CMakeLists.txt
new file mode 100755
index 0000000..b050314
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/CMakeLists.txt
@@ -0,0 +1,107 @@
+SET(PKG_NAME "dali-scene3d-internal")
+
+SET(EXEC_NAME "tct-${PKG_NAME}-core")
+SET(RPM_NAME "core-${PKG_NAME}-tests")
+
+SET(CAPI_LIB "dali-scene3d")
+
+# List of test case sources (Only these get parsed for test cases)
+SET(TC_SOURCES
+  utc-Dali-DliLoaderImpl.cpp
+  utc-Dali-EnvironmentMapTask.cpp
+  utc-Dali-GlbLoaderImpl.cpp
+  utc-Dali-Gltf2Asset.cpp
+  utc-Dali-Gltf2LoaderImpl.cpp
+  utc-Dali-Hash.cpp
+  utc-Dali-JsonReader.cpp
+  utc-Dali-JsonUtil.cpp
+  utc-Dali-MaterialImpl.cpp
+  utc-Dali-ModelCacheManager.cpp
+  utc-Dali-ModelPrimitiveImpl.cpp
+)
+
+# List of test harness files (Won't get parsed for test cases)
+SET(TEST_HARNESS_DIR "../dali-toolkit/dali-toolkit-test-utils")
+
+SET(TEST_HARNESS_SOURCES
+  ${TEST_HARNESS_DIR}/toolkit-adaptor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-async-task-manager.cpp
+  ${TEST_HARNESS_DIR}/toolkit-event-thread-callback.cpp
+  ${TEST_HARNESS_DIR}/toolkit-environment-variable.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-context.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-options.cpp
+  ${TEST_HARNESS_DIR}/toolkit-lifecycle-controller.cpp
+  ${TEST_HARNESS_DIR}/toolkit-orientation.cpp
+  ${TEST_HARNESS_DIR}/toolkit-style-monitor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-test-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-timer.cpp
+  ${TEST_HARNESS_DIR}/toolkit-trigger-event-factory.cpp
+  ${TEST_HARNESS_DIR}/toolkit-window.cpp
+  ${TEST_HARNESS_DIR}/toolkit-scene-holder.cpp
+  ${TEST_HARNESS_DIR}/dali-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dali-toolkit-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dummy-control.cpp
+  ${TEST_HARNESS_DIR}/mesh-builder.cpp
+  ${TEST_HARNESS_DIR}/test-actor-utils.cpp
+  ${TEST_HARNESS_DIR}/test-animation-data.cpp
+  ${TEST_HARNESS_DIR}/test-application.cpp
+  ${TEST_HARNESS_DIR}/test-button.cpp
+  ${TEST_HARNESS_DIR}/test-harness.cpp
+  ${TEST_HARNESS_DIR}/test-gesture-generator.cpp
+  ${TEST_HARNESS_DIR}/test-gl-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-impl.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-object.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-command-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-controller.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-framebuffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-texture.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sampler.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-pipeline.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-program.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-shader.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-reflection.cpp
+  ${TEST_HARNESS_DIR}/test-platform-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-render-controller.cpp
+  ${TEST_HARNESS_DIR}/test-trace-call-stack.cpp
+)
+
+PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
+  dali2-core
+  dali2-adaptor
+  dali2-toolkit
+  dali2-scene3d
+)
+
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
+ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
+
+ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
+
+FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
+ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
+
+INCLUDE_DIRECTORIES(
+    ../../../
+    ${${CAPI_LIB}_INCLUDE_DIRS}
+    ../dali-toolkit/dali-toolkit-test-utils
+)
+
+ADD_CUSTOM_COMMAND(
+  COMMAND ${SCRIPT_DIR}/tcheadgen.sh ${EXEC_NAME}.h ${TC_SOURCES}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  OUTPUT ${EXEC_NAME}.h
+  COMMENT "Generating test tables"
+  )
+
+ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
+TARGET_LINK_LIBRARIES(${EXEC_NAME}
+    ${${CAPI_LIB}_LIBRARIES}
+    -lpthread --coverage
+)
+
+INSTALL(PROGRAMS ${EXEC_NAME}
+    DESTINATION ${BIN_DIR}/${EXEC_NAME}
+)
diff --git a/automated-tests/src/dali-scene3d-internal/tct-dali-scene3d-internal-core.cpp b/automated-tests/src/dali-scene3d-internal/tct-dali-scene3d-internal-core.cpp
new file mode 100644
index 0000000..c5ed18f
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/tct-dali-scene3d-internal-core.cpp
@@ -0,0 +1,7 @@
+#include <test-harness.h>
+#include "tct-dali-scene3d-internal-core.h"
+
+int main(int argc, char * const argv[])
+{
+  return TestHarness::RunTests(argc, argv, tc_array);
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-DliLoaderImpl.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-DliLoaderImpl.cpp
new file mode 100644
index 0000000..ca764bd
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-DliLoaderImpl.cpp
@@ -0,0 +1,708 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-scene3d/internal/loader/dli-loader-impl.h>
+#include <dali-scene3d/internal/loader/json-util.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-test-suite-utils.h>
+#include <string_view>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+void ConfigureBlendShapeShaders(ResourceBundle& resources, const SceneDefinition& scene, Actor root, std::vector<BlendshapeShaderConfigurationRequest>&& requests)
+{
+  std::vector<std::string> errors;
+  auto                     onError = [&errors](const std::string& msg)
+  {
+    errors.push_back(msg);
+  };
+
+  if(!scene.ConfigureBlendshapeShaders(resources, root, std::move(requests), onError))
+  {
+    ExceptionFlinger flinger(ASSERT_LOCATION);
+    for(auto& msg : errors)
+    {
+      flinger << msg << '\n';
+    }
+  }
+}
+
+struct Context
+{
+  ResourceBundle::PathProvider pathProvider = [](ResourceType::Value type)
+  {
+    return TEST_RESOURCE_DIR "/";
+  };
+
+  ResourceBundle                        resources;
+  SceneDefinition                       scene;
+  std::vector<CameraParameters>         cameraParameters;
+  std::vector<LightParameters>          lights;
+  std::vector<AnimationDefinition>      animations;
+  std::vector<AnimationGroupDefinition> animGroups;
+
+  SceneMetadata metaData;
+
+  LoadResult output{
+    resources,
+    scene,
+    metaData,
+    animations,
+    animGroups,
+    cameraParameters,
+    lights};
+
+  Dali::Scene3D::Loader::DliInputParameter       input;
+  std::vector<std::string>                       errors;
+  Dali::Scene3D::Loader::Internal::DliLoaderImpl loader;
+
+  StringCallback onError = [this](const std::string& error)
+  {
+    errors.push_back(error);
+    printf("%s\n", error.c_str());
+  };
+
+  Context()
+  {
+    input.mAnimationsPath = pathProvider(ResourceType::Mesh);
+    loader.SetErrorCallback(onError);
+    loader.SetInputParameter(input);
+  }
+};
+
+bool StringHasTokens(const char* string, const std::vector<const char*>& tokens)
+{
+  for(auto& token : tokens)
+  {
+    auto result = strstr(string, token);
+    if(nullptr == result)
+    {
+      return false;
+    }
+    string = result + strlen(token);
+  }
+  return true;
+}
+
+} // namespace
+
+int UtcDaliDliLoaderLoadSceneNotFound(void)
+{
+  Context ctx;
+
+  DALI_TEST_EQUAL(ctx.loader.LoadModel("does_not_exist.dli", ctx.output), false);
+
+  auto error = ctx.loader.GetParseError();
+  DALI_TEST_CHECK(StringHasTokens(error.c_str(), {"Empty source buffer to parse."}));
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneFailParse(void)
+{
+  Context ctx;
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "invalid.gltf";
+  DALI_TEST_EQUAL(ctx.loader.LoadModel(path, ctx.output), false);
+
+  auto error = ctx.loader.GetParseError();
+  DALI_TEST_CHECK(StringHasTokens(error.c_str(), {"Unexpected character."}));
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneAssertions(void)
+{
+  const std::pair<std::string, std::string> pathExceptionPairs[]{
+    // from RequireChild()
+    {"scenes-nodes-missing", "Failed to find child node"},
+    {"scenes-missing", "Failed to find child node"},
+    {"nodes-missing", "Failed to find child node"},
+    // from ParseSceneInternal()
+    {"scene-out-of-bounds", "out of bounds"},
+    {"nodes-invalid-type", "invalid type; array required"},
+    {"nodes-array-empty", "must define a node id"},
+    {"root-id-invalid", "invalid value for root node index"},
+    {"root-id-out-of-bounds", "out of bounds"},
+    {"root-node-invalid-type", "invalid JSON type; object required"},
+    // from ParseSkeletons()
+    {"skeleton-node-missing", "Missing required attribute"},
+    {"skeleton-root-not-found", "not defined"},
+    // from ParseShaders()
+    {"shader-vertex-missing", "Missing vertex / fragment shader"},
+    {"shader-fragment-missing", "Missing vertex / fragment shader"},
+    // from ParseMeshes()
+    {"mesh-uri-missing", "Missing required attribute"},
+    {"mesh-indices-read-fail", "Failed to read indices"},
+    {"mesh-positions-read-fail", "Failed to read positions"},
+    // from ParseMaterials()
+    {"material-environment-out-of-bounds", "out of bounds"},
+    // from ParseNodes()
+    {"node-model-mesh-missing", "Missing mesh"},
+    {"node-arc-mesh-missing", "Missing mesh"},
+    {"node-animated-image-mesh-missing", "Missing mesh"},
+    {"node-renderable-mesh-invalid-type", "Invalid Mesh index type"},
+    {"node-renderable-mesh-out-of-bounds", "out of bounds"},
+    {"node-child-invalid-type", "invalid index type"},
+    // from ParseAnimations()
+    {"animation-failed-to-open", "Failed to open animation data"}};
+  for(auto& i : pathExceptionPairs)
+  {
+    Context ctx;
+
+    auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/" + i.first + ".dli";
+    printf("\n\n%s: %s\n", path.c_str(), i.second.c_str());
+    DALI_TEST_ASSERTION(ctx.loader.LoadModel(path, ctx.output), i.second.c_str());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneExercise(void)
+{
+  TestApplication app;
+  Context ctx;
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "exercise.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+  DALI_TEST_CHECK(ctx.errors.empty());
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 2u);
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "Backdrop"); // default scene is scene 1 - this one.
+  DALI_TEST_EQUAL(scene.GetNode(roots[1])->mName, "ExerciseDemo");
+
+  DALI_TEST_EQUAL(scene.GetNodeCount(), 96u);
+
+  auto& resources = ctx.resources;
+  DALI_TEST_EQUAL(resources.mMeshes.size(), 11u);
+  DALI_TEST_EQUAL(resources.mMaterials.size(), 13u);
+  DALI_TEST_EQUAL(resources.mShaders.size(), 5u);
+  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 2u);
+  DALI_TEST_EQUAL(resources.mSkeletons.size(), 1u);
+
+  DALI_TEST_EQUAL(ctx.cameraParameters.size(), 1u);
+  DALI_TEST_EQUAL(ctx.lights.size(), 1u);
+  DALI_TEST_EQUAL(ctx.animations.size(), 18u);
+  DALI_TEST_EQUAL(ctx.animGroups.size(), 16u);
+
+  ViewProjection viewProjection;
+  Transforms     xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+  };
+
+  Customization::Choices choices;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : scene.GetRoots())
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_EQUAL(root.GetChildCount(), 2u);
+  DALI_TEST_EQUAL(root.GetChildAt(0).GetProperty(Actor::Property::NAME).Get<std::string>(), "Backdrop");
+  DALI_TEST_EQUAL(root.GetChildAt(1).GetProperty(Actor::Property::NAME).Get<std::string>(), "ExerciseDemo");
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneMorph(void)
+{
+  Context ctx;
+
+  std::vector<std::string> metadata;
+  uint32_t                 metadataCount = 0;
+  ctx.input.mPreNodeCategoryProcessors.push_back({"metadata",
+                                                  [&](const Property::Array& array, StringCallback)
+                                                  {
+                                                    std::string key, value;
+                                                    for(uint32_t i0 = 0, i1 = array.Count(); i0 < i1; ++i0)
+                                                    {
+                                                      auto& data = array.GetElementAt(i0);
+                                                      DALI_TEST_EQUAL(data.GetType(), Property::MAP);
+
+                                                      auto map   = data.GetMap();
+                                                      auto key   = map->Find("key");
+                                                      auto value = map->Find("value");
+                                                      DALI_TEST_EQUAL(key->GetType(), Property::STRING);
+                                                      DALI_TEST_EQUAL(value->GetType(), Property::STRING);
+                                                      metadata.push_back(key->Get<std::string>() + ":" + value->Get<std::string>());
+
+                                                      ++metadataCount;
+                                                    }
+                                                  }});
+
+  std::vector<std::string> behaviors;
+  uint32_t                 behaviorCount = 0;
+  ctx.input.mPostNodeCategoryProcessors.push_back({"behaviors",
+                                                   [&](const Property::Array& array, StringCallback)
+                                                   {
+                                                     for(uint32_t i0 = 0, i1 = array.Count(); i0 < i1; ++i0)
+                                                     {
+                                                       auto& data = array.GetElementAt(i0);
+                                                       DALI_TEST_EQUAL(data.GetType(), Property::MAP);
+
+                                                       auto map   = data.GetMap();
+                                                       auto event = map->Find("event");
+                                                       auto url   = map->Find("url");
+                                                       DALI_TEST_EQUAL(event->GetType(), Property::STRING);
+                                                       DALI_TEST_EQUAL(url->GetType(), Property::STRING);
+                                                       behaviors.push_back(event->Get<std::string>() + ":" + url->Get<std::string>());
+
+                                                       ++behaviorCount;
+                                                     }
+                                                   }});
+
+  size_t numNodes                  = 0;
+  ctx.input.mNodePropertyProcessor = [&](const NodeDefinition&, const Property::Map&, StringCallback)
+  {
+    ++numNodes;
+  };
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "morph.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+  DALI_TEST_CHECK(ctx.errors.empty());
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "HeadTest_002");
+
+  DALI_TEST_EQUAL(numNodes, 3u);
+  DALI_TEST_EQUAL(scene.GetNodeCount(), numNodes);
+
+  auto& resources = ctx.resources;
+  DALI_TEST_EQUAL(resources.mMeshes.size(), 2u);
+  DALI_TEST_EQUAL(resources.mMaterials.size(), 1u);
+  DALI_TEST_EQUAL(resources.mShaders.size(), 5u);
+  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 2u);
+  DALI_TEST_EQUAL(resources.mSkeletons.size(), 0u);
+
+  DALI_TEST_EQUAL(ctx.cameraParameters.size(), 1u);
+  DALI_TEST_EQUAL(ctx.lights.size(), 1u);
+  DALI_TEST_EQUAL(ctx.animations.size(), 1u);
+  DALI_TEST_EQUAL(ctx.animations[0].GetDuration(), 1.0f);
+  DALI_TEST_EQUAL(ctx.animGroups.size(), 0u);
+
+  DALI_TEST_EQUAL(metadata.size(), 4u);
+  DALI_TEST_EQUAL(behaviors.size(), 1u);
+
+  ViewProjection viewProjection;
+  Transforms     xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : scene.GetRoots())
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_EQUAL(root.GetChildCount(), 1u);
+  DALI_TEST_EQUAL(root.GetChildAt(0).GetProperty(Actor::Property::NAME).Get<std::string>(), "HeadTest_002");
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneArc(void)
+{
+  Context ctx;
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "arc.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+  DALI_TEST_CHECK(ctx.errors.empty());
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "root");
+
+  DALI_TEST_EQUAL(scene.GetNodeCount(), 2u);
+
+  auto& resources = ctx.resources;
+  DALI_TEST_EQUAL(resources.mMeshes.size(), 1u);
+  DALI_TEST_EQUAL(resources.mMaterials.size(), 1u);
+  DALI_TEST_EQUAL(resources.mShaders.size(), 1u);
+  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 1u);
+  DALI_TEST_EQUAL(resources.mSkeletons.size(), 0u);
+
+  DALI_TEST_EQUAL(ctx.cameraParameters.size(), 0u);
+  DALI_TEST_EQUAL(ctx.lights.size(), 0u);
+  DALI_TEST_EQUAL(ctx.animations.size(), 0u);
+  DALI_TEST_EQUAL(ctx.animGroups.size(), 0u);
+
+  ViewProjection viewProjection;
+  Transforms     xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : scene.GetRoots())
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_EQUAL(root.GetChildCount(), 1u);
+  DALI_TEST_EQUAL(root.GetChildAt(0).GetProperty(Actor::Property::NAME).Get<std::string>(), "root");
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneShaderUniforms(void)
+{
+  Context ctx;
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/shader-uniforms.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+  DALI_TEST_EQUAL(ctx.errors.size(), 1u);
+  DALI_TEST_CHECK(ctx.errors[0].find("failed to infer type") != std::string::npos);
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "root");
+
+  DALI_TEST_EQUAL(scene.GetNodeCount(), 1u);
+
+  auto& resources = ctx.resources;
+  DALI_TEST_EQUAL(resources.mMeshes.size(), 0u);
+  DALI_TEST_EQUAL(resources.mMaterials.size(), 0u);
+  DALI_TEST_EQUAL(resources.mShaders.size(), 1u);
+  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 0u);
+  DALI_TEST_EQUAL(resources.mSkeletons.size(), 0u);
+
+  auto raw = resources.mShaders[0].first.LoadRaw(ctx.pathProvider(ResourceType::Shader));
+
+  TestApplication app;
+
+  auto shader = resources.mShaders[0].first.Load(std::move(raw));
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uBool")).Get<float>(), 1.0f);
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uInt")).Get<float>(), 255.0f);
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uFloat")).Get<float>(), -0.5f);
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uVec2")).Get<Vector2>(), Vector2(100.0f, -100.0f));
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uVec3")).Get<Vector3>(), Vector3(50.0f, 0.f, -200.0f));
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uVec4")).Get<Vector4>(), Vector4(0.1774f, 1.0f, 0.5333f, 0.7997f));
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uMat3")).Get<Matrix3>(), Matrix3(9.0f, 8.0f, 7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f));
+
+  Matrix expectedMatrix;
+  expectedMatrix.SetTransformComponents(Vector3::ONE * 8.0, Quaternion::IDENTITY, Vector3::ZERO);
+  DALI_TEST_EQUAL(shader.GetProperty(shader.GetPropertyIndex("uMat4")).Get<Matrix>(), expectedMatrix);
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneExtras(void)
+{
+  Context ctx;
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/extras.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+  DALI_TEST_EQUAL(ctx.errors.size(), 3u);
+  DALI_TEST_CHECK(ctx.errors[0].find("already defined; overriding") != std::string::npos);
+  DALI_TEST_CHECK(ctx.errors[1].find("empty string is invalid for name") != std::string::npos);
+  DALI_TEST_CHECK(ctx.errors[2].find("failed to interpret value") != std::string::npos);
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "root");
+
+  DALI_TEST_EQUAL(scene.GetNodeCount(), 1u);
+
+  ViewProjection viewProjection;
+  Transforms     xforms{
+    MatrixStack{},
+    viewProjection};
+  auto&                        resources = ctx.resources;
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+  Actor           actor = scene.CreateNodes(0, choices, nodeParams);
+
+  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("fudgeFactor")).Get<float>(), 9000.1f);
+  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("fudgeVector")).Get<Vector2>(), Vector2(-.25f, 17.f));
+  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("isThisTheRealLife")).Get<bool>(), true);
+  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("isThisJustFantasy")).Get<bool>(), false);
+  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("velocity")).Get<Vector3>(), Vector3(.1f, 58.f, -.2f));
+  DALI_TEST_EQUAL(actor.GetProperty(actor.GetPropertyIndex("frameOfReference")).Get<Matrix>(), Matrix::IDENTITY);
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadSceneConstraints(void)
+{
+  Context ctx;
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/constraints.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+  DALI_TEST_EQUAL(ctx.errors.size(), 1u);
+  DALI_TEST_CHECK(ctx.errors[0].find("invalid", ctx.errors[0].find("node ID")) != std::string::npos);
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+  DALI_TEST_EQUAL(scene.GetNode(0)->mName, "root");
+  DALI_TEST_EQUAL(scene.GetNode(1)->mName, "Alice");
+  DALI_TEST_EQUAL(scene.GetNode(2)->mName, "Bob");
+  DALI_TEST_EQUAL(scene.GetNode(3)->mName, "Charlie");
+
+  DALI_TEST_EQUAL(scene.GetNodeCount(), 4u);
+
+  ViewProjection viewProjection;
+  Transforms     xforms{
+    MatrixStack{},
+    viewProjection};
+  auto&                        resources = ctx.resources;
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root    = scene.CreateNodes(0, choices, nodeParams);
+  Actor alice   = root.FindChildByName("Alice");
+  Actor bob     = root.FindChildByName("Bob");
+  Actor charlie = root.FindChildByName("Charlie");
+
+  DALI_TEST_EQUAL(nodeParams.mConstrainables.size(), 3u);
+  DALI_TEST_EQUAL(bob.GetProperty(bob.GetPropertyIndex("angularVelocity")).Get<Vector2>(), Vector2(-0.5, 0.0004));
+
+  ctx.errors.clear();
+  scene.ApplyConstraints(root, std::move(nodeParams.mConstrainables), ctx.onError);
+  DALI_TEST_CHECK(ctx.errors.empty());
+
+  app.GetScene().Add(root);
+  app.SendNotification();
+  app.Render();
+  app.SendNotification();
+  app.Render();
+
+  DALI_TEST_EQUAL(charlie.GetCurrentProperty(Actor::Property::ORIENTATION), alice.GetProperty(Actor::Property::ORIENTATION));
+  DALI_TEST_EQUAL(charlie.GetCurrentProperty(Actor::Property::POSITION), bob.GetProperty(Actor::Property::POSITION));
+  DALI_TEST_EQUAL(charlie.GetCurrentProperty(charlie.GetPropertyIndex("angularVelocity")), bob.GetProperty(bob.GetPropertyIndex("angularVelocity")));
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderNodeProcessor(void)
+{
+  Context ctx;
+
+  std::vector<Property::Map> nodeMaps;
+  ctx.input.mNodePropertyProcessor = [&](const NodeDefinition&, Property::Map&& map, StringCallback)
+  {
+    nodeMaps.push_back(map);
+  };
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "dli/node-processor.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+
+  DALI_TEST_EQUAL(nodeMaps.size(), 2u);
+  DALI_TEST_EQUAL(nodeMaps[0].Count(), 5u);
+  DALI_TEST_EQUAL(nodeMaps[0].Find("name")->Get<std::string>(), "rootA");
+  DALI_TEST_EQUAL(nodeMaps[0].Find("nickname")->Get<std::string>(), "same as name");
+  DALI_TEST_EQUAL(nodeMaps[0].Find("favourite number")->Get<int32_t>(), 63478);
+
+  auto propArray = nodeMaps[0].Find("array");
+  DALI_TEST_EQUAL(propArray->GetType(), Property::ARRAY);
+
+  auto array = propArray->GetArray();
+  DALI_TEST_EQUAL(array->Count(), 5);
+  DALI_TEST_EQUAL(array->GetElementAt(0).Get<int32_t>(), 1);
+  DALI_TEST_EQUAL(array->GetElementAt(1).Get<int32_t>(), 2);
+  DALI_TEST_EQUAL(array->GetElementAt(2).Get<int32_t>(), 4);
+  DALI_TEST_EQUAL(array->GetElementAt(3).Get<int32_t>(), 8);
+  DALI_TEST_EQUAL(array->GetElementAt(4).Get<int32_t>(), -500);
+
+  auto propObject = nodeMaps[0].Find("object");
+  DALI_TEST_EQUAL(propObject->GetType(), Property::MAP);
+
+  auto object = propObject->GetMap();
+  DALI_TEST_EQUAL(object->Count(), 5);
+  DALI_TEST_EQUAL(object->Find("physics")->Get<bool>(), true);
+  DALI_TEST_EQUAL(object->Find("elasticity")->Get<float>(), .27f);
+  DALI_TEST_EQUAL(object->Find("drag")->Get<float>(), .91f);
+
+  auto propInnerArray = object->Find("inner array");
+  DALI_TEST_EQUAL(propInnerArray->GetType(), Property::ARRAY);
+
+  auto innerArray = propInnerArray->GetArray();
+  DALI_TEST_EQUAL(innerArray->Count(), 3);
+  DALI_TEST_EQUAL(innerArray->GetElementAt(0).Get<std::string>(), "why");
+  DALI_TEST_EQUAL(innerArray->GetElementAt(1).Get<std::string>(), "not");
+  DALI_TEST_EQUAL(innerArray->GetElementAt(2).Get<bool>(), false);
+
+  auto propInnerObject = object->Find("inner object");
+  DALI_TEST_EQUAL(propInnerObject->GetType(), Property::MAP);
+
+  auto innerObject = propInnerObject->GetMap();
+  DALI_TEST_EQUAL(innerObject->Count(), 1);
+  DALI_TEST_EQUAL(innerObject->Find("supported")->Get<bool>(), true);
+
+  DALI_TEST_EQUAL(nodeMaps[1].Count(), 1u);
+  DALI_TEST_EQUAL(nodeMaps[1].Find("name")->Get<std::string>(), "rootB");
+
+  END_TEST;
+}
+
+int UtcDaliDliLoaderLoadCoverageTest(void)
+{
+  Context ctx;
+
+  auto path = ctx.pathProvider(ResourceType::Mesh) + "coverageTest.dli";
+  DALI_TEST_CHECK(ctx.loader.LoadModel(path, ctx.output));
+  DALI_TEST_CHECK(ctx.errors.empty());
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "root");
+
+  DALI_TEST_EQUAL(scene.GetNodeCount(), 1u);
+
+  auto& resources = ctx.resources;
+  DALI_TEST_EQUAL(resources.mMeshes.size(), 1u);
+  DALI_TEST_EQUAL(resources.mShaders.size(), 1u);
+  DALI_TEST_EQUAL(resources.mEnvironmentMaps.size(), 2u);
+  DALI_TEST_EQUAL(resources.mSkeletons.size(), 0u);
+
+  auto& materials = ctx.resources.mMaterials;
+  DALI_TEST_EQUAL(2u, materials.size());
+
+  auto  iMaterial = materials.begin();
+  auto& md        = iMaterial->first;
+  DALI_TEST_EQUAL(md.mTextureStages.size(), 1u);
+
+  auto iTexture = md.mTextureStages.begin();
+  DALI_TEST_CHECK(MaskMatch(iTexture->mSemantic, MaterialDefinition::OCCLUSION));
+  DALI_TEST_EQUAL(iTexture->mTexture.mImageUri, "exercise/Icons/Icon_Idle.png");
+  ++iTexture;
+
+  DALI_TEST_EQUAL(ctx.cameraParameters.size(), 1u);
+  DALI_TEST_EQUAL(ctx.lights.size(), 1u);
+  DALI_TEST_EQUAL(ctx.animations.size(), 0u);
+  DALI_TEST_EQUAL(ctx.animGroups.size(), 0u);
+
+  ViewProjection viewProjection;
+  Transforms     xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : scene.GetRoots())
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      ConfigureBlendShapeShaders(resources, scene, actor, std::move(nodeParams.mBlendshapeRequests));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_EQUAL(root.GetChildCount(), 1u);
+  DALI_TEST_EQUAL(root.GetChildAt(0).GetProperty(Actor::Property::NAME).Get<std::string>(), "root");
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-EnvironmentMapTask.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-EnvironmentMapTask.cpp
new file mode 100644
index 0000000..55b28d0
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-EnvironmentMapTask.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <toolkit-event-thread-callback.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <string_view>
+#include <dali-scene3d/internal/common/environment-map-load-task.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Internal;
+
+typedef IntrusivePtr<EnvironmentMapLoadTask> EnvironmentMapLoadTaskPtr;
+
+bool called = false;
+void LoadComplete()
+{
+  called = true;
+}
+
+int UtcDaliEnvironmentMapTaskSuccess01(void)
+{
+  ToolkitTestApplication    application;
+  EnvironmentMapLoadTaskPtr environmentMapLoadTask;
+
+  auto path              = TEST_RESOURCE_DIR "/forest_radiance.ktx";
+  environmentMapLoadTask = new EnvironmentMapLoadTask(path, Dali::Scene3D::EnvironmentMapType::AUTO, Dali::MakeCallback(LoadComplete));
+  Dali::AsyncTaskManager::Get().AddTask(environmentMapLoadTask);
+
+  DALI_TEST_CHECK(!called);
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_CHECK(called);
+  DALI_TEST_CHECK(environmentMapLoadTask->HasSucceeded());
+  DALI_TEST_CHECK(environmentMapLoadTask->GetLoadedTexture());
+  DALI_TEST_EQUALS(Dali::Scene3D::EnvironmentMapType::CUBEMAP, environmentMapLoadTask->GetEnvironmentMapType(), TEST_LOCATION);
+
+  environmentMapLoadTask.Reset();
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-GlbLoaderImpl.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-GlbLoaderImpl.cpp
new file mode 100644
index 0000000..14f5864
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-GlbLoaderImpl.cpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-scene3d/internal/loader/glb-loader-impl.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-test-suite-utils.h>
+#include <string_view>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+#define DALI_TEST_THROW(expression, exception, predicate) \
+  {                                                       \
+    bool daliTestThrowSuccess__ = false;                  \
+    try                                                   \
+    {                                                     \
+      do                                                  \
+      {                                                   \
+        expression;                                       \
+      } while(0);                                         \
+      printf("No exception was thrown.\n");               \
+    }                                                     \
+    catch(std::decay<exception>::type & ex)               \
+    {                                                     \
+      daliTestThrowSuccess__ = predicate(ex);             \
+    }                                                     \
+    catch(...)                                            \
+    {                                                     \
+      printf("Wrong type of exception thrown.\n");        \
+    }                                                     \
+    DALI_TEST_CHECK(daliTestThrowSuccess__);              \
+  }
+
+namespace
+{
+struct Context
+{
+  ResourceBundle::PathProvider pathProvider = [](ResourceType::Value type) {
+    return TEST_RESOURCE_DIR "/";
+  };
+
+  ResourceBundle  resources;
+  SceneDefinition scene;
+  SceneMetadata   metaData;
+
+  std::vector<AnimationDefinition>      animations;
+  std::vector<AnimationGroupDefinition> animationGroups;
+  std::vector<CameraParameters>         cameras;
+  std::vector<LightParameters>          lights;
+
+  LoadResult loadResult{
+    resources,
+    scene,
+    metaData,
+    animations,
+    animationGroups,
+    cameras,
+    lights};
+
+  Dali::Scene3D::Loader::Internal::GlbLoaderImpl loader;
+};
+
+struct ExceptionMessageStartsWith
+{
+  const std::string_view expected;
+
+  bool operator()(const std::runtime_error& e)
+  {
+    const bool success = (0 == strncmp(e.what(), expected.data(), expected.size()));
+    if(!success)
+    {
+      printf("Expected: %s, got: %s.\n", expected.data(), e.what());
+    }
+    return success;
+  }
+};
+
+} // namespace
+
+int UtcDaliGlbLoaderFailedToLoad(void)
+{
+  Context ctx;
+
+  DALI_TEST_EQUAL(ctx.loader.LoadModel("non-existent.glb", ctx.loadResult), false);
+
+  DALI_TEST_EQUAL(0, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(0, ctx.scene.GetNodeCount());
+
+  DALI_TEST_EQUAL(0, ctx.resources.mEnvironmentMaps.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMaterials.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMeshes.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mShaders.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mSkeletons.size());
+
+  DALI_TEST_EQUAL(0, ctx.cameras.size());
+  DALI_TEST_EQUAL(0, ctx.lights.size());
+  DALI_TEST_EQUAL(0, ctx.animations.size());
+  DALI_TEST_EQUAL(0, ctx.animationGroups.size());
+
+  END_TEST;
+}
+
+int UtcDaliGlbLoaderFailedToParse(void)
+{
+  Context ctx;
+  DALI_TEST_EQUAL(ctx.loader.LoadModel(TEST_RESOURCE_DIR "/invalid.glb", ctx.loadResult), false);
+
+  DALI_TEST_EQUAL(0, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(0, ctx.scene.GetNodeCount());
+
+  DALI_TEST_EQUAL(0, ctx.resources.mEnvironmentMaps.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMaterials.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMeshes.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mSkeletons.size());
+
+  DALI_TEST_EQUAL(0, ctx.cameras.size());
+  DALI_TEST_EQUAL(0, ctx.lights.size());
+  DALI_TEST_EQUAL(0, ctx.animations.size());
+  DALI_TEST_EQUAL(0, ctx.animationGroups.size());
+
+  END_TEST;
+}
+
+int UtcDaliGlbLoaderSuccess1(void)
+{
+  Context                 ctx;
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/BoxAnimated.glb", ctx.loadResult);
+
+  DALI_TEST_EQUAL(1u, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(5u, ctx.scene.GetNodeCount());
+
+  TestApplication app;
+
+  Customization::Choices choices;
+  for(auto iRoot : ctx.scene.GetRoots())
+  {
+    auto resourceRefs = ctx.resources.CreateRefCounter();
+    ctx.scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    ctx.resources.mReferenceCounts = std::move(resourceRefs);
+    ctx.resources.LoadResources(ctx.pathProvider);
+  }
+
+  DALI_TEST_EQUAL(true, ctx.resources.mMeshes[0u].first.mPositions.IsDefined());
+  DALI_TEST_EQUAL(1152, ctx.resources.mMeshes[0u].first.mPositions.mBlob.mLength);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-Gltf2Asset.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-Gltf2Asset.cpp
new file mode 100644
index 0000000..e60dfe4
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-Gltf2Asset.cpp
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-test-suite-utils.h>
+#include <string>
+#include "dali-scene3d/internal/loader/gltf2-asset.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliGltf2AssetComponentIsUnsigned(void)
+{
+  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::BYTE), false);
+  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::UNSIGNED_BYTE), true);
+  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::SHORT), false);
+  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::UNSIGNED_SHORT), true);
+  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::UNSIGNED_INT), true);
+  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::FLOAT), false);
+  DALI_TEST_EQUAL(gltf2::Component::IsUnsigned(gltf2::Component::INVALID), false);
+
+  END_TEST;
+}
+
+int UtcDaliGltf2AssetComponentSize(void)
+{
+  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::BYTE), 1u);
+  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::UNSIGNED_BYTE), 1u);
+  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::SHORT), 2u);
+  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::UNSIGNED_SHORT), 2u);
+  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::UNSIGNED_INT), 4u);
+  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::FLOAT), 4u);
+  DALI_TEST_EQUAL(gltf2::Component::Size(gltf2::Component::INVALID), -1);
+
+  END_TEST;
+}
+
+#define FROM_STRING_HELPER(x) FromString(#x, strlen(#x))
+#define TARGET_FROM_STRING_HELPER(x) TargetFromString(#x, strlen(#x))
+#define HASH_FROM_STRING_HELPER(x) HashFromString(#x, strlen(#x))
+
+#define STRING_CHECK(type, x) DALI_TEST_EQUAL(gltf2::type::FROM_STRING_HELPER(x), gltf2::type::x)
+#define TARGET_STRING_CHECK(type, x) DALI_TEST_EQUAL(gltf2::type::TARGET_FROM_STRING_HELPER(x), gltf2::type::x)
+#define HASH_STRING_CHECK(type, x, y, z) DALI_TEST_EQUAL(gltf2::type::HASH_FROM_STRING_HELPER(x), gltf2::type::ToHash(gltf2::type::y, true, z))
+
+int UtcDaliGltf2AssetAccessorType(void)
+{
+  STRING_CHECK(AccessorType, SCALAR);
+  STRING_CHECK(AccessorType, VEC2);
+  STRING_CHECK(AccessorType, VEC3);
+  STRING_CHECK(AccessorType, VEC4);
+  STRING_CHECK(AccessorType, MAT2);
+  STRING_CHECK(AccessorType, MAT3);
+  STRING_CHECK(AccessorType, MAT4);
+  DALI_TEST_EQUAL(gltf2::AccessorType::FROM_STRING_HELPER(VEC88), gltf2::AccessorType::INVALID);
+
+  END_TEST;
+}
+
+int UtcDaliGltf2AssetAlphaMode(void)
+{
+  STRING_CHECK(AlphaMode, OPAQUE);
+  STRING_CHECK(AlphaMode, MASK);
+  STRING_CHECK(AlphaMode, BLEND);
+  DALI_TEST_EQUAL(gltf2::AlphaMode::FROM_STRING_HELPER(ALPHA_SCHMALPHA), gltf2::AlphaMode::INVALID);
+
+  END_TEST;
+}
+
+int UtcDaliGltf2AssetAttribute(void)
+{
+  TARGET_STRING_CHECK(Attribute, POSITION);
+  TARGET_STRING_CHECK(Attribute, NORMAL);
+  TARGET_STRING_CHECK(Attribute, TANGENT);
+  HASH_STRING_CHECK(Attribute, TEXCOORD_0, TEXCOORD_N, 0);
+  HASH_STRING_CHECK(Attribute, TEXCOORD_1, TEXCOORD_N, 1);
+  HASH_STRING_CHECK(Attribute, COLOR_0, COLOR_N, 0);
+  HASH_STRING_CHECK(Attribute, COLOR_1, COLOR_N, 1);
+  HASH_STRING_CHECK(Attribute, JOINTS_0, JOINTS_N, 0);
+  HASH_STRING_CHECK(Attribute, JOINTS_1, JOINTS_N, 1);
+  HASH_STRING_CHECK(Attribute, JOINTS_2, JOINTS_N, 2);
+  HASH_STRING_CHECK(Attribute, WEIGHTS_0, WEIGHTS_N, 0);
+  HASH_STRING_CHECK(Attribute, WEIGHTS_1, WEIGHTS_N, 1);
+  HASH_STRING_CHECK(Attribute, WEIGHTS_2, WEIGHTS_N, 2);
+  DALI_TEST_EQUAL(gltf2::Attribute::TARGET_FROM_STRING_HELPER(VISCOSITY), gltf2::Attribute::INVALID);
+
+  END_TEST;
+}
+
+int UtcDaliGltf2AssetAnimationSamplerInterpolation(void)
+{
+  STRING_CHECK(Animation::Sampler::Interpolation, STEP);
+  STRING_CHECK(Animation::Sampler::Interpolation, LINEAR);
+  STRING_CHECK(Animation::Sampler::Interpolation, CUBICSPLINE);
+  DALI_TEST_EQUAL(gltf2::Animation::Sampler::Interpolation::FROM_STRING_HELPER(EASE_IN_OUT), gltf2::Animation::Sampler::Interpolation::INVALID);
+
+  END_TEST;
+}
+
+int UtcDaliGltf2AssetAnimationChannelTarget(void)
+{
+  STRING_CHECK(Animation::Channel::Target, TRANSLATION);
+  STRING_CHECK(Animation::Channel::Target, ROTATION);
+  STRING_CHECK(Animation::Channel::Target, SCALE);
+  STRING_CHECK(Animation::Channel::Target, WEIGHTS);
+  DALI_TEST_EQUAL(gltf2::Animation::Channel::Target::FROM_STRING_HELPER(FLUFFINESS), gltf2::Animation::Channel::Target::INVALID);
+
+  END_TEST;
+}
+
+int UtcDaliGltf2AssetAccessorSparse(void)
+{
+  gltf2::Accessor acc;
+  DALI_TEST_CHECK(!acc.mSparse);
+
+  std::vector<gltf2::BufferView> bufferViews;
+
+  gltf2::Accessor::Sparse sparse{256u};
+  sparse.mIndices.mBufferView    = gltf2::Ref<gltf2::BufferView>(bufferViews, 5u);
+  sparse.mIndices.mComponentType = gltf2::Component::FLOAT;
+  sparse.mValues.mBufferView     = gltf2::Ref<gltf2::BufferView>(bufferViews, 284u);
+  sparse.mValues.mByteOffset     = 16532;
+  acc.SetSparse(sparse);
+
+  DALI_TEST_EQUAL(acc.mSparse->mCount, sparse.mCount);
+  DALI_TEST_EQUAL(acc.mSparse->mIndices.mBufferView, sparse.mIndices.mBufferView);
+  DALI_TEST_EQUAL(acc.mSparse->mIndices.mByteOffset, sparse.mIndices.mByteOffset);
+  DALI_TEST_EQUAL(acc.mSparse->mIndices.mComponentType, sparse.mIndices.mComponentType);
+  DALI_TEST_EQUAL(acc.mSparse->mValues.mBufferView, sparse.mValues.mBufferView);
+  DALI_TEST_EQUAL(acc.mSparse->mValues.mByteOffset, sparse.mValues.mByteOffset);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-Gltf2LoaderImpl.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-Gltf2LoaderImpl.cpp
new file mode 100644
index 0000000..069941c
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-Gltf2LoaderImpl.cpp
@@ -0,0 +1,992 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-scene3d/internal/loader/gltf2-loader-impl.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-test-suite-utils.h>
+#include <string_view>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+#define DALI_TEST_THROW(expression, exception, predicate) \
+  {                                                       \
+    bool daliTestThrowSuccess__ = false;                  \
+    try                                                   \
+    {                                                     \
+      do                                                  \
+      {                                                   \
+        expression;                                       \
+      } while(0);                                         \
+      printf("No exception was thrown.\n");               \
+    }                                                     \
+    catch(std::decay<exception>::type & ex)               \
+    {                                                     \
+      daliTestThrowSuccess__ = predicate(ex);             \
+    }                                                     \
+    catch(...)                                            \
+    {                                                     \
+      printf("Wrong type of exception thrown.\n");        \
+    }                                                     \
+    DALI_TEST_CHECK(daliTestThrowSuccess__);              \
+  }
+
+namespace
+{
+struct Context
+{
+  ResourceBundle::PathProvider pathProvider = [](ResourceType::Value type) {
+    return TEST_RESOURCE_DIR "/";
+  };
+
+  ResourceBundle  resources;
+  SceneDefinition scene;
+  SceneMetadata   metaData;
+
+  std::vector<AnimationDefinition>      animations;
+  std::vector<AnimationGroupDefinition> animationGroups;
+  std::vector<CameraParameters>         cameras;
+  std::vector<LightParameters>          lights;
+
+  LoadResult loadResult{
+    resources,
+    scene,
+    metaData,
+    animations,
+    animationGroups,
+    cameras,
+    lights};
+
+  Dali::Scene3D::Loader::Internal::Gltf2LoaderImpl loader;
+};
+
+struct ExceptionMessageStartsWith
+{
+  const std::string_view expected;
+
+  bool operator()(const std::runtime_error& e)
+  {
+    const bool success = (0 == strncmp(e.what(), expected.data(), expected.size()));
+    if(!success)
+    {
+      printf("Expected: %s, got: %s.\n", expected.data(), e.what());
+    }
+    return success;
+  }
+};
+
+} // namespace
+
+int UtcDaliGltfLoaderFailedToLoad1(void)
+{
+  Context ctx;
+
+  DALI_TEST_EQUAL(ctx.loader.LoadModel("non-existent.gltf", ctx.loadResult), false);
+
+  DALI_TEST_EQUAL(0, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(0, ctx.scene.GetNodeCount());
+
+  DALI_TEST_EQUAL(0, ctx.resources.mEnvironmentMaps.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMaterials.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMeshes.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mShaders.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mSkeletons.size());
+
+  DALI_TEST_EQUAL(0, ctx.cameras.size());
+  DALI_TEST_EQUAL(0, ctx.lights.size());
+  DALI_TEST_EQUAL(0, ctx.animations.size());
+  DALI_TEST_EQUAL(0, ctx.animationGroups.size());
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderFailedToLoad2(void)
+{
+  Context ctx;
+
+  try
+  {
+    DALI_TEST_EQUAL(ctx.loader.LoadModel(TEST_RESOURCE_DIR "/UnsupportedExtension.gltf", ctx.loadResult), false);
+  }
+  catch(...)
+  {
+    printf("Unsupported glTF extension required.\n");
+  }
+
+  DALI_TEST_EQUAL(0, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(0, ctx.scene.GetNodeCount());
+
+  DALI_TEST_EQUAL(0, ctx.resources.mEnvironmentMaps.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMaterials.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMeshes.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mShaders.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mSkeletons.size());
+
+  DALI_TEST_EQUAL(0, ctx.cameras.size());
+  DALI_TEST_EQUAL(0, ctx.lights.size());
+  DALI_TEST_EQUAL(0, ctx.animations.size());
+  DALI_TEST_EQUAL(0, ctx.animationGroups.size());
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderFailedToParse(void)
+{
+  Context ctx;
+
+  DALI_TEST_EQUAL(ctx.loader.LoadModel(TEST_RESOURCE_DIR "/invalid.gltf", ctx.loadResult), false);
+
+  DALI_TEST_EQUAL(0, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(0, ctx.scene.GetNodeCount());
+
+  DALI_TEST_EQUAL(0, ctx.resources.mEnvironmentMaps.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMaterials.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mMeshes.size());
+  DALI_TEST_EQUAL(0, ctx.resources.mSkeletons.size());
+
+  DALI_TEST_EQUAL(0, ctx.cameras.size());
+  DALI_TEST_EQUAL(0, ctx.lights.size());
+  DALI_TEST_EQUAL(0, ctx.animations.size());
+  DALI_TEST_EQUAL(0, ctx.animationGroups.size());
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderSuccess1(void)
+{
+  Context ctx;
+
+  LoadSceneMetadata(TEST_RESOURCE_DIR "/AnimatedCube.metadata", ctx.metaData);
+
+  std::unordered_map<std::string, ImageMetadata> imageMetadataGroundTruth;
+  imageMetadataGroundTruth["AnimatedCube_BaseColor.png"]         = ImageMetadata{ImageDimensions(256, 256), Dali::SamplingMode::BOX_THEN_NEAREST};
+  imageMetadataGroundTruth["AnimatedCube_MetallicRoughness.png"] = ImageMetadata{ImageDimensions(256, 256), Dali::SamplingMode::NEAREST};
+
+  auto metaData = ctx.metaData.mImageMetadata.begin();
+  for(auto& groundTruth : imageMetadataGroundTruth)
+  {
+    DALI_TEST_EQUAL(groundTruth.first, metaData->first);
+    DALI_TEST_EQUAL(groundTruth.second.mMinSize, metaData->second.mMinSize);
+    DALI_TEST_EQUAL(groundTruth.second.mSamplingMode, metaData->second.mSamplingMode);
+    ++metaData;
+  }
+
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/AnimatedCube.gltf", ctx.loadResult);
+
+  DALI_TEST_EQUAL(1u, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(9u, ctx.scene.GetNodeCount());
+
+  // Default envmap is used
+  DALI_TEST_EQUAL(1u, ctx.resources.mEnvironmentMaps.size());
+
+  TestApplication app;
+
+  Customization::Choices choices;
+  for(auto iRoot : ctx.scene.GetRoots())
+  {
+    auto resourceRefs = ctx.resources.CreateRefCounter();
+    ctx.scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    ctx.resources.mReferenceCounts = std::move(resourceRefs);
+    ctx.resources.CountEnvironmentReferences();
+    ctx.resources.LoadResources(ctx.pathProvider);
+  }
+
+  auto& materials = ctx.resources.mMaterials;
+  DALI_TEST_EQUAL(2u, materials.size());
+  const MaterialDefinition materialGroundTruth[]{
+    {nullptr,
+     MaterialDefinition::ALBEDO | MaterialDefinition::EMISSIVE | MaterialDefinition::OCCLUSION |
+       MaterialDefinition::NORMAL | MaterialDefinition::SPECULAR | MaterialDefinition::SPECULAR_COLOR |
+       MaterialDefinition::GLTF_CHANNELS | (0x80 << MaterialDefinition::ALPHA_CUTOFF_SHIFT),
+     0,
+     Color::WHITE,
+     1.f,
+     0.f,
+     Vector4(1.000, 0.766, 0.336, 1.0),
+     1.f,
+     1.f,
+     Vector3(0.2, 0.1, 0.0),
+     1.0f,
+     0.0f,
+     0.5f,
+     Vector3(0, 0, 1),
+     true,
+     false,
+     true,
+     false,
+     Scene3D::Material::AlphaModeType::MASK,
+     true,
+     true,
+     true,
+     {
+       {
+         MaterialDefinition::ALBEDO,
+         {
+           "AnimatedCube_BaseColor.png",
+           SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+           ImageDimensions(256, 256),
+           SamplingMode::BOX_THEN_NEAREST,
+         },
+       },
+       {
+         MaterialDefinition::NORMAL,
+         {
+           "AnimatedCube_BaseColor.png",
+           SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+           ImageDimensions(256, 256),
+           SamplingMode::BOX_THEN_NEAREST,
+         },
+       },
+       {
+         MaterialDefinition::OCCLUSION,
+         {
+           "AnimatedCube_BaseColor.png",
+           SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+           ImageDimensions(256, 256),
+           SamplingMode::BOX_THEN_NEAREST,
+         },
+       },
+       {
+         MaterialDefinition::EMISSIVE,
+         {
+           "AnimatedCube_BaseColor.png",
+           SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+           ImageDimensions(256, 256),
+           SamplingMode::BOX_THEN_NEAREST,
+         },
+       },
+       {
+         MaterialDefinition::SPECULAR,
+         {
+           "AnimatedCube_BaseColor.png",
+           SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+           ImageDimensions(256, 256),
+           SamplingMode::BOX_THEN_NEAREST,
+         },
+       },
+       {
+         MaterialDefinition::SPECULAR_COLOR,
+         {
+           "AnimatedCube_BaseColor.png",
+           SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+           ImageDimensions(256, 256),
+           SamplingMode::BOX_THEN_NEAREST,
+         },
+       },
+     },
+     nullptr},
+    {
+      nullptr,
+      MaterialDefinition::ALBEDO | MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS |
+        MaterialDefinition::EMISSIVE | MaterialDefinition::OCCLUSION | MaterialDefinition::NORMAL |
+        MaterialDefinition::GLTF_CHANNELS,
+      0,
+      Color::WHITE,
+      1.f,
+      0.f,
+      Vector4(1.000, 0.766, 0.336, 1.0),
+      1.f,
+      1.f,
+      Vector3(0.2, 0.1, 0.0),
+      -1.0f,
+      0.04f,
+      1.0f,
+      Vector3::ONE,
+      true,
+      true,
+      true,
+      false,
+      Scene3D::Material::AlphaModeType::OPAQUE,
+      true,
+      false,
+      true,
+      {
+        {
+          MaterialDefinition::ALBEDO,
+          {
+            "AnimatedCube_BaseColor.png",
+            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+            ImageDimensions(256, 256),
+            SamplingMode::BOX_THEN_NEAREST,
+          },
+        },
+        {
+          MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS,
+          {
+            "AnimatedCube_MetallicRoughness.png",
+            SamplerFlags::Encode(FilterMode::NEAREST_MIPMAP_LINEAR, FilterMode::NEAREST, WrapMode::CLAMP_TO_EDGE, WrapMode::MIRRORED_REPEAT),
+            ImageDimensions(256, 256),
+            SamplingMode::NEAREST,
+          },
+        },
+        {
+          MaterialDefinition::NORMAL,
+          {
+            "AnimatedCube_BaseColor.png",
+            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+            ImageDimensions(256, 256),
+            SamplingMode::BOX_THEN_NEAREST,
+          },
+        },
+        {
+          MaterialDefinition::OCCLUSION,
+          {
+            "AnimatedCube_BaseColor.png",
+            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+            ImageDimensions(256, 256),
+            SamplingMode::BOX_THEN_NEAREST,
+          },
+        },
+        {
+          MaterialDefinition::EMISSIVE,
+          {
+            "AnimatedCube_BaseColor.png",
+            SamplerFlags::Encode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR, WrapMode::CLAMP_TO_EDGE, WrapMode::REPEAT),
+            ImageDimensions(256, 256),
+            SamplingMode::BOX_THEN_NEAREST,
+          },
+        },
+      },
+      nullptr,
+    },
+  };
+
+  auto iMaterial = materials.begin();
+  auto iMetadata = ctx.metaData.mImageMetadata.begin();
+  for(auto& m : materialGroundTruth)
+  {
+    printf("material %ld\n", iMaterial - materials.begin());
+    auto& md = iMaterial->first;
+    DALI_TEST_EQUAL(md.mFlags, m.mFlags);
+    DALI_TEST_EQUAL(md.mEnvironmentIdx, m.mEnvironmentIdx);
+    DALI_TEST_EQUAL(md.mColor, m.mColor);
+    DALI_TEST_EQUAL(md.mMetallic, m.mMetallic);
+    DALI_TEST_EQUAL(md.mRoughness, m.mRoughness);
+    DALI_TEST_EQUAL(md.mBaseColorFactor, m.mBaseColorFactor);
+    DALI_TEST_EQUAL(md.mNormalScale, m.mNormalScale);
+    DALI_TEST_EQUAL(md.mOcclusionStrength, m.mOcclusionStrength);
+    DALI_TEST_EQUAL(md.mEmissiveFactor, m.mEmissiveFactor);
+    DALI_TEST_EQUAL(md.mIor, m.mIor);
+    DALI_TEST_EQUAL(md.mDielectricSpecular, m.mDielectricSpecular);
+    DALI_TEST_EQUAL(md.mSpecularFactor, m.mSpecularFactor);
+    DALI_TEST_EQUAL(md.mSpecularColorFactor, m.mSpecularColorFactor);
+    DALI_TEST_EQUAL(md.mNeedAlbedoTexture, m.mNeedAlbedoTexture);
+    DALI_TEST_EQUAL(md.mNeedMetallicRoughnessTexture, m.mNeedMetallicRoughnessTexture);
+    DALI_TEST_EQUAL(md.mNeedNormalTexture, m.mNeedNormalTexture);
+    DALI_TEST_EQUAL(md.mAlphaModeType, m.mAlphaModeType);
+    DALI_TEST_EQUAL(md.mIsOpaque, m.mIsOpaque);
+    DALI_TEST_EQUAL(md.mIsMask, m.mIsMask);
+
+    DALI_TEST_EQUAL(md.mTextureStages.size(), m.mTextureStages.size());
+    auto iTexture = md.mTextureStages.begin();
+    for(auto& ts : m.mTextureStages)
+    {
+      printf("texture %ld\n", iTexture - md.mTextureStages.begin());
+      DALI_TEST_EQUAL(iTexture->mSemantic, ts.mSemantic);
+      DALI_TEST_EQUAL(iTexture->mTexture.mImageUri, ts.mTexture.mImageUri);
+      DALI_TEST_EQUAL(uint32_t(iTexture->mTexture.mSamplerFlags), uint32_t(ts.mTexture.mSamplerFlags)); // don't interpret it as a character
+      DALI_TEST_EQUAL(iTexture->mTexture.mMinImageDimensions, ts.mTexture.mMinImageDimensions);
+      DALI_TEST_EQUAL(iTexture->mTexture.mSamplingMode, ts.mTexture.mSamplingMode);
+
+      ++iTexture;
+    }
+    ++iMaterial;
+    ++iMetadata;
+  }
+
+  auto& meshes = ctx.resources.mMeshes;
+  DALI_TEST_EQUAL(2u, meshes.size());
+
+  using Blob     = MeshDefinition::Blob;
+  using Accessor = MeshDefinition::Accessor;
+  MeshDefinition meshGroundTruth[]{
+    {
+      nullptr,
+      0,
+      Geometry::TRIANGLES,
+      "AnimatedCube.bin",
+      Accessor{Blob{0, 0}, {}},
+      Accessor{Blob{0, 0}, {}},
+      Accessor{Blob{0, 0}, {}},
+      Accessor{Blob{0, 0}, {}},
+    },
+    {
+      nullptr,
+      0,
+      Geometry::TRIANGLES,
+      "AnimatedCube.bin",
+      Accessor{Blob{0, 0}, {}},
+      Accessor{Blob{0, 0}, {}},
+      Accessor{Blob{0, 0}, {}},
+      Accessor{Blob{0, 0}, {}},
+    },
+  };
+  meshGroundTruth[0].mColors.push_back(Accessor{Blob{0, 0}, {}});
+  meshGroundTruth[0].mTexCoords.push_back(Accessor{Blob{0, 0}, {}});
+  meshGroundTruth[1].mColors.push_back(Accessor{Blob{0, 0}, {}});
+  meshGroundTruth[1].mTexCoords.push_back(Accessor{Blob{0, 0}, {}});
+
+  auto iMesh = meshes.begin();
+  for(auto& m : meshGroundTruth)
+  {
+    printf("mesh %ld\n", iMesh - meshes.begin());
+
+    auto& md = iMesh->first;
+    DALI_TEST_EQUAL(md.mFlags, m.mFlags);
+    DALI_TEST_EQUAL(md.mPrimitiveType, m.mPrimitiveType);
+
+    DALI_TEST_EQUAL((md.mIndices).IsDefined(), (m.mIndices).IsDefined());
+    DALI_TEST_EQUAL((md.mIndices).mBlob.IsDefined(), (m.mIndices).mBlob.IsDefined());
+
+    DALI_TEST_EQUAL((md.mPositions).IsDefined(), (m.mPositions).IsDefined());
+    DALI_TEST_EQUAL((md.mPositions).mBlob.IsDefined(), (m.mPositions).mBlob.IsDefined());
+
+    DALI_TEST_EQUAL((md.mNormals).IsDefined(), (m.mNormals).IsDefined());
+    DALI_TEST_EQUAL((md.mNormals).mBlob.IsDefined(), (m.mNormals).mBlob.IsDefined());
+
+    DALI_TEST_EQUAL((md.mTangents).IsDefined(), (m.mTangents).IsDefined());
+    DALI_TEST_EQUAL((md.mTangents).mBlob.IsDefined(), (m.mTangents).mBlob.IsDefined());
+
+    DALI_TEST_EQUAL(md.mTexCoords.empty(), m.mTexCoords.empty());
+    DALI_TEST_EQUAL(md.mColors.empty(), m.mColors.empty());
+
+    DALI_TEST_EQUAL(md.mJoints.empty(), (m.mJoints.empty()));
+    DALI_TEST_EQUAL(md.mWeights.empty(), (m.mWeights.empty()));
+
+    DALI_TEST_EQUAL(md.mBlendShapeHeader.IsDefined(), m.mBlendShapeHeader.IsDefined());
+
+    ++iMesh;
+  }
+
+  DALI_TEST_EQUAL(0u, ctx.resources.mSkeletons.size());
+
+  DALI_TEST_EQUAL(6u, ctx.cameras.size());
+  DALI_TEST_EQUAL(0u, ctx.lights.size());
+  DALI_TEST_EQUAL(1u, ctx.animations.size());
+  DALI_TEST_EQUAL(0u, ctx.animationGroups.size());
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderSuccess2(void)
+{
+  Context ctx;
+
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/AnimatedCubeStride.gltf", ctx.loadResult);
+
+  DALI_TEST_EQUAL(1u, ctx.scene.GetRoots().size());
+  DALI_TEST_EQUAL(1u, ctx.scene.GetNodeCount());
+
+  TestApplication app;
+
+  Customization::Choices choices;
+  for(auto iRoot : ctx.scene.GetRoots())
+  {
+    auto resourceRefs = ctx.resources.CreateRefCounter();
+    ctx.scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    ctx.resources.mReferenceCounts = std::move(resourceRefs);
+    ctx.resources.LoadResources(ctx.pathProvider);
+  }
+
+  DALI_TEST_EQUAL(true, ctx.resources.mMeshes[0u].first.mPositions.IsDefined());
+  DALI_TEST_EQUAL(432, ctx.resources.mMeshes[0u].first.mPositions.mBlob.mLength);
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderSuccessShort(void)
+{
+  TestApplication app;
+
+  const std::string resourcePath = TEST_RESOURCE_DIR "/";
+  auto              pathProvider = [resourcePath](ResourceType::Value) {
+    return resourcePath;
+  };
+
+  Customization::Choices choices;
+  for(auto modelName : {
+        "2CylinderEngine",
+        "AnimatedMorphCube",
+        "AnimatedMorphCubeAnimateNonZeroFrame",
+        "AnimatedMorphSphere",
+        "AnimatedTriangle",
+        "BoxAnimated",
+        "CesiumMan",
+        "CesiumMilkTruck",
+        "EnvironmentTest",
+        "MetalRoughSpheres",
+        "MorphPrimitivesTest",
+        "MRendererTest",
+        "SimpleSparseAccessor",
+        "TextureTransformMultiTest",
+        "AnimatedCube",
+        /**
+         * For the Avocado glTF file and its Assets
+         * Donated by Microsoft for glTF testing
+         * Take from https://github.com/KhronosGroup/glTF-Sample-Models/blob/master/2.0/Avocado/glTF-Quantized
+         */
+        "AvocadoQuantized",
+        /**
+         * For the AnimatedMorphCube glTF file and its Assets
+         * Donated by Microsoft for glTF testing
+         * Take from https://github.com/KhronosGroup/glTF-Sample-Models/blob/master/2.0/AnimatedMorphCube/glTF-Quantized
+         */
+        "AnimatedMorphCubeQuantized",
+        /**
+         * For the MorphPrimitivesTest glTF file and its Assets
+         * Created by @ft-lab
+         * Licensed under the terms of the CC BY 4.0 license: https://creativecommons.org/licenses/by/4.0/
+         * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/MorphPrimitivesTest/glTF
+         * Modified using gltfpack 0.18.
+         */
+        "MorphPrimitivesTestQuantized",
+        /**
+         * For the CesiumMilkTruck glTF file and its Assets
+         * Donated by Cesium for glTF testing
+         * Licensed under the terms of the CC BY 4.0 license: http://creativecommons.org/licenses/by/4.0/
+         * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/CesiumMilkTruck/glTF
+         * Modified using gltfpack 0.18.
+         */
+        "CesiumMilkTruckQuantized",
+      })
+  {
+    Context ctx;
+
+    auto& resources = ctx.resources;
+    resources.mEnvironmentMaps.push_back({});
+
+    printf("%s\n", modelName);
+    ctx.loader.LoadModel(resourcePath + modelName + ".gltf", ctx.loadResult);
+    DALI_TEST_CHECK(ctx.scene.GetNodeCount() > 0);
+
+    auto& scene = ctx.scene;
+    for(auto iRoot : scene.GetRoots())
+    {
+      struct Visitor : NodeDefinition::IVisitor
+      {
+        struct ResourceReceiver : IResourceReceiver
+        {
+          std::vector<bool> mCounts;
+
+          void Register(ResourceType::Value type, Index id) override
+          {
+            if(type == ResourceType::Mesh)
+            {
+              mCounts[id] = true;
+            }
+          }
+        } receiver;
+
+        void Start(NodeDefinition& n) override
+        {
+          for(auto& renderable : n.mRenderables)
+          {
+            renderable->RegisterResources(receiver);
+          }
+        }
+
+        void Finish(NodeDefinition& n) override
+        {
+        }
+      } visitor;
+      visitor.receiver.mCounts.resize(resources.mMeshes.size(), false);
+
+      scene.Visit(iRoot, choices, visitor);
+      for(uint32_t i0 = 0, i1 = resources.mMeshes.size(); i0 < i1; ++i0)
+      {
+        if(visitor.receiver.mCounts[i0])
+        {
+          auto raw = resources.mMeshes[i0].first.LoadRaw(resourcePath, resources.mBuffers);
+          DALI_TEST_CHECK(!raw.mAttribs.empty());
+
+          resources.mMeshes[i0].second = resources.mMeshes[i0].first.Load(std::move(raw));
+          DALI_TEST_CHECK(resources.mMeshes[i0].second.geometry);
+        }
+      }
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderMRendererTest(void)
+{
+  Context ctx;
+  auto&   resources = ctx.resources;
+
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/MRendererTest.gltf", ctx.loadResult);
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mName, "RootNode");
+  DALI_TEST_EQUAL(scene.GetNode(roots[0])->mScale, Vector3(1.0f, 1.0f, 1.0f));
+
+  DALI_TEST_EQUAL(scene.GetNodeCount(), 1u);
+
+  Scene3D::Loader::ShaderManagerPtr shaderManager = new Scene3D::Loader::ShaderManager();
+  ViewProjection                    viewProjection;
+  Transforms                        xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+    shaderManager,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : roots)
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    ctx.resources.mReferenceCounts = std::move(resourceRefs);
+    ctx.resources.CountEnvironmentReferences();
+    ctx.resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_EQUAL(root.GetChildCount(), 1u);
+  Actor child = root.GetChildAt(0);
+
+  DALI_TEST_EQUAL(child.GetProperty(Actor::Property::NAME).Get<std::string>(), "RootNode");
+  DALI_TEST_EQUAL(child.GetProperty(Actor::Property::SCALE).Get<Vector3>(), Vector3(1.0f, 1.0f, 1.0f));
+  DALI_TEST_EQUAL(child.GetRendererCount(), 1u);
+  DALI_TEST_EQUAL(child.GetRendererAt(0).GetTextures().GetTextureCount(), 5u);
+
+  DALI_TEST_EQUAL(child.GetRendererCount(), 1u);
+  DALI_TEST_EQUAL(child.GetRendererAt(0u).GetProperty<decltype(BlendMode::ON)>(Renderer::Property::BLEND_MODE), BlendMode::ON);
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderAnimationLoadingTest(void)
+{
+  TestApplication app;
+  Context         ctx;
+
+  auto& resources = ctx.resources;
+
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/CesiumMan_e.gltf", ctx.loadResult);
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+
+  Scene3D::Loader::ShaderManagerPtr shaderManager = new Scene3D::Loader::ShaderManager();
+  ViewProjection                    viewProjection;
+  Transforms                        xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+    shaderManager,
+  };
+
+  Customization::Choices choices;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : roots)
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_EQUAL(ctx.loadResult.mAnimationDefinitions.size(), 1u);
+  DALI_TEST_EQUAL(ctx.loadResult.mAnimationDefinitions[0].GetPropertyCount(), 57u);
+
+  uint32_t id = ctx.loadResult.mScene.GetNode(ctx.loadResult.mAnimationDefinitions[0].GetPropertyAt(0).mNodeIndex)->mNodeId;
+  DALI_TEST_EQUAL(id, root.FindChildByName("Skeleton_torso_joint_1").GetProperty<int32_t>(Dali::Actor::Property::ID));
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderImageFromBufferView(void)
+{
+  Context ctx;
+
+  auto& resources = ctx.resources;
+
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/EnvironmentTest_b.gltf", ctx.loadResult);
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+
+  Scene3D::Loader::ShaderManagerPtr shaderManager = new Scene3D::Loader::ShaderManager();
+  ViewProjection                    viewProjection;
+  Transforms                        xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+    shaderManager,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : roots)
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_CHECK(resources.mMaterials[0].second.GetTextureCount() > 1);
+  DALI_TEST_EQUAL(resources.mMaterials[0].second.GetTexture(0).GetWidth(), 256);
+  DALI_TEST_EQUAL(resources.mMaterials[0].second.GetTexture(0).GetHeight(), 256);
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderUint8Indices(void)
+{
+  Context ctx;
+
+  auto& resources = ctx.resources;
+
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/AlphaBlendModeTest.gltf", ctx.loadResult);
+
+  auto& scene = ctx.scene;
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+
+  Scene3D::Loader::ShaderManagerPtr shaderManager = new Scene3D::Loader::ShaderManager();
+  ViewProjection                    viewProjection;
+  Transforms                        xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+    shaderManager,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : roots)
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  DALI_TEST_CHECK(root.FindChildByName("Bed"));
+  DALI_TEST_CHECK(root.FindChildByName("DecalBlend"));
+  DALI_TEST_CHECK(root.FindChildByName("DecalOpaque"));
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderQuantizedMesh(void)
+{
+  Context ctx;
+
+  auto& resources = ctx.resources;
+
+  /**
+   * For the Avocado glTF file and its Assets
+   * Donated by Microsoft for glTF testing
+   * Take from https://github.com/KhronosGroup/glTF-Sample-Models/blob/master/2.0/Avocado/glTF-Quantized
+   */
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/AvocadoQuantized.gltf", ctx.loadResult);
+
+  auto& scene = ctx.scene;
+  DALI_TEST_EQUAL(1u, scene.GetRoots().size());
+  DALI_TEST_EQUAL(1u, scene.GetNodeCount());
+
+  auto& roots = scene.GetRoots();
+  DALI_TEST_EQUAL(roots.size(), 1u);
+
+  Scene3D::Loader::ShaderManagerPtr shaderManager = new Scene3D::Loader::ShaderManager();
+  ViewProjection                    viewProjection;
+  Transforms                        xforms{
+    MatrixStack{},
+    viewProjection};
+  NodeDefinition::CreateParams nodeParams{
+    resources,
+    xforms,
+    shaderManager,
+  };
+
+  Customization::Choices choices;
+
+  TestApplication app;
+
+  Actor root = Actor::New();
+  SetActorCentered(root);
+  for(auto iRoot : roots)
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+    if(auto actor = scene.CreateNodes(iRoot, choices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, actor, std::move(nodeParams.mSkinnables));
+      scene.ApplyConstraints(actor, std::move(nodeParams.mConstrainables));
+      root.Add(actor);
+    }
+  }
+
+  auto& meshes = ctx.resources.mMeshes;
+  DALI_TEST_EQUAL(1u, meshes.size());
+
+  auto& md = meshes[0u].first;
+
+  DALI_TEST_EQUAL(MeshDefinition::Flags::U16_POSITION | MeshDefinition::Flags::S8_NORMAL | MeshDefinition::Flags::S8_TANGENT | MeshDefinition::Flags::U16_TEXCOORD, md.mFlags);
+
+  DALI_TEST_EQUAL(true, md.mPositions.IsDefined());
+  DALI_TEST_EQUAL(false, md.mPositions.mNormalized);
+  DALI_TEST_EQUAL(sizeof(uint16_t) * 3, md.mPositions.mBlob.mElementSizeHint);
+  DALI_TEST_EQUAL(true, md.mPositions.mBlob.IsDefined());
+  DALI_TEST_EQUAL(2436, md.mPositions.mBlob.mLength);
+  DALI_TEST_EQUAL(3u, md.mPositions.mBlob.mMin.size());
+  DALI_TEST_EQUAL(0.0f, md.mPositions.mBlob.mMin[0]);
+  DALI_TEST_EQUAL(0.0f, md.mPositions.mBlob.mMin[1]);
+  DALI_TEST_EQUAL(0.0f, md.mPositions.mBlob.mMin[2]);
+  DALI_TEST_EQUAL(3u, md.mPositions.mBlob.mMax.size());
+  DALI_TEST_EQUAL(11086.0f, md.mPositions.mBlob.mMax[0]);
+  DALI_TEST_EQUAL(16383.0f, md.mPositions.mBlob.mMax[1]);
+  DALI_TEST_EQUAL(7194.0f, md.mPositions.mBlob.mMax[2]);
+
+  DALI_TEST_EQUAL(true, md.mNormals.IsDefined());
+  DALI_TEST_EQUAL(true, md.mNormals.mNormalized);
+  DALI_TEST_EQUAL(sizeof(int8_t) * 3, md.mNormals.mBlob.mElementSizeHint);
+  DALI_TEST_EQUAL(true, md.mNormals.mBlob.IsDefined());
+  DALI_TEST_EQUAL(1218, md.mNormals.mBlob.mLength);
+  DALI_TEST_EQUAL(0u, md.mNormals.mBlob.mMin.size());
+  DALI_TEST_EQUAL(0u, md.mNormals.mBlob.mMax.size());
+
+  DALI_TEST_EQUAL(true, md.mTangents.IsDefined());
+  DALI_TEST_EQUAL(true, md.mTangents.mNormalized);
+  DALI_TEST_EQUAL(Property::VECTOR4, md.mTangentType);
+  DALI_TEST_EQUAL(sizeof(int8_t) * 4, md.mTangents.mBlob.mElementSizeHint);
+  DALI_TEST_EQUAL(true, md.mTangents.mBlob.IsDefined());
+  DALI_TEST_EQUAL(1624, md.mTangents.mBlob.mLength);
+  DALI_TEST_EQUAL(0u, md.mTangents.mBlob.mMin.size());
+  DALI_TEST_EQUAL(0u, md.mTangents.mBlob.mMax.size());
+
+  DALI_TEST_EQUAL(false, md.mTexCoords.empty());
+  DALI_TEST_EQUAL(true, md.mTexCoords[0].IsDefined());
+  DALI_TEST_EQUAL(false, md.mTexCoords[0].mNormalized);
+  DALI_TEST_EQUAL(sizeof(uint16_t) * 2, md.mTexCoords[0].mBlob.mElementSizeHint);
+  DALI_TEST_EQUAL(true, md.mTexCoords[0].mBlob.IsDefined());
+  DALI_TEST_EQUAL(1624, md.mTexCoords[0].mBlob.mLength);
+  DALI_TEST_EQUAL(0u, md.mTexCoords[0].mBlob.mMin.size());
+  DALI_TEST_EQUAL(0u, md.mTexCoords[0].mBlob.mMax.size());
+
+  END_TEST;
+}
+
+int UtcDaliGltfLoaderTextureTransform(void)
+{
+  Context ctx;
+
+  auto& resources = ctx.resources;
+
+  /**
+   * For the Avocado glTF file and its Assets
+   * Donated by Microsoft for glTF testing
+   * Take from https://github.com/KhronosGroup/glTF-Sample-Models/blob/master/2.0/Avocado/glTF-Quantized
+   */
+  ctx.loader.LoadModel(TEST_RESOURCE_DIR "/AvocadoQuantized.gltf", ctx.loadResult);
+
+  auto& scene = ctx.scene;
+  DALI_TEST_EQUAL(1u, scene.GetRoots().size());
+  DALI_TEST_EQUAL(1u, scene.GetNodeCount());
+
+  TestApplication app;
+
+  Customization::Choices choices;
+  for(auto iRoot : scene.GetRoots())
+  {
+    auto resourceRefs = resources.CreateRefCounter();
+    scene.CountResourceRefs(iRoot, choices, resourceRefs);
+    resources.mReferenceCounts = std::move(resourceRefs);
+    resources.CountEnvironmentReferences();
+    resources.LoadResources(ctx.pathProvider);
+  }
+
+  auto& materials = resources.mMaterials;
+  DALI_TEST_EQUAL(1u, materials.size());
+
+  auto  iMaterial = materials.begin();
+  auto& md        = iMaterial->first;
+
+  DALI_TEST_EQUAL(3u, md.mTextureStages.size());
+
+  Matrix3 textureTransformGroundTruth(0.000238f, 0.0f, 0.0f, 0.0f, 0.000242f, 0.0f, 0.00678f, 0.002982f, 1.0f);
+  DALI_TEST_EQUALS(md.mTextureStages[0].mTexture.mTransform, textureTransformGroundTruth, 0.01f, TEST_LOCATION);
+  DALI_TEST_EQUALS(md.mTextureStages[1].mTexture.mTransform, textureTransformGroundTruth, 0.01f, TEST_LOCATION);
+  DALI_TEST_EQUALS(md.mTextureStages[2].mTexture.mTransform, textureTransformGroundTruth, 0.01f, TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-Hash.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-Hash.cpp
new file mode 100644
index 0000000..74aa2c5
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-Hash.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/internal/loader/hash.h"
+#include <dali-test-suite-utils.h>
+#include <string>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliHash(void)
+{
+  DALI_TEST_EQUAL(Hash(0).Add(true), 0);
+  DALI_TEST_EQUAL(Hash(0).Add(false), 1);
+
+  int32_t myInt32 = std::numeric_limits<int32_t>::min();
+  DALI_TEST_EQUAL(Hash(0).Add(myInt32), myInt32);
+
+  uint32_t myUint32 = std::numeric_limits<uint32_t>::max();
+  DALI_TEST_EQUAL(Hash(0).Add(myUint32), myUint32);
+
+  uint64_t myUint64 = std::numeric_limits<uint64_t>::max();
+  DALI_TEST_EQUAL(uint64_t(Hash(0).Add(myUint64)), myUint64);
+
+  constexpr uint32_t multiplier = 31;
+  uint64_t expected = 0;
+  float f = 1928.46852;
+  for (auto i0 = reinterpret_cast<uint8_t const*>(&f), i1 = i0 + sizeof(f); i0 != i1; ++i0)
+  {
+    expected = expected * multiplier + *i0;
+  }
+
+  DALI_TEST_EQUAL(uint64_t(Hash(0).Add(f)), expected);
+
+  END_TEST;
+}
+
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-JsonReader.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-JsonReader.cpp
new file mode 100644
index 0000000..abeb99c
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-JsonReader.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/internal/loader/json-reader.h"
+#include <dali-test-suite-utils.h>
+#include <string>
+
+using namespace Dali;
+
+#define JSON_STRING(x) #x, strlen(#x)
+
+int UtcDaliJsonReaderStrCmp(void)
+{
+  json_string_s jstr[] {
+    { JSON_STRING(hello) },
+    { JSON_STRING(hellew) },
+  };
+  DALI_TEST_EQUAL(json::StrCmp(jstr[0], "hello"), 0);
+  DALI_TEST_EQUAL(json::StrCmp(jstr[1], "hello"), 'e' - 'o');
+
+  END_TEST;
+}
+
+int UtcDaliJsonReaderValidateThrow(void)
+{
+  json_value_s jval { nullptr, json_type_array };
+  DALI_TEST_THROWS(json::Validate(jval, json_type_object), std::runtime_error);
+  json::Validate(jval, json_type_array);
+
+  END_TEST;
+}
+
+int UtcDaliJsonReaderFindObjectChild(void)
+{
+  json_string_s jkey{ JSON_STRING(fudgeFactor) };
+  json_number_s jActualValue{ JSON_STRING(5.2) };
+  json_value_s jvalue { &jActualValue, json_type_number };
+  json_object_element_s jobjelem { &jkey, &jvalue, nullptr };
+
+  json_object_s jobj{ &jobjelem, 1 };
+
+  DALI_TEST_EQUAL(json::FindObjectChild(jkey.string, jobj), &jvalue);
+  DALI_TEST_EQUAL(json::FindObjectChild("fudgeFactory", jobj), static_cast<json_value_s*>(nullptr));
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-JsonUtil.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-JsonUtil.cpp
new file mode 100644
index 0000000..b9f25be
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-JsonUtil.cpp
@@ -0,0 +1,404 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/internal/loader/json-util.h"
+#include "dali-toolkit/devel-api/builder/json-parser.h"
+#include <dali-test-suite-utils.h>
+#include <string>
+
+#define STRINGIFY(x) #x
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+const std::string TEST_JSON =
+  "{ \"int\": 17834,"
+  "\"float\": 3.1415628,"
+  "\"bool\": true,"
+  "\"null\": null,"
+  "\"string\": \"hello\","
+  "\"floatArray\": [ 0.0, 0.25, 1.0, 0.75 ],"
+  "\"intArray\": [ 1, 2, 3, 5, 7, 11, 13, -1, -5 ],"
+  "\"mixedArray\": [ 1.99, \"the\", 6, \"brown\", \"fox\" ],"
+  "\"stringArray\": [ \"lorem\", \"ipsum\", \"dolor\", \"sic\", \"amet\" ],"
+  "\"object\": { \"duration\": 4.0, \"delay\": 1.0 },"
+  "\"rgb\": [ 0.5, 0.8, 0.25 ],"
+  "\"disambiguatedFloat\": { \"type\": \"float\", \"value\": 15.8 },"
+  "\"rotation1\": { \"type\": \"rotation\", \"value\": [ 15.0, 90.0, -45.0 ] },"
+  "\"rotation2\": { \"type\": \"rotation\", \"value\": [ 0.707, 0.0, 0.707, 0.0 ] },"
+  "\"matrix\": [ 1.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 3.0, 0.0, 1.0, 2.0, 3.0, 4.0 ],"
+  "\"matrix3\": [ 2.0, 0.0, 0.0, 0.0, 0.0, 3.0, 0.0, 1.0, 2.0 ],"
+  "\"vector2\": [ 2.0, 1.0 ]"
+  "}";
+
+template <typename T>
+struct Item
+{
+  std::string name;
+  bool readResult;
+  T result;
+};
+
+struct Document
+{
+  Document(const std::string& json)
+  : parser(JsonParser::New())
+  {
+    //DALI_TEST_CHECK(parser.Parse(json));
+    if (!parser.Parse(json))
+    {
+      auto error = parser.GetErrorDescription();
+      printf("Error: %s in {%d, %d}\n", error.c_str(), parser.GetErrorLineNumber(), parser.GetErrorColumn());
+    }
+    root = parser.GetRoot();
+  }
+
+  JsonParser parser;
+  const TreeNode* root;
+};
+
+template <typename T, size_t N>
+bool CompareArrays(const T (&array)[N], const T* p, T epsilon = T(0))
+{
+  for (auto& i: array)
+  {
+    if (std::abs(i - *p) > epsilon)
+    {
+      printf("Element %d mismatched.\n", int32_t(std::distance(array, &i)));
+      return false;
+    }
+    ++p;
+  }
+  return true;
+}
+
+}
+
+int UtcDaliJsonUtilReadBool(void)
+{
+  bool value = false;
+  DALI_TEST_CHECK(!ReadBool(nullptr, value));
+  DALI_TEST_EQUAL(value, false); // unchanged
+
+  Document doc{ TEST_JSON };
+
+  for (auto& i : {
+    Item<bool>{ "bool",       true, true },
+    Item<bool>{ "int",        false, true }, // value unchanged
+    Item<bool>{ "float",      false, true },
+    Item<bool>{ "null",       false, true },
+    Item<bool>{ "floatArray", false, true },
+    Item<bool>{ "intArray",   false, true },
+    Item<bool>{ "object",     false, true },
+  })
+  {
+    bool readResult = ReadBool(doc.root->GetChild(i.name), value);
+    DALI_TEST_EQUAL(readResult, i.readResult);
+    if (readResult)
+    {
+      DALI_TEST_EQUAL(value, i.result);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadInt(void)
+{
+  int value = 0xbadbeef;
+  DALI_TEST_CHECK(!ReadInt(nullptr, value));
+  DALI_TEST_EQUAL(value, 0xbadbeef);
+
+  Document doc{ TEST_JSON };
+
+  for (auto& i : {
+    Item<int>{ "bool",       false, 0xbadbeef }, // unchanged from initial
+    Item<int>{ "int",        true, 17834 },
+    Item<int>{ "float",      true, 3 },
+    Item<int>{ "null",       false, 3 },
+    Item<int>{ "floatArray", false, 3 },
+    Item<int>{ "intArray",   false, 3 },
+    Item<int>{ "object",     false, 3 },
+  })
+  {
+    bool readResult = ReadInt(doc.root->GetChild(i.name), value);
+    DALI_TEST_EQUAL(readResult, i.readResult);
+    if (readResult)
+    {
+      DALI_TEST_EQUAL(value, i.result);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadFloat(void)
+{
+  float value = 10.101f;
+  DALI_TEST_CHECK(!ReadFloat(nullptr, value));
+  DALI_TEST_EQUAL(value, 10.101f);
+
+  Document doc{ TEST_JSON };
+
+  for (auto& i : {
+    Item<float>{ "bool",       false, 10.101f }, // unchanged from initial
+    Item<float>{ "int",        true, 17834.f },
+    Item<float>{ "float",      true, 3.1415628f },
+    Item<float>{ "null",       false, 3.1415628f },
+    Item<float>{ "floatArray", false, 3.1415628f },
+    Item<float>{ "intArray",   false, 3.1415628f },
+    Item<float>{ "object",     false, 3.1415628f },
+  })
+  {
+    bool readResult = ReadFloat(doc.root->GetChild(i.name), value);
+    DALI_TEST_EQUAL(readResult, i.readResult);
+    if (readResult)
+    {
+      DALI_TEST_EQUAL(value, i.result);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilNumericalArrays(void)
+{
+  Document doc{ TEST_JSON };
+
+  DALI_TEST_EQUAL(4u, GetNumericalArraySize(doc.root->GetChild("floatArray")));
+  DALI_TEST_EQUAL(9u, GetNumericalArraySize(doc.root->GetChild("intArray")));
+  DALI_TEST_EQUAL(1u, GetNumericalArraySize(doc.root->GetChild("mixedArray")));
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadVectorInt(void)
+{
+  DALI_TEST_CHECK(!ReadVector(nullptr, static_cast<int*>(nullptr), 0));
+
+  Document doc{ TEST_JSON };
+
+  int ints[9];
+  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("floatArray"), ints, 4u));
+  DALI_TEST_CHECK(CompareArrays<int>({ 0, 0, 1, 0 }, ints));
+
+  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("intArray"), ints, 9u));
+  DALI_TEST_CHECK(CompareArrays<int>({ 1, 2, 3, 5, 7, 11, 13, -1, -5 }, ints));
+
+  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("mixedArray"), ints, 1u));
+  DALI_TEST_CHECK(CompareArrays<int>({ 1 }, ints));
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadVectorFloat(void)
+{
+  DALI_TEST_CHECK(!ReadVector(nullptr, static_cast<int*>(nullptr), 0));
+
+  Document doc{ TEST_JSON };
+
+  constexpr float e = 1e-6f;
+  float floats[9];
+  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("floatArray"), floats, 4u));
+  DALI_TEST_CHECK(CompareArrays<float>({ 0.f, 0.25f, 1.f, 0.75f }, floats, e));
+
+  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("intArray"), floats, 9u));
+  DALI_TEST_CHECK(CompareArrays<float>({ 1.f, 2.f, 3.f, 5.f, 7.f, 11.f, 13.f, -1.f, -5.f }, floats, e));
+
+  DALI_TEST_CHECK(ReadVector(doc.root->GetChild("mixedArray"), floats, 1u));
+  DALI_TEST_CHECK(CompareArrays<float>({ 1.99f }, floats, e));
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadColor(void)
+{
+  Vector4 color;
+  DALI_TEST_CHECK(!ReadColor(nullptr, color));
+
+  Document doc{ TEST_JSON };
+  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("bool"), color));
+  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("int"), color));
+  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("float"), color));
+  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("string"), color));
+  DALI_TEST_CHECK(!ReadColor(doc.root->GetChild("object"), color));
+
+  constexpr float e = 1e-6f;
+  DALI_TEST_CHECK(ReadColor(doc.root->GetChild("floatArray"), color));
+  DALI_TEST_CHECK(CompareArrays<float>({ 0.f, 0.25f, 1.0f, 0.75f }, color.AsFloat(), e));
+
+  DALI_TEST_CHECK(ReadColor(doc.root->GetChild("intArray"), color));
+  DALI_TEST_CHECK(CompareArrays<float>({ 1.f, 2.f, 3.f, 5.f }, color.AsFloat(), e));
+
+  DALI_TEST_CHECK(ReadColor(doc.root->GetChild("rgb"), color));
+  DALI_TEST_CHECK(CompareArrays<float>({ .5f, .8f, .25f, 1.f }, color.AsFloat(), e));
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadTimePeriod(void)
+{
+  TimePeriod value(60.f);
+  DALI_TEST_CHECK(!ReadTimePeriod(nullptr, value));
+  DALI_TEST_EQUAL(value.durationSeconds, 60.f);
+  DALI_TEST_EQUAL(value.delaySeconds, 0.f);
+
+  Document doc{ TEST_JSON };
+  DALI_TEST_CHECK(ReadTimePeriod(doc.root->GetChild("object"), value));
+  DALI_TEST_EQUAL(value.durationSeconds, 4.f);
+  DALI_TEST_EQUAL(value.delaySeconds, 1.f);
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadString(void)
+{
+  std::string value = "bye";
+  DALI_TEST_CHECK(!ReadString(nullptr, value));
+  DALI_TEST_EQUAL(value, "bye");
+
+  Document doc{ TEST_JSON };
+
+  for (auto& i : {
+    Item<std::string>{ "bool",       false, "bye"}, // unchanged from initial
+    Item<std::string>{ "int",        false, "bye"},
+    Item<std::string>{ "float",      false, "bye"},
+    Item<std::string>{ "null",       false, "bye"},
+    Item<std::string>{ "string",     true, "hello"},
+    Item<std::string>{ "floatArray", false, "hello"}, // unchanged
+    Item<std::string>{ "object",     false, "hello"},
+  })
+  {
+    bool readResult = ReadString(doc.root->GetChild(i.name), value);
+    DALI_TEST_EQUAL(readResult, i.readResult);
+    if (readResult)
+    {
+      DALI_TEST_EQUAL(value, i.result);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadStringVector(void)
+{
+  std::vector<std::string> strings;
+  DALI_TEST_CHECK(!ReadStringVector(nullptr, strings));
+  DALI_TEST_CHECK(strings.empty());
+
+  Document doc{ TEST_JSON };
+
+  DALI_TEST_CHECK(!ReadStringVector(doc.root->GetChild("floatArray"), strings));
+  DALI_TEST_CHECK(strings.empty());
+
+  DALI_TEST_CHECK(!ReadStringVector(doc.root->GetChild("intArray"), strings));
+  DALI_TEST_CHECK(strings.empty());
+
+  DALI_TEST_CHECK(!ReadStringVector(doc.root->GetChild("mixedArray"), strings));
+  DALI_TEST_CHECK(strings.empty());
+
+  DALI_TEST_CHECK(ReadStringVector(doc.root->GetChild("stringArray"), strings));
+  DALI_TEST_EQUAL(strings.size(), 5u);
+
+  auto iStrings = strings.begin();
+  for (auto& i : { "lorem", "ipsum", "dolor", "sic", "amet" })
+  {
+    DALI_TEST_EQUAL(*iStrings, i);
+    ++iStrings;
+  }
+
+  END_TEST;
+}
+
+int UtcDaliJsonUtilReadAndReturnPropertyValue(void)
+{
+  Document doc{ TEST_JSON };
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("disambiguatedFloat")).Get<float>(), 15.8f);
+
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("rotation1")).Get<Quaternion>(),
+    Quaternion(Radian(Degree(15.0)), Radian(Degree(90.0)), Radian(Degree(-45.f))));
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("rotation2")).Get<Quaternion>(),
+    Quaternion(Vector4(0.707f, 0.f, 0.707f, 0.f)));
+
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("bool")).Get<bool>(), true);
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("int")).Get<int32_t>(), 17834);
+
+  const float floats[]{ 1.f, 0.f, 0.f, 0.f, 0.f, 2.f, 0.f, 0.f, 0.f, 0.f, 3.f, 0.f, 1.f, 2.f, 3.f, 4.f };
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("matrix")).Get<Matrix>(), Matrix(floats));
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("matrix3")).Get<Matrix3>(), Matrix3(floats[5],
+    floats[6], floats[7], floats[8], floats[9], floats[10], floats[11], floats[12], floats[13]));
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("floatArray")).Get<Vector4>(),
+    Vector4(0.f, .25f, 1.f, .75f));
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("rgb")).Get<Vector3>(),
+    Vector3(.5f, .8f, .25f));
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("vector2")).Get<Vector2>(),
+    Vector2(2.f, 1.f));
+  DALI_TEST_EQUAL(ReadPropertyValue(*doc.root->GetChild("object")->GetChild("duration")).Get<float>(), 4.f );
+
+  END_TEST;
+}
+
+namespace
+{
+template <typename T>
+void CheckEqualityAs(Property::Value lhs, Property::Value rhs)
+{
+  DALI_TEST_EQUAL(lhs.Get<T>(), rhs.Get<T>());
+}
+
+}
+
+int UtcDaliJsonUtilReadPropertyValue(void)
+{
+  struct TypeNameValue
+  {
+    Property::Type type;
+    std::string name;
+    Property::Value value;
+    void(*compareFn)(Property::Value, Property::Value);
+  };
+
+  Document doc{ TEST_JSON };
+
+  const float floats[]{ 1.f, 0.f, 0.f, 0.f, 0.f, 2.f, 0.f, 0.f, 0.f, 0.f, 3.f, 0.f, 1.f, 2.f, 3.f, 4.f };
+  const TypeNameValue typeNameValues[] {
+    { Property::BOOLEAN, "bool", true, CheckEqualityAs<bool> },
+    { Property::FLOAT, "float", 3.1415628f, CheckEqualityAs<float> },
+    { Property::INTEGER, "int", 17834, CheckEqualityAs<int32_t> },
+    { Property::VECTOR2, "vector2", Vector2(2.f, 1.f), CheckEqualityAs<Vector2> },
+    { Property::VECTOR3, "rgb", Vector3(.5f, .8f, .25f), CheckEqualityAs<Vector3> },
+    { Property::VECTOR4, "floatArray", Vector4(.0f, .25f, 1.f, .75f), CheckEqualityAs<Vector4> },
+    { Property::MATRIX3, "matrix3", Matrix3(2.f, 0.f, 0.f, 0.f, 0.f, 3.f, 0.f, 1.f, 2.f),
+      CheckEqualityAs<Matrix3> },
+    { Property::MATRIX, "matrix", Matrix(floats), CheckEqualityAs<Matrix> },
+    { Property::RECTANGLE, "intArray", Rect<int>(1, 2, 3, 5), CheckEqualityAs<Rect<int>> },
+    { Property::EXTENTS, "intArray", Extents(1, 2, 3, 5), CheckEqualityAs<Extents> },
+  };
+  for(auto& i: typeNameValues)
+  {
+    std::cout << i.value << std::endl;
+    i.compareFn(ReadPropertyValue(i.type, *doc.root->GetChild(i.name)), i.value);
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-MaterialImpl.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-MaterialImpl.cpp
new file mode 100644
index 0000000..38eb937
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-MaterialImpl.cpp
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <toolkit-event-thread-callback.h>
+#include <iostream>
+
+#include <dali-scene3d/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-scene3d/internal/model-components/material-impl.h>
+#include <dali-scene3d/public-api/loader/shader-option.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void model_components_material_impl_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_components_material_impl_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+} // namespace
+
+// Method test
+int UtcDaliMaterialImplSetGetTextureInformation(void)
+{
+  tet_infoline("UtcDaliMaterialImplSetGetTextureInformation.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  Scene3D::Internal::Material::TextureInformation baseColor;
+  Dali::Texture                                   baseColorTexture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  Dali::Sampler                                   baseColorSampler = Dali::Sampler::New();
+  baseColor.mTexture                                               = baseColorTexture;
+  baseColor.mSampler                                               = baseColorSampler;
+  baseColor.mUrl                                                   = "baseColor";
+  GetImplementation(material).SetTextureInformation(Scene3D::Material::TextureType::BASE_COLOR, std::move(baseColor));
+  DALI_TEST_EQUALS(baseColorTexture, material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR), TEST_LOCATION);
+  DALI_TEST_EQUALS(baseColorSampler, material.GetSampler(Scene3D::Material::TextureType::BASE_COLOR), TEST_LOCATION);
+  DALI_TEST_EQUALS("baseColor", material.GetProperty<std::string>(Scene3D::Material::Property::BASE_COLOR_URL), TEST_LOCATION);
+
+  Scene3D::Internal::Material::TextureInformation metallicRoughness;
+  Dali::Texture                                   metallicRoughnessTexture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  Dali::Sampler                                   metallicRoughnessSampler = Dali::Sampler::New();
+  metallicRoughness.mTexture                                               = metallicRoughnessTexture;
+  metallicRoughness.mSampler                                               = metallicRoughnessSampler;
+  metallicRoughness.mUrl                                                   = "metallicRoughness";
+  GetImplementation(material).SetTextureInformation(Scene3D::Material::TextureType::METALLIC_ROUGHNESS, std::move(metallicRoughness));
+  DALI_TEST_EQUALS(metallicRoughnessTexture, material.GetTexture(Scene3D::Material::TextureType::METALLIC_ROUGHNESS), TEST_LOCATION);
+  DALI_TEST_EQUALS(metallicRoughnessSampler, material.GetSampler(Scene3D::Material::TextureType::METALLIC_ROUGHNESS), TEST_LOCATION);
+  DALI_TEST_EQUALS("metallicRoughness", material.GetProperty<std::string>(Scene3D::Material::Property::METALLIC_ROUGHNESS_URL), TEST_LOCATION);
+
+  Scene3D::Internal::Material::TextureInformation normal;
+  Dali::Texture                                   normalTexture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  Dali::Sampler                                   normalSampler = Dali::Sampler::New();
+  normal.mTexture                                               = normalTexture;
+  normal.mSampler                                               = normalSampler;
+  normal.mUrl                                                   = "normal";
+  GetImplementation(material).SetTextureInformation(Scene3D::Material::TextureType::NORMAL, std::move(normal));
+  DALI_TEST_EQUALS(normalTexture, material.GetTexture(Scene3D::Material::TextureType::NORMAL), TEST_LOCATION);
+  DALI_TEST_EQUALS(normalSampler, material.GetSampler(Scene3D::Material::TextureType::NORMAL), TEST_LOCATION);
+  DALI_TEST_EQUALS("normal", material.GetProperty<std::string>(Scene3D::Material::Property::NORMAL_URL), TEST_LOCATION);
+
+  Dali::TextureSet textureSet = GetImplementation(material).GetTextureSet();
+  DALI_TEST_EQUALS(3, textureSet.GetTextureCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(baseColorTexture, textureSet.GetTexture(0u), TEST_LOCATION);
+  DALI_TEST_EQUALS(metallicRoughnessTexture, textureSet.GetTexture(1u), TEST_LOCATION);
+  DALI_TEST_EQUALS(normalTexture, textureSet.GetTexture(2u), TEST_LOCATION);
+  DALI_TEST_EQUALS(baseColorSampler, textureSet.GetSampler(0u), TEST_LOCATION);
+  DALI_TEST_EQUALS(metallicRoughnessSampler, textureSet.GetSampler(1u), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  GetImplementation(material).UpdateMaterialData();
+
+  Scene3D::Loader::ShaderOption option;
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::THREE_TEXTURE);
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::GLTF_CHANNELS);
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::BASE_COLOR_TEXTURE);
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::METALLIC_ROUGHNESS_TEXTURE);
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::NORMAL_TEXTURE);
+
+  DALI_TEST_EQUALS(option.GetOptionHash(), GetImplementation(material).GetShaderOption().GetOptionHash(), TEST_LOCATION);
+
+  Scene3D ::Internal ::Material ::TextureInformation occlusion;
+  Dali ::Texture                                     occlusiontexture = Dali ::Texture ::New(TextureType ::TEXTURE_2D, Pixel ::RGBA8888, 100, 100);
+  Dali ::Sampler                                     occlusionSampler = Dali ::Sampler ::New();
+  occlusion.mTexture                                                  = occlusiontexture;
+  occlusion.mSampler                                                  = occlusionSampler;
+  occlusion.mUrl                                                      = "occlusion";
+  GetImplementation(material).SetTextureInformation(Scene3D ::Material ::TextureType ::OCCLUSION, std ::move(occlusion));
+  DALI_TEST_EQUALS(occlusiontexture, material.GetTexture(Scene3D ::Material ::TextureType ::OCCLUSION), TEST_LOCATION);
+  DALI_TEST_EQUALS(occlusionSampler, material.GetSampler(Scene3D ::Material ::TextureType ::OCCLUSION), TEST_LOCATION);
+  DALI_TEST_EQUALS("occlusion", material.GetProperty<std ::string>(Scene3D ::Material ::Property ::OCCLUSION_URL), TEST_LOCATION);
+
+  Scene3D::Internal::Material::TextureInformation emissive;
+  Dali::Texture                                   emissiveTexture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  Dali::Sampler                                   emissiveSampler = Dali::Sampler::New();
+  emissive.mTexture                                               = emissiveTexture;
+  emissive.mSampler                                               = emissiveSampler;
+  emissive.mUrl                                                   = "emissive";
+  GetImplementation(material).SetTextureInformation(Scene3D::Material::TextureType::EMISSIVE, std::move(emissive));
+  DALI_TEST_EQUALS(emissiveTexture, material.GetTexture(Scene3D::Material::TextureType::EMISSIVE), TEST_LOCATION);
+  DALI_TEST_EQUALS(emissiveSampler, material.GetSampler(Scene3D::Material::TextureType::EMISSIVE), TEST_LOCATION);
+  DALI_TEST_EQUALS("emissive", material.GetProperty<std::string>(Scene3D::Material::Property::EMISSIVE_URL), TEST_LOCATION);
+
+  Scene3D ::Internal ::Material ::TextureInformation specular;
+  Dali ::Texture                                     specularTexture = Dali ::Texture ::New(TextureType ::TEXTURE_2D, Pixel ::RGBA8888, 100, 100);
+  Dali ::Sampler                                     specularSampler = Dali ::Sampler ::New();
+  specular.mTexture                                                  = specularTexture;
+  specular.mSampler                                                  = specularSampler;
+  specular.mUrl                                                      = "specular";
+  GetImplementation(material).SetTextureInformation(Scene3D ::Material ::TextureType ::SPECULAR, std ::move(specular));
+  DALI_TEST_EQUALS(specularTexture, material.GetTexture(Scene3D ::Material ::TextureType ::SPECULAR), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularSampler, material.GetSampler(Scene3D ::Material ::TextureType ::SPECULAR), TEST_LOCATION);
+  DALI_TEST_EQUALS("specular", material.GetProperty<std ::string>(Scene3D ::Material ::Property ::SPECULAR_URL), TEST_LOCATION);
+
+  Scene3D::Internal::Material::TextureInformation specularColor;
+  Dali::Texture                                   specularColorTexture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  Dali::Sampler                                   specularColorSampler = Dali::Sampler::New();
+  specularColor.mTexture                                               = specularColorTexture;
+  specularColor.mSampler                                               = specularColorSampler;
+  specularColor.mUrl                                                   = "specularColor";
+  GetImplementation(material).SetTextureInformation(Scene3D::Material::TextureType::SPECULAR_COLOR, std::move(specularColor));
+  DALI_TEST_EQUALS(specularColorTexture, material.GetTexture(Scene3D::Material::TextureType::SPECULAR_COLOR), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularColorSampler, material.GetSampler(Scene3D::Material::TextureType::SPECULAR_COLOR), TEST_LOCATION);
+  DALI_TEST_EQUALS("specularColor", material.GetProperty<std::string>(Scene3D::Material::Property::SPECULAR_COLOR_URL), TEST_LOCATION);
+
+  textureSet = GetImplementation(material).GetTextureSet();
+  DALI_TEST_EQUALS(7, textureSet.GetTextureCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(baseColorTexture, textureSet.GetTexture(0u), TEST_LOCATION);
+  DALI_TEST_EQUALS(metallicRoughnessTexture, textureSet.GetTexture(1u), TEST_LOCATION);
+  DALI_TEST_EQUALS(normalTexture, textureSet.GetTexture(2u), TEST_LOCATION);
+  DALI_TEST_EQUALS(occlusiontexture, textureSet.GetTexture(3u), TEST_LOCATION);
+  DALI_TEST_EQUALS(emissiveTexture, textureSet.GetTexture(4u), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularTexture, textureSet.GetTexture(5u), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularColorTexture, textureSet.GetTexture(6u), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(baseColorSampler, textureSet.GetSampler(0u), TEST_LOCATION);
+  DALI_TEST_EQUALS(metallicRoughnessSampler, textureSet.GetSampler(1u), TEST_LOCATION);
+  DALI_TEST_EQUALS(normalSampler, textureSet.GetSampler(2u), TEST_LOCATION);
+  DALI_TEST_EQUALS(occlusionSampler, textureSet.GetSampler(3u), TEST_LOCATION);
+  DALI_TEST_EQUALS(emissiveSampler, textureSet.GetSampler(4u), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularSampler, textureSet.GetSampler(5u), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularColorSampler, textureSet.GetSampler(6u), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  GetImplementation(material).UpdateMaterialData();
+
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::OCCLUSION);
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::EMISSIVE);
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::SPECULAR);
+  option.AddOption(Scene3D::Loader::ShaderOption::Type::SPECULAR_COLOR);
+
+  DALI_TEST_EQUALS(option.GetOptionHash(), GetImplementation(material).GetShaderOption().GetOptionHash(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+int UtcDaliMaterialCheckUniform(void)
+{
+  tet_infoline("UtcDaliMaterialCheckUniform.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  Vector4 baseColorFactor(0.1f, 0.2f, 0.3f, 0.4f);
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_FACTOR, baseColorFactor);
+  DALI_TEST_EQUALS(baseColorFactor, material.GetProperty<Vector4>(Scene3D::Material::Property::BASE_COLOR_FACTOR), TEST_LOCATION);
+
+  float metallicFactor = 0.5f;
+  material.SetProperty(Scene3D::Material::Property::METALLIC_FACTOR, metallicFactor);
+  DALI_TEST_EQUALS(metallicFactor, material.GetProperty<float>(Scene3D::Material::Property::METALLIC_FACTOR), TEST_LOCATION);
+
+  float roughnessFactor = 0.6f;
+  material.SetProperty(Scene3D::Material::Property::ROUGHNESS_FACTOR, roughnessFactor);
+  DALI_TEST_EQUALS(roughnessFactor, material.GetProperty<float>(Scene3D::Material::Property::ROUGHNESS_FACTOR), TEST_LOCATION);
+
+  float normalScale = 0.7f;
+  material.SetProperty(Scene3D::Material::Property::NORMAL_SCALE, normalScale);
+  DALI_TEST_EQUALS(normalScale, material.GetProperty<float>(Scene3D::Material::Property::NORMAL_SCALE), TEST_LOCATION);
+
+  float occlusionStrength = 0.8f;
+  material.SetProperty(Scene3D::Material::Property::OCCLUSION_STRENGTH, occlusionStrength);
+  DALI_TEST_EQUALS(occlusionStrength, material.GetProperty<float>(Scene3D::Material::Property::OCCLUSION_STRENGTH), TEST_LOCATION);
+
+  Vector3 emissiveFactor(0.9f, 0.1f, 0.2f);
+  material.SetProperty(Scene3D::Material::Property::EMISSIVE_FACTOR, emissiveFactor);
+  DALI_TEST_EQUALS(emissiveFactor, material.GetProperty<Vector3>(Scene3D::Material::Property::EMISSIVE_FACTOR), TEST_LOCATION);
+
+  Dali::Scene3D::Material::AlphaModeType alphaMode = Dali::Scene3D::Material::AlphaModeType::BLEND;
+  material.SetProperty(Scene3D::Material::Property::ALPHA_MODE, alphaMode);
+  DALI_TEST_EQUALS(alphaMode, material.GetProperty<Dali::Scene3D::Material::AlphaModeType>(Scene3D::Material ::Property ::ALPHA_MODE), TEST_LOCATION);
+
+  float alphaCutoff = 0.9f;
+  material.SetProperty(Scene3D ::Material ::Property ::ALPHA_CUTOFF, alphaCutoff);
+  DALI_TEST_EQUALS(alphaCutoff, material.GetProperty<float>(Scene3D ::Material ::Property ::ALPHA_CUTOFF), TEST_LOCATION);
+
+  bool doubleSided = false;
+  material.SetProperty(Scene3D ::Material ::Property ::DOUBLE_SIDED, doubleSided);
+  DALI_TEST_EQUALS(doubleSided, material.GetProperty<bool>(Scene3D ::Material ::Property ::DOUBLE_SIDED), TEST_LOCATION);
+
+  float ior = 1.0f;
+  material.SetProperty(Scene3D::Material::Property::IOR, ior);
+  DALI_TEST_EQUALS(ior, material.GetProperty<float>(Scene3D::Material::Property::IOR), TEST_LOCATION);
+
+  float specularFactor = 1.0f;
+  material.SetProperty(Scene3D::Material::Property::SPECULAR_FACTOR, specularFactor);
+  DALI_TEST_EQUALS(specularFactor, material.GetProperty<float>(Scene3D::Material::Property::SPECULAR_FACTOR), TEST_LOCATION);
+
+  Vector3 specularColorFactor(1.0f, 1.0f, 1.0f);
+  material.SetProperty(Scene3D::Material::Property::SPECULAR_COLOR_FACTOR, specularColorFactor);
+  DALI_TEST_EQUALS(specularColorFactor, material.GetProperty<Vector3>(Scene3D::Material::Property::SPECULAR_COLOR_FACTOR), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  GetImplementation(material).UpdateMaterialData();
+
+  Dali::Shader   shader   = Dali::Shader::New(SHADER_DEFAULT_PHYSICALLY_BASED_SHADER_VERT.data(), SHADER_DEFAULT_PHYSICALLY_BASED_SHADER_FRAG.data());
+  Dali::Geometry geometry = Dali::Geometry::New();
+  Dali::Renderer renderer = Dali::Renderer::New(geometry, shader);
+
+  GetImplementation(material).SetRendererUniform(renderer);
+
+  DALI_TEST_EQUALS(baseColorFactor, renderer.GetProperty<Vector4>(renderer.GetPropertyIndex("uColorFactor")), TEST_LOCATION);
+  DALI_TEST_EQUALS(metallicFactor, renderer.GetProperty<float>(renderer.GetPropertyIndex("uMetallicFactor")), TEST_LOCATION);
+  DALI_TEST_EQUALS(roughnessFactor, renderer.GetProperty<float>(renderer.GetPropertyIndex("uRoughnessFactor")), TEST_LOCATION);
+  DALI_TEST_EQUALS(normalScale, renderer.GetProperty<float>(renderer.GetPropertyIndex("uNormalScale")), TEST_LOCATION);
+  DALI_TEST_EQUALS(emissiveFactor, renderer.GetProperty<Vector3>(renderer.GetPropertyIndex("uEmissiveFactor")), TEST_LOCATION);
+  float dielectricSpecular = (Dali::Equals(ior, -1.0)) ? 0.04f : powf((ior - 1.0f) / (ior + 1.0f), 2.0f);
+  DALI_TEST_EQUALS(dielectricSpecular, renderer.GetProperty<float>(renderer.GetPropertyIndex("uDielectricSpecular")), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularFactor, renderer.GetProperty<float>(renderer.GetPropertyIndex("uSpecularFactor")), TEST_LOCATION);
+  DALI_TEST_EQUALS(specularColorFactor, renderer.GetProperty<Vector3>(renderer.GetPropertyIndex("uSpecularColorFactor")), TEST_LOCATION);
+  float opaque = alphaMode == Dali::Scene3D::Material::AlphaModeType::BLEND ? 0.0f : 1.0f;
+  float mask   = alphaMode == Dali::Scene3D::Material::AlphaModeType::MASK ? 1.0f : 0.0f;
+  DALI_TEST_EQUALS(opaque, renderer.GetProperty<float>(renderer.GetPropertyIndex("uOpaque")), TEST_LOCATION);
+  DALI_TEST_EQUALS(mask, renderer.GetProperty<float>(renderer.GetPropertyIndex("uMask")), TEST_LOCATION);
+  DALI_TEST_EQUALS(alphaCutoff, renderer.GetProperty<float>(renderer.GetPropertyIndex("uAlphaThreshold")), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(DepthTestMode::ON, renderer.GetProperty<DepthTestMode::Type>(Dali::Renderer::Property::DEPTH_TEST_MODE), TEST_LOCATION);
+  DALI_TEST_EQUALS(FaceCullingMode::BACK, renderer.GetProperty<FaceCullingMode::Type>(Dali::Renderer::Property::FACE_CULLING_MODE), TEST_LOCATION);
+  DALI_TEST_EQUALS(DepthTestMode::ON, renderer.GetProperty<DepthTestMode::Type>(Dali::Renderer::Property::DEPTH_TEST_MODE), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(0.0f, renderer.GetProperty<float>(renderer.GetPropertyIndex("uBaseColorTextureTransformAvailable")), TEST_LOCATION);
+  DALI_TEST_EQUALS(0.0f, renderer.GetProperty<float>(renderer.GetPropertyIndex("uNormalTextureTransformAvailable")), TEST_LOCATION);
+  DALI_TEST_EQUALS(0.0f, renderer.GetProperty<float>(renderer.GetPropertyIndex("uNormalRoughnessTextureTransformAvailable")), TEST_LOCATION);
+  DALI_TEST_EQUALS(0.0f, renderer.GetProperty<float>(renderer.GetPropertyIndex("uMetalRoughnessTextureTransformAvailable")), TEST_LOCATION);
+  DALI_TEST_EQUALS(0.0f, renderer.GetProperty<float>(renderer.GetPropertyIndex("uOcclusionTextureTransformAvailable")), TEST_LOCATION);
+  DALI_TEST_EQUALS(0.0f, renderer.GetProperty<float>(renderer.GetPropertyIndex("uEmissiveTextureTransformAvailable")), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliMaterialImplLoadTexture_1(void)
+{
+  tet_infoline("UtcDaliMaterialLoadTexture.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  DALI_TEST_CHECK(!material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR));
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_URL, TEST_IMAGE_FILE_NAME);
+  DALI_TEST_EQUALS(false, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  DALI_TEST_CHECK(material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR));
+  Dali::Texture baseColorTexture = material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR);
+
+  Dali::TextureSet textureSet = GetImplementation(material).GetTextureSet();
+  DALI_TEST_EQUALS(1u, textureSet.GetTextureCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(baseColorTexture, textureSet.GetTexture(0u), TEST_LOCATION);
+  DALI_TEST_CHECK(textureSet.GetSampler(0u));
+
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_URL, TEST_IMAGE_FILE_NAME);
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  DALI_TEST_EQUALS(baseColorTexture, material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR), TEST_LOCATION);
+
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_URL, "");
+  DALI_TEST_CHECK(!material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR));
+
+  END_TEST;
+}
+
+int UtcDaliMaterialImplLoadTexture_2(void)
+{
+  tet_infoline("UtcDaliMaterialImplLoadTexture_2.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  DALI_TEST_CHECK(!material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR));
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_URL, TEST_IMAGE_FILE_NAME);
+  DALI_TEST_EQUALS(false, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_URL, "");
+  DALI_TEST_EQUALS(true, GetImplementation(material).IsResourceReady(), TEST_LOCATION);
+  DALI_TEST_CHECK(!material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR));
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-ModelCacheManager.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-ModelCacheManager.cpp
new file mode 100644
index 0000000..a6b322c
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-ModelCacheManager.cpp
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/internal/common/model-cache-manager.h>
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <toolkit-event-thread-callback.h>
+#include <toolkit-timer.h>
+#include <string>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D::Internal;
+
+namespace
+{
+/**
+ * For the AnimatedCube.gltf and its Assets
+ * Donated by Norbert Nopper for glTF testing.
+ * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/AnimatedCube
+ */
+const char* TEST_GLTF_FILE_NAME = TEST_RESOURCE_DIR "/AnimatedCube.gltf";
+
+static bool gResourceReadyCalled = false;
+
+void OnResourceReady(Control control)
+{
+  gResourceReadyCalled = true;
+}
+} // namespace
+
+int UtcDaliModelCacheManagerLoadModel(void)
+{
+  ToolkitTestApplication application;
+
+  ModelCacheManager cacheManager = ModelCacheManager::Get();
+  DALI_TEST_EQUALS(cacheManager.GetModelCacheRefCount(TEST_GLTF_FILE_NAME), 0u, TEST_LOCATION);
+
+  // Load the first instance of the same model and add it to the scene
+  Scene3D::Model model1 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  application.GetScene().Add(model1);
+
+  gResourceReadyCalled = false;
+  model1.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Check that the loading has finished for mode1
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  // Store the value of expect ref count with one model. Detail value could be changed with detail logic of cache.
+  uint32_t refCountWithOneModel = cacheManager.GetModelCacheRefCount(TEST_GLTF_FILE_NAME);
+
+  // Check whether model reference is greate or equal with 1.
+  DALI_TEST_GREATER(refCountWithOneModel, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(cacheManager.IsSceneLoading(TEST_GLTF_FILE_NAME), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(cacheManager.IsSceneLoaded(TEST_GLTF_FILE_NAME), true, TEST_LOCATION);
+
+  // Load the second instance of the same model and add it to the scene
+  Scene3D::Model model2 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  application.GetScene().Add(model2);
+
+  gResourceReadyCalled = false;
+  model2.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Check that the loading has finished for model2
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  // Store the value of expect ref count with two models. Detail value could be changed with detail logic of cache.
+  uint32_t refCountWithTwoModels = cacheManager.GetModelCacheRefCount(TEST_GLTF_FILE_NAME);
+
+  // Check whether model reference is greate or equal with reference with one model.
+  DALI_TEST_GREATER(refCountWithTwoModels, refCountWithOneModel, TEST_LOCATION);
+  DALI_TEST_EQUALS(cacheManager.IsSceneLoading(TEST_GLTF_FILE_NAME), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(cacheManager.IsSceneLoaded(TEST_GLTF_FILE_NAME), true, TEST_LOCATION);
+
+  Actor meshActor1 = model1.FindChildByName("AnimatedCube");
+  Actor meshActor2 = model2.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor1);
+  DALI_TEST_CHECK(meshActor2);
+
+  Renderer renderer1 = meshActor1.GetRendererAt(0u);
+  Renderer renderer2 = meshActor2.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer1);
+  DALI_TEST_CHECK(renderer2);
+
+  // Check that the two instances use the shared textures and geometries from the cache
+  DALI_TEST_EQUALS(renderer1.GetTextures(), renderer2.GetTextures(), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer1.GetGeometry(), renderer2.GetGeometry(), TEST_LOCATION);
+
+  // Destroy model1
+  model1.Unparent();
+  model1.Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  // Check that the reference count of the cmodel cache is decreased after model1 is destroyed
+  DALI_TEST_EQUALS(cacheManager.GetModelCacheRefCount(TEST_GLTF_FILE_NAME), refCountWithOneModel, TEST_LOCATION);
+
+  // Load another instance of the same model and add it to the scene
+  Scene3D::Model model3 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  application.GetScene().Add(model3);
+
+  gResourceReadyCalled = false;
+  model3.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Check that the loading has finished for model3
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  // Check the value of expect ref count with two models.
+  DALI_TEST_EQUALS(cacheManager.GetModelCacheRefCount(TEST_GLTF_FILE_NAME), refCountWithTwoModels, TEST_LOCATION);
+  DALI_TEST_EQUALS(cacheManager.IsSceneLoading(TEST_GLTF_FILE_NAME), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(cacheManager.IsSceneLoaded(TEST_GLTF_FILE_NAME), true, TEST_LOCATION);
+
+  Actor meshActor3 = model3.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor3);
+
+  Renderer renderer3 = meshActor3.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer3);
+
+  // Check that model2 and model3 use the shared textures and geometries from the cache
+  DALI_TEST_EQUALS(renderer2.GetTextures(), renderer3.GetTextures(), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer2.GetGeometry(), renderer3.GetGeometry(), TEST_LOCATION);
+
+  // Destroy model2 and model3
+  model2.Unparent();
+  model2.Reset();
+
+  model3.Unparent();
+  model3.Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  // All reference count should be decreased.
+  DALI_TEST_EQUALS(cacheManager.GetModelCacheRefCount(TEST_GLTF_FILE_NAME), 0u, TEST_LOCATION);
+
+  // Collect garbages hardly.
+  Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect(true);
+  Test::EmitGlobalTimerSignal();
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d-internal/utc-Dali-ModelPrimitiveImpl.cpp b/automated-tests/src/dali-scene3d-internal/utc-Dali-ModelPrimitiveImpl.cpp
new file mode 100644
index 0000000..57ba4c2
--- /dev/null
+++ b/automated-tests/src/dali-scene3d-internal/utc-Dali-ModelPrimitiveImpl.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/internal/model-components/model-primitive-impl.h>
+#include <dali-scene3d/public-api/common/scene-depth-index-ranges.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void model_components_model_primitive_impl_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_components_model_primitive_impl_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+} // namespace
+
+// Method test
+int UtcDaliModelPrimitiveImplSetData(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+
+  tet_printf("Check primitive don't have material initial time\n");
+
+  DALI_TEST_CHECK(!GetImplementation(modelPrimitive).GetRenderer());
+  DALI_TEST_CHECK(!modelPrimitive.GetGeometry());
+  DALI_TEST_CHECK(!modelPrimitive.GetMaterial());
+
+  Dali::Geometry geometry = Dali::Geometry::New();
+  Dali::Scene3D::Material material = Dali::Scene3D::Material::New();
+
+  modelPrimitive.SetGeometry(geometry);
+  modelPrimitive.SetMaterial(material);
+  DALI_TEST_CHECK(geometry == modelPrimitive.GetGeometry());
+  DALI_TEST_CHECK(material == modelPrimitive.GetMaterial());
+  DALI_TEST_CHECK(GetImplementation(modelPrimitive).GetRenderer());
+
+  END_TEST;
+}
+
+int UtcDaliModelPrimitiveMaterialDepthIndex(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+
+  tet_printf("Check primitive don't have material initial time\n");
+
+  DALI_TEST_CHECK(!modelPrimitive.GetMaterial());
+
+  Dali::Geometry geometry = Dali::Geometry::New();
+  Dali::Scene3D::Material material = Dali::Scene3D::Material::New();
+
+  modelPrimitive.SetGeometry(geometry);
+  modelPrimitive.SetMaterial(material);
+  DALI_TEST_CHECK(material == modelPrimitive.GetMaterial());
+
+  DALI_TEST_CHECK(GetImplementation(modelPrimitive).GetRenderer());
+
+  Dali::Renderer renderer = GetImplementation(modelPrimitive).GetRenderer();
+  DALI_TEST_CHECK(renderer.GetProperty<int32_t>(Dali::Renderer::Property::DEPTH_INDEX) == Scene3D::DepthIndex::Ranges::SCENE);
+
+  material.SetProperty(Scene3D::Material::Property::DEPTH_INDEX, 50);
+  DALI_TEST_CHECK(renderer.GetProperty<int32_t>(Dali::Renderer::Property::DEPTH_INDEX) == 50);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/CMakeLists.txt b/automated-tests/src/dali-scene3d/CMakeLists.txt
new file mode 100755
index 0000000..1269cb2
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/CMakeLists.txt
@@ -0,0 +1,131 @@
+SET(PKG_NAME "dali-scene3d")
+
+SET(EXEC_NAME "tct-${PKG_NAME}-core")
+SET(RPM_NAME "core-${PKG_NAME}-tests")
+
+SET(CAPI_LIB "dali-scene3d")
+
+# List of test case sources (Only these get parsed for test cases)
+SET(TC_SOURCES
+  utc-Dali-AlphaFunctionHelper.cpp
+  utc-Dali-AnimationDefinition.cpp
+  utc-Dali-AnimatedProperty.cpp
+  utc-Dali-BvhLoader.cpp
+  utc-Dali-BlendShapeIndex.cpp
+  utc-Dali-CameraParameters.cpp
+  utc-Dali-EnvironmentMapLoader.cpp
+  utc-Dali-EnvironmentDefinition.cpp
+  utc-Dali-FacialAnimation.cpp
+  utc-Dali-KtxLoader.cpp
+  utc-Dali-Material.cpp
+  utc-Dali-Model.cpp
+  utc-Dali-ModelNode.cpp
+  utc-Dali-ModelPrimitive.cpp
+  utc-Dali-MotionData.cpp
+  utc-Dali-MotionIndex.cpp
+  utc-Dali-MotionPropertyIndex.cpp
+  utc-Dali-MotionTransformIndex.cpp
+  utc-Dali-MotionValue.cpp
+  utc-Dali-SceneView.cpp
+  utc-Dali-MatrixStack.cpp
+  utc-Dali-MeshDefinition.cpp
+  utc-Dali-NavigationMesh.cpp
+  utc-Dali-NodeDefinition.cpp
+  utc-Dali-PathFinding.cpp
+  utc-Dali-RendererState.cpp
+  utc-Dali-ResourceBundle.cpp
+  utc-Dali-SceneDefinition.cpp
+  utc-Dali-ShaderDefinition.cpp
+  utc-Dali-ShaderManager.cpp
+  utc-Dali-ShaderOption.cpp
+  utc-Dali-StringCallback.cpp
+  utc-Dali-Utils.cpp
+  utc-Dali-ViewProjection.cpp
+  utc-Dali-Light.cpp
+)
+
+# List of test harness files (Won't get parsed for test cases)
+SET(TEST_HARNESS_DIR "../dali-toolkit/dali-toolkit-test-utils")
+
+SET(TEST_HARNESS_SOURCES
+  ${TEST_HARNESS_DIR}/toolkit-adaptor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-async-task-manager.cpp
+  ${TEST_HARNESS_DIR}/toolkit-event-thread-callback.cpp
+  ${TEST_HARNESS_DIR}/toolkit-environment-variable.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-context.cpp
+  ${TEST_HARNESS_DIR}/toolkit-input-method-options.cpp
+  ${TEST_HARNESS_DIR}/toolkit-lifecycle-controller.cpp
+  ${TEST_HARNESS_DIR}/toolkit-orientation.cpp
+  ${TEST_HARNESS_DIR}/toolkit-style-monitor.cpp
+  ${TEST_HARNESS_DIR}/toolkit-test-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-timer.cpp
+  ${TEST_HARNESS_DIR}/toolkit-trigger-event-factory.cpp
+  ${TEST_HARNESS_DIR}/toolkit-window.cpp
+  ${TEST_HARNESS_DIR}/toolkit-scene-holder.cpp
+  ${TEST_HARNESS_DIR}/dali-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dali-toolkit-test-suite-utils.cpp
+  ${TEST_HARNESS_DIR}/dummy-control.cpp
+  ${TEST_HARNESS_DIR}/mesh-builder.cpp
+  ${TEST_HARNESS_DIR}/test-actor-utils.cpp
+  ${TEST_HARNESS_DIR}/test-animation-data.cpp
+  ${TEST_HARNESS_DIR}/test-application.cpp
+  ${TEST_HARNESS_DIR}/test-button.cpp
+  ${TEST_HARNESS_DIR}/test-harness.cpp
+  ${TEST_HARNESS_DIR}/test-gesture-generator.cpp
+  ${TEST_HARNESS_DIR}/test-gl-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-impl.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sync-object.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-command-buffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-framebuffer.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-controller.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-texture.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-sampler.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-program.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-pipeline.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-shader.cpp
+  ${TEST_HARNESS_DIR}/test-graphics-reflection.cpp
+  ${TEST_HARNESS_DIR}/test-platform-abstraction.cpp
+  ${TEST_HARNESS_DIR}/test-render-controller.cpp
+  ${TEST_HARNESS_DIR}/test-trace-call-stack.cpp
+)
+
+PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
+  dali2-core
+  dali2-adaptor
+  dali2-toolkit
+  dali2-scene3d
+)
+
+ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
+ADD_COMPILE_OPTIONS( ${${CAPI_LIB}_CFLAGS_OTHER} )
+
+ADD_DEFINITIONS(-DTEST_RESOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../../resources\" )
+
+FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
+ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
+
+INCLUDE_DIRECTORIES(
+    ../../../
+    ${${CAPI_LIB}_INCLUDE_DIRS}
+    ../dali-toolkit/dali-toolkit-test-utils
+)
+
+ADD_CUSTOM_COMMAND(
+  COMMAND ${SCRIPT_DIR}/tcheadgen.sh ${EXEC_NAME}.h ${TC_SOURCES}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  OUTPUT ${EXEC_NAME}.h
+  COMMENT "Generating test tables"
+  )
+
+ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
+TARGET_LINK_LIBRARIES(${EXEC_NAME}
+    ${${CAPI_LIB}_LIBRARIES}
+    -lpthread -ldl --coverage
+)
+
+INSTALL(PROGRAMS ${EXEC_NAME}
+    DESTINATION ${BIN_DIR}/${EXEC_NAME}
+)
diff --git a/automated-tests/src/dali-scene3d/collider-mesh-data.h b/automated-tests/src/dali-scene3d/collider-mesh-data.h
new file mode 100644
index 0000000..5e97c51
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/collider-mesh-data.h
@@ -0,0 +1,75 @@
+#include <algorithm>
+#include <vector>
+
+unsigned char col_test_0[] = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x42, 0x00, 0x00, 0x35, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x42, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_0_len = 216;
+unsigned char col_test_1[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x41, 0x00, 0x00, 0x09, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x42, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x42, 0x00, 0x00, 0x09, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x41, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_1_len = 216;
+unsigned char col_test_10[]  = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x13, 0x44, 0x00, 0x80, 0x93, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1b, 0x44, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1b, 0x44, 0x00, 0x00, 0xa0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x13, 0x44, 0x00, 0x00, 0xa0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x80, 0x93, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0xff, 0xff, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00, 0xff, 0xff, 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0xff, 0xff, 0x01, 0x00, 0x04, 0x00, 0x03, 0x00, 0xff, 0xff, 0x04, 0x00, 0x05, 0x00, 0x03, 0x00, 0xff, 0xff, 0x05, 0x00, 0x01, 0x00, 0x03, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_10_len = 360;
+unsigned char col_test_11[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x44, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1e, 0x44, 0x00, 0xc0, 0x16, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1e, 0x44, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_11_len = 216;
+unsigned char col_test_12[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x28, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x44, 0x00, 0x00, 0xd6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x00, 0xd6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x44, 0x00, 0x00, 0xd6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x00, 0xc0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x00, 0x8c, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x00, 0xc0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x00, 0x28, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x00, 0x09, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x00, 0x28, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x00, 0x09, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x42, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x42, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0xff, 0xff, 0x04, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff, 0x05, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x04, 0x00, 0x06, 0x00, 0x02, 0x00, 0xff, 0xff, 0x06, 0x00, 0x07, 0x00, 0x02, 0x00, 0xff, 0xff, 0x07, 0x00, 0x04, 0x00, 0x02, 0x00, 0xff, 0xff, 0x03, 0x00, 0x06, 0x00, 0x03, 0x00, 0xff, 0xff, 0x06, 0x00, 0x04, 0x00, 0x03, 0x00, 0xff, 0xff, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0xff, 0xff, 0x06, 0x00, 0x08, 0x00, 0x04, 0x00, 0xff, 0xff, 0x08, 0x00, 0x09, 0x00, 0x04, 0x00, 0xff, 0xff, 0x09, 0x00, 0x06, 0x00, 0x04, 0x00, 0xff, 0xff, 0x06, 0x00, 0x0a, 0x00, 0x05, 0x00, 0xff, 0xff, 0x0a, 0x00, 0x08, 0x00, 0x05, 0x00, 0xff, 0xff, 0x08, 0x00, 0x06, 0x00, 0x05, 0x00, 0xff, 0xff, 0x02, 0x00, 0x06, 0x00, 0x06, 0x00, 0xff, 0xff, 0x06, 0x00, 0x03, 0x00, 0x06, 0x00, 0xff, 0xff, 0x03, 0x00, 0x02, 0x00, 0x06, 0x00, 0xff, 0xff, 0x02, 0x00, 0x0a, 0x00, 0x07, 0x00, 0xff, 0xff, 0x0a, 0x00, 0x06, 0x00, 0x07, 0x00, 0xff, 0xff, 0x06, 0x00, 0x02, 0x00, 0x07, 0x00, 0xff, 0xff, 0x01, 0x00, 0x0a, 0x00, 0x08, 0x00, 0xff, 0xff, 0x0a, 0x00, 0x02, 0x00, 0x08, 0x00, 0xff, 0xff, 0x02, 0x00, 0x01, 0x00, 0x08, 0x00, 0xff, 0xff, 0x0b, 0x00, 0x0a, 0x00, 0x09, 0x00, 0xff, 0xff, 0x0a, 0x00, 0x01, 0x00, 0x09, 0x00, 0xff, 0xff, 0x01, 0x00, 0x0b, 0x00, 0x09, 0x00, 0xff, 0xff, 0x0c, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0xff, 0xff, 0x0a, 0x00, 0x0b, 0x00, 0x0a, 0x00, 0xff, 0xff, 0x0b, 0x00, 0x0c, 0x00, 0x0a, 0x00, 0xff, 0xff, 0x0a, 0x00, 0x0c, 0x00, 0x0b, 0x00, 0xff, 0xff, 0x0c, 0x00, 0x0d, 0x00, 0x0b, 0x00, 0xff, 0xff, 0x0d, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0xff, 0xff, 0x07, 0x00, 0x06, 0x00, 0x0c, 0x00, 0xff, 0xff, 0x06, 0x00, 0x09, 0x00, 0x0c, 0x00, 0xff, 0xff, 0x09, 0x00, 0x07, 0x00, 0x0c, 0x00, 0xff, 0xff, 0x0e, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0xff, 0xff, 0x0c, 0x00, 0x0b, 0x00, 0x0d, 0x00, 0xff, 0xff, 0x0b, 0x00, 0x0e, 0x00, 0x0d, 0x00, 0xff, 0xff, 0x0c, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0xff, 0xff, 0x0e, 0x00, 0x0f, 0x00, 0x0e, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x08, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x06, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x0c, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_12_len = 1140;
+unsigned char col_test_13[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x00, 0x28, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd4, 0x43, 0x00, 0x00, 0x8c, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd4, 0x43, 0x00, 0x00, 0x28, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_13_len = 216;
+unsigned char col_test_14[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x44, 0x00, 0x00, 0xd6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1e, 0x44, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1e, 0x44, 0x00, 0x00, 0xd6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_14_len = 216;
+unsigned char col_test_2[]    = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x84, 0x43, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x42, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x84, 0x43, 0x00, 0x00, 0x09, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x00, 0x09, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x42, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0xff, 0xff, 0x04, 0x00, 0x02, 0x00, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00, 0xff, 0xff, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00, 0xff, 0xff, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0xff, 0xff, 0x01, 0x00, 0x05, 0x00, 0x03, 0x00, 0xff, 0xff, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_2_len = 360;
+unsigned char col_test_3[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x43, 0x00, 0x00, 0x28, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x43, 0x00, 0x00, 0x28, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x43, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_3_len = 216;
+unsigned char col_test_4[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x43, 0x00, 0x40, 0x2f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x40, 0x2f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x43, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_4_len = 216;
+unsigned char col_test_5[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x43, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x84, 0x43, 0x00, 0x40, 0x2f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x43, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x40, 0x2f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x40, 0x20, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x84, 0x43, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0xff, 0xff, 0x04, 0x00, 0x02, 0x00, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00, 0xff, 0xff, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00, 0xff, 0xff, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0xff, 0xff, 0x01, 0x00, 0x05, 0x00, 0x03, 0x00, 0xff, 0xff, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_5_len = 360;
+unsigned char col_test_6[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x93, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x00, 0x8c, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x43, 0x00, 0x80, 0x93, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x43, 0x00, 0x00, 0x8c, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_6_len = 216;
+unsigned char col_test_7[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x80, 0x93, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x00, 0xc0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x80, 0x93, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc6, 0x43, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_7_len = 216;
+unsigned char col_test_8[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x44, 0x00, 0x80, 0x36, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x44, 0x00, 0x80, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc4, 0x43, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int  col_test_8_len = 216;
+unsigned char col_test_9[]   = {
+  0x4e, 0x41, 0x56, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1b, 0x44, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x13, 0x44, 0x00, 0x80, 0xa6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1b, 0x44, 0x00, 0x00, 0xd6, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x00, 0xa0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x13, 0x44, 0x00, 0x00, 0xa0, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0x04, 0x00, 0x02, 0x00, 0xff, 0xff, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0xff, 0xff, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00, 0xff, 0xff, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0xff, 0xff, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0xff, 0xff, 0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+unsigned int col_test_9_len = 360;
+
+static const std::vector<std::pair<uint8_t*, uint32_t>> TEST_COLLIDER_MESH = {
+  {col_test_0, col_test_0_len},
+  {col_test_1, col_test_1_len},
+  {col_test_2, col_test_2_len},
+  {col_test_3, col_test_3_len},
+  {col_test_4, col_test_4_len},
+  {col_test_5, col_test_5_len},
+  {col_test_6, col_test_6_len},
+  {col_test_7, col_test_7_len},
+  {col_test_8, col_test_8_len},
+  {col_test_9, col_test_9_len},
+};
+
+#define COLLIDER_BUFFER(N)                                              \
+  std::invoke([]() {                                                    \
+    auto v = std::vector<uint8_t>();                                    \
+    v.insert(v.end(), col_test_##N, col_test_##N + col_test_##N##_len); \
+    return v;                                                           \
+  })
+
+static std::vector<uint8_t> GetTestColliderMesh(int n)
+{
+  auto v = std::vector<uint8_t>();
+  v.insert(v.end(), TEST_COLLIDER_MESH[n].first, TEST_COLLIDER_MESH[n].first + TEST_COLLIDER_MESH[n].second);
+  return v;
+}
diff --git a/automated-tests/src/dali-scene3d/tct-dali-scene3d-core.cpp b/automated-tests/src/dali-scene3d/tct-dali-scene3d-core.cpp
new file mode 100644
index 0000000..3a43985
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/tct-dali-scene3d-core.cpp
@@ -0,0 +1,7 @@
+#include <test-harness.h>
+#include "tct-dali-scene3d-core.h"
+
+int main(int argc, char * const argv[])
+{
+  return TestHarness::RunTests(argc, argv, tc_array);
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-AlphaFunctionHelper.cpp b/automated-tests/src/dali-scene3d/utc-Dali-AlphaFunctionHelper.cpp
new file mode 100644
index 0000000..53de7d2
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-AlphaFunctionHelper.cpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/alpha-function-helper.h"
+#include <dali-test-suite-utils.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+#define ALPHA_FN_PAIR(x) { #x, AlphaFunction::x }
+
+const std::pair<std::string, AlphaFunction::BuiltinFunction> BUILTIN_FUNCTIONS[] {
+  ALPHA_FN_PAIR(DEFAULT),
+  ALPHA_FN_PAIR(LINEAR),
+  ALPHA_FN_PAIR(REVERSE),
+  ALPHA_FN_PAIR(EASE_IN),
+  ALPHA_FN_PAIR(EASE_OUT),
+  ALPHA_FN_PAIR(EASE_IN_OUT),
+  ALPHA_FN_PAIR(EASE_IN_SQUARE),
+  ALPHA_FN_PAIR(EASE_OUT_SQUARE),
+  ALPHA_FN_PAIR(EASE_IN_SINE),
+  ALPHA_FN_PAIR(EASE_OUT_SINE),
+  ALPHA_FN_PAIR(EASE_IN_OUT_SINE),
+  ALPHA_FN_PAIR(BOUNCE),
+  ALPHA_FN_PAIR(SIN),
+  ALPHA_FN_PAIR(EASE_OUT_BACK),
+};
+
+int UtcDaliAlphaFunctionHelperGet(void)
+{
+  bool found;
+  for (auto& a: BUILTIN_FUNCTIONS)
+  {
+    auto result = GetAlphaFunction(a.first, &found);
+    DALI_TEST_EQUAL(result.GetBuiltinFunction(), a.second);
+    DALI_TEST_EQUAL(result.GetMode(), AlphaFunction::BUILTIN_FUNCTION);
+    DALI_TEST_CHECK(found);
+  }
+
+  auto result = GetAlphaFunction("made up function", &found);
+  DALI_TEST_EQUAL(result.GetBuiltinFunction(), AlphaFunction::DEFAULT);
+  DALI_TEST_EQUAL(result.GetMode(), AlphaFunction::BUILTIN_FUNCTION);
+  DALI_TEST_CHECK(!found);
+
+  END_TEST;
+}
+
+int UtcDaliAlphaFunctionHelperRegister(void)
+{
+  for (auto& a: BUILTIN_FUNCTIONS)
+  {
+    DALI_TEST_ASSERTION(RegisterAlphaFunction(a.first, AlphaFunction()), "given key already exists");
+  }
+
+  AlphaFunctionPrototype testFn = [](float f) {
+    return f > .5f ? 1.f : 0.f;
+  };
+  RegisterAlphaFunction("step", AlphaFunction(testFn));
+
+  bool found;
+  auto result = GetAlphaFunction("step", &found);
+  DALI_TEST_EQUAL(result.GetMode(), AlphaFunction::CUSTOM_FUNCTION);
+  DALI_TEST_EQUAL(result.GetCustomFunction(), testFn);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-AnimatedProperty.cpp b/automated-tests/src/dali-scene3d/utc-Dali-AnimatedProperty.cpp
new file mode 100644
index 0000000..6c4502f
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-AnimatedProperty.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/animated-property.h"
+#include <dali-test-suite-utils.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliAnimatedPropertyGetPropertyType(void)
+{
+  TestApplication app;
+  auto actor = Actor::New();
+  actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
+
+  AnimatedProperty animProp {
+    INVALID_INDEX,
+   "ChristopherPlummer",
+   "position",
+   KeyFrames(),
+   std::unique_ptr<AnimatedProperty::Value>{ new AnimatedProperty::Value{
+     Property::Value{ Vector3::XAXIS * 100.f },
+     true
+   } },
+  };
+
+  Property expected(actor, Actor::Property::POSITION);
+  Property result = animProp.GetProperty(actor);
+  DALI_TEST_EQUAL(result.object, expected.object);
+  DALI_TEST_EQUAL(result.propertyIndex, expected.propertyIndex);
+  DALI_TEST_EQUAL(result.componentIndex, expected.componentIndex);
+  DALI_TEST_EQUAL(animProp.GetPropertyType(actor), Property::VECTOR3);
+
+  END_TEST;
+}
+
+
+
+
+
+
+
+
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-AnimationDefinition.cpp b/automated-tests/src/dali-scene3d/utc-Dali-AnimationDefinition.cpp
new file mode 100644
index 0000000..a2e052c
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-AnimationDefinition.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/animation-definition.h"
+#include <dali-test-suite-utils.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliAnimationDefinitionStopForModification(void)
+{
+  TestApplication app;
+  auto anim = Animation::New(15.f);
+  anim.Play();
+
+  auto oldEndAction = AnimationDefinition::StopForModification(anim);
+  DALI_TEST_EQUAL(anim.GetState(), Animation::STOPPED);
+  DALI_TEST_EQUAL(oldEndAction, Animation::BAKE);
+  DALI_TEST_EQUAL(anim.GetEndAction(), Animation::DISCARD);
+
+  END_TEST;
+}
+
+int UtcDaliAnimationDefinitionReAnimate(void)
+{
+  TestApplication app;
+  auto actor = Actor::New();
+  actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
+
+  auto getActor = [&actor](const Dali::Scene3D::Loader::AnimatedProperty& property) {
+    return actor.FindChildByName(property.mNodeName);
+  };
+
+  uint32_t animatedPropertyIndex = 0;
+  for (bool b: { false, true })
+  {
+    AnimationDefinition animDef;
+    animDef.SetName("WalkRight");
+    animDef.SetDuration(10.f);
+    animDef.SetLoopCount(2);
+    animDef.SetEndAction(Animation::BAKE_FINAL);
+    animDef.SetSpeedFactor(.7f);
+    animDef.SetProperty(animatedPropertyIndex++,std::move(AnimatedProperty{
+     INVALID_INDEX,
+     "ChristopherPlummer",
+     "position",
+     KeyFrames(),
+     std::unique_ptr<AnimatedProperty::Value>{ new AnimatedProperty::Value{
+       Property::Value{ Vector3::XAXIS * 100.f },
+       b
+     } },
+     AlphaFunction::EASE_OUT,
+     TimePeriod(animDef.GetDuration())
+    }));
+
+    auto anim = animDef.ReAnimate(getActor);
+    DALI_TEST_EQUAL(anim.GetDuration(), animDef.GetDuration());
+    DALI_TEST_EQUAL(anim.GetEndAction(), animDef.GetEndAction());
+    DALI_TEST_EQUAL(anim.GetSpeedFactor(), animDef.GetSpeedFactor());
+    DALI_TEST_EQUAL(anim.GetLoopCount(), animDef.GetLoopCount());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliAnimationDefinitionReAnimateKeyFrames(void)
+{
+  TestApplication app;
+  auto actor = Actor::New();
+  actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
+
+  auto getActor = [&actor](const Dali::Scene3D::Loader::AnimatedProperty& property) {
+    return actor.FindChildByName(property.mNodeName);
+  };
+
+  KeyFrames kf = KeyFrames::New();
+  kf.Add(0.f, Vector3::ZERO);
+  kf.Add(1.f, Vector3::XAXIS * 100.f);
+
+  uint32_t animatedPropertyIndex = 0;
+  AnimationDefinition animDef;
+  animDef.SetName("WalkRight");
+  animDef.SetDuration(10.f);
+  animDef.SetLoopCount(2);
+  animDef.SetEndAction(Animation::BAKE_FINAL);
+  animDef.SetSpeedFactor(.7f);
+  animDef.SetProperty(animatedPropertyIndex++, std::move(AnimatedProperty{
+   INVALID_INDEX,
+   "ChristopherPlummer",
+   "position",
+   kf,
+   nullptr,
+   AlphaFunction::EASE_OUT,
+   TimePeriod(animDef.GetDuration())
+  }));
+
+  auto anim = animDef.ReAnimate(getActor);
+  DALI_TEST_EQUAL(anim.GetDuration(), animDef.GetDuration());
+  DALI_TEST_EQUAL(anim.GetEndAction(), animDef.GetEndAction());
+  DALI_TEST_EQUAL(anim.GetSpeedFactor(), animDef.GetSpeedFactor());
+  DALI_TEST_EQUAL(anim.GetLoopCount(), animDef.GetLoopCount());
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-BlendShapeIndex.cpp b/automated-tests/src/dali-scene3d/utc-Dali-BlendShapeIndex.cpp
new file mode 100644
index 0000000..b7c34ff
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-BlendShapeIndex.cpp
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D;
+
+void model_motion_blend_shape_index_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_motion_blend_shape_index_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+const char* const WEIGHTS_UNIFORM = "uBlendShapeWeight";
+
+std::string GetPropertyNameFromIndex(int index)
+{
+  if(index >= 0)
+  {
+    char weightNameBuffer[32];
+
+    // Get return value of snprintf to avoid SVACE.
+    [[maybe_unused]] auto prefixSize = snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s[%d]", WEIGHTS_UNIFORM, index);
+
+    return weightNameBuffer;
+  }
+  return "";
+}
+} // namespace
+
+// Positive test case for a method
+int UtcDaliBlendShapeIndexNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliBlendShapeIndexNew");
+
+  BlendShapeIndex blendShapeIndex = BlendShapeIndex::New();
+  DALI_TEST_CHECK(blendShapeIndex);
+  DALI_TEST_EQUALS(blendShapeIndex.GetModelNodeId().stringKey, "", TEST_LOCATION);
+  DALI_TEST_EQUALS(blendShapeIndex.GetBlendShapeId().indexKey, Property::INVALID_INDEX, TEST_LOCATION);
+
+  blendShapeIndex = BlendShapeIndex::New("dummy", 3u);
+  DALI_TEST_CHECK(blendShapeIndex);
+  DALI_TEST_EQUALS(blendShapeIndex.GetModelNodeId().stringKey, "dummy", TEST_LOCATION);
+  DALI_TEST_EQUALS(blendShapeIndex.GetBlendShapeId().indexKey, 3u, TEST_LOCATION);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliBlendShapeIndexDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliBlendShapeIndexDownCast");
+
+  BlendShapeIndex blendShapeIndex = BlendShapeIndex::New();
+  BaseHandle      handle(blendShapeIndex);
+
+  BlendShapeIndex blendShapeIndex2 = BlendShapeIndex::DownCast(handle);
+  DALI_TEST_CHECK(blendShapeIndex);
+  DALI_TEST_CHECK(blendShapeIndex2);
+  DALI_TEST_CHECK(blendShapeIndex2 == blendShapeIndex);
+  END_TEST;
+}
+
+int UtcDaliBlendShapeIndexTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("BlendShapeIndex");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  BlendShapeIndex blendShapeIndex = BlendShapeIndex::DownCast(handle);
+  DALI_TEST_CHECK(blendShapeIndex);
+
+  END_TEST;
+}
+
+int UtcDaliBlendShapeIndexCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  BlendShapeIndex blendShapeIndex = BlendShapeIndex::New();
+  DALI_TEST_CHECK(blendShapeIndex);
+
+  BlendShapeIndex copy(blendShapeIndex);
+  DALI_TEST_CHECK(blendShapeIndex == copy);
+
+  BlendShapeIndex assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == blendShapeIndex);
+
+  END_TEST;
+}
+
+int UtcDaliBlendShapeIndexMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  BlendShapeIndex blendShapeIndex = BlendShapeIndex::New();
+  DALI_TEST_EQUALS(1, blendShapeIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  BlendShapeIndex moved = std::move(blendShapeIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!blendShapeIndex);
+
+  END_TEST;
+}
+
+int UtcDaliBlendShapeIndexMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  BlendShapeIndex blendShapeIndex = BlendShapeIndex::New();
+  DALI_TEST_EQUALS(1, blendShapeIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  BlendShapeIndex moved;
+  moved = std::move(blendShapeIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+
+int UtcDaliBlendShapeIndexGetPropertyName(void)
+{
+  std::string     expectPropertyName  = "";
+  Property::Index expectPropertyIndex = Property::INVALID_INDEX;
+
+  uint32_t blendShapeIndex;
+
+  MotionIndex index = BlendShapeIndex::New();
+
+  // Invalid motion index return empty string, invalid index
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyIndex(), TEST_LOCATION);
+
+  blendShapeIndex    = 0u;
+  index              = BlendShapeIndex::New("", blendShapeIndex);
+  expectPropertyName = GetPropertyNameFromIndex(blendShapeIndex);
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+
+  blendShapeIndex    = 45u;
+  index              = BlendShapeIndex::New("", blendShapeIndex);
+  expectPropertyName = GetPropertyNameFromIndex(blendShapeIndex);
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+
+  blendShapeIndex    = 109u;
+  index              = BlendShapeIndex::New("", blendShapeIndex);
+  expectPropertyName = GetPropertyNameFromIndex(blendShapeIndex);
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliBlendShapeIndexSetGetBlendShapeId(void)
+{
+  Property::Index expectPropertyIndex = 0u;
+
+  BlendShapeIndex index = BlendShapeIndex::New("", expectPropertyIndex);
+
+  // Invalid motion index return empty string, invalid index
+  DALI_TEST_CHECK(index.GetBlendShapeId().type == Property::Key::Type::INDEX);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetBlendShapeId().indexKey, TEST_LOCATION);
+
+  std::string expectPropertyName = "hello";
+  index.SetBlendShapeId(expectPropertyName);
+  DALI_TEST_CHECK(index.GetBlendShapeId().type == Property::Key::Type::STRING);
+  DALI_TEST_EQUALS(expectPropertyName, index.GetBlendShapeId().stringKey, TEST_LOCATION);
+
+  expectPropertyIndex = 100u;
+  index.SetBlendShapeId(expectPropertyIndex);
+  DALI_TEST_CHECK(index.GetBlendShapeId().type == Property::Key::Type::INDEX);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetBlendShapeId().indexKey, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-BvhLoader.cpp b/automated-tests/src/dali-scene3d/utc-Dali-BvhLoader.cpp
new file mode 100644
index 0000000..b395804
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-BvhLoader.cpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-scene3d/public-api/loader/bvh-loader.h>
+#include <dali-test-suite-utils.h>
+
+#include <fstream>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+std::string ReadBufferFromFile(const std::string& url)
+{
+  std::string  rawString;
+  std::fstream fileStream;
+
+  fileStream.open(url, std::ios::in | std::ios::binary);
+  if(!fileStream.is_open())
+  {
+    DALI_LOG_WARNING("stream open failed for: \"%s\", in mode: \"%d\".\n", url.c_str(), static_cast<int>(std::ios::in | std::ios::binary));
+  }
+
+  // get length of file:
+  fileStream.seekg(0, std::ios::end);
+  auto length = fileStream.tellg();
+  fileStream.seekg(0, std::ios::beg);
+
+  rawString.resize(length);
+  fileStream.read(rawString.data(), length);
+
+  fileStream.close();
+
+  return rawString;
+}
+} // namespace
+
+int UtcDaliLoadBvh(void)
+{
+  TestApplication application;
+
+  for(uint32_t tc = 0; tc < 2; ++tc)
+  {
+    AnimationDefinition animDef;
+    tet_printf("UtcDaliLoadBvh testcase %u\n", tc);
+    switch(tc)
+    {
+      case 0: // Load bvh from url
+      {
+        animDef = LoadBvh(TEST_RESOURCE_DIR "/test.bvh", "testBvh", false);
+        break;
+      }
+      case 1: // Load bvh from buffer stream.
+      {
+        std::string rawString = ReadBufferFromFile(TEST_RESOURCE_DIR "/test.bvh");
+        animDef               = LoadBvhFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()), "testBvh", false);
+        break;
+      }
+    }
+
+    DALI_TEST_EQUAL(animDef.GetName(), "testBvh");
+    DALI_TEST_EQUAL(animDef.GetDuration(), 0.3f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mNodeName, "root");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mPropertyName, "position");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mKeyFrames.GetType(), Property::Type::VECTOR3);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mTimePeriod.durationSeconds, 0.3f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(1).mNodeName, "root");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(1).mPropertyName, "orientation");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(1).mKeyFrames.GetType(), Property::Type::ROTATION);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(1).mTimePeriod.durationSeconds, 0.3f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(2).mNodeName, "first");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(2).mPropertyName, "position");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(2).mKeyFrames.GetType(), Property::Type::VECTOR3);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(2).mTimePeriod.durationSeconds, 0.3f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(3).mNodeName, "first");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(3).mPropertyName, "orientation");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(3).mKeyFrames.GetType(), Property::Type::ROTATION);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(3).mTimePeriod.durationSeconds, 0.3f);
+
+    Actor root = Actor::New();
+    root.SetProperty(Actor::Property::NAME, "root");
+
+    Actor first = Actor::New();
+    first.SetProperty(Actor::Property::NAME, "first");
+    root.Add(first);
+
+    auto getActor = [&root](const Dali::Scene3D::Loader::AnimatedProperty& property) {
+      return root.FindChildByName(property.mNodeName);
+    };
+
+    Animation animation = animDef.ReAnimate(getActor);
+    DALI_TEST_EQUAL(animation.GetDuration(), animDef.GetDuration());
+
+    application.GetScene().Add(root);
+
+    application.SendNotification();
+    application.Render(20);
+
+    DALI_TEST_EQUALS(Vector2(0, 0), root.GetProperty<Vector2>(Actor::Property::POSITION), TEST_LOCATION);
+    DALI_TEST_EQUALS(Vector2(0, 0), first.GetProperty<Vector2>(Actor::Property::POSITION), TEST_LOCATION);
+    Vector3 rootWorldPositionBefore  = root.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
+    Vector3 firstWorldPositionBefore = first.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
+
+    animation.Play();
+
+    application.SendNotification();
+    application.Render(1000);
+
+    DALI_TEST_EQUALS(Vector2(0, 10), root.GetProperty<Vector2>(Actor::Property::POSITION), TEST_LOCATION);
+    DALI_TEST_EQUALS(Vector2(10, 0), first.GetProperty<Vector2>(Actor::Property::POSITION), TEST_LOCATION);
+
+    Vector3 rootWorldPositionAfter  = root.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
+    Vector3 firstWorldPositionAfter = first.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
+
+    DALI_TEST_EQUALS(Vector3(0, 10, 0), rootWorldPositionAfter - rootWorldPositionBefore, TEST_LOCATION);
+    DALI_TEST_EQUALS(Vector3(10, 10, 0), firstWorldPositionAfter - firstWorldPositionBefore, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliLoadBvhFailed01(void)
+{
+  TestApplication application;
+
+  AnimationDefinition animDef = LoadBvh("/nothing.bvh", "testBvh", false);
+  DALI_TEST_EQUALS(0u, animDef.GetPropertyCount(), TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliLoadBvhFailed02(void)
+{
+  TestApplication application;
+
+  AnimationDefinition animDef = LoadBvhFromBuffer(nullptr, 0, "testBvh", false);
+  DALI_TEST_EQUALS(0u, animDef.GetPropertyCount(), TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliLoadBvhFailed03(void)
+{
+  TestApplication application;
+
+  tet_infoline("Parse error for hierarchy1");
+  uint32_t caseHierarchyCount = 8;
+  for(uint32_t tc = 0; tc < caseHierarchyCount; ++tc)
+  {
+    tet_printf("Parse error for hierarchy %u\n", tc);
+    std::ostringstream oss;
+    oss << TEST_RESOURCE_DIR << "/test-invalid-hierarchy" << tc << ".bvh";
+    AnimationDefinition animDef = LoadBvh(oss.str(), "testBvh", false);
+    DALI_TEST_EQUALS(0u, animDef.GetPropertyCount(), TEST_LOCATION);
+  }
+
+  uint32_t caseMotionCount = 4;
+  for(uint32_t tc = 0; tc < caseMotionCount; ++tc)
+  {
+    tet_printf("Parse error for motion %u\n", tc);
+    std::ostringstream oss;
+    oss << TEST_RESOURCE_DIR << "/test-invalid-motion" << tc << ".bvh";
+    AnimationDefinition animDef = LoadBvh(oss.str(), "testBvh", false);
+    DALI_TEST_EQUALS(0u, animDef.GetPropertyCount(), TEST_LOCATION);
+  }
+
+  {
+    tet_infoline("empty file");
+    AnimationDefinition animDef = LoadBvh(TEST_RESOURCE_DIR "/test-empty.bvh", "testBvh", false);
+    DALI_TEST_EQUALS(0u, animDef.GetPropertyCount(), TEST_LOCATION);
+  }
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-CameraParameters.cpp b/automated-tests/src/dali-scene3d/utc-Dali-CameraParameters.cpp
new file mode 100644
index 0000000..83f345c
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-CameraParameters.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-test-suite-utils.h>
+#include <dali/devel-api/actors/camera-actor-devel.h>
+#include <string_view>
+#include "dali-scene3d/public-api/loader/camera-parameters.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliCameraParameters(void)
+{
+  Quaternion       qView = Quaternion(Radian(Degree(180.f)), Vector3::YAXIS);
+  CameraParameters camParams;
+  camParams.matrix.SetTransformComponents(Vector3::ONE * 2.f,
+                                          qView,
+                                          Vector3::ZAXIS * -100.f);
+  camParams.orthographicSize = 3.0f;
+  camParams.aspectRatio      = 1.0f;
+  camParams.yFovDegree       = Degree(Radian(M_PI * .5));
+  camParams.zNear            = 1.f;
+  camParams.zFar             = 1000.f;
+
+  Vector3    scale;
+  Quaternion orientation;
+  Vector3    position;
+  camParams.CalculateTransformComponents(position, orientation, scale);
+  DALI_TEST_EQUAL(scale, Vector3::ONE * 2.f);
+  DALI_TEST_EQUAL(orientation, Quaternion::IDENTITY); // 2 180 degrees rotations along y
+  DALI_TEST_EQUAL(position, Vector3::ZAXIS * -100.f);
+
+  TestApplication app;
+  CameraActor     camera = CameraActor::New();
+  for(auto i : {false, true})
+  {
+    camParams.isPerspective = i;
+
+    auto   viewProjection = camParams.GetViewProjection();
+    Matrix view{false};
+    Matrix::Multiply(view, Matrix(qView), camParams.matrix);
+    view.Invert();
+    DALI_TEST_EQUAL(viewProjection.GetView(), view);
+
+    camParams.ConfigureCamera(camera);
+    DALI_TEST_EQUAL(camParams.zNear, camera.GetNearClippingPlane());
+    DALI_TEST_EQUAL(camParams.zFar, camera.GetFarClippingPlane());
+
+    DALI_TEST_EQUAL(camera.GetInvertYAxis(), true);
+    DALI_TEST_EQUAL(camera.GetProperty(Actor::Property::POSITION).Get<Vector3>(), position);
+    DALI_TEST_EQUAL(camera.GetProperty(Actor::Property::ORIENTATION).Get<Quaternion>(), orientation);
+    DALI_TEST_EQUAL(camera.GetProperty(Actor::Property::SCALE).Get<Vector3>(), scale);
+
+    if(camParams.isPerspective)
+    {
+      DALI_TEST_EQUAL(camera.GetProperty(Dali::CameraActor::Property::FIELD_OF_VIEW).Get<float>(), Radian(camParams.yFovDegree).radian);
+    }
+    else
+    {
+      DALI_TEST_EQUAL(camera.GetProperty(Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE).Get<float>(), camParams.orthographicSize);
+    }
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-EnvironmentDefinition.cpp b/automated-tests/src/dali-scene3d/utc-Dali-EnvironmentDefinition.cpp
new file mode 100644
index 0000000..8d5e694
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-EnvironmentDefinition.cpp
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-test-suite-utils.h>
+#include <string_view>
+#include "dali-scene3d/public-api/loader/environment-definition.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliEnvironmentDefinitionLoadRawDefault(void)
+{
+  EnvironmentDefinition envDef;
+  auto                  rawData = envDef.LoadRaw("");
+
+  DALI_TEST_EQUAL(rawData.mDiffuse.mPixelData.size(), 6u);
+  for(auto& face : rawData.mDiffuse.mPixelData)
+  {
+    DALI_TEST_EQUAL(face.size(), 1u);
+  }
+
+  DALI_TEST_EQUAL(rawData.mSpecular.mPixelData.size(), 6u);
+  for(auto& face : rawData.mSpecular.mPixelData)
+  {
+    DALI_TEST_EQUAL(face.size(), 1u);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentDefinitionLoadRawFail(void)
+{
+  for(auto name : {"nonexistent.ktx", TEST_RESOURCE_DIR "Cobe.obj", TEST_RESOURCE_DIR "truncated.ktx"})
+  {
+    EnvironmentDefinition envDef{name, name};
+    DALI_TEST_ASSERTION(envDef.LoadRaw(""), "Failed to load cubemap texture");
+
+    envDef.mDiffuseMapPath = "";
+    DALI_TEST_ASSERTION(envDef.LoadRaw(""), "Failed to load cubemap texture"); // specular map still invalid
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentDefinitionLoadRawSuccess(void)
+{
+  EnvironmentDefinition envDef{"forest_irradiance.ktx", "forest_radiance.ktx"};
+  auto                  rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");
+
+  DALI_TEST_EQUAL(rawData.mDiffuse.mPixelData.size(), 6u);
+  for(auto& face : rawData.mDiffuse.mPixelData)
+  {
+    DALI_TEST_EQUAL(face.size(), 1u);
+    uint32_t size = 64u;
+    for(auto& mipLevel : face)
+    {
+      DALI_TEST_EQUAL(mipLevel.GetPixelFormat(), Pixel::Format::RGB888);
+      DALI_TEST_EQUAL(mipLevel.GetWidth(), size);
+      DALI_TEST_EQUAL(mipLevel.GetHeight(), size);
+      size /= 2;
+    }
+  }
+
+  DALI_TEST_EQUAL(rawData.mSpecular.mPixelData.size(), 6u);
+  for(auto& face : rawData.mSpecular.mPixelData)
+  {
+    DALI_TEST_EQUAL(face.size(), 5u);
+    uint32_t size = 64u;
+    for(auto& mipLevel : face)
+    {
+      DALI_TEST_EQUAL(mipLevel.GetPixelFormat(), Pixel::Format::RGB888);
+      DALI_TEST_EQUAL(mipLevel.GetWidth(), size);
+      DALI_TEST_EQUAL(mipLevel.GetHeight(), size);
+      size /= 2;
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentDefinitionLoadEmptyRaw(void)
+{
+  EnvironmentDefinition::RawData rawData;
+  EnvironmentDefinition          envDef;
+  auto                           textures = envDef.Load(std::move(rawData));
+  DALI_TEST_CHECK(!textures.mDiffuse);
+  DALI_TEST_CHECK(!textures.mSpecular);
+
+  END_TEST;
+}
+
+namespace
+{
+void CheckTextureDefault(Texture texture)
+{
+  DALI_TEST_CHECK(texture);
+  DALI_TEST_EQUAL(texture.GetWidth(), 1u);
+  DALI_TEST_EQUAL(texture.GetHeight(), 1u);
+}
+
+void CheckTextureNotDefault(Texture texture)
+{
+  DALI_TEST_CHECK(texture);
+  DALI_TEST_CHECK(texture.GetWidth() > 1u);
+  DALI_TEST_CHECK(texture.GetHeight() > 1u);
+}
+
+} // namespace
+
+int UtcDaliEnvironmentDefinitionLoadDefault(void)
+{
+  EnvironmentDefinition envDef{};
+  auto                  rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");
+  ;
+
+  TestApplication app;
+  auto            textures = envDef.Load(std::move(rawData));
+
+  CheckTextureDefault(textures.mSpecular);
+  CheckTextureDefault(textures.mDiffuse);
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentDefinitionLoadDiffuse(void)
+{
+  EnvironmentDefinition envDef{"forest_irradiance.ktx"};
+  auto                  rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");
+  ;
+
+  TestApplication app;
+  auto            textures = envDef.Load(std::move(rawData));
+
+  CheckTextureNotDefault(textures.mDiffuse);
+  CheckTextureDefault(textures.mSpecular);
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentDefinitionLoadSpecular(void)
+{
+  EnvironmentDefinition envDef{"", "forest_radiance.ktx"};
+  auto                  rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");
+  ;
+
+  TestApplication app;
+  auto            textures = envDef.Load(std::move(rawData));
+
+  CheckTextureDefault(textures.mDiffuse);
+  CheckTextureNotDefault(textures.mSpecular);
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentDefinitionLoadBoth(void)
+{
+  EnvironmentDefinition envDef{"forest_irradiance.ktx", "forest_radiance.ktx"};
+  auto                  rawData = envDef.LoadRaw(TEST_RESOURCE_DIR "/");
+  ;
+
+  TestApplication app;
+  auto            textures = envDef.Load(std::move(rawData));
+
+  CheckTextureNotDefault(textures.mDiffuse);
+  CheckTextureNotDefault(textures.mSpecular);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-EnvironmentMapLoader.cpp b/automated-tests/src/dali-scene3d/utc-Dali-EnvironmentMapLoader.cpp
new file mode 100644
index 0000000..602d369
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-EnvironmentMapLoader.cpp
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-test-suite-utils.h>
+#include <string_view>
+#include "dali-scene3d/public-api/loader/environment-map-loader.h"
+
+#include <fstream>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliEnvironmentMapLoaderFailNonexistent(void)
+{
+  EnvironmentMapData environmentMapData;
+  DALI_TEST_CHECK(!LoadEnvironmentMap("non-existent.jpg", environmentMapData));
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderSuccess01(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/forest_radiance.ktx";
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  DALI_TEST_EQUAL(6u, environmentMapData.mPixelData.size());
+  for(auto& face : environmentMapData.mPixelData)
+  {
+    uint32_t size = 64;
+    for(auto& mipData : face)
+    {
+      DALI_TEST_EQUAL(size, mipData.GetWidth());
+      DALI_TEST_EQUAL(size, mipData.GetHeight());
+      DALI_TEST_EQUAL(Pixel::Format::RGB888, mipData.GetPixelFormat());
+      size /= 2;
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderAutoType01(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/forest_diffuse_cubemap.png"; // cross horizontal
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::AUTO);
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::CUBEMAP);
+  DALI_TEST_EQUAL(6u, environmentMapData.mPixelData.size());
+  for(auto& face : environmentMapData.mPixelData)
+  {
+    uint32_t size = 512;
+    DALI_TEST_EQUAL(size, face[0].GetWidth());
+    DALI_TEST_EQUAL(size, face[0].GetHeight());
+    DALI_TEST_EQUAL(Pixel::Format::RGBA8888, face[0].GetPixelFormat());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderAutoType02(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/forest_diffuse_cubemap_cross_vertical.png"; // cross vertical
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::AUTO);
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::CUBEMAP);
+  DALI_TEST_EQUAL(6u, environmentMapData.mPixelData.size());
+  for(auto& face : environmentMapData.mPixelData)
+  {
+    uint32_t size = 256;
+    DALI_TEST_EQUAL(size, face[0].GetWidth());
+    DALI_TEST_EQUAL(size, face[0].GetHeight());
+    DALI_TEST_EQUAL(Pixel::Format::RGBA8888, face[0].GetPixelFormat());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderAutoType03(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/cubemap_array_horizontal.png"; // array horizontal
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::AUTO);
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::CUBEMAP);
+  DALI_TEST_EQUAL(6u, environmentMapData.mPixelData.size());
+  for(auto& face : environmentMapData.mPixelData)
+  {
+    uint32_t size = 100;
+    DALI_TEST_EQUAL(size, face[0].GetWidth());
+    DALI_TEST_EQUAL(size, face[0].GetHeight());
+    DALI_TEST_EQUAL(Pixel::Format::RGB888, face[0].GetPixelFormat());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderAutoType04(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/cubemap_array_vertical.png"; // array horizontal
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::AUTO);
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::CUBEMAP);
+  DALI_TEST_EQUAL(6u, environmentMapData.mPixelData.size());
+  for(auto& face : environmentMapData.mPixelData)
+  {
+    uint32_t size = 100;
+    DALI_TEST_EQUAL(size, face[0].GetWidth());
+    DALI_TEST_EQUAL(size, face[0].GetHeight());
+    DALI_TEST_EQUAL(Pixel::Format::RGB888, face[0].GetPixelFormat());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderAutoType05(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/equirectangular.png"; // no cube map
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::AUTO);
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::EQUIRECTANGULAR);
+  DALI_TEST_EQUAL(1u, environmentMapData.mPixelData.size());
+  for(auto& face : environmentMapData.mPixelData)
+  {
+    DALI_TEST_EQUAL(20, face[0].GetWidth());
+    DALI_TEST_EQUAL(10, face[0].GetHeight());
+    DALI_TEST_EQUAL(Pixel::Format::RGB888, face[0].GetPixelFormat());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderEquirectangularMapType01(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/forest_diffuse_cubemap.png"; // no cube map
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::AUTO);
+  environmentMapData.SetEnvironmentMapType(Scene3D::EnvironmentMapType::EQUIRECTANGULAR);
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  DALI_TEST_EQUAL(environmentMapData.GetEnvironmentMapType(), Scene3D::EnvironmentMapType::EQUIRECTANGULAR);
+  DALI_TEST_EQUAL(1u, environmentMapData.mPixelData.size());
+  for(auto& face : environmentMapData.mPixelData)
+  {
+    DALI_TEST_EQUAL(2048, face[0].GetWidth());
+    DALI_TEST_EQUAL(1536, face[0].GetHeight());
+    DALI_TEST_EQUAL(Pixel::Format::RGBA8888, face[0].GetPixelFormat());
+  }
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderEnvironmentMapDataCreateTexture01(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/forest_radiance.ktx";
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  TestApplication app;
+  auto            texture = environmentMapData.GetTexture();
+
+  DALI_TEST_CHECK(texture);
+  DALI_TEST_EQUAL(64u, texture.GetWidth());
+  DALI_TEST_EQUAL(64u, texture.GetHeight());
+
+  END_TEST;
+}
+
+int UtcDaliEnvironmentMapLoaderEnvironmentMapDataCreateTexture02(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto               path = TEST_RESOURCE_DIR "/forest_diffuse_cubemap.png";
+  DALI_TEST_CHECK(LoadEnvironmentMap(path, environmentMapData));
+
+  TestApplication app;
+  auto            texture = environmentMapData.GetTexture();
+
+  DALI_TEST_CHECK(texture);
+  DALI_TEST_EQUAL(512u, texture.GetWidth());
+  DALI_TEST_EQUAL(512u, texture.GetHeight());
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-FacialAnimation.cpp b/automated-tests/src/dali-scene3d/utc-Dali-FacialAnimation.cpp
new file mode 100644
index 0000000..c130b2e
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-FacialAnimation.cpp
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/loader/facial-animation-loader.h>
+#include <dali-test-suite-utils.h>
+
+#include <fstream>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+std::string ReadBufferFromFile(const std::string& url)
+{
+  std::string  rawString;
+  std::fstream fileStream;
+
+  fileStream.open(url, std::ios::in | std::ios::binary);
+  if(!fileStream.is_open())
+  {
+    DALI_LOG_WARNING("stream open failed for: \"%s\", in mode: \"%d\".\n", url.c_str(), static_cast<int>(std::ios::in | std::ios::binary));
+  }
+
+  // get length of file:
+  fileStream.seekg(0, std::ios::end);
+  auto length = fileStream.tellg();
+  fileStream.seekg(0, std::ios::beg);
+
+  rawString.resize(length);
+  fileStream.read(rawString.data(), length);
+
+  fileStream.close();
+
+  return rawString;
+}
+} // namespace
+
+int UtcDaliLoadFacialAnimation(void)
+{
+  TestApplication app;
+
+  for(uint32_t tc = 0; tc < 2; ++tc)
+  {
+    tet_printf("UtcDaliLoadFacialAnimation testcase %u\n", tc);
+    AnimationDefinition animDef;
+    switch(tc)
+    {
+      case 0: // Load bvh from url
+      {
+        animDef = LoadFacialAnimation(TEST_RESOURCE_DIR "/facial-blendshape-animation.json");
+        break;
+      }
+      case 1: // Load bvh from buffer stream.
+      {
+        std::string rawString = ReadBufferFromFile(TEST_RESOURCE_DIR "/facial-blendshape-animation.json");
+        animDef               = LoadFacialAnimationFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()));
+        break;
+      }
+    }
+
+    std::string name = animDef.GetName();
+    DALI_TEST_EQUAL(name, "Facial_Blendshape_Animation");
+    DALI_TEST_EQUAL(animDef.GetDuration(), 14.966001f);
+    DALI_TEST_EQUAL(animDef.GetEndAction(), Animation::BAKE);
+    DALI_TEST_EQUAL(animDef.GetSpeedFactor(), 1.0f);
+    DALI_TEST_EQUAL(animDef.GetLoopCount(), 1);
+    DALI_TEST_EQUAL(animDef.GetPropertyCount(), 122);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mNodeName, "GEO_1");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mPropertyName, "uBlendShapeWeight[0]");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mKeyFrames.GetType(), Property::Type::FLOAT);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mTimePeriod.delaySeconds, 0.0f);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(0).mTimePeriod.durationSeconds, 14.966001f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(69).mNodeName, "GEO_2");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(69).mPropertyName, "uBlendShapeWeight[1]");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(69).mKeyFrames.GetType(), Property::Type::FLOAT);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(69).mTimePeriod.delaySeconds, 0.0f);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(69).mTimePeriod.durationSeconds, 14.966001f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(86).mNodeName, "GEO_3");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(86).mPropertyName, "uBlendShapeWeight[2]");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(86).mKeyFrames.GetType(), Property::Type::FLOAT);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(86).mTimePeriod.delaySeconds, 0.0f);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(86).mTimePeriod.durationSeconds, 14.966001f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(100).mNodeName, "GEO_4");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(100).mPropertyName, "uBlendShapeWeight[7]");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(100).mKeyFrames.GetType(), Property::Type::FLOAT);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(100).mTimePeriod.delaySeconds, 0.0f);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(100).mTimePeriod.durationSeconds, 14.966001f);
+
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(121).mNodeName, "GEO_5");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(121).mPropertyName, "uBlendShapeWeight[19]");
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(121).mKeyFrames.GetType(), Property::Type::FLOAT);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(121).mTimePeriod.delaySeconds, 0.0f);
+    DALI_TEST_EQUAL(animDef.GetPropertyAt(121).mTimePeriod.durationSeconds, 14.966001f);
+
+    auto actor = Actor::New();
+    actor.SetProperty(Actor::Property::NAME, "GEO_1");
+
+    char        weightNameBuffer[32];
+    char* const pWeightName = weightNameBuffer + snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s", "uBlendShapeWeight");
+    for(int i = 0; i < 122; i++)
+    {
+      snprintf(pWeightName, sizeof(weightNameBuffer) - (pWeightName - weightNameBuffer), "[%d]", i);
+      std::string weightName{weightNameBuffer};
+      actor.RegisterProperty(weightName, 0.0f);
+    }
+
+    auto getActor = [&actor](const Dali::Scene3D::Loader::AnimatedProperty& property) {
+      return actor.FindChildByName(property.mNodeName);
+    };
+
+    auto anim = animDef.ReAnimate(getActor);
+    DALI_TEST_EQUAL(anim.GetDuration(), animDef.GetDuration());
+    DALI_TEST_EQUAL(anim.GetEndAction(), animDef.GetEndAction());
+    DALI_TEST_EQUAL(anim.GetSpeedFactor(), animDef.GetSpeedFactor());
+    DALI_TEST_EQUAL(anim.GetLoopCount(), animDef.GetLoopCount());
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-KtxLoader.cpp b/automated-tests/src/dali-scene3d/utc-Dali-KtxLoader.cpp
new file mode 100644
index 0000000..18b9d08
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-KtxLoader.cpp
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/ktx-loader.h"
+#include <dali-test-suite-utils.h>
+#include <string_view>
+
+#include <fstream>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliKtxLoaderFailNonexistent(void)
+{
+  EnvironmentMapData environmentMapData;
+  DALI_TEST_CHECK(!LoadKtxData("non-existent.ktx", environmentMapData));
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderFailInvalid1(void)
+{
+  EnvironmentMapData environmentMapData;
+  DALI_TEST_CHECK(!LoadKtxData(TEST_RESOURCE_DIR "/invalid.svg", environmentMapData)); // file smaller than KTX header
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderFailInvalid2(void)
+{
+  EnvironmentMapData environmentMapData;
+  DALI_TEST_CHECK(!LoadKtxData(TEST_RESOURCE_DIR "/anim.gif", environmentMapData)); // not a KTX
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderFailTruncated(void)
+{
+  EnvironmentMapData environmentMapData;
+  DALI_TEST_CHECK(!LoadKtxData(TEST_RESOURCE_DIR "/truncated.ktx", environmentMapData));
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderSuccess(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto path = TEST_RESOURCE_DIR "/forest_radiance.ktx";
+  DALI_TEST_CHECK(LoadKtxData(path, environmentMapData));
+
+  DALI_TEST_EQUAL(6u, environmentMapData.mPixelData.size());
+  for (auto& face: environmentMapData.mPixelData)
+  {
+    uint32_t size = 64;
+    for (auto& mipData: face)
+    {
+      DALI_TEST_EQUAL(size, mipData.GetWidth());
+      DALI_TEST_EQUAL(size, mipData.GetHeight());
+      DALI_TEST_EQUAL(Pixel::Format::RGB888, mipData.GetPixelFormat());
+      size /= 2;
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderFormats(void)
+{
+  auto resPath = TEST_RESOURCE_DIR "/";
+#define FORMAT_PATH(x) { #x, Pixel::x }
+#define FORMAT_COMPRESSED_PATH(x) { #x, Pixel::COMPRESSED_ ## x ## _KHR }
+  std::pair<std::string, Pixel::Format> pathFormats[] {
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_4x4),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_5x4),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_5x5),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_6x5),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_6x6),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_8x5),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_8x6),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_8x8),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_10x5),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_10x6),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_10x10),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_12x10),
+    FORMAT_COMPRESSED_PATH(RGBA_ASTC_12x12),
+    FORMAT_PATH(RGB16F),
+    FORMAT_PATH(RGB32F),
+    FORMAT_PATH(RGBA8888),
+  };
+  for (auto i : pathFormats)
+  {
+    EnvironmentMapData environmentMapData;
+    DALI_TEST_CHECK(LoadKtxData(resPath + i.first + ".ktx", environmentMapData));
+    DALI_TEST_EQUAL(environmentMapData.mPixelData[0][0].GetPixelFormat(), i.second);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderEnvironmentMApDataCreateTexture1(void)
+{
+  uint32_t pixelBufferSize = 3;
+  uint8_t* pixelBuffer = new uint8_t[pixelBufferSize];
+
+  EnvironmentMapData environmentMapData;
+  environmentMapData.mPixelData.push_back({});
+
+  auto pixelData = PixelData::New(pixelBuffer, pixelBufferSize, 1, 1, Pixel::Format::RGB888, PixelData::DELETE_ARRAY);
+  environmentMapData.mPixelData[0].push_back(pixelData);
+
+  TestApplication app;
+  auto texture = environmentMapData.GetTexture();
+
+  DALI_TEST_CHECK(texture);
+  DALI_TEST_EQUAL(1u, texture.GetWidth());
+  DALI_TEST_EQUAL(1u, texture.GetHeight());
+
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderEnvironmentMApDataCreateTexture2(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto path = TEST_RESOURCE_DIR "/forest_radiance.ktx";
+  DALI_TEST_CHECK(LoadKtxData(path, environmentMapData));
+
+  TestApplication app;
+  auto texture = environmentMapData.GetTexture();
+
+  DALI_TEST_CHECK(texture);
+  DALI_TEST_EQUAL(64u, texture.GetWidth());
+  DALI_TEST_EQUAL(64u, texture.GetHeight());
+
+  END_TEST;
+}
+
+int UtcDaliKtxLoaderEnvironmentMApDataCreateTexture3(void)
+{
+  EnvironmentMapData environmentMapData;
+  auto path = TEST_RESOURCE_DIR "/papermill_E_diffuse-64.ktx";
+  DALI_TEST_CHECK(LoadKtxData(path, environmentMapData));
+
+  TestApplication app;
+  auto texture = environmentMapData.GetTexture();
+
+  DALI_TEST_CHECK(texture);
+  DALI_TEST_EQUAL(64u, texture.GetWidth());
+  DALI_TEST_EQUAL(64u, texture.GetHeight());
+
+  END_TEST;
+
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-Light.cpp b/automated-tests/src/dali-scene3d/utc-Dali-Light.cpp
new file mode 100644
index 0000000..88b0f56
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-Light.cpp
@@ -0,0 +1,1255 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <dali-scene3d/public-api/light/light.h>
+#include <dali/public-api/object/property.h>
+#include <toolkit-event-thread-callback.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void light_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void light_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+const char* TEST_GLTF_FILE_NAME = TEST_RESOURCE_DIR "/BoxAnimated.gltf";
+} // namespace
+
+// Negative test case for a method
+int UtcDaliLightUninitialized(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliLightUninitialized");
+
+  Scene3D::Light light;
+
+  try
+  {
+    // New() must be called to create a Model or it wont be valid.
+    Actor a = Actor::New();
+    light.Add(a);
+    DALI_TEST_CHECK(false);
+  }
+  catch(Dali::DaliException& e)
+  {
+    // Tests that a negative test of an assertion succeeds
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_CHECK(!light);
+  }
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliLightNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliLightNew");
+
+  Scene3D::Light light = Scene3D::Light::New();
+  DALI_TEST_CHECK(light);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliLightDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliLightDownCast");
+
+  Scene3D::Light light = Scene3D::Light::New();
+  BaseHandle     handle(light);
+
+  Scene3D::Light light2 = Scene3D::Light::DownCast(handle);
+  DALI_TEST_CHECK(light);
+  DALI_TEST_CHECK(light2);
+  DALI_TEST_CHECK(light == light2);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliLightCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Light light = Scene3D::Light::New();
+  DALI_TEST_CHECK(light);
+
+  Scene3D::Light copy(light);
+  DALI_TEST_CHECK(light == copy);
+
+  Scene3D::Light assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == light);
+
+  END_TEST;
+}
+
+int UtcDaliLightMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Light light = Scene3D::Light::New();
+  DALI_TEST_EQUALS(1, light.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  light.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == light.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::Light moved = std::move(light);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!light);
+
+  END_TEST;
+}
+
+int UtcDaliLightMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Light light = Scene3D::Light::New();
+  DALI_TEST_EQUALS(1, light.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  light.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == light.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::Light moved;
+  moved = std::move(light);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!light);
+
+  END_TEST;
+}
+
+// For TC coverage
+int UtcDaliLightSize(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Light light = Scene3D::Light::New();
+  application.GetScene().Add(light);
+
+  application.SendNotification();
+  application.Render();
+
+  light.SetProperty(Dali::Actor::Property::SIZE, Vector3::ONE);
+  DALI_TEST_EQUALS(Vector3::ONE, light.GetProperty<Vector3>(Dali::Actor::Property::SIZE), 0.01f, TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3::ZERO, light.GetNaturalSize(), 0.01f, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  light.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FIXED);
+  DALI_TEST_EQUALS(ResizePolicy::FIXED, light.GetProperty<ResizePolicy::Type>(Dali::Actor::Property::WIDTH_RESIZE_POLICY), TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  float widthForHeight = light.GetWidthForHeight(light.GetProperty<float>(Dali::Actor::Property::SIZE_HEIGHT));
+  float heightForWidth = light.GetHeightForWidth(light.GetProperty<float>(Dali::Actor::Property::SIZE_WIDTH));
+  DALI_TEST_EQUALS(0.0f, widthForHeight, 0.01f, TEST_LOCATION);
+  DALI_TEST_EQUALS(0.0f, heightForWidth, 0.01f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliLightOnScene01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Light light = Scene3D::Light::New();
+  application.GetScene().Add(light);
+
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, light.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  application.GetScene().Remove(light);
+
+  application.SendNotification();
+  application.Render();
+
+  // Light is removed from layer when on scene
+  DALI_TEST_EQUALS(false, light.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Add a light on SceneView directly
+int UtcDaliLightAdd01(void)
+{
+  ToolkitTestApplication application;
+  Scene3D::SceneView     sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  DALI_TEST_EQUALS(1u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  auto countPropertyIndex = shader.GetPropertyIndex("uLightCount");
+  DALI_TEST_CHECK(countPropertyIndex != Dali::Property::INVALID_INDEX);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+  auto colorPropertyIndex = shader.GetPropertyIndex("uLightColor[0]");
+  DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, 1.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex), 0.01f, TEST_LOCATION);
+  auto directionPropertyIndex = shader.GetPropertyIndex("uLightDirection[0]");
+  DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex), 0.01f, TEST_LOCATION);
+
+  light.Enable(false);
+
+  DALI_TEST_EQUALS(0u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Add a light on an Actor that is child of SceneView.
+int UtcDaliLightAdd02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Actor actor = Actor::New();
+  sceneView.Add(actor);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  actor.Add(light);
+
+  application.SendNotification();
+  application.Render();
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  DALI_TEST_EQUALS(1u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  auto countPropertyIndex = shader.GetPropertyIndex("uLightCount");
+  DALI_TEST_CHECK(countPropertyIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+  auto colorPropertyIndex = shader.GetPropertyIndex("uLightColor[0]");
+  DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, 1.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex), 0.01f, TEST_LOCATION);
+  auto directionPropertyIndex = shader.GetPropertyIndex("uLightDirection[0]");
+  DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex), 0.01f, TEST_LOCATION);
+
+  light.Enable(false);
+
+  DALI_TEST_EQUALS(0u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Enable a light after it is added on SceneView.
+int UtcDaliLightAdd03(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.Enable(false);
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  DALI_TEST_EQUALS(0u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  auto countPropertyIndex = shader.GetPropertyIndex("uLightCount");
+  DALI_TEST_CHECK(countPropertyIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+
+  light.Enable(true);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(1u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+  auto colorPropertyIndex = shader.GetPropertyIndex("uLightColor[0]");
+  DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, 1.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex), 0.01f, TEST_LOCATION);
+  auto directionPropertyIndex = shader.GetPropertyIndex("uLightDirection[0]");
+  DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex), 0.01f, TEST_LOCATION);
+
+  light.Enable(false);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(0u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliLightAdd04(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Light light1 = Scene3D::Light::New();
+  light1.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light1, Vector3(1.0f, 0.0f, 0.0f));
+  sceneView.Add(light1);
+
+  Scene3D::Light light2 = Scene3D::Light::New();
+  light2.SetProperty(Dali::Actor::Property::COLOR, Color::RED);
+  Dali::DevelActor::LookAt(light2, Vector3(0.0f, 0.0f, -1.0f));
+  sceneView.Add(light2);
+
+  application.SendNotification();
+  application.Render();
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  DALI_TEST_EQUALS(2u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  auto countPropertyIndex = shader.GetPropertyIndex("uLightCount");
+  DALI_TEST_CHECK(countPropertyIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(2, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+  auto colorPropertyIndex1 = shader.GetPropertyIndex("uLightColor[0]");
+  DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, 1.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex1), 0.01f, TEST_LOCATION);
+  auto directionPropertyIndex1 = shader.GetPropertyIndex("uLightDirection[0]");
+  DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex1), 0.01f, TEST_LOCATION);
+  auto colorPropertyIndex2 = shader.GetPropertyIndex("uLightColor[1]");
+  DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex2), 0.01f, TEST_LOCATION);
+  auto directionPropertyIndex2 = shader.GetPropertyIndex("uLightDirection[1]");
+  DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, -1.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex2), 0.01f, TEST_LOCATION);
+
+  light1.Enable(false);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(1u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+
+  // After light1 is disable, shader uniforms of lights are reordered.
+  DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex1), 0.01f, TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, -1.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex1), 0.01f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Check unactivated light in SceneView becomes activated when a light become disabled.
+int UtcDaliLightAdd05(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  uint32_t                    maxLightCount = Scene3D::Light::GetMaximumEnabledLightCount();
+  std::vector<Scene3D::Light> lightList;
+  for(uint32_t i = 0; i < maxLightCount; ++i)
+  {
+    Scene3D::Light light = Scene3D::Light::New();
+    light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+    Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+    sceneView.Add(light);
+    lightList.push_back(light);
+  }
+
+  Scene3D::Light light2 = Scene3D::Light::New();
+  light2.SetProperty(Dali::Actor::Property::COLOR, Color::RED);
+  Dali::DevelActor::LookAt(light2, Vector3(0.0f, 0.0f, -1.0f));
+  sceneView.Add(light2);
+  lightList.push_back(light2);
+
+  application.SendNotification();
+  application.Render();
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  DALI_TEST_EQUALS(maxLightCount, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  auto countPropertyIndex = shader.GetPropertyIndex("uLightCount");
+  DALI_TEST_CHECK(countPropertyIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(static_cast<int32_t>(maxLightCount), shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+  for(uint32_t i = 0; i < maxLightCount; ++i)
+  {
+    std::string colorStringKey     = std::string("uLightColor[") + std::to_string(i) + "]";
+    auto        colorPropertyIndex = shader.GetPropertyIndex(colorStringKey);
+    DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, 1.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex), 0.01f, TEST_LOCATION);
+
+    std::string directionStringKey     = std::string("uLightDirection[") + std::to_string(i) + "]";
+    auto        directionPropertyIndex = shader.GetPropertyIndex(directionStringKey);
+    DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex), 0.01f, TEST_LOCATION);
+  }
+
+  lightList[2].Enable(false);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(maxLightCount, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int32_t>(maxLightCount), shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+  for(uint32_t i = 0; i < maxLightCount; ++i)
+  {
+    tet_printf("i : %d\n", i);
+    Vector3 color, direction;
+    if(i == maxLightCount - 1)
+    {
+      color     = Vector3(1.0f, 0.0f, 0.0f);
+      direction = Vector3(0.0f, 0.0f, -1.0f);
+    }
+    else
+    {
+      color     = Vector3(0.0f, 0.0f, 1.0f);
+      direction = Vector3(1.0f, 0.0f, 0.0f);
+    }
+    std::string colorStringKey     = std::string("uLightColor[") + std::to_string(i) + "]";
+    auto        colorPropertyIndex = shader.GetPropertyIndex(colorStringKey);
+    DALI_TEST_EQUALS(color, shader.GetCurrentProperty<Vector3>(colorPropertyIndex), 0.01f, TEST_LOCATION);
+
+    std::string directionStringKey     = std::string("uLightDirection[") + std::to_string(i) + "]";
+    auto        directionPropertyIndex = shader.GetPropertyIndex(directionStringKey);
+    DALI_TEST_EQUALS(direction, shader.GetCurrentProperty<Vector3>(directionPropertyIndex), 0.01f, TEST_LOCATION);
+  }
+
+  for(uint32_t i = 0; i < lightList.size(); ++i)
+  {
+    if(i == 2)
+    {
+      DALI_TEST_EQUALS(false, lightList[i].IsEnabled(), TEST_LOCATION);
+    }
+    else
+    {
+      DALI_TEST_EQUALS(true, lightList[i].IsEnabled(), TEST_LOCATION);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliLightModelAddAndRemove(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  DALI_TEST_EQUALS(1u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+  auto countPropertyIndex = shader.GetPropertyIndex("uLightCount");
+  DALI_TEST_CHECK(countPropertyIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(countPropertyIndex), TEST_LOCATION);
+
+  auto colorPropertyIndex = shader.GetPropertyIndex("uLightColor[0]");
+  DALI_TEST_EQUALS(Vector3(0.0f, 0.0f, 1.0f), shader.GetCurrentProperty<Vector3>(colorPropertyIndex), 0.01f, TEST_LOCATION);
+  auto directionPropertyIndex = shader.GetPropertyIndex("uLightDirection[0]");
+  DALI_TEST_EQUALS(Vector3(1.0f, 0.0f, 0.0f), shader.GetCurrentProperty<Vector3>(directionPropertyIndex), 0.01f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(1u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+
+  model.Unparent();
+
+  DALI_TEST_EQUALS(1u, sceneView.GetActivatedLightCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Enable Shadow and add the light to SceneView.
+int UtcDaliLightEnableShadowOnScene01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.EnableShadow(true);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  sceneView.Add(light);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Add the light to SceneView and Enable Shadow.
+int UtcDaliLightEnableShadowOnScene02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  sceneView.Add(light);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadow(true);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadow(true);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Add the light to SceneView and Add Model.
+int UtcDaliLightEnableShadowOnScene03(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.EnableShadow(true);
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliLightEnableShadowOnScene04(void)
+{
+  tet_infoline("Test when shader language version is low\n");
+  ToolkitTestApplication application;
+
+  auto originalShaderVersion = application.GetGlAbstraction().GetShaderLanguageVersion();
+
+  // Change the shader language version forcely!
+  application.GetGlAbstraction().mShaderLanguageVersion = 200;
+
+  try
+  {
+    Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+    sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+    sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+    sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+    application.GetScene().Add(sceneView);
+
+    Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+    sceneView.Add(model);
+
+    application.SendNotification();
+    application.Render();
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    application.SendNotification();
+    application.Render();
+
+    // Light is added on layer when on scene
+    DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+    Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+    DALI_TEST_CHECK(renderer);
+    Shader shader = renderer.GetShader();
+    DALI_TEST_CHECK(shader);
+
+    auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+    DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+    DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+    Scene3D::Light light = Scene3D::Light::New();
+    light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+    Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+    sceneView.Add(light);
+
+    DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+    DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+    light.EnableShadow(true);
+
+    DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+    DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+    light.EnableShadow(true);
+
+    DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+    DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  // Revert shader version. We should revert it even if UTC failed.
+  application.GetGlAbstraction().mShaderLanguageVersion = originalShaderVersion;
+
+  END_TEST;
+}
+
+int UtcDaliLightEnableShadowOnScene05(void)
+{
+  tet_infoline("Test when shader language version is low\n");
+  ToolkitTestApplication application;
+
+  auto originalShaderVersion = application.GetGlAbstraction().GetShaderLanguageVersion();
+
+  // Change the shader language version forcely!
+  application.GetGlAbstraction().mShaderLanguageVersion = 200;
+
+  try
+  {
+    Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+    sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+    sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+    sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+    application.GetScene().Add(sceneView);
+
+    Scene3D::Light light = Scene3D::Light::New();
+    light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+    Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+    light.EnableShadow(true);
+    sceneView.Add(light);
+
+    application.SendNotification();
+    application.Render();
+
+    Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+    sceneView.Add(model);
+
+    application.SendNotification();
+    application.Render();
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    application.SendNotification();
+    application.Render();
+
+    // Light is added on layer when on scene
+    DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+    Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+    DALI_TEST_CHECK(renderer);
+    Shader shader = renderer.GetShader();
+    DALI_TEST_CHECK(shader);
+
+    auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+    DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+    DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+    // Change material information, for line coverage.
+    auto modelNode = model.FindChildModelNodeByName("node2");
+    DALI_TEST_CHECK(modelNode);
+    DALI_TEST_GREATER(modelNode.GetModelPrimitiveCount(), 0u, TEST_LOCATION);
+    auto modelPrimitive = modelNode.GetModelPrimitive(0u);
+    DALI_TEST_CHECK(modelPrimitive);
+    auto material = modelPrimitive.GetMaterial();
+    DALI_TEST_CHECK(material);
+
+    auto originBaseColorFactor = material.GetProperty<Dali::Vector4>(Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR);
+    auto expectBaseColorFactor = Vector4(originBaseColorFactor.r + 0.05f, originBaseColorFactor.g - 0.05f, originBaseColorFactor.b, originBaseColorFactor.a);
+    material.SetProperty(Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR, expectBaseColorFactor);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(material.GetProperty<Dali::Vector4>(Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR), expectBaseColorFactor, TEST_LOCATION);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  // Revert shader version. We should revert it even if UTC failed.
+  application.GetGlAbstraction().mShaderLanguageVersion = originalShaderVersion;
+
+  END_TEST;
+}
+
+// Disable Shadow
+int UtcDaliLightDisableShadow01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.EnableShadow(true);
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadow(false);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadow(true);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  light.Unparent();
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Disable Shadow
+int UtcDaliLightDisableShadow02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.EnableShadow(true);
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadow(false);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadow(true);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  Scene3D::Light newLight = Scene3D::Light::New();
+  newLight.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(newLight, Vector3(1.0f, 0.0f, 0.0f));
+  newLight.EnableShadow(true);
+  sceneView.Add(newLight);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  // Disable light's shadow, the shadow of newLight is rendered
+  light.EnableShadow(false);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  // Enable light's shadow, but newLight's shadow is rendered.
+  light.EnableShadow(true);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  // Disable newLight's shadow, light's shadow is rendered.
+  newLight.Unparent();
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  // Every shadow is disabled.
+  light.Unparent();
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Make a light EnableShadow that is not enabled on scene
+int UtcDaliLightEnableShadowOfNotEnabledLight(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  uint32_t                    maxLightCount = Scene3D::Light::GetMaximumEnabledLightCount();
+  std::vector<Scene3D::Light> lights;
+  for(uint32_t i = 0; i < maxLightCount; ++i)
+  {
+    Scene3D::Light light = Scene3D::Light::New();
+    light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+    Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+    sceneView.Add(light);
+    lights.push_back(light);
+  }
+
+  Scene3D::Light shadowLight = Scene3D::Light::New();
+  shadowLight.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(shadowLight, Vector3(1.0f, 0.0f, 0.0f));
+  sceneView.Add(shadowLight);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  auto shadowEnabledIndex = shader.GetPropertyIndex("uIsShadowEnabled");
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  shadowLight.EnableShadow(true);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  lights[0].Enable(false);
+
+  DALI_TEST_CHECK(shadowEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowEnabledIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Set/Get Shadow Properties
+int UtcDaliLightSetGetProperty(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.EnableShadow(true);
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(0.001f, light.GetShadowBias(), TEST_LOCATION);
+  light.SetShadowBias(0.1f);
+  DALI_TEST_EQUALS(0.1f, light.GetShadowBias(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(0.5f, light.GetShadowIntensity(), TEST_LOCATION);
+  light.SetShadowIntensity(0.1f);
+  DALI_TEST_EQUALS(0.1f, light.GetShadowIntensity(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Enable PCF for soft shadow edge.
+int UtcDaliLightShadowSoftFiltering(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  sceneView.Add(model);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.EnableShadow(true);
+  sceneView.Add(light);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Light is added on layer when on scene
+  DALI_TEST_EQUALS(true, model.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE), TEST_LOCATION);
+
+  Renderer renderer = model.FindChildByName("node2").GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  Shader shader = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
+
+  DALI_TEST_EQUALS(false, light.IsShadowSoftFilteringEnabled(), TEST_LOCATION);
+  auto shadowFilteringEnabledIndex = shader.GetPropertyIndex("uEnableShadowSoftFiltering");
+  DALI_TEST_CHECK(shadowFilteringEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowFilteringEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadowSoftFiltering(true);
+  DALI_TEST_EQUALS(true, light.IsShadowSoftFilteringEnabled(), TEST_LOCATION);
+
+  DALI_TEST_CHECK(shadowFilteringEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(1, shader.GetProperty<int32_t>(shadowFilteringEnabledIndex), TEST_LOCATION);
+
+  light.EnableShadowSoftFiltering(false);
+  DALI_TEST_EQUALS(false, light.IsShadowSoftFilteringEnabled(), TEST_LOCATION);
+  DALI_TEST_CHECK(shadowFilteringEnabledIndex != DALI_KEY_INVALID);
+  DALI_TEST_EQUALS(0, shader.GetProperty<int32_t>(shadowFilteringEnabledIndex), TEST_LOCATION);
+
+  END_TEST;
+}
+
+namespace
+{
+constexpr int32_t SCENE_ORDER_INDEX = 100;
+constexpr int32_t SHADOW_ORDER_INDEX = 99;
+}
+
+int UtcDaliLightShadowRenderTask(void)
+{
+  ToolkitTestApplication application;
+  RenderTaskList taskList = application.GetScene().GetRenderTaskList();
+
+  uint32_t baseRenderTaskCount = application.GetScene().GetRenderTaskList().GetTaskCount();
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+  sceneView.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sceneView.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  sceneView.SetProperty(Dali::Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::FILL_TO_PARENT);
+  application.GetScene().Add(sceneView);
+
+  DALI_TEST_EQUALS(baseRenderTaskCount + 1u, taskList.GetTaskCount(), TEST_LOCATION);
+
+  sceneView.UseFramebuffer(true);
+
+  DALI_TEST_EQUALS(baseRenderTaskCount + 1u, taskList.GetTaskCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, taskList.GetTask(baseRenderTaskCount - 1u).GetOrderIndex(), TEST_LOCATION);
+  DALI_TEST_EQUALS(SCENE_ORDER_INDEX, taskList.GetTask(baseRenderTaskCount).GetOrderIndex(), TEST_LOCATION);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  light.SetProperty(Dali::Actor::Property::COLOR, Color::BLUE);
+  Dali::DevelActor::LookAt(light, Vector3(1.0f, 0.0f, 0.0f));
+  light.EnableShadow(true);
+
+  tet_printf("Do not create rendertask until light is scene on");
+  DALI_TEST_EQUALS(baseRenderTaskCount + 1u, taskList.GetTaskCount(), TEST_LOCATION);
+
+  sceneView.Add(light);
+
+  tet_printf("Create shadowmap rendertask after light is scene on");
+  DALI_TEST_EQUALS(baseRenderTaskCount + 2u, taskList.GetTaskCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, taskList.GetTask(baseRenderTaskCount - 1u).GetOrderIndex(), TEST_LOCATION);
+  DALI_TEST_EQUALS(SCENE_ORDER_INDEX, taskList.GetTask(baseRenderTaskCount).GetOrderIndex(), TEST_LOCATION);
+  DALI_TEST_EQUALS(SHADOW_ORDER_INDEX, taskList.GetTask(baseRenderTaskCount + 1u).GetOrderIndex(), TEST_LOCATION);
+
+  application.SendNotification();
+
+  tet_printf("Check render task list sorted");
+  DALI_TEST_EQUALS(SHADOW_ORDER_INDEX, taskList.GetTask(baseRenderTaskCount).GetOrderIndex(), TEST_LOCATION);
+  DALI_TEST_EQUALS(SCENE_ORDER_INDEX, taskList.GetTask(baseRenderTaskCount + 1u).GetOrderIndex(), TEST_LOCATION);
+
+  light.EnableShadow(false);
+
+  tet_printf("Check shadowmap rendertask removed");
+  DALI_TEST_EQUALS(baseRenderTaskCount + 1u, taskList.GetTaskCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, taskList.GetTask(baseRenderTaskCount - 1u).GetOrderIndex(), TEST_LOCATION);
+  DALI_TEST_EQUALS(SCENE_ORDER_INDEX, taskList.GetTask(baseRenderTaskCount).GetOrderIndex(), TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-Material.cpp b/automated-tests/src/dali-scene3d/utc-Dali-Material.cpp
new file mode 100644
index 0000000..36f6a22
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-Material.cpp
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-components/material.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void model_components_material_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_components_material_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+} // namespace
+
+// Positive test case for a method
+int UtcDaliMaterialNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMaterialNew");
+
+  Scene3D::Material material = Scene3D::Material::New();
+  DALI_TEST_CHECK(material);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliMaterialDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMaterialDownCast");
+
+  Scene3D::Material material = Scene3D::Material::New();
+  BaseHandle        handle(material);
+
+  Scene3D::Material material2 = Scene3D::Material::DownCast(handle);
+  DALI_TEST_CHECK(material);
+  DALI_TEST_CHECK(material2);
+  DALI_TEST_CHECK(material2 == material);
+  END_TEST;
+}
+
+int UtcDaliMaterialTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("Material");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  Scene3D::Material mateiral = Scene3D::Material::DownCast(handle);
+  DALI_TEST_CHECK(mateiral);
+
+  END_TEST;
+}
+
+int UtcDaliMaterialCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Material mateiral = Scene3D::Material::New();
+  DALI_TEST_CHECK(mateiral);
+
+  Scene3D::Material copy(mateiral);
+  DALI_TEST_CHECK(mateiral == copy);
+
+  Scene3D::Material assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == mateiral);
+
+  END_TEST;
+}
+
+int UtcDaliMaterialMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Material mateiral = Scene3D::Material::New();
+  DALI_TEST_EQUALS(1, mateiral.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  Scene3D::Material moved = std::move(mateiral);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!mateiral);
+
+  END_TEST;
+}
+
+int UtcDaliMaterialMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Material mateiral = Scene3D::Material::New();
+  DALI_TEST_EQUALS(1, mateiral.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  Scene3D::Material moved;
+  moved = std::move(mateiral);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!mateiral);
+
+  END_TEST;
+}
+
+// Method test
+int UtcDaliMaterialSetGetProperty(void)
+{
+  tet_infoline("UtcDaliMaterialSetGetProperty.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  std::string name = "name";
+  material.SetProperty(Scene3D::Material::Property::NAME, name);
+  DALI_TEST_EQUALS(name, material.GetProperty<std::string>(Scene3D::Material::Property::NAME), TEST_LOCATION);
+
+  std::string baseColorUrl = "baseColorUrl";
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_URL, baseColorUrl);
+  DALI_TEST_EQUALS(baseColorUrl, material.GetProperty<std::string>(Scene3D::Material::Property::BASE_COLOR_URL), TEST_LOCATION);
+
+  Vector4 baseColorFactor(0.1f, 0.2f, 0.3f, 0.4f);
+  material.SetProperty(Scene3D::Material::Property::BASE_COLOR_FACTOR, baseColorFactor);
+  DALI_TEST_EQUALS(baseColorFactor, material.GetProperty<Vector4>(Scene3D::Material::Property::BASE_COLOR_FACTOR), TEST_LOCATION);
+
+  std::string metallicRoughnessUrl = "metallicRoughnessUrl";
+  material.SetProperty(Scene3D::Material::Property::METALLIC_ROUGHNESS_URL, metallicRoughnessUrl);
+  DALI_TEST_EQUALS(metallicRoughnessUrl, material.GetProperty<std::string>(Scene3D::Material::Property::METALLIC_ROUGHNESS_URL), TEST_LOCATION);
+
+  float metallicFactor = 0.5f;
+  material.SetProperty(Scene3D::Material::Property::METALLIC_FACTOR, metallicFactor);
+  DALI_TEST_EQUALS(metallicFactor, material.GetProperty<float>(Scene3D::Material::Property::METALLIC_FACTOR), TEST_LOCATION);
+
+  float roughnessFactor = 0.6f;
+  material.SetProperty(Scene3D::Material::Property::ROUGHNESS_FACTOR, roughnessFactor);
+  DALI_TEST_EQUALS(roughnessFactor, material.GetProperty<float>(Scene3D::Material::Property::ROUGHNESS_FACTOR), TEST_LOCATION);
+
+  std::string normalUrl = "normalUrl";
+  material.SetProperty(Scene3D::Material::Property::NORMAL_URL, normalUrl);
+  DALI_TEST_EQUALS(normalUrl, material.GetProperty<std::string>(Scene3D::Material::Property::NORMAL_URL), TEST_LOCATION);
+
+  float normalScale = 0.7f;
+  material.SetProperty(Scene3D::Material::Property::NORMAL_SCALE, normalScale);
+  DALI_TEST_EQUALS(normalScale, material.GetProperty<float>(Scene3D::Material::Property::NORMAL_SCALE), TEST_LOCATION);
+
+  std::string occlusionUrl = "occlusionUrl";
+  material.SetProperty(Scene3D::Material::Property::OCCLUSION_URL, occlusionUrl);
+  DALI_TEST_EQUALS(occlusionUrl, material.GetProperty<std::string>(Scene3D::Material::Property::OCCLUSION_URL), TEST_LOCATION);
+
+  float occlusionStrength = 0.8f;
+  material.SetProperty(Scene3D::Material::Property::OCCLUSION_STRENGTH, occlusionStrength);
+  DALI_TEST_EQUALS(occlusionStrength, material.GetProperty<float>(Scene3D::Material::Property::OCCLUSION_STRENGTH), TEST_LOCATION);
+
+  std::string emissiveUrl = "emissiveUrl";
+  material.SetProperty(Scene3D::Material::Property::EMISSIVE_URL, emissiveUrl);
+  DALI_TEST_EQUALS(emissiveUrl, material.GetProperty<std::string>(Scene3D::Material::Property::EMISSIVE_URL), TEST_LOCATION);
+
+  Vector3 emissiveFactor(0.9f, 0.1f, 0.2f);
+  material.SetProperty(Scene3D::Material::Property::EMISSIVE_FACTOR, emissiveFactor);
+  DALI_TEST_EQUALS(emissiveFactor, material.GetProperty<Vector3>(Scene3D::Material::Property::EMISSIVE_FACTOR), TEST_LOCATION);
+
+  int alphaMode = 1;
+  material.SetProperty(Scene3D::Material::Property::ALPHA_MODE, alphaMode);
+  DALI_TEST_EQUALS(alphaMode, material.GetProperty<int>(Scene3D::Material ::Property ::ALPHA_MODE), TEST_LOCATION);
+
+  float alphaCutoff = 0.9f;
+  material.SetProperty(Scene3D ::Material ::Property ::ALPHA_CUTOFF, alphaCutoff);
+  DALI_TEST_EQUALS(alphaCutoff, material.GetProperty<float>(Scene3D ::Material ::Property ::ALPHA_CUTOFF), TEST_LOCATION);
+
+  bool doubleSided = true;
+  material.SetProperty(Scene3D ::Material ::Property ::DOUBLE_SIDED, doubleSided);
+  DALI_TEST_EQUALS(doubleSided, material.GetProperty<bool>(Scene3D ::Material ::Property ::DOUBLE_SIDED), TEST_LOCATION);
+
+  float ior = 1.0f;
+  material.SetProperty(Scene3D::Material::Property::IOR, ior);
+  DALI_TEST_EQUALS(ior, material.GetProperty<float>(Scene3D::Material::Property::IOR), TEST_LOCATION);
+
+  std::string specularUrl = "specularUrl";
+  material.SetProperty(Scene3D::Material::Property::SPECULAR_URL, specularUrl);
+  DALI_TEST_EQUALS(specularUrl, material.GetProperty<std::string>(Scene3D::Material::Property::SPECULAR_URL), TEST_LOCATION);
+
+  float specularFactor = 1.0f;
+  material.SetProperty(Scene3D::Material::Property::SPECULAR_FACTOR, specularFactor);
+  DALI_TEST_EQUALS(specularFactor, material.GetProperty<float>(Scene3D::Material::Property::SPECULAR_FACTOR), TEST_LOCATION);
+
+  std::string specularColorUrl = "specularColorUrl";
+  material.SetProperty(Scene3D::Material::Property::SPECULAR_COLOR_URL, specularColorUrl);
+  DALI_TEST_EQUALS(specularColorUrl, material.GetProperty<std::string>(Scene3D::Material::Property::SPECULAR_COLOR_URL), TEST_LOCATION);
+
+  Vector3 specularColorFactor(1.0f, 1.0f, 1.0f);
+  material.SetProperty(Scene3D::Material::Property::SPECULAR_COLOR_FACTOR, specularColorFactor);
+  DALI_TEST_EQUALS(specularColorFactor, material.GetProperty<Vector3>(Scene3D::Material::Property::SPECULAR_COLOR_FACTOR), TEST_LOCATION);
+
+  int32_t depthIndex = 50;
+  material.SetProperty(Scene3D::Material::Property::DEPTH_INDEX, depthIndex);
+  DALI_TEST_EQUALS(depthIndex, material.GetProperty<int32_t>(Scene3D::Material::Property::DEPTH_INDEX), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliMaterialSetGetTexture(void)
+{
+  tet_infoline("UtcDaliMaterialSetGetTexture.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  Dali::Texture baseColor = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  material.SetTexture(Scene3D::Material::TextureType::BASE_COLOR, baseColor);
+  DALI_TEST_EQUALS(baseColor, material.GetTexture(Scene3D::Material::TextureType::BASE_COLOR), TEST_LOCATION);
+
+  Dali::Texture metallicRoughness = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  material.SetTexture(Scene3D::Material::TextureType::METALLIC_ROUGHNESS, metallicRoughness);
+  DALI_TEST_EQUALS(metallicRoughness, material.GetTexture(Scene3D::Material::TextureType::METALLIC_ROUGHNESS), TEST_LOCATION);
+
+  Dali::Texture normal = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  material.SetTexture(Scene3D::Material::TextureType::NORMAL, normal);
+  DALI_TEST_EQUALS(normal, material.GetTexture(Scene3D::Material::TextureType::NORMAL), TEST_LOCATION);
+
+  Dali::Texture occlusion = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  material.SetTexture(Scene3D::Material::TextureType::OCCLUSION, occlusion);
+  DALI_TEST_EQUALS(occlusion, material.GetTexture(Scene3D::Material::TextureType::OCCLUSION), TEST_LOCATION);
+
+  Dali::Texture emissive = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  material.SetTexture(Scene3D::Material::TextureType::EMISSIVE, emissive);
+  DALI_TEST_EQUALS(emissive, material.GetTexture(Scene3D::Material::TextureType::EMISSIVE), TEST_LOCATION);
+
+  Dali::Texture specular = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  material.SetTexture(Scene3D::Material::TextureType::SPECULAR, specular);
+  DALI_TEST_EQUALS(specular, material.GetTexture(Scene3D::Material::TextureType::SPECULAR), TEST_LOCATION);
+
+  Dali::Texture specularColor = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 100, 100);
+  material.SetTexture(Scene3D::Material::TextureType::SPECULAR_COLOR, specularColor);
+  DALI_TEST_EQUALS(specularColor, material.GetTexture(Scene3D::Material::TextureType::SPECULAR_COLOR), TEST_LOCATION);
+
+  DALI_TEST_CHECK(!material.GetTexture((Scene3D::Material::TextureType)100));
+
+  END_TEST;
+}
+
+int UtcDaliMaterialSetGetSampler(void)
+{
+  tet_infoline("UtcDaliMaterialSetGetSampler.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  Dali::Sampler baseColor = Dali::Sampler::New();
+  material.SetSampler(Scene3D::Material::TextureType::BASE_COLOR, baseColor);
+  DALI_TEST_EQUALS(baseColor, material.GetSampler(Scene3D::Material::TextureType::BASE_COLOR), TEST_LOCATION);
+
+  Dali::Sampler metallicRoughness = Dali::Sampler::New();
+  material.SetSampler(Scene3D::Material::TextureType::METALLIC_ROUGHNESS, metallicRoughness);
+  DALI_TEST_EQUALS(metallicRoughness, material.GetSampler(Scene3D::Material::TextureType::METALLIC_ROUGHNESS), TEST_LOCATION);
+
+  Dali::Sampler normal = Dali::Sampler::New();
+  material.SetSampler(Scene3D::Material::TextureType::NORMAL, normal);
+  DALI_TEST_EQUALS(normal, material.GetSampler(Scene3D::Material::TextureType::NORMAL), TEST_LOCATION);
+
+  Dali::Sampler occlusion = Dali::Sampler::New();
+  material.SetSampler(Scene3D::Material::TextureType::OCCLUSION, occlusion);
+  DALI_TEST_EQUALS(occlusion, material.GetSampler(Scene3D::Material::TextureType::OCCLUSION), TEST_LOCATION);
+
+  Dali::Sampler emissive = Dali::Sampler::New();
+  material.SetSampler(Scene3D::Material::TextureType::EMISSIVE, emissive);
+  DALI_TEST_EQUALS(emissive, material.GetSampler(Scene3D::Material::TextureType::EMISSIVE), TEST_LOCATION);
+
+  Dali::Sampler specular = Dali::Sampler::New();
+  material.SetSampler(Scene3D::Material::TextureType::SPECULAR, specular);
+  DALI_TEST_EQUALS(specular, material.GetSampler(Scene3D::Material::TextureType::SPECULAR), TEST_LOCATION);
+
+  Dali::Sampler specularColor = Dali::Sampler::New();
+  material.SetSampler(Scene3D::Material::TextureType::SPECULAR_COLOR, specularColor);
+  DALI_TEST_EQUALS(specularColor, material.GetSampler(Scene3D::Material::TextureType::SPECULAR_COLOR), TEST_LOCATION);
+
+  DALI_TEST_CHECK(!material.GetSampler((Scene3D::Material::TextureType)100));
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-MatrixStack.cpp b/automated-tests/src/dali-scene3d/utc-Dali-MatrixStack.cpp
new file mode 100644
index 0000000..b9d8aff
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-MatrixStack.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/matrix-stack.h"
+#include <dali-test-suite-utils.h>
+#include <string_view>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliMatrixStack(void)
+{
+  MatrixStack stack;
+  DALI_TEST_CHECK(stack.IsEmpty());
+
+  Matrix testMatrix;
+  testMatrix.SetTransformComponents(Vector3::ONE * 5.f,
+    Quaternion(Radian(Degree(-45.f)), Vector3::XAXIS),
+    Vector3(100.f, 0.f, -200.f));
+
+  stack.Push(testMatrix);
+  DALI_TEST_CHECK(!stack.IsEmpty());
+  DALI_TEST_EQUAL(stack.Top(), testMatrix);
+
+  stack.Push(Matrix::IDENTITY);
+  DALI_TEST_CHECK(!stack.IsEmpty());
+  DALI_TEST_EQUAL(stack.Top(), testMatrix);
+
+  stack.Push(testMatrix);
+
+  Matrix testMatrix2;
+  Matrix::Multiply(testMatrix2, testMatrix, testMatrix);
+  DALI_TEST_CHECK(!stack.IsEmpty());
+  DALI_TEST_EQUAL(stack.Top(), testMatrix2);
+
+  stack.PopAll();
+  DALI_TEST_CHECK(stack.IsEmpty());
+
+  stack.Push(Matrix::IDENTITY);
+  DALI_TEST_EQUAL(stack.Top(), Matrix::IDENTITY);
+
+  stack.Push(testMatrix);
+  DALI_TEST_EQUAL(stack.Top(), testMatrix);
+
+  stack.Pop();
+  DALI_TEST_EQUAL(stack.Top(), Matrix::IDENTITY);
+  DALI_TEST_CHECK(!stack.IsEmpty());
+
+  stack.Pop();
+  DALI_TEST_CHECK(stack.IsEmpty());
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-MeshDefinition.cpp b/automated-tests/src/dali-scene3d/utc-Dali-MeshDefinition.cpp
new file mode 100644
index 0000000..ba67d42
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-MeshDefinition.cpp
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <vector>
+
+#include <dali-scene3d/public-api/loader/buffer-definition.h>
+#include <dali-scene3d/public-api/loader/mesh-definition.h>
+#include <dali-test-suite-utils.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliMeshDefinitionBlobApplyMinMaxBothMinMaxApplied(void)
+{
+  using Container = std::vector<float>;
+
+  Container buffer    = {4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
+  Container minValues = {5.0f};
+  Container maxValues = {10.0f};
+  Container result    = {5.0f, 6.0f, 8.0f, 10.0f, 10.0f};
+
+  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
+
+  for(auto i = 0u; i < result.size(); ++i)
+  {
+    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliMeshDefinitionBlobApplyMinMaxOnlyMin(void)
+{
+  using Container = std::vector<float>;
+
+  Container buffer    = {4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
+  Container minValues = {5.0f};
+  Container maxValues = {};
+  Container result    = {5.0f, 6.0f, 8.0f, 10.0f, 12.0f};
+
+  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
+
+  for(auto i = 0u; i < result.size(); ++i)
+  {
+    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliMeshDefinitionBlobApplyMinMaxOnlyMax(void)
+{
+  using Container = std::vector<float>;
+
+  Container buffer    = {4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
+  Container minValues = {};
+  Container maxValues = {10.0f};
+  Container result    = {4.0f, 6.0f, 8.0f, 10.0f, 10.0f};
+
+  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
+
+  for(auto i = 0u; i < result.size(); ++i)
+  {
+    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliMeshDefinitionBlobApplyMinMaxBothEmpty(void)
+{
+  using Container = std::vector<float>;
+
+  Container buffer = {4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
+  Container minValues;
+  Container maxValues;
+  Container result = {4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
+
+  MeshDefinition::Blob::ApplyMinMax(minValues, maxValues, 5, buffer.data());
+
+  for(auto i = 0u; i < result.size(); ++i)
+  {
+    DALI_TEST_EQUALS(buffer[i], result[i], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliMeshDefinitionByteSkinWeight(void)
+{
+  float data8[8] = {0.003922, 0.062745, 0.250980, 0.098039, 0.937255, 0.749020, 0.741176, 0.937255};
+
+  BufferDefinition bufferDefinition;
+  bufferDefinition.mUri        = "data:application/base64,ARBAGe+/ve+/vT9hc2RmYXNkZmFzZGZhc2RmYXNkZmE=";
+  bufferDefinition.mByteLength = 32;
+  BufferDefinition::Vector buffers;
+  buffers.push_back(std::move(bufferDefinition));
+
+  MeshDefinition meshDefinition;
+  meshDefinition.mFlags = MeshDefinition::U16_JOINT_IDS | MeshDefinition::U8_WEIGHT;
+  MeshDefinition::SparseBlob sparseBlob;
+  meshDefinition.mPositions =
+    MeshDefinition::Accessor{
+      std::move(MeshDefinition::Blob{0, 12, 0, (uint16_t)12, std::vector<float>(), std::vector<float>()}), std::move(sparseBlob), 0};
+  meshDefinition.mJoints.push_back(
+    MeshDefinition::Accessor{
+      std::move(MeshDefinition::Blob{0, 16, 0, (uint16_t)16, std::vector<float>(), std::vector<float>()}), std::move(sparseBlob), 0});
+  meshDefinition.mWeights.push_back(
+    MeshDefinition::Accessor{
+      std::move(MeshDefinition::Blob{0, 8, 0, (uint16_t)8, std::vector<float>(), std::vector<float>()}), std::move(sparseBlob), 0});
+
+  MeshDefinition::RawData rawData = meshDefinition.LoadRaw("", buffers);
+
+  DALI_TEST_EQUALS(rawData.mAttribs.size(), 4, TEST_LOCATION);
+  DALI_TEST_EQUALS(rawData.mAttribs[3].mName, "aWeights0", TEST_LOCATION);
+  DALI_TEST_EQUALS(rawData.mAttribs[3].mNumElements, 2, TEST_LOCATION);
+  float* value = reinterpret_cast<float*>(rawData.mAttribs[3].mData.data());
+  for(uint32_t i = 0; i < rawData.mAttribs[3].mNumElements * 4; ++i)
+  {
+    DALI_TEST_EQUALS(*value, data8[i], TEST_LOCATION);
+    value++;
+  }
+  END_TEST;
+}
+
+int UtcDaliMeshDefinitionShortSkinWeight(void)
+{
+  float data8[8] = {0.062516, 0.098634, 0.749752, 0.936492, 0.741207, 0.379873, 0.392386, 0.380468};
+
+  BufferDefinition bufferDefinition;
+  bufferDefinition.mUri        = "data:application/base64,ARBAGe+/ve+/vT9hc2RmYXNkZmFzZGZhc2RmYXNkZmE=";
+  bufferDefinition.mByteLength = 32;
+  BufferDefinition::Vector buffers;
+  buffers.push_back(std::move(bufferDefinition));
+
+  MeshDefinition meshDefinition;
+  meshDefinition.mFlags = MeshDefinition::U16_JOINT_IDS | MeshDefinition::U16_WEIGHT;
+  MeshDefinition::SparseBlob sparseBlob;
+  meshDefinition.mPositions =
+    MeshDefinition::Accessor{
+      std::move(MeshDefinition::Blob{0, 12, 0, (uint16_t)12, std::vector<float>(), std::vector<float>()}), std::move(sparseBlob), 0};
+  meshDefinition.mJoints.push_back(
+    MeshDefinition::Accessor{
+      std::move(MeshDefinition::Blob{0, 16, 0, (uint16_t)16, std::vector<float>(), std::vector<float>()}), std::move(sparseBlob), 0});
+  meshDefinition.mWeights.push_back(
+    MeshDefinition::Accessor{
+      std::move(MeshDefinition::Blob{0, 16, 0, (uint16_t)16, std::vector<float>(), std::vector<float>()}), std::move(sparseBlob), 0});
+
+  MeshDefinition::RawData rawData = meshDefinition.LoadRaw("", buffers);
+
+  DALI_TEST_EQUALS(rawData.mAttribs.size(), 4, TEST_LOCATION);
+  DALI_TEST_EQUALS(rawData.mAttribs[3].mName, "aWeights0", TEST_LOCATION);
+  DALI_TEST_EQUALS(rawData.mAttribs[3].mNumElements, 2, TEST_LOCATION);
+  float* value = reinterpret_cast<float*>(rawData.mAttribs[3].mData.data());
+  for(uint32_t i = 0; i < rawData.mAttribs[3].mNumElements * 4; ++i)
+  {
+    DALI_TEST_EQUALS(*value, data8[i], TEST_LOCATION);
+    value++;
+  }
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-Model.cpp b/automated-tests/src/dali-scene3d/utc-Dali-Model.cpp
new file mode 100644
index 0000000..6b6670c
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-Model.cpp
@@ -0,0 +1,2093 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <toolkit-environment-variable.h>
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/model-components/model-node.h>
+
+#include <dali-scene3d/public-api/model-motion/motion-data.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h>
+
+#include <dali-scene3d/public-api/loader/node-definition.h>
+
+#include <dali/devel-api/actors/camera-actor-devel.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void model_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+const bool DEFAULT_MODEL_CHILDREN_SENSITIVE = false;
+const bool DEFAULT_MODEL_CHILDREN_FOCUSABLE = false;
+/**
+ * For the AnimatedCube.gltf and its Assets
+ * Donated by Norbert Nopper for glTF testing.
+ * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/AnimatedCube
+ */
+const char* TEST_GLTF_FILE_NAME                    = TEST_RESOURCE_DIR "/AnimatedCube.gltf";
+const char* TEST_GLTF_FILE_NAME_SAME_FILE          = TEST_RESOURCE_DIR "/AnimatedCube2.gltf";
+const char* TEST_GLTF_FILE_NAME_DIFF_META_FILE     = TEST_RESOURCE_DIR "/AnimatedCube3.gltf";
+const char* TEST_GLTF_ANIMATION_TEST_FILE_NAME     = TEST_RESOURCE_DIR "/animationTest.gltf";
+const char* TEST_GLTF_EXTRAS_FILE_NAME             = TEST_RESOURCE_DIR "/AnimatedMorphCubeAnimateNonZeroFrame.gltf";
+const char* TEST_GLTF_MULTIPLE_PRIMITIVE_FILE_NAME = TEST_RESOURCE_DIR "/simpleMultiplePrimitiveTest.gltf";
+const char* TEST_GLTF_MORPH_FILE_NAME              = TEST_RESOURCE_DIR "/AnimatedMorphCube.gltf";
+const char* TEST_DLI_FILE_NAME                     = TEST_RESOURCE_DIR "/arc.dli";
+const char* TEST_DLI_EXERCISE_FILE_NAME            = TEST_RESOURCE_DIR "/exercise.dli";
+
+/**
+ * For the diffuse and specular cube map texture.
+ * These textures are based off version of Wave engine sample
+ * Take from https://github.com/WaveEngine/Samples
+ *
+ * Copyright (c) 2024 Wave Coorporation
+ *
+ * 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.
+ */
+const char* TEST_DIFFUSE_TEXTURE  = TEST_RESOURCE_DIR "/forest_irradiance.ktx";
+const char* TEST_SPECULAR_TEXTURE = TEST_RESOURCE_DIR "/forest_radiance.ktx";
+
+bool gTouchCallBackCalled = false;
+bool TestTouchCallback(Actor, const TouchEvent&)
+{
+  gTouchCallBackCalled = true;
+  return true;
+}
+
+bool gFocusChangedCallBackCalled = false;
+void TestFocusChangedCallback(Actor, Actor)
+{
+  gFocusChangedCallBackCalled = true;
+}
+
+// For ResourceReady
+static bool gOnRelayoutCallBackCalled = false;
+void        OnRelayoutCallback(Actor actor)
+{
+  gOnRelayoutCallBackCalled = true;
+}
+
+static bool gResourceReadyCalled = false;
+void        OnResourceReady(Control control)
+{
+  gResourceReadyCalled = true;
+}
+
+void ApplyAllMaterialPropertyRecursively(Scene3D::ModelNode modelNode, const std::vector<KeyValuePair>& materialPropertyValues)
+{
+  if(!modelNode)
+  {
+    return;
+  }
+
+  for(uint32_t primitiveIndex = 0u; primitiveIndex < modelNode.GetModelPrimitiveCount(); ++primitiveIndex)
+  {
+    Scene3D::ModelPrimitive primitive = modelNode.GetModelPrimitive(primitiveIndex);
+    if(primitive)
+    {
+      Scene3D::Material material = primitive.GetMaterial();
+      if(material)
+      {
+        for(const auto& keyValuePair : materialPropertyValues)
+        {
+          if(keyValuePair.first.type == Property::Key::Type::INDEX)
+          {
+            material.SetProperty(keyValuePair.first.indexKey, keyValuePair.second);
+          }
+        }
+      }
+    }
+  }
+
+  for(uint32_t childIndex = 0u; childIndex < modelNode.GetChildCount(); ++childIndex)
+  {
+    Scene3D::ModelNode childNode = Scene3D::ModelNode::DownCast(modelNode.GetChildAt(childIndex));
+    ApplyAllMaterialPropertyRecursively(childNode, materialPropertyValues);
+  }
+}
+
+} // namespace
+
+// Negative test case for a method
+int UtcDaliModelUninitialized(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelUninitialized");
+
+  Scene3D::Model model;
+
+  try
+  {
+    // New() must be called to create a Model or it wont be valid.
+    Actor a = Actor::New();
+    model.Add(a);
+    DALI_TEST_CHECK(false);
+  }
+  catch(Dali::DaliException& e)
+  {
+    // Tests that a negative test of an assertion succeeds
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_CHECK(!model);
+  }
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNew");
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_CHECK(model);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelNewP2(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNew without url");
+
+  Scene3D::Model model = Scene3D::Model::New();
+  DALI_TEST_CHECK(model);
+
+  application.GetScene().Add(model);
+
+  DALI_TEST_CHECK(model.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+
+  application.GetScene().Remove(model);
+
+  DALI_TEST_CHECK(!model.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+
+  END_TEST;
+}
+
+int UtcDaliModelNewSameModelUrlCached(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNew with same model");
+
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_CHECK(model);
+  Scene3D::Model model2 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_CHECK(model2);
+
+  application.GetScene().Add(model);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("Test if there is at least 1 texture.\n");
+  int expectTextureCount = textureTrace.CountMethod("GenTextures");
+  DALI_TEST_GREATER(expectTextureCount, 0, TEST_LOCATION);
+
+  application.GetScene().Add(model2);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("Test if we reuse cached texture or not.\n");
+  int currentTextureCount = textureTrace.CountMethod("GenTextures");
+  DALI_TEST_EQUALS(currentTextureCount, expectTextureCount, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliModelNewSameResourceUrlCached01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNew with difference url but same model");
+
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  textureTrace.EnableLogging(true);
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_CHECK(model);
+  Scene3D::Model model2 = Scene3D::Model::New(TEST_GLTF_FILE_NAME_SAME_FILE); // Difference model that use same Images.
+  DALI_TEST_CHECK(model2);
+  Scene3D::Model model3 = Scene3D::Model::New(TEST_GLTF_FILE_NAME_DIFF_META_FILE); // Difference model that use same Images, but difference metadata.
+  DALI_TEST_CHECK(model3);
+
+  application.GetScene().Add(model);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("Test if there is at least 1 texture.\n");
+  int expectTextureCount = textureTrace.CountMethod("GenTextures");
+  DALI_TEST_GREATER(expectTextureCount, 0, TEST_LOCATION);
+
+  application.GetScene().Add(model2);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("Test if we reuse cached texture or not.\n");
+  int currentTextureCount = textureTrace.CountMethod("GenTextures");
+  DALI_TEST_EQUALS(currentTextureCount, expectTextureCount, TEST_LOCATION);
+
+  application.GetScene().Add(model3);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("Test if we don't reuse cached texture, due to the metadata difference.\n");
+  currentTextureCount = textureTrace.CountMethod("GenTextures");
+  DALI_TEST_GREATER(currentTextureCount, expectTextureCount, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliModelNewSameResourceUrlCached02(void)
+{
+  /// Make we don't use mutiple thread loading for this UTC.
+  EnvironmentVariable::SetTestEnvironmentVariable("DALI_ASYNC_MANAGER_THREAD_POOL_SIZE", "1");
+  EnvironmentVariable::SetTestEnvironmentVariable("DALI_ASYNC_MANAGER_LOW_PRIORITY_THREAD_POOL_SIZE", "1");
+
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNew with difference url but same model");
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_CHECK(model);
+  Scene3D::Model model2 = Scene3D::Model::New(TEST_GLTF_FILE_NAME_SAME_FILE);
+  DALI_TEST_CHECK(model2);
+
+  application.GetScene().Add(model);
+  application.GetScene().Add(model2);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelDownCast");
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  BaseHandle     handle(model);
+
+  Scene3D::Model model2 = Scene3D::Model::DownCast(handle);
+  DALI_TEST_CHECK(model);
+  DALI_TEST_CHECK(model2);
+  DALI_TEST_CHECK(model2 == model);
+  END_TEST;
+}
+
+int UtcDaliModelTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("Model");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  Scene3D::Model model = Scene3D::Model::DownCast(handle);
+  DALI_TEST_CHECK(model);
+
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelAddRemove(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelAddRemove");
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_CHECK(model);
+
+  Actor actor = Actor::New();
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+
+  model.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  model.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
+  model.Add(actor);
+  application.GetScene().Add(model);
+
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+
+  model.Remove(actor);
+
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+  END_TEST;
+}
+
+int UtcDaliModelCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_CHECK(model);
+
+  Scene3D::Model copy(model);
+  DALI_TEST_CHECK(model == copy);
+
+  Scene3D::Model assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == model);
+
+  END_TEST;
+}
+
+int UtcDaliModelMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_EQUALS(1, model.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  model.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == model.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::Model moved = std::move(model);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!model);
+
+  END_TEST;
+}
+
+int UtcDaliModelMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  DALI_TEST_EQUALS(1, model.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  model.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == model.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::Model moved;
+  moved = std::move(model);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!model);
+
+  END_TEST;
+}
+
+int UtcDaliModelOnScene01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  uint32_t modelCount = model.GetModelRoot().GetChildCount();
+  DALI_TEST_EQUALS(1, modelCount, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliModelOnScene02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_DLI_FILE_NAME);
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  uint32_t modelCount = model.GetModelRoot().GetChildCount();
+  DALI_TEST_EQUALS(1, modelCount, TEST_LOCATION);
+
+  Scene3D::ModelNode rootNode = model.GetModelRoot();
+  Vector3            rootSize = rootNode.GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+  DALI_TEST_EQUALS(Vector3(2, 2, 1), rootSize, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelOnSizeSet(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+
+  application.GetScene().Add(model);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector2 size(200.0f, 300.0f);
+  model.SetProperty(Actor::Property::SIZE, size);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model.GetCurrentProperty<Vector2>(Actor::Property::SIZE), size, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelGetNaturalSize(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+
+  Vector3 naturalSize = model.GetNaturalSize();
+  DALI_TEST_EQUALS(Vector3::ZERO, naturalSize, TEST_LOCATION);
+
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  naturalSize = model.GetNaturalSize();
+  DALI_TEST_EQUALS(Vector3(2, 2, 2), naturalSize, TEST_LOCATION);
+
+  Scene3D::ModelNode rootNode = model.GetModelRoot();
+  DALI_TEST_CHECK(rootNode);
+
+  END_TEST;
+}
+
+int UtcDaliModelSetImageBasedLightSource01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor = model.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor);
+
+  Renderer renderer = meshActor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  TextureSet textureSet = renderer.GetTextures();
+  DALI_TEST_EQUALS(textureSet.GetTextureCount(), 10u, TEST_LOCATION);
+
+  Texture diffuseTexture  = textureSet.GetTexture(8u);
+  Texture specularTexture = textureSet.GetTexture(9u);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  model.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  TextureSet newTextureSet      = renderer.GetTextures();
+  Texture    newDiffuseTexture  = newTextureSet.GetTexture(8u);
+  Texture    newSpecularTexture = newTextureSet.GetTexture(9u);
+
+  DALI_TEST_NOT_EQUALS(diffuseTexture, newDiffuseTexture, 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(specularTexture, newSpecularTexture, 0.0f, TEST_LOCATION);
+
+  model.Unparent();
+  model.Reset();
+  END_TEST;
+}
+
+int UtcDaliModelSetImageBasedLightSource02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor = model.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor);
+
+  Renderer renderer = meshActor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  TextureSet textureSet = renderer.GetTextures();
+  DALI_TEST_EQUALS(textureSet.GetTextureCount(), 10u, TEST_LOCATION);
+
+  Texture diffuseTexture  = textureSet.GetTexture(8u);
+  Texture specularTexture = textureSet.GetTexture(9u);
+
+  // if url is empty, loading is not requested.
+  model.SetImageBasedLightSource("", "");
+
+  Texture newDiffuseTexture  = textureSet.GetTexture(8u);
+  Texture newSpecularTexture = textureSet.GetTexture(9u);
+
+  DALI_TEST_EQUALS(diffuseTexture, newDiffuseTexture, TEST_LOCATION);
+  DALI_TEST_EQUALS(specularTexture, newSpecularTexture, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelSetImageBasedLightSource03(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor = model.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor);
+
+  Renderer renderer = meshActor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  TextureSet textureSet = renderer.GetTextures();
+  DALI_TEST_EQUALS(textureSet.GetTextureCount(), 10u, TEST_LOCATION);
+
+  Texture diffuseTexture  = textureSet.GetTexture(8u);
+  Texture specularTexture = textureSet.GetTexture(9u);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  model.SetImageBasedLightSource("dummy.ktx", "dummy.ktx");
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Texture newDiffuseTexture  = textureSet.GetTexture(8u);
+  Texture newSpecularTexture = textureSet.GetTexture(9u);
+
+  DALI_TEST_EQUALS(diffuseTexture, newDiffuseTexture, TEST_LOCATION);
+  DALI_TEST_EQUALS(specularTexture, newSpecularTexture, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelSetImageBasedLightSource04(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  model.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE);
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliModelImageBasedFactor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+
+  DALI_TEST_EQUALS(model.GetImageBasedLightScaleFactor(), 1.0f, TEST_LOCATION);
+
+  model.SetImageBasedLightScaleFactor(0.5f);
+  DALI_TEST_EQUALS(model.GetImageBasedLightScaleFactor(), 0.5f, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliModelChildrenSensitive01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model view = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector3(100, 100, 100));
+  view.SetProperty(Dali::Actor::Property::POSITION, Vector3(0, 0, 0));
+  view.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  view.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  // Get default vaule.
+  DALI_TEST_EQUALS(view.GetChildrenSensitive(), DEFAULT_MODEL_CHILDREN_SENSITIVE, TEST_LOCATION);
+
+  // Allow children actor's event before on scene.
+  view.SetChildrenSensitive(true);
+  DALI_TEST_EQUALS(view.GetChildrenSensitive(), true, TEST_LOCATION);
+  application.GetScene().Add(view);
+
+  gResourceReadyCalled = false;
+  view.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor = view.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor);
+
+  // connect hit-test signal
+  gTouchCallBackCalled = false;
+  meshActor.TouchedSignal().Connect(TestTouchCallback);
+
+  Vector2 sceneSize = application.GetScene().GetSize();
+
+  // Try to touch center of scene.
+  Dali::Integration::Point point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(sceneSize * 0.5f);
+  Dali::Integration::TouchEvent event;
+  event.AddPoint(point);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Not touched yet.
+  DALI_TEST_CHECK(!gTouchCallBackCalled);
+  application.ProcessEvent(event);
+  // Touched.
+  DALI_TEST_CHECK(gTouchCallBackCalled);
+
+  // Clear
+  gTouchCallBackCalled = false;
+
+  // Block children actor's event
+  view.SetChildrenSensitive(false);
+  DALI_TEST_EQUALS(view.GetChildrenSensitive(), false, TEST_LOCATION);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Not touched yet.
+  DALI_TEST_CHECK(!gTouchCallBackCalled);
+  application.ProcessEvent(event);
+  // Also not touched.
+  DALI_TEST_CHECK(!gTouchCallBackCalled);
+
+  // Clear
+  gTouchCallBackCalled = false;
+
+  // Allow again
+  view.SetChildrenSensitive(true);
+  DALI_TEST_EQUALS(view.GetChildrenSensitive(), true, TEST_LOCATION);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Not touched yet.
+  DALI_TEST_CHECK(!gTouchCallBackCalled);
+  application.ProcessEvent(event);
+  // Touched.
+  DALI_TEST_CHECK(gTouchCallBackCalled);
+
+  // Clear
+  gTouchCallBackCalled = false;
+
+  END_TEST;
+}
+
+int UtcDaliModelChildrenSensitive02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model view = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector3(100, 100, 100));
+  view.SetProperty(Dali::Actor::Property::POSITION, Vector3(0, 0, 0));
+  view.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  view.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  // Get vaule.
+  DALI_TEST_EQUALS(view.GetChildrenSensitive(), DEFAULT_MODEL_CHILDREN_SENSITIVE, TEST_LOCATION);
+
+  // Block children actor's event before on scene.
+  view.SetChildrenSensitive(false);
+  DALI_TEST_EQUALS(view.GetChildrenSensitive(), false, TEST_LOCATION);
+  application.GetScene().Add(view);
+
+  gResourceReadyCalled = false;
+  view.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor = view.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor);
+
+  // connect hit-test signal
+  gTouchCallBackCalled = false;
+  meshActor.TouchedSignal().Connect(TestTouchCallback);
+
+  Vector2 sceneSize = application.GetScene().GetSize();
+
+  // Try to touch center of scene.
+  Dali::Integration::Point point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(sceneSize * 0.5f);
+  Dali::Integration::TouchEvent event;
+  event.AddPoint(point);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Not touched yet.
+  DALI_TEST_CHECK(!gTouchCallBackCalled);
+  application.ProcessEvent(event);
+  // Also not touched.
+  DALI_TEST_CHECK(!gTouchCallBackCalled);
+
+  // Clear
+  gTouchCallBackCalled = false;
+
+  // Allow again
+  view.SetChildrenSensitive(true);
+  DALI_TEST_EQUALS(view.GetChildrenSensitive(), true, TEST_LOCATION);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Not touched yet.
+  DALI_TEST_CHECK(!gTouchCallBackCalled);
+  application.ProcessEvent(event);
+  // Touched.
+  DALI_TEST_CHECK(gTouchCallBackCalled);
+
+  // Clear
+  gTouchCallBackCalled = false;
+
+  END_TEST;
+}
+
+int UtcDaliModelChildrenFocusable01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model view = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector3(100, 100, 100));
+  view.SetProperty(Dali::Actor::Property::POSITION, Vector3(0, 0, 0));
+  view.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  view.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  // Get vaule. Default is false.
+  DALI_TEST_EQUALS(view.GetChildrenFocusable(), DEFAULT_MODEL_CHILDREN_FOCUSABLE, TEST_LOCATION);
+
+  // Allow children actor's focus before on scene.
+  view.SetChildrenFocusable(true);
+  DALI_TEST_EQUALS(view.GetChildrenFocusable(), true, TEST_LOCATION);
+  application.GetScene().Add(view);
+
+  gResourceReadyCalled = false;
+  view.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor = view.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor);
+
+  // Enable the default algorithm
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+  Dali::Toolkit::DevelKeyboardFocusManager::EnableDefaultAlgorithm(manager, true);
+
+  // connect focusable signal
+  gFocusChangedCallBackCalled = false;
+  meshActor.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  manager.FocusChangedSignal().Connect(TestFocusChangedCallback);
+
+  // Initialize with some left-positioned actor
+  Control focusStartActor = Control::New();
+  focusStartActor.SetProperty(Dali::Actor::Property::SIZE, Vector3(100, 100, 100));
+  focusStartActor.SetProperty(Dali::Actor::Property::POSITION, Vector3(-200, 0, 0));
+  focusStartActor.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  focusStartActor.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  focusStartActor.SetProperty(Dali::Actor::Property::KEYBOARD_FOCUSABLE, true);
+  application.GetScene().Add(focusStartActor);
+
+  // Clear
+  manager.ClearFocus();
+  manager.SetCurrentFocusActor(focusStartActor);
+  gFocusChangedCallBackCalled = false;
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Focusable view find success
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
+  DALI_TEST_CHECK(gFocusChangedCallBackCalled);
+
+  // Clear
+  manager.ClearFocus();
+  manager.SetCurrentFocusActor(focusStartActor);
+  gFocusChangedCallBackCalled = false;
+
+  // Block children actor's focus
+  view.SetChildrenFocusable(false);
+  DALI_TEST_EQUALS(view.GetChildrenFocusable(), false, TEST_LOCATION);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Focusable view find failed
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == false);
+  DALI_TEST_CHECK(!gFocusChangedCallBackCalled);
+
+  // Clear
+  manager.ClearFocus();
+  manager.SetCurrentFocusActor(focusStartActor);
+  gFocusChangedCallBackCalled = false;
+
+  // Allow again
+  view.SetChildrenFocusable(true);
+  DALI_TEST_EQUALS(view.GetChildrenFocusable(), true, TEST_LOCATION);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Focusable view find success
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
+  DALI_TEST_CHECK(gFocusChangedCallBackCalled);
+
+  // Clear
+  manager.ClearFocus();
+  manager.SetCurrentFocusActor(focusStartActor);
+  gFocusChangedCallBackCalled = false;
+
+  END_TEST;
+}
+
+int UtcDaliModelModelChildrenFocusable02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model view = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector3(100, 100, 100));
+  view.SetProperty(Dali::Actor::Property::POSITION, Vector3(0, 0, 0));
+  view.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  view.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  // Get vaule. Default is true.
+  DALI_TEST_EQUALS(view.GetChildrenFocusable(), DEFAULT_MODEL_CHILDREN_FOCUSABLE, TEST_LOCATION);
+
+  // Block children actor's focus before on scene.
+  view.SetChildrenFocusable(false);
+  DALI_TEST_EQUALS(view.GetChildrenFocusable(), false, TEST_LOCATION);
+  application.GetScene().Add(view);
+
+  gResourceReadyCalled = false;
+  view.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor = view.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor);
+
+  // Enable the default algorithm
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+  Dali::Toolkit::DevelKeyboardFocusManager::EnableDefaultAlgorithm(manager, true);
+
+  // connect focusable signal
+  gFocusChangedCallBackCalled = false;
+  meshActor.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  manager.FocusChangedSignal().Connect(TestFocusChangedCallback);
+
+  // Initialize with some left-positioned actor
+  Control focusStartActor = Control::New();
+  focusStartActor.SetProperty(Dali::Actor::Property::SIZE, Vector3(100, 100, 100));
+  focusStartActor.SetProperty(Dali::Actor::Property::POSITION, Vector3(-200, 0, 0));
+  focusStartActor.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  focusStartActor.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  focusStartActor.SetProperty(Dali::Actor::Property::KEYBOARD_FOCUSABLE, true);
+  application.GetScene().Add(focusStartActor);
+
+  // Clear
+  manager.ClearFocus();
+  manager.SetCurrentFocusActor(focusStartActor);
+  gFocusChangedCallBackCalled = false;
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Focusable view find failed
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == false);
+  DALI_TEST_CHECK(!gFocusChangedCallBackCalled);
+
+  // Clear
+  manager.ClearFocus();
+  manager.SetCurrentFocusActor(focusStartActor);
+  gFocusChangedCallBackCalled = false;
+
+  // Allow again
+  view.SetChildrenFocusable(true);
+  DALI_TEST_EQUALS(view.GetChildrenFocusable(), true, TEST_LOCATION);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Focusable view find success
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
+  DALI_TEST_CHECK(gFocusChangedCallBackCalled);
+
+  // Clear
+  manager.ClearFocus();
+  manager.SetCurrentFocusActor(focusStartActor);
+  gFocusChangedCallBackCalled = false;
+
+  END_TEST;
+}
+
+int UtcDaliModelAnimation01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  uint32_t animationCount = model.GetAnimationCount();
+  DALI_TEST_EQUALS(1, animationCount, TEST_LOCATION);
+
+  Animation animationByIndex = model.GetAnimation(0u);
+  DALI_TEST_CHECK(animationByIndex);
+
+  Animation animationByName = model.GetAnimation("animation_AnimatedCube");
+  DALI_TEST_CHECK(animationByName);
+  DALI_TEST_EQUALS(animationByIndex, animationByName, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelAnimation02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_ANIMATION_TEST_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  uint32_t animationCount = model.GetAnimationCount();
+  DALI_TEST_EQUALS(9, animationCount, TEST_LOCATION);
+
+  Animation animation1 = model.GetAnimation("Step Scale");
+  DALI_TEST_CHECK(animation1);
+  DALI_TEST_EQUALS(1.66667f, animation1.GetDuration(), 0.001f, TEST_LOCATION);
+
+  Animation animation2 = model.GetAnimation("CubicSpline Scale");
+  DALI_TEST_CHECK(animation2);
+  DALI_TEST_EQUALS(1.66667f, animation2.GetDuration(), 0.001f, TEST_LOCATION);
+
+  DALI_TEST_NOT_EQUALS(animation1, animation2, 0.0f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelAnimation03(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_DLI_EXERCISE_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  uint32_t animationCount = model.GetAnimationCount();
+  DALI_TEST_EQUALS(18, animationCount, TEST_LOCATION);
+
+  Animation animationByIndex = model.GetAnimation(0u);
+  DALI_TEST_CHECK(animationByIndex);
+
+  Animation animationByName = model.GetAnimation("idleClip");
+  DALI_TEST_CHECK(animationByName);
+  DALI_TEST_EQUALS(animationByIndex, animationByName, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelCameraGenerate01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_DLI_EXERCISE_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  uint32_t cameraCount = model.GetCameraCount();
+  DALI_TEST_EQUALS(1, cameraCount, TEST_LOCATION);
+
+  CameraActor generatedCamera = model.GenerateCamera(0u);
+  DALI_TEST_CHECK(generatedCamera);
+
+  generatedCamera = model.GenerateCamera(1u); // Fail to generate camera
+  DALI_TEST_CHECK(!generatedCamera);
+
+  END_TEST;
+}
+
+int UtcDaliModelCameraGenerate02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  uint32_t cameraCount = model.GetCameraCount();
+  DALI_TEST_EQUALS(6, cameraCount, TEST_LOCATION);
+
+  CameraActor generatedCamera0 = model.GenerateCamera(0u);
+  DALI_TEST_CHECK(generatedCamera0);
+  CameraActor generatedCamera1 = model.GenerateCamera(1u);
+  DALI_TEST_CHECK(generatedCamera1);
+  CameraActor generatedCamera2 = model.GenerateCamera(2u);
+  DALI_TEST_CHECK(generatedCamera2);
+  CameraActor generatedCamera3 = model.GenerateCamera(3u); // Infinity far camera
+  DALI_TEST_CHECK(generatedCamera3);
+  CameraActor generatedCamera4 = model.GenerateCamera(4u); // Broken camera 1
+  DALI_TEST_CHECK(!generatedCamera4);
+  CameraActor generatedCamera5 = model.GenerateCamera(5u); // Broken camera 2
+  DALI_TEST_CHECK(!generatedCamera5);
+  CameraActor generatedCamera6 = model.GenerateCamera(6u); // Out of bound
+  DALI_TEST_CHECK(!generatedCamera6);
+
+  CameraActor appliedCamera;
+  DALI_TEST_EQUALS(model.ApplyCamera(0u, appliedCamera), false, TEST_LOCATION); // Cannot apply into empty camera.
+
+  auto CompareCameraProperties = [](CameraActor lhs, CameraActor rhs, const char* location) {
+    DALI_TEST_EQUALS(lhs.GetProperty<int>(Dali::CameraActor::Property::PROJECTION_MODE), rhs.GetProperty<int>(Dali::CameraActor::Property::PROJECTION_MODE), TEST_LOCATION);
+    DALI_TEST_EQUALS(lhs.GetProperty<float>(Dali::CameraActor::Property::NEAR_PLANE_DISTANCE), rhs.GetProperty<float>(Dali::CameraActor::Property::NEAR_PLANE_DISTANCE), TEST_LOCATION);
+
+    if(lhs.GetProperty<int>(Dali::CameraActor::Property::PROJECTION_MODE) == static_cast<int>(Dali::Camera::ProjectionMode::PERSPECTIVE_PROJECTION))
+    {
+      DALI_TEST_EQUALS(lhs.GetProperty<float>(Dali::CameraActor::Property::FIELD_OF_VIEW), rhs.GetProperty<float>(Dali::CameraActor::Property::FIELD_OF_VIEW), TEST_LOCATION);
+      // TODO : Open this test when infinity far projection implement.
+      // DALI_TEST_EQUALS(lhs.GetProperty<float>(Dali::CameraActor::Property::FAR_PLANE_DISTANCE), rhs.GetProperty<float>(Dali::CameraActor::Property::FAR_PLANE_DISTANCE), TEST_LOCATION);
+    }
+    else
+    {
+      DALI_TEST_EQUALS(lhs.GetProperty<float>(Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE), rhs.GetProperty<float>(Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE), TEST_LOCATION);
+      DALI_TEST_EQUALS(lhs.GetProperty<float>(Dali::CameraActor::Property::FAR_PLANE_DISTANCE), rhs.GetProperty<float>(Dali::CameraActor::Property::FAR_PLANE_DISTANCE), TEST_LOCATION);
+    }
+  };
+
+  appliedCamera = CameraActor::New();
+  DALI_TEST_EQUALS(model.ApplyCamera(0u, appliedCamera), true, TEST_LOCATION);
+  CompareCameraProperties(generatedCamera0, appliedCamera, TEST_LOCATION);
+  DALI_TEST_EQUALS(model.ApplyCamera(1u, appliedCamera), true, TEST_LOCATION);
+  CompareCameraProperties(generatedCamera1, appliedCamera, TEST_LOCATION);
+  DALI_TEST_EQUALS(model.ApplyCamera(2u, appliedCamera), true, TEST_LOCATION);
+  CompareCameraProperties(generatedCamera2, appliedCamera, TEST_LOCATION);
+  DALI_TEST_EQUALS(model.ApplyCamera(3u, appliedCamera), true, TEST_LOCATION);
+  CompareCameraProperties(generatedCamera3, appliedCamera, TEST_LOCATION);
+  DALI_TEST_EQUALS(model.ApplyCamera(4u, appliedCamera), false, TEST_LOCATION); // Broken camera 1
+  DALI_TEST_EQUALS(model.ApplyCamera(5u, appliedCamera), false, TEST_LOCATION); // Broken camera 2
+  DALI_TEST_EQUALS(model.ApplyCamera(6u, appliedCamera), false, TEST_LOCATION); // Cannot apply over the index.
+
+  END_TEST;
+}
+
+int UtcDaliModelMultiplePrimitives(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_MULTIPLE_PRIMITIVE_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Actor actor = model.FindChildByName("rootNode");
+
+  DALI_TEST_EQUALS(0, actor.GetChildCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(2, actor.GetRendererCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelColorMode(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  model.SetProperty(Dali::Actor::Property::COLOR, Color::RED);
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Actor   actor           = model.FindChildByName("AnimatedCube");
+  Vector4 childColor      = actor[Dali::Actor::Property::COLOR];
+  Vector4 childWorldColor = actor[Dali::Actor::Property::WORLD_COLOR];
+
+  DALI_TEST_EQUALS(childColor, Color::WHITE, TEST_LOCATION);
+  DALI_TEST_EQUALS(childWorldColor, Color::RED, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelResourceReady(void)
+{
+  ToolkitTestApplication application;
+
+  gOnRelayoutCallBackCalled = false;
+  gResourceReadyCalled      = false;
+  Scene3D::Model model      = Scene3D::Model::New(TEST_GLTF_ANIMATION_TEST_FILE_NAME);
+  model.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  model.OnRelayoutSignal().Connect(OnRelayoutCallback);
+  model.ResourceReadySignal().Connect(OnResourceReady);
+  DALI_TEST_EQUALS(model.IsResourceReady(), false, TEST_LOCATION);
+
+  // Sanity check
+  DALI_TEST_CHECK(!gOnRelayoutCallBackCalled);
+  DALI_TEST_CHECK(!gResourceReadyCalled);
+
+  application.GetScene().Add(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(model.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelResourceReady02(void)
+{
+  tet_infoline("Test model load successfully even if shader language version is low\n");
+  ToolkitTestApplication application;
+
+  auto originalShaderVersion = application.GetGlAbstraction().GetShaderLanguageVersion();
+
+  // Change the shader language version forcely!
+  application.GetGlAbstraction().mShaderLanguageVersion = 200;
+
+  try
+  {
+    gOnRelayoutCallBackCalled = false;
+    gResourceReadyCalled      = false;
+    Scene3D::Model model      = Scene3D::Model::New(TEST_GLTF_MORPH_FILE_NAME);
+    model.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+    model.OnRelayoutSignal().Connect(OnRelayoutCallback);
+    model.ResourceReadySignal().Connect(OnResourceReady);
+    DALI_TEST_EQUALS(model.IsResourceReady(), false, TEST_LOCATION);
+
+    // Sanity check
+    DALI_TEST_CHECK(!gOnRelayoutCallBackCalled);
+    DALI_TEST_CHECK(!gResourceReadyCalled);
+
+    application.GetScene().Add(model);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(model.IsResourceReady(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+    // Change material information, for line coverage.
+    auto modelNode = model.FindChildModelNodeByName("AnimatedMorphCube");
+    DALI_TEST_CHECK(modelNode);
+    DALI_TEST_GREATER(modelNode.GetModelPrimitiveCount(), 0u, TEST_LOCATION);
+    auto modelPrimitive = modelNode.GetModelPrimitive(0u);
+    DALI_TEST_CHECK(modelPrimitive);
+    auto material = modelPrimitive.GetMaterial();
+    DALI_TEST_CHECK(material);
+
+    auto originBaseColorFactor = material.GetProperty<Dali::Vector4>(Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR);
+    auto expectBaseColorFactor = Vector4(originBaseColorFactor.r + 0.05f, originBaseColorFactor.g - 0.05f, originBaseColorFactor.b, originBaseColorFactor.a);
+    material.SetProperty(Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR, expectBaseColorFactor);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(material.GetProperty<Dali::Vector4>(Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR), expectBaseColorFactor, TEST_LOCATION);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  // Revert shader version. We should revert it even if UTC failed.
+  application.GetGlAbstraction().mShaderLanguageVersion = originalShaderVersion;
+
+  END_TEST;
+}
+
+int UtcDaliModelResourceCacheCheck(void)
+{
+  ToolkitTestApplication application;
+
+  // Load three instances of the same model and add them to the scene
+  Scene3D::Model model1 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  Scene3D::Model model2 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  Scene3D::Model model3 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+
+  application.GetScene().Add(model1);
+  application.GetScene().Add(model2);
+  application.GetScene().Add(model3);
+
+  gResourceReadyCalled = false;
+  model1.ResourceReadySignal().Connect(&OnResourceReady);
+  model2.ResourceReadySignal().Connect(&OnResourceReady);
+  model3.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Check that the loading has finished for all the three instances
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Actor meshActor1 = model1.FindChildByName("AnimatedCube");
+  Actor meshActor2 = model2.FindChildByName("AnimatedCube");
+  Actor meshActor3 = model3.FindChildByName("AnimatedCube");
+  DALI_TEST_CHECK(meshActor1);
+  DALI_TEST_CHECK(meshActor2);
+  DALI_TEST_CHECK(meshActor3);
+
+  Renderer renderer1 = meshActor1.GetRendererAt(0u);
+  Renderer renderer2 = meshActor2.GetRendererAt(0u);
+  Renderer renderer3 = meshActor3.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer1);
+  DALI_TEST_CHECK(renderer2);
+  DALI_TEST_CHECK(renderer3);
+
+  // Check that all the three instances use the shared textures and geometries from the cache
+  // but have their own shader objects
+  DALI_TEST_EQUALS(renderer1.GetTextures(), renderer2.GetTextures(), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer1.GetTextures(), renderer3.GetTextures(), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer1.GetGeometry(), renderer2.GetGeometry(), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer1.GetGeometry(), renderer3.GetGeometry(), TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(renderer1.GetShader(), renderer2.GetShader(), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(renderer1.GetShader(), renderer3.GetShader(), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(renderer2.GetShader(), renderer3.GetShader(), 0.0f, TEST_LOCATION);
+
+  // Destroy model1
+  model1.Unparent();
+  model1.Reset();
+
+  // Check that all the other two instances still use the shared textures and geometries from the cache
+  // but have their own shader objects
+  DALI_TEST_EQUALS(renderer2.GetTextures(), renderer3.GetTextures(), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer2.GetGeometry(), renderer3.GetGeometry(), TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(renderer2.GetShader(), renderer3.GetShader(), 0.0f, TEST_LOCATION);
+
+  // Set new IBL textures for model2, and this should apply to model2 instance only
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  model2.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Check that the new IBL textures are loaded for model2
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  // Check that the two instances still use the shared geometries from the cache
+  // but now have their own shader objects and different texture set
+  DALI_TEST_NOT_EQUALS(renderer2.GetTextures(), renderer3.GetTextures(), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer2.GetGeometry(), renderer3.GetGeometry(), TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(renderer2.GetShader(), renderer3.GetShader(), 0.0f, TEST_LOCATION);
+
+  // Check that the two instances now have their own diffuse texture and specular texture,
+  // but all the other textures are still the same
+  TextureSet textureSet2 = renderer2.GetTextures();
+  TextureSet textureSet3 = renderer3.GetTextures();
+  DALI_TEST_EQUALS(textureSet2.GetTextureCount(), 10u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureSet3.GetTextureCount(), 10u, TEST_LOCATION);
+
+  for(uint32_t i = 0; i < 7u; i++)
+  {
+    DALI_TEST_EQUALS(textureSet2.GetTexture(i), textureSet3.GetTexture(i), TEST_LOCATION);
+  }
+
+  DALI_TEST_NOT_EQUALS(textureSet2.GetTexture(8u), textureSet3.GetTexture(7u), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(textureSet2.GetTexture(9u), textureSet3.GetTexture(8u), 0.0f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelAddRemoveModelNode(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New();
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+
+  Scene3D::ModelNode node1 = Scene3D::ModelNode::New();
+  Scene3D::ModelNode node2 = Scene3D::ModelNode::New();
+  Scene3D::ModelNode node3 = Scene3D::ModelNode::New();
+  Scene3D::ModelNode node4 = Scene3D::ModelNode::New();
+
+  model.AddModelNode(node1);
+  model.AddModelNode(node2);
+  model.AddModelNode(node3);
+  model.RemoveModelNode(node1); // Remove node before scene on
+
+  application.GetScene().Add(model);
+
+  Dali::Scene3D::ModelNode root = model.GetModelRoot();
+  DALI_TEST_CHECK(root);
+  DALI_TEST_EQUALS(2, root.GetChildCount(), TEST_LOCATION);
+
+  model.RemoveModelNode(node2); // Remove node after scene on
+
+  DALI_TEST_EQUALS(1, root.GetChildCount(), TEST_LOCATION);
+
+  model.AddModelNode(node4); // Add during scene on
+
+  DALI_TEST_EQUALS(2, root.GetChildCount(), TEST_LOCATION);
+
+  application.GetScene().Remove(model);
+
+  model.RemoveModelNode(node3); // Remove node after scene off
+
+  END_TEST;
+}
+
+int UtcDaliModelFindChildModelNodeByName(void)
+{
+  tet_infoline(" UtcDaliModelNodeFindChildModelNodeByName.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New();
+  application.GetScene().Add(model);
+
+  Scene3D::ModelNode modelNode1 = Scene3D::ModelNode::New();
+  Scene3D::ModelNode modelNode2 = Scene3D::ModelNode::New();
+
+  modelNode1.SetProperty(Dali::Actor::Property::NAME, "modelNode1");
+  modelNode2.SetProperty(Dali::Actor::Property::NAME, "modelNode2");
+  model.AddModelNode(modelNode1);
+  model.AddModelNode(modelNode2);
+
+  Scene3D::ModelNode child1 = model.FindChildModelNodeByName("modelNode1");
+  DALI_TEST_CHECK(child1);
+  DALI_TEST_EQUALS(child1, modelNode1, TEST_LOCATION);
+
+  Scene3D::ModelNode child2 = model.FindChildModelNodeByName("modelNode2");
+  DALI_TEST_CHECK(child2);
+  DALI_TEST_EQUALS(child2, modelNode2, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelSizeChange(void)
+{
+  tet_infoline(" UtcDaliModelSizeChange.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector3(300, 300, 300));
+  application.GetScene().Add(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model.GetChildCount(), 1u, TEST_LOCATION);
+  Vector3 scale = model.GetChildAt(0u).GetProperty<Vector3>(Dali::Actor::Property::SCALE);
+
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector3(600, 600, 600));
+  Vector3 scale2 = model.GetChildAt(0u).GetProperty<Vector3>(Dali::Actor::Property::SCALE);
+
+  DALI_TEST_NOT_EQUALS(scale, scale2, 0.1f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelSizeChange2(void)
+{
+  tet_infoline(" UtcDaliModelSizeChange2.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector3(300, 300, 300));
+  application.GetScene().Add(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model.GetChildCount(), 1u, TEST_LOCATION);
+  Vector3 scale = model.GetChildAt(0u).GetProperty<Vector3>(Dali::Actor::Property::SCALE);
+
+  Animation animation = Animation::New(0.5f);
+  animation.AnimateTo(Dali::Property(model, Dali::Actor::Property::SIZE), Vector3(600, 600, 600));
+  animation.Play();
+
+  application.SendNotification();
+  application.Render(250);
+
+  application.SendNotification();
+
+  Vector3 scale2 = model.GetChildAt(0u).GetProperty<Vector3>(Dali::Actor::Property::SCALE);
+  DALI_TEST_NOT_EQUALS(scale, scale2, 0.1f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelRetrieveBlendShapeNames(void)
+{
+  tet_infoline(" UtcDaliModelRetrieveBlendShapeByName.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_EXTRAS_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector3(300, 300, 300));
+  application.GetScene().Add(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model.GetChildCount(), 1u, TEST_LOCATION);
+
+  // Get target ModelNode that has extras
+  Scene3D::ModelNode expectNode = model.FindChildModelNodeByName("AnimatedMorphCube");
+
+  // Pair of expected blend shape index from expectNode.
+  std::map<std::string, Scene3D::Loader::BlendShapes::Index> expectBlendShapeNames = {
+    {"Target_0", 0u},
+    {"Target_1", 1u},
+  };
+
+  std::vector<std::string> blendShapeNameList;
+  model.RetrieveBlendShapeNames(blendShapeNameList);
+
+  DALI_TEST_EQUALS(blendShapeNameList.size(), expectBlendShapeNames.size(), TEST_LOCATION);
+  for(auto i = 0u; i < blendShapeNameList.size(); ++i)
+  {
+    const auto& name = blendShapeNameList[i];
+    tet_printf("Check retrieved blendshape name : %s\n", name.c_str());
+
+    const auto& iter = expectBlendShapeNames.find(name);
+    DALI_TEST_CHECK(iter != expectBlendShapeNames.end());
+
+    std::vector<Scene3D::ModelNode> nodeList;
+    model.RetrieveModelNodesByBlendShapeName(name, nodeList);
+    DALI_TEST_EQUALS(nodeList.size(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(nodeList[0], expectNode, TEST_LOCATION);
+    DALI_TEST_EQUALS(nodeList[0].GetBlendShapeIndexByName(name), iter->second, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliModelGenerateMotionDataAnimation01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_MORPH_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  KeyFrames floatKeyFrames = KeyFrames::New();
+  floatKeyFrames.Add(0.0f, 1.0f);
+  floatKeyFrames.Add(1.0f, 0.5f);
+
+  float               duration   = 3.0f;
+  Scene3D::MotionData motionData = Scene3D::MotionData::New(duration);
+  motionData.Add(Scene3D::MotionTransformIndex::New("AnimatedMorphCube", Scene3D::MotionTransformIndex::TransformType::SCALE_Y), Scene3D::MotionValue::New(2.0f));
+  motionData.Add(Scene3D::MotionTransformIndex::New("AnimatedMorphCube", Scene3D::MotionTransformIndex::TransformType::SCALE_Z), Scene3D::MotionValue::New(floatKeyFrames));
+  motionData.Add(Scene3D::BlendShapeIndex::New("AnimatedMorphCube", 0), Scene3D::MotionValue::New(0.5f));
+  motionData.Add(Scene3D::BlendShapeIndex::New("AnimatedMorphCube", 1), Scene3D::MotionValue::New(floatKeyFrames));
+
+  Animation generatedAnimation = model.GenerateMotionDataAnimation(motionData);
+  DALI_TEST_CHECK(generatedAnimation);
+  DALI_TEST_EQUALS(generatedAnimation.GetDuration(), duration, TEST_LOCATION);
+
+  Scene3D::MotionData invalidMotionData = Scene3D::MotionData::New(duration);
+  invalidMotionData.Add(Scene3D::MotionTransformIndex::New("NotAnimatedMorphCube", Scene3D::MotionTransformIndex::TransformType::SCALE_Y), Scene3D::MotionValue::New(2.0f));
+  invalidMotionData.Add(Scene3D::MotionTransformIndex::New("NotAnimatedMorphCube", Scene3D::MotionTransformIndex::TransformType::SCALE_Z), Scene3D::MotionValue::New(floatKeyFrames));
+  invalidMotionData.Add(Scene3D::BlendShapeIndex::New("NotAnimatedMorphCube", 0), Scene3D::MotionValue::New(0.5f));
+  invalidMotionData.Add(Scene3D::BlendShapeIndex::New("NotAnimatedMorphCube", 1), Scene3D::MotionValue::New(floatKeyFrames));
+
+  generatedAnimation = model.GenerateMotionDataAnimation(invalidMotionData);
+  DALI_TEST_CHECK(!generatedAnimation); // Animation should be empty if motion data have invalid index.
+
+  END_TEST;
+}
+
+int UtcDaliModelSetMotionData(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_MORPH_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  KeyFrames floatKeyFrames = KeyFrames::New();
+  floatKeyFrames.Add(0.0f, 1.0f);
+  floatKeyFrames.Add(1.0f, 0.5f);
+
+  float               duration   = 3.0f;
+  Scene3D::MotionData motionData = Scene3D::MotionData::New(duration);
+  motionData.Add(Scene3D::MotionTransformIndex::New("AnimatedMorphCube", Scene3D::MotionTransformIndex::TransformType::SCALE_Y), Scene3D::MotionValue::New(2.0f));
+  motionData.Add(Scene3D::MotionTransformIndex::New("AnimatedMorphCube", Scene3D::MotionTransformIndex::TransformType::SCALE_Z), Scene3D::MotionValue::New(floatKeyFrames));
+  motionData.Add(Scene3D::BlendShapeIndex::New("AnimatedMorphCube", 0), Scene3D::MotionValue::New(0.5f));
+  motionData.Add(Scene3D::BlendShapeIndex::New("AnimatedMorphCube", 1), Scene3D::MotionValue::New(floatKeyFrames));
+
+  auto cubeModelNode = model.FindChildModelNodeByName("AnimatedMorphCube");
+
+  float expectScaleX = cubeModelNode.GetProperty<float>(Actor::Property::SCALE_X);
+
+  model.SetMotionData(motionData);
+
+  DALI_TEST_EQUALS(cubeModelNode.GetProperty<float>(Actor::Property::SCALE_X), expectScaleX, TEST_LOCATION);
+  DALI_TEST_EQUALS(cubeModelNode.GetProperty<float>(Actor::Property::SCALE_Y), 2.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(cubeModelNode.GetProperty<float>(Actor::Property::SCALE_Z), 0.5f, TEST_LOCATION); ///< Last value of keyframes
+
+  END_TEST;
+}
+
+int UtcDaliModelBlendShapeMotionDataByName(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_EXTRAS_FILE_NAME);
+  model.SetProperty(Dali::Actor::Property::SIZE, Vector2(50, 50));
+  application.GetScene().Add(model);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  KeyFrames floatKeyFrames = KeyFrames::New();
+  floatKeyFrames.Add(0.0f, 0.5f);
+  floatKeyFrames.Add(1.0f, 1.0f);
+
+  float               duration   = 3.0f;
+  Scene3D::MotionData motionData = Scene3D::MotionData::New(duration);
+  motionData.Add(Scene3D::BlendShapeIndex::New("Target_0"), Scene3D::MotionValue::New(0.5f));
+  motionData.Add(Scene3D::BlendShapeIndex::New("Target_1"), Scene3D::MotionValue::New(floatKeyFrames));
+
+  Animation generatedAnimation = model.GenerateMotionDataAnimation(motionData);
+  DALI_TEST_CHECK(generatedAnimation);
+  DALI_TEST_EQUALS(generatedAnimation.GetDuration(), duration, TEST_LOCATION);
+
+  model.SetMotionData(motionData);
+
+  // Get target ModelNode that has extras
+  Scene3D::ModelNode expectNode    = model.FindChildModelNodeByName("AnimatedMorphCube");
+  auto               propertyIndex = expectNode.GetPropertyIndex(motionData.GetIndex(0u).GetPropertyName(expectNode));
+
+  DALI_TEST_CHECK(propertyIndex != Property::INVALID_INDEX);
+  DALI_TEST_EQUALS(expectNode.GetProperty<float>(propertyIndex), 0.5f, TEST_LOCATION);
+
+  propertyIndex = expectNode.GetPropertyIndex(motionData.GetIndex(1u).GetPropertyName(expectNode));
+  DALI_TEST_CHECK(propertyIndex != Property::INVALID_INDEX);
+  DALI_TEST_EQUALS(expectNode.GetProperty<float>(propertyIndex), 1.0f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelMaterialUniformChange(void)
+{
+  ToolkitTestApplication application;
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("uColorFactor", Property::Type::VECTOR4),
+      UniformData("uBaseColorTextureTransformAvailable", Property::Type::FLOAT),
+      UniformData(Scene3D::Loader::NodeDefinition::GetIblMaxLodUniformName().data(), Property::Type::FLOAT),
+      UniformData(Scene3D::Loader::NodeDefinition::GetIblScaleFactorUniformName().data(), Property::Type::FLOAT),
+    };
+
+  TestGraphicsController& graphics = application.GetGraphicsController();
+  graphics.AddCustomUniforms(customUniforms);
+
+  auto& gl = application.GetGlAbstraction();
+
+  Scene3D::Model model = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+
+  gResourceReadyCalled = false;
+  model.ResourceReadySignal().Connect(&OnResourceReady);
+
+  float expectIblFactor = 0.5f;
+  model.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE, expectIblFactor);
+  DALI_TEST_EQUALS(model.GetImageBasedLightScaleFactor(), expectIblFactor, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  application.GetScene().Add(model);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait 3 task. (Load 1 model + Load 2 IBL)
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(model.GetImageBasedLightScaleFactor(), expectIblFactor, TEST_LOCATION);
+
+  // Check uniform values before change material value
+  Vector4 expectBaseColorFactor = Vector4(1.000f, 0.766f, 0.336f, 1.0f); // Defined at AnimatedCube.gltf
+  float   expectTransformValid  = 0.0f;                                  ///< Note : This value will be true when gltf have BaseColorTexture, and use KHR_texture_transform extension.
+  float   expectMaxLOD          = 5.0f;                                  ///< Note : The number of LOD what TEST_SPECULAR_TEXTURE file has is 5.
+
+  tet_printf("Check uniform value result\n");
+  DALI_TEST_EQUALS(gl.CheckUniformValue<Vector4>("uColorFactor", expectBaseColorFactor), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("uBaseColorTextureTransformAvailable", expectTransformValid), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>(Scene3D::Loader::NodeDefinition::GetIblMaxLodUniformName().data(), expectMaxLOD), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>(Scene3D::Loader::NodeDefinition::GetIblScaleFactorUniformName().data(), expectIblFactor), true, TEST_LOCATION);
+
+  // Change all materials in Model.
+  expectBaseColorFactor = Color::BLUE;
+
+  Scene3D::ModelNode rootModelNode = model.GetModelRoot();
+  DALI_TEST_CHECK(rootModelNode);
+  ApplyAllMaterialPropertyRecursively(rootModelNode, {{Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR, expectBaseColorFactor}});
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("Check whether uniform values are not changed instead what we change now\n");
+  DALI_TEST_EQUALS(gl.CheckUniformValue<Vector4>("uColorFactor", expectBaseColorFactor), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("uBaseColorTextureTransformAvailable", expectTransformValid), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>(Scene3D::Loader::NodeDefinition::GetIblMaxLodUniformName().data(), expectMaxLOD), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>(Scene3D::Loader::NodeDefinition::GetIblScaleFactorUniformName().data(), expectIblFactor), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelCastShadow(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New();
+  application.GetScene().Add(model);
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  model.AddModelNode(modelNode);
+
+  DALI_TEST_EQUALS(model.IsShadowCasting(), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowCasting(), true, TEST_LOCATION);
+
+  auto shadowCastingIndex = modelNode.GetPropertyIndex("uIsShadowCasting");
+  DALI_TEST_EQUALS(modelNode.GetProperty<int>(shadowCastingIndex), 1, TEST_LOCATION);
+
+  model.CastShadow(false);
+
+  DALI_TEST_EQUALS(model.IsShadowCasting(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowCasting(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.GetProperty<int>(shadowCastingIndex), 0, TEST_LOCATION);
+
+  Scene3D::ModelNode modelNode2 = Scene3D::ModelNode::New();
+  model.AddModelNode(modelNode2);
+
+  DALI_TEST_EQUALS(modelNode2.IsShadowCasting(), true, TEST_LOCATION);
+
+  auto shadowCastingIndex2 = modelNode2.GetPropertyIndex("uIsShadowCasting");
+  DALI_TEST_EQUALS(modelNode2.GetProperty<int>(shadowCastingIndex2), 1, TEST_LOCATION);
+
+  modelNode.CastShadow(true);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowCasting(), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(model.IsShadowCasting(), false, TEST_LOCATION);
+
+  model.CastShadow(false);
+
+  DALI_TEST_EQUALS(model.IsShadowCasting(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowCasting(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.GetProperty<int>(shadowCastingIndex), 0, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode2.GetProperty<int>(shadowCastingIndex2), 0, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliModelReceiveShadow(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::Model model = Scene3D::Model::New();
+  application.GetScene().Add(model);
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  model.AddModelNode(modelNode);
+
+  DALI_TEST_EQUALS(model.IsShadowReceiving(), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowReceiving(), true, TEST_LOCATION);
+
+  auto shadowReceivingIndex = modelNode.GetPropertyIndex("uIsShadowReceiving");
+  DALI_TEST_EQUALS(modelNode.GetProperty<int>(shadowReceivingIndex), 1, TEST_LOCATION);
+
+  model.ReceiveShadow(false);
+
+  DALI_TEST_EQUALS(model.IsShadowReceiving(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowReceiving(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.GetProperty<int>(shadowReceivingIndex), 0, TEST_LOCATION);
+
+  Scene3D::ModelNode modelNode2 = Scene3D::ModelNode::New();
+  model.AddModelNode(modelNode2);
+
+  DALI_TEST_EQUALS(modelNode2.IsShadowReceiving(), true, TEST_LOCATION);
+
+  auto shadowReceivingIndex2 = modelNode2.GetPropertyIndex("uIsShadowReceiving");
+  DALI_TEST_EQUALS(modelNode2.GetProperty<int>(shadowReceivingIndex2), 1, TEST_LOCATION);
+
+  modelNode.ReceiveShadow(true);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowReceiving(), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(model.IsShadowReceiving(), false, TEST_LOCATION);
+
+  model.ReceiveShadow(false);
+
+  DALI_TEST_EQUALS(model.IsShadowReceiving(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.IsShadowReceiving(), false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode.GetProperty<int>(shadowReceivingIndex), 0, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(modelNode2.GetProperty<int>(shadowReceivingIndex2), 0, TEST_LOCATION);
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-ModelNode.cpp b/automated-tests/src/dali-scene3d/utc-Dali-ModelNode.cpp
new file mode 100644
index 0000000..3aaecc6
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-ModelNode.cpp
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-components/model-node.h>
+#include "mesh-builder.h"
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void model_components_model_node_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_components_model_node_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+// Negative test case for a method
+int UtcDaliModelNodeUninitialized(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNodeUninitialized");
+
+  Scene3D::ModelNode modelNode;
+
+  try
+  {
+    // New() must be called to create a ModelNode or it wont be valid.
+    Actor a = Actor::New();
+    modelNode.Add(a);
+    DALI_TEST_CHECK(false);
+  }
+  catch(Dali::DaliException& e)
+  {
+    // Tests that a negative test of an assertion succeeds
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_CHECK(!modelNode);
+  }
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelNodeNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNodeNew");
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  DALI_TEST_CHECK(modelNode);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelNodeDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelNodeDownCast");
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  BaseHandle         handle(modelNode);
+
+  Scene3D::ModelNode modelNode2 = Scene3D::ModelNode::DownCast(handle);
+  DALI_TEST_CHECK(modelNode);
+  DALI_TEST_CHECK(modelNode2);
+  DALI_TEST_CHECK(modelNode2 == modelNode);
+  END_TEST;
+}
+
+int UtcDaliModelNodeTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("ModelNode");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::DownCast(handle);
+  DALI_TEST_CHECK(modelNode);
+
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelNodeAddRemove(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelAddRemove");
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  DALI_TEST_CHECK(modelNode);
+
+  Actor actor = Actor::New();
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+
+  modelNode.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  modelNode.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
+  modelNode.Add(actor);
+  application.GetScene().Add(modelNode);
+
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+
+  modelNode.Remove(actor);
+
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+  END_TEST;
+}
+
+int UtcDaliModelNodeCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  DALI_TEST_CHECK(modelNode);
+
+  Scene3D::ModelNode copy(modelNode);
+  DALI_TEST_CHECK(modelNode == copy);
+
+  Scene3D::ModelNode assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == modelNode);
+
+  END_TEST;
+}
+
+int UtcDaliModelNodeMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  DALI_TEST_EQUALS(1, modelNode.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  modelNode.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == modelNode.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::ModelNode moved = std::move(modelNode);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!modelNode);
+
+  END_TEST;
+}
+
+int UtcDaliModelNodeMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  DALI_TEST_EQUALS(1, modelNode.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  modelNode.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == modelNode.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::ModelNode moved;
+  moved = std::move(modelNode);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!modelNode);
+
+  END_TEST;
+}
+
+int UtcDaliModelNodeOnSizeSet(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+
+  application.GetScene().Add(modelNode);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector2 size(200.0f, 300.0f);
+  modelNode.SetProperty(Actor::Property::SIZE, size);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(modelNode.GetCurrentProperty<Vector2>(Actor::Property::SIZE), size, TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+
+int UtcDaliModelNodeAddRemovePrimitive(void)
+{
+  tet_infoline(" UtcDaliModelNodeAddPrimitive.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+
+  uint32_t expect = 0u;
+
+  tet_printf("Test empty primitive case\n");
+
+  DALI_TEST_EQUALS(expect, modelNode.GetModelPrimitiveCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!modelNode.GetModelPrimitive(0u));
+  DALI_TEST_CHECK(!modelNode.GetModelPrimitive(1u));
+
+  Scene3D::ModelPrimitive primitive1 = Scene3D::ModelPrimitive::New();
+  Scene3D::ModelPrimitive primitive2 = Scene3D::ModelPrimitive::New();
+
+  Scene3D::Material material = Scene3D::Material::New();
+
+  primitive1.SetMaterial(material);
+  primitive2.SetMaterial(material);
+
+  tet_printf("Test primitive appended during off scene\n");
+
+  modelNode.AddModelPrimitive(primitive1);
+  ++expect;
+  DALI_TEST_EQUALS(expect, modelNode.GetModelPrimitiveCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(primitive1 == modelNode.GetModelPrimitive(0u));
+  DALI_TEST_CHECK(!modelNode.GetModelPrimitive(1u));
+
+  tet_printf("Test primitive appended during on scene\n");
+
+  application.GetScene().Add(modelNode);
+
+  modelNode.AddModelPrimitive(primitive2);
+  ++expect;
+  DALI_TEST_EQUALS(expect, modelNode.GetModelPrimitiveCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(primitive1 == modelNode.GetModelPrimitive(0u));
+  DALI_TEST_CHECK(primitive2 == modelNode.GetModelPrimitive(1u));
+
+  modelNode.RemoveModelPrimitive(primitive1);
+  DALI_TEST_CHECK(primitive2 == modelNode.GetModelPrimitive(0u));
+  DALI_TEST_CHECK(!modelNode.GetModelPrimitive(1u));
+
+  modelNode.RemoveModelPrimitive(0u);
+  DALI_TEST_CHECK(!modelNode.GetModelPrimitive(0u));
+  DALI_TEST_CHECK(!modelNode.GetModelPrimitive(1u));
+
+  modelNode.Unparent();
+
+  END_TEST;
+}
+
+int UtcDaliModelNodeFindChildModelNodeByName(void)
+{
+  tet_infoline(" UtcDaliModelNodeFindChildModelNodeByName.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode modelNode = Scene3D::ModelNode::New();
+  Scene3D::ModelNode modelNode1 = Scene3D::ModelNode::New();
+  Scene3D::ModelNode modelNode2 = Scene3D::ModelNode::New();
+
+  modelNode1.SetProperty(Dali::Actor::Property::NAME, "modelNode1");
+  modelNode2.SetProperty(Dali::Actor::Property::NAME, "modelNode2");
+  modelNode.Add(modelNode1);
+  modelNode.Add(modelNode2);
+
+  Scene3D::ModelNode child1 = modelNode.FindChildModelNodeByName("modelNode1");
+  DALI_TEST_CHECK(child1);
+  DALI_TEST_EQUALS(child1, modelNode1, TEST_LOCATION);
+
+  Scene3D::ModelNode child2 = modelNode.FindChildModelNodeByName("modelNode2");
+  DALI_TEST_CHECK(child2);
+  DALI_TEST_EQUALS(child2, modelNode2, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelNodeCustomNode1(void)
+{
+  tet_infoline(" UtcDaliModelNodeCustomNode1.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode      modelNode      = Scene3D::ModelNode::New();
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  Scene3D::Material       material       = Scene3D::Material::New();
+  Geometry                geometry       = CreateQuadGeometry();
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 0, TEST_LOCATION);
+
+  modelNode.AddModelPrimitive(modelPrimitive);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 0, TEST_LOCATION);
+  
+  modelPrimitive.SetGeometry(geometry);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 0, TEST_LOCATION);
+
+  modelPrimitive.SetMaterial(material);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelNodeCustomNode2(void)
+{
+  tet_infoline(" UtcDaliModelNodeCustomNode2.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode      modelNode      = Scene3D::ModelNode::New();
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  Scene3D::Material       material       = Scene3D::Material::New();
+  Geometry                geometry       = CreateQuadGeometry();
+  modelPrimitive.SetGeometry(geometry);
+  modelPrimitive.SetMaterial(material);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 0, TEST_LOCATION);
+
+  modelNode.AddModelPrimitive(modelPrimitive);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliModelNodeCustomNode3(void)
+{
+  tet_infoline(" UtcDaliModelNodeCustomNode3.");
+
+  ToolkitTestApplication application;
+
+  Scene3D::ModelNode      modelNode      = Scene3D::ModelNode::New();
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  Scene3D::Material       material       = Scene3D::Material::New();
+  Geometry                geometry       = CreateQuadGeometry();
+  modelPrimitive.SetGeometry(geometry);
+  modelPrimitive.SetMaterial(material);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 0, TEST_LOCATION);
+
+  modelNode.AddModelPrimitive(modelPrimitive);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 1, TEST_LOCATION);
+
+  modelNode.AddModelPrimitive(modelPrimitive);
+
+  DALI_TEST_EQUALS(modelNode.GetRendererCount(), 1, TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-ModelPrimitive.cpp b/automated-tests/src/dali-scene3d/utc-Dali-ModelPrimitive.cpp
new file mode 100644
index 0000000..0733aab
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-ModelPrimitive.cpp
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void model_components_model_primitive_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_components_model_primitive_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+} // namespace
+
+// Positive test case for a method
+int UtcDaliModelPrimitiveNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelPrimitiveNew");
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  DALI_TEST_CHECK(modelPrimitive);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliModelPrimitiveDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliModelPrimitiveDownCast");
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  BaseHandle              handle(modelPrimitive);
+
+  Scene3D::ModelPrimitive modelPrimitive2 = Scene3D::ModelPrimitive::DownCast(handle);
+  DALI_TEST_CHECK(modelPrimitive);
+  DALI_TEST_CHECK(modelPrimitive2);
+  DALI_TEST_CHECK(modelPrimitive2 == modelPrimitive);
+  END_TEST;
+}
+
+int UtcDaliModelPrimitiveTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("ModelPrimitive");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::DownCast(handle);
+  DALI_TEST_CHECK(modelPrimitive);
+
+  END_TEST;
+}
+
+int UtcDaliModelPrimitiveCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  DALI_TEST_CHECK(modelPrimitive);
+
+  Scene3D::ModelPrimitive copy(modelPrimitive);
+  DALI_TEST_CHECK(modelPrimitive == copy);
+
+  Scene3D::ModelPrimitive assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == modelPrimitive);
+
+  END_TEST;
+}
+
+int UtcDaliModelPrimitiveMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  DALI_TEST_EQUALS(1, modelPrimitive.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  Scene3D::ModelPrimitive moved = std::move(modelPrimitive);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!modelPrimitive);
+
+  END_TEST;
+}
+
+int UtcDaliModelPrimitiveMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+  DALI_TEST_EQUALS(1, modelPrimitive.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  Scene3D::ModelPrimitive moved;
+  moved = std::move(modelPrimitive);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+int UtcDaliModelPrimitiveSetGetGeometry(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+
+  tet_printf("Check primitive don't have renderer initial time\n");
+
+  DALI_TEST_CHECK(!modelPrimitive.GetGeometry());
+
+  Dali::Geometry geometry = Dali::Geometry::New();
+
+  modelPrimitive.SetGeometry(geometry);
+  DALI_TEST_CHECK(geometry == modelPrimitive.GetGeometry());
+
+  tet_printf("Replace as new Renderer\n");
+
+  Dali::Geometry geometry2 = Dali::Geometry::New();
+
+  modelPrimitive.SetGeometry(geometry2);
+  DALI_TEST_CHECK(geometry != modelPrimitive.GetGeometry());
+  DALI_TEST_CHECK(geometry2 == modelPrimitive.GetGeometry());
+  END_TEST;
+}
+
+int UtcDaliModelPrimitiveSetGetMaterial(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::ModelPrimitive modelPrimitive = Scene3D::ModelPrimitive::New();
+
+  tet_printf("Check primitive don't have material initial time\n");
+
+  DALI_TEST_CHECK(!modelPrimitive.GetMaterial());
+
+  Dali::Scene3D::Material material = Dali::Scene3D::Material::New();
+
+  modelPrimitive.SetMaterial(material);
+  DALI_TEST_CHECK(material == modelPrimitive.GetMaterial());
+
+  tet_printf("Replace as new Material\n");
+
+  Dali::Scene3D::Material material2 = Dali::Scene3D::Material::New();
+
+  modelPrimitive.SetMaterial(material2);
+  DALI_TEST_CHECK(material != modelPrimitive.GetMaterial());
+  DALI_TEST_CHECK(material2 == modelPrimitive.GetMaterial());
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-MotionData.cpp b/automated-tests/src/dali-scene3d/utc-Dali-MotionData.cpp
new file mode 100644
index 0000000..b8d593b
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-MotionData.cpp
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <fstream>
+#include <iostream>
+
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-scene3d/public-api/model-motion/motion-data.h>
+#include <dali-scene3d/public-api/model-motion/motion-value.h>
+
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D;
+
+void model_motion_motion_data_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_motion_motion_data_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+const char* TEST_BVH_FILE_NAME    = TEST_RESOURCE_DIR "/test.bvh";
+const char* TEST_FACIAL_FILE_NAME = TEST_RESOURCE_DIR "/facial-blendshape-animation.json";
+
+std::string ReadBufferFromFile(const std::string& url)
+{
+  std::string  rawString;
+  std::fstream fileStream;
+
+  fileStream.open(url, std::ios::in | std::ios::binary);
+  if(!fileStream.is_open())
+  {
+    DALI_LOG_WARNING("stream open failed for: \"%s\", in mode: \"%d\".\n", url.c_str(), static_cast<int>(std::ios::in | std::ios::binary));
+  }
+
+  // get length of file:
+  fileStream.seekg(0, std::ios::end);
+  auto length = fileStream.tellg();
+  fileStream.seekg(0, std::ios::beg);
+
+  rawString.resize(length);
+  fileStream.read(rawString.data(), length);
+
+  fileStream.close();
+
+  return rawString;
+}
+
+// For LoadCompleted
+static bool gLoadCompleted = false;
+void        OnLoadCompleted(MotionData data)
+{
+  gLoadCompleted = true;
+}
+} // namespace
+
+// Positive test case for a method
+int UtcDaliMotionDataNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionDataNew");
+
+  float      expectDuration = 0.0f;
+  MotionData motionData     = MotionData::New();
+  DALI_TEST_CHECK(motionData);
+  DALI_TEST_EQUALS(motionData.GetDuration(), expectDuration, TEST_LOCATION);
+
+  expectDuration = 10.0f;
+  motionData     = MotionData::New(expectDuration);
+  DALI_TEST_CHECK(motionData);
+  DALI_TEST_EQUALS(motionData.GetDuration(), expectDuration, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliMotionDataDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionDataDownCast");
+
+  MotionData motionData = MotionData::New();
+  BaseHandle handle(motionData);
+
+  MotionData motionData2 = MotionData::DownCast(handle);
+  DALI_TEST_CHECK(motionData);
+  DALI_TEST_CHECK(motionData2);
+  DALI_TEST_CHECK(motionData2 == motionData);
+  END_TEST;
+}
+
+int UtcDaliMotionDataTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("MotionData");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  MotionData motionData = MotionData::DownCast(handle);
+  DALI_TEST_CHECK(motionData);
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionData motionData = MotionData::New();
+  DALI_TEST_CHECK(motionData);
+
+  MotionData copy(motionData);
+  DALI_TEST_CHECK(motionData == copy);
+
+  MotionData assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == motionData);
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  MotionData motionData = MotionData::New();
+  DALI_TEST_EQUALS(1, motionData.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionData moved = std::move(motionData);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!motionData);
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionData motionData = MotionData::New();
+  DALI_TEST_EQUALS(1, motionData.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionData moved;
+  moved = std::move(motionData);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+
+int UtcDaliMotionDataAddMotion(void)
+{
+  ToolkitTestApplication application;
+
+  MotionData motionData = MotionData::New(3.0f);
+
+  const uint32_t countMax = 4;
+  MotionIndex    index[countMax];
+  MotionValue    value[countMax];
+  for(uint32_t i = 0u; i < countMax; ++i)
+  {
+    // Generate index
+    if(i & 1)
+    {
+      index[i] = BlendShapeIndex::New("node", 0);
+    }
+    else
+    {
+      index[i] = MotionTransformIndex::New("node", MotionTransformIndex::TransformType::POSITION_X);
+    }
+
+    // Generate value
+    if(i & 2)
+    {
+      value[i] = MotionValue::New(3.0f);
+    }
+    else
+    {
+      KeyFrames keyFrames = KeyFrames::New();
+      keyFrames.Add(0.0f, 9.0f);
+      keyFrames.Add(1.0f, 5.0f);
+      value[i] = MotionValue::New(keyFrames);
+    }
+
+    DALI_TEST_CHECK(index[i]);
+    DALI_TEST_CHECK(value[i]);
+    motionData.Add(index[i], value[i]);
+
+    DALI_TEST_EQUALS(i + 1, motionData.GetMotionCount(), TEST_LOCATION);
+  }
+
+  for(uint32_t i = 0u; i < countMax; ++i)
+  {
+    DALI_TEST_EQUALS(index[i], motionData.GetIndex(i), TEST_LOCATION);
+    DALI_TEST_EQUALS(value[i], motionData.GetValue(i), TEST_LOCATION);
+  }
+
+  DALI_TEST_CHECK(!motionData.GetIndex(countMax));
+  DALI_TEST_CHECK(!motionData.GetValue(countMax));
+
+  motionData.Clear();
+
+  DALI_TEST_EQUALS(0u, motionData.GetMotionCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!motionData.GetIndex(0u));
+  DALI_TEST_CHECK(!motionData.GetValue(0u));
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataSetGetDuration(void)
+{
+  ToolkitTestApplication application;
+
+  float      expectDuration = 3.0f;
+  MotionData motionData     = MotionData::New(expectDuration);
+  DALI_TEST_EQUALS(motionData.GetDuration(), expectDuration, TEST_LOCATION);
+
+  expectDuration = 7.0f;
+  motionData.SetDuration(expectDuration);
+  DALI_TEST_EQUALS(motionData.GetDuration(), expectDuration, TEST_LOCATION);
+
+  expectDuration = 1.0f;
+  motionData.SetDuration(expectDuration);
+  DALI_TEST_EQUALS(motionData.GetDuration(), expectDuration, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataLoadBvhAndFacialAsync(void)
+{
+  ToolkitTestApplication application;
+
+  for(uint32_t tc = 0; tc < 4; ++tc)
+  {
+    MotionData motionData = MotionData::New();
+    gLoadCompleted        = false;
+    motionData.LoadCompletedSignal().Connect(&OnLoadCompleted);
+
+    switch(tc)
+    {
+      case 0:
+      default:
+      {
+        motionData.LoadBvh(TEST_BVH_FILE_NAME);
+        break;
+      }
+      case 1:
+      {
+        motionData.LoadFacialAnimation(TEST_FACIAL_FILE_NAME);
+        break;
+      }
+      case 2:
+      {
+        std::string rawString = ReadBufferFromFile(TEST_BVH_FILE_NAME);
+        motionData.LoadBvhFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()));
+        break;
+      }
+      case 3:
+      {
+        std::string rawString = ReadBufferFromFile(TEST_FACIAL_FILE_NAME);
+        motionData.LoadFacialAnimationFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()));
+        break;
+      }
+    }
+
+    DALI_TEST_EQUALS(gLoadCompleted, false, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    application.SendNotification();
+    application.Render();
+
+    // Check LoadCompletedSignal emitted.
+    DALI_TEST_EQUALS(gLoadCompleted, true, TEST_LOCATION);
+
+    // Check MotionData load successfully.
+    DALI_TEST_GREATER(motionData.GetMotionCount(), 0u, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataLoadBvhAndFacialSync(void)
+{
+  ToolkitTestApplication application;
+
+  for(uint32_t tc = 0; tc < 4; ++tc)
+  {
+    MotionData motionData = MotionData::New();
+    gLoadCompleted        = false;
+    motionData.LoadCompletedSignal().Connect(&OnLoadCompleted);
+
+    switch(tc)
+    {
+      case 0:
+      default:
+      {
+        motionData.LoadBvh(TEST_BVH_FILE_NAME, Vector3::ONE, true);
+        break;
+      }
+      case 1:
+      {
+        motionData.LoadFacialAnimation(TEST_FACIAL_FILE_NAME, true);
+        break;
+      }
+      case 2:
+      {
+        std::string rawString = ReadBufferFromFile(TEST_BVH_FILE_NAME);
+        motionData.LoadBvhFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()), Vector3::ONE, true);
+        break;
+      }
+      case 3:
+      {
+        std::string rawString = ReadBufferFromFile(TEST_FACIAL_FILE_NAME);
+        motionData.LoadFacialAnimationFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()), true);
+        break;
+      }
+    }
+
+    // Check LoadCompletedSignal emitted.
+    DALI_TEST_EQUALS(gLoadCompleted, true, TEST_LOCATION);
+
+    // Check MotionData load successfully.
+    DALI_TEST_GREATER(motionData.GetMotionCount(), 0u, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataLoadAsyncMultiple(void)
+{
+  ToolkitTestApplication application;
+
+  MotionData motionData = MotionData::New();
+  gLoadCompleted        = false;
+  motionData.LoadCompletedSignal().Connect(&OnLoadCompleted);
+
+  auto tryCount = 10u;
+  for(auto i = 0u; i < tryCount; ++i)
+  {
+    motionData.LoadBvh(TEST_BVH_FILE_NAME);
+  }
+
+  DALI_TEST_EQUALS(gLoadCompleted, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gLoadCompleted, true, TEST_LOCATION);
+
+  // Check MotionData load successfully.
+  DALI_TEST_GREATER(motionData.GetMotionCount(), 0u, TEST_LOCATION);
+
+  gLoadCompleted = false;
+
+  // Check if completed request comes only 1 time.
+  Test::WaitForEventThreadTrigger(1, 1);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gLoadCompleted, false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataLoadBvhUseRootTranslationOnly(void)
+{
+  ToolkitTestApplication application;
+
+  MotionData motionDataAllTranslation = MotionData::New();
+  motionDataAllTranslation.LoadBvh(TEST_BVH_FILE_NAME, false, Vector3::ONE, true);
+
+  DALI_TEST_EQUALS(motionDataAllTranslation.GetMotionCount(), 4, TEST_LOCATION);  
+
+  MotionData motionDataOnlyRootTranslation = MotionData::New();
+  motionDataOnlyRootTranslation.LoadBvh(TEST_BVH_FILE_NAME, true, Vector3::ONE, true);
+
+  DALI_TEST_EQUALS(motionDataOnlyRootTranslation.GetMotionCount(), 3, TEST_LOCATION);  
+
+  END_TEST;
+}
+
+int UtcDaliMotionDataLoadBvhFromBufferUseRootTranslationOnly(void)
+{
+  ToolkitTestApplication application;
+
+  std::string rawString = ReadBufferFromFile(TEST_BVH_FILE_NAME);
+
+  MotionData motionDataAllTranslation = MotionData::New();
+  motionDataAllTranslation.LoadBvhFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()), false, Vector3::ONE, true);
+
+  DALI_TEST_EQUALS(motionDataAllTranslation.GetMotionCount(), 4, TEST_LOCATION);  
+
+  MotionData motionDataOnlyRootTranslation = MotionData::New();
+  motionDataOnlyRootTranslation.LoadBvhFromBuffer(reinterpret_cast<uint8_t*>(rawString.data()), static_cast<int>(rawString.length()), true, Vector3::ONE, true);
+
+  DALI_TEST_EQUALS(motionDataOnlyRootTranslation.GetMotionCount(), 3, TEST_LOCATION);  
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-MotionIndex.cpp b/automated-tests/src/dali-scene3d/utc-Dali-MotionIndex.cpp
new file mode 100644
index 0000000..1e28a46
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-MotionIndex.cpp
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D;
+
+void model_motion_motion_index_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_motion_motion_index_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+} // namespace
+
+// Positive test case for a method
+int UtcDaliMotionIndexDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionIndexDownCast");
+
+  MotionIndex blendShapeIndex = BlendShapeIndex::New();
+  BaseHandle  handle(blendShapeIndex);
+
+  MotionIndex blendShapeIndex2 = MotionIndex::DownCast(handle);
+  DALI_TEST_CHECK(blendShapeIndex);
+  DALI_TEST_CHECK(blendShapeIndex2);
+  DALI_TEST_CHECK(blendShapeIndex2 == blendShapeIndex);
+  END_TEST;
+}
+
+int UtcDaliMotionIndexDownCastNotMatchedType(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionIndexDownCastNotMatchedType");
+
+  {
+    MotionIndex baseIndex = BlendShapeIndex::New();
+    DALI_TEST_CHECK(baseIndex);
+
+    BaseHandle handle(baseIndex);
+
+    MotionIndex motionPropertyIndex = MotionPropertyIndex::DownCast(handle);
+    DALI_TEST_CHECK(!motionPropertyIndex);
+
+    MotionIndex motionTransformIndex = MotionTransformIndex::DownCast(handle);
+    DALI_TEST_CHECK(!motionTransformIndex);
+
+    MotionIndex blendShapeIndex = BlendShapeIndex::DownCast(handle);
+    DALI_TEST_CHECK(blendShapeIndex);
+    DALI_TEST_CHECK(blendShapeIndex == baseIndex);
+  }
+  END_TEST;
+}
+
+int UtcDaliMotionIndexCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionIndex blendShapeIndex = BlendShapeIndex::New();
+  DALI_TEST_CHECK(blendShapeIndex);
+
+  MotionIndex copy(blendShapeIndex);
+  DALI_TEST_CHECK(blendShapeIndex == copy);
+
+  MotionIndex assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == blendShapeIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionIndexMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  MotionIndex blendShapeIndex = MotionTransformIndex::New();
+  DALI_TEST_EQUALS(1, blendShapeIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionIndex moved = std::move(blendShapeIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!blendShapeIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionIndexMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionIndex blendShapeIndex = BlendShapeIndex::New();
+  DALI_TEST_EQUALS(1, blendShapeIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionIndex moved;
+  moved = std::move(blendShapeIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+
+int UtcDaliMotionIndexSetGetModelNodeId(void)
+{
+  std::string expectModelNodeStringId = "nodeId";
+  MotionIndex index                   = MotionTransformIndex::New(expectModelNodeStringId, MotionTransformIndex::TransformType::POSITION);
+
+  auto propertyKey = index.GetModelNodeId();
+  DALI_TEST_CHECK(propertyKey.type == Property::Key::Type::STRING);
+  DALI_TEST_EQUALS(expectModelNodeStringId, propertyKey.stringKey, TEST_LOCATION);
+
+  expectModelNodeStringId = "anotherId";
+  index.SetModelNodeId(expectModelNodeStringId);
+
+  propertyKey = index.GetModelNodeId();
+  DALI_TEST_CHECK(propertyKey.type == Property::Key::Type::STRING);
+  DALI_TEST_EQUALS(expectModelNodeStringId, propertyKey.stringKey, TEST_LOCATION);
+
+  Property::Index expectModelNodeIndexId = 193u;
+  index.SetModelNodeId(expectModelNodeIndexId);
+
+  propertyKey = index.GetModelNodeId();
+  DALI_TEST_CHECK(propertyKey.type == Property::Key::Type::INDEX);
+  DALI_TEST_EQUALS(expectModelNodeIndexId, propertyKey.indexKey, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-MotionPropertyIndex.cpp b/automated-tests/src/dali-scene3d/utc-Dali-MotionPropertyIndex.cpp
new file mode 100644
index 0000000..d0aa20d
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-MotionPropertyIndex.cpp
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D;
+
+void model_motion_motion_property_index_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_motion_motion_property_index_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+} // namespace
+
+// Positive test case for a method
+int UtcDaliMotionPropertyIndexNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionPropertyIndexNew");
+
+  MotionPropertyIndex motionPropertyIndex = MotionPropertyIndex::New();
+  DALI_TEST_CHECK(motionPropertyIndex);
+  DALI_TEST_EQUALS(motionPropertyIndex.GetModelNodeId().stringKey, "", TEST_LOCATION);
+  DALI_TEST_EQUALS(motionPropertyIndex.GetPropertyId().indexKey, Property::INVALID_INDEX, TEST_LOCATION);
+
+  motionPropertyIndex = MotionPropertyIndex::New("dummy", 3u);
+  DALI_TEST_CHECK(motionPropertyIndex);
+  DALI_TEST_EQUALS(motionPropertyIndex.GetModelNodeId().stringKey, "dummy", TEST_LOCATION);
+  DALI_TEST_EQUALS(motionPropertyIndex.GetPropertyId().indexKey, 3u, TEST_LOCATION);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliMotionPropertyIndexDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionPropertyIndexDownCast");
+
+  MotionPropertyIndex motionPropertyIndex = MotionPropertyIndex::New();
+  BaseHandle          handle(motionPropertyIndex);
+
+  MotionPropertyIndex motionPropertyIndex2 = MotionPropertyIndex::DownCast(handle);
+  DALI_TEST_CHECK(motionPropertyIndex);
+  DALI_TEST_CHECK(motionPropertyIndex2);
+  DALI_TEST_CHECK(motionPropertyIndex2 == motionPropertyIndex);
+  END_TEST;
+}
+
+int UtcDaliMotionPropertyIndexTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("MotionPropertyIndex");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  MotionPropertyIndex motionPropertyIndex = MotionPropertyIndex::DownCast(handle);
+  DALI_TEST_CHECK(motionPropertyIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionPropertyIndexCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionPropertyIndex motionPropertyIndex = MotionPropertyIndex::New();
+  DALI_TEST_CHECK(motionPropertyIndex);
+
+  MotionPropertyIndex copy(motionPropertyIndex);
+  DALI_TEST_CHECK(motionPropertyIndex == copy);
+
+  MotionPropertyIndex assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == motionPropertyIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionPropertyIndexMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  MotionPropertyIndex motionPropertyIndex = MotionPropertyIndex::New();
+  DALI_TEST_EQUALS(1, motionPropertyIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionPropertyIndex moved = std::move(motionPropertyIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!motionPropertyIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionPropertyIndexMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionPropertyIndex motionPropertyIndex = MotionPropertyIndex::New();
+  DALI_TEST_EQUALS(1, motionPropertyIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionPropertyIndex moved;
+  moved = std::move(motionPropertyIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+
+int UtcDaliMotionPropertyIndexGetPropertyName(void)
+{
+  std::string     expectPropertyName  = "";
+  Property::Index expectPropertyIndex = Property::INVALID_INDEX;
+
+  MotionIndex index = MotionPropertyIndex::New();
+
+  // Invalid motion index return empty string, invalid index
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyIndex(), TEST_LOCATION);
+
+  expectPropertyIndex = 0u;
+  index               = MotionPropertyIndex::New("", expectPropertyIndex);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyIndex(), TEST_LOCATION);
+
+  expectPropertyIndex = 45u;
+  index               = MotionPropertyIndex::New("", expectPropertyIndex);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyIndex(), TEST_LOCATION);
+
+  expectPropertyName = "name";
+  index              = MotionPropertyIndex::New("", expectPropertyName);
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliMotionPropertyIndexSetGetPropertyId(void)
+{
+  Property::Index expectPropertyIndex = 0u;
+
+  MotionPropertyIndex index = MotionPropertyIndex::New("", expectPropertyIndex);
+
+  // Invalid motion index return empty string, invalid index
+  DALI_TEST_CHECK(index.GetPropertyId().type == Property::Key::Type::INDEX);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyId().indexKey, TEST_LOCATION);
+
+  std::string expectPropertyName = "hello";
+  index.SetPropertyId(expectPropertyName);
+  DALI_TEST_CHECK(index.GetPropertyId().type == Property::Key::Type::STRING);
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyId().stringKey, TEST_LOCATION);
+
+  expectPropertyIndex = 100u;
+  index.SetPropertyId(expectPropertyIndex);
+  DALI_TEST_CHECK(index.GetPropertyId().type == Property::Key::Type::INDEX);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyId().indexKey, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-MotionTransformIndex.cpp b/automated-tests/src/dali-scene3d/utc-Dali-MotionTransformIndex.cpp
new file mode 100644
index 0000000..0dd0814
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-MotionTransformIndex.cpp
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D;
+
+void model_motion_motion_transform_index_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_motion_motion_transform_index_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+struct PropertyStringIndex
+{
+  const MotionTransformIndex::TransformType type;
+
+  const char* const     name;
+  const Property::Index index;
+};
+const PropertyStringIndex PROPERTY_TABLE[] =
+  {
+    {MotionTransformIndex::TransformType::POSITION, "position", Actor::Property::POSITION},
+    {MotionTransformIndex::TransformType::POSITION_X, "positionX", Actor::Property::POSITION_X},
+    {MotionTransformIndex::TransformType::POSITION_Y, "positionY", Actor::Property::POSITION_Y},
+    {MotionTransformIndex::TransformType::POSITION_Z, "positionZ", Actor::Property::POSITION_Z},
+    {MotionTransformIndex::TransformType::ORIENTATION, "orientation", Actor::Property::ORIENTATION},
+    {MotionTransformIndex::TransformType::SCALE, "scale", Actor::Property::SCALE},
+    {MotionTransformIndex::TransformType::SCALE_X, "scaleX", Actor::Property::SCALE_X},
+    {MotionTransformIndex::TransformType::SCALE_Y, "scaleY", Actor::Property::SCALE_Y},
+    {MotionTransformIndex::TransformType::SCALE_Z, "scaleZ", Actor::Property::SCALE_Z},
+};
+} // namespace
+
+// Positive test case for a method
+int UtcDaliMotionTransformIndexNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionTransformIndexNew");
+
+  MotionTransformIndex motionTransformIndex = MotionTransformIndex::New();
+  DALI_TEST_CHECK(motionTransformIndex);
+  DALI_TEST_EQUALS(motionTransformIndex.GetModelNodeId().stringKey, "", TEST_LOCATION);
+  DALI_TEST_EQUALS(motionTransformIndex.GetTransformType(), MotionTransformIndex::TransformType::INVALID, TEST_LOCATION);
+
+  motionTransformIndex = MotionTransformIndex::New("dummy", MotionTransformIndex::TransformType::SCALE);
+  DALI_TEST_CHECK(motionTransformIndex);
+  DALI_TEST_EQUALS(motionTransformIndex.GetModelNodeId().stringKey, "dummy", TEST_LOCATION);
+  DALI_TEST_EQUALS(motionTransformIndex.GetTransformType(), MotionTransformIndex::TransformType::SCALE, TEST_LOCATION);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliMotionTransformIndexDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionTransformIndexDownCast");
+
+  MotionTransformIndex motionTransformIndex = MotionTransformIndex::New();
+  BaseHandle           handle(motionTransformIndex);
+
+  MotionTransformIndex motionTransformIndex2 = MotionTransformIndex::DownCast(handle);
+  DALI_TEST_CHECK(motionTransformIndex);
+  DALI_TEST_CHECK(motionTransformIndex2);
+  DALI_TEST_CHECK(motionTransformIndex2 == motionTransformIndex);
+  END_TEST;
+}
+
+int UtcDaliMotionTransformIndexTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("MotionTransformIndex");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  MotionTransformIndex motionTransformIndex = MotionTransformIndex::DownCast(handle);
+  DALI_TEST_CHECK(motionTransformIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionTransformIndexCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionTransformIndex motionTransformIndex = MotionTransformIndex::New();
+  DALI_TEST_CHECK(motionTransformIndex);
+
+  MotionTransformIndex copy(motionTransformIndex);
+  DALI_TEST_CHECK(motionTransformIndex == copy);
+
+  MotionTransformIndex assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == motionTransformIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionTransformIndexMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  MotionTransformIndex motionTransformIndex = MotionTransformIndex::New();
+  DALI_TEST_EQUALS(1, motionTransformIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionTransformIndex moved = std::move(motionTransformIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!motionTransformIndex);
+
+  END_TEST;
+}
+
+int UtcDaliMotionTransformIndexMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionTransformIndex motionTransformIndex = MotionTransformIndex::New();
+  DALI_TEST_EQUALS(1, motionTransformIndex.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  MotionTransformIndex moved;
+  moved = std::move(motionTransformIndex);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Method test
+
+int UtcDaliMotionTransformIndexGetPropertyNameAndIndex(void)
+{
+  auto transfromTypeCount = sizeof(PROPERTY_TABLE) / sizeof(PROPERTY_TABLE[0]);
+  for(auto i = 0u; i < transfromTypeCount; i++)
+  {
+    auto type = PROPERTY_TABLE[i].type;
+
+    std::string     expectPropertyName  = PROPERTY_TABLE[i].name;
+    Property::Index expectPropertyIndex = PROPERTY_TABLE[i].index;
+
+    MotionIndex index = MotionTransformIndex::New("", type);
+
+    DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+    DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyIndex(), TEST_LOCATION);
+  }
+  END_TEST;
+}
+
+int UtcDaliMotionTransformIndexGetPropertyInvalid(void)
+{
+  std::string     expectPropertyName  = "";
+  Property::Index expectPropertyIndex = Property::INVALID_INDEX;
+
+  MotionIndex index = MotionTransformIndex::New();
+
+  // Invalid motion index return empty string, invalid index
+  DALI_TEST_EQUALS(expectPropertyName, index.GetPropertyName(), TEST_LOCATION);
+  DALI_TEST_EQUALS(expectPropertyIndex, index.GetPropertyIndex(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliMotionTransformIndexSetGetPropertType(void)
+{
+  auto                 expectType = MotionTransformIndex::TransformType::POSITION;
+  MotionTransformIndex index      = MotionTransformIndex::New("", expectType);
+
+  // Invalid motion index return empty string, invalid index
+  DALI_TEST_EQUALS(expectType, index.GetTransformType(), TEST_LOCATION);
+
+  expectType = MotionTransformIndex::TransformType::ORIENTATION;
+  index.SetTransformType(expectType);
+  DALI_TEST_EQUALS(expectType, index.GetTransformType(), TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-MotionValue.cpp b/automated-tests/src/dali-scene3d/utc-Dali-MotionValue.cpp
new file mode 100644
index 0000000..79b6fea
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-MotionValue.cpp
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/model-motion/motion-value.h>
+#include <dali/devel-api/animation/key-frames-devel.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+using namespace Dali::Scene3D;
+
+void model_motion_motion_value_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void model_motion_motion_value_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+} // namespace
+
+// Positive test case for a method
+int UtcDaliMotionValueNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionValueNew");
+
+  MotionValue motionValue = MotionValue::New();
+  DALI_TEST_CHECK(motionValue);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliMotionValueDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliMotionValueDownCast");
+
+  MotionValue motionValue = MotionValue::New();
+  BaseHandle  handle(motionValue);
+
+  MotionValue motionValue2 = MotionValue::DownCast(handle);
+  DALI_TEST_CHECK(motionValue);
+  DALI_TEST_CHECK(motionValue2);
+  DALI_TEST_CHECK(motionValue2 == motionValue);
+  END_TEST;
+}
+
+int UtcDaliMotionValueTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("MotionValue");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  MotionValue motionValue = MotionValue::DownCast(handle);
+  DALI_TEST_CHECK(motionValue);
+
+  END_TEST;
+}
+
+int UtcDaliMotionValueCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionValue motionValue = MotionValue::New(1);
+  DALI_TEST_CHECK(motionValue);
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::PROPERTY_VALUE);
+
+  MotionValue copy(motionValue);
+  DALI_TEST_CHECK(motionValue == copy);
+  DALI_TEST_CHECK(copy.GetValueType() == MotionValue::ValueType::PROPERTY_VALUE);
+
+  MotionValue assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == motionValue);
+  DALI_TEST_CHECK(assign.GetValueType() == MotionValue::ValueType::PROPERTY_VALUE);
+
+  END_TEST;
+}
+
+int UtcDaliMotionValueMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  MotionValue motionValue = MotionValue::New(3.0f);
+  DALI_TEST_EQUALS(1, motionValue.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::PROPERTY_VALUE);
+
+  MotionValue moved = std::move(motionValue);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetValueType() == MotionValue::ValueType::PROPERTY_VALUE);
+  DALI_TEST_CHECK(!motionValue);
+
+  END_TEST;
+}
+
+int UtcDaliMotionValueMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  MotionValue motionValue = MotionValue::New(KeyFrames::New());
+  DALI_TEST_EQUALS(1, motionValue.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::KEY_FRAMES);
+
+  MotionValue moved;
+  moved = std::move(motionValue);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetValueType() == MotionValue::ValueType::KEY_FRAMES);
+
+  END_TEST;
+}
+
+// Method test
+
+int UtcDaliMotionValueGetSetValue(void)
+{
+  ToolkitTestApplication application;
+
+  MotionValue motionValue = MotionValue::New();
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::INVALID);
+  DALI_TEST_CHECK(motionValue.GetPropertyValue().GetType() == Property::Type::NONE);
+  DALI_TEST_CHECK(!motionValue.GetKeyFrames());
+
+  float expectValue = 3.0f;
+  motionValue.SetValue(expectValue);
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::PROPERTY_VALUE);
+  DALI_TEST_CHECK(motionValue.GetPropertyValue().GetType() == Property::Type::FLOAT);
+  DALI_TEST_CHECK(motionValue.GetPropertyValue().Get<float>() == expectValue);
+
+  // Check the converted KeyFrames
+  auto convertedKeyFrames = motionValue.GetKeyFrames();
+  DALI_TEST_CHECK(convertedKeyFrames);
+  auto convertedKeyFrameCount = DevelKeyFrames::GetKeyFrameCount(convertedKeyFrames);
+  for(auto i = 0u; i < convertedKeyFrameCount; ++i)
+  {
+    float           progress;
+    Property::Value value;
+    DevelKeyFrames::GetKeyFrame(convertedKeyFrames, i, progress, value);
+
+    // Check all value has same as expect property.
+    DALI_TEST_EQUALS(value.Get<float>(), expectValue, TEST_LOCATION);
+  }
+
+  KeyFrames expectKeyFrames = KeyFrames::New();
+  expectValue               = 2.0f;
+  expectKeyFrames.Add(0.0f, expectValue - 1.0f);
+  expectKeyFrames.Add(1.0f, expectValue);
+  motionValue.SetValue(expectKeyFrames);
+
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::KEY_FRAMES);
+  DALI_TEST_CHECK(motionValue.GetKeyFrames() == expectKeyFrames);
+
+  // Check property value return last frame value.
+  DALI_TEST_CHECK(motionValue.GetPropertyValue().GetType() == Property::Type::FLOAT);
+  DALI_TEST_EQUALS(motionValue.GetPropertyValue().Get<float>(), expectValue, TEST_LOCATION);
+
+  // Check invalidate value.
+  motionValue.Invalidate();
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::INVALID);
+  DALI_TEST_CHECK(motionValue.GetPropertyValue().GetType() == Property::Type::NONE);
+  DALI_TEST_CHECK(!motionValue.GetKeyFrames());
+
+  motionValue.SetValue(expectKeyFrames);
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::KEY_FRAMES);
+  DALI_TEST_CHECK(motionValue.GetKeyFrames() == expectKeyFrames);
+
+  // Check invalidate value by Clear().
+  motionValue.Clear();
+  DALI_TEST_CHECK(motionValue.GetValueType() == MotionValue::ValueType::INVALID);
+  DALI_TEST_CHECK(motionValue.GetPropertyValue().GetType() == Property::Type::NONE);
+  DALI_TEST_CHECK(!motionValue.GetKeyFrames());
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-NavigationMesh.cpp b/automated-tests/src/dali-scene3d/utc-Dali-NavigationMesh.cpp
new file mode 100644
index 0000000..b2ccb7f
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-NavigationMesh.cpp
@@ -0,0 +1,855 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali/devel-api/actors/camera-actor-devel.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <dlfcn.h>
+#include "dali-scene3d/public-api/algorithm/navigation-mesh.h"
+#include "dali-scene3d/public-api/loader/navigation-mesh-factory.h"
+
+// include collider mesh data
+#include "collider-mesh-data.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Algorithm;
+using namespace Dali::Scene3D::Loader;
+
+/**
+ * SysOverride allows overriding a system symbol and
+ * set the return value for n-th call of it.
+ *
+ * After invoking the symbol override is disabled.
+ */
+template<class R, class F>
+struct SysOverride
+{
+  SysOverride(const char* funcName)
+  {
+    funcNameStr = funcName;
+    if(!func)
+    {
+      func = decltype(func)(dlsym(RTLD_NEXT, funcName));
+    }
+  }
+
+  void SetReturnValue(R value, uint32_t n)
+  {
+    if(overrideEnabled)
+    {
+      tet_infoline("Warning! Overriding return value is already enabled! Ignoring!\n");
+      return;
+    }
+    result          = value;
+    overrideCounter = n;
+    overrideEnabled = true;
+  }
+
+  template<class... Args>
+  R Invoke(Args&&... args)
+  {
+    auto retval = func(args...);
+    if(overrideEnabled)
+    {
+      if(!overrideCounter)
+      {
+        overrideEnabled = false;
+        return result;
+      }
+      overrideCounter--;
+    }
+    return retval;
+  }
+
+  std::string funcNameStr;
+  R           result{R{}};
+  F*          func{nullptr};
+  uint32_t    overrideCounter = 0;
+  bool        overrideEnabled = false;
+};
+
+// Override fseek()
+static thread_local SysOverride<int, decltype(fseek)> call_fseek("fseek");
+extern "C" int                                        fseek(FILE* s, long int o, int w)
+{
+  return call_fseek.Invoke(s, o, w);
+}
+
+// Override ftell()
+static thread_local SysOverride<int, decltype(ftell)> call_ftell("ftell");
+extern "C" long int                                   ftell(FILE* s)
+{
+  return call_ftell.Invoke(s);
+}
+
+// Override fread()
+static thread_local SysOverride<int, decltype(fread)> call_fread("fread");
+extern "C" size_t                                     fread(void* __restrict p, size_t s, size_t n, FILE* __restrict st)
+{
+  return call_fread.Invoke(p, s, n, st);
+}
+
+// Data to test factory
+static std::vector<Dali::Vector3> COLLIDER_0_VERTS = {
+  Dali::Vector3(-1.000000, -1.556106, 0.000000),
+  Dali::Vector3(1.000000, -1.556106, 0.000000),
+  Dali::Vector3(-1.000000, 1.000000, 0.000000),
+  Dali::Vector3(1.000000, 1.000000, 0.000000),
+  Dali::Vector3(3.026269, -1.556106, 0.000000),
+  Dali::Vector3(3.026269, 1.000000, 0.000000),
+  Dali::Vector3(-1.000000, 2.491248, 0.000000),
+  Dali::Vector3(1.000000, 2.491248, 0.000000),
+};
+static std::vector<uint32_t> COLLIDER_0_IDX = {
+  1,
+  2,
+  0,
+  1,
+  5,
+  3,
+  3,
+  6,
+  2,
+  1,
+  3,
+  2,
+  1,
+  4,
+  5,
+  3,
+  7,
+  6,
+};
+static std::vector<Dali::Vector3> COLLIDER_1_VERTS = {
+  Dali::Vector3(-1.000000, -3.386207, 0.000000),
+  Dali::Vector3(1.000000, -3.386207, 0.000000),
+  Dali::Vector3(-1.000000, 1.000000, 0.000000),
+  Dali::Vector3(1.000000, 1.000000, 0.000000),
+  Dali::Vector3(-3.393266, -3.386207, 0.000000),
+  Dali::Vector3(-3.393266, 1.000000, 0.000000),
+};
+static std::vector<uint32_t> COLLIDER_1_IDX = {
+  1,
+  2,
+  0,
+  2,
+  4,
+  0,
+  1,
+  3,
+  2,
+  2,
+  5,
+  4,
+};
+static std::vector<Dali::Vector3> COLLIDER_2_VERTS = {
+  Dali::Vector3(-3.393266, -1.000000, 0.000000),
+  Dali::Vector3(1.000000, -1.000000, 0.000000),
+  Dali::Vector3(-3.393266, 0.491248, 0.000000),
+  Dali::Vector3(1.000000, 0.491248, 0.000000),
+};
+static std::vector<uint32_t> COLLIDER_2_IDX = {
+  1,
+  2,
+  0,
+  1,
+  3,
+  2,
+};
+
+Integration::TouchEvent GenerateSingleTouch(PointState::Type state, const Vector2& screenPosition)
+{
+  Integration::TouchEvent touchEvent;
+  Integration::Point      point;
+  point.SetState(state);
+  point.SetScreenPosition(screenPosition);
+  point.SetDeviceClass(Device::Class::TOUCH);
+  point.SetDeviceSubclass(Device::Subclass::NONE);
+  touchEvent.points.push_back(point);
+  return touchEvent;
+}
+
+int UtcDaliNavigationMeshCreateFromFileFail1(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromFileFail1: Fails to create navigation mesh from file");
+
+  // No such file, misspelled name
+  auto result = NavigationMeshFactory::CreateFromFile("notexisting.bin");
+
+  DALI_TEST_CHECK(result == nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromFileFail2(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromFileFail2: Fails to create navigation mesh using file");
+
+  // Override next fseek to fail
+  call_fseek.SetReturnValue(-1, 0);
+  auto result = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(result == nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromFileFail3(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromFileFail3: Fails to create navigation mesh using file");
+
+  // Override next ftell to fail
+  call_ftell.SetReturnValue(-1, 0);
+  auto result = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(result == nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromFileFail4(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromFileFail4: Fails to create navigation mesh using file");
+
+  // Override 2nd fseek to fail
+  call_fseek.SetReturnValue(-1, 1);
+  auto result = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(result == nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromFileFail5(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromFileFail5: Fails to create navigation mesh using file");
+
+  // Override fread() to fail reading file
+  call_fread.SetReturnValue(-1, 0);
+  auto result = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(result == nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromFileOk1(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromFileOk1: Creates navigation mesh using file");
+
+  auto result = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(result != nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromBufferP(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromBufferP: Creates navigation mesh using binary buffer");
+
+  auto                  fin    = fopen("resources/navmesh-test.bin", "rb");
+  [[maybe_unused]] auto err    = fseek(fin, 0, SEEK_END);
+  auto                  length = ftell(fin);
+  fseek(fin, 0, SEEK_SET);
+  std::vector<uint8_t> buffer;
+  buffer.resize(length);
+  fread(buffer.data(), 1, length, fin);
+  fclose(fin);
+  auto result = NavigationMeshFactory::CreateFromBuffer(buffer);
+  DALI_TEST_CHECK(result != nullptr);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCountersP(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCountersP: Test vertex, edge and face counts");
+
+  auto result = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(result != nullptr);
+
+  auto vertexCount = result->GetVertexCount();
+  auto edgeCount   = result->GetEdgeCount();
+  auto faceCount   = result->GetFaceCount();
+
+  DALI_TEST_EQUALS(vertexCount, 132, TEST_LOCATION);
+  DALI_TEST_EQUALS(edgeCount, 300, TEST_LOCATION);
+  DALI_TEST_EQUALS(faceCount, 165, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshGetVertexP(void)
+{
+  tet_infoline("UtcDaliNavigationMeshGetVertexP: Test vertex getters");
+
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(navmesh != nullptr);
+
+  auto vertexCount = navmesh->GetVertexCount();
+
+  DALI_TEST_EQUALS(vertexCount, 132, TEST_LOCATION);
+
+  // List of coords, must be verified with Blender exporter
+  // clang-format off
+  std::vector<float> vertexData = {
+    -7.000000f, -3.000000f, 0.000000f, -4.018748f, 3.000000f, 0.000000f,
+    1.943754f, -1.500000f, 0.000000f, -2.541295f, -0.756627f, 0.000000f,
+    -0.277504f, -1.593252f, 0.000000f, 0.682341f, 2.316388f, 3.349901f,
+    1.912569f, 1.240314f, 2.549901f, 2.215021f, -0.365898f, 1.749901f,
+    1.460422f, -1.815717f, 0.949901f, -0.336699f, -2.992929f, 3.829999f,
+    -3.179410f, 0.153939f, 3.829999f, -3.664814f, 2.992929f, 3.829999f,
+    -1.384417f, 0.876845f, 3.829999f, -1.571236f, 1.101834f, 3.829999f
+  };
+  // clang-format on
+
+  auto j = 0;
+  for(auto i = 0u; i < 132; i += 10, j += 3)
+  {
+    const auto* vertex = navmesh->GetVertex(i);
+    Vector3     v0(vertex->coordinates);
+    Vector3     v1(vertexData[j], vertexData[j + 1], vertexData[j + 2]);
+    DALI_TEST_EQUALS(v0, v1, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshGetEdgeP(void)
+{
+  tet_infoline("UtcDaliNavigationMeshGetEdgeP: Test edge getters");
+
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(navmesh != nullptr);
+
+  auto edgeCount = navmesh->GetEdgeCount();
+
+  DALI_TEST_EQUALS(edgeCount, 300, TEST_LOCATION);
+
+  // List of coords, must be verified with Blender exporter
+  // clang-format off
+  std::vector<EdgeIndex> edgeData = {
+    2, 65535, 8, 1,
+    8, 109, 124, 108,
+    10, 158, 32, 35,
+    78, 65535, 50, 52,
+    54, 75, 70, 69,
+    83, 65535, 83, 81,
+    79, 65535, 86, 42,
+    140, 65535, 94, 115,
+    111, 112, 118, 111,
+    101, 143, 106, 127
+  };
+  // clang-format on
+  auto j = 0;
+  for(auto i = 0u; i < 300; i += 30, j += 4)
+  {
+    const auto* edge = navmesh->GetEdge(i);
+    auto        e0   = edge->face[0];
+    auto        e1   = edge->face[1];
+    auto        v0   = edge->vertex[0];
+    auto        v1   = edge->vertex[1];
+
+    DALI_TEST_EQUALS(e0, edgeData[j + 0], TEST_LOCATION);
+    DALI_TEST_EQUALS(e1, edgeData[j + 1], TEST_LOCATION);
+    DALI_TEST_EQUALS(v0, edgeData[j + 2], TEST_LOCATION);
+    DALI_TEST_EQUALS(v1, edgeData[j + 3], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshGetFaceP(void)
+{
+  tet_infoline("UtcDaliNavigationMeshGetFaceP: Test face getters");
+
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  DALI_TEST_CHECK(navmesh != nullptr);
+
+  auto faceCount = navmesh->GetFaceCount();
+
+  DALI_TEST_EQUALS(faceCount, 165, TEST_LOCATION);
+
+  // List of coords, must be verified with Blender exporter
+  // clang-format off
+
+  std::vector<NavigationMesh::Face> faceData = {
+    {{6, 10, 17}, {14, 32, 8}, {0.000000f, 0.000000f, 1.000000f}, {-3.024998f, 2.500000f, 0.000000f}},
+    {{130, 120, 44}, {228, 215, 33}, {0.000000f, 0.000000f, 1.000000f}, {-1.097451f, 1.192811f, 3.829999f}},
+    {{30, 9, 38}, {13, 291, 289}, {0.000000f, -0.000000f, 1.000000f}, {-3.029388f, -1.252209f, 0.000000f}},
+    {{55, 52, 53}, {140, 95, 96}, {0.522345f, -0.298279f, 0.798865f}, {0.743287f, 1.610713f, 3.136567f}},
+    {{69, 66, 67}, {91, 121, 122}, {0.071722f, -0.597219f, 0.798865f}, {1.632142f, 0.155658f, 2.016567f}},
+    {{41, 86, 87}, {81, 160, 80}, {-0.563316f, -0.210929f, 0.798864f}, {0.340215f, -1.799765f, 0.416567f}},
+    {{28, 19, 27}, {55, 74, 47}, {0.000000f, -0.000000f, 1.000000f}, {-0.640862f, -1.037395f, 0.000000f}},
+    {{118, 96, 111}, {213, 241, 240}, {0.000000f, 0.000000f, 1.000000f}, {-6.577459f, -0.586560f, 3.829999f}},
+    {{91, 107, 103}, {170, 258, 257}, {-0.021129f, 0.023143f, 0.999509f}, {-2.551766f, 1.007552f, 3.829145f}},
+    {{97, 120, 130}, {191, 228, 271}, {0.000000f, 0.000000f, 1.000000f}, {-1.795930f, 0.710873f, 3.829999f}},
+    {{30, 39, 31}, {290, 296, 295}, {0.000000f, 0.000000f, 1.000000f}, {-2.291577f, -0.509718f, 0.000000f}},
+  };
+  // clang-format on
+  auto j = 0;
+  for(auto i = 0u; i < 165; i += 16, j++)
+  {
+    const auto* face = navmesh->GetFace(i);
+    Vector3     n0(face->normal);
+    Vector3     c0(face->center);
+
+    Vector3 n1(faceData[j].normal);
+    Vector3 c1(faceData[j].center);
+
+    DALI_TEST_EQUALS(n0, n1, TEST_LOCATION);
+    DALI_TEST_EQUALS(c0, c1, TEST_LOCATION);
+
+    DALI_TEST_EQUALS(faceData[j].vertex[0], face->vertex[0], TEST_LOCATION);
+    DALI_TEST_EQUALS(faceData[j].vertex[1], face->vertex[1], TEST_LOCATION);
+    DALI_TEST_EQUALS(faceData[j].vertex[2], face->vertex[2], TEST_LOCATION);
+
+    DALI_TEST_EQUALS(faceData[j].edge[0], face->edge[0], TEST_LOCATION);
+    DALI_TEST_EQUALS(faceData[j].edge[1], face->edge[1], TEST_LOCATION);
+    DALI_TEST_EQUALS(faceData[j].edge[2], face->edge[2], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliNavigationGetGravityP(void)
+{
+  tet_infoline("UtcDaliNavigationGetGravityP: Tests gravity vector");
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+  auto gravity = navmesh->GetGravityVector();
+
+  // navmesh-test.bin is exported in Blender and the default gravity is Z = -1
+  Dali::Vector3 expectedGravity(0.0f, 0.0f, -1.0f);
+
+  DALI_TEST_EQUALS(gravity, expectedGravity, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationSetTransformP(void)
+{
+  tet_infoline("UtcDaliNavigationSetTransformP: Test setting transform");
+
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  Matrix matrix;
+  matrix.SetIdentity();
+  Quaternion q = Quaternion(Radian(Degree(-90)), Vector3(1.0, 0.0, 0.0));
+  Matrix     newMatrix;
+  matrix.Multiply(newMatrix, matrix, q); // Rotate matrix along X-axis
+
+  navmesh->SetSceneTransform(newMatrix);
+
+  auto point = Vector3(0, -1, 0);
+
+  [[maybe_unused]] Vector3 navMeshLocalSpace;
+  [[maybe_unused]] Vector3 navMeshParentSpace;
+  navMeshLocalSpace = navmesh->PointSceneToLocal(point);
+
+  // Should match gravity vector
+  auto gravityVector = navmesh->GetGravityVector();
+
+  // 'point' should be turned into the gravity vector after transforming into the local space
+  DALI_TEST_EQUALS(navMeshLocalSpace, gravityVector, std::numeric_limits<float>::epsilon(), TEST_LOCATION);
+
+  navMeshParentSpace = navmesh->PointLocalToScene(gravityVector);
+
+  // The gravity should be transformed back into point
+  DALI_TEST_EQUALS(navMeshParentSpace, point, std::numeric_limits<float>::epsilon(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliNavigationFindFloor0P(void)
+{
+  tet_infoline("UtcDaliNavigationFindFloor0P: Finds floor with result");
+
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  // All calculations in the navmesh local space
+  navmesh->SetSceneTransform(Matrix(Matrix::IDENTITY));
+
+  std::vector<Vector3>   inPositions;
+  std::vector<Vector3>   expectedPositions;
+  std::vector<FaceIndex> expectedFaceIndex;
+  std::vector<bool>      expectedResult;
+
+  // Lift slightly over the floor level
+  auto upFromGravity = navmesh->GetGravityVector() * (0.05f);
+
+  auto size = navmesh->GetFaceCount();
+  for(auto i = 0u; i < size; ++i)
+  {
+    const auto* face = navmesh->GetFace(i);
+    Vector3(face->center);
+    inPositions.emplace_back(Vector3(face->center));
+    inPositions.back() -= Vector3(upFromGravity);
+    expectedResult.emplace_back(true);
+
+    expectedPositions.emplace_back(face->center);
+    expectedFaceIndex.emplace_back(i);
+  }
+
+  // Add negative results
+  // Middle 'circle' of scene
+  inPositions.emplace_back(Vector3(-0.048838f, 0.039285f, 0.013085f));
+  expectedPositions.emplace_back();
+  expectedFaceIndex.emplace_back(NavigationMesh::NULL_FACE);
+  expectedResult.emplace_back(false);
+
+  // Triangle under stairs
+  inPositions.emplace_back(Vector3(0.44365f, -1.787f, 0.13085f));
+  expectedPositions.emplace_back();
+  expectedFaceIndex.emplace_back(NavigationMesh::NULL_FACE);
+  expectedResult.emplace_back(false);
+
+  // Outside area
+  inPositions.emplace_back(Vector3(0.77197f, -3.8596f, 0.13085f));
+  expectedPositions.emplace_back();
+  expectedFaceIndex.emplace_back(NavigationMesh::NULL_FACE);
+  expectedResult.emplace_back(false);
+
+  for(auto i = 0u; i < inPositions.size(); ++i)
+  {
+    Vector3   outPosition;
+    FaceIndex faceIndex{NavigationMesh::NULL_FACE};
+    auto      result = navmesh->FindFloor(inPositions[i], outPosition, faceIndex);
+    DALI_TEST_EQUALS(bool(result), bool(expectedResult[i]), TEST_LOCATION);
+    DALI_TEST_EQUALS(faceIndex, expectedFaceIndex[i], TEST_LOCATION);
+    DALI_TEST_EQUALS(outPosition, expectedPositions[i], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliNavigationFindFloorForFace1P(void)
+{
+  tet_infoline("UtcDaliNavigationFindFloorForFace1P: Finds floor for selected face");
+
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  // All calculations in the navmesh local space
+  navmesh->SetSceneTransform(Matrix(Matrix::IDENTITY));
+
+  {
+    auto faceIndex           = FaceIndex(0u);
+    auto position            = Vector3(0, 0, 0);
+    auto dontCheckNeighbours = true;
+    auto outPosition         = Vector3();
+    auto expectedPosition    = Vector3();
+    bool result              = false;
+
+    {
+      // test 1. position lies within selected triangle
+      faceIndex           = 137;
+      position            = Vector3(-6.0767f, -1.7268f, 4.287f);
+      expectedPosition    = Vector3(-6.0767f, -1.7268f, 3.83f);
+      dontCheckNeighbours = true;
+      result              = navmesh->FindFloorForFace(position, faceIndex, dontCheckNeighbours, outPosition);
+
+      DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+      DALI_TEST_EQUALS(outPosition, expectedPosition, TEST_LOCATION);
+    }
+
+    {
+      // test 2. position lies outside selected triangle, not checking neighbours
+      faceIndex           = 137;
+      position            = Vector3(-5.3073f, -0.6023f, 4.287f);
+      expectedPosition    = Vector3::ZERO;
+      outPosition         = Vector3::ZERO;
+      dontCheckNeighbours = true;
+      result              = navmesh->FindFloorForFace(position, faceIndex, dontCheckNeighbours, outPosition);
+
+      DALI_TEST_EQUALS(result, false, TEST_LOCATION);
+      DALI_TEST_EQUALS(outPosition, expectedPosition, TEST_LOCATION);
+    }
+
+    {
+      // test 3. position lies outside selected triangle but this time checking neighbours
+      faceIndex           = 137;
+      position            = Vector3(-5.3073f, -0.6023f, 4.287f);
+      expectedPosition    = Vector3(-5.3073, -0.6023, 3.83);
+      outPosition         = Vector3::ZERO;
+      dontCheckNeighbours = false;
+      result              = navmesh->FindFloorForFace(position, faceIndex, dontCheckNeighbours, outPosition);
+
+      DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+      DALI_TEST_EQUALS(outPosition, expectedPosition, TEST_LOCATION);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliNavigationFindFloorForFace2P(void)
+{
+  tet_infoline("UtcDaliNavigationFindFloorForFace2P: Finds floor for selected face");
+
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  // All calculations in the navmesh local space
+  navmesh->SetSceneTransform(Matrix(Matrix::IDENTITY));
+
+  {
+    [[maybe_unused]] auto faceIndex           = 0u;
+    auto                  position            = Vector3(0, 0, 0);
+    auto                  dontCheckNeighbours = true;
+    auto                  outPosition         = Vector3();
+    auto                  expectedPosition    = Vector3();
+    bool                  result              = false;
+
+    {
+      // test 4. position lies within a triangle but this time full search forced,
+      // the navmesh must have no previous searches (mCurrentFace shouldn't be set)
+      faceIndex           = 137;
+      position            = Vector3(-6.0767f, -1.7268f, 4.287f);
+      expectedPosition    = Vector3(-6.0767f, -1.7268f, 3.83f);
+      dontCheckNeighbours = true;
+      result              = navmesh->FindFloorForFace(position, NavigationMesh::NULL_FACE, dontCheckNeighbours, outPosition);
+
+      DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+      DALI_TEST_EQUALS(outPosition, expectedPosition, TEST_LOCATION);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromVerticesAndFaces(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromVerticesAndFaces: Creates NavigationMesh using vertices and faces");
+
+  auto buffer0 = COLLIDER_BUFFER(0);
+
+  // All calculations in the navmesh local space
+  auto fn = [&](const auto& vertices, const auto& normals, const auto& indices) {
+    auto navmesh = NavigationMeshFactory::CreateFromVertexFaceList(vertices, normals, indices);
+    navmesh->SetSceneTransform(Matrix(Matrix::IDENTITY));
+    DALI_TEST_EQUALS(navmesh->GetVertexCount(), vertices.size(), TEST_LOCATION);
+    DALI_TEST_EQUALS(navmesh->GetFaceCount(), indices.size() / 3, TEST_LOCATION);
+    DALI_TEST_EQUALS(navmesh->GetEdgeCount(), indices.size(), TEST_LOCATION);
+
+    // compare data
+    for(auto i = 0u; i < navmesh->GetVertexCount(); ++i)
+    {
+      Dali::Vector3 v(navmesh->GetVertex(i)->coordinates);
+      DALI_TEST_EQUALS(vertices[i], v, TEST_LOCATION);
+    }
+
+    for(auto i = 0u; i < navmesh->GetFaceCount() * 3; i += 3)
+    {
+      const auto& v = navmesh->GetFace(i / 3)->vertex;
+      DALI_TEST_EQUALS(indices[i], v[0], TEST_LOCATION);
+      DALI_TEST_EQUALS(indices[i + 1], v[1], TEST_LOCATION);
+      DALI_TEST_EQUALS(indices[i + 2], v[2], TEST_LOCATION);
+    }
+  };
+
+  std::vector<Vector3> normals;
+  normals.resize(COLLIDER_0_VERTS.size());
+  std::fill(normals.begin(), normals.end(), Vector3(0.0, 1.0, 0.0));
+  fn(COLLIDER_0_VERTS, normals, COLLIDER_0_IDX);
+
+  normals.resize(COLLIDER_1_VERTS.size());
+  std::fill(normals.begin(), normals.end(), Vector3(0.0, 1.0, 0.0));
+  fn(COLLIDER_1_VERTS, normals, COLLIDER_1_IDX);
+
+  normals.resize(COLLIDER_2_VERTS.size());
+  std::fill(normals.begin(), normals.end(), Vector3(0.0, 1.0, 0.0));
+  fn(COLLIDER_2_VERTS, normals, COLLIDER_2_IDX);
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshCreateFromVerticesAndFacesNoNormals(void)
+{
+  tet_infoline("UtcDaliNavigationMeshCreateFromVerticesAndFacesNoNormals: Creates NavigationMesh using vertices and faces but recalculates normals");
+
+  auto buffer0 = COLLIDER_BUFFER(0);
+
+  // All calculations in the navmesh local space
+  auto fn = [&](const auto& vertices, const auto& indices) {
+    auto navmesh = NavigationMeshFactory::CreateFromVertexFaceList(vertices.data(), nullptr, vertices.size(), indices.data(), indices.size());
+    navmesh->SetSceneTransform(Matrix(Matrix::IDENTITY));
+    DALI_TEST_EQUALS(navmesh->GetVertexCount(), vertices.size(), TEST_LOCATION);
+    DALI_TEST_EQUALS(navmesh->GetFaceCount(), indices.size() / 3, TEST_LOCATION);
+    DALI_TEST_EQUALS(navmesh->GetEdgeCount(), indices.size(), TEST_LOCATION);
+
+    // compare data
+    for(auto i = 0u; i < navmesh->GetVertexCount(); ++i)
+    {
+      Dali::Vector3 v(navmesh->GetVertex(i)->coordinates);
+      DALI_TEST_EQUALS(vertices[i], v, TEST_LOCATION);
+    }
+
+    for(auto i = 0u; i < navmesh->GetFaceCount() * 3; i += 3)
+    {
+      const auto& v = navmesh->GetFace(i / 3)->vertex;
+      DALI_TEST_EQUALS(indices[i], v[0], TEST_LOCATION);
+      DALI_TEST_EQUALS(indices[i + 1], v[1], TEST_LOCATION);
+      DALI_TEST_EQUALS(indices[i + 2], v[2], TEST_LOCATION);
+    }
+  };
+
+  std::vector<Vector3> normals;
+  normals.resize(COLLIDER_0_VERTS.size());
+  std::fill(normals.begin(), normals.end(), Vector3(0.0, 1.0, 0.0));
+  fn(COLLIDER_0_VERTS, COLLIDER_0_IDX);
+
+  normals.resize(COLLIDER_1_VERTS.size());
+  std::fill(normals.begin(), normals.end(), Vector3(0.0, 1.0, 0.0));
+  fn(COLLIDER_1_VERTS, COLLIDER_1_IDX);
+
+  normals.resize(COLLIDER_2_VERTS.size());
+  std::fill(normals.begin(), normals.end(), Vector3(0.0, 1.0, 0.0));
+  fn(COLLIDER_2_VERTS, COLLIDER_2_IDX);
+  END_TEST;
+}
+
+int UtcDaliNavigationMeshGetBinaryTest(void)
+{
+  tet_infoline("UtcDaliNavigationMeshGetBinaryTest: Creates meshes dynamically, reloads binaries and compares");
+
+  // Test 10 collider meshes
+  for(auto i = 0u; i < 10; ++i)
+  {
+    auto colliderMesh = NavigationMeshFactory::CreateFromBuffer(GetTestColliderMesh(i));
+    auto binary       = NavigationMeshFactory::GetMeshBinary(*colliderMesh);
+    DALI_TEST_EQUALS(binary.size() > 0, true, TEST_LOCATION);
+
+    auto colliderMesh2 = NavigationMeshFactory::CreateFromBuffer(binary);
+
+    DALI_TEST_EQUALS(colliderMesh->GetFaceCount(), colliderMesh2->GetFaceCount(), TEST_LOCATION);
+    DALI_TEST_EQUALS(colliderMesh->GetVertexCount(), colliderMesh2->GetVertexCount(), TEST_LOCATION);
+    DALI_TEST_EQUALS(colliderMesh->GetEdgeCount(), colliderMesh2->GetEdgeCount(), TEST_LOCATION);
+
+    // test vertices
+    for(auto idx = 0u; idx < colliderMesh->GetFaceCount(); ++idx)
+    {
+      auto v0  = colliderMesh->GetVertex(idx);
+      auto v1  = colliderMesh2->GetVertex(idx);
+      auto co0 = Vector3(v0->coordinates);
+      auto co1 = Vector3(v1->coordinates);
+      DALI_TEST_EQUALS(co0, co1, std::numeric_limits<float>::epsilon(), TEST_LOCATION);
+    }
+
+    // test face
+    for(auto idx = 0u; idx < colliderMesh->GetFaceCount(); ++idx)
+    {
+      auto  f0  = colliderMesh->GetFace(idx);
+      auto  f1  = colliderMesh2->GetFace(idx);
+      auto& vi0 = f0->vertex;
+      auto& vi1 = f1->vertex;
+      DALI_TEST_EQUALS(vi0[0], vi1[0], TEST_LOCATION);
+      DALI_TEST_EQUALS(vi0[1], vi1[1], TEST_LOCATION);
+      DALI_TEST_EQUALS(vi0[2], vi1[2], TEST_LOCATION);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliColliderMeshModelNodeSetup(void)
+{
+  tet_infoline("UtcDaliColliderMeshModelNodeSetup: Test different variants of setting up a collider mesh to the node");
+
+  ToolkitTestApplication   application;
+  Dali::Scene3D::ModelNode node  = Dali::Scene3D::ModelNode::New();
+  Dali::Scene3D::Model     model = Dali::Scene3D::Model::New();
+  model.AddModelNode(node);
+
+  application.GetWindow().Add(model);
+  application.SendNotification();
+  application.Render();
+
+  auto colliderMesh = NavigationMeshFactory::CreateFromBuffer(GetTestColliderMesh(0));
+
+  // Redundant setup test
+  DALI_TEST_EQUALS(node.HasColliderMesh(), false, TEST_LOCATION);
+  node.SetColliderMesh(nullptr);
+  DALI_TEST_EQUALS(node.HasColliderMesh(), false, TEST_LOCATION);
+  node.SetColliderMesh(std::move(colliderMesh));
+  DALI_TEST_EQUALS(node.HasColliderMesh(), true, TEST_LOCATION);
+
+  // Reset collider mesh
+  node.SetColliderMesh(nullptr);
+  DALI_TEST_EQUALS(node.HasColliderMesh(), false, TEST_LOCATION);
+
+  auto colliderMesh2 = NavigationMeshFactory::CreateFromBuffer(GetTestColliderMesh(1));
+  auto colliderMesh3 = NavigationMeshFactory::CreateFromBuffer(GetTestColliderMesh(2));
+
+  const auto& cm2 = *colliderMesh2;
+  const auto& cm3 = *colliderMesh3;
+
+  node.SetColliderMesh(std::move(colliderMesh2));
+  DALI_TEST_EQUALS(node.HasColliderMesh(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(&node.GetColliderMesh(), &cm2, TEST_LOCATION);
+  node.SetColliderMesh(std::move(colliderMesh3));
+  DALI_TEST_EQUALS(node.HasColliderMesh(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(&node.GetColliderMesh(), &cm3, TEST_LOCATION);
+
+  node.SetColliderMesh(nullptr);
+  DALI_TEST_EQUALS(node.HasColliderMesh(), false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliColliderMeshModelNodeRemoveModelNode(void)
+{
+  tet_infoline("UtcDaliColliderMeshModelNodeRemoveModelNode: Test removing model node when there is collider mesh attached");
+
+  ToolkitTestApplication   application;
+  Dali::Scene3D::ModelNode node  = Dali::Scene3D::ModelNode::New();
+  Dali::Scene3D::Model     model = Dali::Scene3D::Model::New();
+  model.AddModelNode(node);
+
+  application.GetWindow().Add(model);
+  application.SendNotification();
+  application.Render();
+
+  auto colliderMesh = NavigationMeshFactory::CreateFromBuffer(GetTestColliderMesh(0));
+
+  // Redundant setup test
+  DALI_TEST_EQUALS(node.HasColliderMesh(), false, TEST_LOCATION);
+  node.SetColliderMesh(nullptr);
+  DALI_TEST_EQUALS(node.HasColliderMesh(), false, TEST_LOCATION);
+  node.SetColliderMesh(std::move(colliderMesh));
+  DALI_TEST_EQUALS(node.HasColliderMesh(), true, TEST_LOCATION);
+
+  model.RemoveModelNode(node);
+  DALI_TEST_EQUALS(node.HasColliderMesh(), true, TEST_LOCATION);
+
+  // Reset collider mesh
+  node.SetColliderMesh(nullptr);
+  DALI_TEST_EQUALS(node.HasColliderMesh(), false, TEST_LOCATION);
+
+  auto colliderMesh1 = NavigationMeshFactory::CreateFromBuffer(GetTestColliderMesh(0));
+
+  node.SetColliderMesh(std::move(colliderMesh1));
+  DALI_TEST_EQUALS(node.HasColliderMesh(), true, TEST_LOCATION);
+
+  model.AddModelNode(node);
+  DALI_TEST_EQUALS(node.HasColliderMesh(), true, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-NodeDefinition.cpp b/automated-tests/src/dali-scene3d/utc-Dali-NodeDefinition.cpp
new file mode 100644
index 0000000..1de81f7
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-NodeDefinition.cpp
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-test-suite-utils.h>
+#include <toolkit-test-application.h>
+#include <string_view>
+#include "dali-scene3d/public-api/loader/node-definition.h"
+#include "dali-scene3d/public-api/loader/view-projection.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+
+struct Context
+{
+  ResourceBundle resources;
+
+  ViewProjection viewProjection;
+  Transforms     transforms{MatrixStack{}, viewProjection};
+
+  NodeDefinition::CreateParams createParams{
+    resources,
+    transforms};
+};
+
+} // namespace
+
+int UtcDaliConstraintDefinitionsCompare(void)
+{
+  ConstraintDefinition cd1{"orientation", 0};
+  ConstraintDefinition cd2{"position", 1};
+
+  DALI_TEST_CHECK(cd1 < cd2);
+  DALI_TEST_CHECK(!(cd2 < cd1));
+  DALI_TEST_CHECK(!(cd1 < cd1));
+  DALI_TEST_CHECK(!(cd2 < cd2));
+
+  DALI_TEST_CHECK(cd1 == cd1);
+  DALI_TEST_CHECK(cd2 == cd2);
+
+  ConstraintDefinition cd3{"position", 0};
+  ConstraintDefinition cd4{"scale", 1};
+  ConstraintDefinition cd5{"position", 1};
+  DALI_TEST_CHECK(cd2 != cd3);
+  DALI_TEST_CHECK(cd2 != cd4);
+  DALI_TEST_CHECK(cd2 == cd5);
+  DALI_TEST_CHECK(cd5 == cd2);
+
+  END_TEST;
+}
+
+int UtcDaliBlendshapeShaderConfigurationRequestsCompare(void)
+{
+  TestApplication                      app;
+  BlendshapeShaderConfigurationRequest bsscr1{"", 0, Shader(nullptr)};
+
+  BlendshapeShaderConfigurationRequest bsscr2{"", 0, Shader::New("void main(){ gl_Position = vec4(0.); }", "void main(){ gl_FragColor = vec4(1.); }")};
+
+  DALI_TEST_CHECK(bsscr1 < bsscr2);
+  DALI_TEST_CHECK(!(bsscr2 < bsscr1));
+  DALI_TEST_CHECK(!(bsscr1 < bsscr1));
+  DALI_TEST_CHECK(!(bsscr2 < bsscr2));
+
+  END_TEST;
+}
+
+int UtcDaliNodeDefinitionExtrasCompare(void)
+{
+  NodeDefinition::Extra e1{"alpha", Vector3::XAXIS * 2.f};
+  NodeDefinition::Extra e2{"beta", 8};
+
+  DALI_TEST_CHECK(e1 < e2);
+  DALI_TEST_CHECK(!(e1 < e1));
+  DALI_TEST_CHECK(!(e2 < e1));
+  DALI_TEST_CHECK(!(e2 < e2));
+
+  END_TEST;
+}
+
+int UtcDaliNodeDefinitionProperties(void)
+{
+  TestApplication testApp;
+  NodeDefinition  nodeDef{
+    "testRootNode",
+    INVALID_INDEX,
+    Vector3{-100.f, 100.f, -500.f},
+    Quaternion{Radian(Degree(45.f)), Vector3::ZAXIS},
+    Vector3{2.f, 4.f, 8.f},
+    Vector3{100.f, 50.f, 25.f},
+    false,
+  };
+
+  Quaternion frobnicateFactor(0.f, 1.f, 2.f, 3.f);
+  frobnicateFactor.Normalize(); // because it will be (by DALi) once it's set as a property.
+  nodeDef.mExtras.push_back(NodeDefinition::Extra{"frobnicateFactor", frobnicateFactor});
+
+  Context ctx;
+  auto    actor = nodeDef.CreateModelNode(ctx.createParams);
+  DALI_TEST_EQUAL(nodeDef.mName, actor.GetProperty(Actor::Property::NAME).Get<std::string>());
+  DALI_TEST_EQUAL(nodeDef.mPosition, actor.GetProperty(Actor::Property::POSITION).Get<Vector3>());
+  DALI_TEST_EQUAL(nodeDef.mOrientation, actor.GetProperty(Actor::Property::ORIENTATION).Get<Quaternion>());
+  DALI_TEST_EQUAL(nodeDef.mScale, actor.GetProperty(Actor::Property::SCALE).Get<Vector3>());
+  DALI_TEST_EQUAL(nodeDef.mSize, actor.GetProperty(Actor::Property::SIZE).Get<Vector3>());
+  DALI_TEST_EQUAL(nodeDef.mIsVisible, actor.GetProperty(Actor::Property::VISIBLE).Get<bool>());
+
+  Property::Index propFrobnicateFactor = actor.GetPropertyIndex("frobnicateFactor");
+  DALI_TEST_CHECK(propFrobnicateFactor != Property::INVALID_INDEX);
+
+  auto frobnicateFactorValue = actor.GetProperty(propFrobnicateFactor);
+  DALI_TEST_EQUAL(Property::ROTATION, frobnicateFactorValue.GetType());
+  DALI_TEST_EQUAL(frobnicateFactorValue.Get<Quaternion>(), frobnicateFactor);
+
+  DALI_TEST_EQUAL(0, actor.GetChildCount());
+  DALI_TEST_EQUAL(0, actor.GetRendererCount());
+
+  END_TEST;
+}
+
+int UtcDaliNodeDefinitionRenderableRegisterResources(void)
+{
+  NodeDefinition nodeDef;
+
+  std::unique_ptr<NodeDefinition::Renderable> renderable = std::unique_ptr<NodeDefinition::Renderable>(new NodeDefinition::Renderable());
+  nodeDef.mRenderables.push_back(std::move(renderable));
+  nodeDef.mRenderables[0]->mShaderIdx = 0;
+
+  struct : IResourceReceiver
+  {
+    std::vector<Index> shaders;
+    uint32_t           otherResources = 0;
+
+    void Register(ResourceType::Value type, Index id) override
+    {
+      switch(type)
+      {
+        case ResourceType::Shader:
+          shaders.push_back(id);
+          break;
+
+        default:
+          ++otherResources;
+      }
+    }
+  } resourceReceiver;
+
+  nodeDef.mRenderables[0]->RegisterResources(resourceReceiver);
+  DALI_TEST_EQUAL(1u, resourceReceiver.shaders.size());
+  DALI_TEST_EQUAL(0, resourceReceiver.shaders[0]);
+  DALI_TEST_EQUAL(0, resourceReceiver.otherResources);
+
+  END_TEST;
+}
+
+int UtcDaliNodeDefinitionRenderableReflectResources(void)
+{
+  NodeDefinition nodeDef;
+
+  std::unique_ptr<NodeDefinition::Renderable> renderable = std::unique_ptr<NodeDefinition::Renderable>(new NodeDefinition::Renderable());
+  nodeDef.mRenderables.push_back(std::move(renderable));
+  nodeDef.mRenderables[0]->mShaderIdx = 0;
+
+  struct : IResourceReflector
+  {
+    std::vector<Index*> shaders;
+    uint32_t            otherResources = 0;
+
+    void Reflect(ResourceType::Value type, Index& id) override
+    {
+      switch(type)
+      {
+        case ResourceType::Shader:
+          shaders.push_back(&id);
+          break;
+
+        default:
+          ++otherResources;
+      }
+    }
+  } resourceReflector;
+
+  nodeDef.mRenderables[0]->ReflectResources(resourceReflector);
+  DALI_TEST_EQUAL(1u, resourceReflector.shaders.size());
+  DALI_TEST_EQUAL(&nodeDef.mRenderables[0]->mShaderIdx, resourceReflector.shaders[0]);
+  DALI_TEST_EQUAL(0, resourceReflector.otherResources);
+
+  END_TEST;
+}
+
+int UtcDaliNodeDefinitionRenderable(void)
+{
+  TestApplication testApp;
+  NodeDefinition  nodeDef;
+
+  std::unique_ptr<NodeDefinition::Renderable> renderable = std::unique_ptr<NodeDefinition::Renderable>(new NodeDefinition::Renderable());
+  nodeDef.mRenderables.push_back(std::move(renderable));
+  nodeDef.mRenderables[0]->mShaderIdx = 0;
+
+  Context    ctx;
+  const auto VSH    = "void main() { gl_Position = vec4(0.); }";
+  const auto FSH    = "void main() { gl_FragColor = vec4(1.); }";
+  auto       shader = Shader::New(VSH, FSH);
+  ctx.resources.mShaders.push_back({ShaderDefinition{}, shader});
+
+  auto actor = nodeDef.CreateModelNode(ctx.createParams);
+  DALI_TEST_EQUAL(1, actor.GetRendererCount());
+
+  auto renderer = actor.GetRendererAt(0);
+  DALI_TEST_EQUAL(renderer.GetShader(), shader);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-PathFinding.cpp b/automated-tests/src/dali-scene3d/utc-Dali-PathFinding.cpp
new file mode 100644
index 0000000..d924c3a
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-PathFinding.cpp
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-test-suite-utils.h>
+#include "dali-scene3d/public-api/algorithm/navigation-mesh.h"
+#include "dali-scene3d/public-api/algorithm/path-finder.h"
+#include "dali-scene3d/public-api/loader/navigation-mesh-factory.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Algorithm;
+using namespace Dali::Scene3D::Loader;
+
+bool CompareResults(const std::vector<FaceIndex>& nodes, const WayPointList& waypoints)
+{
+  if(nodes.size() != waypoints.size())
+  {
+    std::ostringstream oss;
+    oss << "expect indexs : [";
+    for(const auto& index : nodes)
+    {
+      oss << index << ", ";
+    }
+    oss << "]\n";
+    oss << "your indexs : [";
+    for(const auto& waypoint : waypoints)
+    {
+      oss << waypoint.GetNavigationMeshFaceIndex() << ", ";
+    }
+    oss << "]\n";
+    tet_printf("%s\n", oss.str().c_str());
+    return false;
+  }
+  for(auto i = 0u; i < nodes.size(); ++i)
+  {
+    if(nodes[i] != waypoints[i].GetNavigationMeshFaceIndex())
+    {
+      std::ostringstream oss;
+      oss << "expect indexs : [";
+      for(const auto& index : nodes)
+      {
+        oss << index << ", ";
+      }
+      oss << "]\n";
+      oss << "your indexs : [";
+      for(const auto& waypoint : waypoints)
+      {
+        oss << waypoint.GetNavigationMeshFaceIndex() << ", ";
+      }
+      oss << "]\n";
+      tet_printf("%s\n", oss.str().c_str());
+      return false;
+    }
+  }
+  return true;
+}
+
+int UtcDaliPathFinderNewP(void)
+{
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  auto pathfinder = PathFinder::New(*navmesh, PathFinderAlgorithm::DEFAULT);
+
+  DALI_TEST_CHECK(navmesh);
+  DALI_TEST_CHECK(pathfinder);
+
+  END_TEST;
+}
+
+int UtcDaliPathFinderNewFail(void)
+{
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  auto pathfinder = PathFinder::New(*navmesh, static_cast<PathFinderAlgorithm>(-1));
+
+  DALI_TEST_CHECK(navmesh);
+  DALI_TEST_CHECK(!pathfinder);
+
+  END_TEST;
+}
+
+void printWaypointForPython(WayPointList& waypoints)
+{
+  tet_printf("size: %d\n", waypoints.size());
+  tet_printf("[");
+  for(auto& wp : waypoints)
+  {
+    auto index = wp.GetNavigationMeshFaceIndex();
+    tet_printf("%d, ", index);
+  }
+  tet_printf("]");
+}
+
+int UtcDaliPathFinderFindShortestPath0(void)
+{
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+
+  std::vector<PathFinderAlgorithm> testAlgorithms = {
+    PathFinderAlgorithm::DIJKSTRA_SHORTEST_PATH,
+    PathFinderAlgorithm::SPFA,
+  };
+
+  for(const auto& algorithm : testAlgorithms)
+  {
+    tet_printf("Test algorithm type : %d\n", static_cast<int>(algorithm));
+    auto pathfinder = PathFinder::New(*navmesh, algorithm);
+
+    DALI_TEST_CHECK(navmesh);
+    DALI_TEST_CHECK(pathfinder);
+
+    {
+      auto waypoints = pathfinder->FindPath(18, 139);
+      DALI_TEST_NOT_EQUALS(int(waypoints.size()), 0, 0, TEST_LOCATION);
+
+      // Results are verified in the Blender
+      std::vector<FaceIndex> expectedResults =
+        {18, 97, 106, 82, 50, 139};
+
+      DALI_TEST_EQUALS(CompareResults(expectedResults, waypoints), true, TEST_LOCATION);
+    }
+    //printWaypointForPython(waypoints);
+
+    {
+      // Top floor middle to the tree
+
+      auto waypoints = pathfinder->FindPath(18, 157);
+      DALI_TEST_NOT_EQUALS(int(waypoints.size()), 0, 0, TEST_LOCATION);
+
+      //printWaypointForPython(waypoints);
+
+      // Results are verified in the Blender
+      std::vector<FaceIndex> expectedResults =
+        {18, 97, 106, 82, 50, 6, 89, 33, 157};
+
+      DALI_TEST_EQUALS(CompareResults(expectedResults, waypoints), true, TEST_LOCATION);
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliPathFinderFindShortestPath1(void)
+{
+  auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
+  // All coordinates in navmesh local space
+  navmesh->SetSceneTransform(Matrix(Matrix::IDENTITY));
+
+  std::vector<PathFinderAlgorithm> testAlgorithms = {
+    PathFinderAlgorithm::DIJKSTRA_SHORTEST_PATH,
+    PathFinderAlgorithm::SPFA,
+    PathFinderAlgorithm::SPFA_DOUBLE_WAY, /* Note : Even this algorithm doesn't found shortest path, UTC will pass. */
+  };
+
+  for(const auto& algorithm : testAlgorithms)
+  {
+    tet_printf("Test algorithm type : %d\n", static_cast<int>(algorithm));
+    auto pathfinder = PathFinder::New(*navmesh, algorithm);
+
+    DALI_TEST_CHECK(navmesh);
+    DALI_TEST_CHECK(pathfinder);
+
+    {
+      Vector3 from(-6.0767, -1.7268, 0.1438); // ground floor
+      Vector3 to(-6.0767, -1.7268, 4.287);    // first floor
+
+      auto waypoints = pathfinder->FindPath(from, to);
+      DALI_TEST_NOT_EQUALS(int(waypoints.size()), 0, 0, TEST_LOCATION);
+
+      // Results are verified in the Blender
+      std::vector<FaceIndex> expectedResults =
+        {154, 58, 85, 106, 128, 132, 137};
+
+      DALI_TEST_EQUALS(CompareResults(expectedResults, waypoints), true, TEST_LOCATION);
+
+      // Verify last and first points by finding floor points
+      {
+        Vector3   verifyPos   = Vector3::ZERO;
+        FaceIndex verifyIndex = NavigationMesh::NULL_FACE;
+        auto      result      = navmesh->FindFloor(from, verifyPos, verifyIndex);
+
+        DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+        DALI_TEST_EQUALS(verifyPos, waypoints[0].GetScenePosition(), TEST_LOCATION);
+        DALI_TEST_EQUALS(verifyIndex, waypoints[0].GetNavigationMeshFaceIndex(), TEST_LOCATION);
+
+        // Verified with Blender
+        Vector2 local(1.064201f, -0.273200f);
+        DALI_TEST_EQUALS(local, waypoints[0].GetFaceLocalSpacePosition(), TEST_LOCATION);
+      }
+
+      {
+        Vector3   verifyPos   = Vector3::ZERO;
+        FaceIndex verifyIndex = NavigationMesh::NULL_FACE;
+        auto      result      = navmesh->FindFloor(to, verifyPos, verifyIndex);
+
+        DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+        DALI_TEST_EQUALS(verifyPos, waypoints.back().GetScenePosition(), TEST_LOCATION);
+        DALI_TEST_EQUALS(verifyIndex, waypoints.back().GetNavigationMeshFaceIndex(), TEST_LOCATION);
+
+        // Verified with Blender
+        Vector2 local(0.165907f, 0.142597f);
+        DALI_TEST_EQUALS(local, waypoints.back().GetFaceLocalSpacePosition(), TEST_LOCATION);
+      }
+    }
+  }
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-RendererState.cpp b/automated-tests/src/dali-scene3d/utc-Dali-RendererState.cpp
new file mode 100644
index 0000000..a72560b
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-RendererState.cpp
@@ -0,0 +1,317 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/renderer-state.h"
+#include "dali-scene3d/public-api/loader/parse-renderer-state.h"
+#include "dali-scene3d/public-api/loader/utils.h"
+#include <dali-test-suite-utils.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace sl = Dali::Scene3D::Loader;
+namespace rs = RendererState;
+
+int UtcDaliRendererStateFromBlendFactors(void)
+{
+  rs::Type state = rs::FromBlendFactors(sl::BlendFactor::ZERO, sl::BlendFactor::ONE,
+    sl::BlendFactor::SRC_COLOR, sl::BlendFactor::ONE_MINUS_SRC_COLOR);
+
+  DALI_TEST_EQUAL((state >> rs::BLEND_FACTOR_BASE_SHIFT) & rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::ZERO));
+  DALI_TEST_EQUAL((state >> (rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS)) &
+    rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::ONE));
+  DALI_TEST_EQUAL((state >> (rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 2)) &
+    rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::SRC_COLOR));
+  DALI_TEST_EQUAL((state >> (rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 3)) &
+    rs::BLEND_FACTOR_ITEM_MASK, rs::Type(sl::BlendFactor::ONE_MINUS_SRC_COLOR));
+
+  END_TEST;
+}
+
+#define HELP_TEST_RENDERER_STATE(property, resetValue, state, checkValue, renderer)\
+  renderer.SetProperty(property, ~(resetValue));\
+  rs::Apply((state), (renderer));\
+  printf("%s %s vs %s\n", #property, #state, #checkValue);\
+  DALI_TEST_EQUAL(renderer.GetProperty(property).Get<decltype(checkValue)>(), (checkValue));
+
+int UtcDaliRendererStateApply(void)
+{
+  TestApplication app;
+  auto vsh = "void main() { gl_Position = vec4(0.); }";
+  auto fsh = "void main() { gl_FragColor = vec4(1.); }";
+  Geometry geom = Geometry::New();
+  Shader shader = Shader::New(vsh, fsh);
+  Renderer renderer = Renderer::New(geom, shader);
+
+  HELP_TEST_RENDERER_STATE(Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::OFF, rs::DEPTH_TEST, DepthTestMode::ON, renderer);
+
+  HELP_TEST_RENDERER_STATE(Renderer::Property::BLEND_MODE, BlendMode::OFF, rs::ALPHA_BLEND, BlendMode::ON, renderer);
+  HELP_TEST_RENDERER_STATE(Renderer::Property::BLEND_MODE, BlendMode::OFF, ~(rs::ALPHA_BLEND), BlendMode::USE_ACTOR_OPACITY, renderer);
+
+  HELP_TEST_RENDERER_STATE(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::NONE, rs::CULL_FRONT, FaceCullingMode::FRONT, renderer);
+  HELP_TEST_RENDERER_STATE(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::NONE, rs::CULL_BACK, FaceCullingMode::BACK, renderer);
+  HELP_TEST_RENDERER_STATE(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::NONE, rs::CULL_FRONT | rs::CULL_BACK,
+    FaceCullingMode::FRONT_AND_BACK, renderer);
+
+#define DEPTH_FUNC_PAIR(x) { Comparison::x << rs::DEPTH_FUNCTION_SHIFT, DepthFunction::x }
+  const std::pair<rs::Type, DepthFunction::Type> depthFunctionPairs[] {
+    DEPTH_FUNC_PAIR(NEVER),
+    DEPTH_FUNC_PAIR(ALWAYS),
+    DEPTH_FUNC_PAIR(LESS),
+    DEPTH_FUNC_PAIR(GREATER),
+    DEPTH_FUNC_PAIR(EQUAL),
+    DEPTH_FUNC_PAIR(NOT_EQUAL),
+    DEPTH_FUNC_PAIR(LESS_EQUAL),
+    DEPTH_FUNC_PAIR(GREATER_EQUAL),
+  };
+#undef DEPTH_FUNC_PAIR
+  for (auto& p : depthFunctionPairs)
+  {
+    HELP_TEST_RENDERER_STATE(Renderer::Property::DEPTH_FUNCTION, DepthFunction::LESS, p.first, p.second, renderer);
+  }
+
+#define BLEND_FACTOR_PAIR(x) { sl::BlendFactor::x, BlendFactor::x }
+  const std::pair<rs::Type, BlendFactor::Type> BLEND_FACTORS[] {
+    BLEND_FACTOR_PAIR(ZERO),
+    BLEND_FACTOR_PAIR(ONE),
+    BLEND_FACTOR_PAIR(SRC_COLOR),
+    BLEND_FACTOR_PAIR(ONE_MINUS_SRC_COLOR),
+    BLEND_FACTOR_PAIR(SRC_ALPHA),
+    BLEND_FACTOR_PAIR(ONE_MINUS_SRC_ALPHA),
+    BLEND_FACTOR_PAIR(DST_COLOR),
+    BLEND_FACTOR_PAIR(ONE_MINUS_DST_COLOR),
+    BLEND_FACTOR_PAIR(DST_ALPHA),
+    BLEND_FACTOR_PAIR(ONE_MINUS_DST_ALPHA),
+    BLEND_FACTOR_PAIR(SRC_ALPHA_SATURATE),
+    BLEND_FACTOR_PAIR(CONSTANT_COLOR),
+    BLEND_FACTOR_PAIR(ONE_MINUS_CONSTANT_COLOR),
+    BLEND_FACTOR_PAIR(CONSTANT_ALPHA),
+    BLEND_FACTOR_PAIR(ONE_MINUS_CONSTANT_ALPHA),
+  };
+#undef BLEND_FACTOR_PAIR
+  for (auto property: {
+    Renderer::Property::BLEND_FACTOR_SRC_RGB,
+    Renderer::Property::BLEND_FACTOR_DEST_RGB,
+    Renderer::Property::BLEND_FACTOR_SRC_ALPHA,
+    Renderer::Property::BLEND_FACTOR_DEST_ALPHA,
+  })
+  {
+    const auto itemShift = rs::BLEND_FACTOR_ITEM_BITS * (property - Renderer::Property::BLEND_FACTOR_SRC_RGB);
+    const auto shift = rs::BLEND_FACTOR_BASE_SHIFT + itemShift;
+    for (auto& value: BLEND_FACTORS)
+    {
+      HELP_TEST_RENDERER_STATE(property, BlendFactor::ZERO, value.first << shift, value.second, renderer);
+    }
+  }
+
+#define RENDER_MODE_PAIR(x) { BufferMode::x << rs::BUFFER_MODE_SHIFT, RenderMode::x }
+  std::pair<rs::Type, RenderMode::Type> renderModePairs[] {
+    // same as our reset value: RENDER_MODE_PAIR(NONE),
+    RENDER_MODE_PAIR(AUTO),
+    RENDER_MODE_PAIR(COLOR),
+    RENDER_MODE_PAIR(STENCIL),
+    RENDER_MODE_PAIR(COLOR_STENCIL),
+  };
+#undef RENDER_MODE_PAIR
+  for (auto& p: renderModePairs)
+  {
+    HELP_TEST_RENDERER_STATE(Renderer::Property::RENDER_MODE, RenderMode::NONE, p.first, p.second, renderer);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliRendererStateParseEmpty(void)
+{
+  std::string error;
+  auto onError = [&](const std::string& e) { error = e; };
+
+  DALI_TEST_EQUAL(rs::Parse("", 0, onError), uint32_t(rs::NONE));
+  DALI_TEST_CHECK(error.empty());
+  END_TEST;
+}
+
+int UtcDaliRendererStateParseInvalid(void)
+{
+  std::string error;
+  auto onError = [&](const std::string& e) { error = e; };
+
+  DALI_TEST_EQUAL(rs::Parse("definitelyNotAValidRendererState", 0, onError), uint32_t(rs::NONE));
+  DALI_TEST_CHECK(strstr(error.c_str(), "Not a valid RendererState") != nullptr);
+  END_TEST;
+}
+
+namespace
+{
+struct Option
+{
+  std::string_view name;
+  rs::Type expected;
+
+  void Apply(std::ostream& stream, uint8_t shift, uint32_t& result) const
+  {
+    stream << name;
+    result |= expected << shift;
+  }
+};
+
+struct StateGenerator
+{
+  std::string_view name;
+
+  uint8_t shift;
+  std::vector<Option> permutations;
+};
+
+#define STRING_STATE_PAIR(x, y) { #x, y::x }
+const decltype(StateGenerator::permutations) BLEND_FACTORS {
+  { "", sl::BlendFactor::OMIT },
+  STRING_STATE_PAIR(ZERO, sl::BlendFactor),
+  STRING_STATE_PAIR(ONE, sl::BlendFactor),
+  STRING_STATE_PAIR(SRC_COLOR, sl::BlendFactor),
+  STRING_STATE_PAIR(ONE_MINUS_SRC_COLOR, sl::BlendFactor),
+  STRING_STATE_PAIR(SRC_ALPHA, sl::BlendFactor),
+  STRING_STATE_PAIR(ONE_MINUS_SRC_ALPHA, sl::BlendFactor),
+  STRING_STATE_PAIR(DST_COLOR, sl::BlendFactor),
+  STRING_STATE_PAIR(ONE_MINUS_DST_COLOR, sl::BlendFactor),
+  STRING_STATE_PAIR(DST_ALPHA, sl::BlendFactor),
+  STRING_STATE_PAIR(ONE_MINUS_DST_ALPHA, sl::BlendFactor),
+  STRING_STATE_PAIR(SRC_ALPHA_SATURATE, sl::BlendFactor),
+  STRING_STATE_PAIR(CONSTANT_COLOR, sl::BlendFactor),
+  STRING_STATE_PAIR(ONE_MINUS_CONSTANT_COLOR, sl::BlendFactor),
+  STRING_STATE_PAIR(CONSTANT_ALPHA, sl::BlendFactor),
+  STRING_STATE_PAIR(ONE_MINUS_CONSTANT_ALPHA, sl::BlendFactor),
+};
+
+const StateGenerator PERMUTATORS[] {
+  { "DEPTH_FUNC:", rs::DEPTH_FUNCTION_SHIFT, {
+    { "", Comparison::OMIT },
+    STRING_STATE_PAIR(NEVER, Comparison),
+    STRING_STATE_PAIR(ALWAYS, Comparison),
+    STRING_STATE_PAIR(LESS, Comparison),
+    STRING_STATE_PAIR(GREATER, Comparison),
+    STRING_STATE_PAIR(EQUAL, Comparison),
+    STRING_STATE_PAIR(NOT_EQUAL, Comparison),
+    STRING_STATE_PAIR(LESS_EQUAL, Comparison),
+    STRING_STATE_PAIR(GREATER_EQUAL, Comparison),
+  } },
+  { "BLEND_SRC_RGB:", rs::BLEND_FACTOR_BASE_SHIFT, BLEND_FACTORS },
+  { "BLEND_DST_RGB:", rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS, BLEND_FACTORS  },
+  { "BLEND_SRC_ALPHA:", rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 2, BLEND_FACTORS },
+  { "BLEND_DST_ALPHA:", rs::BLEND_FACTOR_BASE_SHIFT + rs::BLEND_FACTOR_ITEM_BITS * 3, BLEND_FACTORS },
+  { "BUFFER_MODE:", rs::BUFFER_MODE_SHIFT, {
+    { "", BufferMode::OMIT },
+    STRING_STATE_PAIR(NONE, BufferMode),
+    STRING_STATE_PAIR(AUTO, BufferMode),
+    STRING_STATE_PAIR(COLOR, BufferMode),
+    STRING_STATE_PAIR(STENCIL, BufferMode),
+    STRING_STATE_PAIR(COLOR_STENCIL, BufferMode),
+  } },
+  // binary options
+  { "", 0, { STRING_STATE_PAIR(DEPTH_WRITE, rs) } },
+  { "", 0, { STRING_STATE_PAIR(DEPTH_TEST, rs) } },
+  { "", 0, { STRING_STATE_PAIR(CULL_FRONT, rs) } },
+  { "", 0, { STRING_STATE_PAIR(CULL_BACK, rs) } },
+  { "", 0, { STRING_STATE_PAIR(ALPHA_BLEND, rs) } },
+};
+
+#undef STRING_STATE_PAIR
+}
+
+int UtcDaliRendererStateParseIndividual(void)
+{
+  std::string error;
+  auto onError = [&](const std::string& e) { error = e; };
+
+  char buffer[512] {};
+  for (auto& p: PERMUTATORS)
+  {
+    for (auto& o: p.permutations)
+    {
+      StreamBuffer streamBuf(buffer, sizeof(buffer));
+      std::ostream stream(&streamBuf);
+
+      stream << p.name;
+
+      uint32_t expected = 0x0;
+      o.Apply(stream, p.shift, expected);
+      stream << '\0';
+
+      printf("%s -> %d\n", buffer, expected);
+      DALI_TEST_EQUAL(rs::Parse(buffer, 0, onError), expected);
+      DALI_TEST_CHECK(error.empty());
+    }
+  }
+
+  END_TEST;
+}
+
+int UtcDaliRendererStateParseCombined(void)
+{
+  constexpr uint32_t count = std::extent<decltype(PERMUTATORS)>::value;
+  constexpr uint32_t prime = 13;
+  static_assert(prime > count);
+  constexpr uint32_t skip = 3 * count * count + 7 * count + 1;
+  static_assert(skip % prime != 0);
+
+  std::string error;
+  auto onError = [&](const std::string& e) { error = e; };
+
+  std::vector<rs::Type> expectedValues;
+
+  char buffer[512] {};
+  for (uint32_t i = 0; i < count; ++i)
+  {
+    StreamBuffer streamBuf(buffer, sizeof(buffer));
+    std::ostream stream(&streamBuf);
+
+    uint32_t expected = 0x0;
+
+    uint32_t iTmp = i;
+    for (uint32_t j = 0; j < count; ++j)
+    {
+      iTmp = (iTmp + skip) % count;
+      DALI_TEST_CHECK(iTmp < count);
+
+      if (expected)
+      {
+        stream << "|";
+      }
+
+      auto& perm = PERMUTATORS[iTmp];
+      stream << perm.name;
+      perm.permutations.back().Apply(stream, perm.shift, expected);
+    }
+
+    stream << '\0';
+
+    DALI_TEST_EQUAL(rs::Parse(buffer, 0, onError), expected);
+    DALI_TEST_CHECK(error.empty());
+
+    auto iFind = std::lower_bound(expectedValues.begin(), expectedValues.end(), expected);
+    if (iFind == expectedValues.end() || *iFind != expected)
+    {
+      expectedValues.insert(iFind, expected);
+    }
+    DALI_TEST_EQUAL(expectedValues.size(), 1u);
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-ResourceBundle.cpp b/automated-tests/src/dali-scene3d/utc-Dali-ResourceBundle.cpp
new file mode 100644
index 0000000..162e48e
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-ResourceBundle.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-test-suite-utils.h>
+#include <string_view>
+#include "dali-scene3d/public-api/loader/resource-bundle.h"
+#include "dali-scene3d/public-api/loader/utils.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliResourceRefCounts(void)
+{
+  ResourceBundle resourceBundle;
+  resourceBundle.mEnvironmentMaps.resize(4);
+  resourceBundle.mShaders.resize(13);
+  resourceBundle.mMeshes.resize(17);
+  resourceBundle.mMaterials.resize(19);
+
+  int              i = 0;
+  std::vector<int> testEnvironmentReferences(resourceBundle.mEnvironmentMaps.size());
+  for(auto& m : resourceBundle.mMaterials)
+  {
+    Index iEnv = 0;
+    iEnv += (i % 3) == 0;
+    iEnv += ((i % 4) == 0) * 2;
+    m.first.mEnvironmentIdx = iEnv;
+
+    printf("%d : %d, ", i, iEnv);
+
+    ++testEnvironmentReferences[iEnv];
+    ++i;
+  }
+
+  auto counter = resourceBundle.CreateRefCounter();
+  DALI_TEST_EQUAL(counter[ResourceType::Environment].Size(), resourceBundle.mEnvironmentMaps.size());
+  DALI_TEST_EQUAL(counter[ResourceType::Shader].Size(), resourceBundle.mShaders.size());
+  DALI_TEST_EQUAL(counter[ResourceType::Mesh].Size(), resourceBundle.mMeshes.size());
+  DALI_TEST_EQUAL(counter[ResourceType::Material].Size(), resourceBundle.mMaterials.size());
+
+  std::fill(counter[ResourceType::Material].begin(), counter[ResourceType::Material].end(), 1u);
+  resourceBundle.mReferenceCounts = std::move(counter);
+  resourceBundle.CountEnvironmentReferences();
+
+  const ResourceRefCounts& referenceCounts = resourceBundle.mReferenceCounts;
+  i                                        = 0;
+  for(auto& er : referenceCounts[ResourceType::Environment])
+  {
+    DALI_TEST_EQUAL(er, testEnvironmentReferences[i]);
+    ++i;
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-SceneDefinition.cpp b/automated-tests/src/dali-scene3d/utc-Dali-SceneDefinition.cpp
new file mode 100644
index 0000000..e7126eb
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-SceneDefinition.cpp
@@ -0,0 +1,465 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/scene-definition.h"
+#include "dali-scene3d/public-api/loader/utils.h"
+#include <dali-test-suite-utils.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliSceneDefinitionAddNode(void)
+{
+  SceneDefinition sceneDef;
+
+  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 0u);
+  auto node = new NodeDefinition();
+  node->mName = "First";
+
+  auto result = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ node });
+  DALI_TEST_EQUAL(result, node);
+  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 1u);
+  DALI_TEST_EQUAL(sceneDef.GetNode(0), node);
+  DALI_TEST_EQUAL(sceneDef.FindNode(node->mName), node);
+
+  auto node2 = new NodeDefinition();
+  node2->mName = node->mName;
+  result = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ node2 });
+  DALI_TEST_EQUAL(result, node2);
+  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 2u);
+  DALI_TEST_EQUAL(sceneDef.GetNode(1), node2);
+
+  auto child = new NodeDefinition();
+  child->mName = "Second";
+  child->mParentIdx = 0;
+
+  DALI_TEST_CHECK(node->mChildren.empty()); // these are hooked up by AddNode, base on parent idx.
+
+  result = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ child });
+  DALI_TEST_EQUAL(result, child);
+  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 3u);
+  DALI_TEST_EQUAL(sceneDef.GetNode(2), child);
+  DALI_TEST_EQUAL(sceneDef.FindNode(child->mName), child);
+
+  DALI_TEST_EQUAL(node->mChildren[0], 2u); // these are hooked up by AddNode, base on parent idx.
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionAddRootsFail(void)
+{
+  SceneDefinition sceneDef;
+
+  DALI_TEST_ASSERTION(sceneDef.AddRootNode(0), "index out of bounds");
+  DALI_TEST_CHECK(sceneDef.GetRoots().empty());
+  DALI_TEST_EQUAL(sceneDef.GetNodeCount(), 0u);
+
+  END_TEST;
+}
+
+namespace
+{
+
+struct TestContext
+{
+  SceneDefinition sceneDef;
+  NodeDefinition* root;
+  NodeDefinition* childA;
+  NodeDefinition* childB;
+
+  TestContext()
+  : sceneDef{},
+    root{ new NodeDefinition{ "Root" }},
+    childA{ new NodeDefinition{ "A" }},
+    childB{ new NodeDefinition{ "B" }}
+  {
+    childA->mParentIdx = 0;
+    childB->mParentIdx = 0;
+
+    root = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ root });
+    childA = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ childA });
+    childB = sceneDef.AddNode(std::unique_ptr<NodeDefinition>{ childB });
+  }
+};
+
+enum Event
+{
+  DEFAULT = -1,
+  START,
+  FINISH
+};
+
+struct NodeVisitor : NodeDefinition::IVisitor
+{
+  struct Visit
+  {
+    Event event;
+    NodeDefinition* node;
+
+    bool operator==(const Visit& other) const
+    {
+      return event == other.event && node == other.node;
+    }
+  };
+
+  void Start(NodeDefinition& n) override
+  {
+    visits.push_back({ START, &n });
+  }
+
+  void Finish(NodeDefinition& n) override
+  {
+    visits.push_back({ FINISH, &n });
+  }
+
+  std::vector<Visit> visits;
+};
+
+struct ConstNodeVisitor : NodeDefinition::IConstVisitor
+{
+  struct Visit
+  {
+    Event  event;
+    const NodeDefinition* node;
+
+    bool operator==(const Visit& other) const
+    {
+      return event == other.event && node == other.node;
+    }
+  };
+
+  void Start(const NodeDefinition& n) override
+  {
+    visits.push_back({ START, &n });
+  }
+
+  void Finish(const NodeDefinition& n) override
+  {
+    visits.push_back({ FINISH, &n });
+  }
+
+  std::vector<Visit> visits;
+};
+
+}
+
+int UtcDaliSceneDefinitionAddRemoveRootNode(void)
+{
+  TestContext ctx;
+
+  DALI_TEST_EQUAL(ctx.sceneDef.AddRootNode(0), 0);
+  DALI_TEST_EQUAL(ctx.sceneDef.GetRoots().size(), 1u);
+  DALI_TEST_EQUAL(ctx.sceneDef.GetRoots()[0], 0);
+
+  ctx.sceneDef.RemoveRootNode(0);
+  DALI_TEST_EQUAL(ctx.sceneDef.GetRoots().size(), 0);
+
+  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 3u);
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionVisit(void)
+{
+  TestContext ctx;
+
+  NodeVisitor visitor;
+  ctx.sceneDef.Visit(0, Customization::Choices{}, visitor);
+
+  const NodeVisitor::Visit expected[] {
+    { START, ctx.root },
+    { START, ctx.childA },
+    { FINISH, ctx.childA },
+    { START, ctx.childB },
+    { FINISH, ctx.childB },
+    { FINISH, ctx.root },
+  };
+  DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), expected));
+
+  END_TEST;
+};
+
+int UtcDaliSceneDefinitionConstVisit(void)
+{
+  TestContext ctx;
+
+  ConstNodeVisitor visitor;
+  ctx.sceneDef.Visit(0, Customization::Choices{}, visitor);
+
+  const ConstNodeVisitor::Visit expected[] {
+    { START, ctx.root },
+    { START, ctx.childA },
+    { FINISH, ctx.childA },
+    { START, ctx.childB },
+    { FINISH, ctx.childB },
+    { FINISH, ctx.root },
+  };
+  DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), expected));
+
+  END_TEST;
+};
+
+int UtcDaliSceneDefinitionVisitCustomized(void)
+{
+  TestContext ctx;
+
+  ctx.root->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "A/B" });
+
+  const NodeVisitor::Visit expected[] {
+    { START, ctx.root },
+    { START, ctx.childB },
+    { FINISH, ctx.childB },
+    { FINISH, ctx.root },
+  };
+
+  Customization::Choices choices;
+  for (auto i : { 1, 2 })
+  {
+    choices.Set("A/B", i);
+
+    NodeVisitor visitor;
+    ctx.sceneDef.Visit(0, choices, visitor);
+
+    DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), std::begin(expected)));
+  }
+
+  END_TEST;
+};
+
+int UtcDaliSceneDefinitionConstVisitCustomized(void)
+{
+  TestContext ctx;
+
+  ctx.root->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "A/B" });
+
+  const ConstNodeVisitor::Visit expected[] {
+    { START, ctx.root },
+    { START, ctx.childB },
+    { FINISH, ctx.childB },
+    { FINISH, ctx.root },
+  };
+
+  Customization::Choices choices;
+  for (auto i : { 1, 2 })
+  {
+    choices.Set("A/B", i);
+
+    ConstNodeVisitor visitor;
+    ctx.sceneDef.Visit(0, choices, visitor);
+
+    DALI_TEST_CHECK(std::equal(visitor.visits.begin(), visitor.visits.end(), std::begin(expected)));
+  }
+
+  END_TEST;
+};
+
+int UtcDaliSceneDefinitionGetCustomizationOptions(void)
+{
+  TestContext ctx;
+
+  ctx.sceneDef.AddRootNode(0); // GetCustomizationOptions requires this.
+
+  ctx.root->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "A/B" });
+  ctx.childA->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "hello" });
+  ctx.childB->mCustomization.reset(new NodeDefinition::CustomizationDefinition{ "goodbye" });
+
+  Customization::Choices choices;
+  Customization::Map options;
+  ctx.sceneDef.GetCustomizationOptions(choices, options, &choices);
+
+  DALI_TEST_EQUAL(choices.Size(), 2u);
+  DALI_TEST_EQUAL(options.Size(), 2u);
+
+  struct TestOption
+  {
+    std::string name;
+    Customization customization;
+    Customization::OptionType choice;
+  };
+
+  std::vector<TestOption> testOptions {
+    { "A/B", { 2, { "Root" } }, 0 },
+    { "hello", { 0, { "A" } }, 0 },
+  };
+  for (auto& testOption: testOptions)
+  {
+    auto iFind = choices.Get(testOption.name);
+    DALI_TEST_EQUAL(iFind, testOption.choice);
+
+    auto iFindOption = options.Get(testOption.name);
+    DALI_TEST_CHECK(iFindOption != nullptr);
+    DALI_TEST_EQUAL(iFindOption->numOptions, testOption.customization.numOptions);
+    DALI_TEST_EQUAL(iFindOption->nodes.size(), testOption.customization.nodes.size());
+    DALI_TEST_CHECK(std::equal(iFindOption->nodes.begin(), iFindOption->nodes.end(),
+      testOption.customization.nodes.begin()));
+  }
+
+  choices.Clear();
+  choices.Set("A/B", 1);
+  *options.Get("A/B") = {};
+
+  testOptions[0].choice = 1;
+  testOptions[1].name = "goodbye";
+  testOptions[1].customization.nodes[0] = "B";
+
+  ctx.sceneDef.GetCustomizationOptions(choices, options, &choices);
+
+  DALI_TEST_EQUAL(choices.Size(), 2u);
+  DALI_TEST_EQUAL(options.Size(), 3u);
+
+  for (auto& testOption: testOptions)
+  {
+    auto iFind = choices.Get(testOption.name);
+    DALI_TEST_EQUAL(iFind, testOption.choice);
+
+    auto iFindOption = options.Get(testOption.name);
+    DALI_TEST_CHECK(iFindOption != nullptr);
+    DALI_TEST_EQUAL(iFindOption->numOptions, testOption.customization.numOptions);
+    DALI_TEST_EQUAL(iFindOption->nodes.size(), testOption.customization.nodes.size());
+    DALI_TEST_CHECK(std::equal(iFindOption->nodes.begin(), iFindOption->nodes.end(),
+      testOption.customization.nodes.begin()));
+  }
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionFindNode(void)
+{
+  TestContext ctx;
+
+  Index result = INVALID_INDEX;
+  for (auto n: { ctx.root, ctx.childA, ctx.childB })
+  {
+    ctx.sceneDef.FindNode(n->mName, &result);
+    DALI_TEST_CHECK(result != INVALID_INDEX);
+    DALI_TEST_EQUAL(ctx.sceneDef.GetNode(result), n);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionConstFindNode(void)
+{
+  TestContext ctx;
+
+  Index result = INVALID_INDEX;
+  for (auto n: { ctx.root, ctx.childA, ctx.childB })
+  {
+    const_cast<const TestContext&>(ctx).sceneDef.FindNode(n->mName, &result);
+    DALI_TEST_CHECK(result != INVALID_INDEX);
+    DALI_TEST_EQUAL(ctx.sceneDef.GetNode(result), n);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionFindNodeIndex(void)
+{
+  TestContext ctx;
+
+  Index result = INVALID_INDEX;
+  for (auto n: { ctx.root, ctx.childA, ctx.childB })
+  {
+    result = ctx.sceneDef.FindNodeIndex(*n);
+    DALI_TEST_CHECK(result != INVALID_INDEX);
+    DALI_TEST_EQUAL(ctx.sceneDef.GetNode(result), n);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionFindNodes(void)
+{
+  TestContext ctx;
+
+  std::vector<NodeDefinition*> nodes;
+  auto nodeConsumer = [&nodes](NodeDefinition& nd) {
+    nodes.push_back(&nd);
+  };
+
+  auto nodePredicate = [](const NodeDefinition& nd) {
+    return nd.mName.length() == 1;
+  };
+
+  ctx.sceneDef.FindNodes(nodePredicate, nodeConsumer, 1);
+  DALI_TEST_EQUAL(nodes.size(), 1);
+  DALI_TEST_EQUAL(nodes[0]->mName, "A");
+  DALI_TEST_EQUAL(nodes[0], ctx.childA);
+
+  nodes.clear();
+  ctx.sceneDef.FindNodes(nodePredicate, nodeConsumer);
+
+  DALI_TEST_EQUAL(nodes.size(), 2);
+  DALI_TEST_EQUAL(nodes[0]->mName, "A");
+  DALI_TEST_EQUAL(nodes[0], ctx.childA);
+  DALI_TEST_EQUAL(nodes[1]->mName, "B");
+  DALI_TEST_EQUAL(nodes[1], ctx.childB);
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionRemoveNode(void)
+{
+  TestContext ctx;
+  DALI_TEST_EQUAL(ctx.sceneDef.RemoveNode("doesn't exist"), false);
+
+  // pre-removing A
+  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 3u);
+  DALI_TEST_EQUAL(ctx.root->mChildren.size(), 2u);
+
+  Index result;
+  DALI_TEST_EQUAL(ctx.sceneDef.FindNode("B", &result), ctx.childB);
+  DALI_TEST_EQUAL(result, 2);
+
+  DALI_TEST_EQUAL(ctx.sceneDef.RemoveNode("A"), true);
+
+  // post-removing A
+  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 2u);
+
+  result = 12345;
+  DALI_TEST_EQUAL(ctx.sceneDef.FindNode("A", &result), static_cast<NodeDefinition*>(nullptr));
+  DALI_TEST_EQUAL(result, 12345); // doesn't change
+
+  DALI_TEST_EQUAL(ctx.sceneDef.FindNode("B", &result), ctx.childB);
+  DALI_TEST_EQUAL(result, 1); // dropped
+
+  DALI_TEST_EQUAL(ctx.root->mChildren.size(), 1u);
+  DALI_TEST_EQUAL(ctx.root->mChildren[0], 1u);
+
+  // removing root
+  DALI_TEST_EQUAL(ctx.sceneDef.RemoveNode("Root"), true);
+  DALI_TEST_EQUAL(ctx.sceneDef.GetNodeCount(), 0);
+
+  END_TEST;
+}
+
+int UtcDaliSceneDefinitionReparentNode(void)
+{
+  TestContext ctx;
+
+  ctx.sceneDef.ReparentNode("B", "A", 0);
+
+  DALI_TEST_EQUAL(ctx.childB->mParentIdx, ctx.sceneDef.FindNodeIndex(*ctx.childA));
+  DALI_TEST_EQUAL(ctx.childA->mChildren.size(), 1u);
+  DALI_TEST_EQUAL(ctx.childA->mChildren[0], ctx.sceneDef.FindNodeIndex(*ctx.childB));
+
+  END_TEST;
+}
+
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-SceneView.cpp b/automated-tests/src/dali-scene3d/utc-Dali-SceneView.cpp
new file mode 100644
index 0000000..06ff712
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-SceneView.cpp
@@ -0,0 +1,1197 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <toolkit-event-thread-callback.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void scene_view_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void scene_view_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+/**
+ * For the AnimatedCube.gltf and its Assets
+ * Donated by Norbert Nopper for glTF testing.
+ * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/AnimatedCube
+ */
+const char* TEST_GLTF_FILE_NAME = TEST_RESOURCE_DIR "/AnimatedCube.gltf";
+
+/**
+ * For the diffuse and specular cube map texture.
+ * These textures are based off version of Wave engine sample
+ * Take from https://github.com/WaveEngine/Samples
+ *
+ * Copyright (c) 2024 Wave Coorporation
+ *
+ * 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.
+ */
+const char* TEST_EQUIRECTANGULAR_TEXTURE = TEST_RESOURCE_DIR "/application-icon-20.png";
+const char* TEST_DIFFUSE_TEXTURE         = TEST_RESOURCE_DIR "/forest_irradiance.ktx";
+const char* TEST_SPECULAR_TEXTURE        = TEST_RESOURCE_DIR "/forest_radiance.ktx";
+const char* TEST_DIFFUSE_TEXTURE2        = TEST_RESOURCE_DIR "//forest_irradiance.ktx";
+const char* TEST_SPECULAR_TEXTURE2       = TEST_RESOURCE_DIR "//forest_radiance.ktx";
+
+Dali::Texture GetDiffuseTexture(Dali::Scene3D::Model model)
+{
+  Dali::Texture texture;
+
+  Actor meshActor = model.FindChildByName("AnimatedCube");
+  if(meshActor)
+  {
+    Renderer renderer = meshActor.GetRendererAt(0u);
+    if(renderer)
+    {
+      TextureSet textureSet = renderer.GetTextures();
+      if(textureSet.GetTextureCount() == 10u)
+      {
+        texture = textureSet.GetTexture(8u);
+      }
+    }
+  }
+
+  return texture;
+}
+
+Dali::Texture GetSpecularTexture(Dali::Scene3D::Model model)
+{
+  Dali::Texture texture;
+
+  Actor meshActor = model.FindChildByName("AnimatedCube");
+  if(meshActor)
+  {
+    Renderer renderer = meshActor.GetRendererAt(0u);
+    if(renderer)
+    {
+      TextureSet textureSet = renderer.GetTextures();
+      if(textureSet.GetTextureCount() == 10u)
+      {
+        texture = textureSet.GetTexture(9u);
+      }
+    }
+  }
+
+  return texture;
+}
+
+// For ResourceReady
+static bool gOnRelayoutCallBackCalled = false;
+void        OnRelayoutCallback(Actor actor)
+{
+  gOnRelayoutCallBackCalled = true;
+}
+
+static bool gResourceReadyCalled = false;
+void        OnResourceReady(Control control)
+{
+  gResourceReadyCalled = true;
+}
+} // namespace
+
+// Negative test case for a method
+int UtcDaliSceneViewUninitialized(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliSceneViewUninitialized");
+
+  Scene3D::SceneView view;
+
+  try
+  {
+    // New() must be called to create a Model or it wont be valid.
+    Actor a = Actor::New();
+    view.Add(a);
+    DALI_TEST_CHECK(false);
+  }
+  catch(Dali::DaliException& e)
+  {
+    // Tests that a negative test of an assertion succeeds
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_CHECK(!view);
+  }
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliSceneViewNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliSceneViewNew");
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  DALI_TEST_CHECK(view);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliSceneViewDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliSceneViewDownCast");
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  BaseHandle         handle(view);
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(sceneView);
+  DALI_TEST_CHECK(sceneView == view);
+  END_TEST;
+}
+
+int UtcDaliSceneViewTypeRegistry(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliSceneViewTypeRegistry");
+
+  TypeRegistry typeRegistry = TypeRegistry::Get();
+  DALI_TEST_CHECK(typeRegistry);
+
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("SceneView");
+  DALI_TEST_CHECK(typeInfo);
+
+  BaseHandle handle = typeInfo.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  Scene3D::SceneView model = Scene3D::SceneView::DownCast(handle);
+  DALI_TEST_CHECK(model);
+
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliSceneViewAddRemove(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliSceneViewAddRemove");
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  DALI_TEST_CHECK(view);
+  DALI_TEST_EQUALS(1u, view.GetChildCount(), TEST_LOCATION);
+
+  Actor actor = Actor::New();
+
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
+  view.Add(actor);
+
+  DALI_TEST_EQUALS(1u, view.GetChildCount(), TEST_LOCATION);
+  Actor layer = view.GetChildAt(0u);
+
+  DALI_TEST_EQUALS(2u, layer.GetChildCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor, layer.GetChildAt(1u), TEST_LOCATION); // index 0u is default camera
+
+  view.Remove(actor);
+  DALI_TEST_EQUALS(1u, layer.GetChildCount(), TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliSceneViewCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  DALI_TEST_CHECK(view);
+
+  Scene3D::SceneView copy(view);
+  DALI_TEST_CHECK(view == copy);
+
+  Scene3D::SceneView assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == view);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  view.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == view.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::SceneView moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!view);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  view.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == view.GetProperty<bool>(Actor::Property::SENSITIVE));
+
+  Scene3D::SceneView moved;
+  moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!view);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewOnScene01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+
+  DALI_TEST_EQUALS(1u, view.GetChildCount(), TEST_LOCATION);
+  Actor layer = view.GetChildAt(0u);
+
+  DALI_TEST_EQUALS(1u, layer.GetChildCount(), TEST_LOCATION);
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  // CameraActor is added on layer when on scene
+  DALI_TEST_EQUALS(1u, layer.GetChildCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewOnScene02(void)
+{
+  ToolkitTestApplication application;
+
+  uint32_t baseRenderTaskCount = application.GetScene().GetRenderTaskList().GetTaskCount();
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+
+  uint32_t renderTaskCount = application.GetScene().GetRenderTaskList().GetTaskCount();
+  DALI_TEST_EQUALS(baseRenderTaskCount, renderTaskCount, TEST_LOCATION);
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  renderTaskCount = application.GetScene().GetRenderTaskList().GetTaskCount();
+  DALI_TEST_EQUALS(baseRenderTaskCount + 1u, renderTaskCount, TEST_LOCATION);
+
+  RenderTask  renderTask = application.GetScene().GetRenderTaskList().GetTask(baseRenderTaskCount);
+  CameraActor camera     = renderTask.GetCameraActor();
+
+  CameraActor defaultCamera = renderTask.GetCameraActor();
+  DALI_TEST_CHECK(defaultCamera);
+  DALI_TEST_EQUALS(camera, defaultCamera, TEST_LOCATION);
+  DALI_TEST_EQUALS(defaultCamera, view.GetSelectedCamera(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewUserCamera(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  CameraActor defaultCamera = view.GetSelectedCamera();
+  CameraActor camera        = Dali::CameraActor::New();
+  camera.SetProperty(Dali::Actor::Property::NAME, "camera");
+  view.AddCamera(camera);
+  view.SelectCamera("camera");
+
+  DALI_TEST_NOT_EQUALS(defaultCamera, view.GetSelectedCamera(), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(camera, view.GetSelectedCamera(), TEST_LOCATION);
+
+  camera.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  camera.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  camera.SetFieldOfView(0.5f);
+  camera.SetNearClippingPlane(1.0f);
+  camera.SetFarClippingPlane(5000.0f);
+  camera.SetProperty(Dali::Actor::Property::POSITION, Vector3(20, 30, 40));
+
+  float   fov            = camera[Dali::CameraActor::Property::FIELD_OF_VIEW];
+  float   nearPlain      = camera[Dali::CameraActor::Property::NEAR_PLANE_DISTANCE];
+  float   farPlain       = camera[Dali::CameraActor::Property::FAR_PLANE_DISTANCE];
+  Vector3 cameraPosition = camera[Dali::Actor::Property::POSITION];
+
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(400, 300));
+
+  DALI_TEST_EQUALS(fov, camera.GetProperty<float>(Dali::CameraActor::Property::FIELD_OF_VIEW), TEST_LOCATION);
+  DALI_TEST_EQUALS(nearPlain, camera.GetProperty<float>(Dali::CameraActor::Property::NEAR_PLANE_DISTANCE), TEST_LOCATION);
+  DALI_TEST_EQUALS(farPlain, camera.GetProperty<float>(Dali::CameraActor::Property::FAR_PLANE_DISTANCE), TEST_LOCATION);
+  DALI_TEST_EQUALS(cameraPosition, camera.GetProperty<Vector3>(Dali::Actor::Property::POSITION), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewAddRemoveCamera(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  CameraActor camera0 = view.GetSelectedCamera();
+  camera0.SetProperty(Dali::Actor::Property::NAME, "camera0");
+  CameraActor camera1 = Dali::CameraActor::New();
+  camera1.SetProperty(Dali::Actor::Property::NAME, "camera1");
+
+  DALI_TEST_EQUALS(1u, view.GetCameraCount(), TEST_LOCATION);
+  view.AddCamera(camera1);
+  DALI_TEST_EQUALS(2u, view.GetCameraCount(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(camera0, view.GetCamera(0), TEST_LOCATION);
+  DALI_TEST_EQUALS(camera0, view.GetCamera("camera0"), TEST_LOCATION);
+  DALI_TEST_EQUALS(camera1, view.GetCamera(1), TEST_LOCATION);
+  DALI_TEST_EQUALS(camera1, view.GetCamera("camera1"), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(camera0, view.GetSelectedCamera(), TEST_LOCATION);
+  view.SelectCamera(1); // 0 -> 1
+  DALI_TEST_EQUALS(camera1, view.GetSelectedCamera(), TEST_LOCATION);
+  view.SelectCamera("camera0"); // 1 -> 0
+  DALI_TEST_EQUALS(camera0, view.GetSelectedCamera(), TEST_LOCATION);
+  view.SelectCamera("camera1"); // 0 -> 1
+  DALI_TEST_EQUALS(camera1, view.GetSelectedCamera(), TEST_LOCATION);
+  view.SelectCamera(0); // 1 -> 0
+  DALI_TEST_EQUALS(camera0, view.GetSelectedCamera(), TEST_LOCATION);
+
+  view.SelectCamera(1); // 0 -> 1
+  DALI_TEST_EQUALS(camera1, view.GetSelectedCamera(), TEST_LOCATION);
+  DALI_TEST_EQUALS(2u, view.GetCameraCount(), TEST_LOCATION);
+  view.RemoveCamera(camera1); // 1 -> 0
+  DALI_TEST_EQUALS(camera0, view.GetSelectedCamera(), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, view.GetCameraCount(), TEST_LOCATION);
+
+  CameraActor defaultCamera = view.GetSelectedCamera();
+  DALI_TEST_CHECK(defaultCamera);
+  DALI_TEST_EQUALS(camera0, defaultCamera, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(camera1, defaultCamera, 0.0f, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliSceneViewImageBasedLight01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Model modelView1 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  Scene3D::Model modelView2 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  Scene3D::Model modelView3 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  view.Add(modelView1);
+  view.Add(modelView2);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(GetDiffuseTexture(modelView1), GetDiffuseTexture(modelView2), TEST_LOCATION);
+  DALI_TEST_EQUALS(GetSpecularTexture(modelView1), GetSpecularTexture(modelView2), TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), GetDiffuseTexture(modelView3), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), GetSpecularTexture(modelView3), 0.0f, TEST_LOCATION);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  view.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(GetDiffuseTexture(modelView1), GetDiffuseTexture(modelView2), TEST_LOCATION);
+  DALI_TEST_EQUALS(GetSpecularTexture(modelView1), GetSpecularTexture(modelView2), TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), GetDiffuseTexture(modelView3), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), GetSpecularTexture(modelView3), 0.0f, TEST_LOCATION);
+
+  view.Add(modelView3);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(GetDiffuseTexture(modelView1), GetDiffuseTexture(modelView3), TEST_LOCATION);
+  DALI_TEST_EQUALS(GetSpecularTexture(modelView1), GetSpecularTexture(modelView3), TEST_LOCATION);
+
+  view.Remove(modelView1);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  view.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE2, TEST_SPECULAR_TEXTURE2);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), GetDiffuseTexture(modelView2), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), GetSpecularTexture(modelView2), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), GetDiffuseTexture(modelView3), 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), GetSpecularTexture(modelView3), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetDiffuseTexture(modelView2), GetDiffuseTexture(modelView3), TEST_LOCATION);
+  DALI_TEST_EQUALS(GetSpecularTexture(modelView2), GetSpecularTexture(modelView3), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewImageBasedLight02(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Model modelView1 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  modelView1.ResourceReadySignal().Connect(OnResourceReady);
+  view.Add(modelView1);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  view.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  Dali::Texture diffuseTexture  = GetDiffuseTexture(modelView1);
+  Dali::Texture specularTexture = GetSpecularTexture(modelView1);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  modelView1.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE2, TEST_SPECULAR_TEXTURE2);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), diffuseTexture, 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), specularTexture, 0.0f, TEST_LOCATION);
+  diffuseTexture  = GetDiffuseTexture(modelView1);
+  specularTexture = GetSpecularTexture(modelView1);
+
+  // reset SceneView IBL
+  view.SetImageBasedLightSource("", "");
+  DALI_TEST_EQUALS(GetDiffuseTexture(modelView1), diffuseTexture, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetSpecularTexture(modelView1), specularTexture, TEST_LOCATION);
+
+  modelView1.SetImageBasedLightSource("", "");
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), diffuseTexture, 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), specularTexture, 0.0f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewImageBasedLight03(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Model modelView1 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  view.Add(modelView1);
+  modelView1.SetImageBasedLightSource(TEST_SPECULAR_TEXTURE, TEST_DIFFUSE_TEXTURE);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  Dali::Texture diffuseTexture  = GetDiffuseTexture(modelView1);
+  Dali::Texture specularTexture = GetSpecularTexture(modelView1);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  view.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE2, TEST_SPECULAR_TEXTURE2);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(GetDiffuseTexture(modelView1), diffuseTexture, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetSpecularTexture(modelView1), specularTexture, TEST_LOCATION);
+
+  modelView1.SetImageBasedLightSource("", "");
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), diffuseTexture, 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), specularTexture, 0.0f, TEST_LOCATION);
+  diffuseTexture  = GetDiffuseTexture(modelView1);
+  specularTexture = GetSpecularTexture(modelView1);
+
+  // reset SceneView IBL
+  view.SetImageBasedLightSource("", "");
+  DALI_TEST_NOT_EQUALS(GetDiffuseTexture(modelView1), diffuseTexture, 0.0f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(GetSpecularTexture(modelView1), specularTexture, 0.0f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewImageBasedFactor(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  Scene3D::Model modelView1 = Scene3D::Model::New(TEST_GLTF_FILE_NAME);
+  view.Add(modelView1);
+
+  DALI_TEST_EQUALS(view.GetImageBasedLightScaleFactor(), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(modelView1.GetImageBasedLightScaleFactor(), 1.0f, TEST_LOCATION);
+
+  view.SetImageBasedLightScaleFactor(0.5f);
+  DALI_TEST_EQUALS(view.GetImageBasedLightScaleFactor(), 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(modelView1.GetImageBasedLightScaleFactor(), 1.0f, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliSceneViewUseFramebuffer01(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  bool useFramebuffer = view.IsUsingFramebuffer();
+  view.UseFramebuffer(true);
+  DALI_TEST_NOT_EQUALS(useFramebuffer, view.IsUsingFramebuffer(), 0.0f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewUseFramebuffer02(void)
+{
+  ToolkitTestApplication application;
+
+  uint32_t baseRenderTaskCount = application.GetScene().GetRenderTaskList().GetTaskCount();
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  RenderTask renderTask = application.GetScene().GetRenderTaskList().GetTask(baseRenderTaskCount);
+  DALI_TEST_CHECK(!renderTask.GetFrameBuffer());
+
+  view.UseFramebuffer(true);
+  DALI_TEST_CHECK(renderTask.GetFrameBuffer());
+
+  view.UseFramebuffer(false);
+  DALI_TEST_CHECK(!renderTask.GetFrameBuffer());
+
+  view.UseFramebuffer(true);
+  DALI_TEST_CHECK(renderTask.GetFrameBuffer());
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewFramebufferMultiSamplingLevel(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  uint8_t expectValue        = 0u; // Default MultiSamplingLevel is 0.
+  uint8_t multiSamplingLevel = view.GetFramebufferMultiSamplingLevel();
+  DALI_TEST_EQUALS(multiSamplingLevel, expectValue, TEST_LOCATION);
+
+  expectValue = 4u; // Change value.
+  view.UseFramebuffer(true);
+  view.SetFramebufferMultiSamplingLevel(expectValue);
+
+  multiSamplingLevel = view.GetFramebufferMultiSamplingLevel();
+  DALI_TEST_EQUALS(multiSamplingLevel, expectValue, TEST_LOCATION);
+
+  // Note : we don't check multi sampling level is applied to framebuffer, or not.
+  view.UseFramebuffer(false);
+  expectValue = 2u; // Change value.
+  view.SetFramebufferMultiSamplingLevel(expectValue);
+
+  application.SendNotification();
+  application.Render();
+
+  multiSamplingLevel = view.GetFramebufferMultiSamplingLevel();
+  DALI_TEST_EQUALS(multiSamplingLevel, expectValue, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewResourceReady(void)
+{
+  ToolkitTestApplication application;
+
+  gOnRelayoutCallBackCalled = false;
+  gResourceReadyCalled      = false;
+  Scene3D::SceneView view   = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  view.OnRelayoutSignal().Connect(OnRelayoutCallback);
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  // SceneView::IsResourceReady() returns true by default.
+  DALI_TEST_EQUALS(view.IsResourceReady(), true, TEST_LOCATION);
+
+  // Sanity check
+  DALI_TEST_CHECK(!gOnRelayoutCallBackCalled);
+  DALI_TEST_CHECK(!gResourceReadyCalled);
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  gOnRelayoutCallBackCalled = false;
+  gResourceReadyCalled      = false;
+
+  view.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetSkybox(void)
+{
+  ToolkitTestApplication application;
+
+  gResourceReadyCalled    = false;
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t childCount = view.GetChildAt(0u).GetChildCount();
+  view.SetSkybox(TEST_SPECULAR_TEXTURE);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetChildCount(), childCount + 1, TEST_LOCATION);
+
+  view.Unparent();
+  view.Reset();
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetSkyboxEquirectangular(void)
+{
+  ToolkitTestApplication application;
+
+  gResourceReadyCalled    = false;
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t childCount = view.GetChildAt(0u).GetChildCount();
+  view.SetSkyboxEnvironmentMapType(Scene3D::EnvironmentMapType::EQUIRECTANGULAR);
+  view.SetSkybox(TEST_EQUIRECTANGULAR_TEXTURE);
+
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetChildCount(), childCount + 1, TEST_LOCATION);
+
+  view.Unparent();
+  view.Reset();
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetSkyboxEmpty(void)
+{
+  ToolkitTestApplication application;
+
+  gResourceReadyCalled    = false;
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t childCount = view.GetChildAt(0u).GetChildCount();
+  view.SetSkybox("");
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetChildCount(), childCount, TEST_LOCATION);
+
+  view.Unparent();
+  view.Reset();
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetSkyboxEmpty2(void)
+{
+  ToolkitTestApplication application;
+
+  gResourceReadyCalled    = false;
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  view.SetSkybox(TEST_EQUIRECTANGULAR_TEXTURE);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  uint32_t childCount = view.GetChildAt(0u).GetChildCount();
+
+  view.SetSkybox("");
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetChildCount(), childCount - 1, TEST_LOCATION);
+
+  view.Unparent();
+  view.Reset();
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetSkyboxEquirectangularEmpty(void)
+{
+  ToolkitTestApplication application;
+
+  gResourceReadyCalled    = false;
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t childCount = view.GetChildAt(0u).GetChildCount();
+  view.SetSkybox("");
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetChildCount(), childCount, TEST_LOCATION);
+
+  view.Unparent();
+  view.Reset();
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetSkyboxIntensity(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+
+  float intensity = 0.5f;
+  DALI_TEST_EQUALS(view.GetSkyboxIntensity(), 1.0f, TEST_LOCATION);
+
+  view.SetSkyboxIntensity(intensity);
+  DALI_TEST_EQUALS(view.GetSkyboxIntensity(), intensity, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetSkyboxOrientation(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+
+  Dali::Quaternion orientation = Dali::Quaternion(Radian(0.5f), Vector3::YAXIS);
+  view.SetSkyboxOrientation(orientation);
+  DALI_TEST_EQUALS(view.GetSkyboxOrientation(), orientation, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetImageBasedLightAndSkybox(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.ResourceReadySignal().Connect(OnResourceReady);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+  view.SetImageBasedLightSource(TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE);
+  view.SetSkybox(TEST_SPECULAR_TEXTURE);
+  application.GetScene().Add(view);
+
+  // Check SceneView needs 3 trigger to load both of image based light and skybox.
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewCreateAndRemoveRenderTask(void)
+{
+  ToolkitTestApplication application;
+  RenderTaskList         taskList = application.GetScene().GetRenderTaskList();
+
+  uint32_t baseRenderTaskCount = taskList.GetTaskCount();
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+
+  DALI_TEST_EQUALS(baseRenderTaskCount, application.GetScene().GetRenderTaskList().GetTaskCount(), TEST_LOCATION);
+
+  application.GetScene().Add(view);
+
+  DALI_TEST_EQUALS(baseRenderTaskCount + 1, application.GetScene().GetRenderTaskList().GetTaskCount(), TEST_LOCATION);
+
+  view.Unparent();
+
+  DALI_TEST_EQUALS(baseRenderTaskCount, application.GetScene().GetRenderTaskList().GetTaskCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewColorMode(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  application.GetScene().Add(view);
+
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetProperty<int>(Dali::Actor::Property::COLOR_MODE), static_cast<int>(ColorMode::USE_OWN_MULTIPLY_PARENT_ALPHA), TEST_LOCATION);
+
+  view.UseFramebuffer(true);
+
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetProperty<int>(Dali::Actor::Property::COLOR_MODE), static_cast<int>(ColorMode::USE_OWN_COLOR), TEST_LOCATION);
+
+  view.UseFramebuffer(false);
+
+  DALI_TEST_EQUALS(view.GetChildAt(0u).GetProperty<int>(Dali::Actor::Property::COLOR_MODE), static_cast<int>(ColorMode::USE_OWN_MULTIPLY_PARENT_ALPHA), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetResolution(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  application.GetScene().Add(view);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 100u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 100u, TEST_LOCATION);
+
+  view.SetResolution(200u, 200u);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 100u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 100u, TEST_LOCATION);
+
+  view.UseFramebuffer(true);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 200u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 200u, TEST_LOCATION);
+
+  view.SetResolution(300u, 0u);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 100u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 100u, TEST_LOCATION);
+
+  view.SetResolution(300u, 400u);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 300u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 400u, TEST_LOCATION);
+
+  view.ResetResolution();
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 100u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 100u, TEST_LOCATION);
+
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(400, 400));
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 400u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 400u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliSceneViewSetResolution02(void)
+{
+  tet_infoline("Test whether framebuffer created well base on inputed resolution");
+  ToolkitTestApplication application;
+  RenderTaskList         renderTaskList = application.GetScene().GetRenderTaskList();
+
+  uint32_t baseRenderTaskCount = renderTaskList.GetTaskCount();
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  application.GetScene().Add(view);
+  view.SetProperty(Dali::Actor::Property::SIZE, Vector2(100, 100));
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 100u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 100u, TEST_LOCATION);
+
+  uint32_t expectWidth  = 83u;
+  uint32_t expectHeight = 207u;
+
+  view.SetResolution(expectWidth, expectHeight);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), 100u, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), 100u, TEST_LOCATION);
+
+  tet_printf("Test Framebuffer result target created well\n");
+  view.UseFramebuffer(true);
+
+  RenderTask renderTask = renderTaskList.GetTask(baseRenderTaskCount);
+  DALI_TEST_CHECK(renderTask);
+
+  FrameBuffer frameBuffer = renderTask.GetFrameBuffer();
+  DALI_TEST_CHECK(frameBuffer);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), expectWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), expectHeight, TEST_LOCATION);
+
+  Texture renderTargetTexture = frameBuffer.GetColorTexture();
+  DALI_TEST_CHECK(renderTargetTexture);
+  DALI_TEST_EQUALS(renderTargetTexture.GetWidth(), expectWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderTargetTexture.GetHeight(), expectHeight, TEST_LOCATION);
+
+  tet_printf("Test Framebuffer result target created well after create new FBO, by set multisampling level\n");
+  view.SetFramebufferMultiSamplingLevel(2u);
+
+  renderTask = renderTaskList.GetTask(baseRenderTaskCount);
+  DALI_TEST_CHECK(renderTask);
+
+  frameBuffer = renderTask.GetFrameBuffer();
+  DALI_TEST_CHECK(frameBuffer);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), expectWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), expectHeight, TEST_LOCATION);
+
+  renderTargetTexture = frameBuffer.GetColorTexture();
+  DALI_TEST_CHECK(renderTargetTexture);
+
+  DALI_TEST_EQUALS(renderTargetTexture.GetWidth(), expectWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderTargetTexture.GetHeight(), expectHeight, TEST_LOCATION);
+
+  tet_printf("Test Framebuffer result target created well after change resolution\n");
+  expectWidth  = 421u;
+  expectHeight = 103u;
+  view.SetResolution(expectWidth, expectHeight);
+
+  renderTask = renderTaskList.GetTask(baseRenderTaskCount);
+  DALI_TEST_CHECK(renderTask);
+
+  frameBuffer = renderTask.GetFrameBuffer();
+  DALI_TEST_CHECK(frameBuffer);
+
+  DALI_TEST_EQUALS(view.GetResolutionWidth(), expectWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetResolutionHeight(), expectHeight, TEST_LOCATION);
+
+  renderTargetTexture = frameBuffer.GetColorTexture();
+  DALI_TEST_CHECK(renderTargetTexture);
+
+  DALI_TEST_EQUALS(renderTargetTexture.GetWidth(), expectWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderTargetTexture.GetHeight(), expectHeight, TEST_LOCATION);
+
+  END_TEST;
+}
+
+namespace
+{
+const char* TEST_MASK_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/mask.png";
+
+static constexpr std::string_view Y_FLIP_MASK_TEXTURE = "uYFlipMaskTexture";
+} // namespace
+
+int UtcDaliSceneViewMasking(void)
+{
+  ToolkitTestApplication application;
+
+  Scene3D::SceneView view = Scene3D::SceneView::New();
+  application.GetScene().Add(view);
+
+  DALI_TEST_EQUALS(view.GetProperty<std::string>(Dali::Scene3D::SceneView::Property::ALPHA_MASK_URL), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetProperty<bool>(Dali::Scene3D::SceneView::Property::CROP_TO_MASK), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetProperty<float>(Dali::Scene3D::SceneView::Property::MASK_CONTENT_SCALE), 1.0f, TEST_LOCATION);
+
+  auto yFlipMaskTextureIndex = view.GetPropertyIndex(Y_FLIP_MASK_TEXTURE.data());
+  DALI_TEST_EQUALS(yFlipMaskTextureIndex, Property::INVALID_INDEX, TEST_LOCATION);
+
+  view.UseFramebuffer(true);
+  view.SetProperty(Dali::Scene3D::SceneView::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+  view.SetProperty(Dali::Scene3D::SceneView::Property::CROP_TO_MASK, false);
+  view.SetProperty(Dali::Scene3D::SceneView::Property::MASK_CONTENT_SCALE, 0.5f);
+
+  DALI_TEST_EQUALS(view.GetProperty<std::string>(Dali::Scene3D::SceneView::Property::ALPHA_MASK_URL), TEST_MASK_IMAGE_FILE_NAME, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetProperty<bool>(Dali::Scene3D::SceneView::Property::CROP_TO_MASK), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetProperty<float>(Dali::Scene3D::SceneView::Property::MASK_CONTENT_SCALE), 0.5f, TEST_LOCATION);
+
+  yFlipMaskTextureIndex = view.GetPropertyIndex(std::string(Y_FLIP_MASK_TEXTURE));
+  DALI_TEST_EQUALS(view.GetProperty<float>(yFlipMaskTextureIndex), 1.0f, TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-ShaderDefinition.cpp b/automated-tests/src/dali-scene3d/utc-Dali-ShaderDefinition.cpp
new file mode 100644
index 0000000..3804038
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-ShaderDefinition.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/shader-definition.h"
+#include <dali-test-suite-utils.h>
+#include <string_view>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+int UtcDaliShaderDefinitionFailedToLoad(void)
+{
+  ShaderDefinition shaderDef;
+  shaderDef.mVertexShaderPath = "nonexistent.vsh";
+  shaderDef.mFragmentShaderPath = "nonexistent.vsh";
+
+  DALI_TEST_ASSERTION(shaderDef.LoadRaw(""), "Failed to load shader source");
+
+  shaderDef.mVertexShaderPath = "dli_pbr.vsh";
+
+  auto shaderPath = TEST_RESOURCE_DIR "/";
+  DALI_TEST_ASSERTION(shaderDef.LoadRaw(shaderPath), "Failed to load shader source");
+
+  shaderDef.mFragmentShaderPath = "dli_pbr.fsh";
+
+  shaderDef.mHints.push_back("MODIFIES_GEOMETRY");
+  shaderDef.mHints.push_back("OUTPUT_IS_TRANSPARENT");
+  auto raw = shaderDef.LoadRaw(shaderPath);
+
+  TestApplication app;
+  auto shader = shaderDef.Load(std::move(raw));
+  DALI_TEST_CHECK(shader);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-ShaderManager.cpp b/automated-tests/src/dali-scene3d/utc-Dali-ShaderManager.cpp
new file mode 100644
index 0000000..f17dcb3
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-ShaderManager.cpp
@@ -0,0 +1,337 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-scene3d/public-api/loader/node-definition.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-test-suite-utils.h>
+#include <set>
+#include <string_view>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+struct Context
+{
+  ResourceBundle resources;
+};
+
+struct ShaderParameters
+{
+  MeshDefinition&     meshDefinition;
+  MaterialDefinition& materialDefinition;
+  NodeDefinition&     nodeDefinition;
+};
+
+struct Permutation
+{
+  using ConfigureFn = void (*)(ShaderParameters&);
+
+  ConfigureFn configureFn;
+
+  std::set<ShaderOption::Type> options;
+  RendererState::Type          rendererStateSet   = 0;
+  RendererState::Type          rendererStateClear = 0;
+};
+
+struct PermutationSet
+{
+  std::vector<const Permutation*> permutations;
+};
+
+} // namespace
+
+int UtcDaliShaderManagerProduceShader(void)
+{
+  Context ctx;
+  ctx.resources.mMaterials.push_back({});
+  ctx.resources.mMeshes.push_back({});
+
+  Permutation permutations[]{
+    {
+      //0
+      [](ShaderParameters& p) {},
+      {},
+      RendererState::DEPTH_TEST | RendererState::CULL_BACK,
+    },
+    {
+      //1
+      [](ShaderParameters& p) {
+        p.materialDefinition.mFlags |= MaterialDefinition::TRANSPARENCY;
+      },
+      {ShaderOption::Type::THREE_TEXTURE},
+      RendererState::ALPHA_BLEND,
+    },
+    {//2
+     [](ShaderParameters& p) {
+       p.materialDefinition.mFlags |= MaterialDefinition::ALBEDO;
+       p.materialDefinition.mTextureStages.push_back({MaterialDefinition::ALBEDO, {}});
+     },
+     {ShaderOption::Type::THREE_TEXTURE, ShaderOption::Type::BASE_COLOR_TEXTURE}},
+    {//3
+     [](ShaderParameters& p) {
+       p.materialDefinition.mTextureStages.push_back({MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS, {}});
+     },
+     {ShaderOption::Type::THREE_TEXTURE, ShaderOption::Type::METALLIC_ROUGHNESS_TEXTURE}},
+    {//4
+     [](ShaderParameters& p) {
+       p.materialDefinition.mFlags |= MaterialDefinition::NORMAL;
+       p.materialDefinition.mTextureStages.push_back({MaterialDefinition::NORMAL, {}});
+     },
+     {ShaderOption::Type::THREE_TEXTURE, ShaderOption::Type::NORMAL_TEXTURE}},
+    {//5
+     [](ShaderParameters& p) {
+       p.materialDefinition.mFlags |= MaterialDefinition::SUBSURFACE;
+     },
+     {ShaderOption::Type::SUBSURFACE}},
+    {//6
+     [](ShaderParameters& p) {
+       p.materialDefinition.SetAlphaCutoff(.5f);
+     },
+     {ShaderOption::Type::ALPHA_TEST}},
+    {//7
+     [](ShaderParameters& p) {
+       p.materialDefinition.SetAlphaCutoff(1.f);
+     },
+     {ShaderOption::Type::ALPHA_TEST}},
+    {//8
+     [](ShaderParameters& p) {
+       p.materialDefinition.mFlags |= MaterialDefinition::GLTF_CHANNELS;
+     },
+     {ShaderOption::Type::GLTF_CHANNELS}},
+    {//9
+     [](ShaderParameters& p) {
+       p.meshDefinition.mJoints[0].mBlob.mOffset  = 0;
+       p.meshDefinition.mWeights[0].mBlob.mOffset = 0;
+     },
+     {ShaderOption::Type::SKINNING}},
+    {//10
+     [](ShaderParameters& p) {
+       p.meshDefinition.mFlags |= MeshDefinition::FLIP_UVS_VERTICAL;
+     },
+     {ShaderOption::Type::FLIP_UVS_VERTICAL}},
+    {
+      //11
+      [](ShaderParameters& p) {
+        p.meshDefinition.mBlendShapes.push_back({});
+      },
+    },
+    {//12
+     [](ShaderParameters& p) {
+       p.meshDefinition.mBlendShapes.back().deltas.mBlob.mOffset = 0;
+     },
+     {ShaderOption::Type::MORPH_POSITION}},
+    {//13
+     [](ShaderParameters& p) {
+       p.meshDefinition.mBlendShapes.back().normals.mBlob.mOffset = 0;
+     },
+     {ShaderOption::Type::MORPH_NORMAL}},
+    {//14
+     [](ShaderParameters& p) {
+       p.meshDefinition.mBlendShapes.back().tangents.mBlob.mOffset = 0;
+     },
+     {ShaderOption::Type::MORPH_TANGENT}},
+    {//15
+     [](ShaderParameters& p) {
+       auto& blendShapes = p.meshDefinition.mBlendShapes;
+       DALI_ASSERT_ALWAYS(!blendShapes.empty() &&
+                          (blendShapes.back().deltas.mBlob.mOffset != MeshDefinition::INVALID ||
+                           blendShapes.back().normals.mBlob.mOffset != MeshDefinition::INVALID ||
+                           blendShapes.back().tangents.mBlob.mOffset != MeshDefinition::INVALID));
+       p.meshDefinition.mBlendShapeVersion = BlendShapes::Version::VERSION_2_0;
+     },
+     {ShaderOption::Type::MORPH_VERSION_2_0}},
+
+    {//16
+     [](ShaderParameters& p) {
+       p.materialDefinition.mFlags |= MaterialDefinition::OCCLUSION;
+     },
+     {ShaderOption::Type::OCCLUSION}},
+
+    {//17
+     [](ShaderParameters& p) {
+       p.meshDefinition.mColors[0].mBlob.mOffset = 0;
+     },
+     {ShaderOption::Type::COLOR_ATTRIBUTE}},
+    {//18
+     [](ShaderParameters& p) {
+       p.meshDefinition.mTangentType = Property::VECTOR4;
+     },
+     {ShaderOption::Type::VEC4_TANGENT}},
+  };
+
+  PermutationSet permutationSets[]{
+    // default
+    {{&permutations[0]}},
+
+    // alpha
+    {{&permutations[0], &permutations[1]}},
+
+    // three-texture setups
+    {{&permutations[0], &permutations[2]}},
+    {{&permutations[0], &permutations[3]}},
+    {{&permutations[0], &permutations[4]}},
+    {{&permutations[0], &permutations[2], &permutations[3]}},
+    {{&permutations[0], &permutations[3], &permutations[4]}},
+    {{&permutations[0], &permutations[4], &permutations[2]}},
+    {{&permutations[0], &permutations[2], &permutations[3], &permutations[4]}},
+
+    // subsurface scattering
+    {{&permutations[0], &permutations[5]}},
+
+    // alpha test
+    {{&permutations[0], &permutations[6]}},
+    {{&permutations[0], &permutations[7]}},
+
+    // glTF channels
+    {{&permutations[0], &permutations[8]}},
+
+    // skinning
+    {{&permutations[0], &permutations[9]}},
+
+    // flip uvs
+    {{&permutations[0], &permutations[10]}},
+
+    // morphing
+    {{&permutations[0], &permutations[11], &permutations[12]}},
+    {{&permutations[0], &permutations[11], &permutations[13]}},
+    {{&permutations[0], &permutations[11], &permutations[14]}},
+    {{&permutations[0], &permutations[11], &permutations[12], &permutations[13]}},
+    {{&permutations[0], &permutations[11], &permutations[13], &permutations[14]}},
+    {{&permutations[0], &permutations[11], &permutations[14], &permutations[12]}},
+    {{&permutations[0], &permutations[11], &permutations[12], &permutations[13], &permutations[14]}},
+
+    {{&permutations[0], &permutations[11], &permutations[12], &permutations[15]}},
+    {{&permutations[0], &permutations[11], &permutations[13], &permutations[15]}},
+    {{&permutations[0], &permutations[11], &permutations[14], &permutations[15]}},
+    {{&permutations[0], &permutations[11], &permutations[12], &permutations[13], &permutations[15]}},
+    {{&permutations[0], &permutations[11], &permutations[13], &permutations[14], &permutations[15]}},
+    {{&permutations[0], &permutations[11], &permutations[14], &permutations[12], &permutations[15]}},
+    {{&permutations[0], &permutations[11], &permutations[12], &permutations[13], &permutations[14], &permutations[15]}},
+
+    // etc.
+    {{&permutations[0], &permutations[1], &permutations[2]}},
+    {{&permutations[0], &permutations[1], &permutations[3]}},
+    {{&permutations[0], &permutations[1], &permutations[2], &permutations[3]}},
+
+    // occlusion
+    {{&permutations[0], &permutations[16]}},
+  };
+
+  TestApplication app;
+  ShaderManager   shaderManager;
+  for(auto& permutationSet : permutationSets)
+  {
+    static int tc = 0;
+    tet_printf("Test %d's tc\n", ++tc);
+    auto modelRenderable          = new ModelRenderable();
+    modelRenderable->mMeshIdx     = 0;
+    modelRenderable->mMaterialIdx = 0;
+
+    NodeDefinition                              nodeDefinition;
+    std::unique_ptr<NodeDefinition::Renderable> renderable;
+    renderable.reset(modelRenderable);
+    nodeDefinition.mRenderables.push_back(std::move(renderable));
+
+    MeshDefinition     meshDefinition;
+    MaterialDefinition materialDefinition;
+    ShaderParameters   shaderParameter{meshDefinition, materialDefinition, nodeDefinition};
+
+    // Only define skinning accessors for skinning test...
+    if(permutationSet.permutations.size() > 1)
+    {
+      auto& checkP = permutationSet.permutations[1];
+      if(auto search = checkP->options.find(ShaderOption::Type::SKINNING);
+         search != checkP->options.end())
+      {
+        meshDefinition.mJoints.push_back(MeshDefinition::Accessor{MeshDefinition::Blob{0, 0}, {}});
+        meshDefinition.mWeights.push_back(MeshDefinition::Accessor{MeshDefinition::Blob{0, 0}, {}});
+      }
+    }
+    std::set<std::string> defines;
+    ShaderOption          option1;
+    RendererState::Type   rendererState = 0;
+    for(auto permutation : permutationSet.permutations)
+    {
+      permutation->configureFn(shaderParameter);
+      if(materialDefinition.mFlags & MaterialDefinition::TRANSPARENCY)
+      {
+        option1.SetTransparency();
+      }
+      for(auto&& optionType : permutation->options)
+      {
+        option1.AddOption(optionType);
+      }
+      // No permutation uses extra joint weights.
+      option1.AddJointMacros(0);
+      rendererState = (rendererState | permutation->rendererStateSet) & ~permutation->rendererStateClear;
+    }
+    option1.AddOption(ShaderOption::Type::THREE_TEXTURE);
+
+    ShaderOption option2 = shaderManager.ProduceShaderOption(materialDefinition, meshDefinition);
+
+    Shader shaderFromOption1 = shaderManager.ProduceShader(option1);
+    Shader shaderFromOption2 = shaderManager.ProduceShader(option2);
+    DALI_TEST_EQUAL(option1.GetOptionHash(), option2.GetOptionHash());
+    DALI_TEST_EQUAL(shaderFromOption1, shaderFromOption2);
+
+    RendererState::Type rendererStateFromMaterialDefinition = shaderManager.GetRendererState(materialDefinition);
+    DALI_TEST_EQUAL(rendererStateFromMaterialDefinition, rendererState);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliShaderManagerAddAndRemoveLights(void)
+{
+  TestApplication app;
+  ShaderManager   shaderManager;
+
+  ShaderOption option1;
+  option1.AddOption(ShaderOption::Type::THREE_TEXTURE);
+  Dali::Shader shader1 = shaderManager.ProduceShader(option1);
+
+  ShaderOption option2;
+  option2.AddOption(ShaderOption::Type::BASE_COLOR_TEXTURE);
+  Dali::Shader shader2 = shaderManager.ProduceShader(option2);
+
+  DALI_TEST_NOT_EQUALS(shader1, shader2, 0.1f, TEST_LOCATION);
+  DALI_TEST_EQUALS(shader1.GetProperty<int>(shader1.GetPropertyIndex("uLightCount")), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(shader2.GetProperty<int>(shader2.GetPropertyIndex("uLightCount")), 0, TEST_LOCATION);
+
+  Scene3D::Light light = Scene3D::Light::New();
+  shaderManager.AddLight(light);
+
+  DALI_TEST_EQUALS(shader1.GetProperty<int>(shader1.GetPropertyIndex("uLightCount")), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(shader2.GetProperty<int>(shader2.GetPropertyIndex("uLightCount")), 1, TEST_LOCATION);
+
+  ShaderOption option3;
+  option3.AddOption(ShaderOption::Type::METALLIC_ROUGHNESS_TEXTURE);
+  Dali::Shader shader3 = shaderManager.ProduceShader(option3);
+
+  DALI_TEST_NOT_EQUALS(shader1, shader3, 0.1f, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(shader2, shader3, 0.1f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(shader3.GetProperty<int>(shader3.GetPropertyIndex("uLightCount")), 1, TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-ShaderOption.cpp b/automated-tests/src/dali-scene3d/utc-Dali-ShaderOption.cpp
new file mode 100644
index 0000000..71514fd
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-ShaderOption.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <string_view>
+#include "dali-scene3d/public-api/loader/shader-option.h"
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void shader_definition_option_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void shader_definition_option_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+int UtcDaliShaderOptionInit(void)
+{
+  Scene3D::Loader::ShaderOption option;
+  DALI_TEST_EQUALS(option.GetOptionHash(), 0u, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliShaderOptionSetTransparency(void)
+{
+  Scene3D::Loader::ShaderOption option;
+  DALI_TEST_EQUALS(option.GetOptionHash(), 0u, TEST_LOCATION);
+
+  option.SetTransparency();
+  DALI_TEST_NOT_EQUALS(option.GetOptionHash(), static_cast<uint64_t>(0u), 0.1f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliShaderOptionAddOption(void)
+{
+  Scene3D::Loader::ShaderOption option;
+  DALI_TEST_EQUALS(option.GetOptionHash(), 0u, TEST_LOCATION);
+
+  Scene3D::Loader::ShaderOption::Type types[19] = {
+    Scene3D::Loader::ShaderOption::Type::GLTF_CHANNELS,
+    Scene3D::Loader::ShaderOption::Type::THREE_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::BASE_COLOR_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::METALLIC_ROUGHNESS_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::NORMAL_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::OCCLUSION,
+    Scene3D::Loader::ShaderOption::Type::EMISSIVE,
+    Scene3D::Loader::ShaderOption::Type::ALPHA_TEST,
+    Scene3D::Loader::ShaderOption::Type::SUBSURFACE,
+    Scene3D::Loader::ShaderOption::Type::SPECULAR,
+    Scene3D::Loader::ShaderOption::Type::SPECULAR_COLOR,
+    Scene3D::Loader::ShaderOption::Type::SKINNING,
+    Scene3D::Loader::ShaderOption::Type::FLIP_UVS_VERTICAL,
+    Scene3D::Loader::ShaderOption::Type::COLOR_ATTRIBUTE,
+    Scene3D::Loader::ShaderOption::Type::VEC4_TANGENT,
+    Scene3D::Loader::ShaderOption::Type::MORPH_POSITION,
+    Scene3D::Loader::ShaderOption::Type::MORPH_NORMAL,
+    Scene3D::Loader::ShaderOption::Type::MORPH_TANGENT,
+    Scene3D::Loader::ShaderOption::Type::MORPH_VERSION_2_0};
+
+  uint64_t hash = 0u;
+  for(uint32_t i = 0; i < 19; ++i)
+  {
+    hash |= (1 << static_cast<uint32_t>(types[i]));
+    option.AddOption(types[i]);
+    DALI_TEST_EQUALS(option.GetOptionHash(), hash, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliShaderOptionGetDefines(void)
+{
+  Scene3D::Loader::ShaderOption option;
+  DALI_TEST_EQUALS(option.GetOptionHash(), 0u, TEST_LOCATION);
+
+  Scene3D::Loader::ShaderOption::Type types[19] = {
+    Scene3D::Loader::ShaderOption::Type::GLTF_CHANNELS,
+    Scene3D::Loader::ShaderOption::Type::THREE_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::BASE_COLOR_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::METALLIC_ROUGHNESS_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::NORMAL_TEXTURE,
+    Scene3D::Loader::ShaderOption::Type::OCCLUSION,
+    Scene3D::Loader::ShaderOption::Type::EMISSIVE,
+    Scene3D::Loader::ShaderOption::Type::ALPHA_TEST,
+    Scene3D::Loader::ShaderOption::Type::SUBSURFACE,
+    Scene3D::Loader::ShaderOption::Type::SPECULAR,
+    Scene3D::Loader::ShaderOption::Type::SPECULAR_COLOR,
+    Scene3D::Loader::ShaderOption::Type::SKINNING,
+    Scene3D::Loader::ShaderOption::Type::FLIP_UVS_VERTICAL,
+    Scene3D::Loader::ShaderOption::Type::COLOR_ATTRIBUTE,
+    Scene3D::Loader::ShaderOption::Type::VEC4_TANGENT,
+    Scene3D::Loader::ShaderOption::Type::MORPH_POSITION,
+    Scene3D::Loader::ShaderOption::Type::MORPH_NORMAL,
+    Scene3D::Loader::ShaderOption::Type::MORPH_TANGENT,
+    Scene3D::Loader::ShaderOption::Type::MORPH_VERSION_2_0};
+
+  uint64_t hash = 0u;
+  for(uint32_t i = 0; i < 19; ++i)
+  {
+    hash |= (1 << static_cast<uint32_t>(types[i]));
+    option.AddOption(types[i]);
+    DALI_TEST_EQUALS(option.GetOptionHash(), hash, TEST_LOCATION);
+
+    std::vector<std::string> defines;
+    option.GetDefines(defines);
+    DALI_TEST_EQUALS(defines.size(), i + 1, TEST_LOCATION);
+    for(uint32_t j = 0; j < defines.size(); ++j)
+    {
+      DALI_TEST_EQUALS(defines[j], option.GetDefineKeyword(types[j]), TEST_LOCATION);
+    }
+  }
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-StringCallback.cpp b/automated-tests/src/dali-scene3d/utc-Dali-StringCallback.cpp
new file mode 100644
index 0000000..3b80905
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-StringCallback.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include <dali-test-suite-utils.h>
+#include <string_view>
+#include "dali-scene3d/public-api/loader/string-callback.h"
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+char sBuffer[64];
+
+void TestLogFunction(Integration::Log::DebugPriority level, std::string& str)
+{
+  snprintf(sBuffer, sizeof(sBuffer), "%d: %s", level, str.c_str());
+}
+
+} // namespace
+
+int UtcDaliUtilsDefaultStringCallback(void)
+{
+  InstallLogFunction(TestLogFunction);
+  DefaultErrorCallback("Hello world!");
+  DALI_TEST_EQUAL(std::string(sBuffer), "3: string-callback.cpp: DefaultErrorCallback(28) > Hello world!");
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-Utils.cpp b/automated-tests/src/dali-scene3d/utc-Dali-Utils.cpp
new file mode 100644
index 0000000..05b53e7
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-Utils.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/utils.h"
+#include <dali-test-suite-utils.h>
+#include <string_view>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+constexpr std::string_view TEST_STRING = "The quick brown fox jumped over a lazy dog.1337true";
+}
+
+template <size_t N>
+void HelpTestStreamBuffer()
+{
+  char buffer[N];
+  StreamBuffer streamBuffer(buffer, N); // note we aren't leaving space for a terminating 0 as we're using strNcmp.
+  std::ostream stream(&streamBuffer);
+
+  stream << "The quick brown fox jumped over a lazy dog.";
+  stream << 1337;
+  stream << std::boolalpha << true;
+
+  const size_t checkLen = std::min(N, TEST_STRING.size());
+  DALI_TEST_EQUAL(0, strncmp(buffer, TEST_STRING.data(), checkLen));
+}
+
+int UtcDaliUtilsStreamBuffer(void)
+{
+  HelpTestStreamBuffer<16>();
+  HelpTestStreamBuffer<32>();
+  HelpTestStreamBuffer<64>();
+  END_TEST;
+}
+
+int UtcDaliUtilsFormatString(void)
+{
+  DALI_TEST_EQUAL(FormatString("%s", "hello"), "hello");
+  DALI_TEST_EQUAL(FormatString("%d", 1667), "1667");
+
+  DALI_TEST_EQUAL(FormatString("%s %d", "hello", 2778), "hello 2778");
+  DALI_TEST_EQUAL(FormatString("%d %s", 3889, "hello"), "3889 hello");
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-scene3d/utc-Dali-ViewProjection.cpp b/automated-tests/src/dali-scene3d/utc-Dali-ViewProjection.cpp
new file mode 100644
index 0000000..0c47b6b
--- /dev/null
+++ b/automated-tests/src/dali-scene3d/utc-Dali-ViewProjection.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Enable debug log for test coverage
+#define DEBUG_ENABLED 1
+
+#include "dali-scene3d/public-api/loader/view-projection.h"
+#include <dali-test-suite-utils.h>
+
+using namespace Dali;
+using namespace Dali::Scene3D::Loader;
+
+namespace
+{
+void SetPerspectiveProjection(Matrix& m)
+{
+  auto data = m.AsFloat();
+  float near = 1.f;
+  float far = 10.f;
+  float right = 1.f;
+  float left = -right;
+  float top = .75f;
+  float bottom = -top;
+  data[0] = 2.f * near / (right - left);
+  data[5] = 2.f * near / (top - bottom);
+  data[8] = (right + left) / (right - left);
+  data[9] = (top + bottom) / (top - bottom);
+  data[10] = (far + near) / (far - near);
+  data[11] = -1.f;
+  data[14] = 2 * far * near / (far - near);
+}
+
+}
+
+int UtcDaliViewProjection(void)
+{
+  ViewProjection vp;
+  Matrix viewMatrix;
+  viewMatrix.SetTransformComponents( Vector3::ONE,
+    Quaternion(Radian(Degree(90.f)), Vector3::YAXIS),
+    Vector3::XAXIS * 200.f);
+  vp.GetView() = viewMatrix;
+
+  Matrix projectionMatrix;
+  SetPerspectiveProjection(projectionMatrix);
+  vp.GetProjection() = projectionMatrix;
+
+  vp.Update();
+
+  [&](const ViewProjection& vp) {
+    DALI_TEST_EQUAL(vp.GetView(), viewMatrix);
+    DALI_TEST_EQUAL(vp.GetProjection(), projectionMatrix);
+  }(vp);
+
+  Matrix expectedViewProjection{ false };
+  Matrix::Multiply(expectedViewProjection, viewMatrix, projectionMatrix);
+  auto viewProjectionResult = vp.GetViewProjection();
+  DALI_TEST_EQUAL(viewProjectionResult, expectedViewProjection);
+
+  Matrix expectedInverseProjection{ projectionMatrix };
+  expectedInverseProjection.Invert();
+  auto inverseProjectionResult = vp.GetInverseProjection();
+  DALI_TEST_EQUAL(inverseProjectionResult, expectedInverseProjection);
+
+  END_TEST;
+}
+
+int UtcDaliViewProjectionUpdateFail(void)
+{
+  ViewProjection vp;
+  DALI_TEST_ASSERTION(vp.Update(), "Failed to find inverse");
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-shader-generator/CMakeLists.txt b/automated-tests/src/dali-shader-generator/CMakeLists.txt
index 517b7d3..30502d8 100644
--- a/automated-tests/src/dali-shader-generator/CMakeLists.txt
+++ b/automated-tests/src/dali-shader-generator/CMakeLists.txt
@@ -21,6 +21,7 @@ SET(TEST_HARNESS_DIR "../dali-toolkit/dali-toolkit-test-utils")
 SET(TEST_HARNESS_SOURCES
   ${TEST_HARNESS_DIR}/toolkit-adaptor.cpp
   ${TEST_HARNESS_DIR}/toolkit-application.cpp
+  ${TEST_HARNESS_DIR}/toolkit-async-task-manager.cpp
   ${TEST_HARNESS_DIR}/toolkit-event-thread-callback.cpp
   ${TEST_HARNESS_DIR}/toolkit-environment-variable.cpp
   ${TEST_HARNESS_DIR}/toolkit-input-method-context.cpp
diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
index c1b0ae6..05354c0 100755
--- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
@@ -9,14 +9,19 @@ SET(CAPI_LIB "dali-toolkit-internal")
 SET(TC_SOURCES
  utc-Dali-AddOns.cpp
  utc-Dali-BidirectionalSupport.cpp
+ utc-Dali-BoundedParagraph-Functions.cpp
  utc-Dali-ColorConversion.cpp
  utc-Dali-Control-internal.cpp
  utc-Dali-DebugRendering.cpp
  utc-Dali-Dictionary.cpp
  utc-Dali-FeedbackStyle.cpp
+ utc-Dali-ImageVisualShaderFeatureBuilder.cpp
  utc-Dali-ItemView-internal.cpp
+ utc-Dali-LineHelperFunctions.cpp
  utc-Dali-LogicalModel.cpp
  utc-Dali-PropertyHelper.cpp
+ utc-Dali-Text-AbstractStyleCharacterRun.cpp
+ utc-Dali-Text-Characters.cpp
  utc-Dali-Text-CharacterSetConversion.cpp
  utc-Dali-Text-Circular.cpp
  utc-Dali-Text-Controller.cpp
@@ -26,6 +31,7 @@ SET(TC_SOURCES
  utc-Dali-Text-MultiLanguage.cpp
  utc-Dali-Text-Segmentation.cpp
  utc-Dali-Text-Shaping.cpp
+ utc-Dali-Text-TextSpannable.cpp
  utc-Dali-Text-Typesetter.cpp
  utc-Dali-Text-ViewModel.cpp
  utc-Dali-TextField-internal.cpp
@@ -38,6 +44,7 @@ SET(TC_SOURCES
  utc-Dali-VisualUrl.cpp
  utc-Dali-Text-Hyphen-Wrapping.cpp
  utc-Dali-Text-Ellipsis.cpp
+ utc-Dali-Text-CharacterSpacing.cpp
 )
 
 IF(ELDBUS_AVAILABLE)
@@ -54,8 +61,8 @@ ENDIF()
 SET(TEST_HARNESS_SOURCES
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
+   ../dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-feedback-player.cpp
@@ -70,6 +77,7 @@ SET(TEST_HARNESS_SOURCES
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
+   ../dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
    ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp
index a9d9f03..c6499b0 100644
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp
@@ -1,306 +1,331 @@
 #include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali/devel-api/common/stage.h>
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
 #include "dbus-wrapper.h"
 
-namespace Dali {
-    namespace Accessibility {
-
-        using MethodType = TestDBusWrapper::MethodType;
-        using MessagePtr = DBusWrapper::MessagePtr;
-
-        static bool MoveOutedCalled = false;
-
-        void TestEnableSC(bool b) {
-            static bool firstTime = true;
-            if (b && firstTime) {
-                firstTime = false;
-                auto bridge = Accessibility::Bridge::GetCurrentBridge();
-                Dali::Stage stage = Dali::Stage::GetCurrent();
-                auto accessible = Accessibility::Accessible::Get( stage.GetRootLayer() );
-//                bridge->SetApplicationChild( accessible ); // BART
-                bridge->AddTopLevelWindow( accessible ); // BART
-                bridge->SetApplicationName( "TestApp" );
-                bridge->Initialize();
-
-                static bool ScreenReaderEnabled = false;
-                static bool IsEnabled = false;
-
-                auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/bus", "org.a11y.Status", "ScreenReaderEnabled", MethodType::Getter}] = [wr](const MessagePtr &m) -> MessagePtr {
-                    auto reply = wr->newReplyMessage(m);
-                    wr->Encode(reply, std::tuple<TestDBusWrapper::Variant<bool>>{ ScreenReaderEnabled });
-                    return reply;
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/bus", "org.a11y.Status", "IsEnabled", MethodType::Getter}] = [wr](const MessagePtr &m) -> MessagePtr {
-                    auto reply = wr->newReplyMessage(m);
-                    wr->Encode(reply, std::tuple<TestDBusWrapper::Variant<bool>>{ IsEnabled });
-                    return reply;
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/bus", "org.a11y.Bus", "GetAddress", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr {
-                    auto reply = wr->newReplyMessage(m);
-                    wr->Encode(reply, std::tuple<const char*>{ "bus" });
-                    return reply;
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible/root", "org.a11y.atspi.Socket", "Embed", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr {
-                    auto reply = wr->newReplyMessage(m);
-                    wr->Encode(reply, std::tuple<Address>{ {"bus", "root"} });
-                    return reply;
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "PropertyChange", MethodType::Method}] =
-                [wr](const MessagePtr &m) -> MessagePtr {
-                    return wr->newReplyMessage(m);
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "StateChanged", MethodType::Method}] =
-                [wr](const MessagePtr &m) -> MessagePtr {
-                    return wr->newReplyMessage(m);
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "BoundsChanged", MethodType::Method}] =
-                [wr](const MessagePtr &m) -> MessagePtr {
-                    return wr->newReplyMessage(m);
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "ActiveDescendantChanged", MethodType::Method}] =
-                [wr](const MessagePtr &m) -> MessagePtr {
-                    return wr->newReplyMessage(m);
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "TextChanged", MethodType::Method}] =
-                [wr](const MessagePtr &m) -> MessagePtr {
-                    return wr->newReplyMessage(m);
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "TextCaretMoved", MethodType::Method}] =
-                [wr](const MessagePtr &m) -> MessagePtr {
-                    return wr->newReplyMessage(m);
-                };
-                wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "MoveOuted", MethodType::Method}] =
-                [wr](const MessagePtr &m) -> MessagePtr {
-                    MoveOutedCalled = true;
-                    return wr->newReplyMessage(m);
-                };
-            }
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            wr->fromTestChangeProperty("/org/a11y/bus", "org.a11y.Status", "ScreenReaderEnabled", b);
-            wr->fromTestChangeProperty("/org/a11y/bus", "org.a11y.Status", "IsEnabled", b);
-        }
-
-        std::vector<Address> TestGetChildren(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall<std::vector<Address>>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetChildren", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        std::string TestGetName(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto name = wr->fromTestGet<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "Name");
-            return name;
-        }
-
-        std::string TestGetDescription(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto description = wr->fromTestGet<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "Description");
-            return description;
-        }
-
-        uint32_t TestGetRole(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall<uint32_t>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetRole", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        std::string TestGetRoleName(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetRoleName", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        Address TestGetParent(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestGet< Address >(adr.GetPath(), "org.a11y.atspi.Accessible", "Parent");
-            return chs;
-        }
-
-        std::string TestGetLocalizedRoleName(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetLocalizedRoleName", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        std::array< uint32_t, 2 > TestGetStates(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall<std::array< uint32_t, 2 >>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetState", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        std::unordered_map< std::string, std::string > TestGetAttributes(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall<std::unordered_map< std::string, std::string >>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetAttributes", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        bool TestDoGesture(const Address &adr, Dali::Accessibility::Gesture type, int32_t xBeg, int32_t xEnd, int32_t yBeg, int32_t yEnd, Dali::Accessibility::GestureState state, uint32_t eventTime)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Accessible", "DoGesture",
-                std::tuple< Dali::Accessibility::Gesture, int32_t, int32_t, int32_t, int32_t, Dali::Accessibility::GestureState, uint32_t >(type, xBeg, xEnd, yBeg, yEnd, state, eventTime ));
-            return std::move(std::get<0>(chs));
-        }
-
-        std::vector< std::tuple< uint32_t, std::vector< Dali::Accessibility::Address > > > TestGetRelationSet(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< std::vector< std::tuple< uint32_t, std::vector< Dali::Accessibility::Address > > > >(adr.GetPath(), "org.a11y.atspi.Accessible", "GetRelationSet", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        Address TestGetChildAtIndex(const Address &adr, int index)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< Address >(adr.GetPath(), "org.a11y.atspi.Accessible", "GetChildAtIndex", std::tuple< int >( index ));
-            return std::move(std::get<0>(chs));
-        }
-
-        ComponentLayer TestGetLayer(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< Dali::Accessibility::ComponentLayer >(adr.GetPath(), "org.a11y.atspi.Component", "GetLayer", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        int TestGetIndexInParent(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< int >(adr.GetPath(), "org.a11y.atspi.Accessible", "GetIndexInParent", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        bool TestGrabFocus(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Component", "GrabFocus", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        bool TestGrabHighlight(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Component", "GrabHighlight", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        bool TestClearHighlight(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Component", "ClearHighlight", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        std::tuple< int32_t, int32_t, int32_t, int32_t > TestGetExtents(const Address &adr, Dali::Accessibility::CoordinateType coordinateType)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< std::tuple< int32_t, int32_t, int32_t, int32_t > >(adr.GetPath(), "org.a11y.atspi.Component", "GetExtents", std::make_tuple(static_cast<uint32_t>(coordinateType)));
-            return std::move(std::get<0>(chs));
-        }
-
-        int TestGetMdiZOrder(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< int16_t >(adr.GetPath(), "org.a11y.atspi.Component", "GetMDIZOrder", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        double TestGetAlpha(const Address &adr)
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< double >(adr.GetPath(), "org.a11y.atspi.Component", "GetAlpha", std::tuple<>());
-            return std::move(std::get<0>(chs));
-        }
-
-        std::string TestGetActionName( const Address &adr, size_t index )
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetName", std::tuple< int32_t >( index ));
-            return std::move(std::get<0>(chs));
-        }
-
-        std::string TestGetLocalizedActionName( const Address &adr, size_t index )
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetLocalizedName", std::tuple< int32_t >( index ));
-            return std::move(std::get<0>(chs));
-        }
-
-        size_t TestGetActionCount( const Address &adr )
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto count = wr->fromTestGet< int32_t >(adr.GetPath(), "org.a11y.atspi.Action", "NActions");
-            return count;
-        }
-
-        bool TestDoAction ( const Address &adr, size_t index )
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Action", "DoAction", std::tuple< int32_t >( index ));
-            return std::move(std::get<0>(chs));
-        }
-
-        bool TestDoAction ( const Address &adr, const std::string& name )
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Action", "DoActionName", std::tuple< std::string >( name ));
-            return std::move(std::get<0>(chs));
-        }
-
-        std::string TestGetActionKeyBinding ( const Address &adr, size_t index )
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetKeyBinding", std::tuple< int32_t >( index ));
-            return std::move(std::get<0>(chs));
-        }
-
-        std::string TestGetActionDescription ( const Address &adr, size_t index )
-        {
-            auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
-            auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetDescription", std::tuple< int32_t >( index ));
-            return std::move(std::get<0>(chs));
-        }
-
-        void TestResetMoveOutedCalled ()
-        {
-          MoveOutedCalled = false;
-        }
-
-        bool TestGetMoveOutedCalled ()
-        {
-          return MoveOutedCalled;
-        }
-
-        void printTree(const Address &root, size_t depth)
-        {
-            auto name = TestGetName(root);
-            printf("%10s", root.GetPath().c_str());
-            for(unsigned int i = 0; i < depth; ++i) printf("  ");
-            printf("%s\n", name.c_str());
-            auto chs = TestGetChildren(root);
-            for(auto &c : chs)
-                printTree(c, depth + 1);
-        }
-
-        bool Find( const std::vector< std::string > &collection, const std::string &key)
-        {
-            for ( auto& it : collection)
-                if( it == key )
-                    return true;
-            return false;
-        }
+namespace Dali
+{
+namespace Accessibility
+{
+  using MethodType = TestDBusWrapper::MethodType;
+  using MessagePtr = DBusWrapper::MessagePtr;
+
+  static bool gMoveOutedCalled = false;
+
+  void TestEnableSC(bool b)
+  {
+    static bool firstTime = true;
+    if (b && firstTime)
+    {
+      firstTime = false;
+      auto bridge = Accessibility::Bridge::GetCurrentBridge();
+      Dali::Stage stage = Dali::Stage::GetCurrent();
+      auto accessible = Accessibility::Accessible::Get( stage.GetRootLayer() );
+      bridge->AddTopLevelWindow( accessible );
+      bridge->SetApplicationName( "TestApp" );
+      bridge->Initialize();
+
+      static bool ScreenReaderEnabled = false;
+      static bool IsEnabled = false;
+
+      auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/bus", "org.a11y.Status", "ScreenReaderEnabled", MethodType::Getter}] = [wr](const MessagePtr &m) -> MessagePtr {
+          auto reply = wr->newReplyMessage(m);
+          wr->Encode(reply, std::tuple<TestDBusWrapper::Variant<bool>>{ ScreenReaderEnabled });
+          return reply;
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/bus", "org.a11y.Status", "IsEnabled", MethodType::Getter}] = [wr](const MessagePtr &m) -> MessagePtr {
+          auto reply = wr->newReplyMessage(m);
+          wr->Encode(reply, std::tuple<TestDBusWrapper::Variant<bool>>{ IsEnabled });
+          return reply;
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/bus", "org.a11y.Bus", "GetAddress", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr {
+          auto reply = wr->newReplyMessage(m);
+          wr->Encode(reply, std::tuple<const char*>{ "bus" });
+          return reply;
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible/root", "org.a11y.atspi.Socket", "Embed", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr {
+          auto reply = wr->newReplyMessage(m);
+          wr->Encode(reply, std::tuple<Address>{ {"bus", "root"} });
+          return reply;
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible/root", "org.a11y.atspi.Socket", "Unembed", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible/root", "org.a11y.atspi.Socket", "Embedded", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "PropertyChange", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "StateChanged", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "BoundsChanged", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "ActiveDescendantChanged", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "TextChanged", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "TextCaretMoved", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "MoveOuted", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          gMoveOutedCalled = true;
+          return wr->newReplyMessage(m);
+      };
+
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Window", "Activate", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
+      wr->testMethods[std::tuple<std::string, std::string, std::string, MethodType>{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Window", "Deactivate", MethodType::Method}] =
+      [wr](const MessagePtr &m) -> MessagePtr {
+          return wr->newReplyMessage(m);
+      };
     }
-}
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    wr->fromTestChangeProperty("/org/a11y/bus", "org.a11y.Status", "ScreenReaderEnabled", b);
+    wr->fromTestChangeProperty("/org/a11y/bus", "org.a11y.Status", "IsEnabled", b);
+  }
+
+  std::vector<Address> TestGetChildren(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall<std::vector<Address>>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetChildren", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  std::string TestGetName(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto name = wr->fromTestGet<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "Name");
+    return name;
+  }
+
+  std::string TestGetDescription(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto description = wr->fromTestGet<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "Description");
+    return description;
+  }
+
+  uint32_t TestGetRole(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall<uint32_t>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetRole", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  std::string TestGetRoleName(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetRoleName", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  Address TestGetParent(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestGet< Address >(adr.GetPath(), "org.a11y.atspi.Accessible", "Parent");
+    return chs;
+  }
+
+  std::string TestGetLocalizedRoleName(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall<std::string>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetLocalizedRoleName", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  std::array< uint32_t, 2 > TestGetStates(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall<std::array< uint32_t, 2 >>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetState", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  std::unordered_map< std::string, std::string > TestGetAttributes(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall<std::unordered_map< std::string, std::string >>(adr.GetPath(), "org.a11y.atspi.Accessible", "GetAttributes", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  bool TestDoGesture(const Address &adr, Dali::Accessibility::Gesture type, int32_t xBeg, int32_t xEnd, int32_t yBeg, int32_t yEnd, Dali::Accessibility::GestureState state, uint32_t eventTime)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Accessible", "DoGesture",
+        std::tuple< Dali::Accessibility::Gesture, int32_t, int32_t, int32_t, int32_t, Dali::Accessibility::GestureState, uint32_t >(type, xBeg, xEnd, yBeg, yEnd, state, eventTime ));
+    return std::move(std::get<0>(chs));
+  }
+
+  std::vector< std::tuple< uint32_t, std::vector< Dali::Accessibility::Address > > > TestGetRelationSet(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< std::vector< std::tuple< uint32_t, std::vector< Dali::Accessibility::Address > > > >(adr.GetPath(), "org.a11y.atspi.Accessible", "GetRelationSet", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  Address TestGetChildAtIndex(const Address &adr, int index)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< Address >(adr.GetPath(), "org.a11y.atspi.Accessible", "GetChildAtIndex", std::tuple< int >( index ));
+    return std::move(std::get<0>(chs));
+  }
+
+  ComponentLayer TestGetLayer(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< Dali::Accessibility::ComponentLayer >(adr.GetPath(), "org.a11y.atspi.Component", "GetLayer", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  int TestGetIndexInParent(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< int >(adr.GetPath(), "org.a11y.atspi.Accessible", "GetIndexInParent", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  bool TestGrabFocus(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Component", "GrabFocus", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  bool TestGrabHighlight(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Component", "GrabHighlight", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  bool TestClearHighlight(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Component", "ClearHighlight", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  std::tuple< int32_t, int32_t, int32_t, int32_t > TestGetExtents(const Address &adr, Dali::Accessibility::CoordinateType coordinateType)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< std::tuple< int32_t, int32_t, int32_t, int32_t > >(adr.GetPath(), "org.a11y.atspi.Component", "GetExtents", std::make_tuple(static_cast<uint32_t>(coordinateType)));
+    return std::move(std::get<0>(chs));
+  }
+
+  int TestGetMdiZOrder(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< int16_t >(adr.GetPath(), "org.a11y.atspi.Component", "GetMDIZOrder", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  double TestGetAlpha(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< double >(adr.GetPath(), "org.a11y.atspi.Component", "GetAlpha", std::tuple<>());
+    return std::move(std::get<0>(chs));
+  }
+
+  std::string TestGetActionName(const Address &adr, size_t index)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetName", std::tuple< int32_t >( index ));
+    return std::move(std::get<0>(chs));
+  }
+
+  std::string TestGetLocalizedActionName(const Address &adr, size_t index)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetLocalizedName", std::tuple< int32_t >( index ));
+    return std::move(std::get<0>(chs));
+  }
+
+  size_t TestGetActionCount(const Address &adr)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto count = wr->fromTestGet< int32_t >(adr.GetPath(), "org.a11y.atspi.Action", "NActions");
+    return count;
+  }
+
+  bool TestDoAction(const Address &adr, size_t index)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Action", "DoAction", std::tuple< int32_t >( index ));
+    return std::move(std::get<0>(chs));
+  }
+
+  bool TestDoAction(const Address &adr, const std::string& name)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< bool >(adr.GetPath(), "org.a11y.atspi.Action", "DoActionName", std::tuple< std::string >( name ));
+    return std::move(std::get<0>(chs));
+  }
+
+  std::string TestGetActionKeyBinding(const Address &adr, size_t index)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetKeyBinding", std::tuple< int32_t >( index ));
+    return std::move(std::get<0>(chs));
+  }
+
+  std::string TestGetActionDescription(const Address &adr, size_t index)
+  {
+    auto wr = static_cast<TestDBusWrapper*>(DBusWrapper::Installed());
+    auto chs = wr->fromTestCall< std::string >(adr.GetPath(), "org.a11y.atspi.Action", "GetDescription", std::tuple< int32_t >( index ));
+    return std::move(std::get<0>(chs));
+  }
+
+  void TestResetMoveOutedCalled ()
+  {
+    gMoveOutedCalled = false;
+  }
+
+  bool TestGetMoveOutedCalled ()
+  {
+    return gMoveOutedCalled;
+  }
+
+  void PrintTree(const Address &root, size_t depth)
+  {
+    auto name = TestGetName(root);
+    printf("%10s", root.GetPath().c_str());
+    for(unsigned int i = 0; i < depth; ++i) printf("  ");
+    printf("%s\n", name.c_str());
+    auto chs = TestGetChildren(root);
+    for(auto &c : chs)
+    {
+      PrintTree(c, depth + 1);
+    }
+  }
+
+  bool Find(const std::vector< std::string > &collection, const std::string &key)
+  {
+    for(auto& it : collection)
+    {
+      if(it == key)
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+
+} // namespace Accessibility
+} // namespace Dali
diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h
index 6c172fd..92388e2 100644
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h
@@ -3,42 +3,43 @@
 
 #include <dali/devel-api/adaptor-framework/accessibility.h>
 
-
-namespace Dali {
-    namespace Accessibility {
-        void TestEnableSC(bool b);
-        std::vector<Address> TestGetChildren(const Address &adr);
-        std::string TestGetName(const Address &adr);
-        std::string TestGetDescription(const Address &adr);
-        uint32_t TestGetRole(const Address &adr);
-        std::string TestGetRoleName(const Address &adr);
-        Address TestGetParent(const Address &adr);
-        std::string TestGetLocalizedRoleName(const Address &adr);
-        std::array< uint32_t, 2 > TestGetStates(const Address &adr);
-        std::unordered_map< std::string, std::string > TestGetAttributes(const Address &adr);
-        bool TestDoGesture(const Address &adr, Dali::Accessibility::Gesture type, int32_t xBeg, int32_t xEnd, int32_t yBeg, int32_t yEnd, Dali::Accessibility::GestureState state, uint32_t eventTime);
-        std::vector< std::tuple< uint32_t, std::vector< Dali::Accessibility::Address > > > TestGetRelationSet(const Address &adr);
-        Address TestGetChildAtIndex(const Address &adr, int index);
-        ComponentLayer TestGetLayer(const Address &adr);
-        int TestGetIndexInParent(const Address &adr);
-        bool TestGrabFocus(const Address &adr);
-        bool TestGrabHighlight(const Address &adr);
-        bool TestClearHighlight(const Address &adr);
-        std::tuple< int32_t, int32_t, int32_t, int32_t > TestGetExtents(const Address &adr, Dali::Accessibility::CoordinateType coordinateType );
-        int TestGetMdiZOrder(const Address &adr);
-        double TestGetAlpha(const Address &adr);
-        void printTree(const Address &root, size_t depth = 0);
-        bool Find( const std::vector< std::string > &collection, const std::string &key);
-        std::string TestGetActionName( const Address &adr, size_t index );
-        std::string TestGetLocalizedActionName( const Address &adr, size_t index );
-        size_t TestGetActionCount( const Address &adr );
-        bool TestDoAction ( const Address &adr, size_t index );
-        bool TestDoAction ( const Address &adr, const std::string& name );
-        std::string TestGetActionKeyBinding ( const Address &adr, size_t index );
-        std::string TestGetActionDescription ( const Address &adr, size_t index );
-        void TestResetMoveOutedCalled ();
-        bool TestGetMoveOutedCalled ();
-    }
-}
+namespace Dali
+{
+namespace Accessibility
+{
+  void TestEnableSC(bool b);
+  std::vector<Address> TestGetChildren(const Address &adr);
+  std::string TestGetName(const Address &adr);
+  std::string TestGetDescription(const Address &adr);
+  uint32_t TestGetRole(const Address &adr);
+  std::string TestGetRoleName(const Address &adr);
+  Address TestGetParent(const Address &adr);
+  std::string TestGetLocalizedRoleName(const Address &adr);
+  std::array< uint32_t, 2 > TestGetStates(const Address &adr);
+  std::unordered_map< std::string, std::string > TestGetAttributes(const Address &adr);
+  bool TestDoGesture(const Address &adr, Dali::Accessibility::Gesture type, int32_t xBeg, int32_t xEnd, int32_t yBeg, int32_t yEnd, Dali::Accessibility::GestureState state, uint32_t eventTime);
+  std::vector< std::tuple< uint32_t, std::vector< Dali::Accessibility::Address > > > TestGetRelationSet(const Address &adr);
+  Address TestGetChildAtIndex(const Address &adr, int index);
+  ComponentLayer TestGetLayer(const Address &adr);
+  int TestGetIndexInParent(const Address &adr);
+  bool TestGrabFocus(const Address &adr);
+  bool TestGrabHighlight(const Address &adr);
+  bool TestClearHighlight(const Address &adr);
+  std::tuple< int32_t, int32_t, int32_t, int32_t > TestGetExtents(const Address &adr, Dali::Accessibility::CoordinateType coordinateType );
+  int TestGetMdiZOrder(const Address &adr);
+  double TestGetAlpha(const Address &adr);
+  void PrintTree(const Address &root, size_t depth = 0);
+  bool Find( const std::vector< std::string > &collection, const std::string &key);
+  std::string TestGetActionName( const Address &adr, size_t index );
+  std::string TestGetLocalizedActionName( const Address &adr, size_t index );
+  size_t TestGetActionCount( const Address &adr );
+  bool TestDoAction ( const Address &adr, size_t index );
+  bool TestDoAction ( const Address &adr, const std::string& name );
+  std::string TestGetActionKeyBinding ( const Address &adr, size_t index );
+  std::string TestGetActionDescription ( const Address &adr, size_t index );
+  void TestResetMoveOutedCalled ();
+  bool TestGetMoveOutedCalled ();
+} // namespace Accessibility
+} // namespace Dali
 
 #endif //__DALI_TOOLKIT_ACCESSIBILITY_TEST_UTILS__
diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h
index e44aa56..d3f4e25 100644
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h
@@ -125,6 +125,8 @@ struct DBusWrapper
   virtual ObjectPtr eldbus_object_get_impl( const ConnectionPtr &conn, const std::string &bus, const std::string &path ) = 0;
   virtual ProxyPtr eldbus_proxy_get_impl( const ObjectPtr &obj, const std::string &interface ) = 0;
   virtual ProxyPtr eldbus_proxy_copy_impl( const ProxyPtr &ptr) = 0;
+  virtual void eldbus_name_request_impl(const ConnectionPtr&, const std::string&) {} // no-op
+  virtual void eldbus_name_release_impl(const ConnectionPtr&, const std::string&) {} // no-op
 
   class StringStorage
   {
diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
old mode 100755
new mode 100644
index 64a8473..7db4632
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,48 +19,46 @@
 #include "toolkit-text-utils.h"
 
 // EXTERNAL INCLUDES
-#include <limits>
 #include <dali/devel-api/text-abstraction/font-client.h>
+#include <limits>
+#include <cstring> ///< for memcpy
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/bidirectional-support.h>
 #include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/hyphenator.h>
 #include <dali-toolkit/internal/text/layouts/layout-engine.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 #include <dali-toolkit/internal/text/multi-language-support.h>
 #include <dali-toolkit/internal/text/segmentation.h>
 #include <dali-toolkit/internal/text/shaper.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
-#include <dali-toolkit/internal/text/hyphenator.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Text
 {
-
 /**
  * @brief Frees previously allocated bidirectional resources.
  *
  * @param[in] bidirectionalLineInfo Bidirectional info per line.
  * @param[in] index Index to the first line with bidirectional info to be freed.
  */
-void FreeBidirectionalLineInfoResources( Vector<BidirectionalLineInfoRun> bidirectionalLineInfo,
-                                         uint32_t index )
+void FreeBidirectionalLineInfoResources(Vector<BidirectionalLineInfoRun> bidirectionalLineInfo,
+                                        uint32_t                         index)
 {
   // Free the allocated memory used to store the conversion table in the bidirectional line info run.
-  for( Vector<BidirectionalLineInfoRun>::Iterator it = bidirectionalLineInfo.Begin() + index,
-         endIt = bidirectionalLineInfo.End();
-       it != endIt;
-       ++it )
+  for(Vector<BidirectionalLineInfoRun>::Iterator it    = bidirectionalLineInfo.Begin() + index,
+                                                 endIt = bidirectionalLineInfo.End();
+      it != endIt;
+      ++it)
   {
     BidirectionalLineInfoRun& bidiLineInfo = *it;
 
-    free( bidiLineInfo.visualToLogicalMap );
+    free(bidiLineInfo.visualToLogicalMap);
   }
 }
 
@@ -69,14 +67,14 @@ void FreeBidirectionalLineInfoResources( Vector<BidirectionalLineInfoRun> bidire
  *
  * @param[in] characterIndex Clear data starting from the index.
  */
-void ClearModelData( CharacterIndex characterIndex,
-                     LogicalModelPtr logicalModel,
-                     VisualModelPtr visualModel )
+void ClearModelData(CharacterIndex  characterIndex,
+                    LogicalModelPtr logicalModel,
+                    VisualModelPtr  visualModel)
 {
   // n.b. This does not Clear the mText from mLogicalModel
 
   // Frees previously allocated resources.
-  FreeBidirectionalLineInfoResources( logicalModel->mBidirectionalLineInfo, 0u );
+  FreeBidirectionalLineInfoResources(logicalModel->mBidirectionalLineInfo, 0u);
 
   logicalModel->mScriptRuns.Clear();
   logicalModel->mFontRuns.Clear();
@@ -94,72 +92,79 @@ void ClearModelData( CharacterIndex characterIndex,
   visualModel->ClearCaches();
 }
 
-void CreateTextModel( const std::string& text,
-                      const Size& textArea,
-                      const Vector<FontDescriptionRun>& fontDescriptions,
-                      const LayoutOptions& options,
-                      Size& layoutSize,
-                      ModelPtr& textModel,
-                      MetricsPtr& metrics,
-                      bool markupProcessorEnabled,
-                      LineWrap::Mode wrapMode,
-                      bool ellipsisEnabled,
-                      DevelText::EllipsisPosition::Type ellipsisPosition)
+void CreateTextModel(const std::string&                text,
+                     const Size&                       textArea,
+                     const Vector<FontDescriptionRun>& fontDescriptions,
+                     const LayoutOptions&              options,
+                     Size&                             layoutSize,
+                     ModelPtr&                         textModel,
+                     MetricsPtr&                       metrics,
+                     bool                              markupProcessorEnabled,
+                     LineWrap::Mode                    wrapMode,
+                     bool                              ellipsisEnabled,
+                     DevelText::EllipsisPosition::Type ellipsisPosition,
+                     float                             lineSpacing,
+                     float                             characterSpacing)
 {
-  textModel = Model::New(); ///< Pointer to the text's model.
+  textModel                    = Model::New(); ///< Pointer to the text's model.
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
-
-  MarkupProcessData markupProcessData( logicalModel->mColorRuns,
-                                       logicalModel->mFontDescriptionRuns,
-                                       logicalModel->mEmbeddedItems,
-                                       logicalModel->mAnchors,
-                                       logicalModel->mUnderlinedCharacterRuns,
-                                       logicalModel->mBackgroundColorRuns);
-
-  Length textSize = 0u;
-  const uint8_t* utf8 = NULL;
-  if( markupProcessorEnabled )
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
+
+  MarkupProcessData markupProcessData(logicalModel->mColorRuns,
+                                      logicalModel->mFontDescriptionRuns,
+                                      logicalModel->mEmbeddedItems,
+                                      logicalModel->mAnchors,
+                                      logicalModel->mUnderlinedCharacterRuns,
+                                      logicalModel->mBackgroundColorRuns,
+                                      logicalModel->mStrikethroughCharacterRuns,
+                                      logicalModel->mBoundedParagraphRuns,
+                                      logicalModel->mCharacterSpacingCharacterRuns);
+
+  Length         textSize = 0u;
+  const uint8_t* utf8     = NULL;
+  if(markupProcessorEnabled)
   {
-    ProcessMarkupString( text, markupProcessData );
+    MarkupPropertyData markupPropertyData(Color::MEDIUM_BLUE, Color::DARK_MAGENTA);
+
+    ProcessMarkupString(text, markupPropertyData, markupProcessData);
     textSize = markupProcessData.markupProcessedText.size();
 
     // This is a bit horrible but std::string returns a (signed) char*
-    utf8 = reinterpret_cast<const uint8_t*>( markupProcessData.markupProcessedText.c_str() );
+    utf8 = reinterpret_cast<const uint8_t*>(markupProcessData.markupProcessedText.c_str());
   }
   else
   {
     textSize = text.size();
 
     // This is a bit horrible but std::string returns a (signed) char*
-    utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
+    utf8 = reinterpret_cast<const uint8_t*>(text.c_str());
   }
 
   //Ellipsis
-  textModel-> mElideEnabled = ellipsisEnabled;
-  textModel-> mVisualModel->SetTextElideEnabled(ellipsisEnabled);
-  textModel-> mEllipsisPosition = ellipsisPosition;
-  textModel-> mVisualModel->SetEllipsisPosition(ellipsisPosition);
+  textModel->mElideEnabled = ellipsisEnabled;
+  textModel->mVisualModel->SetTextElideEnabled(ellipsisEnabled);
+  textModel->mEllipsisPosition = ellipsisPosition;
+  textModel->mVisualModel->SetEllipsisPosition(ellipsisPosition);
 
   // 1) Convert to utf32
   Vector<Character>& utf32Characters = logicalModel->mText;
-  utf32Characters.Resize( textSize );
+  utf32Characters.Resize(textSize);
 
   // Transform a text array encoded in utf8 into an array encoded in utf32.
   // It returns the actual number of characters.
-  Length characterCount = Utf8ToUtf32( utf8, textSize, utf32Characters.Begin() );
-  utf32Characters.Resize( characterCount );
+  Length characterCount = Utf8ToUtf32(utf8, textSize, utf32Characters.Begin());
+  utf32Characters.Resize(characterCount);
 
   // 2) Set the break and paragraph info.
   Vector<LineBreakInfo>& lineBreakInfo = logicalModel->mLineBreakInfo;
-  lineBreakInfo.Resize( characterCount );
+  lineBreakInfo.Resize(characterCount);
 
-  SetLineBreakInfo( utf32Characters,
-                    0u,
-                    characterCount,
-                    lineBreakInfo );
+  SetLineBreakInfo(utf32Characters,
+                   0u,
+                   characterCount,
+                   lineBreakInfo);
 
-  if( 0u == characterCount )
+  if(0u == characterCount)
   {
     // Nothing else to do if the number of characters is zero.
     return;
@@ -168,7 +173,7 @@ void CreateTextModel( const std::string& text,
   textModel->mLineWrapMode = wrapMode;
 
   if(textModel->mLineWrapMode == ((Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) ||
-       textModel->mLineWrapMode == ((Text::LineWrap::Mode)DevelText::LineWrap::MIXED))
+     textModel->mLineWrapMode == ((Text::LineWrap::Mode)DevelText::LineWrap::MIXED))
   {
     CharacterIndex end                 = characterCount;
     LineBreakInfo* lineBreakInfoBuffer = lineBreakInfo.Begin();
@@ -204,71 +209,71 @@ void CreateTextModel( const std::string& text,
   MultilanguageSupport multilanguageSupport = MultilanguageSupport::Get();
 
   Vector<ScriptRun>& scripts = logicalModel->mScriptRuns;
-  multilanguageSupport.SetScripts( utf32Characters,
-                                   0u,
-                                   characterCount,
-                                   scripts );
+  multilanguageSupport.SetScripts(utf32Characters,
+                                  0u,
+                                  characterCount,
+                                  scripts);
 
   // 4) Set the font info
   Vector<FontDescriptionRun>& fontDescriptionRuns = logicalModel->mFontDescriptionRuns;
-  fontDescriptionRuns = fontDescriptions;
-  Vector<FontRun>& validFonts = logicalModel->mFontRuns;
+  fontDescriptionRuns                             = fontDescriptions;
+  Vector<FontRun>& validFonts                     = logicalModel->mFontRuns;
 
   // The default font description.
   TextAbstraction::FontDescription fontDescription;
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
   // Validates the fonts. If there is a character with no assigned font it sets a default one.
   // After this call, fonts are validated.
-  multilanguageSupport.ValidateFonts( utf32Characters,
-                                      scripts,
-                                      fontDescriptionRuns,
-                                      fontDescription,
-                                      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-                                      0u,
-                                      characterCount,
-                                      validFonts );
+  multilanguageSupport.ValidateFonts(utf32Characters,
+                                     scripts,
+                                     fontDescriptionRuns,
+                                     fontDescription,
+                                     TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+                                     1.0f,
+                                     0u,
+                                     characterCount,
+                                     validFonts);
 
   // 5) Set the bidirectional info per paragraph.
   Vector<Character> mirroredUtf32Characters;
-  bool textMirrored = false;
+  bool              textMirrored = false;
 
   // Reserve some space for the vector of paragraph's bidirectional info.
   Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = logicalModel->mBidirectionalParagraphInfo;
 
   // Calculates the bidirectional info for the whole paragraph if it contains right to left scripts.
-  SetBidirectionalInfo( utf32Characters,
-                        scripts,
-                        lineBreakInfo,
-                        0u,
-                        characterCount,
-                        bidirectionalInfo );
+  SetBidirectionalInfo(utf32Characters,
+                       scripts,
+                       lineBreakInfo,
+                       0u,
+                       characterCount,
+                       bidirectionalInfo);
 
   // Create the paragraph info.
-  logicalModel->CreateParagraphInfo( 0u,
-                                     characterCount );
+  logicalModel->CreateParagraphInfo(0u,
+                                    characterCount);
 
   // 6) Set character directions.
   Vector<CharacterDirection>& characterDirections = logicalModel->mCharacterDirections;
-  if( 0u != bidirectionalInfo.Count() )
+  if(0u != bidirectionalInfo.Count())
   {
     // Only set the character directions if there is right to left characters.
-    GetCharactersDirection( bidirectionalInfo,
-                            characterCount,
-                            0u,
-                            characterCount,
-                            characterDirections );
-
+    GetCharactersDirection(bidirectionalInfo,
+                           characterCount,
+                           0u,
+                           characterCount,
+                           characterDirections);
 
     // This paragraph has right to left text. Some characters may need to be mirrored.
-    textMirrored = GetMirroredText( utf32Characters,
-                                    characterDirections,
-                                    bidirectionalInfo,
-                                    0u,
-                                    characterCount,
-                                    mirroredUtf32Characters );
+    textMirrored = GetMirroredText(utf32Characters,
+                                   characterDirections,
+                                   bidirectionalInfo,
+                                   0u,
+                                   characterCount,
+                                   mirroredUtf32Characters);
   }
   else
   {
@@ -278,188 +283,233 @@ void CreateTextModel( const std::string& text,
 
   // 7) Shape the text.
 
-  Vector<GlyphInfo>& glyphs = visualModel->mGlyphs;
+  Vector<GlyphInfo>&      glyphs                = visualModel->mGlyphs;
   Vector<CharacterIndex>& glyphsToCharactersMap = visualModel->mGlyphsToCharacters;
-  Vector<Length>& charactersPerGlyph = visualModel->mCharactersPerGlyph;
-  Vector<GlyphIndex> newParagraphGlyphs;
+  Vector<Length>&         charactersPerGlyph    = visualModel->mCharactersPerGlyph;
+  Vector<GlyphIndex>      newParagraphGlyphs;
 
   const Vector<Character>& textToShape = textMirrored ? mirroredUtf32Characters : utf32Characters;
 
-  ShapeText( textToShape,
-             lineBreakInfo,
-             scripts,
-             validFonts,
-             0u,
-             0u,
-             characterCount,
-             glyphs,
-             glyphsToCharactersMap,
-             charactersPerGlyph,
-             newParagraphGlyphs );
+  ShapeText(textToShape,
+            lineBreakInfo,
+            scripts,
+            validFonts,
+            0u,
+            0u,
+            characterCount,
+            glyphs,
+            glyphsToCharactersMap,
+            charactersPerGlyph,
+            newParagraphGlyphs);
 
   // Create the 'number of glyphs' per character and the glyph to character conversion tables.
-  visualModel->CreateGlyphsPerCharacterTable( 0u, 0u, characterCount );
-  visualModel->CreateCharacterToGlyphTable( 0u, 0u, characterCount );
+  visualModel->CreateGlyphsPerCharacterTable(0u, 0u, characterCount);
+  visualModel->CreateCharacterToGlyphTable(0u, 0u, characterCount);
+
+  visualModel->SetCharacterSpacing(characterSpacing);
 
   const Length numberOfGlyphs = glyphs.Count();
 
   // 8) Get the glyph metrics
-  metrics = Metrics::New( fontClient );
+  metrics = Metrics::New(fontClient);
 
   GlyphInfo* glyphsBuffer = glyphs.Begin();
-  metrics->GetGlyphMetrics( glyphsBuffer, numberOfGlyphs );
+  metrics->GetGlyphMetrics(glyphsBuffer, numberOfGlyphs);
 
   // Update the width and advance of all new paragraph characters.
-  for( Vector<GlyphIndex>::ConstIterator it = newParagraphGlyphs.Begin(),
-         endIt = newParagraphGlyphs.End();
-       it != endIt;
-       ++it )
+  for(Vector<GlyphIndex>::ConstIterator it    = newParagraphGlyphs.Begin(),
+                                        endIt = newParagraphGlyphs.End();
+      it != endIt;
+      ++it)
   {
     const GlyphIndex index = *it;
-    GlyphInfo& glyph = *( glyphsBuffer + index );
+    GlyphInfo&       glyph = *(glyphsBuffer + index);
 
     glyph.xBearing = 0.f;
-    glyph.width = 0.f;
-    glyph.advance = 0.f;
+    glyph.width    = 0.f;
+    glyph.advance  = 0.f;
   }
 
   // 9) Layout the text
   Layout::Engine layoutEngine;
-  layoutEngine.SetMetrics( metrics );
-  layoutEngine.SetLayout( Layout::Engine::MULTI_LINE_BOX );
+  layoutEngine.SetMetrics(metrics);
+  layoutEngine.SetLayout(Layout::Engine::MULTI_LINE_BOX);
+  layoutEngine.SetDefaultLineSpacing(lineSpacing);
 
   // Set the layout parameters.
-  textModel->mHorizontalAlignment = Text::HorizontalAlignment::BEGIN;
+  textModel->mHorizontalAlignment   = Text::HorizontalAlignment::BEGIN;
   textModel->mIgnoreSpacesAfterText = true;
-  Layout::Parameters layoutParameters( textArea,
-                                       textModel );
+  Layout::Parameters layoutParameters(textArea,
+                                      textModel);
 
   Vector<LineRun>& lines = visualModel->mLines;
 
   Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
-  glyphPositions.Resize( numberOfGlyphs );
+  glyphPositions.Resize(numberOfGlyphs);
 
-  layoutParameters.isLastNewParagraph = TextAbstraction::IsNewParagraph( *( utf32Characters.Begin() + ( characterCount - 1u ) ) );
+  layoutParameters.isLastNewParagraph = TextAbstraction::IsNewParagraph(*(utf32Characters.Begin() + (characterCount - 1u)));
 
   // The initial glyph and the number of glyphs to layout.
-  layoutParameters.startGlyphIndex = 0u;
-  layoutParameters.numberOfGlyphs = numberOfGlyphs;
-  layoutParameters.startLineIndex = 0u;
+  layoutParameters.startGlyphIndex        = 0u;
+  layoutParameters.numberOfGlyphs         = numberOfGlyphs;
+  layoutParameters.startLineIndex         = 0u;
   layoutParameters.estimatedNumberOfLines = logicalModel->mParagraphInfo.Count();
 
-  bool isAutoScroll = false;
-  layoutEngine.LayoutText( layoutParameters,
-                           layoutSize,
-                           false,
-                           isAutoScroll,
-                           ellipsisPosition);
-
-  if( options.align )
+  bool isAutoScroll                   = false;
+  bool isAutoScrollMaxTextureExceeded = false;
+  bool isHiddenInputEnabled           = false;
+  layoutEngine.LayoutText(layoutParameters,
+                          layoutSize,
+                          false,
+                          isAutoScroll,
+                          isAutoScrollMaxTextureExceeded,
+                          isHiddenInputEnabled,
+                          ellipsisPosition);
+
+  if(options.align)
   {
     float alignmentOffset = 0.f;
-    layoutEngine.Align( textArea,
-                        0u,
-                        characterCount,
-                        Text::HorizontalAlignment::BEGIN,
-                        lines,
-                        alignmentOffset,
-                        Dali::LayoutDirection::LEFT_TO_RIGHT,
-                        false );
+    layoutEngine.Align(textArea,
+                       0u,
+                       characterCount,
+                       Text::HorizontalAlignment::BEGIN,
+                       lines,
+                       alignmentOffset,
+                       Dali::LayoutDirection::LEFT_TO_RIGHT,
+                       false);
   }
 }
 
-void ConfigureTextLabel( ControllerPtr controller )
+void ConfigureTextLabel(ControllerPtr controller)
 {
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
   // Set the text layout as multi-line.
-  controller->GetLayoutEngine().SetLayout( Layout::Engine::MULTI_LINE_BOX );
+  controller->GetLayoutEngine().SetLayout(Layout::Engine::MULTI_LINE_BOX);
 
   // Set cursor's width to zero.
-  controller->GetLayoutEngine().SetCursorWidth( 0 );
+  controller->GetLayoutEngine().SetCursorWidth(0);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Disables the text input.
-  controller->EnableTextInput( NULL, inputMethodContext );
+  controller->EnableTextInput(NULL, inputMethodContext);
 
   // Disables the vertical scrolling.
-  controller->SetVerticalScrollEnabled( false );
+  controller->SetVerticalScrollEnabled(false);
 
   // Disables the horizontal scrolling.
-  controller->SetHorizontalScrollEnabled( false );
+  controller->SetHorizontalScrollEnabled(false);
 
   // Enable the text elide.
-  controller->SetTextElideEnabled( true );
+  controller->SetTextElideEnabled(true);
 
   // Disable match system language direction
   controller->SetMatchLayoutDirection(DevelText::MatchLayoutDirection::CONTENTS);
 }
 
-void ConfigureTextField( ControllerPtr controller )
+void ConfigureTextField(ControllerPtr controller)
 {
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator = Text::Decorator::New(*controller,
+                                                      *controller);
 
   // Set the text layout as multi-line.
-  controller->GetLayoutEngine().SetLayout( Layout::Engine::SINGLE_LINE_BOX );
+  controller->GetLayoutEngine().SetLayout(Layout::Engine::SINGLE_LINE_BOX);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Enables the vertical scrolling after the text input has been enabled.
-  controller->SetVerticalScrollEnabled( false );
+  controller->SetVerticalScrollEnabled(false);
 
   // Disables the horizontal scrolling.
-  controller->SetHorizontalScrollEnabled( true );
+  controller->SetHorizontalScrollEnabled(true);
 
   // No maximum number of characters.
-  controller->SetMaximumNumberOfCharacters( 50u );
+  controller->SetMaximumNumberOfCharacters(50u);
 
   // Disable the text elide.
-  controller->SetTextElideEnabled( false );
+  controller->SetTextElideEnabled(false);
 
   // Disable match system language direction
   controller->SetMatchLayoutDirection(DevelText::MatchLayoutDirection::CONTENTS);
 }
 
-void ConfigureTextEditor( ControllerPtr controller )
+void ConfigureTextEditor(ControllerPtr controller)
 {
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator = Text::Decorator::New(*controller,
+                                                      *controller);
 
   // Set the text layout as multi-line.
-  controller->GetLayoutEngine().SetLayout( Layout::Engine::MULTI_LINE_BOX );
+  controller->GetLayoutEngine().SetLayout(Layout::Engine::MULTI_LINE_BOX);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Enables the vertical scrolling after the text input has been enabled.
-  controller->SetVerticalScrollEnabled( true );
+  controller->SetVerticalScrollEnabled(true);
 
   // Disables the horizontal scrolling.
-  controller->SetHorizontalScrollEnabled( false );
+  controller->SetHorizontalScrollEnabled(false);
 
   // No maximum number of characters.
-  controller->SetMaximumNumberOfCharacters( std::numeric_limits<Length>::max() );
+  controller->SetMaximumNumberOfCharacters(std::numeric_limits<Length>::max());
 
   // Disable the text elide.
-  controller->SetTextElideEnabled( false );
+  controller->SetTextElideEnabled(false);
 
   // Disable match system language direction
   controller->SetMatchLayoutDirection(DevelText::MatchLayoutDirection::CONTENTS);
 }
 
+Vector<FontDescriptionRun> CreateSingleFontDescription(
+  const CharacterRun&   characterRun,
+  const std::string     fontFamilyName,
+  const FontWeight      weight,
+  const FontWidth       width,
+  const FontSlant       slant,
+  const PointSize26Dot6 size,
+  const bool            familyDefined,
+  const bool            weightDefined,
+  const bool            widthDefined,
+  const bool            slantDefined,
+  const bool            sizeDefined)
+{
+  FontDescriptionRun fontDescriptionRun =
+    {
+      characterRun,
+      nullptr,
+      0u,
+      weight,
+      width,
+      slant,
+      size,
+      familyDefined,
+      weightDefined,
+      widthDefined,
+      slantDefined,
+      sizeDefined};
+
+  fontDescriptionRun.familyLength = fontFamilyName.size();
+  fontDescriptionRun.familyName   = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamilyName.c_str(), fontDescriptionRun.familyLength);
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+
+  return fontDescriptionRuns;
+}
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
index ccfbe98..b064bfa 100644
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_UTILS_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,28 +20,26 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/metrics.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-model.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Text
 {
-
 /**
  * @brief Some layout options.
  */
 struct LayoutOptions
 {
   LayoutOptions()
-  : align{ true }
-  {}
+  : align{true}
+  {
+  }
 
-  bool align   : 1; ///< Whether to align the lines.
+  bool align : 1; ///< Whether to align the lines.
 };
 
 /**
@@ -59,39 +57,73 @@ struct LayoutOptions
  * @param[in] wrapMode Line wrap mode.
  * @param[in] ellipsisEnabled Whether the ellipsis layout option is enabled.
  * @param[in] ellipsisPosition Where is the location the text elide.
+ * @param[in] lineSpacing The height of the line in points.
+ * @param[in] characterSpacing The spacing between the characters.
  */
-void CreateTextModel( const std::string& text,
-                      const Size& textArea,
-                      const Vector<FontDescriptionRun>& fontDescriptions,
-                      const LayoutOptions& options,
-                      Size& layoutSize,
-                      ModelPtr& textModel,
-                      MetricsPtr& metrics,
-                      bool markupProcessorEnabled,
-                      LineWrap::Mode wrapMode,
-                      bool ellipsisEnabled,
-                      DevelText::EllipsisPosition::Type ellipsisPosition);
+void CreateTextModel(const std::string&                text,
+                     const Size&                       textArea,
+                     const Vector<FontDescriptionRun>& fontDescriptions,
+                     const LayoutOptions&              options,
+                     Size&                             layoutSize,
+                     ModelPtr&                         textModel,
+                     MetricsPtr&                       metrics,
+                     bool                              markupProcessorEnabled,
+                     LineWrap::Mode                    wrapMode,
+                     bool                              ellipsisEnabled,
+                     DevelText::EllipsisPosition::Type ellipsisPosition,
+                     float                             lineSpacing,
+                     float                             characterSpacing);
 
 /**
  * @brief Configures the text @p controller similarly to the one configured by the text-label.
  *
  * @param[in,out] The text controller to configure.
  */
-void ConfigureTextLabel( ControllerPtr controller );
+void ConfigureTextLabel(ControllerPtr controller);
 
 /**
  * @brief Configures the text @p controller similarly to the one configured by the text-field.
  *
  * @param[in,out] The text controller to configure.
  */
-void ConfigureTextField( ControllerPtr controller );
+void ConfigureTextField(ControllerPtr controller);
 
 /**
  * @brief Configures the text @p controller similarly to the one configured by the text-editor.
  *
  * @param[in,out] The text controller to configure.
  */
-void ConfigureTextEditor( ControllerPtr controller );
+void ConfigureTextEditor(ControllerPtr controller);
+
+/**
+ * @brief Creates one FontDescriptionRun then add it to FontDescription list.
+ *
+ * @param[in] characterRun The initial character index and the number of characters of the run.
+ * @param[in] fontFamilyName The font's family name.
+ * @param[in] weight The font's weight.
+ * @param[in] width The font's width.
+ * @param[in] slant The font's slant.
+ * @param[in] size Whether the font's family is defined.
+ * @param[in] familyDefined Whether the font's weight is defined.
+ * @param[in] weightDefined Whether the font's width is defined.
+ * @param[in] widthDefined Whether the ellipsis layout option is enabled.
+ * @param[in] slantDefined Whether the font's slant is defined.
+ * @param[in] sizeDefined Whether the font's size is defined.
+
+* @return vector contains one FontDescriptionRun.
+ */
+Vector<FontDescriptionRun> CreateSingleFontDescription(
+  const CharacterRun&   characterRun,
+  const std::string     fontFamilyName,
+  const FontWeight      weight,
+  const FontWidth       width,
+  const FontSlant       slant,
+  const PointSize26Dot6 size,
+  const bool            familyDefined,
+  const bool            weightDefined,
+  const bool            widthDefined,
+  const bool            slantDefined,
+  const bool            sizeDefined);
 
 } // namespace Text
 
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp
index 423893a..f76c4a0 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp
@@ -21,9 +21,11 @@
 
 #include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 
 #include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
 
 #include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
 
@@ -112,7 +114,7 @@ int UtcDaliAccessibilityCheckShowingState(void)
   q = Dali::Accessibility::Accessible::Get(buttonB);
   DALI_TEST_CHECK(q);
   states = q->GetStates();
-  DALI_TEST_EQUALS((int) states[Dali::Accessibility::State::SHOWING], (int) false, TEST_LOCATION);
+  DALI_TEST_EQUALS((int) states[Dali::Accessibility::State::SHOWING], (int) true, TEST_LOCATION);
 
   q = Dali::Accessibility::Accessible::Get(buttonC);
   DALI_TEST_CHECK(q);
@@ -128,5 +130,79 @@ int UtcDaliAccessibilityCheckShowingState(void)
   states = q->GetStates();
   DALI_TEST_EQUALS((int) states[Dali::Accessibility::State::SHOWING], (int) false, TEST_LOCATION);
 
+  // Make SHOWING parent invisible
+  parentButton.SetProperty(Actor::Property::VISIBLE, false);
+
+  application.SendNotification();
+  application.Render(16);
+
+  q = Dali::Accessibility::Accessible::Get(buttonA);
+  DALI_TEST_CHECK(q);
+  states = q->GetStates();
+  DALI_TEST_EQUALS((int) states[Dali::Accessibility::State::SHOWING], (int) false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliAccessibilityHidden(void)
+{
+  ToolkitTestApplication application;
+
+  auto  parent            = Toolkit::Control::New();
+  auto* parentAccessible  = Accessibility::Accessible::Get(parent);
+  auto  control           = Toolkit::Control::New();
+  auto* controlAccessible = Accessibility::Accessible::Get(control);
+
+  parent.Add(control);
+
+  // Check not hidden
+  DALI_TEST_CHECK(parentAccessible && controlAccessible);
+  DALI_TEST_CHECK(!controlAccessible->IsHidden());
+  DALI_TEST_CHECK(!control.GetProperty<bool>(Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN));
+  DALI_TEST_EQUALS(parentAccessible->GetChildCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(parentAccessible->GetChildAtIndex(0), controlAccessible, TEST_LOCATION);
+
+  control.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN, true);
+
+  // Check hidden
+  DALI_TEST_CHECK(controlAccessible->IsHidden());
+  DALI_TEST_CHECK(control.GetProperty<bool>(Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN));
+  DALI_TEST_EQUALS(parentAccessible->GetChildCount(), 0u, TEST_LOCATION);
+
   END_TEST;
-}
\ No newline at end of file
+}
+
+int utcDaliAutomationId(void)
+{
+  ToolkitTestApplication application;
+  Dali::Property::Index  automationIdIndex = Toolkit::DevelControl::Property::AUTOMATION_ID;
+  std::string            automationIdKey   = "automationId";
+  std::string            automationIdValue = "test123";
+
+  auto  control           = Toolkit::Control::New();
+  auto* controlAccessible = Accessibility::Accessible::Get(control);
+
+  // Check that there is no automationId initially
+  DALI_TEST_CHECK(control.GetProperty<std::string>(automationIdIndex).empty());
+  auto attributes = controlAccessible->GetAttributes();
+  DALI_TEST_CHECK(attributes.find(automationIdKey) == attributes.end());
+
+  // Set automationId
+  control.SetProperty(automationIdIndex, automationIdValue);
+
+  // Check that automationId is set
+  DALI_TEST_EQUALS(control.GetProperty<std::string>(automationIdIndex), automationIdValue, TEST_LOCATION);
+  attributes = controlAccessible->GetAttributes();
+  DALI_TEST_CHECK(attributes.find(automationIdKey) != attributes.end());
+  DALI_TEST_EQUALS(attributes[automationIdKey], automationIdValue, TEST_LOCATION);
+
+  // Unset automationId
+  control.SetProperty(automationIdIndex, "");
+
+  // Check that there is no automationId
+  DALI_TEST_CHECK(control.GetProperty<std::string>(automationIdIndex).empty());
+  attributes = controlAccessible->GetAttributes();
+  DALI_TEST_CHECK(attributes.find(automationIdKey) == attributes.end());
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
index 0b1ec0e..ad2fba7 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
@@ -1,14 +1,19 @@
-#include <dali-toolkit-test-suite-utils.h>
 #include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h>
 #include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
+#include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
-#include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-view.h>
 #include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/adaptor-framework/accessibility.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
+#include <dali/devel-api/atspi-interfaces/action.h>
+#include <dali/devel-api/atspi-interfaces/component.h>
 #include <dali/devel-api/common/stage.h>
 #include <cstdlib>
 
@@ -29,15 +34,17 @@ void utc_dali_accessibility_controls_bridge_up_cleanup(void)
   DBusWrapper::Install({});
 }
 
-namespace Dali {
-  namespace Accessibility {
-    std::ostream & operator<< (std::ostream & stream, const Address & address)
-    {
-      stream << address.ToString();
-      return stream;
-    }
-  }
+namespace Dali
+{
+namespace Accessibility
+{
+std::ostream& operator<<(std::ostream& stream, const Address& address)
+{
+  stream << address.ToString();
+  return stream;
 }
+} // namespace Accessibility
+} // namespace Dali
 
 int UtcDaliControlAccessibilityRaiseBridge(void)
 {
@@ -71,28 +78,40 @@ int UtcDaliControlAccessibilityName(void)
   ToolkitTestApplication application;
 
   auto control = Control::New();
-  Stage::GetCurrent().Add( control );
+  Stage::GetCurrent().Add(control);
+
+  auto q = Dali::Accessibility::Accessible::Get(control);
+  DALI_TEST_CHECK(q);
 
-  auto q = Dali::Accessibility::Accessible::Get( control );
-  DALI_TEST_CHECK( q );
+  DALI_TEST_EQUALS("", q->GetName(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( "" , q->GetName(), TEST_LOCATION );
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_NAME, "Accessibility_Name");
+  DALI_TEST_EQUALS("Accessibility_Name", q->GetName(), TEST_LOCATION);
+  DALI_TEST_EQUALS(control.GetProperty(DevelControl::Property::ACCESSIBILITY_NAME).Get<std::string>(), "Accessibility_Name", TEST_LOCATION);
 
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_NAME, "Accessibility_Name" );
-  DALI_TEST_EQUALS( "Accessibility_Name" , q->GetName(), TEST_LOCATION );
-  DALI_TEST_EQUALS( control.GetProperty( DevelControl::Property::ACCESSIBILITY_NAME ).Get< std::string >() , "Accessibility_Name", TEST_LOCATION );
+  auto nameChangeCallback = [](std::string& accessibilityName) { accessibilityName = "Accessibility_Name_With_Callback"; };
 
-  DevelControl::AccessibilityGetNameSignal(control).Connect( [] (std::string &accessibility_name) {
-    accessibility_name = "Accessibility_Name_With_Callback"; } );
+  DevelControl::AccessibilityGetNameSignal(control).Connect(nameChangeCallback);
 
-  DALI_TEST_EQUALS( "Accessibility_Name_With_Callback" , q->GetName(), TEST_LOCATION );
+  DALI_TEST_EQUALS("Accessibility_Name_With_Callback", q->GetName(), TEST_LOCATION);
 
   Dali::Accessibility::TestEnableSC(true);
 
-  DALI_TEST_EQUALS( "Accessibility_Name_With_Callback" , TestGetName( q->GetAddress()), TEST_LOCATION );
+  DALI_TEST_EQUALS("Accessibility_Name_With_Callback", TestGetName(q->GetAddress()), TEST_LOCATION);
+
+  DevelControl::AccessibilityGetNameSignal(control).Disconnect(nameChangeCallback);
+
+  auto i = dynamic_cast<Dali::Accessibility::Component*>(q);
+
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
+
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_NAME, "Changed_Accessiblity_Name");
+  DALI_TEST_EQUALS("Changed_Accessiblity_Name", q->GetName(), TEST_LOCATION);
+  DALI_TEST_EQUALS(control.GetProperty(DevelControl::Property::ACCESSIBILITY_NAME).Get<std::string>(), "Changed_Accessiblity_Name", TEST_LOCATION);
 
   //TODO test emission of name change signal
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -103,28 +122,40 @@ int UtcDaliControlAccessibilityDescription(void)
 
   auto control = Control::New();
 
-  auto q = Dali::Accessibility::Accessible::Get( control );
-  DALI_TEST_CHECK( q );
+  auto q = Dali::Accessibility::Accessible::Get(control);
+  DALI_TEST_CHECK(q);
 
-  DALI_TEST_EQUALS( "" , q->GetDescription(), TEST_LOCATION );
+  DALI_TEST_EQUALS("", q->GetDescription(), TEST_LOCATION);
 
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_DESCRIPTION, "Accessibility_Description" );
-  DALI_TEST_EQUALS( "Accessibility_Description" , q->GetDescription(), TEST_LOCATION );
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_DESCRIPTION, "Accessibility_Description");
+  DALI_TEST_EQUALS("Accessibility_Description", q->GetDescription(), TEST_LOCATION);
 
-  auto property = control.GetProperty( DevelControl::Property::ACCESSIBILITY_DESCRIPTION ).Get<std::string>();
-  DALI_TEST_EQUALS( "Accessibility_Description", property, TEST_LOCATION );
+  auto property = control.GetProperty(DevelControl::Property::ACCESSIBILITY_DESCRIPTION).Get<std::string>();
+  DALI_TEST_EQUALS("Accessibility_Description", property, TEST_LOCATION);
 
-  DevelControl::AccessibilityGetDescriptionSignal(control).Connect( [] (std::string &accessibility_description) {
-    accessibility_description = "Accessibility_Description_With_Callback"; } );
+  auto descriptionChangeCallback = [](std::string& accessibilityDescription) { accessibilityDescription = "Accessibility_Description_With_Callback"; };
 
-  DALI_TEST_EQUALS( "Accessibility_Description_With_Callback" , q->GetDescription(), TEST_LOCATION );
+  DevelControl::AccessibilityGetDescriptionSignal(control).Connect(descriptionChangeCallback);
 
-  Dali::Accessibility::TestEnableSC( true );
+  DALI_TEST_EQUALS("Accessibility_Description_With_Callback", q->GetDescription(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( "Accessibility_Description_With_Callback" , TestGetDescription( q->GetAddress()), TEST_LOCATION );
+  Dali::Accessibility::TestEnableSC(true);
+
+  DALI_TEST_EQUALS("Accessibility_Description_With_Callback", TestGetDescription(q->GetAddress()), TEST_LOCATION);
+
+  DevelControl::AccessibilityGetDescriptionSignal(control).Disconnect(descriptionChangeCallback);
+
+  auto i = dynamic_cast<Dali::Accessibility::Component*>(q);
+
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
+
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_DESCRIPTION, "Changed_Accessiblity_Description");
+  DALI_TEST_EQUALS("Changed_Accessiblity_Description", q->GetDescription(), TEST_LOCATION);
+  DALI_TEST_EQUALS(control.GetProperty(DevelControl::Property::ACCESSIBILITY_DESCRIPTION).Get<std::string>(), "Changed_Accessiblity_Description", TEST_LOCATION);
 
   //TODO test emission of description change signal
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -133,32 +164,32 @@ int UtcDaliControlAccessibilityRole(void)
 {
   ToolkitTestApplication application;
 
-  auto control = Control::New();
-  auto role_unknown = Dali::Accessibility::Role::UNKNOWN;
+  auto control         = Control::New();
+  auto role_unknown    = Dali::Accessibility::Role::UNKNOWN;
   auto role_pushbutton = Dali::Accessibility::Role::PUSH_BUTTON;
 
-  DALI_TEST_EQUALS( role_unknown,control.GetProperty( DevelControl::Property::ACCESSIBILITY_ROLE ).Get< Dali::Accessibility::Role >(), TEST_LOCATION );
+  DALI_TEST_EQUALS(role_unknown, control.GetProperty(DevelControl::Property::ACCESSIBILITY_ROLE).Get<Dali::Accessibility::Role>(), TEST_LOCATION);
 
-  auto q = Dali::Accessibility::Accessible::Get( control );
-  DALI_TEST_EQUALS( role_unknown , q->GetRole(), TEST_LOCATION);
-  DALI_TEST_EQUALS( "unknown" , q->GetRoleName(), TEST_LOCATION );
+  auto q = Dali::Accessibility::Accessible::Get(control);
+  DALI_TEST_EQUALS(role_unknown, q->GetRole(), TEST_LOCATION);
+  DALI_TEST_EQUALS("unknown", q->GetRoleName(), TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( true );
-  DALI_TEST_CHECK( q );
-  DALI_TEST_EQUALS( static_cast< uint32_t >( role_unknown ), TestGetRole( q->GetAddress() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "unknown" , TestGetRoleName( q->GetAddress() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "unknown" , TestGetLocalizedRoleName( q->GetAddress() ), TEST_LOCATION );
+  Dali::Accessibility::TestEnableSC(true);
+  DALI_TEST_CHECK(q);
+  DALI_TEST_EQUALS(static_cast<uint32_t>(role_unknown), TestGetRole(q->GetAddress()), TEST_LOCATION);
+  DALI_TEST_EQUALS("unknown", TestGetRoleName(q->GetAddress()), TEST_LOCATION);
+  DALI_TEST_EQUALS("unknown", TestGetLocalizedRoleName(q->GetAddress()), TEST_LOCATION);
 
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_ROLE, role_pushbutton );
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, role_pushbutton);
 
-  DALI_TEST_EQUALS( static_cast< uint32_t >( role_pushbutton ), TestGetRole( q->GetAddress() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "push button" ,TestGetRoleName( q->GetAddress() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "push button" , TestGetLocalizedRoleName( q->GetAddress() ), TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<uint32_t>(role_pushbutton), TestGetRole(q->GetAddress()), TEST_LOCATION);
+  DALI_TEST_EQUALS("push button", TestGetRoleName(q->GetAddress()), TEST_LOCATION);
+  DALI_TEST_EQUALS("push button", TestGetLocalizedRoleName(q->GetAddress()), TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
-  DALI_TEST_EQUALS( role_pushbutton , q->GetRole(), TEST_LOCATION);
-  DALI_TEST_EQUALS( "push button" , q->GetRoleName(), TEST_LOCATION );
+  DALI_TEST_EQUALS(role_pushbutton, q->GetRole(), TEST_LOCATION);
+  DALI_TEST_EQUALS("push button", q->GetRoleName(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -168,32 +199,33 @@ int UtcDaliControlAccessibilityRoleToggleButton(void)
   ToolkitTestApplication application;
 
   auto control = Dali::Toolkit::ToggleButton::New();
-  auto button = Dali::Accessibility::Role::TOGGLE_BUTTON;
+  auto button  = Dali::Accessibility::Role::TOGGLE_BUTTON;
 
   control.SetProperty(Toolkit::ToggleButton::Property::TOOLTIPS,
-          Property::Array{"option1", "option2"});
+                      Property::Array{"option1", "option2"});
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_ROLE, button );
-  auto q = Dali::Accessibility::Accessible::Get( control );
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, button);
+  auto q = Dali::Accessibility::Accessible::Get(control);
 
-  DALI_TEST_EQUALS( button , q->GetRole(), TEST_LOCATION);
-  DALI_TEST_EQUALS( "toggle button" , q->GetRoleName(), TEST_LOCATION );
+  DALI_TEST_EQUALS(button, q->GetRole(), TEST_LOCATION);
+  DALI_TEST_EQUALS("toggle button", q->GetRoleName(), TEST_LOCATION);
 
   Dali::Accessibility::States states = q->GetStates();
-  DALI_TEST_EQUALS( true , (bool)states[Dali::Accessibility::State::VISIBLE], TEST_LOCATION);
+  DALI_TEST_EQUALS(true, (bool)states[Dali::Accessibility::State::VISIBLE], TEST_LOCATION);
 
-  DALI_TEST_EQUALS( "option1", q->GetDescription(), TEST_LOCATION );
+  DALI_TEST_EQUALS("option1", q->GetDescription(), TEST_LOCATION);
 
   auto i = dynamic_cast<Dali::Accessibility::Component*>(q);
-  if (i)
-    i->GrabHighlight();
 
-  control.SetProperty( Toolkit::Button::Property::LABEL, "ToggleButton2" );
-  DALI_TEST_EQUALS( "ToggleButton2", TestGetName( q->GetAddress() ), TEST_LOCATION );
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
 
-  Dali::Accessibility::TestEnableSC( false );
+  control.SetProperty(Toolkit::Button::Property::LABEL, "ToggleButton2");
+  DALI_TEST_EQUALS("ToggleButton2", TestGetName(q->GetAddress()), TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -203,23 +235,23 @@ int UtcDaliControlAccessibilityButtonLabel(void)
   ToolkitTestApplication application;
 
   auto control = Dali::Toolkit::PushButton::New();
-  auto button = Dali::Accessibility::Role::PUSH_BUTTON;
+  auto button  = Dali::Accessibility::Role::PUSH_BUTTON;
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_ROLE, button );
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, button);
 
-  auto q = Dali::Accessibility::Accessible::Get( control );
+  auto q = Dali::Accessibility::Accessible::Get(control);
   auto i = dynamic_cast<Dali::Accessibility::Component*>(q);
 
-  if (i)
-    i->GrabHighlight();
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
 
-  control.SetProperty( Toolkit::Button::Property::LABEL, "Button2" );
+  control.SetProperty(Toolkit::Button::Property::LABEL, "Button2");
 
-  DALI_TEST_EQUALS( "Button2" , TestGetName( q->GetAddress() ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Button2", TestGetName(q->GetAddress()), TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -229,15 +261,15 @@ int UtcDaliControlAccessibilityState(void)
   ToolkitTestApplication application;
 
   auto control = Control::New();
-  auto q = Dali::Accessibility::Accessible::Get( control );
+  auto q       = Dali::Accessibility::Accessible::Get(control);
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )};
-  auto states = DevelControl::GetAccessibilityStates(control);
-  DALI_TEST_CHECK( states_by_bridge == states );
+  auto states_by_bridge = Dali::Accessibility::States{TestGetStates(q->GetAddress())};
+  auto states           = DevelControl::GetAccessibilityStates(control);
+  DALI_TEST_CHECK(states_by_bridge == states);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -247,14 +279,14 @@ int UtcDaliControlAccessibilityModal(void)
   ToolkitTestApplication application;
 
   auto control = Dali::Toolkit::Popup::New();
-  auto q = Dali::Accessibility::Accessible::Get( control );
+  auto q       = Dali::Accessibility::Accessible::Get(control);
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )};
-  DALI_TEST_CHECK( states_by_bridge[Dali::Accessibility::State::MODAL] );
+  auto states_by_bridge = Dali::Accessibility::States{TestGetStates(q->GetAddress())};
+  DALI_TEST_CHECK(states_by_bridge[Dali::Accessibility::State::MODAL]);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -262,38 +294,38 @@ int UtcDaliControlAccessibilityModal(void)
 int UtcDaliControlAccessibilityHighlightable(void)
 {
   ToolkitTestApplication application;
-  auto control = Control::New();
+  auto                   control = Control::New();
 
-  auto noneset = control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE );
-  DALI_TEST_EQUALS( Property::NONE, noneset.GetType(), TEST_LOCATION );
+  auto highlightable = control.GetProperty<bool>(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE);
+  DALI_TEST_EQUALS(highlightable, false, TEST_LOCATION);
 
-   // negative testcase - trying to set unconvertible value
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, "deadbeef" );
-  noneset = control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE );
-  DALI_TEST_EQUALS( Property::NONE, noneset.GetType(), TEST_LOCATION );
+  // negative testcase - trying to set unconvertible value
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, "deadbeef");
+  highlightable = control.GetProperty<bool>(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE);
+  DALI_TEST_EQUALS(highlightable, false, TEST_LOCATION);
 
-  auto q = Dali::Accessibility::Accessible::Get( control );
+  auto q = Dali::Accessibility::Accessible::Get(control);
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )};
-  DALI_TEST_CHECK( !states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] );
+  auto states_by_bridge = Dali::Accessibility::States{TestGetStates(q->GetAddress())};
+  DALI_TEST_CHECK(!states_by_bridge[Dali::Accessibility::State::HIGHLIGHTABLE]);
 
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true );
-  DALI_TEST_EQUALS( Property::BOOLEAN, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).GetType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).Get< bool >(), TEST_LOCATION );
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+  DALI_TEST_EQUALS(Property::BOOLEAN, control.GetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE).GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, control.GetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE).Get<bool>(), TEST_LOCATION);
 
-  states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )};
-  DALI_TEST_CHECK( states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] );
+  states_by_bridge = Dali::Accessibility::States{TestGetStates(q->GetAddress())};
+  DALI_TEST_CHECK(states_by_bridge[Dali::Accessibility::State::HIGHLIGHTABLE]);
 
-  control.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, false );
-  DALI_TEST_EQUALS( Property::BOOLEAN, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).GetType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).Get< bool >(), TEST_LOCATION );
+  control.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, false);
+  DALI_TEST_EQUALS(Property::BOOLEAN, control.GetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE).GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, control.GetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE).Get<bool>(), TEST_LOCATION);
 
-  states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )};
-  DALI_TEST_CHECK( !states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] );
+  states_by_bridge = Dali::Accessibility::States{TestGetStates(q->GetAddress())};
+  DALI_TEST_CHECK(!states_by_bridge[Dali::Accessibility::State::HIGHLIGHTABLE]);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -306,82 +338,81 @@ int UtcDaliControlAccessibilityHighlightBridgeUp(void)
   auto controlb = Control::New();
   controla.Add(controlb);
 
-  controla.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true );
-  controlb.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true );
+  controla.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+  controlb.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
 
-  Dali::Accessibility::TestEnableSC( true );
-
-  auto accessible_a = Dali::Accessibility::Accessible::Get( controla );
-  auto accessible_b = Dali::Accessibility::Accessible::Get( controlb );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto a = dynamic_cast<Dali::Accessibility::Component*>( accessible_a );
-  auto b = dynamic_cast<Dali::Accessibility::Component*>( accessible_b );
+  auto accessible_a = Dali::Accessibility::Accessible::Get(controla);
+  auto accessible_b = Dali::Accessibility::Accessible::Get(controlb);
 
-  auto states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  auto states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  auto a = dynamic_cast<Dali::Accessibility::Component*>(accessible_a);
+  auto b = dynamic_cast<Dali::Accessibility::Component*>(accessible_b);
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  auto states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  auto states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
-  DALI_TEST_EQUALS( true, DevelControl::GrabAccessibilityHighlight(controla), TEST_LOCATION );
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(!states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  DALI_TEST_EQUALS(true, DevelControl::GrabAccessibilityHighlight(controla), TEST_LOCATION);
 
-  DALI_TEST_CHECK( states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
-  DALI_TEST_EQUALS( true, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION );
+  DALI_TEST_CHECK(states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(!states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  DALI_TEST_EQUALS(true, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION);
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
-  DALI_TEST_EQUALS( false, DevelControl::ClearAccessibilityHighlight(controla), TEST_LOCATION );
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  DALI_TEST_EQUALS(false, DevelControl::ClearAccessibilityHighlight(controla), TEST_LOCATION);
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
-  DALI_TEST_EQUALS( true, DevelControl::ClearAccessibilityHighlight(controlb), TEST_LOCATION );
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  DALI_TEST_EQUALS(true, DevelControl::ClearAccessibilityHighlight(controlb), TEST_LOCATION);
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
-  DALI_TEST_CHECK( TestGrabHighlight( a -> GetAddress() ) );
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(!states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  DALI_TEST_CHECK(TestGrabHighlight(a->GetAddress()));
 
-  DALI_TEST_CHECK( states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
-  DALI_TEST_CHECK( TestGrabHighlight( b -> GetAddress() ) );
+  DALI_TEST_CHECK(states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(!states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  DALI_TEST_CHECK(TestGrabHighlight(b->GetAddress()));
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
-  DALI_TEST_CHECK( TestClearHighlight( b -> GetAddress() ) );
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )};
+  DALI_TEST_CHECK(TestClearHighlight(b->GetAddress()));
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] );
-  DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] );
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b->GetAddress())};
 
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::HIGHLIGHTED]);
+  DALI_TEST_CHECK(!states_by_bridge_b[Dali::Accessibility::State::HIGHLIGHTED]);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -389,68 +420,71 @@ int UtcDaliControlAccessibilityHighlightBridgeUp(void)
 int utcDaliAccessibilityControlAttributes(void)
 {
   ToolkitTestApplication application;
-  auto check_box_button = Toolkit::Control::New();
+  auto                   check_box_button = Toolkit::Control::New();
 
   std::string value;
 
-
-  auto attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES );
+  auto attributes     = check_box_button.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
   auto attributes_map = attributes.GetMap();
 
-  auto position = attributes_map->Find( "access_key1" );
-  DALI_TEST_CHECK( !position );
+  auto position = attributes_map->Find("access_key1");
+  DALI_TEST_CHECK(!position);
 
-  DevelControl::AppendAccessibilityAttribute( check_box_button, "access_key1", "access_value1" );
-  attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES );
+  DevelControl::AppendAccessibilityAttribute(check_box_button, "access_key1", "access_value1");
+  attributes     = check_box_button.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
   attributes_map = attributes.GetMap();
 
-  DALI_TEST_EQUALS( (attributes_map->Find( "access_key1" ))->Get<std::string>(), "access_value1", TEST_LOCATION );
+  DALI_TEST_EQUALS((attributes_map->Find("access_key1"))->Get<std::string>(), "access_value1", TEST_LOCATION);
 
-  DevelControl::AppendAccessibilityAttribute( check_box_button, "access_key2", "access_value2_a" );
-  attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES );
+  DevelControl::AppendAccessibilityAttribute(check_box_button, "access_key2", "access_value2_a");
+  attributes     = check_box_button.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
   attributes_map = attributes.GetMap();
 
-  DALI_TEST_EQUALS( (attributes_map->Find( "access_key1" ))->Get<std::string>(), "access_value1", TEST_LOCATION );
-  DALI_TEST_EQUALS( (attributes_map->Find( "access_key2" ))->Get<std::string>(), "access_value2_a", TEST_LOCATION );
+  DALI_TEST_EQUALS((attributes_map->Find("access_key1"))->Get<std::string>(), "access_value1", TEST_LOCATION);
+  DALI_TEST_EQUALS((attributes_map->Find("access_key2"))->Get<std::string>(), "access_value2_a", TEST_LOCATION);
 
-  DevelControl::AppendAccessibilityAttribute( check_box_button, "access_key2", "access_value2_b" );
-  attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES );
+  DevelControl::AppendAccessibilityAttribute(check_box_button, "access_key2", "access_value2_b");
+  attributes     = check_box_button.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
   attributes_map = attributes.GetMap();
 
-  DALI_TEST_EQUALS( (attributes_map->Find( "access_key2" ))->Get<std::string>(), "access_value2_b", TEST_LOCATION );
+  DALI_TEST_EQUALS((attributes_map->Find("access_key2"))->Get<std::string>(), "access_value2_b", TEST_LOCATION);
 
-  DevelControl::RemoveAccessibilityAttribute( check_box_button, "access_key2" );
-  attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES );
+  DevelControl::RemoveAccessibilityAttribute(check_box_button, "access_key2");
+  attributes     = check_box_button.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
   attributes_map = attributes.GetMap();
 
   // In case when we are removing one of attributes the property is setting for NONE type.
-  DALI_TEST_EQUALS( (attributes_map->Find( "access_key2" ))->GetType(), Property::NONE, TEST_LOCATION );
+  DALI_TEST_EQUALS((attributes_map->Find("access_key2"))->GetType(), Property::NONE, TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
+
+  auto ptr                  = Dali::Accessibility::Accessible::Get(check_box_button);
+  auto attribute_map_bridge = TestGetAttributes(ptr->GetAddress());
+  auto counter              = 0u;
 
-  auto ptr = Dali::Accessibility::Accessible::Get( check_box_button );
-  auto attribute_map_bridge = TestGetAttributes( ptr->GetAddress() );
-  auto counter = 0u;
-  for (auto i = 0u; i<attributes_map->Count();++i)
-    if((attributes_map->GetValue(i)).GetType() != Property::NONE )
+  // Refresh the attributes since ControlAccessible::GetAttributes() might have added something
+  attributes     = check_box_button.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
+  attributes_map = attributes.GetMap();
+  for(auto i = 0u; i < attributes_map->Count(); ++i)
+    if((attributes_map->GetValue(i)).GetType() != Property::NONE)
       ++counter;
 
-  DALI_TEST_EQUALS( counter, attribute_map_bridge.size(), TEST_LOCATION );
+  DALI_TEST_EQUALS(counter, attribute_map_bridge.size(), TEST_LOCATION);
 
-  for (auto it : attribute_map_bridge)
-    DALI_TEST_EQUALS( (attributes_map->Find( it.first ))->Get<std::string>(), it.second, TEST_LOCATION );
+  for(auto it : attribute_map_bridge)
+    DALI_TEST_EQUALS((attributes_map->Find(it.first))->Get<std::string>(), it.second, TEST_LOCATION);
 
   DevelControl::ClearAccessibilityAttributes(check_box_button);
-  attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES );
+  attributes     = check_box_button.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
   attributes_map = attributes.GetMap();
 
-  position = attributes_map->Find( "access_key1" );
-  DALI_TEST_CHECK( !position );
+  position = attributes_map->Find("access_key1");
+  DALI_TEST_CHECK(!position);
 
-  position = attributes_map->Find( "access_key2" );
-  DALI_TEST_CHECK( !position );
+  position = attributes_map->Find("access_key2");
+  DALI_TEST_CHECK(!position);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -458,39 +492,39 @@ int utcDaliAccessibilityControlAttributes(void)
 int UtcDaliControlReadingInfoType(void)
 {
   ToolkitTestApplication application;
-  auto control = Control::New();
+  auto                   control = Control::New();
 
   auto reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control);
 
-  for ( auto i = 0u; i < 4; ++i)
-    DALI_TEST_CHECK ( reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]);
+  for(auto i = 0u; i < 4; ++i)
+    DALI_TEST_CHECK(reading_info_type[static_cast<Dali::Accessibility::ReadingInfoType>(i)]);
 
   reading_info_type[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = false;
-  reading_info_type[Dali::Accessibility::ReadingInfoType::STATE] = false;
-  reading_info_type[Dali::Accessibility::ReadingInfoType::NAME] = false;
-  reading_info_type[Dali::Accessibility::ReadingInfoType::ROLE] = false;
+  reading_info_type[Dali::Accessibility::ReadingInfoType::STATE]       = false;
+  reading_info_type[Dali::Accessibility::ReadingInfoType::NAME]        = false;
+  reading_info_type[Dali::Accessibility::ReadingInfoType::ROLE]        = false;
 
   DevelControl::SetAccessibilityReadingInfoType(control, reading_info_type);
 
   reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control);
 
-  for ( auto i = 0u; i < 4; ++i)
-    DALI_TEST_CHECK ( false == reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]);
+  for(auto i = 0u; i < 4; ++i)
+    DALI_TEST_CHECK(false == reading_info_type[static_cast<Dali::Accessibility::ReadingInfoType>(i)]);
 
   reading_info_type[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = true;
-  reading_info_type[Dali::Accessibility::ReadingInfoType::STATE] = true;
-  reading_info_type[Dali::Accessibility::ReadingInfoType::NAME] = true;
-  reading_info_type[Dali::Accessibility::ReadingInfoType::ROLE] = true;
+  reading_info_type[Dali::Accessibility::ReadingInfoType::STATE]       = true;
+  reading_info_type[Dali::Accessibility::ReadingInfoType::NAME]        = true;
+  reading_info_type[Dali::Accessibility::ReadingInfoType::ROLE]        = true;
 
   DevelControl::SetAccessibilityReadingInfoType(control, reading_info_type);
 
-  auto q = control.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES );
+  auto q = control.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
   auto z = q.GetMap();
 
-  DALI_TEST_EQUALS( (z->Find( "reading_info_type" ))->Get<std::string>(), "name|role|description|state", TEST_LOCATION );
+  DALI_TEST_EQUALS((z->Find("reading_info_type"))->Get<std::string>(), "name|role|description|state", TEST_LOCATION);
   reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control);
-  for ( auto i = 0u; i < 4; ++i)
-    DALI_TEST_CHECK ( reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]);
+  for(auto i = 0u; i < 4; ++i)
+    DALI_TEST_CHECK(reading_info_type[static_cast<Dali::Accessibility::ReadingInfoType>(i)]);
 
   END_TEST;
 }
@@ -498,30 +532,30 @@ int UtcDaliControlReadingInfoType(void)
 int UtcDaliControlDoGesture(void)
 {
   ToolkitTestApplication application;
-  auto control = Control::New();
-  Dali::Accessibility::TestEnableSC( true );
+  auto                   control = Control::New();
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( control );
-  auto gesture_one = Dali::Accessibility::GestureInfo { Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 };
-  auto gesture_two = Dali::Accessibility::GestureInfo { Dali::Accessibility::Gesture::ONE_FINGER_FLICK_RIGHT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 };
+  auto accessible  = Dali::Accessibility::Accessible::Get(control);
+  auto gesture_one = Dali::Accessibility::GestureInfo{Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000};
+  auto gesture_two = Dali::Accessibility::GestureInfo{Dali::Accessibility::Gesture::ONE_FINGER_FLICK_RIGHT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000};
 
-  DALI_TEST_CHECK( !accessible->DoGesture( gesture_one ) );
-  DALI_TEST_CHECK( !TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 ) );
+  DALI_TEST_CHECK(!accessible->DoGesture(gesture_one));
+  DALI_TEST_CHECK(!TestDoGesture(accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000));
 
-  DevelControl::AccessibilityDoGestureSignal(control).Connect( [] ( std::pair< Dali::Accessibility::GestureInfo, bool > &gesture ) {
-  if ( gesture.first.type == Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT )
-    gesture.second = true;
-  else
-    gesture.second = false;
-  } );
+  DevelControl::AccessibilityDoGestureSignal(control).Connect([](std::pair<Dali::Accessibility::GestureInfo, bool>& gesture) {
+    if(gesture.first.type == Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT)
+      gesture.second = true;
+    else
+      gesture.second = false;
+  });
 
-  DALI_TEST_CHECK( accessible->DoGesture( gesture_one ) );
-  DALI_TEST_CHECK( TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 ) );
+  DALI_TEST_CHECK(accessible->DoGesture(gesture_one));
+  DALI_TEST_CHECK(TestDoGesture(accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000));
 
-  DALI_TEST_CHECK( !accessible->DoGesture( gesture_two ) );
-  DALI_TEST_CHECK( !TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_RIGHT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 ) );
+  DALI_TEST_CHECK(!accessible->DoGesture(gesture_two));
+  DALI_TEST_CHECK(!TestDoGesture(accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_RIGHT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000));
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -529,46 +563,50 @@ int UtcDaliControlDoGesture(void)
 int UtcDaliAccessibilityRelation(void)
 {
   ToolkitTestApplication application;
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto rel = Accessibility::RelationType::FLOWS_TO;
-  auto number = static_cast< size_t >( rel );
-  auto control = Control::New();
+  auto rel          = Accessibility::RelationType::FLOWS_TO;
+  auto control      = Control::New();
   auto destination1 = Control::New();
   auto destination2 = Control::New();
 
-  DevelControl::AppendAccessibilityRelation( control, destination1, rel );
+  DevelControl::AppendAccessibilityRelation(control, destination1, rel);
   auto relations = DevelControl::GetAccessibilityRelations(control);
-  DALI_TEST_CHECK( relations[ number ].size() == 1 );
+  DALI_TEST_EQUALS(relations.size(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(relations[0].mRelationType, rel, TEST_LOCATION);
+  DALI_TEST_EQUALS(relations[0].mTargets.size(), 1u, TEST_LOCATION);
 
-  DevelControl::AppendAccessibilityRelation( control, destination2, rel );
+  DevelControl::AppendAccessibilityRelation(control, destination2, rel);
   relations = DevelControl::GetAccessibilityRelations(control);
-  DALI_TEST_CHECK( relations[ number ].size() == 2 );
+  DALI_TEST_EQUALS(relations.size(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(relations[0].mRelationType, rel, TEST_LOCATION);
+  DALI_TEST_EQUALS(relations[0].mTargets.size(), 2u, TEST_LOCATION);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( control );
-  auto accessible_destination1 = Dali::Accessibility::Accessible::Get( destination1 );
-  auto accessible_destination2 = Dali::Accessibility::Accessible::Get( destination2 );
-  auto relationset = accessible->GetRelationSet();
+  auto accessible              = Dali::Accessibility::Accessible::Get(control);
+  auto accessible_destination1 = Dali::Accessibility::Accessible::Get(destination1);
+  auto accessible_destination2 = Dali::Accessibility::Accessible::Get(destination2);
+  auto relationset             = accessible->GetRelationSet();
 
-  DALI_TEST_CHECK( relationset[0].relationType == rel );
-  DALI_TEST_CHECK( relationset[0].targets[0] == accessible_destination1->GetAddress() || relationset[0].targets[1] == accessible_destination1->GetAddress() );
-  DALI_TEST_CHECK( relationset[0].targets[0] == accessible_destination2->GetAddress() || relationset[0].targets[1] == accessible_destination2->GetAddress() );
+  DALI_TEST_CHECK(relationset[0].mRelationType == rel);
+  DALI_TEST_CHECK(relationset[0].mTargets[0] == accessible_destination1 || relationset[0].mTargets[1] == accessible_destination1);
+  DALI_TEST_CHECK(relationset[0].mTargets[0] == accessible_destination2 || relationset[0].mTargets[1] == accessible_destination2);
 
-  auto relationset_bridge = TestGetRelationSet( accessible -> GetAddress() );
-  DALI_TEST_CHECK( static_cast< uint32_t >( relationset[0].relationType ) == std::get<0>( relationset_bridge[0] ) );
+  auto relationset_bridge = TestGetRelationSet(accessible->GetAddress());
+  DALI_TEST_CHECK(static_cast<uint32_t>(relationset[0].mRelationType) == std::get<0>(relationset_bridge[0]));
 
-  DALI_TEST_CHECK( relationset[0].targets[0] == std::get<1>( relationset_bridge[0] )[0] || relationset[0].targets[1] == std::get<1>( relationset_bridge[0] )[0] );
-  DALI_TEST_CHECK( relationset[0].targets[0] == std::get<1>( relationset_bridge[0] )[1] || relationset[0].targets[1] == std::get<1>( relationset_bridge[0] )[1] );
+  DALI_TEST_CHECK(relationset[0].mTargets[0]->GetAddress() == std::get<1>(relationset_bridge[0])[0] || relationset[0].mTargets[1]->GetAddress() == std::get<1>(relationset_bridge[0])[0]);
+  DALI_TEST_CHECK(relationset[0].mTargets[0]->GetAddress() == std::get<1>(relationset_bridge[0])[1] || relationset[0].mTargets[1]->GetAddress() == std::get<1>(relationset_bridge[0])[1]);
 
-  DevelControl::RemoveAccessibilityRelation(control,destination2,rel);
+  DevelControl::RemoveAccessibilityRelation(control, destination2, rel);
   relations = DevelControl::GetAccessibilityRelations(control);
-  DALI_TEST_CHECK( relations[ number ].size() == 1 );
+  DALI_TEST_EQUALS(relations.size(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(relations[0].mTargets.size(), 1u, TEST_LOCATION);
 
   DevelControl::ClearAccessibilityRelations(control);
   relations = DevelControl::GetAccessibilityRelations(control);
-  DALI_TEST_CHECK( relations[ number ].size() == 0 );
+  DALI_TEST_EQUALS(relations.size(), 0u, TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -576,55 +614,61 @@ int UtcDaliAccessibilityRelation(void)
 int UtcDaliAccessibilityParentChildren(void)
 {
   ToolkitTestApplication application;
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto parent = Control::New();
+  auto parent  = Control::New();
   auto child_1 = Control::New();
   auto child_2 = Control::New();
 
-  auto parent_accessible = Dali::Accessibility::Accessible::Get( parent );
-  auto child_1_accessible = Dali::Accessibility::Accessible::Get( child_1 );
-  auto child_2_accessible = Dali::Accessibility::Accessible::Get( child_2 );
+  auto parent_accessible  = Dali::Accessibility::Accessible::Get(parent);
+  auto child_1_accessible = Dali::Accessibility::Accessible::Get(child_1);
+  auto child_2_accessible = Dali::Accessibility::Accessible::Get(child_2);
 
-  auto children = TestGetChildren( parent_accessible -> GetAddress() );
-  DALI_TEST_EQUALS( children.size(), 0, TEST_LOCATION );
+  auto children = TestGetChildren(parent_accessible->GetAddress());
+  DALI_TEST_EQUALS(children.size(), 0, TEST_LOCATION);
 
   try
   {
-    TestGetIndexInParent( child_1_accessible -> GetAddress() );
+    TestGetIndexInParent(child_1_accessible->GetAddress());
     DALI_ABORT("Object has parent, test abort");
   }
-  catch(TestDBusWrapper::error &){}
+  catch(TestDBusWrapper::error&)
+  {
+  }
 
   try
   {
-    TestGetChildAtIndex( parent_accessible -> GetAddress(), -1 );
+    TestGetChildAtIndex(parent_accessible->GetAddress(), -1);
     DALI_ABORT("Positive index, test abort");
   }
-  catch(TestDBusWrapper::error &){}
+  catch(TestDBusWrapper::error&)
+  {
+  }
 
-  DALI_TEST_EQUALS( parent_accessible -> GetChildCount(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(parent_accessible->GetChildCount(), 0, TEST_LOCATION);
 
   try
   {
-    child_1_accessible -> GetIndexInParent();
+    child_1_accessible->GetIndexInParent();
     DALI_ABORT("Object has parent, test abort");
   }
-  catch (Dali::DaliException &){}
+  catch(const std::domain_error&)
+  {
+  }
 
   parent.Add(child_1);
   parent.Add(child_2);
 
-  children = TestGetChildren( parent_accessible -> GetAddress() );
-  DALI_TEST_EQUALS( children.size(), 2, TEST_LOCATION );
+  children = TestGetChildren(parent_accessible->GetAddress());
+  DALI_TEST_EQUALS(children.size(), 2, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( parent_accessible -> GetAddress(), TestGetParent( child_1_accessible -> GetAddress() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( child_2_accessible -> GetAddress(), TestGetChildAtIndex( parent_accessible -> GetAddress(), TestGetIndexInParent( child_2_accessible -> GetAddress() ) ), TEST_LOCATION );
+  DALI_TEST_EQUALS(parent_accessible->GetAddress(), TestGetParent(child_1_accessible->GetAddress()), TEST_LOCATION);
+  DALI_TEST_EQUALS(child_2_accessible->GetAddress(), TestGetChildAtIndex(parent_accessible->GetAddress(), TestGetIndexInParent(child_2_accessible->GetAddress())), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( parent_accessible,  child_1_accessible -> GetParent(), TEST_LOCATION );
-  DALI_TEST_EQUALS( child_2_accessible, parent_accessible -> GetChildAtIndex( child_2_accessible -> GetIndexInParent() ) , TEST_LOCATION );
+  DALI_TEST_EQUALS(parent_accessible, child_1_accessible->GetParent(), TEST_LOCATION);
+  DALI_TEST_EQUALS(child_2_accessible, parent_accessible->GetChildAtIndex(child_2_accessible->GetIndexInParent()), TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -633,16 +677,16 @@ int UtcDaliAccessibilityGetLayer(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto control = Control::New();
-  auto accessible_obj = Dali::Accessibility::Accessible::Get( control );
+  auto control              = Control::New();
+  auto accessible_obj       = Dali::Accessibility::Accessible::Get(control);
   auto accessible_component = dynamic_cast<Dali::Accessibility::Component*>(accessible_obj);
-  DALI_TEST_CHECK( accessible_component );
-  DALI_TEST_EQUALS( Dali::Accessibility::ComponentLayer::WINDOW, accessible_component -> GetLayer(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Accessibility::ComponentLayer::WINDOW, TestGetLayer( accessible_component -> GetAddress() ), TEST_LOCATION );
+  DALI_TEST_CHECK(accessible_component);
+  DALI_TEST_EQUALS(Dali::Accessibility::ComponentLayer::WINDOW, accessible_component->GetLayer(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Accessibility::ComponentLayer::WINDOW, TestGetLayer(accessible_component->GetAddress()), TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -651,46 +695,46 @@ int UtcDaliAccessibilityGrabFocus(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
   auto controla = Control::New();
   auto controlb = Control::New();
 
-  Stage::GetCurrent().Add( controla );
-  Stage::GetCurrent().Add( controlb );
+  Stage::GetCurrent().Add(controla);
+  Stage::GetCurrent().Add(controlb);
 
   controla.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   controlb.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
-  auto a = Dali::Accessibility::Accessible::Get( controla );
-  auto b = Dali::Accessibility::Accessible::Get( controlb );
+  auto a = Dali::Accessibility::Accessible::Get(controla);
+  auto b = Dali::Accessibility::Accessible::Get(controlb);
 
-  auto a_component = dynamic_cast<Dali::Accessibility::Component*>( a );
-  auto b_component = dynamic_cast<Dali::Accessibility::Component*>( b );
+  auto a_component = dynamic_cast<Dali::Accessibility::Component*>(a);
+  auto b_component = dynamic_cast<Dali::Accessibility::Component*>(b);
 
-  auto states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a_component -> GetAddress() )};
-  auto states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b_component -> GetAddress() )};
+  auto states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a_component->GetAddress())};
+  auto states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b_component->GetAddress())};
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::FOCUSED ] );
-  DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::FOCUSED ] );
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::FOCUSED]);
+  DALI_TEST_CHECK(!states_by_bridge_b[Dali::Accessibility::State::FOCUSED]);
 
-  DALI_TEST_CHECK( a_component -> GrabFocus() );
+  DALI_TEST_CHECK(a_component->GrabFocus());
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a_component -> GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b_component -> GetAddress() )};
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a_component->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b_component->GetAddress())};
 
-  DALI_TEST_CHECK( states_by_bridge_a[ Dali::Accessibility::State::FOCUSED ] );
-  DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::FOCUSED ] );
+  DALI_TEST_CHECK(states_by_bridge_a[Dali::Accessibility::State::FOCUSED]);
+  DALI_TEST_CHECK(!states_by_bridge_b[Dali::Accessibility::State::FOCUSED]);
 
-  DALI_TEST_CHECK( TestGrabFocus( b_component -> GetAddress() ) );
+  DALI_TEST_CHECK(TestGrabFocus(b_component->GetAddress()));
 
-  states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a_component -> GetAddress() )};
-  states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b_component -> GetAddress() )};
+  states_by_bridge_a = Dali::Accessibility::States{TestGetStates(a_component->GetAddress())};
+  states_by_bridge_b = Dali::Accessibility::States{TestGetStates(b_component->GetAddress())};
 
-  DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::FOCUSED ] );
-  DALI_TEST_CHECK( states_by_bridge_b[ Dali::Accessibility::State::FOCUSED ] );
+  DALI_TEST_CHECK(!states_by_bridge_a[Dali::Accessibility::State::FOCUSED]);
+  DALI_TEST_CHECK(states_by_bridge_b[Dali::Accessibility::State::FOCUSED]);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -698,81 +742,81 @@ int UtcDaliAccessibilityGrabFocus(void)
 int UtcDaliAccessibilityGetExtentsScreenAndWindowPositionMatch(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAccessibilityGetExtentsScreenAndWindowPositionMatch" );
+  tet_infoline("UtcDaliAccessibilityGetExtentsScreenAndWindowPositionMatch");
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
   auto control = Control::New();
-  Stage::GetCurrent().GetRootLayer().Add( control );
+  Stage::GetCurrent().GetRootLayer().Add(control);
 
-  auto window = Dali::DevelWindow::Get( control );
-  DALI_TEST_CHECK( window );
+  auto window = Dali::DevelWindow::Get(control);
+  DALI_TEST_CHECK(window);
 
   //window.SetPosition({0,0});
-  DevelWindow::SetPositionSize( window, PositionSize( 0,0,480, 240 ) );
+  DevelWindow::SetPositionSize(window, PositionSize(0, 0, 480, 240));
 
-  control.SetProperty( Actor::Property::POSITION, Vector3( 10, 10, 100 ) );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 10, 10 ) );
+  control.SetProperty(Actor::Property::POSITION, Vector3(10, 10, 100));
+  control.SetProperty(Actor::Property::SIZE, Vector2(10, 10));
 
   application.SendNotification();
-  application.Render( 1 );
-
-  auto a = Dali::Accessibility::Accessible::Get( control );
-  auto a_component = dynamic_cast<Dali::Accessibility::Component*>( a );
-
-  auto extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( extents.x, 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  auto bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 5, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 5, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( extents.x, 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 5, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 5, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  control.SetProperty( Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT, false );
+  application.Render(1);
+
+  auto a           = Dali::Accessibility::Accessible::Get(control);
+  auto a_component = dynamic_cast<Dali::Accessibility::Component*>(a);
+
+  auto extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(extents.x, 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  auto bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(extents.x, 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  control.SetProperty(Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
   application.SendNotification();
-  application.Render( 1 );
-
-  extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( extents.x, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( extents.x, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  Dali::Accessibility::TestEnableSC( false );
+  application.Render(1);
+
+  extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(extents.x, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(extents.x, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -781,76 +825,76 @@ int UtcDaliAccessibilityGetExtentsScreenAndWindowPositionDoNotMatch(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
   auto control = Control::New();
-  Stage::GetCurrent().GetRootLayer().Add( control );
-  auto window = Dali::DevelWindow::Get( control );
+  Stage::GetCurrent().GetRootLayer().Add(control);
+  auto window = Dali::DevelWindow::Get(control);
   //window.SetPosition({33,33});
-  DevelWindow::SetPositionSize( window, PositionSize( 33,33,480, 240 ) );
+  DevelWindow::SetPositionSize(window, PositionSize(33, 33, 480, 240));
 
-  control.SetProperty( Actor::Property::POSITION, Vector3( 10, 10, 100 ) );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 10, 10 ) );
+  control.SetProperty(Actor::Property::POSITION, Vector3(10, 10, 100));
+  control.SetProperty(Actor::Property::SIZE, Vector2(10, 10));
 
   application.SendNotification();
-  application.Render( 1 );
-
-  auto a = Dali::Accessibility::Accessible::Get( control );
-  auto a_component = dynamic_cast<Dali::Accessibility::Component*>( a );
-
-  auto extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( extents.x, 38.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 38.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  auto bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 38, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 38, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( extents.x, 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 5, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 5, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  control.SetProperty( Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT, false );
+  application.Render(1);
+
+  auto a           = Dali::Accessibility::Accessible::Get(control);
+  auto a_component = dynamic_cast<Dali::Accessibility::Component*>(a);
+
+  auto extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(extents.x, 38.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 38.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  auto bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 38, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 38, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(extents.x, 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  control.SetProperty(Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
   application.SendNotification();
-  application.Render( 1 );
-
-  extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( extents.x, 43.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 43.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 43, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 43, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( extents.x, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.y, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
-
-  bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
-  DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
-
-  Dali::Accessibility::TestEnableSC( false );
+  application.Render(1);
+
+  extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(extents.x, 43.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 43.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::SCREEN);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 43, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 43, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(extents.x, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.y, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.height, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(extents.width, 10.0f, TEST_LOCATION);
+
+  bridge_extents = TestGetExtents(a_component->GetAddress(), Dali::Accessibility::CoordinateType::WINDOW);
+  DALI_TEST_EQUALS(std::get<0>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<1>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<2>(bridge_extents), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(std::get<3>(bridge_extents), 10, TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -859,16 +903,16 @@ int UtcDaliAccessibilityGetAlpha(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto control = Control::New();
-  auto a = Dali::Accessibility::Accessible::Get( control );
-  auto a_component = dynamic_cast<Dali::Accessibility::Component*>( a );
+  auto control     = Control::New();
+  auto a           = Dali::Accessibility::Accessible::Get(control);
+  auto a_component = dynamic_cast<Dali::Accessibility::Component*>(a);
 
-  DALI_TEST_EQUALS( 0.0, a_component -> GetAlpha(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0.0, TestGetAlpha( a_component -> GetAddress() ), TEST_LOCATION );
+  DALI_TEST_EQUALS(0.0, a_component->GetAlpha(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0.0, TestGetAlpha(a_component->GetAddress()), TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -877,16 +921,16 @@ int UtcDaliAccessibilityGetMdiZOrder(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto control = Control::New();
-  auto a = Dali::Accessibility::Accessible::Get( control );
-  auto a_component = dynamic_cast<Dali::Accessibility::Component*>( a );
+  auto control     = Control::New();
+  auto a           = Dali::Accessibility::Accessible::Get(control);
+  auto a_component = dynamic_cast<Dali::Accessibility::Component*>(a);
 
-  DALI_TEST_EQUALS( 0, static_cast< int >( a_component -> GetMdiZOrder() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0, TestGetMdiZOrder( a_component -> GetAddress() ), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, static_cast<int>(a_component->GetMdiZOrder()), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, TestGetMdiZOrder(a_component->GetAddress()), TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -895,23 +939,23 @@ int UtcDaliAccessibilityAction(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto control = Control::New( );
-  auto a = Dali::Accessibility::Accessible::Get( control );
-  auto b = dynamic_cast<Dali::Accessibility::Action*>( a );
+  auto control = Control::New();
+  auto a       = Dali::Accessibility::Accessible::Get(control);
+  auto b       = dynamic_cast<Dali::Accessibility::Action*>(a);
 
-  std::vector< std::string > actions { "activate", "accessibilityActivated", "ReadingSkipped", "ReadingCancelled", "ReadingStopped", "ReadingPaused", "ReadingResumed", "show", "hide" };
-  auto count = b -> GetActionCount();
+  std::vector<std::string> actions{"activate", "accessibilityActivated", "ReadingSkipped", "ReadingCancelled", "ReadingStopped", "ReadingPaused", "ReadingResumed", "show", "hide"};
+  auto                     count = b->GetActionCount();
 
-  DALI_TEST_EQUALS( count, 9, TEST_LOCATION );
+  DALI_TEST_EQUALS(count, 9, TEST_LOCATION);
 
-  for (auto i = 0u; i<count; ++i)
+  for(auto i = 0u; i < count; ++i)
   {
-    DALI_TEST_CHECK( Dali::Accessibility::Find( actions, b -> GetActionName( i ) ) );
-    DALI_TEST_EQUALS( b -> GetActionName( i ), b -> GetLocalizedActionName( i ), TEST_LOCATION );
-    DALI_TEST_EQUALS( b -> GetActionDescription( i ), "", TEST_LOCATION );
-    DALI_TEST_EQUALS( b -> GetActionKeyBinding( i ), "", TEST_LOCATION );
+    DALI_TEST_CHECK(Dali::Accessibility::Find(actions, b->GetActionName(i)));
+    DALI_TEST_EQUALS(b->GetActionName(i), b->GetLocalizedActionName(i), TEST_LOCATION);
+    DALI_TEST_EQUALS(b->GetActionDescription(i), "", TEST_LOCATION);
+    DALI_TEST_EQUALS(b->GetActionKeyBinding(i), "", TEST_LOCATION);
   }
 
   // Empty strings should be returned for invalid indices
@@ -920,16 +964,16 @@ int UtcDaliAccessibilityAction(void)
   DALI_TEST_EQUALS(b->GetLocalizedActionName(count), "", TEST_LOCATION);
   DALI_TEST_EQUALS(b->GetActionKeyBinding(count), "", TEST_LOCATION);
 
-  count = TestGetActionCount(b -> GetAddress());
+  count = TestGetActionCount(b->GetAddress());
 
-  DALI_TEST_EQUALS( count, 9, TEST_LOCATION );
+  DALI_TEST_EQUALS(count, 9, TEST_LOCATION);
 
-  for (auto i = 0u; i<count; ++i)
+  for(auto i = 0u; i < count; ++i)
   {
-    DALI_TEST_CHECK( Dali::Accessibility::Find( actions, TestGetActionName( b->GetAddress(), i ) ) );
-    DALI_TEST_EQUALS( TestGetActionName( b->GetAddress(), i ), TestGetLocalizedActionName( b->GetAddress(), i ), TEST_LOCATION );
-    DALI_TEST_EQUALS( TestGetActionDescription( b->GetAddress(), i ), "", TEST_LOCATION );
-    DALI_TEST_EQUALS( TestGetActionKeyBinding( b->GetAddress(), i ), "", TEST_LOCATION );
+    DALI_TEST_CHECK(Dali::Accessibility::Find(actions, TestGetActionName(b->GetAddress(), i)));
+    DALI_TEST_EQUALS(TestGetActionName(b->GetAddress(), i), TestGetLocalizedActionName(b->GetAddress(), i), TEST_LOCATION);
+    DALI_TEST_EQUALS(TestGetActionDescription(b->GetAddress(), i), "", TEST_LOCATION);
+    DALI_TEST_EQUALS(TestGetActionKeyBinding(b->GetAddress(), i), "", TEST_LOCATION);
   }
 
   DALI_TEST_EQUALS(TestGetActionDescription(b->GetAddress(), count), "", TEST_LOCATION);
@@ -937,7 +981,7 @@ int UtcDaliAccessibilityAction(void)
   DALI_TEST_EQUALS(TestGetLocalizedActionName(b->GetAddress(), count), "", TEST_LOCATION);
   DALI_TEST_EQUALS(TestGetActionKeyBinding(b->GetAddress(), count), "", TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -946,79 +990,79 @@ int UtcDaliAccessibilityDoAction(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Accessibility::TestEnableSC( true );
-  thread_local std::vector< bool > actions_done { false, false, false, false, false, false };
+  Dali::Accessibility::TestEnableSC(true);
+  thread_local std::vector<bool> actions_done{false, false, false, false, false, false};
 
-  auto control = Control::New(  );
-  auto a = Dali::Accessibility::Accessible::Get( control );
-  auto b = dynamic_cast<Dali::Accessibility::Action*>( a );
-  std::vector< std::string > actions { "activate", "accessibilityActivated", "ReadingSkipped", "ReadingCancelled", "ReadingStopped", "ReadingPaused", "ReadingResumed", "show", "hide" };
+  auto                     control = Control::New();
+  auto                     a       = Dali::Accessibility::Accessible::Get(control);
+  auto                     b       = dynamic_cast<Dali::Accessibility::Action*>(a);
+  std::vector<std::string> actions{"activate", "accessibilityActivated", "ReadingSkipped", "ReadingCancelled", "ReadingStopped", "ReadingPaused", "ReadingResumed", "show", "hide"};
 
   // Test calling action by name
-  DALI_TEST_CHECK( b -> DoAction( actions[2] ) ); // ReadingSkipped
-  DALI_TEST_CHECK( b -> DoAction( actions[4] ) ); // ReadingStopped
-  DALI_TEST_CHECK( b -> DoAction( actions[4] ) ); // ReadingStopped
+  DALI_TEST_CHECK(b->DoAction(actions[2])); // ReadingSkipped
+  DALI_TEST_CHECK(b->DoAction(actions[4])); // ReadingStopped
+  DALI_TEST_CHECK(b->DoAction(actions[4])); // ReadingStopped
 
   // Negative test of calling action with not defined name
-  DALI_TEST_CHECK( !b -> DoAction( "undefined" ) );
-
-  DevelControl::AccessibilityReadingSkippedSignal(control).Connect( [] () {
-    actions_done[ 1 ] = true;
-  } );
-  DevelControl::AccessibilityReadingCancelledSignal(control).Connect( [] () {
-    actions_done[ 2 ] = true;
-  } );
-  DevelControl::AccessibilityReadingStoppedSignal(control).Connect( [] () {
-    actions_done[ 3 ] = true;
-  } );
-   DevelControl::AccessibilityReadingPausedSignal(control).Connect( [] () {
-    actions_done[ 4 ] = true;
-  } );
-   DevelControl::AccessibilityReadingResumedSignal(control).Connect( [] () {
-    actions_done[ 5 ] = true;
-  } );
-  DevelControl::AccessibilityActivateSignal(control).Connect( [] () {
-    actions_done[ 0 ] = true;
-  } );
+  DALI_TEST_CHECK(!b->DoAction("undefined"));
+
+  DevelControl::AccessibilityReadingSkippedSignal(control).Connect([]() {
+    actions_done[1] = true;
+  });
+  DevelControl::AccessibilityReadingCancelledSignal(control).Connect([]() {
+    actions_done[2] = true;
+  });
+  DevelControl::AccessibilityReadingStoppedSignal(control).Connect([]() {
+    actions_done[3] = true;
+  });
+  DevelControl::AccessibilityReadingPausedSignal(control).Connect([]() {
+    actions_done[4] = true;
+  });
+  DevelControl::AccessibilityReadingResumedSignal(control).Connect([]() {
+    actions_done[5] = true;
+  });
+  DevelControl::AccessibilityActivateSignal(control).Connect([]() {
+    actions_done[0] = true;
+  });
 
   // Test calling action by index
-  DALI_TEST_CHECK( b -> DoAction( 1 ) );
-  DALI_TEST_CHECK( b -> DoAction( 2 ) );
-  DALI_TEST_CHECK( b -> DoAction( 3 ) );
-  DALI_TEST_CHECK( b -> DoAction( 4 ) );
-  DALI_TEST_CHECK( b -> DoAction( 5 ) );
-  DALI_TEST_CHECK( b -> DoAction( 6 ) );
-
-  for ( auto i = 0u; i < actions_done.size(); ++i )
-    {
-      DALI_TEST_CHECK( actions_done[ i ] );
-      actions_done[ i ] = false;
-    }
-
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), 1 ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), 2 ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), 3 ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), 4 ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), 5 ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), 6 ) );
-
-  for ( auto i = 0u; i < actions_done.size(); ++i )
-    {
-      DALI_TEST_CHECK( actions_done[ i ] );
-      actions_done[ i ] = false;
-    }
-
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), actions[ 1 ] ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), actions[ 2 ] ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), actions[ 3 ] ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), actions[ 4 ] ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), actions[ 5 ] ) );
-  DALI_TEST_CHECK( TestDoAction( b -> GetAddress(), actions[ 6 ] ) );
-
-  for ( auto i = 0u; i < actions_done.size(); ++i )
-      DALI_TEST_CHECK( actions_done[ i ] );
-
-  Dali::Accessibility::TestEnableSC( false );
+  DALI_TEST_CHECK(b->DoAction(1));
+  DALI_TEST_CHECK(b->DoAction(2));
+  DALI_TEST_CHECK(b->DoAction(3));
+  DALI_TEST_CHECK(b->DoAction(4));
+  DALI_TEST_CHECK(b->DoAction(5));
+  DALI_TEST_CHECK(b->DoAction(6));
+
+  for(auto i = 0u; i < actions_done.size(); ++i)
+  {
+    DALI_TEST_CHECK(actions_done[i]);
+    actions_done[i] = false;
+  }
+
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), 1));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), 2));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), 3));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), 4));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), 5));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), 6));
+
+  for(auto i = 0u; i < actions_done.size(); ++i)
+  {
+    DALI_TEST_CHECK(actions_done[i]);
+    actions_done[i] = false;
+  }
+
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), actions[1]));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), actions[2]));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), actions[3]));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), actions[4]));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), actions[5]));
+  DALI_TEST_CHECK(TestDoAction(b->GetAddress(), actions[6]));
+
+  for(auto i = 0u; i < actions_done.size(); ++i)
+    DALI_TEST_CHECK(actions_done[i]);
+
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -1030,20 +1074,20 @@ void TestVoidCallback()
 int UtcDaliAccessibilitySignals(void)
 {
   ToolkitTestApplication application;
-  ConnectionTracker connectionTracker;
-  Control control = Control::New();
+  ConnectionTracker      connectionTracker;
+  Control                control = Control::New();
 
-  DALI_TEST_CHECK( DevelControl::AccessibilityGetNameSignal(control).Empty() );
-  control.ConnectSignal( &connectionTracker, "getName", &TestVoidCallback );
-  DALI_TEST_CHECK( !DevelControl::AccessibilityGetNameSignal(control).Empty() );
+  DALI_TEST_CHECK(DevelControl::AccessibilityGetNameSignal(control).Empty());
+  control.ConnectSignal(&connectionTracker, "getName", &TestVoidCallback);
+  DALI_TEST_CHECK(!DevelControl::AccessibilityGetNameSignal(control).Empty());
 
-  DALI_TEST_CHECK( DevelControl::AccessibilityGetDescriptionSignal(control).Empty() );
-  control.ConnectSignal( &connectionTracker, "getDescription", &TestVoidCallback );
-  DALI_TEST_CHECK( !DevelControl::AccessibilityGetDescriptionSignal(control).Empty() );
+  DALI_TEST_CHECK(DevelControl::AccessibilityGetDescriptionSignal(control).Empty());
+  control.ConnectSignal(&connectionTracker, "getDescription", &TestVoidCallback);
+  DALI_TEST_CHECK(!DevelControl::AccessibilityGetDescriptionSignal(control).Empty());
 
-  DALI_TEST_CHECK( DevelControl::AccessibilityDoGestureSignal(control).Empty() );
-  control.ConnectSignal( &connectionTracker, "doGesture", &TestVoidCallback );
-  DALI_TEST_CHECK( !DevelControl::AccessibilityDoGestureSignal(control).Empty() );
+  DALI_TEST_CHECK(DevelControl::AccessibilityDoGestureSignal(control).Empty());
+  control.ConnectSignal(&connectionTracker, "doGesture", &TestVoidCallback);
+  DALI_TEST_CHECK(!DevelControl::AccessibilityDoGestureSignal(control).Empty());
 
   END_TEST;
 }
@@ -1057,71 +1101,93 @@ static void Wait(ToolkitTestApplication& application)
 int UtcDaliAccessibilityScrollToChildScrollView(void)
 {
   ToolkitTestApplication application;
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
-  PushButton actorA = PushButton::New();
+  PushButton          actorA    = PushButton::New();
   const Dali::Vector3 positionA = Vector3(100.0f, 400.0f, 0.0f);
-  actorA.SetProperty( Dali::Actor::Property::POSITION, positionA );
+  actorA.SetProperty(Dali::Actor::Property::POSITION, positionA);
   scrollView.Add(actorA);
 
-  PushButton actorB = PushButton::New();
+  PushButton          actorB    = PushButton::New();
   const Dali::Vector3 positionB = Vector3(500.0f, 200.0f, 0.0f);
-  actorB.SetProperty( Dali::Actor::Property::POSITION, positionB );
+  actorB.SetProperty(Dali::Actor::Property::POSITION, positionB);
   scrollView.Add(actorB);
 
+  TableView tableView = TableView::New(2, 2); // 2 by 2 grid.
+  tableView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  scrollView.Add(tableView);
+
+  PushButton actorC = PushButton::New();
+  actorC.SetProperty(Actor::Property::SIZE, Vector2(50.0f, 50.0f));
+  tableView.AddChild(actorC, TableView::CellPosition(0, 0));
+
+  PushButton actorD = PushButton::New();
+  application.GetScene().Add(actorD);
+
   Wait(application);
 
-  auto* accessibleParent = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(scrollView));
+  auto* accessibleParent = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(scrollView));
   DALI_TEST_CHECK(accessibleParent);
-  auto* accessibleA = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(actorA));
+  auto* accessibleA = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(actorA));
   DALI_TEST_CHECK(accessibleA);
-  auto* accessibleB = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(actorB));
+  auto* accessibleB = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(actorB));
   DALI_TEST_CHECK(accessibleB);
+  auto* accessibleC = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(actorC));
+  DALI_TEST_CHECK(accessibleC);
 
   accessibleA->GrabHighlight(); // == scrollView.ScrollTo(actorA)
   Wait(application);
   accessibleB->GrabHighlight(); // == scrollView.ScrollTo(actorB)
   Wait(application);
 
-  Dali::Accessibility::TestEnableSC( false );
+  // scrollView is ancestor of actorC
+  // This should work without a crash
+  accessibleC->GrabHighlight(); // == scrollView.ScrollTo(actorC)
+  Wait(application);
+
+  // negative testcase calling ScrollToChild using non-child actor
+  accessibleParent->ScrollToChild(actorD);
+
+  Dali::Accessibility::TestEnableSC(false);
   END_TEST;
 }
 
-namespace {
-  class TestItemFactory : public ItemFactory
+namespace
+{
+class TestItemFactory : public ItemFactory
+{
+public:
+  TestItemFactory()
   {
-  public:
-    TestItemFactory()
-    {
-    }
-
-    unsigned int GetNumberOfItems() override
-    {
-      return 2;
-    }
-
-    Dali::Actor NewItem(unsigned int itemId) override
-    {
-      return TextLabel::New(std::to_string(itemId));
-    }
-  };
-}
+  }
+
+  unsigned int GetNumberOfItems() override
+  {
+    return 2;
+  }
+
+  Dali::Actor NewItem(unsigned int itemId) override
+  {
+    return TextLabel::New(std::to_string(itemId));
+  }
+};
+} // namespace
 
 int UtcDaliAccessibilityScrollToChildItemView(void)
 {
   ToolkitTestApplication application;
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
-  Dali::Vector3 vec(480.0f, 800.0f, 0.0f);
-  ItemLayoutPtr layout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemView        view = ItemView::New(factory);
+  Dali::Vector3   vec(480.0f, 800.0f, 0.0f);
+  ItemLayoutPtr   layout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
 
   view.AddLayout(*layout);
-  view.SetProperty( Actor::Property::SIZE, vec );
+  view.SetProperty(Actor::Property::SIZE, vec);
 
   application.GetScene().Add(view);
   layout->SetOrientation(ControlOrientation::Down);
@@ -1129,11 +1195,11 @@ int UtcDaliAccessibilityScrollToChildItemView(void)
 
   Wait(application);
 
-  auto* accessibleParent = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(view));
+  auto* accessibleParent = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(view));
   DALI_TEST_CHECK(accessibleParent);
-  auto* accessibleA = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(view.GetItem(0)));
+  auto* accessibleA = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(view.GetItem(0)));
   DALI_TEST_CHECK(accessibleA);
-  auto* accessibleB = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(view.GetItem(1)));
+  auto* accessibleB = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(view.GetItem(1)));
   DALI_TEST_CHECK(accessibleB);
 
   accessibleA->GrabHighlight(); // == view.ScrollToItem(view.GetItemId(actorA))
@@ -1141,31 +1207,32 @@ int UtcDaliAccessibilityScrollToChildItemView(void)
   accessibleB->GrabHighlight(); // == view.ScrollToItem(view.GetItemId(actorB))
   Wait(application);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
   END_TEST;
 }
 
 int UtcDaliAccessibilityScrollToChildNonScrollable(void)
 {
   ToolkitTestApplication application;
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
   TextLabel label = TextLabel::New("123");
 
-  auto* accessible = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(label));
+  auto* accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(label));
   DALI_TEST_CHECK(accessible);
 
   DALI_TEST_EQUALS(accessible->IsScrollable(), false, TEST_LOCATION);
   DALI_TEST_EQUALS(accessible->ScrollToChild({}), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(accessible->GetInternalActor(), label, TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
   END_TEST;
 }
 
 int UtcDaliAccessibilityCheckHighlight(void)
 {
   ToolkitTestApplication application;
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
   Dali::Accessibility::TestResetMoveOutedCalled();
 
   // Make precondition two children exist in parent area
@@ -1175,7 +1242,7 @@ int UtcDaliAccessibilityCheckHighlight(void)
   parentButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   parentButton.SetProperty(Actor::Property::POSITION, Dali::Vector2(0.0f, 0.0f));
   parentButton.SetProperty(Actor::Property::SIZE, Dali::Vector2(100.0f, 200.0f));
-  application.GetScene().Add( parentButton );
+  application.GetScene().Add(parentButton);
 
   PushButton buttonA = PushButton::New();
   buttonA.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
@@ -1193,7 +1260,7 @@ int UtcDaliAccessibilityCheckHighlight(void)
   Wait(application);
 
   // Set highlight to first child (A) to enable movement tracking
-  auto* accessible = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(buttonA));
+  auto* accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(buttonA));
   DALI_TEST_CHECK(accessible);
   accessible->GrabHighlight();
   Wait(application);
@@ -1203,34 +1270,34 @@ int UtcDaliAccessibilityCheckHighlight(void)
   Wait(application);
   // Need one more notificaiton to get correct updated position
   application.SendNotification();
-  DALI_TEST_EQUALS( true, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
+  DALI_TEST_EQUALS(true, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION);
 
   // Reset verdict data
   Dali::Accessibility::TestResetMoveOutedCalled();
 
   // Move first child (A) outside of parent area (both start and end position are outside of parent area) - no move outed event expected for A object
-  buttonA.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, -300.0f) );
+  buttonA.SetProperty(Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, -300.0f));
   Wait(application);
   // Need one more notificaiton to get correct updated position
   application.SendNotification();
-  DALI_TEST_EQUALS( false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION);
 
   // Reset verdict data
   Dali::Accessibility::TestResetMoveOutedCalled();
 
   // Set highlight to second child (B) to enable movement tracking
-  accessible = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(buttonB));
+  accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(buttonB));
   DALI_TEST_CHECK(accessible);
   accessible->GrabHighlight();
   Wait(application);
 
   // Move second child (B) inside of parent area (both start and end position are inside of parent area) - no move outed event expected for B object
   // B: (0,100) --> (0, 50)
-  buttonB.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 50.0f) );
+  buttonB.SetProperty(Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 50.0f));
   Wait(application);
   // Need one more notificaiton to get correct updated position
   application.SendNotification();
-  DALI_TEST_EQUALS( false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION);
 
   // Reset verdict data
   Dali::Accessibility::TestResetMoveOutedCalled();
@@ -1240,36 +1307,75 @@ int UtcDaliAccessibilityCheckHighlight(void)
   Wait(application);
   // Need one more notificaiton to get correct updated position
   application.SendNotification();
-  DALI_TEST_EQUALS( true, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
+  DALI_TEST_EQUALS(true, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION);
 
   // Reset verdict data
   Dali::Accessibility::TestResetMoveOutedCalled();
 
   // Move second child (B) back into parent area (start position is outside but end position is inside of parent area) - no move outed event expected for B object
   // B: (300,100) --> (0, 100)
-  buttonB.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 100.0f) );
+  buttonB.SetProperty(Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 100.0f));
   Wait(application);
   // Need one more seding notificaiton to get correct updated position
   application.SendNotification();
-  DALI_TEST_EQUALS( false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION);
 
   // Reset verdict data
   Dali::Accessibility::TestResetMoveOutedCalled();
 
   // Disable movement tracking on B by giving highlight to A
-  accessible = dynamic_cast<DevelControl::AccessibleImpl*>(Dali::Accessibility::Accessible::Get(buttonA));
+  accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(buttonA));
   DALI_TEST_CHECK(accessible);
   accessible->GrabHighlight();
   Wait(application);
 
   // Move B (untracked) out of parent area through the parent's area right edge - no move outed event expected for B object
   // B: (0,100) --> (300, 100)
-  buttonB.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(300.0f, 100.0f) );
+  buttonB.SetProperty(Dali::Actor::Property::POSITION, Dali::Vector2(300.0f, 100.0f));
   Wait(application);
   // Need one more seding notificaiton to get correct updated position
   application.SendNotification();
-  DALI_TEST_EQUALS( false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(false);
+  END_TEST;
+}
+
+int UtcDaliWebViewAccessible(void)
+{
+  ToolkitTestApplication application;
+
+  auto webView           = Dali::Toolkit::WebView::New();
+  auto webViewAccessible = Dali::Accessibility::Accessible::Get(webView);
+
+  DALI_TEST_CHECK(webViewAccessible);
+
+  auto children = webViewAccessible->GetChildren();
+
+  DALI_TEST_CHECK(children.empty());
+
+  Dali::Accessibility::TestEnableSC(true);
+
+  children = webViewAccessible->GetChildren();
+
+  DALI_TEST_EQUALS(children.size(), 1u, TEST_LOCATION);
+
+  auto* child = children[0];
+
+  DALI_TEST_CHECK(child);
+  DALI_TEST_CHECK(child->IsProxy());
+  DALI_TEST_EQUALS(child->GetParent(), webViewAccessible, TEST_LOCATION);
+
+  auto address = child->GetAddress();
+
+  DALI_TEST_CHECK(address);
+  DALI_TEST_NOT_EQUALS(address.GetBus(), webViewAccessible->GetAddress().GetBus(), 0.0f, TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(false);
+
+  children = webViewAccessible->GetChildren();
+
+  DALI_TEST_CHECK(children.empty());
 
-  Dali::Accessibility::TestEnableSC( false );
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp
index 9243a0b..8b54340 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp
@@ -1,10 +1,17 @@
-#include <dali-toolkit-test-suite-utils.h>
 #include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h>
+#include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 
+#include <dali-toolkit/devel-api/controls/control-accessible.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/table-view/table-view.h>
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
+#include <dali/devel-api/atspi-interfaces/action.h>
+#include <dali/devel-api/atspi-interfaces/editable-text.h>
+#include <dali/devel-api/atspi-interfaces/hyperlink.h>
+#include <dali/devel-api/atspi-interfaces/hypertext.h>
+#include <dali/devel-api/atspi-interfaces/text.h>
 
 #include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
 
@@ -23,6 +30,107 @@ void utc_dali_accessibility_controls_cleanup(void)
   DBusWrapper::Install({});
 }
 
+int UtcDaliControlAccessibileGet01(void)
+{
+  ToolkitTestApplication application;
+
+  auto control    = Control::New();
+  auto accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(control));
+  DALI_TEST_CHECK(accessible);
+
+  END_TEST;
+}
+
+int UtcDaliControlAccessibileGet02(void)
+{
+  ToolkitTestApplication application;
+
+  auto control = Control::New();
+
+  // Default is true.
+  DALI_TEST_EQUALS(DevelControl::IsCreateAccessibleEnabled(control), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(DevelControl::IsAccessibleCreated(control), false, TEST_LOCATION);
+
+  DevelControl::EnableCreateAccessible(control, false);
+  DALI_TEST_EQUALS(DevelControl::IsCreateAccessibleEnabled(control), false, TEST_LOCATION);
+  auto accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(control));
+
+  // Check that we don't create accessible yet.
+  DALI_TEST_EQUALS(DevelControl::IsAccessibleCreated(control), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!accessible);
+
+  DevelControl::EnableCreateAccessible(control, true);
+  DALI_TEST_EQUALS(DevelControl::IsCreateAccessibleEnabled(control), true, TEST_LOCATION);
+  accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(control));
+  DALI_TEST_EQUALS(DevelControl::IsAccessibleCreated(control), true, TEST_LOCATION);
+  DALI_TEST_CHECK(accessible);
+
+  DevelControl::EnableCreateAccessible(control, false);
+  DALI_TEST_EQUALS(DevelControl::IsCreateAccessibleEnabled(control), false, TEST_LOCATION);
+  accessible = dynamic_cast<DevelControl::ControlAccessible*>(Dali::Accessibility::Accessible::Get(control));
+
+  // Check that we got created accessible well.
+  DALI_TEST_EQUALS(DevelControl::IsAccessibleCreated(control), true, TEST_LOCATION);
+  DALI_TEST_CHECK(accessible);
+
+  END_TEST;
+}
+
+int UtcDaliControlAccessibileBlockAccessibleCreation(void)
+{
+  ToolkitTestApplication application;
+
+  auto control = Control::New();
+
+  // Default is true.
+  DALI_TEST_EQUALS(DevelControl::IsCreateAccessibleEnabled(control), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(DevelControl::IsAccessibleCreated(control), false, TEST_LOCATION);
+
+  DevelControl::EnableCreateAccessible(control, false);
+  DALI_TEST_EQUALS(DevelControl::IsCreateAccessibleEnabled(control), false, TEST_LOCATION);
+
+  try
+  {
+    // Should not throw exception even if accessible is not created.
+    DALI_TEST_EQUALS(DevelControl::ClearAccessibilityHighlight(control), false, TEST_LOCATION);
+    DALI_TEST_EQUALS(DevelControl::GrabAccessibilityHighlight(control), false, TEST_LOCATION);
+
+    DevelControl::GetAccessibilityStates(control);
+    DevelControl::NotifyAccessibilityStateChange(control, Dali::Accessibility::States{}, false);
+    DevelControl::NotifyAccessibilityStateChange(control, Dali::Accessibility::States{}, true);
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  // Check that we don't create accessible yet.
+  DALI_TEST_EQUALS(DevelControl::IsAccessibleCreated(control), false, TEST_LOCATION);
+
+  // Dummy function call - for line coverage
+  DevelControl::EnableCreateAccessible(control, true);
+  DALI_TEST_EQUALS(DevelControl::IsCreateAccessibleEnabled(control), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(DevelControl::IsAccessibleCreated(control), false, TEST_LOCATION);
+
+  try
+  {
+    // Should not throw exception even if accessible is not created.
+    DevelControl::ClearAccessibilityHighlight(control);
+    DevelControl::GrabAccessibilityHighlight(control);
+    DevelControl::GetAccessibilityStates(control);
+    DevelControl::NotifyAccessibilityStateChange(control, Dali::Accessibility::States{}, false);
+    DevelControl::NotifyAccessibilityStateChange(control, Dali::Accessibility::States{}, true);
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  END_TEST;
+}
+
 int UtcDaliControlPropertyAccessibilityTranslationDomain(void)
 {
   ToolkitTestApplication application;
@@ -30,13 +138,13 @@ int UtcDaliControlPropertyAccessibilityTranslationDomain(void)
   auto control = Control::New();
 
   auto accessibility_translation_domain = DevelControl::Property::ACCESSIBILITY_TRANSLATION_DOMAIN;
-  DALI_TEST_EQUALS( Property::NONE , control.GetProperty( accessibility_translation_domain ).GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS("", control.GetProperty<std::string>(accessibility_translation_domain), TEST_LOCATION);
 
-  control.SetProperty( accessibility_translation_domain, "translation_domain_test_1" );
-  DALI_TEST_EQUALS( "translation_domain_test_1" , control.GetProperty( accessibility_translation_domain ).Get<  std::string  >(), TEST_LOCATION );
+  control.SetProperty(accessibility_translation_domain, "translation_domain_test_1");
+  DALI_TEST_EQUALS("translation_domain_test_1", control.GetProperty(accessibility_translation_domain).Get<std::string>(), TEST_LOCATION);
 
-  control.SetProperty( accessibility_translation_domain, "translation_domain_test_2" );
-  DALI_TEST_EQUALS( "translation_domain_test_2" , control.GetProperty( accessibility_translation_domain ).Get<  std::string  >(), TEST_LOCATION );
+  control.SetProperty(accessibility_translation_domain, "translation_domain_test_2");
+  DALI_TEST_EQUALS("translation_domain_test_2", control.GetProperty(accessibility_translation_domain).Get<std::string>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -46,13 +154,13 @@ int UtcDaliControlPropertyAccessibilityTranslationDomain(void)
 int UtcDaliControlAccessibilityHighlight(void)
 {
   ToolkitTestApplication application;
-  auto controla = Control::New();
-  auto controlb = Control::New();
+  auto                   controla = Control::New();
+  auto                   controlb = Control::New();
 
-  DALI_TEST_EQUALS( false, DevelControl::GrabAccessibilityHighlight(controla), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, DevelControl::ClearAccessibilityHighlight(controla), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, DevelControl::ClearAccessibilityHighlight(controlb), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, DevelControl::GrabAccessibilityHighlight(controla), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, DevelControl::ClearAccessibilityHighlight(controla), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, DevelControl::ClearAccessibilityHighlight(controlb), TEST_LOCATION);
 
   END_TEST;
 }
@@ -63,11 +171,11 @@ int UtcDaliAccessibilityToolBarConstructor(void)
   ToolkitTestApplication application;
 
   auto toolbar = ToolBar::New();
-  DALI_TEST_CHECK( toolbar );
+  DALI_TEST_CHECK(toolbar);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( toolbar );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TOOL_BAR, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(toolbar);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::TOOL_BAR, TEST_LOCATION);
 
   END_TEST;
 }
@@ -77,11 +185,11 @@ int UtcDaliAccessibilityPushButtonConstructor(void)
   ToolkitTestApplication application;
 
   auto pushbutton = PushButton::New();
-  DALI_TEST_CHECK( pushbutton );
+  DALI_TEST_CHECK(pushbutton);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( pushbutton );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::PUSH_BUTTON, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(pushbutton);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::PUSH_BUTTON, TEST_LOCATION);
 
   END_TEST;
 }
@@ -91,30 +199,40 @@ int UtcDaliAccessibilityPushButtonStates(void)
   ToolkitTestApplication application;
 
   auto pushbutton = PushButton::New();
-  DALI_TEST_CHECK( pushbutton );
+  DALI_TEST_CHECK(pushbutton);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( pushbutton );
-  DALI_TEST_CHECK( accessible );
+  auto accessible = Dali::Accessibility::Accessible::Get(pushbutton);
+  DALI_TEST_CHECK(accessible);
 
-  Dali::Accessibility::TestEnableSC( true );
+  Dali::Accessibility::TestEnableSC(true);
 
   /* add to scene and remove from scene to touch AccessibilityDeregister */
-  application.GetScene().Add( pushbutton );
+  application.GetScene().Add(pushbutton);
 
   auto states = accessible->GetStates();
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::PRESSED ] ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::PRESSED]), false, TEST_LOCATION);
 
   // auto button = dynamic_cast<Dali::Toolkit::Button* >( accessible ) ;
-  pushbutton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true );
-  pushbutton.SetProperty( Toolkit::Button::Property::SELECTED, true );
+  pushbutton.SetProperty(Toolkit::Button::Property::TOGGLABLE, true);
+  pushbutton.SetProperty(Toolkit::Button::Property::SELECTED, true);
 
   states = accessible->GetStates();
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::PRESSED ] ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::PRESSED]), true, TEST_LOCATION);
+
+  // Grab highlite now.
+  auto i = dynamic_cast<Dali::Accessibility::Component*>(accessible);
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
+
+  pushbutton.SetProperty(Toolkit::Button::Property::SELECTED, false);
+
+  states = accessible->GetStates();
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::PRESSED]), false, TEST_LOCATION);
 
   /* add to scene and remove from scene to touch AccessibilityDeregister */
-  application.GetScene().Remove( pushbutton );
+  application.GetScene().Remove(pushbutton);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -125,11 +243,56 @@ int UtcDaliAccessibilityToggleButtonConstructor(void)
   ToolkitTestApplication application;
 
   auto togglebutton = ToggleButton::New();
-  DALI_TEST_CHECK( togglebutton );
+  DALI_TEST_CHECK(togglebutton);
+
+  auto accessible = Dali::Accessibility::Accessible::Get(togglebutton);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::TOGGLE_BUTTON, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAccessibilityToggleButtonStates(void)
+{
+  ToolkitTestApplication application;
+
+  auto togglebutton = ToggleButton::New();
+  DALI_TEST_CHECK(togglebutton);
+
+  auto accessible = Dali::Accessibility::Accessible::Get(togglebutton);
+  DALI_TEST_CHECK(accessible);
+
+  Dali::Accessibility::TestEnableSC(true);
+
+  /* add to scene and remove from scene to touch AccessibilityDeregister */
+  application.GetScene().Add(togglebutton);
+
+  auto states = accessible->GetStates();
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), false, TEST_LOCATION);
+
+  // auto button = dynamic_cast<Dali::Toolkit::Button* >( accessible ) ;
+  togglebutton.SetProperty(Toolkit::Button::Property::TOGGLABLE, true);
+  togglebutton.SetProperty(Toolkit::Button::Property::SELECTED, true);
+
+  states = accessible->GetStates();
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), true, TEST_LOCATION);
+
+  // Grab highlite now.
+  auto i = dynamic_cast<Dali::Accessibility::Component*>(accessible);
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
+
+  togglebutton.SetProperty(Toolkit::Button::Property::SELECTED, false);
+
+  states = accessible->GetStates();
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), false, TEST_LOCATION);
+
+  /* add to scene and remove from scene to touch AccessibilityDeregister */
+  application.GetScene().Remove(togglebutton);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( togglebutton );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TOGGLE_BUTTON, TEST_LOCATION );
+  Dali::Accessibility::TestEnableSC(false);
+
+  END_TEST;
 
   END_TEST;
 }
@@ -139,12 +302,12 @@ int UtcDaliAccessibilityTextSelectionPopupConstructor(void)
 {
   ToolkitTestApplication application;
 
-  auto textselectionpopup = TextSelectionPopup::New( NULL );
-  DALI_TEST_CHECK( textselectionpopup );
+  auto textselectionpopup = TextSelectionPopup::New(NULL);
+  DALI_TEST_CHECK(textselectionpopup);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( textselectionpopup );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::DIALOG, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(textselectionpopup);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::DIALOG, TEST_LOCATION);
 
   END_TEST;
 }
@@ -154,11 +317,11 @@ int UtcDaliAccessibilityAlignmentConstructor(void)
   ToolkitTestApplication application;
 
   auto alignment = Alignment::New();
-  DALI_TEST_CHECK( alignment );
+  DALI_TEST_CHECK(alignment);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( alignment );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(alignment);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
@@ -168,22 +331,36 @@ int UtcDaliAccessibilityRadioButtonStates(void)
   ToolkitTestApplication application;
 
   auto radiobutton = RadioButton::New();
-  DALI_TEST_CHECK( radiobutton );
+  DALI_TEST_CHECK(radiobutton);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( radiobutton );
-  DALI_TEST_CHECK( accessible );
+  auto accessible = Dali::Accessibility::Accessible::Get(radiobutton);
+  DALI_TEST_CHECK(accessible);
+
+  Dali::Accessibility::TestEnableSC(true);
 
-  Dali::Accessibility::TestEnableSC( true );
+  application.GetScene().Add(radiobutton);
 
   auto states = accessible->GetStates();
-  DALI_TEST_CHECK( states );
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), false, TEST_LOCATION );
-  radiobutton.SetProperty( Toolkit::RadioButton::Property::SELECTED, true );
+  DALI_TEST_CHECK(states);
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), false, TEST_LOCATION);
+  radiobutton.SetProperty(Toolkit::RadioButton::Property::SELECTED, true);
   states = accessible->GetStates();
-  DALI_TEST_CHECK( states );
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), true, TEST_LOCATION );
+  DALI_TEST_CHECK(states);
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), true, TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  // Grab highlite now.
+  auto i = dynamic_cast<Dali::Accessibility::Component*>(accessible);
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
+
+  radiobutton.SetProperty(Toolkit::RadioButton::Property::SELECTED, false);
+  states = accessible->GetStates();
+  DALI_TEST_CHECK(states);
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), false, TEST_LOCATION);
+
+  application.GetScene().Remove(radiobutton);
+
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -193,11 +370,11 @@ int UtcDaliAccessibilityFlexContainerConstructor(void)
   ToolkitTestApplication application;
 
   auto flexcontainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexcontainer );
+  DALI_TEST_CHECK(flexcontainer);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( flexcontainer );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(flexcontainer);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
@@ -207,20 +384,33 @@ int UtcDaliAccessibilityCheckBoxButton(void)
   ToolkitTestApplication application;
 
   auto checkboxbutton = CheckBoxButton::New();
-  DALI_TEST_CHECK( checkboxbutton );
+  DALI_TEST_CHECK(checkboxbutton);
+
+  auto accessible = Dali::Accessibility::Accessible::Get(checkboxbutton);
+  DALI_TEST_CHECK(accessible);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( checkboxbutton );
-  DALI_TEST_CHECK( accessible );
+  Dali::Accessibility::TestEnableSC(true);
 
-  Dali::Accessibility::TestEnableSC( true );
+  application.GetScene().Add(checkboxbutton);
 
   auto states = accessible->GetStates();
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), false, TEST_LOCATION );
-  checkboxbutton.SetProperty( Toolkit::CheckBoxButton::Property::SELECTED, true );
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), false, TEST_LOCATION);
+  checkboxbutton.SetProperty(Toolkit::CheckBoxButton::Property::SELECTED, true);
   states = accessible->GetStates();
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), true, TEST_LOCATION);
+
+  // Grab highlite now.
+  auto i = dynamic_cast<Dali::Accessibility::Component*>(accessible);
+  DALI_TEST_CHECK(i);
+  i->GrabHighlight();
+
+  checkboxbutton.SetProperty(Toolkit::CheckBoxButton::Property::SELECTED, false);
+  states = accessible->GetStates();
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::CHECKED]), false, TEST_LOCATION);
+
+  application.GetScene().Remove(checkboxbutton);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -231,11 +421,11 @@ int UtcDaliAccessibilityTextSelectionConstructor(void)
   ToolkitTestApplication application;
 
   auto textselectiontoolbar = TextSelectionToolbar::New();
-  DALI_TEST_CHECK( textselectiontoolbar );
+  DALI_TEST_CHECK(textselectiontoolbar);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( textselectiontoolbar );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TOOL_BAR, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(textselectiontoolbar);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::TOOL_BAR, TEST_LOCATION);
 
   END_TEST;
 }
@@ -250,43 +440,43 @@ int UtcDaliAccessibilityManager(void)
   Dali::Accessibility::TestEnableSC(true);
 
   auto accessmanager = new Dali::Toolkit::Internal::AccessibilityManager;
-  auto actor = Control::New();
+  auto actor         = Control::New();
 
-  const std::string name = "Name";
+  const std::string name  = "Name";
   const std::string descr = "Description";
 
   accessmanager->SetAccessibilityAttribute(actor, attr::ACCESSIBILITY_LABEL, name);
-  DALI_TEST_EQUALS( accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_LABEL), name, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetProperty<std::string>(DevelControl::Property::ACCESSIBILITY_NAME), name, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_LABEL), name, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<std::string>(DevelControl::Property::ACCESSIBILITY_NAME), name, TEST_LOCATION);
 
   accessmanager->SetAccessibilityAttribute(actor, attr::ACCESSIBILITY_TRAIT, "Whatever");
-  DALI_TEST_EQUALS( accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_TRAIT), "", TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_TRAIT), "", TEST_LOCATION);
 
   accessmanager->SetAccessibilityAttribute(actor, attr::ACCESSIBILITY_VALUE, "Whatever");
-  DALI_TEST_EQUALS( accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_VALUE), "", TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_VALUE), "", TEST_LOCATION);
 
   accessmanager->SetAccessibilityAttribute(actor, attr::ACCESSIBILITY_HINT, descr);
-  DALI_TEST_EQUALS( accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_HINT), descr, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetProperty<std::string>(DevelControl::Property::ACCESSIBILITY_DESCRIPTION), descr, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetAccessibilityAttribute(actor, attr::ACCESSIBILITY_HINT), descr, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<std::string>(DevelControl::Property::ACCESSIBILITY_DESCRIPTION), descr, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( accessmanager->GetFocusOrder(actor), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( accessmanager->GenerateNewFocusOrder(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetFocusOrder(actor), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(accessmanager->GenerateNewFocusOrder(), 1, TEST_LOCATION);
 
   accessmanager->SetFocusOrder({}, 0);
   accessmanager->SetFocusOrder(Control::New(), 1);
   accessmanager->SetFocusOrder(actor, 2);
   accessmanager->SetFocusOrder(Control::New(), 3);
 
-  DALI_TEST_EQUALS( accessmanager->GetFocusOrder(actor), 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( accessmanager->GetActorByFocusOrder(2), actor, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetFocusOrder(actor), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(accessmanager->GetActorByFocusOrder(2), actor, TEST_LOCATION);
 
   accessmanager->SetCurrentFocusActor(actor);
-  DALI_TEST_EQUALS( accessmanager->GetCurrentFocusActor(), actor, TEST_LOCATION );
-  DALI_TEST_EQUALS( accessmanager->GetCurrentFocusOrder(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetCurrentFocusActor(), actor, TEST_LOCATION);
+  DALI_TEST_EQUALS(accessmanager->GetCurrentFocusOrder(), 2, TEST_LOCATION);
 
   accessmanager->MoveFocusForward();
   accessmanager->MoveFocusBackward();
-  DALI_TEST_EQUALS( accessmanager->GetCurrentFocusActor(), actor, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetCurrentFocusActor(), actor, TEST_LOCATION);
   accessmanager->SetCurrentFocusActor({});
 
   accessmanager->Reset();
@@ -294,15 +484,15 @@ int UtcDaliAccessibilityManager(void)
   accessmanager->MoveFocusForward();
 
   accessmanager->GetCurrentFocusGroup();
-  DALI_TEST_EQUALS( accessmanager->IsFocusGroup(actor), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->IsFocusGroup(actor), false, TEST_LOCATION);
   accessmanager->GetFocusGroup(actor);
 
-  DALI_TEST_EQUALS( accessmanager->GetGroupMode(), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( accessmanager->GetWrapMode(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessmanager->GetGroupMode(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(accessmanager->GetWrapMode(), true, TEST_LOCATION);
 
   auto vector = accessmanager->GetReadPosition();
-  DALI_TEST_EQUALS( vector.x, 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( vector.y, 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(vector.x, 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(vector.y, 0.0f, TEST_LOCATION);
 
   accessmanager->SetFocusIndicatorActor(Dali::Actor{});
   accessmanager->GetFocusIndicatorActor();
@@ -317,11 +507,11 @@ int UtcDaliAccessibilityModel3dViewConstructor(void)
   ToolkitTestApplication application;
 
   auto model3dview = Model3dView::New();
-  DALI_TEST_CHECK( model3dview );
+  DALI_TEST_CHECK(model3dview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( model3dview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::IMAGE, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(model3dview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::IMAGE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -331,13 +521,13 @@ int UtcDaliAccessibilityEffectsViewConstructor(void)
 {
   ToolkitTestApplication application;
 
-  auto etype = Dali::Toolkit::EffectsView::EffectType::DROP_SHADOW;
-  auto effectsview = EffectsView::New( etype );
-  DALI_TEST_CHECK( effectsview );
+  auto etype       = Dali::Toolkit::EffectsView::EffectType::DROP_SHADOW;
+  auto effectsview = EffectsView::New(etype);
+  DALI_TEST_CHECK(effectsview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( effectsview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(effectsview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
@@ -347,12 +537,12 @@ int UtcDaliAccessibilitySuperBlurViewConstructor(void)
 {
   ToolkitTestApplication application;
 
-  auto superblurview = SuperBlurView::New( 1 );
-  DALI_TEST_CHECK( superblurview );
+  auto superblurview = SuperBlurView::New(1);
+  DALI_TEST_CHECK(superblurview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( superblurview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(superblurview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
@@ -362,11 +552,11 @@ int UtcDaliAccessibilityImageViewConstructor(void)
   ToolkitTestApplication application;
 
   auto imageview = ImageView::New();
-  DALI_TEST_CHECK( imageview );
+  DALI_TEST_CHECK(imageview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( imageview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::IMAGE, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(imageview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::IMAGE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -375,9 +565,8 @@ int UtcDaliAccessibilityImageViewConstructor(void)
 class TestPageFactory : public PageFactory
 {
 public:
-
-  TestPageFactory( bool returnValidTexture = true )
-  : mValidTexture( returnValidTexture )
+  TestPageFactory(bool returnValidTexture = true)
+  : mValidTexture(returnValidTexture)
   {
     mTotalPageNumber = 100;
   }
@@ -396,18 +585,18 @@ public:
    * @param[in] pageId The ID of the page to create.
    * @return An image, or an empty handle if the ID is out of range.
    */
-  virtual Texture NewPage( unsigned int pageId )
+  virtual Texture NewPage(unsigned int pageId)
   {
-    if( mValidTexture )
+    if(mValidTexture)
     {
-      return Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGB888, 100, 100 );
+      return Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::RGB888, 100, 100);
     }
     return Texture(); // empty handle
   }
 
 private:
-  unsigned int            mTotalPageNumber;
-  bool                    mValidTexture;
+  unsigned int mTotalPageNumber;
+  bool         mValidTexture;
 };
 
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h>
@@ -415,14 +604,14 @@ int UtcDaliAccessibilityPageTurnViewConstructor(void)
 {
   ToolkitTestApplication application;
 
-  auto testpagefactory = TestPageFactory();
-  auto vector2 = Vector2( 1.0, 1.0 );
-  auto pageturnlandscapeview = PageTurnLandscapeView::New( testpagefactory, vector2 );
-  DALI_TEST_CHECK( pageturnlandscapeview );
+  auto testpagefactory       = TestPageFactory();
+  auto vector2               = Vector2(1.0, 1.0);
+  auto pageturnlandscapeview = PageTurnLandscapeView::New(testpagefactory, vector2);
+  DALI_TEST_CHECK(pageturnlandscapeview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( pageturnlandscapeview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::PAGE_TAB_LIST, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(pageturnlandscapeview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::PAGE_TAB_LIST, TEST_LOCATION);
 
   END_TEST;
 }
@@ -432,11 +621,11 @@ int UtcDaliAccessibilityGaussianBlurViewConstructor(void)
   ToolkitTestApplication application;
 
   auto gaussianblurview = GaussianBlurView::New();
-  DALI_TEST_CHECK( gaussianblurview );
+  DALI_TEST_CHECK(gaussianblurview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( gaussianblurview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(gaussianblurview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
@@ -446,27 +635,27 @@ int UtcDaliAccessibilityShadowViewConstructor(void)
   ToolkitTestApplication application;
 
   auto shadowview = ShadowView::New();
-  DALI_TEST_CHECK( shadowview );
+  DALI_TEST_CHECK(shadowview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( shadowview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(shadowview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
 
-#include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
 int UtcDaliAccessibilityScrollableConstructor(void)
 {
   ToolkitTestApplication application;
 
   auto scrollview = ScrollView::New();
-  DALI_TEST_CHECK( scrollview );
+  DALI_TEST_CHECK(scrollview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( scrollview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::SCROLL_PANE, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(scrollview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::SCROLL_PANE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -477,11 +666,11 @@ int UtcDaliAccessibilityMagnifierConstructor(void)
   ToolkitTestApplication application;
 
   auto magnifier = Magnifier::New();
-  DALI_TEST_CHECK( magnifier );
+  DALI_TEST_CHECK(magnifier);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( magnifier );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(magnifier);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
@@ -490,12 +679,12 @@ int UtcDaliAccessibilityTableViewConstructor(void)
 {
   ToolkitTestApplication application;
 
-  auto tableview = TableView::New( 10, 10 );
-  DALI_TEST_CHECK( tableview );
+  auto tableview = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( tableview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TABLE, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(tableview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::TABLE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -506,58 +695,101 @@ int UtcDaliAccessibilityBloomViewConstructor(void)
   ToolkitTestApplication application;
 
   auto bloomview = BloomView::New();
-  DALI_TEST_CHECK( bloomview );
+  DALI_TEST_CHECK(bloomview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( bloomview );
-  DALI_TEST_CHECK( accessible );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ANIMATION, TEST_LOCATION );
+  auto accessible = Dali::Accessibility::Accessible::Get(bloomview);
+  DALI_TEST_CHECK(accessible);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::ANIMATION, TEST_LOCATION);
 
   END_TEST;
 }
 
+#include <dali-toolkit/internal/controls/text-controls/text-anchor-impl.h>
 #include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
+int UtcDaliAccessibilityTextAnchor(void)
+{
+  ToolkitTestApplication application;
+
+  auto textanchor = TextAnchor::New();
+  DALI_TEST_CHECK(textanchor);
+
+  auto textlabel = TextLabel::New();
+  DALI_TEST_CHECK(textlabel);
+
+  Dali::Accessibility::TestEnableSC(true);
+
+  textlabel.Add(textanchor);
+  auto accessible = Dali::Accessibility::Accessible::Get(textanchor);
+  DALI_TEST_CHECK(accessible);
+  auto hyperlink = dynamic_cast<Dali::Accessibility::Hyperlink*>(accessible);
+  DALI_TEST_CHECK(hyperlink);
+  textanchor.SetProperty(Toolkit::TextAnchor::Property::URI, "https://www.tizen.org");
+  DALI_TEST_EQUALS(hyperlink->IsValid(), true, TEST_LOCATION);
+  auto action = dynamic_cast<Dali::Accessibility::Action*>(accessible);
+  // activation of valid hyperlink
+  DALI_TEST_CHECK(action->DoAction("accessibilityActivated"));
+  // making hyperlink invalid
+  textanchor.SetProperty(Toolkit::TextAnchor::Property::URI, "");
+  DALI_TEST_EQUALS(hyperlink->IsValid(), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!action->DoAction("accessibilityActivated"));
+
+  Dali::Accessibility::TestEnableSC(false);
+
+  END_TEST;
+}
+
 int UtcDaliAccessibilityTextField(void)
 {
   ToolkitTestApplication application;
 
   auto textfield = TextField::New();
-  DALI_TEST_CHECK( textfield );
+  DALI_TEST_CHECK(textfield);
 
-  textfield.SetProperty(Actor::Property::NAME, "test" );
-  DALI_TEST_EQUALS( textfield.GetProperty<std::string>(Actor::Property::NAME), "test", TEST_LOCATION );
+  textfield.SetProperty(Actor::Property::NAME, "test");
+  DALI_TEST_EQUALS(textfield.GetProperty<std::string>(Actor::Property::NAME), "test", TEST_LOCATION);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( textfield );
-  DALI_TEST_CHECK( accessible );
+  auto accessible = Dali::Accessibility::Accessible::Get(textfield);
+  DALI_TEST_CHECK(accessible);
 
-  DALI_TEST_EQUALS( accessible->GetName(), "", TEST_LOCATION );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ENTRY, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessible->GetName(), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::ENTRY, TEST_LOCATION);
   auto states = accessible->GetStates();
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::EDITABLE ] ), true, TEST_LOCATION );
-
-  Dali::Accessibility::TestEnableSC( true );
-
-  textfield.SetProperty( Toolkit::TextField::Property::TEXT, "test" );
-  auto text = dynamic_cast< Dali::Accessibility::Text* >( accessible );
-  DALI_TEST_CHECK( text );
-  DALI_TEST_EQUALS( text->GetText( 0, 10 ), "", TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetCursorOffset(100), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetCursorOffset(2), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->GetCursorOffset(), 2, TEST_LOCATION );
-
-  auto editabletext = dynamic_cast< Dali::Accessibility::EditableText* >( accessible );
-  DALI_TEST_CHECK( editabletext );
-  DALI_TEST_EQUALS( editabletext->CopyText( 3, 1 ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( editabletext->CopyText( 1, 3 ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( editabletext->CutText( 3, 1 ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( editabletext->CutText( 1, 3 ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->GetText( 0, 1 ), "t", TEST_LOCATION );
-
-  auto range = text->GetRangeOfSelection( 1 );
-  DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( range.content, "", TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetRangeOfSelection( 1, 0, 1 ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->RemoveSelection( 1 ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::EDITABLE]), true, TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(true);
+
+  textfield.SetProperty(Toolkit::TextField::Property::TEXT, "test");
+  auto text = dynamic_cast<Dali::Accessibility::Text*>(accessible);
+  DALI_TEST_CHECK(text);
+  DALI_TEST_EQUALS(text->GetText(0, 10), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetCursorOffset(100), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetCursorOffset(2), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetCursorOffset(), 2, TEST_LOCATION);
+
+  auto editabletext = dynamic_cast<Dali::Accessibility::EditableText*>(accessible);
+  DALI_TEST_CHECK(editabletext);
+  DALI_TEST_EQUALS(editabletext->CopyText(3, 1), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->CopyText(1, 3), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->CutText(3, 1), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->CutText(1, 3), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetText(0, 1), "t", TEST_LOCATION);
+
+  auto range = text->GetRangeOfSelection(1);
+  DALI_TEST_EQUALS(range.startOffset, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(range.endOffset, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(range.content, "", TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetRangeOfSelection(1, 0, 1), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->RemoveSelection(1), false, TEST_LOCATION);
+
+  // Insert into empty field
+  DALI_TEST_EQUALS(editabletext->SetTextContents(""), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->InsertText(1, "xyz"), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->InsertText(0, "abc"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetText(0, 3), "abc", TEST_LOCATION);
+
+  // Append at end
+  DALI_TEST_EQUALS(editabletext->InsertText(3, "xyz"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetText(0, 6), "abcxyz", TEST_LOCATION);
 
   DALI_TEST_EQUALS(editabletext->SetTextContents("adef"), true, TEST_LOCATION);
   DALI_TEST_EQUALS(editabletext->InsertText(1, "bc"), true, TEST_LOCATION);
@@ -566,7 +798,52 @@ int UtcDaliAccessibilityTextField(void)
   DALI_TEST_EQUALS(editabletext->DeleteText(1, 5), true, TEST_LOCATION);
   DALI_TEST_EQUALS(text->GetText(0, 2), "af", TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  auto hypertext = dynamic_cast<Dali::Accessibility::Hypertext*>(accessible);
+  DALI_TEST_CHECK(hypertext);
+  // text without the anchors markup and ENABLE_MARKUP property set (by default) to false
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(0) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(5) == nullptr, true, TEST_LOCATION);
+  // text with the anchors markup and ENABLE_MARKUP property set (by default) to false
+  textfield.SetProperty(Toolkit::TextField::Property::TEXT, "12345<a href = 'https://www.tizen.org'>anchor1</a>12345<a href = 'https://www.tizen.org' >veryveryveryveryveryveryveryverylonganchor2</a>12345<a href = 'https://www.tizen.org'>anchor3</a>12345");
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(0) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(5) == nullptr, true, TEST_LOCATION);
+  // text with the anchors markup and ENABLE_MARKUP property set to true
+  textfield.SetProperty(Toolkit::TextField::Property::ENABLE_MARKUP, true);
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), 0, TEST_LOCATION);  //1st anchor index
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(17), 1, TEST_LOCATION); //2nd anchor index
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(66), 2, TEST_LOCATION); //3rd anchor index
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  auto hyperlink = hypertext->GetLink(0);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 12, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetAnchorCount(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetAnchorUri(0), "https://www.tizen.org", TEST_LOCATION);
+  auto anchorAccessible = hyperlink->GetAnchorAccessible(0);
+  DALI_TEST_EQUALS(hyperlink == anchorAccessible, true, TEST_LOCATION);
+  hyperlink = hypertext->GetLink(1);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 17, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 60, TEST_LOCATION);
+  hyperlink = hypertext->GetLink(2);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 65, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 72, TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -577,43 +854,53 @@ int UtcDaliAccessibilityTextEditor(void)
   ToolkitTestApplication application;
 
   auto texteditor = TextEditor::New();
-  DALI_TEST_CHECK( texteditor );
+  DALI_TEST_CHECK(texteditor);
 
-  texteditor.SetProperty(Actor::Property::NAME, "test" );
-  DALI_TEST_EQUALS( texteditor.GetProperty<std::string>(Actor::Property::NAME), "test", TEST_LOCATION );
+  texteditor.SetProperty(Actor::Property::NAME, "test");
+  DALI_TEST_EQUALS(texteditor.GetProperty<std::string>(Actor::Property::NAME), "test", TEST_LOCATION);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( texteditor );
-  DALI_TEST_CHECK( accessible );
+  auto accessible = Dali::Accessibility::Accessible::Get(texteditor);
+  DALI_TEST_CHECK(accessible);
 
-  DALI_TEST_EQUALS( accessible->GetName(), "", TEST_LOCATION );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ENTRY, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessible->GetName(), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::ENTRY, TEST_LOCATION);
   auto states = accessible->GetStates();
-  DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::EDITABLE ] ), true, TEST_LOCATION );
-
-  Dali::Accessibility::TestEnableSC( true );
-
-  texteditor.SetProperty( Toolkit::TextEditor::Property::TEXT, "test" );
-  auto text = dynamic_cast< Dali::Accessibility::Text* >( accessible );
-  DALI_TEST_CHECK( text );
-  DALI_TEST_EQUALS( text->GetText( 0, 10 ), "", TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetCursorOffset(100), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetCursorOffset(2), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->GetCursorOffset(), 2, TEST_LOCATION );
-
-  auto editabletext = dynamic_cast< Dali::Accessibility::EditableText* >( accessible );
-  DALI_TEST_CHECK( editabletext );
-  DALI_TEST_EQUALS( editabletext->CopyText( 3, 1 ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( editabletext->CopyText( 1, 3 ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( editabletext->CutText( 3, 1 ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( editabletext->CutText( 1, 3 ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->GetText( 0, 1 ), "t", TEST_LOCATION );
-
-  auto range = text->GetRangeOfSelection( 1 );
-  DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( range.content, "", TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetRangeOfSelection( 1, 0, 1 ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->RemoveSelection( 1 ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<unsigned int>(states[Accessibility::State::EDITABLE]), true, TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(true);
+
+  texteditor.SetProperty(Toolkit::TextEditor::Property::TEXT, "test");
+  auto text = dynamic_cast<Dali::Accessibility::Text*>(accessible);
+  DALI_TEST_CHECK(text);
+  DALI_TEST_EQUALS(text->GetText(0, 10), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetCursorOffset(100), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetCursorOffset(2), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetCursorOffset(), 2, TEST_LOCATION);
+
+  auto editabletext = dynamic_cast<Dali::Accessibility::EditableText*>(accessible);
+  DALI_TEST_CHECK(editabletext);
+  DALI_TEST_EQUALS(editabletext->CopyText(3, 1), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->CopyText(1, 3), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->CutText(3, 1), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->CutText(1, 3), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetText(0, 1), "t", TEST_LOCATION);
+
+  auto range = text->GetRangeOfSelection(1);
+  DALI_TEST_EQUALS(range.startOffset, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(range.endOffset, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(range.content, "", TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetRangeOfSelection(1, 0, 1), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->RemoveSelection(1), false, TEST_LOCATION);
+
+  // Insert into empty field
+  DALI_TEST_EQUALS(editabletext->SetTextContents(""), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->InsertText(1, "xyz"), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(editabletext->InsertText(0, "abc"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetText(0, 3), "abc", TEST_LOCATION);
+
+  // Append at end
+  DALI_TEST_EQUALS(editabletext->InsertText(3, "xyz"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetText(0, 6), "abcxyz", TEST_LOCATION);
 
   DALI_TEST_EQUALS(editabletext->SetTextContents("adef"), true, TEST_LOCATION);
   DALI_TEST_EQUALS(editabletext->InsertText(1, "bc"), true, TEST_LOCATION);
@@ -622,7 +909,52 @@ int UtcDaliAccessibilityTextEditor(void)
   DALI_TEST_EQUALS(editabletext->DeleteText(1, 5), true, TEST_LOCATION);
   DALI_TEST_EQUALS(text->GetText(0, 2), "af", TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  auto hypertext = dynamic_cast<Dali::Accessibility::Hypertext*>(accessible);
+  DALI_TEST_CHECK(hypertext);
+  // text without the anchors markup and ENABLE_MARKUP property set (by default) to false
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(0) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(5) == nullptr, true, TEST_LOCATION);
+  // text with the anchors markup and ENABLE_MARKUP property set (by default) to false
+  texteditor.SetProperty(Toolkit::TextEditor::Property::TEXT, "12345<a href = 'https://www.tizen.org'>anchor1</a>12345<a href = 'https://www.tizen.org' >veryveryveryveryveryveryveryverylonganchor2</a>12345<a href = 'https://www.tizen.org'>anchor3</a>12345");
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(0) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(5) == nullptr, true, TEST_LOCATION);
+  // text with the anchors markup and ENABLE_MARKUP property set to true
+  texteditor.SetProperty(Toolkit::TextEditor::Property::ENABLE_MARKUP, true);
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), 0, TEST_LOCATION);  //1st anchor index
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(17), 1, TEST_LOCATION); //2nd anchor index
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(66), 2, TEST_LOCATION); //3rd anchor index
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  auto hyperlink = hypertext->GetLink(0);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 12, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetAnchorCount(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetAnchorUri(0), "https://www.tizen.org", TEST_LOCATION);
+  auto anchorAccessible = hyperlink->GetAnchorAccessible(0);
+  DALI_TEST_EQUALS(hyperlink == anchorAccessible, true, TEST_LOCATION);
+  hyperlink = hypertext->GetLink(1);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 17, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 60, TEST_LOCATION);
+  hyperlink = hypertext->GetLink(2);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 65, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 72, TEST_LOCATION);
+
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -632,35 +964,80 @@ int UtcDaliAccessibilityTextLabel(void)
   ToolkitTestApplication application;
 
   auto textlabel = TextLabel::New();
-  DALI_TEST_CHECK( textlabel );
+  DALI_TEST_CHECK(textlabel);
 
-  textlabel.SetProperty(Actor::Property::NAME, "test" );
-  DALI_TEST_EQUALS( textlabel.GetProperty<std::string>(Actor::Property::NAME), "test", TEST_LOCATION );
+  textlabel.SetProperty(Actor::Property::NAME, "test");
+  DALI_TEST_EQUALS(textlabel.GetProperty<std::string>(Actor::Property::NAME), "test", TEST_LOCATION);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( textlabel );
-  DALI_TEST_CHECK( accessible );
+  auto accessible = Dali::Accessibility::Accessible::Get(textlabel);
+  DALI_TEST_CHECK(accessible);
 
-  DALI_TEST_EQUALS( accessible->GetName(), "test", TEST_LOCATION );
-  DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::LABEL, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessible->GetName(), "test", TEST_LOCATION);
+  DALI_TEST_EQUALS(accessible->GetRole(), Accessibility::Role::LABEL, TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( true );
-
-  textlabel.SetProperty( Toolkit::TextLabel::Property::TEXT, "test" );
-  auto text = dynamic_cast< Dali::Accessibility::Text* >( accessible );
-  DALI_TEST_CHECK( text );
-  DALI_TEST_EQUALS( text->GetText( 0, 10 ), "", TEST_LOCATION );
-  DALI_TEST_EQUALS( text->GetText( 0, 4 ), "test", TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetCursorOffset(0), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->GetCursorOffset(), 0, TEST_LOCATION );
+  Dali::Accessibility::TestEnableSC(true);
 
-  auto range = text->GetRangeOfSelection( 1 );
-  DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( range.content, "", TEST_LOCATION );
-  DALI_TEST_EQUALS( text->SetRangeOfSelection( 1, 0, 1 ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( text->RemoveSelection( 1 ), false, TEST_LOCATION );
+  textlabel.SetProperty(Toolkit::TextLabel::Property::TEXT, "test");
+  auto text = dynamic_cast<Dali::Accessibility::Text*>(accessible);
+  DALI_TEST_CHECK(text);
+  DALI_TEST_EQUALS(text->GetText(0, 10), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetText(0, 4), "test", TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetCursorOffset(0), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->GetCursorOffset(), 0, TEST_LOCATION);
+
+  auto range = text->GetRangeOfSelection(1);
+  DALI_TEST_EQUALS(range.startOffset, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(range.endOffset, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(range.content, "", TEST_LOCATION);
+  DALI_TEST_EQUALS(text->SetRangeOfSelection(1, 0, 1), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(text->RemoveSelection(1), false, TEST_LOCATION);
+
+  auto hypertext = dynamic_cast<Dali::Accessibility::Hypertext*>(accessible);
+  DALI_TEST_CHECK(hypertext);
+  // text without the anchors markup and ENABLE_MARKUP property set (by default) to false
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(0) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(5) == nullptr, true, TEST_LOCATION);
+  // text with the anchors markup and ENABLE_MARKUP property set (by default) to false
+  textlabel.SetProperty(Toolkit::TextLabel::Property::TEXT, "12345<a href = 'https://www.tizen.org'>anchor1</a>12345<a href = 'https://www.tizen.org' >veryveryveryveryveryveryveryverylonganchor2</a>12345<a href = 'https://www.tizen.org'>anchor3</a>12345");
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(0) == nullptr, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLink(5) == nullptr, true, TEST_LOCATION);
+  // text with the anchors markup and ENABLE_MARKUP property set to true
+  textlabel.SetProperty(Toolkit::TextLabel::Property::ENABLE_MARKUP, true);
+  DALI_TEST_EQUALS(hypertext->GetLinkCount(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(-1), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(0), -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(5), 0, TEST_LOCATION);  //1st anchor index
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(17), 1, TEST_LOCATION); //2nd anchor index
+  DALI_TEST_EQUALS(hypertext->GetLinkIndex(66), 2, TEST_LOCATION); //3rd anchor index
+  DALI_TEST_EQUALS(hypertext->GetLink(-1) == nullptr, true, TEST_LOCATION);
+  auto hyperlink = hypertext->GetLink(0);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 12, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetAnchorCount(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetAnchorUri(0), "https://www.tizen.org", TEST_LOCATION);
+  auto anchorAccessible = hyperlink->GetAnchorAccessible(0);
+  DALI_TEST_EQUALS(hyperlink == anchorAccessible, true, TEST_LOCATION);
+  hyperlink = hypertext->GetLink(1);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 17, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 60, TEST_LOCATION);
+  hyperlink = hypertext->GetLink(2);
+  DALI_TEST_CHECK(hyperlink);
+  DALI_TEST_EQUALS(hyperlink->GetStartIndex(), 65, TEST_LOCATION);
+  DALI_TEST_EQUALS(hyperlink->GetEndIndex(), 72, TEST_LOCATION);
 
-  Dali::Accessibility::TestEnableSC( false );
+  Dali::Accessibility::TestEnableSC(false);
 
   END_TEST;
 }
@@ -671,12 +1048,12 @@ int UtcDaliAccessibilityNavigationViewConstructor(void)
   ToolkitTestApplication application;
 
   auto navigationview = NavigationView::New();
-  DALI_TEST_CHECK( navigationview );
+  DALI_TEST_CHECK(navigationview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( navigationview );
-  DALI_TEST_CHECK( accessible );
+  auto accessible = Dali::Accessibility::Accessible::Get(navigationview);
+  DALI_TEST_CHECK(accessible);
 
-  DALI_TEST_EQUALS( accessible->GetRole(), Dali::Accessibility::Role::FILLER, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessible->GetRole(), Dali::Accessibility::Role::FILLER, TEST_LOCATION);
 
   END_TEST;
 }
@@ -686,12 +1063,12 @@ int UtcDaliAccessibilityVideoViewConstructor(void)
   ToolkitTestApplication application;
 
   auto videoview = VideoView::New();
-  DALI_TEST_CHECK( videoview );
+  DALI_TEST_CHECK(videoview);
 
-  auto accessible = Dali::Accessibility::Accessible::Get( videoview );
-  DALI_TEST_CHECK( accessible );
+  auto accessible = Dali::Accessibility::Accessible::Get(videoview);
+  DALI_TEST_CHECK(accessible);
 
-  DALI_TEST_EQUALS( accessible->GetRole(), Dali::Accessibility::Role::VIDEO, TEST_LOCATION );
+  DALI_TEST_EQUALS(accessible->GetRole(), Dali::Accessibility::Role::VIDEO, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Text.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Text.cpp
index 6b77f00..4389b90 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Text.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Text.cpp
@@ -23,6 +23,9 @@
 #include <dali-toolkit/dali-toolkit.h>
 
 #include <dali/devel-api/adaptor-framework/accessibility.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
+#include <dali/devel-api/atspi-interfaces/text.h>
+#include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
 #include <dali-toolkit/internal/controls/text-controls/text-editor-impl.h>
 
 #include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
@@ -196,6 +199,50 @@ int utcDaliAccessibilityTextEditorRemoveSelection(void)
   END_TEST;
 }
 
+int utcDaliAccessibilityTextEditorGetRangeExtents(void)
+{
+  ToolkitTestApplication application;
+
+  auto editor = Dali::Toolkit::TextEditor::New();
+  auto q     = Dali::Accessibility::Accessible::Get( editor );
+  auto x     = dynamic_cast< Dali::Accessibility::Text* >( q );
+  DALI_TEST_CHECK( x );
+
+  if( x )
+  {
+    auto rangeExtents = x->GetRangeExtents( 0, 0, Dali::Accessibility::CoordinateType::WINDOW );
+    DALI_TEST_EQUALS( (int)rangeExtents.x, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.y, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.width, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.height, 0, TEST_LOCATION );
+
+    application.GetScene().Add( editor );
+
+    editor.SetProperty( Toolkit::TextEditor::Property::POINT_SIZE, 7.f );
+    editor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+    editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+    editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+    editor.SetProperty( Toolkit::TextEditor::Property::TEXT, "text editor test sentence" );
+
+    // Avoid a crash when core load gl resources.
+    application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+    // Render and notify
+    application.SendNotification();
+    application.Render();
+
+    auto characterCount = x->GetCharacterCount();
+    rangeExtents        = x->GetRangeExtents( 0, characterCount, Dali::Accessibility::CoordinateType::WINDOW );
+
+    DALI_TEST_EQUALS((int)rangeExtents.x >= 0, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.y >= 0, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.width <= 200, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.height <= 200, true, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
 int utcDaliAccessibilityTextFieldGetName(void)
 {
   ToolkitTestApplication application;
@@ -221,6 +268,20 @@ int utcDaliAccessibilityTextFieldGetText(void)
     DALI_TEST_EQUALS( x->GetText( 0, 0 ), "", TEST_LOCATION );
     field.SetProperty( Toolkit::TextField::Property::TEXT, "exemplary_text" );
     DALI_TEST_EQUALS( x->GetText( 0, 9 ), "exemplary", TEST_LOCATION );
+
+    Dali::Property::Map hiddenInputSettings;
+    hiddenInputSettings[ Toolkit::HiddenInput::Property::MODE ] = Toolkit::HiddenInput::Mode::HIDE_ALL;
+
+    field.SetProperty( Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS, hiddenInputSettings );
+
+    DALI_TEST_EQUALS( x->GetName(), "", TEST_LOCATION );
+    DALI_TEST_EQUALS( x->GetText( 0, 9 ), "*********", TEST_LOCATION );
+
+    hiddenInputSettings[ Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER ] = 0x23;
+    field.SetProperty( Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS, hiddenInputSettings );
+
+    DALI_TEST_EQUALS( x->GetName(), "", TEST_LOCATION );
+    DALI_TEST_EQUALS( x->GetText( 0, 9 ), "#########", TEST_LOCATION );
   }
 
   END_TEST;
@@ -294,6 +355,16 @@ int utcDaliAccessibilityTextFieldGetTextAtOffset(void)
     DALI_TEST_EQUALS( range.content, " test sentence", TEST_LOCATION );
     DALI_TEST_EQUALS( range.startOffset, 25, TEST_LOCATION );
     DALI_TEST_EQUALS( range.endOffset, 39, TEST_LOCATION );
+
+    Dali::Property::Map hiddenInputSettings;
+    hiddenInputSettings[ Toolkit::HiddenInput::Property::MODE ] = Toolkit::HiddenInput::Mode::HIDE_ALL;
+    hiddenInputSettings[ Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER ] = 0x23;
+    field.SetProperty( Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS, hiddenInputSettings );
+    range = x->GetTextAtOffset( 8, Dali::Accessibility::TextBoundary::LINE );
+    DALI_TEST_EQUALS( range.content, "", TEST_LOCATION );
+    DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION );
+
   }
 
   END_TEST;
@@ -321,6 +392,15 @@ int utcDaliAccessibilityTextFieldGetSetRangeOfSelection(void)
     DALI_TEST_EQUALS( range.startOffset, 4, TEST_LOCATION );
     DALI_TEST_EQUALS( range.endOffset, 9, TEST_LOCATION );
     DALI_TEST_EQUALS( range.content, "plary", TEST_LOCATION );
+
+    Dali::Property::Map hiddenInputSettings;
+    hiddenInputSettings[ Toolkit::HiddenInput::Property::MODE ] = Toolkit::HiddenInput::Mode::HIDE_ALL;
+    field.SetProperty( Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS, hiddenInputSettings );
+
+    range = x->GetRangeOfSelection( 0 );
+    DALI_TEST_EQUALS( range.startOffset, 4, TEST_LOCATION );
+    DALI_TEST_EQUALS( range.endOffset, 9, TEST_LOCATION );
+    DALI_TEST_EQUALS( range.content, "*****", TEST_LOCATION );
   }
 
   END_TEST;
@@ -354,6 +434,50 @@ int utcDaliAccessibilityTextFieldRemoveSelection(void)
   END_TEST;
 }
 
+int utcDaliAccessibilityTextFieldGetRangeExtents(void)
+{
+  ToolkitTestApplication application;
+
+  auto field = Dali::Toolkit::TextField::New();
+  auto q     = Dali::Accessibility::Accessible::Get( field );
+  auto x     = dynamic_cast< Dali::Accessibility::Text* >( q );
+  DALI_TEST_CHECK( x );
+
+  if( x )
+  {
+    auto rangeExtents = x->GetRangeExtents( 0, 0, Dali::Accessibility::CoordinateType::WINDOW );
+    DALI_TEST_EQUALS( (int)rangeExtents.x, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.y, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.width, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.height, 0, TEST_LOCATION );
+
+    application.GetScene().Add( field );
+
+    field.SetProperty( Toolkit::TextField::Property::POINT_SIZE, 7.f );
+    field.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+    field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+    field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+    field.SetProperty( Toolkit::TextField::Property::TEXT, "text field test sentence" );
+
+    // Avoid a crash when core load gl resources.
+    application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+    // Render and notify
+    application.SendNotification();
+    application.Render();
+
+    auto characterCount = x->GetCharacterCount();
+    rangeExtents        = x->GetRangeExtents( 0, characterCount, Dali::Accessibility::CoordinateType::WINDOW );
+
+    DALI_TEST_EQUALS((int)rangeExtents.x >= 0, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.y >= 0, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.width <= 200, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.height <= 200, true, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
 int utcDaliAccessibilityTextLabelGetName(void)
 {
   ToolkitTestApplication application;
@@ -484,3 +608,48 @@ int utcDaliAccessibilityTextLabelRemoveSelection( void )
 
   END_TEST;
 }
+
+int utcDaliAccessibilityTextLabelGetRangeExtents(void)
+{
+  ToolkitTestApplication application;
+
+  auto label = Dali::Toolkit::TextLabel::New();
+  auto q     = Dali::Accessibility::Accessible::Get( label );
+  auto x     = dynamic_cast< Dali::Accessibility::Text* >( q );
+  DALI_TEST_CHECK( x );
+
+  if( x )
+  {
+    auto rangeExtents = x->GetRangeExtents( 0, 0, Dali::Accessibility::CoordinateType::WINDOW );
+    DALI_TEST_EQUALS( (int)rangeExtents.x, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.y, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.width, 0, TEST_LOCATION );
+    DALI_TEST_EQUALS( (int)rangeExtents.height, 0, TEST_LOCATION );
+
+    application.GetScene().Add( label );
+
+    label.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, 7.f );
+    label.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true );
+    label.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+    label.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+    label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+    label.SetProperty( Toolkit::TextLabel::Property::TEXT, "text label\n test sentence" );
+
+    // Avoid a crash when core load gl resources.
+    application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+    // Render and notify
+    application.SendNotification();
+    application.Render();
+
+    auto characterCount = x->GetCharacterCount();
+    rangeExtents        = x->GetRangeExtents( 0, characterCount, Dali::Accessibility::CoordinateType::WINDOW );
+
+    DALI_TEST_EQUALS((int)rangeExtents.x >= 0, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.y >= 0, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.width <= 200, true, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)rangeExtents.height <= 200, true, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
index af4739b..ff95317 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
@@ -24,7 +24,9 @@
 #include <dali-toolkit/dali-toolkit.h>
 
 #include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
+#include <dali/devel-api/atspi-interfaces/value.h>
 
 #include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 
@@ -94,6 +96,7 @@ int utcDaliAccessibilityProgressBarGetSetCurrent(void)
   DALI_TEST_EQUALS( x->SetCurrent( 2.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->SetCurrent( 0.25 ), true, TEST_LOCATION );
   DALI_TEST_EQUALS( x->GetCurrent(), 0.25, TEST_LOCATION );
+  DALI_TEST_EQUALS( x->GetValueText().empty(), true, TEST_LOCATION ); // not implemented
 
   END_TEST;
 }
@@ -190,6 +193,7 @@ int utcDaliAccessibilityScrollBarGetSetCurrent(void)
   DALI_TEST_EQUALS( x->SetCurrent( 1000.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->SetCurrent( 50.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->GetCurrent(), 0.0, TEST_LOCATION );
+  DALI_TEST_EQUALS( x->GetValueText().empty(), true, TEST_LOCATION ); // not implemented
 
   END_TEST;
 }
@@ -245,6 +249,7 @@ int utcDaliAccessibilitySliderGetSetCurrent(void)
   DALI_TEST_EQUALS( x->SetCurrent( 2.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->SetCurrent( 0.25 ), true, TEST_LOCATION );
   DALI_TEST_EQUALS( x->GetCurrent(), 0.25, TEST_LOCATION );
+  DALI_TEST_EQUALS( x->GetValueText().empty(), true, TEST_LOCATION ); // not implemented
 
   const float MIN_BOUND = 0.0f;
   const float MAX_BOUND = 1.0f;
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
index 84ecd2d..4f6e20c 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
-#include <dali/devel-api/text-abstraction/bidirectional-support.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/internal/text/bidirectional-support.h>
 #include <dali-toolkit/internal/text/character-set-conversion.h>
 #include <dali-toolkit/internal/text/text-run-container.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
+#include <dali/devel-api/text-abstraction/bidirectional-support.h>
 #include <toolkit-text-utils.h>
 
 using namespace Dali;
@@ -54,7 +54,6 @@ using namespace Text;
 
 namespace
 {
-
 struct SetBidirectionalInfoData
 {
   std::string   description;                 ///< Description of the test.
@@ -93,65 +92,68 @@ struct GetCharactersDirectionData
   bool         markupProcessorEnabled; ///< Enable markup processor to use markup text.
 };
 
-bool SetBidirectionalInfoTest( const SetBidirectionalInfoData& data )
+bool SetBidirectionalInfoTest(const SetBidirectionalInfoData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   // Create the model.
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   // 2) Clear the bidirectional paragraph info data.
   Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = logicalModel->mBidirectionalParagraphInfo;
-  if( 0u != data.numberOfCharacters )
+  if(0u != data.numberOfCharacters)
   {
-    ClearCharacterRuns( data.startIndex,
-                        data.startIndex + data.numberOfCharacters - 1u,
-                        bidirectionalInfo );
+    ClearCharacterRuns(data.startIndex,
+                       data.startIndex + data.numberOfCharacters - 1u,
+                       bidirectionalInfo);
   }
 
   // 3) Call the SetBidirectionalInfo() function.
-  SetBidirectionalInfo( logicalModel->mText,
-                        logicalModel->mScriptRuns,
-                        logicalModel->mLineBreakInfo,
-                        data.startIndex,
-                        data.numberOfCharacters,
-                        bidirectionalInfo );
+  SetBidirectionalInfo(logicalModel->mText,
+                       logicalModel->mScriptRuns,
+                       logicalModel->mLineBreakInfo,
+                       data.startIndex,
+                       data.numberOfCharacters,
+                       bidirectionalInfo);
 
   // 4) Compare with the expected results.
   TextAbstraction::BidirectionalSupport bidirectionalSupport = TextAbstraction::BidirectionalSupport::Get();
 
-  if( data.numberOfParagraphs != bidirectionalInfo.Count() )
+  if(data.numberOfParagraphs != bidirectionalInfo.Count())
   {
     // Different number of expected bidirectional paragraphs.
     std::cout << "  Different number of bidi paragraphs : " << bidirectionalInfo.Count() << ", expected : " << data.numberOfParagraphs << std::endl;
     return false;
   }
 
-  for( unsigned int index = 0u; index < data.numberOfParagraphs; ++index )
+  for(unsigned int index = 0u; index < data.numberOfParagraphs; ++index)
   {
     const BidirectionalParagraphInfoRun& run = bidirectionalInfo[index];
 
-    const CharacterDirection direction = bidirectionalSupport.GetParagraphDirection( run.bidirectionalInfoIndex );
-    if( direction != data.directions[index] )
+    const CharacterDirection direction = bidirectionalSupport.GetParagraphDirection(run.bidirectionalInfoIndex);
+    if(direction != data.directions[index])
     {
       std::cout << "  Different direction" << std::endl;
       std::cout << "        paragraph : " << index << std::endl;
@@ -160,7 +162,7 @@ bool SetBidirectionalInfoTest( const SetBidirectionalInfoData& data )
       return false;
     }
 
-    if( run.characterRun.characterIndex != data.indices[index] )
+    if(run.characterRun.characterIndex != data.indices[index])
     {
       std::cout << "  Different index" << std::endl;
       std::cout << "        paragraph : " << index << std::endl;
@@ -168,7 +170,7 @@ bool SetBidirectionalInfoTest( const SetBidirectionalInfoData& data )
       std::cout << "  expected, index : " << data.indices[index] << ", num chars : " << data.numberOfParagraphCharacters[index] << ", direction : " << data.directions[index] << std::endl;
       return false;
     }
-    if( run.characterRun.numberOfCharacters != data.numberOfParagraphCharacters[index] )
+    if(run.characterRun.numberOfCharacters != data.numberOfParagraphCharacters[index])
     {
       std::cout << "  Different number of characters" << std::endl;
       std::cout << "        paragraph : " << index << std::endl;
@@ -181,59 +183,62 @@ bool SetBidirectionalInfoTest( const SetBidirectionalInfoData& data )
   return true;
 }
 
-bool GetMirroredTextTest( const GetMirroredTextData& data )
+bool GetMirroredTextTest(const GetMirroredTextData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   // Create the model.
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   // 2) Call the GetMirroredText() function for the whole text
   Vector<Character> mirroredText;
-  bool mirrored = false;
-  mirrored = GetMirroredText( logicalModel->mText,
-                              logicalModel->mCharacterDirections,
-                              logicalModel->mBidirectionalParagraphInfo,
-                              0u,
-                              logicalModel->mText.Count(),
-                              mirroredText );
+  bool              mirrored = false;
+  mirrored                   = GetMirroredText(logicalModel->mText,
+                             logicalModel->mCharacterDirections,
+                             logicalModel->mBidirectionalParagraphInfo,
+                             0u,
+                             logicalModel->mText.Count(),
+                             mirroredText);
 
   // 3) Call the GetMirroredText() function for the given index + number of characters
-  mirrored = GetMirroredText( logicalModel->mText,
-                              logicalModel->mCharacterDirections,
-                              logicalModel->mBidirectionalParagraphInfo,
-                              data.startIndex,
-                              data.numberOfCharacters,
-                              mirroredText );
+  mirrored = GetMirroredText(logicalModel->mText,
+                             logicalModel->mCharacterDirections,
+                             logicalModel->mBidirectionalParagraphInfo,
+                             data.startIndex,
+                             data.numberOfCharacters,
+                             mirroredText);
 
   // 4) Compare the results.
 
   // Convert to utf8
   std::string mirroredString;
-  Utf32ToUtf8( mirroredText.Begin(),
-               mirroredText.Count(),
-               mirroredString );
+  Utf32ToUtf8(mirroredText.Begin(),
+              mirroredText.Count(),
+              mirroredString);
 
-  if( !mirrored && ( mirroredString != data.text ) )
+  if(!mirrored && (mirroredString != data.text))
   {
     std::cout << "  No mirrored text and mirroredString != data.text." << std::endl;
     std::cout << "  mirrored string : [" << mirroredString << "]" << std::endl;
@@ -241,7 +246,7 @@ bool GetMirroredTextTest( const GetMirroredTextData& data )
     return false;
   }
 
-  if( mirrored && ( mirroredString == data.text ) )
+  if(mirrored && (mirroredString == data.text))
   {
     std::cout << "  Mirrored text and mirroredString == data.text." << std::endl;
     std::cout << "  mirrored string : [" << mirroredString << "]" << std::endl;
@@ -249,7 +254,7 @@ bool GetMirroredTextTest( const GetMirroredTextData& data )
     return false;
   }
 
-  if( mirrored && ( mirroredString != data.mirroredText ) )
+  if(mirrored && (mirroredString != data.mirroredText))
   {
     std::cout << "  Mirrored text and mirroredString != data.mirroredText." << std::endl;
     std::cout << "  mirrored string : [" << mirroredString << "]" << std::endl;
@@ -260,54 +265,57 @@ bool GetMirroredTextTest( const GetMirroredTextData& data )
   return true;
 }
 
-bool GetCharactersDirectionTest( const GetCharactersDirectionData& data )
+bool GetCharactersDirectionTest(const GetCharactersDirectionData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   // Create the model.
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   data.markupProcessorEnabled,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  data.markupProcessorEnabled,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = logicalModel->mBidirectionalParagraphInfo;
 
   // 2) Clear the direction info data.
   Vector<CharacterDirection>& directions = logicalModel->mCharacterDirections;
 
-  if( directions.Count() >= data.startIndex + data.numberOfCharacters )
+  if(directions.Count() >= data.startIndex + data.numberOfCharacters)
   {
-    directions.Erase( directions.Begin() + data.startIndex,
-                      directions.Begin() + data.startIndex + data.numberOfCharacters );
+    directions.Erase(directions.Begin() + data.startIndex,
+                     directions.Begin() + data.startIndex + data.numberOfCharacters);
   }
 
   // 3) Call GetCharactersDirection() function.
 
-  GetCharactersDirection( bidirectionalInfo,
-                          logicalModel->mText.Count(),
-                          data.startIndex,
-                          data.numberOfCharacters,
-                          directions );
+  GetCharactersDirection(bidirectionalInfo,
+                         logicalModel->mText.Count(),
+                         data.startIndex,
+                         data.numberOfCharacters,
+                         directions);
 
-  for( unsigned int index = 0u; index < logicalModel->mText.Count(); ++index )
+  for(unsigned int index = 0u; index < logicalModel->mText.Count(); ++index)
   {
-    if( data.directions[index] != directions[index] )
+    if(data.directions[index] != directions[index])
     {
       return false;
     }
@@ -324,140 +332,129 @@ int UtcDaliSetBidirectionalInfo(void)
 {
   tet_infoline(" UtcDaliSetBidirectionalInfo");
 
-  unsigned int indices01[] = {};
+  unsigned int indices01[]            = {};
   unsigned int numberOfCharacters01[] = {};
-  bool         direction01[] = {};
-  unsigned int indices02[] = {};
+  bool         direction01[]          = {};
+  unsigned int indices02[]            = {};
   unsigned int numberOfCharacters02[] = {};
-  bool         direction02[] = {};
-  unsigned int indices03[] = { 17u, 48u };
-  unsigned int numberOfCharacters03[] = { 14u, 14u };
-  bool         direction03[] = { true, true };
-  unsigned int indices04[] = { 17u, 31u, 79u };
-  unsigned int numberOfCharacters04[] = { 14u, 48u, 31u };
-  bool         direction04[] = { true, false, true };
-  unsigned int indices05[] = { 17u, 41u, 117u };
-  unsigned int numberOfCharacters05[] = { 24u, 76u, 49u };
-  bool         direction05[] = { true, false, true };
-  unsigned int indices06[] = { 17u, 48u };
-  unsigned int numberOfCharacters06[] = { 14u, 14u };
-  bool         direction06[] = { true, true };
-  unsigned int indices07[] = { 17u, 31u, 79u };
-  unsigned int numberOfCharacters07[] = { 14u, 48u, 31u };
-  bool         direction07[] = { true, false, true };
-  unsigned int indices08[] = { 17u, 41u, 117u };
-  unsigned int numberOfCharacters08[] = { 24u, 76u, 49u };
-  bool         direction08[] = { true, false, true };
+  bool         direction02[]          = {};
+  unsigned int indices03[]            = {17u, 48u};
+  unsigned int numberOfCharacters03[] = {14u, 14u};
+  bool         direction03[]          = {true, true};
+  unsigned int indices04[]            = {17u, 31u, 79u};
+  unsigned int numberOfCharacters04[] = {14u, 48u, 31u};
+  bool         direction04[]          = {true, false, true};
+  unsigned int indices05[]            = {17u, 41u, 117u};
+  unsigned int numberOfCharacters05[] = {24u, 76u, 49u};
+  bool         direction05[]          = {true, false, true};
+  unsigned int indices06[]            = {17u, 48u};
+  unsigned int numberOfCharacters06[] = {14u, 14u};
+  bool         direction06[]          = {true, true};
+  unsigned int indices07[]            = {17u, 31u, 79u};
+  unsigned int numberOfCharacters07[] = {14u, 48u, 31u};
+  bool         direction07[]          = {true, false, true};
+  unsigned int indices08[]            = {17u, 41u, 117u};
+  unsigned int numberOfCharacters08[] = {24u, 76u, 49u};
+  bool         direction08[]          = {true, false, true};
 
   struct SetBidirectionalInfoData data[] =
-  {
     {
-      "Zero characters",
-      "",
-      0u,
-      0u,
-      0u,
-      indices01,
-      numberOfCharacters01,
-      direction01
-    },
-    {
-      "Some left to right paragraphs",
-      "Hello world\ndemo\n\n",
-      0u,
-      18u,
-      0u,
-      indices02,
-      numberOfCharacters02,
-      direction02
-    },
-    {
-      "A mix of left to right and right to left paragraphs.",
-      "Hello world demo\nمرحبا بالعالم\nhello world demo\nمرحبا بالعالم\nhello world demo",
-      0u,
-      78u,
-      2u,
-      indices03,
-      numberOfCharacters03,
-      direction03
-    },
-    {
-      "A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text.",
-      "Hello world demo\nمرحبا بالعالم\nhello world demo مرحبا بالعالم hello world demo\nمرحبا hello world demo بالعالم\nhello world demo",
-      0u,
-      126u,
-      3u,
-      indices04,
-      numberOfCharacters04,
-      direction04
-    },
-    {
-      "A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts.",
-      "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
-      0u,
-      182u,
-      3u,
-      indices05,
-      numberOfCharacters05,
-      direction05
-    },
-    {
-      "A mix of left to right and right to left paragraphs. Updates a left to right paragraph.",
-      "Hello world demo\nمرحبا بالعالم\nhello world demo\nمرحبا بالعالم\nhello world demo",
-      31u,
-      17u,
-      2u,
-      indices06,
-      numberOfCharacters06,
-      direction06
-    },
-    {
-      "A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text.",
-      "Hello world demo\nمرحبا بالعالم\nhello world demo مرحبا بالعالم hello world demo\nمرحبا hello world demo بالعالم\nhello world demo",
-      0u,
-      126u,
-      3u,
-      indices07,
-      numberOfCharacters07,
-      direction07
-    },
-    {
-      "A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts. Updates initial paragraphs.",
-      "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
-      0u,
-      41u,
-      3u,
-      indices08,
-      numberOfCharacters08,
-      direction08
-    },
-    {
-      "A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts. Updates mid paragraphs.",
-      "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
-      41u,
-      76u,
-      3u,
-      indices08,
-      numberOfCharacters08,
-      direction08
-    },
-    {
-      "A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts. Updates from character 85",
-      "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
-      117u,
-      65u,
-      3u,
-      indices08,
-      numberOfCharacters08,
-      direction08
-    },
-  };
+      {"Zero characters",
+       "",
+       0u,
+       0u,
+       0u,
+       indices01,
+       numberOfCharacters01,
+       direction01},
+
+      {"Some left to right paragraphs",
+       "Hello world\ndemo\n\n",
+       0u,
+       18u,
+       0u,
+       indices02,
+       numberOfCharacters02,
+       direction02},
+
+      {"A mix of left to right and right to left paragraphs.",
+       "Hello world demo\nمرحبا بالعالم\nhello world demo\nمرحبا بالعالم\nhello world demo",
+       0u,
+       78u,
+       2u,
+       indices03,
+       numberOfCharacters03,
+       direction03},
+
+      {"A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text.",
+       "Hello world demo\nمرحبا بالعالم\nhello world demo مرحبا بالعالم hello world demo\nمرحبا hello world demo بالعالم\nhello world demo",
+       0u,
+       126u,
+       3u,
+       indices04,
+       numberOfCharacters04,
+       direction04},
+
+      {"A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts.",
+       "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
+       0u,
+       182u,
+       3u,
+       indices05,
+       numberOfCharacters05,
+       direction05},
+
+      {"A mix of left to right and right to left paragraphs. Updates a left to right paragraph.",
+       "Hello world demo\nمرحبا بالعالم\nhello world demo\nمرحبا بالعالم\nhello world demo",
+       31u,
+       17u,
+       2u,
+       indices06,
+       numberOfCharacters06,
+       direction06},
+
+      {"A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text.",
+       "Hello world demo\nمرحبا بالعالم\nhello world demo مرحبا بالعالم hello world demo\nمرحبا hello world demo بالعالم\nhello world demo",
+       0u,
+       126u,
+       3u,
+       indices07,
+       numberOfCharacters07,
+       direction07},
+
+      {"A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts. Updates initial paragraphs.",
+       "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
+       0u,
+       41u,
+       3u,
+       indices08,
+       numberOfCharacters08,
+       direction08},
+
+      {"A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts. Updates mid paragraphs.",
+       "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
+       41u,
+       76u,
+       3u,
+       indices08,
+       numberOfCharacters08,
+       direction08},
+
+      {"A mix of left to right and right to left paragraphs. Paragraphs also contain a mix of bidirectional text and a mix of right to left scripts. Updates from character 85",
+       "Hello world demo\nمرحبا שלום עולם بالعالم\nhello world שלום بالعالم עולם demo مرحبا שלום עולם بالعالم hello world demo\nمرحبا hello שלום بالعالم עולם world demo بالعالم\nhello world demo",
+       117u,
+       65u,
+       3u,
+       indices08,
+       numberOfCharacters08,
+       direction08},
+    };
   const unsigned int numberOfTests = 10u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !SetBidirectionalInfoTest( data[index] ) )
+    if(!SetBidirectionalInfoTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -472,76 +469,67 @@ int UtcDaliGetMirroredText(void)
   tet_infoline(" UtcDaliGetMirroredText");
 
   struct GetMirroredTextData data[] =
-  {
     {
-      "Zero characters.",
-      "",
-      0u,
-      0u,
-      ""
-    },
-    {
-      "Left to right characters only.",
-      "Hello world\nhello world demo.",
-      0u,
-      29u,
-      "Hello world\nhello world demo."
-    },
-    {
-      "Right to left characters but with no characters to mirror.",
-      "שלום עולם\nمرحبا بالعالم",
-      0u,
-      23u,
-      "שלום עולם\nمرحبا بالعالم"
-    },
-    {
-      "Right to left characters with some characters to mirror.",
-      "שלום עולם\n(مرحبا بالعالم)",
-      0u,
-      25u,
-      "שלום עולם\n)مرحبا بالعالم("
-    },
-    {
-      "Right to left characters with some characters to mirror. Update last paragraph.",
-      "שלום עולם\n(مرحبا بالعالم)",
-      10u,
-      15u,
-      "שלום עולם\n)مرحبا بالعالم("
-    },
-    {
-      "Mix of bidirectional text. With more paragraphs.",
-      "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)",
-      0u,
-      239u,
-      "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום( עולם\nשלום مرحبا بالعالم עולם )hello( مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום )hello) world demo )עולם(\nשלום )مرحبا بالعالم עולם( )hello("
-    },
-    {
-      "Mix of bidirectional text. With more paragraphs. Update middle paragraphs.",
-      "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)",
-      29u,
-      38u,
-      "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום( עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)"
-    },
-    {
-      "Mix of bidirectional text. With more paragraphs. Update middle paragraphs (2).",
-      "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)",
-      67u,
-      100u,
-      "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם )hello( مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)"
-    },
-  };
+      {"Zero characters.",
+       "",
+       0u,
+       0u,
+       ""},
+
+      {"Left to right characters only.",
+       "Hello world\nhello world demo.",
+       0u,
+       29u,
+       "Hello world\nhello world demo."},
+
+      {"Right to left characters but with no characters to mirror.",
+       "שלום עולם\nمرحبا بالعالم",
+       0u,
+       23u,
+       "שלום עולם\nمرحبا بالعالم"},
+
+      {"Right to left characters with some characters to mirror.",
+       "שלום עולם\n(مرحبا بالعالم)",
+       0u,
+       25u,
+       "שלום עולם\n)مرحبا بالعالم("},
+
+      {"Right to left characters with some characters to mirror. Update last paragraph.",
+       "שלום עולם\n(مرحبا بالعالم)",
+       10u,
+       15u,
+       "שלום עולם\n)مرحبا بالعالم("},
+
+      {"Mix of bidirectional text. With more paragraphs.",
+       "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)",
+       0u,
+       239u,
+       "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם )hello( مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום )hello( world demo )עולם(\nשלום )مرحبا بالعالم עולם( )hello("},
+
+      {"Mix of bidirectional text. With more paragraphs. Update middle paragraphs.",
+       "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)",
+       29u,
+       38u,
+       "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום( עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)"},
+
+      {"Mix of bidirectional text. With more paragraphs. Update middle paragraphs (2).",
+       "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם (hello) مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)",
+       67u,
+       100u,
+       "Hello world demo\nhello world\nhello world (مرحبا بالعالم שלום) עולם\nשלום مرحبا بالعالم עולם )hello( مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום (hello) world demo (עולם)\nשלום (مرحبا بالعالم עולם) (hello)"},
+    };
   const unsigned int numberOfTests = 8u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !GetMirroredTextTest( data[index] ) )
+    if(!GetMirroredTextTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -557,134 +545,92 @@ int UtcDaliGetCharactersDirection(void)
 
   bool directions01[] = {};
   bool directions02[] = {
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false, false, false };
+    false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false};
   bool directions03[] = {
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true };
+    true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true};
   bool directions04[] = {
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, true,  true,  true,  true,  true,  true,
-    true,  true,  true,  false, true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  false, false, false, false, false, false,
-    false, false, false, false, false };
+    false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, true, true, true, true, false, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false};
   bool directions05[] = {
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, true,  true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  false, true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  false,
-    false, false, false, false, true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  false,
-    false, false, false, false, true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  false, false, false, false,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  true,  true,  true,  true,  true,  true,  true,  true,
-    true,  true,  false, false, false, false, false };
-
-    bool directions06[] = {
-    true,  true,  true,  true,  true,  true,  true,  true,  true, true,
-    false, false, false, false, false, false, false, false, false, false,
-    false, false, false, false, false, false };
+    false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false};
+
+  bool directions06[] = {
+    true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false};
 
   struct GetCharactersDirectionData data[] =
-  {
-    {
-      "Zero characters",
-      "",
-      0u,
-      0u,
-      directions01,
-      false
-    },
     {
-      "Left to right characters only",
-      "Hello world\nhello world demo",
-      0u,
-      28u,
-      directions02,
-      false
-    },
-    {
-      "Right to left characters only",
-      "שלום עולם\nשלום עולם",
-      0u,
-      19u,
-      directions03,
-      false
-    },
-    {
-      "Mix of bidirectional text",
-      "Hello world\nhello world שלום עולם\nשלום עולם hello world",
-      0u,
-      55u,
-      directions04,
-      false
-    },
-    {
-      "Mix of bidirectional text. With more paragraphs.",
-      "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
-      0u,
-      227u,
-      directions05,
-      false
-    },
-    {
-      "Mix of bidirectional text. With more paragraphs. Update first paragraph.",
-      "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
-      0u,
-      17u,
-      directions05,
-      false
-    },
-    {
-      "Mix of bidirectional text. With more paragraphs. Update from character 29",
-      "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
-      29u,
-      134u,
-      directions05,
-      false
-    },
-    {
-      "Mix of bidirectional text. With more paragraphs. Update from character 163",
-      "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
-      " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
-      163u,
-      35u,
-      directions05,
-      false
-    },
-    {
-      "Mix of bidirectional text. With brackets and LRM",
-      "שלום עולם &lrm;(hello)[world]&lrm;",
-      0u,
-      26u,
-      directions06,
-      true
-    }
-  };
+      {"Zero characters",
+       "",
+       0u,
+       0u,
+       directions01,
+       false},
+
+      {"Left to right characters only",
+       "Hello world\nhello world demo",
+       0u,
+       28u,
+       directions02,
+       false},
+
+      {"Right to left characters only",
+       "שלום עולם\nשלום עולם",
+       0u,
+       19u,
+       directions03,
+       false},
+
+      {"Mix of bidirectional text",
+       "Hello world\nhello world שלום עולם\nשלום עולם hello world",
+       0u,
+       55u,
+       directions04,
+       false},
+
+      {"Mix of bidirectional text. With more paragraphs.",
+       "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
+       0u,
+       227u,
+       directions05,
+       false},
+
+      {"Mix of bidirectional text. With more paragraphs. Update first paragraph.",
+       "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
+       0u,
+       17u,
+       directions05,
+       false},
+
+      {"Mix of bidirectional text. With more paragraphs. Update from character 29",
+       "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
+       29u,
+       134u,
+       directions05,
+       false},
+
+      {"Mix of bidirectional text. With more paragraphs. Update from character 163",
+       "Hello world demo\nhello world\nhello world مرحبا بالعالم שלום עולם\nשלום مرحبا بالعالم עולם hello مرحبا بالعالم world"
+       " مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
+       163u,
+       35u,
+       directions05,
+       false},
+
+      {"Mix of bidirectional text. With brackets and LRM",
+       "שלום עולם &lrm;(hello)[world]&lrm;",
+       0u,
+       26u,
+       directions06,
+       true}};
+
   const unsigned int numberOfTests = 9u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !GetCharactersDirectionTest( data[index] ) )
+    if(!GetCharactersDirectionTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-BoundedParagraph-Functions.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-BoundedParagraph-Functions.cpp
new file mode 100644
index 0000000..07be747
--- /dev/null
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-BoundedParagraph-Functions.cpp
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/bounded-paragraph-helper-functions.h>
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+
+using namespace Dali;
+using namespace Toolkit;
+using namespace Text;
+
+struct BoundedParagraphData
+{
+  CharacterIndex characterIndex;
+  Length         numberOfCharacters;
+};
+
+struct TestCaseData
+{
+  std::string           description;                       ///< Description of the test.
+  std::string           text;                              ///< The text.
+  CharacterIndex        firstIndexOfRemovedCharacters;     ///< The first index of removed characters.
+  int                   numberOfRemovedCharacters;         ///< The number of removed characters.
+  Length                numberOfBoundedParagraphs;         ///< The number of bounded paragraphs before merging.
+  BoundedParagraphData* boundedParagraphs;                 ///< The bounded paragraphs info before merging.
+  Length                numberOfExpectedBoundedParagraphs; ///< The number of expected bounded paragraphs after merging.
+  BoundedParagraphData* expectedBoundedParagraphs;         ///< The expected bounded paragraphs info after merging.
+};
+
+void CreateBoundedParagraphRunsFromBoundedParagraphData(
+  Vector<BoundedParagraphRun>& boundedParagraphRuns,
+  const BoundedParagraphData*  boundedParagraphs,
+  const Length&                numberOfBoundedParagraphs)
+{
+  boundedParagraphRuns.Clear();
+
+  if(boundedParagraphs != nullptr)
+  {
+    for(Length index = 0u; index < numberOfBoundedParagraphs; index++)
+    {
+      BoundedParagraphRun boundedParagraphRun;
+      boundedParagraphRun.characterRun.characterIndex     = boundedParagraphs[index].characterIndex;
+      boundedParagraphRun.characterRun.numberOfCharacters = boundedParagraphs[index].numberOfCharacters;
+
+      boundedParagraphRuns.PushBack(boundedParagraphRun);
+    }
+  }
+}
+
+bool MergeBoundedParagraphRunsTest(TestCaseData testCase)
+{
+  // 1) Convert boundedParagraphs to vector of BoundedParagraphRun
+  Vector<BoundedParagraphRun> boundedParagraphRuns;
+  CreateBoundedParagraphRunsFromBoundedParagraphData(boundedParagraphRuns, testCase.boundedParagraphs, testCase.numberOfBoundedParagraphs);
+
+  // 2) Convert expectedBoundedParagraphs to vector of BoundedParagraphRun
+  Vector<BoundedParagraphRun> expectedBoundedParagraphRuns;
+  CreateBoundedParagraphRunsFromBoundedParagraphData(expectedBoundedParagraphRuns, testCase.expectedBoundedParagraphs, testCase.numberOfExpectedBoundedParagraphs);
+
+  // 3) Convert string text to vector of character utf32
+  Vector<Character> utf32Text;
+  utf32Text.Resize(testCase.text.size());
+  const uint32_t numberOfCharacters = (testCase.text.size() == 0) ? 0 : Utf8ToUtf32(reinterpret_cast<const uint8_t* const>(testCase.text.c_str()), testCase.text.size(), &utf32Text[0u]);
+  utf32Text.Resize(numberOfCharacters);
+
+  // 4) Call MergeBoundedParagraphRunsWhenRemoveCharacters
+  MergeBoundedParagraphRunsWhenRemoveCharacters(utf32Text, testCase.firstIndexOfRemovedCharacters, testCase.numberOfRemovedCharacters, boundedParagraphRuns);
+
+  // 5) Verify actual with expected
+  if(testCase.numberOfExpectedBoundedParagraphs != boundedParagraphRuns.Count())
+  {
+    std::cout << "  Different number of bounded paragraph runs after merging: " << boundedParagraphRuns.Count() << ", expected : " << testCase.numberOfExpectedBoundedParagraphs << std::endl;
+    return false;
+  }
+
+  for(unsigned int index = 0u; index < testCase.numberOfExpectedBoundedParagraphs; ++index)
+  {
+    if(expectedBoundedParagraphRuns[index].characterRun.characterIndex != boundedParagraphRuns[index].characterRun.characterIndex)
+    {
+      std::cout << "  Different bounded paragraph runs after merging, index : " << index << std::endl;
+      std::cout << "  Different characterIndex, actual: " << boundedParagraphRuns[index].characterRun.characterIndex
+                << ", expected : " << expectedBoundedParagraphRuns[index].characterRun.characterIndex << std::endl;
+      return false;
+    }
+
+    if(expectedBoundedParagraphRuns[index].characterRun.numberOfCharacters != boundedParagraphRuns[index].characterRun.numberOfCharacters)
+    {
+      std::cout << "  Different bounded paragraph runs after merging, index : " << index << std::endl;
+      std::cout << "  Different numberOfCharacters, actual: " << boundedParagraphRuns[index].characterRun.numberOfCharacters
+                << ", expected : " << expectedBoundedParagraphRuns[index].characterRun.numberOfCharacters << std::endl;
+      return false;
+    }
+  }
+
+  return true;
+}
+
+int UtcDaliMergeBoundedParagraphRunsWhenRemoveCharacters(void)
+{
+  tet_infoline(" UtcDaliMergeBoundedParagraphRunsWhenRemoveCharacters ");
+
+  BoundedParagraphData boundedParagraphs01[]         = {{10u, 14u}, {37u, 15u}};
+  BoundedParagraphData expectedBoundedParagraphs01[] = {{10u, 42u}};
+
+  BoundedParagraphData boundedParagraphs02[]         = {{10u, 14u}, {37u, 15u}};
+  BoundedParagraphData expectedBoundedParagraphs02[] = {{37u, 15u}};
+
+  BoundedParagraphData boundedParagraphs03[]         = {{10u, 14u}, {37u, 15u}};
+  BoundedParagraphData expectedBoundedParagraphs03[] = {{10u, 14u}, {37u, 20u}};
+
+  BoundedParagraphData boundedParagraphs04[]         = {{10u, 14u}, {37u, 15u}};
+  BoundedParagraphData expectedBoundedParagraphs04[] = {{10u, 14u}, {37u, 15u}};
+
+  BoundedParagraphData boundedParagraphs05[]         = {{10u, 14u}, {37u, 15u}};
+  BoundedParagraphData expectedBoundedParagraphs05[] = {{10u, 14u}, {37u, 15u}};
+
+  BoundedParagraphData boundedParagraphs06[]         = {{10u, 14u}, {37u, 15u}, {64u, 14u}};
+  BoundedParagraphData expectedBoundedParagraphs06[] = {{10u, 68u}};
+
+  TestCaseData testCases[] =
+    {
+      {
+
+        "test-case 01",
+        "text one \nParagraph two\n text three \nParagraph four\n text five",
+        20u,
+        -26,
+        2u,
+        boundedParagraphs01,
+        1u,
+        expectedBoundedParagraphs01
+
+      },
+
+      {
+
+        "test-case 02",
+        "text one \nParagraph two\n text three \nParagraph four\n text five",
+        5u,
+        -5,
+        2u,
+        boundedParagraphs02,
+        1u,
+        expectedBoundedParagraphs02
+
+      },
+
+      {
+
+        "test-case 03",
+        "text one \nParagraph two\n text three \nParagraph four\n text five",
+        47u,
+        -10,
+        2u,
+        boundedParagraphs03,
+        2u,
+        expectedBoundedParagraphs03
+
+      },
+
+      {
+
+        "test-case 04",
+        "text one \nParagraph two\n text three \nParagraph four\n text five",
+        10u,
+        -9,
+        2u,
+        boundedParagraphs04,
+        2u,
+        expectedBoundedParagraphs04
+
+      },
+
+      {
+
+        "test-case 05",
+        "text one \nParagraph two\n text three \nParagraph four\n text five",
+        25u,
+        -4,
+        2u,
+        boundedParagraphs05,
+        2u,
+        expectedBoundedParagraphs05
+
+      },
+
+      {
+
+        "test-case 06",
+        "text one \nParagraph two\n text three \nParagraph four\n text five \nParagraph six\n text seven",
+        10u,
+        -63,
+        3u,
+        boundedParagraphs06,
+        1u,
+        expectedBoundedParagraphs06
+
+      },
+
+    };
+
+  const unsigned int numberOfTests = 6u;
+
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
+  {
+    ToolkitTestApplication application;
+    tet_infoline(testCases[index].description.c_str());
+
+    if(!MergeBoundedParagraphRunsTest(testCases[index]))
+    {
+      tet_result(TET_FAIL);
+    }
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp
index 8184dd7..69365fb 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.h>
-#include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/text/text-visual.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.h>
 
 #include <dali-toolkit/dali-toolkit.h>
 
@@ -37,45 +37,50 @@ using namespace Dali::Toolkit;
 
 namespace
 {
-const char* TEST_IMAGE_FILE_NAME =  "image_01.jpg";
-const char* TEST_NPATCH_FILE_NAME =  "image_01.9.jpg";
-const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg";
-const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif";
+const char* TEST_IMAGE_FILE_NAME  = "image_01.jpg";
+const char* TEST_NPATCH_FILE_NAME = "image_01.9.jpg";
+const char* TEST_SVG_FILE_NAME    = TEST_RESOURCE_DIR "/svg1.svg";
+const char* TEST_GIF_FILE_NAME    = TEST_RESOURCE_DIR "/anim.gif";
 
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
+const char* const DALI_DEBUG_RENDERING("DALI_DEBUG_RENDERING");
 
-void TestDebugVisual( Integration::Scene scene,  Visual::Base& visual, Visual::Type actualType, Vector2 expectedNaturalSize )
+void TestDebugVisual(Integration::Scene scene, Visual::Base& visual, DevelVisual::Type actualType, Vector2 expectedNaturalSize)
 {
   {
-    auto& impl = GetImplementation( visual );
-    DALI_TEST_CHECK( &typeid( Toolkit::Internal::WireframeVisual ) == &typeid( impl ) );
+    auto& impl = GetImplementation(visual);
+    DALI_TEST_CHECK(&typeid(Toolkit::Internal::WireframeVisual) == &typeid(impl));
   }
 
   Vector2 naturalSize;
-  visual.GetNaturalSize( naturalSize );
-  DALI_TEST_EQUALS( naturalSize, expectedNaturalSize, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  visual.GetNaturalSize(naturalSize);
+  DALI_TEST_EQUALS(naturalSize, expectedNaturalSize, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   Property::Map propertyMap;
-  visual.CreatePropertyMap( propertyMap );
-  Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  if ( typeValue )
+  visual.CreatePropertyMap(propertyMap);
+  Property::Value* typeValue = propertyMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  if(typeValue)
   {
-    DALI_TEST_CHECK( typeValue->Get<int>() == actualType );
+    DALI_TEST_CHECK(typeValue->Get<int>() == actualType);
   }
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
-  scene.Add( actor );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  scene.Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1, TEST_LOCATION );
-  if( actor.GetRendererCount() > 0 )
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1, TEST_LOCATION);
+  if(actor.GetRendererCount() > 0)
   {
-    Geometry geometry = actor.GetRendererAt( 0 ).GetGeometry();
-    DALI_TEST_CHECK( geometry.GetType() == Geometry::LINES );
+    Geometry geometry = actor.GetRendererAt(0).GetGeometry();
+    DALI_TEST_CHECK(geometry.GetType() == Geometry::LINES);
   }
 }
+void TestDebugVisual(Integration::Scene scene, Visual::Base& visual, Visual::Type actualType, Vector2 expectedNaturalSize)
+{
+  TestDebugVisual(scene, visual, (DevelVisual::Type)actualType, expectedNaturalSize);
 }
+} // namespace
 
 void dali_debug_rendering_startup(void)
 {
@@ -92,59 +97,59 @@ void dali_debug_rendering_cleanup(void)
 
 int UtcDaliDebugRenderingGetVisual1(void)
 {
-  EnvironmentVariable::SetTestingEnvironmentVariable(true);
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "1");
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliDebugRenderingGetVisual1:  Request visual with a Property::Map" );
+  tet_infoline("UtcDaliDebugRenderingGetVisual1:  Request visual with a Property::Map");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Test that color visual is replaced with debug visual
   Property::Map propertyMap1;
-  propertyMap1.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap1.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
+  propertyMap1.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap1.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
   Visual::Base colorVisual = factory.CreateVisual(propertyMap1);
-  DALI_TEST_CHECK( colorVisual );
-  TestDebugVisual( application.GetScene(),  colorVisual, Visual::COLOR, Vector2::ZERO );
+  DALI_TEST_CHECK(colorVisual);
+  TestDebugVisual(application.GetScene(), colorVisual, Visual::COLOR, Vector2::ZERO);
 
   // Test that border visual is replaced with debug visual
   Property::Map propertyMap2;
-  propertyMap2.Insert(Visual::Property::TYPE,  Visual::BORDER);
-  propertyMap2.Insert(BorderVisual::Property::COLOR,  Color::BLUE);
-  propertyMap2.Insert(BorderVisual::Property::SIZE,  2.f);
+  propertyMap2.Insert(Visual::Property::TYPE, Visual::BORDER);
+  propertyMap2.Insert(BorderVisual::Property::COLOR, Color::BLUE);
+  propertyMap2.Insert(BorderVisual::Property::SIZE, 2.f);
   Visual::Base borderVisual = factory.CreateVisual(propertyMap2);
-  DALI_TEST_CHECK( borderVisual );
-  TestDebugVisual( application.GetScene(),  borderVisual, Visual::BORDER, Vector2::ZERO );
+  DALI_TEST_CHECK(borderVisual);
+  TestDebugVisual(application.GetScene(), borderVisual, Visual::BORDER, Vector2::ZERO);
 
   // Test that gradient visual is replaced with debug visual
   Property::Map propertyMap3;
-  propertyMap3.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap3.Insert(Visual::Property::TYPE, Visual::GRADIENT);
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
   propertyMap3.Insert(GradientVisual::Property::START_POSITION, start);
   propertyMap3.Insert(GradientVisual::Property::END_POSITION, end);
   propertyMap3.Insert(GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT);
   Property::Array stopOffsets;
-  stopOffsets.PushBack( 0.2f );
-  stopOffsets.PushBack( 0.8f );
+  stopOffsets.PushBack(0.2f);
+  stopOffsets.PushBack(0.8f);
   propertyMap3.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets);
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::GREEN );
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::GREEN);
   propertyMap3.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
   Visual::Base gradientVisual = factory.CreateVisual(propertyMap3);
-  DALI_TEST_CHECK( gradientVisual );
-  TestDebugVisual( application.GetScene(),  gradientVisual, Visual::GRADIENT, Vector2::ZERO );
+  DALI_TEST_CHECK(gradientVisual);
+  TestDebugVisual(application.GetScene(), gradientVisual, Visual::GRADIENT, Vector2::ZERO);
 
   // Test that image visual is replaced with debug visual
   Property::Map propertyMap4;
-  propertyMap4.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap4.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
-  propertyMap4.Insert( ImageVisual::Property::DESIRED_WIDTH,  50.f );
-  propertyMap4.Insert( ImageVisual::Property::DESIRED_HEIGHT,  100.f );
-  Visual::Base imageVisual = factory.CreateVisual( propertyMap4 );
-  DALI_TEST_CHECK( imageVisual );
-  TestDebugVisual( application.GetScene(),  imageVisual, Visual::IMAGE, Vector2( 50.f, 100.f ) );
+  propertyMap4.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap4.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap4.Insert(ImageVisual::Property::DESIRED_WIDTH, 50.f);
+  propertyMap4.Insert(ImageVisual::Property::DESIRED_HEIGHT, 100.f);
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap4);
+  DALI_TEST_CHECK(imageVisual);
+  TestDebugVisual(application.GetScene(), imageVisual, Visual::IMAGE, Vector2(50.f, 100.f));
 
   // Test that SVG visual is replaced with debug visual
   // TEST_SVG_FILE:
@@ -152,135 +157,251 @@ int UtcDaliDebugRenderingGetVisual1(void)
   //  <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
   //  </svg>
   Property::Map propertyMap5;
-  propertyMap5.Insert( Toolkit::Visual::Property::TYPE, Visual::SVG );
-  propertyMap5.Insert( ImageVisual::Property::URL,  TEST_SVG_FILE_NAME );
-  Visual::Base svgVisual = factory.CreateVisual( propertyMap5 );
-  DALI_TEST_CHECK( svgVisual );
-  TestDebugVisual( application.GetScene(),  svgVisual, Visual::SVG, Vector2(100.f, 100.f) );
+  propertyMap5.Insert(Toolkit::Visual::Property::TYPE, Visual::SVG);
+  propertyMap5.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME);
+  Visual::Base svgVisual = factory.CreateVisual(propertyMap5);
+  DALI_TEST_CHECK(svgVisual);
+  TestDebugVisual(application.GetScene(), svgVisual, Visual::SVG, Vector2::ZERO);
 
   // Test that AnimatedImageVisual is replaced with debug visual
   // TEST_GIF_FILE: anim.gif
   // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame
   Property::Map propertyMap6;
-  propertyMap6.Insert( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE );
-  propertyMap6.Insert( ImageVisual::Property::URL,  TEST_GIF_FILE_NAME );
-  Visual::Base animatedImageVisual = factory.CreateVisual( propertyMap6 );
-  DALI_TEST_CHECK( animatedImageVisual );
-  TestDebugVisual( application.GetScene(),  animatedImageVisual, Visual::ANIMATED_IMAGE, Vector2(50.f, 50.f) );
+  propertyMap6.Insert(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+  propertyMap6.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+  Visual::Base animatedImageVisual = factory.CreateVisual(propertyMap6);
+  DALI_TEST_CHECK(animatedImageVisual);
+  TestDebugVisual(application.GetScene(), animatedImageVisual, Visual::ANIMATED_IMAGE, Vector2(50.f, 50.f));
 
   // Test that text visual is replaced with debug visual
 
   // Load some fonts to get the same metrics on different platforms.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
 
   Property::Map propertyMap7;
-  propertyMap7.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT );
-  propertyMap7.Insert( TextVisual::Property::ENABLE_MARKUP, true );
-  propertyMap7.Insert( TextVisual::Property::TEXT, "<font family='TizenSans' size='12'>Hello world</font>" );
-  propertyMap7.Insert( TextVisual::Property::MULTI_LINE, true );
+  propertyMap7.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT);
+  propertyMap7.Insert(TextVisual::Property::ENABLE_MARKUP, true);
+  propertyMap7.Insert(TextVisual::Property::TEXT, "<font family='TizenSans' size='12'>Hello world</font>");
+  propertyMap7.Insert(TextVisual::Property::MULTI_LINE, true);
 
-  Visual::Base textVisual = factory.CreateVisual( propertyMap7 );
-  DALI_TEST_CHECK( textVisual );
+  Visual::Base textVisual = factory.CreateVisual(propertyMap7);
+  DALI_TEST_CHECK(textVisual);
   {
-    auto&& impl = GetImplementation( textVisual );
-    DALI_TEST_CHECK( &typeid( Toolkit::Internal::WireframeVisual ) == &typeid( impl ) );
+    auto&& impl = GetImplementation(textVisual);
+    DALI_TEST_CHECK(&typeid(Toolkit::Internal::WireframeVisual) == &typeid(impl));
   }
 
   Vector2 naturalSize;
-  textVisual.GetNaturalSize( naturalSize );
-  DALI_TEST_EQUALS( naturalSize, Vector2( 82.f, 20.f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  textVisual.GetNaturalSize(naturalSize);
+  DALI_TEST_EQUALS(naturalSize, Vector2(80.f, 20.f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  const float height = textVisual.GetHeightForWidth( 40.f );
-  DALI_TEST_EQUALS( height, 60.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  const float height = textVisual.GetHeightForWidth(40.f);
+  DALI_TEST_EQUALS(height, 40.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Test that NPatchVisual is replaced with debug visual
   // TEST_NPATCH_FILE_NAME: image_01.9.jpg
   Property::Map propertyMap8;
-  propertyMap8.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap8.Insert( ImageVisual::Property::URL,  TEST_NPATCH_FILE_NAME );
-  Visual::Base nPatchVisual = factory.CreateVisual( propertyMap8 );
-  DALI_TEST_CHECK( nPatchVisual );
-  TestDebugVisual( application.GetScene(),  nPatchVisual, Visual::N_PATCH, Vector2::ZERO );
+  propertyMap8.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap8.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME);
+  Visual::Base nPatchVisual = factory.CreateVisual(propertyMap8);
+  DALI_TEST_CHECK(nPatchVisual);
+  TestDebugVisual(application.GetScene(), nPatchVisual, Visual::N_PATCH, Vector2::ZERO);
 
-  EnvironmentVariable::SetTestingEnvironmentVariable(false);
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "0");
   END_TEST;
 }
 
 int UtcDaliDebugRenderingGetVisual2(void)
 {
-  EnvironmentVariable::SetTestingEnvironmentVariable(true);
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "1");
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliDebugRenderingGetVisual2: Request visual with various parameters" );
+  tet_infoline("UtcDaliDebugRenderingGetVisual2: Request visual with various parameters");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Test that color visual is replaced with debug visual
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
-  map[ ColorVisual::Property::MIX_COLOR ] = Color::CYAN;
+  map[Toolkit::Visual::Property::TYPE]  = Visual::COLOR;
+  map[ColorVisual::Property::MIX_COLOR] = Color::CYAN;
 
-  Visual::Base colorVisual = factory.CreateVisual( map);
-  DALI_TEST_CHECK( colorVisual );
-  TestDebugVisual( application.GetScene(),  colorVisual, Visual::COLOR, Vector2::ZERO );
+  Visual::Base colorVisual = factory.CreateVisual(map);
+  DALI_TEST_CHECK(colorVisual);
+  TestDebugVisual(application.GetScene(), colorVisual, Visual::COLOR, Vector2::ZERO);
 
   // Test that border visual is replaced with debug visual
   map.Clear();
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
-  map[ BorderVisual::Property::COLOR  ] = Color::GREEN;
-  map[ BorderVisual::Property::SIZE   ] = 2.f;
-  Visual::Base borderVisual = factory.CreateVisual( map );
-  DALI_TEST_CHECK( borderVisual );
-  TestDebugVisual( application.GetScene(),  borderVisual, Visual::BORDER, Vector2::ZERO );
+  map[Toolkit::Visual::Property::TYPE] = Visual::BORDER;
+  map[BorderVisual::Property::COLOR]   = Color::GREEN;
+  map[BorderVisual::Property::SIZE]    = 2.f;
+  Visual::Base borderVisual            = factory.CreateVisual(map);
+  DALI_TEST_CHECK(borderVisual);
+  TestDebugVisual(application.GetScene(), borderVisual, Visual::BORDER, Vector2::ZERO);
 
   // Test that image visual is replaced with debug visual
   map.Clear();
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
-  map[ ImageVisual::Property::URL ] = TEST_IMAGE_FILE_NAME;
-  Visual::Base imageVisual = factory.CreateVisual( map );
-  DALI_TEST_CHECK( imageVisual );
-  TestDebugVisual( application.GetScene(),  imageVisual, Visual::IMAGE, Vector2(64.0f, 64.0f /* Broken Image Size */ ));
+  map[Toolkit::Visual::Property::TYPE] = Visual::IMAGE;
+  map[ImageVisual::Property::URL]      = TEST_IMAGE_FILE_NAME;
+  Visual::Base imageVisual             = factory.CreateVisual(map);
+  DALI_TEST_CHECK(imageVisual);
+  TestDebugVisual(application.GetScene(), imageVisual, Visual::IMAGE, Vector2(64.0f, 64.0f /* Broken Image Size */));
 
   // Test that n patch visual is replaced with debug visual
-  Visual::Base nPatchVisual = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( nPatchVisual );
-  TestDebugVisual( application.GetScene(),  nPatchVisual, Visual::N_PATCH, Vector2::ZERO );
+  Visual::Base nPatchVisual = factory.CreateVisual(TEST_NPATCH_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(nPatchVisual);
+  TestDebugVisual(application.GetScene(), nPatchVisual, Visual::N_PATCH, Vector2::ZERO);
+
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "0");
+  END_TEST;
+}
+
+int UtcDaliDebugRenderingGetVisual3(void)
+{
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "1");
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliDebugRenderingGetVisual3: Request visual with various parameters");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  // Test that image visual is replaced with debug visual
+  Dali::Property::Map map;
+  map[Toolkit::Visual::Property::TYPE] = Visual::IMAGE;
+  map[ImageVisual::Property::URL]      = TEST_IMAGE_FILE_NAME;
+  Visual::Base imageVisual             = factory.CreateVisual(map);
+  DALI_TEST_CHECK(imageVisual);
+  TestDebugVisual(application.GetScene(), imageVisual, Visual::IMAGE, Vector2(64.0f, 64.0f /* Broken Image Size */));
+
+  // Test that image visual with null string don't make visual
+  map.Clear();
+  map[Toolkit::Visual::Property::TYPE] = Visual::IMAGE;
+  map[ImageVisual::Property::URL]      = "";
+  Visual::Base emptyVisual             = factory.CreateVisual(map);
+  DALI_TEST_CHECK(emptyVisual);
+  TestDebugVisual(application.GetScene(), emptyVisual, Visual::WIREFRAME, Vector2::ZERO);
 
-  EnvironmentVariable::SetTestingEnvironmentVariable(false);
+  tet_infoline("Check that GetVisualObject returns the actual WireframeVisual");
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(emptyVisual).GetVisualObject();
+  DALI_TEST_CHECK(dynamic_cast<Toolkit::Internal::WireframeVisual*>(&visualImpl));
+
+  tet_infoline("Compare the returned emptyVisual with the visual implementation, should be the same");
+  DALI_TEST_CHECK(emptyVisual.GetObjectPtr() == &visualImpl);
+
+  // Test that image view with empty property map don't make visual even DebugRendering is enabled.
+  map.Clear();
+  ImageView imageView1 = ImageView::New();
+  imageView1.SetProperty(Control::Property::BACKGROUND, map);
+  imageView1.SetProperty(ImageView::Property::IMAGE, map);
+
+  // Test that image view with empty property value don't make visual even DebugRendering is enabled.
+  Property::Value emptyValue;
+  ImageView       imageView2 = ImageView::New();
+  imageView2.SetProperty(Control::Property::BACKGROUND, emptyValue);
+  imageView2.SetProperty(ImageView::Property::IMAGE, emptyValue);
+
+  // Test that image view with invalid property value don't make visual even DebugRendering is enabled.
+  Property::Value invalidValue(static_cast<int>(3));
+  ImageView       imageView3 = ImageView::New();
+  imageView3.SetProperty(Control::Property::BACKGROUND, invalidValue);
+  imageView3.SetProperty(ImageView::Property::IMAGE, invalidValue);
+
+  application.GetScene().Add(imageView1);
+  application.GetScene().Add(imageView2);
+  application.GetScene().Add(imageView3);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(imageView1.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView2.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView3.GetRendererCount(), 0u, TEST_LOCATION);
+
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "0");
+  END_TEST;
+}
+
+int UtcDaliDebugRenderingGetVisual4(void)
+{
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "1");
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliDebugRenderingGetVisual4: Request visual with empty URL and empty Array");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  // Test that image visual with null string don't make visual
+  for(auto type : {DevelVisual::IMAGE, DevelVisual::ANIMATED_IMAGE, DevelVisual::SVG, DevelVisual::N_PATCH, DevelVisual::ANIMATED_VECTOR_IMAGE})
+  {
+    Dali::Property::Map map;
+    map[Toolkit::Visual::Property::TYPE] = type;
+    map[ImageVisual::Property::URL]      = "";
+    Visual::Base emptyVisual             = factory.CreateVisual(map);
+    DALI_TEST_CHECK(emptyVisual);
+    TestDebugVisual(application.GetScene(), emptyVisual, Visual::WIREFRAME, Vector2::ZERO);
+
+    tet_infoline("Check that GetVisualObject returns the actual WireframeVisual");
+    Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(emptyVisual).GetVisualObject();
+    DALI_TEST_CHECK(dynamic_cast<Toolkit::Internal::WireframeVisual*>(&visualImpl));
+
+    tet_infoline("Compare the returned emptyVisual with the visual implementation, should be the same");
+    DALI_TEST_CHECK(emptyVisual.GetObjectPtr() == &visualImpl);
+  }
+
+  // Test that image visual with empty array don't make visual
+  for(auto type : {Visual::IMAGE, Visual::ANIMATED_IMAGE})
+  {
+    Dali::Property::Map   map;
+    Dali::Property::Array emptyArray;
+    map[Toolkit::Visual::Property::TYPE] = type;
+    map[ImageVisual::Property::URL]      = emptyArray;
+    Visual::Base emptyVisual             = factory.CreateVisual(map);
+    DALI_TEST_CHECK(emptyVisual);
+    TestDebugVisual(application.GetScene(), emptyVisual, Visual::WIREFRAME, Vector2::ZERO);
+
+    tet_infoline("Check that GetVisualObject returns the actual WireframeVisual");
+    Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(emptyVisual).GetVisualObject();
+    DALI_TEST_CHECK(dynamic_cast<Toolkit::Internal::WireframeVisual*>(&visualImpl));
+
+    tet_infoline("Compare the returned emptyVisual with the visual implementation, should be the same");
+    DALI_TEST_CHECK(emptyVisual.GetObjectPtr() == &visualImpl);
+  }
+
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "0");
   END_TEST;
 }
 
 int UtcDaliDebugRenderingGetVisualObject01(void)
 {
-  EnvironmentVariable::SetTestingEnvironmentVariable( true );
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "1");
   ToolkitTestApplication application;
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  tet_infoline( "Create a TextVisual when debugging is enabled, thus creating a proxy Wireframe Visual" );
+  tet_infoline("Create a TextVisual when debugging is enabled, thus creating a proxy Wireframe Visual");
 
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT;
-  map[ TextVisual::Property::TEXT ] = "Hello";
+  map[Toolkit::Visual::Property::TYPE] = Visual::TEXT;
+  map[TextVisual::Property::TEXT]      = "Hello";
 
-  Visual::Base textVisual = factory.CreateVisual( map);
-  DALI_TEST_CHECK( textVisual );
+  Visual::Base textVisual = factory.CreateVisual(map);
+  DALI_TEST_CHECK(textVisual);
 
-  tet_infoline( "Check that GetVisualObject returns the actual TextVisual" );
-  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation( textVisual ).GetVisualObject();
-  DALI_TEST_CHECK( dynamic_cast< Toolkit::Internal::TextVisual* >( &visualImpl ) );
+  tet_infoline("Check that GetVisualObject returns the actual TextVisual");
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(textVisual).GetVisualObject();
+  DALI_TEST_CHECK(dynamic_cast<Toolkit::Internal::TextVisual*>(&visualImpl));
 
-  tet_infoline( "Compare the returned TextVisual with the visual implementation, should differ" );
-  DALI_TEST_CHECK( textVisual.GetObjectPtr() != &visualImpl );
+  tet_infoline("Compare the returned TextVisual with the visual implementation, should differ");
+  DALI_TEST_CHECK(textVisual.GetObjectPtr() != &visualImpl);
 
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "0");
   END_TEST;
 }
 
@@ -289,23 +410,23 @@ int UtcDaliDebugRenderingGetVisualObject02(void)
   ToolkitTestApplication application;
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  tet_infoline( "Create a TextVisual without debugging enabled, thus no proxy Wireframe Visual" );
+  tet_infoline("Create a TextVisual without debugging enabled, thus no proxy Wireframe Visual");
 
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT;
-  map[ TextVisual::Property::TEXT ] = "Hello";
+  map[Toolkit::Visual::Property::TYPE] = Visual::TEXT;
+  map[TextVisual::Property::TEXT]      = "Hello";
 
-  Visual::Base textVisual = factory.CreateVisual( map);
-  DALI_TEST_CHECK( textVisual );
+  Visual::Base textVisual = factory.CreateVisual(map);
+  DALI_TEST_CHECK(textVisual);
 
-  tet_infoline( "Check that GetVisualObject returns the actual TextVisual" );
-  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation( textVisual ).GetVisualObject();
-  DALI_TEST_CHECK( dynamic_cast< Toolkit::Internal::TextVisual* >( &visualImpl ) );
+  tet_infoline("Check that GetVisualObject returns the actual TextVisual");
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(textVisual).GetVisualObject();
+  DALI_TEST_CHECK(dynamic_cast<Toolkit::Internal::TextVisual*>(&visualImpl));
 
-  tet_infoline( "Compare the returned TextVisual with the visual implementation, should be the same" );
-  DALI_TEST_CHECK( textVisual.GetObjectPtr() == &visualImpl );
+  tet_infoline("Compare the returned TextVisual with the visual implementation, should be the same");
+  DALI_TEST_CHECK(textVisual.GetObjectPtr() == &visualImpl);
 
   END_TEST;
 }
@@ -315,40 +436,41 @@ int UtcDaliDebugRenderingGetVisualObject03(void)
   ToolkitTestApplication application;
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  tet_infoline( "Create a WireframeVisual without debugging enabled, thus no proxy Wireframe Visual either" );
+  tet_infoline("Create a WireframeVisual without debugging enabled, thus no proxy Wireframe Visual either");
 
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::WIREFRAME;
+  map[Toolkit::Visual::Property::TYPE] = Visual::WIREFRAME;
 
-  Visual::Base textVisual = factory.CreateVisual( map);
-  DALI_TEST_CHECK( textVisual );
+  Visual::Base textVisual = factory.CreateVisual(map);
+  DALI_TEST_CHECK(textVisual);
 
-  tet_infoline( "Check that GetVisualObject returns the WireframeVisual" );
-  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation( textVisual ).GetVisualObject();
-  DALI_TEST_CHECK( dynamic_cast< Toolkit::Internal::WireframeVisual* >( &visualImpl ) );
+  tet_infoline("Check that GetVisualObject returns the WireframeVisual");
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(textVisual).GetVisualObject();
+  DALI_TEST_CHECK(dynamic_cast<Toolkit::Internal::WireframeVisual*>(&visualImpl));
 
-  tet_infoline( "Compare the returned Visual with the visual implementation, should be the same" );
-  DALI_TEST_CHECK( textVisual.GetObjectPtr() == &visualImpl );
+  tet_infoline("Compare the returned Visual with the visual implementation, should be the same");
+  DALI_TEST_CHECK(textVisual.GetObjectPtr() == &visualImpl);
 
   END_TEST;
 }
 
 int UtcDaliDebugRenderingRenderText(void)
 {
-  EnvironmentVariable::SetTestingEnvironmentVariable( true );
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_RENDERING, "1");
   ToolkitTestApplication application;
-  tet_infoline( "Ensure we can render text when in debug mode" );
+  tet_infoline("Ensure we can render text when in debug mode");
 
   try
   {
-    Toolkit::TextLabel label = TextLabel::New( "Hello" );
-    application.GetScene().Add( label );
-    DALI_TEST_CHECK( true );
-  } catch( ... )
+    Toolkit::TextLabel label = TextLabel::New("Hello");
+    application.GetScene().Add(label);
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
   {
-    DALI_TEST_CHECK( false );
+    DALI_TEST_CHECK(false);
   }
 
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-ImageVisualShaderFeatureBuilder.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-ImageVisualShaderFeatureBuilder.cpp
new file mode 100644
index 0000000..4041450
--- /dev/null
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-ImageVisualShaderFeatureBuilder.cpp
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <iostream>
+#include <stdlib.h>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <toolkit-event-thread-callback.h>
+#include <toolkit-text-utils.h>
+
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
+
+#include <../dali-toolkit/dali-toolkit-test-utils/dummy-control.h>
+#include <dummy-visual.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcImageVisualShaderFeatureBuilderSetGetProperty01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Register an ImageVisual and and perform an Action on Visual directly");
+  auto featureBuilder = Dali::Toolkit::Internal::ImageVisualShaderFeatureBuilder()
+                          .EnableTextureAtlas(Dali::Toolkit::Internal::ImageVisualShaderFeature::TextureAtlas::ENABLED)
+                          .ApplyDefaultTextureWrapMode(true);
+
+  std::string vertexPrefixList;
+  std::string fragmentPrefixList;
+  featureBuilder.GetVertexShaderPrefixList(vertexPrefixList);
+  featureBuilder.GetFragmentShaderPrefixList(fragmentPrefixList);
+
+  DALI_TEST_EQUALS(vertexPrefixList, std::string(""), TEST_LOCATION);
+  DALI_TEST_EQUALS(fragmentPrefixList, std::string("#define ATLAS_DEFAULT_WARP\n"), TEST_LOCATION);
+
+  featureBuilder = featureBuilder.ApplyDefaultTextureWrapMode(false);
+
+  vertexPrefixList.clear();
+  fragmentPrefixList.clear();
+  featureBuilder.GetVertexShaderPrefixList(vertexPrefixList);
+  featureBuilder.GetFragmentShaderPrefixList(fragmentPrefixList);
+
+  DALI_TEST_EQUALS(vertexPrefixList, std::string(""), TEST_LOCATION);
+  DALI_TEST_EQUALS(fragmentPrefixList, std::string("#define ATLAS_CUSTOM_WARP\n"), TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcImageVisualShaderFeatureBuilderSetGetProperty02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Register an ImageVisual and and perform an Action on Visual directly");
+  auto featureBuilder = Dali::Toolkit::Internal::ImageVisualShaderFeatureBuilder()
+                          .EnableRoundedCorner(true)
+                          .EnableBorderline(true)
+                          .EnableAlphaMaskingOnRendering(true)
+                          .EnableYuvToRgb(true, false);
+
+  std::string vertexPrefixList;
+  std::string fragmentPrefixList;
+  featureBuilder.GetVertexShaderPrefixList(vertexPrefixList);
+  featureBuilder.GetFragmentShaderPrefixList(fragmentPrefixList);
+
+  std::string vertexPrefixListResult;
+  vertexPrefixListResult += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+  vertexPrefixListResult += "#define IS_REQUIRED_BORDERLINE\n";
+  vertexPrefixListResult += "#define IS_REQUIRED_ALPHA_MASKING\n";
+
+  std::string fragmentPrefixListResult;
+  fragmentPrefixListResult += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+  fragmentPrefixListResult += "#define IS_REQUIRED_BORDERLINE\n";
+  fragmentPrefixListResult += "#define IS_REQUIRED_ALPHA_MASKING\n";
+
+  DALI_TEST_EQUALS(vertexPrefixList, vertexPrefixListResult, TEST_LOCATION);
+  DALI_TEST_EQUALS(fragmentPrefixList, fragmentPrefixListResult, TEST_LOCATION);
+
+  featureBuilder = featureBuilder.EnableAlphaMaskingOnRendering(false);
+
+  vertexPrefixList.clear();
+  fragmentPrefixList.clear();
+  featureBuilder.GetVertexShaderPrefixList(vertexPrefixList);
+  featureBuilder.GetFragmentShaderPrefixList(fragmentPrefixList);
+
+  vertexPrefixListResult.clear();
+  vertexPrefixListResult += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+  vertexPrefixListResult += "#define IS_REQUIRED_BORDERLINE\n";
+
+  fragmentPrefixListResult.clear();
+  fragmentPrefixListResult += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+  fragmentPrefixListResult += "#define IS_REQUIRED_BORDERLINE\n";
+  fragmentPrefixListResult += "#define IS_REQUIRED_YUV_TO_RGB\n";
+
+  DALI_TEST_EQUALS(vertexPrefixList, vertexPrefixListResult, TEST_LOCATION);
+  DALI_TEST_EQUALS(fragmentPrefixList, fragmentPrefixListResult, TEST_LOCATION);
+
+  featureBuilder = featureBuilder.EnableYuvToRgb(true, true);
+
+  vertexPrefixList.clear();
+  fragmentPrefixList.clear();
+  featureBuilder.GetVertexShaderPrefixList(vertexPrefixList);
+  featureBuilder.GetFragmentShaderPrefixList(fragmentPrefixList);
+
+  fragmentPrefixListResult.clear();
+  fragmentPrefixListResult += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+  fragmentPrefixListResult += "#define IS_REQUIRED_BORDERLINE\n";
+  fragmentPrefixListResult += "#define IS_REQUIRED_UNIFIED_YUV_AND_RGB\n";
+
+  DALI_TEST_EQUALS(vertexPrefixList, vertexPrefixListResult, TEST_LOCATION);
+  DALI_TEST_EQUALS(fragmentPrefixList, fragmentPrefixListResult, TEST_LOCATION);
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-LineHelperFunctions.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-LineHelperFunctions.cpp
new file mode 100644
index 0000000..92113fc
--- /dev/null
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-LineHelperFunctions.cpp
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/internal/text/line-helper-functions.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/rendering/text-typesetter.h>
+#include <dali-toolkit/internal/text/rendering/view-model.h>
+#include <toolkit-text-utils.h>
+
+using namespace Dali;
+using namespace Toolkit;
+using namespace Text;
+
+int UtcDaliGetPreOffsetVerticalLineAlignmentWithNegativeLineSpacing(void)
+{
+  tet_infoline(" UtcDaliGetPreOffsetVerticalLineAlignmentWithNegativeLineSpacing ");
+  ToolkitTestApplication application;
+
+  uint32_t expectedNumberOfLines = 2u;
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Sets the text.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetTextElideEnabled(false);
+  controller->SetText("<p rel-line-height=0.5>Line one Line two</p>");
+
+  // Creates the text's model and relais-out the text.
+  const Size relayoutSize(120.f, 100.f);
+  controller->Relayout(relayoutSize);
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
+
+  // Tests the view model has been created.
+  ViewModel* model = typesetter->GetViewModel();
+  DALI_TEST_CHECK(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(model->GetLines());
+
+  const LineRun& lineOne = *(model->GetLines() + 0u);
+  const LineRun& lineTwo = *(model->GetLines() + 1u);
+
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), 0.0f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), 0.0f, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliGetPreOffsetVerticalLineAlignmentWithPositiveLineSpacing(void)
+{
+  tet_infoline(" UtcDaliGetPreOffsetVerticalLineAlignmentWithPositiveLineSpacing ");
+  ToolkitTestApplication application;
+
+  uint32_t expectedNumberOfLines = 2u;
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Sets the text.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetTextElideEnabled(false);
+  controller->SetText("<p rel-line-height=2.0>Line one Line two</p>");
+
+  // Creates the text's model and relais-out the text.
+  const Size relayoutSize(120.f, 100.f);
+  controller->Relayout(relayoutSize);
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
+
+  // Tests the view model has been created.
+  ViewModel* model = typesetter->GetViewModel();
+  DALI_TEST_CHECK(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(model->GetLines());
+
+  const LineRun& lineOne = *(model->GetLines() + 0u);
+  const LineRun& lineTwo = *(model->GetLines() + 1u);
+
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), 9.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), 19.0f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPreOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), 0.0f, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliGetPostOffsetVerticalLineAlignmentWithNegativeLineSpacing(void)
+{
+  tet_infoline(" UtcDaliGetPostOffsetVerticalLineAlignmentWithNegativeLineSpacing ");
+  ToolkitTestApplication application;
+
+  uint32_t expectedNumberOfLines = 2u;
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Sets the text.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetTextElideEnabled(false);
+  controller->SetText("<p rel-line-height=0.5>Line one Line two</p>");
+
+  // Creates the text's model and relais-out the text.
+  const Size relayoutSize(120.f, 100.f);
+  controller->Relayout(relayoutSize);
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
+
+  // Tests the view model has been created.
+  ViewModel* model = typesetter->GetViewModel();
+  DALI_TEST_CHECK(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(model->GetLines());
+
+  const LineRun& lineOne = *(model->GetLines() + 0u);
+  const LineRun& lineTwo = *(model->GetLines() + 1u);
+
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), -9.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), -9.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), -9.5f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), 0.0f, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliGetPostOffsetVerticalLineAlignmentWithPositiveLineSpacing(void)
+{
+  tet_infoline(" UtcDaliGetPostOffsetVerticalLineAlignmentWithPositiveLineSpacing ");
+  ToolkitTestApplication application;
+
+  uint32_t expectedNumberOfLines = 2u;
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Sets the text.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetTextElideEnabled(false);
+  controller->SetText("<p rel-line-height=2.0>Line one Line two</p>");
+
+  // Creates the text's model and relais-out the text.
+  const Size relayoutSize(120.f, 100.f);
+  controller->Relayout(relayoutSize);
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
+
+  // Tests the view model has been created.
+  ViewModel* model = typesetter->GetViewModel();
+  DALI_TEST_CHECK(model);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(model->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(model->GetLines());
+
+  const LineRun& lineOne = *(model->GetLines() + 0u);
+  const LineRun& lineTwo = *(model->GetLines() + 1u);
+
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), 19.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), 9.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineOne, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), 0.0f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::TOP), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetPostOffsetVerticalLineAlignment(lineTwo, Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM), 0.0f, TEST_LOCATION);
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
index a95b707..ca775c0 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,15 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/internal/text/text-run-container.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/internal/text/text-run-container.h>
 #include <toolkit-text-utils.h>
 
-
 using namespace Dali;
 using namespace Toolkit;
 using namespace Text;
@@ -44,7 +43,7 @@ using namespace Text;
 
 namespace
 {
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
 
 struct CreateParagraphData
 {
@@ -79,12 +78,12 @@ struct FetchBidirectionalLineInfoData
 
 struct GetLogicalCharacterIndexData
 {
-  std::string   description;        ///< Description of the test.
-  std::string   text;               ///< Input text.
-  Size          textArea;           ///< The text area.
-  unsigned int  numberOfIndices;    ///< The number of characters to set.
-  unsigned int* visualToLogical;    ///< The expected visual to logical conversion table.
-  unsigned int* cachedBidiLine;     ///< The cached bidi line index for each character.
+  std::string   description;     ///< Description of the test.
+  std::string   text;            ///< Input text.
+  Size          textArea;        ///< The text area.
+  unsigned int  numberOfIndices; ///< The number of characters to set.
+  unsigned int* visualToLogical; ///< The expected visual to logical conversion table.
+  unsigned int* cachedBidiLine;  ///< The cached bidi line index for each character.
 };
 
 struct GetLogicalCursorIndexData
@@ -101,62 +100,65 @@ struct GetLogicalCursorIndexData
   unsigned int*       cachedBidiLine;     ///< The cached bidi line index for each character.
 };
 
-bool CreateParagraphTest( const CreateParagraphData& data )
+bool CreateParagraphTest(const CreateParagraphData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   // 2) Clear the paragraphs.
   Vector<ParagraphRun>& paragraphs = logicalModel->mParagraphInfo;
-  ClearCharacterRuns( data.index,
-                      data.index + data.numberOfCharacters - 1u,
-                      paragraphs );
+  ClearCharacterRuns(data.index,
+                     data.index + data.numberOfCharacters - 1u,
+                     paragraphs);
 
   // 3) Call the LogicalModel::CreateParagraphInfo() method
-  logicalModel->CreateParagraphInfo( data.index,
-                                     data.numberOfCharacters );
+  logicalModel->CreateParagraphInfo(data.index,
+                                    data.numberOfCharacters);
 
   // 4) Compare the results.
-  if( data.numberOfParagraphs != paragraphs.Count() )
+  if(data.numberOfParagraphs != paragraphs.Count())
   {
     std::cout << "  Different number of paragraphs : " << paragraphs.Count() << ", expected : " << data.numberOfParagraphs << std::endl;
     return false;
   }
 
   unsigned int index = 0u;
-  for( Vector<ParagraphRun>::ConstIterator it = paragraphs.Begin(),
-         endIt = paragraphs.End();
-       it != endIt;
-       ++it, ++index )
+  for(Vector<ParagraphRun>::ConstIterator it    = paragraphs.Begin(),
+                                          endIt = paragraphs.End();
+      it != endIt;
+      ++it, ++index)
   {
-    const ParagraphRun& paragraph( *it );
+    const ParagraphRun& paragraph(*it);
 
-    if( data.indices[index] != paragraph.characterRun.characterIndex )
+    if(data.indices[index] != paragraph.characterRun.characterIndex)
     {
       std::cout << "  Different character index for paragraph : " << index << ", " << paragraph.characterRun.characterIndex << ", expected : " << data.indices[index] << std::endl;
       return false;
     }
-    if( data.numberOfCharactersPerParagraph[index] != paragraph.characterRun.numberOfCharacters )
+    if(data.numberOfCharactersPerParagraph[index] != paragraph.characterRun.numberOfCharacters)
     {
       std::cout << "  Different number of characters for paragraph : " << index << ", " << paragraph.characterRun.numberOfCharacters << ", expected : " << data.numberOfCharactersPerParagraph[index] << std::endl;
       return false;
@@ -166,50 +168,53 @@ bool CreateParagraphTest( const CreateParagraphData& data )
   return true;
 }
 
-bool FindParagraphTest( const FindParagraphData& data )
+bool FindParagraphTest(const FindParagraphData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   // 2) Find the paragraphs.
   Vector<ParagraphRunIndex> paragraphs;
-  logicalModel->FindParagraphs( data.index, data.numberOfCharacters, paragraphs );
+  logicalModel->FindParagraphs(data.index, data.numberOfCharacters, paragraphs);
 
   // 3) compare the results.
-  if( data.numberOfParagraphs != paragraphs.Count() )
+  if(data.numberOfParagraphs != paragraphs.Count())
   {
     return false;
   }
 
   unsigned int index = 0u;
-  for( Vector<ParagraphRunIndex>::ConstIterator it = paragraphs.Begin(),
-         endIt = paragraphs.End();
-       it != endIt;
-       ++it, ++index )
+  for(Vector<ParagraphRunIndex>::ConstIterator it    = paragraphs.Begin(),
+                                               endIt = paragraphs.End();
+      it != endIt;
+      ++it, ++index)
   {
     const ParagraphRunIndex paragraphIndex = *it;
 
-    if( paragraphIndex != data.paragraphs[index] )
+    if(paragraphIndex != data.paragraphs[index])
     {
       return false;
     }
@@ -218,46 +223,49 @@ bool FindParagraphTest( const FindParagraphData& data )
   return true;
 }
 
-bool FetchBidirectionalLineInfoTest( const FetchBidirectionalLineInfoData& data )
+bool FetchBidirectionalLineInfoTest(const FetchBidirectionalLineInfoData& data)
 {
   std::cout << "  testing : " << data.description << std::endl;
   // Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea( 100.f, 300.f );
-  Size layoutSize;
+  Size       textArea(100.f, 300.f);
+  Size       layoutSize;
 
   // Create the model with the whole text.
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  for( unsigned int index = 0; index < data.numberOfTests; ++index )
+  for(unsigned int index = 0; index < data.numberOfTests; ++index)
   {
-    const bool fetched = logicalModel->FetchBidirectionalLineInfo( data.characterIndex[index] );
+    const bool fetched = logicalModel->FetchBidirectionalLineInfo(data.characterIndex[index]);
 
-    if( fetched != data.fetched[index] )
+    if(fetched != data.fetched[index])
     {
       std::cout << "  Different fetched result : " << fetched << ", expected : " << data.fetched[index] << std::endl;
       return false;
     }
 
-    if( fetched )
+    if(fetched)
     {
-      if( logicalModel->mBidirectionalLineIndex != data.bidiLineIndex[index] )
+      if(logicalModel->mBidirectionalLineIndex != data.bidiLineIndex[index])
       {
         std::cout << "  Different bidi line index : " << logicalModel->mBidirectionalLineIndex << ", expected : " << data.bidiLineIndex << std::endl;
         return false;
@@ -268,45 +276,48 @@ bool FetchBidirectionalLineInfoTest( const FetchBidirectionalLineInfoData& data
   return true;
 }
 
-bool GetLogicalCharacterIndexTest( const GetLogicalCharacterIndexData& data )
+bool GetLogicalCharacterIndexTest(const GetLogicalCharacterIndexData& data)
 {
   std::cout << "  testing : " << data.description << std::endl;
   // Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size layoutSize;
+  Size       layoutSize;
 
   // Create the model with the whole text.
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-  CreateTextModel( data.text,
-                   data.textArea,
-                   fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+  CreateTextModel(data.text,
+                  data.textArea,
+                  fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
+  for(unsigned int index = 0u; index < data.numberOfIndices; ++index)
   {
     // Check the current cached bidi line index. (Check it before call the GetLogicalCharacterIndex() method )
-    if( data.cachedBidiLine[index] != logicalModel->mBidirectionalLineIndex )
+    if(data.cachedBidiLine[index] != logicalModel->mBidirectionalLineIndex)
     {
       std::cout << "  index : " << index << ", different cached bidi index : " << logicalModel->mBidirectionalLineIndex << ", expected : " << data.cachedBidiLine[index] << std::endl;
       return false;
     }
 
-    const bool fetched = logicalModel->FetchBidirectionalLineInfo( index );
-    const Character logicalIndex = fetched ? logicalModel->GetLogicalCharacterIndex( index ) : index;
+    const bool      fetched      = logicalModel->FetchBidirectionalLineInfo(index);
+    const Character logicalIndex = fetched ? logicalModel->GetLogicalCharacterIndex(index) : index;
 
-    if( data.visualToLogical[index] != logicalIndex )
+    if(data.visualToLogical[index] != logicalIndex)
     {
       std::cout << "  visual index : " << index << ", different logical index : " << logicalIndex << ", expected : " << data.visualToLogical[index] << std::endl;
       return false;
@@ -315,69 +326,72 @@ bool GetLogicalCharacterIndexTest( const GetLogicalCharacterIndexData& data )
   return true;
 }
 
-bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data )
+bool GetLogicalCursorIndexTest(const GetLogicalCursorIndexData& data)
 {
-  tet_printf( "  testing : %s\n", data.description.c_str() );
+  tet_printf("  testing : %s\n", data.description.c_str());
 
   // Load some fonts.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf");
 
   // Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size layoutSize;
+  Size       layoutSize;
 
   // Create the model with the whole text.
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  if( 0u != data.numberOfFonts )
+  if(0u != data.numberOfFonts)
   {
-    fontDescriptionRuns.Insert( fontDescriptionRuns.End(),
-                                data.fontDescriptions,
-                                data.fontDescriptions + data.numberOfFonts );
+    fontDescriptionRuns.Insert(fontDescriptionRuns.End(),
+                               data.fontDescriptions,
+                               data.fontDescriptions + data.numberOfFonts);
   }
 
   const LayoutOptions options;
-  CreateTextModel( data.text,
-                   data.textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  CreateTextModel(data.text,
+                  data.textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
+  for(unsigned int index = 0u; index < data.numberOfIndices; ++index)
   {
-    const bool fetched = logicalModel->FetchBidirectionalLineInfo( data.characterIndex[index] );
-    tet_printf("  fetched %d, line index %d, expected line index %d\n", fetched, logicalModel->mBidirectionalLineIndex, data.cachedBidiLine[index] );
+    const bool fetched = logicalModel->FetchBidirectionalLineInfo(data.characterIndex[index]);
+    tet_printf("  fetched %d, line index %d, expected line index %d\n", fetched, logicalModel->mBidirectionalLineIndex, data.cachedBidiLine[index]);
 
-    if( logicalModel->mBidirectionalLineIndex != data.cachedBidiLine[index] )
+    if(logicalModel->mBidirectionalLineIndex != data.cachedBidiLine[index])
     {
-      tet_printf( "  test : %d, different cached line index : %d, expected : %d\n", index, logicalModel->mBidirectionalLineIndex, data.cachedBidiLine[index] );
+      tet_printf("  test : %d, different cached line index : %d, expected : %d\n", index, logicalModel->mBidirectionalLineIndex, data.cachedBidiLine[index]);
       return false;
     }
 
     const CharacterIndex visualCharacterIndex = data.visualCursorIndex[index];
-    const CharacterIndex logicalCursorIndex = fetched ? logicalModel->GetLogicalCursorIndex( visualCharacterIndex ) : visualCharacterIndex;
+    const CharacterIndex logicalCursorIndex   = fetched ? logicalModel->GetLogicalCursorIndex(visualCharacterIndex) : visualCharacterIndex;
     tet_printf("  visual index %d, logical index %d\n", visualCharacterIndex, logicalCursorIndex);
 
-    if( logicalCursorIndex != data.logicalCursorIndex[index] )
+    if(logicalCursorIndex != data.logicalCursorIndex[index])
     {
-      tet_printf( "  test : %d, visual index : %d, different logical cursor index :%d, expected : %d\n", index, visualCharacterIndex, logicalCursorIndex, data.logicalCursorIndex[index] );
+      tet_printf("  test : %d, visual index : %d, different logical cursor index :%d, expected : %d\n", index, visualCharacterIndex, logicalCursorIndex, data.logicalCursorIndex[index]);
       return false;
     }
   }
@@ -401,67 +415,67 @@ int UtcDaliCreateParagraph(void)
 {
   tet_infoline(" UtcDaliCreateParagraph");
 
-  unsigned int paragraphsIndices01[] = { 0u };
-  unsigned int paragraphsNumberOfCharacters01[] = { 0u };
-  unsigned int paragraphsIndices02[] = { 0u, 12u, 17u };
-  unsigned int paragraphsNumberOfCharacters02[] = { 12u, 5u, 1u };
-  unsigned int paragraphsIndices03[] = { 0u, 12u, 17u, 34u };
-  unsigned int paragraphsNumberOfCharacters03[] = { 12u, 5u, 17u ,1u };
+  unsigned int paragraphsIndices01[]            = {0u};
+  unsigned int paragraphsNumberOfCharacters01[] = {0u};
+  unsigned int paragraphsIndices02[]            = {0u, 12u, 17u};
+  unsigned int paragraphsNumberOfCharacters02[] = {12u, 5u, 1u};
+  unsigned int paragraphsIndices03[]            = {0u, 12u, 17u, 34u};
+  unsigned int paragraphsNumberOfCharacters03[] = {12u, 5u, 17u, 1u};
 
   struct CreateParagraphData data[] =
-  {
-    {
-      "Zero characters",
-      "",
-      0u,
-      0u,
-      0u,
-      paragraphsIndices01,
-      paragraphsNumberOfCharacters01,
-    },
     {
-      "Some paragraphs",
-      "Hello world\ndemo\n\n",
-      0u,
-      18u,
-      3u,
-      paragraphsIndices02,
-      paragraphsNumberOfCharacters02,
-    },
-    {
-      "Some paragraphs. Update the initial paragraphs.",
-      "Hello world\ndemo\nhello world demo\n\n",
-      0u,
-      17u,
-      4u,
-      paragraphsIndices03,
-      paragraphsNumberOfCharacters03,
-    },
-    {
-      "Some paragraphs. Update the mid paragraphs.",
-      "Hello world\ndemo\nhello world demo\n\n",
-      12u,
-      5u,
-      4u,
-      paragraphsIndices03,
-      paragraphsNumberOfCharacters03,
-    },
-    {
-      "Some paragraphs. Update the final paragraphs.",
-      "Hello world\ndemo\nhello world demo\n\n",
-      17u,
-      18u,
-      4u,
-      paragraphsIndices03,
-      paragraphsNumberOfCharacters03,
-    },
-  };
+      {
+        "Zero characters",
+        "",
+        0u,
+        0u,
+        0u,
+        paragraphsIndices01,
+        paragraphsNumberOfCharacters01,
+      },
+      {
+        "Some paragraphs",
+        "Hello world\ndemo\n\n",
+        0u,
+        18u,
+        3u,
+        paragraphsIndices02,
+        paragraphsNumberOfCharacters02,
+      },
+      {
+        "Some paragraphs. Update the initial paragraphs.",
+        "Hello world\ndemo\nhello world demo\n\n",
+        0u,
+        17u,
+        4u,
+        paragraphsIndices03,
+        paragraphsNumberOfCharacters03,
+      },
+      {
+        "Some paragraphs. Update the mid paragraphs.",
+        "Hello world\ndemo\nhello world demo\n\n",
+        12u,
+        5u,
+        4u,
+        paragraphsIndices03,
+        paragraphsNumberOfCharacters03,
+      },
+      {
+        "Some paragraphs. Update the final paragraphs.",
+        "Hello world\ndemo\nhello world demo\n\n",
+        17u,
+        18u,
+        4u,
+        paragraphsIndices03,
+        paragraphsNumberOfCharacters03,
+      },
+    };
   const unsigned int numberOfTests = 5u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !CreateParagraphTest( data[index] ) )
+    if(!CreateParagraphTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -476,60 +490,52 @@ int UtcDaliFindParagraph(void)
   tet_infoline(" UtcDaliFindParagraph");
 
   unsigned int paragraphs01[] = {};
-  unsigned int paragraphs02[] = { 0u, 1u, 2u };
-  unsigned int paragraphs03[] = { 0u };
-  unsigned int paragraphs04[] = { 1u };
-  unsigned int paragraphs05[] = { 0u, 1u, 2u };
+  unsigned int paragraphs02[] = {0u, 1u, 2u};
+  unsigned int paragraphs03[] = {0u};
+  unsigned int paragraphs04[] = {1u};
+  unsigned int paragraphs05[] = {0u, 1u, 2u};
 
   struct FindParagraphData data[] =
-  {
-    {
-      "Zero characters",
-      "",
-      0u,
-      100u,
-      0u,
-      paragraphs01,
-    },
-    {
-      "Some paragraphs",
-      "Hello world\ndemo\n\n",
-      0u,
-      18u,
-      3u,
-      paragraphs02
-    },
     {
-      "Some paragraphs",
-      "Hello world\ndemo\n\n",
-      0u,
-      12u,
-      1u,
-      paragraphs03
-    },
-    {
-      "Some paragraphs",
-      "Hello world\ndemo\n\n",
-      12u,
-      5u,
-      1u,
-      paragraphs04
-    },
-    {
-      "Some paragraphs",
-      "Hello world\ndemo\n\n",
-      3u,
-      15u,
-      3u,
-      paragraphs05
-    },
-  };
+      {
+        "Zero characters",
+        "",
+        0u,
+        100u,
+        0u,
+        paragraphs01,
+      },
+      {"Some paragraphs",
+       "Hello world\ndemo\n\n",
+       0u,
+       18u,
+       3u,
+       paragraphs02},
+      {"Some paragraphs",
+       "Hello world\ndemo\n\n",
+       0u,
+       12u,
+       1u,
+       paragraphs03},
+      {"Some paragraphs",
+       "Hello world\ndemo\n\n",
+       12u,
+       5u,
+       1u,
+       paragraphs04},
+      {"Some paragraphs",
+       "Hello world\ndemo\n\n",
+       3u,
+       15u,
+       3u,
+       paragraphs05},
+    };
   const unsigned int numberOfTests = 5u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !FindParagraphTest( data[index] ) )
+    if(!FindParagraphTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -543,51 +549,44 @@ int UtcDaliFetchBidirectionalLineInfo(void)
 {
   tet_infoline(" UtcDaliFetchBidirectionalLineInfo");
 
-  unsigned int logicalIndex01[] = { 0u };
-  bool fetched01[] = { false };
-  unsigned int bidiLine01[] = { 0u };
+  unsigned int logicalIndex01[] = {0u};
+  bool         fetched01[]      = {false};
+  unsigned int bidiLine01[]     = {0u};
 
-  unsigned int logicalIndex02[] = { 3u };
-  bool fetched02[] = { false };
-  unsigned int bidiLine02[] = { 0u };
+  unsigned int logicalIndex02[] = {3u};
+  bool         fetched02[]      = {false};
+  unsigned int bidiLine02[]     = {0u};
 
-  unsigned int logicalIndex03[] = { 0u, 11u, 12u, 21u, 22u, 33u, 34u, 43u, 44u, 54u};
-  bool fetched03[] = { false, false, true, true, false, false, true, true, false, false };
-  unsigned int bidiLine03[] = { 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 0u, 0u };
+  unsigned int logicalIndex03[] = {0u, 11u, 12u, 21u, 22u, 33u, 34u, 43u, 44u, 54u};
+  bool         fetched03[]      = {false, false, true, true, false, false, true, true, false, false};
+  unsigned int bidiLine03[]     = {0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 0u, 0u};
 
   struct FetchBidirectionalLineInfoData data[] =
-  {
-    {
-      "Void text",
-      "",
-      1u,
-      logicalIndex01,
-      fetched01,
-      bidiLine01
-    },
     {
-      "LTR text",
-      "Hello world",
-      1u,
-      logicalIndex02,
-      fetched02,
-      bidiLine02
-    },
-    {
-      "Bidi text",
-      "Hello world\nשלום עולם\nhello world\nשלום עולם\nhello world",
-      10u,
-      logicalIndex03,
-      fetched03,
-      bidiLine03
-    }
-  };
+      {"Void text",
+       "",
+       1u,
+       logicalIndex01,
+       fetched01,
+       bidiLine01},
+      {"LTR text",
+       "Hello world",
+       1u,
+       logicalIndex02,
+       fetched02,
+       bidiLine02},
+      {"Bidi text",
+       "Hello world\nשלום עולם\nhello world\nשלום עולם\nhello world",
+       10u,
+       logicalIndex03,
+       fetched03,
+       bidiLine03}};
   const unsigned int numberOfTests = 3u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !FetchBidirectionalLineInfoTest( data[index] ) )
+    if(!FetchBidirectionalLineInfoTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -602,183 +601,159 @@ int UtcDaliGetLogicalCharacterIndex(void)
   tet_infoline(" UtcDaliSetVisualToLogicalMap");
 
   unsigned int visualToLogical01[] = {};
-  unsigned int  cachedBidiLine01[] = {};
-  unsigned int visualToLogical02[] = { 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u };
-  unsigned int  cachedBidiLine02[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,  0u };
-  unsigned int visualToLogical03[] = { 12u, 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0u };
-  unsigned int  cachedBidiLine03[] = {  0u,  0u,  0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u };
-
-  unsigned int visualToLogical04[] = { 0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u, 11u, 12u, 25u, 24u, 23u, 22u, 21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 81u, 80u, 79u, 78u, 77u, 76u, 75u, 74u, 73u, 72u, 71u, 70u, 69u, 68u, 67u, 66u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u, 43u, 42u, 41u, 40u, 95u, 94u, 93u, 92u, 91u, 90u, 89u, 88u, 87u, 86u, 85u, 84u, 83u, 82u, 96u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, 104u, 105u, 106u };
-  unsigned int  cachedBidiLine04[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                       0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                       1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u };
-
-// size 300, 300
-// LO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,   _  h  e  l  l  o  _  w  o  r  l  d \n
-//      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
-// VO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ل  ا  ع   ل  ا  ب  _  ا   ب  ح  ر  م  ,   _  h  e  l  l  o  _  w  o  r  l  d \n
-//      0  1  2  3  4  5  6  7  8  9 10 11 12 25 24 23 22 21 20 19 18 17 16 15 14 13 26 27 28 29 30 31 32 33 34 35 36 37 38 39
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,  _  h  e  l  l  o  _  w  o  r  l  d   ,  _  م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
-//     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
-// VO  \n  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م  _  ,  h  e  l  l  o  _  w  o  r  l  d   _  ,  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
-//     81 80 79 78 77 76 75 74 73 72 71 70 69 68 67 66 55 56 57 58 59 60 61 62 63 64 65 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
-//     82 83 84 85 86 87 88 89 90 91 92 93 94 95
-// VO  \n  م  ل  ا  ع  ل   ا  ب  _  ا   ب  ح  ر  م
-//     95 94 93 92 91 90 89 88 87 86 85 84 83 82
-
-
-// LO   h   e   l   l   o   _   w   o   r   l   d
-//     96  97  98  99 100 101 102 103 104 105 106
-// VO   h   e   l   l   o   _   w   o   r   l   d
-//     96  97  98  99 100 101 102 103 104 105 106
-
-  unsigned int visualToLogical05[] = { 0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u, 11u, 12u, 25u, 24u, 23u, 22u, 21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 67u, 66u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u, 43u, 42u, 41u, 40u, 81u, 80u, 79u, 78u, 77u, 76u, 75u, 74u, 73u, 72u, 71u, 70u, 69u, 68u, 95u, 94u, 93u, 92u, 91u, 90u, 89u, 88u, 87u, 86u, 85u, 84u, 83u, 82u, 96u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, 104u, 105u, 106u };
-  unsigned int  cachedBidiLine05[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u };
-
-// size 300, 300
-// LO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,   _
-//      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
-// VO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ل  ا  ع   ل  ا  ب  _  ا   ب  ح  ر  م  ,   _
-//      0  1  2  3  4  5  6  7  8  9 10 11 12 25 24 23 22 21 20 19 18 17 16 15 14 13 26 27
-
-// LO    h  e  l  l  o  _  w  o  r  l  d \n
-//      28 29 30 31 32 33 34 35 36 37 38 39
-// VO    h  e  l  l  o  _  w  o  r  l  d \n
-//      28 29 30 31 32 33 34 35 36 37 38 39
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,  _  h  e  l  l  o  _  w  o  r  l  d   ,  _
-//     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
-// VO  _  ,  h  e  l  l  o  _  w  o  r  l  d   _  ,  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
-//     67 66 55 56 57 58 59 60 61 62 63 64 65 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
-//     68 69 70 71 72 73 74 75 76 77 78 79 80 81
-// VO  \n  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
-//     81 80 79 78 77 76 75 74 73 72 71 70 69 68
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
-//     82 83 84 85 86 87 88 89 90 91 92 93 94 95
-// VO  \n  م  ل  ا  ع  ل   ا  ب  _  ا   ب  ح  ر  م
-//     95 94 93 92 91 90 89 88 87 86 85 84 83 82
-
-
-// LO   h   e   l   l   o   _   w   o   r   l   d
-//     96  97  98  99 100 101 102 103 104 105 106
-// VO   h   e   l   l   o   _   w   o   r   l   d
-//     96  97  98  99 100 101 102 103 104 105 106
-
-  unsigned int visualToLogical06[] = { 0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u, 11u, 12u, 25u, 24u, 23u, 22u, 21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u, 43u, 42u, 41u, 40u, 67u, 66u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 81u, 80u, 79u, 78u, 77u, 76u, 75u, 74u, 73u, 72u, 71u, 70u, 69u, 68u, 95u, 94u, 93u, 92u, 91u, 90u, 89u, 88u, 87u, 86u, 85u, 84u, 83u, 82u, 96u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, 104u, 105u, 106u };
-  unsigned int  cachedBidiLine06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                       0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                       1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u,
-                                       2u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u,
-                                       3u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u,
-                                       4u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u,
-                                       5u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u,
-                                       6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u };
-
-// size 100, 600
-// LO   H  e  l  l  o  _  w  o  r  l  d  ,  _
-//      0  1  2  3  4  5  6  7  8  9 10 11 12
-// VO   H  e  l  l  o  _  w  o  r  l  d  ,  _
-//      0  1  2  3  4  5  6  7  8  9 10 11 12
-
-// LO    م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,   _
-//      13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
-// VO    م  ل  ا  ع   ل  ا  ب  _  ا   ب  ح  ر  م  ,   _
-//      25 24 23 22 21 20 19 18 17 16 15 14 13 26 27
-
-// LO    h  e  l  l  o  _  w  o  r  l  d \n
-//      28 29 30 31 32 33 34 35 36 37 38 39
-// VO    h  e  l  l  o  _  w  o  r  l  d \n
-//      28 29 30 31 32 33 34 35 36 37 38 39
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,  _
-//     40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
-// VO   _  ,  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
-//     54 53 52 51 50 49 48 47 46 45 44 43 42 41 40
-
-// LO   h  e  l  l  o  _  w  o  r  l  d   ,  _
-//     55 56 57 58 59 60 61 62 63 64 65 66 67
-// VO   _  ,  h  e  l  l  o  _  w  o  r  l  d
-//     67 66 55 56 57 58 59 60 61 62 63 64 65
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
-//     68 69 70 71 72 73 74 75 76 77 78 79 80 81
-// VO  \n  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
-//     81 80 79 78 77 76 75 74 73 72 71 70 69 68
-
-// LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
-//     82 83 84 85 86 87 88 89 90 91 92 93 94 95
-// VO  \n  م  ل  ا  ع  ل   ا  ب  _  ا   ب  ح  ر  م
-//     95 94 93 92 91 90 89 88 87 86 85 84 83 82
-
-
-// LO   h   e   l   l   o   _   w   o   r   l   d
-//     96  97  98  99 100 101 102 103 104 105 106
-// VO   h   e   l   l   o   _   w   o   r   l   d
-//     96  97  98  99 100 101 102 103 104 105 106
+  unsigned int cachedBidiLine01[]  = {};
+  unsigned int visualToLogical02[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u};
+  unsigned int cachedBidiLine02[]  = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u};
+  unsigned int visualToLogical03[] = {12u, 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0u};
+  unsigned int cachedBidiLine03[]  = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u};
+
+  unsigned int visualToLogical04[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 25u, 24u, 23u, 22u, 21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 81u, 80u, 79u, 78u, 77u, 76u, 75u, 74u, 73u, 72u, 71u, 70u, 69u, 68u, 67u, 66u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u, 43u, 42u, 41u, 40u, 95u, 94u, 93u, 92u, 91u, 90u, 89u, 88u, 87u, 86u, 85u, 84u, 83u, 82u, 96u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, 104u, 105u, 106u};
+  unsigned int cachedBidiLine04[]  = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u};
+
+  // size 300, 300
+  // LO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,   _  h  e  l  l  o  _  w  o  r  l  d \n
+  //      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
+  // VO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ل  ا  ع   ل  ا  ب  _  ا   ب  ح  ر  م  ,   _  h  e  l  l  o  _  w  o  r  l  d \n
+  //      0  1  2  3  4  5  6  7  8  9 10 11 12 25 24 23 22 21 20 19 18 17 16 15 14 13 26 27 28 29 30 31 32 33 34 35 36 37 38 39
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,  _  h  e  l  l  o  _  w  o  r  l  d   ,  _  م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
+  //     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
+  // VO  \n  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م  _  ,  h  e  l  l  o  _  w  o  r  l  d   _  ,  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
+  //     81 80 79 78 77 76 75 74 73 72 71 70 69 68 67 66 55 56 57 58 59 60 61 62 63 64 65 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
+  //     82 83 84 85 86 87 88 89 90 91 92 93 94 95
+  // VO  \n  م  ل  ا  ع  ل   ا  ب  _  ا   ب  ح  ر  م
+  //     95 94 93 92 91 90 89 88 87 86 85 84 83 82
+
+  // LO   h   e   l   l   o   _   w   o   r   l   d
+  //     96  97  98  99 100 101 102 103 104 105 106
+  // VO   h   e   l   l   o   _   w   o   r   l   d
+  //     96  97  98  99 100 101 102 103 104 105 106
+
+  unsigned int visualToLogical05[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 25u, 24u, 23u, 22u, 21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 67u, 66u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u, 43u, 42u, 41u, 40u, 81u, 80u, 79u, 78u, 77u, 76u, 75u, 74u, 73u, 72u, 71u, 70u, 69u, 68u, 95u, 94u, 93u, 92u, 91u, 90u, 89u, 88u, 87u, 86u, 85u, 84u, 83u, 82u, 96u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, 104u, 105u, 106u};
+  unsigned int cachedBidiLine05[]  = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u};
+
+  // size 300, 300
+  // LO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,   _
+  //      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
+  // VO   H  e  l  l  o  _  w  o  r  l  d  ,  _  م  ل  ا  ع   ل  ا  ب  _  ا   ب  ح  ر  م  ,   _
+  //      0  1  2  3  4  5  6  7  8  9 10 11 12 25 24 23 22 21 20 19 18 17 16 15 14 13 26 27
+
+  // LO    h  e  l  l  o  _  w  o  r  l  d \n
+  //      28 29 30 31 32 33 34 35 36 37 38 39
+  // VO    h  e  l  l  o  _  w  o  r  l  d \n
+  //      28 29 30 31 32 33 34 35 36 37 38 39
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,  _  h  e  l  l  o  _  w  o  r  l  d   ,  _
+  //     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
+  // VO  _  ,  h  e  l  l  o  _  w  o  r  l  d   _  ,  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
+  //     67 66 55 56 57 58 59 60 61 62 63 64 65 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
+  //     68 69 70 71 72 73 74 75 76 77 78 79 80 81
+  // VO  \n  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
+  //     81 80 79 78 77 76 75 74 73 72 71 70 69 68
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
+  //     82 83 84 85 86 87 88 89 90 91 92 93 94 95
+  // VO  \n  م  ل  ا  ع  ل   ا  ب  _  ا   ب  ح  ر  م
+  //     95 94 93 92 91 90 89 88 87 86 85 84 83 82
+
+  // LO   h   e   l   l   o   _   w   o   r   l   d
+  //     96  97  98  99 100 101 102 103 104 105 106
+  // VO   h   e   l   l   o   _   w   o   r   l   d
+  //     96  97  98  99 100 101 102 103 104 105 106
+
+  unsigned int visualToLogical06[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 25u, 24u, 23u, 22u, 21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u, 43u, 42u, 41u, 40u, 67u, 66u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 81u, 80u, 79u, 78u, 77u, 76u, 75u, 74u, 73u, 72u, 71u, 70u, 69u, 68u, 95u, 94u, 93u, 92u, 91u, 90u, 89u, 88u, 87u, 86u, 85u, 84u, 83u, 82u, 96u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, 104u, 105u, 106u};
+  unsigned int cachedBidiLine06[]  = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 3u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 4u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 5u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u, 6u};
+
+  // size 100, 600
+  // LO   H  e  l  l  o  _  w  o  r  l  d  ,  _
+  //      0  1  2  3  4  5  6  7  8  9 10 11 12
+  // VO   H  e  l  l  o  _  w  o  r  l  d  ,  _
+  //      0  1  2  3  4  5  6  7  8  9 10 11 12
+
+  // LO    م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,   _
+  //      13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
+  // VO    م  ل  ا  ع   ل  ا  ب  _  ا   ب  ح  ر  م  ,   _
+  //      25 24 23 22 21 20 19 18 17 16 15 14 13 26 27
+
+  // LO    h  e  l  l  o  _  w  o  r  l  d \n
+  //      28 29 30 31 32 33 34 35 36 37 38 39
+  // VO    h  e  l  l  o  _  w  o  r  l  d \n
+  //      28 29 30 31 32 33 34 35 36 37 38 39
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  ,  _
+  //     40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
+  // VO   _  ,  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
+  //     54 53 52 51 50 49 48 47 46 45 44 43 42 41 40
+
+  // LO   h  e  l  l  o  _  w  o  r  l  d   ,  _
+  //     55 56 57 58 59 60 61 62 63 64 65 66 67
+  // VO   _  ,  h  e  l  l  o  _  w  o  r  l  d
+  //     67 66 55 56 57 58 59 60 61 62 63 64 65
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
+  //     68 69 70 71 72 73 74 75 76 77 78 79 80 81
+  // VO  \n  م  ل  ا   ع  ل  ا  ب  _  ا   ب  ح  ر  م
+  //     81 80 79 78 77 76 75 74 73 72 71 70 69 68
+
+  // LO   م  ر  ح  ب   ا  _  ب  ا  ل  ع   ا  ل  م  \n
+  //     82 83 84 85 86 87 88 89 90 91 92 93 94 95
+  // VO  \n  م  ل  ا  ع  ل   ا  ب  _  ا   ب  ح  ر  م
+  //     95 94 93 92 91 90 89 88 87 86 85 84 83 82
+
+  // LO   h   e   l   l   o   _   w   o   r   l   d
+  //     96  97  98  99 100 101 102 103 104 105 106
+  // VO   h   e   l   l   o   _   w   o   r   l   d
+  //     96  97  98  99 100 101 102 103 104 105 106
 
   struct GetLogicalCharacterIndexData data[] =
-  {
-    {
-      "Zero characters text",
-      "",
-      Size( 300.f, 300.f ),
-      0u,
-      visualToLogical01,
-      cachedBidiLine01
-    },
-    {
-      "Left to right text only",
-      "Hello world",
-      Size( 300.f, 300.f ),
-      11u,
-      visualToLogical02,
-      cachedBidiLine02
-    },
     {
-      "Right to left text only",
-      "مرحبا بالعالم",
-      Size( 300.f, 300.f ),
-      13u,
-      visualToLogical03,
-      cachedBidiLine03
-    },
-    {
-      "Mix of left to right and right to left text.",
-      "Hello world, مرحبا بالعالم, hello world\nمرحبا بالعالم, hello world, مرحبا بالعالم\nمرحبا بالعالم\nhello world",
-      Size( 300.f, 300.f ),
-      107u,
-      visualToLogical04,
-      cachedBidiLine04
-    },
-    {
-      "Mix of left to right and right to left text.",
-      "Hello world, مرحبا بالعالم, hello world\nمرحبا بالعالم, hello world, مرحبا بالعالم\nمرحبا بالعالم\nhello world",
-      Size( 200.f, 400.f ),
-      107u,
-      visualToLogical05,
-      cachedBidiLine05
-    },
-    {
-      "Mix of left to right and right to left text.",
-      "Hello world, مرحبا بالعالم, hello world\nمرحبا بالعالم, hello world, مرحبا بالعالم\nمرحبا بالعالم\nhello world",
-      Size( 100.f, 600.f ),
-      107u,
-      visualToLogical06,
-      cachedBidiLine06
-    },
-  };
+      {"Zero characters text",
+       "",
+       Size(300.f, 300.f),
+       0u,
+       visualToLogical01,
+       cachedBidiLine01},
+      {"Left to right text only",
+       "Hello world",
+       Size(300.f, 300.f),
+       11u,
+       visualToLogical02,
+       cachedBidiLine02},
+      {"Right to left text only",
+       "مرحبا بالعالم",
+       Size(300.f, 300.f),
+       13u,
+       visualToLogical03,
+       cachedBidiLine03},
+      {"Mix of left to right and right to left text.",
+       "Hello world, مرحبا بالعالم, hello world\nمرحبا بالعالم, hello world, مرحبا بالعالم\nمرحبا بالعالم\nhello world",
+       Size(300.f, 300.f),
+       107u,
+       visualToLogical04,
+       cachedBidiLine04},
+      {"Mix of left to right and right to left text.",
+       "Hello world, مرحبا بالعالم, hello world\nمرحبا بالعالم, hello world, مرحبا بالعالم\nمرحبا بالعالم\nhello world",
+       Size(200.f, 400.f),
+       107u,
+       visualToLogical05,
+       cachedBidiLine05},
+      {"Mix of left to right and right to left text.",
+       "Hello world, مرحبا بالعالم, hello world\nمرحبا بالعالم, hello world, مرحبا بالعالم\nمرحبا بالعالم\nhello world",
+       Size(100.f, 600.f),
+       107u,
+       visualToLogical06,
+       cachedBidiLine06},
+    };
   const unsigned int numberOfTests = 6u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !GetLogicalCharacterIndexTest( data[index] ) )
+    if(!GetLogicalCharacterIndexTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -792,15 +767,13 @@ int UtcDaliGetLogicalCursorIndex(void)
 {
   tet_infoline(" UtcDaliGetLogicalCursorIndex");
 
-  const std::string fontFamily( "TizenSans" );
-  const std::string fontFamilyHebrew( "TizenSansHebrew" );
+  const std::string fontFamily("TizenSans");
+  const std::string fontFamilyHebrew("TizenSansHebrew");
 
-
-
-  unsigned int visualIndex01[] = { 10u };
-  unsigned int characterIndex01[] = { 0u };
-  unsigned int logicalIndex01[] = { 10u };
-  unsigned int bidirectionalLineIndex01[] = { 0u };
+  unsigned int visualIndex01[]            = {10u};
+  unsigned int characterIndex01[]         = {0u};
+  unsigned int logicalIndex01[]           = {10u};
+  unsigned int bidirectionalLineIndex01[] = {0u};
 
   //  0           11
   //   Hello world  \n
@@ -809,390 +782,374 @@ int UtcDaliGetLogicalCursorIndex(void)
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 0u;
+  fontDescriptionRun02.characterRun.characterIndex     = 0u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 11u;
-  fontDescriptionRun02.familyLength = fontFamily.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontFamily.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns02;
-  fontDescriptionRuns02.PushBack( fontDescriptionRun02 );
+  fontDescriptionRuns02.PushBack(fontDescriptionRun02);
 
-  unsigned int visualIndex02[] = { 0u, 16u, 11u, 12u };
-  unsigned int characterIndex02[] = { 0u, 0u, 0u, 0u };
-  unsigned int logicalIndex02[] = { 0u, 16u, 11u, 12u };
-  unsigned int bidirectionalLineIndex02[] = { 0u, 0u, 0u, 0u };
+  unsigned int visualIndex02[]            = {0u, 16u, 11u, 12u};
+  unsigned int characterIndex02[]         = {0u, 0u, 0u, 0u};
+  unsigned int logicalIndex02[]           = {0u, 16u, 11u, 12u};
+  unsigned int bidirectionalLineIndex02[] = {0u, 0u, 0u, 0u};
 
-// LO     H  e  l  l  o  _  w  o  r  l  d  \n
-//       0  1  2  3  4  5  6  7  8  9 10 11  12
-// VO     H  e  l  l  o  _  w  o  r  l  d  \n
+  // LO     H  e  l  l  o  _  w  o  r  l  d  \n
+  //       0  1  2  3  4  5  6  7  8  9 10 11  12
+  // VO     H  e  l  l  o  _  w  o  r  l  d  \n
 
-// LO         ש  ל  ו  ם  _  ע  ו  ל  ם \n
-//          12 13 14 15 16 17 18 19 20 21  22
-// VO     \n  ם  ל  ו  ע _  ם  ו  ל  ש
+  // LO         ש  ל  ו  ם  _  ע  ו  ל  ם \n
+  //          12 13 14 15 16 17 18 19 20 21  22
+  // VO     \n  ם  ל  ו  ע _  ם  ו  ל  ש
 
-// LO      h  e  l  l  o  _  w  o  r  l  d  _  ש  ל  ו  ם  _  ע ו  ל  ם  \n
-//       22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43  44
-// VO      h  e  l  l  o  _  w  o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש  \n
-
-// LO      ש  ל  ו  ם  _  ע  ו  ל  ם  _  h  e  l  l  o  _  w  o  r   l  d \n
-//       44 45 46 47 48 49 50 51  52 52 54 55 56 57 58 59 60 61 62 63  64 65 66
-// VO      \n h  e  l  l  o  _  w   o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש
+  // LO      h  e  l  l  o  _  w  o  r  l  d  _  ש  ל  ו  ם  _  ע ו  ל  ם  \n
+  //       22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43  44
+  // VO      h  e  l  l  o  _  w  o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש  \n
 
+  // LO      ש  ל  ו  ם  _  ע  ו  ל  ם  _  h  e  l  l  o  _  w  o  r   l  d \n
+  //       44 45 46 47 48 49 50 51  52 52 54 55 56 57 58 59 60 61 62 63  64 65 66
+  // VO      \n h  e  l  l  o  _  w   o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0301;
-  fontDescriptionRun0301.characterRun.characterIndex = 0u;
+  fontDescriptionRun0301.characterRun.characterIndex     = 0u;
   fontDescriptionRun0301.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun0301.familyLength = fontFamily.size();
-  fontDescriptionRun0301.familyName = new char[fontDescriptionRun0301.familyLength];
-  memcpy( fontDescriptionRun0301.familyName, fontFamily.c_str(), fontDescriptionRun0301.familyLength );
+  fontDescriptionRun0301.familyLength                    = fontFamily.size();
+  fontDescriptionRun0301.familyName                      = new char[fontDescriptionRun0301.familyLength];
+  memcpy(fontDescriptionRun0301.familyName, fontFamily.c_str(), fontDescriptionRun0301.familyLength);
   fontDescriptionRun0301.familyDefined = true;
   fontDescriptionRun0301.weightDefined = false;
-  fontDescriptionRun0301.widthDefined = false;
-  fontDescriptionRun0301.slantDefined = false;
-  fontDescriptionRun0301.sizeDefined = false;
+  fontDescriptionRun0301.widthDefined  = false;
+  fontDescriptionRun0301.slantDefined  = false;
+  fontDescriptionRun0301.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0302;
-  fontDescriptionRun0302.characterRun.characterIndex = 12u;
+  fontDescriptionRun0302.characterRun.characterIndex     = 12u;
   fontDescriptionRun0302.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun0302.familyLength = fontFamilyHebrew.size();
-  fontDescriptionRun0302.familyName = new char[fontDescriptionRun0302.familyLength];
-  memcpy( fontDescriptionRun0302.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0302.familyLength );
+  fontDescriptionRun0302.familyLength                    = fontFamilyHebrew.size();
+  fontDescriptionRun0302.familyName                      = new char[fontDescriptionRun0302.familyLength];
+  memcpy(fontDescriptionRun0302.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0302.familyLength);
   fontDescriptionRun0302.familyDefined = true;
   fontDescriptionRun0302.weightDefined = false;
-  fontDescriptionRun0302.widthDefined = false;
-  fontDescriptionRun0302.slantDefined = false;
-  fontDescriptionRun0302.sizeDefined = false;
+  fontDescriptionRun0302.widthDefined  = false;
+  fontDescriptionRun0302.slantDefined  = false;
+  fontDescriptionRun0302.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0303;
-  fontDescriptionRun0303.characterRun.characterIndex = 22u;
+  fontDescriptionRun0303.characterRun.characterIndex     = 22u;
   fontDescriptionRun0303.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun0303.familyLength = fontFamily.size();
-  fontDescriptionRun0303.familyName = new char[fontDescriptionRun0303.familyLength];
-  memcpy( fontDescriptionRun0303.familyName, fontFamily.c_str(), fontDescriptionRun0303.familyLength );
+  fontDescriptionRun0303.familyLength                    = fontFamily.size();
+  fontDescriptionRun0303.familyName                      = new char[fontDescriptionRun0303.familyLength];
+  memcpy(fontDescriptionRun0303.familyName, fontFamily.c_str(), fontDescriptionRun0303.familyLength);
   fontDescriptionRun0303.familyDefined = true;
   fontDescriptionRun0303.weightDefined = false;
-  fontDescriptionRun0303.widthDefined = false;
-  fontDescriptionRun0303.slantDefined = false;
-  fontDescriptionRun0303.sizeDefined = false;
+  fontDescriptionRun0303.widthDefined  = false;
+  fontDescriptionRun0303.slantDefined  = false;
+  fontDescriptionRun0303.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0304;
-  fontDescriptionRun0304.characterRun.characterIndex = 34u;
+  fontDescriptionRun0304.characterRun.characterIndex     = 34u;
   fontDescriptionRun0304.characterRun.numberOfCharacters = 20u;
-  fontDescriptionRun0304.familyLength = fontFamilyHebrew.size();
-  fontDescriptionRun0304.familyName = new char[fontDescriptionRun0304.familyLength];
-  memcpy( fontDescriptionRun0304.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0304.familyLength );
+  fontDescriptionRun0304.familyLength                    = fontFamilyHebrew.size();
+  fontDescriptionRun0304.familyName                      = new char[fontDescriptionRun0304.familyLength];
+  memcpy(fontDescriptionRun0304.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0304.familyLength);
   fontDescriptionRun0304.familyDefined = true;
   fontDescriptionRun0304.weightDefined = false;
-  fontDescriptionRun0304.widthDefined = false;
-  fontDescriptionRun0304.slantDefined = false;
-  fontDescriptionRun0304.sizeDefined = false;
+  fontDescriptionRun0304.widthDefined  = false;
+  fontDescriptionRun0304.slantDefined  = false;
+  fontDescriptionRun0304.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0305;
-  fontDescriptionRun0305.characterRun.characterIndex = 54u;
+  fontDescriptionRun0305.characterRun.characterIndex     = 54u;
   fontDescriptionRun0305.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun0305.familyLength = fontFamily.size();
-  fontDescriptionRun0305.familyName = new char[fontDescriptionRun0305.familyLength];
-  memcpy( fontDescriptionRun0305.familyName, fontFamily.c_str(), fontDescriptionRun0305.familyLength );
+  fontDescriptionRun0305.familyLength                    = fontFamily.size();
+  fontDescriptionRun0305.familyName                      = new char[fontDescriptionRun0305.familyLength];
+  memcpy(fontDescriptionRun0305.familyName, fontFamily.c_str(), fontDescriptionRun0305.familyLength);
   fontDescriptionRun0305.familyDefined = true;
   fontDescriptionRun0305.weightDefined = false;
-  fontDescriptionRun0305.widthDefined = false;
-  fontDescriptionRun0305.slantDefined = false;
-  fontDescriptionRun0305.sizeDefined = false;
+  fontDescriptionRun0305.widthDefined  = false;
+  fontDescriptionRun0305.slantDefined  = false;
+  fontDescriptionRun0305.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns03;
-  fontDescriptionRuns03.PushBack( fontDescriptionRun0301 );
-  fontDescriptionRuns03.PushBack( fontDescriptionRun0302 );
-  fontDescriptionRuns03.PushBack( fontDescriptionRun0303 );
-  fontDescriptionRuns03.PushBack( fontDescriptionRun0304 );
-  fontDescriptionRuns03.PushBack( fontDescriptionRun0305 );
-
-  unsigned int visualIndex03[] = {  0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u, 11u,
-                                   13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u, 22u,
-                                   22u, 23u, 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 40u, 41u, 42u, 43u,
-                                   45u, 46u, 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 66u };
+  fontDescriptionRuns03.PushBack(fontDescriptionRun0301);
+  fontDescriptionRuns03.PushBack(fontDescriptionRun0302);
+  fontDescriptionRuns03.PushBack(fontDescriptionRun0303);
+  fontDescriptionRuns03.PushBack(fontDescriptionRun0304);
+  fontDescriptionRuns03.PushBack(fontDescriptionRun0305);
 
-  unsigned int characterIndex03[] = {  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,
-                                      12u, 12u, 12u, 12u, 12u, 12u, 12u, 12u, 12u, 12u,
-                                      22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u,
-                                      44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u};
+  unsigned int visualIndex03[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u, 22u, 22u, 23u, 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 40u, 41u, 42u, 43u, 45u, 46u, 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 66u};
 
-  unsigned int logicalIndex03[] = {  0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u, 11u,
-                                    21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 12u,
-                                    22u, 23u, 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 42u, 41u, 40u, 39u, 38u, 37u, 36u, 35u, 43u,
-                                    65u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u };
+  unsigned int characterIndex03[] = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 12u, 12u, 12u, 12u, 12u, 12u, 12u, 12u, 12u, 12u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u};
 
-  unsigned int bidirectionalLineIndex03[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                              0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                              1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                              2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u };
+  unsigned int logicalIndex03[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 21u, 20u, 19u, 18u, 17u, 16u, 15u, 14u, 13u, 12u, 22u, 23u, 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 42u, 41u, 40u, 39u, 38u, 37u, 36u, 35u, 43u, 65u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 54u, 53u, 52u, 51u, 50u, 49u, 48u, 47u, 46u, 45u, 44u};
 
+  unsigned int bidirectionalLineIndex03[] = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u};
 
-// LO     ש  ל  ו  ם  _  ע  ו  ל  ם \n
-//       0  1  2  3  4  5  6  7  8  9 10
-// VO  \n ם  ל  ו  ע  _  ם  ו  ל  ש
+  // LO     ש  ל  ו  ם  _  ע  ו  ל  ם \n
+  //       0  1  2  3  4  5  6  7  8  9 10
+  // VO  \n ם  ל  ו  ע  _  ם  ו  ל  ש
 
-//      h  e  l  l  o  _  w  o  r  l  d  \n
-// LO 10 11 12 13 14 15 16 17 18 19 20 21 22
-//      h  e  l  l  o  _  w  o  r  l  d  \n
+  //      h  e  l  l  o  _  w  o  r  l  d  \n
+  // LO 10 11 12 13 14 15 16 17 18 19 20 21 22
+  //      h  e  l  l  o  _  w  o  r  l  d  \n
 
-//         ש  ל  ו  ם  _  ע  ו  ל  ם _  h  e  l  l  o  _  w  o  r  l  d  \n
-// LO    22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
-//     \n  h  e  l  l  o  _  w  o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש
+  //         ש  ל  ו  ם  _  ע  ו  ל  ם _  h  e  l  l  o  _  w  o  r  l  d  \n
+  // LO    22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
+  //     \n  h  e  l  l  o  _  w  o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש
 
-//      h  e  l  l  o  _  w  o  r  l  d  _  ש  ל  ו  ם  _  ע  ו  ל  ם \n
-// LO 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
-//      h  e  l  l  o  _  w  o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש \n
+  //      h  e  l  l  o  _  w  o  r  l  d  _  ש  ל  ו  ם  _  ע  ו  ל  ם \n
+  // LO 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
+  //      h  e  l  l  o  _  w  o  r  l  d  _  ם  ל  ו  ע  _  ם  ו  ל  ש \n
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0401;
-  fontDescriptionRun0401.characterRun.characterIndex = 0u;
+  fontDescriptionRun0401.characterRun.characterIndex     = 0u;
   fontDescriptionRun0401.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun0401.familyLength = fontFamilyHebrew.size();
-  fontDescriptionRun0401.familyName = new char[fontDescriptionRun0401.familyLength];
-  memcpy( fontDescriptionRun0401.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0401.familyLength );
+  fontDescriptionRun0401.familyLength                    = fontFamilyHebrew.size();
+  fontDescriptionRun0401.familyName                      = new char[fontDescriptionRun0401.familyLength];
+  memcpy(fontDescriptionRun0401.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0401.familyLength);
   fontDescriptionRun0401.familyDefined = true;
   fontDescriptionRun0401.weightDefined = false;
-  fontDescriptionRun0401.widthDefined = false;
-  fontDescriptionRun0401.slantDefined = false;
-  fontDescriptionRun0401.sizeDefined = false;
+  fontDescriptionRun0401.widthDefined  = false;
+  fontDescriptionRun0401.slantDefined  = false;
+  fontDescriptionRun0401.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun0402;
-  fontDescriptionRun0402.characterRun.characterIndex = 10u;
+  fontDescriptionRun0402.characterRun.characterIndex     = 10u;
   fontDescriptionRun0402.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun0402.familyLength = fontFamily.size();
-  fontDescriptionRun0402.familyName = new char[fontDescriptionRun0402.familyLength];
-  memcpy( fontDescriptionRun0402.familyName, fontFamily.c_str(), fontDescriptionRun0402.familyLength );
+  fontDescriptionRun0402.familyLength                    = fontFamily.size();
+  fontDescriptionRun0402.familyName                      = new char[fontDescriptionRun0402.familyLength];
+  memcpy(fontDescriptionRun0402.familyName, fontFamily.c_str(), fontDescriptionRun0402.familyLength);
   fontDescriptionRun0402.familyDefined = true;
   fontDescriptionRun0402.weightDefined = false;
-  fontDescriptionRun0402.widthDefined = false;
-  fontDescriptionRun0402.slantDefined = false;
-  fontDescriptionRun0402.sizeDefined = false;
+  fontDescriptionRun0402.widthDefined  = false;
+  fontDescriptionRun0402.slantDefined  = false;
+  fontDescriptionRun0402.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun0403;
-  fontDescriptionRun0403.characterRun.characterIndex = 22u;
+  fontDescriptionRun0403.characterRun.characterIndex     = 22u;
   fontDescriptionRun0403.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun0403.familyLength = fontFamilyHebrew.size();
-  fontDescriptionRun0403.familyName = new char[fontDescriptionRun0403.familyLength];
-  memcpy( fontDescriptionRun0403.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0403.familyLength );
+  fontDescriptionRun0403.familyLength                    = fontFamilyHebrew.size();
+  fontDescriptionRun0403.familyName                      = new char[fontDescriptionRun0403.familyLength];
+  memcpy(fontDescriptionRun0403.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0403.familyLength);
   fontDescriptionRun0403.familyDefined = true;
   fontDescriptionRun0403.weightDefined = false;
-  fontDescriptionRun0403.widthDefined = false;
-  fontDescriptionRun0403.slantDefined = false;
-  fontDescriptionRun0403.sizeDefined = false;
+  fontDescriptionRun0403.widthDefined  = false;
+  fontDescriptionRun0403.slantDefined  = false;
+  fontDescriptionRun0403.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun0404;
-  fontDescriptionRun0404.characterRun.characterIndex = 32u;
+  fontDescriptionRun0404.characterRun.characterIndex     = 32u;
   fontDescriptionRun0404.characterRun.numberOfCharacters = 24u;
-  fontDescriptionRun0404.familyLength = fontFamily.size();
-  fontDescriptionRun0404.familyName = new char[fontDescriptionRun0404.familyLength];
-  memcpy( fontDescriptionRun0404.familyName, fontFamily.c_str(), fontDescriptionRun0404.familyLength );
+  fontDescriptionRun0404.familyLength                    = fontFamily.size();
+  fontDescriptionRun0404.familyName                      = new char[fontDescriptionRun0404.familyLength];
+  memcpy(fontDescriptionRun0404.familyName, fontFamily.c_str(), fontDescriptionRun0404.familyLength);
   fontDescriptionRun0404.familyDefined = true;
   fontDescriptionRun0404.weightDefined = false;
-  fontDescriptionRun0404.widthDefined = false;
-  fontDescriptionRun0404.slantDefined = false;
-  fontDescriptionRun0404.sizeDefined = false;
+  fontDescriptionRun0404.widthDefined  = false;
+  fontDescriptionRun0404.slantDefined  = false;
+  fontDescriptionRun0404.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun0405;
-  fontDescriptionRun0405.characterRun.characterIndex = 56u;
+  fontDescriptionRun0405.characterRun.characterIndex     = 56u;
   fontDescriptionRun0405.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun0405.familyLength = fontFamilyHebrew.size();
-  fontDescriptionRun0405.familyName = new char[fontDescriptionRun0405.familyLength];
-  memcpy( fontDescriptionRun0405.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0405.familyLength );
+  fontDescriptionRun0405.familyLength                    = fontFamilyHebrew.size();
+  fontDescriptionRun0405.familyName                      = new char[fontDescriptionRun0405.familyLength];
+  memcpy(fontDescriptionRun0405.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0405.familyLength);
   fontDescriptionRun0405.familyDefined = true;
   fontDescriptionRun0405.weightDefined = false;
-  fontDescriptionRun0405.widthDefined = false;
-  fontDescriptionRun0405.slantDefined = false;
-  fontDescriptionRun0405.sizeDefined = false;
+  fontDescriptionRun0405.widthDefined  = false;
+  fontDescriptionRun0405.slantDefined  = false;
+  fontDescriptionRun0405.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns04;
-  fontDescriptionRuns04.PushBack( fontDescriptionRun0401 );
-  fontDescriptionRuns04.PushBack( fontDescriptionRun0402 );
-  fontDescriptionRuns04.PushBack( fontDescriptionRun0403 );
-  fontDescriptionRuns04.PushBack( fontDescriptionRun0404 );
-  fontDescriptionRuns04.PushBack( fontDescriptionRun0405 );
-
-  unsigned int  visualIndex04[] = {  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u,
-                                    10u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u,
-                                    23u, 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 40u, 41u, 42u, 43u, 44u,
-                                    44u, 45u, 46u, 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u };
-
-  unsigned int characterIndex04[] = {  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,
-                                      10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u,
-                                      22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u,
-                                      44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u };
-
-  unsigned int logicalIndex04[] = {  9u,  8u,  7u,  6u,  5u,  4u,  3u,  2u,  1u,  0u,
-                                    10u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u,
-                                    43u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 40u, 41u, 42u, 32u, 31u, 30u, 29u, 28u, 27u, 26u, 25u, 24u, 23u, 22u,
-                                    44u, 45u, 46u, 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 64u, 63u, 62u, 61u, 60u, 59u, 58u, 57u, 65u };
-
-  unsigned int bidirectionalLineIndex04[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                              0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                              1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                              2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u };
-
-// LO   A  B  C  D  E  F  G  H  I  J  K
-//     0  1  2  3  4  5  6  7  8  9 10 11
-// LO   L  M  N
-//    11 12 13 14
+  fontDescriptionRuns04.PushBack(fontDescriptionRun0401);
+  fontDescriptionRuns04.PushBack(fontDescriptionRun0402);
+  fontDescriptionRuns04.PushBack(fontDescriptionRun0403);
+  fontDescriptionRuns04.PushBack(fontDescriptionRun0404);
+  fontDescriptionRuns04.PushBack(fontDescriptionRun0405);
+
+  unsigned int visualIndex04[] = {1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 10u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u, 23u, 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 40u, 41u, 42u, 43u, 44u, 44u, 45u, 46u, 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u};
+
+  unsigned int characterIndex04[] = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 22u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u, 44u};
+
+  unsigned int logicalIndex04[] = {9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0u, 10u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u, 43u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, 40u, 41u, 42u, 32u, 31u, 30u, 29u, 28u, 27u, 26u, 25u, 24u, 23u, 22u, 44u, 45u, 46u, 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 64u, 63u, 62u, 61u, 60u, 59u, 58u, 57u, 65u};
+
+  unsigned int bidirectionalLineIndex04[] = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u, 2u};
+
+  // LO   A  B  C  D  E  F  G  H  I  J  K
+  //     0  1  2  3  4  5  6  7  8  9 10 11
+  // LO   L  M  N
+  //    11 12 13 14
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0501;
-  fontDescriptionRun0501.characterRun.characterIndex = 0u;
+  fontDescriptionRun0501.characterRun.characterIndex     = 0u;
   fontDescriptionRun0501.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun0501.familyLength = fontFamily.size();
-  fontDescriptionRun0501.familyName = new char[fontDescriptionRun0501.familyLength];
-  memcpy( fontDescriptionRun0501.familyName, fontFamily.c_str(), fontDescriptionRun0501.familyLength );
+  fontDescriptionRun0501.familyLength                    = fontFamily.size();
+  fontDescriptionRun0501.familyName                      = new char[fontDescriptionRun0501.familyLength];
+  memcpy(fontDescriptionRun0501.familyName, fontFamily.c_str(), fontDescriptionRun0501.familyLength);
   fontDescriptionRun0501.familyDefined = true;
   fontDescriptionRun0501.weightDefined = false;
-  fontDescriptionRun0501.widthDefined = false;
-  fontDescriptionRun0501.slantDefined = false;
-  fontDescriptionRun0501.sizeDefined = false;
+  fontDescriptionRun0501.widthDefined  = false;
+  fontDescriptionRun0501.slantDefined  = false;
+  fontDescriptionRun0501.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns05;
-  fontDescriptionRuns05.PushBack( fontDescriptionRun0501 );
-
-  unsigned int  visualIndex05[] = {  0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u,
-                                    11u, 12u, 13u, 14u };
+  fontDescriptionRuns05.PushBack(fontDescriptionRun0501);
 
-  unsigned int characterIndex05[] = { 0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,
-                                      11u, 11u, 11u, 11u };
+  unsigned int visualIndex05[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 13u, 14u};
 
-  unsigned int logicalIndex05[] = { 0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u,
-                                    11u, 12u, 13u, 14u };
+  unsigned int characterIndex05[] = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 11u, 11u, 11u, 11u};
 
-  unsigned int bidirectionalLineIndex05[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                              0u, 0u, 0u, 0u };
+  unsigned int logicalIndex05[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 13u, 14u};
 
-// LO      ק  ר  א  ט  ו  ן  ם  פ  ש  ד  ג  כ
-//        0  1  2  3  4  5  6  7  8  9  10 11 12
-// VO      כ  ג  ד  ש  פ  ם  ן  ו  ט  א  ר  ק
+  unsigned int bidirectionalLineIndex05[] = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u};
 
-// LO      ע  י  ח  ל
-//       12 13 14 15 16
-// VO      ל  ח  י  ע
+  // LO      ק  ר  א  ט  ו  ן  ם  פ  ש  ד  ג  כ
+  //        0  1  2  3  4  5  6  7  8  9  10 11 12
+  // VO      כ  ג  ד  ש  פ  ם  ן  ו  ט  א  ר  ק
 
+  // LO      ע  י  ח  ל
+  //       12 13 14 15 16
+  // VO      ל  ח  י  ע
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun0601;
-  fontDescriptionRun0601.characterRun.characterIndex = 0u;
+  fontDescriptionRun0601.characterRun.characterIndex     = 0u;
   fontDescriptionRun0601.characterRun.numberOfCharacters = 16u;
-  fontDescriptionRun0601.familyLength = fontFamilyHebrew.size();
-  fontDescriptionRun0601.familyName = new char[fontDescriptionRun0601.familyLength];
-  memcpy( fontDescriptionRun0601.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0601.familyLength );
+  fontDescriptionRun0601.familyLength                    = fontFamilyHebrew.size();
+  fontDescriptionRun0601.familyName                      = new char[fontDescriptionRun0601.familyLength];
+  memcpy(fontDescriptionRun0601.familyName, fontFamilyHebrew.c_str(), fontDescriptionRun0601.familyLength);
   fontDescriptionRun0601.familyDefined = true;
   fontDescriptionRun0601.weightDefined = false;
-  fontDescriptionRun0601.widthDefined = false;
-  fontDescriptionRun0601.slantDefined = false;
-  fontDescriptionRun0601.sizeDefined = false;
+  fontDescriptionRun0601.widthDefined  = false;
+  fontDescriptionRun0601.slantDefined  = false;
+  fontDescriptionRun0601.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns06;
-  fontDescriptionRuns06.PushBack( fontDescriptionRun0601 );
-
-  unsigned int  visualIndex06[] = {  0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u, 10u, 11u, 12u,
-                                    12u, 13u, 14u, 15u, 16u };
-
-  unsigned int characterIndex06[] = {  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,  0u,
-                                      12u, 12u, 12u, 12u, 12u };
-
-  unsigned int logicalIndex06[] = { 12u, 11u, 10u,  9u,  8u,  7u,  6u,  5u,  4u,  3u,  2u,  1u, 0u,
-                                    16u, 15u, 14u, 13u, 12u };
-
-  unsigned int bidirectionalLineIndex06[] = { 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
-                                              1u, 1u, 1u, 1u, 1u, };
+  fontDescriptionRuns06.PushBack(fontDescriptionRun0601);
+
+  unsigned int visualIndex06[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 12u, 13u, 14u, 15u, 16u};
+
+  unsigned int characterIndex06[] = {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 12u, 12u, 12u, 12u, 12u};
+
+  unsigned int logicalIndex06[] = {12u, 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0u, 16u, 15u, 14u, 13u, 12u};
+
+  unsigned int bidirectionalLineIndex06[] = {
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    0u,
+    1u,
+    1u,
+    1u,
+    1u,
+    1u,
+  };
 
   struct GetLogicalCursorIndexData data[] =
-  {
-    {
-      "Zero characters text",
-      "",
-      Size( 300.f, 300.f ),
-      0u,
-      nullptr,
-      1u,
-      visualIndex01,
-      characterIndex01,
-      logicalIndex01,
-      bidirectionalLineIndex01,
-    },
-    {
-      "All left to right text 01.",
-      "Hello world\ndemo",
-      Size( 300.f, 300.f ),
-      1u,
-      fontDescriptionRuns02.Begin(),
-      4u,
-      visualIndex02,
-      characterIndex02,
-      logicalIndex02,
-      bidirectionalLineIndex02,
-    },
-    {
-      "bidirectional text 01.",
-      "Hello world\nשלום עולם\nhello world שלום עולם\nשלום עולם hello world\n",
-      Size( 300.f, 300.f ),
-      5u,
-      fontDescriptionRuns03.Begin(),
-      65u,
-      visualIndex03,
-      characterIndex03,
-      logicalIndex03,
-      bidirectionalLineIndex03,
-    },
-    {
-      "bidirectional text 02.",
-      "שלום עולם\nhello world\nשלום עולם hello world\nhello world שלום עולם\n",
-      Size( 300.f, 300.f ),
-      5u,
-      fontDescriptionRuns04.Begin(),
-      65u,
-      visualIndex04,
-      characterIndex04,
-      logicalIndex04,
-      bidirectionalLineIndex04,
-    },
     {
-      "long line 01.",
-      "ABCDEFGHIJKLMN",
-      Size( 100.f, 300.f ),
-      1u,
-      fontDescriptionRuns05.Begin(),
-      13u,
-      visualIndex05,
-      characterIndex05,
-      logicalIndex05,
-      bidirectionalLineIndex05,
-    },
-    {
-      "bidirectional text 03.",
-      "קראטוןםפשדגכעיחל",
-      Size( 100.f, 300.f ),
-      1u,
-      fontDescriptionRuns06.Begin(),
-      18u,
-      visualIndex06,
-      characterIndex06,
-      logicalIndex06,
-      bidirectionalLineIndex06,
-    },
-  };
+      {
+        "Zero characters text",
+        "",
+        Size(300.f, 300.f),
+        0u,
+        nullptr,
+        1u,
+        visualIndex01,
+        characterIndex01,
+        logicalIndex01,
+        bidirectionalLineIndex01,
+      },
+      {
+        "All left to right text 01.",
+        "Hello world\ndemo",
+        Size(300.f, 300.f),
+        1u,
+        fontDescriptionRuns02.Begin(),
+        4u,
+        visualIndex02,
+        characterIndex02,
+        logicalIndex02,
+        bidirectionalLineIndex02,
+      },
+      {
+        "bidirectional text 01.",
+        "Hello world\nשלום עולם\nhello world שלום עולם\nשלום עולם hello world\n",
+        Size(300.f, 300.f),
+        5u,
+        fontDescriptionRuns03.Begin(),
+        65u,
+        visualIndex03,
+        characterIndex03,
+        logicalIndex03,
+        bidirectionalLineIndex03,
+      },
+      {
+        "bidirectional text 02.",
+        "שלום עולם\nhello world\nשלום עולם hello world\nhello world שלום עולם\n",
+        Size(300.f, 300.f),
+        5u,
+        fontDescriptionRuns04.Begin(),
+        65u,
+        visualIndex04,
+        characterIndex04,
+        logicalIndex04,
+        bidirectionalLineIndex04,
+      },
+      {
+        "long line 01.",
+        "ABCDEFGHIJKLMN",
+        Size(100.f, 300.f),
+        1u,
+        fontDescriptionRuns05.Begin(),
+        13u,
+        visualIndex05,
+        characterIndex05,
+        logicalIndex05,
+        bidirectionalLineIndex05,
+      },
+      {
+        "bidirectional text 03.",
+        "קראטוןםפשדגכעיחל",
+        Size(100.f, 300.f),
+        1u,
+        fontDescriptionRuns06.Begin(),
+        18u,
+        visualIndex06,
+        characterIndex06,
+        logicalIndex06,
+        bidirectionalLineIndex06,
+      },
+    };
   const unsigned int numberOfTests = 6u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !GetLogicalCursorIndexTest( data[index] ) )
+    if(!GetLogicalCursorIndexTest(data[index]))
     {
       tet_printf("Test %d failed : [%s]\n", index, data[index].description.c_str());
       tet_result(TET_FAIL);
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-AbstractStyleCharacterRun.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-AbstractStyleCharacterRun.cpp
new file mode 100644
index 0000000..f6d1827
--- /dev/null
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-AbstractStyleCharacterRun.cpp
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/character-spacing-character-run.h>
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/strikethrough-character-run.h>
+#include <dali-toolkit/internal/text/underlined-character-run.h>
+
+using namespace Dali;
+using namespace Toolkit;
+using namespace Text;
+
+// Tests the following functions for AbstractStyleCharacterRun.
+//  CharacterIndex GetStartCharacterIndex() const;
+//  Length GetNumberOfCharacters() const;
+//  CharacterIndex GetEndCharacterIndex() const;
+
+template<typename TYPE_OF_RUN>
+void TestAbstractStyleCharacterRunEmptyCharacterRun(std::string test_name)
+{
+  tet_infoline(" TestAbstractStyleCharacterRunEmptyCharacterRun ");
+  std::cout << "  testing " << test_name << std::endl;
+
+  tet_infoline(" Default Constructor ");
+  TYPE_OF_RUN abstractStyleCharacterRun;
+
+  tet_infoline(" AbstractStyleCharacterRun_GetStartCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetStartCharacterIndex(), 0u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetNumberOfCharacters ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetNumberOfCharacters(), 0u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetEndCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetEndCharacterIndex(), 0u, TEST_LOCATION);
+}
+
+template<typename TYPE_OF_RUN>
+void TestAbstractStyleCharacterRunOneCharacter(std::string test_name)
+{
+  tet_infoline(" TestAbstractStyleCharacterRunOneCharacter ");
+  std::cout << "  testing " << test_name << std::endl;
+
+  TYPE_OF_RUN abstractStyleCharacterRun;
+  abstractStyleCharacterRun.characterRun.numberOfCharacters = 1u;
+  tet_infoline(" AbstractStyleCharacterRun_GetStartCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetStartCharacterIndex(), 0u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetNumberOfCharacters ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetNumberOfCharacters(), 1u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetEndCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetEndCharacterIndex(), 0u, TEST_LOCATION);
+
+  abstractStyleCharacterRun.characterRun.characterIndex = 5u;
+  tet_infoline(" AbstractStyleCharacterRun_GetStartCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetStartCharacterIndex(), 5u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetNumberOfCharacters ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetNumberOfCharacters(), 1u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetEndCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetEndCharacterIndex(), 5u, TEST_LOCATION);
+}
+
+template<typename TYPE_OF_RUN>
+void TestAbstractStyleCharacterRunMoreThanOneCharacter(std::string test_name)
+{
+  tet_infoline(" TestAbstractStyleCharacterRunOneCharacter ");
+  std::cout << "  testing " << test_name << std::endl;
+
+  TYPE_OF_RUN abstractStyleCharacterRun;
+  abstractStyleCharacterRun.characterRun.numberOfCharacters = 15u;
+  tet_infoline(" AbstractStyleCharacterRun_GetStartCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetStartCharacterIndex(), 0u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetNumberOfCharacters ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetNumberOfCharacters(), 15u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetEndCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetEndCharacterIndex(), 14u, TEST_LOCATION);
+
+  abstractStyleCharacterRun.characterRun.characterIndex = 5u;
+  tet_infoline(" AbstractStyleCharacterRun_GetStartCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetStartCharacterIndex(), 5u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetNumberOfCharacters ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetNumberOfCharacters(), 15u, TEST_LOCATION);
+
+  tet_infoline(" AbstractStyleCharacterRun_GetEndCharacterIndex ");
+  DALI_TEST_EQUALS(abstractStyleCharacterRun.GetEndCharacterIndex(), 19u, TEST_LOCATION);
+}
+
+int UtcDaliTextAbstractStyleCharacterRun(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextAbstractStyleCharacterRun");
+
+  TestAbstractStyleCharacterRunEmptyCharacterRun<Dali::Toolkit::Text::ColorRun>("ColorRun");
+  TestAbstractStyleCharacterRunEmptyCharacterRun<Dali::Toolkit::Text::CharacterSpacingCharacterRun>("CharacterSpacingCharacterRun");
+  TestAbstractStyleCharacterRunEmptyCharacterRun<Dali::Toolkit::Text::FontDescriptionRun>("FontDescriptionRun");
+  TestAbstractStyleCharacterRunEmptyCharacterRun<Dali::Toolkit::Text::UnderlinedCharacterRun>("UnderlinedCharacterRun");
+  TestAbstractStyleCharacterRunEmptyCharacterRun<Dali::Toolkit::Text::StrikethroughCharacterRun>("StrikethroughCharacterRun");
+  TestAbstractStyleCharacterRunEmptyCharacterRun<Dali::Toolkit::Text::BoundedParagraphRun>("BoundedParagraphRun");
+
+  TestAbstractStyleCharacterRunOneCharacter<Dali::Toolkit::Text::ColorRun>("ColorRun");
+  TestAbstractStyleCharacterRunOneCharacter<Dali::Toolkit::Text::CharacterSpacingCharacterRun>("CharacterSpacingCharacterRun");
+  TestAbstractStyleCharacterRunOneCharacter<Dali::Toolkit::Text::FontDescriptionRun>("FontDescriptionRun");
+  TestAbstractStyleCharacterRunOneCharacter<Dali::Toolkit::Text::UnderlinedCharacterRun>("UnderlinedCharacterRun");
+  TestAbstractStyleCharacterRunOneCharacter<Dali::Toolkit::Text::StrikethroughCharacterRun>("StrikethroughCharacterRun");
+  TestAbstractStyleCharacterRunOneCharacter<Dali::Toolkit::Text::BoundedParagraphRun>("BoundedParagraphRun");
+
+  TestAbstractStyleCharacterRunMoreThanOneCharacter<Dali::Toolkit::Text::ColorRun>("ColorRun");
+  TestAbstractStyleCharacterRunMoreThanOneCharacter<Dali::Toolkit::Text::CharacterSpacingCharacterRun>("CharacterSpacingCharacterRun");
+  TestAbstractStyleCharacterRunMoreThanOneCharacter<Dali::Toolkit::Text::FontDescriptionRun>("FontDescriptionRun");
+  TestAbstractStyleCharacterRunMoreThanOneCharacter<Dali::Toolkit::Text::UnderlinedCharacterRun>("UnderlinedCharacterRun");
+  TestAbstractStyleCharacterRunMoreThanOneCharacter<Dali::Toolkit::Text::StrikethroughCharacterRun>("StrikethroughCharacterRun");
+  TestAbstractStyleCharacterRunMoreThanOneCharacter<Dali::Toolkit::Text::BoundedParagraphRun>("BoundedParagraphRun");
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-CharacterSpacing.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-CharacterSpacing.cpp
new file mode 100644
index 0000000..1c45e02
--- /dev/null
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-CharacterSpacing.cpp
@@ -0,0 +1,854 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
+#include <dali-toolkit/internal/text/text-run-container.h>
+#include <toolkit-text-utils.h>
+
+using namespace Dali;
+using namespace Toolkit;
+using namespace Text;
+
+// Tests the LayoutEngine methods.
+
+//////////////////////////////////////////////////////////
+
+namespace
+{
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
+
+struct LayoutTextData
+{
+  std::string          description;
+  std::string          text;
+  Size                 textArea;
+  unsigned int         numberOfFonts;
+  FontDescriptionRun*  fontDescriptions;
+  Size                 layoutSize;
+  unsigned int         totalNumberOfGlyphs;
+  float*               positions;
+  unsigned int         numberOfLines;
+  LineRun*             lines;
+  Layout::Engine::Type layout;
+  unsigned int         startIndex;
+  unsigned int         numberOfGlyphs;
+  bool                 ellipsis : 1;
+  bool                 updated : 1;
+  float                characterSpacing;
+};
+
+void Print(const LineRun& line)
+{
+  std::cout << "        glyph run, index : " << line.glyphRun.glyphIndex << ", num glyphs : " << line.glyphRun.numberOfGlyphs << std::endl;
+  std::cout << "    character run, index : " << line.characterRun.characterIndex << ", num chars : " << line.characterRun.numberOfCharacters << std::endl;
+  std::cout << "                   width : " << floor(line.width) << std::endl;
+  std::cout << "                ascender : " << line.ascender << std::endl;
+  std::cout << "               descender : " << line.descender << std::endl;
+  std::cout << "             extraLength : " << line.extraLength << std::endl;
+  std::cout << "         alignmentOffset : " << line.alignmentOffset << std::endl;
+  std::cout << "               direction : " << line.direction << std::endl;
+  std::cout << "                ellipsis : " << line.ellipsis << std::endl;
+}
+
+bool LayoutTextTest(const LayoutTextData& data)
+{
+  // Load some fonts.
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.SetDpi(96u, 96u);
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHindiRegular.ttf");
+
+  // 1) Create the model.
+  ModelPtr   textModel;
+  MetricsPtr metrics;
+  Size       layoutSize;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  if(0u != data.numberOfFonts)
+  {
+    fontDescriptionRuns.Insert(fontDescriptionRuns.End(),
+                               data.fontDescriptions,
+                               data.fontDescriptions + data.numberOfFonts);
+  }
+
+  LayoutOptions options;
+  options.align = false;
+  CreateTextModel(data.text,
+                  data.textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  data.characterSpacing);
+
+  LogicalModelPtr logicalModel = textModel->mLogicalModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
+
+  // 2) Clear the layout.
+  Vector<LineRun>& lines = visualModel->mLines;
+
+  const Length     numberOfCharacters = logicalModel->mText.Count();
+  const bool       isLastNewParagraph = (0u == numberOfCharacters) ? false : TextAbstraction::IsNewParagraph(*(logicalModel->mText.Begin() + (numberOfCharacters - 1u)));
+  const GlyphIndex lastGlyphIndex     = data.startIndex + data.numberOfGlyphs - 1u;
+  const bool       removeLastLine     = isLastNewParagraph && (lastGlyphIndex + 1u == visualModel->mGlyphs.Count());
+
+  LineIndex startRemoveIndex = 0u;
+
+  if(0u != lines.Count())
+  {
+    startRemoveIndex         = lines.Count();
+    LineIndex endRemoveIndex = startRemoveIndex;
+    ClearGlyphRuns(data.startIndex,
+                   lastGlyphIndex + (removeLastLine ? 1u : 0u),
+                   lines,
+                   startRemoveIndex,
+                   endRemoveIndex);
+
+    // Update the character runs of the lines.
+    const CharacterIndex* const glyphsToCharactersBuffer = visualModel->mGlyphsToCharacters.Begin();
+    const Length* const         charactersPerGlyph       = visualModel->mCharactersPerGlyph.Begin();
+    const CharacterIndex        startCharacterIndex      = *(glyphsToCharactersBuffer + data.startIndex);
+    const CharacterIndex        lastCharacterIndex       = *(glyphsToCharactersBuffer + lastGlyphIndex) + *(charactersPerGlyph + lastGlyphIndex) - 1u;
+    ClearCharacterRuns(startCharacterIndex,
+                       lastCharacterIndex + (removeLastLine ? 1u : 0u),
+                       lines,
+                       startRemoveIndex,
+                       endRemoveIndex);
+
+    lines.Erase(lines.Begin() + startRemoveIndex,
+                lines.Begin() + endRemoveIndex);
+  }
+
+  Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
+
+  glyphPositions.Erase(glyphPositions.Begin() + data.startIndex,
+                       glyphPositions.Begin() + data.startIndex + data.numberOfGlyphs);
+
+  // 3) Layout
+  Layout::Engine engine;
+  engine.SetMetrics(metrics);
+  engine.SetLayout(data.layout);
+
+  textModel->mHorizontalAlignment   = Text::HorizontalAlignment::BEGIN;
+  textModel->mLineWrapMode          = LineWrap::WORD;
+  textModel->mIgnoreSpacesAfterText = true;
+  //textModel->mMatchSystemLanguageDirection = false;
+  Layout::Parameters layoutParameters(data.textArea,
+                                      textModel);
+
+  layoutParameters.isLastNewParagraph = isLastNewParagraph;
+
+  // The initial glyph and the number of glyphs to layout.
+  layoutParameters.startGlyphIndex        = data.startIndex;
+  layoutParameters.numberOfGlyphs         = data.numberOfGlyphs;
+  layoutParameters.startLineIndex         = startRemoveIndex;
+  layoutParameters.estimatedNumberOfLines = logicalModel->mParagraphInfo.Count();
+
+  layoutSize = Vector2::ZERO;
+
+  bool       isAutoScroll                   = false;
+  bool       isAutoScrollMaxTextureExceeded = false;
+  bool       isHiddenInputEnabled           = false;
+  const bool updated                        = engine.LayoutText(layoutParameters,
+                                         layoutSize,
+                                         data.ellipsis,
+                                         isAutoScroll,
+                                         isAutoScrollMaxTextureExceeded,
+                                         isHiddenInputEnabled,
+                                         DevelText::EllipsisPosition::END);
+
+  // 4) Compare the results.
+
+  if(updated != data.updated)
+  {
+    std::cout << "  Different updated bool : " << updated << ", expected : " << data.updated << std::endl;
+    return false;
+  }
+
+  if(layoutSize != data.layoutSize)
+  {
+    std::cout << "  Different layout size : " << layoutSize << ", expected : " << data.layoutSize << std::endl;
+    return false;
+  }
+
+  for(unsigned int index = 0u; index < data.totalNumberOfGlyphs; ++index)
+  {
+    const Vector2& position = *(glyphPositions.Begin() + index);
+
+    if(fabsf(std::round(position.x) - std::round(*(data.positions + 2u * index))) > Math::MACHINE_EPSILON_1000)
+    {
+      std::cout << "  Different position for glyph " << index << " x : " << position.x << ", expected : " << *(data.positions + 2u * index) << std::endl;
+      return false;
+    }
+    if(fabsf(position.y - *(data.positions + 2u * index + 1u)) > Math::MACHINE_EPSILON_1000)
+    {
+      std::cout << "  Different position for glyph " << index << " y : " << position.y << ", expected : " << *(data.positions + 2u * index + 1u) << std::endl;
+      return false;
+    }
+  }
+
+  if(lines.Count() != data.numberOfLines)
+  {
+    std::cout << "  Different number of lines : " << lines.Count() << ", expected : " << data.numberOfLines << std::endl;
+    return false;
+  }
+
+  for(unsigned int index = 0u; index < data.numberOfLines; ++index)
+  {
+    const LineRun& line         = *(lines.Begin() + index);
+    const LineRun& expectedLine = *(data.lines + index);
+
+    if(line.glyphRun.glyphIndex != expectedLine.glyphRun.glyphIndex)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+    if(line.glyphRun.numberOfGlyphs != expectedLine.glyphRun.numberOfGlyphs)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+
+    if(line.characterRun.characterIndex != expectedLine.characterRun.characterIndex)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+    if(line.characterRun.numberOfCharacters != expectedLine.characterRun.numberOfCharacters)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+
+    if(fabsf(floor(line.width) - expectedLine.width) > Math::MACHINE_EPSILON_1)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+
+    if(fabsf(line.ascender - expectedLine.ascender) > Math::MACHINE_EPSILON_1)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+
+    if(fabsf(line.descender - expectedLine.descender) > Math::MACHINE_EPSILON_1)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+
+    if(fabsf(line.extraLength - expectedLine.extraLength) > Math::MACHINE_EPSILON_1)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+
+    if(line.ellipsis != expectedLine.ellipsis)
+    {
+      std::cout << "  Different line info for line : " << index << std::endl;
+      Print(line);
+      std::cout << "  expected" << std::endl;
+      Print(expectedLine);
+      return false;
+    }
+    // Do not compare the alignment offset as it's not calculated in the layout.
+    // Do not compare the line direction as it's not set in the layout.
+  }
+
+  return true;
+}
+
+////////////////////////////////////////////////////////
+
+} // namespace
+
+//////////////////////////////////////////////////////////
+//
+// UtcDaliTextCharacterSpacingSingleLineTextArea1
+// UtcDaliTextCharacterSpacingSingleLineTextArea2
+// UtcDaliTextCharacterSpacingSingleLineTextArea3
+// UtcDaliTextCharacterSpacingMultilineText1
+// UtcDaliTextCharacterSpacingMultilineText2
+//
+//////////////////////////////////////////////////////////
+
+int UtcDaliTextCharacterSpacingSingleLineTextArea1(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextCharacterSpacingSingleLineTextArea1");
+
+  // Will layout the text in single line as it can be scrolled.
+
+  const std::string fontFamily("TizenSans");
+
+  // Set a known font description
+  FontDescriptionRun fontDescriptionRun;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
+  fontDescriptionRun.characterRun.numberOfCharacters = 11u;
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
+  fontDescriptionRun.familyDefined = true;
+  fontDescriptionRun.weightDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+  Size textArea(1.f, 1.f);
+
+  //******* characterSpacing = 0.0f *******//
+  float positions[] =
+   {
+    0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f
+   };
+  Size layoutSize(79.f, 20.f);
+  //************************************//
+
+  struct LineRun line =
+    {
+      {0u, 11u},
+      {0u, 11u},
+      79.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  Vector<LineRun> lines;
+  lines.PushBack(line);
+
+  LayoutTextData data =
+    {
+      "Layout text in a small area",
+      "Hello world",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      11u,
+      positions,
+      1u,
+      lines.Begin(),
+      Layout::Engine::SINGLE_LINE_BOX,
+      0u,
+      11u,
+      false,
+      true,
+      0.0f};
+
+  if(!LayoutTextTest(data))
+  {
+    tet_result(TET_FAIL);
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextCharacterSpacingSingleLineTextArea2(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextCharacterSpacingSingleLineTextArea2");
+
+  // Will layout the text in single line as it can be scrolled.
+
+  const std::string fontFamily("TizenSans");
+
+  // Set a known font description
+  FontDescriptionRun fontDescriptionRun;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
+  fontDescriptionRun.characterRun.numberOfCharacters = 11u;
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
+  fontDescriptionRun.familyDefined = true;
+  fontDescriptionRun.weightDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+  Size textArea(1.f, 1.f);
+
+  //******* characterSpacing = 2.0f *******//
+  float positions[] =
+   {
+     0.f, -12.f, 12.f, -9.f, 23.f, -13.f, 29.f, -13.f, 34.f, -9.f, 45.f, -0.f, 51.f, -9.f, 65.f, -9.f, 77.f, -9.f, 85.f, -13.f, 90.f, -13.f
+   };
+  Size layoutSize(99.f, 20.f);
+  //************************************//
+
+  struct LineRun line =
+    {
+      {0u, 11u},
+      {0u, 11u},
+      99.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  Vector<LineRun> lines;
+  lines.PushBack(line);
+
+  LayoutTextData data =
+    {
+      "Layout text in a small area",
+      "Hello world",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      11u,
+      positions,
+      1u,
+      lines.Begin(),
+      Layout::Engine::SINGLE_LINE_BOX,
+      0u,
+      11u,
+      false,
+      true,
+      2.0f};
+
+  if(!LayoutTextTest(data))
+  {
+    tet_result(TET_FAIL);
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextCharacterSpacingSingleLineTextArea3(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextCharacterSpacingSingleLineTextArea3");
+
+  // Will layout the text in single line as it can be scrolled.
+
+  const std::string fontFamily("TizenSans");
+
+  // Set a known font description
+  FontDescriptionRun fontDescriptionRun;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
+  fontDescriptionRun.characterRun.numberOfCharacters = 11u;
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
+  fontDescriptionRun.familyDefined = true;
+  fontDescriptionRun.weightDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+  Size textArea(1.f, 1.f);
+
+  //******* characterSpacing = 4.0f *******//
+  float positions[] =
+   {
+     0.f, -12.f, 14.f, -9.f, 27.f, -13.f, 35.f, -13.f, 42.f, -9.f, 55.f, -0.f, 63.f, -9.f, 79.f, -9.f, 93.f, -9.f, 103.f, -13.f, 110.f, -13.f
+   };
+  Size layoutSize(119.f, 20.f);
+  //************************************//
+
+  struct LineRun line =
+    {
+      {0u, 11u},
+      {0u, 11u},
+      119.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  Vector<LineRun> lines;
+  lines.PushBack(line);
+
+  LayoutTextData data =
+    {
+      "Layout text in a small area",
+      "Hello world",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      11u,
+      positions,
+      1u,
+      lines.Begin(),
+      Layout::Engine::SINGLE_LINE_BOX,
+      0u,
+      11u,
+      false,
+      true,
+      4.0f};
+
+  if(!LayoutTextTest(data))
+  {
+    tet_result(TET_FAIL);
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextCharacterSpacingMultilineText1(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextCharacterSpacingMultilineText1");
+
+  // Layout some lines of left to right text.
+
+  const std::string fontFamily("TizenSans");
+
+  // Set a known font description
+  FontDescriptionRun fontDescriptionRun1;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
+  fontDescriptionRun1.characterRun.numberOfCharacters = 18u;
+  fontDescriptionRun1.familyLength                    = fontFamily.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength);
+  fontDescriptionRun1.familyDefined = true;
+  fontDescriptionRun1.weightDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = false;
+
+  FontDescriptionRun fontDescriptionRun2;
+  fontDescriptionRun2.characterRun.characterIndex     = 18u;
+  fontDescriptionRun2.characterRun.numberOfCharacters = 31u;
+  fontDescriptionRun2.familyLength                    = fontFamily.size();
+  fontDescriptionRun2.familyName                      = new char[fontDescriptionRun2.familyLength];
+  memcpy(fontDescriptionRun2.familyName, fontFamily.c_str(), fontDescriptionRun2.familyLength);
+  fontDescriptionRun2.familyDefined = true;
+  fontDescriptionRun2.weightDefined = false;
+  fontDescriptionRun2.widthDefined  = false;
+  fontDescriptionRun2.slantDefined  = false;
+  fontDescriptionRun2.sizeDefined   = false;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
+  fontDescriptionRuns.PushBack(fontDescriptionRun2);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(96.f, 97.f);
+  float positions[] =
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -2.f, 44.f, -12.f, 0.f, -12.f, 8.f, -9.f, 18.f, -9.f, 27.f, -9.f, 38.f, -9.f, 47.f, -11.f, 53.f, -0.f, 0.f, -12.f, 11.f, -12.f, 14.f, -12.f, 25.f, -9.f, 36.f, -9.f, 41.f, -9.f, 52.f, -9.f, 61.f, -11.f, 67.f, -0.f, 0.f, -12.f, 4.f, -12.f, 8.f, -9.f, 17.f, -9.f, 27.f, -9.f, 35.f, -0.f, 40.f, -9.f, 50.f, -12.f, 56.f, -0.f, 61.f, -11.f, 67.f, -9.f, 77.f, -9.f, 86.f, -11.f, 93.f, -2.f
+    };
+  struct LineRun line0 =
+    {
+      {0u, 12u},
+      {0u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line1 =
+    {
+      {12u, 6u},
+      {12u, 6u},
+      43.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line2 =
+    {
+      {18u, 7u},
+      {18u, 7u},
+      53.f,
+      15.f,
+      -4.f,
+      5.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line3 =
+    {
+      {25u, 9u},
+      {25u, 10u},
+      67.f,
+      15.f,
+      -4.f,
+      5.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line4 =
+    {
+      {34u, 14u},
+      {35u, 14u},
+      96.f,
+      15.f,
+      -4.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  Vector<LineRun> lines;
+  lines.PushBack(line0);
+  lines.PushBack(line1);
+  lines.PushBack(line2);
+  lines.PushBack(line3);
+  lines.PushBack(line4);
+
+  LayoutTextData data =
+    {
+      "Layout simple multiline text",
+      "Hello world demo.\n"
+      "Layout different lines of text.",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      48u,
+      positions,
+      5u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      48u,
+      false,
+      true,
+      0.0f};
+
+  if(!LayoutTextTest(data))
+  {
+    tet_result(TET_FAIL);
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextCharacterSpacingMultilineText2(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextCharacterSpacingMultilineText2");
+
+  // Layout some lines of left to right text.
+
+  const std::string fontFamily("TizenSans");
+
+  // Set a known font description
+  FontDescriptionRun fontDescriptionRun1;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
+  fontDescriptionRun1.characterRun.numberOfCharacters = 18u;
+  fontDescriptionRun1.familyLength                    = fontFamily.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength);
+  fontDescriptionRun1.familyDefined = true;
+  fontDescriptionRun1.weightDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = false;
+
+  FontDescriptionRun fontDescriptionRun2;
+  fontDescriptionRun2.characterRun.characterIndex     = 18u;
+  fontDescriptionRun2.characterRun.numberOfCharacters = 31u;
+  fontDescriptionRun2.familyLength                    = fontFamily.size();
+  fontDescriptionRun2.familyName                      = new char[fontDescriptionRun2.familyLength];
+  memcpy(fontDescriptionRun2.familyName, fontFamily.c_str(), fontDescriptionRun2.familyLength);
+  fontDescriptionRun2.familyDefined = true;
+  fontDescriptionRun2.weightDefined = false;
+  fontDescriptionRun2.widthDefined  = false;
+  fontDescriptionRun2.slantDefined  = false;
+  fontDescriptionRun2.sizeDefined   = false;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
+  fontDescriptionRuns.PushBack(fontDescriptionRun2);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(99.f, 116.f);
+  float positions[] =
+    {
+      0.f, -12.f, 12.f, -9.f, 23.f, -13.f, 29.f, -13.f, 34.f, -9.f, 45.f, -0.f, 51.f, -9.f, 65.f, -9.f, 77.f, -9.f, 85.f, -13.f, 90.f, -13.f, 101.f, -0.f, 0.f, -13.f, 11.f, -9.f, 22.f, -9.f, 37.f, -9.f, 48.f, -2.f, 54.f, -12.f, 0.f, -12.f, 10.f, -9.f, 22.f, -9.f, 33.f, -9.f, 46.f, -9.f, 57.f, -11.f, 65.f, -0.f, 0.f, -12.f, 13.f, -12.f, 18.f, -12.f, 31.f, -9.f, 44.f, -9.f, 51.f, -9.f, 64.f, -9.f, 75.f, -11.f, 83.f, -0.f, 0.f, -12.f, 6.f, -12.f, 12.f, -9.f, 23.f, -9.f, 35.f, -9.f, 45.f, -0.f, 52.f, -9.f, 64.f, -12.f, 72.f, -0.f, 0.f, -11.f, 8.f, -9.f, 20.f, -9.f, 31.f, -11.f, 40.f, -2.f
+    };
+  struct LineRun line0 =
+    {
+      {0u, 12u},
+      {0u, 12u},
+      99.f,
+      15.f,
+      -5.f,
+      6.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line1 =
+    {
+      {12u, 6u},
+      {12u, 6u},
+      51.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line2 =
+    {
+      {18u, 7u},
+      {18u, 7u},
+      63.f,
+      15.f,
+      -4.f,
+      7.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line3 =
+    {
+      {25u, 9u},
+      {25u, 10u},
+      81.f,
+      15.f,
+      -4.f,
+      7.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line4 =
+    {
+      {34u, 9u},
+      {35u, 9u},
+      70.f,
+      15.f,
+      -4.f,
+      7.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line5 =
+    {
+      {43u, 5u},
+      {44u, 5u},
+      43.f,
+      15.f,
+      -4.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  Vector<LineRun> lines;
+  lines.PushBack(line0);
+  lines.PushBack(line1);
+  lines.PushBack(line2);
+  lines.PushBack(line3);
+  lines.PushBack(line4);
+  lines.PushBack(line5);
+
+  LayoutTextData data =
+    {
+      "Layout simple multiline text",
+      "Hello world demo.\n"
+      "Layout different lines of text.",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      48u,
+      positions,
+      6u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      48u,
+      false,
+      true,
+      2.0f};
+
+  if(!LayoutTextTest(data))
+  {
+    tet_result(TET_FAIL);
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Characters.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Characters.cpp
new file mode 100755
index 0000000..259d682
--- /dev/null
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Characters.cpp
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/internal/text/characters-helper-functions.h>
+#include <toolkit-text-utils.h>
+
+using namespace Dali;
+using namespace Toolkit;
+using namespace Text;
+
+// Tests the following function.
+//
+//  CharacterRun RetrieveClusteredCharactersOfCharacterIndex(const VisualModelPtr&  visualModel,
+//                                                          const LogicalModelPtr& logicalModel,
+//                                                          const CharacterIndex&  characterIndex)
+
+//////////////////////////////////////////////////////////
+
+namespace
+{
+const std::string  DEFAULT_FONT_DIR("/resources/fonts");
+const unsigned int DEFAULT_FONT_SIZE = 1152u;
+
+struct RetrieveClusteredCharactersOfCharacterIndexData
+{
+  std::string     description;            ///< Description of the test.
+  std::string     text;                   ///< Input text.
+  bool            markupProcessorEnabled; //< Enable markup processor to use markup text.
+  unsigned int    numberOfTests;          ///< The number of tests.
+  CharacterIndex* characterIndex;         ///< The character index for each test.
+  CharacterRun*   clusteredCharacters;    ///< The expected clustered characters run for each test.
+};
+
+bool GetRetrieveClusteredCharactersOfCharacterIndexTest(const RetrieveClusteredCharactersOfCharacterIndexData& data)
+{
+  std::cout << "  testing : " << data.description << std::endl;
+
+  // 1) Create the model.
+  ModelPtr   textModel;
+  MetricsPtr metrics;
+  Size       textArea(400.f, 600.f);
+  Size       layoutSize;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+  LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  data.markupProcessorEnabled,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
+
+  LogicalModelPtr logicalModel = textModel->mLogicalModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
+
+  for(unsigned int index = 0; index < data.numberOfTests; ++index)
+  {
+    CharacterRun clusteredCharacters = RetrieveClusteredCharactersOfCharacterIndex(visualModel, logicalModel, data.characterIndex[index]);
+
+    if(clusteredCharacters.characterIndex != data.clusteredCharacters[index].characterIndex)
+    {
+      std::cout << "  test " << index << " failed. Different clusteredCharacters.characterIndex : " << clusteredCharacters.characterIndex << ", expected : " << data.clusteredCharacters[index].characterIndex << std::endl;
+      return false;
+    }
+
+    if(clusteredCharacters.numberOfCharacters != data.clusteredCharacters[index].numberOfCharacters)
+    {
+      std::cout << "  test " << index << " failed. Different clusteredCharacters.numberOfCharacters : " << clusteredCharacters.numberOfCharacters << ", expected : " << data.clusteredCharacters[index].numberOfCharacters << std::endl;
+      return false;
+    }
+  }
+
+  return true;
+}
+
+} // namespace
+
+//////////////////////////////////////////////////////////
+//
+// UtcDaliRetrieveClusteredCharactersOfCharacterIndex
+//
+//////////////////////////////////////////////////////////
+
+int UtcDaliRetrieveClusteredCharactersOfCharacterIndex(void)
+{
+  tet_infoline(" UtcDaliRetrieveClusteredCharactersOfCharacterIndex");
+
+  CharacterIndex characterIndex01[] = {0u, 1u, 2u, 10u};
+
+  CharacterRun clusteredCharacters01[] = {
+    {0u, 1u},
+    {1u, 1u},
+    {2u, 1u},
+    {10u, 1u}};
+
+  CharacterIndex characterIndex02[] = {0u, 4u, 6u};
+
+  CharacterRun clusteredCharacters02[] = {
+    {0u, 7u},
+    {0u, 7u},
+    {0u, 7u}};
+
+  CharacterIndex characterIndex03[] = {3u, 9u, 14u};
+
+  CharacterRun clusteredCharacters03[] = {
+    {2u, 7u},
+    {9u, 1u},
+    {11u, 4u}};
+
+  CharacterIndex characterIndex04[] = {0u, 1u, 2u, 10u};
+
+  CharacterRun clusteredCharacters04[] = {
+    {0u, 1u},
+    {1u, 1u},
+    {2u, 1u},
+    {10u, 1u}};
+
+  struct RetrieveClusteredCharactersOfCharacterIndexData data[] =
+    {
+      {"Easy latin script",
+       "Hello world",
+       true,
+       4u,
+       characterIndex01,
+       clusteredCharacters01},
+
+      {"FamilyManWomanGirlBoy Single Complex Emoji script",
+       "&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;",
+       true,
+       3u,
+       characterIndex02,
+       clusteredCharacters02},
+
+      {"Long text many Emojis with letters",
+       "AB&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;AB&#x1F469;&#x1F3FB;&#x200D;&#x1F52C;B&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;AA&#x262a;&#xfe0e;B&#x262a;&#xfe0f;AB",
+       true,
+       3u,
+       characterIndex03,
+       clusteredCharacters03},
+
+      {"Arabic script",
+       "اهلا و سهلا",
+       true,
+       4u,
+       characterIndex04,
+       clusteredCharacters04},
+    };
+  const unsigned int numberOfTests = 4u;
+
+  for(unsigned int index = 0; index < numberOfTests; ++index)
+  {
+    ToolkitTestApplication application;
+    if(!GetRetrieveClusteredCharactersOfCharacterIndexTest(data[index]))
+    {
+      tet_result(TET_FAIL);
+    }
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
old mode 100755
new mode 100644
index b079ce3..774cce1
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,13 @@
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <toolkit-text-utils.h>
-#include <dali/devel-api/events/key-event-devel.h>
 #include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali/devel-api/events/key-event-devel.h>
+#include <toolkit-text-utils.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -36,30 +36,23 @@ using namespace Text;
 
 namespace
 {
+const char* const OPTION_SELECT_ALL("option-select_all"); // "Select All" popup option.
+const char* const OPTION_CUT("optionCut");                // "Cut" popup option.
+const char* const OPTION_COPY("optionCopy");              // "Copy" popup option.
+const char* const OPTION_PASTE("optionPaste");            // "Paste" popup option.
+const char* const OPTION_CLIPBOARD("optionClipboard");    // "Clipboard" popup option.
 
-const char* const OPTION_SELECT_ALL("option-select_all");   // "Select All" popup option.
-const char* const OPTION_CUT("optionCut");                  // "Cut" popup option.
-const char* const OPTION_COPY("optionCopy");                // "Copy" popup option.
-const char* const OPTION_PASTE("optionPaste");              // "Paste" popup option.
-const char* const OPTION_CLIPBOARD("optionClipboard");      // "Clipboard" popup option.
-
-const Size CONTROL_SIZE( 300.f, 60.f );
-
-std::string gClipboardText;
-void ContentSelectedCallback( ClipboardEventNotifier& notifier )
-{
-  gClipboardText = notifier.GetContent();
-}
+const Size CONTROL_SIZE(300.f, 60.f);
 
 // Generate a KeyEvent to send to Core.
-Dali::KeyEvent GenerateKey( const std::string& keyName,
-                            const std::string& keyString,
-                            int keyCode,
-                            int keyModifier,
-                            unsigned long timeStamp,
-                            const Dali::KeyEvent::State& keyState )
+Dali::KeyEvent GenerateKey(const std::string&           keyName,
+                           const std::string&           keyString,
+                           int                          keyCode,
+                           int                          keyModifier,
+                           unsigned long                timeStamp,
+                           const Dali::KeyEvent::State& keyState)
 {
-  return DevelKeyEvent::New( keyName, "", keyString, keyCode, keyModifier, timeStamp, keyState, "", "", Device::Class::NONE, Device::Subclass::NONE );
+  return DevelKeyEvent::New(keyName, "", keyString, keyCode, keyModifier, timeStamp, keyState, "", "", Device::Class::NONE, Device::Subclass::NONE);
 }
 
 } // namespace
@@ -71,7 +64,7 @@ int UtcDaliTextController(void)
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -84,25 +77,25 @@ int UtcDaliTextControllerSetGetScrollEnabled(void)
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
-  DALI_TEST_CHECK( !controller->IsHorizontalScrollEnabled() );
-  DALI_TEST_CHECK( controller->IsVerticalScrollEnabled() );
+  DALI_TEST_CHECK(!controller->IsHorizontalScrollEnabled());
+  DALI_TEST_CHECK(controller->IsVerticalScrollEnabled());
 
   // Configures the text controller similarly to the text-field.
-  ConfigureTextField( controller );
+  ConfigureTextField(controller);
 
-  DALI_TEST_CHECK( controller->IsHorizontalScrollEnabled() );
-  DALI_TEST_CHECK( !controller->IsVerticalScrollEnabled() );
+  DALI_TEST_CHECK(controller->IsHorizontalScrollEnabled());
+  DALI_TEST_CHECK(!controller->IsVerticalScrollEnabled());
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
-  DALI_TEST_CHECK( !controller->IsHorizontalScrollEnabled() );
-  DALI_TEST_CHECK( !controller->IsVerticalScrollEnabled() );
+  DALI_TEST_CHECK(!controller->IsHorizontalScrollEnabled());
+  DALI_TEST_CHECK(!controller->IsVerticalScrollEnabled());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -115,28 +108,28 @@ int UtcDaliTextControllerSetIsTextElide(void)
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
-  DALI_TEST_EQUALS( false, controller->IsTextElideEnabled(), TEST_LOCATION );
+  ConfigureTextEditor(controller);
+  DALI_TEST_EQUALS(false, controller->IsTextElideEnabled(), TEST_LOCATION);
 
-  controller->SetTextElideEnabled( true );
-  DALI_TEST_EQUALS( true, controller->IsTextElideEnabled(), TEST_LOCATION );
+  controller->SetTextElideEnabled(true);
+  DALI_TEST_EQUALS(true, controller->IsTextElideEnabled(), TEST_LOCATION);
 
   // Configures the text controller similarly to the text-field.
-  ConfigureTextField( controller );
-  DALI_TEST_EQUALS( false, controller->IsTextElideEnabled(), TEST_LOCATION );
+  ConfigureTextField(controller);
+  DALI_TEST_EQUALS(false, controller->IsTextElideEnabled(), TEST_LOCATION);
 
-  controller->SetTextElideEnabled( true );
-  DALI_TEST_EQUALS( true, controller->IsTextElideEnabled(), TEST_LOCATION );
+  controller->SetTextElideEnabled(true);
+  DALI_TEST_EQUALS(true, controller->IsTextElideEnabled(), TEST_LOCATION);
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
-  DALI_TEST_EQUALS( true, controller->IsTextElideEnabled(), TEST_LOCATION );
+  ConfigureTextLabel(controller);
+  DALI_TEST_EQUALS(true, controller->IsTextElideEnabled(), TEST_LOCATION);
 
-  controller->SetTextElideEnabled( false );
-  DALI_TEST_EQUALS( false, controller->IsTextElideEnabled(), TEST_LOCATION );
+  controller->SetTextElideEnabled(false);
+  DALI_TEST_EQUALS(false, controller->IsTextElideEnabled(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -149,28 +142,28 @@ int UtcDaliTextControllerEnableCursorBlinking(void)
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   // There is no text input enabled.
-  DALI_TEST_CHECK( !controller->GetEnableCursorBlink() );
+  DALI_TEST_CHECK(!controller->GetEnableCursorBlink());
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator          = Text::Decorator::New(*controller,
+                                                      *controller);
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Enables the cursor blink.
-  controller->SetEnableCursorBlink( true );
+  controller->SetEnableCursorBlink(true);
 
-  DALI_TEST_CHECK( controller->GetEnableCursorBlink() );
+  DALI_TEST_CHECK(controller->GetEnableCursorBlink());
 
   // Disables the cursor blink.
-  controller->SetEnableCursorBlink( false );
+  controller->SetEnableCursorBlink(false);
 
-  DALI_TEST_CHECK( !controller->GetEnableCursorBlink() );
+  DALI_TEST_CHECK(!controller->GetEnableCursorBlink());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -184,102 +177,110 @@ int UtcDaliTextControllerImfEvent(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  std::string text;
+  std::string                   text;
   InputMethodContext::EventData imfEvent;
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator = Text::Decorator::New(*controller,
+                                                      *controller);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Set the placeholder text.
-  controller->SetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, "Hello Dali" );
+  controller->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, "Hello Dali");
 
   // For coverage.
-  imfEvent = InputMethodContext::EventData( InputMethodContext::GET_SURROUNDING, "", 0, 0 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::GET_SURROUNDING, "", 0, 0);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Send VOID event.
-  imfEvent = InputMethodContext::EventData( InputMethodContext::VOID, "", 0, 0 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::VOID, "", 0, 0);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
-  controller->GetText( text );
-  DALI_TEST_CHECK( text.empty() );
+  controller->GetText(text);
+  DALI_TEST_CHECK(text.empty());
+  DALI_TEST_EQUALS(0u, controller->GetNumberOfCharacters(), TEST_LOCATION); // We should ignore Placeholder text here
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "Hello ", 0, 6 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::COMMIT, "Hello ", 0, 6);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
   controller->GetNaturalSize();
 
   // Check 'Delete All' key which means the input panel send a big range
-  imfEvent = InputMethodContext::EventData( InputMethodContext::DELETE_SURROUNDING, "", -100, 100 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::DELETE_SURROUNDING, "", -100, 100);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   // Send COMMIT event.
-  imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "Hello ", 0, 6 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::COMMIT, "Hello ", 0, 6);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello ", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello ", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(6u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   // Send PRE_EDIT event
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   // Send DELETE_SURROUNDING event
-  imfEvent = InputMethodContext::EventData( InputMethodContext::DELETE_SURROUNDING, "", -1, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::DELETE_SURROUNDING, "", -1, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello ", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello ", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(6u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   // for coverage
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::UNDERLINE );
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::UNDERLINE);
 
   // Send PRE_EDIT event
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "wo", 6, 2 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "wo", 6, 2);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello wo", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(8u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   // Send GET_SURROUNDING event
-  imfEvent = InputMethodContext::EventData( InputMethodContext::GET_SURROUNDING, "", 0, 0 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::GET_SURROUNDING, "", 0, 0);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello wo", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(8u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   // Send PRIVATE_COMMAND event
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRIVATE_COMMAND, "", 0, 0 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRIVATE_COMMAND, "", 0, 0);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello wo", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(8u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -293,94 +294,102 @@ int UtcDaliTextControllerImfPreeditStyle(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  std::string text;
+  std::string                   text;
   InputMethodContext::EventData imfEvent;
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   // Configures the text controller similarly to the text-field.
-  ConfigureTextField( controller );
+  ConfigureTextField(controller);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
 
   // Send COMMIT event.
-  imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "Hello ", 0, 6 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::COMMIT, "Hello ", 0, 6);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello ", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello ", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(6u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   // Send PRE_EDIT event
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::NONE );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::NONE);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Set the preedit style as REVERSE
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::REVERSE );
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::REVERSE);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Set the preedit style as HIGHLIGHT
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::HIGHLIGHT );
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::HIGHLIGHT);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Set the preedit style as CUSTOM_PLATFORM_STYLE_1
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_1 );
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_1);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Set the preedit style as CUSTOM_PLATFORM_STYLE_2
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_2 );
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_2);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Set the preedit style as CUSTOM_PLATFORM_STYLE_3
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_3 );
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_3);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "w", 6, 1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Set the preedit style as CUSTOM_PLATFORM_STYLE_4
-  inputMethodContext.SetPreeditStyle( InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_4 );
+  inputMethodContext.SetPreeditStyle(InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_4);
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION );
+  controller->GetText(text);
+  DALI_TEST_EQUALS("Hello w", text, TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, controller->GetNumberOfCharacters(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -394,7 +403,7 @@ int UtcDaliTextControllerImfPreeditStyleReverse(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  std::string text;
+  std::string                   text;
   InputMethodContext::EventData imfEvent;
 
   DALI_TEST_CHECK(controller);
@@ -410,11 +419,11 @@ int UtcDaliTextControllerImfPreeditStyleReverse(void)
 
   // For coverage, mEditableControlInterface is required.
   // Creates a temporary text-field to use mEditableControlInterface.
-  TextField field = TextField::New();
-  Toolkit::Internal::TextField& fieldImpl = GetImpl(field);
-  ControllerPtr fieldController = fieldImpl.GetTextController();
-  Controller::Impl& fieldControllerImpl = Controller::Impl::GetImplementation(*fieldController.Get());
-  Controller::Impl& controllerImpl = Controller::Impl::GetImplementation(*controller.Get());
+  TextField                     field               = TextField::New();
+  Toolkit::Internal::TextField& fieldImpl           = GetImpl(field);
+  ControllerPtr                 fieldController     = fieldImpl.GetTextController();
+  Controller::Impl&             fieldControllerImpl = Controller::Impl::GetImplementation(*fieldController.Get());
+  Controller::Impl&             controllerImpl      = Controller::Impl::GetImplementation(*controller.Get());
 
   // For coverage, mEditableControlInterface is required.
   controllerImpl.mEditableControlInterface = fieldControllerImpl.mEditableControlInterface;
@@ -438,34 +447,34 @@ int UtcDaliTextControllerTextPopupButtonTouched(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
-  std::string text;
-  PushButton button;
+  std::string   text;
+  PushButton    button;
   Property::Map attributes;
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator = Text::Decorator::New(*controller,
+                                                      *controller);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Creates the text's popup.
   TextSelectionPopupCallbackInterface& callbackInterface = *controller;
-  TextSelectionPopup textPopup = TextSelectionPopup::New( &callbackInterface );
+  TextSelectionPopup                   textPopup         = TextSelectionPopup::New(&callbackInterface);
 
-  Toolkit::TextSelectionPopup::Buttons buttonsToEnable = static_cast<Toolkit::TextSelectionPopup::Buttons>( TextSelectionPopup::CUT        |
-                                                                                                            TextSelectionPopup::COPY       |
-                                                                                                            TextSelectionPopup::PASTE      |
-                                                                                                            TextSelectionPopup::SELECT     |
-                                                                                                            TextSelectionPopup::SELECT_ALL |
-                                                                                                            TextSelectionPopup::CLIPBOARD );
+  Toolkit::TextSelectionPopup::Buttons buttonsToEnable = static_cast<Toolkit::TextSelectionPopup::Buttons>(TextSelectionPopup::CUT |
+                                                                                                           TextSelectionPopup::COPY |
+                                                                                                           TextSelectionPopup::PASTE |
+                                                                                                           TextSelectionPopup::SELECT |
+                                                                                                           TextSelectionPopup::SELECT_ALL |
+                                                                                                           TextSelectionPopup::CLIPBOARD);
 
-  textPopup.EnableButtons( buttonsToEnable );
-  application.GetScene().Add( textPopup );
+  textPopup.EnableButtons(buttonsToEnable);
+  application.GetScene().Add(textPopup);
   textPopup.ShowPopup();
 
   // Render and notify
@@ -473,84 +482,82 @@ int UtcDaliTextControllerTextPopupButtonTouched(void)
   application.Render();
 
   // Sets some text.
-  controller->SetText( "Hello world" );
+  controller->SetText("Hello world");
 
   // When the TextSelectionPopup is active, the controller has focus.
   controller->KeyboardFocusGainEvent();
 
   // Select the whole text.
-  button = PushButton::DownCast( textPopup.FindChildByName( OPTION_SELECT_ALL ) );
-  DALI_TEST_CHECK( button );
+  button = PushButton::DownCast(textPopup.FindChildByName(OPTION_SELECT_ALL));
+  DALI_TEST_CHECK(button);
 
-  button.DoAction( "buttonClick", attributes );
+  button.DoAction("buttonClick", attributes);
 
   // Call relayout to process the input events.
-  controller->Relayout( CONTROL_SIZE );
+  controller->Relayout(CONTROL_SIZE);
 
   // Cut the text.
-  button = PushButton::DownCast( textPopup.FindChildByName( OPTION_CUT ) );
-  DALI_TEST_CHECK( button );
+  button = PushButton::DownCast(textPopup.FindChildByName(OPTION_CUT));
+  DALI_TEST_CHECK(button);
 
-  button.DoAction( "buttonClick", attributes );
+  button.DoAction("buttonClick", attributes);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_CHECK( text.empty() );
+  controller->GetText(text);
+  DALI_TEST_CHECK(text.empty());
 
   // Set text again.
-  controller->SetText( "Hello world" );
+  controller->SetText("Hello world");
 
   // Select the whole text.
-  button = PushButton::DownCast( textPopup.FindChildByName( OPTION_SELECT_ALL ) );
-  DALI_TEST_CHECK( button );
+  button = PushButton::DownCast(textPopup.FindChildByName(OPTION_SELECT_ALL));
+  DALI_TEST_CHECK(button);
 
-  button.DoAction( "buttonClick", attributes );
+  button.DoAction("buttonClick", attributes);
 
   // Call relayout to process the input events.
-  controller->Relayout( CONTROL_SIZE );
+  controller->Relayout(CONTROL_SIZE);
 
   // Copy to the clipboard.
-  button = PushButton::DownCast( textPopup.FindChildByName( OPTION_COPY ) );
-  DALI_TEST_CHECK( button );
+  button = PushButton::DownCast(textPopup.FindChildByName(OPTION_COPY));
+  DALI_TEST_CHECK(button);
 
-  button.DoAction( "buttonClick", attributes );
+  button.DoAction("buttonClick", attributes);
 
   // Call relayout to process the input events.
-  controller->Relayout( CONTROL_SIZE );
+  controller->Relayout(CONTROL_SIZE);
 
   // Cut the text.
-  button = PushButton::DownCast( textPopup.FindChildByName( OPTION_CUT ) );
-  DALI_TEST_CHECK( button );
+  button = PushButton::DownCast(textPopup.FindChildByName(OPTION_CUT));
+  DALI_TEST_CHECK(button);
 
-  button.DoAction( "buttonClick", attributes );
+  button.DoAction("buttonClick", attributes);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
-  controller->GetText( text );
-  DALI_TEST_CHECK( text.empty() );
-
-  ClipboardEventNotifier clipboardEventNotifier = ClipboardEventNotifier::Get();
-  clipboardEventNotifier.ContentSelectedSignal().Connect( &ContentSelectedCallback );
+  controller->GetText(text);
+  DALI_TEST_CHECK(text.empty());
 
   // Paste the text.
-  button = PushButton::DownCast( textPopup.FindChildByName( OPTION_PASTE ) );
-  DALI_TEST_CHECK( button );
+  button = PushButton::DownCast(textPopup.FindChildByName(OPTION_PASTE));
+  DALI_TEST_CHECK(button);
 
-  button.DoAction( "buttonClick", attributes );
+  button.DoAction("buttonClick", attributes);
 
   // Call relayout to process the input events.
-  controller->Relayout( CONTROL_SIZE );
+  controller->Relayout(CONTROL_SIZE);
+  controller->GetText(text);
 
-  DALI_TEST_EQUALS( "Hello world", gClipboardText, TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello world", text.c_str(), TEST_LOCATION);
 
   // Show the clipboard.
-  button = PushButton::DownCast( textPopup.FindChildByName( OPTION_CLIPBOARD ) );
-  DALI_TEST_CHECK( button );
+  button = PushButton::DownCast(textPopup.FindChildByName(OPTION_CLIPBOARD));
+  DALI_TEST_CHECK(button);
 
-  button.DoAction( "buttonClick", attributes );
+  button.DoAction("buttonClick", attributes);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -564,11 +571,11 @@ int UtcDaliTextControllerGetInputShadowProperty(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   const std::string& shadowProperties = controller->GetInputShadowProperties();
 
-  DALI_TEST_CHECK( shadowProperties.empty() );
+  DALI_TEST_CHECK(shadowProperties.empty());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -582,11 +589,11 @@ int UtcDaliTextControllerGetInputUnderlineProperty(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   const std::string& underlineProperties = controller->GetInputUnderlineProperties();
 
-  DALI_TEST_CHECK( underlineProperties.empty() );
+  DALI_TEST_CHECK(underlineProperties.empty());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -600,28 +607,28 @@ int UtcDaliTextControllerSetGetAutoScrollEnabled(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
-  DALI_TEST_CHECK( !controller->IsAutoScrollEnabled() );
+  DALI_TEST_CHECK(!controller->IsAutoScrollEnabled());
 
   // The auto scrolling shouldn't be enabled if the multi-line is enabled.
 
   // Enable multi-line.
-  controller->SetMultiLineEnabled( true );
+  controller->SetMultiLineEnabled(true);
 
   // Enable text scrolling.
-  controller->SetAutoScrollEnabled( true );
+  controller->SetAutoScrollEnabled(true);
 
-  DALI_TEST_CHECK( !controller->IsAutoScrollEnabled() );
+  DALI_TEST_CHECK(!controller->IsAutoScrollEnabled());
 
   // Disable multi-line.
-  controller->SetMultiLineEnabled( false );
+  controller->SetMultiLineEnabled(false);
 
   // Enable text scrolling.
-  controller->SetAutoScrollEnabled( true );
+  controller->SetAutoScrollEnabled(true);
 
   // Should be ebabled now.
-  DALI_TEST_CHECK( controller->IsAutoScrollEnabled() );
+  DALI_TEST_CHECK(controller->IsAutoScrollEnabled());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -635,27 +642,27 @@ int UtcDaliTextControllerSetGetCheckProperty(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller, *controller );
+  Text::DecoratorPtr decorator = Text::Decorator::New(*controller, *controller);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
-  DALI_TEST_CHECK( !controller->IsInputModePassword() );
+  DALI_TEST_CHECK(!controller->IsInputModePassword());
 
   // Set the text input to password.
-  controller->SetInputModePassword( true );
+  controller->SetInputModePassword(true);
 
-  DALI_TEST_CHECK( controller->IsInputModePassword() );
+  DALI_TEST_CHECK(controller->IsInputModePassword());
 
   // Unset the text input to password.
-  controller->SetInputModePassword( false );
+  controller->SetInputModePassword(false);
 
-  DALI_TEST_CHECK( !controller->IsInputModePassword() );
+  DALI_TEST_CHECK(!controller->IsInputModePassword());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -669,34 +676,34 @@ int UtcDaliTextControllerSetGetTapLongPressAction(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  DALI_TEST_CHECK( controller );
+  DALI_TEST_CHECK(controller);
 
   // Test first with no decorator.
 
-  DALI_TEST_EQUALS( Controller::NoTextTap::NO_ACTION, controller->GetNoTextDoubleTapAction(), TEST_LOCATION );
-  controller->SetNoTextDoubleTapAction( Controller::NoTextTap::HIGHLIGHT );
-  DALI_TEST_EQUALS( Controller::NoTextTap::NO_ACTION, controller->GetNoTextDoubleTapAction(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Controller::NoTextTap::NO_ACTION, controller->GetNoTextDoubleTapAction(), TEST_LOCATION);
+  controller->SetNoTextDoubleTapAction(Controller::NoTextTap::HIGHLIGHT);
+  DALI_TEST_EQUALS(Controller::NoTextTap::NO_ACTION, controller->GetNoTextDoubleTapAction(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( Controller::NoTextTap::NO_ACTION, controller->GetNoTextLongPressAction(), TEST_LOCATION );
-  controller->SetNoTextLongPressAction( Controller::NoTextTap::HIGHLIGHT );
-  DALI_TEST_EQUALS( Controller::NoTextTap::NO_ACTION, controller->GetNoTextLongPressAction(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Controller::NoTextTap::NO_ACTION, controller->GetNoTextLongPressAction(), TEST_LOCATION);
+  controller->SetNoTextLongPressAction(Controller::NoTextTap::HIGHLIGHT);
+  DALI_TEST_EQUALS(Controller::NoTextTap::NO_ACTION, controller->GetNoTextLongPressAction(), TEST_LOCATION);
 
   // Add a decorator and re-test.
 
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller, *controller );
+  Text::DecoratorPtr decorator = Text::Decorator::New(*controller, *controller);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
-  DALI_TEST_EQUALS( Controller::NoTextTap::NO_ACTION, controller->GetNoTextDoubleTapAction(), TEST_LOCATION );
-  controller->SetNoTextDoubleTapAction( Controller::NoTextTap::HIGHLIGHT );
-  DALI_TEST_EQUALS( Controller::NoTextTap::HIGHLIGHT, controller->GetNoTextDoubleTapAction(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Controller::NoTextTap::NO_ACTION, controller->GetNoTextDoubleTapAction(), TEST_LOCATION);
+  controller->SetNoTextDoubleTapAction(Controller::NoTextTap::HIGHLIGHT);
+  DALI_TEST_EQUALS(Controller::NoTextTap::HIGHLIGHT, controller->GetNoTextDoubleTapAction(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( Controller::NoTextTap::SHOW_SELECTION_POPUP, controller->GetNoTextLongPressAction(), TEST_LOCATION ); // The default is SHOW_SELECTION_POPUP
-  controller->SetNoTextLongPressAction( Controller::NoTextTap::HIGHLIGHT );
-  DALI_TEST_EQUALS( Controller::NoTextTap::HIGHLIGHT, controller->GetNoTextLongPressAction(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Controller::NoTextTap::SHOW_SELECTION_POPUP, controller->GetNoTextLongPressAction(), TEST_LOCATION); // The default is SHOW_SELECTION_POPUP
+  controller->SetNoTextLongPressAction(Controller::NoTextTap::HIGHLIGHT);
+  DALI_TEST_EQUALS(Controller::NoTextTap::HIGHLIGHT, controller->GetNoTextLongPressAction(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -706,7 +713,7 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
   tet_infoline(" UtcDaliTextControllerSetGetLineSpacingProperty");
   ToolkitTestApplication application;
 
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
 
   // single line text
   const std::string textSingle("A Quick Brown Fox Jumps Over The Lazy Dog");
@@ -721,106 +728,104 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
 
   // single line, line spacing = 0px
   {
-    const float EXPECTED_SPACING = 0.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 349.0f, 19.0f);
-    const Vector3 EXPECTED_NATURAL_SIZE( 350.0f, 20.0f, 0.0f );
+    const float   EXPECTED_SPACING = 0.0f;
+    const Vector2 EXPECTED_LAYOUT_SIZE(350.0f, 19.0f);
+    const Vector3 EXPECTED_NATURAL_SIZE(350.0f, 20.0f, 0.0f);
 
     controller->SetText(textSingle);
     controller->Relayout(size);
-    controller->SetMultiLineEnabled( false );
+    controller->SetMultiLineEnabled(false);
 
     Vector3 naturalSize  = controller->GetNaturalSize();
     Vector2 layoutSize   = controller->GetTextModel()->GetLayoutSize();
-    float lineSpacing0 = controller->GetDefaultLineSpacing();
+    float   lineSpacing0 = controller->GetDefaultLineSpacing();
 
-    DALI_TEST_EQUALS( EXPECTED_SPACING, lineSpacing0, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION );
+    DALI_TEST_EQUALS(EXPECTED_SPACING, lineSpacing0, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION);
   }
 
   // single line, line spacing = 20px
   {
-    const float EXPECTED_SPACING = 20.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 349.0f, 19.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 350.0f, 40.0f, 0.0f );
+    const float   EXPECTED_SPACING = 20.0f;
+    const Vector2 EXPECTED_LAYOUT_SIZE(350.0f, 19.0f);
+    const Vector3 EXPECTED_NATURAL_SIZE(350.0f, 40.0f, 0.0f);
 
     controller->SetText(textSingle);
     controller->Relayout(size);
-    controller->SetDefaultLineSpacing( 20 );
-    controller->SetMultiLineEnabled( false );
+    controller->SetDefaultLineSpacing(20);
+    controller->SetMultiLineEnabled(false);
 
     Vector3 naturalSize  = controller->GetNaturalSize();
     Vector2 layoutSize   = controller->GetTextModel()->GetLayoutSize();
-    float lineSpacing0 = controller->GetDefaultLineSpacing();
+    float   lineSpacing0 = controller->GetDefaultLineSpacing();
 
-    DALI_TEST_EQUALS( EXPECTED_SPACING, lineSpacing0, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION );
+    DALI_TEST_EQUALS(EXPECTED_SPACING, lineSpacing0, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION);
   }
 
   // multi-line, line spacing = 0px
   {
-    const float EXPECTED_SPACING = 0.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 339.0f, 39.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 122.0f, 58.0f, 0.0f );
+    const float   EXPECTED_SPACING = 0.0f;
+    const Vector2 EXPECTED_LAYOUT_SIZE(340.0f, 39.0f);
+    const Vector3 EXPECTED_NATURAL_SIZE(122.0f, 58.0f, 0.0f);
 
     controller->SetText(textMulti);
     controller->Relayout(size);
-    controller->SetMultiLineEnabled( true );
-    controller->SetDefaultLineSpacing( 0 );
+    controller->SetMultiLineEnabled(true);
+    controller->SetDefaultLineSpacing(0);
 
     Vector3 naturalSize  = controller->GetNaturalSize();
     Vector2 layoutSize   = controller->GetTextModel()->GetLayoutSize();
-    float lineSpacing0 = controller->GetDefaultLineSpacing();
+    float   lineSpacing0 = controller->GetDefaultLineSpacing();
 
-    DALI_TEST_EQUALS( EXPECTED_SPACING, lineSpacing0, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION );
+    DALI_TEST_EQUALS(EXPECTED_SPACING, lineSpacing0, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION);
   }
 
   // multi-line, line spacing = 20px
   {
-    const float EXPECTED_SPACING = 20.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 121.0f, 57.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 122.0f, 118.0f, 0.0f );
+    const float   EXPECTED_SPACING = 20.0f;
+    const Vector2 EXPECTED_LAYOUT_SIZE(121.0f, 57.0f);
+    const Vector3 EXPECTED_NATURAL_SIZE(122.0f, 118.0f, 0.0f);
 
     controller->SetText(textMulti);
     controller->Relayout(size);
-    controller->SetMultiLineEnabled( true );
-    controller->SetDefaultLineSpacing( 20 );
+    controller->SetMultiLineEnabled(true);
+    controller->SetDefaultLineSpacing(20);
 
     Vector3 naturalSize  = controller->GetNaturalSize();
     Vector2 layoutSize   = controller->GetTextModel()->GetLayoutSize();
-    float lineSpacing0 = controller->GetDefaultLineSpacing();
+    float   lineSpacing0 = controller->GetDefaultLineSpacing();
 
-    DALI_TEST_EQUALS( EXPECTED_SPACING, lineSpacing0, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION );
+    DALI_TEST_EQUALS(EXPECTED_SPACING, lineSpacing0, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION);
   }
 
   // multi-line, line spacing = 30px
   {
-    const float EXPECTED_SPACING = 30.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 121.0f, 117.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 122.0f, 148.0f, 0.0f );
+    const float   EXPECTED_SPACING = 30.0f;
+    const Vector2 EXPECTED_LAYOUT_SIZE(121.0f, 117.0f);
+    const Vector3 EXPECTED_NATURAL_SIZE(122.0f, 148.0f, 0.0f);
 
     controller->SetText(textMulti);
     controller->Relayout(size);
-    controller->SetMultiLineEnabled( true );
-    controller->SetDefaultLineSpacing( 30 );
+    controller->SetMultiLineEnabled(true);
+    controller->SetDefaultLineSpacing(30);
 
     Vector3 naturalSize  = controller->GetNaturalSize();
     Vector2 layoutSize   = controller->GetTextModel()->GetLayoutSize();
-    float lineSpacing0 = controller->GetDefaultLineSpacing();
+    float   lineSpacing0 = controller->GetDefaultLineSpacing();
 
-    DALI_TEST_EQUALS( EXPECTED_SPACING, lineSpacing0, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION );
-    DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION );
+    DALI_TEST_EQUALS(EXPECTED_SPACING, lineSpacing0, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_LAYOUT_SIZE, layoutSize, TEST_LOCATION);
+    DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, naturalSize, TEST_LOCATION);
   }
 
-
   END_TEST;
-
 }
 
 int UtcDaliTextControllerCheckBufferIndices(void)
@@ -838,16 +843,42 @@ int UtcDaliTextControllerCheckBufferIndices(void)
   controller->SetText(text);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   // Tweak some parameters to make the indices to access the text buffer invalid
-  mImpl.mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl.mModel->mLogicalModel->mText.Count() * 10u;
+  mImpl.mTextUpdateInfo.mNumberOfCharactersToAdd    = mImpl.mModel->mLogicalModel->mText.Count() * 10u;
   mImpl.mTextUpdateInfo.mNumberOfCharactersToRemove = 0u;
   mImpl.mTextUpdateInfo.mPreviousNumberOfCharacters = 0u;
-  mImpl.mOperationsPending = Controller::ALL_OPERATIONS;
+  mImpl.mOperationsPending                          = Controller::ALL_OPERATIONS;
+
+  // Perform a relayout
+  const Size size(application.GetScene().GetSize());
+  controller->Relayout(size);
+
+  // Set the text
+  const std::string emptyText("");
+  controller->SetText(emptyText);
+
+  // Tweak some parameters to make the indices to access the text buffer invalid
+  mImpl.mTextUpdateInfo.mNumberOfCharactersToAdd    = 10u;
+  mImpl.mTextUpdateInfo.mNumberOfCharactersToRemove = 0u;
+  mImpl.mTextUpdateInfo.mPreviousNumberOfCharacters = 0u;
+  mImpl.mOperationsPending                          = Controller::ALL_OPERATIONS;
+
+  // Perform a relayout
+  controller->Relayout(size);
+
+  // Set the text
+  controller->SetText(text);
+
+  // Set the text size
+  controller->SetDefaultFontSize(10.f, Controller::POINT_SIZE);
+
+  // Tweak some parameters to make the indices to access the text buffer invalid
+  mImpl.mTextUpdateInfo.Clear();
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  controller->GetHeightForWidth(size.width / 2.f);
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -867,38 +898,38 @@ int UtcDaliTextControllerCheckInputColorChanged(void)
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator          = Text::Decorator::New(*controller,
+                                                      *controller);
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Set the text
   const std::string text("Hello World!");
   controller->SetText(text);
 
-  const Vector4 inputColor( 0.0f, 0.0f, 0.0f, 1.0f );
-  controller->SetInputColor( inputColor );
+  const Vector4 inputColor(0.0f, 0.0f, 0.0f, 1.0f);
+  controller->SetInputColor(inputColor);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   //  Reset operation
   mImpl.mOperationsPending = Controller::NO_OPERATION;
 
   // simulate a key event.
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN));
 
   // change the input color
-  const Vector4 newInputColor( 1.0f, 0.0f, 0.0f, 1.0f );
-  controller->SetInputColor( newInputColor );
+  const Vector4 newInputColor(1.0f, 0.0f, 0.0f, 1.0f);
+  controller->SetInputColor(newInputColor);
 
   // Check if relayout is requested or not when event state is INACTIVE.
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
-  DALI_TEST_EQUALS( Controller::COLOR, static_cast<Controller::OperationsMask>( mImpl.mOperationsPending & Controller::COLOR ), TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
+  DALI_TEST_EQUALS(Controller::COLOR, static_cast<Controller::OperationsMask>(mImpl.mOperationsPending & Controller::COLOR), TEST_LOCATION);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -918,11 +949,11 @@ int UtcDaliTextControllerCheckInputFontFamilyChanged(void)
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator          = Text::Decorator::New(*controller,
+                                                      *controller);
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Set the text and font family
   const std::string text("Hello World!");
@@ -930,24 +961,23 @@ int UtcDaliTextControllerCheckInputFontFamilyChanged(void)
   controller->SetInputFontFamily("SamsungOneUI_200");
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   //  Reset operation
   mImpl.mOperationsPending = Controller::NO_OPERATION;
 
   // simulate a key event.
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN));
 
   // change the input font family
   controller->SetInputFontFamily("SamsungOneUI_300");
 
   // Check if relayout is requested or not when event state is INACTIVE.
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
-  DALI_TEST_EQUALS( Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>( mImpl.mOperationsPending & Controller::VALIDATE_FONTS ),
-                    TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
+  DALI_TEST_EQUALS(Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>(mImpl.mOperationsPending & Controller::VALIDATE_FONTS), TEST_LOCATION);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -967,36 +997,35 @@ int UtcDaliTextControllerCheckInputFontWeightChanged(void)
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator          = Text::Decorator::New(*controller,
+                                                      *controller);
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Set the text
   const std::string text("Hello World!");
   controller->SetText(text);
-  controller->SetInputFontWeight( TextAbstraction::FontWeight::NORMAL );
+  controller->SetInputFontWeight(TextAbstraction::FontWeight::NORMAL);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   // Reset operation
   mImpl.mOperationsPending = Controller::NO_OPERATION;
 
   // simulate a key event.
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN));
 
   // change the input font weight
-  controller->SetInputFontWeight( TextAbstraction::FontWeight::BOLD );
+  controller->SetInputFontWeight(TextAbstraction::FontWeight::BOLD);
 
   // Check if relayout is requested or not when event state is INACTIVE.
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
-  DALI_TEST_EQUALS( Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>( mImpl.mOperationsPending & Controller::VALIDATE_FONTS ),
-                    TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
+  DALI_TEST_EQUALS(Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>(mImpl.mOperationsPending & Controller::VALIDATE_FONTS), TEST_LOCATION);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -1016,36 +1045,35 @@ int UtcDaliTextControllerCheckInputFontWidthChanged(void)
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator          = Text::Decorator::New(*controller,
+                                                      *controller);
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Set the text
   const std::string text("Hello World!");
   controller->SetText(text);
-  controller->SetInputFontWidth( TextAbstraction::FontWidth::NORMAL );
+  controller->SetInputFontWidth(TextAbstraction::FontWidth::NORMAL);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   // Reset operation
   mImpl.mOperationsPending = Controller::NO_OPERATION;
 
   // simulate a key event.
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN));
 
   // change the input font width
-  controller->SetInputFontWidth( TextAbstraction::FontWidth::EXPANDED );
+  controller->SetInputFontWidth(TextAbstraction::FontWidth::EXPANDED);
 
   // Check if relayout is requested or not when event state is INACTIVE.
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
-  DALI_TEST_EQUALS( Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>( mImpl.mOperationsPending & Controller::VALIDATE_FONTS ),
-                    TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
+  DALI_TEST_EQUALS(Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>(mImpl.mOperationsPending & Controller::VALIDATE_FONTS), TEST_LOCATION);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -1065,36 +1093,35 @@ int UtcDaliTextControllerCheckInputFontSlantChanged(void)
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator          = Text::Decorator::New(*controller,
+                                                      *controller);
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Set the text
   const std::string text("Hello World!");
   controller->SetText(text);
-  controller->SetInputFontSlant( TextAbstraction::FontSlant::NORMAL );
+  controller->SetInputFontSlant(TextAbstraction::FontSlant::NORMAL);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   //  Reset operation
   mImpl.mOperationsPending = Controller::NO_OPERATION;
 
   // simulate a key event.
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN));
 
   // change the input font slant
-  controller->SetInputFontSlant( TextAbstraction::FontSlant::ROMAN );
+  controller->SetInputFontSlant(TextAbstraction::FontSlant::ROMAN);
 
   // Check if relayout is requested or not when event state is INACTIVE.
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
-  DALI_TEST_EQUALS( Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>( mImpl.mOperationsPending & Controller::VALIDATE_FONTS ),
-                    TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
+  DALI_TEST_EQUALS(Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>(mImpl.mOperationsPending & Controller::VALIDATE_FONTS), TEST_LOCATION);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -1114,38 +1141,40 @@ int UtcDaliTextControllerCheckInputFontPointSizeChanged(void)
 
   // Enable the text input.
   // Creates a decorator.
-  Text::DecoratorPtr decorator = Text::Decorator::New( *controller,
-                                                       *controller );
+  Text::DecoratorPtr decorator          = Text::Decorator::New(*controller,
+                                                      *controller);
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Enables the text input.
-  controller->EnableTextInput( decorator, inputMethodContext );
+  controller->EnableTextInput(decorator, inputMethodContext);
 
   // Set the text
   const std::string text("Hello World!");
   controller->SetText(text);
-  controller->SetInputFontPointSize( 1.0f );
+  controller->SetInputFontPointSize(1.0f);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   //  Reset operation
   mImpl.mOperationsPending = Controller::NO_OPERATION;
 
   // simulate a key event.
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN));
 
   // change the input font point size
-  controller->SetInputFontPointSize( 1.2f );
+  controller->SetInputFontPointSize(1.2f);
 
   // Check if relayout is requested or not when event state is INACTIVE.
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
-  DALI_TEST_EQUALS( Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>( mImpl.mOperationsPending & Controller::VALIDATE_FONTS ),
-                    TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
+  DALI_TEST_EQUALS(Controller::VALIDATE_FONTS, static_cast<Controller::OperationsMask>(mImpl.mOperationsPending & Controller::VALIDATE_FONTS), TEST_LOCATION);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
+  // For coverage
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_CURSOR_LEFT, 0, 0, Dali::KeyEvent::DOWN));
+
   tet_result(TET_PASS);
 
   END_TEST;
@@ -1160,40 +1189,39 @@ int UtcDaliTextControllerSelectEvent(void)
   ControllerPtr controller = Controller::New();
 
   // Configures the text controller similarly to the text-field.
-  ConfigureTextField( controller );
+  ConfigureTextField(controller);
 
   // Set the text
   const std::string text("Hello World!");
-  controller->SetText( text );
+  controller->SetText(text);
 
   // Select the whole text.
-  controller->SelectEvent( 0.f, 0.f, SelectionType::INTERACTIVE );
+  controller->SelectEvent(0.f, 0.f, SelectionType::INTERACTIVE);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   // Check if the whole text is selected or not.
   std::string retrieved_text;
-  mImpl.RetrieveSelection( retrieved_text, false );
-  DALI_TEST_EQUALS( "Hello", retrieved_text, TEST_LOCATION );
+  mImpl.RetrieveSelection(retrieved_text, false);
+  DALI_TEST_EQUALS("Hello", retrieved_text, TEST_LOCATION);
 
   // Select the whole text.
-  controller->SelectEvent( 0.f, 0.f, SelectionType::ALL );
+  controller->SelectEvent(0.f, 0.f, SelectionType::ALL);
 
   // Perform a relayout
-  controller->Relayout( size );
+  controller->Relayout(size);
 
-  mImpl.RetrieveSelection( retrieved_text, false );
-  DALI_TEST_EQUALS( text, retrieved_text, TEST_LOCATION );
+  mImpl.RetrieveSelection(retrieved_text, false);
+  DALI_TEST_EQUALS(text, retrieved_text, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliTextControllerRemoveTextChangeEventData(void)
 {
   tet_infoline(" UtcDaliTextControllerRemoveTextChangeEventData");
@@ -1202,34 +1230,34 @@ int UtcDaliTextControllerRemoveTextChangeEventData(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  ConfigureTextField( controller );
+  ConfigureTextField(controller);
 
   // Set the text
-  const std::string text( "Hello World!" );
-  controller->SetText( text );
-  controller->SetInputFontPointSize( 1.0f );
+  const std::string text("Hello World!");
+  controller->SetText(text);
+  controller->SetInputFontPointSize(1.0f);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
 
   // Send DELETE_SURROUNDING event
-  InputMethodContext::EventData imfEvent = InputMethodContext::EventData( InputMethodContext::DELETE_SURROUNDING, "", -1, 1 );
-  InputMethodContext inputMethodContext = InputMethodContext::New();
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  InputMethodContext::EventData imfEvent           = InputMethodContext::EventData(InputMethodContext::DELETE_SURROUNDING, "", -1, 1);
+  InputMethodContext            inputMethodContext = InputMethodContext::New();
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Force to update the model.
   controller->GetNaturalSize();
 
   // Simulate a key event to delete text
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_BACKSPACE, 0, 0, Dali::KeyEvent::DOWN));
 
-  DALI_TEST_EQUALS( EventData::EDITING, mImpl.mEventData->mState, TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::EDITING, mImpl.mEventData->mState, TEST_LOCATION);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
-  controller->Relayout( size );
+  const Size size(application.GetScene().GetSize());
+  controller->Relayout(size);
 
   tet_result(TET_PASS);
 
@@ -1248,22 +1276,22 @@ int UtcDaliTextControllerCheckInputFontPointSizeUpdated(void)
 
   // Set the text
   const std::string text("Hello World!");
-  controller->SetText( text );
-  controller->SetInputFontPointSize( 1.0f );
+  controller->SetText(text);
+  controller->SetInputFontPointSize(1.0f);
   controller->KeyboardFocusGainEvent();
 
   application.SendNotification();
   application.Render();
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
   controller->Relayout(size);
 
   // simulate a key event.
-  controller->KeyEvent( GenerateKey( "a", "a", 38, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("a", "a", 38, 0, 0, Dali::KeyEvent::DOWN));
 
   // change the input font point size
-  controller->SetInputFontPointSize( 20.f );
+  controller->SetInputFontPointSize(20.f);
 
   application.SendNotification();
   application.Render();
@@ -1284,43 +1312,43 @@ int UtcDaliTextControllerDeleteSurroundings(void)
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
-  ConfigureTextField( controller );
+  ConfigureTextField(controller);
 
   // Get the implementation of the text controller
-  Controller::Impl& mImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
 
-  DALI_TEST_EQUALS( EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
 
   InputMethodContext inputMethodContext = InputMethodContext::New();
   // Add some pre-edit text, such as Korean
-  InputMethodContext::EventData imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "ㅂㅂㅂ", 0, 3 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  InputMethodContext::EventData imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "ㅂㅂㅂ", 0, 3);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   // Perform a relayout
-  const Size size( application.GetScene().GetSize() );
+  const Size size(application.GetScene().GetSize());
 
   application.SendNotification();
   application.Render();
 
-  controller->Relayout( size );
+  controller->Relayout(size);
 
   // Simulate a key event to delete one text
-  controller->KeyEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("", "", DALI_KEY_BACKSPACE, 0, 0, Dali::KeyEvent::DOWN));
 
   // Send DELETE_SURROUNDING event (Delete All text)
-  imfEvent = InputMethodContext::EventData( InputMethodContext::DELETE_SURROUNDING, "", -2, 2 );
-  controller->OnInputMethodContextEvent( inputMethodContext, imfEvent );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::DELETE_SURROUNDING, "", -2, 2);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent);
 
   application.SendNotification();
   application.Render();
 
-  controller->Relayout( size );
+  controller->Relayout(size);
 
   // simulate a key event to add text
-  controller->KeyEvent( GenerateKey( "ㅇ", "ㅇ", 238, 0, 0, Dali::KeyEvent::DOWN ) );
-  controller->KeyEvent( GenerateKey( "ㅇ", "ㅇ", 238, 0, 0, Dali::KeyEvent::DOWN ) );
+  controller->KeyEvent(GenerateKey("ㅇ", "ㅇ", 238, 0, 0, Dali::KeyEvent::DOWN));
+  controller->KeyEvent(GenerateKey("ㅇ", "ㅇ", 238, 0, 0, Dali::KeyEvent::DOWN));
 
-  DALI_TEST_EQUALS( EventData::EDITING, mImpl.mEventData->mState, TEST_LOCATION );
+  DALI_TEST_EQUALS(EventData::EDITING, mImpl.mEventData->mState, TEST_LOCATION);
 
   // Force to update the model.
   controller->GetNaturalSize();
@@ -1328,7 +1356,48 @@ int UtcDaliTextControllerDeleteSurroundings(void)
   application.SendNotification();
   application.Render();
 
-  controller->Relayout( size );
+  controller->Relayout(size);
+
+  tet_result(TET_PASS);
+
+  END_TEST;
+}
+
+int UtcDaliTextControllerMultipleInsert(void)
+{
+  tet_infoline(" UtcDaliTextControllerMultipleInsert");
+  ToolkitTestApplication application;
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  ConfigureTextField(controller);
+
+  // Get the implementation of the text controller
+  Controller::Impl& mImpl = Controller::Impl::GetImplementation(*controller.Get());
+
+  DALI_TEST_EQUALS(EventData::INACTIVE, mImpl.mEventData->mState, TEST_LOCATION);
+
+  InputMethodContext inputMethodContext = InputMethodContext::New();
+
+  // When maid thread is busy, multiple event might be executed.
+  InputMethodContext::EventData imfEvent1 = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "A", 0, 1);
+  InputMethodContext::EventData imfEvent2 = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "AAAAA", 0, 5);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent1);
+  controller->OnInputMethodContextEvent(inputMethodContext, imfEvent2);
+
+  // Perform a relayout
+  const Size size(application.GetScene().GetSize());
+
+  application.SendNotification();
+  application.Render();
+
+  controller->Relayout(size);
+
+  std::string text;
+  controller->GetText(text);
+
+  DALI_TEST_EQUALS("AAAAA", text, TEST_LOCATION);
 
   tet_result(TET_PASS);
 
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
index 768e58b..765025a 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,15 @@
  *
  */
 
-#include <iostream>
-
 #include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/internal/text/cursor-helper-functions.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/internal/text/cursor-helper-functions.h>
 #include <toolkit-text-utils.h>
 
-
 using namespace Dali;
 using namespace Toolkit;
 using namespace Text;
@@ -46,92 +45,107 @@ using namespace Text;
 
 namespace
 {
+const std::string  DEFAULT_FONT_DIR("/resources/fonts");
+const unsigned int DEFAULT_FONT_SIZE = 1152u;
 
 struct GetClosestLineData
 {
-  std::string    description;                    ///< Description of the test.
-  std::string    text;                           ///< Input text.
-  unsigned int   numberOfTests;                  ///< The number of tests.
-  float*         visualY;                        ///< The visual 'y' position for each test.
-  LineIndex*     lineIndex;                      ///< The expected line index for each test.
-  bool*          isLineHit;                      ///< The expected line hit value for each test.
+  std::string  description;   ///< Description of the test.
+  std::string  text;          ///< Input text.
+  unsigned int numberOfTests; ///< The number of tests.
+  float*       visualY;       ///< The visual 'y' position for each test.
+  LineIndex*   lineIndex;     ///< The expected line index for each test.
+  bool*        isLineHit;     ///< The expected line hit value for each test.
 };
 
 struct GetClosestCursorIndexData
 {
-  std::string             description;           ///< Description of the test.
-  std::string             text;                  ///< Input text.
-  unsigned int            numberOfTests;         ///< The number of tests.
-  float*                  visualX;               ///< The visual 'x' position for each test.
-  float*                  visualY;               ///< The visual 'y' position for each test.
-  CharacterHitTest::Mode* mode;                  ///< The type of hit test.
-  CharacterIndex*         logicalIndex;          ///< The expected logical cursor index for each test.
-  bool*                   isCharacterHit;        ///< The expected character hit value for each test.
+  std::string             description;            ///< Description of the test.
+  std::string             text;                   ///< Input text.
+  unsigned int            numberOfTests;          ///< The number of tests.
+  float*                  visualX;                ///< The visual 'x' position for each test.
+  float*                  visualY;                ///< The visual 'y' position for each test.
+  CharacterHitTest::Mode* mode;                   ///< The type of hit test.
+  bool                    markupProcessorEnabled; //< Enable markup processor to use markup text.
+  CharacterIndex*         logicalIndex;           ///< The expected logical cursor index for each test.
+  bool*                   isCharacterHit;         ///< The expected character hit value for each test.
 };
 
 struct GetCursorPositionData
 {
-  std::string     description;                    ///< Description of the test.
-  std::string     text;                           ///< Input text.
-  unsigned int    numberOfTests;                  ///< The number of tests.
-  CharacterIndex* logicalIndex;                   ///< The logical cursor index for each test.
-  float*          visualX;                        ///< The expected visual 'x' position for each test.
-  float*          visualY;                        ///< The expected visual 'y' position for each test.
+  std::string     description;   ///< Description of the test.
+  std::string     text;          ///< Input text.
+  unsigned int    numberOfTests; ///< The number of tests.
+  CharacterIndex* logicalIndex;  ///< The logical cursor index for each test.
+  float*          visualX;       ///< The expected visual 'x' position for each test.
+  float*          visualY;       ///< The expected visual 'y' position for each test.
 };
 
 struct FindSelectionIndicesData
 {
-  std::string     description;                    ///< Description of the test.
-  std::string     text;                           ///< Input text.
-  unsigned int    numberOfTests;                  ///< The number of tests.
-  float*          visualX;                        ///< The visual 'x' position for each test.
-  float*          visualY;                        ///< The visual 'y' position for each test.
-  bool*           found;                          ///< Whether selection indices are found.
-  CharacterIndex* startIndex;                     ///< The expected start cursor index for each test.
-  CharacterIndex* endIndex;                       ///< The expected end cursor index for each test.
-  CharacterIndex* noTextHitIndex;                 ///< The expected character index when there is no hit.
+  std::string     description;    ///< Description of the test.
+  std::string     text;           ///< Input text.
+  unsigned int    numberOfTests;  ///< The number of tests.
+  float*          visualX;        ///< The visual 'x' position for each test.
+  float*          visualY;        ///< The visual 'y' position for each test.
+  bool*           found;          ///< Whether selection indices are found.
+  CharacterIndex* startIndex;     ///< The expected start cursor index for each test.
+  CharacterIndex* endIndex;       ///< The expected end cursor index for each test.
+  CharacterIndex* noTextHitIndex; ///< The expected character index when there is no hit.
 };
 
-bool GetClosestLineTest( const GetClosestLineData& data )
+struct PrimaryCursorHeightData
+{
+  std::string     description;   ///< Description of the test.
+  std::string     text;          ///< Input text.
+  unsigned int    numberOfTests; ///< The number of tests.
+  CharacterIndex* logicalIndex;  ///< The logical cursor index for each test.
+  float*          heights;       ///< The expected primary cursor height for each test.
+};
+
+bool GetClosestLineTest(const GetClosestLineData& data)
 {
   std::cout << "  testing : " << data.description << std::endl;
 
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(400.f, 600.f);
-  Size layoutSize;
+  Size       textArea(400.f, 600.f);
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  for( unsigned int index = 0; index < data.numberOfTests; ++index )
+  for(unsigned int index = 0; index < data.numberOfTests; ++index)
   {
-    bool isLineHit = false;
-    const LineIndex lineIndex = GetClosestLine( visualModel,
-                                                data.visualY[index],
-                                                isLineHit );
+    bool            isLineHit = false;
+    const LineIndex lineIndex = GetClosestLine(visualModel,
+                                               data.visualY[index],
+                                               isLineHit);
 
-    if( lineIndex != data.lineIndex[index] )
+    if(lineIndex != data.lineIndex[index])
     {
       std::cout << "  test " << index << " failed. Different line index : " << lineIndex << ", expected : " << data.lineIndex[index] << std::endl;
       return false;
     }
-    if( isLineHit != data.isLineHit[index] )
+    if(isLineHit != data.isLineHit[index])
     {
       std::cout << "  test " << index << " failed. Different line hit value : " << isLineHit << ", expected : " << data.isLineHit[index] << std::endl;
       return false;
@@ -141,50 +155,52 @@ bool GetClosestLineTest( const GetClosestLineData& data )
   return true;
 }
 
-bool GetClosestCursorIndexTest( const GetClosestCursorIndexData& data )
+bool GetClosestCursorIndexTest(const GetClosestCursorIndexData& data)
 {
   std::cout << "  testing : " << data.description << std::endl;
 
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(400.f, 600.f);
-  Size layoutSize;
+  Size       textArea(400.f, 600.f);
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  data.markupProcessorEnabled,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  for( unsigned int index = 0; index < data.numberOfTests; ++index )
+  for(unsigned int index = 0; index < data.numberOfTests; ++index)
   {
-    bool isCharacterHit = false;
-    const CharacterIndex logicalCursorIndex = GetClosestCursorIndex( visualModel,
-                                                                     logicalModel,
-                                                                     metrics,
-                                                                     data.visualX[index],
-                                                                     data.visualY[index],
-                                                                     data.mode[index],
-                                                                     isCharacterHit );
-
-    if( logicalCursorIndex != data.logicalIndex[index] )
+    bool                 isCharacterHit     = false;
+    const CharacterIndex logicalCursorIndex = GetClosestCursorIndex(visualModel,
+                                                                    logicalModel,
+                                                                    metrics,
+                                                                    data.visualX[index],
+                                                                    data.visualY[index],
+                                                                    data.mode[index],
+                                                                    isCharacterHit);
+    if(logicalCursorIndex != data.logicalIndex[index])
     {
       std::cout << "  test " << index << " failed. Different logical cursor index : " << logicalCursorIndex << ", expected : " << data.logicalIndex[index] << std::endl;
       return false;
     }
-    if( isCharacterHit != data.isCharacterHit[index] )
+    if(isCharacterHit != data.isCharacterHit[index])
     {
       std::cout << "  test " << index << " failed. Different character hit value : " << isCharacterHit << ", expected : " << data.isCharacterHit[index] << std::endl;
       return false;
@@ -194,119 +210,126 @@ bool GetClosestCursorIndexTest( const GetClosestCursorIndexData& data )
   return true;
 }
 
-bool GetCursorPositionTest( const GetCursorPositionData& data )
+bool GetCursorPositionTest(const GetCursorPositionData& data)
 {
   std::cout << "  testing : " << data.description << std::endl;
 
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(400.f, 600.f);
-  Size layoutSize;
+  Size       textArea(400.f, 600.f);
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   GetCursorPositionParameters parameters;
-  parameters.visualModel = visualModel;
+  parameters.visualModel  = visualModel;
   parameters.logicalModel = logicalModel;
-  parameters.metrics = metrics;
-  parameters.isMultiline = true;
+  parameters.metrics      = metrics;
+  parameters.isMultiline  = true;
 
-  for( unsigned int index = 0; index < data.numberOfTests; ++index )
+  for(unsigned int index = 0; index < data.numberOfTests; ++index)
   {
     CursorInfo cursorInfo;
     parameters.logical = data.logicalIndex[index];
 
-    GetCursorPosition( parameters,
-                       cursorInfo );
+    GetCursorPosition(parameters,
+                      0.f, // Since this test case is not testing the primary cursor height, the default font line height can be set to 0.f.
+                      cursorInfo);
 
-    if( floor(cursorInfo.primaryPosition.x) != data.visualX[index] )
+    if(floor(cursorInfo.primaryPosition.x) != data.visualX[index])
     {
       std::cout << "  test " << index << " failed. Different 'x' cursor position : " << cursorInfo.primaryPosition.x << ", expected : " << data.visualX[index] << std::endl;
       return false;
     }
-    if( floor(cursorInfo.primaryPosition.y) != data.visualY[index] )
+    if(floor(cursorInfo.primaryPosition.y) != data.visualY[index])
     {
       std::cout << "  test " << index << " failed. Different 'y' cursor position : " << cursorInfo.primaryPosition.y << ", expected : " << data.visualY[index] << std::endl;
-       return false;
+      return false;
     }
   }
 
   return true;
 }
 
-bool FindSelectionIndicesTest( const FindSelectionIndicesData& data )
+bool FindSelectionIndicesTest(const FindSelectionIndicesData& data)
 {
   std::cout << "  testing : " << data.description << std::endl;
 
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(400.f, 600.f);
-  Size layoutSize;
+  Size       textArea(400.f, 600.f);
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  for( unsigned int index = 0; index < data.numberOfTests; ++index )
+  for(unsigned int index = 0; index < data.numberOfTests; ++index)
   {
-    CharacterIndex startIndex = 0;
-    CharacterIndex endIndex = 0;
+    CharacterIndex startIndex     = 0;
+    CharacterIndex endIndex       = 0;
     CharacterIndex noTextHitIndex = 0;
-    const bool found = FindSelectionIndices( visualModel,
-                                             logicalModel,
-                                             metrics,
-                                             data.visualX[index],
-                                             data.visualY[index],
-                                             startIndex,
-                                             endIndex,
-                                             noTextHitIndex );
-
-    if( found != data.found[index] )
-    {
-      std::cout << "  test " << index << " failed. Different found value : " << found << ", expected : " <<  data.found[index] << std::endl;
+    const bool     found          = FindSelectionIndices(visualModel,
+                                            logicalModel,
+                                            metrics,
+                                            data.visualX[index],
+                                            data.visualY[index],
+                                            startIndex,
+                                            endIndex,
+                                            noTextHitIndex);
+
+    if(found != data.found[index])
+    {
+      std::cout << "  test " << index << " failed. Different found value : " << found << ", expected : " << data.found[index] << std::endl;
       return false;
     }
-    if( startIndex != data.startIndex[index] )
+    if(startIndex != data.startIndex[index])
     {
       std::cout << "  test " << index << " failed. Different start index : " << startIndex << ", expected : " << data.startIndex[index] << std::endl;
       return false;
     }
-    if( endIndex != data.endIndex[index] )
+    if(endIndex != data.endIndex[index])
     {
       std::cout << "  test " << index << " failed. Different end index : " << endIndex << ", expected : " << data.endIndex[index] << std::endl;
       return false;
     }
-    if( noTextHitIndex != data.noTextHitIndex[index] )
+    if(noTextHitIndex != data.noTextHitIndex[index])
     {
       std::cout << "  test " << index << " failed. Different no text hit index : " << noTextHitIndex << ", expected : " << data.noTextHitIndex[index] << std::endl;
       return false;
@@ -315,12 +338,104 @@ bool FindSelectionIndicesTest( const FindSelectionIndicesData& data )
   return true;
 }
 
+bool PrimaryCursorHeightTest(const PrimaryCursorHeightData& data)
+{
+  std::cout << "  testing : " << data.description << std::endl;
+
+  // 1) Create the model.
+  ModelPtr   textModel;
+  MetricsPtr metrics;
+  Size       textArea(400.f, 600.f);
+  Size       layoutSize;
+
+  Vector<FontDescriptionRun> fontDescriptionRuns;
+
+  const std::string fontFamily("DejaVuSans");
+
+  // Set a known font description
+  FontDescriptionRun fontDescriptionRun1;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
+  fontDescriptionRun1.characterRun.numberOfCharacters = 13u;
+  fontDescriptionRun1.familyLength                    = fontFamily.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength);
+  fontDescriptionRun1.familyDefined = true;
+  fontDescriptionRun1.weightDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = true;
+  fontDescriptionRun1.size          = 768u; //Font size = 12.0f (768/64 = 12)
+
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
+
+  LayoutOptions options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  50.0f, // lineSpacing
+                  50.0f  // characterSpacing
+  );
+
+  LogicalModelPtr logicalModel = textModel->mLogicalModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
+
+  GetCursorPositionParameters parameters;
+  parameters.visualModel  = visualModel;
+  parameters.logicalModel = logicalModel;
+  parameters.metrics      = metrics;
+  parameters.isMultiline  = true;
+
+  for(unsigned int index = 0; index < data.numberOfTests; ++index)
+  {
+    CursorInfo cursorInfo;
+    parameters.logical = data.logicalIndex[index];
+
+    // Load some fonts.
+    TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+    fontClient.SetDpi(93u, 93u);
+
+    char*             pathNamePtr = get_current_dir_name();
+    const std::string pathName(pathNamePtr);
+    free(pathNamePtr);
+
+    FontId fontID = fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSans.ttf");
+
+    Text::FontMetrics fontMetrics;
+    MetricsPtr        mMetrics = Metrics::New(fontClient);
+    mMetrics->GetFontMetrics(fontID, fontMetrics);
+    float defaultFontLineHeight = (fontMetrics.ascender - fontMetrics.descender);
+
+    GetCursorPosition(parameters,
+                      defaultFontLineHeight,
+                      cursorInfo);
+
+    if(floor(cursorInfo.primaryCursorHeight) != data.heights[index])
+    {
+      std::cout << "  test " << index << " failed. Different primaryCursorHeight : " << cursorInfo.primaryCursorHeight << ", expected : " << data.heights[index] << std::endl;
+      return false;
+    }
+  }
+
+  return true;
+}
+
 } // namespace
 
 //////////////////////////////////////////////////////////
 //
 // UtcDaliGetClosestLine
 // UtcDaliGetClosestCursorIndex
+// UtcDaliGetCursorPosition
+// UtcDaliFindSelectionIndices
+// UtcDaliPrimaryCursorHeight
 //
 //////////////////////////////////////////////////////////
 
@@ -328,56 +443,49 @@ int UtcDaliGetClosestLine(void)
 {
   tet_infoline(" UtcDaliGetClosestLine");
 
-  float visualY01[] = { -4.f, 3.f, 1000.f };
-  LineIndex lineIndices01[] = { 0, 0, 0 };
-  bool isLineHit01[] = { false, false, false };
+  float     visualY01[]     = {-4.f, 3.f, 1000.f};
+  LineIndex lineIndices01[] = {0, 0, 0};
+  bool      isLineHit01[]   = {false, false, false};
 
-  float visualY02[] = { -4.f, 3.f, 1000.f };
-  LineIndex lineIndices02[] = { 0, 0, 0 };
-  bool isLineHit02[] = { false, true, false };
+  float     visualY02[]     = {-4.f, 3.f, 1000.f};
+  LineIndex lineIndices02[] = {0, 0, 0};
+  bool      isLineHit02[]   = {false, true, false};
 
-  float visualY03[] = { -4.f, 11.f, 30.f, 51.f, 68.f, 87.f, 109.f, 130.f };
-  LineIndex lineIndices03[] = { 0, 0, 1u, 2u, 3u, 4u, 5u, 5u };
-  bool isLineHit03[] = { false, true, true, true, true, true, true, false };
+  float     visualY03[]     = {-4.f, 11.f, 30.f, 51.f, 68.f, 87.f, 109.f, 130.f};
+  LineIndex lineIndices03[] = {0, 0, 1u, 2u, 3u, 4u, 5u, 5u};
+  bool      isLineHit03[]   = {false, true, true, true, true, true, true, false};
 
   struct GetClosestLineData data[] =
-  {
-    {
-      "void text.",
-      "",
-      3u,
-      visualY01,
-      lineIndices01,
-      isLineHit01
-    },
-    {
-      "Single line text.",
-      "hello world",
-      3u,
-      visualY02,
-      lineIndices02,
-      isLineHit02
-    },
     {
-      "Multi-line text.",
-      "abcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuדאוvwxה"
-      "סתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuד"
-      "אוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqr"
-      "פרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmno"
-      "צמםpqrפרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjkl"
-      "חלךmnoצמםpqrפרףstuדאוvwxהסתyzטזץ",
-      8u,
-      visualY03,
-      lineIndices03,
-      isLineHit03
-    }
-  };
+      {"void text.",
+       "",
+       3u,
+       visualY01,
+       lineIndices01,
+       isLineHit01},
+      {"Single line text.",
+       "hello world",
+       3u,
+       visualY02,
+       lineIndices02,
+       isLineHit02},
+      {"Multi-line text.",
+       "abcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuדאוvwxה"
+       "סתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuד"
+       "אוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqr"
+       "פרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmno"
+       "צמםpqrפרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjkl"
+       "חלךmnoצמםpqrפרףstuדאוvwxהסתyzטזץ",
+       8u,
+       visualY03,
+       lineIndices03,
+       isLineHit03}};
   const unsigned int numberOfTests = 3u;
 
-  for( unsigned int index = 0; index < numberOfTests; ++index )
+  for(unsigned int index = 0; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !GetClosestLineTest( data[index] ) )
+    if(!GetClosestLineTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -391,23 +499,23 @@ int UtcDaliGetClosestCursorIndex(void)
 {
   tet_infoline(" UtcDaliGetClosestCursorIndex");
 
-  float visualX01[] = { -100.f };
-  float visualY01[] = { -100.f };
-  CharacterHitTest::Mode mode01[] = { CharacterHitTest::TAP };
-  CharacterIndex logicalIndex01[] = { 0 };
-  bool isCharacterHit01[] = { false };
+  float                  visualX01[]        = {-100.f};
+  float                  visualY01[]        = {-100.f};
+  CharacterHitTest::Mode mode01[]           = {CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex01[]   = {0};
+  bool                   isCharacterHit01[] = {false};
 
-  float visualX02[] = { -100.f, 1000.f, 60.f, 79.f, 83.f, 148.f, 99.f };
-  float visualY02[] = { -100.f, 1000.f, 12.f, 12.f, 12.f, 12.f, 12.f };
-  CharacterHitTest::Mode mode02[] = { CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP };
-  CharacterIndex logicalIndex02[] = { 0, 21u, 7u, 10u, 10u, 14u, 12u };
-  bool isCharacterHit02[] = { false, false, true, true, true, true, true  };
+  float                  visualX02[]        = {-100.f, 1000.f, 60.f, 79.f, 83.f, 148.f, 99.f};
+  float                  visualY02[]        = {-100.f, 1000.f, 12.f, 12.f, 12.f, 12.f, 12.f};
+  CharacterHitTest::Mode mode02[]           = {CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex02[]   = {0, 21u, 7u, 10u, 11u, 14u, 20u};
+  bool                   isCharacterHit02[] = {false, false, true, true, true, true, true};
 
-  float visualX03[] = { 19.f, 104.f, -2.f, 127.f };
-  float visualY03[] = { 12.f, 12.f, 12.f, 12.f };
-  CharacterHitTest::Mode mode03[] = { CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP };
-  CharacterIndex logicalIndex03[] = { 3u, 13u, 0, 18u };
-  bool isCharacterHit03[] = { true, true, false, false };
+  float                  visualX03[]        = {19.f, 104.f, -2.f, 127.f};
+  float                  visualY03[]        = {12.f, 12.f, 12.f, 12.f};
+  CharacterHitTest::Mode mode03[]           = {CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex03[]   = {3u, 13u, 0, 18u};
+  bool                   isCharacterHit03[] = {true, true, false, false};
 
   //  0     5 _ 6     11  12
   //   Hello     world  \n
@@ -415,22 +523,11 @@ int UtcDaliGetClosestCursorIndex(void)
   //   שלום       עולם  \n
   // 22         31_32      40  41
   //   different     الأربعاء  \n
-  float visualX04[] = { -100.f, 40.f, 44.f, 85.f, 500.f,
-                         500.f, 367.f, 359.f, 329.f, -100.f,
-                        -100.f, 19.f, 64.f, 72.f, 104.f, 111.f, 500.f};
-  float visualY04[] = { -100.f, 12.f, 12.f, 12.f, 12.f,
-                          30.f, 30.f, 30.f, 30.f, 30.f,
-                          50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f };
-  CharacterHitTest::Mode mode04[] = { CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP };
-  CharacterIndex logicalIndex04[] = {    0,  5u,  6u, 11u, 11u,
-                                       12u, 16u, 17u, 21u, 21u,
-                                       22u, 25u, 30u, 32u, 35u, 34u, 40u,
-                                       41u };
-  bool isCharacterHit04[] = { false, true, true, true, false,
-                              false, true, true, true, false,
-                              false, true, true, true, true, true, false };
+  float                  visualX04[]        = {-100.f, 40.f, 44.f, 85.f, 500.f, 500.f, 367.f, 359.f, 329.f, -100.f, -100.f, 19.f, 64.f, 72.f, 104.f, 111.f, 500.f};
+  float                  visualY04[]        = {-100.f, 12.f, 12.f, 12.f, 12.f, 30.f, 30.f, 30.f, 30.f, 30.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f};
+  CharacterHitTest::Mode mode04[]           = {CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex04[]   = {0, 5u, 6u, 11u, 11u, 12u, 16u, 17u, 21u, 21u, 22u, 25u, 31u, 32u, 35u, 34u, 40u, 41u};
+  bool                   isCharacterHit04[] = {false, true, true, true, false, false, true, true, true, false, false, true, true, true, true, true, false};
 
   //   0           10           20            30           40      46
   //    abcשנבdefג   קכghiעיןjk   lחלךmnoצמם   pqrפרףstuד   אוvwxה
@@ -445,36 +542,11 @@ int UtcDaliGetClosestCursorIndex(void)
   // 233        240            250           260     265
   //    חלךmnoצ    מםpqrפרףst   uדאוvwxהסת    yzטזץ
 
-  float visualX05[] = { -100.f, 96.f, 155.f, 250.f, 344.f, 500.f,
-                        -100.f, 36.f, 124.f, 190.f, 280.f, 500.f,
-                        -100.f, 56.f, 158.f, 237.f, 303.f, 500.f,
-                        -100.f, 98.f, 184.f, 261.f, 337.f, 500.f,
-                        -100.f, 40.f, 113.f, 223.f, 302.f, 500.f,
-                        -100.f, 82.f, 160.f, 253.f, 500.f };
-  float visualY05[] = { -100.f, 12.f, 12.f, 12.f, 12.f, 12.f,
-                        30.f, 30.f, 30.f, 30.f, 30.f, 30.f,
-                        50.f, 50.f, 50.f, 50.f, 50.f, 50.f,
-                        67.f, 67.f, 67.f, 67.f, 67.f, 67.f,
-                        87.f, 87.f, 87.f, 87.f, 87.f, 87.f,
-                        107.f, 107.f, 107.f, 107.f, 107.f };
-  CharacterHitTest::Mode mode05[] = { CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP };
-  CharacterIndex logicalIndex05[] = {    0,  10u,  19u,  28u,  39u,  44u,
-                                       45u,  48u,  59u,  66u,  78u,  87u,
-                                       89u,  96u, 106u, 115u, 124u, 133u,
-                                      134u, 145u, 154u, 162u, 171u, 179u,
-                                      180u, 184u, 191u, 203u, 212u,
-                                      221u, 222u, 233u, 241u, 251u, 265u };
-  bool isCharacterHit05[] = { false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, false };
+  float                  visualX05[]        = {-100.f, 96.f, 155.f, 250.f, 344.f, 500.f, -100.f, 36.f, 124.f, 190.f, 280.f, 500.f, -100.f, 56.f, 158.f, 237.f, 303.f, 500.f, -100.f, 98.f, 184.f, 261.f, 337.f, 500.f, -100.f, 40.f, 113.f, 223.f, 302.f, 500.f, -100.f, 82.f, 160.f, 253.f, 500.f};
+  float                  visualY05[]        = {-100.f, 12.f, 12.f, 12.f, 12.f, 12.f, 30.f, 30.f, 30.f, 30.f, 30.f, 30.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 67.f, 67.f, 67.f, 67.f, 67.f, 67.f, 87.f, 87.f, 87.f, 87.f, 87.f, 87.f, 107.f, 107.f, 107.f, 107.f, 107.f};
+  CharacterHitTest::Mode mode05[]           = {CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex05[]   = {0, 10u, 19u, 28u, 41u, 44u, 45u, 49u, 59u, 66u, 78u, 89u, 90u, 97u, 107u, 117u, 126u, 134u, 135u, 147u, 155u, 163u, 172u, 180u, 181u, 185u, 192u, 204u, 213u, 222u, 223u, 234u, 242u, 252u, 265u};
+  bool                   isCharacterHit05[] = {false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, false};
 
   //   0            10           20           30           40        46
   //    שנבabcגקכd    efעיןghiחל   ךjklצמםmno   פרףpqrדאוs   tuהסתv
@@ -489,150 +561,141 @@ int UtcDaliGetClosestCursorIndex(void)
   // 232         240           250           260     265
   //    ךjklצמםm   noפרףpqrדא    וstuהסתvwx   טזץyz
 
-  float visualX06[] = { 500.f, 307.f, 237.f, 148.f, 55.f, -100.f,
-                        500.f, 362.f, 276.f, 213.f, 121.f, -100.f,
-                        500.f, 344.f, 238.f, 167.f, 93.f, -100.f,
-                        500.f, 306.f, 216.f, 142.f, 58.f, -100.f,
-                        500.f, 355.f, 279.f, 182.f, 92.f, -100.f,
-                        500.f, 326.f, 238.f, 150.f, -100.f };
-  float visualY06[] = { -100.f, 12.f, 12.f, 12.f, 12.f, 12.f,
-                        30.f, 30.f, 30.f, 30.f, 30.f, 30.f,
-                        50.f, 50.f, 50.f, 50.f, 50.f, 50.f,
-                        67.f, 67.f, 67.f, 67.f, 67.f, 67.f,
-                        87.f, 87.f, 87.f, 87.f, 87.f, 87.f,
-                        107.f, 107.f, 107.f, 107.f, 107.f };
-  CharacterHitTest::Mode mode06[] = { CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP,
-                                      CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP };
-  CharacterIndex logicalIndex06[] = {    0,  11u,  19u,  28u,  39u,  44u,
-                                       45u,  48u,  57u,  65u,  78u,  87u,
-                                       89u,  96u, 107u, 114u, 124u, 133u,
-                                      134u, 144u, 154u, 162u, 171u, 178u,
-                                      179u, 185u, 192u, 203u, 212u, 221u,
-                                      222u, 232u, 240u, 251u, 265u  };
-  bool isCharacterHit06[] = { false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, true, false,
-                              false, true, true, true, false };
-
-  float visualX07[] = { 395.f };
-  float visualY07[] = { 12.f };
-  CharacterHitTest::Mode mode07[] = { CharacterHitTest::TAP };
-  CharacterIndex logicalIndex07[] = { 1u };
-  bool isCharacterHit07[] = { true };
-
-  float visualX08[] = { 7.f };
-  float visualY08[] = { 12.f };
-  CharacterHitTest::Mode mode08[] = { CharacterHitTest::TAP };
-  CharacterIndex logicalIndex08[] = { 1u };
-  bool isCharacterHit08[] = { true };
+  float                  visualX06[]        = {500.f, 307.f, 237.f, 148.f, 55.f, -100.f, 500.f, 362.f, 276.f, 213.f, 121.f, -100.f, 500.f, 344.f, 238.f, 167.f, 93.f, -100.f, 500.f, 306.f, 216.f, 142.f, 58.f, -100.f, 500.f, 355.f, 279.f, 182.f, 92.f, -100.f, 500.f, 326.f, 238.f, 150.f, -100.f};
+  float                  visualY06[]        = {-100.f, 12.f, 12.f, 12.f, 12.f, 12.f, 30.f, 30.f, 30.f, 30.f, 30.f, 30.f, 50.f, 50.f, 50.f, 50.f, 50.f, 50.f, 67.f, 67.f, 67.f, 67.f, 67.f, 67.f, 87.f, 87.f, 87.f, 87.f, 87.f, 87.f, 107.f, 107.f, 107.f, 107.f, 107.f};
+  CharacterHitTest::Mode mode06[]           = {CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP, CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex06[]   = {0, 10u, 19u, 28u, 39u, 44u, 45u, 49u, 59u, 66u, 78u, 89u, 90u, 97u, 108u, 117u, 126u, 134u, 135u, 145u, 155u, 163u, 174u, 180u, 181u, 186u, 194u, 204u, 214u, 222u, 224u, 235u, 243u, 252u, 265u};
+  bool                   isCharacterHit06[] = {false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, true, false, false, true, true, true, false};
+
+  float                  visualX07[]        = {395.f};
+  float                  visualY07[]        = {12.f};
+  CharacterHitTest::Mode mode07[]           = {CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex07[]   = {1u};
+  bool                   isCharacterHit07[] = {true};
+
+  float                  visualX08[]        = {7.f};
+  float                  visualY08[]        = {12.f};
+  CharacterHitTest::Mode mode08[]           = {CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex08[]   = {1u};
+  bool                   isCharacterHit08[] = {true};
+
+  float                  visualX09[]        = {9.f};
+  float                  visualY09[]        = {12.f};
+  CharacterHitTest::Mode mode09[]           = {CharacterHitTest::TAP};
+  CharacterIndex         logicalIndex09[]   = {1u};
+  bool                   isCharacterHit09[] = {true};
 
   struct GetClosestCursorIndexData data[] =
-  {
     {
-      "Void text.",
-      "",
-      1u,
-      visualX01,
-      visualY01,
-      mode01,
-      logicalIndex01,
-      isCharacterHit01
-    },
-    {
-      "Single line text.",
-      "Hello world שלום עולם",
-      7u,
-      visualX02,
-      visualY02,
-      mode02,
-      logicalIndex02,
-      isCharacterHit02
-    },
-    {
-      "Single line with ligatures",
-      "different الأربعاء",
-      4u,
-      visualX03,
-      visualY03,
-      mode03,
-      logicalIndex03,
-      isCharacterHit03
-    },
-    {
-      "Multiline. Single line paragraphs",
-      "Hello world\n"
-      "שלום עולם\n"
-      "different الأربعاء\n",
-      17u,
-      visualX04,
-      visualY04,
-      mode04,
-      logicalIndex04,
-      isCharacterHit04
-    },
-    {
-      "Multiline. Single bidirectional paragraph, starts LTR, wrapped lines",
-      "abcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuדאוvwxה"
-      "סתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuד"
-      "אוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqr"
-      "פרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmno"
-      "צמםpqrפרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjkl"
-      "חלךmnoצמםpqrפרףstuדאוvwxהסתyzטזץ",
-      35u,
-      visualX05,
-      visualY05,
-      mode05,
-      logicalIndex05,
-      isCharacterHit05
-    },
-    {
-      "Multiline. Single bidirectional paragraph, starts RTL, wrapped lines",
-      "שנבabcגקכdefעיןghiחלךjklצמםmnoפרףpqrדאוstuהסתv"
-      "wxטזץyzשנבabcגקכdefעיןghiחלךjklצמםmnoפרףpqrדאוs"
-      "tuהסתvwxטזץyzשנבabcגקכdefעיןghiחלךjklצמםmnoפרף"
-      "pqrדאוstuהסתvwxטזץyzשנבabcגקכdefעיןghiחלךjklצמם"
-      "mnoפרףpqrדאוstuהסתvwxטזץyzשנבabcגקכdefעיןghiחל"
-      "ךjklצמםmnoפרףpqrדאוstuהסתvwxטזץyz",
-      35u,
-      visualX06,
-      visualY06,
-      mode06,
-      logicalIndex06,
-      isCharacterHit06
-    },
-    {
-      "Testing complex characters. Arabic ligatures",
-      "الأَبْجَدِيَّة العَرَبِيَّة",
-      1u,
-      visualX07,
-      visualY07,
-      mode07,
-      logicalIndex07,
-      isCharacterHit07
-    },
-    {
-      "Testing complex characters. Latin ligatures",
-      "fi ligature",
-      1u,
-      visualX08,
-      visualY08,
-      mode08,
-      logicalIndex08,
-      isCharacterHit08
-    }
-  };
-  const unsigned int numberOfTests = 8u;
-
-  for( unsigned int index = 0; index < numberOfTests; ++index )
+      {"Void text.",
+       "",
+       1u,
+       visualX01,
+       visualY01,
+       mode01,
+       false,
+       logicalIndex01,
+       isCharacterHit01},
+
+      {"Single line text.",
+       "Hello world שלום עולם",
+       7u,
+       visualX02,
+       visualY02,
+       mode02,
+       false,
+       logicalIndex02,
+       isCharacterHit02},
+
+      {"Single line with ligatures",
+       "different الأربعاء",
+       4u,
+       visualX03,
+       visualY03,
+       mode03,
+       false,
+       logicalIndex03,
+       isCharacterHit03},
+
+      {"Multiline. Single line paragraphs",
+       "Hello world\n"
+       "שלום עולם\n"
+       "different الأربعاء\n",
+       17u,
+       visualX04,
+       visualY04,
+       mode04,
+       false,
+       logicalIndex04,
+       isCharacterHit04},
+
+      {"Multiline. Single bidirectional paragraph, starts LTR, wrapped lines",
+       "abcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuדאוvwxה"
+       "סתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqrפרףstuד"
+       "אוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmnoצמםpqr"
+       "פרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjklחלךmno"
+       "צמםpqrפרףstuדאוvwxהסתyzטזץabcשנבdefגקכghiעיןjkl"
+       "חלךmnoצמםpqrפרףstuדאוvwxהסתyzטזץ",
+       35u,
+       visualX05,
+       visualY05,
+       mode05,
+       false,
+       logicalIndex05,
+       isCharacterHit05},
+
+      {"Multiline. Single bidirectional paragraph, starts RTL, wrapped lines",
+       "שנבabcגקכdefעיןghiחלךjklצמםmnoפרףpqrדאוstuהסתv"
+       "wxטזץyzשנבabcגקכdefעיןghiחלךjklצמםmnoפרףpqrדאוs"
+       "tuהסתvwxטזץyzשנבabcגקכdefעיןghiחלךjklצמםmnoפרף"
+       "pqrדאוstuהסתvwxטזץyzשנבabcגקכdefעיןghiחלךjklצמם"
+       "mnoפרףpqrדאוstuהסתvwxטזץyzשנבabcגקכdefעיןghiחל"
+       "ךjklצמםmnoפרףpqrדאוstuהסתvwxטזץyz",
+       35u,
+       visualX06,
+       visualY06,
+       mode06,
+       false,
+       logicalIndex06,
+       isCharacterHit06},
+
+      {"Testing complex characters. Arabic ligatures",
+       "الأَبْجَدِيَّة العَرَبِيَّة",
+       1u,
+       visualX07,
+       visualY07,
+       mode07,
+       false,
+       logicalIndex07,
+       isCharacterHit07},
+
+      {"Testing complex characters. Latin ligatures",
+       "fi ligature",
+       1u,
+       visualX08,
+       visualY08,
+       mode08,
+       false,
+       logicalIndex08,
+       isCharacterHit08},
+
+      {"Testing complex characters. Emoji",
+       "A&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;B",
+       1u,
+       visualX09,
+       visualY09,
+       mode09,
+       true,
+       logicalIndex09,
+       isCharacterHit09}
+
+    };
+  const unsigned int numberOfTests = 9u;
+
+  for(unsigned int index = 0; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !GetClosestCursorIndexTest( data[index] ) )
+    if(!GetClosestCursorIndexTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -646,27 +709,26 @@ int UtcDaliGetCursorPosition(void)
 {
   tet_infoline(" UtcDaliGetCursorPosition");
 
-  float visualX08[] = { 5.f };
-  float visualY08[] = { 0.f };
-  CharacterIndex logicalIndex08[] = { 1u };
+  float          visualX08[]      = {5.f};
+  float          visualY08[]      = {0.f};
+  CharacterIndex logicalIndex08[] = {1u};
 
   struct GetCursorPositionData data[] =
-  {
     {
-      "Testing complex characters. Latin ligatures",
-      "fi ligature",
-      1u,
-      logicalIndex08,
-      visualX08,
-      visualY08,
-    }
-  };
+      {
+        "Testing complex characters. Latin ligatures",
+        "fi ligature",
+        1u,
+        logicalIndex08,
+        visualX08,
+        visualY08,
+      }};
   const unsigned int numberOfTests = 1u;
 
-  for( unsigned int index = 0; index < numberOfTests; ++index )
+  for(unsigned int index = 0; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !GetCursorPositionTest( data[index] ) )
+    if(!GetCursorPositionTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -680,123 +742,142 @@ int UtcDaliFindSelectionIndices(void)
 {
   tet_infoline(" UtcDaliFindSelectionIndices");
 
-  float visualX01[] = { -100.f };
-  float visualY01[] = { -100.f };
-  bool found01[] = { false };
-  CharacterIndex startIndex01[] = { 0 };
-  CharacterIndex endIndex01[] = { 0 };
-  CharacterIndex noHitText01[] = { 0 };
-
-  float visualX02[] = { -100.f, 1000.f, 1000.f };
-  float visualY02[] = { -100.f, 12.f, 1000.f };
-  bool found02[] = { false, false, false };
-  CharacterIndex startIndex02[] = { 0, 6u, 6u };
-  CharacterIndex endIndex02[] = { 5u, 11u, 11u };
-  CharacterIndex noHitText02[] = { 0, 11u, 11u };
-
-  float visualX03[] = { 70.f };
-  float visualY03[] = { 12.f };
-  bool found03[] = { true };
-  CharacterIndex startIndex03[] = { 6u };
-  CharacterIndex endIndex03[] = { 11u };
-  CharacterIndex noHitText03[] = { 0u };
-
-  float visualX04[] = { 131.f };
-  float visualY04[] = { 12.f };
-  bool found04[] = { true };
-  CharacterIndex startIndex04[] = { 12u };
-  CharacterIndex endIndex04[] = { 16u };
-  CharacterIndex noHitText04[] = { 0u };
-
-  float visualX05[] = { 0.f };
-  float visualY05[] = { 12.f };
-  bool found05[] = { true };
-  CharacterIndex startIndex05[] = { 0 };
-  CharacterIndex endIndex05[] = { 1u };
-  CharacterIndex noHitText05[] = { 0 };
-
-  float visualX06[] = { 10.f };
-  float visualY06[] = { 12.f };
-  bool found06[] = { true };
-  CharacterIndex startIndex06[] = { 0 };
-  CharacterIndex endIndex06[] = { 1u };
-  CharacterIndex noHitText06[] = { 0u };
+  float          visualX01[]    = {-100.f};
+  float          visualY01[]    = {-100.f};
+  bool           found01[]      = {false};
+  CharacterIndex startIndex01[] = {0};
+  CharacterIndex endIndex01[]   = {0};
+  CharacterIndex noHitText01[]  = {0};
+
+  float          visualX02[]    = {-100.f, 1000.f, 1000.f};
+  float          visualY02[]    = {-100.f, 12.f, 1000.f};
+  bool           found02[]      = {false, false, false};
+  CharacterIndex startIndex02[] = {0, 6u, 6u};
+  CharacterIndex endIndex02[]   = {5u, 11u, 11u};
+  CharacterIndex noHitText02[]  = {0, 11u, 11u};
+
+  float          visualX03[]    = {70.f};
+  float          visualY03[]    = {12.f};
+  bool           found03[]      = {true};
+  CharacterIndex startIndex03[] = {6u};
+  CharacterIndex endIndex03[]   = {11u};
+  CharacterIndex noHitText03[]  = {0u};
+
+  float          visualX04[]    = {131.f};
+  float          visualY04[]    = {12.f};
+  bool           found04[]      = {true};
+  CharacterIndex startIndex04[] = {12u};
+  CharacterIndex endIndex04[]   = {16u};
+  CharacterIndex noHitText04[]  = {0u};
+
+  float          visualX05[]    = {0.f};
+  float          visualY05[]    = {12.f};
+  bool           found05[]      = {true};
+  CharacterIndex startIndex05[] = {0};
+  CharacterIndex endIndex05[]   = {1u};
+  CharacterIndex noHitText05[]  = {0};
+
+  float          visualX06[]    = {10.f};
+  float          visualY06[]    = {12.f};
+  bool           found06[]      = {true};
+  CharacterIndex startIndex06[] = {0};
+  CharacterIndex endIndex06[]   = {1u};
+  CharacterIndex noHitText06[]  = {0u};
 
   struct FindSelectionIndicesData data[] =
-  {
-    {
-      "void text",
-      "",
-      1u,
-      visualX01,
-      visualY01,
-      found01,
-      startIndex01,
-      endIndex01,
-      noHitText01
-    },
-    {
-      "touch out of text's boundaries",
-      "Hello world",
-      3u,
-      visualX02,
-      visualY02,
-      found02,
-      startIndex02,
-      endIndex02,
-      noHitText02
-    },
     {
-      "touch on the text",
-      "Hello world demo",
-      1u,
-      visualX03,
-      visualY03,
-      found03,
-      startIndex03,
-      endIndex03,
-      noHitText03
-    },
-    {
-      "touch on the new paragraph character at the end of line",
-      "Hello world demo\n",
-      1u,
-      visualX04,
-      visualY04,
-      found04,
-      startIndex04,
-      endIndex04,
-      noHitText04
-    },
+      {"void text",
+       "",
+       1u,
+       visualX01,
+       visualY01,
+       found01,
+       startIndex01,
+       endIndex01,
+       noHitText01},
+      {"touch out of text's boundaries",
+       "Hello world",
+       3u,
+       visualX02,
+       visualY02,
+       found02,
+       startIndex02,
+       endIndex02,
+       noHitText02},
+      {"touch on the text",
+       "Hello world demo",
+       1u,
+       visualX03,
+       visualY03,
+       found03,
+       startIndex03,
+       endIndex03,
+       noHitText03},
+      {"touch on the new paragraph character at the end of line",
+       "Hello world demo\n",
+       1u,
+       visualX04,
+       visualY04,
+       found04,
+       startIndex04,
+       endIndex04,
+       noHitText04},
+      {"touch on a white space character. is the unique character of the line",
+       " ",
+       1u,
+       visualX05,
+       visualY05,
+       found05,
+       startIndex05,
+       endIndex05,
+       noHitText05},
+      {"touch on a white space character. is between two words",
+       "h ello",
+       1u,
+       visualX06,
+       visualY06,
+       found06,
+       startIndex06,
+       endIndex06,
+       noHitText06},
+    };
+  const unsigned int numberOfTests = 6u;
+
+  for(unsigned int index = 0; index < numberOfTests; ++index)
+  {
+    ToolkitTestApplication application;
+    if(!FindSelectionIndicesTest(data[index]))
     {
-      "touch on a white space character. is the unique character of the line",
-      " ",
-      1u,
-      visualX05,
-      visualY05,
-      found05,
-      startIndex05,
-      endIndex05,
-      noHitText05
-    },
+      tet_result(TET_FAIL);
+    }
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliPrimaryCursorHeight(void)
+{
+  tet_infoline(" UtcDaliPrimaryCursorHeight");
+
+  float          heights[]      = {19.f};
+  CharacterIndex logicalIndex[] = {1u};
+
+  struct PrimaryCursorHeightData data[] =
     {
-      "touch on a white space character. is between two words",
-      "h ello",
-      1u,
-      visualX06,
-      visualY06,
-      found06,
-      startIndex06,
-      endIndex06,
-      noHitText06
-    },
-  };
-  const unsigned int numberOfTests = 6u;
+      {
+        "Testing primary cursor height when line spacing is used.",
+        "Hello World",
+        1u,
+        logicalIndex,
+        heights,
+      }};
+  const unsigned int numberOfTests = 1u;
 
-  for( unsigned int index = 0; index < numberOfTests; ++index )
+  for(unsigned int index = 0; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !FindSelectionIndicesTest( data[index] ) )
+    if(!PrimaryCursorHeightTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp
index 872e85e..ed5ba45 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Ellipsis.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali-toolkit/internal/text/font-description-run.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/text-view.h>
 
 
@@ -74,7 +74,7 @@ namespace
     ControllerPtr controller = Controller::New();
 
     // Tests the rendering controller has been created.
-    TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
+    TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
     DALI_TEST_CHECK(typesetter);
 
     // Tests the view model has been created.
@@ -91,7 +91,7 @@ namespace
     controller->SetLineWrapMode( (Text::LineWrap::Mode)(data.lineWrapMode) );
     controller->SetEllipsisPosition( data.ellipsisPosition );
 
-    controller->SetText( data.text );
+    controller->SetText(data.text);
     controller->Relayout( data.size );
 
     // Elide the glyphs.
@@ -118,6 +118,21 @@ namespace
     const GlyphIndex     firstMiddleIndexOfGlyphs  = model->GetFirstMiddleIndexOfElidedGlyphs();
 
 
+    //Test total height of lines is fit inside Controller's size
+    Length heightOfLines = 0;
+    for(Length lineIndex=0u; lineIndex < numberOfLines; lineIndex++)
+    {
+        const LineRun& tempLine         = *( model->GetLines() + lineIndex);
+        heightOfLines+= (tempLine.ascender - tempLine.descender);
+    }
+
+    if(heightOfLines > data.size.height)
+    {
+        std::cout << "The heightOfLines should be less than height of controller.";
+        std::cout << " The heightOfLines is "<< heightOfLines << "and the height of controller is "<< data.size.height <<std::endl;
+        return false;
+    }
+
     if( numberOfLines != 0u )
     {
       Length   elidedLineIndex    = 0u;
@@ -296,6 +311,21 @@ namespace
     const GlyphIndex firstMiddleIndexOfGlyphs  = textModel->GetFirstMiddleIndexOfElidedGlyphs();
     const GlyphIndex secondMiddleIndexOfGlyphs = textModel->GetSecondMiddleIndexOfElidedGlyphs();
 
+    //Test total height of lines is fit inside Controller's size
+    Length heightOfLines = 0;
+    for(Length lineIndex=0u; lineIndex < numberOfLines; lineIndex++)
+    {
+        const LineRun& tempLine         = *( textModel->GetLines() + lineIndex);
+        heightOfLines+= (tempLine.ascender - tempLine.descender);
+    }
+
+    if(heightOfLines > data.size.height)
+    {
+        std::cout << "The heightOfLines should be less than height of controller.";
+        std::cout << " The heightOfLines is "<< heightOfLines << "and the height of controller is "<< data.size.height <<std::endl;
+        return false;
+    }
+
     if( numberOfLines != 0u )
     {
       Length   elidedLineIndex    = 0u;
@@ -395,887 +425,843 @@ int UtcDaliTextLabelElideTextLocation(void)
   Size textSize00( 100.f, 100.f );
 
   Size  textSize01( 120.0f, 50.0f );
-  float positions01[] = { 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 50.0f, 60.0f, 70.0f, 80.0f, 91.0f };
+  float positions01[] = { 0.0f, 12.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 93.0f };
 
   Size  textSize02( 120.0f, 50.0f );
-  float positions02[] = { 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f, 100.0f, 109.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 49.0f, 59.0f, 69.0f, 79.0f, 90.0f };
+  float positions02[] = { 0.0f, 12.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 92.0f, 102.0f, 111.0f, 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 50.0f, 61.0f, 71.0f, 81.0f, 92.0f };
 
   Size  textSize03( 120.0f, 60.0f );
-  float positions03[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 0.0f, 8.0f, 18.0f, 27.0f, 38.0f, 44.0f, 49.0f, 63.0f, 73.0f, 82.0f, 0.0f, 14.0f, 24.0f, 28.0f, 36.0f, 47.0f, 61.0f, 70.0f, 76.0f, 88.0f };
+  float positions03[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 0.0f, 9.0f, 19.0f, 28.0f, 39.0f, 45.0f, 49.0f, 63.0f, 74.0f, 83.0f, 0.0f, 14.0f, 25.0f, 28.0f, 37.0f, 47.0f, 61.0f, 71.0f, 77.0f, 89.0f };
 
   Size  textSize04( 120.0f, 60.0f );
-  float positions04[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 84.0f, 92.0f, 103.0f, 109.0f, 0.0f, 14.0f, 24.0f, 33.0f, 38.0f, 52.0f, 63.0f, 66.0f, 75.0f, 85.0f, 99.0f, 109.0f, 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 84.0f, 93.0f };
+  float positions04[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 84.0f, 93.0f, 104.0f, 110.0f, 0.0f, 14.0f, 25.0f, 34.0f, 39.0f, 53.0f, 64.0f, 67.0f, 76.0f, 86.0f, 100.0f, 110.0f, 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 84.0f, 94.0f };
 
   Size  textSize05( 110.0f, 60.0f );
-  float positions05[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 0.0f, 8.0f, 19.0f, 25.0f, 30.0f, 44.0f, 54.0f, 63.0f, 68.0f, 82.0f, 93.0f, 0.0f, 8.0f, 19.0f, 33.0f, 42.0f, 48.0f, 59.0f, 69.0f, 74.0f, 78.0f };
+  float positions05[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 0.0f, 9.0f, 20.0f, 26.0f, 30.0f, 44.0f, 55.0f, 64.0f, 69.0f, 83.0f, 94.0f, 0.0f, 9.0f, 19.0f, 33.0f, 43.0f, 49.0f, 60.0f, 71.0f, 75.0f, 79.0f };
 
   Size  textSize06( 110.0f, 60.0f );
-  float positions06[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 0.0f, 8.0f, 18.0f, 27.0f, 38.0f, 44.0f, 49.0f, 63.0f, 73.0f, 82.0f, 0.0f, 14.0f, 24.0f, 28.0f, 36.0f, 47.0f, 61.0f, 70.0f, 77.0f };
+  float positions06[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 0.0f, 9.0f, 19.0f, 28.0f, 39.0f, 45.0f, 49.0f, 63.0f, 74.0f, 83.0f, 0.0f, 14.0f, 25.0f, 28.0f, 37.0f, 47.0f, 61.0f, 71.0f, 78.0f };
 
   Size  textSize07( 120.0f, 50.0f );
-  float positions07[] = { 5.0f, 21.0f, 31.0f, 41.0f, 50.0f, 61.0f, 71.0f, 80.0f, 90.0f, 100.0f, 109.0f };
+  float positions07[] = { 6.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 92.0f, 102.0f, 111.0f };
 
   Size  textSize08( 120.0f, 50.0f );
-  float positions08[] = { 5.0f, 21.0f, 31.0f, 41.0f, 50.0f, 61.0f, 70.0f, 80.0f, 90.0f, 100.0f, 109.0f };
+  float positions08[] = { 6.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 92.0f, 102.0f, 111.0f };
 
   Size  textSize09( 120.0f, 60.0f );
-  float positions09[] = { 8.0f, 24.0f, 28.0f, 36.0f, 47.0f, 61.0f, 70.0f, 76.0f, 87.0f, 97.0f, 102.0f, 105.0f, 115.0f };
+  float positions09[] = { 8.0f, 25.0f, 28.0f, 37.0f, 47.0f, 61.0f, 71.0f, 77.0f, 88.0f, 99.0f, 103.0f, 106.0f, 115.0f };
 
   Size  textSize10( 120.0f, 60.0f );
-  float positions10[] = { 8.0f, 24.0f, 33.0f, 38.0f, 52.0f, 63.0f, 66.0f, 75.0f, 85.0f, 99.0f, 109.0f };
+  float positions10[] = { 8.0f, 25.0f, 34.0f, 39.0f, 53.0f, 64.0f, 67.0f, 76.0f, 86.0f, 100.0f, 110.0f };
 
   Size  textSize11( 100.0f, 60.0f );
-  float positions11[] = { 4.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f };
+  float positions11[] = { 4.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f };
 
   Size  textSize12( 100.0f, 60.0f );
-  float positions12[] = { 4.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f };
+  float positions12[] = { 4.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f };
 
   Size  textSize13( 120.0f, 60.0f );
-  float positions13[] = { 118.0f, 111.0f, 97.0f, 89.0f, 80.0f, 74.0f, 64.0f, 59.0f, 54.0f, 46.0f, 37.0f, 31.0f, 22.0f, 7.0f };
+  float positions13[] = { 118.0f, 111.0f, 97.0f, 89.0f, 80.0f, 74.0f, 64.0f, 59.0f, 54.0f, 45.0f, 37.0f, 31.0f, 22.0f, 7.0f };
 
   Size  textSize14( 120.0f, 60.0f );
-  float positions14[] = { 115.0f, 108.0f, 94.0f, 86.0f, 77.0f, 71.0f, 61.0f, 56.0f, 51.0f, 43.0f, 34.0f, 30.0f, 112.0f, 104.0f, 94.0f, 89.0f, 87.0f, 81.0f, 77.0f, 67.0f, 59.0f, 54.0f, 45.0f, 38.0f, 34.0f, 30.0f, 142.0f, 131.0f, 126.0f, 121.0f, 119.0f, 109.0f, 105.0f, 91.0f, 83.0f, 74.0f, 72.0f, 66.0f, 60.0f, 55.0f, 46.0f, 32.0f };
+  float positions14[] = { 116.0f, 109.0f, 95.0f, 87.0f, 78.0f, 72.0f, 62.0f, 57.0f, 52.0f, 43.0f, 35.0f, 30.0f, 113.0f, 104.0f, 94.0f, 89.0f, 86.0f, 80.0f, 77.0f, 67.0f, 59.0f, 54.0f, 45.0f, 38.0f, 35.0f, 30.0f, 145.0f, 133.0f, 128.0f, 123.0f, 120.0f, 111.0f, 107.0f, 93.0f, 84.0f, 75.0f, 73.0f, 67.0f, 61.0f, 56.0f, 47.0f, 33.0f };
 
   Size  textSize15( 110.0f, 60.0f );
-  float positions15[] = { 108.0f, 101.0f, 87.0f, 79.0f, 70.0f, 64.0f, 54.0f, 49.0f, 44.0f, 36.0f, 27.0f, 21.0f, 12.0f, 4.0f, 96.0f, 91.0f, 89.0f, 83.0f, 79.0f, 69.0f, 61.0f, 56.0f, 47.0f, 40.0f, 36.0f, 30.0f, 27.0f, 16.0f, 11.0f, 6.0f, 4.0f, 102.0f, 98.0f, 84.0f, 75.0f, 66.0f, 64.0f, 58.0f, 53.0f, 47.0f, 38.0f, 25.0f, 22.0f, 5.0f };
+  float positions15[] = { 108.0f, 101.0f, 87.0f, 79.0f, 70.0f, 64.0f, 54.0f, 49.0f, 44.0f, 35.0f, 27.0f, 21.0f, 12.0f, 3.0f, 96.0f, 91.0f, 88.0f, 82.0f, 79.0f, 69.0f, 61.0f, 56.0f, 47.0f, 40.0f, 37.0f, 31.0f, 28.0f, 16.0f, 11.0f, 6.0f, 3.0f, 102.0f, 98.0f, 84.0f, 75.0f, 66.0f, 64.0f, 58.0f, 52.0f, 47.0f, 38.0f, 24.0f, 9.0f };
 
   Size  textSize16( 110.0f, 60.0f );
-  float positions16[] = { 105.0f, 98.0f, 84.0f, 76.0f, 67.0f, 61.0f, 51.0f, 46.0f, 41.0f, 33.0f, 24.0f, 20.0f, 102.0f, 94.0f, 84.0f, 79.0f, 77.0f, 71.0f, 67.0f, 57.0f, 49.0f, 44.0f, 35.0f, 28.0f, 24.0f, 20.0f, 116.0f, 104.0f, 99.0f, 95.0f, 92.0f, 83.0f, 79.0f, 65.0f, 56.0f, 48.0f, 45.0f, 39.0f, 24.0f };
+  float positions16[] = { 106.0f, 99.0f, 85.0f, 77.0f, 68.0f, 62.0f, 52.0f, 47.0f, 42.0f, 33.0f, 25.0f, 20.0f, 103.0f, 94.0f, 84.0f, 79.0f, 76.0f, 70.0f, 67.0f, 57.0f, 49.0f, 44.0f, 35.0f, 28.0f, 25.0f, 20.0f, 118.0f, 106.0f, 101.0f, 96.0f, 93.0f, 84.0f, 80.0f, 66.0f, 57.0f, 48.0f, 46.0f, 40.0f, 24.0f };
 
   Size  textSize17( 110.0f, 60.0f );
-  float positions17[] = { 105.0f, 98.0f, 84.0f, 76.0f, 67.0f, 61.0f, 51.0f, 46.0f, 41.0f, 33.0f, 24.0f, 20.0f, 102.0f, 94.0f, 84.0f, 79.0f, 77.0f, 71.0f, 67.0f, 57.0f, 49.0f, 44.0f, 35.0f, 28.0f, 24.0f, 20.0f, 116.0f, 104.0f, 99.0f, 95.0f, 92.0f, 83.0f, 79.0f, 65.0f, 56.0f, 48.0f, 45.0f, 39.0f, 24.0f };
+  float positions17[] = { 106.0f, 99.0f, 85.0f, 77.0f, 68.0f, 62.0f, 52.0f, 47.0f, 42.0f, 33.0f, 25.0f, 20.0f, 103.0f, 94.0f, 84.0f, 79.0f, 76.0f, 70.0f, 67.0f, 57.0f, 49.0f, 44.0f, 35.0f, 28.0f, 25.0f, 20.0f, 118.0f, 106.0f, 101.0f, 96.0f, 93.0f, 84.0f, 80.0f, 66.0f, 57.0f, 48.0f, 46.0f, 40.0f, 24.0f };
 
   Size  textSize18( 120.0f, 60.0f );
-  float positions18[] = { 89.0f, 79.0f, 70.0f, 68.0f, 62.0f, 56.0f, 51.0f, 42.0f, 28.0f, 25.0f, 14.0f, 7.0f, 0.0f };
+  float positions18[] = { 90.0f, 79.0f, 70.0f, 68.0f, 62.0f, 56.0f, 51.0f, 42.0f, 28.0f, 25.0f, 14.0f, 7.0f, 0.0f };
 
   Size  textSize19( 120.0f, 60.0f );
-  float positions19[] = { 103.0f, 91.0f, 86.0f, 84.0f, 78.0f, 74.0f, 64.0f, 56.0f, 51.0f, 42.0f, 35.0f, 31.0f, 27.0f };
+  float positions19[] = { 103.0f, 91.0f, 86.0f, 83.0f, 77.0f, 74.0f, 64.0f, 56.0f, 51.0f, 42.0f, 35.0f, 32.0f, 27.0f };
 
   Size  textSize20( 110.0f, 60.0f );
-  float positions20[] = { 89.0f, 82.0f, 78.0f, 68.0f, 60.0f, 55.0f, 46.0f, 39.0f, 35.0f, 29.0f, 26.0f, 15.0f, 10.0f, 5.0f, 3.0f };
+  float positions20[] = { 89.0f, 82.0f, 79.0f, 69.0f, 61.0f, 56.0f, 47.0f, 40.0f, 37.0f, 31.0f, 28.0f, 16.0f, 11.0f, 6.0f, 3.0f };
 
   Size  textSize21( 110.0f, 60.0f );
-  float positions21[] = { 93.0f, 81.0f, 76.0f, 74.0f, 68.0f, 64.0f, 54.0f, 46.0f, 41.0f, 32.0f, 25.0f, 21.0f, 17.0f };
+  float positions21[] = { 93.0f, 81.0f, 76.0f, 73.0f, 67.0f, 64.0f, 54.0f, 46.0f, 41.0f, 32.0f, 25.0f, 22.0f, 17.0f };
 
   Size  textSize22( 110.0f, 60.0f );
-  float positions22[] = { 93.0f, 81.0f, 76.0f, 74.0f, 68.0f, 64.0f, 54.0f, 46.0f, 41.0f, 32.0f, 25.0f, 21.0f, 17.0f };
+  float positions22[] = { 93.0f, 81.0f, 76.0f, 73.0f, 67.0f, 64.0f, 54.0f, 46.0f, 41.0f, 32.0f, 25.0f, 22.0f, 17.0f };
 
   Size  textSize23( 120.0f, 50.0f );
-  float positions23[] = { 0.0f, 11.0f, 20.0f, 32.0f, 44.0f };
+  float positions23[] = { 0.0f, 12.0f, 21.0f, 33.0f, 45.0f };
 
   Size  textSize24( 120.0f, 50.0f );
-  float positions24[] = { 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 50.0f, 60.0f, 70.0f, 80.0f, 91.0f };
+  float positions24[] = { 0.0f, 12.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 93.0f };
 
   Size  textSize25( 120.0f, 60.0f );
-  float positions25[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 0.0f, 8.0f, 18.0f, 27.0f, 38.0f, 44.0f, 49.0f, 64.0f };
+  float positions25[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 0.0f, 9.0f, 19.0f, 28.0f, 39.0f, 45.0f, 49.0f, 64.0f };
 
   Size  textSize26( 120.0f, 60.0f );
-  float positions26[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 84.0f, 92.0f, 103.0f, 109.0f, 0.0f, 14.0f, 24.0f, 33.0f, 38.0f, 52.0f, 63.0f, 66.0f, 75.0f, 86.0f };
+  float positions26[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 84.0f, 93.0f, 104.0f, 110.0f, 0.0f, 14.0f, 25.0f, 34.0f, 39.0f, 53.0f, 64.0f, 67.0f, 76.0f, 87.0f };
 
   Size  textSize27( 110.0f, 60.0f );
-  float positions27[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 0.0f, 8.0f, 19.0f, 25.0f, 30.0f, 44.0f, 54.0f, 63.0f, 69.0f };
+  float positions27[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 0.0f, 9.0f, 20.0f, 26.0f, 30.0f, 44.0f, 55.0f, 64.0f, 70.0f };
 
   Size  textSize28( 110.0f, 60.0f );
-  float positions28[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 0.0f, 8.0f, 18.0f, 27.0f, 38.0f, 44.0f, 49.0f, 64.0f };
+  float positions28[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 0.0f, 9.0f, 19.0f, 28.0f, 39.0f, 45.0f, 49.0f, 64.0f };
 
   Size  textSize29( 120.0f, 60.0f );
-  float positions29[] = { 115.0f, 108.0f, 94.0f, 86.0f, 78.0f, 72.0f, 61.0f };
+  float positions29[] = { 116.0f, 109.0f, 95.0f, 87.0f, 78.0f, 72.0f, 62.0f };
 
   Size  textSize30( 120.0f, 60.0f );
-  float positions30[] = { 115.0f, 108.0f, 94.0f, 86.0f, 77.0f, 71.0f, 61.0f, 56.0f, 51.0f, 43.0f, 34.0f, 30.0f, 112.0f, 104.0f, 94.0f, 89.0f, 87.0f, 81.0f, 77.0f, 67.0f, 59.0f, 54.0f, 34.0f };
+  float positions30[] = { 116.0f, 109.0f, 95.0f, 87.0f, 78.0f, 72.0f, 62.0f, 57.0f, 52.0f, 43.0f, 35.0f, 30.0f, 113.0f, 104.0f, 94.0f, 89.0f, 86.0f, 80.0f, 77.0f, 67.0f, 59.0f, 54.0f, 34.0f };
 
   Size  textSize31( 110.0f, 60.0f );
-  float positions31[] = { 108.0f, 101.0f, 87.0f, 79.0f, 70.0f, 64.0f, 54.0f, 49.0f, 44.0f, 36.0f, 27.0f, 21.0f, 12.0f, 4.0f, 96.0f, 91.0f, 89.0f, 83.0f, 79.0f, 69.0f, 61.0f, 56.0f, 47.0f, 40.0f, 36.0f, 30.0f, 27.0f, 11.0f };
+  float positions31[] = { 108.0f, 101.0f, 87.0f, 79.0f, 70.0f, 64.0f, 54.0f, 49.0f, 44.0f, 35.0f, 27.0f, 21.0f, 12.0f, 3.0f, 96.0f, 91.0f, 88.0f, 82.0f, 79.0f, 69.0f, 61.0f, 56.0f, 47.0f, 40.0f, 37.0f, 31.0f, 28.0f, 11.0f };
 
   Size  textSize32( 110.0f, 60.0f );
-  float positions32[] = { 105.0f, 98.0f, 84.0f, 76.0f, 67.0f, 61.0f, 51.0f, 46.0f, 41.0f, 33.0f, 24.0f, 20.0f, 102.0f, 94.0f, 84.0f, 79.0f, 77.0f, 71.0f, 67.0f, 57.0f, 49.0f, 44.0f, 24.0f };
+  float positions32[] = { 106.0f, 99.0f, 85.0f, 77.0f, 68.0f, 62.0f, 52.0f, 47.0f, 42.0f, 33.0f, 25.0f, 20.0f, 103.0f, 94.0f, 84.0f, 79.0f, 76.0f, 70.0f, 67.0f, 57.0f, 49.0f, 44.0f, 24.0f };
 
   Size  textSize33( 110.0f, 60.0f );
-  float positions33[] = { 105.0f, 98.0f, 84.0f, 76.0f, 67.0f, 61.0f, 51.0f, 46.0f, 41.0f, 33.0f, 24.0f, 20.0f, 102.0f, 94.0f, 84.0f, 79.0f, 77.0f, 71.0f, 67.0f, 57.0f, 49.0f, 44.0f, 24.0f };
+  float positions33[] = { 106.0f, 99.0f, 85.0f, 77.0f, 68.0f, 62.0f, 52.0f, 47.0f, 42.0f, 33.0f, 25.0f, 20.0f, 103.0f, 94.0f, 84.0f, 79.0f, 76.0f, 70.0f, 67.0f, 57.0f, 49.0f, 44.0f, 24.0f };
 
   Size  textSize34( 120.0f, 30.0f );
-  float positions34[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 84.0f, 93.0f };
+  float positions34[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 84.0f, 94.0f };
 
   Size  textSize35( 120.0f, 30.0f );
-  float positions35[] = { 8.0f, 24.0f, 35.0f, 44.0f, 49.0f, 63.0f, 74.0f, 77.0f, 85.0f, 96.0f, 110.0f };
+  float positions35[] = { 8.0f, 24.0f, 35.0f, 44.0f, 49.0f, 63.0f, 74.0f, 77.0f, 86.0f, 96.0f, 110.0f };
 
   Size  textSize36( 120.0f, 30.0f );
-  float positions36[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f };
+  float positions36[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f };
+
+  Size  textSize37(145.0f, 30.0f);
+  float positions37[] = { 128.0f, 123.0f, 118.0f, 113.0f, 104.0f, 99.0f, 89.0f, 83.0f, 16.0f, 25.0f, 30.0f, 38.0f, 43.0f, 53.0f, 63.0f };
+
+  Size  textSize38(145.0f, 30.0f);
+  float positions38[] = { 77.0f, 92.0f, 97.0f, 107.0f, 116.0f, 122.0f, 132.0f, 64.0f, 50.0f, 45.0f, 40.0f, 35.0f, 26.0f, 21.0f, 11.0f };
 
   struct ElideData data[] =
-  {
     {
-      "void text",
-      "",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize00,
-      0u,
-      0u,
-      nullptr
-    },
+      {"void text",
+       "",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize00,
+       0u,
+       0u,
+       nullptr},
+
+      {"void text",
+       "",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize00,
+       0u,
+       0u,
+       nullptr},
+
+      {"void text",
+       "",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize00,
+       0u,
+       0u,
+       nullptr},
+
+      //END LTR cases
+      {
+        "EllipsisPosition: TextLabel: Basic case SingleLine LTR END",
+        "A0123456789 B0123456789 C0123456789 D0123456789 ",
+        false,
+        DevelText::LineWrap::WORD,
+        DevelText::EllipsisPosition::END,
+        false,
+        textSize01,
+        1u,
+        10u,
+        positions01},
+
+      {"EllipsisPosition: TextLabel: Basic case Mulitlines LineWrap-WORD LTR END",
+       "A0123456789 B0123456789 C0123456789 D0123456789 ",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize02,
+       2u,
+       22u,
+       positions02},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD LTR END",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize03,
+       3u,
+       29u,
+       positions03},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER LTR END",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::CHARACTER,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize04,
+       3u,
+       40u,
+       positions04},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHAN LTR END",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::HYPHENATION,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize05,
+       3u,
+       32u,
+       positions05},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED LTR END",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::MIXED,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize06,
+       3u,
+       28u,
+       positions06},
+
+      //START LTR cases
+      {
+        "EllipsisPosition: TextLabel: Basic case SingleLine LTR START",
+        "A0123456789 B0123456789 C0123456789 D0123456789 ",
+        false,
+        DevelText::LineWrap::WORD,
+        DevelText::EllipsisPosition::START,
+        false,
+        textSize07,
+        1u,
+        11u,
+        positions07,
+
+      },
+
+      {"EllipsisPosition: TextLabel: Basic case Mulitlines LineWrap-WORD LTR START",
+       "A0123456789 B0123456789 C0123456789 D0123456789 ",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize08,
+       2u,
+       23u,
+       positions08},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD LTR START",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize09,
+       3u,
+       33u,
+       positions09},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER LTR START",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::CHARACTER,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize10,
+       3u,
+       37u,
+       positions10},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHAN LTR START",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::HYPHENATION,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize11,
+       3u,
+       25u,
+       positions11},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED LTR START",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::MIXED,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize12,
+       3u,
+       25u,
+       positions12},
+
+      //END RTL cases
+      {
+        "EllipsisPosition: TextLabel: SingleLine RTL END",
+        "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+        false,
+        DevelText::LineWrap::WORD,
+        DevelText::EllipsisPosition::END,
+        false,
+        textSize13,
+        1u,
+        14u,
+        positions13},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD RTL END",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize14,
+       3u,
+       42u,
+       positions14},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER RTL END",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::CHARACTER,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize15,
+       3u,
+       43u,
+       positions15},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHENATION RTL END",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::HYPHENATION,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize16,
+       3u,
+       39u,
+       positions16},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED RTL END",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::MIXED,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize17,
+       3u,
+       39u,
+       positions17},
+
+      //START RTL cases
+      {
+        "EllipsisPosition: TextLabel: SingleLine RTL START",
+        "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+        false,
+        DevelText::LineWrap::WORD,
+        DevelText::EllipsisPosition::START,
+        false,
+        textSize18,
+        1u,
+        13u,
+        positions18},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD RTL START",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize19,
+       3u,
+       33u,
+       positions19},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER RTL START",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::CHARACTER,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize20,
+       3u,
+       30u,
+       positions20},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHENATION RTL START",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::HYPHENATION,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize21,
+       3u,
+       33u,
+       positions21},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED RTL START",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::MIXED,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize22,
+       3u,
+       33u,
+       positions22},
+
+      //MIDDLE LTR cases
+      {
+        "EllipsisPosition: TextLabel: Basic case SingleLine LTR MIDDLE",
+        "ABCDEFGHIJKLMNPQRSTUVWXYZ abcdefghijklmnpqrstuvwxyz",
+        false,
+        DevelText::LineWrap::WORD,
+        DevelText::EllipsisPosition::MIDDLE,
+        false,
+        textSize23,
+        1u,
+        10u,
+        positions23},
+
+      {"EllipsisPosition: TextLabel: Basic case Mulitlines LineWrap-WORD LTR MIDDLE",
+       "A0123456789 B0123456789 C0123456789 D0123456789 ",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize24,
+       2u,
+       22u,
+       positions24},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD LTR MIDDLE",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize25,
+       3u,
+       24u,
+       positions25},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER LTR MIDDLE",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye",
+       true,
+       DevelText::LineWrap::CHARACTER,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize26,
+       3u,
+       36u,
+       positions26},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHAN LTR MIDDLE",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye",
+       true,
+       DevelText::LineWrap::HYPHENATION,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize27,
+       3u,
+       27u,
+       positions27},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED LTR MIDDLE",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye",
+       true,
+       DevelText::LineWrap::MIXED,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize28,
+       3u,
+       24u,
+       positions28},
+
+      //MIDDLE RTL cases
+      {
+        "EllipsisPosition: TextLabel: SingleLine RTL MIDDLE",
+        "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+        false,
+        DevelText::LineWrap::WORD,
+        DevelText::EllipsisPosition::MIDDLE,
+        false,
+        textSize29,
+        1u,
+        13u,
+        positions29},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD RTL MIDDLE",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize30,
+       3u,
+       31u,
+       positions30},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER RTL MIDDLE",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::CHARACTER,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize31,
+       3u,
+       29u,
+       positions31},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHENATION RTL MIDDLE",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::HYPHENATION,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize32,
+       3u,
+       31u,
+       positions32},
+
+      {"EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED RTL MIDDLE",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       true,
+       DevelText::LineWrap::MIXED,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize33,
+       3u,
+       31u,
+       positions33},
+
+      {"EllipsisPosition: TextLabel: One-Line for Mulitlines LineWrap-WORD LTR END",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize34,
+       1u,
+       13u,
+       positions34},
+
+      {"EllipsisPosition: TextLabel: One-Line for Mulitlines LineWrap-WORD LTR START",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize35,
+       1u,
+       11u,
+       positions35},
+
+      {"EllipsisPosition: TextLabel: One-Line for Mulitlines LineWrap-WORD LTR MIDDLE",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       true,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize36,
+       1u,
+       12u,
+       positions36},
+
+      {"EllipsisPosition: TextLabel: Mixed Directions Languages END",
+       "سیٹنگیں Projector سیٹنگیں",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize37,
+       1u,
+       15u,
+       positions37},
+
+      {"EllipsisPosition: TextLabel: Mixed Directions Languages START",
+       "سیٹنگیں Projector سیٹنگیں",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize38,
+       1u,
+       15u,
+       positions38},
+
+    };
+  const unsigned int numberOfTests = 41u;
 
+  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  {
+    ToolkitTestApplication application;
+    if( !ElideTestViewModel( data[index] ) )
     {
-      "void text",
-      "",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize00,
-      0u,
-      0u,
-      nullptr
-    },
+      tet_result(TET_FAIL);
+    }
+  }
 
-    {
-      "void text",
-      "",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize00,
-      0u,
-      0u,
-      nullptr
-    },
+  tet_result(TET_PASS);
+  END_TEST;
+}
 
-   //END LTR cases
-    {
-      "EllipsisPosition: TextLabel: Basic case SingleLine LTR END",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize01,
-      1u,
-      10u,
-      positions01
-    },
 
-    {
-      "EllipsisPosition: TextLabel: Basic case Mulitlines LineWrap-WORD LTR END",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize02,
-      2u,
-      22u,
-      positions02
-    },
+int UtcDaliTextFieldlElideTextLocation(void)
+{
+  tet_infoline(" UtcDaliTextFieldlElideTextLocation ");
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD LTR END",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize03,
-      3u,
-      29u,
-      positions03
-    },
+  Size textSize00( 100.f, 100.f );
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER LTR END",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::CHARACTER,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize04,
-      3u,
-      40u,
-      positions04
-    },
+  Size  textSize01( 120.0f, 50.0f );
+  float positions01[] = { 0.0f, 12.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 93.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHAN LTR END",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::HYPHENATION,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize05,
-      3u,
-      32u,
-      positions05
-    },
+  Size  textSize02( 120.0f, 50.0f );
+  float positions02[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 84.0f, 94.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED LTR END",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::MIXED,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize06,
-      3u,
-      28u,
-      positions06
-    },
+  Size  textSize03( 120.0f, 50.0f );
+  float positions03[] = { 121.0f, 114.0f, 100.0f, 92.0f, 83.0f, 77.0f, 67.0f, 62.0f, 57.0f, 48.0f, 40.0f, 34.0f, 25.0f, 10.0f };
 
-   //START LTR cases
-    {
-      "EllipsisPosition: TextLabel: Basic case SingleLine LTR START",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize07,
-      1u,
-      11u,
-      positions07
-    },
+  Size  textSize04( 120.0f, 50.0f );
+  float positions04[] = { 6.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 92.0f, 102.0f, 111.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Basic case Mulitlines LineWrap-WORD LTR START",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize08,
-      2u,
-      23u,
-      positions08
-    },
+  Size  textSize05( 120.0f, 50.0f );
+  float positions05[] = { 8.0f, 24.0f, 35.0f, 44.0f, 49.0f, 63.0f, 74.0f, 77.0f, 86.0f, 96.0f, 110.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD LTR START",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize09,
-      3u,
-      33u,
-      positions09
-    },
+  Size  textSize06( 120.0f, 50.0f );
+  float positions06[] = { 90.0f, 79.0f, 70.0f, 68.0f, 62.0f, 56.0f, 51.0f, 42.0f, 28.0f, 25.0f, 14.0f, 7.0f, 0.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER LTR START",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::CHARACTER,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize10,
-      3u,
-      37u,
-      positions10
-    },
+  Size  textSize07( 120.0f, 50.0f );
+  float positions07[] = { 0.0f, 12.0f, 22.0f, 32.0f, 42.0f, 55.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHAN LTR START",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::HYPHENATION,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize11,
-      3u,
-      25u,
-      positions11
-    },
+  Size  textSize08( 120.0f, 50.0f );
+  float positions08[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED LTR START",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::MIXED,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize12,
-      3u,
-      25u,
-      positions12
-    },
+  Size  textSize09( 120.0f, 50.0f );
+  float positions09[] = { 117.0f, 110.0f, 96.0f, 88.0f, 79.0f, 73.0f, 63.0f };
 
-  //END RTL cases
-    {
-      "EllipsisPosition: TextLabel: SingleLine RTL END",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize13,
-      1u,
-      14u,
-      positions13
-    },
+  Size  textSize10( 120.0f, 50.0f );
+  float positions10[] = { 121.0f, 116.0f, 111.0f, 106.0f, 101.0f, 96.0f, 91.0f, 86.0f, 83.0f, 76.0f, 62.0f, 54.0f, 45.0f, 39.0f, 29.0f, 15.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD RTL END",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize14,
-      3u,
-      42u,
-      positions14
-    },
+  Size  textSize11( 120.0f, 50.0f );
+  float positions11[] = { 95.0f, 79.0f, 76.0f, 65.0f, 58.0f, 51.0f, 46.0f, 41.0f, 36.0f, 31.0f, 26.0f, 21.0f, 16.0f, 11.0f, 6.0f };
 
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER RTL END",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::CHARACTER,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize15,
-      3u,
-      44u,
-      positions15
-    },
+  Size  textSize12( 120.0f, 50.0f );
+  float positions12[] = { 118.0f, 113.0f, 108.0f, 103.0f, 98.0f, 93.0f, 88.0f, 83.0f, 80.0f, 73.0f };
+
+  Size  textSize13(145.0f, 30.0f);
+  float positions13[] = { 139.0f, 134.0f, 129.0f, 124.0f, 115.0f, 110.0f, 100.0f, 94.0f, 27.0f, 36.0f, 41.0f, 49.0f, 54.0f, 64.0f, 74.0f };
 
+  Size  textSize14(145.0f, 30.0f);
+  float positions14[] = { 88.0f, 103.0f, 108.0f, 118.0f, 127.0f, 133.0f, 143.0f, 75.0f, 61.0f, 56.0f, 51.0f, 46.0f, 37.0f, 32.0f, 22.0f };
+
+  struct ElideData data[] =
     {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHENATION RTL END",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::HYPHENATION,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize16,
-      3u,
-      39u,
-      positions16
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED RTL END",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::MIXED,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize17,
-      3u,
-      39u,
-      positions17
-    },
-
-   //START RTL cases
-    {
-      "EllipsisPosition: TextLabel: SingleLine RTL START",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize18,
-      1u,
-      13u,
-      positions18
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD RTL START",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize19,
-      3u,
-      33u,
-      positions19
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER RTL START",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::CHARACTER,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize20,
-      3u,
-      30u,
-      positions20
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHENATION RTL START",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::HYPHENATION,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize21,
-      3u,
-      33u,
-      positions21
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED RTL START",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::MIXED,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize22,
-      3u,
-      33u,
-      positions22
-    },
-
-  //MIDDLE LTR cases
-    {
-      "EllipsisPosition: TextLabel: Basic case SingleLine LTR MIDDLE",
-      "ABCDEFGHIJKLMNPQRSTUVWXYZ abcdefghijklmnpqrstuvwxyz",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize23,
-      1u,
-      10u,
-      positions23
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Basic case Mulitlines LineWrap-WORD LTR MIDDLE",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize24,
-      2u,
-      22u,
-      positions24
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD LTR MIDDLE",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye" ,
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize25,
-      3u,
-      24u,
-      positions25
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER LTR MIDDLE",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye" ,
-      true,
-      DevelText::LineWrap::CHARACTER,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize26,
-      3u,
-      36u,
-      positions26
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHAN LTR MIDDLE",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye" ,
-      true,
-      DevelText::LineWrap::HYPHENATION,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize27,
-      3u,
-      27u,
-      positions27
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED LTR MIDDLE",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye" ,
-      true,
-      DevelText::LineWrap::MIXED,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize28,
-      3u,
-      24u,
-      positions28
-    },
-
-//MIDDLE RTL cases
-    {
-      "EllipsisPosition: TextLabel: SingleLine RTL MIDDLE",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize29,
-      1u,
-      13u,
-      positions29
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-WORD RTL MIDDLE",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize30,
-      3u,
-      31u,
-      positions30
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-CHARACTER RTL MIDDLE",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::CHARACTER,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize31,
-      3u,
-      29u,
-      positions31
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-HYPHENATION RTL MIDDLE",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::HYPHENATION,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize32,
-      3u,
-      31u,
-      positions32
-    },
-
-    {
-      "EllipsisPosition: TextLabel: Mulitlines LineWrap-MIXED RTL MIDDLE",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      true,
-      DevelText::LineWrap::MIXED,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize33,
-      3u,
-      31u,
-      positions33
-    },
-
-    {
-      "EllipsisPosition: TextLabel: One-Line for Mulitlines LineWrap-WORD LTR END",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize34,
-      1u,
-      13u,
-      positions34
-    },
-
-    {
-      "EllipsisPosition: TextLabel: One-Line for Mulitlines LineWrap-WORD LTR START",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize35,
-      1u,
-      11u,
-      positions35
-    },
-
-    {
-      "EllipsisPosition: TextLabel: One-Line for Mulitlines LineWrap-WORD LTR MIDDLE",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      true,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize36,
-      1u,
-      12u,
-      positions36
-    },
-
-  };
-  const unsigned int numberOfTests = 39u;
-
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
-  {
-    ToolkitTestApplication application;
-    if( !ElideTestViewModel( data[index] ) )
-    {
-      tet_result(TET_FAIL);
-    }
-  }
-
-  tet_result(TET_PASS);
-  END_TEST;
-}
-
-
-int UtcDaliTextFieldlElideTextLocation(void)
-{
-  tet_infoline(" UtcDaliTextFieldlElideTextLocation ");
-
-  Size textSize00( 100.f, 100.f );
-
-  Size  textSize01( 120.0f, 50.0f );
-  float positions01[] = { 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 50.0f, 60.0f, 70.0f, 80.0f, 91.0f };
-
-  Size  textSize02( 120.0f, 50.0f );
-  float positions02[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 84.0f, 93.0f };
-
-  Size  textSize03( 120.0f, 50.0f );
-  float positions03[] = { 117.0f, 111.0f, 97.0f, 88.0f, 80.0f, 74.0f, 64.0f, 59.0f, 54.0f, 45.0f, 37.0f, 31.0f, 22.0f, 7.0f };
-
-  Size  textSize04( 120.0f, 50.0f );
-  float positions04[] = { 5.0f, 21.0f, 31.0f, 41.0f, 50.0f, 61.0f, 71.0f, 80.0f, 90.0f, 100.0f, 109.0f };
-
-  Size  textSize05( 120.0f, 50.0f );
-  float positions05[] = { 8.0f, 24.0f, 35.0f, 44.0f, 49.0f, 63.0f, 74.0f, 77.0f, 85.0f, 96.0f, 110.0f };
-
-  Size  textSize06( 120.0f, 50.0f );
-  float positions06[] = { 90.0f, 79.0f, 70.0f, 68.0f, 62.0f, 56.0f, 51.0f, 42.0f, 29.0f, 26.0f, 15.0f, 7.0f, 0.0f };
-
-  Size  textSize07( 120.0f, 50.0f );
-  float positions07[] = { 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 53.0f };
-
-  Size  textSize08( 120.0f, 50.0f );
-  float positions08[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f };
-
-  Size  textSize09( 120.0f, 50.0f );
-  float positions09[] = { 116.0f, 109.0f, 96.0f, 87.0f, 79.0f, 73.0f, 63.0f };
-
-  Size  textSize10( 120.0f, 50.0f );
-  float positions10[] = { 121.0f, 116.0f, 111.0f, 106.0f, 101.0f, 96.0f, 92.0f, 87.0f, 83.0f, 77.0f, 63.0f, 55.0f, 46.0f, 40.0f, 30.0f, 16.0f };
-
-  Size  textSize11( 120.0f, 50.0f );
-  float positions11[] = { 93.0f, 77.0f, 74.0f, 63.0f, 56.0f, 49.0f, 44.0f, 39.0f, 34.0f, 29.0f, 24.0f, 19.0f, 14.0f, 9.0f, 5.0f };
-
-  Size  textSize12( 120.0f, 50.0f );
-  float positions12[] = { 117.0f, 112.0f, 107.0f, 102.0f, 97.0f, 92.0f, 87.0f, 82.0f, 79.0f, 72.0f };
-
-  struct ElideData data[] =
-  {
-    {
-      "void text",
-      "",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize00,
-      0u,
-      0u,
-      nullptr
-    },
-
-    {
-      "void text",
-      "",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize00,
-      0u,
-      0u,
-      nullptr
-    },
-
-    {
-      "void text",
-      "",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize00,
-      0u,
-      0u,
-      nullptr
-    },
-
-    {
-      "EllipsisPosition: TextField: Basic case SingleLine LTR END",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize01,
-      1u,
-      10u,
-      positions01
-    },
-
-    {
-      "EllipsisPosition: TextField: SingleLine LTR END",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize02,
-      1u,
-      13u,
-      positions02
-    },
-
-    {
-      "EllipsisPosition: TextField: SingleLine RTL END",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize03,
-      1u,
-      14u,
-      positions03
-    },
-
-    {
-      "EllipsisPosition: TextField: Basic case SingleLine LTR START",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize04,
-      1u,
-      11u,
-      positions04
-    },
-
-    {
-      "EllipsisPosition: TextField: SingleLine LTR START",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Welcome" ,
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize05,
-      1u,
-      11u,
-      positions05
-    },
-
-    {
-      "EllipsisPosition: TextField: SingleLine RTL START",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize06,
-      1u,
-      13u,
-      positions06
-    },
-
-    {
-      "EllipsisPosition: TextField: Basic case SingleLine LTR MIDDLE",
-      "A0123456789 B0123456789 C0123456789 D0123456789 ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize07,
-      1u,
-      11u,
-      positions07
-    },
-
-    {
-      "EllipsisPosition: TextField: SingleLine LTR MIDDLE",
-      "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye" ,
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize08,
-      1u,
-      13u,
-      positions08
-    },
-
-    {
-      "EllipsisPosition: TextField: SingleLine RTL MIDDLE",
-      "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize09,
-      1u,
-      13u,
-      positions09
-    },
-
-    {
-      "EllipsisPosition: TextField: Head and Tail whitespaces RTL END",
-      "        السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة         ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::END,
-      false,
-      textSize10,
-      1u,
-      16u,
-      positions10
-    },
-
-    {
-      "EllipsisPosition: TextField: Head and Tail whitespaces RTL START",
-      "        السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة         ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::START,
-      false,
-      textSize11,
-      1u,
-      15u,
-      positions11
-    },
-
-    {
-      "EllipsisPosition: TextField: Head and Tail whitespaces RTL MIDDLE",
-      "        السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة         ",
-      false,
-      DevelText::LineWrap::WORD,
-      DevelText::EllipsisPosition::MIDDLE,
-      false,
-      textSize12,
-      1u,
-      20u,
-      positions12
-    },
-
-  };
-
-  const unsigned int numberOfTests = 15u;
+      {"void text",
+       "",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize00,
+       0u,
+       0u,
+       nullptr},
+
+      {"void text",
+       "",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize00,
+       0u,
+       0u,
+       nullptr},
+
+      {"void text",
+       "",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize00,
+       0u,
+       0u,
+       nullptr},
+
+      {"EllipsisPosition: TextField: Basic case SingleLine LTR END",
+       "A0123456789 B0123456789 C0123456789 D0123456789 ",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize01,
+       1u,
+       10u,
+       positions01},
+
+      {"EllipsisPosition: TextField: SingleLine LTR END",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize02,
+       1u,
+       13u,
+       positions02},
+
+      {"EllipsisPosition: TextField: SingleLine RTL END",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize03,
+       1u,
+       14u,
+       positions03},
+
+      {"EllipsisPosition: TextField: Basic case SingleLine LTR START",
+       "A0123456789 B0123456789 C0123456789 D0123456789 ",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize04,
+       1u,
+       11u,
+       positions04},
+
+      {"EllipsisPosition: TextField: SingleLine LTR START",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Welcome",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize05,
+       1u,
+       11u,
+       positions05},
+
+      {"EllipsisPosition: TextField: SingleLine RTL START",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize06,
+       1u,
+       13u,
+       positions06},
+
+      {"EllipsisPosition: TextField: Basic case SingleLine LTR MIDDLE",
+       "A0123456789 B0123456789 C0123456789 D0123456789 ",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize07,
+       1u,
+       11u,
+       positions07},
+
+      {"EllipsisPosition: TextField: SingleLine LTR MIDDLE",
+       "Hello Hi Experimen Welcome Hello Hi Experimen Goodbye",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize08,
+       1u,
+       13u,
+       positions08},
+
+      {"EllipsisPosition: TextField: SingleLine RTL MIDDLE",
+       "السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize09,
+       1u,
+       13u,
+       positions09},
+
+      {"EllipsisPosition: TextField: Head and Tail whitespaces RTL END",
+       "        السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة         ",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize10,
+       1u,
+       16u,
+       positions10},
+
+      {"EllipsisPosition: TextField: Head and Tail whitespaces RTL START",
+       "        السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة         ",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize11,
+       1u,
+       15u,
+       positions11},
+
+      {"EllipsisPosition: TextField: Head and Tail whitespaces RTL MIDDLE",
+       "        السلام عليكم مرحبا اهلا هذا اختبار شكرا للمساعدة         ",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::MIDDLE,
+       false,
+       textSize12,
+       1u,
+       11u,
+       positions12},
+
+      {"EllipsisPosition: TextField: Mixed Directions Languages END",
+       "سیٹنگیں Projector سیٹنگیں",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::END,
+       false,
+       textSize13,
+       1u,
+       15,
+       positions13},
+
+      {"EllipsisPosition: TextField: Mixed Directions Languages START",
+       "سیٹنگیں Projector سیٹنگیں",
+       false,
+       DevelText::LineWrap::WORD,
+       DevelText::EllipsisPosition::START,
+       false,
+       textSize14,
+       1u,
+       15,
+       positions14},
+
+    };
+
+  const unsigned int numberOfTests = 17u;
 
   for( unsigned int index = 0u; index < numberOfTests; ++index )
   {
@@ -1298,94 +1284,94 @@ int UtcDaliTextEditorElideTextLocation(void)
   Size textSize00( 100.f, 100.f );
 
   Size  textSize01( 120.0f, 50.0f );
-  float positions01[] =  { 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f };
+  float positions01[] =  { 0.0f, 12.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 92.0f };
 
   Size  textSize02( 120.0f, 60.0f );
-  float positions02[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 0.0f };
+  float positions02[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 0.0f };
 
   Size  textSize03( 120.0f, 60.0f );
-  float positions03[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 84.0f, 92.0f };
+  float positions03[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 84.0f, 93.0f };
 
   Size  textSize04( 110.0f, 60.0f );
-  float positions04[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f };
+  float positions04[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f };
 
   Size  textSize05( 110.0f, 60.0f );
-  float positions05[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f };
+  float positions05[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f };
 
   Size  textSize06( 120.0f, 50.0f );
-  float positions06[] = { 5.0f, 21.0f, 31.0f, 41.0f, 50.0f, 61.0f, 70.0f, 80.0f, 90.0f, 100.0f, 109.0f };
+  float positions06[] = { 6.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 92.0f, 102.0f, 111.0f };
 
   Size  textSize07( 120.0f, 60.0f );
-  float positions07[] = { 8.0f, 24.0f, 28.0f, 36.0f, 47.0f, 61.0f, 70.0f, 76.0f, 87.0f, 97.0f, 102.0f, 105.0f, 115.0f };
+  float positions07[] = { 8.0f, 25.0f, 28.0f, 37.0f, 47.0f, 61.0f, 71.0f, 77.0f, 88.0f, 99.0f, 103.0f, 106.0f, 115.0f };
 
   Size  textSize08( 120.0f, 60.0f );
-  float positions08[] = { 8.0f, 24.0f, 33.0f, 38.0f, 52.0f, 63.0f, 66.0f, 75.0f, 85.0f, 99.0f, 109.0f };
+  float positions08[] = { 8.0f, 25.0f, 34.0f, 39.0f, 53.0f, 64.0f, 67.0f, 76.0f, 86.0f, 100.0f, 110.0f };
 
   Size  textSize09( 100.0f, 60.0f );
-  float positions09[] = { 4.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f };
+  float positions09[] = { 4.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f };
 
   Size  textSize10( 100.0f, 60.0f );
-  float positions10[] = { 4.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f };
+  float positions10[] = { 4.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f };
 
   Size  textSize11( 120.0f, 60.0f );
-  float positions11[] = { 117.0f, 111.0f, 97.0f, 89.0f, 80.0f, 74.0f, 64.0f, 59.0f, 54.0f, 45.0f, 37.0f, 32.0f, 112.0f, 103.0f, 94.0f, 89.0f };
+  float positions11[] = { 117.0f, 110.0f, 96.0f, 88.0f, 79.0f, 73.0f, 63.0f, 58.0f, 53.0f, 44.0f, 36.0f, 31.0f, 111.0f, 102.0f, 92.0f, 87.0f };
 
   Size  textSize12( 110.0f, 60.0f );
-  float positions12[] = { 109.0f, 102.0f, 89.0f, 80.0f, 72.0f, 66.0f, 56.0f, 50.0f, 46.0f, 37.0f, 29.0f, 23.0f, 14.0f };
+  float positions12[] = { 109.0f, 102.0f, 88.0f, 80.0f, 71.0f, 65.0f, 55.0f, 50.0f, 45.0f, 36.0f, 28.0f, 22.0f };
 
   Size  textSize13( 110.0f, 60.0f );
-  float positions13[] = { 116.0f, 109.0f, 96.0f, 87.0f, 79.0f, 73.0f, 63.0f, 57.0f, 53.0f, 44.0f, 36.0f, 31.0f, 111.0f };
+  float positions13[] = { 116.0f, 109.0f, 95.0f, 87.0f, 78.0f, 72.0f, 62.0f, 57.0f, 52.0f, 43.0f, 35.0f, 30.0f, 110.0f };
 
   Size  textSize14( 110.0f, 60.0f );
-  float positions14[] = { 116.0f, 109.0f, 96.0f, 87.0f, 79.0f, 73.0f, 63.0f, 57.0f, 53.0f, 44.0f, 36.0f, 31.0f, 111.0f };
+  float positions14[] = { 116.0f, 109.0f, 95.0f, 87.0f, 78.0f, 72.0f, 62.0f, 57.0f, 52.0f, 43.0f, 35.0f, 30.0f, 110.0f };
 
   Size  textSize15( 120.0f, 60.0f );
-  float positions15[] = { 130.0f, 118.0f, 113.0f, 111.0f, 105.0f, 101.0f, 91.0f, 83.0f, 78.0f, 69.0f, 62.0f, 58.0f, 54.0f };
+  float positions15[] = { 130.0f, 118.0f, 113.0f, 110.0f, 104.0f, 101.0f, 91.0f, 83.0f, 78.0f, 69.0f, 62.0f, 59.0f, 54.0f };
 
   Size  textSize16( 110.0f, 60.0f );
-  float positions16[] = { 92.0f, 85.0f, 81.0f, 71.0f, 63.0f, 58.0f, 49.0f, 42.0f, 38.0f, 32.0f, 29.0f, 18.0f, 13.0f, 8.0f, 6.0f };
+  float positions16[] = { 92.0f, 85.0f, 82.0f, 72.0f, 64.0f, 59.0f, 50.0f, 43.0f, 40.0f, 34.0f, 31.0f, 19.0f, 14.0f, 9.0f, 6.0f };
 
   Size  textSize17( 110.0f, 60.0f );
-  float positions17[] = { 110.0f, 98.0f, 93.0f, 91.0f, 85.0f, 81.0f, 71.0f, 63.0f, 58.0f, 49.0f, 42.0f, 38.0f, 34.0f };
+  float positions17[] = { 110.0f, 98.0f, 93.0f, 90.0f, 84.0f, 81.0f, 71.0f, 63.0f, 58.0f, 49.0f, 42.0f, 39.0f, 34.0f };
 
   Size  textSize18( 110.0f, 60.0f );
-  float positions18[] = { 110.0f, 98.0f, 93.0f, 91.0f, 85.0f, 81.0f, 71.0f, 63.0f, 58.0f, 49.0f, 42.0f, 38.0f, 34.0f };
+  float positions18[] = { 110.0f, 98.0f, 93.0f, 90.0f, 84.0f, 81.0f, 71.0f, 63.0f, 58.0f, 49.0f, 42.0f, 39.0f, 34.0f };
 
   Size  textSize19( 120.0f, 50.0f );
-  float positions19[] = { 0.0f, 11.0f, 21.0f, 31.0f, 41.0f, 50.0f, 60.0f, 70.0f, 80.0f, 91.0f };
+  float positions19[] = { 0.0f, 12.0f, 22.0f, 32.0f, 42.0f, 51.0f, 62.0f, 72.0f, 82.0f, 93.0f };
 
   Size  textSize20( 120.0f, 60.0f );
-  float positions20[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f };
+  float positions20[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f };
 
   Size  textSize21( 120.0f, 60.0f );
-  float positions21[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f };
+  float positions21[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f };
 
   Size  textSize22( 110.0f, 60.0f );
-  float positions22[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f };
+  float positions22[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f };
 
   Size  textSize23( 110.0f, 60.0f );
-  float positions23[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f };
+  float positions23[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f };
 
   Size  textSize24( 120.0f, 60.0f );
-  float positions24[] = { 142.0f, 135.0f, 121.0f, 113.0f, 104.0f, 98.0f, 88.0f, 83.0f, 78.0f, 70.0f, 61.0f };
+  float positions24[] = { 143.0f, 136.0f, 122.0f, 114.0f, 105.0f, 99.0f, 89.0f, 84.0f, 79.0f, 70.0f, 62.0f };
 
   Size  textSize25( 110.0f, 60.0f );
-  float positions25[] = { 111.0f, 104.0f, 90.0f, 82.0f, 73.0f, 67.0f, 57.0f, 52.0f, 47.0f, 39.0f, 30.0f, 24.0f, 15.0f, 7.0f };
+  float positions25[] = { 111.0f, 104.0f, 90.0f, 82.0f, 73.0f, 67.0f, 57.0f, 52.0f, 47.0f, 38.0f, 30.0f, 24.0f, 15.0f, 6.0f };
 
   Size  textSize26( 110.0f, 60.0f );
-  float positions26[] = { 122.0f, 115.0f, 101.0f, 93.0f, 84.0f, 78.0f, 68.0f, 63.0f, 58.0f, 50.0f, 41.0f };
+  float positions26[] = { 123.0f, 116.0f, 102.0f, 94.0f, 85.0f, 79.0f, 69.0f, 64.0f, 59.0f, 50.0f, 42.0f };
 
   Size  textSize27( 110.0f, 60.0f );
-  float positions27[] = { 122.0f, 115.0f, 101.0f, 93.0f, 84.0f, 78.0f, 68.0f, 63.0f, 58.0f, 50.0f, 41.0f };
+  float positions27[] = { 123.0f, 116.0f, 102.0f, 94.0f, 85.0f, 79.0f, 69.0f, 64.0f, 59.0f, 50.0f, 42.0f };
 
   Size  textSize28( 120.0f, 30.0f );
-  float positions28[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f, 59.0f, 65.0f, 73.0f, 84.0f, 93.0f };
+  float positions28[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f, 59.0f, 65.0f, 74.0f, 84.0f, 94.0f };
 
   Size  textSize29( 120.0f, 30.0f );
-  float positions29[] = { 8.0f, 24.0f, 35.0f, 44.0f, 49.0f, 63.0f, 74.0f, 77.0f, 85.0f, 96.0f, 110.0f };
+  float positions29[] = { 8.0f, 24.0f, 35.0f, 44.0f, 49.0f, 63.0f, 74.0f, 77.0f, 86.0f, 96.0f, 110.0f };
 
   Size  textSize30( 120.0f, 30.0f );
-  float positions30[] = { 0.0f, 10.0f, 21.0f, 25.0f, 28.0f, 38.0f, 44.0f, 55.0f };
+  float positions30[] = { 0.0f, 11.0f, 22.0f, 26.0f, 29.0f, 38.0f, 44.0f, 56.0f };
 
 
   struct ElideData data[] =
@@ -1587,7 +1573,7 @@ int UtcDaliTextEditorElideTextLocation(void)
       false,
       textSize12,
       3u,
-      44u,
+      43u,
       positions12
     },
 
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Hyphen-Wrapping.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Hyphen-Wrapping.cpp
index 402cc40..41e0636 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Hyphen-Wrapping.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Hyphen-Wrapping.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,33 +15,31 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/internal/text/layouts/layout-engine.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
 #include <dali-toolkit/internal/text/text-run-container.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
 #include <toolkit-text-utils.h>
 
 using namespace Dali;
 using namespace Toolkit;
 using namespace Text;
 
-
 namespace
 {
-
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
 
 struct LayoutTextData
 {
   std::string          text;
   Size                 textArea;
   unsigned int         numberOfFonts;
-  FontDescriptionRun  *fontDescriptions;
+  FontDescriptionRun*  fontDescriptions;
   unsigned int         numberOfLines;
   LineRun*             lines;
   Layout::Engine::Type layout;
@@ -50,80 +48,83 @@ struct LayoutTextData
   Text::LineWrap::Mode wrapMode;
 };
 
-void Print( const LineRun& line )
+void Print(const LineRun& line)
 {
   std::cout << "        glyph run, index : " << line.glyphRun.glyphIndex << ", num glyphs : " << line.glyphRun.numberOfGlyphs << std::endl;
   std::cout << "    character run, index : " << line.characterRun.characterIndex << ", num chars : " << line.characterRun.numberOfCharacters << std::endl;
 }
 
-bool LayoutTextTest( const LayoutTextData& data )
+bool LayoutTextTest(const LayoutTextData& data)
 {
   // Load some fonts.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
 
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size layoutSize;
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  if( 0u != data.numberOfFonts )
+  if(0u != data.numberOfFonts)
   {
-    fontDescriptionRuns.Insert( fontDescriptionRuns.End(),
-                                data.fontDescriptions,
-                                data.fontDescriptions + data.numberOfFonts );
+    fontDescriptionRuns.Insert(fontDescriptionRuns.End(),
+                               data.fontDescriptions,
+                               data.fontDescriptions + data.numberOfFonts);
   }
 
   LayoutOptions options;
   options.align = false;
-  CreateTextModel( data.text,
-                   data.textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   data.wrapMode,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  CreateTextModel(data.text,
+                  data.textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  data.wrapMode,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   Vector<LineRun>& lines = textModel->mVisualModel->mLines;
 
   // 4) Compare the results.
 
-  if( lines.Count() != data.numberOfLines )
+  if(lines.Count() != data.numberOfLines)
   {
     std::cout << "  Different number of lines : " << lines.Count() << ", expected : " << data.numberOfLines << std::endl;
     return false;
   }
 
-  for( unsigned int index = 0u; index < data.numberOfLines; ++index )
+  for(unsigned int index = 0u; index < data.numberOfLines; ++index)
   {
-    const LineRun& line = *( lines.Begin() + index );
-    const LineRun& expectedLine = *( data.lines + index );
+    const LineRun& line         = *(lines.Begin() + index);
+    const LineRun& expectedLine = *(data.lines + index);
 
-    if( line.characterRun.characterIndex != expectedLine.characterRun.characterIndex )
+    if(line.characterRun.characterIndex != expectedLine.characterRun.characterIndex)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
-    if( line.characterRun.numberOfCharacters != expectedLine.characterRun.numberOfCharacters )
+    if(line.characterRun.numberOfCharacters != expectedLine.characterRun.numberOfCharacters)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
   }
@@ -133,7 +134,6 @@ bool LayoutTextTest( const LayoutTextData& data )
 
 } // namespace
 
-
 int UtcDaliTextHyphenWrapping(void)
 {
   ToolkitTestApplication application;
@@ -141,71 +141,68 @@ int UtcDaliTextHyphenWrapping(void)
 
   // Layout some lines of left to right text.
 
-  const std::string fontFamily( "TizenSans" );
+  const std::string fontFamily("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun1;
-  fontDescriptionRun1.characterRun.characterIndex = 0u;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
   fontDescriptionRun1.characterRun.numberOfCharacters = 13u;
-  fontDescriptionRun1.familyLength = fontFamily.size();
-  fontDescriptionRun1.familyName = new char[fontDescriptionRun1.familyLength];
-  memcpy( fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength );
+  fontDescriptionRun1.familyLength                    = fontFamily.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength);
   fontDescriptionRun1.familyDefined = true;
   fontDescriptionRun1.weightDefined = false;
-  fontDescriptionRun1.widthDefined = false;
-  fontDescriptionRun1.slantDefined = false;
-  fontDescriptionRun1.sizeDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun1 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
   Size textArea(65.0f, 200.f);
 
   LineRun line1 =
-  {
-    { 0u, 5u },
-    { 0u, 5u },
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 8u},
+      {0u, 8u},
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   LineRun line2 =
-  {
-    { 5u, 8u },
-    { 5u, 8u },
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {8u, 5u},
+      {8u, 5u},
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
 
   Vector<LineRun> lines;
-  lines.PushBack( line1 );
-  lines.PushBack( line2 );
+  lines.PushBack(line1);
+  lines.PushBack(line2);
 
   LayoutTextData data =
-  {
-    "Hi Experiment",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    2u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    13u,
-    (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION
-  };
-
-  if( !LayoutTextTest( data ) )
+    {
+      "Hi Experiment",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      2u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      13u,
+      (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION};
+
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -221,85 +218,81 @@ int UtcDaliTextMixedWrapping(void)
 
   // Layout some lines of left to right text.
 
-  const std::string fontFamily( "DejaVuSans" );
+  const std::string fontFamily("DejaVuSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun1;
-  fontDescriptionRun1.characterRun.characterIndex = 0u;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
   fontDescriptionRun1.characterRun.numberOfCharacters = 13u;
-  fontDescriptionRun1.familyLength = fontFamily.size();
-  fontDescriptionRun1.familyName = new char[fontDescriptionRun1.familyLength];
-  memcpy( fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength );
+  fontDescriptionRun1.familyLength                    = fontFamily.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength);
   fontDescriptionRun1.familyDefined = true;
   fontDescriptionRun1.weightDefined = false;
-  fontDescriptionRun1.widthDefined = false;
-  fontDescriptionRun1.slantDefined = false;
-  fontDescriptionRun1.sizeDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun1 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
   Size textArea(72.0f, 200.f);
 
   LineRun line1 =
-  {
-    { 0u, 3u },
-    { 0u, 3u },
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 3u},
+      {0u, 3u},
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   LineRun line2 =
-  {
-    { 3u, 6u },
-    { 3u, 6u },
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {3u, 6u},
+      {3u, 6u},
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   LineRun line3 =
-  {
-    { 9u, 4u },
-    { 9u, 4u },
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {9u, 4u},
+      {9u, 4u},
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
 
   Vector<LineRun> lines;
-  lines.PushBack( line1 );
-  lines.PushBack( line2 );
-  lines.PushBack( line3 );
+  lines.PushBack(line1);
+  lines.PushBack(line2);
+  lines.PushBack(line3);
 
   LayoutTextData data =
-  {
-    "Hi Experiment",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    3u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    13u,
-    (Text::LineWrap::Mode)DevelText::LineWrap::MIXED
-  };
-
-  if( !LayoutTextTest( data ) )
+    {
+      "Hi Experiment",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      3u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      13u,
+      (Text::LineWrap::Mode)DevelText::LineWrap::MIXED};
+
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
old mode 100755
new mode 100644
index 281dbba..ef83bc0
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/internal/text/layouts/layout-engine.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
 #include <dali-toolkit/internal/text/text-run-container.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
 #include <toolkit-text-utils.h>
 
 using namespace Dali;
@@ -36,30 +36,29 @@ using namespace Text;
 
 namespace
 {
-
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
 
 struct LayoutTextData
 {
-  std::string                                       description;
-  std::string                                       text;
-  Size                                              textArea;
-  unsigned int                                      numberOfFonts;
-  FontDescriptionRun*                               fontDescriptions;
-  Size                                              layoutSize;
-  unsigned int                                      totalNumberOfGlyphs;
-  float*                                            positions;
-  unsigned int                                      numberOfLines;
-  LineRun*                                          lines;
-  Layout::Engine::Type                              layout;
-  unsigned int                                      startIndex;
-  unsigned int                                      numberOfGlyphs;
-  bool                                              ellipsis:1;
-  DevelText::EllipsisPosition::Type                 ellipsisPosition;
-  bool                                              updated:1;
+  std::string                       description;
+  std::string                       text;
+  Size                              textArea;
+  unsigned int                      numberOfFonts;
+  FontDescriptionRun*               fontDescriptions;
+  Size                              layoutSize;
+  unsigned int                      totalNumberOfGlyphs;
+  float*                            positions;
+  unsigned int                      numberOfLines;
+  LineRun*                          lines;
+  Layout::Engine::Type              layout;
+  unsigned int                      startIndex;
+  unsigned int                      numberOfGlyphs;
+  bool                              ellipsis : 1;
+  DevelText::EllipsisPosition::Type ellipsisPosition;
+  bool                              updated : 1;
 };
 
-void Print( const LineRun& line )
+void Print(const LineRun& line)
 {
   std::cout << "        glyph run, index : " << line.glyphRun.glyphIndex << ", num glyphs : " << line.glyphRun.numberOfGlyphs << std::endl;
   std::cout << "    character run, index : " << line.characterRun.characterIndex << ", num chars : " << line.characterRun.numberOfCharacters << std::endl;
@@ -72,239 +71,245 @@ void Print( const LineRun& line )
   std::cout << "                ellipsis : " << line.ellipsis << std::endl;
 }
 
-bool LayoutTextTest( const LayoutTextData& data )
+bool LayoutTextTest(const LayoutTextData& data)
 {
   // Load some fonts.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHindiRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHindiRegular.ttf");
 
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size layoutSize;
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  if( 0u != data.numberOfFonts )
+  if(0u != data.numberOfFonts)
   {
-    fontDescriptionRuns.Insert( fontDescriptionRuns.End(),
-                                data.fontDescriptions,
-                                data.fontDescriptions + data.numberOfFonts );
+    fontDescriptionRuns.Insert(fontDescriptionRuns.End(),
+                               data.fontDescriptions,
+                               data.fontDescriptions + data.numberOfFonts);
   }
 
   LayoutOptions options;
   options.align = false;
-  CreateTextModel( data.text,
-                   data.textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  CreateTextModel(data.text,
+                  data.textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   // 2) Clear the layout.
   Vector<LineRun>& lines = visualModel->mLines;
 
-  const Length numberOfCharacters = logicalModel->mText.Count();
-  const bool isLastNewParagraph = ( 0u == numberOfCharacters ) ? false : TextAbstraction::IsNewParagraph( *( logicalModel->mText.Begin() + ( numberOfCharacters - 1u ) ) );
-  const GlyphIndex lastGlyphIndex = data.startIndex + data.numberOfGlyphs - 1u;
-  const bool removeLastLine = isLastNewParagraph && ( lastGlyphIndex + 1u == visualModel->mGlyphs.Count() );
+  const Length     numberOfCharacters = logicalModel->mText.Count();
+  const bool       isLastNewParagraph = (0u == numberOfCharacters) ? false : TextAbstraction::IsNewParagraph(*(logicalModel->mText.Begin() + (numberOfCharacters - 1u)));
+  const GlyphIndex lastGlyphIndex     = data.startIndex + data.numberOfGlyphs - 1u;
+  const bool       removeLastLine     = isLastNewParagraph && (lastGlyphIndex + 1u == visualModel->mGlyphs.Count());
 
   LineIndex startRemoveIndex = 0u;
 
-  if( 0u != lines.Count() )
+  if(0u != lines.Count())
   {
-    startRemoveIndex = lines.Count();
+    startRemoveIndex         = lines.Count();
     LineIndex endRemoveIndex = startRemoveIndex;
-    ClearGlyphRuns( data.startIndex,
-                    lastGlyphIndex + ( removeLastLine ? 1u : 0u ),
-                    lines,
-                    startRemoveIndex,
-                    endRemoveIndex );
+    ClearGlyphRuns(data.startIndex,
+                   lastGlyphIndex + (removeLastLine ? 1u : 0u),
+                   lines,
+                   startRemoveIndex,
+                   endRemoveIndex);
 
     // Update the character runs of the lines.
     const CharacterIndex* const glyphsToCharactersBuffer = visualModel->mGlyphsToCharacters.Begin();
-    const Length* const charactersPerGlyph = visualModel->mCharactersPerGlyph.Begin();
-    const CharacterIndex startCharacterIndex = *( glyphsToCharactersBuffer + data.startIndex );
-    const CharacterIndex lastCharacterIndex = *( glyphsToCharactersBuffer + lastGlyphIndex ) + *( charactersPerGlyph + lastGlyphIndex ) - 1u;
-    ClearCharacterRuns( startCharacterIndex,
-                        lastCharacterIndex + ( removeLastLine ? 1u : 0u ),
-                        lines,
-                        startRemoveIndex,
-                        endRemoveIndex );
-
-    lines.Erase( lines.Begin() + startRemoveIndex,
-                 lines.Begin() + endRemoveIndex );
+    const Length* const         charactersPerGlyph       = visualModel->mCharactersPerGlyph.Begin();
+    const CharacterIndex        startCharacterIndex      = *(glyphsToCharactersBuffer + data.startIndex);
+    const CharacterIndex        lastCharacterIndex       = *(glyphsToCharactersBuffer + lastGlyphIndex) + *(charactersPerGlyph + lastGlyphIndex) - 1u;
+    ClearCharacterRuns(startCharacterIndex,
+                       lastCharacterIndex + (removeLastLine ? 1u : 0u),
+                       lines,
+                       startRemoveIndex,
+                       endRemoveIndex);
+
+    lines.Erase(lines.Begin() + startRemoveIndex,
+                lines.Begin() + endRemoveIndex);
   }
 
   Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
 
-  glyphPositions.Erase( glyphPositions.Begin() + data.startIndex,
-                        glyphPositions.Begin() + data.startIndex + data.numberOfGlyphs );
+  glyphPositions.Erase(glyphPositions.Begin() + data.startIndex,
+                       glyphPositions.Begin() + data.startIndex + data.numberOfGlyphs);
 
   // 3) Layout
   Layout::Engine engine;
-  engine.SetMetrics( metrics );
-  engine.SetLayout( data.layout );
+  engine.SetMetrics(metrics);
+  engine.SetLayout(data.layout);
 
-  textModel->mHorizontalAlignment = Text::HorizontalAlignment::BEGIN;
-  textModel->mLineWrapMode = LineWrap::WORD;
+  textModel->mHorizontalAlignment   = Text::HorizontalAlignment::BEGIN;
+  textModel->mLineWrapMode          = LineWrap::WORD;
   textModel->mIgnoreSpacesAfterText = true;
-  Layout::Parameters layoutParameters( data.textArea,
-                                       textModel );
+  Layout::Parameters layoutParameters(data.textArea,
+                                      textModel);
 
   layoutParameters.isLastNewParagraph = isLastNewParagraph;
 
   // The initial glyph and the number of glyphs to layout.
-  layoutParameters.startGlyphIndex = data.startIndex;
-  layoutParameters.numberOfGlyphs = data.numberOfGlyphs;
-  layoutParameters.startLineIndex = startRemoveIndex;
+  layoutParameters.startGlyphIndex        = data.startIndex;
+  layoutParameters.numberOfGlyphs         = data.numberOfGlyphs;
+  layoutParameters.startLineIndex         = startRemoveIndex;
   layoutParameters.estimatedNumberOfLines = logicalModel->mParagraphInfo.Count();
 
   layoutSize = Vector2::ZERO;
 
-  bool isAutoScroll = false;
-  const bool updated = engine.LayoutText( layoutParameters,
-                                          layoutSize,
-                                          data.ellipsis,
-                                          isAutoScroll,
-                                          data.ellipsisPosition );
+  bool       isAutoScroll                   = false;
+  bool       isAutoScrollMaxTextureExceeded = false;
+  bool       isHiddenInputEnabled           = false;
+  const bool updated                        = engine.LayoutText(layoutParameters,
+                                         layoutSize,
+                                         data.ellipsis,
+                                         isAutoScroll,
+                                         isAutoScrollMaxTextureExceeded,
+                                         isHiddenInputEnabled,
+                                         data.ellipsisPosition);
 
   // 4) Compare the results.
 
-  if( updated != data.updated )
+  if(updated != data.updated)
   {
     std::cout << "  Different updated bool : " << updated << ", expected : " << data.updated << std::endl;
     return false;
   }
 
-  if( layoutSize != data.layoutSize )
+  if(layoutSize != data.layoutSize)
   {
     std::cout << "  Different layout size : " << layoutSize << ", expected : " << data.layoutSize << std::endl;
     return false;
   }
 
-  for( unsigned int index = 0u; index < data.totalNumberOfGlyphs; ++index )
+  for(unsigned int index = 0u; index < data.totalNumberOfGlyphs; ++index)
   {
-    const Vector2& position = *( glyphPositions.Begin() + index );
+    const Vector2& position = *(glyphPositions.Begin() + index);
 
-    if( fabsf( std::round( position.x ) - *( data.positions + 2u * index ) ) > Math::MACHINE_EPSILON_1000 )
+    if(fabsf(std::round(position.x) - *(data.positions + 2u * index)) > Math::MACHINE_EPSILON_1000)
     {
-      std::cout << "  Different position for glyph " << index << " x : " << position.x << ", expected : " << *( data.positions + 2u * index ) << std::endl;
+      std::cout << "  Different position for glyph " << index << " x : " << position.x << ", expected : " << *(data.positions + 2u * index) << std::endl;
       return false;
     }
-    if( fabsf( position.y - *( data.positions + 2u * index + 1u ) ) > Math::MACHINE_EPSILON_1000 )
+    if(fabsf(position.y - *(data.positions + 2u * index + 1u)) > Math::MACHINE_EPSILON_1000)
     {
-      std::cout << "  Different position for glyph " << index << " y : " << position.y << ", expected : " << *( data.positions + 2u * index + 1u ) << std::endl;
+      std::cout << "  Different position for glyph " << index << " y : " << position.y << ", expected : " << *(data.positions + 2u * index + 1u) << std::endl;
       return false;
     }
   }
 
-  if( lines.Count() != data.numberOfLines )
+  if(lines.Count() != data.numberOfLines)
   {
     std::cout << "  Different number of lines : " << lines.Count() << ", expected : " << data.numberOfLines << std::endl;
     return false;
   }
 
-  for( unsigned int index = 0u; index < data.numberOfLines; ++index )
+  for(unsigned int index = 0u; index < data.numberOfLines; ++index)
   {
-    const LineRun& line = *( lines.Begin() + index );
-    const LineRun& expectedLine = *( data.lines + index );
+    const LineRun& line         = *(lines.Begin() + index);
+    const LineRun& expectedLine = *(data.lines + index);
 
-    if( line.glyphRun.glyphIndex != expectedLine.glyphRun.glyphIndex )
+    if(line.glyphRun.glyphIndex != expectedLine.glyphRun.glyphIndex)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
-    if( line.glyphRun.numberOfGlyphs != expectedLine.glyphRun.numberOfGlyphs )
+    if(line.glyphRun.numberOfGlyphs != expectedLine.glyphRun.numberOfGlyphs)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
 
-    if( line.characterRun.characterIndex != expectedLine.characterRun.characterIndex )
+    if(line.characterRun.characterIndex != expectedLine.characterRun.characterIndex)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
-    if( line.characterRun.numberOfCharacters != expectedLine.characterRun.numberOfCharacters )
+    if(line.characterRun.numberOfCharacters != expectedLine.characterRun.numberOfCharacters)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
 
-    if( fabsf( floor( line.width ) - expectedLine.width ) > Math::MACHINE_EPSILON_1 )
+    if(fabsf(floor(line.width) - expectedLine.width) > Math::MACHINE_EPSILON_1)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
 
-    if( fabsf( line.ascender - expectedLine.ascender ) > Math::MACHINE_EPSILON_1 )
+    if(fabsf(line.ascender - expectedLine.ascender) > Math::MACHINE_EPSILON_1)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
 
-    if( fabsf( line.descender - expectedLine.descender ) > Math::MACHINE_EPSILON_1 )
+    if(fabsf(line.descender - expectedLine.descender) > Math::MACHINE_EPSILON_1)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
 
-    if( fabsf( line.extraLength - expectedLine.extraLength ) > Math::MACHINE_EPSILON_1 )
+    if(fabsf(line.extraLength - expectedLine.extraLength) > Math::MACHINE_EPSILON_1)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
 
-    if( line.ellipsis != expectedLine.ellipsis )
+    if(line.ellipsis != expectedLine.ellipsis)
     {
       std::cout << "  Different line info for line : " << index << std::endl;
-      Print( line );
+      Print(line);
       std::cout << "  expected" << std::endl;
-      Print( expectedLine );
+      Print(expectedLine);
       return false;
     }
-
     // Do not compare the alignment offset as it's not calculated in the layout.
     // Do not compare the line direction as it's not set in the layout.
   }
@@ -316,94 +321,97 @@ bool LayoutTextTest( const LayoutTextData& data )
 
 struct AlignData
 {
-  std::string                       description;
-  std::string                       text;
-  Size                              textArea;
-  unsigned int                      numberOfFonts;
-  FontDescriptionRun*               fontDescriptions;
-  Text::HorizontalAlignment::Type   horizontalAlignment;
-  Text::VerticalAlignment::Type     verticalAlignment;
-  unsigned int                      startIndex;
-  unsigned int                      numberOfCharacters;
-  unsigned int                      numberOfLines;
-  float*                            lineOffsets;
-  Dali::LayoutDirection::Type       layoutDirection;
-  bool                              matchSystemLanguageDirection;
+  std::string                     description;
+  std::string                     text;
+  Size                            textArea;
+  unsigned int                    numberOfFonts;
+  FontDescriptionRun*             fontDescriptions;
+  Text::HorizontalAlignment::Type horizontalAlignment;
+  Text::VerticalAlignment::Type   verticalAlignment;
+  unsigned int                    startIndex;
+  unsigned int                    numberOfCharacters;
+  unsigned int                    numberOfLines;
+  float*                          lineOffsets;
+  Dali::LayoutDirection::Type     layoutDirection;
+  bool                            matchSystemLanguageDirection;
 };
 
-bool AlignTest( const AlignData& data )
+bool AlignTest(const AlignData& data)
 {
   // Load some fonts.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf");
 
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size layoutSize;
+  Size       layoutSize;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  if( 0u != data.numberOfFonts )
+  if(0u != data.numberOfFonts)
   {
-    fontDescriptionRuns.Insert( fontDescriptionRuns.End(),
-                                data.fontDescriptions,
-                                data.fontDescriptions + data.numberOfFonts );
+    fontDescriptionRuns.Insert(fontDescriptionRuns.End(),
+                               data.fontDescriptions,
+                               data.fontDescriptions + data.numberOfFonts);
   }
 
   LayoutOptions options;
   options.align = false;
-  CreateTextModel( data.text,
-                   data.textArea,
-                   fontDescriptionRuns,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  CreateTextModel(data.text,
+                  data.textArea,
+                  fontDescriptionRuns,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   // Call the Align method.
   Layout::Engine engine;
-  engine.SetMetrics( metrics );
+  engine.SetMetrics(metrics);
 
   float alignmentOffset = 0.f;
-  engine.Align( data.textArea,
-                data.startIndex,
-                data.numberOfCharacters,
-                data.horizontalAlignment,
-                visualModel->mLines,
-                alignmentOffset,
-                data.layoutDirection,
-                data.matchSystemLanguageDirection );
+  engine.Align(data.textArea,
+               data.startIndex,
+               data.numberOfCharacters,
+               data.horizontalAlignment,
+               visualModel->mLines,
+               alignmentOffset,
+               data.layoutDirection,
+               data.matchSystemLanguageDirection);
 
   // Compare results.
-  if( data.numberOfLines != visualModel->mLines.Count() )
+  if(data.numberOfLines != visualModel->mLines.Count())
   {
     std::cout << "  Different number of lines : " << visualModel->mLines.Count() << ", expected : " << data.numberOfLines << std::endl;
     return false;
   }
 
   const LineRun* const linesBuffer = visualModel->mLines.Begin();
-  for( unsigned int index = 0u; index < data.numberOfLines; ++index )
+  for(unsigned int index = 0u; index < data.numberOfLines; ++index)
   {
-    const LineRun& line = *( linesBuffer + index );
+    const LineRun& line = *(linesBuffer + index);
 
-    if( line.alignmentOffset != *( data.lineOffsets + index ) )
+    if(line.alignmentOffset != *(data.lineOffsets + index))
     {
-      std::cout << "  different line offset for index " << index << " : " << line.alignmentOffset << ", expected : " << *( data.lineOffsets + index ) << std::endl;
+      std::cout << "  different line offset for index " << index << " : " << line.alignmentOffset << ", expected : " << *(data.lineOffsets + index) << std::endl;
       return false;
     }
   }
@@ -459,10 +467,10 @@ int UtcDaliTextLayoutSetGetLayout(void)
 
   Layout::Engine engine;
 
-  DALI_TEST_CHECK( Layout::Engine::SINGLE_LINE_BOX == engine.GetLayout() );
+  DALI_TEST_CHECK(Layout::Engine::SINGLE_LINE_BOX == engine.GetLayout());
 
-  engine.SetLayout( Layout::Engine::MULTI_LINE_BOX );
-  DALI_TEST_CHECK( Layout::Engine::MULTI_LINE_BOX == engine.GetLayout() );
+  engine.SetLayout(Layout::Engine::MULTI_LINE_BOX);
+  DALI_TEST_CHECK(Layout::Engine::MULTI_LINE_BOX == engine.GetLayout());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -475,10 +483,10 @@ int UtcDaliTextLayoutSetGetCursorWidth(void)
 
   Layout::Engine engine;
 
-  DALI_TEST_EQUALS( 0, engine.GetCursorWidth(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, engine.GetCursorWidth(), TEST_LOCATION);
 
-  engine.SetCursorWidth( 2 );
-  DALI_TEST_EQUALS( 2, engine.GetCursorWidth(), TEST_LOCATION );
+  engine.SetCursorWidth(2);
+  DALI_TEST_EQUALS(2, engine.GetCursorWidth(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -489,29 +497,28 @@ int UtcDaliTextLayoutNoText(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextLayoutNoText");
 
-  Size textArea(100.f, 60.f);
-  Size layoutSize = Vector2::ZERO;
+  Size           textArea(100.f, 60.f);
+  Size           layoutSize = Vector2::ZERO;
   LayoutTextData data =
-  {
-    "No text",
-    "",
-    textArea,
-    0u,
-    NULL,
-    layoutSize,
-    0u,
-    NULL,
-    0u,
-    NULL,
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    0u,
-    false,
-    DevelText::EllipsisPosition::END,
-    false
-  };
+    {
+      "No text",
+      "",
+      textArea,
+      0u,
+      NULL,
+      layoutSize,
+      0u,
+      NULL,
+      0u,
+      NULL,
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      0u,
+      false,
+      DevelText::EllipsisPosition::END,
+      false};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -527,46 +534,45 @@ int UtcDaliTextLayoutSmallTextArea01(void)
 
   // Won't layout the text in multi-line if the width is too small.
 
-  const std::string fontFamily( "TizenSans" );
+  const std::string fontFamily("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun;
-  fontDescriptionRun.characterRun.characterIndex = 0u;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
   fontDescriptionRun.characterRun.numberOfCharacters = 11u;
-  fontDescriptionRun.familyLength = fontFamily.size();
-  fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength];
-  memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength );
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
   fontDescriptionRun.familyDefined = true;
   fontDescriptionRun.weightDefined = false;
-  fontDescriptionRun.widthDefined = false;
-  fontDescriptionRun.slantDefined = false;
-  fontDescriptionRun.sizeDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun );
-  Size textArea(1.f, 1.f);
-  Size layoutSize = Vector2::ZERO;
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+  Size           textArea(1.f, 1.f);
+  Size           layoutSize = Vector2::ZERO;
   LayoutTextData data =
-  {
-    "Layout text in a small area",
-    "Hello world",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    0u,
-    NULL,
-    0u,
-    NULL,
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    11u,
-    false,
-    DevelText::EllipsisPosition::END,
-    false
-  };
+    {
+      "Layout text in a small area",
+      "Hello world",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      0u,
+      NULL,
+      0u,
+      NULL,
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      11u,
+      false,
+      DevelText::EllipsisPosition::END,
+      false};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -582,63 +588,61 @@ int UtcDaliTextLayoutSmallTextArea02(void)
 
   // Will layout the text in single line as it can be scrolled.
 
-  const std::string fontFamily( "TizenSans" );
+  const std::string fontFamily("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun;
-  fontDescriptionRun.characterRun.characterIndex = 0u;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
   fontDescriptionRun.characterRun.numberOfCharacters = 11u;
-  fontDescriptionRun.familyLength = fontFamily.size();
-  fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength];
-  memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength );
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
   fontDescriptionRun.familyDefined = true;
   fontDescriptionRun.weightDefined = false;
-  fontDescriptionRun.widthDefined = false;
-  fontDescriptionRun.slantDefined = false;
-  fontDescriptionRun.sizeDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun );
-  Size textArea(1.f, 1.f);
-  Size layoutSize(81.f, 20.f);
-  float positions[] = { 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f };
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+  Size           textArea(1.f, 1.f);
+  Size           layoutSize(79.f, 20.f);
+  float          positions[] = {0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f};
   struct LineRun line =
-  {
-    { 0u, 11u },
-    { 0u, 11u },
-    81.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 11u},
+      {0u, 11u},
+      79.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line );
+  lines.PushBack(line);
 
   LayoutTextData data =
-  {
-    "Layout text in a small area",
-    "Hello world",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    11u,
-    positions,
-    1u,
-    lines.Begin(),
-    Layout::Engine::SINGLE_LINE_BOX,
-    0u,
-    11u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout text in a small area",
+      "Hello world",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      11u,
+      positions,
+      1u,
+      lines.Begin(),
+      Layout::Engine::SINGLE_LINE_BOX,
+      0u,
+      11u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -654,140 +658,131 @@ int UtcDaliTextLayoutMultilineText01(void)
 
   // Layout some lines of left to right text.
 
-  const std::string fontFamily( "TizenSans" );
+  const std::string fontFamily("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun1;
-  fontDescriptionRun1.characterRun.characterIndex = 0u;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
   fontDescriptionRun1.characterRun.numberOfCharacters = 18u;
-  fontDescriptionRun1.familyLength = fontFamily.size();
-  fontDescriptionRun1.familyName = new char[fontDescriptionRun1.familyLength];
-  memcpy( fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength );
+  fontDescriptionRun1.familyLength                    = fontFamily.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength);
   fontDescriptionRun1.familyDefined = true;
   fontDescriptionRun1.weightDefined = false;
-  fontDescriptionRun1.widthDefined = false;
-  fontDescriptionRun1.slantDefined = false;
-  fontDescriptionRun1.sizeDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun2;
-  fontDescriptionRun2.characterRun.characterIndex = 18u;
+  fontDescriptionRun2.characterRun.characterIndex     = 18u;
   fontDescriptionRun2.characterRun.numberOfCharacters = 31u;
-  fontDescriptionRun2.familyLength = fontFamily.size();
-  fontDescriptionRun2.familyName = new char[fontDescriptionRun2.familyLength];
-  memcpy( fontDescriptionRun2.familyName, fontFamily.c_str(), fontDescriptionRun2.familyLength );
+  fontDescriptionRun2.familyLength                    = fontFamily.size();
+  fontDescriptionRun2.familyName                      = new char[fontDescriptionRun2.familyLength];
+  memcpy(fontDescriptionRun2.familyName, fontFamily.c_str(), fontDescriptionRun2.familyLength);
   fontDescriptionRun2.familyDefined = true;
   fontDescriptionRun2.weightDefined = false;
-  fontDescriptionRun2.widthDefined = false;
-  fontDescriptionRun2.slantDefined = false;
-  fontDescriptionRun2.sizeDefined = false;
+  fontDescriptionRun2.widthDefined  = false;
+  fontDescriptionRun2.slantDefined  = false;
+  fontDescriptionRun2.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun1 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun2 );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(98.f, 97.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
+  fontDescriptionRuns.PushBack(fontDescriptionRun2);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(96.f, 97.f);
   float positions[] =
-  {
-    0.f, -12.f, 10.f,  -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f,  -0.f, 40.f, -9.f, 52.f,  -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,
-    0.f, -13.f,  9.f,  -9.f, 19.f,  -9.f, 32.f,  -9.f, 41.f, -2.f, 45.f, -12.f,
-    0.f, -12.f,  8.f,  -9.f, 18.f,  -9.f, 27.f,  -9.f, 38.f, -9.f, 47.f, -11.f, 53.f, -0.f,
-    0.f, -12.f, 11.f, -12.f, 15.f, -12.f, 26.f,  -9.f, 36.f, -9.f, 42.f,  -9.f, 53.f, -9.f, 62.f, -11.f, 68.f, -0.f,
-    0.f, -12.f,  4.f, -12.f,  9.f,  -9.f, 18.f,  -9.f, 28.f, -9.f, 36.f,  -0.f, 41.f, -9.f, 51.f, -12.f, 57.f, -0.f, 62.f, -11.f, 68.f,  -9.f, 78.f, -9.f, 87.f, -11.f, 94.f, -2.f
-  };
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -2.f, 44.f, -12.f, 0.f, -12.f, 8.f, -9.f, 18.f, -9.f, 27.f, -9.f, 38.f, -9.f, 47.f, -11.f, 53.f, -0.f, 0.f, -12.f, 11.f, -12.f, 14.f, -12.f, 25.f, -9.f, 36.f, -9.f, 41.f, -9.f, 52.f, -9.f, 61.f, -11.f, 67.f, -0.f, 0.f, -12.f, 4.f, -12.f, 8.f, -9.f, 17.f, -9.f, 27.f, -9.f, 35.f, -0.f, 40.f, -9.f, 50.f, -12.f, 56.f, -0.f, 61.f, -11.f, 67.f, -9.f, 77.f, -9.f, 86.f, -11.f, 93.f, -2.f
+    };
+
   struct LineRun line0 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line1 =
-  {
-    { 12u, 6u },
-    { 12u, 6u },
-    44.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {12u, 6u},
+      {12u, 6u},
+      43.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line2 =
-  {
-    { 18u, 7u },
-    { 18u, 7u },
-    54.f,
-    15.f,
-    -4.f,
-    6.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {18u, 7u},
+      {18u, 7u},
+      53.f,
+      15.f,
+      -4.f,
+      5.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line3 =
-  {
-    { 25u, 9u },
-    { 25u, 10u },
-    68.f,
-    15.f,
-    -4.f,
-    6.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {25u, 9u},
+      {25u, 10u},
+      67.f,
+      15.f,
+      -4.f,
+      5.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line4 =
-  {
-    { 34u, 14u },
-    { 35u, 14u },
-    98.f,
-    15.f,
-    -4.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {34u, 14u},
+      {35u, 14u},
+      96.f,
+      15.f,
+      -4.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line0 );
-  lines.PushBack( line1 );
-  lines.PushBack( line2 );
-  lines.PushBack( line3 );
-  lines.PushBack( line4 );
+  lines.PushBack(line0);
+  lines.PushBack(line1);
+  lines.PushBack(line2);
+  lines.PushBack(line3);
+  lines.PushBack(line4);
 
   LayoutTextData data =
-  {
-    "Layout simple multi-line text",
-    "Hello world demo.\n"
-    "Layout different lines of text.",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    48u,
-    positions,
-    5u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    48u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout simple multi-line text",
+      "Hello world demo.\n"
+      "Layout different lines of text.",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      48u,
+      positions,
+      5u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      48u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -803,206 +798,194 @@ int UtcDaliTextLayoutMultilineText02(void)
 
   // Layout some lines of bidirectional text.
 
-  const std::string fontFamily1( "TizenSans" );
+  const std::string fontFamily1("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun1;
-  fontDescriptionRun1.characterRun.characterIndex = 0u;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
   fontDescriptionRun1.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun1.familyLength = fontFamily1.size();
-  fontDescriptionRun1.familyName = new char[fontDescriptionRun1.familyLength];
-  memcpy( fontDescriptionRun1.familyName, fontFamily1.c_str(), fontDescriptionRun1.familyLength );
+  fontDescriptionRun1.familyLength                    = fontFamily1.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily1.c_str(), fontDescriptionRun1.familyLength);
   fontDescriptionRun1.familyDefined = true;
   fontDescriptionRun1.weightDefined = false;
-  fontDescriptionRun1.widthDefined = false;
-  fontDescriptionRun1.slantDefined = false;
-  fontDescriptionRun1.sizeDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = false;
 
-  const std::string fontFamily2( "TizenSansHebrew" );
+  const std::string fontFamily2("TizenSansHebrew");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun2;
-  fontDescriptionRun2.characterRun.characterIndex = 17u;
+  fontDescriptionRun2.characterRun.characterIndex     = 17u;
   fontDescriptionRun2.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun2.familyLength = fontFamily2.size();
-  fontDescriptionRun2.familyName = new char[fontDescriptionRun2.familyLength];
-  memcpy( fontDescriptionRun2.familyName, fontFamily2.c_str(), fontDescriptionRun2.familyLength );
+  fontDescriptionRun2.familyLength                    = fontFamily2.size();
+  fontDescriptionRun2.familyName                      = new char[fontDescriptionRun2.familyLength];
+  memcpy(fontDescriptionRun2.familyName, fontFamily2.c_str(), fontDescriptionRun2.familyLength);
   fontDescriptionRun2.familyDefined = true;
   fontDescriptionRun2.weightDefined = false;
-  fontDescriptionRun2.widthDefined = false;
-  fontDescriptionRun2.slantDefined = false;
-  fontDescriptionRun2.sizeDefined = false;
+  fontDescriptionRun2.widthDefined  = false;
+  fontDescriptionRun2.slantDefined  = false;
+  fontDescriptionRun2.sizeDefined   = false;
 
-  const std::string fontFamily3( "TizenSans" );
+  const std::string fontFamily3("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun3;
-  fontDescriptionRun3.characterRun.characterIndex = 26u;
+  fontDescriptionRun3.characterRun.characterIndex     = 26u;
   fontDescriptionRun3.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun3.familyLength = fontFamily3.size();
-  fontDescriptionRun3.familyName = new char[fontDescriptionRun3.familyLength];
-  memcpy( fontDescriptionRun3.familyName, fontFamily3.c_str(), fontDescriptionRun3.familyLength );
+  fontDescriptionRun3.familyLength                    = fontFamily3.size();
+  fontDescriptionRun3.familyName                      = new char[fontDescriptionRun3.familyLength];
+  memcpy(fontDescriptionRun3.familyName, fontFamily3.c_str(), fontDescriptionRun3.familyLength);
   fontDescriptionRun3.familyDefined = true;
   fontDescriptionRun3.weightDefined = false;
-  fontDescriptionRun3.widthDefined = false;
-  fontDescriptionRun3.slantDefined = false;
-  fontDescriptionRun3.sizeDefined = false;
+  fontDescriptionRun3.widthDefined  = false;
+  fontDescriptionRun3.slantDefined  = false;
+  fontDescriptionRun3.sizeDefined   = false;
 
-  const std::string fontFamily4( "TizenSansHebrew" );
+  const std::string fontFamily4("TizenSansHebrew");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun4;
-  fontDescriptionRun4.characterRun.characterIndex = 28u;
+  fontDescriptionRun4.characterRun.characterIndex     = 28u;
   fontDescriptionRun4.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun4.familyLength = fontFamily4.size();
-  fontDescriptionRun4.familyName = new char[fontDescriptionRun4.familyLength];
-  memcpy( fontDescriptionRun4.familyName, fontFamily4.c_str(), fontDescriptionRun4.familyLength );
+  fontDescriptionRun4.familyLength                    = fontFamily4.size();
+  fontDescriptionRun4.familyName                      = new char[fontDescriptionRun4.familyLength];
+  memcpy(fontDescriptionRun4.familyName, fontFamily4.c_str(), fontDescriptionRun4.familyLength);
   fontDescriptionRun4.familyDefined = true;
   fontDescriptionRun4.weightDefined = false;
-  fontDescriptionRun4.widthDefined = false;
-  fontDescriptionRun4.slantDefined = false;
-  fontDescriptionRun4.sizeDefined = false;
+  fontDescriptionRun4.widthDefined  = false;
+  fontDescriptionRun4.slantDefined  = false;
+  fontDescriptionRun4.sizeDefined   = false;
 
-  const std::string fontFamily5( "TizenSans" );
+  const std::string fontFamily5("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun5;
-  fontDescriptionRun5.characterRun.characterIndex = 38u;
+  fontDescriptionRun5.characterRun.characterIndex     = 38u;
   fontDescriptionRun5.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun5.familyLength = fontFamily5.size();
-  fontDescriptionRun5.familyName = new char[fontDescriptionRun5.familyLength];
-  memcpy( fontDescriptionRun5.familyName, fontFamily5.c_str(), fontDescriptionRun5.familyLength );
+  fontDescriptionRun5.familyLength                    = fontFamily5.size();
+  fontDescriptionRun5.familyName                      = new char[fontDescriptionRun5.familyLength];
+  memcpy(fontDescriptionRun5.familyName, fontFamily5.c_str(), fontDescriptionRun5.familyLength);
   fontDescriptionRun5.familyDefined = true;
   fontDescriptionRun5.weightDefined = false;
-  fontDescriptionRun5.widthDefined = false;
-  fontDescriptionRun5.slantDefined = false;
-  fontDescriptionRun5.sizeDefined = false;
+  fontDescriptionRun5.widthDefined  = false;
+  fontDescriptionRun5.slantDefined  = false;
+  fontDescriptionRun5.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun1 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun2 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun3 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun4 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun5 );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(81.f, 120.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
+  fontDescriptionRuns.PushBack(fontDescriptionRun2);
+  fontDescriptionRuns.PushBack(fontDescriptionRun3);
+  fontDescriptionRuns.PushBack(fontDescriptionRun4);
+  fontDescriptionRuns.PushBack(fontDescriptionRun5);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(79.f, 120.f);
   float positions[] =
   {
-    0.f, -12.f, 10.f,  -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f,  -0.f, 40.f,  -9.f, 52.f,  -9.f, 62.f,  -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, //  0 .. 11
-    0.f, -13.f,  9.f,  -9.f, 19.f,  -9.f, 32.f,  -9.f, 41.f, -0.f, 68.f, -10.f, 59.f, -13.f, 54.f, -10.f, 45.f, -10.f, 79.f,  -0.f,                          // 12 .. 21
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f,                                                                              // 22 .. 27
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f,  -0.f,                           // 28 .. 37
-    4.f, -13.f,  12.f,  -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f,  -0.f, 42.f,  -9.f, 54.f,  -9.f, 64.f,  -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 38 .. 49
-    4.f, -13.f,  13.f,  -9.f, 23.f,  -9.f, 36.f,  -9.f, 0.f, -2.f,                                                                                           // 50 .. 54
+    0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 67.f, -10.f, 58.f, -13.f, 54.f, -10.f, 44.f, -10.f, 78.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f, 63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 37.f, -0.f, 41.f, -9.f, 53.f, -9.f, 63.f, -9.f, 69.f, -13.f, 72.f, -13.f, 0.f, -0.f, 4.f, -13.f, 13.f, -9.f, 22.f, -9.f, 35.f, -9.f, 0.f, -2.f
   };
   struct LineRun line0 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line1 =
-  {
-    { 12u, 10u },
-    { 12u, 10u },
-    79.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {12u, 10u},
+      {12u, 10u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line2 =
-  {
-    { 22u, 6u },
-    { 22u, 6u },
-    35.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {22u, 6u},
+      {22u, 6u},
+      35.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line3 =
-  {
-    { 28u, 10u },
-    { 28u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {28u, 10u},
+      {28u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line4 =
-  {
-    { 38u, 12u },
-    { 38u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {38u, 12u},
+      {38u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line5 =
-  {
-    { 50u, 5u },
-    { 50u, 5u },
-    45.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {50u, 5u},
+      {50u, 5u},
+      44.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line0 );
-  lines.PushBack( line1 );
-  lines.PushBack( line2 );
-  lines.PushBack( line3 );
-  lines.PushBack( line4 );
-  lines.PushBack( line5 );
+  lines.PushBack(line0);
+  lines.PushBack(line1);
+  lines.PushBack(line2);
+  lines.PushBack(line3);
+  lines.PushBack(line4);
+  lines.PushBack(line5);
 
   LayoutTextData data =
-  {
-    "Layout bidirectional text.",
-    "Hello world demo שלום עולם.\n"
-    "שלום עולם hello world demo.",
-    textArea,
-    5u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    55u,
-    positions,
-    6u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    55u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout bidirectional text.",
+      "Hello world demo שלום עולם.\n"
+      "שלום עולם hello world demo.",
+      textArea,
+      5u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      55u,
+      positions,
+      6u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      55u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -1018,96 +1001,90 @@ int UtcDaliTextLayoutMultilineText03(void)
 
   // Layout a long word which doesn't fit in the width of the text area.
 
-  const std::string fontFamily( "TizenSans" );
+  const std::string fontFamily("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun;
-  fontDescriptionRun.characterRun.characterIndex = 0u;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
   fontDescriptionRun.characterRun.numberOfCharacters = 29u;
-  fontDescriptionRun.familyLength = fontFamily.size();
-  fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength];
-  memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength );
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
   fontDescriptionRun.familyDefined = true;
   fontDescriptionRun.weightDefined = false;
-  fontDescriptionRun.widthDefined = false;
-  fontDescriptionRun.slantDefined = false;
-  fontDescriptionRun.sizeDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(98.f, 60.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(96.f, 60.f);
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f,  -9.f, 36.f,  -9.f, 48.f, -9.f, 58.f, -9.f, 65.f, -13.f, 68.f, -13.f, 77.f, -13.f, 86.f,  -9.f,
-    0.f,  -9.f, 13.f, -9.f, 23.f, -13.f, 31.f,  -9.f, 41.f, -13.f, 45.f, -13.f, 48.f, -9.f, 57.f, -9.f, 69.f,  -9.f, 79.f,  -9.f, 85.f, -13.f, 88.f, -13.f,
-    0.f, -13.f,  9.f, -9.f, 19.f,  -9.f, 32.f,  -9.f, 41.f,  -2.f,
-  };
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -9.f, 47.f, -9.f, 57.f, -9.f, 63.f, -13.f, 66.f, -13.f, 75.f, -13.f, 84.f, -9.f, 0.f, -9.f, 13.f, -9.f, 23.f, -13.f, 31.f, -9.f, 40.f, -13.f, 44.f, -13.f, 47.f, -9.f, 56.f, -9.f, 68.f, -9.f, 78.f, -9.f, 84.f, -13.f, 87.f, -13.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -2.f
+    };
   struct LineRun line0 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    95.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      92.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line1 =
-  {
-    { 12u, 12u },
-    { 12u, 12u },
-    98.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {12u, 12u},
+      {12u, 12u},
+      96.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line2 =
-  {
-    { 24u, 5u },
-    { 24u, 5u },
-    44.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {24u, 5u},
+      {24u, 5u},
+      43.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line0 );
-  lines.PushBack( line1 );
-  lines.PushBack( line2 );
+  lines.PushBack(line0);
+  lines.PushBack(line1);
+  lines.PushBack(line2);
 
   LayoutTextData data =
-  {
-    "Layout a long word which doesn't fit in the width of the text area.",
-    "Helloworlddemohelloworlddemo.",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    29u,
-    positions,
-    3u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    29u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout a long word which doesn't fit in the width of the text area.",
+      "Helloworlddemohelloworlddemo.",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      29u,
+      positions,
+      3u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      29u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -1123,79 +1100,75 @@ int UtcDaliTextLayoutMultilineText04(void)
 
   // Layout simple text ending with a \n. It has to add a void line at the end.
 
-  const std::string fontFamily( "TizenSans" );
+  const std::string fontFamily("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun;
-  fontDescriptionRun.characterRun.characterIndex = 0u;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
   fontDescriptionRun.characterRun.numberOfCharacters = 13u;
-  fontDescriptionRun.familyLength = fontFamily.size();
-  fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength];
-  memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength );
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
   fontDescriptionRun.familyDefined = true;
   fontDescriptionRun.weightDefined = false;
-  fontDescriptionRun.widthDefined = false;
-  fontDescriptionRun.slantDefined = false;
-  fontDescriptionRun.sizeDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(84.f, 40.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(82.f, 40.f);
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -2.f, 85.f, -12.f
-  };
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -2.f, 83.f, -12.f};
   struct LineRun line0 =
-  {
-    { 0u, 13u },
-    { 0u, 13u },
-    84.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 13u},
+      {0u, 13u},
+      82.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line1 =
-  {
-    { 13u, 0u },
-    { 13u, 0u },
-    0.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {13u, 0u},
+      {13u, 0u},
+      0.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line0 );
-  lines.PushBack( line1 );
+  lines.PushBack(line0);
+  lines.PushBack(line1);
 
   LayoutTextData data =
-  {
-    "Layout simple text ending with a \n.",
-    "Hello world.\n",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    13u,
-    positions,
-    2u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    13u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout simple text ending with a \n.",
+      "Hello world.\n",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      13u,
+      positions,
+      2u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      13u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -1211,108 +1184,104 @@ int UtcDaliTextLayoutMultilineText05(void)
 
   // Layout simple text with one character with a different font size.
 
-  const std::string fontFamily( "TizenSans" );
+  const std::string fontFamily("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun1;
-  fontDescriptionRun1.characterRun.characterIndex = 0u;
+  fontDescriptionRun1.characterRun.characterIndex     = 0u;
   fontDescriptionRun1.characterRun.numberOfCharacters = 6u;
-  fontDescriptionRun1.familyLength = fontFamily.size();
-  fontDescriptionRun1.familyName = new char[fontDescriptionRun1.familyLength];
-  memcpy( fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength );
+  fontDescriptionRun1.familyLength                    = fontFamily.size();
+  fontDescriptionRun1.familyName                      = new char[fontDescriptionRun1.familyLength];
+  memcpy(fontDescriptionRun1.familyName, fontFamily.c_str(), fontDescriptionRun1.familyLength);
   fontDescriptionRun1.familyDefined = true;
   fontDescriptionRun1.weightDefined = false;
-  fontDescriptionRun1.widthDefined = false;
-  fontDescriptionRun1.slantDefined = false;
-  fontDescriptionRun1.sizeDefined = false;
+  fontDescriptionRun1.widthDefined  = false;
+  fontDescriptionRun1.slantDefined  = false;
+  fontDescriptionRun1.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun2;
-  fontDescriptionRun2.characterRun.characterIndex = 6u;
+  fontDescriptionRun2.characterRun.characterIndex     = 6u;
   fontDescriptionRun2.characterRun.numberOfCharacters = 1u;
-  fontDescriptionRun2.familyLength = fontFamily.size();
-  fontDescriptionRun2.familyName = new char[fontDescriptionRun2.familyLength];
-  memcpy( fontDescriptionRun2.familyName, fontFamily.c_str(), fontDescriptionRun2.familyLength );
-  fontDescriptionRun2.size = 1280u;
+  fontDescriptionRun2.familyLength                    = fontFamily.size();
+  fontDescriptionRun2.familyName                      = new char[fontDescriptionRun2.familyLength];
+  memcpy(fontDescriptionRun2.familyName, fontFamily.c_str(), fontDescriptionRun2.familyLength);
+  fontDescriptionRun2.size          = 1280u;
   fontDescriptionRun2.familyDefined = true;
   fontDescriptionRun2.weightDefined = false;
-  fontDescriptionRun2.widthDefined = false;
-  fontDescriptionRun2.slantDefined = false;
-  fontDescriptionRun2.sizeDefined = true;
+  fontDescriptionRun2.widthDefined  = false;
+  fontDescriptionRun2.slantDefined  = false;
+  fontDescriptionRun2.sizeDefined   = true;
 
   FontDescriptionRun fontDescriptionRun3;
-  fontDescriptionRun3.characterRun.characterIndex = 7u;
+  fontDescriptionRun3.characterRun.characterIndex     = 7u;
   fontDescriptionRun3.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun3.familyLength = fontFamily.size();
-  fontDescriptionRun3.familyName = new char[fontDescriptionRun3.familyLength];
-  memcpy( fontDescriptionRun3.familyName, fontFamily.c_str(), fontDescriptionRun3.familyLength );
+  fontDescriptionRun3.familyLength                    = fontFamily.size();
+  fontDescriptionRun3.familyName                      = new char[fontDescriptionRun3.familyLength];
+  memcpy(fontDescriptionRun3.familyName, fontFamily.c_str(), fontDescriptionRun3.familyLength);
   fontDescriptionRun3.familyDefined = true;
   fontDescriptionRun3.weightDefined = false;
-  fontDescriptionRun3.widthDefined = false;
-  fontDescriptionRun3.slantDefined = false;
-  fontDescriptionRun3.sizeDefined = false;
+  fontDescriptionRun3.widthDefined  = false;
+  fontDescriptionRun3.slantDefined  = false;
+  fontDescriptionRun3.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun1 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun2 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun3 );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(89.f, 53.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun1);
+  fontDescriptionRuns.PushBack(fontDescriptionRun2);
+  fontDescriptionRuns.PushBack(fontDescriptionRun3);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(87.f, 53.f);
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -14.f, 60.f, -9.f, 70.f, -9.f, 76.f, -13.f, 80.f, -13.f, 89.f, -0.f,
-    0.f, -13.f,  9.f, -9.f, 19.f,  -9.f, 32.f,  -9.f, 41.f, -2.f
-  };
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -14.f, 59.f, -9.f, 69.f, -9.f, 75.f, -13.f, 78.f, -13.f, 87.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -2.f
+    };
   struct LineRun line0 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    89.f,
-    25.f,
-    -8.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      87.f,
+      25.f,
+      -8.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line1 =
-  {
-    { 12u, 5u },
-    { 12u, 5u },
-    44.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {12u, 5u},
+      {12u, 5u},
+      43.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line0 );
-  lines.PushBack( line1 );
+  lines.PushBack(line0);
+  lines.PushBack(line1);
 
   LayoutTextData data =
-  {
-    "Layout simple text with one character with a different font size.",
-    "Hello world demo.",
-    textArea,
-    3u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    17u,
-    positions,
-    2u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    17u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout simple text with one character with a different font size.",
+      "Hello world demo.",
+      textArea,
+      3u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      17u,
+      positions,
+      2u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      17u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -1326,82 +1295,77 @@ int UtcDaliTextLayoutMultilineText06(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextLayoutMultilineText06");
 
-  const std::string fontFamily( "TizenSansHebrew" );
+  const std::string fontFamily("TizenSansHebrew");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun;
-  fontDescriptionRun.characterRun.characterIndex = 0u;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
   fontDescriptionRun.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun.familyLength = fontFamily.size();
-  fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength];
-  memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength );
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
   fontDescriptionRun.familyDefined = true;
   fontDescriptionRun.weightDefined = false;
-  fontDescriptionRun.widthDefined = false;
-  fontDescriptionRun.slantDefined = false;
-  fontDescriptionRun.sizeDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun );
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
 
-  Size textArea(64.f, 100.f);
-  Size layoutSize(34.f, 40.f);
+  Size  textArea(64.f, 100.f);
+  Size  layoutSize(33.f, 40.f);
   float positions[] =
-  {
-    27.f, -13.f, 18.f, -10.f, 9.f, -10.f, 4.f, -10.f, 0.f, -0.f,
-    22.f, -10.f, 17.f, -10.f, 12.f, -10.f, 4.f, -10.f, 0.f, -10.f
-  };
+    {
+      27.f, -13.f, 18.f, -10.f, 8.f, -10.f, 4.f, -10.f, 0.f, -0.f, 22.f, -10.f, 16.f, -10.f, 12.f, -10.f, 4.f, -10.f, 0.f, -10.f};
   struct LineRun line0 =
-  {
-    { 0u, 5u },
-    { 0u, 5u },
-    32.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {0u, 5u},
+      {0u, 5u},
+      32.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line1 =
-  {
-    { 5u, 5u },
-    { 5u, 5u },
-    34.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {5u, 5u},
+      {5u, 5u},
+      33.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line0 );
-  lines.PushBack( line1 );
+  lines.PushBack(line0);
+  lines.PushBack(line1);
 
   LayoutTextData data =
-  {
-    "Layout right to left text that doesn't fit in the text area after reordering.",
-    "לכאן שנורו", // If this text is laid-out ltr the width is 64. When reordered, the length is 66. This might cause alignment issues.
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    10u,
-    positions,
-    2u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    10u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout right to left text that doesn't fit in the text area after reordering.",
+      "לכאן שנורו", // If this text is laid-out ltr the width is 64. When reordered, the length is 66. This might cause alignment issues.
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      10u,
+      positions,
+      2u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      10u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -1415,97 +1379,90 @@ int UtcDaliTextLayoutMultilineText07(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextLayoutMultilineText07");
 
-  const std::string fontFamily( "TizenSansHebrew" );
+  const std::string fontFamily("TizenSansHebrew");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun;
-  fontDescriptionRun.characterRun.characterIndex = 0u;
+  fontDescriptionRun.characterRun.characterIndex     = 0u;
   fontDescriptionRun.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun.familyLength = fontFamily.size();
-  fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength];
-  memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength );
+  fontDescriptionRun.familyLength                    = fontFamily.size();
+  fontDescriptionRun.familyName                      = new char[fontDescriptionRun.familyLength];
+  memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
   fontDescriptionRun.familyDefined = true;
   fontDescriptionRun.weightDefined = false;
-  fontDescriptionRun.widthDefined = false;
-  fontDescriptionRun.slantDefined = false;
-  fontDescriptionRun.sizeDefined = false;
+  fontDescriptionRun.widthDefined  = false;
+  fontDescriptionRun.slantDefined  = false;
+  fontDescriptionRun.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun );
+  fontDescriptionRuns.PushBack(fontDescriptionRun);
 
-  Size textArea(26.f, 100.f);
-  Size layoutSize(24.f, 60.f);
+  Size  textArea(26.f, 100.f);
+  Size  layoutSize(23.f, 60.f);
   float positions[] =
-  {
-    10.f, -10.f, 4.f, -10.f, 0.f, -10.f,
-    13.f, -10.f, 9.f, -10.f, 0.f, -13.f,
-    14.f, -10.f, 4.f, -10.f, 0.f, -10.f
-  };
+    {
+      10.f, -10.f, 4.f, -10.f, 0.f, -10.f, 13.f, -10.f, 9.f, -10.f, 0.f, -13.f, 14.f, -10.f, 4.f, -10.f, 0.f, -10.f};
   struct LineRun line0 =
-  {
-    { 0u, 3u },
-    { 0u, 3u },
-    21.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {0u, 3u},
+      {0u, 3u},
+      21.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line1 =
-  {
-    { 3u, 3u },
-    { 3u, 3u },
-    22.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {3u, 3u},
+      {3u, 3u},
+      21.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line2 =
-  {
-    { 6u, 3u },
-    { 6u, 3u },
-    24.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {6u, 3u},
+      {6u, 3u},
+      23.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line0 );
-  lines.PushBack( line1 );
-  lines.PushBack( line2 );
+  lines.PushBack(line0);
+  lines.PushBack(line1);
+  lines.PushBack(line2);
 
   LayoutTextData data =
-  {
-    "Layout a single word of right to left text that doesn't fit in one single line. When layouting ltr a piece of word fits in the line but it doesn't after reordering.",
-    "שנורולכאן", // If a piece of this text is laid-out ltr the width is 26. When reordered, the length is 27. This might cause alignment issues.
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    9u,
-    positions,
-    3u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    9u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout a single word of right to left text that doesn't fit in one single line. When layouting ltr a piece of word fits in the line but it doesn't after reordering.",
+      "שנורולכאן", // If a piece of this text is laid-out ltr the width is 26. When reordered, the length is 27. This might cause alignment issues.
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      9u,
+      positions,
+      3u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      9u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -1521,567 +1478,529 @@ int UtcDaliTextUpdateLayout01(void)
 
   // Layout some lines of bidirectional text. Update the paragraphs at the beginning.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 17u;
+  fontDescriptionRun02.characterRun.characterIndex     = 17u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 26u;
+  fontDescriptionRun03.characterRun.characterIndex     = 26u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun03.familyLength = fontLatin.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontLatin.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 28u;
+  fontDescriptionRun04.characterRun.characterIndex     = 28u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun04.familyLength = fontArabic.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontArabic.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 42u;
+  fontDescriptionRun05.characterRun.characterIndex     = 42u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 54u;
+  fontDescriptionRun06.characterRun.characterIndex     = 54u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun06.familyLength = fontHebrew.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontHebrew.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontHebrew.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontHebrew.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun07;
-  fontDescriptionRun07.characterRun.characterIndex = 64u;
+  fontDescriptionRun07.characterRun.characterIndex     = 64u;
   fontDescriptionRun07.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun07.familyLength = fontHebrew.size();
-  fontDescriptionRun07.familyName = new char[fontDescriptionRun07.familyLength];
-  memcpy( fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength );
+  fontDescriptionRun07.familyLength                    = fontHebrew.size();
+  fontDescriptionRun07.familyName                      = new char[fontDescriptionRun07.familyLength];
+  memcpy(fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength);
   fontDescriptionRun07.familyDefined = true;
   fontDescriptionRun07.weightDefined = false;
-  fontDescriptionRun07.widthDefined = false;
-  fontDescriptionRun07.slantDefined = false;
-  fontDescriptionRun07.sizeDefined = false;
+  fontDescriptionRun07.widthDefined  = false;
+  fontDescriptionRun07.slantDefined  = false;
+  fontDescriptionRun07.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun08;
-  fontDescriptionRun08.characterRun.characterIndex = 74u;
+  fontDescriptionRun08.characterRun.characterIndex     = 74u;
   fontDescriptionRun08.characterRun.numberOfCharacters = 18u;
-  fontDescriptionRun08.familyLength = fontLatin.size();
-  fontDescriptionRun08.familyName = new char[fontDescriptionRun08.familyLength];
-  memcpy( fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength );
+  fontDescriptionRun08.familyLength                    = fontLatin.size();
+  fontDescriptionRun08.familyName                      = new char[fontDescriptionRun08.familyLength];
+  memcpy(fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength);
   fontDescriptionRun08.familyDefined = true;
   fontDescriptionRun08.weightDefined = false;
-  fontDescriptionRun08.widthDefined = false;
-  fontDescriptionRun08.slantDefined = false;
-  fontDescriptionRun08.sizeDefined = false;
+  fontDescriptionRun08.widthDefined  = false;
+  fontDescriptionRun08.slantDefined  = false;
+  fontDescriptionRun08.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun09;
-  fontDescriptionRun09.characterRun.characterIndex = 92u;
+  fontDescriptionRun09.characterRun.characterIndex     = 92u;
   fontDescriptionRun09.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun09.familyLength = fontLatin.size();
-  fontDescriptionRun09.familyName = new char[fontDescriptionRun09.familyLength];
-  memcpy( fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength );
+  fontDescriptionRun09.familyLength                    = fontLatin.size();
+  fontDescriptionRun09.familyName                      = new char[fontDescriptionRun09.familyLength];
+  memcpy(fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength);
   fontDescriptionRun09.familyDefined = true;
   fontDescriptionRun09.weightDefined = false;
-  fontDescriptionRun09.widthDefined = false;
-  fontDescriptionRun09.slantDefined = false;
-  fontDescriptionRun09.sizeDefined = false;
+  fontDescriptionRun09.widthDefined  = false;
+  fontDescriptionRun09.slantDefined  = false;
+  fontDescriptionRun09.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun10;
-  fontDescriptionRun10.characterRun.characterIndex = 104u;
+  fontDescriptionRun10.characterRun.characterIndex     = 104u;
   fontDescriptionRun10.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun10.familyLength = fontArabic.size();
-  fontDescriptionRun10.familyName = new char[fontDescriptionRun10.familyLength];
-  memcpy( fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength );
+  fontDescriptionRun10.familyLength                    = fontArabic.size();
+  fontDescriptionRun10.familyName                      = new char[fontDescriptionRun10.familyLength];
+  memcpy(fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength);
   fontDescriptionRun10.familyDefined = true;
   fontDescriptionRun10.weightDefined = false;
-  fontDescriptionRun10.widthDefined = false;
-  fontDescriptionRun10.slantDefined = false;
-  fontDescriptionRun10.sizeDefined = false;
+  fontDescriptionRun10.widthDefined  = false;
+  fontDescriptionRun10.slantDefined  = false;
+  fontDescriptionRun10.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun11;
-  fontDescriptionRun11.characterRun.characterIndex = 118u;
+  fontDescriptionRun11.characterRun.characterIndex     = 118u;
   fontDescriptionRun11.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun11.familyLength = fontHebrew.size();
-  fontDescriptionRun11.familyName = new char[fontDescriptionRun11.familyLength];
-  memcpy( fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength );
+  fontDescriptionRun11.familyLength                    = fontHebrew.size();
+  fontDescriptionRun11.familyName                      = new char[fontDescriptionRun11.familyLength];
+  memcpy(fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength);
   fontDescriptionRun11.familyDefined = true;
   fontDescriptionRun11.weightDefined = false;
-  fontDescriptionRun11.widthDefined = false;
-  fontDescriptionRun11.slantDefined = false;
-  fontDescriptionRun11.sizeDefined = false;
+  fontDescriptionRun11.widthDefined  = false;
+  fontDescriptionRun11.slantDefined  = false;
+  fontDescriptionRun11.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun12;
-  fontDescriptionRun12.characterRun.characterIndex = 128u;
+  fontDescriptionRun12.characterRun.characterIndex     = 128u;
   fontDescriptionRun12.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun12.familyLength = fontLatin.size();
-  fontDescriptionRun12.familyName = new char[fontDescriptionRun12.familyLength];
-  memcpy( fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength );
+  fontDescriptionRun12.familyLength                    = fontLatin.size();
+  fontDescriptionRun12.familyName                      = new char[fontDescriptionRun12.familyLength];
+  memcpy(fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength);
   fontDescriptionRun12.familyDefined = true;
   fontDescriptionRun12.weightDefined = false;
-  fontDescriptionRun12.widthDefined = false;
-  fontDescriptionRun12.slantDefined = false;
-  fontDescriptionRun12.sizeDefined = false;
+  fontDescriptionRun12.widthDefined  = false;
+  fontDescriptionRun12.slantDefined  = false;
+  fontDescriptionRun12.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun13;
-  fontDescriptionRun13.characterRun.characterIndex = 145u;
+  fontDescriptionRun13.characterRun.characterIndex     = 145u;
   fontDescriptionRun13.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun13.familyLength = fontHebrew.size();
-  fontDescriptionRun13.familyName = new char[fontDescriptionRun13.familyLength];
-  memcpy( fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength );
+  fontDescriptionRun13.familyLength                    = fontHebrew.size();
+  fontDescriptionRun13.familyName                      = new char[fontDescriptionRun13.familyLength];
+  memcpy(fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength);
   fontDescriptionRun13.familyDefined = true;
   fontDescriptionRun13.weightDefined = false;
-  fontDescriptionRun13.widthDefined = false;
-  fontDescriptionRun13.slantDefined = false;
-  fontDescriptionRun13.sizeDefined = false;
+  fontDescriptionRun13.widthDefined  = false;
+  fontDescriptionRun13.slantDefined  = false;
+  fontDescriptionRun13.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun14;
-  fontDescriptionRun14.characterRun.characterIndex = 154u;
+  fontDescriptionRun14.characterRun.characterIndex     = 154u;
   fontDescriptionRun14.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun14.familyLength = fontLatin.size();
-  fontDescriptionRun14.familyName = new char[fontDescriptionRun14.familyLength];
-  memcpy( fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength );
+  fontDescriptionRun14.familyLength                    = fontLatin.size();
+  fontDescriptionRun14.familyName                      = new char[fontDescriptionRun14.familyLength];
+  memcpy(fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength);
   fontDescriptionRun14.familyDefined = true;
   fontDescriptionRun14.weightDefined = false;
-  fontDescriptionRun14.widthDefined = false;
-  fontDescriptionRun14.slantDefined = false;
-  fontDescriptionRun14.sizeDefined = false;
+  fontDescriptionRun14.widthDefined  = false;
+  fontDescriptionRun14.slantDefined  = false;
+  fontDescriptionRun14.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun15;
-  fontDescriptionRun15.characterRun.characterIndex = 156u;
+  fontDescriptionRun15.characterRun.characterIndex     = 156u;
   fontDescriptionRun15.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun15.familyLength = fontHebrew.size();
-  fontDescriptionRun15.familyName = new char[fontDescriptionRun15.familyLength];
-  memcpy( fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength );
+  fontDescriptionRun15.familyLength                    = fontHebrew.size();
+  fontDescriptionRun15.familyName                      = new char[fontDescriptionRun15.familyLength];
+  memcpy(fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength);
   fontDescriptionRun15.familyDefined = true;
   fontDescriptionRun15.weightDefined = false;
-  fontDescriptionRun15.widthDefined = false;
-  fontDescriptionRun15.slantDefined = false;
-  fontDescriptionRun15.sizeDefined = false;
+  fontDescriptionRun15.widthDefined  = false;
+  fontDescriptionRun15.slantDefined  = false;
+  fontDescriptionRun15.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun16;
-  fontDescriptionRun16.characterRun.characterIndex = 166u;
+  fontDescriptionRun16.characterRun.characterIndex     = 166u;
   fontDescriptionRun16.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun16.familyLength = fontLatin.size();
-  fontDescriptionRun16.familyName = new char[fontDescriptionRun16.familyLength];
-  memcpy( fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength );
+  fontDescriptionRun16.familyLength                    = fontLatin.size();
+  fontDescriptionRun16.familyName                      = new char[fontDescriptionRun16.familyLength];
+  memcpy(fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength);
   fontDescriptionRun16.familyDefined = true;
   fontDescriptionRun16.weightDefined = false;
-  fontDescriptionRun16.widthDefined = false;
-  fontDescriptionRun16.slantDefined = false;
-  fontDescriptionRun16.sizeDefined = false;
+  fontDescriptionRun16.widthDefined  = false;
+  fontDescriptionRun16.slantDefined  = false;
+  fontDescriptionRun16.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun17;
-  fontDescriptionRun17.characterRun.characterIndex = 178u;
+  fontDescriptionRun17.characterRun.characterIndex     = 178u;
   fontDescriptionRun17.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun17.familyLength = fontArabic.size();
-  fontDescriptionRun17.familyName = new char[fontDescriptionRun17.familyLength];
-  memcpy( fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength );
+  fontDescriptionRun17.familyLength                    = fontArabic.size();
+  fontDescriptionRun17.familyName                      = new char[fontDescriptionRun17.familyLength];
+  memcpy(fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength);
   fontDescriptionRun17.familyDefined = true;
   fontDescriptionRun17.weightDefined = false;
-  fontDescriptionRun17.widthDefined = false;
-  fontDescriptionRun17.slantDefined = false;
-  fontDescriptionRun17.sizeDefined = false;
+  fontDescriptionRun17.widthDefined  = false;
+  fontDescriptionRun17.slantDefined  = false;
+  fontDescriptionRun17.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun07 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun08 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun09 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun10 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun11 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun12 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun13 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun14 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun15 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun16 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun17 );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(100.f, 380.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
+  fontDescriptionRuns.PushBack(fontDescriptionRun07);
+  fontDescriptionRuns.PushBack(fontDescriptionRun08);
+  fontDescriptionRuns.PushBack(fontDescriptionRun09);
+  fontDescriptionRuns.PushBack(fontDescriptionRun10);
+  fontDescriptionRuns.PushBack(fontDescriptionRun11);
+  fontDescriptionRuns.PushBack(fontDescriptionRun12);
+  fontDescriptionRuns.PushBack(fontDescriptionRun13);
+  fontDescriptionRuns.PushBack(fontDescriptionRun14);
+  fontDescriptionRuns.PushBack(fontDescriptionRun15);
+  fontDescriptionRuns.PushBack(fontDescriptionRun16);
+  fontDescriptionRuns.PushBack(fontDescriptionRun17);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(99.f, 380.f);
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,                                                                                                 //   0 ..  11
-    0.f, -13.f,  9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 68.f, -10.f, 59.f, -13.f, 54.f, -10.f, 45.f, -10.f, 79.f, -0.f,                                                                                                                         //  12 ..  21
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f,                                                                                                                                                                         //  22 ..  27
-    58.f, -8.f, 52.f, -6.f, 45.f, -8.f, 41.f, -7.f, 39.f, -11.f, 34.f, -0.f, 30.f, -7.f, 28.f, -11.f, 23.f, -11.f, 16.f, -8.f, 15.f, -11.f, 9.f, -11.f, 4.f, -8.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, //  28 ..  47
-    42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, 59.f, -10.f, 50.f, -13.f, 46.f, -10.f, 36.f, -10.f, 32.f, -0.f,                                                                                                            //  48 ..  58
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f,                                                                                                                                                                                       //  59 ..  63
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f,                                                                                                                       //  64 ..  73
-    4.f, -13.f,  12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f,                                                                                                 //  74 ..  85
-    4.f, -13.f,  13.f, -9.f, 23.f, -9.f, 36.f, -9.f, 0.f, -2.f, 0.f, -12.f,                                                                                                                                                                             //  86 ..  91
-    0.f, -13.f,  8.f, -9.f, 18.f, -13.f, 22.f, -13.f, 25.f, -9.f, 34.f, -0.f, 38.f, -9.f, 50.f, -9.f, 60.f, -9.f, 66.f, -13.f, 69.f, -13.f, 79.f, -0.f,                                                                                                 //  92 .. 103
-    92.f, -8.f, 86.f, -6.f, 79.f, -8.f, 75.f, -7.f, 73.f, -11.f, 68.f, -0.f, 64.f, -7.f, 62.f, -11.f, 57.f, -11.f, 50.f, -8.f, 49.f, -11.f, 43.f, -11.f, 38.f, -8.f, 34.f, -0.f, 23.f, -10.f, 14.f, -13.f, 10.f, -10.f, 0.f, -10.f, 99.f, -0.f,         // 104 .. 122
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -0.f,                                                                                                                                                                                      // 123 .. 127
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,                                                                                                 // 128 .. 139
-    0.f, -13.f,  9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 68.f, -10.f, 59.f, -13.f, 54.f, -10.f, 45.f, -10.f, 79.f, -0.f,                                                                                                                         // 140 .. 149
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f,                                                                                                                                                                         // 150 .. 155
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f,                                                                                                                       // 156 .. 165
-    4.f, -13.f,  12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f,                                                                                                 // 166 .. 177
-    54.f, -8.f, 49.f, -6.f, 41.f, -8.f, 37.f, -7.f, 35.f, -11.f, 31.f, -0.f, 26.f, -7.f, 24.f, -11.f, 19.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f,                                                                           // 178 .. 191
-  };
-
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 67.f, -10.f, 58.f, -13.f, 54.f, -10.f, 44.f, -10.f, 78.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f, 94.f, -8.f, 89.f, -6.f, 81.f, -8.f, 77.f, -7.f, 76.f, -11.f, 71.f, -0.f, 66.f, -7.f, 65.f, -11.f, 59.f, -11.f, 53.f, -8.f, 52.f, -11.f, 46.f, -11.f, 41.f, -8.f, 37.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 0.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 38.f, -0.f, 27.f, -10.f, 18.f, -13.f, 14.f, -10.f, 4.f, -10.f, 0.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f, 63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 37.f, -0.f, 41.f, -9.f, 53.f, -9.f, 63.f, -9.f, 69.f, -13.f, 72.f, -13.f, 0.f, -0.f, 4.f, -13.f, 13.f, -9.f, 22.f, -9.f, 35.f, -9.f, 0.f, -2.f, 0.f, -12.f, 0.f, -13.f, 8.f, -9.f, 17.f, -13.f, 21.f, -13.f, 24.f, -9.f, 33.f, -0.f, 37.f, -9.f, 49.f, -9.f, 59.f, -9.f, 65.f, -13.f, 68.f, -13.f, 77.f, -0.f, 91.f, -8.f, 86.f, -6.f, 78.f, -8.f, 74.f, -7.f, 73.f, -11.f, 68.f, -0.f, 63.f, -7.f, 62.f, -11.f, 56.f, -11.f, 50.f, -8.f, 49.f, -11.f, 43.f, -11.f, 38.f, -8.f, 34.f, -0.f, 23.f, -10.f, 14.f, -13.f, 10.f, -10.f, 0.f, -10.f, 98.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -0.f, 0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 67.f, -10.f, 58.f, -13.f, 54.f, -10.f, 44.f, -10.f, 78.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f, 63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 37.f, -0.f, 41.f, -9.f, 53.f, -9.f, 63.f, -9.f, 69.f, -13.f, 72.f, -13.f, 0.f, -0.f, 53.f, -8.f, 48.f, -6.f, 40.f, -8.f, 36.f, -7.f, 35.f, -11.f, 30.f, -0.f, 25.f, -7.f, 24.f, -11.f, 18.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f
+    };
   struct LineRun line01 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line02 =
-  {
-    { 12u, 10u },
-    { 12u, 10u },
-    79.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {12u, 10u},
+      {12u, 10u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line03 =
-  {
-    { 22u, 6u },
-    { 22u, 6u },
-    35.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {22u, 6u},
+      {22u, 6u},
+      35.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line04 =
-  {
-    { 28u, 14u },
-    { 28u, 14u },
-    63.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {28u, 20u},
+      {28u, 20u},
+      99.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line05 =
-  {
-    { 42, 12u },
-    { 42, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {48, 11u},
+      {48, 11u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line06 =
-  {
-    { 54u, 10u },
-    { 54u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {59u, 5u},
+      {59u, 5u},
+      32.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line07 =
-  {
-    { 64u, 10u },
-    { 64u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {64u, 10u},
+      {64u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line08 =
-  {
-    { 74u, 12u },
-    { 74u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {74u, 12u},
+      {74u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line09 =
-  {
-    { 86u, 6u },
-    { 86u, 6u },
-    45.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {86u, 6u},
+      {86u, 6u},
+      44.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line10 =
-  {
-    { 92u, 12u },
-    { 92u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {92u, 12u},
+      {92u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line11 =
-  {
-    { 104u, 19u },
-    { 104u, 19u },
-    100.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {104u, 19u},
+      {104u, 19u},
+      98.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line12 =
-  {
-    { 123u, 5u },
-    { 123u, 5u },
-    32.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {123u, 5u},
+      {123u, 5u},
+      32.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line13 =
-  {
-    { 128u, 12u },
-    { 128u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {128u, 12u},
+      {128u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line14 =
-  {
-    { 140u, 10u },
-    { 140u, 10u },
-    79.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {140u, 10u},
+      {140u, 10u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line15 =
-  {
-    { 150u, 6u },
-    { 150u, 6u },
-    35.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {150u, 6u},
+      {150u, 6u},
+      35.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line16 =
-  {
-    { 156u, 10u },
-    { 156u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {156u, 10u},
+      {156u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line17 =
-  {
-    { 166u, 12u },
-    { 166u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {166u, 12u},
+      {166u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line18 =
-  {
-    { 178u, 14u },
-    { 178u, 14u },
-    63.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {178u, 14u},
+      {178u, 14u},
+      62.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line19 =
-  {
-    { 192u, 0u },
-    { 192u, 0u },
-    0.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {192u, 0u},
+      {192u, 0u},
+      0.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
-  lines.PushBack( line02 );
-  lines.PushBack( line03 );
-  lines.PushBack( line04 );
-  lines.PushBack( line05 );
-  lines.PushBack( line06 );
-  lines.PushBack( line07 );
-  lines.PushBack( line08 );
-  lines.PushBack( line09 );
-  lines.PushBack( line10 );
-  lines.PushBack( line11 );
-  lines.PushBack( line12 );
-  lines.PushBack( line13 );
-  lines.PushBack( line14 );
-  lines.PushBack( line15 );
-  lines.PushBack( line16 );
-  lines.PushBack( line17 );
-  lines.PushBack( line18 );
-  lines.PushBack( line19 );
+  lines.PushBack(line01);
+  lines.PushBack(line02);
+  lines.PushBack(line03);
+  lines.PushBack(line04);
+  lines.PushBack(line05);
+  lines.PushBack(line06);
+  lines.PushBack(line07);
+  lines.PushBack(line08);
+  lines.PushBack(line09);
+  lines.PushBack(line10);
+  lines.PushBack(line11);
+  lines.PushBack(line12);
+  lines.PushBack(line13);
+  lines.PushBack(line14);
+  lines.PushBack(line15);
+  lines.PushBack(line16);
+  lines.PushBack(line17);
+  lines.PushBack(line18);
+  lines.PushBack(line19);
 
   LayoutTextData data =
-  {
-    "Layout bidirectional text.",
-    "Hello world demo שלום עולם.\n"
-    "مرحبا بالعالم hello world שלום עולם\n"
-    "שלום עולם hello world demo.\n"
-    "hello world مرحبا بالعالم שלום עולם\n"
-    "Hello world demo שלום עולם.\n"
-    "שלום עולם hello world مرحبا بالعالم\n",
-    textArea,
-    17u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    192u,
-    positions,
-    19u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    64u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout bidirectional text.",
+      "Hello world demo שלום עולם.\n"
+      "مرحبا بالعالم hello world שלום עולם\n"
+      "שלום עולם hello world demo.\n"
+      "hello world مرحبا بالعالم שלום עולם\n"
+      "Hello world demo שלום עולם.\n"
+      "שלום עולם hello world مرحبا بالعالم\n",
+      textArea,
+      17u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      192u,
+      positions,
+      19u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      64u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -2097,567 +2016,529 @@ int UtcDaliTextUpdateLayout02(void)
 
   // Layout some lines of bidirectional text. Update the paragraphs at the middle.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 17u;
+  fontDescriptionRun02.characterRun.characterIndex     = 17u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 26u;
+  fontDescriptionRun03.characterRun.characterIndex     = 26u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun03.familyLength = fontLatin.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontLatin.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 28u;
+  fontDescriptionRun04.characterRun.characterIndex     = 28u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun04.familyLength = fontArabic.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontArabic.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 42u;
+  fontDescriptionRun05.characterRun.characterIndex     = 42u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 54u;
+  fontDescriptionRun06.characterRun.characterIndex     = 54u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun06.familyLength = fontHebrew.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontHebrew.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontHebrew.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontHebrew.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun07;
-  fontDescriptionRun07.characterRun.characterIndex = 64u;
+  fontDescriptionRun07.characterRun.characterIndex     = 64u;
   fontDescriptionRun07.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun07.familyLength = fontHebrew.size();
-  fontDescriptionRun07.familyName = new char[fontDescriptionRun07.familyLength];
-  memcpy( fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength );
+  fontDescriptionRun07.familyLength                    = fontHebrew.size();
+  fontDescriptionRun07.familyName                      = new char[fontDescriptionRun07.familyLength];
+  memcpy(fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength);
   fontDescriptionRun07.familyDefined = true;
   fontDescriptionRun07.weightDefined = false;
-  fontDescriptionRun07.widthDefined = false;
-  fontDescriptionRun07.slantDefined = false;
-  fontDescriptionRun07.sizeDefined = false;
+  fontDescriptionRun07.widthDefined  = false;
+  fontDescriptionRun07.slantDefined  = false;
+  fontDescriptionRun07.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun08;
-  fontDescriptionRun08.characterRun.characterIndex = 74u;
+  fontDescriptionRun08.characterRun.characterIndex     = 74u;
   fontDescriptionRun08.characterRun.numberOfCharacters = 18u;
-  fontDescriptionRun08.familyLength = fontLatin.size();
-  fontDescriptionRun08.familyName = new char[fontDescriptionRun08.familyLength];
-  memcpy( fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength );
+  fontDescriptionRun08.familyLength                    = fontLatin.size();
+  fontDescriptionRun08.familyName                      = new char[fontDescriptionRun08.familyLength];
+  memcpy(fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength);
   fontDescriptionRun08.familyDefined = true;
   fontDescriptionRun08.weightDefined = false;
-  fontDescriptionRun08.widthDefined = false;
-  fontDescriptionRun08.slantDefined = false;
-  fontDescriptionRun08.sizeDefined = false;
+  fontDescriptionRun08.widthDefined  = false;
+  fontDescriptionRun08.slantDefined  = false;
+  fontDescriptionRun08.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun09;
-  fontDescriptionRun09.characterRun.characterIndex = 92u;
+  fontDescriptionRun09.characterRun.characterIndex     = 92u;
   fontDescriptionRun09.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun09.familyLength = fontLatin.size();
-  fontDescriptionRun09.familyName = new char[fontDescriptionRun09.familyLength];
-  memcpy( fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength );
+  fontDescriptionRun09.familyLength                    = fontLatin.size();
+  fontDescriptionRun09.familyName                      = new char[fontDescriptionRun09.familyLength];
+  memcpy(fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength);
   fontDescriptionRun09.familyDefined = true;
   fontDescriptionRun09.weightDefined = false;
-  fontDescriptionRun09.widthDefined = false;
-  fontDescriptionRun09.slantDefined = false;
-  fontDescriptionRun09.sizeDefined = false;
+  fontDescriptionRun09.widthDefined  = false;
+  fontDescriptionRun09.slantDefined  = false;
+  fontDescriptionRun09.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun10;
-  fontDescriptionRun10.characterRun.characterIndex = 104u;
+  fontDescriptionRun10.characterRun.characterIndex     = 104u;
   fontDescriptionRun10.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun10.familyLength = fontArabic.size();
-  fontDescriptionRun10.familyName = new char[fontDescriptionRun10.familyLength];
-  memcpy( fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength );
+  fontDescriptionRun10.familyLength                    = fontArabic.size();
+  fontDescriptionRun10.familyName                      = new char[fontDescriptionRun10.familyLength];
+  memcpy(fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength);
   fontDescriptionRun10.familyDefined = true;
   fontDescriptionRun10.weightDefined = false;
-  fontDescriptionRun10.widthDefined = false;
-  fontDescriptionRun10.slantDefined = false;
-  fontDescriptionRun10.sizeDefined = false;
+  fontDescriptionRun10.widthDefined  = false;
+  fontDescriptionRun10.slantDefined  = false;
+  fontDescriptionRun10.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun11;
-  fontDescriptionRun11.characterRun.characterIndex = 118u;
+  fontDescriptionRun11.characterRun.characterIndex     = 118u;
   fontDescriptionRun11.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun11.familyLength = fontHebrew.size();
-  fontDescriptionRun11.familyName = new char[fontDescriptionRun11.familyLength];
-  memcpy( fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength );
+  fontDescriptionRun11.familyLength                    = fontHebrew.size();
+  fontDescriptionRun11.familyName                      = new char[fontDescriptionRun11.familyLength];
+  memcpy(fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength);
   fontDescriptionRun11.familyDefined = true;
   fontDescriptionRun11.weightDefined = false;
-  fontDescriptionRun11.widthDefined = false;
-  fontDescriptionRun11.slantDefined = false;
-  fontDescriptionRun11.sizeDefined = false;
+  fontDescriptionRun11.widthDefined  = false;
+  fontDescriptionRun11.slantDefined  = false;
+  fontDescriptionRun11.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun12;
-  fontDescriptionRun12.characterRun.characterIndex = 128u;
+  fontDescriptionRun12.characterRun.characterIndex     = 128u;
   fontDescriptionRun12.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun12.familyLength = fontLatin.size();
-  fontDescriptionRun12.familyName = new char[fontDescriptionRun12.familyLength];
-  memcpy( fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength );
+  fontDescriptionRun12.familyLength                    = fontLatin.size();
+  fontDescriptionRun12.familyName                      = new char[fontDescriptionRun12.familyLength];
+  memcpy(fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength);
   fontDescriptionRun12.familyDefined = true;
   fontDescriptionRun12.weightDefined = false;
-  fontDescriptionRun12.widthDefined = false;
-  fontDescriptionRun12.slantDefined = false;
-  fontDescriptionRun12.sizeDefined = false;
+  fontDescriptionRun12.widthDefined  = false;
+  fontDescriptionRun12.slantDefined  = false;
+  fontDescriptionRun12.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun13;
-  fontDescriptionRun13.characterRun.characterIndex = 145u;
+  fontDescriptionRun13.characterRun.characterIndex     = 145u;
   fontDescriptionRun13.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun13.familyLength = fontHebrew.size();
-  fontDescriptionRun13.familyName = new char[fontDescriptionRun13.familyLength];
-  memcpy( fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength );
+  fontDescriptionRun13.familyLength                    = fontHebrew.size();
+  fontDescriptionRun13.familyName                      = new char[fontDescriptionRun13.familyLength];
+  memcpy(fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength);
   fontDescriptionRun13.familyDefined = true;
   fontDescriptionRun13.weightDefined = false;
-  fontDescriptionRun13.widthDefined = false;
-  fontDescriptionRun13.slantDefined = false;
-  fontDescriptionRun13.sizeDefined = false;
+  fontDescriptionRun13.widthDefined  = false;
+  fontDescriptionRun13.slantDefined  = false;
+  fontDescriptionRun13.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun14;
-  fontDescriptionRun14.characterRun.characterIndex = 154u;
+  fontDescriptionRun14.characterRun.characterIndex     = 154u;
   fontDescriptionRun14.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun14.familyLength = fontLatin.size();
-  fontDescriptionRun14.familyName = new char[fontDescriptionRun14.familyLength];
-  memcpy( fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength );
+  fontDescriptionRun14.familyLength                    = fontLatin.size();
+  fontDescriptionRun14.familyName                      = new char[fontDescriptionRun14.familyLength];
+  memcpy(fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength);
   fontDescriptionRun14.familyDefined = true;
   fontDescriptionRun14.weightDefined = false;
-  fontDescriptionRun14.widthDefined = false;
-  fontDescriptionRun14.slantDefined = false;
-  fontDescriptionRun14.sizeDefined = false;
+  fontDescriptionRun14.widthDefined  = false;
+  fontDescriptionRun14.slantDefined  = false;
+  fontDescriptionRun14.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun15;
-  fontDescriptionRun15.characterRun.characterIndex = 156u;
+  fontDescriptionRun15.characterRun.characterIndex     = 156u;
   fontDescriptionRun15.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun15.familyLength = fontHebrew.size();
-  fontDescriptionRun15.familyName = new char[fontDescriptionRun15.familyLength];
-  memcpy( fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength );
+  fontDescriptionRun15.familyLength                    = fontHebrew.size();
+  fontDescriptionRun15.familyName                      = new char[fontDescriptionRun15.familyLength];
+  memcpy(fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength);
   fontDescriptionRun15.familyDefined = true;
   fontDescriptionRun15.weightDefined = false;
-  fontDescriptionRun15.widthDefined = false;
-  fontDescriptionRun15.slantDefined = false;
-  fontDescriptionRun15.sizeDefined = false;
+  fontDescriptionRun15.widthDefined  = false;
+  fontDescriptionRun15.slantDefined  = false;
+  fontDescriptionRun15.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun16;
-  fontDescriptionRun16.characterRun.characterIndex = 166u;
+  fontDescriptionRun16.characterRun.characterIndex     = 166u;
   fontDescriptionRun16.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun16.familyLength = fontLatin.size();
-  fontDescriptionRun16.familyName = new char[fontDescriptionRun16.familyLength];
-  memcpy( fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength );
+  fontDescriptionRun16.familyLength                    = fontLatin.size();
+  fontDescriptionRun16.familyName                      = new char[fontDescriptionRun16.familyLength];
+  memcpy(fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength);
   fontDescriptionRun16.familyDefined = true;
   fontDescriptionRun16.weightDefined = false;
-  fontDescriptionRun16.widthDefined = false;
-  fontDescriptionRun16.slantDefined = false;
-  fontDescriptionRun16.sizeDefined = false;
+  fontDescriptionRun16.widthDefined  = false;
+  fontDescriptionRun16.slantDefined  = false;
+  fontDescriptionRun16.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun17;
-  fontDescriptionRun17.characterRun.characterIndex = 178u;
+  fontDescriptionRun17.characterRun.characterIndex     = 178u;
   fontDescriptionRun17.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun17.familyLength = fontArabic.size();
-  fontDescriptionRun17.familyName = new char[fontDescriptionRun17.familyLength];
-  memcpy( fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength );
+  fontDescriptionRun17.familyLength                    = fontArabic.size();
+  fontDescriptionRun17.familyName                      = new char[fontDescriptionRun17.familyLength];
+  memcpy(fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength);
   fontDescriptionRun17.familyDefined = true;
   fontDescriptionRun17.weightDefined = false;
-  fontDescriptionRun17.widthDefined = false;
-  fontDescriptionRun17.slantDefined = false;
-  fontDescriptionRun17.sizeDefined = false;
+  fontDescriptionRun17.widthDefined  = false;
+  fontDescriptionRun17.slantDefined  = false;
+  fontDescriptionRun17.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun07 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun08 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun09 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun10 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun11 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun12 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun13 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun14 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun15 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun16 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun17 );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(100.f, 380.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
+  fontDescriptionRuns.PushBack(fontDescriptionRun07);
+  fontDescriptionRuns.PushBack(fontDescriptionRun08);
+  fontDescriptionRuns.PushBack(fontDescriptionRun09);
+  fontDescriptionRuns.PushBack(fontDescriptionRun10);
+  fontDescriptionRuns.PushBack(fontDescriptionRun11);
+  fontDescriptionRuns.PushBack(fontDescriptionRun12);
+  fontDescriptionRuns.PushBack(fontDescriptionRun13);
+  fontDescriptionRuns.PushBack(fontDescriptionRun14);
+  fontDescriptionRuns.PushBack(fontDescriptionRun15);
+  fontDescriptionRuns.PushBack(fontDescriptionRun16);
+  fontDescriptionRuns.PushBack(fontDescriptionRun17);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(99.f, 380.f);
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,                                                                                                   //   0 ..  11
-    0.f, -13.f,  9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 68.f, -10.f, 59.f, -13.f, 54.f, -10.f, 45.f, -10.f, 79.f, -0.f,                                                                                                                           //  12 ..  21
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f,                                                                                                                                                                           //  22 ..  27
-    58.f, -8.f, 52.f, -6.f, 45.f, -8.f, 41.f, -7.f, 39.f, -11.f, 34.f, -0.f, 30.f, -7.f, 28.f, -11.f, 23.f, -11.f, 16.f, -8.f, 15.f, -11.f, 9.f, -11.f, 4.f, -8.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f,   //  28 ..  47
-    42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, 59.f, -10.f, 50.f, -13.f, 46.f, -10.f, 36.f, -10.f, 32.f, -0.f,                                                                                                              //  48 ..  58
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f,                                                                                                                                                                                         //  59 ..  63
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f,                                                                                                                         //  64 ..  73
-    4.f, -13.f,  12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f,                                                                                                   //  74 ..  85
-    4.f, -13.f,  13.f, -9.f, 23.f, -9.f, 36.f, -9.f, 0.f, -2.f, 0.f, -12.f,                                                                                                                                                                               //  86 ..  91
-    0.f, -13.f,  8.f, -9.f, 18.f, -13.f, 22.f, -13.f, 25.f, -9.f, 34.f, -0.f, 38.f, -9.f, 50.f, -9.f, 60.f, -9.f, 66.f, -13.f, 69.f, -13.f, 79.f, -0.f,                                                                                                   //  92 .. 103
-    92.f, -8.f, 86.f, -6.f, 79.f, -8.f, 75.f, -7.f, 73.f, -11.f, 68.f, -0.f, 64.f, -7.f, 62.f, -11.f, 57.f, -11.f, 50.f, -8.f, 49.f, -11.f, 43.f, -11.f, 38.f, -8.f, 34.f, -0.f, 23.f, -10.f, 14.f, -13.f, 10.f, -10.f, 0.f, -10.f, 99.f, -0.f,           // 104 .. 122
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -0.f,                                                                                                                                                                                        // 123 .. 127
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,                                                                                                   // 128 .. 139
-    0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 68.f, -10.f, 59.f, -13.f, 54.f, -10.f, 45.f, -10.f, 79.f, -0.f,                                                                                                                            // 140 .. 149
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f,                                                                                                                                                                           // 150 .. 155
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f,                                                                                                                         // 156 .. 165
-    4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f,                                                                                                    // 166 .. 177
-    54.f, -8.f, 49.f, -6.f, 41.f, -8.f, 37.f, -7.f, 35.f, -11.f, 31.f, -0.f, 26.f, -7.f, 24.f, -11.f, 19.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f,                                                                             // 178 .. 191
-  };
-
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 67.f, -10.f, 58.f, -13.f, 54.f, -10.f, 44.f, -10.f, 78.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f, 94.f, -8.f, 89.f, -6.f, 81.f, -8.f, 77.f, -7.f, 76.f, -11.f, 71.f, -0.f, 66.f, -7.f, 65.f, -11.f, 59.f, -11.f, 53.f, -8.f, 52.f, -11.f, 46.f, -11.f, 41.f, -8.f, 37.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 0.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 38.f, -0.f, 27.f, -10.f, 18.f, -13.f, 14.f, -10.f, 4.f, -10.f, 0.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f, 63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 37.f, -0.f, 41.f, -9.f, 53.f, -9.f, 63.f, -9.f, 69.f, -13.f, 72.f, -13.f, 0.f, -0.f, 4.f, -13.f, 13.f, -9.f, 22.f, -9.f, 35.f, -9.f, 0.f, -2.f, 0.f, -12.f, 0.f, -13.f, 8.f, -9.f, 17.f, -13.f, 21.f, -13.f, 24.f, -9.f, 33.f, -0.f, 37.f, -9.f, 49.f, -9.f, 59.f, -9.f, 65.f, -13.f, 68.f, -13.f, 77.f, -0.f, 91.f, -8.f, 86.f, -6.f, 78.f, -8.f, 74.f, -7.f, 73.f, -11.f, 68.f, -0.f, 63.f, -7.f, 62.f, -11.f, 56.f, -11.f, 50.f, -8.f, 49.f, -11.f, 43.f, -11.f, 38.f, -8.f, 34.f, -0.f, 23.f, -10.f, 14.f, -13.f, 10.f, -10.f, 0.f, -10.f, 98.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -0.f, 0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 67.f, -10.f, 58.f, -13.f, 54.f, -10.f, 44.f, -10.f, 78.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f, 63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 37.f, -0.f, 41.f, -9.f, 53.f, -9.f, 63.f, -9.f, 69.f, -13.f, 72.f, -13.f, 0.f, -0.f, 53.f, -8.f, 48.f, -6.f, 40.f, -8.f, 36.f, -7.f, 35.f, -11.f, 30.f, -0.f, 25.f, -7.f, 24.f, -11.f, 18.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f
+    };
   struct LineRun line01 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line02 =
-  {
-    { 12u, 10u },
-    { 12u, 10u },
-    79.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {12u, 10u},
+      {12u, 10u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line03 =
-  {
-    { 22u, 6u },
-    { 22u, 6u },
-    35.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {22u, 6u},
+      {22u, 6u},
+      35.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line04 =
-  {
-    { 28u, 14u },
-    { 28u, 14u },
-    63.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    true,
-    false
-  };
+    {
+      {28u, 20u},
+      {28u, 20u},
+      99.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line05 =
-  {
-    { 42u, 12u },
-    { 42u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {48u, 11u},
+      {48u, 11u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line06 =
-  {
-    { 54u, 10u },
-    { 54u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {59u, 5u},
+      {59u, 5u},
+      32.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line07 =
-  {
-    { 64u, 10u },
-    { 64u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {64u, 10u},
+      {64u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line08 =
-  {
-    { 74u, 12u },
-    { 74u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    1.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {74u, 12u},
+      {74u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line09 =
-  {
-    { 86u, 6u },
-    { 86u, 6u },
-    45.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {86u, 6u},
+      {86u, 6u},
+      44.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line10 =
-  {
-    { 92u, 12u },
-    { 92u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {92u, 12u},
+      {92u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line11 =
-  {
-    { 104u, 19u },
-    { 104u, 19u },
-    100.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {104u, 19u},
+      {104u, 19u},
+      98.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line12 =
-  {
-    { 123u, 5u },
-    { 123u, 5u },
-    32.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {123u, 5u},
+      {123u, 5u},
+      32.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line13 =
-  {
-    { 128u, 12u },
-    { 128u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {128u, 12u},
+      {128u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line14 =
-  {
-    { 140u, 10u },
-    { 140u, 10u },
-    79.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {140u, 10u},
+      {140u, 10u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line15 =
-  {
-    { 150u, 6u },
-    { 150u, 6u },
-    35.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {150u, 6u},
+      {150u, 6u},
+      35.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line16 =
-  {
-    { 156u, 10u },
-    { 156u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {156u, 10u},
+      {156u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line17 =
-  {
-    { 166u, 12u },
-    { 166u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {166u, 12u},
+      {166u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line18 =
-  {
-    { 178u, 14u },
-    { 178u, 14u },
-    63.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {178u, 14u},
+      {178u, 14u},
+      62.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line19 =
-  {
-    { 192u, 0u },
-    { 192u, 0u },
-    0.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {192u, 0u},
+      {192u, 0u},
+      0.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
-  lines.PushBack( line02 );
-  lines.PushBack( line03 );
-  lines.PushBack( line04 );
-  lines.PushBack( line05 );
-  lines.PushBack( line06 );
-  lines.PushBack( line07 );
-  lines.PushBack( line08 );
-  lines.PushBack( line09 );
-  lines.PushBack( line10 );
-  lines.PushBack( line11 );
-  lines.PushBack( line12 );
-  lines.PushBack( line13 );
-  lines.PushBack( line14 );
-  lines.PushBack( line15 );
-  lines.PushBack( line16 );
-  lines.PushBack( line17 );
-  lines.PushBack( line18 );
-  lines.PushBack( line19 );
+  lines.PushBack(line01);
+  lines.PushBack(line02);
+  lines.PushBack(line03);
+  lines.PushBack(line04);
+  lines.PushBack(line05);
+  lines.PushBack(line06);
+  lines.PushBack(line07);
+  lines.PushBack(line08);
+  lines.PushBack(line09);
+  lines.PushBack(line10);
+  lines.PushBack(line11);
+  lines.PushBack(line12);
+  lines.PushBack(line13);
+  lines.PushBack(line14);
+  lines.PushBack(line15);
+  lines.PushBack(line16);
+  lines.PushBack(line17);
+  lines.PushBack(line18);
+  lines.PushBack(line19);
 
   LayoutTextData data =
-  {
-    "Layout bidirectional text.",
-    "Hello world demo שלום עולם.\n"
-    "مرحبا بالعالم hello world שלום עולם\n"
-    "שלום עולם hello world demo.\n"
-    "hello world مرحبا بالعالم שלום עולם\n"
-    "Hello world demo שלום עולם.\n"
-    "שלום עולם hello world مرحبا بالعالم\n",
-    textArea,
-    17u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    192u,
-    positions,
-    19u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    64u,
-    64u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout bidirectional text.",
+      "Hello world demo שלום עולם.\n"
+      "مرحبا بالعالم hello world שלום עולם\n"
+      "שלום עולם hello world demo.\n"
+      "hello world مرحبا بالعالم שלום עולם\n"
+      "Hello world demo שלום עולם.\n"
+      "שלום עולם hello world مرحبا بالعالم\n",
+      textArea,
+      17u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      192u,
+      positions,
+      19u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      64u,
+      64u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -2673,567 +2554,530 @@ int UtcDaliTextUpdateLayout03(void)
 
   // Layout some lines of bidirectional text. Update the paragraphs at the middle.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 17u;
+  fontDescriptionRun02.characterRun.characterIndex     = 17u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 26u;
+  fontDescriptionRun03.characterRun.characterIndex     = 26u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun03.familyLength = fontLatin.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontLatin.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 28u;
+  fontDescriptionRun04.characterRun.characterIndex     = 28u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun04.familyLength = fontArabic.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontArabic.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 42u;
+  fontDescriptionRun05.characterRun.characterIndex     = 42u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 54u;
+  fontDescriptionRun06.characterRun.characterIndex     = 54u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun06.familyLength = fontHebrew.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontHebrew.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontHebrew.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontHebrew.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun07;
-  fontDescriptionRun07.characterRun.characterIndex = 64u;
+  fontDescriptionRun07.characterRun.characterIndex     = 64u;
   fontDescriptionRun07.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun07.familyLength = fontHebrew.size();
-  fontDescriptionRun07.familyName = new char[fontDescriptionRun07.familyLength];
-  memcpy( fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength );
+  fontDescriptionRun07.familyLength                    = fontHebrew.size();
+  fontDescriptionRun07.familyName                      = new char[fontDescriptionRun07.familyLength];
+  memcpy(fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength);
   fontDescriptionRun07.familyDefined = true;
   fontDescriptionRun07.weightDefined = false;
-  fontDescriptionRun07.widthDefined = false;
-  fontDescriptionRun07.slantDefined = false;
-  fontDescriptionRun07.sizeDefined = false;
+  fontDescriptionRun07.widthDefined  = false;
+  fontDescriptionRun07.slantDefined  = false;
+  fontDescriptionRun07.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun08;
-  fontDescriptionRun08.characterRun.characterIndex = 74u;
+  fontDescriptionRun08.characterRun.characterIndex     = 74u;
   fontDescriptionRun08.characterRun.numberOfCharacters = 18u;
-  fontDescriptionRun08.familyLength = fontLatin.size();
-  fontDescriptionRun08.familyName = new char[fontDescriptionRun08.familyLength];
-  memcpy( fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength );
+  fontDescriptionRun08.familyLength                    = fontLatin.size();
+  fontDescriptionRun08.familyName                      = new char[fontDescriptionRun08.familyLength];
+  memcpy(fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength);
   fontDescriptionRun08.familyDefined = true;
   fontDescriptionRun08.weightDefined = false;
-  fontDescriptionRun08.widthDefined = false;
-  fontDescriptionRun08.slantDefined = false;
-  fontDescriptionRun08.sizeDefined = false;
+  fontDescriptionRun08.widthDefined  = false;
+  fontDescriptionRun08.slantDefined  = false;
+  fontDescriptionRun08.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun09;
-  fontDescriptionRun09.characterRun.characterIndex = 92u;
+  fontDescriptionRun09.characterRun.characterIndex     = 92u;
   fontDescriptionRun09.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun09.familyLength = fontLatin.size();
-  fontDescriptionRun09.familyName = new char[fontDescriptionRun09.familyLength];
-  memcpy( fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength );
+  fontDescriptionRun09.familyLength                    = fontLatin.size();
+  fontDescriptionRun09.familyName                      = new char[fontDescriptionRun09.familyLength];
+  memcpy(fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength);
   fontDescriptionRun09.familyDefined = true;
   fontDescriptionRun09.weightDefined = false;
-  fontDescriptionRun09.widthDefined = false;
-  fontDescriptionRun09.slantDefined = false;
-  fontDescriptionRun09.sizeDefined = false;
+  fontDescriptionRun09.widthDefined  = false;
+  fontDescriptionRun09.slantDefined  = false;
+  fontDescriptionRun09.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun10;
-  fontDescriptionRun10.characterRun.characterIndex = 104u;
+  fontDescriptionRun10.characterRun.characterIndex     = 104u;
   fontDescriptionRun10.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun10.familyLength = fontArabic.size();
-  fontDescriptionRun10.familyName = new char[fontDescriptionRun10.familyLength];
-  memcpy( fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength );
+  fontDescriptionRun10.familyLength                    = fontArabic.size();
+  fontDescriptionRun10.familyName                      = new char[fontDescriptionRun10.familyLength];
+  memcpy(fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength);
   fontDescriptionRun10.familyDefined = true;
   fontDescriptionRun10.weightDefined = false;
-  fontDescriptionRun10.widthDefined = false;
-  fontDescriptionRun10.slantDefined = false;
-  fontDescriptionRun10.sizeDefined = false;
+  fontDescriptionRun10.widthDefined  = false;
+  fontDescriptionRun10.slantDefined  = false;
+  fontDescriptionRun10.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun11;
-  fontDescriptionRun11.characterRun.characterIndex = 118u;
+  fontDescriptionRun11.characterRun.characterIndex     = 118u;
   fontDescriptionRun11.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun11.familyLength = fontHebrew.size();
-  fontDescriptionRun11.familyName = new char[fontDescriptionRun11.familyLength];
-  memcpy( fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength );
+  fontDescriptionRun11.familyLength                    = fontHebrew.size();
+  fontDescriptionRun11.familyName                      = new char[fontDescriptionRun11.familyLength];
+  memcpy(fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength);
   fontDescriptionRun11.familyDefined = true;
   fontDescriptionRun11.weightDefined = false;
-  fontDescriptionRun11.widthDefined = false;
-  fontDescriptionRun11.slantDefined = false;
-  fontDescriptionRun11.sizeDefined = false;
+  fontDescriptionRun11.widthDefined  = false;
+  fontDescriptionRun11.slantDefined  = false;
+  fontDescriptionRun11.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun12;
-  fontDescriptionRun12.characterRun.characterIndex = 128u;
+  fontDescriptionRun12.characterRun.characterIndex     = 128u;
   fontDescriptionRun12.characterRun.numberOfCharacters = 17u;
-  fontDescriptionRun12.familyLength = fontLatin.size();
-  fontDescriptionRun12.familyName = new char[fontDescriptionRun12.familyLength];
-  memcpy( fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength );
+  fontDescriptionRun12.familyLength                    = fontLatin.size();
+  fontDescriptionRun12.familyName                      = new char[fontDescriptionRun12.familyLength];
+  memcpy(fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength);
   fontDescriptionRun12.familyDefined = true;
   fontDescriptionRun12.weightDefined = false;
-  fontDescriptionRun12.widthDefined = false;
-  fontDescriptionRun12.slantDefined = false;
-  fontDescriptionRun12.sizeDefined = false;
+  fontDescriptionRun12.widthDefined  = false;
+  fontDescriptionRun12.slantDefined  = false;
+  fontDescriptionRun12.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun13;
-  fontDescriptionRun13.characterRun.characterIndex = 145u;
+  fontDescriptionRun13.characterRun.characterIndex     = 145u;
   fontDescriptionRun13.characterRun.numberOfCharacters = 9u;
-  fontDescriptionRun13.familyLength = fontHebrew.size();
-  fontDescriptionRun13.familyName = new char[fontDescriptionRun13.familyLength];
-  memcpy( fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength );
+  fontDescriptionRun13.familyLength                    = fontHebrew.size();
+  fontDescriptionRun13.familyName                      = new char[fontDescriptionRun13.familyLength];
+  memcpy(fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength);
   fontDescriptionRun13.familyDefined = true;
   fontDescriptionRun13.weightDefined = false;
-  fontDescriptionRun13.widthDefined = false;
-  fontDescriptionRun13.slantDefined = false;
-  fontDescriptionRun13.sizeDefined = false;
+  fontDescriptionRun13.widthDefined  = false;
+  fontDescriptionRun13.slantDefined  = false;
+  fontDescriptionRun13.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun14;
-  fontDescriptionRun14.characterRun.characterIndex = 154u;
+  fontDescriptionRun14.characterRun.characterIndex     = 154u;
   fontDescriptionRun14.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun14.familyLength = fontLatin.size();
-  fontDescriptionRun14.familyName = new char[fontDescriptionRun14.familyLength];
-  memcpy( fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength );
+  fontDescriptionRun14.familyLength                    = fontLatin.size();
+  fontDescriptionRun14.familyName                      = new char[fontDescriptionRun14.familyLength];
+  memcpy(fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength);
   fontDescriptionRun14.familyDefined = true;
   fontDescriptionRun14.weightDefined = false;
-  fontDescriptionRun14.widthDefined = false;
-  fontDescriptionRun14.slantDefined = false;
-  fontDescriptionRun14.sizeDefined = false;
+  fontDescriptionRun14.widthDefined  = false;
+  fontDescriptionRun14.slantDefined  = false;
+  fontDescriptionRun14.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun15;
-  fontDescriptionRun15.characterRun.characterIndex = 156u;
+  fontDescriptionRun15.characterRun.characterIndex     = 156u;
   fontDescriptionRun15.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun15.familyLength = fontHebrew.size();
-  fontDescriptionRun15.familyName = new char[fontDescriptionRun15.familyLength];
-  memcpy( fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength );
+  fontDescriptionRun15.familyLength                    = fontHebrew.size();
+  fontDescriptionRun15.familyName                      = new char[fontDescriptionRun15.familyLength];
+  memcpy(fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength);
   fontDescriptionRun15.familyDefined = true;
   fontDescriptionRun15.weightDefined = false;
-  fontDescriptionRun15.widthDefined = false;
-  fontDescriptionRun15.slantDefined = false;
-  fontDescriptionRun15.sizeDefined = false;
+  fontDescriptionRun15.widthDefined  = false;
+  fontDescriptionRun15.slantDefined  = false;
+  fontDescriptionRun15.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun16;
-  fontDescriptionRun16.characterRun.characterIndex = 166u;
+  fontDescriptionRun16.characterRun.characterIndex     = 166u;
   fontDescriptionRun16.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun16.familyLength = fontLatin.size();
-  fontDescriptionRun16.familyName = new char[fontDescriptionRun16.familyLength];
-  memcpy( fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength );
+  fontDescriptionRun16.familyLength                    = fontLatin.size();
+  fontDescriptionRun16.familyName                      = new char[fontDescriptionRun16.familyLength];
+  memcpy(fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength);
   fontDescriptionRun16.familyDefined = true;
   fontDescriptionRun16.weightDefined = false;
-  fontDescriptionRun16.widthDefined = false;
-  fontDescriptionRun16.slantDefined = false;
-  fontDescriptionRun16.sizeDefined = false;
+  fontDescriptionRun16.widthDefined  = false;
+  fontDescriptionRun16.slantDefined  = false;
+  fontDescriptionRun16.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun17;
-  fontDescriptionRun17.characterRun.characterIndex = 178u;
+  fontDescriptionRun17.characterRun.characterIndex     = 178u;
   fontDescriptionRun17.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun17.familyLength = fontArabic.size();
-  fontDescriptionRun17.familyName = new char[fontDescriptionRun17.familyLength];
-  memcpy( fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength );
+  fontDescriptionRun17.familyLength                    = fontArabic.size();
+  fontDescriptionRun17.familyName                      = new char[fontDescriptionRun17.familyLength];
+  memcpy(fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength);
   fontDescriptionRun17.familyDefined = true;
   fontDescriptionRun17.weightDefined = false;
-  fontDescriptionRun17.widthDefined = false;
-  fontDescriptionRun17.slantDefined = false;
-  fontDescriptionRun17.sizeDefined = false;
+  fontDescriptionRun17.widthDefined  = false;
+  fontDescriptionRun17.slantDefined  = false;
+  fontDescriptionRun17.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun07 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun08 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun09 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun10 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun11 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun12 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun13 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun14 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun15 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun16 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun17 );
-  Size textArea(100.f, 300.f);
-  Size layoutSize(100.f, 380.f);
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
+  fontDescriptionRuns.PushBack(fontDescriptionRun07);
+  fontDescriptionRuns.PushBack(fontDescriptionRun08);
+  fontDescriptionRuns.PushBack(fontDescriptionRun09);
+  fontDescriptionRuns.PushBack(fontDescriptionRun10);
+  fontDescriptionRuns.PushBack(fontDescriptionRun11);
+  fontDescriptionRuns.PushBack(fontDescriptionRun12);
+  fontDescriptionRuns.PushBack(fontDescriptionRun13);
+  fontDescriptionRuns.PushBack(fontDescriptionRun14);
+  fontDescriptionRuns.PushBack(fontDescriptionRun15);
+  fontDescriptionRuns.PushBack(fontDescriptionRun16);
+  fontDescriptionRuns.PushBack(fontDescriptionRun17);
+  Size  textArea(100.f, 300.f);
+  Size  layoutSize(99.f, 380.f);
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,                                                                                                     //   0 ..  11
-    0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 68.f, -10.f, 59.f, -13.f, 54.f, -10.f, 45.f, -10.f, 79.f, -0.f,                                                                                                                              //  12 ..  21
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f,                                                                                                                                                                             //  22 ..  27
-    58.f, -8.f, 52.f, -6.f, 45.f, -8.f, 41.f, -7.f, 39.f, -11.f, 34.f, -0.f, 30.f, -7.f, 28.f, -11.f, 23.f, -11.f, 16.f, -8.f, 15.f, -11.f, 9.f, -11.f, 4.f, -8.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f,     //  28 ..  47
-    42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, 59.f, -10.f, 50.f, -13.f, 46.f, -10.f, 36.f, -10.f, 32.f, -0.f,                                                                                                                //  48 ..  58
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f,                                                                                                                                                                                           //  59 ..  63
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f,                                                                                                                           //  64 ..  73
-    4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f,                                                                                                      //  74 ..  85
-    4.f, -13.f, 13.f, -9.f, 23.f, -9.f, 36.f, -9.f, 0.f, -2.f, 0.f, -12.f,                                                                                                                                                                                  //  86 ..  91
-    0.f, -13.f, 8.f, -9.f, 18.f, -13.f, 22.f, -13.f, 25.f, -9.f, 34.f, -0.f, 38.f, -9.f, 50.f, -9.f, 60.f, -9.f, 66.f, -13.f, 69.f, -13.f, 79.f, -0.f,                                                                                                      //  92 .. 103
-    92.f, -8.f, 86.f, -6.f, 79.f, -8.f, 75.f, -7.f, 73.f, -11.f, 68.f, -0.f, 64.f, -7.f, 62.f, -11.f, 57.f, -11.f, 50.f, -8.f, 49.f, -11.f, 43.f, -11.f, 38.f, -8.f, 34.f, -0.f, 23.f, -10.f, 14.f, -13.f, 10.f, -10.f, 0.f, -10.f, 99.f, -0.f,             // 104 .. 122
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -0.f,                                                                                                                                                                                          // 123 .. 127
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,                                                                                                     // 128 .. 139
-    0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 68.f, -10.f, 59.f, -13.f, 54.f, -10.f, 45.f, -10.f, 79.f, -0.f,                                                                                                                              // 140 .. 149
-    23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f,                                                                                                                                                                             // 150 .. 155
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f,                                                                                                                           // 156 .. 165
-    4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f,                                                                                                      // 166 .. 177
-    54.f, -8.f, 49.f, -6.f, 41.f, -8.f, 37.f, -7.f, 35.f, -11.f, 31.f, -0.f, 26.f, -7.f, 24.f, -11.f, 19.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f,                                                                               // 178 .. 191
-  };
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 67.f, -10.f, 58.f, -13.f, 54.f, -10.f, 44.f, -10.f, 78.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f, 94.f, -8.f, 89.f, -6.f, 81.f, -8.f, 77.f, -7.f, 76.f, -11.f, 71.f, -0.f, 66.f, -7.f, 65.f, -11.f, 59.f, -11.f, 53.f, -8.f, 52.f, -11.f, 46.f, -11.f, 41.f, -8.f, 37.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 0.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 38.f, -0.f, 27.f, -10.f, 18.f, -13.f, 14.f, -10.f, 4.f, -10.f, 0.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f, 63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 37.f, -0.f, 41.f, -9.f, 53.f, -9.f, 63.f, -9.f, 69.f, -13.f, 72.f, -13.f, 0.f, -0.f, 4.f, -13.f, 13.f, -9.f, 22.f, -9.f, 35.f, -9.f, 0.f, -2.f, 0.f, -12.f, 0.f, -13.f, 8.f, -9.f, 17.f, -13.f, 21.f, -13.f, 24.f, -9.f, 33.f, -0.f, 37.f, -9.f, 49.f, -9.f, 59.f, -9.f, 65.f, -13.f, 68.f, -13.f, 77.f, -0.f, 91.f, -8.f, 86.f, -6.f, 78.f, -8.f, 74.f, -7.f, 73.f, -11.f, 68.f, -0.f, 63.f, -7.f, 62.f, -11.f, 56.f, -11.f, 50.f, -8.f, 49.f, -11.f, 43.f, -11.f, 38.f, -8.f, 34.f, -0.f, 23.f, -10.f, 14.f, -13.f, 10.f, -10.f, 0.f, -10.f, 98.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -0.f, 0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 67.f, -10.f, 58.f, -13.f, 54.f, -10.f, 44.f, -10.f, 78.f, -0.f, 23.f, -10.f, 19.f, -10.f, 10.f, -13.f, 0.f, -10.f, 32.f, -2.f, 36.f, -12.f, 63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 21.f, -13.f, 25.f, -13.f, 28.f, -9.f, 37.f, -0.f, 41.f, -9.f, 53.f, -9.f, 63.f, -9.f, 69.f, -13.f, 72.f, -13.f, 0.f, -0.f, 53.f, -8.f, 48.f, -6.f, 40.f, -8.f, 36.f, -7.f, 35.f, -11.f, 30.f, -0.f, 25.f, -7.f, 24.f, -11.f, 18.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f
+    };
 
   struct LineRun line01 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line02 =
-  {
-    { 12u, 10u },
-    { 12u, 10u },
-    79.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {12u, 10u},
+      {12u, 10u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line03 =
-  {
-    { 22u, 6u },
-    { 22u, 6u },
-    35.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {22u, 6u},
+      {22u, 6u},
+      35.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line04 =
-  {
-    { 28u, 14u },
-    { 28u, 14u },
-    63.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {28u, 20u},
+      {28u, 20u},
+      99.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line05 =
-  {
-    { 42u, 12u },
-    { 42u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {48u, 11u},
+      {48u, 11u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line06 =
-  {
-    { 54u, 10u },
-    { 54u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {59u, 5u},
+      {59u, 5u},
+      32.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line07 =
-  {
-    { 64u, 10u },
-    { 64u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {64u, 10u},
+      {64u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line08 =
-  {
-    { 74u, 12u },
-    { 74u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    1.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {74u, 12u},
+      {74u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line09 =
-  {
-    { 86u, 6u },
-    { 86u, 6u },
-    45.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {86u, 6u},
+      {86u, 6u},
+      44.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line10 =
-  {
-    { 92u, 12u },
-    { 92u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {92u, 12u},
+      {92u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line11 =
-  {
-    { 104u, 19u },
-    { 104u, 19u },
-    100.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {104u, 19u},
+      {104u, 19u},
+      98.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line12 =
-  {
-    { 123u, 5u },
-    { 123u, 5u },
-    32.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {123u, 5u},
+      {123u, 5u},
+      32.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line13 =
-  {
-    { 128u, 12u },
-    { 128u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
-  struct LineRun line14 =
-  {
-    { 140u, 10u },
-    { 140u, 10u },
-    79.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
-  struct LineRun line15 =
-  {
-    { 150u, 6u },
-    { 150u, 6u },
-    35.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {128u, 12u},
+      {128u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line14 =
+    {
+      {140u, 10u},
+      {140u, 10u},
+      78.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
+  struct LineRun line15 =
+    {
+      {150u, 6u},
+      {150u, 6u},
+      35.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line16 =
-  {
-    { 156u, 10u },
-    { 156u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {156u, 10u},
+      {156u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line17 =
-  {
-    { 166u, 12u },
-    { 166u, 12u },
-    79.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {166u, 12u},
+      {166u, 12u},
+      77.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line18 =
-  {
-    { 178u, 14u },
-    { 178u, 14u },
-    63.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {178u, 14u},
+      {178u, 14u},
+      62.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line19 =
-  {
-    { 192u, 0u },
-    { 192u, 0u },
-    0.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {192u, 0u},
+      {192u, 0u},
+      0.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
-  lines.PushBack( line02 );
-  lines.PushBack( line03 );
-  lines.PushBack( line04 );
-  lines.PushBack( line05 );
-  lines.PushBack( line06 );
-  lines.PushBack( line07 );
-  lines.PushBack( line08 );
-  lines.PushBack( line09 );
-  lines.PushBack( line10 );
-  lines.PushBack( line11 );
-  lines.PushBack( line12 );
-  lines.PushBack( line13 );
-  lines.PushBack( line14 );
-  lines.PushBack( line15 );
-  lines.PushBack( line16 );
-  lines.PushBack( line17 );
-  lines.PushBack( line18 );
-  lines.PushBack( line19 );
+  lines.PushBack(line01);
+  lines.PushBack(line02);
+  lines.PushBack(line03);
+  lines.PushBack(line04);
+  lines.PushBack(line05);
+  lines.PushBack(line06);
+  lines.PushBack(line07);
+  lines.PushBack(line08);
+  lines.PushBack(line09);
+  lines.PushBack(line10);
+  lines.PushBack(line11);
+  lines.PushBack(line12);
+  lines.PushBack(line13);
+  lines.PushBack(line14);
+  lines.PushBack(line15);
+  lines.PushBack(line16);
+  lines.PushBack(line17);
+  lines.PushBack(line18);
+  lines.PushBack(line19);
 
   LayoutTextData data =
-  {
-    "Layout bidirectional text.",
-    "Hello world demo שלום עולם.\n"
-    "مرحبا بالعالم hello world שלום עולם\n"
-    "שלום עולם hello world demo.\n"
-    "hello world مرحبا بالعالم שלום עולם\n"
-    "Hello world demo שלום עולם.\n"
-    "שלום עולם hello world مرحبا بالعالم\n",
-    textArea,
-    17u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    192u,
-    positions,
-    19u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    128u,
-    64u,
-    false,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout bidirectional text.",
+      "Hello world demo שלום עולם.\n"
+      "مرحبا بالعالم hello world שלום עולם\n"
+      "שלום עולם hello world demo.\n"
+      "hello world مرحبا بالعالم שלום עולם\n"
+      "Hello world demo שלום עולם.\n"
+      "שלום עולם hello world مرحبا بالعالم\n",
+      textArea,
+      17u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      192u,
+      positions,
+      19u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      128u,
+      64u,
+      false,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -3249,69 +3093,92 @@ int UtcDaliTextLayoutEllipsis01(void)
 
   // Layout single-line LTR text with ellipsis.
 
-  const std::string fontLatin( "TizenSans" );
+  const std::string fontLatin("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 51u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
 
   struct LineRun line01 =
-  {
-    { 0u, 13u },
-    { 0u, 13u },
-    93.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    true
-  };
+    {
+      {0u, 14u},
+      {0u, 14u},
+      100.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      true};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
+  lines.PushBack(line01);
 
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, 85.f, -13.f,
-  };
-
-  Size textArea( 100.f, 50.f );
-  Size layoutSize( 100.f, 20.f );
+    {
+      0.f,
+      -12.f,
+      10.f,
+      -9.f,
+      19.f,
+      -13.f,
+      23.f,
+      -13.f,
+      26.f,
+      -9.f,
+      35.f,
+      -0.f,
+      39.f,
+      -9.f,
+      51.f,
+      -9.f,
+      61.f,
+      -9.f,
+      67.f,
+      -13.f,
+      70.f,
+      -13.f,
+      79.f,
+      -0.f,
+      83.f,
+      -13.f,
+    };
+
+  Size textArea(100.f, 50.f);
+  Size layoutSize(100.f, 20.f);
 
   LayoutTextData data =
-  {
-    "Layout single-line LTR text with ellipsis.",
-    "Hello world demo hello world demo hello world demo.",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    13u,
-    positions,
-    1u,
-    lines.Begin(),
-    Layout::Engine::SINGLE_LINE_BOX,
-    0u,
-    51u,
-    true,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout single-line LTR text with ellipsis.",
+      "Hello world demo hello world demo hello world demo.",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      13u,
+      positions,
+      1u,
+      lines.Begin(),
+      Layout::Engine::SINGLE_LINE_BOX,
+      0u,
+      51u,
+      true,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -3327,84 +3194,80 @@ int UtcDaliTextLayoutEllipsis02(void)
 
   // Layout multi-line LTR text with ellipsis.
 
-  const std::string fontLatin( "TizenSans" );
+  const std::string fontLatin("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 51u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
 
   struct LineRun line01 =
-  {
-    { 0u, 12u },
-    { 0u, 12u },
-    81.f,
-    15.f,
-    -5.f,
-    4.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 12u},
+      {0u, 12u},
+      79.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      false,
+      false};
   struct LineRun line02 =
-  {
-    { 12u, 12u },
-    { 12u, 12u },
-    95.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    true
-  };
+    {
+      {12u, 12u},
+      {12u, 12u},
+      94.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      true};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
-  lines.PushBack( line02 );
+  lines.PushBack(line01);
+  lines.PushBack(line02);
 
   float positions[] =
-  {
-    0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f,
-    0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 46.f, -13.f, 54.f, -9.f, 64.f, -13.f, 68.f, -13.f, 71.f, -9.f, 80.f, -0.f, 84.f, -9.f,
-  };
+    {
+      0.f, -12.f, 10.f, -9.f, 19.f, -13.f, 23.f, -13.f, 26.f, -9.f, 35.f, -0.f, 39.f, -9.f, 51.f, -9.f, 61.f, -9.f, 67.f, -13.f, 70.f, -13.f, 79.f, -0.f, 0.f, -13.f, 9.f, -9.f, 18.f, -9.f, 31.f, -9.f, 40.f, -0.f, 45.f, -13.f, 53.f, -9.f, 62.f, -13.f, 66.f, -13.f, 69.f, -9.f, 78.f, -0.f, 82.f, -9.f
+    };
 
-  Size textArea( 100.f, 50.f );
-  Size layoutSize( 100.f, 40.f );
+  Size textArea(100.f, 50.f);
+  Size layoutSize(100.f, 40.f);
 
   LayoutTextData data =
-  {
-    "Layout multi-line LTR text with ellipsis.",
-    "Hello world demo hello world demo hello world demo.",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    24u,
-    positions,
-    2u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    51u,
-    true,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout multi-line LTR text with ellipsis.",
+      "Hello world demo hello world demo hello world demo.",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      24u,
+      positions,
+      2u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      51u,
+      true,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -3420,135 +3283,164 @@ int UtcDaliTextLayoutEllipsis03(void)
 
   // Layout single-line RTL text with ellipsis.
 
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun01.familyLength = fontHebrew.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontHebrew.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontHebrew.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontHebrew.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 10u;
+  fontDescriptionRun02.characterRun.characterIndex     = 10u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun02.familyLength = fontArabic.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontArabic.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontArabic.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontArabic.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 24u;
+  fontDescriptionRun03.characterRun.characterIndex     = 24u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun03.familyLength = fontHebrew.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontHebrew.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontHebrew.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontHebrew.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 34u;
+  fontDescriptionRun04.characterRun.characterIndex     = 34u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun04.familyLength = fontArabic.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontArabic.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun05.familyLength = fontHebrew.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontHebrew.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 58u;
+  fontDescriptionRun06.characterRun.characterIndex     = 58u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 15u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
   struct LineRun line01 =
-  {
-    { 0u, 14u },
-    { 0u, 14u },
-    98.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    true
-  };
+    {
+      {0u, 14u},
+      {0u, 14u},
+      98.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      true};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
+  lines.PushBack(line01);
 
   float positions[] =
-  {
-    87.f, -10.f, 79.f, -13.f, 74.f, -10.f, 65.f, -10.f, 60.f, -0.f, 51.f, -10.f, 47.f, -10.f, 38.f, -13.f, 29.f, -10.f, 24.f, -0.f, 17.f, -8.f, 12.f, -6.f, 4.f, -8.f, 0.f, -7.f, 78.f, -11.f, 73.f, -0.f,
-  };
-
-  Size textArea( 100.f, 50.f );
-  Size layoutSize( 100.f, 20.f );
+    {
+      87.f,
+      -10.f,
+      78.f,
+      -13.f,
+      74.f,
+      -10.f,
+      64.f,
+      -10.f,
+      60.f,
+      -0.f,
+      51.f,
+      -10.f,
+      47.f,
+      -10.f,
+      38.f,
+      -13.f,
+      28.f,
+      -10.f,
+      24.f,
+      -0.f,
+      17.f,
+      -8.f,
+      12.f,
+      -6.f,
+      4.f,
+      -8.f,
+      0.f,
+      -7.f,
+      77.f,
+      -11.f,
+      72.f,
+      -0.f,
+    };
+
+  Size textArea(100.f, 50.f);
+  Size layoutSize(100.f, 20.f);
 
   LayoutTextData data =
-  {
-    "Layout single-line RTL text with ellipsis.",
-    "שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    16u,
-    positions,
-    1u,
-    lines.Begin(),
-    Layout::Engine::SINGLE_LINE_BOX,
-    0u,
-    72u,
-    true,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout single-line RTL text with ellipsis.",
+      "שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      16u,
+      positions,
+      1u,
+      lines.Begin(),
+      Layout::Engine::SINGLE_LINE_BOX,
+      0u,
+      72u,
+      true,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -3564,150 +3456,146 @@ int UtcDaliTextLayoutEllipsis04(void)
 
   // Layout multi-line RTL text with ellipsis.
 
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun01.familyLength = fontHebrew.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontHebrew.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontHebrew.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontHebrew.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 10u;
+  fontDescriptionRun02.characterRun.characterIndex     = 10u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun02.familyLength = fontArabic.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontArabic.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontArabic.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontArabic.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 24u;
+  fontDescriptionRun03.characterRun.characterIndex     = 24u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun03.familyLength = fontHebrew.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontHebrew.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontHebrew.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontHebrew.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 34u;
+  fontDescriptionRun04.characterRun.characterIndex     = 34u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun04.familyLength = fontArabic.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontArabic.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun05.familyLength = fontHebrew.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontHebrew.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 58u;
+  fontDescriptionRun06.characterRun.characterIndex     = 58u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 15u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
   struct LineRun line01 =
-  {
-    { 0u, 10u },
-    { 0u, 10u },
-    70.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 10u},
+      {0u, 10u},
+      70.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      false};
   struct LineRun line02 =
-  {
-    { 10u, 19u },
-    { 10u, 19u },
-    99.f,
-    15.f,
-    -5.f,
-    5.f,
-    0.f,
-    0.f,
-    false,
-    true
-  };
+    {
+      {10u, 19u},
+      {10u, 19u},
+      98.f,
+      15.f,
+      -5.f,
+      4.f,
+      0.f,
+      0.f,
+      true,
+      true};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
-  lines.PushBack( line02 );
+  lines.PushBack(line01);
+  lines.PushBack(line02);
 
   float positions[] =
-  {
-    63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 41.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 96.f, -8.f, 91.f, -6.f, 83.f, -8.f, 79.f, -7.f, 78.f, -11.f, 73.f, -0.f,
-    68.f, -7.f, 67.f, -11.f, 61.f, -11.f, 55.f, -8.f, 53.f, -11.f, 47.f, -11.f, 42.f, -8.f, 38.f, -0.f, 27.f, -10.f, 18.f, -13.f, 14.f, -10.f, 4.f, -10.f, 0.f, -0.f, 92.f, -10.f, 88.f, -10.f, 79.f, -13.f, 70.f, -10.f, 65.f, -0.f,
-  };
+    {
+      63.f, -10.f, 54.f, -13.f, 50.f, -10.f, 40.f, -10.f, 36.f, -0.f, 27.f, -10.f, 23.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 95.f, -8.f, 90.f, -6.f, 82.f, -8.f, 78.f, -7.f, 77.f, -11.f, 72.f, -0.f, 67.f, -7.f, 66.f, -11.f, 60.f, -11.f, 54.f, -8.f, 53.f, -11.f, 47.f, -11.f, 42.f, -8.f, 38.f, -0.f, 27.f, -10.f, 18.f, -13.f, 14.f, -10.f, 4.f, -10.f, 0.f, -0.f, 91.f, -10.f, 87.f, -10.f, 78.f, -13.f, 68.f, -10.f, 64.f, -0.f
+    };
 
-  Size textArea( 100.f, 50.f );
-  Size layoutSize( 100.f, 40.f );
+  Size textArea(100.f, 50.f);
+  Size layoutSize(100.f, 40.f);
 
   LayoutTextData data =
-  {
-    "Layout multi-line RTL text with ellipsis.",
-    "שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    34u,
-    positions,
-    2u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    72u,
-    true,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Layout multi-line RTL text with ellipsis.",
+      "שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      34u,
+      positions,
+      2u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      72u,
+      true,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -3721,69 +3609,66 @@ int UtcDaliTextLayoutEllipsis05(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextLayoutEllipsis05");
 
-  const std::string fontLatin( "TizenSans" );
+  const std::string fontLatin("TizenSans");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 51u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
 
   struct LineRun line01 =
-  {
-    { 0u, 11u },
-    { 0u, 11u },
-    80.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    true
-  };
+    {
+      {0u, 11u},
+      {0u, 11u},
+      79.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      true};
   Vector<LineRun> lines;
-  lines.PushBack( line01 );
+  lines.PushBack(line01);
 
   float positions[] =
-  {
-    0.f, -12.f
-  };
+    {
+      0.f, -12.f};
 
-  Size textArea( 100.f, 19.f );
-  Size layoutSize( 100.f, 20.f );
+  Size textArea(100.f, 19.f);
+  Size layoutSize(100.f, 20.f);
 
   LayoutTextData data =
-  {
-    "Not enough height.",
-    "Hello world",
-    textArea,
-    1u,
-    fontDescriptionRuns.Begin(),
-    layoutSize,
-    1u,
-    positions,
-    1u,
-    lines.Begin(),
-    Layout::Engine::MULTI_LINE_BOX,
-    0u,
-    11u,
-    true,
-    DevelText::EllipsisPosition::END,
-    true
-  };
+    {
+      "Not enough height.",
+      "Hello world",
+      textArea,
+      1u,
+      fontDescriptionRuns.Begin(),
+      layoutSize,
+      1u,
+      positions,
+      1u,
+      lines.Begin(),
+      Layout::Engine::MULTI_LINE_BOX,
+      0u,
+      11u,
+      true,
+      DevelText::EllipsisPosition::END,
+      true};
 
-  if( !LayoutTextTest( data ) )
+  if(!LayoutTextTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -3799,112 +3684,111 @@ int UtcDaliTextAlign01(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f };
+  float positions[] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Begin alignment for the first paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::BEGIN,
-    Text::VerticalAlignment::TOP,
-    0u,
-    22u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
+    {
+      "Begin alignment for the first paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::BEGIN,
+      Text::VerticalAlignment::TOP,
+      0u,
+      22u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
 
-  if( !AlignTest( data ) )
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -3920,112 +3804,111 @@ int UtcDaliTextAlign02(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 33.f, 19.f, 0.f, 0.f };
+  float positions[] = {0.f, 0.f, 34.f, 21.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Begin alignment for the mid paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::BEGIN,
-    Text::VerticalAlignment::TOP,
-    22u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
-
-  if( !AlignTest( data ) )
+    {
+      "Begin alignment for the mid paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::BEGIN,
+      Text::VerticalAlignment::TOP,
+      22u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
+
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4041,112 +3924,111 @@ int UtcDaliTextAlign03(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f };
+  float positions[] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Begin alignment for the last paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::BEGIN,
-    Text::VerticalAlignment::TOP,
-    48u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
-
-  if( !AlignTest( data ) )
+    {
+      "Begin alignment for the last paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::BEGIN,
+      Text::VerticalAlignment::TOP,
+      48u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
+
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4162,112 +4044,111 @@ int UtcDaliTextAlign04(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 9.f, 15.f, 0.f, 0.f, 0.f, 0.f };
+  float positions[] = {10.f, 15.f, 0.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Center alignment for the first paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::CENTER,
-    Text::VerticalAlignment::TOP,
-    0u,
-    22u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
+    {
+      "Center alignment for the first paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::CENTER,
+      Text::VerticalAlignment::TOP,
+      0u,
+      22u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
 
-  if( !AlignTest( data ) )
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4283,112 +4164,111 @@ int UtcDaliTextAlign05(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 14.f, 9.f, 0.f, 0.f };
+  float positions[] = {0.f, 0.f, 15.f, 10.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Center alignment for the mid paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::CENTER,
-    Text::VerticalAlignment::TOP,
-    22u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
-
-  if( !AlignTest( data ) )
+    {
+      "Center alignment for the mid paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::CENTER,
+      Text::VerticalAlignment::TOP,
+      22u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
+
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4404,112 +4284,111 @@ int UtcDaliTextAlign06(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 0.f, 0.f, 9.f, 16.f };
+  float positions[] = {0.f, 0.f, 0.f, 0.f, 10.f, 17.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Center alignment for the last paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::CENTER,
-    Text::VerticalAlignment::TOP,
-    48u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
-
-  if( !AlignTest( data ) )
+    {
+      "Center alignment for the last paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::CENTER,
+      Text::VerticalAlignment::TOP,
+      48u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
+
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4525,112 +4404,111 @@ int UtcDaliTextAlign07(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 19.f, 30.f, 0.f, 0.f, 0.f, 0.f };
+  float positions[] = {21.f, 30.f, 0.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "End alignment for the first paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::END,
-    Text::VerticalAlignment::TOP,
-    0u,
-    22u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
+    {
+      "End alignment for the first paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::END,
+      Text::VerticalAlignment::TOP,
+      0u,
+      22u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
 
-  if( !AlignTest( data ) )
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4646,112 +4524,111 @@ int UtcDaliTextAlign08(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, -4.f, 0.f, 0.f, 0.f };
+  float positions[] = {0.f, 0.f, -4.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "End alignment for the mid paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::END,
-    Text::VerticalAlignment::TOP,
-    22u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
-
-  if( !AlignTest( data ) )
+    {
+      "End alignment for the mid paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::END,
+      Text::VerticalAlignment::TOP,
+      22u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
+
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4767,112 +4644,111 @@ int UtcDaliTextAlign09(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 0.f, 0.f, 19.f, 33.f };
+  float positions[] = {0.f, 0.f, 0.f, 0.f, 21.f, 35.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "End alignment for the last paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::END,
-    Text::VerticalAlignment::TOP,
-    48u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    false
-  };
-
-  if( !AlignTest( data ) )
+    {
+      "End alignment for the last paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::END,
+      Text::VerticalAlignment::TOP,
+      48u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      false};
+
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -4888,112 +4764,111 @@ int UtcDaliTextAlign10(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f };
+  float positions[] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Begin alignment for the first paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::END,
-    Text::VerticalAlignment::TOP,
-    0u,
-    22u,
-    6u,
-    positions,
-    Dali::LayoutDirection::RIGHT_TO_LEFT,
-    true
-  };
+    {
+      "Begin alignment for the first paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::END,
+      Text::VerticalAlignment::TOP,
+      0u,
+      22u,
+      6u,
+      positions,
+      Dali::LayoutDirection::RIGHT_TO_LEFT,
+      true};
 
-  if( !AlignTest( data ) )
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -5009,112 +4884,111 @@ int UtcDaliTextAlign11(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 19.f, 30.f, 33.f, 0.f, 0.f, 0.f };
+  float positions[] = {21.f, 30.f, 34.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "End alignment for the last paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::END,
-    Text::VerticalAlignment::TOP,
-    0u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    true
-  };
+    {
+      "End alignment for the last paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::END,
+      Text::VerticalAlignment::TOP,
+      0u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      true};
 
-  if( !AlignTest( data ) )
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -5130,112 +5004,111 @@ int UtcDaliTextAlign12(void)
 
   // Calculate text alignment.
 
-  const std::string fontLatin( "TizenSans" );
-  const std::string fontHebrew( "TizenSansHebrew" );
-  const std::string fontArabic( "TizenSansArabic" );
+  const std::string fontLatin("TizenSans");
+  const std::string fontHebrew("TizenSansHebrew");
+  const std::string fontArabic("TizenSansArabic");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun01.familyLength = fontLatin.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontLatin.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 12u;
+  fontDescriptionRun02.characterRun.characterIndex     = 12u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 10u;
-  fontDescriptionRun02.familyLength = fontHebrew.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontHebrew.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 22u;
+  fontDescriptionRun03.characterRun.characterIndex     = 22u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun03.familyLength = fontArabic.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontArabic.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun04;
-  fontDescriptionRun04.characterRun.characterIndex = 36u;
+  fontDescriptionRun04.characterRun.characterIndex     = 36u;
   fontDescriptionRun04.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun04.familyLength = fontLatin.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyLength                    = fontLatin.size();
+  fontDescriptionRun04.familyName                      = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength);
   fontDescriptionRun04.familyDefined = true;
   fontDescriptionRun04.weightDefined = false;
-  fontDescriptionRun04.widthDefined = false;
-  fontDescriptionRun04.slantDefined = false;
-  fontDescriptionRun04.sizeDefined = false;
+  fontDescriptionRun04.widthDefined  = false;
+  fontDescriptionRun04.slantDefined  = false;
+  fontDescriptionRun04.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun05;
-  fontDescriptionRun05.characterRun.characterIndex = 48u;
+  fontDescriptionRun05.characterRun.characterIndex     = 48u;
   fontDescriptionRun05.characterRun.numberOfCharacters = 12u;
-  fontDescriptionRun05.familyLength = fontLatin.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyLength                    = fontLatin.size();
+  fontDescriptionRun05.familyName                      = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength);
   fontDescriptionRun05.familyDefined = true;
   fontDescriptionRun05.weightDefined = false;
-  fontDescriptionRun05.widthDefined = false;
-  fontDescriptionRun05.slantDefined = false;
-  fontDescriptionRun05.sizeDefined = false;
+  fontDescriptionRun05.widthDefined  = false;
+  fontDescriptionRun05.slantDefined  = false;
+  fontDescriptionRun05.sizeDefined   = false;
 
   FontDescriptionRun fontDescriptionRun06;
-  fontDescriptionRun06.characterRun.characterIndex = 60u;
+  fontDescriptionRun06.characterRun.characterIndex     = 60u;
   fontDescriptionRun06.characterRun.numberOfCharacters = 14u;
-  fontDescriptionRun06.familyLength = fontArabic.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyLength                    = fontArabic.size();
+  fontDescriptionRun06.familyName                      = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength);
   fontDescriptionRun06.familyDefined = true;
   fontDescriptionRun06.weightDefined = false;
-  fontDescriptionRun06.widthDefined = false;
-  fontDescriptionRun06.slantDefined = false;
-  fontDescriptionRun06.sizeDefined = false;
+  fontDescriptionRun06.widthDefined  = false;
+  fontDescriptionRun06.slantDefined  = false;
+  fontDescriptionRun06.sizeDefined   = false;
 
   Vector<FontDescriptionRun> fontDescriptionRuns;
-  fontDescriptionRuns.PushBack( fontDescriptionRun01 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun02 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun03 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun04 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun05 );
-  fontDescriptionRuns.PushBack( fontDescriptionRun06 );
+  fontDescriptionRuns.PushBack(fontDescriptionRun01);
+  fontDescriptionRuns.PushBack(fontDescriptionRun02);
+  fontDescriptionRuns.PushBack(fontDescriptionRun03);
+  fontDescriptionRuns.PushBack(fontDescriptionRun04);
+  fontDescriptionRuns.PushBack(fontDescriptionRun05);
+  fontDescriptionRuns.PushBack(fontDescriptionRun06);
 
-  float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f };
+  float positions[] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
 
-  Size textArea( 100.f, 300.f );
+  Size      textArea(100.f, 300.f);
   AlignData data =
-  {
-    "Begin alignment for the first paragraph.",
-    "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
-    textArea,
-    6u,
-    fontDescriptionRuns.Begin(),
-    Text::HorizontalAlignment::BEGIN,
-    Text::VerticalAlignment::TOP,
-    48u,
-    26u,
-    6u,
-    positions,
-    Dali::LayoutDirection::LEFT_TO_RIGHT,
-    true
-  };
-
-  if( !AlignTest( data ) )
+    {
+      "Begin alignment for the first paragraph.",
+      "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.",
+      textArea,
+      6u,
+      fontDescriptionRuns.Begin(),
+      Text::HorizontalAlignment::BEGIN,
+      Text::VerticalAlignment::TOP,
+      48u,
+      26u,
+      6u,
+      positions,
+      Dali::LayoutDirection::LEFT_TO_RIGHT,
+      true};
+
+  if(!AlignTest(data))
   {
     tet_result(TET_FAIL);
   }
@@ -5250,10 +5123,10 @@ int UtcDaliTextLayoutSetGetDefaultLineSpacing(void)
   tet_infoline(" UtcDaliTextLayoutSetGetDefaultLineSpacing");
 
   Layout::Engine engine;
-  DALI_TEST_EQUALS( 0.f, engine.GetDefaultLineSpacing(), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(0.f, engine.GetDefaultLineSpacing(), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  engine.SetDefaultLineSpacing( 10.f );
-  DALI_TEST_EQUALS( 10.f, engine.GetDefaultLineSpacing(), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  engine.SetDefaultLineSpacing(10.f);
+  DALI_TEST_EQUALS(10.f, engine.GetDefaultLineSpacing(), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -5265,188 +5138,184 @@ int UtcDaliTextLayoutGetGlyphMetrics(void)
 
   // Test retrieving metrics from group of characters
 
-  const std::string fontFamily( "TizenSansHindi" );
+  const std::string fontFamily("TizenSansHindi");
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun01;
-  fontDescriptionRun01.characterRun.characterIndex = 0u;
+  fontDescriptionRun01.characterRun.characterIndex     = 0u;
   fontDescriptionRun01.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun01.familyLength = fontFamily.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontFamily.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyLength                    = fontFamily.size();
+  fontDescriptionRun01.familyName                      = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontFamily.c_str(), fontDescriptionRun01.familyLength);
   fontDescriptionRun01.familyDefined = true;
   fontDescriptionRun01.weightDefined = false;
-  fontDescriptionRun01.widthDefined = false;
-  fontDescriptionRun01.slantDefined = false;
-  fontDescriptionRun01.sizeDefined = false;
+  fontDescriptionRun01.widthDefined  = false;
+  fontDescriptionRun01.slantDefined  = false;
+  fontDescriptionRun01.sizeDefined   = false;
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun02;
-  fontDescriptionRun02.characterRun.characterIndex = 0u;
+  fontDescriptionRun02.characterRun.characterIndex     = 0u;
   fontDescriptionRun02.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun02.familyLength = fontFamily.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyLength                    = fontFamily.size();
+  fontDescriptionRun02.familyName                      = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength);
   fontDescriptionRun02.familyDefined = true;
   fontDescriptionRun02.weightDefined = false;
-  fontDescriptionRun02.widthDefined = false;
-  fontDescriptionRun02.slantDefined = false;
-  fontDescriptionRun02.sizeDefined = false;
+  fontDescriptionRun02.widthDefined  = false;
+  fontDescriptionRun02.slantDefined  = false;
+  fontDescriptionRun02.sizeDefined   = false;
+
 
   // Set a known font description
   FontDescriptionRun fontDescriptionRun03;
-  fontDescriptionRun03.characterRun.characterIndex = 0u;
+  fontDescriptionRun03.characterRun.characterIndex     = 0u;
   fontDescriptionRun03.characterRun.numberOfCharacters = 2u;
-  fontDescriptionRun03.familyLength = fontFamily.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontFamily.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyLength                    = fontFamily.size();
+  fontDescriptionRun03.familyName                      = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontFamily.c_str(), fontDescriptionRun03.familyLength);
   fontDescriptionRun03.familyDefined = true;
   fontDescriptionRun03.weightDefined = false;
-  fontDescriptionRun03.widthDefined = false;
-  fontDescriptionRun03.slantDefined = false;
-  fontDescriptionRun03.sizeDefined = false;
+  fontDescriptionRun03.widthDefined  = false;
+  fontDescriptionRun03.slantDefined  = false;
+  fontDescriptionRun03.sizeDefined   = false;
+
 
   Vector<FontDescriptionRun> fontDescriptionRuns01;
-  fontDescriptionRuns01.PushBack( fontDescriptionRun01 );
+  fontDescriptionRuns01.PushBack(fontDescriptionRun01);
 
   Vector<FontDescriptionRun> fontDescriptionRuns02;
-  fontDescriptionRuns02.PushBack( fontDescriptionRun02 );
+  fontDescriptionRuns02.PushBack(fontDescriptionRun02);
 
   Vector<FontDescriptionRun> fontDescriptionRuns03;
-  fontDescriptionRuns03.PushBack( fontDescriptionRun03 );
+  fontDescriptionRuns03.PushBack(fontDescriptionRun03);
 
   // Set a text area.
   Size textArea(100.f, 100.f);
 
-
   // Group: second glyph doesn't exceed the width of the first glyph
-  float positions01[] = { 0.f, -11.f };
+  float positions01[] = {0.f, -11.f};
 
   struct LineRun line01 =
-  {
-    { 0u, 1u },
-    { 0u, 1u },
-    11.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 1u},
+      {0u, 1u},
+      11.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines01;
-  lines01.PushBack( line01 );
+  lines01.PushBack(line01);
 
   Size layoutSize01 = Vector2(11.f, 20.f);
 
   // Group: second glyph doesn't exceed the width of the first glyph
-  float positions02[] = { 0.f, -11.f, 7.f, -15.f, };
-
-  struct LineRun line02 =
-  {
-    { 0u, 2u },
-    { 0u, 2u },
-    16.f,
-    15.f,
-    -5.f,
-    0.f,
+  float positions02[] = {
     0.f,
-    0.f,
-    false,
-    false
+    -11.f,
+    7.f,
+    -15.f,
   };
+
+  struct LineRun line02 =
+    {
+      {0u, 2u},
+      {0u, 2u},
+      15.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines02;
-  lines02.PushBack( line02 );
+  lines02.PushBack(line02);
 
-  Size layoutSize02 = Vector2(16.f, 20.f);
+  Size layoutSize02 = Vector2(15.f, 20.f);
 
   // Group: second glyph doesn't exceed the width of the first glyph
-  float positions03[] = { 0.f, -11.f , 2.f, -15.f };
+  float positions03[] = {0.f, -11.f, 2.f, -15.f};
 
   struct LineRun line03 =
-  {
-    { 0u, 2u },
-    { 0u, 2u },
-    11.f,
-    15.f,
-    -5.f,
-    0.f,
-    0.f,
-    0.f,
-    false,
-    false
-  };
+    {
+      {0u, 2u},
+      {0u, 2u},
+      11.f,
+      15.f,
+      -5.f,
+      0.f,
+      0.f,
+      0.f,
+      false,
+      false};
   Vector<LineRun> lines03;
-  lines03.PushBack( line03 );
+  lines03.PushBack(line03);
 
   Size layoutSize03 = Vector2(11.f, 20.f);
 
- /////////////////////////////
+  /////////////////////////////
 
   struct LayoutTextData data[] =
-  {
-    {
-      "Single glyph",
-      "प",
-      textArea,
-      1u,
-      fontDescriptionRuns01.Begin(),
-      layoutSize01,
-      1u,
-      positions01,
-      1u,
-      lines01.Begin(),
-      Layout::Engine::SINGLE_LINE_BOX,
-      0u,
-      1u,
-      false,
-      DevelText::EllipsisPosition::END,
-      true
-    },
     {
-      "Group: second glyph exceeds the width of the first glyph",
-      "पो",
-      textArea,
-      1u,
-      fontDescriptionRuns02.Begin(),
-      layoutSize02,
-      2u,
-      positions02,
-      1u,
-      lines02.Begin(),
-      Layout::Engine::SINGLE_LINE_BOX,
-      0u,
-      2u,
-      false,
-      DevelText::EllipsisPosition::END,
-      true
-    },
-   {
-      "Group: second glyph doesn't exceed the width of the first glyph",
-      "पे",
-      textArea,
-      1u,
-      fontDescriptionRuns03.Begin(),
-      layoutSize03,
-      2u,
-      positions03,
-      1u,
-      lines03.Begin(),
-      Layout::Engine::SINGLE_LINE_BOX,
-      0u,
-      2u,
-      false,
-      DevelText::EllipsisPosition::END,
-      true
-    }
-  };
-  const unsigned int numberOfTests = sizeof(data)/sizeof(LayoutTextData);
-
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+      {"Single glyph",
+       "प",
+       textArea,
+       1u,
+       fontDescriptionRuns01.Begin(),
+       layoutSize01,
+       1u,
+       positions01,
+       1u,
+       lines01.Begin(),
+       Layout::Engine::SINGLE_LINE_BOX,
+       0u,
+       1u,
+       false,
+       DevelText::EllipsisPosition::END,
+       true},
+      {"Group: second glyph exceeds the width of the first glyph",
+       "पो",
+       textArea,
+       1u,
+       fontDescriptionRuns02.Begin(),
+       layoutSize02,
+       2u,
+       positions02,
+       1u,
+       lines02.Begin(),
+       Layout::Engine::SINGLE_LINE_BOX,
+       0u,
+       2u,
+       false,
+       DevelText::EllipsisPosition::END,
+       true},
+      {"Group: second glyph doesn't exceed the width of the first glyph",
+       "पे",
+       textArea,
+       1u,
+       fontDescriptionRuns03.Begin(),
+       layoutSize03,
+       2u,
+       positions03,
+       1u,
+       lines03.Begin(),
+       Layout::Engine::SINGLE_LINE_BOX,
+       0u,
+       2u,
+       false,
+       DevelText::EllipsisPosition::END,
+       true}};
+  const unsigned int numberOfTests = sizeof(data) / sizeof(LayoutTextData);
+
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !LayoutTextTest( data[index] ) )
+    if(!LayoutTextTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
old mode 100755
new mode 100644
index 1a4b5e1..3cc1355
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Markup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,13 @@
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <toolkit-text-utils.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/color-run.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
 #include <dali-toolkit/internal/text/text-io.h>
+#include <toolkit-text-utils.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -36,179 +36,181 @@ using namespace Text;
 
 namespace
 {
+///////////////////////////////////////////////////////////
 
-  ///////////////////////////////////////////////////////////
-
-  struct TokenComparisonData
-  {
-    std::string description;
-    std::string string1; ///< must be in lower case!!!!
-    std::string string2;
-    bool expectedResult;
-  };
-
-  bool TokenComparisonTest( const TokenComparisonData& data )
-  {
-    std::cout << "  testing " << data.description << std::endl;
+struct TokenComparisonData
+{
+  std::string description;
+  std::string string1; ///< must be in lower case!!!!
+  std::string string2;
+  bool        expectedResult;
+};
 
-    const bool result = TokenComparison( data.string1,
-                                         data.string2.c_str(),
-                                         data.string2.size() );
+bool TokenComparisonTest(const TokenComparisonData& data)
+{
+  std::cout << "  testing " << data.description << std::endl;
 
-    if( result != data.expectedResult )
-    {
-      std::cout << "  different conparison result : " << result << ", expected : " << data.expectedResult << std::endl;
-      std::cout << "  comparing : [" << data.string1 << "] and [" << data.string2 << "]" << std::endl;
+  const bool result = TokenComparison(data.string1,
+                                      data.string2.c_str(),
+                                      data.string2.size());
 
-      return false;
-    }
+  if(result != data.expectedResult)
+  {
+    std::cout << "  different conparison result : " << result << ", expected : " << data.expectedResult << std::endl;
+    std::cout << "  comparing : [" << data.string1 << "] and [" << data.string2 << "]" << std::endl;
 
-    return true;
+    return false;
   }
 
-  ///////////////////////////////////////////////////////////
+  return true;
+}
 
-  struct ColorStringToVector4Data
-  {
-    std::string description;
-    std::string colorStr;
-    Vector4 expectedColor;
-  };
+///////////////////////////////////////////////////////////
 
-  bool ColorStringToVector4Test( const ColorStringToVector4Data& data )
-  {
-    std::cout << "  testing " << data.description << std::endl;
+struct ColorStringToVector4Data
+{
+  std::string description;
+  std::string colorStr;
+  Vector4     expectedColor;
+};
 
-    Vector4 color;
-    ColorStringToVector4( data.colorStr.c_str(), data.colorStr.size(), color );
+bool ColorStringToVector4Test(const ColorStringToVector4Data& data)
+{
+  std::cout << "  testing " << data.description << std::endl;
 
-    if( color != data.expectedColor )
-    {
-      std::cout << "  different color : " << color << ", expected : " << data.expectedColor << std::endl;
-      return false;
-    }
+  Vector4 color;
+  ColorStringToVector4(data.colorStr.c_str(), data.colorStr.size(), color);
 
-    return true;
+  if(color != data.expectedColor)
+  {
+    std::cout << "  different color : " << color << ", expected : " << data.expectedColor << std::endl;
+    return false;
   }
 
-  ///////////////////////////////////////////////////////////
+  return true;
+}
 
-  struct Vector4ToColorStringData
-  {
-    std::string description;
-    Vector4 color;
-    std::string expectedColorStr;
-  };
+///////////////////////////////////////////////////////////
 
-  bool Vector4ToColorStringTest( const Vector4ToColorStringData& data )
-  {
-    std::cout << "  testing " << data.description << std::endl;
+struct Vector4ToColorStringData
+{
+  std::string description;
+  Vector4     color;
+  std::string expectedColorStr;
+};
 
-    std::string colorStr;
-    Vector4ToColorString( data.color, colorStr );
+bool Vector4ToColorStringTest(const Vector4ToColorStringData& data)
+{
+  std::cout << "  testing " << data.description << std::endl;
 
-    if( colorStr != data.expectedColorStr )
-    {
-      std::cout << "  different color : [" << colorStr << "], expected : [" << data.expectedColorStr << "]" << std::endl;
-      return false;
-    }
+  std::string colorStr;
+  Vector4ToColorString(data.color, colorStr);
 
-    return true;
+  if(colorStr != data.expectedColorStr)
+  {
+    std::cout << "  different color : [" << colorStr << "], expected : [" << data.expectedColorStr << "]" << std::endl;
+    return false;
   }
 
-  ///////////////////////////////////////////////////////////
+  return true;
+}
 
-  struct StringToVector2Data
-  {
-    std::string description;
-    std::string vector2Str;
-    Vector2 expectedVector2;
-  };
+///////////////////////////////////////////////////////////
 
-  bool StringToVector2Test( const StringToVector2Data& data )
-  {
-    std::cout << "  testing " << data.description << std::endl;
+struct StringToVector2Data
+{
+  std::string description;
+  std::string vector2Str;
+  Vector2     expectedVector2;
+};
 
-    Vector2 vector2;
-    StringToVector2( data.vector2Str.c_str(), data.vector2Str.size(), vector2 );
+bool StringToVector2Test(const StringToVector2Data& data)
+{
+  std::cout << "  testing " << data.description << std::endl;
 
-    if( vector2 != data.expectedVector2 )
-    {
-      std::cout << "  different vector2 : " << vector2 << ", expected : " << data.expectedVector2 << std::endl;
-      return false;
-    }
+  Vector2 vector2;
+  StringToVector2(data.vector2Str.c_str(), data.vector2Str.size(), vector2);
 
-    return true;
+  if(vector2 != data.expectedVector2)
+  {
+    std::cout << "  different vector2 : " << vector2 << ", expected : " << data.expectedVector2 << std::endl;
+    return false;
   }
 
-  ///////////////////////////////////////////////////////////
-
+  return true;
+}
 
-  struct Vector2ToStringData
-  {
-    std::string description;
-    Vector2 vector2;
-    std::string expectedVector2Str;
-  };
+///////////////////////////////////////////////////////////
 
-  bool Vector2ToStringTest( const Vector2ToStringData& data )
-  {
-    std::cout << "  testing " << data.description << std::endl;
+struct Vector2ToStringData
+{
+  std::string description;
+  Vector2     vector2;
+  std::string expectedVector2Str;
+};
 
-    std::string vector2Str;
-    Vector2ToString( data.vector2, vector2Str );
+bool Vector2ToStringTest(const Vector2ToStringData& data)
+{
+  std::cout << "  testing " << data.description << std::endl;
 
-    if( vector2Str != data.expectedVector2Str )
-    {
-      std::cout << "  different vector2 : [" << vector2Str << "], expected : [" << data.expectedVector2Str << "]" << std::endl;
-      return false;
-    }
+  std::string vector2Str;
+  Vector2ToString(data.vector2, vector2Str);
 
-    return true;
+  if(vector2Str != data.expectedVector2Str)
+  {
+    std::cout << "  different vector2 : [" << vector2Str << "], expected : [" << data.expectedVector2Str << "]" << std::endl;
+    return false;
   }
 
-  ///////////////////////////////////////////////////////////
+  return true;
+}
 
+///////////////////////////////////////////////////////////
 
-  struct XHTMLEntityToUTF8Data
-  {
-    std::string description;
-    std::string xHTMLEntityString;
-    std::string expectedString;
-  };
+struct XHTMLEntityToUTF8Data
+{
+  std::string description;
+  std::string xHTMLEntityString;
+  std::string expectedString;
+};
 
-  bool XHTMLEntityToUTF8Test( const XHTMLEntityToUTF8Data& data )
+bool XHTMLEntityToUTF8Test(const XHTMLEntityToUTF8Data& data)
+{
+  std::cout << "  testing " << data.description << std::endl;
+
+  Vector<ColorRun>                     colorRuns;
+  Vector<FontDescriptionRun>           fontRuns;
+  Vector<EmbeddedItem>                 items;
+  Vector<Anchor>                       anchors;
+  Vector<UnderlinedCharacterRun>       underlinedCharacterRuns;
+  Vector<ColorRun>                     backgroundColorRuns;
+  Vector<StrikethroughCharacterRun>    strikethroughCharacterRuns;
+  Vector<BoundedParagraphRun>          boundedParagraphRuns;
+  Vector<CharacterSpacingCharacterRun> characterSpacingCharacterRuns;
+  MarkupProcessData                    markupProcessData(colorRuns, fontRuns, items, anchors, underlinedCharacterRuns, backgroundColorRuns, strikethroughCharacterRuns, boundedParagraphRuns, characterSpacingCharacterRuns);
+
+  MarkupPropertyData markupPropertyData(Color::MEDIUM_BLUE, Color::DARK_MAGENTA);
+  ProcessMarkupString(data.xHTMLEntityString, markupPropertyData, markupProcessData);
+
+  for(Vector<EmbeddedItem>::Iterator it    = items.Begin(),
+                                     endIt = items.End();
+      it != endIt;
+      ++it)
   {
-    std::cout << "  testing " << data.description << std::endl;
-
-    Vector<ColorRun> colorRuns;
-    Vector<FontDescriptionRun> fontRuns;
-    Vector<EmbeddedItem> items;
-    Vector<Anchor> anchors;
-    Vector<UnderlinedCharacterRun> underlinedCharacterRuns;
-    Vector<ColorRun> backgroundColorRuns;
-    MarkupProcessData markupProcessData( colorRuns, fontRuns, items, anchors, underlinedCharacterRuns, backgroundColorRuns );
-    ProcessMarkupString( data.xHTMLEntityString, markupProcessData );
-
-    for( Vector<EmbeddedItem>::Iterator it = items.Begin(),
-           endIt = items.End();
-         it != endIt;
-         ++it )
-    {
-      EmbeddedItem& item = *it;
-      delete[] item.url;
-    }
-    items.Clear();
-
-    if( markupProcessData.markupProcessedText != data.expectedString )
-    {
-      std::cout << "  different output string : " << markupProcessData.markupProcessedText << ", expected : " << data.expectedString << " " << std::endl;
-      return false;
-    }
+    EmbeddedItem& item = *it;
+    delete[] item.url;
+  }
+  items.Clear();
 
-    return true;
+  if(markupProcessData.markupProcessedText != data.expectedString)
+  {
+    std::cout << "  different output string : " << markupProcessData.markupProcessedText << ", expected : " << data.expectedString << " " << std::endl;
+    return false;
   }
 
+  return true;
+}
+
 } // namespace
 
 int UtcDaliTextTokenComparison(void)
@@ -216,45 +218,35 @@ int UtcDaliTextTokenComparison(void)
   tet_infoline(" UtcDaliTextTokenComparison");
 
   const TokenComparisonData data[] =
-  {
     {
-      "void texts",
-      "",
-      "",
-      true
-    },
-    {
-      "different size text",
-      "hello",
-      "world!",
-      false
-    },
-    {
-      "different texts",
-      "hello",
-      "world",
-      false
-    },
-    {
-      "same texts",
-      "world",
-      "wOrLD",
-      true
-    },
-    {
-      "some punctuation characters, numbers, ...",
-      "hello0123456789.![?]",
-      "Hello0123456789.![?]",
-      true
-    }
-
-  };
+      {"void texts",
+       "",
+       "",
+       true},
+      {"different size text",
+       "hello",
+       "world!",
+       false},
+      {"different texts",
+       "hello",
+       "world",
+       false},
+      {"same texts",
+       "world",
+       "wOrLD",
+       true},
+      {"some punctuation characters, numbers, ...",
+       "hello0123456789.![?]",
+       "Hello0123456789.![?]",
+       true}
+
+    };
   const unsigned int numberOfTests = 5u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !TokenComparisonTest( data[index] ) )
+    if(!TokenComparisonTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -269,84 +261,56 @@ int UtcDaliTextColorStringToVector4(void)
   tet_infoline(" UtcDaliTextColorStringToVector4");
 
   const ColorStringToVector4Data data[] =
-  {
-    {
-      "black string",
-      "bLack",
-      Color::BLACK
-    },
-    {
-      "white string",
-      "White",
-      Color::WHITE
-    },
-    {
-      "red string",
-      "reD",
-      Color::RED
-    },
-    {
-      "green string",
-      "green",
-      Color::GREEN
-    },
-    {
-      "blue string",
-      "blue",
-      Color::BLUE
-    },
-    {
-      "yellow string",
-      "yeLloW",
-      Color::YELLOW
-    },
-    {
-      "magenta string",
-      "MagEnta",
-      Color::MAGENTA
-    },
-    {
-      "cyan string",
-      "CyaN",
-      Color::CYAN
-    },
-    {
-      "transparent string",
-      "transparent",
-      Color::TRANSPARENT
-    },
-    {
-      "3 component web color",
-      "#F00",
-      Color::RED
-    },
-    {
-      "6 component web color",
-      "#fF0000",
-      Color::RED
-    },
-    {
-      "hex color red (ARGB)",
-      "0xffff0000",
-      Color::RED
-    },
     {
-      "hex color green (ARGB)",
-      "0xFf00FF00",
-      Color::GREEN
-    },
-    {
-      "undefined color",
-      "undefined",
-      Vector4::ZERO
-    },
-  };
+      {"black string",
+       "bLack",
+       Color::BLACK},
+      {"white string",
+       "White",
+       Color::WHITE},
+      {"red string",
+       "reD",
+       Color::RED},
+      {"green string",
+       "green",
+       Color::GREEN},
+      {"blue string",
+       "blue",
+       Color::BLUE},
+      {"yellow string",
+       "yeLloW",
+       Color::YELLOW},
+      {"magenta string",
+       "MagEnta",
+       Color::MAGENTA},
+      {"cyan string",
+       "CyaN",
+       Color::CYAN},
+      {"transparent string",
+       "transparent",
+       Color::TRANSPARENT},
+      {"3 component web color",
+       "#F00",
+       Color::RED},
+      {"6 component web color",
+       "#fF0000",
+       Color::RED},
+      {"hex color red (ARGB)",
+       "0xffff0000",
+       Color::RED},
+      {"hex color green (ARGB)",
+       "0xFf00FF00",
+       Color::GREEN},
+      {"undefined color",
+       "undefined",
+       Vector4::ZERO},
+    };
   const unsigned int numberOfTests = 14u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !ColorStringToVector4Test( data[index] ) )
+    if(!ColorStringToVector4Test(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -361,64 +325,46 @@ int UtcDaliTextVector4ToColorString(void)
   tet_infoline(" UtcDaliTextVector4ToColorString");
 
   const Vector4ToColorStringData data[] =
-  {
-    {
-      "black color",
-      Color::BLACK,
-      "black"
-    },
-    {
-      "white string",
-      Color::WHITE,
-      "white"
-    },
-    {
-      "red string",
-      Color::RED,
-      "red"
-    },
-    {
-      "green string",
-      Color::GREEN,
-      "green"
-    },
-    {
-      "blue string",
-      Color::BLUE,
-      "blue"
-    },
     {
-      "yellow string",
-      Color::YELLOW,
-      "yellow"
-    },
-    {
-      "magenta string",
-      Color::MAGENTA,
-      "magenta",
-    },
-    {
-      "cyan string",
-      Color::CYAN,
-      "cyan"
-    },
-    {
-      "transparent string",
-      Color::TRANSPARENT,
-      "transparent"
-    },
-    {
-      "hex color",
-      Vector4( 0.4f, 0.5f, 0.6f, 1.f ),
-      "0xff667f99"
-    },
-  };
+      {"black color",
+       Color::BLACK,
+       "black"},
+      {"white string",
+       Color::WHITE,
+       "white"},
+      {"red string",
+       Color::RED,
+       "red"},
+      {"green string",
+       Color::GREEN,
+       "green"},
+      {"blue string",
+       Color::BLUE,
+       "blue"},
+      {"yellow string",
+       Color::YELLOW,
+       "yellow"},
+      {
+        "magenta string",
+        Color::MAGENTA,
+        "magenta",
+      },
+      {"cyan string",
+       Color::CYAN,
+       "cyan"},
+      {"transparent string",
+       Color::TRANSPARENT,
+       "transparent"},
+      {"hex color",
+       Vector4(0.4f, 0.5f, 0.6f, 1.f),
+       "0xff667f99"},
+    };
   const unsigned int numberOfTests = 10u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !Vector4ToColorStringTest( data[index] ) )
+    if(!Vector4ToColorStringTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -432,29 +378,22 @@ int UtcDaliTextStringToVector2(void)
 {
   tet_infoline(" UtcDaliTextStringToVector2");
   const StringToVector2Data data[] =
-  {
-    {
-      "void text",
-      "",
-      Vector2::ZERO
-    },
     {
-      "zero zero",
-      "0 0",
-      Vector2::ZERO
-    },
-    {
-      "five four",
-      "5 4",
-      Vector2(5.f, 4.f)
-    }
-  };
+      {"void text",
+       "",
+       Vector2::ZERO},
+      {"zero zero",
+       "0 0",
+       Vector2::ZERO},
+      {"five four",
+       "5 4",
+       Vector2(5.f, 4.f)}};
   const unsigned int numberOfTests = 3u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !StringToVector2Test( data[index] ) )
+    if(!StringToVector2Test(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -468,24 +407,23 @@ int UtcDaliTextVector2ToString(void)
 {
   tet_infoline(" UtcDaliTextVector2ToString");
   const Vector2ToStringData data[] =
-  {
     {
-      "zero zero",
-      Vector2::ZERO,
-      "0 0",
-    },
-    {
-      "five four",
-      Vector2(5.f, 4.f),
-      "5 4",
-    }
-  };
+      {
+        "zero zero",
+        Vector2::ZERO,
+        "0 0",
+      },
+      {
+        "five four",
+        Vector2(5.f, 4.f),
+        "5 4",
+      }};
   const unsigned int numberOfTests = 2u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !Vector2ToStringTest( data[index] ) )
+    if(!Vector2ToStringTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -499,44 +437,31 @@ int UtcDaliTextXHTMLEntityToUTF8(void)
 {
   tet_infoline(" UtcDaliTextXHTMLEntityToUTF8");
   const XHTMLEntityToUTF8Data data[] =
-  {
     {
-      "Text Without XHTML Entity",
-      "Checking XHTML Entitities",
-      "Checking XHTML Entitities"
-    },
-    {
-      "Text With XHTML Entity in Numeric form",
-      "Checking Numeric Entitities &#x26; &#x27; &#x3C; &#x3E; &#xA1; &#xA2; &#xA3; &#xA4; &#xA5; &#xA6; &#xA7; &#xA8; &#xA9; &#xAA; &#xAB; &#xAC; &#xAD; &#xAE; &#xAF; &#xB0; &#xB1; &#xB2; &#xB3; &#xB4; &#xB5; &#xB6; &#xB7; &#xB8; &#xB9; &#xBA; &#xBB; &#xBC; &#xBD; &#xBE; &#xBF; &#xC0; &#xC1; &#xC2; &#xC3; &#xC4; &#xC5; &#xE6; &#xC7; &#xC8; &#xC9; &#xCA; &#xCB; &#xCC; &#xCD; &#xCE; &#xCF; &#xF0; &#xD1; &#xD2; &#xD3; &#xD4; &#xD5; &#xD6; &#xD7; &#xD8; &#xD9; &#xDA; &#xDB; &#xDD; &#xFE; &#xDF; &#xE0; &#xE1; &#xE2; &#xE3; &#xE4; &#xE5; &#xE6; &#xE7; &#xE8; &#xE9; &#xEA; &#xEB; &#xEC; &#xED; &#xEE; &#xEF; &#xF0; &#xF1; &#xF2; &#xF3; &#xF4; &#xF5; &#xF6; &#xF7; &#xF8; &#xF9; &#xFA; &#xFB; &#xFC; &#xFD; &#xFE; &#xFF; &#x3B1; &#x3B2; &#x3B3; &#x3B4; &#x3B5; &#x3B6; &#x3B7; &#x3B8; &#x3B9; &#x3BA; &#x3BB; &#x3BC; &#x3BD; &#x3BE; &#x3BF; &#x3C0; &#x3C1; &#x3C3; &#x3C4; &#x3C5; &#x3C6; &#x3C7; &#x3C8; &#x3C9; &#x2026; &#x20AC; &#x2190; &#x2191; &#x2192; &#x2193; &#x2194; &#x2190; &#x2192; &#x2200; &#x2203; &#x2207; &#x220F; &#x2211; &#x2227; &#x2228; &#x222B; &#x2260; &#x2261; &#x2295; &#x22A5; &#x2020; &#x2021; &#x2022; ",
-      "Checking Numeric Entitities & ' < > ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å æ Ç È É Ê Ë Ì Í Î Ï ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ý þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω … € ← ↑ → ↓ ↔ ← → ∀ ∃ ∇ ∏ ∑ ∧ ∨ ∫ ≠ ≡ ⊕ ⊥ † ‡ • "
-    },
-    {
-      "Text With XHTML Named Entities",
-      "Checking Named Entitities &amp; &apos; &lt; &gt; &iexcl; &cent; &pound; &curren; &yen; &brvbar; &sect; &uml; &copy; &ordf; &laquo; &not; &shy; &reg; &macr; &deg; &plusmn; &sup2; &sup3; &acute; &micro; &para; &middot; &cedil; &sup1; &ordm; &raquo; &frac14; &frac12; &frac34; &iquest; &Agrave; &Aacute; &Acirc; &Atilde; &Auml; &Aring; &aelig; &Ccedil; &Egrave; &Eacute; &Ecirc; &Euml; &Igrave; &Iacute; &Icirc; &Iuml; &eth; &Ntilde; &Ograve; &Oacute; &Ocirc; &Otilde; &Ouml; &times; &Oslash; &Ugrave; &Uacute; &Ucirc; &Yacute; &thorn; &szlig; &agrave; &aacute; &acirc; &atilde; &auml; &aring; &aelig; &ccedil; &egrave; &eacute; &ecirc; &euml; &igrave; &iacute; &icirc; &iuml; &eth; &ntilde; &ograve; &oacute; &ocirc; &otilde; &ouml; &divide; &oslash; &ugrave; &uacute; &ucirc; &uuml; &yacute; &thorn; &yuml; &alpha; &beta; &gamma; &delta; &epsilon; &zeta; &eta; &theta; &iota; &kappa; &lambda; &mu; &nu; &xi; &omicron; &pi; &rho; &sigma; &tau; &upsilon; &phi; &chi; &psi; &omega; &hellip; &euro; &larr; &uarr; &rarr; &darr; &harr; &larr; &rarr; &forall; &exist; &nabla; &prod; &sum; &and; &or; &int; &ne; &equiv; &oplus; &perp; &dagger; &Dagger; &bull; ",
-      "Checking Named Entitities & ' < > ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å æ Ç È É Ê Ë Ì Í Î Ï ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ý þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω … € ← ↑ → ↓ ↔ ← → ∀ ∃ ∇ ∏ ∑ ∧ ∨ ∫ ≠ ≡ ⊕ ⊥ † ‡ • "
-    },
-    {
-      "Testing of < special character",
-      "Testing of < special character",
-      "Testing of "
-    },
-    {
-      "Testing of & special character",
-      "Testing of & special character",
-      "Testing of "
-    },
-    {
-      "Testing of & < > special character",
-      "Testing of \\& \\< \\> special character",
-      "Testing of & < > special character"
-    }
-  };
+      {"Text Without XHTML Entity",
+       "Checking XHTML Entitities",
+       "Checking XHTML Entitities"},
+      {"Text With XHTML Entity in Numeric form",
+       "Checking Numeric Entitities &#x26; &#x27; &#x3C; &#x3E; &#xA1; &#xA2; &#xA3; &#xA4; &#xA5; &#xA6; &#xA7; &#xA8; &#xA9; &#xAA; &#xAB; &#xAC; &#xAD; &#xAE; &#xAF; &#xB0; &#xB1; &#xB2; &#xB3; &#xB4; &#xB5; &#xB6; &#xB7; &#xB8; &#xB9; &#xBA; &#xBB; &#xBC; &#xBD; &#xBE; &#xBF; &#xC0; &#xC1; &#xC2; &#xC3; &#xC4; &#xC5; &#xE6; &#xC7; &#xC8; &#xC9; &#xCA; &#xCB; &#xCC; &#xCD; &#xCE; &#xCF; &#xF0; &#xD1; &#xD2; &#xD3; &#xD4; &#xD5; &#xD6; &#xD7; &#xD8; &#xD9; &#xDA; &#xDB; &#xDD; &#xFE; &#xDF; &#xE0; &#xE1; &#xE2; &#xE3; &#xE4; &#xE5; &#xE6; &#xE7; &#xE8; &#xE9; &#xEA; &#xEB; &#xEC; &#xED; &#xEE; &#xEF; &#xF0; &#xF1; &#xF2; &#xF3; &#xF4; &#xF5; &#xF6; &#xF7; &#xF8; &#xF9; &#xFA; &#xFB; &#xFC; &#xFD; &#xFE; &#xFF; &#x3B1; &#x3B2; &#x3B3; &#x3B4; &#x3B5; &#x3B6; &#x3B7; &#x3B8; &#x3B9; &#x3BA; &#x3BB; &#x3BC; &#x3BD; &#x3BE; &#x3BF; &#x3C0; &#x3C1; &#x3C3; &#x3C4; &#x3C5; &#x3C6; &#x3C7; &#x3C8; &#x3C9; &#x2026; &#x20AC; &#x2190; &#x2191; &#x2192; &#x2193; &#x2194; &#x2190; &#x2192; &#x2200; &#x2203; &#x2207; &#x220F; &#x2211; &#x2227; &#x2228; &#x222B; &#x2260; &#x2261; &#x2295; &#x22A5; &#x2020; &#x2021; &#x2022; ",
+       "Checking Numeric Entitities & ' < > ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å æ Ç È É Ê Ë Ì Í Î Ï ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ý þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω … € ← ↑ → ↓ ↔ ← → ∀ ∃ ∇ ∏ ∑ ∧ ∨ ∫ ≠ ≡ ⊕ ⊥ † ‡ • "},
+      {"Text With XHTML Named Entities",
+       "Checking Named Entitities &amp; &apos; &lt; &gt; &iexcl; &cent; &pound; &curren; &yen; &brvbar; &sect; &uml; &copy; &ordf; &laquo; &not; &shy; &reg; &macr; &deg; &plusmn; &sup2; &sup3; &acute; &micro; &para; &middot; &cedil; &sup1; &ordm; &raquo; &frac14; &frac12; &frac34; &iquest; &Agrave; &Aacute; &Acirc; &Atilde; &Auml; &Aring; &aelig; &Ccedil; &Egrave; &Eacute; &Ecirc; &Euml; &Igrave; &Iacute; &Icirc; &Iuml; &eth; &Ntilde; &Ograve; &Oacute; &Ocirc; &Otilde; &Ouml; &times; &Oslash; &Ugrave; &Uacute; &Ucirc; &Yacute; &thorn; &szlig; &agrave; &aacute; &acirc; &atilde; &auml; &aring; &aelig; &ccedil; &egrave; &eacute; &ecirc; &euml; &igrave; &iacute; &icirc; &iuml; &eth; &ntilde; &ograve; &oacute; &ocirc; &otilde; &ouml; &divide; &oslash; &ugrave; &uacute; &ucirc; &uuml; &yacute; &thorn; &yuml; &alpha; &beta; &gamma; &delta; &epsilon; &zeta; &eta; &theta; &iota; &kappa; &lambda; &mu; &nu; &xi; &omicron; &pi; &rho; &sigma; &tau; &upsilon; &phi; &chi; &psi; &omega; &hellip; &euro; &larr; &uarr; &rarr; &darr; &harr; &larr; &rarr; &forall; &exist; &nabla; &prod; &sum; &and; &or; &int; &ne; &equiv; &oplus; &perp; &dagger; &Dagger; &bull; ",
+       "Checking Named Entitities & ' < > ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å æ Ç È É Ê Ë Ì Í Î Ï ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ý þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω … € ← ↑ → ↓ ↔ ← → ∀ ∃ ∇ ∏ ∑ ∧ ∨ ∫ ≠ ≡ ⊕ ⊥ † ‡ • "},
+      {"Testing of < special character",
+       "Testing of < special character",
+       "Testing of "},
+      {"Testing of & special character",
+       "Testing of & special character",
+       "Testing of "},
+      {"Testing of & < > special character",
+       "Testing of \\& \\< \\> special character",
+       "Testing of & < > special character"}};
   const unsigned int numberOfTests = 6u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !XHTMLEntityToUTF8Test( data[index] ) )
+    if(!XHTMLEntityToUTF8Test(data[index]))
     {
       tet_result(TET_FAIL);
     }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
index 559e34e..a81a462 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/multi-language-helper-functions.h>
 #include <dali-toolkit/internal/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/multi-language-support-impl.h>
 #include <dali-toolkit/internal/text/segmentation.h>
 #include <dali-toolkit/internal/text/text-run-container.h>
 #include <dali-toolkit-test-suite-utils.h>
@@ -33,35 +34,38 @@ using namespace Dali;
 using namespace Toolkit;
 using namespace Text;
 
+
 // Tests the following functions with different scripts.
 //
-// void MergeFontDescriptions( const Vector<FontDescriptionRun>& fontDescriptions,
-//                             const TextAbstraction::FontDescription& defaultFontDescription,
-//                             TextAbstraction::PointSize26Dot6 defaultPointSize,
-//                             CharacterIndex characterIndex,
-//                             TextAbstraction::FontDescription& fontDescription,
-//                             TextAbstraction::PointSize26Dot6& fontPointSize,
-//                             bool& isDefaultFont );
+// void MergeFontDescriptions(const Vector<FontDescriptionRun>&       fontDescriptions,
+//                            const TextAbstraction::FontDescription& defaultFontDescription,
+//                            TextAbstraction::PointSize26Dot6        defaultPointSize,
+//                            float                                   fontSizeScale,
+//                            CharacterIndex                          characterIndex,
+//                            TextAbstraction::FontDescription&       fontDescription,
+//                            TextAbstraction::PointSize26Dot6&       fontPointSize,
+//                            bool&                                   isDefaultFont);
 //
-// Script GetScript( Length index,
-//                   Vector<ScriptRun>::ConstIterator& scriptRunIt,
-//                   const Vector<ScriptRun>::ConstIterator& scriptRunEndIt );
+// Script GetScript(Length                                  index,
+//                  Vector<ScriptRun>::ConstIterator&       scriptRunIt,
+//                  const Vector<ScriptRun>::ConstIterator& scriptRunEndIt);
 //
 // Constructor, destructor and MultilanguageSupport::Get()
 //
-// void MultilanguageSupport::SetScripts( const Vector<Character>& text,
-//                                        CharacterIndex startIndex,
-//                                        Length numberOfCharacters,
-//                                        Vector<ScriptRun>& scripts );
+// void MultilanguageSupport::SetScripts(const Vector<Character>& text,
+//                                       CharacterIndex           startIndex,
+//                                       Length                   numberOfCharacters,
+//                                       Vector<ScriptRun>&       scripts);
 //
-// void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
-//                                           const Vector<ScriptRun>& scripts,
-//                                           const Vector<FontDescriptionRun>& fontDescriptions,
-//                                           const TextAbstraction::FontDescription& defaultFontDescription,
-//                                           TextAbstraction::PointSize26Dot6 defaultFontPointSize,
-//                                           CharacterIndex startIndex,
-//                                           Length numberOfCharacters,
-//                                           Vector<FontRun>& fonts );
+// void MultilanguageSupport::ValidateFonts(const Vector<Character>&                text,
+//                                          const Vector<ScriptRun>&                scripts,
+//                                          const Vector<FontDescriptionRun>&       fontDescriptions,
+//                                          const TextAbstraction::FontDescription& defaultFontDescription,
+//                                          TextAbstraction::PointSize26Dot6        defaultFontPointSize,
+//                                          float                                   fontSizeScale,
+//                                          CharacterIndex                          startIndex,
+//                                          Length                                  numberOfCharacters,
+//                                          Vector<FontRun>&                        fonts);
 
 //////////////////////////////////////////////////////////
 
@@ -78,6 +82,7 @@ struct MergeFontDescriptionsData
   Vector<FontDescriptionRun> fontDescriptionRuns;          ///< The font description runs.
   TextAbstraction::FontDescription defaultFontDescription; ///< The default font description.
   TextAbstraction::PointSize26Dot6 defaultPointSize;       ///< The default point size.
+  float        fontSizeScale;                              ///< The font's size scale.
   unsigned int startIndex;                                 ///< The start index.
   unsigned int numberOfCharacters;                         ///< The number of characters.
   Vector<FontId> expectedFontIds;                          ///< The expected font ids.
@@ -99,6 +104,7 @@ struct ValidateFontsData
   std::string                text;                ///< Input text.
   std::string                defaultFont;         ///< The default font.
   unsigned int               defaultFontSize;     ///< The default font size.
+  float                      fontSizeScale;       ///< The font's size scale.
   unsigned int               index;               ///< The index of the first character to update the script.
   unsigned int               numberOfCharacters;  ///< The numbers of characters to update the script.
   Vector<FontDescriptionRun> fontDescriptionRuns; ///< The font description runs.
@@ -123,6 +129,7 @@ bool MergeFontDescriptionsTest( const MergeFontDescriptionsData& data )
     MergeFontDescriptions( data.fontDescriptionRuns,
                            data.defaultFontDescription,
                            data.defaultPointSize,
+                           data.fontSizeScale,
                            index,
                            fontDescription,
                            fontPointSize,
@@ -290,6 +297,7 @@ bool ValidateFontTest( const ValidateFontsData& data )
                                       data.fontDescriptionRuns,
                                       defaultFontDescription,
                                       defaultPointSize,
+                                      data.fontSizeScale,
                                       0u,
                                       numberOfCharacters,
                                       fontRuns );
@@ -307,6 +315,7 @@ bool ValidateFontTest( const ValidateFontsData& data )
                                         data.fontDescriptionRuns,
                                         defaultFontDescription,
                                         defaultPointSize,
+                                        data.fontSizeScale,
                                         data.index,
                                         data.numberOfCharacters,
                                         fontRuns );
@@ -594,6 +603,7 @@ int UtcDaliTextMergeFontDescriptions(void)
       fontDescriptionRuns01,
       defaultFontDescription01,
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       0u,
       expectedFontIds01,
@@ -604,6 +614,7 @@ int UtcDaliTextMergeFontDescriptions(void)
       fontDescriptionRuns02,
       defaultFontDescription02,
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       2u,
       expectedFontIds02,
@@ -614,6 +625,7 @@ int UtcDaliTextMergeFontDescriptions(void)
       fontDescriptionRuns03,
       defaultFontDescription03,
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       10u,
       expectedFontIds03,
@@ -1744,6 +1756,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       0u,
       fontDescriptions01,
@@ -1754,6 +1767,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "Hello world",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       11u,
       fontDescriptions02,
@@ -1764,6 +1778,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "Hello world\nhello world\ndemo",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       28u,
       fontDescriptions03,
@@ -1774,6 +1789,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "Hello world\nhello world\ndemo",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       12u,
       fontDescriptions03,
@@ -1784,6 +1800,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "Hello world\nhello world\ndemo",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       12u,
       12u,
       fontDescriptions03,
@@ -1794,6 +1811,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "Hello world\nhello world\ndemo",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       24u,
       4u,
       fontDescriptions03,
@@ -1804,6 +1822,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "שלום עולם",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       9u,
       fontDescriptions07,
@@ -1814,6 +1833,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "שלום עולם",
       "/tizen/TizenSansHebrewRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       9u,
       fontDescriptions08,
@@ -1824,6 +1844,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "\xF0\x9F\x98\x81\xF0\x9F\x98\x82\xF0\x9F\x98\x83\xF0\x9F\x98\x84",
       "/tizen/BreezeColorEmoji.ttf",
       EMOJI_FONT_SIZE,
+      1.0f,
       0u,
       4u,
       fontDescriptions09,
@@ -1834,6 +1855,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "Hello world, שלום עולם, hello world, שלום עולם",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       46u,
       fontDescriptions10,
@@ -1844,6 +1866,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "WRC – The Official App",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       22u,
       fontDescriptions11,
@@ -1854,6 +1877,7 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
       "Hello \tworld",
       "/tizen/TizenSansRegular.ttf",
       TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      1.0f,
       0u,
       12u,
       fontDescriptions12,
@@ -1873,3 +1897,76 @@ int UtcDaliTextMultiLanguageValidateFonts01(void)
   tet_result(TET_PASS);
   END_TEST;
 }
+
+int UtcDaliTextMultiLanguageValidateFontsPerScriptCache(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextMultiLanguageValidateFontsPerScriptCache");
+
+  std::size_t MAX_VALIDATE_FONTS_PER_SCRIPT_CACHE_SIZE = 63u;
+  std::size_t VALIDATE_FONTS_PER_SCRIPT_REMAIN_COUNT   = 8u;
+
+  Dali::Toolkit::Text::Internal::ValidateFontsPerScript* validateFontsPerScript = new Dali::Toolkit::Text::Internal::ValidateFontsPerScript();
+
+  for(std::size_t i = 0u; i < MAX_VALIDATE_FONTS_PER_SCRIPT_CACHE_SIZE; i ++)
+  {
+    FontId fontId = i;
+    validateFontsPerScript->Cache(fontId);
+  }
+
+  DALI_TEST_EQUALS(MAX_VALIDATE_FONTS_PER_SCRIPT_CACHE_SIZE, validateFontsPerScript->mValidFonts.Count(), TEST_LOCATION);
+
+  FontId fontId = MAX_VALIDATE_FONTS_PER_SCRIPT_CACHE_SIZE;
+  validateFontsPerScript->Cache(fontId);
+
+  DALI_TEST_EQUALS(VALIDATE_FONTS_PER_SCRIPT_REMAIN_COUNT, validateFontsPerScript->mValidFonts.Count(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextMultiLanguageDefaultFontsCache(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextMultiLanguageDefaultFontsCache");
+
+  std::size_t MAX_DEFAULT_FONTS_CACHE_SIZE = 15;
+  std::size_t DEFAULT_FONTS_REMAIN_COUNT   = 2;
+
+  Dali::Toolkit::Text::Internal::DefaultFonts* defaultFontsPerScript = new Dali::Toolkit::Text::Internal::DefaultFonts();
+
+  for(std::size_t i = 0u; i < MAX_DEFAULT_FONTS_CACHE_SIZE; i ++)
+  {
+    TextAbstraction::FontDescription fontDescription;
+    FontId fontId = i;
+    defaultFontsPerScript->Cache(fontDescription, fontId);
+  }
+
+  DALI_TEST_EQUALS(MAX_DEFAULT_FONTS_CACHE_SIZE, defaultFontsPerScript->mFonts.size(), TEST_LOCATION);
+
+  TextAbstraction::FontDescription fontDescription;
+  FontId fontId = MAX_DEFAULT_FONTS_CACHE_SIZE;
+  defaultFontsPerScript->Cache(fontDescription, fontId);
+
+  DALI_TEST_EQUALS(DEFAULT_FONTS_REMAIN_COUNT, defaultFontsPerScript->mFonts.size(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextMultiLanguageLocaleChange(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextMultiLanguageLocaleChange");
+
+  Adaptor &adaptor = application.GetAdaptor();
+  MultilanguageSupport multilanguageSupport = MultilanguageSupport::Get();
+
+  std::string newLocale = "multi_TEST";
+  adaptor.LocaleChangedSignal().Emit(newLocale);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(newLocale.data(), GetImplementation(multilanguageSupport).GetLocale(), TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
index 8c056dd..774c1cb 100755
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
-#include <dali-toolkit/internal/text/shaper.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/internal/text/shaper.h>
 #include <toolkit-text-utils.h>
 
 using namespace Dali;
@@ -45,61 +45,61 @@ using namespace Text;
 
 namespace
 {
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
 
 struct GlyphInfoData
 {
-  FontId fontId;     ///< Identifies the font containing the glyph
-  GlyphIndex index;  ///< Uniquely identifies a glyph for a given FontId
-  float width;       ///< The width of the glyph
-  float height;      ///< The height of the glyph
-  float xBearing;    ///< The distance from the cursor position to the leftmost border of the glyph
-  float yBearing;    ///< The distance from the baseline to the topmost border of the glyph
-  float advance;     ///< The distance to move the cursor for this glyph
-  float scaleFactor; ///< The scaling applied (fixed-size fonts only)
-  bool isItalicRequired; ///< Whether the italic style is required.
-  bool isBoldRequired;   ///< Whether the bold style is required.
+  FontId     fontId;           ///< Identifies the font containing the glyph
+  GlyphIndex index;            ///< Uniquely identifies a glyph for a given FontId
+  float      width;            ///< The width of the glyph
+  float      height;           ///< The height of the glyph
+  float      xBearing;         ///< The distance from the cursor position to the leftmost border of the glyph
+  float      yBearing;         ///< The distance from the baseline to the topmost border of the glyph
+  float      advance;          ///< The distance to move the cursor for this glyph
+  float      scaleFactor;      ///< The scaling applied (fixed-size fonts only)
+  bool       isItalicRequired; ///< Whether the italic style is required.
+  bool       isBoldRequired;   ///< Whether the bold style is required.
 };
 
-bool IsEqualGlyph ( const GlyphInfoData& glyphData, const GlyphInfo& glyph )
+bool IsEqualGlyph(const GlyphInfoData& glyphData, const GlyphInfo& glyph)
 {
-  if( glyphData.fontId != glyph.fontId )
+  if(glyphData.fontId != glyph.fontId)
   {
     return false;
   }
-  if( glyphData.index != glyph.index )
+  if(glyphData.index != glyph.index)
   {
     return false;
   }
-  if( fabsf( glyphData.width - glyph.width ) > Math::MACHINE_EPSILON_1000 )
+  if(fabsf(glyphData.width - glyph.width) > Math::MACHINE_EPSILON_1000)
   {
     return false;
   }
-  if( fabsf( glyphData.height - glyph.height ) > Math::MACHINE_EPSILON_1000 )
+  if(fabsf(glyphData.height - glyph.height) > Math::MACHINE_EPSILON_1000)
   {
     return false;
   }
-  if( fabsf( glyphData.xBearing - glyph.xBearing ) > Math::MACHINE_EPSILON_1000 )
+  if(fabsf(glyphData.xBearing - glyph.xBearing) > Math::MACHINE_EPSILON_1000)
   {
     return false;
   }
-  if( fabsf( glyphData.yBearing - glyph.yBearing ) > Math::MACHINE_EPSILON_1000 )
+  if(fabsf(glyphData.yBearing - glyph.yBearing) > Math::MACHINE_EPSILON_1000)
   {
     return false;
   }
-  if( fabsf( glyphData.advance - floor(glyph.advance) ) > Math::MACHINE_EPSILON_1000 )
+  if(glyphData.advance >= 0.0f && fabsf(glyphData.advance - round(glyph.advance)) > Math::MACHINE_EPSILON_1000)
   {
     return false;
   }
-  if( fabsf( glyphData.scaleFactor - glyph.scaleFactor ) > Math::MACHINE_EPSILON_1000 )
+  if(fabsf(glyphData.scaleFactor - glyph.scaleFactor) > Math::MACHINE_EPSILON_1000)
   {
     return false;
   }
-  if( glyphData.isItalicRequired != glyph.isItalicRequired )
+  if(glyphData.isItalicRequired != glyph.isItalicRequired)
   {
     return false;
   }
-  if( glyphData.isBoldRequired != glyph.isBoldRequired )
+  if(glyphData.isBoldRequired != glyph.isBoldRequired)
   {
     return false;
   }
@@ -109,97 +109,100 @@ bool IsEqualGlyph ( const GlyphInfoData& glyphData, const GlyphInfo& glyph )
 
 struct ShapeInfoData
 {
-  std::string     description;                        ///< Description of the test.
-  std::string     text;                               ///< input text.
-  uint32_t        index;                              ///< The index from where to start to query the break info.
-  uint32_t        numberOfCharacters;                 ///< The requested number of characters.
-  uint32_t        expectedNumberOfGlyphs;             ///< The expected number of glyphs.
-  GlyphInfoData*  glyphs;                             ///< The glyphs.
-  CharacterIndex* characterIndices;                   ///< The character index for each glyph.
-  Length*         charactersPerGlyph;                 ///< The characters per glyph.
-  uint32_t        expectedNumberOfNewParagraphGlyphs; ///< The expected number of glyphs.
-  GlyphIndex*     newParagraphGlyphs;                 ///< Indices to the new paragraphs glyphs.
-  Vector<FontDescriptionRun> fontDescriptions;        ///< Fonts which is used for text.
+  std::string                description;                        ///< Description of the test.
+  std::string                text;                               ///< input text.
+  uint32_t                   index;                              ///< The index from where to start to query the break info.
+  uint32_t                   numberOfCharacters;                 ///< The requested number of characters.
+  uint32_t                   expectedNumberOfGlyphs;             ///< The expected number of glyphs.
+  GlyphInfoData*             glyphs;                             ///< The glyphs.
+  CharacterIndex*            characterIndices;                   ///< The character index for each glyph.
+  Length*                    charactersPerGlyph;                 ///< The characters per glyph.
+  uint32_t                   expectedNumberOfNewParagraphGlyphs; ///< The expected number of glyphs.
+  GlyphIndex*                newParagraphGlyphs;                 ///< Indices to the new paragraphs glyphs.
+  bool                       markupProcessorEnabled;             //< Enable markup processor to use markup text.
+  Vector<FontDescriptionRun> fontDescriptions;                   ///< Fonts which is used for text.
 };
 
-bool ShapeInfoTest( const ShapeInfoData& data )
+bool ShapeInfoTest(const ShapeInfoData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-
-  CreateTextModel( data.text,
-                   textArea,
-                   data.fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+
+  CreateTextModel(data.text,
+                  textArea,
+                  data.fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  data.markupProcessorEnabled,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
   // 2) Clear the model.
 
-  Vector<GlyphInfo>& glyphs = visualModel->mGlyphs;
-  Vector<CharacterIndex>& glyphToCharacter = visualModel->mGlyphsToCharacters;
-  Vector<Length>& charactersPerGlyph = visualModel->mCharactersPerGlyph;
-  Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
-  Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
+  Vector<GlyphInfo>&      glyphs             = visualModel->mGlyphs;
+  Vector<CharacterIndex>& glyphToCharacter   = visualModel->mGlyphsToCharacters;
+  Vector<Length>&         charactersPerGlyph = visualModel->mCharactersPerGlyph;
+  Vector<GlyphIndex>&     charactersToGlyph  = visualModel->mCharactersToGlyph;
+  Vector<Length>&         glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
 
   // Get the glyph index.
   GlyphIndex glyphIndex = 0u;
-  if( 0u != visualModel->mCharactersToGlyph.Count() )
+  if(0u != visualModel->mCharactersToGlyph.Count())
   {
-    glyphIndex = *( visualModel->mCharactersToGlyph.Begin() + data.index );
+    glyphIndex = *(visualModel->mCharactersToGlyph.Begin() + data.index);
 
     const CharacterIndex lastCharacterIndex = data.index + data.numberOfCharacters - 1u;
-    const Length numberOfGlyphs = *( visualModel->mCharactersToGlyph.Begin() + lastCharacterIndex ) + *( visualModel->mGlyphsPerCharacter.Begin() + lastCharacterIndex ) - glyphIndex;
+    const Length         numberOfGlyphs     = *(visualModel->mCharactersToGlyph.Begin() + lastCharacterIndex) + *(visualModel->mGlyphsPerCharacter.Begin() + lastCharacterIndex) - glyphIndex;
 
     // Erase the glyph info from the text model.
     // Got from the ShapeText() function.
-    glyphs.Erase( glyphs.Begin() + glyphIndex, glyphs.Begin() + glyphIndex + numberOfGlyphs );
-    glyphToCharacter.Erase( glyphToCharacter.Begin() + glyphIndex, glyphToCharacter.Begin() + glyphIndex + numberOfGlyphs );
-    charactersPerGlyph.Erase( charactersPerGlyph.Begin() + glyphIndex, charactersPerGlyph.Begin() + glyphIndex + numberOfGlyphs );
+    glyphs.Erase(glyphs.Begin() + glyphIndex, glyphs.Begin() + glyphIndex + numberOfGlyphs);
+    glyphToCharacter.Erase(glyphToCharacter.Begin() + glyphIndex, glyphToCharacter.Begin() + glyphIndex + numberOfGlyphs);
+    charactersPerGlyph.Erase(charactersPerGlyph.Begin() + glyphIndex, charactersPerGlyph.Begin() + glyphIndex + numberOfGlyphs);
 
     // Got from the VisualModel::CreateCharacterToGlyphTable() and the VisualModel::CreateGlyphsPerCharacterTable() methods.
-    charactersToGlyph.Erase( charactersToGlyph.Begin() + data.index,
-                             charactersToGlyph.Begin() + data.index + data.numberOfCharacters );
-    glyphsPerCharacter.Erase( glyphsPerCharacter.Begin() + data.index,
-                              glyphsPerCharacter.Begin() + data.index + data.numberOfCharacters );
+    charactersToGlyph.Erase(charactersToGlyph.Begin() + data.index,
+                            charactersToGlyph.Begin() + data.index + data.numberOfCharacters);
+    glyphsPerCharacter.Erase(glyphsPerCharacter.Begin() + data.index,
+                             glyphsPerCharacter.Begin() + data.index + data.numberOfCharacters);
 
     // Update the glyph to character indices.
-    for( Vector<CharacterIndex>::Iterator it = glyphToCharacter.Begin() + glyphIndex,
-           endIt = glyphToCharacter.End();
-         it != endIt;
-         ++it )
+    for(Vector<CharacterIndex>::Iterator it    = glyphToCharacter.Begin() + glyphIndex,
+                                         endIt = glyphToCharacter.End();
+        it != endIt;
+        ++it)
     {
       CharacterIndex& index = *it;
       index -= data.numberOfCharacters;
     }
-
   }
 
   // Reset the metrics got from the model as the ShapeText() function doesn't retrieve them.
-  for( Vector<GlyphInfo>::Iterator it = glyphs.Begin(),
-         endIt = glyphs.End();
-       it != endIt;
-       ++it )
+  for(Vector<GlyphInfo>::Iterator it    = glyphs.Begin(),
+                                  endIt = glyphs.End();
+      it != endIt;
+      ++it)
   {
-    GlyphInfo& info = *it;
-    info.width = 0.f;
-    info.height = 0.f;
-    info.xBearing = 0.f;
-    info.yBearing = 0.f;
+    GlyphInfo& info  = *it;
+    info.width       = 0.f;
+    info.height      = 0.f;
+    info.xBearing    = 0.f;
+    info.yBearing    = 0.f;
     info.scaleFactor = 0.f;
   }
 
@@ -207,39 +210,39 @@ bool ShapeInfoTest( const ShapeInfoData& data )
 
   Vector<GlyphIndex> newParagraphGlyphs;
 
-  ShapeText( logicalModel->mText,
-             logicalModel->mLineBreakInfo,
-             logicalModel->mScriptRuns,
-             logicalModel->mFontRuns,
-             data.index,
-             glyphIndex,
-             data.numberOfCharacters,
-             glyphs,
-             glyphToCharacter,
-             charactersPerGlyph,
-             newParagraphGlyphs );
+  ShapeText(logicalModel->mText,
+            logicalModel->mLineBreakInfo,
+            logicalModel->mScriptRuns,
+            logicalModel->mFontRuns,
+            data.index,
+            glyphIndex,
+            data.numberOfCharacters,
+            glyphs,
+            glyphToCharacter,
+            charactersPerGlyph,
+            newParagraphGlyphs);
 
   // Clear the advance of the new paragraph glyphs.
-  for( Vector<GlyphIndex>::Iterator it = newParagraphGlyphs.Begin(),
-         endIt = newParagraphGlyphs.End();
-       it != endIt;
-       ++it )
+  for(Vector<GlyphIndex>::Iterator it    = newParagraphGlyphs.Begin(),
+                                   endIt = newParagraphGlyphs.End();
+      it != endIt;
+      ++it)
   {
-    GlyphInfo& info = *( glyphs.Begin() + *it );
-    info.advance = 0.f;
+    GlyphInfo& info = *(glyphs.Begin() + *it);
+    info.advance    = 0.f;
   }
 
   // 4) Compare the results.
 
-  if( data.expectedNumberOfGlyphs != glyphs.Count() )
+  if(data.expectedNumberOfGlyphs != glyphs.Count())
   {
     std::cout << "  Different number of glyphs : " << glyphs.Count() << ", expected : " << data.expectedNumberOfGlyphs << std::endl;
     return false;
   }
 
-  for( unsigned int index = 0u; index < data.expectedNumberOfGlyphs; ++index )
+  for(unsigned int index = 0u; index < data.expectedNumberOfGlyphs; ++index)
   {
-    if( !IsEqualGlyph( data.glyphs[index], glyphs[index] ) )
+    if(!IsEqualGlyph(data.glyphs[index], glyphs[index]))
     {
       std::cout << "  different glyph info, index : " << index << std::endl;
 
@@ -250,7 +253,7 @@ bool ShapeInfoTest( const ShapeInfoData& data )
       std::cout << "            height : " << glyphInfo.height << std::endl;
       std::cout << "          xBearing : " << glyphInfo.xBearing << std::endl;
       std::cout << "          yBearing : " << glyphInfo.yBearing << std::endl;
-      std::cout << "           advance : " << floor(glyphInfo.advance) << std::endl;
+      std::cout << "           advance : " << round(glyphInfo.advance) << std::endl;
       std::cout << "       scaleFactor : " << glyphInfo.scaleFactor << std::endl;
       std::cout << "  isItalicRequired : " << glyphInfo.isItalicRequired << std::endl;
       std::cout << "    isBoldRequired : " << glyphInfo.isBoldRequired << std::endl;
@@ -268,38 +271,37 @@ bool ShapeInfoTest( const ShapeInfoData& data )
       std::cout << "  isItalicRequired : " << expectedGlyphInfo.isItalicRequired << std::endl;
       std::cout << "    isBoldRequired : " << expectedGlyphInfo.isBoldRequired << std::endl;
 
-
       return false;
     }
   }
 
-  for( unsigned int index = 0u; index < data.expectedNumberOfGlyphs; ++index )
+  for(unsigned int index = 0u; index < data.expectedNumberOfGlyphs; ++index)
   {
-    if( data.characterIndices[index] != glyphToCharacter[index] )
+    if(data.characterIndices[index] != glyphToCharacter[index])
     {
       std::cout << "  different character index, index : " << index << std::endl;
       return false;
     }
   }
 
-  for( unsigned int index = 0u; index < data.expectedNumberOfGlyphs; ++index )
+  for(unsigned int index = 0u; index < data.expectedNumberOfGlyphs; ++index)
   {
-    if( data.charactersPerGlyph[index] != charactersPerGlyph[index] )
+    if(data.charactersPerGlyph[index] != charactersPerGlyph[index])
     {
       std::cout << "  different character per glyph, index : " << index << std::endl;
       return false;
     }
   }
 
-  if( data.expectedNumberOfNewParagraphGlyphs != newParagraphGlyphs.Count() )
+  if(data.expectedNumberOfNewParagraphGlyphs != newParagraphGlyphs.Count())
   {
     std::cout << "  Different number of new paragraph glyphs : " << newParagraphGlyphs.Count() << ", expected : " << data.expectedNumberOfNewParagraphGlyphs << std::endl;
     return false;
   }
 
-  for( unsigned int index = 0u; index < data.expectedNumberOfNewParagraphGlyphs; ++index )
+  for(unsigned int index = 0u; index < data.expectedNumberOfNewParagraphGlyphs; ++index)
   {
-    if( data.newParagraphGlyphs[index] != newParagraphGlyphs[index] )
+    if(data.newParagraphGlyphs[index] != newParagraphGlyphs[index])
     {
       std::cout << "  different new paragraph glyph, index : " << index << std::endl;
       return false;
@@ -312,29 +314,56 @@ bool ShapeInfoTest( const ShapeInfoData& data )
 void LoadTextShapeFonts()
 {
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/noto/NotoSansMalayalam-Regular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/noto/NotoSansMalayalam-Regular.ttf");
 }
 
 void LoadSoftwareStylingFonts()
 {
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-Regular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-Bold.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-Italic.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-BoldItalic.ttf");
+}
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-Regular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-Bold.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-Italic.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/roboto/Roboto-BoldItalic.ttf" );
+void LoadEmojiFonts()
+{
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.ClearCache();
+  fontClient.SetDpi(96u, 96u);
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  TextAbstraction::FontDescription fontDescriptionText;
+  fontDescriptionText.path   = "";
+  fontDescriptionText.family = "DejaVuSans";
+  fontDescriptionText.width  = TextAbstraction::FontWidth::NONE;
+  fontDescriptionText.weight = TextAbstraction::FontWeight::NORMAL;
+  fontDescriptionText.slant  = TextAbstraction::FontSlant::NONE;
+  fontClient.GetFontId(fontDescriptionText, TextAbstraction::FontClient::DEFAULT_POINT_SIZE);
+
+  TextAbstraction::FontDescription fontDescriptionEmoji;
+  fontDescriptionEmoji.path   = "";
+  fontDescriptionEmoji.family = "NotoColorEmoji";
+  fontDescriptionEmoji.width  = TextAbstraction::FontWidth::NONE;
+  fontDescriptionEmoji.weight = TextAbstraction::FontWeight::NORMAL;
+  fontDescriptionEmoji.slant  = TextAbstraction::FontSlant::NONE;
+  fontClient.GetFontId(fontDescriptionEmoji, TextAbstraction::FontClient::DEFAULT_POINT_SIZE);
 }
 
 } // namespace
@@ -346,164 +375,150 @@ int UtcDaliTextShape(void)
   tet_infoline(" UtcDaliTextShape");
 
   struct GlyphInfoData glyphs02[] =
-  {
-    { 1u, 276u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 306u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 306u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u,   3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 317u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 312u, 0.f, 0.f, 0.f, 0.f,  6.f, 0.f },
-    { 1u, 306u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 298u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-  };
-
-  CharacterIndex characterIndices02[] = { 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u };
-  Length charactersPerGlyph02[] = { 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u };
+    {
+      {1u, 276u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 306u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 306u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 317u, 0.f, 0.f, 0.f, 0.f, 12.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 312u, 0.f, 0.f, 0.f, 0.f, 6.f, 0.f},
+      {1u, 306u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 298u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+    };
+
+  CharacterIndex characterIndices02[]   = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u};
+  Length         charactersPerGlyph02[] = {1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u};
 
   struct GlyphInfoData glyphs03[] =
-  {
-    { 1u, 276u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 306u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 306u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u,   3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 317u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 312u, 0.f, 0.f, 0.f, 0.f,  6.f, 0.f },
-    { 1u, 306u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 298u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u,   0u, 0.f, 0.f, 0.f, 0.f,  0.f, 0.f },
-    { 1u, 298u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 307u, 0.f, 0.f, 0.f, 0.f, 13.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u,   0u, 0.f, 0.f, 0.f, 0.f,  0.f, 0.f },
-  };
-
-  CharacterIndex characterIndices03[] = { 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, 16u };
-  Length charactersPerGlyph03[] = { 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u };
-  CharacterIndex newParagraphGlyphs03[] = { 11u, 16u };
+    {
+      {1u, 276u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 306u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 306u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 317u, 0.f, 0.f, 0.f, 0.f, 12.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 312u, 0.f, 0.f, 0.f, 0.f, 6.f, 0.f},
+      {1u, 306u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 298u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 0u, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},
+      {1u, 298u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 307u, 0.f, 0.f, 0.f, 0.f, 14.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 0u, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},
+    };
+
+  CharacterIndex characterIndices03[]   = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, 16u};
+  Length         charactersPerGlyph03[] = {1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u};
+  CharacterIndex newParagraphGlyphs03[] = {11u, 16u};
 
   struct GlyphInfoData glyphs04[] =
-  {
-    { 2u, 67u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 2u, 27u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f },
-    { 2u, 59u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 2u, 67u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 2u, 55u, 0.f, 0.f, 0.f, 0.f, 19.f, 0.f },
-    { 2u, 59u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 2u, 67u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 2u, 56u, 0.f, 0.f, 0.f, 0.f, 19.f, 0.f },
-    { 2u, 59u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 2u, 67u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 2u, 52u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f },
-    { 2u, 59u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-  };
-
-  CharacterIndex characterIndices04[] = { 0u, 0u, 0u, 2u, 2u, 2u, 4u, 4u, 4u, 6u, 6u, 6u };
-  Length charactersPerGlyph04[] = { 0u, 0u, 2u, 0u, 0u, 2u, 0u, 0u, 2u, 0u, 0u, 2u };
+    {
+      {2u, 67u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f},
+      {2u, 27u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f},
+      {2u, 59u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {2u, 67u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f},
+      {2u, 55u, 0.f, 0.f, 0.f, 0.f, 20.f, 0.f},
+      {2u, 59u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {2u, 67u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f},
+      {2u, 56u, 0.f, 0.f, 0.f, 0.f, 19.f, 0.f},
+      {2u, 59u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {2u, 67u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f},
+      {2u, 52u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f},
+      {2u, 59u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+    };
+
+  CharacterIndex characterIndices04[]   = {0u, 0u, 0u, 2u, 2u, 2u, 4u, 4u, 4u, 6u, 6u, 6u};
+  Length         charactersPerGlyph04[] = {0u, 0u, 2u, 0u, 0u, 2u, 0u, 0u, 2u, 0u, 0u, 2u};
 
   struct GlyphInfoData glyphs05[] =
-  {
-    { 1u, 280u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 312u, 0.f, 0.f, 0.f, 0.f,  5.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 307u, 0.f, 0.f, 0.f, 0.f, 13.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 303u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 310u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 313u, 0.f, 0.f, 0.f, 0.f,  7.f, 0.f },
-    { 1u, 315u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 307u, 0.f, 0.f, 0.f, 0.f, 13.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 298u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 306u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 312u, 0.f, 0.f, 0.f, 0.f,  6.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 313u, 0.f, 0.f, 0.f, 0.f,  7.f, 0.f },
-    { 1u, 303u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 314u, 0.f, 0.f, 0.f, 0.f,  6.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 295u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 307u, 0.f, 0.f, 0.f, 0.f, 13.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 314u, 0.f, 0.f, 0.f, 0.f,  6.f, 0.f },
-    { 1u,  0u, 0.f, 0.f, 0.f, 0.f,  0.f, 0.f },
-    { 1u, 295u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 311u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 315u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 298u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 403u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 308u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 303u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 296u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 295u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 313u, 0.f, 0.f, 0.f, 0.f,  7.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 295u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 307u, 0.f, 0.f, 0.f, 0.f, 13.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 303u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u,  0u, 0.f, 0.f, 0.f, 0.f,  0.f, 0.f },
-    { 1u, 310u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 309u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 313u, 0.f, 0.f, 0.f, 0.f,  7.f, 0.f },
-    { 1u, 313u, 0.f, 0.f, 0.f, 0.f,  7.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 303u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 312u, 0.f, 0.f, 0.f, 0.f,  5.f, 0.f },
-    { 1u, 295u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 297u, 0.f, 0.f, 0.f, 0.f,  7.f, 0.f },
-    { 1u, 315u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 308u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 298u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 303u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 295u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 308u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f },
-    { 1u, 299u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u,  3u, 0.f, 0.f, 0.f, 0.f,  4.f, 0.f },
-    { 1u, 297u, 0.f, 0.f, 0.f, 0.f,  7.f, 0.f },
-    { 1u, 315u, 0.f, 0.f, 0.f, 0.f,  8.f, 0.f },
-    { 1u, 307u, 0.f, 0.f, 0.f, 0.f, 13.f, 0.f },
-    { 1u,  4u, 0.f, 0.f, 0.f, 0.f,  3.f, 0.f },
-    { 1u,  0u, 0.f, 0.f, 0.f, 0.f,  0.f, 0.f },
-  };
-
-  CharacterIndex characterIndices05[] = {  0u,  1u,  2u,  3u,  4u,  5u,  6u,  7u,  8u,  9u,
-                                          10u, 11u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u,
-                                          20u, 21u, 22u, 23u, 24u, 25u, 26u, 27u, 28u, 29u,
-                                          30u, 31u, 32u, 33u, 34u, 35u, 37u, 38u, 39u, 40u,
-                                          41u, 42u, 43u, 44u, 45u, 46u, 47u, 48u, 49u, 50u,
-                                          51u, 52u, 53u, 54u, 55u, 56u, 57u, 58u, 59u, 60u,
-                                          61u, 62u, 63u, 64u, 65u, 66u, 67u, 68u, 69u, 70u,
-                                          71u, 72u, 73u, 74u };
-  Length charactersPerGlyph05[] = { 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u, 1u, 2u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u };
-  CharacterIndex newParagraphGlyphs05[] = { 26u };
-  CharacterIndex newParagraphGlyphs06[] = { 49u };
-  CharacterIndex newParagraphGlyphs07[] = { 73u };
+    {
+      {1u, 280u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 312u, 0.f, 0.f, 0.f, 0.f, 6.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 307u, 0.f, 0.f, 0.f, 0.f, 14.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 303u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 310u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 313u, 0.f, 0.f, 0.f, 0.f, 7.f, 0.f},
+      {1u, 315u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 307u, 0.f, 0.f, 0.f, 0.f, 14.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 298u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 306u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 312u, 0.f, 0.f, 0.f, 0.f, 6.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 313u, 0.f, 0.f, 0.f, 0.f, 7.f, 0.f},
+      {1u, 303u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 314u, 0.f, 0.f, 0.f, 0.f, 6.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 295u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 307u, 0.f, 0.f, 0.f, 0.f, 14.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 314u, 0.f, 0.f, 0.f, 0.f, 6.f, 0.f},
+      {1u, 0u, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},
+      {1u, 295u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 311u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 315u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 298u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 403u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f},
+      {1u, 308u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 303u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 296u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 295u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 313u, 0.f, 0.f, 0.f, 0.f, 7.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 295u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 307u, 0.f, 0.f, 0.f, 0.f, 14.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 303u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 0u, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},
+      {1u, 310u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 309u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 313u, 0.f, 0.f, 0.f, 0.f, 7.f, 0.f},
+      {1u, 313u, 0.f, 0.f, 0.f, 0.f, 7.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 303u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 312u, 0.f, 0.f, 0.f, 0.f, 6.f, 0.f},
+      {1u, 295u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 297u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 315u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 308u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 298u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 303u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 295u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 308u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 299u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 297u, 0.f, 0.f, 0.f, 0.f, 8.f, 0.f},
+      {1u, 315u, 0.f, 0.f, 0.f, 0.f, 9.f, 0.f},
+      {1u, 307u, 0.f, 0.f, 0.f, 0.f, 14.f, 0.f},
+      {1u, 4u, 0.f, 0.f, 0.f, 0.f, 4.f, 0.f},
+      {1u, 0u, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f},
+    };
+
+  CharacterIndex characterIndices05[]   = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u, 22u, 23u, 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, 32u, 33u, 34u, 35u, 37u, 38u, 39u, 40u, 41u, 42u, 43u, 44u, 45u, 46u, 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, 64u, 65u, 66u, 67u, 68u, 69u, 70u, 71u, 72u, 73u, 74u};
+  Length         charactersPerGlyph05[] = {1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 2u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u};
+  CharacterIndex newParagraphGlyphs05[] = {26u};
+  CharacterIndex newParagraphGlyphs06[] = {49u};
+  CharacterIndex newParagraphGlyphs07[] = {73u};
 
   Vector<FontDescriptionRun> fontDescriptions01;
   Vector<FontDescriptionRun> fontDescriptions02;
@@ -512,254 +527,233 @@ int UtcDaliTextShape(void)
   Vector<FontDescriptionRun> fontDescriptions05;
   Vector<FontDescriptionRun> fontDescriptions06;
 
-  const std::string fontFamily( "TizenSans" );
-  const std::string fontFamilyMalayalam( "Noto Sans Malayalam" );
+  const std::string fontFamily("TizenSans");
+  const std::string fontFamilyMalayalam("Noto Sans Malayalam");
 
   FontDescriptionRun fontDescriptionRun01 =
-  {
     {
+      {0u,
+       11u},
+      nullptr,
       0u,
-      11u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    false,
-    false
-  };
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      false,
+      false};
   fontDescriptionRun01.familyLength = fontFamily.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontFamily.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyName   = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontFamily.c_str(), fontDescriptionRun01.familyLength);
 
-  fontDescriptions01.PushBack( fontDescriptionRun01 );
+  fontDescriptions01.PushBack(fontDescriptionRun01);
 
   FontDescriptionRun fontDescriptionRun02 =
-  {
     {
+      {0u,
+       17u},
+      nullptr,
       0u,
-      17u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    false,
-    false
-  };
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      false,
+      false};
   fontDescriptionRun02.familyLength = fontFamily.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyName   = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength);
 
-  fontDescriptions02.PushBack( fontDescriptionRun02 );
+  fontDescriptions02.PushBack(fontDescriptionRun02);
 
   FontDescriptionRun fontDescriptionRun03 =
-  {
     {
+      {0u,
+       8u},
+      nullptr,
       0u,
-      8u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    false,
-    false
-  };
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      false,
+      false};
   fontDescriptionRun03.familyLength = fontFamilyMalayalam.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontFamilyMalayalam.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyName   = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontFamilyMalayalam.c_str(), fontDescriptionRun03.familyLength);
 
-  fontDescriptions03.PushBack( fontDescriptionRun03 );
+  fontDescriptions03.PushBack(fontDescriptionRun03);
 
   FontDescriptionRun fontDescriptionRun04 =
-  {
     {
+      {0u,
+       75u},
+      nullptr,
       0u,
-      75u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    false,
-    false
-  };
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      false,
+      false};
   fontDescriptionRun04.familyLength = fontFamily.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontFamily.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyName   = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontFamily.c_str(), fontDescriptionRun04.familyLength);
 
-  fontDescriptions04.PushBack( fontDescriptionRun04 );
+  fontDescriptions04.PushBack(fontDescriptionRun04);
 
   FontDescriptionRun fontDescriptionRun05 =
-  {
     {
+      {0u,
+       75u},
+      nullptr,
       0u,
-      75u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    false,
-    false
-  };
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      false,
+      false};
   fontDescriptionRun05.familyLength = fontFamily.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontFamily.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyName   = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontFamily.c_str(), fontDescriptionRun05.familyLength);
 
-  fontDescriptions05.PushBack( fontDescriptionRun05 );
+  fontDescriptions05.PushBack(fontDescriptionRun05);
 
   FontDescriptionRun fontDescriptionRun06 =
-  {
     {
+      {0u,
+       75u},
+      nullptr,
       0u,
-      75u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    false,
-    false
-  };
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      false,
+      false};
   fontDescriptionRun06.familyLength = fontFamily.size();
-  fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength];
-  memcpy( fontDescriptionRun06.familyName, fontFamily.c_str(), fontDescriptionRun06.familyLength );
+  fontDescriptionRun06.familyName   = new char[fontDescriptionRun06.familyLength];
+  memcpy(fontDescriptionRun06.familyName, fontFamily.c_str(), fontDescriptionRun06.familyLength);
 
-  fontDescriptions06.PushBack( fontDescriptionRun06 );
+  fontDescriptions06.PushBack(fontDescriptionRun06);
 
   struct ShapeInfoData data[] =
-  {
-    {
-      "Zero characters",
-      "",
-      0u,
-      0u,
-      0u,
-      nullptr,
-      nullptr,
-      nullptr,
-      0u,
-      nullptr
-    },
-    {
-      "Latin script",
-      "Hello world",
-      0u,
-      11u,
-      11u,
-      glyphs02,
-      characterIndices02,
-      charactersPerGlyph02,
-      0u,
-      nullptr,
-      fontDescriptions01
-    },
-    {
-      "Latin script. Some paragraphs.",
-      "Hello world\ndemo\n",
-      0u,
-      17u,
-      17u,
-      glyphs03,
-      characterIndices03,
-      charactersPerGlyph03,
-      2u,
-      newParagraphGlyphs03,
-      fontDescriptions02
-    },
-    {
-      "Malayalam script. More glyphs than characters.",
-      "ജോസോഹോവോ",
-      0u,
-      8u,
-      12u,
-      glyphs04,
-      characterIndices04,
-      charactersPerGlyph04,
-      0u,
-      nullptr,
-      fontDescriptions03
-    },
-    {
-      "Latin script with some paragraphs. Update initial paragraph.",
-      "Lorem ipsum dolor sit amet\naeque definiebas ea mei\nposse iracundia ne cum.\n",
-      0u,
-      27u,
-      74u,
-      glyphs05,
-      characterIndices05,
-      charactersPerGlyph05,
-      1u,
-      newParagraphGlyphs05,
-      fontDescriptions04
-    },
-    {
-      "Latin script with some paragraphs. Update mid paragraph.",
-      "Lorem ipsum dolor sit amet\naeque definiebas ea mei\nposse iracundia ne cum.\n",
-      27u,
-      24u,
-      74u,
-      glyphs05,
-      characterIndices05,
-      charactersPerGlyph05,
-      1u,
-      newParagraphGlyphs06,
-      fontDescriptions05
-    },
     {
-      "Latin script with some paragraphs. Update final paragraph.",
-      "Lorem ipsum dolor sit amet\naeque definiebas ea mei\nposse iracundia ne cum.\n",
-      51u,
-      24u,
-      74u,
-      glyphs05,
-      characterIndices05,
-      charactersPerGlyph05,
-      1u,
-      newParagraphGlyphs07,
-      fontDescriptions06
-    },
-  };
+      {
+        "Zero characters",
+        "",
+        0u,
+        0u,
+        0u,
+        nullptr,
+        nullptr,
+        nullptr,
+        0u,
+        nullptr,
+        false,
+      },
+      {"Latin script",
+       "Hello world",
+       0u,
+       11u,
+       11u,
+       glyphs02,
+       characterIndices02,
+       charactersPerGlyph02,
+       0u,
+       nullptr,
+       false,
+       fontDescriptions01},
+      {"Latin script. Some paragraphs.",
+       "Hello world\ndemo\n",
+       0u,
+       17u,
+       17u,
+       glyphs03,
+       characterIndices03,
+       charactersPerGlyph03,
+       2u,
+       newParagraphGlyphs03,
+       false,
+       fontDescriptions02},
+      {"Malayalam script. More glyphs than characters.",
+       "ജോസോഹോവോ",
+       0u,
+       8u,
+       12u,
+       glyphs04,
+       characterIndices04,
+       charactersPerGlyph04,
+       0u,
+       nullptr,
+       false,
+       fontDescriptions03},
+      {
+        "Latin script with some paragraphs. Update initial paragraph.",
+        "Lorem ipsum dolor sit amet\naeque definiebas ea mei\nposse iracundia ne cum.\n",
+        0u,
+        27u,
+        74u,
+        glyphs05,
+        characterIndices05,
+        charactersPerGlyph05,
+        1u,
+        newParagraphGlyphs05,
+        false,
+        fontDescriptions04,
+      },
+      {"Latin script with some paragraphs. Update mid paragraph.",
+       "Lorem ipsum dolor sit amet\naeque definiebas ea mei\nposse iracundia ne cum.\n",
+       27u,
+       24u,
+       74u,
+       glyphs05,
+       characterIndices05,
+       charactersPerGlyph05,
+       1u,
+       newParagraphGlyphs06,
+       false,
+       fontDescriptions05},
+      {"Latin script with some paragraphs. Update final paragraph.",
+       "Lorem ipsum dolor sit amet\naeque definiebas ea mei\nposse iracundia ne cum.\n",
+       51u,
+       24u,
+       74u,
+       glyphs05,
+       characterIndices05,
+       charactersPerGlyph05,
+       1u,
+       newParagraphGlyphs07,
+       false,
+       fontDescriptions06},
+    };
   const unsigned int numberOfTests = 7u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
     LoadTextShapeFonts();
 
-    if( !ShapeInfoTest( data[index] ) )
+    if(!ShapeInfoTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -774,184 +768,287 @@ int UtcDaliTextSoftwareStyling(void)
   tet_infoline(" UtcDaliTextSoftwareStyling");
 
   struct GlyphInfoData glyphs01[] =
-  {
-    { 4u, 38u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true },
-    { 4u, 39u, 0.f, 0.f, 0.f, 0.f,  9.f, 0.f, true, true },
-    { 4u, 40u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true },
-    { 4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true },
-  };
+    {
+      {4u, 38u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f, true, true},
+      {4u, 39u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
+      {4u, 40u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
+      {4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
+    };
   struct GlyphInfoData glyphs02[] =
-  {
-    { 1u, 38u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, false, false },
-    { 2u, 39u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, false,  true },
-    { 3u, 40u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true,  false },
-    { 4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true,   true },
-  };
+    {
+      {1u, 38u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, false, false},
+      {2u, 39u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, false, true},
+      {3u, 40u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, false},
+      {4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
+    };
 
-  CharacterIndex characterIndices[] = { 0u, 1u, 2u, 3u };
-  Length charactersPerGlyph[] = { 1u, 1u, 1u, 1u };
+  CharacterIndex characterIndices[]   = {0u, 1u, 2u, 3u};
+  Length         charactersPerGlyph[] = {1u, 1u, 1u, 1u};
 
   Vector<FontDescriptionRun> fontDescriptions01;
   Vector<FontDescriptionRun> fontDescriptions02;
 
-  const std::string fontFamily( "Roboto" );
+  const std::string fontFamily("Roboto");
 
   FontDescriptionRun fontDescriptionRun01 =
-  {
     {
+      {0u,
+       4u},
+      nullptr,
       0u,
-      4u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::BOLD,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::ITALIC,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    true,
-    false,
-    true,
-    false
-  };
+      TextAbstraction::FontWeight::BOLD,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::ITALIC,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      true,
+      false,
+      true,
+      false};
   fontDescriptionRun01.familyLength = fontFamily.size();
-  fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength];
-  memcpy( fontDescriptionRun01.familyName, fontFamily.c_str(), fontDescriptionRun01.familyLength );
+  fontDescriptionRun01.familyName   = new char[fontDescriptionRun01.familyLength];
+  memcpy(fontDescriptionRun01.familyName, fontFamily.c_str(), fontDescriptionRun01.familyLength);
 
   fontDescriptions01.PushBack(fontDescriptionRun01);
 
   FontDescriptionRun fontDescriptionRun02 =
-  {
     {
+      {0u,
+       1u},
+      nullptr,
       0u,
-      1u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    false,
-    false
-  };
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      false,
+      false};
   fontDescriptionRun02.familyLength = fontFamily.size();
-  fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength];
-  memcpy( fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength );
+  fontDescriptionRun02.familyName   = new char[fontDescriptionRun02.familyLength];
+  memcpy(fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength);
 
   FontDescriptionRun fontDescriptionRun03 =
-  {
     {
-      1u,
-      1u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::BOLD,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::NONE,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    true,
-    false,
-    false,
-    false
-  };
+      {1u,
+       1u},
+      nullptr,
+      0u,
+      TextAbstraction::FontWeight::BOLD,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::NONE,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      true,
+      false,
+      false,
+      false};
   fontDescriptionRun03.familyLength = fontFamily.size();
-  fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength];
-  memcpy( fontDescriptionRun03.familyName, fontFamily.c_str(), fontDescriptionRun03.familyLength );
+  fontDescriptionRun03.familyName   = new char[fontDescriptionRun03.familyLength];
+  memcpy(fontDescriptionRun03.familyName, fontFamily.c_str(), fontDescriptionRun03.familyLength);
 
   FontDescriptionRun fontDescriptionRun04 =
-  {
     {
-      2u,
-      1u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::NONE,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::ITALIC,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    false,
-    false,
-    true,
-    false
-  };
+      {2u,
+       1u},
+      nullptr,
+      0u,
+      TextAbstraction::FontWeight::NONE,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::ITALIC,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      false,
+      false,
+      true,
+      false};
   fontDescriptionRun04.familyLength = fontFamily.size();
-  fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength];
-  memcpy( fontDescriptionRun04.familyName, fontFamily.c_str(), fontDescriptionRun04.familyLength );
+  fontDescriptionRun04.familyName   = new char[fontDescriptionRun04.familyLength];
+  memcpy(fontDescriptionRun04.familyName, fontFamily.c_str(), fontDescriptionRun04.familyLength);
 
   FontDescriptionRun fontDescriptionRun05 =
-  {
     {
-      3u,
-      1u
-    },
-    nullptr,
-    0u,
-    TextAbstraction::FontWeight::BOLD,
-    TextAbstraction::FontWidth::NONE,
-    TextAbstraction::FontSlant::ITALIC,
-    TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
-    true,
-    true,
-    false,
-    true,
-    false
-  };
+      {3u,
+       1u},
+      nullptr,
+      0u,
+      TextAbstraction::FontWeight::BOLD,
+      TextAbstraction::FontWidth::NONE,
+      TextAbstraction::FontSlant::ITALIC,
+      TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+      true,
+      true,
+      false,
+      true,
+      false};
   fontDescriptionRun05.familyLength = fontFamily.size();
-  fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength];
-  memcpy( fontDescriptionRun05.familyName, fontFamily.c_str(), fontDescriptionRun05.familyLength );
+  fontDescriptionRun05.familyName   = new char[fontDescriptionRun05.familyLength];
+  memcpy(fontDescriptionRun05.familyName, fontFamily.c_str(), fontDescriptionRun05.familyLength);
 
   fontDescriptions02.PushBack(fontDescriptionRun02);
   fontDescriptions02.PushBack(fontDescriptionRun03);
   fontDescriptions02.PushBack(fontDescriptionRun04);
   fontDescriptions02.PushBack(fontDescriptionRun05);
 
-
   struct ShapeInfoData data[] =
-  {
     {
-      "Latin script. Characters have same font description",
-      "ABCD",
-      0u,
-      4u,
-      4u,
-      glyphs01,
-      characterIndices,
-      charactersPerGlyph,
-      0u,
-      nullptr,
-      fontDescriptions01
-    },
-    {
-      "Latin script. Each character has different font description.",
-      "ABCD",
-      0u,
-      4u,
-      4u,
-      glyphs02,
-      characterIndices,
-      charactersPerGlyph,
-      0u,
-      nullptr,
-      fontDescriptions02
-    }
-  };
+      {"Latin script. Characters have same font description",
+       "ABCD",
+       0u,
+       4u,
+       4u,
+       glyphs01,
+       characterIndices,
+       charactersPerGlyph,
+       0u,
+       nullptr,
+       false,
+       fontDescriptions01},
+      {"Latin script. Each character has different font description.",
+       "ABCD",
+       0u,
+       4u,
+       4u,
+       glyphs02,
+       characterIndices,
+       charactersPerGlyph,
+       0u,
+       nullptr,
+       false,
+       fontDescriptions02}};
 
   const unsigned int numberOfTests = 2u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
     LoadSoftwareStylingFonts();
 
-    if( !ShapeInfoTest( data[index] ) )
+    if(!ShapeInfoTest(data[index]))
+    {
+      tet_result(TET_FAIL);
+    }
+  }
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextShapeEmojiSequences(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliTextShapeEmojiSequences");
+
+  const std::string colorFontFamily("NotoColorEmoji");
+  const std::string textFontFamily("DejaVuSans");
+
+  LoadEmojiFonts();
+
+  //Common attributes for font Descriptions
+  CharacterRun    characterRun = {0u, 2u};
+  FontWeight      weight       = TextAbstraction::FontWeight::NORMAL;
+  FontWidth       width        = TextAbstraction::FontWidth::NORMAL;
+  FontSlant       slant        = TextAbstraction::FontSlant::ITALIC;
+  PointSize26Dot6 size         = TextAbstraction::FontClient::DEFAULT_POINT_SIZE;
+
+  bool familyDefined = true;
+  bool weightDefined = false;
+  bool widthDefined  = false;
+  bool slantDefined  = false;
+  bool sizeDefined   = false;
+
+  // variation selector 16 (Emoji)
+  // Note : Non-scalable font's advance value is undefined. See https://github.com/harfbuzz/harfbuzz/discussions/3023. 2022-06-03 updated.
+  struct GlyphInfoData glyphsVS16[] =
+    {
+      {2u, 74u, 0.f, 0.f, 0.f, 0.f, -1.0f /* Special value that we don't check it */, 0.f, false, false},
+    };
+  CharacterIndex characterIndicesVS16[]   = {0u, 1u};
+  Length         charactersPerGlyphVS16[] = {2u};
+
+  // variation selector 15 (Text)
+  struct GlyphInfoData glyphsVS15[] =
+    {
+      {1u, 3842u, 0.f, 0.f, 0.f, 0.f, 14.0f, 0.f, false, false},
+      {1u, 3u, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, false, false},
+    };
+  CharacterIndex characterIndicesVS15[]   = {0u, 0u};
+  Length         charactersPerGlyphVS15[] = {0u, 2u};
+
+  //Font Descriptions
+  Vector<FontDescriptionRun> fontDescriptionsColorVS16 =
+    CreateSingleFontDescription(characterRun, colorFontFamily, weight, width, slant, size, familyDefined, weightDefined, widthDefined, slantDefined, sizeDefined);
+
+  Vector<FontDescriptionRun> fontDescriptionsColorVS15 =
+    CreateSingleFontDescription(characterRun, colorFontFamily, weight, width, slant, size, familyDefined, weightDefined, widthDefined, slantDefined, sizeDefined);
+
+  Vector<FontDescriptionRun> fontDescriptionsTextVS16 =
+    CreateSingleFontDescription(characterRun, textFontFamily, weight, width, slant, size, familyDefined, weightDefined, widthDefined, slantDefined, sizeDefined);
+
+  Vector<FontDescriptionRun> fontDescriptionsTextVS15 =
+    CreateSingleFontDescription(characterRun, textFontFamily, weight, width, slant, size, familyDefined, weightDefined, widthDefined, slantDefined, sizeDefined);
+
+  struct ShapeInfoData data[] =
+    {
+      {"EMOJI Sequence: Color Font with VS16",
+       "&#x262a;&#xfe0f;",
+       0u,
+       2u,
+       1u,
+       glyphsVS16,
+       characterIndicesVS16,
+       charactersPerGlyphVS16,
+       0u,
+       nullptr,
+       true,
+       fontDescriptionsColorVS16},
+      {"EMOJI Sequence: Color Font with VS15",
+       "&#x262a;&#xfe0e;",
+       0u,
+       2u,
+       2u,
+       glyphsVS15,
+       characterIndicesVS15,
+       charactersPerGlyphVS15,
+       0u,
+       nullptr,
+       true,
+       fontDescriptionsColorVS15},
+      {"EMOJI Sequence: Text Font with VS16",
+       "&#x262a;&#xfe0f;",
+       0u,
+       2u,
+       1u,
+       glyphsVS16,
+       characterIndicesVS16,
+       charactersPerGlyphVS16,
+       0u,
+       nullptr,
+       true,
+       fontDescriptionsTextVS16},
+      {"EMOJI Sequence: Text Font with VS15",
+       "&#x262a;&#xfe0e;",
+       0u,
+       2u,
+       2u,
+       glyphsVS15,
+       characterIndicesVS15,
+       charactersPerGlyphVS15,
+       0u,
+       nullptr,
+       true,
+       fontDescriptionsTextVS15},
+    };
+
+  const unsigned int numberOfTests = 4u;
+
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
+  {
+    tet_infoline(data[index].description.c_str());
+    if(!ShapeInfoTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
new file mode 100644
index 0000000..36125c5
--- /dev/null
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
@@ -0,0 +1,577 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-spannable.h>
+#include <dali-toolkit/devel-api/text/spannable-string.h>
+#include <dali-toolkit/devel-api/text/spans/background-color-span.h>
+#include <dali-toolkit/devel-api/text/spans/bold-span.h>
+#include <dali-toolkit/devel-api/text/spans/character-spacing-span.h>
+#include <dali-toolkit/devel-api/text/spans/font-span.h>
+#include <dali-toolkit/devel-api/text/spans/foreground-color-span.h>
+#include <dali-toolkit/devel-api/text/spans/italic-span.h>
+#include <dali-toolkit/devel-api/text/spans/strikethrough-span.h>
+#include <dali-toolkit/devel-api/text/spans/underline-span.h>
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/controls/text-controls/text-editor-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/text-label-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/rendering/text-typesetter.h>
+#include <dali-toolkit/internal/text/rendering/view-model.h>
+#include <dali-toolkit/internal/text/text-view.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+#include <toolkit-text-utils.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+namespace
+{
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
+const float       PIXEL_FORMAT_64_FACTOR = 64.f; ///< 64.f is used to convert from point size to 26.6 pixel format.
+} // namespace
+
+Text::SpannableString CreateSpannableStringForStrikethroughSpan()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello World");
+  DALI_TEST_CHECK(spannableString);
+
+  auto isAddedStrikethroughSpan = spannableString.AttachSpan(
+    Text::StrikethroughSpan::New(Color::GREEN, 5.0f),
+    Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isAddedStrikethroughSpan);
+
+  return spannableString;
+}
+
+Text::SpannableString CreateSpannableStringForForegroundColorSpan()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannableString);
+
+  auto isAddedGreen = spannableString.AttachSpan(
+    Text::ForegroundColorSpan::New(Color::GREEN),
+    Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isAddedGreen);
+
+  return spannableString;
+}
+
+Text::SpannableString CreateSpannableStringForFontSpan()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello World");
+  DALI_TEST_CHECK(spannableString);
+
+  auto isAddedFontSpan = spannableString.AttachSpan(
+    Text::FontSpan::New("TizenSans",
+                        45.0f,
+                        Dali::TextAbstraction::FontWeight::BOLD,
+                        Dali::TextAbstraction::FontWidth::SEMI_CONDENSED,
+                        Dali::TextAbstraction::FontSlant::OBLIQUE),
+    Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isAddedFontSpan);
+
+  return spannableString;
+}
+
+Text::SpannableString CreateSpannableStringForUnderlineSpan()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello World");
+  DALI_TEST_CHECK(spannableString);
+
+  auto isAddedUnderlineSpan = spannableString.AttachSpan(
+    Text::UnderlineSpan::NewDashed(Color::GREEN, 5.0f, 2.0f, 3.0f),
+    Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isAddedUnderlineSpan);
+
+  return spannableString;
+}
+
+Text::SpannableString CreateSpannableStringForCharacterSpacing()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello World");
+  DALI_TEST_CHECK(spannableString);
+
+  auto isCharacterSpacingSpan = spannableString.AttachSpan(
+    Text::CharacterSpacingSpan::New(5.2f),
+    Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isCharacterSpacingSpan);
+
+  return spannableString;
+}
+
+Text::SpannableString CreateSpannableStringForBoldSpan()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello");
+  DALI_TEST_CHECK(spannableString);
+
+  auto boldspan   = Dali::Toolkit::Text::BoldSpan::New();
+  auto isBoldSpan = spannableString.AttachSpan(boldspan, Dali::Toolkit::Text::Range::New(0u, 3u));
+  DALI_TEST_CHECK(isBoldSpan);
+
+  return spannableString;
+}
+
+Text::SpannableString CreateSpannableStringForItalicSpan()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello");
+  DALI_TEST_CHECK(spannableString);
+
+  auto isAddedItalic = spannableString.AttachSpan(
+    Text::ItalicSpan::New(),
+    Text::Range::New(0u, 3u));
+  DALI_TEST_CHECK(isAddedItalic);
+
+  return spannableString;
+}
+
+Text::SpannableString CreateSpannableStringForBackgroundColorSpan()
+{
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+
+  DALI_TEST_CHECK(spannableString);
+
+  auto isAddedGreen = spannableString.AttachSpan(
+    Text::BackgroundColorSpan::New(Color::GREEN),
+    Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isAddedGreen);
+
+  return spannableString;
+}
+
+void CheckColorIndices(const Text::ColorIndex* const colorIndicesBuffer,
+                       uint32_t                      numberOfIndices,
+                       std::vector<uint32_t>         indicesToCheck,
+                       std::vector<uint32_t>         expectedValues)
+{
+  DALI_TEST_CHECK(colorIndicesBuffer);
+
+  for(uint32_t i = 0u; i < numberOfIndices; i++)
+  {
+    DALI_TEST_EQUALS(colorIndicesBuffer[indicesToCheck[i]], expectedValues[i], TEST_LOCATION);
+  }
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextLabelSetSpannedText");
+
+  TextLabel textLabel = TextLabel::New();
+  DALI_TEST_CHECK(textLabel);
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForForegroundColorSpan();
+
+  Text::SetSpannedText(textLabel, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& labelImpl          = GetImpl(textLabel);
+  const Text::ColorIndex* const colorIndicesBuffer = labelImpl.GetTextController()->GetTextModel()->GetColorIndices();
+
+  CheckColorIndices(colorIndicesBuffer, 4u, {0u, 5u, 7u, 10u}, {0u, 1u, 1u, 0u});
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextEditorSetSpannedText(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextEditorSetSpannedText");
+
+  TextEditor textEditor = TextEditor::New();
+  DALI_TEST_CHECK(textEditor);
+  application.GetScene().Add(textEditor);
+
+  Text::SpannableString spannableString = CreateSpannableStringForForegroundColorSpan();
+
+  Text::SetSpannedText(textEditor, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextEditor& labelImpl          = GetImpl(textEditor);
+  const Text::ColorIndex* const  colorIndicesBuffer = labelImpl.GetTextController()->GetTextModel()->GetColorIndices();
+
+  CheckColorIndices(colorIndicesBuffer, 4u, {0u, 5u, 7u, 10u}, {0u, 1u, 1u, 0u});
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextFieldSetSpannedText(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFieldSetSpannedText");
+
+  TextField textField = TextField::New();
+  DALI_TEST_CHECK(textField);
+  application.GetScene().Add(textField);
+
+  Text::SpannableString spannableString = CreateSpannableStringForForegroundColorSpan();
+
+  Text::SetSpannedText(textField, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextField& labelImpl          = GetImpl(textField);
+  const Text::ColorIndex* const colorIndicesBuffer = labelImpl.GetTextController()->GetTextModel()->GetColorIndices();
+
+  CheckColorIndices(colorIndicesBuffer, 4u, {0u, 5u, 7u, 10u}, {0u, 1u, 1u, 0u});
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText_FontSpan(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextLabelSetSpannedText_FontSpan ");
+
+  // Load some fonts to get the same metrics on different platforms.
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.SetDpi(96u, 96u);
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+
+  TextLabel textLabel = TextLabel::New();
+  DALI_TEST_CHECK(textLabel);
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForFontSpan();
+
+  Text::SetSpannedText(textLabel, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel&               labelImpl     = GetImpl(textLabel);
+  const Vector<Dali::Toolkit::Text::FontRun>& validFontRuns = labelImpl.GetTextController()->GetTextModel()->GetFontRuns();
+
+  DALI_TEST_EQUALS(validFontRuns.Count(), 3u, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(validFontRuns[0].fontId, validFontRuns[2].fontId, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(validFontRuns[0].fontId, validFontRuns[1].fontId, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(validFontRuns[1].characterRun.characterIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontRuns[1].characterRun.GetEndCharacterIndex(), 7u, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontRuns[1].isItalicRequired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontRuns[1].isBoldRequired, true, TEST_LOCATION);
+
+  TextAbstraction::FontDescription spanFontDescription;
+
+  float expectedPointSize = 45.0f * PIXEL_FORMAT_64_FACTOR;
+  float fontPointSize     = fontClient.GetPointSize(validFontRuns[1].fontId);
+  DALI_TEST_EQUALS(fontPointSize, expectedPointSize, TEST_LOCATION);
+
+  const Vector<Dali::Toolkit::Text::FontDescriptionRun>& validFontDescriptionRuns = labelImpl.GetTextController()->GetTextModel()->GetFontDescriptionRuns();
+  DALI_TEST_EQUALS(validFontDescriptionRuns.Count(), 1u, TEST_LOCATION);
+  std::string familyName = std::string(validFontDescriptionRuns[0].familyName, validFontDescriptionRuns[0].familyLength);
+
+  DALI_TEST_EQUALS(familyName, "TizenSans", TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontDescriptionRuns[0].size, expectedPointSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontDescriptionRuns[0].weight, Dali::TextAbstraction::FontWeight::BOLD, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontDescriptionRuns[0].width, Dali::TextAbstraction::FontWidth::SEMI_CONDENSED, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontDescriptionRuns[0].slant, Dali::TextAbstraction::FontSlant::OBLIQUE, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextModelIsSpannedTextPlaced(void)
+
+{
+  tet_infoline(" UtcDaliTextModelIsSpannedTextPlaced");
+
+  ToolkitTestApplication application;
+
+  // Create spanned-text and set it
+  Text::SpannableString spannedText = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannedText);
+
+  // Creates a text controller.
+  Dali::Toolkit::Text::ControllerPtr         controllerTextEditor = Dali::Toolkit::Text::Controller::New();
+  const Dali::Toolkit::Text::ModelInterface* modelEditor          = controllerTextEditor->GetTextModel();
+
+  // Tests the rendering controller has been created.
+  Dali::Toolkit::Text::TypesetterPtr typesetterEditor = Dali::Toolkit::Text::Typesetter::New(controllerTextEditor->GetTextModel());
+  DALI_TEST_CHECK(typesetterEditor);
+
+  // Tests the view model has been created.
+  Dali::Toolkit::Text::ViewModel* viewModelEditor = typesetterEditor->GetViewModel();
+  DALI_TEST_CHECK(viewModelEditor);
+
+  // Configures the text controller similarly to the text-editor.
+  Dali::Toolkit::Text::ConfigureTextEditor(controllerTextEditor);
+
+  DALI_TEST_EQUALS(false, modelEditor->IsSpannedTextPlaced(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, viewModelEditor->IsSpannedTextPlaced(), TEST_LOCATION);
+
+  controllerTextEditor->SetSpannedText(spannedText);
+
+  DALI_TEST_EQUALS(true, modelEditor->IsSpannedTextPlaced(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, viewModelEditor->IsSpannedTextPlaced(), TEST_LOCATION);
+
+  // Creates a text controller.
+  Dali::Toolkit::Text::ControllerPtr         controllerTextLabel = Dali::Toolkit::Text::Controller::New();
+  const Dali::Toolkit::Text::ModelInterface* modelLabel          = controllerTextLabel->GetTextModel();
+
+  // Tests the rendering controller has been created.
+  Dali::Toolkit::Text::TypesetterPtr typesetterLabel = Dali::Toolkit::Text::Typesetter::New(controllerTextLabel->GetTextModel());
+  DALI_TEST_CHECK(typesetterLabel);
+
+  // Tests the view model has been created.
+  Dali::Toolkit::Text::ViewModel* viewModelLabel = typesetterLabel->GetViewModel();
+  DALI_TEST_CHECK(viewModelLabel);
+
+  // Configures the text controller similarly to the text-label.
+  Dali::Toolkit::Text::ConfigureTextLabel(controllerTextLabel);
+
+  DALI_TEST_EQUALS(false, modelLabel->IsSpannedTextPlaced(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, viewModelLabel->IsSpannedTextPlaced(), TEST_LOCATION);
+
+  controllerTextLabel->SetSpannedText(spannedText);
+
+  DALI_TEST_EQUALS(true, modelLabel->IsSpannedTextPlaced(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, viewModelLabel->IsSpannedTextPlaced(), TEST_LOCATION);
+
+  // Creates a text controller.
+  Dali::Toolkit::Text::ControllerPtr         controllerTextField = Dali::Toolkit::Text::Controller::New();
+  const Dali::Toolkit::Text::ModelInterface* modelField          = controllerTextField->GetTextModel();
+
+  // Tests the rendering controller has been created.
+  Dali::Toolkit::Text::TypesetterPtr typesetterField = Dali::Toolkit::Text::Typesetter::New(controllerTextField->GetTextModel());
+  DALI_TEST_CHECK(typesetterField);
+
+  // Tests the view model has been created.
+  Dali::Toolkit::Text::ViewModel* viewModelField = typesetterField->GetViewModel();
+  DALI_TEST_CHECK(viewModelField);
+
+  // Configures the text controller similarly to the text-field.
+  Dali::Toolkit::Text::ConfigureTextField(controllerTextField);
+
+  DALI_TEST_EQUALS(false, modelField->IsSpannedTextPlaced(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, viewModelField->IsSpannedTextPlaced(), TEST_LOCATION);
+
+  controllerTextField->SetSpannedText(spannedText);
+
+  DALI_TEST_EQUALS(true, modelField->IsSpannedTextPlaced(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, viewModelField->IsSpannedTextPlaced(), TEST_LOCATION);
+
+  tet_result(TET_PASS);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText_UnderlineSpan(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextLabelSetSpannedText_UnderlineSpan ");
+
+  Dali::Toolkit::Text::UnderlineStyleProperties expectedProperties = {
+    Text::Underline::DASHED,
+    Color::GREEN,
+    5u,
+    2u,
+    3u,
+    true,
+    true,
+    true,
+    true,
+    true};
+
+  TextLabel textLabel = TextLabel::New();
+  DALI_TEST_CHECK(textLabel);
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForUnderlineSpan();
+
+  Text::SetSpannedText(textLabel, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& labelImpl             = GetImpl(textLabel);
+  const Text::Length            numberOfUnderlineRuns = labelImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, 1u, TEST_LOCATION);
+
+  Vector<Dali::Toolkit::Text::UnderlinedGlyphRun> underlineRuns;
+
+  underlineRuns.Resize(numberOfUnderlineRuns);
+
+  labelImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  DALI_TEST_EQUALS(underlineRuns[0].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[0].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
+  DALI_TEST_CHECK(underlineRuns[0].properties == expectedProperties);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText_CharacterSpacingSpan(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextLabelSetSpannedText_CharacterSpacingSpan");
+
+  TextLabel textLabel = TextLabel::New();
+  DALI_TEST_CHECK(textLabel);
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForCharacterSpacing();
+  Text::SetSpannedText(textLabel, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel&                               labelImpl        = GetImpl(textLabel);
+  const Vector<Dali::Toolkit::Text::CharacterSpacingGlyphRun> characterSpacing = labelImpl.GetTextController()->GetTextModel()->GetCharacterSpacingGlyphRuns();
+  DALI_TEST_EQUALS(1, characterSpacing.Count(), TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText_BoldSpan(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("UtcDaliToolkitTextLabelSetSpannedText_BoldSpan");
+
+  TextLabel textLabel = TextLabel::New();
+
+  DALI_TEST_CHECK(textLabel);
+
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForBoldSpan();
+  Text::SetSpannedText(textLabel, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& labelImpl = GetImpl(textLabel);
+
+  const Vector<Text::FontRun>& validFonts = labelImpl.GetTextController()->GetTextModel()->GetFontRuns();
+
+  DALI_TEST_EQUALS(validFonts.Count(), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFonts[0].characterRun.characterIndex, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFonts[0].characterRun.GetEndCharacterIndex(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFonts[0].isBoldRequired, true, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText_ItalicSpan(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextLabelSetSpannedText_ItalicSpan");
+
+  TextLabel textLabel = TextLabel::New();
+  DALI_TEST_CHECK(textLabel);
+
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForItalicSpan();
+
+  Text::SetSpannedText(textLabel, spannableString);
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& labelImpl        = GetImpl(textLabel);
+  const Vector<Text::FontRun>&  validFontsItalic = labelImpl.GetTextController()->GetTextModel()->GetFontRuns();
+
+  DALI_TEST_EQUALS(validFontsItalic.Count(), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontsItalic[0].characterRun.characterIndex, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontsItalic[0].characterRun.GetEndCharacterIndex(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFontsItalic[0].isItalicRequired, true, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText_BackgroundColorSpan(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextLabelSetSpannedText_BackgroundColorSpan");
+
+  TextLabel textLabel = TextLabel::New();
+  DALI_TEST_CHECK(textLabel);
+
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForBackgroundColorSpan();
+  Text::SetSpannedText(textLabel, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& labelImpl                    = GetImpl(textLabel);
+  const Text::ColorIndex* const backgroundColorIndicesBuffer = labelImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
+
+  CheckColorIndices(backgroundColorIndicesBuffer, 4u, {0u, 5u, 7u, 10u}, {0u, 1u, 1u, 0u});
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelSetSpannedText_StrikethroughSpan(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextLabelSetSpannedText_StrikethroughSpan ");
+
+  Dali::Toolkit::Text::StrikethroughStyleProperties expectedProperties = {
+    Color::GREEN,
+    5u,
+    true,
+    true};
+
+  TextLabel textLabel = TextLabel::New();
+
+  DALI_TEST_CHECK(textLabel);
+
+  application.GetScene().Add(textLabel);
+
+  Text::SpannableString spannableString = CreateSpannableStringForStrikethroughSpan();
+  Text::SetSpannedText(textLabel, spannableString);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& labelImpl = GetImpl(textLabel);
+
+  const Text::Length numberOfStrikethroughRuns = labelImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, 1u, TEST_LOCATION);
+
+  Vector<Dali::Toolkit::Text::StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+
+  labelImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  DALI_TEST_EQUALS(strikethroughRuns[0].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[0].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
+  DALI_TEST_CHECK(strikethroughRuns[0].properties == expectedProperties);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
index 8ec03d6..c64458a 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
@@ -18,18 +18,19 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <limits>
 #include <unistd.h>
+#include <limits>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <toolkit-text-utils.h>
+#include <dali-toolkit/devel-api/text/bitmap-font.h>
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
 #include <dali/devel-api/text-abstraction/bitmap-font.h>
-#include <dali-toolkit/devel-api/text/bitmap-font.h>
+#include <toolkit-environment-variable.h>
+#include <toolkit-text-utils.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -37,8 +38,10 @@ using namespace Text;
 
 namespace
 {
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string     DEFAULT_FONT_DIR("/resources/fonts");
 const PointSize26Dot6 EMOJI_FONT_SIZE = 3840u; // 60 * 64
+
+constexpr auto DALI_RENDERED_GLYPH_COMPRESS_POLICY = "DALI_RENDERED_GLYPH_COMPRESS_POLICY";
 } // namespace
 
 int UtcDaliTextTypesetter(void)
@@ -50,8 +53,8 @@ int UtcDaliTextTypesetter(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -66,82 +69,293 @@ int UtcDaliTextTypesetterGetViewModel(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextRenderingControllerRenderRGBA(void)
+{
+  tet_infoline(" UtcDaliTextRenderingControllerRenderRGBA");
+  ToolkitTestApplication application;
+
+  // Load some fonts.
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf", EMOJI_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Sets the text.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular'>Hello world </font><font family='BreezeColorEmoji'>\xF0\x9F\x98\x81</font>");
+
+  // Creates the text's model and relais-out the text.
+  const Size relayoutSize(120.f, 60.f);
+  controller->Relayout(relayoutSize);
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr renderingController = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(renderingController);
+
+  // Renders the text and creates the final bitmap.
+  PixelData bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  // Changes vertical alignment.
+  controller->SetVerticalAlignment(Text::VerticalAlignment::CENTER);
+  controller->Relayout(relayoutSize);
+
+  // Renders the text and creates the final bitmap.
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  controller->SetVerticalAlignment(Text::VerticalAlignment::BOTTOM);
+  controller->Relayout(relayoutSize);
+
+  // Renders the text and creates the final bitmap.
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
 }
 
-int UtcDaliTextRenderingControllerRender(void)
+int UtcDaliTextRenderingControllerRenderLuminance(void)
 {
-  tet_infoline(" UtcDaliTextRenderingControllerRender");
+  tet_infoline(" UtcDaliTextRenderingControllerRenderLuminance");
   ToolkitTestApplication application;
 
   // Load some fonts.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf", EMOJI_FONT_SIZE );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf", EMOJI_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Sets the text.
-  controller->SetMarkupProcessorEnabled( true );
-  controller->SetText( "<font family='TizenSansRegular'>Hello world </font><font family='BreezeColorEmoji'>\xF0\x9F\x98\x81</font>" );
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular'>Hello world </font><font family='BreezeColorEmoji'>\xF0\x9F\x98\x81</font>");
 
   // Creates the text's model and relais-out the text.
-  const Size relayoutSize( 120.f, 60.f );
-  controller->Relayout( relayoutSize );
+  const Size relayoutSize(120.f, 60.f);
+  controller->Relayout(relayoutSize);
 
   // Tests the rendering controller has been created.
-  TypesetterPtr renderingController = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( renderingController );
+  TypesetterPtr renderingController = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(renderingController);
 
   // Renders the text and creates the final bitmap.
-  PixelData bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT );
-  DALI_TEST_CHECK( bitmap );
+  PixelData bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT, Typesetter::RENDER_TEXT_AND_STYLES, false, Pixel::L8);
+  DALI_TEST_CHECK(bitmap);
 
-  DALI_TEST_EQUALS( 120u, bitmap.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION );
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::L8, bitmap.GetPixelFormat(), TEST_LOCATION);
 
   // Changes vertical alignment.
-  controller->SetVerticalAlignment( Text::VerticalAlignment::CENTER );
-  controller->Relayout( relayoutSize );
+  controller->SetVerticalAlignment(Text::VerticalAlignment::CENTER);
+  controller->Relayout(relayoutSize);
 
   // Renders the text and creates the final bitmap.
-  bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT );
-  DALI_TEST_CHECK( bitmap );
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT, Typesetter::RENDER_TEXT_AND_STYLES, false, Pixel::L8);
+  DALI_TEST_CHECK(bitmap);
 
-  DALI_TEST_EQUALS( 120u, bitmap.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION );
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::L8, bitmap.GetPixelFormat(), TEST_LOCATION);
 
-  controller->SetVerticalAlignment( Text::VerticalAlignment::BOTTOM );
-  controller->Relayout( relayoutSize );
+  controller->SetVerticalAlignment(Text::VerticalAlignment::BOTTOM);
+  controller->Relayout(relayoutSize);
 
   // Renders the text and creates the final bitmap.
-  bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT );
-  DALI_TEST_CHECK( bitmap );
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT, Typesetter::RENDER_TEXT_AND_STYLES, false, Pixel::L8);
+  DALI_TEST_CHECK(bitmap);
 
-  DALI_TEST_EQUALS( 120u, bitmap.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION );
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::L8, bitmap.GetPixelFormat(), TEST_LOCATION);
 
   tet_result(TET_PASS);
+
+  END_TEST;
+}
+
+int UtcDaliTextRenderingControllerRenderWithCompressRGBA(void)
+{
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_RENDERED_GLYPH_COMPRESS_POLICY, "m");
+
+  tet_infoline(" UtcDaliTextRenderingControllerRenderWithCompressRGBA");
+  ToolkitTestApplication application;
+
+  // Load some fonts.
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf", EMOJI_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Sets the text.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular'>Hello world </font><font family='BreezeColorEmoji'>\xF0\x9F\x98\x81</font>");
+
+  // Creates the text's model and relais-out the text.
+  const Size relayoutSize(120.f, 60.f);
+  controller->Relayout(relayoutSize);
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr renderingController = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(renderingController);
+
+  // Renders the text and creates the final bitmap.
+  PixelData bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  // Changes vertical alignment.
+  controller->SetVerticalAlignment(Text::VerticalAlignment::CENTER);
+  controller->Relayout(relayoutSize);
+
+  // Renders the text and creates the final bitmap.
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  controller->SetVerticalAlignment(Text::VerticalAlignment::BOTTOM);
+  controller->Relayout(relayoutSize);
+
+  // Renders the text and creates the final bitmap.
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  tet_result(TET_PASS);
+
+  END_TEST;
+}
+
+int UtcDaliTextRenderingControllerRenderWithCompressLuminance(void)
+{
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_RENDERED_GLYPH_COMPRESS_POLICY, "m");
+
+  tet_infoline(" UtcDaliTextRenderingControllerRenderWithCompressLuminance");
+  ToolkitTestApplication application;
+
+  // Load some fonts.
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf", EMOJI_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Sets the text.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular'>Hello world </font><font family='BreezeColorEmoji'>\xF0\x9F\x98\x81</font>");
+
+  // Creates the text's model and relais-out the text.
+  const Size relayoutSize(120.f, 60.f);
+  controller->Relayout(relayoutSize);
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr renderingController = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(renderingController);
+
+  // Renders the text and creates the final bitmap.
+  PixelData bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT, Typesetter::RENDER_TEXT_AND_STYLES, false, Pixel::L8);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::L8, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  // Changes vertical alignment.
+  controller->SetVerticalAlignment(Text::VerticalAlignment::CENTER);
+  controller->Relayout(relayoutSize);
+
+  // Renders the text and creates the final bitmap.
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT, Typesetter::RENDER_TEXT_AND_STYLES, false, Pixel::L8);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::L8, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  controller->SetVerticalAlignment(Text::VerticalAlignment::BOTTOM);
+  controller->Relayout(relayoutSize);
+
+  // Renders the text and creates the final bitmap.
+  bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT, Typesetter::RENDER_TEXT_AND_STYLES, false, Pixel::L8);
+  DALI_TEST_CHECK(bitmap);
+
+  DALI_TEST_EQUALS(120u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Pixel::L8, bitmap.GetPixelFormat(), TEST_LOCATION);
+
+  tet_result(TET_PASS);
+
   END_TEST;
 }
 
@@ -154,45 +368,45 @@ int UtcDaliTextTypesetterVerticalLineAlignment(void)
   ControllerPtr controller = Controller::New();
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Sets the text.
-  controller->SetMarkupProcessorEnabled( true );
-  controller->SetText( "<font family='TizenSansRegular'>Hello world</font>" );
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular'>Hello world</font>");
 
   // Creates the text's model and relais-out the text.
-  const Size relayoutSize( 120.f, 60.f );
-  controller->Relayout( relayoutSize );
+  const Size relayoutSize(120.f, 60.f);
+  controller->Relayout(relayoutSize);
 
   // Tests the rendering controller has been created.
-  TypesetterPtr renderingController = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( renderingController );
+  TypesetterPtr renderingController = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(renderingController);
 
   {
-    controller->SetVerticalLineAlignment( Dali::Toolkit::DevelText::VerticalLineAlignment::TOP );
-    controller->Relayout( relayoutSize );
+    controller->SetVerticalLineAlignment(Dali::Toolkit::DevelText::VerticalLineAlignment::TOP);
+    controller->Relayout(relayoutSize);
 
     // Renders the text and creates the final bitmap.
-    auto bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT );
-    DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION );
+    auto bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+    DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
   }
 
   {
-    controller->SetVerticalLineAlignment( Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE );
-    controller->Relayout( relayoutSize );
+    controller->SetVerticalLineAlignment(Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE);
+    controller->Relayout(relayoutSize);
 
     // Renders the text and creates the final bitmap.
-    auto bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT );
-    DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION );
+    auto bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+    DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
   }
 
   {
-    controller->SetVerticalLineAlignment( Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM );
-    controller->Relayout( relayoutSize );
+    controller->SetVerticalLineAlignment(Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM);
+    controller->Relayout(relayoutSize);
 
     // Renders the text and creates the final bitmap.
-    auto bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT );
-    DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION );
+    auto bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
+    DALI_TEST_EQUALS(60u, bitmap.GetHeight(), TEST_LOCATION);
   }
 
   tet_result(TET_PASS);
@@ -205,45 +419,45 @@ int UtcDaliTextTypesetterBitmapFont(void)
   ToolkitTestApplication application;
 
   DevelText::BitmapFontDescription fontDescription;
-  fontDescription.name = "Digits";
-  fontDescription.underlinePosition = 0.f;
+  fontDescription.name               = "Digits";
+  fontDescription.underlinePosition  = 0.f;
   fontDescription.underlineThickness = 0.f;
-  fontDescription.isColorFont = true;
+  fontDescription.isColorFont        = true;
 
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0031.png", "0", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0032.png", "1", 34.f, 0.f } );
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0031.png", "0", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0032.png", "1", 34.f, 0.f});
 
   TextAbstraction::BitmapFont bitmapFont;
-  DevelText::CreateBitmapFont( fontDescription, bitmapFont );
+  DevelText::CreateBitmapFont(fontDescription, bitmapFont);
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.GetFontId( bitmapFont );
+  fontClient.GetFontId(bitmapFont);
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Sets the text.
-  controller->SetMarkupProcessorEnabled( true );
-  controller->SetText( "<font family='Digits'><color 'value'='red'>0</color></font>" );
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='Digits'><color 'value'='red'>0</color></font>");
 
   // Creates the text's model and relais-out the text.
-  const Size relayoutSize( 31.f, 34.f );
-  controller->Relayout( relayoutSize );
+  const Size relayoutSize(31.f, 34.f);
+  controller->Relayout(relayoutSize);
 
   // Tests the rendering controller has been created.
-  TypesetterPtr renderingController = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( renderingController );
+  TypesetterPtr renderingController = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(renderingController);
 
-  controller->Relayout( relayoutSize );
+  controller->Relayout(relayoutSize);
 
   // Renders the text and creates the final bitmap.
-  auto bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT );
+  auto bitmap = renderingController->Render(relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT);
 
-  DALI_TEST_EQUALS( 31u, bitmap.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 34u, bitmap.GetHeight(), TEST_LOCATION );
+  DALI_TEST_EQUALS(31u, bitmap.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(34u, bitmap.GetHeight(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
old mode 100755
new mode 100644
index a3ad901..dc3f714
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,18 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <toolkit-text-utils.h>
+#include <dali-toolkit/devel-api/text/spannable-string.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <toolkit-text-utils.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -33,12 +34,12 @@ using namespace Text;
 
 namespace
 {
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
 
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
-
-const Size CONTROL_SIZE( 200.f, 400.f );
-const Size CONTROL_SMALL_SIZE( 50.f, 100.f );
-const char* LOREM_IPSUM = "Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.\n"
+const Size  CONTROL_SIZE(200.f, 400.f);
+const Size  CONTROL_SMALL_SIZE(50.f, 100.f);
+const char* LOREM_IPSUM =
+  "Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.\n"
   "Usu ne nisl maiorum iudicabit, veniam epicurei oporteat eos an.\n"
   "Ne nec nulla regione albucius, mea doctus delenit ad!\n"
   "Et everti blandit adversarium mei, eam porro neglegentur suscipiantur an.\n"
@@ -49,19 +50,21 @@ const char* LOREM_IPSUM = "Lorem ipsum dolor sit amet, aeque definiebas ea mei,
   "Aliquip sanctůs delicáta quí ěá, et natum aliquam est?\n"
   "Asšúm sapěret usu ůť.\n"
   "Síť ut apeirián laboramúš percipitur, sůas hařum ín éos?\n";
-const Vector2 LOREM_SCROLL_POSITION( 0.f, -265.f );
-const Length LOREM_NUMBER_OF_LINES = 35u;
-const Length LOREM_NUMBER_OF_LINES_ELIDED = 21u;
-const Length LOREM_NUMBER_OF_GLYPHS = 632;
-const Length LOREM_NUMBER_OF_GLYPHS_ELIDED = 393u;
+const Vector2 LOREM_SCROLL_POSITION(0.f, -265.f);
+const Length  LOREM_NUMBER_OF_LINES             = 35u;
+const Length  LOREM_NUMBER_OF_LINES_ELIDED      = 21u;
+const Length  LOREM_NUMBER_OF_GLYPHS            = 632u;
+const Length  LOREM_NUMBER_OF_GLYPHS_ELIDED     = 393u;
+const Length  LOREM_NUMBER_OF_CHARACTERS        = 633u;
+const Length  LOREM_NUMBER_OF_CHARACTERS_ELIDED = 633u;
 
 // The expected layout size for UtcDaliTextViewModelGetLayoutSize
-const Size LAYOUT_SIZE( 181.f, 48.f );
+const Size LAYOUT_SIZE(182.f, 48.f);
 
 // The expected color indices for UtcDaliTextViewModelGetColors
-const ColorIndex COLOR_INDICES[] = { 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 1u, 1u, 1u, 1u, 1u, 3u, 1u, 1u, 1u, 0u, 0u, 0u, 0u };
-const Length NUMBER_OF_COLORS = 3u;
-const Vector4 COLORS[] = { Color::RED, Color::BLUE, Color::GREEN };
+const ColorIndex COLOR_INDICES[]  = {0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 1u, 1u, 1u, 1u, 1u, 3u, 1u, 1u, 1u, 0u, 0u, 0u, 0u};
+const Length     NUMBER_OF_COLORS = 3u;
+const Vector4    COLORS[]         = {Color::RED, Color::BLUE, Color::GREEN};
 
 struct ElideData
 {
@@ -73,81 +76,81 @@ struct ElideData
   float*       positions;
 };
 
-bool ElideTest( const ElideData& data )
+bool ElideTest(const ElideData& data)
 {
   std::cout << "  testing : " << data.description << std::endl;
 
   // Load some fonts.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf");
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf");
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Sets a text and relais-out.
-  controller->SetMarkupProcessorEnabled( true );
+  controller->SetMarkupProcessorEnabled(true);
 
-  controller->SetText( data.text );
-  controller->Relayout( data.size );
+  controller->SetText(data.text);
+  controller->Relayout(data.size);
 
   // Elide the glyphs.
   model->ElideGlyphs();
 
-  if( data.numberOfLines != model->GetNumberOfLines() )
+  if(data.numberOfLines != model->GetNumberOfLines())
   {
     std::cout << "  different number of lines : " << model->GetNumberOfLines() << ", expected : " << data.numberOfLines << std::endl;
     return false;
   }
 
-  if( data.numberOfGlyphs != model->GetNumberOfGlyphs() )
+  if(data.numberOfGlyphs != model->GetNumberOfGlyphs())
   {
     std::cout << "  different number of glyphs : " << model->GetNumberOfGlyphs() << ", expected : " << data.numberOfGlyphs << std::endl;
     return false;
   }
 
-  const Vector2* const layoutBuffer = model->GetLayout();
-  const Length numberOfLines = model->GetNumberOfLines();
+  const Vector2* const layoutBuffer  = model->GetLayout();
+  const Length         numberOfLines = model->GetNumberOfLines();
 
-  if( numberOfLines != 0u )
+  if(numberOfLines != 0u)
   {
-    const LineRun& lastLine = *( model->GetLines() + numberOfLines - 1u );
-    const Length numberOfLastLineGlyphs = data.numberOfGlyphs - lastLine.glyphRun.glyphIndex;
+    const LineRun& lastLine               = *(model->GetLines() + numberOfLines - 1u);
+    const Length   numberOfLastLineGlyphs = data.numberOfGlyphs - lastLine.glyphRun.glyphIndex;
 
     std::cout << "  last line alignment offset : " << floor(lastLine.alignmentOffset) << std::endl;
 
-    for( unsigned int index = 0u; index < numberOfLastLineGlyphs; ++index )
+    for(unsigned int index = 0u; index < numberOfLastLineGlyphs; ++index)
     {
-      if( *( data.positions + index ) != floor(lastLine.alignmentOffset + ( *( layoutBuffer + lastLine.glyphRun.glyphIndex + index ) ).x ) )
+      if(*(data.positions + index) != floor(lastLine.alignmentOffset + (*(layoutBuffer + lastLine.glyphRun.glyphIndex + index)).x))
       {
         std::cout << "  different layout :";
-        for( unsigned int i = 0; i < numberOfLastLineGlyphs; ++i )
+        for(unsigned int i = 0; i < numberOfLastLineGlyphs; ++i)
         {
-          std::cout << " " << floor( lastLine.alignmentOffset + ( *( layoutBuffer + lastLine.glyphRun.glyphIndex + i ) ).x );
+          std::cout << " " << floor(lastLine.alignmentOffset + (*(layoutBuffer + lastLine.glyphRun.glyphIndex + i)).x);
         }
         std::cout << std::endl;
         std::cout << "          expected :";
-        for( unsigned int i = 0; i < numberOfLastLineGlyphs; ++i )
+        for(unsigned int i = 0; i < numberOfLastLineGlyphs; ++i)
         {
-          std::cout << " " << *( data.positions + i );
+          std::cout << " " << *(data.positions + i);
         }
         std::cout << std::endl;
         return false;
@@ -169,12 +172,12 @@ int UtcDaliTextViewModel(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -189,25 +192,25 @@ int UtcDaliTextViewModelGetControlSize(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
   // The text has not been laid-out. The stored control's size should be zero.
-  DALI_TEST_EQUALS( Size::ZERO, model->GetControlSize(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Size::ZERO, model->GetControlSize(), TEST_LOCATION);
 
   // Sets a text and relais-out.
-  controller->SetText( "Hello world" );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText("Hello world");
+  controller->Relayout(CONTROL_SIZE);
 
   // The control's size should be stored now.
-  DALI_TEST_EQUALS( CONTROL_SIZE, model->GetControlSize(), TEST_LOCATION );
+  DALI_TEST_EQUALS(CONTROL_SIZE, model->GetControlSize(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -220,38 +223,38 @@ int UtcDaliTextViewModelGetLayoutSize(void)
 
   // Load some fonts.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
 
   // Creates a text controller.
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
   // The text has not been laid-out. The stored control's size should be zero.
-  DALI_TEST_EQUALS( Size::ZERO, model->GetLayoutSize(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Size::ZERO, model->GetLayoutSize(), TEST_LOCATION);
 
   // Sets a text and relais-out.
-  controller->SetMarkupProcessorEnabled( true );
-  controller->SetText( "<font family='TizenSansRegular' size='10'>Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.</font>" );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular' size='10'>Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.</font>");
+  controller->Relayout(CONTROL_SIZE);
 
   // The control's size should be stored now.
-  DALI_TEST_EQUALS( LAYOUT_SIZE, model->GetLayoutSize(), TEST_LOCATION );
+  DALI_TEST_EQUALS(LAYOUT_SIZE, model->GetLayoutSize(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -266,26 +269,26 @@ int UtcDaliTextViewModelGetScrollPosition(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
   // No text has been set. The scroll position should be zero.
-  DALI_TEST_EQUALS( Vector2::ZERO, model->GetScrollPosition(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Vector2::ZERO, model->GetScrollPosition(), TEST_LOCATION);
 
   // Gains the keyboard focus, sets a big text and relais-out.
   controller->KeyboardFocusGainEvent();
-  controller->SetText( LOREM_IPSUM );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText(LOREM_IPSUM);
+  controller->Relayout(CONTROL_SIZE);
 
   // The text should be scrolled to the end.
-  DALI_TEST_EQUALS( LOREM_SCROLL_POSITION, model->GetScrollPosition(), TEST_LOCATION );
+  DALI_TEST_EQUALS(LOREM_SCROLL_POSITION, model->GetScrollPosition(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -300,21 +303,21 @@ int UtcDaliTextViewModelGetAlignment(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
-  DALI_TEST_EQUALS( Text::HorizontalAlignment::BEGIN, model->GetHorizontalAlignment(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Text::VerticalAlignment::TOP, model->GetVerticalAlignment(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Text::HorizontalAlignment::BEGIN, model->GetHorizontalAlignment(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Text::VerticalAlignment::TOP, model->GetVerticalAlignment(), TEST_LOCATION);
 
-  controller->SetHorizontalAlignment( Text::HorizontalAlignment::CENTER );
-  controller->SetVerticalAlignment( Text::VerticalAlignment::CENTER );
+  controller->SetHorizontalAlignment(Text::HorizontalAlignment::CENTER);
+  controller->SetVerticalAlignment(Text::VerticalAlignment::CENTER);
 
-  DALI_TEST_EQUALS( Text::HorizontalAlignment::CENTER, model->GetHorizontalAlignment(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Text::VerticalAlignment::CENTER, model->GetVerticalAlignment(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Text::HorizontalAlignment::CENTER, model->GetHorizontalAlignment(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Text::VerticalAlignment::CENTER, model->GetVerticalAlignment(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -329,24 +332,64 @@ int UtcDaliTextViewModelIsTextElideEnabled(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
   // Elide text should be disabled.
-  DALI_TEST_CHECK( !model->IsTextElideEnabled() );
+  DALI_TEST_CHECK(!model->IsTextElideEnabled());
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Elide text should be enabled.
-  DALI_TEST_CHECK( model->IsTextElideEnabled() );
+  DALI_TEST_CHECK(model->IsTextElideEnabled());
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextViewModelGetCharacters(void)
+{
+  tet_infoline(" UtcDaliTextViewModelGetLines");
+  ToolkitTestApplication application;
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
+
+  // Tests the view model has been created.
+  ViewModel* model = typesetter->GetViewModel();
+  DALI_TEST_CHECK(NULL != model);
+
+  // Configures the text controller similarly to the text-editor.
+  ConfigureTextEditor(controller);
+
+  // The number of characters should be zero.
+  DALI_TEST_EQUALS(0u, model->GetNumberOfCharacters(), TEST_LOCATION);
+
+  // Sets a text and relais-out.
+  controller->SetText(LOREM_IPSUM);
+  controller->Relayout(CONTROL_SIZE);
+
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_CHARACTERS, model->GetNumberOfCharacters(), TEST_LOCATION);
+  // Configures the text controller similarly to the text-label.
+  ConfigureTextLabel(controller);
+
+  // Relais-out for the text-label configuration.
+  controller->Relayout(Size(100.f, 100.f)); // Change the size to force a relayout.
+  controller->Relayout(CONTROL_SIZE);
+
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_CHARACTERS_ELIDED, model->GetNumberOfCharacters(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -361,36 +404,36 @@ int UtcDaliTextViewModelGetLines(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
   // The number of lines should be zero.
-  DALI_TEST_EQUALS( 0u, model->GetNumberOfLines(), TEST_LOCATION );
-  DALI_TEST_CHECK( NULL == model->GetLines() );
+  DALI_TEST_EQUALS(0u, model->GetNumberOfLines(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL == model->GetLines());
 
   // Sets a text and relais-out.
-  controller->SetText( LOREM_IPSUM );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText(LOREM_IPSUM);
+  controller->Relayout(CONTROL_SIZE);
 
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_LINES, model->GetNumberOfLines(), TEST_LOCATION );
-  DALI_TEST_CHECK( NULL != model->GetLines() );
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_LINES, model->GetNumberOfLines(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL != model->GetLines());
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Relais-out for the text-label configuration.
-  controller->Relayout( Size( 100.f, 100.f) ); // Change the size to force a relayout.
-  controller->Relayout( CONTROL_SIZE );
+  controller->Relayout(Size(100.f, 100.f)); // Change the size to force a relayout.
+  controller->Relayout(CONTROL_SIZE);
 
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_LINES_ELIDED, model->GetNumberOfLines(), TEST_LOCATION );
-  DALI_TEST_CHECK( NULL != model->GetLines() );
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_LINES_ELIDED, model->GetNumberOfLines(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL != model->GetLines());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -405,42 +448,42 @@ int UtcDaliTextViewModelGetGlyphsLayout(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
   // The number of glyphs should be zero.
-  DALI_TEST_EQUALS( 0u, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_CHECK( NULL == model->GetGlyphs() );
-  DALI_TEST_CHECK( NULL == model->GetLayout() );
+  DALI_TEST_EQUALS(0u, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL == model->GetGlyphs());
+  DALI_TEST_CHECK(NULL == model->GetLayout());
 
   // Sets a text and relais-out.
-  controller->SetText( LOREM_IPSUM );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText(LOREM_IPSUM);
+  controller->Relayout(CONTROL_SIZE);
 
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_GLYPHS, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_CHECK( NULL != model->GetGlyphs() );
-  DALI_TEST_CHECK( NULL != model->GetLayout() );
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_GLYPHS, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL != model->GetGlyphs());
+  DALI_TEST_CHECK(NULL != model->GetLayout());
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Relais-out for the text-label configuration.
-  controller->Relayout( Size( 100.f, 100.f) ); // Change the size to force a relayout.
-  controller->Relayout( CONTROL_SIZE );
+  controller->Relayout(Size(100.f, 100.f)); // Change the size to force a relayout.
+  controller->Relayout(CONTROL_SIZE);
 
   // Elide the glyphs.
   model->ElideGlyphs();
 
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_GLYPHS_ELIDED, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_CHECK( NULL != model->GetGlyphs() );
-  DALI_TEST_CHECK( NULL != model->GetLayout() );
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_GLYPHS_ELIDED, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL != model->GetGlyphs());
+  DALI_TEST_CHECK(NULL != model->GetLayout());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -455,35 +498,35 @@ int UtcDaliTextViewModelGetColors(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Sets a text and relais-out.
-  controller->SetMarkupProcessorEnabled( true );
-  controller->SetText( "Lorem <color value='red'>ips<color value='blue'>um do</color>lor s<color value='green'>i</color>t a</color>met." );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("Lorem <color value='red'>ips<color value='blue'>um do</color>lor s<color value='green'>i</color>t a</color>met.");
+  controller->Relayout(CONTROL_SIZE);
 
-  DALI_TEST_EQUALS( Color::BLACK, model->GetDefaultColor(), TEST_LOCATION );
+  DALI_TEST_EQUALS(Color::BLACK, model->GetDefaultColor(), TEST_LOCATION);
 
   const ColorIndex* const colorIndicesBuffer = model->GetColorIndices();
 
   const Length numberOfGlyphs = model->GetNumberOfGlyphs();
-  for( ColorIndex index = 0u; index < numberOfGlyphs; ++index )
+  for(ColorIndex index = 0u; index < numberOfGlyphs; ++index)
   {
-    DALI_TEST_EQUALS( COLOR_INDICES[index], *( colorIndicesBuffer + index ), TEST_LOCATION );
+    DALI_TEST_EQUALS(COLOR_INDICES[index], *(colorIndicesBuffer + index), TEST_LOCATION);
   }
 
   const Vector4* const colors = model->GetColors();
-  for( unsigned int index = 0u; index < NUMBER_OF_COLORS; ++index )
+  for(unsigned int index = 0u; index < NUMBER_OF_COLORS; ++index)
   {
-    DALI_TEST_EQUALS( COLORS[index], *( colors + index ), TEST_LOCATION );
+    DALI_TEST_EQUALS(COLORS[index], *(colors + index), TEST_LOCATION);
   }
 
   tet_result(TET_PASS);
@@ -499,96 +542,96 @@ int UtcDaliTextViewModelElideText01(void)
   ControllerPtr controller = Controller::New();
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( controller->GetTextModel() );
-  DALI_TEST_CHECK( typesetter );
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
   ViewModel* model = typesetter->GetViewModel();
-  DALI_TEST_CHECK( NULL != model );
+  DALI_TEST_CHECK(NULL != model);
 
   // Configures the text controller similarly to the text-editor.
-  ConfigureTextEditor( controller );
+  ConfigureTextEditor(controller);
 
   // The number of glyphs should be zero.
-  DALI_TEST_EQUALS( 0u, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, model->GetNumberOfLines(), TEST_LOCATION );
-  DALI_TEST_CHECK( NULL == model->GetGlyphs() );
-  DALI_TEST_CHECK( NULL == model->GetLayout() );
+  DALI_TEST_EQUALS(0u, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, model->GetNumberOfLines(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL == model->GetGlyphs());
+  DALI_TEST_CHECK(NULL == model->GetLayout());
 
   // Sets a text and relais-out.
-  controller->SetText( LOREM_IPSUM );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText(LOREM_IPSUM);
+  controller->Relayout(CONTROL_SIZE);
 
   // Keep the pointers to the glyphs and layout.
   // As the text is not elided with this configuration, the pointers shoud be the same after calling the ElideGlyphs() method.
-  const GlyphInfo* const glyphsModel = model->GetGlyphs();
-  const Vector2* layoutsModel = model->GetLayout();
+  const GlyphInfo* const glyphsModel  = model->GetGlyphs();
+  const Vector2*         layoutsModel = model->GetLayout();
 
   // Elide the glyphs. Text shouldn't be elided with this configuration.
   model->ElideGlyphs();
 
-  DALI_TEST_CHECK( glyphsModel == model->GetGlyphs() );
-  DALI_TEST_CHECK( layoutsModel == model->GetLayout() );
+  DALI_TEST_CHECK(glyphsModel == model->GetGlyphs());
+  DALI_TEST_CHECK(layoutsModel == model->GetLayout());
 
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_GLYPHS, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_LINES, model->GetNumberOfLines(), TEST_LOCATION );
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_GLYPHS, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_LINES, model->GetNumberOfLines(), TEST_LOCATION);
 
   // Configures the text controller similarly to the text-label.
-  ConfigureTextLabel( controller );
+  ConfigureTextLabel(controller);
 
   // Clear the text and relais-out.
-  controller->SetText( "" );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText("");
+  controller->Relayout(CONTROL_SIZE);
 
-  DALI_TEST_EQUALS( 0u, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, model->GetNumberOfLines(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0u, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, model->GetNumberOfLines(), TEST_LOCATION);
 
   // Elide the glyphs. Should not add the ellipsis glyph.
   model->ElideGlyphs();
 
-  DALI_TEST_EQUALS( 0u, model->GetNumberOfGlyphs(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0u, model->GetNumberOfGlyphs(), TEST_LOCATION);
 
   // Sets a text that doesn't need to be elided.
-  controller->SetText( "Hello\n" );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText("Hello\n");
+  controller->Relayout(CONTROL_SIZE);
 
   // Elide the glyphs.
   model->ElideGlyphs();
 
-  DALI_TEST_EQUALS( 6u, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 2u, model->GetNumberOfLines(), TEST_LOCATION );
+  DALI_TEST_EQUALS(6u, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_EQUALS(2u, model->GetNumberOfLines(), TEST_LOCATION);
 
   // Sets a text and relais-out.
-  controller->SetText( LOREM_IPSUM );
-  controller->Relayout( CONTROL_SIZE );
+  controller->SetText(LOREM_IPSUM);
+  controller->Relayout(CONTROL_SIZE);
 
   // Elide the glyphs.
   model->ElideGlyphs();
 
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_GLYPHS_ELIDED, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_EQUALS( LOREM_NUMBER_OF_LINES_ELIDED, model->GetNumberOfLines(), TEST_LOCATION );
-  const GlyphInfo* const glyphs = model->GetGlyphs();
-  const Vector2* layouts = model->GetLayout();
-  DALI_TEST_CHECK( NULL != glyphs );
-  DALI_TEST_CHECK( NULL != layouts );
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_GLYPHS_ELIDED, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_EQUALS(LOREM_NUMBER_OF_LINES_ELIDED, model->GetNumberOfLines(), TEST_LOCATION);
+  const GlyphInfo* const glyphs  = model->GetGlyphs();
+  const Vector2*         layouts = model->GetLayout();
+  DALI_TEST_CHECK(NULL != glyphs);
+  DALI_TEST_CHECK(NULL != layouts);
 
   // When the ellipsis is enabled, at least a glyph has to be rendered.
   // Even if the given width is too narrow for rendering an ellipsis glyph.
-  controller->SetText( "…" );
+  controller->SetText("…");
   Vector3 sizeEllipsis = controller->GetNaturalSize();
-  controller->SetText( "A" );
-  Vector3 sizeA = controller->GetNaturalSize();
-  float testWidth = sizeA.width < sizeEllipsis.width ? sizeA.width : sizeEllipsis.width - 1.0;
+  controller->SetText("A");
+  Vector3 sizeA     = controller->GetNaturalSize();
+  float   testWidth = sizeA.width < sizeEllipsis.width ? sizeA.width : sizeEllipsis.width - 1.0;
 
-  controller->SetText( "AB" );
+  controller->SetText("AB");
   Vector3 sizeAB = controller->GetNaturalSize();
 
-  controller->Relayout( Size(testWidth, sizeAB.height) );
+  controller->Relayout(Size(testWidth, sizeAB.height));
 
   // Elide the glyphs.
   model->ElideGlyphs();
-  DALI_TEST_EQUALS( 1u, model->GetNumberOfGlyphs(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, model->GetNumberOfLines(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1u, model->GetNumberOfGlyphs(), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, model->GetNumberOfLines(), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
@@ -598,69 +641,58 @@ int UtcDaliTextViewModelElideText02(void)
 {
   tet_infoline(" UtcDaliTextViewModelElideText02");
 
-  Size textSize00( 100.f, 100.f );
+  Size textSize00(100.f, 100.f);
 
-  Size textSize01( 80.f, 100.f );
-  float positions01[] = { 0.f, 7.f, 16.f, 26.f, 33.f, 41.f, 45.f, 55.f, 64.0f };
+  Size  textSize01(80.f, 100.f);
+  float positions01[] = {0.0f, 8.0f, 16.0f, 26.0f, 34.0f, 42.0f, 46.0f, 56.0f, 64.0f};
 
-  Size textSize02( 80.f, 100.f );
-  float positions02[] = { 68.f, 62.f, 58.f, 50.f, 46.f, 42.f, 32.f, 24.f, 5.f };
+  Size  textSize02(80.f, 100.f);
+  float positions02[] = {69.0f, 63.0f, 59.0f, 51.0f, 47.0f, 43.0f, 34.0f, 26.0f, 7.0f};
 
-  Size textSize03( 80.f, 100.f );
-  float positions03[] = { 78.f, 72.f, 66.f, 62.f, 57.f, 50.f, 45.f, 41.f, 39.f, 33.f, 30.f, 24.f, 5.0f };
+  Size  textSize03(80.f, 100.f);
+  float positions03[] = {78.0f, 72.0f, 66.0f, 62.0f, 57.0f, 50.0f, 45.0f, 41.0f, 39.0f, 33.0f, 29.0f, 23.0f, 3.0f};
 
-  Size textSize04( 80.f, 10.f );
-  float positions04[] = { 1.f };
+  Size  textSize04(80.f, 10.f);
+  float positions04[] = {1.f};
 
   struct ElideData data[] =
-  {
-    {
-      "void text",
-      "",
-      textSize00,
-      0u,
-      0u,
-      NULL
-    },
     {
-      "Latin script",
-      "<font family='TizenSans'>Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.</font>",
-      textSize01,
-      5u,
-      36u,
-      positions01
-    },
-    {
-      "Hebrew script",
-      "<font family='TizenSansHebrew'>צעד על לשון המלצת לאחרונה, אם לכאן שנורו סרבול מדע, קרן דת שפות להפוך.</font>",
-      textSize02,
-      5u,
-      44u,
-      positions02
-    },
-    {
-      "Arabic script",
-      "<font family='TizenSansArabic'>عل النفط ديسمبر الإمداد بال, بين وترك شعار هو. لمّ من المبرمة النفط بالسيطرة, أم يتم تحرّك وبغطاء, عدم في لإعادة وإقامة رجوعهم.</font>",
-      textSize03,
-      5u,
-      66u,
-      positions03
-    },
-    {
-      "Small control size, no line fits.",
-      "<font family='TizenSans'>Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.</font>",
-      textSize04,
-      1u,
-      1u,
-      positions04
-    }
-  };
+      {"void text",
+       "",
+       textSize00,
+       0u,
+       0u,
+       NULL},
+      {"Latin script",
+       "<font family='TizenSans'>Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.</font>",
+       textSize01,
+       5u,
+       36u,
+       positions01},
+      {"Hebrew script",
+       "<font family='TizenSansHebrew'>צעד על לשון המלצת לאחרונה, אם לכאן שנורו סרבול מדע, קרן דת שפות להפוך.</font>",
+       textSize02,
+       5u,
+       44u,
+       positions02},
+      {"Arabic script",
+       "<font family='TizenSansArabic'>عل النفط ديسمبر الإمداد بال, بين وترك شعار هو. لمّ من المبرمة النفط بالسيطرة, أم يتم تحرّك وبغطاء, عدم في لإعادة وإقامة رجوعهم.</font>",
+       textSize03,
+       5u,
+       66u,
+       positions03},
+      {"Small control size, no line fits.",
+       "<font family='TizenSans'>Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.</font>",
+       textSize04,
+       1u,
+       1u,
+       positions04}};
   const unsigned int numberOfTests = 5u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !ElideTest( data[index] ) )
+    if(!ElideTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -669,3 +701,89 @@ int UtcDaliTextViewModelElideText02(void)
   tet_result(TET_PASS);
   END_TEST;
 }
+
+int UtcDaliTextViewModelGetFontRuns(void)
+{
+  tet_infoline(" UtcDaliTextViewModelGetFontRuns");
+  ToolkitTestApplication application;
+
+  // Load some fonts.
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.SetDpi(93u, 93u);
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
+
+  // Tests the view model has been created.
+  ViewModel* model = typesetter->GetViewModel();
+  DALI_TEST_CHECK(NULL != model);
+
+  // Configures the text controller similarly to the text-editor.
+  ConfigureTextEditor(controller);
+
+  // Sets a text and relais-out.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular' size='10'>Hello </font>Hello<font family='TizenSansRegular' size='15'>Hello</font>");
+  controller->Relayout(CONTROL_SIZE);
+
+  const Vector<FontRun>& validFonts = model->GetFontRuns();
+
+  // The font-runs should be equal to number of segments have different fonts.
+  DALI_TEST_EQUALS(validFonts.Count(), 3u, TEST_LOCATION);
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
+
+int UtcDaliTextViewModelGetFontDescriptionRuns(void)
+{
+  tet_infoline(" UtcDaliTextViewModelGetFontDescriptionRuns");
+  ToolkitTestApplication application;
+
+  // Load some fonts.
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.SetDpi(93u, 93u);
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
+
+  // Creates a text controller.
+  ControllerPtr controller = Controller::New();
+
+  // Tests the rendering controller has been created.
+  TypesetterPtr typesetter = Typesetter::New(controller->GetTextModel());
+  DALI_TEST_CHECK(typesetter);
+
+  // Tests the view model has been created.
+  ViewModel* model = typesetter->GetViewModel();
+  DALI_TEST_CHECK(NULL != model);
+
+  // Configures the text controller similarly to the text-editor.
+  ConfigureTextEditor(controller);
+
+  // Sets a text and relais-out.
+  controller->SetMarkupProcessorEnabled(true);
+  controller->SetText("<font family='TizenSansRegular' size='10'>Hello </font>Hello<font family='TizenSansRegular' size='15'>Hello</font>");
+  controller->Relayout(CONTROL_SIZE);
+
+  const Vector<FontDescriptionRun>& validFonts = model->GetFontDescriptionRuns();
+
+  // The font-description-runs should be equal number of the used fonts.
+  DALI_TEST_EQUALS(validFonts.Count(), 2u, TEST_LOCATION);
+
+  tet_result(TET_PASS);
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp
old mode 100755
new mode 100644
index 0b18d11..adc7625
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextEditor-internal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,38 +15,38 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 
-#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
 #include <dali-toolkit/internal/controls/text-controls/text-editor-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
 
 using namespace Dali;
 using namespace Toolkit;
 using namespace Text;
 
-int UtcDaliTextEditorSelectText(void)
+int UtcDaliInternalTextEditorSelectText(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliTextEditorSelectText" );
+  tet_infoline("UtcDaliInternalTextEditorSelectText");
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 400.f, 60.f ) );
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hello World" );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(400.f, 60.f));
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hello World");
 
   // Add the text editor to the stage
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextEditor& textEditorImpl = GetImpl( textEditor );
+  Toolkit::Internal::TextEditor& textEditorImpl = GetImpl(textEditor);
 
   application.SendNotification();
   application.Render();
@@ -58,7 +58,7 @@ int UtcDaliTextEditorSelectText(void)
   application.Render();
 
   std::string selectedText = textEditorImpl.GetSelectedText();
-  DALI_TEST_CHECK( selectedText == "Hello World" );
+  DALI_TEST_CHECK(selectedText == "Hello World");
 
   // Select None
   textEditorImpl.SelectNone();
@@ -67,7 +67,7 @@ int UtcDaliTextEditorSelectText(void)
   application.Render();
 
   selectedText = textEditorImpl.GetSelectedText();
-  DALI_TEST_CHECK( selectedText == "" );
+  DALI_TEST_CHECK(selectedText == "");
 
   END_TEST;
 }
@@ -79,33 +79,761 @@ int UtcDaliTextEditorMarkupUnderline(void)
 
   TextEditor textEditor = TextEditor::New();
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "<u>ABC</u>EF<u>GH</u>" );
-  textEditor.SetProperty( TextEditor ::Property::ENABLE_MARKUP,  true );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "<u>ABC</u>EF<u>GH</u>");
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
 
   application.SendNotification();
   application.Render();
 
-  uint32_t expectedNumberOfUnderlinedGlyphs = 5u;
+  uint32_t expectedNumberOfUnderlineRuns = 2u;
 
-  Toolkit::Internal::TextEditor& textEditorImpl = GetImpl( textEditor );
-  const Text::Length numberOfUnderlineRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+  Toolkit::Internal::TextEditor& textEditorImpl        = GetImpl(textEditor);
+  const Text::Length             numberOfUnderlineRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
 
-  DALI_TEST_EQUALS( numberOfUnderlineRuns, expectedNumberOfUnderlinedGlyphs, TEST_LOCATION );
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
 
-  Vector<GlyphRun> underlineRuns;
+  Vector<UnderlinedGlyphRun> underlineRuns;
   underlineRuns.Resize(numberOfUnderlineRuns);
   textEditorImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
 
   //ABC are underlined
-  DALI_TEST_EQUALS( underlineRuns[0u].glyphIndex, 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[1u].glyphIndex, 1u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[2u].glyphIndex, 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[0u].glyphRun.glyphIndex, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[0u].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
 
   //GH are underlined
-  DALI_TEST_EQUALS( underlineRuns[3u].glyphIndex, 5u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[4u].glyphIndex, 6u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[1u].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[1u].glyphRun.numberOfGlyphs, 2u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupUnderlineAttributes(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupUnderlineAttributes ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  std::string testText =
+    "start<u>ABC1</u>then"
+    "<u type='solid'>ABC2</u>then"
+    "<u type='dashed'>ABC3</u>then"
+    "<u type='double'>ABC4</u>then"
+    "<u color='green'>ABC5</u>then"
+    "<u height='5.0f'>ABC6</u>then"
+    "<u type='dashed' dash-gap='3.0f'>ABC7</u>then"
+    "<u type='dashed' dash-width='4.0f'>ABC8</u>then"
+    "<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>ABC9</u>end";
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, testText);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 9u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl        = GetImpl(textEditor);
+  const Text::Length             numberOfUnderlineRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textEditorImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //<u>ABC1</u>
+      {"<u>ABC1</u>",
+       5u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         false,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='solid'>ABC2</u>
+      {"<u type='solid'>ABC2</u>",
+       13u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='dashed'>ABC3</u>
+      {"<u type='dashed'>ABC3</u>",
+       21u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='double'>ABC4</u>
+      {"<u type='double'>ABC4</u>",
+       29u,
+       4u,
+       {
+         Text::Underline::DOUBLE,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u color='green'>ABC5</u>
+      {"<u color='green'>ABC5</u>",
+       37u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         0u,
+         1u,
+         2u,
+         false,
+         true,
+         false,
+         false,
+         false,
+       }},
+
+      //<u height='5.0f'>ABC6</u>
+      {"<u height='5.0f'>ABC6</u>",
+       45u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         5u,
+         1u,
+         2u,
+         false,
+         false,
+         true,
+         false,
+         false,
+       }},
+
+      //<u type='dashed' dash-gap='3.0f'>ABC7</u>
+      {"<u type='dashed' dash-gap='3.0f'>ABC7</u>",
+       53u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         3u,
+         2u,
+         true,
+         false,
+         false,
+         true,
+         false,
+       }},
+
+      //<u type='dashed' dash-width='4.0f'>ABC8</u>
+      {"<u type='dashed' dash-width='4.0f'>ABC8</u>",
+       61u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         4u,
+         true,
+         false,
+         false,
+         false,
+         true,
+       }},
+
+      //<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>
+      {"<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>",
+       69u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLUE,
+         4u,
+         2u,
+         3u,
+         true,
+         true,
+         true,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupSpanUnderline(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupSpanUnderline ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  std::string testText =
+    "start<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ABC1</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='solid'>ABC2</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed'>ABC3</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='double'>ABC4</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='green'>ABC5</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-height='5.0f'>ABC6</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-gap='3.0f'>ABC7</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-width='4.0f'>ABC8</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='blue' u-type='dashed' u-height='4.0f' u-dash-gap='2.0f' u-dash-width='3.0f'>ABC9</span>end";
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, testText);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 8u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl        = GetImpl(textEditor);
+  const Text::Length             numberOfUnderlineRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textEditorImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //<u type='solid'>ABC2</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='solid'>ABC2</span>",
+       13u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='dashed'>ABC3</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed'>ABC3</span>",
+       21u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='double'>ABC4</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='double'>ABC4</span>",
+       29u,
+       4u,
+       {
+         Text::Underline::DOUBLE,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u color='green'>ABC5</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='green'>ABC5</span>",
+       37u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         0u,
+         1u,
+         2u,
+         false,
+         true,
+         false,
+         false,
+         false,
+       }},
+
+      //<u height='5.0f'>ABC6</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-height='5.0f'>ABC6</span>",
+       45u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         5u,
+         1u,
+         2u,
+         false,
+         false,
+         true,
+         false,
+         false,
+       }},
+
+      //<u type='dashed' dash-gap='3.0f'>ABC7</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-gap='3.0f'>ABC7</span>",
+       53u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         3u,
+         2u,
+         true,
+         false,
+         false,
+         true,
+         false,
+       }},
+
+      //<u type='dashed' dash-width='4.0f'>ABC8</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-width='4.0f'>ABC8</span>",
+       61u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         4u,
+         true,
+         false,
+         false,
+         false,
+         true,
+       }},
+
+      //<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='blue' u-type='dashed' u-height='4.0f' u-dash-gap='2.0f' u-dash-width='3.0f'>ABC9</span>",
+       69u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLUE,
+         4u,
+         2u,
+         3u,
+         true,
+         true,
+         true,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupNestedUnderlineTags(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupNestedUnderlineTags ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  std::string testText = "start<u height='5.0f' color='green' >AB<u color='blue' >XYZ</u>CDE</u>end";
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, testText);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 2u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl        = GetImpl(textEditor);
+  const Text::Length             numberOfUnderlineRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textEditorImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //Outter
+      {"<u height='5.0f' color='green' >AB<u color='blue' >XYZ</u>CDE</u>",
+       5u,
+       8u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         5u,
+         1u,
+         2u,
+         false,
+         true,
+         true,
+         false,
+         false,
+       }},
+
+      //Inner
+      {"<u color='blue' >XYZ</u>",
+       7u,
+       3u,
+       {
+         Text::Underline::SOLID,
+         Color::BLUE,
+         5u,
+         1u,
+         2u,
+         false,
+         true,
+         true,
+         false,
+         false,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupNestedStrikethroughTags(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupNestedStrikethroughTags ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  std::string testText = "start<s height='5.0f' color='green' >AB<s color='blue' >XYZ</s>CDE</s>end";
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, testText);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 2u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl            = GetImpl(textEditor);
+  const Text::Length             numberOfStrikethroughRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textEditorImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //Outter
+      {"<s height='5.0f' color='green' >AB<s color='blue' >XYZ</s>CDE</s>",
+       5u,
+       8u,
+       {
+         Color::GREEN,
+         5.0f,
+         true,
+         true,
+       }},
+
+      //Inner
+      {"<s color='blue' >XYZ</s>",
+       7u,
+       3u,
+       {
+         Color::BLUE,
+         5.0f,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupStrikethroughAttributes(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupStrikethroughAttributes ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  std::string testText =
+    "start<s>ABC1</s>then"
+    "<s color='green'>ABC2</s>then"
+    "<s height='5.0f'>ABC3</s>then"
+    "<s color='blue' height='4.0f' >ABC4</s>end";
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, testText);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 4u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl            = GetImpl(textEditor);
+  const Text::Length             numberOfStrikethroughRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textEditorImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+
+      {"<s>ABC1</s>",
+       5u,
+       4u,
+       {Color::BLACK,
+        0.0f,
+        false,
+        false}},
+
+      {"<s color='green'>ABC2</s>",
+       13u,
+       4u,
+       {Color::GREEN,
+        0.0f,
+        true,
+        false}},
+
+      {"<s height='5.0f'>ABC3</s>",
+       21u,
+       4u,
+       {Color::BLACK,
+        5.0f,
+        false,
+        true}},
+
+      {"<s color='blue' height='4.0f' >ABC4</s>",
+       29u,
+       4u,
+       {Color::BLUE,
+        4.0f,
+        true,
+        true}},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupSpanStrikethrough(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupSpanStrikethrough ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  std::string testText =
+    "start<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ABC1</span>then"
+    "<span s-color='blue'>ABC2</span>then"
+    "<span s-height='2.0f'>ABC3</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' s-color='green' s-height='5.0f'>ABC4</span>end";
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, testText);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 3u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl            = GetImpl(textEditor);
+  const Text::Length             numberOfStrikethroughRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textEditorImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+
+      {"<span s-color='blue'>ABC2</span>then",
+       13u,
+       4u,
+       {Color::BLUE,
+        0.0f,
+        true,
+        false}},
+
+      {"<span s-height='2.0f'>ABC3</span>then",
+       21u,
+       4u,
+       {Color::BLACK,
+        2.0f,
+        false,
+        true}},
+
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' s-color='green' s-height='5.0f'>ABC4</span>",
+       29u,
+       4u,
+       {Color::GREEN,
+        5.0f,
+        true,
+        true}},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
 
   END_TEST;
 }
@@ -118,27 +846,26 @@ int UtcDaliTextEditorFontPointSizeLargerThanAtlas(void)
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set size to avoid automatic eliding
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
   //Set very large font-size using point-size
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 1000);
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 1000);
   //Specify font-family
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
   //Set text to check if appear or not
   textEditor.SetProperty(TextEditor::Property::TEXT, "A");
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
   //Check if Glyph is added to AtlasGlyphManger or not
   int countAtlas = AtlasGlyphManager::Get().GetMetrics().mAtlasMetrics.mAtlasCount;
-  DALI_TEST_EQUALS( countAtlas, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(countAtlas, 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliTextEditorFontPointSizeLargerThanAtlasPlaceholderCase(void)
 {
   ToolkitTestApplication application;
@@ -146,25 +873,25 @@ int UtcDaliTextEditorFontPointSizeLargerThanAtlasPlaceholderCase(void)
 
   //Set Map of placeholder: text, font-family and point-size
   Property::Map placeholderMapSet;
-  placeholderMapSet["text"] = "A";
+  placeholderMapSet["text"]       = "A";
   placeholderMapSet["fontFamily"] = "DejaVu Sans";
-  placeholderMapSet["pixelSize"] = 1000.0f;
+  placeholderMapSet["pixelSize"]  = 1000.0f;
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set size to avoid automatic eliding
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
   //Set placeholder
-  textEditor.SetProperty( TextEditor::Property::PLACEHOLDER, placeholderMapSet) ;
+  textEditor.SetProperty(TextEditor::Property::PLACEHOLDER, placeholderMapSet);
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
   //Check if Glyph is added to AtlasGlyphManger or not
   int countAtlas = AtlasGlyphManager::Get().GetMetrics().mAtlasMetrics.mAtlasCount;
-  DALI_TEST_EQUALS( countAtlas, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(countAtlas, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -175,27 +902,58 @@ int UtcDaliTextEditorBackgroundTag(void)
   tet_infoline("UtcDaliTextEditorBackgroundTag\n");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
+
+  editor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "H<background color='red'>e</background> Worl<background color='yellow'>d</background>");
+  application.GetScene().Add(editor);
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextEditor& editorImpl                   = GetImpl(editor);
+  const ColorIndex* const        backgroundColorIndicesBuffer = editorImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
+
+  DALI_TEST_CHECK(backgroundColorIndicesBuffer);
+
+  //default color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
+
+  //red color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
+
+  //yellow color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorSpanBackgroundTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextEditorSpanBackgroundTag\n");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
 
-  editor.SetProperty( TextEditor ::Property::ENABLE_MARKUP,  true );
-  editor.SetProperty( TextEditor::Property::TEXT, "H<background color='red'>e</background> Worl<background color='yellow'>d</background>" );
-  application.GetScene().Add( editor );
+  editor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "H<span background-color='red'>e</span> Worl<span background-color='yellow'>d</span>");
+  application.GetScene().Add(editor);
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextEditor& editorImpl = GetImpl( editor );
-  const ColorIndex* const backgroundColorIndicesBuffer = editorImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
+  Toolkit::Internal::TextEditor& editorImpl                   = GetImpl(editor);
+  const ColorIndex* const        backgroundColorIndicesBuffer = editorImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
 
-  DALI_TEST_CHECK( backgroundColorIndicesBuffer );
+  DALI_TEST_CHECK(backgroundColorIndicesBuffer);
 
   //default color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
 
   //red color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
 
   //yellow color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -206,17 +964,17 @@ int UtcDaliTextEditorTextWithSpan(void)
   tet_infoline("UtcDaliTextEditorTextWithSpan\n");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  editor.SetProperty( TextEditor ::Property::ENABLE_MARKUP,  true );
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello Span" );
-  application.GetScene().Add( editor );
+  editor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello Span");
+  application.GetScene().Add(editor);
 
   application.SendNotification();
   application.Render();
 
   Vector3 originalSize = editor.GetNaturalSize();
-  editor.SetProperty( TextEditor::Property::TEXT, "H<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ello</span> Span" );
+  editor.SetProperty(TextEditor::Property::TEXT, "H<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ello</span> Span");
 
   application.SendNotification();
   application.Render();
@@ -225,41 +983,40 @@ int UtcDaliTextEditorTextWithSpan(void)
 
   DALI_TEST_GREATER(spanSize.width, originalSize.width, TEST_LOCATION);
 
-  Toolkit::Internal::TextEditor& editorImpl = GetImpl( editor );
-  const ColorIndex* const colorIndicesBuffer1 = editorImpl.GetTextController()->GetTextModel()->GetColorIndices();
+  Toolkit::Internal::TextEditor& editorImpl          = GetImpl(editor);
+  const ColorIndex* const        colorIndicesBuffer1 = editorImpl.GetTextController()->GetTextModel()->GetColorIndices();
 
-  DALI_TEST_CHECK( colorIndicesBuffer1 );
+  DALI_TEST_CHECK(colorIndicesBuffer1);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[0], 0u, TEST_LOCATION);
 
   //span color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[1], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[1], 1u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[6], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[6], 0u, TEST_LOCATION);
 
-
-  editor.SetProperty( TextEditor::Property::TEXT, "<span font-size='45'>H</span>ello <span text-color='red'>S</span>pan" );
+  editor.SetProperty(TextEditor::Property::TEXT, "<span font-size='45'>H</span>ello <span text-color='red'>S</span>pan");
 
   application.SendNotification();
   application.Render();
 
   const ColorIndex* const colorIndicesBuffer2 = editorImpl.GetTextController()->GetTextModel()->GetColorIndices();
 
-  DALI_TEST_CHECK( colorIndicesBuffer2 );
+  DALI_TEST_CHECK(colorIndicesBuffer2);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[0], 0u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[1], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[1], 0u, TEST_LOCATION);
 
   //span color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[6], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[6], 1u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[7], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[7], 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -279,9 +1036,9 @@ int UtcDaliTextEditorControlBackgroundColor(void)
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextEditor& editorImpl = GetImpl(editor);
-  ControllerPtr controller = editorImpl.GetTextController();
-  Controller::Impl& controllerImpl = Controller::Impl::GetImplementation(*controller.Get());
+  Toolkit::Internal::TextEditor& editorImpl     = GetImpl(editor);
+  ControllerPtr                  controller     = editorImpl.GetTextController();
+  Controller::Impl&              controllerImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   // Default color is transparent
   controllerImpl.mEditableControlInterface->GetControlBackgroundColor(backgroundColor);
@@ -298,3 +1055,390 @@ int UtcDaliTextEditorControlBackgroundColor(void)
 
   END_TEST;
 }
+
+int UtcDaliTextEditorTextPositionWithMinLineAndBigFont(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorTextPositionWithMinLine ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "<span font-size='45'>H</span>\ni");
+  textEditor.SetProperty(DevelTextEditor::Property::MIN_LINE_SIZE, 50);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.GetScene().Add(textEditor);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextEditor& textEditorImpl = GetImpl(textEditor);
+  Text::ViewInterface&           view           = textEditorImpl.GetTextController()->GetView();
+
+  Length numberOfGlyphs = view.GetNumberOfGlyphs();
+
+  DALI_TEST_EQUALS(numberOfGlyphs, 3u, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  Vector<GlyphInfo> glyphs;
+  glyphs.Resize(numberOfGlyphs);
+
+  Vector<Vector2> positions;
+  positions.Resize(numberOfGlyphs);
+
+  float alignmentOffset = 0u;
+  numberOfGlyphs        = view.GetGlyphs(glyphs.Begin(),
+                                  positions.Begin(),
+                                  alignmentOffset,
+                                  0u,
+                                  numberOfGlyphs);
+
+  DALI_TEST_EQUALS(positions[2].y, 165.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupStrikethrough(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupStrikethrough ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "<s>ABC</s>EF<s color='red'>GH</s>");
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfStrikethroughGlyphs = 2u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl            = GetImpl(textEditor);
+  const Text::Length             numberOfStrikethroughRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughGlyphs, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textEditorImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  //ABC have strikethrough
+  DALI_TEST_EQUALS(strikethroughRuns[0u].glyphRun.glyphIndex, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[0u].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
+  DALI_TEST_CHECK(!strikethroughRuns[0u].properties.colorDefined);
+
+  //GH have strikethrough
+  DALI_TEST_EQUALS(strikethroughRuns[1u].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[1u].glyphRun.numberOfGlyphs, 2u, TEST_LOCATION);
+  DALI_TEST_CHECK(strikethroughRuns[1u].properties.colorDefined);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupStrikethroughNoEndTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupStrikethroughNoEndTag ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  application.GetScene().Add(textEditor);
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "<s>ABC");
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfStrikethroughGlyphs = 0u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl            = GetImpl(textEditor);
+  Text::Length                   numberOfStrikethroughRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughGlyphs, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupParagraphTag(void)
+
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTag ");
+
+  TextEditor textEditor = TextEditor::New();
+  application.GetScene().Add(textEditor);
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "text one <p>Paragraph two</p> text three <p>Paragraph four</p> text five");
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfBoundedParagraphRuns = 2u;
+
+  Toolkit::Internal::TextEditor& textEditorImpl               = GetImpl(textEditor);
+  const Text::Length             numberOfBoundedParagraphRuns = textEditorImpl.GetTextController()->GetTextModel()->GetNumberOfBoundedParagraphRuns();
+  DALI_TEST_EQUALS(numberOfBoundedParagraphRuns, expectedNumberOfBoundedParagraphRuns, TEST_LOCATION);
+
+  const Vector<BoundedParagraphRun>& boundedParagraphRuns = textEditorImpl.GetTextController()->GetTextModel()->GetBoundedParagraphRuns();
+
+  //<p>Paragraph two</p>
+  DALI_TEST_EQUALS(boundedParagraphRuns[0u].characterRun.characterIndex, 10u, TEST_LOCATION);
+  DALI_TEST_EQUALS(boundedParagraphRuns[0u].characterRun.numberOfCharacters, 14u, TEST_LOCATION);
+
+  //<p>Paragraph four</p>
+  DALI_TEST_EQUALS(boundedParagraphRuns[1u].characterRun.characterIndex, 37u, TEST_LOCATION);
+  DALI_TEST_EQUALS(boundedParagraphRuns[1u].characterRun.numberOfCharacters, 15u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupParagraphTagAlignAttribute(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute ");
+
+  // Apply alignment for each type on property level on three paragraphs and in-between text.
+  // Apply align in markup on the three paragraphs (each one a type).
+  // Using the same text to gain similar results from both the property level and the markup.
+  // Compare line alignment between the property level and the markup.
+
+  std::string textAlignOnPropertyLevel = "text outside<p>Paragraph end</p>text outside<p>Paragraph center</p>text outside<p>Paragraph begin</p><p>Paragraph property alignment</p>";
+  std::string textAlignInMarkup        = "text outside<p align='end'>Paragraph end</p>text outside<p align='center'>Paragraph center</p>text outside<p align='begin' >Paragraph begin</p><p>Paragraph property alignment</p>";
+
+  //Set size to avoid automatic eliding
+  Vector2 controllerSize = Vector2(1025, 1025);
+
+  TextEditor textEditorBeginAlign  = TextEditor::New();
+  TextEditor textEditorCenterAlign = TextEditor::New();
+  TextEditor textEditorEndAlign    = TextEditor::New();
+  TextEditor textEditorMultiAlign  = TextEditor::New();
+
+  application.GetScene().Add(textEditorBeginAlign);
+  application.GetScene().Add(textEditorCenterAlign);
+  application.GetScene().Add(textEditorEndAlign);
+  application.GetScene().Add(textEditorMultiAlign);
+
+  textEditorBeginAlign.SetProperty(TextEditor::Property::TEXT, textAlignOnPropertyLevel);
+  textEditorBeginAlign.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+  textEditorBeginAlign.SetProperty(DevelTextEditor::Property::ELLIPSIS, false);
+  textEditorBeginAlign.SetProperty(TextEditor::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::BEGIN);
+  textEditorBeginAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  textEditorCenterAlign.SetProperty(TextEditor::Property::TEXT, textAlignOnPropertyLevel);
+  textEditorCenterAlign.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+  textEditorCenterAlign.SetProperty(DevelTextEditor::Property::ELLIPSIS, false);
+  textEditorCenterAlign.SetProperty(TextEditor::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::CENTER);
+  textEditorCenterAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  textEditorEndAlign.SetProperty(TextEditor::Property::TEXT, textAlignOnPropertyLevel);
+  textEditorEndAlign.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+  textEditorEndAlign.SetProperty(DevelTextEditor::Property::ELLIPSIS, false);
+  textEditorEndAlign.SetProperty(TextEditor::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::END);
+  textEditorEndAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  textEditorMultiAlign.SetProperty(TextEditor::Property::TEXT, textAlignInMarkup);
+  textEditorMultiAlign.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+  textEditorMultiAlign.SetProperty(DevelTextEditor::Property::ELLIPSIS, false);
+  textEditorMultiAlign.SetProperty(TextEditor::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::CENTER);
+  textEditorMultiAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfBoundedParagraphRuns = 4u;
+  uint32_t expectedNumberOfLines                = 7u;
+
+  Toolkit::Internal::TextEditor& textEditorMultiAlignImpl  = GetImpl(textEditorMultiAlign);
+  Toolkit::Internal::TextEditor& textEditorBeginAlignImpl  = GetImpl(textEditorBeginAlign);
+  Toolkit::Internal::TextEditor& textEditorCenterAlignImpl = GetImpl(textEditorCenterAlign);
+  Toolkit::Internal::TextEditor& textEditorEndAlignImpl    = GetImpl(textEditorEndAlign);
+
+  const Text::Length numberOfBoundedParagraphRuns = textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetNumberOfBoundedParagraphRuns();
+  DALI_TEST_EQUALS(numberOfBoundedParagraphRuns, expectedNumberOfBoundedParagraphRuns, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  DALI_TEST_EQUALS(textEditorBeginAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textEditorBeginAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  DALI_TEST_EQUALS(textEditorCenterAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textEditorCenterAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  DALI_TEST_EQUALS(textEditorEndAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textEditorEndAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  const uint32_t LINE_INDEX_ALIGN_END    = 1u;
+  const uint32_t LINE_INDEX_ALIGN_CENTER = 3u;
+  const uint32_t LINE_INDEX_ALIGN_BEGIN  = 5u;
+  const uint32_t LINE_INDEX_OUTSIDE_1    = 0u;
+  const uint32_t LINE_INDEX_OUTSIDE_2    = 2u;
+  const uint32_t LINE_INDEX_OUTSIDE_3    = 4u;
+  const uint32_t LINE_INDEX_PARAGRAPH    = 6u;
+
+  //<p align='end'>Paragraph end</p>
+  const LineRun& lineEndFromMultiAlign = *(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_END);
+  const LineRun& lineEndFromEndAlign   = *(textEditorEndAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_END);
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute - <p align='end'>Paragraph end</p>");
+  DALI_TEST_EQUALS(lineEndFromMultiAlign.alignmentOffset, lineEndFromEndAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineEndFromMultiAlign.width, lineEndFromEndAlign.width, TEST_LOCATION);
+
+  //<p align='center'>Paragraph center</p>
+  const LineRun& lineCenterFromMultiAlign = *(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_CENTER);
+  const LineRun& lineEndFromCenterAlign   = *(textEditorCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_CENTER);
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute - <p align='center'>Paragraph center</p>");
+  DALI_TEST_EQUALS(lineCenterFromMultiAlign.alignmentOffset, lineEndFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineCenterFromMultiAlign.width, lineEndFromCenterAlign.width, TEST_LOCATION);
+
+  //<p align='begin' >Paragraph begin</p>
+  const LineRun& lineBeginFromMultiAlign = *(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_BEGIN);
+  const LineRun& lineEndFromBeginAlign   = *(textEditorBeginAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_BEGIN);
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute - <p align='begin' >Paragraph begin</p>");
+  DALI_TEST_EQUALS(lineBeginFromMultiAlign.alignmentOffset, lineEndFromBeginAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineBeginFromMultiAlign.width, lineEndFromBeginAlign.width, TEST_LOCATION);
+
+  //text outside
+  const LineRun& lineOutsideOneFromMultiAlign  = *(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_1);
+  const LineRun& lineOutsideOneFromCenterAlign = *(textEditorCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_1);
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute - text outside one");
+  DALI_TEST_EQUALS(lineOutsideOneFromMultiAlign.alignmentOffset, lineOutsideOneFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineOutsideOneFromMultiAlign.width, lineOutsideOneFromCenterAlign.width, TEST_LOCATION);
+
+  const LineRun& lineOutsideTwoFromMultiAlign  = *(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_2);
+  const LineRun& lineOutsideTwoFromCenterAlign = *(textEditorCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_2);
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute - text outside two");
+  DALI_TEST_EQUALS(lineOutsideTwoFromMultiAlign.alignmentOffset, lineOutsideTwoFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineOutsideTwoFromMultiAlign.width, lineOutsideTwoFromCenterAlign.width, TEST_LOCATION);
+
+  const LineRun& lineOutsideThreeFromMultiAlign  = *(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_3);
+  const LineRun& lineOutsideThreeFromCenterAlign = *(textEditorCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_3);
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute - text outside three");
+  DALI_TEST_EQUALS(lineOutsideThreeFromMultiAlign.alignmentOffset, lineOutsideThreeFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineOutsideThreeFromMultiAlign.width, lineOutsideThreeFromCenterAlign.width, TEST_LOCATION);
+
+  const LineRun& lineParagraphFromMultiAlign  = *(textEditorMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_PARAGRAPH);
+  const LineRun& lineParagraphFromCenterAlign = *(textEditorCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_PARAGRAPH);
+  tet_infoline(" UtcDaliTextEditorMarkupParagraphTagAlignAttribute - <p>Paragraph property alignment</p>");
+  DALI_TEST_EQUALS(lineParagraphFromMultiAlign.alignmentOffset, lineParagraphFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineParagraphFromMultiAlign.width, lineParagraphFromCenterAlign.width, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupCharacterSpacingTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupCharacterSpacingTag ");
+
+  const Length EXPECTED_NUMBER_OF_GLYPHS = 21u;
+
+  const float expandedCharSpacing  = 10.0f;
+  const float condensedCharSpacing = -5.0f;
+
+  TextEditor textEditor = TextEditor::New();
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "ABC EF\n<char-spacing value='-5.0f'>ABC EF\n</char-spacing><char-spacing value='10.0f'>ABC EF\n</char-spacing>");
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.GetScene().Add(textEditor);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextEditor& textEditorImpl = GetImpl(textEditor);
+  Text::ViewInterface&           view           = textEditorImpl.GetTextController()->GetView();
+
+  Length numberOfGlyphs = view.GetNumberOfGlyphs();
+
+  DALI_TEST_EQUALS(numberOfGlyphs, EXPECTED_NUMBER_OF_GLYPHS, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  Vector<GlyphInfo> glyphs;
+  glyphs.Resize(numberOfGlyphs);
+
+  Vector<Vector2> positions;
+  positions.Resize(numberOfGlyphs);
+
+  float alignmentOffset = 0u;
+  numberOfGlyphs        = view.GetGlyphs(glyphs.Begin(),
+                                  positions.Begin(),
+                                  alignmentOffset,
+                                  0u,
+                                  numberOfGlyphs);
+
+  const Length numberOfGlyphsOneLine = 7u;
+  for(Length i = 0; i < numberOfGlyphsOneLine - 1u; i++)
+  {
+    float diffLineNoCharSpacing = positions[i + 1].x - positions[i].x;
+
+    float diffLineCondensedCharSpacing = positions[numberOfGlyphsOneLine + i + 1].x - positions[numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineCondensedCharSpacing, diffLineNoCharSpacing + condensedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+    float diffLineExpandedCharSpacing = positions[2u * numberOfGlyphsOneLine + i + 1].x - positions[2u * numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineExpandedCharSpacing, diffLineNoCharSpacing + expandedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorMarkupSpanCharacterSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMarkupSpanCharacterSpacing ");
+
+  const Length EXPECTED_NUMBER_OF_GLYPHS = 21u;
+
+  const float expandedCharSpacing  = 10.0f;
+  const float condensedCharSpacing = -5.0f;
+
+  std::string testText =
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='blue' >ABC EF\n</span>"
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' char-space-value='-5.0f'>ABC EF\n</span>"
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='green' char-space-value='10.0f'>ABC EF\n</span>";
+
+  TextEditor textEditor = TextEditor::New();
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, testText);
+  textEditor.SetProperty(TextEditor ::Property::ENABLE_MARKUP, true);
+
+  application.GetScene().Add(textEditor);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextEditor& textEditorImpl = GetImpl(textEditor);
+  Text::ViewInterface&           view           = textEditorImpl.GetTextController()->GetView();
+
+  Length numberOfGlyphs = view.GetNumberOfGlyphs();
+
+  DALI_TEST_EQUALS(numberOfGlyphs, EXPECTED_NUMBER_OF_GLYPHS, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  Vector<GlyphInfo> glyphs;
+  glyphs.Resize(numberOfGlyphs);
+
+  Vector<Vector2> positions;
+  positions.Resize(numberOfGlyphs);
+
+  float alignmentOffset = 0u;
+  numberOfGlyphs        = view.GetGlyphs(glyphs.Begin(),
+                                  positions.Begin(),
+                                  alignmentOffset,
+                                  0u,
+                                  numberOfGlyphs);
+
+  const Length numberOfGlyphsOneLine = 7u;
+  for(Length i = 0; i < numberOfGlyphsOneLine - 1u; i++)
+  {
+    float diffLineNoCharSpacing = positions[i + 1].x - positions[i].x;
+
+    float diffLineCondensedCharSpacing = positions[numberOfGlyphsOneLine + i + 1].x - positions[numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineCondensedCharSpacing, diffLineNoCharSpacing + condensedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+    float diffLineExpandedCharSpacing = positions[2u * numberOfGlyphsOneLine + i + 1].x - positions[2u * numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineExpandedCharSpacing, diffLineNoCharSpacing + expandedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp
old mode 100755
new mode 100644
index 7cf4084..663e6db
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,16 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 
-#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
 #include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -33,64 +33,64 @@ using namespace Text;
 int UtcDaliTextFieldMultipleBackgroundText(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliTextFieldMultipleBackgroundText" );
+  tet_infoline("UtcDaliTextFieldMultipleBackgroundText");
 
   // Create a text field
   TextField textField = TextField::New();
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 400.f, 60.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(400.f, 60.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Add the text field to the stage
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextField& textFieldImpl = GetImpl( textField );
-  ControllerPtr controller = textFieldImpl.GetTextController();
-  Controller::Impl& controllerImpl = Controller::Impl::GetImplementation( *controller.Get() );
+  Toolkit::Internal::TextField& textFieldImpl  = GetImpl(textField);
+  ControllerPtr                 controller     = textFieldImpl.GetTextController();
+  Controller::Impl&             controllerImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   // Add multiple background colors for the text.
   ColorRun backgroundColorRun1;
-  backgroundColorRun1.characterRun.characterIndex = 0u;
+  backgroundColorRun1.characterRun.characterIndex     = 0u;
   backgroundColorRun1.characterRun.numberOfCharacters = 1u;
-  backgroundColorRun1.color = Color::RED;
-  controllerImpl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack( backgroundColorRun1 );
+  backgroundColorRun1.color                           = Color::RED;
+  controllerImpl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun1);
 
   ColorRun backgroundColorRun2;
-  backgroundColorRun2.characterRun.characterIndex = 5u;
+  backgroundColorRun2.characterRun.characterIndex     = 5u;
   backgroundColorRun2.characterRun.numberOfCharacters = 8u;
-  backgroundColorRun2.color = Color::CYAN;
-  controllerImpl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack( backgroundColorRun2 );
+  backgroundColorRun2.color                           = Color::CYAN;
+  controllerImpl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun2);
 
   ColorRun backgroundColorRun3;
-  backgroundColorRun3.characterRun.characterIndex = 23u;
+  backgroundColorRun3.characterRun.characterIndex     = 23u;
   backgroundColorRun3.characterRun.numberOfCharacters = 6u;
-  backgroundColorRun3.color = Color::GREEN;
-  controllerImpl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack( backgroundColorRun3 );
+  backgroundColorRun3.color                           = Color::GREEN;
+  controllerImpl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun3);
 
   // Check the case where there is only one character in the text
-  controller->SetText( "S" );
+  controller->SetText("S");
 
   application.SendNotification();
   application.Render();
 
   // The offscreen root actor should have one child: the renderable.
-  Actor stencil = textField.GetChildAt( 0u );
-  DALI_TEST_CHECK( stencil.GetChildCount() == 1u );
+  Actor stencil = textField.GetChildAt(0u);
+  DALI_TEST_CHECK(stencil.GetChildCount() == 1u);
 
   // The renderable actor should have two children: the text and the background.
-  Actor renderableActor = stencil.GetChildAt( 0u );
-  DALI_TEST_CHECK( renderableActor.GetChildCount() == 2u );
+  Actor renderableActor = stencil.GetChildAt(0u);
+  DALI_TEST_CHECK(renderableActor.GetChildCount() == 2u);
 
   // Check that the background is created
-  Actor backgroundActor = renderableActor.GetChildAt( 0u );
-  DALI_TEST_CHECK( backgroundActor );
-  DALI_TEST_CHECK( backgroundActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "TextBackgroundColorActor" );
+  Actor backgroundActor = renderableActor.GetChildAt(0u);
+  DALI_TEST_CHECK(backgroundActor);
+  DALI_TEST_CHECK(backgroundActor.GetProperty<std::string>(Dali::Actor::Property::NAME) == "TextBackgroundColorActor");
 
   // Change the text to contain more characters
-  controller->SetText( "Text Multiple Background Test" );
+  controller->SetText("Text Multiple Background Test");
 
   application.SendNotification();
   application.Render();
@@ -101,36 +101,36 @@ int UtcDaliTextFieldMultipleBackgroundText(void)
   application.SendNotification();
   application.Render();
 
-  // Now the offscreen root actor should have three children: the renderable, the highlight, and the background.
-  DALI_TEST_CHECK( stencil.GetChildCount() == 3u );
+  // Now the offscreen root actor should have four children: the renderable, the clipped cursor, the highlight, and the background.
+  DALI_TEST_CHECK(stencil.GetChildCount() == 4u);
   // The renderable actor should have one child only: the text
-  DALI_TEST_CHECK( renderableActor.GetChildCount() == 1u );
+  DALI_TEST_CHECK(renderableActor.GetChildCount() == 1u);
 
   // The background should now be lowered below the highlight
-  backgroundActor = stencil.GetChildAt( 0u );
-  DALI_TEST_CHECK( backgroundActor );
-  DALI_TEST_CHECK( backgroundActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "TextBackgroundColorActor" );
+  backgroundActor = stencil.GetChildAt(0u);
+  DALI_TEST_CHECK(backgroundActor);
+  DALI_TEST_CHECK(backgroundActor.GetProperty<std::string>(Dali::Actor::Property::NAME) == "TextBackgroundColorActor");
 
   END_TEST;
 }
 
-int UtcDaliTextFieldSelectText(void)
+int UtcDaliInternalTextFieldSelectText(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliTextFieldSelectText" );
+  tet_infoline("UtcDaliInternalTextFieldSelectText");
 
   // Create a text field
   TextField textField = TextField::New();
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 400.f, 60.f ) );
-  textField.SetProperty( TextField::Property::TEXT, "Hello World" );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(400.f, 60.f));
+  textField.SetProperty(TextField::Property::TEXT, "Hello World");
 
   // Add the text field to the stage
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextField& textFieldImpl = GetImpl( textField );
+  Toolkit::Internal::TextField& textFieldImpl = GetImpl(textField);
 
   application.SendNotification();
   application.Render();
@@ -141,7 +141,7 @@ int UtcDaliTextFieldSelectText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( textFieldImpl.GetSelectedText() == "Hello World" );
+  DALI_TEST_CHECK(textFieldImpl.GetSelectedText() == "Hello World");
 
   // Select None
   textFieldImpl.SelectNone();
@@ -149,7 +149,7 @@ int UtcDaliTextFieldSelectText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( textFieldImpl.GetSelectedText() == "" );
+  DALI_TEST_CHECK(textFieldImpl.GetSelectedText() == "");
 
   END_TEST;
 }
@@ -161,36 +161,765 @@ int UtcDaliTextFieldMarkupUnderline(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( TextField::Property::TEXT, "<u>ABC</u>EF<u>GH</u>" );
-  textField.SetProperty( TextField ::Property::ENABLE_MARKUP,  true );
+  textField.SetProperty(TextField::Property::TEXT, "<u>ABC</u>EF<u>GH</u>");
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
 
   application.SendNotification();
   application.Render();
 
-  uint32_t expectedNumberOfUnderlinedGlyphs = 5u;
+  uint32_t expectedNumberOfUnderlineRuns = 2u;
 
-  Toolkit::Internal::TextField& textFieldImpl = GetImpl( textField );
-  const Text::Length numberOfUnderlineRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+  Toolkit::Internal::TextField& textFieldImpl         = GetImpl(textField);
+  const Text::Length            numberOfUnderlineRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
 
-  DALI_TEST_EQUALS( numberOfUnderlineRuns, expectedNumberOfUnderlinedGlyphs, TEST_LOCATION );
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
 
-  Vector<GlyphRun> underlineRuns;
+  Vector<UnderlinedGlyphRun> underlineRuns;
   underlineRuns.Resize(numberOfUnderlineRuns);
   textFieldImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
 
   //ABC are underlined
-  DALI_TEST_EQUALS( underlineRuns[0u].glyphIndex, 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[1u].glyphIndex, 1u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[2u].glyphIndex, 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[0u].glyphRun.glyphIndex, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[0u].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
 
   //GH are underlined
-  DALI_TEST_EQUALS( underlineRuns[3u].glyphIndex, 5u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[4u].glyphIndex, 6u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[1u].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[1u].glyphRun.numberOfGlyphs, 2u, TEST_LOCATION);
 
   END_TEST;
+}
+
+int UtcDaliTextFieldMarkupUnderlineAttributes(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupUnderlineAttributes ");
 
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  std::string testText =
+    "start<u>ABC1</u>then"
+    "<u type='solid'>ABC2</u>then"
+    "<u type='dashed'>ABC3</u>then"
+    "<u type='double'>ABC4</u>then"
+    "<u color='green'>ABC5</u>then"
+    "<u height='5.0f'>ABC6</u>then"
+    "<u type='dashed' dash-gap='3.0f'>ABC7</u>then"
+    "<u type='dashed' dash-width='4.0f'>ABC8</u>then"
+    "<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>ABC9</u>end"
+
+    ;
+
+  textField.SetProperty(TextField::Property::TEXT, testText);
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 9u;
+
+  Toolkit::Internal::TextField& textFieldImpl         = GetImpl(textField);
+  const Text::Length            numberOfUnderlineRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textFieldImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //<u>ABC1</u>
+      {"<u>ABC1</u>",
+       5u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         false,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='solid'>ABC2</u>
+      {"<u type='solid'>ABC2</u>",
+       13u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='dashed'>ABC3</u>
+      {"<u type='dashed'>ABC3</u>",
+       21u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='double'>ABC4</u>
+      {"<u type='double'>ABC4</u>",
+       29u,
+       4u,
+       {
+         Text::Underline::DOUBLE,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u color='green'>ABC5</u>
+      {"<u color='green'>ABC5</u>",
+       37u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         0u,
+         1u,
+         2u,
+         false,
+         true,
+         false,
+         false,
+         false,
+       }},
+
+      //<u height='5.0f'>ABC6</u>
+      {"<u height='5.0f'>ABC6</u>",
+       45u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         5u,
+         1u,
+         2u,
+         false,
+         false,
+         true,
+         false,
+         false,
+       }},
+
+      //<u type='dashed' dash-gap='3.0f'>ABC7</u>
+      {"<u type='dashed' dash-gap='3.0f'>ABC7</u>",
+       53u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         3u,
+         2u,
+         true,
+         false,
+         false,
+         true,
+         false,
+       }},
+
+      //<u type='dashed' dash-width='4.0f'>ABC8</u>
+      {"<u type='dashed' dash-width='4.0f'>ABC8</u>",
+       61u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         4u,
+         true,
+         false,
+         false,
+         false,
+         true,
+       }},
+
+      //<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>
+      {"<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>",
+       69u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLUE,
+         4u,
+         2u,
+         3u,
+         true,
+         true,
+         true,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupSpanUnderline(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupSpanUnderline ");
+
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  std::string testText =
+    "start<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ABC1</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='solid'>ABC2</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed'>ABC3</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='double'>ABC4</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='green'>ABC5</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-height='5.0f'>ABC6</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-gap='3.0f'>ABC7</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-width='4.0f'>ABC8</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='blue' u-type='dashed' u-height='4.0f' u-dash-gap='2.0f' u-dash-width='3.0f'>ABC9</span>end";
+
+  textField.SetProperty(TextField::Property::TEXT, testText);
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 8u;
+
+  Toolkit::Internal::TextField& textFieldImpl         = GetImpl(textField);
+  const Text::Length            numberOfUnderlineRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textFieldImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //<u type='solid'>ABC2</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='solid'>ABC2</span>",
+       13u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='dashed'>ABC3</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed'>ABC3</span>",
+       21u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='double'>ABC4</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='double'>ABC4</span>",
+       29u,
+       4u,
+       {
+         Text::Underline::DOUBLE,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u color='green'>ABC5</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='green'>ABC5</span>",
+       37u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         0u,
+         1u,
+         2u,
+         false,
+         true,
+         false,
+         false,
+         false,
+       }},
+
+      //<u height='5.0f'>ABC6</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-height='5.0f'>ABC6</span>",
+       45u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         5u,
+         1u,
+         2u,
+         false,
+         false,
+         true,
+         false,
+         false,
+       }},
+
+      //<u type='dashed' dash-gap='3.0f'>ABC7</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-gap='3.0f'>ABC7</span>",
+       53u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         3u,
+         2u,
+         true,
+         false,
+         false,
+         true,
+         false,
+       }},
+
+      //<u type='dashed' dash-width='4.0f'>ABC8</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-width='4.0f'>ABC8</span>",
+       61u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         4u,
+         true,
+         false,
+         false,
+         false,
+         true,
+       }},
+
+      //<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='blue' u-type='dashed' u-height='4.0f' u-dash-gap='2.0f' u-dash-width='3.0f'>ABC9</span>",
+       69u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLUE,
+         4u,
+         2u,
+         3u,
+         true,
+         true,
+         true,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupNestedUnderlineTags(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupNestedUnderlineTags ");
+
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  std::string testText = "start<u height='5.0f' color='green' >AB<u color='blue' >XYZ</u>CDE</u>end";
+
+  textField.SetProperty(TextField::Property::TEXT, testText);
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 2u;
+
+  Toolkit::Internal::TextField& textFieldImpl         = GetImpl(textField);
+  const Text::Length            numberOfUnderlineRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textFieldImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //Outter
+      {"<u height='5.0f' color='green' >AB<u color='blue' >XYZ</u>CDE</u>",
+       5u,
+       8u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         5u,
+         1u,
+         2u,
+         false,
+         true,
+         true,
+         false,
+         false,
+       }},
+
+      //Inner
+      {"<u color='blue' >XYZ</u>",
+       7u,
+       3u,
+       {
+         Text::Underline::SOLID,
+         Color::BLUE,
+         5u,
+         1u,
+         2u,
+         false,
+         true,
+         true,
+         false,
+         false,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupNestedStrikethroughTags(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupNestedStrikethroughTags ");
+
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  std::string testText = "start<s height='5.0f' color='green' >AB<s color='blue' >XYZ</s>CDE</s>end";
+
+  textField.SetProperty(TextField::Property::TEXT, testText);
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 2u;
+
+  Toolkit::Internal::TextField& textFieldImpl             = GetImpl(textField);
+  const Text::Length            numberOfStrikethroughRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textFieldImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //Outter
+      {"<s height='5.0f' color='green' >AB<s color='blue' >XYZ</s>CDE</s>",
+       5u,
+       8u,
+       {
+         Color::GREEN,
+         5.0f,
+         true,
+         true,
+       }},
+
+      //Inner
+      {"<s color='blue' >XYZ</s>",
+       7u,
+       3u,
+       {
+         Color::BLUE,
+         5.0f,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupStrikethroughAttributes(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupStrikethroughAttributes ");
+
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  std::string testText =
+    "start<s>ABC1</s>then"
+    "<s color='green'>ABC2</s>then"
+    "<s height='5.0f'>ABC3</s>then"
+    "<s color='blue' height='4.0f' >ABC4</s>end";
+
+  textField.SetProperty(TextField::Property::TEXT, testText);
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 4u;
+
+  Toolkit::Internal::TextField& textFieldImpl             = GetImpl(textField);
+  const Text::Length            numberOfStrikethroughRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textFieldImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+
+      {"<s>ABC1</s>",
+       5u,
+       4u,
+       {Color::BLACK,
+        0.0f,
+        false,
+        false}},
+
+      {"<s color='green'>ABC2</s>",
+       13u,
+       4u,
+       {Color::GREEN,
+        0.0f,
+        true,
+        false}},
+
+      {"<s height='5.0f'>ABC3</s>",
+       21u,
+       4u,
+       {Color::BLACK,
+        5.0f,
+        false,
+        true}},
+
+      {"<s color='blue' height='4.0f' >ABC4</s>",
+       29u,
+       4u,
+       {Color::BLUE,
+        4.0f,
+        true,
+        true}},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupSpanStrikethrough(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupSpanStrikethrough ");
+
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  std::string testText =
+    "start<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ABC1</span>then"
+    "<span s-color='blue'>ABC2</span>then"
+    "<span s-height='2.0f'>ABC3</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' s-color='green' s-height='5.0f'>ABC4</span>end";
+
+  textField.SetProperty(TextField::Property::TEXT, testText);
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 3u;
+
+  Toolkit::Internal::TextField& textFieldImpl             = GetImpl(textField);
+  const Text::Length            numberOfStrikethroughRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textFieldImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+
+      {"<span s-color='blue'>ABC2</span>then",
+       13u,
+       4u,
+       {Color::BLUE,
+        0.0f,
+        true,
+        false}},
+
+      {"<span s-height='2.0f'>ABC3</span>then",
+       21u,
+       4u,
+       {Color::BLACK,
+        2.0f,
+        false,
+        true}},
+
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' s-color='green' s-height='5.0f'>ABC4</span>",
+       29u,
+       4u,
+       {Color::GREEN,
+        5.0f,
+        true,
+        true}},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
 }
 
 int UtcDaliTextFieldFontPointSizeLargerThanAtlas(void)
@@ -201,23 +930,22 @@ int UtcDaliTextFieldFontPointSizeLargerThanAtlas(void)
   // Create a Text field
   TextField textField = TextField::New();
   //Set size to avoid automatic eliding
-  textField.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
+  textField.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
   //Set very large font-size using point-size
-  textField.SetProperty( TextField::Property::POINT_SIZE, 1000) ;
+  textField.SetProperty(TextField::Property::POINT_SIZE, 1000);
   //Specify font-family
-  textField.SetProperty( TextField::Property::FONT_FAMILY, "DejaVu Sans");
+  textField.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
   //Set text to check if appear or not
-  textField.SetProperty( TextField::Property::TEXT, "A");
+  textField.SetProperty(TextField::Property::TEXT, "A");
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
   application.SendNotification();
   application.Render();
 
   //Check if Glyph is added to AtlasGlyphManger or not
   int countAtlas = AtlasGlyphManager::Get().GetMetrics().mAtlasMetrics.mAtlasCount;
-  DALI_TEST_EQUALS( countAtlas, 1, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(countAtlas, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -229,26 +957,25 @@ int UtcDaliTextFieldFontPointSizeLargerThanAtlasPlaceholderCase(void)
 
   //Set Map of placeholder: text, font-family and point-size
   Property::Map placeholderMapSet;
-  placeholderMapSet["text"] = "A";
+  placeholderMapSet["text"]       = "A";
   placeholderMapSet["fontFamily"] = "DejaVu Sans";
-  placeholderMapSet["pixelSize"] = 1000.0f;
+  placeholderMapSet["pixelSize"]  = 1000.0f;
 
   // Create a text editor
   TextField textField = TextField::New();
   //Set size to avoid automatic eliding
-  textField.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
+  textField.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
   //Set placeholder
-  textField.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet) ;
+  textField.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
   application.SendNotification();
   application.Render();
 
   //Check if Glyph is added to AtlasGlyphManger or not
   int countAtlas = AtlasGlyphManager::Get().GetMetrics().mAtlasMetrics.mAtlasCount;
-  DALI_TEST_EQUALS( countAtlas, 1, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(countAtlas, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -259,27 +986,58 @@ int UtcDaliTextFieldBackgroundTag(void)
   tet_infoline("UtcDaliTextFieldBackgroundTag\n");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
+
+  field.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "H<background color='red'>e</background> Worl<background color='yellow'>d</background>");
+  application.GetScene().Add(field);
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextField& fieldImpl                    = GetImpl(field);
+  const ColorIndex* const       backgroundColorIndicesBuffer = fieldImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
+
+  DALI_TEST_CHECK(backgroundColorIndicesBuffer);
+
+  //default color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
+
+  //red color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
+
+  //yellow color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldSpanBackgroundTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextFieldSpanBackgroundTag\n");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
 
-  field.SetProperty( TextField ::Property::ENABLE_MARKUP,  true );
-  field.SetProperty( TextField::Property::TEXT, "H<background color='red'>e</background> Worl<background color='yellow'>d</background>" );
-  application.GetScene().Add( field );
+  field.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "H<span background-color='red'>e</span> Worl<span background-color='yellow'>d</span>");
+  application.GetScene().Add(field);
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextField& fieldImpl = GetImpl( field );
-  const ColorIndex* const backgroundColorIndicesBuffer = fieldImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
+  Toolkit::Internal::TextField& fieldImpl                    = GetImpl(field);
+  const ColorIndex* const       backgroundColorIndicesBuffer = fieldImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
 
-  DALI_TEST_CHECK( backgroundColorIndicesBuffer );
+  DALI_TEST_CHECK(backgroundColorIndicesBuffer);
 
   //default color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
 
   //red color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
 
   //yellow color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -290,31 +1048,30 @@ int UtcDaliToolkitTextFieldEllipsisInternalAPIs(void)
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisInternalAPIs ");
   TextField textField = TextField::New();
 
-  Toolkit::Internal::TextField& textFieldImpl = GetImpl( textField );
-  Text::ViewInterface& view = textFieldImpl.GetTextController()->GetView();
+  Toolkit::Internal::TextField& textFieldImpl = GetImpl(textField);
+  Text::ViewInterface&          view          = textFieldImpl.GetTextController()->GetView();
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisInternalAPIs - ELLIPSIS Disabled");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS, false);
-  DALI_TEST_EQUALS( textField.GetProperty< bool >( DevelTextField::Property::ELLIPSIS ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<bool>(DevelTextField::Property::ELLIPSIS), false, TEST_LOCATION);
   DALI_TEST_CHECK(!(view.IsTextElideEnabled()));
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisInternalAPIs - ELLIPSIS Enabled");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS, true);
-  DALI_TEST_EQUALS( textField.GetProperty< bool >( DevelTextField::Property::ELLIPSIS ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<bool>(DevelTextField::Property::ELLIPSIS), true, TEST_LOCATION);
   DALI_TEST_CHECK(view.IsTextElideEnabled());
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisInternalAPIs - GetStartIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( view.GetStartIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetStartIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisInternalAPIs - GetEndIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( view.GetEndIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetEndIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisInternalAPIs - GetFirstMiddleIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( view.GetFirstMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetFirstMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisInternalAPIs - GetSecondMiddleIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( view.GetSecondMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(view.GetSecondMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -324,17 +1081,17 @@ int UtcDaliTextFieldTextWithSpan(void)
   tet_infoline("UtcDaliTextFieldTextWithSpan\n");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  field.SetProperty( TextField ::Property::ENABLE_MARKUP,  true );
-  field.SetProperty( TextField::Property::TEXT, "Hello Span" );
-  application.GetScene().Add( field );
+  field.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "Hello Span");
+  application.GetScene().Add(field);
 
   application.SendNotification();
   application.Render();
 
   Vector3 originalSize = field.GetNaturalSize();
-  field.SetProperty( TextField::Property::TEXT, "H<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ello</span> Span" );
+  field.SetProperty(TextField::Property::TEXT, "H<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ello</span> Span");
 
   application.SendNotification();
   application.Render();
@@ -343,41 +1100,40 @@ int UtcDaliTextFieldTextWithSpan(void)
 
   DALI_TEST_GREATER(spanSize.width, originalSize.width, TEST_LOCATION);
 
-  Toolkit::Internal::TextField& fieldImpl = GetImpl( field );
-  const ColorIndex* const colorIndicesBuffer1 = fieldImpl.GetTextController()->GetTextModel()->GetColorIndices();
+  Toolkit::Internal::TextField& fieldImpl           = GetImpl(field);
+  const ColorIndex* const       colorIndicesBuffer1 = fieldImpl.GetTextController()->GetTextModel()->GetColorIndices();
 
-  DALI_TEST_CHECK( colorIndicesBuffer1 );
+  DALI_TEST_CHECK(colorIndicesBuffer1);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[0], 0u, TEST_LOCATION);
 
   //span color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[1], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[1], 1u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[6], 0u, TEST_LOCATION);
-
+  DALI_TEST_EQUALS(colorIndicesBuffer1[6], 0u, TEST_LOCATION);
 
-  field.SetProperty( TextField::Property::TEXT, "<span font-size='45'>H</span>ello <span text-color='red'>S</span>pan" );
+  field.SetProperty(TextField::Property::TEXT, "<span font-size='45'>H</span>ello <span text-color='red'>S</span>pan");
 
   application.SendNotification();
   application.Render();
 
   const ColorIndex* const colorIndicesBuffer2 = fieldImpl.GetTextController()->GetTextModel()->GetColorIndices();
 
-  DALI_TEST_CHECK( colorIndicesBuffer2 );
+  DALI_TEST_CHECK(colorIndicesBuffer2);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[0], 0u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[1], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[1], 0u, TEST_LOCATION);
 
   //span color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[6], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[6], 1u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[7], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[7], 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -397,9 +1153,9 @@ int UtcDaliTextFieldControlBackgroundColor(void)
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextField& fieldImpl = GetImpl(field);
-  ControllerPtr controller = fieldImpl.GetTextController();
-  Controller::Impl& controllerImpl = Controller::Impl::GetImplementation(*controller.Get());
+  Toolkit::Internal::TextField& fieldImpl      = GetImpl(field);
+  ControllerPtr                 controller     = fieldImpl.GetTextController();
+  Controller::Impl&             controllerImpl = Controller::Impl::GetImplementation(*controller.Get());
 
   // Default color is transparent
   controllerImpl.mEditableControlInterface->GetControlBackgroundColor(backgroundColor);
@@ -416,3 +1172,182 @@ int UtcDaliTextFieldControlBackgroundColor(void)
 
   END_TEST;
 }
+
+int UtcDaliTextFieldMarkupStrikethrough(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupStrikethrough ");
+
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  textField.SetProperty(TextField::Property::TEXT, "<s>ABC</s>EF<s color='red'>GH</s>");
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfStrikethroughGlyphs = 2u;
+
+  Toolkit::Internal::TextField& textFieldImpl             = GetImpl(textField);
+  const Text::Length            numberOfStrikethroughRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughGlyphs, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textFieldImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  //ABC have strikethrough
+  DALI_TEST_EQUALS(strikethroughRuns[0u].glyphRun.glyphIndex, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[0u].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
+  DALI_TEST_CHECK(!strikethroughRuns[0u].properties.colorDefined);
+
+  //GH have strikethrough
+  DALI_TEST_EQUALS(strikethroughRuns[1u].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[1u].glyphRun.numberOfGlyphs, 2u, TEST_LOCATION);
+  DALI_TEST_CHECK(strikethroughRuns[1u].properties.colorDefined);
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupStrikethroughNoEndTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupStrikethroughNoEndTag ");
+
+  TextField textField = TextField::New();
+
+  application.GetScene().Add(textField);
+
+  textField.SetProperty(TextField::Property::TEXT, "<s>ABC");
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfStrikethroughGlyphs = 0u;
+
+  Toolkit::Internal::TextField& textFieldImpl             = GetImpl(textField);
+  Text::Length                  numberOfStrikethroughRuns = textFieldImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughGlyphs, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupCharacterSpacingTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupCharacterSpacingTag ");
+
+  const Length EXPECTED_NUMBER_OF_GLYPHS = 21u;
+
+  const float expandedCharSpacing  = 10.0f;
+  const float condensedCharSpacing = -5.0f;
+
+  TextField textField = TextField::New();
+
+  textField.SetProperty(TextField::Property::TEXT, "ABC EF\n<char-spacing value='-5.0f'>ABC EF\n</char-spacing><char-spacing value='10.0f'>ABC EF\n</char-spacing>");
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.GetScene().Add(textField);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextField& textFieldImpl = GetImpl(textField);
+  Text::ViewInterface&          view          = textFieldImpl.GetTextController()->GetView();
+
+  Length numberOfGlyphs = view.GetNumberOfGlyphs();
+
+  DALI_TEST_EQUALS(numberOfGlyphs, EXPECTED_NUMBER_OF_GLYPHS, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  Vector<GlyphInfo> glyphs;
+  glyphs.Resize(numberOfGlyphs);
+
+  Vector<Vector2> positions;
+  positions.Resize(numberOfGlyphs);
+
+  float alignmentOffset = 0u;
+  numberOfGlyphs        = view.GetGlyphs(glyphs.Begin(),
+                                  positions.Begin(),
+                                  alignmentOffset,
+                                  0u,
+                                  numberOfGlyphs);
+
+  const Length numberOfGlyphsOneLine = 7u;
+  for(Length i = 0; i < numberOfGlyphsOneLine - 1u; i++)
+  {
+    float diffLineNoCharSpacing = positions[i + 1].x - positions[i].x;
+
+    float diffLineCondensedCharSpacing = positions[numberOfGlyphsOneLine + i + 1].x - positions[numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineCondensedCharSpacing, diffLineNoCharSpacing + condensedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+    float diffLineExpandedCharSpacing = positions[2u * numberOfGlyphsOneLine + i + 1].x - positions[2u * numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineExpandedCharSpacing, diffLineNoCharSpacing + expandedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldMarkupSpanCharacterSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldMarkupSpanCharacterSpacing ");
+
+  const Length EXPECTED_NUMBER_OF_GLYPHS = 21u;
+
+  const float expandedCharSpacing  = 10.0f;
+  const float condensedCharSpacing = -5.0f;
+
+  std::string testText =
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='blue' >ABC EF\n</span>"
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' char-space-value='-5.0f'>ABC EF\n</span>"
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='green' char-space-value='10.0f'>ABC EF\n</span>";
+
+  TextField textField = TextField::New();
+
+  textField.SetProperty(TextField::Property::TEXT, testText);
+  textField.SetProperty(TextField ::Property::ENABLE_MARKUP, true);
+
+  application.GetScene().Add(textField);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextField& textFieldImpl = GetImpl(textField);
+  Text::ViewInterface&          view          = textFieldImpl.GetTextController()->GetView();
+
+  Length numberOfGlyphs = view.GetNumberOfGlyphs();
+
+  DALI_TEST_EQUALS(numberOfGlyphs, EXPECTED_NUMBER_OF_GLYPHS, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  Vector<GlyphInfo> glyphs;
+  glyphs.Resize(numberOfGlyphs);
+
+  Vector<Vector2> positions;
+  positions.Resize(numberOfGlyphs);
+
+  float alignmentOffset = 0u;
+  numberOfGlyphs        = view.GetGlyphs(glyphs.Begin(),
+                                  positions.Begin(),
+                                  alignmentOffset,
+                                  0u,
+                                  numberOfGlyphs);
+
+  const Length numberOfGlyphsOneLine = 7u;
+  for(Length i = 0; i < numberOfGlyphsOneLine - 1u; i++)
+  {
+    float diffLineNoCharSpacing = positions[i + 1].x - positions[i].x;
+
+    float diffLineCondensedCharSpacing = positions[numberOfGlyphsOneLine + i + 1].x - positions[numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineCondensedCharSpacing, diffLineNoCharSpacing + condensedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+    float diffLineExpandedCharSpacing = positions[2u * numberOfGlyphsOneLine + i + 1].x - positions[2u * numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineExpandedCharSpacing, diffLineNoCharSpacing + expandedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
old mode 100755
new mode 100644
index b72dcb4..31de850
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextLabel-internal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 #include <dali-toolkit/internal/controls/text-controls/text-label-impl.h>
-#include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
 
@@ -38,36 +38,765 @@ int UtcDaliTextLabelMarkupUnderline(void)
 
   TextLabel textLabel = TextLabel::New();
 
-  application.GetScene().Add( textLabel );
+  application.GetScene().Add(textLabel);
 
-  textLabel.SetProperty( TextLabel::Property::TEXT, "<u>ABC</u>EF<u>GH</u>" );
-  textLabel.SetProperty( TextLabel ::Property::ENABLE_MARKUP,  true );
+  textLabel.SetProperty(TextLabel::Property::TEXT, "<u>ABC</u>EF<u>GH</u>");
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
 
   application.SendNotification();
   application.Render();
 
-  uint32_t expectedNumberOfUnderlinedGlyphs = 5u;
+  uint32_t expectedNumberOfUnderlineRuns = 2u;
 
-  Toolkit::Internal::TextLabel& textLabelImpl = GetImpl( textLabel );
-  const Text::Length numberOfUnderlineRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+  Toolkit::Internal::TextLabel& textLabelImpl         = GetImpl(textLabel);
+  const Text::Length            numberOfUnderlineRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
 
-  DALI_TEST_EQUALS( numberOfUnderlineRuns, expectedNumberOfUnderlinedGlyphs, TEST_LOCATION );
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
 
-  Vector<GlyphRun> underlineRuns;
+  Vector<UnderlinedGlyphRun> underlineRuns;
   underlineRuns.Resize(numberOfUnderlineRuns);
   textLabelImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
 
   //ABC are underlined
-  DALI_TEST_EQUALS( underlineRuns[0u].glyphIndex, 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[1u].glyphIndex, 1u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[2u].glyphIndex, 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[0u].glyphRun.glyphIndex, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[0u].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
 
   //GH are underlined
-  DALI_TEST_EQUALS( underlineRuns[3u].glyphIndex, 5u, TEST_LOCATION);
-  DALI_TEST_EQUALS( underlineRuns[4u].glyphIndex, 6u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[1u].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(underlineRuns[1u].glyphRun.numberOfGlyphs, 2u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupUnderlineAttributes(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupUnderlineAttributes ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  std::string testText =
+    "start<u>ABC1</u>then"
+    "<u type='solid'>ABC2</u>then"
+    "<u type='dashed'>ABC3</u>then"
+    "<u type='double'>ABC4</u>then"
+    "<u color='green'>ABC5</u>then"
+    "<u height='5.0f'>ABC6</u>then"
+    "<u type='dashed' dash-gap='3.0f'>ABC7</u>then"
+    "<u type='dashed' dash-width='4.0f'>ABC8</u>then"
+    "<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>ABC9</u>end"
+
+    ;
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, testText);
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 9u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl         = GetImpl(textLabel);
+  const Text::Length            numberOfUnderlineRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textLabelImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //<u>ABC1</u>
+      {"<u>ABC1</u>",
+       5u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         false,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='solid'>ABC2</u>
+      {"<u type='solid'>ABC2</u>",
+       13u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='dashed'>ABC3</u>
+      {"<u type='dashed'>ABC3</u>",
+       21u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='double'>ABC4</u>
+      {"<u type='double'>ABC4</u>",
+       29u,
+       4u,
+       {
+         Text::Underline::DOUBLE,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u color='green'>ABC5</u>
+      {"<u color='green'>ABC5</u>",
+       37u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         0u,
+         1u,
+         2u,
+         false,
+         true,
+         false,
+         false,
+         false,
+       }},
+
+      //<u height='5.0f'>ABC6</u>
+      {"<u height='5.0f'>ABC6</u>",
+       45u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         5u,
+         1u,
+         2u,
+         false,
+         false,
+         true,
+         false,
+         false,
+       }},
+
+      //<u type='dashed' dash-gap='3.0f'>ABC7</u>
+      {"<u type='dashed' dash-gap='3.0f'>ABC7</u>",
+       53u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         3u,
+         2u,
+         true,
+         false,
+         false,
+         true,
+         false,
+       }},
+
+      //<u type='dashed' dash-width='4.0f'>ABC8</u>
+      {"<u type='dashed' dash-width='4.0f'>ABC8</u>",
+       61u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         4u,
+         true,
+         false,
+         false,
+         false,
+         true,
+       }},
+
+      //<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>
+      {"<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>",
+       69u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLUE,
+         4u,
+         2u,
+         3u,
+         true,
+         true,
+         true,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupSpanUnderline(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupSpanUnderline ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  std::string testText =
+    "start<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ABC1</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='solid'>ABC2</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed'>ABC3</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='double'>ABC4</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='green'>ABC5</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-height='5.0f'>ABC6</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-gap='3.0f'>ABC7</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-width='4.0f'>ABC8</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='blue' u-type='dashed' u-height='4.0f' u-dash-gap='2.0f' u-dash-width='3.0f'>ABC9</span>end";
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, testText);
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 8u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl         = GetImpl(textLabel);
+  const Text::Length            numberOfUnderlineRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textLabelImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //<u type='solid'>ABC2</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='solid'>ABC2</span>",
+       13u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='dashed'>ABC3</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed'>ABC3</span>",
+       21u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u type='double'>ABC4</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='double'>ABC4</span>",
+       29u,
+       4u,
+       {
+         Text::Underline::DOUBLE,
+         Color::BLACK,
+         0u,
+         1u,
+         2u,
+         true,
+         false,
+         false,
+         false,
+         false,
+       }},
+
+      //<u color='green'>ABC5</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='green'>ABC5</span>",
+       37u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         0u,
+         1u,
+         2u,
+         false,
+         true,
+         false,
+         false,
+         false,
+       }},
+
+      //<u height='5.0f'>ABC6</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-height='5.0f'>ABC6</span>",
+       45u,
+       4u,
+       {
+         Text::Underline::SOLID,
+         Color::BLACK,
+         5u,
+         1u,
+         2u,
+         false,
+         false,
+         true,
+         false,
+         false,
+       }},
+
+      //<u type='dashed' dash-gap='3.0f'>ABC7</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-gap='3.0f'>ABC7</span>",
+       53u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         3u,
+         2u,
+         true,
+         false,
+         false,
+         true,
+         false,
+       }},
+
+      //<u type='dashed' dash-width='4.0f'>ABC8</u>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-type='dashed' u-dash-width='4.0f'>ABC8</span>",
+       61u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLACK,
+         0u,
+         1u,
+         4u,
+         true,
+         false,
+         false,
+         false,
+         true,
+       }},
+
+      //<u color='blue' type='dashed' height='4.0f' dash-gap='2.0f' dash-width='3.0f'>
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' u-color='blue' u-type='dashed' u-height='4.0f' u-dash-gap='2.0f' u-dash-width='3.0f'>ABC9</span>",
+       69u,
+       4u,
+       {
+         Text::Underline::DASHED,
+         Color::BLUE,
+         4u,
+         2u,
+         3u,
+         true,
+         true,
+         true,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupNestedUnderlineTags(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupNestedUnderlineTags ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  std::string testText = "start<u height='5.0f' color='green' >AB<u color='blue' >XYZ</u>CDE</u>end";
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, testText);
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfUnderlineRuns = 2u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl         = GetImpl(textLabel);
+  const Text::Length            numberOfUnderlineRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfUnderlineRuns();
+
+  DALI_TEST_EQUALS(numberOfUnderlineRuns, expectedNumberOfUnderlineRuns, TEST_LOCATION);
+
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  textLabelImpl.GetTextController()->GetTextModel()->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  struct DataOfCase
+  {
+    std::string              title;
+    GlyphIndex               glyphIndex;
+    Length                   numberOfGlyphs;
+    UnderlineStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //Outter
+      {"<u height='5.0f' color='green' >AB<u color='blue' >XYZ</u>CDE</u>",
+       5u,
+       8u,
+       {
+         Text::Underline::SOLID,
+         Color::GREEN,
+         5u,
+         1u,
+         2u,
+         false,
+         true,
+         true,
+         false,
+         false,
+       }},
+
+      //Inner
+      {"<u color='blue' >XYZ</u>",
+       7u,
+       3u,
+       {
+         Text::Underline::SOLID,
+         Color::BLUE,
+         5u,
+         1u,
+         2u,
+         false,
+         true,
+         true,
+         false,
+         false,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfUnderlineRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(underlineRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == underlineRuns[i].properties);
+  }
 
   END_TEST;
+}
+
+int UtcDaliTextLabelMarkupNestedStrikethroughTags(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupNestedStrikethroughTags ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  std::string testText = "start<s height='5.0f' color='green' >AB<s color='blue' >XYZ</s>CDE</s>end";
 
+  textLabel.SetProperty(TextLabel::Property::TEXT, testText);
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 2u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl             = GetImpl(textLabel);
+  const Text::Length            numberOfStrikethroughRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textLabelImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+      //Outter
+      {"<s height='5.0f' color='green' >AB<s color='blue' >XYZ</s>CDE</s>",
+       5u,
+       8u,
+       {
+         Color::GREEN,
+         5.0f,
+         true,
+         true,
+       }},
+
+      //Inner
+      {"<s color='blue' >XYZ</s>",
+       7u,
+       3u,
+       {
+         Color::BLUE,
+         5.0f,
+         true,
+         true,
+       }},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupStrikethroughAttributes(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupStrikethroughAttributes ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  std::string testText =
+    "start<s>ABC1</s>then"
+    "<s color='green'>ABC2</s>then"
+    "<s height='5.0f'>ABC3</s>then"
+    "<s color='blue' height='4.0f' >ABC4</s>end";
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, testText);
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 4u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl             = GetImpl(textLabel);
+  const Text::Length            numberOfStrikethroughRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textLabelImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+
+      {"<s>ABC1</s>",
+       5u,
+       4u,
+       {Color::BLACK,
+        0.0f,
+        false,
+        false}},
+
+      {"<s color='green'>ABC2</s>",
+       13u,
+       4u,
+       {Color::GREEN,
+        0.0f,
+        true,
+        false}},
+
+      {"<s height='5.0f'>ABC3</s>",
+       21u,
+       4u,
+       {Color::BLACK,
+        5.0f,
+        false,
+        true}},
+
+      {"<s color='blue' height='4.0f' >ABC4</s>",
+       29u,
+       4u,
+       {Color::BLUE,
+        4.0f,
+        true,
+        true}},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupSpanStrikethrough(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupSpanStrikethrough ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  std::string testText =
+    "start<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ABC1</span>then"
+    "<span s-color='blue'>ABC2</span>then"
+    "<span s-height='2.0f'>ABC3</span>then"
+    "<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' s-color='green' s-height='5.0f'>ABC4</span>end";
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, testText);
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  const uint32_t expectedNumberOfStrikethroughRuns = 3u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl             = GetImpl(textLabel);
+  const Text::Length            numberOfStrikethroughRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughRuns, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textLabelImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  struct DataOfCase
+  {
+    std::string                  title;
+    GlyphIndex                   glyphIndex;
+    Length                       numberOfGlyphs;
+    StrikethroughStyleProperties properties;
+  };
+  DataOfCase data[] =
+    {
+
+      {"<span s-color='blue'>ABC2</span>then",
+       13u,
+       4u,
+       {Color::BLUE,
+        0.0f,
+        true,
+        false}},
+
+      {"<span s-height='2.0f'>ABC3</span>then",
+       21u,
+       4u,
+       {Color::BLACK,
+        2.0f,
+        false,
+        true}},
+
+      {"<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' s-color='green' s-height='5.0f'>ABC4</span>",
+       29u,
+       4u,
+       {Color::GREEN,
+        5.0f,
+        true,
+        true}},
+
+    };
+
+  for(uint32_t i = 0; i < expectedNumberOfStrikethroughRuns; i++)
+  {
+    tet_infoline(data[i].title.c_str());
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.glyphIndex, data[i].glyphIndex, TEST_LOCATION);
+    DALI_TEST_EQUALS(strikethroughRuns[i].glyphRun.numberOfGlyphs, data[i].numberOfGlyphs, TEST_LOCATION);
+    DALI_TEST_CHECK(data[i].properties == strikethroughRuns[i].properties);
+  }
+
+  END_TEST;
 }
 
 int UtcDaliTextLabelBackgroundTag(void)
@@ -76,27 +805,58 @@ int UtcDaliTextLabelBackgroundTag(void)
   tet_infoline("UtcDaliTextLabelBackgroundTag\n");
 
   TextLabel label = TextLabel::New();
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
+
+  label.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, "H<background color='red'>e</background> Worl<background color='yellow'>d</background>");
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& labelImpl                    = GetImpl(label);
+  const ColorIndex* const       backgroundColorIndicesBuffer = labelImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
+
+  DALI_TEST_CHECK(backgroundColorIndicesBuffer);
+
+  //default color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
+
+  //red color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
+
+  //yellow color
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelSpanBackgroundTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextLabelSpanBackgroundTag\n");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
 
-  label.SetProperty( TextLabel ::Property::ENABLE_MARKUP,  true );
-  label.SetProperty( TextLabel::Property::TEXT, "H<background color='red'>e</background> Worl<background color='yellow'>d</background>" );
-  application.GetScene().Add( label );
+  label.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, "H<span background-color='red'>e</span> Worl<span background-color='yellow'>d</span>");
+  application.GetScene().Add(label);
   application.SendNotification();
   application.Render();
 
-  Toolkit::Internal::TextLabel& labelImpl = GetImpl( label );
-  const ColorIndex* const backgroundColorIndicesBuffer = labelImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
+  Toolkit::Internal::TextLabel& labelImpl                    = GetImpl(label);
+  const ColorIndex* const       backgroundColorIndicesBuffer = labelImpl.GetTextController()->GetTextModel()->GetBackgroundColorIndices();
 
-  DALI_TEST_CHECK( backgroundColorIndicesBuffer );
+  DALI_TEST_CHECK(backgroundColorIndicesBuffer);
 
   //default color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[0], 0u, TEST_LOCATION);
 
   //red color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[1], 1u, TEST_LOCATION);
 
   //yellow color
-  DALI_TEST_EQUALS( backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(backgroundColorIndicesBuffer[7], 2u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -107,34 +867,33 @@ int UtcDaliToolkitTextlabelEllipsisInternalAPIs(void)
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs ");
   TextLabel textLabel = TextLabel::New();
 
-  Toolkit::Internal::TextLabel& textLabelImpl = GetImpl( textLabel );
-  const ModelInterface* const textModel = textLabelImpl.GetTextController()->GetTextModel();
-
+  Toolkit::Internal::TextLabel& textLabelImpl = GetImpl(textLabel);
+  const ModelInterface* const   textModel     = textLabelImpl.GetTextController()->GetTextModel();
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - ELLIPSIS Disabled");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS, false);
-  DALI_TEST_EQUALS( textLabel.GetProperty< bool >( DevelTextLabel::Property::ELLIPSIS ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<bool>(DevelTextLabel::Property::ELLIPSIS), false, TEST_LOCATION);
   DALI_TEST_CHECK(!(textModel->IsTextElideEnabled()));
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - ELLIPSIS Enabled");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS, true);
-  DALI_TEST_EQUALS( textLabel.GetProperty< bool >( DevelTextLabel::Property::ELLIPSIS ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<bool>(DevelTextLabel::Property::ELLIPSIS), true, TEST_LOCATION);
   DALI_TEST_CHECK(textModel->IsTextElideEnabled());
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetStartIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( textModel->GetStartIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(textModel->GetStartIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetEndIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( textModel->GetEndIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(textModel->GetEndIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetFirstMiddleIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( textModel->GetFirstMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(textModel->GetFirstMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetSecondMiddleIndexOfElidedGlyphs Default");
-  DALI_TEST_EQUALS( textModel->GetSecondMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(textModel->GetSecondMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   // Tests the rendering controller has been created.
-  TypesetterPtr typesetter = Typesetter::New( textModel );
+  TypesetterPtr typesetter = Typesetter::New(textModel);
   DALI_TEST_CHECK(typesetter);
 
   // Tests the view model has been created.
@@ -144,16 +903,16 @@ int UtcDaliToolkitTextlabelEllipsisInternalAPIs(void)
   DALI_TEST_CHECK(model->IsTextElideEnabled());
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetStartIndexOfElidedGlyphs ViewModel");
-  DALI_TEST_EQUALS( model->GetStartIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(model->GetStartIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetEndIndexOfElidedGlyphs ViewModel");
-  DALI_TEST_EQUALS( model->GetEndIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(model->GetEndIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetFirstMiddleIndexOfElidedGlyphs ViewModel");
-  DALI_TEST_EQUALS( model->GetFirstMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(model->GetFirstMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisInternalAPIs - GetSecondMiddleIndexOfElidedGlyphs ViewModel");
-  DALI_TEST_EQUALS( model->GetSecondMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(model->GetSecondMiddleIndexOfElidedGlyphs(), 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -163,17 +922,17 @@ int UtcDaliTextLabelTextWithSpan(void)
   tet_infoline("UtcDaliTextLabelTextWithSpan\n");
 
   TextLabel label = TextLabel::New();
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
-  label.SetProperty( TextLabel ::Property::ENABLE_MARKUP,  true );
-  label.SetProperty( TextLabel::Property::TEXT, "Hello Span" );
-  application.GetScene().Add( label );
+  label.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello Span");
+  application.GetScene().Add(label);
 
   application.SendNotification();
   application.Render();
 
   Vector3 originalSize = label.GetNaturalSize();
-  label.SetProperty( TextLabel::Property::TEXT, "H<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ello</span> Span" );
+  label.SetProperty(TextLabel::Property::TEXT, "H<span font-size='45' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red'>ello</span> Span");
 
   application.SendNotification();
   application.Render();
@@ -182,41 +941,423 @@ int UtcDaliTextLabelTextWithSpan(void)
 
   DALI_TEST_GREATER(spanSize.width, originalSize.width, TEST_LOCATION);
 
-  Toolkit::Internal::TextLabel& labelImpl = GetImpl( label );
-  const ColorIndex* const colorIndicesBuffer1 = labelImpl.GetTextController()->GetTextModel()->GetColorIndices();
+  Toolkit::Internal::TextLabel& labelImpl           = GetImpl(label);
+  const ColorIndex* const       colorIndicesBuffer1 = labelImpl.GetTextController()->GetTextModel()->GetColorIndices();
 
-  DALI_TEST_CHECK( colorIndicesBuffer1 );
+  DALI_TEST_CHECK(colorIndicesBuffer1);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[0], 0u, TEST_LOCATION);
 
   //span color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[1], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[1], 1u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer1[6], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer1[6], 0u, TEST_LOCATION);
 
-
-  label.SetProperty( TextLabel::Property::TEXT, "<span font-size='45'>H</span>ello <span text-color='red'>S</span>pan" );
+  label.SetProperty(TextLabel::Property::TEXT, "<span font-size='45'>H</span>ello <span text-color='red'>S</span>pan");
 
   application.SendNotification();
   application.Render();
 
   const ColorIndex* const colorIndicesBuffer2 = labelImpl.GetTextController()->GetTextModel()->GetColorIndices();
 
-  DALI_TEST_CHECK( colorIndicesBuffer2 );
+  DALI_TEST_CHECK(colorIndicesBuffer2);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[0], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[0], 0u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[1], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[1], 0u, TEST_LOCATION);
 
   //span color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[6], 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[6], 1u, TEST_LOCATION);
 
   //default color
-  DALI_TEST_EQUALS( colorIndicesBuffer2[7], 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorIndicesBuffer2[7], 0u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupStrikethrough(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupStrikethrough ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, "<s color='red'>ABC</s>EF<s color='green'>GH</s>");
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfStrikethroughGlyphs = 2u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl             = GetImpl(textLabel);
+  const Text::Length            numberOfStrikethroughRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughGlyphs, TEST_LOCATION);
+
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  textLabelImpl.GetTextController()->GetTextModel()->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  //ABC have strikethrough
+  DALI_TEST_EQUALS(strikethroughRuns[0u].glyphRun.glyphIndex, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[0u].glyphRun.numberOfGlyphs, 3u, TEST_LOCATION);
+  DALI_TEST_CHECK(strikethroughRuns[0u].properties.colorDefined);
+  DALI_TEST_EQUALS(strikethroughRuns[0u].properties.color.r, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[0u].properties.color.g, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[0u].properties.color.b, 0u, TEST_LOCATION);
+
+  //GH have strikethrough
+  DALI_TEST_EQUALS(strikethroughRuns[1u].glyphRun.glyphIndex, 5u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[1u].glyphRun.numberOfGlyphs, 2u, TEST_LOCATION);
+  DALI_TEST_CHECK(strikethroughRuns[1u].properties.colorDefined);
+  DALI_TEST_EQUALS(strikethroughRuns[1u].properties.color.r, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[1u].properties.color.g, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(strikethroughRuns[1u].properties.color.b, 0u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupStrikethroughNoEndTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupStrikethroughNoEndTag ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, "<s>ABC");
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfStrikethroughGlyphs = 0u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl             = GetImpl(textLabel);
+  Text::Length                  numberOfStrikethroughRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfStrikethroughRuns();
+
+  DALI_TEST_EQUALS(numberOfStrikethroughRuns, expectedNumberOfStrikethroughGlyphs, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupParagraphTag(void)
+
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTag ");
+  TextLabel textLabel = TextLabel::New();
+
+  application.GetScene().Add(textLabel);
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, "text one <p>Paragraph two</p> text three <p>Paragraph four</p> text five");
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  textLabel.SetProperty(TextLabel::Property::MULTI_LINE, true);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfBoundedParagraphRuns = 2u;
+
+  Toolkit::Internal::TextLabel& textLabelImpl                = GetImpl(textLabel);
+  const Text::Length            numberOfBoundedParagraphRuns = textLabelImpl.GetTextController()->GetTextModel()->GetNumberOfBoundedParagraphRuns();
+  DALI_TEST_EQUALS(numberOfBoundedParagraphRuns, expectedNumberOfBoundedParagraphRuns, TEST_LOCATION);
+
+  const Vector<BoundedParagraphRun>& boundedParagraphRuns = textLabelImpl.GetTextController()->GetTextModel()->GetBoundedParagraphRuns();
+
+  //<p>Paragraph two</p>
+  DALI_TEST_EQUALS(boundedParagraphRuns[0u].characterRun.characterIndex, 10u, TEST_LOCATION);
+  DALI_TEST_EQUALS(boundedParagraphRuns[0u].characterRun.numberOfCharacters, 14u, TEST_LOCATION);
+
+  //<p>Paragraph four</p>
+  DALI_TEST_EQUALS(boundedParagraphRuns[1u].characterRun.characterIndex, 37u, TEST_LOCATION);
+  DALI_TEST_EQUALS(boundedParagraphRuns[1u].characterRun.numberOfCharacters, 15u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupParagraphTagAlignAttribute(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute ");
+
+  // Apply alignment for each type on property level on three paragraphs and in-between text.
+  // Apply align in markup on the three paragraphs (each one a type).
+  // Using the same text to gain similar results from both the property level and the markup.
+  // Compare line alignment between the property level and the markup.
+
+  std::string textAlignOnPropertyLevel = "text outside<p>Paragraph end</p>text outside<p>Paragraph center</p>text outside<p>Paragraph begin</p><p>Paragraph property alignment</p>";
+  std::string textAlignInMarkup        = "text outside<p align='end'>Paragraph end</p>text outside<p align='center'>Paragraph center</p>text outside<p align='begin' >Paragraph begin</p><p>Paragraph property alignment</p>";
+
+  //Set size to avoid automatic eliding
+  Vector2 controllerSize = Vector2(1025, 1025);
+
+  TextLabel textLabelBeginAlign  = TextLabel::New();
+  TextLabel textLabelCenterAlign = TextLabel::New();
+  TextLabel textLabelEndAlign    = TextLabel::New();
+  TextLabel textLabelMultiAlign  = TextLabel::New();
+
+  application.GetScene().Add(textLabelBeginAlign);
+  application.GetScene().Add(textLabelCenterAlign);
+  application.GetScene().Add(textLabelEndAlign);
+  application.GetScene().Add(textLabelMultiAlign);
+
+  textLabelBeginAlign.SetProperty(TextLabel::Property::TEXT, textAlignOnPropertyLevel);
+  textLabelBeginAlign.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  textLabelBeginAlign.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  textLabelBeginAlign.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  textLabelBeginAlign.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::BEGIN);
+  textLabelBeginAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  textLabelCenterAlign.SetProperty(TextLabel::Property::TEXT, textAlignOnPropertyLevel);
+  textLabelCenterAlign.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  textLabelCenterAlign.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  textLabelCenterAlign.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  textLabelCenterAlign.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::CENTER);
+  textLabelCenterAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  textLabelEndAlign.SetProperty(TextLabel::Property::TEXT, textAlignOnPropertyLevel);
+  textLabelEndAlign.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  textLabelEndAlign.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  textLabelEndAlign.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  textLabelEndAlign.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::END);
+  textLabelEndAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  textLabelMultiAlign.SetProperty(TextLabel::Property::TEXT, textAlignInMarkup);
+  textLabelMultiAlign.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  textLabelMultiAlign.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  textLabelMultiAlign.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  textLabelMultiAlign.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, Dali::Toolkit::Text::HorizontalAlignment::CENTER);
+  textLabelMultiAlign.SetProperty(Actor::Property::SIZE, controllerSize);
+
+  application.SendNotification();
+  application.Render();
+
+  uint32_t expectedNumberOfBoundedParagraphRuns = 4u;
+  uint32_t expectedNumberOfLines                = 7u;
+
+  Toolkit::Internal::TextLabel& textLabelMultiAlignImpl  = GetImpl(textLabelMultiAlign);
+  Toolkit::Internal::TextLabel& textLabelBeginAlignImpl  = GetImpl(textLabelBeginAlign);
+  Toolkit::Internal::TextLabel& textLabelCenterAlignImpl = GetImpl(textLabelCenterAlign);
+  Toolkit::Internal::TextLabel& textLabelEndAlignImpl    = GetImpl(textLabelEndAlign);
+
+  const Text::Length numberOfBoundedParagraphRuns = textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetNumberOfBoundedParagraphRuns();
+  DALI_TEST_EQUALS(numberOfBoundedParagraphRuns, expectedNumberOfBoundedParagraphRuns, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  DALI_TEST_EQUALS(textLabelBeginAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textLabelBeginAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  DALI_TEST_EQUALS(textLabelCenterAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textLabelCenterAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  DALI_TEST_EQUALS(textLabelEndAlignImpl.GetTextController()->GetTextModel()->GetNumberOfLines(), expectedNumberOfLines, TEST_LOCATION);
+  DALI_TEST_CHECK(textLabelEndAlignImpl.GetTextController()->GetTextModel()->GetLines());
+
+  const uint32_t LINE_INDEX_ALIGN_END    = 1u;
+  const uint32_t LINE_INDEX_ALIGN_CENTER = 3u;
+  const uint32_t LINE_INDEX_ALIGN_BEGIN  = 5u;
+  const uint32_t LINE_INDEX_OUTSIDE_1    = 0u;
+  const uint32_t LINE_INDEX_OUTSIDE_2    = 2u;
+  const uint32_t LINE_INDEX_OUTSIDE_3    = 4u;
+  const uint32_t LINE_INDEX_PARAGRAPH    = 6u;
+
+  //<p align='end'>Paragraph end</p>
+  const LineRun& lineEndFromMultiAlign = *(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_END);
+  const LineRun& lineEndFromEndAlign   = *(textLabelEndAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_END);
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute - <p align='end'>Paragraph end</p>");
+  DALI_TEST_EQUALS(lineEndFromMultiAlign.alignmentOffset, lineEndFromEndAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineEndFromMultiAlign.width, lineEndFromEndAlign.width, TEST_LOCATION);
+
+  //<p align='center'>Paragraph center</p>
+  const LineRun& lineCenterFromMultiAlign = *(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_CENTER);
+  const LineRun& lineEndFromCenterAlign   = *(textLabelCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_CENTER);
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute - <p align='center'>Paragraph center</p>");
+  DALI_TEST_EQUALS(lineCenterFromMultiAlign.alignmentOffset, lineEndFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineCenterFromMultiAlign.width, lineEndFromCenterAlign.width, TEST_LOCATION);
+
+  //<p align='begin' >Paragraph begin</p>
+  const LineRun& lineBeginFromMultiAlign = *(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_BEGIN);
+  const LineRun& lineEndFromBeginAlign   = *(textLabelBeginAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_ALIGN_BEGIN);
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute - <p align='begin' >Paragraph begin</p>");
+  DALI_TEST_EQUALS(lineBeginFromMultiAlign.alignmentOffset, lineEndFromBeginAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineBeginFromMultiAlign.width, lineEndFromBeginAlign.width, TEST_LOCATION);
+
+  //text outside
+  const LineRun& lineOutsideOneFromMultiAlign  = *(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_1);
+  const LineRun& lineOutsideOneFromCenterAlign = *(textLabelCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_1);
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute - text outside one");
+  DALI_TEST_EQUALS(lineOutsideOneFromMultiAlign.alignmentOffset, lineOutsideOneFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineOutsideOneFromMultiAlign.width, lineOutsideOneFromCenterAlign.width, TEST_LOCATION);
+
+  const LineRun& lineOutsideTwoFromMultiAlign  = *(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_2);
+  const LineRun& lineOutsideTwoFromCenterAlign = *(textLabelCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_2);
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute - text outside two");
+  DALI_TEST_EQUALS(lineOutsideTwoFromMultiAlign.alignmentOffset, lineOutsideTwoFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineOutsideTwoFromMultiAlign.width, lineOutsideTwoFromCenterAlign.width, TEST_LOCATION);
+
+  const LineRun& lineOutsideThreeFromMultiAlign  = *(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_3);
+  const LineRun& lineOutsideThreeFromCenterAlign = *(textLabelCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_OUTSIDE_3);
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute - text outside three");
+  DALI_TEST_EQUALS(lineOutsideThreeFromMultiAlign.alignmentOffset, lineOutsideThreeFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineOutsideThreeFromMultiAlign.width, lineOutsideThreeFromCenterAlign.width, TEST_LOCATION);
+
+  const LineRun& lineParagraphFromMultiAlign  = *(textLabelMultiAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_PARAGRAPH);
+  const LineRun& lineParagraphFromCenterAlign = *(textLabelCenterAlignImpl.GetTextController()->GetTextModel()->GetLines() + LINE_INDEX_PARAGRAPH);
+  tet_infoline(" UtcDaliTextLabelMarkupParagraphTagAlignAttribute - <p>Paragraph property alignment</p>");
+  DALI_TEST_EQUALS(lineParagraphFromMultiAlign.alignmentOffset, lineParagraphFromCenterAlign.alignmentOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(lineParagraphFromMultiAlign.width, lineParagraphFromCenterAlign.width, TEST_LOCATION);
 
   END_TEST;
 }
+
+int UtcDaliTextLabelMarkupCharacterSpacingTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupCharacterSpacingTag ");
+
+  const Length EXPECTED_NUMBER_OF_GLYPHS = 21u;
+
+  const float expandedCharSpacing  = 10.0f;
+  const float condensedCharSpacing = -5.0f;
+
+  TextLabel textLabel = TextLabel::New();
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, "ABC EF\n<char-spacing value='-5.0f'>ABC EF\n</char-spacing><char-spacing value='10.0f'>ABC EF\n</char-spacing>");
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  textLabel.SetProperty(TextLabel::Property::MULTI_LINE, true);
+
+  application.GetScene().Add(textLabel);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& textLabelImpl = GetImpl(textLabel);
+  Text::ViewInterface&          view          = textLabelImpl.GetTextController()->GetView();
+
+  Length numberOfGlyphs = view.GetNumberOfGlyphs();
+
+  DALI_TEST_EQUALS(numberOfGlyphs, EXPECTED_NUMBER_OF_GLYPHS, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  Vector<GlyphInfo> glyphs;
+  glyphs.Resize(numberOfGlyphs);
+
+  Vector<Vector2> positions;
+  positions.Resize(numberOfGlyphs);
+
+  float alignmentOffset = 0u;
+  numberOfGlyphs        = view.GetGlyphs(glyphs.Begin(),
+                                  positions.Begin(),
+                                  alignmentOffset,
+                                  0u,
+                                  numberOfGlyphs);
+
+  const Length numberOfGlyphsOneLine = 7u;
+  for(Length i = 0; i < numberOfGlyphsOneLine - 1u; i++)
+  {
+    float diffLineNoCharSpacing = positions[i + 1].x - positions[i].x;
+
+    float diffLineCondensedCharSpacing = positions[numberOfGlyphsOneLine + i + 1].x - positions[numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineCondensedCharSpacing, diffLineNoCharSpacing + condensedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+    float diffLineExpandedCharSpacing = positions[2u * numberOfGlyphsOneLine + i + 1].x - positions[2u * numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineExpandedCharSpacing, diffLineNoCharSpacing + expandedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelMarkupSpanCharacterSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelMarkupSpanCharacterSpacing ");
+
+  const Length EXPECTED_NUMBER_OF_GLYPHS = 21u;
+
+  const float expandedCharSpacing  = 10.0f;
+  const float condensedCharSpacing = -5.0f;
+
+  std::string testText =
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='blue' >ABC EF\n</span>"
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='red' char-space-value='-5.0f'>ABC EF\n</span>"
+    "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='green' char-space-value='10.0f'>ABC EF\n</span>";
+
+  TextLabel textLabel = TextLabel::New();
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, testText);
+  textLabel.SetProperty(TextLabel ::Property::ENABLE_MARKUP, true);
+  textLabel.SetProperty(TextLabel::Property::MULTI_LINE, true);
+
+  application.GetScene().Add(textLabel);
+
+  application.SendNotification();
+  application.Render();
+
+  Toolkit::Internal::TextLabel& textLabelImpl = GetImpl(textLabel);
+  Text::ViewInterface&          view          = textLabelImpl.GetTextController()->GetView();
+
+  Length numberOfGlyphs = view.GetNumberOfGlyphs();
+
+  DALI_TEST_EQUALS(numberOfGlyphs, EXPECTED_NUMBER_OF_GLYPHS, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  Vector<GlyphInfo> glyphs;
+  glyphs.Resize(numberOfGlyphs);
+
+  Vector<Vector2> positions;
+  positions.Resize(numberOfGlyphs);
+
+  float alignmentOffset = 0u;
+  numberOfGlyphs        = view.GetGlyphs(glyphs.Begin(),
+                                  positions.Begin(),
+                                  alignmentOffset,
+                                  0u,
+                                  numberOfGlyphs);
+
+  const Length numberOfGlyphsOneLine = 7u;
+  for(Length i = 0; i < numberOfGlyphsOneLine - 1u; i++)
+  {
+    float diffLineNoCharSpacing = positions[i + 1].x - positions[i].x;
+
+    float diffLineCondensedCharSpacing = positions[numberOfGlyphsOneLine + i + 1].x - positions[numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineCondensedCharSpacing, diffLineNoCharSpacing + condensedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+    float diffLineExpandedCharSpacing = positions[2u * numberOfGlyphsOneLine + i + 1].x - positions[2u * numberOfGlyphsOneLine + i].x;
+    DALI_TEST_EQUALS(diffLineExpandedCharSpacing, diffLineNoCharSpacing + expandedCharSpacing, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelLocaleChange(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelLocaleChange ");
+
+  Adaptor &adaptor = application.GetAdaptor();
+  TextLabel textLabel = TextLabel::New();
+  application.GetScene().Add(textLabel);
+
+  application.SendNotification();
+  application.Render();
+
+  std::string newLocale = "label_TEST";
+  adaptor.LocaleChangedSignal().Emit(newLocale);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(newLocale.data(), GetImpl(textLabel).GetLocale(), TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp
index 04c51af..a4e177c 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,18 @@
 #include <stdlib.h>
 
 #include <dali-toolkit-test-suite-utils.h>
-#include <toolkit-timer.h>
+#include <toolkit-environment-variable.h>
 #include <toolkit-event-thread-callback.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
-#include <dali-toolkit/internal/visuals/texture-upload-observer.h>
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <toolkit-timer.h>
+
+#include <dali-toolkit/internal/texture-manager/texture-async-loading-helper.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
 #include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h> ///< For VisualFactory's member TextureManager.
+#include <dali-toolkit/public-api/image-loader/image-url.h>
+#include <dali-toolkit/public-api/image-loader/image.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 
 #include <test-encoded-image-buffer.h>
 
@@ -38,7 +43,7 @@ using namespace Dali::Toolkit::Internal;
 
 void utc_dali_toolkit_texture_manager_startup(void)
 {
-  setenv( "LOG_TEXTURE_MANAGER", "3", 1 );
+  setenv("LOG_TEXTURE_MANAGER", "3", 1);
   test_return_value = TET_UNDEF;
 #if defined(ELDBUS_ENABLED)
   DBusWrapper::Install(std::unique_ptr<DBusWrapper>(new TestDBusWrapper));
@@ -52,10 +57,14 @@ void utc_dali_toolkit_texture_manager_cleanup(void)
 
 namespace
 {
+const char* TEST_IMAGE_FILE_NAME   = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const char* TEST_IMAGE_2_FILE_NAME = TEST_RESOURCE_DIR "/icon-delete.png";
+const char* TEST_IMAGE_3_FILE_NAME = TEST_RESOURCE_DIR "/icon-edit.png";
+const char* TEST_IMAGE_4_FILE_NAME = TEST_RESOURCE_DIR "/application-icon-20.png";
+const char* TEST_MASK_FILE_NAME    = TEST_RESOURCE_DIR "/mask.png";
 
-const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-
-}
+const char* TEST_SVG_FILE_NAME                   = TEST_RESOURCE_DIR "/svg1.svg";
+const char* TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json";
 
 class TestObserver : public Dali::Toolkit::TextureUploadObserver
 {
@@ -69,32 +78,121 @@ public:
 
 public:
   TestObserver()
-  : mCompleteType( CompleteType::NOT_COMPLETED ),
+  : mCompleteType(CompleteType::NOT_COMPLETED),
     mLoaded(false),
-    mObserverCalled(false)
+    mObserverCalled(false),
+    mTextureSet()
+  {
+  }
+
+  virtual void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override
+  {
+    if(textureInformation.returnType == TextureUploadObserver::ReturnType::TEXTURE)
+    {
+      mCompleteType = CompleteType::UPLOAD_COMPLETE;
+    }
+    else
+    {
+      mCompleteType = CompleteType::LOAD_COMPLETE;
+    }
+    mLoaded         = loadSuccess;
+    mObserverCalled = true;
+    mTextureSet     = textureInformation.textureSet;
+  }
+
+  CompleteType mCompleteType;
+  bool         mLoaded;
+  bool         mObserverCalled;
+  TextureSet   mTextureSet;
+};
+
+class TestObserverRemoveAndGenerateUrl : public TestObserver
+{
+public:
+  TestObserverRemoveAndGenerateUrl(TextureManager* textureManagerPtr)
+  : TestObserver(),
+    mTextureManagerPtr(textureManagerPtr)
   {
   }
 
-  virtual void UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet,
-                               bool useAtlasing, const Vector4& atlasRect, bool preMultiplied ) override
+  virtual void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override
   {
-    mCompleteType = CompleteType::UPLOAD_COMPLETE;
-    mLoaded = loadSuccess;
+    if(textureInformation.returnType == TextureUploadObserver::ReturnType::TEXTURE)
+    {
+      mCompleteType = CompleteType::UPLOAD_COMPLETE;
+    }
+    else
+    {
+      mCompleteType = CompleteType::LOAD_COMPLETE;
+    }
+    mLoaded         = loadSuccess;
     mObserverCalled = true;
+    mTextureSet     = textureInformation.textureSet;
+
+    // Remove during LoadComplete
+    mTextureManagerPtr->RequestRemove(textureInformation.textureId, nullptr);
+
+    // ...And generate string which using texture id.
+    mGeneratedExternalUrl = mTextureManagerPtr->AddExternalTexture(mTextureSet);
+  }
+
+public:
+  std::string mGeneratedExternalUrl;
+
+protected:
+  TextureManager* mTextureManagerPtr; // Keep the pointer of texture manager.
+};
+
+class TestObserverWithCustomFunction : public TestObserver
+{
+public:
+  TestObserverWithCustomFunction()
+  : TestObserver(),
+    mSignals{},
+    mData{nullptr},
+    mKeepSignal{false}
+  {
   }
 
-  virtual void LoadComplete( bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied ) override
+  virtual void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override
   {
-    mCompleteType = CompleteType::LOAD_COMPLETE;
-    mLoaded = loadSuccess;
+    if(textureInformation.returnType == TextureUploadObserver::ReturnType::TEXTURE)
+    {
+      mCompleteType = CompleteType::UPLOAD_COMPLETE;
+    }
+    else
+    {
+      mCompleteType = CompleteType::LOAD_COMPLETE;
+    }
+    mLoaded         = loadSuccess;
     mObserverCalled = true;
+    mTextureSet     = textureInformation.textureSet;
+
+    // Execute signals.
+    for(size_t i = 0; i < mSignals.size(); i++)
+    {
+      mSignals[i](mData);
+    }
+
+    // Clear signals.
+    if(!mKeepSignal)
+    {
+      mSignals.clear();
+    }
   }
 
-  CompleteType mCompleteType;
-  bool mLoaded;
-  bool mObserverCalled;
+  void ConnectFunction(std::function<void(void*)> signal)
+  {
+    mSignals.push_back(signal);
+  }
+
+public:
+  std::vector<std::function<void(void*)>> mSignals;
+  void*                                   mData;
+  bool                                    mKeepSignal;
 };
 
+} // namespace
 
 int UtcTextureManagerRequestLoad(void)
 {
@@ -102,23 +200,22 @@ int UtcTextureManagerRequestLoad(void)
 
   TextureManager textureManager; // Create new texture manager
 
-  TestObserver observer;
-  std::string filename("image.png");
-  auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-  TextureManager::TextureId textureId = textureManager.RequestLoad(
+  TestObserver              observer;
+  std::string               filename("image.png");
+  auto                      preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  TextureManager::TextureId textureId   = textureManager.RequestLoad(
     filename,
     ImageDimensions(),
     FittingMode::SCALE_TO_FILL,
     SamplingMode::BOX_THEN_LINEAR,
-    TextureManager::NO_ATLAS,
     &observer,
     true,
     TextureManager::ReloadPolicy::CACHED,
     preMultiply);
 
-  VisualUrl url = textureManager.GetVisualUrl( textureId );
+  VisualUrl url = textureManager.GetVisualUrl(textureId);
 
-  DALI_TEST_EQUALS( url.GetUrl().compare( filename ), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(url.GetUrl().compare(filename), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -129,23 +226,22 @@ int UtcTextureManagerGenerateHash(void)
 
   TextureManager textureManager; // Create new texture manager
 
-  TestObserver observer;
-  std::string filename( "image.png" );
-  auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-  TextureManager::TextureId textureId = textureManager.RequestLoad(
+  TestObserver              observer;
+  std::string               filename("image.png");
+  auto                      preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  TextureManager::TextureId textureId   = textureManager.RequestLoad(
     filename,
     ImageDimensions(),
     FittingMode::SCALE_TO_FILL,
     SamplingMode::BOX_THEN_LINEAR,
-    TextureManager::USE_ATLAS,
     &observer,
     true,
     TextureManager::ReloadPolicy::CACHED,
     preMultiply);
 
-  VisualUrl url = textureManager.GetVisualUrl( textureId );
+  VisualUrl url = textureManager.GetVisualUrl(textureId);
 
-  DALI_TEST_EQUALS( url.GetUrl().compare( filename ), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(url.GetUrl().compare(filename), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -153,7 +249,7 @@ int UtcTextureManagerGenerateHash(void)
 int UtcTextureManagerEncodedImageBuffer(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcTextureManagerEncodedImageBuffer" );
+  tet_infoline("UtcTextureManagerEncodedImageBuffer");
 
   auto  visualFactory  = Toolkit::VisualFactory::Get();
   auto& textureManager = GetImplementation(visualFactory).GetTextureManager(); // Use VisualFactory's texture manager
@@ -162,18 +258,18 @@ int UtcTextureManagerEncodedImageBuffer(void)
   EncodedImageBuffer buffer1 = ConvertFileToEncodedImageBuffer(TEST_IMAGE_FILE_NAME);
   EncodedImageBuffer buffer2 = ConvertFileToEncodedImageBuffer(TEST_IMAGE_FILE_NAME);
 
-  std::string  url1 = textureManager.AddExternalEncodedImageBuffer(buffer1);
-  std::string  url2 = textureManager.AddExternalEncodedImageBuffer(buffer1);
-  std::string  url3 = VisualUrl::CreateBufferUrl(""); ///< Impossible Buffer URL. for coverage
+  std::string url1 = textureManager.AddEncodedImageBuffer(buffer1);
+  std::string url2 = textureManager.AddEncodedImageBuffer(buffer1);
+  std::string url3 = VisualUrl::CreateBufferUrl("", ""); ///< Impossible Buffer URL. for coverage
 
   // Check if same EncodedImageBuffer get same url
   DALI_TEST_CHECK(url1 == url2);
   // Reduce reference count
-  textureManager.RemoveExternalEncodedImageBuffer(url1);
+  textureManager.RemoveEncodedImageBuffer(url1);
   // Check whethere url1 still valid
   DALI_TEST_CHECK(textureManager.GetEncodedImageBuffer(url1));
 
-  url2 = textureManager.AddExternalEncodedImageBuffer(buffer2);
+  url2 = textureManager.AddEncodedImageBuffer(buffer2);
   // Check if difference EncodedImageBuffer get difference url
   DALI_TEST_CHECK(url1 != url2);
 
@@ -185,26 +281,25 @@ int UtcTextureManagerEncodedImageBuffer(void)
     ImageDimensions(),
     FittingMode::SCALE_TO_FILL,
     SamplingMode::BOX_THEN_LINEAR,
-    TextureManager::NO_ATLAS,
     &observer1,
     true, ///< orientationCorrection
     TextureManager::ReloadPolicy::CACHED,
     preMultiply);
 
-  DALI_TEST_EQUALS( observer1.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( observer1.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
   TestObserver observer2;
   // Syncload
@@ -218,9 +313,9 @@ int UtcTextureManagerEncodedImageBuffer(void)
     true, ///< orientationCorrection
     preMultiply);
 
-  DALI_TEST_CHECK( pixelBuffer );
-  DALI_TEST_EQUALS( observer2.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_CHECK(pixelBuffer);
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
 
   // Asyncload
   pixelBuffer = textureManager.LoadPixelBuffer(
@@ -233,23 +328,23 @@ int UtcTextureManagerEncodedImageBuffer(void)
     true, ///< orientationCorrection
     preMultiply);
 
-  DALI_TEST_EQUALS( observer2.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( observer2.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION);
 
-  textureManager.RemoveExternalEncodedImageBuffer(url1);
-  textureManager.RemoveExternalEncodedImageBuffer(url2);
+  textureManager.RemoveEncodedImageBuffer(url1);
+  textureManager.RemoveEncodedImageBuffer(url2);
 
   // Now url1 and url2 is invalid type. mLoaded will return false
 
@@ -259,16 +354,15 @@ int UtcTextureManagerEncodedImageBuffer(void)
     ImageDimensions(),
     FittingMode::SCALE_TO_FILL,
     SamplingMode::BOX_THEN_LINEAR,
-    TextureManager::NO_ATLAS,
     &observer3,
     true, ///< orientationCorrection
     TextureManager::ReloadPolicy::CACHED,
     preMultiply);
 
   // Load will be success because url1 is cached
-  DALI_TEST_EQUALS( observer3.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer3.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer3.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer3.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
   TestObserver observer4;
   textureManager.RequestLoad(
@@ -276,26 +370,25 @@ int UtcTextureManagerEncodedImageBuffer(void)
     ImageDimensions(),
     FittingMode::SCALE_TO_FILL,
     SamplingMode::BOX_THEN_LINEAR,
-    TextureManager::NO_ATLAS,
     &observer4,
     true, ///< orientationCorrection
     TextureManager::ReloadPolicy::FORCED,
     preMultiply);
 
-  DALI_TEST_EQUALS( observer4.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer4.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer4.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer4.mObserverCalled, false, TEST_LOCATION);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
   // Load will be failed becuase reloadpolicy is forced
-  DALI_TEST_EQUALS( observer4.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer4.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer4.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer4.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer4.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer4.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
   TestObserver observer5;
   pixelBuffer = textureManager.LoadPixelBuffer(
@@ -309,9 +402,9 @@ int UtcTextureManagerEncodedImageBuffer(void)
     preMultiply);
 
   // Load will be faild because synchronousLoading doesn't use cached texture
-  DALI_TEST_CHECK( !pixelBuffer );
-  DALI_TEST_EQUALS( observer5.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer5.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_CHECK(!pixelBuffer);
+  DALI_TEST_EQUALS(observer5.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer5.mObserverCalled, false, TEST_LOCATION);
 
   TestObserver observer6;
   pixelBuffer = textureManager.LoadPixelBuffer(
@@ -324,21 +417,340 @@ int UtcTextureManagerEncodedImageBuffer(void)
     true, ///< orientationCorrection
     preMultiply);
 
-  DALI_TEST_EQUALS( observer6.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer6.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer6.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer6.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
   // Load will be failed because url3 is invalid URL
-  DALI_TEST_EQUALS( observer6.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer6.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer6.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer6.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer6.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer6.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerEncodedImageBufferWithImageType(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerEncodedImageBufferWithImageType");
+
+  auto  visualFactory  = Toolkit::VisualFactory::Get();
+  auto& textureManager = GetImplementation(visualFactory).GetTextureManager(); // Use VisualFactory's texture manager
+
+  // Get encoded raw-buffer image and generate url
+  EncodedImageBuffer buffer1 = ConvertFileToEncodedImageBuffer(TEST_SVG_FILE_NAME);
+  EncodedImageBuffer buffer2 = ConvertFileToEncodedImageBuffer(TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME);
+
+  std::string url1 = textureManager.AddEncodedImageBuffer(buffer1);
+  std::string url2 = textureManager.AddEncodedImageBuffer(buffer1);
+
+  // Check if same EncodedImageBuffer get same url
+  DALI_TEST_CHECK(url1 == url2);
+  // Reduce reference count
+  textureManager.RemoveEncodedImageBuffer(url1);
+  // Check whethere url1 still valid
+  DALI_TEST_CHECK(textureManager.GetEncodedImageBuffer(url1));
+
+  url2 = textureManager.AddEncodedImageBuffer(buffer2);
+  // Check if difference EncodedImageBuffer get difference url
+  DALI_TEST_CHECK(url1 != url2);
+
+  buffer1.SetImageType(EncodedImageBuffer::ImageType::VECTOR_IMAGE);
+  buffer2.SetImageType(EncodedImageBuffer::ImageType::ANIMATED_VECTOR_IMAGE);
+
+  std::string url1AfterType = textureManager.AddEncodedImageBuffer(buffer1);
+  std::string url2AfterType = textureManager.AddEncodedImageBuffer(buffer2);
+
+  // Check if EncodedImageBuffer with imagetype get difference url.
+  DALI_TEST_CHECK(url1 != url1AfterType);
+  DALI_TEST_CHECK(url2 != url2AfterType);
+  DALI_TEST_CHECK(url1AfterType != url2AfterType);
+
+  int  bufferId      = std::atoi(VisualUrl::GetLocationWithoutExtension(url1AfterType).c_str());
+  auto urlFromBuffer = textureManager.GetVisualUrl(bufferId);
+
+  // Check url from buffer id is equal with what we know.
+  DALI_TEST_CHECK(url1AfterType == urlFromBuffer.GetUrl());
+
+  // Reduce reference count
+  textureManager.RemoveEncodedImageBuffer(url1AfterType);
+  // Check whethere url1 still valid
+  DALI_TEST_CHECK(textureManager.GetEncodedImageBuffer(url1AfterType));
+
+  // Reduce reference count
+  textureManager.RemoveEncodedImageBuffer(url1AfterType);
+  // Check whethere url1 is invalid
+  DALI_TEST_CHECK(!textureManager.GetEncodedImageBuffer(url1AfterType));
+
+  // Reduce reference count
+  textureManager.RemoveEncodedImageBuffer(url2);
+  // Check whethere url2 is still valid
+  DALI_TEST_CHECK(textureManager.GetEncodedImageBuffer(url2));
+
+  // Reduce reference count
+  textureManager.RemoveEncodedImageBuffer(url2);
+  // Check whethere url2 is invalid
+  DALI_TEST_CHECK(!textureManager.GetEncodedImageBuffer(url2));
+
+  END_TEST;
+}
+
+int UtcTextureManagerExternalTexture(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerExternalTexture check TextureManager using external texture works well");
+
+  auto  visualFactory  = Toolkit::VisualFactory::Get();
+  auto& textureManager = GetImplementation(visualFactory).GetTextureManager(); // Use VisualFactory's texture manager
+
+  TestObserver observer1;
+  TestObserver observer2;
+
+  auto                               textureId1(TextureManager::INVALID_TEXTURE_ID);
+  auto                               textureId2(TextureManager::INVALID_TEXTURE_ID);
+  std::string                        maskname(TEST_MASK_FILE_NAME);
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  uint32_t width(64);
+  uint32_t height(64);
+  uint32_t bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
+
+  uint8_t*  buffer    = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
+
+  DALI_TEST_CHECK(pixelData);
+
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(pixelData, true);
+  std::string             url      = imageUrl.GetUrl();
+
+  TextureSet texture1 = textureManager.LoadTexture(
+    url,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId1,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer1,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  TextureSet texture2 = textureManager.LoadTexture(
+    url,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId2,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer2,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(textureId1 == textureId2, true, TEST_LOCATION);
+
+  texture1 = textureManager.LoadTexture(
+    url,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId1,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer1,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  texture2 = textureManager.LoadTexture(
+    url,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId2,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer2,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(textureId1 == textureId2, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(texture1 != texture2, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerRemoveExternalTextureAndLoadAgain(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerRemoveExternalTextureAndLoadAgain check TextureManager RequestRemove and RemoveExternalTexture lifecycle works well");
+
+  auto  visualFactory  = Toolkit::VisualFactory::Get();
+  auto& textureManager = GetImplementation(visualFactory).GetTextureManager(); // Use VisualFactory's texture manager
+
+  TestObserver observer1;
+  TestObserver observer2;
+
+  auto                               textureId1(TextureManager::INVALID_TEXTURE_ID);
+  auto                               textureId2(TextureManager::INVALID_TEXTURE_ID);
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  uint32_t width(64);
+  uint32_t height(64);
+  uint32_t bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
+
+  uint8_t*  buffer    = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
+
+  DALI_TEST_CHECK(pixelData);
+
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(pixelData, true);
+  std::string             url1     = imageUrl.GetUrl();
+  std::string             url2     = TEST_IMAGE_FILE_NAME;
+
+  // Step 1 : Load request for external url
+  TextureSet texture1 = textureManager.LoadTexture(
+    url1,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId1,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer1,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_CHECK(textureId1 != TextureManager::INVALID_TEXTURE_ID);
+
+  // Step 2 : Request remove for external url
+  textureManager.RequestRemove(textureId1, &observer1);
+
+  // Step 3 : Reduce imageUrl reference count.
+  imageUrl.Reset();
+
+  // Step 4 : Request new load by normal image.
+  TextureSet texture2 = textureManager.LoadTexture(
+    url2,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId2,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer2,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_CHECK(textureId2 != TextureManager::INVALID_TEXTURE_ID);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -346,7 +758,7 @@ int UtcTextureManagerEncodedImageBuffer(void)
 int UtcTextureManagerEncodedImageBufferReferenceCount(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcTextureManagerEncodedImageBuffer check reference count works well" );
+  tet_infoline("UtcTextureManagerEncodedImageBuffer check reference count works well");
 
   auto  visualFactory  = Toolkit::VisualFactory::Get();
   auto& textureManager = GetImplementation(visualFactory).GetTextureManager(); // Use VisualFactory's texture manager
@@ -355,19 +767,19 @@ int UtcTextureManagerEncodedImageBufferReferenceCount(void)
   EncodedImageBuffer buffer1 = ConvertFileToEncodedImageBuffer(TEST_IMAGE_FILE_NAME);
   EncodedImageBuffer buffer2 = ConvertFileToEncodedImageBuffer(TEST_IMAGE_FILE_NAME);
 
-  std::string  url1    = textureManager.AddExternalEncodedImageBuffer(buffer1);
-  std::string  url2    = textureManager.AddExternalEncodedImageBuffer(buffer1);
+  std::string url1 = textureManager.AddEncodedImageBuffer(buffer1);
+  std::string url2 = textureManager.AddEncodedImageBuffer(buffer1);
 
   // Check if same EncodedImageBuffer get same url
   DALI_TEST_CHECK(url1 == url2);
 
   // Reduce reference count
-  textureManager.RemoveExternalEncodedImageBuffer(url1);
+  textureManager.RemoveEncodedImageBuffer(url1);
   // Check whethere url1 still valid
   DALI_TEST_CHECK(textureManager.GetEncodedImageBuffer(url1));
 
   // Reduce reference count
-  textureManager.RemoveExternalEncodedImageBuffer(url1);
+  textureManager.RemoveEncodedImageBuffer(url1);
   // Check whethere url1 is not valid anymore
   DALI_TEST_CHECK(!textureManager.GetEncodedImageBuffer(url1));
 
@@ -376,12 +788,9 @@ int UtcTextureManagerEncodedImageBufferReferenceCount(void)
   textureManager.UseExternalResource(url1);
   DALI_TEST_CHECK(!textureManager.GetEncodedImageBuffer(url1));
 
-  url1 = textureManager.AddExternalEncodedImageBuffer(buffer1);
-  // Check if difference EncodedImageBuffer get difference url
-  // Previous EncodedImageBuffer was deleted, so we get new url even same buffer.
-  DALI_TEST_CHECK(url1 != url2);
+  url1 = textureManager.AddEncodedImageBuffer(buffer1);
 
-  url2 = textureManager.AddExternalEncodedImageBuffer(buffer2);
+  url2 = textureManager.AddEncodedImageBuffer(buffer2);
   // Check if difference EncodedImageBuffer get difference url
   DALI_TEST_CHECK(url1 != url2);
 
@@ -394,29 +803,28 @@ int UtcTextureManagerEncodedImageBufferReferenceCount(void)
     ImageDimensions(),
     FittingMode::SCALE_TO_FILL,
     SamplingMode::BOX_THEN_LINEAR,
-    TextureManager::NO_ATLAS,
     &observer1,
     true, ///< orientationCorrection
     TextureManager::ReloadPolicy::CACHED,
     preMultiply);
 
-  DALI_TEST_EQUALS( observer1.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( observer1.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
   // LoadPixelBuffer doen't use cache. url2 will not be cached
-  TestObserver observer2;
+  TestObserver       observer2;
   Devel::PixelBuffer pixelBuffer = textureManager.LoadPixelBuffer(
     url2,
     ImageDimensions(),
@@ -427,24 +835,24 @@ int UtcTextureManagerEncodedImageBufferReferenceCount(void)
     true, ///< orientationCorrection
     preMultiply);
 
-  DALI_TEST_EQUALS( observer2.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( observer2.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION);
 
   // Decrease each url's reference count.
-  textureManager.RemoveExternalEncodedImageBuffer(url1);
-  textureManager.RemoveExternalEncodedImageBuffer(url2);
+  textureManager.RemoveEncodedImageBuffer(url1);
+  textureManager.RemoveEncodedImageBuffer(url2);
 
   // url1 buffer is still have 1 reference count because it is cached.
   // But url2 not valid because it is not cached.
@@ -452,50 +860,48 @@ int UtcTextureManagerEncodedImageBufferReferenceCount(void)
   DALI_TEST_CHECK(!textureManager.GetEncodedImageBuffer(url2));
 
   // Check url1 buffer have 1 reference count because it is cached.
-  textureManager.RemoveExternalEncodedImageBuffer(url1);
+  textureManager.RemoveEncodedImageBuffer(url1);
   DALI_TEST_CHECK(!textureManager.GetEncodedImageBuffer(url1));
 
   END_TEST;
 }
 
-
 int UtcTextureManagerCachingForDifferentLoadingType(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcTextureManagerCachingForDifferentLoadingType" );
+  tet_infoline("UtcTextureManagerCachingForDifferentLoadingType");
 
   TextureManager textureManager; // Create new texture manager
 
   TestObserver observer1;
-  std::string filename( TEST_IMAGE_FILE_NAME );
-  auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  std::string  filename(TEST_IMAGE_FILE_NAME);
+  auto         preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
   textureManager.RequestLoad(
     filename,
     ImageDimensions(),
     FittingMode::SCALE_TO_FILL,
     SamplingMode::BOX_THEN_LINEAR,
-    TextureManager::NO_ATLAS,
     &observer1,
     true,
     TextureManager::ReloadPolicy::CACHED,
     preMultiply);
 
-  DALI_TEST_EQUALS( observer1.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( observer1.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
-  TestObserver observer2;
+  TestObserver       observer2;
   Devel::PixelBuffer pixelBuffer = textureManager.LoadPixelBuffer(
     filename,
     ImageDimensions(),
@@ -506,20 +912,20 @@ int UtcTextureManagerCachingForDifferentLoadingType(void)
     true,
     preMultiply);
 
-  DALI_TEST_EQUALS( observer2.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( observer2.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer2.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -527,28 +933,28 @@ int UtcTextureManagerCachingForDifferentLoadingType(void)
 int UtcTextureManagerUseInvalidMask(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcTextureManagerUseInvalidMask" );
+  tet_infoline("UtcTextureManagerUseInvalidMask");
 
   TextureManager textureManager; // Create new texture manager
 
-  TestObserver observer;
-  std::string filename( TEST_IMAGE_FILE_NAME );
-  std::string maskname("");
+  TestObserver                       observer;
+  std::string                        filename(TEST_IMAGE_FILE_NAME);
+  std::string                        maskname("");
   TextureManager::MaskingDataPointer maskInfo = nullptr;
   maskInfo.reset(new TextureManager::MaskingData());
-  maskInfo->mAlphaMaskUrl = maskname;
-  maskInfo->mAlphaMaskId = TextureManager::INVALID_TEXTURE_ID;
-  maskInfo->mCropToMask = true;
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
   maskInfo->mContentScaleFactor = 1.0f;
 
-  auto textureId( TextureManager::INVALID_TEXTURE_ID );
-  Vector4 atlasRect( 0.f, 0.f, 1.f, 1.f );
-  Dali::ImageDimensions atlasRectSize( 0,0 );
-  bool synchronousLoading(false);
-  bool atlasingStatus(false);
-  bool loadingStatus(false);
-  auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-  ImageAtlasManagerPtr atlasManager = nullptr;
+  auto                          textureId(TextureManager::INVALID_TEXTURE_ID);
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
   Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
 
   textureManager.LoadTexture(
@@ -563,30 +969,1447 @@ int UtcTextureManagerUseInvalidMask(void)
     atlasRectSize,
     atlasingStatus,
     loadingStatus,
-    WrapMode::DEFAULT,
-    WrapMode::DEFAULT,
     &observer,
     atlasUploadObserver,
     atlasManager,
     true,
     TextureManager::ReloadPolicy::CACHED,
-    preMultiply
-  );
+    preMultiply);
 
-  DALI_TEST_EQUALS( observer.mLoaded, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer.mObserverCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(observer.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(observer.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerUseInvalidMaskAndMaskLoadedFirst(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerUseInvalidMask when normal image loaded first, and mask image loaded first");
+  tet_infoline("Try to check PostLoad works well");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserver                       observer;
+  std::string                        filename(TEST_IMAGE_FILE_NAME);
+  std::string                        maskname("invalid.png");
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+
+  auto                          textureId(TextureManager::INVALID_TEXTURE_ID);
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(observer.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerUseInvalidMaskAndMaskLoadedLater(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerUseInvalidMask when normal image loaded first, and mask image loaded later");
+  tet_infoline("Try to check CheckForWaitingTexture called");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserver                       observer;
+  std::string                        filename(TEST_IMAGE_FILE_NAME);
+  std::string                        maskname("invalid.png");
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+
+  auto                          textureId(TextureManager::INVALID_TEXTURE_ID);
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, false, TEST_LOCATION);
+
+  // CAPTION : HARD-CODING for coverage.
+  {
+    Dali::Devel::PixelBuffer pixelBuffer = textureManager.LoadPixelBuffer(
+      filename,
+      ImageDimensions(),
+      FittingMode::SCALE_TO_FILL,
+      SamplingMode::BOX_THEN_LINEAR,
+      true, ///< synchronousLoading
+      nullptr,
+      true, ///< orientationCorrection
+      preMultiply);
+
+    std::vector<Devel::PixelBuffer> pixelBuffers;
+    pixelBuffers.push_back(pixelBuffer);
+    textureManager.AsyncLoadComplete(textureId, pixelBuffers);
+    std::vector<Devel::PixelBuffer> maskBuffers;
+    textureManager.AsyncLoadComplete(maskInfo->mAlphaMaskId, maskBuffers);
+    textureManager.RequestRemove(maskInfo->mAlphaMaskId, nullptr);
+    textureManager.RequestRemove(textureId, &observer);
+  }
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(observer.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerSynchronousLoadingFail(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerSynchronousLoadingFail");
+
+  TextureManager textureManager; // Create new texture manager
+
+  std::string                        maskname("");
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+
+  std::string                   filename("dummy");
+  auto                          textureId(TextureManager::INVALID_TEXTURE_ID);
+  Vector4                       atlasRect(0.f, 0.f, 0.f, 0.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  // load image synchronously.
+  TestObserver observer;
+  TextureSet   textureSet = textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    true, // synchronous loading.
+    textureId,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(loadingStatus, false, TEST_LOCATION);
+  DALI_TEST_CHECK(!textureSet);                                     // texture loading fail.
+  DALI_TEST_CHECK(textureId == TextureManager::INVALID_TEXTURE_ID); // invalid texture id is returned.
+
+  END_TEST;
+}
+
+int UtcTextureManagerCachingSynchronousLoading(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerCachingSynchronousLoading");
+
+  TextureManager textureManager; // Create new texture manager
+
+  std::string filename(TEST_IMAGE_FILE_NAME);
+
+  std::string                        maskname("");
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+
+  Vector4                       atlasRect(0.f, 0.f, 0.f, 0.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  // load image synchronously.
+  TestObserver observer;
+  auto         textureId(TextureManager::INVALID_TEXTURE_ID);
+  TextureSet   textureSet = textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    true, // synchronous loading.
+    textureId,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(loadingStatus, false, TEST_LOCATION);
+  DALI_TEST_CHECK(textureSet); // texture is loaded.
+
+  // observer isn't called in synchronous loading.
+  DALI_TEST_EQUALS(observer.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, false, TEST_LOCATION);
+
+  // load same image asynchronously.
+  TestObserver asyncObserver;
+  auto         asyncTextureId(TextureManager::INVALID_TEXTURE_ID);
+  loadingStatus              = false;
+  TextureSet asyncTextureSet = textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    false, // asynchronous loading.
+    asyncTextureId,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &asyncObserver,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(asyncTextureId, textureId, TEST_LOCATION); // texture is loaded.
+  DALI_TEST_EQUALS(loadingStatus, false, TEST_LOCATION);
+  DALI_TEST_CHECK(asyncTextureSet); // Cached texture.
+
+  // observer is directly called because textureSet is retrieved by cache.
+  DALI_TEST_EQUALS(asyncObserver.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(asyncObserver.mObserverCalled, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerAsyncSyncAsync(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerAsyncSyncAsync");
+
+  TextureManager textureManager; // Create new texture manager
+
+  std::string filename(TEST_IMAGE_FILE_NAME);
+
+  std::string                        maskname("");
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+
+  Vector4                       atlasRect(0.f, 0.f, 0.f, 0.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          atlasingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  // load image asynchronously.
+  TestObserver asyncObserver1;
+  auto         asyncTextureId1(TextureManager::INVALID_TEXTURE_ID);
+  bool         asyncLoadingStatus1 = false;
+  TextureSet   asyncTextureSet1    = textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    false, // asynchronous loading.
+    asyncTextureId1,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    asyncLoadingStatus1,
+    &asyncObserver1,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(asyncLoadingStatus1, true, TEST_LOCATION); // texture is loading now.
+  DALI_TEST_CHECK(!asyncTextureSet1);                         // texture is not loaded yet.
+
+  // observer is still not called.
+  DALI_TEST_EQUALS(asyncObserver1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(asyncObserver1.mObserverCalled, false, TEST_LOCATION);
+
+  // load same image synchronously just after asynchronous loading.
+  TestObserver syncObserver;
+  auto         textureId(TextureManager::INVALID_TEXTURE_ID);
+  bool         syncLoadingStatus = false;
+  TextureSet   syncTextureSet    = textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    true, // synchronous loading.
+    textureId,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    syncLoadingStatus,
+    &syncObserver,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(asyncTextureId1, textureId, TEST_LOCATION); // texture is loaded.
+  DALI_TEST_EQUALS(syncLoadingStatus, false, TEST_LOCATION);   // texture is loaded.
+  DALI_TEST_CHECK(syncTextureSet);                             // texture is loaded.
+
+  // syncObserver isn't called in synchronous loading.
+  DALI_TEST_EQUALS(syncObserver.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(syncObserver.mObserverCalled, false, TEST_LOCATION);
+
+  // asyncObserver1 is still not called too.
+  DALI_TEST_EQUALS(asyncObserver1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(asyncObserver1.mObserverCalled, false, TEST_LOCATION);
+
+  // load image asynchronously.
+  TestObserver asyncObserver2;
+  auto         asyncTextureId2(TextureManager::INVALID_TEXTURE_ID);
+  bool         asyncLoadingStatus2 = false;
+  TextureSet   asyncTextureSet2    = textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    false, // asynchronous loading.
+    asyncTextureId2,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    asyncLoadingStatus2,
+    &asyncObserver2,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(asyncLoadingStatus2, false, TEST_LOCATION); // texture is loaded by previous sync request
+  DALI_TEST_CHECK(asyncTextureSet2);                           // texture is loaded
+  Texture syncTexture   = syncTextureSet.GetTexture(0u);
+  Texture asyncTexture2 = asyncTextureSet2.GetTexture(0u);
+  DALI_TEST_CHECK(syncTexture);
+  DALI_TEST_CHECK(asyncTexture2);
+  DALI_TEST_CHECK(asyncTexture2 == syncTexture); // check loaded two texture is same.
+
+  // observer is called synchronously because the texture is cached.
+  DALI_TEST_EQUALS(asyncObserver2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(asyncObserver2.mObserverCalled, true, TEST_LOCATION);
+
+  asyncObserver2.mLoaded         = false;
+  asyncObserver2.mObserverCalled = false;
+
+  application.SendNotification();
+  application.Render();
+
+  // Requested asynchronous loading at first is finished now and async observer is called now.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(asyncObserver1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(asyncObserver1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_CHECK(asyncObserver1.mTextureSet);
+
+  Texture observerTexture = asyncObserver1.mTextureSet.GetTexture(0u);
+  DALI_TEST_CHECK(observerTexture == asyncTexture2); // check loaded two texture is same.
+
+  // asyncObserver2 was already called so it isn't called here.
+  DALI_TEST_EQUALS(asyncObserver2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(asyncObserver2.mObserverCalled, false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerQueueRemoveDuringObserve(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerQueueRemoveDuringObserve");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserverRemoveAndGenerateUrl observer(&textureManager); // special observer for this UTC.
+
+  std::string filename(TEST_IMAGE_FILE_NAME);
+  auto        preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+  TextureManager::TextureId textureId = textureManager.RequestLoad(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    &observer,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(observer.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+
+  tet_printf("loaded textureId is %d, generated url is %s\n", static_cast<int>(textureId), observer.mGeneratedExternalUrl.c_str());
+
+  DALI_TEST_CHECK(static_cast<int>(textureId) != std::stoi(VisualUrl::GetLocation(observer.mGeneratedExternalUrl))); // Check we don't reuse textureId during observe
+
+  // Decrease external texture reference count who observer created
+  textureManager.RemoveExternalTexture(observer.mGeneratedExternalUrl);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcTextureManagerRemoveDuringApplyMasking(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerRemoveDuringApplyMasking");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserver observer1;
+  TestObserver observer2;
+
+  std::string                        filename(TEST_IMAGE_FILE_NAME);
+  std::string                        maskname(TEST_MASK_FILE_NAME);
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+
+  auto                          textureId1(TextureManager::INVALID_TEXTURE_ID);
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId1,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer1,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Load image and mask image.
+  // Now, LoadState become MASK_APPLYING
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  tet_printf("Current textureId1:%d's state become MASK_APPLYING\n", static_cast<int>(textureId1));
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+
+  // Remove current textureId1. and request new texture again.
+  textureManager.RequestRemove(textureId1, &observer1);
+  auto textureId2 = textureManager.RequestLoad(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    &observer2,
+    true, ///< orientationCorrection
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply,
+    synchronousLoading);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+
+  tet_printf("textureId1:%d removed and textureId2:%d requested\n", static_cast<int>(textureId1), static_cast<int>(textureId2));
+
+  // CAPTION : HARD-CODING.
+  {
+    std::vector<Devel::PixelBuffer> pixelBuffers;
+    textureManager.AsyncLoadComplete(textureId2, pixelBuffers);
+    textureManager.RequestRemove(textureId2, &observer2);
+  }
+
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION); ///< Note that we call AsyncLoadComplete hardly with empty pixelbuffer.
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcTextureManagerMaskCacheTest(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerMaskCacheTest");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserver observer1;
+  TestObserver observer2;
+
+  std::string                        filename(TEST_IMAGE_FILE_NAME);
+  std::string                        filename2(TEST_IMAGE_2_FILE_NAME);
+  std::string                        maskname(TEST_MASK_FILE_NAME);
+  TextureManager::MaskingDataPointer maskInfo = nullptr;
+  maskInfo.reset(new TextureManager::MaskingData());
+  maskInfo->mAlphaMaskUrl       = maskname;
+  maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo->mCropToMask         = true;
+  maskInfo->mContentScaleFactor = 1.0f;
+
+  TextureManager::MaskingDataPointer maskInfo2 = nullptr;
+  maskInfo2.reset(new TextureManager::MaskingData());
+  maskInfo2->mAlphaMaskUrl       = maskname;
+  maskInfo2->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+  maskInfo2->mCropToMask         = true;
+  maskInfo2->mContentScaleFactor = 1.0f;
+
+  auto                          textureId1(TextureManager::INVALID_TEXTURE_ID);
+  auto                          textureId2(TextureManager::INVALID_TEXTURE_ID);
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  textureManager.LoadTexture(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo,
+    synchronousLoading,
+    textureId1,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer1,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Load image and mask image.
+  // Now, LoadState become MASK_APPLYING
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  tet_printf("Current textureId1:%d's state become MASK_APPLYING\n", static_cast<int>(textureId1));
+
+  textureManager.LoadTexture(
+    filename2,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo2,
+    synchronousLoading,
+    textureId2,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer2,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  application.SendNotification();
+  application.Render();
+
+  // Load image2 + image1 apply mask + image2 apply mask = total 3 event trigger required.
+  // Note that we use cached mask image.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+
+  try
+  {
+    // Remove textureId1 first, and then remove textureId2. Check whether segfault occured.
+    textureManager.RequestRemove(textureId1, &observer1);
+
+    application.SendNotification();
+    application.Render();
+
+    textureManager.RequestRemove(textureId2, &observer2);
+
+    application.SendNotification();
+    application.Render();
+
+    TestObserver observer3;
+    maskInfo.reset(new TextureManager::MaskingData());
+    maskInfo->mAlphaMaskUrl       = maskname;
+    maskInfo->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+    maskInfo->mCropToMask         = true;
+    maskInfo->mContentScaleFactor = 1.0f;
+
+    textureManager.LoadTexture(
+      filename,
+      ImageDimensions(),
+      FittingMode::SCALE_TO_FILL,
+      SamplingMode::BOX_THEN_LINEAR,
+      maskInfo,
+      synchronousLoading,
+      textureId1,
+      atlasRect,
+      atlasRectSize,
+      atlasingStatus,
+      loadingStatus,
+      &observer3,
+      atlasUploadObserver,
+      atlasManager,
+      true,
+      TextureManager::ReloadPolicy::CACHED,
+      preMultiply);
+
+    DALI_TEST_EQUALS(observer3.mLoaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3.mObserverCalled, false, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    // Load image and mask image.
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    DALI_TEST_EQUALS(observer3.mLoaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3.mObserverCalled, false, TEST_LOCATION);
+
+    // Apply mask.
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    DALI_TEST_EQUALS(observer3.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3.mObserverCalled, true, TEST_LOCATION);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  END_TEST;
+}
+
+int UtcTextureManagerRemoveDuringGPUMasking(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerRemoveDuringGPUMasking");
+  tet_infoline("Request 3 different GPU masking image.");
+  tet_infoline("Control to mask image load last. and then, check execute result.");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserverWithCustomFunction  observer1;
+  TestObserverWithCustomFunction  observer2;
+  TestObserverWithCustomFunction* observer3 = new TestObserverWithCustomFunction(); // Deleted in observer1 loaded signal
+  TestObserver                    observer4;
+
+  std::string filename1(TEST_IMAGE_FILE_NAME);
+  std::string filename2(TEST_IMAGE_2_FILE_NAME);
+  std::string filename3(TEST_IMAGE_3_FILE_NAME);
+  std::string filename4(TEST_IMAGE_4_FILE_NAME);
+
+  auto textureId1(TextureManager::INVALID_TEXTURE_ID);
+  auto textureId2(TextureManager::INVALID_TEXTURE_ID);
+  auto textureId3(TextureManager::INVALID_TEXTURE_ID);
+  auto textureId4(TextureManager::INVALID_TEXTURE_ID);
+
+  std::string                        maskname(TEST_MASK_FILE_NAME);
+  TextureManager::MaskingDataPointer maskInfo[3] = {nullptr, nullptr, nullptr};
+  for(int i = 0; i < 3; i++)
+  {
+    maskInfo[i].reset(new TextureManager::MaskingData());
+    maskInfo[i]->mAlphaMaskUrl       = maskname;
+    maskInfo[i]->mAlphaMaskId        = TextureManager::INVALID_TEXTURE_ID;
+    maskInfo[i]->mCropToMask         = true;
+    maskInfo[i]->mPreappliedMasking  = false; // To make GPU masking
+    maskInfo[i]->mContentScaleFactor = 1.0f;
+  }
+  Vector4                       atlasRect(0.f, 0.f, 1.f, 1.f);
+  Dali::ImageDimensions         atlasRectSize(0, 0);
+  bool                          synchronousLoading(false);
+  bool                          atlasingStatus(false);
+  bool                          loadingStatus(false);
+  auto                          preMultiply         = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  ImageAtlasManagerPtr          atlasManager        = nullptr;
+  Toolkit::AtlasUploadObserver* atlasUploadObserver = nullptr;
+
+  // Request image 1, 2, 3 with GPU masking
+  textureManager.LoadTexture(
+    filename1,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo[0],
+    synchronousLoading,
+    textureId1,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer1,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  textureManager.LoadTexture(
+    filename2,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo[1],
+    synchronousLoading,
+    textureId2,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    &observer2,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  textureManager.LoadTexture(
+    filename3,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    maskInfo[2],
+    synchronousLoading,
+    textureId3,
+    atlasRect,
+    atlasRectSize,
+    atlasingStatus,
+    loadingStatus,
+    observer3,
+    atlasUploadObserver,
+    atlasManager,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3->mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3->mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer4.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer4.mObserverCalled, false, TEST_LOCATION);
+
+  // Check we use cached mask image
+  DALI_TEST_CHECK(maskInfo[0]->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID);
+  DALI_TEST_EQUALS(maskInfo[0]->mAlphaMaskId, maskInfo[1]->mAlphaMaskId, TEST_LOCATION);
+  DALI_TEST_EQUALS(maskInfo[0]->mAlphaMaskId, maskInfo[2]->mAlphaMaskId, TEST_LOCATION);
+
+  // Connect observer1 custom function
+  struct CustomData1
+  {
+    TextureManager*           textureManagerPtr{nullptr};
+    TextureManager::TextureId removeTextureId{TextureManager::INVALID_TEXTURE_ID};
+    TestObserver*             removeTextureObserver{nullptr};
+  };
+  CustomData1 data1;
+  data1.textureManagerPtr     = &textureManager;
+  data1.removeTextureId       = textureId3;
+  data1.removeTextureObserver = observer3;
+
+  observer1.mData = &data1;
+  observer1.ConnectFunction(
+    [](void* data) {
+      DALI_TEST_CHECK(data);
+      CustomData1 data1 = *(CustomData1*)data;
+
+      DALI_TEST_CHECK(data1.textureManagerPtr);
+      DALI_TEST_CHECK(data1.removeTextureId != TextureManager::INVALID_TEXTURE_ID);
+      DALI_TEST_CHECK(data1.removeTextureObserver);
+
+      // Remove textureId3.
+      data1.textureManagerPtr->RequestRemove(data1.removeTextureId, data1.removeTextureObserver);
+
+      // Destroy observer3
+      delete data1.removeTextureObserver;
+    });
+
+  // Connect observer2 custom function
+  struct CustomData2
+  {
+    TextureManager*            textureManagerPtr{nullptr};
+    std::string                addTextureUrl{};
+    TextureManager::TextureId* addTextureIdPtr{nullptr};
+    TestObserver*              addTextureObserver{nullptr};
+  };
+  CustomData2 data2;
+  data2.textureManagerPtr  = &textureManager;
+  data2.addTextureUrl      = filename4;
+  data2.addTextureIdPtr    = &textureId4;
+  data2.addTextureObserver = &observer4;
+
+  observer2.mData = &data2;
+  observer2.ConnectFunction(
+    [](void* data) {
+      DALI_TEST_CHECK(data);
+      CustomData2 data2 = *(CustomData2*)data;
+
+      DALI_TEST_CHECK(data2.textureManagerPtr);
+      DALI_TEST_CHECK(!data2.addTextureUrl.empty());
+      DALI_TEST_CHECK(data2.addTextureIdPtr);
+      DALI_TEST_CHECK(data2.addTextureObserver);
+
+      auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+      // Load textureId4
+      (*data2.addTextureIdPtr) = data2.textureManagerPtr->RequestLoad(
+        data2.addTextureUrl,
+        ImageDimensions(),
+        FittingMode::SCALE_TO_FILL,
+        SamplingMode::BOX_THEN_LINEAR,
+        data2.addTextureObserver,
+        true,
+        TextureManager::ReloadPolicy::CACHED,
+        preMultiply);
+    });
+
+  // Connect observer3 custom function
+  struct CustomData3
+  {
+    TestObserver* self{nullptr};
+    bool*         observerLoadedPtr{nullptr};
+    bool*         observerCalleddPtr{nullptr};
+  };
+  CustomData3 data3;
+  bool        observer3Loaded = false;
+  bool        observer3Called = false;
+  data3.self                  = observer3;
+  data3.observerLoadedPtr     = &observer3Loaded;
+  data3.observerCalleddPtr    = &observer3Called;
+
+  observer3->mData = &data3;
+  observer3->ConnectFunction(
+    [](void* data) {
+      DALI_TEST_CHECK(data);
+      CustomData3 data3 = *(CustomData3*)data;
+
+      DALI_TEST_CHECK(data3.self);
+      DALI_TEST_CHECK(data3.observerLoadedPtr);
+      DALI_TEST_CHECK(data3.observerCalleddPtr);
+
+      *data3.observerLoadedPtr  = data3.self->mLoaded;
+      *data3.observerCalleddPtr = data3.self->mObserverCalled;
+    });
+
+  tet_printf("Id info - mask : {%d}, 1 : {%d}, 2 : {%d}, 3 : {%d}, 4 : {%d}\n", static_cast<int>(maskInfo[0]->mAlphaMaskId), static_cast<int>(textureId1), static_cast<int>(textureId2), static_cast<int>(textureId3), static_cast<int>(textureId4));
+
+  // CAPTION : HARD-CODING.
+  {
+    // Complete async load 1, 2, 3.
+    std::vector<Devel::PixelBuffer> pixelBuffers;
+
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::RGB888));
+    textureManager.AsyncLoadComplete(textureId1, pixelBuffers);
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::RGB888));
+    textureManager.AsyncLoadComplete(textureId2, pixelBuffers);
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::RGB888));
+    textureManager.AsyncLoadComplete(textureId3, pixelBuffers);
+
+    // Ensure textureId3 remove request processed.
+
+    DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3Loaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3Called, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer4.mLoaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer4.mObserverCalled, false, TEST_LOCATION);
+
+    // Complete mask load.
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::L8));
+    textureManager.AsyncLoadComplete(maskInfo[0]->mAlphaMaskId, pixelBuffers);
+
+    tet_printf("Id info after observer notify - mask : {%d}, 1 : {%d}, 2 : {%d}, 3 : {%d}, 4 : {%d}\n", static_cast<int>(maskInfo[0]->mAlphaMaskId), static_cast<int>(textureId1), static_cast<int>(textureId2), static_cast<int>(textureId3), static_cast<int>(textureId4));
+
+    // Check observer 1 and 2 called, but 3 and 4 not called.
+    DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3Loaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3Called, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer4.mLoaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer4.mObserverCalled, false, TEST_LOCATION);
+
+    // Check textureId4
+    DALI_TEST_CHECK(textureId4 != TextureManager::INVALID_TEXTURE_ID);
+
+    // Complete 4.
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::RGB888));
+    textureManager.AsyncLoadComplete(textureId4, pixelBuffers);
+
+    DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3Loaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3Called, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer4.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer4.mObserverCalled, true, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcTextureManagerDestroyObserverDuringObserve(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerDestroyObserverDuringObserve");
+  tet_infoline("Request 3 different image.");
+  tet_infoline("Complete textureId1. After observer1 loaded done,");
+  tet_infoline(" - Remove and destroy observer2");
+  tet_infoline(" - Re-generate observer2 which has same address pointer with before.");
+  tet_infoline(" - Remove and Reqeust third file by observer3");
+  tet_infoline("Complete textureId2. and check old observer2 not emmited, and newly observer2 works.");
+  tet_infoline("Complete textureId3. and check observer3 comes");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserverWithCustomFunction  observer1;
+  TestObserverWithCustomFunction* observer2 = new TestObserverWithCustomFunction(); // Deleted in observer1 loaded signal.
+  TestObserver                    observer3;
+
+  std::string filename1(TEST_IMAGE_FILE_NAME);
+  std::string filename2(TEST_IMAGE_2_FILE_NAME);
+  std::string filename3(TEST_IMAGE_3_FILE_NAME);
+  std::string filename4(TEST_IMAGE_4_FILE_NAME);
+
+  auto textureId1(TextureManager::INVALID_TEXTURE_ID);
+  auto textureId2(TextureManager::INVALID_TEXTURE_ID);
+  auto textureId3(TextureManager::INVALID_TEXTURE_ID);
+  auto textureId4(TextureManager::INVALID_TEXTURE_ID);
+
+  // Dummy reference value
+  auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+  // Request image 1, 2, 3.
+  textureId1 = textureManager.RequestLoad(
+    filename1,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    &observer1,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  textureId2 = textureManager.RequestLoad(
+    filename2,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    observer2,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  textureId3 = textureManager.RequestLoad(
+    filename3,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    &observer3,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  struct CustomData1
+  {
+    TextureManager*                  textureManagerPtr{nullptr};
+    TextureManager::TextureId        removeTextureId{TextureManager::INVALID_TEXTURE_ID};
+    TestObserverWithCustomFunction** removeTextureObserver{nullptr};
+    std::string                      resendFilename{};
+    TextureManager::TextureId        resendTextureId{TextureManager::INVALID_TEXTURE_ID};
+    TestObserver*                    resendTextureObserver{nullptr};
+    std::string                      newlyFilename{};
+    TextureManager::TextureId*       newlyTextureIdPtr{nullptr};
+  };
+  struct CustomData2
+  {
+    TextureManager* textureManagerPtr{nullptr};
+    TestObserver*   self{nullptr};
+    bool*           observerLoadedPtr{nullptr};
+    bool*           observerCalledPtr{nullptr};
+  };
+
+  bool        observer2Loaded    = false;
+  bool        observer2Called    = false;
+  bool        newObserver2Loaded = false;
+  bool        newObserver2Called = false;
+  CustomData2 newData2; // Used on observer1 function
+
+  // Connect observer1 custom function
+  CustomData1 data1;
+  data1.textureManagerPtr     = &textureManager;
+  data1.removeTextureId       = textureId2;
+  data1.removeTextureObserver = &observer2;
+  data1.resendFilename        = filename3;
+  data1.resendTextureId       = textureId3;
+  data1.resendTextureObserver = &observer3;
+  data1.newlyFilename         = filename2; // Same as observer2 filename
+  data1.newlyTextureIdPtr     = &textureId4;
+
+  observer1.mData = &data1;
+  observer1.ConnectFunction(
+    [&](void* data) {
+      DALI_TEST_CHECK(data);
+      CustomData1 data1 = *(CustomData1*)data;
+
+      DALI_TEST_CHECK(data1.textureManagerPtr);
+      DALI_TEST_CHECK(data1.removeTextureId != TextureManager::INVALID_TEXTURE_ID);
+      DALI_TEST_CHECK(data1.removeTextureObserver);
+      DALI_TEST_CHECK(*data1.removeTextureObserver);
+      DALI_TEST_CHECK(!data1.resendFilename.empty());
+      DALI_TEST_CHECK(data1.resendTextureId != TextureManager::INVALID_TEXTURE_ID);
+      DALI_TEST_CHECK(data1.resendTextureObserver);
+      DALI_TEST_CHECK(!data1.newlyFilename.empty());
+      DALI_TEST_CHECK(data1.newlyTextureIdPtr);
+      DALI_TEST_CHECK(*data1.newlyTextureIdPtr == TextureManager::INVALID_TEXTURE_ID);
+
+      // Remove textureId2.
+      data1.textureManagerPtr->RequestRemove(data1.removeTextureId, *data1.removeTextureObserver);
+
+      auto removedObserver = *data1.removeTextureObserver;
+
+      // Destroy observer2.
+      delete removedObserver;
+
+      // Create new observer. Make we use same pointer if we can.
+      uint32_t maxTryCount = 100u;
+      uint32_t tryCount    = 0u;
+
+      while(tryCount < maxTryCount)
+      {
+        *data1.removeTextureObserver = new TestObserverWithCustomFunction();
+        if(removedObserver == *data1.removeTextureObserver) break;
+        ++tryCount;
+        delete *data1.removeTextureObserver;
+      }
+
+      tet_printf("TryCount[%u] / Old observer2 : %p, newly observer2 : %p\n", tryCount, removedObserver, *data1.removeTextureObserver);
+
+      // Connect new observer2 custom function
+      newData2.textureManagerPtr = &textureManager;
+      newData2.self              = (*data1.removeTextureObserver);
+      newData2.observerLoadedPtr = &newObserver2Loaded;
+      newData2.observerCalledPtr = &newObserver2Called;
+
+      (*data1.removeTextureObserver)->mData = &newData2;
+      (*data1.removeTextureObserver)->ConnectFunction([](void* data) {
+        DALI_TEST_CHECK(data);
+        CustomData2 data2 = *(CustomData2*)data;
+
+        tet_printf("New created observer running\n");
+
+        DALI_TEST_CHECK(data2.self);
+        DALI_TEST_CHECK(data2.observerLoadedPtr);
+        DALI_TEST_CHECK(data2.observerCalledPtr);
+
+        *data2.observerLoadedPtr = data2.self->mLoaded;
+        *data2.observerCalledPtr = data2.self->mObserverCalled;
+      });
+
+      // Dummy reference value
+      auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+      // Resend textureId3
+      data1.textureManagerPtr->RequestRemove(data1.resendTextureId, data1.resendTextureObserver);
+
+      TextureManager::TextureId tempId;
+      tempId = data1.textureManagerPtr->RequestLoad(
+        data1.resendFilename,
+        ImageDimensions(),
+        FittingMode::SCALE_TO_FILL,
+        SamplingMode::BOX_THEN_LINEAR,
+        data1.resendTextureObserver,
+        true,
+        TextureManager::ReloadPolicy::CACHED,
+        preMultiply);
+
+      DALI_TEST_CHECK(tempId == data1.resendTextureId);
+
+      // Request new task
+
+      tempId = data1.textureManagerPtr->RequestLoad(
+        data1.newlyFilename,
+        ImageDimensions(),
+        FittingMode::SCALE_TO_FILL,
+        SamplingMode::BOX_THEN_LINEAR,
+        *data1.removeTextureObserver,
+        true,
+        TextureManager::ReloadPolicy::CACHED,
+        preMultiply);
+
+      DALI_TEST_CHECK(tempId != TextureManager::INVALID_TEXTURE_ID);
+      *data1.newlyTextureIdPtr = tempId;
+    });
+
+  // Connect observer2 custom function
+  CustomData2 data2;
+  data2.textureManagerPtr = &textureManager;
+  data2.self              = observer2;
+  data2.observerLoadedPtr = &observer2Loaded;
+  data2.observerCalledPtr = &observer2Called;
+
+  observer2->mData = &data2;
+  observer2->ConnectFunction(
+    [](void* data) {
+      DALI_TEST_CHECK(data);
+      CustomData2 data2 = *(CustomData2*)data;
+
+      tet_printf("Old created observer running. Something error occured!\n");
+
+      DALI_TEST_CHECK(data2.self);
+      DALI_TEST_CHECK(data2.observerLoadedPtr);
+      DALI_TEST_CHECK(data2.observerCalledPtr);
+
+      *data2.observerLoadedPtr = data2.self->mLoaded;
+      *data2.observerCalledPtr = data2.self->mObserverCalled;
+    });
+
+  tet_printf("Id info - 1 : {%d}, 2 : {%d}, 3 : {%d}, 4 : {%d}\n", static_cast<int>(textureId1), static_cast<int>(textureId2), static_cast<int>(textureId3), static_cast<int>(textureId4));
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2Loaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2Called, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(newObserver2Loaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(newObserver2Called, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mObserverCalled, false, TEST_LOCATION);
+
+  DALI_TEST_CHECK(textureId4 == TextureManager::INVALID_TEXTURE_ID);
+
+  // CAPTION : HARD-CODING.
+  // Run codes without exception.
+  try
+  {
+    tet_printf("Complete async load 1 first.\n");
+    std::vector<Devel::PixelBuffer> pixelBuffers;
+
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::RGB888));
+    textureManager.AsyncLoadComplete(textureId1, pixelBuffers);
+
+    tet_printf("Now observer2 deleted, observer3 resended, observer2 re-created.\n");
+    DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2Loaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2Called, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(newObserver2Loaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(newObserver2Called, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3.mLoaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3.mObserverCalled, false, TEST_LOCATION);
+
+    tet_printf("Id info - 1 : {%d}, 2 : {%d}, 3 : {%d}, 4 : {%d}\n", static_cast<int>(textureId1), static_cast<int>(textureId2), static_cast<int>(textureId3), static_cast<int>(textureId4));
+
+    DALI_TEST_CHECK(textureId4 == textureId2);
+
+    // Remove processor excute.
+    application.SendNotification();
+    application.Render();
+
+    tet_printf("Complete async load 2. Let we check old version observer2 ignored and newly observer2 loaded.\n");
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::RGB888));
+    textureManager.AsyncLoadComplete(textureId2, pixelBuffers);
+
+    DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2Loaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2Called, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(newObserver2Loaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(newObserver2Called, true, TEST_LOCATION);
+    // We don't check observer3 not loaded case because SendNotification can process AsyncTask.
+    //DALI_TEST_EQUALS(observer3.mLoaded, false, TEST_LOCATION);
+    //DALI_TEST_EQUALS(observer3.mObserverCalled, false, TEST_LOCATION);
+
+    tet_printf("Complete async load 3.\n");
+    pixelBuffers.clear();
+    pixelBuffers.push_back(Devel::PixelBuffer::New(1, 1, Pixel::Format::RGB888));
+    textureManager.AsyncLoadComplete(textureId3, pixelBuffers);
+
+    DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2Loaded, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer2Called, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(newObserver2Loaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(newObserver2Called, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3.mLoaded, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(observer3.mObserverCalled, true, TEST_LOCATION);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  END_TEST;
+}
+
+int UtcTextureManagerCachingForDifferentMultiplyOnLoad(void)
+{
+  /// To insture the order of callback, Make we don't use mutiple thread loading for this UTC.
+  EnvironmentVariable::SetTestEnvironmentVariable("DALI_ASYNC_MANAGER_THREAD_POOL_SIZE", "1");
+  EnvironmentVariable::SetTestEnvironmentVariable("DALI_ASYNC_MANAGER_LOW_PRIORITY_THREAD_POOL_SIZE", "1");
+
+  ToolkitTestApplication application;
+  tet_infoline("UtcTextureManagerCachingForDifferentMultiplyOnLoad");
+  tet_infoline("Observe1 multiply on load, and Observer2, 3 don't multiply on load.");
+  tet_infoline("We will use jpg image, with will not premultiply alpha even if we try to load without multiply.");
+
+  tet_infoline("Let we request Observer1 and Observer2 sequencely.");
+  tet_infoline("After Observer1 complete, we will cache -premultiplyOnLoad = true, premultiplied = false;");
+  tet_infoline("Before Observer2 complete, let we request Observer3. It will cache-hit with Observer1 item (since image is not premultiplied.)");
+  tet_infoline("At this time, Observer1 and Observer3 loaded, but Observer2 still not.");
+
+  TextureManager textureManager; // Create new texture manager
+
+  TestObserver observer1;
+  TestObserver observer2;
+  TestObserver observer3;
+  std::string  filename(TEST_IMAGE_FILE_NAME);
+  auto         preMultiply = TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD;
+  textureManager.RequestLoad(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    &observer1,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer1.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, false, TEST_LOCATION);
+
+  preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  textureManager.RequestLoad(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    &observer2,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  tet_printf("We can ensure that observer1 loaded first. (since the number of thread pool is 1)\n");
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+
+  preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  textureManager.RequestLoad(
+    filename,
+    ImageDimensions(),
+    FittingMode::SCALE_TO_FILL,
+    SamplingMode::BOX_THEN_LINEAR,
+    &observer3,
+    true,
+    TextureManager::ReloadPolicy::CACHED,
+    preMultiply);
+
+  tet_printf("Request Observer3. It will cache-hit with Observer1.\n");
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( observer.mLoaded, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer.mObserverCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( observer.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer2.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mLoaded, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mObserverCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(observer3.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
index 2453771..c0e6a76 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <toolkit-text-utils.h>
 
-
 using namespace Dali;
 using namespace Toolkit;
 using namespace Text;
@@ -36,12 +35,10 @@ using namespace Text;
 // void CreateGlyphsPerCharacterTable( CharacterIndex startIndex,
 //                                     Length numberOfCharacters )
 
-
 //////////////////////////////////////////////////////////
 
 namespace
 {
-
 struct SetGlyphsPerCharacterData
 {
   std::string   description;             ///< Description of the test.
@@ -62,82 +59,85 @@ struct SetCharacterToGlyphData
   unsigned int* glyphsIndices;           ///< The glyph indices.
 };
 
-bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data )
+bool SetGlyphsPerCharacterTest(const SetGlyphsPerCharacterData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
-  Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
+  Vector<GlyphIndex>& charactersToGlyph  = visualModel->mCharactersToGlyph;
+  Vector<Length>&     glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
 
   // 2) Clear the model.
 
   GlyphIndex startGlyphIndex = 0u;
-  if( 0u != charactersToGlyph.Count() )
+  if(0u != charactersToGlyph.Count())
   {
     // The number of glyphs to be removed.
     const Length numberOfGlyphs = charactersToGlyph[data.startIndex + data.numberOfCharacters - 1u] + glyphsPerCharacter[data.startIndex + data.numberOfCharacters - 1u] - charactersToGlyph[data.startIndex];
-    startGlyphIndex = charactersToGlyph[data.startIndex];
+    startGlyphIndex             = charactersToGlyph[data.startIndex];
 
-    charactersToGlyph.Erase( charactersToGlyph.Begin() + data.startIndex,
-                             charactersToGlyph.Begin() + data.startIndex + data.numberOfCharacters );
-    glyphsPerCharacter.Erase( glyphsPerCharacter.Begin() + data.startIndex,
-                              glyphsPerCharacter.Begin() + data.startIndex + data.numberOfCharacters );
+    charactersToGlyph.Erase(charactersToGlyph.Begin() + data.startIndex,
+                            charactersToGlyph.Begin() + data.startIndex + data.numberOfCharacters);
+    glyphsPerCharacter.Erase(glyphsPerCharacter.Begin() + data.startIndex,
+                             glyphsPerCharacter.Begin() + data.startIndex + data.numberOfCharacters);
 
     // Update the character to glyph indices.
-    for( Vector<GlyphIndex>::Iterator it = charactersToGlyph.Begin() + data.startIndex,
-           endIt = charactersToGlyph.End();
-         it != endIt;
-         ++it )
+    for(Vector<GlyphIndex>::Iterator it    = charactersToGlyph.Begin() + data.startIndex,
+                                     endIt = charactersToGlyph.End();
+        it != endIt;
+        ++it)
     {
       *it -= numberOfGlyphs;
     }
   }
 
   // 3) Call the CreateGlyphsPerCharacterTable() function
-  visualModel->CreateGlyphsPerCharacterTable( data.startIndex,
-                                              startGlyphIndex,
-                                              data.numberOfCharacters );
+  visualModel->CreateGlyphsPerCharacterTable(data.startIndex,
+                                             startGlyphIndex,
+                                             data.numberOfCharacters);
 
   // 4) Compare the results.
-  if( data.totalNumberOfCharacters != glyphsPerCharacter.Count() )
+  if(data.totalNumberOfCharacters != glyphsPerCharacter.Count())
   {
     std::cout << "  Different number of characters : " << glyphsPerCharacter.Count() << ", expected : " << data.totalNumberOfCharacters << std::endl;
     return false;
   }
 
-  for( unsigned int i = 0u; i < data.totalNumberOfCharacters; ++i )
+  for(unsigned int i = 0u; i < data.totalNumberOfCharacters; ++i)
   {
-    if( data.glyphsPerCharacter[i] != glyphsPerCharacter[i] )
+    if(data.glyphsPerCharacter[i] != glyphsPerCharacter[i])
     {
       std::cout << "  Different number of glyphs for index " << i << std::endl;
-      for( unsigned int j = 0; j < data.totalNumberOfCharacters; ++j )
+      for(unsigned int j = 0; j < data.totalNumberOfCharacters; ++j)
       {
         std::cout << glyphsPerCharacter[j] << " ";
       }
       std::cout << std::endl;
       std::cout << "  expected" << std::endl;
-      for( unsigned int j = 0; j < data.totalNumberOfCharacters; ++j )
+      for(unsigned int j = 0; j < data.totalNumberOfCharacters; ++j)
       {
         std::cout << data.glyphsPerCharacter[j] << " ";
       }
@@ -149,80 +149,83 @@ bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data )
   return true;
 }
 
-bool SetCharacterToGlyphTest( const SetCharacterToGlyphData& data )
+bool SetCharacterToGlyphTest(const SetCharacterToGlyphData& data)
 {
   // 1) Create the model.
-  ModelPtr textModel;
+  ModelPtr   textModel;
   MetricsPtr metrics;
-  Size textArea(100.f, 60.f);
-  Size layoutSize;
+  Size       textArea(100.f, 60.f);
+  Size       layoutSize;
 
   const Vector<FontDescriptionRun> fontDescriptions;
-  const LayoutOptions options;
-  CreateTextModel( data.text,
-                   textArea,
-                   fontDescriptions,
-                   options,
-                   layoutSize,
-                   textModel,
-                   metrics,
-                   false,
-                   LineWrap::WORD,
-                   false,
-                   Toolkit::DevelText::EllipsisPosition::END );
+  const LayoutOptions              options;
+  CreateTextModel(data.text,
+                  textArea,
+                  fontDescriptions,
+                  options,
+                  layoutSize,
+                  textModel,
+                  metrics,
+                  false,
+                  LineWrap::WORD,
+                  false,
+                  Toolkit::DevelText::EllipsisPosition::END,
+                  0.0f, // lineSpacing
+                  0.0f  // characterSpacing
+  );
 
   LogicalModelPtr logicalModel = textModel->mLogicalModel;
-  VisualModelPtr visualModel = textModel->mVisualModel;
+  VisualModelPtr  visualModel  = textModel->mVisualModel;
 
-  Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
-  Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
+  Vector<GlyphIndex>& charactersToGlyph  = visualModel->mCharactersToGlyph;
+  Vector<Length>&     glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
 
   // 2) Clear the model.
 
   GlyphIndex startGlyphIndex = 0u;
-  if( 0u != charactersToGlyph.Count() )
+  if(0u != charactersToGlyph.Count())
   {
     // The number of glyphs to be removed.
     const Length numberOfGlyphs = charactersToGlyph[data.startIndex + data.numberOfCharacters - 1u] + glyphsPerCharacter[data.startIndex + data.numberOfCharacters - 1u] - charactersToGlyph[data.startIndex];
-    startGlyphIndex = charactersToGlyph[data.startIndex];
+    startGlyphIndex             = charactersToGlyph[data.startIndex];
 
-    charactersToGlyph.Erase( charactersToGlyph.Begin() + data.startIndex,
-                             charactersToGlyph.Begin() + data.startIndex + data.numberOfCharacters );
+    charactersToGlyph.Erase(charactersToGlyph.Begin() + data.startIndex,
+                            charactersToGlyph.Begin() + data.startIndex + data.numberOfCharacters);
 
     // Update the character to glyph indices.
-    for( Vector<GlyphIndex>::Iterator it = charactersToGlyph.Begin() + data.startIndex,
-           endIt = charactersToGlyph.End();
-         it != endIt;
-         ++it )
+    for(Vector<GlyphIndex>::Iterator it    = charactersToGlyph.Begin() + data.startIndex,
+                                     endIt = charactersToGlyph.End();
+        it != endIt;
+        ++it)
     {
       *it -= numberOfGlyphs;
     }
   }
 
   // 3) Call the CreateCharacterToGlyphTable() function
-  visualModel->CreateCharacterToGlyphTable( data.startIndex,
-                                            startGlyphIndex,
-                                            data.numberOfCharacters );
+  visualModel->CreateCharacterToGlyphTable(data.startIndex,
+                                           startGlyphIndex,
+                                           data.numberOfCharacters);
 
   // 4) Compare the results.
-  if( data.totalNumberOfCharacters != charactersToGlyph.Count() )
+  if(data.totalNumberOfCharacters != charactersToGlyph.Count())
   {
     std::cout << "  Different number of character : " << charactersToGlyph.Count() << ", expected : " << data.totalNumberOfCharacters << std::endl;
     return false;
   }
 
-  for( unsigned int i = 0u; i < data.totalNumberOfCharacters; ++i )
+  for(unsigned int i = 0u; i < data.totalNumberOfCharacters; ++i)
   {
-    if( data.glyphsIndices[i] != charactersToGlyph[i] )
+    if(data.glyphsIndices[i] != charactersToGlyph[i])
     {
       std::cout << "  Different number of character to glyph index " << i << std::endl;
-      for( unsigned int j = 0; j < data.totalNumberOfCharacters; ++j )
+      for(unsigned int j = 0; j < data.totalNumberOfCharacters; ++j)
       {
         std::cout << charactersToGlyph[j] << " ";
       }
       std::cout << std::endl;
       std::cout << "  expected" << std::endl;
-      for( unsigned int j = 0; j < data.totalNumberOfCharacters; ++j )
+      for(unsigned int j = 0; j < data.totalNumberOfCharacters; ++j)
       {
         std::cout << data.glyphsIndices[j] << " ";
       }
@@ -242,72 +245,65 @@ int UtcDaliSetGlyphsPerCharacter(void)
 {
   tet_infoline(" UtcDaliSetGlyphsPerCharacter");
 
-  Length glyphsPerCharacter02[] = { 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u };
-  Length glyphsPerCharacter03[] = { 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u };
-  Length glyphsPerCharacter04[] = { 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 1u,
-                                    1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
-                                    1u, 1u, 1u, 1u, 0u, 1u, 0u, 2u, 1u, 0u,
-                                    2u, 0u, 2u, 0u, 2u, 1u, 1u, 0u, 0u, 0u,
-                                    2u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 2u, 1u,
-                                    0u, 2u, 1u, 1u };
+  Length glyphsPerCharacter02[] = {1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u};
+  Length glyphsPerCharacter03[] = {1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u};
+  Length glyphsPerCharacter04[] = {1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 0u, 1u, 0u, 2u, 1u, 0u, 2u, 0u, 2u, 0u, 2u, 1u, 1u, 0u, 0u, 0u, 2u, 1u, 1u, 1u, 1u, 1u, 0u, 0u, 2u, 1u, 0u, 2u, 1u, 1u};
 
   struct SetGlyphsPerCharacterData data[] =
-  {
-    {
-      "Zero characters text",
-      "",
-      0u,
-      0u,
-      0u,
-      NULL
-    },
-    {
-      "Simple 1 to 1 text",
-      "Hello world",
-      0u,
-      11u,
-      11u,
-      glyphsPerCharacter02,
-    },
-    {
-      "Text with different number of glyphs and characters.",
-      "Hello different world",
-      0u,
-      21u,
-      21u,
-      glyphsPerCharacter03,
-    },
     {
-      "Text paragraphs with different number of glyphs and characters. Update initial paragraphs.",
-      "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
-      0u,
-      22u,
-      54u,
-      glyphsPerCharacter04,
-    },
-    {
-      "Text paragraphs with different number of glyphs and characters. Update mid paragraphs.",
-      "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
-      22u,
-      14u,
-      54u,
-      glyphsPerCharacter04,
-    },
-    {
-      "Text paragraphs with different number of glyphs and characters. Update final paragraphs.",
-      "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
-      36u,
-      18u,
-      54u,
-      glyphsPerCharacter04,
-    },
-  };
+      {"Zero characters text",
+       "",
+       0u,
+       0u,
+       0u,
+       NULL},
+      {
+        "Simple 1 to 1 text",
+        "Hello world",
+        0u,
+        11u,
+        11u,
+        glyphsPerCharacter02,
+      },
+      {
+        "Text with different number of glyphs and characters.",
+        "Hello different world",
+        0u,
+        21u,
+        21u,
+        glyphsPerCharacter03,
+      },
+      {
+        "Text paragraphs with different number of glyphs and characters. Update initial paragraphs.",
+        "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
+        0u,
+        22u,
+        54u,
+        glyphsPerCharacter04,
+      },
+      {
+        "Text paragraphs with different number of glyphs and characters. Update mid paragraphs.",
+        "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
+        22u,
+        14u,
+        54u,
+        glyphsPerCharacter04,
+      },
+      {
+        "Text paragraphs with different number of glyphs and characters. Update final paragraphs.",
+        "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
+        36u,
+        18u,
+        54u,
+        glyphsPerCharacter04,
+      },
+    };
   const unsigned int numberOfTests = 6u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !SetGlyphsPerCharacterTest( data[index] ) )
+    if(!SetGlyphsPerCharacterTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
@@ -321,70 +317,66 @@ int UtcDaliSetCharacterToGlyph(void)
 {
   tet_infoline(" UtcDaliSetGlyphsPerCharacter");
 
-  GlyphIndex glyphIndices02[] = { 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u };
-  GlyphIndex glyphIndices03[] = { 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u };
-  GlyphIndex glyphIndices04[] = { 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u,
-                                  21u, 22u, 23u, 23u, 24u, 24u, 26u, 27u, 27u, 29u, 29u, 31u, 31u, 33u,
-                                  34u, 35u, 35u, 35u, 35u, 37u, 38u, 39u, 40u, 41u, 42u, 42u, 42u, 44u, 45u, 45u, 47u, 48u };
+  GlyphIndex glyphIndices02[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 9u, 10u};
+  GlyphIndex glyphIndices03[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u};
+  GlyphIndex glyphIndices04[] = {0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u, 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, 16u, 17u, 18u, 19u, 20u, 21u, 22u, 23u, 23u, 24u, 24u, 26u, 27u, 27u, 29u, 29u, 31u, 31u, 33u, 34u, 35u, 35u, 35u, 35u, 37u, 38u, 39u, 40u, 41u, 42u, 42u, 42u, 44u, 45u, 45u, 47u, 48u};
 
   struct SetCharacterToGlyphData data[] =
-  {
-    {
-      "Zero characters text",
-      "",
-      0u,
-      0u,
-      0u,
-      NULL
-    },
-    {
-      "Simple 1 to 1 text",
-      "Hello world",
-      0u,
-      11u,
-      11u,
-      glyphIndices02,
-    },
-    {
-      "Text with different number of glyphs and characters.",
-      "Hello different world",
-      0u,
-      21u,
-      21u,
-      glyphIndices03,
-    },
-    {
-      "Text paragraphs with different number of glyphs and characters. Update initial paragraphs.",
-      "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
-      0u,
-      22u,
-      54u,
-      glyphIndices04,
-    },
     {
-      "Text paragraphs with different number of glyphs and characters. Update mid paragraphs.",
-      "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
-      22u,
-      14u,
-      54u,
-      glyphIndices04,
-    },
-    {
-      "Text paragraphs with different number of glyphs and characters. Update final paragraphs.",
-      "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
-      36u,
-      18u,
-      54u,
-      glyphIndices04,
-    },
-  };
+      {"Zero characters text",
+       "",
+       0u,
+       0u,
+       0u,
+       NULL},
+      {
+        "Simple 1 to 1 text",
+        "Hello world",
+        0u,
+        11u,
+        11u,
+        glyphIndices02,
+      },
+      {
+        "Text with different number of glyphs and characters.",
+        "Hello different world",
+        0u,
+        21u,
+        21u,
+        glyphIndices03,
+      },
+      {
+        "Text paragraphs with different number of glyphs and characters. Update initial paragraphs.",
+        "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
+        0u,
+        22u,
+        54u,
+        glyphIndices04,
+      },
+      {
+        "Text paragraphs with different number of glyphs and characters. Update mid paragraphs.",
+        "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
+        22u,
+        14u,
+        54u,
+        glyphIndices04,
+      },
+      {
+        "Text paragraphs with different number of glyphs and characters. Update final paragraphs.",
+        "Hello different world\nनमस्ते दुनिया\nမင်္ဂလာပါကမ္ဘာလောက",
+        36u,
+        18u,
+        54u,
+        glyphIndices04,
+      },
+    };
 
   const unsigned int numberOfTests = 6u;
 
-  for( unsigned int index = 0u; index < numberOfTests; ++index )
+  for(unsigned int index = 0u; index < numberOfTests; ++index)
   {
     ToolkitTestApplication application;
-    if( !SetCharacterToGlyphTest( data[index] ) )
+    if(!SetCharacterToGlyphTest(data[index]))
     {
       tet_result(TET_FAIL);
     }
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualUrl.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualUrl.cpp
index 767c1f8..f94764d 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualUrl.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualUrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,428 +19,542 @@
 
 #include <stdlib.h>
 
+#include <dali/devel-api/common/hash.h>
+
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
 using namespace Dali::Toolkit::Internal;
 
+namespace
+{
+constexpr uint32_t URL_ELLIPSED_LENGTH = 20u;
+}
+
 int UtcDaliVisualUrlConstructor(void)
 {
-  const char* url="file://bar.org/foobar.gif";
-  VisualUrl visualUrl(url);
-  DALI_TEST_EQUALS( true, visualUrl.IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl.GetType(), VisualUrl::GIF, TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION );
+  const char* url = "file://bar.org/foobar.gif";
+  VisualUrl   visualUrl(url);
+  DALI_TEST_EQUALS(true, visualUrl.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl.GetType(), VisualUrl::GIF, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION);
 
   VisualUrl visualUrl2("foobar.jpeg");
   visualUrl2 = visualUrl;
-  DALI_TEST_EQUALS( true, visualUrl2.IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl2.GetType(), VisualUrl::GIF, TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl2.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION );
+  DALI_TEST_EQUALS(true, visualUrl2.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl2.GetType(), VisualUrl::GIF, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl2.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION);
 
-  VisualUrl visualUrl3( visualUrl );
-  DALI_TEST_EQUALS( true, visualUrl3.IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl3.GetType(), VisualUrl::GIF, TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl3.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION );
+  VisualUrl visualUrl3(visualUrl);
+  DALI_TEST_EQUALS(true, visualUrl3.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl3.GetType(), VisualUrl::GIF, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl3.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION);
 
   VisualUrl visualUrl4("dali://0");
   visualUrl4 = visualUrl;
-  DALI_TEST_EQUALS( true, visualUrl4.IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl4.GetType(), VisualUrl::GIF, TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl4.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION );
+  DALI_TEST_EQUALS(true, visualUrl4.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl4.GetType(), VisualUrl::GIF, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl4.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION);
 
   VisualUrl visualUrl5("dali://1");
-  visualUrl4 = visualUrl5;
-  DALI_TEST_EQUALS( true, visualUrl4.IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl4.GetType(), VisualUrl::REGULAR_IMAGE, TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl4.GetProtocolType(), VisualUrl::TEXTURE, TEST_LOCATION );
+  visualUrl4 = std::move(visualUrl5);
+  DALI_TEST_EQUALS(true, visualUrl4.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl4.GetType(), VisualUrl::REGULAR_IMAGE, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl4.GetProtocolType(), VisualUrl::TEXTURE, TEST_LOCATION);
 
   VisualUrl visualUrl6("enbuf://0");
   visualUrl6 = visualUrl;
-  DALI_TEST_EQUALS( true, visualUrl6.IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl6.GetType(), VisualUrl::GIF, TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl6.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION );
+  DALI_TEST_EQUALS(true, visualUrl6.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl6.GetType(), VisualUrl::GIF, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl6.GetProtocolType(), VisualUrl::LOCAL, TEST_LOCATION);
 
   VisualUrl visualUrl7("enbuf://1");
   visualUrl6 = visualUrl7;
-  DALI_TEST_EQUALS( true, visualUrl6.IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl6.GetType(), VisualUrl::REGULAR_IMAGE, TEST_LOCATION );
-  DALI_TEST_EQUALS( visualUrl6.GetProtocolType(), VisualUrl::BUFFER, TEST_LOCATION );
+  DALI_TEST_EQUALS(true, visualUrl6.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl6.GetType(), VisualUrl::REGULAR_IMAGE, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl6.GetProtocolType(), VisualUrl::BUFFER, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, visualUrl7.IsValid(), TEST_LOCATION);
+  std::size_t hashResult = visualUrl7.GetUrlHash();
+
+  VisualUrl visualUrl8(std::move(visualUrl7));
+  DALI_TEST_EQUALS(true, visualUrl8.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl8.GetType(), VisualUrl::REGULAR_IMAGE, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl8.GetProtocolType(), VisualUrl::BUFFER, TEST_LOCATION);
+  DALI_TEST_EQUALS(visualUrl8.GetUrlHash(), hashResult, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(false, visualUrl7.IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::CalculateHash(std::string("")), visualUrl7.GetUrlHash(), TEST_LOCATION);
   END_TEST;
 }
 
-
 int UtcDaliVisualUrlRegularImage(void)
 {
-  tet_infoline( "UtcDaliVisualUrl REGULAR_IMAGE" );
+  tet_infoline("UtcDaliVisualUrl REGULAR_IMAGE");
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.jpeg").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.jpeg").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.PNG").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.PNG").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.Png123").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.Png123").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.Png1.23").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("foobar.Png1.23").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl(" ").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl(" ").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl(".").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl(".").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("9").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("9").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("dali://bar.org/foobar.gif").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("dali://bar.org/foobar.gif").GetType(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlSvg(void)
 {
-  tet_infoline( "UtcDaliVisualUrl SVG" );
+  tet_infoline("UtcDaliVisualUrl SVG");
 
-  DALI_TEST_EQUALS( VisualUrl::SVG, VisualUrl("foobar.svg").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::SVG, VisualUrl("foobar.svg").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::SVG, VisualUrl("foobar.svg.svg").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::SVG, VisualUrl("foobar.svg.svg").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::SVG, VisualUrl("foobar.svG").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::SVG, VisualUrl("foobar.svG").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::SVG, VisualUrl("foobar.SVG").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::SVG, VisualUrl("foobar.SVG").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::SVG, VisualUrl(".SvG").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::SVG, VisualUrl(".SvG").GetType(), TEST_LOCATION);
 
   // SVGs aren't N-patch
-  DALI_TEST_EQUALS( VisualUrl::SVG, VisualUrl("foobar.9.svg").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::SVG, VisualUrl("foobar.9.svg").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("svg.png").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("svg.png").GetType(), TEST_LOCATION);
 
   // maybe controversial, but for now we expect the suffix to be exactly .svg
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("svg.svg1").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("svg.svg1").GetType(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlNPatch(void)
 {
-  tet_infoline( "UtcDaliVisualUrl N_PATCH" );
+  tet_infoline("UtcDaliVisualUrl N_PATCH");
 
-  DALI_TEST_EQUALS( VisualUrl::N_PATCH, VisualUrl("foobar.#.png").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::N_PATCH, VisualUrl("foobar.#.png").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::N_PATCH, VisualUrl("foobar.9.9.bmp").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::N_PATCH, VisualUrl("foobar.9.9.bmp").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::N_PATCH, VisualUrl("foobar.9.9.jpg[]=$$").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::N_PATCH, VisualUrl("foobar.9.9.jpg[]=$$").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::N_PATCH, VisualUrl("foobar.9.#.#.9.wbpm123").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::N_PATCH, VisualUrl("foobar.9.#.#.9.wbpm123").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("svg.##.png").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("svg.##.png").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("svg.99.jpeg").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("svg.99.jpeg").GetType(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlGif(void)
 {
-  tet_infoline( "UtcDaliVisualUrl GIF" );
+  tet_infoline("UtcDaliVisualUrl GIF");
 
-  DALI_TEST_EQUALS( VisualUrl::GIF, VisualUrl("foobar.gif").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::GIF, VisualUrl("foobar.gif").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::GIF, VisualUrl("foobar.gif.gif").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::GIF, VisualUrl("foobar.gif.gif").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::GIF, VisualUrl("foobar.giF").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::GIF, VisualUrl("foobar.giF").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::GIF, VisualUrl("foobar.GIF").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::GIF, VisualUrl("foobar.GIF").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::GIF, VisualUrl(".GiF").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::GIF, VisualUrl(".GiF").GetType(), TEST_LOCATION);
 
-  // GIFs aren't N-patch
-  DALI_TEST_EQUALS( VisualUrl::GIF, VisualUrl("foobar.9.gif").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::N_PATCH, VisualUrl("foobar.9.gif").GetType(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("gif.png").GetType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("gif.gif1").GetType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REGULAR_IMAGE, VisualUrl("dali://.gif").GetType(), TEST_LOCATION );
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("gif.png").GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("gif.gif1").GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REGULAR_IMAGE, VisualUrl("dali://.gif").GetType(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliVisualUrlLocationP(void)
 {
-  tet_infoline( "UtcDaliVisualUrl Location" );
-
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.jpeg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ftp://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ssh://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("http://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("https://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("FTP://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("FTP://BAR.ORG/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("SSH://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("SSH://BAR.ORG/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTP://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTPS://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("dali://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("dali://1234").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("DALI://1234").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("dali://.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("enbuf://").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("enbuf://1234").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("ENBUF://1234").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("enbuf://.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
+  tet_infoline("UtcDaliVisualUrl Location");
+
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.jpeg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ftp://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ftp://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ssh://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("ssh://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("http://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("http://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("https://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("https://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("FTP://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("FTP://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("FTP://BAR.ORG/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("SSH://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("SSH://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("SSH://BAR.ORG/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTP://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTP://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTPS://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.GIF").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::REMOTE, VisualUrl("HTTPS://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("dali://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("dali://1234").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("DALI://1234").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("dali://.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::TEXTURE, VisualUrl("dali://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("enbuf://").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("enbuf://1234").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("ENBUF://1234").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("enbuf://.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::BUFFER, VisualUrl("enbuf://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliVisualUrlLocationN(void)
 {
-  tet_infoline( "UtcDaliVisualUrl Location negative tests" );
-
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("h://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ht://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("htp://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("htpp://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("httt://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("http;//bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("http:x/bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("http:/xbar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("sshttp://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("http:https://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("https:http://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("HPPT://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ftp:/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ftp:a/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("fpp://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ftt://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ssh;//bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ssh:/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ssh:a/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("shh://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("sss://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("fsh://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("stp://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("http:/bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("h1tps://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("ht2ps://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("htt3s://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("http4://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("https5/bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("https:6/bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("https:/7bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("dal://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("d1li://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("da2i://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("dal3://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("dali4//1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("dali:5/1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("dali:/61").GetProtocolType(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("eunki://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("enbu://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("eubnf://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("1nbuf://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("e2bun://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("en3uf://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("enb4f://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("enbu5://1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("enbuf6//1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("enbuf:7/1").GetProtocolType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( VisualUrl::LOCAL, VisualUrl("enbuf:/81").GetProtocolType(), TEST_LOCATION );
+  tet_infoline("UtcDaliVisualUrl Location negative tests");
+
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("h://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ht://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("htp://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("htpp://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("httt://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("http;//bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("http:x/bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("http:/xbar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("sshttp://bar.org/foobar.svg").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("http:https://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("https:http://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("HPPT://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ftp:/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ftp:a/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("fpp://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ftt://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ssh;//bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ssh:/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ssh:a/bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("shh://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("sss://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("fsh://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("stp://bar.org/foobar.9.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("http:/bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("h1tps://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("ht2ps://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("htt3s://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("http4://bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("https5/bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("https:6/bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("https:/7bar.org/foobar.gif").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("file://bar.org/foobar.png").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("dal://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("d1li://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("da2i://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("dal3://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("dali4//1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("dali:5/1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("dali:/61").GetProtocolType(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("eunki://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("enbu://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("eubnf://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("1nbuf://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("e2bun://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("en3uf://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("enb4f://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("enbu5://1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("enbuf6//1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("enbuf:7/1").GetProtocolType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(VisualUrl::LOCAL, VisualUrl("enbuf:/81").GetProtocolType(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlIsValid(void)
 {
-  tet_infoline( "UtcDaliVisualUrl IsValid" );
-
-  DALI_TEST_EQUALS( false, VisualUrl().IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("").IsValid(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.gif").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.png").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.svg").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.GIF").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.9.png").IsValid(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( true, VisualUrl("http://bar.org/foobar.gif").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("http://bar.org/foobar.png").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("http://bar.org/foobar.svg").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("http://bar.org/foobar.GIF").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("http://bar.org/foobar.9.png").IsValid(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( true, VisualUrl("https://bar.org/foobar.gif").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("https://bar.org/foobar.png").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("https://bar.org/foobar.svg").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("https://bar.org/foobar.GIF").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("https://bar.org/foobar.9.png").IsValid(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( true, VisualUrl("HTTP://bar.org/foobar.gif").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTP://bar.org/foobar.png").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTP://bar.org/foobar.svg").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTP://bar.org/foobar.GIF").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTP://bar.org/foobar.9.png").IsValid(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( true, VisualUrl("HTTPS://bar.org/foobar.gif").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTPS://bar.org/foobar.png").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTPS://bar.org/foobar.svg").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTPS://bar.org/foobar.GIF").IsValid(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("HTTPS://bar.org/foobar.9.png").IsValid(), TEST_LOCATION );
+  tet_infoline("UtcDaliVisualUrl IsValid");
+
+  DALI_TEST_EQUALS(false, VisualUrl().IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("").IsValid(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.gif").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.png").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.svg").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.GIF").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.9.png").IsValid(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, VisualUrl("http://bar.org/foobar.gif").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("http://bar.org/foobar.png").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("http://bar.org/foobar.svg").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("http://bar.org/foobar.GIF").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("http://bar.org/foobar.9.png").IsValid(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, VisualUrl("https://bar.org/foobar.gif").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("https://bar.org/foobar.png").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("https://bar.org/foobar.svg").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("https://bar.org/foobar.GIF").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("https://bar.org/foobar.9.png").IsValid(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, VisualUrl("HTTP://bar.org/foobar.gif").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTP://bar.org/foobar.png").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTP://bar.org/foobar.svg").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTP://bar.org/foobar.GIF").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTP://bar.org/foobar.9.png").IsValid(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(true, VisualUrl("HTTPS://bar.org/foobar.gif").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTPS://bar.org/foobar.png").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTPS://bar.org/foobar.svg").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTPS://bar.org/foobar.GIF").IsValid(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("HTTPS://bar.org/foobar.9.png").IsValid(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliVisualUrlIsLocalResource(void)
 {
-  tet_infoline( "UtcDaliVisualUrl IsLocalResource" );
-
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.gif").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.png").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.svg").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.GIF").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, VisualUrl("foobar.9.png").IsLocalResource(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( false, VisualUrl("http://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("http://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("http://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("http://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("http://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( false, VisualUrl("https://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("https://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("https://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("https://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("https://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( false, VisualUrl("HTTP://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTP://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTP://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTP://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTP://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION );
-
-  DALI_TEST_EQUALS( false, VisualUrl("HTTPS://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTPS://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTPS://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTPS://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, VisualUrl("HTTPS://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION );
+  tet_infoline("UtcDaliVisualUrl IsLocalResource");
+
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.gif").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.png").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.svg").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.GIF").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, VisualUrl("foobar.9.png").IsLocalResource(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(false, VisualUrl("http://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("http://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("http://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("http://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("http://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(false, VisualUrl("https://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("https://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("https://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("https://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("https://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(false, VisualUrl("HTTP://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTP://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTP://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTP://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTP://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(false, VisualUrl("HTTPS://bar.org/foobar.gif").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTPS://bar.org/foobar.png").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTPS://bar.org/foobar.svg").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTPS://bar.org/foobar.GIF").IsLocalResource(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, VisualUrl("HTTPS://bar.org/foobar.9.png").IsLocalResource(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlGetLocationP(void)
 {
-  tet_infoline( "UtcDaliVisualUrl GetLocation Positive" );
+  tet_infoline("UtcDaliVisualUrl GetLocation Positive");
 
-  DALI_TEST_EQUAL( "a", VisualUrl("http://a").GetLocation() );
-  DALI_TEST_EQUAL( "1", VisualUrl("dali://1").GetLocation() );
-  DALI_TEST_EQUAL( "4", VisualUrl("enbuf://4").GetLocation() );
-  DALI_TEST_EQUAL( "", VisualUrl("ftp://").GetLocation() );
-  DALI_TEST_EQUAL( "http://", VisualUrl("http://http://").GetLocation() );
+  DALI_TEST_EQUAL("a", VisualUrl("http://a").GetLocation());
+  DALI_TEST_EQUAL("1", VisualUrl("dali://1").GetLocation());
+  DALI_TEST_EQUAL("4", VisualUrl("enbuf://4").GetLocation());
+  DALI_TEST_EQUAL("", VisualUrl("ftp://").GetLocation());
+  DALI_TEST_EQUAL("http://", VisualUrl("http://http://").GetLocation());
+
+  END_TEST;
+}
+
+int UtcDaliVisualUrlGetLocationWithoutExtensionP(void)
+{
+  tet_infoline("UtcDaliVisualUrl GetLocationWithoutExtension Positive");
+
+  DALI_TEST_EQUAL("a", VisualUrl("http://a.png").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("1", VisualUrl("dali://1.jpg").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("4", VisualUrl("enbuf://4.svg").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("", VisualUrl("ftp://.png").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("http://a.jpg", VisualUrl("http://http://a.jpg.jpg").GetLocationWithoutExtension());
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlGetLocationN(void)
 {
-  tet_infoline( "UtcDaliVisualUrl GetLocation Negative" );
+  tet_infoline("UtcDaliVisualUrl GetLocation Negative");
+
+  DALI_TEST_EQUAL("", VisualUrl("").GetLocation());
+  DALI_TEST_EQUAL("a", VisualUrl("a").GetLocation());
+  DALI_TEST_EQUAL("dali:/1", VisualUrl("dali:/1").GetLocation());
+  DALI_TEST_EQUAL("dali//1", VisualUrl("dali//1").GetLocation());
+  DALI_TEST_EQUAL("enbuf:/2", VisualUrl("enbuf:/2").GetLocation());
+  DALI_TEST_EQUAL("", VisualUrl("http:/http://").GetLocation());
+
+  END_TEST;
+}
+
+int UtcDaliVisualUrlGetLocationWithoutExtensionN(void)
+{
+  tet_infoline("UtcDaliVisualUrl GetLocationWithoutExtension Negative");
 
-  DALI_TEST_EQUAL( "", VisualUrl("").GetLocation() );
-  DALI_TEST_EQUAL( "a", VisualUrl("a").GetLocation() );
-  DALI_TEST_EQUAL( "dali:/1", VisualUrl("dali:/1").GetLocation() );
-  DALI_TEST_EQUAL( "dali//1", VisualUrl("dali//1").GetLocation() );
-  DALI_TEST_EQUAL( "enbuf:/2", VisualUrl("enbuf:/2").GetLocation() );
-  DALI_TEST_EQUAL( "", VisualUrl("http:/http://").GetLocation() );
+  DALI_TEST_EQUAL("", VisualUrl("").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("a", VisualUrl("a").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("dali:/1.jpg", VisualUrl("dali:/1.jpg").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("dali//1.jpg", VisualUrl("dali//1.jpg").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("enbuf:/2.png", VisualUrl("enbuf:/2.png").GetLocationWithoutExtension());
+  DALI_TEST_EQUAL("a.jpg", VisualUrl("http:/http://a.jpg.jpngif").GetLocationWithoutExtension());
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlCreateTextureUrl(void)
 {
-  tet_infoline( "UtcDaliVisualUrl CreateTextureUrl" );
+  tet_infoline("UtcDaliVisualUrl CreateTextureUrl");
 
-  DALI_TEST_EQUAL( "dali://a", VisualUrl::CreateTextureUrl( "a" ) );
-  DALI_TEST_EQUAL( "dali://1234", VisualUrl::CreateTextureUrl( "1234" ) );
-  DALI_TEST_EQUAL( "dali://", VisualUrl::CreateTextureUrl( "" ) );
+  DALI_TEST_EQUAL("dali://a", VisualUrl::CreateTextureUrl("a"));
+  DALI_TEST_EQUAL("dali://1234", VisualUrl::CreateTextureUrl("1234"));
+  DALI_TEST_EQUAL("dali://", VisualUrl::CreateTextureUrl(""));
 
   END_TEST;
 }
 
 int UtcDaliVisualUrlCreateBufferUrl(void)
 {
-  tet_infoline( "UtcDaliVisualUrl CreateBufferUrl" );
+  tet_infoline("UtcDaliVisualUrl CreateBufferUrl");
 
-  DALI_TEST_EQUAL( "enbuf://a", VisualUrl::CreateBufferUrl( "a" ) );
-  DALI_TEST_EQUAL( "enbuf://1234", VisualUrl::CreateBufferUrl( "1234" ) );
-  DALI_TEST_EQUAL( "enbuf://", VisualUrl::CreateBufferUrl( "" ) );
+  DALI_TEST_EQUAL("enbuf://a", VisualUrl::CreateBufferUrl("a", ""));
+  DALI_TEST_EQUAL("enbuf://1234", VisualUrl::CreateBufferUrl("1234", ""));
+  DALI_TEST_EQUAL("enbuf://", VisualUrl::CreateBufferUrl("", ""));
 
   END_TEST;
 }
+
+int UtcDaliVisualUrlCreateBufferUrlWithExtension(void)
+{
+  tet_infoline("UtcDaliVisualUrl CreateBufferUrl with extension");
+
+  DALI_TEST_EQUAL("enbuf://a.jpg", VisualUrl::CreateBufferUrl("a", ".jpg"));
+  DALI_TEST_EQUAL("enbuf://1234567", VisualUrl::CreateBufferUrl("1234", "567"));
+  DALI_TEST_EQUAL("enbuf://b", VisualUrl::CreateBufferUrl("", "b"));
+
+  END_TEST;
+}
+
+int UtcDaliVisualUrlGetUrlHash(void)
+{
+  tet_infoline("UtcDaliVisualUrl GetUrlHash");
+
+  std::vector<std::string> testUrlLists =
+    {
+      "", // empty string.
+      "/opt/usr/home/owner/media/resources/test.png",
+      "hello.world",
+      "image.jpg",
+      "not_suffix",
+      "https://bar.org/foo/bar.gif",
+      "dali://0",
+      "enbuf://1",
+    };
+
+  for(auto& url : testUrlLists)
+  {
+    VisualUrl visualUrl(url);
+
+    std::uint64_t exceptHash = Dali::CalculateHash(url);
+    std::uint64_t visualHash = visualUrl.GetUrlHash();
+
+    DALI_TEST_EQUAL(visualHash, exceptHash);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliVisualUrlGetEllipsedUrl(void)
+{
+  tet_infoline("UtcDaliVisualUrl GetEllipsedUrl");
+
+  std::string inputString;
+
+  // Test shot url is same as what input used.
+  for(uint32_t i = 0; i < URL_ELLIPSED_LENGTH + 3; ++i)
+  {
+    inputString.push_back('a');
+
+    VisualUrl visualUrl(inputString);
+
+    DALI_TEST_EQUALS(visualUrl.GetUrl(), inputString, TEST_LOCATION);
+    DALI_TEST_EQUALS(visualUrl.GetEllipsedUrl(), inputString, TEST_LOCATION);
+  }
+
+  for(uint32_t i = 0; i < 10; ++i)
+  {
+    inputString.push_back('0' + i);
+
+    std::string expectString = "..." + inputString.substr(inputString.length() - URL_ELLIPSED_LENGTH);
+
+    VisualUrl visualUrl(inputString);
+
+    DALI_TEST_EQUALS(visualUrl.GetUrl(), inputString, TEST_LOCATION);
+    DALI_TEST_CHECK(visualUrl.GetEllipsedUrl() != inputString);
+    DALI_TEST_EQUALS(visualUrl.GetEllipsedUrl(), expectString, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Visuals-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Visuals-internal.cpp
index 13464d3..77b2d14 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Visuals-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Visuals-internal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,58 +21,61 @@
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <toolkit-text-utils.h>
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-text-utils.h>
+
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
-#include <dummy-visual.h>
+#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+
 #include <../dali-toolkit/dali-toolkit-test-utils/dummy-control.h>
-#include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
+#include <dummy-visual.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
+const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json";
+const char* TEST_GIF_FILE_NAME          = TEST_RESOURCE_DIR "/anim.gif";
 
-const char* TEST_VECTOR_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/insta_camera.json";
-
-}
+} // namespace
 
 int UtcDaliVisualAction(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Register an ImageVisual and and perform an Action on Visual directly" );
-  Vector2 controlSize( 20.f, 30.f );
+  tet_infoline("Register an ImageVisual and and perform an Action on Visual directly");
+  Vector2 controlSize(20.f, 30.f);
 
   //Created DummyVisual
-  Property::Map settings;
-  Toolkit::Internal::DummyVisualPtr dummyVisualPtr = Toolkit::Internal::DummyVisual::New( settings );
+  Property::Map                     settings;
+  Toolkit::Internal::DummyVisualPtr dummyVisualPtr = Toolkit::Internal::DummyVisual::New(settings);
 
-  DummyControl dummyControl = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
-  tet_infoline( "Register visual and stage control" );
+  tet_infoline("Register visual and stage control");
 
-  Toolkit::Visual::Base visualBaseHandle = Toolkit::Visual::Base( dummyVisualPtr.Get() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visualBaseHandle );
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  Toolkit::Visual::Base visualBaseHandle = Toolkit::Visual::Base(dummyVisualPtr.Get());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visualBaseHandle);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Check action counter is 0 before DoAction" );
-  DALI_TEST_EQUALS( dummyVisualPtr->GetActionCounter() , 0, TEST_LOCATION );
+  tet_infoline("Check action counter is 0 before DoAction");
+  DALI_TEST_EQUALS(dummyVisualPtr->GetActionCounter(), 0, TEST_LOCATION);
 
-  tet_infoline( "Perform TEST_ACTION action on Visual. Should increase the action counter" );
+  tet_infoline("Perform TEST_ACTION action on Visual. Should increase the action counter");
 
-  Property::Map attributes;
-  Toolkit::Internal::Visual::Base& internalVisualBase =  GetImplementation( visualBaseHandle );
-  internalVisualBase.DoAction( Dali::Toolkit::Internal::DummyVisual::TEST_ACTION, attributes );
+  Property::Map                    attributes;
+  Toolkit::Internal::Visual::Base& internalVisualBase = GetImplementation(visualBaseHandle);
+  internalVisualBase.DoAction(Dali::Toolkit::Internal::DummyVisual::TEST_ACTION, attributes);
   application.SendNotification();
-  DALI_TEST_EQUALS( dummyVisualPtr->GetActionCounter() , 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyVisualPtr->GetActionCounter(), 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -80,39 +83,39 @@ int UtcDaliVisualAction(void)
 int UtcDaliVisualActionNotImplemented(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Register an ImageVisual and and perform an Action on a Visual which does not support any Actions" );
-  Vector2 controlSize( 20.f, 30.f );
+  tet_infoline("Register an ImageVisual and and perform an Action on a Visual which does not support any Actions");
+  Vector2 controlSize(20.f, 30.f);
 
   //Created DummyVisual
-  Property::Map settings;
-  Toolkit::Internal::DummyVisualPtr dummyVisualPtr = Toolkit::Internal::DummyVisual::New( settings );
+  Property::Map                     settings;
+  Toolkit::Internal::DummyVisualPtr dummyVisualPtr = Toolkit::Internal::DummyVisual::New(settings);
 
-  DummyControl dummyControl = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
-  tet_infoline( "Register visual and stage control" );
+  tet_infoline("Register visual and stage control");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Check action counter is 0 before DoAction" );
-  DALI_TEST_EQUALS( dummyVisualPtr->GetActionCounter() , 0, TEST_LOCATION );
+  tet_infoline("Check action counter is 0 before DoAction");
+  DALI_TEST_EQUALS(dummyVisualPtr->GetActionCounter(), 0, TEST_LOCATION);
 
-  tet_infoline( "Perform TEST_ACTION action on Color Visual which does not support it.. Should not increment the action counter" );
+  tet_infoline("Perform TEST_ACTION action on Color Visual which does not support it.. Should not increment the action counter");
   Property::Map attributes;
-  GetImplementation( visual ).DoAction( Dali::Toolkit::Internal::DummyVisual::TEST_ACTION, attributes );
+  GetImplementation(visual).DoAction(Dali::Toolkit::Internal::DummyVisual::TEST_ACTION, attributes);
   application.SendNotification();
-  DALI_TEST_EQUALS( dummyVisualPtr->GetActionCounter() , 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyVisualPtr->GetActionCounter(), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -120,40 +123,40 @@ int UtcDaliVisualActionNotImplemented(void)
 int UtcDaliVisualSetProperties(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Register a visual and SetProperties" );
+  tet_infoline("Register a visual and SetProperties");
 
   Toolkit::Internal::VisualFactoryCache* factoryCache = new Toolkit::Internal::VisualFactoryCache(false);
 
   //Created ColorVisual
   Property::Map propertyMap1;
-  propertyMap1.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap1.Insert(ColorVisual::Property::MIX_COLOR,  Color::RED);
-  Toolkit::Internal::ColorVisualPtr colorVisualPtr = Toolkit::Internal::ColorVisual::New( *factoryCache, propertyMap1 );
+  propertyMap1.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap1.Insert(ColorVisual::Property::MIX_COLOR, Color::RED);
+  Toolkit::Internal::ColorVisualPtr colorVisualPtr = Toolkit::Internal::ColorVisual::New(*factoryCache, propertyMap1);
 
-  DummyControl dummyControl = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummyControl.GetImplementation() );
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
-  Toolkit::Visual::Base visualBaseHandle = Toolkit::Visual::Base( colorVisualPtr.Get() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visualBaseHandle );
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  Toolkit::Visual::Base visualBaseHandle = Toolkit::Visual::Base(colorVisualPtr.Get());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visualBaseHandle);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
   application.SendNotification();
   application.Render();
 
   Property::Map propertyMap;
-  propertyMap.Insert( Visual::Property::MIX_COLOR,  Color::BLUE );
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLUE);
 
-  colorVisualPtr->SetProperties( propertyMap );
+  colorVisualPtr->SetProperties(propertyMap);
   application.SendNotification();
   application.Render();
 
   Property::Map resultMap;
-  visualBaseHandle.CreatePropertyMap( resultMap );
+  visualBaseHandle.CreatePropertyMap(resultMap);
 
-  Property::Value* colorValue = resultMap.Find( Visual::Property::MIX_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_CHECK( colorValue->Get< Vector4 >() == Color::BLUE );
+  Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_CHECK(colorValue->Get<Vector4>() == Color::BLUE);
 
   delete factoryCache;
 
@@ -163,70 +166,111 @@ int UtcDaliVisualSetProperties(void)
 int UtcDaliAnimatedVectorImageVisualCreateInstancePropertyMap(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualCreateInstancePropertyMap" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualCreateInstancePropertyMap");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE,  DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
   // request AnimatedVectorImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation( visual );
+  VisualFactory                    factory    = VisualFactory::Get();
+  Visual::Base                     visual     = factory.CreateVisual(propertyMap);
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(visual);
 
   Property::Map resultMap;
-  visualImpl.CreateInstancePropertyMap( resultMap );
+  visualImpl.CreateInstancePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  DALI_TEST_CHECK( resultMap.Empty() );   // Now the map is empty
+  DALI_TEST_CHECK(resultMap.Empty()); // Now the map is empty
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualSetProperties(void)
+int UtcDaliAnimatedImageVisualCreateInstancePropertyMap(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualSetProperties" );
+  tet_infoline("UtcDaliAnimatedImageVisualCreateInstancePropertyMap");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, Vector2( 0.2f, 0.8f )  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+    .Add(ImageVisual::Property::DESIRED_WIDTH, 10)
+    .Add(ImageVisual::Property::DESIRED_HEIGHT, 12);
+
+  // request AnimatedVectorImageVisual with a property map
+  VisualFactory                    factory    = VisualFactory::Get();
+  Visual::Base                     visual     = factory.CreateVisual(propertyMap);
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(visual);
+
+  Property::Map resultMap;
+  visualImpl.CreateInstancePropertyMap(resultMap);
+
+  // check the property values from the returned map from a visual
+  DALI_TEST_EQUALS(resultMap.Count(), 3u, TEST_LOCATION);
+
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 10);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 12);
+
+  END_TEST;
+}
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation( visual );
-  DALI_TEST_CHECK( visual );
+int UtcDaliAnimatedVectorImageVisualSetProperties(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualSetProperties");
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, Vector2(0.2f, 0.8f))
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base                     visual     = VisualFactory::Get().CreateVisual(propertyMap);
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(visual);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
+  // Trigger count is 2 - load, resource ready
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   Property::Map propertyMap1;
-  propertyMap1.Add( DevelImageVisual::Property::LOOP_COUNT, 1  )
-              .Add( DevelImageVisual::Property::PLAY_RANGE, Vector2( 0.4f, 0.6f )  );
+  propertyMap1.Add(DevelImageVisual::Property::LOOP_COUNT, 1)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, Vector2(0.4f, 0.6f));
 
-  visualImpl.SetProperties( propertyMap1 );
+  visualImpl.SetProperties(propertyMap1);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -234,22 +278,65 @@ int UtcDaliAnimatedVectorImageVisualSetProperties(void)
 int UtcDaliArcVisualCreateInstancePropertyMap(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliArcVisualCreateInstancePropertyMap" );
+  tet_infoline("UtcDaliArcVisualCreateInstancePropertyMap");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ARC )
-             .Add( DevelArcVisual::Property::THICKNESS, 20.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ARC)
+    .Add(DevelArcVisual::Property::THICKNESS, 20.0f);
 
   // request ArcVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation( visual );
+  VisualFactory                    factory    = VisualFactory::Get();
+  Visual::Base                     visual     = factory.CreateVisual(propertyMap);
+  Toolkit::Internal::Visual::Base& visualImpl = GetImplementation(visual);
 
   Property::Map resultMap;
-  visualImpl.CreateInstancePropertyMap( resultMap );
+  visualImpl.CreateInstancePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  DALI_TEST_CHECK( resultMap.Empty() );   // Now the map is empty
+  DALI_TEST_CHECK(resultMap.Empty()); // Now the map is empty
+
+  END_TEST;
+}
+int UtcDaliVisualUpdateBrokenImageRenderer(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UpdateBrokenImageRenderer Test");
+
+  Toolkit::Internal::VisualFactoryCache* factoryCache = new Toolkit::Internal::VisualFactoryCache(false);
+
+  std::string defaultBrokenImageUrl = "not-9patch.png";
+
+  // Set default broken image
+  factoryCache->SetBrokenImageUrl(defaultBrokenImageUrl, std::vector<std::string>());
+
+  //Created dummy renderer
+  Geometry geometry = factoryCache->GetGeometry(Toolkit::Internal::VisualFactoryCache::QUAD_GEOMETRY);
+  Shader   shader   = Shader::New("foo", "bar");
+  Renderer renderer = Renderer::New(geometry, shader);
+
+  DALI_TEST_CHECK(renderer);
+
+  // renderer doesn't changed.
+  factoryCache->UpdateBrokenImageRenderer(renderer, Vector2::ZERO, true);
+  Shader testShader1 = renderer.GetShader();
+
+  // Get default image renderer.
+  factoryCache->UpdateBrokenImageRenderer(renderer, Vector2::ZERO, false);
+  Shader testShader2 = renderer.GetShader();
+
+  // Get default image renderer but nine patch.
+  // Note : This API behavior can be changed. (DALi don't consider about default BrokenImageUrl is failed.
+  defaultBrokenImageUrl = "yes-9patch.9.png";
+  factoryCache->SetBrokenImageUrl(defaultBrokenImageUrl, std::vector<std::string>());
+  factoryCache->UpdateBrokenImageRenderer(renderer, Vector2::ZERO, false);
+  Shader testShader3 = renderer.GetShader();
+
+  DALI_TEST_CHECK(testShader1 != factoryCache->GetShader(Toolkit::Internal::VisualFactoryCache::IMAGE_SHADER));
+  DALI_TEST_CHECK(testShader1 != factoryCache->GetShader(Toolkit::Internal::VisualFactoryCache::NINE_PATCH_SHADER));
+  DALI_TEST_CHECK(testShader2 == factoryCache->GetShader(Toolkit::Internal::VisualFactoryCache::IMAGE_SHADER));
+  DALI_TEST_CHECK(testShader3 == factoryCache->GetShader(Toolkit::Internal::VisualFactoryCache::NINE_PATCH_SHADER));
+
+  delete factoryCache;
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
index 4c211d1..dcce7cd 100644
--- a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
@@ -15,6 +15,7 @@ SET(TEST_HARNESS_SOURCES
    ../dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
+   ../dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-color-controller.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
@@ -31,7 +32,6 @@ SET(TEST_HARNESS_SOURCES
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-virtual-keyboard.cpp
diff --git a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
index 45e1c64..0d6c4ae 100644
--- a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
+++ b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,9 @@
 #include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
+// for Internal::StyleManager
+#include <dali-toolkit/internal/styling/style-manager-impl.h>
+
 using namespace Dali;
 using namespace Dali::Toolkit;
 
@@ -1354,3 +1357,62 @@ int UtcDaliStyleManagerConfigSectionTest(void)
 
   END_TEST;
 }
+
+
+int UtcDaliStyleManagerNewWithAdditionalBehavior(void)
+{
+  ToolkitTestApplication application;
+
+  Toolkit::StyleManager            styleManager     = StyleManager::Get();
+  Toolkit::Internal::StyleManager& styleManagerImpl = GetImpl(styleManager);
+
+  auto checkup = [&styleManagerImpl](int enableStyleChangeSignal, const Control& control){
+    DALI_TEST_EQUALS( enableStyleChangeSignal, styleManagerImpl.ControlStyleChangeSignal().GetConnectionCount(), TEST_LOCATION );
+  };
+
+  // Default New
+  // Note: TextField and TextEditor have TextSelectionPopup
+  tet_infoline( "Check whether ControlStyleChangeSignal connected in default New\n");
+  checkup(1, Control::New());
+  checkup(1, ImageView::New());
+  checkup(1, ImageView::New("url"));
+  checkup(1, ImageView::New("url", Dali::ImageDimensions(32u, 32u)));
+  checkup(1, TextLabel::New());
+  checkup(1, TextLabel::New("text"));
+  checkup(2, TextField::New());
+  checkup(2, TextEditor::New());
+
+  // New with additional behaviour, but enable style change signals
+  tet_infoline( "Check whether ControlStyleChangeSignal connected in non-disable style change signals\n");
+  checkup(1, Control::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT));
+  checkup(1, Control::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
+  checkup(1, Control::New(Toolkit::Control::ControlBehaviour::REQUIRES_KEYBOARD_NAVIGATION_SUPPORT));
+  checkup(1, ImageView::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT));
+  checkup(1, ImageView::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT, "url"));
+  checkup(1, ImageView::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT, "url", Dali::ImageDimensions(32u, 32u)));
+  checkup(1, ImageView::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
+  checkup(1, ImageView::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION, "url"));
+  checkup(1, ImageView::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION, "url", Dali::ImageDimensions(32u, 32u)));
+  checkup(1, TextLabel::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT));
+  checkup(1, TextLabel::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT, "text"));
+  checkup(1, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
+  checkup(1, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION, "text"));
+  checkup(2, TextField::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT));
+  checkup(2, TextField::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
+  checkup(2, TextEditor::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT));
+  checkup(2, TextEditor::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
+
+  // New with additional behaviour, so disable style change signals
+  tet_infoline( "Check whether ControlStyleChangeSignal did not connected\n");
+  checkup(0, Control::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
+  checkup(0, Control::New(Toolkit::Control::ControlBehaviour(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS | Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION)));
+  checkup(0, ImageView::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
+  checkup(0, ImageView::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, "url"));
+  checkup(0, ImageView::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, "url", Dali::ImageDimensions(32u, 32u)));
+  checkup(0, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
+  checkup(0, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, "text"));
+  checkup(1, TextField::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
+  checkup(1, TextEditor::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt
index e30acba..9633069 100644
--- a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt
@@ -13,8 +13,8 @@ SET(TC_SOURCES
 # List of test harness files (Won't get parsed for test cases)
 SET(TEST_HARNESS_SOURCES
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
+   ../dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
-   ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
    ../dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.cpp
@@ -57,7 +57,7 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
 )
 
 # Locate GTest
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
 FIND_PACKAGE(GTest REQUIRED)
 
 #ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )
@@ -73,6 +73,8 @@ FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
     SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
 ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 
+STRING(STRIP ${CMAKE_CXX_LINK_FLAGS} CMAKE_CXX_LINK_FLAGS)
+
 INCLUDE_DIRECTORIES(
     ../../../
     ../../../dali-toolkit/third-party
@@ -90,6 +92,7 @@ ADD_CUSTOM_COMMAND(
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
+    ${CMAKE_CXX_LINK_FLAGS}
     ${${CAPI_LIB}_LIBRARIES}
     -lpthread --coverage
     ${GTEST_LIBRARIES}
diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt
index 8990a0f..8d33504 100755
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@ -30,6 +30,7 @@ SET(TC_SOURCES
   utc-Dali-JsonParser.cpp
   utc-Dali-KeyInputFocusManager.cpp
   utc-Dali-PageTurnView.cpp
+  utc-Dali-ParticleSystem.cpp
   utc-Dali-Scene3dView.cpp
   utc-Dali-ScrollBar.cpp
   utc-Dali-ScrollView.cpp
@@ -39,8 +40,20 @@ SET(TC_SOURCES
   utc-Dali-SlideTransition.cpp
   utc-Dali-Slider.cpp
   utc-Dali-TableView.cpp
+  utc-Dali-Text-BaseSpan.cpp
+  utc-Dali-Text-ForegroundColorSpan.cpp
+  utc-Dali-Text-CharacterSpacingSpan.cpp
+  utc-Dali-Text-FontSpan.cpp
+  utc-Dali-Text-BoldSpan.cpp
+  utc-Dali-Text-ItalicSpan.cpp
+  utc-Dali-Text-BackgroundColorSpan.cpp
+  utc-Dali-Text-Range.cpp
+  utc-Dali-Text-SpannableString.cpp
+  utc-Dali-Text-UnderlineSpan.cpp
+  utc-Dali-Text-StrikethroughSpan.cpp
   utc-Dali-TextEditor.cpp
   utc-Dali-TextField.cpp
+  utc-Dali-TextGeometry.cpp
   utc-Dali-TextLabel.cpp
   utc-Dali-TextSelectionPopup.cpp
   utc-Dali-TextSelectionPopupMirroringLTR.cpp
@@ -66,6 +79,7 @@ SET(TC_SOURCES
   utc-Dali-ToggleButton.cpp
   utc-Dali-ScrollViewEffect.cpp
   utc-Dali-SuperBlurView.cpp
+  utc-Dali-SvgVisual.cpp
   utc-Dali-Toolkit.cpp
   utc-Dali-Model3dView.cpp
   utc-Dali-Visual.cpp
@@ -78,15 +92,18 @@ SET(TC_SOURCES
   utc-Dali-ControlWrapper.cpp
   utc-Dali-DragAndDropDetector.cpp
   utc-Dali-NPatchUtilities.cpp
+  utc-Dali-GlView.cpp
+  utc-Dali-GlViewDirectRendering.cpp
 )
 
 # List of test harness files (Won't get parsed for test cases)
 SET(TEST_HARNESS_SOURCES
   dali-toolkit-test-utils/toolkit-adaptor.cpp
   dali-toolkit-test-utils/toolkit-application.cpp
+  dali-toolkit-test-utils/toolkit-async-task-manager.cpp
   dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
   dali-toolkit-test-utils/toolkit-clipboard.cpp
-  dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
+  dali-toolkit-test-utils/toolkit-direct-rendering-egl.cpp
   dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
   dali-toolkit-test-utils/toolkit-environment-variable.cpp
   dali-toolkit-test-utils/toolkit-input-method-context.cpp
@@ -96,6 +113,7 @@ SET(TEST_HARNESS_SOURCES
   dali-toolkit-test-utils/toolkit-physical-keyboard.cpp
   dali-toolkit-test-utils/toolkit-style-monitor.cpp
   dali-toolkit-test-utils/toolkit-test-application.cpp
+  dali-toolkit-test-utils/toolkit-texture-upload-manager.cpp
   dali-toolkit-test-utils/toolkit-timer.cpp
   dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp
   dali-toolkit-test-utils/toolkit-tts-player.cpp
@@ -134,6 +152,7 @@ SET(TEST_HARNESS_SOURCES
   dali-toolkit-test-utils/test-render-controller.cpp
   dali-toolkit-test-utils/test-trace-call-stack.cpp
   dali-toolkit-test-utils/test-native-image.cpp
+  test-text-geometry-utils.cpp
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
@@ -167,7 +186,7 @@ ADD_CUSTOM_COMMAND(
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.h ${EXEC_NAME}.cpp ${TC_SOURCES} ${TEST_HARNESS_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
     ${${CAPI_LIB}_LIBRARIES}
-    -lpthread --coverage
+    -lpthread --coverage -ldl
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
index 523bd8c..299a0e1 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
@@ -78,6 +78,11 @@ std::ostream& operator<<(std::ostream& ostream, Degree angle)
   return ostream;
 }
 
+std::ostream& operator<<(std::ostream& ostream, BaseHandle handle)
+{
+  return ostream << static_cast<void*>(handle.GetObjectPtr());
+}
+
 void DALI_TEST_EQUALS(const BaseHandle& baseHandle1, const BaseHandle& baseHandle2, const char* location)
 {
   DALI_TEST_EQUALS<const BaseHandle&>(baseHandle1, baseHandle2, location);
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
index c6e63e7..a070298 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
@@ -99,6 +99,7 @@ bool          operator==(TimePeriod a, TimePeriod b);
 std::ostream& operator<<(std::ostream& ostream, TimePeriod value);
 std::ostream& operator<<(std::ostream& ostream, Radian angle);
 std::ostream& operator<<(std::ostream& ostream, Degree angle);
+std::ostream& operator<<(std::ostream& ostream, BaseHandle handle);
 
 /**
  * Test whether two values are equal.
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
index da96fac..96f0acd 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
@@ -31,6 +31,5 @@ std::ostream& operator<<( std::ostream& ostream, Dali::Toolkit::Visual::Resource
 #include "toolkit-test-application.h"
 #include "toolkit-application.h"
 #include "toolkit-input-method-context.h"
-#include "toolkit-clipboard-event-notifier.h"
 
 #endif // DALI_TOOLKIT_TEST_SUITE_UTILS_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index 7d0c661..56b3b5e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@ -268,8 +268,20 @@ void Impl::DummyControl::OnChildRemove(Actor& child) { childRemoveCalled = true;
 void Impl::DummyControl::OnSizeSet(const Vector3& targetSize) { Control::OnSizeSet( targetSize ); sizeSetCalled = true; }
 void Impl::DummyControl::OnSizeAnimation(Animation& animation, const Vector3& targetSize) { Control::OnSizeAnimation( animation, targetSize ); sizeAnimationCalled = true; }
 bool Impl::DummyControl::OnKeyEvent(const KeyEvent& event) { keyEventCalled = true; return false;}
-void Impl::DummyControl::OnKeyInputFocusGained() { keyInputFocusGained = true; }
-void Impl::DummyControl::OnKeyInputFocusLost() { keyInputFocusLost = true; }
+void Impl::DummyControl::OnKeyInputFocusGained()
+{
+  if(this->HasKeyInputFocus())
+  {
+    keyInputFocusGained = true;
+  }
+}
+void Impl::DummyControl::OnKeyInputFocusLost()
+{
+  if(!this->HasKeyInputFocus())
+  {
+    keyInputFocusLost = true;
+  }
+}
 
 void Impl::DummyControl::SetLayout( Property::Index visualIndex, Property::Map& map )
 {
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
index bf62bb8..d628f0d 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include <dali/public-api/dali-core.h>
 
 // INTERNAL INCLUDES
+#include <dali-test-suite-utils.h>
 #include "mesh-builder.h"
 
 namespace Dali
@@ -124,11 +125,43 @@ Texture CreateTexture(TextureType::Type type, Pixel::Format format, int width, i
 {
   Texture texture = Texture::New(type, format, width, height);
 
-  int       bufferSize = width * height * 2;
+  int       bufferSize = width * height * GetBytesPerPixel(format);
   uint8_t*  buffer     = reinterpret_cast<uint8_t*>(malloc(bufferSize));
   PixelData pixelData  = PixelData::New(buffer, bufferSize, width, height, format, PixelData::FREE);
   texture.Upload(pixelData, 0u, 0u, 0u, 0u, width, height);
   return texture;
 }
 
+TextureSet CreateTextureSet(Pixel::Format format, int width, int height)
+{
+  TextureSet textureSet = TextureSet::New();
+  textureSet.SetTexture(0u, CreateTexture(TextureType::TEXTURE_2D, format, width, height));
+  return textureSet;
+}
+
+void DirtyRectChecker(const std::vector<Rect<int>>& damagedRects, std::multiset<Rect<int>, RectSorter> expectedRectList, bool checkRectsExact, const char* testLocation)
+{
+  // Just check damagedRect contain all expectRectList.
+  DALI_TEST_GREATER(damagedRects.size() + 1u, expectedRectList.size(), testLocation);
+
+  for(auto& rect : damagedRects)
+  {
+    auto iter = expectedRectList.find(rect);
+    if(iter != expectedRectList.end())
+    {
+      expectedRectList.erase(iter);
+    }
+    else if(checkRectsExact)
+    {
+      std::ostringstream o;
+      o << rect << " exist in expectRectList" << std::endl;
+      fprintf(stderr, "Test failed in %s, checking %s", testLocation, o.str().c_str());
+      tet_result(TET_FAIL);
+    }
+  }
+
+  // Check all rects are matched
+  DALI_TEST_EQUALS(expectedRectList.empty(), true, testLocation);
+}
+
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h
index 0dbe07e..03a65c1 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_ACTOR_UTILS_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <dali/public-api/rendering/texture.h>
+#include <set> // For std::multiset
 #include <string>
 
 namespace Dali
@@ -60,7 +62,32 @@ Actor CreateRenderableActor(Texture texture, const std::string& vertexShader, co
  */
 Actor CreateRenderableActor2(TextureSet textures, const std::string& vertexShader, const std::string& fragmentShader);
 
-Texture CreateTexture(TextureType::Type type, Pixel::Format format, int width, int height);
+Texture    CreateTexture(TextureType::Type type, Pixel::Format format, int width, int height);
+TextureSet CreateTextureSet(Pixel::Format format, int width, int height);
+
+// Check dirtyRect is equal with expected multiset.
+// Note that the order of damagedRect is not important
+struct RectSorter
+{
+  bool operator()(const Rect<int>& lhs, const Rect<int>& rhs) const
+  {
+    if(lhs.x != rhs.x)
+    {
+      return lhs.x < rhs.x;
+    }
+    if(lhs.y != rhs.y)
+    {
+      return lhs.y < rhs.y;
+    }
+    if(lhs.width != rhs.width)
+    {
+      return lhs.width < rhs.width;
+    }
+    return lhs.height < rhs.height;
+  }
+};
+
+void DirtyRectChecker(const std::vector<Rect<int>>& damagedRects, std::multiset<Rect<int>, RectSorter> expectedRectList, bool checkRectsExact, const char* testLocation);
 
 } // namespace Dali
 
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
index 5e69c95..496fc3b 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 
 namespace Dali
 {
+const Rect<int> TestApplication::DEFAULT_SURFACE_RECT = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+
 bool TestApplication::mLoggingEnabled = true;
 
 TestApplication::TestApplication(uint32_t surfaceWidth,
@@ -80,8 +82,11 @@ void TestApplication::CreateScene()
   // Create render target for the scene
   Graphics::RenderTargetCreateInfo rtInfo{};
   rtInfo.SetExtent({mSurfaceWidth, mSurfaceHeight});
-  mRenderTarget = mGraphicsController.CreateRenderTarget(rtInfo, nullptr);
-  mScene.SetSurfaceRenderTarget(mRenderTarget.get());
+  rtInfo.SetSurface(&mSurfaceWidth); // Can point to anything, really.
+
+  mScene.SetSurfaceRenderTarget(rtInfo);
+
+  mScenes.push_back(mScene);
 }
 
 void TestApplication::InitializeCore()
@@ -96,15 +101,15 @@ TestApplication::~TestApplication()
   delete mCore;
 }
 
-void TestApplication::LogContext(bool start, const char* tag)
+void TestApplication::LogContext(bool start, const char* tag, const char* message)
 {
   if(start)
   {
-    fprintf(stderr, "INFO: Trace Start: %s\n", tag);
+    fprintf(stderr, "INFO: Trace Start: %s %s\n", tag, message ? message : "");
   }
   else
   {
-    fprintf(stderr, "INFO: Trace End: %s\n", tag);
+    fprintf(stderr, "INFO: Trace End: %s %s\n", tag, message ? message : "");
   }
 }
 
@@ -114,13 +119,16 @@ void TestApplication::LogMessage(Dali::Integration::Log::DebugPriority level, st
   {
     switch(level)
     {
-      case Dali::Integration::Log::DebugInfo:
+      case Dali::Integration::Log::DEBUG:
+        fprintf(stderr, "DEBUG: %s", message.c_str());
+        break;
+      case Dali::Integration::Log::INFO:
         fprintf(stderr, "INFO: %s", message.c_str());
         break;
-      case Dali::Integration::Log::DebugWarning:
+      case Dali::Integration::Log::WARNING:
         fprintf(stderr, "WARN: %s", message.c_str());
         break;
-      case Dali::Integration::Log::DebugError:
+      case Dali::Integration::Log::ERROR:
         fprintf(stderr, "ERROR: %s", message.c_str());
         break;
       default:
@@ -155,11 +163,6 @@ TestGlAbstraction& TestApplication::GetGlAbstraction()
   return static_cast<TestGlAbstraction&>(mGraphicsController.GetGlAbstraction());
 }
 
-TestGlContextHelperAbstraction& TestApplication::GetGlContextHelperAbstraction()
-{
-  return static_cast<TestGlContextHelperAbstraction&>(mGraphicsController.GetGlContextHelperAbstraction());
-}
-
 TestGraphicsSyncImplementation& TestApplication::GetGraphicsSyncImpl()
 {
   return static_cast<TestGraphicsSyncImplementation&>(mGraphicsController.GetGraphicsSyncImpl());
@@ -176,7 +179,7 @@ void TestApplication::SendNotification()
   mCore->ProcessEvents();
 }
 
-void TestApplication::DoUpdate(uint32_t intervalMilliseconds, const char* location)
+void TestApplication::DoUpdate(uint32_t intervalMilliseconds, const char* location, bool uploadOnly)
 {
   if(GetUpdateStatus() == 0 &&
      mRenderStatus.NeedsUpdate() == false &&
@@ -188,25 +191,31 @@ void TestApplication::DoUpdate(uint32_t intervalMilliseconds, const char* locati
   uint32_t nextVSyncTime  = mLastVSyncTime + intervalMilliseconds;
   float    elapsedSeconds = static_cast<float>(intervalMilliseconds) * 0.001f;
 
-  mCore->Update(elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus, false, false);
+  mCore->Update(elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus, false, false, uploadOnly);
 
   GetRenderController().Initialize();
 
   mLastVSyncTime = nextVSyncTime;
 }
 
-bool TestApplication::Render(uint32_t intervalMilliseconds, const char* location)
+bool TestApplication::Render(uint32_t intervalMilliseconds, const char* location, bool uploadOnly)
 {
-  DoUpdate(intervalMilliseconds, location);
+  DoUpdate(intervalMilliseconds, location, uploadOnly);
 
   // Reset the status
   mRenderStatus.SetNeedsUpdate(false);
   mRenderStatus.SetNeedsPostRender(false);
 
-  mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/);
-  mCore->RenderScene(mRenderStatus, mScene, true /*render the off-screen buffers*/);
-  mCore->RenderScene(mRenderStatus, mScene, false /*render the surface*/);
-  mCore->PostRender(false /*do not skip rendering*/);
+  mCore->PreRender(mRenderStatus, false /*do not force clear*/);
+  if(!uploadOnly)
+  {
+    for(auto&& scene : mScenes)
+    {
+      mCore->RenderScene(mRenderStatus, scene, true /*render the off-screen buffers*/);
+      mCore->RenderScene(mRenderStatus, scene, false /*render the surface*/);
+    }
+  }
+  mCore->PostRender();
 
   mFrame++;
 
@@ -217,7 +226,7 @@ bool TestApplication::PreRenderWithPartialUpdate(uint32_t intervalMilliseconds,
 {
   DoUpdate(intervalMilliseconds, location);
 
-  mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/);
+  mCore->PreRender(mRenderStatus, false /*do not force clear*/);
   mCore->PreRender(mScene, damagedRects);
 
   return mStatus.KeepUpdating() || mRenderStatus.NeedsUpdate();
@@ -225,9 +234,39 @@ bool TestApplication::PreRenderWithPartialUpdate(uint32_t intervalMilliseconds,
 
 bool TestApplication::RenderWithPartialUpdate(std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect)
 {
-  mCore->RenderScene(mRenderStatus, mScene, true /*render the off-screen buffers*/, clippingRect);
+  mCore->RenderScene(mRenderStatus, mScene, true /*render the off-screen buffers*/);
   mCore->RenderScene(mRenderStatus, mScene, false /*render the surface*/, clippingRect);
-  mCore->PostRender(false /*do not skip rendering*/);
+  mCore->PostRender();
+
+  mFrame++;
+
+  return mStatus.KeepUpdating() || mRenderStatus.NeedsUpdate();
+}
+
+bool TestApplication::RenderWithPartialUpdate(uint32_t intervalMilliseconds, const char* location)
+{
+  DoUpdate(intervalMilliseconds, location);
+
+  // Reset the status
+  mRenderStatus.SetNeedsUpdate(false);
+  mRenderStatus.SetNeedsPostRender(false);
+
+  mCore->PreRender(mRenderStatus, false /*do not force clear*/);
+
+  for(auto&& scene : mScenes)
+  {
+    std::vector<Rect<int>> damagedRects;
+    Rect<int>              clippingRect{};
+
+    mCore->PreRender(scene, damagedRects);
+    mCore->RenderScene(mRenderStatus, scene, true /*render the off-screen buffers*/);
+    for(auto&& iter : damagedRects)
+    {
+      clippingRect.Merge(iter);
+    }
+    mCore->RenderScene(mRenderStatus, scene, false /*render the surface*/, clippingRect);
+  }
+  mCore->PostRender();
 
   mFrame++;
 
@@ -258,10 +297,10 @@ bool TestApplication::GetRenderNeedsPostRender()
 bool TestApplication::RenderOnly()
 {
   // Update Time values
-  mCore->PreRender(mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/);
+  mCore->PreRender(mRenderStatus, false /*do not force clear*/);
   mCore->RenderScene(mRenderStatus, mScene, true /*render the off-screen buffers*/);
   mCore->RenderScene(mRenderStatus, mScene, false /*render the surface*/);
-  mCore->PostRender(false /*do not skip rendering*/);
+  mCore->PostRender();
 
   mFrame++;
 
@@ -288,4 +327,14 @@ uint32_t TestApplication::Wait(uint32_t durationToWait)
   return time;
 }
 
+void TestApplication::AddScene(Integration::Scene scene)
+{
+  mScenes.push_back(scene);
+}
+
+void TestApplication::RemoveScene(Integration::Scene scene)
+{
+  mScenes.erase(std::remove(mScenes.begin(), mScenes.end(), scene), mScenes.end());
+}
+
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
index 4f32cd8..555822d 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_APPLICATION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,8 @@ public:
   static const uint32_t DEFAULT_SURFACE_WIDTH  = 480;
   static const uint32_t DEFAULT_SURFACE_HEIGHT = 800;
 
+  static const Rect<int> DEFAULT_SURFACE_RECT;
+
   static constexpr uint32_t DEFAULT_HORIZONTAL_DPI = 220;
   static constexpr uint32_t DEFAULT_VERTICAL_DPI   = 217;
 
@@ -58,21 +60,21 @@ public:
   void InitializeCore();
   ~TestApplication() override;
   static void              LogMessage(Dali::Integration::Log::DebugPriority level, std::string& message);
-  static void              LogContext(bool start, const char* tag);
+  static void              LogContext(bool start, const char* tag, const char* message);
   Dali::Integration::Core& GetCore();
   TestPlatformAbstraction& GetPlatform();
   TestRenderController&    GetRenderController();
   TestGraphicsController&  GetGraphicsController();
 
   TestGlAbstraction&              GetGlAbstraction();
-  TestGlContextHelperAbstraction& GetGlContextHelperAbstraction();
   TestGraphicsSyncImplementation& GetGraphicsSyncImpl();
 
   void        ProcessEvent(const Integration::Event& event);
   void        SendNotification();
-  bool        Render(uint32_t intervalMilliseconds = DEFAULT_RENDER_INTERVAL, const char* location = NULL);
+  bool        Render(uint32_t intervalMilliseconds = DEFAULT_RENDER_INTERVAL, const char* location = NULL, bool uploadOnly = false);
   bool        PreRenderWithPartialUpdate(uint32_t intervalMilliseconds, const char* location, std::vector<Rect<int>>& damagedRects);
   bool        RenderWithPartialUpdate(std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect);
+  bool        RenderWithPartialUpdate(uint32_t intervalMilliseconds, const char* location = NULL);
   uint32_t    GetUpdateStatus();
   bool        UpdateOnly(uint32_t intervalMilliseconds = DEFAULT_RENDER_INTERVAL);
   bool        RenderOnly();
@@ -90,8 +92,11 @@ public:
     return mScene;
   }
 
+  void AddScene(Integration::Scene scene);
+  void RemoveScene(Integration::Scene scene);
+
 private:
-  void DoUpdate(uint32_t intervalMilliseconds, const char* location = NULL);
+  void DoUpdate(uint32_t intervalMilliseconds, const char* location = NULL, bool uploadOnly = false);
 
 protected:
   TestPlatformAbstraction mPlatformAbstraction;
@@ -101,8 +106,9 @@ protected:
   Integration::UpdateStatus mStatus;
   Integration::RenderStatus mRenderStatus;
 
-  Integration::Core*       mCore;
-  Dali::Integration::Scene mScene;
+  Integration::Core*              mCore;
+  Dali::Integration::Scene        mScene;
+  std::vector<Integration::Scene> mScenes;
 
   uint32_t mSurfaceWidth;
   uint32_t mSurfaceHeight;
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h
index d917107..a31f162 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_COMPARE_TYPES_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ inline bool CompareType(Type value1, Type value2, float epsilon)
 }
 
 /**
- * A helper for fuzzy-comparing Vector2 objects
- * @param[in] vector1 the first object
- * @param[in] vector2 the second object
+ * A helper for matching floats
+ * @param[in] value1 the first object
+ * @param[in] value2 the second object
  * @param[in] epsilon difference threshold
  * @returns true if difference is smaller than epsilon threshold, false otherwise
  */
@@ -40,6 +40,19 @@ inline bool CompareType<float>(float value1, float value2, float epsilon)
 }
 
 /**
+ * A helper for matching doubles
+ * @param[in] value1 the first object
+ * @param[in] value2 the second object
+ * @param[in] epsilon difference threshold
+ * @returns true if difference is smaller than epsilon threshold, false otherwise
+ */
+template<>
+inline bool CompareType<double>(double value1, double value2, float epsilon)
+{
+  return fabs(value1 - value2) < double(epsilon);
+}
+
+/**
  * A helper for fuzzy-comparing Vector2 objects
  * @param[in] vector1 the first object
  * @param[in] vector2 the second object
@@ -111,109 +124,4 @@ inline bool CompareType<Extents>(Extents extents1, Extents extents2, float epsil
          (extents1.bottom == extents2.bottom);
 }
 
-template<>
-inline bool CompareType<Property::Value>(Property::Value q1, Property::Value q2, float epsilon)
-{
-  Property::Type type = q1.GetType();
-  if(type != q2.GetType())
-  {
-    return false;
-  }
-
-  bool result = false;
-  switch(type)
-  {
-    case Property::BOOLEAN:
-    {
-      bool a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = a == b;
-      break;
-    }
-    case Property::INTEGER:
-    {
-      int a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = a == b;
-      break;
-    }
-    case Property::FLOAT:
-    {
-      float a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = CompareType<float>(a, b, epsilon);
-      break;
-    }
-    case Property::VECTOR2:
-    {
-      Vector2 a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = CompareType<Vector2>(a, b, epsilon);
-      break;
-    }
-    case Property::VECTOR3:
-    {
-      Vector3 a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = CompareType<Vector3>(a, b, epsilon);
-      break;
-    }
-    case Property::RECTANGLE:
-    case Property::VECTOR4:
-    {
-      Vector4 a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = CompareType<Vector4>(a, b, epsilon);
-      break;
-    }
-    case Property::ROTATION:
-    {
-      Quaternion a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = CompareType<Quaternion>(a, b, epsilon);
-      break;
-    }
-    case Property::STRING:
-    {
-      std::string a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = (a.compare(b) == 0);
-      break;
-    }
-    case Property::MATRIX:
-    case Property::MATRIX3:
-    case Property::ARRAY:
-    case Property::MAP:
-    {
-      //TODO: Implement this?
-      DALI_ASSERT_ALWAYS(0 && "Not implemented");
-      result = false;
-      break;
-    }
-    case Property::EXTENTS:
-    {
-      Extents a, b;
-      q1.Get(a);
-      q2.Get(b);
-      result = CompareType<Extents>(a, b, epsilon);
-      break;
-    }
-    case Property::NONE:
-    {
-      result = false;
-      break;
-    }
-  }
-
-  return result;
-}
-
 #endif
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.cpp
index e693098..600a866 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,21 +21,22 @@
 
 namespace Dali
 {
-EncodedImageBuffer ConvertFileToEncodedImageBuffer(const char* url)
+EncodedImageBuffer ConvertFileToEncodedImageBuffer(const char* url, EncodedImageBuffer::ImageType imageType)
 {
   EncodedImageBuffer buffer;
-  FILE *fp;
+  FILE*              fp;
   fp = fopen(url, "rb");
   if(fp != NULL)
   {
     fseek(fp, 0, SEEK_END);
-    size_t size = ftell(fp);
+    size_t                size = ftell(fp);
     Dali::Vector<uint8_t> data;
     data.Resize(size);
     fseek(fp, 0, SEEK_SET);
-    fread(data.Begin(), size, sizeof(uint8_t), fp);
+    size_t realSize = fread(data.Begin(), sizeof(uint8_t), size, fp);
     fclose(fp);
-    buffer = EncodedImageBuffer::New(data);
+    data.Resize(realSize);
+    buffer = EncodedImageBuffer::New(data, imageType);
   }
   return buffer;
 }
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.h
index 96fbe46..3b6e28b 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-encoded-image-buffer.h
@@ -2,7 +2,7 @@
 #define TEST_ENCODED_IMAGE_BUFFER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,8 @@
 
 namespace Dali
 {
-
 // util function to convert local file to EncodedImageBuffer
-EncodedImageBuffer ConvertFileToEncodedImageBuffer(const char* url);
+EncodedImageBuffer ConvertFileToEncodedImageBuffer(const char* url, EncodedImageBuffer::ImageType imageType = EncodedImageBuffer::ImageType::DEFAULT);
 
 } // namespace Dali
 
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
index b85cf4d..fc1eb65 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,34 @@
 #include "test-gl-abstraction.h"
 #include "test-trace-call-stack.h"
 
-static const bool TRACE{
-  false};
+static const bool TRACE{false};
+
+uint32_t GetGLDataTypeSize(GLenum type)
+{
+  // There are many more types than what are covered here, but
+  // they are not supported in dali.
+  switch(type)
+  {
+    case GL_FLOAT: // "float", 1 float, 4 bytes
+      return 4;
+    case GL_FLOAT_VEC2: // "vec2", 2 floats, 8 bytes
+      return 8;
+    case GL_FLOAT_VEC3: // "vec3", 3 floats, 12 bytes
+      return 12;
+    case GL_FLOAT_VEC4: // "vec4", 4 floats, 16 bytes
+      return 16;
+    case GL_INT: // "int", 1 integer, 4 bytes
+      return 4;
+    case GL_FLOAT_MAT2: // "mat2", 4 floats, 16 bytes
+      return 16;
+    case GL_FLOAT_MAT3: // "mat3", 3 vec3, 36 bytes
+      return 36;
+    case GL_FLOAT_MAT4: // "mat4", 4 vec4, 64 bytes
+      return 64;
+    default:
+      return 0;
+  }
+}
 
 namespace Dali
 {
@@ -46,28 +72,32 @@ TestGlAbstraction::~TestGlAbstraction()
 
 void TestGlAbstraction::Initialize()
 {
-  mCurrentProgram                  = 0;
-  mCompileStatus                   = GL_TRUE;
-  mLinkStatus                      = GL_TRUE;
-  mGetErrorResult                  = 0;
-  mGetStringResult                 = NULL;
-  mIsBufferResult                  = 0;
-  mIsEnabledResult                 = 0;
-  mIsFramebufferResult             = 0;
-  mIsProgramResult                 = 0;
-  mIsRenderbufferResult            = 0;
-  mIsShaderResult                  = 0;
-  mIsTextureResult                 = 0;
-  mActiveTextureUnit               = 0;
-  mCheckFramebufferStatusResult    = 0;
-  mFramebufferStatus               = 0;
-  mFramebufferDepthAttached        = 0;
-  mFramebufferStencilAttached      = 0;
-  mFramebufferColorAttachmentCount = 0;
-  mFrameBufferColorStatus          = 0;
-  mNumBinaryFormats                = 0;
-  mBinaryFormats                   = 0;
-  mProgramBinaryLength             = 0;
+  mCurrentProgram                         = 0;
+  mCompileStatus                          = GL_TRUE;
+  mLinkStatus                             = GL_TRUE;
+  mGetErrorResult                         = 0;
+  mGetStringResult                        = NULL;
+  mIsBufferResult                         = 0;
+  mIsEnabledResult                        = 0;
+  mIsFramebufferResult                    = 0;
+  mIsProgramResult                        = 0;
+  mIsRenderbufferResult                   = 0;
+  mIsShaderResult                         = 0;
+  mIsTextureResult                        = 0;
+  mActiveTextureUnit                      = 0;
+  mCheckFramebufferStatusResult           = 0;
+  mFramebufferStatus                      = 0;
+  mFramebufferDepthAttached               = 0;
+  mFramebufferStencilAttached             = 0;
+  mFramebufferDepthStencilAttached        = 0;
+  mFramebufferColorAttachmentCount        = 0;
+  mFrameBufferColorStatus                 = 0;
+  mFramebufferDepthAttachmentCount        = 0;
+  mFramebufferStencilAttachmentCount      = 0;
+  mFramebufferDepthStencilAttachmentCount = 0;
+  mNumBinaryFormats                       = 0;
+  mBinaryFormats                          = 0;
+  mProgramBinaryLength                    = 0;
 
   mVertexAttribArrayChanged = false;
   mGetProgramBinaryCalled   = false;
@@ -97,9 +127,9 @@ void TestGlAbstraction::Initialize()
   mProgramUniforms3f.clear();
   mProgramUniforms4f.clear();
 
-  mAttribLocs.clear();
-  mAttribLocs.push_back("aPosition");
-  mAttribLocs.push_back("aTexCoord");
+  mAttribLocs  = {"aPosition", "aTexCoord"};
+  mAttribTypes = {GL_FLOAT, GL_FLOAT};
+
   mCullFaceTrace.Reset();
   mDepthFunctionTrace.Reset();
   mEnableDisableTrace.Reset();
@@ -130,15 +160,25 @@ void TestGlAbstraction::Initialize()
     {"sTextureRect", GL_SAMPLER_2D, 1},
     {"sGloss", GL_SAMPLER_2D, 1},
     {"uColor", GL_FLOAT_VEC4, 1},
+    {"uActorColor", GL_FLOAT_VEC4, 1},
     {"uModelMatrix", GL_FLOAT_MAT4, 1},
     {"uModelView", GL_FLOAT_MAT4, 1},
     {"uMvpMatrix", GL_FLOAT_MAT4, 1},
     {"uNormalMatrix", GL_FLOAT_MAT4, 1},
     {"uProjection", GL_FLOAT_MAT4, 1},
+    {"uScale", GL_FLOAT_VEC3, 1},
     {"uSize", GL_FLOAT_VEC3, 1},
     {"uViewMatrix", GL_FLOAT_MAT4, 1},
     {"uLightCameraProjectionMatrix", GL_FLOAT_MAT4, 1},
     {"uLightCameraViewMatrix", GL_FLOAT_MAT4, 1}};
+
+  int offset = 0;
+  for(uint32_t i = 0; i < mActiveUniforms.size(); ++i)
+  {
+    mActiveUniforms[i].offset = offset;
+    offset += mActiveUniforms[i].size * GetGLDataTypeSize(mActiveUniforms[i].type);
+  }
+  // WARNING: IF YOU CHANGE THIS LIST, ALSO CHANGE UNIFORMS IN test-graphics-reflection.cpp
 }
 
 void TestGlAbstraction::PreRender()
@@ -159,11 +199,21 @@ bool TestGlAbstraction::IsAdvancedBlendEquationSupported()
   return true;
 }
 
+bool TestGlAbstraction::IsMultisampledRenderToTextureSupported()
+{
+  return true;
+}
+
 bool TestGlAbstraction::IsBlendEquationSupported(DevelBlendEquation::Type blendEquation)
 {
   return true;
 }
 
+uint32_t TestGlAbstraction::GetShaderLanguageVersion()
+{
+  return mShaderLanguageVersion;
+}
+
 std::string TestGlAbstraction::GetShaderVersionPrefix()
 {
   return std::string("");
@@ -184,6 +234,17 @@ bool TestGlAbstraction::TextureRequiresConverting(const GLenum imageGlFormat, co
   return ((imageGlFormat == GL_RGB) && (textureGlFormat == GL_RGBA));
 }
 
+void TestGlAbstraction::SetActiveUniforms(const std::vector<ActiveUniform>& uniforms)
+{
+  mActiveUniforms = uniforms;
+  int offset      = 0;
+  for(uint32_t i = 0; i < uniforms.size(); ++i)
+  {
+    mActiveUniforms[i].offset = offset;
+    offset += mActiveUniforms[i].size * GetGLDataTypeSize(mActiveUniforms[i].type);
+  }
+}
+
 } // namespace Dali
 
 bool BlendEnabled(const Dali::TraceCallStack& callStack)
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
index aec9f5d..a70c21f 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
@@ -2,7 +2,7 @@
 #define TEST_GL_ABSTRACTION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,9 +51,10 @@ struct UniformData
 
 struct ActiveUniform
 {
-  std::string name;
-  GLenum      type;
-  GLint       size;
+  std::string name{};
+  GLenum      type{GL_FLOAT};
+  GLint       size{0};
+  GLint       offset{0};
 };
 
 class DALI_CORE_API TestGlAbstraction : public Dali::Integration::GlAbstraction
@@ -72,8 +73,12 @@ public:
 
   bool IsAdvancedBlendEquationSupported() override;
 
+  bool IsMultisampledRenderToTextureSupported() override;
+
   bool IsBlendEquationSupported(DevelBlendEquation::Type blendEquation) override;
 
+  uint32_t GetShaderLanguageVersion();
+
   std::string GetShaderVersionPrefix();
 
   std::string GetVertexShaderPrefix();
@@ -299,6 +304,21 @@ public:
     return mFramebufferColorAttachmentCount;
   }
 
+  inline GLuint CheckFramebufferDepthAttachmentCount()
+  {
+    return mFramebufferDepthAttachmentCount;
+  }
+
+  inline GLuint CheckFramebufferStencilAttachmentCount()
+  {
+    return mFramebufferStencilAttachmentCount;
+  }
+
+  inline GLuint CheckFramebufferDepthStencilAttachmentCount()
+  {
+    return mFramebufferDepthStencilAttachmentCount;
+  }
+
   inline GLenum CheckFramebufferDepthAttachment()
   {
     return mFramebufferDepthAttached;
@@ -309,6 +329,11 @@ public:
     return mFramebufferStencilAttached;
   }
 
+  inline GLenum CheckFramebufferDepthStencilAttachment()
+  {
+    return mFramebufferDepthStencilAttached;
+  }
+
   inline void Clear(GLbitfield mask) override
   {
     mClearCount++;
@@ -435,6 +460,10 @@ public:
 
   inline void DeleteBuffers(GLsizei n, const GLuint* buffers) override
   {
+    TraceCallStack::NamedParams namedParams;
+    namedParams["n"] << n;
+    namedParams["id"] << buffers[0];
+    mBufferTrace.PushCall("DeleteBuffers", namedParams.str(), namedParams);
   }
 
   inline void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) override
@@ -630,8 +659,9 @@ public:
     }
     else if(attachment == GL_DEPTH_STENCIL_ATTACHMENT)
     {
-      mFramebufferStencilAttached = true;
-      mFramebufferDepthAttached   = true;
+      mFramebufferStencilAttached      = true;
+      mFramebufferDepthAttached        = true;
+      mFramebufferDepthStencilAttached = true;
     }
   }
 
@@ -650,6 +680,20 @@ public:
         ++mFramebufferColorAttachmentCount;
       }
     }
+    else if(attachment == GL_DEPTH_ATTACHMENT)
+    {
+      ++mFramebufferDepthAttachmentCount;
+    }
+    else if(attachment == GL_STENCIL_ATTACHMENT)
+    {
+      ++mFramebufferStencilAttachmentCount;
+    }
+    else if(attachment == GL_DEPTH_STENCIL_ATTACHMENT)
+    {
+      ++mFramebufferDepthAttachmentCount;
+      ++mFramebufferStencilAttachmentCount;
+      ++mFramebufferDepthStencilAttachmentCount;
+    }
   }
 
   inline void FrontFace(GLenum mode) override
@@ -660,13 +704,21 @@ public:
   inline void GenBuffers(GLsizei n, GLuint* buffers) override
   {
     // avoids an assert in GpuBuffers
-    *buffers = 1u;
+    static GLuint id = 1;
 
-    std::ostringstream o;
-    o << n;
     TraceCallStack::NamedParams namedParams;
-    namedParams["n"] << o.str();
-    mBufferTrace.PushCall("GenBuffers", o.str(), namedParams);
+    namedParams["n"] << n;
+
+    // Allocate some buffer names
+    bool first = true;
+    while(n)
+    {
+      namedParams["buffers"] << (first ? "" : ", ") << id;
+      first      = false;
+      *buffers++ = id++;
+      --n;
+    }
+    mBufferTrace.PushCall("GenBuffers", namedParams.str(), namedParams);
   }
 
   inline void GenerateMipmap(GLenum target) override
@@ -759,12 +811,11 @@ public:
 
   inline void GetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) override
   {
+    strncpy(name, mAttribLocs[index].c_str(), 99);
+    *type = mAttribTypes[index];
   }
 
-  inline void SetActiveUniforms(const std::vector<ActiveUniform>& uniforms)
-  {
-    mActiveUniforms = uniforms;
-  }
+  void SetActiveUniforms(const std::vector<ActiveUniform>& uniforms);
 
   inline void GetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) override
   {
@@ -826,6 +877,9 @@ public:
       case GL_PROGRAM_BINARY_FORMATS_OES:
         *params = mBinaryFormats;
         break;
+      case GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT:
+        *params = mUniformBufferOffsetAlignment;
+        break;
     }
   }
 
@@ -848,6 +902,9 @@ public:
       case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
         *params = 100;
         break;
+      case GL_ACTIVE_ATTRIBUTES:
+        *params = static_cast<GLint>(mAttribLocs.size());
+        break;
     }
   }
 
@@ -913,8 +970,8 @@ public:
     if(it2 == uniformIDs.end())
     {
       // Uniform not found, so add it...
-      uniformIDs[name] = mLastUniformIdUsed++;
-      return mLastUniformIdUsed;
+      uniformIDs[name] = ++mLastUniformIdUsed;
+      return uniformIDs[name];
     }
 
     return it2->second;
@@ -986,12 +1043,60 @@ public:
 
     for(const auto& uniform : mActiveUniforms)
     {
-      GetUniformLocation(program, uniform.name.c_str());
+      std::string name = uniform.name;
+      if(uniform.size <= 1)
+      {
+        GetUniformLocation(program, name.c_str());
+      }
+      else
+      {
+        // Convert single active uniform from "uBlah[0]" or "uStruct[0].element" to N versions of the same
+        std::string suffix;
+        auto        iter = name.find("["); // Search for index operator
+        if(iter != std::string::npos)
+        {
+          name = uniform.name.substr(0, iter); // Strip off index operator
+          iter = uniform.name.find("]");
+          if(iter != std::string::npos && iter + 1 != uniform.name.length())
+          {
+            suffix = uniform.name.substr(iter + 1);
+          }
+        }
+        for(int i = 0; i < uniform.size; ++i)
+        {
+          std::stringstream nss;
+          nss << name << "[" << i << "]" << suffix;
+          GetUniformLocation(program, nss.str().c_str()); // Generate N uniforms in the uniform map
+        }
+      }
     }
 
     for(const auto& uniform : mCustomUniformData)
     {
-      GetUniformLocation(program, uniform.name.c_str());
+      auto iter = uniform.name.find("[");
+      auto name = uniform.name;
+      if(iter != std::string::npos)
+      {
+        name            = uniform.name.substr(0, iter);
+        auto arrayCount = std::stoi(uniform.name.substr(iter + 1));
+        iter            = uniform.name.find("]");
+        std::string suffix;
+        if(iter != std::string::npos && iter + 1 != uniform.name.length())
+        {
+          suffix = uniform.name.substr(iter + 1); // If there is a suffix, it means its an element of an array of struct
+        }
+
+        for(int i = 0; i < arrayCount; ++i)
+        {
+          std::stringstream nss;
+          nss << name << "[" << i << "]" << suffix;
+          GetUniformLocation(program, nss.str().c_str()); // Generate a GL loc per element
+        }
+      }
+      else
+      {
+        GetUniformLocation(program, name.c_str());
+      }
     }
   }
 
@@ -1527,6 +1632,18 @@ public:
     mBufferTrace.PushCall("VertexAttribPointer", namedParams.str(), namedParams);
   }
 
+  inline void VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer) override
+  {
+    TraceCallStack::NamedParams namedParams;
+    namedParams["index"] << index;
+    namedParams["size"] << size;
+    namedParams["type"] << std::hex << type;
+    namedParams["stride"] << stride;
+    namedParams["offset"] << std::to_string(reinterpret_cast<unsigned long>(pointer));
+
+    mBufferTrace.PushCall("VertexAttribIPointer", namedParams.str(), namedParams);
+  }
+
   inline void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) override
   {
     std::string commaString(", ");
@@ -1644,6 +1761,12 @@ public:
   {
   }
 
+  inline void FramebufferTexture2DMultisample(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples) override
+  {
+    // TODO : Check it if need
+    FramebufferTexture2D(target, attachment, textarget, texture, level);
+  }
+
   inline void FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) override
   {
   }
@@ -1703,10 +1826,6 @@ public:
   {
   }
 
-  inline void VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer) override
-  {
-  }
-
   inline void GetVertexAttribIiv(GLuint index, GLenum pname, GLint* params) override
   {
   }
@@ -1803,6 +1922,44 @@ public:
 
   inline void GetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params) override
   {
+    for(int i = 0; i < uniformCount; ++i)
+    {
+      if(i < int(mActiveUniforms.size()))
+      {
+        switch(pname)
+        {
+          case GL_UNIFORM_TYPE:
+          {
+            params[i] = mActiveUniforms[i].type;
+            break;
+          }
+          case GL_UNIFORM_SIZE:
+          {
+            params[i] = mActiveUniforms[i].size;
+            break;
+          }
+          case GL_UNIFORM_NAME_LENGTH:
+          {
+            params[i] = mActiveUniforms[i].name.length();
+            break;
+          }
+          case GL_UNIFORM_BLOCK_INDEX:
+          {
+            params[i] = -1;
+            break;
+          }
+          case GL_UNIFORM_OFFSET:
+          {
+            params[i] = mActiveUniforms[i].offset;
+            break;
+          }
+          case GL_UNIFORM_MATRIX_STRIDE:
+          {
+            break;
+          }
+        }
+      }
+    }
   }
 
   inline GLuint GetUniformBlockIndex(GLuint program, const GLchar* uniformBlockName) override
@@ -1824,10 +1981,26 @@ public:
 
   inline void DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount) override
   {
+    std::stringstream out;
+    out << mode << ", " << first << ", " << count << ", " << instanceCount;
+    TraceCallStack::NamedParams namedParams;
+    namedParams["mode"] << std::hex << mode;
+    namedParams["first"] << first;
+    namedParams["count"] << count;
+    namedParams["instanceCount"] << instanceCount;
+    mDrawTrace.PushCall("DrawArraysInstanced", out.str(), namedParams);
   }
 
   inline void DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount) override
   {
+    std::stringstream out;
+    out << mode << ", " << count << ", " << type << ", " << instanceCount;
+    TraceCallStack::NamedParams namedParams;
+    namedParams["mode"] << std::hex << mode;
+    namedParams["count"] << count;
+    namedParams["type"] << std::hex << type;
+    namedParams["indexCount"] << instanceCount;
+    mDrawTrace.PushCall("DrawElementsInstanced", out.str(), namedParams);
   }
 
   inline GLsync FenceSync(GLenum condition, GLbitfield flags) override
@@ -1912,6 +2085,12 @@ public:
 
   inline void VertexAttribDivisor(GLuint index, GLuint divisor) override
   {
+    std::stringstream out;
+    out << index << ", " << divisor;
+    TraceCallStack::NamedParams namedParams;
+    namedParams["index"] << index;
+    namedParams["divisor"] << divisor;
+    mBufferTrace.PushCall("VertexAttribDivisor", out.str(), namedParams);
   }
 
   inline void BindTransformFeedback(GLenum target, GLuint id) override
@@ -2008,10 +2187,14 @@ public: // TEST FUNCTIONS
   {
     mLinkStatus = value;
   }
-  inline void SetAttribLocations(std::vector<std::string> locs)
+  inline void SetAttribLocations(std::vector<std::string>& locs)
   {
     mAttribLocs = locs;
   }
+  inline void SetAttribTypes(std::vector<GLenum>& types)
+  {
+    mAttribTypes = types;
+  }
   inline void SetGetErrorResult(GLenum result)
   {
     mGetErrorResult = result;
@@ -2064,7 +2247,10 @@ public: // TEST FUNCTIONS
   {
     mProgramBinaryLength = length;
   }
-
+  inline void SetUniformBufferOffsetAlignment(GLint align)
+  {
+    mUniformBufferOffsetAlignment = align;
+  }
   inline bool GetVertexAttribArrayState(GLuint index)
   {
     if(index >= MAX_ATTRIBUTE_CACHE_SIZE)
@@ -2468,17 +2654,23 @@ public:
   GLint                                 mFramebufferStatus;
   GLenum                                mFramebufferDepthAttached;
   GLenum                                mFramebufferStencilAttached;
+  GLenum                                mFramebufferDepthStencilAttached;
   GLuint                                mFramebufferColorAttachmentCount;
   GLuint                                mFrameBufferColorStatus;
+  GLuint                                mFramebufferDepthAttachmentCount;
+  GLuint                                mFramebufferStencilAttachmentCount;
+  GLuint                                mFramebufferDepthStencilAttachmentCount;
   GLint                                 mNumBinaryFormats;
   GLint                                 mBinaryFormats;
   GLint                                 mProgramBinaryLength;
+  GLint                                 mUniformBufferOffsetAlignment{1};
   bool                                  mVertexAttribArrayState[MAX_ATTRIBUTE_CACHE_SIZE];
   bool                                  mVertexAttribArrayChanged; // whether the vertex attrib array has been changed
   bool                                  mGetProgramBinaryCalled;
   typedef std::map<GLuint, std::string> ShaderSourceMap;
   ShaderSourceMap                       mShaderSources;
-  std::vector<std::string>              mAttribLocs; // should be bound to shader
+  std::vector<std::string>              mAttribLocs;  // should be bound to shader
+  std::vector<GLenum>                   mAttribTypes; // should be bound to shader
   GLuint                                mLastShaderCompiled;
   GLbitfield                            mLastClearBitMask;
   Vector4                               mLastClearColor;
@@ -2522,6 +2714,8 @@ public:
   TraceCallStack mViewportTrace;
 
   // Shaders & Uniforms
+  uint32_t mShaderLanguageVersion{320u};
+
   GLuint                                 mLastShaderIdUsed;
   GLuint                                 mLastProgramIdUsed{0u};
   GLuint                                 mLastUniformIdUsed;
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
index 83b7899..456d978 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,31 +22,61 @@
 
 namespace Dali
 {
-TestGraphicsBuffer::TestGraphicsBuffer(TraceCallStack& callStack, TestGlAbstraction& glAbstraction, uint32_t size, Graphics::BufferUsageFlags usage)
+TestGraphicsBuffer::TestGraphicsBuffer(const Graphics::BufferCreateInfo& createInfo, TestGraphicsController& controller, TestGlAbstraction& glAbstraction, TraceCallStack& callStack)
 : mCallStack(callStack),
+  mController(controller),
   mGl(glAbstraction),
-  mUsage(usage)
+  mCreateInfo(createInfo),
+  mUsage(createInfo.usage)
 {
-  memory.resize(size);
-  mGl.GetBufferTrace().EnableLogging(true);
+  if(createInfo.propertiesFlags & int(Graphics::BufferPropertiesFlagBit::CPU_ALLOCATED))
+  {
+    mCpuOnly = true;
+  }
+  else
+  {
+    mGl.GenBuffers(1, &mId);
+  }
+  memory.resize(createInfo.size);
+}
+
+TestGraphicsBuffer::~TestGraphicsBuffer()
+{
+  // Not strictly parameters, but useful for testing
+  TraceCallStack::NamedParams namedParams;
+  namedParams["usage"] << "0x" << std::hex << mCreateInfo.usage;
+  namedParams["propertiesFlags"] << mCreateInfo.propertiesFlags;
+
+  mCallStack.PushCall("Buffer::~Buffer", namedParams.str(), namedParams);
+  if(!mCpuOnly && mId)
+  {
+    mGl.DeleteBuffers(1, &mId);
+  }
+}
+
+void TestGraphicsBuffer::DiscardResource()
+{
+  mController.DiscardBuffer(this);
 }
 
 void TestGraphicsBuffer::Bind()
 {
   mCallStack.PushCall("Buffer::Bind", "");
-  if(!mId)
+  if(!mCpuOnly && mId > 0)
   {
-    mGl.GenBuffers(1, &mId);
+    mGl.BindBuffer(GetTarget(), mId);
   }
-  mGl.BindBuffer(GetTarget(), mId);
 }
 
 void TestGraphicsBuffer::Unbind()
 {
   mCallStack.PushCall("Buffer::Unbind", "");
-  if(mId)
+  if(!mCpuOnly)
   {
-    mGl.BindBuffer(GetTarget(), 0);
+    if(mId)
+    {
+      mGl.BindBuffer(GetTarget(), 0);
+    }
   }
 }
 
@@ -58,15 +88,19 @@ void TestGraphicsBuffer::Upload(uint32_t offset, uint32_t size)
   namedParams["offset"] << offset;
   namedParams["size"] << size;
   mCallStack.PushCall("Buffer::Upload", o.str(), namedParams);
-  if(size <= memory.size() && mCreated)
-  {
-    // Use subData to avoid re-allocation
-    mGl.BufferSubData(GetTarget(), offset, size, &memory[offset]);
-  }
-  else
+
+  if(!mCpuOnly)
   {
-    mGl.BufferData(GetTarget(), GLsizeiptr(size), &memory[0], GL_STATIC_DRAW); //@todo Query - do we need other usages?
-    mCreated = true;
+    if(size <= memory.size() && mCreated)
+    {
+      // Use subData to avoid re-allocation
+      mGl.BufferSubData(GetTarget(), static_cast<GLintptr>(static_cast<unsigned long>(offset)), static_cast<GLsizeiptr>(static_cast<unsigned long>(size)), &memory[offset]);
+    }
+    else
+    {
+      mGl.BufferData(GetTarget(), static_cast<GLsizeiptr>(static_cast<unsigned long>(size)), &memory[0], GL_STATIC_DRAW); //@todo Query - do we need other usages?
+      mCreated = true;
+    }
   }
 }
 
@@ -82,65 +116,67 @@ GLenum TestGraphicsBuffer::GetTarget()
 
 void TestGraphicsBuffer::BindAsUniformBuffer(const TestGraphicsProgram* program, const Dali::UniformBufferBindingDescriptor& uboBinding) const
 {
-  auto* reflection = static_cast<const TestGraphicsReflection*>(&program->GetReflection());
-
-  Graphics::UniformBlockInfo uboInfo{};
-  reflection->GetUniformBlock(0, uboInfo);
+  auto*       reflection = static_cast<const TestGraphicsReflection*>(&program->GetReflection());
+  const auto& uboInfo    = reflection->GetTestUniformBlock(0u);
 
   auto  offset = uboBinding.offset;
   auto* data   = memory.data() + offset;
 
   for(const auto& member : uboInfo.members)
   {
-    auto type = reflection->GetMemberType(0, member.location);
-    switch(type)
+    uint32_t numElements = member.numElements > 0 ? member.numElements : 1;
+
+    for(uint32_t i = 0; i < numElements; ++i)
     {
-      case Property::VECTOR4:
-      {
-        auto value = *reinterpret_cast<const Dali::Vector4*>(data + member.offset);
-        mGl.Uniform4f(member.location, value.x, value.y, value.z, value.w);
-        break;
-      }
-      case Property::VECTOR3:
-      {
-        auto value = *reinterpret_cast<const Dali::Vector3*>(data + member.offset);
-        mGl.Uniform3f(member.location, value.x, value.y, value.z);
-        break;
-      }
-      case Property::VECTOR2:
-      {
-        auto value = *reinterpret_cast<const Dali::Vector2*>(data + member.offset);
-        mGl.Uniform2f(member.location, value.x, value.y);
-        break;
-      }
-      case Property::FLOAT:
-      {
-        auto value = *reinterpret_cast<const float*>(data + member.offset);
-        mGl.Uniform1f(member.location, value);
-        break;
-      }
-      case Property::INTEGER:
-      {
-        auto ptr   = reinterpret_cast<const GLint*>(data + member.offset);
-        auto value = *ptr;
-        mGl.Uniform1i(member.location, value);
-        break;
-      }
-      case Property::MATRIX:
-      {
-        auto value = reinterpret_cast<const float*>(data + member.offset);
-        mGl.UniformMatrix4fv(member.location, 1, GL_FALSE, value);
-        break;
-      }
-      case Property::MATRIX3:
-      {
-        auto value = reinterpret_cast<const float*>(data + member.offset);
-        mGl.UniformMatrix3fv(member.location, 1, GL_FALSE, value);
-        break;
-      }
-      default:
+      switch(member.type)
       {
-        fprintf(stderr, "\n%s type not found\n", member.name.c_str());
+        case Property::VECTOR4:
+        {
+          auto value = *reinterpret_cast<const Dali::Vector4*>(data + member.offsets[i]);
+          mGl.Uniform4f(member.locations[i], value.x, value.y, value.z, value.w);
+          break;
+        }
+        case Property::VECTOR3:
+        {
+          auto value = *reinterpret_cast<const Dali::Vector3*>(data + member.offsets[i]);
+          mGl.Uniform3f(member.locations[i], value.x, value.y, value.z);
+          break;
+        }
+        case Property::VECTOR2:
+        {
+          auto value = *reinterpret_cast<const Dali::Vector2*>(data + member.offsets[i]);
+          mGl.Uniform2f(member.locations[i], value.x, value.y);
+          break;
+        }
+        case Property::FLOAT:
+        {
+          auto value = *reinterpret_cast<const float*>(data + member.offsets[i]);
+          mGl.Uniform1f(member.locations[i], value);
+          break;
+        }
+        case Property::INTEGER:
+        {
+          auto ptr   = reinterpret_cast<const GLint*>(data + member.offsets[i]);
+          auto value = *ptr;
+          mGl.Uniform1i(member.locations[i], value);
+          break;
+        }
+        case Property::MATRIX:
+        {
+          auto value = reinterpret_cast<const float*>(data + member.offsets[i]);
+          mGl.UniformMatrix4fv(member.locations[i], 1, GL_FALSE, value);
+          break;
+        }
+        case Property::MATRIX3:
+        {
+          auto value = reinterpret_cast<const float*>(data + member.offsets[i]);
+          mGl.UniformMatrix3fv(member.locations[i], 1, GL_FALSE, value);
+          break;
+        }
+        default:
+        {
+          fprintf(stderr, "\n%s type not found\n", member.name.c_str());
+        }
       }
     }
   }
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.h
index 1dc2715..220ae06 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_GRAPHICS_BUFFER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 
+#include <dali/graphics-api/graphics-buffer-create-info.h>
 #include <dali/graphics-api/graphics-buffer.h>
 #include <dali/graphics-api/graphics-types.h>
 
@@ -26,11 +27,16 @@
 namespace Dali
 {
 class TestGraphicsProgram;
+class TestGraphicsController;
 class UniformBufferBindingDescriptor;
+
 class TestGraphicsBuffer : public Graphics::Buffer
 {
 public:
-  TestGraphicsBuffer(TraceCallStack& callStack, TestGlAbstraction& glAbstraction, uint32_t size, Graphics::BufferUsageFlags usage);
+  TestGraphicsBuffer(const Graphics::BufferCreateInfo& createInfo, TestGraphicsController& controller, TestGlAbstraction& glAbstraction, TraceCallStack& callStack);
+  ~TestGraphicsBuffer();
+  void DiscardResource();
+
   void   Bind();
   void   Unbind();
   void   Upload(uint32_t offset, uint32_t size);
@@ -38,17 +44,21 @@ public:
 
   bool IsCPUAllocated() const
   {
-    return true;
+    return mCpuOnly;
   }
 
   void BindAsUniformBuffer(const TestGraphicsProgram* program, const Dali::UniformBufferBindingDescriptor& uboBinding) const;
 
-  TraceCallStack&            mCallStack;
-  TestGlAbstraction&         mGl;
-  std::vector<uint8_t>       memory;
+  TraceCallStack&         mCallStack;
+  TestGraphicsController& mController;
+  TestGlAbstraction&      mGl;
+  std::vector<uint8_t>    memory;
+
+  Graphics::BufferCreateInfo mCreateInfo;
   Graphics::BufferUsageFlags mUsage;
   GLuint                     mId{0};
   bool                       mCreated{false};
+  bool                       mCpuOnly{false};
 };
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h
index 3df3219..84480ef 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_GRAPHICS_COMMAND_BUFFER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,6 +65,7 @@ enum class CommandType
   SET_DEPTH_COMPARE_OP    = 1 << 24,
   SET_DEPTH_TEST_ENABLE   = 1 << 25,
   SET_DEPTH_WRITE_ENABLE  = 1 << 26,
+  DRAW_NATIVE             = 1 << 27,
 };
 
 std::ostream& operator<<(std::ostream& os, Graphics::StencilOp op);
@@ -123,7 +124,8 @@ struct DrawCallDescriptor
   {
     DRAW,
     DRAW_INDEXED,
-    DRAW_INDEXED_INDIRECT
+    DRAW_INDEXED_INDIRECT,
+    DRAW_NATIVE
   };
 
   Type type{}; ///< Type of the draw call
@@ -166,6 +168,11 @@ struct DrawCallDescriptor
       uint32_t                  drawCount;
       uint32_t                  stride;
     } drawIndexedIndirect;
+
+    struct
+    {
+      Graphics::DrawNativeInfo drawNativeInfo;
+    } drawNative;
   };
 };
 
@@ -265,6 +272,12 @@ struct Command
         data.bindUniformBuffers = rhs.data.bindUniformBuffers;
         break;
       }
+      case CommandType::DRAW_NATIVE:
+      {
+        data.draw.type       = rhs.data.draw.type;
+        data.draw.drawNative = rhs.data.draw.drawNative;
+        break;
+      }
       case CommandType::DRAW:
       {
         data.draw.type = rhs.data.draw.type;
@@ -418,6 +431,12 @@ struct Command
         data.bindPipeline = rhs.data.bindPipeline;
         break;
       }
+      case CommandType::DRAW_NATIVE:
+      {
+        data.draw.type       = rhs.data.draw.type;
+        data.draw.drawNative = rhs.data.draw.drawNative;
+        break;
+      }
       case CommandType::DRAW:
       {
         data.draw.type = rhs.data.draw.type;
@@ -647,9 +666,9 @@ public:
   {
   }
 
-  void BindVertexBuffers(uint32_t                             firstBinding,
-                         std::vector<const Graphics::Buffer*> buffers,
-                         std::vector<uint32_t>                offsets) override
+  void BindVertexBuffers(uint32_t                                    firstBinding,
+                         const std::vector<const Graphics::Buffer*>& buffers,
+                         const std::vector<uint32_t>&                offsets) override
   {
     mCommands.emplace_back();
     mCommands.back().type = CommandType::BIND_VERTEX_BUFFERS;
@@ -712,7 +731,7 @@ public:
     mCallStack.PushCall("BindPipeline", "");
   }
 
-  void BindTextures(std::vector<Graphics::TextureBinding>& textureBindings) override
+  void BindTextures(const std::vector<Graphics::TextureBinding>& textureBindings) override
   {
     mCommands.emplace_back();
     mCommands.back().type                              = CommandType::BIND_TEXTURES;
@@ -720,7 +739,7 @@ public:
     mCallStack.PushCall("BindTextures", "");
   }
 
-  void BindSamplers(std::vector<Graphics::SamplerBinding>& samplerBindings) override
+  void BindSamplers(const std::vector<Graphics::SamplerBinding>& samplerBindings) override
   {
     mCommands.emplace_back();
     mCommands.back().data.bindSamplers.samplerBindings = std::move(samplerBindings);
@@ -747,10 +766,10 @@ public:
   }
 
   void BeginRenderPass(
-    Graphics::RenderPass*             renderPass,
-    Graphics::RenderTarget*           renderTarget,
-    Graphics::Rect2D                  renderArea,
-    std::vector<Graphics::ClearValue> clearValues) override
+    Graphics::RenderPass*                    renderPass,
+    Graphics::RenderTarget*                  renderTarget,
+    Graphics::Rect2D                         renderArea,
+    const std::vector<Graphics::ClearValue>& clearValues) override
   {
     mCommands.emplace_back(CommandType::BEGIN_RENDER_PASS);
     auto& cmd                             = mCommands.back();
@@ -800,6 +819,16 @@ public:
     mCallStack.PushCall("ExecuteCommandBuffers", "");
   }
 
+  void DrawNative(const Graphics::DrawNativeInfo* drawInfo)
+  {
+    mCommands.emplace_back();
+    mCommands.back().type         = CommandType::DRAW_NATIVE;
+    auto& cmd                     = mCommands.back().data.draw;
+    cmd.type                      = DrawCallDescriptor::Type::DRAW_NATIVE;
+    cmd.drawNative.drawNativeInfo = *drawInfo;
+    mCallStack.PushCall("DrawNative", "");
+  }
+
   void Draw(
     uint32_t vertexCount,
     uint32_t instanceCount,
@@ -814,7 +843,12 @@ public:
     cmd.draw.instanceCount = instanceCount;
     cmd.draw.firstInstance = firstInstance;
     cmd.draw.firstVertex   = firstVertex;
-    mCallStack.PushCall("Draw", "");
+    TraceCallStack::NamedParams namedParams;
+    namedParams["vertexCount"] << vertexCount;
+    namedParams["instanceCount"] << instanceCount;
+    namedParams["firstInstance"] << firstInstance;
+    namedParams["firstVertex"] << firstVertex;
+    mCallStack.PushCall("Draw", namedParams.str(), namedParams);
   }
 
   void DrawIndexed(
@@ -833,7 +867,13 @@ public:
     cmd.drawIndexed.indexCount    = indexCount;
     cmd.drawIndexed.vertexOffset  = vertexOffset;
     cmd.drawIndexed.instanceCount = instanceCount;
-    mCallStack.PushCall("DrawIndexed", "");
+    TraceCallStack::NamedParams namedParams;
+    namedParams["firstIndex"] << firstIndex;
+    namedParams["firstInstance"] << firstInstance;
+    namedParams["indexCount"] << indexCount;
+    namedParams["vertexOffset"] << vertexOffset;
+    namedParams["instanceCount"] << instanceCount;
+    mCallStack.PushCall("DrawIndexed", namedParams.str(), namedParams);
   }
 
   void DrawIndexedIndirect(
@@ -850,7 +890,11 @@ public:
     cmd.drawIndexedIndirect.offset    = offset;
     cmd.drawIndexedIndirect.drawCount = drawCount;
     cmd.drawIndexedIndirect.stride    = stride;
-    mCallStack.PushCall("DrawIndexedIndirect", "");
+    TraceCallStack::NamedParams namedParams;
+    namedParams["offset"] << offset;
+    namedParams["drawCount"] << drawCount;
+    namedParams["stride"] << stride;
+    mCallStack.PushCall("DrawIndexedIndirect", namedParams.str(), namedParams);
   }
 
   void Reset() override
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
index 0886719..24bb51e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include "test-graphics-controller.h"
 
+#include <dali/graphics-api/graphics-types.h>
 #include "test-graphics-buffer.h"
 #include "test-graphics-command-buffer.h"
 #include "test-graphics-framebuffer.h"
@@ -28,12 +29,29 @@
 #include "test-graphics-texture.h"
 
 #include <dali/integration-api/gl-defines.h>
+#include <any>
 #include <cstdio>
 #include <iostream>
+#include <memory>
 #include <sstream>
 
 namespace Dali
 {
+namespace
+{
+template<class T>
+struct TestGraphicsDeleter
+{
+  TestGraphicsDeleter() = default;
+  void operator()(T* object)
+  {
+    // Discard resource
+    object->DiscardResource();
+  }
+};
+
+} //namespace
+
 std::ostream& operator<<(std::ostream& o, const Graphics::BufferCreateInfo& bufferCreateInfo)
 {
   return o << "usage:" << std::hex << bufferCreateInfo.usage << ", size:" << std::dec << bufferCreateInfo.size;
@@ -78,7 +96,7 @@ std::ostream& operator<<(std::ostream& o, const Graphics::TextureCreateInfo& cre
     << " usageFlags:" << std::hex << createInfo.usageFlags
     << " data:" << std::hex << createInfo.data
     << " dataSize:" << std::dec << createInfo.dataSize
-    << " nativeImagePtr:" << std::hex << createInfo.nativeImagePtr;
+    << " nativeImagePtr:" << std::hex << createInfo.nativeImagePtr.Get();
   return o;
 }
 
@@ -379,8 +397,81 @@ GLenum GetBlendOp(Graphics::BlendOp blendOp)
     case Graphics::BlendOp::MAX:
       op = GL_MAX;
       break;
-
-      // @todo Add advanced blend equations
+    case Graphics::BlendOp::MULTIPLY:
+    {
+      op = GL_MULTIPLY;
+      break;
+    }
+    case Graphics::BlendOp::SCREEN:
+    {
+      op = GL_SCREEN;
+      break;
+    }
+    case Graphics::BlendOp::OVERLAY:
+    {
+      op = GL_OVERLAY;
+      break;
+    }
+    case Graphics::BlendOp::DARKEN:
+    {
+      op = GL_DARKEN;
+      break;
+    }
+    case Graphics::BlendOp::LIGHTEN:
+    {
+      op = GL_LIGHTEN;
+      break;
+    }
+    case Graphics::BlendOp::COLOR_DODGE:
+    {
+      op = GL_COLORDODGE;
+      break;
+    }
+    case Graphics::BlendOp::COLOR_BURN:
+    {
+      op = GL_COLORBURN;
+      break;
+    }
+    case Graphics::BlendOp::HARD_LIGHT:
+    {
+      op = GL_HARDLIGHT;
+      break;
+    }
+    case Graphics::BlendOp::SOFT_LIGHT:
+    {
+      op = GL_SOFTLIGHT;
+      break;
+    }
+    case Graphics::BlendOp::DIFFERENCE:
+    {
+      op = GL_DIFFERENCE;
+      break;
+    }
+    case Graphics::BlendOp::EXCLUSION:
+    {
+      op = GL_EXCLUSION;
+      break;
+    }
+    case Graphics::BlendOp::HUE:
+    {
+      op = GL_HSL_HUE;
+      break;
+    }
+    case Graphics::BlendOp::SATURATION:
+    {
+      op = GL_HSL_SATURATION;
+      break;
+    }
+    case Graphics::BlendOp::COLOR:
+    {
+      op = GL_HSL_COLOR;
+      break;
+    }
+    case Graphics::BlendOp::LUMINOSITY:
+    {
+      op = GL_HSL_LUMINOSITY;
+      break;
+    }
   }
   return op;
 }
@@ -511,15 +602,15 @@ public:
 };
 
 TestGraphicsController::TestGraphicsController()
-: mCallStack(true, "TestGraphicsController."),
-  mCommandBufferCallStack(true, "TestCommandBuffer."),
-  mFrameBufferCallStack(true, "TestFrameBuffer.")
+: mCallStack(false, "TestGraphicsController."),
+  mCommandBufferCallStack(false, "TestCommandBuffer."),
+  mFrameBufferCallStack(false, "TestFrameBuffer.")
 {
   mCallStack.Enable(true);
   mCommandBufferCallStack.Enable(true);
   auto& trace = mGl.GetTextureTrace();
   trace.Enable(true);
-  trace.EnableLogging(true);
+  trace.EnableLogging(false);
 }
 
 void TestGraphicsController::SubmitCommandBuffers(const Graphics::SubmitInfo& submitInfo)
@@ -620,13 +711,36 @@ void TestGraphicsController::ProcessCommandBuffer(TestGraphicsCommandBuffer& com
         BindPipeline(currentPipeline);
         break;
       }
+      case CommandType::DRAW_NATIVE:
+      {
+        auto info = &cmd.data.draw.drawNative.drawNativeInfo;
+
+        if(info->glesNativeInfo.eglSharedContextStoragePointer)
+        {
+          auto* anyContext = reinterpret_cast<std::any*>(info->glesNativeInfo.eglSharedContextStoragePointer);
+          *anyContext      = reinterpret_cast<void*>(0x12345678u);
+        }
+
+        CallbackBase::ExecuteReturn<bool>(*info->callback, info->userData);
+        break;
+      }
       case CommandType::DRAW:
       {
         if(currentPipeline)
         {
-          mGl.DrawArrays(GetTopology(currentPipeline->inputAssemblyState.topology),
-                         0,
-                         cmd.data.draw.draw.vertexCount);
+          if(cmd.data.draw.draw.instanceCount == 0)
+          {
+            mGl.DrawArrays(GetTopology(currentPipeline->inputAssemblyState.topology),
+                           cmd.data.draw.draw.firstVertex,
+                           cmd.data.draw.draw.vertexCount);
+          }
+          else
+          {
+            mGl.DrawArraysInstanced(GetTopology(currentPipeline->inputAssemblyState.topology),
+                                    cmd.data.draw.draw.firstVertex,
+                                    cmd.data.draw.draw.vertexCount,
+                                    cmd.data.draw.draw.instanceCount);
+          }
         }
         break;
       }
@@ -634,10 +748,21 @@ void TestGraphicsController::ProcessCommandBuffer(TestGraphicsCommandBuffer& com
       {
         if(currentPipeline)
         {
-          mGl.DrawElements(GetTopology(currentPipeline->inputAssemblyState.topology),
-                           static_cast<GLsizei>(cmd.data.draw.drawIndexed.indexCount),
-                           GL_UNSIGNED_SHORT,
-                           reinterpret_cast<void*>(cmd.data.draw.drawIndexed.firstIndex));
+          if(cmd.data.draw.draw.instanceCount == 0)
+          {
+            mGl.DrawElements(GetTopology(currentPipeline->inputAssemblyState.topology),
+                             static_cast<GLsizei>(cmd.data.draw.drawIndexed.indexCount),
+                             GL_UNSIGNED_SHORT,
+                             reinterpret_cast<void*>(cmd.data.draw.drawIndexed.firstIndex));
+          }
+          else
+          {
+            mGl.DrawElementsInstanced(GetTopology(currentPipeline->inputAssemblyState.topology),
+                                      static_cast<GLsizei>(cmd.data.draw.drawIndexed.indexCount),
+                                      GL_UNSIGNED_SHORT,
+                                      reinterpret_cast<void*>(cmd.data.draw.drawIndexed.firstIndex),
+                                      cmd.data.draw.drawIndexed.instanceCount);
+          }
         }
         break;
       }
@@ -895,12 +1020,22 @@ void TestGraphicsController::BindPipeline(TestGraphicsPipeline* pipeline)
     uint32_t attributeOffset = attribute.offset;
     GLsizei  stride          = vi.bufferBindings[attribute.binding].stride;
 
+    auto rate = vi.bufferBindings[attribute.binding].inputRate;
+
     mGl.VertexAttribPointer(attribute.location,
                             GetNumComponents(attribute.format),
                             GetGlType(attribute.format),
                             GL_FALSE, // Not normalized
                             stride,
                             reinterpret_cast<void*>(attributeOffset));
+    if(rate == Graphics::VertexInputRate::PER_VERTEX)
+    {
+      mGl.VertexAttribDivisor(attribute.location, 0);
+    }
+    else if(rate == Graphics::VertexInputRate::PER_INSTANCE)
+    {
+      mGl.VertexAttribDivisor(attribute.location, 1);
+    }
   }
 
   // Cull face setup
@@ -955,9 +1090,11 @@ void TestGraphicsController::BindPipeline(TestGraphicsPipeline* pipeline)
  */
 void TestGraphicsController::PresentRenderTarget(Graphics::RenderTarget* renderTarget)
 {
+  auto*                       rt = static_cast<const TestGraphicsRenderTarget*>(renderTarget);
   TraceCallStack::NamedParams namedParams;
   namedParams["renderTarget"] << std::hex << renderTarget;
-  mCallStack.PushCall("PresentRenderTarget", "", namedParams);
+  namedParams["surface"] << std::hex << rt->mCreateInfo.surface;
+  mCallStack.PushCall("PresentRenderTarget", namedParams.str(), namedParams);
 }
 
 /**
@@ -1064,10 +1201,25 @@ bool TestGraphicsController::IsDrawOnResumeRequired()
 
 Graphics::UniquePtr<Graphics::Buffer> TestGraphicsController::CreateBuffer(const Graphics::BufferCreateInfo& createInfo, Graphics::UniquePtr<Graphics::Buffer>&& oldBuffer)
 {
-  std::ostringstream oss;
-  oss << "bufferCreateInfo:" << createInfo;
-  mCallStack.PushCall("CreateBuffer", oss.str());
-  return Graphics::MakeUnique<TestGraphicsBuffer>(mCallStack, mGl, createInfo.size, createInfo.usage);
+  TraceCallStack::NamedParams namedParams;
+  namedParams["usage"] << "0x" << std::hex << createInfo.usage;
+  namedParams["propertiesFlags"] << createInfo.propertiesFlags;
+  namedParams["size"] << createInfo.size;
+  mCallStack.PushCall("CreateBuffer", namedParams.str(), namedParams);
+
+  auto ptr = Graphics::MakeUnique<TestGraphicsBuffer, TestGraphicsDeleter<TestGraphicsBuffer>>(createInfo, *this, mGl, mCallStack);
+  mAllocatedBuffers.push_back(ptr.get());
+  return ptr;
+}
+
+void TestGraphicsController::DiscardBuffer(TestGraphicsBuffer* buffer)
+{
+  auto iter = std::find(mAllocatedBuffers.begin(), mAllocatedBuffers.end(), buffer);
+  if(iter != mAllocatedBuffers.end())
+  {
+    mAllocatedBuffers.erase(iter);
+  }
+  delete buffer;
 }
 
 Graphics::UniquePtr<Graphics::CommandBuffer> TestGraphicsController::CreateCommandBuffer(const Graphics::CommandBufferCreateInfo& commandBufferCreateInfo, Graphics::UniquePtr<Graphics::CommandBuffer>&& oldCommandBuffer)
@@ -1124,7 +1276,7 @@ Graphics::UniquePtr<Graphics::Program> TestGraphicsController::CreateProgram(con
       source.resize(graphicsShader->mCreateInfo.sourceSize);
       memcpy(&source[0], graphicsShader->mCreateInfo.sourceData, graphicsShader->mCreateInfo.sourceSize);
 
-      if(!std::equal(source.begin(), source.end(), cacheEntry.shaders[shader.pipelineStage].begin()))
+      if(!std::equal(source.begin(), source.end(), cacheEntry.shaders[shader.pipelineStage].begin(), cacheEntry.shaders[shader.pipelineStage].end()))
       {
         found = false;
         break;
@@ -1137,7 +1289,8 @@ Graphics::UniquePtr<Graphics::Program> TestGraphicsController::CreateProgram(con
   }
 
   mProgramCache.emplace_back();
-  mProgramCache.back().programImpl = new TestGraphicsProgramImpl(mGl, programCreateInfo, mVertexFormats, mCustomUniforms);
+  mProgramCache.back().programImpl = new TestGraphicsProgramImpl(*this, mGl, programCreateInfo, mVertexFormats, mCustomUniforms, mCustomUniformBlocks);
+
   for(auto& shader : *(programCreateInfo.shaderState))
   {
     auto graphicsShader = Uncast<TestGraphicsShader>(shader.shader);
@@ -1164,7 +1317,10 @@ Graphics::UniquePtr<Graphics::Sampler> TestGraphicsController::CreateSampler(con
 
 Graphics::UniquePtr<Graphics::RenderTarget> TestGraphicsController::CreateRenderTarget(const Graphics::RenderTargetCreateInfo& renderTargetCreateInfo, Graphics::UniquePtr<Graphics::RenderTarget>&& oldRenderTarget)
 {
-  mCallStack.PushCall("CreateRenderTarget", "");
+  TraceCallStack::NamedParams namedParams;
+  namedParams["surface"] << std::hex << renderTargetCreateInfo.surface;
+  mCallStack.PushCall("CreateRenderTarget", namedParams.str(), namedParams);
+
   return Graphics::MakeUnique<TestGraphicsRenderTarget>(mGl, renderTargetCreateInfo);
 }
 
@@ -1205,11 +1361,27 @@ Graphics::MemoryRequirements TestGraphicsController::GetTextureMemoryRequirement
 
 Graphics::MemoryRequirements TestGraphicsController::GetBufferMemoryRequirements(Graphics::Buffer& buffer) const
 {
+  static GLint uniformAlign{0};
+
+  Graphics::MemoryRequirements reqs{};
   mCallStack.PushCall("GetBufferMemoryRequirements", "");
-  return Graphics::MemoryRequirements{};
+
+  auto gfxBuffer = Uncast<TestGraphicsBuffer>(&buffer);
+  if(gfxBuffer->mCreateInfo.usage & (0 | Graphics::BufferUsage::UNIFORM_BUFFER))
+  {
+    if(!uniformAlign)
+    {
+      // Throw off the shackles of constness
+      auto& gl = *const_cast<TestGlAbstraction*>(&mGl);
+      gl.GetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &uniformAlign);
+    }
+    reqs.size      = gfxBuffer->mCreateInfo.size;
+    reqs.alignment = uint32_t(uniformAlign);
+  }
+  return reqs;
 }
 
-const Graphics::TextureProperties& TestGraphicsController::GetTextureProperties(const Graphics::Texture& texture)
+Graphics::TextureProperties TestGraphicsController::GetTextureProperties(const Graphics::Texture& texture)
 {
   static Graphics::TextureProperties textureProperties{};
   mCallStack.PushCall("GetTextureProperties", "");
@@ -1237,4 +1409,71 @@ bool TestGraphicsController::GetProgramParameter(Graphics::Program& program, uin
   return graphicsProgram->GetParameter(parameterId, outData);
 }
 
+Graphics::Texture* TestGraphicsController::CreateTextureByResourceId(uint32_t resourceId, const Graphics::TextureCreateInfo& createInfo)
+{
+  Graphics::Texture*                     ret = nullptr;
+  Graphics::UniquePtr<Graphics::Texture> texture;
+  TraceCallStack::NamedParams            namedParams;
+  namedParams["resourceId"] << resourceId;
+
+  auto iter = mTextureUploadBindMapper.find(resourceId);
+  DALI_ASSERT_ALWAYS(iter == mTextureUploadBindMapper.end());
+
+  // Create new graphics texture.
+  texture = CreateTexture(createInfo, std::move(texture));
+  ret     = texture.get();
+
+  mTextureUploadBindMapper.insert(std::make_pair(resourceId, std::move(texture)));
+
+  mCallStack.PushCall("CreateTextureByResourceId", "", namedParams);
+  return ret;
+}
+
+void TestGraphicsController::DiscardTextureFromResourceId(uint32_t resourceId)
+{
+  TraceCallStack::NamedParams namedParams;
+  namedParams["resourceId"] << resourceId;
+
+  mTextureUploadBindMapper.erase(resourceId);
+
+  mCallStack.PushCall("DiscardTextureFromResourceId", "", namedParams);
+}
+
+Graphics::Texture* TestGraphicsController::GetTextureFromResourceId(uint32_t resourceId)
+{
+  TraceCallStack::NamedParams namedParams;
+  namedParams["resourceId"] << resourceId;
+
+  Graphics::Texture* ret = nullptr;
+
+  auto iter = mTextureUploadBindMapper.find(resourceId);
+  if(iter != mTextureUploadBindMapper.end())
+  {
+    ret = iter->second.get();
+  }
+
+  mCallStack.PushCall("GetTextureFromResourceId", "", namedParams);
+
+  return ret;
+}
+
+Graphics::UniquePtr<Graphics::Texture> TestGraphicsController::ReleaseTextureFromResourceId(uint32_t resourceId)
+{
+  TraceCallStack::NamedParams namedParams;
+  namedParams["resourceId"] << resourceId;
+
+  Graphics::UniquePtr<Graphics::Texture> texture;
+
+  auto iter = mTextureUploadBindMapper.find(resourceId);
+  if(iter != mTextureUploadBindMapper.end())
+  {
+    texture = std::move(iter->second);
+    mTextureUploadBindMapper.erase(iter);
+  }
+
+  mCallStack.PushCall("ReleaseTextureFromResourceId", "", namedParams);
+
+  return texture;
+}
+
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h
index cabc414..6066f67 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h
@@ -2,7 +2,7 @@
 #define TEST_GRAPHICS_CONTROLLER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
  */
 
 #include <dali/graphics-api/graphics-controller.h>
+#include <unordered_map>
 #include "test-gl-abstraction.h"
-#include "test-gl-context-helper-abstraction.h"
 #include "test-graphics-command-buffer.h"
 #include "test-graphics-program.h"
 #include "test-graphics-reflection.h"
@@ -103,14 +103,14 @@ public:
     mGl.Initialize();
   }
 
-  Integration::GlAbstraction& GetGlAbstraction() override
+  Integration::GlAbstraction& GetGlAbstraction()
   {
     return mGl;
   }
 
-  Integration::GlContextHelperAbstraction& GetGlContextHelperAbstraction() override
+  Integration::GraphicsConfig& GetGraphicsConfig()
   {
-    return mGlContextHelperAbstraction;
+    return mGl;
   }
 
   TestGraphicsSyncImplementation& GetGraphicsSyncImpl()
@@ -207,6 +207,8 @@ public:
    */
   Graphics::UniquePtr<Graphics::Buffer> CreateBuffer(const Graphics::BufferCreateInfo& bufferCreateInfo, Graphics::UniquePtr<Graphics::Buffer>&& oldBuffer) override;
 
+  void DiscardBuffer(TestGraphicsBuffer* buffer);
+
   /**
    * @brief Creates new CommandBuffer object
    *
@@ -354,7 +356,7 @@ public:
    *
    * @return Returns the TextureProperties object
    */
-  const Graphics::TextureProperties& GetTextureProperties(const Graphics::Texture& texture) override;
+  Graphics::TextureProperties GetTextureProperties(const Graphics::Texture& texture) override;
 
   /**
    * @brief Returns the reflection of the given program
@@ -373,7 +375,63 @@ public:
    */
   bool PipelineEquals(const Graphics::Pipeline& pipeline0, const Graphics::Pipeline& pipeline1) const override;
 
+  /**
+   * @brief Retrieves program parameters
+   *
+   * This function can be used to retrieve data from internal implementation
+   *
+   * @param[in] program Valid program object
+   * @param[in] parameterId Integer parameter id
+   * @param[out] outData Pointer to output memory
+   * @return True on success
+   */
+  bool GetProgramParameter(Graphics::Program& program, uint32_t parameterId, void* outData) override;
+
+public: // ResourceId relative API.
+  /**
+   * @brief Create Graphics::Texture as resourceId.
+   * The ownership of Graphics::Texture will be hold on this controller.
+   * @note If some Graphics::Texture already created before, assert.
+   * @post DiscardTextureFromResourceId() or ReleaseTextureFromResourceId() should be called when we don't use resourceId texture anymore.
+   *
+   * @param[in] resourceId The unique id of resouces.
+   * @return Pointer of Graphics::Texture, or nullptr if we fail to create.
+   */
+  Graphics::Texture* CreateTextureByResourceId(uint32_t resourceId, const Graphics::TextureCreateInfo& createInfo) override;
+
+  /**
+   * @brief Discard Graphics::Texture as resourceId.
+   *
+   * @param[in] resourceId The unique id of resouces.
+   */
+  void DiscardTextureFromResourceId(uint32_t resourceId) override;
+
+  /**
+   * @brief Get the Graphics::Texture as resourceId.
+   *
+   * @param[in] resourceId The unique id of resouces.
+   * @return Pointer of Graphics::Texture, or nullptr if there is no valid objects.
+   */
+  Graphics::Texture* GetTextureFromResourceId(uint32_t resourceId) override;
+
+  /**
+   * @brief Get the ownership of Graphics::Texture as resourceId.
+   *
+   * @param[in] resourceId The unique id of resouces.
+   * @return Pointer of Graphics::Texture.
+   */
+  Graphics::UniquePtr<Graphics::Texture> ReleaseTextureFromResourceId(uint32_t resourceId) override;
+
 public: // Test Functions
+  void SetAutoAttrCreation(bool v)
+  {
+    mAutoAttrCreation = v;
+  }
+  bool AutoAttrCreation()
+  {
+    return mAutoAttrCreation;
+  }
+
   void SetVertexFormats(Property::Array& vfs)
   {
     mVertexFormats = vfs;
@@ -384,23 +442,16 @@ public: // Test Functions
     mCustomUniforms = customUniforms;
   }
 
+  void AddCustomUniformBlock(const TestGraphicsReflection::TestUniformBlockInfo& blockInfo)
+  {
+    mCustomUniformBlocks.push_back(blockInfo);
+  }
+
   void ClearSubmitStack()
   {
     mSubmitStack.clear();
   }
 
-  /**
-   * @brief Retrieves program parameters
-   *
-   * This function can be used to retrieve data from internal implementation
-   *
-   * @param[in] program Valid program object
-   * @param[in] parameterId Integer parameter id
-   * @param[out] outData Pointer to output memory
-   * @return True on success
-   */
-  bool GetProgramParameter(Graphics::Program& program, uint32_t parameterId, void* outData) override;
-
   void ProcessCommandBuffer(TestGraphicsCommandBuffer& commandBuffer);
 
   void BindPipeline(TestGraphicsPipeline* pipeline);
@@ -413,11 +464,10 @@ public:
 
   TestGlAbstraction              mGl;
   TestGraphicsSyncImplementation mGraphicsSyncImpl;
-  TestGlContextHelperAbstraction mGlContextHelperAbstraction;
-
-  bool isDiscardQueueEmptyResult{true};
-  bool isDrawOnResumeRequiredResult{true};
 
+  bool            isDiscardQueueEmptyResult{true};
+  bool            isDrawOnResumeRequiredResult{true};
+  bool            mAutoAttrCreation{true};
   Property::Array mVertexFormats;
 
   struct ProgramCache
@@ -427,11 +477,16 @@ public:
   };
   std::vector<ProgramCache> mProgramCache;
 
+  std::vector<TestGraphicsBuffer*> mAllocatedBuffers;
+
+  std::unordered_map<uint32_t, Graphics::UniquePtr<Graphics::Texture>> mTextureUploadBindMapper;
+
   struct PipelineCache
   {
   };
 
-  std::vector<UniformData> mCustomUniforms;
+  std::vector<UniformData>                                  mCustomUniforms;
+  std::vector<TestGraphicsReflection::TestUniformBlockInfo> mCustomUniformBlocks;
 };
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp
index a994157..3c8418e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,18 @@
 
 namespace Dali
 {
-TestGraphicsProgramImpl::TestGraphicsProgramImpl(TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats, std::vector<UniformData>& customUniforms)
-: mGl(gl),
+TestGraphicsProgramImpl::TestGraphicsProgramImpl(TestGraphicsController& controller, TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats, std::vector<UniformData>& customUniforms, std::vector<TestGraphicsReflection::TestUniformBlockInfo>& customUniformBlocks)
+: mController(controller),
+  mGl(gl),
+  mId(gl.CreateProgram()),
   mCreateInfo(createInfo),
-  mReflection(gl, vertexFormats, createInfo, customUniforms)
+  mReflection(controller, gl, mId, vertexFormats, createInfo, customUniforms, customUniformBlocks)
 {
-  mId = mGl.CreateProgram();
-
   // Ensure active sampler uniforms are set
   mGl.SetCustomUniforms(customUniforms);
-  mGl.LinkProgram(mId);
+
+  // Don't need to re-register uniforms in GL side - now done in creation of mReflection.
+  // Was previously done in mGl.LinkProgram(mId);
 }
 
 bool TestGraphicsProgramImpl::GetParameter(uint32_t parameterId, void* outData)
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.h
index 3899bec..b81185a 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_GRAPHICS_PROGRAM_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,12 @@
 
 namespace Dali
 {
+class TestGraphicsController;
+
 class TestGraphicsProgramImpl
 {
 public:
-  TestGraphicsProgramImpl(TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats, std::vector<UniformData>& customUniforms);
+  TestGraphicsProgramImpl(TestGraphicsController& controller, TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats, std::vector<UniformData>& customUniforms, std::vector<TestGraphicsReflection::TestUniformBlockInfo>& customUniformBlocks);
 
   // For API
   const TestGraphicsReflection& GetReflection() const
@@ -45,6 +47,7 @@ public:
   bool GetParameter(uint32_t parameterId, void* outData);
 
 public:
+  TestGraphicsController&     mController;
   TestGlAbstraction&          mGl;
   uint32_t                    mId;
   Graphics::ProgramCreateInfo mCreateInfo;
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp
index 8493992..22d09e1 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,26 @@
  */
 
 #include "test-graphics-reflection.h"
+#include "test-graphics-controller.h"
 #include "test-graphics-shader.h"
 
 #include <dali/public-api/object/property-map.h>
 #include <string>
 #include <vector>
+
+extern "C"
+{
+  void tet_infoline(const char* str);
+  void tet_printf(const char* format, ...);
+}
+
 namespace Dali
 {
 namespace
 {
 static const std::vector<UniformData> UNIFORMS =
   {
+    UniformData("uColor", Property::Type::VECTOR4),
     UniformData("uRendererColor", Property::Type::FLOAT),
     UniformData("uCustom", Property::Type::INTEGER),
     UniformData("uCustom3", Property::Type::VECTOR3),
@@ -39,21 +48,73 @@ static const std::vector<UniformData> UNIFORMS =
     UniformData("sTexture", Property::Type::FLOAT),
     UniformData("sTextureRect", Property::Type::FLOAT),
     UniformData("sGloss", Property::Type::FLOAT),
-    UniformData("uColor", Property::Type::VECTOR4),
+    UniformData("uActorColor", Property::Type::VECTOR4),
     UniformData("uModelMatrix", Property::Type::MATRIX),
     UniformData("uModelView", Property::Type::MATRIX),
     UniformData("uMvpMatrix", Property::Type::MATRIX),
     UniformData("uNormalMatrix", Property::Type::MATRIX3),
     UniformData("uProjection", Property::Type::MATRIX),
+    UniformData("uScale", Property::Type::VECTOR3),
     UniformData("uSize", Property::Type::VECTOR3),
     UniformData("uViewMatrix", Property::Type::MATRIX),
     UniformData("uLightCameraProjectionMatrix", Property::Type::MATRIX),
     UniformData("uLightCameraViewMatrix", Property::Type::MATRIX),
+
+    // WARNING: IF YOU CHANGE THIS LIST, ALSO CHANGE mActiveUniforms IN test-gl-abstraction, Initialize
 };
+
+/**
+ * Helper function that returns size of uniform datatypes based
+ * on property type.
+ */
+constexpr int GetSizeForType(Property::Type type)
+{
+  switch(type)
+  {
+    case Property::Type::BOOLEAN:
+    {
+      return sizeof(bool);
+    }
+    case Property::Type::FLOAT:
+    {
+      return sizeof(float);
+    }
+    case Property::Type::INTEGER:
+    {
+      return sizeof(int);
+    }
+    case Property::Type::VECTOR2:
+    {
+      return sizeof(Vector2);
+    }
+    case Property::Type::VECTOR3:
+    {
+      return sizeof(Vector3);
+    }
+    case Property::Type::VECTOR4:
+    {
+      return sizeof(Vector4);
+    }
+    case Property::Type::MATRIX3:
+    {
+      return sizeof(Matrix3);
+    }
+    case Property::Type::MATRIX:
+    {
+      return sizeof(Matrix);
+    }
+    default:
+    {
+      return 0;
+    }
+  };
 }
 
-TestGraphicsReflection::TestGraphicsReflection(TestGlAbstraction& gl, Property::Array& vfs, const Graphics::ProgramCreateInfo& createInfo, std::vector<UniformData>& customUniforms)
-: mGl(gl),
+} // namespace
+
+TestGraphicsReflection::TestGraphicsReflection(TestGraphicsController& controller, TestGlAbstraction& gl, uint32_t programId, Property::Array& vfs, const Graphics::ProgramCreateInfo& createInfo, std::vector<UniformData>& customUniforms, std::vector<TestGraphicsReflection::TestUniformBlockInfo>& customUniformBlocks)
+: mController(controller),
+  mGl(gl),
   mCustomUniforms(customUniforms)
 {
   for(Property::Array::SizeType i = 0; i < vfs.Count(); ++i)
@@ -75,62 +136,140 @@ TestGraphicsReflection::TestGraphicsReflection(TestGlAbstraction& gl, Property::
   mDefaultUniformBlock.name          = "";
   mDefaultUniformBlock.members       = {};
   mDefaultUniformBlock.binding       = 0;
-  mDefaultUniformBlock.size          = 64 * (UNIFORMS.size() + mCustomUniforms.size());
   mDefaultUniformBlock.descriptorSet = 0;
   mDefaultUniformBlock.members.clear();
-  int loc = 0;
-  for(const auto& data : UNIFORMS)
-  {
-    mDefaultUniformBlock.members.emplace_back();
-    auto& item        = mDefaultUniformBlock.members.back();
-    item.name         = data.name;
-    item.binding      = 0;
-    item.offset       = loc * 64;
-    item.location     = loc++;
-    item.bufferIndex  = 0;
-    item.uniformClass = Graphics::UniformClass::UNIFORM;
-  }
+
+  int offset = 0;
 
   for(const auto& data : mCustomUniforms)
   {
     fprintf(stderr, "\ncustom uniforms: %s\n", data.name.c_str());
+
+    auto iter        = data.name.find("[", 0);
+    int  numElements = 1;
+    if(iter != std::string::npos)
+    {
+      auto baseName = data.name.substr(0, iter);
+      iter++;
+      numElements = std::stoi(data.name.substr(iter));
+      if(numElements == 0)
+      {
+        numElements = 1;
+      }
+      iter = data.name.find("]");
+      std::string suffix;
+      if(iter != std::string::npos && iter + 1 != data.name.length())
+      {
+        suffix = data.name.substr(iter + 1); // If there is a suffix, it means it is an element of an array of struct
+      }
+
+      if(!suffix.empty())
+      {
+        // Write multiple items
+        for(int i = 0; i < numElements; ++i)
+        {
+          std::stringstream elementNameStream;
+          elementNameStream << baseName << "[" << i << "]" << suffix;
+          mDefaultUniformBlock.members.emplace_back();
+          auto& item   = mDefaultUniformBlock.members.back();
+          item.name    = elementNameStream.str();
+          item.binding = 0;
+          item.offsets.push_back(offset);
+          item.locations.push_back(gl.GetUniformLocation(programId, elementNameStream.str().c_str()));
+          item.bufferIndex  = 0;
+          item.uniformClass = Graphics::UniformClass::UNIFORM;
+          item.type         = data.type;
+          offset += GetSizeForType(data.type);
+        }
+      }
+      else
+      {
+        // Write 1 item with multiple elements
+        mDefaultUniformBlock.members.emplace_back();
+        auto& item = mDefaultUniformBlock.members.back();
+
+        item.name         = baseName;
+        item.binding      = 0;
+        item.bufferIndex  = 0;
+        item.uniformClass = Graphics::UniformClass::UNIFORM;
+        item.type         = data.type;
+        item.numElements  = numElements;
+
+        for(int i = 0; i < numElements; ++i)
+        {
+          std::stringstream elementNameStream;
+          elementNameStream << baseName << "[" << i << "]";
+          item.locations.push_back(gl.GetUniformLocation(programId, elementNameStream.str().c_str()));
+          item.offsets.push_back(offset);
+          offset += GetSizeForType(data.type);
+        }
+      }
+    }
+    else
+    {
+      // Write 1 item with 1 element
+      mDefaultUniformBlock.members.emplace_back();
+      auto& item   = mDefaultUniformBlock.members.back();
+      item.name    = data.name;
+      item.binding = 0;
+      item.offsets.push_back(offset);
+      item.locations.push_back(gl.GetUniformLocation(programId, item.name.c_str()));
+      item.bufferIndex  = 0;
+      item.uniformClass = Graphics::UniformClass::UNIFORM;
+      item.type         = data.type;
+      offset += GetSizeForType(data.type);
+    }
+  }
+
+  for(const auto& data : UNIFORMS)
+  {
     mDefaultUniformBlock.members.emplace_back();
-    auto& item        = mDefaultUniformBlock.members.back();
-    item.name         = data.name;
-    item.binding      = 0;
-    item.offset       = loc * 64;
-    item.location     = loc++;
+    auto& item   = mDefaultUniformBlock.members.back();
+    item.name    = data.name;
+    item.binding = 0;
+    item.offsets.push_back(offset);
+    item.locations.push_back(gl.GetUniformLocation(programId, data.name.c_str()));
     item.bufferIndex  = 0;
     item.uniformClass = Graphics::UniformClass::UNIFORM;
+    item.type         = data.type;
+    offset += GetSizeForType(data.type);
   }
 
+  mDefaultUniformBlock.size = offset;
+
   mUniformBlocks.push_back(mDefaultUniformBlock);
+  for(auto& element : customUniformBlocks)
+  {
+    mUniformBlocks.push_back(element);
+  }
 }
 
 uint32_t TestGraphicsReflection::GetVertexAttributeLocation(const std::string& name) const
 {
-  // Automatically assign locations to named attributes when requested
   auto iter = std::find(mAttributes.begin(), mAttributes.end(), name);
   if(iter != mAttributes.end())
   {
     return iter - mAttributes.begin();
   }
-  else
+  else if(mController.AutoAttrCreation())
   {
     uint32_t location = mAttributes.size();
     mAttributes.push_back(name);
     return location;
   }
-  return 0u;
+
+  return -1;
 }
 
 Dali::Graphics::VertexInputAttributeFormat TestGraphicsReflection::GetVertexAttributeFormat(uint32_t location) const
 {
+  tet_infoline("Warning, TestGraphicsReflection::GetVertexAttributeFormat is unimplemented\n");
   return Dali::Graphics::VertexInputAttributeFormat{};
 }
 
 std::string TestGraphicsReflection::GetVertexAttributeName(uint32_t location) const
 {
+  tet_infoline("Warning, TestGraphicsReflection::GetVertexAttributeName is unimplemented\n");
   return 0u;
 }
 
@@ -151,14 +290,22 @@ uint32_t TestGraphicsReflection::GetUniformBlockCount() const
 
 uint32_t TestGraphicsReflection::GetUniformBlockBinding(uint32_t index) const
 {
-  return 0u;
+  if(index >= mUniformBlocks.size())
+  {
+    return 0;
+  }
+  return mUniformBlocks[index].binding;
 }
 
 uint32_t TestGraphicsReflection::GetUniformBlockSize(uint32_t index) const
 {
-  // 64 bytes per uniform (64 = 4x4 matrix)
-  // TODO: fix if array will be used
-  return 64 * (UNIFORMS.size() + mCustomUniforms.size());
+  if(index >= mUniformBlocks.size())
+  {
+    return 0;
+  }
+
+  const auto& block = mUniformBlocks[index];
+  return block.size;
 }
 
 bool TestGraphicsReflection::GetUniformBlock(uint32_t index, Dali::Graphics::UniformBlockInfo& out) const
@@ -182,8 +329,9 @@ bool TestGraphicsReflection::GetUniformBlock(uint32_t index, Dali::Graphics::Uni
     out.members[i].name         = memberUniform.name;
     out.members[i].binding      = block.binding;
     out.members[i].uniformClass = Graphics::UniformClass::UNIFORM;
-    out.members[i].offset       = memberUniform.offset;
-    out.members[i].location     = memberUniform.location;
+    out.members[i].offset       = memberUniform.offsets[0];
+    out.members[i].location     = memberUniform.locations[0];
+    out.members[i].elementCount = memberUniform.numElements;
   }
 
   return true;
@@ -191,11 +339,13 @@ bool TestGraphicsReflection::GetUniformBlock(uint32_t index, Dali::Graphics::Uni
 
 std::vector<uint32_t> TestGraphicsReflection::GetUniformBlockLocations() const
 {
+  tet_infoline("Warning, TestGraphicsReflection::GetUniformBlockLocations is unimplemented\n");
   return std::vector<uint32_t>{};
 }
 
 std::string TestGraphicsReflection::GetUniformBlockName(uint32_t blockIndex) const
 {
+  tet_infoline("Warning, TestGraphicsReflection::GetUniformBlockName is unimplemented\n");
   return std::string{};
 }
 
@@ -227,7 +377,7 @@ uint32_t TestGraphicsReflection::GetUniformBlockMemberOffset(uint32_t blockIndex
 {
   if(blockIndex < mUniformBlocks.size() && memberLocation < mUniformBlocks[blockIndex].members.size())
   {
-    return mUniformBlocks[blockIndex].members[memberLocation].offset;
+    return mUniformBlocks[blockIndex].members[memberLocation].offsets[0];
   }
   else
   {
@@ -237,11 +387,13 @@ uint32_t TestGraphicsReflection::GetUniformBlockMemberOffset(uint32_t blockIndex
 
 bool TestGraphicsReflection::GetNamedUniform(const std::string& name, Dali::Graphics::UniformInfo& out) const
 {
+  tet_infoline("Warning, TestGraphicsReflection::GetNamedUniform is unimplemented\n");
   return true;
 }
 
 const std::vector<Dali::Graphics::UniformInfo>& TestGraphicsReflection::GetSamplers() const
 {
+  tet_infoline("Warning, TestGraphicsReflection::GetSamplers is unimplemented\n");
   static std::vector<Dali::Graphics::UniformInfo> samplers{};
   return samplers;
 }
@@ -251,9 +403,4 @@ Graphics::ShaderLanguage TestGraphicsReflection::GetLanguage() const
   return Graphics::ShaderLanguage::GLSL_3_1;
 }
 
-Dali::Property::Type TestGraphicsReflection::GetMemberType(int blockIndex, int location) const
-{
-  return location < static_cast<int>(UNIFORMS.size()) ? UNIFORMS[location].type : mCustomUniforms[location - UNIFORMS.size()].type;
-}
-
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h
index 2147cae..b598435 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_GRAPHICS_REFLECTION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,14 @@
 
 namespace Dali
 {
+class TestGraphicsController;
+
 class TestGraphicsReflection : public Graphics::Reflection
 {
 public:
-  TestGraphicsReflection(TestGlAbstraction& gl, Property::Array& vertexFormats, const Graphics::ProgramCreateInfo& createInfo, std::vector<UniformData>& customUniforms);
+  class TestUniformBlockInfo;
+
+  TestGraphicsReflection(TestGraphicsController& controller, TestGlAbstraction& gl, uint32_t program_id, Property::Array& vertexFormats, const Graphics::ProgramCreateInfo& createInfo, std::vector<UniformData>& customUniforms, std::vector<TestUniformBlockInfo>& customUniformBlocks);
 
   uint32_t                                        GetVertexAttributeLocation(const std::string& name) const override;
   Dali::Graphics::VertexInputAttributeFormat      GetVertexAttributeFormat(uint32_t location) const override;
@@ -46,6 +50,27 @@ public:
   Graphics::ShaderLanguage                        GetLanguage() const override;
 
 public: // Test methods
+  struct TestUniformInfo
+  {
+    std::string            name{""}; // baseName in the case of arrays
+    Graphics::UniformClass uniformClass{Graphics::UniformClass::UNDEFINED};
+    uint32_t               binding{0u};
+    uint32_t               bufferIndex{0u};
+    std::vector<uint32_t>  offsets{};
+    std::vector<uint32_t>  locations{};
+    uint32_t               numElements{0u}; // 0 elements means this isn't an array; 1 element means this is an array of size 1
+    Property::Type         type;
+  };
+
+  struct TestUniformBlockInfo
+  {
+    std::string                  name{""};
+    uint32_t                     descriptorSet{0u};
+    uint32_t                     binding{0u};
+    uint32_t                     size{0u};
+    std::vector<TestUniformInfo> members{};
+  };
+
   void SetAttributes(std::vector<std::string> locations)
   {
     mAttributes.clear();
@@ -56,14 +81,18 @@ public: // Test methods
     }
   }
 
-  Dali::Property::Type GetMemberType(int blockIndex, int location) const;
+  const TestUniformBlockInfo& GetTestUniformBlock(uint32_t index) const
+  {
+    return mUniformBlocks[index];
+  }
 
+  TestGraphicsController&          mController;
   TestGlAbstraction&               mGl;
   mutable std::vector<std::string> mAttributes;
   std::vector<UniformData>         mCustomUniforms;
 
-  Graphics::UniformBlockInfo              mDefaultUniformBlock{}; ///< The emulated UBO containing all the standalone uniforms
-  std::vector<Graphics::UniformBlockInfo> mUniformBlocks{};       ///< List of uniform blocks
+  TestUniformBlockInfo              mDefaultUniformBlock{}; ///< The emulated UBO containing all the standalone uniforms
+  std::vector<TestUniformBlockInfo> mUniformBlocks{};       ///< List of uniform blocks
 };
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.cpp
index 17f53a7..bb4a500 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.cpp
@@ -38,6 +38,16 @@ bool TestSyncObject::IsSynced()
   return synced;
 }
 
+void TestSyncObject::Wait()
+{
+  mTrace.PushCall("SyncObject::Wait", ""); // Trace the method
+}
+
+void TestSyncObject::ClientWait()
+{
+  mTrace.PushCall("SyncObject::ClientWait", ""); // Trace the method
+}
+
 TestGraphicsSyncImplementation::TestGraphicsSyncImplementation()
 {
   Initialize();
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.h
index cbc5331..21fd358 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-impl.h
@@ -2,7 +2,7 @@
 #define TEST_SYNC_IMPLEMENTATION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,10 @@ class TestSyncObject : public Integration::GraphicsSyncAbstraction::SyncObject
 public:
   TestSyncObject(TraceCallStack& trace);
   ~TestSyncObject() override;
-  bool            IsSynced() override;
+  bool IsSynced() override;
+  void Wait() override;
+  void ClientWait() override;
+
   bool            synced;
   TraceCallStack& mTrace;
 };
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-object.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-object.h
index c33de6c..6886687 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-object.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-sync-object.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_GRAPHICS_SYNC_OBJECT_H_
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,7 @@
 
 #include <dali/graphics-api/graphics-sync-object-create-info.h>
 #include <dali/graphics-api/graphics-sync-object.h>
-
-#include <test-graphics-sync-impl.h>
+#include "test-graphics-sync-impl.h"
 
 namespace Dali
 {
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.cpp
index 9e1ad3e..4950bbd 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 #include "test-graphics-texture.h"
+#include <dali/integration-api/pixel-data-integ.h>
 #include <iostream>
 #include <sstream>
 
@@ -916,22 +917,6 @@ void TestGraphicsTexture::Prepare()
 {
   if(mCreateInfo.nativeImagePtr)
   {
-    /***********************************************************************************
-     * If the native image source changes, we need to re-create the texture.           *
-     * In EGL, this is done in native image implementation in PrepareTexture below.    *
-     *                                                                                 *
-     * In Vulkan impl, this was done in dali-core side. I think we should make this    *
-     * work in the graphics implementation instead.                                    *
-     ***********************************************************************************/
-    if(mCreateInfo.nativeImagePtr->SourceChanged())
-    {
-      uint32_t width  = mCreateInfo.nativeImagePtr->GetWidth();
-      uint32_t height = mCreateInfo.nativeImagePtr->GetHeight();
-      mCreateInfo.SetSize({width, height}); // Size may change
-
-      // @todo Re-initialize this texture from the new create info.
-    }
-
     // Ensure the native image is up-to-date
     mCreateInfo.nativeImagePtr->PrepareTexture();
   }
@@ -951,26 +936,74 @@ void TestGraphicsTexture::Update(Graphics::TextureUpdateInfo updateInfo, Graphic
                         updateInfo.srcExtent2D.width != (mCreateInfo.size.width / (1 << updateInfo.level)) ||
                         updateInfo.srcExtent2D.height != (mCreateInfo.size.height / (1 << updateInfo.level)));
 
+  uint8_t* pixels        = nullptr;
+  bool     releasePixels = false;
+
+  switch(source.sourceType)
+  {
+    case Graphics::TextureUpdateSourceInfo::Type::PIXEL_DATA:
+    {
+      auto pixelDataBuffer = Dali::Integration::GetPixelDataBuffer(source.pixelDataSource.pixelData);
+
+      pixels        = pixelDataBuffer.buffer;
+      releasePixels = Dali::Integration::IsPixelDataReleaseAfterUpload(source.pixelDataSource.pixelData) && updateInfo.srcOffset == 0u;
+      break;
+    }
+    case Graphics::TextureUpdateSourceInfo::Type::MEMORY:
+    {
+      pixels        = reinterpret_cast<uint8_t*>(source.memorySource.memory);
+      releasePixels = true;
+      break;
+    }
+    default:
+    {
+      // TODO : Implement here
+      break;
+    }
+  }
+
   if(!isSubImage)
   {
     if(!mIsCompressed)
     {
-      mGlAbstraction.TexImage2D(target, updateInfo.level, mGlInternalFormat, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, 0, mGlFormat, mPixelDataType, source.memorySource.memory);
+      mGlAbstraction.TexImage2D(target, updateInfo.level, mGlInternalFormat, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, 0, mGlFormat, mPixelDataType, pixels);
     }
     else
     {
-      mGlAbstraction.CompressedTexImage2D(target, updateInfo.level, mGlInternalFormat, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, 0, updateInfo.srcSize, source.memorySource.memory);
+      mGlAbstraction.CompressedTexImage2D(target, updateInfo.level, mGlInternalFormat, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, 0, updateInfo.srcSize, pixels);
     }
   }
   else
   {
     if(!mIsCompressed)
     {
-      mGlAbstraction.TexSubImage2D(target, updateInfo.level, updateInfo.dstOffset2D.x, updateInfo.dstOffset2D.y, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, mGlFormat, mPixelDataType, source.memorySource.memory);
+      mGlAbstraction.TexSubImage2D(target, updateInfo.level, updateInfo.dstOffset2D.x, updateInfo.dstOffset2D.y, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, mGlFormat, mPixelDataType, pixels);
     }
     else
     {
-      mGlAbstraction.CompressedTexSubImage2D(target, updateInfo.level, updateInfo.dstOffset2D.x, updateInfo.dstOffset2D.y, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, mGlFormat, updateInfo.srcSize, source.memorySource.memory);
+      mGlAbstraction.CompressedTexSubImage2D(target, updateInfo.level, updateInfo.dstOffset2D.x, updateInfo.dstOffset2D.y, updateInfo.srcExtent2D.width, updateInfo.srcExtent2D.height, mGlFormat, updateInfo.srcSize, pixels);
+    }
+  }
+
+  if(releasePixels && pixels != nullptr)
+  {
+    switch(source.sourceType)
+    {
+      case Graphics::TextureUpdateSourceInfo::Type::PIXEL_DATA:
+      {
+        Dali::Integration::ReleasePixelDataBuffer(source.pixelDataSource.pixelData);
+        break;
+      }
+      case Graphics::TextureUpdateSourceInfo::Type::MEMORY:
+      {
+        free(reinterpret_cast<void*>(pixels));
+        break;
+      }
+      default:
+      {
+        // TODO : Implement here
+        break;
+      }
     }
   }
 }
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.h
index 58f7738..4d86364 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-texture.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_GRAPHICS_TEXTURE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class TestGraphicsTexture : public Graphics::Texture
 public:
   TestGraphicsTexture(TestGlAbstraction& glAbstraction, const Graphics::TextureCreateInfo& createInfo);
 
-  ~TestGraphicsTexture();
+  ~TestGraphicsTexture() override;
 
   /**
    * Initialize the texture: allocate gl mem, apply default samplers
@@ -70,7 +70,7 @@ public:
   void Bind(uint32_t textureUnit);
 
   /**
-   * Prepare ensures that the native texture is updated if necessary (SourceChanged)
+   * Prepare ensures that the native texture is updated if necessary
    */
   void Prepare();
 
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
index 587d4a5..4237327 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,6 +122,18 @@ std::string TestModuleName(const char* processName)
   return oss.str();
 }
 
+std::string GetWChan(int pid)
+{
+  std::ostringstream procwchan;
+  procwchan << "/proc/" << pid << "/wchan";
+  std::ifstream ifs;
+  ifs.open(procwchan.str(), std::ifstream::in);
+  std::string line;
+  std::getline(ifs, line);
+  ifs.close();
+  return line;
+}
+
 std::string ReadAndEscape(std::string filename)
 {
   std::ostringstream os;
@@ -229,9 +241,9 @@ void OutputStatistics(const char* processName, int32_t numPasses, int32_t numFai
             basename(processName),
             numPasses + numFailures,
             numPasses,
-            (float)numPasses * 100.0f / (numPasses + numFailures),
+            numPasses > 0 ? (float)numPasses * 100.0f / (numPasses + numFailures) : 0.0f,
             numFailures,
-            (float)numFailures * 100.0f / (numPasses + numFailures));
+            numPasses > 0 ? (float)numFailures * 100.0f / (numPasses + numFailures) : 0.0f);
     fclose(fp);
   }
 }
@@ -362,7 +374,7 @@ int32_t RunTestCaseInChildProcess(TestCase& testCase, bool redirect)
   return testResult;
 }
 
-int32_t RunAll(const char* processName, ::testcase tc_array[], bool quiet)
+int32_t RunAll(const char* processName, ::testcase tc_array[], std::string match, bool quiet)
 {
   int32_t       numFailures = 0;
   int32_t       numPasses   = 0;
@@ -381,23 +393,35 @@ int32_t RunAll(const char* processName, ::testcase tc_array[], bool quiet)
     std::string startTime(buffer);
 
     TestCase testCase(i, &tc_array[i]);
-    testCase.result = RunTestCaseInChildProcess(testCase, quiet);
-
-    tt = system_clock::to_time_t(system_clock::now());
-    strftime(buffer, BUFSIZE, "%c", localtime(&tt));
-    std::string endTime(buffer);
-
-    if(testCase.result == 0)
-    {
-      numPasses++;
-    }
-    else
+    bool     run = true;
+    if(!match.empty())
     {
-      numFailures++;
+      if(match.compare(0, match.size(), testCase.name, match.size()))
+      {
+        run = false;
+      }
     }
-    if(!quiet)
+
+    if(run)
     {
-      OutputTestResult(ofs, processName, moduleName, testCase, startTime, endTime);
+      testCase.result = RunTestCaseInChildProcess(testCase, quiet);
+
+      tt = system_clock::to_time_t(system_clock::now());
+      strftime(buffer, BUFSIZE, "%c", localtime(&tt));
+      std::string endTime(buffer);
+
+      if(testCase.result == 0)
+      {
+        numPasses++;
+      }
+      else
+      {
+        numFailures++;
+      }
+      if(!quiet)
+      {
+        OutputTestResult(ofs, processName, moduleName, testCase, startTime, endTime);
+      }
     }
   }
   ofs.close();
@@ -408,7 +432,7 @@ int32_t RunAll(const char* processName, ::testcase tc_array[], bool quiet)
 }
 
 // Constantly runs up to MAX_NUM_CHILDREN processes
-int32_t RunAllInParallel(const char* processName, ::testcase tc_array[], bool reRunFailed, bool quiet)
+int32_t RunAllInParallel(const char* processName, ::testcase tc_array[], std::string match, bool reRunFailed, bool quiet)
 {
   int32_t numFailures = 0;
   int32_t numPasses   = 0;
@@ -427,34 +451,54 @@ int32_t RunAllInParallel(const char* processName, ::testcase tc_array[], bool re
     // Create more children (up to the max number or til the end of the array)
     while(numRunningChildren < MAX_NUM_CHILDREN && tc_array[nextTestCase].name)
     {
-      int32_t pid = fork();
-      if(pid == 0) // Child process
+      bool run = true;
+      if(!match.empty())
       {
-        TestCase testCase(nextTestCase, &tc_array[nextTestCase]);
-        int      status = RunTestCaseRedirectOutput(testCase, quiet);
-        exit(status);
+        if(match.compare(0, match.size(), tc_array[nextTestCase].name, match.size()))
+        {
+          run = false;
+        }
       }
-      else if(pid == -1)
+      if(run)
       {
-        perror("fork");
-        exit(EXIT_STATUS_FORK_FAILED);
+        int32_t pid = fork();
+        if(pid == 0) // Child process
+        {
+          TestCase testCase(nextTestCase, &tc_array[nextTestCase]);
+          int      status = RunTestCaseRedirectOutput(testCase, quiet);
+          exit(status);
+        }
+        else if(pid == -1)
+        {
+          perror("fork");
+          exit(EXIT_STATUS_FORK_FAILED);
+        }
+        else // Parent process
+        {
+          TestCase tc(nextTestCase, tc_array[nextTestCase].name);
+          tc.startTime       = steady_clock::now();
+          tc.startSystemTime = system_clock::now();
+          tc.childPid        = pid;
+
+          children[pid] = tc;
+          nextTestCase++;
+          numRunningChildren++;
+        }
       }
-      else // Parent process
+      else
       {
-        TestCase tc(nextTestCase, tc_array[nextTestCase].name);
-        tc.startTime       = steady_clock::now();
-        tc.startSystemTime = system_clock::now();
-        tc.childPid        = pid;
-
-        children[pid] = tc;
         nextTestCase++;
-        numRunningChildren++;
       }
     }
 
-    // Check to see if any children have finished yet
     int32_t status   = 0;
-    int32_t childPid = waitpid(-1, &status, WNOHANG);
+    int32_t childPid = 0;
+    if(numRunningChildren > 0) // Only wait if there are running children.
+    {
+      // Check to see if any children have finished yet
+      childPid = waitpid(-1, &status, WNOHANG);
+    }
+
     if(childPid == 0)
     {
       // No children have finished.
@@ -464,11 +508,21 @@ int32_t RunAllInParallel(const char* processName, ::testcase tc_array[], bool re
       for(auto& tc : children)
       {
         std::chrono::steady_clock::duration timeSpan = endTime - tc.second.startTime;
-        std::chrono::duration<double>       seconds  = std::chrono::duration_cast<std::chrono::duration<double>>(timeSpan);
-        if(seconds.count() > MAXIMUM_CHILD_LIFETIME)
+        double                              seconds  = double(timeSpan.count()) * std::chrono::steady_clock::period::num / std::chrono::steady_clock::period::den;
+
+        if(4.9999 < seconds && seconds < 5 && !tc.second.finished)
+        {
+          printf("Child process %s is delayed: WCHAN:%s\n", tc.second.name, GetWChan(tc.first).c_str());
+        }
+        else if(seconds > MAXIMUM_CHILD_LIFETIME)
         {
           // Kill the child process. A subsequent call to waitpid will process signal result below.
-          kill(tc.first, SIGKILL);
+          if(!tc.second.finished)
+          {
+            printf("Child process %s WCHAN:%s\n", tc.second.name, GetWChan(tc.first).c_str());
+            kill(tc.first, SIGKILL);
+            tc.second.finished = true; // Only send kill signal once.
+          }
         }
       }
     }
@@ -481,8 +535,9 @@ int32_t RunAllInParallel(const char* processName, ::testcase tc_array[], bool re
     {
       if(WIFEXITED(status))
       {
-        auto& testCase  = children[childPid];
-        testCase.result = WEXITSTATUS(status);
+        auto& testCase    = children[childPid];
+        testCase.result   = WEXITSTATUS(status);
+        testCase.finished = true;
         if(testCase.result)
         {
           printf("Test case %s failed: %d\n", testCase.name, testCase.result);
@@ -503,6 +558,7 @@ int32_t RunAllInParallel(const char* processName, ::testcase tc_array[], bool re
         RunningTestCases::iterator iter = children.find(childPid);
         if(iter != children.end())
         {
+          iter->second.finished = true;
           printf("Test case %s exited with signal %s\n", iter->second.name, strsignal(status));
           iter->second.result = 1;
           failedTestCases.push_back(iter->second.testCase);
@@ -581,10 +637,11 @@ void Usage(const char* program)
 int RunTests(int argc, char* const argv[], ::testcase tc_array[])
 {
   int         result    = TestHarness::EXIT_STATUS_BAD_ARGUMENT;
-  const char* optString = "sfq";
+  const char* optString = "sfqm:";
   bool        optRerunFailed(true);
   bool        optRunSerially(false);
   bool        optQuiet(false);
+  std::string optMatch;
 
   int nextOpt = 0;
   do
@@ -601,6 +658,9 @@ int RunTests(int argc, char* const argv[], ::testcase tc_array[])
       case 'q':
         optQuiet = true;
         break;
+      case 'm':
+        optMatch = optarg;
+        break;
       case '?':
         TestHarness::Usage(argv[0]);
         exit(TestHarness::EXIT_STATUS_BAD_ARGUMENT);
@@ -612,11 +672,11 @@ int RunTests(int argc, char* const argv[], ::testcase tc_array[])
   {
     if(optRunSerially)
     {
-      result = TestHarness::RunAll(argv[0], tc_array, optQuiet);
+      result = TestHarness::RunAll(argv[0], tc_array, optMatch, optQuiet);
     }
     else
     {
-      result = TestHarness::RunAllInParallel(argv[0], tc_array, optRerunFailed, optQuiet);
+      result = TestHarness::RunAllInParallel(argv[0], tc_array, optMatch, optRerunFailed, optQuiet);
     }
   }
   else
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.h
index 554846f..e884c64 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.h
@@ -2,7 +2,7 @@
 #define TEST_HARNESS_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,10 @@ struct TestCase
   const char*                           name;
   std::chrono::steady_clock::time_point startTime;
   std::chrono::system_clock::time_point startSystemTime;
-  int32_t                               result;
+  int32_t                               result{0};
   pid_t                                 childPid{0};
   testcase*                             tctPtr;
+  bool                                  finished{false};
 
   TestCase(int32_t index, testcase* testCase)
   : testCase(index),
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
index bd1bfcc..cbbef46 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
@@ -2,7 +2,7 @@
 #define TEST_NATIVE_IMAGE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,20 +107,31 @@ public:
   };
   inline bool SourceChanged() const override
   {
-    return false;
+    return true;
   };
 
+  inline Rect<uint32_t> GetUpdatedArea() override
+  {
+    return mUpdatedArea;
+  }
+
   inline virtual Dali::NativeImageInterface::Extension* GetExtension()
   {
     return nullptr;
   }
 
+  inline void SetUpdatedArea(const Rect<uint32_t>& updatedArea)
+  {
+    mUpdatedArea = updatedArea;
+  }
+
 private:
   TestNativeImage(uint32_t width, uint32_t height);
   virtual ~TestNativeImage();
 
-  uint32_t mWidth;
-  uint32_t mHeight;
+  uint32_t       mWidth;
+  uint32_t       mHeight;
+  Rect<uint32_t> mUpdatedArea{};
 
 public:
   int32_t                mExtensionCreateCalls;
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp
index 1b90e0c..ae9dd7b 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,12 +28,12 @@ TestRenderController::~TestRenderController()
 {
 }
 
-void TestRenderController::RequestUpdate(bool forceUpdate)
+void TestRenderController::RequestUpdate()
 {
   mRequestUpdateCalled = true;
 }
 
-void TestRenderController::RequestProcessEventsOnIdle(bool forceProcess)
+void TestRenderController::RequestProcessEventsOnIdle()
 {
   mRequestProcessEventsOnIdleCalled = true;
 }
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h
index f7cafa4..2774df3 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h
@@ -2,7 +2,7 @@
 #define TEST_RENDER_CONTROLLER_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ public:
   TestRenderController();
   ~TestRenderController() override;
 
-  void RequestUpdate(bool forceUpdate) override;
-  void RequestProcessEventsOnIdle(bool forceProcess) override;
+  void RequestUpdate() override;
+  void RequestProcessEventsOnIdle() override;
 
   typedef enum
   {
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
index 7f2de63..1284793 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,26 @@ bool TraceCallStack::FindMethodAndGetParameters(std::string method, std::string&
   }
   if(!found)
   {
-    fprintf(stderr, "Search for %s(%s) failed\n", method.c_str(), params.c_str());
+    fprintf(stderr, "Search for %s() failed\n", method.c_str());
+  }
+  return found;
+}
+
+bool TraceCallStack::FindMethodAndGetParameters(std::string method, NamedParams& params) const
+{
+  bool found = false;
+  for(size_t i = 0; i < mCallStack.size(); i++)
+  {
+    if(0 == mCallStack[i].method.compare(method))
+    {
+      found  = true;
+      params = mCallStack[i].namedParams;
+      break;
+    }
+  }
+  if(!found)
+  {
+    fprintf(stderr, "Search for %s() failed\n", method.c_str());
   }
   return found;
 }
@@ -229,11 +248,15 @@ int TraceCallStack::FindIndexFromMethodAndParams(std::string method, const Trace
 
       for(auto iter = params.mParams.begin(); iter != params.mParams.end(); ++iter)
       {
-        auto        paramIter = mCallStack[i].namedParams.find(iter->parameterName);
-        std::string value     = paramIter->value.str();
-        std::string iValue    = iter->value.str();
-
-        if(paramIter == mCallStack[i].namedParams.end() || value.compare(iValue))
+        auto paramIter = mCallStack[i].namedParams.find(iter->parameterName);
+        if(paramIter == mCallStack[i].namedParams.end())
+        {
+          match = false;
+          break;
+        }
+        std::string value  = paramIter->value.str();
+        std::string iValue = iter->value.str();
+        if(value.compare(iValue))
         {
           match = false;
           break;
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h
index 7631630..c2d0a49 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h
@@ -2,7 +2,7 @@
 #define TEST_TRACE_CALL_STACK_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -121,6 +121,25 @@ public:
       }
     }
 
+    const std::ostringstream& operator[](std::string name) const
+    {
+      static std::ostringstream empty;
+      auto                      iter = mParams.begin();
+      for(; iter != mParams.end(); ++iter)
+      {
+        if(!iter->parameterName.compare(name))
+        {
+          break;
+        }
+      }
+
+      if(iter != mParams.end())
+      {
+        return iter->value;
+      }
+      return empty;
+    }
+
     std::string str() const
     {
       std::ostringstream out;
@@ -188,6 +207,14 @@ public:
   bool FindMethodAndGetParameters(std::string method, std::string& params) const;
 
   /**
+   * Search for a method in the stack and return its parameters if found
+   * @param[in] method The name of the method
+   * @param[out] params of the method
+   * @return true if the method was in the stack
+   */
+  bool FindMethodAndGetParameters(std::string method, NamedParams& params) const;
+
+  /**
    * Count how many times a method was called
    * @param[in] method The name of the method
    * @return The number of times it was called
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
index 4970dc4..49c344a 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ADAPTOR_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,10 +37,8 @@ using WindowContainer = std::vector<Window>;
 
 namespace Internal
 {
-
 namespace Adaptor
 {
-
 class GraphicsInterface;
 class SceneHolder;
 
@@ -50,7 +48,6 @@ class SceneHolder;
 
 namespace Integration
 {
-
 class GlAbstraction;
 
 } // namespace Integration
@@ -59,7 +56,6 @@ namespace Internal
 {
 namespace Adaptor
 {
-
 class Adaptor
 {
 public:
@@ -68,42 +64,57 @@ public:
   Adaptor();
   ~Adaptor();
 
-  void Start( Dali::Window window );
+  void Start(Dali::Window window);
+  void Stop();
 
-  bool AddIdle( CallbackBase* callback, bool hasReturnValue );
-  void RemoveIdle( CallbackBase* callback );
+  bool AddIdle(CallbackBase* callback, bool hasReturnValue);
+  void RemoveIdle(CallbackBase* callback);
   void RunIdles();
 
-  static Integration::Scene GetScene( Dali::Window window );
+  static Integration::Scene GetScene(Dali::Window window);
 
   Dali::RenderSurfaceInterface& GetSurface();
-  Dali::WindowContainer GetWindows();
-  Dali::SceneHolderList GetSceneHolders();
+  Dali::WindowContainer         GetWindows();
+  Dali::SceneHolderList         GetSceneHolders();
+
+  Dali::Internal::Adaptor::SceneHolder* GetWindow(Dali::Actor& actor);
+  void                                  AddWindow(Internal::Adaptor::SceneHolder* window);
+  void                                  RemoveWindow(Internal::Adaptor::SceneHolder* window);
 
-  Dali::Internal::Adaptor::SceneHolder* GetWindow( Dali::Actor& actor );
-  void AddWindow( Internal::Adaptor::SceneHolder* window );
-  void RemoveWindow( Internal::Adaptor::SceneHolder* window );
+  void RegisterProcessor(Integration::Processor& processor, bool postProcessor = false);
+  void UnregisterProcessor(Integration::Processor& processor, bool postProcessor = false);
 
-  void RegisterProcessor( Integration::Processor& processor, bool postProcessor = false);
-  void UnregisterProcessor( Integration::Processor& processor, bool postProcessor = false);
+  void SetApplication(Dali::TestApplication& testApplication);
 
-  void SetApplication( Dali::TestApplication& testApplication );
+  bool IsStopped() const
+  {
+    return mStopped;
+  }
 
-  Dali::Adaptor::AdaptorSignalType& ResizedSignal();
-  Dali::Adaptor::AdaptorSignalType& LanguageChangedSignal();
+  Dali::Adaptor::AdaptorSignalType&       ResizedSignal();
+  Dali::Adaptor::AdaptorSignalType&       LanguageChangedSignal();
   Dali::Adaptor::WindowCreatedSignalType& WindowCreatedSignal();
+  Dali::Adaptor::LocaleChangedSignalType& LocaleChangedSignal();
 
-  static Adaptor& GetImpl( Dali::Adaptor& adaptor ) { return *adaptor.mImpl; }
-  static const Adaptor& GetImpl( const Dali::Adaptor& adaptor ) { return *adaptor.mImpl; }
+  static Adaptor& GetImpl(Dali::Adaptor& adaptor)
+  {
+    return *adaptor.mImpl;
+  }
+  static const Adaptor& GetImpl(const Dali::Adaptor& adaptor)
+  {
+    return *adaptor.mImpl;
+  }
 
 private:
-
-  Vector<CallbackBase*> mCallbacks;
+  Vector<CallbackBase*>                        mCallbacks;
+  Vector<CallbackBase*>                        mReturnCallbacks;
   std::vector<Internal::Adaptor::SceneHolder*> mWindows;
-  Dali::Adaptor::AdaptorSignalType mResizedSignal;
-  Dali::Adaptor::AdaptorSignalType mLanguageChangedSignal;
-  Dali::Adaptor::WindowCreatedSignalType mWindowCreatedSignal;
-  TestApplication* mTestApplication;
+  Dali::Adaptor::AdaptorSignalType             mResizedSignal;
+  Dali::Adaptor::AdaptorSignalType             mLanguageChangedSignal;
+  Dali::Adaptor::WindowCreatedSignalType       mWindowCreatedSignal;
+  Dali::Adaptor::LocaleChangedSignalType       mLocaleChangedSignal;
+  TestApplication*                             mTestApplication;
+  bool                                         mStopped{false};
 };
 
 } // namespace Adaptor
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
index 8f3095f..4d77310 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,21 +24,22 @@
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/adaptor-framework/scene-holder.h>
 
-#include <toolkit-scene-holder-impl.h>
-#include <toolkit-adaptor-impl.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/scene.h>
 #include <test-application.h>
+#include <toolkit-adaptor-impl.h>
+#include <toolkit-application.h>
+#include <toolkit-async-task-manager.h>
+#include <toolkit-scene-holder-impl.h>
 #include <toolkit-test-application.h>
+#include "dali-test-suite-utils.h"
 
 namespace Dali
 {
-
 namespace Internal
 {
 namespace Adaptor
 {
-
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Dali::Internal::Adaptor::Adaptor Stub
@@ -49,14 +50,14 @@ Dali::Adaptor* gAdaptor = nullptr;
 
 Dali::Adaptor& Adaptor::New()
 {
-  DALI_ASSERT_ALWAYS( ! gAdaptor );
+  DALI_ASSERT_ALWAYS(!gAdaptor);
   gAdaptor = new Dali::Adaptor;
   return *gAdaptor;
 }
 
 Dali::Adaptor& Adaptor::Get()
 {
-  DALI_ASSERT_ALWAYS( gAdaptor );
+  DALI_ASSERT_ALWAYS(gAdaptor);
   return *gAdaptor;
 }
 
@@ -67,58 +68,95 @@ Adaptor::Adaptor()
 Adaptor::~Adaptor()
 {
   gAdaptor = nullptr;
+
+  // Ensure all threads and not-excuted tasks are destroyed.
+  // TODO : we'd better make some singletone service for toolkit UTC in future.
+  Test::AsyncTaskManager::DestroyAsyncTaskManager();
+}
+
+void Adaptor::Start(Dali::Window window)
+{
+  AddWindow(&GetImplementation(window));
 }
 
-void Adaptor::Start( Dali::Window window )
+void Adaptor::Stop()
 {
-  AddWindow( &GetImplementation( window ) );
+  if(mTestApplication)
+  {
+    Integration::Core& core = mTestApplication->GetCore();
+    tet_printf("Adaptor::UnregisterProcessors\n");
+    core.UnregisterProcessors();
+  }
+
+  mStopped = true;
 }
 
-Integration::Scene Adaptor::GetScene( Dali::Window window )
+Integration::Scene Adaptor::GetScene(Dali::Window window)
 {
   return window.GetScene();
 }
 
-bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue )
+bool Adaptor::AddIdle(CallbackBase* callback, bool hasReturnValue)
 {
-  mCallbacks.PushBack( callback );
-  return true;
+  if(ToolkitApplication::ADD_IDLE_SUCCESS)
+  {
+    if(hasReturnValue)
+    {
+      mReturnCallbacks.PushBack(callback);
+    }
+    else
+    {
+      mCallbacks.PushBack(callback);
+    }
+  }
+  return ToolkitApplication::ADD_IDLE_SUCCESS;
 }
 
-void Adaptor::RemoveIdle( CallbackBase* callback )
+void Adaptor::RemoveIdle(CallbackBase* callback)
 {
-  mCallbacks.Erase( std::find_if( mCallbacks.Begin(), mCallbacks.End(),
-                                  [ &callback ] ( CallbackBase* current ) { return callback == current; } ) );
+  mCallbacks.Erase(std::remove_if(mCallbacks.Begin(), mCallbacks.End(), [&callback](CallbackBase* current) { return callback == current; }), mCallbacks.End());
+  mReturnCallbacks.Erase(std::remove_if(mReturnCallbacks.Begin(), mReturnCallbacks.End(), [&callback](CallbackBase* current) { return callback == current; }), mReturnCallbacks.End());
 }
 
 void Adaptor::RunIdles()
 {
-  for( auto& callback : mCallbacks )
+  Dali::Vector<CallbackBase*> reusedCallbacks;
+  for(auto& callback : mReturnCallbacks)
   {
-    CallbackBase::Execute( *callback );
+    bool retValue = CallbackBase::ExecuteReturn<bool>(*callback);
+    if(retValue)
+    {
+      reusedCallbacks.PushBack(callback);
+    }
+  }
+  for(auto& callback : mCallbacks)
+  {
+    CallbackBase::Execute(*callback);
   }
 
   mCallbacks.Clear();
+  mReturnCallbacks.Clear();
+  mReturnCallbacks.Swap(reusedCallbacks);
 }
 
 Dali::RenderSurfaceInterface& Adaptor::GetSurface()
 {
-  DALI_ASSERT_ALWAYS( ! mWindows.empty() );
+  DALI_ASSERT_ALWAYS(!mWindows.empty());
 
-  return reinterpret_cast < Dali::RenderSurfaceInterface& >( mWindows.front()->GetRenderSurface() );
+  return reinterpret_cast<Dali::RenderSurfaceInterface&>(mWindows.front()->GetRenderSurface());
 }
 
 Dali::WindowContainer Adaptor::GetWindows()
 {
   Dali::WindowContainer windows;
 
-  for ( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter )
+  for(auto iter = mWindows.begin(); iter != mWindows.end(); ++iter)
   {
     // Downcast to Dali::Window
-    Dali::Window window( dynamic_cast<Dali::Internal::Adaptor::Window*>( *iter ) );
-    if ( window )
+    Dali::Window window(dynamic_cast<Dali::Internal::Adaptor::Window*>(*iter));
+    if(window)
     {
-      windows.push_back( window );
+      windows.push_back(window);
     }
   }
 
@@ -129,21 +167,21 @@ Dali::SceneHolderList Adaptor::GetSceneHolders()
 {
   Dali::SceneHolderList sceneHolderList;
 
-  for( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter )
+  for(auto iter = mWindows.begin(); iter != mWindows.end(); ++iter)
   {
-    sceneHolderList.push_back( Dali::Integration::SceneHolder( *iter ) );
+    sceneHolderList.push_back(Dali::Integration::SceneHolder(*iter));
   }
 
   return sceneHolderList;
 }
 
-Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow( Dali::Actor& actor )
+Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow(Dali::Actor& actor)
 {
-  Dali::Integration::Scene scene = Dali::Integration::Scene::Get( actor );
+  Dali::Integration::Scene scene = Dali::Integration::Scene::Get(actor);
 
-  for( auto window : mWindows )
+  for(auto window : mWindows)
   {
-    if ( scene == window->GetScene() )
+    if(scene == window->GetScene())
     {
       return window;
     }
@@ -152,39 +190,41 @@ Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow( Dali::Actor& actor )
   return nullptr;
 }
 
-void Adaptor::AddWindow( Internal::Adaptor::SceneHolder* window )
+void Adaptor::AddWindow(Internal::Adaptor::SceneHolder* window)
 {
-  if ( window )
+  if(window)
   {
-    mWindows.push_back( window );
+    mWindows.push_back(window);
 
-    Dali::Integration::SceneHolder newWindow( window );
-    mWindowCreatedSignal.Emit( newWindow );
+    Dali::Integration::SceneHolder newWindow(window);
+    mWindowCreatedSignal.Emit(newWindow);
   }
 }
 
-void Adaptor::RemoveWindow( Internal::Adaptor::SceneHolder* window )
+void Adaptor::RemoveWindow(Internal::Adaptor::SceneHolder* window)
 {
-  auto iter = std::find( mWindows.begin(), mWindows.end(), window );
-  if( iter != mWindows.end() )
+  auto iter = std::find(mWindows.begin(), mWindows.end(), window);
+  if(iter != mWindows.end())
   {
-    mWindows.erase( iter );
+    mWindows.erase(iter);
   }
 }
 
-void Adaptor::RegisterProcessor( Integration::Processor& processor, bool postProcessor )
+void Adaptor::RegisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
   Integration::Core& core = mTestApplication->GetCore();
-  core.RegisterProcessor( processor, postProcessor );
+  tet_printf("Adaptor::RegisterProcessor : %s\n", processor.GetProcessorName().data());
+  core.RegisterProcessor(processor, postProcessor);
 }
 
-void Adaptor::UnregisterProcessor( Integration::Processor& processor, bool postProcessor )
+void Adaptor::UnregisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
   Integration::Core& core = mTestApplication->GetCore();
-  core.UnregisterProcessor( processor, postProcessor );
+  tet_printf("Adaptor::UnregisterProcessor : %s\n", processor.GetProcessorName().data());
+  core.UnregisterProcessor(processor, postProcessor);
 }
 
-void Adaptor::SetApplication( Dali::TestApplication& testApplication )
+void Adaptor::SetApplication(Dali::TestApplication& testApplication)
 {
   mTestApplication = &testApplication;
 }
@@ -214,7 +254,7 @@ Dali::Adaptor::WindowCreatedSignalType& Adaptor::WindowCreatedSignal()
 ///////////////////////////////////////////////////////////////////////////////
 
 Adaptor::Adaptor()
-: mImpl( new Internal::Adaptor::Adaptor )
+: mImpl(new Internal::Adaptor::Adaptor)
 {
 }
 
@@ -238,23 +278,24 @@ void Adaptor::Resume()
 
 void Adaptor::Stop()
 {
+  mImpl->Stop();
 }
 
-bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue )
+bool Adaptor::AddIdle(CallbackBase* callback, bool hasReturnValue)
 {
-  return mImpl->AddIdle( callback, hasReturnValue );
+  return mImpl->AddIdle(callback, hasReturnValue);
 }
 
-void Adaptor::RemoveIdle( CallbackBase* callback )
+void Adaptor::RemoveIdle(CallbackBase* callback)
 {
-  mImpl->RemoveIdle( callback );
+  mImpl->RemoveIdle(callback);
 }
 
-void Adaptor::ReplaceSurface( Window window, Dali::RenderSurfaceInterface& surface )
+void Adaptor::ReplaceSurface(Window window, Dali::RenderSurfaceInterface& surface)
 {
 }
 
-void Adaptor::ReplaceSurface( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface& surface )
+void Adaptor::ReplaceSurface(Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface& surface)
 {
 }
 
@@ -294,7 +335,7 @@ Any Adaptor::GetNativeWindowHandle()
   return window;
 }
 
-Any Adaptor::GetNativeWindowHandle( Actor actor )
+Any Adaptor::GetNativeWindowHandle(Actor actor)
 {
   return GetNativeWindowHandle();
 }
@@ -303,7 +344,7 @@ void Adaptor::ReleaseSurfaceLock()
 {
 }
 
-void Adaptor::SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender )
+void Adaptor::SetRenderRefreshRate(unsigned int numberOfVSyncsPerRender)
 {
 }
 
@@ -314,7 +355,7 @@ Adaptor& Adaptor::Get()
 
 bool Adaptor::IsAvailable()
 {
-  return Internal::Adaptor::gAdaptor;
+  return Internal::Adaptor::gAdaptor && (!Internal::Adaptor::Adaptor::GetImpl(*Internal::Adaptor::gAdaptor).IsStopped());
 }
 
 void Adaptor::NotifySceneCreated()
@@ -325,15 +366,15 @@ void Adaptor::NotifyLanguageChanged()
 {
 }
 
-void Adaptor::FeedTouchPoint( TouchPoint& point, int timeStamp )
+void Adaptor::FeedTouchPoint(TouchPoint& point, int timeStamp)
 {
 }
 
-void Adaptor::FeedWheelEvent( WheelEvent& wheelEvent )
+void Adaptor::FeedWheelEvent(WheelEvent& wheelEvent)
 {
 }
 
-void Adaptor::FeedKeyEvent( KeyEvent& keyEvent )
+void Adaptor::FeedKeyEvent(KeyEvent& keyEvent)
 {
 }
 
@@ -358,24 +399,51 @@ public:
   }
 };
 
-LogFactory* gLogFactory = NULL;
+LogFactory*                gLogFactory = NULL;
 const LogFactoryInterface& Adaptor::GetLogFactory()
 {
-  if( gLogFactory == NULL )
+  if(gLogFactory == NULL)
   {
     gLogFactory = new LogFactory;
   }
   return *gLogFactory;
 }
 
-void Adaptor::RegisterProcessor( Integration::Processor& processor, bool postProcessor)
+class TraceFactory : public TraceFactoryInterface
+{
+public:
+  virtual void InstallTraceFunction() const
+  {
+    Dali::Integration::Trace::LogContextFunction logContextFunction(&TestApplication::LogContext);
+    Dali::Integration::Trace::InstallLogContextFunction(logContextFunction);
+  }
+
+  TraceFactory()
+  {
+  }
+  virtual ~TraceFactory()
+  {
+  }
+};
+
+TraceFactory*                gTraceFactory = NULL;
+const TraceFactoryInterface& Adaptor::GetTraceFactory()
+{
+  if(gTraceFactory == NULL)
+  {
+    gTraceFactory = new TraceFactory;
+  }
+  return *gTraceFactory;
+}
+
+void Adaptor::RegisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
-  mImpl->RegisterProcessor( processor, postProcessor );
+  mImpl->RegisterProcessor(processor, postProcessor);
 }
 
-void Adaptor::UnregisterProcessor( Integration::Processor& processor, bool postProcessor)
+void Adaptor::UnregisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
-  mImpl->UnregisterProcessor( processor, postProcessor );
+  mImpl->UnregisterProcessor(processor, postProcessor);
 }
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
index 271d6ec..949c8c1 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
@@ -18,39 +18,31 @@
 #include "toolkit-application.h"
 
 #include <dali-toolkit/public-api/dali-toolkit-common.h>
-#include <dali/public-api/signals/dali-signal.h>
 #include <dali/devel-api/adaptor-framework/orientation.h>
+#include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
 {
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 /**
  * Stub for the Application
  */
 class Application
 {
 public:
-
 public:
-
   Application(ToolkitApplication& toolkitApplication);
   ~Application();
 
 public:
-
   static std::string GetResourcePath();
 
   //Orientation& GetOrientation();
 
 public: // static methods
-
-public:  // Signals
-
+public: // Signals
 private:
-
   // Undefined
   Application(const Application&);
   Application& operator=(Application&);
@@ -88,6 +80,7 @@ std::string Application::GetResourcePath()
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 bool ToolkitApplication::DECODED_IMAGES_SUPPORTED;
+bool ToolkitApplication::ADD_IDLE_SUCCESS = true;
 
 ToolkitApplication::ToolkitApplication()
 : mApplicationStub(new Application(*this))
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h
index d444557..bd53962 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TOOLKIT_APPLICATION_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 namespace Dali
 {
-
 class Application;
 
 /**
@@ -30,18 +29,14 @@ class Application;
 class ToolkitApplication
 {
 public: // Construction & Destruction
-
   ToolkitApplication();
   ~ToolkitApplication();
 
 public: // Getters
-
   Application& GetApplication();
 
 public: // Signal Emissions
-
 public: // TEST FUNCTIONS
-
   // Enumeration of Application methods
   enum TestFuncEnum
   {
@@ -68,7 +63,6 @@ public: // TEST FUNCTIONS
   }
 
 private:
-
   struct TestFunctions
   {
     TestFunctions()
@@ -88,6 +82,7 @@ private:
 
 public: // Test static member
   static bool DECODED_IMAGES_SUPPORTED;
+  static bool ADD_IDLE_SUCCESS; ///< Default as true.
 };
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.cpp
new file mode 100644
index 0000000..c6922a5
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.cpp
@@ -0,0 +1,1113 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <toolkit-async-task-manager.h>
+
+// EXTERNAL INCLUDE
+#include <dali/devel-api/adaptor-framework/thread-settings.h>
+#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/devel-api/threading/thread.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/adaptor-framework/round-robin-container-view.h>
+#include <dali/public-api/common/list-wrapper.h>
+#include <dali/public-api/object/base-object.h>
+#include <memory>
+#include <unordered_map>
+
+// INTERNAL INCLUDE
+#include <toolkit-application.h>
+#include <toolkit-environment-variable.h>
+#include <toolkit-event-thread-callback.h>
+#include "dali-test-suite-utils.h"
+
+namespace Dali
+{
+namespace Internal
+{
+namespace Adaptor
+{
+namespace
+{
+std::atomic_uint32_t gThreadId = 0u;
+}
+
+class AsyncTaskThread;
+
+class AsyncTaskManager : public Dali::BaseObject
+{
+public:
+  static Dali::AsyncTaskManager Get();
+
+  AsyncTaskManager();
+  ~AsyncTaskManager();
+
+public:
+  void AddTask(AsyncTaskPtr task);
+  void RemoveTask(AsyncTaskPtr task);
+
+  Dali::AsyncTaskManager::TasksCompletedId SetCompletedCallback(CallbackBase* callback, Dali::AsyncTaskManager::CompletedCallbackTraceMask mask);
+  bool                                     RemoveCompletedCallback(Dali::AsyncTaskManager::TasksCompletedId tasksCompletedId);
+
+public:
+  AsyncTaskPtr PopNextCompletedTask();
+  void         TaskCompleted();
+  void         TaskAllCompleted();
+
+public: // Worker thread called method
+  AsyncTaskPtr PopNextTaskToProcess();
+  void         CompleteTask(AsyncTaskPtr&& task);
+
+private: /**
+   * @brief Helper class to keep the relation between AsyncTaskThread and corresponding container
+   */
+  class TaskHelper
+  {
+  public:
+    /**
+     * @brief Create an TaskHelper.
+     *
+     * @param[in] asyncTaskManager Reference to the AsyncTaskManager
+     */
+    TaskHelper(AsyncTaskManager& asyncTaskManager);
+
+    /**
+     * @brief Request the thread to process the task.
+     * @return True if the request succeeds, otherwise false.
+     */
+    bool Request();
+
+  public:
+    TaskHelper(const TaskHelper&) = delete;
+    TaskHelper& operator=(const TaskHelper&) = delete;
+
+    TaskHelper(TaskHelper&& rhs);
+    TaskHelper& operator=(TaskHelper&& rhs) = delete;
+
+  private:
+    /**
+     * @brief Main constructor that used by all other constructors
+     */
+    TaskHelper(std::unique_ptr<AsyncTaskThread> processor, AsyncTaskManager& asyncTaskManager);
+
+  private:
+    std::unique_ptr<AsyncTaskThread> mProcessor;
+    AsyncTaskManager&                mAsyncTaskManager;
+  };
+
+  /**
+   * @brief State of running task
+   */
+  enum class RunningTaskState
+  {
+    RUNNING  = 0, ///< Running task
+    CANCELED = 1, ///< Canceled by user
+  };
+
+  /**
+   * @brief State of complete task
+   */
+  enum class CompletedTaskState
+  {
+    REQUIRE_CALLBACK = 0, ///< Need to execute callback when completed task process.
+    SKIP_CALLBACK    = 1, ///< Do not execute callback
+  };
+
+private:
+  // Undefined
+  AsyncTaskManager(const AsyncTaskManager& manager);
+
+  // Undefined
+  AsyncTaskManager& operator=(const AsyncTaskManager& manager);
+
+private:
+  // Keep Task as list since we take tasks by FIFO as default.
+  using AsyncTaskContainer = std::list<AsyncTaskPtr>;
+
+  using AsyncRunningTaskPair      = std::pair<AsyncTaskPtr, RunningTaskState>;
+  using AsyncRunningTaskContainer = std::list<AsyncRunningTaskPair>;
+
+  using AsyncCompletedTaskPair      = std::pair<AsyncTaskPtr, CompletedTaskState>;
+  using AsyncCompletedTaskContainer = std::list<AsyncCompletedTaskPair>;
+
+  AsyncTaskContainer          mWaitingTasks;   ///< The queue of the tasks waiting to async process. Must be locked under mWaitingTasksMutex.
+  AsyncRunningTaskContainer   mRunningTasks;   ///< The queue of the running tasks. Must be locked under mRunningTasksMutex.
+  AsyncCompletedTaskContainer mCompletedTasks; ///< The queue of the tasks with the async process. Must be locked under mCompletedTasksMutex.
+
+  RoundRobinContainerView<TaskHelper> mTasks;
+
+  Dali::Mutex mWaitingTasksMutex;   ///< Mutex for mWaitingTasks. We can lock mRunningTasksMutex and mCompletedTasksMutex under this scope.
+  Dali::Mutex mRunningTasksMutex;   ///< Mutex for mRunningTasks. We can lock mCompletedTasksMutex under this scope.
+  Dali::Mutex mCompletedTasksMutex; ///< Mutex for mCompletedTasks. We cannot lock any mutex under this scope.
+
+  std::unique_ptr<EventThreadCallback> mTrigger;
+
+  struct TasksCompletedImpl;
+  std::unique_ptr<TasksCompletedImpl> mTasksCompletedImpl; ///< TaskS completed signal interface for AsyncTaskManager.
+};
+
+inline Internal::Adaptor::AsyncTaskManager& GetImplementation(Dali::AsyncTaskManager& obj)
+{
+  DALI_ASSERT_ALWAYS(obj && "AsyncTaskManager is empty");
+
+  Dali::BaseObject& handle = obj.GetBaseObject();
+
+  return static_cast<Internal::Adaptor::AsyncTaskManager&>(handle);
+}
+
+inline const Internal::Adaptor::AsyncTaskManager& GetImplementation(const Dali::AsyncTaskManager& obj)
+{
+  DALI_ASSERT_ALWAYS(obj && "AsyncTaskManager is empty");
+
+  const Dali::BaseObject& handle = obj.GetBaseObject();
+
+  return static_cast<const Internal::Adaptor::AsyncTaskManager&>(handle);
+}
+
+/********************************************************************************/
+/*********************************  INTERNAL CLASS  *****************************/
+/********************************************************************************/
+
+namespace
+{
+constexpr auto FORCE_TRIGGER_THRESHOLD = 128u; ///< Trigger TasksCompleted() forcely if the number of completed task contain too much.
+
+constexpr auto DEFAULT_NUMBER_OF_ASYNC_THREADS = size_t{8u};
+constexpr auto NUMBER_OF_ASYNC_THREADS_ENV     = "DALI_ASYNC_MANAGER_THREAD_POOL_SIZE";
+
+size_t GetNumberOfThreads(const char* environmentVariable, size_t defaultValue)
+{
+  auto           numberString          = EnvironmentVariable::GetEnvironmentVariable(environmentVariable);
+  auto           numberOfThreads       = numberString ? std::strtoul(numberString, nullptr, 10) : 0;
+  constexpr auto MAX_NUMBER_OF_THREADS = 16u;
+  DALI_ASSERT_DEBUG(numberOfThreads <= MAX_NUMBER_OF_THREADS);
+  return (numberOfThreads > 0 && numberOfThreads <= MAX_NUMBER_OF_THREADS) ? numberOfThreads : defaultValue;
+}
+
+thread_local Dali::AsyncTaskManager gAsyncTaskManager;
+} // namespace
+
+/**
+ * The worker thread for async process
+ */
+class AsyncTaskThread : public Thread
+{
+public:
+  /**
+   * Constructor.
+   */
+  AsyncTaskThread(AsyncTaskManager& asyncTaskManager)
+  : mConditionalWait(),
+    mAsyncTaskManager(asyncTaskManager),
+    mThreadId(++gThreadId),
+    mDestroyThread(false),
+    mIsThreadStarted(false),
+    mIsThreadIdle(true)
+  {
+  }
+
+  /**
+   * Destructor.
+   */
+  ~AsyncTaskThread() override
+  {
+    // Stop the thread
+    {
+      ConditionalWait::ScopedLock lock(mConditionalWait);
+      mDestroyThread = true;
+      mConditionalWait.Notify(lock);
+    }
+
+    Join();
+  }
+
+  /**
+   * @brief Request the thread to process the task.
+   * @return True if the request is successed, otherwise false.
+   */
+  bool Request()
+  {
+    if(!mIsThreadStarted)
+    {
+      Start();
+      mIsThreadStarted = true;
+    }
+
+    {
+      // Lock while adding task to the queue
+      ConditionalWait::ScopedLock lock(mConditionalWait);
+
+      if(mIsThreadIdle)
+      {
+        mIsThreadIdle = false;
+
+        // wake up the thread
+        mConditionalWait.Notify(lock);
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+protected:
+  /**
+   * The entry function of the worker thread.
+   */
+  void Run() override
+  {
+    {
+      char temp[100];
+      snprintf(temp, 100, "AsyncTaskThread[%u]", mThreadId);
+      SetThreadName(temp);
+    }
+
+    while(!mDestroyThread)
+    {
+      AsyncTaskPtr task = mAsyncTaskManager.PopNextTaskToProcess();
+      if(!task)
+      {
+        ConditionalWait::ScopedLock lock(mConditionalWait);
+        if(!mDestroyThread)
+        {
+          mIsThreadIdle = true;
+          mConditionalWait.Wait(lock);
+        }
+      }
+      else
+      {
+        tet_printf("BEGIN: AsyncTask[%s] Process\n", task->GetTaskName().data());
+        task->Process();
+        tet_printf("END: AsyncTask[%s] Process\n", task->GetTaskName().data());
+        if(!mDestroyThread)
+        {
+          mAsyncTaskManager.CompleteTask(std::move(task));
+        }
+      }
+    }
+  }
+
+private:
+  // Undefined
+  AsyncTaskThread(const AsyncTaskThread& thread) = delete;
+
+  // Undefined
+  AsyncTaskThread& operator=(const AsyncTaskThread& thread) = delete;
+
+private:
+  ConditionalWait   mConditionalWait;
+  AsyncTaskManager& mAsyncTaskManager;
+  uint32_t          mThreadId;
+  bool              mDestroyThread;
+  bool              mIsThreadStarted;
+  bool              mIsThreadIdle;
+};
+
+// AsyncTaskManager::TasksCompletedImpl
+
+struct AsyncTaskManager::TasksCompletedImpl
+{
+  TasksCompletedImpl(AsyncTaskManager& manager, EventThreadCallback* trigger)
+  : mManager(manager),
+    mTrigger(trigger),
+    mEmitCompletedTaskTriggered(false)
+  {
+  }
+
+public:
+  /**
+   * @brief Create new tasks completed id and.
+   * @post AppendTaskTrace or CheckTasksCompletedCallbackCompleted should be called.
+   * @param[in] callback The callback that want to be executed when we notify that all tasks completed.
+   */
+  Dali::AsyncTaskManager::TasksCompletedId GenerateTasksCompletedId(CallbackBase* callback)
+  {
+    // Lock while adding tasks completed callback list to the queue
+    Mutex::ScopedLock lock(mTasksCompletedCallbacksMutex);
+
+    auto id = mTasksCompletedCount++;
+    DALI_ASSERT_ALWAYS(mTasksCompletedCallbackList.find(id) == mTasksCompletedCallbackList.end());
+
+    mTasksCompletedCallbackList.insert({id, CallbackData(callback)});
+    return id;
+  }
+
+  /**
+   * @brief Append task that will be trace.
+   * @post RemoveTaskTrace should be called.
+   * @param[in] id The id of tasks completed.
+   * @param[in] task The task want to trace.
+   */
+  void AppendTaskTrace(Dali::AsyncTaskManager::TasksCompletedId id, AsyncTaskPtr task)
+  {
+    // Lock while adding tasks completed callback list to the queue
+    Mutex::ScopedLock lock(mTasksCompletedCallbacksMutex);
+
+    auto iter = mTasksCompletedCallbackList.find(id);
+    if(iter == mTasksCompletedCallbackList.end())
+    {
+      // This task is already erased. Ignore.
+      return;
+    }
+
+    auto& callbackData = iter->second;
+
+    auto jter = callbackData.mTasks.find(task.Get());
+
+    if(jter != callbackData.mTasks.end())
+    {
+      // Increase reference count.
+      ++(jter->second);
+    }
+    else
+    {
+      callbackData.mTasks.insert({task.Get(), 1u});
+    }
+  }
+
+  /**
+   * @brief Remove all task that were traced.
+   * @param[in] task The task want to remove trace.
+   * @param[in] taskCount The number of tasks that will be removed.
+   */
+  void RemoveTaskTrace(AsyncTaskPtr task, uint32_t count = 1u)
+  {
+    if(count == 0u)
+    {
+      return;
+    }
+
+    // Lock while removing tasks completed callback list to the queue
+    Mutex::ScopedLock lock(mTasksCompletedCallbacksMutex);
+
+    for(auto iter = mTasksCompletedCallbackList.begin(); iter != mTasksCompletedCallbackList.end();)
+    {
+      auto& callbackData      = iter->second;
+      bool  eraseCallbackData = false;
+
+      auto jter = callbackData.mTasks.find(task.Get());
+
+      if(jter != callbackData.mTasks.end())
+      {
+        if(jter->second <= count)
+        {
+          callbackData.mTasks.erase(jter);
+
+          if(callbackData.mTasks.empty())
+          {
+            eraseCallbackData = true;
+
+            // Move callback base into list.
+            // (To avoid task container changed during callback emit)
+            RegisterTasksCompletedCallback(std::move(callbackData.mCallback), iter->first);
+
+            iter = mTasksCompletedCallbackList.erase(iter);
+          }
+        }
+        else
+        {
+          jter->second -= count;
+        }
+      }
+
+      if(!eraseCallbackData)
+      {
+        ++iter;
+      }
+    }
+  }
+
+  /**
+   * @brief Check whether current TasksCompletedId completed or not.
+   * @param[in] id The id of tasks completed.
+   * @return True if all tasks are completed so we need to execute callback soon. False otherwise.
+   */
+  bool CheckTasksCompletedCallbackCompleted(Dali::AsyncTaskManager::TasksCompletedId id)
+  {
+    // Lock while removing tasks completed callback list to the queue
+    Mutex::ScopedLock lock(mTasksCompletedCallbacksMutex);
+
+    auto iter = mTasksCompletedCallbackList.find(id);
+    if(iter != mTasksCompletedCallbackList.end())
+    {
+      auto& callbackData = iter->second;
+      if(callbackData.mTasks.empty())
+      {
+        // Move callback base into list.
+        // (To avoid task container changed during callback emit)
+        RegisterTasksCompletedCallback(std::move(callbackData.mCallback), iter->first);
+
+        iter = mTasksCompletedCallbackList.erase(iter);
+
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * @brief Remove taskS completed callbacks by id.
+   * @param[in] id The id of taskS completed.
+   * @return True if taskS completed id removed. False otherwise.
+   */
+  bool RemoveTasksCompleted(Dali::AsyncTaskManager::TasksCompletedId id)
+  {
+    // Lock while removing taskS completed callback list to the queue
+    Mutex::ScopedLock lock(mTasksCompletedCallbacksMutex);
+
+    auto iter = mTasksCompletedCallbackList.find(id);
+    if(iter == mTasksCompletedCallbackList.end())
+    {
+      // This task is already erased, or completed.
+      // Erase from completed excute callback list.
+
+      // Lock while removing excute callback list to the queue
+      Mutex::ScopedLock lock(mExcuteCallbacksMutex);
+
+      for(auto iter = mExcuteCallbackList.begin(); iter != mExcuteCallbackList.end();)
+      {
+        if(iter->second == id)
+        {
+          iter = mExcuteCallbackList.erase(iter);
+
+          return true;
+        }
+        else
+        {
+          ++iter;
+        }
+      }
+
+      // This task is alread erased and completed. Ignore.
+      return false;
+    }
+
+    mTasksCompletedCallbackList.erase(iter);
+
+    return true;
+  }
+
+  /**
+   * @brief Emit all completed callbacks.
+   * @note This API should be called at event thread.
+   */
+  void EmitCompletedTasks()
+  {
+    ExecuteCallbackContainer executeCallbackList;
+    {
+      // Lock while removing excute callback list to the queue
+      Mutex::ScopedLock lock(mExcuteCallbacksMutex);
+
+      mEmitCompletedTaskTriggered = false;
+
+      // Copy callback lists, for let we execute callbacks out of mutex
+      executeCallbackList = std::move(mExcuteCallbackList);
+      mExcuteCallbackList.clear();
+    }
+
+    if(!executeCallbackList.empty())
+    {
+      // Execute all callbacks
+      for(auto&& callbackPair : executeCallbackList)
+      {
+        auto& callback = callbackPair.first;
+        auto  id       = callbackPair.second;
+
+        Dali::CallbackBase::Execute(*callback, id);
+      }
+    }
+  }
+
+  /**
+   * @brief Check whether there is some completed signal what we need to trace, or not.
+   * @return True if mTasksCompletedCallbackList is not empty. False otherwise.
+   */
+  bool IsTasksCompletedCallbackExist()
+  {
+    Mutex::ScopedLock lock(mTasksCompletedCallbacksMutex);
+    return !mTasksCompletedCallbackList.empty();
+  }
+
+  /**
+   * @brief Check whether there is some completed signal what we need to execute, or not.
+   * @return True if mExcuteCallbackList is not empty. False otherwise.
+   */
+  bool IsExecuteCallbackExist()
+  {
+    Mutex::ScopedLock lock(mExcuteCallbacksMutex);
+    return !mExcuteCallbackList.empty();
+  }
+
+private:
+  void RegisterTasksCompletedCallback(std::unique_ptr<CallbackBase> callback, Dali::AsyncTaskManager::TasksCompletedId id)
+  {
+    // Lock while adding excute callback list to the queue
+    Mutex::ScopedLock lock(mExcuteCallbacksMutex);
+
+    mExcuteCallbackList.emplace_back(std::move(callback), id);
+
+    if(!mEmitCompletedTaskTriggered)
+    {
+      mEmitCompletedTaskTriggered = true;
+      mTrigger->Trigger();
+    }
+  }
+
+private:
+  struct CallbackData
+  {
+  public:
+    CallbackData(CallbackBase* callback)
+    : mCallback(callback),
+      mTasks()
+    {
+    }
+
+    CallbackData(CallbackData&& rhs) noexcept
+    : mCallback(std::move(rhs.mCallback)),
+      mTasks(std::move(rhs.mTasks))
+    {
+    }
+
+    CallbackData& operator=(CallbackData&& rhs) noexcept
+    {
+      if(this != &rhs)
+      {
+        mCallback = std::move(rhs.mCallback);
+        mTasks    = std::move(rhs.mTasks);
+      }
+
+      return *this;
+    }
+
+  private:
+    // Delete copy operator.
+    CallbackData(const CallbackData& rhs) = delete;
+    CallbackData& operator=(const CallbackData& rhs) = delete;
+
+  public:
+    std::unique_ptr<CallbackBase>                  mCallback;
+    std::unordered_map<const AsyncTask*, uint32_t> mTasks;
+  };
+
+private:
+  AsyncTaskManager&    mManager; ///< Owner of this CacheImpl.
+  EventThreadCallback* mTrigger; ///< EventThread callback trigger. (Not owned.)
+
+  Dali::AsyncTaskManager::TasksCompletedId mTasksCompletedCount{0u};
+
+  using TasksCompletedContainer = std::unordered_map<Dali::AsyncTaskManager::TasksCompletedId, CallbackData>;
+  TasksCompletedContainer mTasksCompletedCallbackList;
+
+  using ExecuteCallbackContainer = std::vector<std::pair<std::unique_ptr<CallbackBase>, Dali::AsyncTaskManager::TasksCompletedId>>;
+  ExecuteCallbackContainer mExcuteCallbackList;
+
+  Dali::Mutex mTasksCompletedCallbacksMutex; ///< Mutex for mTasksCompletedCallbackList. We can lock mExcuteCallbacksMutex under this scope.
+  Dali::Mutex mExcuteCallbacksMutex;         ///< Mutex for mExcuteCallbackList.
+
+  bool mEmitCompletedTaskTriggered : 1;
+};
+
+// AsyncTaskManager
+
+Dali::AsyncTaskManager AsyncTaskManager::Get()
+{
+  if(!gAsyncTaskManager)
+  {
+    gAsyncTaskManager = Dali::AsyncTaskManager(new AsyncTaskManager());
+  }
+  return gAsyncTaskManager;
+}
+
+AsyncTaskManager::AsyncTaskManager()
+: mTasks(GetNumberOfThreads(NUMBER_OF_ASYNC_THREADS_ENV, DEFAULT_NUMBER_OF_ASYNC_THREADS), [&]() { return TaskHelper(*this); }),
+  mTrigger(new EventThreadCallback(MakeCallback(this, &AsyncTaskManager::TaskCompleted))),
+  mTasksCompletedImpl(new TasksCompletedImpl(*this, mTrigger.get()))
+{
+}
+
+AsyncTaskManager::~AsyncTaskManager()
+{
+  // Join all threads.
+  mTasks.Clear();
+
+  // Remove task completed impl after all threads are join.
+  mTasksCompletedImpl.reset();
+
+  // Remove tasks
+  mWaitingTasks.clear();
+  mRunningTasks.clear();
+  mCompletedTasks.clear();
+}
+
+void AsyncTaskManager::AddTask(AsyncTaskPtr task)
+{
+  if(task)
+  {
+    // Lock while adding task to the queue
+    Mutex::ScopedLock lock(mWaitingTasksMutex);
+
+    // push back into waiting queue.
+    mWaitingTasks.insert(mWaitingTasks.end(), task);
+
+    {
+      // For thread safety
+      Mutex::ScopedLock lock(mRunningTasksMutex); // We can lock this mutex under mWaitingTasksMutex.
+
+      // Finish all Running threads are working
+      if(mRunningTasks.size() >= mTasks.GetElementCount())
+      {
+        return;
+      }
+    }
+  }
+
+  size_t count = mTasks.GetElementCount();
+  size_t index = 0;
+  while(index++ < count)
+  {
+    auto processHelperIt = mTasks.GetNext();
+    DALI_ASSERT_ALWAYS(processHelperIt != mTasks.End());
+    if(processHelperIt->Request())
+    {
+      break;
+    }
+    // If all threads are busy, then it's ok just to push the task because they will try to get the next job.
+  }
+}
+
+void AsyncTaskManager::RemoveTask(AsyncTaskPtr task)
+{
+  if(task)
+  {
+    uint32_t removedCount = 0u;
+
+    {
+      // Lock while remove task from the queue
+      Mutex::ScopedLock lock(mWaitingTasksMutex);
+
+      for(auto iterator = mWaitingTasks.begin(); iterator != mWaitingTasks.end();)
+      {
+        if((*iterator) == task)
+        {
+          iterator = mWaitingTasks.erase(iterator);
+          ++removedCount;
+        }
+        else
+        {
+          ++iterator;
+        }
+      }
+    }
+
+    {
+      // Lock while remove task from the queue
+      Mutex::ScopedLock lock(mRunningTasksMutex);
+
+      for(auto iterator = mRunningTasks.begin(); iterator != mRunningTasks.end();)
+      {
+        if((*iterator).first == task)
+        {
+          // We cannot erase container. Just mark as canceled.
+          // Note : mAvaliableLowPriorityTaskCounts will be increased after process finished.
+          if((*iterator).second == RunningTaskState::RUNNING)
+          {
+            (*iterator).second = RunningTaskState::CANCELED;
+            ++removedCount;
+          }
+        }
+        ++iterator;
+      }
+    }
+
+    {
+      // Lock while remove task from the queue
+      Mutex::ScopedLock lock(mCompletedTasksMutex);
+
+      for(auto iterator = mCompletedTasks.begin(); iterator != mCompletedTasks.end();)
+      {
+        if((*iterator).first == task)
+        {
+          if((*iterator).second == CompletedTaskState::REQUIRE_CALLBACK)
+          {
+            ++removedCount;
+          }
+          iterator = mCompletedTasks.erase(iterator);
+        }
+        else
+        {
+          ++iterator;
+        }
+      }
+    }
+
+    // Remove TasksCompleted callback trace
+    if(removedCount > 0u && mTasksCompletedImpl->IsTasksCompletedCallbackExist())
+    {
+      mTasksCompletedImpl->RemoveTaskTrace(task, removedCount);
+    }
+  }
+}
+
+Dali::AsyncTaskManager::TasksCompletedId AsyncTaskManager::SetCompletedCallback(CallbackBase* callback, Dali::AsyncTaskManager::CompletedCallbackTraceMask mask)
+{
+  // mTasksCompletedImpl will take ownership of callback.
+  Dali::AsyncTaskManager::TasksCompletedId tasksCompletedId = mTasksCompletedImpl->GenerateTasksCompletedId(callback);
+
+  bool taskAdded = false; ///< Flag whether at least one task tracing now.
+
+  // Please be careful the order of mutex, to avoid dead lock.
+  {
+    Mutex::ScopedLock lockWait(mWaitingTasksMutex);
+    {
+      Mutex::ScopedLock lockRunning(mRunningTasksMutex); // We can lock this mutex under mWaitingTasksMutex.
+      {
+        Mutex::ScopedLock lockComplete(mCompletedTasksMutex); // We can lock this mutex under mWaitingTasksMutex and mRunningTasksMutex.
+
+        // Collect all tasks from waiting tasks
+        for(auto& task : mWaitingTasks)
+        {
+          auto checkMask = (task->GetCallbackInvocationThread() == Dali::AsyncTask::ThreadType::MAIN_THREAD ? Dali::AsyncTaskManager::CompletedCallbackTraceMask::THREAD_MASK_MAIN : Dali::AsyncTaskManager::CompletedCallbackTraceMask::THREAD_MASK_WORKER) |
+                           (task->GetPriorityType() == Dali::AsyncTask::PriorityType::HIGH ? Dali::AsyncTaskManager::CompletedCallbackTraceMask::PRIORITY_MASK_HIGH : Dali::AsyncTaskManager::CompletedCallbackTraceMask::PRIORITY_MASK_LOW);
+
+          if((checkMask & mask) == checkMask)
+          {
+            taskAdded = true;
+            mTasksCompletedImpl->AppendTaskTrace(tasksCompletedId, task);
+          }
+        }
+
+        // Collect all tasks from running tasks
+        for(auto& taskPair : mRunningTasks)
+        {
+          // Trace only if it is running now.
+          if(taskPair.second == RunningTaskState::RUNNING)
+          {
+            auto& task      = taskPair.first;
+            auto  checkMask = (task->GetCallbackInvocationThread() == Dali::AsyncTask::ThreadType::MAIN_THREAD ? Dali::AsyncTaskManager::CompletedCallbackTraceMask::THREAD_MASK_MAIN : Dali::AsyncTaskManager::CompletedCallbackTraceMask::THREAD_MASK_WORKER) |
+                             (task->GetPriorityType() == Dali::AsyncTask::PriorityType::HIGH ? Dali::AsyncTaskManager::CompletedCallbackTraceMask::PRIORITY_MASK_HIGH : Dali::AsyncTaskManager::CompletedCallbackTraceMask::PRIORITY_MASK_LOW);
+
+            if((checkMask & mask) == checkMask)
+            {
+              taskAdded = true;
+              mTasksCompletedImpl->AppendTaskTrace(tasksCompletedId, task);
+            }
+          }
+        }
+
+        // Collect all tasks from complete tasks
+        for(auto& taskPair : mCompletedTasks)
+        {
+          // Trace only if it is need callback.
+          // Note : There are two CompletedTaskState::SKIP_CALLBACK cases, worker thread invocation and canceled cases.
+          //        If worker thread invocation, than it already remove trace at completed timing.
+          //        If canceled cases, we don't append trace at running tasks already.
+          //        So, we don't need to trace for SKIP_CALLBACK cases.
+          if(taskPair.second == CompletedTaskState::REQUIRE_CALLBACK)
+          {
+            auto& task      = taskPair.first;
+            auto  checkMask = (task->GetCallbackInvocationThread() == Dali::AsyncTask::ThreadType::MAIN_THREAD ? Dali::AsyncTaskManager::CompletedCallbackTraceMask::THREAD_MASK_MAIN : Dali::AsyncTaskManager::CompletedCallbackTraceMask::THREAD_MASK_WORKER) |
+                             (task->GetPriorityType() == Dali::AsyncTask::PriorityType::HIGH ? Dali::AsyncTaskManager::CompletedCallbackTraceMask::PRIORITY_MASK_HIGH : Dali::AsyncTaskManager::CompletedCallbackTraceMask::PRIORITY_MASK_LOW);
+
+            if((checkMask & mask) == checkMask)
+            {
+              taskAdded = true;
+              mTasksCompletedImpl->AppendTaskTrace(tasksCompletedId, task);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // If there is nothing to check task, just excute callback right now.
+  if(!taskAdded)
+  {
+    mTasksCompletedImpl->CheckTasksCompletedCallbackCompleted(tasksCompletedId);
+  }
+  return tasksCompletedId;
+}
+
+bool AsyncTaskManager::RemoveCompletedCallback(Dali::AsyncTaskManager::TasksCompletedId tasksCompletedId)
+{
+  return mTasksCompletedImpl->RemoveTasksCompleted(tasksCompletedId);
+}
+
+AsyncTaskPtr AsyncTaskManager::PopNextCompletedTask()
+{
+  std::vector<AsyncTaskPtr> ignoredTaskList; ///< To keep asyncTask reference so we can ensure that destructor called out of mutex.
+
+  AsyncTaskPtr nextCompletedTask = nullptr;
+  {
+    // Lock while popping task out from the queue
+    Mutex::ScopedLock lock(mCompletedTasksMutex);
+
+    while(!mCompletedTasks.empty())
+    {
+      auto               next      = mCompletedTasks.begin();
+      AsyncTaskPtr       nextTask  = next->first;
+      CompletedTaskState taskState = next->second;
+      mCompletedTasks.erase(next);
+
+      if(taskState == CompletedTaskState::REQUIRE_CALLBACK)
+      {
+        nextCompletedTask = nextTask;
+        break;
+      }
+
+      ignoredTaskList.push_back(nextTask);
+    }
+  }
+
+  return nextCompletedTask;
+}
+
+void AsyncTaskManager::TaskCompleted()
+{
+  // For UTC, let we complete only 1 task here.
+  if(AsyncTaskPtr task = PopNextCompletedTask())
+  {
+    CallbackBase::Execute(*(task->GetCompletedCallback()), task);
+
+    // Remove TasksCompleted callback trace
+    if(mTasksCompletedImpl->IsTasksCompletedCallbackExist())
+    {
+      mTasksCompletedImpl->RemoveTaskTrace(task);
+    }
+  }
+
+  mTasksCompletedImpl->EmitCompletedTasks();
+}
+
+void AsyncTaskManager::TaskAllCompleted()
+{
+  while(AsyncTaskPtr task = PopNextCompletedTask())
+  {
+    CallbackBase::Execute(*(task->GetCompletedCallback()), task);
+
+    // Remove TasksCompleted callback trace
+    if(mTasksCompletedImpl->IsTasksCompletedCallbackExist())
+    {
+      mTasksCompletedImpl->RemoveTaskTrace(task);
+    }
+  }
+
+  mTasksCompletedImpl->EmitCompletedTasks();
+}
+
+/// Worker thread called
+AsyncTaskPtr AsyncTaskManager::PopNextTaskToProcess()
+{
+  // Lock while popping task out from the queue
+  Mutex::ScopedLock lock(mWaitingTasksMutex);
+
+  // pop out the next task from the queue
+  AsyncTaskPtr nextTask = nullptr;
+
+  for(auto iter = mWaitingTasks.begin(), endIter = mWaitingTasks.end(); iter != endIter; ++iter)
+  {
+    if((*iter)->IsReady())
+    {
+      nextTask = *iter;
+
+      // Add Running queue
+      {
+        // Lock while popping task out from the queue
+        Mutex::ScopedLock lock(mRunningTasksMutex); // We can lock this mutex under mWaitingTasksMutex.
+
+        mRunningTasks.insert(mRunningTasks.end(), std::make_pair(nextTask, RunningTaskState::RUNNING));
+
+        mWaitingTasks.erase(iter);
+      }
+      break;
+    }
+  }
+
+  return nextTask;
+}
+
+/// Worker thread called
+void AsyncTaskManager::CompleteTask(AsyncTaskPtr&& task)
+{
+  bool notify = false;
+
+  if(task)
+  {
+    bool needTrigger = false;
+
+    // Lock while check validation of task.
+    {
+      Mutex::ScopedLock lock(mRunningTasksMutex);
+
+      auto iter = std::find_if(mRunningTasks.begin(), mRunningTasks.end(), [task](const AsyncRunningTaskPair& element) { return element.first == task; });
+      if(iter != mRunningTasks.end())
+      {
+        if(iter->second == RunningTaskState::RUNNING)
+        {
+          // This task is valid.
+          notify = true;
+        }
+      }
+    }
+
+    // We should execute this tasks complete callback out of mutex
+    if(notify && task->GetCallbackInvocationThread() == AsyncTask::ThreadType::WORKER_THREAD)
+    {
+      CallbackBase::Execute(*(task->GetCompletedCallback()), task);
+
+      // We need to remove task trace now.
+      if(mTasksCompletedImpl->IsTasksCompletedCallbackExist())
+      {
+        mTasksCompletedImpl->RemoveTaskTrace(task);
+
+        if(mTasksCompletedImpl->IsExecuteCallbackExist())
+        {
+          // We need to call EmitCompletedTasks(). Trigger main thread.
+          needTrigger = true;
+        }
+      }
+    }
+
+    // Lock while adding task to the queue
+    {
+      Mutex::ScopedLock lock(mRunningTasksMutex);
+
+      auto iter = std::find_if(mRunningTasks.begin(), mRunningTasks.end(), [task](const AsyncRunningTaskPair& element) { return element.first == task; });
+      if(iter != mRunningTasks.end())
+      {
+        // Move task into completed, for ensure that AsyncTask destroy at main thread.
+        {
+          Mutex::ScopedLock lock(mCompletedTasksMutex); // We can lock this mutex under mRunningTasksMutex.
+
+          const bool callbackRequired = notify && (task->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD);
+
+          needTrigger |= callbackRequired;
+
+          mCompletedTasks.insert(mCompletedTasks.end(), std::make_pair(task, callbackRequired ? CompletedTaskState::REQUIRE_CALLBACK : CompletedTaskState::SKIP_CALLBACK));
+
+          mRunningTasks.erase(iter);
+
+          if(!needTrigger)
+          {
+            needTrigger |= (mCompletedTasks.size() >= FORCE_TRIGGER_THRESHOLD);
+          }
+
+          // Now, task is invalidate.
+          task.Reset();
+        }
+      }
+    }
+
+    // Wake up the main thread
+    if(needTrigger)
+    {
+      mTrigger->Trigger();
+    }
+  }
+}
+
+// AsyncTaskManager::TaskHelper
+
+AsyncTaskManager::TaskHelper::TaskHelper(AsyncTaskManager& asyncTaskManager)
+: TaskHelper(std::unique_ptr<AsyncTaskThread>(new AsyncTaskThread(asyncTaskManager)), asyncTaskManager)
+{
+}
+
+AsyncTaskManager::TaskHelper::TaskHelper(TaskHelper&& rhs)
+: TaskHelper(std::move(rhs.mProcessor), rhs.mAsyncTaskManager)
+{
+}
+
+AsyncTaskManager::TaskHelper::TaskHelper(std::unique_ptr<AsyncTaskThread> processor, AsyncTaskManager& asyncTaskManager)
+: mProcessor(std::move(processor)),
+  mAsyncTaskManager(asyncTaskManager)
+{
+}
+
+bool AsyncTaskManager::TaskHelper::Request()
+{
+  return mProcessor->Request();
+}
+
+} // namespace Adaptor
+
+} // namespace Internal
+
+/********************************************************************************/
+/*********************************  PUBLIC CLASS  *******************************/
+/********************************************************************************/
+
+AsyncTaskManager::AsyncTaskManager() = default;
+
+AsyncTaskManager::~AsyncTaskManager() = default;
+
+AsyncTaskManager AsyncTaskManager::Get()
+{
+  return Internal::Adaptor::AsyncTaskManager::Get();
+}
+
+void AsyncTaskManager::AddTask(AsyncTaskPtr task)
+{
+  Internal::Adaptor::GetImplementation(*this).AddTask(task);
+}
+
+void AsyncTaskManager::RemoveTask(AsyncTaskPtr task)
+{
+  Internal::Adaptor::GetImplementation(*this).RemoveTask(task);
+}
+
+AsyncTaskManager::TasksCompletedId AsyncTaskManager::SetCompletedCallback(CallbackBase* callback, AsyncTaskManager::CompletedCallbackTraceMask mask)
+{
+  return Internal::Adaptor::GetImplementation(*this).SetCompletedCallback(callback, mask);
+}
+
+bool AsyncTaskManager::RemoveCompletedCallback(AsyncTaskManager::TasksCompletedId tasksCompletedId)
+{
+  return Internal::Adaptor::GetImplementation(*this).RemoveCompletedCallback(tasksCompletedId);
+}
+
+AsyncTaskManager::AsyncTaskManager(Internal::Adaptor::AsyncTaskManager* impl)
+: BaseHandle(impl)
+{
+}
+
+} // namespace Dali
+
+namespace Test
+{
+namespace AsyncTaskManager
+{
+void DestroyAsyncTaskManager()
+{
+  Dali::Internal::Adaptor::gAsyncTaskManager.Reset();
+}
+
+void ProcessSingleCompletedTask()
+{
+  auto asyncTaskManager = Dali::AsyncTaskManager::Get();
+  Dali::Internal::Adaptor::GetImplementation(asyncTaskManager).TaskCompleted();
+}
+
+void ProcessAllCompletedTask()
+{
+  auto asyncTaskManager = Dali::AsyncTaskManager::Get();
+  Dali::Internal::Adaptor::GetImplementation(asyncTaskManager).TaskAllCompleted();
+}
+} // namespace AsyncTaskManager
+} // namespace Test
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.h
new file mode 100644
index 0000000..875daaf
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-async-task-manager.h
@@ -0,0 +1,39 @@
+#ifndef DALI_TOOLKIT_TOOLKIT_ASYNC_TASK_MANAGER_H
+#define DALI_TOOLKIT_TOOLKIT_ASYNC_TASK_MANAGER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+
+namespace Test
+{
+namespace AsyncTaskManager
+{
+// Destroy global static AsyncTaskManager, only for ~ToolkitApplication()
+void DestroyAsyncTaskManager();
+
+// Execute one completed processes synchronously.
+void ProcessSingleCompletedTasks();
+
+// Execute all completed processes synchronously.
+void ProcessAllCompletedTasks();
+} // namespace AsyncTaskManager
+} // namespace Test
+
+#endif // DALI_TOOLKIT_TOOLKIT_ASYNC_TASK_MANAGER_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
index 56c0cd8..726648a 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  *
  */
 
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/rendering/renderer.h>
 #include <toolkit-application.h>
@@ -39,7 +39,7 @@ class CanvasRenderer: public Dali::BaseObject
 public:
   CanvasRenderer( const Vector2& size )
   : mDrawable(nullptr),
-    mPixelBuffer( Devel::PixelBuffer::New(size.width, size.height, Dali::Pixel::RGBA8888) ),
+    mTexture ( Dali::Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, size.width, size.height ) ),
     mSize(size),
     mViewBox(size)
   {
@@ -59,6 +59,11 @@ public:
      return true;
   }
 
+  Dali::Texture GetRasterizedTexture()
+  {
+    return mTexture;
+  }
+
   bool Rasterize()
   {
      return true;
@@ -97,12 +102,6 @@ public:
     return false;
   }
 
-  Devel::PixelBuffer GetPixelBuffer()
-  {
-    return mPixelBuffer;
-  }
-
-
   bool SetSize(Vector2 size)
   {
     mSize = size;
@@ -137,7 +136,7 @@ public:
 
 public:
    Dali::CanvasRenderer::Drawable* mDrawable;
-   Devel::PixelBuffer mPixelBuffer;
+   Dali::Texture mTexture;
    Vector2 mSize;
    Vector2 mViewBox;
 };
@@ -200,9 +199,9 @@ bool CanvasRenderer::Rasterize()
   return Internal::Adaptor::GetImplementation(*this).Rasterize();
 }
 
-Devel::PixelBuffer CanvasRenderer::GetPixelBuffer()
+Dali::Texture CanvasRenderer::GetRasterizedTexture()
 {
-  return Internal::Adaptor::GetImplementation(*this).GetPixelBuffer();
+  return Internal::Adaptor::GetImplementation(*this).GetRasterizedTexture();
 }
 
 bool CanvasRenderer::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
deleted file mode 100644
index cbfe93e..0000000
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "toolkit-clipboard-event-notifier.h"
-
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
-#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-class ClipboardEventNotifier : public Dali::BaseObject
-{
-public:
-
-  typedef Dali::ClipboardEventNotifier::ClipboardEventSignalType ClipboardEventSignalType;
-
-  // Creation
-  static Dali::ClipboardEventNotifier New();
-  static Dali::ClipboardEventNotifier Get();
-
-  // Public API
-  const std::string& GetContent() const;
-  void SetContent( const std::string& content );
-  void ClearContent();
-  void EmitContentSelectedSignal();
-
-  // Signals
-  ClipboardEventSignalType& ContentSelectedSignal()
-  {
-    return mContentSelectedSignal;
-  }
-
-private:
-  // Construction & Destruction
-  ClipboardEventNotifier();
-  virtual ~ClipboardEventNotifier();
-
-  // Undefined
-  ClipboardEventNotifier( const ClipboardEventNotifier& );
-  ClipboardEventNotifier& operator=( ClipboardEventNotifier& );
-
-private:
-
-  std::string mContent;    ///< The current selected content.
-  ClipboardEventSignalType mContentSelectedSignal;
-
-  static Dali::ClipboardEventNotifier mToolkitClipboardEventNotifier;
-
-public:
-
-  // Helpers for public-api forwarding methods
-
-  inline static Internal::Adaptor::ClipboardEventNotifier& GetImplementation(Dali::ClipboardEventNotifier& detector)
-  {
-    DALI_ASSERT_ALWAYS( detector && "ClipboardEventNotifier handle is empty" );
-
-    BaseObject& handle = detector.GetBaseObject();
-
-    return static_cast<Internal::Adaptor::ClipboardEventNotifier&>(handle);
-  }
-
-  inline static const Internal::Adaptor::ClipboardEventNotifier& GetImplementation(const Dali::ClipboardEventNotifier& detector)
-  {
-    DALI_ASSERT_ALWAYS( detector && "ClipboardEventNotifier handle is empty" );
-
-    const BaseObject& handle = detector.GetBaseObject();
-
-    return static_cast<const Internal::Adaptor::ClipboardEventNotifier&>(handle);
-  }
-
-};
-
-Dali::ClipboardEventNotifier ClipboardEventNotifier::mToolkitClipboardEventNotifier;
-
-Dali::ClipboardEventNotifier ClipboardEventNotifier::New()
-{
-  return Get();
-}
-
-Dali::ClipboardEventNotifier ClipboardEventNotifier::Get()
-{
-  if ( !mToolkitClipboardEventNotifier )
-  {
-    mToolkitClipboardEventNotifier = Dali::ClipboardEventNotifier( new ClipboardEventNotifier );
-  }
-  return mToolkitClipboardEventNotifier;
-}
-
-const std::string& ClipboardEventNotifier::GetContent() const
-{
-  return mContent;
-}
-
-void ClipboardEventNotifier::SetContent( const std::string& content )
-{
-  mContent = content;
-}
-
-void ClipboardEventNotifier::ClearContent()
-{
-  mContent.clear();
-}
-
-void ClipboardEventNotifier::EmitContentSelectedSignal()
-{
-  if ( !mContentSelectedSignal.Empty() )
-  {
-    Dali::ClipboardEventNotifier handle( this );
-    mContentSelectedSignal.Emit( handle );
-  }
-}
-
-ClipboardEventNotifier::ClipboardEventNotifier()
-: mContent()
-{
-}
-
-ClipboardEventNotifier::~ClipboardEventNotifier()
-{
-}
-
-} // namespace Adaptor
-} // namespace Internal
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-ClipboardEventNotifier::ClipboardEventNotifier()
-{
-}
-
-ClipboardEventNotifier ClipboardEventNotifier::Get()
-{
-  return Internal::Adaptor::ClipboardEventNotifier::Get();
-}
-
-ClipboardEventNotifier::~ClipboardEventNotifier()
-{
-}
-
-const std::string& ClipboardEventNotifier::GetContent() const
-{
-  return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).GetContent();
-}
-
-void ClipboardEventNotifier::SetContent( const std::string& content )
-{
-  Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).SetContent(content);
-}
-
-void ClipboardEventNotifier::ClearContent()
-{
-  Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ClearContent();
-}
-
-void ClipboardEventNotifier::EmitContentSelectedSignal()
-{
-  Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal();
-}
-
-ClipboardEventNotifier::ClipboardEventSignalType& ClipboardEventNotifier::ContentSelectedSignal()
-{
-  return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal();
-}
-
-ClipboardEventNotifier::ClipboardEventNotifier( Internal::Adaptor::ClipboardEventNotifier* notifier )
-: BaseHandle( notifier )
-{
-}
-
-} // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
deleted file mode 100644
index 282a0c0..0000000
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H
-#define DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H
-
-/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <string>
-
-// PUBLIC INCLUDES
-#define DALI_CLIPBOARD_EVENT_NOTIFIER_H
-#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal.h>
-
-
-namespace Dali
-{
-
-namespace Internal
-{
-namespace Adaptor
-{
-class ClipboardEventNotifier;
-}
-}
-
-class ClipboardEventNotifier : public BaseHandle
-{
-public:
-  typedef Signal< void ( ClipboardEventNotifier& ) > ClipboardEventSignalType;
-
-  ClipboardEventNotifier();
-  static ClipboardEventNotifier Get();
-  ~ClipboardEventNotifier();
-
-  const std::string& GetContent() const;
-  void SetContent( const std::string& content );
-  void ClearContent();
-
-  void EmitContentSelectedSignal();
-  ClipboardEventSignalType& ContentSelectedSignal();
-
-  ClipboardEventNotifier( Internal::Adaptor::ClipboardEventNotifier* notifier );
-};
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
index 1d06f25..39d04e3 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
@@ -19,7 +19,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>
-#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
 
 namespace Dali
 {
@@ -31,7 +30,7 @@ namespace Adaptor
 {
 
 /**
- * Implementation of the Clip Board
+ * Implementation of the Clipboard
  */
 
 class Clipboard :  public Dali::BaseObject
@@ -51,19 +50,34 @@ public:
   virtual ~Clipboard();
 
   /**
-   * @copydoc Dali::Clipboard::SetItem()
+   * @copydoc Dali::Clipboard::IsAvailable()
    */
-  bool SetItem(const std::string &itemData);
+  static bool IsAvailable();
 
   /**
-   * @copydoc Dali::Clipboard::RequestItem()
+   * @copydoc Dali::Clipboard::DataSentSignal()
    */
-  void RequestItem();
+  Dali::Clipboard::DataSentSignalType& DataSentSignal();
+
+  /**
+   * @copydoc Dali::Clipboard::DataReceivedSignal()
+   */
+  Dali::Clipboard::DataReceivedSignalType& DataReceivedSignal();
+
+  /**
+   * @copydoc Dali::Clipboard::SetData()
+   */
+  bool SetData(const Dali::Clipboard::ClipData& clipData);
+
+  /**
+   * @copydoc Dali::Clipboard::GetData()
+   */
+  uint32_t GetData(const std::string &mimeType);
 
   /**
    * @copydoc Dali::Clipboard::NumberOfClipboardItems()
    */
-  unsigned int NumberOfItems();
+  size_t NumberOfItems();
 
   /**
    * @copydoc Dali::Clipboard::ShowClipboard()
@@ -85,9 +99,15 @@ private:
   Clipboard& operator=( Clipboard& );
 
   static Dali::Clipboard mToolkitClipboard;
-  bool mVisible;
-  std::string mItem;
-  int mCount;
+
+  bool        mVisible;
+  std::string mMimeType;
+  std::string mData;
+  uint32_t    mDataId{0};
+  size_t      mCount;
+
+  Dali::Clipboard::DataSentSignalType     mDataSentSignal;
+  Dali::Clipboard::DataReceivedSignalType mDataReceivedSignal;
 }; // class clipboard
 
 
@@ -97,7 +117,7 @@ Dali::Clipboard Dali::Internal::Adaptor::Clipboard::mToolkitClipboard;
 Clipboard::Clipboard()
 {
   mVisible = false;
-  mCount = 0;
+  mCount = 0u;
 }
 
 Clipboard::~Clipboard()
@@ -106,31 +126,60 @@ Clipboard::~Clipboard()
 
 Dali::Clipboard Clipboard::Get()
 {
-  if( ! mToolkitClipboard )
+  if(!mToolkitClipboard)
   {
-    mToolkitClipboard = Dali::Clipboard( new Dali::Internal::Adaptor::Clipboard() );
+    mToolkitClipboard = Dali::Clipboard(new Dali::Internal::Adaptor::Clipboard());
   }
   return mToolkitClipboard;
 }
 
-bool Clipboard::SetItem(const std::string &itemData )
+bool Clipboard::IsAvailable()
+{
+  if(mToolkitClipboard)
+  {
+    return true;
+  }
+  return false;
+}
+
+Dali::Clipboard::DataSentSignalType& Clipboard::DataSentSignal()
 {
-  mItem = itemData;
-  mCount = 1;
+  return mDataSentSignal;
+}
+
+Dali::Clipboard::DataReceivedSignalType& Clipboard::DataReceivedSignal()
+{
+  return mDataReceivedSignal;
+}
+
+bool Clipboard::SetData(const Dali::Clipboard::ClipData& clipData)
+{
+  mMimeType = clipData.GetMimeType();
+  mData     = clipData.GetData();
+  mCount    = 1u;
+
+  if(mData.empty())
+  {
+    return false;
+  }
+
+  mDataSentSignal.Emit(mMimeType.c_str(), mData.c_str());
+
   return true;
 }
 
-void Clipboard::RequestItem()
+uint32_t Clipboard::GetData(const std::string &mimeType)
 {
-  Dali::ClipboardEventNotifier clipboardEventNotifier(Dali::ClipboardEventNotifier::Get());
-  if ( clipboardEventNotifier )
+  if(!mMimeType.compare(mimeType.c_str()))
   {
-    clipboardEventNotifier.SetContent( mItem );
-    clipboardEventNotifier.EmitContentSelectedSignal();
+    mDataId++;
+    mDataReceivedSignal.Emit(mDataId, mMimeType.c_str(), mData.c_str());
+    return mDataId;
   }
+  return 0u;
 }
 
-unsigned int Clipboard::NumberOfItems()
+size_t Clipboard::NumberOfItems()
 {
   return mCount;
 }
@@ -187,17 +236,8 @@ Clipboard Clipboard::Get()
 {
   return Internal::Adaptor::Clipboard::Get();
 }
-bool Clipboard::SetItem( const std::string &itemData)
-{
-  return GetImplementation(*this).SetItem( itemData );
-}
-
-void Clipboard::RequestItem()
-{
-  GetImplementation(*this).RequestItem();
-}
 
-unsigned int Clipboard::NumberOfItems()
+size_t Clipboard::NumberOfItems()
 {
   return GetImplementation(*this).NumberOfItems();
 }
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
index ad532cd..7ad3187 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
@@ -23,6 +23,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali DALI_IMPORT_API
 {
@@ -44,6 +45,45 @@ class Clipboard : public BaseHandle
 {
 public:
   /**
+   * @brief Structure that contains information about the clipboard data information.
+   */
+  struct ClipData
+  {
+    ClipData(const char* mimeType = nullptr, const char* data = nullptr)
+    {
+      this->mimeType = mimeType;
+      this->data     = data;
+    }
+    void SetMimeType(const char* mimeType)
+    {
+      this->mimeType = mimeType;
+    }
+    const char* GetMimeType() const
+    {
+      return mimeType;
+    }
+    void SetData(const char* data)
+    {
+      this->data = data;
+    }
+    const char* GetData() const
+    {
+      return data;
+    }
+
+  private:
+    const char* mimeType {nullptr}; ///< The mime type of clip data.
+    const char* data {nullptr};     ///< The clip data.
+  };
+
+  /// @brief Data send completed signal.
+  typedef Signal<void(const char*, const char*)> DataSentSignalType;
+
+  /// @brief Data receive completed signal.
+  typedef Signal<void(uint32_t, const char*, const char*)> DataReceivedSignalType;
+
+
+  /**
    * Create an uninitialized Clipboard;
    *  this can be initialized with one of the derived Clipboard' New() methods
    */
@@ -58,7 +98,7 @@ public:
    * This constructor is used by Adaptor::GetClipboard().
    * @param[in] clipboard A pointer to the clipboard.
    */
-  Clipboard( Internal::Adaptor::Clipboard* clipboard );
+  Clipboard(Internal::Adaptor::Clipboard* clipboard);
 
   /**
    * Retrieve a handle to the ClipboardEventNotifier instance
@@ -67,22 +107,48 @@ public:
   static Clipboard Get();
 
   /**
-   * Send the given string to the clipboard
-   * @param[in] itemData string to send to clip board
-   * @return bool true if the internal clip board sending was successful.
+   * @brief Checks whether the clipboard is available.
+   * @return true, if it is available, false otherwise.
+   */
+  static bool IsAvailable();
+
+  /**
+   * @brief This signal is emitted when the data send complete.
+   * @note
+   * SetData() opertion does not follow a synchronous call.
+   * It follows the sequence below.
+   * SetData() -> EcoreEventDataSend() -> SendData() -> DataSentSignal() Emit
+   */
+  DataSentSignalType& DataSentSignal();
+
+  /**
+   * @brief This signal is emitted when the data receive complete.
+   * @note
+   * GetData() opertion does not follow a synchronous call.
+   * It follows the sequence below.
+   * GetData() -> EcoreEventOfferDataReady() -> ReceiveData() -> DataReceivedSignal() Emit
+   */
+  DataReceivedSignalType& DataReceivedSignal();
+
+  /**
+   * @brief Send the given data to the clipboard.
+   * @param[in] clipData data to send to the clipboard
+   * @return bool true if the internal clipboard sending was successful.
    */
-  bool SetItem( const std::string& itemData );
+  bool SetData(const ClipData& clipData);
 
   /**
-   * Request clipboard service to retrieve an item
+   * @brief Request data from the clipboard.
+   * @param[in] mimeType mime type of data to request.
+   * @return uint32_t Returns the data request id.
    */
-  void RequestItem();
+  uint32_t GetData(const std::string& mimeType);
 
   /**
-   * Returns the number of item currently in the clipboard
-   * @return unsigned int number of clipboard items
+   * @brief Returns the number of item currently in the clipboard.
+   * @return size_t number of clipboard items.
    */
-  unsigned int NumberOfItems();
+  size_t NumberOfItems();
 
   /**
    * Show the clipboard window
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-direct-rendering-egl.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-direct-rendering-egl.cpp
new file mode 100644
index 0000000..198c849
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-direct-rendering-egl.cpp
@@ -0,0 +1,138 @@
+/*
+* Copyright (c) 2023 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+#include <EGL/egl.h>
+#include <GLES3/gl3.h>
+extern "C"
+{
+  // Flag to be set when we want shader compilation fail
+  bool gDirectRenderingFailCreateShader = false;
+
+  // Flag to be set when we want program linking fail
+  bool gDirectRenderingFailCreateProgram = false;
+
+  /**
+ * To test the multithreaded variant we need override EGL api
+ *
+ * The Direct Rendering uses GL directly and it's needed to override certain funtions in order
+ * to force code execution.
+ */
+  EGLContext eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list)
+  {
+    return EGLContext(0x12345678);
+  }
+
+  EGLBoolean eglGetConfigs(EGLDisplay dpy, EGLConfig* configs, EGLint config_size, EGLint* num_config)
+  {
+    static EGLConfig config;
+    if(num_config)
+    {
+      *num_config = 1;
+    }
+    if(configs)
+    {
+      configs[0] = config;
+    }
+
+    return EGL_TRUE;
+  }
+
+  GLuint glCreateProgram(void)
+  {
+    static uint32_t programId = 1;
+    return programId++;
+  }
+
+  GLuint glCreateShader(GLenum type)
+  {
+    static uint32_t shaderId = 1;
+    return shaderId++;
+  }
+
+  void glCompileShader(GLuint shader)
+  {
+  }
+
+  void glLinkProgram(GLuint program)
+  {
+  }
+
+  void glGenTextures(GLsizei n, GLuint* textures)
+  {
+    static GLuint texId = 1u;
+    for(auto i = 0; i < n; ++i)
+    {
+      textures[i] = texId++;
+    }
+  }
+
+  void glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
+  {
+    if(pname == GL_COMPILE_STATUS)
+    {
+      params[0] = gDirectRenderingFailCreateShader ? GL_FALSE : GL_TRUE;
+    }
+    else if(pname == GL_INFO_LOG_LENGTH)
+    {
+      params[0] = 4;
+    }
+  }
+
+  void glGetProgramiv(GLuint shader, GLenum pname, GLint* params)
+  {
+    if(pname == GL_LINK_STATUS)
+    {
+      params[0] = gDirectRenderingFailCreateProgram ? GL_FALSE : GL_TRUE;
+    }
+    else if(pname == GL_INFO_LOG_LENGTH)
+    {
+      params[0] = 4;
+    }
+  }
+
+  void glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog)
+  {
+    infoLog[0] = '0';
+    infoLog[1] = '\n';
+  }
+
+  void glGetProgramInfoLog(GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog)
+  {
+    infoLog[0] = '0';
+    infoLog[1] = '\n';
+  }
+
+  void glDeleteSync(GLsync sync)
+  {
+  }
+
+  GLenum glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
+  {
+    return GL_CONDITION_SATISFIED;
+  }
+
+  GLsync glFenceSync(GLenum condition, GLbitfield flags)
+  {
+    static uint32_t syncId = 0;
+    return reinterpret_cast<GLsync>(++syncId);
+  }
+
+  GLenum glCheckFramebufferStatus(GLenum target)
+  {
+    return GL_FRAMEBUFFER_COMPLETE;
+  }
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
index f02bfb4..3bd51bc 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,34 +18,31 @@
 #include "toolkit-environment-variable.h"
 
 // EXTERNAL INCLUDE
-#include <cstddef>
+#include <map>
+#include <string>
 
 namespace Dali
 {
-
 namespace EnvironmentVariable
 {
-
 namespace
 {
-const char * gReturnValue = NULL;
-}
+std::map<std::string, std::string> gEnvironmentVariables;
+} // namespace
 
-const char * GetEnvironmentVariable( const char * variable )
+const char* GetEnvironmentVariable(const char* variable)
 {
-  return gReturnValue;
+  auto value = gEnvironmentVariables.find(variable);
+  if(value != gEnvironmentVariables.end())
+  {
+    return value->second.c_str();
+  }
+  return nullptr;
 }
 
-void SetTestingEnvironmentVariable( bool testing)
+void SetTestEnvironmentVariable(const char* variable, const char* value)
 {
-  if( testing )
-  {
-    gReturnValue = "1";
-  }
-  else
-  {
-    gReturnValue = NULL;
-  }
+  gEnvironmentVariables[variable] = value;
 }
 
 } // namespace EnvironmentVariable
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h
index b1ebae0..96c9c88 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,17 +23,14 @@
 
 namespace Dali
 {
-
 namespace EnvironmentVariable
 {
+const char* GetEnvironmentVariable(const char* variable);
 
-const char * GetEnvironmentVariable( const char * variable );
-
-void SetTestingEnvironmentVariable( bool );
+void SetTestEnvironmentVariable(const char* variable, const char* value);
 
 } // namespace EnvironmentVariable
 
 } // namespace Dali
 
-
 #endif // DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
index 02f3d8f..c85110a 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
@@ -18,15 +18,15 @@
 #include "toolkit-event-thread-callback.h"
 
 // EXTERNAL INCLUDES
-#include <cstddef>
-#include <semaphore.h>
 #include <math.h>
-#include <ctime>
+#include <semaphore.h>
+#include <unistd.h>
+#include <algorithm>
 #include <climits>
+#include <cstddef>
 #include <cstdio>
-#include <unistd.h>
+#include <ctime>
 #include <vector>
-#include <algorithm>
 
 namespace
 {
@@ -34,23 +34,21 @@ namespace
 // triggers from multiple threads - they should all be created on
 // event thread.
 std::vector<Dali::EventThreadCallback*> gEventThreadCallbacks;
-}
-
+} // namespace
 
 namespace Dali
 {
-
 struct EventThreadCallback::Impl
 {
   CallbackBase* callback;
-  sem_t mySemaphore;
+  sem_t         mySemaphore;
 };
 
-EventThreadCallback::EventThreadCallback( CallbackBase* callback )
-: mImpl( new Impl() )
+EventThreadCallback::EventThreadCallback(CallbackBase* callback)
+: mImpl(new Impl())
 {
   mImpl->callback = callback;
-  sem_init( &(mImpl->mySemaphore), 0, 0 );
+  sem_init(&(mImpl->mySemaphore), 0, 0);
 
   gEventThreadCallbacks.push_back(this);
 }
@@ -59,7 +57,7 @@ EventThreadCallback::~EventThreadCallback()
 {
   std::vector<EventThreadCallback*>::iterator iter =
     std::find(gEventThreadCallbacks.begin(), gEventThreadCallbacks.end(), this);
-  if( iter != gEventThreadCallbacks.end() )
+  if(iter != gEventThreadCallbacks.end())
   {
     gEventThreadCallbacks.erase(iter);
   }
@@ -68,15 +66,15 @@ EventThreadCallback::~EventThreadCallback()
 
 void EventThreadCallback::Trigger()
 {
-  sem_post( &(mImpl->mySemaphore) );
+  sem_post(&(mImpl->mySemaphore));
 }
 
 // returns true if timed out rather than triggered
 bool EventThreadCallback::WaitingForTrigger()
 {
   struct timespec now;
-  clock_gettime( CLOCK_REALTIME, &now );
-  if( now.tv_nsec < 999900000 ) // 999, 900, 000
+  clock_gettime(CLOCK_REALTIME, &now);
+  if(now.tv_nsec < 999900000) // 999, 900, 000
     now.tv_nsec += 1000;
   else
   {
@@ -84,7 +82,7 @@ bool EventThreadCallback::WaitingForTrigger()
     now.tv_nsec = 0;
   }
 
-  int error = sem_timedwait( &(mImpl->mySemaphore), &now );
+  int error = sem_timedwait(&(mImpl->mySemaphore), &now);
   return error != 0; // true if timeout
 }
 
@@ -93,57 +91,59 @@ CallbackBase* EventThreadCallback::GetCallback()
   return mImpl->callback;
 }
 
-}
-
+} // namespace Dali
 
 namespace Test
 {
-
-bool WaitForEventThreadTrigger( int triggerCount, int timeoutInSeconds )
+bool WaitForEventThreadTrigger(int triggerCount, int timeoutInSeconds, int executeCallbacks)
 {
   struct timespec startTime;
   struct timespec now;
-  clock_gettime( CLOCK_REALTIME, &startTime );
-  now.tv_sec = startTime.tv_sec;
+  clock_gettime(CLOCK_REALTIME, &startTime);
+  now.tv_sec  = startTime.tv_sec;
   now.tv_nsec = startTime.tv_nsec;
 
   // Round robin poll of each semaphore:
-  while ( triggerCount > 0 )
+  while(triggerCount > 0)
   {
-    if( gEventThreadCallbacks.size() > 0 )
+    if(gEventThreadCallbacks.size() > 0)
     {
-      for( std::vector<Dali::EventThreadCallback*>::iterator iter = gEventThreadCallbacks.begin();
-           iter != gEventThreadCallbacks.end(); ++iter )
+      for(std::vector<Dali::EventThreadCallback*>::iterator iter = gEventThreadCallbacks.begin();
+          iter != gEventThreadCallbacks.end();
+          ++iter)
       {
         Dali::EventThreadCallback* eventTrigger = (*iter);
-        Dali::CallbackBase* callback = eventTrigger->GetCallback();
-        bool timedout = eventTrigger->WaitingForTrigger();
-        if( ! timedout )
+        Dali::CallbackBase*        callback     = eventTrigger->GetCallback();
+        bool                       timedout     = eventTrigger->WaitingForTrigger();
+        if(!timedout)
         {
-          // Semaphore was unlocked - execute the trigger
-          Dali::CallbackBase::Execute( *callback );
+          if(executeCallbacks)
+          {
+            // Semaphore was unlocked - execute the trigger
+            Dali::CallbackBase::Execute(*callback);
+          }
           triggerCount--;
         }
-        if( triggerCount <= 0 )
+        if(triggerCount <= 0)
         {
           break;
         }
       }
     }
-    clock_gettime( CLOCK_REALTIME, &now );
-    if( now.tv_sec - startTime.tv_sec > timeoutInSeconds )
+    clock_gettime(CLOCK_REALTIME, &now);
+    if(now.tv_sec - startTime.tv_sec > timeoutInSeconds)
     {
       // Ensure we break out of the loop if elapsed time has passed
       break;
     }
   }
 
-  clock_gettime( CLOCK_REALTIME, &now );
-  if( now.tv_sec > startTime.tv_sec + 1 )
+  clock_gettime(CLOCK_REALTIME, &now);
+  if(now.tv_sec > startTime.tv_sec + 1)
   {
-    fprintf(stderr, "WaitForEventThreadTrigger took %ld seconds\n", now.tv_sec - startTime.tv_sec );
+    fprintf(stderr, "WaitForEventThreadTrigger took %ld seconds\n", now.tv_sec - startTime.tv_sec);
   }
   return triggerCount == 0;
 }
 
-}
+} // namespace Test
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h
index 9693e6e..6541b3e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,10 @@
 
 namespace Dali
 {
-
 class DALI_TOOLKIT_API EventThreadCallback
 {
 public:
-
-  EventThreadCallback( CallbackBase* callback );
+  EventThreadCallback(CallbackBase* callback);
 
   ~EventThreadCallback();
 
@@ -41,24 +39,21 @@ public:
   CallbackBase* GetCallback();
 
 private:
-
   // undefined copy constructor.
-  EventThreadCallback( const EventThreadCallback& );
+  EventThreadCallback(const EventThreadCallback&);
 
   // undefined assignment operator
-  EventThreadCallback& operator=( const EventThreadCallback& );
+  EventThreadCallback& operator=(const EventThreadCallback&);
 
 private:
-
   struct Impl;
   Impl* mImpl;
 };
 
-}
+} // namespace Dali
 
 namespace Test
 {
-
 /**
  * Wait for the tested code to create an event trigger, then
  * wait for triggerCount Trigger calls to occur, and execute the trigger
@@ -66,9 +61,8 @@ namespace Test
  *
  * Will wait for a maximum of 30s before failing the test and returning.
  */
-bool WaitForEventThreadTrigger( int triggerCount, int timeoutInSeconds=30 );
-
-}
+bool WaitForEventThreadTrigger(int triggerCount, int timeoutInSeconds = 30, int executeCallbacks = true);
 
+} // namespace Test
 
 #endif // DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h
index d53e02a..deb9a2d 100755
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h
@@ -60,12 +60,13 @@ public:
    */
   enum EventType
   {
-    VOID,                ///< No event
-    PRE_EDIT,             ///< Pre-Edit changed
-    COMMIT,              ///< Commit recieved
-    DELETE_SURROUNDING,   ///< Event to delete a range of characters from the string
-    GET_SURROUNDING,      ///< Event to query string and cursor position
-    PRIVATE_COMMAND       ///< Private command sent from the input panel
+    VOID,               ///< No event
+    PRE_EDIT,           ///< Pre-Edit changed
+    COMMIT,             ///< Commit recieved
+    DELETE_SURROUNDING, ///< Event to delete a range of characters from the string
+    GET_SURROUNDING,    ///< Event to query string and cursor position
+    PRIVATE_COMMAND,    ///< Private command sent from the input panel
+    SELECTION_SET       ///< input method needs to set the selection
   };
 
   /**
@@ -141,7 +142,9 @@ public:
     : predictiveString(),
       eventName( VOID ),
       cursorOffset( 0 ),
-      numberOfChars ( 0 )
+      numberOfChars ( 0 ),
+      startIndex ( 0 ),
+      endIndex ( 0 )
     {
     };
 
@@ -157,15 +160,36 @@ public:
     : predictiveString( aPredictiveString ),
       eventName( aEventName ),
       cursorOffset( aCursorOffset ),
-      numberOfChars( aNumberOfChars )
+      numberOfChars( aNumberOfChars ),
+      startIndex ( 0 ),
+      endIndex ( 0 )
+    {
+    }
+
+    /**
+     * @brief Constructor
+     *
+     * @param[in] aEventName The name of the event from the InputMethodContext.
+     * @param[in] aStartIndex The start index of selection.
+     * @param[in] aEndIndex The end index of selection.
+     */
+    EventData(EventType aEventName, int aStartIndex, int aEndIndex)
+    : predictiveString(),
+      eventName(aEventName),
+      cursorOffset(0),
+      numberOfChars(0),
+      startIndex(aStartIndex),
+      endIndex(aEndIndex)
     {
     }
 
     // Data
     std::string predictiveString; ///< The pre-edit or commit string.
-    EventType eventName;           ///< The name of the event from the input method context.
+    EventType eventName;          ///< The name of the event from the input method context.
     int cursorOffset;             ///< Start position from the current cursor position to start deleting characters.
     int numberOfChars;            ///< number of characters to delete from the cursorOffset.
+    int startIndex;               ///< The start index of selection.
+    int endIndex;                 ///< The end index of selection.
   };
 
   /**
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp
index 1e29a1c..e05f9f7 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 
 namespace Dali
 {
-
 /********************************************************************************
  * Stub for Dali::Internal::Adaptor::LifecycleController
  ********************************************************************************/
@@ -34,18 +33,18 @@ namespace Adaptor
 class LifecycleController : public BaseObject
 {
 public: // Creation & Destruction
-
   LifecycleController();
   ~LifecycleController();
   static Dali::LifecycleController Get();
 
-
 public: // Signals
   Dali::LifecycleController::LifecycleSignalType& InitSignal();
+  Dali::LifecycleController::LifecycleSignalType& TerminateSignal();
 
 private:
   Dali::LifecycleController::LifecycleSignalType mInitSignal;
-  static Dali::LifecycleController mLifecycleController;
+  Dali::LifecycleController::LifecycleSignalType mTerminateSignal;
+  static Dali::LifecycleController               mLifecycleController;
 };
 
 Dali::LifecycleController LifecycleController::mLifecycleController;
@@ -60,7 +59,7 @@ LifecycleController::~LifecycleController()
 
 Dali::LifecycleController LifecycleController::Get()
 {
-  if( ! mLifecycleController )
+  if(!mLifecycleController)
   {
     mLifecycleController = Dali::LifecycleController(new Internal::Adaptor::LifecycleController());
   }
@@ -72,16 +71,24 @@ Dali::LifecycleController::LifecycleSignalType& LifecycleController::InitSignal(
   return mInitSignal;
 }
 
+Dali::LifecycleController::LifecycleSignalType& LifecycleController::TerminateSignal()
+{
+  return mTerminateSignal;
+}
+
 } // namespace Adaptor
 } // namespace Internal
 
-
 /********************************************************************************
  * Stub for Dali::LifecycleController
  ********************************************************************************/
 
-LifecycleController::LifecycleController(){}
-LifecycleController::~LifecycleController(){}
+LifecycleController::LifecycleController()
+{
+}
+LifecycleController::~LifecycleController()
+{
+}
 
 LifecycleController LifecycleController::Get()
 {
@@ -92,12 +99,19 @@ LifecycleController LifecycleController::Get()
 
 LifecycleController::LifecycleSignalType& LifecycleController::InitSignal()
 {
-  BaseObject& object = GetBaseObject();
-  Internal::Adaptor::LifecycleController& controller = static_cast< Internal::Adaptor::LifecycleController& >( object );
+  BaseObject&                             object     = GetBaseObject();
+  Internal::Adaptor::LifecycleController& controller = static_cast<Internal::Adaptor::LifecycleController&>(object);
   return controller.InitSignal();
 }
 
-LifecycleController::LifecycleController( Internal::Adaptor::LifecycleController *impl )
+LifecycleController::LifecycleSignalType& LifecycleController::TerminateSignal()
+{
+  BaseObject&                             object     = GetBaseObject();
+  Internal::Adaptor::LifecycleController& controller = static_cast<Internal::Adaptor::LifecycleController&>(object);
+  return controller.TerminateSignal();
+}
+
+LifecycleController::LifecycleController(Internal::Adaptor::LifecycleController* impl)
 : BaseHandle(impl)
 {
 }
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.h
index 3069b15..ec3c64ec 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-lifecycle-controller.h
@@ -2,7 +2,7 @@
 #define TOOLKIT_LIFECYCLE_CONTROLLER_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
  */
 
 // EXTERNAL INCLUDES
-#include <string>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal.h>
+#include <string>
 
 namespace Dali
 {
@@ -31,20 +31,20 @@ namespace Adaptor
 {
 class LifecycleController;
 }
-}
+} // namespace Internal
 
 class LifecycleController : public BaseHandle
 {
 public:
-  typedef Signal< void (void) > LifecycleSignalType;
+  typedef Signal<void(void)> LifecycleSignalType;
   LifecycleController();
   ~LifecycleController();
   static LifecycleController Get();
-  LifecycleSignalType& InitSignal();
-  LifecycleController( Internal::Adaptor::LifecycleController* impl );
+  LifecycleSignalType&       InitSignal();
+  LifecycleSignalType&       TerminateSignal();
+  LifecycleController(Internal::Adaptor::LifecycleController* impl);
 };
 
-
 } // namespace Dali
 
 #endif // TOOLKIT_LIFECYCLE_CONTROLLER_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
index fb67a4b..42050e4 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
@@ -71,7 +71,9 @@ public:
 
   Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; };
 
-  int GetOrientation() const override {return 0;};
+  int GetSurfaceOrientation() const override {return 0;};
+
+  int GetScreenOrientation() const override {return 0;};
 
   void SetBackgroundColor( Vector4 color ) {};
 
@@ -119,10 +121,14 @@ public:
 
   Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal();
 
+  Dali::Integration::SceneHolder::WheelEventGeneratedSignalType& WheelEventGeneratedSignal();
+
   Integration::Scene GetScene();
 
   Dali::RenderSurfaceInterface& GetRenderSurface();
 
+  Dali::RenderTaskList GetRenderTaskList();
+
 protected:
 
   TestRenderSurface mRenderSurface;
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
index e18809a..22a027b 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  *
  */
 
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/adaptor-framework/scene-holder.h>
+#include <dali/integration-api/events/touch-event-integ.h>
 
 #include <toolkit-scene-holder-impl.h>
 
@@ -25,13 +25,13 @@
 #include <dali/public-api/object/base-object.h>
 
 #include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 #include <toolkit-adaptor-impl.h>
 
 using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
 
 namespace Dali
 {
-
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Dali::Internal::Adaptor::SceneHolder Stub
@@ -40,32 +40,30 @@ namespace Dali
 
 namespace Internal
 {
-
 namespace Adaptor
 {
-
-SceneHolder::SceneHolder( const Dali::Rect<int>& positionSize )
-: mRenderSurface( positionSize ),
-  mScene( Dali::Integration::Scene::New( Dali::Size( static_cast<float>( positionSize.width ), static_cast<float>( positionSize.height ) ) ) )
+SceneHolder::SceneHolder(const Dali::Rect<int>& positionSize)
+: mRenderSurface(positionSize),
+  mScene(Dali::Integration::Scene::New(Dali::Size(static_cast<float>(positionSize.width), static_cast<float>(positionSize.height))))
 {
 }
 
 SceneHolder::~SceneHolder()
 {
-  if ( Dali::Adaptor::IsAvailable() )
+  if(Dali::Adaptor::IsAvailable())
   {
-    AdaptorImpl::GetImpl( AdaptorImpl::Get() ).RemoveWindow( this );
+    AdaptorImpl::GetImpl(AdaptorImpl::Get()).RemoveWindow(this);
   }
 }
 
-void SceneHolder::Add( Dali::Actor actor )
+void SceneHolder::Add(Dali::Actor actor)
 {
-  mScene.Add( actor );
+  mScene.Add(actor);
 }
 
-void SceneHolder::Remove( Dali::Actor actor )
+void SceneHolder::Remove(Dali::Actor actor)
 {
-  mScene.Remove( actor );
+  mScene.Remove(actor);
 }
 
 Dali::Layer SceneHolder::GetRootLayer() const
@@ -73,9 +71,9 @@ Dali::Layer SceneHolder::GetRootLayer() const
   return mScene.GetRootLayer();
 }
 
-void SceneHolder::SetBackgroundColor( Vector4 color )
+void SceneHolder::SetBackgroundColor(Vector4 color)
 {
-  return mScene.SetBackgroundColor( color );
+  return mScene.SetBackgroundColor(color);
 }
 
 Vector4 SceneHolder::GetBackgroundColor() const
@@ -83,15 +81,15 @@ Vector4 SceneHolder::GetBackgroundColor() const
   return mScene.GetBackgroundColor();
 }
 
-void SceneHolder::FeedTouchPoint( Dali::TouchPoint& point, int timeStamp )
+void SceneHolder::FeedTouchPoint(Dali::TouchPoint& point, int timeStamp)
 {
 }
 
-void SceneHolder::FeedWheelEvent( Dali::WheelEvent& wheelEvent )
+void SceneHolder::FeedWheelEvent(Dali::WheelEvent& wheelEvent)
 {
 }
 
-void SceneHolder::FeedKeyEvent( Dali::KeyEvent& keyEvent )
+void SceneHolder::FeedKeyEvent(Dali::KeyEvent& keyEvent)
 {
 }
 
@@ -115,6 +113,11 @@ Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSig
   return mScene.WheelEventSignal();
 }
 
+Dali::Integration::SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal()
+{
+  return mScene.WheelEventGeneratedSignal();
+}
+
 Integration::Scene SceneHolder::GetScene()
 {
   return mScene;
@@ -125,6 +128,11 @@ Dali::RenderSurfaceInterface& SceneHolder::GetRenderSurface()
   return mRenderSurface;
 }
 
+Dali::RenderTaskList SceneHolder::GetRenderTaskList()
+{
+  return mScene.GetRenderTaskList();
+}
+
 } // namespace Adaptor
 
 } // namespace Internal
@@ -137,7 +145,6 @@ Dali::RenderSurfaceInterface& SceneHolder::GetRenderSurface()
 
 namespace Integration
 {
-
 SceneHolder::SceneHolder()
 {
   // Dali::Internal::Adaptor::Adaptor::Get().WindowCreatedSignal().Emit( *this );
@@ -147,94 +154,104 @@ SceneHolder::~SceneHolder()
 {
 }
 
-SceneHolder::SceneHolder( const SceneHolder& handle )
+SceneHolder::SceneHolder(const SceneHolder& handle)
 : BaseHandle(handle)
 {
 }
 
-SceneHolder::SceneHolder( Internal::Adaptor::SceneHolder* internal )
+SceneHolder::SceneHolder(Internal::Adaptor::SceneHolder* internal)
 : BaseHandle(internal)
 {
 }
 
-SceneHolder& SceneHolder::operator=( const SceneHolder& rhs )
+SceneHolder& SceneHolder::operator=(const SceneHolder& rhs)
 {
   BaseHandle::operator=(rhs);
   return *this;
 }
 
-Dali::Integration::SceneHolder SceneHolder::Get( Dali::Actor actor )
+Dali::Integration::SceneHolder SceneHolder::Get(Dali::Actor actor)
 {
   Internal::Adaptor::SceneHolder* sceneHolderImpl = nullptr;
 
-  if ( Dali::Adaptor::IsAvailable() )
+  if(Dali::Adaptor::IsAvailable())
   {
-    sceneHolderImpl = AdaptorImpl::GetImpl( AdaptorImpl::Get() ).GetWindow( actor );
+    sceneHolderImpl = AdaptorImpl::GetImpl(AdaptorImpl::Get()).GetWindow(actor);
   }
 
-  return Dali::Integration::SceneHolder( sceneHolderImpl );
+  return Dali::Integration::SceneHolder(sceneHolderImpl);
 }
 
-void SceneHolder::Add( Actor actor )
+void SceneHolder::Add(Actor actor)
 {
-  GetImplementation( *this ).Add( actor );
+  GetImplementation(*this).Add(actor);
 }
 
-void SceneHolder::Remove( Actor actor )
+void SceneHolder::Remove(Actor actor)
 {
-  GetImplementation( *this ).Remove( actor );
+  GetImplementation(*this).Remove(actor);
 }
 
 Dali::Layer SceneHolder::GetRootLayer() const
 {
-  return GetImplementation( *this ).GetRootLayer();
+  return GetImplementation(*this).GetRootLayer();
 }
 
-void SceneHolder::SetBackgroundColor( Vector4 color )
+void SceneHolder::SetBackgroundColor(Vector4 color)
 {
-  GetImplementation( *this ).SetBackgroundColor( color );
+  GetImplementation(*this).SetBackgroundColor(color);
 }
 
 Vector4 SceneHolder::GetBackgroundColor() const
 {
-  return GetImplementation( *this ).GetBackgroundColor();
+  return GetImplementation(*this).GetBackgroundColor();
 }
 
-void SceneHolder::FeedTouchPoint( Dali::TouchPoint& point, int timeStamp )
+void SceneHolder::FeedTouchPoint(Dali::TouchPoint& point, int timeStamp)
 {
-  GetImplementation( *this ).FeedTouchPoint( point, timeStamp );
+  GetImplementation(*this).FeedTouchPoint(point, timeStamp);
 }
 
-void SceneHolder::FeedWheelEvent( Dali::WheelEvent& wheelEvent )
+void SceneHolder::FeedWheelEvent(Dali::WheelEvent& wheelEvent)
 {
-  GetImplementation( *this ).FeedWheelEvent( wheelEvent );
+  GetImplementation(*this).FeedWheelEvent(wheelEvent);
 }
 
-void SceneHolder::FeedKeyEvent( Dali::KeyEvent& keyEvent )
+void SceneHolder::FeedKeyEvent(Dali::KeyEvent& keyEvent)
 {
-  GetImplementation( *this ).FeedKeyEvent( keyEvent );
+  GetImplementation(*this).FeedKeyEvent(keyEvent);
+}
+
+RenderTaskList SceneHolder::GetRenderTaskList()
+{
+  return GetImplementation(*this).GetRenderTaskList();
 }
 
 SceneHolder::KeyEventSignalType& SceneHolder::KeyEventSignal()
 {
-  return GetImplementation( *this ).KeyEventSignal();
+  return GetImplementation(*this).KeyEventSignal();
 }
 
 SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal()
 {
-  return GetImplementation( *this ).KeyEventGeneratedSignal();
+  return GetImplementation(*this).KeyEventGeneratedSignal();
 }
 
 SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal()
 {
-  return GetImplementation( *this ).TouchedSignal();
+  return GetImplementation(*this).TouchedSignal();
 }
 
 SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
 {
-  return GetImplementation( *this ).WheelEventSignal();
+  return GetImplementation(*this).WheelEventSignal();
+}
+
+SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal()
+{
+  return GetImplementation(*this).WheelEventGeneratedSignal();
 }
 
-} // Integration
+} // namespace Integration
 
-} // Dali
+} // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
index 18c086f..e0000ec 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 
 namespace
 {
-const char* DEFAULT_THEME=
+const char* DEFAULT_THEME =
   "{\n"
   "  \"config\":\n"
   "  {\n"
@@ -44,22 +44,37 @@ const char* DEFAULT_THEME=
 
 struct NamedTheme
 {
-  NamedTheme( const std::string& name, const std::string& theme )
-  : name(name), theme(theme)
+  NamedTheme(const std::string& name, const std::string& theme)
+  : name(name),
+    theme(theme)
   {
   }
 
   std::string name;
   std::string theme;
 };
-typedef std::vector< NamedTheme > NamedThemes;
-NamedThemes gThemes;
+typedef std::vector<NamedTheme> NamedThemes;
+NamedThemes                     gThemes;
 
 std::string gTheme;
 std::string gFontFamily("LucidaSans");
 std::string gFontStyle("Regular");
 int         gFontSize(1);
-}
+
+constexpr std::string_view THROW_EXCEPTION_STYLE_FILE_NAME = "throwException";
+class DummyException : public std::exception
+{
+public:
+  DummyException()
+  {
+  }
+
+  const char* what() const throw()
+  {
+    return "DummyException";
+  }
+};
+} // namespace
 
 namespace Dali
 {
@@ -78,12 +93,12 @@ public: // Creation & Destruction
   ~StyleMonitor();
 
 public: // Style Information
-  std::string GetDefaultFontFamily() const;
-  std::string GetDefaultFontStyle() const;
-  float GetDefaultFontSize() const;
+  std::string        GetDefaultFontFamily() const;
+  std::string        GetDefaultFontStyle() const;
+  float              GetDefaultFontSize() const;
   const std::string& GetTheme() const;
-  void SetTheme(std::string theme);
-  bool LoadThemeFile( const std::string& filename, std::string& output );
+  void               SetTheme(std::string theme);
+  bool               LoadThemeFile(const std::string& filename, std::string& output);
 
 public: // Signals
   Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal();
@@ -95,18 +110,18 @@ public: // Signals
 
 private:
   Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal;
-  static Dali::StyleMonitor mToolkitStyleMonitor;
+  static Dali::StyleMonitor                 mToolkitStyleMonitor;
 
-  std::string mTheme;  ///<< Current theme name
+  std::string mTheme; ///<< Current theme name
 };
 
 Dali::StyleMonitor StyleMonitor::mToolkitStyleMonitor;
 
 Dali::StyleMonitor StyleMonitor::Get()
 {
-  if( ! mToolkitStyleMonitor )
+  if(!mToolkitStyleMonitor)
   {
-    mToolkitStyleMonitor = Dali::StyleMonitor( new Dali::Internal::Adaptor::StyleMonitor() );
+    mToolkitStyleMonitor = Dali::StyleMonitor(new Dali::Internal::Adaptor::StyleMonitor());
   }
   return mToolkitStyleMonitor;
 }
@@ -143,22 +158,27 @@ const std::string& StyleMonitor::GetTheme() const
 void StyleMonitor::SetTheme(std::string path)
 {
   mTheme = path;
-  EmitStyleChangeSignal( StyleChange::THEME_CHANGE );
+  EmitStyleChangeSignal(StyleChange::THEME_CHANGE);
 }
 
-bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
+bool StyleMonitor::LoadThemeFile(const std::string& filename, std::string& output)
 {
-  for( NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter )
+  // Throw something exceptions during load file
+  if(filename == THROW_EXCEPTION_STYLE_FILE_NAME)
+  {
+    throw DummyException();
+  }
+  for(NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter)
   {
     NamedTheme& theme = *iter;
-    if( theme.name == filename )
+    if(theme.name == filename)
     {
       output = theme.theme;
       return true;
     }
   }
 
-  if( !gTheme.empty() )
+  if(!gTheme.empty())
   {
     output = gTheme;
   }
@@ -238,14 +258,14 @@ StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
   return GetImplementation(*this).StyleChangeSignal();
 }
 
-bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
+bool StyleMonitor::LoadThemeFile(const std::string& filename, std::string& output)
 {
   return GetImplementation(*this).LoadThemeFile(filename, output);
 }
 
 StyleMonitor& StyleMonitor::operator=(const StyleMonitor& monitor)
 {
-  if( *this != monitor )
+  if(*this != monitor)
   {
     BaseHandle::operator=(monitor);
   }
@@ -263,20 +283,19 @@ namespace Test
 {
 namespace StyleMonitor
 {
-
-void SetThemeFileOutput( const std::string& name, const std::string& output )
+void SetThemeFileOutput(const std::string& name, const std::string& output)
 {
-  for( NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter )
+  for(NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter)
   {
     NamedTheme& theme = *iter;
-    if( theme.name == name )
+    if(theme.name == name)
     {
       theme.theme = output;
       return;
     }
   }
 
-  gThemes.push_back( NamedTheme( name, output ) );
+  gThemes.push_back(NamedTheme(name, output));
 }
 
 void SetDefaultFontFamily(const std::string& family)
@@ -289,10 +308,10 @@ void SetDefaultFontStyle(const std::string& style)
   gFontStyle = style;
 }
 
-void SetDefaultFontSize( float size )
+void SetDefaultFontSize(float size)
 {
   gFontSize = size;
 }
 
-} // StyleMonitor
-} // Test
+} // namespace StyleMonitor
+} // namespace Test
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp
index e309bfe..840cc13 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,58 +20,62 @@
 
 // INTERNAL INCLUDES
 #include <dali-test-suite-utils.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <toolkit-adaptor-impl.h>
 #include <toolkit-lifecycle-controller.h>
 
 namespace Dali
 {
-
 using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
 
-ToolkitTestApplication::ToolkitTestApplication( size_t surfaceWidth, size_t surfaceHeight, float  horizontalDpi, float verticalDpi )
-: TestApplication( surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi, false /* Do not Initialize Core */ ),
-  mMainWindow( new Dali::Window ),
-  mAdaptor( &AdaptorImpl::New() ) // Need to create Adaptor first as many singletons in dali-adaptor need it
+ToolkitTestApplication::ToolkitTestApplication(size_t surfaceWidth, size_t surfaceHeight, float horizontalDpi, float verticalDpi)
+: TestApplication(surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi, false /* Do not Initialize Core */),
+  mMainWindow(),
+  mAdaptor(&AdaptorImpl::New()) // Need to create Adaptor first as many singletons in dali-adaptor need it
 {
   // Create Core next
   CreateCore();
 
   // Override Scene creation in TestApplication by creating a window.
   // The window will create a Scene & surface and set up the scene's surface appropriately.
-  *mMainWindow = Window::New( PositionSize( 0, 0, surfaceWidth, surfaceHeight ), "" );
-  mScene = AdaptorImpl::GetScene( *mMainWindow );
-  mScene.SetDpi( Vector2( horizontalDpi, verticalDpi ) );
+  mMainWindow = Window::New(PositionSize(0, 0, surfaceWidth, surfaceHeight), "");
+  mScene      = AdaptorImpl::GetScene(mMainWindow);
+  mScene.SetDpi(Vector2(horizontalDpi, verticalDpi));
 
   // Create render target for the scene
   Graphics::RenderTargetCreateInfo rtInfo{};
-  rtInfo.SetExtent( {mSurfaceWidth, mSurfaceHeight });
-  mRenderTarget = mGraphicsController.CreateRenderTarget( rtInfo, nullptr );
-  mScene.SetSurfaceRenderTarget( mRenderTarget.get() );
+  rtInfo.SetExtent({mSurfaceWidth, mSurfaceHeight});
+  mScene.SetSurfaceRenderTarget(rtInfo);
+
+  mScenes.push_back(mScene);
 
   // Core needs to be initialized next before we start the adaptor
   InitializeCore();
   Accessibility::Accessible::SetObjectRegistry(mCore->GetObjectRegistry());
 
   // This will also emit the window created signals
-  AdaptorImpl::GetImpl( *mAdaptor ).Start( *mMainWindow );
-  AdaptorImpl::GetImpl( *mAdaptor ).SetApplication( *this );
+  AdaptorImpl::GetImpl(*mAdaptor).Start(mMainWindow);
+  AdaptorImpl::GetImpl(*mAdaptor).SetApplication(*this);
 
   Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get();
   lifecycleController.InitSignal().Emit();
 
   // set the DPI value for font rendering
   TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get();
-  if( fontClient )
+  if(fontClient)
   {
-    fontClient.SetDpi( mDpi.x, mDpi.y );
+    fontClient.SetDpi(mDpi.x, mDpi.y);
   }
 }
 
 ToolkitTestApplication::~ToolkitTestApplication()
 {
+  Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get();
+  lifecycleController.TerminateSignal().Emit();
+
   // Need to delete core before we delete the adaptor.
   delete mCore;
   mCore = NULL;
@@ -79,7 +83,7 @@ ToolkitTestApplication::~ToolkitTestApplication()
 
 void ToolkitTestApplication::RunIdles()
 {
-  AdaptorImpl::GetImpl( *mAdaptor.get() ).RunIdles();
+  AdaptorImpl::GetImpl(*mAdaptor.get()).RunIdles();
 }
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
index 49a4c6f..b9e94ed 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEST_APPLICATION_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,9 +61,18 @@ public:
    */
   void RunIdles();
 
-private:
+  Dali::Window GetWindow()
+  {
+    return mMainWindow;
+  }
+
+  Dali::Adaptor& GetAdaptor()
+  {
+    return *mAdaptor;
+  }
 
-  std::unique_ptr<Dali::Window> mMainWindow;
+private:
+  Dali::Window mMainWindow;
   std::unique_ptr< Adaptor > mAdaptor;
 };
 
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp
old mode 100755
new mode 100644
index cae7871..57a438e
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <dali/devel-api/common/singleton-service.h>
 #include <dali/devel-api/text-abstraction/bidirectional-support.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
 #include <dali/devel-api/text-abstraction/font-metrics.h>
@@ -22,7 +23,6 @@
 #include <dali/devel-api/text-abstraction/segmentation.h>
 #include <dali/devel-api/text-abstraction/shaping.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/devel-api/common/singleton-service.h>
 #include <cstring>
 
 using namespace Dali;
@@ -35,7 +35,6 @@ namespace TextAbstraction
 {
 namespace Internal
 {
-
 class BidirectionalSupport : public BaseObject
 {
 public:
@@ -51,52 +50,53 @@ public:
   {
     TextAbstraction::BidirectionalSupport bidirectionalSupportHandle;
 
-    Dali::SingletonService service( Dali::SingletonService::Get() );
-    if( service )
+    Dali::SingletonService service(Dali::SingletonService::Get());
+    if(service)
     {
       // Check whether the singleton is already created
-      BaseHandle handle = service.GetSingleton( typeid( TextAbstraction::BidirectionalSupport ) );
+      BaseHandle handle = service.GetSingleton(typeid(TextAbstraction::BidirectionalSupport));
       if(handle)
       {
         // If so, downcast the handle
-        BidirectionalSupport* impl = dynamic_cast< Internal::BidirectionalSupport* >( handle.GetObjectPtr() );
-        bidirectionalSupportHandle = TextAbstraction::BidirectionalSupport( impl );
+        BidirectionalSupport* impl = dynamic_cast<Internal::BidirectionalSupport*>(handle.GetObjectPtr());
+        bidirectionalSupportHandle = TextAbstraction::BidirectionalSupport(impl);
       }
       else // create and register the object
       {
-        bidirectionalSupportHandle = TextAbstraction::BidirectionalSupport( new BidirectionalSupport );
-        service.Register( typeid( bidirectionalSupportHandle ), bidirectionalSupportHandle );
+        bidirectionalSupportHandle = TextAbstraction::BidirectionalSupport(new BidirectionalSupport);
+        service.Register(typeid(bidirectionalSupportHandle), bidirectionalSupportHandle);
       }
     }
     return bidirectionalSupportHandle;
   }
-  BidiInfoIndex CreateInfo( const Character* const paragraph, Length numberOfCharacters,
-                            bool matchSystemLanguageDirection, LayoutDirection::Type layoutDirection ){return 0;}
+  BidiInfoIndex CreateInfo(const Character* const paragraph, Length numberOfCharacters, bool matchSystemLanguageDirection, LayoutDirection::Type layoutDirection)
+  {
+    return 0;
+  }
 
-  void DestroyInfo( BidiInfoIndex bidiInfoIndex )
+  void DestroyInfo(BidiInfoIndex bidiInfoIndex)
   {
   }
 
-  void Reorder( BidiInfoIndex bidiInfoIndex,CharacterIndex firstCharacterIndex,Length numberOfCharacters,CharacterIndex* visualToLogicalMap )
+  void Reorder(BidiInfoIndex bidiInfoIndex, CharacterIndex firstCharacterIndex, Length numberOfCharacters, CharacterIndex* visualToLogicalMap)
   {
   }
 
-  bool GetMirroredText( Character* text,CharacterDirection* directions,Length numberOfCharacters )
+  bool GetMirroredText(Character* text, CharacterDirection* directions, Length numberOfCharacters)
   {
     return true;
   }
 
-  bool GetParagraphDirection( BidiInfoIndex bidiInfoIndex ) const
+  bool GetParagraphDirection(BidiInfoIndex bidiInfoIndex) const
   {
     return true;
   }
 
-  void GetCharactersDirection( BidiInfoIndex bidiInfoIndex, CharacterDirection* directions, Length numberOfCharacters )
+  void GetCharactersDirection(BidiInfoIndex bidiInfoIndex, CharacterDirection* directions, Length numberOfCharacters)
   {
   }
 }; // class BidirectionalSupport
 
-
 class FontClient : public BaseObject
 {
 public:
@@ -105,113 +105,173 @@ public:
   {
   }
 
-  ~FontClient(){}
+  ~FontClient()
+  {
+  }
 
   static Dali::TextAbstraction::FontClient Get()
   {
     Dali::TextAbstraction::FontClient fontClientHandle;
 
-    Dali::SingletonService service( SingletonService::Get() );
-    if ( service )
+    Dali::SingletonService service(SingletonService::Get());
+    if(service)
     {
       // Check whether the singleton is already created
-      Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::TextAbstraction::FontClient ) );
+      Dali::BaseHandle handle = service.GetSingleton(typeid(Dali::TextAbstraction::FontClient));
       if(handle)
       {
         // If so, downcast the handle
-        FontClient* impl = dynamic_cast< Dali::TextAbstraction::Internal::FontClient* >( handle.GetObjectPtr() );
-        fontClientHandle = Dali::TextAbstraction::FontClient( impl );
+        FontClient* impl = dynamic_cast<Dali::TextAbstraction::Internal::FontClient*>(handle.GetObjectPtr());
+        fontClientHandle = Dali::TextAbstraction::FontClient(impl);
       }
       else // create and register the object
       {
-        fontClientHandle = Dali::TextAbstraction::FontClient( new FontClient );
-        service.Register( typeid( fontClientHandle ), fontClientHandle );
+        fontClientHandle = Dali::TextAbstraction::FontClient(new FontClient);
+        service.Register(typeid(fontClientHandle), fontClientHandle);
       }
     }
 
     return fontClientHandle;
   }
 
-  void SetDpi( unsigned int horizontalDpi, unsigned int verticalDpi ){}
-  void GetDpi( unsigned int& horizontalDpi, unsigned int& verticalDpi ){horizontalDpi=verticalDpi=96;}
-
-  void ResetSystemDefaults(){}
-  void GetDefaultFonts( FontList& defaultFonts ){}
-  void GetDefaultPlatformFontDescription( FontDescription& fontDescription ){}
-  void GetSystemFonts( FontList& systemFonts ){}
-  void GetDescription( FontId id, FontDescription& fontDescription ){}
-  PointSize26Dot6 GetPointSize( FontId id ){return 9;}
-  FontId FindDefaultFont( Character charcode, PointSize26Dot6 pointSize, bool preferColor ){return 0;}
-  FontId FindFallbackFont( Character charcode, const FontDescription& fontDescription, PointSize26Dot6 pointSize, bool preferColor ){return 0;}
-  FontId GetFontId( const FontPath& path, PointSize26Dot6 pointSize, FaceIndex faceIndex ){return 0;}
-  FontId GetFontId( const FontDescription& fontDescription,PointSize26Dot6 pointSize, FaceIndex faceIndex ){return 0;}
-  bool IsScalable( const FontPath& path ){return true;}
-  bool IsScalable( const FontDescription& fontDescription ){return true;}
-  void GetFixedSizes( const FontPath& path, Dali::Vector< PointSize26Dot6>& sizes ){}
-  void GetFixedSizes( const FontDescription& fontDescription, Dali::Vector< PointSize26Dot6 >& sizes ){}
-  void GetFontMetrics( FontId fontId, FontMetrics& metrics ){}
-  GlyphIndex GetGlyphIndex( FontId fontId, Character charcode ){return 0;}
-  bool GetGlyphMetrics( GlyphInfo* array, uint32_t size, bool horizontal ){return true;}
-  void CreateBitmap( FontId fontId, GlyphIndex glyphIndex, bool softwareItailc, bool softwareBold, Dali::TextAbstraction::FontClient::GlyphBufferData& data, int outlineWidth ){}
-  PixelData CreateBitmap( FontId fontId, GlyphIndex glyphIndex, int outlineWidth ){return PixelData();}
-  void CreateVectorBlob( FontId fontId, GlyphIndex glyphIndex, VectorBlob*& blob,
-                         unsigned int& blobLength, unsigned int& nominalWidth, unsigned int& nominalHeight )
+  void SetDpi(unsigned int horizontalDpi, unsigned int verticalDpi)
+  {
+  }
+  void GetDpi(unsigned int& horizontalDpi, unsigned int& verticalDpi)
+  {
+    horizontalDpi = verticalDpi = 96;
+  }
+
+  void ResetSystemDefaults()
+  {
+  }
+  void GetDefaultFonts(FontList& defaultFonts)
+  {
+  }
+  void GetDefaultPlatformFontDescription(FontDescription& fontDescription)
+  {
+  }
+  void GetSystemFonts(FontList& systemFonts)
+  {
+  }
+  void GetDescription(FontId id, FontDescription& fontDescription)
+  {
+  }
+  PointSize26Dot6 GetPointSize(FontId id)
+  {
+    return 9;
+  }
+  FontId FindDefaultFont(Character charcode, PointSize26Dot6 pointSize, bool preferColor)
+  {
+    return 0;
+  }
+  FontId FindFallbackFont(Character charcode, const FontDescription& fontDescription, PointSize26Dot6 pointSize, bool preferColor)
+  {
+    return 0;
+  }
+  FontId GetFontId(const FontPath& path, PointSize26Dot6 pointSize, FaceIndex faceIndex)
+  {
+    return 0;
+  }
+  FontId GetFontId(const FontDescription& fontDescription, PointSize26Dot6 pointSize, FaceIndex faceIndex)
+  {
+    return 0;
+  }
+  bool IsScalable(const FontPath& path)
+  {
+    return true;
+  }
+  bool IsScalable(const FontDescription& fontDescription)
+  {
+    return true;
+  }
+  void GetFixedSizes(const FontPath& path, Dali::Vector<PointSize26Dot6>& sizes)
+  {
+  }
+  void GetFixedSizes(const FontDescription& fontDescription, Dali::Vector<PointSize26Dot6>& sizes)
+  {
+  }
+  void GetFontMetrics(FontId fontId, FontMetrics& metrics)
+  {
+  }
+  GlyphIndex GetGlyphIndex(FontId fontId, Character charcode)
+  {
+    return 0;
+  }
+  bool GetGlyphMetrics(GlyphInfo* array, uint32_t size, bool horizontal)
+  {
+    return true;
+  }
+  void CreateBitmap(FontId fontId, GlyphIndex glyphIndex, bool softwareItailc, bool softwareBold, Dali::TextAbstraction::GlyphBufferData& data, int outlineWidth)
+  {
+  }
+  PixelData CreateBitmap(FontId fontId, GlyphIndex glyphIndex, int outlineWidth)
+  {
+    return PixelData();
+  }
+  void CreateVectorBlob(FontId fontId, GlyphIndex glyphIndex, VectorBlob*& blob, unsigned int& blobLength, unsigned int& nominalWidth, unsigned int& nominalHeight)
   {
     blobLength = 0;
   }
-  const GlyphInfo& GetEllipsisGlyph( PointSize26Dot6 pointSize ){return mGlyphInfo;}
-  bool IsColorGlyph( FontId fontId, GlyphIndex glyphIndex ){return false;}
+  const GlyphInfo& GetEllipsisGlyph(PointSize26Dot6 pointSize)
+  {
+    return mGlyphInfo;
+  }
+  bool IsColorGlyph(FontId fontId, GlyphIndex glyphIndex)
+  {
+    return false;
+  }
+
 private:
-  GlyphInfo    mGlyphInfo;
+  GlyphInfo mGlyphInfo;
 }; // class FontClient
 
-
 class Shaping : public BaseObject
 {
 public:
   Shaping()
-  : mText( NULL ),
-    mNumChars( 0 )
+  : mText(NULL),
+    mNumChars(0)
   {
   }
 
   ~Shaping()
   {
-    delete [] mText;
+    delete[] mText;
   }
 
   static Dali::TextAbstraction::Shaping Get()
   {
     Dali::TextAbstraction::Shaping shapingHandle;
 
-    Dali::SingletonService service( SingletonService::Get() );
-    if ( service )
+    Dali::SingletonService service(SingletonService::Get());
+    if(service)
     {
       // Check whether the singleton is already created
-      Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::TextAbstraction::Shaping ) );
+      Dali::BaseHandle handle = service.GetSingleton(typeid(Dali::TextAbstraction::Shaping));
       if(handle)
       {
         // If so, downcast the handle
-        Shaping* impl = dynamic_cast< Dali::TextAbstraction::Internal::Shaping* >( handle.GetObjectPtr() );
-        shapingHandle = Dali::TextAbstraction::Shaping( impl );
+        Shaping* impl = dynamic_cast<Dali::TextAbstraction::Internal::Shaping*>(handle.GetObjectPtr());
+        shapingHandle = Dali::TextAbstraction::Shaping(impl);
       }
       else // create and register the object
       {
-        shapingHandle = Dali::TextAbstraction::Shaping( new Shaping );
-        service.Register( typeid( shapingHandle ), shapingHandle );
+        shapingHandle = Dali::TextAbstraction::Shaping(new Shaping);
+        service.Register(typeid(shapingHandle), shapingHandle);
       }
     }
     return shapingHandle;
   }
 
-  void GetGlyphs(GlyphInfo* glyphStore, unsigned int*mappingTable)
+  void GetGlyphs(GlyphInfo* glyphStore, unsigned int* mappingTable)
   {
     // Return store & mapping table (0, 1, 2, 3... N-1))
-    if( glyphStore )
+    if(glyphStore)
     {
-      memcpy( glyphStore, mText, mNumChars );
+      memcpy(glyphStore, mText, mNumChars);
     }
-    for( unsigned int i=0; i<mNumChars ; ++i )
+    for(unsigned int i = 0; i < mNumChars; ++i)
     {
       mappingTable[i] = i;
     }
@@ -219,50 +279,50 @@ public:
 
   Length Shape(unsigned int const* text, unsigned int numChars, unsigned int fontId, Script script)
   {
-    mText = new unsigned char[numChars];
+    mText     = new unsigned char[numChars];
     mNumChars = numChars;
 
-    memcpy( mText, text, numChars );
+    memcpy(mText, text, numChars);
 
     return numChars;
   }
+
 private:
   unsigned char* mText;
-  unsigned int mNumChars;
+  unsigned int   mNumChars;
 };
 
-} // Internal
-} // TextAbstraction
+} // namespace Internal
+} // namespace TextAbstraction
 
-inline static TextAbstraction::Internal::BidirectionalSupport& GetImplementation( TextAbstraction::BidirectionalSupport& bidirectionalSupport )
+inline static TextAbstraction::Internal::BidirectionalSupport& GetImplementation(TextAbstraction::BidirectionalSupport& bidirectionalSupport)
 {
-  DALI_ASSERT_ALWAYS( bidirectionalSupport && "bidirectional support handle is empty" );
+  DALI_ASSERT_ALWAYS(bidirectionalSupport && "bidirectional support handle is empty");
   BaseObject& object = bidirectionalSupport.GetBaseObject();
   return static_cast<TextAbstraction::Internal::BidirectionalSupport&>(object);
 }
 
-inline static const TextAbstraction::Internal::BidirectionalSupport& GetImplementation( const TextAbstraction::BidirectionalSupport& bidirectionalSupport )
+inline static const TextAbstraction::Internal::BidirectionalSupport& GetImplementation(const TextAbstraction::BidirectionalSupport& bidirectionalSupport)
 {
-  DALI_ASSERT_ALWAYS( bidirectionalSupport && "bidirectional support handle is empty" );
+  DALI_ASSERT_ALWAYS(bidirectionalSupport && "bidirectional support handle is empty");
   const BaseObject& object = bidirectionalSupport.GetBaseObject();
   return static_cast<const TextAbstraction::Internal::BidirectionalSupport&>(object);
 }
 
 inline static TextAbstraction::Internal::FontClient& GetImplementation(TextAbstraction::FontClient& fontClient)
 {
-  DALI_ASSERT_ALWAYS( fontClient && "fontClient handle is empty" );
+  DALI_ASSERT_ALWAYS(fontClient && "fontClient handle is empty");
   BaseObject& handle = fontClient.GetBaseObject();
   return static_cast<TextAbstraction::Internal::FontClient&>(handle);
 }
 
 inline static TextAbstraction::Internal::Shaping& GetImplementation(TextAbstraction::Shaping& shaping)
 {
-  DALI_ASSERT_ALWAYS( shaping && "shaping handle is empty" );
+  DALI_ASSERT_ALWAYS(shaping && "shaping handle is empty");
   BaseObject& handle = shaping.GetBaseObject();
   return static_cast<TextAbstraction::Internal::Shaping&>(handle);
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 /******************************************************************************/
 
@@ -278,8 +338,8 @@ BidirectionalSupport::~BidirectionalSupport()
 {
 }
 
-BidirectionalSupport::BidirectionalSupport( Internal::BidirectionalSupport* implementation )
-: BaseHandle( implementation )
+BidirectionalSupport::BidirectionalSupport(Internal::BidirectionalSupport* implementation)
+: BaseHandle(implementation)
 {
 }
 
@@ -288,47 +348,46 @@ BidirectionalSupport BidirectionalSupport::Get()
   return Internal::BidirectionalSupport::Get();
 }
 
-BidiInfoIndex BidirectionalSupport::CreateInfo( const Character* const paragraph,
-                                                Length numberOfCharacters,
-                                                bool matchSystemLanguageDirection,
-                                                LayoutDirection::Type layoutDirection )
+BidiInfoIndex BidirectionalSupport::CreateInfo(const Character* const paragraph,
+                                               Length                 numberOfCharacters,
+                                               bool                   matchSystemLanguageDirection,
+                                               LayoutDirection::Type  layoutDirection)
 {
-  return GetImplementation( *this ).CreateInfo( paragraph, numberOfCharacters, matchSystemLanguageDirection, layoutDirection );
+  return GetImplementation(*this).CreateInfo(paragraph, numberOfCharacters, matchSystemLanguageDirection, layoutDirection);
 }
 
-void BidirectionalSupport::DestroyInfo( BidiInfoIndex bidiInfoIndex )
+void BidirectionalSupport::DestroyInfo(BidiInfoIndex bidiInfoIndex)
 {
-  GetImplementation( *this ).DestroyInfo( bidiInfoIndex );
+  GetImplementation(*this).DestroyInfo(bidiInfoIndex);
 }
 
-void BidirectionalSupport::Reorder( BidiInfoIndex bidiInfoIndex,
-                                    CharacterIndex firstCharacterIndex,
-                                    Length numberOfCharacters,
-                                    CharacterIndex* visualToLogicalMap )
+void BidirectionalSupport::Reorder(BidiInfoIndex   bidiInfoIndex,
+                                   CharacterIndex  firstCharacterIndex,
+                                   Length          numberOfCharacters,
+                                   CharacterIndex* visualToLogicalMap)
 {
-  GetImplementation( *this ).Reorder( bidiInfoIndex, firstCharacterIndex, numberOfCharacters, visualToLogicalMap );
+  GetImplementation(*this).Reorder(bidiInfoIndex, firstCharacterIndex, numberOfCharacters, visualToLogicalMap);
 }
 
-bool BidirectionalSupport::GetMirroredText( Character* text,
-                                            CharacterDirection* directions,
-                                            Length numberOfCharacters )
+bool BidirectionalSupport::GetMirroredText(Character*          text,
+                                           CharacterDirection* directions,
+                                           Length              numberOfCharacters)
 {
-  return GetImplementation( *this ).GetMirroredText( text, directions, numberOfCharacters );
+  return GetImplementation(*this).GetMirroredText(text, directions, numberOfCharacters);
 }
 
-bool BidirectionalSupport::GetParagraphDirection( BidiInfoIndex bidiInfoIndex ) const
+bool BidirectionalSupport::GetParagraphDirection(BidiInfoIndex bidiInfoIndex) const
 {
-  return GetImplementation( *this ).GetParagraphDirection( bidiInfoIndex );
+  return GetImplementation(*this).GetParagraphDirection(bidiInfoIndex);
 }
 
-void BidirectionalSupport::GetCharactersDirection( BidiInfoIndex bidiInfoIndex,
-                                                   CharacterDirection* directions,
-                                                   Length numberOfCharacters )
+void BidirectionalSupport::GetCharactersDirection(BidiInfoIndex       bidiInfoIndex,
+                                                  CharacterDirection* directions,
+                                                  Length              numberOfCharacters)
 {
-  GetImplementation( *this ).GetCharactersDirection( bidiInfoIndex, directions, numberOfCharacters );
+  GetImplementation(*this).GetCharactersDirection(bidiInfoIndex, directions, numberOfCharacters);
 }
 
-
 FontClient FontClient::Get()
 {
   return Internal::FontClient::Get();
@@ -342,33 +401,33 @@ FontClient::~FontClient()
 {
 }
 
-FontClient::FontClient( const FontClient& handle )
-: BaseHandle( handle )
+FontClient::FontClient(const FontClient& handle)
+: BaseHandle(handle)
 {
 }
 
-FontClient::GlyphBufferData::GlyphBufferData()
+GlyphBufferData::GlyphBufferData()
 {
 }
 
-FontClient::GlyphBufferData::~GlyphBufferData()
+GlyphBufferData::~GlyphBufferData()
 {
 }
 
-FontClient& FontClient::operator=( const FontClient& handle )
+FontClient& FontClient::operator=(const FontClient& handle)
 {
-  BaseHandle::operator=( handle );
+  BaseHandle::operator=(handle);
   return *this;
 }
 
-void FontClient::SetDpi( unsigned int horizontalDpi, unsigned int verticalDpi  )
+void FontClient::SetDpi(unsigned int horizontalDpi, unsigned int verticalDpi)
 {
-  GetImplementation(*this).SetDpi( horizontalDpi, verticalDpi );
+  GetImplementation(*this).SetDpi(horizontalDpi, verticalDpi);
 }
 
-void FontClient::GetDpi( unsigned int& horizontalDpi, unsigned int& verticalDpi )
+void FontClient::GetDpi(unsigned int& horizontalDpi, unsigned int& verticalDpi)
 {
-  GetImplementation(*this).GetDpi( horizontalDpi, verticalDpi );
+  GetImplementation(*this).GetDpi(horizontalDpi, verticalDpi);
 }
 
 void FontClient::ResetSystemDefaults()
@@ -376,132 +435,132 @@ void FontClient::ResetSystemDefaults()
   GetImplementation(*this).ResetSystemDefaults();
 }
 
-void FontClient::GetDefaultFonts( FontList& defaultFonts )
+void FontClient::GetDefaultFonts(FontList& defaultFonts)
 {
-  GetImplementation(*this).GetDefaultFonts( defaultFonts );
+  GetImplementation(*this).GetDefaultFonts(defaultFonts);
 }
 
-void FontClient::GetDefaultPlatformFontDescription( FontDescription& fontDescription )
+void FontClient::GetDefaultPlatformFontDescription(FontDescription& fontDescription)
 {
-  GetImplementation(*this).GetDefaultPlatformFontDescription( fontDescription );
+  GetImplementation(*this).GetDefaultPlatformFontDescription(fontDescription);
 }
 
-void FontClient::GetSystemFonts( FontList& systemFonts )
+void FontClient::GetSystemFonts(FontList& systemFonts)
 {
-  GetImplementation(*this).GetSystemFonts( systemFonts );
+  GetImplementation(*this).GetSystemFonts(systemFonts);
 }
 
-void FontClient::GetDescription( FontId id, FontDescription& fontDescription )
+void FontClient::GetDescription(FontId id, FontDescription& fontDescription)
 {
-  GetImplementation(*this).GetDescription( id, fontDescription );
+  GetImplementation(*this).GetDescription(id, fontDescription);
 }
 
-PointSize26Dot6 FontClient::GetPointSize( FontId id )
+PointSize26Dot6 FontClient::GetPointSize(FontId id)
 {
-  return GetImplementation(*this).GetPointSize( id );
+  return GetImplementation(*this).GetPointSize(id);
 }
 
-FontId FontClient::FindDefaultFont( Character charcode, PointSize26Dot6 pointSize, bool preferColor )
+FontId FontClient::FindDefaultFont(Character charcode, PointSize26Dot6 pointSize, bool preferColor)
 {
-  return GetImplementation(*this).FindDefaultFont( charcode, pointSize, preferColor );
+  return GetImplementation(*this).FindDefaultFont(charcode, pointSize, preferColor);
 }
 
-FontId FontClient::FindFallbackFont( Character charcode, const FontDescription& fontDescription, PointSize26Dot6 pointSize, bool preferColor )
+FontId FontClient::FindFallbackFont(Character charcode, const FontDescription& fontDescription, PointSize26Dot6 pointSize, bool preferColor)
 {
-  return GetImplementation(*this).FindFallbackFont( charcode, fontDescription, pointSize, preferColor );
+  return GetImplementation(*this).FindFallbackFont(charcode, fontDescription, pointSize, preferColor);
 }
 
-FontId FontClient::GetFontId( const FontPath& path, PointSize26Dot6 pointSize, FaceIndex faceIndex )
+FontId FontClient::GetFontId(const FontPath& path, PointSize26Dot6 pointSize, FaceIndex faceIndex)
 {
-  return GetImplementation(*this).GetFontId( path, pointSize, faceIndex );
+  return GetImplementation(*this).GetFontId(path, pointSize, faceIndex);
 }
 
-FontId FontClient::GetFontId( const FontDescription& fontDescription,
-                              PointSize26Dot6 pointSize,
-                              FaceIndex faceIndex )
+FontId FontClient::GetFontId(const FontDescription& fontDescription,
+                             PointSize26Dot6        pointSize,
+                             FaceIndex              faceIndex)
 {
-  return GetImplementation(*this).GetFontId( fontDescription,
-                                             pointSize,
-                                             faceIndex );
+  return GetImplementation(*this).GetFontId(fontDescription,
+                                            pointSize,
+                                            faceIndex);
 }
 
-bool FontClient::IsScalable( const FontPath& path )
+bool FontClient::IsScalable(const FontPath& path)
 {
-  return GetImplementation(*this).IsScalable( path );
+  return GetImplementation(*this).IsScalable(path);
 }
 
-bool FontClient::IsScalable( const FontDescription& fontDescription )
+bool FontClient::IsScalable(const FontDescription& fontDescription)
 {
-  return GetImplementation(*this).IsScalable( fontDescription );
+  return GetImplementation(*this).IsScalable(fontDescription);
 }
 
-void FontClient::GetFixedSizes( const FontPath& path, Dali::Vector< PointSize26Dot6>& sizes )
+void FontClient::GetFixedSizes(const FontPath& path, Dali::Vector<PointSize26Dot6>& sizes)
 {
-  GetImplementation(*this).GetFixedSizes( path, sizes );
+  GetImplementation(*this).GetFixedSizes(path, sizes);
 }
 
-void FontClient::GetFixedSizes( const FontDescription& fontDescription,
-                                Dali::Vector< PointSize26Dot6 >& sizes )
+void FontClient::GetFixedSizes(const FontDescription&         fontDescription,
+                               Dali::Vector<PointSize26Dot6>& sizes)
 {
-  GetImplementation(*this).GetFixedSizes( fontDescription, sizes );
+  GetImplementation(*this).GetFixedSizes(fontDescription, sizes);
 }
 
-void FontClient::GetFontMetrics( FontId fontId, FontMetrics& metrics )
+void FontClient::GetFontMetrics(FontId fontId, FontMetrics& metrics)
 {
-  GetImplementation(*this).GetFontMetrics( fontId, metrics );
+  GetImplementation(*this).GetFontMetrics(fontId, metrics);
 }
 
-GlyphIndex FontClient::GetGlyphIndex( FontId fontId, Character charcode )
+GlyphIndex FontClient::GetGlyphIndex(FontId fontId, Character charcode)
 {
-  return GetImplementation(*this).GetGlyphIndex( fontId, charcode );
+  return GetImplementation(*this).GetGlyphIndex(fontId, charcode);
 }
 
-bool FontClient::GetGlyphMetrics( GlyphInfo* array, uint32_t size, GlyphType type, bool horizontal )
+bool FontClient::GetGlyphMetrics(GlyphInfo* array, uint32_t size, GlyphType type, bool horizontal)
 {
-  return GetImplementation(*this).GetGlyphMetrics( array, size, horizontal );
+  return GetImplementation(*this).GetGlyphMetrics(array, size, horizontal);
 }
 
-void FontClient::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, bool softwareItailc, bool softwareBold, Dali::TextAbstraction::FontClient::GlyphBufferData& data, int outlineWidth )
+void FontClient::CreateBitmap(FontId fontId, GlyphIndex glyphIndex, bool softwareItailc, bool softwareBold, Dali::TextAbstraction::GlyphBufferData& data, int outlineWidth)
 {
-  GetImplementation(*this).CreateBitmap( fontId, glyphIndex, softwareItailc, softwareBold, data, outlineWidth );
+  GetImplementation(*this).CreateBitmap(fontId, glyphIndex, softwareItailc, softwareBold, data, outlineWidth);
 }
 
-PixelData FontClient::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, int outlineWidth )
+PixelData FontClient::CreateBitmap(FontId fontId, GlyphIndex glyphIndex, int outlineWidth)
 {
-  return GetImplementation(*this).CreateBitmap( fontId, glyphIndex, outlineWidth );
+  return GetImplementation(*this).CreateBitmap(fontId, glyphIndex, outlineWidth);
 }
 
-void FontClient::CreateVectorBlob( FontId fontId,
-                                   GlyphIndex glyphIndex,
-                                   VectorBlob*& blob,
-                                   unsigned int& blobLength,
-                                   unsigned int& nominalWidth,
-                                   unsigned int& nominalHeight )
+void FontClient::CreateVectorBlob(FontId        fontId,
+                                  GlyphIndex    glyphIndex,
+                                  VectorBlob*&  blob,
+                                  unsigned int& blobLength,
+                                  unsigned int& nominalWidth,
+                                  unsigned int& nominalHeight)
 {
-  GetImplementation(*this).CreateVectorBlob( fontId, glyphIndex, blob, blobLength, nominalWidth, nominalHeight );
+  GetImplementation(*this).CreateVectorBlob(fontId, glyphIndex, blob, blobLength, nominalWidth, nominalHeight);
 }
 
-const GlyphInfo& FontClient::GetEllipsisGlyph( PointSize26Dot6 pointSize )
+const GlyphInfo& FontClient::GetEllipsisGlyph(PointSize26Dot6 pointSize)
 {
-  return GetImplementation(*this).GetEllipsisGlyph( pointSize );
+  return GetImplementation(*this).GetEllipsisGlyph(pointSize);
 }
 
-bool FontClient::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex )
+bool FontClient::IsColorGlyph(FontId fontId, GlyphIndex glyphIndex)
 {
-  return GetImplementation(*this).IsColorGlyph( fontId, glyphIndex );
+  return GetImplementation(*this).IsColorGlyph(fontId, glyphIndex);
 }
 
-FontClient::FontClient( Internal::FontClient* internal )
-: BaseHandle( internal )
+FontClient::FontClient(Internal::FontClient* internal)
+: BaseHandle(internal)
 {
 }
 
 FontMetrics::FontMetrics()
-: ascender( 0.f ),
-  descender( 0.f ),
-  height( 0.f ),
-  underlinePosition( 0.f ),
-  underlineThickness( 0.f )
+: ascender(0.f),
+  descender(0.f),
+  height(0.f),
+  underlinePosition(0.f),
+  underlineThickness(0.f)
 {
 }
 
@@ -513,20 +572,49 @@ Script GetCharacterScript(unsigned int x)
 {
   return LATIN;
 }
-bool HasLigatureMustBreak(Script x){return false;}
-bool IsCommonScript(unsigned int character){ return false;}
-bool IsNewParagraph(unsigned int character){return false;}
-bool IsRightToLeftScript(Script){return false;}
+bool HasLigatureMustBreak(Script x)
+{
+  return false;
+}
+bool IsCommonScript(unsigned int character)
+{
+  return false;
+}
+bool IsNewParagraph(unsigned int character)
+{
+  return false;
+}
+bool IsRightToLeftScript(Script)
+{
+  return false;
+}
 bool IsWhiteSpace(unsigned int character)
 {
   return character < 0x21;
 }
 
-Segmentation Segmentation::Get(){ return Segmentation();}
-Segmentation::Segmentation(){}
-Segmentation::~Segmentation(){}
-void Segmentation::GetLineBreakPositions(unsigned int const*, unsigned int, char*){}
-void Segmentation::GetWordBreakPositions(unsigned int const*, unsigned int, char*){}
+Segmentation Segmentation::Get()
+{
+  return Segmentation();
+}
+Segmentation::Segmentation()
+{
+}
+Segmentation::~Segmentation()
+{
+}
+void Segmentation::GetLineBreakPositions(unsigned int const*, unsigned int, char*)
+{
+}
+void Segmentation::GetWordBreakPositions(unsigned int const*, unsigned int, char*)
+{
+}
+void Segmentation::GetLineBreakPositionsUtf8(unsigned char const*, unsigned int, char*)
+{
+}
+void Segmentation::GetWordBreakPositionsUtf8(unsigned char const*, unsigned int, char*)
+{
+}
 
 Shaping Shaping::Get()
 {
@@ -537,8 +625,8 @@ Shaping::Shaping()
 {
 }
 
-Shaping::Shaping( Internal::Shaping* internal )
-: BaseHandle( internal )
+Shaping::Shaping(Internal::Shaping* internal)
+: BaseHandle(internal)
 {
 }
 
@@ -546,7 +634,7 @@ Shaping::~Shaping()
 {
 }
 
-void Shaping::GetGlyphs(GlyphInfo* glyphStore, unsigned int*mappingTable)
+void Shaping::GetGlyphs(GlyphInfo* glyphStore, unsigned int* mappingTable)
 {
   // Return store & mapping table (0, 1, 2, 3... N-1))
   GetImplementation(*this).GetGlyphs(glyphStore, mappingTable);
@@ -554,8 +642,8 @@ void Shaping::GetGlyphs(GlyphInfo* glyphStore, unsigned int*mappingTable)
 
 Length Shaping::Shape(unsigned int const* text, unsigned int numChars, unsigned int fontId, Script script)
 {
-  return GetImplementation(*this).Shape( text, numChars, fontId, script );
+  return GetImplementation(*this).Shape(text, numChars, fontId, script);
 }
 
-} // TextAbstraction
-} // Dali
+} // namespace TextAbstraction
+} // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-texture-upload-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-texture-upload-manager.cpp
new file mode 100644
index 0000000..f1c336c
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-texture-upload-manager.cpp
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <toolkit-texture-upload-manager.h>
+
+// EXTERNAL INCLUDE
+#include <dali/devel-api/adaptor-framework/texture-upload-manager.h>
+#include <dali/graphics-api/graphics-controller.h>
+#include <dali/integration-api/pixel-data-integ.h>
+#include <dali/integration-api/texture-integ.h>
+
+// INTERNAL INCLUDE
+#include <test-graphics-controller.h>
+#include <toolkit-application.h>
+
+namespace Dali
+{
+namespace Internal
+{
+namespace Adaptor
+{
+class TextureUploadManager : public Dali::BaseObject
+{
+public:
+  using ResourceId = Dali::Devel::TextureUploadManager::ResourceId;
+
+public:
+  static Dali::Devel::TextureUploadManager Get();
+  TextureUploadManager();
+  ~TextureUploadManager() = default;
+
+  Dali::Texture GenerateTexture2D();
+
+public: // Update thread called method
+  bool ResourceUpload();
+
+  void InitalizeGraphicsController(Dali::Graphics::Controller& graphicsController);
+
+private:                                                             // Update thread called method
+  using UploadRequestItem  = std::pair<ResourceId, Dali::PixelData>; ///< TODO : PixelData? PixelBuffer?
+  using RequestUploadQueue = std::vector<UploadRequestItem>;
+
+  bool ProcessUploadQueue(RequestUploadQueue&& queue);
+
+public: // Worker thread called method
+  /**
+   * @copydoc Dali::Devel::TextureUploadManager::RequestUpload()
+   */
+  void RequestUpload(ResourceId id, Dali::PixelData pixelData);
+
+private:
+  Dali::Graphics::Controller* mGraphicsController;
+  RequestUploadQueue          mRequestUploadQueue{};
+
+public:
+  ResourceId gUniqueResourceId{0u};
+};
+
+inline Internal::Adaptor::TextureUploadManager& GetImplementation(Dali::Devel::TextureUploadManager& obj)
+{
+  DALI_ASSERT_ALWAYS(obj && "TextureUploadManager is empty");
+
+  Dali::BaseObject& handle = obj.GetBaseObject();
+
+  return static_cast<Internal::Adaptor::TextureUploadManager&>(handle);
+}
+
+inline const Internal::Adaptor::TextureUploadManager& GetImplementation(const Dali::Devel::TextureUploadManager& obj)
+{
+  DALI_ASSERT_ALWAYS(obj && "TextureUploadManager is empty");
+
+  const Dali::BaseObject& handle = obj.GetBaseObject();
+
+  return static_cast<const Internal::Adaptor::TextureUploadManager&>(handle);
+}
+
+/********************************************************************************/
+/*********************************  INTERNAL CLASS  *****************************/
+/********************************************************************************/
+
+namespace
+{
+Devel::TextureUploadManager gTextureUploadManager;
+} // namespace
+
+Devel::TextureUploadManager TextureUploadManager::Get()
+{
+  if(!gTextureUploadManager)
+  {
+    gTextureUploadManager = Devel::TextureUploadManager(new TextureUploadManager());
+  }
+  return gTextureUploadManager;
+}
+
+TextureUploadManager::TextureUploadManager()
+: mGraphicsController{nullptr}
+{
+}
+
+Dali::Texture TextureUploadManager::GenerateTexture2D()
+{
+  ResourceId resourceId = ++gUniqueResourceId;
+
+  Dali::Texture ret = Dali::Integration::NewTextureWithResourceId(Dali::TextureType::TEXTURE_2D, resourceId);
+
+  return ret;
+}
+
+// Called by update thread
+
+bool TextureUploadManager::ResourceUpload()
+{
+  DALI_ASSERT_DEBUG(mGraphicsController && "GraphicsController is not prepared!");
+
+  // Upload.
+  bool uploaded = ProcessUploadQueue(std::move(mRequestUploadQueue));
+  mRequestUploadQueue.clear();
+
+  return uploaded;
+}
+
+void TextureUploadManager::InitalizeGraphicsController(Dali::Graphics::Controller& graphicsController)
+{
+  mGraphicsController = &graphicsController;
+}
+
+bool TextureUploadManager::ProcessUploadQueue(RequestUploadQueue&& queue)
+{
+  bool uploaded = false;
+
+  if(!queue.empty())
+  {
+    for(auto& requests : queue)
+    {
+      auto& resourceId = requests.first;
+      auto& pixelData  = requests.second;
+
+      Graphics::Texture* graphicsTexture = nullptr;
+
+      // TODO : Could we detect TEXTURE_2D or TEXTURE_CUBE case in future?
+      {
+        // We always need to create new one
+        auto createInfo = Graphics::TextureCreateInfo();
+        createInfo
+          .SetTextureType(Dali::Graphics::ConvertTextureType(Dali::TextureType::TEXTURE_2D))
+          .SetUsageFlags(static_cast<Graphics::TextureUsageFlags>(Graphics::TextureUsageFlagBits::SAMPLE))
+          .SetFormat(Dali::Graphics::ConvertPixelFormat(pixelData.GetPixelFormat()))
+          .SetSize({pixelData.GetWidth(), pixelData.GetHeight()})
+          .SetLayout(Graphics::TextureLayout::LINEAR)
+          .SetData(nullptr)
+          .SetDataSize(0u)
+          .SetNativeImage(nullptr)
+          .SetMipMapFlag(Graphics::TextureMipMapFlag::DISABLED);
+
+        graphicsTexture = mGraphicsController->CreateTextureByResourceId(resourceId, createInfo);
+      }
+
+      if(graphicsTexture)
+      {
+        Graphics::TextureUpdateInfo info{};
+
+        info.dstTexture   = graphicsTexture;
+        info.dstOffset2D  = {0u, 0u};
+        info.layer        = 0u;
+        info.level        = 0u;
+        info.srcReference = 0;
+        info.srcExtent2D  = {pixelData.GetWidth(), pixelData.GetHeight()};
+        info.srcOffset    = 0;
+        info.srcSize      = Dali::Integration::GetPixelDataBuffer(pixelData).bufferSize;
+        info.srcStride    = pixelData.GetStride();
+        info.srcFormat    = Dali::Graphics::ConvertPixelFormat(pixelData.GetPixelFormat());
+
+        Graphics::TextureUpdateSourceInfo updateSourceInfo{};
+        updateSourceInfo.sourceType                = Graphics::TextureUpdateSourceInfo::Type::PIXEL_DATA;
+        updateSourceInfo.pixelDataSource.pixelData = pixelData;
+
+        mGraphicsController->UpdateTextures({info}, {updateSourceInfo});
+
+        uploaded = true;
+      }
+      else
+      {
+        // Invalidate resouce id! ignore.
+      }
+    }
+
+    if(uploaded)
+    {
+      // Flush here
+      Graphics::SubmitInfo submitInfo;
+      submitInfo.cmdBuffer.clear(); // Only flush
+      submitInfo.flags = 0 | Graphics::SubmitFlagBits::FLUSH;
+      mGraphicsController->SubmitCommandBuffers(submitInfo);
+    }
+  }
+
+  return uploaded;
+}
+
+// Called by worker thread
+
+void TextureUploadManager::RequestUpload(Dali::Devel::TextureUploadManager::ResourceId resourceId, Dali::PixelData pixelData)
+{
+  mRequestUploadQueue.push_back(std::move(UploadRequestItem(resourceId, pixelData)));
+}
+
+} // namespace Adaptor
+
+} // namespace Internal
+
+/********************************************************************************/
+/*********************************  PUBLIC CLASS  *******************************/
+/********************************************************************************/
+
+namespace Devel
+{
+// Called by main thread
+
+TextureUploadManager::TextureUploadManager() = default;
+
+TextureUploadManager::~TextureUploadManager() = default;
+
+TextureUploadManager TextureUploadManager::Get()
+{
+  return Internal::Adaptor::TextureUploadManager::Get();
+}
+
+Dali::Texture TextureUploadManager::GenerateTexture2D()
+{
+  return Internal::Adaptor::GetImplementation(*this).GenerateTexture2D();
+}
+
+TextureUploadManager::TextureUploadManager(Internal::Adaptor::TextureUploadManager* impl)
+: BaseHandle(impl)
+{
+}
+
+// Called by update thread
+
+bool TextureUploadManager::ResourceUpload()
+{
+  return Internal::Adaptor::GetImplementation(*this).ResourceUpload();
+}
+
+// Called by worker thread
+
+void TextureUploadManager::RequestUpload(ResourceId resourceId, PixelData pixelData)
+{
+  Internal::Adaptor::GetImplementation(*this).RequestUpload(resourceId, pixelData);
+}
+
+} // namespace Devel
+
+} // namespace Dali
+
+namespace Test
+{
+namespace TextureUploadManager
+{
+void InitalizeGraphicsController(Dali::Graphics::Controller& graphicsController)
+{
+  auto textureUploadManager = Dali::Devel::TextureUploadManager::Get();
+  Internal::Adaptor::GetImplementation(textureUploadManager).InitalizeGraphicsController(graphicsController);
+}
+} // namespace TextureUploadManager
+} // namespace Test
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-texture-upload-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-texture-upload-manager.h
new file mode 100644
index 0000000..18585fd
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-texture-upload-manager.h
@@ -0,0 +1,40 @@
+#ifndef DALI_TOOLKIT_TOOLKIT_TEXTURE_UPLOAD_MANAGER_H
+#define DALI_TOOLKIT_TOOLKIT_TEXTURE_UPLOAD_MANAGER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/texture-upload-manager.h>
+
+namespace Dali
+{
+namespace Graphics DALI_INTERNAL
+{
+class Controller;
+} // namespace DALI_INTERNAL
+} // namespace Dali
+
+namespace Test
+{
+namespace TextureUploadManager
+{
+void InitalizeGraphicsController(Dali::Graphics::Controller& graphicsController);
+}
+} // namespace Test
+
+#endif // DALI_TOOLKIT_TOOLKIT_TEXTURE_UPLOAD_MANAGER_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
old mode 100755
new mode 100644
index 2ccf2c1..aec90ad
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,50 +15,53 @@
  *
  */
 
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 #include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/object/base-object.h>
+#include <dali/public-api/object/property-array.h>
 #include <toolkit-application.h>
-#include <toolkit-vector-animation-renderer.h>
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-vector-animation-renderer.h>
+#include <chrono>
 #include <memory>
 #include <thread>
-#include <chrono>
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace Adaptor
 {
-
 namespace
 {
 Dali::Internal::Adaptor::VectorAnimationRenderer* gVectorAnimationRenderer = nullptr;
 }
 
-class VectorAnimationRenderer: public Dali::BaseObject
+class VectorAnimationRenderer : public Dali::BaseObject
 {
 public:
-
   VectorAnimationRenderer()
   : mUrl(),
     mRenderer(),
-    mWidth( 0 ),
-    mHeight( 0 ),
+    mWidth(0),
+    mHeight(0),
+    mDefaultWidth(0),
+    mDefaultHeight(0),
     mTotalFrameNumber(VECTOR_ANIMATION_TOTAL_FRAME_NUMBER),
-    mPreviousFrame( 0 ),
+    mPreviousFrame(0),
     mDelayTime(0),
     mDroppedFrames(0),
-    mFrameRate( 60.0f ),
+    mFrameRate(60.0f),
     mTestFrameDrop(false),
     mNeedDroppedFrames(false),
-    mEventThreadCallback( new EventThreadCallback( MakeCallback( this, &VectorAnimationRenderer::OnTriggered ) ) )
+    mUseNativeImage(false),
+    mEventThreadCallback(new EventThreadCallback(MakeCallback(this, &VectorAnimationRenderer::OnTriggered)))
   {
     mCount++;
 
-    if( mCount == 2 )
+    if(mCount == 2)
     {
       mFrameRate = 0.1f;
     }
@@ -71,69 +74,86 @@ public:
 
   bool Load(const std::string& url)
   {
+    Dali::Mutex::ScopedLock lock(mMutex);
     mUrl = url;
     if(mUrl == "invalid.json")
     {
+      mLoadFailed = true;
       return false;
     }
     else if(mUrl == "framedrop.json")
     {
       // Change total frame number for test
       mTotalFrameNumber = 200;
-      mTestFrameDrop = true;
     }
+
+    mDefaultWidth  = 100;
+    mDefaultHeight = 100;
+
     return true;
   }
 
-  void SetRenderer( Dali::Renderer renderer )
+  bool Load(const Dali::Vector<uint8_t>& data)
   {
-    mRenderer = renderer;
+    Dali::Mutex::ScopedLock lock(mMutex);
 
-    if( mWidth != 0 && mHeight != 0 )
-    {
-      Dali::TextureSet textureSet = mRenderer.GetTextures();
-      Dali::Texture texture = Dali::Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight );
-      textureSet.SetTexture( 0, texture );
-      mUploadCompletedSignal.Emit();
-    }
+    mDefaultWidth  = 100;
+    mDefaultHeight = 100;
+
+    return true;
+  }
+
+  void SetRenderer(Dali::Renderer renderer)
+  {
+    mRenderer = renderer;
   }
 
-  void SetSize( uint32_t width, uint32_t height )
+  void SetSize(uint32_t width, uint32_t height)
   {
-    mWidth = width;
+    Dali::Mutex::ScopedLock lock(mMutex);
+    mWidth  = width;
     mHeight = height;
 
-    if( mRenderer )
+    if(!mLoadFailed)
     {
-      Dali::TextureSet textureSet = mRenderer.GetTextures();
-      Dali::Texture texture = Dali::Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight );
-      textureSet.SetTexture( 0, texture );
-      mUploadCompletedSignal.Emit();
+      mNeedTrigger   = true;
+      mResourceReady = false;
     }
   }
 
-  bool Render( uint32_t frameNumber )
+  bool Render(uint32_t frameNumber)
   {
+    Dali::Mutex::ScopedLock lock(mMutex);
+    if(mWidth == 0 || mHeight == 0)
+    {
+      return false;
+    }
+
     if(mTestFrameDrop)
     {
       std::this_thread::sleep_for(std::chrono::milliseconds(static_cast<int32_t>(mDelayTime)));
-      mTestFrameDrop = false;
+      mTestFrameDrop     = false;
       mNeedDroppedFrames = true;
     }
     else if(mNeedDroppedFrames)
     {
-      mDroppedFrames = (frameNumber > mPreviousFrame) ? frameNumber - mPreviousFrame - 1: frameNumber + (mTotalFrameNumber - mPreviousFrame) - 1;
-      mNeedTrigger = true;
+      mDroppedFrames     = (frameNumber > mPreviousFrame) ? frameNumber - mPreviousFrame - 1 : frameNumber + (mTotalFrameNumber - mPreviousFrame) - 1;
+      mNeedTrigger       = true;
       mNeedDroppedFrames = false;
     }
 
-    if( mNeedTrigger )
+    if(mDynamicPropertyCallback)
+    {
+      CallbackBase::ExecuteReturn<Property::Value>(*mDynamicPropertyCallback, 0, 0, frameNumber);
+    }
+
+    if(mNeedTrigger)
     {
       mEventThreadCallback->Trigger();
       mNeedTrigger = false;
     }
 
-    if( frameNumber == 1 && mPreviousFrame != frameNumber )
+    if(frameNumber == 1 && mPreviousFrame != frameNumber)
     {
       mPreviousFrame = frameNumber;
       // For test corverage
@@ -153,23 +173,23 @@ public:
     return mFrameRate;
   }
 
-  void GetDefaultSize( uint32_t& width, uint32_t& height ) const
+  void GetDefaultSize(uint32_t& width, uint32_t& height) const
   {
-    width = 100;
-    height = 100;
+    width  = mDefaultWidth;
+    height = mDefaultHeight;
   }
 
-  bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+  bool GetMarkerInfo(const std::string& marker, uint32_t& startFrame, uint32_t& endFrame) const
   {
-    if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_1 ) == 0 )
+    if(marker.compare(VECTOR_ANIMATION_MARKER_NAME_1) == 0)
     {
       startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_1;
-      endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_1;
+      endFrame   = VECTOR_ANIMATION_MARKER_END_FRAME_1;
     }
-    else if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_2 ) == 0 )
+    else if(marker.compare(VECTOR_ANIMATION_MARKER_NAME_2) == 0)
     {
       startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_2;
-      endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_2;
+      endFrame   = VECTOR_ANIMATION_MARKER_END_FRAME_2;
     }
     else
     {
@@ -178,6 +198,27 @@ public:
     return true;
   }
 
+  void InvalidateBuffer()
+  {
+    Dali::Mutex::ScopedLock lock(mMutex);
+    if(mResourceReady)
+    {
+      mNeedTrigger   = true;
+      mResourceReady = false;
+    }
+  }
+
+  void AddPropertyValueCallback(const std::string& keyPath, Dali::VectorAnimationRenderer::VectorProperty property, CallbackBase* callback, int32_t id)
+  {
+    mDynamicPropertyCallback = std::unique_ptr<CallbackBase>(callback);
+  }
+
+  void KeepRasterizedBuffer()
+  {
+    Dali::Mutex::ScopedLock lock(mMutex);
+    mEnableFixedCache = true;
+  }
+
   Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal()
   {
     return mUploadCompletedSignal;
@@ -185,50 +226,81 @@ public:
 
   void OnTriggered()
   {
+    if(!mResourceReady)
+    {
+      mResourceReady = true;
+
+      Dali::TextureSet textureSet = mRenderer.GetTextures();
+
+      if(mUseNativeImage)
+      {
+        Dali::NativeImageSourcePtr nativeImageSource = Dali::NativeImageSource::New(mWidth, mHeight, Dali::NativeImageSource::COLOR_DEPTH_32);
+        Dali::Texture              texture           = Dali::Texture::New(*nativeImageSource);
+        textureSet.SetTexture(0, texture);
+      }
+      else
+      {
+        Dali::Texture texture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight);
+        textureSet.SetTexture(0, texture);
+
+        Devel::PixelBuffer pixelBuffer = Devel::PixelBuffer::New(mWidth, mHeight, Pixel::RGBA8888);
+        Dali::PixelData    pixelData   = Devel::PixelBuffer::Convert(pixelBuffer);
+        texture.Upload(pixelData);
+      }
+
+      mUploadCompletedSignal.Emit();
+    }
   }
 
 public:
-
   static uint32_t mCount;
-  static bool mNeedTrigger;
 
-  std::string mUrl;
-  Dali::Renderer mRenderer;
+  std::string                   mUrl;
+  Dali::Renderer                mRenderer;
+  Dali::Mutex                   mMutex;
+  std::unique_ptr<CallbackBase> mDynamicPropertyCallback{nullptr};
+
   uint32_t mWidth;
   uint32_t mHeight;
+  uint32_t mDefaultWidth;
+  uint32_t mDefaultHeight;
   uint32_t mTotalFrameNumber;
   uint32_t mPreviousFrame;
   uint32_t mDelayTime;
   uint32_t mDroppedFrames;
-  float mFrameRate;
-  bool mTestFrameDrop;
-  bool mNeedDroppedFrames;
+  float    mFrameRate;
+  bool     mTestFrameDrop;
+  bool     mNeedDroppedFrames;
+  bool     mLoadFailed{false};
+  bool     mResourceReady{false};
+  bool     mNeedTrigger{true};
+  bool     mEnableFixedCache{false};
+  bool     mUseNativeImage{false};
+
   Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal;
-  std::unique_ptr< EventThreadCallback > mEventThreadCallback;
+  std::unique_ptr<EventThreadCallback>                     mEventThreadCallback;
 };
 
 uint32_t VectorAnimationRenderer::mCount = 0;
-bool VectorAnimationRenderer::mNeedTrigger = true;
 
-inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer )
+inline VectorAnimationRenderer& GetImplementation(Dali::VectorAnimationRenderer& renderer)
 {
-  DALI_ASSERT_ALWAYS( renderer && "VectorAnimationRenderer handle is empty." );
+  DALI_ASSERT_ALWAYS(renderer && "VectorAnimationRenderer handle is empty.");
   BaseObject& handle = renderer.GetBaseObject();
-  return static_cast< Internal::Adaptor::VectorAnimationRenderer& >( handle );
+  return static_cast<Internal::Adaptor::VectorAnimationRenderer&>(handle);
 }
 
-inline const VectorAnimationRenderer& GetImplementation( const Dali::VectorAnimationRenderer& renderer )
+inline const VectorAnimationRenderer& GetImplementation(const Dali::VectorAnimationRenderer& renderer)
 {
-  DALI_ASSERT_ALWAYS( renderer && "VectorAnimationRenderer handle is empty." );
+  DALI_ASSERT_ALWAYS(renderer && "VectorAnimationRenderer handle is empty.");
   const BaseObject& handle = renderer.GetBaseObject();
-  return static_cast< const Internal::Adaptor::VectorAnimationRenderer& >( handle );
+  return static_cast<const Internal::Adaptor::VectorAnimationRenderer&>(handle);
 }
 
 } // namespace Adaptor
 
 } // namespace Internal
 
-
 /********************************************************************************/
 /*********************************  PUBLIC CLASS  *******************************/
 /********************************************************************************/
@@ -239,7 +311,7 @@ VectorAnimationRenderer VectorAnimationRenderer::New()
 
   Internal::Adaptor::gVectorAnimationRenderer = animationRenderer;
 
-  return VectorAnimationRenderer( animationRenderer );
+  return VectorAnimationRenderer(animationRenderer);
 }
 
 VectorAnimationRenderer::VectorAnimationRenderer()
@@ -250,19 +322,19 @@ VectorAnimationRenderer::~VectorAnimationRenderer()
 {
 }
 
-VectorAnimationRenderer::VectorAnimationRenderer( Internal::Adaptor::VectorAnimationRenderer* internal )
-: BaseHandle( internal )
+VectorAnimationRenderer::VectorAnimationRenderer(Internal::Adaptor::VectorAnimationRenderer* internal)
+: BaseHandle(internal)
 {
 }
 
-VectorAnimationRenderer::VectorAnimationRenderer( const VectorAnimationRenderer& handle )
-: BaseHandle( handle )
+VectorAnimationRenderer::VectorAnimationRenderer(const VectorAnimationRenderer& handle)
+: BaseHandle(handle)
 {
 }
 
-VectorAnimationRenderer& VectorAnimationRenderer::operator=( const VectorAnimationRenderer& rhs )
+VectorAnimationRenderer& VectorAnimationRenderer::operator=(const VectorAnimationRenderer& rhs)
 {
-  BaseHandle::operator=( rhs );
+  BaseHandle::operator=(rhs);
   return *this;
 }
 
@@ -272,68 +344,93 @@ void VectorAnimationRenderer::Finalize()
 
 bool VectorAnimationRenderer::Load(const std::string& url)
 {
-  return Internal::Adaptor::GetImplementation( *this ).Load(url);
+  return Internal::Adaptor::GetImplementation(*this).Load(url);
+}
+
+bool VectorAnimationRenderer::Load(const Dali::Vector<uint8_t>& data)
+{
+  return Internal::Adaptor::GetImplementation(*this).Load(data);
+}
+
+void VectorAnimationRenderer::SetRenderer(Renderer renderer)
+{
+  Internal::Adaptor::GetImplementation(*this).SetRenderer(renderer);
 }
 
-void VectorAnimationRenderer::SetRenderer( Renderer renderer )
+void VectorAnimationRenderer::SetSize(uint32_t width, uint32_t height)
 {
-  Internal::Adaptor::GetImplementation( *this ).SetRenderer( renderer );
+  Internal::Adaptor::GetImplementation(*this).SetSize(width, height);
 }
 
-void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
+bool VectorAnimationRenderer::Render(uint32_t frameNumber)
 {
-  Internal::Adaptor::GetImplementation( *this ).SetSize( width, height );
+  return Internal::Adaptor::GetImplementation(*this).Render(frameNumber);
 }
 
-bool VectorAnimationRenderer::Render( uint32_t frameNumber )
+void VectorAnimationRenderer::RenderStopped()
 {
-  return Internal::Adaptor::GetImplementation( *this ).Render( frameNumber );
 }
 
 uint32_t VectorAnimationRenderer::GetTotalFrameNumber() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetTotalFrameNumber();
+  return Internal::Adaptor::GetImplementation(*this).GetTotalFrameNumber();
 }
 
 float VectorAnimationRenderer::GetFrameRate() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetFrameRate();
+  return Internal::Adaptor::GetImplementation(*this).GetFrameRate();
 }
 
-void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height ) const
+void VectorAnimationRenderer::GetDefaultSize(uint32_t& width, uint32_t& height) const
 {
-  Internal::Adaptor::GetImplementation( *this ).GetDefaultSize( width, height );
+  Internal::Adaptor::GetImplementation(*this).GetDefaultSize(width, height);
 }
 
-void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const
+void VectorAnimationRenderer::GetLayerInfo(Property::Map& map) const
 {
 }
 
-bool VectorAnimationRenderer::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+bool VectorAnimationRenderer::GetMarkerInfo(const std::string& marker, uint32_t& startFrame, uint32_t& endFrame) const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetMarkerInfo( marker, startFrame, endFrame );
+  return Internal::Adaptor::GetImplementation(*this).GetMarkerInfo(marker, startFrame, endFrame);
 }
 
-VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal()
+void VectorAnimationRenderer::GetMarkerInfo(Property::Map& map) const
 {
-  return Internal::Adaptor::GetImplementation( *this ).UploadCompletedSignal();
+  map.Add(VECTOR_ANIMATION_MARKER_NAME_1, Property::Array({VECTOR_ANIMATION_MARKER_START_FRAME_1, VECTOR_ANIMATION_MARKER_END_FRAME_1}));
+  map.Add(VECTOR_ANIMATION_MARKER_NAME_2, Property::Array({VECTOR_ANIMATION_MARKER_START_FRAME_2, VECTOR_ANIMATION_MARKER_END_FRAME_2}));
 }
 
-} // namespace Dali
+void VectorAnimationRenderer::InvalidateBuffer()
+{
+  return Internal::Adaptor::GetImplementation(*this).InvalidateBuffer();
+}
 
-namespace Test
+void VectorAnimationRenderer::AddPropertyValueCallback(const std::string& keyPath, VectorProperty property, CallbackBase* callback, int32_t id)
 {
-namespace VectorAnimationRenderer
+  Internal::Adaptor::GetImplementation(*this).AddPropertyValueCallback(keyPath, property, callback, id);
+}
+
+void VectorAnimationRenderer::KeepRasterizedBuffer()
 {
+  Internal::Adaptor::GetImplementation(*this).KeepRasterizedBuffer();
+}
 
-void RequestTrigger()
+VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal()
 {
-  Dali::Internal::Adaptor::VectorAnimationRenderer::mNeedTrigger = true;
+  return Internal::Adaptor::GetImplementation(*this).UploadCompletedSignal();
 }
 
+} // namespace Dali
+
+namespace Test
+{
+namespace VectorAnimationRenderer
+{
 void DelayRendering(uint32_t delay)
 {
-  Dali::Internal::Adaptor::gVectorAnimationRenderer->mDelayTime = delay;
+  Dali::Internal::Adaptor::gVectorAnimationRenderer->mDelayTime     = delay;
+  Dali::Internal::Adaptor::gVectorAnimationRenderer->mTestFrameDrop = true;
 }
 
 uint32_t GetDroppedFrames()
@@ -341,6 +438,10 @@ uint32_t GetDroppedFrames()
   return Dali::Internal::Adaptor::gVectorAnimationRenderer->mDroppedFrames;
 }
 
-} // VectorAnimationRenderer
-} // Test
+void UseNativeImageTexture(bool useNativeImage)
+{
+  Dali::Internal::Adaptor::gVectorAnimationRenderer->mUseNativeImage = useNativeImage;
+}
 
+} // namespace VectorAnimationRenderer
+} // namespace Test
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.h
old mode 100755
new mode 100644
index a1ea51b..9177afd
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEST_VECTOR_ANIMATION_RENDERER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ namespace Test
 {
 namespace VectorAnimationRenderer
 {
-
 #define VECTOR_ANIMATION_TOTAL_FRAME_NUMBER 5
 #define VECTOR_ANIMATION_MARKER_NAME_1 "marker1"
 #define VECTOR_ANIMATION_MARKER_NAME_2 "marker2"
@@ -31,12 +30,11 @@ namespace VectorAnimationRenderer
 #define VECTOR_ANIMATION_MARKER_START_FRAME_2 2
 #define VECTOR_ANIMATION_MARKER_END_FRAME_2 3
 
-void RequestTrigger();
-void DelayRendering(uint32_t delay);
+void     DelayRendering(uint32_t delay);
 uint32_t GetDroppedFrames();
+void     UseNativeImageTexture(bool useNativeImage);
 
-} // VectorAnimationRenderer
-} // Test
-
+} // namespace VectorAnimationRenderer
+} // namespace Test
 
 #endif // DALI_TOOLKIT_TEST_VECTOR_ANIMATION_RENDERER_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
index b0365ff..78252b8 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,29 +18,59 @@
 #include <dali/devel-api/adaptor-framework/vector-image-renderer.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/rendering/renderer.h>
+#include <sys/stat.h>
 #include <toolkit-application.h>
 #include <toolkit-event-thread-callback.h>
-#include <memory>
+#include <toolkit-vector-image-renderer.h>
 #include <cstring>
-#include <sys/stat.h>
+#include <memory>
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace Adaptor
 {
+namespace
+{
+Dali::Internal::Adaptor::VectorImageRenderer* gVectorImageRenderer = nullptr;
 
-class VectorImageRenderer: public Dali::BaseObject
+/**
+ * @brief Check whether the data contain keyword as substring or not.
+ * It can be used as Naive Check-up to determine vector image loaded successfully or not.
+ *
+ * @param[in] data Raw data
+ * @param[in] keyword Keyword to check data holded or not.
+ * @return True if data contain keyword.
+ */
+bool CheckKeywordExist(const Vector<uint8_t>& data, std::string keyword)
 {
-public:
+  std::string trimedString;
+
+  // Remove useless character in data.
+  for(const uint8_t& it : data)
+  {
+    if(keyword.find(it) != std::string::npos)
+    {
+      trimedString.push_back(it);
+    }
+  }
 
+  if(trimedString.length() >= keyword.length())
+  {
+    if(trimedString.find(keyword) != std::string::npos)
+    {
+      return true;
+    }
+  }
+  return false;
+}
+} // namespace
+
+class VectorImageRenderer : public Dali::BaseObject
+{
+public:
   VectorImageRenderer()
-  : mWidth(0),
-    mHeight(0),
-    mRasterizeSuccess(true)
   {
   }
 
@@ -50,6 +80,7 @@ public:
 
   bool Load(const Vector<uint8_t>& data, float dpi)
   {
+    mLoadCount++;
     if(strncmp(reinterpret_cast<char*>(data.Begin()), "invalid", 7) == 0)
     {
       return false;
@@ -58,46 +89,62 @@ public:
     {
       mRasterizeSuccess = false;
     }
+    // Naive check-up whether data is valid format or not. Currently we only check svg and tvg file format.
+    else if(!CheckKeywordExist(data, "</svg>") && !CheckKeywordExist(data, "ThorVG"))
+    {
+      return false;
+    }
+    mLoadSuccess = true;
     return true;
   }
 
-  bool Rasterize(Dali::Devel::PixelBuffer& buffer, float scale)
+  bool IsLoaded() const
   {
-     return mRasterizeSuccess;
+    return mLoadSuccess;
+  }
+
+  Dali::Devel::PixelBuffer Rasterize(uint32_t width, uint32_t height)
+  {
+    if(mRasterizeSuccess)
+    {
+      Devel::PixelBuffer pixelBuffer = Devel::PixelBuffer::New(width, height, Dali::Pixel::RGBA8888);
+      return pixelBuffer;
+    }
+    return Dali::Devel::PixelBuffer();
   }
 
   void GetDefaultSize(uint32_t& width, uint32_t& height) const
   {
-    width = 100;
+    width  = 100;
     height = 100;
   }
 
 public:
-
-  uint32_t mWidth;
-  uint32_t mHeight;
-  bool     mRasterizeSuccess;
+  uint32_t mWidth{0};
+  uint32_t mHeight{0};
+  uint32_t mLoadCount{0};
+  bool     mLoadSuccess{false};
+  bool     mRasterizeSuccess{true};
 };
 
-inline VectorImageRenderer& GetImplementation( Dali::VectorImageRenderer& renderer )
+inline VectorImageRenderer& GetImplementation(Dali::VectorImageRenderer& renderer)
 {
-  DALI_ASSERT_ALWAYS( renderer && "VectorImageRenderer handle is empty." );
+  DALI_ASSERT_ALWAYS(renderer && "VectorImageRenderer handle is empty.");
   BaseObject& handle = renderer.GetBaseObject();
-  return static_cast< Internal::Adaptor::VectorImageRenderer& >( handle );
+  return static_cast<Internal::Adaptor::VectorImageRenderer&>(handle);
 }
 
-inline const VectorImageRenderer& GetImplementation( const Dali::VectorImageRenderer& renderer )
+inline const VectorImageRenderer& GetImplementation(const Dali::VectorImageRenderer& renderer)
 {
-  DALI_ASSERT_ALWAYS( renderer && "VectorImageRenderer handle is empty." );
+  DALI_ASSERT_ALWAYS(renderer && "VectorImageRenderer handle is empty.");
   const BaseObject& handle = renderer.GetBaseObject();
-  return static_cast< const Internal::Adaptor::VectorImageRenderer& >( handle );
+  return static_cast<const Internal::Adaptor::VectorImageRenderer&>(handle);
 }
 
 } // namespace Adaptor
 
 } // namespace Internal
 
-
 /********************************************************************************/
 /*********************************  PUBLIC CLASS  *******************************/
 /********************************************************************************/
@@ -106,7 +153,9 @@ VectorImageRenderer VectorImageRenderer::New()
 {
   Internal::Adaptor::VectorImageRenderer* imageRenderer = new Internal::Adaptor::VectorImageRenderer();
 
-  return VectorImageRenderer( imageRenderer );
+  Internal::Adaptor::gVectorImageRenderer = imageRenderer;
+
+  return VectorImageRenderer(imageRenderer);
 }
 
 VectorImageRenderer::VectorImageRenderer()
@@ -117,8 +166,8 @@ VectorImageRenderer::~VectorImageRenderer()
 {
 }
 
-VectorImageRenderer::VectorImageRenderer( Internal::Adaptor::VectorImageRenderer* internal )
-: BaseHandle( internal )
+VectorImageRenderer::VectorImageRenderer(Internal::Adaptor::VectorImageRenderer* internal)
+: BaseHandle(internal)
 {
 }
 
@@ -127,14 +176,31 @@ bool VectorImageRenderer::Load(const Vector<uint8_t>& data, float dpi)
   return Internal::Adaptor::GetImplementation(*this).Load(data, dpi);
 }
 
-bool VectorImageRenderer::Rasterize(Dali::Devel::PixelBuffer& buffer, float scale)
+bool VectorImageRenderer::IsLoaded() const
 {
-  return Internal::Adaptor::GetImplementation(*this).Rasterize(buffer, scale);
+  return Internal::Adaptor::GetImplementation(*this).IsLoaded();
 }
 
-void VectorImageRenderer::GetDefaultSize( uint32_t& width, uint32_t& height ) const
+Dali::Devel::PixelBuffer VectorImageRenderer::Rasterize(uint32_t width, uint32_t height)
 {
-  Internal::Adaptor::GetImplementation( *this ).GetDefaultSize( width, height );
+  return Internal::Adaptor::GetImplementation(*this).Rasterize(width, height);
+}
+
+void VectorImageRenderer::GetDefaultSize(uint32_t& width, uint32_t& height) const
+{
+  Internal::Adaptor::GetImplementation(*this).GetDefaultSize(width, height);
 }
 
 } // namespace Dali
+
+namespace Test
+{
+namespace VectorImageRenderer
+{
+uint32_t GetLoadCount()
+{
+  return Dali::Internal::Adaptor::gVectorImageRenderer->mLoadCount;
+}
+
+} // namespace VectorImageRenderer
+} // namespace Test
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.h
new file mode 100644
index 0000000..37cc362
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.h
@@ -0,0 +1,30 @@
+#ifndef DALI_TOOLKIT_TEST_VECTOR_IMAGE_RENDERER_H
+#define DALI_TOOLKIT_TEST_VECTOR_IMAGE_RENDERER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Test
+{
+namespace VectorImageRenderer
+{
+uint32_t GetLoadCount();
+
+} // namespace VectorImageRenderer
+} // namespace Test
+
+#endif // DALI_TOOLKIT_TEST_VECTOR_IMAGE_RENDERER_H
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp
old mode 100755
new mode 100644
index 8f8853c..19f32b3
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,53 +17,51 @@
 
 #include "toolkit-timer.h"
 
-#include <dali/devel-api/adaptor-framework/web-engine.h>
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list.h>
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list-item.h>
-#include <dali/devel-api/adaptor-framework/web-engine-certificate.h>
-#include <dali/devel-api/adaptor-framework/web-engine-console-message.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu-item.h>
-#include <dali/devel-api/adaptor-framework/web-engine-cookie-manager.h>
-#include <dali/devel-api/adaptor-framework/web-engine-form-repost-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-frame.h>
-#include <dali/devel-api/adaptor-framework/web-engine-hit-test.h>
-#include <dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h>
-#include <dali/devel-api/adaptor-framework/web-engine-load-error.h>
-#include <dali/devel-api/adaptor-framework/web-engine-policy-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-request-interceptor.h>
-#include <dali/devel-api/adaptor-framework/web-engine-security-origin.h>
-#include <dali/devel-api/adaptor-framework/web-engine-settings.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-frame.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-request-interceptor.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/images/pixel-data.h>
 #include <dali/public-api/object/any.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/property-map.h>
-#include <memory>
 #include <string.h>
 #include <toolkit-application.h>
+#include <memory>
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace Adaptor
 {
-
 class WebEngine;
 class MockWebEngineContext;
+class MockWebEngineCookieManager;
 
 namespace
 {
-
 // Generally only one WebEngine instance exists.
 // If > 1, a new web engine has been created by CreateWindowSignal.
-static WebEngine* gInstance = nullptr;
-static int gInstanceCount = 0;
-static MockWebEngineContext* gWebEngineContextInstance = nullptr;
+WebEngine*                  gInstance                   = nullptr;
+int                         gInstanceCount              = 0;
+MockWebEngineContext*       gWebEngineContextInstance   = nullptr;
+MockWebEngineCookieManager* gMockWebEngineCookieManager = nullptr;
 
 bool OnGoBack();
 bool OnGoForward();
@@ -87,24 +85,24 @@ bool OnRequestIntercepted();
 bool OnChangesWatch();
 bool OnPlainTextReceived();
 
-static void ConnectToGlobalSignal( bool ( *func )() )
+static void ConnectToGlobalSignal(bool (*func)())
 {
-  Dali::Timer timer = Dali::Timer::New( 0 );
-  timer.TickSignal().Connect( func );
+  Dali::Timer timer = Dali::Timer::New(0);
+  timer.TickSignal().Connect(func);
 }
 
-static void DisconnectFromGlobalSignal( bool ( *func )() )
+static void DisconnectFromGlobalSignal(bool (*func)())
 {
-  Dali::Timer timer = Dali::Timer::New( 0 );
-  timer.TickSignal().Disconnect( func );
+  Dali::Timer timer = Dali::Timer::New(0);
+  timer.TickSignal().Disconnect(func);
 }
-} // namespace anonymous
+} // namespace
 
 class MockWebEngineContext : public Dali::WebEngineContext
 {
 public:
   MockWebEngineContext()
-    : mockModel( Dali::WebEngineContext::CacheModel::DOCUMENT_VIEWER )
+  : mockModel(Dali::WebEngineContext::CacheModel::DOCUMENT_VIEWER)
   {
   }
 
@@ -113,12 +111,12 @@ public:
     return mockModel;
   }
 
-  void SetCacheModel( Dali::WebEngineContext::CacheModel cacheModel ) override
+  void SetCacheModel(Dali::WebEngineContext::CacheModel cacheModel) override
   {
     mockModel = cacheModel;
   }
 
-  void SetProxyUri( const std::string& uri ) override
+  void SetProxyUri(const std::string& uri) override
   {
     mockProxyUri = uri;
   }
@@ -138,11 +136,11 @@ public:
     return mockBypassRule;
   }
 
-  void SetDefaultProxyAuth( const std::string& username, const std::string& password ) override
+  void SetDefaultProxyAuth(const std::string& username, const std::string& password) override
   {
   }
 
-  void SetCertificateFilePath( const std::string& certificatePath ) override
+  void SetCertificateFilePath(const std::string& certificatePath) override
   {
     mockCertificateFilePath = certificatePath;
   }
@@ -158,7 +156,7 @@ public:
 
   bool GetWebDatabaseOrigins(Dali::WebEngineContext::WebEngineSecurityOriginAcquiredCallback callback) override
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnSecurityOriginAcquired);
       mSecurityOriginAcquiredCallback = callback;
@@ -173,7 +171,7 @@ public:
 
   bool GetWebStorageOrigins(Dali::WebEngineContext::WebEngineSecurityOriginAcquiredCallback callback) override
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnSecurityOriginAcquired);
       mSecurityOriginAcquiredCallback = callback;
@@ -183,7 +181,7 @@ public:
 
   bool GetWebStorageUsageForOrigin(Dali::WebEngineSecurityOrigin& origin, Dali::WebEngineContext::WebEngineStorageUsageAcquiredCallback callback) override
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnStorageUsageAcquired);
       mStorageUsageAcquiredCallback = callback;
@@ -215,7 +213,7 @@ public:
 
   void GetFormPasswordList(Dali::WebEngineContext::WebEngineFormPasswordAcquiredCallback callback) override
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnFormPasswordAcquired);
       mFormPasswordAcquiredCallback = callback;
@@ -224,7 +222,7 @@ public:
 
   void RegisterDownloadStartedCallback(Dali::WebEngineContext::WebEngineDownloadStartedCallback callback) override
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnDownloadStarted);
       mDownloadStartedCallback = callback;
@@ -233,7 +231,7 @@ public:
 
   void RegisterMimeOverriddenCallback(Dali::WebEngineContext::WebEngineMimeOverriddenCallback callback) override
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnMimeOverridden);
       mMimeOverriddenCallback = callback;
@@ -242,14 +240,14 @@ public:
 
   void RegisterRequestInterceptedCallback(Dali::WebEngineContext::WebEngineRequestInterceptedCallback callback) override
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnRequestIntercepted);
       mRequestInterceptedCallback = callback;
     }
   }
 
-  void EnableCache( bool cacheEnabled ) override
+  void EnableCache(bool cacheEnabled) override
   {
     mockCacheEnabled = cacheEnabled;
   }
@@ -342,15 +340,24 @@ private:
   float                              mockZoomFactor;
 };
 
+Dali::WebEngineContext* GetContext()
+{
+  if(!gWebEngineContextInstance)
+  {
+    gWebEngineContextInstance = new MockWebEngineContext();
+  }
+  return gWebEngineContextInstance;
+}
+
 class MockWebEngineCookieManager : public Dali::WebEngineCookieManager
 {
 public:
   MockWebEngineCookieManager()
-    : mockCookieAcceptPolicy( Dali::WebEngineCookieManager::CookieAcceptPolicy::NO_THIRD_PARTY )
+  : mockCookieAcceptPolicy(Dali::WebEngineCookieManager::CookieAcceptPolicy::NO_THIRD_PARTY)
   {
   }
 
-  void SetCookieAcceptPolicy( Dali::WebEngineCookieManager::CookieAcceptPolicy policy ) override
+  void SetCookieAcceptPolicy(Dali::WebEngineCookieManager::CookieAcceptPolicy policy) override
   {
     mockCookieAcceptPolicy = policy;
   }
@@ -364,15 +371,15 @@ public:
   {
   }
 
-  void SetPersistentStorage( const std::string& path, Dali::WebEngineCookieManager::CookiePersistentStorage storage ) override
+  void SetPersistentStorage(const std::string& path, Dali::WebEngineCookieManager::CookiePersistentStorage storage) override
   {
   }
 
-  void ChangesWatch( Dali::WebEngineCookieManager::WebEngineCookieManagerChangesWatchCallback callback ) override
+  void ChangesWatch(Dali::WebEngineCookieManager::WebEngineCookieManagerChangesWatchCallback callback) override
   {
-    if ( callback )
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnChangesWatch );
+      ConnectToGlobalSignal(&OnChangesWatch);
       mChangesWatchCallback = callback;
     }
   }
@@ -384,13 +391,22 @@ private:
   Dali::WebEngineCookieManager::CookieAcceptPolicy mockCookieAcceptPolicy;
 };
 
+Dali::WebEngineCookieManager* GetCookieManager()
+{
+  if(!gMockWebEngineCookieManager)
+  {
+    gMockWebEngineCookieManager = new MockWebEngineCookieManager();
+  }
+  return gMockWebEngineCookieManager;
+}
+
 class MockWebEngineBackForwardListItem : public Dali::WebEngineBackForwardListItem
 {
 public:
   MockWebEngineBackForwardListItem()
-    : mockUrl( "http://url" ),
-      mockTitle( "title" ),
-      mockOriginalUrl( "http://originalurl" )
+  : mockUrl("http://url"),
+    mockTitle("title"),
+    mockOriginalUrl("http://originalurl")
   {
   }
 
@@ -440,7 +456,7 @@ public:
     return ret;
   }
 
-  std::unique_ptr<Dali::WebEngineBackForwardListItem> GetItemAtIndex( uint32_t index ) const override
+  std::unique_ptr<Dali::WebEngineBackForwardListItem> GetItemAtIndex(uint32_t index) const override
   {
     std::unique_ptr<Dali::WebEngineBackForwardListItem> ret(new MockWebEngineBackForwardListItem());
     return ret;
@@ -454,7 +470,7 @@ public:
   std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> GetBackwardItems(int limit) override
   {
     std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> ret;
-    std::unique_ptr<Dali::WebEngineBackForwardListItem> item(new MockWebEngineBackForwardListItem());
+    std::unique_ptr<Dali::WebEngineBackForwardListItem>              item(new MockWebEngineBackForwardListItem());
     ret.push_back(std::move(item));
     return ret;
   }
@@ -462,13 +478,12 @@ public:
   std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> GetForwardItems(int limit) override
   {
     std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> ret;
-    std::unique_ptr<Dali::WebEngineBackForwardListItem> item(new MockWebEngineBackForwardListItem());
+    std::unique_ptr<Dali::WebEngineBackForwardListItem>              item(new MockWebEngineBackForwardListItem());
     ret.push_back(std::move(item));
     return ret;
   }
 };
 
-
 class MockWebEngineCertificate : public Dali::WebEngineCertificate
 {
 public:
@@ -528,7 +543,9 @@ public:
   {
   }
 
-  void Reply(bool allowed) override {}
+  void Reply(bool allowed) override
+  {
+  }
 };
 
 class MockWebEngineFrame : public Dali::WebEngineFrame
@@ -610,69 +627,6 @@ private:
   MockWebEngineFrame mockWebFrame;
 };
 
-class MockWebEngineRequestInterceptor : public WebEngineRequestInterceptor
-{
-public:
-  MockWebEngineRequestInterceptor()
-  {
-  }
-
-  std::string GetUrl() const override
-  {
-    return "http://test.html";
-  }
-
-  Dali::Property::Map GetHeaders() const override
-  {
-    return mockHeadersMap;
-  }
-
-  std::string GetMethod() const override
-  {
-    return "GET";
-  }
-
-  bool Ignore() override
-  {
-    return true;
-  }
-
-  bool SetResponseStatus(int statusCode, const std::string& customedStatusText) override
-  {
-    return true;
-  }
-
-  bool AddResponseHeader(const std::string& fieldName, const std::string& fieldValue) override
-  {
-    mockHeadersMap.Add(fieldName, fieldValue);
-    return true;
-  }
-
-  bool AddResponseHeaders(const Dali::Property::Map& headers) override
-  {
-    mockHeadersMap.Merge(headers);
-    return true;
-  }
-
-  bool AddResponseBody(const std::string& body, uint32_t length) override
-  {
-    return true;
-  }
-
-  bool AddResponse(const std::string& headers, const std::string& body, uint32_t length) override
-  {
-    return true;
-  }
-
-  bool WriteResponseChunk(const std::string& chunk, uint32_t length) override
-  {
-    return true;
-  }
-
-private:
-  Dali::Property::Map mockHeadersMap;
-};
-
 class MockWebEngineConsoleMessage : public Dali::WebEngineConsoleMessage
 {
 public:
@@ -705,7 +659,7 @@ class MockWebEngineLoadError : public Dali::WebEngineLoadError
 {
 public:
   MockWebEngineLoadError(const std::string& url)
-    : mockUrl(url)
+  : mockUrl(url)
   {
   }
 
@@ -798,7 +752,7 @@ public:
   std::vector<std::unique_ptr<WebEngineContextMenuItem>> GetItemList() const override
   {
     std::vector<std::unique_ptr<WebEngineContextMenuItem>> result;
-    std::unique_ptr<Dali::WebEngineContextMenuItem> webitem(new MockWebEngineContextMenuItem());
+    std::unique_ptr<Dali::WebEngineContextMenuItem>        webitem(new MockWebEngineContextMenuItem());
     result.push_back(std::move(webitem));
     return result;
   }
@@ -890,9 +844,7 @@ public:
   {
     uint8_t* imageData = new uint8_t[16];
     memset(imageData, 0xff, 16);
-    return Dali::PixelData::New(imageData, 16, 2, 2,
-                                Dali::Pixel::Format::RGBA8888,
-                                Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
+    return Dali::PixelData::New(imageData, 16, 2, 2, Dali::Pixel::Format::RGBA8888, Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
   }
 
 private:
@@ -903,8 +855,8 @@ class MockWebEngineSecurityOrigin : public Dali::WebEngineSecurityOrigin
 {
 public:
   MockWebEngineSecurityOrigin()
-    : mockUrl("https://test.html")
-    , mockPotocol("https")
+  : mockUrl("https://test.html"),
+    mockPotocol("https")
   {
   }
 
@@ -927,22 +879,22 @@ class MockWebEngineSettings : public WebEngineSettings
 {
 public:
   MockWebEngineSettings()
-    : mockDefaultFontSize( 16 ),
-      mockJavaScriptEnabled( true ),
-      mockAutoFittingEnabled ( true ),
-      mockPluginsEnabled ( true ),
-      mockPrivateBrowsingEnabled( true ),
-      mockLinkMagnifierEnabled( true ),
-      mockKeypadWithoutUserActionUsed( true ),
-      mockAutofillPasswordFormEnabled( true ),
-      mockFormCandidateDataEnabled( true ),
-      mockTextSelectionEnabled( true ),
-      mockTextAutosizingEnable( true ),
-      mockArrowScrollEnable( true ),
-      mockClipboardEnabled( true ),
-      mockImePanelEnabled( true ),
-      mockImageLoadedAutomatically( true ),
-      mockDefaultTextEncodingName()
+  : mockDefaultFontSize(16),
+    mockJavaScriptEnabled(true),
+    mockAutoFittingEnabled(true),
+    mockPluginsEnabled(true),
+    mockPrivateBrowsingEnabled(true),
+    mockLinkMagnifierEnabled(true),
+    mockKeypadWithoutUserActionUsed(true),
+    mockAutofillPasswordFormEnabled(true),
+    mockFormCandidateDataEnabled(true),
+    mockTextSelectionEnabled(true),
+    mockTextAutosizingEnable(true),
+    mockArrowScrollEnable(true),
+    mockClipboardEnabled(true),
+    mockImePanelEnabled(true),
+    mockImageLoadedAutomatically(true),
+    mockDefaultTextEncodingName()
   {
   }
 
@@ -951,7 +903,7 @@ public:
     return mockDefaultFontSize;
   }
 
-  void SetDefaultFontSize( uint32_t size ) override
+  void SetDefaultFontSize(uint32_t size) override
   {
     mockDefaultFontSize = size;
   }
@@ -961,7 +913,7 @@ public:
     return mockJavaScriptEnabled;
   }
 
-  void EnableJavaScript( bool enabled ) override
+  void EnableJavaScript(bool enabled) override
   {
     mockJavaScriptEnabled = enabled;
   }
@@ -971,7 +923,7 @@ public:
     return mockAutoFittingEnabled;
   }
 
-  void EnableAutoFitting( bool enabled ) override
+  void EnableAutoFitting(bool enabled) override
   {
     mockAutoFittingEnabled = enabled;
   }
@@ -981,7 +933,7 @@ public:
     return mockPluginsEnabled;
   }
 
-  void EnablePlugins( bool enabled ) override
+  void EnablePlugins(bool enabled) override
   {
     mockPluginsEnabled = enabled;
   }
@@ -991,7 +943,7 @@ public:
     return mockPrivateBrowsingEnabled;
   }
 
-  void EnablePrivateBrowsing( bool enabled ) override
+  void EnablePrivateBrowsing(bool enabled) override
   {
     mockPrivateBrowsingEnabled = enabled;
   }
@@ -1001,7 +953,7 @@ public:
     return mockLinkMagnifierEnabled;
   }
 
-  void EnableLinkMagnifier( bool enabled ) override
+  void EnableLinkMagnifier(bool enabled) override
   {
     mockLinkMagnifierEnabled = enabled;
   }
@@ -1011,7 +963,7 @@ public:
     return mockKeypadWithoutUserActionUsed;
   }
 
-  void UseKeypadWithoutUserAction( bool used ) override
+  void UseKeypadWithoutUserAction(bool used) override
   {
     mockKeypadWithoutUserActionUsed = used;
   }
@@ -1021,7 +973,7 @@ public:
     return mockAutofillPasswordFormEnabled;
   }
 
-  void EnableAutofillPasswordForm( bool enabled ) override
+  void EnableAutofillPasswordForm(bool enabled) override
   {
     mockAutofillPasswordFormEnabled = enabled;
   }
@@ -1031,7 +983,7 @@ public:
     return mockFormCandidateDataEnabled;
   }
 
-  void EnableFormCandidateData( bool enabled ) override
+  void EnableFormCandidateData(bool enabled) override
   {
     mockFormCandidateDataEnabled = enabled;
   }
@@ -1041,7 +993,7 @@ public:
     return mockTextSelectionEnabled;
   }
 
-  void EnableTextSelection( bool enabled ) override
+  void EnableTextSelection(bool enabled) override
   {
     mockTextSelectionEnabled = enabled;
   }
@@ -1051,7 +1003,7 @@ public:
     return mockTextAutosizingEnable;
   }
 
-  void EnableTextAutosizing( bool enabled ) override
+  void EnableTextAutosizing(bool enabled) override
   {
     mockTextAutosizingEnable = enabled;
   }
@@ -1061,7 +1013,7 @@ public:
     return mockArrowScrollEnable;
   }
 
-  void EnableArrowScroll( bool enabled ) override
+  void EnableArrowScroll(bool enabled) override
   {
     mockArrowScrollEnable = enabled;
   }
@@ -1071,7 +1023,7 @@ public:
     return mockClipboardEnabled;
   }
 
-  void EnableClipboard( bool enabled ) override
+  void EnableClipboard(bool enabled) override
   {
     mockClipboardEnabled = enabled;
   }
@@ -1081,7 +1033,7 @@ public:
     return mockImePanelEnabled;
   }
 
-  void EnableImePanel( bool enabled ) override
+  void EnableImePanel(bool enabled) override
   {
     mockImePanelEnabled = enabled;
   }
@@ -1091,7 +1043,7 @@ public:
     return mockImageLoadedAutomatically;
   }
 
-  void AllowImagesLoadAutomatically( bool automatic ) override
+  void AllowImagesLoadAutomatically(bool automatic) override
   {
     mockImageLoadedAutomatically = automatic;
   }
@@ -1101,40 +1053,40 @@ public:
     return mockDefaultTextEncodingName;
   }
 
-  void SetDefaultTextEncodingName( const std::string& defaultTextEncodingName ) override
+  void SetDefaultTextEncodingName(const std::string& defaultTextEncodingName) override
   {
     mockDefaultTextEncodingName = defaultTextEncodingName;
   }
 
-  void AllowMixedContents( bool allowed ) override
+  void AllowMixedContents(bool allowed) override
   {
   }
 
-  void EnableSpatialNavigation( bool enabled ) override
+  void EnableSpatialNavigation(bool enabled) override
   {
   }
 
-  void EnableWebSecurity( bool enabled ) override
+  void EnableWebSecurity(bool enabled) override
   {
   }
 
-  void EnableCacheBuilder( bool enabled ) override
+  void EnableCacheBuilder(bool enabled) override
   {
   }
 
-  void UseScrollbarThumbFocusNotifications( bool used ) override
+  void UseScrollbarThumbFocusNotifications(bool used) override
   {
   }
 
-  void EnableDoNotTrack( bool enabled ) override
+  void EnableDoNotTrack(bool enabled) override
   {
   }
 
-  void AllowFileAccessFromExternalUrl( bool allowed ) override
+  void AllowFileAccessFromExternalUrl(bool allowed) override
   {
   }
 
-  void AllowScriptsOpenWindows( bool allowed ) override
+  void AllowScriptsOpenWindows(bool allowed) override
   {
   }
 
@@ -1169,70 +1121,473 @@ public:
 
   bool IsExtraFeatureEnabled(const std::string& feature) const override
   {
-    return  true;
+    return true;
   }
 
 private:
-  int mockDefaultFontSize;
-  bool mockJavaScriptEnabled;
-  bool mockAutoFittingEnabled;
-  bool mockPluginsEnabled;
-  bool mockPrivateBrowsingEnabled;
-  bool mockLinkMagnifierEnabled;
-  bool mockKeypadWithoutUserActionUsed;
-  bool mockAutofillPasswordFormEnabled;
-  bool mockFormCandidateDataEnabled;
-  bool mockTextSelectionEnabled;
-  bool mockTextAutosizingEnable;
-  bool mockArrowScrollEnable;
-  bool mockClipboardEnabled;
-  bool mockImePanelEnabled;
-  bool mockImageLoadedAutomatically;
+  int         mockDefaultFontSize;
+  bool        mockJavaScriptEnabled;
+  bool        mockAutoFittingEnabled;
+  bool        mockPluginsEnabled;
+  bool        mockPrivateBrowsingEnabled;
+  bool        mockLinkMagnifierEnabled;
+  bool        mockKeypadWithoutUserActionUsed;
+  bool        mockAutofillPasswordFormEnabled;
+  bool        mockFormCandidateDataEnabled;
+  bool        mockTextSelectionEnabled;
+  bool        mockTextAutosizingEnable;
+  bool        mockArrowScrollEnable;
+  bool        mockClipboardEnabled;
+  bool        mockImePanelEnabled;
+  bool        mockImageLoadedAutomatically;
   std::string mockDefaultTextEncodingName;
 };
 
-class WebEngine: public Dali::BaseObject
+class MockWebEnginePlugin : public Dali::WebEnginePlugin
 {
 public:
+  MockWebEnginePlugin()
+  {
+  }
+  void Create(uint32_t width, uint32_t height, const std::string& locale, const std::string& timezoneId) override
+  {
+  }
+  void Create(uint32_t width, uint32_t height, uint32_t argc, char** argv) override
+  {
+  }
+  void Destroy() override
+  {
+  }
+  WebEngineSettings& GetSettings() const override
+  {
+    return *((WebEngineSettings*)&settings);
+  }
+  WebEngineBackForwardList& GetBackForwardList() const override
+  {
+    return *((WebEngineBackForwardList*)&backForwardList);
+  }
+  void LoadUrl(const std::string& url) override
+  {
+  }
+  std::string GetTitle() const override
+  {
+    return std::string();
+  }
+  Dali::PixelData GetFavicon() const override
+  {
+    return Dali::PixelData();
+  }
+  NativeImageSourcePtr GetNativeImageSource() override
+  {
+    return nullptr;
+  }
+  std::string GetUrl() const override
+  {
+    return std::string();
+  }
+  void LoadHtmlString(const std::string& htmlString) override
+  {
+  }
+  bool LoadHtmlStringOverrideCurrentEntry(const std::string& html, const std::string& basicUri, const std::string& unreachableUrl) override
+  {
+    return false;
+  }
+  bool LoadContents(const int8_t* contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri) override
+  {
+    return false;
+  }
+  void Reload() override
+  {
+  }
+  bool ReloadWithoutCache() override
+  {
+    return false;
+  }
+  void StopLoading() override
+  {
+  }
+  void Suspend() override
+  {
+  }
+  void Resume() override
+  {
+  }
+  void SuspendNetworkLoading() override
+  {
+  }
+  void ResumeNetworkLoading() override
+  {
+  }
+  bool AddCustomHeader(const std::string& name, const std::string& value) override
+  {
+    return false;
+  }
+  bool RemoveCustomHeader(const std::string& name) override
+  {
+    return false;
+  }
+  uint32_t StartInspectorServer(uint32_t port) override
+  {
+    return 0;
+  }
+  bool StopInspectorServer() override
+  {
+    return false;
+  }
+  void ScrollBy(int32_t deltaX, int32_t deltaY) override
+  {
+  }
+  bool ScrollEdgeBy(int32_t deltaX, int32_t deltaY) override
+  {
+    return false;
+  }
+  void SetScrollPosition(int32_t x, int32_t y) override
+  {
+  }
+  Dali::Vector2 GetScrollPosition() const override
+  {
+    return Dali::Vector2();
+  }
+  Dali::Vector2 GetScrollSize() const override
+  {
+    return Dali::Vector2();
+  }
+  Dali::Vector2 GetContentSize() const override
+  {
+    return Dali::Vector2();
+  }
+  bool CanGoForward() override
+  {
+    return false;
+  }
+  void GoForward() override
+  {
+  }
+  bool CanGoBack() override
+  {
+    return false;
+  }
+  void GoBack() override
+  {
+  }
+  void EvaluateJavaScript(const std::string& script, JavaScriptMessageHandlerCallback resultHandler) override
+  {
+  }
+  void AddJavaScriptMessageHandler(const std::string& exposedObjectName, JavaScriptMessageHandlerCallback handler) override
+  {
+  }
+  void RegisterJavaScriptAlertCallback(JavaScriptAlertCallback callback) override
+  {
+  }
+  void JavaScriptAlertReply() override
+  {
+  }
+  void RegisterJavaScriptConfirmCallback(JavaScriptConfirmCallback callback) override
+  {
+  }
+  void JavaScriptConfirmReply(bool confirmed) override
+  {
+  }
+  void RegisterJavaScriptPromptCallback(JavaScriptPromptCallback callback) override
+  {
+  }
+  void JavaScriptPromptReply(const std::string& result) override
+  {
+  }
+  std::unique_ptr<Dali::WebEngineHitTest> CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode) override
+  {
+    return nullptr;
+  }
+  bool CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, WebEngineHitTestCreatedCallback callback) override
+  {
+    return false;
+  }
+  void ClearHistory() override
+  {
+  }
+  void ClearAllTilesResources() override
+  {
+  }
+  std::string GetUserAgent() const override
+  {
+    return std::string();
+  }
+  void SetUserAgent(const std::string& userAgent) override
+  {
+  }
+  void SetSize(uint32_t width, uint32_t height) override
+  {
+  }
+  void SetDocumentBackgroundColor(Dali::Vector4 color) override
+  {
+  }
+  void ClearTilesWhenHidden(bool cleared) override
+  {
+  }
+  void SetTileCoverAreaMultiplier(float multiplier) override
+  {
+  }
+  void EnableCursorByClient(bool enabled) override
+  {
+  }
+  std::string GetSelectedText() const override
+  {
+    return std::string();
+  }
+  bool SendTouchEvent(const TouchEvent& touch) override
+  {
+    return false;
+  }
+  bool SendKeyEvent(const KeyEvent& event) override
+  {
+    return false;
+  }
+  void EnableMouseEvents(bool enabled) override
+  {
+  }
+  void EnableKeyEvents(bool enabled) override
+  {
+  }
+  void SetFocus(bool focused) override
+  {
+  }
+  void SetPageZoomFactor(float zoomFactor) override
+  {
+  }
+  float GetPageZoomFactor() const override
+  {
+    return 0.0f;
+  }
+  void SetTextZoomFactor(float zoomFactor) override
+  {
+  }
+  float GetTextZoomFactor() const override
+  {
+    return 0.0f;
+  }
+  float GetLoadProgressPercentage() const override
+  {
+    return 0.0f;
+  }
+  void SetScaleFactor(float scaleFactor, Dali::Vector2 point) override
+  {
+  }
+  float GetScaleFactor() const override
+  {
+    return 0.0f;
+  }
+  void ActivateAccessibility(bool activated) override
+  {
+  }
+  Accessibility::Address GetAccessibilityAddress() override
+  {
+    return Accessibility::Address();
+  }
+  bool SetVisibility(bool visible) override
+  {
+    return false;
+  }
+  bool HighlightText(const std::string& text, FindOption options, uint32_t maxMatchCount) override
+  {
+    return false;
+  }
+  void AddDynamicCertificatePath(const std::string& host, const std::string& certPath) override
+  {
+  }
+  Dali::PixelData GetScreenshot(Dali::Rect<int32_t> viewArea, float scaleFactor) override
+  {
+    return Dali::PixelData();
+  }
+  bool GetScreenshotAsynchronously(Dali::Rect<int32_t> viewArea, float scaleFactor, ScreenshotCapturedCallback callback) override
+  {
+    return false;
+  }
+  bool CheckVideoPlayingAsynchronously(VideoPlayingCallback callback) override
+  {
+    return false;
+  }
+  void RegisterGeolocationPermissionCallback(GeolocationPermissionCallback callback) override
+  {
+  }
+  void UpdateDisplayArea(Dali::Rect<int32_t> displayArea) override
+  {
+  }
+  void EnableVideoHole(bool enabled) override
+  {
+  }
+  bool SendHoverEvent(const HoverEvent& event) override
+  {
+    return false;
+  }
+  bool SendWheelEvent(const WheelEvent& event) override
+  {
+    return false;
+  }
+  void RegisterFrameRenderedCallback(WebEngineFrameRenderedCallback callback) override
+  {
+  }
+  void RegisterPageLoadStartedCallback(WebEnginePageLoadCallback callback) override
+  {
+  }
+  void RegisterPageLoadInProgressCallback(WebEnginePageLoadCallback callback) override
+  {
+  }
+  void RegisterPageLoadFinishedCallback(WebEnginePageLoadCallback callback) override
+  {
+  }
+  void RegisterPageLoadErrorCallback(WebEnginePageLoadErrorCallback callback) override
+  {
+  }
+  void RegisterScrollEdgeReachedCallback(WebEngineScrollEdgeReachedCallback callback) override
+  {
+  }
+  void RegisterUrlChangedCallback(WebEngineUrlChangedCallback callback) override
+  {
+  }
+  void RegisterFormRepostDecidedCallback(WebEngineFormRepostDecidedCallback callback) override
+  {
+  }
+  void RegisterConsoleMessageReceivedCallback(WebEngineConsoleMessageReceivedCallback callback) override
+  {
+  }
+  void RegisterResponsePolicyDecidedCallback(WebEngineResponsePolicyDecidedCallback callback) override
+  {
+  }
+  void RegisterNavigationPolicyDecidedCallback(WebEngineNavigationPolicyDecidedCallback callback) override
+  {
+  }
+  void RegisterNewWindowCreatedCallback(WebEngineNewWindowCreatedCallback callback) override
+  {
+  }
+  void RegisterCertificateConfirmedCallback(WebEngineCertificateCallback callback) override
+  {
+  }
+  void RegisterSslCertificateChangedCallback(WebEngineCertificateCallback callback) override
+  {
+  }
+  void RegisterHttpAuthHandlerCallback(WebEngineHttpAuthHandlerCallback callback) override
+  {
+  }
+  void RegisterContextMenuShownCallback(WebEngineContextMenuShownCallback callback) override
+  {
+  }
+  void RegisterContextMenuHiddenCallback(WebEngineContextMenuHiddenCallback callback) override
+  {
+  }
+  void GetPlainTextAsynchronously(PlainTextReceivedCallback callback) override
+  {
+  }
 
+private:
+  MockWebEngineSettings        settings;
+  MockWebEngineBackForwardList backForwardList;
+};
+
+Dali::WebEnginePlugin* GetWebEnginePlugin()
+{
+  static MockWebEnginePlugin plugin;
+  return &plugin;
+}
+
+class MockWebEngineRequestInterceptor : public WebEngineRequestInterceptor
+{
+public:
+  MockWebEngineRequestInterceptor()
+  {
+  }
+
+  Dali::WebEnginePlugin* GetWebEngine() const
+  {
+    return GetWebEnginePlugin();
+  }
+
+  std::string GetUrl() const override
+  {
+    return "http://test.html";
+  }
+
+  Dali::Property::Map GetHeaders() const override
+  {
+    return mockHeadersMap;
+  }
+
+  std::string GetMethod() const override
+  {
+    return "GET";
+  }
+
+  bool Ignore() override
+  {
+    return true;
+  }
+
+  bool SetResponseStatus(int statusCode, const std::string& customedStatusText) override
+  {
+    return true;
+  }
+
+  bool AddResponseHeader(const std::string& fieldName, const std::string& fieldValue) override
+  {
+    mockHeadersMap.Add(fieldName, fieldValue);
+    return true;
+  }
+
+  bool AddResponseHeaders(const Dali::Property::Map& headers) override
+  {
+    mockHeadersMap.Merge(headers);
+    return true;
+  }
+
+  bool AddResponseBody(const int8_t* body, uint32_t length) override
+  {
+    return true;
+  }
+
+  bool AddResponse(const std::string& headers, const int8_t* body, uint32_t length) override
+  {
+    return true;
+  }
+
+  bool WriteResponseChunk(const int8_t* chunk, uint32_t length) override
+  {
+    return true;
+  }
+
+private:
+  Dali::Property::Map mockHeadersMap;
+};
+
+class WebEngine : public Dali::BaseObject
+{
+public:
   WebEngine()
-    : mUrl()
-    , mCurrentPlusOnePos( 0 )
-    , mUserAgent()
-    , mEvaluating( false )
-    , mScrollPosition( 0, 0 )
-    , mScrollSize( 500, 500 )
-    , mContentSize( 500, 500 )
+  : mUrl(),
+    mCurrentPlusOnePos(0),
+    mUserAgent(),
+    mEvaluating(false),
+    mScrollPosition(0, 0),
+    mScrollSize(500, 500),
+    mContentSize(500, 500)
   {
     gInstanceCount++;
-    if ( gInstanceCount == 1 ) // only first web engine need be saved.
+    if(gInstanceCount == 1) // only first web engine need be saved.
     {
       gInstance = this;
     }
 
-    mockWebEngineSettings = new MockWebEngineSettings();
-    MockWebEngineContext* engineContext = new MockWebEngineContext();
-    mockWebEngineContext = engineContext;
-    if ( gInstanceCount == 1 )
-    {
-      gWebEngineContextInstance = engineContext;
-    }
-    mockWebEngineCookieManager = new MockWebEngineCookieManager();
+    mockWebEngineSettings        = new MockWebEngineSettings();
     mockWebEngineBackForwardList = new MockWebEngineBackForwardList();
   }
 
   virtual ~WebEngine()
   {
     gInstanceCount--;
-    if( !gInstanceCount )
+    if(!gInstanceCount)
     {
-      gInstance = 0;
-      gWebEngineContextInstance = 0;
+      gInstance = nullptr;
     }
 
     delete mockWebEngineSettings;
-    delete mockWebEngineContext;
-    delete mockWebEngineCookieManager;
     delete mockWebEngineBackForwardList;
   }
 
@@ -1241,25 +1596,15 @@ public:
     return *mockWebEngineSettings;
   }
 
-  Dali::WebEngineContext& GetContext() const
-  {
-    return *mockWebEngineContext;
-  }
-
-  Dali::WebEngineCookieManager& GetCookieManager() const
-  {
-    return *mockWebEngineCookieManager;
-  }
-
   Dali::WebEngineBackForwardList& GetBackForwardList() const
   {
     return *mockWebEngineBackForwardList;
   }
 
-  void LoadUrl( const std::string& url )
+  void LoadUrl(const std::string& url)
   {
     mUrl = url;
-    ConnectToGlobalSignal( &OnLoadUrl );
+    ConnectToGlobalSignal(&OnLoadUrl);
   }
 
   std::string GetUrl() const
@@ -1275,14 +1620,12 @@ public:
   Dali::PixelData GetFavicon() const
   {
     static int testGetFaviconCount = 0;
-    if (testGetFaviconCount == 0)
+    if(testGetFaviconCount == 0)
     {
       testGetFaviconCount++;
       uint8_t* faviconData = new uint8_t[16];
       memset(faviconData, 0xff, 16);
-      return Dali::PixelData::New(faviconData, 16, 2, 2,
-                                  Dali::Pixel::Format::RGBA8888,
-                                  Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
+      return Dali::PixelData::New(faviconData, 16, 2, 2, Dali::Pixel::Format::RGBA8888, Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
     }
     else
     {
@@ -1297,7 +1640,7 @@ public:
 
   void GoForward()
   {
-    ConnectToGlobalSignal( &OnGoForward );
+    ConnectToGlobalSignal(&OnGoForward);
   }
 
   bool CanGoBack() const
@@ -1307,44 +1650,44 @@ public:
 
   void GoBack()
   {
-    ConnectToGlobalSignal( &OnGoBack );
+    ConnectToGlobalSignal(&OnGoBack);
   }
 
-  void EvaluateJavaScript( const std::string& script, std::function< void( const std::string& ) > resultHandler )
+  void EvaluateJavaScript(const std::string& script, std::function<void(const std::string&)> resultHandler)
   {
-    if( resultHandler )
+    if(resultHandler)
     {
-      if( !mEvaluating )
+      if(!mEvaluating)
       {
-        ConnectToGlobalSignal( &OnEvaluteJavaScript );
+        ConnectToGlobalSignal(&OnEvaluteJavaScript);
       }
-      mResultCallbacks.push_back( resultHandler );
+      mResultCallbacks.push_back(resultHandler);
     }
   }
 
-  void RegisterJavaScriptAlertCallback( Dali::WebEnginePlugin::JavaScriptAlertCallback callback )
+  void RegisterJavaScriptAlertCallback(Dali::WebEnginePlugin::JavaScriptAlertCallback callback)
   {
-    if ( callback )
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnJavaScriptAlert );
+      ConnectToGlobalSignal(&OnJavaScriptAlert);
       mJavaScriptAlertCallback = callback;
     }
   }
 
-  void RegisterJavaScriptConfirmCallback( Dali::WebEnginePlugin::JavaScriptConfirmCallback callback )
+  void RegisterJavaScriptConfirmCallback(Dali::WebEnginePlugin::JavaScriptConfirmCallback callback)
   {
-    if ( callback )
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnJavaScriptConfirm );
+      ConnectToGlobalSignal(&OnJavaScriptConfirm);
       mJavaScriptConfirmCallback = callback;
     }
   }
 
-  void RegisterJavaScriptPromptCallback( Dali::WebEnginePlugin::JavaScriptPromptCallback callback )
+  void RegisterJavaScriptPromptCallback(Dali::WebEnginePlugin::JavaScriptPromptCallback callback)
   {
-    if ( callback )
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnJavaScriptPrompt );
+      ConnectToGlobalSignal(&OnJavaScriptPrompt);
       mJavaScriptPromptCallback = callback;
     }
   }
@@ -1357,9 +1700,9 @@ public:
 
   bool CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback)
   {
-    if (callback)
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnHitTestCreated );
+      ConnectToGlobalSignal(&OnHitTestCreated);
       mHitTestCreatedCallback = callback;
     }
     return true;
@@ -1367,7 +1710,7 @@ public:
 
   void ClearHistory()
   {
-    ConnectToGlobalSignal( &OnClearHistory );
+    ConnectToGlobalSignal(&OnClearHistory);
   }
 
   std::string GetUserAgent() const
@@ -1375,31 +1718,31 @@ public:
     return mUserAgent;
   }
 
-  void SetUserAgent( const std::string& userAgent )
+  void SetUserAgent(const std::string& userAgent)
   {
     mUserAgent = userAgent;
   }
 
-  void ScrollBy( int32_t dx, int32_t dy )
+  void ScrollBy(int32_t dx, int32_t dy)
   {
-    mScrollPosition += Dali::Vector2( dx, dy );
-    if ( mScrollPosition.y + mScrollSize.height > mContentSize.height )
+    mScrollPosition += Dali::Vector2(dx, dy);
+    if(mScrollPosition.y + mScrollSize.height > mContentSize.height)
     {
-      ConnectToGlobalSignal( &OnScrollEdge );
+      ConnectToGlobalSignal(&OnScrollEdge);
     }
   }
 
-  bool ScrollEdgeBy( int32_t dx, int32_t dy )
+  bool ScrollEdgeBy(int32_t dx, int32_t dy)
   {
-    mScrollPosition += Dali::Vector2( dx, dy );
-    if ( mScrollPosition.y + mScrollSize.height > mContentSize.height )
+    mScrollPosition += Dali::Vector2(dx, dy);
+    if(mScrollPosition.y + mScrollSize.height > mContentSize.height)
     {
-      ConnectToGlobalSignal( &OnScrollEdge );
+      ConnectToGlobalSignal(&OnScrollEdge);
     }
     return true;
   }
 
-  void SetScrollPosition( int32_t x, int32_t y )
+  void SetScrollPosition(int32_t x, int32_t y)
   {
     mScrollPosition.x = x;
     mScrollPosition.y = y;
@@ -1455,21 +1798,30 @@ public:
     return mScaleFactor;
   }
 
+  bool SetVisibility(bool visible)
+  {
+    mVisible = visible;
+    return true;
+  }
+
+  Dali::Accessibility::Address GetAccessibilityAddress()
+  {
+    return {":9.99", "root"};
+  }
+
   Dali::PixelData GetScreenshot(Dali::Rect<int32_t> viewArea, float scaleFactor)
   {
-    uint32_t bufferSize = viewArea.width * viewArea.height * 4 ;
-    uint8_t* pixel = new uint8_t[ bufferSize ];
+    uint32_t bufferSize = viewArea.width * viewArea.height * 4;
+    uint8_t* pixel      = new uint8_t[bufferSize];
     memset(pixel, 0xff, bufferSize);
-    return Dali::PixelData::New( pixel, bufferSize, viewArea.width, viewArea.height,
-                                 Dali::Pixel::Format::RGBA8888,
-                                 Dali::PixelData::ReleaseFunction::DELETE_ARRAY );
+    return Dali::PixelData::New(pixel, bufferSize, viewArea.width, viewArea.height, Dali::Pixel::Format::RGBA8888, Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
   }
 
   bool GetScreenshotAsynchronously(Dali::Rect<int32_t> viewArea, float scaleFactor, Dali::WebEnginePlugin::ScreenshotCapturedCallback callback)
   {
-    if ( callback )
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnScreenshotCaptured );
+      ConnectToGlobalSignal(&OnScreenshotCaptured);
       mScreenshotCapturedCallback = callback;
     }
     return true;
@@ -1477,9 +1829,9 @@ public:
 
   bool CheckVideoPlayingAsynchronously(Dali::WebEnginePlugin::VideoPlayingCallback callback)
   {
-    if ( callback )
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnVideoPlaying );
+      ConnectToGlobalSignal(&OnVideoPlaying);
       mVideoPlayingCallback = callback;
     }
     return true;
@@ -1487,16 +1839,16 @@ public:
 
   void RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback)
   {
-    if ( callback )
+    if(callback)
     {
-      ConnectToGlobalSignal( &OnGeolocationPermission );
+      ConnectToGlobalSignal(&OnGeolocationPermission);
       mGeolocationPermissionCallback = callback;
     }
   }
 
-  Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType& FrameRenderedSignal()
+  void RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback)
   {
-    return mFrameRenderedSignal;
+    mFrameRenderedCallback = callback;
   }
 
   void RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback)
@@ -1544,6 +1896,16 @@ public:
     mResponsePolicyDecisionCallback = callback;
   }
 
+  void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback)
+  {
+    mNavigationPolicyDecisionCallback = callback;
+  }
+
+  void RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
+  {
+    mNewWindowCreatedCallback = callback;
+  }
+
   void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback)
   {
     mCertificateConfirmCallback = callback;
@@ -1571,7 +1933,7 @@ public:
 
   void GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback)
   {
-    if (callback)
+    if(callback)
     {
       ConnectToGlobalSignal(&OnPlainTextReceived);
       mPlainTextReceivedCallback = callback;
@@ -1583,57 +1945,54 @@ public:
   size_t                   mCurrentPlusOnePos;
   std::string              mUserAgent;
 
-  Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType mFrameRenderedSignal;
-
   bool  mEvaluating;
   float mPageZoomFactor;
   float mTextZoomFactor;
   float mScaleFactor;
+  bool  mVisible;
 
   Dali::Vector2             mScrollPosition;
   Dali::Vector2             mScrollSize;
   Dali::Vector2             mContentSize;
   WebEngineBackForwardList* mockWebEngineBackForwardList;
-  WebEngineContext*         mockWebEngineContext;
-  WebEngineCookieManager*   mockWebEngineCookieManager;
   WebEngineSettings*        mockWebEngineSettings;
 
   std::vector<Dali::WebEnginePlugin::JavaScriptMessageHandlerCallback> mResultCallbacks;
 
-  Dali::WebEnginePlugin::WebEnginePageLoadCallback               mPageLoadStartedCallback;
-  Dali::WebEnginePlugin::WebEnginePageLoadCallback               mPageLoadInProgressCallback;
-  Dali::WebEnginePlugin::WebEnginePageLoadCallback               mPageLoadFinishedCallback;
-  Dali::WebEnginePlugin::WebEnginePageLoadErrorCallback          mPageLoadErrorCallback;
-  Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback      mScrollEdgeReachedCallback;
-  Dali::WebEnginePlugin::WebEngineUrlChangedCallback             mUrlChangedCallback;
-  Dali::WebEnginePlugin::WebEngineFormRepostDecidedCallback      mFormRepostDecidedCallback;
-  Dali::WebEnginePlugin::WebEngineFrameRenderedCallback          mFrameRenderedCallback;
-  Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback mConsoleMessageCallback;
-  Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback  mResponsePolicyDecisionCallback;
-  Dali::WebEnginePlugin::WebEngineCertificateCallback            mCertificateConfirmCallback;
-  Dali::WebEnginePlugin::WebEngineCertificateCallback            mSslCertificateChangedCallback;
-  Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback        mHttpAuthHandlerCallback;
-  Dali::WebEnginePlugin::WebEngineContextMenuShownCallback       mContextMenuShownCallback;
-  Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback      mContextMenuHiddenCallback;
-  Dali::WebEnginePlugin::JavaScriptAlertCallback                 mJavaScriptAlertCallback;
-  Dali::WebEnginePlugin::JavaScriptConfirmCallback               mJavaScriptConfirmCallback;
-  Dali::WebEnginePlugin::JavaScriptPromptCallback                mJavaScriptPromptCallback;
-  Dali::WebEnginePlugin::ScreenshotCapturedCallback              mScreenshotCapturedCallback;
-  Dali::WebEnginePlugin::VideoPlayingCallback                    mVideoPlayingCallback;
-  Dali::WebEnginePlugin::GeolocationPermissionCallback           mGeolocationPermissionCallback;
-  Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback         mHitTestCreatedCallback;
-  Dali::WebEnginePlugin::PlainTextReceivedCallback               mPlainTextReceivedCallback;
+  Dali::WebEnginePlugin::WebEnginePageLoadCallback                mPageLoadStartedCallback;
+  Dali::WebEnginePlugin::WebEnginePageLoadCallback                mPageLoadInProgressCallback;
+  Dali::WebEnginePlugin::WebEnginePageLoadCallback                mPageLoadFinishedCallback;
+  Dali::WebEnginePlugin::WebEnginePageLoadErrorCallback           mPageLoadErrorCallback;
+  Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback       mScrollEdgeReachedCallback;
+  Dali::WebEnginePlugin::WebEngineUrlChangedCallback              mUrlChangedCallback;
+  Dali::WebEnginePlugin::WebEngineFormRepostDecidedCallback       mFormRepostDecidedCallback;
+  Dali::WebEnginePlugin::WebEngineFrameRenderedCallback           mFrameRenderedCallback;
+  Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback  mConsoleMessageCallback;
+  Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback   mResponsePolicyDecisionCallback;
+  Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback mNavigationPolicyDecisionCallback;
+  Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback        mNewWindowCreatedCallback;
+  Dali::WebEnginePlugin::WebEngineCertificateCallback             mCertificateConfirmCallback;
+  Dali::WebEnginePlugin::WebEngineCertificateCallback             mSslCertificateChangedCallback;
+  Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback         mHttpAuthHandlerCallback;
+  Dali::WebEnginePlugin::WebEngineContextMenuShownCallback        mContextMenuShownCallback;
+  Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback       mContextMenuHiddenCallback;
+  Dali::WebEnginePlugin::JavaScriptAlertCallback                  mJavaScriptAlertCallback;
+  Dali::WebEnginePlugin::JavaScriptConfirmCallback                mJavaScriptConfirmCallback;
+  Dali::WebEnginePlugin::JavaScriptPromptCallback                 mJavaScriptPromptCallback;
+  Dali::WebEnginePlugin::ScreenshotCapturedCallback               mScreenshotCapturedCallback;
+  Dali::WebEnginePlugin::VideoPlayingCallback                     mVideoPlayingCallback;
+  Dali::WebEnginePlugin::GeolocationPermissionCallback            mGeolocationPermissionCallback;
+  Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback          mHitTestCreatedCallback;
+  Dali::WebEnginePlugin::PlainTextReceivedCallback                mPlainTextReceivedCallback;
 };
 
-
 namespace
 {
-
 bool OnGoBack()
 {
-  DisconnectFromGlobalSignal( &OnGoBack );
+  DisconnectFromGlobalSignal(&OnGoBack);
 
-  if( gInstance && gInstance->CanGoBack() )
+  if(gInstance && gInstance->CanGoBack())
   {
     gInstance->mCurrentPlusOnePos--;
   }
@@ -1642,9 +2001,9 @@ bool OnGoBack()
 
 bool OnGoForward()
 {
-  DisconnectFromGlobalSignal( &OnGoForward );
+  DisconnectFromGlobalSignal(&OnGoForward);
 
-  if( gInstance && gInstance->CanGoForward() )
+  if(gInstance && gInstance->CanGoForward())
   {
     gInstance->mCurrentPlusOnePos++;
   }
@@ -1653,78 +2012,87 @@ bool OnGoForward()
 
 bool OnLoadUrl()
 {
-  DisconnectFromGlobalSignal( &OnLoadUrl );
+  DisconnectFromGlobalSignal(&OnLoadUrl);
 
-  if( gInstance )
+  if(gInstance)
   {
-    if( gInstance->mHistory.size() > gInstance->mCurrentPlusOnePos )
+    if(gInstance->mHistory.size() > gInstance->mCurrentPlusOnePos)
     {
-      gInstance->mHistory.erase( gInstance->mHistory.begin() + gInstance->mCurrentPlusOnePos, gInstance->mHistory.end() );
+      gInstance->mHistory.erase(gInstance->mHistory.begin() + gInstance->mCurrentPlusOnePos, gInstance->mHistory.end());
     }
-    gInstance->mHistory.push_back( gInstance->mUrl );
+    gInstance->mHistory.push_back(gInstance->mUrl);
     gInstance->mCurrentPlusOnePos++;
-    if (gInstance->mPageLoadStartedCallback)
+    if(gInstance->mPageLoadStartedCallback)
     {
-      gInstance->mPageLoadStartedCallback( gInstance->mUrl );
+      gInstance->mPageLoadStartedCallback(gInstance->mUrl);
     }
-    if (gInstance->mPageLoadInProgressCallback)
+    if(gInstance->mPageLoadInProgressCallback)
     {
-      gInstance->mPageLoadInProgressCallback( gInstance->mUrl );
+      gInstance->mPageLoadInProgressCallback(gInstance->mUrl);
     }
-    if (gInstance->mPageLoadFinishedCallback)
+    if(gInstance->mPageLoadFinishedCallback)
     {
-      gInstance->mPageLoadFinishedCallback( gInstance->mUrl );
+      gInstance->mPageLoadFinishedCallback(gInstance->mUrl);
     }
-    if (gInstance->mPageLoadErrorCallback)
+    if(gInstance->mPageLoadErrorCallback)
     {
       std::unique_ptr<Dali::WebEngineLoadError> error(new MockWebEngineLoadError(gInstance->mUrl));
       gInstance->mPageLoadErrorCallback(std::move(error));
     }
-    if (gInstance->mUrlChangedCallback)
+    if(gInstance->mUrlChangedCallback)
     {
-      gInstance->mUrlChangedCallback( "http://new-test" );
+      gInstance->mUrlChangedCallback("http://new-test");
     }
-    if (gInstance->mFormRepostDecidedCallback)
+    if(gInstance->mFormRepostDecidedCallback)
     {
       std::unique_ptr<Dali::WebEngineFormRepostDecision> repostDecision(new MockWebEngineFormRepostDecision());
       gInstance->mFormRepostDecidedCallback(std::move(repostDecision));
     }
-    gInstance->mFrameRenderedSignal.Emit();
-    if (gInstance->mFrameRenderedCallback)
+    if(gInstance->mFrameRenderedCallback)
     {
       gInstance->mFrameRenderedCallback();
     }
-    if (gInstance->mConsoleMessageCallback)
+    if(gInstance->mConsoleMessageCallback)
     {
       std::unique_ptr<Dali::WebEngineConsoleMessage> message(new MockWebEngineConsoleMessage());
       gInstance->mConsoleMessageCallback(std::move(message));
     }
-    if (gInstance->mResponsePolicyDecisionCallback)
+    if(gInstance->mResponsePolicyDecisionCallback)
     {
       std::unique_ptr<Dali::WebEnginePolicyDecision> policyDecision(new MockWebEnginePolicyDecision());
       gInstance->mResponsePolicyDecisionCallback(std::move(policyDecision));
     }
-    if (gInstance->mCertificateConfirmCallback)
+    if(gInstance->mNavigationPolicyDecisionCallback)
+    {
+      std::unique_ptr<Dali::WebEnginePolicyDecision> policyDecision(new MockWebEnginePolicyDecision());
+      gInstance->mNavigationPolicyDecisionCallback(std::move(policyDecision));
+    }
+    if(gInstance->mNewWindowCreatedCallback)
+    {
+      Dali::WebEnginePlugin* plugin = 0;
+      gInstance->mNewWindowCreatedCallback(plugin);
+    }
+    if(gInstance->mCertificateConfirmCallback)
     {
       std::unique_ptr<Dali::WebEngineCertificate> certificate(new MockWebEngineCertificate());
       gInstance->mCertificateConfirmCallback(std::move(certificate));
     }
-    if (gInstance->mSslCertificateChangedCallback)
+    if(gInstance->mSslCertificateChangedCallback)
     {
       std::unique_ptr<Dali::WebEngineCertificate> sslCertificate(new MockWebEngineCertificate());
       gInstance->mSslCertificateChangedCallback(std::move(sslCertificate));
     }
-    if (gInstance->mHttpAuthHandlerCallback)
+    if(gInstance->mHttpAuthHandlerCallback)
     {
       std::unique_ptr<Dali::WebEngineHttpAuthHandler> handler(new MockWebEngineHttpAuthHandler());
       gInstance->mHttpAuthHandlerCallback(std::move(handler));
     }
-    if (gInstance->mContextMenuShownCallback)
+    if(gInstance->mContextMenuShownCallback)
     {
       std::unique_ptr<Dali::WebEngineContextMenu> menu(new MockWebEngineContextMenu());
       gInstance->mContextMenuShownCallback(std::move(menu));
     }
-    if (gInstance->mContextMenuHiddenCallback)
+    if(gInstance->mContextMenuHiddenCallback)
     {
       std::unique_ptr<Dali::WebEngineContextMenu> hiddenMenu(new MockWebEngineContextMenu());
       gInstance->mContextMenuHiddenCallback(std::move(hiddenMenu));
@@ -1735,11 +2103,11 @@ bool OnLoadUrl()
 
 bool OnScrollEdge()
 {
-  DisconnectFromGlobalSignal( &OnScrollEdge );
+  DisconnectFromGlobalSignal(&OnScrollEdge);
 
-  if( gInstance && gInstance->mScrollEdgeReachedCallback )
+  if(gInstance && gInstance->mScrollEdgeReachedCallback)
   {
-    gInstance->mScrollEdgeReachedCallback( Dali::WebEnginePlugin::ScrollEdge::BOTTOM );
+    gInstance->mScrollEdgeReachedCallback(Dali::WebEnginePlugin::ScrollEdge::BOTTOM);
   }
 
   return false;
@@ -1747,11 +2115,11 @@ bool OnScrollEdge()
 
 bool OnEvaluteJavaScript()
 {
-  DisconnectFromGlobalSignal( &OnEvaluteJavaScript );
+  DisconnectFromGlobalSignal(&OnEvaluteJavaScript);
 
-  if( gInstance )
+  if(gInstance)
   {
-    for( auto& func : gInstance->mResultCallbacks )
+    for(auto& func : gInstance->mResultCallbacks)
     {
       func("undefined");
     }
@@ -1762,65 +2130,63 @@ bool OnEvaluteJavaScript()
 
 bool OnJavaScriptAlert()
 {
-  DisconnectFromGlobalSignal( &OnJavaScriptAlert );
-  if ( gInstance )
+  DisconnectFromGlobalSignal(&OnJavaScriptAlert);
+  if(gInstance)
   {
-    gInstance->mJavaScriptAlertCallback( "this is an alert popup." );
+    gInstance->mJavaScriptAlertCallback("this is an alert popup.");
   }
   return false;
 }
 
 bool OnJavaScriptConfirm()
 {
-  DisconnectFromGlobalSignal( &OnJavaScriptConfirm );
-  if ( gInstance )
+  DisconnectFromGlobalSignal(&OnJavaScriptConfirm);
+  if(gInstance)
   {
-    gInstance->mJavaScriptConfirmCallback( "this is a confirm popup." );
+    gInstance->mJavaScriptConfirmCallback("this is a confirm popup.");
   }
   return false;
 }
 
 bool OnJavaScriptPrompt()
 {
-  DisconnectFromGlobalSignal( &OnJavaScriptPrompt );
-  if ( gInstance )
+  DisconnectFromGlobalSignal(&OnJavaScriptPrompt);
+  if(gInstance)
   {
-    gInstance->mJavaScriptPromptCallback( "this is a prompt pompt.", "" );
+    gInstance->mJavaScriptPromptCallback("this is a prompt pompt.", "");
   }
   return false;
 }
 
 bool OnScreenshotCaptured()
 {
-  DisconnectFromGlobalSignal( &OnScreenshotCaptured );
-  if ( gInstance )
+  DisconnectFromGlobalSignal(&OnScreenshotCaptured);
+  if(gInstance)
   {
-    uint8_t* pixel = new uint8_t[ 2 * 2 * 4 ];
+    uint8_t* pixel = new uint8_t[2 * 2 * 4];
     memset(pixel, 0xff, 2 * 2 * 4);
-    Dali::PixelData data = Dali::PixelData::New( pixel, 2 * 2 * 4, 2, 2,
-                                 Dali::Pixel::Format::RGBA8888,
-                                 Dali::PixelData::ReleaseFunction::DELETE_ARRAY );
-    gInstance->mScreenshotCapturedCallback( data );
+    Dali::PixelData data = Dali::PixelData::New(pixel, 2 * 2 * 4, 2, 2, Dali::Pixel::Format::RGBA8888, Dali::PixelData::ReleaseFunction::DELETE_ARRAY);
+    gInstance->mScreenshotCapturedCallback(data);
   }
   return false;
 }
 
 bool OnVideoPlaying()
 {
-  DisconnectFromGlobalSignal( &OnVideoPlaying );
-  if ( gInstance )
+  DisconnectFromGlobalSignal(&OnVideoPlaying);
+  if(gInstance)
   {
-    gInstance->mVideoPlayingCallback( true );
+    gInstance->mVideoPlayingCallback(true);
   }
   return false;
 }
 
 bool OnGeolocationPermission()
 {
-  DisconnectFromGlobalSignal( &OnGeolocationPermission );
-  if ( gInstance )
+  DisconnectFromGlobalSignal(&OnGeolocationPermission);
+  if(gInstance)
   {
-    gInstance->mGeolocationPermissionCallback( "", "" );
+    gInstance->mGeolocationPermissionCallback("", "");
   }
   return false;
 }
@@ -1828,7 +2194,7 @@ bool OnGeolocationPermission()
 bool OnHitTestCreated()
 {
   DisconnectFromGlobalSignal(&OnHitTestCreated);
-  if (gInstance)
+  if(gInstance)
   {
     std::unique_ptr<Dali::WebEngineHitTest> test(new MockWebEngineHitTest());
     gInstance->mHitTestCreatedCallback(std::move(test));
@@ -1838,13 +2204,13 @@ bool OnHitTestCreated()
 
 bool OnClearHistory()
 {
-  DisconnectFromGlobalSignal( &OnClearHistory );
+  DisconnectFromGlobalSignal(&OnClearHistory);
 
-  if( gInstance && gInstance->mCurrentPlusOnePos )
+  if(gInstance && gInstance->mCurrentPlusOnePos)
   {
-    std::string url = gInstance->mHistory[ gInstance->mCurrentPlusOnePos - 1 ];
-    std::vector< std::string >().swap( gInstance->mHistory );
-    gInstance->mHistory.push_back( url );
+    std::string url = gInstance->mHistory[gInstance->mCurrentPlusOnePos - 1];
+    std::vector<std::string>().swap(gInstance->mHistory);
+    gInstance->mHistory.push_back(url);
     gInstance->mCurrentPlusOnePos = 1;
   }
   return false;
@@ -1853,10 +2219,10 @@ bool OnClearHistory()
 bool OnSecurityOriginAcquired()
 {
   DisconnectFromGlobalSignal(&OnSecurityOriginAcquired);
-  if (gWebEngineContextInstance)
+  if(gWebEngineContextInstance)
   {
     std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>> securityOriginList;
-    std::unique_ptr<Dali::WebEngineSecurityOrigin> origin(new MockWebEngineSecurityOrigin());
+    std::unique_ptr<Dali::WebEngineSecurityOrigin>              origin(new MockWebEngineSecurityOrigin());
     securityOriginList.push_back(std::move(origin));
     gWebEngineContextInstance->mSecurityOriginAcquiredCallback(securityOriginList);
   }
@@ -1866,7 +2232,7 @@ bool OnSecurityOriginAcquired()
 bool OnStorageUsageAcquired()
 {
   DisconnectFromGlobalSignal(&OnStorageUsageAcquired);
-  if (gWebEngineContextInstance)
+  if(gWebEngineContextInstance)
   {
     gWebEngineContextInstance->mStorageUsageAcquiredCallback(0);
   }
@@ -1876,11 +2242,11 @@ bool OnStorageUsageAcquired()
 bool OnFormPasswordAcquired()
 {
   DisconnectFromGlobalSignal(&OnFormPasswordAcquired);
-  if (gWebEngineContextInstance)
+  if(gWebEngineContextInstance)
   {
     std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>> formPasswordList;
-    std::unique_ptr<Dali::WebEngineContext::PasswordData> data(new Dali::WebEngineContext::PasswordData());
-    data->url = "http://test.html";
+    std::unique_ptr<Dali::WebEngineContext::PasswordData>              data(new Dali::WebEngineContext::PasswordData());
+    data->url            = "http://test.html";
     data->useFingerprint = false;
     formPasswordList.push_back(std::move(data));
     gWebEngineContextInstance->mFormPasswordAcquiredCallback(formPasswordList);
@@ -1891,7 +2257,7 @@ bool OnFormPasswordAcquired()
 bool OnDownloadStarted()
 {
   DisconnectFromGlobalSignal(&OnDownloadStarted);
-  if (gWebEngineContextInstance)
+  if(gWebEngineContextInstance)
   {
     gWebEngineContextInstance->mDownloadStartedCallback("http://test.html");
   }
@@ -1901,7 +2267,7 @@ bool OnDownloadStarted()
 bool OnMimeOverridden()
 {
   DisconnectFromGlobalSignal(&OnMimeOverridden);
-  if (gWebEngineContextInstance)
+  if(gWebEngineContextInstance)
   {
     std::string newMime;
     gWebEngineContextInstance->mMimeOverriddenCallback("http://test.html", "txt/xml", newMime);
@@ -1912,7 +2278,7 @@ bool OnMimeOverridden()
 bool OnRequestIntercepted()
 {
   DisconnectFromGlobalSignal(&OnRequestIntercepted);
-  if (gWebEngineContextInstance)
+  if(gWebEngineContextInstance)
   {
     Dali::WebEngineRequestInterceptorPtr interceptor = new MockWebEngineRequestInterceptor();
     gWebEngineContextInstance->mRequestInterceptedCallback(interceptor);
@@ -1922,24 +2288,18 @@ bool OnRequestIntercepted()
 
 bool OnChangesWatch()
 {
-  DisconnectFromGlobalSignal( &OnChangesWatch );
-
-  if ( gInstance )
+  DisconnectFromGlobalSignal(&OnChangesWatch);
+  if(gMockWebEngineCookieManager)
   {
-    MockWebEngineCookieManager* temp = (MockWebEngineCookieManager *)(&(gInstance->GetCookieManager()));
-    if ( temp )
-    {
-      temp->mChangesWatchCallback();
-    }
+    gMockWebEngineCookieManager->mChangesWatchCallback();
   }
-
   return false;
 }
 
 bool OnPlainTextReceived()
 {
   DisconnectFromGlobalSignal(&OnPlainTextReceived);
-  if (gInstance)
+  if(gInstance)
   {
     std::string dummyResultText;
     gInstance->mPlainTextReceivedCallback(dummyResultText);
@@ -1949,18 +2309,18 @@ bool OnPlainTextReceived()
 
 } // namespace
 
-inline WebEngine& GetImplementation( Dali::WebEngine& webEngine )
+inline WebEngine& GetImplementation(Dali::WebEngine& webEngine)
 {
-  DALI_ASSERT_ALWAYS( webEngine && "WebEngine handle is empty." );
+  DALI_ASSERT_ALWAYS(webEngine && "WebEngine handle is empty.");
   BaseObject& handle = webEngine.GetBaseObject();
-  return static_cast< Internal::Adaptor::WebEngine& >( handle );
+  return static_cast<Internal::Adaptor::WebEngine&>(handle);
 }
 
-inline const WebEngine& GetImplementation( const Dali::WebEngine& webEngine )
+inline const WebEngine& GetImplementation(const Dali::WebEngine& webEngine)
 {
-  DALI_ASSERT_ALWAYS( webEngine && "WebEngine handle is empty." );
+  DALI_ASSERT_ALWAYS(webEngine && "WebEngine handle is empty.");
   const BaseObject& handle = webEngine.GetBaseObject();
-  return static_cast< const Internal::Adaptor::WebEngine& >( handle );
+  return static_cast<const Internal::Adaptor::WebEngine&>(handle);
 }
 
 } // namespace Adaptor
@@ -1972,8 +2332,8 @@ WebEngine::WebEngine()
 {
 }
 
-WebEngine::WebEngine( Internal::Adaptor::WebEngine* internal )
-: BaseHandle( internal )
+WebEngine::WebEngine(Internal::Adaptor::WebEngine* internal)
+: BaseHandle(internal)
 {
 }
 
@@ -1985,85 +2345,90 @@ WebEngine WebEngine::New()
 {
   Internal::Adaptor::WebEngine* baseObject = new Internal::Adaptor::WebEngine();
 
-  return WebEngine( baseObject );
+  return WebEngine(baseObject);
 }
 
-WebEngine::WebEngine( const WebEngine& WebEngine )
-: BaseHandle( WebEngine )
+Dali::WebEngineContext* WebEngine::GetContext()
 {
+  return Internal::Adaptor::GetContext();
 }
 
-WebEngine& WebEngine::operator=( const WebEngine& webEngine )
+Dali::WebEngineCookieManager* WebEngine::GetCookieManager()
 {
-  BaseHandle::operator=( webEngine );
-  return *this;
+  return Internal::Adaptor::GetCookieManager();
 }
 
-WebEngine WebEngine::DownCast( BaseHandle handle )
+WebEngine::WebEngine(const WebEngine& WebEngine)
+: BaseHandle(WebEngine)
 {
-  return WebEngine( dynamic_cast< Internal::Adaptor::WebEngine* >( handle.GetObjectPtr() ) );
 }
 
-void WebEngine::Create( uint32_t width, uint32_t height, const std::string& locale, const std::string& timezoneId )
+WebEngine& WebEngine::operator=(const WebEngine& webEngine)
 {
+  BaseHandle::operator=(webEngine);
+  return *this;
 }
 
-void WebEngine::Create( uint32_t width, uint32_t height, uint32_t argc, char** argv )
+WebEngine WebEngine::DownCast(BaseHandle handle)
 {
+  return WebEngine(dynamic_cast<Internal::Adaptor::WebEngine*>(handle.GetObjectPtr()));
 }
 
-void WebEngine::Destroy()
+void WebEngine::Create(uint32_t width, uint32_t height, const std::string& locale, const std::string& timezoneId)
 {
 }
 
-WebEngineSettings& WebEngine::GetSettings() const
+void WebEngine::Create(uint32_t width, uint32_t height, uint32_t argc, char** argv)
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetSettings();
 }
 
-WebEngineContext& WebEngine::GetContext() const
+void WebEngine::Destroy()
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetContext();
 }
 
-WebEngineCookieManager& WebEngine::GetCookieManager() const
+WebEngineSettings& WebEngine::GetSettings() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetCookieManager();
+  return Internal::Adaptor::GetImplementation(*this).GetSettings();
 }
 
 WebEngineBackForwardList& WebEngine::GetBackForwardList() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetBackForwardList();
+  return Internal::Adaptor::GetImplementation(*this).GetBackForwardList();
 }
 
-void WebEngine::LoadUrl( const std::string& url )
+void WebEngine::LoadUrl(const std::string& url)
 {
-  return Internal::Adaptor::GetImplementation( *this ).LoadUrl( url );
+  return Internal::Adaptor::GetImplementation(*this).LoadUrl(url);
 }
 
 std::string WebEngine::GetTitle() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetTitle();
+  return Internal::Adaptor::GetImplementation(*this).GetTitle();
 }
 
 Dali::PixelData WebEngine::GetFavicon() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetFavicon();
+  return Internal::Adaptor::GetImplementation(*this).GetFavicon();
 }
 
 std::string WebEngine::GetUrl() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetUrl();
+  return Internal::Adaptor::GetImplementation(*this).GetUrl();
+}
+
+Dali::WebEnginePlugin* WebEngine::GetPlugin() const
+{
+  return Internal::Adaptor::GetWebEnginePlugin();
 }
 
-NativeImageInterfacePtr WebEngine::GetNativeImageSource()
+NativeImageSourcePtr WebEngine::GetNativeImageSource()
 {
-  Any source;
-  Dali::NativeImageSourcePtr sourcePtr = Dali::NativeImageSource::New( source );
+  Any                        source;
+  Dali::NativeImageSourcePtr sourcePtr = Dali::NativeImageSource::New(source);
   return sourcePtr;
 }
 
-void WebEngine::LoadHtmlString( const std::string& htmlString )
+void WebEngine::LoadHtmlString(const std::string& htmlString)
 {
 }
 
@@ -2072,7 +2437,7 @@ bool WebEngine::LoadHtmlStringOverrideCurrentEntry(const std::string& html, cons
   return true;
 }
 
-bool WebEngine::LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
+bool WebEngine::LoadContents(const int8_t* contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
 {
   return true;
 }
@@ -2128,57 +2493,57 @@ bool WebEngine::StopInspectorServer()
 
 bool WebEngine::CanGoForward()
 {
-  return Internal::Adaptor::GetImplementation( *this ).CanGoForward();
+  return Internal::Adaptor::GetImplementation(*this).CanGoForward();
 }
 
 void WebEngine::GoForward()
 {
-  Internal::Adaptor::GetImplementation( *this ).GoForward();
+  Internal::Adaptor::GetImplementation(*this).GoForward();
 }
 
 bool WebEngine::CanGoBack()
 {
-  return Internal::Adaptor::GetImplementation( *this ).CanGoBack();
+  return Internal::Adaptor::GetImplementation(*this).CanGoBack();
 }
 
 void WebEngine::GoBack()
 {
-  Internal::Adaptor::GetImplementation( *this ).GoBack();
+  Internal::Adaptor::GetImplementation(*this).GoBack();
 }
 
-void WebEngine::EvaluateJavaScript( const std::string& script, std::function< void( const std::string& ) > resultHandler )
+void WebEngine::EvaluateJavaScript(const std::string& script, std::function<void(const std::string&)> resultHandler)
 {
-  Internal::Adaptor::GetImplementation( *this ).EvaluateJavaScript( script, resultHandler );
+  Internal::Adaptor::GetImplementation(*this).EvaluateJavaScript(script, resultHandler);
 }
 
-void WebEngine::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void(const std::string&) > handler )
+void WebEngine::AddJavaScriptMessageHandler(const std::string& exposedObjectName, std::function<void(const std::string&)> handler)
 {
 }
 
-void WebEngine::RegisterJavaScriptAlertCallback( Dali::WebEnginePlugin::JavaScriptAlertCallback callback )
+void WebEngine::RegisterJavaScriptAlertCallback(Dali::WebEnginePlugin::JavaScriptAlertCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterJavaScriptAlertCallback( callback );
+  Internal::Adaptor::GetImplementation(*this).RegisterJavaScriptAlertCallback(callback);
 }
 
 void WebEngine::JavaScriptAlertReply()
 {
 }
 
-void WebEngine::RegisterJavaScriptConfirmCallback( Dali::WebEnginePlugin::JavaScriptConfirmCallback callback )
+void WebEngine::RegisterJavaScriptConfirmCallback(Dali::WebEnginePlugin::JavaScriptConfirmCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterJavaScriptConfirmCallback( callback );
+  Internal::Adaptor::GetImplementation(*this).RegisterJavaScriptConfirmCallback(callback);
 }
 
-void WebEngine::JavaScriptConfirmReply( bool confirmed )
+void WebEngine::JavaScriptConfirmReply(bool confirmed)
 {
 }
 
-void WebEngine::RegisterJavaScriptPromptCallback( Dali::WebEnginePlugin::JavaScriptPromptCallback callback )
+void WebEngine::RegisterJavaScriptPromptCallback(Dali::WebEnginePlugin::JavaScriptPromptCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterJavaScriptPromptCallback( callback );
+  Internal::Adaptor::GetImplementation(*this).RegisterJavaScriptPromptCallback(callback);
 }
 
-void WebEngine::JavaScriptPromptReply( const std::string& result )
+void WebEngine::JavaScriptPromptReply(const std::string& result)
 {
 }
 
@@ -2198,23 +2563,33 @@ void WebEngine::ClearAllTilesResources()
 
 void WebEngine::ClearHistory()
 {
-  Internal::Adaptor::GetImplementation( *this ).ClearHistory();
+  Internal::Adaptor::GetImplementation(*this).ClearHistory();
 }
 
 void WebEngine::SetScaleFactor(float scaleFactor, Dali::Vector2 point)
 {
-  Internal::Adaptor::GetImplementation( *this ).SetScaleFactor(scaleFactor, point);
+  Internal::Adaptor::GetImplementation(*this).SetScaleFactor(scaleFactor, point);
 }
 
 float WebEngine::GetScaleFactor() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetScaleFactor();
+  return Internal::Adaptor::GetImplementation(*this).GetScaleFactor();
+}
+
+bool WebEngine::SetVisibility(bool visible)
+{
+  return Internal::Adaptor::GetImplementation(*this).SetVisibility(visible);
 }
 
 void WebEngine::ActivateAccessibility(bool activated)
 {
 }
 
+Accessibility::Address WebEngine::GetAccessibilityAddress()
+{
+  return Internal::Adaptor::GetImplementation(*this).GetAccessibilityAddress();
+}
+
 bool WebEngine::HighlightText(const std::string& text, Dali::WebEnginePlugin::FindOption options, uint32_t maxMatchCount)
 {
   return true;
@@ -2226,65 +2601,65 @@ void WebEngine::AddDynamicCertificatePath(const std::string& host, const std::st
 
 Dali::PixelData WebEngine::GetScreenshot(Dali::Rect<int32_t> viewArea, float scaleFactor)
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetScreenshot(viewArea, scaleFactor);
+  return Internal::Adaptor::GetImplementation(*this).GetScreenshot(viewArea, scaleFactor);
 }
 
 bool WebEngine::GetScreenshotAsynchronously(Dali::Rect<int32_t> viewArea, float scaleFactor, Dali::WebEnginePlugin::ScreenshotCapturedCallback callback)
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetScreenshotAsynchronously(viewArea, scaleFactor, callback);
+  return Internal::Adaptor::GetImplementation(*this).GetScreenshotAsynchronously(viewArea, scaleFactor, callback);
 }
 
 bool WebEngine::CheckVideoPlayingAsynchronously(Dali::WebEnginePlugin::VideoPlayingCallback callback)
 {
-  return Internal::Adaptor::GetImplementation( *this ).CheckVideoPlayingAsynchronously(callback);
+  return Internal::Adaptor::GetImplementation(*this).CheckVideoPlayingAsynchronously(callback);
 }
 
 void WebEngine::RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterGeolocationPermissionCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterGeolocationPermissionCallback(callback);
 }
 
 std::string WebEngine::GetUserAgent() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetUserAgent();
+  return Internal::Adaptor::GetImplementation(*this).GetUserAgent();
 }
 
-void WebEngine::SetUserAgent( const std::string& userAgent )
+void WebEngine::SetUserAgent(const std::string& userAgent)
 {
-  Internal::Adaptor::GetImplementation( *this ).SetUserAgent( userAgent );
+  Internal::Adaptor::GetImplementation(*this).SetUserAgent(userAgent);
 }
 
-void WebEngine::ScrollBy( int32_t dx, int32_t dy )
+void WebEngine::ScrollBy(int32_t dx, int32_t dy)
 {
-  Internal::Adaptor::GetImplementation( *this ).ScrollBy( dx, dy );
+  Internal::Adaptor::GetImplementation(*this).ScrollBy(dx, dy);
 }
 
-bool WebEngine::ScrollEdgeBy( int32_t dx, int32_t dy )
+bool WebEngine::ScrollEdgeBy(int32_t dx, int32_t dy)
 {
-  return Internal::Adaptor::GetImplementation( *this ).ScrollEdgeBy( dx, dy );
+  return Internal::Adaptor::GetImplementation(*this).ScrollEdgeBy(dx, dy);
 }
 
-void WebEngine::SetScrollPosition( int32_t x, int32_t y )
+void WebEngine::SetScrollPosition(int32_t x, int32_t y)
 {
-  Internal::Adaptor::GetImplementation( *this ).SetScrollPosition( x, y );
+  Internal::Adaptor::GetImplementation(*this).SetScrollPosition(x, y);
 }
 
 Dali::Vector2 WebEngine::GetScrollPosition() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetScrollPosition();
+  return Internal::Adaptor::GetImplementation(*this).GetScrollPosition();
 }
 
 Dali::Vector2 WebEngine::GetScrollSize() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetScrollSize();
+  return Internal::Adaptor::GetImplementation(*this).GetScrollSize();
 }
 
 Dali::Vector2 WebEngine::GetContentSize() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetContentSize();
+  return Internal::Adaptor::GetImplementation(*this).GetContentSize();
 }
 
-void WebEngine::SetSize( uint32_t width, uint32_t height )
+void WebEngine::SetSize(uint32_t width, uint32_t height)
 {
 }
 
@@ -2309,144 +2684,154 @@ std::string WebEngine::GetSelectedText() const
   return "test";
 }
 
-bool WebEngine::SendTouchEvent( const TouchEvent& touch )
+bool WebEngine::SendTouchEvent(const TouchEvent& touch)
 {
   return true;
 }
 
-bool WebEngine::SendKeyEvent( const KeyEvent& event )
+bool WebEngine::SendKeyEvent(const KeyEvent& event)
 {
   return true;
 }
 
-bool WebEngine::SendHoverEvent( const HoverEvent& event )
+bool WebEngine::SendHoverEvent(const HoverEvent& event)
 {
   return true;
 }
 
-bool WebEngine::SendWheelEvent( const WheelEvent& event )
+bool WebEngine::SendWheelEvent(const WheelEvent& event)
 {
   return true;
 }
 
-void WebEngine::SetFocus( bool focused )
+void WebEngine::SetFocus(bool focused)
 {
 }
 
 void WebEngine::SetPageZoomFactor(float zoomFactor)
 {
-  Internal::Adaptor::GetImplementation( *this ).SetPageZoomFactor(zoomFactor);
+  Internal::Adaptor::GetImplementation(*this).SetPageZoomFactor(zoomFactor);
 }
 
 float WebEngine::GetPageZoomFactor() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetPageZoomFactor();
+  return Internal::Adaptor::GetImplementation(*this).GetPageZoomFactor();
 }
 
 void WebEngine::SetTextZoomFactor(float zoomFactor)
 {
-  Internal::Adaptor::GetImplementation( *this ).SetTextZoomFactor(zoomFactor);
+  Internal::Adaptor::GetImplementation(*this).SetTextZoomFactor(zoomFactor);
 }
 
 float WebEngine::GetTextZoomFactor() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetTextZoomFactor();
+  return Internal::Adaptor::GetImplementation(*this).GetTextZoomFactor();
 }
 
 float WebEngine::GetLoadProgressPercentage() const
 {
-  return Internal::Adaptor::GetImplementation( *this ).GetLoadProgressPercentage();
+  return Internal::Adaptor::GetImplementation(*this).GetLoadProgressPercentage();
 }
 
-void WebEngine::UpdateDisplayArea( Dali::Rect< int32_t > displayArea )
+void WebEngine::UpdateDisplayArea(Dali::Rect<int32_t> displayArea)
 {
 }
 
-void WebEngine::EnableVideoHole( bool enabled )
+void WebEngine::EnableVideoHole(bool enabled)
 {
 }
 
-void WebEngine::EnableMouseEvents( bool enabled )
+void WebEngine::EnableMouseEvents(bool enabled)
 {
 }
 
-void WebEngine::EnableKeyEvents( bool enabled )
+void WebEngine::EnableKeyEvents(bool enabled)
 {
 }
 
-Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType& WebEngine::FrameRenderedSignal()
+void WebEngine::RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback)
 {
-  return Internal::Adaptor::GetImplementation(*this).FrameRenderedSignal();
+  Internal::Adaptor::GetImplementation(*this).RegisterFrameRenderedCallback(callback);
 }
 
 void WebEngine::RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterPageLoadStartedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterPageLoadStartedCallback(callback);
 }
 
 void WebEngine::RegisterPageLoadInProgressCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterPageLoadInProgressCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterPageLoadInProgressCallback(callback);
 }
 
 void WebEngine::RegisterPageLoadFinishedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterPageLoadFinishedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterPageLoadFinishedCallback(callback);
 }
 
 void WebEngine::RegisterPageLoadErrorCallback(Dali::WebEnginePlugin::WebEnginePageLoadErrorCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterPageLoadErrorCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterPageLoadErrorCallback(callback);
 }
 
 void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterScrollEdgeReachedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterScrollEdgeReachedCallback(callback);
 }
 
 void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterUrlChangedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterUrlChangedCallback(callback);
 }
 
 void WebEngine::RegisterFormRepostDecidedCallback(Dali::WebEnginePlugin::WebEngineFormRepostDecidedCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterFormRepostDecidedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterFormRepostDecidedCallback(callback);
 }
 
 void WebEngine::RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterConsoleMessageReceivedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterConsoleMessageReceivedCallback(callback);
 }
 
 void WebEngine::RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterResponsePolicyDecidedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterResponsePolicyDecidedCallback(callback);
+}
+
+void WebEngine::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback)
+{
+  Internal::Adaptor::GetImplementation(*this).RegisterNavigationPolicyDecidedCallback(callback);
+}
+
+void WebEngine::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
+{
+  Internal::Adaptor::GetImplementation(*this).RegisterNewWindowCreatedCallback(callback);
 }
 
 void WebEngine::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterCertificateConfirmedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterCertificateConfirmedCallback(callback);
 }
 
 void WebEngine::RegisterSslCertificateChangedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterSslCertificateChangedCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterSslCertificateChangedCallback(callback);
 }
 
 void WebEngine::RegisterHttpAuthHandlerCallback(Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterHttpAuthHandlerCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterHttpAuthHandlerCallback(callback);
 }
 
 void WebEngine::RegisterContextMenuShownCallback(Dali::WebEnginePlugin::WebEngineContextMenuShownCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterContextMenuShownCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterContextMenuShownCallback(callback);
 }
 
 void WebEngine::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback)
 {
-  Internal::Adaptor::GetImplementation( *this ).RegisterContextMenuHiddenCallback(callback);
+  Internal::Adaptor::GetImplementation(*this).RegisterContextMenuHiddenCallback(callback);
 }
 
 void WebEngine::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback)
@@ -2454,5 +2839,4 @@ void WebEngine::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextRecei
   Internal::Adaptor::GetImplementation(*this).GetPlainTextAsynchronously(callback);
 }
 
-} // namespace Dali;
-
+} // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h
index dc7a206..58d344e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h
@@ -30,7 +30,6 @@ namespace Dali
 {
 
 using PositionSize   = Dali::Rect<int>;
-using WindowPosition = Uint16Pair;
 
 namespace Internal
 {
@@ -45,15 +44,16 @@ public:
   virtual ~Window() = default;
   static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent);
 
-  WindowPosition           GetPosition() const;
-  PositionSize             GetPositionSize() const;
-  Dali::Window::WindowSize GetSize() const;
+  Dali::Window::WindowPosition           GetPosition() const;
+  PositionSize                           GetPositionSize() const;
+  Dali::Window::WindowSize               GetSize() const;
 
   void SetPositionSize(PositionSize positionSize);
 
   FocusChangeSignalType mFocusChangeSignal;
   ResizeSignalType      mResizeSignal;
   int                   mRotationAngle;
+  bool                  mVisible;
   DevelWindow::VisibilityChangedSignalType mVisibilityChangedSignal;
 };
 
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
index d0a3e4f..b770e14 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/object/base-object.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 
 #define DALI_WINDOW_H
 #include <dali/integration-api/adaptor-framework/adaptor.h>
@@ -31,7 +32,6 @@ using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
 
 namespace Dali
 {
-
 class Window;
 
 /********************************************************************************
@@ -42,26 +42,26 @@ namespace Internal
 {
 namespace Adaptor
 {
-
-Window::Window( const PositionSize& positionSize )
-: SceneHolder( positionSize ),
+Window::Window(const PositionSize& positionSize)
+: SceneHolder(positionSize),
   mFocusChangeSignal(),
   mResizeSignal(),
   mRotationAngle(90), // dummy angle for test coverage
+  mVisible(true),
   mVisibilityChangedSignal()
 {
 }
 
 Window* Window::New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent)
 {
-  return new Window( positionSize );
+  return new Window(positionSize);
 }
 
-WindowPosition Window::GetPosition() const
+Dali::Window::WindowPosition Window::GetPosition() const
 {
   PositionSize positionSize = mRenderSurface.GetPositionSize();
 
-  return WindowPosition(positionSize.x, positionSize.y);
+  return Dali::Window::WindowPosition(positionSize.x, positionSize.y);
 }
 
 PositionSize Window::GetPositionSize() const
@@ -80,24 +80,24 @@ void Window::SetPositionSize(PositionSize positionSize)
 {
   mRenderSurface.MoveResize(positionSize);
 
-  Uint16Pair newSize(positionSize.width, positionSize.height);
+  Uint16Pair   newSize(positionSize.width, positionSize.height);
   Dali::Window handle(this);
   mResizeSignal.Emit(handle, newSize);
 }
 
-} // Adaptor
-} // Internal
+} // namespace Adaptor
+} // namespace Internal
 
 inline Internal::Adaptor::Window& GetImplementation(Dali::Window& window)
 {
-  DALI_ASSERT_ALWAYS( window && "Window handle is empty" );
+  DALI_ASSERT_ALWAYS(window && "Window handle is empty");
   BaseObject& object = window.GetBaseObject();
   return static_cast<Internal::Adaptor::Window&>(object);
 }
 
 inline const Internal::Adaptor::Window& GetImplementation(const Dali::Window& window)
 {
-  DALI_ASSERT_ALWAYS( window && "Window handle is empty" );
+  DALI_ASSERT_ALWAYS(window && "Window handle is empty");
   const BaseObject& object = window.GetBaseObject();
   return static_cast<const Internal::Adaptor::Window&>(object);
 }
@@ -110,166 +110,187 @@ Window::~Window()
 {
 }
 
-Window::Window( const Window& copy ) = default;
+Window::Window(const Window& copy) = default;
 
-Window& Window::operator=( const Window& rhs ) = default;
+Window& Window::operator=(const Window& rhs) = default;
 
-Window::Window( Window&& rhs ) = default;
+Window::Window(Window&& rhs) = default;
 
-Window& Window::operator=( Window&& rhs ) = default;
+Window& Window::operator=(Window&& rhs) = default;
 
-Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent )
+Dali::Window Window::New(PositionSize windowPosition, const std::string& name, bool isTransparent)
 {
-  return New( windowPosition, name, "", isTransparent );
+  return New(windowPosition, name, "", isTransparent);
 }
 
-Dali::Window Window::New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent )
+Dali::Window Window::New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent)
 {
-  Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( windowPosition, name, className, isTransparent );
+  Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(windowPosition, name, className, isTransparent);
 
-  Dali::Window result( window );
+  Dali::Window result(window);
 
   // This will also emit the window created signals
-  AdaptorImpl::GetImpl( AdaptorImpl::Get() ).AddWindow( window );
+  AdaptorImpl::GetImpl(AdaptorImpl::Get()).AddWindow(window);
 
   return result;
 }
 
-Window::Window( Internal::Adaptor::Window* window )
-: BaseHandle( window )
+Window Window::DownCast(BaseHandle handle)
+{
+  Internal::Adaptor::Window* windowImpl = nullptr;
+  if(Dali::Adaptor::IsAvailable())
+  {
+    windowImpl = dynamic_cast<Dali::Internal::Adaptor::Window*>(handle.GetObjectPtr());
+  }
+  return Dali::Window(windowImpl);
+}
+
+Window::Window(Internal::Adaptor::Window* window)
+: BaseHandle(window)
 {
 }
 
 Integration::Scene Window::GetScene()
 {
-  return GetImplementation( *this ).GetScene();
+  return GetImplementation(*this).GetScene();
 }
 
 Dali::RenderSurfaceInterface& Window::GetRenderSurface()
 {
-  return GetImplementation( *this ).GetRenderSurface();
+  return GetImplementation(*this).GetRenderSurface();
 }
 
-void Window::Add( Actor actor )
+void Window::Add(Actor actor)
 {
-  GetImplementation( *this ).Add( actor );
+  GetImplementation(*this).Add(actor);
 }
 
-void Window::Remove( Actor actor )
+void Window::Remove(Actor actor)
 {
-  GetImplementation( *this ).Remove( actor );
+  GetImplementation(*this).Remove(actor);
 }
 
 Dali::Layer Window::GetRootLayer() const
 {
-  return GetImplementation( *this ).GetRootLayer();
+  return GetImplementation(*this).GetRootLayer();
 }
 
-void Window::SetBackgroundColor( const Vector4& color )
+void Window::SetBackgroundColor(const Vector4& color)
 {
-  GetImplementation( *this ).SetBackgroundColor( color );
+  GetImplementation(*this).SetBackgroundColor(color);
 }
 
 Vector4 Window::GetBackgroundColor() const
 {
-  return GetImplementation( *this ).GetBackgroundColor();
+  return GetImplementation(*this).GetBackgroundColor();
 }
 
 void Window::Raise()
 {
-  GetImplementation( *this ).mFocusChangeSignal.Emit(*this, true);
+  GetImplementation(*this).mFocusChangeSignal.Emit(*this, true);
+}
+
+void Window::Show()
+{
+  GetImplementation(*this).mVisible = true;
+  GetImplementation(*this).mVisibilityChangedSignal.Emit(*this, true);
 }
 
 void Window::Hide()
 {
-  GetImplementation( *this ).mVisibilityChangedSignal.Emit( *this, false );
+  GetImplementation(*this).mVisible = false;
+  GetImplementation(*this).mVisibilityChangedSignal.Emit(*this, false);
+}
+
+bool Window::IsVisible() const
+{
+  return GetImplementation(*this).mVisible;
 }
 
 FocusChangeSignalType& Window::FocusChangeSignal()
 {
-  return GetImplementation( *this ).mFocusChangeSignal;
+  return GetImplementation(*this).mFocusChangeSignal;
 }
 
 ResizeSignalType& Window::ResizeSignal()
 {
-  return GetImplementation( *this ).mResizeSignal;
+  return GetImplementation(*this).mResizeSignal;
 }
 
 Window::KeyEventSignalType& Window::KeyEventSignal()
 {
-  return GetImplementation( *this ).KeyEventSignal();
+  return GetImplementation(*this).KeyEventSignal();
 }
 
 Window::TouchEventSignalType& Window::TouchedSignal()
 {
-  return GetImplementation( *this ).TouchedSignal();
+  return GetImplementation(*this).TouchedSignal();
 }
 
-namespace DevelWindow
+Dali::RenderTaskList Window::GetRenderTaskList()
 {
+  return GetImplementation(*this).GetRenderTaskList();
+}
 
-Window Get( Actor actor )
+namespace DevelWindow
+{
+Window Get(Actor actor)
 {
   Internal::Adaptor::Window* windowImpl = nullptr;
 
-  if ( Dali::Adaptor::IsAvailable() )
+  if(Dali::Adaptor::IsAvailable())
   {
-    windowImpl = static_cast<Internal::Adaptor::Window*>( AdaptorImpl::GetImpl( AdaptorImpl::Get() ).GetWindow( actor ) );
+    windowImpl = static_cast<Internal::Adaptor::Window*>(AdaptorImpl::GetImpl(AdaptorImpl::Get()).GetWindow(actor));
   }
 
-  return Dali::Window( windowImpl );
+  return Dali::Window(windowImpl);
 }
 
-Window DownCast( BaseHandle handle )
+void SetPositionSize(Window window, PositionSize positionSize)
 {
-  Internal::Adaptor::Window* windowImpl = nullptr;
-  if ( Dali::Adaptor::IsAvailable() )
-  {
-    windowImpl = dynamic_cast<Dali::Internal::Adaptor::Window*>( handle.GetObjectPtr());
-  }
-  return Dali::Window( windowImpl );
+  GetImplementation(window).SetPositionSize(positionSize);
 }
 
-void SetPositionSize(Window window, PositionSize positionSize)
+int GetPhysicalOrientation(Window window)
 {
-  GetImplementation( window ).SetPositionSize(positionSize);
+  return GetImplementation(window).mRotationAngle;
 }
 
-int GetPhysicalOrientation(Window window)
+void AddFrameRenderedCallback(Window window, std::unique_ptr<CallbackBase> callback, int32_t frameId)
 {
-  return GetImplementation( window ).mRotationAngle;
+  CallbackBase::Execute(*callback, frameId);
 }
 
-void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId )
+void AddFramePresentedCallback(Window window, std::unique_ptr<CallbackBase> callback, int32_t frameId)
 {
-  CallbackBase::Execute( *callback, frameId );
+  CallbackBase::Execute(*callback, frameId);
 }
 
-void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId )
+EventProcessingFinishedSignalType& EventProcessingFinishedSignal(Window window)
 {
-  CallbackBase::Execute( *callback, frameId );
+  return GetImplementation(window).GetScene().EventProcessingFinishedSignal();
 }
 
-EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window )
+KeyEventGeneratedSignalType& KeyEventGeneratedSignal(Window window)
 {
-  return GetImplementation( window ).GetScene().EventProcessingFinishedSignal();
+  return GetImplementation(window).KeyEventGeneratedSignal();
 }
 
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window )
+WheelEventSignalType& WheelEventSignal(Window window)
 {
-  return GetImplementation( window ).KeyEventGeneratedSignal();
+  return GetImplementation(window).WheelEventSignal();
 }
 
-WheelEventSignalType& WheelEventSignal( Window window )
+WheelEventGeneratedSignalType& WheelEventGeneratedSignal(Window window)
 {
-  return GetImplementation( window ).WheelEventSignal();
+  return GetImplementation(window).WheelEventGeneratedSignal();
 }
 
-VisibilityChangedSignalType& VisibilityChangedSignal( Window window )
+VisibilityChangedSignalType& VisibilityChangedSignal(Window window)
 {
-  return GetImplementation( window ).mVisibilityChangedSignal;
+  return GetImplementation(window).mVisibilityChangedSignal;
 }
 
 } // namespace DevelWindow
 
-} // Dali
+} // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
index a696684..2c3eb28 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
@@ -2,7 +2,7 @@
 #define TOOLKIT_WINDOW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,16 @@
  */
 
 //EXTERNAL INCLUDES
-#include <string>
+#include <dali/integration-api/scene.h>
+#include <dali/public-api/math/int-pair.h>
 #include <dali/public-api/math/rect.h>
+#include <dali/public-api/math/uint-16-pair.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal.h>
-#include <dali/integration-api/scene.h>
+#include <string>
 
 namespace Dali
 {
-
 class Actor;
 class Layer;
 class RenderSurfaceInterface;
@@ -43,20 +44,21 @@ namespace Adaptor
 {
 class Window;
 }
-}
+} // namespace Internal
 
 class Window;
-typedef Signal< void (Window,bool) > FocusChangeSignalType;
-typedef Signal< void (Window,Uint16Pair) > ResizeSignalType;
+typedef Signal<void(Window, bool)>       FocusChangeSignalType;
+typedef Signal<void(Window, Uint16Pair)> ResizeSignalType;
 
 class Window : public BaseHandle
 {
 public:
   using WindowSize     = Uint16Pair;
+  using WindowPosition = Int32Pair;
 
-  using KeyEventSignalType = Signal< void (const KeyEvent&) >;
-  using TouchEventSignalType = Signal< void (const TouchEvent&) >;
-  using ResizeSignalType      = Signal<void(Window, WindowSize)>;
+  using KeyEventSignalType   = Signal<void(const KeyEvent&)>;
+  using TouchEventSignalType = Signal<void(const TouchEvent&)>;
+  using ResizeSignalType     = Signal<void(Window, WindowSize)>;
 
   static Window New(PositionSize windowPosition, const std::string& name, bool isTransparent = false);
   static Window New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent = false);
@@ -65,49 +67,54 @@ public:
   ~Window();
   Window(const Window& handle);
   Window& operator=(const Window& rhs);
-  Window( Window&& rhs );
-  Window& operator=( Window&& rhs );
+  Window(Window&& rhs);
+  Window&       operator=(Window&& rhs);
+  static Window DownCast(BaseHandle handle);
 
-  Integration::Scene GetScene();
+  Integration::Scene            GetScene();
   Dali::RenderSurfaceInterface& GetRenderSurface();
-  void Add( Dali::Actor actor );
-  void Remove( Dali::Actor actor );
-  Dali::Layer GetRootLayer() const;
-  void SetBackgroundColor( const Vector4& color );
-  Vector4 GetBackgroundColor() const;
-  void Raise();
-  void Hide();
-  FocusChangeSignalType& FocusChangeSignal();
-  KeyEventSignalType& KeyEventSignal();
-  TouchEventSignalType& TouchedSignal();
-  ResizeSignalType& ResizeSignal();
+  void                          Add(Dali::Actor actor);
+  void                          Remove(Dali::Actor actor);
+  Dali::Layer                   GetRootLayer() const;
+  void                          SetBackgroundColor(const Vector4& color);
+  Vector4                       GetBackgroundColor() const;
+  void                          Raise();
+  void                          Show();
+  void                          Hide();
+  bool                          IsVisible() const;
+  FocusChangeSignalType&        FocusChangeSignal();
+  KeyEventSignalType&           KeyEventSignal();
+  TouchEventSignalType&         TouchedSignal();
+  ResizeSignalType&             ResizeSignal();
+  Dali::RenderTaskList          GetRenderTaskList();
 
 public:
-  explicit Window( Internal::Adaptor::Window* window );
+  explicit Window(Internal::Adaptor::Window* window);
 };
 
-Internal::Adaptor::Window& GetImplementation(Dali::Window& window);
+Internal::Adaptor::Window&       GetImplementation(Dali::Window& window);
 const Internal::Adaptor::Window& GetImplementation(const Dali::Window& window);
 
 namespace DevelWindow
 {
-typedef Signal< void () > EventProcessingFinishedSignalType;
-typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType;
-typedef Signal< void (const WheelEvent&) > WheelEventSignalType;
-typedef Signal< void ( Window, bool ) > VisibilityChangedSignalType;
-
-Dali::Window Get( Actor actor );
-Dali::Window DownCast(  BaseHandle handle );
-void SetPositionSize(Window window, PositionSize positionSize);
-int GetPhysicalOrientation(Window window);
-void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId );
-void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId );
-
-EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window );
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
-WheelEventSignalType& WheelEventSignal( Window window );
-VisibilityChangedSignalType& VisibilityChangedSignal( Window window );
-}
+typedef Signal<void()>                  EventProcessingFinishedSignalType;
+typedef Signal<bool(const KeyEvent&)>   KeyEventGeneratedSignalType;
+typedef Signal<void(const WheelEvent&)> WheelEventSignalType;
+typedef Signal<bool(const WheelEvent&)> WheelEventGeneratedSignalType;
+typedef Signal<void(Window, bool)>      VisibilityChangedSignalType;
+
+Dali::Window Get(Actor actor);
+void         SetPositionSize(Window window, PositionSize positionSize);
+int          GetPhysicalOrientation(Window window);
+void         AddFrameRenderedCallback(Window window, std::unique_ptr<CallbackBase> callback, int32_t frameId);
+void         AddFramePresentedCallback(Window window, std::unique_ptr<CallbackBase> callback, int32_t frameId);
+
+EventProcessingFinishedSignalType& EventProcessingFinishedSignal(Window window);
+KeyEventGeneratedSignalType&       KeyEventGeneratedSignal(Dali::Window window);
+WheelEventSignalType&              WheelEventSignal(Window window);
+WheelEventGeneratedSignalType&     WheelEventGeneratedSignal(Dali::Window window);
+VisibilityChangedSignalType&       VisibilityChangedSignal(Window window);
+} // namespace DevelWindow
 
 } // namespace Dali
 
diff --git a/automated-tests/src/dali-toolkit/test-text-geometry-utils.cpp b/automated-tests/src/dali-toolkit/test-text-geometry-utils.cpp
new file mode 100644
index 0000000..6ca87ad
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/test-text-geometry-utils.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "test-text-geometry-utils.h"
+
+namespace TestTextGeometryUtils
+{
+
+void CheckGeometryResult(Vector<Vector2> positionsList, Vector<Vector2> sizeList, Vector<Vector2> expectedPositions, Vector<Vector2> expectedSizes)
+{
+  unsigned int expectedCount = expectedSizes.Size();
+
+  for(unsigned int i = 0; i < expectedCount; i++)
+  {
+    DALI_TEST_EQUALS((int)positionsList[i].x, (int)expectedPositions[i].x, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)positionsList[i].y, (int)expectedPositions[i].y, TEST_LOCATION);
+
+    DALI_TEST_EQUALS((int)sizeList[i].x, (int)expectedSizes[i].x, TEST_LOCATION);
+    DALI_TEST_EQUALS((int)sizeList[i].y, (int)expectedSizes[i].y, TEST_LOCATION);
+  }
+}
+
+void CheckRectGeometryResult(Rect<> rectGeometry, Rect<> expectedRectGeometry)
+{
+  DALI_TEST_EQUALS((float)rectGeometry.x, (float)expectedRectGeometry.x, TEST_LOCATION);
+  DALI_TEST_EQUALS((float)rectGeometry.y, (float)expectedRectGeometry.y, TEST_LOCATION);
+  DALI_TEST_EQUALS((float)rectGeometry.width, (float)expectedRectGeometry.width, TEST_LOCATION);
+  DALI_TEST_EQUALS((float)rectGeometry.height, (float)expectedRectGeometry.height, TEST_LOCATION);
+}
+
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/test-text-geometry-utils.h b/automated-tests/src/dali-toolkit/test-text-geometry-utils.h
new file mode 100644
index 0000000..41050eb
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/test-text-geometry-utils.h
@@ -0,0 +1,33 @@
+#ifndef  TOOLKIT_TEXT_GEOMETRY_UTILS_H
+#define  TOOLKIT_TEXT_GEOMETRY_UTILS_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+
+
+
+namespace TestTextGeometryUtils
+{
+void CheckGeometryResult(Vector<Vector2> positionsList, Vector<Vector2> sizeList, Vector<Vector2> expectedPositions, Vector<Vector2> expectedSizes);
+void CheckRectGeometryResult(Rect<> rectGeometry, Rect<> expectedRectGeometry);
+}
+
+#endif // TOOLKIT_TEXT_GEOMETRY_UTILS_H
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
index f4b809d..d00fa11 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,16 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
-
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
-#include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -43,9 +42,9 @@ void utc_dali_toolkit_alignment_cleanup(void)
 namespace
 {
 /// Compare an int (Or'd Alignment::Type) with an Alignment::Type value
-void DALI_TEST_EQUALS( int value1, Alignment::Type value2, const char* location )
+void DALI_TEST_EQUALS(int value1, Alignment::Type value2, const char* location)
 {
-  ::DALI_TEST_EQUALS< Alignment::Type >( static_cast< Alignment::Type >( value1 ), value2, location );
+  ::DALI_TEST_EQUALS<Alignment::Type>(static_cast<Alignment::Type>(value1), value2, location);
 }
 
 static bool gObjectCreatedCallBackCalled;
@@ -56,7 +55,6 @@ static void TestCallback(BaseHandle handle)
 }
 } // namespace
 
-
 int UtcDaliAlignmentConstructorNegative(void)
 {
   ToolkitTestApplication application;
@@ -69,9 +67,9 @@ int UtcDaliAlignmentConstructorNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "alignment", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "alignment", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -88,15 +86,15 @@ int UtcDaliAlignmentConstructorPositive(void)
     alignment.SetPadding(padding);
     tet_result(TET_PASS);
   }
-  catch (DaliException& exception)
+  catch(DaliException& exception)
   {
     tet_result(TET_FAIL);
   }
 
   Actor actor = alignment;
-  alignment = Alignment::DownCast( actor );
+  alignment   = Alignment::DownCast(actor);
 
-  DALI_TEST_CHECK( alignment );
+  DALI_TEST_CHECK(alignment);
   END_TEST;
 }
 
@@ -106,14 +104,14 @@ int UtcDaliAlignmentConstructorRegister(void)
 
   //To ensure the object is registered after creation
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
   registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     Alignment alignment = Alignment::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -423,43 +421,43 @@ int UtcDaliAlignmentSetAlignmentTypeNegative(void)
 
   // Setting HORIZONTAL_LEFT, HORIZONTAL_CENTER
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::HORIZONTAL_CENTER));
     alignment.SetAlignmentType(type);
     // center will prevail in conflict
-    DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()));
   }
 
   // Setting HORIZONTAL_CENTER, HORIZONTAL_RIGHT
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::HORIZONTAL_RIGHT));
 
     alignment.SetAlignmentType(type);
     // center will prevail in conflict
-    DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()));
   }
 
   // Setting VERTICAL_TOP, VERTICAL_CENTER
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_CENTER));
     alignment.SetAlignmentType(type);
     // center will prevail in conflict
-    DALI_TEST_CHECK( Alignment::VERTICAL_CENTER & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::VERTICAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()));
   }
 
   // Setting VERTICAL_CENTER, VERTICAL_BOTTOM
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_BOTTOM));
     alignment.SetAlignmentType(type);
     // top will prevail in conflict
-    DALI_TEST_CHECK( Alignment::VERTICAL_TOP & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::VERTICAL_TOP & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()));
   }
   END_TEST;
 }
@@ -817,16 +815,16 @@ int UtcDaliAlignmentSetPaddingPositive(void)
   Alignment alignment = Alignment::New();
 
   Alignment::Padding padding(1.0f, 1.5f, 2.f, 0.5f);
-  DALI_TEST_CHECK( fabs( padding.left - alignment.GetPadding().left ) > GetRangedEpsilon( padding.left, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignment.GetPadding().right ) > GetRangedEpsilon( padding.right, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignment.GetPadding().top ) > GetRangedEpsilon( padding.top, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignment.GetPadding().bottom ) > GetRangedEpsilon( padding.bottom, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignment.GetPadding().left) > GetRangedEpsilon(padding.left, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignment.GetPadding().right) > GetRangedEpsilon(padding.right, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignment.GetPadding().top) > GetRangedEpsilon(padding.top, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignment.GetPadding().bottom) > GetRangedEpsilon(padding.bottom, alignment.GetPadding().bottom));
 
   alignment.SetPadding(padding);
-  DALI_TEST_CHECK( fabs( padding.left - alignment.GetPadding().left ) < GetRangedEpsilon( padding.left, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignment.GetPadding().right ) < GetRangedEpsilon( padding.right, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignment.GetPadding().top ) < GetRangedEpsilon( padding.top, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignment.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignment.GetPadding().left) < GetRangedEpsilon(padding.left, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignment.GetPadding().right) < GetRangedEpsilon(padding.right, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignment.GetPadding().top) < GetRangedEpsilon(padding.top, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignment.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignment.GetPadding().bottom));
   END_TEST;
 }
 
@@ -842,9 +840,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
 
   try
@@ -853,9 +851,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
 
   try
@@ -864,9 +862,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
 
   try
@@ -875,9 +873,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -887,17 +885,17 @@ int UtcDaliAlignmentGetPadding(void)
   ToolkitTestApplication application;
 
   Alignment alignment = Alignment::New();
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().left ) < GetRangedEpsilon( 0.f, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().right ) < GetRangedEpsilon( 0.f, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().top ) < GetRangedEpsilon( 0.f, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().bottom ) < GetRangedEpsilon( 0.f, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().left) < GetRangedEpsilon(0.f, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().right) < GetRangedEpsilon(0.f, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().top) < GetRangedEpsilon(0.f, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().bottom) < GetRangedEpsilon(0.f, alignment.GetPadding().bottom));
 
   Alignment::Padding padding(1.0f, 1.5f, 2.f, 0.f);
   alignment.SetPadding(padding);
-  DALI_TEST_CHECK( fabs( padding.left - alignment.GetPadding().left ) < GetRangedEpsilon( padding.left, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignment.GetPadding().right ) < GetRangedEpsilon( padding.right, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignment.GetPadding().top ) < GetRangedEpsilon( padding.top, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignment.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignment.GetPadding().left) < GetRangedEpsilon(padding.left, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignment.GetPadding().right) < GetRangedEpsilon(padding.right, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignment.GetPadding().top) < GetRangedEpsilon(padding.top, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignment.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignment.GetPadding().bottom));
   END_TEST;
 }
 
@@ -940,8 +938,8 @@ int UtcDaliAlignmentSizeSetP(void)
   application.Render();
   application.SendNotification();
 
-  Vector2 size( 100.0f, 200.0f );
-  alignment.SetProperty( Actor::Property::SIZE, size);
+  Vector2 size(100.0f, 200.0f);
+  alignment.SetProperty(Actor::Property::SIZE, size);
 
   application.Render();
   application.SendNotification();
@@ -967,8 +965,8 @@ int UtcDaliAlignmentOnTouchEvent(void)
   ToolkitTestApplication application;
 
   Alignment alignment = Alignment::New();
-  alignment.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  alignment.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  alignment.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  alignment.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   application.GetScene().Add(alignment);
 
   alignment.TouchedSignal().Connect(&TouchCallback);
@@ -979,10 +977,10 @@ int UtcDaliAlignmentOnTouchEvent(void)
   application.SendNotification();
 
   Integration::TouchEvent touchEvent(1);
-  Integration::Point point;
-  point.SetDeviceId( 1 );
-  point.SetState( PointState::DOWN);
-  point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
+  Integration::Point      point;
+  point.SetDeviceId(1);
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(20.0f, 20.0f));
   touchEvent.AddPoint(point);
   application.ProcessEvent(touchEvent);
 
@@ -1019,7 +1017,7 @@ int UtcDaliAlignmentOnSizeAnimation(void)
   application.GetScene().Add(alignment);
 
   Animation animation = Animation::New(100.0f);
-  animation.AnimateTo( Property( alignment, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) );
+  animation.AnimateTo(Property(alignment, Actor::Property::SIZE), Vector3(100.0f, 150.0f, 200.0f));
   animation.Play();
 
   application.Render();
@@ -1042,20 +1040,20 @@ int UtcDaliAlignmentCopyAndAssignment(void)
   alignment.SetPadding(padding);
 
   Alignment alignmentCopy(alignment);
-  DALI_TEST_CHECK( fabs( padding.left - alignmentCopy.GetPadding().left ) < GetRangedEpsilon( padding.left, alignmentCopy.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignmentCopy.GetPadding().right ) < GetRangedEpsilon( padding.right, alignmentCopy.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignmentCopy.GetPadding().top ) < GetRangedEpsilon( padding.top, alignmentCopy.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignmentCopy.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignmentCopy.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignmentCopy.GetPadding().left) < GetRangedEpsilon(padding.left, alignmentCopy.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignmentCopy.GetPadding().right) < GetRangedEpsilon(padding.right, alignmentCopy.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignmentCopy.GetPadding().top) < GetRangedEpsilon(padding.top, alignmentCopy.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignmentCopy.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignmentCopy.GetPadding().bottom));
 
   Alignment alignmentEmptyCopy(emptyAlignment);
   DALI_TEST_CHECK(emptyAlignment == alignmentEmptyCopy);
 
   Alignment alignmentEquals;
   alignmentEquals = alignment;
-  DALI_TEST_CHECK( fabs( padding.left - alignmentEquals.GetPadding().left ) < GetRangedEpsilon( padding.left, alignmentEquals.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignmentEquals.GetPadding().right ) < GetRangedEpsilon( padding.right, alignmentEquals.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignmentEquals.GetPadding().top ) < GetRangedEpsilon( padding.top, alignmentEquals.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignmentEquals.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignmentEquals.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignmentEquals.GetPadding().left) < GetRangedEpsilon(padding.left, alignmentEquals.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignmentEquals.GetPadding().right) < GetRangedEpsilon(padding.right, alignmentEquals.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignmentEquals.GetPadding().top) < GetRangedEpsilon(padding.top, alignmentEquals.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignmentEquals.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignmentEquals.GetPadding().bottom));
 
   Alignment alignmentEmptyEquals;
   alignmentEmptyEquals = emptyAlignment;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
index 56d67f4..4535413 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +14,22 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
-#include <toolkit-timer.h>
+
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-timer.h>
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+
 #include "dummy-control.h"
 
 using namespace Dali;
@@ -43,14 +47,15 @@ void dali_animated_image_visual_cleanup(void)
 
 namespace
 {
-const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/application-icon-%02d.png";
-const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif";
-}
-
+const char* TEST_IMAGE_FILE_NAME      = TEST_RESOURCE_DIR "/application-icon-%02d.png";
+const char* TEST_GIF_FILE_NAME        = TEST_RESOURCE_DIR "/anim.gif";
+const char* TEST_MASK_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/mask.png";
+const char* TEST_WEBP_FILE_NAME       = TEST_RESOURCE_DIR "/dali-logo.webp";
+} // namespace
 
-void CopyUrlsIntoArray( Property::Array& urls, int startIndex=0 )
+void CopyUrlsIntoArray(Property::Array& urls, int startIndex = 0)
 {
-  for( int i=20+startIndex;i<=30;++i)
+  for(int i = 20 + startIndex; i <= 30; ++i)
   {
     char* url;
     if(asprintf(&url, TEST_IMAGE_FILE_NAME, i) > 0)
@@ -65,230 +70,361 @@ void CopyUrlsIntoArray( Property::Array& urls, int startIndex=0 )
 int UtcDaliAnimatedImageVisualGetPropertyMap01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base animatedImageVisual = factory.CreateVisual(
+  VisualFactory factory             = VisualFactory::Get();
+  Visual::Base  animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-    .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-    .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-    .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-    .Add( DevelVisual::Property::CORNER_RADIUS, 22.2f )
-    .Add( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE )
-    .Add( DevelVisual::Property::BORDERLINE_WIDTH, 33.3f )
-    .Add( DevelVisual::Property::BORDERLINE_COLOR, Color::RED )
-    .Add( DevelVisual::Property::BORDERLINE_OFFSET, 0.3f ));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+      .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+      .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+      .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+      .Add(ImageVisual::Property::FITTING_MODE, FittingMode::FIT_WIDTH)
+      .Add(ImageVisual::Property::SAMPLING_MODE, SamplingMode::NEAREST)
+      .Add(ImageVisual::Property::DESIRED_WIDTH, 154)
+      .Add(ImageVisual::Property::DESIRED_HEIGHT, 79)
+      .Add(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME)
+      .Add(ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f)
+      .Add(ImageVisual::Property::CROP_TO_MASK, true)
+      .Add(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING)
+      .Add(DevelVisual::Property::CORNER_RADIUS, 22.2f)
+      .Add(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE)
+      .Add(DevelVisual::Property::BORDERLINE_WIDTH, 33.3f)
+      .Add(DevelVisual::Property::BORDERLINE_COLOR, Color::RED)
+      .Add(DevelVisual::Property::BORDERLINE_OFFSET, 0.3f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
+
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_GIF_FILE_NAME);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::WRAP_MODE_U, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == WrapMode::REPEAT);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::WRAP_MODE_V, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == WrapMode::DEFAULT);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::FITTING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == FittingMode::FIT_WIDTH);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::SAMPLING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == SamplingMode::NEAREST);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 154);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 79);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(22.2f, 22.2f, 22.2f, 22.2f), TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(22.2f, 22.2f, 22.2f, 22.2f), TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::ABSOLUTE);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::Transform::Policy::ABSOLUTE );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 33.3f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 33.3f, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Color::RED, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.3f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.3f, TEST_LOCATION );
+  // Check mask properties
+  value = resultMap.Find(ImageVisual::Property::ALPHA_MASK_URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_MASK_IMAGE_FILE_NAME);
+
+  value = resultMap.Find(ImageVisual::Property::MASK_CONTENT_SCALE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 1.6f, TEST_LOCATION);
+
+  value = resultMap.Find(ImageVisual::Property::CROP_TO_MASK, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+
+  value = resultMap.Find(DevelImageVisual::Property::MASKING_TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+
+  // Natural size getted as desired size
+  Vector2 naturalSize;
+  animatedImageVisual.GetNaturalSize(naturalSize);
+  DALI_TEST_EQUALS(naturalSize, Vector2(154, 79), TEST_LOCATION);
 
   // request AnimatedImageVisual with an URL
-  Visual::Base animatedImageVisual2 = factory.CreateVisual( TEST_GIF_FILE_NAME, ImageDimensions() );
+  Visual::Base animatedImageVisual2 = factory.CreateVisual(TEST_GIF_FILE_NAME, ImageDimensions());
   resultMap.Clear();
-  animatedImageVisual2.CreatePropertyMap( resultMap );
+  animatedImageVisual2.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_GIF_FILE_NAME);
+
+  // Natural size getted as image size
+  animatedImageVisual2.GetNaturalSize(naturalSize);
+  DALI_TEST_EQUALS(naturalSize, Vector2(50, 50), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualGetPropertyMap02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap for multi image with fixed cache" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap for multi image with fixed cache");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
+  VisualFactory   factory = VisualFactory::Get();
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   Visual::Base animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( "url", urls )
-    .Add( "batchSize", 4 )
-    .Add( "cacheSize", 20 )
-    .Add( "loopCount", 10 )
-    .Add( "frameDelay", 200 )
-    .Add( "pixelArea", Vector4() )
-    .Add( "wrapModeU", WrapMode::REPEAT )
-    .Add( "wrapModeV", WrapMode::DEFAULT )
-    .Add( "cornerRadius", Vector4(50.0f, 25.0f, 12.5f, 33.0f) )
-    .Add( "cornerRadiusPolicy", Visual::Transform::Policy::RELATIVE )
-    .Add( "borderlineWidth", 20.0f )
-    .Add( "borderlineColor", Vector4() )
-    .Add( "borderlineOffset", -1.0f));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add("url", urls)
+      .Add("batchSize", 4)
+      .Add("cacheSize", 20)
+      .Add("loopCount", 10)
+      .Add("frameDelay", 200)
+      .Add("pixelArea", Vector4())
+      .Add("wrapModeU", WrapMode::REPEAT)
+      .Add("wrapModeV", WrapMode::DEFAULT)
+      .Add("fittingMode", FittingMode::FIT_WIDTH)
+      .Add("samplingMode", SamplingMode::NEAREST)
+      .Add("desiredWidth", 154)
+      .Add("desiredHeight", 79)
+      .Add("alphaMaskUrl", TEST_MASK_IMAGE_FILE_NAME)
+      .Add("maskContentScale", 1.6f)
+      .Add("cropToMask", true)
+      .Add(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING)
+      .Add("cornerRadius", Vector4(50.0f, 25.0f, 12.5f, 33.0f))
+      .Add("cornerRadiusPolicy", Visual::Transform::Policy::RELATIVE)
+      .Add("borderlineWidth", 20.0f)
+      .Add("borderlineColor", Vector4())
+      .Add("borderlineOffset", -1.0f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, "url" );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(ImageVisual::Property::URL, "url");
+  DALI_TEST_CHECK(value);
   Property::Array* resultUrls = value->GetArray();
-  DALI_TEST_CHECK( resultUrls );
-  DALI_TEST_EQUALS( resultUrls->Count(), urls.Count(), TEST_LOCATION );
+  DALI_TEST_CHECK(resultUrls);
+  DALI_TEST_EQUALS(resultUrls->Count(), urls.Count(), TEST_LOCATION);
+
+  value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, "batchSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 4, TEST_LOCATION);
+
+  value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, "cacheSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 20, TEST_LOCATION);
+
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 10, TEST_LOCATION);
+
+  value = resultMap.Find(ImageVisual::Property::FRAME_DELAY, "frameDelay");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 200, TEST_LOCATION);
+
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 11, TEST_LOCATION);
+
+  value = resultMap.Find(Toolkit::ImageVisual::Property::WRAP_MODE_U, "wrapModeU");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == WrapMode::REPEAT);
 
-  value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 4, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::ImageVisual::Property::WRAP_MODE_V, "wrapModeV");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == WrapMode::DEFAULT);
 
-  value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 20, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::ImageVisual::Property::FITTING_MODE, "fittingMode");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == FittingMode::FIT_WIDTH);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 10, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::ImageVisual::Property::SAMPLING_MODE, "samplingMode");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == SamplingMode::NEAREST);
 
-  value = resultMap.Find( ImageVisual::Property::FRAME_DELAY, "frameDelay" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 200, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::ImageVisual::Property::DESIRED_WIDTH, "desiredWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 154);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 11, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, "desiredHeight");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 79);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(50.0f, 25.0f, 12.5f, 33.0f), TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(50.0f, 25.0f, 12.5f, 33.0f), TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::Transform::Policy::RELATIVE );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::RELATIVE);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 20.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 20.0f, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), -1.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), -1.0f, TEST_LOCATION);
+
+  // Check mask properties
+  value = resultMap.Find(ImageVisual::Property::ALPHA_MASK_URL, "alphaMaskUrl");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_MASK_IMAGE_FILE_NAME);
+
+  value = resultMap.Find(ImageVisual::Property::MASK_CONTENT_SCALE, "maskContentScale");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 1.6f, TEST_LOCATION);
+
+  value = resultMap.Find(ImageVisual::Property::CROP_TO_MASK, "cropToMask");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+
+  value = resultMap.Find(DevelImageVisual::Property::MASKING_TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualGetPropertyMap03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap for multi image rolling cache" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap for multi image rolling cache");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
+  VisualFactory   factory = VisualFactory::Get();
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   Visual::Base animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( "url", urls )
-    .Add( "batchSize", 4 )
-    .Add( "cacheSize", 8 )
-    .Add( "loopCount", 10 )
-    .Add( "frameDelay", 200 )
-    .Add( "pixelArea", Vector4() )
-    .Add( "wrapModeU", WrapMode::REPEAT )
-    .Add( "wrapModeV", WrapMode::DEFAULT )
-    .Add( "cornerRadius", 50.5f ));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add("url", urls)
+      .Add("batchSize", 4)
+      .Add("cacheSize", 8)
+      .Add("loopCount", 10)
+      .Add("frameDelay", 200)
+      .Add("pixelArea", Vector4())
+      .Add("wrapModeU", WrapMode::REPEAT)
+      .Add("wrapModeV", WrapMode::DEFAULT)
+      .Add("alphaMaskUrl", TEST_MASK_IMAGE_FILE_NAME)
+      .Add("maskContentScale", 1.6f)
+      .Add("cropToMask", true)
+      .Add(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING)
+      .Add("cornerRadius", 50.5f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, "url" );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(ImageVisual::Property::URL, "url");
+  DALI_TEST_CHECK(value);
   Property::Array* resultUrls = value->GetArray();
-  DALI_TEST_CHECK( resultUrls );
-  DALI_TEST_EQUALS( resultUrls->Count(), urls.Count(), TEST_LOCATION );
+  DALI_TEST_CHECK(resultUrls);
+  DALI_TEST_EQUALS(resultUrls->Count(), urls.Count(), TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 4, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, "batchSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 4, TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 8, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, "cacheSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 8, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 10, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 10, TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::FRAME_DELAY, "frameDelay" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 200, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::FRAME_DELAY, "frameDelay");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 200, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 11, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 11, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(50.5f, 50.5f, 50.5f, 50.5f), TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(50.5f, 50.5f, 50.5f, 50.5f), TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::Transform::Policy::ABSOLUTE );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::ABSOLUTE);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Color::BLACK, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::BLACK, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
+
+  // Check mask properties
+  value = resultMap.Find(ImageVisual::Property::ALPHA_MASK_URL, "alphaMaskUrl");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_MASK_IMAGE_FILE_NAME);
+
+  value = resultMap.Find(ImageVisual::Property::MASK_CONTENT_SCALE, "maskContentScale");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 1.6f, TEST_LOCATION);
+
+  value = resultMap.Find(ImageVisual::Property::CROP_TO_MASK, "cropToMask");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+
+  value = resultMap.Find(DevelImageVisual::Property::MASKING_TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+
+  // Natural size getted as masked image size
+  Vector2 naturalSize;
+  animatedImageVisual.GetNaturalSize(naturalSize);
+  DALI_TEST_EQUALS(naturalSize, Vector2(100, 100), TEST_LOCATION);
 
   END_TEST;
 }
@@ -296,54 +432,68 @@ int UtcDaliAnimatedImageVisualGetPropertyMap03(void)
 int UtcDaliAnimatedImageVisualGetPropertyMap04(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base animatedImageVisual = factory.CreateVisual(
+  VisualFactory factory             = VisualFactory::Get();
+  Visual::Base  animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-    .Add( ImageVisual::Property::BATCH_SIZE, 1 )
-    .Add( ImageVisual::Property::CACHE_SIZE, 1 )
-    .Add( ImageVisual::Property::SYNCHRONOUS_LOADING, false )
-    .Add( DevelVisual::Property::BORDERLINE_WIDTH, 0.4f ));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+      .Add(ImageVisual::Property::BATCH_SIZE, 1)
+      .Add(ImageVisual::Property::CACHE_SIZE, 1)
+      .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, true)
+      .Add(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED)
+      .Add(ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED)
+      .Add(DevelVisual::Property::BORDERLINE_WIDTH, 0.4f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
+
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_GIF_FILE_NAME);
+
+  value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 2);
+
+  value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 2);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::SYNCHRONOUS_LOADING, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == true);
 
-  value = resultMap.Find( ImageVisual::Property::BATCH_SIZE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == 2 );
+  value = resultMap.Find(ImageVisual::Property::RELEASE_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == ImageVisual::ReleasePolicy::DETACHED);
 
-  value = resultMap.Find( ImageVisual::Property::CACHE_SIZE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == 2 );
+  value = resultMap.Find(ImageVisual::Property::LOAD_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == ImageVisual::LoadPolicy::ATTACHED);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 4, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 4, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.4f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.4f, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(0.0f, 0.0f, 0.0f, 1.0f), TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(0.0f, 0.0f, 0.0f, 1.0f), TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -351,28 +501,28 @@ int UtcDaliAnimatedImageVisualGetPropertyMap04(void)
 int UtcDaliAnimatedImageVisualImageLoadingFail01(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::ANIMATED_IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, "dummy.gif" );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20 );
-    propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS, 0.23f );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE );
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, "dummy.gif");
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 0.23f);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -380,14 +530,14 @@ int UtcDaliAnimatedImageVisualImageLoadingFail01(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 1, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 1, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
@@ -398,28 +548,28 @@ int UtcDaliAnimatedImageVisualImageLoadingFail01(void)
 int UtcDaliAnimatedImageVisualSynchronousLoading(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::ANIMATED_IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, TEST_GIF_FILE_NAME );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20 );
-    propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS, 0.23f );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE );
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 0.23f);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -427,70 +577,185 @@ int UtcDaliAnimatedImageVisualSynchronousLoading(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    // The first frame is loaded synchronously and load next batch.
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 3 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 3);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
+int UtcDaliAnimatedImageVisualSynchronousLoadingWithAlphaMask01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualSynchronousLoadingWithAlphaMask01 for CPU Alpha Masking");
+  TestGlAbstraction& gl = application.GetGlAbstraction();
 
-int UtcDaliAnimatedImageVisualJumpToAction(void)
+  {
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 0.23f);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE);
+
+    VisualFactory factory = VisualFactory::Get();
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
+
+    Property::Map testMap;
+    visual.CreatePropertyMap(testMap);
+    DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
+
+    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
+    application.SendNotification();
+    application.Render(20);
+
+    // The first frame is loaded synchronously and load next batch with masking
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
+
+    dummyControl.Unparent();
+  }
+  tet_infoline("Test that removing the visual from stage deletes all textures");
+  application.SendNotification();
+  application.Render(16);
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedImageVisualSynchronousLoadingWithAlphaMask02(void)
 {
   ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualSynchronousLoadingWithAlphaMask02 for GPU Alpha Masking");
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
+  {
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+    propertyMap.Insert(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 0.23f);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE);
+
+    VisualFactory factory = VisualFactory::Get();
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
+
+    Property::Map testMap;
+    visual.CreatePropertyMap(testMap);
+    DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
+
+    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
+    application.SendNotification();
+    application.Render(20);
+
+    // The first frame is loaded synchronously and load next batch with masking
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
+
+    dummyControl.Unparent();
+  }
+  tet_infoline("Test that removing the visual from stage deletes all textures");
+  application.SendNotification();
+  application.Render(16);
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedImageVisualJumpToAction(void)
+{
+  ToolkitTestApplication application;
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
+
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 12);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 12);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(20);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -498,69 +763,68 @@ int UtcDaliAnimatedImageVisualJumpToAction(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map() );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map());
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 20 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 6 ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(6), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualStopBehavior(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME);
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 8);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 8);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(20);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -568,62 +832,61 @@ int UtcDaliAnimatedImageVisualStopBehavior(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map() );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map());
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 1 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 1);
 
     // Expect the second batch has been requested
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualStopBehavior02(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -631,75 +894,76 @@ int UtcDaliAnimatedImageVisualStopBehavior02(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 2, TEST_LOCATION);
 
     Test::EmitGlobalTimerSignal();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map() );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map());
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualAnimatedImage01(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
+  tet_infoline("Set cache size same as GIF frame, and try to load same image at another ImageView");
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, TEST_GIF_FILE_NAME );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
+    // Batch 2 frames. Now frame 0, 1 cached.
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 2, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
+    tet_infoline("Test that a timer has been started");
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -709,60 +973,244 @@ int UtcDaliAnimatedImageVisualAnimatedImage01(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
+    // 0 frame removed. and after, batch 2 frames. Now frame 1, 2, 3 cached.
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
+
+    Visual::Base        visual2       = factory.CreateVisual(propertyMap);
+    DummyControl        dummyControl2 = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl2    = static_cast<Impl::DummyControl&>(dummyControl2.GetImplementation());
+    dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual2);
+    application.GetScene().Add(dummyControl2);
+
+    tet_infoline("Add new view with same url");
+
+    application.SendNotification();
+    application.Render();
+
+    // Note that we only re-load 0 frame.
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    tet_infoline("Test that we don't try to re-load new image cause it cached");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 1), false, TEST_LOCATION);
+
+    // Batch 2 frames. Now visual frame 1, 2, 3 cached and visual2 frame 0, 1 cached.
+    application.SendNotification();
+    application.Render(20);
+
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 5, TEST_LOCATION);
+
+    textureTrace.Reset();
+
+    tet_infoline("Load some many frames");
+
+    const int repeatCount = 10;
+    for(int repeat = 0; repeat < repeatCount; ++repeat)
+    {
+      Test::EmitGlobalTimerSignal();
+      application.SendNotification();
+      application.Render(2000);
+    }
+
+    DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); // A new texture should NOT be generated.
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 5, TEST_LOCATION);
+
+    textureTrace.Reset();
 
     dummyControl.Unparent();
+    dummyControl2.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(20);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
+int UtcDaliAnimatedImageVisualAnimatedImageWithAlphaMask01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualAnimatedImageWithAlphaMask01 for CPU Alpha Masking");
+  TestGlAbstraction& gl = application.GetGlAbstraction();
 
-int UtcDaliAnimatedImageVisualMultiImage01(void)
+  {
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+
+    VisualFactory factory = VisualFactory::Get();
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
+
+    application.SendNotification();
+    application.Render();
+
+    // load two frame(batch size), load mask image, and request two masking
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(5), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render(20);
+
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 2, TEST_LOCATION);
+
+    dummyControl.Unparent();
+  }
+  tet_infoline("Test that removing the visual from stage deletes all textures");
+  application.SendNotification();
+  application.Render(20);
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedImageVisualAnimatedImageWithAlphaMask02(void)
 {
   ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualAnimatedImageWithAlphaMask02 for GPU Alpha Masking");
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
+  {
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+    propertyMap.Insert(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+
+    VisualFactory factory = VisualFactory::Get();
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
+
+    Property::Map attributes;
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, attributes);
+
+    application.SendNotification();
+    application.Render();
+
+    // load two frame(batch size), load mask image, and request two masking
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render(20);
+
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
+
+    dummyControl.Unparent();
+  }
+  tet_infoline("Test that removing the visual from stage deletes all textures");
+  application.SendNotification();
+  application.Render(20);
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedImageVisualAnimatedImageWithAlphaMask03(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualAnimatedImageWithAlphaMask03 for GPU Alpha Masking with broken mask texture");
+  TestGlAbstraction& gl = application.GetGlAbstraction();
+
+  {
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, "");
+    propertyMap.Insert(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+
+    VisualFactory factory = VisualFactory::Get();
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
+
+    application.SendNotification();
+    application.Render();
+
+    // load two frame(batch size), load mask image, and request two masking
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render(20);
+
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 3, TEST_LOCATION);
+
+    dummyControl.Unparent();
+  }
+  tet_infoline("Test that removing the visual from stage deletes all textures");
+  application.SendNotification();
+  application.Render(20);
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedImageVisualMultiImage01(void)
+{
+  ToolkitTestApplication application;
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
+
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 8);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 8);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -770,51 +1218,49 @@ int UtcDaliAnimatedImageVisualMultiImage01(void)
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    tet_infoline( "Test that after 1 tick, and file loads completed, that we have 7 textures" );
+    tet_infoline("Test that after 1 tick, and file loads completed, that we have 7 textures");
     Test::EmitGlobalTimerSignal();
 
     // Expect the second batch has been requested
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
-
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
-    tet_infoline( "Test that after 2 ticks that we have 6 textures" );
+    tet_infoline("Test that after 2 ticks that we have 6 textures");
 
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 6, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 6, TEST_LOCATION);
 
     tet_infoline("And that at least 2 textures were requested");
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 8, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 8, TEST_LOCATION);
 
-
-    tet_infoline( "Test that after 3rd tick that we have 7 textures and 1 request" );
+    tet_infoline("Test that after 3rd tick that we have 7 textures and 1 request");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 8, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 8, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -822,144 +1268,149 @@ int UtcDaliAnimatedImageVisualMultiImage01(void)
 int UtcDaliAnimatedImageVisualMultiImage02(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
-  tet_infoline( "Test that the animated visual has different batch and cache size." );
+  tet_infoline("Test that the animated visual has different batch and cache size.");
 
   {
     Property::Array urls;
-    CopyUrlsIntoArray( urls );
+    CopyUrlsIntoArray(urls);
 
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 0);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 0);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 0);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 0);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0
+    Visual::Base  visual  = factory.CreateVisual(propertyMap); // TexMgr::Request load tId:0
 
     // Check the batch size and cache size need to have minimum 2.
     Property::Map resultMap;
-    visual.CreatePropertyMap( resultMap );
-    Property::Value* value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" );
-    DALI_TEST_CHECK( value );
-    DALI_TEST_EQUALS( value->Get<int>(), 2, TEST_LOCATION );
-    value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" );
-    DALI_TEST_CHECK( value );
-    DALI_TEST_EQUALS( value->Get<int>(), 2, TEST_LOCATION );
+    visual.CreatePropertyMap(resultMap);
+    Property::Value* value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, "batchSize");
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
+    value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, "cacheSize");
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
     visual.Reset();
 
     // Batch size is 2 and cache size is 3
     propertyMap.Clear();
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 3);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 3);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
-    visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0
+    visual = factory.CreateVisual(propertyMap); // TexMgr::Request load tId:0
 
     // Expect that each image is loaded each tick
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl1 = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl1   = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
     visual.Reset();
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the visual after the visual is on window" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on window");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 1 and 2
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    application.Render(16); //glGenTextures 1 and 2
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:0
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 3
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    application.Render(16); //glGenTextures 3
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:1
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 4
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    application.Render(16); //glGenTextures 4
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    dummyImpl1.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    dummyImpl1.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
     dummyControl.Unparent();
 
+    // Ensure to remove cached texture. (Since we support lazy cache removal)
+    application.SendNotification();
+    application.Render(16);
+    application.SendNotification();
+    application.Render(16);
 
     // Batch size is 9 and cache size is 4
     propertyMap.Clear();
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 3);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 7);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 3);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 7);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
-    visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0
+    visual = factory.CreateVisual(propertyMap); // TexMgr::Request load tId:0
 
     // Expect that each image is loaded each tick
-    dummyControl = DummyControl::New(true);
+    dummyControl                   = DummyControl::New(true);
     Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
     visual.Reset();
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the visual after the visual is on window" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on window");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 1, 2, and 3
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    application.Render(16); //glGenTextures 1, 2, and 3
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:0
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 4, 5, and 6
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 5, TEST_LOCATION );
+    application.Render(16); //glGenTextures 4, 5, and 6
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 5, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:1
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 7, 1, and 2
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
+    application.Render(16); //glGenTextures 7, 1, and 2
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:2
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 3
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
+    application.Render(16); //glGenTextures 3
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from window deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -967,70 +1418,70 @@ int UtcDaliAnimatedImageVisualMultiImage02(void)
 int UtcDaliAnimatedImageVisualMultiImage03(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   {
     Property::Array urls1, urls2;
-    CopyUrlsIntoArray( urls1 );
-    CopyUrlsIntoArray( urls2 );
+    CopyUrlsIntoArray(urls1);
+    CopyUrlsIntoArray(urls2);
 
     Property::Map animatedImageMap1;
-    animatedImageMap1.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    animatedImageMap1.Insert( ImageVisual::Property::URL, Property::Value(urls1) );
-    animatedImageMap1.Insert( ImageVisual::Property::BATCH_SIZE, 3);
-    animatedImageMap1.Insert( ImageVisual::Property::CACHE_SIZE, 3);
-    animatedImageMap1.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    animatedImageMap1.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    animatedImageMap1.Insert(ImageVisual::Property::URL, Property::Value(urls1));
+    animatedImageMap1.Insert(ImageVisual::Property::BATCH_SIZE, 3);
+    animatedImageMap1.Insert(ImageVisual::Property::CACHE_SIZE, 3);
+    animatedImageMap1.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     Property::Map animatedImageMap2;
-    animatedImageMap2.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    animatedImageMap2.Insert( ImageVisual::Property::URL, Property::Value(urls2) );
-    animatedImageMap2.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    animatedImageMap2.Insert( ImageVisual::Property::CACHE_SIZE, 2);
-    animatedImageMap2.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    animatedImageMap2.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    animatedImageMap2.Insert(ImageVisual::Property::URL, Property::Value(urls2));
+    animatedImageMap2.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    animatedImageMap2.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    animatedImageMap2.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
-    VisualFactory factory = VisualFactory::Get();
-    Visual::Base animatedImageVisual1 = factory.CreateVisual( animatedImageMap1 );
+    VisualFactory factory              = VisualFactory::Get();
+    Visual::Base  animatedImageVisual1 = factory.CreateVisual(animatedImageMap1);
 
-    tet_infoline( "Create two image views with the same URLs, offset by 1 frame.");
+    tet_infoline("Create two image views with the same URLs, offset by 1 frame.");
 
-    DummyControl dummyControl1 = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl1 = static_cast<Impl::DummyControl&>(dummyControl1.GetImplementation());
-    dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual1 );
-    dummyControl1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl1 );
+    DummyControl        dummyControl1 = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl1    = static_cast<Impl::DummyControl&>(dummyControl1.GetImplementation());
+    dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual1);
+    dummyControl1.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl1);
 
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the requested image after the first visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    tet_infoline("Ready the requested image after the first visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    Visual::Base animatedImageVisual2 = factory.CreateVisual( animatedImageMap2 );
-    DummyControl dummyControl2 = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(dummyControl2.GetImplementation());
-    dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual2 );
-    dummyControl2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl2 );
+    Visual::Base        animatedImageVisual2 = factory.CreateVisual(animatedImageMap2);
+    DummyControl        dummyControl2        = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl2           = static_cast<Impl::DummyControl&>(dummyControl2.GetImplementation());
+    dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual2);
+    dummyControl2.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl2);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "The texture cache should be holding the requested images; check that the renderer has a texture" );
+    tet_infoline("The texture cache should be holding the requested images; check that the renderer has a texture");
     TextureSet ts = dummyControl2.GetRendererAt(0).GetTextures();
-    Texture t1 = ts.GetTexture( 0 );
-    DALI_TEST_EQUALS( ts.GetTextureCount(), 1, TEST_LOCATION );
+    Texture    t1 = ts.GetTexture(0);
+    DALI_TEST_EQUALS(ts.GetTextureCount(), 1, TEST_LOCATION);
 
-    tet_infoline( "Test that on the first tick, 1 new image is requested" );
+    tet_infoline("Test that on the first tick, 1 new image is requested");
     Test::EmitGlobalTimerSignal(); // Both visuals should tick
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    ts = dummyControl2.GetRendererAt(0).GetTextures();
-    Texture t2 = ts.GetTexture( 0 );
-    DALI_TEST_CHECK( t1 != t2 );
+    ts         = dummyControl2.GetRendererAt(0).GetTextures();
+    Texture t2 = ts.GetTexture(0);
+    DALI_TEST_CHECK(t1 != t2);
 
     dummyControl1.Unparent();
     dummyControl2.Unparent();
@@ -1038,87 +1489,86 @@ int UtcDaliAnimatedImageVisualMultiImage03(void)
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualMultiImage04(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction&     gl           = application.GetGlAbstraction();
+  TraceCallStack&        textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  tet_infoline( "Test that if the cache size is the same as the number of urls, that once the cache is full, no new images are loaded" );
+  tet_infoline("Test that if the cache size is the same as the number of urls, that once the cache is full, no new images are loaded");
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 6);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 11);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 6);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 11);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    tet_infoline( "Expect that a batch of 7 textures has been requested." );
+    tet_infoline("Expect that a batch of 7 textures has been requested.");
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Wait for the first batch to complete" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 6 ), true, TEST_LOCATION );
+    tet_infoline("Wait for the first batch to complete");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(6), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 6, TEST_LOCATION );
-    tet_infoline( "Test that after 1 tick, and 5 file loads completed, that we have 11 textures" );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 6, TEST_LOCATION);
+    tet_infoline("Test that after 1 tick, and 5 file loads completed, that we have 11 textures");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
     // Expect the second batch has been requested
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 5 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(5), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 11, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 11, TEST_LOCATION);
 
-    tet_infoline( "Test that after 2 ticks that we have 11 textures and no requests" );
+    tet_infoline("Test that after 2 ticks that we have 11 textures and no requests");
 
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, 5 ), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 5), false, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 11, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 11, TEST_LOCATION);
 
-    tet_infoline( "Test that after 3rd tick that we have 11 textures and no requests" );
+    tet_infoline("Test that after 3rd tick that we have 11 textures and no requests");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, 5 ), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 5), false, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 11, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 11, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
@@ -1126,54 +1576,53 @@ int UtcDaliAnimatedImageVisualMultiImage04(void)
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualMultiImage05(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
-  tet_infoline( "Test that if the cache size is the same as the number of urls, that removing a partially loaded visual removes all textures" );
+  tet_infoline("Test that if the cache size is the same as the number of urls, that removing a partially loaded visual removes all textures");
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 11);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 11);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    tet_infoline( "Expect that a batch of 4 textures has been requested." );
+    tet_infoline("Expect that a batch of 4 textures has been requested.");
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Wait for the first batch to complete" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Wait for the first batch to complete");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Test that a timer has been started" );
+    tet_infoline("Test that a timer has been started");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
@@ -1183,64 +1632,64 @@ int UtcDaliAnimatedImageVisualMultiImage05(void)
 
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
-  tet_infoline( "Test that pending batch of image loads are cancelled instead of uploaded");
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+  tet_infoline("Test that pending batch of image loads are cancelled instead of uploaded");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-void TestLoopCount( ToolkitTestApplication &application, DummyControl &dummyControl, uint16_t frameCount, uint16_t loopCount, const char * location )
+void TestLoopCount(ToolkitTestApplication& application, DummyControl& dummyControl, uint16_t frameCount, uint16_t loopCount, const char* location)
 {
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
 
   textureTrace.Enable(true);
-  application.GetScene().Add( dummyControl );
+  application.GetScene().Add(dummyControl);
 
   application.SendNotification();
   application.Render(16);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_INNER_LOCATION( location ) );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_INNER_LOCATION(location));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Test that a timer has been created" );
-  DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_INNER_LOCATION( location ) );
+  tet_infoline("Test that a timer has been created");
+  DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_INNER_LOCATION(location));
 
-  for ( uint16_t i = 0; i < loopCount; i++ )
+  for(uint16_t i = 0; i < loopCount; i++)
   {
-    for ( uint16_t j = 0; j < frameCount; j++ )
+    for(uint16_t j = 0; j < frameCount; j++)
     {
-      if( i == 0 && j == 0 )
+      if(i == 0 && j == 0)
       {
         continue; // Because first frame is already showed and we call 2nd frame at the first time of timer animation.
       }
-      tet_printf( "Test that after %u ticks, and we have %u frame \n", j + 1u, j + 1u );
+      tet_printf("Test that after %u ticks, and we have %u frame \n", j + 1u, j + 1u);
       Test::EmitGlobalTimerSignal();
       application.SendNotification();
       application.Render(16);
 
-      DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_INNER_LOCATION( location ) );
+      DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_INNER_LOCATION(location));
 
       application.SendNotification();
       application.Render();
-      DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_INNER_LOCATION( location ) );
-      DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_INNER_LOCATION( location ) );
+      DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_INNER_LOCATION(location));
+      DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_INNER_LOCATION(location));
     }
-    tet_printf( "Test Loop %u \n\n", i + 1u );
+    tet_printf("Test Loop %u \n\n", i + 1u);
   }
 
-  tet_printf( "Test that after %u loops, and we have no frame. Timer should stop \n", loopCount );
+  tet_printf("Test that after %u loops, and we have no frame. Timer should stop \n", loopCount);
   Test::EmitGlobalTimerSignal();
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( Test::AreTimersRunning(), false, TEST_INNER_LOCATION( location ) );
+  DALI_TEST_EQUALS(Test::AreTimersRunning(), false, TEST_INNER_LOCATION(location));
 
   dummyControl.Unparent();
 }
@@ -1249,29 +1698,29 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliAnimatedImageVisualLoopCount" );
+  tet_infoline("UtcDaliAnimatedImageVisualLoopCount");
 
   {
     // request AnimatedImageVisual with a property map
     // Test with no (0) loop count
-    VisualFactory factory = VisualFactory::Get();
-    Visual::Base animatedImageVisual = factory.CreateVisual(
+    VisualFactory factory             = VisualFactory::Get();
+    Visual::Base  animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, 0 ));
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, 0));
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
-    TestLoopCount( application, dummyControl, 4, 0, TEST_LOCATION );
+    TestLoopCount(application, dummyControl, 4, 0, TEST_LOCATION);
 
-    dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
     animatedImageVisual.Reset();
 
     application.SendNotification();
@@ -1280,18 +1729,18 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
     // Test with no (1) loop count. Request AnimatedImageVisual with a property map
     animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, 1 ));
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, 1));
 
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
 
-    TestLoopCount( application, dummyControl, 4, 1, TEST_LOCATION );
+    TestLoopCount(application, dummyControl, 4, 1, TEST_LOCATION);
 
-    dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
     animatedImageVisual.Reset();
 
     application.SendNotification();
@@ -1300,16 +1749,16 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
     // Test with no (100) loop count. Request AnimatedImageVisual with a property map
     animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, 100 ));
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, 100));
 
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
 
-    TestLoopCount( application, dummyControl, 4, 100, TEST_LOCATION );
+    TestLoopCount(application, dummyControl, 4, 100, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -1317,93 +1766,388 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
 int UtcDaliAnimatedImageVisualPlayback(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction&     gl           = application.GetGlAbstraction();
+  TraceCallStack&        textureTrace = gl.GetTextureTrace();
 
-  tet_infoline( "UtcDaliAnimatedImageVisualPlayback" );
+  tet_infoline("UtcDaliAnimatedImageVisualPlayback");
 
   {
     // request AnimatedImageVisual with a property map
     // Test with forever (-1) loop count
-    VisualFactory factory = VisualFactory::Get();
-    Visual::Base animatedImageVisual = factory.CreateVisual(
+    VisualFactory factory             = VisualFactory::Get();
+    Visual::Base  animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, -1 ));
-
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, -1));
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
     textureTrace.Enable(true);
-    application.GetScene().Add( dummyControl );
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    tet_infoline( "Test that a timer has been created" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been created");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_LOCATION);
 
     Property::Map attributes;
-    tet_infoline( "Test Pause action. Timer should stop after Pause action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PAUSE, attributes );
+    tet_infoline("Test Pause action. Timer should stop after Pause action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PAUSE, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), false, TEST_LOCATION);
 
-    tet_infoline( "Test Play action. Timer should Restart after Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action. Timer should Restart after Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_LOCATION);
 
-    tet_infoline( "Test Stop action. Timer should stop after Stop action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, attributes );
+    tet_infoline("Test Stop action. Timer should stop after Stop action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), false, TEST_LOCATION);
 
-    tet_infoline( "Test Play action. Timer should Restart after Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action. Timer should Restart after Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
 
   END_TEST;
 }
+
+int UtcDaliAnimatedImageVisualWrapMode(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualWrapMode");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  // Test wrap mode in animated image visual.
+  const int     width  = 950;
+  const int     height = 1080;
+  const Vector4 pixelArea(0.0f, 0.0f, 950 / 40, 1.0f);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_WEBP_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::PIXEL_AREA, pixelArea);
+  propertyMap.Insert(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  textureTrace.EnableLogging(true);
+  TraceCallStack& texParameterTrace = gl.GetTexParameterTrace();
+  texParameterTrace.Enable(true);
+  texParameterTrace.EnableLogging(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(width, height));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  application.GetScene().Add(actor);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  // WITHOUT atlasing, the wrapping is handled by setting gl texture parameters
+  std::stringstream out;
+  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_REPEAT;
+  DALI_TEST_CHECK(texParameterTrace.FindMethodAndParams("TexParameteri", out.str()));
+
+  // test the uniforms which used to handle the wrap mode
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea"));
+  DALI_TEST_EQUALS(pixelAreaValue.Get<Vector4>(), pixelArea, TEST_LOCATION);
+
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedImageVisualDesiredSize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualDesiredSize");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+
+  // Set desiredWidth < 37 and desiredHeight < 50, which is smaller than original image's size.
+  int desiredWidth  = 15;
+  int desiredHeight = 20;
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(TEST_GIF_FILE_NAME, ImageDimensions(desiredWidth, desiredHeight));
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - first frame and second frame.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  textureTrace.Enable(true);
+  textureTrace.EnableLogging(true);
+
+  application.SendNotification();
+  application.Render();
+
+  {
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str()));
+  }
+
+  // Unparent to make next trigger
+  actor.Unparent();
+
+  application.SendNotification();
+  application.Render();
+
+  // Set visual size
+  actor.SetProperty(Actor::Property::SIZE, Vector2(300.0f, 300.0f));
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - first frame and second frame.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  textureTrace.Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  {
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str())); // The size should not be changed
+  }
+
+  END_TEST;
+}
+
+
+int UtcDaliAnimatedImageVisualControlVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualControlVisibilityChanged");
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+    .Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check frame number
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  Test::EmitGlobalTimerSignal();
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  Property::Map resultMap;
+  visual.CreatePropertyMap(resultMap);
+
+  // check the property values from the returned map from a visual
+  Property::Value* value = resultMap.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_NOT_EQUALS(value->Get<int>(), 0, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  actor.SetProperty(Actor::Property::VISIBLE, false);
+
+  Test::EmitGlobalTimerSignal();
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  visual.CreatePropertyMap(resultMap);
+
+  // check the property values from the returned map from a visual
+  value = resultMap.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedImageVisualWindowVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedImageVisualWindowVisibilityChanged");
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+    .Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check frame number
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  Test::EmitGlobalTimerSignal();
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  Property::Map resultMap;
+  visual.CreatePropertyMap(resultMap);
+
+  // check the property values from the returned map from a visual
+  Property::Value* value = resultMap.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_NOT_EQUALS(value->Get<int>(), 0, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  Window window = DevelWindow::Get(actor);
+  window.Hide();
+
+  Test::EmitGlobalTimerSignal();
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  visual.CreatePropertyMap(resultMap);
+
+  // check the property values from the returned map from a visual
+  value = resultMap.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
index 7f43240..72a4966 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +14,31 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <chrono>
+#include <iostream>
 #include <thread>
+
 #include <dali-toolkit-test-suite-utils.h>
-#include <toolkit-timer.h>
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-timer.h>
 #include <toolkit-vector-animation-renderer.h>
+#include "dummy-control.h"
+#include "test-native-image-source.h"
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-signals-devel.h>
-#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+
+#include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>
-#include "dummy-control.h"
+#include <dali/devel-api/rendering/renderer-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -48,49 +55,51 @@ void dali_animated_vector_image_visual_cleanup(void)
 
 namespace
 {
-
-const char* TEST_VECTOR_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/insta_camera.json";
+const char* TEST_VECTOR_IMAGE_FILE_NAME            = TEST_RESOURCE_DIR "/insta_camera.json";
 const char* TEST_VECTOR_IMAGE_FILE_NAME_FRAME_DROP = "framedrop.json";
-const char* TEST_VECTOR_IMAGE_INVALID_FILE_NAME =  "invalid.json";
+const char* TEST_VECTOR_IMAGE_INVALID_FILE_NAME    = "invalid.json";
 
 bool gAnimationFinishedSignalFired = false;
 
-void VisualEventSignal( Control control, Dali::Property::Index visualIndex, Dali::Property::Index signalId )
+void VisualEventSignal(Control control, Dali::Property::Index visualIndex, Dali::Property::Index signalId)
 {
-  if( visualIndex == DummyControl::Property::TEST_VISUAL && signalId == DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED )
+  if(visualIndex == DummyControl::Property::TEST_VISUAL && signalId == DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED)
   {
     gAnimationFinishedSignalFired = true;
   }
 }
 
-}
+} // namespace
 
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual01: Request animated vector image visual with a json url" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual01: Request animated vector image visual with a json url");
 
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base  visual  = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   // Test SetOffScene().
   actor.Unparent();
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -98,31 +107,35 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual01(void)
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual02: Request animated vector image visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual02: Request animated vector image visual with a Property::Map");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -130,40 +143,44 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual02(void)
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual03: Request animated vector image visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual03: Request animated vector image visual with a Property::Map");
 
-  int startFrame = 1, endFrame = 3;
+  int             startFrame = 1, endFrame = 3;
   Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, playRange  )
-             .Add( DevelVisual::Property::CORNER_RADIUS, 50.0f )
-             .Add( DevelVisual::Property::BORDERLINE_WIDTH, 20.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, playRange)
+    .Add(DevelVisual::Property::CORNER_RADIUS, 50.0f)
+    .Add(DevelVisual::Property::BORDERLINE_WIDTH, 20.0f)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -171,106 +188,118 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual03(void)
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual04: Request animated vector image visual with a Property::Map" );
-
-  int startFrame = 1, endFrame = 3;
-  float cornerRadius = 22.0f;
-  float borderlineWidth = 2.0f;
-  Vector4 borderlineColor = Vector4(1.0f, 1.0f, 1.0f, 1.0f);
-  float borderlineOffset = 0.1f;
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual04: Request animated vector image visual with a Property::Map");
+
+  int             startFrame = 1, endFrame = 3;
+  int             desiredWidth = 100, desiredHeight = 150;
+  float           cornerRadius     = 22.0f;
+  float           borderlineWidth  = 2.0f;
+  Vector4         borderlineColor  = Vector4(1.0f, 1.0f, 1.0f, 1.0f);
+  float           borderlineOffset = 0.1f;
   Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( "visualType", DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( "url", TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( "loopCount", 3 )
-             .Add( "playRange", playRange )
-             .Add( "stopBehavior", DevelImageVisual::StopBehavior::FIRST_FRAME )
-             .Add( "loopingMode", DevelImageVisual::LoopingMode::AUTO_REVERSE )
-             .Add( "redrawInScalingDown", false )
-             .Add( "cornerRadius", cornerRadius )
-             .Add( "borderlineWidth", borderlineWidth )
-             .Add( "borderlineColor", borderlineColor )
-             .Add( "borderlineOffset", borderlineOffset );
+  propertyMap.Add("visualType", DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add("url", TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add("loopCount", 3)
+    .Add("playRange", playRange)
+    .Add("stopBehavior", DevelImageVisual::StopBehavior::FIRST_FRAME)
+    .Add("loopingMode", DevelImageVisual::LoopingMode::AUTO_REVERSE)
+    .Add("redrawInScalingDown", false)
+    .Add("cornerRadius", cornerRadius)
+    .Add("borderlineWidth", borderlineWidth)
+    .Add("borderlineColor", borderlineColor)
+    .Add("borderlineOffset", borderlineOffset)
+    .Add("desiredWidth", desiredWidth)
+    .Add("desiredHeight", desiredHeight)
+    .Add("useFixedCache", false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - render a frame
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   Property::Map resultMap;
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< std::string >() == TEST_VECTOR_IMAGE_FILE_NAME );
+  Property::Value* value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_VECTOR_IMAGE_FILE_NAME);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == 3 );
+  value = resultMap.Find(DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 3);
 
-  value = resultMap.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY);
+  DALI_TEST_CHECK(value);
 
   Property::Array* result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
+
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
+
+  value = resultMap.Find(DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::StopBehavior::FIRST_FRAME);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+  value = resultMap.Find(DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::LoopingMode::AUTO_REVERSE);
 
-  value = resultMap.Find( DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::StopBehavior::FIRST_FRAME );
+  value = resultMap.Find(DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == false);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::LoopingMode::AUTO_REVERSE );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius), TEST_LOCATION);
 
-  value = resultMap.Find( DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< bool >() == false );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::ABSOLUTE);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius), TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineWidth, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == Visual::Transform::Policy::ABSOLUTE );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), borderlineColor, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineWidth, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineOffset, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), borderlineColor, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), desiredWidth, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineOffset, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), desiredHeight, TEST_LOCATION);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -278,120 +307,140 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void)
 int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualGetPropertyMap01" );
-
-  int startFrame = 1, endFrame = 3;
-  Vector4 cornerRadius(50.0f, 22.0f, 0.0f, 3.0f);
-  float borderlineWidth = 2.3f;
-  Vector4 borderlineColor = Vector4(0.3f, 0.3f, 1.0f, 1.0f);
-  float borderlineOffset = 0.3f;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualGetPropertyMap01");
+
+  int             startFrame = 1, endFrame = 3;
+  int             desiredWidth = 100, desiredHeight = 150;
+  Vector4         cornerRadius(50.0f, 22.0f, 0.0f, 3.0f);
+  float           borderlineWidth  = 2.3f;
+  Vector4         borderlineColor  = Vector4(0.3f, 0.3f, 1.0f, 1.0f);
+  float           borderlineOffset = 0.3f;
   Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE,  DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3 )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, playRange )
-             .Add( DevelVisual::Property::CORNER_RADIUS, cornerRadius )
-             .Add( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::RELATIVE)
-             .Add( DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth )
-             .Add( DevelVisual::Property::BORDERLINE_COLOR, borderlineColor )
-             .Add( DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, playRange)
+    .Add(DevelVisual::Property::CORNER_RADIUS, cornerRadius)
+    .Add(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::RELATIVE)
+    .Add(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth)
+    .Add(DevelVisual::Property::BORDERLINE_COLOR, borderlineColor)
+    .Add(DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false)
+    .Add(ImageVisual::Property::DESIRED_WIDTH, desiredWidth)
+    .Add(ImageVisual::Property::DESIRED_HEIGHT, desiredHeight);
 
   // request AnimatedVectorImageVisual with a property map
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   Property::Map resultMap;
-  resultMap = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
+  resultMap = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelVisual::ANIMATED_VECTOR_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_VECTOR_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< std::string >() == TEST_VECTOR_IMAGE_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_VECTOR_IMAGE_FILE_NAME);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == 3 );
+  value = resultMap.Find(DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 3);
 
-  value = resultMap.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY);
+  DALI_TEST_CHECK(value);
 
   Property::Array* result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
+
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
+
+  value = resultMap.Find(DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::StopBehavior::CURRENT_FRAME);
+
+  value = resultMap.Find(DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::LoopingMode::RESTART);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+  value = resultMap.Find(DevelImageVisual::Property::CONTENT_INFO, Property::MAP);
+  DALI_TEST_CHECK(value);
 
-  value = resultMap.Find( DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::StopBehavior::CURRENT_FRAME );
+  value = resultMap.Find(DevelImageVisual::Property::MARKER_INFO, Property::MAP);
+  DALI_TEST_CHECK(value);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::LoopingMode::RESTART );
+  value = resultMap.Find(DevelImageVisual::Property::ENABLE_FRAME_CACHE, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == false); // Check default value
 
-  value = resultMap.Find( DevelImageVisual::Property::CONTENT_INFO, Property::MAP );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == true); // Check default value
 
-  value = resultMap.Find( DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< bool >() == true );    // Check default value
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), cornerRadius, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), cornerRadius, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::RELATIVE);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == Visual::Transform::Policy::RELATIVE );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineWidth, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineWidth, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), borderlineColor, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), borderlineColor, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineOffset, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineOffset, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), desiredWidth, TEST_LOCATION);
+
+  value = resultMap.Find(ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), desiredHeight, TEST_LOCATION);
 
   // request AnimatedVectorImageVisual with an URL
-  Visual::Base visual2 = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() );
+  Visual::Base visual2 = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions());
 
   resultMap.Clear();
-  visual2.CreatePropertyMap( resultMap );
+  visual2.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelVisual::ANIMATED_VECTOR_IMAGE );
+  value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_VECTOR_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< std::string >() == TEST_VECTOR_IMAGE_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_VECTOR_IMAGE_FILE_NAME);
 
   END_TEST;
 }
@@ -400,123 +449,124 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayback" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPlayback");
 
   {
     // request AnimatedVectorImageVisual with a property map
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual(
+    Visual::Base  visual  = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME ) );
+        .Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+        .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false));
 
-    DummyControl dummyControl = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummyControl.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
     Property::Map attributes;
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
-    application.GetScene().Add( dummyControl );
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
-    application.Render( 16 );
+    application.Render(16);
 
-    Property::Map map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    Property::Map    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
-    tet_infoline( "Test Pause action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes );
+    tet_infoline("Test Pause action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PAUSED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PAUSED);
 
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
-    tet_infoline( "Test Stop action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+    tet_infoline("Test Stop action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "Test Stop action again" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+    tet_infoline("Test Stop action again");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
-    tet_infoline( "Off stage" );
+    tet_infoline("Off stage");
     dummyControl.Unparent();
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "On stage again" );
-    application.GetScene().Add( dummyControl );
+    tet_infoline("On stage again");
+    application.GetScene().Add(dummyControl);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
     // Change Size
-    Vector3 newSize( 100.0f, 100.0f, 0.0f );
-    dummyControl.SetProperty( Actor::Property::SIZE, newSize );
+    Vector3 newSize(100.0f, 100.0f, 0.0f);
+    dummyControl.SetProperty(Actor::Property::SIZE, newSize);
 
     application.SendNotification();
     application.Render(16);
 
     // Size should be changed
     Vector3 naturalSize = dummyControl.GetNaturalSize();
-    DALI_TEST_CHECK( naturalSize == newSize );
+    DALI_TEST_CHECK(naturalSize == newSize);
 
     dummyControl.Unparent();
   }
@@ -527,48 +577,51 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void)
 int UtcDaliAnimatedVectorImageVisualCustomShader(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualCustomShader Test custom shader" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualCustomShader Test custom shader");
 
-  VisualFactory factory = VisualFactory::Get();
-  Property::Map properties;
-  Property::Map shader;
-  const std::string vertexShader = "Foobar";
-  const std::string fragmentShader = "Foobar sampler2D Foobar";
+  VisualFactory     factory = VisualFactory::Get();
+  Property::Map     properties;
+  Property::Map     shader;
+  const std::string vertexShader                    = "Foobar";
+  const std::string fragmentShader                  = "Foobar sampler2D Foobar";
   shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-  shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+  shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
-  properties[Visual::Property::TYPE] = Visual::IMAGE;
-  properties[Visual::Property::SHADER] = shader;
+  properties[Visual::Property::TYPE]     = Visual::IMAGE;
+  properties[Visual::Property::SHADER]   = shader;
   properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME;
 
-  Visual::Base visual = factory.CreateVisual( properties );
+  Visual::Base visual = factory.CreateVisual(properties);
 
   // trigger creation through setting on stage
-  DummyControl dummy = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl        dummy     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( dummy );
+  dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(dummy);
 
   application.SendNotification();
   application.Render();
 
-  Renderer renderer = dummy.GetRendererAt( 0 );
-  Shader shader2 = renderer.GetShader();
-  Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  Renderer        renderer = dummy.GetRendererAt(0);
+  Shader          shader2  = renderer.GetShader();
+  Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
 
-  std::string resultFragmentShader, resultVertexShader;
-  Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-  fragment->Get( resultFragmentShader );
-  DALI_TEST_CHECK( resultFragmentShader.find( fragmentShader ) != std::string::npos );
+  std::string      resultFragmentShader, resultVertexShader;
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  fragment->Get(resultFragmentShader);
+  DALI_TEST_CHECK(resultFragmentShader.find(fragmentShader) != std::string::npos);
 
-  Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-  vertex->Get( resultVertexShader );
-  DALI_TEST_CHECK( resultVertexShader.find( vertexShader ) != std::string::npos );
+  Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+  vertex->Get(resultVertexShader);
+  DALI_TEST_CHECK(resultVertexShader.find(vertexShader) != std::string::npos);
 
   END_TEST;
 }
@@ -576,36 +629,43 @@ int UtcDaliAnimatedVectorImageVisualCustomShader(void)
 int UtcDaliAnimatedVectorImageVisualNaturalSize(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualNaturalSize" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualNaturalSize");
 
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base  visual  = factory.CreateVisual(
+    Property::Map()
+      .Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+      .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+      .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false));
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
+  Vector2 controlSize(20.f, 30.f);
   Vector2 naturalSize;
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  visual.GetNaturalSize( naturalSize );
+  // Trigger count is 1 - load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  visual.GetNaturalSize(naturalSize);
 
-  DALI_TEST_EQUALS( naturalSize, Vector2( 100.0f, 100.0f ), TEST_LOCATION );    // 100x100 is the content default size.
+  DALI_TEST_EQUALS(naturalSize, Vector2(100.0f, 100.0f), TEST_LOCATION); // 100x100 is the content default size.
 
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
   application.SendNotification();
   application.Render();
 
-  visual.GetNaturalSize( naturalSize );
+  visual.GetNaturalSize(naturalSize);
 
-  DALI_TEST_EQUALS( naturalSize, controlSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize, controlSize, TEST_LOCATION);
 
   END_TEST;
 }
@@ -613,38 +673,39 @@ int UtcDaliAnimatedVectorImageVisualNaturalSize(void)
 int UtcDaliAnimatedVectorImageVisualLoopCount(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualLoopCount" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualLoopCount");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  // Trigger count is 1 - render a frame
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   END_TEST;
 }
@@ -652,119 +713,131 @@ int UtcDaliAnimatedVectorImageVisualLoopCount(void)
 int UtcDaliAnimatedVectorImageVisualPlayRange(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayRange" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPlayRange");
 
-  int startFrame = 1, endFrame = 3;
+  int             startFrame = 1, endFrame = 3;
   Property::Array array;
-  array.PushBack( endFrame );
-  array.PushBack( startFrame );
+  array.PushBack(endFrame);
+  array.PushBack(startFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, array  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, array)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  Property::Map    map              = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value            = map.Find(DevelImageVisual::Property::PLAY_RANGE);
+  int              totalFrameNumber = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER)->Get<int>();
 
-  int resultStartFrame, resultEndFrame;
+  int              resultStartFrame, resultEndFrame;
   Property::Array* result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( startFrame, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( endFrame, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(startFrame, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(endFrame, resultEndFrame, TEST_LOCATION);
 
   // Set invalid play range
   array.Clear();
-  array.PushBack( 1 );
-  array.PushBack( 100 );
+  array.PushBack(1);
+  array.PushBack(100);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( startFrame, resultStartFrame, TEST_LOCATION );  // Should not be changed
-  DALI_TEST_EQUALS( endFrame, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(resultStartFrame, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultEndFrame, totalFrameNumber - 1, TEST_LOCATION); // Should be clamped
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, Property::Map() );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, Property::Map());
 
   application.SendNotification();
   application.Render();
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
   array.Clear();
-  array.PushBack( 0 );
-  array.PushBack( 2 );
+  array.PushBack(0);
+  array.PushBack(2);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( 0, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( 2, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(0, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(2, resultEndFrame, TEST_LOCATION);
 
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );    // CURRENT_FRAME_NUMBER should be changed also.
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION); // CURRENT_FRAME_NUMBER should be changed also.
 
   END_TEST;
 }
@@ -772,844 +845,1705 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void)
 int UtcDaliAnimatedVectorImageVisualPlayRangeMarker(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayRangeMarker" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPlayRangeMarker");
 
+  // Set 1 marker as array
   Property::Array array;
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 );
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_1);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, array  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, array)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
-  int resultStartFrame, resultEndFrame;
+  int              resultStartFrame, resultEndFrame;
   Property::Array* result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_1, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_1, resultEndFrame, TEST_LOCATION);
+
+  // Set 1 marker as string
+  array.Clear();
+
+  attributes.Clear();
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, VECTOR_ANIMATION_MARKER_NAME_1);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(40.0f, 40.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
+
+  result = value->GetArray();
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
+
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_1, resultEndFrame, TEST_LOCATION);
 
   // Set 2 markers
   array.Clear();
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 );
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_2 );
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_1);
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_2);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION);
 
   // Set invalid play range
   array.Clear();
-  array.PushBack( 1 );
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 );
+  array.PushBack(1);
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_1);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION );  // Should not be changed
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION); // Should not be changed
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal(void)
+int UtcDaliAnimatedVectorImageVisualMarkerInfo(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualMarkerInfo");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DevelControl::VisualEventSignal( actor ).Connect( &VisualEventSignal );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  // Wait for animation finish
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  // renderer is added to actor
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::MARKER_INFO);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+  DALI_TEST_CHECK(value);
 
-  DALI_TEST_EQUALS( gAnimationFinishedSignalFired, true, TEST_LOCATION );
+  Property::Map* result = value->GetMap();
+  DALI_TEST_CHECK(result);
+
+  std::string resultMarkerName;
+  int         resultStartFrame, resultEndFrame;
+  DALI_TEST_EQUALS(2u, result->Count(), TEST_LOCATION);
+
+  for(uint32_t i = 0u; i < result->Count(); ++i)
+  {
+    if(result->GetKeyAt(i).stringKey == VECTOR_ANIMATION_MARKER_NAME_1)
+    {
+      Property::Array* frameArray = result->GetValue(i).GetArray();
+      DALI_TEST_CHECK(frameArray);
+      frameArray->GetElementAt(0).Get(resultStartFrame);
+      frameArray->GetElementAt(1).Get(resultEndFrame);
+
+      DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION);
+      DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_1, resultEndFrame, TEST_LOCATION);
+    }
+    else if(result->GetKeyAt(i).stringKey == VECTOR_ANIMATION_MARKER_NAME_2)
+    {
+      Property::Array* frameArray = result->GetValue(i).GetArray();
+      DALI_TEST_CHECK(frameArray);
+      frameArray->GetElementAt(0).Get(resultStartFrame);
+      frameArray->GetElementAt(1).Get(resultEndFrame);
+
+      DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_2, resultStartFrame, TEST_LOCATION);
+      DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION);
+    }
+    else
+    {
+      DALI_TEST_CHECK(false);
+    }
+  }
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualJumpTo(void)
+int UtcDaliAnimatedVectorImageVisualMarkerInfoFromInvalid(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualJumpTo" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualMarkerInfoFromInvalid");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  tet_printf( "1. Visual is created.\n" );
-
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
-
-  application.GetScene().Add( actor );
-
-  application.SendNotification();
-  application.Render();
-
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 2 );
-
-  application.SendNotification();
-  application.Render();
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, "invalid.json")
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  tet_printf( "2. The current frame number is [%d].\n", value->Get< int >() );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  Property::Array array;
-  array.PushBack( 0 );
-  array.PushBack( 2 );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
-
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  // Trigger count is 1 - load, and failed.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );
-
-  tet_printf( "3. The current frame number is [%d].\n", value->Get< int >() );
+  // renderer is added to actor
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  // Change play range
-  attributes.Clear();
-  array.Clear();
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::MARKER_INFO);
 
-  array.PushBack( 0 );
-  array.PushBack( 4 );
+  // The values when load failed case is invalid.
+  DALI_TEST_CHECK(value == nullptr || (value->GetMap() == nullptr) || (value->GetMap()->Empty()));
 
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  END_TEST;
+}
 
-  attributes.Clear();
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+int UtcDaliAnimatedVectorImageVisualUsedFixedCache(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualUsedFixedCache");
 
-  application.SendNotification();
-  application.Render();
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::ENABLE_FRAME_CACHE, true)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  // Stop and jump to 3
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  //actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
-
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
-
-  tet_printf( "4. The current frame number is [%d].\n", value->Get< int >() );
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  // Jump to the same position
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  Vector2 controlSize(200.f, 200.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  // Trigger count is 1 - load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
+  // renderer is added to actor
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  tet_printf( "5. The current frame number is [%d].\n", value->Get< int >() );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::ENABLE_FRAME_CACHE);
+  DALI_TEST_CHECK(value->Get<bool>() == true);
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualUpdateProperty(void)
+int UtcDaliAnimatedVectorImageVisualUsedFixedCacheFailed(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualUpdateProperty" );
-
-  int startFrame = 1, endFrame = 3;
-  Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualUsedFixedCacheFailed");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, playRange  );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_INVALID_FILE_NAME)
+    .Add(DevelImageVisual::Property::ENABLE_FRAME_CACHE, true)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  application.GetScene().Add( actor );
+  Vector2 controlSize(200.f, 200.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
+  application.GetScene().Add(actor);
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  // Trigger count is 1 - load, and failed.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::LOOP_COUNT );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
-
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
-  DALI_TEST_CHECK( value );
-
-  Property::Array* result = value->GetArray();
-  DALI_TEST_CHECK( result );
-
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
-
-  playRange.Clear();
-  playRange.PushBack( 0 );
-  playRange.PushBack( 2 );
-
-  Property::Map attributes;
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
-  attributes.Add( DevelImageVisual::Property::LOOP_COUNT, 5 );
+  // renderer is added to actor
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  propertyMap.Clear();
+  propertyMap.Add(DevelImageVisual::Property::ENABLE_FRAME_CACHE, true)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::DESIRED_WIDTH, 100)
+    .Add(ImageVisual::Property::DESIRED_HEIGHT, 100);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, propertyMap);
 
-  application.SendNotification();
-  application.Render();
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::ENABLE_FRAME_CACHE);
+  DALI_TEST_CHECK(value->Get<bool>() == true);
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  END_TEST;
+}
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::LOOP_COUNT );
-  DALI_TEST_EQUALS( value->Get< int >(), 5, TEST_LOCATION );
+int UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal");
 
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
-  result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == 0 );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == 2 );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  attributes.Clear();
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  playRange.Clear();
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  DevelControl::VisualEventSignal(actor).Connect(&VisualEventSignal);
 
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
-
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
-
-  result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+  propertyMap.Clear();
+  propertyMap.Add(DevelImageVisual::Property::LOOP_COUNT, 3);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, propertyMap);
 
-  // Play and update property
-  attributes.Clear();
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  attributes.Add( DevelImageVisual::Property::LOOP_COUNT, 10 );
-
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  // Wait for animation finish
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  application.SendNotification();
-  application.Render();
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::LOOP_COUNT );
-  DALI_TEST_EQUALS( value->Get< int >(), 10, TEST_LOCATION );
+  DALI_TEST_EQUALS(gAnimationFinishedSignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualStopBehavior(void)
+int UtcDaliAnimatedVectorImageVisualJumpTo(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualStopBehavior" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualJumpTo");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3 )
-             .Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  tet_printf("1. Visual is created.\n");
 
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 0, TEST_LOCATION );  // Should be the first frame
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 2);
 
-  // Change stop behavior
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME );
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
+
+  application.SendNotification();
+  application.Render();
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  attributes.Clear();
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
 
-  // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  tet_printf("2. The current frame number is [%d].\n", value->Get<int>());
+
+  Property::Array array;
+  array.PushBack(0);
+  array.PushBack(2);
+
+  Property::Map attributes;
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
 
   application.SendNotification();
   application.Render();
 
-  // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
 
-  Property::Value* value1 = map.Find( DevelImageVisual::Property::TOTAL_FRAME_NUMBER );
-  int totalFrameNumber = value1->Get< int >();
+  tet_printf("3. The current frame number is [%d].\n", value->Get<int>());
 
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), totalFrameNumber - 1, TEST_LOCATION );  // Should be the last frame
+  // Change play range
+  attributes.Clear();
+  array.Clear();
 
-  // Change stop behavior
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME );
-  attributes.Add( DevelImageVisual::Property::LOOP_COUNT, -1 );
+  array.PushBack(0);
+  array.PushBack(4);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   attributes.Clear();
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
-  // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  application.SendNotification();
+  application.Render();
+
+  // Wait for animation finish
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  // Jump to 3
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
-  // Pause
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  int currentFrameNumber = value->Get< int >();
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
-  // Stop
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+  tet_printf("4. The current frame number is [%d].\n", value->Get<int>());
+
+  // Jump to the same position
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), currentFrameNumber, TEST_LOCATION );  // Should be same with currentFrameNumber
+  tet_printf("5. The current frame number is [%d].\n", value->Get<int>());
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualLoopingMode(void)
+int UtcDaliAnimatedVectorImageVisualUpdateProperty(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualLoopingMode" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualUpdateProperty");
+
+  int             startFrame = 1, endFrame = 3;
+  Property::Array playRange;
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3 )
-             .Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME )
-             .Add( DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::AUTO_REVERSE );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, playRange)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::LOOP_COUNT);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY);
+  DALI_TEST_CHECK(value);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Property::Array* result = value->GetArray();
+  DALI_TEST_CHECK(result);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
 
-  application.GetScene().Add( actor );
+  playRange.Clear();
+  playRange.PushBack(0);
+  playRange.PushBack(2);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, playRange);
+  attributes.Add(DevelImageVisual::Property::LOOP_COUNT, 5);
+
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
-  // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 0, TEST_LOCATION );  // Should be the first frame because of auto reverse
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::LOOP_COUNT);
+  DALI_TEST_EQUALS(value->Get<int>(), 5, TEST_LOCATION);
 
-  // Change stop behavior
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME );
+  value  = map.Find(DevelImageVisual::Property::PLAY_RANGE);
+  result = value->GetArray();
+  DALI_TEST_CHECK(result);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == 0);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == 2);
 
-  // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  attributes.Clear();
+
+  playRange.Clear();
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
+
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, playRange);
+
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
 
   application.SendNotification();
   application.Render();
 
-  // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 0, TEST_LOCATION );  // Should be the first frame
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
-  // Change looping mode
-  attributes.Add( DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::RESTART );
+  result = value->GetArray();
+  DALI_TEST_CHECK(result);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
 
-  // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  // Play and update property
+  attributes.Clear();
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  attributes.Add(DevelImageVisual::Property::LOOP_COUNT, 10);
+
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
-  Property::Value* value1 = map.Find( DevelImageVisual::Property::TOTAL_FRAME_NUMBER );
-  int totalFrameNumber = value1->Get< int >();
+  application.SendNotification();
+  application.Render();
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), totalFrameNumber - 1, TEST_LOCATION );  // Should be the last frame
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::LOOP_COUNT);
+  DALI_TEST_EQUALS(value->Get<int>(), 10, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualPropertyNotification(void)
+int UtcDaliAnimatedVectorImageVisualStopBehavior(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPropertyNotification" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualStopBehavior");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  Vector3 controlScale( 2.0f, 2.0f, 1.0f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
-  actor.SetProperty( Actor::Property::SCALE, controlScale );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  application.GetScene().Add( actor );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.SendNotification();
-  application.Render();
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
-
-  auto textureSet = renderer.GetTextures();
-  auto texture = textureSet.GetTexture(0);
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION );
+  propertyMap.Clear();
+  propertyMap.Add(DevelImageVisual::Property::LOOP_COUNT, 3);
+  propertyMap.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, propertyMap);
 
-  // Change scale and size
-  controlSize = Vector2( 50.f, 40.f );
-  controlScale= Vector3( 0.5f, 0.5f, 1.0f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
-  actor.SetProperty( Actor::Property::SCALE, controlScale );
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  application.SendNotification();
-  application.Render();
+  // Trigger count is 1 - animation finished
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION); // Should be the first frame
 
-  textureSet = renderer.GetTextures();
-  texture = textureSet.GetTexture(0);
+  // Change stop behavior
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
 
-  DALI_TEST_EQUALS( controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
-  END_TEST;
-}
+  attributes.Clear();
 
-int UtcDaliAnimatedVectorImageVisualMultipleInstances(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualMultipleInstances" );
+  // Play again
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
-  Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - animation finished
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  Visual::Base visual1 = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual1 );
+  map = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
 
-  DummyControl actor1 = DummyControl::New( true );
-  DummyControlImpl& dummyImpl1 = static_cast< DummyControlImpl& >( actor1.GetImplementation() );
-  dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual1 );
+  Property::Value* value1           = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER);
+  int              totalFrameNumber = value1->Get<int>();
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor1.SetProperty( Actor::Property::SIZE, controlSize );
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), totalFrameNumber - 1, TEST_LOCATION); // Should be the last frame
 
-  application.GetScene().Add( actor1 );
+  // Change stop behavior
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME);
+  attributes.Add(DevelImageVisual::Property::LOOP_COUNT, -1);
 
-  propertyMap.Clear();
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
-  Visual::Base visual2 = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual2 );
+  attributes.Clear();
 
-  DummyControl actor2 = DummyControl::New( true );
-  DummyControlImpl& dummyImpl2 = static_cast< DummyControlImpl& >( actor2.GetImplementation() );
-  dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual2 );
+  // Play again
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
-  actor2.SetProperty( Actor::Property::SIZE, controlSize );
+  application.SendNotification();
+  application.Render();
 
-  application.GetScene().Add( actor2 );
+  // Pause
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes);
 
-  DevelControl::DoAction( actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map() );
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 200 ) );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  Property::Map attributes;
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME );
+  map                    = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value                  = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  int currentFrameNumber = value->Get<int>();
 
-  DevelControl::DoAction( actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
-  DevelControl::DoAction( actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+  // Stop
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes);
 
-  DevelControl::DoAction( actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map() );
+  // To make event trigger
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
 
-  // renderer is added to actor
-  DALI_TEST_CHECK( actor1.GetRendererCount() == 1u );
-  Renderer renderer1 = actor1.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer1 );
+  application.SendNotification();
+  application.Render();
 
-  // renderer is added to actor
-  DALI_TEST_CHECK( actor2.GetRendererCount() == 1u );
-  Renderer renderer2 = actor2.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer2 );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), currentFrameNumber, TEST_LOCATION); // Should be same with currentFrameNumber
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualControlVisibilityChanged(void)
+int UtcDaliAnimatedVectorImageVisualLoopingMode(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualControlVisibilityChanged" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualLoopingMode");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
+  // Trigger count is 2 - load, render
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  propertyMap.Clear();
+  propertyMap.Add(DevelImageVisual::Property::LOOP_COUNT, 3);
+  propertyMap.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
+  propertyMap.Add(DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::AUTO_REVERSE);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, propertyMap);
+
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  // Check rendering behavior
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::CONTINUOUSLY );
+  // Trigger count is 1 - animation finished
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION); // Should be the first frame because of auto reverse
+
+  // Change stop behavior
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME);
+
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
-  actor.SetProperty( Actor::Property::VISIBLE, false );
+  // Play again
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  // Check rendering behavior again
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::IF_REQUIRED );
+  // Trigger count is 1 - animation finished
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION); // Should be the first frame
+
+  // Change looping mode
+  attributes.Add(DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::RESTART);
+
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  // Play again
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - animation finished
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  Property::Value* value1           = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER);
+  int              totalFrameNumber = value1->Get<int>();
+
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), totalFrameNumber - 1, TEST_LOCATION); // Should be the last frame
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged(void)
+int UtcDaliAnimatedVectorImageVisualPropertyNotification(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPropertyNotification");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  application.SendNotification();
-  application.Render();
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  // Check rendering behavior
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::CONTINUOUSLY );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  Window window = DevelWindow::Get( actor );
-  window.Hide();
+  application.SendNotification();
+  application.Render();
 
   application.SendNotification();
   application.Render();
 
-  // Check rendering behavior again
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::IF_REQUIRED );
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  END_TEST;
-}
+  auto textureSet = renderer.GetTextures();
+  auto texture    = textureSet.GetTexture(0);
 
-int UtcDaliAnimatedVectorImageVisualInvalidFile(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline("Request loading with invalid file - should draw broken image");
+  DALI_TEST_EQUALS(controlSize.width, texture.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(controlSize.height, texture.GetHeight(), TEST_LOCATION);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  // Change scale
+  Vector3 controlScale(2.0f, 2.0f, 1.0f);
+  actor.SetProperty(Actor::Property::SCALE, controlScale);
 
-  Property::Map propertyMap;
-  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
-             .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_INVALID_FILE_NAME);
+  application.SendNotification();
+  application.Render();
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
-  DALI_TEST_CHECK(visual);
+  application.SendNotification();
+  application.Render();
 
-  DummyControl actor = DummyControl::New(true);
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >(actor.GetImplementation());
-  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
+  renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  application.GetScene().Add(actor);
+  textureSet = renderer.GetTextures();
+  texture    = textureSet.GetTexture(0);
+
+  DALI_TEST_EQUALS(controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION);
+
+  // Size animation
+  controlSize         = Vector2(50.0f, 100.0f);
+  Animation animation = Animation::New(1.0);
+  animation.AnimateTo(Property(actor, Actor::Property::SIZE), Vector3(controlSize.x, controlSize.y, 0.0f));
+  animation.Play();
+
+  application.SendNotification();
+  application.Render(1100); // After the animation
 
   application.SendNotification();
   application.Render();
 
-  // Check resource status
-  Visual::ResourceStatus status = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
-  DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION);
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  // The broken image should be shown.
-  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
-  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  textureSet = renderer.GetTextures();
+  texture    = textureSet.GetTexture(0);
+
+  DALI_TEST_EQUALS(controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliAnimatedVectorImageVisualFrameDrops(void)
+int UtcDaliAnimatedVectorImageVisualMultipleInstances(void)
 {
   ToolkitTestApplication application;
-  tet_infoline("UtcDaliAnimatedVectorImageVisualFrameDrops");
+  tet_infoline("UtcDaliAnimatedVectorImageVisualMultipleInstances");
 
   Property::Map propertyMap;
   propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
-             .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME_FRAME_DROP);
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
-  DALI_TEST_CHECK(visual);
+  Visual::Base visual1 = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual1);
 
-  DummyControl actor = DummyControl::New(true);
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  DummyControl      actor1     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl1 = static_cast<DummyControlImpl&>(actor1.GetImplementation());
+  dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual1);
 
   Vector2 controlSize(20.f, 30.f);
-  actor.SetProperty(Actor::Property::SIZE, controlSize);
-
-  application.GetScene().Add(actor);
-
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::TOTAL_FRAME_NUMBER );
-  int totalFrameNumber = value->Get< int >();
-
-  Property::Map attributes;
-  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
+  actor1.SetProperty(Actor::Property::SIZE, controlSize);
 
-  // Make delay to drop frames
-  Test::VectorAnimationRenderer::DelayRendering(170); // longer than 16.6 * 10frames
+  application.GetScene().Add(actor1);
 
   application.SendNotification();
   application.Render();
 
-  // Trigger count is 2 - render the first frame & calculating frame drops
+  // Trigger count is 2 - load & render a frame
   DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  // Check dropped frame
+  propertyMap.Clear();
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual2 = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual2);
+
+  DummyControl      actor2     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl2 = static_cast<DummyControlImpl&>(actor2.GetImplementation());
+  dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual2);
+
+  actor2.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor2);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  DevelControl::DoAction(actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map());
+
+  // To make event trigger
+  actor2.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  Property::Map attributes;
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
+
+  DevelControl::DoAction(actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+  DevelControl::DoAction(actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  DevelControl::DoAction(actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map());
+
+  // renderer is added to actor
+  DALI_TEST_CHECK(actor1.GetRendererCount() == 1u);
+  Renderer renderer1 = actor1.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer1);
+
+  // renderer is added to actor
+  DALI_TEST_CHECK(actor2.GetRendererCount() == 1u);
+  Renderer renderer2 = actor2.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer2);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualControlVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualControlVisibilityChanged");
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check rendering behavior
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::CONTINUOUSLY);
+
+  actor.SetProperty(Actor::Property::VISIBLE, false);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check rendering behavior again
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::IF_REQUIRED);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged");
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check rendering behavior
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::CONTINUOUSLY);
+
+  Window window = DevelWindow::Get(actor);
+  window.Hide();
+
+  application.SendNotification();
+  application.Render();
+
+  // Check rendering behavior again
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::IF_REQUIRED);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualInvalidFile01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request loading with invalid file - should draw broken image");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_INVALID_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check resource status
+  Visual::ResourceStatus status = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+  // The broken image should be shown.
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualInvalidFile02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request loading with invalid file - should draw broken image");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_INVALID_FILE_NAME);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  // Add to the Scene after loading
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check resource status
+  Visual::ResourceStatus status = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+  // The broken image should be shown.
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualInvalidFile03(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request loading with invalid file without size set - should draw broken image");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_INVALID_FILE_NAME)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check resource status
+  Visual::ResourceStatus status = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+  // The broken image should be shown.
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualFrameDrops(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualFrameDrops");
+
+  Property::Map propertyMap;
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME_FRAME_DROP)
+    .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - load, render the first frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  Property::Map    map              = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value            = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER);
+  int              totalFrameNumber = value->Get<int>();
+
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
+
+  // Make delay to drop frames
+  Test::VectorAnimationRenderer::DelayRendering(170); // longer than 16.6 * 10frames
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - calculating frame drops
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  // Check dropped frame
   uint32_t frames = Test::VectorAnimationRenderer::GetDroppedFrames();
   DALI_TEST_CHECK(frames > 0);
   DALI_TEST_CHECK(frames <= static_cast<uint32_t>(totalFrameNumber));
 
   END_TEST;
 }
+
+int UtcDaliAnimatedVectorImageVisualSize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualSize");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+
+  VisualFactory factory = VisualFactory::Get();
+  Visual::Base  visual  = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - resource ready
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  textureTrace.Enable(true);
+
+  application.SendNotification();
+  application.Render();
+
+  {
+    int               width = 100, height = 100; // 100x100 is the content default size.
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << width << ", " << height;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str()));
+  }
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - resource ready
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  textureTrace.Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  {
+    int               width = 200, height = 200;
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << width << ", " << height;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str()));
+  }
+
+  END_TEST;
+}
+
+namespace
+{
+bool gDynamicPropertyCallbackFired = false;
+
+Property::Value FillColorCallback(int32_t id, VectorAnimationRenderer::VectorProperty property, uint32_t frameNumber)
+{
+  gDynamicPropertyCallbackFired = true;
+
+  if(frameNumber < 3)
+  {
+    return Vector3(0, 0, 1);
+  }
+  else
+  {
+    return Vector3(1, 0, 0);
+  }
+}
+} // namespace
+
+int UtcDaliAnimatedVectorImageVisualDynamicProperty(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualDynamicProperty");
+
+  VisualFactory factory = VisualFactory::Get();
+  Visual::Base  visual  = factory.CreateVisual(
+    Property::Map()
+      .Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+      .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+      .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false));
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+
+  application.GetScene().Add(actor);
+
+  gDynamicPropertyCallbackFired = false;
+
+  // Set dynamic property
+  DevelAnimatedVectorImageVisual::DynamicPropertyInfo info;
+  info.id       = 1;
+  info.keyPath  = "Test.Path";
+  info.property = static_cast<int>(VectorAnimationRenderer::VectorProperty::FILL_COLOR);
+  info.callback = MakeCallback(FillColorCallback);
+
+  DevelControl::DoActionExtension(actor, DummyControl::Property::TEST_VISUAL, DevelAnimatedVectorImageVisual::Action::SET_DYNAMIC_PROPERTY, Any(info));
+
+  Property::Map attributes;
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  // Test whether the property callback is called
+  DALI_TEST_EQUALS(gDynamicPropertyCallbackFired, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualDesiredSize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageVisualDesiredSize");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  int                desiredWidth = 150, desiredHeight = 200;
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions(desiredWidth, desiredHeight));
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - resource ready
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  textureTrace.Enable(true);
+
+  application.SendNotification();
+  application.Render();
+
+  {
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str()));
+  }
+
+  // Unparent to make next trigger
+  actor.Unparent();
+
+  application.SendNotification();
+  application.Render();
+
+  // Set visual size
+  actor.SetProperty(Actor::Property::SIZE, Vector2(300.0f, 300.0f));
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - resource ready
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  textureTrace.Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  {
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str())); // The size should not be changed
+  }
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageVisualFlushAction(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("UtcDaliAnimatedVectorImageVisualFlushAction");
+
+  int startFrame = 1;
+  int endFrame   = 2;
+
+  int totalFrameCount = 0;
+
+  Property::Array playRange;
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
+
+  Property::Map    resultMap;
+  Property::Value* value = nullptr;
+
+  // request AnimatedVectorImageVisual with a property map
+  VisualFactory factory = VisualFactory::Get();
+  Visual::Base  visual  = factory.CreateVisual(
+    Property::Map()
+      .Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+      .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+      .Add(DevelImageVisual::Property::PLAY_RANGE, playRange)
+      .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, true));
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  application.GetScene().Add(dummyControl);
+
+  // Retry function to get playrange until expect values comes.
+  auto CheckAndRetryPlayRange = [&](int expectStartFrame, int expectEndFrame, std::vector<std::pair<int, int>> retrialFrames) {
+    int tryCount    = 0;
+    int tryCountMax = 30;
+    while(++tryCount <= tryCountMax)
+    {
+      Property::Map resultMap = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+
+      Property::Value* value = resultMap.Find(DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY);
+      DALI_TEST_CHECK(value);
+
+      Property::Array* result = value->GetArray();
+      DALI_TEST_CHECK(result);
+      DALI_TEST_EQUALS(result->Count(), 2, TEST_LOCATION);
+
+      bool tryAgain = false;
+      for(auto& framePair : retrialFrames)
+      {
+        if(result->GetElementAt(0).Get<int>() == framePair.first && result->GetElementAt(1).Get<int>() == framePair.second)
+        {
+          tryAgain = true;
+          break;
+        }
+      }
+      if(tryAgain)
+      {
+        tet_printf("Retry to get value again! [%d]\n", tryCount);
+        // Dummy sleep 1 second.
+        Test::WaitForEventThreadTrigger(1, 1);
+        continue;
+      }
+
+      DALI_TEST_EQUALS(result->GetElementAt(0).Get<int>(), expectStartFrame, TEST_LOCATION);
+      DALI_TEST_EQUALS(result->GetElementAt(1).Get<int>(), expectEndFrame, TEST_LOCATION);
+      break;
+    }
+    DALI_TEST_CHECK(tryCount <= tryCountMax);
+  };
+
+  tet_printf("Pause lottie first.\n");
+
+  Property::Map attributes;
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes);
+
+  application.SendNotification();
+  application.Render(16);
+
+  do
+  {
+    resultMap = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+
+    value = resultMap.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER, Property::INTEGER);
+    DALI_TEST_CHECK(value);
+    totalFrameCount = value->Get<int>();
+  } while(totalFrameCount == 0);
+
+  // Ensure that vector data sended well.
+  CheckAndRetryPlayRange(startFrame, endFrame, {{0, 0}, {0, totalFrameCount - 1}});
+
+  resultMap = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+
+  value = resultMap.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), startFrame, TEST_LOCATION);
+
+  tet_printf("Now logically, range : [%d~%d], current : %d\n", startFrame, endFrame, startFrame);
+
+  int changedStartFrame1 = startFrame + 2;
+  int changedEndFrame1   = endFrame + 2;
+
+  playRange.Clear();
+  playRange.Add(changedStartFrame1);
+  playRange.Add(changedEndFrame1);
+
+  tet_printf("Change play range\n");
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, playRange);
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  tet_printf("Jump to changedEndFrame!\n");
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, changedEndFrame1);
+
+  attributes.Clear();
+  tet_infoline("Flush Action!");
+  tet_printf("Now logically, range : [%d~%d], current : %d\n", changedStartFrame1, changedEndFrame1, changedEndFrame1);
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::FLUSH, attributes);
+
+  int changedStartFrame2 = startFrame + 1;
+  int changedEndFrame2   = endFrame + 1;
+
+  playRange.Clear();
+  playRange.Add(changedStartFrame2);
+  playRange.Add(changedEndFrame2);
+
+  tet_printf("Change play range again\n");
+  tet_printf("Now logically, range : [%d~%d], current : %d\n", changedStartFrame2, changedEndFrame2, changedEndFrame2);
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, playRange);
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // Ensure that vector data sended well.
+  CheckAndRetryPlayRange(changedStartFrame2, changedEndFrame2, {{changedStartFrame1, changedEndFrame1}, {startFrame, endFrame}});
+
+  resultMap = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+
+  tet_printf("Test whether current frame number changed well. If Flush not works, current frame become startFrame.");
+  value = resultMap.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), changedEndFrame2, TEST_LOCATION);
+
+  dummyControl.Unparent();
+
+  END_TEST;
+}
+
+int UtcDaliAnimatedVectorImageNativeTextureChangeShader(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliAnimatedVectorImageNativeTextureChangeShader");
+
+  VisualFactory factory = VisualFactory::Get();
+  Visual::Base  visual  = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  // Make we use native texture now.
+  Test::VectorAnimationRenderer::UseNativeImageTexture(true);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  // Trigger count is 1 - resource ready
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  Renderer        renderer = actor.GetRendererAt(0);
+  Shader          shader   = renderer.GetShader();
+  Property::Value value    = shader.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
+
+  std::string      resultFragmentShader, resultVertexShader;
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  fragment->Get(resultFragmentShader);
+  DALI_TEST_CHECK(resultFragmentShader.find(NativeImageSourceTest::GetCustomFragmentPrefix()) != std::string::npos);
+
+  // Reset to make we use normal texture again.
+  Test::VectorAnimationRenderer::UseNativeImageTexture(false);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp
index 583ce16..89add36 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali/devel-api/rendering/renderer-devel.h>
+#include <stdlib.h>
+#include <iostream>
 #include "dummy-control.h"
 
 using namespace Dali;
@@ -42,32 +42,32 @@ void dali_arc_visual_cleanup(void)
 int UtcDaliVisualFactoryGetArcVisual01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetArcVisual01: Request arc visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetArcVisual01: Request arc visual with a Property::Map");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ARC )
-             .Add( Visual::Property::MIX_COLOR, Color::RED )
-             .Add( DevelArcVisual::Property::THICKNESS, 20.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ARC)
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, 20.0f);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -75,35 +75,35 @@ int UtcDaliVisualFactoryGetArcVisual01(void)
 int UtcDaliVisualFactoryGetArcVisual02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetArcVisual02: Request arc visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetArcVisual02: Request arc visual with a Property::Map");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ARC )
-             .Add( Visual::Property::MIX_COLOR, Color::RED )
-             .Add( DevelArcVisual::Property::THICKNESS, 20.0f )
-             .Add( DevelArcVisual::Property::START_ANGLE, 0.0f )
-             .Add( DevelArcVisual::Property::SWEEP_ANGLE, 90.0f )
-             .Add( DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ARC)
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, 20.0f)
+    .Add(DevelArcVisual::Property::START_ANGLE, 0.0f)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, 90.0f)
+    .Add(DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -111,89 +111,89 @@ int UtcDaliVisualFactoryGetArcVisual02(void)
 int UtcDaliArcVisualGetPropertyMap01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliArcVisualGetPropertyMap01" );
+  tet_infoline("UtcDaliArcVisualGetPropertyMap01");
 
-  float thickness = 20.0f;
+  float thickness  = 20.0f;
   float startAngle = 0.0f, sweepAngle = 90.0f;
 
   Property::Map propertyMap;
-  propertyMap.Add( "visualType", DevelVisual::ARC )
-             .Add( "mixColor", Color::RED )
-             .Add( "thickness", thickness )
-             .Add( "startAngle", startAngle )
-             .Add( "sweepAngle", sweepAngle )
-             .Add( "cap", DevelArcVisual::Cap::ROUND );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  propertyMap.Add("visualType", DevelVisual::ARC)
+    .Add("mixColor", Color::RED)
+    .Add("thickness", thickness)
+    .Add("startAngle", startAngle)
+    .Add("sweepAngle", sweepAngle)
+    .Add("cap", DevelArcVisual::Cap::ROUND);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   Property::Map resultMap;
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), Color::RED, TEST_LOCATION );
+  Property::Value* value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::CAP, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelArcVisual::Cap::ROUND );
+  value = resultMap.Find(DevelArcVisual::Property::CAP, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelArcVisual::Cap::ROUND);
 
   // Test wrong values
-  propertyMap[DevelArcVisual::Property::THICKNESS] = "3.0f";
+  propertyMap[DevelArcVisual::Property::THICKNESS]   = "3.0f";
   propertyMap[DevelArcVisual::Property::START_ANGLE] = "0.0f";
   propertyMap[DevelArcVisual::Property::SWEEP_ANGLE] = "90.0f";
-  propertyMap[DevelArcVisual::Property::CAP] = "1";
+  propertyMap[DevelArcVisual::Property::CAP]         = "1";
 
-  visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
-  value = resultMap.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), 360.0f, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 360.0f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::CAP, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelArcVisual::Cap::BUTT );
+  value = resultMap.Find(DevelArcVisual::Property::CAP, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelArcVisual::Cap::BUTT);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -201,45 +201,45 @@ int UtcDaliArcVisualGetPropertyMap01(void)
 int UtcDaliArcVisualGetPropertyMap02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliArcVisualGetPropertyMap02" );
+  tet_infoline("UtcDaliArcVisualGetPropertyMap02");
 
-  float thickness = 20.0f;
+  float thickness  = 20.0f;
   float startAngle = 0.0f, sweepAngle = 90.0f;
 
   Property::Map propertyMap;
   propertyMap.Add(Visual::Property::TYPE, DevelVisual::ARC)
-             .Add(Visual::Property::MIX_COLOR, Color::RED)
-             .Add(DevelArcVisual::Property::THICKNESS, thickness )
-             .Add(DevelArcVisual::Property::START_ANGLE, startAngle )
-             .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle )
-             .Add(DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND );
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, thickness)
+    .Add(DevelArcVisual::Property::START_ANGLE, startAngle)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle)
+    .Add(DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   Property::Map resultMap;
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), Color::RED, TEST_LOCATION );
+  Property::Value* value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::CAP, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelArcVisual::Cap::ROUND );
+  value = resultMap.Find(DevelArcVisual::Property::CAP, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelArcVisual::Cap::ROUND);
 
   END_TEST;
 }
@@ -247,83 +247,83 @@ int UtcDaliArcVisualGetPropertyMap02(void)
 int UtcDaliArcVisualUpdateProperty(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliArcVisualUpdateProperty" );
+  tet_infoline("UtcDaliArcVisualUpdateProperty");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("thickness", Property::Type::FLOAT),
-    UniformData("startAngle", Property::Type::FLOAT),
-    UniformData("sweepAngle", Property::Type::FLOAT),
-  };
+    {
+      UniformData("thickness", Property::Type::FLOAT),
+      UniformData("startAngle", Property::Type::FLOAT),
+      UniformData("sweepAngle", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
-  float thickness = 20.0f;
+  float thickness  = 20.0f;
   float startAngle = 0.0f;
   float sweepAngle = 90.0f;
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ARC )
-             .Add( Visual::Property::MIX_COLOR, Color::RED )
-             .Add( DevelArcVisual::Property::THICKNESS, thickness )
-             .Add( DevelArcVisual::Property::START_ANGLE, startAngle )
-             .Add( DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ARC)
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, thickness)
+    .Add(DevelArcVisual::Property::START_ANGLE, startAngle)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "thickness", thickness ), true, TEST_LOCATION );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("thickness", thickness), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "startAngle", startAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("startAngle", startAngle), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "sweepAngle", sweepAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("sweepAngle", sweepAngle), true, TEST_LOCATION);
 
-  thickness = 10.0f;
+  thickness  = 10.0f;
   startAngle = 90.0f;
   sweepAngle = 180.0f;
 
   Property::Map attributes;
-  attributes.Add( DevelArcVisual::Property::THICKNESS, thickness )
-            .Add( DevelArcVisual::Property::START_ANGLE, startAngle )
-            .Add( DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle );
+  attributes.Add(DevelArcVisual::Property::THICKNESS, thickness)
+    .Add(DevelArcVisual::Property::START_ANGLE, startAngle)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelArcVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "thickness", thickness ), true, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("thickness", thickness), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "startAngle", startAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("startAngle", startAngle), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "sweepAngle", sweepAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("sweepAngle", sweepAngle), true, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
index 175ccfc..894a23d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>
-#include <unistd.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
 #include <dali/dali.h>
 #include <dali/devel-api/actors/actor-devel.h>
-#include <dali-toolkit-test-suite-utils.h>
+#include <stdlib.h>
 #include <toolkit-event-thread-callback.h>
-#include <dali-toolkit/dali-toolkit.h>
+#include <unistd.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -33,23 +34,29 @@ static const char* gImage_34_RGBA = TEST_RESOURCE_DIR "/icon-edit.png";
 static const char* gImage_50_RGBA = TEST_RESOURCE_DIR "/icon-delete.png";
 // resolution: 128*128, pixel format: RGB888
 static const char* gImage_128_RGB = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+// animated image
+static const char* gImage_gif = TEST_RESOURCE_DIR "/canvas-none.gif";
 
 // for testing the ImageLoadedSignal
 class ImageLoadedSignalVerifier : public ConnectionTracker
 {
 public:
-
   ImageLoadedSignalVerifier()
-  : mCount( 0 )
-  {}
+  : mCount(0)
+  {
+  }
 
   virtual ~ImageLoadedSignalVerifier()
-  {}
+  {
+  }
 
-  void ImageLoaded( uint32_t id, PixelData pixelData )
+  void ImageLoaded(uint32_t id, PixelData pixelData)
   {
-    mIDs.push_back( id );
-    mPixelDataList.push_back( pixelData );
+    if(pixelData)
+    {
+      mIDs.push_back(id);
+      mPixelDataList.push_back(pixelData);
+    }
     mCount++;
   }
 
@@ -58,15 +65,14 @@ public:
     return mCount;
   }
 
-  bool Verify( uint32_t id, uint32_t width, uint32_t height )
+  bool Verify(uint32_t id, uint32_t width, uint32_t height)
   {
     int size = mIDs.size();
-    for( int i = 0; i<size; i++  )
+    for(int i = 0; i < size; i++)
     {
-      if( mIDs[i] == id )
+      if(mIDs[i] == id)
       {
-        return mPixelDataList[i].GetWidth() == width
-            && mPixelDataList[i].GetHeight() == height;
+        return mPixelDataList[i].GetWidth() == width && mPixelDataList[i].GetHeight() == height;
       }
     }
 
@@ -74,14 +80,12 @@ public:
   }
 
 private:
-
   int mCount;
 
-  std::vector<uint32_t> mIDs;
+  std::vector<uint32_t>  mIDs;
   std::vector<PixelData> mPixelDataList;
 };
 
-
 } // anonymous namespace
 
 void dali_async_image_loader_startup(void)
@@ -94,18 +98,18 @@ void dali_async_image_loader_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-int UtcDaliImageAtlasNew01(void)
+int UtcDaliAsyncImageLoaderNew01(void)
 {
   ToolkitTestApplication application;
 
   //invoke default handle constructor
   AsyncImageLoader loader;
 
-  DALI_TEST_CHECK( !loader );
+  DALI_TEST_CHECK(!loader);
 
   // initialise handle
   loader = AsyncImageLoader::New();
-  DALI_TEST_CHECK( loader );
+  DALI_TEST_CHECK(loader);
 
   END_TEST;
 }
@@ -114,11 +118,11 @@ int UtcDaliAsyncImageLoaderCopyConstructor(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New( );
-  DALI_TEST_CHECK( loader );
+  AsyncImageLoader loader = AsyncImageLoader::New();
+  DALI_TEST_CHECK(loader);
 
   AsyncImageLoader loaderCopy(loader);
-  DALI_TEST_CHECK( loaderCopy );
+  DALI_TEST_CHECK(loaderCopy);
 
   END_TEST;
 }
@@ -127,14 +131,14 @@ int UtcDaliAsyncImageLoaderMoveConstructor(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New( );
-  DALI_TEST_CHECK( loader );
-  DALI_TEST_EQUALS( 1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  AsyncImageLoader loader = AsyncImageLoader::New();
+  DALI_TEST_CHECK(loader);
+  DALI_TEST_EQUALS(1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
-  AsyncImageLoader moved = std::move( loader );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( !loader );
+  AsyncImageLoader moved = std::move(loader);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!loader);
 
   END_TEST;
 }
@@ -144,14 +148,14 @@ int UtcDaliAsyncImageLoaderAssignmentOperator(void)
   ToolkitTestApplication application;
 
   AsyncImageLoader loader = AsyncImageLoader::New();
-  DALI_TEST_CHECK( loader );
+  DALI_TEST_CHECK(loader);
 
   AsyncImageLoader loader2;
-  DALI_TEST_CHECK( !loader2 );
+  DALI_TEST_CHECK(!loader2);
 
   loader2 = loader;
-  DALI_TEST_CHECK( loader2 );
-  DALI_TEST_CHECK( loader == loader2 ); // the two handles are pointing to the same object.
+  DALI_TEST_CHECK(loader2);
+  DALI_TEST_CHECK(loader == loader2); // the two handles are pointing to the same object.
 
   END_TEST;
 }
@@ -160,15 +164,15 @@ int UtcDaliAsyncImageLoaderMoveAssignment(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New( );
-  DALI_TEST_CHECK( loader );
-  DALI_TEST_EQUALS( 1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  AsyncImageLoader loader = AsyncImageLoader::New();
+  DALI_TEST_CHECK(loader);
+  DALI_TEST_EQUALS(1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
   AsyncImageLoader moved;
-  moved = std::move( loader );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( !loader );
+  moved = std::move(loader);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!loader);
 
   END_TEST;
 }
@@ -178,11 +182,11 @@ int UtcDaliAsyncImageLoaderDownCastP(void)
   ToolkitTestApplication application;
 
   AsyncImageLoader asyncImageLoader = AsyncImageLoader::New();
-  BaseHandle object(asyncImageLoader);
+  BaseHandle       object(asyncImageLoader);
 
-  AsyncImageLoader asyncImageLoader2 = AsyncImageLoader::DownCast( object );
+  AsyncImageLoader asyncImageLoader2 = AsyncImageLoader::DownCast(object);
 
-  DALI_TEST_CHECK( asyncImageLoader2 );
+  DALI_TEST_CHECK(asyncImageLoader2);
 
   END_TEST;
 }
@@ -191,10 +195,10 @@ int UtcDaliAsyncImageLoaderDownCastN(void)
 {
   ToolkitTestApplication application;
 
-  BaseHandle unInitializedObject;
-  AsyncImageLoader asyncImageLoader = AsyncImageLoader::DownCast( unInitializedObject );
+  BaseHandle       unInitializedObject;
+  AsyncImageLoader asyncImageLoader = AsyncImageLoader::DownCast(unInitializedObject);
 
-  DALI_TEST_CHECK( !asyncImageLoader );
+  DALI_TEST_CHECK(!asyncImageLoader);
 
   END_TEST;
 }
@@ -203,54 +207,76 @@ int UtcDaliAsyncImageLoaderLoadAndLoadedSignal(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New();
+  AsyncImageLoader          loader = AsyncImageLoader::New();
   ImageLoadedSignalVerifier loadedSignalVerifier;
 
-  loader.ImageLoadedSignal().Connect( &loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded );
+  loader.ImageLoadedSignal().Connect(&loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded);
+
+  loader.Load(gImage_34_RGBA);                                                                                                             // Trigger 1
+  uint32_t id02 = loader.Load(gImage_50_RGBA, ImageDimensions(25, 25));                                                                    // Trigger 2
+  uint32_t id03 = loader.Load(gImage_128_RGB, ImageDimensions(100, 100), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true); // Trigger 3
+
+  // Try load animted image
+  Dali::AnimatedImageLoading animatedImageLoading = Dali::AnimatedImageLoading::New(gImage_gif, true);
+  DevelAsyncImageLoader::LoadAnimatedImage(loader, animatedImageLoading, 0, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF); // Trigger 4
 
-  loader.Load( gImage_34_RGBA );
-  uint32_t id02 = loader.Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
-  uint32_t id03 = loader.Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
+  // Try apply mask image
+  Devel::PixelBuffer imageData = Devel::PixelBuffer::New(50, 50, Dali::Pixel::RGBA8888);
+  Devel::PixelBuffer maskData  = Devel::PixelBuffer::New(50, 50, Dali::Pixel::RGBA8888);
+  DevelAsyncImageLoader::ApplyMask(loader, imageData, maskData, 0.0f, false, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF); // Trigger 5 - ApplyMask also uses AsyncTask
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(5), true, TEST_LOCATION); // Wait for 5 triggers
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( loadedSignalVerifier.LoadedImageCount() == 3 );
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id02, 25, 25 ) );
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id03, 100, 100 ) );
+  DALI_TEST_CHECK(loadedSignalVerifier.LoadedImageCount() == 5);
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id02, 25, 25));
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id03, 100, 100));
 
   END_TEST;
 }
 
 // Note: This is not an ideal test, but we cannot guarantee we can call Cancel() before the image has finished loading.
-int UtcDaliAsyncImageLoaderCancel(void)
+int UtcDaliAsyncImageLoaderCancel01(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New();
+  AsyncImageLoader          loader = AsyncImageLoader::New();
   ImageLoadedSignalVerifier loadedSignalVerifier;
 
-  loader.ImageLoadedSignal().Connect( &loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded );
+  loader.ImageLoadedSignal().Connect(&loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded);
 
-  uint32_t id01 = loader.Load( gImage_34_RGBA, ImageDimensions( 34, 34 ) );
-  uint32_t id02 = loader.Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
-  uint32_t id03 = loader.Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
+  uint32_t id01 = loader.Load(gImage_34_RGBA, ImageDimensions(34, 34));
+  uint32_t id02 = loader.Load(gImage_50_RGBA, ImageDimensions(25, 25));
+  uint32_t id03 = loader.Load(gImage_128_RGB, ImageDimensions(100, 100), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( loadedSignalVerifier.LoadedImageCount() == 3 );
+  DALI_TEST_CHECK(loadedSignalVerifier.LoadedImageCount() == 3);
+
+  DALI_TEST_CHECK(!loader.Cancel(id03)); // Cannot cancel a task that is already implemeted
 
-  DALI_TEST_CHECK( !loader.Cancel( id03 ) ); // Cannot cancel a task that is already implemeted
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id01, 34, 34));   // first image is loaded
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id02, 25, 25));   // second image is loaded
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id03, 100, 100)); // third image is loaded
+
+  END_TEST;
+}
+
+int UtcDaliAsyncImageLoaderCancel02(void)
+{
+  ToolkitTestApplication application;
 
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id01, 34, 34 ) );   // first image is loaded
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id02, 25, 25 ) );   // second image is loaded
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id03, 100, 100 ) ); // third image is loaded
+  AsyncImageLoader loader = AsyncImageLoader::New();
+  uint32_t         id01   = loader.Load(gImage_34_RGBA, ImageDimensions(34, 34));
+  DALI_TEST_CHECK(loader.Cancel(id01)); // Cancle a task
 
+  application.SendNotification();
+  application.Render();
   END_TEST;
 }
 
@@ -272,7 +298,20 @@ int UtcDaliAsyncImageLoaderCancelAll(void)
 
   // Test that cancelling a non-existing loading task will return false
   uint32_t id = 1;
-  DALI_TEST_CHECK( !(loader.Cancel( id )) );
+  DALI_TEST_CHECK(!(loader.Cancel(id)));
+
+  uint32_t id01 = loader.Load(gImage_34_RGBA, ImageDimensions(34, 34));
+  uint32_t id02 = loader.Load(gImage_50_RGBA, ImageDimensions(25, 25));
+  uint32_t id03 = loader.Load(gImage_128_RGB, ImageDimensions(100, 100), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true);
+  loader.CancelAll();
+
+  // Test that cancelling a non-existing loading task will return false
+  DALI_TEST_CHECK(!(loader.Cancel(id01)));
+  DALI_TEST_CHECK(!(loader.Cancel(id02)));
+  DALI_TEST_CHECK(!(loader.Cancel(id03)));
+
+  application.SendNotification();
+  application.Render();
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
index 2105c4a..f328ef2 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,15 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bloom-view/bloom-view.h>
-
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
-
 void bloom_view_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -48,13 +46,13 @@ int UtcDaliBloomViewUninitialized(void)
   {
     // New() must be called to create a BloomView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
@@ -67,10 +65,10 @@ int UtcDaliBloomViewNew(void)
   tet_infoline(" UtcDaliBloomViewNew");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Toolkit::BloomView view2 = Toolkit::BloomView::New(10, 1.0f, Pixel::RGB888, 0.5f, 0.5f);
-  DALI_TEST_CHECK( view2 );
+  DALI_TEST_CHECK(view2);
   END_TEST;
 }
 
@@ -81,16 +79,15 @@ int UtcDaliBloomViewDownCast(void)
   tet_infoline(" UtcDaliBloomViewDownCast");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  BaseHandle handle(view);
+  BaseHandle         handle(view);
 
-  Toolkit::BloomView bloomView = Toolkit::BloomView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( bloomView );
-  DALI_TEST_CHECK( bloomView == view );
+  Toolkit::BloomView bloomView = Toolkit::BloomView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(bloomView);
+  DALI_TEST_CHECK(bloomView == view);
   END_TEST;
 }
 
-
 // Positive test case for a method
 int UtcDaliBloomViewPropertyNames(void)
 {
@@ -98,16 +95,16 @@ int UtcDaliBloomViewPropertyNames(void)
   tet_infoline(" UtcDaliBloomViewPropertyNames");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // Check the names, this names are used in the shader code,
   // if they change in the shader code, then it has to be updated here.
-  DALI_TEST_EQUALS( view.GetBloomThresholdPropertyIndex(), view.GetPropertyIndex("uBloomThreshold"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetBloomIntensityPropertyIndex(), view.GetPropertyIndex("uBloomIntensity"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetBloomSaturationPropertyIndex(), view.GetPropertyIndex("uBloomSaturation"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetImageIntensityPropertyIndex(), view.GetPropertyIndex("uImageIntensity"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetImageSaturationPropertyIndex(), view.GetPropertyIndex("uImageSaturation"), TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetBloomThresholdPropertyIndex(), view.GetPropertyIndex("uBloomThreshold"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetBloomIntensityPropertyIndex(), view.GetPropertyIndex("uBloomIntensity"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetBloomSaturationPropertyIndex(), view.GetPropertyIndex("uBloomSaturation"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetImageIntensityPropertyIndex(), view.GetPropertyIndex("uImageIntensity"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetImageSaturationPropertyIndex(), view.GetPropertyIndex("uImageSaturation"), TEST_LOCATION);
   END_TEST;
 }
 
@@ -118,22 +115,21 @@ int UtcDaliBloomViewAddRemove(void)
   tet_infoline(" UtcDaliBloomViewAddRemove");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(actor);
   application.GetScene().Add(view);
 
-  DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
   view.Remove(actor);
 
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
@@ -144,24 +140,24 @@ int UtcDaliBloomActivateDeactivate(void)
   tet_infoline(" UtcDaliBloomActivateDeactivate");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   RenderTaskList taskList = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList.GetTaskCount());
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.Activate();
 
   RenderTaskList taskList2 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
+  DALI_TEST_CHECK(1u != taskList2.GetTaskCount());
 
   view.Deactivate();
 
   RenderTaskList taskList3 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList3.GetTaskCount());
   END_TEST;
 }
 
@@ -170,16 +166,16 @@ int UtcDaliBloomCopyAndAssignment(void)
   ToolkitTestApplication application;
 
   BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  BloomView copy( view );
-  DALI_TEST_CHECK( view == copy );
+  BloomView copy(view);
+  DALI_TEST_CHECK(view == copy);
 
   BloomView assign;
-  DALI_TEST_CHECK( ! assign );
+  DALI_TEST_CHECK(!assign);
 
   assign = copy;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -189,16 +185,16 @@ int UtcDaliBloomTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "BloomView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("BloomView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  BloomView view = BloomView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  BloomView view = BloomView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -209,18 +205,18 @@ int UtcDaliBloomOnSizeSet(void)
 
   BloomView view = Toolkit::BloomView::New();
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   application.SendNotification();
   application.Render();
 
-  Vector3 size( 200.0f, 300.0f, 0.0f );
-  view.SetProperty( Actor::Property::SIZE, size );
+  Vector3 size(200.0f, 300.0f, 0.0f);
+  view.SetProperty(Actor::Property::SIZE, size);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), size, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
index 7fa50ed..41e8236 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,17 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
-#include <dali.h>
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
+#include <dali.h>
+#include <dali/public-api/rendering/renderer.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -40,10 +40,8 @@ void utc_dali_toolkit_bubble_emitter_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 namespace
 {
-
 const int RENDER_FRAME_INTERVAL = 16;
 
 static bool gObjectCreatedCallBackCalled;
@@ -65,7 +63,7 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -75,13 +73,27 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
   return time;
 }
 
-static Texture CreateSolidColorTexture( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
+static Texture CreateSolidColorTexture(ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height)
 {
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height );
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
+
+  int      bufferSize = width * height * GetBytesPerPixel(Pixel::RGBA8888);
+  uint8_t* buffer     = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+
+  for(uint32_t i = 0; i < width * height; ++i)
+  {
+    buffer[i * 4 + 0] = static_cast<uint8_t>(color.r * 255.0f);
+    buffer[i * 4 + 1] = static_cast<uint8_t>(color.g * 255.0f);
+    buffer[i * 4 + 2] = static_cast<uint8_t>(color.b * 255.0f);
+    buffer[i * 4 + 3] = static_cast<uint8_t>(color.a * 255.0f);
+  }
+
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
+  texture.Upload(pixelData, 0u, 0u, 0u, 0u, width, height);
+
   return texture;
 }
-}//namespace
-
+} //namespace
 
 int UtcDaliBubbleEmitterNew(void)
 {
@@ -91,32 +103,32 @@ int UtcDaliBubbleEmitterNew(void)
 
   // Test default constructor
   BubbleEmitter emitter;
-  DALI_TEST_CHECK( !emitter );
+  DALI_TEST_CHECK(!emitter);
 
   // Test object creation
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
-  DALI_TEST_CHECK( emitter );
+  Texture shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  emitter            = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
+  DALI_TEST_CHECK(emitter);
 
   // Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+    BubbleEmitter emitter = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   // Test copy constructor
-  BubbleEmitter emitterCopy( emitter );
-  DALI_TEST_CHECK( emitterCopy );
+  BubbleEmitter emitterCopy(emitter);
+  DALI_TEST_CHECK(emitterCopy);
 
   // Test down cast
   Handle handleEmitter;
-  handleEmitter = emitter;
-  BubbleEmitter downCastEmitter = BubbleEmitter::DownCast( handleEmitter );
-  DALI_TEST_CHECK( downCastEmitter );
+  handleEmitter                 = emitter;
+  BubbleEmitter downCastEmitter = BubbleEmitter::DownCast(handleEmitter);
+  DALI_TEST_CHECK(downCastEmitter);
   END_TEST;
 }
 
@@ -126,12 +138,12 @@ int UtcDaliBubbleEmitterDownCast01(void)
 
   tet_infoline(" UtcDaliBubbleEmitterDownCast01 ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
-  BaseHandle handle(emitter);
+  BaseHandle    handle(emitter);
   BubbleEmitter emitter2 = BubbleEmitter::DownCast(handle);
-  DALI_TEST_EQUALS( (bool)emitter2, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)emitter2, true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -141,44 +153,44 @@ int UtcDaliBubbleEmitterDownCast02(void)
 
   tet_infoline(" UtcDaliBubbleEmitterDownCast02 ");
 
-  Handle handle = Handle::New(); // Create a custom object
+  Handle        handle  = Handle::New(); // Create a custom object
   BubbleEmitter emitter = BubbleEmitter::DownCast(handle);
-  DALI_TEST_EQUALS( (bool)emitter, false, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)emitter, false, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliBubbleEmitterGetRootActor(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterGetRootActor " );
+  tet_infoline(" UtcDaliBubbleEmitterGetRootActor ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 270, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 270, Vector2(5.f, 10.f));
 
   Actor root = emitter.GetRootActor();
-  DALI_TEST_CHECK( root );
-  DALI_TEST_CHECK( root.GetChildCount() == 0 );
+  DALI_TEST_CHECK(root);
+  DALI_TEST_CHECK(root.GetChildCount() == 0);
   END_TEST;
 }
 
 int UtcDaliBubbleEmitterSetBackground(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBackground " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBackground ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
-  RenderTaskList taskList = application.GetScene().GetRenderTaskList();
-  unsigned int taskCount = taskList.GetTaskCount();
+  RenderTaskList taskList  = application.GetScene().GetRenderTaskList();
+  unsigned int   taskCount = taskList.GetTaskCount();
 
-  Texture bgImage = CreateSolidColorTexture( application, Color::RED, 50, 50 );
-  emitter.SetBackground( bgImage, Vector3(0.f, 0.f, 0.5f) );
+  Texture bgImage = CreateSolidColorTexture(application, Color::RED, 50, 50);
+  emitter.SetBackground(bgImage, Vector3(0.f, 0.f, 0.5f));
 
-  DALI_TEST_CHECK( taskList.GetTaskCount() == taskCount+1 );
+  DALI_TEST_CHECK(taskList.GetTaskCount() == taskCount + 1);
 
   Wait(application, 500);
-  DALI_TEST_CHECK( taskList.GetTaskCount() == taskCount );
+  DALI_TEST_CHECK(taskList.GetTaskCount() == taskCount);
   END_TEST;
 }
 
@@ -191,42 +203,42 @@ int UtcDaliBubbleEmitterSetBackground(void)
 int UtcDaliBubbleEmitterSetBubbleScale(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBubbleScale " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBubbleScale ");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uDynamicScale", Property::Type::FLOAT),
-  };
+    {
+      UniformData("uDynamicScale", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 150, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 150, Vector2(5.f, 10.f));
   DALI_TEST_CHECK(emitter);
   Actor root = emitter.GetRootActor();
-  application.GetScene().Add( root );
-  root.SetProperty( Actor::Property::POSITION, Vector3::ZERO );
-  root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  application.GetScene().Add(root);
+  root.SetProperty(Actor::Property::POSITION, Vector3::ZERO);
+  root.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  root.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
   Wait(application);
 
   float scaleValue;
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uDynamicScale", scaleValue ) );
-  DALI_TEST_EQUALS( scaleValue, 1.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uDynamicScale", scaleValue));
+  DALI_TEST_EQUALS(scaleValue, 1.f, TEST_LOCATION);
 
-  emitter.SetBubbleScale( 2.f );
+  emitter.SetBubbleScale(2.f);
   Wait(application);
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uDynamicScale", scaleValue ) );
-  DALI_TEST_EQUALS( scaleValue, 2.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uDynamicScale", scaleValue));
+  DALI_TEST_EQUALS(scaleValue, 2.f, TEST_LOCATION);
 
-  emitter.SetBubbleScale( 0.5f );
+  emitter.SetBubbleScale(0.5f);
   Wait(application);
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uDynamicScale", scaleValue ) );
-  DALI_TEST_EQUALS( scaleValue, 0.5f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uDynamicScale", scaleValue));
+  DALI_TEST_EQUALS(scaleValue, 0.5f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -234,20 +246,20 @@ int UtcDaliBubbleEmitterSetBubbleScale(void)
 int UtcDaliBubbleEmitterSetBubbleDensity01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBubbleDensity " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBubbleDensity ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
   try
   {
-    emitter.SetBubbleDensity( 3.f );
+    emitter.SetBubbleDensity(3.f);
     DALI_TEST_CHECK(true);
   }
   catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION );
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -255,19 +267,19 @@ int UtcDaliBubbleEmitterSetBubbleDensity01(void)
 int UtcDaliBubbleEmitterSetBubbleDensity02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBubbleDensity " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBubbleDensity ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
   try
   {
-    emitter.SetBubbleDensity( 10.f );
+    emitter.SetBubbleDensity(10.f);
   }
   catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_ASSERT(e, "density > 0 && density <= 9", TEST_LOCATION );
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_ASSERT(e, "density > 0 && density <= 9", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -275,117 +287,113 @@ int UtcDaliBubbleEmitterSetBubbleDensity02(void)
 int UtcDaliBubbleEmitterEmitBubble(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterEmitBubble " );
-
-  Texture shapeImage1 = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage1, 200, Vector2( 5.f, 10.f ));
-
-  Actor root = emitter.GetRootActor();
-  Renderer bubbleRenderer = root.GetRendererAt( 0 );
-  application.GetScene().Add( root );
-  DALI_TEST_CHECK( bubbleRenderer );
-
-  Property::Index propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" );
-  Property::Index propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" );
-  float value0, value1;
-
-  Animation animation = Animation::New( 0.5f );
-  emitter.EmitBubble( animation, Vector2(40.f,40.f), Vector2(-5.f,-5.f), Vector2(30.f,30.f) );
-  emitter.EmitBubble( animation, Vector2(10.f,10.f), Vector2(5.f,5.f), Vector2(30.f,30.f) );
-  (bubbleRenderer.GetProperty(propertyIndex0)).Get( value0 );
-  (bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 );
-  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
-  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
-  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
-  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
+  tet_infoline(" UtcDaliBubbleEmitterEmitBubble ");
+
+  Texture       shapeImage1 = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter     = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage1, 200, Vector2(5.f, 10.f));
+
+  Actor    root           = emitter.GetRootActor();
+  Renderer bubbleRenderer = root.GetRendererAt(0);
+  application.GetScene().Add(root);
+  DALI_TEST_CHECK(bubbleRenderer);
+
+  Property::Index propertyIndex0 = bubbleRenderer.GetPropertyIndex("uPercentage[0]");
+  Property::Index propertyIndex1 = bubbleRenderer.GetPropertyIndex("uPercentage[1]");
+  float           value0, value1;
+
+  Animation animation = Animation::New(0.5f);
+  emitter.EmitBubble(animation, Vector2(40.f, 40.f), Vector2(-5.f, -5.f), Vector2(30.f, 30.f));
+  emitter.EmitBubble(animation, Vector2(10.f, 10.f), Vector2(5.f, 5.f), Vector2(30.f, 30.f));
+  (bubbleRenderer.GetProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetProperty(propertyIndex1)).Get(value1);
+  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value1);
+  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION);
 
   animation.Play();
 
   Wait(application, 300);
-  propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" );
-  propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
-  DALI_TEST_CHECK( value0 >= 0.6f );
-  DALI_TEST_CHECK( value1 >= 0.6f );
-
-  Wait(application,500);
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
-  DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION );
-  DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION );
+  propertyIndex0 = bubbleRenderer.GetPropertyIndex("uPercentage[0]");
+  propertyIndex1 = bubbleRenderer.GetPropertyIndex("uPercentage[1]");
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value1);
+  DALI_TEST_CHECK(value0 >= 0.6f);
+  DALI_TEST_CHECK(value1 >= 0.6f);
+
+  Wait(application, 500);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value1);
+  DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliBubbleEmitterRestore(void)
 {
-#ifdef OLD_GRAPHICS_TEST
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterRestore " );
+  tet_infoline(" UtcDaliBubbleEmitterRestore ");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uPercentage[0]", Property::Type::FLOAT),
-    UniformData("uStartEndPosition[0]", Property::Type::VECTOR4),
-  };
+    {
+      UniformData("uPercentage[90]", Property::Type::FLOAT),
+      UniformData("uStartEndPosition[90]", Property::Type::VECTOR4),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
-  Vector2 movementArea(50.f,50.f);
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( movementArea,shapeImage, 90, Vector2( 5.f, 10.f ));
-  Actor root = emitter.GetRootActor();
-  application.GetScene().Add( root );
-  root.SetProperty( Actor::Property::POSITION, Vector3::ZERO );
-  root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  Vector2       movementArea(50.f, 50.f);
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(movementArea, shapeImage, 90, Vector2(5.f, 10.f));
+  Actor         root       = emitter.GetRootActor();
+  application.GetScene().Add(root);
+  root.SetProperty(Actor::Property::POSITION, Vector3::ZERO);
+  root.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  root.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
 
-  Renderer renderer = root.GetRendererAt( 0 );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = root.GetRendererAt(0);
+  DALI_TEST_CHECK(renderer);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
-  float percentageValue;
+  float   percentageValue;
   Vector4 startEndPosValue;
 
-  Animation animation = Animation::New( 0.5f );
-  emitter.EmitBubble( animation, Vector2(40.f,40.f), Vector2(-5.f,-5.f), Vector2(30.f,30.f) );
+  Animation animation = Animation::New(0.5f);
+  emitter.EmitBubble(animation, Vector2(40.f, 40.f), Vector2(-5.f, -5.f), Vector2(30.f, 30.f));
 
   Wait(application);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uPercentage[0]", percentageValue ) );
-  DALI_TEST_EQUALS( percentageValue, 0.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uPercentage[0]", percentageValue));
+  DALI_TEST_EQUALS(percentageValue, 0.f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uStartEndPosition[0]", startEndPosValue ) );
-  DALI_TEST_EQUALS( startEndPosValue.x, 40.f - movementArea.x*0.5f, TEST_LOCATION );
-  DALI_TEST_EQUALS( startEndPosValue.y, 40.f- movementArea.x*0.5f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uStartEndPosition[0]", startEndPosValue));
+  DALI_TEST_EQUALS(startEndPosValue.x, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(startEndPosValue.y, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
 
   animation.Play();
   Wait(application, 200);
   animation.Clear();
 
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uPercentage[0]", percentageValue ) );
-  DALI_TEST_CHECK( percentageValue < 0.5f && percentageValue >= 0.4);
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uPercentage[0]", percentageValue));
+  DALI_TEST_CHECK(percentageValue < 0.5f && percentageValue >= 0.4);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uStartEndPosition[0]", startEndPosValue ) );
-  DALI_TEST_EQUALS( startEndPosValue.x, 40.f- movementArea.x*0.5f, TEST_LOCATION );
-  DALI_TEST_EQUALS( startEndPosValue.y, 40.f- movementArea.x*0.5f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uStartEndPosition[0]", startEndPosValue));
+  DALI_TEST_EQUALS(startEndPosValue.x, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(startEndPosValue.y, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
 
   emitter.Restore();
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uPercentage[0]", percentageValue ) );
-  DALI_TEST_EQUALS( percentageValue, 0.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uPercentage[0]", percentageValue));
+  DALI_TEST_EQUALS(percentageValue, 0.f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uStartEndPosition[0]", startEndPosValue ) );
-  DALI_TEST_EQUALS( startEndPosValue,  Vector4::ZERO, TEST_LOCATION );
-#else
-  tet_result(TET_PASS);
-#endif
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uStartEndPosition[0]", startEndPosValue));
+  DALI_TEST_EQUALS(startEndPosValue, Vector4::ZERO, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
index ca32522..f332890 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,30 +15,28 @@
  *
  */
 
+#include <algorithm>
+#include <cstdlib>
 #include <iostream>
 #include <iterator>
 #include <vector>
-#include <algorithm>
-#include <cstdlib>
 
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/devel-api/builder/builder.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/builder/base64-encoding.h>
+#include <dali-toolkit/devel-api/builder/builder.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <test-button.h>
-#include <test-animation-data.h>
 #include <dummy-control.h>
+#include <test-animation-data.h>
+#include <test-button.h>
 
-
-#define STRINGIFY(A)#A
+#define STRINGIFY(A) #A
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace BuilderControlProperty
 {
-
 enum
 {
   INTEGER_PROPERTY = Toolkit::Control::CONTROL_PROPERTY_END_INDEX + 1,
@@ -49,7 +47,6 @@ enum
 
 namespace
 {
-
 BaseHandle Create()
 {
   return Toolkit::Control::New();
@@ -57,12 +54,12 @@ BaseHandle Create()
 
 int gSetPropertyCalledCount = 0;
 
-void SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
+void SetProperty(BaseObject* object, Property::Index propertyIndex, const Property::Value& value)
 {
   ++gSetPropertyCalledCount;
 }
 
-Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex )
+Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex)
 {
   return Property::Value();
 }
@@ -70,21 +67,21 @@ Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex )
 } // unnamed namespace
 
 // Properties
-Dali::TypeRegistration typeRegistration( "BuilderControl", typeid( Toolkit::Control ), Create );
+Dali::TypeRegistration typeRegistration("BuilderControl", typeid(Toolkit::Control), Create);
 
-Dali::PropertyRegistration propertyInteger( typeRegistration, "integerProperty", INTEGER_PROPERTY, Property::INTEGER, &SetProperty, &GetProperty );
-Dali::PropertyRegistration propertyMatrix3( typeRegistration, "matrix3Property", MATRIX3_PROPERTY, Property::MATRIX3, &SetProperty, &GetProperty );
-Dali::PropertyRegistration propertyMatrix(  typeRegistration, "matrixProperty",  MATRIX_PROPERTY,  Property::MATRIX,  &SetProperty, &GetProperty );
-Dali::PropertyRegistration propertyNone(    typeRegistration, "noneProperty",    NONE_PROPERTY,    Property::NONE,    &SetProperty, &GetProperty );
+Dali::PropertyRegistration propertyInteger(typeRegistration, "integerProperty", INTEGER_PROPERTY, Property::INTEGER, &SetProperty, &GetProperty);
+Dali::PropertyRegistration propertyMatrix3(typeRegistration, "matrix3Property", MATRIX3_PROPERTY, Property::MATRIX3, &SetProperty, &GetProperty);
+Dali::PropertyRegistration propertyMatrix(typeRegistration, "matrixProperty", MATRIX_PROPERTY, Property::MATRIX, &SetProperty, &GetProperty);
+Dali::PropertyRegistration propertyNone(typeRegistration, "noneProperty", NONE_PROPERTY, Property::NONE, &SetProperty, &GetProperty);
 
-}
+} // namespace BuilderControlProperty
 
 namespace
 {
-
 struct BuilderFunctor
 {
-  BuilderFunctor( bool& called ) : mCalled( called )
+  BuilderFunctor(bool& called)
+  : mCalled(called)
   {
     mCalled = false;
   }
@@ -99,8 +96,6 @@ struct BuilderFunctor
 
 } // namespace
 
-
-
 void builder_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -117,30 +112,29 @@ int UtcDaliBuilderQuitSignal(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{"
-         "\"stage\":"
-         "[{"
-           "\"type\": \"Layer\","
-           "\"size\": [100,100,1],"
-           "\"parentOrigin\": \"TOP_LEFT\","
-           "\"anchorPoint\": \"TOP_LEFT\","
-           "\"maximumSize\": [100,100],"
-           "\"orientation\": [10,10,10,10],"
-           "\"clippingBox\": [10,10,10,10],"
-           "\"signals\": [{"
-             "\"name\": \"touched\","
-             "\"action\": \"quit\""
-           "}]"
-         "}]"
-      "}"
-  );
+    "{"
+    "\"stage\":"
+    "[{"
+    "\"type\": \"Layer\","
+    "\"size\": [100,100,1],"
+    "\"parentOrigin\": \"TOP_LEFT\","
+    "\"anchorPoint\": \"TOP_LEFT\","
+    "\"maximumSize\": [100,100],"
+    "\"orientation\": [10,10,10,10],"
+    "\"clippingBox\": [10,10,10,10],"
+    "\"signals\": [{"
+    "\"name\": \"touched\","
+    "\"action\": \"quit\""
+    "}]"
+    "}]"
+    "}");
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Connect to builder's quit signal
-  bool functorCalled( false );
-  builder.QuitSignal().Connect( &application, BuilderFunctor( functorCalled ) );
+  bool functorCalled(false);
+  builder.QuitSignal().Connect(&application, BuilderFunctor(functorCalled));
 
   // Render and notify
   application.SendNotification();
@@ -148,204 +142,202 @@ int UtcDaliBuilderQuitSignal(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
-  DALI_TEST_CHECK( functorCalled );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
+  DALI_TEST_CHECK(functorCalled);
 
   END_TEST;
 }
 
-
 int UtcDaliBuilderAnimationP(void)
 {
   ToolkitTestApplication application;
 
   // JSON with a quit event when the actor is touched
   std::string json(
-        "{"
-        "   \"constants\":"
-        "   {"
-        "     \"ALPHA_FUNCTION\":\"EASE_IN_OUT\""
-        "   },"
-        "   \"paths\":"
-        "   {"
-        "     \"path0\":"
-        "     {"
-        "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
-        "       \"curvature\":0.35"
-        "     }"
-        "   },"
-        "  \"animations\": {"
-        "    \"animate\": {"
-        "      \"loop\": true,"
-        "      \"endAction\": \"BAKE\","
-        "      \"disconnectAction\": \"BAKE\","
-        "      \"properties\":"
-        "      [{"
-        "        \"actor\": \"greeting\","
-        "        \"property\": \"position\","
-        "        \"value\": [300, 300, -1000],"
-        "        \"alphaFunction\": \"{ALPHA_FUNCTION}\","
-        "        \"relative\": true,"
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"visible\","
-        "         \"alphaFunction\": \"LINEAR\","
-        "         \"value\": true"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"sizeWidth\","
-        "         \"alphaFunction\": \"REVERSE\","
-        "         \"value\": 10.0"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN\","
-        "         \"value\": [10.0,20.0,30.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_OUT\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN_OUT\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN_SINE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_OUT_SINE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN_OUT_SINE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"BOUNCE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"SIN\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_OUT_BACK\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       }"
-        "      ]"
-        "    },"
-        "    \"pathAnimation\": {"
-        "      \"duration\": 3.0,"
-        "      \"endAction\": \"DISCARD\","
-        "      \"disconnectAction\": \"BAKE_FINAL\","
-        "      \"properties\": [{"
-        "        \"actor\": \"greeting\","
-        "        \"path\":\"path0\","
-        "        \"forward\":[1,0,0],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }]"
-        "    },"
-        "    \"pathAnimation2\": {"
-        "      \"duration\": 3.0,"
-        "      \"endAction\": \"BAKE_FINAL\","
-        "      \"disconnectAction\": \"DISCARD\","
-        "      \"properties\": [{"
-        "        \"actor\": \"greeting\","
-        "        \"path\":\"path0\","
-        "        \"forward\":[1,0,0],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }]"
-        "    }"
-        "  },"
-        "  \"stage\": [{"
-        "    \"name\": \"greeting\","
-        "    \"type\": \"TextLabel\","
-        "    \"text\": \"Touch me\","
-        "    \"inherit\": [\"basicText\"],"
-        "    \"position\": [0, -120, 0],"
-        "    \"size\": [200, 200, 1],"
-        "    \"orientation\": [0, 0, 30],"
-        "    \"signals\": [{"
-        "      \"name\": \"touched\","
-        "      \"action\": \"play\","
-        "      \"animation\": \"animate\""
-        "    }]"
-        "  }]"
-        "}");
+    "{"
+    "   \"constants\":"
+    "   {"
+    "     \"ALPHA_FUNCTION\":\"EASE_IN_OUT\""
+    "   },"
+    "   \"paths\":"
+    "   {"
+    "     \"path0\":"
+    "     {"
+    "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
+    "       \"curvature\":0.35"
+    "     }"
+    "   },"
+    "  \"animations\": {"
+    "    \"animate\": {"
+    "      \"loop\": true,"
+    "      \"endAction\": \"BAKE\","
+    "      \"disconnectAction\": \"BAKE\","
+    "      \"properties\":"
+    "      [{"
+    "        \"actor\": \"greeting\","
+    "        \"property\": \"position\","
+    "        \"value\": [300, 300, -1000],"
+    "        \"alphaFunction\": \"{ALPHA_FUNCTION}\","
+    "        \"relative\": true,"
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"visible\","
+    "         \"alphaFunction\": \"LINEAR\","
+    "         \"value\": true"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"sizeWidth\","
+    "         \"alphaFunction\": \"REVERSE\","
+    "         \"value\": 10.0"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN\","
+    "         \"value\": [10.0,20.0,30.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_OUT\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN_OUT\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN_SINE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_OUT_SINE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN_OUT_SINE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"BOUNCE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"SIN\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_OUT_BACK\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       }"
+    "      ]"
+    "    },"
+    "    \"pathAnimation\": {"
+    "      \"duration\": 3.0,"
+    "      \"endAction\": \"DISCARD\","
+    "      \"disconnectAction\": \"BAKE_FINAL\","
+    "      \"properties\": [{"
+    "        \"actor\": \"greeting\","
+    "        \"path\":\"path0\","
+    "        \"forward\":[1,0,0],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }]"
+    "    },"
+    "    \"pathAnimation2\": {"
+    "      \"duration\": 3.0,"
+    "      \"endAction\": \"BAKE_FINAL\","
+    "      \"disconnectAction\": \"DISCARD\","
+    "      \"properties\": [{"
+    "        \"actor\": \"greeting\","
+    "        \"path\":\"path0\","
+    "        \"forward\":[1,0,0],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }]"
+    "    }"
+    "  },"
+    "  \"stage\": [{"
+    "    \"name\": \"greeting\","
+    "    \"type\": \"TextLabel\","
+    "    \"text\": \"Touch me\","
+    "    \"inherit\": [\"basicText\"],"
+    "    \"position\": [0, -120, 0],"
+    "    \"size\": [200, 200, 1],"
+    "    \"orientation\": [0, 0, 30],"
+    "    \"signals\": [{"
+    "      \"name\": \"touched\","
+    "      \"action\": \"play\","
+    "      \"animation\": \"animate\""
+    "    }]"
+    "  }]"
+    "}");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   Animation anim = builder.CreateAnimation("animate");
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   Property::Map map;
   map["ALPHA_FUNCTION"] = "EASE_IN_SQUARE";
-  anim = builder.CreateAnimation("animate", map);
+  anim                  = builder.CreateAnimation("animate", map);
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   anim = builder.CreateAnimation("pathAnimation");
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   anim = builder.CreateAnimation("pathAnimation2");
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   // trigger play
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-
   END_TEST;
 }
 
@@ -355,98 +347,97 @@ int UtcDaliBuilderAnimationN(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-        "{"
-        "   \"constants\":"
-        "   {"
-        "     \"TEXT\": \"Touch Me\","
-        "     \"NAME\": \"greeting\" "
-        "   },"
-        "   \"paths\":"
-        "   {"
-        "     \"path0\":"
-        "     {"
-        "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
-        "       \"curvature\":0.35"
-        "     }"
-        "   },"
-        "  \"animations\": {"
-        "    \"animate\": {"
-        "      \"loop\": true,"
-        "      \"endAction\": \"BAKE\","
-        "      \"disconnectAction\": \"BAKE\","
-        "      \"properties\":"
-        "      [{"
-        "        \"actor\": \"{NAME}\","
-        "        \"property\": \"positioninvalid\","
-        "        \"value\": [300, 300, -1000],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"relative\": true,"
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }"
-        "      ]"
-        "    },"
-        "    \"animate2\": {"
-        "      \"loop\": true,"
-        "      \"endAction\": \"BAKE\","
-        "      \"disconnectAction\": \"BAKE\","
-        "      \"properties\":"
-        "      [{"
-        "        \"actor\": \"{NAME}\","
-        "        \"property\": \"positioninvalid\","
-        "        \"value\": [300, 300, -1000],"
-        "        \"alphaFunction\": \"EGGS_OVER_EASY\","
-        "        \"relative\": true,"
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }"
-        "      ]"
-        "    },"
-        "    \"pathAnimation\": {"
-        "      \"duration\": 3.0,"
-        "      \"endAction\": \"DISCARD\","
-        "      \"disconnectAction\": \"BAKE_FINAL\","
-        "      \"properties\": [{"
-        "        \"actor\": \"greeting\","
-        "        \"path\":\"pathDoesntExist\","
-        "        \"forward\":[1,0,0],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }]"
-        "    }"
-        "  },"
-        "  \"stage\": [{"
-        "    \"name\": \"greeting\","
-        "    \"type\": \"TextLabel\","
-        "    \"text\": \"Touch me\","
-        "    \"inherit\": [\"basicText\"],"
-        "    \"position\": [0, -120, 0],"
-        "    \"size\": [200, 200, 1],"
-        "    \"orientation\": [0, 0, 30],"
-        "    \"signals\": [{"
-        "      \"name\": \"touched\","
-        "      \"action\": \"play\","
-        "      \"animation\": \"animate\""
-        "    }]"
-        "  },"
-        "  {"
-        "    \"name\": \"greeting2\","
-        "    \"type\": \"TextLabel\","
-        "    \"text\": \"Touch me\""
-        "  }]"
-        "}");
-
+    "{"
+    "   \"constants\":"
+    "   {"
+    "     \"TEXT\": \"Touch Me\","
+    "     \"NAME\": \"greeting\" "
+    "   },"
+    "   \"paths\":"
+    "   {"
+    "     \"path0\":"
+    "     {"
+    "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
+    "       \"curvature\":0.35"
+    "     }"
+    "   },"
+    "  \"animations\": {"
+    "    \"animate\": {"
+    "      \"loop\": true,"
+    "      \"endAction\": \"BAKE\","
+    "      \"disconnectAction\": \"BAKE\","
+    "      \"properties\":"
+    "      [{"
+    "        \"actor\": \"{NAME}\","
+    "        \"property\": \"positioninvalid\","
+    "        \"value\": [300, 300, -1000],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"relative\": true,"
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }"
+    "      ]"
+    "    },"
+    "    \"animate2\": {"
+    "      \"loop\": true,"
+    "      \"endAction\": \"BAKE\","
+    "      \"disconnectAction\": \"BAKE\","
+    "      \"properties\":"
+    "      [{"
+    "        \"actor\": \"{NAME}\","
+    "        \"property\": \"positioninvalid\","
+    "        \"value\": [300, 300, -1000],"
+    "        \"alphaFunction\": \"EGGS_OVER_EASY\","
+    "        \"relative\": true,"
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }"
+    "      ]"
+    "    },"
+    "    \"pathAnimation\": {"
+    "      \"duration\": 3.0,"
+    "      \"endAction\": \"DISCARD\","
+    "      \"disconnectAction\": \"BAKE_FINAL\","
+    "      \"properties\": [{"
+    "        \"actor\": \"greeting\","
+    "        \"path\":\"pathDoesntExist\","
+    "        \"forward\":[1,0,0],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }]"
+    "    }"
+    "  },"
+    "  \"stage\": [{"
+    "    \"name\": \"greeting\","
+    "    \"type\": \"TextLabel\","
+    "    \"text\": \"Touch me\","
+    "    \"inherit\": [\"basicText\"],"
+    "    \"position\": [0, -120, 0],"
+    "    \"size\": [200, 200, 1],"
+    "    \"orientation\": [0, 0, 30],"
+    "    \"signals\": [{"
+    "      \"name\": \"touched\","
+    "      \"action\": \"play\","
+    "      \"animation\": \"animate\""
+    "    }]"
+    "  },"
+    "  {"
+    "    \"name\": \"greeting2\","
+    "    \"type\": \"TextLabel\","
+    "    \"text\": \"Touch me\""
+    "  }]"
+    "}");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   Animation anim = builder.CreateAnimation("animate");
 
@@ -463,7 +454,7 @@ int UtcDaliBuilderAnimationN(void)
   // create referencing a different actor aka animation templates
   Property::Map map;
   map["NAME"] = "greeting2";
-  anim = builder.CreateAnimation("animate2", map);
+  anim        = builder.CreateAnimation("animate2", map);
   DALI_TEST_CHECK(anim);
 
   // alternative actor to use for FindChildByName
@@ -474,9 +465,7 @@ int UtcDaliBuilderAnimationN(void)
   anim = builder.CreateAnimation("animate2", map, application.GetScene().GetRootLayer());
   DALI_TEST_CHECK(anim);
 
-
   END_TEST;
-
 }
 
 int UtcDaliBuilderConstantsP(void)
@@ -485,56 +474,55 @@ int UtcDaliBuilderConstantsP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{"
-      "\"constants\":"
-      "{"
-      "  \"IMAGE_PATH\": \"apath\","
-      "  \"WIDTH\": 22.3,"
-      "  \"ANCHOR\": \"TOP_LEFT\","
-      "  \"PADDING\": [1,2,3,4]"
-      "},"
-      "\"stage\":"
-      "[{"
-      "  \"type\": \"ImageView\","
-      "  \"name\": \"{NAME}\","
-      "  \"size\": [100,100,1],"
-      "  \"parentOrigin\": \"TOP_LEFT\","
-      "  \"anchorPoint\": \"{ANCHOR}\","
-      "  \"padding\": \"{PADDING}\","
-      "  \"image\": { \"url\": \"dir/{IMAGE_PATH}\" },"
-      "  \"sizeWidth\": \"{WIDTH}\","
-      "  \"signals\": [{"
-      "    \"name\": \"touched\","
-      "    \"action\": \"quit\""
-      "  }]"
-      "}]"
-      "}"
-  );
+    "{"
+    "\"constants\":"
+    "{"
+    "  \"IMAGE_PATH\": \"apath\","
+    "  \"WIDTH\": 22.3,"
+    "  \"ANCHOR\": \"TOP_LEFT\","
+    "  \"PADDING\": [1,2,3,4]"
+    "},"
+    "\"stage\":"
+    "[{"
+    "  \"type\": \"ImageView\","
+    "  \"name\": \"{NAME}\","
+    "  \"size\": [100,100,1],"
+    "  \"parentOrigin\": \"TOP_LEFT\","
+    "  \"anchorPoint\": \"{ANCHOR}\","
+    "  \"padding\": \"{PADDING}\","
+    "  \"image\": { \"url\": \"dir/{IMAGE_PATH}\" },"
+    "  \"sizeWidth\": \"{WIDTH}\","
+    "  \"signals\": [{"
+    "    \"name\": \"touched\","
+    "    \"action\": \"quit\""
+    "  }]"
+    "}]"
+    "}");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
-  builder.AddConstant( "NAME", "image" );
+  builder.AddConstant("NAME", "image");
 
   Property::Map map = builder.GetConstants();
 
-  Dali::Property::Value* pValue = map.Find( "NAME" );
+  Dali::Property::Value* pValue = map.Find("NAME");
 
-  DALI_TEST_CHECK( pValue );
+  DALI_TEST_CHECK(pValue);
 
-  pValue = map.Find( "IMAGE_PATH" );
+  pValue = map.Find("IMAGE_PATH");
 
-  DALI_TEST_CHECK( pValue );
+  DALI_TEST_CHECK(pValue);
 
-  Dali::Property::Value value = builder.GetConstant( "WIDTH" );
+  Dali::Property::Value value = builder.GetConstant("WIDTH");
 
-  DALI_TEST_CHECK( value.GetType() != Property::NONE );
+  DALI_TEST_CHECK(value.GetType() != Property::NONE);
 
-  builder.AddActors ( application.GetScene().GetRootLayer() );
-  DALI_TEST_CHECK( builder );
+  builder.AddActors(application.GetScene().GetRootLayer());
+  DALI_TEST_CHECK(builder);
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("image");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
   END_TEST;
 }
@@ -545,64 +533,63 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "\"constants\":"
-      "{"
-      "  \"SIZE\": [10,20,30]"
-      "},"
-      "\"styles\":\n"
-      "{\n"
-      "  \"imageStyle\": \n"
-      "  {\n"
-      "    \"color\": [1,0,0,1],\n"
-      "    \"actors\": {\n"
-      "      \"childImage\": {\n"
-      "        \"color\": \"34\"\n"
-      "      }\n"
-      "    }\n"
-      "  }\n"
-      "},\n"
-      "\"templates\":\n"
-      "{\n"
-      "  \"imageViewTemplate\": { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"styles\": [\"imageStyle\"]\n"
-      "  },\n"
-      "  \"imageTree\": { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"styles\": [\"imageStyle\"],\n"
-      "    \"name\": \"image\",\n"
-      "    \"size\": \"{SIZE}\",\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"quit\"\n"
-      "    }],\n"
-      "    \"actors\": [\n"
-      "      {\n"
-      "        \"type\":\"ImageView\",\n"
-      "        \"name\":\"childImage\", \n"
-      "        \"color\": \n"
-      "          {\n"
-      "            \"r\": 10,\n"
-      "            \"g\": 10,\n"
-      "            \"b\": 10,\n"
-      "            \"a\": 100\n"
-      "          }\n"
-      "      },\n"
-      "      {\n"
-      "        \"type\":\"imageViewTemplate\",\n"
-      "        \"name\":\"childImage2\"\n"
-      "      }\n"
-      "    ]\n"
-      "  }\n"
-      "},\n"
-      "\"stage\":"
-      "[{"
-      "  \"type\": \"imageTree\","
-      "  \"size\": [100,100,1]"
-      "}]"
-      "}\n"
-  );
+    "{\n"
+    "\"constants\":"
+    "{"
+    "  \"SIZE\": [10,20,30]"
+    "},"
+    "\"styles\":\n"
+    "{\n"
+    "  \"imageStyle\": \n"
+    "  {\n"
+    "    \"color\": [1,0,0,1],\n"
+    "    \"actors\": {\n"
+    "      \"childImage\": {\n"
+    "        \"color\": \"34\"\n"
+    "      }\n"
+    "    }\n"
+    "  }\n"
+    "},\n"
+    "\"templates\":\n"
+    "{\n"
+    "  \"imageViewTemplate\": { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"styles\": [\"imageStyle\"]\n"
+    "  },\n"
+    "  \"imageTree\": { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"styles\": [\"imageStyle\"],\n"
+    "    \"name\": \"image\",\n"
+    "    \"size\": \"{SIZE}\",\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"quit\"\n"
+    "    }],\n"
+    "    \"actors\": [\n"
+    "      {\n"
+    "        \"type\":\"ImageView\",\n"
+    "        \"name\":\"childImage\", \n"
+    "        \"color\": \n"
+    "          {\n"
+    "            \"r\": 10,\n"
+    "            \"g\": 10,\n"
+    "            \"b\": 10,\n"
+    "            \"a\": 100\n"
+    "          }\n"
+    "      },\n"
+    "      {\n"
+    "        \"type\":\"imageViewTemplate\",\n"
+    "        \"name\":\"childImage2\"\n"
+    "      }\n"
+    "    ]\n"
+    "  }\n"
+    "},\n"
+    "\"stage\":"
+    "[{"
+    "  \"type\": \"imageTree\","
+    "  \"size\": [100,100,1]"
+    "}]"
+    "}\n");
 
   std::string stylejson(
     "{\n"
@@ -612,8 +599,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "     \"color\": \"#344353\"\n"
     "   }\n"
     " }\n"
-    "}\n"
-    );
+    "}\n");
 
   std::string templatejson(
     "{ \n"
@@ -631,30 +617,28 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "      \"name\":\"childImage\" \n"
     "    }\n"
     "  ]\n"
-    "}\n"
-    );
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
-  ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) );
-  DALI_TEST_CHECK( actor );
+  ImageView actor = ImageView::DownCast(builder.Create("imageTree"));
+  DALI_TEST_CHECK(actor);
 
   Dali::Property::Map map;
-  map["SIZE"] = Vector3(100,100,1);
-  actor = ImageView::DownCast( builder.Create( "imageTree",  map ) );
-  DALI_TEST_CHECK( actor );
+  map["SIZE"] = Vector3(100, 100, 1);
+  actor       = ImageView::DownCast(builder.Create("imageTree", map));
+  DALI_TEST_CHECK(actor);
 
   // create from json snippet
-  actor = ImageView::DownCast( builder.CreateFromJson( templatejson ) );
-  DALI_TEST_CHECK( actor );
-
+  actor = ImageView::DownCast(builder.CreateFromJson(templatejson));
+  DALI_TEST_CHECK(actor);
 
   // NB: already applied in create
-  DALI_TEST_CHECK( builder.ApplyStyle( "imageStyle",  actor ) );
+  DALI_TEST_CHECK(builder.ApplyStyle("imageStyle", actor));
 
   // apply from json snippet
-  DALI_TEST_CHECK( builder.ApplyFromJson( actor, stylejson ) );
+  DALI_TEST_CHECK(builder.ApplyFromJson(actor, stylejson));
 
   END_TEST;
 }
@@ -665,49 +649,48 @@ int UtcDaliBuilderRenderTasksP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "\"renderTasks\":\n"
-      "{\n"
-      "  \"task0\": {\n"
-      "    \"sourceActor\": \"image\",\n"
-      "    \"cameraActor\": \"camera\" \n"
-      "  }\n"
-      "},\n"
-      "\"stage\":\n"
-      "[\n"
-      "  { \n"
-      "    \"type\": \"CameraActor\",\n"
-      "    \"name\": \"camera\"\n"
-      "  }, \n"
-      "  { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"name\": \"image\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"quit\"\n"
-      "    }],\n"
-      "    \"actors\": [\n"
-      "      {\n"
-      "        \"type\":\"ImageView\",\n"
-      "        \"name\":\"childImage\" \n"
-      "      }\n"
-      "    ]\n"
-      "  }\n"
-      "]\n"
-      "}\n"
-  );
+    "{\n"
+    "\"renderTasks\":\n"
+    "{\n"
+    "  \"task0\": {\n"
+    "    \"sourceActor\": \"image\",\n"
+    "    \"cameraActor\": \"camera\" \n"
+    "  }\n"
+    "},\n"
+    "\"stage\":\n"
+    "[\n"
+    "  { \n"
+    "    \"type\": \"CameraActor\",\n"
+    "    \"name\": \"camera\"\n"
+    "  }, \n"
+    "  { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"name\": \"image\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"quit\"\n"
+    "    }],\n"
+    "    \"actors\": [\n"
+    "      {\n"
+    "        \"type\":\"ImageView\",\n"
+    "        \"name\":\"childImage\" \n"
+    "      }\n"
+    "    ]\n"
+    "  }\n"
+    "]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
   unsigned int count = application.GetScene().GetRenderTaskList().GetTaskCount();
 
   // coverage
-  builder.CreateRenderTask( "task0" );
+  builder.CreateRenderTask("task0");
 
-  DALI_TEST_CHECK( count <
-                   application.GetScene().GetRenderTaskList().GetTaskCount() );
+  DALI_TEST_CHECK(count <
+                  application.GetScene().GetRenderTaskList().GetTaskCount());
 
   END_TEST;
 }
@@ -718,31 +701,30 @@ int UtcDaliBuilderChildActionP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"hide\",\n"
-      "      \"actor\": \"actor\",\n"
-      "      \"childActor\": \"subActor\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"hide\",\n"
+    "      \"actor\": \"actor\",\n"
+    "      \"childActor\": \"subActor\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -750,20 +732,20 @@ int UtcDaliBuilderChildActionP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(!actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -774,32 +756,31 @@ int UtcDaliBuilderSetPropertyActionP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"set\",\n"
-      "      \"actor\": \"subActor\",\n"
-      "      \"property\": \"visible\",\n"
-      "      \"value\": false\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"set\",\n"
+    "      \"actor\": \"subActor\",\n"
+    "      \"property\": \"visible\",\n"
+    "      \"value\": false\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -807,20 +788,20 @@ int UtcDaliBuilderSetPropertyActionP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(!actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -831,29 +812,28 @@ int UtcDaliBuilderGenericActionP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"hide\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"hide\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -861,20 +841,20 @@ int UtcDaliBuilderGenericActionP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("actor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(!actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -885,60 +865,59 @@ int UtcDaliBuilderPropertyNotificationP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"hide\"\n"
-      "    }],\n"
-      "    \"notifications\": [{\n"
-      "      \"property\": \"visible\",\n"
-      "      \"condition\": \"False\",\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionX\",\n"
-      "      \"condition\": \"LessThan\",\n"
-      "      \"arg0\": 0.0,\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionY\",\n"
-      "      \"condition\": \"GreaterThan\",\n"
-      "      \"arg0\": 200.0,\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionZ\",\n"
-      "      \"condition\": \"Inside\",\n"
-      "      \"arg0\": 0.0,\n"
-      "      \"arg1\": 10.0,\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionZ\",\n"
-      "      \"condition\": \"Outside\",\n"
-      "      \"arg0\": 40.0,\n"
-      "      \"arg1\": 50.0,\n"
-      "      \"action\": \"show\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"hide\"\n"
+    "    }],\n"
+    "    \"notifications\": [{\n"
+    "      \"property\": \"visible\",\n"
+    "      \"condition\": \"False\",\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionX\",\n"
+    "      \"condition\": \"LessThan\",\n"
+    "      \"arg0\": 0.0,\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionY\",\n"
+    "      \"condition\": \"GreaterThan\",\n"
+    "      \"arg0\": 200.0,\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionZ\",\n"
+    "      \"condition\": \"Inside\",\n"
+    "      \"arg0\": 0.0,\n"
+    "      \"arg1\": 10.0,\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionZ\",\n"
+    "      \"condition\": \"Outside\",\n"
+    "      \"arg0\": 40.0,\n"
+    "      \"arg1\": 50.0,\n"
+    "      \"action\": \"show\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -946,11 +925,11 @@ int UtcDaliBuilderPropertyNotificationP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
@@ -961,9 +940,9 @@ int UtcDaliBuilderPropertyNotificationP(void)
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("actor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -974,86 +953,82 @@ int UtcDaliBuilderPropertyNotificationN(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"notifications\": [{\n"
-      "      \"property\": \"visible\",\n"
-      "      \"condition\": \"ErrorCondition\",\n"
-      "      \"action\": \"show\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"notifications\": [{\n"
+    "      \"property\": \"visible\",\n"
+    "      \"condition\": \"ErrorCondition\",\n"
+    "      \"action\": \"show\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   try
   {
     Builder builder = Builder::New();
-    builder.LoadFromString( json );
-    builder.AddActors ( application.GetScene().GetRootLayer() );
-    DALI_TEST_CHECK( false );
+    builder.LoadFromString(json);
+    builder.AddActors(application.GetScene().GetRootLayer());
+    DALI_TEST_CHECK(false);
   }
   catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
 }
 
-
-
 int UtcDaliBuilderCustomPropertyP(void)
 {
   ToolkitTestApplication application;
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "\"templates\":\n"
-      "{\n"
-      "  \"imageTree\": { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"name\": \"image\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"quit\"\n"
-      "    }],\n"
-      "    \"properties\": {\n"
-      "      \"newproperty\": true\n"
-      "    },\n"
-      "    \"animatableProperties\": {\n"
-      "      \"newAnimatableproperty\": 3\n"
-      "    },\n"
-      "    \"actors\": [\n"
-      "      {\n"
-      "        \"type\":\"ImageView\",\n"
-      "        \"name\":\"childImage\" \n"
-      "      }\n"
-      "    ]\n"
-      "  }\n"
-      "}\n"
-      "}\n"
-  );
+    "{\n"
+    "\"templates\":\n"
+    "{\n"
+    "  \"imageTree\": { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"name\": \"image\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"quit\"\n"
+    "    }],\n"
+    "    \"properties\": {\n"
+    "      \"newproperty\": true\n"
+    "    },\n"
+    "    \"animatableProperties\": {\n"
+    "      \"newAnimatableproperty\": 3\n"
+    "    },\n"
+    "    \"actors\": [\n"
+    "      {\n"
+    "        \"type\":\"ImageView\",\n"
+    "        \"name\":\"childImage\" \n"
+    "      }\n"
+    "    ]\n"
+    "  }\n"
+    "}\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
-  ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) );
-  DALI_TEST_CHECK( actor );
+  ImageView actor = ImageView::DownCast(builder.Create("imageTree"));
+  DALI_TEST_CHECK(actor);
 
   // NB: already applied in create
   Property::Index index = actor.GetPropertyIndex("newproperty");
-  DALI_TEST_CHECK( Property::INVALID_INDEX != index );
+  DALI_TEST_CHECK(Property::INVALID_INDEX != index);
   Property::Value value = actor.GetProperty(index);
-  DALI_TEST_CHECK( value.Get<bool>() == true );
+  DALI_TEST_CHECK(value.Get<bool>() == true);
 
   index = actor.GetPropertyIndex("newAnimatableproperty");
-  DALI_TEST_CHECK( Property::INVALID_INDEX != index );
+  DALI_TEST_CHECK(Property::INVALID_INDEX != index);
   value = actor.GetProperty(index);
-  DALI_TEST_CHECK( value.Get<int>() == 3 );
+  DALI_TEST_CHECK(value.Get<int>() == 3);
 
   END_TEST;
 }
@@ -1120,9 +1095,9 @@ int UtcDaliBuilderCustomShaderP(void)
   );
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
-  builder.AddActors ( "stage", application.GetScene().GetRootLayer() );
+  builder.AddActors("stage", application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -1131,94 +1106,90 @@ int UtcDaliBuilderCustomShaderP(void)
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("Image1");
 
   // coverage
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
   END_TEST;
 }
 
-
 int UtcDaliBuilderLoadFromStringN(void)
 {
   ToolkitTestApplication application;
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "asdfsadf dsf asdf asdf {"
-         "\"stage\":"
-         "[{"
-           "\"type\": \"Actor\","
-           "\"size\": [100,100,1],"
-           "\"parentOrigin\": \"TOP_LEFT\","
-           "\"anchorPoint\": \"TOP_LEFT\","
-           "\"signals\": [{"
-             "\"name\": \"touched\","
-             "\"action\": \"quit\""
-           "}]"
-         "}]"
-      "}"
-  );
+    "asdfsadf dsf asdf asdf {"
+    "\"stage\":"
+    "[{"
+    "\"type\": \"Actor\","
+    "\"size\": [100,100,1],"
+    "\"parentOrigin\": \"TOP_LEFT\","
+    "\"anchorPoint\": \"TOP_LEFT\","
+    "\"signals\": [{"
+    "\"name\": \"touched\","
+    "\"action\": \"quit\""
+    "}]"
+    "}]"
+    "}");
   Builder builder = Builder::New();
 
   bool assert1 = false;
 
   try
   {
-    builder.LoadFromString( json );
+    builder.LoadFromString(json);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "!\"Cannot parse JSON\"", TEST_LOCATION);
     assert1 = true;
   }
 
-  DALI_TEST_CHECK( assert1 );
+  DALI_TEST_CHECK(assert1);
 
   END_TEST;
 }
 
-
 int UtcDaliBuilderAddActorsP(void)
 {
   ToolkitTestApplication application;
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"arbitarysection\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\",\n"
-      "      \"visible\": false\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"hide\",\n"
-      "      \"actor\": \"actor\",\n"
-      "      \"childActor\": \"subActor\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"arbitarysection\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\",\n"
+    "      \"visible\": false\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"hide\",\n"
+    "      \"actor\": \"actor\",\n"
+    "      \"childActor\": \"subActor\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( "arbitarysection", application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors("arbitarysection", application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(!actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -1386,68 +1357,67 @@ int UtcDaliBuilderPathConstraintsP(void)
   Builder builder = Builder::New();
 
   // frame buffer coverage
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Dali::Path path =  builder.GetPath( "path0" );
-  DALI_TEST_CHECK( path );
+  Dali::Path path = builder.GetPath("path0");
+  DALI_TEST_CHECK(path);
 
-  Dali::Path path2 =  builder.GetPath( "path0" );
-  DALI_TEST_CHECK( path2 );
-  DALI_TEST_CHECK( path == path2 );
+  Dali::Path path2 = builder.GetPath("path0");
+  DALI_TEST_CHECK(path2);
+  DALI_TEST_CHECK(path == path2);
 
-  Dali::PathConstrainer constrainer0 = builder.GetPathConstrainer( "constrainer0" );
-  DALI_TEST_CHECK( constrainer0 );
+  Dali::PathConstrainer constrainer0 = builder.GetPathConstrainer("constrainer0");
+  DALI_TEST_CHECK(constrainer0);
 
-  Dali::PathConstrainer constrainer0_2 = builder.GetPathConstrainer( "constrainer0" );
-  DALI_TEST_CHECK( constrainer0_2 );
-  DALI_TEST_CHECK( constrainer0 == constrainer0_2 );
+  Dali::PathConstrainer constrainer0_2 = builder.GetPathConstrainer("constrainer0");
+  DALI_TEST_CHECK(constrainer0_2);
+  DALI_TEST_CHECK(constrainer0 == constrainer0_2);
 
-  Dali::LinearConstrainer constrainer1 = builder.GetLinearConstrainer( "constrainer1" );
-  DALI_TEST_CHECK( constrainer1 );
+  Dali::LinearConstrainer constrainer1 = builder.GetLinearConstrainer("constrainer1");
+  DALI_TEST_CHECK(constrainer1);
 
-  Dali::LinearConstrainer constrainer1_2 = builder.GetLinearConstrainer( "constrainer1" );
-  DALI_TEST_CHECK( constrainer1 == constrainer1_2 );
+  Dali::LinearConstrainer constrainer1_2 = builder.GetLinearConstrainer("constrainer1");
+  DALI_TEST_CHECK(constrainer1 == constrainer1_2);
 
   // For coverage
 
   Actor actor = Actor::New();
-  application.GetScene().Add( actor );
-  builder.AddActors( actor );
+  application.GetScene().Add(actor);
+  builder.AddActors(actor);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  actor.GetChildAt( 0 ).Unparent();
+  actor.GetChildAt(0).Unparent();
 
   END_TEST;
 }
 
-#define CHECK_MAP_ELEMENT( xMap, xKey, xType, xPropType, xExpected, xLocation ) \
-  {                                                                       \
-    Property::Value* value = xMap->Find( xKey );                          \
-    DALI_TEST_EQUALS( value==NULL, false, xLocation);                     \
-    if( value != NULL )                                                   \
-    {                                                                     \
-      DALI_TEST_EQUALS( value->GetType(), xPropType, xLocation );         \
-      xType result;                                                       \
-      value->Get(result);                                                 \
-      DALI_TEST_EQUALS( result, xExpected, TEST_LOCATION );               \
-      std::ostringstream oss;                                             \
-      oss << "Animation element " << xKey << "= " << result << std::endl; \
-      tet_printf( oss.str().c_str() );                                    \
-    }                                                                     \
-    else                                                                  \
-    {                                                                     \
-      tet_printf("Can't find map element " xKey "\n");                    \
-    }                                                                     \
+#define CHECK_MAP_ELEMENT(xMap, xKey, xType, xPropType, xExpected, xLocation) \
+  {                                                                           \
+    Property::Value* value = xMap->Find(xKey);                                \
+    DALI_TEST_EQUALS(value == NULL, false, xLocation);                        \
+    if(value != NULL)                                                         \
+    {                                                                         \
+      DALI_TEST_EQUALS(value->GetType(), xPropType, xLocation);               \
+      xType result;                                                           \
+      value->Get(result);                                                     \
+      DALI_TEST_EQUALS(result, xExpected, TEST_LOCATION);                     \
+      std::ostringstream oss;                                                 \
+      oss << "Animation element " << xKey << "= " << result << std::endl;     \
+      tet_printf(oss.str().c_str());                                          \
+    }                                                                         \
+    else                                                                      \
+    {                                                                         \
+      tet_printf("Can't find map element " xKey "\n");                        \
+    }                                                                         \
   }
 
-
 int UtcDaliBuilderMapping01(void)
 {
   ToolkitTestApplication application;
@@ -1518,25 +1488,25 @@ int UtcDaliBuilderMapping01(void)
     "}\n";
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
   Test::TestButton testButton = Test::TestButton::New();
-  application.GetScene().Add( testButton );
+  application.GetScene().Add(testButton);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( builder.ApplyStyle( "testbutton", testButton ) );
+  DALI_TEST_CHECK(builder.ApplyStyle("testbutton", testButton));
 
   // Now check that it has loaded the transition correctly:
   Property::Value transition = testButton.GetProperty(Test::TestButton::Property::PRESS_TRANSITION);
-  DALI_TEST_EQUALS( transition.GetType(), Property::ARRAY, TEST_LOCATION );
+  DALI_TEST_EQUALS(transition.GetType(), Property::ARRAY, TEST_LOCATION);
   Property::Array* array = transition.GetArray();
 
-  DALI_TEST_EQUALS( array->Size(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(array->Size(), 1, TEST_LOCATION);
   Property::Value element = array->GetElementAt(0);
-  DALI_TEST_CHECK( element.GetType() == Property::MAP );
+  DALI_TEST_CHECK(element.GetType() == Property::MAP);
   Property::Map* map = element.GetMap();
 
   CHECK_MAP_ELEMENT(map, "target", std::string, Property::STRING, "unselectedBackgroundRenderer", TEST_LOCATION);
@@ -1548,7 +1518,6 @@ int UtcDaliBuilderMapping01(void)
   END_TEST;
 }
 
-
 int UtcDaliBuilderMappingCycleCheck(void)
 {
   ToolkitTestApplication application;
@@ -1590,25 +1559,25 @@ int UtcDaliBuilderMappingCycleCheck(void)
     "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
   Test::TestButton testButton = Test::TestButton::New();
-  application.GetScene().Add( testButton );
+  application.GetScene().Add(testButton);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( builder.ApplyStyle( "testbutton", testButton ) );
+  DALI_TEST_CHECK(builder.ApplyStyle("testbutton", testButton));
 
   // Now check that it has loaded the transition correctly:
   Property::Value transition = testButton.GetProperty(Test::TestButton::Property::PRESS_TRANSITION);
-  DALI_TEST_EQUALS( transition.GetType(), Property::ARRAY, TEST_LOCATION );
+  DALI_TEST_EQUALS(transition.GetType(), Property::ARRAY, TEST_LOCATION);
   Property::Array* array = transition.GetArray();
 
-  DALI_TEST_EQUALS( array->Size(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(array->Size(), 1, TEST_LOCATION);
   Property::Value element = array->GetElementAt(0);
-  DALI_TEST_CHECK( element.GetType() == Property::MAP );
+  DALI_TEST_CHECK(element.GetType() == Property::MAP);
   Property::Map* map = element.GetMap();
 
   CHECK_MAP_ELEMENT(map, "target", std::string, Property::STRING, "", TEST_LOCATION);
@@ -1624,37 +1593,36 @@ int UtcDaliBuilderTypeCasts(void)
 
   std::string json(
     "{"
-       "\"stage\":"
-       "[{"
-         "\"type\": \"Layer\","
-         "\"maximumSize\": { \"typeCast\":\"vector2\", \"value\":[100,15] },"
-         "\"position\":    { \"typeCast\":\"vector3\", \"value\":[100,10,1] },"
-         "\"color\":       { \"typeCast\":\"vector4\", \"value\":[0.5,0.5,0.5,1] },"
-         "\"sensitive\":   { \"typeCast\":\"boolean\", \"value\":false },"
-         "\"orientation\": { \"typeCast\":\"rotation\", \"value\":[10,10,10,10] },"
-         "\"colorMode\":   { \"typeCast\":\"string\", \"value\":\"USE_OWN_MULTIPLY_PARENT_COLOR\" },"
-         "\"clippingBox\": { \"typeCast\":\"rect\", \"value\":[10,10,10,10] },"
-         "\"padding\":     { \"typeCast\":\"extents\", \"value\":[10,10,10,10] }"
-      "}]"
-    "}"
-  );
+    "\"stage\":"
+    "[{"
+    "\"type\": \"Layer\","
+    "\"maximumSize\": { \"typeCast\":\"vector2\", \"value\":[100,15] },"
+    "\"position\":    { \"typeCast\":\"vector3\", \"value\":[100,10,1] },"
+    "\"color\":       { \"typeCast\":\"vector4\", \"value\":[0.5,0.5,0.5,1] },"
+    "\"sensitive\":   { \"typeCast\":\"boolean\", \"value\":false },"
+    "\"orientation\": { \"typeCast\":\"rotation\", \"value\":[10,10,10,10] },"
+    "\"colorMode\":   { \"typeCast\":\"string\", \"value\":\"USE_OWN_MULTIPLY_PARENT_COLOR\" },"
+    "\"clippingBox\": { \"typeCast\":\"rect\", \"value\":[10,10,10,10] },"
+    "\"padding\":     { \"typeCast\":\"extents\", \"value\":[10,10,10,10] }"
+    "}]"
+    "}");
 
   Actor rootActor = Actor::New();
-  application.GetScene().Add( rootActor );
+  application.GetScene().Add(rootActor);
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( rootActor );
+  builder.LoadFromString(json);
+  builder.AddActors(rootActor);
 
   application.SendNotification();
   application.Render();
 
-  Actor createdActor = rootActor.GetChildAt( 0 );
-  DALI_TEST_EQUALS( createdActor.GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ), Vector2(100.0f,15.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100.0f,10.0f,1.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Vector4(0.5f,0.5f,0.5f,1.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.GetProperty< bool >( Actor::Property::SENSITIVE ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.GetProperty< ColorMode >( Actor::Property::COLOR_MODE ), USE_OWN_MULTIPLY_PARENT_COLOR, TEST_LOCATION );
+  Actor createdActor = rootActor.GetChildAt(0);
+  DALI_TEST_EQUALS(createdActor.GetProperty<Vector2>(Actor::Property::MAXIMUM_SIZE), Vector2(100.0f, 15.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(createdActor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(100.0f, 10.0f, 1.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(createdActor.GetCurrentProperty<Vector4>(Actor::Property::COLOR), Vector4(0.5f, 0.5f, 0.5f, 1.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(createdActor.GetProperty<bool>(Actor::Property::SENSITIVE), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(createdActor.GetProperty<ColorMode>(Actor::Property::COLOR_MODE), USE_OWN_MULTIPLY_PARENT_COLOR, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1665,28 +1633,27 @@ int UtcDaliBuilderBuilderControl(void)
 
   std::string json(
     "{"
-       "\"stage\":"
-       "[{"
-         "\"type\": \"BuilderControl\","
-         "\"integerProperty\": 10,"
-         "\"matrix3Property\": [ 1,2,3,4,5,6,7,8,9 ],"
-         "\"matrixProperty\":  [ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 ],"
-         "\"noneProperty\": 10"
-      "}]"
-    "}"
-  );
+    "\"stage\":"
+    "[{"
+    "\"type\": \"BuilderControl\","
+    "\"integerProperty\": 10,"
+    "\"matrix3Property\": [ 1,2,3,4,5,6,7,8,9 ],"
+    "\"matrixProperty\":  [ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 ],"
+    "\"noneProperty\": 10"
+    "}]"
+    "}");
 
   Actor rootActor = Actor::New();
-  application.GetScene().Add( rootActor );
+  application.GetScene().Add(rootActor);
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( rootActor );
+  builder.LoadFromString(json);
+  builder.AddActors(rootActor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( BuilderControlProperty::gSetPropertyCalledCount, 4, TEST_LOCATION );
+  DALI_TEST_EQUALS(BuilderControlProperty::gSetPropertyCalledCount, 4, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1697,32 +1664,31 @@ int UtcDaliBuilderCustomControl(void)
 
   std::string json(
     "{"
-       "\"stage\":"
-       "[{"
-         "\"type\": \"DummyControl\","
-         "\"name\": \"I can haz custom Control\""
-      "}]"
-    "}"
-  );
+    "\"stage\":"
+    "[{"
+    "\"type\": \"DummyControl\","
+    "\"name\": \"I can haz custom Control\""
+    "}]"
+    "}");
 
   Actor rootActor = Actor::New();
-  application.GetScene().Add( rootActor );
+  application.GetScene().Add(rootActor);
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( rootActor );
+  builder.LoadFromString(json);
+  builder.AddActors(rootActor);
 
   application.SendNotification();
   application.Render();
 
-  Actor customControl = rootActor.FindChildByName( "I can haz custom Control" );
+  Actor customControl = rootActor.FindChildByName("I can haz custom Control");
 
   // Test that we have the correct type of custom control
-  DummyControl dummyControl = DummyControl::DownCast( customControl );
-  DALI_TEST_CHECK( dummyControl );
-  if( dummyControl )
+  DummyControl dummyControl = DummyControl::DownCast(customControl);
+  DALI_TEST_CHECK(dummyControl);
+  if(dummyControl)
   {
-    DALI_TEST_CHECK( typeid(dummyControl.GetImplementation()) == typeid(DummyControlImpl) );
+    DALI_TEST_CHECK(typeid(dummyControl.GetImplementation()) == typeid(DummyControlImpl));
   }
 
   END_TEST;
@@ -1734,33 +1700,32 @@ int UtcDaliBuilderActionsWithParams(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "\"stage\":\n"
-      "[\n"
-      "  { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"name\": \"image\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"show\",\n"
-      "      \"parameters\": {\n"
-      "        \"property1\" : 10,\n"
-      "        \"property2\" : [1,2],\n"
-      "        \"property3\" : [1,2,3],\n"
-      "        \"property4\" : [1,2,3,4]\n"
-      "      }\n"
-      "    }]\n"
-      "  }\n"
-      "]\n"
-      "}\n"
-  );
+    "{\n"
+    "\"stage\":\n"
+    "[\n"
+    "  { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"name\": \"image\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"show\",\n"
+    "      \"parameters\": {\n"
+    "        \"property1\" : 10,\n"
+    "        \"property2\" : [1,2],\n"
+    "        \"property3\" : [1,2,3],\n"
+    "        \"property4\" : [1,2,3,4]\n"
+    "      }\n"
+    "    }]\n"
+    "  }\n"
+    "]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
-  DALI_TEST_CHECK( true ); // For Coverage
+  DALI_TEST_CHECK(true); // For Coverage
 
   END_TEST;
 }
@@ -1771,47 +1736,107 @@ int UtcDaliBuilderConfigurationP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"config\":\n"
-      "  {\n"
-      "    \"alwaysShowFocus\":true\n"
-      "  }\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"config\":\n"
+    "  {\n"
+    "    \"alwaysShowFocus\":true\n"
+    "  }\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
   Property::Map map = builder.GetConfigurations();
 
-  Dali::Property::Value* pValue = map.Find( "alwaysShowFocus" );
+  Dali::Property::Value* pValue = map.Find("alwaysShowFocus");
 
-  DALI_TEST_CHECK( pValue );
+  DALI_TEST_CHECK(pValue);
 
   bool value = pValue->Get<bool>();
 
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
 
-
 int UtcDaliBase64EncodingP(void)
 {
-  std::vector<uint32_t> data = { 0, 1, 2, 3, 4, 5, std::numeric_limits<uint32_t>::min(), std::numeric_limits<uint32_t>::max()  };
+  std::vector<uint32_t> data = {0, 1, 2, 3, 4, 5, std::numeric_limits<uint32_t>::min(), std::numeric_limits<uint32_t>::max()};
 
   Property::Value value;
-  EncodeBase64PropertyData( value, data );
+  EncodeBase64PropertyData(value, data);
 
   std::cout << "Max uint32_t:" << std::numeric_limits<uint32_t>::max() << std::endl;
   std::cout << "Input data:  ";
-  std::ostream_iterator<uint32_t> out_it (std::cout,", ");
-  std::copy ( data.begin(), data.end(), out_it );
+  std::ostream_iterator<uint32_t> out_it(std::cout, ", ");
+  std::copy(data.begin(), data.end(), out_it);
+  std::cout << std::endl;
+
+  std::string output;
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, "AAAAAAEAAAACAAAAAwAAAAQAAAAFAAAAAAAAAP////8=", TEST_LOCATION);
+
+  std::cout << "Output data:  " << output << std::endl;
+
+  END_TEST;
+}
+
+int UtcDaliBase64EncodingP2(void)
+{
+  std::vector<uint8_t> data = {0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0, 5, 0, 0, 0, std::numeric_limits<uint8_t>::min(), std::numeric_limits<uint8_t>::min(), std::numeric_limits<uint8_t>::min(), std::numeric_limits<uint8_t>::min(), std::numeric_limits<uint8_t>::max(), std::numeric_limits<uint8_t>::max(), std::numeric_limits<uint8_t>::max(), std::numeric_limits<uint8_t>::max()};
+
+  Property::Value value;
+  EncodeBase64PropertyData(value, data);
+
+  std::cout << "Input data:  ";
+  std::ostream_iterator<uint32_t> out_it(std::cout, ", ");
+  std::copy(data.begin(), data.end(), out_it);
   std::cout << std::endl;
 
   std::string output;
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, "AAAAAAEAAAACAAAAAwAAAAQAAAAFAAAAAAAAAP////8", TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, "AAAAAAEAAAACAAAAAwAAAAQAAAAFAAAAAAAAAP////8=", TEST_LOCATION);
+
+  std::cout << "Output data:  " << output << std::endl;
+
+  END_TEST;
+}
+
+int UtcDaliBase64EncodingP3(void)
+{
+  std::string originalData = "Something Longer than 64 ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/==  length is 106";
+  originalData.push_back(-4);
+  originalData.push_back(-7); // some kind of non-ascii.
+  originalData.push_back(0);
+  originalData.push_back(0);
+  originalData.push_back(2);
+  originalData.push_back(2);
+  originalData.push_back(2);
+
+  std::vector<uint8_t> data(originalData.begin(), originalData.end());
+
+  Dali::Property::Value value;
+  EncodeBase64PropertyData(value, data);
+
+  std::cout << "Input data:  ";
+  std::ostream_iterator<uint8_t> out_it(std::cout, ", ");
+  std::copy(data.begin(), data.end(), out_it);
+  std::cout << std::endl;
+
+  std::string           output;
+  Dali::Property::Array array;
+  DALI_TEST_CHECK(value.GetArray());
+  array = *value.GetArray();
+  DALI_TEST_EQUALS(array.Count(), 3, TEST_LOCATION);
+  DALI_TEST_CHECK(array[0].Get(output));
+  std::cout << "first string :  " << output << std::endl;
+  DALI_TEST_EQUALS(output, "U29tZXRoaW5nIExvbmdlciB0aGFuIDY0IEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZX", TEST_LOCATION);
+  DALI_TEST_CHECK(array[1].Get(output));
+  std::cout << "second string : " << output << std::endl;
+  DALI_TEST_EQUALS(output, "WFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5Ky89PSAgbGVu", TEST_LOCATION);
+  DALI_TEST_CHECK(array[2].Get(output));
+  std::cout << "third string : " << output << std::endl;
+  DALI_TEST_EQUALS(output, "Z3RoIGlzIDEwNvz5AAACAgI=", TEST_LOCATION);
 
   std::cout << "Output data:  " << output << std::endl;
 
@@ -1820,205 +1845,210 @@ int UtcDaliBase64EncodingP(void)
 
 int UtcDaliBase64EncodingN(void)
 {
-  tet_infoline( "Test encoding an empty vector returns empty string" );
+  tet_infoline("Test encoding an empty vector returns empty string");
   std::vector<uint32_t> data;
 
   Property::Value value;
-  EncodeBase64PropertyData( value, data );
+  EncodeBase64PropertyData(value, data);
 
   std::string output;
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output.empty(), true, TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output.empty(), true, TEST_LOCATION);
+
+  std::vector<uint8_t> data2;
+  EncodeBase64PropertyData(value, data2);
+
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output.empty(), true, TEST_LOCATION);
 
   END_TEST;
 }
 
-template <typename T>
-int b64l(std::vector<T>&data)
+template<typename T>
+int b64l(std::vector<T>& data)
 {
-  auto lengthInBytes = 4*data.size();
-  return ceil( lengthInBytes * 1.33333f );
+  auto lengthInBytes = sizeof(T) * data.size();
+  // base64 encode each 3-byte as 4-byte.
+  // return ceil(lengthInBytes / 3) * 4
+  return (lengthInBytes + 2) / 3 * 4;
 }
 
 int UtcDaliBase64EncodingP02(void)
 {
-  tet_infoline( "Test encoding vectors of lengths m .. m+4 encode and decode back to the same length vectors" );
+  tet_infoline("Test encoding vectors of lengths m .. m+4 encode and decode back to the same length vectors");
 
   std::vector<uint32_t> testData;
-  for(int i=0; i<8; ++i ) // 8 chosen to stay within single string output
+  for(int i = 0; i < 8; ++i) // 8 chosen to stay within single string output
   {
     testData.push_back(i);
   }
   Property::Value value;
-  EncodeBase64PropertyData( value, testData );
+  EncodeBase64PropertyData(value, testData);
 
   std::string output;
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output.empty(), false, TEST_LOCATION);
-  DALI_TEST_EQUALS( output.length(), b64l(testData), TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output.empty(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(output.length(), b64l(testData), TEST_LOCATION);
 
   std::vector<uint32_t> outData;
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
-  DALI_TEST_EQUALS( std::equal( testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION );
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(std::equal(testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION);
 
   // n+1
-  testData.push_back( 12345 );
-  EncodeBase64PropertyData( value, testData );
+  testData.push_back(12345);
+  EncodeBase64PropertyData(value, testData);
 
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output.empty(), false, TEST_LOCATION);
-  DALI_TEST_EQUALS( output.length(), b64l(testData), TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output.empty(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(output.length(), b64l(testData), TEST_LOCATION);
 
   outData.clear();
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
-  DALI_TEST_EQUALS( std::equal( testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION );
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(std::equal(testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION);
 
   // n+2
-  testData.push_back( 67890 );
-  EncodeBase64PropertyData( value, testData );
+  testData.push_back(67890);
+  EncodeBase64PropertyData(value, testData);
 
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output.empty(), false, TEST_LOCATION);
-  DALI_TEST_EQUALS( output.length(), b64l(testData), TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output.empty(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(output.length(), b64l(testData), TEST_LOCATION);
 
   outData.clear();
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
-  DALI_TEST_EQUALS( std::equal( testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION );
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(std::equal(testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION);
 
   // n+3
-  testData.push_back( -1 );
-  EncodeBase64PropertyData( value, testData );
+  testData.push_back(-1);
+  EncodeBase64PropertyData(value, testData);
 
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output.empty(), false, TEST_LOCATION);
-  DALI_TEST_EQUALS( output.length(), b64l(testData), TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output.empty(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(output.length(), b64l(testData), TEST_LOCATION);
 
   outData.clear();
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
-  DALI_TEST_EQUALS( std::equal( testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION );
-
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(std::equal(testData.begin(), testData.end(), outData.begin()), true, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliBase64EncodingP03(void)
 {
-  tet_infoline( "Test encoding a vector of length 12 has output within single string" );
+  tet_infoline("Test encoding a vector of length 12 has output within single string");
 
   std::vector<uint32_t> testData;
-  for(int i=0; i<12; ++i )
+  for(int i = 0; i < 12; ++i)
   {
     testData.push_back(i);
   }
   Property::Value value;
-  EncodeBase64PropertyData( value, testData );
+  EncodeBase64PropertyData(value, testData);
 
   std::string output;
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output.empty(), false, TEST_LOCATION);
-  DALI_TEST_EQUALS( output.length(), b64l(testData), TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output.empty(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(output.length(), b64l(testData), TEST_LOCATION);
 
   std::vector<uint32_t> outData;
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliBase64EncodingP04(void)
 {
-  tet_infoline( "Test encoding a vector of length 13 has output split over 2 strings" );
+  tet_infoline("Test encoding a vector of length 13 has output split over 2 strings");
 
   std::vector<uint32_t> testData;
-  for(int i=0; i<13; ++i )
+  for(int i = 0; i < 13; ++i)
   {
     testData.push_back(i);
   }
   Property::Value value;
-  EncodeBase64PropertyData( value, testData );
+  EncodeBase64PropertyData(value, testData);
 
   auto array = value.GetArray();
-  DALI_TEST_CHECK( array );
+  DALI_TEST_CHECK(array);
 
-  DALI_TEST_EQUALS( array->Count(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(array->Count(), 2, TEST_LOCATION);
 
   std::vector<uint32_t> outData;
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliBase64EncodingP05(void)
 {
-  tet_infoline( "Test encoding a vector of length 24 has output split over 2 strings" );
+  tet_infoline("Test encoding a vector of length 24 has output split over 2 strings");
 
   std::vector<uint32_t> testData;
-  for(int i=0; i<24; ++i )
+  for(int i = 0; i < 24; ++i)
   {
     testData.push_back(i);
   }
   Property::Value value;
-  EncodeBase64PropertyData( value, testData );
+  EncodeBase64PropertyData(value, testData);
 
   auto array = value.GetArray();
-  DALI_TEST_CHECK( array );
+  DALI_TEST_CHECK(array);
 
-  DALI_TEST_EQUALS( array->Count(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(array->Count(), 2, TEST_LOCATION);
 
   std::vector<uint32_t> outData;
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliBase64EncodingP06(void)
 {
-  tet_infoline( "Test encoding a vector of arbitrary length decodes OK." );
+  tet_infoline("Test encoding a vector of arbitrary length decodes OK.");
 
   std::vector<uint32_t> testData;
-  for(int i=0; i<97; ++i )
+  for(int i = 0; i < 97; ++i)
   {
     testData.push_back(i);
   }
   Property::Value value;
-  EncodeBase64PropertyData( value, testData );
+  EncodeBase64PropertyData(value, testData);
 
   auto array = value.GetArray();
-  DALI_TEST_CHECK( array );
+  DALI_TEST_CHECK(array);
 
   std::vector<uint32_t> outData;
-  DecodeBase64PropertyData( value, outData );
-  DALI_TEST_EQUALS( testData.size(), outData.size(), TEST_LOCATION );
+  DecodeBase64PropertyData(value, outData);
+  DALI_TEST_EQUALS(testData.size(), outData.size(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliBase64DecodingN01(void)
 {
-  tet_infoline( "Test decoding empty string results in empty data" );
+  tet_infoline("Test decoding empty string results in empty data");
 
-  Property::Value value("");
+  Property::Value       value("");
   std::vector<uint32_t> outputData;
-  DecodeBase64PropertyData( value, outputData);
-  DALI_TEST_EQUALS( outputData.size(), 0, TEST_LOCATION );
+  DecodeBase64PropertyData(value, outputData);
+  DALI_TEST_EQUALS(outputData.size(), 0, TEST_LOCATION);
+
+  std::vector<uint8_t> outputData2;
+  DecodeBase64PropertyData(value, outputData2);
+  DALI_TEST_EQUALS(outputData2.size(), 0, TEST_LOCATION);
   END_TEST;
 }
 
-
 int UtcDaliBase64DecodingN02(void)
 {
-  tet_infoline( "Test decoding array with non-string values results in empty data" );
+  tet_infoline("Test decoding array with non-string values results in empty data");
 
   Property::Array array;
   array.Resize(2);
@@ -2027,23 +2057,56 @@ int UtcDaliBase64DecodingN02(void)
   Property::Value value(array);
 
   std::vector<uint32_t> outputData;
-  DecodeBase64PropertyData( value, outputData);
-  DALI_TEST_EQUALS( outputData.size(), 0, TEST_LOCATION );
+  DecodeBase64PropertyData(value, outputData);
+  DALI_TEST_EQUALS(outputData.size(), 0, TEST_LOCATION);
+
+  std::vector<uint8_t> outputData2;
+  DecodeBase64PropertyData(value, outputData2);
+  DALI_TEST_EQUALS(outputData2.size(), 0, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliBase64DecodingP01(void)
 {
-  tet_infoline( "Test decoding string of known data gives expected result");
+  tet_infoline("Test decoding string of known data gives expected result");
 
-  std::string testInput("//////7+/v4DAgEA");
-  std::vector<uint32_t> expectedResults = { 0xffffffff, 0xfefefefe, 0x00010203 };
+  std::string           testInput("//////7+/v4DAgEA");
+  std::vector<uint32_t> expectedResults = {0xffffffff, 0xfefefefe, 0x00010203};
 
   std::vector<uint32_t> outputData;
   DecodeBase64PropertyData(Property::Value(testInput), outputData);
 
-  DALI_TEST_EQUALS( std::equal( expectedResults.begin(), expectedResults.end(), outputData.begin() ), true,
-                    TEST_LOCATION );
+  DALI_TEST_EQUALS(std::equal(expectedResults.begin(), expectedResults.end(), outputData.begin()), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliBase64DecodingP02(void)
+{
+  tet_infoline("Test decoding string of known data gives expected result");
+
+  std::string          testInput("//////7+/v4DAgEA");
+  std::vector<uint8_t> expectedResults = {0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0x03, 0x02, 0x01, 0x00};
+
+  std::vector<uint8_t> outputData;
+  DecodeBase64PropertyData(Property::Value(testInput), outputData);
+
+  DALI_TEST_EQUALS(std::equal(expectedResults.begin(), expectedResults.end(), outputData.begin()), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliBase64DecodingFromString(void)
+{
+  tet_infoline("Test decoding string of known data gives expected result");
+
+  std::string          testInput("//////7+/v4DAgEA");
+  std::vector<uint8_t> expectedResults = {0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0x03, 0x02, 0x01, 0x00};
+
+  std::vector<uint8_t> outputData;
+  DecodeBase64FromString(testInput, outputData);
+
+  DALI_TEST_EQUALS(std::equal(expectedResults.begin(), expectedResults.end(), outputData.begin()), true, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index 83ebfb6..76a10fc 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,16 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 #include "dali-toolkit-test-utils/toolkit-timer.h"
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
@@ -32,7 +32,6 @@
 using namespace Dali;
 using namespace Toolkit;
 
-
 void utc_dali_toolkit_button_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -45,33 +44,33 @@ void utc_dali_toolkit_button_cleanup(void)
 
 namespace
 {
-static bool gIsCalledButtonCallback = false;
+static bool gIsCalledButtonCallback      = false;
 static bool gIsCalledChildButtonCallback = false;
 
-static bool ButtonCallback( Button button )
+static bool ButtonCallback(Button button)
 {
   gIsCalledButtonCallback = true;
   return false;
 }
 
-static bool ChildButtonCallback( Button button )
+static bool ChildButtonCallback(Button button)
 {
   gIsCalledChildButtonCallback = true;
   return false;
 }
 
-static std::string GetButtonText( Button button )
+static std::string GetButtonText(Button button)
 {
-  Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+  Property::Value value = button.GetProperty(Toolkit::Button::Property::LABEL);
 
-  Property::Map *labelProperty = value.GetMap();
+  Property::Map* labelProperty = value.GetMap();
 
   std::string textLabel;
 
-  if ( labelProperty )
+  if(labelProperty)
   {
-    Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
-    value->Get( textLabel );
+    Property::Value* value = labelProperty->Find(Toolkit::TextVisual::Property::TEXT);
+    value->Get(textLabel);
   }
 
   return textLabel;
@@ -80,7 +79,7 @@ static std::string GetButtonText( Button button )
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -94,48 +93,48 @@ struct CallbackFunctor
 Dali::Integration::Point GetPointDownInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointUpInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointLeave()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::LEAVE );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::LEAVE);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointEnter()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::MOTION );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::MOTION);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointDownOutside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
 Dali::Integration::Point GetPointUpOutside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
@@ -147,7 +146,7 @@ int UtcDaliButtonConstructorP(void)
 
   Button button;
 
-  DALI_TEST_CHECK( !button );
+  DALI_TEST_CHECK(!button);
   END_TEST;
 }
 
@@ -158,8 +157,8 @@ int UtcDaliButtonCopyConstructorP(void)
   // Initialize an object, ref count == 1
   Button button = PushButton::New();
 
-  Button copy( button );
-  DALI_TEST_CHECK( copy );
+  Button copy(button);
+  DALI_TEST_CHECK(copy);
   END_TEST;
 }
 
@@ -168,16 +167,16 @@ int UtcDaliButtonMoveConstructor(void)
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, true );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
 
-  Button moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  Button moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -188,10 +187,10 @@ int UtcDaliButtonAssignmentOperatorP(void)
 
   Button button = PushButton::New();
 
-  Button copy( button );
-  DALI_TEST_CHECK( copy );
+  Button copy(button);
+  DALI_TEST_CHECK(copy);
 
-  DALI_TEST_CHECK( button == copy );
+  DALI_TEST_CHECK(button == copy);
   END_TEST;
 }
 
@@ -200,17 +199,17 @@ int UtcDaliButtonMoveAssignment(void)
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, true );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
 
   Button moved;
-  moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -223,10 +222,10 @@ int UtcDaliButtonDownCastP(void)
 
   BaseHandle object(button);
 
-  Button button2 = Button::DownCast( object );
+  Button button2 = Button::DownCast(object);
   DALI_TEST_CHECK(button2);
 
-  Button button3 = DownCast< Button >(object);
+  Button button3 = DownCast<Button>(object);
   DALI_TEST_CHECK(button3);
   END_TEST;
 }
@@ -237,11 +236,11 @@ int UtcDaliButtonDownCastN(void)
 
   BaseHandle unInitializedObject;
 
-  Button button1 = Button::DownCast( unInitializedObject );
-  DALI_TEST_CHECK( !button1 );
+  Button button1 = Button::DownCast(unInitializedObject);
+  DALI_TEST_CHECK(!button1);
 
-  Button button2 = DownCast< Button >( unInitializedObject );
-  DALI_TEST_CHECK( !button2 );
+  Button button2 = DownCast<Button>(unInitializedObject);
+  DALI_TEST_CHECK(!button2);
   END_TEST;
 }
 
@@ -251,22 +250,21 @@ int UtcDaliButtonDisabledPropertyP(void)
 
   Button button = PushButton::New();
 
+  button.SetProperty(button.GetPropertyIndex("disabled"), true);
 
-  button.SetProperty( button.GetPropertyIndex("disabled"), true );
-
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("disabled")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), true, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("disabled"), false );
+  button.SetProperty(button.GetPropertyIndex("disabled"), false);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("disabled")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), false, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("disabled"), true );
+  button.SetProperty(button.GetPropertyIndex("disabled"), true);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("disabled")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), true, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("disabled"), false );
+  button.SetProperty(button.GetPropertyIndex("disabled"), false);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("disabled")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), false, TEST_LOCATION);
 
   END_TEST;
 }
@@ -281,17 +279,17 @@ int UtcDaliButtonSetDisabledWithDifferentStates01P(void)
 
   bool SELECTED = true;
 
-  button.SetProperty( Button::Property::TOGGLABLE, true);
-  button.SetProperty( Button::Property::SELECTED, SELECTED );
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::SELECTED, SELECTED);
 
-  button.SetProperty( Button::Property::DISABLED, true);
+  button.SetProperty(Button::Property::DISABLED, true);
 
   tet_infoline("Set button to SELECTED = false whilst disabled, should not change to false\n");
-  button.SetProperty( Button::Property::SELECTED, !SELECTED );
+  button.SetProperty(Button::Property::SELECTED, !SELECTED);
 
-  bool isSelected = button.GetProperty<bool>( Button::Property::SELECTED ) ;
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
 
-  DALI_TEST_EQUALS( isSelected, SELECTED , TEST_LOCATION );
+  DALI_TEST_EQUALS(isSelected, SELECTED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -306,19 +304,19 @@ int UtcDaliButtonSetDisabledWithDifferentStates02P(void)
 
   bool SELECTED = true;
 
-  button.SetProperty( Button::Property::TOGGLABLE, true );
-  button.SetProperty( Button::Property::SELECTED, SELECTED );
-  button.SetProperty( Button::Property::DISABLED, true );
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::SELECTED, SELECTED);
+  button.SetProperty(Button::Property::DISABLED, true);
 
-  bool isSelected =  button.GetProperty<bool>( Button::Property::SELECTED );
-  DALI_TEST_EQUALS( isSelected, SELECTED , TEST_LOCATION );
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, SELECTED, TEST_LOCATION);
   tet_infoline("Set button to DISABLED = false whilst disabled and then set to unselected\n");
 
-  button.SetProperty( Button::Property::DISABLED, false);
-  button.SetProperty( Button::Property::SELECTED, !SELECTED );
+  button.SetProperty(Button::Property::DISABLED, false);
+  button.SetProperty(Button::Property::SELECTED, !SELECTED);
 
-  isSelected = button.GetProperty<bool>( Button::Property::SELECTED );
-  DALI_TEST_EQUALS( isSelected, !SELECTED , TEST_LOCATION );
+  isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, !SELECTED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -329,8 +327,8 @@ int UtcDaliButtonPropertyGetLabelAlignment(void)
   tet_infoline(" UtcDaliPushButtonPropertyGetLabelAlignment\n");
 
   Button button = PushButton::New();
-  button.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END"  );
-  DALI_TEST_EQUALS( button.GetProperty<std::string>( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT ), "END", TEST_LOCATION );
+  button.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END");
+  DALI_TEST_EQUALS(button.GetProperty<std::string>(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT), "END", TEST_LOCATION);
 
   END_TEST;
 }
@@ -341,13 +339,13 @@ int UtcDaliButtonIsDisabledP(void)
 
   Button button = PushButton::New();
 
-  button.SetProperty( Button::Property::DISABLED, true);
+  button.SetProperty(Button::Property::DISABLED, true);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::DISABLED ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::DISABLED), true, TEST_LOCATION);
 
-  button.SetProperty( Button::Property::DISABLED, false);
+  button.SetProperty(Button::Property::DISABLED, false);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::DISABLED ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::DISABLED), false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -357,17 +355,17 @@ int UtcDaliButtonAutoRepeatingPropertyP(void)
 
   Button button = PushButton::New();
 
-  button.SetProperty( button.GetPropertyIndex("autoRepeating"), true );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), true);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("autoRepeating"), false );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), false);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("autoRepeating"), true );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), true);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -378,13 +376,13 @@ int UtcDaliButtonIsAutoRepeatingP(void)
 
   Button button = PushButton::New();
 
-  button.SetProperty( Button::Property::AUTO_REPEATING, true);
+  button.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::AUTO_REPEATING), true, TEST_LOCATION);
 
-  button.SetProperty( Button::Property::AUTO_REPEATING, false);
+  button.SetProperty(Button::Property::AUTO_REPEATING, false);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::AUTO_REPEATING), false, TEST_LOCATION);
 
   END_TEST;
 }
@@ -397,54 +395,54 @@ int UtcDaliButtonAutoRepeatingP(void)
   const float AUTO_REPEATING_DELAY = 0.15f;
 
   Button button = PushButton::New();
-  button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  button.SetProperty( Actor::Property::POSITION, Vector2( 240, 400 ));
-  button.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
-  application.GetScene().Add( button );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::POSITION, Vector2(240, 400));
+  button.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
-  button.SetProperty( Toolkit::Button::Property::AUTO_REPEATING, true  );
-  button.SetProperty( Toolkit::Button::Property::INITIAL_AUTO_REPEATING_DELAY, AUTO_REPEATING_DELAY );
+  button.SetProperty(Toolkit::Button::Property::AUTO_REPEATING, true);
+  button.SetProperty(Toolkit::Button::Property::INITIAL_AUTO_REPEATING_DELAY, AUTO_REPEATING_DELAY);
   // connect to its touch signal
   ConnectionTracker* testTracker = new ConnectionTracker();
-  button.PressedSignal().Connect( &ButtonCallback );
-  button.ClickedSignal().Connect( &ButtonCallback );
+  button.PressedSignal().Connect(&ButtonCallback);
+  button.ClickedSignal().Connect(&ButtonCallback);
   bool clickedSignal = false;
   bool pressedSignal = false;
-  button.ConnectSignal( testTracker, "pressed", CallbackFunctor(&pressedSignal) );
-  button.ConnectSignal( testTracker, "clicked", CallbackFunctor(&clickedSignal) );
+  button.ConnectSignal(testTracker, "pressed", CallbackFunctor(&pressedSignal));
+  button.ConnectSignal(testTracker, "clicked", CallbackFunctor(&clickedSignal));
 
   Dali::Integration::TouchEvent event;
 
   // Touch point down and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( pressedSignal, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(pressedSignal, true, TEST_LOCATION);
   tet_infoline("Consume first clicked signal then wait\n");
 
   gIsCalledButtonCallback = false;
-  Dali::Timer timer = Timer::New( AUTO_REPEATING_DELAY );
+  Dali::Timer timer       = Timer::New(AUTO_REPEATING_DELAY);
   timer.MockEmitSignal();
-  application.Wait( AUTO_REPEATING_DELAY*2 );
-  DALI_TEST_EQUALS( clickedSignal, true, TEST_LOCATION );
+  application.Wait(AUTO_REPEATING_DELAY * 2);
+  DALI_TEST_EQUALS(clickedSignal, true, TEST_LOCATION);
   tet_infoline("Check gIsCalledButtonCallback was called again after last consumption of it.\n");
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -455,13 +453,13 @@ int UtcDaliButtonInitialAutoRepeatingDelayPropertyP(void)
 
   Button button = PushButton::New();
 
-  button.SetProperty( button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.5f );
+  button.SetProperty(button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.5f);
 
-  DALI_TEST_EQUALS( button.GetProperty<float>( button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.5f, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.2f );
+  button.SetProperty(button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.2f);
 
-  DALI_TEST_EQUALS( button.GetProperty<float>( button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.2f, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.2f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -472,13 +470,13 @@ int UtcDaliButtonNextAutoRepeatingDelayPropertyP(void)
 
   Button button = PushButton::New();
 
-  button.SetProperty( button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.5f );
+  button.SetProperty(button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.5f);
 
-  DALI_TEST_EQUALS( button.GetProperty<float>( button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.5f, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.2f );
+  button.SetProperty(button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.2f);
 
-  DALI_TEST_EQUALS( button.GetProperty<float>( button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.2f, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.2f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -488,13 +486,13 @@ int UtcDaliButtonTogglableButtonPropertyP(void)
 
   Button button = PushButton::New();
 
-  button.SetProperty( button.GetPropertyIndex("togglable"), true );
+  button.SetProperty(button.GetPropertyIndex("togglable"), true);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("togglable")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("togglable")), true, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("togglable"), false );
+  button.SetProperty(button.GetPropertyIndex("togglable"), false);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("togglable")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("togglable")), false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -503,15 +501,15 @@ int UtcDaliButtonSelectedPropertyP(void)
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  button.SetProperty( button.GetPropertyIndex("togglable"), true );
+  button.SetProperty(button.GetPropertyIndex("togglable"), true);
 
-  button.SetProperty( button.GetPropertyIndex("selected"), true );
+  button.SetProperty(button.GetPropertyIndex("selected"), true);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("selected")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("selected")), true, TEST_LOCATION);
 
-  button.SetProperty( button.GetPropertyIndex("selected"), false );
+  button.SetProperty(button.GetPropertyIndex("selected"), false);
 
-  DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("selected")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("selected")), false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -520,13 +518,10 @@ int UtcDaliButtonSetLabelStringWithPropertyMapP(void)
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  button.SetProperty( Toolkit::Button::Property::LABEL,
-                      Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-                                     .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                                     .Add( Toolkit::TextVisual::Property::TEXT, "Button Label")
-                     );
+  button.SetProperty(Toolkit::Button::Property::LABEL,
+                     Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f).Add(Toolkit::TextVisual::Property::TEXT, "Button Label"));
 
-  DALI_TEST_EQUALS( GetButtonText( button ), "Button Label", TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
   END_TEST;
 }
 
@@ -540,34 +535,34 @@ int UtcDaliButtonSetLabelStringWithPropertyMapStringsP(void)
 
   Property::Map textVisualMapInitial;
   textVisualMapInitial["visualType"] = "TEXT";
-  textVisualMapInitial["pointSize"] =  15.0f;
-  textVisualMapInitial["text"] = "button label initial";
+  textVisualMapInitial["pointSize"]  = 15.0f;
+  textVisualMapInitial["text"]       = "button label initial";
 
-  button.SetProperty( Button::Property::LABEL, textVisualMapInitial );
+  button.SetProperty(Button::Property::LABEL, textVisualMapInitial);
 
-  DALI_TEST_EQUALS( GetButtonText( button ), "button label initial", TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "button label initial", TEST_LOCATION);
 
   tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Intermediate part of test");
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::TEXT );
-  propertyMap.Insert( Toolkit::TextVisual::Property::TEXT,  "error if this is the final text" );
-  propertyMap.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT);
+  propertyMap.Insert(Toolkit::TextVisual::Property::TEXT, "error if this is the final text");
+  propertyMap.Insert(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
 
-  button.SetProperty( Button::Property::LABEL, propertyMap );
+  button.SetProperty(Button::Property::LABEL, propertyMap);
 
-  DALI_TEST_EQUALS( GetButtonText( button ), "error if this is the final text", TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "error if this is the final text", TEST_LOCATION);
 
   tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Final part of test");
 
   Property::Map textVisualMap;
   textVisualMap["visualType"] = "TEXT";
-  textVisualMap["pointSize"] =  15.0f;
-  textVisualMap["text"] = "Button Label";
+  textVisualMap["pointSize"]  = 15.0f;
+  textVisualMap["text"]       = "Button Label";
 
-  button.SetProperty( Toolkit::Button::Property::LABEL, textVisualMap );
+  button.SetProperty(Toolkit::Button::Property::LABEL, textVisualMap);
 
-  DALI_TEST_EQUALS( GetButtonText( button ), "Button Label", TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
   END_TEST;
 }
 
@@ -578,14 +573,12 @@ int UtcDaliButtonSetLabelWithStringP(void)
   Button button = PushButton::New();
 
   // Set default point size for text visual as style sheet not available.
-  button.SetProperty( Toolkit::Button::Property::LABEL,
-                      Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-                                     .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                                     );
+  button.SetProperty(Toolkit::Button::Property::LABEL,
+                     Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f));
 
-  button.SetProperty( Toolkit::Button::Property::LABEL, "Button Label" );
+  button.SetProperty(Toolkit::Button::Property::LABEL, "Button Label");
 
-  DALI_TEST_EQUALS( GetButtonText( button ), "Button Label", TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
   END_TEST;
 }
 
@@ -595,28 +588,24 @@ int UtcDaliButtonSetLabelPropertyP(void)
 
   tet_infoline(" UtcDaliButtonSetLabelPropertyP Set text label and then set again with new text");
 
-
   const std::string TEST_LABEL1 = "test label one";
   const std::string TEST_LABEL2 = "test label two";
 
   Button button = PushButton::New();
 
-  button.SetProperty( Toolkit::Button::Property::LABEL,
-                        Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-                                       .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                                       .Add( Toolkit::TextVisual::Property::TEXT, TEST_LABEL1 )
-                     );
+  button.SetProperty(Toolkit::Button::Property::LABEL,
+                     Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f).Add(Toolkit::TextVisual::Property::TEXT, TEST_LABEL1));
 
-  DALI_TEST_EQUALS( GetButtonText( button ), TEST_LABEL1,  TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), TEST_LABEL1, TEST_LOCATION);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::TEXT );
-  propertyMap.Insert( Toolkit::TextVisual::Property::TEXT,  TEST_LABEL2 );
-  propertyMap.Insert( Toolkit::TextVisual::Property::TEXT_COLOR, Color::BLUE );
-  propertyMap.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
-  button.SetProperty( Button::Property::LABEL, propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT);
+  propertyMap.Insert(Toolkit::TextVisual::Property::TEXT, TEST_LABEL2);
+  propertyMap.Insert(Toolkit::TextVisual::Property::TEXT_COLOR, Color::BLUE);
+  propertyMap.Insert(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
+  button.SetProperty(Button::Property::LABEL, propertyMap);
 
-  DALI_TEST_EQUALS( GetButtonText( button ), TEST_LABEL2,  TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), TEST_LABEL2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -627,104 +616,104 @@ int UtcDaliButtonPressedSignalP(void)
   tet_infoline(" UtcDaliButtonPressedSignalP");
 
   Button button = PushButton::New();
-  button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  button.SetProperty( Actor::Property::POSITION, Vector2( 240, 400 ));
-  button.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::POSITION, Vector2(240, 400));
+  button.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
 
-  application.GetScene().Add( button );
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
   // connect to its touch signal
   ConnectionTracker* testTracker = new ConnectionTracker();
-  button.PressedSignal().Connect( &ButtonCallback );
-  button.ReleasedSignal().Connect( &ButtonCallback );
-  bool pressedSignal = false;
+  button.PressedSignal().Connect(&ButtonCallback);
+  button.ReleasedSignal().Connect(&ButtonCallback);
+  bool pressedSignal  = false;
   bool releasedSignal = false;
-  button.ConnectSignal( testTracker, "pressed",   CallbackFunctor(&pressedSignal) );
-  button.ConnectSignal( testTracker, "released",  CallbackFunctor(&releasedSignal) );
+  button.ConnectSignal(testTracker, "pressed", CallbackFunctor(&pressedSignal));
+  button.ConnectSignal(testTracker, "released", CallbackFunctor(&releasedSignal));
 
   Dali::Integration::TouchEvent event;
 
   // Test1. Touch point down and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( pressedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(pressedSignal);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( releasedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(releasedSignal);
 
   // Test2. Touch point down and up outside the button.
 
-  pressedSignal = false;
-  releasedSignal = false;
+  pressedSignal           = false;
+  releasedSignal          = false;
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !pressedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!pressedSignal);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !releasedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!releasedSignal);
 
   // Test3. Touch point down inside and up outside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointLeave() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointLeave());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
 
   // Test4. Touch point down outside and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointEnter() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointEnter());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
   END_TEST;
 }
 
@@ -734,90 +723,90 @@ int UtcDaliButtonClickedSignalP(void)
   tet_infoline(" UtcDaliButtonClickedSignalP");
 
   Button button = PushButton::New();
-  button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  button.SetProperty( Actor::Property::POSITION, Vector2( 240, 400 ));
-  button.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::POSITION, Vector2(240, 400));
+  button.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
 
-  application.GetScene().Add( button );
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
   // connect to its touch signal
-  button.ClickedSignal().Connect( &ButtonCallback );
-  bool clickedSignal = false;
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  button.ConnectSignal( testTracker, "clicked",   CallbackFunctor(&clickedSignal) );
+  button.ClickedSignal().Connect(&ButtonCallback);
+  bool               clickedSignal = false;
+  ConnectionTracker* testTracker   = new ConnectionTracker();
+  button.ConnectSignal(testTracker, "clicked", CallbackFunctor(&clickedSignal));
 
   Dali::Integration::TouchEvent event;
 
   // Test1. Touch point down and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( clickedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(clickedSignal);
 
   // Test2. Touch point down and up outside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  clickedSignal           = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!clickedSignal);
 
   // Test3. Touch point down inside and up outside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  clickedSignal           = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointLeave() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointLeave());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!clickedSignal);
 
   // Test4. Touch point down outside and up inside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  clickedSignal           = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointEnter() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointEnter());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!clickedSignal);
   END_TEST;
 }
 
@@ -828,31 +817,31 @@ int UtcDaliButtonStateChangedSignalP(void)
 
   Button button = PushButton::New();
 
-  button.SetProperty( Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
 
-  application.GetScene().Add( button );
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
   // connect to its signal
-  button.StateChangedSignal().Connect( &ButtonCallback );
-  bool stateChangedSignal = false;
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  button.ConnectSignal( testTracker, "stateChanged",   CallbackFunctor(&stateChangedSignal) );
+  button.StateChangedSignal().Connect(&ButtonCallback);
+  bool               stateChangedSignal = false;
+  ConnectionTracker* testTracker        = new ConnectionTracker();
+  button.ConnectSignal(testTracker, "stateChanged", CallbackFunctor(&stateChangedSignal));
 
   gIsCalledButtonCallback = false;
-  button.SetProperty( Button::Property::SELECTED, true);
+  button.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( stateChangedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(stateChangedSignal);
 
   gIsCalledButtonCallback = false;
-  stateChangedSignal = false;
+  stateChangedSignal      = false;
 
-  button.SetProperty( Button::Property::SELECTED, false);
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( stateChangedSignal );
+  button.SetProperty(Button::Property::SELECTED, false);
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(stateChangedSignal);
   END_TEST;
 }
 
@@ -865,10 +854,10 @@ int UtcDaliButtonSetProperty(void)
 
   pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( pushButton.GetPropertyIndex("disabled")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("disabled")), false, TEST_LOCATION);
 
   pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true);
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( pushButton.GetPropertyIndex("disabled")), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("disabled")), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -887,47 +876,47 @@ int UtcDaliButtonEventConsumption(void)
   ToolkitTestApplication application;
 
   Button parentButton = PushButton::New();
-  parentButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  parentButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  parentButton.SetProperty( Actor::Property::SIZE, Vector2( 20, 20 ) );
-  application.GetScene().Add( parentButton );
+  parentButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  application.GetScene().Add(parentButton);
 
   Button childButton = PushButton::New();
-  childButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  childButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT );
-  childButton.SetProperty( Actor::Property::SIZE, Vector2( 20, 20 ) );
-  parentButton.Add( childButton );
+  childButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  childButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT);
+  childButton.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  parentButton.Add(childButton);
 
   // Reset signal flags
   gIsCalledChildButtonCallback = false;
-  gIsCalledButtonCallback = false;
+  gIsCalledButtonCallback      = false;
 
-  parentButton.ClickedSignal().Connect( &ButtonCallback );
-  childButton.ClickedSignal().Connect( &ChildButtonCallback );
+  parentButton.ClickedSignal().Connect(&ButtonCallback);
+  childButton.ClickedSignal().Connect(&ChildButtonCallback);
 
   // Peform a button click at coordinates (10,30) which is the child.
   Dali::Integration::TouchEvent event;
   event = Dali::Integration::TouchEvent();
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10, 30 ) );
-  event.AddPoint( point );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 30));
+  event.AddPoint(point);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( event );
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 10, 30 ) );
-  event.AddPoint( point );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(10, 30));
+  event.AddPoint(point);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( event );
+  application.ProcessEvent(event);
 
-  DALI_TEST_EQUALS( gIsCalledChildButtonCallback, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( ! gIsCalledButtonCallback, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledChildButtonCallback, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(!gIsCalledButtonCallback, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -941,11 +930,11 @@ int UtcDaliButtonRelease(void)
   ToolkitTestApplication application;
 
   Button parentButton = PushButton::New();
-  parentButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  parentButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  parentButton.SetProperty( Actor::Property::SIZE, Vector2( 20, 20 ) );
-  application.GetScene().Add( parentButton );
-  parentButton.ReleasedSignal().Connect( &ButtonCallback );
+  parentButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  application.GetScene().Add(parentButton);
+  parentButton.ReleasedSignal().Connect(&ButtonCallback);
 
   // Reset signal flags
   gIsCalledButtonCallback = false;
@@ -954,23 +943,23 @@ int UtcDaliButtonRelease(void)
   Dali::Integration::TouchEvent event;
   event = Dali::Integration::TouchEvent();
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( point );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(point);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( event );
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  point.SetState( PointState::INTERRUPTED );
-  event.AddPoint( point );
+  point.SetState(PointState::INTERRUPTED);
+  event.AddPoint(point);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( event );
+  application.ProcessEvent(event);
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -984,13 +973,13 @@ int UtcDaliButtonMultiTouch(void)
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  button.SetProperty( Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
 
-  button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  button.SetProperty( Actor::Property::SIZE, Vector2( 20, 20 ) );
-  application.GetScene().Add( button );
-  button.ReleasedSignal().Connect( &ButtonCallback );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  application.GetScene().Add(button);
+  button.ReleasedSignal().Connect(&ButtonCallback);
 
   // Reset signal flags
   gIsCalledButtonCallback = false;
@@ -1001,49 +990,49 @@ int UtcDaliButtonMultiTouch(void)
   Dali::Integration::Point point;
 
   // Add Press button
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 15, 15 ) );
-  downEvent.AddPoint( point );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(15, 15));
+  downEvent.AddPoint(point);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( downEvent );
+  application.ProcessEvent(downEvent);
 
   // Release button
   Dali::Integration::TouchEvent upEvent;
   upEvent = Dali::Integration::TouchEvent();
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 15, 15 ) );
-  upEvent.AddPoint( point );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(15, 15));
+  upEvent.AddPoint(point);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( upEvent );
+  application.ProcessEvent(upEvent);
 
   tet_infoline("Button should now be selected\n");
-  bool isSelected = button.GetProperty<bool>( Button::Property::SELECTED ) ;
-  DALI_TEST_EQUALS( isSelected, true, TEST_LOCATION );
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, true, TEST_LOCATION);
 
   // Add first point
   Dali::Integration::TouchEvent multiEvent;
   multiEvent = Dali::Integration::TouchEvent();
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
-  multiEvent.AddPoint( point );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
+  multiEvent.AddPoint(point);
 
   // Add second point
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 15, 15 ) );
-  multiEvent.AddPoint( point );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(15, 15));
+  multiEvent.AddPoint(point);
 
   tet_infoline("Before a multi touch event\n");
 
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( multiEvent );
+  application.ProcessEvent(multiEvent);
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CameraView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CameraView.cpp
old mode 100755
new mode 100644
index 24149f5..807fab3
--- a/automated-tests/src/dali-toolkit/utc-Dali-CameraView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CameraView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/public-api/controls/camera-view/camera-view.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -36,13 +36,13 @@ int UtcDaliCameraViewUninitialized(void)
   {
     // New() must be called to create a CameraView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
@@ -53,9 +53,9 @@ int UtcDaliCameraViewNew(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCameraViewNew");
-  Any dummy( 0 );
+  Any                 dummy(0);
   Toolkit::CameraView view = Toolkit::CameraView::New(dummy);
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
   END_TEST;
 }
 
@@ -65,14 +65,14 @@ int UtcDaliCameraViewDownCast(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCameraViewDownCast");
 
-  Any dummy( 0 );
+  Any                 dummy(0);
   Toolkit::CameraView view = Toolkit::CameraView::New(dummy);
-  BaseHandle handle(view);
+  BaseHandle          handle(view);
 
-  Toolkit::CameraView view2 = Toolkit::CameraView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( view2 );
-  DALI_TEST_CHECK( view == view2 );
+  Toolkit::CameraView view2 = Toolkit::CameraView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(view2);
+  DALI_TEST_CHECK(view == view2);
   END_TEST;
 }
 
@@ -81,18 +81,18 @@ int UtcDaliCameraViewCopyAndAssignment(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliCameraViewCopyAndAssignment");
 
-  Any dummy( 0 );
+  Any        dummy(0);
   CameraView view = Toolkit::CameraView::New(dummy);
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  CameraView copy( view );
-  DALI_TEST_CHECK( view == copy );
+  CameraView copy(view);
+  DALI_TEST_CHECK(view == copy);
 
   CameraView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
 
   assign = copy;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -102,15 +102,15 @@ int UtcDaliCameraViewMoveAssignment(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliCameraViewMoveAssignment");
 
-  Any dummy( 0 );
+  Any        dummy(0);
   CameraView view = Toolkit::CameraView::New(dummy);
-  DALI_TEST_EQUALS( 1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
   CameraView moved;
-  moved = std::move( view );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( !view );
+  moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!view);
 
   END_TEST;
 }
@@ -121,16 +121,16 @@ int UtcDaliCameraViewTypeRegistry(void)
   tet_infoline("UtcDaliCameraViewTypeRegistry");
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "CameraView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("CameraView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  CameraView view = CameraView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  CameraView view = CameraView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -140,22 +140,22 @@ int UtcDaliCameraViewWindowDisplayType(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliCameraViewWindowDisplayType");
 
-  Any dummy( 0 );
+  Any        dummy(0);
   CameraView cameraView = CameraView::New(dummy, Dali::Toolkit::CameraView::DisplayType::WINDOW);
-  DALI_TEST_CHECK( cameraView );
+  DALI_TEST_CHECK(cameraView);
 
-  application.GetScene().Add( cameraView );
+  application.GetScene().Add(cameraView);
 
   try
   {
     cameraView.Update();
     application.SendNotification();
     application.Render();
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(false);
   }
 
@@ -167,22 +167,22 @@ int UtcDaliCameraViewImageDisplayType(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliCameraViewImageDisplayType");
 
-  Any dummy( 0 );
+  Any        dummy(0);
   CameraView cameraView = CameraView::New(dummy, Dali::Toolkit::CameraView::DisplayType::IMAGE);
-  DALI_TEST_CHECK( cameraView );
+  DALI_TEST_CHECK(cameraView);
 
-  application.GetScene().Add( cameraView );
+  application.GetScene().Add(cameraView);
 
   try
   {
     cameraView.Update();
     application.SendNotification();
     application.Render();
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(false);
   }
 
@@ -194,23 +194,23 @@ int UtcDaliCameraViewCoverUpdateDisplayArea1(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliCameraViewUpdateDisplayArea1");
 
-  Any dummy( 0 );
+  Any        dummy(0);
   CameraView view = CameraView::New(dummy, Dali::Toolkit::CameraView::DisplayType::WINDOW);
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   application.SendNotification();
   application.Render();
 
   Vector3 vector(100.0f, 100.0f, 0.0f);
-  view.SetProperty( Actor::Property::SIZE, vector );
+  view.SetProperty(Actor::Property::SIZE, vector);
 
   application.SendNotification();
   application.Render();
 
   // Check the size in the new frame
-  DALI_TEST_CHECK(vector == view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ));
+  DALI_TEST_CHECK(vector == view.GetCurrentProperty<Vector3>(Actor::Property::SIZE));
 
   application.GetScene().Remove(view);
 
@@ -222,23 +222,23 @@ int UtcDaliCameraViewCoverUpdateDisplayArea2(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliCameraViewUpdateDisplayArea2");
 
-  Any dummy( 0 );
+  Any        dummy(0);
   CameraView view = CameraView::New(dummy, Dali::Toolkit::CameraView::DisplayType::WINDOW);
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   application.SendNotification();
   application.Render();
 
   Vector3 vector(100.0f, 100.0f, 0.0f);
-  view.SetProperty( Actor::Property::SIZE, vector );
+  view.SetProperty(Actor::Property::SIZE, vector);
 
   application.SendNotification();
   application.Render();
 
   // Check the size in the new frame
-  DALI_TEST_CHECK(vector == view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ));
+  DALI_TEST_CHECK(vector == view.GetCurrentProperty<Vector3>(Actor::Property::SIZE));
 
   application.GetScene().Remove(view);
 
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp
index 36cf1df..6d29bf5 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,29 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
+#include <toolkit-event-thread-callback.h>
+#include <toolkit-timer.h>
+
 #include <dali-toolkit-test-suite-utils.h>
+
+#include <dali-toolkit/dali-toolkit.h>
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <test-application.h>
+#include <dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h>
+#include <dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/images/pixel-data.h>
-#include <toolkit-event-thread-callback.h>
-#include <dali-toolkit/devel-api/controls/canvas-view/canvas-view.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
-#include <dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
-
 } // namespace
 
 void utc_dali_toolkit_canvasview_startup(void)
@@ -49,21 +53,21 @@ void utc_dali_toolkit_canvasview_cleanup(void)
 int UtcDaliCanvasViewConstructorP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView;
+  CanvasView             canvasView;
 
-  DALI_TEST_CHECK( !canvasView );
+  DALI_TEST_CHECK(!canvasView);
   END_TEST;
 }
 
 int UtcDaliCanvasViewMoveAssignment(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
 
-  CanvasView moved = std::move( canvasView );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( !canvasView );
+  CanvasView moved = std::move(canvasView);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!canvasView);
 
   END_TEST;
 }
@@ -71,57 +75,57 @@ int UtcDaliCanvasViewMoveAssignment(void)
 int UtcDaliCanvasViewAssignmentConstructorP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
 
-  CanvasView copy( canvasView );
-  DALI_TEST_CHECK( copy );
+  CanvasView copy(canvasView);
+  DALI_TEST_CHECK(copy);
 
-  DALI_TEST_CHECK( canvasView == copy );
+  DALI_TEST_CHECK(canvasView == copy);
   END_TEST;
 }
 
 int UtcDaliCanvasViewAssignmentOperatorP(void)
 {
   ToolkitTestApplication application;
-  const CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  const CanvasView       canvasView = CanvasView::New(Vector2(100, 100));
 
   CanvasView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
 
-  assign = canvasView ;
-  DALI_TEST_CHECK( assign == canvasView);
+  assign = canvasView;
+  DALI_TEST_CHECK(assign == canvasView);
   END_TEST;
 }
 
 int UtcDaliCanvasViewNewP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
 
-  DALI_TEST_CHECK( canvasView );
+  DALI_TEST_CHECK(canvasView);
   END_TEST;
 }
 
 int UtcDaliCanvasViewNewWithoutViewboxP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New();
+  CanvasView             canvasView = CanvasView::New();
 
-  DALI_TEST_CHECK( canvasView );
+  DALI_TEST_CHECK(canvasView);
   END_TEST;
 }
 
 int UtcDaliCanvasViewDownCastP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
 
   BaseHandle object(canvasView);
 
-  CanvasView canvasView2 = CanvasView::DownCast( object );
+  CanvasView canvasView2 = CanvasView::DownCast(object);
   DALI_TEST_CHECK(canvasView2);
 
-  CanvasView canvasView3 = DownCast< CanvasView >(object);
+  CanvasView canvasView3 = DownCast<CanvasView>(object);
   DALI_TEST_CHECK(canvasView3);
   END_TEST;
 }
@@ -129,21 +133,21 @@ int UtcDaliCanvasViewDownCastP(void)
 int UtcDaliCanvasViewDownCastN(void)
 {
   ToolkitTestApplication application;
-  BaseHandle unInitializedObject;
+  BaseHandle             unInitializedObject;
 
-  CanvasView canvasView1 = CanvasView::DownCast( unInitializedObject );
-  DALI_TEST_CHECK( !canvasView1 );
+  CanvasView canvasView1 = CanvasView::DownCast(unInitializedObject);
+  DALI_TEST_CHECK(!canvasView1);
 
-  CanvasView canvasView2 = DownCast< CanvasView >( unInitializedObject );
-  DALI_TEST_CHECK( !canvasView2 );
+  CanvasView canvasView2 = DownCast<CanvasView>(unInitializedObject);
+  DALI_TEST_CHECK(!canvasView2);
   END_TEST;
 }
 
 int UtcDaliCanvasViewAddP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New();
 
@@ -157,8 +161,8 @@ int UtcDaliCanvasViewAddP(void)
 int UtcDaliCanvasViewAddN(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   Dali::CanvasRenderer::Shape shape;
 
@@ -170,14 +174,14 @@ int UtcDaliCanvasViewAddN(void)
 int UtcDaliCanvasViewRemoveP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New();
 
   canvasView.AddDrawable(shape);
 
-  DALI_TEST_CHECK( canvasView.RemoveDrawable(shape) );
+  DALI_TEST_CHECK(canvasView.RemoveDrawable(shape));
 
   END_TEST;
 }
@@ -186,12 +190,12 @@ int UtcDaliCanvasViewRemoveN(void)
 {
   ToolkitTestApplication application;
 
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New();
 
-  DALI_TEST_CHECK( !canvasView.RemoveDrawable(shape) );
+  DALI_TEST_CHECK(!canvasView.RemoveDrawable(shape));
 
   END_TEST;
 }
@@ -199,8 +203,8 @@ int UtcDaliCanvasViewRemoveN(void)
 int UtcDaliCanvasViewRemoveAllP(void)
 {
   ToolkitTestApplication application;
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView             canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New();
 
@@ -215,21 +219,20 @@ int UtcDaliCanvasViewRemoveAllN(void)
 {
   ToolkitTestApplication application;
 
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   canvasView.RemoveAllDrawables();
 
   END_TEST;
 }
 
-
 int UtcDaliCanvasViewChangeSizeP(void)
 {
   ToolkitTestApplication application;
 
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   application.GetScene().Add(canvasView);
 
@@ -239,9 +242,9 @@ int UtcDaliCanvasViewChangeSizeP(void)
   application.Render();
 
   Property::Value pv = canvasView.GetProperty(Actor::Property::SIZE);
-  Vector3 v3;
+  Vector3         v3;
   pv.Get(v3);
-  DALI_TEST_EQUALS( v3, Vector3(300, 300, 0), TEST_LOCATION );
+  DALI_TEST_EQUALS(v3, Vector3(300, 300, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -250,8 +253,8 @@ int UtcDaliCanvasViewSizeN(void)
 {
   ToolkitTestApplication application;
 
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   application.GetScene().Add(canvasView);
 
@@ -261,253 +264,140 @@ int UtcDaliCanvasViewSizeN(void)
   application.Render();
 
   Property::Value pv = canvasView.GetProperty(Actor::Property::SIZE);
-  Vector3 v3;
+  Vector3         v3;
   pv.Get(v3);
-  DALI_TEST_EQUALS( v3, Vector3(-999, -999, 0), TEST_LOCATION );
+  DALI_TEST_EQUALS(v3, Vector3(-999, -999, 0), TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliCanvasViewRasterizeTaskP(void)
+bool gRasterizationCompletedSignal = false;
+void rasteriztionCompleted(IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task)
 {
-  ToolkitTestApplication application;
-
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
-
-  Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
-
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
-
-  END_TEST;
+  gRasterizationCompletedSignal = true;
 }
 
-int UtcDaliCanvasViewRasterizeTaskGetCanvasViewP(void)
+int UtcDaliCanvasViewRasterizeTaskP(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
+  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100, 100));
+  DALI_TEST_CHECK(dummyInternalCanvasView);
 
   Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
+  DALI_TEST_CHECK(dummyCanvasRenderer);
 
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
-
-  DALI_TEST_EQUALS( task->GetCanvasView(), dummyInternalCanvasView, TEST_LOCATION );
+  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted));
+  DALI_TEST_CHECK(task);
 
   END_TEST;
 }
 
-int UtcDaliCanvasViewRasterizeTaskGetBufferSizeP(void)
+int UtcDaliCanvasViewRasterizeTaskAddTaskP(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
+  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100, 100));
+  DALI_TEST_CHECK(dummyInternalCanvasView);
 
   Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
+  DALI_TEST_CHECK(dummyCanvasRenderer);
 
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
+  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted));
+  DALI_TEST_CHECK(task);
 
-  //There is no rasterized buffer.
-  DALI_TEST_EQUALS( task->GetBufferSize(), Vector2(0, 0), TEST_LOCATION );
+  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task2 = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted));
+  DALI_TEST_CHECK(task2);
 
-  END_TEST;
-}
+  Dali::AsyncTaskManager asyncTaskManager = Dali::AsyncTaskManager::Get();
+  DALI_TEST_CHECK(asyncTaskManager);
 
-int UtcDaliCanvasViewRasterizeTaskGetPixelDataP(void)
-{
-
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
-
-  Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
-
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
-
-  DALI_TEST_EQUALS( task->GetPixelData(), PixelData(), TEST_LOCATION );
-
-  END_TEST;
-}
-
-int UtcDaliCanvasViewRasterizeThreadP(void)
-{
-  ToolkitTestApplication application;
-
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
-
-  Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
-
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
-
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread();
-  DALI_TEST_CHECK( dummyThread );
+  asyncTaskManager.AddTask(task);
+  asyncTaskManager.AddTask(task2);
 
   END_TEST;
 }
 
-int UtcDaliCanvasViewRasterizeThreadAddTaskP(void)
+int UtcDaliCanvasViewRasterizeTaskAddRemoveTaskP(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
+  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100, 100));
+  DALI_TEST_CHECK(dummyInternalCanvasView);
 
   Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
+  DALI_TEST_CHECK(dummyCanvasRenderer);
 
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
+  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted));
+  DALI_TEST_CHECK(task);
 
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task2 = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task2 );
+  Dali::AsyncTaskManager asyncTaskManager = Dali::AsyncTaskManager::Get();
+  DALI_TEST_CHECK(asyncTaskManager);
 
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread();
-  DALI_TEST_CHECK( dummyThread );
+  asyncTaskManager.AddTask(task);
 
-  dummyThread->AddTask(task);
-  dummyThread->AddTask(task2);
+  asyncTaskManager.RemoveTask(task);
 
   END_TEST;
 }
 
-int UtcDaliCanvasViewRasterizeThreadAddRemoveTaskP(void)
+PixelData CreatePixelData(unsigned int width, unsigned int height)
 {
-  ToolkitTestApplication application;
-
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
-
-  Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
+  unsigned int bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
 
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
+  unsigned char* buffer    = reinterpret_cast<unsigned char*>(malloc(bufferSize));
+  PixelData      pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
 
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread();
-  DALI_TEST_CHECK( dummyThread );
-
-  dummyThread->AddTask(task);
-
-  dummyThread->RemoveTask(dummyInternalCanvasView);
-
-  END_TEST;
+  return pixelData;
 }
 
-int UtcDaliCanvasViewRasterizeThreadApplyRasterizedP(void)
+int UtcDaliCanvasViewRasterizeThreadRasterizationCompletedSignalP(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
-
-  Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
-
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
-
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread();
-  DALI_TEST_CHECK( dummyThread );
-
-  dummyThread->AddTask(task);
+  gRasterizationCompletedSignal = false;
 
-  dummyThread->ApplyRasterized();
-
-  END_TEST;
-}
-
-int UtcDaliCanvasViewRasterizeThreadTerminateThreadP(void)
-{
-  ToolkitTestApplication application;
-
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
+  Dali::Toolkit::CanvasView            canvasView              = Dali::Toolkit::CanvasView::New(Vector2(100, 100));
 
   Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
-
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
+  DALI_TEST_CHECK(dummyCanvasRenderer);
 
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread();
-  DALI_TEST_CHECK( dummyThread );
+  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted));
+  DALI_TEST_CHECK(task);
 
-  dummyThread->AddTask(task);
+  Dali::AsyncTaskManager asyncTaskManager = Dali::AsyncTaskManager::Get();
+  DALI_TEST_CHECK(asyncTaskManager);
 
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread::TerminateThread(dummyThread);
+  asyncTaskManager.AddTask(task);
 
-  END_TEST;
-}
-
-PixelData CreatePixelData( unsigned int width, unsigned int height )
-{
-  unsigned int bufferSize = width*height*Pixel::GetBytesPerPixel( Pixel::RGBA8888 );
-
-  unsigned char* buffer= reinterpret_cast<unsigned char*>( malloc( bufferSize ) );
-  PixelData pixelData = PixelData::New( buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE );
-
-  return pixelData;
-}
-
-int UtcDaliCanvasViewRasterizeThreadCallProcessP(void)
-{
-  ToolkitTestApplication application;
-
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
-
-  Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
-
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
-
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread();
-  DALI_TEST_CHECK( dummyThread );
-
-  dummyThread->AddTask(task);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
 
-  dummyThread->Process(false);
+  DALI_TEST_EQUALS(gRasterizationCompletedSignal, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliCanvasViewRasterizeThreadRasterizationCompletedSignalP(void)
+int UtcDaliCanvasViewSetSizeAndAddDrawable(void)
 {
   ToolkitTestApplication application;
 
-  Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100));
-  DALI_TEST_CHECK( dummyInternalCanvasView );
-
-  Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100));
-  DALI_TEST_CHECK( dummyCanvasRenderer );
+  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
-  IntrusivePtr<Dali::Toolkit::Internal::CanvasRendererRasterizingTask> task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer);
-  DALI_TEST_CHECK( task );
+  application.GetScene().Add(canvasView);
 
-  Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread();
-  DALI_TEST_CHECK( dummyThread );
+  canvasView.SetProperty(Actor::Property::SIZE, Vector2(300, 300));
 
-  dummyThread->AddTask(task);
+  application.SendNotification();
+  application.Render();
 
-  dummyThread->Process(false);
+  Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New();
 
-  PixelData pixelData = CreatePixelData( 100, 100 );
+  shape.AddRect(Rect<float>(10, 10, 10, 10), Vector2(0, 0));
 
-  dummyThread->RasterizationCompletedSignal().Connect(dummyInternalCanvasView, &Dali::Toolkit::Internal::CanvasView::ApplyRasterizedImage);
-  dummyThread->RasterizationCompletedSignal().Emit(pixelData);
+  canvasView.AddDrawable(shape);
 
   application.SendNotification();
   application.Render();
@@ -515,15 +405,16 @@ int UtcDaliCanvasViewRasterizeThreadRasterizationCompletedSignalP(void)
   END_TEST;
 }
 
-int UtcDaliCanvasViewSetSizeAndAddDrawable(void)
+int UtcDaliCanvasViewSetSizeAndAddDrawableAsync(void)
 {
   ToolkitTestApplication application;
 
-  CanvasView canvasView = CanvasView::New(Vector2(100,100));
-  DALI_TEST_CHECK( canvasView );
+  CanvasView canvasView = CanvasView::New(Vector2(100, 100));
+  DALI_TEST_CHECK(canvasView);
 
   application.GetScene().Add(canvasView);
 
+  canvasView.SetProperty(Toolkit::CanvasView::Property::SYNCHRONOUS_LOADING, false);
   canvasView.SetProperty(Actor::Property::SIZE, Vector2(300, 300));
 
   application.SendNotification();
@@ -538,7 +429,7 @@ int UtcDaliCanvasViewSetSizeAndAddDrawable(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -551,7 +442,7 @@ int UtcDaliCanvasViewViewBoxP(void)
   ToolkitTestApplication application;
 
   CanvasView canvasView = CanvasView::New(Vector2(300, 300));
-  DALI_TEST_CHECK( canvasView );
+  DALI_TEST_CHECK(canvasView);
 
   application.GetScene().Add(canvasView);
 
@@ -569,7 +460,7 @@ int UtcDaliCanvasViewViewBoxN(void)
   ToolkitTestApplication application;
 
   CanvasView canvasView = CanvasView::New(Vector2(300, 300));
-  DALI_TEST_CHECK( canvasView );
+  DALI_TEST_CHECK(canvasView);
 
   application.GetScene().Add(canvasView);
 
@@ -580,7 +471,35 @@ int UtcDaliCanvasViewViewBoxN(void)
   application.Render();
 
   Vector2 viewBox = canvasView.GetProperty(Toolkit::CanvasView::Property::VIEW_BOX).Get<Vector2>();
-  DALI_TEST_EQUALS( viewBox, Vector2(-999, -999), TEST_LOCATION );
+  DALI_TEST_EQUALS(viewBox, Vector2(-999, -999), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliCanvasViewSychronousLoading(void)
+{
+  ToolkitTestApplication application;
+
+  CanvasView canvasView = CanvasView::New(Vector2(300, 300));
+  DALI_TEST_CHECK(canvasView);
+
+  application.GetScene().Add(canvasView);
+
+  canvasView.SetProperty(Actor::Property::SIZE, Vector2(300, 300));
+
+  application.SendNotification();
+  application.Render();
+
+  bool isSynchronous = canvasView.GetProperty(Toolkit::CanvasView::Property::SYNCHRONOUS_LOADING).Get<bool>();
+  DALI_TEST_EQUALS(isSynchronous, true, TEST_LOCATION);
+
+  canvasView.SetProperty(Toolkit::CanvasView::Property::SYNCHRONOUS_LOADING, false);
+
+  application.SendNotification();
+  application.Render();
+
+  isSynchronous = canvasView.GetProperty(Toolkit::CanvasView::Property::SYNCHRONOUS_LOADING).Get<bool>();
+  DALI_TEST_EQUALS(isSynchronous, false, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
index 799a069..abce046 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,42 +15,42 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <test-application.h>
-#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
+#include <test-application.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
 static bool gCheckBoxButtonState = false;
-bool CheckBoxButtonClicked( Button button )
+bool        CheckBoxButtonClicked(Button button)
 {
-  gCheckBoxButtonState = button.GetProperty<bool>(button.GetPropertyIndex("selected")) ;
+  gCheckBoxButtonState = button.GetProperty<bool>(button.GetPropertyIndex("selected"));
   return true;
 }
 
-static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-const Vector2 TEST_IMAGE_SIZE = Vector2( 66.0f, 66.0f );
+static const char* TEST_IMAGE_ONE  = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const Vector2      TEST_IMAGE_SIZE = Vector2(66.0f, 66.0f);
 
-static std::string GetButtonText( Button button )
+static std::string GetButtonText(Button button)
 {
-  Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+  Property::Value value = button.GetProperty(Toolkit::Button::Property::LABEL);
 
-  Property::Map *labelProperty = value.GetMap();
+  Property::Map* labelProperty = value.GetMap();
 
   std::string textLabel;
 
-  if ( labelProperty )
+  if(labelProperty)
   {
-    Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
-    value->Get( textLabel );
+    Property::Value* value = labelProperty->Find(Toolkit::TextVisual::Property::TEXT);
+    value->Get(textLabel);
   }
 
   return textLabel;
@@ -74,7 +74,7 @@ int UtcDaliCheckBoxButtonConstructorP(void)
 
   CheckBoxButton checkBox;
 
-  DALI_TEST_CHECK( !checkBox );
+  DALI_TEST_CHECK(!checkBox);
   END_TEST;
 }
 
@@ -85,8 +85,8 @@ int UtcDaliCheckBoxButtonCopyConstructorP(void)
   // Initialize an object, ref count == 1
   CheckBoxButton checkBox = CheckBoxButton::New();
 
-  CheckBoxButton copy( checkBox );
-  DALI_TEST_CHECK( copy );
+  CheckBoxButton copy(checkBox);
+  DALI_TEST_CHECK(copy);
   END_TEST;
 }
 
@@ -95,16 +95,16 @@ int UtcDaliCheckBoxButtonMoveConstructor(void)
   ToolkitTestApplication application;
 
   CheckBoxButton button = CheckBoxButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, false );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, false);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
 
-  CheckBoxButton moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  CheckBoxButton moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -115,10 +115,10 @@ int UtcDaliCheckBoxButtonAssignmentOperatorP(void)
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
-  CheckBoxButton copy( checkBox );
-  DALI_TEST_CHECK( copy );
+  CheckBoxButton copy(checkBox);
+  DALI_TEST_CHECK(copy);
 
-  DALI_TEST_CHECK( checkBox == copy );
+  DALI_TEST_CHECK(checkBox == copy);
   END_TEST;
 }
 
@@ -127,17 +127,17 @@ int UtcDaliCheckBoxButtonMoveAssignment(void)
   ToolkitTestApplication application;
 
   CheckBoxButton button = CheckBoxButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, false );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, false);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
 
   CheckBoxButton moved;
-  moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -148,7 +148,7 @@ int UtcDaliCheckBoxButtonNewP(void)
 
   CheckBoxButton checkBox = CheckBoxButton::New();
 
-  DALI_TEST_CHECK( checkBox );
+  DALI_TEST_CHECK(checkBox);
   END_TEST;
 }
 
@@ -160,10 +160,10 @@ int UtcDaliCheckBoxButtonDownCastP(void)
 
   BaseHandle object(checkBox);
 
-  CheckBoxButton checkBox2 = CheckBoxButton::DownCast( object );
+  CheckBoxButton checkBox2 = CheckBoxButton::DownCast(object);
   DALI_TEST_CHECK(checkBox2);
 
-  CheckBoxButton checkBox3 = DownCast< CheckBoxButton >(object);
+  CheckBoxButton checkBox3 = DownCast<CheckBoxButton>(object);
   DALI_TEST_CHECK(checkBox3);
   END_TEST;
 }
@@ -174,11 +174,11 @@ int UtcDaliCheckBoxButtonDownCastN(void)
 
   BaseHandle unInitializedObject;
 
-  CheckBoxButton checkBox1 = CheckBoxButton::DownCast( unInitializedObject );
-  DALI_TEST_CHECK( !checkBox1 );
+  CheckBoxButton checkBox1 = CheckBoxButton::DownCast(unInitializedObject);
+  DALI_TEST_CHECK(!checkBox1);
 
-  CheckBoxButton checkBox2 = DownCast< CheckBoxButton >( unInitializedObject );
-  DALI_TEST_CHECK( !checkBox2 );
+  CheckBoxButton checkBox2 = DownCast<CheckBoxButton>(unInitializedObject);
+  DALI_TEST_CHECK(!checkBox2);
   END_TEST;
 }
 
@@ -188,25 +188,25 @@ int UtcDaliCheckBoxButtonSelectedPropertyP(void)
   tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected");
 
   CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
+  checkBoxButton.StateChangedSignal().Connect(&CheckBoxButtonClicked);
 
   // global var used to check if CheckBoxButtonClicked is called;
   gCheckBoxButtonState = false;
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true );
+  checkBoxButton.SetProperty(checkBoxButton.GetPropertyIndex("selected"), true);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gCheckBoxButtonState);
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), false );
+  checkBoxButton.SetProperty(checkBoxButton.GetPropertyIndex("selected"), false);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), false, TEST_LOCATION );
-  DALI_TEST_CHECK( !gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gCheckBoxButtonState);
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true );
+  checkBoxButton.SetProperty(checkBoxButton.GetPropertyIndex("selected"), true);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty<bool>(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gCheckBoxButtonState);
   END_TEST;
 }
 
@@ -218,13 +218,13 @@ int UtcDaliCheckBoxSetLabelP(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT)
+    .Add(Toolkit::TextVisual::Property::TEXT, "activate")
+    .Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
 
-  checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
+  checkBox.SetProperty(checkBox.GetPropertyIndex("label"), propertyMap);
 
-  DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(checkBox), "activate", TEST_LOCATION);
   END_TEST;
 }
 
@@ -233,25 +233,25 @@ int UtcDaliCheckBoxSetDisabledPropertyP(void)
   ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
-  application.GetScene().Add( checkBox );
+  application.GetScene().Add(checkBox);
 
-  checkBox.SetProperty( Actor::Property::SIZE, Vector2( 20.0f, 20.0f ) );
-  checkBox.SetProperty(checkBox.GetPropertyIndex("disabledUnselectedBackgroundVisual"),  "Image.jpg" );
+  checkBox.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
+  checkBox.SetProperty(checkBox.GetPropertyIndex("disabledUnselectedBackgroundVisual"), "Image.jpg");
 
   application.SendNotification();
   application.Render();
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT)
+    .Add(Toolkit::TextVisual::Property::TEXT, "activate")
+    .Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
 
   checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true);
-  checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
+  checkBox.SetProperty(checkBox.GetPropertyIndex("label"), propertyMap);
 
-  DALI_TEST_EQUALS( checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION );
+  DALI_TEST_EQUALS(checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetButtonText(checkBox), "activate", TEST_LOCATION);
 
   END_TEST;
 }
@@ -263,11 +263,11 @@ int UtcDaliCheckBoxSettingDisabled(void)
   CheckBoxButton checkBox = CheckBoxButton::New();
 
   checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true);
-  DALI_TEST_CHECK(  checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
+  DALI_TEST_CHECK(checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")));
 
   checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), false);
 
-  DALI_TEST_CHECK(  !checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
+  DALI_TEST_CHECK(!checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")));
 
   END_TEST;
 }
@@ -282,31 +282,31 @@ int UtcDaliCheckBoxSetLabelPadding(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT)
+    .Add(Toolkit::TextVisual::Property::TEXT, "activate")
+    .Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
 
-  checkBox.SetProperty( Toolkit::Button::Property::LABEL, propertyMap );
+  checkBox.SetProperty(Toolkit::Button::Property::LABEL, propertyMap);
 
   application.SendNotification();
   application.Render();
 
   Vector3 orginalSize = checkBox.GetNaturalSize();
 
-  checkBox.SetProperty( Toolkit::DevelButton::Property::LABEL_PADDING, Vector4( 10.0f, 10.0f, 10.0f, 10.0f ) );
+  checkBox.SetProperty(Toolkit::DevelButton::Property::LABEL_PADDING, Vector4(10.0f, 10.0f, 10.0f, 10.0f));
 
   application.SendNotification();
   application.Render();
 
   Vector3 paddingAddedSize = checkBox.GetNaturalSize();
 
-  DALI_TEST_EQUALS( checkBox.GetProperty<Vector4>( Toolkit::DevelButton::Property::LABEL_PADDING ), Vector4( 10.0f, 10.0f, 10.0f, 10.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(checkBox.GetProperty<Vector4>(Toolkit::DevelButton::Property::LABEL_PADDING), Vector4(10.0f, 10.0f, 10.0f, 10.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   tet_infoline("Comparing original size of button with just text and button size with text and padding\n");
 
-  DALI_TEST_EQUALS( orginalSize.width +10.0f + 10.0f , paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(orginalSize.width + 10.0f + 10.0f, paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( orginalSize.height +10.0f + 10.0f , paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(orginalSize.height + 10.0f + 10.0f, paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
@@ -321,50 +321,49 @@ int UtcDaliCheckBoxSetForegroundPadding(void)
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT)
+    .Add(Toolkit::TextVisual::Property::TEXT, "activate")
+    .Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
 
-  checkBox.SetProperty( Toolkit::Button::Property::LABEL, propertyMap );
-  checkBox.SetProperty( Toolkit::DevelButton::Property::LABEL_PADDING, Vector4( 5.0f, 5.0f, 5.0f, 5.0f ) );
+  checkBox.SetProperty(Toolkit::Button::Property::LABEL, propertyMap);
+  checkBox.SetProperty(Toolkit::DevelButton::Property::LABEL_PADDING, Vector4(5.0f, 5.0f, 5.0f, 5.0f));
 
   application.SendNotification();
   application.Render();
 
-  tet_printf( "Button RelayoutSize with text(%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height );
+  tet_printf("Button RelayoutSize with text(%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height);
 
   TestPlatformAbstraction& platform = application.GetPlatform();
-  platform.SetClosestImageSize( TEST_IMAGE_SIZE );
-
-  checkBox.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE );
-  checkBox.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE );
+  platform.SetClosestImageSize(TEST_IMAGE_SIZE);
 
+  checkBox.SetProperty(Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE);
+  checkBox.SetProperty(Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE);
 
   application.SendNotification();
   application.Render();
 
   Vector3 preVisualPaddingSize = checkBox.GetNaturalSize();
 
-  tet_printf( "Button RelayoutSize with text and icon (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height );
+  tet_printf("Button RelayoutSize with text and icon (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height);
 
-  checkBox.SetProperty( Toolkit::DevelButton::Property::VISUAL_PADDING, Vector4( 25.0f, 25.0f, 25.0f, 25.0f ) );
+  checkBox.SetProperty(Toolkit::DevelButton::Property::VISUAL_PADDING, Vector4(25.0f, 25.0f, 25.0f, 25.0f));
 
   application.SendNotification();
   application.Render();
 
   Vector3 paddingAddedSize = checkBox.GetNaturalSize();
 
-  tet_printf( "Button RelayoutSize with text, icon and padding (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height );
+  tet_printf("Button RelayoutSize with text, icon and padding (%f,%f)\n", checkBox.GetNaturalSize().width, checkBox.GetNaturalSize().height);
 
-  DALI_TEST_EQUALS( checkBox.GetProperty<Vector4>( Toolkit::DevelButton::Property::VISUAL_PADDING ), Vector4( 25.0f, 25.0f, 25.0f, 25.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(checkBox.GetProperty<Vector4>(Toolkit::DevelButton::Property::VISUAL_PADDING), Vector4(25.0f, 25.0f, 25.0f, 25.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   tet_infoline("Comparing original size of button before adding padding to visual foreground\n");
 
-  DALI_TEST_GREATER( paddingAddedSize.width, preVisualPaddingSize.width , TEST_LOCATION );
+  DALI_TEST_GREATER(paddingAddedSize.width, preVisualPaddingSize.width, TEST_LOCATION);
 
   tet_infoline("Text and Visual are side by side, visual height and padding must be greater than text height and padding for this test\n");
 
-  DALI_TEST_GREATER( paddingAddedSize.height, preVisualPaddingSize.height , TEST_LOCATION );
+  DALI_TEST_GREATER(paddingAddedSize.height, preVisualPaddingSize.height, TEST_LOCATION);
 
   END_TEST;
 }
@@ -377,25 +376,25 @@ int UtcDaliCheckBoxButtonSetGetSelected(void)
   tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected");
 
   CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
+  checkBoxButton.StateChangedSignal().Connect(&CheckBoxButtonClicked);
 
   // global var used to check if CheckBoxButtonClicked is called;
   gCheckBoxButtonState = false;
 
-  checkBoxButton.SetProperty( Button::Property::SELECTED, true );
+  checkBoxButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty( Button::Property::SELECTED ).Get<bool>(), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty(Button::Property::SELECTED).Get<bool>(), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gCheckBoxButtonState);
 
-  checkBoxButton.SetProperty( Button::Property::SELECTED, false );
+  checkBoxButton.SetProperty(Button::Property::SELECTED, false);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty( Button::Property::SELECTED ).Get<bool>(), false, TEST_LOCATION );
-  DALI_TEST_CHECK( !gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty(Button::Property::SELECTED).Get<bool>(), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gCheckBoxButtonState);
 
-  checkBoxButton.SetProperty( Button::Property::SELECTED, true );
+  checkBoxButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( checkBoxButton.GetProperty( Button::Property::SELECTED ).Get<bool>(), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gCheckBoxButtonState );
+  DALI_TEST_EQUALS(checkBoxButton.GetProperty(Button::Property::SELECTED).Get<bool>(), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gCheckBoxButtonState);
   END_TEST;
 }
 
@@ -404,25 +403,25 @@ int UtcDaliCheckBoxSetLabelDisabledP(void)
   ToolkitTestApplication application;
 
   CheckBoxButton checkBox = CheckBoxButton::New();
-  application.GetScene().Add( checkBox );
+  application.GetScene().Add(checkBox);
 
-  checkBox.SetProperty( Actor::Property::SIZE, Vector2( 20.0f, 20.0f ) );
-  checkBox.SetProperty(Button::Property::DISABLED_UNSELECTED_VISUAL, "Image.jpg" );
+  checkBox.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
+  checkBox.SetProperty(Button::Property::DISABLED_UNSELECTED_VISUAL, "Image.jpg");
 
   application.SendNotification();
   application.Render();
 
   Property::Map propertyMap;
 
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-             .Add( Toolkit::TextVisual::Property::TEXT, "activate" )
-             .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT)
+    .Add(Toolkit::TextVisual::Property::TEXT, "activate")
+    .Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
 
   checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true);
-  checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap );
+  checkBox.SetProperty(checkBox.GetPropertyIndex("label"), propertyMap);
 
-  DALI_TEST_CHECK(  checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")) );
-  DALI_TEST_EQUALS( GetButtonText(checkBox), "activate", TEST_LOCATION );
+  DALI_TEST_CHECK(checkBox.GetProperty<bool>(checkBox.GetPropertyIndex("disabled")));
+  DALI_TEST_EQUALS(GetButtonText(checkBox), "activate", TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp
index 8bdddfe..d30a397 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/popup/confirmation-popup.h>
 
@@ -38,7 +39,6 @@ void utc_dali_toolkit_confirmation_popup_cleanup(void)
 
 namespace
 {
-
 static bool gObjectCreatedCallBackCalled;
 
 static void TestCallback(BaseHandle handle)
@@ -88,131 +88,130 @@ struct ConfirmationPopupCancelTestFunctor
 
 } // unnamed namespace.
 
-
-int UtcDaliConfirmationPopupNewP( void )
+int UtcDaliConfirmationPopupNewP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliConfirmationPopupNewP" );
+  tet_infoline(" UtcDaliConfirmationPopupNewP");
 
   // Create the ConfirmationPopup.
   ConfirmationPopup popup;
 
-  DALI_TEST_CHECK( !popup );
+  DALI_TEST_CHECK(!popup);
 
   popup = ConfirmationPopup::New();
 
-  DALI_TEST_CHECK( popup );
+  DALI_TEST_CHECK(popup);
 
-  ConfirmationPopup popup2( popup );
+  ConfirmationPopup popup2(popup);
 
-  DALI_TEST_CHECK( popup2 == popup );
+  DALI_TEST_CHECK(popup2 == popup);
 
   // Additional check to ensure object is created by checking if it's registered.
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     ConfirmationPopup popup = ConfirmationPopup::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
-int UtcDaliConfirmationPopupDestructorP( void )
+int UtcDaliConfirmationPopupDestructorP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliConfirmationPopupDestructorP" );
+  tet_infoline(" UtcDaliConfirmationPopupDestructorP");
 
   ConfirmationPopup* popup = new ConfirmationPopup();
   delete popup;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
 int UtcDaliConfirmationPopupDownCastP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliConfirmationPopupDownCastP" );
+  tet_infoline(" UtcDaliConfirmationPopupDownCastP");
 
   Handle handle = ConfirmationPopup::New();
 
-  ConfirmationPopup popup = ConfirmationPopup::DownCast( handle );
+  ConfirmationPopup popup = ConfirmationPopup::DownCast(handle);
 
-  DALI_TEST_CHECK( popup == handle );
+  DALI_TEST_CHECK(popup == handle);
   END_TEST;
 }
 
 int UtcDaliConfirmationPopupDynamicSignalGenerationP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliConfirmationPopupDynamicSignalGenerationP" );
+  tet_infoline(" UtcDaliConfirmationPopupDynamicSignalGenerationP");
 
   ConfirmationPopup popup = ConfirmationPopup::New();
 
-  TextLabel titleActor = TextLabel::New( "Title" );
-  popup.SetTitle( titleActor );
+  TextLabel titleActor = TextLabel::New("Title");
+  popup.SetTitle(titleActor);
 
-  TextLabel contentActor = TextLabel::New( "Content" );
-  popup.SetContent( contentActor );
+  TextLabel contentActor = TextLabel::New("Content");
+  popup.SetContent(contentActor);
 
   Actor footerActor = Actor::New();
 
   // The confirmation popup can use any control type for the ok or cancel buttons.
   // It requires that the name is "controlOk" to provide the "controlSignalOk" signal.
   PushButton buttonOK = PushButton::New();
-  buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOk" );
-  footerActor.Add( buttonOK );
+  buttonOK.SetProperty(Dali::Actor::Property::NAME, "controlOk");
+  footerActor.Add(buttonOK);
 
   PushButton buttonCancel = PushButton::New();
-  buttonCancel.SetProperty( Dali::Actor::Property::NAME, "controlCancel" );
-  footerActor.Add( buttonCancel );
+  buttonCancel.SetProperty(Dali::Actor::Property::NAME, "controlCancel");
+  footerActor.Add(buttonCancel);
 
-  popup.SetFooter( footerActor );
+  popup.SetFooter(footerActor);
 
   // Tell the confirmation popup to connect to the signal in our button called "onScene".
-  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene" );
+  popup.SetProperty(Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene");
   std::string resultProperty;
-  DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED ).Get( resultProperty ) );
-  DALI_TEST_EQUALS( resultProperty, "onScene",  TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED).Get(resultProperty));
+  DALI_TEST_EQUALS(resultProperty, "onScene", TEST_LOCATION);
 
   // Connect to the confirmation popup's OK signal. This signal is dynamically created upon connection.
-  gSignalReceivedOK = false;
-  gSignalReceivedCancel = false;
+  gSignalReceivedOK                        = false;
+  gSignalReceivedCancel                    = false;
   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
-  popup.ConnectSignal( testTracker, "controlSignalOk",   ConfirmationPopupOKTestFunctor() );
+  popup.ConnectSignal(testTracker, "controlSignalOk", ConfirmationPopupOKTestFunctor());
 
   // Check no signal has occurred yet.
-  DALI_TEST_CHECK( !gSignalReceivedOK );
-  DALI_TEST_CHECK( !gSignalReceivedCancel );
+  DALI_TEST_CHECK(!gSignalReceivedOK);
+  DALI_TEST_CHECK(!gSignalReceivedCancel);
 
   // Provoke the signal.
-  application.GetScene().Add( popup );
+  application.GetScene().Add(popup);
 
   // Check the signal has occurred.
-  DALI_TEST_CHECK( gSignalReceivedOK );
-  DALI_TEST_CHECK( !gSignalReceivedCancel );
+  DALI_TEST_CHECK(gSignalReceivedOK);
+  DALI_TEST_CHECK(!gSignalReceivedCancel);
 
   // Remove the popup from the stage, and connect the cancel signal.
   popup.Unparent();
-  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "onScene" );
-  DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED ).Get( resultProperty ) );
-  DALI_TEST_EQUALS( resultProperty, "onScene",  TEST_LOCATION );
+  popup.SetProperty(Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "onScene");
+  DALI_TEST_CHECK(popup.GetProperty(Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED).Get(resultProperty));
+  DALI_TEST_EQUALS(resultProperty, "onScene", TEST_LOCATION);
 
-  popup.ConnectSignal( testTracker, "controlSignalCancel",   ConfirmationPopupCancelTestFunctor() );
+  popup.ConnectSignal(testTracker, "controlSignalCancel", ConfirmationPopupCancelTestFunctor());
 
   // Check the cancel signal has not occurred yet.
-  DALI_TEST_CHECK( gSignalReceivedOK );
-  DALI_TEST_CHECK( !gSignalReceivedCancel );
+  DALI_TEST_CHECK(gSignalReceivedOK);
+  DALI_TEST_CHECK(!gSignalReceivedCancel);
 
   // Provoke the signal.
-  application.GetScene().Add( popup );
+  application.GetScene().Add(popup);
 
   // Check the cancel signal has occurred.
-  DALI_TEST_CHECK( gSignalReceivedOK );
-  DALI_TEST_CHECK( gSignalReceivedCancel );
+  DALI_TEST_CHECK(gSignalReceivedOK);
+  DALI_TEST_CHECK(gSignalReceivedCancel);
 
   END_TEST;
 }
@@ -220,69 +219,66 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void)
 int UtcDaliConfirmationPopupDynamicSignalGenerationN(void)
 {
   ToolkitTestApplication application;
-   tet_infoline( " UtcDaliConfirmationPopupDynamicSignalGenerationN" );
+  tet_infoline(" UtcDaliConfirmationPopupDynamicSignalGenerationN");
 
-   ConfirmationPopup popup = ConfirmationPopup::New();
+  ConfirmationPopup popup = ConfirmationPopup::New();
 
-   TextLabel titleActor = TextLabel::New( "Title" );
-   popup.SetTitle( titleActor );
+  TextLabel titleActor = TextLabel::New("Title");
+  popup.SetTitle(titleActor);
 
-   TextLabel contentActor = TextLabel::New( "Content" );
-   popup.SetContent( contentActor );
+  TextLabel contentActor = TextLabel::New("Content");
+  popup.SetContent(contentActor);
 
-   Actor footerActor = Actor::New();
+  Actor footerActor = Actor::New();
 
-   PushButton buttonOK = PushButton::New();
-   buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOkMisnamed" );
-   popup.SetFooter( buttonOK );
+  PushButton buttonOK = PushButton::New();
+  buttonOK.SetProperty(Dali::Actor::Property::NAME, "controlOkMisnamed");
+  popup.SetFooter(buttonOK);
 
-   // Tell the confirmation popup to connect to the signal in our button called "onScene".
-   popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene" );
+  // Tell the confirmation popup to connect to the signal in our button called "onScene".
+  popup.SetProperty(Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene");
 
-   // Connect to the confirmation popup's OK signal.
-   gSignalReceivedOK = false;
+  // Connect to the confirmation popup's OK signal.
+  gSignalReceivedOK = false;
 
-   // The connection will fail at this point as no actor with the name "controlOk" will be located.
-   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
-   popup.ConnectSignal( testTracker, "controlSignalOk",   ConfirmationPopupOKTestFunctor() );
+  // The connection will fail at this point as no actor with the name "controlOk" will be located.
+  TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
+  popup.ConnectSignal(testTracker, "controlSignalOk", ConfirmationPopupOKTestFunctor());
 
-   // Check no signal has occurred yet.
-   DALI_TEST_CHECK( !gSignalReceivedOK );
+  // Check no signal has occurred yet.
+  DALI_TEST_CHECK(!gSignalReceivedOK);
 
-   // Provoke the signal.
-   application.GetScene().Add( popup );
+  // Provoke the signal.
+  application.GetScene().Add(popup);
 
-   // Check the signal has still not occurred, as our button was incorrectly named.
-   DALI_TEST_CHECK( !gSignalReceivedOK );
+  // Check the signal has still not occurred, as our button was incorrectly named.
+  DALI_TEST_CHECK(!gSignalReceivedOK);
 
-   END_TEST;
+  END_TEST;
 }
 
 int UtcDaliConfirmationPopupTypeRegistryCreation(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliConfirmationPopupTypeRegistryCreation" );
+  tet_infoline(" UtcDaliConfirmationPopupTypeRegistryCreation");
 
-  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "ConfirmationPopup" );
-  DALI_TEST_CHECK( typeInfo )
+  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo("ConfirmationPopup");
+  DALI_TEST_CHECK(typeInfo)
 
   BaseHandle baseHandle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( baseHandle )
+  DALI_TEST_CHECK(baseHandle)
 
-  Toolkit::Popup popup = Toolkit::Popup::DownCast( baseHandle );
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
+  Toolkit::Popup popup = Toolkit::Popup::DownCast(baseHandle);
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
 
-  application.GetScene().Add( popup );
-  popup.SetDisplayState( Toolkit::Popup::SHOWN );
+  application.GetScene().Add(popup);
+  popup.SetDisplayState(Toolkit::Popup::SHOWN);
 
   application.SendNotification();
   application.Render();
 
   // Check the popup is shown.
-  DALI_TEST_EQUALS( popup.GetDisplayState(), Popup::SHOWN, TEST_LOCATION );
+  DALI_TEST_EQUALS(popup.GetDisplayState(), Popup::SHOWN, TEST_LOCATION);
 
   END_TEST;
 }
-
-
-
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
index 221bac0..8000f62 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,20 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/public-api/align-enumerations.h>
-#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
-
+#include <dali-toolkit/public-api/align-enumerations.h>
+#include <dali.h>
 
 #include <toolkit-event-thread-callback.h>
 
@@ -52,7 +51,6 @@ void utc_dali_toolkit_control_cleanup(void)
 
 namespace
 {
-
 bool gObjectCreatedCallBackCalled;
 
 void TestCallback(BaseHandle handle)
@@ -66,38 +64,38 @@ void TestVoidCallback()
 
 static bool gKeyInputFocusCallBackCalled;
 
-static void TestKeyInputFocusCallback( Control control )
+static void TestKeyInputFocusCallback(Control control)
 {
   tet_infoline(" TestKeyInputFocusCallback");
 
   gKeyInputFocusCallBackCalled = true;
 }
 
-const char* TEST_LARGE_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/tbcol.png";
-const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/Kid1.svg";
+const char* TEST_LARGE_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/tbcol.png";
+const char* TEST_IMAGE_FILE_NAME       = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const char* TEST_SVG_FILE_NAME         = TEST_RESOURCE_DIR "/svg1.svg";
 
-Vector4 GetControlBackgroundColor( Control& control )
+Vector4 GetControlBackgroundColor(Control& control)
 {
-  Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR ) );
+  Property::Value propValue = control.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  resultMap = propValue.GetMap();
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR));
 
   Vector4 color;
-  resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get( color );
+  resultMap->Find(ColorVisual::Property::MIX_COLOR)->Get(color);
 
   return color;
 }
 
 bool gResourceReadySignalFired = false;
 
-void ResourceReadySignal( Control control )
+void ResourceReadySignal(Control control)
 {
-  if( control.GetVisualResourceStatus( Control::Property::BACKGROUND ) == Visual::ResourceStatus::FAILED )
+  if(control.GetVisualResourceStatus(Control::Property::BACKGROUND) == Visual::ResourceStatus::FAILED)
   {
     Property::Map propertyMap;
-    propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME );
-    control.SetProperty( Control::Property::BACKGROUND, propertyMap );
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME);
+    control.SetProperty(Control::Property::BACKGROUND, propertyMap);
   }
 
   gResourceReadySignalFired = true;
@@ -107,50 +105,48 @@ void ResourceReadySignal( Control control )
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 int UtcDaliControlConstructor(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   DummyControl dummy;
 
-  DALI_TEST_CHECK( !Control::DownCast(dummy) );
+  DALI_TEST_CHECK(!Control::DownCast(dummy));
 
   dummy = DummyControl::New();
 
-  DALI_TEST_CHECK( Control::DownCast(dummy) );
+  DALI_TEST_CHECK(Control::DownCast(dummy));
   END_TEST;
 }
 
 int UtcDaliControlNew(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control;
 
-  DALI_TEST_CHECK( !Control::DownCast(control) );
+  DALI_TEST_CHECK(!Control::DownCast(control));
 
   control = Control::New();
 
-  DALI_TEST_CHECK( Control::DownCast(control) );
+  DALI_TEST_CHECK(Control::DownCast(control));
   END_TEST;
 }
 
-
 int UtcDaliControlRegister(void)
 {
   ToolkitTestApplication application;
 
   // Ensure the object is registered after creation
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     Alignment alignment = Alignment::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -159,25 +155,25 @@ int UtcDaliControlCopyAndAssignment(void)
   ToolkitTestApplication application;
 
   DummyControl control = DummyControl::New();
-  Control emptyControl;
+  Control      emptyControl;
 
-  Control controlCopy( control );
-  DALI_TEST_CHECK( control == controlCopy );
+  Control controlCopy(control);
+  DALI_TEST_CHECK(control == controlCopy);
 
-  Control emptyControlCopy( emptyControl );
-  DALI_TEST_CHECK( emptyControl == emptyControlCopy );
+  Control emptyControlCopy(emptyControl);
+  DALI_TEST_CHECK(emptyControl == emptyControlCopy);
 
   Control controlEquals;
   controlEquals = control;
-  DALI_TEST_CHECK( control == controlEquals );
+  DALI_TEST_CHECK(control == controlEquals);
 
   Control emptyControlEquals;
   emptyControlEquals = emptyControl;
-  DALI_TEST_CHECK( emptyControl == emptyControlEquals );
+  DALI_TEST_CHECK(emptyControl == emptyControlEquals);
 
   // Self assignment
   control = control;
-  DALI_TEST_CHECK( control == controlCopy );
+  DALI_TEST_CHECK(control == controlCopy);
   END_TEST;
 }
 
@@ -186,15 +182,15 @@ int UtcDaliControlMoveConstructor(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  DALI_TEST_EQUALS( 1, control.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  control.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == control.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, control.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  control.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == control.GetProperty<bool>(Actor::Property::SENSITIVE));
 
-  Control moved = std::move( control );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !control );
+  Control moved = std::move(control);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!control);
 
   END_TEST;
 }
@@ -204,16 +200,16 @@ int UtcDaliControlMoveAssignment(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  DALI_TEST_EQUALS( 1, control.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  control.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == control.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, control.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  control.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == control.GetProperty<bool>(Actor::Property::SENSITIVE));
 
   Control moved;
-  moved = std::move( control );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !control );
+  moved = std::move(control);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!control);
 
   END_TEST;
 }
@@ -224,19 +220,19 @@ int UtcDaliControlDownCast(void)
 
   DummyControl control;
 
-  DALI_TEST_CHECK( !Control::DownCast( control ) );
+  DALI_TEST_CHECK(!Control::DownCast(control));
 
   control = DummyControl::New();
 
-  DALI_TEST_CHECK( Control::DownCast( control ) );
+  DALI_TEST_CHECK(Control::DownCast(control));
 
   Actor actor;
 
-  DALI_TEST_CHECK( !Control::DownCast( actor ) );
+  DALI_TEST_CHECK(!Control::DownCast(actor));
 
   actor = Actor::New();
 
-  DALI_TEST_CHECK( !Control::DownCast( actor ) );
+  DALI_TEST_CHECK(!Control::DownCast(actor));
   END_TEST;
 }
 
@@ -246,19 +242,19 @@ int UtcDaliControlDownCastTemplate(void)
 
   DummyControl control;
 
-  DALI_TEST_CHECK( !DummyControl::DownCast( control ));
+  DALI_TEST_CHECK(!DummyControl::DownCast(control));
 
   control = DummyControl::New();
 
-  DALI_TEST_CHECK( DummyControl::DownCast( control ) );
+  DALI_TEST_CHECK(DummyControl::DownCast(control));
 
   Actor actor;
 
-  DALI_TEST_CHECK( !DummyControl::DownCast( actor ) );
+  DALI_TEST_CHECK(!DummyControl::DownCast(actor));
 
   actor = Actor::New();
 
-  DALI_TEST_CHECK( !DummyControl::DownCast( actor ) );
+  DALI_TEST_CHECK(!DummyControl::DownCast(actor));
   END_TEST;
 }
 
@@ -267,30 +263,36 @@ int UtcDaliControlNavigationProperties(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  application.GetScene().Add( control );
-
-  DALI_TEST_EQUALS( -1, control.GetProperty( DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( -1, control.GetProperty( DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( -1, control.GetProperty( DevelControl::Property::UP_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( -1, control.GetProperty( DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-
-  control.SetProperty( DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, 1 );
-  DALI_TEST_EQUALS( 1, control.GetProperty( DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  control.SetProperty( DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, 2 );
-  DALI_TEST_EQUALS( 2, control.GetProperty( DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  control.SetProperty( DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, 3 );
-  DALI_TEST_EQUALS( 3, control.GetProperty( DevelControl::Property::UP_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  control.SetProperty( DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, 4 );
-  DALI_TEST_EQUALS( 4, control.GetProperty( DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-
-  control.SetProperty( DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, 15 );
-  DALI_TEST_EQUALS( 15, control.GetProperty( DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  control.SetProperty( DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, 16 );
-  DALI_TEST_EQUALS( 16, control.GetProperty( DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  control.SetProperty( DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, 17 );
-  DALI_TEST_EQUALS( 17, control.GetProperty( DevelControl::Property::UP_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
-  control.SetProperty( DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, 18 );
-  DALI_TEST_EQUALS( 18, control.GetProperty( DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
+  application.GetScene().Add(control);
+
+  DALI_TEST_EQUALS(-1, control.GetProperty(DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(-1, control.GetProperty(DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(-1, control.GetProperty(DevelControl::Property::UP_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(-1, control.GetProperty(DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(-1, control.GetProperty(DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(-1, control.GetProperty(DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+
+  control.SetProperty(DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, 1);
+  DALI_TEST_EQUALS(1, control.GetProperty(DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, 2);
+  DALI_TEST_EQUALS(2, control.GetProperty(DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, 3);
+  DALI_TEST_EQUALS(3, control.GetProperty(DevelControl::Property::UP_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, 4);
+  DALI_TEST_EQUALS(4, control.GetProperty(DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+
+  control.SetProperty(DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, 15);
+  DALI_TEST_EQUALS(15, control.GetProperty(DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, 16);
+  DALI_TEST_EQUALS(16, control.GetProperty(DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, 17);
+  DALI_TEST_EQUALS(17, control.GetProperty(DevelControl::Property::UP_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, 18);
+  DALI_TEST_EQUALS(18, control.GetProperty(DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID, 19);
+  DALI_TEST_EQUALS(19, control.GetProperty(DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
+  control.SetProperty(DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID, 20);
+  DALI_TEST_EQUALS(20, control.GetProperty(DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID).Get<int>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -298,35 +300,35 @@ int UtcDaliControlNavigationProperties(void)
 int UtcDaliControlKeyInputFocus(void)
 {
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   DummyControl control;
 
   PushButton pushButton1 = PushButton::New();
-  stage.Add( pushButton1 );
+  stage.Add(pushButton1);
 
   pushButton1.SetKeyInputFocus();
-  DALI_TEST_CHECK( pushButton1.HasKeyInputFocus() );
+  DALI_TEST_CHECK(pushButton1.HasKeyInputFocus());
 
   pushButton1.ClearKeyInputFocus();
-  DALI_TEST_CHECK( !pushButton1.HasKeyInputFocus() );
+  DALI_TEST_CHECK(!pushButton1.HasKeyInputFocus());
   END_TEST;
 }
 
 int UtcDaliControlGetImplementationN(void)
 {
   ToolkitTestApplication application;
-  DummyControl control;
+  DummyControl           control;
 
   // Get Empty
   {
     try
     {
-      Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( control );
+      Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(control);
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_FAIL);
     }
-    catch (DaliException &exception)
+    catch(DaliException& exception)
     {
       tet_result(TET_PASS);
     }
@@ -337,18 +339,18 @@ int UtcDaliControlGetImplementationN(void)
 int UtcDaliControlGetImplementationConstN(void)
 {
   ToolkitTestApplication application;
-  DummyControl control;
+  DummyControl           control;
 
   // Get Const Empty
   {
     try
     {
-      const DummyControl constControl(control);
-      const Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( constControl );
+      const DummyControl                constControl(control);
+      const Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(constControl);
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_FAIL);
     }
-    catch (DaliException &exception)
+    catch(DaliException& exception)
     {
       tet_result(TET_PASS);
     }
@@ -359,17 +361,17 @@ int UtcDaliControlGetImplementationConstN(void)
 int UtcDaliControlGetImplementationP(void)
 {
   ToolkitTestApplication application;
-  DummyControl control = DummyControl::New();
+  DummyControl           control = DummyControl::New();
 
   // Get
   {
     try
     {
-      Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( control );
+      Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(control);
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_PASS);
     }
-    catch (DaliException &exception)
+    catch(DaliException& exception)
     {
       tet_result(TET_FAIL);
     }
@@ -380,17 +382,17 @@ int UtcDaliControlGetImplementationP(void)
 int UtcDaliControlGetImplementationConstP(void)
 {
   ToolkitTestApplication application;
-  DummyControl control = DummyControl::New();
+  DummyControl           control = DummyControl::New();
   // Get Const
   {
     try
     {
-      const DummyControl constControl(control);
-      const Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( constControl );
+      const DummyControl                constControl(control);
+      const Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(constControl);
       (void)controlImpl; // Avoid unused warning
       tet_result(TET_PASS);
     }
-    catch (DaliException &exception)
+    catch(DaliException& exception)
     {
       tet_result(TET_FAIL);
     }
@@ -406,29 +408,29 @@ int UtcDaliControlSignalConnectDisconnect(void)
     DummyControl dummy = DummyControlImpl::New();
 
     Actor actor = Actor::New();
-    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION );
-    Toolkit::Internal::Control& control = Toolkit::Internal::GetImplementation( dummy );
-    DummyControlImpl* dummyImpl = dynamic_cast<DummyControlImpl*>(&control);
+    DALI_TEST_EQUALS(actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION);
+    Toolkit::Internal::Control& control   = Toolkit::Internal::GetImplementation(dummy);
+    DummyControlImpl*           dummyImpl = dynamic_cast<DummyControlImpl*>(&control);
 
-    if( dummyImpl == NULL )
+    if(dummyImpl == NULL)
     {
-      tet_result( TET_FAIL );
+      tet_result(TET_FAIL);
       END_TEST;
     }
 
-    actor.OnSceneSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 1u, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
+    actor.OnSceneSignal().Connect(dummyImpl, &DummyControlImpl::CustomSlot1);
+    DALI_TEST_EQUALS(actor.OnSceneSignal().GetConnectionCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(dummyImpl->mCustomSlot1Called, false, TEST_LOCATION);
 
-    application.GetScene().Add( actor );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION );
+    application.GetScene().Add(actor);
+    DALI_TEST_EQUALS(dummyImpl->mCustomSlot1Called, true, TEST_LOCATION);
 
     dummyImpl->mCustomSlot1Called = false;
-    actor.OnSceneSignal().Disconnect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION );
-    application.GetScene().Remove( actor );
-    application.GetScene().Add( actor );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
+    actor.OnSceneSignal().Disconnect(dummyImpl, &DummyControlImpl::CustomSlot1);
+    DALI_TEST_EQUALS(actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION);
+    application.GetScene().Remove(actor);
+    application.GetScene().Add(actor);
+    DALI_TEST_EQUALS(dummyImpl->mCustomSlot1Called, false, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -440,55 +442,55 @@ int UtcDaliControlSignalAutomaticDisconnect(void)
   Actor actor = Actor::New();
 
   {
-    DummyControl dummy = DummyControlImpl::New();
-    Toolkit::Internal::Control& control = Toolkit::Internal::GetImplementation( dummy );
-    DummyControlImpl* dummyImpl = dynamic_cast<DummyControlImpl*>(&control);
+    DummyControl                dummy     = DummyControlImpl::New();
+    Toolkit::Internal::Control& control   = Toolkit::Internal::GetImplementation(dummy);
+    DummyControlImpl*           dummyImpl = dynamic_cast<DummyControlImpl*>(&control);
 
-    if( dummyImpl == NULL )
+    if(dummyImpl == NULL)
     {
-      tet_result( TET_FAIL );
+      tet_result(TET_FAIL);
       END_TEST;
     }
 
-    actor.OnSceneSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 1u, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
+    actor.OnSceneSignal().Connect(dummyImpl, &DummyControlImpl::CustomSlot1);
+    DALI_TEST_EQUALS(actor.OnSceneSignal().GetConnectionCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(dummyImpl->mCustomSlot1Called, false, TEST_LOCATION);
 
-    application.GetScene().Add( actor );
-    DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION );
-    application.GetScene().Remove( actor );
+    application.GetScene().Add(actor);
+    DALI_TEST_EQUALS(dummyImpl->mCustomSlot1Called, true, TEST_LOCATION);
+    application.GetScene().Remove(actor);
   }
   // dummyControl automatically disconnects
 
-  DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION);
 
-  const Vector3 ignoredSize( 20, 20, 0 );
-  actor.SetProperty( Actor::Property::SIZE, ignoredSize );
+  const Vector3 ignoredSize(20, 20, 0);
+  actor.SetProperty(Actor::Property::SIZE, ignoredSize);
   END_TEST;
 }
 
 int UtcDaliControlTestParameters(void)
 {
   ToolkitTestApplication application;
-  DummyControl test = DummyControl::New();
+  DummyControl           test = DummyControl::New();
 
-  test.SetProperty( Actor::Property::SIZE, Vector3( 0.7f, 0.7f, 0.7f ) );
+  test.SetProperty(Actor::Property::SIZE, Vector3(0.7f, 0.7f, 0.7f));
 
-  application.GetScene().Add( test );
+  application.GetScene().Add(test);
 
   application.SendNotification();
   application.Render();
 
-  float width = 640.0f;
-  float height = test.GetHeightForWidth( width );
-  DALI_TEST_EQUALS( 640.0f, height, TEST_LOCATION );
-  DALI_TEST_EQUALS( 640.0f, test.GetWidthForHeight( height ), TEST_LOCATION );
+  float width  = 640.0f;
+  float height = test.GetHeightForWidth(width);
+  DALI_TEST_EQUALS(640.0f, height, TEST_LOCATION);
+  DALI_TEST_EQUALS(640.0f, test.GetWidthForHeight(height), TEST_LOCATION);
 
   test.KeyEventSignal();
 
   // Provide coverage for pointer destructor
   Control* testControlPtr = new Control;
-  DALI_TEST_CHECK( testControlPtr );
+  DALI_TEST_CHECK(testControlPtr);
   delete testControlPtr;
   END_TEST;
 }
@@ -496,110 +498,110 @@ int UtcDaliControlTestParameters(void)
 int UtcDaliControlBackgroundColor(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
-  DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND ).Get< Property::Map >().Empty() );
+  DALI_TEST_CHECK(control.GetProperty(Control::Property::BACKGROUND).Get<Property::Map>().Empty());
 
-  control.SetProperty( Control::Property::BACKGROUND, Color::RED );
+  control.SetProperty(Control::Property::BACKGROUND, Color::RED);
 
-  Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>() == Visual::COLOR );
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR ) );
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get<Vector4>() == Color::RED );
+  Property::Value propValue = control.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  resultMap = propValue.GetMap();
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE));
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>() == Visual::COLOR);
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR));
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR)->Get<Vector4>() == Color::RED);
 
-  control.SetProperty( Control::Property::BACKGROUND, Color::YELLOW );
+  control.SetProperty(Control::Property::BACKGROUND, Color::YELLOW);
 
-  propValue = control.GetProperty( Control::Property::BACKGROUND );
+  propValue = control.GetProperty(Control::Property::BACKGROUND);
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR ) );
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get<Vector4>() == Color::YELLOW );
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR));
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR)->Get<Vector4>() == Color::YELLOW);
 
   END_TEST;
 }
 
 int UtcDaliControlBackgroundColorRendererCount(void)
 {
-  tet_infoline( "Test ensures we only create renderers when non-transparent color is requested or if we our clipping-mode is set to CLIP_CHILDREN" );
+  tet_infoline("Test ensures we only create renderers when non-transparent color is requested or if we our clipping-mode is set to CLIP_CHILDREN");
 
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
   control[Actor::Property::SIZE] = Vector2(100.0f, 100.0f);
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
-  tet_infoline( "Set semi transparent alpha with positive RGB values, 1 renderer should be created, but returned color should reflect what we set" );
-  const Vector4 semiTransparent( 1.0f, 0.75f, 0.5f, 0.5f );
-  control.SetBackgroundColor( semiTransparent );
+  tet_infoline("Set semi transparent alpha with positive RGB values, 1 renderer should be created, but returned color should reflect what we set");
+  const Vector4 semiTransparent(1.0f, 0.75f, 0.5f, 0.5f);
+  control.SetBackgroundColor(semiTransparent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), semiTransparent, TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetControlBackgroundColor(control), semiTransparent, TEST_LOCATION);
 
-  Renderer renderer = control.GetRendererAt( 0 );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = control.GetRendererAt(0);
+  DALI_TEST_CHECK(renderer);
 
-  tet_infoline( "Set semi transparent alpha with positive RGB values, renderer should not be changed" );
-  const Vector4 newColor( 1.0f, 1.0f, 0.5f, 0.5f );
-  control.SetBackgroundColor( newColor );
+  tet_infoline("Set semi transparent alpha with positive RGB values, renderer should not be changed");
+  const Vector4 newColor(1.0f, 1.0f, 0.5f, 0.5f);
+  control.SetBackgroundColor(newColor);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), newColor, TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer, control.GetRendererAt( 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetControlBackgroundColor(control), newColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer, control.GetRendererAt(0), TEST_LOCATION);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& drawTrace = gl.GetDrawTrace();
+  TestGlAbstraction& gl        = application.GetGlAbstraction();
+  TraceCallStack&    drawTrace = gl.GetDrawTrace();
   drawTrace.Enable(true);
 
-  tet_infoline( "Set transparent, 1 renderer should be created, but ensure nothing is drawn" );
-  control.SetBackgroundColor( Color::TRANSPARENT );
+  tet_infoline("Set transparent, 1 renderer should be created, but ensure nothing is drawn");
+  control.SetBackgroundColor(Color::TRANSPARENT);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), Color::TRANSPARENT, TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetControlBackgroundColor(control), Color::TRANSPARENT, TEST_LOCATION);
   DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), false, TEST_LOCATION);
 
   drawTrace.Reset();
 
-  tet_infoline( "Set control to clip its children, a renderer should be created which will be transparent" );
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  tet_infoline("Set control to clip its children, a renderer should be created which will be transparent");
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), Color::TRANSPARENT, TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetControlBackgroundColor(control), Color::TRANSPARENT, TEST_LOCATION);
   DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION);
 
-  tet_infoline( "Set a color, only 1 renderer should exist" );
-  control.SetBackgroundColor( Color::RED );
+  tet_infoline("Set a color, only 1 renderer should exist");
+  control.SetBackgroundColor(Color::RED);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), Color::RED, TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetControlBackgroundColor(control), Color::RED, TEST_LOCATION);
 
-  tet_infoline( "Clear the background, no renderers" );
+  tet_infoline("Clear the background, no renderers");
   control.ClearBackground();
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( control.GetRendererCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetRendererCount(), 0u, TEST_LOCATION);
 
-  tet_infoline( "Set control to clip its children again, a renderer should be created which will be transparent" );
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  tet_infoline("Set control to clip its children again, a renderer should be created which will be transparent");
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), Color::TRANSPARENT, TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetControlBackgroundColor(control), Color::TRANSPARENT, TEST_LOCATION);
 
   drawTrace.Reset();
 
-  tet_infoline( "Disable clipping, render nothing" );
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::DISABLED );
+  tet_infoline("Disable clipping, render nothing");
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::DISABLED);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), Color::TRANSPARENT, TEST_LOCATION );
+  DALI_TEST_EQUALS(GetControlBackgroundColor(control), Color::TRANSPARENT, TEST_LOCATION);
   DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), false, TEST_LOCATION);
 
   END_TEST;
@@ -608,25 +610,25 @@ int UtcDaliControlBackgroundColorRendererCount(void)
 int UtcDaliControlBackgroundImage(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
-  tet_infoline( "Set first background image" );
-  control.SetProperty( Control::Property::BACKGROUND, "TestImage" );
+  tet_infoline("Set first background image");
+  control.SetProperty(Control::Property::BACKGROUND, "TestImage");
 
-  Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>() == Visual::IMAGE );
-  DALI_TEST_CHECK( resultMap->Find( ImageVisual::Property::URL ) );
-  DALI_TEST_CHECK( resultMap->Find( ImageVisual::Property::URL )->Get<std::string>() == "TestImage" );
+  Property::Value propValue = control.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  resultMap = propValue.GetMap();
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE));
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>() == Visual::IMAGE);
+  DALI_TEST_CHECK(resultMap->Find(ImageVisual::Property::URL));
+  DALI_TEST_CHECK(resultMap->Find(ImageVisual::Property::URL)->Get<std::string>() == "TestImage");
 
-  tet_infoline( "Set replacement background image" );
-  control.SetProperty( Control::Property::BACKGROUND, "TestImage2" );
+  tet_infoline("Set replacement background image");
+  control.SetProperty(Control::Property::BACKGROUND, "TestImage2");
 
-  propValue = control.GetProperty( Control::Property::BACKGROUND );
+  propValue = control.GetProperty(Control::Property::BACKGROUND);
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( ImageVisual::Property::URL ) );
-  DALI_TEST_CHECK( resultMap->Find( ImageVisual::Property::URL )->Get<std::string>() == "TestImage2" );
+  DALI_TEST_CHECK(resultMap->Find(ImageVisual::Property::URL));
+  DALI_TEST_CHECK(resultMap->Find(ImageVisual::Property::URL)->Get<std::string>() == "TestImage2");
 
   END_TEST;
 }
@@ -634,49 +636,49 @@ int UtcDaliControlBackgroundImage(void)
 int UtcDaliControlBackgroundProperties(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
-  DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND ).Get< Property::Map >().Empty() );
+  DALI_TEST_CHECK(control.GetProperty(Control::Property::BACKGROUND).Get<Property::Map>().Empty());
 
   Property::Map imageMap;
-  imageMap[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
-  imageMap[ ImageVisual::Property::URL ] = "TestImage";
-  control.SetProperty( Control::Property::BACKGROUND, imageMap );
-  Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(),(int)Visual::IMAGE, TEST_LOCATION );
-  DALI_TEST_CHECK( resultMap->Find( ImageVisual::Property::URL ) );
-  DALI_TEST_EQUALS( resultMap->Find( ImageVisual::Property::URL )->Get<std::string>(), "TestImage", TEST_LOCATION );
+  imageMap[Toolkit::Visual::Property::TYPE] = Visual::IMAGE;
+  imageMap[ImageVisual::Property::URL]      = "TestImage";
+  control.SetProperty(Control::Property::BACKGROUND, imageMap);
+  Property::Value propValue = control.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  resultMap = propValue.GetMap();
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE));
+  DALI_TEST_EQUALS(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>(), (int)Visual::IMAGE, TEST_LOCATION);
+  DALI_TEST_CHECK(resultMap->Find(ImageVisual::Property::URL));
+  DALI_TEST_EQUALS(resultMap->Find(ImageVisual::Property::URL)->Get<std::string>(), "TestImage", TEST_LOCATION);
 
   Property::Map rendererMap;
-  rendererMap[Visual::Property::TYPE] = Visual::COLOR;
+  rendererMap[Visual::Property::TYPE]           = Visual::COLOR;
   rendererMap[ColorVisual::Property::MIX_COLOR] = Color::CYAN;
-  control.SetProperty( Control::Property::BACKGROUND, rendererMap );
-  propValue = control.GetProperty( Control::Property::BACKGROUND );
+  control.SetProperty(Control::Property::BACKGROUND, rendererMap);
+  propValue = control.GetProperty(Control::Property::BACKGROUND);
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(), (int)Visual::COLOR, TEST_LOCATION );
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR ) );
-  DALI_TEST_EQUALS( resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get<Vector4>(), Color::CYAN, TEST_LOCATION );
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE));
+  DALI_TEST_EQUALS(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>(), (int)Visual::COLOR, TEST_LOCATION);
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR));
+  DALI_TEST_EQUALS(resultMap->Find(ColorVisual::Property::MIX_COLOR)->Get<Vector4>(), Color::CYAN, TEST_LOCATION);
 
   Property::Map emptyMap;
-  control.SetProperty( Control::Property::BACKGROUND, emptyMap );
-  DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND ).Get< Property::Map >().Empty() );
+  control.SetProperty(Control::Property::BACKGROUND, emptyMap);
+  DALI_TEST_CHECK(control.GetProperty(Control::Property::BACKGROUND).Get<Property::Map>().Empty());
 
   // set as URL
-  control.SetProperty( Control::Property::BACKGROUND, "Foobar.png" );
-  propValue = control.GetProperty( Control::Property::BACKGROUND );
+  control.SetProperty(Control::Property::BACKGROUND, "Foobar.png");
+  propValue = control.GetProperty(Control::Property::BACKGROUND);
   resultMap = propValue.GetMap();
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(), (int)Visual::IMAGE, TEST_LOCATION );
-  DALI_TEST_EQUALS( resultMap->Find( ImageVisual::Property::URL )->Get<std::string>(), "Foobar.png", TEST_LOCATION );
+  DALI_TEST_EQUALS(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>(), (int)Visual::IMAGE, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultMap->Find(ImageVisual::Property::URL)->Get<std::string>(), "Foobar.png", TEST_LOCATION);
 
   // set as Color
-  control.SetProperty( Control::Property::BACKGROUND, Color::RED );
-  propValue = control.GetProperty( Control::Property::BACKGROUND );
+  control.SetProperty(Control::Property::BACKGROUND, Color::RED);
+  propValue = control.GetProperty(Control::Property::BACKGROUND);
   resultMap = propValue.GetMap();
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(), (int)Visual::COLOR, TEST_LOCATION );
-  DALI_TEST_EQUALS( resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get<Vector4>(), Color::RED, TEST_LOCATION );
+  DALI_TEST_EQUALS(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>(), (int)Visual::COLOR, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultMap->Find(ColorVisual::Property::MIX_COLOR)->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -684,35 +686,35 @@ int UtcDaliControlBackgroundProperties(void)
 int UtcDaliControlShadowProperties(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
-  DALI_TEST_CHECK( control.GetProperty( DevelControl::Property::SHADOW ).Get< Property::Map >().Empty() );
+  DALI_TEST_CHECK(control.GetProperty(DevelControl::Property::SHADOW).Get<Property::Map>().Empty());
 
   Property::Map imageMap;
-  imageMap[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
-  imageMap[ ImageVisual::Property::URL ] = "TestImage";
-  control.SetProperty( DevelControl::Property::SHADOW, imageMap );
-  Property::Value propValue = control.GetProperty( DevelControl::Property::SHADOW );
-  Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(),(int)Visual::IMAGE, TEST_LOCATION );
-  DALI_TEST_CHECK( resultMap->Find( ImageVisual::Property::URL ) );
-  DALI_TEST_EQUALS( resultMap->Find( ImageVisual::Property::URL )->Get<std::string>(), "TestImage", TEST_LOCATION );
+  imageMap[Toolkit::Visual::Property::TYPE] = Visual::IMAGE;
+  imageMap[ImageVisual::Property::URL]      = "TestImage";
+  control.SetProperty(DevelControl::Property::SHADOW, imageMap);
+  Property::Value propValue = control.GetProperty(DevelControl::Property::SHADOW);
+  Property::Map*  resultMap = propValue.GetMap();
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE));
+  DALI_TEST_EQUALS(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>(), (int)Visual::IMAGE, TEST_LOCATION);
+  DALI_TEST_CHECK(resultMap->Find(ImageVisual::Property::URL));
+  DALI_TEST_EQUALS(resultMap->Find(ImageVisual::Property::URL)->Get<std::string>(), "TestImage", TEST_LOCATION);
 
   Property::Map colorMap;
-  colorMap[Visual::Property::TYPE] = Visual::COLOR;
+  colorMap[Visual::Property::TYPE]           = Visual::COLOR;
   colorMap[ColorVisual::Property::MIX_COLOR] = Color::CYAN;
-  control.SetProperty( DevelControl::Property::SHADOW, colorMap );
-  propValue = control.GetProperty( DevelControl::Property::SHADOW );
+  control.SetProperty(DevelControl::Property::SHADOW, colorMap);
+  propValue = control.GetProperty(DevelControl::Property::SHADOW);
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(), (int)Visual::COLOR, TEST_LOCATION );
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR ) );
-  DALI_TEST_EQUALS( resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get<Vector4>(), Color::CYAN, TEST_LOCATION );
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE));
+  DALI_TEST_EQUALS(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>(), (int)Visual::COLOR, TEST_LOCATION);
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR));
+  DALI_TEST_EQUALS(resultMap->Find(ColorVisual::Property::MIX_COLOR)->Get<Vector4>(), Color::CYAN, TEST_LOCATION);
 
   Property::Map emptyMap;
-  control.SetProperty( DevelControl::Property::SHADOW, emptyMap );
-  DALI_TEST_CHECK( control.GetProperty( DevelControl::Property::SHADOW ).Get< Property::Map >().Empty() );
+  control.SetProperty(DevelControl::Property::SHADOW, emptyMap);
+  DALI_TEST_CHECK(control.GetProperty(DevelControl::Property::SHADOW).Get<Property::Map>().Empty());
 
   END_TEST;
 }
@@ -722,18 +724,18 @@ int UtcDaliControlKeyProperties(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
-  DALI_TEST_EQUALS( control.HasKeyInputFocus(), control.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION );
+  DALI_TEST_EQUALS(control.HasKeyInputFocus(), control.GetProperty(Control::Property::KEY_INPUT_FOCUS).Get<bool>(), TEST_LOCATION);
 
   control.SetKeyInputFocus();
-  DALI_TEST_EQUALS( true, control.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION );
+  DALI_TEST_EQUALS(true, control.GetProperty(Control::Property::KEY_INPUT_FOCUS).Get<bool>(), TEST_LOCATION);
 
   control.ClearKeyInputFocus();
-  DALI_TEST_EQUALS( false, control.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, control.GetProperty(Control::Property::KEY_INPUT_FOCUS).Get<bool>(), TEST_LOCATION);
 
-  control.SetProperty( Control::Property::KEY_INPUT_FOCUS, true );
-  DALI_TEST_EQUALS( true, control.HasKeyInputFocus(), TEST_LOCATION );
+  control.SetProperty(Control::Property::KEY_INPUT_FOCUS, true);
+  DALI_TEST_EQUALS(true, control.HasKeyInputFocus(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -741,25 +743,25 @@ int UtcDaliControlKeyProperties(void)
 int UtcDaliControlGestureSignals(void)
 {
   ToolkitTestApplication application;
-  ConnectionTracker connectionTracker;
-  Control control = Control::New();
+  ConnectionTracker      connectionTracker;
+  Control                control = Control::New();
 
   // Each gesture detector gets created when connecting to the gesture signals
-  DALI_TEST_CHECK( !control.GetTapGestureDetector() );
-  control.ConnectSignal( &connectionTracker, "tapped", &TestVoidCallback );
-  DALI_TEST_CHECK( control.GetTapGestureDetector() );
+  DALI_TEST_CHECK(!control.GetTapGestureDetector());
+  control.ConnectSignal(&connectionTracker, "tapped", &TestVoidCallback);
+  DALI_TEST_CHECK(control.GetTapGestureDetector());
 
-  DALI_TEST_CHECK( !control.GetPanGestureDetector() );
-  control.ConnectSignal( &connectionTracker, "panned", &TestVoidCallback );
-  DALI_TEST_CHECK( control.GetPanGestureDetector() );
+  DALI_TEST_CHECK(!control.GetPanGestureDetector());
+  control.ConnectSignal(&connectionTracker, "panned", &TestVoidCallback);
+  DALI_TEST_CHECK(control.GetPanGestureDetector());
 
-  DALI_TEST_CHECK( !control.GetPinchGestureDetector() );
-  control.ConnectSignal( &connectionTracker, "pinched", &TestVoidCallback );
-  DALI_TEST_CHECK( control.GetPinchGestureDetector() );
+  DALI_TEST_CHECK(!control.GetPinchGestureDetector());
+  control.ConnectSignal(&connectionTracker, "pinched", &TestVoidCallback);
+  DALI_TEST_CHECK(control.GetPinchGestureDetector());
 
-  DALI_TEST_CHECK( !control.GetLongPressGestureDetector() );
-  control.ConnectSignal( &connectionTracker, "longPressed",  &TestVoidCallback );
-  DALI_TEST_CHECK( control.GetLongPressGestureDetector() );
+  DALI_TEST_CHECK(!control.GetLongPressGestureDetector());
+  control.ConnectSignal(&connectionTracker, "longPressed", &TestVoidCallback);
+  DALI_TEST_CHECK(control.GetLongPressGestureDetector());
 
   END_TEST;
 }
@@ -769,7 +771,7 @@ int UtcDaliControlImplKeyInputFocusGainedSignal(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   gKeyInputFocusCallBackCalled = false;
   control.KeyInputFocusGainedSignal().Connect(&TestKeyInputFocusCallback);
@@ -779,9 +781,9 @@ int UtcDaliControlImplKeyInputFocusGainedSignal(void)
 
   control.SetKeyInputFocus();
 
-  DALI_TEST_CHECK( control.HasKeyInputFocus() );
+  DALI_TEST_CHECK(control.HasKeyInputFocus());
 
-  DALI_TEST_CHECK( gKeyInputFocusCallBackCalled );
+  DALI_TEST_CHECK(gKeyInputFocusCallBackCalled);
 
   END_TEST;
 }
@@ -791,7 +793,7 @@ int UtcDaliControlImplKeyInputFocusLostSignal(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   gKeyInputFocusCallBackCalled = false;
   control.KeyInputFocusLostSignal().Connect(&TestKeyInputFocusCallback);
@@ -801,11 +803,11 @@ int UtcDaliControlImplKeyInputFocusLostSignal(void)
 
   control.SetKeyInputFocus();
 
-  DALI_TEST_CHECK( control.HasKeyInputFocus() );
+  DALI_TEST_CHECK(control.HasKeyInputFocus());
 
   control.ClearKeyInputFocus();
 
-  DALI_TEST_CHECK( gKeyInputFocusCallBackCalled );
+  DALI_TEST_CHECK(gKeyInputFocusCallBackCalled);
 
   END_TEST;
 }
@@ -813,11 +815,11 @@ int UtcDaliControlImplKeyInputFocusLostSignal(void)
 int UtcDaliControlImplGetControlExtensionP(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( control );
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(control);
 
-  DALI_TEST_CHECK( NULL == controlImpl.GetControlExtension() );
+  DALI_TEST_CHECK(NULL == controlImpl.GetControlExtension());
 
   END_TEST;
 }
@@ -825,20 +827,20 @@ int UtcDaliControlImplGetControlExtensionP(void)
 int UtcDaliControlAutoClipping(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
-  tet_infoline( "Test to see if a renderer gets added when we are clipping children" );
+  tet_infoline("Test to see if a renderer gets added when we are clipping children");
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 1, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, control.GetRendererCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -846,30 +848,29 @@ int UtcDaliControlAutoClipping(void)
 int UtcDaliControlAutoClippingN(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
-  control.SetProperty( Control::Property::BACKGROUND, Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
-                                                                     .Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
+  Control                control = Control::New();
+  control.SetProperty(Control::Property::BACKGROUND, Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::COLOR).Add(ColorVisual::Property::MIX_COLOR, Color::RED));
 
-  tet_infoline( "Test to ensure that a renderer does NOT get added when we are clipping children and already have renderers/visuals" );
+  tet_infoline("Test to ensure that a renderer does NOT get added when we are clipping children and already have renderers/visuals");
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 1, control.GetRendererCount(), TEST_LOCATION ); // Only 1, not 2
+  DALI_TEST_EQUALS(1, control.GetRendererCount(), TEST_LOCATION); // Only 1, not 2
 
   // Ensure the background color is still RED rather than what's set by the automatic clipping
-  Property::Value value = control.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
-  Property::Value* colorValue = map->Find(ColorVisual::Property::MIX_COLOR );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_EQUALS( colorValue->Get< Vector4 >(), Color::RED, TEST_LOCATION );
+  Property::Value value = control.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  map   = value.GetMap();
+  DALI_TEST_CHECK(map);
+  Property::Value* colorValue = map->Find(ColorVisual::Property::MIX_COLOR);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_EQUALS(colorValue->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -877,25 +878,25 @@ int UtcDaliControlAutoClippingN(void)
 int UtcDaliControlAutoClippingWhenAlreadyOnStage(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
-  tet_infoline( "Test to see if a renderer gets added when we are clipping children and when already on stage" );
+  tet_infoline("Test to see if a renderer gets added when we are clipping children and when already on stage");
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 1, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, control.GetRendererCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -903,35 +904,34 @@ int UtcDaliControlAutoClippingWhenAlreadyOnStage(void)
 int UtcDaliControlAutoClippingWhenAlreadyOnStageN(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
-  control.SetProperty( Control::Property::BACKGROUND, Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
-                                                                     .Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
+  Control                control = Control::New();
+  control.SetProperty(Control::Property::BACKGROUND, Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::COLOR).Add(ColorVisual::Property::MIX_COLOR, Color::RED));
 
-  tet_infoline( "Test to ensure that a renderer does NOT get added when we are clipping children and already have renderers/visuals and when already on stage" );
+  tet_infoline("Test to ensure that a renderer does NOT get added when we are clipping children and already have renderers/visuals and when already on stage");
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 1, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, control.GetRendererCount(), TEST_LOCATION);
 
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 1, control.GetRendererCount(), TEST_LOCATION ); // Still should be 1
+  DALI_TEST_EQUALS(1, control.GetRendererCount(), TEST_LOCATION); // Still should be 1
 
   // Ensure the background color is still RED rather than what's set by the automatic clipping
-  Property::Value value = control.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
-  Property::Value* colorValue = map->Find(ColorVisual::Property::MIX_COLOR );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_EQUALS( colorValue->Get< Vector4 >(), Color::RED, TEST_LOCATION );
+  Property::Value value = control.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  map   = value.GetMap();
+  DALI_TEST_CHECK(map);
+  Property::Value* colorValue = map->Find(ColorVisual::Property::MIX_COLOR);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_EQUALS(colorValue->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -939,114 +939,112 @@ int UtcDaliControlAutoClippingWhenAlreadyOnStageN(void)
 int UtcDaliControlSetTransformSize(void)
 {
   ToolkitTestApplication application;
-  Control control = Control::New();
+  Control                control = Control::New();
 
   Property::Map transformMap;
-  transformMap.Add( Visual::Transform::Property::OFFSET, Vector2( 10, 10 ) )
-              .Add( Visual::Transform::Property::ANCHOR_POINT, Align::BOTTOM_END )
-              .Add( Visual::Transform::Property::ORIGIN, Align::BOTTOM_END )
-              .Add( Visual::Transform::Property::SIZE, Vector2( 10, 20 ) );
+  transformMap.Add(Visual::Transform::Property::OFFSET, Vector2(10, 10))
+    .Add(Visual::Transform::Property::ANCHOR_POINT, Align::BOTTOM_END)
+    .Add(Visual::Transform::Property::ORIGIN, Align::BOTTOM_END)
+    .Add(Visual::Transform::Property::SIZE, Vector2(10, 20));
 
-  control.SetProperty( Control::Property::BACKGROUND, Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
-                                                                     .Add( Visual::Property::TRANSFORM, transformMap ) );
+  control.SetProperty(Control::Property::BACKGROUND, Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::COLOR).Add(Visual::Property::TRANSFORM, transformMap));
 
-  tet_infoline( "Test to ensure that the control background transform does not get overwritten when adding to the stage" );
+  tet_infoline("Test to ensure that the control background transform does not get overwritten when adding to the stage");
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
   // Ensure the transform property still matches what we set
-  Property::Value value = control.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
-  Property::Value* transformValue = map->Find( Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( transformValue );
+  Property::Value value = control.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  map   = value.GetMap();
+  DALI_TEST_CHECK(map);
+  Property::Value* transformValue = map->Find(Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(transformValue);
 
   Property::Map* retMap = transformValue->GetMap();
-  DALI_TEST_CHECK( retMap );
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 10, 10 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::ANCHOR_POINT )->Get< int >(), (int)Align::BOTTOM_END, TEST_LOCATION );
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::ORIGIN )->Get< int >(), (int)Align::BOTTOM_END, TEST_LOCATION );
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::SIZE )->Get< Vector2 >(), Vector2( 10, 20 ), TEST_LOCATION );
+  DALI_TEST_CHECK(retMap);
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get<Vector2>(), Vector2(10, 10), TEST_LOCATION);
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::ANCHOR_POINT)->Get<int>(), (int)Align::BOTTOM_END, TEST_LOCATION);
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::ORIGIN)->Get<int>(), (int)Align::BOTTOM_END, TEST_LOCATION);
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::SIZE)->Get<Vector2>(), Vector2(10, 20), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliControlResourcesReady(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Register 2 visuals and check ResourceReady when a visual is disabled" );
+  tet_infoline("Register 2 visuals and check ResourceReady when a visual is disabled");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMapLarge;
-  propertyMapLarge.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMapLarge.Insert( ImageVisual::Property::URL,  TEST_LARGE_IMAGE_FILE_NAME );
+  propertyMapLarge.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMapLarge.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
 
   Property::Map propertyMapSmall;
-  propertyMapSmall.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMapSmall.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
+  propertyMapSmall.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMapSmall.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
 
-  Visual::Base smallVisual = factory.CreateVisual( propertyMapSmall );
+  Visual::Base smallVisual = factory.CreateVisual(propertyMapSmall);
   smallVisual.SetName("smallVisual");
-  DALI_TEST_CHECK( smallVisual );
+  DALI_TEST_CHECK(smallVisual);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, smallVisual );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, smallVisual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
   Toolkit::Visual::ResourceStatus resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
   resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL);
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::READY), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::READY), TEST_LOCATION);
 
-  Visual::Base largeVisual = factory.CreateVisual( propertyMapLarge );
+  Visual::Base largeVisual = factory.CreateVisual(propertyMapLarge);
   largeVisual.SetName("largeVisual");
-  DALI_TEST_CHECK( largeVisual );
+  DALI_TEST_CHECK(largeVisual);
 
-  tet_infoline( "Register Visual but set disabled, IsResourceReady should be true" );
+  tet_infoline("Register Visual but set disabled, IsResourceReady should be true");
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, largeVisual, false );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, largeVisual, false);
 
   resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL2);
-  DALI_TEST_EQUALS( static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION);
 
   application.SendNotification();
 
   resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL2);
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION);
 
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL2, true );
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL2, true);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
 
   resourceStatus = actor.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL2);
-  DALI_TEST_EQUALS( static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::READY), TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::READY), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1054,30 +1052,33 @@ int UtcDaliControlResourcesReady(void)
 int UtcDaliControlResourcesReady02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Change a resource during ResourceReady callback" );
+  tet_infoline("Change a resource during ResourceReady callback");
 
   gResourceReadySignalFired = false;
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  control.ResourceReadySignal().Connect( &ResourceReadySignal );
+  control.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  control.ResourceReadySignal().Connect(&ResourceReadySignal);
 
   Property::Map propertyMap;
-  propertyMap.Insert( ImageVisual::Property::URL, "invalid.jpg" );
-  control.SetProperty( Control::Property::BACKGROUND, propertyMap );
+  propertyMap.Insert(ImageVisual::Property::URL, "invalid.jpg");
+  control.SetProperty(Control::Property::BACKGROUND, propertyMap);
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( control.IsResourceReady(), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(control.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
   gResourceReadySignalFired = false;
 
   END_TEST;
@@ -1088,28 +1089,28 @@ int UtcDaliControlMarginProperty(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  control.SetBackgroundColor( Color::BLUE );
+  control.SetBackgroundColor(Color::BLUE);
 
-  control.SetProperty( Control::Property::MARGIN, Extents( 20, 10, 0, 0 ) );
+  control.SetProperty(Control::Property::MARGIN, Extents(20, 10, 0, 0));
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( control.GetProperty<Extents>( Control::Property::MARGIN ), Extents( 20, 10, 0, 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetProperty<Extents>(Control::Property::MARGIN), Extents(20, 10, 0, 0), TEST_LOCATION);
 
   // Parent control has one ImageView as a Child.
   ImageView image = ImageView::New();
-  image.SetBackgroundColor( Color::RED );
-  image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  image.SetProperty( Control::Property::PADDING, Extents( 10, 10, 10, 10 ) );
-  control.Add( image );
+  image.SetBackgroundColor(Color::RED);
+  image.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  image.SetProperty(Control::Property::PADDING, Extents(10, 10, 10, 10));
+  control.Add(image);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( image.GetProperty<Extents>( Control::Property::PADDING ), Extents( 10, 10, 10, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(image.GetProperty<Extents>(Control::Property::PADDING), Extents(10, 10, 10, 10), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1119,16 +1120,16 @@ int UtcDaliControlPaddingProperty(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  control.SetBackgroundColor( Color::BLUE );
+  control.SetBackgroundColor(Color::BLUE);
 
-  control.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
+  control.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10));
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( control.GetProperty<Extents>( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(control.GetProperty<Extents>(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION);
 
   Control child = Control::New();
   control.Add(child);
@@ -1136,18 +1137,18 @@ int UtcDaliControlPaddingProperty(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( child.GetProperty<Vector3>( Dali::Actor::Property::POSITION ), Vector3( 15, 5, 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(child.GetProperty<Vector3>(Dali::Actor::Property::POSITION), Vector3(15, 5, 0), TEST_LOCATION);
 
-  control.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION,  Dali::LayoutDirection::RIGHT_TO_LEFT);
+  control.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( child.GetProperty<Vector3>( Dali::Actor::Property::POSITION ), Vector3( 10, 5, 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(child.GetProperty<Vector3>(Dali::Actor::Property::POSITION), Vector3(10, 5, 0), TEST_LOCATION);
 
-  control.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION,  Dali::LayoutDirection::LEFT_TO_RIGHT);
+  control.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( child.GetProperty<Vector3>( Dali::Actor::Property::POSITION ), Vector3( 15, 5, 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(child.GetProperty<Vector3>(Dali::Actor::Property::POSITION), Vector3(15, 5, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1155,92 +1156,339 @@ int UtcDaliControlPaddingProperty(void)
 int UtcDaliControlDoAction(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "DoAction on a visual registered with a control" );
+  tet_infoline("DoAction on a visual registered with a control");
 
   // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable( true );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
   //Created AnimatedImageVisual
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base imageVisual = factory.CreateVisual( TEST_IMAGE_FILE_NAME, ImageDimensions() );
+  VisualFactory factory     = VisualFactory::Get();
+  Visual::Base  imageVisual = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
   textureTrace.Reset();
 
   Property::Map attributes;
-  DevelControl::DoAction( dummyControl,  DummyControl::Property::TEST_VISUAL, DevelImageVisual::Action::RELOAD, attributes );
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelImageVisual::Action::RELOAD, attributes);
 
-  tet_infoline( "Perform RELOAD action. should reload Image and generate a texture" );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  tet_infoline("Perform RELOAD action. should reload Image and generate a texture");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliControlDoActionWhenNotStage(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "DoAction on a visual registered with a control but not staged" );
+  tet_infoline("DoAction on a visual registered with a control but not staged");
 
   // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable( true );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
   //Created AnimatedImageVisual
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base imageVisual = factory.CreateVisual( TEST_IMAGE_FILE_NAME, ImageDimensions() );
+  VisualFactory factory     = VisualFactory::Get();
+  Visual::Base  imageVisual = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
   textureTrace.Reset();
 
   Property::Map attributes;
-  DevelControl::DoAction( dummyControl,  DummyControl::Property::TEST_VISUAL, DevelImageVisual::Action::RELOAD, attributes );
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelImageVisual::Action::RELOAD, attributes);
 
-  tet_infoline( "Perform RELOAD action. should reload Image and generate a texture" );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  tet_infoline("Perform RELOAD action. should reload Image and generate a texture");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
   textureTrace.Reset();
 
-  tet_infoline( "Adding control to stage will in turn add the visual to the stage" );
+  tet_infoline("Adding control to stage will in turn add the visual to the stage");
 
-  application.GetScene().Add( dummyControl );
+  application.GetScene().Add(dummyControl);
   application.SendNotification();
   application.Render();
-  tet_infoline( "No change in textures could occurs as already loaded and cached texture will be used" );
+  tet_infoline("No change in textures could occurs as already loaded and cached texture will be used");
 
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
   textureTrace.Reset();
 
   END_TEST;
 }
+
+int UtcDaliControlDoActionMultipleWhenNotStage01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("DoAction on a visual registered with a control multiple times but not staged");
+
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  //Created AnimatedImageVisual
+  VisualFactory factory     = VisualFactory::Get();
+  Visual::Base  imageVisual = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+  textureTrace.Reset();
+
+  Property::Map  attributes;
+  const uint32_t repeatMax = 10u;
+  for(uint32_t repeatCnt = 0u; repeatCnt < repeatMax; ++repeatCnt)
+  {
+    // DoAction multiple times.
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelImageVisual::Action::RELOAD, attributes);
+  }
+
+  tet_infoline("Perform RELOAD action. should reload Image and generate a texture");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  textureTrace.Reset();
+
+  tet_infoline("Do not load image on more time even we request reload multiple times.");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 1), false, TEST_LOCATION);
+
+  tet_infoline("Adding control to stage will in turn add the visual to the stage");
+
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+  tet_infoline("No change in textures could occurs as already loaded and cached texture will be used");
+
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+  textureTrace.Reset();
+
+  dummyControl.Unparent();
+  dummyControl.Reset();
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliControlDoActionMultipleWhenNotStage02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("DoAction on a visual registered with a control multiple times but not staged");
+
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  //Created AnimatedImageVisual
+  VisualFactory factory      = VisualFactory::Get();
+  Visual::Base  imageVisual  = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
+  Visual::Base  imageVisual2 = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+
+  gResourceReadySignalFired = false;
+
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummyControl.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  application.SendNotification();
+  application.Render();
+
+  // Dummy control to keep cache
+  DummyControl        keepCacheControl = DummyControl::New(true);
+  Impl::DummyControl& keepCacheImpl    = static_cast<Impl::DummyControl&>(keepCacheControl.GetImplementation());
+
+  keepCacheImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2);
+  keepCacheControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  // Load request for keep cache control.
+  application.GetScene().Add(keepCacheControl);
+
+  Property::Map  attributes;
+  const uint32_t repeatMax = 10u;
+  for(uint32_t repeatCnt = 0u; repeatCnt < repeatMax; ++repeatCnt)
+  {
+    // DoAction multiple times.
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelImageVisual::Action::RELOAD, attributes);
+  }
+
+  application.SendNotification();
+  application.Render();
+
+  try
+  {
+    application.SendNotification();
+    application.Render();
+
+    tet_infoline("Async load completed. Sigabort should not be occured");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    tet_infoline("ResourceReady signal must be fired!");
+    DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+
+    tet_infoline("Texture generation occured");
+    DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+    textureTrace.Reset();
+
+    tet_result(TET_PASS);
+  }
+  catch(...)
+  {
+    // Must not be throw exception.
+    tet_infoline("Exception occured!");
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliControlDoActionMultipleWhenNotStage03(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("DoAction on a visual registered with a control multiple times but not staged");
+
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  //Created AnimatedImageVisual
+  VisualFactory factory      = VisualFactory::Get();
+  Visual::Base  imageVisual  = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
+  Visual::Base  imageVisual2 = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+
+  gResourceReadySignalFired = false;
+
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummyControl.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  application.SendNotification();
+  application.Render();
+
+  // Dummy control to keep cache
+  DummyControl        keepCacheControl = DummyControl::New(true);
+  Impl::DummyControl& keepCacheImpl    = static_cast<Impl::DummyControl&>(keepCacheControl.GetImplementation());
+
+  keepCacheImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2);
+  keepCacheControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  // Load request for keep cache control.
+  application.GetScene().Add(keepCacheControl);
+
+  Property::Map  attributes;
+  const uint32_t repeatMax = 10u;
+  for(uint32_t repeatCnt = 0u; repeatCnt < repeatMax; ++repeatCnt)
+  {
+    // DoAction multiple times.
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelImageVisual::Action::RELOAD, attributes);
+  }
+
+  application.SendNotification();
+  application.Render();
+
+  try
+  {
+    tet_infoline("Destroy control without stage on. And create new object that as same visual pointer as previous control");
+
+    const auto*    imageVisualObjectPtr = imageVisual.GetObjectPtr();
+    const uint32_t tryCountMax          = 100u;
+    uint32_t       tryCount             = 0u;
+    do
+    {
+      dummyControl.Reset();
+      imageVisual.Reset();
+
+      imageVisual  = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions());
+      dummyControl = DummyControl::New(true);
+
+      Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+
+      dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+      dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    } while(++tryCount < tryCountMax && imageVisualObjectPtr != imageVisual.GetObjectPtr());
+
+    tet_printf("Luck-trial count : %u. Success? %d\n", tryCount, imageVisualObjectPtr == imageVisual.GetObjectPtr());
+
+    // Connect signal
+    dummyControl.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+    application.SendNotification();
+    application.Render();
+
+    tet_infoline("Async load completed after control destroyed. Sigabort should not be occured");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    tet_infoline("ResourceReady signal must not be fired!");
+    DALI_TEST_EQUALS(gResourceReadySignalFired, false, TEST_LOCATION);
+
+    tet_infoline("Texture generation occured");
+    DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+    textureTrace.Reset();
+
+    tet_result(TET_PASS);
+  }
+  catch(...)
+  {
+    // Must not be throw exception.
+    tet_infoline("Exception occured!");
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
index a3ed827..3d21701 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,21 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 #include "toolkit-style-monitor.h"
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali.h>
+#include <dali/integration-api/events/hover-event-integ.h>
 #include <dali/integration-api/events/key-event-integ.h>
-#include <dali/integration-api/events/wheel-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/hover-event-integ.h>
-
+#include <dali/integration-api/events/wheel-event-integ.h>
 
 #include "dummy-control.h"
 
@@ -49,70 +48,69 @@ void utc_dali_toolkit_control_impl_cleanup(void)
 
 int UtcDaliControlImplNew(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control;
 
-  DALI_TEST_CHECK( !Control::DownCast(control) );
+  DALI_TEST_CHECK(!Control::DownCast(control));
 
   control = Toolkit::Internal::Control::New();
 
-  DALI_TEST_CHECK( Control::DownCast(control) );
+  DALI_TEST_CHECK(Control::DownCast(control));
   END_TEST;
 }
 
-
 int UtcDaliControlImplEnableGestureDetector(void)
 {
   ToolkitTestApplication application;
 
   // Enable individually
   {
-    DummyControl dummy = DummyControl::New();
+    DummyControl      dummy     = DummyControl::New();
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-    DALI_TEST_CHECK( !dummyImpl.GetPinchGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPinchGestureDetector());
     dummyImpl.EnableGestureDetection(GestureType::PINCH);
-    DALI_TEST_CHECK( dummyImpl.GetPinchGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetPinchGestureDetector());
 
-    DALI_TEST_CHECK( !dummyImpl.GetPanGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPanGestureDetector());
     dummyImpl.EnableGestureDetection(GestureType::PAN);
-    DALI_TEST_CHECK( dummyImpl.GetPanGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetPanGestureDetector());
 
-    DALI_TEST_CHECK( !dummyImpl.GetTapGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetTapGestureDetector());
     dummyImpl.EnableGestureDetection(GestureType::TAP);
-    DALI_TEST_CHECK( dummyImpl.GetTapGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetTapGestureDetector());
 
-    DALI_TEST_CHECK( !dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetLongPressGestureDetector());
     dummyImpl.EnableGestureDetection(GestureType::LONG_PRESS);
-    DALI_TEST_CHECK( dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetLongPressGestureDetector());
   }
 
   // Enable All
   {
-    DummyControl dummy = DummyControl::New();
+    DummyControl      dummy     = DummyControl::New();
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-    DALI_TEST_CHECK( !dummyImpl.GetPinchGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetPanGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetTapGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPinchGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetPanGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetTapGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetLongPressGestureDetector());
 
-    dummyImpl.EnableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.EnableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_CHECK( dummyImpl.GetPinchGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetPanGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetTapGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetPinchGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetPanGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetTapGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetLongPressGestureDetector());
 
     // Enable when already enabled
 
-    dummyImpl.EnableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.EnableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_CHECK( dummyImpl.GetPinchGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetPanGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetTapGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetPinchGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetPanGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetTapGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetLongPressGestureDetector());
   }
   END_TEST;
 }
@@ -123,89 +121,89 @@ int UtcDaliControlImplDisableGestureDetector(void)
 
   // Disable individually
   {
-    DummyControl dummy = DummyControl::New();
+    DummyControl      dummy     = DummyControl::New();
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-    dummyImpl.EnableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.EnableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_CHECK( dummyImpl.GetPinchGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetPinchGestureDetector());
     dummyImpl.DisableGestureDetection(GestureType::PINCH);
-    DALI_TEST_CHECK( !dummyImpl.GetPinchGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPinchGestureDetector());
 
-    DALI_TEST_CHECK( dummyImpl.GetPanGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetPanGestureDetector());
     dummyImpl.DisableGestureDetection(GestureType::PAN);
-    DALI_TEST_CHECK( !dummyImpl.GetPanGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPanGestureDetector());
 
-    DALI_TEST_CHECK( dummyImpl.GetTapGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetTapGestureDetector());
     dummyImpl.DisableGestureDetection(GestureType::TAP);
-    DALI_TEST_CHECK( !dummyImpl.GetTapGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetTapGestureDetector());
 
-    DALI_TEST_CHECK( dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetLongPressGestureDetector());
     dummyImpl.DisableGestureDetection(GestureType::LONG_PRESS);
-    DALI_TEST_CHECK( !dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetLongPressGestureDetector());
   }
 
   // Disable All
   {
-    DummyControl dummy = DummyControl::New();
+    DummyControl      dummy     = DummyControl::New();
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-    dummyImpl.EnableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.EnableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_CHECK( dummyImpl.GetPinchGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetPanGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetTapGestureDetector() );
-    DALI_TEST_CHECK( dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(dummyImpl.GetPinchGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetPanGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetTapGestureDetector());
+    DALI_TEST_CHECK(dummyImpl.GetLongPressGestureDetector());
 
-    dummyImpl.DisableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.DisableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_CHECK( !dummyImpl.GetPinchGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetPanGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetTapGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPinchGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetPanGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetTapGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetLongPressGestureDetector());
   }
 
   // Disable When not enabled
   {
-    DummyControl dummy = DummyControl::New();
+    DummyControl      dummy     = DummyControl::New();
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-    DALI_TEST_CHECK( !dummyImpl.GetPinchGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetPanGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetTapGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPinchGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetPanGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetTapGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetLongPressGestureDetector());
 
-    dummyImpl.DisableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.DisableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_CHECK( !dummyImpl.GetPinchGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetPanGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetTapGestureDetector() );
-    DALI_TEST_CHECK( !dummyImpl.GetLongPressGestureDetector() );
+    DALI_TEST_CHECK(!dummyImpl.GetPinchGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetPanGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetTapGestureDetector());
+    DALI_TEST_CHECK(!dummyImpl.GetLongPressGestureDetector());
   }
 
   // Ensure control is detached if gesture detector is not deleted
   {
-    DummyControl dummy = DummyControl::New();
+    DummyControl      dummy     = DummyControl::New();
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-    dummyImpl.EnableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.EnableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    PinchGestureDetector pinch = dummyImpl.GetPinchGestureDetector();
-    PanGestureDetector pan   = dummyImpl.GetPanGestureDetector();
-    TapGestureDetector tap = dummyImpl.GetTapGestureDetector();
+    PinchGestureDetector     pinch     = dummyImpl.GetPinchGestureDetector();
+    PanGestureDetector       pan       = dummyImpl.GetPanGestureDetector();
+    TapGestureDetector       tap       = dummyImpl.GetTapGestureDetector();
     LongPressGestureDetector longPress = dummyImpl.GetLongPressGestureDetector();
 
-    DALI_TEST_EQUALS( 0 == pinch.GetAttachedActorCount(), false, TEST_LOCATION );
-    DALI_TEST_EQUALS( 0 == pan.GetAttachedActorCount(), false, TEST_LOCATION );
-    DALI_TEST_EQUALS( 0 == tap.GetAttachedActorCount(), false, TEST_LOCATION );
-    DALI_TEST_EQUALS( 0 == longPress.GetAttachedActorCount(), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(0 == pinch.GetAttachedActorCount(), false, TEST_LOCATION);
+    DALI_TEST_EQUALS(0 == pan.GetAttachedActorCount(), false, TEST_LOCATION);
+    DALI_TEST_EQUALS(0 == tap.GetAttachedActorCount(), false, TEST_LOCATION);
+    DALI_TEST_EQUALS(0 == longPress.GetAttachedActorCount(), false, TEST_LOCATION);
 
-    dummyImpl.DisableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.DisableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_EQUALS( 0 == pinch.GetAttachedActorCount(), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( 0 == pan.GetAttachedActorCount(), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( 0 == tap.GetAttachedActorCount(), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( 0 == longPress.GetAttachedActorCount(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(0 == pinch.GetAttachedActorCount(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(0 == pan.GetAttachedActorCount(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(0 == tap.GetAttachedActorCount(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(0 == longPress.GetAttachedActorCount(), true, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -217,9 +215,9 @@ int UtcDaliControlImplOnGestureMethods(void)
   // Check gesture actually happens
   {
     DummyControl dummy = DummyControl::New(true);
-    dummy.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f ) );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
-    dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+    dummy.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
     application.GetScene().Add(dummy);
 
     // Render and notify a couple of times
@@ -229,31 +227,31 @@ int UtcDaliControlImplOnGestureMethods(void)
     application.Render();
 
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
-    dummyImpl.EnableGestureDetection( GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS) );
+    dummyImpl.EnableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::PAN | GestureType::TAP | GestureType::LONG_PRESS));
 
-    DALI_TEST_CHECK( dummyImpl.pinchCalled == false );
+    DALI_TEST_CHECK(dummyImpl.pinchCalled == false);
 
     TestGeneratePinch(application);
 
-    DALI_TEST_CHECK( dummyImpl.pinchCalled == true );
+    DALI_TEST_CHECK(dummyImpl.pinchCalled == true);
 
-    DALI_TEST_CHECK( dummyImpl.panCalled == false );
+    DALI_TEST_CHECK(dummyImpl.panCalled == false);
 
     TestGenerateMiniPan(application);
 
-    DALI_TEST_CHECK( dummyImpl.panCalled == true );
+    DALI_TEST_CHECK(dummyImpl.panCalled == true);
 
-    DALI_TEST_CHECK( dummyImpl.tapCalled == false );
+    DALI_TEST_CHECK(dummyImpl.tapCalled == false);
 
     TestGenerateTap(application);
 
-    DALI_TEST_CHECK( dummyImpl.tapCalled == true );
+    DALI_TEST_CHECK(dummyImpl.tapCalled == true);
 
-    DALI_TEST_CHECK( dummyImpl.longPressCalled == false );
+    DALI_TEST_CHECK(dummyImpl.longPressCalled == false);
 
     TestGenerateLongPress(application);
 
-    DALI_TEST_CHECK( dummyImpl.longPressCalled == true );
+    DALI_TEST_CHECK(dummyImpl.longPressCalled == true);
 
     application.GetScene().Remove(dummy);
   }
@@ -266,27 +264,27 @@ int UtcDaliControlImplChildAddAndRemove(void)
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl dummy = DummyControl::New(true);
     application.GetScene().Add(dummy);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
 
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS( dummyImpl.childAddCalled, false, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummy.GetChildCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.childAddCalled, false, TEST_LOCATION);
+    DALI_TEST_EQUALS(dummy.GetChildCount(), 0u, TEST_LOCATION);
     Actor actor = Actor::New();
     dummy.Add(actor);
-    DALI_TEST_EQUALS( dummyImpl.childAddCalled, true, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummy.GetChildCount(), 1u, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.childAddCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(dummy.GetChildCount(), 1u, TEST_LOCATION);
 
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS( dummyImpl.childRemoveCalled, false, TEST_LOCATION );
-    dummy.Remove( actor );
-    DALI_TEST_EQUALS( dummyImpl.childRemoveCalled, true, TEST_LOCATION );
-    DALI_TEST_EQUALS( dummy.GetChildCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.childRemoveCalled, false, TEST_LOCATION);
+    dummy.Remove(actor);
+    DALI_TEST_EQUALS(dummyImpl.childRemoveCalled, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(dummy.GetChildCount(), 0u, TEST_LOCATION);
 
     application.Render();
     application.SendNotification();
@@ -302,16 +300,16 @@ int UtcDaliControlImplChildAddAndRemove(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS( dummy.GetChildCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummy.GetChildCount(), 0u, TEST_LOCATION);
     Actor actor = Actor::New();
     dummy.Add(actor);
-    DALI_TEST_EQUALS( dummy.GetChildCount(), 1u, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummy.GetChildCount(), 1u, TEST_LOCATION);
 
     application.Render();
     application.SendNotification();
 
-    dummy.Remove( actor );
-    DALI_TEST_EQUALS( dummy.GetChildCount(), 0u, TEST_LOCATION );
+    dummy.Remove(actor);
+    DALI_TEST_EQUALS(dummy.GetChildCount(), 0u, TEST_LOCATION);
 
     application.Render();
     application.SendNotification();
@@ -326,37 +324,37 @@ int UtcDaliControlImplStageConnection(void)
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl        dummy     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
 
-    DALI_TEST_EQUALS( dummyImpl.stageConnectionCalled, false, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.stageConnectionCalled, false, TEST_LOCATION);
     application.GetScene().Add(dummy);
     application.Render();
     application.SendNotification();
-    DALI_TEST_EQUALS( dummyImpl.stageConnectionCalled, true, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.stageConnectionCalled, true, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( dummyImpl.stageDisconnectionCalled, false, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.stageDisconnectionCalled, false, TEST_LOCATION);
     application.GetScene().Remove(dummy);
     application.Render();
     application.SendNotification();
-    DALI_TEST_EQUALS( dummyImpl.stageDisconnectionCalled, true, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.stageDisconnectionCalled, true, TEST_LOCATION);
   }
 
   // Ensure full code coverage
   {
     unsigned int stageChildren = application.GetScene().GetLayer(0).GetChildCount();
-    DummyControl dummy = DummyControl::New();
+    DummyControl dummy         = DummyControl::New();
 
-    DALI_TEST_EQUALS( application.GetScene().GetLayer(0).GetChildCount(), stageChildren, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetScene().GetLayer(0).GetChildCount(), stageChildren, TEST_LOCATION);
     application.GetScene().Add(dummy);
     application.Render();
     application.SendNotification();
-    DALI_TEST_EQUALS( application.GetScene().GetLayer(0).GetChildCount(), stageChildren + 1, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetScene().GetLayer(0).GetChildCount(), stageChildren + 1, TEST_LOCATION);
 
     application.GetScene().Remove(dummy);
     application.Render();
     application.SendNotification();
-    DALI_TEST_EQUALS( application.GetScene().GetLayer(0).GetChildCount(), stageChildren, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetScene().GetLayer(0).GetChildCount(), stageChildren, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -366,24 +364,24 @@ int UtcDaliControlImplSizeSetP(void)
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl        dummy     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
 
     application.GetScene().Add(dummy);
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS( dummyImpl.sizeSetCalled, false, TEST_LOCATION ); // Size not set, no onSizeSet called
+    DALI_TEST_EQUALS(dummyImpl.sizeSetCalled, false, TEST_LOCATION); // Size not set, no onSizeSet called
     Vector2 size(100.0f, 200.0f);
-    dummy.SetProperty( Actor::Property::SIZE, size );
+    dummy.SetProperty(Actor::Property::SIZE, size);
 
-    DALI_TEST_EQUALS( dummyImpl.sizeSetCalled, false, TEST_LOCATION ); // Size is going to get negotiated, no onSizeSet called
+    DALI_TEST_EQUALS(dummyImpl.sizeSetCalled, false, TEST_LOCATION); // Size is going to get negotiated, no onSizeSet called
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( size, dummy.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY(), TEST_LOCATION );
-    DALI_TEST_EQUALS( dummyImpl.sizeSetCalled, true, TEST_LOCATION );
+    DALI_TEST_EQUALS(size, dummy.GetCurrentProperty<Vector3>(Actor::Property::SIZE).GetVectorXY(), TEST_LOCATION);
+    DALI_TEST_EQUALS(dummyImpl.sizeSetCalled, true, TEST_LOCATION);
 
     application.GetScene().Remove(dummy);
   }
@@ -400,37 +398,36 @@ int UtcDaliControlImplSizeSet2P(void)
     application.GetScene().Add(dummy);
 
     Vector2 size(100.0f, 200.0f);
-    DALI_TEST_CHECK( size != dummy.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY() );
+    DALI_TEST_CHECK(size != dummy.GetCurrentProperty<Vector3>(Actor::Property::SIZE).GetVectorXY());
 
     application.SendNotification();
     application.Render();
 
-    dummy.SetProperty( Actor::Property::SIZE, size);
+    dummy.SetProperty(Actor::Property::SIZE, size);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS(size, dummy.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY(), TEST_LOCATION);
+    DALI_TEST_EQUALS(size, dummy.GetCurrentProperty<Vector3>(Actor::Property::SIZE).GetVectorXY(), TEST_LOCATION);
 
     application.GetScene().Remove(dummy);
   }
   END_TEST;
 }
 
-
 int UtcDaliControlImplSizeAnimation(void)
 {
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl        dummy     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
 
     application.GetScene().Add(dummy);
 
-    DALI_TEST_EQUALS( dummyImpl.sizeAnimationCalled, false, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.sizeAnimationCalled, false, TEST_LOCATION);
     Animation animation = Animation::New(1.0f);
-    animation.AnimateTo( Property( dummy, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) );
+    animation.AnimateTo(Property(dummy, Actor::Property::SIZE), Vector3(100.0f, 150.0f, 200.0f));
     animation.Play();
 
     application.Render();
@@ -438,7 +435,7 @@ int UtcDaliControlImplSizeAnimation(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS( dummyImpl.sizeAnimationCalled, true, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.sizeAnimationCalled, true, TEST_LOCATION);
 
     application.GetScene().Remove(dummy);
   }
@@ -450,7 +447,7 @@ int UtcDaliControlImplSizeAnimation(void)
     application.GetScene().Add(dummy);
 
     Animation animation = Animation::New(1.0f);
-    animation.AnimateTo( Property( dummy, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) );
+    animation.AnimateTo(Property(dummy, Actor::Property::SIZE), Vector3(100.0f, 150.0f, 200.0f));
     animation.Play();
 
     application.Render();
@@ -470,7 +467,7 @@ int UtcDaliControlImplKeyEvent(void)
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl        dummy     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
 
     application.GetScene().Add(dummy);
@@ -481,10 +478,10 @@ int UtcDaliControlImplKeyEvent(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS( dummyImpl.keyEventCalled, false, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.keyEventCalled, false, TEST_LOCATION);
     Integration::KeyEvent keyEvent;
     application.ProcessEvent(keyEvent);
-    DALI_TEST_EQUALS( dummyImpl.keyEventCalled, true, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.keyEventCalled, true, TEST_LOCATION);
 
     application.GetScene().Remove(dummy);
   }
@@ -514,16 +511,16 @@ int UtcDaliControlImplKeyInputFocusGained(void)
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl        dummy     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
 
     application.GetScene().Add(dummy);
 
-    DALI_TEST_EQUALS( dummyImpl.keyInputFocusGained, false, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.keyInputFocusGained, false, TEST_LOCATION);
 
     dummy.SetKeyInputFocus();
 
-    DALI_TEST_EQUALS( dummyImpl.keyInputFocusGained, true, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.keyInputFocusGained, true, TEST_LOCATION);
 
     application.GetScene().Remove(dummy);
   }
@@ -544,17 +541,17 @@ int UtcDaliControlImplKeyInputFocusLost(void)
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl        dummy     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
 
     application.GetScene().Add(dummy);
 
-    DALI_TEST_EQUALS( dummyImpl.keyInputFocusLost, false, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.keyInputFocusLost, false, TEST_LOCATION);
 
     dummy.SetKeyInputFocus();
     dummy.ClearKeyInputFocus();
 
-    DALI_TEST_EQUALS( dummyImpl.keyInputFocusLost, true, TEST_LOCATION );
+    DALI_TEST_EQUALS(dummyImpl.keyInputFocusLost, true, TEST_LOCATION);
 
     application.GetScene().Remove(dummy);
   }
@@ -583,17 +580,16 @@ int UtcDaliControlImplTypeRegistry(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "Control" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("Control");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   // Check if it's a control
-  DALI_TEST_CHECK( Control::DownCast(handle) );
+  DALI_TEST_CHECK(Control::DownCast(handle));
   END_TEST;
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 int UtcDaliControlImplSetStyleName(void)
@@ -601,15 +597,15 @@ int UtcDaliControlImplSetStyleName(void)
   ToolkitTestApplication application;
 
   {
-    DummyControl dummy = DummyControl::New( true );
+    DummyControl dummy = DummyControl::New(true);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-    dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+    dummy.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
     application.GetScene().Add(dummy);
 
     dummy.SetStyleName("TestStyle");
 
-    DALI_TEST_CHECK( dummy.GetStyleName() == "TestStyle" );
+    DALI_TEST_CHECK(dummy.GetStyleName() == "TestStyle");
 
     application.GetScene().Remove(dummy);
   }
@@ -618,64 +614,62 @@ int UtcDaliControlImplSetStyleName(void)
 
 int UtcDaliControlImplOnStyleChangeN(void)
 {
-  ToolkitTestApplication application;
-  Control dummy = Control::New();
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( dummy );
+  ToolkitTestApplication      application;
+  Control                     dummy       = Control::New();
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(dummy);
 
   // test that style manager is being used, passing an empty handle does nothing but does not crash either
   Dali::Toolkit::StyleManager styleManager;
-  controlImpl.OnStyleChange( styleManager, StyleChange::THEME_CHANGE );
+  controlImpl.OnStyleChange(styleManager, StyleChange::THEME_CHANGE);
   // no crash so test passes
   tet_result(TET_PASS);
 
   END_TEST;
 }
 
-
 int UtcDaliControlImplOnAccessibilityPanP(void)
 {
-  ToolkitTestApplication application;
-  Control dummy = Control::New();
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( dummy );
+  ToolkitTestApplication      application;
+  Control                     dummy       = Control::New();
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(dummy);
 
   PanGesture pan;
-  DALI_TEST_EQUALS( false, controlImpl.OnAccessibilityPan( pan ), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, controlImpl.OnAccessibilityPan(pan), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliControlImplOnAccessibilityActivatedP(void)
 {
   ToolkitTestApplication application;
 
-  Control dummy = Control::New();
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( dummy );
-  DALI_TEST_EQUALS( false, controlImpl.OnAccessibilityActivated(), TEST_LOCATION );
+  Control                     dummy       = Control::New();
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(dummy);
+  DALI_TEST_EQUALS(false, controlImpl.OnAccessibilityActivated(), TEST_LOCATION);
 
   // Invoke the control's activate action
-  TypeInfo type = TypeRegistry::Get().GetTypeInfo( "Control" );
-  DALI_TEST_CHECK( type );
+  TypeInfo type = TypeRegistry::Get().GetTypeInfo("Control");
+  DALI_TEST_CHECK(type);
 
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   Property::Map attributes;
-  DALI_TEST_EQUALS( false, handle.DoAction("accessibilityActivated",  attributes), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, handle.DoAction("accessibilityActivated", attributes), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliControlImplGetNextKeyboardFocusableActorP(void)
 {
-  ToolkitTestApplication application;
-  Control dummy = Control::New();
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( dummy );
+  ToolkitTestApplication      application;
+  Control                     dummy       = Control::New();
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(dummy);
 
   Actor currentFocusedActor;
-  Actor result = controlImpl.GetNextKeyboardFocusableActor( currentFocusedActor, Control::KeyboardFocus::LEFT, false );
+  Actor result = controlImpl.GetNextKeyboardFocusableActor(currentFocusedActor, Control::KeyboardFocus::LEFT, false);
 
-  DALI_TEST_EQUALS( result, currentFocusedActor, TEST_LOCATION );
+  DALI_TEST_EQUALS(result, currentFocusedActor, TEST_LOCATION);
 
   END_TEST;
 }
@@ -684,39 +678,39 @@ int UtcDaliControlImplRegisterThenReRegisterVisual(void)
 {
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index index =1;
+  Property::Index index = 1;
 
-  DALI_TEST_CHECK( !dummyImpl.GetVisual( index )  );
+  DALI_TEST_CHECK(!dummyImpl.GetVisual(index));
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( index, visual );
+  dummyImpl.RegisterVisual(index, visual);
 
-  DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
+  DALI_TEST_CHECK(dummyImpl.GetVisual(index) == visual);
 
   Property::Map newMap;
-  newMap[Visual::Property::TYPE] = Visual::COLOR;
+  newMap[Visual::Property::TYPE]           = Visual::COLOR;
   newMap[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
 
-  visual = visualFactory.CreateVisual( newMap );
+  visual = visualFactory.CreateVisual(newMap);
   DALI_TEST_CHECK(visual);
 
   // ReRegister with altered color visual
-  dummyImpl.RegisterVisual( index, visual );
+  dummyImpl.RegisterVisual(index, visual);
 
-  DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
+  DALI_TEST_CHECK(dummyImpl.GetVisual(index) == visual);
 
   tet_result(TET_PASS);
 
@@ -727,30 +721,30 @@ int UtcDaliControlImplRegisterVisaulThenReRegisterToSelf(void)
 {
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index index =1;
+  Property::Index index = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( index, visual );
+  dummyImpl.RegisterVisual(index, visual);
 
-  DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
+  DALI_TEST_CHECK(dummyImpl.GetVisual(index) == visual);
 
   // ReRegister to self
-  dummyImpl.RegisterVisual( index, visual );
+  dummyImpl.RegisterVisual(index, visual);
 
-  DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
+  DALI_TEST_CHECK(dummyImpl.GetVisual(index) == visual);
 
   END_TEST;
 }
@@ -759,33 +753,33 @@ int UtcDaliControlImplRegisterVisualToSelf(void)
 {
   ToolkitTestApplication application;
 
-  Test::ObjectDestructionTracker objectDestructionTracker( application.GetCore().GetObjectRegistry() );
+  Test::ObjectDestructionTracker objectDestructionTracker(application.GetCore().GetObjectRegistry());
 
   {
-    DummyControl dummy = DummyControl::New();
+    DummyControl      dummy     = DummyControl::New();
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
-    objectDestructionTracker.Start( dummy );
+    objectDestructionTracker.Start(dummy);
 
     Property::Index index = 1;
 
     Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-    Toolkit::Visual::Base visual;
+    Toolkit::Visual::Base  visual;
 
     Property::Map map;
-    map[Visual::Property::TYPE] = Visual::COLOR;
+    map[Visual::Property::TYPE]           = Visual::COLOR;
     map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-    visual = visualFactory.CreateVisual( map );
+    visual = visualFactory.CreateVisual(map);
     DALI_TEST_CHECK(visual);
 
     // Register to self
-    dummyImpl.RegisterVisual( index, visual );
+    dummyImpl.RegisterVisual(index, visual);
 
-    DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION ); // Control not destroyed yet
-    DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
+    DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION); // Control not destroyed yet
+    DALI_TEST_CHECK(dummyImpl.GetVisual(index) == visual);
   }
 
-  DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION ); // Should be destroyed
+  DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION); // Should be destroyed
 
   END_TEST;
 }
@@ -794,38 +788,38 @@ int UtcDaliControlImplRegisterTwoVisuals(void)
 {
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index index =1;
-  Property::Index index2 =2;
+  Property::Index index  = 1;
+  Property::Index index2 = 2;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
-  Toolkit::Visual::Base secondVisual;
+  Toolkit::Visual::Base  visual;
+  Toolkit::Visual::Base  secondVisual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( index, visual );
+  dummyImpl.RegisterVisual(index, visual);
 
   Property::Map newMap;
-  newMap[Visual::Property::TYPE] = Visual::COLOR;
+  newMap[Visual::Property::TYPE]           = Visual::COLOR;
   newMap[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
 
-  secondVisual = visualFactory.CreateVisual( newMap );
-  DALI_TEST_CHECK( secondVisual );
+  secondVisual = visualFactory.CreateVisual(newMap);
+  DALI_TEST_CHECK(secondVisual);
 
   // ReRegister with altered color visual
-  dummyImpl.RegisterVisual( index2, secondVisual );
+  dummyImpl.RegisterVisual(index2, secondVisual);
 
-  DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
-  DALI_TEST_CHECK( dummyImpl.GetVisual( index2 ) == secondVisual );
+  DALI_TEST_CHECK(dummyImpl.GetVisual(index) == visual);
+  DALI_TEST_CHECK(dummyImpl.GetVisual(index2) == secondVisual);
 
   END_TEST;
 }
@@ -834,42 +828,42 @@ int UtcDaliControlImplRegisterUnregisterVisual(void)
 {
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index index =1;
+  Property::Index index = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( index, visual );
+  dummyImpl.RegisterVisual(index, visual);
 
-  tet_infoline( "Add control with visual to stage and check renderer count is 1" );
-  application.GetScene().Add( dummy );
+  tet_infoline("Add control with visual to stage and check renderer count is 1");
+  application.GetScene().Add(dummy);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
-  DALI_TEST_EQUALS( dummy.GetRendererCount(), 1, TEST_LOCATION );
+  DALI_TEST_CHECK(dummyImpl.GetVisual(index) == visual);
+  DALI_TEST_EQUALS(dummy.GetRendererCount(), 1, TEST_LOCATION);
 
   // Unregister visual
-  dummyImpl.UnregisterVisual( index );
+  dummyImpl.UnregisterVisual(index);
 
-  tet_infoline( "Remove control with visual from stage and check renderer count is 0" );
-  application.GetScene().Remove( dummy );
+  tet_infoline("Remove control with visual from stage and check renderer count is 0");
+  application.GetScene().Remove(dummy);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( dummy.GetRendererCount(), 0, TEST_LOCATION );
-  DALI_TEST_CHECK( !dummyImpl.GetVisual( index ) );
+  DALI_TEST_EQUALS(dummy.GetRendererCount(), 0, TEST_LOCATION);
+  DALI_TEST_CHECK(!dummyImpl.GetVisual(index));
 
   END_TEST;
 }
@@ -878,26 +872,26 @@ int UtcDaliControlImplRegisterDisabledVisual(void)
 {
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index TEST_PROPERTY =1;
+  Property::Index TEST_PROPERTY = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( TEST_PROPERTY, visual, false );
+  dummyImpl.RegisterVisual(TEST_PROPERTY, visual, false);
 
-  DALI_TEST_CHECK( dummyImpl.GetVisual( TEST_PROPERTY ) == visual );
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == false );
+  DALI_TEST_CHECK(dummyImpl.GetVisual(TEST_PROPERTY) == visual);
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY) == false);
 
   application.GetScene().Add(dummy);
 
@@ -905,13 +899,13 @@ int UtcDaliControlImplRegisterDisabledVisual(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == false );
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY) == false);
 
-  DALI_TEST_CHECK( dummy.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) == true );
+  DALI_TEST_CHECK(dummy.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE) == true);
 
-  dummyImpl.EnableVisual( TEST_PROPERTY, true );
+  dummyImpl.EnableVisual(TEST_PROPERTY, true);
 
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == true );
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY) == true);
 
   END_TEST;
 }
@@ -920,23 +914,23 @@ int UtcDaliControlImplDisableRegisteredVisual(void)
 {
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index TEST_PROPERTY =1;
+  Property::Index TEST_PROPERTY = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( TEST_PROPERTY, visual );
+  dummyImpl.RegisterVisual(TEST_PROPERTY, visual);
 
   application.GetScene().Add(dummy);
 
@@ -944,13 +938,13 @@ int UtcDaliControlImplDisableRegisteredVisual(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == true);
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY) == true);
 
-  DALI_TEST_CHECK( dummy.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) == true );
+  DALI_TEST_CHECK(dummy.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE) == true);
 
-  dummyImpl.EnableVisual( TEST_PROPERTY, false );
+  dummyImpl.EnableVisual(TEST_PROPERTY, false);
 
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == false );
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY) == false);
 
   END_TEST;
 }
@@ -962,52 +956,52 @@ int UtcDaliControlImplEnabledVisualParentRemovedFromStage(void)
 
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index TEST_PROPERTY =1;
+  Property::Index TEST_PROPERTY = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( TEST_PROPERTY, visual, false );
+  dummyImpl.RegisterVisual(TEST_PROPERTY, visual, false);
 
   application.GetScene().Add(dummy);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == false );
-  DALI_TEST_CHECK( dummy.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) == true );
-  dummyImpl.EnableVisual( TEST_PROPERTY, true );
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY) == false);
+  DALI_TEST_CHECK(dummy.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE) == true);
+  dummyImpl.EnableVisual(TEST_PROPERTY, true);
 
   // Render and notify
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( dummy.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(dummy.GetRendererCount() == 1u);
 
   // Remove control from stage, visual should be removed from stage too
   application.GetScene().Remove(dummy);
   // Render and notify
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( dummy.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(dummy.GetRendererCount() == 0u);
 
   application.GetScene().Add(dummy);
   // Render and notify
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( dummy.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(dummy.GetRendererCount() == 1u);
 
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == true );
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY) == true);
 
   END_TEST;
 }
@@ -1021,66 +1015,66 @@ int UtcDaliControlImplRegisterTwoVisualsAndEnableOnlyOne(void)
 
   ToolkitTestApplication application;
 
-  DummyControl dummy = DummyControl::New();
+  DummyControl      dummy     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
 
-  Property::Index TEST_PROPERTY1 =1;
-  Property::Index TEST_PROPERTY2 =2;
+  Property::Index TEST_PROPERTY1 = 1;
+  Property::Index TEST_PROPERTY2 = 2;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual1;
-  Toolkit::Visual::Base visual2;
+  Toolkit::Visual::Base  visual1;
+  Toolkit::Visual::Base  visual2;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
   Property::Map map2;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
 
-  visual1 = visualFactory.CreateVisual( map );
+  visual1 = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual1);
 
-  visual2 = visualFactory.CreateVisual( map );
+  visual2 = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual2);
 
   // Register index with a color visual
-  dummyImpl.RegisterVisual( TEST_PROPERTY1, visual1 );
+  dummyImpl.RegisterVisual(TEST_PROPERTY1, visual1);
   // Register second index with a color visual
-  dummyImpl.RegisterVisual( TEST_PROPERTY2, visual2 );
+  dummyImpl.RegisterVisual(TEST_PROPERTY2, visual2);
 
   application.GetScene().Add(dummy);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( dummy.GetRendererCount() == 2u );
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY1 ) == true );
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY1 ) == true);
-  DALI_TEST_CHECK( dummy.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) == true );
-  dummyImpl.EnableVisual( TEST_PROPERTY2, false );
+  DALI_TEST_CHECK(dummy.GetRendererCount() == 2u);
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY1) == true);
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY1) == true);
+  DALI_TEST_CHECK(dummy.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE) == true);
+  dummyImpl.EnableVisual(TEST_PROPERTY2, false);
 
   // Render and notify
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( dummy.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(dummy.GetRendererCount() == 1u);
 
   // Remove control from stage, visual should be removed from stage too
   application.GetScene().Remove(dummy);
   // Render and notify
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( dummy.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(dummy.GetRendererCount() == 0u);
 
   application.GetScene().Add(dummy);
   // Render and notify
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( dummy.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(dummy.GetRendererCount() == 1u);
 
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY1 ) == true );
-  DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY2 ) == false );
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY1) == true);
+  DALI_TEST_CHECK(dummyImpl.IsVisualEnabled(TEST_PROPERTY2) == false);
 
   END_TEST;
 }
@@ -1088,30 +1082,30 @@ int UtcDaliControlImplAutoClippingWithVisuals(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Test to ensure a renderer does NOT get added when we've already registered a visual which we haven't enabled" );
+  tet_infoline("Test to ensure a renderer does NOT get added when we've already registered a visual which we haven't enabled");
 
-  DummyControl control = DummyControl::New();
-  DummyControlImpl& controlImpl = static_cast<DummyControlImpl&>( control.GetImplementation() );
+  DummyControl      control     = DummyControl::New();
+  DummyControlImpl& controlImpl = static_cast<DummyControlImpl&>(control.GetImplementation());
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
-  Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  Toolkit::Visual::Base  visual;
+  Property::Map          map;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
-  visual = visualFactory.CreateVisual( map );
+  visual                                = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
-  controlImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual, false );
+  controlImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual, false);
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1120,33 +1114,33 @@ int UtcDaliControlImplAutoClippingWithVisualsAlreadyOnStage(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Test to ensure a renderer does NOT get added when we've already registered a visual which we haven't enabled and we're already on the stage" );
+  tet_infoline("Test to ensure a renderer does NOT get added when we've already registered a visual which we haven't enabled and we're already on the stage");
 
-  DummyControl control = DummyControl::New();
-  DummyControlImpl& controlImpl = static_cast<DummyControlImpl&>( control.GetImplementation() );
+  DummyControl      control     = DummyControl::New();
+  DummyControlImpl& controlImpl = static_cast<DummyControlImpl&>(control.GetImplementation());
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
-  Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  Toolkit::Visual::Base  visual;
+  Property::Map          map;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
-  visual = visualFactory.CreateVisual( map );
+  visual                                = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
-  controlImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual, false );
+  controlImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual, false);
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
   application.SendNotification();
   application.Render();
 
-  control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
+  control.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, control.GetRendererCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1156,8 +1150,8 @@ int UtcDaliControlImplOnPinch(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  control.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   application.GetScene().Add(control);
 
   application.SendNotification();
@@ -1167,11 +1161,76 @@ int UtcDaliControlImplOnPinch(void)
   impl.EnableGestureDetection(GestureType::PINCH);
 
   // Scale becomes 0.6666666
-  TestStartPinch( application,  Vector2( 5.0f, 20.0f ), Vector2( 35.0f, 20.0f ),
-                                Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), 100 );
+  TestStartPinch(application, Vector2(5.0f, 20.0f), Vector2(35.0f, 20.0f), Vector2(10.0f, 20.0f), Vector2(30.0f, 20.0f), 100);
 
-  DALI_TEST_EQUALS(0.666f, control.GetProperty( Actor::Property::SCALE_X).Get<float>(), 0.01f, TEST_LOCATION);
+  DALI_TEST_EQUALS(0.666f, control.GetProperty(Actor::Property::SCALE_X).Get<float>(), 0.01f, TEST_LOCATION);
 
   END_TEST;
+}
+
+// For ResourceReady
+namespace
+{
+static bool gOnRelayoutCallBackCalled = false;
+void        OnRelayoutCallback(Actor actor)
+{
+  gOnRelayoutCallBackCalled = true;
+}
+
+static bool gResourceReadyCalled = false;
+void        OnResourceReady(Control control)
+{
+  gResourceReadyCalled = true;
+}
+} // namespace
+
+int UtcDaliControlImplResourceReady(void)
+{
+  ToolkitTestApplication application;
+
+  gOnRelayoutCallBackCalled = false;
+  gResourceReadyCalled      = false;
+  Control control           = Control::New();
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control.OnRelayoutSignal().Connect(OnRelayoutCallback);
+  control.ResourceReadySignal().Connect(OnResourceReady);
+  application.GetScene().Add(control);
+
+  // Sanity check
+  DALI_TEST_CHECK(!gOnRelayoutCallBackCalled);
+  DALI_TEST_CHECK(!gResourceReadyCalled);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, true, TEST_LOCATION);
+  gOnRelayoutCallBackCalled = false;
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, false, TEST_LOCATION);
+  Toolkit::Internal::Control& impl = Toolkit::Internal::GetImplementation(control);
+  // ResourceReady is true when there is no visual in the default Toolkit::Internal::Control.
+  DALI_TEST_EQUALS(impl.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  impl.SetResourceReady();
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, false, TEST_LOCATION);
+  gResourceReadyCalled = false;
+  DALI_TEST_EQUALS(gResourceReadyCalled, false, TEST_LOCATION);
+  impl.SetResourceReady();
+  DALI_TEST_EQUALS(gResourceReadyCalled, true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
 
+  DALI_TEST_EQUALS(gOnRelayoutCallBackCalled, false, TEST_LOCATION);
+
+  END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
index f1b934b..d346395 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,23 +15,23 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
-#include <dali.h>
-#include <dali/public-api/dali-core.h>
-#include <dali/devel-api/actors/custom-actor-devel.h>
-#include <dali/devel-api/object/csharp-type-registry.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/controls/control-wrapper.h>
 #include <dali-toolkit/devel-api/controls/control-wrapper-impl.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/controls/control-wrapper.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali.h>
+#include <dali/devel-api/actors/custom-actor-devel.h>
+#include <dali/devel-api/object/csharp-type-registry.h>
+#include <dali/public-api/dali-core.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -54,7 +54,7 @@ bool gOnRelayout = false;
 
 static bool gKeyInputFocusCallBackCalled;
 
-static void TestKeyInputFocusCallback( Control control )
+static void TestKeyInputFocusCallback(Control control)
 {
   tet_infoline(" TestKeyInputFocusCallback");
 
@@ -64,7 +64,6 @@ static void TestKeyInputFocusCallback( Control control )
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-
 namespace Impl
 {
 struct TestCustomControl : public Toolkit::Internal::ControlWrapper
@@ -72,23 +71,25 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper
   /**
    * Constructor
    */
-  TestCustomControl()  : Toolkit::Internal::ControlWrapper( CustomControlBehaviour( Toolkit::Internal::ControlWrapper::DISABLE_STYLE_CHANGE_SIGNALS |
-          Toolkit::Internal::ControlWrapper::REQUIRES_KEYBOARD_NAVIGATION_SUPPORT )) ,
-          mDaliProperty( Property::INVALID_INDEX ),
-          mSizeSet( Vector3::ZERO ),
-          mTargetSize( Vector3::ZERO ),
-          mNego( false ),
-          mDepth( 0u )
+  TestCustomControl()
+  : Toolkit::Internal::ControlWrapper(CustomControlBehaviour(Toolkit::Internal::ControlWrapper::DISABLE_STYLE_CHANGE_SIGNALS |
+                                                             Toolkit::Internal::ControlWrapper::REQUIRES_KEYBOARD_NAVIGATION_SUPPORT)),
+    mDaliProperty(Property::INVALID_INDEX),
+    mSizeSet(Vector3::ZERO),
+    mTargetSize(Vector3::ZERO),
+    mNego(false),
+    mDepth(0u)
   {
   }
 
-  TestCustomControl(bool nego)  : Toolkit::Internal::ControlWrapper( CustomControlBehaviour( Toolkit::Internal::ControlWrapper::DISABLE_STYLE_CHANGE_SIGNALS |
-          Toolkit::Internal::ControlWrapper::REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) ),
-          mDaliProperty( Property::INVALID_INDEX ),
-          mSizeSet( Vector3::ZERO ),
-          mTargetSize( Vector3::ZERO ),
-          mNego( nego ),
-          mDepth( 0u )
+  TestCustomControl(bool nego)
+  : Toolkit::Internal::ControlWrapper(CustomControlBehaviour(Toolkit::Internal::ControlWrapper::DISABLE_STYLE_CHANGE_SIGNALS |
+                                                             Toolkit::Internal::ControlWrapper::REQUIRES_KEYBOARD_NAVIGATION_SUPPORT)),
+    mDaliProperty(Property::INVALID_INDEX),
+    mSizeSet(Vector3::ZERO),
+    mTargetSize(Vector3::ZERO),
+    mNego(nego),
+    mDepth(0u)
   {
   }
 
@@ -99,18 +100,20 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper
   {
   }
 
-  void Initialize( const char* name = NULL )
+  void Initialize(const char* name = NULL)
   {
-    mDaliProperty = Self().RegisterProperty( "Dali", std::string("no"), Property::READ_WRITE );
+    mDaliProperty = Self().RegisterProperty("Dali", std::string("no"), Property::READ_WRITE);
 
-    OnInitialize( name );
+    OnInitialize(name);
   }
 
   using Control::OnInitialize; ///< To tell the compiler that we really do want to overload OnInitialize in this class & were not trying to override it
-  virtual void OnInitialize( const char* name ) {}
+  virtual void OnInitialize(const char* name)
+  {
+  }
 
   // From Toolkit::Internal::ControlWrapper
-  virtual void OnSceneConnection( int depth )
+  virtual void OnSceneConnection(int depth)
   {
     mDepth = depth;
     Control::OnSceneConnection(depth);
@@ -119,37 +122,37 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper
   {
     Control::OnSceneDisconnection();
   }
-  virtual void OnChildAdd( Actor& child )
+  virtual void OnChildAdd(Actor& child)
   {
     Control::OnChildAdd(child);
   }
-  virtual void OnChildRemove( Actor& child )
+  virtual void OnChildRemove(Actor& child)
   {
     Control::OnChildRemove(child);
   }
-  virtual void OnPropertySet( Property::Index index, const Property::Value& propertyValue )
+  virtual void OnPropertySet(Property::Index index, const Property::Value& propertyValue)
   {
     Control::OnPropertySet(index, propertyValue);
   }
-  virtual void OnSizeSet( const Vector3& targetSize )
+  virtual void OnSizeSet(const Vector3& targetSize)
   {
     mSizeSet = targetSize;
-    Control::OnSizeSet( targetSize );
+    Control::OnSizeSet(targetSize);
   }
-  virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize )
+  virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize)
   {
     mTargetSize = targetSize;
-    Control::OnSizeAnimation( animation, targetSize );
+    Control::OnSizeAnimation(animation, targetSize);
   }
-  virtual bool OnHoverEvent( const HoverEvent& event )
+  virtual bool OnHoverEvent(const HoverEvent& event)
   {
     return true;
   }
-  virtual bool OnWheelEvent( const WheelEvent& event )
+  virtual bool OnWheelEvent(const WheelEvent& event)
   {
     return true;
   }
-  virtual bool OnKeyEvent( const KeyEvent& event )
+  virtual bool OnKeyEvent(const KeyEvent& event)
   {
     return true;
   }
@@ -161,60 +164,60 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper
   }
   virtual Vector3 GetNaturalSize()
   {
-    return Vector3( 0.0f, 0.0f, 0.0f );
+    return Vector3(0.0f, 0.0f, 0.0f);
   }
 
-  virtual float GetHeightForWidth( float width )
+  virtual float GetHeightForWidth(float width)
   {
     return 0.0f;
   }
 
-  virtual float GetWidthForHeight( float height )
+  virtual float GetWidthForHeight(float height)
   {
     return 0.0f;
   }
 
-  void TestRegisterVisual( Property::Index index, Toolkit::Visual::Base visual )
+  void TestRegisterVisual(Property::Index index, Toolkit::Visual::Base visual)
   {
-    ControlWrapper::RegisterVisual( index, visual );
+    ControlWrapper::RegisterVisual(index, visual);
 
-    VisualIndices::iterator iter = std::find( mRegisteredVisualIndices.begin(), mRegisteredVisualIndices.end(), index );
-    if( iter == mRegisteredVisualIndices.end() )
+    VisualIndices::iterator iter = std::find(mRegisteredVisualIndices.begin(), mRegisteredVisualIndices.end(), index);
+    if(iter == mRegisteredVisualIndices.end())
     {
       mRegisteredVisualIndices.push_back(index);
     }
   }
 
-  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
+  virtual void OnRelayout(const Vector2& size, RelayoutContainer& container)
   {
     gOnRelayout = true;
 
-    for( VisualIndices::iterator iter = mRegisteredVisualIndices.begin(); iter != mRegisteredVisualIndices.end() ; ++iter )
+    for(VisualIndices::iterator iter = mRegisteredVisualIndices.begin(); iter != mRegisteredVisualIndices.end(); ++iter)
     {
-      Visual::Base visual = GetVisual(*iter);
+      Visual::Base  visual = GetVisual(*iter);
       Property::Map map; // empty map enforces defaults
-      visual.SetTransformAndSize( map, size );
+      visual.SetTransformAndSize(map, size);
     }
   }
 
-  virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
+  virtual void OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension)
   {
   }
 
-  virtual void OnCalculateRelayoutSize( Dimension::Type dimension )
+  virtual void OnCalculateRelayoutSize(Dimension::Type dimension)
   {
   }
 
-  virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension )
+  virtual float CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension)
   {
     return 0.0f;
   }
 
-  virtual void OnLayoutNegotiated( float size, Dimension::Type dimension )
+  virtual void OnLayoutNegotiated(float size, Dimension::Type dimension)
   {
   }
 
-  virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS )
+  virtual bool RelayoutDependentOnChildren(Dimension::Type dimension = Dimension::ALL_DIMENSIONS)
   {
     return false;
   }
@@ -228,61 +231,57 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper
     RelayoutRequest();
   }
 
-  float TestGetHeightForWidthBase( float width )
+  float TestGetHeightForWidthBase(float width)
   {
-    return GetHeightForWidthBase( width );
+    return GetHeightForWidthBase(width);
   }
 
-  float TestGetWidthForHeightBase( float height )
+  float TestGetWidthForHeightBase(float height)
   {
-    return GetWidthForHeightBase( height );
+    return GetWidthForHeightBase(height);
   }
 
-  float TestCalculateChildSizeBase( const Dali::Actor& child, Dimension::Type dimension )
+  float TestCalculateChildSizeBase(const Dali::Actor& child, Dimension::Type dimension)
   {
-    return CalculateChildSizeBase( child, dimension );
+    return CalculateChildSizeBase(child, dimension);
   }
 
-  bool TestRelayoutDependentOnChildrenBase( Dimension::Type dimension )
+  bool TestRelayoutDependentOnChildrenBase(Dimension::Type dimension)
   {
-    return RelayoutDependentOnChildrenBase( dimension );
+    return RelayoutDependentOnChildrenBase(dimension);
   }
 
   Property::Index mDaliProperty;
-  Vector3 mSizeSet;
-  Vector3 mTargetSize;
-  bool mNego;
-  unsigned int mDepth;
+  Vector3         mSizeSet;
+  Vector3         mTargetSize;
+  bool            mNego;
+  unsigned int    mDepth;
 
   typedef std::vector<Property::Index> VisualIndices;
-  VisualIndices mRegisteredVisualIndices;
+  VisualIndices                        mRegisteredVisualIndices;
 };
 
+} // namespace Impl
 
-
-}
-
-static std::string customControlTypeName = "MyTestCustomControl";
-static TypeRegistration customControl( customControlTypeName, typeid(Dali::Toolkit::Control), NULL );
-
+static std::string      customControlTypeName = "MyTestCustomControl";
+static TypeRegistration customControl(customControlTypeName, typeid(Dali::Toolkit::Control), NULL);
 
 int UtcDaliControlWrapperConstructor(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
-  Toolkit::Internal::ControlWrapper* controlWrapperImpl = new Toolkit::Internal::ControlWrapper( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper;
+  Toolkit::Internal::ControlWrapper* controlWrapperImpl = new Toolkit::Internal::ControlWrapper(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper                     controlWrapper;
 
-  DALI_TEST_CHECK( !ControlWrapper::DownCast( controlWrapper ) );
+  DALI_TEST_CHECK(!ControlWrapper::DownCast(controlWrapper));
 
-  controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  controlWrapper = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
-  DALI_TEST_CHECK( ControlWrapper::DownCast( controlWrapper ) );
+  DALI_TEST_CHECK(ControlWrapper::DownCast(controlWrapper));
 
-  Dali::TypeInfo typeInfo = DevelCustomActor::GetTypeInfo( controlWrapper );
-
-  DALI_TEST_EQUALS( typeInfo.GetName(), customControlTypeName, TEST_LOCATION);
+  Dali::TypeInfo typeInfo = DevelCustomActor::GetTypeInfo(controlWrapper);
 
+  DALI_TEST_EQUALS(typeInfo.GetName(), customControlTypeName, TEST_LOCATION);
 
   END_TEST;
 }
@@ -291,17 +290,17 @@ int UtcDaliControlWrapperDestructor(void)
 {
   ToolkitTestApplication application;
 
-  ControlWrapper control = ControlWrapper::New( customControlTypeName, *( new Toolkit::Internal::ControlWrapper( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT ) ) );
+  ControlWrapper control = ControlWrapper::New(customControlTypeName, *(new Toolkit::Internal::ControlWrapper(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT)));
 
-  ControlWrapper control2( control );
+  ControlWrapper control2(control);
 
-  DALI_TEST_CHECK( control );
+  DALI_TEST_CHECK(control);
   control.Reset();
-  DALI_TEST_CHECK( !control );
+  DALI_TEST_CHECK(!control);
 
-  DALI_TEST_CHECK( control2 );
+  DALI_TEST_CHECK(control2);
   control2.Reset();
-  DALI_TEST_CHECK( !control2 );
+  DALI_TEST_CHECK(!control2);
 
   END_TEST;
 }
@@ -310,24 +309,24 @@ int UtcDaliControlWrapperRelayoutRequest(void)
 {
   ToolkitTestApplication application;
 
-  DALI_TEST_EQUALS( gOnRelayout, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnRelayout, false, TEST_LOCATION);
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
-  application.GetScene().Add( controlWrapper );
+  application.GetScene().Add(controlWrapper);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( gOnRelayout, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnRelayout, true, TEST_LOCATION);
   gOnRelayout = false;
 
   controlWrapperImpl->TestRelayoutRequest();
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( gOnRelayout, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnRelayout, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -336,18 +335,18 @@ int UtcDaliControlWrapperImplGetHeightForWidthBase(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   float width = 300.0f;
-  float v = 0.0f;
+  float v     = 0.0f;
 
   application.SendNotification();
   application.Render();
 
-  v = controlWrapperImpl->TestGetHeightForWidthBase( width );
+  v = controlWrapperImpl->TestGetHeightForWidthBase(width);
 
-  DALI_TEST_EQUALS( width, v, TEST_LOCATION );
+  DALI_TEST_EQUALS(width, v, TEST_LOCATION);
 
   END_TEST;
 }
@@ -356,18 +355,18 @@ int UtcDaliControlWrapperGetWidthForHeightBase(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   float height = 300.0f;
-  float v = 0.0f;
+  float v      = 0.0f;
 
   application.SendNotification();
   application.Render();
 
-  v = controlWrapperImpl->TestGetWidthForHeightBase( height );
+  v = controlWrapperImpl->TestGetWidthForHeightBase(height);
 
-  DALI_TEST_EQUALS( height, v, TEST_LOCATION );
+  DALI_TEST_EQUALS(height, v, TEST_LOCATION);
 
   END_TEST;
 }
@@ -376,19 +375,19 @@ int UtcDaliControlWrapperCalculateChildSizeBase(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   Actor child = Actor::New();
-  child.SetResizePolicy( Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS );
-  child.SetProperty( Actor::Property::SIZE, Vector2(150, 150) );
+  child.SetResizePolicy(Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS);
+  child.SetProperty(Actor::Property::SIZE, Vector2(150, 150));
 
   application.SendNotification();
   application.Render();
 
   float v = 9.99f;
-  v = controlWrapperImpl->TestCalculateChildSizeBase( child, Dali::Dimension::ALL_DIMENSIONS );
-  DALI_TEST_EQUALS( v, 0.0f, TEST_LOCATION );
+  v       = controlWrapperImpl->TestCalculateChildSizeBase(child, Dali::Dimension::ALL_DIMENSIONS);
+  DALI_TEST_EQUALS(v, 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -397,22 +396,22 @@ int UtcDaliControlWrapperRelayoutDependentOnChildrenBase(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   bool v = false;
 
-  v = controlWrapperImpl->TestRelayoutDependentOnChildrenBase( Dali::Dimension::ALL_DIMENSIONS );
+  v = controlWrapperImpl->TestRelayoutDependentOnChildrenBase(Dali::Dimension::ALL_DIMENSIONS);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( v, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(v, true, TEST_LOCATION);
 
-  controlWrapper.SetResizePolicy( Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS );
-  v = controlWrapperImpl->TestRelayoutDependentOnChildrenBase( Dali::Dimension::WIDTH );
+  controlWrapper.SetResizePolicy(Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS);
+  v = controlWrapperImpl->TestRelayoutDependentOnChildrenBase(Dali::Dimension::WIDTH);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( v, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(v, false, TEST_LOCATION);
 
   END_TEST;
 }
@@ -421,34 +420,34 @@ int UtcDaliControlWrapperRegisterVisualToSelf(void)
 {
   ToolkitTestApplication application;
 
-  Test::ObjectDestructionTracker objectDestructionTracker( application.GetCore().GetObjectRegistry() );
+  Test::ObjectDestructionTracker objectDestructionTracker(application.GetCore().GetObjectRegistry());
 
   {
-    Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-    ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+    Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+    ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
-    objectDestructionTracker.Start( controlWrapper );
+    objectDestructionTracker.Start(controlWrapper);
 
     Property::Index index = 1;
 
     Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-    Toolkit::Visual::Base visual;
+    Toolkit::Visual::Base  visual;
 
     Property::Map map;
-    map[Visual::Property::TYPE] = Visual::COLOR;
+    map[Visual::Property::TYPE]           = Visual::COLOR;
     map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-    visual = visualFactory.CreateVisual( map );
-    DALI_TEST_CHECK( visual );
+    visual = visualFactory.CreateVisual(map);
+    DALI_TEST_CHECK(visual);
 
     // Register to self
-    controlWrapperImpl->RegisterVisual( index, visual );
+    controlWrapperImpl->RegisterVisual(index, visual);
 
-    DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION ); // Control not destroyed yet
-    DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( index ), visual, TEST_LOCATION );
+    DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION); // Control not destroyed yet
+    DALI_TEST_EQUALS(controlWrapperImpl->GetVisual(index), visual, TEST_LOCATION);
   }
 
-  DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION ); // Should be destroyed
+  DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION); // Should be destroyed
 
   END_TEST;
 }
@@ -457,35 +456,35 @@ int UtcDaliControlWrapperRegisterVisualWithDepthIndexToSelf(void)
 {
   ToolkitTestApplication application;
 
-  Test::ObjectDestructionTracker objectDestructionTracker( application.GetCore().GetObjectRegistry() );
+  Test::ObjectDestructionTracker objectDestructionTracker(application.GetCore().GetObjectRegistry());
 
   {
-    Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-    ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+    Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+    ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
-    objectDestructionTracker.Start( controlWrapper );
+    objectDestructionTracker.Start(controlWrapper);
 
     Property::Index index = 1;
 
     Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-    Toolkit::Visual::Base visual;
+    Toolkit::Visual::Base  visual;
 
     Property::Map map;
-    map[Visual::Property::TYPE] = Visual::COLOR;
+    map[Visual::Property::TYPE]           = Visual::COLOR;
     map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-    visual = visualFactory.CreateVisual( map );
-    DALI_TEST_CHECK( visual );
+    visual = visualFactory.CreateVisual(map);
+    DALI_TEST_CHECK(visual);
 
     // Register to self
-    controlWrapperImpl->RegisterVisual( index, visual, 4 );
+    controlWrapperImpl->RegisterVisual(index, visual, 4);
 
-    DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION ); // Control not destroyed yet
-    DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( index ), visual, TEST_LOCATION );
-    DALI_TEST_EQUALS( visual.GetDepthIndex(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION); // Control not destroyed yet
+    DALI_TEST_EQUALS(controlWrapperImpl->GetVisual(index), visual, TEST_LOCATION);
+    DALI_TEST_EQUALS(visual.GetDepthIndex(), 4, TEST_LOCATION);
   }
 
-  DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION ); // Should be destroyed
+  DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION); // Should be destroyed
 
   END_TEST;
 }
@@ -494,40 +493,40 @@ int UtcDaliControlWrapperRegisterDisabledVisual(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   Property::Index TEST_PROPERTY = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  controlWrapperImpl->RegisterVisual( TEST_PROPERTY, visual, false );
+  controlWrapperImpl->RegisterVisual(TEST_PROPERTY, visual, false);
 
-  DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( TEST_PROPERTY ), visual, TEST_LOCATION );
-  DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapperImpl->GetVisual(TEST_PROPERTY), visual, TEST_LOCATION);
+  DALI_TEST_EQUALS(controlWrapperImpl->IsVisualEnabled(TEST_PROPERTY), false, TEST_LOCATION);
 
-  application.GetScene().Add( controlWrapper );
+  application.GetScene().Add(controlWrapper);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapperImpl->IsVisualEnabled(TEST_PROPERTY), false, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( controlWrapper.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapper.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE), true, TEST_LOCATION);
 
-  controlWrapperImpl->EnableVisual( TEST_PROPERTY, true );
+  controlWrapperImpl->EnableVisual(TEST_PROPERTY, true);
 
-  DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapperImpl->IsVisualEnabled(TEST_PROPERTY), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -536,41 +535,41 @@ int UtcDaliControlWrapperRegisterDisabledVisualWithDepthIndex(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   Property::Index TEST_PROPERTY = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  controlWrapperImpl->RegisterVisual( TEST_PROPERTY, visual, false, 10 );
+  controlWrapperImpl->RegisterVisual(TEST_PROPERTY, visual, false, 10);
 
-  DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( TEST_PROPERTY ), visual, TEST_LOCATION );
-  DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( visual.GetDepthIndex(), 10, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapperImpl->GetVisual(TEST_PROPERTY), visual, TEST_LOCATION);
+  DALI_TEST_EQUALS(controlWrapperImpl->IsVisualEnabled(TEST_PROPERTY), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(visual.GetDepthIndex(), 10, TEST_LOCATION);
 
-  application.GetScene().Add( controlWrapper );
+  application.GetScene().Add(controlWrapper);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapperImpl->IsVisualEnabled(TEST_PROPERTY), false, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( controlWrapper.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapper.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE), true, TEST_LOCATION);
 
-  controlWrapperImpl->EnableVisual( TEST_PROPERTY, true );
+  controlWrapperImpl->EnableVisual(TEST_PROPERTY, true);
 
-  DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapperImpl->IsVisualEnabled(TEST_PROPERTY), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -579,30 +578,30 @@ int UtcDaliControlWrapperRegisterUnregisterVisual(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   Property::Index index = 1;
 
   Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-  Toolkit::Visual::Base visual;
+  Toolkit::Visual::Base  visual;
 
   Property::Map map;
-  map[Visual::Property::TYPE] = Visual::COLOR;
+  map[Visual::Property::TYPE]           = Visual::COLOR;
   map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-  visual = visualFactory.CreateVisual( map );
+  visual = visualFactory.CreateVisual(map);
   DALI_TEST_CHECK(visual);
 
   // Register index with a color visual
-  controlWrapperImpl->RegisterVisual( index, visual );
+  controlWrapperImpl->RegisterVisual(index, visual);
 
-  DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( index ), visual, TEST_LOCATION );
+  DALI_TEST_EQUALS(controlWrapperImpl->GetVisual(index), visual, TEST_LOCATION);
 
   // Unregister visual
-  controlWrapperImpl->UnregisterVisual( index );
+  controlWrapperImpl->UnregisterVisual(index);
 
-  DALI_TEST_CHECK( !controlWrapperImpl->GetVisual( index ) );
+  DALI_TEST_CHECK(!controlWrapperImpl->GetVisual(index));
 
   END_TEST;
 }
@@ -612,63 +611,61 @@ int UtcDaliControlWrapperTransitionDataMap1N(void)
   ToolkitTestApplication application;
 
   Property::Map map;
-  map["target"] = "Actor1";
-  map["property"] = "randomProperty";
+  map["target"]       = "Actor1";
+  map["property"]     = "randomProperty";
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_OUT")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "EASE_OUT")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   //DummyControl actor = DummyControl::New();
   controlWrapper.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  controlWrapper.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  controlWrapper.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  controlWrapper.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  controlWrapper.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(controlWrapper);
 
-  Animation anim = controlWrapperImpl->CreateTransition( transition );
-  DALI_TEST_CHECK( ! anim );
+  Animation anim = controlWrapperImpl->CreateTransition(transition);
+  DALI_TEST_CHECK(!anim);
 
   Property::Map returnedMap = transition.GetAnimatorAt(0);
 
   Property::Value* value = returnedMap.Find("property");
-  DALI_TEST_CHECK( value != NULL);
-  DALI_TEST_EQUALS( "randomProperty", value->Get<std::string>(), TEST_LOCATION );
+  DALI_TEST_CHECK(value != NULL);
+  DALI_TEST_EQUALS("randomProperty", value->Get<std::string>(), TEST_LOCATION);
 
   value = returnedMap.Find("initialValue");
-  DALI_TEST_CHECK( value != NULL);
-  DALI_TEST_EQUALS( Color::MAGENTA, value->Get<Vector4>(), TEST_LOCATION );
+  DALI_TEST_CHECK(value != NULL);
+  DALI_TEST_EQUALS(Color::MAGENTA, value->Get<Vector4>(), TEST_LOCATION);
 
   value = returnedMap.Find("targetValue");
-  DALI_TEST_CHECK( value != NULL);
-  DALI_TEST_EQUALS( Color::RED, value->Get<Vector4>(), TEST_LOCATION );
+  DALI_TEST_CHECK(value != NULL);
+  DALI_TEST_EQUALS(Color::RED, value->Get<Vector4>(), TEST_LOCATION);
 
   value = returnedMap.Find("animator");
-  DALI_TEST_CHECK( value != NULL);
+  DALI_TEST_CHECK(value != NULL);
   Property::Map returnedAnimatorMap = value->Get<Property::Map>();
 
   value = returnedAnimatorMap.Find("alphaFunction");
-  DALI_TEST_CHECK( value != NULL);
-  DALI_TEST_EQUALS( "EASE_OUT", value->Get<std::string>(), TEST_LOCATION );
+  DALI_TEST_CHECK(value != NULL);
+  DALI_TEST_EQUALS("EASE_OUT", value->Get<std::string>(), TEST_LOCATION);
 
   value = returnedAnimatorMap.Find("timePeriod");
-  DALI_TEST_CHECK( value != NULL);
+  DALI_TEST_CHECK(value != NULL);
   Property::Map returnedTimePeriodMap = value->Get<Property::Map>();
 
   value = returnedTimePeriodMap.Find("delay");
-  DALI_TEST_CHECK( value != NULL);
-  DALI_TEST_EQUALS( 0.5f, value->Get<float>(), TEST_LOCATION );
+  DALI_TEST_CHECK(value != NULL);
+  DALI_TEST_EQUALS(0.5f, value->Get<float>(), TEST_LOCATION);
 
   value = returnedTimePeriodMap.Find("duration");
-  DALI_TEST_CHECK( value != NULL);
-  DALI_TEST_EQUALS( 1.0f, value->Get<float>(), TEST_LOCATION );
+  DALI_TEST_CHECK(value != NULL);
+  DALI_TEST_EQUALS(1.0f, value->Get<float>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -677,12 +674,12 @@ int UtcDaliControlWrapperApplyThemeStyle(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   controlWrapperImpl->ApplyThemeStyle();
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -690,30 +687,30 @@ int UtcDaliControlWrapperTestControlProperties(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
-  application.GetScene().Add( controlWrapper );
+  application.GetScene().Add(controlWrapper);
 
   // "background" property
   Property::Map rendererMap;
-  rendererMap[Visual::Property::TYPE] = Visual::COLOR;
+  rendererMap[Visual::Property::TYPE]           = Visual::COLOR;
   rendererMap[ColorVisual::Property::MIX_COLOR] = Color::RED;
-  controlWrapper.SetProperty( Control::Property::BACKGROUND, rendererMap );
-  Property::Value propertyValue = controlWrapper.GetProperty( Control::Property::BACKGROUND );
-  Property::Map* resultMap = propertyValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(), (int)Visual::COLOR, TEST_LOCATION );
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR ) );
-  DALI_TEST_EQUALS( resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get<Vector4>(), Color::RED, TEST_LOCATION );
+  controlWrapper.SetProperty(Control::Property::BACKGROUND, rendererMap);
+  Property::Value propertyValue = controlWrapper.GetProperty(Control::Property::BACKGROUND);
+  Property::Map*  resultMap     = propertyValue.GetMap();
+  DALI_TEST_CHECK(resultMap->Find(Toolkit::Visual::Property::TYPE));
+  DALI_TEST_EQUALS(resultMap->Find(Toolkit::Visual::Property::TYPE)->Get<int>(), (int)Visual::COLOR, TEST_LOCATION);
+  DALI_TEST_CHECK(resultMap->Find(ColorVisual::Property::MIX_COLOR));
+  DALI_TEST_EQUALS(resultMap->Find(ColorVisual::Property::MIX_COLOR)->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
   // "keyInputFocus" property
-  controlWrapper.SetProperty( Control::Property::KEY_INPUT_FOCUS, true );
-  DALI_TEST_EQUALS( true, controlWrapper.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION );
+  controlWrapper.SetProperty(Control::Property::KEY_INPUT_FOCUS, true);
+  DALI_TEST_EQUALS(true, controlWrapper.GetProperty(Control::Property::KEY_INPUT_FOCUS).Get<bool>(), TEST_LOCATION);
 
   // "styleName" property
-  controlWrapper.SetProperty( Control::Property::STYLE_NAME, "MyCustomStyle" );
-  DALI_TEST_EQUALS( "MyCustomStyle", controlWrapper.GetProperty( Control::Property::STYLE_NAME ).Get< std::string >(), TEST_LOCATION );
+  controlWrapper.SetProperty(Control::Property::STYLE_NAME, "MyCustomStyle");
+  DALI_TEST_EQUALS("MyCustomStyle", controlWrapper.GetProperty(Control::Property::STYLE_NAME).Get<std::string>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -722,12 +719,12 @@ int UtcDaliControlWrapperTypeRegistryCreation(void)
 {
   ToolkitTestApplication application;
 
-  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "ControlWrapper" );
-  DALI_TEST_CHECK( typeInfo )
+  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo("ControlWrapper");
+  DALI_TEST_CHECK(typeInfo)
 
   // Check that we can't create a ControlWrapper instance
   BaseHandle baseHandle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( !baseHandle )
+  DALI_TEST_CHECK(!baseHandle)
 
   END_TEST;
 }
@@ -735,7 +732,7 @@ int UtcDaliControlWrapperTypeRegistryCreation(void)
 void SetProperty(BaseObject* object, const char* const name, Property::Value* value)
 {
 }
-Property::Value* GetProperty(BaseObject* object, const char* const name )
+Property::Value* GetProperty(BaseObject* object, const char* const name)
 {
   return NULL;
 }
@@ -744,74 +741,74 @@ int UtcDaliControlWrapperAnimateVisual(void)
 {
   tet_infoline("Test that the control wrapper's visuals can be animated by name when registered");
 
-  ToolkitTestApplication application;
-  Test::ObjectDestructionTracker objectDestructionTracker( application.GetCore().GetObjectRegistry() );
+  ToolkitTestApplication         application;
+  Test::ObjectDestructionTracker objectDestructionTracker(application.GetCore().GetObjectRegistry());
 
   {
-    Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-    ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+    Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+    ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
-    Property::Index index = Control::CONTROL_PROPERTY_END_INDEX+1;
-    std::string visualName("colorVisual");
-    CSharpTypeRegistry::RegisterProperty( customControlTypeName, visualName, index, Property::VECTOR4, SetProperty, GetProperty );
+    Property::Index index = Control::CONTROL_PROPERTY_END_INDEX + 1;
+    std::string     visualName("colorVisual");
+    CSharpTypeRegistry::RegisterProperty(customControlTypeName, visualName, index, Property::VECTOR4, SetProperty, GetProperty);
 
-    objectDestructionTracker.Start( controlWrapper );
+    objectDestructionTracker.Start(controlWrapper);
 
     Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
-    Toolkit::Visual::Base visual;
+    Toolkit::Visual::Base  visual;
 
     Property::Map map;
-    map[Visual::Property::TYPE] = Visual::COLOR;
+    map[Visual::Property::TYPE]           = Visual::COLOR;
     map[ColorVisual::Property::MIX_COLOR] = Color::RED;
 
-    visual = visualFactory.CreateVisual( map );
-    DALI_TEST_CHECK( visual );
+    visual = visualFactory.CreateVisual(map);
+    DALI_TEST_CHECK(visual);
 
     // Register to self
-    controlWrapperImpl->TestRegisterVisual( index, visual );
+    controlWrapperImpl->TestRegisterVisual(index, visual);
 
-    application.GetScene().Add( controlWrapper );
-    controlWrapper.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
+    application.GetScene().Add(controlWrapper);
+    controlWrapper.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
     application.SendNotification();
     application.Render(0); // Trigger animation start
 
     Property::Map transition;
-    transition["target"] = visualName;
-    transition["property"] = "mixColor";
+    transition["target"]      = visualName;
+    transition["property"]    = "mixColor";
     transition["targetValue"] = Color::GREEN;
     Property::Map animator;
     animator["alphaFunction"] = "LINEAR";
-    animator["duration"] = 1.0f;
-    animator["delay"] = 0.0f;
-    transition["animator"] = animator;
+    animator["duration"]      = 1.0f;
+    animator["delay"]         = 0.0f;
+    transition["animator"]    = animator;
 
     TransitionData transitionData = TransitionData::New(transition);
-    Animation anim = DevelControl::CreateTransition( *controlWrapperImpl, transitionData );
+    Animation      anim           = DevelControl::CreateTransition(*controlWrapperImpl, transitionData);
     anim.Play();
 
     application.SendNotification();
     application.Render(0); // Trigger animation start
 
     application.Render(1000); // animation end
-    application.Render(  10);
+    application.Render(10);
 
     Property::Map visualMap;
-    visual.CreatePropertyMap( visualMap );
+    visual.CreatePropertyMap(visualMap);
     Property::Value* value = visualMap.Find(ColorVisual::Property::MIX_COLOR, "mixColor");
-    DALI_TEST_CHECK( value != NULL );
-    if( value )
+    DALI_TEST_CHECK(value != NULL);
+    if(value)
     {
       Vector4 testColor = value->Get<Vector4>();
-      DALI_TEST_EQUALS( testColor, Color::GREEN, 0.001f, TEST_LOCATION );
+      DALI_TEST_EQUALS(testColor, Color::GREEN, 0.001f, TEST_LOCATION);
     }
 
-    DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION ); // Control not destroyed yet
-    DALI_TEST_EQUALS( controlWrapperImpl->GetVisual( index ), visual, TEST_LOCATION );
+    DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION); // Control not destroyed yet
+    DALI_TEST_EQUALS(controlWrapperImpl->GetVisual(index), visual, TEST_LOCATION);
 
-    application.GetScene().Remove( controlWrapper );
+    application.GetScene().Remove(controlWrapper);
   }
 
-  DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION ); // Should be destroyed
+  DALI_TEST_EQUALS(objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION); // Should be destroyed
 
   END_TEST;
 }
@@ -820,8 +817,8 @@ int UtcDaliControlWrapperEmitKeyFocusSignal(void)
 {
   ToolkitTestApplication application;
 
-  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
-  ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl );
+  Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl(Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT);
+  ControlWrapper           controlWrapper     = ControlWrapper::New(customControlTypeName, *controlWrapperImpl);
 
   gKeyInputFocusCallBackCalled = false;
   controlWrapper.KeyInputFocusGainedSignal().Connect(&TestKeyInputFocusCallback);
@@ -829,9 +826,9 @@ int UtcDaliControlWrapperEmitKeyFocusSignal(void)
   application.SendNotification();
   application.Render();
 
-  controlWrapperImpl->EmitKeyInputFocusSignal( true );
+  controlWrapperImpl->EmitKeyInputFocusSignal(true);
 
-  DALI_TEST_CHECK( gKeyInputFocusCallBackCalled );
+  DALI_TEST_CHECK(gKeyInputFocusCallBackCalled);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
index 2cb2588..5ae3379 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,39 +15,39 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
+
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h>
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 
-
 using namespace Dali;
 using namespace Dali::Toolkit;
 
-
 namespace
 {
-const unsigned int NUM_ROWS = 16;
+const unsigned int NUM_ROWS    = 16;
 const unsigned int NUM_COLUMNS = 10;
-const Vector2 VIEW_AREA_SIZE( 480.0f, 800.0f );
-const float TRANSITION_DURATION = 0.5f;
-const float CUBE_DISPLACEMENT = 55.f;
-const Vector2 PAN_POSITION1( VIEW_AREA_SIZE.x * 0.75f, VIEW_AREA_SIZE.y * 0.25f );
-const Vector2 PAN_DISPLACEMENT1( -5.f, 5.f );
-const Vector2 PAN_POSITION2( VIEW_AREA_SIZE.x * 0.25f, VIEW_AREA_SIZE.y * 0.75f );
-const Vector2 PAN_DISPLACEMENT2( 5.f, 5.f );
-const Vector4 FULL_BRIGHTNESS(1.f,1.f,1.f,1.f);
-const Vector4 HALF_BRIGHTNESS(0.5f, 0.5f, 0.5f, 1.f);
-const int RENDER_FRAME_INTERVAL = 16;
-static const float FLT_EPISILON = 0.0001f;
-static const float EPISILON = 0.05f;
-const float TRANSITION_BEFORE_END_DURATION = TRANSITION_DURATION - 0.05f;
+const Vector2      VIEW_AREA_SIZE(480.0f, 800.0f);
+const float        TRANSITION_DURATION = 0.5f;
+const float        CUBE_DISPLACEMENT   = 55.f;
+const Vector2      PAN_POSITION1(VIEW_AREA_SIZE.x * 0.75f, VIEW_AREA_SIZE.y * 0.25f);
+const Vector2      PAN_DISPLACEMENT1(-5.f, 5.f);
+const Vector2      PAN_POSITION2(VIEW_AREA_SIZE.x * 0.25f, VIEW_AREA_SIZE.y * 0.75f);
+const Vector2      PAN_DISPLACEMENT2(5.f, 5.f);
+const Vector4      FULL_BRIGHTNESS(1.f, 1.f, 1.f, 1.f);
+const Vector4      HALF_BRIGHTNESS(0.5f, 0.5f, 0.5f, 1.f);
+const int          RENDER_FRAME_INTERVAL          = 16;
+static const float FLT_EPISILON                   = 0.0001f;
+static const float EPISILON                       = 0.05f;
+const float        TRANSITION_BEFORE_END_DURATION = TRANSITION_DURATION - 0.05f;
 
 static bool gObjectCreatedCallBackCalled;
 static void TestCallback(BaseHandle handle)
@@ -62,33 +62,31 @@ static void TestCallback(BaseHandle handle)
  */
 void Wait(ToolkitTestApplication& application, float durationToPass)
 {
-  int duration = static_cast<int>(durationToPass*1000.f);
+  int duration = static_cast<int>(durationToPass * 1000.f);
   // wait 2 more frames to compensate the two frames used by the image waiting for the loading succeeded signal
-  for(int i = 0; i <=  duration/RENDER_FRAME_INTERVAL+2 ; i++)
+  for(int i = 0; i <= duration / RENDER_FRAME_INTERVAL + 2; i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
   }
 }
 
-
-
 //Callback class to test whether transition completed signal is emitted when the transition animation is finished
 class TransitionCompletedCallback : public Dali::ConnectionTracker
 {
 public:
-  TransitionCompletedCallback( bool& signalReceived, CubeTransitionEffect& effect, Texture& image )
-  : mSignalVerified( signalReceived ),
-    mCurrentEffect( effect ),
-    mActorTransitTo( image )
+  TransitionCompletedCallback(bool& signalReceived, CubeTransitionEffect& effect, Texture& image)
+  : mSignalVerified(signalReceived),
+    mCurrentEffect(effect),
+    mActorTransitTo(image)
   {
   }
 
-  void Callback( CubeTransitionEffect effect, Texture image )
+  void Callback(CubeTransitionEffect effect, Texture image)
   {
-    tet_infoline( "Verifying TransitionCompletedSignal" );
+    tet_infoline("Verifying TransitionCompletedSignal");
 
-    if( mCurrentEffect == effect && mActorTransitTo == image )
+    if(mCurrentEffect == effect && mActorTransitTo == image)
     {
       mSignalVerified = true;
     }
@@ -99,15 +97,13 @@ public:
     mSignalVerified = false;
   }
 
-  bool&                  mSignalVerified;
-  CubeTransitionEffect&  mCurrentEffect;
-  Texture&               mActorTransitTo;
+  bool&                 mSignalVerified;
+  CubeTransitionEffect& mCurrentEffect;
+  Texture&              mActorTransitTo;
 };
 
 } // namespace
 
-
-
 void cube_transition_effect_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -125,26 +121,26 @@ int UtcDaliCubeTransitionWaveEffectNew(void)
 
   CubeTransitionEffect waveEffect;
 
-  DALI_TEST_CHECK( !waveEffect );
+  DALI_TEST_CHECK(!waveEffect);
 
-  waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
+  waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
 
-  DALI_TEST_CHECK( waveEffect );
+  DALI_TEST_CHECK(waveEffect);
 
   waveEffect.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-    waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
+    CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+    waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -155,56 +151,56 @@ int UtcDaliCubeTransitionCrossEffectNew(void)
 
   CubeTransitionEffect crossEffect;
 
-  DALI_TEST_CHECK( !crossEffect );
+  DALI_TEST_CHECK(!crossEffect);
 
-  crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
+  crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
 
-  DALI_TEST_CHECK( crossEffect );
+  DALI_TEST_CHECK(crossEffect);
 
   crossEffect.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-    crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
+    CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+    crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
 int UtcDaliCubeTransitionFoldEffectNew(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliCubeTransitionFoldEffectNew " );
+  tet_infoline(" UtcDaliCubeTransitionFoldEffectNew ");
 
   CubeTransitionEffect foldEffect;
 
-  DALI_TEST_CHECK( !foldEffect );
+  DALI_TEST_CHECK(!foldEffect);
 
-  foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
+  foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
 
-  DALI_TEST_CHECK( foldEffect );
+  DALI_TEST_CHECK(foldEffect);
 
   foldEffect.Reset();
 
   //Additional check to ensure object is created by checking if it is registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-    foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
+    CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+    foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -213,20 +209,20 @@ int UtcDaliCubeTransitionEffectSetGetTransitionDuration(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetGetTransitionDuration ");
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  DALI_TEST_EQUALS( TRANSITION_DURATION, waveEffect.GetTransitionDuration(), TEST_LOCATION );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  DALI_TEST_EQUALS(TRANSITION_DURATION, waveEffect.GetTransitionDuration(), TEST_LOCATION);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  DALI_TEST_EQUALS( TRANSITION_DURATION, crossEffect.GetTransitionDuration(), TEST_LOCATION );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  DALI_TEST_EQUALS(TRANSITION_DURATION, crossEffect.GetTransitionDuration(), TEST_LOCATION);
 
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  DALI_TEST_EQUALS( TRANSITION_DURATION, foldEffect.GetTransitionDuration(), TEST_LOCATION );
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  DALI_TEST_EQUALS(TRANSITION_DURATION, foldEffect.GetTransitionDuration(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -235,15 +231,15 @@ int UtcDaliCubeTransitionEffectSetGetCubeDisplacement(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetGetTransitionDuration ");
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS);
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_EQUALS( CUBE_DISPLACEMENT, waveEffect.GetCubeDisplacement(), TEST_LOCATION );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_EQUALS(CUBE_DISPLACEMENT, waveEffect.GetCubeDisplacement(), TEST_LOCATION);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_EQUALS( CUBE_DISPLACEMENT, crossEffect.GetCubeDisplacement(), TEST_LOCATION );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_EQUALS(CUBE_DISPLACEMENT, crossEffect.GetCubeDisplacement(), TEST_LOCATION);
 
   //Cube displacement is not used in CubeTransitionFoldEffect
   END_TEST;
@@ -255,31 +251,31 @@ int UtcDaliCubeTransitionEffectGetRoot(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectGetRoot ");
 
-  unsigned int totalNum = NUM_ROWS*NUM_COLUMNS;
+  unsigned int totalNum = NUM_ROWS * NUM_COLUMNS;
 
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  application.GetScene().Add( waveEffect );
-  waveEffect.SetCurrentTexture( texture );
-  waveEffect.SetTargetTexture( texture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(waveEffect);
+  waveEffect.SetCurrentTexture(texture);
+  waveEffect.SetTargetTexture(texture);
 
   application.SendNotification();
   application.Render();
 
   waveEffect.StartTransition();
 
-  Wait( application, TRANSITION_DURATION * 0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
 
   // check that we have a total of NUM_ROWS*NUM_COLUMNS cubes;
   Actor boxesRoot = waveEffect.GetChildAt(0);
-  DALI_TEST_CHECK( totalNum == boxesRoot.GetChildCount() );
+  DALI_TEST_CHECK(totalNum == boxesRoot.GetChildCount());
 
   // check that every cube has two children
-  DALI_TEST_CHECK( 2 == boxesRoot.GetChildAt(0).GetChildCount() );
-  DALI_TEST_CHECK( 2 == boxesRoot.GetChildAt(totalNum/2).GetChildCount() );
-  DALI_TEST_CHECK( 2 == boxesRoot.GetChildAt(totalNum-1).GetChildCount() );
+  DALI_TEST_CHECK(2 == boxesRoot.GetChildAt(0).GetChildCount());
+  DALI_TEST_CHECK(2 == boxesRoot.GetChildAt(totalNum / 2).GetChildCount());
+  DALI_TEST_CHECK(2 == boxesRoot.GetChildAt(totalNum - 1).GetChildCount());
   END_TEST;
 }
 
@@ -288,58 +284,58 @@ int UtcDaliCubeTransitionEffectIsTransitioning(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectIsTransiting ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  application.GetScene().Add( waveEffect );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(waveEffect);
 
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_CHECK( !waveEffect.IsTransitioning() );
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_CHECK(!waveEffect.IsTransitioning());
 
-  waveEffect.SetCurrentTexture( texture );
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetCurrentTexture(texture);
+  waveEffect.SetTargetTexture(texture);
   //transition is started
   waveEffect.StartTransition();
-  DALI_TEST_CHECK( waveEffect.IsTransitioning() );
+  DALI_TEST_CHECK(waveEffect.IsTransitioning());
   //transition is finished
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( !waveEffect.IsTransitioning() );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(!waveEffect.IsTransitioning());
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  application.GetScene().Add( crossEffect );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(crossEffect);
 
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_CHECK( !crossEffect.IsTransitioning() );
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_CHECK(!crossEffect.IsTransitioning());
 
-  crossEffect.SetCurrentTexture( texture );
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetCurrentTexture(texture);
+  crossEffect.SetTargetTexture(texture);
   //transition is started
   crossEffect.StartTransition(false);
-  DALI_TEST_CHECK( crossEffect.IsTransitioning() );
+  DALI_TEST_CHECK(crossEffect.IsTransitioning());
   //transition is finished
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( !crossEffect.IsTransitioning() );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(!crossEffect.IsTransitioning());
 
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  application.GetScene().Add( foldEffect );
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(foldEffect);
 
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  DALI_TEST_CHECK( !foldEffect.IsTransitioning() );
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  DALI_TEST_CHECK(!foldEffect.IsTransitioning());
 
-  foldEffect.SetCurrentTexture( texture );
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetCurrentTexture(texture);
+  foldEffect.SetTargetTexture(texture);
   //transition is started
   foldEffect.StartTransition(true);
-  DALI_TEST_CHECK(foldEffect.IsTransitioning() );
+  DALI_TEST_CHECK(foldEffect.IsTransitioning());
   //transition is finished
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( !foldEffect.IsTransitioning() );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(!foldEffect.IsTransitioning());
 
   END_TEST;
 }
@@ -350,14 +346,14 @@ int UtcDaliCubeTransitionEffectSetCurrentTexture(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetCurrentTexture ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  waveEffect.SetCurrentTexture( texture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetCurrentTexture(texture);
 
-  application.GetScene().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
@@ -366,19 +362,19 @@ int UtcDaliCubeTransitionEffectSetCurrentTexture(void)
 
   // the current image content is set to the tiles facing the camera
   Actor currentTile = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(0);
-  Actor targetTile = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(1);
+  Actor targetTile  = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(1);
 
   //check the pixel area set to the cube
-  Vector4 pixelAreaDef( 0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
+  Vector4 pixelAreaDef(0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
 
-  Property::Index textureRectIndex = currentTile.GetPropertyIndex( "uTextureRect" );
-  DALI_TEST_CHECK( textureRectIndex != Property::INVALID_INDEX );
-  Property::Value textureRectValue = currentTile.GetProperty( textureRectIndex );
-  DALI_TEST_CHECK( textureRectValue.GetType() == Property::VECTOR4 );
+  Property::Index textureRectIndex = currentTile.GetPropertyIndex("uTextureRect");
+  DALI_TEST_CHECK(textureRectIndex != Property::INVALID_INDEX);
+  Property::Value textureRectValue = currentTile.GetProperty(textureRectIndex);
+  DALI_TEST_CHECK(textureRectValue.GetType() == Property::VECTOR4);
   Vector4 pixelArea;
-  DALI_TEST_CHECK( textureRectValue.Get( pixelArea ) );
+  DALI_TEST_CHECK(textureRectValue.Get(pixelArea));
 
-  DALI_TEST_EQUALS( pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION);
 
   END_TEST;
 }
@@ -389,16 +385,16 @@ int UtcDaliCubeTransitionEffectSetTargetTexture(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetTargetTexture ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  application.GetScene().Add( waveEffect );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture              texture    = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(waveEffect);
 
-  waveEffect.SetCurrentTexture( texture );
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetCurrentTexture(texture);
+  waveEffect.SetTargetTexture(texture);
 
-  application.GetScene().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
@@ -409,16 +405,16 @@ int UtcDaliCubeTransitionEffectSetTargetTexture(void)
   Actor tile = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(1);
 
   //check the pixel area set to the cube
-  Vector4 pixelAreaDef( 0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
+  Vector4 pixelAreaDef(0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
 
-  Property::Index textureRectIndex = tile.GetPropertyIndex( "uTextureRect" );
-  DALI_TEST_CHECK( textureRectIndex != -1 );
-  Property::Value textureRectValue = tile.GetProperty( textureRectIndex );
-  DALI_TEST_CHECK( textureRectValue.GetType() == Property::VECTOR4 );
+  Property::Index textureRectIndex = tile.GetPropertyIndex("uTextureRect");
+  DALI_TEST_CHECK(textureRectIndex != -1);
+  Property::Value textureRectValue = tile.GetProperty(textureRectIndex);
+  DALI_TEST_CHECK(textureRectValue.GetType() == Property::VECTOR4);
   Vector4 pixelArea;
-  DALI_TEST_CHECK( textureRectValue.Get( pixelArea ) );
+  DALI_TEST_CHECK(textureRectValue.Get(pixelArea));
 
-  DALI_TEST_EQUALS( pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION);
 
   END_TEST;
 }
@@ -428,55 +424,55 @@ int UtcDaliCubeTransitionWaveEffectStartTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionWaveEffectStartTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   Devel::PixelBuffer pixelBuffer = LoadImageFromFile(TEST_RESOURCE_DIR "/gallery-small-1.jpg");
-  PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() );
-  texture.Upload( pixelData );
+  PixelData          pixelData   = Devel::PixelBuffer::Convert(pixelBuffer);
+  Texture            texture     = Texture::New(TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+  texture.Upload(pixelData);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  waveEffect.SetCurrentTexture( texture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  waveEffect.SetCurrentTexture(texture);
 
-  application.GetScene().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
 
-  waveEffect.StartTransition( true );
+  waveEffect.StartTransition(true);
 
   Actor cube = waveEffect.GetChildAt(0).GetChildAt(0);
 
   //check the cube rotation value and color values just before the end of different transitions
-  waveEffect.SetTargetTexture( texture );
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  waveEffect.SetTargetTexture(texture);
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetTargetTexture(texture);
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetTargetTexture(texture);
   waveEffect.StartTransition(false);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetTargetTexture(texture);
   waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -485,21 +481,21 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionCrossEffectStartTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   Devel::PixelBuffer pixelBuffer = LoadImageFromFile(TEST_RESOURCE_DIR "/gallery-small-1.jpg");
-  PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() );
-  texture.Upload( pixelData );
+  PixelData          pixelData   = Devel::PixelBuffer::Convert(pixelBuffer);
+  Texture            texture     = Texture::New(TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+  texture.Upload(pixelData);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  crossEffect.SetCurrentTexture( texture );
-  crossEffect.SetTargetTexture( texture );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  crossEffect.SetCurrentTexture(texture);
+  crossEffect.SetTargetTexture(texture);
 
-  application.GetScene().Add( crossEffect );
+  application.GetScene().Add(crossEffect);
 
   application.SendNotification();
   application.Render();
@@ -510,37 +506,35 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void)
   Actor cube1 = crossEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation value and color values just before the end of different transitions
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetTargetTexture(texture);
   crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
-
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetTargetTexture(texture);
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetTargetTexture(texture);
   crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -549,15 +543,15 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionFoldEffectStartTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  foldEffect.SetCurrentTexture( texture );
-  foldEffect.SetTargetTexture( texture );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture              texture    = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  foldEffect.SetCurrentTexture(texture);
+  foldEffect.SetTargetTexture(texture);
 
-  application.GetScene().Add( foldEffect );
+  application.GetScene().Add(foldEffect);
 
   application.SendNotification();
   application.Render();
@@ -568,36 +562,35 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void)
   Actor cube1 = foldEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation value and color values just before the end of different transitions
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetTargetTexture(texture);
   foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetTargetTexture(texture);
   foldEffect.StartTransition(false);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ),FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetTargetTexture(texture);
   foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -606,88 +599,88 @@ int UtcDaliCubeTransitionEffectSignalTransitionCompleted(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSignalTransitionCompleted ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
-  Texture thirdTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
-
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  application.GetScene().Add( waveEffect );
-
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  application.GetScene().Add( crossEffect );
-
-  CubeTransitionEffect foldEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  application.GetScene().Add( foldEffect );
-
-  bool signalVerified = false;
-  CubeTransitionEffect currentEffect;
-  Texture actorTransitTo;
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
+  Texture thirdTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
+
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(waveEffect);
+
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(crossEffect);
+
+  CubeTransitionEffect foldEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  application.GetScene().Add(foldEffect);
+
+  bool                        signalVerified = false;
+  CubeTransitionEffect        currentEffect;
+  Texture                     actorTransitTo;
   TransitionCompletedCallback callback(signalVerified, currentEffect, actorTransitTo);
-  waveEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  crossEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  foldEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
+  waveEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  crossEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  foldEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
 
   //check that the wave effect is used to transit to secondTexture
-  currentEffect = waveEffect;
+  currentEffect  = waveEffect;
   actorTransitTo = secondTexture;
-  waveEffect.SetCurrentTexture( firstTexture );
-  waveEffect.SetTargetTexture( secondTexture );
+  waveEffect.SetCurrentTexture(firstTexture);
+  waveEffect.SetTargetTexture(secondTexture);
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the wave effect is used to transit to thirdTexture
   actorTransitTo = thirdTexture;
-  waveEffect.SetTargetTexture( thirdTexture );
+  waveEffect.SetTargetTexture(thirdTexture);
   waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the cross effect is used to transit to secondTexture
-  currentEffect = crossEffect;
+  currentEffect  = crossEffect;
   actorTransitTo = secondTexture;
-  crossEffect.SetCurrentTexture( thirdTexture );
-  crossEffect.SetTargetTexture( secondTexture );
+  crossEffect.SetCurrentTexture(thirdTexture);
+  crossEffect.SetTargetTexture(secondTexture);
   crossEffect.StartTransition(true);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the cross effect is used to transit to firstTexture
   actorTransitTo = firstTexture;
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetTargetTexture(firstTexture);
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the fold effect is used to transit to secondTexture
-  currentEffect = foldEffect;
+  currentEffect  = foldEffect;
   actorTransitTo = secondTexture;
-  foldEffect.SetCurrentTexture( firstTexture );
-  foldEffect.SetTargetTexture( secondTexture );
+  foldEffect.SetCurrentTexture(firstTexture);
+  foldEffect.SetTargetTexture(secondTexture);
   foldEffect.StartTransition();
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( callback.mSignalVerified );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the fold effect is used to transit to thirdTexture
   actorTransitTo = thirdTexture;
-  foldEffect.SetTargetTexture( thirdTexture );
-  foldEffect.StartTransition( false );
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( callback.mSignalVerified );
+  foldEffect.SetTargetTexture(thirdTexture);
+  foldEffect.StartTransition(false);
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(callback.mSignalVerified);
   END_TEST;
 }
 
@@ -696,104 +689,104 @@ int UtcDaliCubeTransitionEffectPauseResumeTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectPauseResumeTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
-
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  application.GetScene().Add( waveEffect );
-
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  application.GetScene().Add( crossEffect );
-
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  application.GetScene().Add( foldEffect );
-
-  bool signalVerified = false;
-  CubeTransitionEffect currentEffect;
-  Texture actorTransitTo;
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
+
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(waveEffect);
+
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(crossEffect);
+
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  application.GetScene().Add(foldEffect);
+
+  bool                        signalVerified = false;
+  CubeTransitionEffect        currentEffect;
+  Texture                     actorTransitTo;
   TransitionCompletedCallback callback(signalVerified, currentEffect, actorTransitTo);
-  waveEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  crossEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  foldEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
+  waveEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  crossEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  foldEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
 
-  currentEffect = waveEffect;
+  currentEffect  = waveEffect;
   actorTransitTo = secondTexture;
-  waveEffect.SetCurrentTexture( firstTexture );
-  waveEffect.SetTargetTexture( secondTexture );
+  waveEffect.SetCurrentTexture(firstTexture);
+  waveEffect.SetTargetTexture(secondTexture);
   // start transition; transit for 0.5*duration; pause for 0.5*duration;
   // resume for 0.25*duration; pause for 0.25*duration; resume for another 0.25*duration;
   // only until now the transition finished signal can be received
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
-  currentEffect = crossEffect;
+  currentEffect  = crossEffect;
   actorTransitTo = firstTexture;
-  crossEffect.SetCurrentTexture( secondTexture );
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetCurrentTexture(secondTexture);
+  crossEffect.SetTargetTexture(firstTexture);
   // start transition; transit for 0.25*duration; pause for 0.2*duration;
   // resume for 0.5*duration; pause for 0.2*duration; resume for another 0.25*duration;
   // only until now the transition finished signal can be received
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
-  currentEffect = foldEffect;
+  currentEffect  = foldEffect;
   actorTransitTo = secondTexture;
-  foldEffect.SetCurrentTexture( firstTexture );
-  foldEffect.SetTargetTexture( secondTexture );
+  foldEffect.SetCurrentTexture(firstTexture);
+  foldEffect.SetTargetTexture(secondTexture);
   // start transition; transit for 0.5*duration; pause for 0.5*duration;
   // resume for 0.25*duration; pause for 0.25*duration; resume for another 0.25*duration;
   // only until now the transition finished signal can be received
   foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(callback.mSignalVerified);
   END_TEST;
 }
@@ -803,18 +796,18 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionWaveEffectStopTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  waveEffect.SetCurrentTexture( firstTexture );
-  waveEffect.SetTargetTexture( secondTexture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  waveEffect.SetCurrentTexture(firstTexture);
+  waveEffect.SetTargetTexture(secondTexture);
 
-  application.GetScene().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
@@ -824,43 +817,43 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void)
   Actor cube = waveEffect.GetChildAt(0).GetChildAt(0);
 
   //check the cube rotation value and color values reset after stopping different transitions in the middle
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( firstTexture );
+  waveEffect.SetTargetTexture(firstTexture);
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.4f );
+  Wait(application, TRANSITION_DURATION * 0.4f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( secondTexture );
+  waveEffect.SetTargetTexture(secondTexture);
   waveEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.6f );
+  Wait(application, TRANSITION_DURATION * 0.6f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( firstTexture );
+  waveEffect.SetTargetTexture(firstTexture);
   waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION*0.8f );
+  Wait(application, TRANSITION_DURATION * 0.8f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -869,18 +862,18 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionCrossEffectStopTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  crossEffect.SetCurrentTexture( firstTexture );
-  crossEffect.SetTargetTexture( secondTexture );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  crossEffect.SetCurrentTexture(firstTexture);
+  crossEffect.SetTargetTexture(secondTexture);
 
-  application.GetScene().Add( crossEffect );
+  application.GetScene().Add(crossEffect);
 
   application.SendNotification();
   application.Render();
@@ -891,47 +884,47 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void)
   Actor cube1 = crossEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation values and color values reset after stop the different transitions in the middle
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetTargetTexture(firstTexture);
   crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.4f );
+  Wait(application, TRANSITION_DURATION * 0.4f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( secondTexture );
+  crossEffect.SetTargetTexture(secondTexture);
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.6f );
+  Wait(application, TRANSITION_DURATION * 0.6f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetTargetTexture(firstTexture);
   crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION*0.8f );
+  Wait(application, TRANSITION_DURATION * 0.8f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -940,17 +933,17 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionFoldEffectStopTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
 
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetProperty( Actor::Property::SIZE, Vector2( VIEW_AREA_SIZE ) );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  foldEffect.SetCurrentTexture( firstTexture );
-  foldEffect.SetTargetTexture( secondTexture );
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  foldEffect.SetCurrentTexture(firstTexture);
+  foldEffect.SetTargetTexture(secondTexture);
 
-  application.GetScene().Add( foldEffect );
+  application.GetScene().Add(foldEffect);
 
   application.SendNotification();
   application.Render();
@@ -961,47 +954,47 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void)
   Actor cube1 = foldEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation values and color values after stop the different transitions in the middle
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( firstTexture );
+  foldEffect.SetTargetTexture(firstTexture);
   foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.4f );
+  Wait(application, TRANSITION_DURATION * 0.4f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( secondTexture );
+  foldEffect.SetTargetTexture(secondTexture);
   foldEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.6f );
+  Wait(application, TRANSITION_DURATION * 0.6f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( firstTexture );
+  foldEffect.SetTargetTexture(firstTexture);
   foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION*0.8f );
+  Wait(application, TRANSITION_DURATION * 0.8f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp
index 9f41ad8..9ef083d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
@@ -40,57 +40,57 @@ void utc_dali_toolkit_drag_drop_detector_cleanup(void)
 
 namespace
 {
-  const int RENDER_FRAME_INTERVAL = 16;
-  struct SignalData
-  {
-    SignalData()
-    :functorCalled(false),
+const int RENDER_FRAME_INTERVAL = 16;
+struct SignalData
+{
+  SignalData()
+  : functorCalled(false),
     control(),
     detector()
-    {
-    }
+  {
+  }
 
-    void Reset()
-    {
-      functorCalled = false;
-      control.Reset();
-    }
+  void Reset()
+  {
+    functorCalled = false;
+    control.Reset();
+  }
 
-    bool functorCalled;
-    Control control;
-    Dali::Toolkit::DragAndDropDetector detector;
-  };
+  bool                               functorCalled;
+  Control                            control;
+  Dali::Toolkit::DragAndDropDetector detector;
+};
 
-  struct DragSignalFunctor
-  {
-    DragSignalFunctor(SignalData& data, bool returnValue = true)
-    :signalData(data),
+struct DragSignalFunctor
+{
+  DragSignalFunctor(SignalData& data, bool returnValue = true)
+  : signalData(data),
     returnValue(returnValue)
-    {
-    }
-
-    bool operator()(Control control, Dali::Toolkit::DragAndDropDetector detector)
-    {
-      signalData.functorCalled = true;
-      signalData.control = control;
-      signalData.detector = detector;
-      return returnValue;
-    }
-
-    SignalData& signalData;
-    bool returnValue;
-    };
-
-  Integration::TouchEvent GenerateSingleTouch(PointState::Type state, const Vector2& screenPosition)
   {
-    Integration::TouchEvent touchEvent;
-    Integration::Point point;
-    point.SetState(static_cast<PointState::Type>(state));
-    point.SetScreenPosition(screenPosition);
-    touchEvent.points.push_back(point);
-    return touchEvent;
   }
+
+  bool operator()(Control control, Dali::Toolkit::DragAndDropDetector detector)
+  {
+    signalData.functorCalled = true;
+    signalData.control       = control;
+    signalData.detector      = detector;
+    return returnValue;
+  }
+
+  SignalData& signalData;
+  bool        returnValue;
+};
+
+Integration::TouchEvent GenerateSingleTouch(PointState::Type state, const Vector2& screenPosition)
+{
+  Integration::TouchEvent touchEvent;
+  Integration::Point      point;
+  point.SetState(static_cast<PointState::Type>(state));
+  point.SetScreenPosition(screenPosition);
+  touchEvent.points.push_back(point);
+  return touchEvent;
 }
+} // namespace
 
 int UtcDaliDragAndDropDetectorConstructorN(void)
 {
@@ -117,7 +117,7 @@ int UtcDaliDragAndDropDetectorAttachN(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control;
+  Control                            control;
   detector.Attach(control);
 
   DALI_TEST_EQUALS(0, detector.GetAttachedControlCount(), TEST_LOCATION);
@@ -134,7 +134,7 @@ int UtcDaliDragAndDropDetectorAttachP(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control = Control::New();
+  Control                            control  = Control::New();
 
   detector.Attach(control);
   DALI_TEST_EQUALS(1, detector.GetAttachedControlCount(), TEST_LOCATION);
@@ -143,12 +143,12 @@ int UtcDaliDragAndDropDetectorAttachP(void)
 }
 
 int UtcDaliDragAndDropDetectorDetachN(void)
-  {
+{
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1;
-  Control control2 = Control::New();
+  Control                            control1;
+  Control                            control2 = Control::New();
 
   detector.Attach(control1);
   detector.Attach(control2);
@@ -161,7 +161,6 @@ int UtcDaliDragAndDropDetectorDetachN(void)
   DALI_TEST_EQUALS(0, detector.GetAttachedControlCount(), TEST_LOCATION);
 
   END_TEST;
-
 }
 
 int UtcDaliDragAndDropDetectorDetachP(void)
@@ -169,9 +168,9 @@ int UtcDaliDragAndDropDetectorDetachP(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
-  Control control3;
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
+  Control                            control3;
 
   detector.Attach(control1);
   detector.Attach(control2);
@@ -205,8 +204,8 @@ int UtcDaliDragAndDropDetectorDetachAllP(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
 
   detector.Attach(control1);
   detector.Attach(control2);
@@ -221,8 +220,8 @@ int UtcDaliDragAndDropDetectorGetAttachedControlCountP(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
 
   detector.Attach(control1);
   detector.Attach(control2);
@@ -236,8 +235,8 @@ int UtcDaliDragAndDropDetectorGetAttachedControlN(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
 
   detector.Attach(control1);
 
@@ -252,8 +251,8 @@ int UtcDaliDragAndDropDetectorGetAttachedControlP(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
 
   detector.Attach(control1);
   detector.Attach(control2);
@@ -269,9 +268,9 @@ int UtcDaliDragAndDropDetectorStartSignal(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control = Control::New();
-  control.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  Control                            control  = Control::New();
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   application.GetScene().Add(control);
   detector.Attach(control);
 
@@ -281,7 +280,7 @@ int UtcDaliDragAndDropDetectorStartSignal(void)
   DALI_TEST_CHECK(detector);
   DALI_TEST_CHECK(control);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.StartedSignal().Connect(&application, functor);
 
@@ -300,16 +299,16 @@ int UtcDaliDragAndDropDetectorEnteredSignal(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
-  control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
-  control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
-  control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
+  control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
 
   application.GetScene().Add(control1);
   application.GetScene().Add(control2);
@@ -320,7 +319,7 @@ int UtcDaliDragAndDropDetectorEnteredSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.EnteredSignal().Connect(&application, functor);
 
@@ -335,7 +334,6 @@ int UtcDaliDragAndDropDetectorEnteredSignal(void)
   data.Reset();
 
   END_TEST;
-
 }
 
 int UtcDaliDragAndDropDetectorMovedSignal(void)
@@ -343,16 +341,16 @@ int UtcDaliDragAndDropDetectorMovedSignal(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
-  control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
-  control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
-  control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
+  control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
 
   application.GetScene().Add(control1);
   application.GetScene().Add(control2);
@@ -363,7 +361,7 @@ int UtcDaliDragAndDropDetectorMovedSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.MovedSignal().Connect(&application, functor);
 
@@ -390,19 +388,19 @@ int UtcDaliDragAndDropDetectorExitedSignal(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
-  control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
-  control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
-  control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
-
-  control1.SetProperty( Actor::Property::LEAVE_REQUIRED,true);
-  control2.SetProperty( Actor::Property::LEAVE_REQUIRED,true);
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
+  control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+
+  control1.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
+  control2.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
 
   application.GetScene().Add(control1);
   application.GetScene().Add(control2);
@@ -413,7 +411,7 @@ int UtcDaliDragAndDropDetectorExitedSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.ExitedSignal().Connect(&application, functor);
 
@@ -438,16 +436,16 @@ int UtcDaliDragAndDropDetectorDroppedSignal(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
-  control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
-  control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
-  control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
+  control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
 
   application.GetScene().Add(control1);
   application.GetScene().Add(control2);
@@ -458,7 +456,7 @@ int UtcDaliDragAndDropDetectorDroppedSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.DroppedSignal().Connect(&application, functor);
 
@@ -486,16 +484,16 @@ int UtcDaliDragAndDropDetectorEndedSignal(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
-  control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f,100.0f) );
-  control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
-  control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
+  control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
 
   application.GetScene().Add(control1);
   application.GetScene().Add(control2);
@@ -506,7 +504,7 @@ int UtcDaliDragAndDropDetectorEndedSignal(void)
   detector.Attach(control1);
   detector.Attach(control2);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.EndedSignal().Connect(&application, functor);
 
@@ -526,18 +524,18 @@ int UtcDaliDragAndDropDetectorGetContent(void)
   ToolkitTestApplication application;
 
   Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New();
-  Control control1 = Control::New();
-  Control control2 = Control::New();
-  control1.SetProperty( Dali::Actor::Property::NAME,"control1");
-  control2.SetProperty( Dali::Actor::Property::NAME,"control2");
-  control1.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  control1.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f));
-  control2.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 100.0f));
+  Control                            control1 = Control::New();
+  Control                            control2 = Control::New();
+  control1.SetProperty(Dali::Actor::Property::NAME, "control1");
+  control2.SetProperty(Dali::Actor::Property::NAME, "control2");
+  control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f));
 
   application.GetScene().Add(control1);
   application.GetScene().Add(control2);
@@ -548,7 +546,7 @@ int UtcDaliDragAndDropDetectorGetContent(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.DroppedSignal().Connect(&application, functor);
 
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
index fbaa3de..811fc2f 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,12 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 #include <sstream>
+
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/effects-view/effects-view.h>
 
@@ -40,16 +42,16 @@ int UtcDaliEffectsViewNew(void)
   ToolkitTestApplication application;
 
   EffectsView view;
-  DALI_TEST_CHECK( !view );
+  DALI_TEST_CHECK(!view);
 
-  view = EffectsView::New( EffectsView::DROP_SHADOW );
-  DALI_TEST_CHECK( view );
+  view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   view.Reset();
-  view = EffectsView::New( EffectsView::EMBOSS );
-  DALI_TEST_CHECK( view );
+  view = EffectsView::New(EffectsView::EMBOSS);
+  DALI_TEST_CHECK(view);
 
   application.SendNotification();
   application.Render();
@@ -61,21 +63,21 @@ int UtcDaliEffectsViewCopyAndAssignment(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New( EffectsView::DROP_SHADOW );
-  DALI_TEST_CHECK( view );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view);
 
-  EffectsView copy( view );
-  DALI_TEST_CHECK( copy == view );
+  EffectsView copy(view);
+  DALI_TEST_CHECK(copy == view);
 
   EffectsView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
   assign = view;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   // Self assignment
   assign = assign;
-  DALI_TEST_CHECK( assign );
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign);
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -84,14 +86,14 @@ int UtcDaliEffectsViewDownCast(void)
 {
   ToolkitTestApplication application;
 
-  BaseHandle view = EffectsView::New( EffectsView::EMBOSS );
-  DALI_TEST_CHECK( EffectsView::DownCast( view ) );
+  BaseHandle view = EffectsView::New(EffectsView::EMBOSS);
+  DALI_TEST_CHECK(EffectsView::DownCast(view));
 
   BaseHandle empty;
-  DALI_TEST_CHECK( ! EffectsView::DownCast( empty ) );
+  DALI_TEST_CHECK(!EffectsView::DownCast(empty));
 
   BaseHandle another = Actor::New();
-  DALI_TEST_CHECK( ! EffectsView::DownCast( another ) );
+  DALI_TEST_CHECK(!EffectsView::DownCast(another));
 
   END_TEST;
 }
@@ -102,29 +104,27 @@ int UtcDaliEffectsViewAddRemoveDropShadow(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliEffectsViewAddRemoveDropShadow");
 
-  EffectsView view = EffectsView::New( EffectsView::DROP_SHADOW );
-  DALI_TEST_CHECK( view );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
-
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(actor);
   application.GetScene().Add(view);
 
-  DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
-  DALI_TEST_CHECK( actor.GetParent() );
-  DALI_TEST_CHECK( actor.GetParent() != view );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+  DALI_TEST_CHECK(actor.GetParent());
+  DALI_TEST_CHECK(actor.GetParent() != view);
 
   view.Remove(actor);
 
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
-
 int UtcDaliEffectsViewAddRemoveEmboss(void)
 {
   ToolkitTestApplication application;
@@ -134,35 +134,35 @@ int UtcDaliEffectsViewAddRemoveEmboss(void)
   application.SendNotification();
   application.Render();
   Integration::Scene stage = application.GetScene();
-  DALI_TEST_EQUALS( stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION);
 
   tet_infoline("Create effects view");
 
-  EffectsView view = EffectsView::New( EffectsView::EMBOSS );
-  Vector3 offsetSet( 2.f, 3.f, 4.f );
-  Vector4 colorSet( 0.2f, 0.3f, 0.4f, 0.5f );
-  view.SetProperty( EffectsView::Property::EFFECT_OFFSET, offsetSet);
-  view.SetProperty( EffectsView::Property::EFFECT_COLOR, colorSet);
-  Vector3 offsetAnimate( 4.f, 6.f, 8.f );
-  float durationSeconds(0.05f);
-  Animation animation = Animation::New( durationSeconds );
-  animation.AnimateTo( Property(view,EffectsView::Property::EFFECT_OFFSET ), offsetAnimate );
+  EffectsView view = EffectsView::New(EffectsView::EMBOSS);
+  Vector3     offsetSet(2.f, 3.f, 4.f);
+  Vector4     colorSet(0.2f, 0.3f, 0.4f, 0.5f);
+  view.SetProperty(EffectsView::Property::EFFECT_OFFSET, offsetSet);
+  view.SetProperty(EffectsView::Property::EFFECT_COLOR, colorSet);
+  Vector3   offsetAnimate(4.f, 6.f, 8.f);
+  float     durationSeconds(0.05f);
+  Animation animation = Animation::New(durationSeconds);
+  animation.AnimateTo(Property(view, EffectsView::Property::EFFECT_OFFSET), offsetAnimate);
   animation.Play();
 
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
 
   view.Add(actor);
-  view.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+  view.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
   stage.Add(view);
 
-  DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
   application.SendNotification();
   application.Render();
@@ -171,33 +171,32 @@ int UtcDaliEffectsViewAddRemoveEmboss(void)
   stage.Remove(view);
 
   tet_infoline("Checking number of render tasks = 1");
-  DALI_TEST_EQUALS( stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION);
 
   tet_infoline("Adding view to stage again re-enables view");
   stage.Add(view);
 
   tet_infoline("Removing view from stage disables view");
-  DALI_TEST_GREATER( stage.GetRenderTaskList().GetTaskCount(), 1u, TEST_LOCATION );
+  DALI_TEST_GREATER(stage.GetRenderTaskList().GetTaskCount(), 1u, TEST_LOCATION);
   stage.Remove(view);
   view.Reset();
 
   tet_infoline("Checking number of render tasks = 1");
-  DALI_TEST_EQUALS( stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliEffectsViewGetTypeP(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New( EffectsView::DROP_SHADOW );
-  DALI_TEST_CHECK( view.GetType() == EffectsView::DROP_SHADOW );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view.GetType() == EffectsView::DROP_SHADOW);
 
   view.Reset();
-  view = EffectsView::New( EffectsView::EMBOSS );
-  DALI_TEST_CHECK( view.GetType() == EffectsView::EMBOSS );
+  view = EffectsView::New(EffectsView::EMBOSS);
+  DALI_TEST_CHECK(view.GetType() == EffectsView::EMBOSS);
 
   END_TEST;
 }
@@ -207,14 +206,14 @@ int UtcDaliEffectsViewOnStage(void)
   ToolkitTestApplication application;
 
   EffectsView view = EffectsView::New(EffectsView::EMBOSS);
-  view.SetProperty( Actor::Property::SIZE, Vector2(100.f, 100.f) );
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
   Integration::Scene stage = application.GetScene();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() == 1);
 
-  stage.Add( view );
+  stage.Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() > 1 );
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() > 1);
 
   END_TEST;
 }
@@ -224,19 +223,19 @@ int UtcDaliEffectsViewOffStage(void)
   ToolkitTestApplication application;
 
   EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-  view.SetProperty( Actor::Property::SIZE, Vector2(100.f, 100.f) );
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
   Integration::Scene stage = application.GetScene();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() == 1);
 
-  stage.Add( view );
+  stage.Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() > 1 );
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() > 1);
 
-  stage.Remove( view );
+  stage.Remove(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() == 1);
 
   END_TEST;
 }
@@ -245,15 +244,15 @@ int UtcDaliEffectsViewRefreshP(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New( EffectsView::DROP_SHADOW );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
   try
   {
     view.Refresh();
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( false ); // Should not get here!
+    DALI_TEST_CHECK(false); // Should not get here!
   }
 
   END_TEST;
@@ -267,11 +266,11 @@ int UtcDaliEffectsViewRefreshN(void)
   try
   {
     view.Refresh();
-    DALI_TEST_CHECK( false ); // Should not get here
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -281,15 +280,15 @@ int UtcDaliEffectsViewSetPixelFormatP(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New( EffectsView::DROP_SHADOW );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
   try
   {
-    view.SetPixelFormat( Pixel::RGBA8888 );
-    DALI_TEST_CHECK( true );
+    view.SetPixelFormat(Pixel::RGBA8888);
+    DALI_TEST_CHECK(true);
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( false ); // Should not get here!
+    DALI_TEST_CHECK(false); // Should not get here!
   }
 
   END_TEST;
@@ -302,12 +301,12 @@ int UtcDaliEffectsViewSetPixelFormatN(void)
   EffectsView view;
   try
   {
-    view.SetPixelFormat( Pixel::RGBA8888 );
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.SetPixelFormat(Pixel::RGBA8888);
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -317,16 +316,16 @@ int UtcDaliEffectsViewSizeProperty(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New( EffectsView::DROP_SHADOW );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
 
-  Property::Index idx = view.GetPropertyIndex( "effectSize" );
-  DALI_TEST_EQUALS( idx, (Property::Index)EffectsView::Property::EFFECT_SIZE, TEST_LOCATION );
+  Property::Index idx = view.GetPropertyIndex("effectSize");
+  DALI_TEST_EQUALS(idx, (Property::Index)EffectsView::Property::EFFECT_SIZE, TEST_LOCATION);
 
-  view.SetProperty( idx, 5 );
-  Property::Value value = view.GetProperty( EffectsView::Property::EFFECT_SIZE );
-  int size;
-  DALI_TEST_CHECK( value.Get(size) );
-  DALI_TEST_CHECK( size == 5 );
+  view.SetProperty(idx, 5);
+  Property::Value value = view.GetProperty(EffectsView::Property::EFFECT_SIZE);
+  int             size;
+  DALI_TEST_CHECK(value.Get(size));
+  DALI_TEST_CHECK(size == 5);
 
   END_TEST;
 }
@@ -335,33 +334,33 @@ int UtcDaliEffectsViewOffsetProperty(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New( EffectsView::EMBOSS );
-  application.GetScene().Add( view );
+  EffectsView view = EffectsView::New(EffectsView::EMBOSS);
+  application.GetScene().Add(view);
 
-  Property::Value value = view.GetProperty( EffectsView::Property::EFFECT_OFFSET );
-  Vector3 offsetValue;
-  DALI_TEST_CHECK( value.Get(offsetValue) );
-  DALI_TEST_EQUALS( offsetValue, Vector3::ZERO, TEST_LOCATION );
+  Property::Value value = view.GetProperty(EffectsView::Property::EFFECT_OFFSET);
+  Vector3         offsetValue;
+  DALI_TEST_CHECK(value.Get(offsetValue));
+  DALI_TEST_EQUALS(offsetValue, Vector3::ZERO, TEST_LOCATION);
 
-  Vector3 offsetSet( 2.f, 3.f, 4.f );
-  view.SetProperty( EffectsView::Property::EFFECT_OFFSET, offsetSet);
+  Vector3 offsetSet(2.f, 3.f, 4.f);
+  view.SetProperty(EffectsView::Property::EFFECT_OFFSET, offsetSet);
   application.SendNotification();
   application.Render(0);
-  value = view.GetProperty( EffectsView::Property::EFFECT_OFFSET );
+  value = view.GetProperty(EffectsView::Property::EFFECT_OFFSET);
   value.Get(offsetValue);
-  DALI_TEST_EQUALS( offsetValue, offsetSet, TEST_LOCATION );
+  DALI_TEST_EQUALS(offsetValue, offsetSet, TEST_LOCATION);
 
-  Vector3 offsetAnimate( 4.f, 6.f, 8.f );
-  float durationSeconds(0.05f);
-  Animation animation = Animation::New( durationSeconds );
-  animation.AnimateTo( Property(view,EffectsView::Property::EFFECT_OFFSET ), offsetAnimate );
+  Vector3   offsetAnimate(4.f, 6.f, 8.f);
+  float     durationSeconds(0.05f);
+  Animation animation = Animation::New(durationSeconds);
+  animation.AnimateTo(Property(view, EffectsView::Property::EFFECT_OFFSET), offsetAnimate);
   animation.Play();
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*1000.0f) + 1u/*just beyond the animation duration*/);
+  application.Render(static_cast<unsigned int>(durationSeconds * 1000.0f) + 1u /*just beyond the animation duration*/);
 
-  value = view.GetCurrentProperty( EffectsView::Property::EFFECT_OFFSET );
+  value = view.GetCurrentProperty(EffectsView::Property::EFFECT_OFFSET);
   value.Get(offsetValue);
-  DALI_TEST_EQUALS( offsetValue, offsetAnimate, TEST_LOCATION );
+  DALI_TEST_EQUALS(offsetValue, offsetAnimate, TEST_LOCATION);
 
   END_TEST;
 }
@@ -370,33 +369,33 @@ int UtcDaliEffectsViewColorProperty(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New( EffectsView::DROP_SHADOW );
-  application.GetScene().Add( view );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  application.GetScene().Add(view);
 
-  Property::Value value = view.GetProperty( EffectsView::Property::EFFECT_COLOR );
-  Vector4 colorValue;
-  DALI_TEST_CHECK( value.Get(colorValue) );
-  DALI_TEST_EQUALS( colorValue, Color::WHITE, TEST_LOCATION );
+  Property::Value value = view.GetProperty(EffectsView::Property::EFFECT_COLOR);
+  Vector4         colorValue;
+  DALI_TEST_CHECK(value.Get(colorValue));
+  DALI_TEST_EQUALS(colorValue, Color::WHITE, TEST_LOCATION);
 
-  Vector4 colorSet( 0.2f, 0.3f, 0.4f, 0.5f );
-  view.SetProperty( EffectsView::Property::EFFECT_COLOR, colorSet);
+  Vector4 colorSet(0.2f, 0.3f, 0.4f, 0.5f);
+  view.SetProperty(EffectsView::Property::EFFECT_COLOR, colorSet);
   application.SendNotification();
   application.Render(0);
-  value = view.GetProperty( EffectsView::Property::EFFECT_COLOR );
+  value = view.GetProperty(EffectsView::Property::EFFECT_COLOR);
   value.Get(colorValue);
-  DALI_TEST_EQUALS( colorValue, colorSet, TEST_LOCATION );
+  DALI_TEST_EQUALS(colorValue, colorSet, TEST_LOCATION);
 
-  Vector4 colorAnimate( 0.5f, 0.6f, 0.8f, 1.f );
-  float durationSeconds(0.05f);
-  Animation animation = Animation::New( durationSeconds );
-  animation.AnimateTo( Property(view,EffectsView::Property::EFFECT_COLOR ), colorAnimate );
+  Vector4   colorAnimate(0.5f, 0.6f, 0.8f, 1.f);
+  float     durationSeconds(0.05f);
+  Animation animation = Animation::New(durationSeconds);
+  animation.AnimateTo(Property(view, EffectsView::Property::EFFECT_COLOR), colorAnimate);
   animation.Play();
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*1000.0f) + 1u/*just beyond the animation duration*/);
+  application.Render(static_cast<unsigned int>(durationSeconds * 1000.0f) + 1u /*just beyond the animation duration*/);
 
-  value = view.GetCurrentProperty( EffectsView::Property::EFFECT_COLOR );
+  value = view.GetCurrentProperty(EffectsView::Property::EFFECT_COLOR);
   value.Get(colorValue);
-  DALI_TEST_EQUALS( colorValue, colorAnimate, TEST_LOCATION );
+  DALI_TEST_EQUALS(colorValue, colorAnimate, TEST_LOCATION);
 
   END_TEST;
 }
@@ -406,11 +405,11 @@ int UtcDaliEffectsViewGetSetBackgroundColor(void)
   ToolkitTestApplication application;
 
   EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-  view.SetBackgroundColor( Color::RED );
-  DALI_TEST_CHECK( Color::RED == view.GetBackgroundColor() );
+  view.SetBackgroundColor(Color::RED);
+  DALI_TEST_CHECK(Color::RED == view.GetBackgroundColor());
 
-  view.SetBackgroundColor( Color::YELLOW );
-  DALI_TEST_CHECK( Color::YELLOW == view.GetBackgroundColor() );
+  view.SetBackgroundColor(Color::YELLOW);
+  DALI_TEST_CHECK(Color::YELLOW == view.GetBackgroundColor());
 
   END_TEST;
 }
@@ -422,12 +421,12 @@ int UtcDaliEffectsViewSetBackgroundColorN(void)
   EffectsView view;
   try
   {
-    view.SetBackgroundColor( Color::RED );
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.SetBackgroundColor(Color::RED);
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -442,11 +441,11 @@ int UtcDaliEffectsViewGetBackgroundColorN(void)
   {
     Vector4 color = view.GetBackgroundColor();
     (void)color;
-    DALI_TEST_CHECK( false ); // Should not get here
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -457,21 +456,21 @@ int UtcDaliEffectsViewSetRefreshOnDemandP(void)
   ToolkitTestApplication application;
 
   EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-  view.SetProperty( Actor::Property::SIZE, Vector2(100.f, 100.f) );
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
   Integration::Scene stage = application.GetScene();
-  stage.Add( view );
+  stage.Add(view);
   application.SendNotification();
   application.Render();
 
   RenderTaskList renderTaskList = stage.GetRenderTaskList();
-  DALI_TEST_CHECK( renderTaskList.GetTask( 1 ).GetRefreshRate() == RenderTask::REFRESH_ALWAYS );
+  DALI_TEST_CHECK(renderTaskList.GetTask(1).GetRefreshRate() == RenderTask::REFRESH_ALWAYS);
 
-  view.SetRefreshOnDemand( true );
-  DALI_TEST_CHECK( renderTaskList.GetTask( 1 ).GetRefreshRate() == RenderTask::REFRESH_ONCE );
+  view.SetRefreshOnDemand(true);
+  DALI_TEST_CHECK(renderTaskList.GetTask(1).GetRefreshRate() == RenderTask::REFRESH_ONCE);
 
-  view.SetRefreshOnDemand( false );
-  DALI_TEST_CHECK( renderTaskList.GetTask( 1 ).GetRefreshRate() == RenderTask::REFRESH_ALWAYS );
+  view.SetRefreshOnDemand(false);
+  DALI_TEST_CHECK(renderTaskList.GetTask(1).GetRefreshRate() == RenderTask::REFRESH_ALWAYS);
 
   END_TEST;
 }
@@ -483,12 +482,12 @@ int UtcDaliEffectsViewSetRefreshOnDemandN(void)
   EffectsView view;
   try
   {
-    view.SetRefreshOnDemand( false );
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.SetRefreshOnDemand(false);
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -497,39 +496,39 @@ int UtcDaliEffectsViewSetRefreshOnDemandN(void)
 int UtcDaliEffectsViewSizeSet(void)
 {
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   {
     EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-    view.SetProperty( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f ) );
-    stage.Add( view );
+    view.SetProperty(Actor::Property::SIZE, Vector3(200.0f, 200.0f, 0.0f));
+    stage.Add(view);
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), Vector3(200.0f, 200.0f, 0.0f), TEST_LOCATION);
   }
 
   {
     EffectsView view = EffectsView::New(EffectsView::EMBOSS);
-    view.SetProperty( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f ) );
-    stage.Add( view );
+    view.SetProperty(Actor::Property::SIZE, Vector3(200.0f, 200.0f, 0.0f));
+    stage.Add(view);
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), Vector3(200.0f, 200.0f, 0.0f), TEST_LOCATION);
   }
 
   {
     EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-    view.SetProperty( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f ) );
-    stage.Add( view );
+    view.SetProperty(Actor::Property::SIZE, Vector3(200.0f, 200.0f, 0.0f));
+    stage.Add(view);
     application.SendNotification();
     application.Render();
 
-    stage.Remove( view );
+    stage.Remove(view);
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), Vector3(200.0f, 200.0f, 0.0f), TEST_LOCATION);
   }
 
   END_TEST;
@@ -540,16 +539,16 @@ int UtcDaliEffectsViewTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "EffectsView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("EffectsView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  EffectsView view = EffectsView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  EffectsView view = EffectsView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FadeTransition.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FadeTransition.cpp
old mode 100755
new mode 100644
index f708a31..f7b81f0
--- a/automated-tests/src/dali-toolkit/utc-Dali-FadeTransition.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-FadeTransition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,17 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/actor-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/transition/transition-set.h>
-#include <dali-toolkit/public-api/transition/transition-base.h>
 #include <dali-toolkit/public-api/transition/fade-transition.h>
+#include <dali-toolkit/public-api/transition/transition-base.h>
+#include <dali-toolkit/public-api/transition/transition-set.h>
+#include <dali/devel-api/actors/actor-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -118,7 +120,7 @@ int UtcDaliFadeTransitionWithOffScene(void)
   transitionSet.AddTransition(fade);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -130,7 +132,7 @@ int UtcDaliFadeTransitionWithOffScene(void)
   finishCheck.CheckSignalNotReceived();
 
   DALI_TEST_EQUALS(1.0f, control.GetCurrentProperty<float>(Actor::Property::OPACITY), TEST_LOCATION);
-  
+
   application.SendNotification();
   application.Render(200);
 
@@ -175,7 +177,7 @@ int UtcDaliFadeTransitionDisappearing(void)
   transitionSet.AddTransition(fade);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -188,7 +190,7 @@ int UtcDaliFadeTransitionDisappearing(void)
 
   float currentOpacity = control.GetCurrentProperty<float>(Actor::Property::OPACITY);
   DALI_TEST_CHECK(currentOpacity <= 0.7 && currentOpacity >= 0.5);
-  
+
   application.SendNotification();
   application.Render(200);
 
@@ -234,7 +236,7 @@ int UtcDaliFadeTransitionAppearing(void)
   transitionSet.AddTransition(fade);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -247,7 +249,7 @@ int UtcDaliFadeTransitionAppearing(void)
 
   float currentOpacity = control.GetCurrentProperty<float>(Actor::Property::OPACITY);
   DALI_TEST_CHECK(currentOpacity <= 1.0 && currentOpacity >= 0.8);
-  
+
   application.SendNotification();
   application.Render(200);
 
@@ -263,7 +265,6 @@ int UtcDaliFadeTransitionAppearing(void)
   END_TEST;
 }
 
-
 int UtcDaliFadeTransitionAppearingWithDelay(void)
 {
   ToolkitTestApplication application;
@@ -293,7 +294,7 @@ int UtcDaliFadeTransitionAppearingWithDelay(void)
   transitionSet.AddTransition(fade);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
index 61c4a58..0d5523c 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/devel-api/actors/actor-devel.h>
 
@@ -36,16 +38,15 @@ void dali_flexflexContainer_cleanup(void)
 
 namespace
 {
-
 const char* const PROPERTY_NAME_CONTENT_DIRECTION = "contentDirection";
-const char* const PROPERTY_NAME_FLEX_DIRECTION = "flexDirection";
-const char* const PROPERTY_NAME_FLEX_WRAP = "flexWrap";
-const char* const PROPERTY_NAME_JUSTIFY_CONTENT = "justifyContent";
-const char* const PROPERTY_NAME_ALIGN_ITEMS = "alignItems";
-const char* const PROPERTY_NAME_ALIGN_CONTENT =  "alignContent";
-const char* const CHILD_PROPERTY_NAME_FLEX = "flex";
-const char* const CHILD_PROPERTY_NAME_ALIGN_SELF = "alignSelf";
-const char* const CHILD_PROPERTY_NAME_FLEX_MARGIN =  "flexMargin";
+const char* const PROPERTY_NAME_FLEX_DIRECTION    = "flexDirection";
+const char* const PROPERTY_NAME_FLEX_WRAP         = "flexWrap";
+const char* const PROPERTY_NAME_JUSTIFY_CONTENT   = "justifyContent";
+const char* const PROPERTY_NAME_ALIGN_ITEMS       = "alignItems";
+const char* const PROPERTY_NAME_ALIGN_CONTENT     = "alignContent";
+const char* const CHILD_PROPERTY_NAME_FLEX        = "flex";
+const char* const CHILD_PROPERTY_NAME_ALIGN_SELF  = "alignSelf";
+const char* const CHILD_PROPERTY_NAME_FLEX_MARGIN = "flexMargin";
 
 } // namespace
 
@@ -54,7 +55,7 @@ int UtcDaliToolkitFlexContainerConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerConstructorP");
   FlexContainer flexContainer;
-  DALI_TEST_CHECK( !flexContainer );
+  DALI_TEST_CHECK(!flexContainer);
   END_TEST;
 }
 
@@ -63,7 +64,7 @@ int UtcDaliToolkitFlexContainerNewP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerNewP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
   END_TEST;
 }
 
@@ -72,13 +73,13 @@ int UtcDaliToolkitFlexContainerDownCastP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerDownCastP");
   FlexContainer flexContainer1 = FlexContainer::New();
-  BaseHandle object( flexContainer1 );
+  BaseHandle    object(flexContainer1);
 
-  FlexContainer flexContainer2 = FlexContainer::DownCast( object );
-  DALI_TEST_CHECK( flexContainer2 );
+  FlexContainer flexContainer2 = FlexContainer::DownCast(object);
+  DALI_TEST_CHECK(flexContainer2);
 
-  FlexContainer flexContainer3 = DownCast< FlexContainer >( object );
-  DALI_TEST_CHECK( flexContainer3 );
+  FlexContainer flexContainer3 = DownCast<FlexContainer>(object);
+  DALI_TEST_CHECK(flexContainer3);
   END_TEST;
 }
 
@@ -86,12 +87,12 @@ int UtcDaliToolkitFlexContainerDownCastN(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerDownCastN");
-  BaseHandle uninitializedObject;
-  FlexContainer flexContainer1 = FlexContainer::DownCast( uninitializedObject );
-  DALI_TEST_CHECK( !flexContainer1 );
+  BaseHandle    uninitializedObject;
+  FlexContainer flexContainer1 = FlexContainer::DownCast(uninitializedObject);
+  DALI_TEST_CHECK(!flexContainer1);
 
-  FlexContainer flexContainer2 = DownCast< FlexContainer >( uninitializedObject );
-  DALI_TEST_CHECK( !flexContainer2 );
+  FlexContainer flexContainer2 = DownCast<FlexContainer>(uninitializedObject);
+  DALI_TEST_CHECK(!flexContainer2);
   END_TEST;
 }
 
@@ -100,11 +101,11 @@ int UtcDaliToolkitFlexContainerCopyConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerCopyConstructorP");
   FlexContainer flexContainer = FlexContainer::New();
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE);
 
-  FlexContainer copy( flexContainer );
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) );
+  FlexContainer copy(flexContainer);
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION) == flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION));
 
   END_TEST;
 }
@@ -114,15 +115,15 @@ int UtcDaliFlexContainerMoveConstructor(void)
   ToolkitTestApplication application;
 
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_EQUALS( 1, flexContainer.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE );
-  DALI_TEST_CHECK( flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
+  DALI_TEST_EQUALS(1, flexContainer.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE);
+  DALI_TEST_CHECK(flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION) == FlexContainer::ROW_REVERSE);
 
-  FlexContainer moved = std::move( flexContainer );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
-  DALI_TEST_CHECK( !flexContainer );
+  FlexContainer moved = std::move(flexContainer);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION) == FlexContainer::ROW_REVERSE);
+  DALI_TEST_CHECK(!flexContainer);
 
   END_TEST;
 }
@@ -132,11 +133,11 @@ int UtcDaliToolkitFlexContainerAssignmentOperatorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerAssingmentOperatorP");
   FlexContainer flexContainer = FlexContainer::New();
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE);
 
   FlexContainer copy = flexContainer;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION) == flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION));
   END_TEST;
 }
 
@@ -145,16 +146,16 @@ int UtcDaliFlexContainerMoveAssignment(void)
   ToolkitTestApplication application;
 
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_EQUALS( 1, flexContainer.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE );
-  DALI_TEST_CHECK( flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
+  DALI_TEST_EQUALS(1, flexContainer.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE);
+  DALI_TEST_CHECK(flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION) == FlexContainer::ROW_REVERSE);
 
   FlexContainer moved;
-  moved = std::move( flexContainer );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
-  DALI_TEST_CHECK( !flexContainer );
+  moved = std::move(flexContainer);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION) == FlexContainer::ROW_REVERSE);
+  DALI_TEST_CHECK(!flexContainer);
 
   END_TEST;
 }
@@ -165,15 +166,15 @@ int UtcDaliToolkitFlexContainerGetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerGetPropertyP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
 
   // Check Property Indices are correct
-  DALI_TEST_CHECK( flexContainer.GetPropertyIndex( PROPERTY_NAME_CONTENT_DIRECTION ) == FlexContainer::Property::CONTENT_DIRECTION );
-  DALI_TEST_CHECK( flexContainer.GetPropertyIndex( PROPERTY_NAME_FLEX_DIRECTION ) == FlexContainer::Property::FLEX_DIRECTION );
-  DALI_TEST_CHECK( flexContainer.GetPropertyIndex( PROPERTY_NAME_FLEX_WRAP ) == FlexContainer::Property::FLEX_WRAP );
-  DALI_TEST_CHECK( flexContainer.GetPropertyIndex( PROPERTY_NAME_JUSTIFY_CONTENT ) == FlexContainer::Property::JUSTIFY_CONTENT );
-  DALI_TEST_CHECK( flexContainer.GetPropertyIndex( PROPERTY_NAME_ALIGN_ITEMS ) == FlexContainer::Property::ALIGN_ITEMS );
-  DALI_TEST_CHECK( flexContainer.GetPropertyIndex( PROPERTY_NAME_ALIGN_CONTENT ) == FlexContainer::Property::ALIGN_CONTENT );
+  DALI_TEST_CHECK(flexContainer.GetPropertyIndex(PROPERTY_NAME_CONTENT_DIRECTION) == FlexContainer::Property::CONTENT_DIRECTION);
+  DALI_TEST_CHECK(flexContainer.GetPropertyIndex(PROPERTY_NAME_FLEX_DIRECTION) == FlexContainer::Property::FLEX_DIRECTION);
+  DALI_TEST_CHECK(flexContainer.GetPropertyIndex(PROPERTY_NAME_FLEX_WRAP) == FlexContainer::Property::FLEX_WRAP);
+  DALI_TEST_CHECK(flexContainer.GetPropertyIndex(PROPERTY_NAME_JUSTIFY_CONTENT) == FlexContainer::Property::JUSTIFY_CONTENT);
+  DALI_TEST_CHECK(flexContainer.GetPropertyIndex(PROPERTY_NAME_ALIGN_ITEMS) == FlexContainer::Property::ALIGN_ITEMS);
+  DALI_TEST_CHECK(flexContainer.GetPropertyIndex(PROPERTY_NAME_ALIGN_CONTENT) == FlexContainer::Property::ALIGN_CONTENT);
 
   END_TEST;
 }
@@ -183,90 +184,89 @@ int UtcDaliToolkitFlexContainerSetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerSetPropertyP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
 
   // Add flex container to the stage
-  application.GetScene().Add( flexContainer );
+  application.GetScene().Add(flexContainer);
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
   flexContainer.Add(actor1);
   flexContainer.Add(actor2);
 
   // Check content direction property.
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, FlexContainer::RTL );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::RTL, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, FlexContainer::RTL);
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::RTL, TEST_LOCATION);
 
   // Check flex direction property.
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::COLUMN_REVERSE );
-  DALI_TEST_EQUALS( (FlexContainer::FlexDirection)flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ), FlexContainer::COLUMN_REVERSE, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, FlexContainer::COLUMN_REVERSE);
+  DALI_TEST_EQUALS((FlexContainer::FlexDirection)flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION), FlexContainer::COLUMN_REVERSE, TEST_LOCATION);
 
   // Check flex wrap property.
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_WRAP, FlexContainer::WRAP );
-  DALI_TEST_EQUALS( (FlexContainer::WrapType)flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_WRAP ), FlexContainer::WRAP, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_WRAP, FlexContainer::WRAP);
+  DALI_TEST_EQUALS((FlexContainer::WrapType)flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_WRAP), FlexContainer::WRAP, TEST_LOCATION);
 
   // Check justify content property.
-  flexContainer.SetProperty( FlexContainer::Property::JUSTIFY_CONTENT, FlexContainer::JUSTIFY_SPACE_BETWEEN );
-  DALI_TEST_EQUALS( (FlexContainer::Justification)flexContainer.GetProperty<int>( FlexContainer::Property::JUSTIFY_CONTENT ), FlexContainer::JUSTIFY_SPACE_BETWEEN, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::JUSTIFY_CONTENT, FlexContainer::JUSTIFY_SPACE_BETWEEN);
+  DALI_TEST_EQUALS((FlexContainer::Justification)flexContainer.GetProperty<int>(FlexContainer::Property::JUSTIFY_CONTENT), FlexContainer::JUSTIFY_SPACE_BETWEEN, TEST_LOCATION);
 
   // Check align items property.
-  flexContainer.SetProperty( FlexContainer::Property::ALIGN_ITEMS, FlexContainer::ALIGN_FLEX_START );
-  DALI_TEST_EQUALS( (FlexContainer::Alignment)flexContainer.GetProperty<int>( FlexContainer::Property::ALIGN_ITEMS ), FlexContainer::ALIGN_FLEX_START, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::ALIGN_ITEMS, FlexContainer::ALIGN_FLEX_START);
+  DALI_TEST_EQUALS((FlexContainer::Alignment)flexContainer.GetProperty<int>(FlexContainer::Property::ALIGN_ITEMS), FlexContainer::ALIGN_FLEX_START, TEST_LOCATION);
 
   // Check align content property.
-  flexContainer.SetProperty( FlexContainer::Property::ALIGN_CONTENT, FlexContainer::ALIGN_STRETCH );
-  DALI_TEST_EQUALS( (FlexContainer::Alignment)flexContainer.GetProperty<int>( FlexContainer::Property::ALIGN_CONTENT ), FlexContainer::ALIGN_STRETCH, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::ALIGN_CONTENT, FlexContainer::ALIGN_STRETCH);
+  DALI_TEST_EQUALS((FlexContainer::Alignment)flexContainer.GetProperty<int>(FlexContainer::Property::ALIGN_CONTENT), FlexContainer::ALIGN_STRETCH, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliToolkitFlexContainerSetPropertyEnumP(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerSetPropertyEnumP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
 
   // Add flex container to the stage
-  application.GetScene().Add( flexContainer );
+  application.GetScene().Add(flexContainer);
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
   flexContainer.Add(actor1);
   flexContainer.Add(actor2);
 
   // Check content direction property.
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "RTL" );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::RTL, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, "RTL");
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::RTL, TEST_LOCATION);
 
   // Check flex direction property.
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, "columnReverse" );
-  DALI_TEST_EQUALS( (FlexContainer::FlexDirection)flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ), FlexContainer::COLUMN_REVERSE, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, "columnReverse");
+  DALI_TEST_EQUALS((FlexContainer::FlexDirection)flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION), FlexContainer::COLUMN_REVERSE, TEST_LOCATION);
 
   // Check flex wrap property.
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_WRAP, "wrap" );
-  DALI_TEST_EQUALS( (FlexContainer::WrapType)flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_WRAP ), FlexContainer::WRAP, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_WRAP, "wrap");
+  DALI_TEST_EQUALS((FlexContainer::WrapType)flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_WRAP), FlexContainer::WRAP, TEST_LOCATION);
 
   // Check justify content property.
-  flexContainer.SetProperty( FlexContainer::Property::JUSTIFY_CONTENT, "spaceBetween" );
-  DALI_TEST_EQUALS( (FlexContainer::Justification)flexContainer.GetProperty<int>( FlexContainer::Property::JUSTIFY_CONTENT ), FlexContainer::JUSTIFY_SPACE_BETWEEN, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::JUSTIFY_CONTENT, "spaceBetween");
+  DALI_TEST_EQUALS((FlexContainer::Justification)flexContainer.GetProperty<int>(FlexContainer::Property::JUSTIFY_CONTENT), FlexContainer::JUSTIFY_SPACE_BETWEEN, TEST_LOCATION);
 
   // Check align items property.
-  flexContainer.SetProperty( FlexContainer::Property::ALIGN_ITEMS, "flexStart" );
-  DALI_TEST_EQUALS( (FlexContainer::Alignment)flexContainer.GetProperty<int>( FlexContainer::Property::ALIGN_ITEMS ), FlexContainer::ALIGN_FLEX_START, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::ALIGN_ITEMS, "flexStart");
+  DALI_TEST_EQUALS((FlexContainer::Alignment)flexContainer.GetProperty<int>(FlexContainer::Property::ALIGN_ITEMS), FlexContainer::ALIGN_FLEX_START, TEST_LOCATION);
 
   // Check align content property.
-  flexContainer.SetProperty( FlexContainer::Property::ALIGN_CONTENT, "stretch" );
-  DALI_TEST_EQUALS( (FlexContainer::Alignment)flexContainer.GetProperty<int>( FlexContainer::Property::ALIGN_CONTENT ), FlexContainer::ALIGN_STRETCH, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::ALIGN_CONTENT, "stretch");
+  DALI_TEST_EQUALS((FlexContainer::Alignment)flexContainer.GetProperty<int>(FlexContainer::Property::ALIGN_CONTENT), FlexContainer::ALIGN_STRETCH, TEST_LOCATION);
 
   END_TEST;
 }
@@ -276,31 +276,31 @@ int UtcDaliToolkitFlexContainerSetChildPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerSetChildPropertyP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
 
   // Add flex container to the stage
-  application.GetScene().Add( flexContainer );
+  application.GetScene().Add(flexContainer);
 
   // Create an actor and add it to the container
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
   flexContainer.Add(actor);
 
   // Check flex child property.
-  actor.SetProperty( FlexContainer::ChildProperty::FLEX, 2.0f );
-  DALI_TEST_EQUALS( actor.GetProperty<float>( FlexContainer::ChildProperty::FLEX ), 2.0f, TEST_LOCATION );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( CHILD_PROPERTY_NAME_FLEX ) == FlexContainer::ChildProperty::FLEX );
+  actor.SetProperty(FlexContainer::ChildProperty::FLEX, 2.0f);
+  DALI_TEST_EQUALS(actor.GetProperty<float>(FlexContainer::ChildProperty::FLEX), 2.0f, TEST_LOCATION);
+  DALI_TEST_CHECK(actor.GetPropertyIndex(CHILD_PROPERTY_NAME_FLEX) == FlexContainer::ChildProperty::FLEX);
 
   // Check align self child property.
-  actor.SetProperty( FlexContainer::ChildProperty::ALIGN_SELF, FlexContainer::ALIGN_FLEX_END );
-  DALI_TEST_EQUALS( (FlexContainer::Alignment)actor.GetProperty<int>( FlexContainer::ChildProperty::ALIGN_SELF ), FlexContainer::ALIGN_FLEX_END, TEST_LOCATION );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( CHILD_PROPERTY_NAME_ALIGN_SELF ) == FlexContainer::ChildProperty::ALIGN_SELF );
+  actor.SetProperty(FlexContainer::ChildProperty::ALIGN_SELF, FlexContainer::ALIGN_FLEX_END);
+  DALI_TEST_EQUALS((FlexContainer::Alignment)actor.GetProperty<int>(FlexContainer::ChildProperty::ALIGN_SELF), FlexContainer::ALIGN_FLEX_END, TEST_LOCATION);
+  DALI_TEST_CHECK(actor.GetPropertyIndex(CHILD_PROPERTY_NAME_ALIGN_SELF) == FlexContainer::ChildProperty::ALIGN_SELF);
 
   // Check flex margin child property.
-  actor.SetProperty( FlexContainer::ChildProperty::FLEX_MARGIN, Vector4( 10.0f, 10.0f, 10.0f, 10.0f ) );
-  DALI_TEST_EQUALS( actor.GetProperty<Vector4>( FlexContainer::ChildProperty::FLEX_MARGIN ), Vector4( 10.0f, 10.0f, 10.0f, 10.0f ), TEST_LOCATION );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( CHILD_PROPERTY_NAME_FLEX_MARGIN ) == FlexContainer::ChildProperty::FLEX_MARGIN );
+  actor.SetProperty(FlexContainer::ChildProperty::FLEX_MARGIN, Vector4(10.0f, 10.0f, 10.0f, 10.0f));
+  DALI_TEST_EQUALS(actor.GetProperty<Vector4>(FlexContainer::ChildProperty::FLEX_MARGIN), Vector4(10.0f, 10.0f, 10.0f, 10.0f), TEST_LOCATION);
+  DALI_TEST_CHECK(actor.GetPropertyIndex(CHILD_PROPERTY_NAME_FLEX_MARGIN) == FlexContainer::ChildProperty::FLEX_MARGIN);
 
   application.SendNotification();
   application.Render();
@@ -308,23 +308,20 @@ int UtcDaliToolkitFlexContainerSetChildPropertyP(void)
   END_TEST;
 }
 
-
-
 //Functor to test whether RelayoutSignal is emitted
 class RelayoutSignalHandler : public Dali::ConnectionTracker
 {
 public:
-
-  RelayoutSignalHandler( FlexContainer& actor )
-  : mSignalVerified( false ),
-    mActor( actor )
+  RelayoutSignalHandler(FlexContainer& actor)
+  : mSignalVerified(false),
+    mActor(actor)
   {
   }
 
   // callback to be connected to RelayoutSignal
-  void RelayoutCallback( Actor actor  )
+  void RelayoutCallback(Actor actor)
   {
-    if( mActor == actor )
+    if(mActor == actor)
     {
       mSignalVerified = true;
     }
@@ -344,19 +341,19 @@ int UtcDaliToolkitFlexContainerRemoveChildP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerSetPropertyP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
 
   // Add flex container to the stage
-  application.GetScene().Add( flexContainer );
+  application.GetScene().Add(flexContainer);
 
   RelayoutSignalHandler relayoutSignal(flexContainer);
-  flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback );
+  flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback);
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
   flexContainer.Add(actor1);
   flexContainer.Add(actor2);
@@ -364,22 +361,22 @@ int UtcDaliToolkitFlexContainerRemoveChildP(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( relayoutSignal.mSignalVerified, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(relayoutSignal.mSignalVerified, true, TEST_LOCATION);
   relayoutSignal.Reset();
 
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
   flexContainer.Remove(actor1);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( relayoutSignal.mSignalVerified, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(relayoutSignal.mSignalVerified, true, TEST_LOCATION);
   relayoutSignal.Reset();
 
   flexContainer.Remove(actor2);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( relayoutSignal.mSignalVerified, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(relayoutSignal.mSignalVerified, true, TEST_LOCATION);
   relayoutSignal.Reset();
 
   END_TEST;
@@ -387,7 +384,6 @@ int UtcDaliToolkitFlexContainerRemoveChildP(void)
 
 namespace
 {
-
 // Functors to test whether PreFocusChange signal is emitted when the keyboard focus is about to change
 class PreFocusChangeCallback : public Dali::ConnectionTracker
 {
@@ -404,8 +400,8 @@ public:
     tet_infoline("Verifying PreFocusChangeCallback()");
 
     mSignalVerified = true;
-    mDirection = direction;
-    if( ! proposedActorToFocus )
+    mDirection      = direction;
+    if(!proposedActorToFocus)
     {
       return mFirstFocusActor;
     }
@@ -418,11 +414,11 @@ public:
   void Reset()
   {
     mSignalVerified = false;
-    mDirection = Control::KeyboardFocus::LEFT;
+    mDirection      = Control::KeyboardFocus::LEFT;
   }
 
-  bool& mSignalVerified;
-  Actor mFirstFocusActor;
+  bool&                             mSignalVerified;
+  Actor                             mFirstFocusActor;
   Control::KeyboardFocus::Direction mDirection;
 };
 
@@ -447,7 +443,7 @@ public:
     }
 
     mOriginalFocusedActor = originalFocusedActor;
-    mCurrentFocusedActor = currentFocusedActor;
+    mCurrentFocusedActor  = currentFocusedActor;
   }
 
   void Reset()
@@ -462,31 +458,30 @@ public:
 
 } // anonymous namespace
 
-
 int UtcDaliToolkitFlexContainerMoveFocus(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerSetPropertyP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
 
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW);
 
   // Add flex container to the stage
-  application.GetScene().Add( flexContainer );
+  application.GetScene().Add(flexContainer);
   Size stageSize = application.GetScene().GetSize();
 
   RelayoutSignalHandler relayoutSignal(flexContainer);
-  flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback );
-  flexContainer.SetProperty( Actor::Property::SIZE, stageSize );
+  flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback);
+  flexContainer.SetProperty(Actor::Property::SIZE, stageSize);
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  actor1.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-  actor2.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  actor1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  actor2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
   flexContainer.Add(actor1);
   flexContainer.Add(actor2);
@@ -497,13 +492,13 @@ int UtcDaliToolkitFlexContainerMoveFocus(void)
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool preFocusChangeSignalVerified = false;
+  bool                   preFocusChangeSignalVerified = false;
   PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified, actor1);
-  manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
+  manager.PreFocusChangeSignal().Connect(&preFocusChangeCallback, &PreFocusChangeCallback::Callback);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
   // Move the focus to the right
   DALI_TEST_EQUALS(manager.MoveFocus(Control::KeyboardFocus::RIGHT), true, TEST_LOCATION);
@@ -538,58 +533,58 @@ int UtcDaliToolkitFlexContainerRTLSupportP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexContainerRTLSupportP");
   FlexContainer flexContainer = FlexContainer::New();
-  DALI_TEST_CHECK( flexContainer );
+  DALI_TEST_CHECK(flexContainer);
 
   Actor actor0 = Actor::New();
 
-  application.GetScene().Add( actor0 );
-  actor0.Add( flexContainer );
+  application.GetScene().Add(actor0);
+  actor0.Add(flexContainer);
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
   flexContainer.Add(actor1);
   flexContainer.Add(actor2);
 
   // Check flex direction property.
-  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, "row" );
-  DALI_TEST_EQUALS( (FlexContainer::FlexDirection)flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ), FlexContainer::ROW, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::FLEX_DIRECTION, "row");
+  DALI_TEST_EQUALS((FlexContainer::FlexDirection)flexContainer.GetProperty<int>(FlexContainer::Property::FLEX_DIRECTION), FlexContainer::ROW, TEST_LOCATION);
 
   // Check content direction property.
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::INHERIT, TEST_LOCATION );
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::INHERIT, TEST_LOCATION);
 
-  actor0.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::RTL, TEST_LOCATION );
+  actor0.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT);
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::RTL, TEST_LOCATION);
 
-  actor0.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
+  actor0.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT);
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::LTR, TEST_LOCATION);
 
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "RTL" );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::RTL, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, "RTL");
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::RTL, TEST_LOCATION);
 
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "LTR" );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, "LTR");
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::LTR, TEST_LOCATION);
 
-  actor0.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
+  actor0.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT);
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::LTR, TEST_LOCATION);
 
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "inherit" );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::RTL, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, "inherit");
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::RTL, TEST_LOCATION);
 
-  actor0.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
+  actor0.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT);
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::LTR, TEST_LOCATION);
 
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "inherit" );
-  DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, "inherit");
+  DALI_TEST_EQUALS((FlexContainer::ContentDirection)flexContainer.GetProperty<int>(FlexContainer::Property::CONTENT_DIRECTION), FlexContainer::LTR, TEST_LOCATION);
 
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "LTR" );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, "LTR");
   application.SendNotification();
   application.Render();
 
-  flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "RTL" );
+  flexContainer.SetProperty(FlexContainer::Property::CONTENT_DIRECTION, "RTL");
   application.SendNotification();
   application.Render();
 
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp
index 307c149..6cef66a 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,14 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/actor-devel.h>
 #include <dali-toolkit/devel-api/layouting/flex-node.h>
+#include <dali/devel-api/actors/actor-devel.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -37,28 +39,27 @@ void dali_flexNodeContainer_cleanup(void)
 
 namespace
 {
+const Flex::SizeTuple ITEM_SIZE               = Flex::SizeTuple{10.0f, 10.0f};
+const Flex::SizeTuple ITEM_SIZE_CALLBACK_TEST = Flex::SizeTuple{15.0f, 15.0f};
 
-const Flex::SizeTuple ITEM_SIZE = Flex::SizeTuple{ 10.0f, 10.0f };
-const Flex::SizeTuple ITEM_SIZE_CALLBACK_TEST = Flex::SizeTuple{ 15.0f, 15.0f };
-
-void MeasureChild( Actor child, float width, int measureModeWidth, float height, int measureModeHeight, Flex::SizeTuple *childSize)
+void MeasureChild(Actor child, float width, int measureModeWidth, float height, int measureModeHeight, Flex::SizeTuple* childSize)
 {
   *childSize = ITEM_SIZE;
-  if (child.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "callbackTest")
+  if(child.GetProperty<std::string>(Dali::Actor::Property::NAME) == "callbackTest")
   {
     *childSize = ITEM_SIZE_CALLBACK_TEST;
   }
-  tet_printf(" MeasureChild test callback executed (%f,%f)\n", childSize->width, childSize->height );
+  tet_printf(" MeasureChild test callback executed (%f,%f)\n", childSize->width, childSize->height);
 }
 
-}
+} // namespace
 
 int UtcDaliToolkitFlexNodeConstructorP(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexNodeNewP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
   END_TEST;
 }
 
@@ -67,19 +68,19 @@ int UtcDaliToolkitFlexNodeAddChildWithMarginP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexNodeAddChildWithMarginP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Position elements as a Row
   flexNode->SetFlexDirection(Flex::FlexDirection::ROW);
 
   // Create two actors and add them to the parent flex node
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  Extents margin( 5,5,5,5);
+  Extents margin(5, 5, 5, 5);
   flexNode->AddChild(actor, margin, &MeasureChild, 0);
 
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION );
+  DALI_TEST_EQUALS((int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION);
 
   flexNode->CalculateLayout(480, 800, false);
 
@@ -87,7 +88,9 @@ int UtcDaliToolkitFlexNodeAddChildWithMarginP(void)
 
   tet_printf("Actor frame(left:%f,top:%f,right:%f,bottom:%f)\n", actorFrame.x, actorFrame.y, actorFrame.z, actorFrame.w);
 
-  DALI_TEST_EQUALS( actorFrame, Vector4( 5.0f, 5.0f, ITEM_SIZE.width+5, ITEM_SIZE.height+5 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actorFrame, Vector4(5.0f, 5.0f, ITEM_SIZE.width + 5, ITEM_SIZE.height + 5), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -97,7 +100,7 @@ int UtcDaliToolkitFlexNodeAddChildrenRowP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexNodeAddChildrenRowP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Position elements as a Row
   flexNode->SetFlexDirection(Flex::FlexDirection::ROW);
@@ -105,13 +108,13 @@ int UtcDaliToolkitFlexNodeAddChildrenRowP(void)
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION );
+  DALI_TEST_EQUALS((int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION);
 
   flexNode->CalculateLayout(480, 800, false);
 
@@ -121,8 +124,10 @@ int UtcDaliToolkitFlexNodeAddChildrenRowP(void)
   tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w);
   tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w);
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -132,7 +137,7 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnP(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToolkitFlexNodeAddChildrenColumnP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Position elements in a Column
   flexNode->SetFlexDirection(Flex::FlexDirection::COLUMN);
@@ -140,66 +145,67 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnP(void)
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
   flexNode->CalculateLayout(480, 800, false);
 
-  Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root
-  Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
+  Vector4 root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  Vector4 actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  Vector4 actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
   tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w);
   tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w);
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height *2 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
 
-
 int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void)
 {
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToolkitFlexNodeAddChildrenColumnJustify");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Position elements in a Column
   flexNode->SetFlexDirection(Flex::FlexDirection::COLUMN);
 
   tet_infoline("Justify to the Start, align to start, third item should be displayed at the top and the end");
   flexNode->SetFlexJustification(Flex::Justification::FLEX_START);
-  flexNode->SetFlexItemsAlignment( Flex::Alignment::FLEX_START );
+  flexNode->SetFlexItemsAlignment(Flex::Alignment::FLEX_START);
 
   // Create three actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
   Actor actor3 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
-  DALI_TEST_CHECK( actor3 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
+  DALI_TEST_CHECK(actor3);
 
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION );
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION );
+  DALI_TEST_EQUALS((int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION);
+  DALI_TEST_EQUALS((int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
-  Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0,0,0,0), &MeasureChild, 2);
-  actor3node->SetFlexAlignmentSelf( Flex::Alignment::FLEX_END );
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
+  Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0, 0, 0, 0), &MeasureChild, 2);
+  actor3node->SetFlexAlignmentSelf(Flex::Alignment::FLEX_END);
 
   flexNode->CalculateLayout(480, 800, false);
 
-  Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root
-  Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
-  Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child
+  Vector4 root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  Vector4 actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  Vector4 actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
+  Vector4 actor3Frame = flexNode->GetNodeFrame(2);  // 2 is third child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -217,21 +223,21 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void)
     ---------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height *2 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3Frame, Vector4( root.z - ITEM_SIZE.width, ITEM_SIZE.height *2, root.z, ITEM_SIZE.height *3 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3Frame, Vector4(root.z - ITEM_SIZE.width, ITEM_SIZE.height * 2, root.z, ITEM_SIZE.height * 3), TEST_LOCATION);
 
   tet_infoline(" Justify to the End, items should now be displayed at the bottom, third item should now be displayed at the end");
-  flexNode->SetFlexJustification( Flex::Justification::FLEX_END );
-  flexNode->SetFlexItemsAlignment( Flex::Alignment::FLEX_START );
+  flexNode->SetFlexJustification(Flex::Justification::FLEX_END);
+  flexNode->SetFlexItemsAlignment(Flex::Alignment::FLEX_START);
 
   // Recalulate layout
   flexNode->CalculateLayout(480, 800, false);
 
-  root = flexNode->GetNodeFrame(-1); // -1 is the root
-  actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
-  actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child
+  root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
+  actor3Frame = flexNode->GetNodeFrame(2);  // 2 is third child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -249,20 +255,20 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void)
     ---------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, root.w - (ITEM_SIZE.height*3), ITEM_SIZE.width,  root.w - (ITEM_SIZE.height*2) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, root.w - (ITEM_SIZE.height*2), ITEM_SIZE.width, root.w - ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3Frame, Vector4( root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, root.w - (ITEM_SIZE.height * 3), ITEM_SIZE.width, root.w - (ITEM_SIZE.height * 2)), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, root.w - (ITEM_SIZE.height * 2), ITEM_SIZE.width, root.w - ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3Frame, Vector4(root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w), TEST_LOCATION);
 
   tet_infoline(" Align to End, items should now be displayed at the bottom and the end");
-  flexNode->SetFlexJustification( Flex::Justification::FLEX_END );
-  flexNode->SetFlexItemsAlignment( Flex::Alignment::FLEX_END );
+  flexNode->SetFlexJustification(Flex::Justification::FLEX_END);
+  flexNode->SetFlexItemsAlignment(Flex::Alignment::FLEX_END);
   // Recalulate layout
   flexNode->CalculateLayout(480, 800, false);
 
-  root = flexNode->GetNodeFrame(-1); // -1 is the root
-  actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
-  actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child
+  root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
+  actor3Frame = flexNode->GetNodeFrame(2);  // 2 is third child
 
   tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w);
   tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w);
@@ -278,9 +284,11 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void)
     ---------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height*3), root.z,  root.w - (ITEM_SIZE.height*2) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height*2), root.z,  root.w - ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3Frame, Vector4( root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height * 3), root.z, root.w - (ITEM_SIZE.height * 2)), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height * 2), root.z, root.w - ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3Frame, Vector4(root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -290,21 +298,23 @@ int UtcDaliToolkitFlexNodeSizingP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexNodeSizingP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
   flexNode->CalculateLayout(480, 800, false);
 
-  DALI_TEST_EQUALS( flexNode->GetFlexWidth(), 480.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( flexNode->GetFlexHeight(), 800.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(flexNode->GetFlexWidth(), 480.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(flexNode->GetFlexHeight(), 800.0f, TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -314,12 +324,12 @@ int UtcDaliToolkitFlexNodeWrapModeP(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToolkitFlexNodeWrapModeP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Position elements in a Column
-  flexNode->SetFlexDirection( Flex::FlexDirection::ROW );
-  flexNode->SetFlexAlignment( Flex::Alignment::FLEX_START );
-  flexNode->SetFlexWrap( Flex::WrapType::NO_WRAP );
+  flexNode->SetFlexDirection(Flex::FlexDirection::ROW);
+  flexNode->SetFlexAlignment(Flex::Alignment::FLEX_START);
+  flexNode->SetFlexWrap(Flex::WrapType::NO_WRAP);
 
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
@@ -327,23 +337,23 @@ int UtcDaliToolkitFlexNodeWrapModeP(void)
   Actor actor3 = Actor::New();
   Actor actor4 = Actor::New();
 
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION );
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION );
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION );
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexWrap(), (int)Flex::WrapType::NO_WRAP, TEST_LOCATION );
+  DALI_TEST_EQUALS((int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION);
+  DALI_TEST_EQUALS((int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION);
+  DALI_TEST_EQUALS((int)flexNode->GetFlexAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION);
+  DALI_TEST_EQUALS((int)flexNode->GetFlexWrap(), (int)Flex::WrapType::NO_WRAP, TEST_LOCATION);
 
-  flexNode->AddChild( actor1, Extents(0,0,0,0), &MeasureChild, 0 );
-  flexNode->AddChild( actor2, Extents(0,0,0,0), &MeasureChild, 1 );
-  flexNode->AddChild( actor2, Extents(0,0,0,0), &MeasureChild, 2 );
-  flexNode->AddChild( actor2, Extents(0,0,0,0), &MeasureChild, 3 );
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 2);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 3);
 
   flexNode->CalculateLayout(30, 800, false);
 
-  Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root
-  Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
-  Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is first child
-  Vector4 actor4Frame = flexNode->GetNodeFrame(3); // 3 is second child
+  Vector4 root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  Vector4 actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  Vector4 actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
+  Vector4 actor3Frame = flexNode->GetNodeFrame(2);  // 2 is first child
+  Vector4 actor4Frame = flexNode->GetNodeFrame(3);  // 3 is second child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
   tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w);
@@ -361,17 +371,17 @@ int UtcDaliToolkitFlexNodeWrapModeP(void)
     -------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f,            0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( ITEM_SIZE.width, 0.0f, ITEM_SIZE.width*2, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3Frame, Vector4( ITEM_SIZE.width*2, 0.0f, ITEM_SIZE.width*3, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor4Frame, Vector4( ITEM_SIZE.width*3, 0.0f, ITEM_SIZE.width*4, ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3Frame, Vector4(ITEM_SIZE.width * 2, 0.0f, ITEM_SIZE.width * 3, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor4Frame, Vector4(ITEM_SIZE.width * 3, 0.0f, ITEM_SIZE.width * 4, ITEM_SIZE.height), TEST_LOCATION);
 
-  flexNode->SetFlexWrap( Flex::WrapType::WRAP );
+  flexNode->SetFlexWrap(Flex::WrapType::WRAP);
 
-  flexNode->CalculateLayout( 30, 800, false );
+  flexNode->CalculateLayout(30, 800, false);
   root = flexNode->GetNodeFrame(-1); // -1 is the root
 
-  DALI_TEST_EQUALS( (int)flexNode->GetFlexWrap(), (int)Flex::WrapType::WRAP, TEST_LOCATION );
+  DALI_TEST_EQUALS((int)flexNode->GetFlexWrap(), (int)Flex::WrapType::WRAP, TEST_LOCATION);
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
   actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
@@ -394,11 +404,12 @@ int UtcDaliToolkitFlexNodeWrapModeP(void)
     -------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f,            0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( ITEM_SIZE.width, 0.0f, ITEM_SIZE.width*2, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3Frame, Vector4( ITEM_SIZE.width*2, 0.0f, ITEM_SIZE.width*3, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor4Frame, Vector4( 0.0,ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height*2 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3Frame, Vector4(ITEM_SIZE.width * 2, 0.0f, ITEM_SIZE.width * 3, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor4Frame, Vector4(0.0, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION);
 
+  delete flexNode;
 
   END_TEST;
 }
@@ -408,19 +419,19 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexNodeRemoveChildP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2");
+  actor1.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor2.SetProperty(Dali::Actor::Property::NAME, "Actor2");
 
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
   flexNode->CalculateLayout(480, 800, false);
 
@@ -430,7 +441,7 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void)
   tet_printf("Actor 1 frame(%f,%f,%f,%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w);
   tet_printf("Actor 2 frame(%f,%f,%f,%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w);
 
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.width, ITEM_SIZE.width, ITEM_SIZE.height*2 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.width, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION);
 
   flexNode->RemoveChild(actor1);
 
@@ -441,7 +452,9 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void)
   tet_printf("Actor 1 frame(%f,%f,%f,%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w);
   tet_printf("Actor 2 frame(%f,%f,%f,%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w);
 
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -451,19 +464,19 @@ int UtcDaliToolkitFlexNodeRemoveAllChildrenP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexNodeRemoveAllChildrenP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2");
+  actor1.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor2.SetProperty(Dali::Actor::Property::NAME, "Actor2");
 
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
   flexNode->CalculateLayout(480, 800, false);
 
@@ -484,8 +497,10 @@ int UtcDaliToolkitFlexNodeRemoveAllChildrenP(void)
   tet_printf("Actor 1 frame(%f,%f,%f,%f)\n", actor1FrameRemoved.x, actor1FrameRemoved.y, actor1FrameRemoved.z, actor1FrameRemoved.w);
   tet_printf("Actor 2 frame(%f,%f,%f,%f)\n", actor2FrameRemoved.x, actor2FrameRemoved.y, actor2FrameRemoved.z, actor2FrameRemoved.w);
 
-  DALI_TEST_NOT_EQUALS( actor1Frame, actor1FrameRemoved, 0.1, TEST_LOCATION );
-  DALI_TEST_NOT_EQUALS( actor2Frame, actor2FrameRemoved, 0.1, TEST_LOCATION );
+  DALI_TEST_NOT_EQUALS(actor1Frame, actor1FrameRemoved, 0.1, TEST_LOCATION);
+  DALI_TEST_NOT_EQUALS(actor2Frame, actor2FrameRemoved, 0.1, TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -495,23 +510,23 @@ int UtcDaliToolkitFlexNodePaddingMarginP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitFlexNodePaddingMarginP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
-  flexNode->SetFlexDirection( Flex::FlexDirection::ROW );
+  DALI_TEST_CHECK(flexNode);
+  flexNode->SetFlexDirection(Flex::FlexDirection::ROW);
 
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
-  Extents padding( 5,5,5,5);
-  Extents margin( 5,5,5,5);
+  Extents padding(5, 5, 5, 5);
+  Extents margin(5, 5, 5, 5);
 
-  flexNode->SetPadding( padding );
-  flexNode->SetMargin( margin );
+  flexNode->SetPadding(padding);
+  flexNode->SetMargin(margin);
 
   flexNode->CalculateLayout(480, 800, false);
 
@@ -526,8 +541,10 @@ int UtcDaliToolkitFlexNodePaddingMarginP(void)
   |ppppp|
   -------
   */
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 5.0f, 5.0f, ITEM_SIZE.width +5 , ITEM_SIZE.height + 5 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 5+ ITEM_SIZE.width, 5.0f, (ITEM_SIZE.width*2) +5, ITEM_SIZE.height +5 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(5.0f, 5.0f, ITEM_SIZE.width + 5, ITEM_SIZE.height + 5), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(5 + ITEM_SIZE.width, 5.0f, (ITEM_SIZE.width * 2) + 5, ITEM_SIZE.height + 5), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -537,7 +554,7 @@ int UtcDaliToolkitFlexNodeCallbackTestP(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToolkitFlexNodeCallbackTestP");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Position elements in a Column
   flexNode->SetFlexDirection(Flex::FlexDirection::COLUMN);
@@ -546,27 +563,29 @@ int UtcDaliToolkitFlexNodeCallbackTestP(void)
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
 
-  actor1.SetProperty( Dali::Actor::Property::NAME,"callbackTest");
+  actor1.SetProperty(Dali::Actor::Property::NAME, "callbackTest");
 
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
   flexNode->CalculateLayout(480, 800, false);
 
-  Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root
-  Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
+  Vector4 root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  Vector4 actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  Vector4 actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
   tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w);
   tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w);
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE_CALLBACK_TEST.width, ITEM_SIZE_CALLBACK_TEST.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE_CALLBACK_TEST.height, ITEM_SIZE.width, ITEM_SIZE_CALLBACK_TEST.height + ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE_CALLBACK_TEST.width, ITEM_SIZE_CALLBACK_TEST.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE_CALLBACK_TEST.height, ITEM_SIZE.width, ITEM_SIZE_CALLBACK_TEST.height + ITEM_SIZE.height), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -576,26 +595,26 @@ int UtcDaliToolkitFlexNodeFlexPositionType(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToolkitFlexNodeFlexPositionType");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   tet_infoline(" FlexPositionType is RELATIVE by default");
 
   // Create two actors and add them to the parent flex node
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
 
-  flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
+  flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
 
-  DALI_TEST_EQUALS( (int)actor2node->GetFlexPositionType(), (int)Flex::PositionType::RELATIVE, TEST_LOCATION );
+  DALI_TEST_EQUALS((int)actor2node->GetFlexPositionType(), (int)Flex::PositionType::RELATIVE, TEST_LOCATION);
 
   flexNode->CalculateLayout(480, 800, false);
 
-  Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root
-  Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
+  Vector4 root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  Vector4 actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  Vector4 actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -612,18 +631,18 @@ int UtcDaliToolkitFlexNodeFlexPositionType(void)
     ---------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height *2 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION);
 
   tet_infoline(" ABSOLUTE FlexPositionType, second item should now be ignore any properties");
-  actor2node->SetFlexPositionType( Flex::PositionType::ABSOLUTE );
+  actor2node->SetFlexPositionType(Flex::PositionType::ABSOLUTE);
 
   // Recalulate layout
   flexNode->CalculateLayout(480, 800, false);
 
-  root = flexNode->GetNodeFrame(-1); // -1 is the root
-  actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
+  root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -640,8 +659,10 @@ int UtcDaliToolkitFlexNodeFlexPositionType(void)
     ---------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -651,22 +672,22 @@ int UtcDaliToolkitFlexNodeFlexAspectRatio(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToolkitFlexNodeFlexAspectRatio");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Create a actor and add them to the parent flex node
   Actor actor1 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
+  DALI_TEST_CHECK(actor1);
 
   tet_infoline(" 1.0 FlexAspectRatio");
-  Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
+  Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
   actor1node->SetFlexAspectRatio(1.0);
 
-  DALI_TEST_EQUALS( actor1node->GetFlexAspectRatio(), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1node->GetFlexAspectRatio(), 1.0f, TEST_LOCATION);
 
   flexNode->CalculateLayout(480, 800, false);
 
-  Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root
-  Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
+  Vector4 root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  Vector4 actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -682,18 +703,18 @@ int UtcDaliToolkitFlexNodeFlexAspectRatio(void)
     ---------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION);
 
   tet_infoline(" 2.0 FlexAspectRatio");
   actor1node->SetFlexAspectRatio(2.0);
 
-  DALI_TEST_EQUALS( actor1node->GetFlexAspectRatio(), 2.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1node->GetFlexAspectRatio(), 2.0f, TEST_LOCATION);
 
   // Recalulate layout
   flexNode->CalculateLayout(480, 800, false);
 
-  root = flexNode->GetNodeFrame(-1); // -1 is the root
-  actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
+  root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -709,7 +730,9 @@ int UtcDaliToolkitFlexNodeFlexAspectRatio(void)
     ---------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width*2, ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
@@ -719,7 +742,7 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToolkitFlexNodeFlexBasisShrinkGrow");
   Flex::Node* flexNode = new Flex::Node();
-  DALI_TEST_CHECK( flexNode );
+  DALI_TEST_CHECK(flexNode);
 
   // Position elements as a Row
   flexNode->SetFlexDirection(Flex::FlexDirection::ROW);
@@ -728,13 +751,13 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void)
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
   Actor actor3 = Actor::New();
-  DALI_TEST_CHECK( actor1 );
-  DALI_TEST_CHECK( actor2 );
-  DALI_TEST_CHECK( actor3 );
+  DALI_TEST_CHECK(actor1);
+  DALI_TEST_CHECK(actor2);
+  DALI_TEST_CHECK(actor3);
 
-  Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0);
-  Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1);
-  Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0,0,0,0), &MeasureChild, 2);
+  Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0);
+  Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1);
+  Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0, 0, 0, 0), &MeasureChild, 2);
 
   float basis = 5;
 
@@ -748,16 +771,16 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void)
   actor2node->SetFlexBasis(basis);
   actor3node->SetFlexBasis(basis);
 
-  DALI_TEST_EQUALS( actor1node->GetFlexGrow(), 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor1node->GetFlexShrink(), 1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor1node->GetFlexBasis(), basis, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1node->GetFlexGrow(), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor1node->GetFlexShrink(), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor1node->GetFlexBasis(), basis, TEST_LOCATION);
 
   flexNode->CalculateLayout(600, 200, false);
 
-  Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root
-  Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
-  Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child
+  Vector4 root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  Vector4 actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  Vector4 actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
+  Vector4 actor3Frame = flexNode->GetNodeFrame(2);  // 2 is third child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -772,10 +795,9 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void)
     -------------------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, basis, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( basis, 0.0f, basis*2, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3Frame, Vector4( basis*2, 0.0f, basis*3, ITEM_SIZE.height ), TEST_LOCATION );
-
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, basis, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(basis, 0.0f, basis * 2, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3Frame, Vector4(basis * 2, 0.0f, basis * 3, ITEM_SIZE.height), TEST_LOCATION);
 
   actor2node->SetFlexGrow(1.0);
   actor3node->SetFlexGrow(1.0);
@@ -783,10 +805,10 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void)
   // Recalulate layout
   flexNode->CalculateLayout(605, 200, false);
 
-  root = flexNode->GetNodeFrame(-1); // -1 is the root
-  actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child
-  actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child
-  actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child
+  root        = flexNode->GetNodeFrame(-1); // -1 is the root
+  actor1Frame = flexNode->GetNodeFrame(0);  // 0 is first child
+  actor2Frame = flexNode->GetNodeFrame(1);  // 1 is second child
+  actor3Frame = flexNode->GetNodeFrame(2);  // 2 is third child
 
   tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w);
 
@@ -801,9 +823,11 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void)
     -------------------
   */
 
-  DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, basis, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2Frame, Vector4( basis, 0.0f, basis + (root.z-basis)/2, ITEM_SIZE.height ), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3Frame, Vector4( basis + (root.z-basis)/2, 0.0f, root.z, ITEM_SIZE.height ), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, basis, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2Frame, Vector4(basis, 0.0f, basis + (root.z - basis) / 2, ITEM_SIZE.height), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3Frame, Vector4(basis + (root.z - basis) / 2, 0.0f, root.z, ITEM_SIZE.height), TEST_LOCATION);
+
+  delete flexNode;
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
index 1f30c929..41393d8 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 
@@ -42,23 +44,23 @@ void utc_gaussian_blur_view_cleanup(void)
 class TestCallback : public ConnectionTracker
 {
 public:
-  TestCallback( Dali::Toolkit::GaussianBlurView& blurView )
-  : mBlurView( blurView )
+  TestCallback(Dali::Toolkit::GaussianBlurView& blurView)
+  : mBlurView(blurView)
   {
     mFinished = false;
   }
 
   void Connect()
   {
-    mBlurView.FinishedSignal().Connect( this, &TestCallback::OnFinished );
+    mBlurView.FinishedSignal().Connect(this, &TestCallback::OnFinished);
   }
 
-  void OnFinished( Dali::Toolkit::GaussianBlurView source )
+  void OnFinished(Dali::Toolkit::GaussianBlurView source)
   {
     mFinished = true;
   }
 
-  bool mFinished;
+  bool                             mFinished;
   Dali::Toolkit::GaussianBlurView& mBlurView;
 };
 
@@ -74,13 +76,13 @@ int UtcDaliGaussianBlurViewUninitialized(void)
   {
     // New() must be called to create a GaussianBlurView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
@@ -93,10 +95,10 @@ int UtcDaliGaussianBlurViewNew(void)
   tet_infoline("UtcDaliGaussianBlurViewNew");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Toolkit::GaussianBlurView view2 = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, false);
-  DALI_TEST_CHECK( view2 );
+  DALI_TEST_CHECK(view2);
   END_TEST;
 }
 
@@ -107,16 +109,15 @@ int UtcDaliGaussianBlurViewDownCast(void)
   tet_infoline("UtcDaliGaussianBlurViewDownCast");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  BaseHandle handle(view);
+  BaseHandle                handle(view);
 
-  Toolkit::GaussianBlurView gaussianBlurView = Toolkit::GaussianBlurView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( gaussianBlurView );
-  DALI_TEST_CHECK( gaussianBlurView == view );
+  Toolkit::GaussianBlurView gaussianBlurView = Toolkit::GaussianBlurView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(gaussianBlurView);
+  DALI_TEST_CHECK(gaussianBlurView == view);
   END_TEST;
 }
 
-
 // Positive test case for a method
 int UtcDaliGaussianBlurViewPropertyNames(void)
 {
@@ -124,11 +125,11 @@ int UtcDaliGaussianBlurViewPropertyNames(void)
   tet_infoline("UtcDaliGaussianBlurViewPropertyNames");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // Check the names, this names are used in the shader code,
   // if they change in the shader code, then it has to be updated here.
-  DALI_TEST_EQUALS( view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("GaussianBlurStrengthPropertyName"), TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("GaussianBlurStrengthPropertyName"), TEST_LOCATION);
   END_TEST;
 }
 
@@ -139,22 +140,21 @@ int UtcDaliGaussianBlurViewAddRemove(void)
   tet_infoline("UtcDaliGaussianBlurViewAddRemove");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
-
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(actor);
   application.GetScene().Add(view);
 
-  DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
   view.Remove(actor);
 
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
@@ -165,26 +165,26 @@ int UtcDaliGaussianBlurActivateDeactivate(void)
   tet_infoline("UtcDaliGaussianBlurActivateDeactivate");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   RenderTaskList taskList = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList.GetTaskCount());
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.Activate();
 
   RenderTaskList taskList2 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
-  DALI_TEST_CHECK( 2u == view.GetChildCount() );
+  DALI_TEST_CHECK(1u != taskList2.GetTaskCount());
+  DALI_TEST_CHECK(2u == view.GetChildCount());
 
   view.Deactivate();
 
   RenderTaskList taskList3 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
-  DALI_TEST_CHECK( 1u == view.GetChildCount() );
+  DALI_TEST_CHECK(1u == taskList3.GetTaskCount());
+  DALI_TEST_CHECK(1u == view.GetChildCount());
 
   END_TEST;
 }
@@ -192,18 +192,17 @@ int UtcDaliGaussianBlurActivateDeactivate(void)
 // Positive test case for a method
 int UtcDaliGaussianBlurActivateDeactivateRepeat(void)
 {
-#ifdef OLD_GRAPHICS_TEST // NEeds framebuffers implementing
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction&     gl           = application.GetGlAbstraction();
+  TraceCallStack&        textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
   tet_infoline("UtcDaliGaussianBlurActivateDeactivateRepeat");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.Activate();
@@ -211,24 +210,21 @@ int UtcDaliGaussianBlurActivateDeactivateRepeat(void)
   application.SendNotification();
   application.Render(20);
 
-  DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 3, TEST_LOCATION);
 
   view.Deactivate();
 
   application.SendNotification();
   application.Render(20);
 
-  DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 3, TEST_LOCATION);
 
   view.Activate();
 
   application.SendNotification();
   application.Render(20);
 
-  DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 6, TEST_LOCATION);
-#else
-  tet_result(TET_PASS);
-#endif
+  DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 6, TEST_LOCATION);
   END_TEST;
 }
 
@@ -239,11 +235,11 @@ int UtcDaliGaussianBlurViewSetGetBackgroundColor(void)
   tet_infoline("UtcDaliGaussianBlurViewSetGetBackgroundColor");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   view.SetBackgroundColor(Dali::Color::RED);
   Vector4 color = view.GetBackgroundColor();
-  DALI_TEST_CHECK( color == Dali::Color::RED );
+  DALI_TEST_CHECK(color == Dali::Color::RED);
   END_TEST;
 }
 
@@ -254,21 +250,21 @@ int UtcDaliGaussianBlurViewSetGetRenderTarget(void)
   tet_infoline("UtcDaliGaussianBlurViewSetGetRenderTarget");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, true);
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.Activate();
 
-  PixelData pixels = Toolkit::SyncImageLoader::Load( TEST_IMAGE_FILE_NAME );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight() );
-  texture.Upload( pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight() );
+  PixelData pixels  = Toolkit::SyncImageLoader::Load(TEST_IMAGE_FILE_NAME);
+  Texture   texture = Texture::New(TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight());
+  texture.Upload(pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight());
 
-  FrameBuffer renderTarget = FrameBuffer::New( 480, 800, FrameBuffer::Attachment::NONE );
+  FrameBuffer renderTarget = FrameBuffer::New(480, 800, FrameBuffer::Attachment::NONE);
   view.SetUserImageAndOutputRenderTarget(texture, renderTarget);
-  DALI_TEST_CHECK( view.GetBlurredRenderTarget() == renderTarget );
+  DALI_TEST_CHECK(view.GetBlurredRenderTarget() == renderTarget);
   END_TEST;
 }
 
@@ -278,19 +274,19 @@ int UtcDaliGaussianBlurViewActivateOnce1(void)
   tet_infoline("UtcDaliGaussianBlurActivateOnce1");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, true);
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   RenderTaskList taskList = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList.GetTaskCount());
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.ActivateOnce();
 
   RenderTaskList taskList2 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
+  DALI_TEST_CHECK(1u != taskList2.GetTaskCount());
   application.Render();
 
   END_TEST;
@@ -299,18 +295,17 @@ int UtcDaliGaussianBlurViewActivateOnce1(void)
 // Positive test case for a method
 int UtcDaliGaussianBlurActivateOnce2(void)
 {
-#ifdef OLD_GRAPHICS_TEST // requires framebuffers to be implemented
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction&     gl           = application.GetGlAbstraction();
+  TraceCallStack&        textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
   tet_infoline("UtcDaliGaussianBlurActivateOnce2");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.ActivateOnce();
@@ -318,18 +313,14 @@ int UtcDaliGaussianBlurActivateOnce2(void)
   application.SendNotification();
   application.Render(20);
 
-  DALI_TEST_CHECK( gl.GetLastGenTextureId() == 3 );
+  DALI_TEST_CHECK(gl.GetLastGenTextureId() == 3);
 
   view.ActivateOnce();
 
   application.SendNotification();
   application.Render(20);
 
-  DALI_TEST_CHECK( gl.GetLastGenTextureId() == 6 );
-
-#else
-  tet_result(TET_PASS);
-#endif
+  DALI_TEST_CHECK(gl.GetLastGenTextureId() == 6);
 
   END_TEST;
 }
@@ -340,16 +331,16 @@ int UtcDaliGaussianBlurViewFinishedSignalN(void)
   tet_infoline("UtcDaliGaussianBlurViewFinishedSignalN");
 
   Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, true);
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.Activate();
 
-  TestCallback callback( view );
-  DALI_TEST_CHECK( callback.mFinished == false );
+  TestCallback callback(view);
+  DALI_TEST_CHECK(callback.mFinished == false);
 
   callback.Connect();
 
@@ -357,7 +348,7 @@ int UtcDaliGaussianBlurViewFinishedSignalN(void)
   application.SendNotification();
 
   // FinishedSignal is only for ActivateOnce()
-  DALI_TEST_CHECK( callback.mFinished == false );
+  DALI_TEST_CHECK(callback.mFinished == false);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp
new file mode 100644
index 0000000..8fc3799
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <unistd.h>
+#include <thread>
+
+#include <dali-toolkit-test-suite-utils.h>
+
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+// Positive test case for a method
+int UtcDaliGlViewNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliGlViewNew");
+  GlView view = GlView::New(GlView::ColorFormat::RGBA8888);
+  DALI_TEST_CHECK(view);
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliGlViewDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliGlViewDownCast");
+
+  GlView     view = GlView::New(GlView::ColorFormat::RGB888);
+  BaseHandle handle(view);
+
+  Toolkit::GlView view2 = Toolkit::GlView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(view2);
+  DALI_TEST_CHECK(view == view2);
+  END_TEST;
+}
+
+int UtcDaliGlViewCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewCopyAndAssignment");
+
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+  DALI_TEST_CHECK(view);
+
+  GlView copy(view);
+  DALI_TEST_CHECK(view == copy);
+
+  GlView assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == view);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewMoveAssignment");
+
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  GlView moved;
+  moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!view);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewSetGraphicsConfigGles20N(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewSetGraphicsConfigGles20");
+  GlView view;
+  try
+  {
+    view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+    DALI_TEST_CHECK(false);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewSetGraphicsConfigGles30(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewSetGraphicsConfigGles30");
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+
+  try
+  {
+    view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_3_0);
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewRenderingMode(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewRenderingMode");
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+
+  view.SetRenderingMode(GlView::RenderingMode::ON_DEMAND);
+
+  GlView::RenderingMode mode = view.GetRenderingMode();
+
+  DALI_TEST_EQUALS(GlView::RenderingMode::ON_DEMAND, mode, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewOnSizeSet(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewOnSizeSet");
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector3 size(200.0f, 300.0f, 0.0f);
+  view.SetProperty(Actor::Property::SIZE, size);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), size, TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Internal callback function
+void glInit(void)
+{
+}
+
+int glRenderFrame(void)
+{
+  static unsigned int retFlag = 0;
+  return retFlag++;
+}
+
+void glTerminate(void)
+{
+}
+
+void resizeCB(Vector2 size)
+{
+}
+
+int UtcDaliGlViewRegisterGlCallbacksN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewRegisterGlCallbacksN");
+  GlView view;
+
+  try
+  {
+    view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+    DALI_TEST_CHECK(false);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewSetResizeCallbackN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewSetResizeCallback");
+  GlView view;
+
+  try
+  {
+    view.SetResizeCallback(Dali::MakeCallback(resizeCB));
+    DALI_TEST_CHECK(false);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewRenderOnce(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewRenderOnce");
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+
+  try
+  {
+    view.RenderOnce();
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewWindowVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewWindowVisibilityChanged");
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+  application.GetScene().Add(view);
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+  view.SetResizeCallback(Dali::MakeCallback(resizeCB));
+
+  application.SendNotification();
+  application.Render();
+
+  Window window = DevelWindow::Get(view);
+  window.Hide();
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewOnScene(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+
+  //Onscene
+  application.GetScene().Add(view);
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+
+  application.SendNotification();
+  application.Render();
+
+  //Offscene
+  application.GetScene().Remove(view);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewControlVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  view.SetProperty(Actor::Property::VISIBLE, false);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(view.GetCurrentProperty<bool>(Actor::Property::VISIBLE) == false);
+
+  view.SetProperty(Actor::Property::VISIBLE, true);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(view.GetCurrentProperty<bool>(Actor::Property::VISIBLE) == true);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewResize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewResize");
+  GlView view = Toolkit::GlView::New(GlView::ColorFormat::RGB888);
+
+  application.GetScene().Add(view);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+  view.SetResizeCallback(Dali::MakeCallback(resizeCB));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 360.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  //To GlViewRenderThread can recognize Resize signal the main thread have to sleep.
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GlViewDirectRendering.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GlViewDirectRendering.cpp
new file mode 100644
index 0000000..85f1746
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-GlViewDirectRendering.cpp
@@ -0,0 +1,588 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <unistd.h>
+#include <thread>
+
+#include <dali-toolkit-test-suite-utils.h>
+
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/public-api/signals/render-callback.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+// Positive test case for a method
+int UtcDaliGlViewDirectRenderingNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliGlViewDirectRenderingNew");
+  GlView view = GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGBA8888);
+  DALI_TEST_CHECK(view);
+
+  auto mode1 = view.GetBackendMode();
+
+  DALI_TEST_EQUALS(mode1, GlView::BackendMode::DIRECT_RENDERING, TEST_LOCATION);
+
+  GlView view2 = GlView::New(GlView::BackendMode::EGL_IMAGE_OFFSCREEN_RENDERING, GlView::ColorFormat::RGBA8888);
+  DALI_TEST_CHECK(view2);
+
+  auto mode2 = view2.GetBackendMode();
+  DALI_TEST_EQUALS(mode2, GlView::BackendMode::EGL_IMAGE_OFFSCREEN_RENDERING, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingNewN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliGlViewDirectRenderingNewN");
+  // Invalid backend mode
+  GlView view = GlView::New(GlView::BackendMode(11111), GlView::ColorFormat::RGBA8888);
+  DALI_TEST_CHECK(!view);
+
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliGlViewDirectRenderingDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliGlViewDirectRenderingDownCast");
+
+  GlView     view = GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+  BaseHandle handle(view);
+
+  Toolkit::GlView view2 = Toolkit::GlView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(view2);
+  DALI_TEST_CHECK(view == view2);
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingCopyAndAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingCopyAndAssignment");
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+  DALI_TEST_CHECK(view);
+
+  GlView copy(view);
+  DALI_TEST_CHECK(view == copy);
+
+  GlView assign;
+  DALI_TEST_CHECK(!assign);
+
+  assign = copy;
+  DALI_TEST_CHECK(assign == view);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingMoveAssignment");
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  GlView moved;
+  moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!view);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingSetGraphicsConfigGles20N(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingSetGraphicsConfigGles20");
+  GlView view;
+  try
+  {
+    view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+    DALI_TEST_CHECK(false);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingSetGraphicsConfigGles30(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingSetGraphicsConfigGles30");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  try
+  {
+    view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_3_0);
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingRenderingMode(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingRenderingMode");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  view.SetRenderingMode(GlView::RenderingMode::ON_DEMAND);
+
+  GlView::RenderingMode mode = view.GetRenderingMode();
+
+  DALI_TEST_EQUALS(GlView::RenderingMode::ON_DEMAND, mode, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingOnSizeSet(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingOnSizeSet");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector3 size(200.0f, 300.0f, 0.0f);
+  view.SetProperty(Actor::Property::SIZE, size);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), size, TEST_LOCATION);
+
+  END_TEST;
+}
+
+namespace DirectRenderingCode
+{
+// Internal callback function
+void glInit(Dali::RenderCallbackInput& input)
+{
+}
+
+int glRenderFrame(Dali::RenderCallbackInput& input)
+{
+  static unsigned int retFlag = 0;
+  return retFlag++;
+}
+
+int gBoundTextureCount = 0;
+
+int glRenderFrameWithTextures(Dali::RenderCallbackInput& input)
+{
+  gBoundTextureCount = input.textureBindings.size();
+  return 1;
+}
+
+void glTerminate(Dali::RenderCallbackInput& input)
+{
+}
+
+// Internal callback function
+void glInitMT(Dali::RenderCallbackInput& input)
+{
+}
+
+int gDRFramesRendered = 0;
+
+int glRenderFrameMT(Dali::RenderCallbackInput& input)
+{
+  gDRFramesRendered++;
+  return 1;
+}
+
+void glTerminateMT(Dali::RenderCallbackInput& input)
+{
+}
+
+void resizeCB(Vector2 size)
+{
+}
+
+} // namespace DirectRenderingCode
+
+int UtcDaliGlViewDirectRenderingRegisterGlCallbacksN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingRegisterGlCallbacksN");
+  GlView view;
+
+  try
+  {
+    view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInit), Dali::MakeCallback(DirectRenderingCode::glRenderFrame), Dali::MakeCallback(DirectRenderingCode::glTerminate));
+    DALI_TEST_CHECK(false);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingSetResizeCallbackN(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingSetResizeCallback");
+  GlView view;
+
+  try
+  {
+    view.SetResizeCallback(Dali::MakeCallback(DirectRenderingCode::resizeCB));
+    DALI_TEST_CHECK(false);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingRenderOnce(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingRenderOnce");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  try
+  {
+    view.RenderOnce();
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingWindowVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingWindowVisibilityChanged");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+  application.GetScene().Add(view);
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInit), Dali::MakeCallback(DirectRenderingCode::glRenderFrame), Dali::MakeCallback(DirectRenderingCode::glTerminate));
+  view.SetResizeCallback(Dali::MakeCallback(DirectRenderingCode::resizeCB));
+
+  application.SendNotification();
+  application.Render();
+
+  Window window = DevelWindow::Get(view);
+  window.Hide();
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingOnScene(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  //Onscene
+  application.GetScene().Add(view);
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInit), Dali::MakeCallback(DirectRenderingCode::glRenderFrame), Dali::MakeCallback(DirectRenderingCode::glTerminate));
+
+  application.SendNotification();
+  application.Render();
+
+  //Offscene
+  application.GetScene().Remove(view);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingControlVisibilityChanged(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+  application.GetScene().Add(view);
+
+  application.SendNotification();
+  application.Render();
+
+  view.SetProperty(Actor::Property::VISIBLE, false);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(view.GetCurrentProperty<bool>(Actor::Property::VISIBLE) == false);
+
+  view.SetProperty(Actor::Property::VISIBLE, true);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(view.GetCurrentProperty<bool>(Actor::Property::VISIBLE) == true);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingResize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingResize");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  application.GetScene().Add(view);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInit), Dali::MakeCallback(DirectRenderingCode::glRenderFrame), Dali::MakeCallback(DirectRenderingCode::glTerminate));
+  view.SetResizeCallback(Dali::MakeCallback(DirectRenderingCode::resizeCB));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 360.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  //To GlViewRenderThread can recognize Resize signal the main thread have to sleep.
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingDirectResize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingResize");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::UNSAFE_DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  application.GetScene().Add(view);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInit), Dali::MakeCallback(DirectRenderingCode::glRenderFrame), Dali::MakeCallback(DirectRenderingCode::glTerminate));
+  view.SetResizeCallback(Dali::MakeCallback(DirectRenderingCode::resizeCB));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 360.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  //To GlViewRenderThread can recognize Resize signal the main thread have to sleep.
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingTerminateCallback(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliGlViewDirectRenderingTerminateCallback");
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  application.GetScene().Add(view);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInit), Dali::MakeCallback(DirectRenderingCode::glRenderFrame), Dali::MakeCallback(DirectRenderingCode::glTerminate));
+  view.SetResizeCallback(Dali::MakeCallback(DirectRenderingCode::resizeCB));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 360.0f));
+
+  application.SendNotification();
+  application.Render();
+
+  //To GlViewRenderThread can recognize Resize signal the main thread have to sleep.
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingTextureBinding(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING, GlView::ColorFormat::RGB888);
+
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInit), Dali::MakeCallback(DirectRenderingCode::glRenderFrameWithTextures), Dali::MakeCallback(DirectRenderingCode::glTerminate));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 360.0f));
+
+  // Set size on the actor (half the window size to show that glClear() and scissor test work together)
+  view.SetProperty(Actor::Property::SIZE, Size(100, 100));
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+
+  application.GetScene().Add(view);
+
+  // Prepare texture 1
+  Texture   texture1   = Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 512, 512);
+  auto*     data1      = reinterpret_cast<uint8_t*>(malloc(512 * 512 * 4));
+  PixelData pixelData1 = PixelData::New(data1, 512 * 512 * 4, 512, 512, Pixel::Format::RGBA8888, PixelData::ReleaseFunction::FREE);
+  texture1.Upload(pixelData1);
+
+  // Prepare texture 2
+  Texture   texture2   = Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 512, 512);
+  auto*     data2      = reinterpret_cast<uint8_t*>(malloc(512 * 512 * 4));
+  PixelData pixelData2 = PixelData::New(data2, 512 * 512 * 4, 512, 512, Pixel::Format::RGBA8888, PixelData::ReleaseFunction::FREE);
+  texture2.Upload(pixelData2);
+
+  std::vector<Texture> texturesToBind;
+  texturesToBind.push_back(texture1);
+  texturesToBind.push_back(texture2);
+
+  view.BindTextureResources(texturesToBind);
+
+  DirectRenderingCode::gBoundTextureCount = 0;
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(DirectRenderingCode::gBoundTextureCount, texturesToBind.size(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+// Positive test case for a method
+int UtcDaliGlViewDirectRenderingThreadedNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliGlViewDirectRenderingThreadedNew");
+  GlView view = GlView::New(GlView::BackendMode::DIRECT_RENDERING_THREADED, GlView::ColorFormat::RGBA8888);
+  DALI_TEST_CHECK(view);
+
+  auto mode1 = view.GetBackendMode();
+
+  DALI_TEST_EQUALS(mode1, GlView::BackendMode::DIRECT_RENDERING_THREADED, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingThreadedOnScene(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING_THREADED, GlView::ColorFormat::RGB888);
+
+  //Onscene
+  application.GetScene().Add(view);
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_3_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInitMT), Dali::MakeCallback(DirectRenderingCode::glRenderFrameMT), Dali::MakeCallback(DirectRenderingCode::glTerminateMT));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+
+  // Set size on the actor (half the window size to show that glClear() and scissor test work together)
+  view.SetProperty(Actor::Property::SIZE, Size(100, 100));
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+
+  while(DirectRenderingCode::gDRFramesRendered < 1)
+  {
+    application.SendNotification();
+    application.Render();
+  }
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+extern "C" bool gDirectRenderingFailCreateShader;
+extern "C" bool gDirectRenderingFailCreateProgram;
+
+int UtcDaliGlViewDirectRenderingThreadedOnScene1(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING_THREADED, GlView::ColorFormat::RGB888);
+
+  // This test will fail instantiating shaders
+  gDirectRenderingFailCreateShader = true;
+
+  //Onscene
+  application.GetScene().Add(view);
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_3_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInitMT), Dali::MakeCallback(DirectRenderingCode::glRenderFrameMT), Dali::MakeCallback(DirectRenderingCode::glTerminateMT));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+
+  // Set size on the actor (half the window size to show that glClear() and scissor test work together)
+  view.SetProperty(Actor::Property::SIZE, Size(100, 100));
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+
+  while(DirectRenderingCode::gDRFramesRendered < 1)
+  {
+    application.SendNotification();
+    application.Render();
+  }
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
+
+int UtcDaliGlViewDirectRenderingThreadedOnScene2(void)
+{
+  ToolkitTestApplication application;
+
+  GlView view = Toolkit::GlView::New(GlView::BackendMode::DIRECT_RENDERING_THREADED, GlView::ColorFormat::RGB888);
+
+  // This test will fail instantiating shaders
+  gDirectRenderingFailCreateProgram = true;
+
+  //Onscene
+  application.GetScene().Add(view);
+  view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
+  view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_3_0);
+  view.RegisterGlCallbacks(Dali::MakeCallback(DirectRenderingCode::glInitMT), Dali::MakeCallback(DirectRenderingCode::glRenderFrameMT), Dali::MakeCallback(DirectRenderingCode::glTerminateMT));
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+
+  // Set size on the actor (half the window size to show that glClear() and scissor test work together)
+  view.SetProperty(Actor::Property::SIZE, Size(100, 100));
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+
+  while(DirectRenderingCode::gDRFramesRendered < 1)
+  {
+    application.SendNotification();
+    application.Render();
+  }
+  DALI_TEST_CHECK(true);
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Image.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Image.cpp
index b4b88b6..dd21194 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Image.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali/public-api/rendering/texture.h>
+
+#include <dali-toolkit/public-api/image-loader/image-url.h>
+#include <dali-toolkit/public-api/image-loader/image.h>
+#include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/images/pixel-data.h>
 #include <dali/public-api/rendering/frame-buffer.h>
-#include <dali/public-api/adaptor-framework/native-image-source.h>
-#include <dali-toolkit/public-api/image-loader/image.h>
-#include <dali-toolkit/public-api/image-loader/image-url.h>
+#include <dali/public-api/rendering/texture.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -31,7 +34,6 @@ namespace
 {
 } // namespace
 
-
 void dali_image_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -45,78 +47,190 @@ void dali_image_cleanup(void)
 int UtcDaliImageConvertFrameBufferToUrl1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageConvertFrameBufferToUrl1" );
+  tet_infoline("UtcDaliImageConvertFrameBufferToUrl1");
 
   unsigned int width(64);
   unsigned int height(64);
-  FrameBuffer frameBuffer = FrameBuffer::New( width, height, FrameBuffer::Attachment::NONE );
+  FrameBuffer  frameBuffer = FrameBuffer::New(width, height, FrameBuffer::Attachment::NONE);
 
-  DALI_TEST_CHECK( frameBuffer );
-  ImageUrl url = Dali::Toolkit::Image::GenerateUrl( frameBuffer, Pixel::Format::RGBA8888, width, height );
+  DALI_TEST_CHECK(frameBuffer);
+  ImageUrl url = Dali::Toolkit::Image::GenerateUrl(frameBuffer, Pixel::Format::RGBA8888, width, height);
 
-  DALI_TEST_CHECK( url.GetUrl().size() > 0u );
+  DALI_TEST_CHECK(url.GetUrl().size() > 0u);
 
   END_TEST;
 }
 
-
 int UtcDaliImageConvertFrameBufferToUrl2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageConvertFrameBufferToUrl2" );
+  tet_infoline("UtcDaliImageConvertFrameBufferToUrl2");
 
   unsigned int width(64);
   unsigned int height(64);
-  FrameBuffer frameBuffer = FrameBuffer::New( width, height, FrameBuffer::Attachment::NONE );
+  FrameBuffer  frameBuffer = FrameBuffer::New(width, height, FrameBuffer::Attachment::NONE);
 
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height );
-  frameBuffer.AttachColorTexture( texture );
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
+  frameBuffer.AttachColorTexture(texture);
 
-  DALI_TEST_CHECK( Dali::Toolkit::Image::GenerateUrl( frameBuffer, 0 ).GetUrl().size() > 0u );
+  DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(frameBuffer, 0).GetUrl().size() > 0u);
 
   END_TEST;
 }
 
+int UtcDaliImageConvertDepthTextureFrameBufferToUrl(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageConvertDepthTextureFrameBufferToUrl");
+
+  unsigned int width(64);
+  unsigned int height(64);
+  FrameBuffer  frameBuffer = FrameBuffer::New(width, height, FrameBuffer::Attachment::NONE);
+
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::DEPTH_UNSIGNED_INT, width, height);
+  DevelFrameBuffer::AttachDepthTexture(frameBuffer, texture);
+
+  DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateDepthUrl(frameBuffer).GetUrl().size() > 0u);
+
+  END_TEST;
+}
 
-int UtcDaliImageConvertPixelDataToUrl(void)
+int UtcDaliImageConvertPixelDataToUrl01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageConvertPixelDataToUrl" );
+  tet_infoline("UtcDaliImageConvertPixelDataToUrl01");
 
   unsigned int width(64);
   unsigned int height(64);
-  unsigned int bufferSize = width*height*Pixel::GetBytesPerPixel( Pixel::RGB888 );
+  unsigned int bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGB888);
 
-  unsigned char* buffer= reinterpret_cast<unsigned char*>( malloc( bufferSize ) );
-  PixelData pixelData = PixelData::New( buffer, bufferSize, width, height, Pixel::RGB888, PixelData::FREE );
+  unsigned char* buffer    = reinterpret_cast<unsigned char*>(malloc(bufferSize));
+  PixelData      pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGB888, PixelData::FREE);
 
-  DALI_TEST_CHECK( Dali::Toolkit::Image::GenerateUrl( pixelData ).GetUrl().size() > 0u );
+  DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(pixelData).GetUrl().size() > 0u);
 
   END_TEST;
 }
 
+int UtcDaliImageConvertPixelDataToUrl02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageConvertPixelDataToUrl02");
+
+  unsigned int width(64);
+  unsigned int height(64);
+  unsigned int bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
+
+  unsigned char* buffer    = reinterpret_cast<unsigned char*>(malloc(bufferSize));
+  PixelData      pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
+
+  DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(pixelData, true).GetUrl().size() > 0u);
+
+  END_TEST;
+}
+
+int UtcDaliImageConvertNativeImageSourceToUrl01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageConvertNativeImageSourceToUrl01");
+
+  unsigned int width(64);
+  unsigned int height(64);
+  try
+  {
+    NativeImageSourcePtr nativeImageSource = NativeImageSource::New(width, height, NativeImageSource::COLOR_DEPTH_DEFAULT);
+
+    DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(nativeImageSource).GetUrl().size() > 0u);
+  }
+  catch(Dali::DaliException& e)
+  {
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_ASSERT(e, "Adaptor::IsAvailable()", TEST_LOCATION);
+  }
+  catch(...)
+  {
+    tet_printf("Assertion test failed - wrong Exception\n");
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageConvertNativeImageSourceToUrl02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageConvertNativeImageSourceToUrl02");
+
+  unsigned int width(64);
+  unsigned int height(64);
+  try
+  {
+    NativeImageSourcePtr nativeImageSource = NativeImageSource::New(width, height, NativeImageSource::COLOR_DEPTH_DEFAULT);
+
+    DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(nativeImageSource, true).GetUrl().size() > 0u);
+  }
+  catch(Dali::DaliException& e)
+  {
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_ASSERT(e, "Adaptor::IsAvailable()", TEST_LOCATION);
+  }
+  catch(...)
+  {
+    tet_printf("Assertion test failed - wrong Exception\n");
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageConvertNativeImageInterfaceToUrl01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageConvertNativeImageInterfaceToUrl01");
+
+  unsigned int width(64);
+  unsigned int height(64);
+  try
+  {
+    NativeImageSourceQueuePtr nativeImageQueue = NativeImageSourceQueue::New(width, height, (Dali::NativeImageSourceQueue::ColorFormat::BGR888));
+
+    DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(nativeImageQueue).GetUrl().size() > 0u);
+  }
+  catch(Dali::DaliException& e)
+  {
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_ASSERT(e, "Adaptor::IsAvailable()", TEST_LOCATION);
+  }
+  catch(...)
+  {
+    tet_printf("Assertion test failed - wrong Exception\n");
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
 
-int UtcDaliImageConvertNativeImageSourceToUrl(void)
+int UtcDaliImageConvertNativeImageInterfaceToUrl02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageConvertNativeImageSourceToUrl" );
+  tet_infoline("UtcDaliImageConvertNativeImageInterfaceToUrl02");
 
   unsigned int width(64);
   unsigned int height(64);
   try
   {
-    NativeImageSourcePtr nativeImageSource = NativeImageSource::New(width, height, NativeImageSource::COLOR_DEPTH_DEFAULT );
+    NativeImageSourceQueuePtr nativeImageQueue = NativeImageSourceQueue::New(width, height, (Dali::NativeImageSourceQueue::ColorFormat::BGR888));
 
-    DALI_TEST_CHECK( Dali::Toolkit::Image::GenerateUrl( nativeImageSource ).GetUrl().size() > 0u );
+    DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(nativeImageQueue, true).GetUrl().size() > 0u);
   }
   catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_ASSERT(e, "Adaptor::IsAvailable()", TEST_LOCATION);
   }
   catch(...)
   {
-    tet_printf("Assertion test failed - wrong Exception\n" );
+    tet_printf("Assertion test failed - wrong Exception\n");
     tet_result(TET_FAIL);
   }
 
@@ -126,14 +240,14 @@ int UtcDaliImageConvertNativeImageSourceToUrl(void)
 int UtcDaliImageConvertEncodedImageBufferToUrl(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageConvertEncodedImageBufferToUrl" );
+  tet_infoline("UtcDaliImageConvertEncodedImageBufferToUrl");
 
   Dali::Vector<uint8_t> buffer;
   buffer.PushBack(0x11);
   buffer.PushBack(0x22);
   buffer.PushBack(0x33);
 
-  DALI_TEST_CHECK( Dali::Toolkit::Image::GenerateUrl( EncodedImageBuffer::New(buffer) ).GetUrl().size() > 0u );
+  DALI_TEST_CHECK(Dali::Toolkit::Image::GenerateUrl(EncodedImageBuffer::New(buffer)).GetUrl().size() > 0u);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
index 9276f50..2bd6357 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <dali/dali.h>
+
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-event-thread-callback.h>
-#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
+
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
+#include <dali/dali.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -40,45 +42,42 @@ static const char* gEmptyImage = TEST_RESOURCE_DIR "/empty.bmp";
 
 const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
 
-PixelData CreatePixelData( unsigned int width, unsigned int height )
+PixelData CreatePixelData(unsigned int width, unsigned int height)
 {
-  unsigned int bufferSize = width*height*Pixel::GetBytesPerPixel( Pixel::RGBA8888 );
+  unsigned int bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
 
-  unsigned char* buffer= reinterpret_cast<unsigned char*>( malloc( bufferSize ) );
-  PixelData pixelData = PixelData::New( buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE );
+  unsigned char* buffer    = reinterpret_cast<unsigned char*>(malloc(bufferSize));
+  PixelData      pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
 
   return pixelData;
 }
 
-Rect<int> TextureCoordinateToPixelArea( const Vector4& textureCoordinate, float size )
+Rect<int> TextureCoordinateToPixelArea(const Vector4& textureCoordinate, float size)
 {
-  Vector4 temp = textureCoordinate * size;
+  Vector4   temp = textureCoordinate * size;
   Rect<int> pixelArea;
-  pixelArea.x = static_cast<int>( temp.x );
-  pixelArea.y = static_cast<int>( temp.y );
-  pixelArea.width = static_cast<int>( temp.z-temp.x+1.01f );
-  pixelArea.height = static_cast<int>( temp.w-temp.y+1.01f );
+  pixelArea.x      = static_cast<int>(temp.x);
+  pixelArea.y      = static_cast<int>(temp.y);
+  pixelArea.width  = static_cast<int>(temp.z - temp.x + 1.01f);
+  pixelArea.height = static_cast<int>(temp.w - temp.y + 1.01f);
 
   return pixelArea;
 }
 
-Rect<int> TextureCoordinateToPixelArea( const Vector4& textureCoordinate, float width, float height )
+Rect<int> TextureCoordinateToPixelArea(const Vector4& textureCoordinate, float width, float height)
 {
   Rect<int> pixelArea;
-  pixelArea.x = static_cast<int>( textureCoordinate.x*width );
-  pixelArea.y = static_cast<int>( textureCoordinate.y*height);
-  pixelArea.width = static_cast<int>( (textureCoordinate.z-textureCoordinate.x)*width+1.01f );
-  pixelArea.height = static_cast<int>( (textureCoordinate.w-textureCoordinate.y)*height+1.01f );
+  pixelArea.x      = static_cast<int>(textureCoordinate.x * width);
+  pixelArea.y      = static_cast<int>(textureCoordinate.y * height);
+  pixelArea.width  = static_cast<int>((textureCoordinate.z - textureCoordinate.x) * width + 1.01f);
+  pixelArea.height = static_cast<int>((textureCoordinate.w - textureCoordinate.y) * height + 1.01f);
 
   return pixelArea;
 }
 
-bool IsOverlap( Rect<int> rect1, Rect<int> rect2 )
+bool IsOverlap(Rect<int> rect1, Rect<int> rect2)
 {
- return rect1.x < rect2.x+rect2.width
-     && rect2.x < rect1.x+rect1.width
-     && rect1.y < rect2.y+rect2.height
-     && rect2.y < rect1.y+rect1.height;
+  return rect1.x < rect2.x + rect2.width && rect2.x < rect1.x + rect1.width && rect1.y < rect2.y + rect2.height && rect2.y < rect1.y + rect1.height;
 }
 
 static unsigned int gCountOfTestFuncCall;
@@ -86,10 +85,12 @@ class TestUploadObserver : public AtlasUploadObserver
 {
 public:
   TestUploadObserver()
-  {}
+  {
+  }
 
   virtual ~TestUploadObserver()
-  {}
+  {
+  }
 
   void UploadCompleted()
   {
@@ -116,12 +117,12 @@ int UtcDaliImageAtlasNew(void)
   // invoke default handle constructor
   ImageAtlas atlas;
 
-  DALI_TEST_CHECK( !atlas );
+  DALI_TEST_CHECK(!atlas);
 
   // initialise handle
-  atlas = ImageAtlas::New( 32, 32 );
+  atlas = ImageAtlas::New(32, 32);
 
-  DALI_TEST_CHECK( atlas );
+  DALI_TEST_CHECK(atlas);
   END_TEST;
 }
 
@@ -129,10 +130,10 @@ int UtcDaliImageAtlasCopyConstructor(void)
 {
   ToolkitTestApplication application;
 
-  ImageAtlas atlas = ImageAtlas::New( 32, 32);
+  ImageAtlas atlas = ImageAtlas::New(32, 32);
   ImageAtlas atlasCopy(atlas);
 
-  DALI_TEST_EQUALS( (bool)atlasCopy, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)atlasCopy, true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -140,13 +141,13 @@ int UtcDaliImageAtlasAssignmentOperator(void)
 {
   ToolkitTestApplication application;
 
-  ImageAtlas atlas = ImageAtlas::New( 32, 32 );
+  ImageAtlas atlas = ImageAtlas::New(32, 32);
 
   ImageAtlas atlas2;
-  DALI_TEST_EQUALS( (bool)atlas2, false, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)atlas2, false, TEST_LOCATION);
 
   atlas2 = atlas;
-  DALI_TEST_EQUALS( (bool)atlas2, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)atlas2, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -155,13 +156,13 @@ int UtcDaliImageAtlasGetAtlas(void)
 {
   ToolkitTestApplication application;
 
-  ImageAtlas atlas = ImageAtlas::New( 32, 32 );
-  Texture image = atlas.GetAtlas();
+  ImageAtlas atlas = ImageAtlas::New(32, 32);
+  Texture    image = atlas.GetAtlas();
 
   // test the atlas created
-  DALI_TEST_EQUALS( (bool)image, true, TEST_LOCATION );
-  DALI_TEST_CHECK( image.GetHeight() == 32u );
-  DALI_TEST_CHECK( image.GetWidth() == 32u );
+  DALI_TEST_EQUALS((bool)image, true, TEST_LOCATION);
+  DALI_TEST_CHECK(image.GetHeight() == 32u);
+  DALI_TEST_CHECK(image.GetWidth() == 32u);
 
   END_TEST;
 }
@@ -170,17 +171,17 @@ int UtcDaliImageAtlasGetOccupancyRate(void)
 {
   ToolkitTestApplication application;
 
-  ImageAtlas atlas = ImageAtlas::New( 100, 100 );
+  ImageAtlas atlas = ImageAtlas::New(100, 100);
 
-  DALI_TEST_EQUALS( atlas.GetOccupancyRate(), 0.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(atlas.GetOccupancyRate(), 0.f, TEST_LOCATION);
 
   Vector4 textureRect1;
-  atlas.Upload( textureRect1, gImage_34_RGBA, ImageDimensions(34, 34) );
-  DALI_TEST_EQUALS( atlas.GetOccupancyRate(), 34.f*34.f/10000.f, 0.001f, TEST_LOCATION );
+  atlas.Upload(textureRect1, gImage_34_RGBA, ImageDimensions(34, 34));
+  DALI_TEST_EQUALS(atlas.GetOccupancyRate(), 34.f * 34.f / 10000.f, 0.001f, TEST_LOCATION);
 
   Vector4 textureRect2;
-  atlas.Upload( textureRect2, gImage_50_RGBA, ImageDimensions(50, 50) );
-  DALI_TEST_EQUALS( atlas.GetOccupancyRate(), (34.f*34.f+50.f*50.f)/10000.f, 0.001f, TEST_LOCATION );
+  atlas.Upload(textureRect2, gImage_50_RGBA, ImageDimensions(50, 50));
+  DALI_TEST_EQUALS(atlas.GetOccupancyRate(), (34.f * 34.f + 50.f * 50.f) / 10000.f, 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -188,48 +189,46 @@ int UtcDaliImageAtlasGetOccupancyRate(void)
 int UtcDaliImageAtlasSetBrokenImage(void)
 {
   ToolkitTestApplication application;
-  unsigned int size = 200;
-  ImageAtlas atlas = ImageAtlas::New( size, size );
+  unsigned int           size  = 200;
+  ImageAtlas             atlas = ImageAtlas::New(size, size);
 
   // Set broken image
   TestPlatformAbstraction& platform = application.GetPlatform();
-  platform.SetClosestImageSize(Vector2( 34, 34));
-  atlas.SetBrokenImage( gImage_34_RGBA );
+  platform.SetClosestImageSize(Vector2(34, 34));
+  atlas.SetBrokenImage(gImage_34_RGBA);
 
   Vector4 textureRect;
 
   // the empty image will be replaced with the broken image
-  platform.SetClosestImageSize(Vector2( 20, 20));
-  atlas.Upload( textureRect, gEmptyImage );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  platform.SetClosestImageSize(Vector2(20, 20));
+  atlas.Upload(textureRect, gEmptyImage);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect, size);
-  DALI_TEST_EQUALS( pixelArea.width, 20, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.height, 20, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea.width, 20, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.height, 20, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-
 int UtcDaliImageAtlasUploadP(void)
 {
   ToolkitTestApplication application;
-  unsigned int size = 200;
-  ImageAtlas atlas = ImageAtlas::New( size, size );
+  unsigned int           size  = 200;
+  ImageAtlas             atlas = ImageAtlas::New(size, size);
 
   TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace();
   callStack.Reset();
   callStack.Enable(true);
 
   Vector4 textureRect1;
-  atlas.Upload( textureRect1, gImage_34_RGBA, ImageDimensions(34, 34) );
+  atlas.Upload(textureRect1, gImage_34_RGBA, ImageDimensions(34, 34));
   Vector4 textureRect2;
-  atlas.Upload( textureRect2, gImage_50_RGBA, ImageDimensions(50, 50) );
+  atlas.Upload(textureRect2, gImage_50_RGBA, ImageDimensions(50, 50));
   Vector4 textureRect3;
-  atlas.Upload( textureRect3, gImage_128_RGB, ImageDimensions(128, 128) );
+  atlas.Upload(textureRect3, gImage_128_RGB, ImageDimensions(128, 128));
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
@@ -237,41 +236,41 @@ int UtcDaliImageAtlasUploadP(void)
   callStack.Enable(false);
 
   Rect<int> pixelArea1 = TextureCoordinateToPixelArea(textureRect1, size);
-  DALI_TEST_EQUALS( pixelArea1.width, 34, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea1.height, 34, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea1.width, 34, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea1.height, 34, TEST_LOCATION);
 
   TraceCallStack::NamedParams params;
-  params["width"] <<pixelArea1.width;
-  params["height"] <<pixelArea1.height;
-  params["xoffset"] <<pixelArea1.x;
-  params["yoffset"] <<pixelArea1.y;
-  DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ));
+  params["width"] << pixelArea1.width;
+  params["height"] << pixelArea1.height;
+  params["xoffset"] << pixelArea1.x;
+  params["yoffset"] << pixelArea1.y;
+  DALI_TEST_CHECK(callStack.FindMethodAndParams("TexSubImage2D", params));
 
   Rect<int> pixelArea2 = TextureCoordinateToPixelArea(textureRect2, size);
-  DALI_TEST_EQUALS( pixelArea2.width, 50, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea2.height, 50, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea2.width, 50, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea2.height, 50, TEST_LOCATION);
 
   params.mParams.clear();
-  params["width"] <<pixelArea2.width;
-  params["height"] <<pixelArea2.height;
-  params["xoffset"] <<pixelArea2.x;
-  params["yoffset"] <<pixelArea2.y;
-  DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
+  params["width"] << pixelArea2.width;
+  params["height"] << pixelArea2.height;
+  params["xoffset"] << pixelArea2.x;
+  params["yoffset"] << pixelArea2.y;
+  DALI_TEST_CHECK(callStack.FindMethodAndParams("TexSubImage2D", params));
 
   Rect<int> pixelArea3 = TextureCoordinateToPixelArea(textureRect3, size);
-  DALI_TEST_EQUALS( pixelArea3.width, 128, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea3.height, 128, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea3.width, 128, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea3.height, 128, TEST_LOCATION);
 
   params.mParams.clear();
-  params["width"] <<pixelArea3.width;
-  params["height"] <<pixelArea3.height;
-  params["xoffset"] <<pixelArea3.x;
-  params["yoffset"] <<pixelArea3.y;
-  DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
+  params["width"] << pixelArea3.width;
+  params["height"] << pixelArea3.height;
+  params["xoffset"] << pixelArea3.x;
+  params["yoffset"] << pixelArea3.y;
+  DALI_TEST_CHECK(callStack.FindMethodAndParams("TexSubImage2D", params));
 
-  DALI_TEST_CHECK( ! IsOverlap(pixelArea1, pixelArea2) );
-  DALI_TEST_CHECK( ! IsOverlap(pixelArea1, pixelArea3) );
-  DALI_TEST_CHECK( ! IsOverlap(pixelArea2, pixelArea3) );
+  DALI_TEST_CHECK(!IsOverlap(pixelArea1, pixelArea2));
+  DALI_TEST_CHECK(!IsOverlap(pixelArea1, pixelArea3));
+  DALI_TEST_CHECK(!IsOverlap(pixelArea2, pixelArea3));
 
   END_TEST;
 }
@@ -279,26 +278,25 @@ int UtcDaliImageAtlasUploadP(void)
 int UtcDaliImageAtlasUploadWithObserver01(void)
 {
   ToolkitTestApplication application;
-  ImageAtlas atlas = ImageAtlas::New( 200, 200 );
-
+  ImageAtlas             atlas = ImageAtlas::New(200, 200);
 
   gCountOfTestFuncCall = 0;
   TestUploadObserver uploadObserver;
 
   Vector4 textureRect1;
-  atlas.Upload( textureRect1, gImage_34_RGBA, ImageDimensions(34, 34), FittingMode::DEFAULT, true, &uploadObserver );
+  atlas.Upload(textureRect1, gImage_34_RGBA, ImageDimensions(34, 34), FittingMode::DEFAULT, true, &uploadObserver);
   Vector4 textureRect2;
-  atlas.Upload( textureRect2, gImage_50_RGBA, ImageDimensions(50, 50), FittingMode::DEFAULT, true, NULL );
+  atlas.Upload(textureRect2, gImage_50_RGBA, ImageDimensions(50, 50), FittingMode::DEFAULT, true, NULL);
   Vector4 textureRect3;
-  atlas.Upload( textureRect3, gImage_128_RGB, ImageDimensions(128, 128), FittingMode::DEFAULT, true, &uploadObserver );
+  atlas.Upload(textureRect3, gImage_128_RGB, ImageDimensions(128, 128), FittingMode::DEFAULT, true, &uploadObserver);
 
   // waiting until all three images are loaded and uploaded to atlas
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
   // Check that TestFunc is called twice
-  DALI_TEST_EQUALS( gCountOfTestFuncCall, 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCountOfTestFuncCall, 2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -306,29 +304,29 @@ int UtcDaliImageAtlasUploadWithObserver01(void)
 int UtcDaliImageAtlasUploadWithObserver02(void)
 {
   ToolkitTestApplication application;
-  ImageAtlas atlas = ImageAtlas::New( 200, 200 );
+  ImageAtlas             atlas = ImageAtlas::New(200, 200);
 
-  gCountOfTestFuncCall = 0;
+  gCountOfTestFuncCall               = 0;
   TestUploadObserver* uploadObserver = new TestUploadObserver;
 
   Vector4 textureRect1;
-  atlas.Upload( textureRect1, gImage_34_RGBA, ImageDimensions(34, 34), FittingMode::DEFAULT, true, uploadObserver );
+  atlas.Upload(textureRect1, gImage_34_RGBA, ImageDimensions(34, 34), FittingMode::DEFAULT, true, uploadObserver);
   Vector4 textureRect2;
-  atlas.Upload( textureRect2, gImage_50_RGBA, ImageDimensions(50, 50), FittingMode::DEFAULT, true, uploadObserver );
+  atlas.Upload(textureRect2, gImage_50_RGBA, ImageDimensions(50, 50), FittingMode::DEFAULT, true, uploadObserver);
   Vector4 textureRect3;
-  atlas.Upload( textureRect3, gImage_128_RGB, ImageDimensions(128, 128), FittingMode::DEFAULT, true, uploadObserver );
+  atlas.Upload(textureRect3, gImage_128_RGB, ImageDimensions(128, 128), FittingMode::DEFAULT, true, uploadObserver);
 
   // destroy the object.
   delete uploadObserver;
 
- // waiting until all three images are loaded and uploaded to atlas
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  // waiting until all three images are loaded and uploaded to atlas
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
   application.Render(RENDER_FRAME_INTERVAL);
   application.SendNotification();
 
   // Check that TestFunc is called twice
-  DALI_TEST_EQUALS( gCountOfTestFuncCall, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCountOfTestFuncCall, 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -337,18 +335,18 @@ int UtcDaliImageAtlasUploadWithObserver03(void)
 {
   ToolkitTestApplication application;
 
-  gCountOfTestFuncCall = 0;
+  gCountOfTestFuncCall               = 0;
   TestUploadObserver* uploadObserver = new TestUploadObserver;
 
   {
-    ImageAtlas atlas = ImageAtlas::New( 200, 200 );
+    ImageAtlas atlas = ImageAtlas::New(200, 200);
 
     Vector4 textureRect1;
-    atlas.Upload( textureRect1, gImage_34_RGBA, ImageDimensions(34, 34), FittingMode::DEFAULT, true, uploadObserver );
+    atlas.Upload(textureRect1, gImage_34_RGBA, ImageDimensions(34, 34), FittingMode::DEFAULT, true, uploadObserver);
     Vector4 textureRect2;
-    atlas.Upload( textureRect2, gImage_50_RGBA, ImageDimensions(50, 50), FittingMode::DEFAULT, true, uploadObserver );
+    atlas.Upload(textureRect2, gImage_50_RGBA, ImageDimensions(50, 50), FittingMode::DEFAULT, true, uploadObserver);
     Vector4 textureRect3;
-    atlas.Upload( textureRect3, gImage_128_RGB, ImageDimensions(128, 128), FittingMode::DEFAULT, true, uploadObserver );
+    atlas.Upload(textureRect3, gImage_128_RGB, ImageDimensions(128, 128), FittingMode::DEFAULT, true, uploadObserver);
   }
 
   //ImageAtlas is out of scope, so it will get destroyed
@@ -359,7 +357,7 @@ int UtcDaliImageAtlasUploadWithObserver03(void)
   application.Render(RENDER_FRAME_INTERVAL);
 
   // Check that TestFunc is called twice
-  DALI_TEST_EQUALS( gCountOfTestFuncCall, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCountOfTestFuncCall, 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -367,20 +365,20 @@ int UtcDaliImageAtlasUploadWithObserver03(void)
 int UtcDaliImageAtlasRemove(void)
 {
   ToolkitTestApplication application;
-  unsigned int size = 100;
-  ImageAtlas atlas = ImageAtlas::New( size, size );
-  Vector4 textureRect1;
-  atlas.Upload( textureRect1, gImage_34_RGBA, ImageDimensions(34, 34) );
+  unsigned int           size  = 100;
+  ImageAtlas             atlas = ImageAtlas::New(size, size);
+  Vector4                textureRect1;
+  atlas.Upload(textureRect1, gImage_34_RGBA, ImageDimensions(34, 34));
 
-  atlas.Remove( textureRect1 );
+  atlas.Remove(textureRect1);
 
   Vector4 textureRect2;
-  atlas.Upload( textureRect2, gImage_50_RGBA, ImageDimensions(50, 50) );
+  atlas.Upload(textureRect2, gImage_50_RGBA, ImageDimensions(50, 50));
 
   // one pixel gap
   Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect2, size);
-  DALI_TEST_EQUALS( pixelArea.x, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.y, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea.x, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.y, 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -395,36 +393,36 @@ int UtcDaliImageAtlasImageView(void)
 
   Property::Map imageMap1;
 
-  imageMap1[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap1[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
-  imageMap1[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
-  imageMap1[ ImageVisual::Property::ATLASING] = true;
+  imageMap1[ImageVisual::Property::URL]            = gImage_34_RGBA;
+  imageMap1[ImageVisual::Property::DESIRED_HEIGHT] = 34;
+  imageMap1[ImageVisual::Property::DESIRED_WIDTH]  = 34;
+  imageMap1[ImageVisual::Property::ATLASING]       = true;
 
   Property::Map imageMap2;
 
-  imageMap2[ ImageVisual::Property::URL ] = gImage_50_RGBA;
-  imageMap2[ ImageVisual::Property::DESIRED_HEIGHT ] = 50;
-  imageMap2[ ImageVisual::Property::DESIRED_WIDTH ] = 50;
-  imageMap2[ ImageVisual::Property::ATLASING ] = true;
+  imageMap2[ImageVisual::Property::URL]            = gImage_50_RGBA;
+  imageMap2[ImageVisual::Property::DESIRED_HEIGHT] = 50;
+  imageMap2[ImageVisual::Property::DESIRED_WIDTH]  = 50;
+  imageMap2[ImageVisual::Property::ATLASING]       = true;
 
   ImageView imageView1 = ImageView::New();
-  imageView1.SetProperty( ImageView::Property::IMAGE, imageMap1 );
+  imageView1.SetProperty(ImageView::Property::IMAGE, imageMap1);
 
   ImageView imageView2 = ImageView::New();
-  imageView2.SetProperty( ImageView::Property::IMAGE, imageMap2 );
+  imageView2.SetProperty(ImageView::Property::IMAGE, imageMap2);
 
   // ImageView doesn't do size negotiation properly: it only listens to OnSizeSet:
-  imageView1.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
-  imageView2.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
-  imageView1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  imageView2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+  imageView1.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  imageView2.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  imageView1.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  imageView2.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
-  application.GetPlatform().SetClosestImageSize(  Vector2(34, 34) );
-  application.GetScene().Add( imageView1 );
-  application.GetPlatform().SetClosestImageSize(  Vector2(50, 50) );
-  application.GetScene().Add( imageView2 );
+  application.GetPlatform().SetClosestImageSize(Vector2(34, 34));
+  application.GetScene().Add(imageView1);
+  application.GetPlatform().SetClosestImageSize(Vector2(50, 50));
+  application.GetScene().Add(imageView2);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
@@ -443,31 +441,31 @@ int UtcDaliImageAtlasImageView(void)
   params2["xoffset"] << 0;
   params2["yoffset"] << 34;
 
-  DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params1 ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params2), true, TEST_LOCATION);
 
   callStack.Reset();
   callStack.Enable(true);
 
   // remove the imageView2 from stage, the second image will also be removed from atlas
   // then the space on the atlas will be used by the third image added.
-  application.GetScene().Remove( imageView2 );
+  application.GetScene().Remove(imageView2);
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
   Property::Map imageMap3;
-  imageMap3[ ImageVisual::Property::URL ] = gImage_128_RGB;
-  imageMap3[ ImageVisual::Property::DESIRED_HEIGHT ] = 100;
-  imageMap3[ ImageVisual::Property::DESIRED_WIDTH ] = 100;
-  imageMap3[ ImageVisual::Property::ATLASING ] = true;
+  imageMap3[ImageVisual::Property::URL]            = gImage_128_RGB;
+  imageMap3[ImageVisual::Property::DESIRED_HEIGHT] = 100;
+  imageMap3[ImageVisual::Property::DESIRED_WIDTH]  = 100;
+  imageMap3[ImageVisual::Property::ATLASING]       = true;
 
   ImageView imageView3 = ImageView::New();
-  imageView3.SetProperty( ImageView::Property::IMAGE, imageMap3 );
+  imageView3.SetProperty(ImageView::Property::IMAGE, imageMap3);
 
-  application.GetPlatform().SetClosestImageSize(  Vector2(100, 100) );
-  application.GetScene().Add( imageView3 );
+  application.GetPlatform().SetClosestImageSize(Vector2(100, 100));
+  application.GetScene().Add(imageView3);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
@@ -480,7 +478,7 @@ int UtcDaliImageAtlasImageView(void)
   params3["xoffset"] << 0;
   params3["yoffset"] << 34;
 
-  DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params3), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -490,50 +488,50 @@ int UtcDaliImageAtlasPackToAtlas(void)
   ToolkitTestApplication application;
 
   std::vector<PixelData> pixelDataContainer;
-  pixelDataContainer.push_back( CreatePixelData( 20, 30 ) );
-  pixelDataContainer.push_back( CreatePixelData( 10, 10 ) );
-  pixelDataContainer.push_back( CreatePixelData( 45, 30 ) );
-  pixelDataContainer.push_back( CreatePixelData( 20, 20 ) );
+  pixelDataContainer.push_back(CreatePixelData(20, 30));
+  pixelDataContainer.push_back(CreatePixelData(10, 10));
+  pixelDataContainer.push_back(CreatePixelData(45, 30));
+  pixelDataContainer.push_back(CreatePixelData(20, 20));
 
   Dali::Vector<Vector4> textureRects;
-  Texture texture = ImageAtlas::PackToAtlas( pixelDataContainer, textureRects  );
+  Texture               texture = ImageAtlas::PackToAtlas(pixelDataContainer, textureRects);
 
- // --------------
- // |            |
- // |    45*30   |
-//  |            |
-//  --------------
-//  | 20 |    | 20*20
-//  |  * |____|
-//  | 30 |  |  10*10
-//  --------
+  //  --------------
+  //  |            |
+  //  |    45*30   |
+  //  |            |
+  //  --------------
+  //  | 20 |    | 20*20
+  //  |  * |____|
+  //  | 30 |  |  10*10
+  //  --------
 
-  DALI_TEST_EQUALS( texture.GetWidth(), 45, TEST_LOCATION );
-  DALI_TEST_EQUALS( texture.GetHeight(), 60, TEST_LOCATION );
+  DALI_TEST_EQUALS(texture.GetWidth(), 45, TEST_LOCATION);
+  DALI_TEST_EQUALS(texture.GetHeight(), 60, TEST_LOCATION);
 
   Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRects[0], texture.GetWidth(), texture.GetHeight());
-  DALI_TEST_EQUALS( pixelArea.x, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.y, 30, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.width, 20, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.height, 30, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea.x, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.y, 30, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.width, 20, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.height, 30, TEST_LOCATION);
 
   pixelArea = TextureCoordinateToPixelArea(textureRects[1], texture.GetWidth(), texture.GetHeight());
-  DALI_TEST_EQUALS( pixelArea.x, 20, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.y, 50, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.width, 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.height, 10, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea.x, 20, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.y, 50, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.width, 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.height, 10, TEST_LOCATION);
 
   pixelArea = TextureCoordinateToPixelArea(textureRects[2], texture.GetWidth(), texture.GetHeight());
-  DALI_TEST_EQUALS( pixelArea.x, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.y, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.width, 45, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.height, 30, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea.x, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.y, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.width, 45, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.height, 30, TEST_LOCATION);
 
   pixelArea = TextureCoordinateToPixelArea(textureRects[3], texture.GetWidth(), texture.GetHeight());
-  DALI_TEST_EQUALS( pixelArea.x, 20, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.y, 30, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.width, 20, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.height, 20, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelArea.x, 20, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.y, 30, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.width, 20, TEST_LOCATION);
+  DALI_TEST_EQUALS(pixelArea.height, 20, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageUrl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageUrl.cpp
index 09cc7cd..d137c5d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageUrl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageUrl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,44 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/public-api/image-loader/image-url.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
-int UtcImageUrlConstructor(void)
+int UtcImageUrlConstructor01(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcImageUrlValid ");
+
+  // Test default constructor.
+  ImageUrl imageUrl;
+  DALI_TEST_CHECK(!imageUrl);
+
+  // Test object creation
+  Texture image = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 4u, 4u); // test texture
+  imageUrl      = ImageUrl::New(image);
+  DALI_TEST_CHECK(imageUrl);
+
+  // Test copy constructor
+  ImageUrl ImageUrlCopy(imageUrl);
+  DALI_TEST_CHECK(ImageUrlCopy);
+
+  // Test down cast
+  BaseHandle baseUrl;
+  baseUrl              = imageUrl;
+  ImageUrl downcastUrl = ImageUrl::DownCast(baseUrl);
+  DALI_TEST_CHECK(downcastUrl);
+  END_TEST;
+}
+
+int UtcImageUrlConstructor02(void)
 {
   ToolkitTestApplication application;
 
@@ -30,21 +59,21 @@ int UtcImageUrlConstructor(void)
 
   // Test default constructor.
   ImageUrl imageUrl;
-  DALI_TEST_CHECK( !imageUrl );
+  DALI_TEST_CHECK(!imageUrl);
 
   // Test object creation
   Texture image = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 4u, 4u); // test texture
-  imageUrl = ImageUrl::New(image);
-  DALI_TEST_CHECK( imageUrl );
+  imageUrl      = ImageUrl::New(image, true);
+  DALI_TEST_CHECK(imageUrl);
 
   // Test copy constructor
-  ImageUrl ImageUrlCopy( imageUrl );
-  DALI_TEST_CHECK( ImageUrlCopy );
+  ImageUrl ImageUrlCopy(imageUrl);
+  DALI_TEST_CHECK(ImageUrlCopy);
 
   // Test down cast
   BaseHandle baseUrl;
-  baseUrl = imageUrl;
-  ImageUrl downcastUrl = ImageUrl::DownCast( baseUrl );
-  DALI_TEST_CHECK( downcastUrl );
+  baseUrl              = imageUrl;
+  ImageUrl downcastUrl = ImageUrl::DownCast(baseUrl);
+  DALI_TEST_CHECK(downcastUrl);
   END_TEST;
-}
\ No newline at end of file
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index 0450040..4eb38b8 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,29 +15,32 @@
  *
  */
 
+#include <unistd.h>
+#include <sstream>
+
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
+
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-vector-image-renderer.h>
+#include "dummy-control.h"
+
+#include <test-encoded-image-buffer.h>
+#include <test-native-image.h>
 
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/scripting/scripting.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
+#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/image-loader/image.h>
 #include <dali-toolkit/public-api/image-loader/image-url.h>
-
-#include <test-native-image.h>
-#include <test-encoded-image-buffer.h>
-#include <sstream>
-#include <unistd.h>
-
-
-#include "dummy-control.h"
+#include <dali-toolkit/public-api/image-loader/image.h>
+#include <dali/devel-api/scripting/scripting.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -54,13 +57,22 @@ void utc_dali_toolkit_image_view_cleanup(void)
 
 namespace
 {
+const char* TEST_IMAGE_FILE_NAME  = "gallery_image_01.jpg";
+const char* TEST_IMAGE_FILE_NAME2 = "gallery_image_02.jpg";
 
-const char* TEST_IMAGE_FILE_NAME =  "gallery_image_01.jpg";
-const char* TEST_IMAGE_FILE_NAME2 =  "gallery_image_02.jpg";
-
+// resolution: 1024*1024
 const char* TEST_IMAGE_1 = TEST_RESOURCE_DIR "/TB-gloss.png";
 const char* TEST_IMAGE_2 = TEST_RESOURCE_DIR "/tb-norm.png";
 
+const char* TEST_BROKEN_IMAGE_DEFAULT = TEST_RESOURCE_DIR "/broken.png";
+const char* TEST_BROKEN_IMAGE_S       = TEST_RESOURCE_DIR "/broken_s.9.png";
+const char* TEST_BROKEN_IMAGE_M       = TEST_RESOURCE_DIR "/broken_m.9.png";
+const char* TEST_BROKEN_IMAGE_L       = TEST_RESOURCE_DIR "/broken_l.9.png";
+const char* TEST_BROKEN_IMAGE_01      = TEST_RESOURCE_DIR "/button-up.9.png";
+const char* TEST_BROKEN_IMAGE_02      = TEST_RESOURCE_DIR "/heartsframe.9.png";
+
+const char* TEST_INVALID_NPATCH_FILE_NAME_01 = "invalid1.9.png";
+
 // resolution: 34*34, pixel format: RGBA8888
 static const char* gImage_34_RGBA = TEST_RESOURCE_DIR "/icon-edit.png";
 // resolution: 600*600, pixel format: RGB888
@@ -69,15 +81,51 @@ static const char* gImage_600_RGB = TEST_RESOURCE_DIR "/test-image-600.jpg";
 // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame
 const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif";
 
-const char* TEST_VECTOR_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/insta_camera.json";
+const char* TEST_SVG_FILE_NAME                   = TEST_RESOURCE_DIR "/svg1.svg";
+const char* TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json";
+const char* TEST_WEBP_FILE_NAME                  = TEST_RESOURCE_DIR "/dali-logo.webp";
+
+const char* TEST_OVERWRITABLE_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/overwritable-image.jpg";
 
-void TestUrl( ImageView imageView, const std::string url )
+void TestUrl(ImageView imageView, const std::string url)
 {
-  Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+  Property::Value value = imageView.GetProperty(imageView.GetPropertyIndex("image"));
 
   std::string urlActual;
-  DALI_TEST_CHECK( value.Get( urlActual ) );
-  DALI_TEST_EQUALS( urlActual, url, TEST_LOCATION );
+  DALI_TEST_CHECK(value.Get(urlActual));
+  DALI_TEST_EQUALS(urlActual, url, TEST_LOCATION);
+}
+
+void OverwriteImage(const char* sourceFilename)
+{
+  FILE* fpOut = fopen(TEST_OVERWRITABLE_IMAGE_FILE_NAME, "wb");
+  DALI_TEST_CHECK(fpOut);
+  if(fpOut)
+  {
+    FILE* fpIn = fopen(sourceFilename, "rb");
+    if(fpIn)
+    {
+      fseek(fpIn, 0, SEEK_END);
+      size_t size = ftell(fpIn);
+
+      tet_printf("Open %s success! file size : %zu byte\n", sourceFilename, size);
+      Dali::Vector<uint8_t> data;
+      data.Resize(size);
+      fseek(fpIn, 0, SEEK_SET);
+      size_t realSize = fread(data.Begin(), sizeof(uint8_t), size, fpIn);
+      fclose(fpIn);
+      data.Resize(realSize);
+
+      // Overwrite
+      fwrite(data.Begin(), sizeof(uint8_t), size, fpOut);
+    }
+    else
+    {
+      tet_printf("Open %s failed! write invalid\n", sourceFilename);
+      fprintf(fpOut, "invalid\n");
+    }
+    fclose(fpOut);
+  }
 }
 
 } // namespace
@@ -88,7 +136,7 @@ int UtcDaliImageViewNewP(void)
 
   ImageView imageView = ImageView::New();
 
-  DALI_TEST_CHECK( imageView );
+  DALI_TEST_CHECK(imageView);
 
   END_TEST;
 }
@@ -97,10 +145,10 @@ int UtcDaliImageViewNewUrlP(void)
 {
   ToolkitTestApplication application;
 
-  ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME );
-  DALI_TEST_CHECK( imageView );
+  ImageView imageView = ImageView::New(TEST_IMAGE_FILE_NAME);
+  DALI_TEST_CHECK(imageView);
 
-  TestUrl( imageView, TEST_IMAGE_FILE_NAME );
+  TestUrl(imageView, TEST_IMAGE_FILE_NAME);
 
   END_TEST;
 }
@@ -111,7 +159,7 @@ int UtcDaliImageViewConstructorP(void)
 
   ImageView imageView;
 
-  DALI_TEST_CHECK( !imageView );
+  DALI_TEST_CHECK(!imageView);
 
   END_TEST;
 }
@@ -123,8 +171,8 @@ int UtcDaliImageViewCopyConstructorP(void)
   // Initialize an object, ref count == 1
   ImageView imageView = ImageView::New();
 
-  ImageView copy( imageView );
-  DALI_TEST_CHECK( copy );
+  ImageView copy(imageView);
+  DALI_TEST_CHECK(copy);
 
   END_TEST;
 }
@@ -134,15 +182,15 @@ int UtcDaliImageViewMoveConstructor(void)
   ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
-  DALI_TEST_EQUALS( 1, imageView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  imageView.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == imageView.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, imageView.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  imageView.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == imageView.GetProperty<bool>(Actor::Property::SENSITIVE));
 
-  ImageView moved = std::move( imageView );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !imageView );
+  ImageView moved = std::move(imageView);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!imageView);
 
   END_TEST;
 }
@@ -153,9 +201,9 @@ int UtcDaliImageViewAssignmentOperatorP(void)
 
   ImageView imageView = ImageView::New();
 
-  ImageView copy( imageView );
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_EQUALS( imageView, copy, TEST_LOCATION );
+  ImageView copy(imageView);
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_EQUALS(imageView, copy, TEST_LOCATION);
 
   END_TEST;
 }
@@ -165,16 +213,16 @@ int UtcDaliImageViewMoveAssignment(void)
   ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
-  DALI_TEST_EQUALS( 1, imageView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  imageView.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == imageView.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, imageView.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  imageView.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == imageView.GetProperty<bool>(Actor::Property::SENSITIVE));
 
   ImageView moved;
-  moved = std::move( imageView );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !imageView );
+  moved = std::move(imageView);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!imageView);
 
   END_TEST;
 }
@@ -187,10 +235,10 @@ int UtcDaliImageViewDownCastP(void)
 
   BaseHandle object(imageView);
 
-  ImageView imageView2 = ImageView::DownCast( object );
+  ImageView imageView2 = ImageView::DownCast(object);
   DALI_TEST_CHECK(imageView2);
 
-  ImageView imageView3 = DownCast< ImageView >( object );
+  ImageView imageView3 = DownCast<ImageView>(object);
   DALI_TEST_CHECK(imageView3);
 
   END_TEST;
@@ -202,11 +250,11 @@ int UtcDaliImageViewDownCastN(void)
 
   BaseHandle unInitializedObject;
 
-  ImageView imageView1 = ImageView::DownCast( unInitializedObject );
-  DALI_TEST_CHECK( !imageView1 );
+  ImageView imageView1 = ImageView::DownCast(unInitializedObject);
+  DALI_TEST_CHECK(!imageView1);
 
-  ImageView imageView2 = DownCast< ImageView >( unInitializedObject );
-  DALI_TEST_CHECK( !imageView2 );
+  ImageView imageView2 = DownCast<ImageView>(unInitializedObject);
+  DALI_TEST_CHECK(!imageView2);
 
   END_TEST;
 }
@@ -216,16 +264,16 @@ int UtcDaliImageViewTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "ImageView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("ImageView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  ImageView imageView = ImageView::DownCast( handle );
-  DALI_TEST_CHECK( imageView );
+  ImageView imageView = ImageView::DownCast(handle);
+  DALI_TEST_CHECK(imageView);
 
   END_TEST;
 }
@@ -236,11 +284,11 @@ int UtcDaliImageViewSetGetProperty01(void)
 
   ImageView imageView = ImageView::New();
 
-  Property::Index idx = imageView.GetPropertyIndex( "image" );
-  DALI_TEST_EQUALS( idx, (Property::Index)ImageView::Property::IMAGE, TEST_LOCATION );
+  Property::Index idx = imageView.GetPropertyIndex("image");
+  DALI_TEST_EQUALS(idx, (Property::Index)ImageView::Property::IMAGE, TEST_LOCATION);
 
-  imageView.SetProperty( idx, TEST_IMAGE_FILE_NAME );
-  TestUrl( imageView, TEST_IMAGE_FILE_NAME );
+  imageView.SetProperty(idx, TEST_IMAGE_FILE_NAME);
+  TestUrl(imageView, TEST_IMAGE_FILE_NAME);
 
   END_TEST;
 }
@@ -250,110 +298,110 @@ int UtcDaliImageViewPreMultipliedAlphaPng(void)
   ToolkitTestApplication application;
 
   // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable( true );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
   Property::Map imageMap;
-  imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap[ ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER;   // To keep the texture cache
+  imageMap[ImageVisual::Property::URL]            = gImage_34_RGBA;
+  imageMap[ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER; // To keep the texture cache
 
   ImageView imageView1 = ImageView::New();
-  imageView1.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageView1.SetProperty(ImageView::Property::IMAGE, imageMap);
 
-  application.GetScene().Add( imageView1 );
+  application.GetScene().Add(imageView1);
 
-  Property::Value value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA );
-  bool enable;
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( enable );    // Default value is true
+  Property::Value value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA);
+  bool            enable;
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(enable); // Default value is true
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( enable );    // Keep true
+  value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(enable); // Keep true
 
   // conventional alpha blending
-  Renderer renderer1 = imageView1.GetRendererAt( 0 );
-  value = renderer1.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( enable );
-
-  int srcFactorRgb    = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_RGB );
-  int destFactorRgb   = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_RGB );
-  int srcFactorAlpha  = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_ALPHA );
-  int destFactorAlpha = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_ALPHA );
-  DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
-  DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
-
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );  // A new texture should be generated.
+  Renderer renderer1 = imageView1.GetRendererAt(0);
+  value              = renderer1.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(enable);
+
+  int srcFactorRgb    = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_RGB);
+  int destFactorRgb   = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_RGB);
+  int srcFactorAlpha  = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_ALPHA);
+  int destFactorAlpha = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_ALPHA);
+  DALI_TEST_CHECK(srcFactorRgb == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA);
+  DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // A new texture should be generated.
   textureTrace.Reset();
 
   // Disable pre-multiplied alpha blending
-  imageView1.SetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA, false );
+  imageView1.SetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA, false);
 
   // Reload the image
   Property::Map attributes;
-  DevelControl::DoAction( imageView1, ImageView::Property::IMAGE, DevelImageVisual::Action::RELOAD, attributes );
+  DevelControl::DoAction(imageView1, ImageView::Property::IMAGE, DevelImageVisual::Action::RELOAD, attributes);
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( !enable );
+  value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(!enable);
 
   // conventional alpha blending
-  value = renderer1.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( !enable );
-
-  srcFactorRgb    = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_RGB );
-  destFactorRgb   = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_RGB );
-  srcFactorAlpha  = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_ALPHA );
-  destFactorAlpha = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_ALPHA );
-  DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA );
-  DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
-  DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
-
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );  // A new texture should be generated.
+  value = renderer1.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(!enable);
+
+  srcFactorRgb    = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_RGB);
+  destFactorRgb   = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_RGB);
+  srcFactorAlpha  = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_ALPHA);
+  destFactorAlpha = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_ALPHA);
+  DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA);
+  DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA);
+  DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // A new texture should be generated.
   textureTrace.Reset();
 
   // Make a new ImageView using the same image
   ImageView imageView2 = ImageView::New();
-  imageView2.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageView2.SetProperty(ImageView::Property::IMAGE, imageMap);
 
-  application.GetScene().Add( imageView2 );
+  application.GetScene().Add(imageView2);
 
   application.SendNotification();
   application.Render();
 
-  Renderer renderer2 = imageView2.GetRendererAt( 0 );
-  value = renderer2.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( enable );
+  Renderer renderer2 = imageView2.GetRendererAt(0);
+  value              = renderer2.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(enable);
 
-  srcFactorRgb    = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_RGB );
-  destFactorRgb   = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_RGB );
-  srcFactorAlpha  = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_ALPHA );
-  destFactorAlpha = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_ALPHA );
-  DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
-  DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
+  srcFactorRgb    = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_RGB);
+  destFactorRgb   = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_RGB);
+  srcFactorAlpha  = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_ALPHA);
+  destFactorAlpha = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_ALPHA);
+  DALI_TEST_CHECK(srcFactorRgb == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA);
+  DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); // The cached texture should be used.
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); // The cached texture should be used.
 
   END_TEST;
 }
@@ -363,83 +411,83 @@ int UtcDaliImageViewPreMultipliedAlphaJpg(void)
   ToolkitTestApplication application;
 
   // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable( true );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
   Property::Map imageMap;
-  imageMap[ ImageVisual::Property::URL ] = gImage_600_RGB;
-  imageMap[ ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER;   // To keep the texture cache
+  imageMap[ImageVisual::Property::URL]            = gImage_600_RGB;
+  imageMap[ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER; // To keep the texture cache
 
   ImageView imageView1 = ImageView::New();
-  imageView1.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageView1.SetProperty(ImageView::Property::IMAGE, imageMap);
 
-  application.GetScene().Add( imageView1 );
+  application.GetScene().Add(imageView1);
 
-  Property::Value value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA );
-  bool enable;
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( enable );    // Default value is true
+  Property::Value value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA);
+  bool            enable;
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(enable); // Default value is true
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( !enable );    // Should be false after loading
+  value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(!enable); // Should be false after loading
 
   // conventional alpha blending
-  Renderer renderer1 = imageView1.GetRendererAt( 0 );
-  value = renderer1.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( !enable );
-
-  int srcFactorRgb    = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_RGB );
-  int destFactorRgb   = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_RGB );
-  int srcFactorAlpha  = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_ALPHA );
-  int destFactorAlpha = renderer1.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_ALPHA );
-  DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA );
-  DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
-  DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
-
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );  // A new texture should be generated.
+  Renderer renderer1 = imageView1.GetRendererAt(0);
+  value              = renderer1.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(!enable);
+
+  int srcFactorRgb    = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_RGB);
+  int destFactorRgb   = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_RGB);
+  int srcFactorAlpha  = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_ALPHA);
+  int destFactorAlpha = renderer1.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_ALPHA);
+  DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA);
+  DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA);
+  DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // A new texture should be generated.
   textureTrace.Reset();
 
   ImageView imageView2 = ImageView::New();
-  imageView2.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageView2.SetProperty(ImageView::Property::IMAGE, imageMap);
 
   // Disable pre-multiplied alpha blending
-  imageView2.SetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA, false );
+  imageView2.SetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA, false);
 
-  application.GetScene().Add( imageView2 );
+  application.GetScene().Add(imageView2);
 
   application.SendNotification();
   application.Render();
 
-  value = imageView2.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( !enable );
+  value = imageView2.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(!enable);
 
   // conventional alpha blending
-  Renderer renderer2 = imageView2.GetRendererAt( 0 );
-  value = renderer2.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_CHECK( value.Get( enable ) );
-  DALI_TEST_CHECK( !enable );
-
-  srcFactorRgb    = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_RGB );
-  destFactorRgb   = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_RGB );
-  srcFactorAlpha  = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_ALPHA );
-  destFactorAlpha = renderer2.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_ALPHA );
-  DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA );
-  DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
-  DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
-
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); // The cached texture should be used.
+  Renderer renderer2 = imageView2.GetRendererAt(0);
+  value              = renderer2.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_CHECK(value.Get(enable));
+  DALI_TEST_CHECK(!enable);
+
+  srcFactorRgb    = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_RGB);
+  destFactorRgb   = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_RGB);
+  srcFactorAlpha  = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_ALPHA);
+  destFactorAlpha = renderer2.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_ALPHA);
+  DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA);
+  DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA);
+  DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); // The cached texture should be used.
 
   END_TEST;
 }
@@ -450,92 +498,90 @@ int UtcDaliImageViewPixelArea(void)
   ToolkitTestApplication application;
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("pixelArea", Property::Type::VECTOR4),
-  };
+    {
+      UniformData("pixelArea", Property::Type::VECTOR4),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   // Gif image, use AnimatedImageVisual internally
   // Atlasing is applied to pack multiple frames, use custom wrap mode
-  ImageView gifView = ImageView::New();
-  const Vector4 pixelAreaVisual( 0.f, 0.f, 2.f, 2.f );
-  gifView.SetProperty( ImageView::Property::IMAGE,
-                       Property::Map().Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-                                      .Add( ImageVisual::Property::PIXEL_AREA, pixelAreaVisual ) );
+  ImageView     gifView = ImageView::New();
+  const Vector4 pixelAreaVisual(0.f, 0.f, 2.f, 2.f);
+  gifView.SetProperty(ImageView::Property::IMAGE,
+                      Property::Map().Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME).Add(ImageVisual::Property::PIXEL_AREA, pixelAreaVisual));
 
   // Add to stage
   Integration::Scene stage = application.GetScene();
-  stage.Add( gifView );
+  stage.Add(gifView);
 
   // loading started
   application.SendNotification();
   application.Render(16);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gifView.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(gifView.GetRendererCount() == 1u);
 
-  const Vector4 fullTextureRect( 0.f, 0.f, 1.f, 1.f );
+  const Vector4 fullTextureRect(0.f, 0.f, 1.f, 1.f);
   // test that the pixel area value defined in the visual property map is registered on renderer
-  Renderer renderer = gifView.GetRendererAt(0);
-  Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) );
-  DALI_TEST_EQUALS( pixelAreaValue.Get<Vector4>(), pixelAreaVisual, TEST_LOCATION );
+  Renderer        renderer       = gifView.GetRendererAt(0);
+  Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea"));
+  DALI_TEST_EQUALS(pixelAreaValue.Get<Vector4>(), pixelAreaVisual, TEST_LOCATION);
 
   // test that the shader has the default pixel area value registered.
-  Shader shader = renderer.GetShader();
-  pixelAreaValue = shader.GetProperty( shader.GetPropertyIndex( "pixelArea" ) );
-  DALI_TEST_EQUALS( pixelAreaValue.Get<Vector4>(), fullTextureRect, TEST_LOCATION );
+  Shader shader  = renderer.GetShader();
+  pixelAreaValue = shader.GetProperty(shader.GetPropertyIndex("pixelArea"));
+  DALI_TEST_EQUALS(pixelAreaValue.Get<Vector4>(), fullTextureRect, TEST_LOCATION);
 
   // test that the uniform uses the pixelArea property on the renderer.
   TestGlAbstraction& gl = application.GetGlAbstraction();
-  Vector4 pixelAreaUniform;
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "pixelArea", pixelAreaUniform ) );
-  DALI_TEST_EQUALS( pixelAreaVisual, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  Vector4            pixelAreaUniform;
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("pixelArea", pixelAreaUniform));
+  DALI_TEST_EQUALS(pixelAreaVisual, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   // set the pixelArea property on the control
-  const Vector4 pixelAreaControl( -1.f, -1.f, 3.f, 3.f );
-  gifView.SetProperty( ImageView::Property::PIXEL_AREA, pixelAreaControl );
+  const Vector4 pixelAreaControl(-1.f, -1.f, 3.f, 3.f);
+  gifView.SetProperty(ImageView::Property::PIXEL_AREA, pixelAreaControl);
   application.SendNotification();
   application.Render(16);
 
   // check the pixelArea property on the control
-  pixelAreaValue = gifView.GetProperty( gifView.GetPropertyIndex( "pixelArea" ) );
-  DALI_TEST_EQUALS( pixelAreaValue.Get<Vector4>(), pixelAreaControl, TEST_LOCATION );
+  pixelAreaValue = gifView.GetProperty(gifView.GetPropertyIndex("pixelArea"));
+  DALI_TEST_EQUALS(pixelAreaValue.Get<Vector4>(), pixelAreaControl, TEST_LOCATION);
   // test that the uniform uses the pixelArea property on the control.
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "pixelArea", pixelAreaUniform ) );
-  DALI_TEST_EQUALS( pixelAreaControl, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION );
-
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("pixelArea", pixelAreaUniform));
+  DALI_TEST_EQUALS(pixelAreaControl, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliImageViewAsyncLoadingWithoutAltasing(void)
 {
-  ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  const std::vector<GLuint>& textures = gl.GetBoundTextures();
-  size_t numTextures = textures.size();
+  ToolkitTestApplication     application;
+  TestGlAbstraction&         gl          = application.GetGlAbstraction();
+  const std::vector<GLuint>& textures    = gl.GetBoundTextures();
+  size_t                     numTextures = textures.size();
 
   // Async loading, no atlasing for big size image
-  ImageView imageView = ImageView::New( gImage_600_RGB );
+  ImageView imageView = ImageView::New(gImage_600_RGB);
 
   // By default, Aysnc loading is used
-  application.GetScene().Add( imageView );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(100, 100) );
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  application.GetScene().Add(imageView);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
   application.SendNotification();
 
   const std::vector<GLuint>& textures2 = gl.GetBoundTextures();
-  DALI_TEST_GREATER( textures2.size(), numTextures, TEST_LOCATION );
+  DALI_TEST_GREATER(textures2.size(), numTextures, TEST_LOCATION);
 
   END_TEST;
 }
@@ -551,32 +597,24 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing(void)
 
   Property::Map imageMap;
 
-  imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
-  imageMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
-  imageMap[ ImageVisual::Property::ATLASING] = true;
+  imageMap[ImageVisual::Property::URL]            = gImage_34_RGBA;
+  imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 34;
+  imageMap[ImageVisual::Property::DESIRED_WIDTH]  = 34;
+  imageMap[ImageVisual::Property::ATLASING]       = true;
 
   ImageView imageView = ImageView::New();
-  imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Toolkit::Control::Property::PADDING, Extents( 10u, 10u, 10u, 10u ) );
+  imageView.SetProperty(ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u));
 
   // By default, Aysnc loading is used
   // loading is not started if the actor is offScene
 
-  application.GetScene().Add( imageView );
-  application.SendNotification();
-  application.Render(16);
-  application.Render(16);
-  application.SendNotification();
+  application.GetScene().Add(imageView);
 
-  imageView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION,  Dali::LayoutDirection::RIGHT_TO_LEFT );
-  application.SendNotification();
-  application.Render(16);
-  application.Render(16);
-  application.SendNotification();
+  imageView.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT);
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
@@ -586,7 +624,7 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing(void)
   TraceCallStack::NamedParams params;
   params["width"] << 34;
   params["height"] << 34;
-DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -601,23 +639,19 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing02(void)
   callStack.Enable(true);
 
   Property::Map asyncLoadingMap;
-  asyncLoadingMap[ "url" ] = gImage_34_RGBA;
-  asyncLoadingMap[ "desiredHeight" ] = 34;
-  asyncLoadingMap[ "desiredWidth" ] = 34;
-  asyncLoadingMap[ "synchronousLoading" ] = false;
-  asyncLoadingMap[ "atlasing" ] = true;
+  asyncLoadingMap["url"]                = gImage_34_RGBA;
+  asyncLoadingMap["desiredHeight"]      = 34;
+  asyncLoadingMap["desiredWidth"]       = 34;
+  asyncLoadingMap["synchronousLoading"] = false;
+  asyncLoadingMap["atlasing"]           = true;
 
   ImageView imageView = ImageView::New();
-  imageView.SetProperty( ImageView::Property::IMAGE, asyncLoadingMap );
+  imageView.SetProperty(ImageView::Property::IMAGE, asyncLoadingMap);
 
-  application.GetScene().Add( imageView );
-  application.SendNotification();
-  application.Render(16);
-  application.Render(16);
-  application.SendNotification();
+  application.GetScene().Add(imageView);
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
@@ -627,7 +661,7 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing02(void)
   TraceCallStack::NamedParams params;
   params["width"] << 34;
   params["height"] << 34;
-  DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -639,16 +673,16 @@ int UtcDaliImageViewSyncLoading(void)
   tet_infoline("ImageView Testing sync loading and size using index key property map");
 
   Property::Map syncLoadingMap;
-  syncLoadingMap[ ImageVisual::Property::SYNCHRONOUS_LOADING ] = true;
-  syncLoadingMap[ ImageVisual::Property::ATLASING ] = true;
+  syncLoadingMap[ImageVisual::Property::SYNCHRONOUS_LOADING] = true;
+  syncLoadingMap[ImageVisual::Property::ATLASING]            = true;
 
   // Sync loading, no atlasing for big size image
   {
     ImageView imageView = ImageView::New();
 
     // Sync loading is used
-    syncLoadingMap[ ImageVisual::Property::URL ] = gImage_600_RGB;
-    imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap );
+    syncLoadingMap[ImageVisual::Property::URL] = gImage_600_RGB;
+    imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap);
   }
 
   // Sync loading, automatic atlasing for small size image
@@ -657,23 +691,24 @@ int UtcDaliImageViewSyncLoading(void)
     callStack.Reset();
     callStack.Enable(true);
 
-    ImageView imageView = ImageView::New( );
+    ImageView imageView = ImageView::New();
 
     // Sync loading is used
-    syncLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-    syncLoadingMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
-    syncLoadingMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
-    imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap );
+    syncLoadingMap[ImageVisual::Property::URL]            = gImage_34_RGBA;
+    syncLoadingMap[ImageVisual::Property::DESIRED_HEIGHT] = 34;
+    syncLoadingMap[ImageVisual::Property::DESIRED_WIDTH]  = 34;
+    imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap);
 
-    application.GetScene().Add( imageView );
+    application.GetScene().Add(imageView);
     application.SendNotification();
     application.Render(16);
 
     TraceCallStack::NamedParams params;
     params["width"] << 34;
     params["height"] << 34;
-    DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
-                      true, TEST_LOCATION );
+    DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params),
+                     true,
+                     TEST_LOCATION);
   }
   END_TEST;
 }
@@ -690,36 +725,37 @@ int UtcDaliImageViewSyncLoading02(void)
     callStack.Reset();
     callStack.Enable(true);
 
-    ImageView imageView = ImageView::New( );
+    ImageView imageView = ImageView::New();
 
     // Sync loading is used
     Property::Map syncLoadingMap;
-    syncLoadingMap[ "url" ] = gImage_34_RGBA;
-    syncLoadingMap[ "desiredHeight" ] = 34;
-    syncLoadingMap[ "desiredWidth" ] = 34;
-    syncLoadingMap[ "synchronousLoading" ] = true;
-    syncLoadingMap[ "atlasing" ] = true;
-    imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap );
-
-    application.GetScene().Add( imageView );
+    syncLoadingMap["url"]                = gImage_34_RGBA;
+    syncLoadingMap["desiredHeight"]      = 34;
+    syncLoadingMap["desiredWidth"]       = 34;
+    syncLoadingMap["synchronousLoading"] = true;
+    syncLoadingMap["atlasing"]           = true;
+    imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap);
+
+    application.GetScene().Add(imageView);
     application.SendNotification();
     application.Render(16);
 
     TraceCallStack::NamedParams params;
     params["width"] << 34;
     params["height"] << 34;
-    DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
-                      true, TEST_LOCATION );
+    DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params),
+                     true,
+                     TEST_LOCATION);
   }
   END_TEST;
 }
 
 int UtcDaliImageViewAsyncLoadingEncodedBuffer(void)
 {
-  ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  const std::vector<GLuint>& textures = gl.GetBoundTextures();
-  size_t numTextures = textures.size();
+  ToolkitTestApplication     application;
+  TestGlAbstraction&         gl          = application.GetGlAbstraction();
+  const std::vector<GLuint>& textures    = gl.GetBoundTextures();
+  size_t                     numTextures = textures.size();
 
   // Get encoded raw-buffer image and generate url
   EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_600_RGB);
@@ -730,17 +766,17 @@ int UtcDaliImageViewAsyncLoadingEncodedBuffer(void)
 
   // By default, Aysnc loading is used
   application.GetScene().Add(imageView);
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(100, 100) );
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
   application.SendNotification();
 
   const std::vector<GLuint>& textures2 = gl.GetBoundTextures();
-  DALI_TEST_GREATER( textures2.size(), numTextures, TEST_LOCATION );
+  DALI_TEST_GREATER(textures2.size(), numTextures, TEST_LOCATION);
 
   END_TEST;
 }
@@ -761,7 +797,7 @@ int UtcDaliImageViewAsyncLoadingEncodedBufferWithAtlasing(void)
   DALI_TEST_CHECK(url.GetUrl() == url2.GetUrl());
 
   EncodedImageBuffer buffer2 = ConvertFileToEncodedImageBuffer(gImage_600_RGB);
-  url2 = Toolkit::Image::GenerateUrl(buffer2);
+  url2                       = Toolkit::Image::GenerateUrl(buffer2);
 
   // Check whethere two url are not equal
   DALI_TEST_CHECK(url.GetUrl() != url2.GetUrl());
@@ -773,36 +809,53 @@ int UtcDaliImageViewAsyncLoadingEncodedBufferWithAtlasing(void)
 
   Property::Map imageMap;
 
-  imageMap[ ImageVisual::Property::URL ] = url.GetUrl();
-  imageMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
-  imageMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
-  imageMap[ ImageVisual::Property::ATLASING] = true;
+  imageMap[ImageVisual::Property::URL]            = url.GetUrl();
+  imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 600;
+  imageMap[ImageVisual::Property::DESIRED_WIDTH]  = 600;
+  imageMap[ImageVisual::Property::ATLASING]       = true;
+
+  // No atlasing with big image
+  ImageView imageView_bigdesired = ImageView::New();
+  imageView_bigdesired.SetProperty(ImageView::Property::IMAGE, imageMap);
+  imageView_bigdesired.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u));
+
+  imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 0;
+  imageMap[ImageVisual::Property::DESIRED_WIDTH]  = 0;
+
+  // No atlasing with zero desired size
+  ImageView imageView_nodesired = ImageView::New();
+  imageView_nodesired.SetProperty(ImageView::Property::IMAGE, imageMap);
+  imageView_nodesired.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u));
+
+  imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 34;
+  imageMap[ImageVisual::Property::DESIRED_WIDTH]  = 34;
 
   ImageView imageView = ImageView::New();
-  imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Toolkit::Control::Property::PADDING, Extents( 10u, 10u, 10u, 10u ) );
+  imageView.SetProperty(ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u));
 
   // By default, Aysnc loading is used
   // loading is not started if the actor is offScene
-
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
+  application.GetScene().Add(imageView_bigdesired);
+  application.GetScene().Add(imageView_nodesired);
   application.SendNotification();
   application.Render(16);
+
+  // loading started, this waits for the loader thread for max 30 seconds
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
   application.Render(16);
   application.SendNotification();
 
   // Change url to url2
-  imageMap[ ImageVisual::Property::URL ] = url2.GetUrl();
-  imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageMap[ImageVisual::Property::URL] = url2.GetUrl();
+  imageView.SetProperty(ImageView::Property::IMAGE, imageMap);
 
-  imageView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION,  Dali::LayoutDirection::RIGHT_TO_LEFT );
-  application.SendNotification();
-  application.Render(16);
-  application.Render(16);
-  application.SendNotification();
+  imageView.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT);
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
@@ -812,7 +865,7 @@ int UtcDaliImageViewAsyncLoadingEncodedBufferWithAtlasing(void)
   TraceCallStack::NamedParams params;
   params["width"] << 34;
   params["height"] << 34;
-  DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -833,31 +886,153 @@ int UtcDaliImageViewSyncLoadingEncodedBuffer(void)
     callStack.Reset();
     callStack.Enable(true);
 
-    ImageView imageView = ImageView::New( );
+    ImageView imageView = ImageView::New();
 
     // Sync loading is used
     Property::Map syncLoadingMap;
-    syncLoadingMap[ "url" ] = url.GetUrl();
-    syncLoadingMap[ "desiredHeight" ] = 34;
-    syncLoadingMap[ "desiredWidth" ] = 34;
-    syncLoadingMap[ "synchronousLoading" ] = true;
-    syncLoadingMap[ "atlasing" ] = true;
-    imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap );
-
-    application.GetScene().Add( imageView );
+    syncLoadingMap["url"]                = url.GetUrl();
+    syncLoadingMap["alphaMaskUrl"]       = gImage_34_RGBA;
+    syncLoadingMap["desiredHeight"]      = 34;
+    syncLoadingMap["desiredWidth"]       = 34;
+    syncLoadingMap["synchronousLoading"] = true;
+    syncLoadingMap["atlasing"]           = true;
+    imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap);
+
+    application.GetScene().Add(imageView);
     application.SendNotification();
     application.Render(16);
 
     TraceCallStack::NamedParams params;
     params["width"] << 34;
     params["height"] << 34;
-    DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
-                      true, TEST_LOCATION );
+    DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params),
+                     true,
+                     TEST_LOCATION);
   }
 
   END_TEST;
 }
 
+int UtcDaliImageViewEncodedBufferWithSvg(void)
+{
+  ToolkitTestApplication     application;
+  TestGlAbstraction&         gl          = application.GetGlAbstraction();
+  const std::vector<GLuint>& textures    = gl.GetBoundTextures();
+  size_t                     numTextures = textures.size();
+
+  // Get encoded raw-buffer svg image and generate url
+  EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(TEST_SVG_FILE_NAME, EncodedImageBuffer::ImageType::VECTOR_IMAGE);
+  ImageUrl           url    = Toolkit::Image::GenerateUrl(buffer);
+
+  // Async loading, no atlasing for big size image
+  ImageView imageView = ImageView::New(url.GetUrl());
+
+  // By default, Aysnc loading is used
+  application.GetScene().Add(imageView);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // Load svg image + rasterize.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+  application.SendNotification();
+
+  const std::vector<GLuint>& textures2 = gl.GetBoundTextures();
+  DALI_TEST_GREATER(textures2.size(), numTextures, TEST_LOCATION);
+
+  // Remove visual, for line coverage.
+  imageView.Unparent();
+  application.SendNotification();
+  application.Render(16);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewEncodedBufferWithAnimatedVectorImage(void)
+{
+  ToolkitTestApplication     application;
+  TestGlAbstraction&         gl          = application.GetGlAbstraction();
+  const std::vector<GLuint>& textures    = gl.GetBoundTextures();
+  size_t                     numTextures = textures.size();
+
+  // Get encoded raw-buffer lottie image and generate url
+  EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, EncodedImageBuffer::ImageType::ANIMATED_VECTOR_IMAGE);
+  ImageUrl           url    = Toolkit::Image::GenerateUrl(buffer);
+
+  // Async loading, no atlasing for big size image
+  ImageView imageView = ImageView::New(url.GetUrl());
+
+  // By default, Aysnc loading is used
+  application.GetScene().Add(imageView);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // Load lottie image is sync. Only wait rasterize.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+  application.SendNotification();
+
+  const std::vector<GLuint>& textures2 = gl.GetBoundTextures();
+  DALI_TEST_GREATER(textures2.size(), numTextures, TEST_LOCATION);
+
+  // Remove visual, for line coverage.
+  imageView.Unparent();
+  application.SendNotification();
+  application.Render(16);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewEncodedBufferWithInvalidImageType(void)
+{
+  ToolkitTestApplication     application;
+  TestGlAbstraction&         gl          = application.GetGlAbstraction();
+  const std::vector<GLuint>& textures    = gl.GetBoundTextures();
+  size_t                     numTextures = textures.size();
+
+  // Get encoded raw-buffer jpg image with invalid image type, and generate url
+  EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_34_RGBA, static_cast<EncodedImageBuffer::ImageType>(-1));
+  ImageUrl           url    = Toolkit::Image::GenerateUrl(buffer);
+
+  // Async loading, no atlasing for big size image
+  ImageView imageView = ImageView::New(url.GetUrl());
+
+  // By default, Aysnc loading is used
+  application.GetScene().Add(imageView);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // Load image
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+  application.SendNotification();
+
+  const std::vector<GLuint>& textures2 = gl.GetBoundTextures();
+  DALI_TEST_GREATER(textures2.size(), numTextures, TEST_LOCATION);
+
+  // Remove visual, for line coverage.
+  imageView.Unparent();
+  application.SendNotification();
+  application.Render(16);
+
+  END_TEST;
+}
+
 int UtcDaliImageViewAddedTexture(void)
 {
   ToolkitTestApplication application;
@@ -875,7 +1050,7 @@ int UtcDaliImageViewAddedTexture(void)
   propertyMap[ImageVisual::Property::URL] = url;
   imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
   application.SendNotification();
   application.Render();
 
@@ -886,25 +1061,24 @@ int UtcDaliImageViewSizeWithBackground(void)
 {
   ToolkitTestApplication application;
 
-  int width = 100;
-  int height = 200;
+  int       width     = 100;
+  int       height    = 200;
   ImageView imageView = ImageView::New();
 
-  imageView.SetProperty( Control::Property::BACKGROUND,
-                         {
-                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
-                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
-                           { ImageVisual::Property::DESIRED_WIDTH, width },
-                           { ImageVisual::Property::DESIRED_HEIGHT, height },
-                         }
-                       );
+  imageView.SetProperty(Control::Property::BACKGROUND,
+                        {
+                          {Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
+                          {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"},
+                          {ImageVisual::Property::DESIRED_WIDTH, width},
+                          {ImageVisual::Property::DESIRED_HEIGHT, height},
+                        });
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, (float)width, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, (float)height, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetCurrentProperty<Vector3>(Actor::Property::SIZE).width, (float)width, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height, (float)height, TEST_LOCATION);
 
   END_TEST;
 }
@@ -913,30 +1087,29 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void)
 {
   ToolkitTestApplication application;
 
-  int widthBackground = 100;
+  int widthBackground  = 100;
   int heightBackground = 200;
-  int width = 600;
-  int height = 600;
+  int width            = 600;
+  int height           = 600;
 
   ImageView imageView = ImageView::New();
 
-  imageView.SetProperty( Control::Property::BACKGROUND,
-                         {
-                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
-                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
-                           { ImageVisual::Property::DESIRED_WIDTH, widthBackground },
-                           { ImageVisual::Property::DESIRED_HEIGHT, heightBackground },
-                          }
-                       );
+  imageView.SetProperty(Control::Property::BACKGROUND,
+                        {
+                          {Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
+                          {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"},
+                          {ImageVisual::Property::DESIRED_WIDTH, widthBackground},
+                          {ImageVisual::Property::DESIRED_HEIGHT, heightBackground},
+                        });
 
-  imageView.SetImage( gImage_600_RGB ); // 1 to 1 ratio, 600x600 pixels
+  imageView.SetImage(gImage_600_RGB); // 1 to 1 ratio, 600x600 pixels
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, (float)width, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, (float)height, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetCurrentProperty<Vector3>(Actor::Property::SIZE).width, (float)width, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height, (float)height, TEST_LOCATION);
 
   END_TEST;
 }
@@ -945,28 +1118,25 @@ int UtcDaliImageViewHeightForWidthBackground(void)
 {
   ToolkitTestApplication application;
 
-  int widthBackground = 100;
+  int widthBackground  = 100;
   int heightBackground = 200;
 
   ImageView imageView = ImageView::New();
 
-  imageView.SetProperty( Control::Property::BACKGROUND,
-                         {
-                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
-                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
-                           { ImageVisual::Property::DESIRED_WIDTH, widthBackground },
-                           { ImageVisual::Property::DESIRED_HEIGHT, heightBackground }
-                         }
-                       );
+  imageView.SetProperty(Control::Property::BACKGROUND,
+                        {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
+                         {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"},
+                         {ImageVisual::Property::DESIRED_WIDTH, widthBackground},
+                         {ImageVisual::Property::DESIRED_HEIGHT, heightBackground}});
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
   application.SendNotification();
   application.Render();
 
-  Control control = Control::DownCast( imageView );
-  DALI_TEST_CHECK( control );
-  DALI_TEST_EQUALS( imageView.GetHeightForWidth( 123.f ), control.GetHeightForWidth( 123.f ), TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetWidthForHeight( 321.f ), control.GetWidthForHeight( 321.f ), TEST_LOCATION );
+  Control control = Control::DownCast(imageView);
+  DALI_TEST_CHECK(control);
+  DALI_TEST_EQUALS(imageView.GetHeightForWidth(123.f), control.GetHeightForWidth(123.f), TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetWidthForHeight(321.f), control.GetWidthForHeight(321.f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -975,30 +1145,27 @@ int UtcDaliImageViewHeightForWidthBackgroundAndImage(void)
 {
   ToolkitTestApplication application;
 
-  int widthBackground = 100;
+  int widthBackground  = 100;
   int heightBackground = 200;
-  int width = 300;
-  int height = 300;
+  int width            = 300;
+  int height           = 300;
 
   ImageView imageView = ImageView::New();
 
-  imageView.SetProperty( Control::Property::BACKGROUND,
-                         {
-                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
-                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
-                           { ImageVisual::Property::DESIRED_WIDTH, widthBackground },
-                           { ImageVisual::Property::DESIRED_HEIGHT, heightBackground }
-                         }
-                       ); // 1 to 2 ratio
+  imageView.SetProperty(Control::Property::BACKGROUND,
+                        {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
+                         {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"},
+                         {ImageVisual::Property::DESIRED_WIDTH, widthBackground},
+                         {ImageVisual::Property::DESIRED_HEIGHT, heightBackground}}); // 1 to 2 ratio
 
-  imageView.SetImage( gImage_600_RGB ); // 1 to 1 ratio
+  imageView.SetImage(gImage_600_RGB); // 1 to 1 ratio
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetHeightForWidth( width ), (float)height, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetWidthForHeight( height ), (float)width, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetHeightForWidth(width), (float)height, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetWidthForHeight(height), (float)width, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1008,24 +1175,40 @@ int UtcDaliImageViewSetImageUrl(void)
   ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
-  imageView.SetImage( TEST_IMAGE_FILE_NAME );
-  TestUrl( imageView, TEST_IMAGE_FILE_NAME );
+  imageView.SetImage(TEST_IMAGE_FILE_NAME);
+  TestUrl(imageView, TEST_IMAGE_FILE_NAME);
 
-
-  imageView.SetImage( TEST_IMAGE_FILE_NAME2 );
-  TestUrl( imageView, TEST_IMAGE_FILE_NAME2 );
+  imageView.SetImage(TEST_IMAGE_FILE_NAME2);
+  TestUrl(imageView, TEST_IMAGE_FILE_NAME2);
 
   END_TEST;
 }
 
-bool gResourceReadySignalFired = false;
+bool    gResourceReadySignalFired = false;
 Vector3 gNaturalSize;
 
-void ResourceReadySignal( Control control )
+void ResourceReadySignal(Control control)
 {
   gResourceReadySignalFired = true;
 }
 
+void OnResourceReadySignalSVG(Control control)
+{
+  // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(control);
+  Toolkit::Visual::Base       imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+  Property::Map               resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(transformValue);
+  Property::Map* retMap = transformValue->GetMap();
+  DALI_TEST_CHECK(retMap);
+
+  // Fitting mode should not be applied at this point
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::SIZE)->Get<Vector2>(), Vector2::ZERO, TEST_LOCATION);
+}
+
 int UtcDaliImageViewCheckResourceReady(void)
 {
   ToolkitTestApplication application;
@@ -1033,37 +1216,34 @@ int UtcDaliImageViewCheckResourceReady(void)
   gResourceReadySignalFired = false;
 
   // Check ImageView with background and main image, to ensure both visuals are marked as loaded
-  ImageView imageView = ImageView::New( TEST_GIF_FILE_NAME );
+  ImageView imageView = ImageView::New(TEST_GIF_FILE_NAME);
 
-  imageView.SetProperty( Control::Property::BACKGROUND,
-                         {
-                           { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE },
-                           { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" },
-                           { ImageVisual::Property::DESIRED_WIDTH, 100 },
-                           { ImageVisual::Property::DESIRED_HEIGHT, 200 }
-                          }
-                       );
+  imageView.SetProperty(Control::Property::BACKGROUND,
+                        {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
+                         {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"},
+                         {ImageVisual::Property::DESIRED_WIDTH, 100},
+                         {ImageVisual::Property::DESIRED_HEIGHT, 200}});
 
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
 
-  imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // loading started, this waits for the loader thread
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1072,95 +1252,124 @@ int UtcDaliImageViewSetImageTypeChangesP(void)
 {
   ToolkitTestApplication application;
 
-  ImageView imageView = ImageView::New();
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
+  ImageView                   imageView   = ImageView::New();
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView);
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
-  std::string url;
-  Property::Map map;
+  std::string           url;
+  Property::Map         map;
   Toolkit::Visual::Base visual;
 
-  Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-  visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  Property::Value value = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual                = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render(16);
 
-  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
-  value.Get( map );
-  DALI_TEST_CHECK( map.Empty() );        // Value should be empty
-  DALI_TEST_CHECK( ! visual );           // Visual should be invalid
+  DALI_TEST_CHECK(!value.Get(url)); // Value should be empty
+  value.Get(map);
+  DALI_TEST_CHECK(map.Empty()); // Value should be empty
+  DALI_TEST_CHECK(!visual);     // Visual should be invalid
 
   // Set a URL
-  imageView.SetImage( "TEST_URL" );
+  imageView.SetImage("TEST_URL");
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render(16);
 
-  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-  visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  value  = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
 
-  DALI_TEST_CHECK( value.Get( url ) );   // Value should NOT be empty
-  DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
-  DALI_TEST_CHECK( visual );             // Visual should be valid
+  DALI_TEST_CHECK(value.Get(url));  // Value should NOT be empty
+  DALI_TEST_CHECK(!value.Get(map)); // Value should be empty
+  DALI_TEST_CHECK(visual);          // Visual should be valid
 
   // Set an empty URL
-  imageView.SetImage( "" );
+  imageView.SetImage("");
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render(16);
 
-  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-  visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  value  = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
 
-  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
-  value.Get( map );
-  DALI_TEST_CHECK( map.Empty() );        // Value should be empty
-  DALI_TEST_CHECK( ! visual );           // Visual should be invalid
+  DALI_TEST_CHECK(!value.Get(url)); // Value should be empty
+  value.Get(map);
+  DALI_TEST_CHECK(map.Empty()); // Value should be empty
+  DALI_TEST_CHECK(!visual);     // Visual should be invalid
 
   // Set a URL in property map
   Property::Map propertyMap;
   propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
-  imageView.SetProperty( ImageView::Property::IMAGE, propertyMap );
+  imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render(16);
 
-  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-  visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  value  = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
 
-  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
-  DALI_TEST_CHECK( value.Get( map ) );   // Value should NOT be empty
-  DALI_TEST_CHECK( visual );             // Visual should be valid
+  DALI_TEST_CHECK(!value.Get(url)); // Value should be empty
+  DALI_TEST_CHECK(value.Get(map));  // Value should NOT be empty
+  DALI_TEST_CHECK(visual);          // Visual should be valid
 
   // Set a URL in property map again
   propertyMap[ImageVisual::Property::URL] = gImage_34_RGBA;
-  imageView.SetProperty( ImageView::Property::IMAGE, propertyMap );
+  imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render(16);
 
-  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-  visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  value  = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
 
-  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
-  DALI_TEST_CHECK( value.Get( map ) );   // Value should NOT be empty
-  DALI_TEST_CHECK( visual );             // Visual should be valid
+  DALI_TEST_CHECK(!value.Get(url)); // Value should be empty
+  DALI_TEST_CHECK(value.Get(map));  // Value should NOT be empty
+  DALI_TEST_CHECK(visual);          // Visual should be valid
 
   // Set an empty URL in property map
   propertyMap[ImageVisual::Property::URL] = std::string();
-  imageView.SetProperty( ImageView::Property::IMAGE, propertyMap );
+  imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
+
+  application.SendNotification();
+  application.Render(16);
+
+  value  = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+
+  DALI_TEST_CHECK(!value.Get(url)); // Value should be empty
+  DALI_TEST_CHECK(value.Get(map));  // Value should NOT be empty
+  DALI_TEST_CHECK(!visual);         // Visual should be invalid
+
+  // Set a URL in property map again
+  propertyMap[ImageVisual::Property::URL] = gImage_34_RGBA;
+  imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
+
+  application.SendNotification();
+  application.Render(16);
+
+  value  = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+
+  DALI_TEST_CHECK(!value.Get(url)); // Value should be empty
+  DALI_TEST_CHECK(value.Get(map));  // Value should NOT be empty
+  DALI_TEST_CHECK(visual);          // Visual should be valid
+
+  // Set an empty property map
+  propertyMap.Clear();
+  imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render(16);
 
-  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-  visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+  value  = imageView.GetProperty(imageView.GetPropertyIndex("image"));
+  visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
 
-  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
-  DALI_TEST_CHECK( value.Get( map ) );   // Value should NOT be empty
-  DALI_TEST_CHECK( ! visual );           // Visual should be invalid
+  DALI_TEST_CHECK(!value.Get(url)); // Value should be empty
+  DALI_TEST_CHECK(value.Get(map));  // Value should NOT be empty
+  DALI_TEST_CHECK(map.Empty());     // But PropertyMap should be empty
+  DALI_TEST_CHECK(!visual);         // Visual should be invalid
 
   END_TEST;
 }
@@ -1170,10 +1379,10 @@ int UtcDaliImageViewResourceUrlP(void)
   ToolkitTestApplication application;
 
   ImageView imageView = ImageView::New();
-  DALI_TEST_CHECK( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >().empty() );
+  DALI_TEST_CHECK(imageView.GetProperty(ImageView::Property::IMAGE).Get<std::string>().empty());
 
-  imageView.SetProperty( ImageView::Property::IMAGE, "TestString" );
-  DALI_TEST_EQUALS( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >(), "TestString", TEST_LOCATION );
+  imageView.SetProperty(ImageView::Property::IMAGE, "TestString");
+  DALI_TEST_EQUALS(imageView.GetProperty(ImageView::Property::IMAGE).Get<std::string>(), "TestString", TEST_LOCATION);
 
   END_TEST;
 }
@@ -1185,23 +1394,23 @@ int UtcDaliImageViewReplaceImage(void)
   gResourceReadySignalFired = false;
 
   // Check ImageView with background and main image, to ensure both visuals are marked as loaded
-  ImageView imageView = ImageView::New( TEST_IMAGE_1 );
+  ImageView imageView = ImageView::New(TEST_IMAGE_1);
 
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
 
-  imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   application.SendNotification();
   application.Render(16);
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
   gResourceReadySignalFired = false;
 
@@ -1211,93 +1420,161 @@ int UtcDaliImageViewReplaceImage(void)
   application.Render(16);
 
   // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-void OnRelayoutOverride( Size size )
-{
-  gNaturalSize = size; // Size Relayout is using
-}
-
-int UtcDaliImageViewReplaceImageAndGetNaturalSize(void)
+int UtcDaliImageViewReloadAlphaMaskImage(void)
 {
   ToolkitTestApplication application;
 
-  // Check ImageView with background and main image, to ensure both visuals are marked as loaded
-  ImageView imageView = ImageView::New( TEST_IMAGE_1 );
-  imageView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+  gResourceReadySignalFired = false;
 
-  DummyControl dummyControl = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyControl.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
+  ImageView     dummy     = ImageView::New();
+  ImageView     imageView = ImageView::New();
+  Property::Map propertyMap;
+
+  // To keep alpha mask cached, scene on some dummy image.
+  // Note : If we don't cache alpha mask image, the reference count of mask image become zero.
+  // In this case, we might need to wait mask image loading, which is not neccesary & can be changed behavior.
+  propertyMap[ImageVisual::Property::URL]            = gImage_600_RGB;
+  propertyMap[ImageVisual::Property::ALPHA_MASK_URL] = TEST_BROKEN_IMAGE_DEFAULT;
+  dummy.SetProperty(ImageView::Property::IMAGE, propertyMap);
 
-  dummyControl.Add( imageView );
-  dummyImpl.SetRelayoutCallback( &OnRelayoutOverride );
-  application.GetScene().Add( dummyControl );
+  application.GetScene().Add(dummy);
 
   application.SendNotification();
-  application.Render();
+  application.Render(16);
 
-  // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( gNaturalSize.width, 1024.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( gNaturalSize.height, 1024.0f, TEST_LOCATION );
+  application.SendNotification();
+  application.Render(16);
 
-  gNaturalSize = Vector3::ZERO;
+  propertyMap.Clear();
+  propertyMap[ImageVisual::Property::URL]            = gImage_34_RGBA;
+  propertyMap[ImageVisual::Property::ALPHA_MASK_URL] = TEST_BROKEN_IMAGE_DEFAULT;
+  imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
 
-  imageView.SetImage(gImage_600_RGB);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
 
-  // Waiting for resourceReady so SendNotifcation not called here.
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
 
-  // loading started, this waits for the loader thread for max 30 seconds
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  application.GetScene().Add(imageView);
 
-  // Trigger a potential relayout
   application.SendNotification();
-  application.Render();
+  application.Render(16);
 
-  DALI_TEST_EQUALS( gNaturalSize.width, 600.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( gNaturalSize.height, 600.0f, TEST_LOCATION );
+  // Load image and use cached mask. Now we try to apply masking.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  END_TEST;
-}
+  DALI_TEST_EQUALS(gResourceReadySignalFired, false, TEST_LOCATION);
 
-int UtcDaliImageViewResourceReadySignalWithImmediateLoad(void)
-{
-  tet_infoline("Test Setting Image with IMMEDIATE load and receving ResourceReadySignal before staged.");
+  // Cancel apply masking.
+  imageView.Unparent();
 
-  ToolkitTestApplication application;
+  application.SendNotification();
+  application.Render(16);
 
-  gResourceReadySignalFired = false;
+  // Reload same image again.
+  application.GetScene().Add(imageView);
 
-  Property::Map imageMap;
+  application.SendNotification();
+  application.Render(16);
 
-  imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap[ ImageVisual::Property::LOAD_POLICY ] =  ImageVisual::LoadPolicy::IMMEDIATE;
+  // Finish apply masking.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  tet_infoline("Creating ImageView without URL so image does not start loading");
+  DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+void OnRelayoutOverride(Size size)
+{
+  gNaturalSize = size; // Size Relayout is using
+}
+
+int UtcDaliImageViewReplaceImageAndGetNaturalSize(void)
+{
+  ToolkitTestApplication application;
+
+  // Check ImageView with background and main image, to ensure both visuals are marked as loaded
+  ImageView imageView = ImageView::New(TEST_IMAGE_1);
+  imageView.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyControl.SetResizePolicy(ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS);
+
+  dummyControl.Add(imageView);
+  dummyImpl.SetRelayoutCallback(&OnRelayoutOverride);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  // loading started, this waits for the loader thread for max 30 seconds
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gNaturalSize.width, 1024.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(gNaturalSize.height, 1024.0f, TEST_LOCATION);
+
+  gNaturalSize = Vector3::ZERO;
+
+  imageView.SetImage(gImage_600_RGB);
+
+  // Waiting for resourceReady so SendNotifcation not called here.
+
+  // loading started, this waits for the loader thread for max 30 seconds
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  // Trigger a potential relayout
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gNaturalSize.width, 600.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(gNaturalSize.height, 600.0f, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewResourceReadySignalWithImmediateLoad(void)
+{
+  tet_infoline("Test Setting Image with IMMEDIATE load and receving ResourceReadySignal before staged.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalFired = false;
+
+  Property::Map imageMap;
+
+  imageMap[ImageVisual::Property::URL]         = gImage_34_RGBA;
+  imageMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE;
+
+  tet_infoline("Creating ImageView without URL so image does not start loading");
   ImageView imageView = ImageView::New();
   tet_infoline("Connect to image loaded signal before setting image");
-  imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
   tet_infoline("Setting Image with IMMEDIATE load, signal already connected so will be triggered.");
-  imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageView.SetProperty(ImageView::Property::IMAGE, imageMap);
 
   // loading started, this waits for the loader thread
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1312,27 +1589,27 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage(void)
 
   Property::Map imageMap;
 
-  imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap[ ImageVisual::Property::LOAD_POLICY ] =  ImageVisual::LoadPolicy::IMMEDIATE;
+  imageMap[ImageVisual::Property::URL]         = gImage_34_RGBA;
+  imageMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE;
 
   ImageView imageView = ImageView::New();
-  imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
-  imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+  imageView.SetProperty(ImageView::Property::IMAGE, imageMap);
 
   // loading started, this waits for the loader thread
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
   gResourceReadySignalFired = false;
 
   ImageView imageViewWithExistingImage = ImageView::New();
-  imageViewWithExistingImage.ResourceReadySignal().Connect( &ResourceReadySignal);
-  imageViewWithExistingImage.SetProperty( ImageView::Property::IMAGE, imageMap );
+  imageViewWithExistingImage.ResourceReadySignal().Connect(&ResourceReadySignal);
+  imageViewWithExistingImage.SetProperty(ImageView::Property::IMAGE, imageMap);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1346,32 +1623,32 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage02(void)
   gResourceReadySignalFired = false;
 
   Property::Map imageImmediateLoadingMap;
-  imageImmediateLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageImmediateLoadingMap[ ImageVisual::Property::LOAD_POLICY ] =  ImageVisual::LoadPolicy::IMMEDIATE;
+  imageImmediateLoadingMap[ImageVisual::Property::URL]         = gImage_34_RGBA;
+  imageImmediateLoadingMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE;
 
   tet_infoline("Immediate load an image");
   ImageView imageView = ImageView::New();
-  imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
-  imageView.SetProperty( ImageView::Property::IMAGE, imageImmediateLoadingMap );
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+  imageView.SetProperty(ImageView::Property::IMAGE, imageImmediateLoadingMap);
 
   // loading started, this waits for the loader thread
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(16);
 
   tet_infoline("Check image loaded");
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
   gResourceReadySignalFired = false;
 
   tet_infoline("Create another ImageView with the same URL");
-  ImageView imageViewWithExistingImage = ImageView::New( gImage_34_RGBA );
+  ImageView imageViewWithExistingImage = ImageView::New(gImage_34_RGBA);
   tet_infoline("Connect to ResourceReady signal for second ImageView, it should still fire as resource is ready");
-  imageViewWithExistingImage.ResourceReadySignal().Connect( &ResourceReadySignal);
+  imageViewWithExistingImage.ResourceReadySignal().Connect(&ResourceReadySignal);
 
-  application.GetScene().Add( imageViewWithExistingImage );
+  application.GetScene().Add(imageViewWithExistingImage);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1380,47 +1657,47 @@ int UtcDaliImageViewPaddingProperty(void)
 {
   ToolkitTestApplication application;
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imagePropertyMap;
-  imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/gallery-small-1.jpg" ;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128;
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
-  imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
-  application.GetScene().Add( imageView );
+  imagePropertyMap[Toolkit::Visual::Property::TYPE]       = Toolkit::Visual::IMAGE;
+  imagePropertyMap[Toolkit::ImageVisual::Property::URL]   = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+  imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH]  = 128;
+  imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT] = 128;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap);
+  imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10));
+  application.GetScene().Add(imageView);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetProperty<Extents>( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetProperty<Extents>(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION);
 
   ImageView childImage = ImageView::New();
-  childImage.SetBackgroundColor( Color::BLACK );
-  childImage.SetProperty( Actor::Property::SIZE, Vector2( 10.f, 10.f ) );
-  imageView.Add( childImage );
+  childImage.SetBackgroundColor(Color::BLACK);
+  childImage.SetProperty(Actor::Property::SIZE, Vector2(10.f, 10.f));
+  imageView.Add(childImage);
 
   application.SendNotification();
   application.Render();
 
   // Child ImageView should be positioned dependinig on Parent ImageView's Padding value
-  DALI_TEST_EQUALS( childImage.GetProperty<Vector3>( Dali::Actor::Property::POSITION ), Vector3( 15, 5, 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(childImage.GetProperty<Vector3>(Dali::Actor::Property::POSITION), Vector3(15, 5, 0), TEST_LOCATION);
 
   // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
-  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
-  Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView);
+  Toolkit::Visual::Base       imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+  Property::Map               resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
 
-  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( transformValue );
+  Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(transformValue);
   Property::Map* retMap = transformValue->GetMap();
-  DALI_TEST_CHECK( retMap );
+  DALI_TEST_CHECK(retMap);
 
   // Image Visual should be positioned depending on ImageView's padding
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 15, 5 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get<Vector2>(), Vector2(15, 5), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1429,37 +1706,37 @@ int UtcDaliImageViewPaddingProperty02(void)
 {
   ToolkitTestApplication application;
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imagePropertyMap;
-  imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128;
-  imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
-  imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
-  application.GetScene().Add( imageView );
+  imagePropertyMap[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imagePropertyMap[Toolkit::ImageVisual::Property::URL]        = TEST_RESOURCE_DIR "/Kid1.svg";
+  imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH]       = 128;
+  imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT]      = 128;
+  imagePropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap);
+  imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10));
+  application.GetScene().Add(imageView);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetProperty<Extents>( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetProperty<Extents>(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION);
 
   // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
-  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
-  Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView);
+  Toolkit::Visual::Base       imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+  Property::Map               resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
 
-  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( transformValue );
+  Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(transformValue);
   Property::Map* retMap = transformValue->GetMap();
-  DALI_TEST_CHECK( retMap );
+  DALI_TEST_CHECK(retMap);
 
   // Image Visual should be positioned depending on ImageView's padding
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 15, 5 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get<Vector2>(), Vector2(15, 5), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1470,44 +1747,44 @@ int UtcDaliImageViewPaddingProperty03(void)
 
   ToolkitTestApplication application;
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imagePropertyMap;
-  imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128;
-  imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
-  imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
-  application.GetScene().Add( imageView );
+  imagePropertyMap[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imagePropertyMap[Toolkit::ImageVisual::Property::URL]        = TEST_RESOURCE_DIR "/Kid1.svg";
+  imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH]       = 128;
+  imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT]      = 128;
+  imagePropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap);
+  imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10));
+  application.GetScene().Add(imageView);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetProperty<Extents>( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetProperty<Extents>(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION);
 
   tet_infoline("Remove Padding and test Visual is position correctly");
 
-  imageView.SetProperty( Control::Property::PADDING, Extents( 0, 0, 0, 0 ) );
+  imageView.SetProperty(Control::Property::PADDING, Extents(0, 0, 0, 0));
 
   application.SendNotification();
   application.Render();
 
   // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
-  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
-  Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView);
+  Toolkit::Visual::Base       imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+  Property::Map               resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
 
-  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( transformValue );
+  Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(transformValue);
   Property::Map* retMap = transformValue->GetMap();
-  DALI_TEST_CHECK( retMap );
+  DALI_TEST_CHECK(retMap);
 
   // Image Visual should be positioned depending on ImageView's padding
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1518,44 +1795,44 @@ int UtcDaliImageViewPaddingProperty04(void)
 
   ToolkitTestApplication application;
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imagePropertyMap;
-  imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128;
-  imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128;
-  imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FILL;
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
-  imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
-  application.GetScene().Add( imageView );
+  imagePropertyMap[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imagePropertyMap[Toolkit::ImageVisual::Property::URL]        = TEST_RESOURCE_DIR "/Kid1.svg";
+  imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH]       = 128;
+  imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT]      = 128;
+  imagePropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FILL;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap);
+  imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10));
+  application.GetScene().Add(imageView);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetProperty<Extents>( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(imageView.GetProperty<Extents>(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION);
 
   tet_infoline("Remove Padding and test Visual is position correctly");
 
-  imageView.SetProperty( Control::Property::PADDING, Extents( 0, 0, 0, 0 ) );
+  imageView.SetProperty(Control::Property::PADDING, Extents(0, 0, 0, 0));
 
   application.SendNotification();
   application.Render();
 
   // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
-  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
-  Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView);
+  Toolkit::Visual::Base       imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+  Property::Map               resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
 
-  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( transformValue );
+  Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(transformValue);
   Property::Map* retMap = transformValue->GetMap();
-  DALI_TEST_CHECK( retMap );
+  DALI_TEST_CHECK(retMap);
 
   // Image Visual should be positioned depending on ImageView's padding
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1566,40 +1843,40 @@ int UtcDaliImageViewTransformTest01(void)
 
   ToolkitTestApplication application;
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imagePropertyMap;
-  imagePropertyMap.Add( Toolkit::Visual::Property::TYPE,Toolkit::Visual::IMAGE )
-                  .Add( Toolkit::ImageVisual::Property::URL,TEST_RESOURCE_DIR "/Kid1.svg" )
-                  .Add( ImageVisual::Property::DESIRED_WIDTH,120 )
-                  .Add( ImageVisual::Property::DESIRED_HEIGHT,120 )
-                  .Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL )
-                  .Add( Visual::Property::TRANSFORM,
-                        Property::Map().Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY,
-                                             Vector2( Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE ) )
-                                       .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( 8, 8 ) ) );
-
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap );
-  imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  application.GetScene().Add( imageView );
+  imagePropertyMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE)
+    .Add(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/Kid1.svg")
+    .Add(ImageVisual::Property::DESIRED_WIDTH, 120)
+    .Add(ImageVisual::Property::DESIRED_HEIGHT, 120)
+    .Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL)
+    .Add(Visual::Property::TRANSFORM,
+         Property::Map().Add(Toolkit::Visual::Transform::Property::OFFSET_POLICY,
+                             Vector2(Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE))
+           .Add(Toolkit::Visual::Transform::Property::OFFSET, Vector2(8, 8)));
+
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap);
+  imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  application.GetScene().Add(imageView);
 
   application.SendNotification();
   application.Render();
 
   // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
-  Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
-  Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView);
+  Toolkit::Visual::Base       imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+  Property::Map               resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
 
-  Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( transformValue );
+  Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(transformValue);
   Property::Map* retMap = transformValue->GetMap();
-  DALI_TEST_CHECK( retMap );
+  DALI_TEST_CHECK(retMap);
 
   // Image Visual should be positioned depending on ImageView's padding
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 8, 8 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET_POLICY )->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get<Vector2>(), Vector2(8, 8), TEST_LOCATION);
+  DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET_POLICY)->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1609,13 +1886,13 @@ int UtcDaliImageViewUsingAtlasAndGetNaturalSize(void)
   ToolkitTestApplication application;
 
   // Check ImageView with background and main image, to ensure both visuals are marked as loaded
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap[ Toolkit::ImageVisual::Property::ATLASING ] = true;
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  application.GetScene().Add( imageView );
+  imageMap[Toolkit::Visual::Property::TYPE]          = Toolkit::Visual::IMAGE;
+  imageMap[Toolkit::ImageVisual::Property::URL]      = gImage_34_RGBA;
+  imageMap[Toolkit::ImageVisual::Property::ATLASING] = true;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
@@ -1623,8 +1900,8 @@ int UtcDaliImageViewUsingAtlasAndGetNaturalSize(void)
 
   Vector3 naturalSize = imageView.GetNaturalSize();
 
-  DALI_TEST_EQUALS( naturalSize.width, 34.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( naturalSize.height, 34.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize.width, 34.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(naturalSize.height, 34.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1633,38 +1910,38 @@ int UtcDaliImageViewFillMode(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual without padding and set the fill-mode to fill" );
+  tet_infoline("Create an ImageVisual without padding and set the fill-mode to fill");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB );
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, DevelVisual::FittingMode::FILL );
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB);
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, DevelVisual::FittingMode::FILL);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2::ONE, TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Toolkit::Visual::Transform::Policy::RELATIVE);
 
   END_TEST;
 }
@@ -1673,45 +1950,45 @@ int UtcDaliImageViewFittingModeFitKeepAspectRatio(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using FitKeepAspectRatio ( image: [600,600], view: [600,700] )" );
-  tet_infoline( "  There should be need to change the transform, offset is adjusted to fit inside");
+  tet_infoline("Create an ImageVisual using FitKeepAspectRatio ( image: [600,600], view: [600,700] )");
+  tet_infoline("  There should be need to change the transform, offset is adjusted to fit inside");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO );
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
   // If there's
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 600), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 50), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1720,44 +1997,44 @@ int UtcDaliImageViewFittingModesFill(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using Fill ( image: [600,600], view: [600,700] )" );
-  tet_infoline( "  There should be no need to change the transform, only size is changed to fit view");
+  tet_infoline("Create an ImageVisual using Fill ( image: [600,600], view: [600,700] )");
+  tet_infoline("  There should be no need to change the transform, only size is changed to fit view");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::FILL );
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2::ONE, TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Toolkit::Visual::Transform::Policy::RELATIVE);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero
 
   END_TEST;
 }
@@ -1766,45 +2043,45 @@ int UtcDaliImageViewFittingModesOverfitKeepAspectRatio(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using OverFitKeepAspectRatio ( image: [600,600], view: [600,500] )" );
-  tet_infoline( "  offset or size is the same as view, but adjust internally using pixelArea ");
+  tet_infoline("Create an ImageVisual using OverFitKeepAspectRatio ( image: [600,600], view: [600,500] )");
+  tet_infoline("  offset or size is the same as view, but adjust internally using pixelArea ");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO );
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(600,500) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 500));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
   // If there's
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 500 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 500), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero
 
   END_TEST;
 }
@@ -1813,44 +2090,44 @@ int UtcDaliImageViewFittingModesCenter01(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using Center ( image: [600,600], view: [700,700] )" );
-  tet_infoline( "  There should be need to change the transform, offset is adjusted to fit inside");
+  tet_infoline("Create an ImageVisual using Center ( image: [600,600], view: [700,700] )");
+  tet_infoline("  There should be need to change the transform, offset is adjusted to fit inside");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER);
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(50, 50), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1859,44 +2136,44 @@ int UtcDaliImageViewFittingModesCenter02(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using Center ( image: [600,600], view: [500,500] )" );
-  tet_infoline( "  There should be need to change the transform, offset is adjusted to fit inside");
+  tet_infoline("Create an ImageVisual using Center ( image: [600,600], view: [500,500] )");
+  tet_infoline("  There should be need to change the transform, offset is adjusted to fit inside");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER);
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(50, 50), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1905,43 +2182,47 @@ int UtcDaliImageViewFittingModesFitHeight01(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [600,700] )" );
+  tet_infoline("Create an ImageVisual using FitHeight ( image: [600,600], view: [600,700] )");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT);
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 700), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero
+
+  value = returnedMap.Find(DevelVisual::Property::VISUAL_FITTING_MODE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), "FIT_HEIGHT", TEST_LOCATION); // OFFSET is zero
 
   END_TEST;
 }
@@ -1950,43 +2231,43 @@ int UtcDaliImageViewFittingModesFitHeight02(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [700,600] )" );
+  tet_infoline("Create an ImageVisual using FitHeight ( image: [600,600], view: [700,600] )");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 249x169 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT);
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 249x169 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 600));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(50, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1995,43 +2276,47 @@ int UtcDaliImageViewFittingModesFitWidth01(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view: [600,700] )" );
+  tet_infoline("Create an ImageVisual using FitWidth ( image: [600,600], view: [600,700] )");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH);
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
+
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 50), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION );
+  value = returnedMap.Find(DevelVisual::Property::VISUAL_FITTING_MODE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), "FIT_WIDTH", TEST_LOCATION); // OFFSET is zero
 
   END_TEST;
 }
@@ -2040,43 +2325,43 @@ int UtcDaliImageViewFittingModesFitWidth02(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view:[700,600] )" );
+  tet_infoline("Create an ImageVisual using FitWidth ( image: [600,600], view:[700,600] )");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 249x169 image
-  imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH);
+  imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 249x169 image
+  imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH);
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 600));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(700, 600), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero
 
   END_TEST;
 }
@@ -2085,120 +2370,120 @@ int UtcDaliImageViewFittingModesChangeFittingMode01(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]" );
+  tet_infoline("UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]");
 
   ImageView imageView = ImageView::New();
 
   // 1. Render using FittingMode::SHRINK_TO_FIT
   Property::Map imageMap;
-  imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB;
-  imageMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] =  Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
+  imageMap[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imageMap[Toolkit::ImageVisual::Property::URL]        = gImage_600_RGB;
+  imageMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(700, 700), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(50, 0), TEST_LOCATION);
 
   // 2. Render again using DevelVisaul::CENTER
   Property::Map imageMap2;
-  imageMap2[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imageMap2[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB;
-  imageMap2[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::CENTER;
+  imageMap2[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imageMap2[Toolkit::ImageVisual::Property::URL]        = gImage_600_RGB;
+  imageMap2[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::CENTER;
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap2);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
   returnedMap.Clear();
-  visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
+  visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
 
-  visual.CreatePropertyMap( returnedMap );
+  visual.CreatePropertyMap(returnedMap);
 
-  value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 100, 50 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(100, 50), TEST_LOCATION);
 
   // 3. Render again using before fittingMode
   Property::Map imageMap3;
-  imageMap3[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imageMap3[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB;
-  imageMap3[ DevelVisual::Property::VISUAL_FITTING_MODE ] =  Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
+  imageMap3[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imageMap3[Toolkit::ImageVisual::Property::URL]        = gImage_600_RGB;
+  imageMap3[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO;
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap3);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
   returnedMap.Clear();
-  visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  visual.CreatePropertyMap( returnedMap );
+  visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  visual.CreatePropertyMap(returnedMap);
 
-  value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(700, 700), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(50, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2207,120 +2492,120 @@ int UtcDaliImageViewFittingModesChangeFittingMode02(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]" );
+  tet_infoline("UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]");
 
   ImageView imageView = ImageView::New();
 
   // 1. Render using FittingMode::OVER_FIT_KEEP_ASPECT_RATIO
   Property::Map imageMap;
-  imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB;
-  imageMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] =  Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO;
+  imageMap[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imageMap[Toolkit::ImageVisual::Property::URL]        = gImage_600_RGB;
+  imageMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO;
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 800, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(800, 700), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION);
 
   // 2. Render again using DevelVisaul::CENTER
   Property::Map imageMap2;
-  imageMap2[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imageMap2[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB;
-  imageMap2[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::CENTER;
+  imageMap2[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imageMap2[Toolkit::ImageVisual::Property::URL]        = gImage_600_RGB;
+  imageMap2[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::CENTER;
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap2);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
   returnedMap.Clear();
-  visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
+  visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
 
-  visual.CreatePropertyMap( returnedMap );
+  visual.CreatePropertyMap(returnedMap);
 
-  value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 100, 50 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(100, 50), TEST_LOCATION);
 
   // 3. Render again using before fittingMode
   Property::Map imageMap3;
-  imageMap3[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
-  imageMap3[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB;
-  imageMap3[ DevelVisual::Property::VISUAL_FITTING_MODE ] =  Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO;
+  imageMap3[Toolkit::Visual::Property::TYPE]            = Toolkit::Visual::IMAGE;
+  imageMap3[Toolkit::ImageVisual::Property::URL]        = gImage_600_RGB;
+  imageMap3[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO;
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap3);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
   returnedMap.Clear();
-  visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  visual.CreatePropertyMap( returnedMap );
+  visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  visual.CreatePropertyMap(returnedMap);
 
-  value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 800, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(800, 700), TEST_LOCATION); // Change the internal size according to the image view size
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION );
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2329,259 +2614,253 @@ int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Create an ImageVisual using SCALE_TO_FILL and animated vector image ( image: [600,600], view:[600,600] )" );
+  tet_infoline("Create an ImageVisual using SCALE_TO_FILL and animated vector image ( image: [600,600], view:[600,600] )");
 
-  ImageView imageView = ImageView::New();
+  ImageView     imageView = ImageView::New();
   Property::Map imageMap;
-  imageMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE );
-  imageMap.Add( Toolkit::ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME ); // 249x169 image
+  imageMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE);
+  imageMap.Add(Toolkit::ImageVisual::Property::URL, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME); // 249x169 image
 
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(600,600) );
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 600));
 
-  application.GetScene().Add( imageView );
+  application.GetScene().Add(imageView);
 
   // Trigger a potential relayout
   application.SendNotification();
   application.Render();
 
-  Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE );
-  Property::Map returnedMap;
-  visual.CreatePropertyMap( returnedMap );
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE);
+  Property::Map         returnedMap;
+  visual.CreatePropertyMap(returnedMap);
 
-  Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM);
+  DALI_TEST_CHECK(value);
   Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); // Relative size so will take up 100%
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2::ONE, TEST_LOCATION); // Relative size so will take up 100%
 
-  value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE );
+  value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Toolkit::Visual::Transform::Policy::RELATIVE);
 
-  value = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero
+  value = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero
 
   END_TEST;
 }
 
-
 int UtcDaliImageViewCustomShader(void)
 {
   ToolkitTestApplication application;
 
   // Set a custom shader with an image url
   {
-    Property::Map properties;
-    Property::Map shader;
-    const std::string vertexShader = "Foobar";
-    const std::string fragmentShader = "Foobar";
+    Property::Map     properties;
+    Property::Map     shader;
+    const std::string vertexShader                    = "Foobar";
+    const std::string fragmentShader                  = "Foobar";
     shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-    shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+    shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
-    properties[Visual::Property::TYPE] = Visual::IMAGE;
-    properties[Visual::Property::SHADER] = shader;
+    properties[Visual::Property::TYPE]     = Visual::IMAGE;
+    properties[Visual::Property::SHADER]   = shader;
     properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
 
     ImageView imageView = ImageView::New();
-    imageView.SetProperty( ImageView::Property::IMAGE, properties );
+    imageView.SetProperty(ImageView::Property::IMAGE, properties);
 
-    application.GetScene().Add( imageView );
+    application.GetScene().Add(imageView);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-    Renderer renderer = imageView.GetRendererAt( 0 );
-    Shader shader2 = renderer.GetShader();
-    Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-    Property::Map* map = value.GetMap();
-    DALI_TEST_CHECK( map );
+    Renderer        renderer = imageView.GetRendererAt(0);
+    Shader          shader2  = renderer.GetShader();
+    Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+    Property::Map*  map      = value.GetMap();
+    DALI_TEST_CHECK(map);
 
-    Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-    DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+    Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+    DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-    Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-    DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+    Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+    DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
   }
 
   // Set a custom shader after setting an image url
   {
-    Property::Map properties;
-    Property::Map shader;
-    const std::string vertexShader = "Foobar";
-    const std::string fragmentShader = "Foobar";
+    Property::Map     properties;
+    Property::Map     shader;
+    const std::string vertexShader                    = "Foobar";
+    const std::string fragmentShader                  = "Foobar";
     shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-    shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+    shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
     properties[Visual::Property::SHADER] = shader;
 
-    ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME );
-    imageView.SetProperty( ImageView::Property::IMAGE, properties );
+    ImageView imageView = ImageView::New(TEST_IMAGE_FILE_NAME);
+    imageView.SetProperty(ImageView::Property::IMAGE, properties);
 
-    application.GetScene().Add( imageView );
+    application.GetScene().Add(imageView);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-    Renderer renderer = imageView.GetRendererAt( 0 );
-    Shader shader2 = renderer.GetShader();
-    Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-    Property::Map* map = value.GetMap();
-    DALI_TEST_CHECK( map );
+    Renderer        renderer = imageView.GetRendererAt(0);
+    Shader          shader2  = renderer.GetShader();
+    Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+    Property::Map*  map      = value.GetMap();
+    DALI_TEST_CHECK(map);
 
-    Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-    DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+    Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+    DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-    Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-    DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+    Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+    DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
   }
 
   // Set a custom shader before setting an image url
   {
-    Property::Map properties;
-    Property::Map shader;
-    const std::string vertexShader = "Foobar";
-    const std::string fragmentShader = "Foobar";
+    Property::Map     properties;
+    Property::Map     shader;
+    const std::string vertexShader                    = "Foobar";
+    const std::string fragmentShader                  = "Foobar";
     shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-    shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+    shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
     properties[Visual::Property::SHADER] = shader;
 
     ImageView imageView = ImageView::New();
-    imageView.SetProperty( ImageView::Property::IMAGE, properties );
-    imageView.SetProperty( ImageView::Property::IMAGE, TEST_IMAGE_FILE_NAME );
+    imageView.SetProperty(ImageView::Property::IMAGE, properties);
+    imageView.SetProperty(ImageView::Property::IMAGE, TEST_IMAGE_FILE_NAME);
 
-    application.GetScene().Add( imageView );
+    application.GetScene().Add(imageView);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-    Renderer renderer = imageView.GetRendererAt( 0 );
-    Shader shader2 = renderer.GetShader();
-    Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-    Property::Map* map = value.GetMap();
-    DALI_TEST_CHECK( map );
+    Renderer        renderer = imageView.GetRendererAt(0);
+    Shader          shader2  = renderer.GetShader();
+    Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+    Property::Map*  map      = value.GetMap();
+    DALI_TEST_CHECK(map);
 
-    Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-    DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+    Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+    DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-    Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-    DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+    Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+    DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
   }
 
   // Set a custom shader after setting a property map
   {
-    Property::Map properties;
-    Property::Map shader;
-    const std::string vertexShader = "Foobar";
-    const std::string fragmentShader = "Foobar";
+    Property::Map     properties;
+    Property::Map     shader;
+    const std::string vertexShader                    = "Foobar";
+    const std::string fragmentShader                  = "Foobar";
     shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-    shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+    shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
     properties[Visual::Property::SHADER] = shader;
 
     Property::Map properties1;
-    properties1[Visual::Property::TYPE] = Visual::IMAGE;
+    properties1[Visual::Property::TYPE]     = Visual::IMAGE;
     properties1[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
 
     ImageView imageView = ImageView::New();
-    imageView.SetProperty( ImageView::Property::IMAGE, properties1 );
-    imageView.SetProperty( ImageView::Property::IMAGE, properties );
+    imageView.SetProperty(ImageView::Property::IMAGE, properties1);
+    imageView.SetProperty(ImageView::Property::IMAGE, properties);
 
-    application.GetScene().Add( imageView );
+    application.GetScene().Add(imageView);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-    Renderer renderer = imageView.GetRendererAt( 0 );
-    Shader shader2 = renderer.GetShader();
-    Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-    Property::Map* map = value.GetMap();
-    DALI_TEST_CHECK( map );
+    Renderer        renderer = imageView.GetRendererAt(0);
+    Shader          shader2  = renderer.GetShader();
+    Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+    Property::Map*  map      = value.GetMap();
+    DALI_TEST_CHECK(map);
 
-    Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-    DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+    Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+    DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-    Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-    DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+    Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+    DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
   }
 
   // Set a custom shader before setting a property map
   {
-    Property::Map properties;
-    Property::Map shader;
-    const std::string vertexShader = "Foobar";
-    const std::string fragmentShader = "Foobar";
+    Property::Map     properties;
+    Property::Map     shader;
+    const std::string vertexShader                    = "Foobar";
+    const std::string fragmentShader                  = "Foobar";
     shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-    shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+    shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
     properties[Visual::Property::SHADER] = shader;
 
     Property::Map properties1;
-    properties1[Visual::Property::TYPE] = Visual::IMAGE;
+    properties1[Visual::Property::TYPE]     = Visual::IMAGE;
     properties1[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
 
     ImageView imageView = ImageView::New();
-    imageView.SetProperty( ImageView::Property::IMAGE, properties );
-    imageView.SetProperty( ImageView::Property::IMAGE, properties1 );
+    imageView.SetProperty(ImageView::Property::IMAGE, properties);
+    imageView.SetProperty(ImageView::Property::IMAGE, properties1);
 
-    application.GetScene().Add( imageView );
+    application.GetScene().Add(imageView);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-    Renderer renderer = imageView.GetRendererAt( 0 );
-    Shader shader2 = renderer.GetShader();
-    Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-    Property::Map* map = value.GetMap();
-    DALI_TEST_CHECK( map );
+    Renderer        renderer = imageView.GetRendererAt(0);
+    Shader          shader2  = renderer.GetShader();
+    Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+    Property::Map*  map      = value.GetMap();
+    DALI_TEST_CHECK(map);
 
-    Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-    DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+    Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+    DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-    Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-    DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+    Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+    DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
   }
 
   END_TEST;
 }
 
-
 namespace
 {
 static int gFailCounter = 0;
-const int MAX_RETRIES(3);
+const int  MAX_RETRIES(3);
 
 void ReloadImage(ImageView imageView)
 {
   Property::Map imageImmediateLoadingMap;
-  imageImmediateLoadingMap[ ImageVisual::Property::URL ] = "Non-existant-image.jpg";
-  imageImmediateLoadingMap[ ImageVisual::Property::LOAD_POLICY ] =  ImageVisual::LoadPolicy::IMMEDIATE;
+  imageImmediateLoadingMap[ImageVisual::Property::URL]         = "Non-existant-image.jpg";
+  imageImmediateLoadingMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE;
 
   tet_infoline("Immediate load an image");
-  imageView.SetProperty( ImageView::Property::IMAGE, imageImmediateLoadingMap );
+  imageView.SetProperty(ImageView::Property::IMAGE, imageImmediateLoadingMap);
 }
 
-void ResourceFailedReload( Control control )
+void ResourceFailedReload(Control control)
 {
   gFailCounter++;
-  if( gFailCounter < MAX_RETRIES )
-  {
-    ReloadImage(ImageView::DownCast(control));
-  }
-}
 }
+} // namespace
 
 int UtcDaliImageViewReloadFailedOnResourceReadySignal(void)
 {
@@ -2592,24 +2871,21 @@ int UtcDaliImageViewReloadFailedOnResourceReadySignal(void)
   gFailCounter = 0;
 
   ImageView imageView = ImageView::New();
-  imageView.ResourceReadySignal().Connect( &ResourceFailedReload );
-  DALI_TEST_EQUALS( gFailCounter, 0, TEST_LOCATION );
+  imageView.ResourceReadySignal().Connect(&ResourceFailedReload);
+  DALI_TEST_EQUALS(gFailCounter, 0, TEST_LOCATION);
   ReloadImage(imageView);
 
   // loading started, this waits for the loader thread to complete
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-  application.SendNotification();
-
-  DALI_TEST_EQUALS( gFailCounter, 1, TEST_LOCATION );
-
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-  application.SendNotification();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gFailCounter, 1, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( gFailCounter, 2, TEST_LOCATION );
+  ReloadImage(imageView);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gFailCounter, 2, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-  application.SendNotification();
-  DALI_TEST_EQUALS( gFailCounter, 3, TEST_LOCATION );
+  ReloadImage(imageView);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gFailCounter, 3, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2619,30 +2895,88 @@ int UtcDaliImageViewLoadRemoteSVG(void)
   tet_infoline("Test load from a remote server.");
 
   ToolkitTestApplication application;
-  Toolkit::ImageView imageView;
-  imageView = Toolkit::ImageView::New();
-  imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg");
-  // Victor. Temporary (or permanent?) update as the url above seems not to work from time to time ...
-//  imageView.SetImage("https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/SVG_logo.svg/64px-SVG_logo.svg.png");
-  imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2(300, 300) );
-  imageView.SetProperty( Actor::Property::POSITION, Vector3( 150.0f , 150.0f , 0.0f ) );
 
-  application.GetScene().Add( imageView );
+  const std::string svgImageUrl("https://dalihub.github.io/images/check.svg");
 
-  DALI_TEST_CHECK( imageView );
+  {
+    Toolkit::ImageView imageView;
+    imageView = Toolkit::ImageView::New();
+    imageView.SetImage(svgImageUrl);
+    imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+    imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+    imageView.SetProperty(Actor::Property::SIZE, Vector2(300, 300));
+    imageView.SetProperty(Actor::Property::POSITION, Vector3(150.0f, 150.0f, 0.0f));
 
-  DALI_TEST_EQUALS( imageView.GetRendererCount(), 0u, TEST_LOCATION );
+    application.GetScene().Add(imageView);
 
-  application.SendNotification();
+    DALI_TEST_CHECK(imageView);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.SendNotification();
-  application.Render();
+    application.SendNotification();
+
+    // Wait for loading & rasterization
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+  }
 
-  DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION );
+  // Without size set
+  {
+    Toolkit::ImageView imageView;
+    imageView = Toolkit::ImageView::New();
+    imageView.SetImage(svgImageUrl);
+    imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+    imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+    imageView.SetProperty(Actor::Property::POSITION, Vector3(150.0f, 150.0f, 0.0f));
+
+    application.GetScene().Add(imageView);
+
+    DALI_TEST_CHECK(imageView);
+
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 0u, TEST_LOCATION);
+
+    application.SendNotification();
+
+    // Wait for loading & rasterization
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewLoadRemoteLottie(void)
+{
+  tet_infoline("Test load from a remote server. (Note we don't support real download now. Just for line coverage)");
+
+  ToolkitTestApplication application;
+
+  {
+    Toolkit::ImageView imageView;
+    imageView = Toolkit::ImageView::New();
+    imageView.SetImage("https://lottie.json");
+    imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+    imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+    imageView.SetProperty(Actor::Property::SIZE, Vector2(300, 300));
+    imageView.SetProperty(Actor::Property::POSITION, Vector3(150.0f, 150.0f, 0.0f));
+
+    application.GetScene().Add(imageView);
+
+    DALI_TEST_CHECK(imageView);
+
+    application.SendNotification();
+    application.Render();
+
+    // Do not check anything for here.
+  }
 
   END_TEST;
 }
@@ -2653,31 +2987,69 @@ int UtcDaliImageViewSyncSVGLoading(void)
 
   tet_infoline("ImageView Testing SVG image sync loading");
 
-  // Sync loading, automatic atlasing for small size image
   {
-    TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace();
-    callStack.Reset();
-    callStack.Enable(true);
-
-    ImageView imageView = ImageView::New( );
+    ImageView imageView = ImageView::New();
 
     // Sync loading is used
     Property::Map syncLoadingMap;
-    syncLoadingMap.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE );
-    syncLoadingMap.Insert( Toolkit::ImageVisual::Property::URL,  TEST_RESOURCE_DIR "/svg1.svg"  );
-    syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING,  true);
-    imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap );
+    syncLoadingMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+    syncLoadingMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg");
+    syncLoadingMap.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap);
 
-    application.GetScene().Add( imageView );
-    DALI_TEST_CHECK( imageView );
+    application.GetScene().Add(imageView);
+    DALI_TEST_CHECK(imageView);
 
     application.SendNotification();
-    application.Render(16);
     Vector3 naturalSize = imageView.GetNaturalSize();
 
-    DALI_TEST_EQUALS( naturalSize.width, 100.0f, TEST_LOCATION );
-    DALI_TEST_EQUALS( naturalSize.height, 100.0f, TEST_LOCATION );
+    DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION);
+    DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION);
+  }
+  END_TEST;
+}
+
+int UtcDaliImageViewSyncSVGLoading02(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("ImageView Testing SVG image sync loading");
+
+  {
+    ImageView imageView = ImageView::New();
+
+    // Sync loading is used
+    Property::Map syncLoadingMap;
+    syncLoadingMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+    syncLoadingMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg");
+    syncLoadingMap.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    syncLoadingMap.Insert(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO);
+    imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap);
+    imageView.ResourceReadySignal().Connect(&OnResourceReadySignalSVG);
+
+    application.GetScene().Add(imageView);
+    DALI_TEST_CHECK(imageView);
+
+    application.SendNotification();
+    application.Render();
+
+    // Check whether Image Visual transforms on ImageVieiw::OnRelayout()
+    Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView);
+    Toolkit::Visual::Base       imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE);
+    Property::Map               resultMap;
+    imageVisual.CreatePropertyMap(resultMap);
+
+    Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM);
+    DALI_TEST_CHECK(transformValue);
+    Property::Map* retMap = transformValue->GetMap();
+    DALI_TEST_CHECK(retMap);
+
+    // Image Visual should be positioned depending on ImageView's padding
+    DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::SIZE)->Get<Vector2>(), Vector2(100, 100), TEST_LOCATION);
 
+    Vector3 naturalSize = imageView.GetNaturalSize();
+    DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION);
+    DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -2688,30 +3060,29 @@ int UtcDaliImageViewAsyncSVGLoading(void)
 
   tet_infoline("ImageView Testing SVG image async loading");
 
-  // Sync loading, automatic atlasing for small size image
   {
-    TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace();
-    callStack.Reset();
-    callStack.Enable(true);
+    ImageView imageView = ImageView::New();
 
-    ImageView imageView = ImageView::New( );
+    // Async loading is used - default value of SYNCHRONOUS_LOADING is false.
+    Property::Map propertyMap;
+    propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+    propertyMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg");
+    imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
 
-    // Sync loading is used
-    Property::Map syncLoadingMap;
-    syncLoadingMap.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE );
-    syncLoadingMap.Insert( Toolkit::ImageVisual::Property::URL,  TEST_RESOURCE_DIR "/svg1.svg"  );
-    syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING,  false);
-    imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap );
+    application.GetScene().Add(imageView);
+    DALI_TEST_CHECK(imageView);
 
-    application.GetScene().Add( imageView );
-    DALI_TEST_CHECK( imageView );
+    application.SendNotification();
+
+    // Wait for loading
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
-    Vector3 naturalSize = imageView.GetNaturalSize();
 
-    DALI_TEST_EQUALS( naturalSize.width, 100.0f, TEST_LOCATION );
-    DALI_TEST_EQUALS( naturalSize.height, 100.0f, TEST_LOCATION );
+    Vector3 naturalSize = imageView.GetNaturalSize();
+    DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION);
+    DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -2722,330 +3093,2654 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void)
 
   tet_infoline("ImageView Testing SVG image async loading");
 
-  // Sync loading, automatic atlasing for small size image
+  // Sync loading
   {
-    TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace();
-    callStack.Reset();
-    callStack.Enable(true);
-
-    ImageView imageView = ImageView::New( );
+    ImageView imageView = ImageView::New();
 
     // Sync loading is used
     Property::Map syncLoadingMap;
-    syncLoadingMap.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE );
-    syncLoadingMap.Insert( Toolkit::ImageVisual::Property::URL,  TEST_RESOURCE_DIR "/svg1.svg"  );
+    syncLoadingMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+    syncLoadingMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg");
 
     // Check to set invalid value
     // The SYNCHRONOUS_LOADING property must be set to the bool value.
     // Check if error log is outputted when setting other value like string.
     // Even if the wrong value is set, the image will be shown normally, and the synchronous value should be the default value(false).
-    syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, std::to_string(5) );
-    imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap );
+    syncLoadingMap.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, std::to_string(5));
+    imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap);
+
+    application.GetScene().Add(imageView);
+    DALI_TEST_CHECK(imageView);
+
+    application.SendNotification();
 
-    application.GetScene().Add( imageView );
-    DALI_TEST_CHECK( imageView );
+    // Wait for loading
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
-    Vector3 naturalSize = imageView.GetNaturalSize();
-    DALI_TEST_EQUALS( naturalSize.width, 100.0f, TEST_LOCATION );
-    DALI_TEST_EQUALS( naturalSize.height, 100.0f, TEST_LOCATION );
 
-    Property::Value value = imageView.GetProperty( ImageView::Property::IMAGE );
-    Property::Map* map = value.GetMap();
-    DALI_TEST_CHECK( map );
+    Vector3 naturalSize = imageView.GetNaturalSize();
+    DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION);
+    DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION);
 
-    Property::Value* sync = map->Find( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING );
-    DALI_TEST_CHECK( sync );
-    DALI_TEST_EQUALS( false, sync->Get< bool >(), TEST_LOCATION );
+    Property::Value value = imageView.GetProperty(ImageView::Property::IMAGE);
+    Property::Map*  map   = value.GetMap();
+    DALI_TEST_CHECK(map);
 
+    Property::Value* sync = map->Find(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING);
+    DALI_TEST_CHECK(sync);
+    DALI_TEST_EQUALS(false, sync->Get<bool>(), TEST_LOCATION);
   }
   END_TEST;
 }
 
-int UtcDaliImageViewSvgLoadingFailure(void)
+int UtcDaliImageViewSvgLoadingFailureLocalFile(void)
 {
-  ToolkitTestApplication application;
-
   // Local svg file - invalid file path
   {
+    ToolkitTestApplication application;
+
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
     gResourceReadySignalFired = false;
 
-    ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/foo.svg" );
-    imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+    ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/foo.svg");
+    imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
+    application.GetScene().Add(imageView);
 
-    application.GetScene().Add( imageView );
+    application.SendNotification();
+
+    // loading started, this waits for the loader thread - load
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
-    DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION );
+    DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+    // Should be shown a broken image
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
   }
 
-  // Local svg file - invalid file
+  // Local svg file - invalid file path without size set
   {
+    ToolkitTestApplication application;
+
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
     gResourceReadySignalFired = false;
+    textureTrace.Reset();
+
+    ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/foo.svg");
+    imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
 
-    ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/invalid.svg" );
-    imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+    application.GetScene().Add(imageView);
 
-    DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
+    application.SendNotification();
 
-    application.GetScene().Add( imageView );
+    // loading started, this waits for the loader thread - load & rasterize
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
-    DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION );
+    DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+    // Should be shown a broken image
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
   }
 
-  // Remote svg file
+  // Local svg file - invalid file
   {
+    ToolkitTestApplication application;
+
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
     gResourceReadySignalFired = false;
+    textureTrace.Reset();
 
-    ImageView imageView = ImageView::New( "https://bar.org/foobar.svg" );
-    imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+    ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/invalid.svg");
+    imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
 
-    DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
 
-    application.GetScene().Add( imageView );
+    application.GetScene().Add(imageView);
 
     application.SendNotification();
 
-    // loading started, this waits for the loader thread
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    // loading started, this waits for the loader thread - load & rasterize
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
-    DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION );
+    DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+    // Should be shown a broken image
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
   }
 
   END_TEST;
 }
 
-int UtcDaliImageViewSvgRasterizationFailure(void)
+int UtcDaliImageViewSvgLoadingFailureRemoteFile01(void)
 {
-  ToolkitTestApplication application;
-
-  gResourceReadySignalFired = false;
-
-  ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/svg1.svg" );
-  imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
-
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
-
-  application.GetScene().Add( imageView );
+  // Remote svg file
+  {
+    ToolkitTestApplication application;
 
-  application.SendNotification();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
 
-  // loading started, this waits for the loader thread
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    gResourceReadySignalFired = false;
 
-  application.SendNotification();
-  application.Render(16);
+    ImageView imageView = ImageView::New("https://127.0.0.1/foobar.svg");
+    imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::READY, TEST_LOCATION );
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
 
-  // Reset flag
-  gResourceReadySignalFired = false;
+    application.GetScene().Add(imageView);
 
-  // Change size
-  imageView.SetProperty( Actor::Property::SIZE, Vector2( 0.f, 0.f ) );
+    application.SendNotification();
 
-  application.SendNotification();
+    // loading started, this waits for the loader thread - load & rasterize
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  // rasterization started, this waits for the rasterize thread
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    application.SendNotification();
+    application.Render(16);
 
-  application.SendNotification();
-  application.Render(16);
+    DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
-  // Fail to rasterize because the size is 0.
-  DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION );
+    // Should be shown a broken image
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  }
 
   END_TEST;
 }
 
-namespace
+int UtcDaliImageViewSvgLoadingFailureRemoteFile02(void)
 {
+  // Remote svg file without size set
+  {
+    ToolkitTestApplication application;
 
-static int gResourceReadySignalCounter = 0;
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
 
-void OnResourceReadySignal01( Control control )
-{
-  gResourceReadySignalCounter++;
+    gResourceReadySignalFired = false;
 
-  if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::READY)
+    ImageView imageView = ImageView::New("https://127.0.0.1/foobar.svg");
+    imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
+
+    application.GetScene().Add(imageView);
+
+    application.SendNotification();
+
+    // loading started, this waits for the loader thread - load & rasterize
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render(16);
+
+    DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+    // Should be shown a broken image
+    DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSvgRasterizationFailure(void)
+{
+  ToolkitTestApplication application;
+
+  gResourceReadySignalFired = false;
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/invalid1.svg");
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
+
+  application.GetScene().Add(imageView);
+
+  application.SendNotification();
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+  // Should be shown a broken image
+  DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSvgChageSize(void)
+{
+  ToolkitTestApplication application;
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  ImageView imageView = ImageView::New(TEST_SVG_FILE_NAME);
+  application.GetScene().Add(imageView);
+
+  application.SendNotification();
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(Test::VectorImageRenderer::GetLoadCount(), 1, TEST_LOCATION);
+
+  // Change actor size, then rasterization should be done again
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  application.SendNotification();
+
+  // Wait for rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // We should not load the file again.
+  DALI_TEST_EQUALS(Test::VectorImageRenderer::GetLoadCount(), 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSvgAtlasing(void)
+{
+  ToolkitTestApplication application;
+
+  TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace();
+  callStack.Reset();
+  callStack.Enable(true);
+
+  Property::Map propertyMap;
+  propertyMap["url"]      = TEST_SVG_FILE_NAME;
+  propertyMap["atlasing"] = true;
+
+  ImageView imageView = ImageView::New();
+  imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  application.GetScene().Add(imageView);
+
+  application.SendNotification();
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // use atlas
+  TraceCallStack::NamedParams params1;
+  params1["width"] << 100;
+  params1["height"] << 100;
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params1), true, TEST_LOCATION);
+
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(600.f, 600.f));
+
+  application.SendNotification();
+
+  // Wait for rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  callStack.Reset();
+
+  application.SendNotification();
+  application.Render(16);
+
+  // not use atlas
+  TraceCallStack::NamedParams params2;
+  params2["width"] << 600;
+  params2["height"] << 600;
+  DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexImage2D", params2), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewTVGLoading(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("ImageView Testing TVG image loading");
+
+  {
+    ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/test.tvg");
+    application.GetScene().Add(imageView);
+    DALI_TEST_CHECK(imageView);
+
+    application.SendNotification();
+
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render(16);
+
+    Vector3 naturalSize = imageView.GetNaturalSize();
+
+    DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION);
+    DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION);
+  }
+  END_TEST;
+}
+
+int UtcDaliImageViewSvgDesiredSize01(void)
+{
+  ToolkitTestApplication application;
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  int       desiredWidth = 100, desiredHeight = 150;
+  ImageView imageView = ImageView::New(TEST_SVG_FILE_NAME, ImageDimensions(desiredWidth, desiredHeight));
+
+  application.GetScene().Add(imageView);
+
+  application.SendNotification();
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  {
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str()));
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSvgDesiredSize02(void)
+{
+  ToolkitTestApplication application;
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  int       desiredWidth = 150, desiredHeight = 100;
+  ImageView imageView                   = ImageView::New();
+  imageView[ImageView::Property::IMAGE] = Property::Map().Add("url", TEST_SVG_FILE_NAME).Add("desiredWidth", desiredWidth).Add("desiredHeight", desiredHeight);
+  application.GetScene().Add(imageView);
+
+  application.SendNotification();
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  {
+    std::stringstream out;
+    out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight;
+    DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str()));
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewImageLoadFailure01(void)
+{
+  ToolkitTestApplication application;
+
+  Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_S);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_M);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L);
+
+  std::string brokenUrl;
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_S, brokenUrl, TEST_LOCATION);
+
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_M, brokenUrl, TEST_LOCATION);
+
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION);
+
+  ImageView imageView = ImageView::New("invalidUrl.png");
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  application.GetScene().Add(imageView);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewImageLoadFailure02(void)
+{
+  ToolkitTestApplication application;
+
+  Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_DEFAULT);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_M);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L);
+
+  std::string brokenUrl;
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_DEFAULT, brokenUrl, TEST_LOCATION);
+
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_M, brokenUrl, TEST_LOCATION);
+
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION);
+
+  ImageView imageView = ImageView::New("invalidUrl.png");
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(30.f, 30.f));
+  application.GetScene().Add(imageView);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewImageLoadFailure03(void)
+{
+  ToolkitTestApplication application;
+
+  Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_01);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_02);
+
+  std::string brokenUrl;
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_01, brokenUrl, TEST_LOCATION);
+
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_02, brokenUrl, TEST_LOCATION);
+
+  ImageView imageView = ImageView::New("invalidUrl.png");
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  application.GetScene().Add(imageView);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewImageLoadFailure04(void)
+{
+  ToolkitTestApplication application;
+
+  ImageView imageView = ImageView::New("invalidUrl.png");
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  application.GetScene().Add(imageView);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_S);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, "invalidBroken.png");
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L);
+
+  ImageView imageView2 = ImageView::New("invalidUrl.png");
+  imageView2.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  application.GetScene().Add(imageView2);
+
+  std::string brokenUrl;
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_S, brokenUrl, TEST_LOCATION);
+
+  brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE);
+  DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, "invalidBroken.9.png");
+
+  ImageView imageView3 = ImageView::New("invalidUrl.png");
+  imageView3.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  application.GetScene().Add(imageView3);
+
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+namespace
+{
+static int gResourceReadySignalCounter = 0;
+
+void OnResourceReadySignal01(Control control)
+{
+  gResourceReadySignalCounter++;
+
+  if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::READY)
   {
-    if( gResourceReadySignalCounter == 1 )
+    if(gResourceReadySignalCounter == 1)
     {
       // Set image twice
       // It makes the first new visual be deleted immediately
-      ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
-      ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
+      ImageView::DownCast(control).SetImage(gImage_34_RGBA);
+      ImageView::DownCast(control).SetImage(gImage_34_RGBA);
     }
   }
   else if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::FAILED)
   {
     // Make the resource ready immediately
-    control[ImageView::Property::IMAGE] = TEST_RESOURCE_DIR "/svg1.svg";
+    control[ImageView::Property::IMAGE] = gImage_600_RGB;
+  }
+}
+
+void OnResourceReadySignal02(Control control)
+{
+  if(++gResourceReadySignalCounter == 1)
+  {
+    // It makes the first new visual be deleted immediately
+    // The first image will not be loaded.
+    control[ImageView::Property::IMAGE] = Property::Map().Add(ImageVisual::Property::URL, gImage_600_RGB).Add(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER);
+    control[ImageView::Property::IMAGE] = TEST_IMAGE_1;
   }
 }
 
-void OnResourceReadySignal02( Control control )
-{
-  if(++gResourceReadySignalCounter == 1)
-  {
-    // It makes the first new visual be deleted immediately
-    // The first image will not be loaded.
-    control[ImageView::Property::IMAGE] = Property::Map().Add(ImageVisual::Property::URL, gImage_600_RGB)
-                                                         .Add(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER);
-    control[ImageView::Property::IMAGE] = TEST_IMAGE_1;
-  }
-}
+ImageView gImageView1;
+ImageView gImageView2;
+ImageView gImageView3;
+ImageView gImageView4;
+
+void OnResourceReadySignal03(Control control)
+{
+  if(gResourceReadySignalCounter == 0)
+  {
+    // Queue loading
+    // 1. Use cached image, then LoadComplete will be called right after OnResourceReadySignal03.
+    gImageView2[ImageView::Property::IMAGE] = gImage_34_RGBA;
+
+    // 2. Load a new image
+    gImageView3[ImageView::Property::IMAGE] = TEST_IMAGE_1;
+
+    // 3. Use the new image again
+    gImageView1[ImageView::Property::IMAGE] = TEST_IMAGE_1;
+    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal03);
+  }
+  else if(gResourceReadySignalCounter == 1)
+  {
+    // This is called from TextureManager::ProcessQueuedTextures().
+    gImageView1.Unparent();
+    gImageView1.Reset();
+  }
+  gResourceReadySignalCounter++;
+}
+
+void OnSimpleResourceReadySignal(Control control)
+{
+  // simply increate counter
+  gResourceReadySignalCounter++;
+}
+
+int gResourceReadySignal04ComesOrder = 0;
+
+void OnResourceReadySignal04(Control control)
+{
+  gResourceReadySignalCounter++;
+  tet_printf("rc %d\n", gResourceReadySignalCounter);
+  if(gResourceReadySignalCounter == 1)
+  {
+    auto scene = gImageView1.GetParent();
+
+    // Request load something
+    // We hope this request result is return later than gImageView2.
+    gImageView3 = ImageView::New(TEST_IMAGE_1);
+    gImageView3.ResourceReadySignal().Connect(&OnResourceReadySignal04);
+    scene.Add(gImageView3);
+    gImageView4 = ImageView::New(TEST_IMAGE_2);
+    gImageView4.ResourceReadySignal().Connect(&OnResourceReadySignal04);
+    scene.Add(gImageView4);
+
+    if(control == gImageView1)
+    {
+      gResourceReadySignal04ComesOrder = 1;
+    }
+    else
+    {
+      gResourceReadySignal04ComesOrder = 2;
+    }
+  }
+  if(gResourceReadySignalCounter == 2)
+  {
+    if(gResourceReadySignal04ComesOrder == 1 && control == gImageView2)
+    {
+      // Scene off first one.
+      gImageView1.Unparent();
+
+      // Scene off second one.
+      gImageView2.Unparent();
+    }
+    else if(gResourceReadySignal04ComesOrder == 2 && control == gImageView1)
+    {
+      // Scene off first one.
+      gImageView2.Unparent();
+
+      // Scene off second one.
+      gImageView1.Unparent();
+    }
+    else
+    {
+      // We can't check that this utc fail case. just pass always when we come here.
+      gResourceReadySignal04ComesOrder = -1;
+    }
+
+    // If we don't seperate index of FreeList area
+    // and if we don't queue remove during obversing,
+    // cache index become something invalid data.
+    // In this case, some strange observer can be called.
+    // For example, gImageView4.LoadComplete will be called.
+  }
+}
+
+void OnResourceReadySignal05(Control control)
+{
+  gResourceReadySignalCounter++;
+
+  // Request load with same image
+  // NOTE : The url must not be same as gImageView1
+  const int viewCount = 4;
+  for(int i = 0; i < viewCount; ++i)
+  {
+    gImageView1.Add(ImageView::New("invalid2.jpg"));
+  }
+}
+
+int gResourceReadySignal06ComesOrder = 0;
+
+void OnResourceReadySignal06(Control control)
+{
+  gResourceReadySignalCounter++;
+  if(gResourceReadySignalCounter == 1)
+  {
+    auto scene = gImageView1.GetParent();
+
+    // Request load something
+    // We hope this request result is return later than gImageView2.
+
+    Property::Map map1;
+    map1[Toolkit::ImageVisual::Property::URL]            = TEST_IMAGE_1;
+    map1[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = TEST_BROKEN_IMAGE_DEFAULT;
+
+    gImageView3 = ImageView::New();
+    gImageView3.SetProperty(Toolkit::ImageView::Property::IMAGE, map1);
+    gImageView3.ResourceReadySignal().Connect(&OnResourceReadySignal06);
+
+    Property::Map map2;
+    map2[Toolkit::ImageVisual::Property::URL]            = TEST_IMAGE_2;
+    map2[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = TEST_BROKEN_IMAGE_S;
+    gImageView4                                          = ImageView::New();
+    gImageView4.SetProperty(Toolkit::ImageView::Property::IMAGE, map2);
+    gImageView4.ResourceReadySignal().Connect(&OnResourceReadySignal06);
+
+    if(control == gImageView1)
+    {
+      gResourceReadySignal06ComesOrder = 1;
+    }
+    else
+    {
+      gResourceReadySignal06ComesOrder = 2;
+    }
+  }
+  if(gResourceReadySignalCounter == 2)
+  {
+    if(gResourceReadySignal06ComesOrder == 1 && control == gImageView2)
+    {
+      // Scene off first one.
+      gImageView1.Unparent();
+
+      // Scene off second one.
+      gImageView2.Unparent();
+    }
+    else if(gResourceReadySignal06ComesOrder == 2 && control == gImageView1)
+    {
+      // Scene off first one.
+      gImageView2.Unparent();
+
+      // Scene off second one.
+      gImageView1.Unparent();
+    }
+    else
+    {
+      // We can't check that this utc fail case. just pass always when we come here.
+      gResourceReadySignal06ComesOrder = -1;
+    }
+
+    // If we don't seperate index of FreeList area
+    // and if we don't queue remove during obversing,
+    // cache index become something invalid data.
+    // In this case, some strange observer can be called.
+    // For example, gImageView4.LoadComplete will be called.
+  }
+}
+
+void OnResourceReadySignal07(Control control)
+{
+  gResourceReadySignalCounter++;
+  // Load masked image
+  tet_printf("rc %d %d\n", gResourceReadySignalCounter, static_cast<bool>(gImageView2));
+
+  if(!gImageView2)
+  {
+    auto scene = gImageView1.GetParent();
+
+    Property::Map map1;
+    map1[Toolkit::ImageVisual::Property::URL]            = TEST_IMAGE_1;
+    map1[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = TEST_BROKEN_IMAGE_DEFAULT;
+
+    gImageView2 = ImageView::New();
+    gImageView2.SetProperty(Toolkit::ImageView::Property::IMAGE, map1);
+    gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal07);
+
+    scene.Add(gImageView2);
+  }
+}
+
+void OnResourceReadySignal08(Control control)
+{
+  gResourceReadySignalCounter++;
+
+  if(gImageView1)
+  {
+    gImageView1.Unparent();
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Unparent();
+    gImageView2.Reset();
+  }
+}
+
+std::size_t gResourceReadySignal09Emitted = false;
+
+void OnResourceReadySignal09(Control control)
+{
+  gResourceReadySignalCounter++;
+
+  if(gImageView1 && !gResourceReadySignal09Emitted)
+  {
+    gResourceReadySignal09Emitted = true;
+    gImageView1.ResourceReadySignal().Disconnect(&OnResourceReadySignal09);
+
+    // Try to load cached invalid nine patch image. It will request load now.
+    gImageView1.SetImage(TEST_INVALID_NPATCH_FILE_NAME_01);
+    gImageView2.SetImage(TEST_INVALID_NPATCH_FILE_NAME_01);
+
+    // Destroy all visuals immediatly.
+    gImageView1.Unparent();
+    gImageView1.Reset();
+    gImageView2.Unparent();
+    gImageView2.Reset();
+  }
+}
+constexpr int gResourceReadySignal10MaxCounter = 5;
+
+void OnResourceReadySignal10(Control control)
+{
+  gResourceReadySignalCounter++;
+
+  tet_printf("OnResourceReadySignal10 comes!\n");
+  if(gResourceReadySignalCounter < gResourceReadySignal10MaxCounter)
+  {
+    tet_printf("OnResourceReadySignal10 Set image\n");
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, gImage_34_RGBA);
+    tet_printf("OnResourceReadySignal10 Set image done\n");
+  }
+}
+
+void OnResourceReadySignal11(Control control)
+{
+  gResourceReadySignalCounter++;
+
+  if(!gImageView2)
+  {
+    auto scene = gImageView1.GetParent();
+
+    // Try to load animated image visual here which is already cached, and then ignore forcely.
+
+    Property::Map map1;
+    map1[Toolkit::ImageVisual::Property::URL] = TEST_GIF_FILE_NAME;
+
+    gImageView2 = ImageView::New();
+    gImageView2.SetProperty(Toolkit::ImageView::Property::IMAGE, map1);
+
+    gImageView3 = ImageView::New();
+    gImageView3.SetProperty(Toolkit::ImageView::Property::IMAGE, map1);
+
+    scene.Add(gImageView2);
+    gImageView2.Unparent();
+
+    scene.Add(gImageView3);
+    gImageView3.Unparent();
+    gImageView3.Reset(); // Destroy visual
+  }
+}
+
+} // namespace
+
+int UtcDaliImageViewSetImageOnResourceReadySignal01(void)
+{
+  tet_infoline("Test setting image from within signal handler.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  ImageView imageView = ImageView::New(gImage_34_RGBA);
+  imageView.ResourceReadySignal().Connect(&OnResourceReadySignal01);
+
+  application.GetScene().Add(imageView);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+
+  // Create a new ImageView to cache the image
+  ImageView imageView1 = ImageView::New(gImage_600_RGB);
+  application.GetScene().Add(imageView1);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Reset count
+  gResourceReadySignalCounter = 0;
+
+  imageView[ImageView::Property::IMAGE] = "invalid.jpg";
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Run idle callback
+  application.RunIdles();
+
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal02(void)
+{
+  tet_infoline("Test setting image from within signal handler.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  ImageView imageView = ImageView::New(gImage_34_RGBA);
+  imageView.ResourceReadySignal().Connect(&OnResourceReadySignal02);
+
+  application.GetScene().Add(imageView);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait for loading an image
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal03(void)
+{
+  tet_infoline("Test setting image from within signal handler.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  gImageView1 = ImageView::New(gImage_34_RGBA);
+  application.GetScene().Add(gImageView1);
+
+  // Wait for loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  gImageView2 = ImageView::New(gImage_600_RGB);
+  gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal03);
+  application.GetScene().Add(gImageView2);
+
+  gImageView3 = ImageView::New();
+  application.GetScene().Add(gImageView3);
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliImageViewOnResourceReadySignalWithBrokenAlphaMask01(void)
+{
+  tet_infoline("Test signal handler when image / mask image is broken.");
+
+  ToolkitTestApplication application;
+
+  auto TestResourceReadyUrl = [&application](int eventTriggerCount, bool isSynchronous, const std::string& url, const std::string& mask, const char* location) {
+    gResourceReadySignalCounter = 0;
+
+    Property::Map map;
+    map[Toolkit::ImageVisual::Property::URL] = url;
+    if(!mask.empty())
+    {
+      map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = mask;
+    }
+    map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = isSynchronous;
+
+    ImageView imageView                            = ImageView::New();
+    imageView[Toolkit::ImageView::Property::IMAGE] = map;
+    imageView[Actor::Property::SIZE]               = Vector2(100.0f, 200.0f);
+    imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal);
+
+    application.GetScene().Add(imageView);
+    application.SendNotification();
+    application.Render();
+
+    if(!isSynchronous)
+    {
+      // Wait for loading
+      DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(eventTriggerCount), true, location);
+    }
+    tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location);
+
+    imageView.Unparent();
+  };
+
+  for(int synchronous = 0; synchronous <= 1; synchronous++)
+  {
+    tet_printf("Test normal case (sync:%d)\n", synchronous);
+    TestResourceReadyUrl(1, synchronous, gImage_600_RGB, "", TEST_LOCATION);
+    TestResourceReadyUrl(3, synchronous, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); // 3 event trigger required : 2 image load + 1 apply mask
+
+    tet_printf("Test broken image case (sync:%d)\n", synchronous);
+    TestResourceReadyUrl(1, synchronous, "invalid.jpg", "", TEST_LOCATION);
+    TestResourceReadyUrl(2, synchronous, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION);
+
+    tet_printf("Test broken mask image case (sync:%d)\n", synchronous);
+    TestResourceReadyUrl(2, synchronous, gImage_600_RGB, "invalid.png", TEST_LOCATION);
+
+    tet_printf("Test broken both image, mask image case (sync:%d)\n", synchronous);
+    TestResourceReadyUrl(2, synchronous, "invalid.jpg", "invalid.png", TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewOnResourceReadySignalWithBrokenAlphaMask02(void)
+{
+  tet_infoline("Test signal handler when image try to use cached-and-broken mask image.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  auto TestBrokenMaskResourceReadyUrl = [&application](const std::string& url, const char* location) {
+    Property::Map map;
+    map[Toolkit::ImageVisual::Property::URL] = url;
+    // Use invalid mask url
+    map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = "invalid.png";
+
+    ImageView imageView                            = ImageView::New();
+    imageView[Toolkit::ImageView::Property::IMAGE] = map;
+    imageView[Actor::Property::SIZE]               = Vector2(100.0f, 200.0f);
+    imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal);
+
+    application.GetScene().Add(imageView);
+
+    // Don't unparent imageView, for keep the cache.
+  };
+
+  // Use more than 4 images (The number of LocalImageLoadThread)
+  const std::vector<std::string> testUrlList = {gImage_34_RGBA, gImage_600_RGB, "invalid.jpg" /* invalid url */, TEST_IMAGE_1, TEST_IMAGE_2, TEST_BROKEN_IMAGE_DEFAULT};
+
+  int expectResourceReadySignalCounter = 0;
+
+  for(auto& url : testUrlList)
+  {
+    TestBrokenMaskResourceReadyUrl(url, TEST_LOCATION);
+    expectResourceReadySignalCounter++;
+  }
+
+  // Remain 1 signal due to we use #URL + 1 mask image.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(expectResourceReadySignalCounter + 1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, expectResourceReadySignalCounter, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void)
+{
+  tet_infoline("Test signal handler various case.");
+
+  auto TestResourceReadyUrl = [](int eventTriggerCount, bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& mask, const char* location) {
+    ToolkitTestApplication application;
+
+    gResourceReadySignalCounter = 0;
+
+    Property::Map map;
+    map[Toolkit::ImageVisual::Property::URL] = url;
+    if(!mask.empty())
+    {
+      map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = mask;
+    }
+    map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = isSynchronous;
+
+    ImageView imageView                            = ImageView::New();
+    imageView[Toolkit::ImageView::Property::IMAGE] = map;
+    imageView[Actor::Property::SIZE]               = Vector2(100.0f, 200.0f);
+    imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal);
+
+    application.GetScene().Add(imageView);
+    application.SendNotification();
+    application.Render();
+
+    // Wait for loading
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(eventTriggerCount), true, location);
+
+    tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location);
+    DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, location);
+
+    imageView.Unparent();
+  };
+
+  auto TestAuxiliaryResourceReadyUrl = [](bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& auxiliaryUrl, const char* location) {
+    ToolkitTestApplication application;
+
+    gResourceReadySignalCounter = 0;
+
+    Property::Map map;
+    map[Toolkit::ImageVisual::Property::URL]                        = url;
+    map[Toolkit::DevelImageVisual::Property::AUXILIARY_IMAGE]       = auxiliaryUrl;
+    map[Toolkit::DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA] = 0.5f;
+    map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING]        = isSynchronous;
+
+    ImageView imageView = ImageView::New();
+    imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+    imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal);
+    application.GetScene().Add(imageView);
+
+    application.SendNotification();
+    application.Render();
+
+    if(!isSynchronous)
+    {
+      // Wait for loading
+      DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, location);
+    }
+
+    tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location);
+    DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+    imageView.Unparent();
+  };
+
+  // Case 1 : asynchronous loading
+  tet_printf("Test invalid single simple image Asynchronous\n");
+
+  // Test normal case
+  TestResourceReadyUrl(1, 0, 1, gImage_600_RGB, "", TEST_LOCATION);
+  TestResourceReadyUrl(2, 0, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // load & rasterize
+  TestResourceReadyUrl(1, 0, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION);
+
+  TestResourceReadyUrl(2, 0, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION);                   // 2 image loading - batch size
+  TestResourceReadyUrl(2, 0, 1, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, "", TEST_LOCATION); // load & rasterize
+
+  TestResourceReadyUrl(3, 0, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); // 2 image loading + 1 applymask
+
+  TestAuxiliaryResourceReadyUrl(0, 1, TEST_BROKEN_IMAGE_L, gImage_34_RGBA, TEST_LOCATION);
+
+  // Test broken case
+  TestResourceReadyUrl(1, 0, 0, "invalid.jpg", "", TEST_LOCATION);
+  TestResourceReadyUrl(1, 0, 0, "invalid.svg", "", TEST_LOCATION);
+  TestResourceReadyUrl(1, 0, 0, "invalid.9.png", "", TEST_LOCATION);
+  TestResourceReadyUrl(1, 0, 0, "invalid.gif", "", TEST_LOCATION);  // 1 image loading
+  TestResourceReadyUrl(1, 0, 0, "invalid.json", "", TEST_LOCATION); // 0 rasterize
+
+  TestResourceReadyUrl(2, 0, 0, "invalid.jpg", "invalid.png", TEST_LOCATION);  // 2 image loading
+  TestResourceReadyUrl(2, 0, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION); // 2 image loading
+  TestResourceReadyUrl(2, 0, 0, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION); // 2 image loading
+
+  TestAuxiliaryResourceReadyUrl(0, 0, "invalid.9.png", "invalid.png", TEST_LOCATION);
+  TestAuxiliaryResourceReadyUrl(0, 1, TEST_BROKEN_IMAGE_L, "invalid.png", TEST_LOCATION);
+  TestAuxiliaryResourceReadyUrl(0, 0, "invalid.9.png", gImage_34_RGBA, TEST_LOCATION);
+
+  // Case 2 : Synchronous loading
+  tet_printf("Test invalid single simple image Synchronous\n");
+
+  // Test normal case
+  TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, "", TEST_LOCATION);
+  TestResourceReadyUrl(0, 1, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // synchronous rasterize
+  TestResourceReadyUrl(0, 1, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION);
+
+  TestResourceReadyUrl(1, 1, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // first frame image loading sync + second frame image loading async
+
+  TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION);
+
+  TestAuxiliaryResourceReadyUrl(1, 1, TEST_BROKEN_IMAGE_L, gImage_34_RGBA, TEST_LOCATION);
+
+  // Test broken case
+  TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "", TEST_LOCATION);
+  TestResourceReadyUrl(0, 1, 0, "invalid.svg", "", TEST_LOCATION);
+  TestResourceReadyUrl(0, 1, 0, "invalid.9.png", "", TEST_LOCATION);
+  TestResourceReadyUrl(0, 1, 0, "invalid.gif", "", TEST_LOCATION);
+
+  TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "invalid.png", TEST_LOCATION);
+  TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION);
+  TestResourceReadyUrl(0, 1, 0, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION);
+
+  TestAuxiliaryResourceReadyUrl(1, 0, "invalid.9.png", "invalid.png", TEST_LOCATION);
+  TestAuxiliaryResourceReadyUrl(1, 1, TEST_BROKEN_IMAGE_L, "invalid.png", TEST_LOCATION);
+  TestAuxiliaryResourceReadyUrl(1, 0, "invalid.9.png", gImage_34_RGBA, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal04(void)
+{
+  tet_infoline("Test texturemanager's remove queue works well within signal handler.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter      = 0;
+  gResourceReadySignal04ComesOrder = 0;
+
+  gImageView1 = ImageView::New("invalid.jpg"); // request invalid image, to make loading failed fast.
+  gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal04);
+  application.GetScene().Add(gImageView1);
+
+  gImageView2 = ImageView::New("invalid.png"); // request invalid image, to make loading failed fast.
+  gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal04);
+  application.GetScene().Add(gImageView2);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_infoline("Try to load 2 invalid image");
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+  tet_infoline("load done");
+
+  // We can test this UTC only if gImageView1 and gImageView2 loaded done.
+  if(gResourceReadySignal04ComesOrder == -1)
+  {
+    tet_infoline("Bad news.. gImageView3 or gImageView4 loaded faster than others. just skip this UTC");
+  }
+  else
+  {
+    // gImageView3 and gImageView4 load must not be successed yet.
+    DALI_TEST_EQUALS(gImageView3.GetRendererCount(), 0u, TEST_LOCATION);
+    DALI_TEST_EQUALS(gImageView4.GetRendererCount(), 0u, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    tet_infoline("Try to load 2 valid image");
+
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 4, TEST_LOCATION);
+
+    tet_infoline("load done");
+
+    // gImageView3 and gImageView4 load must be successed now.
+    DALI_TEST_EQUALS(gImageView3.GetRendererAt(0).GetTextures().GetTextureCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(gImageView4.GetRendererAt(0).GetTextures().GetTextureCount(), 1u, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+int UtcDaliImageViewSetImageOnResourceReadySignal05(void)
+{
+  tet_infoline("Test multiple views with same image during ResourceReady load the image only 1 times");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  gImageView1 = ImageView::New("invalid.jpg"); // request invalid image, to make loading failed fast.
+  gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal05);
+  application.GetScene().Add(gImageView1);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_infoline("Try to load 1 invalid.jpg image");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION);
+
+  tet_infoline("Try to load 1 invalid2.jpg image");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  tet_infoline("Now we don't have any image to be loaded. Check event thread trigger failed.");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 1), false, TEST_LOCATION);
+
+  gImageView1.Unparent();
+  gImageView1.Reset();
+
+  END_TEST;
+}
+int UtcDaliImageViewSetImageOnResourceReadySignal06(void)
+{
+  tet_infoline("Test texturemanager's remove image & mask queue works well within signal handler.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter      = 0;
+  gResourceReadySignal06ComesOrder = 0;
+
+  Property::Map map;
+  map[Toolkit::ImageVisual::Property::URL]            = "invalid.jpg";
+  map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = "invalid.png";
+
+  gImageView1 = ImageView::New(); // request invalid image, to make loading failed fast.
+  gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal06);
+  application.GetScene().Add(gImageView1);
+
+  gImageView2 = ImageView::New(); // request invalid image, to make loading failed fast.
+  gImageView2.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal06);
+  application.GetScene().Add(gImageView2);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_infoline("Try to load 2 invalid image");
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+  tet_infoline("load done");
+
+  // We can test this UTC only if gImageView1 and gImageView2 loaded done.
+  if(gResourceReadySignal06ComesOrder == -1)
+  {
+    tet_infoline("Bad news.. gImageView3 or gImageView4 loaded faster than others. just skip this UTC");
+  }
+  else
+  {
+    // gImageView3 and gImageView4 load must not be successed yet.
+    DALI_TEST_EQUALS(gImageView3.GetRendererCount(), 0u, TEST_LOCATION);
+    DALI_TEST_EQUALS(gImageView4.GetRendererCount(), 0u, TEST_LOCATION);
+
+    application.GetScene().Add(gImageView3);
+    application.GetScene().Add(gImageView4);
+    application.SendNotification();
+    application.Render();
+
+    tet_infoline("Try to load 2 valid image");
+
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+    tet_infoline("Note that resource ready should not come now.");
+    tet_infoline("Try to load remained 2 valid image + apply masking");
+
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 4, TEST_LOCATION);
+
+    tet_infoline("Check all resource ready comes now.");
+  }
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal07(void)
+{
+  tet_infoline("Test texturemanager's remove image & mask queue works well within signal handler 02.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  Property::Map map;
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_1;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Reset();
+  }
+
+  gImageView1 = ImageView::New();
+  gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal07);
+  application.GetScene().Add(gImageView1);
+
+  application.SendNotification();
+  application.Render();
+
+  // Load gImageView1
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION);
+
+  tet_infoline("load image1 done");
+
+  // Load gImageView2 and mask
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION);
+
+  // gImageView2 mask apply done
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+  tet_infoline("load image2 done");
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal08(void)
+{
+  tet_infoline("Test remove npatch images during resource ready");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  Property::Map map;
+  map[Toolkit::ImageVisual::Property::URL] = TEST_BROKEN_IMAGE_M;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Reset();
+  }
+
+  // Case 1 : Remove all images during resource ready.
+  try
+  {
+    gImageView1 = ImageView::New();
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal08);
+    application.GetScene().Add(gImageView1);
+
+    application.SendNotification();
+    application.Render();
+
+    // Load gImageView1
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    // Exception should not happened
+    DALI_TEST_CHECK(false);
+  }
+
+  // Clear cache.
+  application.SendNotification();
+  application.Render();
+
+  gResourceReadySignalCounter = 0;
+
+  // Case 2 : Remove all images when we use cached resource.
+  try
+  {
+    gImageView1 = ImageView::New();
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    gImageView1.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal);
+    application.GetScene().Add(gImageView1);
+
+    application.SendNotification();
+    application.Render();
+
+    // Load gImageView1
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    gImageView2 = ImageView::New();
+    gImageView2.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal08);
+    application.GetScene().Add(gImageView2);
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    // Exception should not happened
+    DALI_TEST_CHECK(false);
+  }
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Reset();
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal09(void)
+{
+  tet_infoline("Test load invalid npatch images during invalid resource ready");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  Property::Map map;
+  map[Toolkit::ImageVisual::Property::URL] = TEST_INVALID_NPATCH_FILE_NAME_01;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Reset();
+  }
+  if(gImageView3)
+  {
+    gImageView3.Reset();
+  }
+
+  // Dummy view with npatch image
+  ImageView dummyView = ImageView::New(TEST_BROKEN_IMAGE_M);
+  application.GetScene().Add(dummyView);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Case 1 : Reload images during resource ready.
+  try
+  {
+    gResourceReadySignal09Emitted = false;
+
+    gImageView1 = ImageView::New();
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal09);
+    application.GetScene().Add(gImageView1);
+
+    gImageView2 = ImageView::New();
+    application.GetScene().Add(gImageView2);
+
+    // Load TEST_INVALID_NPATCH_FILE_NAME_01
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    // Load TEST_INVALID_NPATCH_FILE_NAME_01 one more times.
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    // Exception should not happened
+    DALI_TEST_CHECK(false);
+  }
+
+  // Clear cache.
+  application.SendNotification();
+  application.Render();
+
+  gResourceReadySignalCounter = 0;
+
+  // Case 2 : Remove all images when we use cached resource.
+  try
+  {
+    gResourceReadySignal09Emitted = false;
+
+    gImageView3 = ImageView::New();
+    gImageView3.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    gImageView3.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal);
+    application.GetScene().Add(gImageView3);
+
+    gImageView2 = ImageView::New();
+    application.GetScene().Add(gImageView2);
+
+    // Load gImageView2
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    gImageView1 = ImageView::New();
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal09);
+    application.GetScene().Add(gImageView1);
+
+    // Load gImageView1
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    // Load TEST_INVALID_NPATCH_FILE_NAME_01 one more times.
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    // Exception should not happened
+    DALI_TEST_CHECK(false);
+  }
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Reset();
+  }
+  if(gImageView3)
+  {
+    gImageView3.Reset();
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal10(void)
+{
+  tet_infoline("Test ResourceReady signal comes more than 2 times.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+
+  // Dummy view to cache image.
+  ImageView dummyView = ImageView::New(gImage_34_RGBA);
+  application.GetScene().Add(dummyView);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  try
+  {
+    gImageView1 = ImageView::New();
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, gImage_34_RGBA);
+    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal10);
+    application.GetScene().Add(gImageView1); // It will call resourceReady signal 1 time.
+
+    tet_printf("ResourceReady called %d times\n", gResourceReadySignalCounter);
+
+    DALI_TEST_GREATER(gResourceReadySignal10MaxCounter, gResourceReadySignalCounter, TEST_LOCATION); // Check whether resource ready call too much.
+
+    for(int i = 0; i < gResourceReadySignal10MaxCounter; ++i)
+    {
+      tet_printf("RunIdles\n");
+      // Executes the idle callbacks.
+      application.RunIdles();
+      application.SendNotification();
+      application.Render();
+      tet_printf("RunIdles done\n");
+    }
+    tet_printf("ResourceReady called %d times\n", gResourceReadySignalCounter);
+
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, gResourceReadySignal10MaxCounter, TEST_LOCATION);
+
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    // Exception should not happened
+    DALI_TEST_CHECK(false);
+  }
+
+  // Clear cache.
+  application.SendNotification();
+  application.Render();
+
+  gResourceReadySignalCounter = 0;
+
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal10WhenAddIdleFailed(void)
+{
+  tet_infoline("Test ResourceReady signal comes more than 2 times, but do not call again if AddIdle failed");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+
+  // Dummy view to cache image.
+  ImageView dummyView = ImageView::New(gImage_34_RGBA);
+  application.GetScene().Add(dummyView);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  // Make AddIdle failed.
+  ToolkitApplication::ADD_IDLE_SUCCESS = false;
+
+  try
+  {
+    gImageView1 = ImageView::New();
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, gImage_34_RGBA);
+    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal10);
+    application.GetScene().Add(gImageView1); // It will call resourceReady signal 1 time.
+
+    tet_printf("ResourceReady called %d times\n", gResourceReadySignalCounter);
+
+    DALI_TEST_GREATER(gResourceReadySignal10MaxCounter, gResourceReadySignalCounter, TEST_LOCATION); // Check whether resource ready call too much.
+
+    for(int i = 0; i < gResourceReadySignal10MaxCounter; ++i)
+    {
+      tet_printf("RunIdles\n");
+      // Executes the idle callbacks.
+      application.RunIdles();
+      application.SendNotification();
+      application.Render();
+      tet_printf("RunIdles done\n");
+    }
+    tet_printf("ResourceReady called %d times\n", gResourceReadySignalCounter);
+
+    DALI_TEST_GREATER(gResourceReadySignal10MaxCounter, gResourceReadySignalCounter, TEST_LOCATION); // Check whether resource ready not called multiple times.
+
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    // Exception should not happened
+    DALI_TEST_CHECK(false);
+  }
+
+  ToolkitApplication::ADD_IDLE_SUCCESS = true;
+
+  // Clear cache.
+  application.SendNotification();
+  application.Render();
+
+  gResourceReadySignalCounter = 0;
+
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewSetImageOnResourceReadySignal11(void)
+{
+  tet_infoline("Test ResourceReady Add AnimatedImageVisual and then Remove immediately.");
+
+  ToolkitTestApplication application;
+
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Reset();
+  }
+  if(gImageView3)
+  {
+    gImageView3.Reset();
+  }
+
+  try
+  {
+    gImageView1 = ImageView::New();
+    gImageView1.SetProperty(Toolkit::ImageView::Property::IMAGE, TEST_GIF_FILE_NAME);
+    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal11);
+    application.GetScene().Add(gImageView1); // It will call resourceReady signal 1 time.
+
+    tet_printf("ResourceReady called %d times\n", gResourceReadySignalCounter);
+
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 0, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
+
+    // Load gImageView1
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+    tet_printf("ResourceReady called %d times\n", gResourceReadySignalCounter);
+
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION);
+
+    DALI_TEST_CHECK(true);
+  }
+  catch(...)
+  {
+    // Exception should not happened
+    DALI_TEST_CHECK(false);
+  }
+
+  // Clear cache.
+  application.SendNotification();
+  application.Render();
+
+  gResourceReadySignalCounter = 0;
+
+  // Clear image view for clear test
+
+  if(gImageView1)
+  {
+    gImageView1.Reset();
+  }
+  if(gImageView2)
+  {
+    gImageView2.Reset();
+  }
+  if(gImageView3)
+  {
+    gImageView3.Reset();
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageViewUseSameUrlWithAnimatedImageVisual(void)
+{
+  tet_infoline("Test multiple views with same image in animated image visual");
+  ToolkitTestApplication application;
+
+  gImageView1 = ImageView::New(TEST_WEBP_FILE_NAME);
+  application.GetScene().Add(gImageView1);
+
+  tet_infoline("Remove imageView and Create new imageView with same url");
+  application.GetScene().Remove(gImageView1);
+  gImageView2 = ImageView::New(TEST_WEBP_FILE_NAME);
+  application.GetScene().Add(gImageView2);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_infoline("Check the ImageView load image successfully");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliImageViewNpatchImageCacheTest01(void)
+{
+  tet_infoline("Test npatch image cached");
+
+  ToolkitTestApplication application;
+  ImageView              imageView[2];
+
+  auto& gl = application.GetGlAbstraction();
+  gl.EnableTextureCallTrace(true);
+  auto& textureCallStack = gl.GetTextureTrace();
+  textureCallStack.Enable(true);
+  textureCallStack.EnableLogging(true);
+
+  auto TestNPatch = [&](int index, const std::string& nPatchImageUrl, const char* location) {
+    if(imageView[index])
+    {
+      imageView[index].Unparent();
+    }
+
+    // Ensure remove npatch cache if required.
+    application.SendNotification();
+    application.Render();
+
+    imageView[index] = ImageView::New(nPatchImageUrl);
+    imageView[index].SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+    application.GetScene().Add(imageView[index]);
+  };
+
+  TestNPatch(0, TEST_BROKEN_IMAGE_M, TEST_LOCATION);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("trace : \n%s\n", textureCallStack.GetTraceString().c_str());
+
+  // Check we gen only 1 textures
+  DALI_TEST_EQUALS(textureCallStack.CountMethod("GenTextures"), 1, TEST_LOCATION);
+  textureCallStack.Reset();
+
+  // Let we use cached textures
+  for(int i = 0; i < 10; i++)
+  {
+    TestNPatch(1, TEST_BROKEN_IMAGE_M, TEST_LOCATION);
+    TestNPatch(0, TEST_BROKEN_IMAGE_M, TEST_LOCATION);
+  }
+
+  application.SendNotification();
+  application.Render();
+  // Check we use cached npatch data so we don't generate new texture textures
+  DALI_TEST_EQUALS(textureCallStack.CountMethod("GenTextures"), 0, TEST_LOCATION);
+
+  // Clear all cached
+  imageView[0].Unparent();
+  imageView[0].Reset();
+  imageView[1].Unparent();
+  imageView[1].Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  textureCallStack.Reset();
+  // Let we use deference textures
+  TestNPatch(1, TEST_BROKEN_IMAGE_S, TEST_LOCATION);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+  // Try to load multiple times.
+  for(int i = 0; i < 3; i++)
+  {
+    TestNPatch(0, TEST_BROKEN_IMAGE_M, TEST_LOCATION);
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    TestNPatch(1, TEST_BROKEN_IMAGE_S, TEST_LOCATION);
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  }
+  application.SendNotification();
+  application.Render();
+
+  imageView[0].Unparent();
+  imageView[0].Reset();
+  imageView[1].Unparent();
+  imageView[1].Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  // Check memory leak
+  DALI_TEST_EQUALS(textureCallStack.CountMethod("GenTextures"), textureCallStack.CountMethod("DeleteTextures"), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewNpatchImageCacheTest02(void)
+{
+  tet_infoline("Test npatch image cached with border");
+
+  ToolkitTestApplication application;
+  ImageView              imageView[2];
+
+  auto& gl = application.GetGlAbstraction();
+  gl.EnableTextureCallTrace(true);
+  auto& textureCallStack = gl.GetTextureTrace();
+  textureCallStack.Enable(true);
+  textureCallStack.EnableLogging(true);
+
+  auto TestBorderImage = [&](int index, const std::string& normalImageUrl, const Rect<int> border, const char* location) {
+    Property::Map map;
+    map[Toolkit::Visual::Property::TYPE]        = Toolkit::Visual::N_PATCH;
+    map[Toolkit::ImageVisual::Property::URL]    = normalImageUrl;
+    map[Toolkit::ImageVisual::Property::BORDER] = border;
+
+    imageView[index] = ImageView::New();
+    imageView[index].SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+    imageView[index].SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+    application.GetScene().Add(imageView[index]);
+  };
+
+  TestBorderImage(0, gImage_34_RGBA, Rect<int>(0, 0, 0, 0), TEST_LOCATION);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  tet_printf("trace : \n%s\n", textureCallStack.GetTraceString().c_str());
+
+  // Check we gen only 1 textures
+  DALI_TEST_EQUALS(textureCallStack.CountMethod("GenTextures"), 1, TEST_LOCATION);
+  textureCallStack.Reset();
+
+  // Let we use cached textures
+  for(int i = 0; i < 10; i++)
+  {
+    TestBorderImage(0, gImage_34_RGBA, Rect<int>(i, i + 1, i + 2, i + 3), TEST_LOCATION);
+    TestBorderImage(1, gImage_34_RGBA, Rect<int>(i + 1, i, i + 3, i + 2), TEST_LOCATION);
+  }
+
+  application.SendNotification();
+  application.Render();
+
+  // Check we use cached npatch data so we don't generate new texture textures
+  DALI_TEST_EQUALS(textureCallStack.CountMethod("GenTextures"), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageViewPlaceholderImage01(void)
+{
+  tet_infoline("Test imageView use placeholder image");
+
+  ToolkitTestApplication application;
+  Property::Map          map;
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+
+  ImageView imageView = ImageView::New();
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+  application.GetScene().Add(imageView);
+
+  Property::Value value = imageView.GetProperty(ImageView::Property::PLACEHOLDER_IMAGE);
+  std::string     url;
+  DALI_TEST_CHECK(value.Get(url));
+  DALI_TEST_CHECK(url.empty());
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+
+  application.SendNotification();
+  application.Render();
+
+  value = imageView.GetProperty(ImageView::Property::PLACEHOLDER_IMAGE);
+  DALI_TEST_CHECK(value.Get(url));
+  DALI_TEST_CHECK(url == gImage_34_RGBA);
+
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  // Replace Image test
+  map[Toolkit::ImageVisual::Property::URL]    = TEST_IMAGE_1;
+  map[ImageView::Property::PLACEHOLDER_IMAGE] = gImage_34_RGBA;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = "";
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_2;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  // Replace Image test2
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_1;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_2;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render(900);
+
+  map[Toolkit::ImageVisual::Property::URL] = "";
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_1;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliImageViewPlaceholderImage02(void)
+{
+  tet_infoline("Test imageView use placeholder image without resource ready");
+
+  ToolkitTestApplication application;
+
+  Property::Map map;
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+
+  ImageView imageView = ImageView::New();
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+  application.GetScene().Add(imageView);
+
+  Property::Value value = imageView.GetProperty(ImageView::Property::PLACEHOLDER_IMAGE);
+  std::string     url;
+  DALI_TEST_CHECK(value.Get(url));
+  DALI_TEST_CHECK(url.empty());
+
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-ImageView gImageView1;
-ImageView gImageView2;
-ImageView gImageView3;
+  value = imageView.GetProperty(ImageView::Property::PLACEHOLDER_IMAGE);
+  DALI_TEST_CHECK(value.Get(url));
+  DALI_TEST_CHECK(url == gImage_34_RGBA);
 
-void OnResourceReadySignal03( Control control )
-{
-  if(gResourceReadySignalCounter == 0)
-  {
-    // Queue loading
-    // 1. Use cached image, then UploadComplete will be called right after OnResourceReadySignal03.
-    gImageView2[ImageView::Property::IMAGE] = gImage_34_RGBA;
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
-    // 2. Load a new image
-    gImageView3[ImageView::Property::IMAGE] = TEST_IMAGE_1;
+  gResourceReadySignalFired                = false;
+  map[Toolkit::ImageVisual::Property::URL] = "";
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
 
-    // 3. Use the new image again
-    gImageView1[ImageView::Property::IMAGE] = TEST_IMAGE_1;
-    gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal03);
-  }
-  else if(gResourceReadySignalCounter == 1)
-  {
-    // This is called from TextureManager::ProcessQueuedTextures().
-    gImageView1.Unparent();
-    gImageView1.Reset();
-  }
-  gResourceReadySignalCounter++;
-}
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, false, TEST_LOCATION);
 
+  END_TEST;
 }
 
-int UtcDaliImageViewSetImageOnResourceReadySignal01(void)
+int UtcDaliImageViewTransitionEffect01(void)
 {
-  tet_infoline("Test setting image from within signal handler.");
+  tet_infoline("Test imageView use transition effect");
 
   ToolkitTestApplication application;
+  Property::Map          map;
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+  map[Toolkit::Visual::Property::OPACITY]  = 0.9f;
 
-  gResourceReadySignalCounter = 0;
+  ImageView imageView = ImageView::New();
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+  application.GetScene().Add(imageView);
 
-  ImageView imageView = ImageView::New( gImage_34_RGBA );
-  imageView.ResourceReadySignal().Connect( &OnResourceReadySignal01 );
+  Property::Value value = imageView.GetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT);
+  bool            transition;
+  DALI_TEST_CHECK(value.Get(transition));
+  DALI_TEST_CHECK(transition == false);
+  imageView.SetProperty(Toolkit::ImageView::Property::ENABLE_TRANSITION_EFFECT, true);
 
-  application.GetScene().Add( imageView );
+  application.SendNotification();
+  application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  value = imageView.GetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT);
+  DALI_TEST_CHECK(value.Get(transition));
+  DALI_TEST_CHECK(transition == true);
 
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION );
+  // Test transition effect with placeholder
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_1;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
 
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+  map[Toolkit::ImageVisual::Property::URL] = "";
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  application.SendNotification();
+  application.Render();
 
-  // Reset count
-  gResourceReadySignalCounter = 0;
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  application.SendNotification();
+  application.Render();
 
-  imageView[ImageView::Property::IMAGE] = "invalid.jpg";
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_1;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  application.SendNotification();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  map[Toolkit::ImageVisual::Property::URL] = "";
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  application.SendNotification();
+  application.Render();
 
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, "");
   application.SendNotification();
   application.Render();
 
-  // Run idle callback
-  application.RunIdles();
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = "";
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  // Test transition effect without placeholder
+  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_1;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = "";
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  map[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB;
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
+
+  imageView.SetImage(TEST_IMAGE_1);
+  application.SendNotification();
+  application.Render();
+
+  imageView.SetImage(gImage_600_RGB);
+  application.SendNotification();
+  application.Render(9000);
 
-  DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION );
+  imageView.SetImage("");
+  application.SendNotification();
+  application.Render();
+
+  imageView.SetImage(TEST_IMAGE_1);
+  application.SendNotification();
+  application.Render();
 
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+  // Clear all cached
+  imageView.Unparent();
+  imageView.Reset();
 
   END_TEST;
 }
 
-int UtcDaliImageViewSetImageOnResourceReadySignal02(void)
+int UtcDaliImageViewTransitionEffect02(void)
 {
-  tet_infoline("Test setting image from within signal handler.");
+  tet_infoline("Test imageView use transition effect with replace image");
 
   ToolkitTestApplication application;
 
-  gResourceReadySignalCounter = 0;
+  Property::Map map;
 
-  ImageView imageView = ImageView::New( gImage_34_RGBA );
-  imageView.ResourceReadySignal().Connect( &OnResourceReadySignal02 );
+  ImageView imageView = ImageView::New();
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+  application.GetScene().Add(imageView);
 
-  application.GetScene().Add( imageView );
+  Property::Value value;
+  value = imageView.GetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT);
+  bool transition;
+  DALI_TEST_CHECK(value.Get(transition));
+  DALI_TEST_CHECK(transition == false);
+  imageView.SetProperty(Toolkit::ImageView::Property::ENABLE_TRANSITION_EFFECT, true);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  value = imageView.GetProperty(ImageView::Property::PLACEHOLDER_IMAGE);
+  std::string url;
+  DALI_TEST_CHECK(value.Get(url));
+  DALI_TEST_CHECK(url.empty());
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  application.SendNotification();
+  application.Render();
 
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, "");
   application.SendNotification();
   application.Render();
 
-  // Wait for loading an image
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  application.SendNotification();
+  application.Render();
+
+  value = imageView.GetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT);
+  DALI_TEST_CHECK(value.Get(transition));
+  DALI_TEST_CHECK(transition == true);
 
-  DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION );
+  value = imageView.GetProperty(ImageView::Property::PLACEHOLDER_IMAGE);
+  DALI_TEST_CHECK(value.Get(url));
+  DALI_TEST_CHECK(url == gImage_34_RGBA);
+
+  imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
+  application.SendNotification();
+  application.Render();
 
-  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+  // Clear all cached
+  imageView.Unparent();
+  imageView.Reset();
 
   END_TEST;
 }
 
-int UtcDaliImageViewSetImageOnResourceReadySignal03(void)
+int UtcDaliImageViewTransitionEffect03(void)
 {
-  tet_infoline("Test setting image from within signal handler.");
+  tet_infoline("Test imageView use transition effect with placeholder");
 
   ToolkitTestApplication application;
+  Property::Map          map;
 
-  gResourceReadySignalCounter = 0;
+  ImageView imageView = ImageView::New();
+  imageView.SetImage("");
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+  imageView.SetProperty(ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  imageView.SetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT, true);
+  application.GetScene().Add(imageView);
 
-  gImageView1 = ImageView::New(gImage_34_RGBA);
-  application.GetScene().Add(gImageView1);
+  //DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  // Wait for loading
+  application.SendNotification();
+  application.Render(16);
+
+  tet_infoline("(1)");
+  imageView.SetImage(gImage_600_RGB);
+  imageView.SetProperty(ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render(16);
+
+  Property::Value value;
+  value = imageView.GetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT);
+  bool transition;
+  DALI_TEST_CHECK(value.Get(transition));
+  DALI_TEST_CHECK(transition == true);
+
+  value = imageView.GetProperty(ImageView::Property::PLACEHOLDER_IMAGE);
+  std::string url;
+  DALI_TEST_CHECK(value.Get(url));
+  DALI_TEST_CHECK(url == gImage_34_RGBA);
+
+  imageView.SetImage("");
+  application.SendNotification();
+  application.Render(16);
+
+  imageView.SetImage(TEST_IMAGE_1);
+  imageView.SetProperty(ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
   DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  application.SendNotification();
+  application.Render(16);
 
-  gImageView2 = ImageView::New(gImage_600_RGB);
-  gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal03);
-  application.GetScene().Add(gImageView2);
+  // Clear all cached
+  imageView.Unparent();
+  imageView.Reset();
 
-  gImageView3 = ImageView::New();
-  application.GetScene().Add(gImageView3);
+  END_TEST;
+}
 
-  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+int UtcDaliImageViewTransitionEffect04(void)
+{
+  tet_infoline("Test transitoin effect operation when image is changed quickly ");
+
+  ToolkitTestApplication application;
+  Property::Map          map;
+
+  ImageView imageView = ImageView::New();
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+  imageView.SetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT, true);
+  imageView.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  imageView.SetImage("");
+  application.GetScene().Add(imageView);
+
+  ImageView imageView2 = ImageView::New();
+  imageView2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f));
+  imageView2.SetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT, true);
+  imageView2.SetProperty(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  imageView2.SetImage("");
+  application.GetScene().Add(imageView2);
+  application.SendNotification();
+  application.Render();
+
+  //PLACEHOLDER_IMAGE is not call WaitForEventThreadTrigger because it is not shown url is null.
+  //DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
+  imageView.SetImage(gImage_600_RGB);
+  imageView.SetProperty(ImageView::Property::PLACEHOLDER_IMAGE, gImage_34_RGBA);
+  imageView2.SetImage(TEST_IMAGE_1);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+
+  imageView.SetImage(TEST_IMAGE_1);
+  imageView2.SetImage(gImage_600_RGB);
+  application.SendNotification();
+  application.Render(3000);
+
+  imageView.SetImage("");
+  application.SendNotification();
+  application.Render();
+
+  imageView.SetImage(TEST_IMAGE_2);
   application.SendNotification();
   application.Render();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  Property::Value value;
+  value = imageView.GetProperty(ImageView::Property::ENABLE_TRANSITION_EFFECT);
+  bool transition;
+  DALI_TEST_CHECK(value.Get(transition));
+  DALI_TEST_CHECK(transition == true);
+
+  // Clear all cached
+  imageView.Unparent();
+  imageView.Reset();
+
+  END_TEST;
+}
+
+int UtcDaliImageViewImageLoadFailureAndReload01(void)
+{
+  tet_infoline("Try to load invalid image first, and then reload after that image valid.");
+  ToolkitTestApplication application;
+
+  gResourceReadySignalFired = false;
+
+  // Make overwritable image invalid first.
+  OverwriteImage("");
+
+  ImageView imageView = ImageView::New(TEST_OVERWRITABLE_IMAGE_FILE_NAME);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  application.GetScene().Add(imageView);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+  gResourceReadySignalFired = false;
+
+  // Make overwritable image valid now.
+  OverwriteImage(gImage_34_RGBA);
+
+  // Reload the image
+  Property::Map attributes;
+  DevelControl::DoAction(imageView, ImageView::Property::IMAGE, DevelImageVisual::Action::RELOAD, attributes);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::READY, TEST_LOCATION);
+
+  // Make overwritable image invalid end of test (for clean).
+  OverwriteImage("");
+
+  gResourceReadySignalFired = false;
+
+  END_TEST;
+}
+
+int UtcDaliImageViewImageLoadFailureAndReload02(void)
+{
+  tet_infoline("Try to load invalid image first, and then reload after that image valid.");
+  tet_infoline("This case, broken image was n-patch. So we should check whether Geometry / Shader changed after reload");
+  ToolkitTestApplication application;
+
+  Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_S);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_M);
+  DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L);
+
+  gResourceReadySignalFired = false;
+
+  // Make overwritable image invalid first.
+  OverwriteImage("");
+
+  ImageView imageView = ImageView::New(TEST_OVERWRITABLE_IMAGE_FILE_NAME);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  application.GetScene().Add(imageView);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+  Geometry brokenGeometry = imageView.GetRendererAt(0u).GetGeometry();
+  Shader   brokenShader   = imageView.GetRendererAt(0u).GetShader();
+  DALI_TEST_CHECK(brokenGeometry);
+  DALI_TEST_CHECK(brokenShader);
+
+  gResourceReadySignalFired = false;
+
+  // Make overwritable image valid now.
+  OverwriteImage(gImage_34_RGBA);
+
+  // Reload the image
+  Property::Map attributes;
+  DevelControl::DoAction(imageView, ImageView::Property::IMAGE, DevelImageVisual::Action::RELOAD, attributes);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::READY, TEST_LOCATION);
+
+  // Check whether we don't use n-patch shader and geometry in this case.
+  DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_CHECK(brokenGeometry != imageView.GetRendererAt(0u).GetGeometry());
+  DALI_TEST_CHECK(brokenShader != imageView.GetRendererAt(0u).GetShader());
+
+  // Make overwritable image invalid end of test (for clean).
+  OverwriteImage("");
+
+  gResourceReadySignalFired = false;
 
   END_TEST;
 }
+
+int UtcDaliImageViewImageLoadSuccessAndReload01(void)
+{
+  tet_infoline("Try to load valid image first, and then reload again. Check whether ResourceReady signal comes well");
+  ToolkitTestApplication application;
+
+  gResourceReadySignalFired = false;
+
+  ImageView imageView = ImageView::New(gImage_34_RGBA);
+  imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  imageView.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  application.GetScene().Add(imageView);
+  application.SendNotification();
+  application.Render(16);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::READY, TEST_LOCATION);
+
+  gResourceReadySignalFired = false;
+
+  // Reload the image
+  Property::Map attributes;
+  DevelControl::DoAction(imageView, ImageView::Property::IMAGE, DevelImageVisual::Action::RELOAD, attributes);
+  application.SendNotification();
+  application.Render(16);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::PREPARING, TEST_LOCATION);
+
+  // loading started, this waits for the loader thread
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::READY, TEST_LOCATION);
+
+  gResourceReadySignalFired = false;
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
index cd834df..0bd455b 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +14,35 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 #include <vector>
+
+#include <unistd.h>
+#include <thread>
+
 #include <dali-toolkit-test-suite-utils.h>
-#include <toolkit-timer.h>
+
+#include <toolkit-environment-variable.h>
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-style-monitor.h>
+#include <toolkit-texture-upload-manager.h>
+#include <toolkit-timer.h>
+
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
-#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
-#include <dali-toolkit/public-api/image-loader/image.h>
 #include <dali-toolkit/public-api/image-loader/image-url.h>
-#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/public-api/image-loader/image.h>
+
+#include <dali/devel-api/adaptor-framework/texture-upload-manager.h>
 
-#include <test-encoded-image-buffer.h>
 #include "dummy-control.h"
+#include "test-encoded-image-buffer.h"
 #include "test-native-image-source.h"
 
 using namespace Dali;
@@ -48,23 +60,47 @@ void dali_image_visual_cleanup(void)
 
 namespace
 {
-const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/gallery-small-1.jpg";
-const char* TEST_BROKEN_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/a-random-nonimage.jpg";
-const char* TEST_LARGE_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/tbcol.png";
-const char* TEST_SMALL_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/icon-edit.png";
-const char* TEST_REMOTE_IMAGE_FILE_NAME = "https://www.tizen.org/sites/all/themes/tizen_theme/logo.png";
-const char* TEST_INVALID_FILE_NAME =  TEST_RESOURCE_DIR  "/invalid.jpg";
+const char* TEST_IMAGE_FILE_NAME          = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const char* TEST_BROKEN_IMAGE_FILE_NAME   = TEST_RESOURCE_DIR "/a-random-nonimage.jpg";
+const char* TEST_LARGE_IMAGE_FILE_NAME    = TEST_RESOURCE_DIR "/tbcol.png";
+const char* TEST_SMALL_IMAGE_FILE_NAME    = TEST_RESOURCE_DIR "/icon-edit.png";
+const char* TEST_REMOTE_IMAGE_FILE_NAME   = "https://www.tizen.org/sites/all/themes/tizen_theme/logo.png";
+const char* TEST_INVALID_FILE_NAME        = TEST_RESOURCE_DIR "/invalid.jpg";
 const char* TEST_REMOTE_INVALID_FILE_NAME = "https://www.tizen.org/invalid.png";
-const char* TEST_MASK_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/mask.png";
-const char* TEST_ROTATED_IMAGE =  TEST_RESOURCE_DIR  "/keyboard-Landscape.jpg";
-
-
-bool gResourceReadySignalFired = false;
-std::vector<int> gReadyIds = {};
-void ResourceReadySignal( Control control )
+const char* TEST_MASK_IMAGE_FILE_NAME     = TEST_RESOURCE_DIR "/mask.png";
+const char* TEST_ROTATED_IMAGE            = TEST_RESOURCE_DIR "/keyboard-Landscape.jpg";
+const char* TEST_YUV420_IMAGE_FILE_NAME   = TEST_RESOURCE_DIR "/gallery-small-1-yuv420.jpg";
+const char* TEST_N_PATCH_IMAGE_FILE_NAME  = TEST_RESOURCE_DIR "/heartsframe.9.png";
+
+constexpr auto LOAD_IMAGE_YUV_PLANES_ENV         = "DALI_LOAD_IMAGE_YUV_PLANES";
+constexpr auto ENABLE_DECODE_JPEG_TO_YUV_420_ENV = "DALI_ENABLE_DECODE_JPEG_TO_YUV_420";
+
+constexpr auto DALI_DEBUG_IMAGE_VISUAL_SHADER_ENV = "DALI_DEBUG_IMAGE_VISUAL_SHADER";
+
+constexpr auto DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME_ENV = "DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME";
+
+const char* VALID_DEBUG_SHADER_SCRIPT =
+  "{\n"
+  "  \"version\": \"1.0.0\",\n"
+  "  \"maximumColorRate\": 0.5,\n"
+  "  \"extraVaryings\": [\"mediump vec3 vDebug;\"],\n"
+  "  \"extraUniforms\": \"mediump float uDebug;\",\n"
+  "  \"applyVaryingsCode\": \"vDebug = gl_Position.xyz / gl_Position.w;\",\n"
+  "  \"redChannelCodes\":\n"
+  "  {\n"
+  "    \"triggerCode\":[\"return\",\" false;\"],\n"
+  "    \"ratioCode\":\"return 0.0;\"\n"
+  "  }\n"
+  "}\n";
+
+constexpr std::string_view THROW_EXCEPTION_STYLE_FILE_NAME = "throwException";
+
+bool             gResourceReadySignalFired = false;
+std::vector<int> gReadyIds                 = {};
+void             ResourceReadySignal(Control control)
 {
   gResourceReadySignalFired = true;
-  gReadyIds.push_back(control.GetProperty< int >( Actor::Property::ID ));
+  gReadyIds.push_back(control.GetProperty<int>(Actor::Property::ID));
 }
 void ClearReadyIds()
 {
@@ -73,2639 +109,4035 @@ void ClearReadyIds()
 
 Actor CreateActorWithImageVisual(const Property::Map& map)
 {
-  VisualFactory factory = VisualFactory::Get();
-  DummyControl actor = DummyControl::New();
+  VisualFactory     factory   = VisualFactory::Get();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  Visual::Base visual = factory.CreateVisual( map );
-  DALI_TEST_CHECK( visual );
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  Visual::Base      visual    = factory.CreateVisual(map);
+  DALI_TEST_CHECK(visual);
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
   return actor;
 }
 
-
-Visual::Base CreateVisualWithPolicy( const char* url, Property::Index key, const Property::Value& value )
+Visual::Base CreateVisualWithPolicy(const char* url, Property::Index key, const Property::Value& value)
 {
   VisualFactory factory = VisualFactory::Get();
 
   Property::Map propertyMap;
-  propertyMap.Insert( Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  url );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH,   20 );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT,   30 );
-  propertyMap.Insert( key , value );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 20);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30);
+  propertyMap.Insert(key, value);
 
-  return factory.CreateVisual( propertyMap );
+  return factory.CreateVisual(propertyMap);
 }
 
 } // namespace
 
-void TestVisualRender( ToolkitTestApplication& application,
-                       DummyControl& actor,
-                       Visual::Base& visual,
-                       std::size_t expectedSamplers = 0,
-                       ImageDimensions imageDimensions = ImageDimensions(),
-                       Integration::ResourcePointer resourcePtr = Integration::ResourcePointer())
+void TestVisualRender(ToolkitTestApplication&      application,
+                      DummyControl&                actor,
+                      Visual::Base&                visual,
+                      std::size_t                  expectedSamplers = 0,
+                      ImageDimensions              imageDimensions  = ImageDimensions(),
+                      Integration::ResourcePointer resourcePtr      = Integration::ResourcePointer())
 {
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  if( resourcePtr )
+  if(resourcePtr)
   {
     // set the image size, for test case, this needs to be set before loading started
-    application.GetPlatform().SetClosestImageSize(  Vector2(imageDimensions.GetWidth(), imageDimensions.GetHeight()) );
+    application.GetPlatform().SetClosestImageSize(Vector2(imageDimensions.GetWidth(), imageDimensions.GetHeight()));
   }
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification(); // Send messages to update
   application.Render();           // process update and render
   application.SendNotification(); // process any signals to event
 
-  if( resourcePtr )
+  if(resourcePtr)
   {
-    DALI_TEST_EQUALS( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceSynchronouslyFunc ), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceSynchronouslyFunc), true, TEST_LOCATION);
   }
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 }
 
-static void TestMixColor( Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor )
+static void TestMixColor(Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor)
 {
   Property::Map map;
   visual.CreatePropertyMap(map);
-  Property::Value* value = map.Find( mixColorIndex );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = map.Find(mixColorIndex);
+  DALI_TEST_CHECK(value);
   Vector3 mixColor1;
-  DALI_TEST_CHECK( value->Get( mixColor1 ) );
-  DALI_TEST_EQUALS( mixColor1, Vector3(testColor), 0.001, TEST_LOCATION );
+  DALI_TEST_CHECK(value->Get(mixColor1));
+  DALI_TEST_EQUALS(mixColor1, Vector3(testColor), 0.001, TEST_LOCATION);
 
-  value = map.Find( Visual::Property::MIX_COLOR );
-  DALI_TEST_CHECK( value );
+  value = map.Find(Visual::Property::MIX_COLOR);
+  DALI_TEST_CHECK(value);
   Vector4 mixColor2;
-  DALI_TEST_CHECK( value->Get( mixColor2 ) );
-  DALI_TEST_EQUALS( mixColor2, testColor, 0.001, TEST_LOCATION );
+  DALI_TEST_CHECK(value->Get(mixColor2));
+  DALI_TEST_EQUALS(mixColor2, testColor, 0.001, TEST_LOCATION);
 
-  value = map.Find( Visual::Property::OPACITY );
-  DALI_TEST_CHECK( value );
+  value = map.Find(Visual::Property::OPACITY);
+  DALI_TEST_CHECK(value);
   float opacity;
-  DALI_TEST_CHECK( value->Get( opacity ) );
-  DALI_TEST_EQUALS( opacity, testColor.a, 0.001, TEST_LOCATION );
+  DALI_TEST_CHECK(value->Get(opacity));
+  DALI_TEST_EQUALS(opacity, testColor.a, 0.001, TEST_LOCATION);
 }
 
-
-
 int UtcDaliImageVisualPropertyMap(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with a Property::Map" );
+  tet_infoline("Request image visual with a Property::Map");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
-  factory.SetPreMultiplyOnLoad( true );
+  DALI_TEST_CHECK(factory);
+  factory.SetPreMultiplyOnLoad(true);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_LARGE_IMAGE_FILE_NAME );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
   // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  auto renderer = actor.GetRendererAt(0);
-  auto preMultipliedIndex = renderer.GetPropertyIndex( "preMultipliedAlpha" );
-  DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX );
-  auto preMultipliedAlpha = renderer.GetProperty<float>( preMultipliedIndex );
-  auto preMultipliedAlpha2 = renderer.GetProperty<bool>( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
-  DALI_TEST_EQUALS( preMultipliedAlpha, 1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( preMultipliedAlpha2, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  auto renderer           = actor.GetRendererAt(0);
+  auto preMultipliedIndex = renderer.GetPropertyIndex("preMultipliedAlpha");
+  DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX);
+  auto preMultipliedAlpha  = renderer.GetProperty<float>(preMultipliedIndex);
+  auto preMultipliedAlpha2 = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(preMultipliedAlpha2, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
 
-
 int UtcDaliImageVisualNoPremultipliedAlpha01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual without pre-multiplied alpha" );
+  tet_infoline("Request image visual without pre-multiplied alpha");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
-  factory.SetPreMultiplyOnLoad( false );
+  DALI_TEST_CHECK(factory);
+  factory.SetPreMultiplyOnLoad(false);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_LARGE_IMAGE_FILE_NAME );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
   // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  auto renderer = actor.GetRendererAt(0);
-  auto preMultipliedIndex = renderer.GetPropertyIndex( "preMultipliedAlpha" );
-  DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX );
-  auto preMultipliedAlpha = renderer.GetProperty<bool>( preMultipliedIndex );
-  auto preMultipliedAlpha2 = renderer.GetProperty<bool>( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  auto renderer           = actor.GetRendererAt(0);
+  auto preMultipliedIndex = renderer.GetPropertyIndex("preMultipliedAlpha");
+  DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX);
+  auto preMultipliedAlpha  = renderer.GetProperty<bool>(preMultipliedIndex);
+  auto preMultipliedAlpha2 = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
 
-  DALI_TEST_EQUALS( preMultipliedAlpha, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( preMultipliedAlpha2, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(preMultipliedAlpha2, false, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
 
-
 int UtcDaliImageVisualNoPremultipliedAlpha02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with no alpha channel" );
+  tet_infoline("Request image visual with no alpha channel");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
   // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  auto renderer = actor.GetRendererAt(0);
-  auto preMultipliedIndex = renderer.GetPropertyIndex( "preMultipliedAlpha" );
-  DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX );
-  auto preMultipliedAlpha = renderer.GetProperty<bool>( preMultipliedIndex );
-  auto preMultipliedAlpha2 = renderer.GetProperty<bool>( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  auto renderer           = actor.GetRendererAt(0);
+  auto preMultipliedIndex = renderer.GetPropertyIndex("preMultipliedAlpha");
+  DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX);
+  auto preMultipliedAlpha  = renderer.GetProperty<bool>(preMultipliedIndex);
+  auto preMultipliedAlpha2 = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
 
-  DALI_TEST_EQUALS( preMultipliedAlpha, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( preMultipliedAlpha2, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(preMultipliedAlpha2, false, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  int srcFactorRgb    = renderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_RGB );
-  int destFactorRgb   = renderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_RGB );
-  int srcFactorAlpha  = renderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_ALPHA );
-  int destFactorAlpha = renderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_ALPHA );
-  DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA );
-  DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
-  DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
+  int srcFactorRgb    = renderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_RGB);
+  int destFactorRgb   = renderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_RGB);
+  int srcFactorAlpha  = renderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_ALPHA);
+  int destFactorAlpha = renderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_ALPHA);
+  DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA);
+  DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA);
+  DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA);
 
   textureTrace.Reset();
 
   // Make a new visual with the same image
-  Visual::Base newVisual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( newVisual );
+  Visual::Base newVisual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(newVisual);
 
   // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
   // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
 
-  DummyControl newActor = DummyControl::New();
-  DummyControlImpl& newDummyImpl = static_cast< DummyControlImpl& >( newActor.GetImplementation() );
-  newDummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, newVisual );
+  DummyControl      newActor     = DummyControl::New();
+  DummyControlImpl& newDummyImpl = static_cast<DummyControlImpl&>(newActor.GetImplementation());
+  newDummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, newVisual);
 
-  newActor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( newActor.GetRendererCount(), 0u, TEST_LOCATION );
+  newActor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(newActor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( newActor );
+  application.GetScene().Add(newActor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( newActor.GetRendererCount(), 1u, TEST_LOCATION );
-  auto newRenderer = newActor.GetRendererAt( 0 );
-  preMultipliedIndex = newRenderer.GetPropertyIndex( "preMultipliedAlpha" );
-  DALI_TEST_CHECK( preMultipliedIndex != Property::INVALID_INDEX );
-  preMultipliedAlpha = newRenderer.GetProperty< bool >( preMultipliedIndex );
-  preMultipliedAlpha2 = newRenderer.GetProperty< bool >( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
+  DALI_TEST_EQUALS(newActor.GetRendererCount(), 1u, TEST_LOCATION);
+  auto newRenderer   = newActor.GetRendererAt(0);
+  preMultipliedIndex = newRenderer.GetPropertyIndex("preMultipliedAlpha");
+  DALI_TEST_CHECK(preMultipliedIndex != Property::INVALID_INDEX);
+  preMultipliedAlpha  = newRenderer.GetProperty<bool>(preMultipliedIndex);
+  preMultipliedAlpha2 = newRenderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
 
-  DALI_TEST_EQUALS( preMultipliedAlpha, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( preMultipliedAlpha2, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(preMultipliedAlpha2, false, TEST_LOCATION);
 
-  srcFactorRgb    = newRenderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_RGB );
-  destFactorRgb   = newRenderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_RGB );
-  srcFactorAlpha  = newRenderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_SRC_ALPHA );
-  destFactorAlpha = newRenderer.GetProperty<int>( Renderer::Property::BLEND_FACTOR_DEST_ALPHA );
-  DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA );
-  DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
-  DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
+  srcFactorRgb    = newRenderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_RGB);
+  destFactorRgb   = newRenderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_RGB);
+  srcFactorAlpha  = newRenderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_SRC_ALPHA);
+  destFactorAlpha = newRenderer.GetProperty<int>(Renderer::Property::BLEND_FACTOR_DEST_ALPHA);
+  DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA);
+  DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA);
+  DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE);
+  DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA);
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
 
-
 int UtcDaliImageVisualRemoteImageLoad(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request remote image visual with a Property::Map" );
+  tet_infoline("Request remote image visual with a Property::Map");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_REMOTE_IMAGE_FILE_NAME );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
   application.SendNotification();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
 
-
-int UtcDaliImageVisualWithNativeImage(void)
+int UtcDaliImageVisualWithFrameBufferPreMultipliedAlpha01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Use Native Image as url" );
+  tet_infoline("Use FrameBuffer as url");
 
-  NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT);
-  ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource);
-  std::string url = imageUrl.GetUrl();
+  uint32_t    width(64);
+  uint32_t    height(64);
+  FrameBuffer frameBuffer = Dali::FrameBuffer::New(width, height, FrameBuffer::Attachment::NONE);
+
+  DALI_TEST_CHECK(frameBuffer);
+  ImageUrl    imageUrl = Dali::Toolkit::Image::GenerateUrl(frameBuffer, Pixel::Format::RGBA8888, width, height);
+  std::string url      = imageUrl.GetUrl();
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  url );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
-
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  application.GetScene().Add( actor );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
+  application.GetScene().Add(actor);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Shader shader = renderer.GetShader();
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
-  Property::Value value = shader.GetProperty(Shader::Property::PROGRAM);
-  DALI_TEST_CHECK(value.GetType() == Property::MAP);
-  const Property::Map* outMap = value.GetMap();
-  std::string fragmentShader = (*outMap)["fragment"].Get<std::string>();
+  application.SendNotification();
+  application.Render(16);
 
-  const char* fragmentPrefix = Dali::NativeImageSourceTest::GetCustomFragmentPrefix();
-  size_t pos = fragmentShader.find(fragmentPrefix);
+  Renderer renderer = actor.GetRendererAt(0);
 
-  DALI_TEST_EQUALS( pos != std::string::npos, true, TEST_LOCATION );
+  // Check whether preMultipliedAlpha is true.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualWithNativeImageRemoved(void)
+int UtcDaliImageVisualWithFrameBufferPreMultipliedAlpha02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Use Native Image as url" );
+  tet_infoline("Use FrameBuffer as url");
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  uint32_t    width(64);
+  uint32_t    height(64);
+  FrameBuffer frameBuffer = Dali::FrameBuffer::New(width, height, FrameBuffer::Attachment::NONE);
 
-  NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT);
-  ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSource);
-  std::string url = imageUrl.GetUrl();
+  DALI_TEST_CHECK(frameBuffer);
+
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
+  frameBuffer.AttachColorTexture(texture);
+
+  ImageUrl    imageUrl = Dali::Toolkit::Image::GenerateUrl(frameBuffer, 0u);
+  std::string url      = imageUrl.GetUrl();
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  url );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual(  DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
-  application.SendNotification();
-  application.Render();
+  application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
-  tet_infoline( "No delete texture because reference count is not zero" );
-  imageUrl.Reset();
-  application.GetScene().Remove( actor );
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
   application.SendNotification();
-  application.Render();
-
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
+  application.Render(16);
 
-  tet_infoline( "Delete texture because reference count is zero" );
-  visual.Reset();
-  application.SendNotification();
-  application.Render();
+  Renderer renderer = actor.GetRendererAt(0);
 
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+  // Check whether preMultipliedAlpha is true.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualWithEncodedImageBuffer(void)
+int UtcDaliImageVisualWithPixelData(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Use Encoded Image Buffer as url" );
+  tet_infoline("Use PixelData as url");
 
-  EncodedImageBuffer rawBuffer = ConvertFileToEncodedImageBuffer(TEST_LARGE_IMAGE_FILE_NAME);
-  ImageUrl url = Dali::Toolkit::Image::GenerateUrl(rawBuffer);
+  uint32_t width(64);
+  uint32_t height(64);
+  uint32_t bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
+
+  uint8_t*  buffer    = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
+
+  DALI_TEST_CHECK(pixelData);
+
+  ImageUrl    imageUrl = Dali::Toolkit::Image::GenerateUrl(pixelData);
+  std::string url      = imageUrl.GetUrl();
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, url.GetUrl() );
-
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
-  application.SendNotification();
+  application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render();
+  application.Render(16);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  Renderer renderer = actor.GetRendererAt(0);
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  // Check whether preMultipliedAlpha is false.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualWithEncodedImageBufferRemoved(void)
+int UtcDaliImageVisualWithPixelDataPreMultipliedAlpha(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Use Encoded Image Buffer as url" );
+  tet_infoline("Use PixelData as url");
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  uint32_t width(64);
+  uint32_t height(64);
+  uint32_t bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
 
-  EncodedImageBuffer rawBuffer = ConvertFileToEncodedImageBuffer(TEST_LARGE_IMAGE_FILE_NAME);
-  ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(rawBuffer);
-  std::string url = imageUrl.GetUrl();
+  uint8_t*  buffer    = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
+
+  DALI_TEST_CHECK(pixelData);
+
+  ImageUrl    imageUrl = Dali::Toolkit::Image::GenerateUrl(pixelData, true);
+  std::string url      = imageUrl.GetUrl();
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  url );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New();
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual(  DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
-  application.SendNotification();
+  application.GetScene().Add(actor);
 
-  // Wait for decode buffer and make texture.
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render();
+  application.Render(16);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-
-  tet_infoline( "Delete texture because there is no actor to use decoded texture" );
-  imageUrl.Reset();
-  application.GetScene().Remove( actor );
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
-  application.SendNotification();
-  application.Render();
+  Renderer renderer = actor.GetRendererAt(0);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+  // Check whether preMultipliedAlpha is true.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualTextureReuse1(void)
+int UtcDaliImageVisualWithPixelDataMasking(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request remote image visual with a Property::Map; request a second visual with the same property map - should reuse texture" );
+  tet_infoline("Load external texture with mask");
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::RELEASE_POLICY,  ImageVisual::ReleasePolicy::DETACHED );
-
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
-  TraceCallStack& drawTrace = gl.GetDrawTrace();
-  drawTrace.Enable(true);
 
-  Actor actor = CreateActorWithImageVisual( propertyMap );
-  application.GetScene().Add( actor );
-  application.SendNotification();
+  uint32_t width(64);
+  uint32_t height(64);
+  uint32_t bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
 
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  uint8_t*  buffer    = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
 
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_CHECK(pixelData);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION );
-  textureTrace.Reset();
-  drawTrace.Reset();
+  ImageUrl    imageUrl = Dali::Toolkit::Image::GenerateUrl(pixelData, true);
+  std::string url      = imageUrl.GetUrl();
 
-  Actor actor2 = CreateActorWithImageVisual( propertyMap );
-  application.GetScene().Add(actor2);
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  application.SendNotification(); // Send messages to update
-  application.Render();           // process update and render
-  application.SendNotification(); // process any signals to event
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
 
-  DALI_TEST_EQUALS( actor2.GetRendererCount(), 1u, TEST_LOCATION );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  tet_infoline("Test that 2 draw calls occur with no new texture gens/binds, i.e. both\n"
-               "draw calls use the same texture as the previous draw call\n" );
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION );
-  // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
-//  DALI_TEST_EQUALS( textureTrace.CountMethod("BindTexture"), 0, TEST_LOCATION );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  tet_infoline("Test that removing 1 actor doesn't delete the texture\n");
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Remove( actor );
+  application.GetScene().Add(actor);
   application.SendNotification();
-  application.Render();
-
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-
-  tet_infoline("Test that removing last actor does delete the texture\n");
+  application.Render(16);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  application.GetScene().Remove( actor2 ); // Detaches remaining ImageVisual
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
 
-  DALI_TEST_CHECK( actor2.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+  dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-int UtcDaliImageVisualTextureReuse2(void)
+int UtcDaliImageVisualWithPixelDataMasking02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request remote image visual with a Property::Map; request a second visual with the same url but different property map - should create new texture" );
-
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME );
+  tet_infoline("Load premultiplied external texture with mask");
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
-  TraceCallStack& drawTrace = gl.GetDrawTrace();
-  drawTrace.Enable(true);
-
-  Actor actor = CreateActorWithImageVisual( propertyMap );
-  application.GetScene().Add( actor );
-  application.SendNotification();
-
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
 
-  application.SendNotification();
-  application.Render();
+  uint32_t width(64);
+  uint32_t height(64);
+  uint32_t bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION );
-  textureTrace.Reset();
-  drawTrace.Reset();
+  uint8_t*  buffer    = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
 
-  propertyMap.Insert( ImageVisual::Property::SAMPLING_MODE, Dali::SamplingMode::NEAREST );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, 100 );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, 100 );
-  Actor actor2 = CreateActorWithImageVisual( propertyMap );
-  application.GetScene().Add(actor2);
+  DALI_TEST_CHECK(pixelData);
 
-  application.SendNotification();
+  ImageUrl    imageUrl = Dali::Toolkit::Image::GenerateUrl(pixelData, true);
+  std::string url      = imageUrl.GetUrl();
 
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  application.SendNotification();
-  application.Render();
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
 
-  DALI_TEST_EQUALS( actor2.GetRendererCount(), 1u, TEST_LOCATION );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  tet_infoline("Test that 2 draw calls occur with 1 new texture gen/bind, i.e. both "
-               "renderers are using different textures\n" );
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION );
-  TraceCallStack::NamedParams tex1;
-  tex1["texture"] << 1;
-  TraceCallStack::NamedParams tex2;
-  tex2["texture"] << 2;
-  DALI_TEST_EQUALS( textureTrace.FindMethodAndParams("BindTexture", tex1), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethodAndParams("BindTexture", tex2), true, TEST_LOCATION );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  tet_infoline("Test that removing 1 actor deletes it's texture\n");
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Remove( actor );
+  application.GetScene().Add(actor);
   application.SendNotification();
-  application.Render();
+  application.Render(16);
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
 
-  tet_infoline("Test that removing last actor deletes it's texture\n");
+  Renderer renderer = actor.GetRendererAt(0);
 
-  application.GetScene().Remove( actor2 );
-  application.SendNotification();
-  application.Render();
+  //Check visual property
+  DALI_TEST_EQUALS(*testMap.Find(Visual::Property::PREMULTIPLIED_ALPHA), Property::Value(true), TEST_LOCATION);
 
-  DALI_TEST_CHECK( actor2.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 2, TEST_LOCATION );
+  // Check whether preMultipliedAlpha is true.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, true, TEST_LOCATION);
+
+  dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-int UtcDaliImageVisualCustomWrapModePixelArea(void)
+int UtcDaliImageVisualWithPixelDataMaskingSynchronously(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with a Property::Map, test custom wrap mode and pixel area with atlasing" );
-
-  static std::vector<UniformData> customUniforms =
-  {
-    UniformData("pixelArea", Property::Type::VECTOR4),
-    UniformData("wrapMode", Property::Type::VECTOR2),
-  };
+  tet_infoline("Load synchronously external texture with mask");
 
-  TestGraphicsController& graphics = application.GetGraphicsController();
-  graphics.AddCustomUniforms(customUniforms);
+  uint32_t width(64);
+  uint32_t height(64);
+  uint32_t bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888);
 
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  uint8_t*  buffer    = reinterpret_cast<uint8_t*>(malloc(bufferSize));
+  PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE);
 
-  // Test wrap mode with atlasing. Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
-  const int width=34;
-  const int height=34;
-  const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f);
+  DALI_TEST_CHECK(pixelData);
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_SMALL_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, width );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, height );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
-  propertyMap.Insert( ImageVisual::Property::PIXEL_AREA, pixelArea );
-  propertyMap.Insert( ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT );
-  propertyMap.Insert( ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT );
-  propertyMap.Insert( ImageVisual::Property::ATLASING, true );
-
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
-  TraceCallStack& texParameterTrace = gl.GetTexParameterTrace();
-  texParameterTrace.Enable( true );
+  ImageUrl    imageUrl = Dali::Toolkit::Image::GenerateUrl(pixelData, true);
+  std::string url      = imageUrl.GetUrl();
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  application.GetScene().Add( actor );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  // loading started
-  application.SendNotification();
-  application.Render();
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
 
-  // WITH atlasing, the wrapping is handled manually in shader, so the following gl function should not be called
-  std::stringstream out;
-  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_MIRRORED_REPEAT;
-  DALI_TEST_CHECK( !texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) );
-  out.str("");
-  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_T << ", " << GL_REPEAT;
-  DALI_TEST_CHECK( !texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  // test the uniforms which used to handle the wrap mode
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) );
-  DALI_TEST_EQUALS( pixelAreaValue.Get<Vector4>(), pixelArea, TEST_LOCATION );
-  Vector4 pixelAreaUniform;
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "pixelArea", pixelAreaUniform ) );
-  DALI_TEST_EQUALS( pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  application.GetScene().Add(actor);
 
-  Property::Value wrapModeValue = renderer.GetProperty( renderer.GetPropertyIndex( "wrapMode" ) );
-  Vector2 wrapMode( WrapMode::MIRRORED_REPEAT-1, WrapMode::REPEAT-1 );
-  DALI_TEST_EQUALS( wrapModeValue.Get<Vector2>(), wrapMode, TEST_LOCATION );
-  Vector2 wrapModeUniform;
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector2>( "wrapMode", wrapModeUniform ) );
-  DALI_TEST_EQUALS( wrapMode, wrapModeUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  application.SendNotification();
+  application.Render(16);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualCustomWrapModeNoAtlas(void)
+int UtcDaliImageVisualWithNativeImage(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with a Property::Map, test custom wrap mode and pixel area without atlasing" );
-
-  static std::vector<UniformData> customUniforms =
-  {
-    UniformData("pixelArea", Property::Type::VECTOR4),
-  };
+  tet_infoline("Use Native Image as url");
 
-  TestGraphicsController& graphics = application.GetGraphicsController();
-  graphics.AddCustomUniforms(customUniforms);
+  NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT);
+  ImageUrl             imageUrl          = Dali::Toolkit::Image::GenerateUrl(nativeImageSource);
+  std::string          url               = imageUrl.GetUrl();
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
-
-  // Test wrap mode without atlasing. Image with a size bigger than 512*512 will NOT be uploaded as a part of the atlas.
-  const int width=600;
-  const int height=600;
-  const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f);
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH, width );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT, height );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
-  propertyMap.Insert( ImageVisual::Property::PIXEL_AREA, pixelArea );
-  propertyMap.Insert( ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT );
-  propertyMap.Insert( ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT );
-
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
-  textureTrace.EnableLogging(true);
-  TraceCallStack& texParameterTrace = gl.GetTexParameterTrace();
-  texParameterTrace.Enable( true );
-  texParameterTrace.EnableLogging( true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
 
-  DummyControl actor = DummyControl::New();
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  application.GetScene().Add( actor );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  // loading started
-  application.SendNotification();
-  application.Render();
-  application.SendNotification();
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
-  // WITHOUT atlasing, the wrapping is handled by setting gl texture parameters
-  std::stringstream out;
-  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_MIRRORED_REPEAT;
-  DALI_TEST_CHECK( texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) );
-  out.str("");
-  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_T << ", " << GL_REPEAT;
-  DALI_TEST_CHECK( texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) );
+  application.SendNotification();
+  application.Render(16);
 
-  // test the uniforms which used to handle the wrap mode
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = actor.GetRendererAt(0);
+  Shader   shader   = renderer.GetShader();
 
-  Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) );
-  DALI_TEST_EQUALS( pixelAreaValue.Get<Vector4>(), pixelArea, TEST_LOCATION );
-  Vector4 pixelAreaUniform;
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "pixelArea", pixelAreaUniform ) );
-  DALI_TEST_EQUALS( pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  Property::Value value = shader.GetProperty(Shader::Property::PROGRAM);
+  DALI_TEST_CHECK(value.GetType() == Property::MAP);
+  const Property::Map* outMap         = value.GetMap();
+  std::string          fragmentShader = (*outMap)["fragment"].Get<std::string>();
 
-  Property::Index wrapModeIndex = renderer.GetPropertyIndex( "wrapMode" );
-  DALI_TEST_CHECK(wrapModeIndex == Property::INVALID_INDEX);
+  const char* fragmentPrefix = Dali::NativeImageSourceTest::GetCustomFragmentPrefix();
+  size_t      pos            = fragmentShader.find(fragmentPrefix);
 
-  actor.Unparent();
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_EQUALS(pos != std::string::npos, true, TEST_LOCATION);
+
+  // Check whether preMultipliedAlpha is false.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualAnimateMixColor(void)
+int UtcDaliImageVisualWithNativeImagePreMultipliedAlpha(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Animate mix color" );
-
-  static std::vector<UniformData> customUniforms =
-  {
-    UniformData("mixColor", Property::Type::VECTOR3),
-  };
-
-  TestGraphicsController& graphics = application.GetGraphicsController();
-  graphics.AddCustomUniforms(customUniforms);
+  tet_infoline("Use Native Image as url");
 
-  application.GetPlatform().SetClosestImageSize( Vector2(100, 100) );
+  NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT);
+  ImageUrl             imageUrl          = Dali::Toolkit::Image::GenerateUrl(nativeImageSource, true);
+  std::string          url               = imageUrl.GetUrl();
 
   VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::IMAGE);
-  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert("mixColor", Color::BLUE);
-  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
 
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
   application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
 
   Renderer renderer = actor.GetRendererAt(0);
-  Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR );
-  Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE );
-  DALI_TEST_EQUALS( blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION );
+  Shader   shader   = renderer.GetShader();
 
-  tet_infoline("Test that the renderer has the mixColor property");
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
+  Property::Value value = shader.GetProperty(Shader::Property::PROGRAM);
+  DALI_TEST_CHECK(value.GetType() == Property::MAP);
+  const Property::Map* outMap         = value.GetMap();
+  std::string          fragmentShader = (*outMap)["fragment"].Get<std::string>();
 
-  const Vector4 TARGET_MIX_COLOR( 1.0f, 0.0f, 0.0f, 0.5f );
+  const char* fragmentPrefix = Dali::NativeImageSourceTest::GetCustomFragmentPrefix();
+  size_t      pos            = fragmentShader.find(fragmentPrefix);
 
-  Property::Map map;
-  map["target"] = "testVisual";
-  map["property"] = "mixColor";
-  map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = TARGET_MIX_COLOR;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 4.0f));
+  DALI_TEST_EQUALS(pos != std::string::npos, true, TEST_LOCATION);
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  // Check whether preMultipliedAlpha is true.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, true, TEST_LOCATION);
 
-  Animation animation = dummyImpl.CreateTransition( transition );
+  END_TEST;
+}
 
-  animation.AnimateTo( Property(actor, Actor::Property::COLOR), Color::WHITE );
-  animation.Play();
+int UtcDaliImageVisualWithNativeImageCustomShader(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Use Native Image as url and Use custom shader");
 
-  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  glAbstraction.EnableEnableDisableCallTrace( true );
-  TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace();
-  std::ostringstream blendStr;
-  blendStr << std::hex << GL_BLEND;
+  NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT);
+  ImageUrl             imageUrl          = Dali::Toolkit::Image::GenerateUrl(nativeImageSource, true);
+  std::string          url               = imageUrl.GetUrl();
 
-  application.SendNotification();
-  application.Render(0); // Ensure animation starts
-  application.Render(2000u); // Halfway point
-  Vector3 testColor( 1.0f, 0.0f, 0.5f );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  // uColor.a should be actor's alpha * mixColor.a.
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>( "uColor", Vector4( 0.5f, 0.5f, 0.5f, 0.75f ) ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>( "mixColor", testColor ), true, TEST_LOCATION );
+  Property::Map     propertyMap;
+  Property::Map     shaderMap;
+  const std::string customVertexShaderSource                    = "Foobar";
+  const std::string customFragmentShaderSource                  = "Foobar";
+  shaderMap[Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = customFragmentShaderSource;
+  shaderMap[Toolkit::Visual::Shader::Property::VERTEX_SHADER]   = customVertexShaderSource;
 
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(Toolkit::Visual::Property::SHADER, shaderMap);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
 
-  glEnableStack.Reset();
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  application.Render(2000u); // Halfway point between blue and white
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+
+  Renderer renderer = actor.GetRendererAt(0);
+  Shader   shader   = renderer.GetShader();
+
+  Property::Value value = shader.GetProperty(Shader::Property::PROGRAM);
+  DALI_TEST_CHECK(value.GetType() == Property::MAP);
+  const Property::Map* outMap               = value.GetMap();
+  std::string          fragmentShaderSource = (*outMap)["fragment"].Get<std::string>();
+  std::string          vertexShaderSource   = (*outMap)["vertex"].Get<std::string>();
+
+  // Compare vertex shader is equal
+  DALI_TEST_EQUALS(customVertexShaderSource, vertexShaderSource, TEST_LOCATION);
+
+  // Check fragment shader changed
+  const char* fragmentPrefix = Dali::NativeImageSourceTest::GetCustomFragmentPrefix();
+  size_t      pos            = fragmentShaderSource.find(fragmentPrefix);
+
+  DALI_TEST_EQUALS(pos != std::string::npos, true, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(std::string(fragmentPrefix) + customFragmentShaderSource, fragmentShaderSource, TEST_LOCATION);
+
+  // Check whether preMultipliedAlpha is false.
+  // Note : We dont use preMultiplied alpha when app developer using custom shader.
+  auto preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualWithNativeImageRemoved(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Use Native Image as url");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  NativeImageSourcePtr nativeImageSource = NativeImageSource::New(500, 500, NativeImageSource::COLOR_DEPTH_DEFAULT);
+  ImageUrl             imageUrl          = Dali::Toolkit::Image::GenerateUrl(nativeImageSource);
+  std::string          url               = imageUrl.GetUrl();
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+
+  tet_infoline("No delete texture because reference count is not zero");
+  imageUrl.Reset();
+  application.GetScene().Remove(actor);
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+
+  tet_infoline("Delete texture because reference count is zero");
+  visual.Reset();
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualWithEncodedImageBuffer(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Use Encoded Image Buffer as url");
+
+  EncodedImageBuffer rawBuffer = ConvertFileToEncodedImageBuffer(TEST_LARGE_IMAGE_FILE_NAME);
+  ImageUrl           url       = Dali::Toolkit::Image::GenerateUrl(rawBuffer);
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url.GetUrl());
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+  application.SendNotification();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualWithEncodedImageBufferRemoved(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Use Encoded Image Buffer as url");
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  EncodedImageBuffer rawBuffer = ConvertFileToEncodedImageBuffer(TEST_LARGE_IMAGE_FILE_NAME);
+  ImageUrl           imageUrl  = Dali::Toolkit::Image::GenerateUrl(rawBuffer);
+  std::string        url       = imageUrl.GetUrl();
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, url);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+  application.SendNotification();
+
+  // Wait for decode buffer and make texture.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+
+  tet_infoline("Delete texture because there is no actor to use decoded texture");
+  imageUrl.Reset();
+  application.GetScene().Remove(actor);
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualTextureReuse1(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request remote image visual with a Property::Map; request a second visual with the same property map - should reuse texture");
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  TraceCallStack& drawTrace = gl.GetDrawTrace();
+  drawTrace.Enable(true);
+
+  Actor actor = CreateActorWithImageVisual(propertyMap);
+  application.GetScene().Add(actor);
+  application.SendNotification();
+
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION);
+  textureTrace.Reset();
+  drawTrace.Reset();
+
+  Actor actor2 = CreateActorWithImageVisual(propertyMap);
+  application.GetScene().Add(actor2);
+
+  application.SendNotification(); // Send messages to update
+  application.Render();           // process update and render
+  application.SendNotification(); // process any signals to event
+
+  DALI_TEST_EQUALS(actor2.GetRendererCount(), 1u, TEST_LOCATION);
+
+  // Testing for texture re-use in gl side is not relevant - we are not using actual graphics
+  // backend here, but test graphics backend.
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
+
+  tet_infoline("Test that removing 1 actor doesn't delete the texture\n");
+
+  application.GetScene().Remove(actor);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+
+  tet_infoline("Test that removing last actor does delete the texture\n");
+
+  application.GetScene().Remove(actor2); // Detaches remaining ImageVisual
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(actor2.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualTextureReuse2(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request remote image visual with a Property::Map; request a second visual with the same url but different property map - should create new texture");
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  TraceCallStack& drawTrace = gl.GetDrawTrace();
+  drawTrace.Enable(true);
+
+  Actor actor = CreateActorWithImageVisual(propertyMap);
+  application.GetScene().Add(actor);
+  application.SendNotification();
+
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION);
+  textureTrace.Reset();
+  drawTrace.Reset();
+
+  propertyMap.Insert(ImageVisual::Property::SAMPLING_MODE, Dali::SamplingMode::NEAREST);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 100);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 100);
+  Actor actor2 = CreateActorWithImageVisual(propertyMap);
+  application.GetScene().Add(actor2);
+
+  application.SendNotification();
+
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor2.GetRendererCount(), 1u, TEST_LOCATION);
+
+  tet_infoline(
+    "Test that 2 draw calls occur with 1 new texture gen/bind, i.e. both "
+    "renderers are using different textures\n");
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION);
+  TraceCallStack::NamedParams tex1;
+  tex1["texture"] << 1;
+  TraceCallStack::NamedParams tex2;
+  tex2["texture"] << 2;
+  DALI_TEST_EQUALS(textureTrace.FindMethodAndParams("BindTexture", tex1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethodAndParams("BindTexture", tex2), true, TEST_LOCATION);
+
+  tet_infoline("Test that removing 1 actor deletes it's texture\n");
+
+  application.GetScene().Remove(actor);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
+
+  tet_infoline("Test that removing last actor deletes it's texture\n");
+
+  application.GetScene().Remove(actor2);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(actor2.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 2, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualCustomWrapModePixelArea(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with a Property::Map, test custom wrap mode and pixel area with atlasing");
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("pixelArea", Property::Type::VECTOR4),
+      UniformData("wrapMode", Property::Type::VECTOR2),
+    };
+
+  TestGraphicsController& graphics = application.GetGraphicsController();
+  graphics.AddCustomUniforms(customUniforms);
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  // Test wrap mode with atlasing. Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+  const int     width  = 34;
+  const int     height = 34;
+  const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_SMALL_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, width);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, height);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  propertyMap.Insert(ImageVisual::Property::PIXEL_AREA, pixelArea);
+  propertyMap.Insert(ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT);
+  propertyMap.Insert(ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT);
+  propertyMap.Insert(ImageVisual::Property::ATLASING, true);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  TraceCallStack& texParameterTrace = gl.GetTexParameterTrace();
+  texParameterTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(actor);
+
+  // loading started
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  // WITH atlasing, the wrapping is handled manually in shader, so the following gl function should not be called
+  std::stringstream out;
+  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_MIRRORED_REPEAT;
+  DALI_TEST_CHECK(!texParameterTrace.FindMethodAndParams("TexParameteri", out.str()));
+  out.str("");
+  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_T << ", " << GL_REPEAT;
+  DALI_TEST_CHECK(!texParameterTrace.FindMethodAndParams("TexParameteri", out.str()));
+
+  // test the uniforms which used to handle the wrap mode
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea"));
+  DALI_TEST_EQUALS(pixelAreaValue.Get<Vector4>(), pixelArea, TEST_LOCATION);
+  Vector4 pixelAreaUniform;
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("pixelArea", pixelAreaUniform));
+  DALI_TEST_EQUALS(pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  Property::Value wrapModeValue = renderer.GetProperty(renderer.GetPropertyIndex("wrapMode"));
+  Vector2         wrapMode(WrapMode::MIRRORED_REPEAT - 1, WrapMode::REPEAT - 1);
+  DALI_TEST_EQUALS(wrapModeValue.Get<Vector2>(), wrapMode, TEST_LOCATION);
+  Vector2 wrapModeUniform;
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector2>("wrapMode", wrapModeUniform));
+  DALI_TEST_EQUALS(wrapMode, wrapModeUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualCustomWrapModeNoAtlas(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with a Property::Map, test custom wrap mode and pixel area without atlasing");
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("pixelArea", Property::Type::VECTOR4),
+    };
+
+  TestGraphicsController& graphics = application.GetGraphicsController();
+  graphics.AddCustomUniforms(customUniforms);
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  // Test wrap mode without atlasing. Image with a size bigger than 512*512 will NOT be uploaded as a part of the atlas.
+  const int     width  = 600;
+  const int     height = 600;
+  const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, width);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, height);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  propertyMap.Insert(ImageVisual::Property::PIXEL_AREA, pixelArea);
+  propertyMap.Insert(ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT);
+  propertyMap.Insert(ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  textureTrace.EnableLogging(true);
+  TraceCallStack& texParameterTrace = gl.GetTexParameterTrace();
+  texParameterTrace.Enable(true);
+  texParameterTrace.EnableLogging(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(actor);
+
+  // loading started
+  application.SendNotification();
+  application.Render();
+  application.SendNotification();
+
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  // WITHOUT atlasing, the wrapping is handled by setting gl texture parameters
+  std::stringstream out;
+  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_MIRRORED_REPEAT;
+  DALI_TEST_CHECK(texParameterTrace.FindMethodAndParams("TexParameteri", out.str()));
+  out.str("");
+  out << std::hex << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_T << ", " << GL_REPEAT;
+  DALI_TEST_CHECK(texParameterTrace.FindMethodAndParams("TexParameteri", out.str()));
+
+  // test the uniforms which used to handle the wrap mode
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+
+  Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea"));
+  DALI_TEST_EQUALS(pixelAreaValue.Get<Vector4>(), pixelArea, TEST_LOCATION);
+  Vector4 pixelAreaUniform;
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("pixelArea", pixelAreaUniform));
+  DALI_TEST_EQUALS(pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  Property::Index wrapModeIndex = renderer.GetPropertyIndex("wrapMode");
+  DALI_TEST_CHECK(wrapModeIndex == Property::INVALID_INDEX);
+
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualAnimateMixColor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Animate mix color");
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+    };
+
+  TestGraphicsController& graphics = application.GetGraphicsController();
+  graphics.AddCustomUniforms(customUniforms);
+
+  application.GetPlatform().SetClosestImageSize(Vector2(100, 100));
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert("mixColor", Color::BLUE);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
+  application.GetScene().Add(actor);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  Renderer renderer = actor.GetRendererAt(0);
+
+  // @todo Should we add API to make this code work again?
+  // Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR );
+
+  Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+  DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION);
+
+  const Vector4 TARGET_MIX_COLOR(1.0f, 0.0f, 0.0f, 0.5f);
+
+  Property::Map map;
+  map["target"]       = "testVisual";
+  map["property"]     = "mixColor";
+  map["initialValue"] = Color::MAGENTA;
+  map["targetValue"]  = TARGET_MIX_COLOR;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "LINEAR")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f));
+
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
+
+  Animation animation = dummyImpl.CreateTransition(transition);
+
+  animation.AnimateTo(Property(actor, Actor::Property::COLOR), Color::WHITE);
+  animation.Play();
+
+  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+  glAbstraction.EnableEnableDisableCallTrace(true);
+  TraceCallStack&    glEnableStack = glAbstraction.GetEnableDisableTrace();
+  std::ostringstream blendStr;
+  blendStr << std::hex << GL_BLEND;
+
+  application.SendNotification();
+  application.Render(0);     // Ensure animation starts
+  application.Render(2000u); // Halfway point
+  Vector3 testColor(1.0f, 0.0f, 0.5f);
+
+  // uColor.a should be actor's alpha * mixColor.a.
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("uColor", Vector4(0.5f, 0.5f, 0.5f, 0.75f)), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", testColor), true, TEST_LOCATION);
+
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
+
+  glEnableStack.Reset();
+
+  application.SendNotification();
+  application.Render(2000u);
+
+  application.SendNotification();
+  application.Render();
+  application.SendNotification();
+
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector4>(Actor::Property::COLOR), Color::WHITE, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("uColor", Vector4(1.0f, 1.0f, 1.0f, 0.5f)), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(TARGET_MIX_COLOR)), true, TEST_LOCATION);
+
+  // (Don't test for caching of capabilities, toolkit uses Test graphics backend, not actual backend)
+
+  TestMixColor(visual, Visual::Property::MIX_COLOR, TARGET_MIX_COLOR);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualAnimateOpacity(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Animate image visual opacity");
+
+  application.GetPlatform().SetClosestImageSize(Vector2(100, 100));
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert("opacity", 0.5f);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
+  application.GetScene().Add(actor);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+  glAbstraction.EnableEnableDisableCallTrace(true);
+  TraceCallStack&    glEnableStack = glAbstraction.GetEnableDisableTrace();
+  std::ostringstream blendStr;
+  blendStr << std::hex << GL_BLEND;
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
+
+  {
+    tet_infoline("Test that the opacity can be increased to full via animation, and that the blend mode is set appropriately at the start and end of the animation.");
+
+    Property::Map map;
+    map["target"]      = "testVisual";
+    map["property"]    = "opacity";
+    map["targetValue"] = 1.0f;
+    map["animator"]    = Property::Map()
+                        .Add("alphaFunction", "LINEAR")
+                        .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f));
+
+    Dali::Toolkit::TransitionData transition = TransitionData::New(map);
+    Animation                     animation  = dummyImpl.CreateTransition(transition);
+    animation.Play();
+
+    glEnableStack.Reset();
+
+    application.SendNotification();
+    application.Render(0);          // Ensure animation starts
+    application.Render(2000u);      // Halfway point through animation
+    application.SendNotification(); // Handle any signals
+
+    Vector4 color;
+    DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", color));
+    DALI_TEST_EQUALS(color.a, 0.75f, TEST_LOCATION);
+
+    application.Render(2001u);      // end
+    application.SendNotification(); // ensure animation finished signal is sent
+
+    DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", color));
+    DALI_TEST_EQUALS(color.a, 1.0f, TEST_LOCATION);
+
+    // (Don't test for caching of capabilities, toolkit uses Test graphics backend, not actual backend)
+    DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str()));
+  }
+
+  {
+    tet_infoline("Test that the opacity can be reduced via animation, and that the blend mode is set appropriately at the start and end of the animation.");
+
+    Property::Map map;
+    map["target"]      = "testVisual";
+    map["property"]    = Visual::Property::OPACITY;
+    map["targetValue"] = 0.1f;
+    map["animator"]    = Property::Map()
+                        .Add("alphaFunction", "LINEAR")
+                        .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f));
+
+    Dali::Toolkit::TransitionData transition = TransitionData::New(map);
+    Animation                     animation  = dummyImpl.CreateTransition(transition);
+    animation.Play();
+
+    glEnableStack.Reset();
+
+    application.SendNotification();
+    application.Render(0);     // Ensure animation starts
+    application.Render(2000u); // Halfway point
+    application.SendNotification();
+
+    Vector4 color;
+    DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", color));
+    DALI_TEST_EQUALS(color.a, 0.55f, TEST_LOCATION);
+
+    DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
+
+    glEnableStack.Reset();
+
+    application.Render(2016u); // end
+    application.SendNotification();
+
+    DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", color));
+    DALI_TEST_EQUALS(color.a, 0.1f, TEST_LOCATION);
+
+    // (Don't test for caching of capabilities, toolkit uses Test graphics backend, not actual backend)
+    DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Disable", blendStr.str()));
+  }
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualAnimateOpacity02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Animate image visual opacity");
+
+  application.GetPlatform().SetClosestImageSize(Vector2(100, 100));
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert("opacity", 0.5f);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
+
+  tet_infoline("Test that the opacity doesn't animate when actor not staged");
+
+  Property::Array array;
+
+  Property::Map map;
+  map["target"]       = "testVisual";
+  map["property"]     = "opacity";
+  map["initialValue"] = 0.0f;
+  map["targetValue"]  = 1.0f;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "LINEAR")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f));
+
+  Property::Map map2;
+  map2["target"]      = "testVisual";
+  map2["property"]    = "size";
+  map2["targetValue"] = Vector2(1.0f, 1.0f);
+
+  array.Add(map).Add(map2);
+
+  Dali::Toolkit::TransitionData transition = TransitionData::New(array);
+  Animation                     animation  = dummyImpl.CreateTransition(transition);
+
+  application.GetScene().Add(actor);
+  application.SendNotification();
+  application.Render(0); // Ensure animation starts
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  Renderer        renderer       = actor.GetRendererAt(0);
+  Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+  DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION);
+
+  animation = dummyImpl.CreateTransition(transition);
+  animation.Play();
+
+  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+  glAbstraction.EnableEnableDisableCallTrace(true);
+  TraceCallStack&    glEnableStack = glAbstraction.GetEnableDisableTrace();
+  std::ostringstream blendStr;
+  blendStr << std::hex << GL_BLEND;
+
+  application.SendNotification();
+  application.Render(0);          // Ensure animation starts
+  application.Render(2000u);      // Halfway point through animation
+  application.SendNotification(); // Handle any signals
+
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
+
+  Vector4 color;
+  DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", color));
+  DALI_TEST_EQUALS(color.a, 0.5f, TEST_LOCATION);
+
+  glEnableStack.Reset();
+
+  application.Render(2001u);      // end
+  application.SendNotification(); // ensure animation finished signal is sent
+
+  DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", color));
+  DALI_TEST_EQUALS(color.a, 1.0f, TEST_LOCATION);
+
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str()));
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualAnimatePixelArea(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("ImageVisual animate pixel area");
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("pixelArea", Property::Type::VECTOR4),
+    };
+
+  TestGraphicsController& graphics = application.GetGraphicsController();
+  graphics.AddCustomUniforms(customUniforms);
+
+  application.GetPlatform().SetClosestImageSize(Vector2(100, 100));
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert("mixColor", Color::BLUE);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000, 2000));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
+  application.GetScene().Add(actor);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  Renderer renderer = actor.GetRendererAt(0);
+  // @todo Implement this feature?
+  //Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR );
+  //tet_infoline("Test that the renderer has the mixColor property");
+  //DALI_TEST_CHECK( index != Property::INVALID_INDEX );
+
+  // TransitionData only takes string keys
+  Property::Map map;
+  map["target"]       = "testVisual";
+  map["property"]     = "pixelArea";
+  map["initialValue"] = Vector4(0, 0, 0, 1);
+  map["targetValue"]  = Vector4(0, 0, 1, 1); // Animate width from zero to full
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "LINEAR")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f));
+
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
+
+  Animation animation = dummyImpl.CreateTransition(transition);
+  animation.AnimateTo(Property(actor, Actor::Property::COLOR), Color::WHITE);
+  animation.Play();
+
+  application.SendNotification();
+  application.Render(0);     // Ensure animation starts
+  application.Render(2000u); // Halfway point
+
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("pixelArea", Vector4(0.0f, 0.0f, 0.5f, 1.0f)), true, TEST_LOCATION);
+
+  application.Render(2000u); // End of animation
+
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("pixelArea", Vector4(0.0f, 0.0f, 1.0f, 1.0f)), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualTextureCancelRemoteLoad(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request remote image visual, then destroy visual to cancel load");
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  TraceCallStack& drawTrace = gl.GetDrawTrace();
+  drawTrace.Enable(true);
+
+  Actor actor = CreateActorWithImageVisual(propertyMap);
+  application.GetScene().Add(actor);
+  application.SendNotification();
+
+  application.GetScene().Remove(actor);
+  application.SendNotification();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualTextureCancelAsyncLoad(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Load image asynchronously, cancel loading, then load again");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+  TraceCallStack& drawTrace = gl.GetDrawTrace();
+  drawTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::Property::BACKGROUND, visual);
+
+  application.GetScene().Add(actor);
+
+  // Cancel loading
+  application.GetScene().Remove(actor);
+
+  application.GetScene().Add(actor);
+
+  // Create another visual with the same image
+  visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  dummyImpl.RegisterVisual(Control::Property::BACKGROUND, visual);
+
+  application.SendNotification();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualSetInvalidAsyncImage(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with invalid images - should draw broken.png");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_INVALID_FILE_NAME);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::WHITE, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>( "uColor", Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>( "mixColor", Vector3( TARGET_MIX_COLOR ) ), true, TEST_LOCATION );
+  application.SendNotification();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
 
-  // GL_BLEND should not be changed: Keep enabled
-  // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
-//  DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
-  DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  TestMixColor( visual, Visual::Property::MIX_COLOR, TARGET_MIX_COLOR );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualAnimateOpacity(void)
+int UtcDaliImageVisualSetInvalidSyncImage(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Animate image visual opacity" );
-
-  application.GetPlatform().SetClosestImageSize( Vector2(100, 100) );
+  tet_infoline("Request image visual with invalid images - should draw broken.png");
 
   VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::IMAGE);
-  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert("opacity", 0.5f);
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_INVALID_FILE_NAME);
   propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
 
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
   application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
 
-  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  glAbstraction.EnableEnableDisableCallTrace( true );
-  TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace();
-  std::ostringstream blendStr;
-  blendStr << std::hex << GL_BLEND;
+  // Check resource status
+  Visual::ResourceStatus status = actor.GetVisualResourceStatus(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+  // The broken image should be shown.
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualSetInvalidRemoteImage(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with invalid images - should draw broken.png");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  // Local invalid file, asynchronous loading
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_REMOTE_INVALID_FILE_NAME);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str()) );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  {
-    tet_infoline( "Test that the opacity can be increased to full via animation, and that the blend mode is set appropriately at the start and end of the animation." );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
-    Property::Map map;
-    map["target"] = "testVisual";
-    map["property"] = "opacity";
-    map["targetValue"] = 1.0f;
-    map["animator"] = Property::Map()
-      .Add("alphaFunction", "LINEAR")
-      .Add("timePeriod", Property::Map()
-           .Add("delay", 0.0f)
-           .Add("duration", 4.0f));
-
-    Dali::Toolkit::TransitionData transition = TransitionData::New( map );
-    Animation animation = dummyImpl.CreateTransition( transition );
-    animation.Play();
+  END_TEST;
+}
 
-    glEnableStack.Reset();
+int UtcDaliImageVisualSetInvalidImageWithDisabledBroken(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with invalid images - should draw broken.png");
 
-    application.SendNotification();
-    application.Render(0);     // Ensure animation starts
-    application.Render(2000u); // Halfway point through animation
-    application.SendNotification(); // Handle any signals
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-    Vector4 color;
-    DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
-    DALI_TEST_EQUALS( color.a, 0.75f, TEST_LOCATION );
+  // Load invalid file
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, "InvalidImage.png");
 
-    application.Render(2001u); // end
-    application.SendNotification(); // ensure animation finished signal is sent
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-    DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
-    DALI_TEST_EQUALS( color.a, 1.0f, TEST_LOCATION );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-    // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
-//    DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
-    DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
-  }
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  {
-    tet_infoline( "Test that the opacity can be reduced via animation, and that the blend mode is set appropriately at the start and end of the animation." );
+  application.GetScene().Add(actor);
 
-    Property::Map map;
-    map["target"] = "testVisual";
-    map["property"] = Visual::Property::OPACITY;
-    map["targetValue"] = 0.1f;
-    map["animator"] = Property::Map()
-      .Add("alphaFunction", "LINEAR")
-      .Add("timePeriod", Property::Map()
-           .Add("delay", 0.0f)
-           .Add("duration", 4.0f));
-
-    Dali::Toolkit::TransitionData transition = TransitionData::New( map );
-    Animation animation = dummyImpl.CreateTransition( transition );
-    animation.Play();
+  application.SendNotification();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-    glEnableStack.Reset();
+  application.SendNotification();
+  application.Render();
 
-    application.SendNotification();
-    application.Render(0);     // Ensure animation starts
-    application.Render(2000u); // Halfway point
-    application.SendNotification();
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector4 color;
-    DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
-    DALI_TEST_EQUALS( color.a, 0.55f, TEST_LOCATION );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  textureTrace.Reset();
+
+  // Load invalid file with disabled broken
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, "InvalidImage.png");
+  propertyMap.Insert(Toolkit::DevelImageVisual::Property::ENABLE_BROKEN_IMAGE, false);
+
+  visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  actor                        = DummyControl::New();
+  DummyControlImpl& dummyImpl2 = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl2.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), false, TEST_LOCATION);
+
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualAlphaMask01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with a Property::Map containing an Alpha mask");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
+
+  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
+  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+
+  dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualAlphaMask02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with a Property::Map containing an Alpha mask for GPU");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+  propertyMap.Insert(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+  propertyMap.Insert(DevelImageVisual::Property::CROP_TO_MASK, false);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
+  DALI_TEST_EQUALS(*testMap.Find(DevelImageVisual::Property::MASKING_TYPE), Property::Value(DevelImageVisual::MaskingType::MASKING_ON_RENDERING), TEST_LOCATION);
+
+  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
+  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  Renderer   renderer = actor.GetRendererAt(0u);
+  TextureSet textures = renderer.GetTextures();
+  DALI_TEST_CHECK(textures);
+  DALI_TEST_EQUALS(textures.GetTextureCount(), 2u, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+
+  dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  auto index = renderer.GetPropertyIndex("maskTextureRatio");
+  DALI_TEST_NOT_EQUALS(index, Property::INVALID_INDEX, 0.1f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector2>(index), Vector2::ONE, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualAlphaMask03(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with a Property::Map containing an Alpha mask for GPU with fail case");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, "dummy_path");
+  propertyMap.Insert(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+
+  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
+  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  Renderer   renderer = actor.GetRendererAt(0u);
+  TextureSet textures = renderer.GetTextures();
+  DALI_TEST_CHECK(textures);
+  DALI_TEST_EQUALS(textures.GetTextureCount(), 1u, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+
+  dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualSynchronousLoadAlphaMask01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with a Property::Map containing an Alpha mask with synchronous loading");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
+
+  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
+  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+
+  // Do not wait for any EventThreadTrigger in synchronous alpha mask.
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+
+  dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualSynchronousLoadAlphaMask02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with a Property::Map containing an Alpha mask for GPU with synchronous loading");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  propertyMap.Insert(DevelImageVisual::Property::MASKING_TYPE, DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
+
+  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
+  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
 
-    DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+  // Do not wait for any EventThreadTrigger in synchronous alpha mask.
 
-    glEnableStack.Reset();
+  application.SendNotification();
+  application.Render();
 
-    application.Render(2016u); // end
-    application.SendNotification();
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  Renderer   renderer = actor.GetRendererAt(0u);
+  TextureSet textures = renderer.GetTextures();
+  DALI_TEST_CHECK(textures);
+  DALI_TEST_EQUALS(textures.GetTextureCount(), 2u, TEST_LOCATION);
 
-    DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
-    DALI_TEST_EQUALS( color.a, 0.1f, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
 
-    // GL_BLEND should not be changed: Keep enabled
-// @todo
-// TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
-//    DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
-    DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
-  }
+  dummyImpl.UnregisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-
-int UtcDaliImageVisualAnimateOpacity02(void)
+int UtcDaliImageVisualRemoteAlphaMask(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Animate image visual opacity" );
-
-  application.GetPlatform().SetClosestImageSize( Vector2(100, 100) );
+  tet_infoline("Request image visual with a Property::Map containing an Alpha mask");
 
   VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  const std::string MASK_IMAGE = TEST_REMOTE_IMAGE_FILE_NAME;
+
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::IMAGE);
-  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert("opacity", 0.5f);
-  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, MASK_IMAGE);
 
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
 
-  tet_infoline( "Test that the opacity doesn't animate when actor not staged" );
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(MASK_IMAGE), TEST_LOCATION);
 
-  Property::Array array;
+  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
+  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
 
-  Property::Map map;
-  map["target"] = "testVisual";
-  map["property"] = "opacity";
-  map["initialValue"] = 0.0f;
-  map["targetValue"] = 1.0f;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 4.0f));
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  Property::Map map2;
-  map2["target"] = "testVisual";
-  map2["property"] = "size";
-  map2["targetValue"] = Vector2(1.0f, 1.0f);
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
-  array.Add( map ).Add(map2);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( array );
-  Animation animation = dummyImpl.CreateTransition( transition );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
   application.GetScene().Add(actor);
   application.SendNotification();
-  application.Render(0);     // Ensure animation starts
-
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+  application.Render();
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE );
-  DALI_TEST_EQUALS( blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
-  animation = dummyImpl.CreateTransition( transition );
-  animation.Play();
+  application.SendNotification();
+  application.Render();
 
-  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  glAbstraction.EnableEnableDisableCallTrace( true );
-  TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace();
-  std::ostringstream blendStr;
-  blendStr << std::hex << GL_BLEND;
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
 
-  application.SendNotification();
-  application.Render(0);     // Ensure animation starts
-  application.Render(2000u); // Halfway point through animation
-  application.SendNotification(); // Handle any signals
+  END_TEST;
+}
 
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+int UtcDaliImageVisualAlphaMaskCrop(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("Request image visual with an Alpha mask and scale/cropping");
 
-  Vector4 color;
-  DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
-  DALI_TEST_EQUALS( color.a, 0.5f, TEST_LOCATION );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  glEnableStack.Reset();
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_LARGE_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f);
+  propertyMap.Insert(ImageVisual::Property::CROP_TO_MASK, true);
 
-  application.Render(2001u); // end
-  application.SendNotification(); // ensure animation finished signal is sent
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
-  DALI_TEST_EQUALS( color.a, 1.0f, TEST_LOCATION );
+  Property::Map testMap;
+  visual.CreatePropertyMap(testMap);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL), Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::MASK_CONTENT_SCALE), Property::Value(1.6f), TEST_LOCATION);
+  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::CROP_TO_MASK), Property::Value(true), TEST_LOCATION);
 
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
+  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
+  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
 
-  END_TEST;
-}
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
 
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), false, TEST_LOCATION);
 
-int UtcDaliImageVisualAnimatePixelArea(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( "ImageVisual animate pixel area" );
+  application.GetScene().Add(actor);
+  application.SendNotification();
+  application.Render();
 
-  static std::vector<UniformData> customUniforms =
-  {
-    UniformData("pixelArea", Property::Type::VECTOR4),
-  };
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
-  TestGraphicsController& graphics = application.GetGraphicsController();
-  graphics.AddCustomUniforms(customUniforms);
+  application.SendNotification();
+  application.Render();
 
-  application.GetPlatform().SetClosestImageSize( Vector2(100, 100) );
+  Vector2 size;
+  visual.GetNaturalSize(size);
 
-  VisualFactory factory = VisualFactory::Get();
-  Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::IMAGE);
-  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert("mixColor", Color::BLUE);
-  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  DALI_TEST_EQUALS(size, Vector2(100.0f, 100.0f), 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
 
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  END_TEST;
+}
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(2000, 2000) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
-  application.GetScene().Add(actor);
+int UtcDaliImageVisualReleasePolicy01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageVisualReleasePolicy01 Detached Policy, disabling visual with this policy deletes texture");
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED);
+  DALI_TEST_CHECK(imageVisual);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index index = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR );
+  // Set up debug trace
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  tet_infoline("Test that the renderer has the mixColor property");
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
+  tet_infoline("Register visual with control and ensure it has the only handle");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset();
 
-  // TransitionData only takes string keys
-  Property::Map map;
-  map["target"] = "testVisual";
-  map["property"] = "pixelArea";
-  map["initialValue"] = Vector4( 0,0,0,1 );
-  map["targetValue"] = Vector4( 0,0,1,1 ); // Animate width from zero to full
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 4.0f));
-
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
-
-  Animation animation = dummyImpl.CreateTransition( transition );
-  animation.AnimateTo( Property(actor, Actor::Property::COLOR), Color::WHITE );
-  animation.Play();
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
   application.SendNotification();
-  application.Render(0);     // Ensure animation starts
-  application.Render(2000u); // Halfway point
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>("pixelArea", Vector4(0.0f, 0.0f, 0.5f, 1.0f )), true, TEST_LOCATION );
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  application.Render(2000u); // End of animation
+  application.SendNotification();
+  application.Render(0);
+  // Test renderer and texture created
+  tet_infoline("Confirm texture created");
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>("pixelArea", Vector4( 0.0f, 0.0f, 1.0f, 1.0f )), true, TEST_LOCATION );
+  tet_infoline("Disable visual causing the texture to be deleted");
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false);
+
+  application.SendNotification();
+  application.Render(0);
+  // Test renderer and textures removed.
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualTextureCancelRemoteLoad(void)
+int UtcDaliImageVisualReleasePolicy02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request remote image visual, then destroy visual to cancel load" );
+  tet_infoline("UtcDaliImageVisualReleasePolicy02 Destroyed Policy, Texture should be deleted when visual destroyed");
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_REMOTE_IMAGE_FILE_NAME );
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED);
+  DALI_TEST_CHECK(imageVisual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  // Setup debug trace
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
-  TraceCallStack& drawTrace = gl.GetDrawTrace();
-  drawTrace.Enable(true);
 
-  Actor actor = CreateActorWithImageVisual( propertyMap );
-  application.GetScene().Add( actor );
+  tet_infoline("Register visual with control and ensure it has the only handle");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
   application.SendNotification();
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(0);
+  // Test renderer and texture created
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
 
-  application.GetScene().Remove( actor );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  tet_infoline("Destroy visual by UnRegistering visual with control, check renderer is destroyed");
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   application.SendNotification();
+  application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), false, TEST_LOCATION );
+  // Test texture removed after visual destroyed.
+  tet_infoline("Ensure texture is deleted after visual destroyed");
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualTextureCancelAsyncLoad(void)
+int UtcDaliImageVisualReleasePolicy03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Load image asynchronously, cancel loading, then load again" );
-
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
-
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME );
-
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  tet_infoline("UtcDaliImageVisualReleasePolicy03 Never Policy, texture should not be deleted after visual destroyed");
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable( true );
-  TraceCallStack& drawTrace = gl.GetDrawTrace();
-  drawTrace.Enable( true );
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER);
+  DALI_TEST_CHECK(imageVisual);
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( Control::Property::BACKGROUND, visual );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  application.GetScene().Add( actor );
+  tet_infoline("Register visual with control and ensure it has the only handle");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
-  // Cancel loading
-  application.GetScene().Remove( actor );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  application.GetScene().Add( actor );
+  application.SendNotification();
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
 
-  // Create another visual with the same image
-  visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  application.GetScene().Add(actor);
 
-  dummyImpl.RegisterVisual( Control::Property::BACKGROUND, visual );
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  application.Render(0);
+  // Test renderer and texture created
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
 
+  tet_infoline("Destroy visual by UnRegistering visual with control, check renderer is destroyed");
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION );
+  tet_infoline("Ensure texture is not deleted as policy is set to NEVER");
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualSetInvalidAsyncImage(void)
+int UtcDaliImageVisualReleasePolicy04(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with invalid images - should draw broken.png" );
+  tet_infoline("UtcDaliImageVisualReleasePolicy04 Two visuals with different policies sharing a texture");
 
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
-
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_INVALID_FILE_NAME );
+  tet_infoline("Create first visual with Never release policy");
+  Visual::Base imageVisualNever = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  tet_infoline("Create second visual with Destroyed release policy");
+  Visual::Base imageVisualDestroyed = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  tet_infoline("Register visuals with control and ensure it has the only handles");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisualNever);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, imageVisualDestroyed);
+  imageVisualNever.Reset();     // reduce ref count so only the control keeps the visual alive.
+  imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive.
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  // Test initially zero renderers
+  application.SendNotification();
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
 
-  application.GetScene().Add( actor );
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  application.Render(0);
+  tet_infoline("Ensure a texture is created, shared amongst both visuals.  Each visual has its own renderer");
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
 
+  // Test renderer removed when visual destroyed
+  DALI_TEST_CHECK(actor.GetRendererCount() == 2u);
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL2); // TEST_VISUAL2 no longer requires the texture as release policy DESTROYED
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  // Test texture was not deleted as TEST_VISUAL release policy is NEVER so it is still required.
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  application.SendNotification();
+  application.Render();
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  tet_infoline("Ensure a texture is not deleted as second visual used the NEVER release policy");
+  // Test texture was not deleted as TEST_VISUAL release policy is NEVER so it is still required.
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualSetInvalidSyncImage(void)
+int UtcDaliImageVisualReleasePolicy05(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with invalid images - should draw broken.png" );
+  tet_infoline("UtcDaliImageVisualReleasePolicy05 Testing settung by string currents correct enum");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_INVALID_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
+  Property::Map propertyMapNeverReleasePolicy;
+  propertyMapNeverReleasePolicy.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMapNeverReleasePolicy.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMapNeverReleasePolicy.Insert(ImageVisual::Property::DESIRED_WIDTH, 20);
+  propertyMapNeverReleasePolicy.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30);
+  propertyMapNeverReleasePolicy.Insert("releasePolicy", "never");
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base imageVisualNever = factory.CreateVisual(propertyMapNeverReleasePolicy);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  Property::Map resultMap;
+  imageVisualNever.CreatePropertyMap(resultMap);
+  DALI_TEST_CHECK(!resultMap.Empty());
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  DALI_TEST_EQUALS((resultMap.Find(ImageVisual::Property::RELEASE_POLICY))->Get<int>(), (int)ImageVisual::ReleasePolicy::NEVER, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualReleasePolicy06(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageVisualReleasePolicy06 Never Policy, texture should not be affected by Disabling and Enabling visual");
+
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER);
+  DALI_TEST_CHECK(imageVisual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  tet_infoline("Register visual with control and ensure it has the only handle");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
-  application.GetScene().Add( actor );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
   application.SendNotification();
-  application.Render();
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
 
-  // Check resource status
-  Visual::ResourceStatus status = actor.GetVisualResourceStatus(Control::CONTROL_PROPERTY_END_INDEX + 1);
-  DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION);
+  application.GetScene().Add(actor);
 
-  // The broken image should be shown.
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(0);
+  // Test renderer and texture created
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  textureTrace.Reset();
+
+  tet_infoline("Disable Visual and check texture not affected");
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false);
+  application.SendNotification();
+  application.Render(0);
+  tet_infoline("Check renderer is destroyed when visual off stage");
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+  textureTrace.Reset();
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  tet_infoline("Re-enable Visual and check texture not affected");
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, true);
+  application.SendNotification();
+  application.Render(0);
+  tet_infoline("Check texture not affected and renderer is destroyed when visual off stage");
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualSetInvalidRemoteImage(void)
+int UtcDaliImageVisualReleasePolicy07(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with invalid images - should draw broken.png" );
-
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  tet_infoline("UtcDaliImageVisualReleasePolicy07 Two visuals with different policies sharing a texture DETACHED and DESTROYED");
 
-  // Local invalid file, asynchronous loading
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_REMOTE_INVALID_FILE_NAME );
+  tet_infoline("Create first visual with DESTROYED release policy");
+  Visual::Base imageVisualDestroyed = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  tet_infoline("Create second visual with DETACHED release policy");
+  Visual::Base imageVisualDetached = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  tet_infoline("Register visuals with control and ensure it has the only handles");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisualDestroyed);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, imageVisualDetached);
+  imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive.
+  imageVisualDetached.Reset();  // reduce ref count so only the control keeps the visual alive.
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  // Test initially zero renderers
+  application.SendNotification();
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  application.GetScene().Add(actor);
 
-  application.GetScene().Add( actor );
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  application.Render(0);
+  tet_infoline("Ensure a texture is created, shared amongst both visuals.  Each visual has its own renderer");
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
 
+  // Test renderer removed when visual destroyed
+  DALI_TEST_CHECK(actor.GetRendererCount() == 2u);
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL2, false); // TEST_VISUAL2 no longer requires the texture as release policy DETACHED
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  // Test texture was not deleted as TEST_VISUAL release policy is DESTROYED and is still required.
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  application.SendNotification();
+  application.Render();
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  tet_infoline("Ensure a texture is not deleted as second visual used the DESTROYED release policy");
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualAlphaMask(void)
+int UtcDaliImageVisualReleasePolicy08(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with a Property::Map containing an Alpha mask" );
+  tet_infoline("UtcDaliImageVisualReleasePolicy08 Ensure TextureSet is same after detach/attach on stage when texture used the DESTROYED release policy");
 
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  tet_infoline("Create first visual with DESTROYED release policy");
+  Visual::Base imageVisualDestroyed = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED);
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_LARGE_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME );
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  tet_infoline("Register visuals with control and ensure it has the only handles");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisualDestroyed);
+  imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive.
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  Property::Map testMap;
-  visual.CreatePropertyMap(testMap);
-  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION );
+  // Test initially zero renderers
+  application.SendNotification();
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+  textureTrace.Reset();
 
-  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
-  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+  application.GetScene().Add(actor);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  application.SendNotification();
+  application.Render(0);
+  tet_infoline("Ensure a texture is created");
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  textureTrace.Reset();
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION );
+  // Ensure Texture is same after detach/attach on stage when texture used the DESTROYED release policy
+  // 1. Get Texture
+  Texture textureBefore = actor.GetRendererAt(0u).GetTextures().GetTexture(0u);
 
-  application.GetScene().Add( actor );
+  // 2.Remove actor from stage. In this case, renderer also is deleted.
+  tet_infoline("Remove actor from stage");
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  tet_infoline("Ensure a texture is not deleted as visual used the DESTROYED release policy");
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION);
+  textureTrace.Reset();
 
+  // 3.Add actor in stage. In this case, renderer is created.
+  tet_infoline("Add actor in stage");
+  application.GetScene().Add(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
   application.SendNotification();
   application.Render();
+  tet_infoline("Ensure a texture is not created again");
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION);
+  textureTrace.Reset();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION );
+  // 4.Compare Texture with before and after. texture need to be same because release policy is the DESTROYED.
+  tet_infoline("Ensure a texture is not deleted because it is used the DESTROYED release policy");
+  Texture textureAfter = actor.GetRendererAt(0u).GetTextures().GetTexture(0u);
+  DALI_TEST_CHECK(textureBefore == textureAfter);
+  textureBefore.Reset();
+  textureAfter.Reset();
 
-  dummyImpl.UnregisterVisual(  Control::CONTROL_PROPERTY_END_INDEX + 1 );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualSynchronousLoadAlphaMask(void)
+int UtcDaliImageVisualReleasePolicy09(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with a Property::Map containing an Alpha mask with synchronous loading" );
+  tet_infoline("UtcDaliImageVisualReleasePolicy09 Destroyed Policy with N-Patch, Texture should be deleted when visual destroyed");
 
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
-
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_LARGE_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
+  Property::Map propertyMapNPatchReleasePolicy;
+  propertyMapNPatchReleasePolicy.Insert(Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMapNPatchReleasePolicy.Insert(ImageVisual::Property::URL, TEST_N_PATCH_IMAGE_FILE_NAME);
+  propertyMapNPatchReleasePolicy.Insert(DevelImageVisual::Property::AUXILIARY_IMAGE, TEST_MASK_IMAGE_FILE_NAME);
+  propertyMapNPatchReleasePolicy.Insert(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, 0.9f);
+  propertyMapNPatchReleasePolicy.Insert(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  VisualFactory factory     = VisualFactory::Get();
+  Visual::Base  imageVisual = factory.CreateVisual(propertyMapNPatchReleasePolicy);
+  DALI_TEST_CHECK(imageVisual);
 
-  Property::Map testMap;
-  visual.CreatePropertyMap(testMap);
-  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION );
+  // Setup debug trace
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
-  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+  tet_infoline("Register visual with control and ensure it has the only handle");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  application.SendNotification();
+  application.Render(0);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION );
+  application.GetScene().Add(actor);
 
-  application.GetScene().Add( actor );
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  // Do not wait for any EventThreadTrigger in synchronous alpha mask.
+  application.SendNotification();
+  application.Render(0);
+  // Test renderer and texture created
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
 
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  tet_infoline("Destroy visual by UnRegistering visual with control, check renderer is destroyed");
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION );
-
-  dummyImpl.UnregisterVisual(  Control::CONTROL_PROPERTY_END_INDEX + 1 );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  // Test texture removed after visual destroyed.
+  tet_infoline("Ensure texture is deleted after visual destroyed");
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 2, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualRemoteAlphaMask(void)
+int UtcDaliImageVisualLoadPolicy01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with a Property::Map containing an Alpha mask" );
+  tet_infoline("UtcDaliImageVisualLoadPolicy01 Load a visual image before attaching to stage");
 
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  const std::string MASK_IMAGE = TEST_REMOTE_IMAGE_FILE_NAME;
+  tet_infoline("Create visual with IMMEDIATE load policy");
+  VisualFactory factory = VisualFactory::Get();
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, MASK_IMAGE );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 20);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30);
+  propertyMap.Insert("loadPolicy", ImageVisual::LoadPolicy::IMMEDIATE);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  Property::Map testMap;
-  visual.CreatePropertyMap(testMap);
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
 
-  DALI_TEST_EQUALS(*testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(MASK_IMAGE), TEST_LOCATION );
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+  DALI_TEST_CHECK(!resultMap.Empty());
+  DALI_TEST_EQUALS((resultMap.Find(ImageVisual::Property::LOAD_POLICY))->Get<int>(), (int)ImageVisual::LoadPolicy::IMMEDIATE, TEST_LOCATION);
 
-  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
-  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  // Ensure texture has been uploaded
+  application.SendNotification();
+  application.Render();
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  tet_infoline("Ensure texture loading starts after visual created");
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  textureTrace.Reset();
 
-  DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION );
+  tet_infoline("Register visuals with control and ensure it has the only handles");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+  tet_infoline("Ensure nothing triggers another load as texure already loaded");
+  const unsigned int TIME_OUT_3_SECONDS = 3;
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, TIME_OUT_3_SECONDS), false, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+
+  // Ensure texture is deleted when no longer needed (ref count was correct )
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualAlphaMaskCrop(void)
+int UtcDaliImageVisualLoadPolicy02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Request image visual with an Alpha mask and scale/cropping" );
-
-  VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  tet_infoline("UtcDaliImageVisualLoadPolicy01 Load a visual image only after attached to stage");
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_LARGE_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f );
-  propertyMap.Insert( ImageVisual::Property::CROP_TO_MASK, true );
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  tet_infoline("Create visual with IMMEDIATE load policy");
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED);
 
-  Property::Map testMap;
-  visual.CreatePropertyMap(testMap);
-  DALI_TEST_EQUALS( *testMap.Find(ImageVisual::Property::ALPHA_MASK_URL),Property::Value(TEST_MASK_IMAGE_FILE_NAME), TEST_LOCATION );
-  DALI_TEST_EQUALS( *testMap.Find(ImageVisual::Property::MASK_CONTENT_SCALE), Property::Value(1.6f), TEST_LOCATION );
-  DALI_TEST_EQUALS( *testMap.Find(ImageVisual::Property::CROP_TO_MASK),Property::Value(true), TEST_LOCATION );
+  const unsigned int TIME_OUT_3_SECONDS = 3;
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, TIME_OUT_3_SECONDS), false, TEST_LOCATION);
 
-  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
-  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+  // Act on meeage queue even although nothing expected to load
+  application.SendNotification();
+  application.Render();
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  tet_infoline("Ensure texture is not generated yet");
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION);
+  textureTrace.Reset();
 
-  DummyControl actor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+  tet_infoline("Register visuals with control and ensure it has the only handles");
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+  tet_infoline("Allow image time to load");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  tet_infoline("Ensure texture generated and renderer created");
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+
+  // Ensure texture is delete when no longer needed
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
 
   application.SendNotification();
   application.Render();
 
-  Vector2 size;
-  visual.GetNaturalSize(size);
-
-  DALI_TEST_EQUALS( size, Vector2( 100.0f, 100.0f ), 0.001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.IsResourceReady(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualReleasePolicy01(void)
+int UtcDaliImageVisualLoadPolicy03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy01 Detached Policy, disabling visual with this policy deletes texture" );
+  tet_infoline("UtcDaliImageVisualLoadPolicy03 Load a visual image and receive ResourceReady Signal when loaded");
 
-  Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED );
-  DALI_TEST_CHECK( imageVisual );
+  const bool VISUAL_NOT_ENABLED(false); // Instead of just passing 'false' into an API.
 
-  // Set up debug trace
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  tet_infoline( "Register visual with control and ensure it has the only handle" );
+  tet_infoline("Create a control and connect to resource ready signal without adding to stage");
   DummyControl actor = DummyControl::New(true);
+  actor.ResourceReadySignal().Connect(&ResourceReadySignal);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  imageVisual.Reset();
-
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  application.SendNotification();
-  application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  tet_infoline("Create visual with IMMEDIATE load policy");
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE);
 
-  application.GetScene().Add( actor );
-
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  tet_infoline("Registering visual allows control to get a signal once loaded even if visual not enabled( not staged )");
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
+  tet_infoline("Allow image time to load resource");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
   application.SendNotification();
-  application.Render(0);
-  // Test renderer and texture created
-  tet_infoline( "Confirm texture created" );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-
-  tet_infoline( "Disable visual causing the texture to be deleted" );
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false );
+  application.Render();
 
-  application.SendNotification();
-  application.Render(0);
-  // Test renderer and textures removed.
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+  // Ensure texture has been uploaded
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, false, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualReleasePolicy02(void)
+int UtcDaliImageVisualLoadPolicy04(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy02 Destroyed Policy, Texture should be deleted when visual destroyed" );
+  tet_infoline("UtcDaliImageVisualLoadPolicy04 First part  Load a visual image before attaching to stage");
+  tet_infoline("Second part, Reuse the same image in aonther control and check resource ready signal fired");
 
-  Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED );
-  DALI_TEST_CHECK( imageVisual );
+  const bool VISUAL_NOT_ENABLED(false); // Instead of just passing false into an API.
 
-  // Setup debug trace
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  tet_infoline( "Register visual with control and ensure it has the only handle" );
+  tet_infoline("Create a control and connect to resource ready signal");
   DummyControl actor = DummyControl::New(true);
+  actor.ResourceReadySignal().Connect(&ResourceReadySignal);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  tet_infoline("Create visual with IMMEDIATE load policy");
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE);
+
+  tet_infoline("Registering visual allows control to get a signal once loaded even if visual not enabled( staged )");
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
+  tet_infoline("Allow image time to load");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
   application.SendNotification();
-  application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  application.Render();
 
-  application.GetScene().Add( actor );
+  tet_infoline("Testing texture is loaded and resource ready signal fired");
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, false, TEST_LOCATION);
 
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  tet_infoline("Original control correctly signalled, now testing for signal with new Control reusing the image");
 
-  application.SendNotification();
-  application.Render(0);
-  // Test renderer and texture created
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  gResourceReadySignalFired        = false; // Reset signal check ready for testing next Control
+  Visual::Base        imageVisual2 = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE);
+  DummyControl        actor2       = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl2   = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  actor2.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  tet_infoline("Registering visual this should trigger the loading signal as is already image loaded for previous control");
+  dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2);
+  imageVisual2.Reset(); // reduce ref count so only the control keeps the visual alive.
+  actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(0), true, TEST_LOCATION); // Not expecting any further loading as texture is being reused.
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliImageVisualLoadPolicy05(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliImageVisualLoadPolicy05 LoadPolicy::ATTACHED (default) First part  Load a visual image before attaching to stage");
+  tet_infoline("Second part, Reuse the same image in aonther control and check resource ready signal fired");
+  // Set up trace debug
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  tet_infoline("Create a control and connect to resource ready signal");
+  DummyControl actor = DummyControl::New(true);
+  actor.ResourceReadySignal().Connect(&ResourceReadySignal);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+
+  tet_infoline("Create visual with ATTACHED load policy");
+  Visual::Base imageVisual = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED);
 
+  tet_infoline("Registering visual allows control to get a signal once loaded");
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  tet_infoline( "Destroy visual by UnRegistering visual with control, check renderer is destroyed" );
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  tet_infoline("Allow image time to load");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
   application.SendNotification();
   application.Render();
 
-  // Test texture removed after visual destroyed.
-  tet_infoline( "Ensure texture is deleted after visual destroyed" );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+  tet_infoline("Testing texture is loaded and resource ready signal fired");
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+
+  tet_infoline("Original control correctly signalled, now testing for signal with new Control reusing the image");
+
+  gResourceReadySignalFired        = false; // Reset signal check ready for testing next Control
+  Visual::Base        imageVisual2 = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED);
+  DummyControl        actor2       = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl2   = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  actor2.ResourceReadySignal().Connect(&ResourceReadySignal);
+
+  tet_infoline("Registering visual this should trigger the loading signal as is already image loaded for previous control");
+  dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2);
+  imageVisual2.Reset(); // reduce ref count so only the control keeps the visual alive.
+  actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(0), true, TEST_LOCATION); // Not expecting any further loading as texture is being reused.
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualReleasePolicy03(void)
+int UtcDaliImageVisualOrientationCorrection(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy03 Never Policy, texture should not be deleted after visual destroyed" );
+  tet_infoline("UtcDaliImageVisualOrientationCorrection Enabling OrientationCorrection should rotate an image with exif (90deg) orientation data with requested");
 
-  Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER );
-  DALI_TEST_CHECK( imageVisual );
-
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  VisualFactory factory = VisualFactory::Get();
+  tet_infoline("Create visual with Orientation correction set OFF");
+  Property::Map propertyMap;
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_ROTATED_IMAGE);
+  propertyMap.Insert("orientationCorrection", false);
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
 
-  tet_infoline( "Register visual with control and ensure it has the only handle" );
-  DummyControl actor = DummyControl::New(true);
+  tet_infoline("Create control for visual, need to loaded it");
+  DummyControl        actor     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+  application.GetScene().Add(actor);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  // Wait for image to load
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
+  Vector2 originalImageSize;
+  tet_infoline("Get size of original visual to compare later with rotated image");
+  imageVisual.GetNaturalSize(originalImageSize);
+  DALI_TEST_GREATER(originalImageSize.width, originalImageSize.height, TEST_LOCATION); // Width and Height must be different for this test.
+  imageVisual.Reset();                                                                 // remove handle so can unregister it and remove from cache
+  dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
   application.SendNotification();
-  application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  application.Render();
 
-  application.GetScene().Add( actor );
+  tet_infoline("Create visual with Orientation correction set ON ");
+  propertyMap.Clear();
+  propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_ROTATED_IMAGE);
+  propertyMap.Insert(ImageVisual::Property::ORIENTATION_CORRECTION, true);
+  imageVisual = factory.CreateVisual(propertyMap);
 
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
   // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  application.SendNotification();
-  application.Render(0);
-  // Test renderer and texture created
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  Vector2 rotatedImageSize;
+  imageVisual.GetNaturalSize(rotatedImageSize);
+  tet_infoline("Confirm that visual has rotated");
+  DALI_TEST_EQUALS(originalImageSize.width, rotatedImageSize.height, TEST_LOCATION);
+  DALI_TEST_EQUALS(originalImageSize.height, rotatedImageSize.width, TEST_LOCATION);
 
-  tet_infoline( "Destroy visual by UnRegistering visual with control, check renderer is destroyed" );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  application.SendNotification();
-  application.Render();
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
 
-  tet_infoline( "Ensure texture is not deleted as policy is set to NEVER" );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
+  // check the Property::ORIENTATION_CORRECTION value from the returned map
+  Property::Value* typeValue = resultMap.Find(ImageVisual::Property::ORIENTATION_CORRECTION, Property::BOOLEAN);
+  DALI_TEST_EQUALS(typeValue->Get<bool>(), true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualReleasePolicy04(void)
+int UtcDaliImageVisualCustomShader(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy04 Two visuals with different policies sharing a texture" );
+  tet_infoline("UtcDaliImageVisualCustomShader Test custom shader");
 
-  tet_infoline( "Create first visual with Never release policy" );
-  Visual::Base imageVisualNever = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER );
+  VisualFactory     factory = VisualFactory::Get();
+  Property::Map     properties;
+  Property::Map     shader;
+  const std::string vertexShader                    = "Foobar";
+  const std::string fragmentShader                  = "Foobar";
+  shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
+  shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
-  tet_infoline( "Create second visual with Destroyed release policy");
-    Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED );
+  properties[Visual::Property::TYPE]     = Visual::IMAGE;
+  properties[Visual::Property::SHADER]   = shader;
+  properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
 
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  Visual::Base visual = factory.CreateVisual(properties);
 
-  tet_infoline( "Register visuals with control and ensure it has the only handles" );
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisualNever );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, imageVisualDestroyed );
-  imageVisualNever.Reset(); // reduce ref count so only the control keeps the visual alive.
-  imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive.
+  // trigger creation through setting on stage
+  DummyControl        dummy     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(dummy);
 
-  // Test initially zero renderers
   application.SendNotification();
-  application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  application.Render();
 
-  application.GetScene().Add( actor );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  Renderer        renderer = dummy.GetRendererAt(0);
+  Shader          shader2  = renderer.GetShader();
+  Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
 
-  application.SendNotification();
-  application.Render(0);
-  tet_infoline( "Ensure a texture is created, shared amongst both visuals.  Each visual has its own renderer" );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 2u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-  // Test renderer removed when visual destroyed
-  DALI_TEST_CHECK( actor.GetRendererCount() == 2u );
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL2 );  // TEST_VISUAL2 no longer requires the texture as release policy DESTROYED
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  application.SendNotification();
-  application.Render();
+  Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+  DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
 
-  // Test texture was not deleted as TEST_VISUAL release policy is NEVER so it is still required.
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
+  shader.Clear();
+
+  shader[Visual::Shader::Property::HINTS] = Shader::Hint::OUTPUT_IS_TRANSPARENT;
+  properties[Visual::Property::SHADER]    = shader;
+
+  Visual::Base visual1 = factory.CreateVisual(properties);
+
+  // trigger creation through setting on stage
+  DummyControl        dummy1     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl1 = static_cast<Impl::DummyControl&>(dummy1.GetImplementation());
+  dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual1);
+  dummy1.SetProperty(Actor::Property::SIZE, Vector2(200, 200));
+  dummy1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(dummy1);
+
+  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+  glAbstraction.EnableEnableDisableCallTrace(true);
 
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Ensure a texture is not deleted as second visual used the NEVER release policy" );
-  // Test texture was not deleted as TEST_VISUAL release policy is NEVER so it is still required.
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
+  TraceCallStack&    glEnableStack = glAbstraction.GetEnableDisableTrace();
+  std::ostringstream blendStr;
+  blendStr << std::hex << GL_BLEND;
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
 
   END_TEST;
 }
 
-int UtcDaliImageVisualReleasePolicy05(void)
+void ResourceReadyLoadNext(Control control)
 {
-  ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy05 Testing settung by string currents correct enum" );
-
-  VisualFactory factory = VisualFactory::Get();
-
-  Property::Map propertyMapNeverReleasePolicy;
-  propertyMapNeverReleasePolicy.Insert( Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMapNeverReleasePolicy.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
-  propertyMapNeverReleasePolicy.Insert( ImageVisual::Property::DESIRED_WIDTH,   20 );
-  propertyMapNeverReleasePolicy.Insert( ImageVisual::Property::DESIRED_HEIGHT,   30 );
-  propertyMapNeverReleasePolicy.Insert( "releasePolicy" , "never" );
+  static int callNumber = 0;
 
-  Visual::Base imageVisualNever = factory.CreateVisual( propertyMapNeverReleasePolicy );
+  gResourceReadySignalFired = true;
+  gReadyIds.push_back(control.GetProperty<int>(Actor::Property::ID));
 
-  Property::Map resultMap;
-  imageVisualNever.CreatePropertyMap( resultMap );
-  DALI_TEST_CHECK( ! resultMap.Empty() );
+  if(callNumber == 0)
+  {
+    DALI_TEST_EQUALS(control.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL), Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( ( resultMap.Find( ImageVisual::Property::RELEASE_POLICY ) )->Get<int>(), (int)ImageVisual::ReleasePolicy::NEVER, TEST_LOCATION );
+    tet_infoline("Create visual with loaded image from within the signal handler");
+    VisualFactory factory     = VisualFactory::Get();
+    Visual::Base  imageVisual = factory.CreateVisual(TEST_IMAGE_FILE_NAME, ImageDimensions{20, 30});
 
-  END_TEST;
+    Impl::DummyControl& controlImpl = static_cast<Impl::DummyControl&>(control.GetImplementation());
+    controlImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual); // This should trigger another signal.
+    callNumber = 1;
+  }
+  else
+  {
+    tet_infoline("3rd signal called");
+    DALI_TEST_CHECK(true);
+  }
 }
 
-int UtcDaliImageVisualReleasePolicy06(void)
+int UtcDaliImageVisualLoadReady01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy06 Never Policy, texture should not be affected by Disabling and Enabling visual" );
-
-  Visual::Base imageVisual= CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER );
-  DALI_TEST_CHECK( imageVisual );
+  tet_infoline("UtcDaliImageVisualLoadReady01");
+  tet_infoline("First part:  Load an image visual for one resource, then another image visual for a second resource.");
+  tet_infoline("Second part, In the ready signal for the second image visual, add a 3rd visual with the first URL");
+  tet_infoline("Should get a ready signal for all three visuals");
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  ClearReadyIds();
 
-  tet_infoline( "Register visual with control and ensure it has the only handle" );
-  DummyControl actor = DummyControl::New(true);
+  tet_infoline("Create a control and connect to resource ready signal");
+  DummyControl actor    = DummyControl::New(true);
+  int          actor1Id = actor.GetProperty<int>(Actor::Property::ID);
+  actor.ResourceReadySignal().Connect(&ResourceReadySignal);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+
+  tet_infoline("Create visual with IMMEDIATE load policy");
+  Visual::Base imageVisual1 = CreateVisualWithPolicy(TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  tet_infoline("Registering visual allows control to get a signal once loaded even if visual not enabled( staged )");
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual1);
 
+  tet_infoline("Allow image time to load");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
   application.SendNotification();
-  application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  application.Render();
 
-  application.GetScene().Add( actor );
+  tet_infoline("Testing texture is loaded and resource ready signal fired");
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gReadyIds[0], actor1Id, TEST_LOCATION);
 
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  tet_infoline("Original control correctly signalled, now testing failing image");
 
-  application.SendNotification();
-  application.Render(0);
-  // Test renderer and texture created
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  textureTrace.Reset();
+  gResourceReadySignalFired = false; // Reset signal check ready for testing next Control
+  ClearReadyIds();
 
-  tet_infoline( "Disable Visual and check texture not affected" );
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false );
-  application.SendNotification();
-  application.Render(0);
-  tet_infoline( "Check renderer is destroyed when visual off stage" );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
-  textureTrace.Reset();
+  Visual::Base imageVisual2 = CreateVisualWithPolicy(TEST_BROKEN_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE);
 
-  tet_infoline( "Re-enable Visual and check texture not affected" );
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, true );
-  application.SendNotification();
-  application.Render(0);
-  tet_infoline( "Check texture not affected and renderer is destroyed when visual off stage" );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  DummyControl        actor2     = DummyControl::New(true);
+  int                 actor2Id   = actor2.GetProperty<int>(Actor::Property::ID);
+  Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(actor2.GetImplementation());
+  actor2.ResourceReadySignal().Connect(&ResourceReadyLoadNext);
 
-  END_TEST;
-}
+  tet_infoline("Registering visual this should trigger the ready signal when the image fails to load");
+  dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual2);
 
-int UtcDaliImageVisualReleasePolicy07(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy07 Two visuals with different policies sharing a texture DETACHED and DESTROYED" );
+  actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor2);
 
-  tet_infoline( "Create first visual with DESTROYED release policy" );
-  Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED );
+  tet_infoline("Wait for loading thread to finish");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION);
 
+  DALI_TEST_EQUALS(gReadyIds[0], actor2Id, TEST_LOCATION);
 
-  tet_infoline( "Create second visual with DETACHED release policy");
-  Visual::Base imageVisualDetached = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DETACHED );
+  tet_infoline("Check for 3rd signal");
+  application.SendNotification();
+  DALI_TEST_EQUALS(gReadyIds.size(), 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(gReadyIds[1], actor2Id, TEST_LOCATION);
 
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  END_TEST;
+}
 
-  tet_infoline( "Register visuals with control and ensure it has the only handles" );
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisualDestroyed );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, imageVisualDetached );
-  imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive.
-  imageVisualDetached.Reset(); // reduce ref count so only the control keeps the visual alive.
+int UtcDaliImageVisualLoadImagePlanes01(void)
+{
+  EnvironmentVariable::SetTestEnvironmentVariable(LOAD_IMAGE_YUV_PLANES_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(ENABLE_DECODE_JPEG_TO_YUV_420_ENV, "1");
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  ToolkitTestApplication application;
 
-  // Test initially zero renderers
-  application.SendNotification();
-  application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  application.GetScene().Add( actor );
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_YUV420_IMAGE_FILE_NAME);
 
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  application.SendNotification();
-  application.Render(0);
-  tet_infoline( "Ensure a texture is created, shared amongst both visuals.  Each visual has its own renderer" );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 2u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
 
-  // Test renderer removed when visual destroyed
-  DALI_TEST_CHECK( actor.GetRendererCount() == 2u );
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL2, false );  // TEST_VISUAL2 no longer requires the texture as release policy DETACHED
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
   application.SendNotification();
   application.Render();
 
-  // Test texture was not deleted as TEST_VISUAL release policy is DESTROYED and is still required.
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Ensure a texture is not deleted as second visual used the DESTROYED release policy" );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 3, TEST_LOCATION);
+
+  Renderer renderer           = actor.GetRendererAt(0);
+  auto     preMultipliedAlpha = renderer.GetProperty<bool>(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA);
+  DALI_TEST_EQUALS(preMultipliedAlpha, false, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualReleasePolicy08(void)
+int UtcDaliImageVisualLoadImagePlanes02(void)
 {
+  EnvironmentVariable::SetTestEnvironmentVariable(LOAD_IMAGE_YUV_PLANES_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(ENABLE_DECODE_JPEG_TO_YUV_420_ENV, "1");
+
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualReleasePolicy08 Ensure TextureSet is same after detach/attach on stage when texture used the DESTROYED release policy" );
 
-  tet_infoline( "Create first visual with DESTROYED release policy" );
-  Visual::Base imageVisualDestroyed = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::DESTROYED );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  // Alpha masking case - not support yuv planes
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_YUV420_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ALPHA_MASK_URL, TEST_MASK_IMAGE_FILE_NAME);
 
-  tet_infoline( "Register visuals with control and ensure it has the only handles" );
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisualDestroyed );
-  imageVisualDestroyed.Reset(); // reduce ref count so only the control keeps the visual alive.
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
 
-  // Test initially zero renderers
   application.SendNotification();
-  application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
-  textureTrace.Reset();
+  application.Render();
 
-  application.GetScene().Add( actor );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
   application.SendNotification();
-  application.Render(0);
-  tet_infoline( "Ensure a texture is created" );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  textureTrace.Reset();
+  application.Render();
 
-  // Ensure TextureSet is same after detach/attach on stage when texture used the DESTROYED release policy
-  // 1. Get TextureSet
-  TextureSet textureSetBefore = actor.GetRendererAt( 0u ).GetTextures();
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 1, TEST_LOCATION);
 
-  // 2.Remove actor from stage. In this case, renderer also is deleted.
-  tet_infoline( "Remove actor from stage" );
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
-  application.SendNotification();
-  application.Render();
+  END_TEST;
+}
 
-  tet_infoline( "Ensure a texture is not deleted as visual used the DESTROYED release policy" );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 0, TEST_LOCATION );
-  textureTrace.Reset();
+int UtcDaliImageVisualLoadImagePlanes03(void)
+{
+  EnvironmentVariable::SetTestEnvironmentVariable(LOAD_IMAGE_YUV_PLANES_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(ENABLE_DECODE_JPEG_TO_YUV_420_ENV, "1");
 
-  // 3.Add actor in stage. In this case, renderer is created.
-  tet_infoline( "Add actor in stage" );
-  application.GetScene().Add( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  application.SendNotification();
-  application.Render();
-  tet_infoline( "Ensure a texture is not created again" );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION );
-  textureTrace.Reset();
+  ToolkitTestApplication application;
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  // 4.Compare Texture with before and after. textureSet need to be same because release policy is the DESTROYED.
-  tet_infoline( "Ensure a textureSet is not deleted because it is used the DESTROYED release policy" );
-  TextureSet textureSetAfter = actor.GetRendererAt( 0u ).GetTextures();
-  DALI_TEST_CHECK( textureSetBefore == textureSetAfter );
-  textureSetBefore.Reset();
-  textureSetAfter.Reset();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_YUV420_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
 
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 3, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualLoadPolicy01(void)
+int UtcDaliImageVisualLoadFastTrackImage01(void)
 {
+  tet_infoline("Test worker thread uploading with Local URL");
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualLoadPolicy01 Load a visual image before attaching to stage" );
 
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  Test::TextureUploadManager::InitalizeGraphicsController(application.GetGraphicsController());
 
-  tet_infoline( "Create visual with IMMEDIATE load policy" );
   VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH,   20 );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT,   30 );
-  propertyMap.Insert( "loadPolicy" , ImageVisual::LoadPolicy::IMMEDIATE );
+  // Pair of filename - expect GenTextures count.
+  std::vector<std::pair<std::string, int>> testCases = {
+    {TEST_IMAGE_FILE_NAME, 1},
+    {TEST_REMOTE_IMAGE_FILE_NAME, 1},
+    {TEST_INVALID_FILE_NAME, 0},
+  };
 
-  Visual::Base imageVisual = factory.CreateVisual( propertyMap );
+  for(auto&& tc : testCases)
+  {
+    auto& filename    = tc.first;
+    auto& expectValue = tc.second;
 
-  Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
-  DALI_TEST_CHECK( ! resultMap.Empty() );
-  DALI_TEST_EQUALS( ( resultMap.Find( ImageVisual::Property::LOAD_POLICY ) )->Get<int>(), (int)ImageVisual::LoadPolicy::IMMEDIATE, TEST_LOCATION );
+    tet_printf("Test %s\n", filename.c_str());
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    Property::Map propertyMap;
+    propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, filename.c_str());
+    propertyMap.Insert(DevelImageVisual::Property::FAST_TRACK_UPLOADING, true);
 
-  // Ensure texture has been uploaded
-  application.SendNotification();
-  application.Render();
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-  tet_infoline( "Ensure texture loading starts after visual created" );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  textureTrace.Reset();
+    DummyControl      actor     = DummyControl::New();
+    DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+    dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  tet_infoline( "Register visuals with control and ensure it has the only handles" );
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
-  application.GetScene().Add( actor );
-  tet_infoline( "Ensure nothing triggers another load as texure already loaded" );
-  const unsigned int TIME_OUT_3_SECONDS = 3;
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, TIME_OUT_3_SECONDS ), false, TEST_LOCATION );
+    application.GetScene().Add(actor);
 
-  application.SendNotification();
-  application.Render();
+    application.SendNotification();
+    application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
+    // EventThread without callback
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 30, false), true, TEST_LOCATION);
 
-  // Ensure texture is deleted when no longer needed (ref count was correct )
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION);
 
-  application.SendNotification();
-  application.Render();
+    {
+      // TODO : There is no way to flush TextureUploadManager in test-application's Render() now.
+      // How can we make it? Should it be integration-api?
+      auto textureUploadManager = Dali::Devel::TextureUploadManager::Get();
+      DALI_TEST_EQUALS(textureUploadManager.ResourceUpload(), expectValue > 0, TEST_LOCATION);
+    }
+    // Render only without SendNotification(). And check whether glTexImage2D called or not.
+    application.Render();
+
+    DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), expectValue, TEST_LOCATION);
+
+    application.SendNotification();
+    application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+    textureTrace.Reset();
+  }
 
   END_TEST;
 }
 
-int UtcDaliImageVisualLoadPolicy02(void)
+int UtcDaliImageVisualLoadFastTrackImage02(void)
 {
+  tet_infoline("Test worker thread uploading with Local URL");
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualLoadPolicy01 Load a visual image only after attached to stage" );
 
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  Test::TextureUploadManager::InitalizeGraphicsController(application.GetGraphicsController());
 
-  tet_infoline( "Create visual with IMMEDIATE load policy" );
-  Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  const unsigned int TIME_OUT_3_SECONDS = 3;
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, TIME_OUT_3_SECONDS ), false, TEST_LOCATION );
+  {
+    auto filename    = std::string(TEST_IMAGE_FILE_NAME);
+    auto expectValue = 1;
 
-  // Act on meeage queue even although nothing expected to load
-  application.SendNotification();
-  application.Render();
+    tet_printf("Test %s\n", filename.c_str());
 
-  tet_infoline( "Ensure texture is not generated yet" );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
-  textureTrace.Reset();
+    Property::Map propertyMap;
+    propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, filename.c_str());
+    propertyMap.Insert("fastTrackUploading", true);
 
-  tet_infoline( "Register visuals with control and ensure it has the only handles" );
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
-  application.GetScene().Add( actor );
-  tet_infoline( "Allow image time to load" );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DummyControl      actor     = DummyControl::New();
+    DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+    dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
-  application.SendNotification();
-  application.Render();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
 
-  tet_infoline( "Ensure texture generated and renderer created" );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+    application.GetScene().Add(actor);
 
-  // Ensure texture is delete when no longer needed
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    application.SendNotification();
+    application.Render();
 
-  application.SendNotification();
-  application.Render();
+    // EventThread without callback
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 30, false), true, TEST_LOCATION);
+
+    DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION);
+
+    {
+      // TODO : There is no way to flush TextureUploadManager in test-application's Render() now.
+      // How can we make it? Should it be integration-api?
+      auto textureUploadManager = Dali::Devel::TextureUploadManager::Get();
+      DALI_TEST_EQUALS(textureUploadManager.ResourceUpload(), expectValue > 0, TEST_LOCATION);
+    }
+    // Render only without SendNotification(). And check whether glTexImage2D called or not.
+    application.Render();
+
+    DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), expectValue, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( textureTrace.CountMethod("DeleteTextures"), 1, TEST_LOCATION );
+    application.SendNotification();
+    application.Render();
+
+    textureTrace.Reset();
+  }
 
   END_TEST;
 }
 
-int UtcDaliImageVisualLoadPolicy03(void)
+int UtcDaliImageVisualLoadFastTrackImageResourceReady(void)
 {
+  tet_infoline("Test worker thread uploading with Local URL");
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualLoadPolicy03 Load a visual image and receive ResourceReady Signal when loaded" );
 
-  const bool VISUAL_NOT_ENABLED( false ); // Instead of just passing 'false' into an API.
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert(DevelImageVisual::Property::FAST_TRACK_UPLOADING, true);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  tet_infoline( "Create a control and connect to resource ready signal without adding to stage" );
-  DummyControl actor = DummyControl::New(true);
-  actor.ResourceReadySignal().Connect( &ResourceReadySignal);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  application.GetScene().Add(actor);
 
-  tet_infoline( "Create visual with IMMEDIATE load policy" );
-  Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE );
+  application.SendNotification();
+  application.Render();
 
-  tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( not staged )" );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+  // EventThread with callback
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  tet_infoline( "Allow image time to load resource" );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  // Check resource ready comes after
   application.SendNotification();
   application.Render();
 
-  // Ensure texture has been uploaded
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualLoadPolicy04(void)
+int UtcDaliImageVisualLoadFastTrackImageReload(void)
 {
+  tet_infoline("Test worker thread uploading with Local URL");
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualLoadPolicy04 First part  Load a visual image before attaching to stage");
-  tet_infoline( "Second part, Reuse the same image in aonther control and check resource ready signal fired" );
 
-  const bool VISUAL_NOT_ENABLED( false ); // Instead of just passing false into an API.
+  Test::TextureUploadManager::InitalizeGraphicsController(application.GetGraphicsController());
 
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  tet_infoline( "Create a control and connect to resource ready signal" );
-  DummyControl actor = DummyControl::New(true);
-  actor.ResourceReadySignal().Connect( &ResourceReadySignal);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert(DevelImageVisual::Property::FAST_TRACK_UPLOADING, true);
 
-  tet_infoline( "Create visual with IMMEDIATE load policy" );
-  Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( staged )" );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual, VISUAL_NOT_ENABLED );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  application.GetScene().Add(actor);
 
-  tet_infoline( "Allow image time to load" );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Testing texture is loaded and resource ready signal fired" );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  // EventThread without callback
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 30, false), true, TEST_LOCATION);
 
-  tet_infoline( "Original control correctly signalled, now testing for signal with new Control reusing the image" );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION);
 
-  gResourceReadySignalFired = false; // Reset signal check ready for testing next Control
-  Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE );
-  DummyControl actor2 = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  actor2.ResourceReadySignal().Connect( &ResourceReadySignal);
+  {
+    // TODO : There is no way to flush TextureUploadManager in test-application's Render() now.
+    // How can we make it? Should it be integration-api?
+    auto textureUploadManager = Dali::Devel::TextureUploadManager::Get();
+    DALI_TEST_EQUALS(textureUploadManager.ResourceUpload(), true, TEST_LOCATION);
+  }
+  // Render only without SendNotification(). And check whether glTexImage2D called or not.
+  application.Render();
 
-  tet_infoline( "Registering visual this should trigger the loading signal as is already image loaded for previous control" );
-  dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual2 );
-  imageVisual2.Reset(); // reduce ref count so only the control keeps the visual alive.
-  actor2.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 0 ), true, TEST_LOCATION ); // Not expecting any further loading as texture is being reused.
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 1, TEST_LOCATION);
+
+  // Reload
+  Property::Map attributes;
+  DevelControl::DoAction(actor, Control::CONTROL_PROPERTY_END_INDEX + 1, DevelImageVisual::Action::RELOAD, attributes);
+
+  // EventThread with callback
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  // Check resource ready comes after
+  application.SendNotification();
+  application.Render();
+
+  // Check whether renderer count is 1 or not.
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliImageVisualLoadPolicy05(void)
+int UtcDaliImageVisualLoadFastTrackImagePlanes01(void)
 {
+  EnvironmentVariable::SetTestEnvironmentVariable(LOAD_IMAGE_YUV_PLANES_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(ENABLE_DECODE_JPEG_TO_YUV_420_ENV, "1");
+
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualLoadPolicy05 LoadPolicy::ATTACHED (default) First part  Load a visual image before attaching to stage");
-  tet_infoline( "Second part, Reuse the same image in aonther control and check resource ready signal fired" );
-  // Set up trace debug
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
-  textureTrace.Enable(true);
 
-  tet_infoline( "Create a control and connect to resource ready signal" );
-  DummyControl actor = DummyControl::New(true);
-  actor.ResourceReadySignal().Connect( &ResourceReadySignal);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
-  application.GetScene().Add( actor );
+  Test::TextureUploadManager::InitalizeGraphicsController(application.GetGraphicsController());
 
-  tet_infoline( "Create visual with ATTACHED load policy" );
-  Visual::Base imageVisual = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED );
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  tet_infoline( "Registering visual allows control to get a signal once loaded" );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  imageVisual.Reset(); // reduce ref count so only the control keeps the visual alive.
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_YUV420_IMAGE_FILE_NAME);
+  propertyMap.Insert(DevelImageVisual::Property::FAST_TRACK_UPLOADING, true);
+
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  application.GetScene().Add(actor);
 
-  tet_infoline( "Allow image time to load" );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Testing texture is loaded and resource ready signal fired" );
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  // EventThread without callback
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 30, false), true, TEST_LOCATION);
 
-  tet_infoline( "Original control correctly signalled, now testing for signal with new Control reusing the image" );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION);
 
-  gResourceReadySignalFired = false; // Reset signal check ready for testing next Control
-  Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::ATTACHED );
-  DummyControl actor2 = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  actor2.ResourceReadySignal().Connect( &ResourceReadySignal);
+  {
+    // TODO : There is no way to flush TextureUploadManager in test-application's Render() now.
+    // How can we make it? Should it be integration-api?
+    auto textureUploadManager = Dali::Devel::TextureUploadManager::Get();
+    textureUploadManager.ResourceUpload();
+    application.Render();
+  }
+  // Render only without SendNotification(). And check whether glTexImage2D called or not.
+  application.Render();
 
-  tet_infoline( "Registering visual this should trigger the loading signal as is already image loaded for previous control" );
-  dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual2 );
-  imageVisual2.Reset(); // reduce ref count so only the control keeps the visual alive.
-  actor2.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 0 ), true, TEST_LOCATION ); // Not expecting any further loading as texture is being reused.
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 3, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
 
   END_TEST;
 }
 
-
-int UtcDaliImageVisualOrientationCorrection(void)
+int UtcDaliImageVisualLoadFastTrackImagePlanes02(void)
 {
+  EnvironmentVariable::SetTestEnvironmentVariable(LOAD_IMAGE_YUV_PLANES_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(ENABLE_DECODE_JPEG_TO_YUV_420_ENV, "1");
+
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualOrientationCorrection Enabling OrientationCorrection should rotate an image with exif (90deg) orientation data with requested" );
+
+  Test::TextureUploadManager::InitalizeGraphicsController(application.GetGraphicsController());
 
   VisualFactory factory = VisualFactory::Get();
-  tet_infoline( "Create visual with Orientation correction set OFF" );
+  DALI_TEST_CHECK(factory);
+
   Property::Map propertyMap;
-  propertyMap.Insert( Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_ROTATED_IMAGE );
-  propertyMap.Insert( "orientationCorrection", false );
-  Visual::Base imageVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert(DevelImageVisual::Property::FAST_TRACK_UPLOADING, true);
 
-  tet_infoline( "Create control for visual, need to loaded it" );
-  DummyControl actor = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  application.GetScene().Add( actor );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  application.GetScene().Add(actor);
 
-  Vector2 originalImageSize;
-  tet_infoline( "Get size of original visual to compare later with rotated image" );
-  imageVisual.GetNaturalSize( originalImageSize );
-  DALI_TEST_GREATER( originalImageSize.width, originalImageSize.height, TEST_LOCATION ); // Width and Height must be different for this test.
-  imageVisual.Reset();  // remove handle so can unregister it and remove from cache
-  dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Create visual with Orientation correction set ON " );
-  propertyMap.Clear();
-  propertyMap.Insert( Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_ROTATED_IMAGE );
-  propertyMap.Insert( ImageVisual::Property::ORIENTATION_CORRECTION, true );
-  imageVisual = factory.CreateVisual( propertyMap );
+  // EventThread without callback
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 30, false), true, TEST_LOCATION);
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
-  // Wait for image to load
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION);
 
-  Vector2 rotatedImageSize;
-  imageVisual.GetNaturalSize( rotatedImageSize );
-  tet_infoline( "Confirm that visual has rotated" );
-  DALI_TEST_EQUALS( originalImageSize.width, rotatedImageSize.height , TEST_LOCATION );
-  DALI_TEST_EQUALS( originalImageSize.height, rotatedImageSize.width , TEST_LOCATION );
+  {
+    // TODO : There is no way to flush TextureUploadManager in test-application's Render() now.
+    // How can we make it? Should it be integration-api?
+    auto textureUploadManager = Dali::Devel::TextureUploadManager::Get();
+    textureUploadManager.ResourceUpload();
+    application.Render();
+  }
+  // Render only without SendNotification(). And check whether glTexImage2D called or not.
+  application.Render();
 
-  Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  DALI_TEST_GREATER(textureTrace.CountMethod("GenTextures"), 0, TEST_LOCATION);
 
-  // check the Property::ORIENTATION_CORRECTION value from the returned map
-  Property::Value* typeValue = resultMap.Find( ImageVisual::Property::ORIENTATION_CORRECTION,  Property::BOOLEAN );
-  DALI_TEST_EQUALS( typeValue->Get<bool>(), true, TEST_LOCATION );
+  application.SendNotification();
+  application.Render();
 
   END_TEST;
 }
 
-int UtcDaliImageVisualCustomShader(void)
+int UtcDaliImageVisualDebugImageVisualShaderP1(void)
 {
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME_ENV, "validFile"); // Try to load not exist file.
+
+  // Set valid script file
+  Test::StyleMonitor::SetThemeFileOutput("validFile", VALID_DEBUG_SHADER_SCRIPT);
+
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualCustomShader Test custom shader" );
 
   VisualFactory factory = VisualFactory::Get();
-  Property::Map properties;
-  Property::Map shader;
-  const std::string vertexShader = "Foobar";
-  const std::string fragmentShader = "Foobar";
-  shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-  shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
-
-  properties[Visual::Property::TYPE] = Visual::IMAGE;
-  properties[Visual::Property::SHADER] = shader;
-  properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
+  DALI_TEST_CHECK(factory);
 
-  Visual::Base visual = factory.CreateVisual( properties );
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
 
-  // trigger creation through setting on stage
-  DummyControl dummy = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( dummy );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-
-  Renderer renderer = dummy.GetRendererAt( 0 );
-  Shader shader2 = renderer.GetShader();
-  Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
-
-  Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-  DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
-
-  Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-  DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
-
-  shader.Clear();
-
-  shader[Visual::Shader::Property::HINTS] = Shader::Hint::OUTPUT_IS_TRANSPARENT;
-  properties[Visual::Property::SHADER] = shader;
-
-  Visual::Base visual1 = factory.CreateVisual( properties );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  // trigger creation through setting on stage
-  DummyControl dummy1 = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl1 = static_cast< Impl::DummyControl& >( dummy1.GetImplementation() );
-  dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual1 );
-  dummy1.SetProperty( Actor::Property::SIZE, Vector2( 200, 200 ) );
-  dummy1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( dummy1 );
-
-  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  glAbstraction.EnableEnableDisableCallTrace( true );
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
   application.SendNotification();
   application.Render();
 
-  TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace();
-  std::ostringstream blendStr;
-  blendStr << std::hex << GL_BLEND;
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-void ResourceReadyLoadNext( Control control )
+int UtcDaliImageVisualDebugImageVisualShaderN1(void)
 {
-  static int callNumber = 0;
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME_ENV, "notJsonFile"); // Try to load exist file, but not a json
 
-  gResourceReadySignalFired = true;
-  gReadyIds.push_back(control.GetProperty< int >( Actor::Property::ID ));
-
-  if( callNumber == 0 )
-  {
-    DALI_TEST_EQUALS( control.GetVisualResourceStatus(DummyControl::Property::TEST_VISUAL), Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION );
+  // Set invalid script file
+  Test::StyleMonitor::SetThemeFileOutput("notJsonFile", "1");
 
-    tet_infoline( "Create visual with loaded image from within the signal handler" );
-    VisualFactory factory = VisualFactory::Get();
-    Visual::Base imageVisual = factory.CreateVisual( TEST_IMAGE_FILE_NAME, ImageDimensions{20,30} );
+  ToolkitTestApplication application;
 
-    Impl::DummyControl& controlImpl = static_cast<Impl::DummyControl&>(control.GetImplementation());
-    controlImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual ); // This should trigger another signal.
-    callNumber = 1;
-  }
-  else
-  {
-    tet_infoline( "3rd signal called" );
-    DALI_TEST_CHECK(true);
-  }
-}
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-int UtcDaliImageVisualLoadReady01(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( "UtcDaliImageVisualLoadReady01");
-  tet_infoline( "First part:  Load an image visual for one resource, then another image visual for a second resource.");
-  tet_infoline( "Second part, In the ready signal for the second image visual, add a 3rd visual with the first URL" );
-  tet_infoline( "Should get a ready signal for all three visuals");
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
 
-  ClearReadyIds();
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  tet_infoline( "Create a control and connect to resource ready signal" );
-  DummyControl actor = DummyControl::New(true);
-  int actor1Id = actor.GetProperty< int >( Actor::Property::ID );
-  actor.ResourceReadySignal().Connect( &ResourceReadySignal);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
   application.GetScene().Add(actor);
 
-  tet_infoline( "Create visual with IMMEDIATE load policy" );
-  Visual::Base imageVisual1 = CreateVisualWithPolicy( TEST_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE );
+  application.SendNotification();
+  application.Render();
 
-  tet_infoline( "Registering visual allows control to get a signal once loaded even if visual not enabled( staged )" );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual1 );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  tet_infoline( "Allow image time to load" );
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Testing texture is loaded and resource ready signal fired" );
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( gReadyIds[0], actor1Id, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 1, TEST_LOCATION);
 
+  END_TEST;
+}
 
-  tet_infoline( "Original control correctly signalled, now testing failing image" );
+int UtcDaliImageVisualDebugImageVisualShaderN2(void)
+{
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_ENV, "1");
+  EnvironmentVariable::SetTestEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME_ENV, std::string(THROW_EXCEPTION_STYLE_FILE_NAME).c_str()); // Try to load file that throw some exception
 
-  gResourceReadySignalFired = false; // Reset signal check ready for testing next Control
-  ClearReadyIds();
+  // Set throw exception script file
+  Test::StyleMonitor::SetThemeFileOutput(std::string(THROW_EXCEPTION_STYLE_FILE_NAME), "1");
 
-  Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_BROKEN_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE );
+  ToolkitTestApplication application;
 
-  DummyControl actor2 = DummyControl::New(true);
-  int actor2Id = actor2.GetProperty< int >( Actor::Property::ID );
-  Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(actor2.GetImplementation());
-  actor2.ResourceReadySignal().Connect( &ResourceReadyLoadNext);
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
 
-  tet_infoline( "Registering visual this should trigger the ready signal when the image fails to load" );
-  dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual2 );
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
 
-  actor2.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
-  application.GetScene().Add(actor2);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
 
-  tet_infoline( "Wait for loading thread to finish");
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( gReadyIds[0], actor2Id, TEST_LOCATION);
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
 
-  tet_infoline( "Check for 3rd signal");
   application.SendNotification();
-  DALI_TEST_EQUALS( gReadyIds.size(), 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( gReadyIds[1], actor2Id, TEST_LOCATION);
+  application.Render();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsResourceReady(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(textureTrace.CountMethod("GenTextures"), 1, TEST_LOCATION);
 
   END_TEST;
-}
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp
index c1ada404..d791ff1 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,30 +15,28 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-const unsigned int TOTAL_ITEM_NUMBER = 200;
-const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg";
-
+const unsigned int TOTAL_ITEM_NUMBER    = 200;
+const char*        TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg";
 
 // Implementation of ItemFactory for providing actors to ItemView
 class TestItemFactory : public ItemFactory
 {
 public:
-
   /**
    * Constructor
    * @param application class, stored as reference
@@ -55,7 +53,6 @@ public:
   }
 
 public: // From ItemFactory
-
   /**
    * Query the number of items available from the factory.
    * The maximum available item has an ID of GetNumberOfItems() - 1.
@@ -73,7 +70,7 @@ public: // From ItemFactory
   virtual Actor NewItem(unsigned int itemId)
   {
     // Create a renderable actor for this item
-    return ImageView::New( TEST_IMAGE_FILE_NAME );
+    return ImageView::New(TEST_IMAGE_FILE_NAME);
   }
 };
 
@@ -85,7 +82,6 @@ typedef IntrusivePtr<TestItemLayout> TestItemLayoutPtr;
 class TestItemLayout : public ItemLayout
 {
 public:
-
   /**
    * Constructor
    */
@@ -109,7 +105,6 @@ public:
   }
 
 public: // From ItemLayout
-
   /**
    * Query the minimum valid layout position; this is a negative value.
    *
@@ -178,7 +173,7 @@ public: // From ItemLayout
    * @param[in] layoutSize The layout size
    * @param[out] itemSize The target size of an item.
    */
-  virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const
+  virtual void GetDefaultItemSize(unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize) const
   {
   }
 
@@ -188,7 +183,7 @@ public: // From ItemLayout
    */
   virtual Degree GetScrollDirection() const
   {
-    return Degree( 0.0f );
+    return Degree(0.0f);
   }
 
   /**
@@ -226,7 +221,7 @@ public: // From ItemLayout
    * @param[in] layoutSize the current size of the item view instance.
    * @param[in] itemViewActor The item view instance which requests the application of constraints.
    */
-  virtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor )
+  virtual void ApplyConstraints(Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor)
   {
   }
 
@@ -252,10 +247,10 @@ int UtcDaliItemLayoutSetAndGetOrientation(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
 
   // Set the orientation of the layout to be horizontal from left to right
@@ -289,21 +284,21 @@ int UtcDaliItemLayoutSetAndGetOrientation(void)
   DALI_TEST_CHECK(flickSpeedFactor != 0.0f);
 
   // White box test here: -( itemId / NoOfItemsPerRow(default 4) ) * NoOfItemsPerRow
-  DALI_TEST_EQUALS( -1.0f, gridLayout->GetItemScrollToPosition( 1 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(-1.0f, gridLayout->GetItemScrollToPosition(1), TEST_LOCATION);
 
-  ItemLayoutPtr depthLayout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemLayoutPtr depthLayout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
   view.AddLayout(*depthLayout);
 
   layout = view.GetLayout(1);
   DALI_TEST_CHECK(depthLayout == layout);
 
-  ItemLayoutPtr listLayout = DefaultItemLayout::New( DefaultItemLayout::LIST );
+  ItemLayoutPtr listLayout = DefaultItemLayout::New(DefaultItemLayout::LIST);
   view.AddLayout(*listLayout);
 
   layout = view.GetLayout(2);
   DALI_TEST_CHECK(listLayout == layout);
 
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
   view.AddLayout(*spiralLayout);
 
   layout = view.GetLayout(3);
@@ -315,9 +310,9 @@ int UtcDaliItemLayoutGetExtension(void)
 {
   ToolkitTestApplication application;
 
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
-  DALI_TEST_CHECK( gridLayout );
-  DALI_TEST_CHECK( !gridLayout->GetExtension() );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
+  DALI_TEST_CHECK(gridLayout);
+  DALI_TEST_CHECK(!gridLayout->GetExtension());
 
   END_TEST;
 }
@@ -327,9 +322,9 @@ int UtcDaliItemLayoutGetClosestOnScreenLayoutPosition(void)
   ToolkitTestApplication application;
 
   TestItemLayoutPtr layout = TestItemLayout::New();
-  DALI_TEST_CHECK( layout );
-  DALI_TEST_EQUALS(layout->GetClosestOnScreenLayoutPosition(0, 0.0f, Vector3::ZERO), 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS(layout->GetClosestOnScreenLayoutPosition(0, 0.0f, Vector3(-800.0f, -1200.0f, 0.0f)), 0.0f, TEST_LOCATION );
+  DALI_TEST_CHECK(layout);
+  DALI_TEST_EQUALS(layout->GetClosestOnScreenLayoutPosition(0, 0.0f, Vector3::ZERO), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(layout->GetClosestOnScreenLayoutPosition(0, 0.0f, Vector3(-800.0f, -1200.0f, 0.0f)), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -339,9 +334,9 @@ int UtcDaliItemLayoutGetNextFocusItemID(void)
   ToolkitTestApplication application;
 
   TestItemLayoutPtr layout = TestItemLayout::New();
-  DALI_TEST_CHECK( layout );
-  DALI_TEST_EQUALS(layout->GetNextFocusItemID(0, 100, Control::KeyboardFocus::LEFT, true), 99, TEST_LOCATION );
-  DALI_TEST_EQUALS(layout->GetNextFocusItemID(110, 100, Control::KeyboardFocus::RIGHT, true), 0, TEST_LOCATION );
+  DALI_TEST_CHECK(layout);
+  DALI_TEST_EQUALS(layout->GetNextFocusItemID(0, 100, Control::KeyboardFocus::LEFT, true), 99, TEST_LOCATION);
+  DALI_TEST_EQUALS(layout->GetNextFocusItemID(110, 100, Control::KeyboardFocus::RIGHT, true), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -352,25 +347,25 @@ int UtcDaliItemLayoutSetAndGetLayoutProperties(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
 
   // Set the property of the grid layout
   Property::Map gridLayoutProperty;
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::GRID) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::ITEM_SIZE, Dali::Property::Value(Vector3(200, 200,50)) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_ROW_SPACING, Dali::Property::Value(50.0f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_COLUMN_NUMBER, Dali::Property::Value(4) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_COLUMN_SPACING, Dali::Property::Value(50.0f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_TOP_MARGIN, Dali::Property::Value(95.0f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_BOTTOM_MARGIN, Dali::Property::Value(20.0f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_SIDE_MARGIN, Dali::Property::Value(20.0f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_SCROLL_SPEED_FACTOR, Dali::Property::Value(0.03f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_ITEM_FLICK_ANIMATION_DURATION, Dali::Property::Value(0.015f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_MAXIMUM_SWIPE_SPEED, Dali::Property::Value(100.0f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::ORIENTATION, Dali::Property::Value((int)ControlOrientation::Up) );
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::GRID));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::ITEM_SIZE, Dali::Property::Value(Vector3(200, 200, 50)));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_ROW_SPACING, Dali::Property::Value(50.0f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_COLUMN_NUMBER, Dali::Property::Value(4));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_COLUMN_SPACING, Dali::Property::Value(50.0f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_TOP_MARGIN, Dali::Property::Value(95.0f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_BOTTOM_MARGIN, Dali::Property::Value(20.0f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_SIDE_MARGIN, Dali::Property::Value(20.0f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_SCROLL_SPEED_FACTOR, Dali::Property::Value(0.03f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_ITEM_FLICK_ANIMATION_DURATION, Dali::Property::Value(0.015f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_MAXIMUM_SWIPE_SPEED, Dali::Property::Value(100.0f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::ORIENTATION, Dali::Property::Value((int)ControlOrientation::Up));
   gridLayout->SetLayoutProperties(gridLayoutProperty);
 
   view.AddLayout(*gridLayout);
@@ -379,81 +374,81 @@ int UtcDaliItemLayoutSetAndGetLayoutProperties(void)
   Property::Map firstLayout = gridLayout->GetLayoutProperties();
 
   //Check all the properties of grid layout
-  DALI_TEST_EQUALS( gridLayoutProperty.Count(), firstLayout.Count(), TEST_LOCATION );
+  DALI_TEST_EQUALS(gridLayoutProperty.Count(), firstLayout.Count(), TEST_LOCATION);
 
-  for( unsigned int mapIdx = 0, mapCount = firstLayout.Count(); mapIdx < mapCount; ++mapIdx )
+  for(unsigned int mapIdx = 0, mapCount = firstLayout.Count(); mapIdx < mapCount; ++mapIdx)
   {
-    KeyValuePair propertyPair( firstLayout.GetKeyValue( mapIdx ) );
+    KeyValuePair propertyPair(firstLayout.GetKeyValue(mapIdx));
     if(propertyPair.first == DefaultItemLayoutProperty::TYPE)
     {
       int layoutType = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS( layoutType, (int)DefaultItemLayout::GRID, TEST_LOCATION );
+      DALI_TEST_EQUALS(layoutType, (int)DefaultItemLayout::GRID, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::ITEM_SIZE)
     {
       Vector3 size = propertyPair.second.Get<Vector3>();
-      DALI_TEST_EQUALS( size, Vector3(200, 200,50), TEST_LOCATION );
+      DALI_TEST_EQUALS(size, Vector3(200, 200, 50), TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_ROW_SPACING)
     {
       float rowSpacing = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS( rowSpacing, 50.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(rowSpacing, 50.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_COLUMN_NUMBER)
     {
       int number = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS(number, 4, TEST_LOCATION );
+      DALI_TEST_EQUALS(number, 4, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_COLUMN_SPACING)
     {
       float columnSpacing = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(columnSpacing, 50.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(columnSpacing, 50.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_TOP_MARGIN)
     {
       float topMargin = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(topMargin, 95.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(topMargin, 95.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_BOTTOM_MARGIN)
     {
       float bottomMargin = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(bottomMargin, 20.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(bottomMargin, 20.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_SIDE_MARGIN)
     {
       float sideMargin = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(sideMargin, 20.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(sideMargin, 20.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_SCROLL_SPEED_FACTOR)
     {
       float scrollSpeedFactor = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(scrollSpeedFactor, 0.03f, TEST_LOCATION );
+      DALI_TEST_EQUALS(scrollSpeedFactor, 0.03f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_ITEM_FLICK_ANIMATION_DURATION)
     {
       float animationDuration = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(animationDuration, 0.015f, TEST_LOCATION );
+      DALI_TEST_EQUALS(animationDuration, 0.015f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_MAXIMUM_SWIPE_SPEED)
     {
       float swipSpeed = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(swipSpeed, 100.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(swipSpeed, 100.0f, TEST_LOCATION);
     }
   }
-  ItemLayoutPtr depthLayout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemLayoutPtr depthLayout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
 
   // Set the property of the depth layout
   Property::Map depthLayoutProperty;
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::DEPTH) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_COLUMN_NUMBER, Dali::Property::Value(3) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_ROW_NUMBER, Dali::Property::Value(26.0f) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_ROW_SPACING, Dali::Property::Value(55.0f) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_TILT_ANGLE, Dali::Property::Value(Math::PI*0.15f) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_ITEM_TILT_ANGLE, Dali::Property::Value(-Math::PI*0.025f ) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_SCROLL_SPEED_FACTOR, Dali::Property::Value(0.02f) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_ITEM_FLICK_ANIMATION_DURATION, Dali::Property::Value(0.03f) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_MAXIMUM_SWIPE_SPEED, Dali::Property::Value(50.0f) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::ORIENTATION, Dali::Property::Value((int)ControlOrientation::Up) );
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::DEPTH));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_COLUMN_NUMBER, Dali::Property::Value(3));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_ROW_NUMBER, Dali::Property::Value(26.0f));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_ROW_SPACING, Dali::Property::Value(55.0f));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_TILT_ANGLE, Dali::Property::Value(Math::PI * 0.15f));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_ITEM_TILT_ANGLE, Dali::Property::Value(-Math::PI * 0.025f));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_SCROLL_SPEED_FACTOR, Dali::Property::Value(0.02f));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_ITEM_FLICK_ANIMATION_DURATION, Dali::Property::Value(0.03f));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_MAXIMUM_SWIPE_SPEED, Dali::Property::Value(50.0f));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::ORIENTATION, Dali::Property::Value((int)ControlOrientation::Up));
   depthLayout->SetLayoutProperties(depthLayoutProperty);
 
   view.AddLayout(*depthLayout);
@@ -463,79 +458,79 @@ int UtcDaliItemLayoutSetAndGetLayoutProperties(void)
   Property::Map secondLayout = depthLayout->GetLayoutProperties();
 
   //Check all the properties of grid layout
-  DALI_TEST_EQUALS( depthLayoutProperty.Count(), secondLayout.Count(), TEST_LOCATION );
-  for( unsigned int mapIdx = 0, mapCount = secondLayout.Count(); mapIdx < mapCount; ++mapIdx )
+  DALI_TEST_EQUALS(depthLayoutProperty.Count(), secondLayout.Count(), TEST_LOCATION);
+  for(unsigned int mapIdx = 0, mapCount = secondLayout.Count(); mapIdx < mapCount; ++mapIdx)
   {
-    KeyValuePair propertyPair( secondLayout.GetKeyValue( mapIdx ) );
+    KeyValuePair propertyPair(secondLayout.GetKeyValue(mapIdx));
     if(propertyPair.first == DefaultItemLayoutProperty::TYPE)
     {
       int layoutType = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS( layoutType, (int)DefaultItemLayout::DEPTH, TEST_LOCATION );
+      DALI_TEST_EQUALS(layoutType, (int)DefaultItemLayout::DEPTH, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::ORIENTATION)
     {
       int orientation = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS(orientation, (int)ControlOrientation::Up, TEST_LOCATION );
+      DALI_TEST_EQUALS(orientation, (int)ControlOrientation::Up, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::ITEM_SIZE)
     {
       Vector3 size = propertyPair.second.Get<Vector3>();
-      DALI_TEST_EQUALS( size, Vector3(200, 200,50), TEST_LOCATION );
+      DALI_TEST_EQUALS(size, Vector3(200, 200, 50), TEST_LOCATION);
     }
 
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_COLUMN_NUMBER)
     {
       int columnNumber = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS( columnNumber, 3, TEST_LOCATION );
+      DALI_TEST_EQUALS(columnNumber, 3, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_ROW_NUMBER)
     {
       float rowNumber = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(rowNumber, 26.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(rowNumber, 26.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_ROW_SPACING)
     {
       float rowSpacing = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(rowSpacing, 55.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(rowSpacing, 55.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_TILT_ANGLE)
     {
       float tiltAngle = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(tiltAngle, Math::PI*0.15f, TEST_LOCATION );
+      DALI_TEST_EQUALS(tiltAngle, Math::PI * 0.15f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_ITEM_TILT_ANGLE)
     {
       float itemTiltAngle = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(itemTiltAngle, -Math::PI*0.025f, TEST_LOCATION );
+      DALI_TEST_EQUALS(itemTiltAngle, -Math::PI * 0.025f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_SCROLL_SPEED_FACTOR)
     {
       float scrollSpeedFactor = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(scrollSpeedFactor, 0.02f, TEST_LOCATION );
+      DALI_TEST_EQUALS(scrollSpeedFactor, 0.02f, TEST_LOCATION);
     }
 
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_ITEM_FLICK_ANIMATION_DURATION)
     {
       float animationDuration = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(animationDuration, 0.03f, TEST_LOCATION );
+      DALI_TEST_EQUALS(animationDuration, 0.03f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::DEPTH_MAXIMUM_SWIPE_SPEED)
     {
       float swipSpeed = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(swipSpeed, 50.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(swipSpeed, 50.0f, TEST_LOCATION);
     }
   }
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
 
   // Set the property of the spiral layout
   Property::Map spiralLayoutPrperty;
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::SPIRAL) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_ITEM_SPACING, Dali::Property::Value((Math::PI*2.0f)/9.5f) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_TOP_ITEM_ALIGNMENT, Dali::Property::Value(-0.125f) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_REVOLUTION_DISTANCE, Dali::Property::Value(190.0f) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_SCROLL_SPEED_FACTOR, Dali::Property::Value(0.01f) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_ITEM_FLICK_ANIMATION_DURATION, Dali::Property::Value(0.1f) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_MAXIMUM_SWIPE_SPEED, Dali::Property::Value(30.0f) );
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::SPIRAL));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_ITEM_SPACING, Dali::Property::Value((Math::PI * 2.0f) / 9.5f));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_TOP_ITEM_ALIGNMENT, Dali::Property::Value(-0.125f));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_REVOLUTION_DISTANCE, Dali::Property::Value(190.0f));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_SCROLL_SPEED_FACTOR, Dali::Property::Value(0.01f));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_ITEM_FLICK_ANIMATION_DURATION, Dali::Property::Value(0.1f));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_MAXIMUM_SWIPE_SPEED, Dali::Property::Value(30.0f));
   spiralLayout->SetLayoutProperties(spiralLayoutPrperty);
 
   view.AddLayout(*spiralLayout);
@@ -545,55 +540,54 @@ int UtcDaliItemLayoutSetAndGetLayoutProperties(void)
   Property::Map thridLayout = spiralLayout->GetLayoutProperties();
 
   //Check all the properties of grid layout
-  DALI_TEST_EQUALS( spiralLayoutPrperty.Count(), thridLayout.Count(), TEST_LOCATION );
+  DALI_TEST_EQUALS(spiralLayoutPrperty.Count(), thridLayout.Count(), TEST_LOCATION);
 
-  for( unsigned int mapIdx = 0, mapCount = thridLayout.Count(); mapIdx < mapCount; ++mapIdx )
+  for(unsigned int mapIdx = 0, mapCount = thridLayout.Count(); mapIdx < mapCount; ++mapIdx)
   {
-    KeyValuePair propertyPair( thridLayout.GetKeyValue( mapIdx ) );
+    KeyValuePair propertyPair(thridLayout.GetKeyValue(mapIdx));
     if(propertyPair.first == DefaultItemLayoutProperty::TYPE)
     {
       int layoutType = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS( layoutType, (int)DefaultItemLayout::SPIRAL, TEST_LOCATION );
+      DALI_TEST_EQUALS(layoutType, (int)DefaultItemLayout::SPIRAL, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::SPIRAL_ITEM_SPACING)
     {
       float columnNumber = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS( columnNumber, (Math::PI*2.0f)/9.5f, TEST_LOCATION );
+      DALI_TEST_EQUALS(columnNumber, (Math::PI * 2.0f) / 9.5f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::SPIRAL_TOP_ITEM_ALIGNMENT)
     {
       float rowNumber = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(rowNumber, -0.125f, TEST_LOCATION );
+      DALI_TEST_EQUALS(rowNumber, -0.125f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::SPIRAL_REVOLUTION_DISTANCE)
     {
       float rowSpacing = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(rowSpacing, 190.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(rowSpacing, 190.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::SPIRAL_SCROLL_SPEED_FACTOR)
     {
       float scrollSpeedFactor = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(scrollSpeedFactor, 0.01f, TEST_LOCATION );
+      DALI_TEST_EQUALS(scrollSpeedFactor, 0.01f, TEST_LOCATION);
     }
 
     else if(propertyPair.first == DefaultItemLayoutProperty::SPIRAL_ITEM_FLICK_ANIMATION_DURATION)
     {
       float animationDuration = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(animationDuration, 0.1f, TEST_LOCATION );
+      DALI_TEST_EQUALS(animationDuration, 0.1f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::SPIRAL_MAXIMUM_SWIPE_SPEED)
     {
       float swipSpeed = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS(swipSpeed, 30.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(swipSpeed, 30.0f, TEST_LOCATION);
     }
   }
   Dali::Integration::Scene scene = application.GetScene();
-  Vector3 sceneSize(scene.GetSize());
+  Vector3                  sceneSize(scene.GetSize());
   view.ActivateLayout(0, sceneSize, 0.5f);
   view.ActivateLayout(1, sceneSize, 0.5f);
   view.ActivateLayout(2, sceneSize, 0.5f);
   END_TEST;
-
 }
 
 int UtcDaliItemRangeIntersection(void)
@@ -602,18 +596,18 @@ int UtcDaliItemRangeIntersection(void)
 
   unsigned int uBeginItemFirst = 100u, uEndItemFirst = 300u;
   unsigned int uBeginItemSecond = 290u, uEndItemSecond = 400;
-  unsigned int uInterBeginCheck=290u , uInterEndCheck=301u;
-  bool bIsInThisRange = false, bOutOfThisRange = false;
+  unsigned int uInterBeginCheck = 290u, uInterEndCheck = 301u;
+  bool         bIsInThisRange = false, bOutOfThisRange = false;
 
   Toolkit::ItemRange objItemRangeFirst(uBeginItemFirst, uEndItemFirst);
   Toolkit::ItemRange objItemRangeSecond(uBeginItemSecond, uEndItemSecond);
-  ItemRange itmInterSect = objItemRangeFirst.Intersection(objItemRangeSecond);
+  ItemRange          itmInterSect = objItemRangeFirst.Intersection(objItemRangeSecond);
 
   bIsInThisRange = itmInterSect.Within(uInterBeginCheck);
-  DALI_TEST_EQUALS(bIsInThisRange, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(bIsInThisRange, true, TEST_LOCATION);
 
   bOutOfThisRange = itmInterSect.Within(uInterEndCheck);
-  DALI_TEST_EQUALS(bOutOfThisRange, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(bOutOfThisRange, false, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
index da5ce83..e892f52 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  *
  */
 
-#include <iostream>
+#include <float.h> // for FLT_MAX
 #include <stdlib.h>
-#include <float.h>       // for FLT_MAX
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
@@ -41,16 +41,15 @@ void utc_dali_toolkit_item_view_cleanup(void)
 
 namespace
 {
+const unsigned int TOTAL_ITEM_NUMBER    = 400;
+const char*        TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg";
 
-const unsigned int TOTAL_ITEM_NUMBER = 400;
-const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg";
-
-const int RENDER_FRAME_INTERVAL = 16;                     ///< Duration of each frame in ms. (at approx 60FPS)
+const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
 
 static bool gObjectCreatedCallBackCalled;
-static bool gOnLayoutActivatedCalled;                     ///< Whether the LayoutActivated signal was invoked.
+static bool gOnLayoutActivatedCalled; ///< Whether the LayoutActivated signal was invoked.
 static bool gOnScrollUpdateCalled;
-static bool gOnWheelEventCalled;                          ///< Whether the WheelEventSignal signal was invoked.
+static bool gOnWheelEventCalled; ///< Whether the WheelEventSignal signal was invoked.
 
 static void TestCallback(BaseHandle handle)
 {
@@ -62,27 +61,27 @@ static void OnLayoutActivated()
   gOnLayoutActivatedCalled = true;
 }
 
-static void OnScrollUpdate( const Vector2& position )
+static void OnScrollUpdate(const Vector2& position)
 {
   gOnScrollUpdateCalled = true;
 }
 
-static bool OnWheelEvent( Actor actor, const Dali::WheelEvent& wheelEvent )
+static bool OnWheelEvent(Actor actor, const Dali::WheelEvent& wheelEvent)
 {
   gOnWheelEventCalled = true;
   return false;
 }
 
-Integration::TouchEvent GenerateSingleTouch( PointState::Type state, const Vector2& screenPosition, uint32_t time )
+Integration::TouchEvent GenerateSingleTouch(PointState::Type state, const Vector2& screenPosition, uint32_t time)
 {
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( state );
+  Integration::Point      point;
+  point.SetState(state);
   point.SetDeviceId(4);
-  point.SetScreenPosition( screenPosition );
-  point.SetDeviceClass( Device::Class::TOUCH );
-  point.SetDeviceSubclass( Device::Subclass::NONE );
-  touchEvent.points.push_back( point );
+  point.SetScreenPosition(screenPosition);
+  point.SetDeviceClass(Device::Class::TOUCH);
+  point.SetDeviceSubclass(Device::Subclass::NONE);
+  touchEvent.points.push_back(point);
   touchEvent.time = time;
   return touchEvent;
 }
@@ -100,7 +99,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -114,7 +113,6 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 class TestItemFactory : public ItemFactory
 {
 public:
-
   /**
    * Constructor
    * @param application class, stored as reference
@@ -124,7 +122,6 @@ public:
   }
 
 public: // From ItemFactory
-
   /**
    * Query the number of items available from the factory.
    * The maximum available item has an ID of GetNumberOfItems() - 1.
@@ -142,34 +139,33 @@ public: // From ItemFactory
   virtual Actor NewItem(unsigned int itemId)
   {
     // Create a renderable actor for this item
-    return ImageView::New( TEST_IMAGE_FILE_NAME );
+    return ImageView::New(TEST_IMAGE_FILE_NAME);
   }
 };
 
 } // namespace
 
-
 int UtcDaliItemViewNew(void)
 {
   ToolkitTestApplication application;
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   DALI_TEST_CHECK(view);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
   registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     TestItemFactory factory;
-    ItemView view = ItemView::New(factory);
+    ItemView        view = ItemView::New(factory);
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -178,11 +174,11 @@ int UtcDaliItemViewCopyConstructor(void)
   ToolkitTestApplication application;
 
   TestItemFactory factory;
-  ItemView itemView = ItemView::New( factory );
-  DALI_TEST_CHECK( itemView );
+  ItemView        itemView = ItemView::New(factory);
+  DALI_TEST_CHECK(itemView);
 
-  ItemView copy( itemView );
-  DALI_TEST_CHECK( copy );
+  ItemView copy(itemView);
+  DALI_TEST_CHECK(copy);
 
   END_TEST;
 }
@@ -192,13 +188,13 @@ int UtcDaliItemViewCopyAssignment(void)
   ToolkitTestApplication application;
 
   TestItemFactory factory;
-  ItemView itemView = ItemView::New( factory );
-  DALI_TEST_CHECK( itemView );
+  ItemView        itemView = ItemView::New(factory);
+  DALI_TEST_CHECK(itemView);
 
   ItemView copy;
   copy = itemView;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_EQUALS( itemView, copy, TEST_LOCATION );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_EQUALS(itemView, copy, TEST_LOCATION);
 
   END_TEST;
 }
@@ -208,16 +204,16 @@ int UtcDaliItemViewMoveConstructor(void)
   ToolkitTestApplication application;
 
   TestItemFactory factory;
-  ItemView itemView = ItemView::New( factory );
-  DALI_TEST_EQUALS( 1, itemView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  itemView.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == itemView.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  ItemView        itemView = ItemView::New(factory);
+  DALI_TEST_EQUALS(1, itemView.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  itemView.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == itemView.GetProperty<bool>(Actor::Property::SENSITIVE));
 
-  ItemView moved = std::move( itemView );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !itemView );
+  ItemView moved = std::move(itemView);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!itemView);
 
   END_TEST;
 }
@@ -227,17 +223,17 @@ int UtcDaliItemViewMoveAssignment(void)
   ToolkitTestApplication application;
 
   TestItemFactory factory;
-  ItemView itemView = ItemView::New( factory );
-  DALI_TEST_EQUALS( 1, itemView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  itemView.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == itemView.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  ItemView        itemView = ItemView::New(factory);
+  DALI_TEST_EQUALS(1, itemView.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  itemView.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == itemView.GetProperty<bool>(Actor::Property::SENSITIVE));
 
   ItemView moved;
-  moved = std::move( itemView );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !itemView );
+  moved = std::move(itemView);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!itemView);
 
   END_TEST;
 }
@@ -248,14 +244,14 @@ int UtcDaliItemViewDownCast(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  const ItemView itemViewConst = ItemView::New(factory);
-  ItemView itemView(itemViewConst);
+  const ItemView  itemViewConst = ItemView::New(factory);
+  ItemView        itemView(itemViewConst);
 
   BaseHandle handle(itemView);
 
-  ItemView newItemView = ItemView::DownCast( handle );
-  DALI_TEST_CHECK( itemView );
-  DALI_TEST_CHECK( newItemView == itemView );
+  ItemView newItemView = ItemView::DownCast(handle);
+  DALI_TEST_CHECK(itemView);
+  DALI_TEST_CHECK(newItemView == itemView);
   END_TEST;
 }
 
@@ -265,24 +261,24 @@ int UtcDaliItemViewAddAndGetLayout(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
 
   // As we have added one layout, check the number of layout is now 1
   DALI_TEST_CHECK(view.GetLayoutCount() == 1);
 
   // Create a depth layout and add it to ItemView
-  ItemLayoutPtr depthLayout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemLayoutPtr depthLayout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
   view.AddLayout(*depthLayout);
 
   // As we have added another layout, check the number of layout is now 2
   DALI_TEST_CHECK(view.GetLayoutCount() == 2);
 
   // Create a spiral layout and add it to ItemView
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
   view.AddLayout(*spiralLayout);
 
   // As we have added another layout, check the number of layout is now 3
@@ -301,17 +297,17 @@ int UtcDaliItemViewAddAndRemoveLayout(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
 
   // As we have added one layout, check the number of layout is now 1
   DALI_TEST_CHECK(view.GetLayoutCount() == 1);
 
   // Create a depth layout and add it to ItemView
-  ItemLayoutPtr depthLayout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemLayoutPtr depthLayout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
   view.AddLayout(*depthLayout);
 
   // As we have added another layout, check the number of layout is now 2
@@ -344,25 +340,25 @@ int UtcDaliItemViewActivateLayoutAndGetActiveLayout(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
 
   // Create a depth layout and add it to ItemView
-  ItemLayoutPtr depthLayout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemLayoutPtr depthLayout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
   view.AddLayout(*depthLayout);
 
   // Create a spiral layout and add it to ItemView
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
   view.AddLayout(*spiralLayout);
 
   // As we have added three layouts, check the number of layout is now 3
   DALI_TEST_CHECK(view.GetLayoutCount() == 3);
 
   // Check there is no active layout at the moment
-  DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
+  DALI_TEST_CHECK(!view.GetActiveLayout());
 
   // Activate the depth layout
   Vector3 stageSize(application.GetScene().GetSize());
@@ -391,15 +387,15 @@ int UtcDaliItemViewDeactivateCurrentLayout(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   gridLayout->SetOrientation(ControlOrientation::Down);
   view.AddLayout(*gridLayout);
 
   // Check there is no active layout at the moment
-  DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
+  DALI_TEST_CHECK(!view.GetActiveLayout());
 
   // Activate the grid layout
   Vector3 stageSize(application.GetScene().GetSize());
@@ -412,7 +408,7 @@ int UtcDaliItemViewDeactivateCurrentLayout(void)
   view.DeactivateCurrentLayout();
 
   // Check there is no active layout at the moment
-  DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
+  DALI_TEST_CHECK(!view.GetActiveLayout());
   END_TEST;
 }
 
@@ -422,10 +418,10 @@ int UtcDaliItemViewGetItemAndGetItemId(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   gridLayout->SetOrientation(ControlOrientation::Left);
   view.AddLayout(*gridLayout);
 
@@ -447,10 +443,10 @@ int UtcDaliItemViewRemoveItem(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   gridLayout->SetOrientation(ControlOrientation::Right);
   view.AddLayout(*gridLayout);
 
@@ -502,10 +498,10 @@ int UtcDaliItemViewGetCurrentLayoutPosition(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a depth layout and add it to ItemView
-  ItemLayoutPtr depthLayout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemLayoutPtr depthLayout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
   depthLayout->SetOrientation(ControlOrientation::Up);
   view.AddLayout(*depthLayout);
 
@@ -514,7 +510,7 @@ int UtcDaliItemViewGetCurrentLayoutPosition(void)
   view.ActivateLayout(0, stageSize, 0.0f);
 
   // Check the current layout position for the 10th items is 9.0f
-  DALI_TEST_EQUALS(view.GetCurrentLayoutPosition(9), 9.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetCurrentLayoutPosition(9), 9.0f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -524,13 +520,13 @@ int UtcDaliItemViewSetAndGetMinimumSwipeSpeed(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Set the minimum swipe speed to be 1.5f
   view.SetMinimumSwipeSpeed(1.5f);
 
   // Check the minimum swipe speed is 1.5f
-  DALI_TEST_EQUALS(view.GetMinimumSwipeSpeed(), 1.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetMinimumSwipeSpeed(), 1.5f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -540,13 +536,13 @@ int UtcDaliItemViewSetAndGetMinimumSwipeDistance(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Set the minimum swipe distance to be 2.5f
   view.SetMinimumSwipeDistance(2.5f);
 
   // Check the minimum swipe distance is 2.5f
-  DALI_TEST_EQUALS(view.GetMinimumSwipeDistance(), 2.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetMinimumSwipeDistance(), 2.5f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -556,7 +552,7 @@ int UtcDaliItemViewSetAndGetAnchoring(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Disable the anchor animation
   view.SetAnchoring(false);
@@ -572,13 +568,13 @@ int UtcDaliItemViewSetAndGetAnchoringDuration(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Set the duration of anchor animation to be 1.5f
   view.SetAnchoringDuration(1.5f);
 
   // Check the duration of anchor animation is 1.5f
-  DALI_TEST_EQUALS(view.GetAnchoringDuration(), 1.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetAnchoringDuration(), 1.5f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -588,7 +584,7 @@ int UtcDaliItemViewSetAndGetRefreshInterval(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Set the interval between refreshes to be 20
   view.SetRefreshInterval(20);
@@ -606,13 +602,13 @@ int UtcDaliItemViewScrollToItem(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
-  Vector3 vec(480.0f, 800.0f, 0.0f);
-  ItemLayoutPtr layout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
+  ItemView        view = ItemView::New(factory);
+  Vector3         vec(480.0f, 800.0f, 0.0f);
+  ItemLayoutPtr   layout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
 
-  view.SetProperty( Dali::Actor::Property::NAME,"view actor");
+  view.SetProperty(Dali::Actor::Property::NAME, "view actor");
   view.AddLayout(*layout);
-  view.SetProperty( Actor::Property::SIZE, vec );
+  view.SetProperty(Actor::Property::SIZE, vec);
 
   application.GetScene().Add(view);
   layout->SetOrientation(ControlOrientation::Down);
@@ -632,7 +628,7 @@ int UtcDaliItemViewScrollToItem(void)
   for(unsigned int i = 0; i < 10; i++)
   {
     Actor testActor = view.GetItem(i);
-    if (testActor)
+    if(testActor)
     {
       indices.push_back(i);
     }
@@ -640,9 +636,9 @@ int UtcDaliItemViewScrollToItem(void)
 
   try
   {
-    if (!indices.empty())
+    if(!indices.empty())
     {
-      const unsigned int firstTargetIndex = indices[indices.size()-1];
+      const unsigned int firstTargetIndex = indices[indices.size() - 1];
       // scroll to last item
       view.ScrollToItem(firstTargetIndex, 0.00f);
       for(int i = 0; i < 10; ++i)
@@ -657,7 +653,7 @@ int UtcDaliItemViewScrollToItem(void)
         view.ScrollToItem(indices[i], 0.0f);
         float layoutPosAfter = view.GetCurrentLayoutPosition(i);
 
-        if (fabs(layoutPosBefore-layoutPosAfter) <= FLT_EPSILON)
+        if(fabs(layoutPosBefore - layoutPosAfter) <= FLT_EPSILON)
         {
           ++moveCount;
         }
@@ -681,13 +677,13 @@ int UtcDaliItemViewSetAndGetWheelScrollDistanceStep(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Set the scroll distance step for the wheel event to be 100.0f
   view.SetWheelScrollDistanceStep(100.0f);
 
   // Check the scroll distance step is 100.0f
-  DALI_TEST_EQUALS(view.GetWheelScrollDistanceStep(), 100.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetWheelScrollDistanceStep(), 100.0f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -697,10 +693,10 @@ int UtcDaliItemViewInsertItemP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID);
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   gridLayout->SetOrientation(ControlOrientation::Left);
   view.AddLayout(*gridLayout);
 
@@ -711,7 +707,7 @@ int UtcDaliItemViewInsertItemP(void)
   // Get the specified item where new item to be inserted before that
   Actor itemActor = view.GetItem(2);
 
-  ItemId id = view.GetItemId( itemActor );
+  ItemId id = view.GetItemId(itemActor);
 
   // Check we are getting the correct Item ID given the specified actor
   DALI_TEST_CHECK(view.GetItemId(itemActor) == 2);
@@ -754,10 +750,10 @@ int UtcDaliItemViewInsertItemsP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a depth layout and add it to ItemView
-  ItemLayoutPtr depthLayout = DefaultItemLayout::New( DefaultItemLayout::DEPTH);
+  ItemLayoutPtr depthLayout = DefaultItemLayout::New(DefaultItemLayout::DEPTH);
   depthLayout->SetOrientation(ControlOrientation::Right);
   view.AddLayout(*depthLayout);
 
@@ -775,17 +771,17 @@ int UtcDaliItemViewInsertItemsP(void)
 
   ItemContainer insertList;
 
-  for( unsigned int i = 1u; i < 11; ++i )
+  for(unsigned int i = 1u; i < 11; ++i)
   {
-    Actor child = view.GetChildAt( i );
+    Actor child    = view.GetChildAt(i);
     Actor newActor = Actor::New();
-    newActor.SetProperty( Dali::Actor::Property::NAME,"Inserted");
-    insertList.push_back( Item( view.GetItemId(child), newActor ) );
+    newActor.SetProperty(Dali::Actor::Property::NAME, "Inserted");
+    insertList.push_back(Item(view.GetItemId(child), newActor));
   }
 
-  if( !insertList.empty() )
+  if(!insertList.empty())
   {
-    view.InsertItems( insertList, 0.5f );
+    view.InsertItems(insertList, 0.5f);
   }
 
   DALI_TEST_CHECK(view.GetChildCount() == itemCount + 10);
@@ -796,19 +792,19 @@ int UtcDaliItemViewInsertItemsP(void)
 
   ItemIdContainer removeList;
 
-  for( unsigned int i = 0u; i < view.GetChildCount(); ++i )
+  for(unsigned int i = 0u; i < view.GetChildCount(); ++i)
   {
-    Actor child = view.GetChildAt( i );
+    Actor child = view.GetChildAt(i);
 
-    if( child.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Inserted" )
+    if(child.GetProperty<std::string>(Dali::Actor::Property::NAME) == "Inserted")
     {
-      removeList.push_back( view.GetItemId(child) );
+      removeList.push_back(view.GetItemId(child));
     }
   }
 
-  if( ! removeList.empty() )
+  if(!removeList.empty())
   {
-    view.RemoveItems( removeList, 0.5f );
+    view.RemoveItems(removeList, 0.5f);
   }
 
   DALI_TEST_CHECK(view.GetChildCount() == itemCount);
@@ -826,10 +822,10 @@ int UtcDaliItemViewReplaceItemP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a spiral layout and add it to ItemView
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
   view.AddLayout(*spiralLayout);
 
   // Activate the grid layout so that the items will be created and added to ItemView
@@ -838,7 +834,7 @@ int UtcDaliItemViewReplaceItemP(void)
 
   Actor newActor = Actor::New();
 
-  view.ReplaceItem( Item( 5, newActor ), 0.5f );
+  view.ReplaceItem(Item(5, newActor), 0.5f);
 
   DALI_TEST_CHECK(view.GetItem(5) == newActor);
 
@@ -851,11 +847,11 @@ int UtcDaliItemViewReplaceItemsP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a spiral layout and add it to ItemView
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
-  spiralLayout->SetOrientation( ControlOrientation::Down );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
+  spiralLayout->SetOrientation(ControlOrientation::Down);
   view.AddLayout(*spiralLayout);
 
   // Activate the grid layout so that the items will be created and added to ItemView
@@ -864,22 +860,22 @@ int UtcDaliItemViewReplaceItemsP(void)
 
   ItemContainer replaceList;
 
-  for( unsigned int i = 0u; i < 10; ++i )
+  for(unsigned int i = 0u; i < 10; ++i)
   {
-    Actor child = view.GetItem( i );
+    Actor child    = view.GetItem(i);
     Actor newActor = Actor::New();
-    newActor.SetProperty( Dali::Actor::Property::NAME,"Replaced");
+    newActor.SetProperty(Dali::Actor::Property::NAME, "Replaced");
 
-    replaceList.push_back( Item( i, newActor ) );
+    replaceList.push_back(Item(i, newActor));
   }
 
-  if( !replaceList.empty() )
+  if(!replaceList.empty())
   {
-    view.ReplaceItems( replaceList, 0.5f );
+    view.ReplaceItems(replaceList, 0.5f);
   }
 
-  DALI_TEST_CHECK(view.GetItem(0).GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Replaced");
-  DALI_TEST_CHECK(view.GetItem(8).GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Replaced");
+  DALI_TEST_CHECK(view.GetItem(0).GetProperty<std::string>(Dali::Actor::Property::NAME) == "Replaced");
+  DALI_TEST_CHECK(view.GetItem(8).GetProperty<std::string>(Dali::Actor::Property::NAME) == "Replaced");
   END_TEST;
 }
 
@@ -889,11 +885,11 @@ int UtcDaliItemViewGetItemsRangeP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a spiral layout and add it to ItemView
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
-  spiralLayout->SetOrientation( ControlOrientation::Left );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
+  spiralLayout->SetOrientation(ControlOrientation::Left);
   view.AddLayout(*spiralLayout);
 
   // Activate the grid layout so that the items will be created and added to ItemView
@@ -914,11 +910,11 @@ int UtcDaliItemViewSetItemsAnchorPointP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a spiral layout and add it to ItemView
-  ItemLayoutPtr spiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
-  spiralLayout->SetOrientation( ControlOrientation::Right );
+  ItemLayoutPtr spiralLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
+  spiralLayout->SetOrientation(ControlOrientation::Right);
   view.AddLayout(*spiralLayout);
 
   // Activate the grid layout so that the items will be created and added to ItemView
@@ -930,7 +926,7 @@ int UtcDaliItemViewSetItemsAnchorPointP(void)
   view.SetItemsAnchorPoint(anchorPoint);
 
   DALI_TEST_CHECK(view.GetItemsAnchorPoint() == anchorPoint);
-  DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) == anchorPoint);
+  DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) == anchorPoint);
   END_TEST;
 }
 
@@ -940,10 +936,10 @@ int UtcDaliItemViewSetItemsParentOriginP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
 
   // Activate the grid layout so that the items will be created and added to ItemView
@@ -955,15 +951,15 @@ int UtcDaliItemViewSetItemsParentOriginP(void)
   view.SetItemsParentOrigin(parentOrigin);
 
   DALI_TEST_CHECK(view.GetItemsParentOrigin() == parentOrigin);
-  DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) == parentOrigin);
+  DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty<Vector3>(Actor::Property::PARENT_ORIGIN) == parentOrigin);
   END_TEST;
 }
 
 int UtcDaliItemFactoryGetExtention(void)
 {
   ToolkitTestApplication application;
-  TestItemFactory factory;
-  DALI_TEST_CHECK( factory.GetExtension() == NULL );
+  TestItemFactory        factory;
+  DALI_TEST_CHECK(factory.GetExtension() == NULL);
   END_TEST;
 }
 
@@ -973,16 +969,16 @@ int UtcDaliItemViewLayoutActivatedSignalP(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   // Connect the layout activated signal
-  view.LayoutActivatedSignal().Connect( &OnLayoutActivated );
+  view.LayoutActivatedSignal().Connect(&OnLayoutActivated);
 
   gOnLayoutActivatedCalled = false;
 
@@ -997,7 +993,7 @@ int UtcDaliItemViewLayoutActivatedSignalP(void)
   // Wait for 0.1 second
   Wait(application, 100);
 
-  DALI_TEST_EQUALS( gOnLayoutActivatedCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnLayoutActivatedCalled, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1008,63 +1004,62 @@ int UtcDaliItemViewSetGetProperty(void)
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
   DALI_TEST_CHECK(view);
 
   // Event side properties
 
   // Test "minimumSwipeSpeed" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("minimumSwipeSpeed") == ItemView::Property::MINIMUM_SWIPE_SPEED  );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::MINIMUM_SWIPE_SPEED).Get<float>(), view.GetMinimumSwipeSpeed(), TEST_LOCATION );
-  view.SetProperty( ItemView::Property::MINIMUM_SWIPE_SPEED, 2.5f );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::MINIMUM_SWIPE_SPEED).Get<float>(), 2.5f, TEST_LOCATION );
+  DALI_TEST_CHECK(view.GetPropertyIndex("minimumSwipeSpeed") == ItemView::Property::MINIMUM_SWIPE_SPEED);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::MINIMUM_SWIPE_SPEED).Get<float>(), view.GetMinimumSwipeSpeed(), TEST_LOCATION);
+  view.SetProperty(ItemView::Property::MINIMUM_SWIPE_SPEED, 2.5f);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::MINIMUM_SWIPE_SPEED).Get<float>(), 2.5f, TEST_LOCATION);
 
   // Test "minimumSwipeDistance" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("minimumSwipeDistance") == ItemView::Property::MINIMUM_SWIPE_DISTANCE  );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::MINIMUM_SWIPE_DISTANCE).Get<float>(), view.GetMinimumSwipeDistance(), TEST_LOCATION );
-  view.SetProperty( ItemView::Property::MINIMUM_SWIPE_DISTANCE, 8.725f );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::MINIMUM_SWIPE_DISTANCE).Get<float>(), 8.725f, TEST_LOCATION );
+  DALI_TEST_CHECK(view.GetPropertyIndex("minimumSwipeDistance") == ItemView::Property::MINIMUM_SWIPE_DISTANCE);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::MINIMUM_SWIPE_DISTANCE).Get<float>(), view.GetMinimumSwipeDistance(), TEST_LOCATION);
+  view.SetProperty(ItemView::Property::MINIMUM_SWIPE_DISTANCE, 8.725f);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::MINIMUM_SWIPE_DISTANCE).Get<float>(), 8.725f, TEST_LOCATION);
 
   // Test "wheelScrollDistanceStep" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("wheelScrollDistanceStep") == ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP  );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP).Get<float>(), view.GetWheelScrollDistanceStep(), TEST_LOCATION );
-  view.SetProperty( ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP, 5.0f );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP).Get<float>(), 5.0f, TEST_LOCATION );
+  DALI_TEST_CHECK(view.GetPropertyIndex("wheelScrollDistanceStep") == ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP).Get<float>(), view.GetWheelScrollDistanceStep(), TEST_LOCATION);
+  view.SetProperty(ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP, 5.0f);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::WHEEL_SCROLL_DISTANCE_STEP).Get<float>(), 5.0f, TEST_LOCATION);
 
   // Test "snapToItemEnabled" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("snapToItemEnabled") == ItemView::Property::SNAP_TO_ITEM_ENABLED  );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::SNAP_TO_ITEM_ENABLED).Get<bool>(), view.GetAnchoring(), TEST_LOCATION );
-  view.SetProperty( ItemView::Property::SNAP_TO_ITEM_ENABLED, true );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::SNAP_TO_ITEM_ENABLED).Get<bool>(), true, TEST_LOCATION );
+  DALI_TEST_CHECK(view.GetPropertyIndex("snapToItemEnabled") == ItemView::Property::SNAP_TO_ITEM_ENABLED);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::SNAP_TO_ITEM_ENABLED).Get<bool>(), view.GetAnchoring(), TEST_LOCATION);
+  view.SetProperty(ItemView::Property::SNAP_TO_ITEM_ENABLED, true);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::SNAP_TO_ITEM_ENABLED).Get<bool>(), true, TEST_LOCATION);
 
   // Test "refreshInterval" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("refreshInterval") == ItemView::Property::REFRESH_INTERVAL  );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::REFRESH_INTERVAL).Get<float>(), view.GetRefreshInterval(), TEST_LOCATION );
-  view.SetProperty( ItemView::Property::REFRESH_INTERVAL, 11.0f );
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::REFRESH_INTERVAL).Get<float>(), 11.0f, TEST_LOCATION );
+  DALI_TEST_CHECK(view.GetPropertyIndex("refreshInterval") == ItemView::Property::REFRESH_INTERVAL);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::REFRESH_INTERVAL).Get<float>(), view.GetRefreshInterval(), TEST_LOCATION);
+  view.SetProperty(ItemView::Property::REFRESH_INTERVAL, 11.0f);
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::REFRESH_INTERVAL).Get<float>(), 11.0f, TEST_LOCATION);
 
   // Test "layout" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("layout") == ItemView::Property::LAYOUT  );
+  DALI_TEST_CHECK(view.GetPropertyIndex("layout") == ItemView::Property::LAYOUT);
   Property::Map gridLayoutProperty;
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::GRID) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::ITEM_SIZE, Dali::Property::Value(Vector3(200, 200,50)) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_ROW_SPACING, Dali::Property::Value(50.0f) );
-  gridLayoutProperty.Insert( DefaultItemLayoutProperty::GRID_COLUMN_NUMBER, Dali::Property::Value(4) );
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::GRID));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::ITEM_SIZE, Dali::Property::Value(Vector3(200, 200, 50)));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_ROW_SPACING, Dali::Property::Value(50.0f));
+  gridLayoutProperty.Insert(DefaultItemLayoutProperty::GRID_COLUMN_NUMBER, Dali::Property::Value(4));
 
   Property::Map depthLayoutProperty;
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::DEPTH) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_COLUMN_NUMBER, Dali::Property::Value(3) );
-  depthLayoutProperty.Insert( DefaultItemLayoutProperty::DEPTH_ROW_NUMBER, Dali::Property::Value(26.0f) );
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::DEPTH));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_COLUMN_NUMBER, Dali::Property::Value(3));
+  depthLayoutProperty.Insert(DefaultItemLayoutProperty::DEPTH_ROW_NUMBER, Dali::Property::Value(26.0f));
 
   Property::Map spiralLayoutPrperty;
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::SPIRAL) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_ITEM_SPACING, Dali::Property::Value((Math::PI*2.0f)/9.5f) );
-  spiralLayoutPrperty.Insert( DefaultItemLayoutProperty::SPIRAL_TOP_ITEM_ALIGNMENT, Dali::Property::Value(-0.125f) );
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::SPIRAL));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_ITEM_SPACING, Dali::Property::Value((Math::PI * 2.0f) / 9.5f));
+  spiralLayoutPrperty.Insert(DefaultItemLayoutProperty::SPIRAL_TOP_ITEM_ALIGNMENT, Dali::Property::Value(-0.125f));
 
   Property::Map listLayoutPrperty;
-  listLayoutPrperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::LIST) );
-  listLayoutPrperty.Insert( DefaultItemLayoutProperty::ITEM_SIZE, Dali::Property::Value(Vector3(100, 100,50)) );
-
+  listLayoutPrperty.Insert(DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::LIST));
+  listLayoutPrperty.Insert(DefaultItemLayoutProperty::ITEM_SIZE, Dali::Property::Value(Vector3(100, 100, 50)));
 
   Property::Array layoutArray;
   layoutArray.PushBack(gridLayoutProperty);
@@ -1072,107 +1067,105 @@ int UtcDaliItemViewSetGetProperty(void)
   layoutArray.PushBack(spiralLayoutPrperty);
   layoutArray.PushBack(listLayoutPrperty);
 
-  view.SetProperty( ItemView::Property::LAYOUT, layoutArray);
+  view.SetProperty(ItemView::Property::LAYOUT, layoutArray);
 
   Property::Array getLayoutArray;
-  DALI_TEST_CHECK( view.GetProperty( ItemView::Property::LAYOUT ).Get( getLayoutArray ) );
+  DALI_TEST_CHECK(view.GetProperty(ItemView::Property::LAYOUT).Get(getLayoutArray));
 
   //Check that the result is the same as
-  DALI_TEST_EQUALS( layoutArray.Count(), getLayoutArray.Count(), TEST_LOCATION );
-  Property::Map firstLayout = *((getLayoutArray.GetElementAt( 0 )).GetMap());
+  DALI_TEST_EQUALS(layoutArray.Count(), getLayoutArray.Count(), TEST_LOCATION);
+  Property::Map firstLayout = *((getLayoutArray.GetElementAt(0)).GetMap());
 
-  for( unsigned int mapIdx = 0, mapCount = firstLayout.Count(); mapIdx < mapCount; ++mapIdx )
+  for(unsigned int mapIdx = 0, mapCount = firstLayout.Count(); mapIdx < mapCount; ++mapIdx)
   {
-    KeyValuePair propertyPair( firstLayout.GetKeyValue( mapIdx ) );
+    KeyValuePair propertyPair(firstLayout.GetKeyValue(mapIdx));
     if(propertyPair.first == DefaultItemLayoutProperty::TYPE)
     {
       int layoutType = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS( layoutType, (int)DefaultItemLayout::GRID, TEST_LOCATION );
+      DALI_TEST_EQUALS(layoutType, (int)DefaultItemLayout::GRID, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::ITEM_SIZE)
     {
       Vector3 size = propertyPair.second.Get<Vector3>();
-      DALI_TEST_EQUALS( size, Vector3(200, 200,50), TEST_LOCATION );
+      DALI_TEST_EQUALS(size, Vector3(200, 200, 50), TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_ROW_SPACING)
     {
       float spacing = propertyPair.second.Get<float>();
-      DALI_TEST_EQUALS( spacing, 50.0f, TEST_LOCATION );
+      DALI_TEST_EQUALS(spacing, 50.0f, TEST_LOCATION);
     }
     else if(propertyPair.first == DefaultItemLayoutProperty::GRID_COLUMN_NUMBER)
     {
       int number = propertyPair.second.Get<int>();
-      DALI_TEST_EQUALS(number, 4, TEST_LOCATION );
+      DALI_TEST_EQUALS(number, 4, TEST_LOCATION);
     }
   }
-  view.SetProperty( ItemView::Property::LAYOUT, layoutArray);
-
+  view.SetProperty(ItemView::Property::LAYOUT, layoutArray);
 
   // Test "overshootEnabled" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("overshootEnabled") == Scrollable::Property::OVERSHOOT_ENABLED  );
-  DALI_TEST_EQUALS( view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), view.IsOvershootEnabled(), TEST_LOCATION );
-  view.SetProperty( Scrollable::Property::OVERSHOOT_ENABLED, false );
-  DALI_TEST_EQUALS( view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), false, TEST_LOCATION );
+  DALI_TEST_CHECK(view.GetPropertyIndex("overshootEnabled") == Scrollable::Property::OVERSHOOT_ENABLED);
+  DALI_TEST_EQUALS(view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), view.IsOvershootEnabled(), TEST_LOCATION);
+  view.SetProperty(Scrollable::Property::OVERSHOOT_ENABLED, false);
+  DALI_TEST_EQUALS(view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), false, TEST_LOCATION);
 
   // Test "overshootSize" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("overshootSize") == Scrollable::Property::OVERSHOOT_SIZE  );
-  Vector2 overshootSize = Vector2(100.0f,100.0f);
-  view.SetProperty( Scrollable::Property::OVERSHOOT_SIZE, overshootSize );
-  DALI_TEST_EQUALS( view.GetProperty(Scrollable::Property::OVERSHOOT_SIZE).Get<Vector2>(), overshootSize, TEST_LOCATION );
+  DALI_TEST_CHECK(view.GetPropertyIndex("overshootSize") == Scrollable::Property::OVERSHOOT_SIZE);
+  Vector2 overshootSize = Vector2(100.0f, 100.0f);
+  view.SetProperty(Scrollable::Property::OVERSHOOT_SIZE, overshootSize);
+  DALI_TEST_EQUALS(view.GetProperty(Scrollable::Property::OVERSHOOT_SIZE).Get<Vector2>(), overshootSize, TEST_LOCATION);
 
   // Animatable properties
 
   // Test "layoutPosition" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("layoutPosition") == ItemView::Property::LAYOUT_POSITION  );
-  view.SetProperty( ItemView::Property::LAYOUT_POSITION, 20.5f );
+  DALI_TEST_CHECK(view.GetPropertyIndex("layoutPosition") == ItemView::Property::LAYOUT_POSITION);
+  view.SetProperty(ItemView::Property::LAYOUT_POSITION, 20.5f);
   Wait(application);
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::LAYOUT_POSITION).Get<float>(), 20.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::LAYOUT_POSITION).Get<float>(), 20.5f, TEST_LOCATION);
 
   // Test "scrollSpeed" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("scrollSpeed") == ItemView::Property::SCROLL_SPEED  );
-  view.SetProperty( ItemView::Property::SCROLL_SPEED, 3.35f );
+  DALI_TEST_CHECK(view.GetPropertyIndex("scrollSpeed") == ItemView::Property::SCROLL_SPEED);
+  view.SetProperty(ItemView::Property::SCROLL_SPEED, 3.35f);
   Wait(application);
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::SCROLL_SPEED).Get<float>(), 3.35f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::SCROLL_SPEED).Get<float>(), 3.35f, TEST_LOCATION);
 
   // Test "overshoot" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("overshoot") == ItemView::Property::OVERSHOOT  );
-  view.SetProperty( ItemView::Property::OVERSHOOT, 0.15f );
+  DALI_TEST_CHECK(view.GetPropertyIndex("overshoot") == ItemView::Property::OVERSHOOT);
+  view.SetProperty(ItemView::Property::OVERSHOOT, 0.15f);
   Wait(application);
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::OVERSHOOT).Get<float>(), 0.15f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::OVERSHOOT).Get<float>(), 0.15f, TEST_LOCATION);
 
   // Test "scrollDirection" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("scrollDirection") == ItemView::Property::SCROLL_DIRECTION  );
-  view.SetProperty( ItemView::Property::SCROLL_DIRECTION, Vector2(0.85f, 0.5f) );
+  DALI_TEST_CHECK(view.GetPropertyIndex("scrollDirection") == ItemView::Property::SCROLL_DIRECTION);
+  view.SetProperty(ItemView::Property::SCROLL_DIRECTION, Vector2(0.85f, 0.5f));
   Wait(application);
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::SCROLL_DIRECTION).Get<Vector2>(), Vector2(0.85f, 0.5f), TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::SCROLL_DIRECTION).Get<Vector2>(), Vector2(0.85f, 0.5f), TEST_LOCATION);
 
   // Test "layoutOrientation" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("layoutOrientation") == ItemView::Property::LAYOUT_ORIENTATION  );
-  view.SetProperty( ItemView::Property::LAYOUT_ORIENTATION, 2 );
+  DALI_TEST_CHECK(view.GetPropertyIndex("layoutOrientation") == ItemView::Property::LAYOUT_ORIENTATION);
+  view.SetProperty(ItemView::Property::LAYOUT_ORIENTATION, 2);
   Wait(application);
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::LAYOUT_ORIENTATION).Get<int>(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::LAYOUT_ORIENTATION).Get<int>(), 2, TEST_LOCATION);
 
   // Test "scrollContentSize" property
-  DALI_TEST_CHECK( view.GetPropertyIndex("scrollContentSize") == ItemView::Property::SCROLL_CONTENT_SIZE  );
-  view.SetProperty( ItemView::Property::SCROLL_CONTENT_SIZE, 250.0f );
+  DALI_TEST_CHECK(view.GetPropertyIndex("scrollContentSize") == ItemView::Property::SCROLL_CONTENT_SIZE);
+  view.SetProperty(ItemView::Property::SCROLL_CONTENT_SIZE, 250.0f);
   Wait(application);
-  DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::SCROLL_CONTENT_SIZE).Get<float>(), 250.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(ItemView::Property::SCROLL_CONTENT_SIZE).Get<float>(), 250.0f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliItemViewOvershootVertical(void)
 {
-  ToolkitTestApplication application;
+  ToolkitTestApplication   application;
   Dali::Integration::Scene stage = application.GetScene();
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
   stage.Add(view);
 
@@ -1180,65 +1173,65 @@ int UtcDaliItemViewOvershootVertical(void)
   Vector3 stageSize(stage.GetSize());
   view.ActivateLayout(0, stageSize, 0.5f);
 
-  view.SetProperty( Scrollable::Property::OVERSHOOT_ENABLED, true );
-  DALI_TEST_EQUALS( view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), true, TEST_LOCATION );
+  view.SetProperty(Scrollable::Property::OVERSHOOT_ENABLED, true);
+  DALI_TEST_EQUALS(view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), true, TEST_LOCATION);
 
-  view.SetProperty( Scrollable::Property::OVERSHOOT_SIZE, Vector2(30, 30) );
+  view.SetProperty(Scrollable::Property::OVERSHOOT_SIZE, Vector2(30, 30));
 
   Wait(application);
 
   // Do a pan starting from 100,100 and moving down
   Vector2 pos(100.0f, 100.0f);
 
-  application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ) );
-  application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+  application.ProcessEvent(GenerateSingleTouch(PointState::DOWN, pos, 100));
+  application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
 
   pos.y += 5.0f;
   Wait(application, 100);
 
-  for(int i = 0;i<200;i++)
+  for(int i = 0; i < 200; i++)
   {
-    application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+    application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
     pos.y += 5.0f;
     Wait(application);
   }
 
-  application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
+  application.ProcessEvent(GenerateSingleTouch(PointState::UP, pos, 100));
 
   Wait(application, 100);
 
   // Do a pan starting from 100,100 and moving up
   pos = Vector2(100.0f, 300.0f);
 
-  application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ) );
-  application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+  application.ProcessEvent(GenerateSingleTouch(PointState::DOWN, pos, 100));
+  application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
 
   pos.y -= 5.0f;
   Wait(application, 100);
 
-  for(int i = 0;i<200;i++)
+  for(int i = 0; i < 200; i++)
   {
-    application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+    application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
     pos.y -= 5.0f;
     Wait(application);
   }
 
-  application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
+  application.ProcessEvent(GenerateSingleTouch(PointState::UP, pos, 100));
   Wait(application, 100);
   END_TEST;
 }
 
 int UtcDaliItemViewOvershootHorizontal(void)
 {
-  ToolkitTestApplication application;
+  ToolkitTestApplication   application;
   Dali::Integration::Scene stage = application.GetScene();
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::SPIRAL);
   view.AddLayout(*gridLayout);
   stage.Add(view);
 
@@ -1246,45 +1239,45 @@ int UtcDaliItemViewOvershootHorizontal(void)
   Vector3 stageSize(stage.GetSize());
   view.ActivateLayout(0, stageSize, 0.5f);
 
-  view.SetProperty( Scrollable::Property::OVERSHOOT_ENABLED, true );
-  DALI_TEST_EQUALS( view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), true, TEST_LOCATION );
+  view.SetProperty(Scrollable::Property::OVERSHOOT_ENABLED, true);
+  DALI_TEST_EQUALS(view.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), true, TEST_LOCATION);
 
-  view.SetProperty( Scrollable::Property::OVERSHOOT_SIZE, Vector2(30, 30) );
+  view.SetProperty(Scrollable::Property::OVERSHOOT_SIZE, Vector2(30, 30));
 
   Wait(application);
 
   // Do a pan starting from 100,100 and moving left
   Vector2 pos(100.0f, 100.0f);
-  application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ));
-  application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ));
+  application.ProcessEvent(GenerateSingleTouch(PointState::DOWN, pos, 100));
+  application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
   pos.x -= 5.0f;
   Wait(application, 100);
 
-  for(int i = 0;i<200;i++)
+  for(int i = 0; i < 200; i++)
   {
-    application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+    application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
     pos.x -= 5.0f;
     Wait(application);
   }
 
-  application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
+  application.ProcessEvent(GenerateSingleTouch(PointState::UP, pos, 100));
   Wait(application, 100);
 
   // Do a pan starting from 100,100 and moving right
   pos = Vector2(100.0f, 100.0f);
-  application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ) );
-  application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+  application.ProcessEvent(GenerateSingleTouch(PointState::DOWN, pos, 100));
+  application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
   pos.x += 5.0f;
   Wait(application, 100);
 
-  for(int i = 0;i<200;i++)
+  for(int i = 0; i < 200; i++)
   {
-    application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+    application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, pos, 100));
     pos.x += 5.0f;
     Wait(application);
   }
 
-  application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
+  application.ProcessEvent(GenerateSingleTouch(PointState::UP, pos, 100));
   Wait(application, 100);
 
   END_TEST;
@@ -1292,15 +1285,15 @@ int UtcDaliItemViewOvershootHorizontal(void)
 
 int UtcDaliItemEnableDisableRefresh(void)
 {
-  ToolkitTestApplication application;
+  ToolkitTestApplication   application;
   Dali::Integration::Scene stage = application.GetScene();
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New(factory);
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
   view.AddLayout(*gridLayout);
   stage.Add(view);
 
@@ -1309,50 +1302,49 @@ int UtcDaliItemEnableDisableRefresh(void)
   view.ActivateLayout(0, stageSize, 0.5f);
 
   //Connect to signal scroll updated
-  view.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
+  view.ScrollUpdatedSignal().Connect(&OnScrollUpdate);
 
   Property::Map attributes;
-  view.DoAction("enableRefresh", attributes );
+  view.DoAction("enableRefresh", attributes);
   gOnScrollUpdateCalled = true;
-  view.SetProperty( ItemView::Property::LAYOUT_POSITION, 100.0f );
+  view.SetProperty(ItemView::Property::LAYOUT_POSITION, 100.0f);
   application.SendNotification();
   application.Render(1000);
-  DALI_TEST_EQUALS( gOnScrollUpdateCalled, true, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(gOnScrollUpdateCalled, true, TEST_LOCATION);
 
-  view.DoAction("disableRefresh", attributes );
+  view.DoAction("disableRefresh", attributes);
   gOnScrollUpdateCalled = false;
-  view.SetProperty( ItemView::Property::LAYOUT_POSITION, 100.0f );
+  view.SetProperty(ItemView::Property::LAYOUT_POSITION, 100.0f);
   application.SendNotification();
   application.Render(1000);
 
-  DALI_TEST_EQUALS( gOnScrollUpdateCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollUpdateCalled, false, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliItemViewWheelEvent(void)
 {
-  ToolkitTestApplication application;
+  ToolkitTestApplication   application;
   Dali::Integration::Scene stage = application.GetScene();
 
   // Create the ItemView actor
   TestItemFactory factory;
-  ItemView view = ItemView::New( factory );
+  ItemView        view = ItemView::New(factory);
 
   // Create a grid layout and add it to ItemView
-  ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
-  view.AddLayout( *gridLayout );
-  stage.Add( view );
+  ItemLayoutPtr gridLayout = DefaultItemLayout::New(DefaultItemLayout::GRID);
+  view.AddLayout(*gridLayout);
+  stage.Add(view);
 
   // Activate the grid layout so that the items will be created and added to ItemView
-  Vector3 stageSize( stage.GetSize() );
-  view.ActivateLayout (0, stageSize, 0.5f );
+  Vector3 stageSize(stage.GetSize());
+  view.ActivateLayout(0, stageSize, 0.5f);
 
   //Connect to wheel event signal
-  view.WheelEventSignal().Connect( &OnWheelEvent );
+  view.WheelEventSignal().Connect(&OnWheelEvent);
 
-  DALI_TEST_CHECK( !gOnWheelEventCalled );
+  DALI_TEST_CHECK(!gOnWheelEventCalled);
 
   // Render and notify
   application.Render();
@@ -1361,9 +1353,9 @@ int UtcDaliItemViewWheelEvent(void)
   application.SendNotification();
 
   // Perform a wheel event
-  Dali::Integration::WheelEvent wheelEvent( Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2( 10.0f, 10.0f ), 1, 1000u );
-  application.ProcessEvent( wheelEvent );
-  DALI_TEST_CHECK( gOnWheelEventCalled );
+  Dali::Integration::WheelEvent wheelEvent(Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2(10.0f, 10.0f), 1, 1000u);
+  application.ProcessEvent(wheelEvent);
+  DALI_TEST_CHECK(gOnWheelEventCalled);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp b/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
index 258add1..c4b5749 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/builder/json-parser.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -36,8 +36,7 @@ void utc_json_parser_cleanup(void)
 
 namespace
 {
-
-std::string ReplaceQuotes(const std::string &in_s)
+std::string ReplaceQuotes(const std::string& in_s)
 {
   std::string s(in_s);
   // wrong as no embedded quote but had regex link problems
@@ -47,47 +46,48 @@ std::string ReplaceQuotes(const std::string &in_s)
 
 void CompareTrees(const TreeNode& a, const TreeNode& b)
 {
-  DALI_TEST_CHECK( a.GetType() == b.GetType() );
+  DALI_TEST_CHECK(a.GetType() == b.GetType());
 
-  DALI_TEST_CHECK( a.Size() == b.Size() );
+  DALI_TEST_CHECK(a.Size() == b.Size());
 
-  if( a.GetName() )
+  if(a.GetName())
   {
-    DALI_TEST_CHECK( std::string( a.GetName() ) == std::string( b.GetName() ) );
+    DALI_TEST_CHECK(std::string(a.GetName()) == std::string(b.GetName()));
   }
 
-  DALI_TEST_CHECK( a.HasSubstitution() == b.HasSubstitution() );
+  DALI_TEST_CHECK(a.HasSubstitution() == b.HasSubstitution());
 
-  switch( a.GetType() )
+  switch(a.GetType())
   {
     case TreeNode::OBJECT:
     case TreeNode::ARRAY:
     {
-      for( TreeNode::ConstIterator aiter = a.CBegin(), biter = b.CBegin();
-           aiter != a.CEnd() && biter != b.CEnd(); ++aiter, ++biter )
+      for(TreeNode::ConstIterator aiter = a.CBegin(), biter = b.CBegin();
+          aiter != a.CEnd() && biter != b.CEnd();
+          ++aiter, ++biter)
       {
-        CompareTrees( (*aiter).second, (*biter).second );
+        CompareTrees((*aiter).second, (*biter).second);
       }
       break;
     }
     case TreeNode::STRING:
     {
-      DALI_TEST_CHECK( std::string( a.GetString() ) == std::string( b.GetString() ) );
+      DALI_TEST_CHECK(std::string(a.GetString()) == std::string(b.GetString()));
       break;
     }
     case TreeNode::FLOAT:
     {
-      DALI_TEST_CHECK( a.GetFloat() == b.GetFloat() );
+      DALI_TEST_CHECK(a.GetFloat() == b.GetFloat());
       break;
     }
     case TreeNode::INTEGER:
     {
-      DALI_TEST_CHECK( a.GetInteger() == b.GetInteger());
+      DALI_TEST_CHECK(a.GetInteger() == b.GetInteger());
       break;
     }
     case TreeNode::BOOLEAN:
     {
-      DALI_TEST_CHECK( a.GetBoolean() == b.GetBoolean() );
+      DALI_TEST_CHECK(a.GetBoolean() == b.GetBoolean());
       break;
     }
     default:
@@ -97,9 +97,7 @@ void CompareTrees(const TreeNode& a, const TreeNode& b)
   }
 }
 
-
-}
-
+} // namespace
 
 int UtcDaliJsonParserMethod01(void)
 {
@@ -107,8 +105,8 @@ int UtcDaliJsonParserMethod01(void)
 
   tet_infoline("JSON basic test");
 
-  std::string s1( ReplaceQuotes(
-"{ \
+  std::string s1(ReplaceQuotes(
+    "{ \
   'string':'value2', \
   'integer':2, \
   'float':2.0, \
@@ -120,7 +118,7 @@ int UtcDaliJsonParserMethod01(void)
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   if(parser.ParseError())
   {
@@ -187,21 +185,21 @@ int UtcDaliJsonParserMethod01(void)
   TreeNode::ConstIterator iterArray = node->CBegin();
 
   DALI_TEST_CHECK(iterArray != node->CEnd());
-  DALI_TEST_CHECK( ((*iterArray).second).GetType() == TreeNode::INTEGER);
-  DALI_TEST_CHECK( (*iterArray).first == NULL );
-  DALI_TEST_CHECK( ((*iterArray).second).GetInteger() == 1);
+  DALI_TEST_CHECK(((*iterArray).second).GetType() == TreeNode::INTEGER);
+  DALI_TEST_CHECK((*iterArray).first == NULL);
+  DALI_TEST_CHECK(((*iterArray).second).GetInteger() == 1);
 
   ++iterArray;
   DALI_TEST_CHECK(iterArray != node->CEnd());
-  DALI_TEST_CHECK( ((*iterArray).second).GetType() == TreeNode::INTEGER);
-  DALI_TEST_CHECK( (*iterArray).first == NULL );
-  DALI_TEST_CHECK( ((*iterArray).second).GetInteger() == 2);
+  DALI_TEST_CHECK(((*iterArray).second).GetType() == TreeNode::INTEGER);
+  DALI_TEST_CHECK((*iterArray).first == NULL);
+  DALI_TEST_CHECK(((*iterArray).second).GetInteger() == 2);
 
   ++iterArray;
   DALI_TEST_CHECK(iterArray != node->CEnd());
-  DALI_TEST_CHECK( ((*iterArray).second).GetType() == TreeNode::INTEGER);
-  DALI_TEST_CHECK( (*iterArray).first == NULL );
-  DALI_TEST_CHECK( ((*iterArray).second).GetInteger() == 3);
+  DALI_TEST_CHECK(((*iterArray).second).GetType() == TreeNode::INTEGER);
+  DALI_TEST_CHECK((*iterArray).first == NULL);
+  DALI_TEST_CHECK(((*iterArray).second).GetInteger() == 3);
 
   ++iter;
   DALI_TEST_CHECK(iter != root->CEnd());
@@ -212,12 +210,12 @@ int UtcDaliJsonParserMethod01(void)
 
   TreeNode::ConstIterator iterObject = node->CBegin();
   DALI_TEST_CHECK(iterObject != node->CEnd());
-  DALI_TEST_CHECK( ((*iterObject).second).GetType() == TreeNode::STRING);
-  DALI_TEST_CHECK( std::string((*iterObject).first) == std::string("key" ));
-  DALI_TEST_CHECK( std::string(((*iterObject).second).GetString()) == std::string("value"));
+  DALI_TEST_CHECK(((*iterObject).second).GetType() == TreeNode::STRING);
+  DALI_TEST_CHECK(std::string((*iterObject).first) == std::string("key"));
+  DALI_TEST_CHECK(std::string(((*iterObject).second).GetString()) == std::string("value"));
 
   ++iter;
-  DALI_TEST_CHECK(!( iter != root->CEnd() ));
+  DALI_TEST_CHECK(!(iter != root->CEnd()));
 
   ++iter; // Go past the end
 
@@ -233,7 +231,8 @@ int UtcDaliJsonParserMethod02(void)
 
   tet_infoline("JSON Comments");
 
-  std::string s1( ReplaceQuotes("         \
+  std::string s1(ReplaceQuotes(
+    "         \
 // some comments with empty line above  \n\
 {                                         \
   // inline comments                    \n\
@@ -245,7 +244,7 @@ int UtcDaliJsonParserMethod02(void)
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   if(parser.ParseError())
   {
@@ -273,27 +272,25 @@ int UtcDaliJsonParserMethod02(void)
   END_TEST;
 }
 
-
 int UtcDaliJsonParserMethod03(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline("JSON Empty line comment");
 
-  std::string s1( ReplaceQuotes(
-"/*\n" \
-"c comment\n" \
-"*/"\
-"// next empty line comment\n"\
-"//\n"\
-"{\n"\
-"  'key':'value'\n"\
-"}\n"\
-));
+  std::string s1(ReplaceQuotes(
+    "/*\n"
+    "c comment\n"
+    "*/"
+    "// next empty line comment\n"
+    "//\n"
+    "{\n"
+    "  'key':'value'\n"
+    "}\n"));
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   if(parser.ParseError())
   {
@@ -327,7 +324,8 @@ int UtcDaliJsonParserMethod04(void)
 
   tet_infoline("JSON Merge");
 
-  std::string s1( ReplaceQuotes("                                       \
+  std::string s1(ReplaceQuotes(
+    "                                       \
 {                                                                       \
   'animations':                                                         \
   {                                                                     \
@@ -348,7 +346,8 @@ int UtcDaliJsonParserMethod04(void)
 }                                                                       \
 "));
 
-  std::string s2( ReplaceQuotes("                                       \
+  std::string s2(ReplaceQuotes(
+    "                                       \
 {                                                                       \
   'animations':                                                         \
   {                                                                     \
@@ -364,7 +363,7 @@ int UtcDaliJsonParserMethod04(void)
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   if(parser.ParseError())
   {
@@ -373,7 +372,7 @@ int UtcDaliJsonParserMethod04(void)
   }
   DALI_TEST_CHECK(!parser.ParseError());
 
-  parser.Parse( s2 );
+  parser.Parse(s2);
 
   if(parser.ParseError())
   {
@@ -386,15 +385,14 @@ int UtcDaliJsonParserMethod04(void)
   const TreeNode* root = parser.GetRoot();
   DALI_TEST_CHECK(root);
 
-  const TreeNode *node = root->Find("bump");
+  const TreeNode* node = root->Find("bump");
   DALI_TEST_CHECK(node);
 
   DALI_TEST_CHECK(static_cast<int>(node->Size()) == 4);
 
-  DALI_TEST_CHECK( node->GetChild("duration") );
-  DALI_TEST_CHECK( node->GetChild("loop") );
-  DALI_TEST_CHECK( node->GetChild("properties") );
-
+  DALI_TEST_CHECK(node->GetChild("duration"));
+  DALI_TEST_CHECK(node->GetChild("loop"));
+  DALI_TEST_CHECK(node->GetChild("properties"));
 
   tet_result(TET_PASS);
   END_TEST;
@@ -406,7 +404,8 @@ int UtcDaliJsonParserMethod05(void)
 
   tet_infoline("JSON Pack & Write");
 
-  std::string s1( ReplaceQuotes("                                       \
+  std::string s1(ReplaceQuotes(
+    "                                       \
 {                                                                       \
   'animations':                                                         \
   {                                                                     \
@@ -429,7 +428,7 @@ int UtcDaliJsonParserMethod05(void)
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   if(parser.ParseError())
   {
@@ -446,7 +445,7 @@ int UtcDaliJsonParserMethod05(void)
   std::stringstream b;
   parser.Write(b, 2);
 
-  DALI_TEST_CHECK( a.str() == b.str() );
+  DALI_TEST_CHECK(a.str() == b.str());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -454,9 +453,8 @@ int UtcDaliJsonParserMethod05(void)
 
 namespace
 {
-
-static const int NUMBER_OK_TESTS = 36;
-const char *TEST_OK[NUMBER_OK_TESTS] = {
+static const int NUMBER_OK_TESTS          = 36;
+const char*      TEST_OK[NUMBER_OK_TESTS] = {
   "{ 'hex': '\u0123\u4567\u89AB\uCDEF\uabcd\uef4A' }",
   "{ 'special': '`1~!@#$%^&*()_+-={:[,]}|;.</>?' }",
   "{ 'slash': '/ & \' }",
@@ -494,8 +492,7 @@ const char *TEST_OK[NUMBER_OK_TESTS] = {
   "{'JSON Test Pattern pass3': { 'The outermost value': 'must be an object or array.', 'In this test': 'It is an object.' } }",
   "[[[[[[[[[[[[[[[[[[['Not too deep']]]]]]]]]]]]]]]]]]]",
 };
-}
-
+} // namespace
 
 int UtcDaliJsonParserMethod06(void)
 {
@@ -509,7 +506,7 @@ int UtcDaliJsonParserMethod06(void)
   {
     parser = JsonParser::New();
 
-    parser.Parse( ReplaceQuotes(TEST_OK[i]) );
+    parser.Parse(ReplaceQuotes(TEST_OK[i]));
 
     if(parser.ParseError())
     {
@@ -528,9 +525,8 @@ int UtcDaliJsonParserMethod06(void)
 
 namespace
 {
-
 static const int NUMBER_FAIL_TESTS = 34;
-const char *TEST_FAIL[] = {
+const char*      TEST_FAIL[]       = {
   "[' tab\t   character  \t in\t string   ']",
   "['Extra close']]",
   "['Colon instead of comma': false]",
@@ -566,7 +562,7 @@ const char *TEST_FAIL[] = {
   "[{'no comma':1} {'b:2}]",
   "{'extra comma':1,}",
 };
-}
+} // namespace
 
 int UtcDaliJsonParserMethod07(void)
 {
@@ -580,23 +576,21 @@ int UtcDaliJsonParserMethod07(void)
   {
     parser = JsonParser::New();
 
-    parser.Parse( ReplaceQuotes(TEST_FAIL[i]) );
+    parser.Parse(ReplaceQuotes(TEST_FAIL[i]));
 
     if(!parser.ParseError())
     {
       tet_printf("Invalid JSON parse test %d Failed", i);
       tet_printf("%s", ReplaceQuotes(TEST_FAIL[i]).c_str());
-      tet_printf("JSON Error %d:%d %s (%s)", parser.GetErrorLineNumber(), parser.GetErrorColumn(),
-                 parser.GetErrorDescription().c_str(), parser.GetErrorPosition());
+      tet_printf("JSON Error %d:%d %s (%s)", parser.GetErrorLineNumber(), parser.GetErrorColumn(), parser.GetErrorDescription().c_str(), parser.GetErrorPosition());
     }
 
     DALI_TEST_CHECK(parser.ParseError());
   }
 
-
   parser = JsonParser::New();
 
-  parser.Parse( "['single quote']" );
+  parser.Parse("['single quote']");
 
   if(!parser.ParseError())
   {
@@ -615,7 +609,8 @@ int UtcDaliJsonParserMethod08(void)
 
   tet_infoline("JSON error reporting");
 
-  std::string s1( ReplaceQuotes("\
+  std::string s1(ReplaceQuotes(
+    "\
 {                                         \n\
   'float':,],                             \n\
 }                                         \n\
@@ -623,11 +618,11 @@ int UtcDaliJsonParserMethod08(void)
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   DALI_TEST_CHECK(parser.ParseError());
 
-  DALI_TEST_CHECK(1  == parser.GetErrorLineNumber());
+  DALI_TEST_CHECK(1 == parser.GetErrorLineNumber());
   DALI_TEST_CHECK(53 == parser.GetErrorPosition());
   DALI_TEST_CHECK(11 == parser.GetErrorColumn());
   DALI_TEST_CHECK("Missing Value" == parser.GetErrorDescription());
@@ -642,7 +637,8 @@ int UtcDaliJsonParserMethod09(void)
 
   tet_infoline("JSON Pack()");
 
-  std::string s1( ReplaceQuotes("\
+  std::string s1(ReplaceQuotes(
+    "\
 {                                         \
   'string':'value2',                      \
   'integer':2,                            \
@@ -656,7 +652,7 @@ int UtcDaliJsonParserMethod09(void)
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   std::stringstream ss1;
   parser.Write(ss1, 2);
@@ -678,11 +674,11 @@ int UtcDaliJsonParserMethod10(void)
 
   tet_infoline("JSON empty data");
 
-  std::string s1( "" );
+  std::string s1("");
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   DALI_TEST_CHECK(parser.ParseError());
 
@@ -695,7 +691,8 @@ int UtcDaliJsonParserMethod11(void)
   ToolkitTestApplication application;
   tet_infoline("JSON tree copy");
 
-  std::string s1( ReplaceQuotes("                                       \
+  std::string s1(ReplaceQuotes(
+    "                                       \
 {                                                                       \
   'animations':                                                         \
   {                                                                     \
@@ -718,26 +715,26 @@ int UtcDaliJsonParserMethod11(void)
 
   JsonParser parser = JsonParser::New();
 
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   JsonParser parser2 = JsonParser::New(*parser.GetRoot());
 
   DALI_TEST_CHECK(parser.GetRoot());
   DALI_TEST_CHECK(parser2.GetRoot());
 
-  CompareTrees( *parser.GetRoot(), *parser2.GetRoot() );
+  CompareTrees(*parser.GetRoot(), *parser2.GetRoot());
 
   tet_result(TET_PASS);
   END_TEST;
 }
 
-
 int UtcDaliJsonParserMerge1(void)
 {
   ToolkitTestApplication application;
   tet_infoline("JSON tree merge");
 
-  std::string s1( ReplaceQuotes("                                       \
+  std::string s1(ReplaceQuotes(
+    "                                       \
 {                                                                       \
   'styles':                                                             \
   {                                                                     \
@@ -750,17 +747,17 @@ int UtcDaliJsonParserMerge1(void)
 }                                                                       \
 "));
 
-  JsonParser parser = JsonParser::New();
+  JsonParser parser     = JsonParser::New();
   JsonParser testParser = JsonParser::New();
 
-  testParser.Parse( s1 );
+  testParser.Parse(s1);
 
-  parser.Parse( s1 );
-  parser.Parse( s1 ); // Merge the tree into itself. The value array should not grow.
+  parser.Parse(s1);
+  parser.Parse(s1); // Merge the tree into itself. The value array should not grow.
 
   DALI_TEST_CHECK(parser.GetRoot());
 
-  CompareTrees( *parser.GetRoot(), *testParser.GetRoot() );
+  CompareTrees(*parser.GetRoot(), *testParser.GetRoot());
 
   END_TEST;
 }
@@ -768,14 +765,15 @@ int UtcDaliJsonParserMerge1(void)
 int UtcDaliJsonParserDownCast(void)
 {
   BaseHandle handle = JsonParser::New();
-  JsonParser parser = JsonParser::DownCast( handle );
-  DALI_TEST_CHECK( parser );
+  JsonParser parser = JsonParser::DownCast(handle);
+  DALI_TEST_CHECK(parser);
   END_TEST;
 }
 
 int UtcDaliJsonParserTreeNodeCount(void)
 {
-  std::string s1( ReplaceQuotes("                                       \
+  std::string s1(ReplaceQuotes(
+    "                                       \
 {                                                                       \
   'styles':                                                             \
   {                                                                     \
@@ -789,18 +787,19 @@ int UtcDaliJsonParserTreeNodeCount(void)
 "));
 
   JsonParser parser = JsonParser::New();
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
   const TreeNode* treeNode = parser.GetRoot();
-  DALI_TEST_EQUALS(1, treeNode->Count("styles"), TEST_LOCATION );
-  DALI_TEST_EQUALS(0, treeNode->Count("random"), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, treeNode->Count("styles"), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, treeNode->Count("random"), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliJsonParserTreeNodeFind(void)
 {
-  std::string s1( ReplaceQuotes("\
+  std::string s1(ReplaceQuotes(
+    "\
 {                                         \
   'string':'value2',                      \
   'integer':2,                            \
@@ -813,13 +812,13 @@ int UtcDaliJsonParserTreeNodeFind(void)
 "));
 
   JsonParser parser = JsonParser::New();
-  parser.Parse( s1 );
+  parser.Parse(s1);
 
-  const TreeNode* treeNode = parser.GetRoot();
+  const TreeNode* treeNode  = parser.GetRoot();
   const TreeNode* childNode = treeNode->Find("string");
-  DALI_TEST_CHECK( childNode );
+  DALI_TEST_CHECK(childNode);
   const TreeNode* sameNode = childNode->Find("string");
-  DALI_TEST_EQUALS( sameNode, childNode, TEST_LOCATION );
+  DALI_TEST_EQUALS(sameNode, childNode, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
index 5a0cf33..8377ec7 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,14 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/key-event-integ.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali/devel-api/common/stage-devel.h>
+#include <dali/integration-api/events/key-event-integ.h>
+#include <stdlib.h>
+#include <iostream>
 
 #include "dummy-control.h"
 
@@ -30,7 +31,6 @@ using namespace Toolkit;
 
 namespace
 {
-
 /**
  * Callback class for KeyInputFocusChanged signal.
  */
@@ -42,13 +42,13 @@ public:
    * @param[in]  gainActor  Ref to the actor that should be set as the one that gains key input focus.
    * @param[in]  lostActor  Ref to the actor that should be set as the one that loses key input focus.
    */
-  KeyInputFocusChangedCallback( Control& gainActor, Control& lostActor )
-  : mActorGain( gainActor ),
-    mActorLost( lostActor )
+  KeyInputFocusChangedCallback(Control& gainActor, Control& lostActor)
+  : mActorGain(gainActor),
+    mActorLost(lostActor)
   {
   }
 
-  void Callback( Control gainingActor, Control lostActor )
+  void Callback(Control gainingActor, Control lostActor)
   {
     mActorGain = gainingActor;
     mActorLost = lostActor;
@@ -63,17 +63,17 @@ struct SignalData
 {
   SignalData()
   : functorCalled(false)
-  {}
+  {
+  }
 
   void Reset()
   {
     functorCalled = false;
 
     receivedKeyEvent.Reset();
-
   }
 
-  bool functorCalled;
+  bool     functorCalled;
   KeyEvent receivedKeyEvent;
 };
 
@@ -87,19 +87,19 @@ public:
    * Constructor
    * @param[in]  returnValue  Set return value of KeyEvent callback.
    * */
-  KeyEventCallback( bool consumed )
-  : mConsumed( consumed ),
-    mIsCalled( false )
+  KeyEventCallback(bool consumed)
+  : mConsumed(consumed),
+    mIsCalled(false)
   {
   }
 
-  bool Callback( Control control, const KeyEvent& keyEvent )
+  bool Callback(Control control, const KeyEvent& keyEvent)
   {
     mIsCalled = true;
     return mConsumed;
   }
 
-  void Callback( const KeyEvent& keyEvent )
+  void Callback(const KeyEvent& keyEvent)
   {
     mIsCalled = true;
   }
@@ -144,7 +144,7 @@ int UtcDaliKeyInputFocusManagerGet(void)
 int UtcDaliKeyInputFocusManagerSetFocus01(void)
 {
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   tet_infoline(" Check that there is no focused control. Set focus to control. Check it is now the focused actor and receives KeyInputFocusGained signal");
 
@@ -152,21 +152,21 @@ int UtcDaliKeyInputFocusManagerSetFocus01(void)
   DALI_TEST_CHECK(manager);
 
   Control focusedControl = manager.GetCurrentFocusControl();
-  DALI_TEST_CHECK( ! focusedControl );
+  DALI_TEST_CHECK(!focusedControl);
 
-  DummyControl dummy = DummyControl::New(true);
+  DummyControl        dummy     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
-  dummy.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  stage.Add( dummy );
-  DALI_TEST_CHECK( ! dummyImpl.keyInputFocusGained );
+  dummy.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  stage.Add(dummy);
+  DALI_TEST_CHECK(!dummyImpl.keyInputFocusGained);
 
-  manager.SetFocus( dummy );
-  DALI_TEST_CHECK( dummy.HasKeyInputFocus()); // Also tests IsKeyboardListener() API
-  DALI_TEST_CHECK( dummyImpl.keyInputFocusGained );
+  manager.SetFocus(dummy);
+  DALI_TEST_CHECK(dummy.HasKeyInputFocus()); // Also tests IsKeyboardListener() API
+  DALI_TEST_CHECK(dummyImpl.keyInputFocusGained);
 
   focusedControl = manager.GetCurrentFocusControl();
-  DALI_TEST_CHECK( focusedControl );
-  DALI_TEST_CHECK( focusedControl == dummy );
+  DALI_TEST_CHECK(focusedControl);
+  DALI_TEST_CHECK(focusedControl == dummy);
 
   END_TEST;
 }
@@ -174,97 +174,95 @@ int UtcDaliKeyInputFocusManagerSetFocus01(void)
 int UtcDaliKeyInputFocusManagerSetFocus02(void)
 {
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   tet_infoline(" Set focus to control. Check it is now the focused actor and receives KeyInputFocusGained signal. Set focuse to another control - check that the first control receives KeyInputFocusLost");
 
   KeyInputFocusManager manager = KeyInputFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  DummyControl dummy1 = DummyControl::New(true);
+  DummyControl        dummy1     = DummyControl::New(true);
   Impl::DummyControl& dummy1Impl = static_cast<Impl::DummyControl&>(dummy1.GetImplementation());
-  dummy1.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  stage.Add( dummy1 );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusLost );
-
-  manager.SetFocus( dummy1 );
-  DALI_TEST_CHECK( dummy1.HasKeyInputFocus()); // Also tests IsKeyboardListener() API
-  DALI_TEST_CHECK( dummy1Impl.keyInputFocusGained );
+  dummy1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  stage.Add(dummy1);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusLost);
+
+  manager.SetFocus(dummy1);
+  DALI_TEST_CHECK(dummy1.HasKeyInputFocus()); // Also tests IsKeyboardListener() API
+  DALI_TEST_CHECK(dummy1Impl.keyInputFocusGained);
   dummy1Impl.keyInputFocusGained = false;
 
-  DummyControl dummy2 = DummyControl::New(true);
+  DummyControl        dummy2     = DummyControl::New(true);
   Impl::DummyControl& dummy2Impl = static_cast<Impl::DummyControl&>(dummy2.GetImplementation());
-  dummy2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  stage.Add( dummy2 );
-  DALI_TEST_CHECK( ! dummy2Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusLost );
-
-  manager.SetFocus( dummy2 );
-  DALI_TEST_CHECK( dummy2.HasKeyInputFocus()); // Also tests IsKeyboardListener() API
-  DALI_TEST_CHECK( dummy2Impl.keyInputFocusGained );
+  dummy2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  stage.Add(dummy2);
+  DALI_TEST_CHECK(!dummy2Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusLost);
+
+  manager.SetFocus(dummy2);
+  DALI_TEST_CHECK(dummy2.HasKeyInputFocus()); // Also tests IsKeyboardListener() API
+  DALI_TEST_CHECK(dummy2Impl.keyInputFocusGained);
   dummy1Impl.keyInputFocusGained = false;
 
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( dummy1Impl.keyInputFocusLost );
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(dummy1Impl.keyInputFocusLost);
 
   END_TEST;
 }
 
 int UtcDaliKeyInputFocusManagerKeyEventPropagation01(void)
 {
-
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   tet_infoline("Test KeyEvent propagation. If focused control doesn't consume KeyEvent, KeyEvent will be recursively delivered to the control and its parents, until the event is consumed or the stage is reached. In this case, KeyEvent is delivered to KeyboardFocusManager via Stage's KeyEventSignal");
 
   KeyInputFocusManager manager = KeyInputFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  KeyEventCallback stageCallback( false );
-  stage.KeyEventSignal().Connect( &stageCallback, &KeyEventCallback::Callback );
+  KeyEventCallback stageCallback(false);
+  stage.KeyEventSignal().Connect(&stageCallback, &KeyEventCallback::Callback);
 
   DummyControl dummy1 = DummyControl::New(true);
-  dummy1.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  KeyEventCallback callback1( false );
-  dummy1.KeyEventSignal().Connect( &callback1, &KeyEventCallback::Callback );
-  stage.Add( dummy1 );
+  dummy1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback1(false);
+  dummy1.KeyEventSignal().Connect(&callback1, &KeyEventCallback::Callback);
+  stage.Add(dummy1);
 
   DummyControl dummy2 = DummyControl::New(true);
-  dummy2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  KeyEventCallback callback2( false );
-  dummy2.KeyEventSignal().Connect( &callback2, &KeyEventCallback::Callback );
-  dummy1.Add( dummy2 );
+  dummy2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback2(false);
+  dummy2.KeyEventSignal().Connect(&callback2, &KeyEventCallback::Callback);
+  dummy1.Add(dummy2);
 
-  DummyControl dummy3 = DummyControl::New(true);
+  DummyControl        dummy3     = DummyControl::New(true);
   Impl::DummyControl& dummy3Impl = static_cast<Impl::DummyControl&>(dummy3.GetImplementation());
-  dummy3.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  KeyEventCallback callback3( false );
-  dummy3.KeyEventSignal().Connect( &callback3, &KeyEventCallback::Callback );
-  dummy2.Add( dummy3 );
-  DALI_TEST_CHECK( ! dummy3Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy3Impl.keyInputFocusLost );
+  dummy3.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback3(false);
+  dummy3.KeyEventSignal().Connect(&callback3, &KeyEventCallback::Callback);
+  dummy2.Add(dummy3);
+  DALI_TEST_CHECK(!dummy3Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy3Impl.keyInputFocusLost);
 
-  manager.SetFocus( dummy3 );
-  DALI_TEST_CHECK( dummy3Impl.keyInputFocusGained );
+  manager.SetFocus(dummy3);
+  DALI_TEST_CHECK(dummy3Impl.keyInputFocusGained);
 
-  Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "", "", Device::Class::TOUCH, Device::Subclass::NONE );
+  Integration::KeyEvent event("a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "", "", Device::Class::TOUCH, Device::Subclass::NONE);
   application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( callback1.mIsCalled );
-  DALI_TEST_CHECK( callback2.mIsCalled );
-  DALI_TEST_CHECK( callback3.mIsCalled );
-  DALI_TEST_CHECK( stageCallback.mIsCalled );
+  DALI_TEST_CHECK(callback1.mIsCalled);
+  DALI_TEST_CHECK(callback2.mIsCalled);
+  DALI_TEST_CHECK(callback3.mIsCalled);
+  DALI_TEST_CHECK(stageCallback.mIsCalled);
 
   END_TEST;
 }
 
 int UtcDaliKeyInputFocusManagerKeyEventPropagation02(void)
 {
-
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   tet_infoline("Test KeyEvent propagation. If focused control doesn't consume KeyEvent, KeyEvent will be recursively delivered to the control and its parents, until the event is consumed or the stage is reached. In this case, KeyEvent is delivered from dummy3 to dummy2");
 
@@ -272,35 +270,81 @@ int UtcDaliKeyInputFocusManagerKeyEventPropagation02(void)
   DALI_TEST_CHECK(manager);
 
   DummyControl dummy1 = DummyControl::New(true);
-  dummy1.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  KeyEventCallback callback1( false );
-  dummy1.KeyEventSignal().Connect( &callback1, &KeyEventCallback::Callback );
-  stage.Add( dummy1 );
+  dummy1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback1(false);
+  dummy1.KeyEventSignal().Connect(&callback1, &KeyEventCallback::Callback);
+  stage.Add(dummy1);
 
   DummyControl dummy2 = DummyControl::New(true);
-  dummy2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  KeyEventCallback callback2( true );
-  dummy2.KeyEventSignal().Connect( &callback2, &KeyEventCallback::Callback );
-  dummy1.Add( dummy2 );
+  dummy2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback2(true);
+  dummy2.KeyEventSignal().Connect(&callback2, &KeyEventCallback::Callback);
+  dummy1.Add(dummy2);
 
-  DummyControl dummy3 = DummyControl::New(true);
+  DummyControl        dummy3     = DummyControl::New(true);
   Impl::DummyControl& dummy3Impl = static_cast<Impl::DummyControl&>(dummy3.GetImplementation());
-  dummy3.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  KeyEventCallback callback3( false );
-  dummy3.KeyEventSignal().Connect( &callback3, &KeyEventCallback::Callback );
-  dummy2.Add( dummy3 );
-  DALI_TEST_CHECK( ! dummy3Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy3Impl.keyInputFocusLost );
+  dummy3.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback3(false);
+  dummy3.KeyEventSignal().Connect(&callback3, &KeyEventCallback::Callback);
+  dummy2.Add(dummy3);
+  DALI_TEST_CHECK(!dummy3Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy3Impl.keyInputFocusLost);
 
-  manager.SetFocus( dummy3 );
-  DALI_TEST_CHECK( dummy3Impl.keyInputFocusGained );
+  manager.SetFocus(dummy3);
+  DALI_TEST_CHECK(dummy3Impl.keyInputFocusGained);
 
-  Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "", "", Device::Class::TOUCH, Device::Subclass::NONE );
+  Integration::KeyEvent event("a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "", "", Device::Class::TOUCH, Device::Subclass::NONE);
   application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !callback1.mIsCalled );
-  DALI_TEST_CHECK( callback2.mIsCalled );
-  DALI_TEST_CHECK( callback3.mIsCalled );
+  DALI_TEST_CHECK(!callback1.mIsCalled);
+  DALI_TEST_CHECK(callback2.mIsCalled);
+  DALI_TEST_CHECK(callback3.mIsCalled);
+
+  END_TEST;
+}
+
+int UtcDaliKeyInputFocusManagerDispatchKeyEvents(void)
+{
+  ToolkitTestApplication application;
+  Integration::Scene     stage = application.GetScene();
+
+  tet_infoline("Test KeyEvents propagation. If DISPATCH_KEY_EVENTS property is false, the KeyEvent is also not received.");
+
+  KeyInputFocusManager manager = KeyInputFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+
+  DummyControl dummy1 = DummyControl::New(true);
+  dummy1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback1(false);
+  dummy1.KeyEventSignal().Connect(&callback1, &KeyEventCallback::Callback);
+  stage.Add(dummy1);
+
+  DummyControl dummy2 = DummyControl::New(true);
+  dummy2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback2(false);
+  dummy2.KeyEventSignal().Connect(&callback2, &KeyEventCallback::Callback);
+  // dummy2 set DISPATCH_KEY_EVENTS property to false.
+  dummy2.SetProperty(Toolkit::DevelControl::Property::DISPATCH_KEY_EVENTS, false);
+  dummy1.Add(dummy2);
+
+  DummyControl        dummy3     = DummyControl::New(true);
+  Impl::DummyControl& dummy3Impl = static_cast<Impl::DummyControl&>(dummy3.GetImplementation());
+  dummy3.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  KeyEventCallback callback3(false);
+  dummy3.KeyEventSignal().Connect(&callback3, &KeyEventCallback::Callback);
+  dummy2.Add(dummy3);
+  DALI_TEST_CHECK(!dummy3Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy3Impl.keyInputFocusLost);
+
+  manager.SetFocus(dummy3);
+  DALI_TEST_CHECK(dummy3Impl.keyInputFocusGained);
+
+  Integration::KeyEvent event("a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "", "", Device::Class::TOUCH, Device::Subclass::NONE);
+  application.ProcessEvent(event);
+
+  DALI_TEST_CHECK(!callback1.mIsCalled);
+  DALI_TEST_CHECK(!callback2.mIsCalled);
+  DALI_TEST_CHECK(!callback3.mIsCalled);
 
   END_TEST;
 }
@@ -308,81 +352,81 @@ int UtcDaliKeyInputFocusManagerKeyEventPropagation02(void)
 int UtcDaliKeyInputFocusManagerGetCurrentFocusControl(void)
 {
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   tet_infoline(" Add 2 controls, check they each get focused. Re-focus the first control - ensure it's now got focus (check signals)");
 
   KeyInputFocusManager manager = KeyInputFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  DummyControl dummy1 = DummyControl::New(true);
+  DummyControl        dummy1     = DummyControl::New(true);
   Impl::DummyControl& dummy1Impl = static_cast<Impl::DummyControl&>(dummy1.GetImplementation());
-  dummy1.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  stage.Add( dummy1 );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusLost );
+  dummy1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  stage.Add(dummy1);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusLost);
 
-  DummyControl dummy2 = DummyControl::New(true);
+  DummyControl        dummy2     = DummyControl::New(true);
   Impl::DummyControl& dummy2Impl = static_cast<Impl::DummyControl&>(dummy2.GetImplementation());
-  dummy2.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  stage.Add( dummy2 );
-  DALI_TEST_CHECK( ! dummy2Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy2Impl.keyInputFocusLost );
+  dummy2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  stage.Add(dummy2);
+  DALI_TEST_CHECK(!dummy2Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy2Impl.keyInputFocusLost);
 
   manager.SetFocus(dummy1);
-  DALI_TEST_CHECK( dummy1 == manager.GetCurrentFocusControl() );
-  DALI_TEST_CHECK( dummy1Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusLost );
+  DALI_TEST_CHECK(dummy1 == manager.GetCurrentFocusControl());
+  DALI_TEST_CHECK(dummy1Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusLost);
   dummy1Impl.keyInputFocusGained = false;
-  dummy1Impl.keyInputFocusLost = false;
+  dummy1Impl.keyInputFocusLost   = false;
 
   manager.SetFocus(dummy2);
-  DALI_TEST_CHECK( dummy2 == manager.GetCurrentFocusControl() );
-  DALI_TEST_CHECK( dummy1Impl.keyInputFocusLost );
-  DALI_TEST_CHECK( dummy2Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy2Impl.keyInputFocusLost );
+  DALI_TEST_CHECK(dummy2 == manager.GetCurrentFocusControl());
+  DALI_TEST_CHECK(dummy1Impl.keyInputFocusLost);
+  DALI_TEST_CHECK(dummy2Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy2Impl.keyInputFocusLost);
   // Reset signal received
   dummy1Impl.keyInputFocusGained = false;
-  dummy1Impl.keyInputFocusLost = false;
+  dummy1Impl.keyInputFocusLost   = false;
   dummy2Impl.keyInputFocusGained = false;
-  dummy2Impl.keyInputFocusLost = false;
+  dummy2Impl.keyInputFocusLost   = false;
 
   manager.SetFocus(dummy1);
-  DALI_TEST_CHECK( dummy1 == manager.GetCurrentFocusControl());
-  DALI_TEST_CHECK( dummy1Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( dummy2Impl.keyInputFocusLost );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusLost );
-  DALI_TEST_CHECK( ! dummy2Impl.keyInputFocusGained );
+  DALI_TEST_CHECK(dummy1 == manager.GetCurrentFocusControl());
+  DALI_TEST_CHECK(dummy1Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(dummy2Impl.keyInputFocusLost);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusLost);
+  DALI_TEST_CHECK(!dummy2Impl.keyInputFocusGained);
   END_TEST;
 }
 
 int UtcDaliKeyInputFocusManagerRemoveFocus(void)
 {
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   tet_infoline(" Add focus controls. Test that removing focus from control which has focus. ");
 
   KeyInputFocusManager manager = KeyInputFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  DummyControl dummy1 = DummyControl::New(true);
+  DummyControl        dummy1     = DummyControl::New(true);
   Impl::DummyControl& dummy1Impl = static_cast<Impl::DummyControl&>(dummy1.GetImplementation());
-  dummy1.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  stage.Add( dummy1 );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusGained );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusLost );
+  dummy1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  stage.Add(dummy1);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusGained);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusLost);
 
   manager.SetFocus(dummy1);
   DALI_TEST_CHECK(dummy1 == manager.GetCurrentFocusControl());
   dummy1Impl.keyInputFocusGained = false;
-  dummy1Impl.keyInputFocusLost = false;
+  dummy1Impl.keyInputFocusLost   = false;
 
   manager.RemoveFocus(dummy1);
   DALI_TEST_CHECK(Control() == manager.GetCurrentFocusControl());
-  DALI_TEST_CHECK( dummy1Impl.keyInputFocusLost );
-  DALI_TEST_CHECK( ! dummy1Impl.keyInputFocusGained );
+  DALI_TEST_CHECK(dummy1Impl.keyInputFocusLost);
+  DALI_TEST_CHECK(!dummy1Impl.keyInputFocusGained);
 
   END_TEST;
 }
@@ -390,88 +434,117 @@ int UtcDaliKeyInputFocusManagerRemoveFocus(void)
 int UtcDaliKeyInputFocusManagerSignalKeyInputFocusChanged(void)
 {
   ToolkitTestApplication application;
-  KeyInputFocusManager manager = KeyInputFocusManager::Get();
-  Integration::Scene stage = application.GetScene();
+  KeyInputFocusManager   manager = KeyInputFocusManager::Get();
+  Integration::Scene     stage   = application.GetScene();
 
   tet_infoline(" UtcDaliKeyInputFocusManagerSignalKeyInputFocusChanged");
 
   PushButton pushButton1 = PushButton::New();
   PushButton pushButton2 = PushButton::New();
 
-  stage.Add( pushButton1 );
-  stage.Add( pushButton2 );
+  stage.Add(pushButton1);
+  stage.Add(pushButton2);
 
-  PushButton gainActor, lostActor;
-  KeyInputFocusChangedCallback callback( gainActor, lostActor );
-  manager.KeyInputFocusChangedSignal().Connect( &callback, &KeyInputFocusChangedCallback::Callback );
+  PushButton                   gainActor, lostActor;
+  KeyInputFocusChangedCallback callback(gainActor, lostActor);
+  manager.KeyInputFocusChangedSignal().Connect(&callback, &KeyInputFocusChangedCallback::Callback);
 
   manager.SetFocus(pushButton1);
 
-  DALI_TEST_CHECK( gainActor == pushButton1 );
-  DALI_TEST_CHECK( lostActor == Control() );
+  DALI_TEST_CHECK(gainActor == pushButton1);
+  DALI_TEST_CHECK(lostActor == Control());
 
   gainActor.Reset();
   lostActor.Reset();
 
   manager.SetFocus(pushButton2);
 
-  DALI_TEST_CHECK( gainActor == pushButton2 );
-  DALI_TEST_CHECK( lostActor == pushButton1 );
+  DALI_TEST_CHECK(gainActor == pushButton2);
+  DALI_TEST_CHECK(lostActor == pushButton1);
 
   gainActor.Reset();
   lostActor.Reset();
 
   // Removing the focus actor from the stage would also result in signal emission.
-  stage.Remove( pushButton1 );
-  stage.Remove( pushButton2 );
+  stage.Remove(pushButton1);
+  stage.Remove(pushButton2);
 
-  DALI_TEST_CHECK( gainActor == Control() );
-  DALI_TEST_CHECK( lostActor == Control() );
+  DALI_TEST_CHECK(gainActor == Control());
+  DALI_TEST_CHECK(lostActor == Control());
   END_TEST;
 }
 
 int UtcDaliKeyInputFocusManagerSignalKeyInputFocusChangedforNewWindow(void)
 {
   ToolkitTestApplication application;
-  KeyInputFocusManager manager = KeyInputFocusManager::Get();
+  KeyInputFocusManager   manager = KeyInputFocusManager::Get();
 
   tet_infoline(" UtcDaliKeyInputFocusManagerSignalKeyInputFocusChanged");
 
   PushButton pushButton1 = PushButton::New();
   PushButton pushButton2 = PushButton::New();
 
-  Window window = Window::New(PositionSize(0,0,0,0) ,"", false);
-  DALI_TEST_CHECK( window );
+  Window window = Window::New(PositionSize(0, 0, 0, 0), "", false);
+  DALI_TEST_CHECK(window);
 
-  window.Add( pushButton1 );
-  window.Add( pushButton2 );
+  window.Add(pushButton1);
+  window.Add(pushButton2);
 
-  PushButton gainActor, lostActor;
-  KeyInputFocusChangedCallback callback( gainActor, lostActor );
-  manager.KeyInputFocusChangedSignal().Connect( &callback, &KeyInputFocusChangedCallback::Callback );
+  PushButton                   gainActor, lostActor;
+  KeyInputFocusChangedCallback callback(gainActor, lostActor);
+  manager.KeyInputFocusChangedSignal().Connect(&callback, &KeyInputFocusChangedCallback::Callback);
 
   manager.SetFocus(pushButton1);
 
-  DALI_TEST_CHECK( gainActor == pushButton1 );
-  DALI_TEST_CHECK( lostActor == Control() );
+  DALI_TEST_CHECK(gainActor == pushButton1);
+  DALI_TEST_CHECK(lostActor == Control());
 
   gainActor.Reset();
   lostActor.Reset();
 
   manager.SetFocus(pushButton2);
 
-  DALI_TEST_CHECK( gainActor == pushButton2 );
-  DALI_TEST_CHECK( lostActor == pushButton1 );
+  DALI_TEST_CHECK(gainActor == pushButton2);
+  DALI_TEST_CHECK(lostActor == pushButton1);
 
   gainActor.Reset();
   lostActor.Reset();
 
   // Removing the focus actor from the window would also result in signal emission.
-  window.Remove( pushButton1 );
-  window.Remove( pushButton2 );
-  DALI_TEST_CHECK( gainActor == Control() );
-  DALI_TEST_CHECK( lostActor == Control() );
+  window.Remove(pushButton1);
+  window.Remove(pushButton2);
+  DALI_TEST_CHECK(gainActor == Control());
+  DALI_TEST_CHECK(lostActor == Control());
 
   window.Reset();
   END_TEST;
 }
+
+int UtcDaliKeyInputFocusManagerKeyEventOtherWindow(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliKeyInputFocusManagerSignalKeyEventOtherWindow");
+
+  Dali::Integration::Scene scene = application.GetScene();
+
+  KeyInputFocusManager   manager = KeyInputFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+
+  PushButton pushButton1 = PushButton::New();
+  scene.Add(pushButton1);
+
+  KeyEventCallback windowCallback(false);
+  pushButton1.KeyEventSignal().Connect(&windowCallback, &KeyEventCallback::Callback);
+
+  manager.SetFocus(pushButton1);
+
+  Integration::KeyEvent event("a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "", "", Device::Class::TOUCH, Device::Subclass::NONE);
+  event.windowId = 3;
+
+  application.ProcessEvent(event);
+
+  DALI_TEST_CHECK(!windowCallback.mIsCalled);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
index 6d0e8af..4d0d54e 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,20 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/integration-api/events/key-event-integ.h>
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/integration-api/events/key-event-integ.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/integration-api/events/wheel-event-integ.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -42,10 +43,8 @@ void utc_dali_toolkit_keyboard_focus_manager_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 namespace
 {
-
 const std::string DEFAULT_DEVICE_NAME("hwKeyboard");
 
 // Functors to test whether GetNextFocusableActor() method of CustomAlgorithmInterface is called when the keyboard focus is about to change
@@ -56,35 +55,39 @@ public:
   : mInterfaceVerified(interfaceVerified),
     mCurrentFocusedActor(),
     mProposedActorToFocus(),
-    mDirection(Control::KeyboardFocus::LEFT)
+    mDirection(Control::KeyboardFocus::LEFT),
+    mDeviceName("")
   {
   }
 
-  Actor GetNextFocusableActor(Actor currentFocusedActor, Actor proposedActorToFocus, Control::KeyboardFocus::Direction direction)
+  Actor GetNextFocusableActor(Actor currentFocusedActor, Actor proposedActorToFocus, Control::KeyboardFocus::Direction direction, const std::string& deviceName)
   {
     tet_infoline("Verifying CustomAlgorithm()");
 
     mInterfaceVerified = true;
 
-    mCurrentFocusedActor = currentFocusedActor;
+    mCurrentFocusedActor  = currentFocusedActor;
     mProposedActorToFocus = proposedActorToFocus;
-    mDirection = direction;
+    mDirection            = direction;
+    mDeviceName           = deviceName;
 
     return mProposedActorToFocus;
   }
 
   void Reset()
   {
-    mInterfaceVerified = false;
-    mCurrentFocusedActor = Actor();
+    mInterfaceVerified    = false;
+    mCurrentFocusedActor  = Actor();
     mProposedActorToFocus = Actor();
-    mDirection = Control::KeyboardFocus::LEFT;
+    mDirection            = Control::KeyboardFocus::LEFT;
+    mDeviceName           = "";
   }
 
-  bool& mInterfaceVerified;
-  Actor mCurrentFocusedActor;
-  Actor mProposedActorToFocus;
+  bool&                             mInterfaceVerified;
+  Actor                             mCurrentFocusedActor;
+  Actor                             mProposedActorToFocus;
   Control::KeyboardFocus::Direction mDirection;
+  std::string mDeviceName;
 };
 
 // Functors to test whether PreFocusChange signal is emitted when the keyboard focus is about to change
@@ -105,24 +108,24 @@ public:
 
     mSignalVerified = true;
 
-    mCurrentFocusedActor = currentFocusedActor;
+    mCurrentFocusedActor  = currentFocusedActor;
     mProposedActorToFocus = proposedActorToFocus;
-    mDirection = direction;
+    mDirection            = direction;
 
     return mProposedActorToFocus;
   }
 
   void Reset()
   {
-    mSignalVerified = false;
-    mCurrentFocusedActor = Actor();
+    mSignalVerified       = false;
+    mCurrentFocusedActor  = Actor();
     mProposedActorToFocus = Actor();
-    mDirection = Control::KeyboardFocus::LEFT;
+    mDirection            = Control::KeyboardFocus::LEFT;
   }
 
-  bool& mSignalVerified;
-  Actor mCurrentFocusedActor;
-  Actor mProposedActorToFocus;
+  bool&                             mSignalVerified;
+  Actor                             mCurrentFocusedActor;
+  Actor                             mProposedActorToFocus;
   Control::KeyboardFocus::Direction mDirection;
 };
 
@@ -147,7 +150,7 @@ public:
     }
 
     mOriginalFocusedActor = originalFocusedActor;
-    mCurrentFocusedActor = currentFocusedActor;
+    mCurrentFocusedActor  = currentFocusedActor;
   }
 
   void Reset()
@@ -178,7 +181,7 @@ public:
     mSignalVerified = true;
 
     mCurrentFocusedActor = currentFocusedActor;
-    mForward = forward;
+    mForward             = forward;
   }
 
   void Reset()
@@ -188,7 +191,7 @@ public:
 
   bool& mSignalVerified;
   Actor mCurrentFocusedActor;
-  bool mForward;
+  bool  mForward;
 };
 
 // Functors to test whether focused actor activated signal is emitted when the focused actor is activated
@@ -226,19 +229,47 @@ public:
    * Constructor
    * @param[in]  returnValue  Set return value of KeyEvent callback.
    * */
-  KeyEventCallback( bool consumed )
-  : mConsumed( consumed ),
-    mIsCalled( false )
+  KeyEventCallback(bool consumed)
+  : mConsumed(consumed),
+    mIsCalled(false)
+  {
+  }
+
+  bool Callback(Control control, const KeyEvent& keyEvent)
+  {
+    mIsCalled = true;
+    return mConsumed;
+  }
+
+  void Callback(const KeyEvent& keyEvent)
+  {
+    mIsCalled = true;
+  }
+
+  bool mConsumed;
+  bool mIsCalled;
+};
+
+class WheelEventCallback : public Dali::ConnectionTracker
+{
+public:
+  /**
+   * Constructor
+   * @param[in]  returnValue  Set return value of WheelEvent callback.
+   * */
+  WheelEventCallback(bool consumed)
+  : mConsumed(consumed),
+    mIsCalled(false)
   {
   }
 
-  bool Callback( Control control, const KeyEvent& keyEvent )
+  bool Callback(Actor actor, const WheelEvent& wheelEvent)
   {
     mIsCalled = true;
     return mConsumed;
   }
 
-  void Callback( const KeyEvent& keyEvent )
+  void Callback(const WheelEvent& wheelEvent)
   {
     mIsCalled = true;
   }
@@ -269,10 +300,10 @@ int UtcDaliKeyboardFocusManagerGet(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager;
 
@@ -298,12 +329,12 @@ int UtcDaliKeyboardFocusManagerSetAndGetCurrentFocusActor(void)
 
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the stage
   Actor second = Actor::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(second);
 
   // Create the third actor but don't add it to the stage
@@ -335,7 +366,7 @@ int UtcDaliKeyboardFocusManagerSetAndGetCurrentFocusActor(void)
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
 
   // Make the third actor focusable
-  third.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  third.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Check that the focus is successfully moved to the third actor
   DALI_TEST_CHECK(manager.SetCurrentFocusActor(third) == true);
@@ -351,30 +382,30 @@ int UtcDaliKeyboardFocusManagerMoveFocus(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool preFocusChangeSignalVerified = false;
+  bool                   preFocusChangeSignalVerified = false;
   PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified);
-  manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
+  manager.PreFocusChangeSignal().Connect(&preFocusChangeCallback, &PreFocusChangeCallback::Callback);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the stage
   Actor second = Actor::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(second);
 
   // Move the focus to the right
@@ -425,16 +456,16 @@ int UtcDaliKeyboardFocusManagerMoveFocus(void)
   DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
 
   // Create a 2x2 table view and try to move focus inside it
-  TableView tableView = TableView::New( 2, 2 );
+  TableView tableView = TableView::New(2, 2);
   application.GetScene().Add(tableView);
 
   // Create the third actor
   Actor third = Actor::New();
-  third.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  third.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Create the fourth actor
   Actor fourth = Actor::New();
-  fourth.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  fourth.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Add the four children to table view
   tableView.AddChild(first, TableView::CellPosition(0, 0));
@@ -514,30 +545,30 @@ int UtcDaliKeyboardFocusManagerCustomAlgorithmMoveFocus(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool preFocusChangeSignalVerified = false;
+  bool                   preFocusChangeSignalVerified = false;
   PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified);
-  manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
+  manager.PreFocusChangeSignal().Connect(&preFocusChangeCallback, &PreFocusChangeCallback::Callback);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the stage
   Actor second = Actor::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(second);
 
   // Move the focus to the right
@@ -550,18 +581,20 @@ int UtcDaliKeyboardFocusManagerCustomAlgorithmMoveFocus(void)
   DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::KeyboardFocus::RIGHT);
   preFocusChangeCallback.Reset();
 
-  bool customAlgorithmInterfaceVerified = false;
+  bool            customAlgorithmInterfaceVerified = false;
+  std::string     deviceName                       = "deviceName";
   CustomAlgorithm customAlgorithm(customAlgorithmInterfaceVerified);
   Toolkit::DevelKeyboardFocusManager::SetCustomAlgorithm(manager, customAlgorithm);
 
   // Move the focus towards right
-  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == false);
+  DALI_TEST_CHECK(Toolkit::DevelKeyboardFocusManager::MoveFocus(manager, Control::KeyboardFocus::RIGHT, deviceName) == false);
 
   // Because no layout control in the stage and the first actor is focused, it should invoke CustomAlgorithm
   DALI_TEST_CHECK(customAlgorithm.mInterfaceVerified);
   DALI_TEST_CHECK(customAlgorithm.mCurrentFocusedActor == Actor());
   DALI_TEST_CHECK(customAlgorithm.mProposedActorToFocus == Actor());
   DALI_TEST_CHECK(customAlgorithm.mDirection == Control::KeyboardFocus::RIGHT);
+  DALI_TEST_EQUALS(customAlgorithm.mDeviceName, deviceName, TEST_LOCATION );
   customAlgorithm.Reset();
 
   // Check that the focus is set on the first actor
@@ -573,13 +606,14 @@ int UtcDaliKeyboardFocusManagerCustomAlgorithmMoveFocus(void)
   focusChangedCallback.Reset();
 
   // Move the focus towards right
-  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == false);
+  DALI_TEST_CHECK(Toolkit::DevelKeyboardFocusManager::MoveFocus(manager, Control::KeyboardFocus::RIGHT, deviceName) == false);
 
   // Because no layout control in the stage and the first actor is focused, it should invoke CustomAlgorithm
   DALI_TEST_CHECK(customAlgorithm.mInterfaceVerified);
   DALI_TEST_CHECK(customAlgorithm.mCurrentFocusedActor == first);
   DALI_TEST_CHECK(customAlgorithm.mProposedActorToFocus == Actor());
   DALI_TEST_CHECK(customAlgorithm.mDirection == Control::KeyboardFocus::RIGHT);
+  DALI_TEST_EQUALS(customAlgorithm.mDeviceName, deviceName, TEST_LOCATION );
   customAlgorithm.Reset();
 
   // Check that the focus is set on the second actor
@@ -591,13 +625,14 @@ int UtcDaliKeyboardFocusManagerCustomAlgorithmMoveFocus(void)
   focusChangedCallback.Reset();
 
   // Move the focus towards up
-  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::UP) == false);
+  DALI_TEST_CHECK(Toolkit::DevelKeyboardFocusManager::MoveFocus(manager, Control::KeyboardFocus::UP, deviceName) == false);
 
   // Because no layout control in the stage and no actor is focused, it should invoke CustomAlgorithm
   DALI_TEST_CHECK(customAlgorithm.mInterfaceVerified);
   DALI_TEST_CHECK(customAlgorithm.mCurrentFocusedActor == second);
   DALI_TEST_CHECK(customAlgorithm.mProposedActorToFocus == Actor());
   DALI_TEST_CHECK(customAlgorithm.mDirection == Control::KeyboardFocus::UP);
+  DALI_TEST_EQUALS(customAlgorithm.mDeviceName, deviceName, TEST_LOCATION );
   customAlgorithm.Reset();
   DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
 
@@ -611,22 +646,22 @@ int UtcDaliKeyboardFocusManagerFocusablePropertiesMoveFocus(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
   PushButton button1 = PushButton::New();
   PushButton button2 = PushButton::New();
-  button1.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
-  button2.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  button1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(button1);
   application.GetScene().Add(button2);
 
@@ -639,22 +674,26 @@ int UtcDaliKeyboardFocusManagerFocusablePropertiesMoveFocus(void)
   focusChangedCallback.Reset();
 
   // set the navigation properties of button1
-  button1.SetProperty(Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID )));
-  button1.SetProperty(Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID )));
-  button1.SetProperty(Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID )));
-  button1.SetProperty(Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID )));
+  button1.SetProperty(Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID)));
 
   // set the navigation properties of button2
-  button2.SetProperty(Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty< int >( Actor::Property::ID )));
-  button2.SetProperty(Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty< int >( Actor::Property::ID )));
-  button2.SetProperty(Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty< int >( Actor::Property::ID )));
-  button2.SetProperty(Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty< int >( Actor::Property::ID )));
+  button2.SetProperty(Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty<int>(Actor::Property::ID)));
+  button2.SetProperty(Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty<int>(Actor::Property::ID)));
+  button2.SetProperty(Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty<int>(Actor::Property::ID)));
+  button2.SetProperty(Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty<int>(Actor::Property::ID)));
+  button2.SetProperty(Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty< int >( Actor::Property::ID)));
+  button2.SetProperty(Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty< int >( Actor::Property::ID)));
 
   // Move the focus towards left
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::LEFT) == true);
 
   // Confirm whether focus is moved to button2
-  DALI_TEST_EQUALS(button2.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(button2.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button1);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button2);
@@ -664,7 +703,7 @@ int UtcDaliKeyboardFocusManagerFocusablePropertiesMoveFocus(void)
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
 
   // Confirm whether focus is moved to button1
-  DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button2);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button1);
@@ -674,7 +713,7 @@ int UtcDaliKeyboardFocusManagerFocusablePropertiesMoveFocus(void)
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::UP) == true);
 
   // Confirm whether focus is moved to button2
-  DALI_TEST_EQUALS(button2.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(button2.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button1);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button2);
@@ -684,6 +723,26 @@ int UtcDaliKeyboardFocusManagerFocusablePropertiesMoveFocus(void)
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::DOWN) == true);
 
   // Confirm whether focus is moved to button1
+  DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button2);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button1);
+  focusChangedCallback.Reset();
+
+  // Move the focus towards clockwise
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::CLOCKWISE) == true);
+
+  // Confirm whether focus is moved to button2
+  DALI_TEST_EQUALS(button2.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button1);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button2);
+  focusChangedCallback.Reset();
+
+  // Move the focus towards clockwise
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::COUNTER_CLOCKWISE) == true);
+
+  // Confirm whether focus is moved to button1
   DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button2);
@@ -691,15 +750,15 @@ int UtcDaliKeyboardFocusManagerFocusablePropertiesMoveFocus(void)
   focusChangedCallback.Reset();
 
   // Create a 1x1 table view and try to move focus inside it
-  TableView tableView = TableView::New( 1, 1 );
+  TableView tableView = TableView::New(1, 1);
   application.GetScene().Add(tableView);
 
   PushButton button = PushButton::New();
-  button.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  button.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   tableView.AddChild(button, TableView::CellPosition(0, 0));
 
   // set the navigation properties of button3
-  button.SetProperty(Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty< int >( Actor::Property::ID )));
+  button.SetProperty(Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::Value((int)button1.GetProperty<int>(Actor::Property::ID)));
 
   // Set the focus to the button
   DALI_TEST_CHECK(manager.SetCurrentFocusActor(button) == true);
@@ -713,7 +772,7 @@ int UtcDaliKeyboardFocusManagerFocusablePropertiesMoveFocus(void)
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::LEFT) == true);
 
   // Confirm whether focus is moved to button1
-  DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button1);
@@ -733,12 +792,12 @@ int UtcDaliKeyboardFocusManagerClearFocus(void)
 
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the stage
   Actor second = Actor::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(second);
 
   // Check that the focus is set on the first actor
@@ -819,7 +878,7 @@ int UtcDaliKeyboardFocusManagerGetFocusGroup(void)
 
   // Create an actor with two child actors and add it to the stage
   Actor parent = Actor::New();
-  Actor child = Actor::New();
+  Actor child  = Actor::New();
   parent.Add(child);
   application.GetScene().Add(parent);
 
@@ -881,7 +940,6 @@ int UtcDaliKeyboardFocusManagerSetAndGetFocusIndicator(void)
   END_TEST;
 }
 
-
 int UtcDaliKeyboardFocusManagerSignalFocusedActorActivated(void)
 {
   ToolkitTestApplication application;
@@ -891,11 +949,11 @@ int UtcDaliKeyboardFocusManagerSignalFocusedActorActivated(void)
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool focusedActorActivatedSignalVerified = false;
+  bool                          focusedActorActivatedSignalVerified = false;
   FocusedActorActivatedCallback focusedActorActivatedCallback(focusedActorActivatedSignalVerified);
-  manager.FocusedActorEnterKeySignal().Connect( &focusedActorActivatedCallback, &FocusedActorActivatedCallback::Callback );
+  manager.FocusedActorEnterKeySignal().Connect(&focusedActorActivatedCallback, &FocusedActorActivatedCallback::Callback);
 
-  Integration::KeyEvent returnEvent( "Return", "", "", 0, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent returnEvent("Return", "", "", 0, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
 
   // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
   // It makes mIsFocusIndicatorEnabled true
@@ -903,12 +961,12 @@ int UtcDaliKeyboardFocusManagerSignalFocusedActorActivated(void)
 
   // Create the first button and add it to the stage
   PushButton firstPushButton = PushButton::New();
-  firstPushButton.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  firstPushButton.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(firstPushButton);
 
   // Create the second button and add it to the stage
   PushButton secondPushButton = PushButton::New();
-  secondPushButton.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  secondPushButton.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(secondPushButton);
 
   // Check that the focus is set on the first button
@@ -941,20 +999,20 @@ int UtcDaliKeyboardFocusManagerSignalFocusGroupChanged(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool focusGroupChangedSignalVerified = false;
+  bool                      focusGroupChangedSignalVerified = false;
   FocusGroupChangedCallback focusGroupChangedCallback(focusGroupChangedSignalVerified);
-  manager.FocusGroupChangedSignal().Connect( &focusGroupChangedCallback, &FocusGroupChangedCallback::Callback );
+  manager.FocusGroupChangedSignal().Connect(&focusGroupChangedCallback, &FocusGroupChangedCallback::Callback);
 
-  Integration::KeyEvent tabEvent( "Tab", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
-  Integration::KeyEvent shiftTabEvent( "Tab", "", "", 0, 1, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent tabEvent("Tab", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  Integration::KeyEvent shiftTabEvent("Tab", "", "", 0, 1, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
 
   // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
   // It makes mIsFocusIndicatorEnabled true
@@ -981,13 +1039,13 @@ int UtcDaliKeyboardFocusManagerSignals(void)
   ToolkitTestApplication application;
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK( manager );
+  DALI_TEST_CHECK(manager);
 
   ConnectionTracker* testTracker = new ConnectionTracker();
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardPreFocusChange", CallbackFunctor() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardFocusChanged", CallbackFunctor() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardFocusGroupChanged", CallbackFunctor() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardFocusedActorEnterKey", CallbackFunctor() ), TEST_LOCATION );
+  DALI_TEST_EQUALS(true, manager.ConnectSignal(testTracker, "keyboardPreFocusChange", CallbackFunctor()), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, manager.ConnectSignal(testTracker, "keyboardFocusChanged", CallbackFunctor()), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, manager.ConnectSignal(testTracker, "keyboardFocusGroupChanged", CallbackFunctor()), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, manager.ConnectSignal(testTracker, "keyboardFocusedActorEnterKey", CallbackFunctor()), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1003,22 +1061,22 @@ int UtcDaliKeyboardFocusManagerMoveFocusBackward(void)
 
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the stage
   Actor second = Actor::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(second);
 
   // Create the third actor and add it to the stage
   Actor third = Actor::New();
-  third.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  third.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(third);
 
   // Create the fourth actor and add it to the stage
   Actor fourth = Actor::New();
-  fourth.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  fourth.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(fourth);
 
   // Check that the focus is set on the second actor
@@ -1057,15 +1115,15 @@ int UtcDaliKeyboardFocusManagerMoveFocusBackward(void)
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == third);
 
   // Make history stack full
-  for(int i = 0 ; i < 31 ; i ++)
+  for(int i = 0; i < 31; i++)
   {
     Actor actor = Actor::New();
-    actor.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+    actor.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
     application.GetScene().Add(actor);
     manager.SetCurrentFocusActor(actor);
   }
 
-  for(int i = 0 ; i < 31 ; i ++)
+  for(int i = 0; i < 31; i++)
   {
     manager.MoveFocusBackward();
   }
@@ -1085,44 +1143,44 @@ int UtcDaliKeyboardFocusManagerChangeFocusDirectionByKeyEvents(void)
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool preFocusChangeSignalVerified = false;
+  bool                   preFocusChangeSignalVerified = false;
   PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified);
-  manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
+  manager.PreFocusChangeSignal().Connect(&preFocusChangeCallback, &PreFocusChangeCallback::Callback);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
-  Integration::KeyEvent leftEvent( "Left", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
-  Integration::KeyEvent rightEvent( "Right", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
-  Integration::KeyEvent upEvent( "Up", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
-  Integration::KeyEvent downEvent( "Down", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
-  Integration::KeyEvent pageUpEvent( "Prior", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
-  Integration::KeyEvent pageDownEvent( "Next", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent leftEvent("Left", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  Integration::KeyEvent rightEvent("Right", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  Integration::KeyEvent upEvent("Up", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  Integration::KeyEvent downEvent("Down", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  Integration::KeyEvent pageUpEvent("Prior", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  Integration::KeyEvent pageDownEvent("Next", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
 
   // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
   // It makes mIsFocusIndicatorEnabled true
   application.ProcessEvent(leftEvent);
 
   // Create a 2x2 table view and try to move focus inside it
-  TableView tableView = TableView::New( 2, 2 );
+  TableView tableView = TableView::New(2, 2);
   application.GetScene().Add(tableView);
 
   // Create the first actor
   Actor first = Actor::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Create the second actor
   Actor second = Actor::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Create the third actor
   Actor third = Actor::New();
-  third.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  third.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Create the fourth actor
   Actor fourth = Actor::New();
-  fourth.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  fourth.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Add the four children to table view
   tableView.AddChild(first, TableView::CellPosition(0, 0));
@@ -1246,11 +1304,11 @@ int UtcDaliKeyboardFocusManagerSignalChangedBySpaceKeyEvent(void)
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool preFocusChangeSignalVerified = false;
+  bool                   preFocusChangeSignalVerified = false;
   PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified);
-  manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
+  manager.PreFocusChangeSignal().Connect(&preFocusChangeCallback, &PreFocusChangeCallback::Callback);
 
-  Integration::KeyEvent spaceEvent( "space", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent spaceEvent("space", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
 
   // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
   // It makes mIsFocusIndicatorEnabled true
@@ -1275,8 +1333,6 @@ int UtcDaliKeyboardFocusManagerSignalChangedBySpaceKeyEvent(void)
   END_TEST;
 }
 
-
-
 int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
 {
   ToolkitTestApplication application;
@@ -1285,30 +1341,30 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool preFocusChangeSignalVerified = false;
+  bool                   preFocusChangeSignalVerified = false;
   PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified);
-  manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
+  manager.PreFocusChangeSignal().Connect(&preFocusChangeCallback, &PreFocusChangeCallback::Callback);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
   // Create the first actor and add it to the stage
   Control first = Control::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the stage
   Control second = Control::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(second);
 
   // Move the focus to the right
@@ -1327,7 +1383,7 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
   focusChangedCallback.Reset();
 
   // Move the focus towards right
@@ -1346,8 +1402,8 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
   focusChangedCallback.Reset();
 
   // Move the focus towards up
@@ -1362,16 +1418,16 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
 
   // Create a 2x2 table view and try to move focus inside it
-  TableView tableView = TableView::New( 2, 2 );
+  TableView tableView = TableView::New(2, 2);
   application.GetScene().Add(tableView);
 
   // Create the third actor
   Control third = Control::New();
-  third.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  third.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Create the fourth actor
   Control fourth = Control::New();
-  fourth.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  fourth.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   // Add the four children to table view
   tableView.AddChild(first, TableView::CellPosition(0, 0));
@@ -1386,8 +1442,8 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
 
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
 
   focusChangedCallback.Reset();
 
@@ -1397,8 +1453,8 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
 
   focusChangedCallback.Reset();
 
@@ -1409,10 +1465,10 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
 
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
 
   focusChangedCallback.Reset();
 
@@ -1423,10 +1479,10 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == fourth);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == third);
 
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
-  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
 
   focusChangedCallback.Reset();
 
@@ -1436,10 +1492,10 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == third);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
   focusChangedCallback.Reset();
 
   // Move the focus towards left. The focus move will fail as no way to move it upwards
@@ -1449,10 +1505,10 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
   DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
   DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::KeyboardFocus::LEFT);
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
 
   preFocusChangeCallback.Reset();
   DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
@@ -1468,20 +1524,19 @@ int UtcDaliKeyboardFocusManagerMoveFocusTestStateChange(void)
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
 
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
 
   focusChangedCallback.Reset();
 
   // Clear the focus
   manager.ClearFocus();
-  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1490,26 +1545,26 @@ int UtcDaliKeyboardFocusManagerFocusedActorUnstaged(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Ensure we cannot set an actor to be focused if it is not staged and that we do not retrieve an actor if it has been unstaged" );
+  tet_infoline("Ensure we cannot set an actor to be focused if it is not staged and that we do not retrieve an actor if it has been unstaged");
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK( ! manager.GetCurrentFocusActor() );
+  DALI_TEST_CHECK(!manager.GetCurrentFocusActor());
 
   Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
+  actor.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
-  tet_infoline( "Attempt to set unstaged actor, no actor should be returned from KeyboardFocusManager" );
-  manager.SetCurrentFocusActor( actor );
-  DALI_TEST_CHECK( ! manager.GetCurrentFocusActor() );
+  tet_infoline("Attempt to set unstaged actor, no actor should be returned from KeyboardFocusManager");
+  manager.SetCurrentFocusActor(actor);
+  DALI_TEST_CHECK(!manager.GetCurrentFocusActor());
 
-  tet_infoline( "Add actor to stage and attempt to set, our actor should be returned from KeyboardFocusManager" );
-  application.GetScene().Add( actor );
-  manager.SetCurrentFocusActor( actor );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor() == actor );
+  tet_infoline("Add actor to stage and attempt to set, our actor should be returned from KeyboardFocusManager");
+  application.GetScene().Add(actor);
+  manager.SetCurrentFocusActor(actor);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == actor);
 
-  tet_infoline( "Remove actor from stage and attempt to retrieve, no actor should be returned from KeyboardFocusManager" );
+  tet_infoline("Remove actor from stage and attempt to retrieve, no actor should be returned from KeyboardFocusManager");
   actor.Unparent();
-  DALI_TEST_CHECK( ! manager.GetCurrentFocusActor() );
+  DALI_TEST_CHECK(!manager.GetCurrentFocusActor());
 
   END_TEST;
 }
@@ -1518,31 +1573,31 @@ int UtcDaliKeyboardFocusManagerEnableFocusIndicator(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Ensure we cannot set an actor to be focused if it is not staged and that we do not retrieve an actor if it has been unstaged" );
+  tet_infoline("Ensure we cannot set an actor to be focused if it is not staged and that we do not retrieve an actor if it has been unstaged");
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK( ! manager.GetCurrentFocusActor() );
+  DALI_TEST_CHECK(!manager.GetCurrentFocusActor());
 
   Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-  application.GetScene().Add( actor );
-  manager.SetCurrentFocusActor( actor );
+  actor.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  application.GetScene().Add(actor);
+  manager.SetCurrentFocusActor(actor);
 
   // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
   // It makes mIsFocusIndicatorEnabled true and add focus indicator to focused actor.
-  Integration::KeyEvent rightEvent( "Right", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent rightEvent("Right", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
   application.ProcessEvent(rightEvent);
 
   Actor indicatorActor = manager.GetFocusIndicatorActor();
 
-  tet_infoline( "Indicator is added to focused actor" );
-  DALI_TEST_CHECK( actor == indicatorActor.GetParent() );
+  tet_infoline("Indicator is added to focused actor");
+  DALI_TEST_CHECK(actor == indicatorActor.GetParent());
 
   Dali::Toolkit::DevelKeyboardFocusManager::EnableFocusIndicator(manager, false);
-  DALI_TEST_CHECK( !Dali::Toolkit::DevelKeyboardFocusManager::IsFocusIndicatorEnabled(manager) );
+  DALI_TEST_CHECK(!Dali::Toolkit::DevelKeyboardFocusManager::IsFocusIndicatorEnabled(manager));
 
-  tet_infoline( "Indicator is removed from focused actor because mUseFocusIndicator is false" );
-  DALI_TEST_CHECK( !indicatorActor.GetParent() );
+  tet_infoline("Indicator is removed from focused actor because mUseFocusIndicator is false");
+  DALI_TEST_CHECK(!indicatorActor.GetParent());
 
   END_TEST;
 }
@@ -1551,32 +1606,32 @@ int UtcDaliKeyboardFocusManagerCheckConsumedKeyEvent(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Ensure Window can't receive KeyEvent when Control already consumed it" );
+  tet_infoline("Ensure Window can't receive KeyEvent when Control already consumed it");
   Dali::Integration::Scene scene = application.GetScene();
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK( ! manager.GetCurrentFocusActor() );
+  DALI_TEST_CHECK(!manager.GetCurrentFocusActor());
 
   // Create the first actor and add it to the stage
   Control control = Control::New();
-  control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  control.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   scene.Add(control);
 
-  KeyEventCallback controlCallback( true );
-  control.KeyEventSignal().Connect( &controlCallback, &KeyEventCallback::Callback );
+  KeyEventCallback controlCallback(true);
+  control.KeyEventSignal().Connect(&controlCallback, &KeyEventCallback::Callback);
 
-  KeyEventCallback sceneCallback( false );
-  scene.KeyEventSignal().Connect( &sceneCallback, &KeyEventCallback::Callback );
+  KeyEventCallback sceneCallback(false);
+  scene.KeyEventSignal().Connect(&sceneCallback, &KeyEventCallback::Callback);
 
-  manager.SetCurrentFocusActor( control );
+  manager.SetCurrentFocusActor(control);
 
   // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
   // It makes mIsFocusIndicatorEnabled true and add focus indicator to focused actor.
-  Integration::KeyEvent event1( "Right", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event1("Right", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
   application.ProcessEvent(event1);
 
-  DALI_TEST_CHECK( controlCallback.mIsCalled );
-  DALI_TEST_CHECK( !sceneCallback.mIsCalled );
+  DALI_TEST_CHECK(controlCallback.mIsCalled);
+  DALI_TEST_CHECK(!sceneCallback.mIsCalled);
 
   END_TEST;
 }
@@ -1585,21 +1640,21 @@ int UtcDaliKeyboardFocusManagerFocusPerWindow(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Ensure Memory focus actors for each window ");
+  tet_infoline("Ensure Memory focus actors for each window ");
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK( ! manager.GetCurrentFocusActor() );
+  DALI_TEST_CHECK(!manager.GetCurrentFocusActor());
 
-  Window firstWindow = Window::New(PositionSize(0,0,300,500) ,"", false);
-  DALI_TEST_CHECK( firstWindow );
+  Window firstWindow = Window::New(PositionSize(0, 0, 300, 500), "", false);
+  DALI_TEST_CHECK(firstWindow);
   Control first = Control::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   firstWindow.Add(first);
 
-  Window secondWindow = Window::New(PositionSize(0,0,400,600) ,"", false);
-  DALI_TEST_CHECK( secondWindow );
+  Window secondWindow = Window::New(PositionSize(0, 0, 400, 600), "", false);
+  DALI_TEST_CHECK(secondWindow);
   Control second = Control::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
-  secondWindow.Add( second );
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  secondWindow.Add(second);
 
   DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
@@ -1609,7 +1664,7 @@ int UtcDaliKeyboardFocusManagerFocusPerWindow(void)
   firstWindow.Raise();
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
 
-  secondWindow.Remove( second );
+  secondWindow.Remove(second);
   secondWindow.Raise();
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() != second);
 
@@ -1625,17 +1680,17 @@ int UtcDaliKeyboardFocusManagerWithoutFocusablePropertiesMoveFocus(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
   PushButton button1 = PushButton::New();
   PushButton button2 = PushButton::New();
@@ -1649,11 +1704,11 @@ int UtcDaliKeyboardFocusManagerWithoutFocusablePropertiesMoveFocus(void)
   button4.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
   button5.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
 
-  button1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
-  button2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
-  button3.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
-  button4.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
-  button5.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
+  button1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button3.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button4.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button5.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   application.GetScene().Add(button1);
   application.GetScene().Add(button2);
@@ -1691,7 +1746,7 @@ int UtcDaliKeyboardFocusManagerWithoutFocusablePropertiesMoveFocus(void)
   // without set the navigation properties, but we can focus move
   // enable the default algorithm
   Dali::Toolkit::DevelKeyboardFocusManager::EnableDefaultAlgorithm(manager, true);
-  DALI_TEST_CHECK( Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager) );
+  DALI_TEST_CHECK(Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager));
 
   // Move the focus towards right
   // button1 -- [button2]
@@ -1805,7 +1860,6 @@ int UtcDaliKeyboardFocusManagerWithoutFocusablePropertiesMoveFocus(void)
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button1);
   focusChangedCallback.Reset();
 
-
   // Move the focus towards left. The focus move will fail as no way to move it upwards
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::LEFT) == false);
 
@@ -1817,7 +1871,6 @@ int UtcDaliKeyboardFocusManagerWithoutFocusablePropertiesMoveFocus(void)
   END_TEST;
 }
 
-
 int UtcDaliKeyboardFocusManagerSetAndGetCurrentFocusActorInTouchMode(void)
 {
   ToolkitTestApplication application;
@@ -1829,19 +1882,19 @@ int UtcDaliKeyboardFocusManagerSetAndGetCurrentFocusActorInTouchMode(void)
 
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
-  first.SetProperty(Actor::Property::SIZE, Vector2( 50, 50 ));
+  first.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
   first.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
   first.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
-  first.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE,true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  first.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the stage
   Actor second = Actor::New();
-  second.SetProperty(Actor::Property::SIZE, Vector2( 50, 50 ));
+  second.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
   second.SetProperty(Actor::Property::POSITION, Vector2(100.0f, 0.0f));
   second.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(second);
 
   // flush the queue and render once
@@ -1854,15 +1907,14 @@ int UtcDaliKeyboardFocusManagerSetAndGetCurrentFocusActorInTouchMode(void)
   // Check that it will fail to set focus on an invalid actor
   DALI_TEST_CHECK(manager.SetCurrentFocusActor(Actor()) == false);
 
-
   Dali::Integration::TouchEvent event1 = Dali::Integration::TouchEvent();
-  Dali::Integration::Point pointDown1;
-  pointDown1.SetState( PointState::DOWN );
+  Dali::Integration::Point      pointDown1;
+  pointDown1.SetState(PointState::DOWN);
   pointDown1.SetDeviceId(1);
   // touch first actor
-  pointDown1.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+  pointDown1.SetScreenPosition(Vector2(10.0f, 10.0f));
   event1.AddPoint(pointDown1);
-  application.ProcessEvent( event1 );
+  application.ProcessEvent(event1);
 
   // flush the queue and render once
   application.SendNotification();
@@ -1872,26 +1924,26 @@ int UtcDaliKeyboardFocusManagerSetAndGetCurrentFocusActorInTouchMode(void)
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
 
   Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
-  Dali::Integration::Point pointDown2;
-  pointDown2.SetState( PointState::DOWN );
+  Dali::Integration::Point      pointDown2;
+  pointDown2.SetState(PointState::DOWN);
   pointDown2.SetDeviceId(1);
   // touch second actor
-  pointDown2.SetScreenPosition( Vector2( 110.0f, 10.0f ) );
+  pointDown2.SetScreenPosition(Vector2(110.0f, 10.0f));
   event2.AddPoint(pointDown2);
-  application.ProcessEvent( event2 );
+  application.ProcessEvent(event2);
 
   // flush the queue and render once
   application.SendNotification();
   application.Render();
 
-  // Check that the focus is successfully to clear
-  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
+  // Since no focus has been moved, the current focus actor is the same.
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
 
   // Make the second actor focusableInTouchMode
-  second.SetProperty( DevelActor::Property::TOUCH_FOCUSABLE,true);
+  second.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE, true);
 
   // touch second actor
-  application.ProcessEvent( event2 );
+  application.ProcessEvent(event2);
 
   // flush the queue and render once
   application.SendNotification();
@@ -1911,17 +1963,17 @@ int UtcDaliKeyboardFocusManagerEnableDefaultAlgorithm(void)
 
   // Register Type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
   DALI_TEST_CHECK(manager);
 
-  bool focusChangedSignalVerified = false;
+  bool                 focusChangedSignalVerified = false;
   FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
-  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
 
   PushButton button1 = PushButton::New();
   PushButton button2 = PushButton::New();
@@ -1929,8 +1981,8 @@ int UtcDaliKeyboardFocusManagerEnableDefaultAlgorithm(void)
   button1.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
   button2.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
 
-  button1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
-  button2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE,true);
+  button1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
   application.GetScene().Add(button1);
   application.GetScene().Add(button2);
@@ -1939,6 +1991,8 @@ int UtcDaliKeyboardFocusManagerEnableDefaultAlgorithm(void)
   // button1 -- button2
   button1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
   button2.SetProperty(Actor::Property::POSITION, Vector2(100.0f, 0.0f));
+  button1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // flush the queue and render once
   application.SendNotification();
@@ -1956,7 +2010,7 @@ int UtcDaliKeyboardFocusManagerEnableDefaultAlgorithm(void)
   // without set the navigation properties, but we can focus move
   // enable the default algorithm
   Dali::Toolkit::DevelKeyboardFocusManager::EnableDefaultAlgorithm(manager, true);
-  DALI_TEST_CHECK( Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager) );
+  DALI_TEST_CHECK(Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager));
 
   // Move the focus towards right
   // button1 -- [button2]
@@ -1971,30 +2025,46 @@ int UtcDaliKeyboardFocusManagerEnableDefaultAlgorithm(void)
 
   // disable the default algorithm
   Dali::Toolkit::DevelKeyboardFocusManager::EnableDefaultAlgorithm(manager, false);
-  DALI_TEST_CHECK( !Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager) );
+  DALI_TEST_CHECK(!Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager));
 
   // Move the focus towards left, The focus move will fail because the default algorithm is disabled.
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::LEFT) == false);
 
   // enable the default algorithm
   Dali::Toolkit::DevelKeyboardFocusManager::EnableDefaultAlgorithm(manager, true);
-  DALI_TEST_CHECK( Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager) );
+  DALI_TEST_CHECK(Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager));
 
   // Move the focus towards left, The focus move will success because the default algorithm is enabled.
   // [button1] -- button2
   DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::LEFT) == true);
-  // Confirm whether focus is moved to button2
+  // Confirm whether focus is moved to button1
   DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
   DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
   DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button2);
   DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button1);
   focusChangedCallback.Reset();
 
+  // Clears focus.
+  manager.ClearFocus();
+  // There is no actor focused.
+  // button1 -- button2
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
+
+  // Move the focus towards right, The focus is on the actor closest to the top left of the window.
+  // [button1] -- button2
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
+
+  // Confirm whether focus is moved to button1
+  DALI_TEST_EQUALS(button1.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button1);
+  focusChangedCallback.Reset();
+
 
   END_TEST;
 }
 
-
 int UtcDaliKeyboardFocusManagerWithKeyboardFocusableChildren(void)
 {
   ToolkitTestApplication application;
@@ -2006,12 +2076,12 @@ int UtcDaliKeyboardFocusManagerWithKeyboardFocusableChildren(void)
 
   // Create the first actor and add it to the stage
   Actor first = Actor::New();
-  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true);
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   application.GetScene().Add(first);
 
   // Create the second actor and add it to the first actor.
   Actor second = Actor::New();
-  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true);
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   first.Add(second);
 
   // Check that no actor is being focused yet.
@@ -2022,18 +2092,367 @@ int UtcDaliKeyboardFocusManagerWithKeyboardFocusableChildren(void)
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
 
   // Set KeyboardFocusableChildren false.
-  first.SetProperty( DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, false);
+  first.SetProperty(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, false);
 
   // Check that it will fail to set focus on the second actor as it's not focusable
   DALI_TEST_CHECK(manager.SetCurrentFocusActor(second) == false);
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
 
   // Set KeyboardFocusableChildren true.
-  first.SetProperty( DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, true);
+  first.SetProperty(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, true);
 
   // Check that the focus is set on the second actor
   DALI_TEST_CHECK(manager.SetCurrentFocusActor(second) == true);
   DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
 
   END_TEST;
+}
+
+int UtcDaliKeyboardFocusManagerCheckWheelEvent(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline("UtcDaliKeyboardFocusManagerCheckWheelEvent");
+  Dali::Integration::Scene scene = application.GetScene();
+
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(!manager.GetCurrentFocusActor());
+
+  // Create the first actor and add it to the stage
+  Actor parent = Actor::New();
+  parent.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+
+  Actor child = Actor::New();
+  child.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+
+  parent.Add(child);
+  scene.Add(parent);
+
+  WheelEventCallback childCallback(false);
+  child.WheelEventSignal().Connect(&childCallback, &WheelEventCallback::Callback);
+
+  WheelEventCallback parentCallback(true);
+  parent.WheelEventSignal().Connect(&parentCallback, &WheelEventCallback::Callback);
+
+  WheelEventCallback sceneCallback(false);
+  scene.WheelEventSignal().Connect(&sceneCallback, &WheelEventCallback::Callback);
+
+  manager.SetCurrentFocusActor(child);
+
+  // Emit custom wheel event is comming to KeyboardFocusManager
+  Integration::WheelEvent event(Integration::WheelEvent::CUSTOM_WHEEL, 0, 0u, Vector2(0.0f, 0.0f), 1, 1000u);
+  application.ProcessEvent(event);
+
+  DALI_TEST_CHECK(childCallback.mIsCalled);
+  DALI_TEST_CHECK(parentCallback.mIsCalled);
+  DALI_TEST_CHECK(!sceneCallback.mIsCalled);
+
+  END_TEST;
+}
+
+int UtcDaliKeyboardFocusManagerChangeFocusDirectionByCustomWheelEvent(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliKeyboardFocusManagerChangeFocusDirectionByCustomWheelEvent");
+  Dali::Integration::Scene scene = application.GetScene();
+
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+
+  bool focusChangedSignalVerified = false;
+  FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
+  manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
+
+  Integration::WheelEvent clockwiseEvent(Integration::WheelEvent::CUSTOM_WHEEL, 0, 0u, Vector2(0.0f, 0.0f), 1, 1000u);
+  Integration::WheelEvent counterClockwiseEvent(Integration::WheelEvent::CUSTOM_WHEEL, 0, 0u, Vector2(0.0f, 0.0f), -1, 1100u);
+
+  // Create the first button
+  PushButton first = PushButton::New();
+  first.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  scene.Add(first);
+
+  // Create the second button
+  PushButton second = PushButton::New();
+  second.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  scene.Add(second);
+
+   // set the navigation properties
+  first.SetProperty(Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)second.GetProperty< int >( Actor::Property::ID )));
+  second.SetProperty(Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)first.GetProperty< int >( Actor::Property::ID )));
+
+  // Set the focus to the first actor
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
+  focusChangedCallback.Reset();
+
+  // Send the clockwise wheel event to move the focus towards clockwise
+  application.ProcessEvent(clockwiseEvent);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
+  focusChangedCallback.Reset();
+
+  // Send the counter clockwise wheel event to move the focus towards count clockwise
+  application.ProcessEvent(counterClockwiseEvent);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
+  focusChangedCallback.Reset();
+
+  // Clear the focus
+  manager.ClearFocus();
+
+  END_TEST;
+}
+
+int UtcDaliKeyboardFocusManagerWithUserInteractionEnabled(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliKeyboardFocusManagerWithUserInteractionEnabled");
+
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+
+  // Create the first control and add it to the stage
+  Control first = Control::New();
+  first.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  application.GetScene().Add(first);
+
+  // Create the second control and add it to the first control.
+  Control second = Control::New();
+  second.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  first.Add(second);
+
+  // Check that no actor is being focused yet.
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
+
+  // Check that the focus is set on the first actor
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+
+  // Set USER_INTERACTION_ENABLED false.
+  second.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, false);
+
+  // Check that it will fail to set focus on the second actor as it's not userInteractionEnabled
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(second) == false);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+
+  // Set KeyboardFocusableChildren true.
+  second.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, true);
+
+  // Check that the focus is set on the second actor
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(second) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
+
+  // If the currently focused actor becomes USER_INTERACTION_ENABLED false, it loses focus.
+  second.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, false);
+
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
+
+
+  END_TEST;
+}
+
+int UtcDaliKeyboardFocusManagerFocusFinderRootActor(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliKeyboardFocusManagerFocusFinderRootActor");
+
+  // Register Type
+  TypeInfo type;
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
+  BaseHandle handle = type.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+
+  bool                 focusChangedSignalVerified = false;
+  FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
+  manager.FocusChangedSignal().Connect(&focusChangedCallback, &FocusChangedCallback::Callback);
+
+  PushButton button1 = PushButton::New();
+  PushButton button2 = PushButton::New();
+
+  button1.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
+  button2.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
+
+  button1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+
+  application.GetScene().Add(button1);
+  application.GetScene().Add(button2);
+
+  Actor actor = Actor::New();
+  actor.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  application.GetScene().Add(actor);
+
+  PushButton buttonA = PushButton::New();
+  PushButton buttonB = PushButton::New();
+
+  buttonA.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
+  buttonB.SetProperty(Actor::Property::SIZE, Vector2(50, 50));
+
+  buttonA.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  buttonB.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+
+  actor.Add(buttonA);
+  actor.Add(buttonB);
+
+  // set position
+  // button1 -- button2
+  button1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  button2.SetProperty(Actor::Property::POSITION, Vector2(100.0f, 0.0f));
+  button1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // buttonA -- buttonB
+  buttonA.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 50.0f));
+  buttonB.SetProperty(Actor::Property::POSITION, Vector2(100.0f, 50.0f));
+  buttonA.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  buttonB.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  // Set the focus to the button1
+  // [button1] -- button2
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(button1) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == button1);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button1);
+  focusChangedCallback.Reset();
+
+  // without set the navigation properties, but we can focus move
+  // enable the default algorithm
+  Dali::Toolkit::DevelKeyboardFocusManager::EnableDefaultAlgorithm(manager, true);
+  DALI_TEST_CHECK(Dali::Toolkit::DevelKeyboardFocusManager::IsDefaultAlgorithmEnabled(manager));
+
+  // Move the focus towards right
+  // button1 -- [button2]
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
+
+  // Confirm whether focus is moved to button2
+  DALI_TEST_EQUALS(button2.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == button1);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == button2);
+  focusChangedCallback.Reset();
+
+  // Clears focus.
+  manager.ClearFocus();
+
+  // There is no actor focused.
+  // button1 -- button2
+  // buttonA -- buttonB
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
+
+  // Sets the actor to root.
+  Dali::Toolkit::DevelKeyboardFocusManager::SetFocusFinderRootActor(manager, actor);
+
+  // Move the focus towards right
+  // [buttonA] -- buttonB
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
+
+  // Confirm whether focus is moved to buttonA
+  // Because the root is an actor, the focus is moved to buttonA, a child of the actor.
+  DALI_TEST_EQUALS(buttonA.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == buttonA);
+  focusChangedCallback.Reset();
+
+
+  // Move the focus towards right, The focus move will success.
+  // buttonA -- [buttonB]
+  DALI_TEST_CHECK(manager.MoveFocus(Control::KeyboardFocus::RIGHT) == true);
+  // Confirm whether focus is moved to buttonB
+  DALI_TEST_EQUALS(buttonB.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION);
+  DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+  DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == buttonA);
+  DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == buttonB);
+  focusChangedCallback.Reset();
+
+  // reset
+  Dali::Toolkit::DevelKeyboardFocusManager::ResetFocusFinderRootActor(manager);
+
+  END_TEST;
+}
+
+int UtcDaliKeyboardFocusManagerKeyEventOtherWindow(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliKeyboardFocusManagerKeyEventOtherWindow");
+
+  Dali::Integration::Scene scene = application.GetScene();
+
+  // Register Type
+  TypeInfo type;
+  type = TypeRegistry::Get().GetTypeInfo("KeyboardFocusManager");
+  DALI_TEST_CHECK(type);
+  BaseHandle handle = type.CreateInstance();
+  DALI_TEST_CHECK(handle);
+
+  KeyboardFocusManager manager = KeyboardFocusManager::Get();
+  DALI_TEST_CHECK(manager);
+
+
+  PushButton button1 = PushButton::New();
+  PushButton button2 = PushButton::New();
+  button1.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  button2.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  application.GetScene().Add(button1);
+  application.GetScene().Add(button2);
+
+  // Set the focus to the button1
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(button1) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == button1);
+
+  // set the navigation properties of button1
+  button1.SetProperty(Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty<int>(Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID)));
+  button1.SetProperty(Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::Value((int)button2.GetProperty< int >( Actor::Property::ID)));
+
+  Integration::KeyEvent event("Right", "", "Right", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  // It makes mIsFocusIndicatorEnabled true
+  application.ProcessEvent(event);
+
+  // Move the focus towards right
+  application.ProcessEvent(event);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == button2);
+
+  DALI_TEST_CHECK(manager.SetCurrentFocusActor(button1) == true);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == button1);
+
+  Integration::KeyEvent event1("Right", "", "Right", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE);
+  event1.windowId = 3;
+  application.ProcessEvent(event1);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor() == button1);
+
+  END_TEST;
 }
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
index 984518f..fdf690d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/magnifier/magnifier.h>
+#include <stdlib.h>
+#include <iostream>
+#include <sstream>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -40,12 +40,12 @@ int UtcDaliMagnifierNew(void)
   ToolkitTestApplication application;
 
   Magnifier magnifier;
-  DALI_TEST_CHECK( !magnifier );
+  DALI_TEST_CHECK(!magnifier);
 
   magnifier = Magnifier::New();
-  DALI_TEST_CHECK( magnifier );
+  DALI_TEST_CHECK(magnifier);
 
-  application.GetScene().Add( magnifier );
+  application.GetScene().Add(magnifier);
 
   application.SendNotification();
   application.Render();
@@ -58,20 +58,20 @@ int UtcDaliMagnifierCopyAndAssignment(void)
   ToolkitTestApplication application;
 
   Magnifier view = Magnifier::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  Magnifier copy( view );
-  DALI_TEST_CHECK( copy == view );
+  Magnifier copy(view);
+  DALI_TEST_CHECK(copy == view);
 
   Magnifier assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
   assign = view;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   // Self assignment
   assign = assign;
-  DALI_TEST_CHECK( assign );
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign);
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -81,13 +81,13 @@ int UtcDaliMagnifierDownCast(void)
   ToolkitTestApplication application;
 
   BaseHandle view = Magnifier::New();
-  DALI_TEST_CHECK( Magnifier::DownCast( view ) );
+  DALI_TEST_CHECK(Magnifier::DownCast(view));
 
   BaseHandle empty;
-  DALI_TEST_CHECK( ! Magnifier::DownCast( empty ) );
+  DALI_TEST_CHECK(!Magnifier::DownCast(empty));
 
   BaseHandle another = Actor::New();
-  DALI_TEST_CHECK( ! Magnifier::DownCast( another ) );
+  DALI_TEST_CHECK(!Magnifier::DownCast(another));
 
   END_TEST;
 }
@@ -97,16 +97,16 @@ int UtcDaliMagnifierTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Magnifier" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("Magnifier");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  Magnifier view = Magnifier::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  Magnifier view = Magnifier::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -118,24 +118,24 @@ int UtcDaliMagnifierSetSourceActorP(void)
   Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
   RenderTaskList renderTaskList = stage.GetRenderTaskList();
-  DALI_TEST_CHECK( renderTaskList.GetTaskCount() > 1 );
+  DALI_TEST_CHECK(renderTaskList.GetTaskCount() > 1);
 
   Actor actor = Actor::New();
-  stage.Add( actor );
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTask( 1 ).GetSourceActor() != actor );
+  stage.Add(actor);
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTask(1).GetSourceActor() != actor);
 
-  view.SetSourceActor( actor );
+  view.SetSourceActor(actor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( stage.GetRenderTaskList().GetTask( 1 ).GetSourceActor(), actor, TEST_LOCATION );
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTask(1).GetSourceActor(), actor, TEST_LOCATION);
 
   END_TEST;
 }
@@ -148,12 +148,12 @@ int UtcDaliMagnifierSetSourceActorN(void)
 
   try
   {
-    view.SetSourceActor( Actor::New() );
-    DALI_TEST_CHECK( false ); // should not get here
+    view.SetSourceActor(Actor::New());
+    DALI_TEST_CHECK(false); // should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -166,28 +166,28 @@ int UtcDaliMagnifierFrameVisibility(void)
   Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), true, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::FRAME_VISIBILITY, false );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), false, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::FRAME_VISIBILITY, false);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), false, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::FRAME_VISIBILITY, true );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), true, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::FRAME_VISIBILITY, true);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -199,30 +199,30 @@ int UtcDaliMagnifierMagnificationFactor(void)
   Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
-  float magnificationFactor( 200.0f );
+  float magnificationFactor(200.0f);
 
-  DALI_TEST_CHECK( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >() != magnificationFactor );
+  DALI_TEST_CHECK(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>() != magnificationFactor);
 
-  view.SetProperty( Magnifier::Property::MAGNIFICATION_FACTOR, magnificationFactor );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), magnificationFactor, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::MAGNIFICATION_FACTOR, magnificationFactor);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), magnificationFactor, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), magnificationFactor, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), magnificationFactor, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::MAGNIFICATION_FACTOR, 1.0f );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), 1.0f, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::MAGNIFICATION_FACTOR, 1.0f);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), 1.0f, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -234,24 +234,24 @@ int UtcDaliMagnifierSourcePosition(void)
   Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
-  Vector3 position( 100.0f, 200.0f, 300.0f );
+  Vector3 position(100.0f, 200.0f, 300.0f);
 
-  DALI_TEST_CHECK( view.GetProperty( Magnifier::Property::SOURCE_POSITION ).Get< Vector3 >() != position );
+  DALI_TEST_CHECK(view.GetProperty(Magnifier::Property::SOURCE_POSITION).Get<Vector3>() != position);
 
-  view.SetProperty( Magnifier::Property::SOURCE_POSITION, position );
+  view.SetProperty(Magnifier::Property::SOURCE_POSITION, position);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::SOURCE_POSITION ).Get< Vector3 >(), position, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::SOURCE_POSITION).Get<Vector3>(), position, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::SOURCE_POSITION, Vector3::ONE );
+  view.SetProperty(Magnifier::Property::SOURCE_POSITION, Vector3::ONE);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::SOURCE_POSITION ).Get< Vector3 >(), Vector3::ONE, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::SOURCE_POSITION).Get<Vector3>(), Vector3::ONE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -262,18 +262,18 @@ int UtcDaliMagnifierOnSizeSet(void)
 
   Magnifier view = Magnifier::New();
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   application.SendNotification();
   application.Render();
 
-  Vector3 size( 200.0f, 300.0f, 0.0f );
-  view.SetProperty( Actor::Property::SIZE, size );
+  Vector3 size(200.0f, 300.0f, 0.0f);
+  view.SetProperty(Actor::Property::SIZE, size);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), size, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp
index b5e3429..afe7253 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,36 +15,34 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/public-api/controls/model3d-view/model3d-view.h>
-
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
-
-void model_view_startup(void)
+void model3d_view_startup(void)
 {
   test_return_value = TET_UNDEF;
 }
 
-void model_view_cleanup(void)
+void model3d_view_cleanup(void)
 {
   test_return_value = TET_PASS;
 }
 
 namespace
 {
-const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj";
-const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl";
+const char* TEST_OBJ_FILE_NAME     = TEST_RESOURCE_DIR "/Cube.obj";
+const char* TEST_MTL_FILE_NAME     = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl";
 const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/";
-}
+} // namespace
 
 // Negative test case for a method
-int UtcDaliModelViewUninitialized(void)
+int UtcDaliModel3dViewUninitialized(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliModel3dViewUninitialized");
@@ -55,73 +53,72 @@ int UtcDaliModelViewUninitialized(void)
   {
     // New() must be called to create a Model3dView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
 }
 
 // Positive test case for a method
-int UtcDaliModelViewNew(void)
+int UtcDaliModel3dViewNew(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliModel3dViewNew");
 
   Toolkit::Model3dView view = Toolkit::Model3dView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  Toolkit::Model3dView view2 = Toolkit::Model3dView::New("","","");
-  DALI_TEST_CHECK( view2 );
+  Toolkit::Model3dView view2 = Toolkit::Model3dView::New("", "", "");
+  DALI_TEST_CHECK(view2);
   END_TEST;
 }
 
 // Positive test case for a method
-int UtcDaliModelViewDownCast(void)
+int UtcDaliModel3dViewDownCast(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliModelViewDownCast");
 
   Toolkit::Model3dView view = Toolkit::Model3dView::New();
-  BaseHandle handle(view);
+  BaseHandle           handle(view);
 
-  Toolkit::Model3dView modelView = Toolkit::Model3dView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( modelView );
-  DALI_TEST_CHECK( modelView == view );
+  Toolkit::Model3dView modelView = Toolkit::Model3dView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(modelView);
+  DALI_TEST_CHECK(modelView == view);
   END_TEST;
 }
 
-
 // Positive test case for a method
-int UtcDaliModelViewPropertyNames(void)
+int UtcDaliModel3dViewPropertyNames(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliModel3dViewPropertyNames");
 
   Toolkit::Model3dView view = Toolkit::Model3dView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Model3dView::Property::GEOMETRY_URL, Dali::Property::Value( TEST_OBJ_FILE_NAME ) );
-  Property::Value val = view.GetProperty( Model3dView::Property::GEOMETRY_URL );
-  std::string obj_file_name;
-  DALI_TEST_CHECK( val.Get( obj_file_name ) );
-  DALI_TEST_EQUALS( obj_file_name, TEST_OBJ_FILE_NAME, TEST_LOCATION );
+  view.SetProperty(Model3dView::Property::GEOMETRY_URL, Dali::Property::Value(TEST_OBJ_FILE_NAME));
+  Property::Value val = view.GetProperty(Model3dView::Property::GEOMETRY_URL);
+  std::string     obj_file_name;
+  DALI_TEST_CHECK(val.Get(obj_file_name));
+  DALI_TEST_EQUALS(obj_file_name, TEST_OBJ_FILE_NAME, TEST_LOCATION);
 
-  view.SetProperty( Model3dView::Property::MATERIAL_URL, Dali::Property::Value( TEST_MTL_FILE_NAME ) );
-  val = view.GetProperty( Model3dView::Property::MATERIAL_URL );
-  DALI_TEST_CHECK( val.Get( obj_file_name ) );
-  DALI_TEST_EQUALS( obj_file_name, TEST_MTL_FILE_NAME, TEST_LOCATION );
+  view.SetProperty(Model3dView::Property::MATERIAL_URL, Dali::Property::Value(TEST_MTL_FILE_NAME));
+  val = view.GetProperty(Model3dView::Property::MATERIAL_URL);
+  DALI_TEST_CHECK(val.Get(obj_file_name));
+  DALI_TEST_EQUALS(obj_file_name, TEST_MTL_FILE_NAME, TEST_LOCATION);
 
-  view.SetProperty( Model3dView::Property::IMAGES_URL, Dali::Property::Value( TEST_RESOURCE_LOCATION ) );
-  val = view.GetProperty( Model3dView::Property::IMAGES_URL );
-  DALI_TEST_CHECK( val.Get( obj_file_name ) );
-  DALI_TEST_EQUALS( obj_file_name, TEST_RESOURCE_LOCATION, TEST_LOCATION );
+  view.SetProperty(Model3dView::Property::IMAGES_URL, Dali::Property::Value(TEST_RESOURCE_LOCATION));
+  val = view.GetProperty(Model3dView::Property::IMAGES_URL);
+  DALI_TEST_CHECK(val.Get(obj_file_name));
+  DALI_TEST_EQUALS(obj_file_name, TEST_RESOURCE_LOCATION, TEST_LOCATION);
 
   application.GetScene().Add(view);
 
@@ -129,125 +126,123 @@ int UtcDaliModelViewPropertyNames(void)
 }
 
 // Positive test case for a method
-int UtcDaliModelViewAddRemove(void)
+int UtcDaliModel3dViewAddRemove(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliModel3dViewAddRemove");
 
   Toolkit::Model3dView view = Toolkit::Model3dView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
-
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(actor);
   application.GetScene().Add(view);
 
-  DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
   view.Remove(actor);
 
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
-
-int UtcDaliModelCopyAndAssignment(void)
+int UtcDaliModel3dViewCopyAndAssignment(void)
 {
   ToolkitTestApplication application;
 
   Model3dView view = Toolkit::Model3dView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  Model3dView copy( view );
-  DALI_TEST_CHECK( view == copy );
+  Model3dView copy(view);
+  DALI_TEST_CHECK(view == copy);
 
   Model3dView assign;
-  DALI_TEST_CHECK( ! assign );
+  DALI_TEST_CHECK(!assign);
 
   assign = copy;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
 
-int UtcDaliModelMoveConstructor(void)
+int UtcDaliModel3dViewMoveConstructor(void)
 {
   ToolkitTestApplication application;
 
   Model3dView view = Toolkit::Model3dView::New();
-  DALI_TEST_EQUALS( 1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  view.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == view.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  view.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == view.GetProperty<bool>(Actor::Property::SENSITIVE));
 
-  Model3dView moved = std::move( view );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !view );
+  Model3dView moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!view);
 
   END_TEST;
 }
 
-int UtcDaliModelMoveAssignment(void)
+int UtcDaliModel3dViewMoveAssignment(void)
 {
   ToolkitTestApplication application;
 
   Model3dView view = Toolkit::Model3dView::New();
-  DALI_TEST_EQUALS( 1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  view.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == view.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  view.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == view.GetProperty<bool>(Actor::Property::SENSITIVE));
 
   Model3dView moved;
-  moved = std::move( view );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !view );
+  moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!view);
 
   END_TEST;
 }
 
-int UtcDaliModelTypeRegistry(void)
+int UtcDaliModel3dViewTypeRegistry(void)
 {
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Model3dView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("Model3dView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  Model3dView view = Model3dView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  Model3dView view = Model3dView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
 
-int UtcDaliModelOnSizeSet(void)
+int UtcDaliModel3dViewOnSizeSet(void)
 {
   ToolkitTestApplication application;
 
   Model3dView view = Toolkit::Model3dView::New();
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   application.SendNotification();
   application.Render();
 
-  Vector3 size( 200.0f, 300.0f, 0.0f );
-  view.SetProperty( Actor::Property::SIZE, size );
+  Vector3 size(200.0f, 300.0f, 0.0f);
+  view.SetProperty(Actor::Property::SIZE, size);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), size, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp b/automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp
index 64f57d5..4b7e6f8 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,75 +14,74 @@
  * limitations under the License.
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/utility/npatch-utilities.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
 namespace
 {
-
-void InitialiseRegionsToZeroAlpha( Dali::Devel::PixelBuffer pixelBuffer, uint32_t width, uint32_t height, Pixel::Format pixelFormat )
+void InitialiseRegionsToZeroAlpha(Dali::Devel::PixelBuffer pixelBuffer, uint32_t width, uint32_t height, Pixel::Format pixelFormat)
 {
-  unsigned char* buffer = pixelBuffer.GetBuffer();
-  uint32_t bytesPerPixel = GetBytesPerPixel( pixelFormat );
+  unsigned char* buffer        = pixelBuffer.GetBuffer();
+  uint32_t       bytesPerPixel = GetBytesPerPixel(pixelFormat);
 
-  for( uint32_t row = 0; row < width; ++row )
+  for(uint32_t row = 0; row < width; ++row)
   {
-    uint32_t pixelOffset = row * bytesPerPixel;
-    buffer[ pixelOffset + 3 ] = 0x00;
-    pixelOffset += ( height - 1 ) * width * bytesPerPixel;
-    buffer[ pixelOffset + 3 ] = 0x00;
+    uint32_t pixelOffset    = row * bytesPerPixel;
+    buffer[pixelOffset + 3] = 0x00;
+    pixelOffset += (height - 1) * width * bytesPerPixel;
+    buffer[pixelOffset + 3] = 0x00;
   }
 
-  for( unsigned int column = 0; column < height; ++column )
+  for(unsigned int column = 0; column < height; ++column)
   {
-    uint32_t pixelOffset = column * width * bytesPerPixel;
-    buffer[ pixelOffset + 3 ] = 0x00;
-    pixelOffset += ( width -1 ) * bytesPerPixel;
-    buffer[ pixelOffset + 3 ] = 0x00;
+    uint32_t pixelOffset    = column * width * bytesPerPixel;
+    buffer[pixelOffset + 3] = 0x00;
+    pixelOffset += (width - 1) * bytesPerPixel;
+    buffer[pixelOffset + 3] = 0x00;
   }
 }
 
-void AddStretchRegionsToImage( Dali::Devel::PixelBuffer pixelBuffer, uint32_t width, uint32_t height, const Vector4& requiredStretchBorder, Pixel::Format pixelFormat )
+void AddStretchRegionsToImage(Dali::Devel::PixelBuffer pixelBuffer, uint32_t width, uint32_t height, const Vector4& requiredStretchBorder, Pixel::Format pixelFormat)
 {
-  unsigned char* buffer = pixelBuffer.GetBuffer();
-  uint32_t bytesPerPixel = GetBytesPerPixel( pixelFormat );
+  unsigned char* buffer        = pixelBuffer.GetBuffer();
+  uint32_t       bytesPerPixel = GetBytesPerPixel(pixelFormat);
 
-  for( uint32_t column = requiredStretchBorder.x; column < width - requiredStretchBorder.z; ++column )
+  for(uint32_t column = requiredStretchBorder.x; column < width - requiredStretchBorder.z; ++column)
   {
-    uint32_t pixelOffset = column * bytesPerPixel;
-    buffer[ pixelOffset ] = 0x00;
-    buffer[ pixelOffset + 1 ] = 0x00;
-    buffer[ pixelOffset + 2 ] = 0x00;
-    buffer[ pixelOffset + 3 ] = 0xFF;
+    uint32_t pixelOffset    = column * bytesPerPixel;
+    buffer[pixelOffset]     = 0x00;
+    buffer[pixelOffset + 1] = 0x00;
+    buffer[pixelOffset + 2] = 0x00;
+    buffer[pixelOffset + 3] = 0xFF;
   }
 
-  for( uint32_t row = requiredStretchBorder.y; row < height - requiredStretchBorder.w; ++row )
+  for(uint32_t row = requiredStretchBorder.y; row < height - requiredStretchBorder.w; ++row)
   {
     unsigned int pixelOffset = row * width * bytesPerPixel;
-    buffer[ pixelOffset ] = 0x00;
-    buffer[ pixelOffset + 1 ] = 0x00;
-    buffer[ pixelOffset + 2 ] = 0x00;
-    buffer[ pixelOffset + 3 ] = 0xFF;
+    buffer[pixelOffset]      = 0x00;
+    buffer[pixelOffset + 1]  = 0x00;
+    buffer[pixelOffset + 2]  = 0x00;
+    buffer[pixelOffset + 3]  = 0xFF;
   }
 }
 
-Dali::Devel::PixelBuffer CustomizeNPatch( uint32_t width, uint32_t height, const Vector4& requiredStretchBorder )
+Dali::Devel::PixelBuffer CustomizeNPatch(uint32_t width, uint32_t height, const Vector4& requiredStretchBorder)
 {
-  Pixel::Format pixelFormat = Pixel::RGBA8888;
-  Dali::Devel::PixelBuffer pixelBuffer = Dali::Devel::PixelBuffer::New( width, height, pixelFormat );
+  Pixel::Format            pixelFormat = Pixel::RGBA8888;
+  Dali::Devel::PixelBuffer pixelBuffer = Dali::Devel::PixelBuffer::New(width, height, pixelFormat);
 
   unsigned char* buffer = pixelBuffer.GetBuffer();
-  memset( buffer, 0, width * height * Dali::Pixel::GetBytesPerPixel( pixelFormat ) );
+  memset(buffer, 0, width * height * Dali::Pixel::GetBytesPerPixel(pixelFormat));
 
-  InitialiseRegionsToZeroAlpha( pixelBuffer, width, height, pixelFormat );
+  InitialiseRegionsToZeroAlpha(pixelBuffer, width, height, pixelFormat);
 
-  AddStretchRegionsToImage( pixelBuffer, width, height, requiredStretchBorder, pixelFormat );
+  AddStretchRegionsToImage(pixelBuffer, width, height, requiredStretchBorder, pixelFormat);
 
   return pixelBuffer;
 }
@@ -106,134 +105,134 @@ int UtcDaliNPatchUtilityGetRedOffsetAndMask(void)
   tet_infoline("UtcDaliNPatchUtilityGetRedOffsetAndMask");
 
   int32_t byteOffset = 0;
-  int32_t bitMask = 0;
+  int32_t bitMask    = 0;
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::A8, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::L8, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::LA88, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::A8, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::L8, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::LA88, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGBA8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGB888, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0xff);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGB8888, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0xff);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGBA8888, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0xff);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::BGR8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 2 && bitMask == 0xff );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::BGRA8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 2 && bitMask == 0xff );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::BGR8888, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 2 && bitMask == 0xff);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::BGRA8888, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 2 && bitMask == 0xff);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB565, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf8 );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGB565, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0xf8);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::BGR565, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0x1f );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::BGR565, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 1 && bitMask == 0x1f);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGBA4444, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf0 );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGBA4444, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0xf0);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::BGRA4444, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0xf0 );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::BGRA4444, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 1 && bitMask == 0xf0);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGBA5551, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf8 );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGBA5551, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0xf8);
 
-  NPatchUtility::GetRedOffsetAndMask( Pixel::BGRA5551, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0x1e );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::BGRA5551, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 1 && bitMask == 0x1e);
 
   // Compressed formats are not supported
-  NPatchUtility::GetRedOffsetAndMask( Pixel::INVALID, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_R11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SIGNED_R11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RG11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SIGNED_RG11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_ETC1, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB_PVRTC_4BPPV1, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA8_ETC2_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::INVALID, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_R11_EAC, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SIGNED_R11_EAC, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RG11_EAC, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SIGNED_RG11_EAC, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGB8_ETC2, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ETC2, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGB8_ETC1, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGB_PVRTC_4BPPV1, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA8_ETC2_EAC, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
 
   // Not supported
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB16F, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB32F, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGB16F, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
+  NPatchUtility::GetRedOffsetAndMask(Pixel::RGB32F, byteOffset, bitMask);
+  DALI_TEST_CHECK(byteOffset == 0 && bitMask == 0);
 
   END_TEST;
 }
@@ -254,49 +253,49 @@ int UtcDaliNPatchUtilityParseBorders(void)
     *   cccc
     */
 
-   const unsigned int imageHeight = 18;
-   const unsigned int imageWidth = 28;
-   const Vector4 requiredStretchBorder( 3, 4, 5, 6 );
+  const unsigned int imageHeight = 18;
+  const unsigned int imageWidth  = 28;
+  const Vector4      requiredStretchBorder(3, 4, 5, 6);
 
-   Dali::Devel::PixelBuffer pixelBuffer = CustomizeNPatch( imageHeight, imageWidth, requiredStretchBorder );
-   DALI_TEST_CHECK( pixelBuffer );
+  Dali::Devel::PixelBuffer pixelBuffer = CustomizeNPatch(imageHeight, imageWidth, requiredStretchBorder);
+  DALI_TEST_CHECK(pixelBuffer);
 
-   if( pixelBuffer )
-   {
-     NPatchUtility::StretchRanges stretchPixelsX;
-     NPatchUtility::StretchRanges stretchPixelsY;
+  if(pixelBuffer)
+  {
+    NPatchUtility::StretchRanges stretchPixelsX;
+    NPatchUtility::StretchRanges stretchPixelsY;
 
-     NPatchUtility::ParseBorders( pixelBuffer, stretchPixelsX, stretchPixelsY );
+    NPatchUtility::ParseBorders(pixelBuffer, stretchPixelsX, stretchPixelsY);
 
-     DALI_TEST_CHECK( stretchPixelsX.Size() == 1 );
-     DALI_TEST_CHECK( stretchPixelsY.Size() == 1 );
+    DALI_TEST_CHECK(stretchPixelsX.Size() == 1);
+    DALI_TEST_CHECK(stretchPixelsY.Size() == 1);
 
-     Vector4 stretchBorders;
-     //The NPatch image stretch pixels are in the cropped image space, inset by 1 to get it to uncropped image space
-     stretchBorders.x = stretchPixelsX[ 0 ].GetX() + 1;
-     stretchBorders.y = stretchPixelsY[ 0 ].GetX() + 1;
-     stretchBorders.z = imageHeight - stretchPixelsX[ 0 ].GetY() - 1;
-     stretchBorders.w = imageWidth - stretchPixelsY[ 0 ].GetY() - 1;
+    Vector4 stretchBorders;
+    //The NPatch image stretch pixels are in the cropped image space, inset by 1 to get it to uncropped image space
+    stretchBorders.x = stretchPixelsX[0].GetX() + 1;
+    stretchBorders.y = stretchPixelsY[0].GetX() + 1;
+    stretchBorders.z = imageHeight - stretchPixelsX[0].GetY() - 1;
+    stretchBorders.w = imageWidth - stretchPixelsY[0].GetY() - 1;
 
-     DALI_TEST_EQUALS( stretchBorders, requiredStretchBorder, 0.001, TEST_LOCATION );
-   }
-   else
-   {
-     test_return_value = TET_FAIL;
-   }
+    DALI_TEST_EQUALS(stretchBorders, requiredStretchBorder, 0.001, TEST_LOCATION);
+  }
+  else
+  {
+    test_return_value = TET_FAIL;
+  }
 
   END_TEST;
 }
 
 int UtcDaliNPatchUtilityIsNinePatchUrl(void)
 {
-  tet_infoline( "UtcDaliNPatchUtilityIsNinePatchUrl" );
+  tet_infoline("UtcDaliNPatchUtilityIsNinePatchUrl");
 
-  DALI_TEST_CHECK( NPatchUtility::IsNinePatchUrl( "test.9.jpg" ) );
-  DALI_TEST_CHECK( NPatchUtility::IsNinePatchUrl( "test.#.jpg" ) );
-  DALI_TEST_CHECK( !NPatchUtility::IsNinePatchUrl( "test.9" ) );
-  DALI_TEST_CHECK( !NPatchUtility::IsNinePatchUrl( "test.#" ) );
-  DALI_TEST_CHECK( !NPatchUtility::IsNinePatchUrl( "test" ) );
+  DALI_TEST_CHECK(NPatchUtility::IsNinePatchUrl("test.9.jpg"));
+  DALI_TEST_CHECK(NPatchUtility::IsNinePatchUrl("test.#.jpg"));
+  DALI_TEST_CHECK(!NPatchUtility::IsNinePatchUrl("test.9"));
+  DALI_TEST_CHECK(!NPatchUtility::IsNinePatchUrl("test.#"));
+  DALI_TEST_CHECK(!NPatchUtility::IsNinePatchUrl("test"));
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp
index f6b9929..09f0ba5 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/navigation-view/navigation-view.h>
+#include <stdlib.h>
+#include <iostream>
+#include <sstream>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -40,16 +40,16 @@ int UtcDaliNavigationTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "NavigationView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("NavigationView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  NavigationView view = NavigationView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  NavigationView view = NavigationView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -59,12 +59,12 @@ int UtcDaliNavigationViewNew(void)
   ToolkitTestApplication application;
 
   NavigationView navigationView;
-  DALI_TEST_CHECK( !navigationView );
+  DALI_TEST_CHECK(!navigationView);
 
   navigationView = NavigationView::New();
-  DALI_TEST_CHECK( navigationView );
+  DALI_TEST_CHECK(navigationView);
 
-  application.GetScene().Add( navigationView );
+  application.GetScene().Add(navigationView);
 
   application.SendNotification();
   application.Render();
@@ -77,20 +77,20 @@ int UtcDaliNavigationViewCopyAndAssignment(void)
   ToolkitTestApplication application;
 
   NavigationView view = NavigationView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  NavigationView copy( view );
-  DALI_TEST_CHECK( copy == view );
+  NavigationView copy(view);
+  DALI_TEST_CHECK(copy == view);
 
   NavigationView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
   assign = view;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   // Self assignment
   assign = assign;
-  DALI_TEST_CHECK( assign );
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign);
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -100,13 +100,13 @@ int UtcDaliNavigationViewDownCast(void)
   ToolkitTestApplication application;
 
   BaseHandle view = NavigationView::New();
-  DALI_TEST_CHECK( NavigationView::DownCast( view ) );
+  DALI_TEST_CHECK(NavigationView::DownCast(view));
 
   BaseHandle empty;
-  DALI_TEST_CHECK( ! NavigationView::DownCast( empty ) );
+  DALI_TEST_CHECK(!NavigationView::DownCast(empty));
 
   BaseHandle another = Actor::New();
-  DALI_TEST_CHECK( ! NavigationView::DownCast( another ) );
+  DALI_TEST_CHECK(!NavigationView::DownCast(another));
 
   END_TEST;
 }
@@ -119,16 +119,16 @@ int UtcDaliNavigationViewPush(void)
 
   // 1 Create and Add Navigation View to stage, actor count should be zero
   NavigationView naviView = NavigationView::New();
-  stage.Add( naviView );
+  stage.Add(naviView);
 
-  DALI_TEST_EQUALS( naviView.GetChildCount(), 0,  TEST_LOCATION );
+  DALI_TEST_EQUALS(naviView.GetChildCount(), 0, TEST_LOCATION);
 
   // 2 Add Actor to Navigation View, actor count should increase to 1
 
   Actor TestParentActor1 = Actor::New();
-  naviView.Push( TestParentActor1 );
+  naviView.Push(TestParentActor1);
 
-  DALI_TEST_EQUALS( naviView.GetChildCount(), 1,  TEST_LOCATION );
+  DALI_TEST_EQUALS(naviView.GetChildCount(), 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -141,29 +141,27 @@ int UtcDaliNavigationViewPop(void)
 
   // 1 Create Navigation View
   NavigationView naviView = NavigationView::New();
-  stage.Add( naviView );
+  stage.Add(naviView);
 
   // 2 Push initial Actor
   Actor testParentActor1 = Actor::New();
-  testParentActor1.SetProperty( Dali::Actor::Property::NAME,"TestParentActor1");
-  naviView.Push( testParentActor1 );
-  DALI_TEST_EQUALS( naviView.GetChildCount(), 1 ,  TEST_LOCATION );
+  testParentActor1.SetProperty(Dali::Actor::Property::NAME, "TestParentActor1");
+  naviView.Push(testParentActor1);
+  DALI_TEST_EQUALS(naviView.GetChildCount(), 1, TEST_LOCATION);
 
   // 3 Push Second Actor which contains a child actor
   Actor testParentActor2 = Actor::New();
-  testParentActor2.SetProperty( Dali::Actor::Property::NAME,"TestParentActor2");
+  testParentActor2.SetProperty(Dali::Actor::Property::NAME, "TestParentActor2");
   Actor testChildActor1 = Actor::New();
-  testParentActor2.Add( testChildActor1 );
-  naviView.Push( testParentActor2 );
-
+  testParentActor2.Add(testChildActor1);
+  naviView.Push(testParentActor2);
 
   // 4 Pop head actor, it should be TestParentActor2
   Actor poppedActor = naviView.Pop();
-  DALI_TEST_EQUALS( poppedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) ,  "TestParentActor2", TEST_LOCATION );
+  DALI_TEST_EQUALS(poppedActor.GetProperty<std::string>(Dali::Actor::Property::NAME), "TestParentActor2", TEST_LOCATION);
 
   // 5 Navigation View child count should be 1
-  DALI_TEST_EQUALS( naviView.GetChildCount(), 1 ,  TEST_LOCATION );
-
+  DALI_TEST_EQUALS(naviView.GetChildCount(), 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -176,36 +174,35 @@ int UtcDaliNavigationViewPushAndPop(void)
 
   // 1 Create Navigation View
   NavigationView naviView = NavigationView::New();
-  stage.Add( naviView );
+  stage.Add(naviView);
 
   // 2 Push initial Actor
   Actor testParentActor1 = Actor::New();
-  testParentActor1.SetProperty( Dali::Actor::Property::NAME,"TestParentActor1");
-  naviView.Push( testParentActor1 );
-  DALI_TEST_EQUALS( naviView.GetChildCount(), 1 ,  TEST_LOCATION );
+  testParentActor1.SetProperty(Dali::Actor::Property::NAME, "TestParentActor1");
+  naviView.Push(testParentActor1);
+  DALI_TEST_EQUALS(naviView.GetChildCount(), 1, TEST_LOCATION);
 
   // 3 Push Second Actor which contains a child actor
   Actor testParentActor2 = Actor::New();
-  testParentActor2.SetProperty( Dali::Actor::Property::NAME,"TestParentActor2");
+  testParentActor2.SetProperty(Dali::Actor::Property::NAME, "TestParentActor2");
   Actor testChildActor1 = Actor::New();
-  testParentActor2.Add( testChildActor1 );
-  naviView.Push( testParentActor2 );
+  testParentActor2.Add(testChildActor1);
+  naviView.Push(testParentActor2);
 
   // 3 Push third Actor which contains a child actor
   Actor testParentActor3 = Actor::New();
-  testParentActor3.SetProperty( Dali::Actor::Property::NAME,"TestParentActor3");
+  testParentActor3.SetProperty(Dali::Actor::Property::NAME, "TestParentActor3");
   Actor testChildActor2 = Actor::New();
-  testParentActor2.Add( testChildActor2 );
-  naviView.Push( testParentActor3 );
+  testParentActor2.Add(testChildActor2);
+  naviView.Push(testParentActor3);
 
   // 4 Pop head actor,  it should be TestParentActor3
   Actor poppedActor = naviView.Pop();
-  DALI_TEST_EQUALS( poppedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) ,  "TestParentActor3", TEST_LOCATION );
+  DALI_TEST_EQUALS(poppedActor.GetProperty<std::string>(Dali::Actor::Property::NAME), "TestParentActor3", TEST_LOCATION);
 
   // 5 Pop head actor,  it should be TestParentActor2
   Actor poppedActor2 = naviView.Pop();
-  DALI_TEST_EQUALS( poppedActor2.GetProperty< std::string >( Dali::Actor::Property::NAME ) ,  "TestParentActor2", TEST_LOCATION );
-
+  DALI_TEST_EQUALS(poppedActor2.GetProperty<std::string>(Dali::Actor::Property::NAME), "TestParentActor2", TEST_LOCATION);
 
   END_TEST;
 }
@@ -218,40 +215,38 @@ int UtcDaliNavigationViewPreventLastPop(void)
 
   // 1 Create Navigation View
   NavigationView naviView = NavigationView::New();
-  stage.Add( naviView );
+  stage.Add(naviView);
 
   // 2 Push initial Actor
   Actor testParentActor1 = Actor::New();
-  testParentActor1.SetProperty( Dali::Actor::Property::NAME,"TestParentActor1");
-  naviView.Push( testParentActor1 );
-  DALI_TEST_EQUALS( naviView.GetChildCount(), 1 ,  TEST_LOCATION );
+  testParentActor1.SetProperty(Dali::Actor::Property::NAME, "TestParentActor1");
+  naviView.Push(testParentActor1);
+  DALI_TEST_EQUALS(naviView.GetChildCount(), 1, TEST_LOCATION);
 
   // 3 Push Second Actor which contains a child actor
   Actor testParentActor2 = Actor::New();
-  testParentActor2.SetProperty( Dali::Actor::Property::NAME,"TestParentActor2");
+  testParentActor2.SetProperty(Dali::Actor::Property::NAME, "TestParentActor2");
   Actor testChildActor1 = Actor::New();
-  testParentActor2.Add( testChildActor1 );
-  naviView.Push( testParentActor2 );
+  testParentActor2.Add(testChildActor1);
+  naviView.Push(testParentActor2);
 
   // 4 Pop head actor, it should be TestParentActor2
   Actor poppedActor1 = naviView.Pop();
-  DALI_TEST_EQUALS( poppedActor1.GetProperty< std::string >( Dali::Actor::Property::NAME ) ,  "TestParentActor2", TEST_LOCATION );
-
+  DALI_TEST_EQUALS(poppedActor1.GetProperty<std::string>(Dali::Actor::Property::NAME), "TestParentActor2", TEST_LOCATION);
 
   // 5 Try to Pop head actor, Should be empty hence can not get name of Actor
   Actor poppedActorEmpty = naviView.Pop();
 
   try
   {
-    const std::string hasNoName = poppedActorEmpty.GetProperty< std::string >( Dali::Actor::Property::NAME );
-    tet_infoline( hasNoName.c_str() );
-    DALI_TEST_CHECK( false ); // should not get here
+    const std::string hasNoName = poppedActorEmpty.GetProperty<std::string>(Dali::Actor::Property::NAME);
+    tet_infoline(hasNoName.c_str());
+    DALI_TEST_CHECK(false); // should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
-
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
index db1b845..7415f8a 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,26 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <string.h>
-#include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <stdlib.h>
+#include <string.h>
+#include <iostream>
+#include <sstream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
 namespace
 {
-const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
-const unsigned int TOTAL_PAGE_NUMBER = 20;
-const Vector2 VIEW_PAGE_SIZE( 300.f,400.f );
-const Vector2 SPINE_SHADOW_PARAMETER( 60.0f, 30.0f );
+const int          RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
+const unsigned int TOTAL_PAGE_NUMBER     = 20;
+const Vector2      VIEW_PAGE_SIZE(300.f, 400.f);
+const Vector2      SPINE_SHADOW_PARAMETER(60.0f, 30.0f);
 
 static bool gObjectCreatedCallBackCalled;
 static void TestCallback(BaseHandle handle)
@@ -54,7 +54,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -64,69 +64,66 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
   return time;
 }
 
-
 static Vector2 PerformGestureDiagonalSwipe(ToolkitTestApplication& application, Vector2 start, Vector2 direction, int frames, uint32_t& time, bool toStart = true, bool toFinish = true)
 {
-  Vector2 pos( start );
+  Vector2 pos(start);
 
-  if( toStart )
+  if(toStart)
   {
     // Now do a pan starting from (start + 20) and heading (direction)
-    Vector2 pos_start_jump( start + Vector2(15.0f, 0.0f) );
-    TestStartPan( application, start, pos_start_jump, time );
+    Vector2 pos_start_jump(start + Vector2(15.0f, 0.0f));
+    TestStartPan(application, start, pos_start_jump, time);
     pos += direction;
   }
 
   time += Wait(application);
 
-  for(int i = 0;i<frames;i++)
+  for(int i = 0; i < frames; i++)
   {
     pos += direction;
-    TestMovePan(application, pos, time );
+    TestMovePan(application, pos, time);
     time += Wait(application);
   }
 
   if(toFinish)
   {
     pos += direction;
-    TestEndPan(application, pos, time );
+    TestEndPan(application, pos, time);
     time += Wait(application);
   }
 
   return pos;
 }
 
-
 //Functor to test whether PageTurnSignal / PagePanSignal is emitted
 class PageSignalCallback : public Dali::ConnectionTracker
 {
 public:
-
-  PageSignalCallback( bool& signalReceived, PageTurnView& view, unsigned int& pageIndex, bool& isForwards )
-  : mSignalVerified( signalReceived ),
-    mView( view ),
-    mPageIndex( pageIndex ),
-    mIsTurningForwards( isForwards )
+  PageSignalCallback(bool& signalReceived, PageTurnView& view, unsigned int& pageIndex, bool& isForwards)
+  : mSignalVerified(signalReceived),
+    mView(view),
+    mPageIndex(pageIndex),
+    mIsTurningForwards(isForwards)
   {
   }
 
   // callback to be connected to PageTurnSignal
-  void PageTurnSignalCallback( PageTurnView view, unsigned int pageIndex, bool isTurningForward )
+  void PageTurnSignalCallback(PageTurnView view, unsigned int pageIndex, bool isTurningForward)
   {
-    tet_infoline( "Verifying PageTurnedSignal" );
+    tet_infoline("Verifying PageTurnedSignal");
 
-    if( mView == view && mPageIndex == pageIndex && mIsTurningForwards == isTurningForward )
+    if(mView == view && mPageIndex == pageIndex && mIsTurningForwards == isTurningForward)
     {
       mSignalVerified = true;
     }
   }
 
   // callback to be connected to PagePanSignal
-  void PagePanSignalCallback( PageTurnView view )
+  void PagePanSignalCallback(PageTurnView view)
   {
-    tet_infoline( "Verifying PagePannedSignal" );
+    tet_infoline("Verifying PagePannedSignal");
 
-    if( mView == view )
+    if(mView == view)
     {
       mSignalVerified = true;
     }
@@ -141,17 +138,14 @@ public:
   PageTurnView& mView;
   unsigned int& mPageIndex;
   bool&         mIsTurningForwards;
-
 };
 
-
 //Implementation of PageFactory for providing page actors to PageTurnView
 class TestPageFactory : public PageFactory
 {
 public:
-
-  TestPageFactory( bool returnValidTexture = true )
-  : mValidTexture( returnValidTexture )
+  TestPageFactory(bool returnValidTexture = true)
+  : mValidTexture(returnValidTexture)
   {
     mTotalPageNumber = TOTAL_PAGE_NUMBER;
   }
@@ -170,21 +164,21 @@ public:
    * @param[in] pageId The ID of the page to create.
    * @return An image, or an empty handle if the ID is out of range.
    */
-  virtual Texture NewPage( unsigned int pageId )
+  virtual Texture NewPage(unsigned int pageId)
   {
-    if( mValidTexture )
+    if(mValidTexture)
     {
-      return Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGB888, 100, 100 );
+      return Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::RGB888, 100, 100);
     }
     return Texture(); // empty handle
   }
 
 private:
-  unsigned int            mTotalPageNumber;
-  bool                    mValidTexture;
+  unsigned int mTotalPageNumber;
+  bool         mValidTexture;
 };
 
-}// namespace
+} // namespace
 
 void dali_page_turn_view_startup(void)
 {
@@ -204,34 +198,34 @@ int UtcDaliPageTurnPortraitViewNew(void)
 
   // Test default constructor
   PageTurnView portraitView;
-  DALI_TEST_CHECK( !portraitView );
+  DALI_TEST_CHECK(!portraitView);
 
   // Test object creation
   TestPageFactory factory;
-  portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( portraitView );
+  portraitView = PageTurnPortraitView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(portraitView);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     TestPageFactory factory;
-    PageTurnView portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
+    PageTurnView    portraitView = PageTurnPortraitView::New(factory, VIEW_PAGE_SIZE);
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   // Test copy constructor
-  PageTurnView viewCopy( portraitView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnView viewCopy(portraitView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test down cast
   Handle handleView;
-  handleView = portraitView;
-  PageTurnView downCastView = PageTurnView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                = portraitView;
+  PageTurnView downCastView = PageTurnView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -244,34 +238,34 @@ int UtcDaliPageTurnLandscapeViewNew(void)
 
   //Test default constructor
   PageTurnView landscapeView;
-  DALI_TEST_CHECK( !landscapeView );
+  DALI_TEST_CHECK(!landscapeView);
 
   // Test object creation
   TestPageFactory factory;
-  landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( landscapeView );
+  landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(landscapeView);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     TestPageFactory factory;
-    PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
+    PageTurnView    landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   // Test copy constructor
-  PageTurnView viewCopy( landscapeView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnView viewCopy(landscapeView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test down cast
   Handle handleView;
-  handleView = landscapeView;
-  PageTurnView downCastView = PageTurnView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                = landscapeView;
+  PageTurnView downCastView = PageTurnView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -284,28 +278,28 @@ int UtcDaliPageTurnPortraitViewCopyConstructorAndAssignment(void)
 
   // Test default constructor
   PageTurnPortraitView portraitView;
-  DALI_TEST_CHECK( !portraitView );
+  DALI_TEST_CHECK(!portraitView);
 
   // Test object creation
   TestPageFactory factory;
-  portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( portraitView );
+  portraitView = PageTurnPortraitView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(portraitView);
 
   // Test copy constructor
-  PageTurnPortraitView viewCopy( portraitView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnPortraitView viewCopy(portraitView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test assignment
   PageTurnPortraitView portraitView2;
   portraitView2 = portraitView;
-  DALI_TEST_CHECK( portraitView2 );
-  DALI_TEST_CHECK( portraitView == portraitView2);
+  DALI_TEST_CHECK(portraitView2);
+  DALI_TEST_CHECK(portraitView == portraitView2);
 
   // Test down cast
   Handle handleView;
-  handleView = portraitView;
-  PageTurnPortraitView downCastView = PageTurnPortraitView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                        = portraitView;
+  PageTurnPortraitView downCastView = PageTurnPortraitView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -318,28 +312,28 @@ int UtcDaliPageTurnLandscapeViewCopyConstructorAndAssignment(void)
 
   // Test default constructor
   PageTurnLandscapeView landscapeView;
-  DALI_TEST_CHECK( !landscapeView );
+  DALI_TEST_CHECK(!landscapeView);
 
   // Test object creation
   TestPageFactory factory;
-  landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( landscapeView );
+  landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(landscapeView);
 
   // Test copy constructor
-  PageTurnLandscapeView viewCopy( landscapeView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnLandscapeView viewCopy(landscapeView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test assignment
   PageTurnLandscapeView landscapeView2;
   landscapeView2 = landscapeView;
-  DALI_TEST_CHECK( landscapeView2 );
-  DALI_TEST_CHECK( landscapeView == landscapeView2);
+  DALI_TEST_CHECK(landscapeView2);
+  DALI_TEST_CHECK(landscapeView == landscapeView2);
 
   // Test down cast
   Handle handleView;
-  handleView = landscapeView;
-  PageTurnLandscapeView downCastView = PageTurnLandscapeView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                         = landscapeView;
+  PageTurnLandscapeView downCastView = PageTurnLandscapeView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -351,44 +345,44 @@ int UtcDaliPageTurnViewSetGetProperty(void)
   tet_infoline(" UtcDaliPageTurnViewSetGetProperty ");
 
   TestPageFactory factory;
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( landscapeView );
+  PageTurnView    landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(landscapeView);
 
-  application.GetScene().Add( landscapeView );
+  application.GetScene().Add(landscapeView);
 
   // Test "viewPageSize" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("viewPageSize") == PageTurnView::Property::VIEW_PAGE_SIZE  );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), VIEW_PAGE_SIZE, TEST_LOCATION );
+  DALI_TEST_CHECK(landscapeView.GetPropertyIndex("viewPageSize") == PageTurnView::Property::VIEW_PAGE_SIZE);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), VIEW_PAGE_SIZE, TEST_LOCATION);
 
-  Vector2 newSize( VIEW_PAGE_SIZE.x*0.75, VIEW_PAGE_SIZE.y*0.5f );
-  landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE, newSize );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION );
-  Wait( application);
-  DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*2.f, newSize.y), TEST_LOCATION);
+  Vector2 newSize(VIEW_PAGE_SIZE.x * 0.75, VIEW_PAGE_SIZE.y * 0.5f);
+  landscapeView.SetProperty(PageTurnView::Property::VIEW_PAGE_SIZE, newSize);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION);
+  Wait(application);
+  DALI_TEST_EQUALS(Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x * 2.f, newSize.y), TEST_LOCATION);
 
-  landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE,newSize*1.5f);
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize*1.5f, TEST_LOCATION );
-  Wait( application);
-  DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION);
+  landscapeView.SetProperty(PageTurnView::Property::VIEW_PAGE_SIZE, newSize * 1.5f);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize * 1.5f, TEST_LOCATION);
+  Wait(application);
+  DALI_TEST_EQUALS(Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x * 3.f, newSize.y * 1.5f), TEST_LOCATION);
 
   // Test "currentPageId" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("currentPageId") == PageTurnView::Property::CURRENT_PAGE_ID );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
+  DALI_TEST_CHECK(landscapeView.GetPropertyIndex("currentPageId") == PageTurnView::Property::CURRENT_PAGE_ID);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
 
-  int pageId = static_cast<int>(TOTAL_PAGE_NUMBER)/3;
-  landscapeView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, pageId );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId, TEST_LOCATION );
+  int pageId = static_cast<int>(TOTAL_PAGE_NUMBER) / 3;
+  landscapeView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, pageId);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId, TEST_LOCATION);
 
-  landscapeView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, pageId*2 );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId*2, TEST_LOCATION );
+  landscapeView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, pageId * 2);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId * 2, TEST_LOCATION);
 
   // Test "spinShadow" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex( "spineShadow" ) == PageTurnView::Property::SPINE_SHADOW );
-  landscapeView.SetProperty( PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER, TEST_LOCATION );
+  DALI_TEST_CHECK(landscapeView.GetPropertyIndex("spineShadow") == PageTurnView::Property::SPINE_SHADOW);
+  landscapeView.SetProperty(PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER, TEST_LOCATION);
 
-  landscapeView.SetProperty( PageTurnView::Property::SPINE_SHADOW,  SPINE_SHADOW_PARAMETER*0.75f );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER*0.75f, TEST_LOCATION );
+  landscapeView.SetProperty(PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER * 0.75f);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER * 0.75f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -399,13 +393,13 @@ int UtcDaliPageTurnPortraitViewSignals(void)
 
   tet_infoline(" UtcDaliPageTurnPortraitViewSignals ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   TestPageFactory factory;
-  Vector2 size = application.GetScene().GetSize();
-  PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
-  portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( portraitView );
+  Vector2         size         = application.GetScene().GetSize();
+  PageTurnView    portraitView = PageTurnPortraitView::New(factory, size);
+  portraitView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(portraitView);
 
   // Render and notify
   application.SendNotification();
@@ -413,108 +407,108 @@ int UtcDaliPageTurnPortraitViewSignals(void)
 
   // [0]: testing PageTurnStartedSignal;  [1]: testing PageTurnFinishedSignal
   // [2]: testing PagePanStartedSignal;   [3]: testing PagePanFinishedSignal
-  bool signalVerified[4] = {false, false, false, false};
+  bool         signalVerified[4] = {false, false, false, false};
   PageTurnView currentView;
   unsigned int pageIndex;
-  bool isTurningForwards;
+  bool         isTurningForwards;
 
-  PageSignalCallback callbackTurnStarted( signalVerified[0], currentView, pageIndex, isTurningForwards );
-  portraitView.PageTurnStartedSignal().Connect( &callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnStarted(signalVerified[0], currentView, pageIndex, isTurningForwards);
+  portraitView.PageTurnStartedSignal().Connect(&callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackTurnFinished( signalVerified[1], currentView, pageIndex, isTurningForwards );
-  portraitView.PageTurnFinishedSignal().Connect( &callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnFinished(signalVerified[1], currentView, pageIndex, isTurningForwards);
+  portraitView.PageTurnFinishedSignal().Connect(&callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackPanStarted( signalVerified[2], currentView, pageIndex, isTurningForwards );
-  portraitView.PagePanStartedSignal().Connect( &callbackPanStarted, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanStarted(signalVerified[2], currentView, pageIndex, isTurningForwards);
+  portraitView.PagePanStartedSignal().Connect(&callbackPanStarted, &PageSignalCallback::PagePanSignalCallback);
 
-  PageSignalCallback callbackPanFinished( signalVerified[3], currentView, pageIndex, isTurningForwards );
-  portraitView.PagePanFinishedSignal().Connect( &callbackPanFinished, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanFinished(signalVerified[3], currentView, pageIndex, isTurningForwards);
+  portraitView.PagePanFinishedSignal().Connect(&callbackPanFinished, &PageSignalCallback::PagePanSignalCallback);
 
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
   currentView = portraitView;
 
   //-----Test 1: pan 10 frames from position(size * 0.75f) to position(size * 0.25f), page 0 will be turned forward----
-  pageIndex = 0;
+  pageIndex         = 0;
   isTurningForwards = true;
   // Do a pan moving up diagonally
-  uint32_t time = 0;
-  Vector2 start = size * 0.75f;
-  Vector2 direction = -size*0.05f; //-size*0.5f/10.f;
+  uint32_t time      = 0;
+  Vector2  start     = size * 0.75f;
+  Vector2  direction = -size * 0.05f; //-size*0.5f/10.f;
 
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
   // the page is turned over
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex+1), TEST_LOCATION );
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex + 1), TEST_LOCATION);
 
   //---Test 2: pan from position( size*0.5f ) to position( size.width, size.height*0.5f ) to position( size * 0.75f ), page 1 will bent then slid back---
   callbackTurnStarted.Reset();
   callbackTurnFinished.Reset();
   callbackPanStarted.Reset();
   callbackPanFinished.Reset();
-  portraitView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, 5 );
-  pageIndex = 5;
+  portraitView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, 5);
+  pageIndex         = 5;
   isTurningForwards = true;
 
   //pan 10 frames from position( size.width, size.height*0.5f ) to position( size * 0.75f )
-  start = Vector2( size.width, size.height*0.5f );
-  direction = Vector2(-size.width*0.025f, size.height*0.025f);
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  start     = Vector2(size.width, size.height * 0.5f);
+  direction = Vector2(-size.width * 0.025f, size.height * 0.025f);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
   signalVerified[0] = false;
   isTurningForwards = false;
-  PerformGestureDiagonalSwipe( application, start + direction*2 , direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified ); // start the sliding back
+  PerformGestureDiagonalSwipe(application, start + direction * 2, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified); // start the sliding back
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)pageIndex, TEST_LOCATION ); // the page is not turned over
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)pageIndex, TEST_LOCATION); // the page is not turned over
 
   // ----Test 3: pan 10 frames from position( size*0.25f ) to position( size.width*0.75f, size.height*0.25f ), the previous page will be turned backwards---
   callbackTurnStarted.Reset();
   callbackTurnFinished.Reset();
   callbackPanStarted.Reset();
   callbackPanFinished.Reset();
-  portraitView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, 10);
-  pageIndex = 9; // will turn the previous page back
+  portraitView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, 10);
+  pageIndex         = 9; // will turn the previous page back
   isTurningForwards = false;
-  start = size*0.25f;
-  direction = Vector2(size.x*0.05f, 0.f);
-  PerformGestureDiagonalSwipe( application, start, direction, 4, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
-
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-
-  Wait( application, 1000 );
-
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 9, TEST_LOCATION );
+  start             = size * 0.25f;
+  direction         = Vector2(size.x * 0.05f, 0.f);
+  PerformGestureDiagonalSwipe(application, start, direction, 4, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
+
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+
+  Wait(application, 1000);
+
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 9, TEST_LOCATION);
   END_TEST;
 }
 
@@ -524,7 +518,7 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
 
   tet_infoline(" UtcDaliPageTurnLanscapeViewSignals ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   /***
    * -----------------
    * |               |
@@ -540,10 +534,10 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
    */
 
   TestPageFactory factory;
-  Vector2 stageSize = application.GetScene().GetSize();
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, Vector2(stageSize.x*0.5f, stageSize.x*0.8f) );
-  landscapeView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( landscapeView );
+  Vector2         stageSize     = application.GetScene().GetSize();
+  PageTurnView    landscapeView = PageTurnLandscapeView::New(factory, Vector2(stageSize.x * 0.5f, stageSize.x * 0.8f));
+  landscapeView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(landscapeView);
 
   // Render and notify
   application.SendNotification();
@@ -551,53 +545,53 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
 
   // [0]: testing PageTurnStartedSignal;  [1]: testing PageTurnFinishedSignal
   // [2]: testing PagePanStartedSignal;   [3]: testing PagePanFinishedSignal
-  bool signalVerified[4] = {false, false, false, false};
+  bool         signalVerified[4] = {false, false, false, false};
   PageTurnView currentView;
   unsigned int pageIndex;
-  bool isTurningForwards;
+  bool         isTurningForwards;
 
-  PageSignalCallback callbackTurnStarted( signalVerified[0], currentView, pageIndex, isTurningForwards );
-  landscapeView.PageTurnStartedSignal().Connect( &callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnStarted(signalVerified[0], currentView, pageIndex, isTurningForwards);
+  landscapeView.PageTurnStartedSignal().Connect(&callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackTurnFinished( signalVerified[1], currentView, pageIndex, isTurningForwards );
-  landscapeView.PageTurnFinishedSignal().Connect( &callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnFinished(signalVerified[1], currentView, pageIndex, isTurningForwards);
+  landscapeView.PageTurnFinishedSignal().Connect(&callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackPanStarted( signalVerified[2], currentView, pageIndex, isTurningForwards );
-  landscapeView.PagePanStartedSignal().Connect( &callbackPanStarted, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanStarted(signalVerified[2], currentView, pageIndex, isTurningForwards);
+  landscapeView.PagePanStartedSignal().Connect(&callbackPanStarted, &PageSignalCallback::PagePanSignalCallback);
 
-  PageSignalCallback callbackPanFinished( signalVerified[3], currentView, pageIndex, isTurningForwards );
-  landscapeView.PagePanFinishedSignal().Connect( &callbackPanFinished, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanFinished(signalVerified[3], currentView, pageIndex, isTurningForwards);
+  landscapeView.PagePanFinishedSignal().Connect(&callbackPanFinished, &PageSignalCallback::PagePanSignalCallback);
 
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
   currentView = landscapeView;
 
   //-----Test 1: pan 10 frames from position(stageSize.x * 0.85f, stageSize.y*0.5) to position(stageSize.x * 0.45f, stageSize.y*0.5-stageSize.x * 0.3f), page 0 will be turned forward----
-  pageIndex = 0;
+  pageIndex         = 0;
   isTurningForwards = true;
   // Do a pan to the left.
-  uint32_t time = 0;
-  Vector2 start = Vector2(stageSize.x * 0.85f, stageSize.y*0.5);
-  Vector2 direction = Vector2(-stageSize.x*0.04f, -stageSize.x*0.03f);
+  uint32_t time      = 0;
+  Vector2  start     = Vector2(stageSize.x * 0.85f, stageSize.y * 0.5);
+  Vector2  direction = Vector2(-stageSize.x * 0.04f, -stageSize.x * 0.03f);
 
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
   // the page is turned over
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex+1), TEST_LOCATION );
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex + 1), TEST_LOCATION);
 
   //---Test 2: pan from position(stageSize.x * 0.15f, stageSize.y*0.5) to position(stageSize.x * 0.45f, stageSize.y*0.5) page 4 will be turned back---
   callbackTurnStarted.Reset();
@@ -607,21 +601,21 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
   isTurningForwards = false;
 
   //pan 10 frames from position( size.width, size.height*0.5f ) to position( size * 0.75f )
-  start = Vector2( stageSize.x * 0.15f, stageSize.y*0.5f );
+  start     = Vector2(stageSize.x * 0.15f, stageSize.y * 0.5f);
   direction = Vector2(stageSize.x * 0.03f, 0.f);
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
-  PerformGestureDiagonalSwipe( application, start + direction*5.f , direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION ); // the first page is turned back
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION); // the first page is turned back
 
   // ----Test 3: pan 10 frames from position( size*0.55f ) to position( size.width*0.8f, size.height*0.5f ), no page turn will be started---
   callbackTurnStarted.Reset();
@@ -629,31 +623,31 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
   callbackPanStarted.Reset();
   callbackPanFinished.Reset();
   isTurningForwards = false;
-  start = stageSize*0.55f;
-  direction = Vector2(stageSize.x*0.025f, 0.f);
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
-
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-
-  Wait( application, 1000 );
-
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
+  start             = stageSize * 0.55f;
+  direction         = Vector2(stageSize.x * 0.025f, 0.f);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
+
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+
+  Wait(application, 1000);
+
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPageImageFactoryGetExtention(void)
 {
   ToolkitTestApplication application;
-  TestPageFactory factory;
-  DALI_TEST_CHECK( factory.GetExtension() == NULL );
+  TestPageFactory        factory;
+  DALI_TEST_CHECK(factory.GetExtension() == NULL);
   END_TEST;
 }
 
@@ -663,27 +657,26 @@ int UtcDaliPageTurnEmptyTextureHandle(void)
 
   tet_infoline(" UtcDaliPageTurnEmptyTextureHandle ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  TestPageFactory factory( false /* returns empty handles */ );
-  Vector2 size = application.GetScene().GetSize();
+  TestPageFactory factory(false /* returns empty handles */);
+  Vector2         size = application.GetScene().GetSize();
   try
   {
-    PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
-    portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( portraitView );
+    PageTurnView portraitView = PageTurnPortraitView::New(factory, size);
+    portraitView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(portraitView);
 
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "must pass in valid texture", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "must pass in valid texture", TEST_LOCATION);
   }
-  catch (...)
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
 
   END_TEST;
 }
-
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ParticleSystem.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ParticleSystem.cpp
new file mode 100644
index 0000000..eb7ba1d
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ParticleSystem.cpp
@@ -0,0 +1,1065 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-test-suite-utils.h>
+#include <dali-toolkit/public-api/particle-system/particle-domain.h>
+#include <dali-toolkit/public-api/particle-system/particle-emitter.h>
+#include <dali-toolkit/public-api/particle-system/particle-list.h>
+#include <dali-toolkit/public-api/particle-system/particle-modifier.h>
+#include <dali-toolkit/public-api/particle-system/particle-renderer.h>
+#include <dali-toolkit/public-api/particle-system/particle-source.h>
+#include <dali-toolkit/public-api/particle-system/particle.h>
+
+#include <dlfcn.h>
+
+#include <future>
+
+using namespace Dali;
+using namespace Dali::Toolkit::ParticleSystem;
+
+/**
+ * Helper function to invoke next function in the call chain
+ */
+template<class R, class T, class... Args>
+R InvokeNext(T* pObj, Args... args)
+{
+  Dl_info info;
+  dladdr(__builtin_return_address(0), &info);
+  using Func = R (*)(T*, Args...);
+  auto sym   = (Func)(dlsym(RTLD_NEXT, info.dli_sname));
+  return sym(pObj, args...);
+}
+
+static std::chrono::milliseconds currentTime(1u);
+static void                      AdvanceTimeByMs(uint32_t ms)
+{
+  currentTime += std::chrono::milliseconds(ms);
+}
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+// Create fake time getter
+struct ParticleEmitter
+{
+  [[nodiscard]] std::chrono::milliseconds GetCurrentTimeMillis() const;
+};
+std::chrono::milliseconds ParticleEmitter::GetCurrentTimeMillis() const
+{
+  [[maybe_unused]] auto value = InvokeNext<std::chrono::milliseconds>(this);
+  return std::chrono::milliseconds(currentTime);
+}
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+
+using ParticleEmitterWrapper = Dali::Toolkit::ParticleSystem::Internal::ParticleEmitter;
+
+Texture CreateTexture()
+{
+  Texture   texture   = Texture::New(Dali::TextureType::TEXTURE_2D, Dali::Pixel::RGBA8888, 100, 100);
+  uint8_t*  data      = reinterpret_cast<uint8_t*>(malloc(100 * 100 * 4));
+  PixelData pixelData = PixelData::New(data, 100 * 100 * 4, 100, 100, Pixel::Format::RGBA8888, PixelData::FREE);
+  texture.Upload(pixelData);
+  return texture;
+}
+
+/**
+ * Test particle source
+ */
+class TestSource : public ParticleSourceInterface
+{
+public:
+  TestSource(ParticleEmitter* emitter)
+  : mEmitter(*emitter)
+  {
+  }
+
+  void NewFrame()
+  {
+    mPromise = std::promise<uint32_t>();
+    mFuture  = mPromise.get_future();
+  }
+
+  uint32_t Update(ParticleList& outList, uint32_t count) override
+  {
+    mPromise.set_value(count);
+    auto i = count;
+    while(--i)
+    {
+      outList.NewParticle(1.0f);
+    }
+    return count;
+  }
+
+  void Init() override
+  {
+    // calls initialized
+    mInitialized = true;
+  }
+
+  bool                   mInitialized{false};
+  std::future<uint32_t>  mFuture;
+  std::promise<uint32_t> mPromise;
+  ParticleEmitter&       mEmitter;
+};
+
+class TestSource2 : public ParticleSourceInterface
+{
+public:
+  TestSource2(ParticleEmitter* emitter)
+  : mEmitter(*emitter)
+  {
+  }
+
+  void NewFrame()
+  {
+    mPromise = std::promise<uint32_t>();
+    mFuture  = mPromise.get_future();
+  }
+
+  uint32_t Update(ParticleList& outList, uint32_t count) override
+  {
+    mPromise.set_value(count);
+
+    while(count--)
+    {
+      auto particle = outList.NewParticle(1.0);
+      if(!particle)
+      {
+        return 0u;
+      }
+
+      [[maybe_unused]] auto& pos = particle.GetByIndex<Vector3>(mStreamBasePos);
+
+      [[maybe_unused]] auto& gpos = particle.Get<Vector3>(ParticleStream::POSITION_STREAM_BIT);
+      [[maybe_unused]] auto& col  = particle.Get<Vector4>(ParticleStream::COLOR_STREAM_BIT);
+      [[maybe_unused]] auto& vel  = particle.Get<Vector3>(ParticleStream::VELOCITY_STREAM_BIT);
+      [[maybe_unused]] auto& sca  = particle.Get<Vector3>(ParticleStream::SCALE_STREAM_BIT);
+      //auto& basePos = particle.Get<Vector3>(ParticleStream::SCALE_STREAM_BIT);
+    }
+
+    return count;
+  }
+
+  void Init() override
+  {
+    // calls initialized
+    mStreamBasePos = mEmitter.GetParticleList().AddLocalStream<Vector3>(Vector3::ZERO);
+    mInitialized   = true;
+  }
+
+  bool                   mInitialized{false};
+  std::future<uint32_t>  mFuture;
+  std::promise<uint32_t> mPromise;
+  uint32_t               mStreamBasePos{0u};
+  ParticleEmitter&       mEmitter;
+};
+/**
+ * Sample of FlameModifier
+ */
+struct TestModifier : public ParticleModifierInterface
+{
+  void Update(ParticleList& particleList, uint32_t firstParticleIndex, uint32_t particleCount) override
+  {
+  }
+};
+
+struct TestModifierMT : public ParticleModifierInterface
+{
+  void Update(ParticleList& particleList, uint32_t firstParticleIndex, uint32_t particleCount) override
+  {
+  }
+
+  bool IsMultiThreaded() override
+  {
+    return true;
+  }
+};
+
+/**
+ * Another modifier to test modifier stack
+ */
+struct TestModifier2 : public ParticleModifierInterface
+{
+  void Update(ParticleList& particleList, uint32_t firstParticleIndex, uint32_t particleCount) override
+  {
+  }
+};
+
+struct EmitterGroup
+{
+  ParticleEmitter  emitter;
+  ParticleRenderer renderer;
+  ParticleModifier modifier;
+  ParticleSource   source;
+};
+
+// Helper function to create emitter (every test will be doing that)
+template<class SOURCE, class MODIFIER>
+ParticleEmitter CreateEmitter(EmitterGroup* output = nullptr)
+{
+  auto emitter = ParticleEmitter::New();
+
+  bool result = (emitter != nullptr);
+  DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+
+  // Create test source
+  auto source = ParticleSource::New<SOURCE>(&emitter);
+
+  {
+    BaseHandle handle(source);
+    auto       newHandle = ParticleSource::DownCast(handle);
+    DALI_TEST_EQUALS(newHandle, source, TEST_LOCATION);
+  }
+
+  // Create test renderer
+  auto renderer = ParticleRenderer::New();
+
+  {
+    BaseHandle handle(renderer);
+    auto       newHandle = ParticleRenderer::DownCast(handle);
+    DALI_TEST_EQUALS(newHandle, renderer, TEST_LOCATION);
+  }
+
+  // Create modifier
+  auto modifier = ParticleModifier::New<MODIFIER>();
+
+  {
+    BaseHandle handle(modifier);
+    auto       newHandle = ParticleModifier::DownCast(handle);
+    DALI_TEST_EQUALS(newHandle, modifier, TEST_LOCATION);
+  }
+
+  auto domain = ParticleDomain::New();
+
+  {
+    BaseHandle handle(domain);
+    auto       newHandle = ParticleDomain::DownCast(handle);
+    DALI_TEST_EQUALS(newHandle, domain, TEST_LOCATION);
+  }
+
+  // Test emitter readiness
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::INCOMPLETE, TEST_LOCATION);
+
+  // Attach all components to the emitter
+  emitter.SetSource(source);
+  emitter.SetRenderer(renderer);
+  emitter.AddModifier(modifier);
+  emitter.SetDomain(domain);
+
+  auto domain0   = emitter.GetDomain();
+  auto renderer0 = emitter.GetRenderer();
+
+  DALI_TEST_EQUALS(renderer0, renderer, TEST_LOCATION);
+  DALI_TEST_EQUALS(domain0, domain, TEST_LOCATION);
+
+  if(output)
+  {
+    output->emitter  = emitter;
+    output->renderer = renderer;
+    output->modifier = modifier;
+    output->source   = source;
+  }
+
+  return emitter;
+}
+
+int UtcDaliParticleSystemEmitterNew(void)
+{
+  // create particle emitter
+  auto emitter = ParticleEmitter::New();
+
+  bool result = (emitter != nullptr);
+  DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+
+  // Create test source
+  auto source = ParticleSource::New<TestSource>(&emitter);
+
+  // Create test renderer
+  auto renderer = ParticleRenderer::New();
+
+  // Create modifier
+  auto modifier = ParticleModifier::New<TestModifier>();
+
+  // Create domain
+  auto domain = ParticleDomain::New();
+
+  // Test emitter readiness
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::INCOMPLETE, TEST_LOCATION);
+
+  // Attach all components to the emitter
+  emitter.SetSource(source);
+  emitter.SetRenderer(renderer);
+  emitter.AddModifier(modifier);
+  emitter.SetDomain(domain);
+
+  // test status again (domain is optional);
+  ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemEmitterNew2(void)
+{
+  // create particle emitter
+  auto emitter = ParticleEmitter::New();
+
+  bool result = (emitter != nullptr);
+  DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+
+  // Create test source
+  auto source = ParticleSource::New<TestSource>(&emitter);
+
+  // Create test renderer
+  auto renderer = ParticleRenderer::New();
+
+  // Create modifier
+  auto modifier = ParticleModifier::New<TestModifier>();
+
+  // Create domain
+  auto domain = ParticleDomain::New();
+
+  // Test emitter readiness
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::INCOMPLETE, TEST_LOCATION);
+
+  // Attach all components to the emitter
+  emitter.SetSource(source);
+  emitter.SetRenderer(renderer);
+  emitter.AddModifier(modifier);
+  emitter.SetDomain(domain);
+
+  // test blending mode
+  DALI_TEST_EQUALS(renderer.GetBlendingMode(), Dali::Toolkit::ParticleSystem::BlendingMode::DEFAULT, TEST_LOCATION);
+
+  emitter.SetParticleCount(10000);
+  DALI_TEST_EQUALS(emitter.GetParticleCount(), 10000, TEST_LOCATION);
+
+  auto m = emitter.GetModifierAt(0);
+  DALI_TEST_EQUALS(m != nullptr, true, TEST_LOCATION);
+
+  m.GetModifierCallback();
+
+  // test status again (domain is optional);
+  ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemEmitterDefaultStreams(void)
+{
+  // create particle emitter
+  auto emitter = ParticleEmitter::New();
+
+  bool result = (emitter != nullptr);
+  DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+
+  // Create test source
+  auto source = ParticleSource::New<TestSource>(&emitter);
+
+  // Create test renderer
+  auto renderer = ParticleRenderer::New();
+
+  // Create modifier
+  auto modifier = ParticleModifier::New<TestModifier>();
+
+  // Create domain
+  auto domain = ParticleDomain::New();
+
+  // Test emitter readiness
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::INCOMPLETE, TEST_LOCATION);
+
+  // Attach all components to the emitter
+  emitter.SetSource(source);
+  emitter.SetRenderer(renderer);
+  emitter.AddModifier(modifier);
+  emitter.SetDomain(domain);
+
+  auto                  particleList   = emitter.GetParticleList();
+  std::vector<uint32_t> expectedValues = {
+    ParticleStream::POSITION_STREAM_BIT, 0, ParticleStream::COLOR_STREAM_BIT, 3, ParticleStream::VELOCITY_STREAM_BIT, 2, ParticleStream::SCALE_STREAM_BIT, 1, ParticleStream::LIFETIME_STREAM_BIT, 4, ParticleStream::LIFETIME_BASE_STREAM_BIT, 5};
+
+  for(auto i = 0u; i < expectedValues.size(); i += 2)
+  {
+    auto index = particleList.GetDefaultStreamIndex(expectedValues[i]);
+    DALI_TEST_EQUALS(index, expectedValues[i + 1], TEST_LOCATION);
+  }
+
+  // test status again (domain is optional);
+  ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemEmitterModifierStack(void)
+{
+  // create particle emitter
+  auto emitter = ParticleEmitter::New();
+
+  bool result = (emitter != nullptr);
+  DALI_TEST_EQUALS(result, true, TEST_LOCATION);
+
+  // Create test source
+  auto source = ParticleSource::New<TestSource>(&emitter);
+
+  // Create test renderer
+  auto renderer = ParticleRenderer::New();
+
+  // Create modifier
+  auto modifier0 = ParticleModifier::New<TestModifier>();
+  auto modifier1 = ParticleModifier::New<TestModifier>();
+  auto modifier2 = ParticleModifier::New<TestModifier>();
+
+  // Create domain
+  auto domain = ParticleDomain::New();
+
+  // Test emitter readiness
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::INCOMPLETE, TEST_LOCATION);
+
+  // Attach all components to the emitter
+  emitter.SetSource(source);
+  emitter.SetRenderer(renderer);
+  emitter.AddModifier(modifier0);
+  emitter.AddModifier(modifier1);
+  emitter.AddModifier(modifier2);
+
+  emitter.SetDomain(domain);
+
+  // test status again (domain is optional);
+  ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  auto modifier = emitter.GetModifierAt(1);
+  DALI_TEST_EQUALS(modifier, modifier1, TEST_LOCATION);
+
+  emitter.RemoveModifierAt(0);
+  modifier = emitter.GetModifierAt(0);
+  DALI_TEST_EQUALS(modifier, modifier1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemTest(void)
+{
+  TestApplication application;
+
+  // Create actor to be used with emitter
+  Actor actor = Actor::New();
+  application.GetScene().Add(actor);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+
+  auto emitter = CreateEmitter<TestSource, TestModifier>();
+
+  // test status again (domain is optional);
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  // Set initial parameters of system
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(5000);
+
+  // Test getters
+  auto initialParticleCount = emitter.GetInitialParticleCount();
+  auto activeParticlesLimit = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(initialParticleCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeParticlesLimit, 5000, TEST_LOCATION);
+
+  // Attach emitter to actor
+  emitter.AttachTo(actor);
+
+  // Start emitter
+  emitter.Start();
+
+  auto status = emitter.GetStatus();
+  DALI_TEST_EQUALS(status, ParticleEmitter::Status::STARTED, TEST_LOCATION);
+
+  auto& sourceCallback = dynamic_cast<TestSource&>(emitter.GetSource().GetSourceCallback());
+
+  // Run simulation
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // First call into source callback should emit initial number of particles
+  auto emittedParticleCount = sourceCallback.mFuture.get();
+  DALI_TEST_EQUALS(emittedParticleCount, 1000, TEST_LOCATION);
+
+  // Run 3 more frames advancing by 1000ms which should
+  // emit particles based on emission rate
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemTestWithTextureScreen(void)
+{
+  TestApplication application;
+
+  // Create actor to be used with emitter
+  Actor actor = Actor::New();
+  application.GetScene().Add(actor);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+
+  EmitterGroup group;
+
+  auto emitter = CreateEmitter<TestSource, TestModifier>(&group);
+
+  // Blending mode with screen
+  auto texture = CreateTexture();
+  group.renderer.SetTexture(texture);
+  group.renderer.SetBlendingMode(BlendingMode::SCREEN);
+
+  // test status again (domain is optional);
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  // Set initial parameters of system
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(5000);
+
+  // Test getters
+  auto initialParticleCount = emitter.GetInitialParticleCount();
+  auto activeParticlesLimit = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(initialParticleCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeParticlesLimit, 5000, TEST_LOCATION);
+
+  // Attach emitter to actor
+  emitter.AttachTo(actor);
+
+  // Start emitter
+  emitter.Start();
+
+  auto status = emitter.GetStatus();
+  DALI_TEST_EQUALS(status, ParticleEmitter::Status::STARTED, TEST_LOCATION);
+
+  auto& sourceCallback = dynamic_cast<TestSource&>(emitter.GetSource().GetSourceCallback());
+
+  // Run simulation
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // First call into source callback should emit initial number of particles
+  auto emittedParticleCount = sourceCallback.mFuture.get();
+  DALI_TEST_EQUALS(emittedParticleCount, 1000, TEST_LOCATION);
+
+  // Run 3 more frames advancing by 1000ms which should
+  // emit particles based on emission rate
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemTestWithTextureAdd(void)
+{
+  TestApplication application;
+
+  // Create actor to be used with emitter
+  Actor actor = Actor::New();
+  application.GetScene().Add(actor);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+
+  EmitterGroup group;
+
+  auto emitter = CreateEmitter<TestSource, TestModifier>(&group);
+
+  // Blending mode with screen
+  auto texture = CreateTexture();
+  group.renderer.SetTexture(texture);
+  group.renderer.SetBlendingMode(BlendingMode::DEFAULT);
+
+  // test status again (domain is optional);
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  // Set initial parameters of system
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(5000);
+
+  // Test getters
+  auto initialParticleCount = emitter.GetInitialParticleCount();
+  auto activeParticlesLimit = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(initialParticleCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeParticlesLimit, 5000, TEST_LOCATION);
+
+  // Attach emitter to actor
+  emitter.AttachTo(actor);
+
+  // Start emitter
+  emitter.Start();
+
+  auto status = emitter.GetStatus();
+  DALI_TEST_EQUALS(status, ParticleEmitter::Status::STARTED, TEST_LOCATION);
+
+  auto& sourceCallback = dynamic_cast<TestSource&>(emitter.GetSource().GetSourceCallback());
+
+  // Run simulation
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // First call into source callback should emit initial number of particles
+  auto emittedParticleCount = sourceCallback.mFuture.get();
+  DALI_TEST_EQUALS(emittedParticleCount, 1000, TEST_LOCATION);
+
+  // Run 3 more frames advancing by 1000ms which should
+  // emit particles based on emission rate
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemTestInitialSetup(void)
+{
+  TestApplication application;
+
+  // Create actor to be used with emitter
+  Actor actor = Actor::New();
+  application.GetScene().Add(actor);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+
+  EmitterGroup group;
+
+  auto emitter = CreateEmitter<TestSource, TestModifier>(&group);
+
+  emitter.SetEmissionRate(1000);
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(10000);
+
+  auto emissionRate = emitter.GetEmissionRate();
+  auto initialCount = emitter.GetInitialParticleCount();
+  auto activeCount  = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(emissionRate, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(initialCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeCount, 10000, TEST_LOCATION);
+
+  // Blending mode with screen
+  auto texture = CreateTexture();
+  group.renderer.SetTexture(texture);
+  group.renderer.SetBlendingMode(BlendingMode::DEFAULT);
+
+  // test status again (domain is optional);
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  // Set initial parameters of system
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(5000);
+
+  // Test getters
+  auto initialParticleCount = emitter.GetInitialParticleCount();
+  auto activeParticlesLimit = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(initialParticleCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeParticlesLimit, 5000, TEST_LOCATION);
+
+  // Attach emitter to actor
+  emitter.AttachTo(actor);
+
+  // Start emitter
+  emitter.Start();
+
+  auto status = emitter.GetStatus();
+  DALI_TEST_EQUALS(status, ParticleEmitter::Status::STARTED, TEST_LOCATION);
+
+  auto& sourceCallback = dynamic_cast<TestSource&>(emitter.GetSource().GetSourceCallback());
+
+  // Run simulation
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // First call into source callback should emit initial number of particles
+  auto emittedParticleCount = sourceCallback.mFuture.get();
+  DALI_TEST_EQUALS(emittedParticleCount, 1000, TEST_LOCATION);
+
+  // Run 3 more frames advancing by 1000ms which should
+  // emit particles based on emission rate
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemTestMT(void)
+{
+  TestApplication application;
+
+  // Create actor to be used with emitter
+  Actor actor = Actor::New();
+  application.GetScene().Add(actor);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+
+  EmitterGroup group;
+
+  auto emitter = CreateEmitter<TestSource, TestModifierMT>(&group);
+
+  emitter.SetEmissionRate(10000);
+  emitter.SetInitialParticleCount(10000);
+  emitter.SetActiveParticlesLimit(20000);
+  emitter.SetParticleCount(300000);
+
+  auto emissionRate = emitter.GetEmissionRate();
+  auto initialCount = emitter.GetInitialParticleCount();
+  auto activeCount  = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(emissionRate, 10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(initialCount, 10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeCount, 20000, TEST_LOCATION);
+
+  emitter.EnableParallelProcessing(true);
+
+  auto mtEnabled = emitter.IsParallelProcessingEnabled();
+  DALI_TEST_EQUALS(mtEnabled, true, TEST_LOCATION);
+
+  // Blending mode with screen
+  auto texture = CreateTexture();
+  group.renderer.SetTexture(texture);
+  group.renderer.SetBlendingMode(BlendingMode::DEFAULT);
+
+  // test status again (domain is optional);
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  // Attach emitter to actor
+  emitter.AttachTo(actor);
+
+  // Start emitter
+  emitter.Start();
+
+  auto status = emitter.GetStatus();
+  DALI_TEST_EQUALS(status, ParticleEmitter::Status::STARTED, TEST_LOCATION);
+
+  auto& sourceCallback = dynamic_cast<TestSource&>(emitter.GetSource().GetSourceCallback());
+
+  // Run simulation
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // First call into source callback should emit initial number of particles
+  auto emittedParticleCount = sourceCallback.mFuture.get();
+  DALI_TEST_EQUALS(emittedParticleCount, 10000, TEST_LOCATION);
+
+  // Run 3 more frames advancing by 1000ms which should
+  // emit particles based on emission rate
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemTestParticleSource(void)
+{
+  TestApplication application;
+
+  // Create actor to be used with emitter
+  Actor actor = Actor::New();
+  application.GetScene().Add(actor);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+
+  EmitterGroup group;
+
+  auto emitter = CreateEmitter<TestSource2, TestModifier>(&group);
+
+  emitter.SetEmissionRate(1000);
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(10000);
+
+  auto emissionRate = emitter.GetEmissionRate();
+  auto initialCount = emitter.GetInitialParticleCount();
+  auto activeCount  = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(emissionRate, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(initialCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeCount, 10000, TEST_LOCATION);
+
+  emitter.EnableParallelProcessing(true);
+
+  // Blending mode with screen
+  auto texture = CreateTexture();
+  group.renderer.SetTexture(texture);
+  group.renderer.SetBlendingMode(BlendingMode::DEFAULT);
+
+  // test status again (domain is optional);
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  // Set initial parameters of system
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(5000);
+
+  // Test getters
+  auto initialParticleCount = emitter.GetInitialParticleCount();
+  auto activeParticlesLimit = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(initialParticleCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeParticlesLimit, 5000, TEST_LOCATION);
+
+  // Attach emitter to actor
+  emitter.AttachTo(actor);
+
+  // Start emitter
+  emitter.Start();
+
+  auto status = emitter.GetStatus();
+  DALI_TEST_EQUALS(status, ParticleEmitter::Status::STARTED, TEST_LOCATION);
+
+  auto& sourceCallback = static_cast<TestSource2&>(emitter.GetSource().GetSourceCallback());
+
+  // Run simulation
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // First call into source callback should emit initial number of particles
+  auto emittedParticleCount = sourceCallback.mFuture.get();
+  DALI_TEST_EQUALS(emittedParticleCount, 1000, TEST_LOCATION);
+
+  // Run 3 more frames advancing by 1000ms which should
+  // emit particles based on emission rate
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // Stop the emitter
+  emitter.Stop();
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliParticleSystemReplaceEmitter(void)
+{
+  TestApplication application;
+
+  // Create actor to be used with emitter
+  Actor actor = Actor::New();
+  application.GetScene().Add(actor);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+
+  EmitterGroup group;
+
+  auto emitter = CreateEmitter<TestSource, TestModifier>(&group);
+
+  // Blending mode with screen
+  auto texture = CreateTexture();
+  group.renderer.SetTexture(texture);
+  group.renderer.SetBlendingMode(BlendingMode::DEFAULT);
+
+  // test status again (domain is optional);
+  auto ready = emitter.GetStatus();
+
+  // Emitter should return status incomplete
+  DALI_TEST_EQUALS(ready, ParticleEmitter::Status::READY, TEST_LOCATION);
+
+  // Set initial parameters of system
+  emitter.SetInitialParticleCount(1000);
+  emitter.SetActiveParticlesLimit(5000);
+
+  // Test getters
+  auto initialParticleCount = emitter.GetInitialParticleCount();
+  auto activeParticlesLimit = emitter.GetActiveParticlesLimit();
+
+  DALI_TEST_EQUALS(initialParticleCount, 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(activeParticlesLimit, 5000, TEST_LOCATION);
+
+  // Attach emitter to actor
+  emitter.AttachTo(actor);
+
+  // Start emitter
+  emitter.Start();
+
+  auto status = emitter.GetStatus();
+  DALI_TEST_EQUALS(status, ParticleEmitter::Status::STARTED, TEST_LOCATION);
+
+  auto& sourceCallback = dynamic_cast<TestSource&>(emitter.GetSource().GetSourceCallback());
+
+  // Run simulation
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // First call into source callback should emit initial number of particles
+  auto emittedParticleCount = sourceCallback.mFuture.get();
+  DALI_TEST_EQUALS(emittedParticleCount, 1000, TEST_LOCATION);
+
+  // Run 3 more frames advancing by 1000ms which should
+  // emit particles based on emission rate
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  AdvanceTimeByMs(1000);
+
+  sourceCallback.NewFrame();
+  application.SendNotification();
+  application.Render();
+
+  // replace emitter
+  auto                  oldEmitter = emitter.GetObjectPtr(); // store old emitter
+  [[maybe_unused]] auto i          = oldEmitter->ReferenceCount();
+  // Reset group
+  group = {};
+
+  emitter = CreateEmitter<TestSource, TestModifier>(&group);
+  DALI_TEST_EQUALS(bool(emitter.GetObjectPtr() != oldEmitter), true, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
index 159ea01..a46c93b 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +22,14 @@
 #include <dali-toolkit-test-suite-utils.h>
 #include "dali-toolkit-test-utils/toolkit-timer.h"
 
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
 #include <dali.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/devel-api/scripting/scripting.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/popup/popup.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -53,24 +53,24 @@ static void TestCallback(BaseHandle handle)
   gObjectCreatedCallBackCalled = true;
 }
 
-const int RENDER_FRAME_INTERVAL = 10;                          ///< Duration of each frame in ms.
-const int RENDER_ANIMATION_TEST_DURATION_MS = 2000;            ///< 2000ms to test animation.
-const int RENDER_ANIMATION_TEST_DURATION_FRAMES = RENDER_ANIMATION_TEST_DURATION_MS / RENDER_FRAME_INTERVAL; ///< equivalent frames.
+const int     RENDER_FRAME_INTERVAL                 = 10;                                                        ///< Duration of each frame in ms.
+const int     RENDER_ANIMATION_TEST_DURATION_MS     = 2000;                                                      ///< 2000ms to test animation.
+const int     RENDER_ANIMATION_TEST_DURATION_FRAMES = RENDER_ANIMATION_TEST_DURATION_MS / RENDER_FRAME_INTERVAL; ///< equivalent frames.
 const Vector3 DEFAULT_BUTTON_SIZE(100.0f, 50.0f, 0.0f);
 
 Dali::Integration::Point GetPointDown()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
 Dali::Integration::Point GetPointUp()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
@@ -81,32 +81,32 @@ Dali::Integration::Point GetPointUp()
  * @param[in] root The root actor to count from.
  * @return The number of descendants including root actor itself.
  */
-int DescendentCount( const Actor& root )
+int DescendentCount(const Actor& root)
 {
   unsigned int numChildren = root.GetChildCount();
 
   int count = 1;
 
-  for( unsigned int i = 0; i < numChildren; ++i )
+  for(unsigned int i = 0; i < numChildren; ++i)
   {
-    count += DescendentCount( root.GetChildAt( i ) );
+    count += DescendentCount(root.GetChildAt(i));
   }
 
   return count;
 }
 
-bool HasAncestor( Actor child, Actor ancestor )
+bool HasAncestor(Actor child, Actor ancestor)
 {
-  while( child && child != ancestor )
+  while(child && child != ancestor)
   {
     child = child.GetParent();
   }
 
-  return ( child == ancestor );
+  return (child == ancestor);
 }
 
 static Toolkit::Popup::DisplayState gPopupState = Toolkit::Popup::HIDDEN;
-static bool gTouchedOutside;
+static bool                         gTouchedOutside;
 
 // Signal callbacks
 
@@ -135,21 +135,21 @@ static void OnPopupHidden()
   gPopupState = Toolkit::Popup::HIDDEN;
 }
 
-void ConnectStateSignals( Toolkit::Popup popup )
+void ConnectStateSignals(Toolkit::Popup popup)
 {
-  popup.ShowingSignal().Connect( &OnPopupShowing );
-  popup.ShownSignal().Connect( &OnPopupShown );
-  popup.HidingSignal().Connect( &OnPopupHiding );
-  popup.HiddenSignal().Connect( &OnPopupHidden );
+  popup.ShowingSignal().Connect(&OnPopupShowing);
+  popup.ShownSignal().Connect(&OnPopupShown);
+  popup.HidingSignal().Connect(&OnPopupHiding);
+  popup.HiddenSignal().Connect(&OnPopupHidden);
 }
 
-void WaitAnimation( ToolkitTestApplication& application )
+void WaitAnimation(ToolkitTestApplication& application)
 {
   // Wait for a while (allow animation to complete), and then check state.
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++ )
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 }
 
@@ -175,30 +175,29 @@ struct PopupTestFunctor
 };
 
 // Generate a KeyEvent to send to Core.
-Integration::KeyEvent GenerateKey( const std::string& keyName,
-                                   const std::string& logicalKey,
-                                   const std::string& keyString,
-                                   int keyCode,
-                                   int keyModifier,
-                                   unsigned long timeStamp,
-                                   const Integration::KeyEvent::State& keyState,
-                                   const std::string& compose = "",
-                                   const std::string& deviceName = "",
-                                   const Device::Class::Type& deviceClass = Device::Class::NONE,
-                                   const Device::Subclass::Type& deviceSubclass = Device::Subclass::NONE
-                                   )
+Integration::KeyEvent GenerateKey(const std::string&                  keyName,
+                                  const std::string&                  logicalKey,
+                                  const std::string&                  keyString,
+                                  int                                 keyCode,
+                                  int                                 keyModifier,
+                                  unsigned long                       timeStamp,
+                                  const Integration::KeyEvent::State& keyState,
+                                  const std::string&                  compose        = "",
+                                  const std::string&                  deviceName     = "",
+                                  const Device::Class::Type&          deviceClass    = Device::Class::NONE,
+                                  const Device::Subclass::Type&       deviceSubclass = Device::Subclass::NONE)
 {
-  return Integration::KeyEvent( keyName,
-                                logicalKey,
-                                keyString,
-                                keyCode,
-                                keyModifier,
-                                timeStamp,
-                                keyState,
-                                compose,
-                                deviceName,
-                                deviceClass,
-                                deviceSubclass );
+  return Integration::KeyEvent(keyName,
+                               logicalKey,
+                               keyString,
+                               keyCode,
+                               keyModifier,
+                               timeStamp,
+                               keyState,
+                               compose,
+                               deviceName,
+                               deviceClass,
+                               deviceSubclass);
 }
 
 } // Anonymous namespace
@@ -206,422 +205,422 @@ Integration::KeyEvent GenerateKey( const std::string& keyName,
 /*
  * This test checks popup creation.
  */
-int UtcDaliPopupNewP( void )
+int UtcDaliPopupNewP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupNewP" );
+  tet_infoline(" UtcDaliPopupNewP");
 
   // Create the Popup actor.
   Popup popup;
 
-  DALI_TEST_CHECK( !popup );
+  DALI_TEST_CHECK(!popup);
 
   popup = Popup::New();
 
-  DALI_TEST_CHECK( popup );
+  DALI_TEST_CHECK(popup);
 
-  Popup popup2( popup );
+  Popup popup2(popup);
 
-  DALI_TEST_CHECK( popup2 == popup );
+  DALI_TEST_CHECK(popup2 == popup);
 
   // Additional check to ensure object is created by checking if it's registered.
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     Popup popup = Popup::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
 /*
  * This test checks popup destruction.
  */
-int UtcDaliPopupDestructorP( void )
+int UtcDaliPopupDestructorP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupDestructorP" );
+  tet_infoline(" UtcDaliPopupDestructorP");
 
   Popup* popup = new Popup();
   delete popup;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
 int UtcDaliPopupDownCastP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupDownCastP" );
+  tet_infoline(" UtcDaliPopupDownCastP");
 
   Handle handle = Popup::New();
 
-  Popup popup = Popup::DownCast( handle );
+  Popup popup = Popup::DownCast(handle);
 
-  DALI_TEST_CHECK( popup == handle );
+  DALI_TEST_CHECK(popup == handle);
   END_TEST;
 }
 
 int UtcDaliPopupSetPropertyP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupSetProperty" );
+  tet_infoline(" UtcDaliPopupSetProperty");
 
   Popup popup = Popup::New();
 
   //Test properties
   std::string testString = "Hello World";
 
-  TextLabel textActorIn = TextLabel::New( testString );
+  TextLabel     textActorIn = TextLabel::New(testString);
   Property::Map map;
-  Scripting::CreatePropertyMap( textActorIn, map );
-  popup.SetProperty( popup.GetPropertyIndex( "title" ), map );
-  TextLabel textActorOut = TextLabel::DownCast( popup.GetTitle() );
+  Scripting::CreatePropertyMap(textActorIn, map);
+  popup.SetProperty(popup.GetPropertyIndex("title"), map);
+  TextLabel   textActorOut = TextLabel::DownCast(popup.GetTitle());
   std::string resultText;
-  DALI_TEST_CHECK( textActorOut.GetProperty( Toolkit::TextLabel::Property::TEXT ).Get( resultText ) );
-  DALI_TEST_EQUALS( testString, resultText, TEST_LOCATION );
+  DALI_TEST_CHECK(textActorOut.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(resultText));
+  DALI_TEST_EQUALS(testString, resultText, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliPopupSetTitleP(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupSetTitleP" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupSetTitleP");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
   // Put in show state so it's layer is connected to popup (for ancestor check).
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
 
   TextLabel titleActor = TextLabel::New();
-  titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, "title" );
+  titleActor.SetProperty(Toolkit::TextLabel::Property::TEXT, "title");
 
-  DALI_TEST_CHECK( !popup.GetTitle() );
-  popup.SetTitle( titleActor );
-  TextLabel textActor = TextLabel::DownCast( popup.GetTitle() );
-  DALI_TEST_CHECK( textActor == titleActor );
+  DALI_TEST_CHECK(!popup.GetTitle());
+  popup.SetTitle(titleActor);
+  TextLabel textActor = TextLabel::DownCast(popup.GetTitle());
+  DALI_TEST_CHECK(textActor == titleActor);
 
   std::string resultText;
-  DALI_TEST_CHECK( textActor.GetProperty( Toolkit::TextLabel::Property::TEXT ).Get( resultText ) );
+  DALI_TEST_CHECK(textActor.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(resultText));
 
-  DALI_TEST_CHECK( ( popup.GetTitle() ) && ( resultText == "title" ) );
+  DALI_TEST_CHECK((popup.GetTitle()) && (resultText == "title"));
   // verify titleActor is actually inside popup, and not elsewhere on stage, or off even.
-  DALI_TEST_CHECK( HasAncestor( titleActor, popup ) );
+  DALI_TEST_CHECK(HasAncestor(titleActor, popup));
 
   TextLabel titleActor2 = TextLabel::New();
-  titleActor2.SetProperty( Toolkit::TextLabel::Property::TEXT, "anothertitle" );
-  popup.SetTitle( titleActor2 );
-  DALI_TEST_CHECK( popup.GetTitle() != titleActor );
-  DALI_TEST_CHECK( popup.GetTitle() == titleActor2 );
-  DALI_TEST_CHECK( TextLabel::DownCast( popup.GetTitle() ).GetProperty( Toolkit::TextLabel::Property::TEXT ).Get( resultText ) );
+  titleActor2.SetProperty(Toolkit::TextLabel::Property::TEXT, "anothertitle");
+  popup.SetTitle(titleActor2);
+  DALI_TEST_CHECK(popup.GetTitle() != titleActor);
+  DALI_TEST_CHECK(popup.GetTitle() == titleActor2);
+  DALI_TEST_CHECK(TextLabel::DownCast(popup.GetTitle()).GetProperty(Toolkit::TextLabel::Property::TEXT).Get(resultText));
 
-  DALI_TEST_CHECK( ( popup.GetTitle() ) && ( resultText == "anothertitle" ) );
+  DALI_TEST_CHECK((popup.GetTitle()) && (resultText == "anothertitle"));
 
   // verify titleActor is actually inside popup, and not elsewhere on stage, or off even.
-  DALI_TEST_CHECK( HasAncestor( titleActor2, popup ) );
+  DALI_TEST_CHECK(HasAncestor(titleActor2, popup));
   END_TEST;
 }
 
 int UtcDaliPopupSetTitleN(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupSetTitleN" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupSetTitleN");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
-  TextLabel titleActor = TextLabel::New( "text" );
-  popup.SetTitle( titleActor );
+  TextLabel titleActor = TextLabel::New("text");
+  popup.SetTitle(titleActor);
 
-  DALI_TEST_CHECK( popup.GetTitle() );
+  DALI_TEST_CHECK(popup.GetTitle());
 
   // Set a bad title value.
   // Confirm this has disabled the title.
   Actor badActor;
-  popup.SetTitle( badActor );
+  popup.SetTitle(badActor);
 
-  DALI_TEST_CHECK( !popup.GetTitle() );
+  DALI_TEST_CHECK(!popup.GetTitle());
 
   END_TEST;
 }
 
 int UtcDaliPopupSetContentP(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupSetContentP" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupSetContentP");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  application.GetScene().Add( popup );
-  popup.SetProperty( Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f );
+  application.GetScene().Add(popup);
+  popup.SetProperty(Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f);
 
   // Put in show state so it's layer is connected to popup (for ancestor check).
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
 
   PushButton button = PushButton::New();
-  DALI_TEST_CHECK( !HasAncestor( button, popup ) );
-  popup.SetFooter( button );
+  DALI_TEST_CHECK(!HasAncestor(button, popup));
+  popup.SetFooter(button);
   // Hide and then re-show popup to cause button to be rearranged and added to popup.
-  popup.SetDisplayState( Popup::HIDDEN );
-  popup.SetDisplayState( Popup::SHOWN );
-  DALI_TEST_CHECK( HasAncestor( button, popup ) );
+  popup.SetDisplayState(Popup::HIDDEN);
+  popup.SetDisplayState(Popup::SHOWN);
+  DALI_TEST_CHECK(HasAncestor(button, popup));
   END_TEST;
 }
 
 int UtcDaliPopupSetContentN(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupSetContentN" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupSetContentN");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
-  TextLabel content = TextLabel::New( "text" );
-  popup.SetContent( content );
+  TextLabel content = TextLabel::New("text");
+  popup.SetContent(content);
 
-  DALI_TEST_CHECK( popup.GetContent() );
+  DALI_TEST_CHECK(popup.GetContent());
 
   // Set a bad title value.
   Actor badActor;
-  popup.SetContent( badActor );
+  popup.SetContent(badActor);
 
-  DALI_TEST_CHECK( !popup.GetContent() );
+  DALI_TEST_CHECK(!popup.GetContent());
 
   END_TEST;
 }
 
 int UtcDaliPopupSetFooterP(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupSetFooterP");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  application.GetScene().Add( popup );
-  popup.SetProperty( Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f );
+  application.GetScene().Add(popup);
+  popup.SetProperty(Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f);
   // Put in show state so it's layer is connected to popup (for ancestor check).
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
 
   PushButton button = PushButton::New();
-  DALI_TEST_CHECK( !HasAncestor(button, popup) );
-  popup.SetFooter( button );
+  DALI_TEST_CHECK(!HasAncestor(button, popup));
+  popup.SetFooter(button);
   // Hide and then re-show popup to cause button to be rearranged and added to popup.
-  popup.SetDisplayState( Popup::HIDDEN );
-  popup.SetDisplayState( Popup::SHOWN );
-  DALI_TEST_CHECK( HasAncestor( button, popup ) );
+  popup.SetDisplayState(Popup::HIDDEN);
+  popup.SetDisplayState(Popup::SHOWN);
+  DALI_TEST_CHECK(HasAncestor(button, popup));
   END_TEST;
 }
 
 int UtcDaliPopupSetFooterN(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupSetFooterN");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
   PushButton button = PushButton::New();
-  popup.SetFooter( button );
+  popup.SetFooter(button);
 
-  DALI_TEST_CHECK( popup.GetFooter() );
+  DALI_TEST_CHECK(popup.GetFooter());
 
   // Set a bad title value.
   Actor badActor;
-  popup.SetFooter( badActor );
+  popup.SetFooter(badActor);
 
-  DALI_TEST_CHECK( !popup.GetFooter() );
+  DALI_TEST_CHECK(!popup.GetFooter());
 
   END_TEST;
 }
 
 int UtcDaliPopupSetControlFooterMultiple(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupSetControlFooterMultiple");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  application.GetScene().Add( popup );
-  popup.SetProperty( Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f );
+  application.GetScene().Add(popup);
+  popup.SetProperty(Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f);
   // Put in show state so it's layer is connected to popup (for ancestor check).
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
 
-  Actor container = Actor::New();
-  PushButton button1 = PushButton::New();
-  PushButton button2 = PushButton::New();
-  DALI_TEST_CHECK( !HasAncestor( button1, popup ) );
-  DALI_TEST_CHECK( !HasAncestor( button2, popup ) );
-  container.Add( button1 );
-  container.Add( button2 );
-  popup.SetFooter( container );
+  Actor      container = Actor::New();
+  PushButton button1   = PushButton::New();
+  PushButton button2   = PushButton::New();
+  DALI_TEST_CHECK(!HasAncestor(button1, popup));
+  DALI_TEST_CHECK(!HasAncestor(button2, popup));
+  container.Add(button1);
+  container.Add(button2);
+  popup.SetFooter(container);
 
   // Hide and then re-show popup to cause button to be rearranged and added to popup.
-  popup.SetDisplayState( Popup::HIDDEN );
-  popup.SetDisplayState( Popup::SHOWN );
-  DALI_TEST_CHECK( HasAncestor( button1, popup ) );
-  DALI_TEST_CHECK( HasAncestor( button2, popup ) );
+  popup.SetDisplayState(Popup::HIDDEN);
+  popup.SetDisplayState(Popup::SHOWN);
+  DALI_TEST_CHECK(HasAncestor(button1, popup));
+  DALI_TEST_CHECK(HasAncestor(button2, popup));
   END_TEST;
 }
 
 int UtcDaliPopupSetTitleAndFooter(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupSetTitleAndFooter" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupSetTitleAndFooter");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
   // Put in show state so it's layer is connected to popup (for ancestor check).
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
 
   // Add the title
   TextLabel titleActor = TextLabel::New();
-  titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, "title" );
+  titleActor.SetProperty(Toolkit::TextLabel::Property::TEXT, "title");
 
-  DALI_TEST_CHECK( !popup.GetTitle() );
-  popup.SetTitle( titleActor );
-  TextLabel textActor = TextLabel::DownCast( popup.GetTitle() );
-  DALI_TEST_CHECK( textActor == titleActor );
+  DALI_TEST_CHECK(!popup.GetTitle());
+  popup.SetTitle(titleActor);
+  TextLabel textActor = TextLabel::DownCast(popup.GetTitle());
+  DALI_TEST_CHECK(textActor == titleActor);
 
   std::string resultText;
-  DALI_TEST_CHECK( textActor.GetProperty( Toolkit::TextLabel::Property::TEXT ).Get( resultText ) );
-  DALI_TEST_CHECK( ( popup.GetTitle() ) && ( resultText == "title" ) );
+  DALI_TEST_CHECK(textActor.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(resultText));
+  DALI_TEST_CHECK((popup.GetTitle()) && (resultText == "title"));
   // verify titleActor is actually inside popup, and not elsewhere on stage, or off even.
-  DALI_TEST_CHECK( HasAncestor( titleActor, popup ) );
+  DALI_TEST_CHECK(HasAncestor(titleActor, popup));
 
   // Add the footer
   PushButton button = PushButton::New();
-  DALI_TEST_CHECK( !HasAncestor(button, popup) );
-  popup.SetFooter( button );
+  DALI_TEST_CHECK(!HasAncestor(button, popup));
+  popup.SetFooter(button);
   // Hide and then re-show popup to cause button to be rearranged and added to popup.
-  popup.SetDisplayState( Popup::HIDDEN );
-  popup.SetDisplayState( Popup::SHOWN );
-  DALI_TEST_CHECK( HasAncestor( button, popup ) );
+  popup.SetDisplayState(Popup::HIDDEN);
+  popup.SetDisplayState(Popup::SHOWN);
+  DALI_TEST_CHECK(HasAncestor(button, popup));
 
   END_TEST;
 }
 
 int UtcDaliPopupSetStateP(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupSetStateP");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
-  popup.SetProperty( Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f );
+  popup.SetProperty(Toolkit::Popup::Property::ANIMATION_DURATION, 0.0f);
 
-  DALI_TEST_EQUALS( popup.GetDisplayState(), Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(popup.GetDisplayState(), Popup::HIDDEN, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::SHOWN );
-  DALI_TEST_EQUALS( Popup::SHOWN, popup.GetDisplayState(), TEST_LOCATION );
+  popup.SetDisplayState(Popup::SHOWN);
+  DALI_TEST_EQUALS(Popup::SHOWN, popup.GetDisplayState(), TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
-  DALI_TEST_EQUALS( Popup::HIDDEN, popup.GetDisplayState(), TEST_LOCATION );
+  popup.SetDisplayState(Popup::HIDDEN);
+  DALI_TEST_EQUALS(Popup::HIDDEN, popup.GetDisplayState(), TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPopupSetStateN(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupSetStateN");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
-  popup.SetProperty( Toolkit::Popup::Property::ANIMATION_DURATION, 1.0f );
+  popup.SetProperty(Toolkit::Popup::Property::ANIMATION_DURATION, 1.0f);
 
-  DALI_TEST_EQUALS( popup.GetDisplayState(), Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(popup.GetDisplayState(), Popup::HIDDEN, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::SHOWN );
-  DALI_TEST_EQUALS( Popup::SHOWING, popup.GetDisplayState(), TEST_LOCATION );
+  popup.SetDisplayState(Popup::SHOWN);
+  DALI_TEST_EQUALS(Popup::SHOWING, popup.GetDisplayState(), TEST_LOCATION);
 
   // Test cancelling a show before it has finished.
-  popup.SetDisplayState( Popup::HIDDEN );
-  DALI_TEST_EQUALS( Popup::HIDING, popup.GetDisplayState(), TEST_LOCATION );
+  popup.SetDisplayState(Popup::HIDDEN);
+  DALI_TEST_EQUALS(Popup::HIDING, popup.GetDisplayState(), TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPopupDisplayStateSignal(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupDisplayStateSignal" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupDisplayStateSignal");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  ConnectStateSignals( popup );
+  ConnectStateSignals(popup);
 
-  popup.SetProperty( Toolkit::Popup::Property::ANIMATION_DURATION, 1.0f );
-  popup.SetDisplayState( Popup::SHOWN );
-  DALI_TEST_EQUALS( Popup::SHOWING, popup.GetDisplayState(), TEST_LOCATION );
-  DALI_TEST_EQUALS( gPopupState, Popup::SHOWING, TEST_LOCATION );
+  popup.SetProperty(Toolkit::Popup::Property::ANIMATION_DURATION, 1.0f);
+  popup.SetDisplayState(Popup::SHOWN);
+  DALI_TEST_EQUALS(Popup::SHOWING, popup.GetDisplayState(), TEST_LOCATION);
+  DALI_TEST_EQUALS(gPopupState, Popup::SHOWING, TEST_LOCATION);
 
   // Wait for a while (allow animation to complete), and then check state.
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
-  DALI_TEST_EQUALS( Popup::SHOWN, popup.GetDisplayState(), TEST_LOCATION );
-  DALI_TEST_EQUALS( gPopupState, Popup::SHOWN, TEST_LOCATION );
+  DALI_TEST_EQUALS(Popup::SHOWN, popup.GetDisplayState(), TEST_LOCATION);
+  DALI_TEST_EQUALS(gPopupState, Popup::SHOWN, TEST_LOCATION);
 
   // Hide slowly
-  popup.SetDisplayState( Popup::HIDDEN );
-  DALI_TEST_EQUALS( Popup::HIDING, popup.GetDisplayState(), TEST_LOCATION );
-  DALI_TEST_EQUALS( gPopupState, Popup::HIDING, TEST_LOCATION );
+  popup.SetDisplayState(Popup::HIDDEN);
+  DALI_TEST_EQUALS(Popup::HIDING, popup.GetDisplayState(), TEST_LOCATION);
+  DALI_TEST_EQUALS(gPopupState, Popup::HIDING, TEST_LOCATION);
 
   // Wait for a while (allow animation to complete), and then check state.
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
-  DALI_TEST_EQUALS( Popup::HIDDEN, popup.GetDisplayState(), TEST_LOCATION );
-  DALI_TEST_EQUALS( gPopupState, Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(Popup::HIDDEN, popup.GetDisplayState(), TEST_LOCATION);
+  DALI_TEST_EQUALS(gPopupState, Popup::HIDDEN, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliPopupShowHide(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupShowHide");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  ConnectStateSignals( popup );
+  ConnectStateSignals(popup);
 
-  Actor container = Actor::New();
-  PushButton button1 = PushButton::New();
-  PushButton button2 = PushButton::New();
-  button1.SetProperty( Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY() );
-  button2.SetProperty( Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY() );
-  container.Add( button1 );
-  container.Add( button2 );
-  popup.SetFooter( container );
+  Actor      container = Actor::New();
+  PushButton button1   = PushButton::New();
+  PushButton button2   = PushButton::New();
+  button1.SetProperty(Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY());
+  button2.SetProperty(Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY());
+  container.Add(button1);
+  container.Add(button2);
+  popup.SetFooter(container);
 
   // Show
   // Note: in most popup animation implementations show would result in
   // popup being onstage immediately following Show(). However we can't
   // assume for all. e.g. If one creates a animation with a delay.
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
 
   // Wait for a while (allow animation to complete), and then check state.
   for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
   // Hide
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
 
   // Wait for a while (allow animation to complete), and then check state.
   for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
@@ -630,60 +629,60 @@ int UtcDaliPopupShowHide(void)
     application.Render(RENDER_FRAME_INTERVAL);
   }
 
-  DALI_TEST_EQUALS( gPopupState, Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPopupState, Popup::HIDDEN, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPopupPropertyTailVisibility(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupShowHideTail");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  application.GetScene().Add( popup );
+  application.GetScene().Add(popup);
 
-  popup.SetProperty( Popup::Property::TAIL_VISIBILITY, false );
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetProperty(Popup::Property::TAIL_VISIBILITY, false);
+  popup.SetDisplayState(Popup::SHOWN);
 
-  int withoutTailCount = DescendentCount( popup );
+  int withoutTailCount = DescendentCount(popup);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
 
-  popup.SetProperty( Popup::Property::TAIL_POSITION, "BOTTOM_CENTER" );
-  popup.SetProperty( Popup::Property::TAIL_VISIBILITY, true );
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetProperty(Popup::Property::TAIL_POSITION, "BOTTOM_CENTER");
+  popup.SetProperty(Popup::Property::TAIL_VISIBILITY, true);
+  popup.SetDisplayState(Popup::SHOWN);
 
-  int withTailCount = DescendentCount( popup );
+  int withTailCount = DescendentCount(popup);
 
   // There should be more actors if the Tail has been added.
-  DALI_TEST_CHECK( withTailCount > withoutTailCount );
+  DALI_TEST_CHECK(withTailCount > withoutTailCount);
 
   // Hide again
-  popup.SetDisplayState( Popup::HIDDEN );
-  popup.SetProperty( Popup::Property::TAIL_VISIBILITY, false );
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::HIDDEN);
+  popup.SetProperty(Popup::Property::TAIL_VISIBILITY, false);
+  popup.SetDisplayState(Popup::SHOWN);
   int withoutTailCount2 = DescendentCount(popup);
 
-  DALI_TEST_CHECK( withTailCount > withoutTailCount2 );
+  DALI_TEST_CHECK(withTailCount > withoutTailCount2);
   END_TEST;
 }
 
 int UtcDaliPopupOnTouchedOutsideSignal(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliPopupOnTouchedOutside");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  popup.SetProperty( Actor::Property::ANCHOR_POINT, ParentOrigin::CENTER );
-  popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
-  popup.SetProperty( Actor::Property::SIZE, Vector2( 50.0f, 50.0f ) );
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
-  application.GetScene().Add( popup );
-  popup.OutsideTouchedSignal().Connect( &OnPopupTouchedOutside );
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  popup.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::CENTER);
+  popup.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  popup.SetProperty(Actor::Property::SIZE, Vector2(50.0f, 50.0f));
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
+  application.GetScene().Add(popup);
+  popup.OutsideTouchedSignal().Connect(&OnPopupTouchedOutside);
+  popup.SetDisplayState(Popup::SHOWN);
 
   application.SendNotification();
   application.Render();
@@ -692,91 +691,91 @@ int UtcDaliPopupOnTouchedOutsideSignal(void)
   Dali::Integration::TouchEvent event;
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDown() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDown());
+  application.ProcessEvent(event);
 
   application.SendNotification();
   application.Render();
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUp() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUp());
+  application.ProcessEvent(event);
 
   application.SendNotification();
   application.Render();
 
   // Confirm the signal is ignored if touch_transparent.
   gTouchedOutside = false;
-  popup.SetProperty( Popup::Property::TOUCH_TRANSPARENT, true );
+  popup.SetProperty(Popup::Property::TOUCH_TRANSPARENT, true);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDown() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDown());
+  application.ProcessEvent(event);
 
   application.SendNotification();
   application.Render();
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUp() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUp());
+  application.ProcessEvent(event);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( !gTouchedOutside );
+  DALI_TEST_CHECK(!gTouchedOutside);
 
   END_TEST;
 }
 
 int UtcDaliPopupPropertyAutoHide(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupPropertyAutoHide" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupPropertyAutoHide");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  ConnectStateSignals( popup );
+  ConnectStateSignals(popup);
 
-  Actor container = Actor::New();
-  PushButton button1 = PushButton::New();
-  button1.SetProperty( Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY() );
-  container.Add( button1 );
-  popup.SetFooter( container );
+  Actor      container = Actor::New();
+  PushButton button1   = PushButton::New();
+  button1.SetProperty(Actor::Property::SIZE, DEFAULT_BUTTON_SIZE.GetVectorXY());
+  container.Add(button1);
+  popup.SetFooter(container);
 
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
   float getAnimationDuration = 0.0f;
-  DALI_TEST_CHECK( popup.GetProperty( Popup::Property::ANIMATION_DURATION ).Get( getAnimationDuration ) );
-  DALI_TEST_EQUALS( getAnimationDuration, 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Popup::Property::ANIMATION_DURATION).Get(getAnimationDuration));
+  DALI_TEST_EQUALS(getAnimationDuration, 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
-  popup.SetProperty( Popup::Property::AUTO_HIDE_DELAY, 200 );
+  popup.SetProperty(Popup::Property::AUTO_HIDE_DELAY, 200);
   int getAutoHideDelay = 0;
-  DALI_TEST_CHECK( popup.GetProperty( Popup::Property::AUTO_HIDE_DELAY ).Get( getAutoHideDelay ) );
-  DALI_TEST_EQUALS( getAutoHideDelay, 200, TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Popup::Property::AUTO_HIDE_DELAY).Get(getAutoHideDelay));
+  DALI_TEST_EQUALS(getAutoHideDelay, 200, TEST_LOCATION);
 
-  application.GetScene().Add( popup );
+  application.GetScene().Add(popup);
 
-  DALI_TEST_EQUALS( gPopupState, Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPopupState, Popup::HIDDEN, TEST_LOCATION);
 
   // Show
   // Note: in most popup animation implementations show would result in
   // popup being onstage immediately following Show(). However we can't
   // assume for all. e.g. If one creates a animation with a delay.
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
 
-  DALI_TEST_EQUALS( gPopupState, Popup::SHOWN, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPopupState, Popup::SHOWN, TEST_LOCATION);
 
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++ )
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
   // Force the timer used by the popup to expire,
   // this will cause the popup to hide automatically.
-  Dali::Timer timer = Timer::New( 0 );
+  Dali::Timer timer = Timer::New(0);
   timer.MockEmitSignal();
 
-  DALI_TEST_EQUALS( gPopupState, Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPopupState, Popup::HIDDEN, TEST_LOCATION);
 
   END_TEST;
 }
@@ -786,64 +785,64 @@ int UtcDaliPopupPropertyAutoHide(void)
  */
 int UtcDaliPopupPropertyAnimationMode(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
-  tet_infoline( " UtcDaliPopupPropertyAnimationMode" );
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
+  tet_infoline(" UtcDaliPopupPropertyAnimationMode");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  ConnectStateSignals( popup );
-  popup.SetTitle( TextLabel::New( "Title" ) );
-  application.GetScene().Add( popup );
+  ConnectStateSignals(popup);
+  popup.SetTitle(TextLabel::New("Title"));
+  application.GetScene().Add(popup);
 
-  std::string animationModes[] = { "NONE", "ZOOM", "FADE", "CUSTOM" };
+  std::string animationModes[] = {"NONE", "ZOOM", "FADE", "CUSTOM"};
 
   // Try both default and zero animation duration, as zero has a special case for some animation types.
-  for( int j = 0; j <= 1; j++ )
+  for(int j = 0; j <= 1; j++)
   {
     // On the second loop, set duration to zero.
-    if( j == 1 )
+    if(j == 1)
     {
-      popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
+      popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
     }
 
     // Loop through 4 animation modes.
-    for( int i = 0; i < 4; i++ )
+    for(int i = 0; i < 4; i++)
     {
-      popup.SetProperty( Popup::Property::ANIMATION_MODE, animationModes[i] );
+      popup.SetProperty(Popup::Property::ANIMATION_MODE, animationModes[i]);
 
       std::string checkMode;
-      DALI_TEST_CHECK( popup.GetProperty( Popup::Property::ANIMATION_MODE ).Get( checkMode ) )
+      DALI_TEST_CHECK(popup.GetProperty(Popup::Property::ANIMATION_MODE).Get(checkMode))
 
-      DALI_TEST_EQUALS( checkMode, animationModes[i], TEST_LOCATION );
+      DALI_TEST_EQUALS(checkMode, animationModes[i], TEST_LOCATION);
 
-      popup.SetProperty( Toolkit::Popup::Property::DISPLAY_STATE, "SHOWN" );
+      popup.SetProperty(Toolkit::Popup::Property::DISPLAY_STATE, "SHOWN");
       std::string resultState;
 
       // Only wait for animation if it isn't instant.
-      if( j == 0 )
+      if(j == 0)
       {
-        DALI_TEST_EQUALS( gPopupState, Popup::SHOWING, TEST_LOCATION );
-        DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::DISPLAY_STATE ).Get( resultState ) );
-        DALI_TEST_EQUALS( resultState, "SHOWING", TEST_LOCATION );
-        WaitAnimation( application );
+        DALI_TEST_EQUALS(gPopupState, Popup::SHOWING, TEST_LOCATION);
+        DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::DISPLAY_STATE).Get(resultState));
+        DALI_TEST_EQUALS(resultState, "SHOWING", TEST_LOCATION);
+        WaitAnimation(application);
       }
 
-      DALI_TEST_EQUALS( gPopupState, Popup::SHOWN, TEST_LOCATION );
-      DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::DISPLAY_STATE ).Get( resultState ) );
-      DALI_TEST_EQUALS( resultState, "SHOWN", TEST_LOCATION );
-      popup.SetDisplayState( Popup::HIDDEN );
+      DALI_TEST_EQUALS(gPopupState, Popup::SHOWN, TEST_LOCATION);
+      DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::DISPLAY_STATE).Get(resultState));
+      DALI_TEST_EQUALS(resultState, "SHOWN", TEST_LOCATION);
+      popup.SetDisplayState(Popup::HIDDEN);
 
-      if( j == 0 )
+      if(j == 0)
       {
-        DALI_TEST_EQUALS( gPopupState, Popup::HIDING, TEST_LOCATION );
-        DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::DISPLAY_STATE ).Get( resultState ) );
-        DALI_TEST_EQUALS( resultState, "HIDING", TEST_LOCATION );
-        WaitAnimation( application );
+        DALI_TEST_EQUALS(gPopupState, Popup::HIDING, TEST_LOCATION);
+        DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::DISPLAY_STATE).Get(resultState));
+        DALI_TEST_EQUALS(resultState, "HIDING", TEST_LOCATION);
+        WaitAnimation(application);
       }
 
-      DALI_TEST_EQUALS( gPopupState, Popup::HIDDEN, TEST_LOCATION );
-      DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::DISPLAY_STATE ).Get( resultState ) );
-      DALI_TEST_EQUALS( resultState, "HIDDEN", TEST_LOCATION );
+      DALI_TEST_EQUALS(gPopupState, Popup::HIDDEN, TEST_LOCATION);
+      DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::DISPLAY_STATE).Get(resultState));
+      DALI_TEST_EQUALS(resultState, "HIDDEN", TEST_LOCATION);
     }
   }
 
@@ -853,29 +852,29 @@ int UtcDaliPopupPropertyAnimationMode(void)
 int UtcDaliPopupPropertyTitle(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyTitle" );
+  tet_infoline(" UtcDaliPopupPropertyTitle");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
   std::string testLabelText = "TitleTest";
-  TextLabel titleLabel = TextLabel::New();
-  titleLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, testLabelText );
-  Actor title = titleLabel;
+  TextLabel   titleLabel    = TextLabel::New();
+  titleLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, testLabelText);
+  Actor         title = titleLabel;
   Property::Map map;
-  Scripting::CreatePropertyMap( title, map );
-  popup.SetProperty( Toolkit::Popup::Property::TITLE, map );
+  Scripting::CreatePropertyMap(title, map);
+  popup.SetProperty(Toolkit::Popup::Property::TITLE, map);
 
   Property::Map resultMap;
-  DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::TITLE ).Get( resultMap ) );
+  DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::TITLE).Get(resultMap));
 
-  Property::Value* resultProperty = resultMap.Find( "text" );
-  DALI_TEST_CHECK( resultProperty );
+  Property::Value* resultProperty = resultMap.Find("text");
+  DALI_TEST_CHECK(resultProperty);
 
   std::string resultText;
-  DALI_TEST_CHECK( resultProperty->Get( resultText ) );
+  DALI_TEST_CHECK(resultProperty->Get(resultText));
 
-  DALI_TEST_EQUALS( resultText, testLabelText, TEST_LOCATION );
+  DALI_TEST_EQUALS(resultText, testLabelText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -883,29 +882,29 @@ int UtcDaliPopupPropertyTitle(void)
 int UtcDaliPopupPropertyContent(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyContent" );
+  tet_infoline(" UtcDaliPopupPropertyContent");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
   std::string testLabelText = "ContentTest";
-  TextLabel contentLabel = TextLabel::New();
-  contentLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, testLabelText );
-  Actor content = contentLabel;
+  TextLabel   contentLabel  = TextLabel::New();
+  contentLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, testLabelText);
+  Actor         content = contentLabel;
   Property::Map map;
-  Scripting::CreatePropertyMap( content, map );
-  popup.SetProperty( Toolkit::Popup::Property::CONTENT, map );
+  Scripting::CreatePropertyMap(content, map);
+  popup.SetProperty(Toolkit::Popup::Property::CONTENT, map);
 
   Property::Map resultMap;
-  DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::CONTENT ).Get( resultMap ) );
+  DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::CONTENT).Get(resultMap));
 
-  Property::Value* resultProperty = resultMap.Find( "text" );
-  DALI_TEST_CHECK( resultProperty );
+  Property::Value* resultProperty = resultMap.Find("text");
+  DALI_TEST_CHECK(resultProperty);
 
   std::string resultText;
-  DALI_TEST_CHECK( resultProperty->Get( resultText ) );
+  DALI_TEST_CHECK(resultProperty->Get(resultText));
 
-  DALI_TEST_EQUALS( resultText, testLabelText, TEST_LOCATION );
+  DALI_TEST_EQUALS(resultText, testLabelText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -913,29 +912,29 @@ int UtcDaliPopupPropertyContent(void)
 int UtcDaliPopupPropertyFooter(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyFooter" );
+  tet_infoline(" UtcDaliPopupPropertyFooter");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
   std::string testLabelText = "FooterTest";
-  TextLabel footerLabel = TextLabel::New();
-  footerLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, testLabelText );
-  Actor footer = footerLabel;
+  TextLabel   footerLabel   = TextLabel::New();
+  footerLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, testLabelText);
+  Actor         footer = footerLabel;
   Property::Map map;
-  Scripting::CreatePropertyMap( footer, map );
-  popup.SetProperty( Toolkit::Popup::Property::FOOTER, map );
+  Scripting::CreatePropertyMap(footer, map);
+  popup.SetProperty(Toolkit::Popup::Property::FOOTER, map);
 
   Property::Map resultMap;
-  DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::FOOTER ).Get( resultMap ) );
+  DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::FOOTER).Get(resultMap));
 
-  Property::Value* resultProperty = resultMap.Find( "text" );
-  DALI_TEST_CHECK( resultProperty );
+  Property::Value* resultProperty = resultMap.Find("text");
+  DALI_TEST_CHECK(resultProperty);
 
   std::string resultText;
-  DALI_TEST_CHECK( resultProperty->Get( resultText ) );
+  DALI_TEST_CHECK(resultProperty->Get(resultText));
 
-  DALI_TEST_EQUALS( resultText, testLabelText, TEST_LOCATION );
+  DALI_TEST_EQUALS(resultText, testLabelText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -943,52 +942,52 @@ int UtcDaliPopupPropertyFooter(void)
 int UtcDaliPopupPropertyContextualMode(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyContextualMode" );
+  tet_infoline(" UtcDaliPopupPropertyContextualMode");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
   std::string testLabelText = "ContentTest";
 
   TextLabel contentLabel = TextLabel::New();
 
-  popup.SetContent( contentLabel );
+  popup.SetContent(contentLabel);
 
   // Placement actor to parent the popup from so the popup's contextual position can be relative to it.
   Actor placement = Actor::New();
-  placement.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  placement.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  placement.SetProperty( Actor::Property::SIZE, Vector2( 1.0f, 1.0f ) );
-  placement.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  application.GetScene().Add( placement );
+  placement.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  placement.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  placement.SetProperty(Actor::Property::SIZE, Vector2(1.0f, 1.0f));
+  placement.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(placement);
 
-  placement.Add( popup );
+  placement.Add(popup);
 
   // Test all contextual modes.
-  const char* mode[5] = { "NON_CONTEXTUAL", "ABOVE", "RIGHT", "BELOW", "LEFT" };
-  Vector2 offsetValues[5];
-  offsetValues[0] = Vector2( 0.375f, 0.0f );
-  offsetValues[1] = Vector2( -0.125f, -10.5f );
-  offsetValues[2] = Vector2( 10.875f, -0.5f );
-  offsetValues[3] = Vector2( -0.125f, 10.5f );
-  offsetValues[4] = Vector2( -10.875f, -0.5f );
-
-  for( int i = 0; i < 5; ++i )
+  const char* mode[5] = {"NON_CONTEXTUAL", "ABOVE", "RIGHT", "BELOW", "LEFT"};
+  Vector2     offsetValues[5];
+  offsetValues[0] = Vector2(0.375f, 0.0f);
+  offsetValues[1] = Vector2(-0.125f, -10.5f);
+  offsetValues[2] = Vector2(10.875f, -0.5f);
+  offsetValues[3] = Vector2(-0.125f, 10.5f);
+  offsetValues[4] = Vector2(-10.875f, -0.5f);
+
+  for(int i = 0; i < 5; ++i)
   {
-    popup.SetProperty( Toolkit::Popup::Property::CONTEXTUAL_MODE, mode[i] );
+    popup.SetProperty(Toolkit::Popup::Property::CONTEXTUAL_MODE, mode[i]);
 
     std::string propertyResult;
-    DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::CONTEXTUAL_MODE ).Get( propertyResult ) );
-    DALI_TEST_EQUALS( propertyResult, std::string( mode[i] ), TEST_LOCATION );
+    DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::CONTEXTUAL_MODE).Get(propertyResult));
+    DALI_TEST_EQUALS(propertyResult, std::string(mode[i]), TEST_LOCATION);
 
-    popup.SetDisplayState( Popup::SHOWN );
+    popup.SetDisplayState(Popup::SHOWN);
     application.SendNotification();
     application.Render();
 
     // Check the position of the label within the popup.
-    DALI_TEST_EQUALS( contentLabel.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).GetVectorXY(), offsetValues[i], TEST_LOCATION );
+    DALI_TEST_EQUALS(contentLabel.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).GetVectorXY(), offsetValues[i], TEST_LOCATION);
 
-    popup.SetDisplayState( Popup::HIDDEN );
+    popup.SetDisplayState(Popup::HIDDEN);
     application.SendNotification();
     application.Render();
   }
@@ -999,59 +998,59 @@ int UtcDaliPopupPropertyContextualMode(void)
 int UtcDaliPopupPropertyBacking(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyBacking" );
+  tet_infoline(" UtcDaliPopupPropertyBacking");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
-  application.GetScene().Add( popup );
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
+  application.GetScene().Add(popup);
 
-  Actor backing = popup.FindChildByName( "popupBacking" );
-  DALI_TEST_CHECK( backing );
+  Actor backing = popup.FindChildByName("popupBacking");
+  DALI_TEST_CHECK(backing);
 
-  DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(backing.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   // Check enabled property.
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.5f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(backing.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.5f, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(backing.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
-  popup.SetProperty( Popup::Property::BACKING_ENABLED, false );
+  popup.SetProperty(Popup::Property::BACKING_ENABLED, false);
   bool propertyResult;
-  DALI_TEST_CHECK( popup.GetProperty( Popup::Property::BACKING_ENABLED ).Get( propertyResult ) );
-  DALI_TEST_EQUALS( propertyResult, false, TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Popup::Property::BACKING_ENABLED).Get(propertyResult));
+  DALI_TEST_EQUALS(propertyResult, false, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(backing.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(backing.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   // Check color property.
-  popup.SetProperty( Popup::Property::BACKING_ENABLED, true );
-  popup.SetProperty( Popup::Property::BACKING_COLOR, Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+  popup.SetProperty(Popup::Property::BACKING_ENABLED, true);
+  popup.SetProperty(Popup::Property::BACKING_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
 
   Vector4 resultColor;
-  popup.GetProperty( Popup::Property::BACKING_COLOR ).Get( resultColor );
-  DALI_TEST_EQUALS( resultColor, Vector4( 1.0f, 0.0f, 0.0f, 1.0f ), Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  popup.GetProperty(Popup::Property::BACKING_COLOR).Get(resultColor);
+  DALI_TEST_EQUALS(resultColor, Vector4(1.0f, 0.0f, 0.0f, 1.0f), Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1059,17 +1058,17 @@ int UtcDaliPopupPropertyBacking(void)
 int UtcDaliPopupPropertyBackgroundImage(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyBackgroundImage" );
+  tet_infoline(" UtcDaliPopupPropertyBackgroundImage");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  application.GetScene().Add( popup );
+  application.GetScene().Add(popup);
 
   // Check setting an image
-  popup.SetProperty( Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE, "invalid-image.png" );
+  popup.SetProperty(Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE, "invalid-image.png");
   std::string resultString;
-  popup.GetProperty( Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE ).Get( resultString );
-  DALI_TEST_EQUALS( resultString, "invalid-image.png", TEST_LOCATION );
+  popup.GetProperty(Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE).Get(resultString);
+  DALI_TEST_EQUALS(resultString, "invalid-image.png", TEST_LOCATION);
 
   END_TEST;
 }
@@ -1077,82 +1076,82 @@ int UtcDaliPopupPropertyBackgroundImage(void)
 int UtcDaliPopupPropertyCustomAnimation(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyCustomAnimation" );
+  tet_infoline(" UtcDaliPopupPropertyCustomAnimation");
 
   // Create the Popup actor
-  Popup popup = Popup::New();
-  TextLabel content = TextLabel::New( "text" );
-  popup.SetContent( content );
+  Popup     popup   = Popup::New();
+  TextLabel content = TextLabel::New("text");
+  popup.SetContent(content);
 
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 1.0f );
-  popup.SetProperty( Popup::Property::ANIMATION_MODE, "CUSTOM" );
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 1.0f);
+  popup.SetProperty(Popup::Property::ANIMATION_MODE, "CUSTOM");
 
-  Actor popupContainer = popup.FindChildByName( "popupContainer" );
-  DALI_TEST_CHECK( popupContainer );
+  Actor popupContainer = popup.FindChildByName("popupContainer");
+  DALI_TEST_CHECK(popupContainer);
 
-  Vector3 entryAnimationDestination( 300.0f, 200.0f, 0.0f );
-  Vector3 exitAnimationDestination( -300.0f, -200.0f, 0.0f );
+  Vector3 entryAnimationDestination(300.0f, 200.0f, 0.0f);
+  Vector3 exitAnimationDestination(-300.0f, -200.0f, 0.0f);
 
   Property::Map animationMapEntry;
-  animationMapEntry.Insert( "actor", "customAnimationPopup" );
-  animationMapEntry.Insert( "property", "position" );
-  animationMapEntry.Insert( "value", entryAnimationDestination );
-  animationMapEntry.Insert( "alphaFunction",  "EASE_OUT" );
+  animationMapEntry.Insert("actor", "customAnimationPopup");
+  animationMapEntry.Insert("property", "position");
+  animationMapEntry.Insert("value", entryAnimationDestination);
+  animationMapEntry.Insert("alphaFunction", "EASE_OUT");
 
   Property::Array timePeriodMapEntry;
-  timePeriodMapEntry.PushBack( 0.0f );
-  timePeriodMapEntry.PushBack( 1.0f );
+  timePeriodMapEntry.PushBack(0.0f);
+  timePeriodMapEntry.PushBack(1.0f);
 
-  animationMapEntry.Insert( "timePeriod",  timePeriodMapEntry );
+  animationMapEntry.Insert("timePeriod", timePeriodMapEntry);
 
   Property::Map animationMapExit;
-  animationMapExit.Insert( "actor", "customAnimationPopup" );
-  animationMapExit.Insert( "property", "position" );
-  animationMapExit.Insert( "value", exitAnimationDestination );
-  animationMapExit.Insert( "alphaFunction",  "EASE_IN" );
+  animationMapExit.Insert("actor", "customAnimationPopup");
+  animationMapExit.Insert("property", "position");
+  animationMapExit.Insert("value", exitAnimationDestination);
+  animationMapExit.Insert("alphaFunction", "EASE_IN");
 
   Property::Array timePeriodMapExit;
-  timePeriodMapExit.PushBack( 0.0f );
-  timePeriodMapExit.PushBack( 1.0f );
+  timePeriodMapExit.PushBack(0.0f);
+  timePeriodMapExit.PushBack(1.0f);
 
-  animationMapExit.Insert( "timePeriod",  timePeriodMapExit );
+  animationMapExit.Insert("timePeriod", timePeriodMapExit);
 
-  popup.SetProperty( Toolkit::Popup::Property::ENTRY_ANIMATION, animationMapEntry );
-  popup.SetProperty( Toolkit::Popup::Property::EXIT_ANIMATION, animationMapExit );
+  popup.SetProperty(Toolkit::Popup::Property::ENTRY_ANIMATION, animationMapEntry);
+  popup.SetProperty(Toolkit::Popup::Property::EXIT_ANIMATION, animationMapExit);
 
   Property::Map resultMap;
-  DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::ENTRY_ANIMATION ).Get( resultMap ) );
-  DALI_TEST_EQUALS( resultMap.Count(), 0u, TEST_LOCATION );
-  DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::EXIT_ANIMATION ).Get( resultMap ) );
-  DALI_TEST_EQUALS( resultMap.Count(), 0u, TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::ENTRY_ANIMATION).Get(resultMap));
+  DALI_TEST_EQUALS(resultMap.Count(), 0u, TEST_LOCATION);
+  DALI_TEST_CHECK(popup.GetProperty(Toolkit::Popup::Property::EXIT_ANIMATION).Get(resultMap));
+  DALI_TEST_EQUALS(resultMap.Count(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( popup );
-  popup.SetDisplayState( Popup::SHOWN );
+  application.GetScene().Add(popup);
+  popup.SetDisplayState(Popup::SHOWN);
 
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++ )
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
   // Test the popup has animated to it's entry-transition destination.
-  DALI_TEST_EQUALS( popupContainer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ), entryAnimationDestination, 0.1f, TEST_LOCATION );
+  DALI_TEST_EQUALS(popupContainer.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION), entryAnimationDestination, 0.1f, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
 
-  for( int j = 0; j < RENDER_ANIMATION_TEST_DURATION_FRAMES; j++ )
+  for(int j = 0; j < RENDER_ANIMATION_TEST_DURATION_FRAMES; j++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
-  DALI_TEST_EQUALS( popupContainer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ), exitAnimationDestination, 0.1f, TEST_LOCATION );
+  DALI_TEST_EQUALS(popupContainer.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION), exitAnimationDestination, 0.1f, TEST_LOCATION);
 
   END_TEST;
 }
 
 static bool gPushButtonClicked;
-static bool PushButtonClicked( Button button )
+static bool PushButtonClicked(Button button)
 {
   gPushButtonClicked = true;
   return true;
@@ -1161,32 +1160,32 @@ static bool PushButtonClicked( Button button )
 int UtcDaliPopupPropertyTouchTransparent(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyTouchTransparent" );
+  tet_infoline(" UtcDaliPopupPropertyTouchTransparent");
 
   // Create the Popup actor
-  Popup popup = Popup::New();
-  TextLabel content = TextLabel::New( "text" );
-  popup.SetContent( content );
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
-  popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  popup.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
+  Popup     popup   = Popup::New();
+  TextLabel content = TextLabel::New("text");
+  popup.SetContent(content);
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
+  popup.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  popup.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  popup.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  popup.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
 
   // Create a button (to go underneath the popup).
   PushButton button = Toolkit::PushButton::New();
-  button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  button.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  button.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  button.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
 
-  button.ClickedSignal().Connect( &PushButtonClicked );
+  button.ClickedSignal().Connect(&PushButtonClicked);
 
-  application.GetScene().Add( button );
+  application.GetScene().Add(button);
 
-  button.Add( popup );
+  button.Add(popup);
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
 
@@ -1195,45 +1194,45 @@ int UtcDaliPopupPropertyTouchTransparent(void)
 
   // Perform a click, the popup should block the click from hitting the button.
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDown() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDown());
+  application.ProcessEvent(event);
   application.SendNotification();
   application.Render();
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUp() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUp());
+  application.ProcessEvent(event);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( !gPushButtonClicked );
+  DALI_TEST_CHECK(!gPushButtonClicked);
 
   // Perform a wheel event
-  Dali::Integration::WheelEvent wheelEvent( Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2( 10.0f, 10.0f ), 1, 1000u );
-  application.ProcessEvent( wheelEvent );
+  Dali::Integration::WheelEvent wheelEvent(Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2(10.0f, 10.0f), 1, 1000u);
+  application.ProcessEvent(wheelEvent);
   application.SendNotification();
   application.Render();
 
   // Enable touch transparency.
-  popup.SetProperty( Popup::Property::TOUCH_TRANSPARENT, true );
+  popup.SetProperty(Popup::Property::TOUCH_TRANSPARENT, true);
   bool propertyResult;
-  DALI_TEST_CHECK( popup.GetProperty( Popup::Property::TOUCH_TRANSPARENT ).Get( propertyResult ) );
-  DALI_TEST_EQUALS( propertyResult, true, TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Popup::Property::TOUCH_TRANSPARENT).Get(propertyResult));
+  DALI_TEST_EQUALS(propertyResult, true, TEST_LOCATION);
 
   // Perform a click, the popup should allow the click to travel through to the button.
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDown() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDown());
+  application.ProcessEvent(event);
   application.SendNotification();
   application.Render();
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUp() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUp());
+  application.ProcessEvent(event);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( gPushButtonClicked );
+  DALI_TEST_CHECK(gPushButtonClicked);
 
   END_TEST;
 }
@@ -1241,105 +1240,105 @@ int UtcDaliPopupPropertyTouchTransparent(void)
 int UtcDaliPopupPropertyTail(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyTail" );
+  tet_infoline(" UtcDaliPopupPropertyTail");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  popup.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  TextLabel content = TextLabel::New( "text" );
-  popup.SetContent( content );
+  popup.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  popup.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  popup.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  popup.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  TextLabel content = TextLabel::New("text");
+  popup.SetContent(content);
 
   std::string imageFilename = "invalid-image.jpg";
-  popup.SetProperty( Popup::Property::TAIL_DOWN_IMAGE, imageFilename );
-  popup.SetProperty( Popup::Property::TAIL_UP_IMAGE, imageFilename );
-  popup.SetProperty( Popup::Property::TAIL_RIGHT_IMAGE, imageFilename );
-  popup.SetProperty( Popup::Property::TAIL_LEFT_IMAGE, imageFilename );
+  popup.SetProperty(Popup::Property::TAIL_DOWN_IMAGE, imageFilename);
+  popup.SetProperty(Popup::Property::TAIL_UP_IMAGE, imageFilename);
+  popup.SetProperty(Popup::Property::TAIL_RIGHT_IMAGE, imageFilename);
+  popup.SetProperty(Popup::Property::TAIL_LEFT_IMAGE, imageFilename);
 
   std::string resultString;
-  popup.GetProperty( Toolkit::Popup::Property::TAIL_DOWN_IMAGE ).Get( resultString );
-  DALI_TEST_EQUALS( resultString, imageFilename, TEST_LOCATION );
-  popup.GetProperty( Toolkit::Popup::Property::TAIL_UP_IMAGE ).Get( resultString );
-  DALI_TEST_EQUALS( resultString, imageFilename, TEST_LOCATION );
-  popup.GetProperty( Toolkit::Popup::Property::TAIL_RIGHT_IMAGE ).Get( resultString );
-  DALI_TEST_EQUALS( resultString, imageFilename, TEST_LOCATION );
-  popup.GetProperty( Toolkit::Popup::Property::TAIL_LEFT_IMAGE ).Get( resultString );
-  DALI_TEST_EQUALS( resultString, imageFilename, TEST_LOCATION );
-
-  popup.SetProperty( Popup::Property::TAIL_VISIBILITY, true );
+  popup.GetProperty(Toolkit::Popup::Property::TAIL_DOWN_IMAGE).Get(resultString);
+  DALI_TEST_EQUALS(resultString, imageFilename, TEST_LOCATION);
+  popup.GetProperty(Toolkit::Popup::Property::TAIL_UP_IMAGE).Get(resultString);
+  DALI_TEST_EQUALS(resultString, imageFilename, TEST_LOCATION);
+  popup.GetProperty(Toolkit::Popup::Property::TAIL_RIGHT_IMAGE).Get(resultString);
+  DALI_TEST_EQUALS(resultString, imageFilename, TEST_LOCATION);
+  popup.GetProperty(Toolkit::Popup::Property::TAIL_LEFT_IMAGE).Get(resultString);
+  DALI_TEST_EQUALS(resultString, imageFilename, TEST_LOCATION);
+
+  popup.SetProperty(Popup::Property::TAIL_VISIBILITY, true);
   bool boolResult;
-  DALI_TEST_CHECK( popup.GetProperty( Popup::Property::TAIL_VISIBILITY ).Get( boolResult ) );
-  DALI_TEST_EQUALS( boolResult, true, TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Popup::Property::TAIL_VISIBILITY).Get(boolResult));
+  DALI_TEST_EQUALS(boolResult, true, TEST_LOCATION);
 
-  Actor tailActor;
-  Vector3 tailPosition( ParentOrigin::TOP_CENTER );
+  Actor   tailActor;
+  Vector3 tailPosition(ParentOrigin::TOP_CENTER);
 
-  popup.SetProperty( Popup::Property::TAIL_POSITION, tailPosition );
+  popup.SetProperty(Popup::Property::TAIL_POSITION, tailPosition);
   Vector3 vectorResult;
-  DALI_TEST_CHECK( popup.GetProperty( Popup::Property::TAIL_POSITION ).Get( vectorResult ) );
-  DALI_TEST_EQUALS( vectorResult, tailPosition, TEST_LOCATION );
+  DALI_TEST_CHECK(popup.GetProperty(Popup::Property::TAIL_POSITION).Get(vectorResult));
+  DALI_TEST_EQUALS(vectorResult, tailPosition, TEST_LOCATION);
 
-  application.GetScene().Add( popup );
+  application.GetScene().Add(popup);
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tailImage" );
-  DALI_TEST_CHECK( tailActor );
+  tailActor = popup.FindChildByName("tailImage");
+  DALI_TEST_CHECK(tailActor);
 
-  float baseValX = tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x;
+  float baseValX = tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).x;
 
-  DALI_TEST_GREATER( baseValX, tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y, TEST_LOCATION );
+  DALI_TEST_GREATER(baseValX, tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
   application.SendNotification();
   application.Render();
 
   tailPosition = ParentOrigin::CENTER_LEFT;
-  popup.SetProperty( Popup::Property::TAIL_POSITION, tailPosition );
+  popup.SetProperty(Popup::Property::TAIL_POSITION, tailPosition);
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tailImage" );
-  DALI_TEST_CHECK( tailActor );
+  tailActor = popup.FindChildByName("tailImage");
+  DALI_TEST_CHECK(tailActor);
 
-  float baseValY = tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y;
-  DALI_TEST_GREATER( baseValX, tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x, TEST_LOCATION );
+  float baseValY = tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y;
+  DALI_TEST_GREATER(baseValX, tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).x, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
   application.SendNotification();
   application.Render();
 
   tailPosition = ParentOrigin::BOTTOM_CENTER;
-  popup.SetProperty( Popup::Property::TAIL_POSITION, tailPosition );
+  popup.SetProperty(Popup::Property::TAIL_POSITION, tailPosition);
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tailImage" );
-  DALI_TEST_CHECK( tailActor );
-  DALI_TEST_EQUALS( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x, baseValX, TEST_LOCATION );
-  DALI_TEST_GREATER( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y, baseValY, TEST_LOCATION );
+  tailActor = popup.FindChildByName("tailImage");
+  DALI_TEST_CHECK(tailActor);
+  DALI_TEST_EQUALS(tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).x, baseValX, TEST_LOCATION);
+  DALI_TEST_GREATER(tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y, baseValY, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
   application.SendNotification();
   application.Render();
 
   tailPosition = ParentOrigin::CENTER_RIGHT;
-  popup.SetProperty( Popup::Property::TAIL_POSITION, tailPosition );
+  popup.SetProperty(Popup::Property::TAIL_POSITION, tailPosition);
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tailImage" );
-  DALI_TEST_CHECK( tailActor );
-  DALI_TEST_GREATER( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x, baseValX, TEST_LOCATION );
-  DALI_TEST_EQUALS( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y, baseValY, TEST_LOCATION );
+  tailActor = popup.FindChildByName("tailImage");
+  DALI_TEST_CHECK(tailActor);
+  DALI_TEST_GREATER(tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).x, baseValX, TEST_LOCATION);
+  DALI_TEST_EQUALS(tailActor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y, baseValY, TEST_LOCATION);
 
-  popup.SetDisplayState( Popup::HIDDEN );
+  popup.SetDisplayState(Popup::HIDDEN);
   application.SendNotification();
   application.Render();
 
@@ -1349,49 +1348,49 @@ int UtcDaliPopupPropertyTail(void)
 int UtcDaliPopupTypeToast(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupTypeToast" );
+  tet_infoline(" UtcDaliPopupTypeToast");
 
-  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "PopupToast" );
-  DALI_TEST_CHECK( typeInfo )
+  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo("PopupToast");
+  DALI_TEST_CHECK(typeInfo)
 
   BaseHandle baseHandle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( baseHandle )
+  DALI_TEST_CHECK(baseHandle)
 
-  Toolkit::Popup popup = Toolkit::Popup::DownCast( baseHandle );
-  gPopupState = Toolkit::Popup::HIDDEN;
-  ConnectStateSignals( popup );
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 1.0f );
+  Toolkit::Popup popup = Toolkit::Popup::DownCast(baseHandle);
+  gPopupState          = Toolkit::Popup::HIDDEN;
+  ConnectStateSignals(popup);
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 1.0f);
 
-  popup.SetTitle( Toolkit::TextLabel::New( "This is a Toast Popup.\nIt will auto-hide itself" ) );
-  application.GetScene().Add( popup );
-  popup.SetDisplayState( Toolkit::Popup::SHOWN );
+  popup.SetTitle(Toolkit::TextLabel::New("This is a Toast Popup.\nIt will auto-hide itself"));
+  application.GetScene().Add(popup);
+  popup.SetDisplayState(Toolkit::Popup::SHOWN);
 
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++ )
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
   // Check the toast popup is shown.
-  DALI_TEST_EQUALS( gPopupState, Popup::SHOWN, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPopupState, Popup::SHOWN, TEST_LOCATION);
 
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++ )
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
   // Check the toast popup hides.
-  Dali::Timer timer = Timer::New( 0 );
+  Dali::Timer timer = Timer::New(0);
   timer.MockEmitSignal();
 
-  for( int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++ )
+  for(int i = 0; i < RENDER_ANIMATION_TEST_DURATION_FRAMES; i++)
   {
     application.SendNotification();
-    application.Render( RENDER_FRAME_INTERVAL );
+    application.Render(RENDER_FRAME_INTERVAL);
   }
 
-  DALI_TEST_EQUALS( gPopupState, Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPopupState, Popup::HIDDEN, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1399,27 +1398,27 @@ int UtcDaliPopupTypeToast(void)
 int UtcDaliPopupTypeRegistryCreation(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupTypeRegistryCreation" );
+  tet_infoline(" UtcDaliPopupTypeRegistryCreation");
 
-  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "Popup" );
-  DALI_TEST_CHECK( typeInfo )
+  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo("Popup");
+  DALI_TEST_CHECK(typeInfo)
 
   BaseHandle baseHandle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( baseHandle )
+  DALI_TEST_CHECK(baseHandle)
 
-  Toolkit::Popup popup = Toolkit::Popup::DownCast( baseHandle );
-  gPopupState = Toolkit::Popup::HIDDEN;
-  ConnectStateSignals( popup );
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
+  Toolkit::Popup popup = Toolkit::Popup::DownCast(baseHandle);
+  gPopupState          = Toolkit::Popup::HIDDEN;
+  ConnectStateSignals(popup);
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
 
-  application.GetScene().Add( popup );
-  popup.SetDisplayState( Toolkit::Popup::SHOWN );
+  application.GetScene().Add(popup);
+  popup.SetDisplayState(Toolkit::Popup::SHOWN);
 
   application.SendNotification();
   application.Render();
 
   // Check the popup is shown.
-  DALI_TEST_EQUALS( gPopupState, Popup::SHOWN, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPopupState, Popup::SHOWN, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1427,21 +1426,21 @@ int UtcDaliPopupTypeRegistryCreation(void)
 int UtcDaliPopupPropertyTypeRegistryConnectSignal(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupPropertyTypeRegistryConnectSignal" );
+  tet_infoline(" UtcDaliPopupPropertyTypeRegistryConnectSignal");
 
   // Create the Popup actor
   Popup popup = Popup::New();
 
   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
   // Note: The emmision of this signals has already been tested in other tests.
-  DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "touchedOutside",  PopupTestFunctor() ) );
-  DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "showing", PopupTestFunctor() ) );
-  DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "shown", PopupTestFunctor() ) );
-  DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "hiding", PopupTestFunctor() ) );
-  DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "hidden", PopupTestFunctor() ) );
+  DALI_TEST_CHECK(popup.ConnectSignal(testTracker, "touchedOutside", PopupTestFunctor()));
+  DALI_TEST_CHECK(popup.ConnectSignal(testTracker, "showing", PopupTestFunctor()));
+  DALI_TEST_CHECK(popup.ConnectSignal(testTracker, "shown", PopupTestFunctor()));
+  DALI_TEST_CHECK(popup.ConnectSignal(testTracker, "hiding", PopupTestFunctor()));
+  DALI_TEST_CHECK(popup.ConnectSignal(testTracker, "hidden", PopupTestFunctor()));
 
   // Test connecting to an invalid signal does not work.
-  DALI_TEST_CHECK( !popup.ConnectSignal( testTracker, "invalid", PopupTestFunctor() ) );
+  DALI_TEST_CHECK(!popup.ConnectSignal(testTracker, "invalid", PopupTestFunctor()));
 
   END_TEST;
 }
@@ -1449,17 +1448,17 @@ int UtcDaliPopupPropertyTypeRegistryConnectSignal(void)
 int UtcDaliPopupOnChildAdd(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupOnChildAdd" );
+  tet_infoline(" UtcDaliPopupOnChildAdd");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
   std::string testLabelText = "ContentTest";
-  TextLabel contentLabel = TextLabel::New( testLabelText );
+  TextLabel   contentLabel  = TextLabel::New(testLabelText);
 
-  popup.Add( contentLabel );
+  popup.Add(contentLabel);
 
-  DALI_TEST_CHECK( HasAncestor( contentLabel, popup ) );
+  DALI_TEST_CHECK(HasAncestor(contentLabel, popup));
 
   END_TEST;
 }
@@ -1467,26 +1466,26 @@ int UtcDaliPopupOnChildAdd(void)
 int UtcDaliPopupOnKeyEvent(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliPopupOnKeyEvent" );
+  tet_infoline(" UtcDaliPopupOnKeyEvent");
 
   // Create the Popup actor
   Popup popup = Popup::New();
-  popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
-  application.GetScene().Add( popup );
+  popup.SetProperty(Popup::Property::ANIMATION_DURATION, 0.0f);
+  application.GetScene().Add(popup);
 
-  popup.SetDisplayState( Popup::SHOWN );
+  popup.SetDisplayState(Popup::SHOWN);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( popup.GetDisplayState(), Popup::SHOWN, TEST_LOCATION );
+  DALI_TEST_EQUALS(popup.GetDisplayState(), Popup::SHOWN, TEST_LOCATION);
 
   popup.SetKeyInputFocus();
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", "", Device::Class::TOUCH, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", "", Device::Class::TOUCH, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( popup.GetDisplayState(), Popup::HIDDEN, TEST_LOCATION );
+  DALI_TEST_EQUALS(popup.GetDisplayState(), Popup::HIDDEN, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1495,21 +1494,21 @@ int UtcDaliPopupSetPopupBackgroundBorderProperty(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "Set the background border property of a popup & retrieve it" );
+  tet_infoline("Set the background border property of a popup & retrieve it");
   Popup popup = Popup::New();
 
-  Rect< int > rect( 40, 30, 20, 10 );
-  tet_infoline( "Ensure value we want to set is different from what is already set" );
-  DALI_TEST_CHECK( rect != popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >() );
+  Rect<int> rect(40, 30, 20, 10);
+  tet_infoline("Ensure value we want to set is different from what is already set");
+  DALI_TEST_CHECK(rect != popup.GetProperty(Popup::Property::POPUP_BACKGROUND_BORDER).Get<Rect<int> >());
 
-  tet_infoline( "Set the property and retrieve it to make sure it's the value we set" );
-  popup.SetProperty( Popup::Property::POPUP_BACKGROUND_BORDER, rect );
-  DALI_TEST_EQUALS( rect, popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >(), TEST_LOCATION );
+  tet_infoline("Set the property and retrieve it to make sure it's the value we set");
+  popup.SetProperty(Popup::Property::POPUP_BACKGROUND_BORDER, rect);
+  DALI_TEST_EQUALS(rect, popup.GetProperty(Popup::Property::POPUP_BACKGROUND_BORDER).Get<Rect<int> >(), TEST_LOCATION);
 
-  tet_infoline( "Set a vector4 as well which should also work" );
-  Vector4 vectorValue( 10.0f, 20.0f, 30.0f, 40.0f );
-  popup.SetProperty( Popup::Property::POPUP_BACKGROUND_BORDER, vectorValue );
-  DALI_TEST_EQUALS( Rect< int >( 10, 20, 30, 40 ), popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >(), TEST_LOCATION );
+  tet_infoline("Set a vector4 as well which should also work");
+  Vector4 vectorValue(10.0f, 20.0f, 30.0f, 40.0f);
+  popup.SetProperty(Popup::Property::POPUP_BACKGROUND_BORDER, vectorValue);
+  DALI_TEST_EQUALS(Rect<int>(10, 20, 30, 40), popup.GetProperty(Popup::Property::POPUP_BACKGROUND_BORDER).Get<Rect<int> >(), TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp
index 9e421fd..2a8255a 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ using namespace Dali;
 using namespace Dali::Toolkit;
 using Dali::Toolkit::ProgressBar;
 
-
 void utc_dali_toolkit_progressbar_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -39,18 +38,18 @@ void utc_dali_toolkit_progressbar_cleanup(void)
 
 namespace
 {
-static const char* trackImage = TEST_RESOURCE_DIR "/progress-bar-skin-track-progress.png";
-static const char* progressImage = TEST_RESOURCE_DIR "/progress-bar-skin-progress-progress.png";
+static const char* trackImage             = TEST_RESOURCE_DIR "/progress-bar-skin-track-progress.png";
+static const char* progressImage          = TEST_RESOURCE_DIR "/progress-bar-skin-progress-progress.png";
 static const char* secondaryProgressImage = TEST_RESOURCE_DIR "/progress-bar-skin-secondary-progress.png";
-static const char* indeterminateImage = TEST_RESOURCE_DIR "/progress-bar-skin-indeterminate.png";
-static bool gObjectCreatedCallBackCalled;
+static const char* indeterminateImage     = TEST_RESOURCE_DIR "/progress-bar-skin-indeterminate.png";
+static bool        gObjectCreatedCallBackCalled;
 
 static void TestCallback(BaseHandle handle)
 {
   gObjectCreatedCallBackCalled = true;
 }
 
-}
+} // namespace
 
 int UtcDaliProgressBarNew(void)
 {
@@ -60,31 +59,31 @@ int UtcDaliProgressBarNew(void)
   // Create the ProgressBar actor
   ProgressBar progressBar;
 
-  DALI_TEST_CHECK( !progressBar );
+  DALI_TEST_CHECK(!progressBar);
 
   progressBar = ProgressBar::New();
 
-  DALI_TEST_CHECK( progressBar );
+  DALI_TEST_CHECK(progressBar);
 
   ProgressBar progressBar2(progressBar);
 
-  DALI_TEST_CHECK( progressBar2 == progressBar );
+  DALI_TEST_CHECK(progressBar2 == progressBar);
 
   ProgressBar progressBar3;
   progressBar3 = progressBar2;
 
-  DALI_TEST_CHECK( progressBar3 == progressBar2 );
+  DALI_TEST_CHECK(progressBar3 == progressBar2);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     ProgressBar progressBar = ProgressBar::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -93,13 +92,13 @@ int UtcDaliProgressBarNew2(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliProgressBarNew2");
 
-  ProgressBar progressBar1 = DevelProgressBar::New( DevelProgressBar::Style::LINEAR );
-  DALI_TEST_CHECK( progressBar1 );
+  ProgressBar progressBar1 = DevelProgressBar::New(DevelProgressBar::Style::LINEAR);
+  DALI_TEST_CHECK(progressBar1);
 
-  ProgressBar progressBar2 = DevelProgressBar::New( DevelProgressBar::Style::CIRCULAR );
-  DALI_TEST_CHECK( progressBar2 );
+  ProgressBar progressBar2 = DevelProgressBar::New(DevelProgressBar::Style::CIRCULAR);
+  DALI_TEST_CHECK(progressBar2);
 
-  DALI_TEST_CHECK( progressBar1.GetStyleName() != progressBar2.GetStyleName() );
+  DALI_TEST_CHECK(progressBar1.GetStyleName() != progressBar2.GetStyleName());
 
   END_TEST;
 }
@@ -111,7 +110,7 @@ int UtcDaliProgressBarDestructor(void)
   ProgressBar* progressBar = new ProgressBar();
   delete progressBar;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -120,10 +119,10 @@ int UtcDaliProgressBarCopyConstructor(void)
   ToolkitTestApplication application;
 
   ProgressBar progressBar = ProgressBar::New();
-  DALI_TEST_CHECK( progressBar );
+  DALI_TEST_CHECK(progressBar);
 
-  ProgressBar copy( progressBar );
-  DALI_TEST_CHECK( copy );
+  ProgressBar copy(progressBar);
+  DALI_TEST_CHECK(copy);
 
   END_TEST;
 }
@@ -133,12 +132,12 @@ int UtcDaliProgressBarCopyAssignment(void)
   ToolkitTestApplication application;
 
   ProgressBar progressBar = ProgressBar::New();
-  DALI_TEST_CHECK( progressBar );
+  DALI_TEST_CHECK(progressBar);
 
   ProgressBar copy;
   copy = progressBar;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_EQUALS( progressBar, copy, TEST_LOCATION );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_EQUALS(progressBar, copy, TEST_LOCATION);
 
   END_TEST;
 }
@@ -148,15 +147,15 @@ int UtcDaliProgressBarMoveConstructor(void)
   ToolkitTestApplication application;
 
   ProgressBar progressBar = ProgressBar::New();
-  DALI_TEST_EQUALS( 1, progressBar.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  progressBar.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == progressBar.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, progressBar.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  progressBar.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == progressBar.GetProperty<bool>(Actor::Property::SENSITIVE));
 
-  ProgressBar moved = std::move( progressBar );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !progressBar );
+  ProgressBar moved = std::move(progressBar);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!progressBar);
 
   END_TEST;
 }
@@ -166,16 +165,16 @@ int UtcDaliProgressBarMoveAssignment(void)
   ToolkitTestApplication application;
 
   ProgressBar progressBar = ProgressBar::New();
-  DALI_TEST_EQUALS( 1, progressBar.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  progressBar.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == progressBar.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, progressBar.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  progressBar.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == progressBar.GetProperty<bool>(Actor::Property::SENSITIVE));
 
   ProgressBar moved;
-  moved = std::move( progressBar );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !progressBar );
+  moved = std::move(progressBar);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!progressBar);
 
   END_TEST;
 }
@@ -186,32 +185,32 @@ int UtcDaliProgressBarDownCast(void)
 
   Handle handle = ProgressBar::New();
 
-  ProgressBar progressBar = ProgressBar::DownCast( handle );
+  ProgressBar progressBar = ProgressBar::DownCast(handle);
 
-  DALI_TEST_CHECK( progressBar == handle );
+  DALI_TEST_CHECK(progressBar == handle);
   END_TEST;
 }
 
 static bool gProgressBarValueChangedCallBackCalled = false;
 
-static void OnProgressBarValueChanged( ProgressBar progressBar, float value, float secondaryValue )
+static void OnProgressBarValueChanged(ProgressBar progressBar, float value, float secondaryValue)
 {
   gProgressBarValueChangedCallBackCalled = true;
 }
 
 int UtcDaliProgressBarSignals(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliProgressBarSignals");
 
   // Create the ProgressBar actor
   ProgressBar progressBar = ProgressBar::New();
-  application.GetScene().Add( progressBar );
-  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) );
-  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-  progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
+  application.GetScene().Add(progressBar);
+  progressBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, 20.0f));
+  progressBar.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  progressBar.ValueChangedSignal().Connect(&OnProgressBarValueChanged);
 
   progressBar.SetProperty(ProgressBar::Property::PROGRESS_VALUE, 0.2f);
 
@@ -234,146 +233,144 @@ int UtcDaliProgressBarSignals(void)
 int UtcDaliProgressBarSetPropertyP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliProgressBarSetPropertyP" );
+  tet_infoline("UtcDaliProgressBarSetPropertyP");
 
   ProgressBar progressBar = ProgressBar::New();
-  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) );
-  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-  progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
+  progressBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, 20.0f));
+  progressBar.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  progressBar.ValueChangedSignal().Connect(&OnProgressBarValueChanged);
   application.GetScene().Add(progressBar);
   application.SendNotification();
   application.Render();
 
   Property::Map map;
-  map["visualType"] = "IMAGE";
+  map["visualType"]                        = "IMAGE";
   map[Toolkit::ImageVisual::Property::URL] = trackImage;
   progressBar.SetProperty(ProgressBar::Property::TRACK_VISUAL, map);
 
-  Property::Value value = progressBar.GetProperty(ProgressBar::Property::TRACK_VISUAL);
-  Property::Map* resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
-  Property::Value* urlValue = resultMap->Find( Toolkit::ImageVisual::Property::URL );
-  std::string urlString;
-  urlValue->Get( urlString );
-  DALI_TEST_CHECK( !urlString.empty() ) ;
-  DALI_TEST_EQUALS( urlString, trackImage, TEST_LOCATION );
+  Property::Value value     = progressBar.GetProperty(ProgressBar::Property::TRACK_VISUAL);
+  Property::Map*  resultMap = value.GetMap();
+  DALI_TEST_CHECK(resultMap);
+  Property::Value* urlValue = resultMap->Find(Toolkit::ImageVisual::Property::URL);
+  std::string      urlString;
+  urlValue->Get(urlString);
+  DALI_TEST_CHECK(!urlString.empty());
+  DALI_TEST_EQUALS(urlString, trackImage, TEST_LOCATION);
 
   Property::Map colorMap;
-  colorMap["visualType"] = "COLOR";
+  colorMap["visualType"]                              = "COLOR";
   colorMap[Toolkit::ColorVisual::Property::MIX_COLOR] = Color::RED;
   progressBar.SetProperty(ProgressBar::Property::TRACK_VISUAL, colorMap);
 
-  value = progressBar.GetProperty(ProgressBar::Property::TRACK_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::TRACK_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
-  Property::Value* colorValue = resultMap->Find( Toolkit::ColorVisual::Property::MIX_COLOR );
-  Vector4 color = Color::TRANSPARENT;
-  colorValue->Get( color );
-  DALI_TEST_CHECK( color != Color::TRANSPARENT );
-  DALI_TEST_EQUALS( color, Color::RED, TEST_LOCATION );
+  DALI_TEST_CHECK(resultMap);
+  Property::Value* colorValue = resultMap->Find(Toolkit::ColorVisual::Property::MIX_COLOR);
+  Vector4          color      = Color::TRANSPARENT;
+  colorValue->Get(color);
+  DALI_TEST_CHECK(color != Color::TRANSPARENT);
+  DALI_TEST_EQUALS(color, Color::RED, TEST_LOCATION);
 
   map[Toolkit::ImageVisual::Property::URL] = progressImage;
   progressBar.SetProperty(ProgressBar::Property::PROGRESS_VISUAL, map);
 
-  value = progressBar.GetProperty(ProgressBar::Property::PROGRESS_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::PROGRESS_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
-  urlValue = resultMap->Find( Toolkit::ImageVisual::Property::URL );
-  urlValue->Get( urlString );
-  DALI_TEST_CHECK( !urlString.empty() ) ;
-  DALI_TEST_EQUALS( urlString, progressImage, TEST_LOCATION );
+  DALI_TEST_CHECK(resultMap);
+  urlValue = resultMap->Find(Toolkit::ImageVisual::Property::URL);
+  urlValue->Get(urlString);
+  DALI_TEST_CHECK(!urlString.empty());
+  DALI_TEST_EQUALS(urlString, progressImage, TEST_LOCATION);
 
   progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL, secondaryProgressImage);
 
-  value = progressBar.GetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
-  urlValue = resultMap->Find( Toolkit::ImageVisual::Property::URL );
-  urlValue->Get( urlString );
-  DALI_TEST_CHECK( !urlString.empty() ) ;
-  DALI_TEST_EQUALS( urlString, secondaryProgressImage, TEST_LOCATION );
+  DALI_TEST_CHECK(resultMap);
+  urlValue = resultMap->Find(Toolkit::ImageVisual::Property::URL);
+  urlValue->Get(urlString);
+  DALI_TEST_CHECK(!urlString.empty());
+  DALI_TEST_EQUALS(urlString, secondaryProgressImage, TEST_LOCATION);
 
   map[Toolkit::ImageVisual::Property::URL] = secondaryProgressImage;
   progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL, map);
 
-  value = progressBar.GetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
-  urlValue = resultMap->Find( Toolkit::ImageVisual::Property::URL );
-  urlValue->Get( urlString );
-  DALI_TEST_CHECK( !urlString.empty() ) ;
-  DALI_TEST_EQUALS( urlString, secondaryProgressImage, TEST_LOCATION );
+  DALI_TEST_CHECK(resultMap);
+  urlValue = resultMap->Find(Toolkit::ImageVisual::Property::URL);
+  urlValue->Get(urlString);
+  DALI_TEST_CHECK(!urlString.empty());
+  DALI_TEST_EQUALS(urlString, secondaryProgressImage, TEST_LOCATION);
 
   map[Toolkit::ImageVisual::Property::URL] = indeterminateImage;
   progressBar.SetProperty(ProgressBar::Property::INDETERMINATE_VISUAL, map);
 
-  value = progressBar.GetProperty(ProgressBar::Property::INDETERMINATE_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::INDETERMINATE_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
-  urlValue = resultMap->Find( Toolkit::ImageVisual::Property::URL );
-  urlValue->Get( urlString );
-  DALI_TEST_CHECK( !urlString.empty() ) ;
-  DALI_TEST_EQUALS( urlString, indeterminateImage, TEST_LOCATION );
+  DALI_TEST_CHECK(resultMap);
+  urlValue = resultMap->Find(Toolkit::ImageVisual::Property::URL);
+  urlValue->Get(urlString);
+  DALI_TEST_CHECK(!urlString.empty());
+  DALI_TEST_EQUALS(urlString, indeterminateImage, TEST_LOCATION);
 
   progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, "test1");
 
-  value = progressBar.GetProperty(ProgressBar::Property::LABEL_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::LABEL_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
+  DALI_TEST_CHECK(resultMap);
   Property::Value* textValue = resultMap->Find(Toolkit::TextVisual::Property::TEXT);
 
   std::string textString;
-  textValue->Get( textString );
-  DALI_TEST_CHECK( !textString.empty() );
-  DALI_TEST_EQUALS( textString, std::string( "test1" ), TEST_LOCATION );
+  textValue->Get(textString);
+  DALI_TEST_CHECK(!textString.empty());
+  DALI_TEST_EQUALS(textString, std::string("test1"), TEST_LOCATION);
 
   Property::Map textVisualMap2;
-  textVisualMap2.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT );
-  textVisualMap2.Insert( Toolkit::TextVisual::Property::TEXT, "test2" );
-  textVisualMap2.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 12.0f );
+  textVisualMap2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT);
+  textVisualMap2.Insert(Toolkit::TextVisual::Property::TEXT, "test2");
+  textVisualMap2.Insert(Toolkit::TextVisual::Property::POINT_SIZE, 12.0f);
   progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, textVisualMap2);
 
-  value = progressBar.GetProperty(ProgressBar::Property::LABEL_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::LABEL_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
+  DALI_TEST_CHECK(resultMap);
   textValue = resultMap->Find(Toolkit::TextVisual::Property::TEXT);
 
-  textValue->Get( textString );
-  DALI_TEST_CHECK( !textString.empty() );
-  DALI_TEST_EQUALS( textString, std::string( "test2" ), TEST_LOCATION );
+  textValue->Get(textString);
+  DALI_TEST_CHECK(!textString.empty());
+  DALI_TEST_EQUALS(textString, std::string("test2"), TEST_LOCATION);
 
   progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, "test3");
 
-  value = progressBar.GetProperty(ProgressBar::Property::LABEL_VISUAL);
+  value     = progressBar.GetProperty(ProgressBar::Property::LABEL_VISUAL);
   resultMap = value.GetMap();
-  DALI_TEST_CHECK( resultMap );
+  DALI_TEST_CHECK(resultMap);
   textValue = resultMap->Find(Toolkit::TextVisual::Property::TEXT);
 
   std::string textString2;
-  textValue->Get( textString2 );
-  DALI_TEST_CHECK( !textString2.empty() );
-  DALI_TEST_EQUALS( textString2, std::string( "test3" ), TEST_LOCATION );
+  textValue->Get(textString2);
+  DALI_TEST_CHECK(!textString2.empty());
+  DALI_TEST_EQUALS(textString2, std::string("test3"), TEST_LOCATION);
 
   Property::Map transitionMap;
-  transitionMap["target"] = "indeterminateVisual";
-  transitionMap["property"] = "offset";
-  transitionMap["initialValue"] = Vector2( 0.0f, 0.0f );
-  transitionMap["targetValue"] = Vector2( 10.0f, 0.0f );
-  transitionMap["animator"] = Property::Map().Add("alphaFunction", "EASE_IN_OUT_BACK")
-                                             .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
+  transitionMap["target"]       = "indeterminateVisual";
+  transitionMap["property"]     = "offset";
+  transitionMap["initialValue"] = Vector2(0.0f, 0.0f);
+  transitionMap["targetValue"]  = Vector2(10.0f, 0.0f);
+  transitionMap["animator"]     = Property::Map().Add("alphaFunction", "EASE_IN_OUT_BACK").Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
   Property::Array array;
-  array.PushBack( transitionMap );
+  array.PushBack(transitionMap);
   progressBar.SetProperty(ProgressBar::Property::INDETERMINATE_VISUAL_ANIMATION, array);
 
   Property::Map transitionMap2;
-  transitionMap2["target"] = "indeterminateVisual";
-  transitionMap2["property"] = "offset";
-  transitionMap2["initialValue"] = Vector2( 0.0f, 0.0f );
-  transitionMap2["targetValue"] = Vector2( 15.0f, 0.0f );
-  transitionMap2["animator"] = Property::Map().Add("alphaFunction", "EASE_IN_OUT_BACK")
-                                             .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
+  transitionMap2["target"]       = "indeterminateVisual";
+  transitionMap2["property"]     = "offset";
+  transitionMap2["initialValue"] = Vector2(0.0f, 0.0f);
+  transitionMap2["targetValue"]  = Vector2(15.0f, 0.0f);
+  transitionMap2["animator"]     = Property::Map().Add("alphaFunction", "EASE_IN_OUT_BACK").Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
   progressBar.SetProperty(ProgressBar::Property::INDETERMINATE_VISUAL_ANIMATION, transitionMap2);
   END_TEST;
 }
@@ -381,14 +378,14 @@ int UtcDaliProgressBarSetPropertyP(void)
 int UtcDaliProgressBarSetPropertyP1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliProgressBarSetPropertyP1" );
+  tet_infoline("UtcDaliProgressBarSetPropertyP1");
 
   ProgressBar progressBar = ProgressBar::New();
-  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) );
-  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-  progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
+  progressBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, 20.0f));
+  progressBar.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  progressBar.ValueChangedSignal().Connect(&OnProgressBarValueChanged);
 
   application.GetScene().Add(progressBar);
   application.SendNotification();
@@ -400,9 +397,9 @@ int UtcDaliProgressBarSetPropertyP1(void)
   // test to download a file of 100k in chunks
   float lowerBound = 0, upperBound = 100, progressValue = 0, secondaryProgressValue = 0, chunkValue = 0;
 
-  while( chunkValue <= upperBound )
+  while(chunkValue <= upperBound)
   {
-    progressValue = (chunkValue - lowerBound ) / ( upperBound - lowerBound );
+    progressValue = (chunkValue - lowerBound) / (upperBound - lowerBound);
     progressBar.SetProperty(ProgressBar::Property::PROGRESS_VALUE, progressValue);
     val = progressBar.GetProperty<float>(ProgressBar::Property::PROGRESS_VALUE);
     DALI_TEST_EQUALS(val, progressValue, TEST_LOCATION);
@@ -412,9 +409,9 @@ int UtcDaliProgressBarSetPropertyP1(void)
   // test to download a file of 1000k in chunks
   lowerBound = 0, upperBound = 1000, progressValue = 0, chunkValue = 0;
 
-  while( chunkValue <= upperBound )
+  while(chunkValue <= upperBound)
   {
-    progressValue = (chunkValue - lowerBound ) / ( upperBound - lowerBound );
+    progressValue = (chunkValue - lowerBound) / (upperBound - lowerBound);
     progressBar.SetProperty(ProgressBar::Property::PROGRESS_VALUE, progressValue);
     val = progressBar.GetProperty<float>(ProgressBar::Property::PROGRESS_VALUE);
     DALI_TEST_EQUALS(val, progressValue, TEST_LOCATION);
@@ -427,9 +424,9 @@ int UtcDaliProgressBarSetPropertyP1(void)
   // test to download a file of 100k in chunks
   lowerBound = 0, upperBound = 100, secondaryProgressValue = 0, chunkValue = 0;
 
-  while( chunkValue <= upperBound )
+  while(chunkValue <= upperBound)
   {
-    secondaryProgressValue = (chunkValue - lowerBound ) / ( upperBound - lowerBound );
+    secondaryProgressValue = (chunkValue - lowerBound) / (upperBound - lowerBound);
     progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VALUE, secondaryProgressValue);
     val = progressBar.GetProperty<float>(ProgressBar::Property::SECONDARY_PROGRESS_VALUE);
     DALI_TEST_EQUALS(val, secondaryProgressValue, TEST_LOCATION);
@@ -439,9 +436,9 @@ int UtcDaliProgressBarSetPropertyP1(void)
   // test to download a file of 1000k in chunks
   lowerBound = 0, upperBound = 1000, secondaryProgressValue = 0, chunkValue = 0;
 
-  while( chunkValue <= upperBound )
+  while(chunkValue <= upperBound)
   {
-    secondaryProgressValue = (chunkValue - lowerBound ) / ( upperBound - lowerBound );
+    secondaryProgressValue = (chunkValue - lowerBound) / (upperBound - lowerBound);
     progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VALUE, secondaryProgressValue);
     val = progressBar.GetProperty<float>(ProgressBar::Property::SECONDARY_PROGRESS_VALUE);
     DALI_TEST_EQUALS(val, secondaryProgressValue, TEST_LOCATION);
@@ -454,12 +451,12 @@ int UtcDaliProgressBarSetPropertyP1(void)
 int UtcDaliProgressBarSetPropertyP2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliProgressBarSetPropertyP2" );
+  tet_infoline("UtcDaliProgressBarSetPropertyP2");
 
   ProgressBar progressBar = ProgressBar::New();
-  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
+  progressBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
   progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, "test");
   progressBar.SetProperty(ProgressBar::Property::INDETERMINATE, true);
   progressBar.SetProperty(ProgressBar::Property::TRACK_VISUAL, trackImage);
@@ -468,18 +465,17 @@ int UtcDaliProgressBarSetPropertyP2(void)
   progressBar.SetProperty(ProgressBar::Property::INDETERMINATE_VISUAL, indeterminateImage);
 
   Property::Map transitionMap;
-  transitionMap["target"] = "indeterminateVisual";
-  transitionMap["property"] = "offset";
-  transitionMap["initialValue"] = Vector2( 0.0f, 0.0f );
-  transitionMap["targetValue"] = Vector2( 10.0f, 0.0f );
-  transitionMap["animator"] = Property::Map().Add("alphaFunction", "EASE_IN_OUT_BACK")
-                                             .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
+  transitionMap["target"]       = "indeterminateVisual";
+  transitionMap["property"]     = "offset";
+  transitionMap["initialValue"] = Vector2(0.0f, 0.0f);
+  transitionMap["targetValue"]  = Vector2(10.0f, 0.0f);
+  transitionMap["animator"]     = Property::Map().Add("alphaFunction", "EASE_IN_OUT_BACK").Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
   progressBar.SetProperty(ProgressBar::Property::INDETERMINATE_VISUAL_ANIMATION, transitionMap);
   progressBar.SetProperty(ProgressBar::Property::PROGRESS_VALUE, 0.2f);
   progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VALUE, 0.3f);
 
-  progressBar.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) );
+  progressBar.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  progressBar.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, 20.0f));
   application.GetScene().Add(progressBar);
   application.SendNotification();
   application.Render();
@@ -498,13 +494,13 @@ int UtcDaliProgressBarSetPropertyP2(void)
 int UtcDaliProgressBarSetPropertyP3(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliProgressBarSetPropertyP3" );
+  tet_infoline("UtcDaliProgressBarSetPropertyP3");
 
   ProgressBar progressBar = ProgressBar::New();
-  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
-  progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, application.GetScene().GetSize().y ) );
-  application.GetScene().Add( progressBar );
+  progressBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, application.GetScene().GetSize().y));
+  application.GetScene().Add(progressBar);
   application.SendNotification();
   application.Render();
 
@@ -514,20 +510,20 @@ int UtcDaliProgressBarSetPropertyP3(void)
 
     Property::Map map;
     map["visualType"] = "ARC";
-    map["thickness"] = 4.0f;
-    map["mixColor"] = Color::BLUE;
+    map["thickness"]  = 4.0f;
+    map["mixColor"]   = Color::BLUE;
     map["sweepAngle"] = 60;
     progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL, map);
     progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VALUE, 0.5f); // This should change visual's sweep angle.
 
-    Property::Value value = progressBar.GetProperty( ProgressBar::Property::SECONDARY_PROGRESS_VISUAL );
-    Property::Map* resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    Property::Value value     = progressBar.GetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VISUAL);
+    Property::Map*  resultMap = value.GetMap();
+    DALI_TEST_CHECK(resultMap);
 
-    Property::Value* sweepAngle = resultMap->Find( DevelArcVisual::Property::SWEEP_ANGLE );
-    float result = 0.0f;
-    sweepAngle->Get( result );
-    DALI_TEST_EQUALS( result, expected, TEST_LOCATION );
+    Property::Value* sweepAngle = resultMap->Find(DevelArcVisual::Property::SWEEP_ANGLE);
+    float            result     = 0.0f;
+    sweepAngle->Get(result);
+    DALI_TEST_EQUALS(result, expected, TEST_LOCATION);
   }
 
   {
@@ -536,20 +532,20 @@ int UtcDaliProgressBarSetPropertyP3(void)
 
     Property::Map map;
     map["visualType"] = "ARC";
-    map["thickness"] = 4.0f;
-    map["mixColor"] = Color::RED;
+    map["thickness"]  = 4.0f;
+    map["mixColor"]   = Color::RED;
     map["sweepAngle"] = 60;
     progressBar.SetProperty(ProgressBar::Property::PROGRESS_VISUAL, map);
     progressBar.SetProperty(ProgressBar::Property::PROGRESS_VALUE, 0.25f); // This should change visual's sweep angle.
 
-    Property::Value value = progressBar.GetProperty( ProgressBar::Property::PROGRESS_VISUAL );
-    Property::Map* resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    Property::Value value     = progressBar.GetProperty(ProgressBar::Property::PROGRESS_VISUAL);
+    Property::Map*  resultMap = value.GetMap();
+    DALI_TEST_CHECK(resultMap);
 
-    Property::Value* sweepAngle = resultMap->Find( DevelArcVisual::Property::SWEEP_ANGLE );
-    float result = 0.0f;
-    sweepAngle->Get( result );
-    DALI_TEST_EQUALS( result, expected, TEST_LOCATION );
+    Property::Value* sweepAngle = resultMap->Find(DevelArcVisual::Property::SWEEP_ANGLE);
+    float            result     = 0.0f;
+    sweepAngle->Get(result);
+    DALI_TEST_EQUALS(result, expected, TEST_LOCATION);
   }
 
   {
@@ -558,18 +554,18 @@ int UtcDaliProgressBarSetPropertyP3(void)
 
     Property::Map map;
     map["visualType"] = "ARC";
-    map["thickness"] = 4.0f;
-    map["mixColor"] = expected;
+    map["thickness"]  = 4.0f;
+    map["mixColor"]   = expected;
     progressBar.SetProperty(ProgressBar::Property::INDETERMINATE_VISUAL, map);
 
-    Property::Value value = progressBar.GetProperty( ProgressBar::Property::INDETERMINATE_VISUAL );
-    Property::Map* resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    Property::Value value     = progressBar.GetProperty(ProgressBar::Property::INDETERMINATE_VISUAL);
+    Property::Map*  resultMap = value.GetMap();
+    DALI_TEST_CHECK(resultMap);
 
-    Property::Value* mixColor = resultMap->Find( Visual::Property::MIX_COLOR );
-    Vector4 result;
-    mixColor->Get( result );
-    DALI_TEST_EQUALS( result, expected, TEST_LOCATION );
+    Property::Value* mixColor = resultMap->Find(Visual::Property::MIX_COLOR);
+    Vector4          result;
+    mixColor->Get(result);
+    DALI_TEST_EQUALS(result, expected, TEST_LOCATION);
   }
 
   {
@@ -578,19 +574,19 @@ int UtcDaliProgressBarSetPropertyP3(void)
 
     Property::Map map;
     map["visualType"] = "ARC";
-    map["thickness"] = 0.4f;
-    map["mixColor"] = expected;
-    progressBar.SetProperty( ProgressBar::Property::TRACK_VISUAL, map );
-    progressBar.SetProperty( ProgressBar::Property::INDETERMINATE, true ); // This should not change track visual's properties.
-
-    Property::Value value = progressBar.GetProperty( ProgressBar::Property::TRACK_VISUAL );
-    Property::Map* resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
-
-    Property::Value* mixColor = resultMap->Find( Visual::Property::MIX_COLOR );
-    Vector4 result;
-    mixColor->Get( result );
-    DALI_TEST_EQUALS( result, expected, TEST_LOCATION );
+    map["thickness"]  = 0.4f;
+    map["mixColor"]   = expected;
+    progressBar.SetProperty(ProgressBar::Property::TRACK_VISUAL, map);
+    progressBar.SetProperty(ProgressBar::Property::INDETERMINATE, true); // This should not change track visual's properties.
+
+    Property::Value value     = progressBar.GetProperty(ProgressBar::Property::TRACK_VISUAL);
+    Property::Map*  resultMap = value.GetMap();
+    DALI_TEST_CHECK(resultMap);
+
+    Property::Value* mixColor = resultMap->Find(Visual::Property::MIX_COLOR);
+    Vector4          result;
+    mixColor->Get(result);
+    DALI_TEST_EQUALS(result, expected, TEST_LOCATION);
   }
 
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 5913861..4e5ad76 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,16 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali-toolkit/dali-toolkit.h>
 
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 
@@ -47,20 +47,20 @@ namespace
 {
 static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
 
-static const Vector2 INSIDE_TOUCH_POINT_POSITON  = Vector2( 240, 400 );
-static const Vector3 BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS  = Vector3( 200, 360, 0 );
-static const Size BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS  = Size( 100, 100 );
+static const Vector2 INSIDE_TOUCH_POINT_POSITON                = Vector2(240, 400);
+static const Vector3 BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS = Vector3(200, 360, 0);
+static const Size    BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS    = Size(100, 100);
 
 static bool gPushButtonSelectedState = false;
-bool PushButtonSelected( Button button )
+bool        PushButtonSelected(Button button)
 {
-  gPushButtonSelectedState = button.GetProperty<bool>(button.GetPropertyIndex("selected") );
+  gPushButtonSelectedState = button.GetProperty<bool>(button.GetPropertyIndex("selected"));
   return true;
 }
 
 static bool gPushButtonPressed = false;
 
-static bool PushButtonPressed( Button button )
+static bool PushButtonPressed(Button button)
 {
   gPushButtonPressed = true;
   return true;
@@ -68,7 +68,7 @@ static bool PushButtonPressed( Button button )
 
 static bool gPushButtonReleased = false;
 
-static bool PushButtonReleased( Button button )
+static bool PushButtonReleased(Button button)
 {
   gPushButtonReleased = true;
   return true;
@@ -76,7 +76,7 @@ static bool PushButtonReleased( Button button )
 
 static bool gPushButtonClicked = false;
 
-static bool PushButtonClicked( Button button )
+static bool PushButtonClicked(Button button)
 {
   gPushButtonClicked = true;
   return gPushButtonClicked;
@@ -85,79 +85,79 @@ static bool PushButtonClicked( Button button )
 Dali::Integration::Point GetPointDownInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(INSIDE_TOUCH_POINT_POSITON);
   return point;
 }
 
 Dali::Integration::Point GetPointUpInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(INSIDE_TOUCH_POINT_POSITON);
   return point;
 }
 
 Dali::Integration::Point GetPointLeave()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::LEAVE );
-  point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON );
+  point.SetState(PointState::LEAVE);
+  point.SetScreenPosition(INSIDE_TOUCH_POINT_POSITON);
   return point;
 }
 
 Dali::Integration::Point GetPointEnter()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::MOTION );
-  point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON );
+  point.SetState(PointState::MOTION);
+  point.SetScreenPosition(INSIDE_TOUCH_POINT_POSITON);
   return point;
 }
 
 Dali::Integration::Point GetPointDownOutside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
 Dali::Integration::Point GetPointUpOutside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
 // Set up the position of the button for the default test events
-void SetupButtonForTestTouchEvents( ToolkitTestApplication& application, Button& button, bool useDefaultImages )
+void SetupButtonForTestTouchEvents(ToolkitTestApplication& application, Button& button, bool useDefaultImages)
 {
-  button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  button.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
-  if ( useDefaultImages )
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS);
+  if(useDefaultImages)
   {
-    const Vector2 TEST_IMAGE_SIZE = Vector2( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
-    TestPlatformAbstraction& platform = application.GetPlatform();
-    platform.SetClosestImageSize( TEST_IMAGE_SIZE );
-    button.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
-    button.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE );
+    const Vector2            TEST_IMAGE_SIZE = Vector2(BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS);
+    TestPlatformAbstraction& platform        = application.GetPlatform();
+    platform.SetClosestImageSize(TEST_IMAGE_SIZE);
+    button.SetProperty(Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE);
+    button.SetProperty(Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE);
   }
 }
 
-static std::string GetButtonText( Button button )
+static std::string GetButtonText(Button button)
 {
-  Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+  Property::Value value = button.GetProperty(Toolkit::Button::Property::LABEL);
 
-  Property::Map *labelProperty = value.GetMap();
+  Property::Map* labelProperty = value.GetMap();
 
   std::string textLabel;
 
-  if ( labelProperty )
+  if(labelProperty)
   {
-    Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
-    value->Get( textLabel );
+    Property::Value* value = labelProperty->Find(Toolkit::TextVisual::Property::TEXT);
+    value->Get(textLabel);
   }
 
   return textLabel;
@@ -171,7 +171,7 @@ int UtcDaliPushButtonConstructorP(void)
 
   PushButton button;
 
-  DALI_TEST_CHECK( !button );
+  DALI_TEST_CHECK(!button);
   END_TEST;
 }
 
@@ -182,8 +182,8 @@ int UtcDaliPushButtonCopyConstructorP(void)
   // Initialize an object, ref count == 1
   PushButton button = PushButton::New();
 
-  PushButton copy( button );
-  DALI_TEST_CHECK( copy );
+  PushButton copy(button);
+  DALI_TEST_CHECK(copy);
   END_TEST;
 }
 
@@ -192,16 +192,16 @@ int UtcDaliPushButtonMoveConstructor(void)
   ToolkitTestApplication application;
 
   PushButton button = PushButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, true );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
 
-  PushButton moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  PushButton moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -212,10 +212,10 @@ int UtcDaliPushButtonAssignmentOperatorP(void)
 
   PushButton button = PushButton::New();
 
-  PushButton copy( button );
-  DALI_TEST_CHECK( copy );
+  PushButton copy(button);
+  DALI_TEST_CHECK(copy);
 
-  DALI_TEST_CHECK( button == copy );
+  DALI_TEST_CHECK(button == copy);
   END_TEST;
 }
 
@@ -224,17 +224,17 @@ int UtcDaliPushButtonMoveAssignment(void)
   ToolkitTestApplication application;
 
   PushButton button = PushButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, true );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
 
   PushButton moved;
-  moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -245,7 +245,7 @@ int UtcDaliPushButtonNewP(void)
 
   PushButton button = PushButton::New();
 
-  DALI_TEST_CHECK( button );
+  DALI_TEST_CHECK(button);
   END_TEST;
 }
 
@@ -257,10 +257,10 @@ int UtcDaliPushButtonDownCastP(void)
 
   BaseHandle object(button);
 
-  PushButton button2 = PushButton::DownCast( object );
+  PushButton button2 = PushButton::DownCast(object);
   DALI_TEST_CHECK(button2);
 
-  PushButton button3 = DownCast< PushButton >(object);
+  PushButton button3 = DownCast<PushButton>(object);
   DALI_TEST_CHECK(button3);
   END_TEST;
 }
@@ -271,11 +271,11 @@ int UtcDaliPushButtonDownCastN(void)
 
   BaseHandle unInitializedObject;
 
-  PushButton button1 = PushButton::DownCast( unInitializedObject );
-  DALI_TEST_CHECK( !button1 );
+  PushButton button1 = PushButton::DownCast(unInitializedObject);
+  DALI_TEST_CHECK(!button1);
 
-  PushButton button2 = DownCast< PushButton >( unInitializedObject );
-  DALI_TEST_CHECK( !button2 );
+  PushButton button2 = DownCast<PushButton>(unInitializedObject);
+  DALI_TEST_CHECK(!button2);
   END_TEST;
 }
 
@@ -286,16 +286,16 @@ int UtcDaliPushButtonAutoRepeatingProperty(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("autoRepeating"), true );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("autoRepeating"), true);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("autoRepeating"), false );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("autoRepeating"), false);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION);
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("autoRepeating"), true );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("autoRepeating"), true);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
-    END_TEST;
+  END_TEST;
 }
 
 int UtcDaliPushButtonSetAutoRepeating(void)
@@ -305,18 +305,18 @@ int UtcDaliPushButtonSetAutoRepeating(void)
   tet_infoline("Ensure setting AutoRepeating on a SELECTED Toggle button switches off Toggle\n");
   PushButton pushButton = PushButton::New();
 
-  const bool INITIAL_TOGGLE_VALUE = true;
+  const bool INITIAL_TOGGLE_VALUE   = true;
   const bool INITIAL_SELECTED_VALUE = true;
 
-  pushButton.SetProperty( Button::Property::TOGGLABLE, INITIAL_TOGGLE_VALUE);
-  pushButton.SetProperty( Button::Property::SELECTED, INITIAL_SELECTED_VALUE );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, INITIAL_TOGGLE_VALUE);
+  pushButton.SetProperty(Button::Property::SELECTED, INITIAL_SELECTED_VALUE);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE  ), INITIAL_TOGGLE_VALUE , TEST_LOCATION );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED  ), INITIAL_SELECTED_VALUE , TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::TOGGLABLE), INITIAL_TOGGLE_VALUE, TEST_LOCATION);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), INITIAL_SELECTED_VALUE, TEST_LOCATION);
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), !INITIAL_TOGGLE_VALUE , TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::TOGGLABLE), !INITIAL_TOGGLE_VALUE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -328,14 +328,14 @@ int UtcDaliPushButtonTogglableProperty(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("togglable"), true);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION);
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), false );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), false, TEST_LOCATION );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("togglable"), false);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), false, TEST_LOCATION);
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("togglable"), true);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -347,17 +347,17 @@ int UtcDaliPushButtonAutoRepeatingPropertyAndTogglableButton(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
-  pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
+  pushButton.SetProperty(pushButton.GetPropertyIndex("togglable"), true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION);
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true );
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("togglable"), true);
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("togglable")), false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -368,25 +368,25 @@ int UtcDaliPushButtonSelectedProperty01(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("togglable"), true);
 
-  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
+  pushButton.StateChangedSignal().Connect(&PushButtonSelected);
 
   gPushButtonSelectedState = false;
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED  ), true , TEST_LOCATION );
-  DALI_TEST_CHECK( gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, false );
+  pushButton.SetProperty(Button::Property::SELECTED, false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED  ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED  ), true , TEST_LOCATION );
-  DALI_TEST_CHECK( gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gPushButtonSelectedState);
   END_TEST;
 }
 
@@ -397,24 +397,24 @@ int UtcDaliPushButtonSelectedProperty02(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), false );
-  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("togglable"), false);
+  pushButton.StateChangedSignal().Connect(&PushButtonSelected);
 
   gPushButtonSelectedState = false;
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED  ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, false );
+  pushButton.SetProperty(Button::Property::SELECTED, false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED  ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED  ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
   END_TEST;
 }
 
@@ -425,11 +425,11 @@ int UtcDaliPushButtonAutorepeatingDelayPropertyValues01(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, 1.f );
+  pushButton.SetProperty(Button::Property::INITIAL_AUTO_REPEATING_DELAY, 1.f);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<float>(pushButton.GetPropertyIndex("initialAutoRepeatingDelay") ), 1.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<float>(pushButton.GetPropertyIndex("initialAutoRepeatingDelay")), 1.f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -441,34 +441,34 @@ int UtcDaliPushButtonAutorepeatingDelayPropertyValues02(void)
 
   PushButton pushButton = PushButton::New();
 
-  bool assert1( false );
-  bool assert2( false );
+  bool assert1(false);
+  bool assert2(false);
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
   try
   {
-    pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, -1.f );
+    pushButton.SetProperty(Button::Property::INITIAL_AUTO_REPEATING_DELAY, -1.f);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
     assert1 = true;
   }
 
   try
   {
-    pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, -1.f );
+    pushButton.SetProperty(Button::Property::NEXT_AUTO_REPEATING_DELAY, -1.f);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
     assert2 = true;
   }
 
-  DALI_TEST_CHECK( assert1 && assert2 );
+  DALI_TEST_CHECK(assert1 && assert2);
   END_TEST;
 }
 
@@ -477,22 +477,19 @@ int UtcDaliPushButtonLabelProperty(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliPushButtonSetLabelText");
 
-  const std::string STR( "Hola!" );
+  const std::string STR("Hola!");
 
   PushButton pushButton = PushButton::New();
 
   application.SendNotification();
   application.Render();
 
-  pushButton.SetProperty( Toolkit::Button::Property::LABEL,
-                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-                                           .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                          );
-
+  pushButton.SetProperty(Toolkit::Button::Property::LABEL,
+                         Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f));
 
-  pushButton.SetProperty( Toolkit::Button::Property::LABEL, STR );
+  pushButton.SetProperty(Toolkit::Button::Property::LABEL, STR);
 
-  DALI_TEST_EQUALS( GetButtonText( pushButton ), STR, TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(pushButton), STR, TEST_LOCATION);
 
   END_TEST;
 }
@@ -503,12 +500,12 @@ int UtcDaliPushButtonPressed(void)
   tet_infoline(" UtcDaliPushButtonPressed");
 
   PushButton pushButton = PushButton::New();
-  pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
-  pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+  pushButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS);
+  pushButton.SetProperty(Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS);
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
 
   application.SendNotification();
   application.Render();
@@ -516,17 +513,17 @@ int UtcDaliPushButtonPressed(void)
   gPushButtonPressed = false;
 
   // connect to its touch signal
-  pushButton.PressedSignal().Connect( &PushButtonPressed );
+  pushButton.PressedSignal().Connect(&PushButtonPressed);
 
   Dali::Integration::TouchEvent eventDown;
-  eventDown.AddPoint( GetPointDownInside() );
+  eventDown.AddPoint(GetPointDownInside());
 
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( eventDown );
+  application.ProcessEvent(eventDown);
 
-  DALI_TEST_CHECK( gPushButtonPressed );
+  DALI_TEST_CHECK(gPushButtonPressed);
   END_TEST;
 }
 
@@ -536,80 +533,80 @@ int UtcDaliPushButtonReleased(void)
   tet_infoline(" UtcDaliPushButtonReleased");
 
   PushButton pushButton = PushButton::New();
-  pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
-  pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+  pushButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS);
+  pushButton.SetProperty(Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS);
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
 
   application.SendNotification();
   application.Render();
 
   // connect to its touch signal
-  pushButton.ReleasedSignal().Connect( &PushButtonReleased );
+  pushButton.ReleasedSignal().Connect(&PushButtonReleased);
 
   Dali::Integration::TouchEvent event;
 
   // Test1. Touch point down and up inside the button.
 
   gPushButtonReleased = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event               = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gPushButtonReleased );
+  DALI_TEST_CHECK(gPushButtonReleased);
 
   // Test2. Touch point down and up outside the button.
 
   gPushButtonReleased = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event               = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gPushButtonReleased );
+  DALI_TEST_CHECK(!gPushButtonReleased);
 
   // Test3. Touch point down inside and up outside the button.
 
   gPushButtonReleased = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event               = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointLeave() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointLeave());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gPushButtonReleased );
+  DALI_TEST_CHECK(gPushButtonReleased);
 
   // Test4. Touch point down outside and up inside the button.
 
   gPushButtonReleased = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event               = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointEnter() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointEnter());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gPushButtonReleased );
+  DALI_TEST_CHECK(!gPushButtonReleased);
   END_TEST;
 }
 
@@ -619,109 +616,109 @@ int UtcDaliPushButtonSelected(void)
   tet_infoline(" UtcDaliPushButtonSelected");
 
   PushButton pushButton = PushButton::New();
-  pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
-  pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+  pushButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS);
+  pushButton.SetProperty(Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS);
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
 
   application.SendNotification();
   application.Render();
 
   // connect to its touch signal
-  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
+  pushButton.StateChangedSignal().Connect(&PushButtonSelected);
 
   Dali::Integration::TouchEvent event;
 
   // Test1. No togglable button.
 
   gPushButtonSelectedState = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                    = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
   // Set togglable property.
-  pushButton.SetProperty( Button::Property::TOGGLABLE, true );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, true);
 
   // Test2. Touch point down and up inside the button twice.
   gPushButtonSelectedState = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                    = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gPushButtonSelectedState );
+  DALI_TEST_CHECK(gPushButtonSelectedState);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
   // Test3. Touch point down and up outside the button.
 
   gPushButtonSelectedState = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event                    = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
   // Test4. Touch point down inside and up outside the button.
   //        State changes on Button down
   gPushButtonSelectedState = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                    = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointLeave() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointLeave());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gPushButtonSelectedState );
+  DALI_TEST_CHECK(gPushButtonSelectedState);
 
   // Test5. Touch point down outside and up inside the button.
   // Start in unselected state
-  pushButton.SetProperty( Button::Property::SELECTED, false );
+  pushButton.SetProperty(Button::Property::SELECTED, false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("selected") ),false , TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("selected")), false, TEST_LOCATION);
 
   gPushButtonSelectedState = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event                    = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointEnter() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointEnter());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
   END_TEST;
 }
 
@@ -731,11 +728,11 @@ int UtcDaliPushButtonPropertySetLabelPadding(void)
   tet_infoline(" UtcDaliPushButtonPropertySetLabelPadding");
 
   PushButton pushButton = PushButton::New();
-  pushButton.SetProperty( Toolkit::PushButton::Property::LABEL_PADDING, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-  DALI_TEST_EQUALS( pushButton.GetProperty<Vector4>( Toolkit::PushButton::Property::LABEL_PADDING ), Vector4( 1.0f, 1.0f, 1.0f, 1.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  pushButton.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, Vector4(1.0f, 1.0f, 1.0f, 1.0f));
+  DALI_TEST_EQUALS(pushButton.GetProperty<Vector4>(Toolkit::PushButton::Property::LABEL_PADDING), Vector4(1.0f, 1.0f, 1.0f, 1.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  pushButton.SetProperty( Toolkit::PushButton::Property::LABEL_PADDING, Vector4( 10.0f, 10.0f, 10.0f, 10.0f ) );
-  DALI_TEST_EQUALS( pushButton.GetProperty<Vector4>( Toolkit::PushButton::Property::LABEL_PADDING ), Vector4( 10.0f, 10.0f, 10.0f, 10.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  pushButton.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, Vector4(10.0f, 10.0f, 10.0f, 10.0f));
+  DALI_TEST_EQUALS(pushButton.GetProperty<Vector4>(Toolkit::PushButton::Property::LABEL_PADDING), Vector4(10.0f, 10.0f, 10.0f, 10.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
@@ -746,11 +743,11 @@ int UtcDaliPushButtonPropertySetIconPadding(void)
   tet_infoline(" UtcDaliPushButtonPropertySetIconPadding");
 
   PushButton pushButton = PushButton::New();
-  pushButton.SetProperty( Toolkit::PushButton::Property::ICON_PADDING, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-  DALI_TEST_EQUALS( pushButton.GetProperty<Vector4>( Toolkit::PushButton::Property::ICON_PADDING ), Vector4( 1.0f, 1.0f, 1.0f, 1.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  pushButton.SetProperty(Toolkit::PushButton::Property::ICON_PADDING, Vector4(1.0f, 1.0f, 1.0f, 1.0f));
+  DALI_TEST_EQUALS(pushButton.GetProperty<Vector4>(Toolkit::PushButton::Property::ICON_PADDING), Vector4(1.0f, 1.0f, 1.0f, 1.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  pushButton.SetProperty( Toolkit::PushButton::Property::ICON_PADDING, Vector4( 10.0f, 10.0f, 10.0f, 10.0f ) );
-  DALI_TEST_EQUALS( pushButton.GetProperty<Vector4>( Toolkit::PushButton::Property::ICON_PADDING ), Vector4( 10.0f, 10.0f, 10.0f, 10.0f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  pushButton.SetProperty(Toolkit::PushButton::Property::ICON_PADDING, Vector4(10.0f, 10.0f, 10.0f, 10.0f));
+  DALI_TEST_EQUALS(pushButton.GetProperty<Vector4>(Toolkit::PushButton::Property::ICON_PADDING), Vector4(10.0f, 10.0f, 10.0f, 10.0f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
@@ -764,116 +761,115 @@ int UtcDaliPushButtonPaddingLayout(void)
   // The icon and label are each enabled and disabled to confirm the correct padding is used.
   PushButton pushButton = PushButton::New();
 
-  const Vector4 TEST_ICON_PADDING( 20.0f, 20.0f, 20.0f, 20.0f );
-  const Vector4 TEST_LABEL_PADDING( 10.0f, 10.0f, 10.0f, 10.0f );
+  const Vector4 TEST_ICON_PADDING(20.0f, 20.0f, 20.0f, 20.0f);
+  const Vector4 TEST_LABEL_PADDING(10.0f, 10.0f, 10.0f, 10.0f);
 
   // Get actual size of test image
-  ImageDimensions testImageSize = Dali::GetClosestImageSize( TEST_IMAGE_ONE );
-  const Vector2 TEST_IMAGE_SIZE( testImageSize.GetWidth(), testImageSize.GetHeight() );
+  ImageDimensions testImageSize = Dali::GetClosestImageSize(TEST_IMAGE_ONE);
+  const Vector2   TEST_IMAGE_SIZE(testImageSize.GetWidth(), testImageSize.GetHeight());
 
-  pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-  pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+  pushButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  pushButton.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
 
   application.SendNotification();
   application.Render();
 
   // First test the size is zero.
   // No padding should be added as there is no label or icon.
-  Vector2 size( Vector2::ZERO );
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
-  tet_printf( "Button Natural Size(%f,%f)\n", pushButton.GetNaturalSize().width, pushButton.GetNaturalSize().height );
+  Vector2 size(Vector2::ZERO);
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
+  tet_printf("Button Natural Size(%f,%f)\n", pushButton.GetNaturalSize().width, pushButton.GetNaturalSize().height);
 
-  DALI_TEST_EQUALS( size, Vector2::ZERO, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(size, Vector2::ZERO, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check label only padding
-  pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" );
+  pushButton.SetProperty(Toolkit::Button::Property::LABEL, "Label");
 
   application.SendNotification();
   application.Render();
 
-  Vector2 sizeWithLabelWithoutPadding( Vector2::ZERO );
-  sizeWithLabelWithoutPadding.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  sizeWithLabelWithoutPadding.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
+  Vector2 sizeWithLabelWithoutPadding(Vector2::ZERO);
+  sizeWithLabelWithoutPadding.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  sizeWithLabelWithoutPadding.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
 
-  tet_printf( "Button RelayoutSize label without padding (%f,%f)\n", sizeWithLabelWithoutPadding.width, sizeWithLabelWithoutPadding.height );
+  tet_printf("Button RelayoutSize label without padding (%f,%f)\n", sizeWithLabelWithoutPadding.width, sizeWithLabelWithoutPadding.height);
 
   // Add label padding to label
-  pushButton.SetProperty( Toolkit::PushButton::Property::LABEL_PADDING, TEST_LABEL_PADDING );
+  pushButton.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, TEST_LABEL_PADDING);
   application.SendNotification();
   application.Render();
 
-  Vector2 sizeLabelAndPadding( Vector2::ZERO );
-  sizeLabelAndPadding.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  sizeLabelAndPadding.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
-  tet_printf( "Button RelayoutSize after label padding(%f,%f)\n", sizeLabelAndPadding.width, sizeLabelAndPadding.height );
+  Vector2 sizeLabelAndPadding(Vector2::ZERO);
+  sizeLabelAndPadding.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  sizeLabelAndPadding.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
+  tet_printf("Button RelayoutSize after label padding(%f,%f)\n", sizeLabelAndPadding.width, sizeLabelAndPadding.height);
 
   // If control size has increased beyond size of just label then padding has been applied
-  DALI_TEST_GREATER( sizeLabelAndPadding.width, sizeWithLabelWithoutPadding.width+TEST_LABEL_PADDING.x, TEST_LOCATION );
-  DALI_TEST_GREATER( sizeLabelAndPadding.height, sizeWithLabelWithoutPadding.height+TEST_LABEL_PADDING.w, TEST_LOCATION );
+  DALI_TEST_GREATER(sizeLabelAndPadding.width, sizeWithLabelWithoutPadding.width + TEST_LABEL_PADDING.x, TEST_LOCATION);
+  DALI_TEST_GREATER(sizeLabelAndPadding.height, sizeWithLabelWithoutPadding.height + TEST_LABEL_PADDING.w, TEST_LOCATION);
 
   // Re-initialise the button so we can setup icon-only padding.
   pushButton.Unparent();
   pushButton = PushButton::New();
 
-  pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-  pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-
-  application.GetScene().Add( pushButton );
+  pushButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  pushButton.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
 
+  application.GetScene().Add(pushButton);
 
-  pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN" );
-  pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE );
-  pushButton.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE );
+  pushButton.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN");
+  pushButton.SetProperty(Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE);
+  pushButton.SetProperty(Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE);
 
   application.SendNotification();
   application.Render();
 
   // Size of button with just icon
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
-  tet_printf( "Button RelayoutSize with icon(%f,%f)\n", size.width, size.height );
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
+  tet_printf("Button RelayoutSize with icon(%f,%f)\n", size.width, size.height);
 
-  pushButton.SetProperty( Toolkit::PushButton::Property::ICON_PADDING, TEST_ICON_PADDING );
+  pushButton.SetProperty(Toolkit::PushButton::Property::ICON_PADDING, TEST_ICON_PADDING);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( size, TEST_IMAGE_SIZE, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(size, TEST_IMAGE_SIZE, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
-  tet_printf( "Button RelayoutSize after icon padding(%f,%f)\n", size.width, size.height );
-  const Vector2 expectedIconAndPaddingSize( TEST_ICON_PADDING.x+TEST_ICON_PADDING.y+TEST_IMAGE_SIZE.width, TEST_ICON_PADDING.w + TEST_ICON_PADDING.z + TEST_IMAGE_SIZE.height );
-  DALI_TEST_EQUALS( size, expectedIconAndPaddingSize, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
+  tet_printf("Button RelayoutSize after icon padding(%f,%f)\n", size.width, size.height);
+  const Vector2 expectedIconAndPaddingSize(TEST_ICON_PADDING.x + TEST_ICON_PADDING.y + TEST_IMAGE_SIZE.width, TEST_ICON_PADDING.w + TEST_ICON_PADDING.z + TEST_IMAGE_SIZE.height);
+  DALI_TEST_EQUALS(size, expectedIconAndPaddingSize, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Now test padding for both label and icon simultaneously.
-  pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" );
+  pushButton.SetProperty(Toolkit::Button::Property::LABEL, "Label");
 
   application.SendNotification();
   application.Render();
 
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
-  tet_printf( "Button RelayoutSize after label added(%f,%f)\n", size.width, size.height );
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
+  tet_printf("Button RelayoutSize after label added(%f,%f)\n", size.width, size.height);
 
-  pushButton.SetProperty( Toolkit::PushButton::Property::LABEL_PADDING, TEST_LABEL_PADDING );
+  pushButton.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, TEST_LABEL_PADDING);
 
   application.SendNotification();
   application.Render();
 
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
-  tet_printf( "Button RelayoutSize after icon and label padding(%f,%f)\n", size.width, size.height );
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
+  tet_printf("Button RelayoutSize after icon and label padding(%f,%f)\n", size.width, size.height);
 
-  DALI_TEST_EQUALS( size.width, sizeLabelAndPadding.width + expectedIconAndPaddingSize.width, TEST_LOCATION );
+  DALI_TEST_EQUALS(size.width, sizeLabelAndPadding.width + expectedIconAndPaddingSize.width, TEST_LOCATION);
   // Test height of control is same as icon and padding, as Text is smaller than icon
-  DALI_TEST_EQUALS( size.height, expectedIconAndPaddingSize.height, TEST_LOCATION );
+  DALI_TEST_EQUALS(size.height, expectedIconAndPaddingSize.height, TEST_LOCATION);
 
   END_TEST;
 }
@@ -909,63 +905,63 @@ int UtcDaliPushButtonAlignmentLayout(void)
    * +---------+   -
    */
 
-  const Vector4 TEST_ICON_PADDING( 70.0f, 70.0f, 70.0f, 70.0f );
-  const Vector4 TEST_LABEL_PADDING( 30.0f, 30.0f, 30.0f, 30.0f );
+  const Vector4 TEST_ICON_PADDING(70.0f, 70.0f, 70.0f, 70.0f);
+  const Vector4 TEST_LABEL_PADDING(30.0f, 30.0f, 30.0f, 30.0f);
 
   // Get actual size of test image
-  ImageDimensions testImageSize = Dali::GetClosestImageSize( TEST_IMAGE_ONE );
-  const Vector2 TEST_IMAGE_SIZE( testImageSize.GetWidth(), testImageSize.GetHeight() );
+  ImageDimensions testImageSize = Dali::GetClosestImageSize(TEST_IMAGE_ONE);
+  const Vector2   TEST_IMAGE_SIZE(testImageSize.GetWidth(), testImageSize.GetHeight());
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-  pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+  pushButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  pushButton.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
 
   // Add a label and get size of control
-  pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" );
+  pushButton.SetProperty(Toolkit::Button::Property::LABEL, "Label");
   application.SendNotification();
   application.Render();
 
   // First get the size of control with just label
-  Vector2 justLabelSize( Vector2::ZERO );
-  justLabelSize.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  justLabelSize.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
-  tet_printf( "Button RelayoutSize with just label and no padding(%f,%f)\n", justLabelSize.width, justLabelSize.height );
+  Vector2 justLabelSize(Vector2::ZERO);
+  justLabelSize.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  justLabelSize.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
+  tet_printf("Button RelayoutSize with just label and no padding(%f,%f)\n", justLabelSize.width, justLabelSize.height);
 
-  pushButton.SetProperty( Toolkit::PushButton::Property::LABEL_PADDING, TEST_LABEL_PADDING );
+  pushButton.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, TEST_LABEL_PADDING);
   application.SendNotification();
   application.Render();
 
   // Size of Label and Padding
-  Vector2 expectedLabelAndPaddingSize( Vector2::ZERO );
-  expectedLabelAndPaddingSize.width = justLabelSize.width + TEST_LABEL_PADDING.x + TEST_LABEL_PADDING.y;
+  Vector2 expectedLabelAndPaddingSize(Vector2::ZERO);
+  expectedLabelAndPaddingSize.width  = justLabelSize.width + TEST_LABEL_PADDING.x + TEST_LABEL_PADDING.y;
   expectedLabelAndPaddingSize.height = justLabelSize.height + TEST_LABEL_PADDING.w + TEST_LABEL_PADDING.z;
 
-  Vector2 labelAndPaddingSize( Vector2::ZERO );
-  labelAndPaddingSize.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  labelAndPaddingSize.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
+  Vector2 labelAndPaddingSize(Vector2::ZERO);
+  labelAndPaddingSize.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  labelAndPaddingSize.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
 
-  DALI_TEST_EQUALS( labelAndPaddingSize, expectedLabelAndPaddingSize , Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(labelAndPaddingSize, expectedLabelAndPaddingSize, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  const Vector2 testImageWithPaddingSize = Vector2 ( ( TEST_IMAGE_SIZE.width + TEST_ICON_PADDING.x + TEST_ICON_PADDING.y ),
-                                                     ( TEST_IMAGE_SIZE.height + TEST_ICON_PADDING.w + TEST_ICON_PADDING.z ) );
+  const Vector2 testImageWithPaddingSize = Vector2((TEST_IMAGE_SIZE.width + TEST_ICON_PADDING.x + TEST_ICON_PADDING.y),
+                                                   (TEST_IMAGE_SIZE.height + TEST_ICON_PADDING.w + TEST_ICON_PADDING.z));
 
   // Add Icon and set its alignment
-  pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN" );
-  pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE );
-  pushButton.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE );
-  pushButton.SetProperty( Toolkit::PushButton::Property::ICON_PADDING, TEST_ICON_PADDING );
+  pushButton.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN");
+  pushButton.SetProperty(Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE);
+  pushButton.SetProperty(Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE);
+  pushButton.SetProperty(Toolkit::PushButton::Property::ICON_PADDING, TEST_ICON_PADDING);
 
   application.SendNotification();
   application.Render();
 
-  Vector2 size( Vector2::ZERO );
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
+  Vector2 size(Vector2::ZERO);
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
 
   /*
    * Test Icon right alignment.
@@ -980,17 +976,17 @@ int UtcDaliPushButtonAlignmentLayout(void)
    *  |............+         |
    *  +------------+---------+
    */
-  DALI_TEST_EQUALS( size.width, ( testImageWithPaddingSize.width + labelAndPaddingSize.width ) , TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, ( std::max( testImageWithPaddingSize.height, labelAndPaddingSize.height) ) , Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(size.width, (testImageWithPaddingSize.width + labelAndPaddingSize.width), TEST_LOCATION);
+  DALI_TEST_EQUALS(size.height, (std::max(testImageWithPaddingSize.height, labelAndPaddingSize.height)), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Now test left alignment matches right for size.
-  pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END" );
+  pushButton.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END");
 
   application.SendNotification();
   application.Render();
 
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
 
   /*
    * Test Icon left alignment.
@@ -1005,8 +1001,8 @@ int UtcDaliPushButtonAlignmentLayout(void)
    *  |         +............|
    *  +---------+------------+
    */
-  DALI_TEST_EQUALS( size.width, ( testImageWithPaddingSize.width + labelAndPaddingSize.width ) , TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, ( std::max( testImageWithPaddingSize.height, labelAndPaddingSize.height) ) , Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(size.width, (testImageWithPaddingSize.width + labelAndPaddingSize.width), TEST_LOCATION);
+  DALI_TEST_EQUALS(size.height, (std::max(testImageWithPaddingSize.height, labelAndPaddingSize.height)), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   tet_infoline(" Test Icon TOP alignment - Width grows to largest of Icon or label (plus padding)");
   /*
@@ -1026,23 +1022,23 @@ int UtcDaliPushButtonAlignmentLayout(void)
    */
 
   tet_infoline("SetProperty on LABEL_RELATIVE_ALIGNMENT should relayout the Button");
-  pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BOTTOM" );
+  pushButton.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BOTTOM");
 
   application.SendNotification();
   application.Render();
 
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
 
-  tet_printf("Natural width (%f)\n",pushButton.GetNaturalSize().width);
-  tet_printf("Natural height (%f)\n",pushButton.GetNaturalSize().height);
+  tet_printf("Natural width (%f)\n", pushButton.GetNaturalSize().width);
+  tet_printf("Natural height (%f)\n", pushButton.GetNaturalSize().height);
 
-  tet_printf(" UtcDaliPushButtonAlignmentLayout Top layout - Image and Padding size (%f,%f)\n", testImageWithPaddingSize.width, testImageWithPaddingSize.height );
-  tet_printf(" UtcDaliPushButtonAlignmentLayout Top layout - Text and Padding size (%f,%f)\n", labelAndPaddingSize.width, labelAndPaddingSize.height );
+  tet_printf(" UtcDaliPushButtonAlignmentLayout Top layout - Image and Padding size (%f,%f)\n", testImageWithPaddingSize.width, testImageWithPaddingSize.height);
+  tet_printf(" UtcDaliPushButtonAlignmentLayout Top layout - Text and Padding size (%f,%f)\n", labelAndPaddingSize.width, labelAndPaddingSize.height);
 
-  DALI_TEST_EQUALS( size.width, ( std::max( testImageWithPaddingSize.width, labelAndPaddingSize.width ) ) , TEST_LOCATION );
+  DALI_TEST_EQUALS(size.width, (std::max(testImageWithPaddingSize.width, labelAndPaddingSize.width)), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( size.height,( testImageWithPaddingSize.height + labelAndPaddingSize.height ) , TEST_LOCATION );
+  DALI_TEST_EQUALS(size.height, (testImageWithPaddingSize.height + labelAndPaddingSize.height), TEST_LOCATION);
 
   /*
    * Test Icon bottom alignment.
@@ -1061,16 +1057,16 @@ int UtcDaliPushButtonAlignmentLayout(void)
    *  +---------+
    */
   tet_infoline(" Test Icon BOTTOM alignment - Width grows to largest of Icon or label (plus padding)");
-  pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "TOP" );
+  pushButton.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "TOP");
 
   application.SendNotification();
   application.Render();
 
-  size.width = pushButton.GetRelayoutSize( Dimension::WIDTH );
-  size.height = pushButton.GetRelayoutSize( Dimension::HEIGHT );
+  size.width  = pushButton.GetRelayoutSize(Dimension::WIDTH);
+  size.height = pushButton.GetRelayoutSize(Dimension::HEIGHT);
 
-  DALI_TEST_EQUALS( size.width, ( std::max(testImageWithPaddingSize.width, labelAndPaddingSize.width )) , TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height,( testImageWithPaddingSize.height + labelAndPaddingSize.height ) , TEST_LOCATION );
+  DALI_TEST_EQUALS(size.width, (std::max(testImageWithPaddingSize.width, labelAndPaddingSize.width)), TEST_LOCATION);
+  DALI_TEST_EQUALS(size.height, (testImageWithPaddingSize.height + labelAndPaddingSize.height), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1081,15 +1077,15 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void)
   ToolkitTestApplication application;
 
   PushButton pushButton = PushButton::New();
-  pushButton.SetProperty( Actor::Property::SIZE, Vector2( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ) );
+  pushButton.SetProperty(Actor::Property::SIZE, Vector2(BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS));
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
 
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
   propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
 
-  pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap );
+  pushButton.SetProperty(Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap);
 
   tet_infoline(" UNSELECTED_VISUAL Added to button\n");
 
@@ -1097,33 +1093,33 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void)
   application.Render(0);
 
   unsigned int rendererCount = pushButton.GetRendererCount();
-  tet_printf("After adding UNSELECTED_BACKGROUND_VISUAL the renderer count is(%d)\n", rendererCount );
+  tet_printf("After adding UNSELECTED_BACKGROUND_VISUAL the renderer count is(%d)\n", rendererCount);
 
-  DALI_TEST_EQUALS( pushButton.GetRendererCount(), 1 , TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetRendererCount(), 1, TEST_LOCATION);
 
-  tet_printf("Remove button from stage\n" );
+  tet_printf("Remove button from stage\n");
 
-  application.GetScene().Remove( pushButton );
+  application.GetScene().Remove(pushButton);
 
   rendererCount = pushButton.GetRendererCount();
-  tet_printf("After removing pushbutton from stage the renderer count is(%d)\n ", rendererCount );
+  tet_printf("After removing pushbutton from stage the renderer count is(%d)\n ", rendererCount);
 
-  DALI_TEST_EQUALS( pushButton.GetRendererCount(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetRendererCount(), 0, TEST_LOCATION);
 
-  tet_printf("After removing pushbutton from stage the renderer count is(%d)\n ", rendererCount );
+  tet_printf("After removing pushbutton from stage the renderer count is(%d)\n ", rendererCount);
 
   Property::Map propertyMap2;
-  propertyMap2.Insert(Visual::Property::TYPE,  Visual::COLOR);
+  propertyMap2.Insert(Visual::Property::TYPE, Visual::COLOR);
   propertyMap2.Insert(ColorVisual::Property::MIX_COLOR, Color::RED);
-  pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap2 );
+  pushButton.SetProperty(Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap2);
 
   tet_printf("Added UNSELECTED_VISUAL and add button back to Stage\n");
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
 
-  tet_printf("With UNSELECTED_BACKGROUND_VISUAL and UNSELECTED_VISUAL the renderer count is(%d)\n", pushButton.GetRendererCount() );
+  tet_printf("With UNSELECTED_BACKGROUND_VISUAL and UNSELECTED_VISUAL the renderer count is(%d)\n", pushButton.GetRendererCount());
 
-  DALI_TEST_EQUALS( pushButton.GetRendererCount(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetRendererCount(), 2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1136,37 +1132,37 @@ int UtcDaliPushButtonSetSelectedVisualN(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+  pushButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  pushButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  pushButton.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
   application.SendNotification();
   application.Render(0);
 
   unsigned int preRendererCount = pushButton.GetRendererCount();
-  tet_printf("RendererCount prior to adding visual(%d)\n",preRendererCount);
-  DALI_TEST_EQUALS( preRendererCount, 0, TEST_LOCATION );
+  tet_printf("RendererCount prior to adding visual(%d)\n", preRendererCount);
+  DALI_TEST_EQUALS(preRendererCount, 0, TEST_LOCATION);
 
-  application.GetScene().Remove( pushButton );
+  application.GetScene().Remove(pushButton);
   application.SendNotification();
   application.Render(0);
 
   Property::Map colorMap;
-  const int BROKEN_VISUAL_TYPE = 999999999;
+  const int     BROKEN_VISUAL_TYPE = 999999999;
 
-  colorMap.Insert(Visual::Property::TYPE,  BROKEN_VISUAL_TYPE);
-  colorMap.Insert(BorderVisual::Property::COLOR,  Color::BLUE);
-  colorMap.Insert(BorderVisual::Property::SIZE,  5.f);
-  pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, colorMap );
+  colorMap.Insert(Visual::Property::TYPE, BROKEN_VISUAL_TYPE);
+  colorMap.Insert(BorderVisual::Property::COLOR, Color::BLUE);
+  colorMap.Insert(BorderVisual::Property::SIZE, 5.f);
+  pushButton.SetProperty(Toolkit::Button::Property::UNSELECTED_VISUAL, colorMap);
 
-  application.GetScene().Add( pushButton );
+  application.GetScene().Add(pushButton);
   application.SendNotification();
   application.Render(0);
 
-  unsigned int postRendererCount  = pushButton.GetRendererCount();
+  unsigned int postRendererCount = pushButton.GetRendererCount();
   tet_printf("RendererCount post broken visual (%d)\n", postRendererCount);
-  DALI_TEST_EQUALS( postRendererCount, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(postRendererCount, 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1177,30 +1173,30 @@ int UtcDaliPushButtonToggleSignalP(void)
   tet_infoline(" UtcDaliButtonToggleSignalP Ensure Signals emitted");
 
   PushButton button = PushButton::New();
-  button.SetProperty( Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
 
-  SetupButtonForTestTouchEvents( application, button, true );
+  SetupButtonForTestTouchEvents(application, button, true);
 
-  application.GetScene().Add( button );
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
   // connect to its signal
-  button.ClickedSignal().Connect( &PushButtonClicked );
+  button.ClickedSignal().Connect(&PushButtonClicked);
   gPushButtonClicked = false;
 
   tet_infoline(" Touch down and up within button");
   Dali::Integration::TouchEvent event;
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_EQUALS( gPushButtonClicked, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPushButtonClicked, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1214,17 +1210,17 @@ int UtcDaliPushButtonSetGetAutoRepeating(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::AUTO_REPEATING), true, TEST_LOCATION);
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, false );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::AUTO_REPEATING), false, TEST_LOCATION);
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::AUTO_REPEATING), true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1235,17 +1231,17 @@ int UtcDaliPushButtonSetGetTogglableButton(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Button::Property::TOGGLABLE, true );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
 
-  pushButton.SetProperty( Button::Property::TOGGLABLE, false );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
 
-  pushButton.SetProperty( Button::Property::TOGGLABLE, true );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1256,17 +1252,17 @@ int UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
-  pushButton.SetProperty( Button::Property::TOGGLABLE, true);
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
+  pushButton.SetProperty(Button::Property::TOGGLABLE, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::AUTO_REPEATING), false, TEST_LOCATION);
 
-  pushButton.SetProperty( Button::Property::TOGGLABLE, true);
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, true);
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::TOGGLABLE ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::AUTO_REPEATING), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1278,24 +1274,24 @@ int UtcDaliPushButtonSetGetSelected01(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Button::Property::TOGGLABLE, true);
-  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, true);
+  pushButton.StateChangedSignal().Connect(&PushButtonSelected);
 
   gPushButtonSelectedState = false;
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, false );
+  pushButton.SetProperty(Button::Property::SELECTED, false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), false, TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), true, TEST_LOCATION );
-  DALI_TEST_CHECK( gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), true, TEST_LOCATION);
+  DALI_TEST_CHECK(gPushButtonSelectedState);
   END_TEST;
 }
 
@@ -1307,25 +1303,25 @@ int UtcDaliPushButtonSetGetSelected02(void)
   PushButton pushButton = PushButton::New();
 
   tet_infoline(" Set Toggle feature off");
-  pushButton.SetProperty( Button::Property::TOGGLABLE, false);
-  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
+  pushButton.SetProperty(Button::Property::TOGGLABLE, false);
+  pushButton.StateChangedSignal().Connect(&PushButtonSelected);
 
   gPushButtonSelectedState = false;
   tet_infoline(" Try to set to selected, expecting failure as not a toggle button");
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), false, TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, false );
+  pushButton.SetProperty(Button::Property::SELECTED, false);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED), false, TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
-  pushButton.SetProperty( Button::Property::SELECTED, true );
+  pushButton.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<bool>( Button::Property::SELECTED ), false, TEST_LOCATION );
-  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(Button::Property::SELECTED), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!gPushButtonSelectedState);
 
   END_TEST;
 }
@@ -1337,14 +1333,14 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues01(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, 1.f);
-  DALI_TEST_EQUALS( pushButton.GetProperty<float>( Button::Property::INITIAL_AUTO_REPEATING_DELAY ), 1.f, TEST_LOCATION );
+  pushButton.SetProperty(Button::Property::INITIAL_AUTO_REPEATING_DELAY, 1.f);
+  DALI_TEST_EQUALS(pushButton.GetProperty<float>(Button::Property::INITIAL_AUTO_REPEATING_DELAY), 1.f, TEST_LOCATION);
 
-  pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, 1.f);
+  pushButton.SetProperty(Button::Property::NEXT_AUTO_REPEATING_DELAY, 1.f);
 
-  DALI_TEST_EQUALS( pushButton.GetProperty<float>( Button::Property::NEXT_AUTO_REPEATING_DELAY ), 1.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(pushButton.GetProperty<float>(Button::Property::NEXT_AUTO_REPEATING_DELAY), 1.f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1355,34 +1351,34 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void)
 
   PushButton pushButton = PushButton::New();
 
-  bool assert1( false );
-  bool assert2( false );
+  bool assert1(false);
+  bool assert2(false);
 
-  pushButton.SetProperty( Button::Property::AUTO_REPEATING, true );
+  pushButton.SetProperty(Button::Property::AUTO_REPEATING, true);
 
   try
   {
-    pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, -1.f );
+    pushButton.SetProperty(Button::Property::INITIAL_AUTO_REPEATING_DELAY, -1.f);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
     assert1 = true;
   }
 
   try
   {
-    pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, -1.f );
+    pushButton.SetProperty(Button::Property::NEXT_AUTO_REPEATING_DELAY, -1.f);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
     assert2 = true;
   }
 
-  DALI_TEST_CHECK( assert1 && assert2 );
+  DALI_TEST_CHECK(assert1 && assert2);
   END_TEST;
 }
 
@@ -1391,21 +1387,19 @@ int UtcDaliPushButtonSetLabelText(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliPushButtonSetLabelText");
 
-  const std::string STR( "Hola!" );
+  const std::string STR("Hola!");
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty( Toolkit::Button::Property::LABEL,
-                          Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-                                         .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                        );
+  pushButton.SetProperty(Toolkit::Button::Property::LABEL,
+                         Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f));
 
   application.SendNotification();
   application.Render();
 
-  pushButton.SetProperty( Button::Property::LABEL, STR );
+  pushButton.SetProperty(Button::Property::LABEL, STR);
 
-  DALI_TEST_EQUALS(GetButtonText( pushButton ), STR, TEST_LOCATION);
+  DALI_TEST_EQUALS(GetButtonText(pushButton), STR, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
index 6062415..20d20e3 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,11 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -37,7 +36,6 @@ void dali_radio_button_cleanup(void)
 
 namespace
 {
-
 static bool gObjectCreatedCallBackCalled;
 
 static void TestCallback(BaseHandle handle)
@@ -45,24 +43,24 @@ static void TestCallback(BaseHandle handle)
   gObjectCreatedCallBackCalled = true;
 }
 
-static std::string GetButtonText( Button button )
+static std::string GetButtonText(Button button)
 {
-  Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+  Property::Value value = button.GetProperty(Toolkit::Button::Property::LABEL);
 
-  Property::Map *labelProperty = value.GetMap();
+  Property::Map* labelProperty = value.GetMap();
 
   std::string textLabel;
 
-  if ( labelProperty )
+  if(labelProperty)
   {
-    Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
-    value->Get( textLabel );
+    Property::Value* value = labelProperty->Find(Toolkit::TextVisual::Property::TEXT);
+    value->Get(textLabel);
   }
 
   return textLabel;
 }
 
-}
+} // namespace
 
 int UtcDaliRadioButtonConstructorP(void)
 {
@@ -70,7 +68,7 @@ int UtcDaliRadioButtonConstructorP(void)
 
   RadioButton button;
 
-  DALI_TEST_CHECK( !button );
+  DALI_TEST_CHECK(!button);
   END_TEST;
 }
 
@@ -81,8 +79,8 @@ int UtcDaliRadioButtonCopyConstructorP(void)
   // Initialize an object, ref count == 1
   RadioButton button = RadioButton::New();
 
-  RadioButton copy( button );
-  DALI_TEST_CHECK( copy );
+  RadioButton copy(button);
+  DALI_TEST_CHECK(copy);
   END_TEST;
 }
 
@@ -91,16 +89,16 @@ int UtcDaliRadioButtonMoveConstructor(void)
   ToolkitTestApplication application;
 
   RadioButton button = RadioButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, false );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, false);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
 
-  RadioButton moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  RadioButton moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -111,10 +109,10 @@ int UtcDaliRadioButtonAssignmentOperatorP(void)
 
   RadioButton button = RadioButton::New();
 
-  RadioButton copy( button );
-  DALI_TEST_CHECK( copy );
+  RadioButton copy(button);
+  DALI_TEST_CHECK(copy);
 
-  DALI_TEST_CHECK( button == copy );
+  DALI_TEST_CHECK(button == copy);
   END_TEST;
 }
 
@@ -123,17 +121,17 @@ int UtcDaliRadioButtonMoveAssignment(void)
   ToolkitTestApplication application;
 
   RadioButton button = RadioButton::New();
-  DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), true , TEST_LOCATION );
-  button.SetProperty( Button::Property::TOGGLABLE, false );
-  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, false);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
 
   RadioButton moved;
-  moved = std::move( button );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<bool>( Button::Property::TOGGLABLE ), false , TEST_LOCATION );
-  DALI_TEST_CHECK( !button );
+  moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
   END_TEST;
 }
@@ -146,26 +144,26 @@ int UtcDaliRadioButtonNewP(void)
   // Create the Slider actor
   RadioButton radioButton;
 
-  DALI_TEST_CHECK( !radioButton );
+  DALI_TEST_CHECK(!radioButton);
 
   radioButton = RadioButton::New();
 
-  DALI_TEST_CHECK( radioButton );
+  DALI_TEST_CHECK(radioButton);
 
   RadioButton radioButton2(radioButton);
 
-  DALI_TEST_CHECK( radioButton2 == radioButton );
+  DALI_TEST_CHECK(radioButton2 == radioButton);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     RadioButton radioButton = RadioButton::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -176,7 +174,7 @@ int UtcDaliRadioButtonDestructorP(void)
   RadioButton* radioButton = new RadioButton();
   delete radioButton;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -186,9 +184,9 @@ int UtcDaliRadioButtonDownCast(void)
 
   Handle handle = RadioButton::New();
 
-  RadioButton radioButton = RadioButton::DownCast( handle );
+  RadioButton radioButton = RadioButton::DownCast(handle);
 
-  DALI_TEST_CHECK( radioButton == handle );
+  DALI_TEST_CHECK(radioButton == handle);
   END_TEST;
 }
 
@@ -200,77 +198,74 @@ int UtcDaliRadioButtonLabelProperty(void)
 
   RadioButton radioButton = RadioButton::New();
 
-  radioButton.SetProperty( Toolkit::Button::Property::LABEL,
-                          Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
-                                         .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                        );
-
-  radioButton.SetProperty( Toolkit::Button::Property::LABEL, labelText );
-  DALI_TEST_EQUALS( GetButtonText( radioButton ), labelText, TEST_LOCATION );
+  radioButton.SetProperty(Toolkit::Button::Property::LABEL,
+                          Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f));
 
+  radioButton.SetProperty(Toolkit::Button::Property::LABEL, labelText);
+  DALI_TEST_EQUALS(GetButtonText(radioButton), labelText, TEST_LOCATION);
 
   std::string labelText2 = "test actor 2";
-  radioButton.SetProperty( Toolkit::Button::Property::LABEL, labelText2 );
+  radioButton.SetProperty(Toolkit::Button::Property::LABEL, labelText2);
 
-  DALI_TEST_EQUALS( GetButtonText( radioButton ), labelText2, TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(radioButton), labelText2, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliRadioButtonSelectedProperty(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliRadioButtonSelectedProperty");
 
   // Create the RadioButton actor
   RadioButton radioButton = RadioButton::New();
-  application.GetScene().Add( radioButton );
-  radioButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  radioButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  radioButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
+  application.GetScene().Add(radioButton);
+  radioButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  radioButton.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  radioButton.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
 
   // Default selected
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::Property::SELECTED ) == false );
+  DALI_TEST_CHECK(radioButton.GetProperty<bool>(Button::Property::SELECTED) == false);
 
   // Setting false selected
-  radioButton.SetProperty( Button::Property::SELECTED, false );
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::Property::SELECTED ) == false );
+  radioButton.SetProperty(Button::Property::SELECTED, false);
+  DALI_TEST_CHECK(radioButton.GetProperty<bool>(Button::Property::SELECTED) == false);
 
   // Setting true selected
-  radioButton.SetProperty( Button::Property::SELECTED, true );
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::Property::SELECTED ) == true );
+  radioButton.SetProperty(Button::Property::SELECTED, true);
+  DALI_TEST_CHECK(radioButton.GetProperty<bool>(Button::Property::SELECTED) == true);
 
   // Setting false again
-  radioButton.SetProperty( Button::Property::SELECTED, false );
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::Property::SELECTED ) == false );
+  radioButton.SetProperty(Button::Property::SELECTED, false);
+  DALI_TEST_CHECK(radioButton.GetProperty<bool>(Button::Property::SELECTED) == false);
 
   // Test selecting radio buttons
-  RadioButton radioButton2 = RadioButton::New( "label" );
-  radioButton2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  radioButton2.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  radioButton2.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
+  RadioButton radioButton2 = RadioButton::New("label");
+  radioButton2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  radioButton2.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  radioButton2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
 
-  RadioButton radioButton3 = RadioButton::New( "label" );
-  radioButton3.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  radioButton3.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  radioButton3.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 40.0f ));
+  RadioButton radioButton3 = RadioButton::New("label");
+  radioButton3.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  radioButton3.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  radioButton3.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 40.0f));
 
   Actor radioGroup = Actor::New();
-  application.GetScene().Add( radioGroup );
-  radioGroup.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  radioGroup.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  radioGroup.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-  radioGroup.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0 ) );
+  application.GetScene().Add(radioGroup);
+  radioGroup.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  radioGroup.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  radioGroup.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+  radioGroup.SetProperty(Actor::Property::SIZE, Vector2(400.0f, 400.0));
 
-  radioGroup.Add( radioButton2 );
-  radioGroup.Add( radioButton3 );
+  radioGroup.Add(radioButton2);
+  radioGroup.Add(radioButton3);
 
   application.SendNotification();
   application.Render();
 
   // Simulate touch events
-  DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::Property::SELECTED ) == false );
-  DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::Property::SELECTED ) == false );
+  DALI_TEST_CHECK(radioButton2.GetProperty<bool>(Button::Property::SELECTED) == false);
+  DALI_TEST_CHECK(radioButton3.GetProperty<bool>(Button::Property::SELECTED) == false);
 
   // Select first radio
   {
@@ -278,23 +273,23 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
     Dali::Integration::Point pointDown;
-    pointDown.SetState( PointState::DOWN );
-    pointDown.SetScreenPosition( Vector2( 1.0f, 1.0f ) );
+    pointDown.SetState(PointState::DOWN);
+    pointDown.SetScreenPosition(Vector2(1.0f, 1.0f));
 
-    Dali::Integration::Point pointUp( pointDown );
-    pointUp.SetState( PointState::UP );
+    Dali::Integration::Point pointUp(pointDown);
+    pointUp.SetState(PointState::UP);
 
-    event1.AddPoint( pointDown );
-    application.ProcessEvent( event1 );
+    event1.AddPoint(pointDown);
+    application.ProcessEvent(event1);
 
-    event2.AddPoint( pointUp );
-    application.ProcessEvent( event2 );
+    event2.AddPoint(pointUp);
+    application.ProcessEvent(event2);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::Property::SELECTED ) == true );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::Property::SELECTED ) == false );
+    DALI_TEST_CHECK(radioButton2.GetProperty<bool>(Button::Property::SELECTED) == true);
+    DALI_TEST_CHECK(radioButton3.GetProperty<bool>(Button::Property::SELECTED) == false);
   }
 
   // Select an already selected radio
@@ -303,23 +298,23 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
     Dali::Integration::Point pointDown;
-    pointDown.SetState( PointState::DOWN );
-    pointDown.SetScreenPosition( Vector2( 1.0f, 1.0f ) );
+    pointDown.SetState(PointState::DOWN);
+    pointDown.SetScreenPosition(Vector2(1.0f, 1.0f));
 
-    Dali::Integration::Point pointUp( pointDown );
-    pointUp.SetState( PointState::UP );
+    Dali::Integration::Point pointUp(pointDown);
+    pointUp.SetState(PointState::UP);
 
-    event1.AddPoint( pointDown );
-    application.ProcessEvent( event1 );
+    event1.AddPoint(pointDown);
+    application.ProcessEvent(event1);
 
-    event2.AddPoint( pointUp );
-    application.ProcessEvent( event2 );
+    event2.AddPoint(pointUp);
+    application.ProcessEvent(event2);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::Property::SELECTED ) == true );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::Property::SELECTED ) == false );
+    DALI_TEST_CHECK(radioButton2.GetProperty<bool>(Button::Property::SELECTED) == true);
+    DALI_TEST_CHECK(radioButton3.GetProperty<bool>(Button::Property::SELECTED) == false);
   }
 
   // Select second radio
@@ -328,23 +323,23 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
     Dali::Integration::Point pointDown;
-    pointDown.SetState( PointState::DOWN );
-    pointDown.SetScreenPosition( Vector2( 1.0f, 41.0f ) );
+    pointDown.SetState(PointState::DOWN);
+    pointDown.SetScreenPosition(Vector2(1.0f, 41.0f));
 
-    Dali::Integration::Point pointUp( pointDown );
-    pointUp.SetState( PointState::UP );
+    Dali::Integration::Point pointUp(pointDown);
+    pointUp.SetState(PointState::UP);
 
-    event1.AddPoint( pointDown );
-    application.ProcessEvent( event1 );
+    event1.AddPoint(pointDown);
+    application.ProcessEvent(event1);
 
-    event2.AddPoint( pointUp );
-    application.ProcessEvent( event2 );
+    event2.AddPoint(pointUp);
+    application.ProcessEvent(event2);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::Property::SELECTED ) == false );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::Property::SELECTED ) == true );
+    DALI_TEST_CHECK(radioButton2.GetProperty<bool>(Button::Property::SELECTED) == false);
+    DALI_TEST_CHECK(radioButton3.GetProperty<bool>(Button::Property::SELECTED) == true);
   }
 
   // Select outside radio group
@@ -353,23 +348,23 @@ int UtcDaliRadioButtonSelectedProperty(void)
     Dali::Integration::TouchEvent event2 = Dali::Integration::TouchEvent();
 
     Dali::Integration::Point pointDown;
-    pointDown.SetState( PointState::DOWN );
-    pointDown.SetScreenPosition( Vector2( 1.0f, 500.0f ) );
+    pointDown.SetState(PointState::DOWN);
+    pointDown.SetScreenPosition(Vector2(1.0f, 500.0f));
 
-    Dali::Integration::Point pointUp( pointDown );
-    pointUp.SetState( PointState::UP );
+    Dali::Integration::Point pointUp(pointDown);
+    pointUp.SetState(PointState::UP);
 
-    event1.AddPoint( pointDown );
-    application.ProcessEvent( event1 );
+    event1.AddPoint(pointDown);
+    application.ProcessEvent(event1);
 
-    event2.AddPoint( pointUp );
-    application.ProcessEvent( event2 );
+    event2.AddPoint(pointUp);
+    application.ProcessEvent(event2);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::Property::SELECTED ) == false );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::Property::SELECTED ) == true );
+    DALI_TEST_CHECK(radioButton2.GetProperty<bool>(Button::Property::SELECTED) == false);
+    DALI_TEST_CHECK(radioButton3.GetProperty<bool>(Button::Property::SELECTED) == true);
   }
 
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScaleTransition.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScaleTransition.cpp
old mode 100755
new mode 100644
index 5d2b40e..ed4790d
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScaleTransition.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScaleTransition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/actor-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/transition/transition-set.h>
-#include <dali-toolkit/public-api/transition/transition-base.h>
 #include <dali-toolkit/public-api/transition/scale-transition.h>
+#include <dali-toolkit/public-api/transition/transition-base.h>
+#include <dali-toolkit/public-api/transition/transition-set.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -88,7 +88,6 @@ int UtcDaliScaleTransitionSetGetProperty(void)
   DALI_TEST_EQUALS(0.5f, scaleFactor.x, TEST_LOCATION);
   DALI_TEST_EQUALS(0.5f, scaleFactor.y, TEST_LOCATION);
 
-
   scale.SetScaleFactor(Vector2(1.5f, 1.2f));
   scaleFactor = scale.GetScaleFactor();
   DALI_TEST_EQUALS(1.5f, scaleFactor.x, TEST_LOCATION);
@@ -124,7 +123,7 @@ int UtcDaliScaleTransitionWithOffScene(void)
   transitionSet.AddTransition(scale);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -187,7 +186,7 @@ int UtcDaliScaleTransitionDisappearing(void)
   transitionSet.AddTransition(scale);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -250,7 +249,7 @@ int UtcDaliScaleTransitionAppearing(void)
   transitionSet.AddTransition(scale);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp
index 2b058a0..72cd50e 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -36,7 +36,6 @@ void dali_scene_view_cleanup(void)
 
 namespace
 {
-
 /**
  * For the AnimatedCube.gltf and its Assets
  * Donated by Norbert Nopper for glTF testing.
@@ -50,7 +49,7 @@ const char* TEST_GLTF_FILE_NAME[] = {TEST_RESOURCE_DIR "/AnimatedCube.gltf",
  * These textures are based off version of Wave engine sample
  * Take from https://github.com/WaveEngine/Samples
  *
- * Copyright (c) 2016 Wave Coorporation
+ * Copyright (c) 2022 Wave Coorporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -70,9 +69,9 @@ const char* TEST_GLTF_FILE_NAME[] = {TEST_RESOURCE_DIR "/AnimatedCube.gltf",
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-const char* TEST_DIFFUSE_TEXTURE = TEST_RESOURCE_DIR "/forest_diffuse_cubemap.png";
+const char* TEST_DIFFUSE_TEXTURE  = TEST_RESOURCE_DIR "/forest_diffuse_cubemap.png";
 const char* TEST_SPECULAR_TEXTURE = TEST_RESOURCE_DIR "/forest_specular_cubemap.png";
-}
+} // namespace
 
 int UtcDaliScene3dViewConstructorP(void)
 {
@@ -80,7 +79,7 @@ int UtcDaliScene3dViewConstructorP(void)
 
   Scene3dView scene3dView;
 
-  DALI_TEST_CHECK( !scene3dView );
+  DALI_TEST_CHECK(!scene3dView);
   END_TEST;
 }
 
@@ -89,10 +88,10 @@ int UtcDaliScene3dViewCopyConstructorP(void)
   ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
-  Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
+  Scene3dView scene3dView = Scene3dView::New(TEST_GLTF_FILE_NAME[0]);
 
-  Scene3dView copy( scene3dView );
-  DALI_TEST_CHECK( copy );
+  Scene3dView copy(scene3dView);
+  DALI_TEST_CHECK(copy);
   END_TEST;
 }
 
@@ -101,10 +100,10 @@ int UtcDaliScene3dViewCopyConstructor2P(void)
   ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
-  Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0], TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE, Vector4::ONE );
+  Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::New(TEST_GLTF_FILE_NAME[0], TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE, Vector4::ONE);
 
-  Scene3dView copy( scene3dView );
-  DALI_TEST_CHECK( copy );
+  Scene3dView copy(scene3dView);
+  DALI_TEST_CHECK(copy);
   END_TEST;
 }
 
@@ -112,12 +111,12 @@ int UtcDaliScene3dViewAssignmentOperatorP(void)
 {
   ToolkitTestApplication application;
 
-  Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
+  Scene3dView scene3dView = Scene3dView::New(TEST_GLTF_FILE_NAME[0]);
 
-  Scene3dView copy( scene3dView );
-  DALI_TEST_CHECK( copy );
+  Scene3dView copy(scene3dView);
+  DALI_TEST_CHECK(copy);
 
-  DALI_TEST_CHECK( scene3dView == copy );
+  DALI_TEST_CHECK(scene3dView == copy);
   END_TEST;
 }
 
@@ -128,10 +127,10 @@ int UtcDaliScene3dViewNewP(void)
 
   // Create the Slider actor
   Scene3dView scene3dView;
-  DALI_TEST_CHECK( !scene3dView );
+  DALI_TEST_CHECK(!scene3dView);
 
-  scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
-  DALI_TEST_CHECK( scene3dView );
+  scene3dView = Scene3dView::New(TEST_GLTF_FILE_NAME[0]);
+  DALI_TEST_CHECK(scene3dView);
 
   END_TEST;
 }
@@ -143,7 +142,7 @@ int UtcDaliScene3dViewDestructorP(void)
   Scene3dView* scene3dView = new Scene3dView();
   delete scene3dView;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -152,13 +151,13 @@ int UtcDaliScene3dViewDownCast(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewDownCast");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
-  BaseHandle handle(view);
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New(TEST_GLTF_FILE_NAME[0]);
+  BaseHandle           handle(view);
 
-  Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( scene3dView );
-  DALI_TEST_CHECK( scene3dView == view );
+  Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(scene3dView);
+  DALI_TEST_CHECK(scene3dView == view);
   END_TEST;
 }
 
@@ -167,12 +166,12 @@ int UtcDaliScene3dViewSetLight(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewSetLight");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New(TEST_GLTF_FILE_NAME[0]);
 
-  bool lightSet = view.SetLight( Scene3dView::LightType::DIRECTIONAL_LIGHT, Vector3( 1.0, 1.0, -1.0 ), Vector3( 0.3, 0.3, 0.3 ) );
-  DALI_TEST_CHECK( lightSet );
-  bool lightSet2 = view.SetLight( Scene3dView::LightType::POINT_LIGHT, Vector3( 1.0, 1.0, -1.0 ), Vector3( 0.3, 0.3, 0.3 ) );
-  DALI_TEST_CHECK( lightSet2 );
+  bool lightSet = view.SetLight(Scene3dView::LightType::DIRECTIONAL_LIGHT, Vector3(1.0, 1.0, -1.0), Vector3(0.3, 0.3, 0.3));
+  DALI_TEST_CHECK(lightSet);
+  bool lightSet2 = view.SetLight(Scene3dView::LightType::POINT_LIGHT, Vector3(1.0, 1.0, -1.0), Vector3(0.3, 0.3, 0.3));
+  DALI_TEST_CHECK(lightSet2);
 
   END_TEST;
 }
@@ -182,19 +181,19 @@ int UtcDaliScene3dViewGetCamera(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewGetCamera");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New(TEST_GLTF_FILE_NAME[0]);
 
   CameraActor camera = view.GetDefaultCamera();
-  DALI_TEST_CHECK( camera );
+  DALI_TEST_CHECK(camera);
 
-  CameraActor camera2 = view.GetCamera( -1 );
-  DALI_TEST_CHECK( !camera2 );
+  CameraActor camera2 = view.GetCamera(-1);
+  DALI_TEST_CHECK(!camera2);
 
-  CameraActor camera3 = view.GetCamera( 0 );
-  DALI_TEST_CHECK( camera3 );
+  CameraActor camera3 = view.GetCamera(0);
+  DALI_TEST_CHECK(camera3);
 
-  CameraActor camera4 = view.GetCamera( view.GetCameraCount() - 1 );
-  DALI_TEST_CHECK( camera4 );
+  CameraActor camera4 = view.GetCamera(view.GetCameraCount() - 1);
+  DALI_TEST_CHECK(camera4);
 
   END_TEST;
 }
@@ -204,12 +203,12 @@ int UtcDaliScene3dViewAnimations(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewAnimations");
 
-  for( auto filename : TEST_GLTF_FILE_NAME )
+  for(auto filename : TEST_GLTF_FILE_NAME)
   {
-    Toolkit::Scene3dView view = Toolkit::Scene3dView::New( filename );
+    Toolkit::Scene3dView view = Toolkit::Scene3dView::New(filename);
 
     bool playAnimation = view.PlayAnimations();
-    DALI_TEST_CHECK( playAnimation );
+    DALI_TEST_CHECK(playAnimation);
   }
 
   END_TEST;
@@ -220,15 +219,15 @@ int UtcDaliScene3dViewAnimations2(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliScene3dViewAnimations2");
 
-  Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] );
+  Toolkit::Scene3dView view = Toolkit::Scene3dView::New(TEST_GLTF_FILE_NAME[0]);
 
-  bool animated = true;
+  bool         animated       = true;
   unsigned int animationCount = view.GetAnimationCount();
-  for( unsigned int i = 0; i < animationCount; ++i )
+  for(unsigned int i = 0; i < animationCount; ++i)
   {
-    animated = ( animated && view.PlayAnimation( i ) );
+    animated = (animated && view.PlayAnimation(i));
   }
-  DALI_TEST_CHECK( animated );
+  DALI_TEST_CHECK(animated);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
index c287c5e..c5ebbd9 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,16 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 #include <string>
+
 #include <dali-toolkit-test-suite-utils.h>
 #include "dali-toolkit-test-utils/toolkit-timer.h"
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/actor-devel.h>
 #include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
+#include <dali/devel-api/actors/actor-devel.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -39,8 +41,7 @@ void dali_scrollbar_cleanup(void)
 
 namespace
 {
-
-const int RENDER_FRAME_INTERVAL = 16;                       ///< Duration of each frame in ms. (at approx 60FPS)
+const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
 
 /*
  * Simulate time passed by.
@@ -55,7 +56,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -68,7 +69,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 // Callback probes.
 
 static bool gOnPanFinishedCalled;                         ///< Whether the PanFinished signal was invoked.
-static bool gOnScrollPositionIntervalReachedSignalCalled;        ///< Whether the ScrollPositionIntervalReached signal was invoked.
+static bool gOnScrollPositionIntervalReachedSignalCalled; ///< Whether the ScrollPositionIntervalReached signal was invoked.
 
 /**
  * Invoked when pan gesture is finished on the scroll indicator.
@@ -81,7 +82,7 @@ static void OnPanFinished()
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -98,7 +99,7 @@ struct CallbackFunctor
  *
  * @param[in] position The current scroll position.
  */
-static void OnScrollPositionIntervalReached( float position )
+static void OnScrollPositionIntervalReached(float position)
 {
   gOnScrollPositionIntervalReachedSignalCalled = true;
 }
@@ -108,10 +109,10 @@ static Vector2 PerformGestureSwipe(ToolkitTestApplication& application, Vector2
   gOnPanFinishedCalled = false;
 
   // Now do a pan starting from (start) and heading (direction)
-  Vector2 pos( start + ( direction * 15 ) );
+  Vector2  pos(start + (direction * 15));
   uint32_t time = start_time;
 
-  TestStartPan( application, start, pos, time );
+  TestStartPan(application, start, pos, time);
 
   Wait(application);
 
@@ -121,13 +122,13 @@ static Vector2 PerformGestureSwipe(ToolkitTestApplication& application, Vector2
 
     pos += direction; // Move in this direction
     time += RENDER_FRAME_INTERVAL;
-    TestMovePan( application, pos, time);
+    TestMovePan(application, pos, time);
     Wait(application);
   }
 
   pos += direction; // Move in this direction.
   time += RENDER_FRAME_INTERVAL;
-  TestEndPan(application, pos, time );
+  TestEndPan(application, pos, time);
   Wait(application);
 
   return pos;
@@ -140,7 +141,7 @@ int UtcDaliToolkitScrollBarConstructorP(void)
   ToolkitTestApplication application;
 
   ScrollBar scrollBar;
-  DALI_TEST_CHECK( !scrollBar );
+  DALI_TEST_CHECK(!scrollBar);
   END_TEST;
 }
 
@@ -149,11 +150,11 @@ int UtcDaliToolkitScrollBarCopyConstructorP(void)
   ToolkitTestApplication application;
 
   ScrollBar scrollBar = ScrollBar::New();
-  scrollBar.SetProperty( ScrollBar::Property::INDICATOR_FIXED_HEIGHT, 38.2f );
+  scrollBar.SetProperty(ScrollBar::Property::INDICATOR_FIXED_HEIGHT, 38.2f);
 
-  ScrollBar copy( scrollBar );
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<float>( ScrollBar::Property::INDICATOR_FIXED_HEIGHT ) == scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_FIXED_HEIGHT ) );
+  ScrollBar copy(scrollBar);
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<float>(ScrollBar::Property::INDICATOR_FIXED_HEIGHT) == scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_FIXED_HEIGHT));
   END_TEST;
 }
 
@@ -162,11 +163,11 @@ int UtcDaliToolkitScrollBarAssignmentOperatorP(void)
   ToolkitTestApplication application;
 
   ScrollBar scrollBar = ScrollBar::New();
-  scrollBar.SetProperty( ScrollBar::Property::INDICATOR_FIXED_HEIGHT, 38.2f );
+  scrollBar.SetProperty(ScrollBar::Property::INDICATOR_FIXED_HEIGHT, 38.2f);
 
   ScrollBar copy = scrollBar;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<float>( ScrollBar::Property::INDICATOR_FIXED_HEIGHT ) == scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_FIXED_HEIGHT ) );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<float>(ScrollBar::Property::INDICATOR_FIXED_HEIGHT) == scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_FIXED_HEIGHT));
   END_TEST;
 }
 
@@ -177,7 +178,7 @@ int UtcDaliScrollBarDestructorP(void)
   ScrollBar* scrollBar = new ScrollBar();
   delete scrollBar;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -186,23 +187,23 @@ int UtcDaliToolkitScrollBarNewP(void)
   ToolkitTestApplication application;
 
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
   END_TEST;
 
   ScrollBar vertical = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( vertical );
-  DALI_TEST_CHECK( vertical.GetScrollDirection() == ScrollBar::VERTICAL );
+  DALI_TEST_CHECK(vertical);
+  DALI_TEST_CHECK(vertical.GetScrollDirection() == ScrollBar::VERTICAL);
 
-  Property::Value value = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION);
-  std::string scrollDirection = value.Get<std::string>();
-  DALI_TEST_EQUALS( scrollDirection, "VERTICAL", TEST_LOCATION );
+  Property::Value value           = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION);
+  std::string     scrollDirection = value.Get<std::string>();
+  DALI_TEST_EQUALS(scrollDirection, "VERTICAL", TEST_LOCATION);
 
   ScrollBar horizontal = ScrollBar::New(ScrollBar::HORIZONTAL);
-  DALI_TEST_CHECK( horizontal );
-  DALI_TEST_CHECK( horizontal.GetScrollDirection() == ScrollBar::HORIZONTAL );
-  value = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION);
+  DALI_TEST_CHECK(horizontal);
+  DALI_TEST_CHECK(horizontal.GetScrollDirection() == ScrollBar::HORIZONTAL);
+  value           = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION);
   scrollDirection = value.Get<std::string>();
-  DALI_TEST_EQUALS( scrollDirection, "HORIZONTAL", TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollDirection, "HORIZONTAL", TEST_LOCATION);
 
   END_TEST;
 }
@@ -212,28 +213,28 @@ int UtcDaliToolkitScrollBarCreateP(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "ScrollBar" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("ScrollBar");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  ScrollBar scrollBar = ScrollBar::DownCast( handle );
-  DALI_TEST_CHECK( scrollBar );
+  ScrollBar scrollBar = ScrollBar::DownCast(handle);
+  DALI_TEST_CHECK(scrollBar);
 
   scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "VERTICAL");
   scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "FIXED");
 
-  DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::VERTICAL, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetScrollDirection(), Toolkit::ScrollBar::VERTICAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION);
 
   scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "HORIZONTAL");
   scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "VARIABLE");
 
-  DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::HORIZONTAL, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetScrollDirection(), Toolkit::ScrollBar::HORIZONTAL, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -242,14 +243,14 @@ int UtcDaliToolkitScrollBarDownCastP(void)
 {
   ToolkitTestApplication application;
 
-  ScrollBar scrollBar1 = ScrollBar::New();
-  BaseHandle object( scrollBar1 );
+  ScrollBar  scrollBar1 = ScrollBar::New();
+  BaseHandle object(scrollBar1);
 
-  ScrollBar scrollBar2 = ScrollBar::DownCast( object );
-  DALI_TEST_CHECK( scrollBar2 );
+  ScrollBar scrollBar2 = ScrollBar::DownCast(object);
+  DALI_TEST_CHECK(scrollBar2);
 
-  ScrollBar scrollBar3 = DownCast< ScrollBar >( object );
-  DALI_TEST_CHECK( scrollBar3 );
+  ScrollBar scrollBar3 = DownCast<ScrollBar>(object);
+  DALI_TEST_CHECK(scrollBar3);
   END_TEST;
 }
 
@@ -258,11 +259,11 @@ int UtcDaliToolkitScrollBarDownCastN(void)
   ToolkitTestApplication application;
 
   BaseHandle uninitializedObject;
-  ScrollBar scrollBar1 = ScrollBar::DownCast( uninitializedObject );
-  DALI_TEST_CHECK( !scrollBar1 );
+  ScrollBar  scrollBar1 = ScrollBar::DownCast(uninitializedObject);
+  DALI_TEST_CHECK(!scrollBar1);
 
-  ScrollBar scrollBar2 = DownCast< ScrollBar >( uninitializedObject );
-  DALI_TEST_CHECK( !scrollBar2 );
+  ScrollBar scrollBar2 = DownCast<ScrollBar>(uninitializedObject);
+  DALI_TEST_CHECK(!scrollBar2);
   END_TEST;
 }
 
@@ -272,27 +273,27 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
-  DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::VERTICAL );
+  DALI_TEST_CHECK(scrollBar);
+  DALI_TEST_CHECK(scrollBar.GetScrollDirection() == ScrollBar::VERTICAL);
 
   float scrollBarHeight = 100.0f;
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f) );
-  application.GetScene().Add( scrollBar );
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f));
+  application.GetScene().Add(scrollBar);
 
   // Create a source actor that owns the scroll properties required by the scroll bar
   Actor sourceActor = Actor::New();
-  application.GetScene().Add( sourceActor );
+  application.GetScene().Add(sourceActor);
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
+  Property::Index propertyScrollPosition    = sourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty("sourcePositionMax", 100.0f);
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty("sourceContentSize", 500.0f);
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePosition"), propertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMin"), propertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMax"), propertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourceContentSize"), propertyScrollContentSize, TEST_LOCATION);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -302,75 +303,75 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void)
   application.Render();
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Check that the indicator size should be: scroll bar size * (scroll bar size / content size).
   // i.e. The bigger the content size, the smaller the indicator size
-  float indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y;
-  DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION );
+  float indicatorHeight = indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y;
+  DALI_TEST_EQUALS(indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION);
 
   // Decrease the content length
-  sourceActor.SetProperty( propertyScrollContentSize, 250.0f );
+  sourceActor.SetProperty(propertyScrollContentSize, 250.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator size is changed accordingly
-  indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y;
-  DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 250.0f, TEST_LOCATION );
+  indicatorHeight = indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y;
+  DALI_TEST_EQUALS(indicatorHeight, scrollBarHeight * scrollBarHeight / 250.0f, TEST_LOCATION);
 
   // As scroll position is 0, check that the indicator position should be 0.0f.
-  float indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y;
-  DALI_TEST_EQUALS( indicatorPosition, 0.0f, TEST_LOCATION );
+  float indicatorPosition = indicator.GetCurrentProperty<Vector3>(Actor::Property::POSITION).y;
+  DALI_TEST_EQUALS(indicatorPosition, 0.0f, TEST_LOCATION);
 
   // Set the scroll position to the middle
-  sourceActor.SetProperty( propertyScrollPosition, -50.0f );
+  sourceActor.SetProperty(propertyScrollPosition, -50.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator should be in the middle of the scroll bar
-  indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y;
-  DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION );
+  indicatorPosition = indicator.GetCurrentProperty<Vector3>(Actor::Property::POSITION).y;
+  DALI_TEST_EQUALS(indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION);
 
   // Set the scroll position to the maximum
-  sourceActor.SetProperty( propertyScrollPosition, -100.0f );
+  sourceActor.SetProperty(propertyScrollPosition, -100.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator should be in the end of the scroll bar
-  indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y;
-  DALI_TEST_EQUALS( indicatorPosition, scrollBarHeight - indicatorHeight, TEST_LOCATION );
+  indicatorPosition = indicator.GetCurrentProperty<Vector3>(Actor::Property::POSITION).y;
+  DALI_TEST_EQUALS(indicatorPosition, scrollBarHeight - indicatorHeight, TEST_LOCATION);
 
   // Increase the maximum scroll position to double
-  sourceActor.SetProperty( propertyMaxScrollPosition, 200.0f );
+  sourceActor.SetProperty(propertyMaxScrollPosition, 200.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator should be now in the middle of the scroll bar
-  indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y;
-  DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION );
+  indicatorPosition = indicator.GetCurrentProperty<Vector3>(Actor::Property::POSITION).y;
+  DALI_TEST_EQUALS(indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION);
 
   // Create another source actor
   Actor newSourceActor = Actor::New();
-  application.GetScene().Add( newSourceActor );
+  application.GetScene().Add(newSourceActor);
 
   // Register the scroll properties
-  Property::Index newPropertyScrollPosition = newSourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index newPropertyMinScrollPosition = newSourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index newPropertyMaxScrollPosition = newSourceActor.RegisterProperty( "sourcePositionMax",   200.0f );
-  Property::Index newPropertyScrollContentSize = newSourceActor.RegisterProperty( "sourceContentSize",   400.0f );
+  Property::Index newPropertyScrollPosition    = newSourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index newPropertyMinScrollPosition = newSourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index newPropertyMaxScrollPosition = newSourceActor.RegisterProperty("sourcePositionMax", 200.0f);
+  Property::Index newPropertyScrollContentSize = newSourceActor.RegisterProperty("sourceContentSize", 400.0f);
 
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourcePosition" ), newPropertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourcePositionMin" ), newPropertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourcePositionMax" ), newPropertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourceContentSize" ), newPropertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(newSourceActor.GetPropertyIndex("sourcePosition"), newPropertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(newSourceActor.GetPropertyIndex("sourcePositionMin"), newPropertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(newSourceActor.GetPropertyIndex("sourcePositionMax"), newPropertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(newSourceActor.GetPropertyIndex("sourceContentSize"), newPropertyScrollContentSize, TEST_LOCATION);
 
   // Change the source of the scroll position properties to be the new source actor.
   scrollBar.SetScrollPropertySource(newSourceActor, newPropertyScrollPosition, newPropertyMinScrollPosition, newPropertyMaxScrollPosition, newPropertyScrollContentSize);
@@ -380,23 +381,23 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void)
   application.Render();
 
   // Check that the indicator size is changed accordingly
-  indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y;
-  DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 400.0f, TEST_LOCATION );
+  indicatorHeight = indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y;
+  DALI_TEST_EQUALS(indicatorHeight, scrollBarHeight * scrollBarHeight / 400.0f, TEST_LOCATION);
 
   // Check that the indicator position goes back to the beginning of the scroll bar
-  indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y;
-  DALI_TEST_EQUALS( indicatorPosition, 0.0f, TEST_LOCATION );
+  indicatorPosition = indicator.GetCurrentProperty<Vector3>(Actor::Property::POSITION).y;
+  DALI_TEST_EQUALS(indicatorPosition, 0.0f, TEST_LOCATION);
 
   // Set the scroll position to one fifth of the maximum
-  newSourceActor.SetProperty( propertyScrollPosition, -40.0f );
+  newSourceActor.SetProperty(propertyScrollPosition, -40.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator should be in one fifth from the beginning of the scroll bar
-  indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y;
-  DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.2f, TEST_LOCATION );
+  indicatorPosition = indicator.GetCurrentProperty<Vector3>(Actor::Property::POSITION).y;
+  DALI_TEST_EQUALS(indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.2f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -407,13 +408,13 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceN(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   // Set empty handle of source object and invalid source property index.
   Actor sourceActor;
   scrollBar.SetScrollPropertySource(sourceActor, Property::INVALID_INDEX, Property::INVALID_INDEX, Property::INVALID_INDEX, Property::INVALID_INDEX);
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -423,24 +424,24 @@ int UtcDaliToolkitScrollBarSetScrollIndicatorP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Set a new indicator
   Actor newIndicator = Actor::New();
   scrollBar.SetScrollIndicator(newIndicator);
 
   // Check that the new indicator is successfully set
-  DALI_TEST_CHECK( indicator != scrollBar.GetScrollIndicator() );
-  DALI_TEST_CHECK( newIndicator == scrollBar.GetScrollIndicator() );
+  DALI_TEST_CHECK(indicator != scrollBar.GetScrollIndicator());
+  DALI_TEST_CHECK(newIndicator == scrollBar.GetScrollIndicator());
 
   // Check that the new control indicator is successfully set
   Control controlIndicator = Control::New();
   scrollBar.SetScrollIndicator(controlIndicator);
 
-  DALI_TEST_CHECK( controlIndicator == Control::DownCast( scrollBar.GetScrollIndicator() ) );
+  DALI_TEST_CHECK(controlIndicator == Control::DownCast(scrollBar.GetScrollIndicator()));
   END_TEST;
 }
 
@@ -450,18 +451,18 @@ int UtcDaliToolkitScrollBarSetScrollIndicatorN(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Try to set an uninitialized actor as the indicator
   Actor uninitializedIndicator;
   scrollBar.SetScrollIndicator(uninitializedIndicator);
 
   // Check that the uninitialized actor can not be set as the indicator
-  DALI_TEST_CHECK( indicator == scrollBar.GetScrollIndicator() );
-  DALI_TEST_CHECK( uninitializedIndicator != scrollBar.GetScrollIndicator() );
+  DALI_TEST_CHECK(indicator == scrollBar.GetScrollIndicator());
+  DALI_TEST_CHECK(uninitializedIndicator != scrollBar.GetScrollIndicator());
 
   END_TEST;
 }
@@ -472,19 +473,19 @@ int UtcDaliToolkitScrollBarGetScrollIndicatorP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Set a new indicator
   Actor newIndicator = Actor::New();
   scrollBar.SetScrollIndicator(newIndicator);
 
   // Check that the new indicator is successfully set
-  DALI_TEST_CHECK( scrollBar.GetScrollIndicator() );
-  DALI_TEST_CHECK( indicator != scrollBar.GetScrollIndicator() );
-  DALI_TEST_CHECK( newIndicator == scrollBar.GetScrollIndicator() );
+  DALI_TEST_CHECK(scrollBar.GetScrollIndicator());
+  DALI_TEST_CHECK(indicator != scrollBar.GetScrollIndicator());
+  DALI_TEST_CHECK(newIndicator == scrollBar.GetScrollIndicator());
 
   END_TEST;
 }
@@ -495,18 +496,18 @@ int UtcDaliToolkitScrollBarGetScrollIndicatorN(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Try to set an uninitialized actor as the indicator
   Actor uninitializedIndicator;
   scrollBar.SetScrollIndicator(uninitializedIndicator);
 
   // Check that the indicator has not been changed
-  DALI_TEST_CHECK( indicator == scrollBar.GetScrollIndicator() );
-  DALI_TEST_CHECK( uninitializedIndicator != scrollBar.GetScrollIndicator() );
+  DALI_TEST_CHECK(indicator == scrollBar.GetScrollIndicator());
+  DALI_TEST_CHECK(uninitializedIndicator != scrollBar.GetScrollIndicator());
 
   END_TEST;
 }
@@ -517,16 +518,16 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) );
+  scrollBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f));
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   // Connect to the ScrollPositionIntervalReached signal
-  scrollBar.ScrollPositionIntervalReachedSignal().Connect( &OnScrollPositionIntervalReached );
+  scrollBar.ScrollPositionIntervalReachedSignal().Connect(&OnScrollPositionIntervalReached);
 
   // Render and notify
   application.SendNotification();
@@ -534,18 +535,18 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void)
 
   // Create a source actor that owns the scroll properties required by the scroll bar
   Actor sourceActor = Actor::New();
-  application.GetScene().Add( sourceActor );
+  application.GetScene().Add(sourceActor);
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   800.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   2000.0f );
+  Property::Index propertyScrollPosition    = sourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty("sourcePositionMax", 800.0f);
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty("sourceContentSize", 2000.0f);
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePosition"), propertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMin"), propertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMax"), propertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourceContentSize"), propertyScrollContentSize, TEST_LOCATION);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -556,9 +557,9 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void)
 
   // Set the values to get notified when the scroll positions of the source actor goes above or below these values
   Dali::Vector<float> positionIntervals;
-  for( size_t i = 0; i != 10; ++i )
+  for(size_t i = 0; i != 10; ++i)
   {
-    positionIntervals.PushBack( -80.0f * i ); // should get notified for each 80 pixels
+    positionIntervals.PushBack(-80.0f * i); // should get notified for each 80 pixels
   }
   scrollBar.SetScrollPositionIntervals(positionIntervals);
 
@@ -566,31 +567,31 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void)
   Dali::Vector<float> results = scrollBar.GetScrollPositionIntervals();
 
   // Check that the result is the same as the list previously set.
-  DALI_TEST_EQUALS( positionIntervals.Count(), results.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[0], results[0], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[1], results[1], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[2], results[2], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[3], results[3], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[4], results[4], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[5], results[5], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[6], results[6], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[7], results[7], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[8], results[8], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[9], results[9], TEST_LOCATION );
+  DALI_TEST_EQUALS(positionIntervals.Count(), results.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[0], results[0], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[1], results[1], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[2], results[2], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[3], results[3], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[4], results[4], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[5], results[5], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[6], results[6], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[7], results[7], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[8], results[8], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[9], results[9], TEST_LOCATION);
 
   // Reset the flag
   gOnScrollPositionIntervalReachedSignalCalled = false;
 
   // Animate the scroll position to cross the specified value
   Animation animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -85.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -85.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION);
 
   // Reset the flag
   gOnScrollPositionIntervalReachedSignalCalled = false;
@@ -601,14 +602,14 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void)
 
   // Animate the scroll position to cross another specified value
   animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -170.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -170.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION);
 
   // Reset the flag
   gOnScrollPositionIntervalReachedSignalCalled = false;
@@ -619,14 +620,14 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void)
 
   // Animate the scroll position back to the previous value
   animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -85.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -85.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -637,13 +638,13 @@ int UtcDaliToolkitScrollBarGetScrollPositionIntervalsP(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   // Set the values to get notified when the scroll positions of the source actor goes above or below these values
   Dali::Vector<float> positionIntervals;
-  for( size_t i = 0; i != 10; ++i )
+  for(size_t i = 0; i != 10; ++i)
   {
-    positionIntervals.PushBack( -80.0f * i ); // should get notified for each 80 pixels
+    positionIntervals.PushBack(-80.0f * i); // should get notified for each 80 pixels
   }
   scrollBar.SetScrollPositionIntervals(positionIntervals);
 
@@ -651,31 +652,31 @@ int UtcDaliToolkitScrollBarGetScrollPositionIntervalsP(void)
   Dali::Vector<float> results = scrollBar.GetScrollPositionIntervals();
 
   // Check that the result is the same as the list previously set.
-  DALI_TEST_EQUALS( positionIntervals.Count(), results.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[0], results[0], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[1], results[1], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[2], results[2], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[3], results[3], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[4], results[4], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[5], results[5], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[6], results[6], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[7], results[7], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[8], results[8], TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[9], results[9], TEST_LOCATION );
+  DALI_TEST_EQUALS(positionIntervals.Count(), results.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[0], results[0], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[1], results[1], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[2], results[2], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[3], results[3], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[4], results[4], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[5], results[5], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[6], results[6], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[7], results[7], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[8], results[8], TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[9], results[9], TEST_LOCATION);
 
   Property::Array resultArray = scrollBar.GetProperty<Property::Array>(Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS);
 
-  DALI_TEST_EQUALS( positionIntervals.Count(), resultArray.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[0], resultArray[0].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[1], resultArray[1].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[2], resultArray[2].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[3], resultArray[3].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[4], resultArray[4].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[5], resultArray[5].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[6], resultArray[6].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[7], resultArray[7].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[8], resultArray[8].Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( positionIntervals[9], resultArray[9].Get<float>(), TEST_LOCATION );
+  DALI_TEST_EQUALS(positionIntervals.Count(), resultArray.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[0], resultArray[0].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[1], resultArray[1].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[2], resultArray[2].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[3], resultArray[3].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[4], resultArray[4].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[5], resultArray[5].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[6], resultArray[6].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[7], resultArray[7].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[8], resultArray[8].Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(positionIntervals[9], resultArray[9].Get<float>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -686,12 +687,12 @@ int UtcDaliToolkitScrollBarGetScrollDirectionP(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
-  DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::VERTICAL );
+  DALI_TEST_CHECK(scrollBar);
+  DALI_TEST_CHECK(scrollBar.GetScrollDirection() == ScrollBar::VERTICAL);
 
   // Change the direction of scroll bar to horizontal
   scrollBar.SetScrollDirection(ScrollBar::HORIZONTAL);
-  DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::HORIZONTAL );
+  DALI_TEST_CHECK(scrollBar.GetScrollDirection() == ScrollBar::HORIZONTAL);
 
   END_TEST;
 }
@@ -702,26 +703,26 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   float scrollBarHeight = 100.0f;
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f) );
-  application.GetScene().Add( scrollBar );
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f));
+  application.GetScene().Add(scrollBar);
 
   // Create a source actor that owns the scroll properties required by the scroll bar
   Actor sourceActor = Actor::New();
-  application.GetScene().Add( sourceActor );
+  application.GetScene().Add(sourceActor);
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
+  Property::Index propertyScrollPosition    = sourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty("sourcePositionMax", 100.0f);
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty("sourceContentSize", 500.0f);
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePosition"), propertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMin"), propertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMax"), propertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourceContentSize"), propertyScrollContentSize, TEST_LOCATION);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -731,40 +732,40 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void)
   application.Render();
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Check that the indicator size should be: scroll bar size * (scroll bar size / content size).
   // i.e. The bigger the content size, the smaller the indicator size
-  float indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y;
-  DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION );
+  float indicatorHeight = indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y;
+  DALI_TEST_EQUALS(indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION);
 
   // Set the indicator height to be fixed to 50.0f
   scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED);
   scrollBar.SetIndicatorFixedHeight(50.0f);
 
   Property::Value value = scrollBar.GetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY);
-  DALI_TEST_EQUALS(value.Get<std::string>(), "FIXED", TEST_LOCATION );
+  DALI_TEST_EQUALS(value.Get<std::string>(), "FIXED", TEST_LOCATION);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator size should be 50.0f
-  indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y;
-  DALI_TEST_EQUALS( indicatorHeight, 50.0f, TEST_LOCATION );
+  indicatorHeight = indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y;
+  DALI_TEST_EQUALS(indicatorHeight, 50.0f, TEST_LOCATION);
 
   // Set the indicator height to be variable
   scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE);
   value = scrollBar.GetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY);
-  DALI_TEST_EQUALS(value.Get<std::string>(), "VARIABLE", TEST_LOCATION );
+  DALI_TEST_EQUALS(value.Get<std::string>(), "VARIABLE", TEST_LOCATION);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator size should be: scroll bar size * (scroll bar size / content size).
-  indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y;
-  DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION );
+  indicatorHeight = indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y;
+  DALI_TEST_EQUALS(indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -775,15 +776,15 @@ int UtcDaliToolkitScrollBarGetIndicatorHeightPolicyP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   // Set the indicator height to be fixed
   scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION);
 
   // Set the indicator height to be variable
   scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -794,14 +795,14 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   float scrollBarHeight = 100.0f;
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f) );
-  application.GetScene().Add( scrollBar );
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f));
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Set the indicator height to be fixed to 50.0f
   scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED);
@@ -812,7 +813,7 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void)
   application.Render();
 
   // Check that the indicator size should be 50.0f
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y, 50.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y, 50.0f, TEST_LOCATION);
 
   // Set the indicator height to be fixed to 25.0f
   scrollBar.SetIndicatorFixedHeight(25.0f);
@@ -822,7 +823,7 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void)
   application.Render();
 
   // Check that the indicator size should be 25.0f
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y, 25.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<Vector3>(Actor::Property::SIZE).y, 25.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -833,19 +834,19 @@ int UtcDaliToolkitScrollBarGetIndicatorFixedHeightP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   // Set the fixed indicator height to be 50.0f
   scrollBar.SetIndicatorFixedHeight(50.0f);
 
   // Check that the indicator size should be 50.0f
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorFixedHeight(), 50.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorFixedHeight(), 50.0f, TEST_LOCATION);
 
   // Set the indicator height to be fixed to 25.0f
   scrollBar.SetIndicatorFixedHeight(25.0f);
 
   // Check that the indicator size should be 50.0f
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorFixedHeight(), 25.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorFixedHeight(), 25.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -856,26 +857,26 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Set the duration to show the indicator to be 0.35 second
   scrollBar.SetIndicatorShowDuration(0.35);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.35f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorShowDuration(), 0.35f, TEST_LOCATION);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Show the indicator
   scrollBar.ShowIndicator();
@@ -888,21 +889,21 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void)
   application.Render();
 
   // Check that the indicator is now visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Set the duration to show the indicator to be 0.75 second
   scrollBar.SetIndicatorShowDuration(0.75);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.75f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorShowDuration(), 0.75f, TEST_LOCATION);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Show the indicator
   scrollBar.ShowIndicator();
@@ -915,7 +916,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void)
   application.Render();
 
   // Check that the indicator is not fully visible yet
-  DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ) != 1.0f );
+  DALI_TEST_CHECK(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY) != 1.0f);
 
   // Wait for another 0.4 second
   Wait(application, 400);
@@ -925,7 +926,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void)
   application.Render();
 
   // Check that the indicator is now fully visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -936,28 +937,28 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to show the indicator
   float duration = scrollBar.GetIndicatorShowDuration();
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Show the indicator
   scrollBar.ShowIndicator();
@@ -970,21 +971,21 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void)
   application.Render();
 
   // Check that the indicator is now visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Now set the duration to show the indicator to be a negative value (which should be ignored and therefore means instant)
   scrollBar.SetIndicatorShowDuration(-0.25f);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), -0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorShowDuration(), -0.25f, TEST_LOCATION);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Show the indicator
   scrollBar.ShowIndicator();
@@ -994,7 +995,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void)
   application.Render();
 
   // Check that the indicator becomes instantly visible in the next frame
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1005,19 +1006,19 @@ int UtcDaliToolkitScrollBarGetIndicatorShowDurationP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   // Set the duration to show the indicator to be 0.35 second
   scrollBar.SetIndicatorShowDuration(0.35f);
 
   // Check that the duration to show the indicator is 0.35 second
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.35f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorShowDuration(), 0.35f, TEST_LOCATION);
 
   // Set the duration to show the indicator to be 0.75 second
   scrollBar.SetIndicatorShowDuration(0.75f);
 
   // Check that the duration to show the indicator is 0.75 second
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.75f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorShowDuration(), 0.75f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1028,26 +1029,26 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Set the duration to hide the indicator to be 0.15 second
   scrollBar.SetIndicatorHideDuration(0.15f);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.15f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHideDuration(), 0.15f, TEST_LOCATION);
 
   // Make the indicator visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Hide the indicator
   scrollBar.HideIndicator();
@@ -1060,21 +1061,21 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void)
   application.Render();
 
   // Check that the indicator is now invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Set the duration to hide the indicator to be 0.65 second
   scrollBar.SetIndicatorHideDuration(0.65f);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.65f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHideDuration(), 0.65f, TEST_LOCATION);
 
   // Make the indicator visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Hide the indicator
   scrollBar.HideIndicator();
@@ -1087,7 +1088,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void)
   application.Render();
 
   // Check that the indicator is not fully invisible yet
-  DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ) != 0.0f );
+  DALI_TEST_CHECK(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY) != 0.0f);
 
   // Wait for another 0.5 second
   Wait(application, 500);
@@ -1097,7 +1098,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void)
   application.Render();
 
   // Check that the indicator is now fully invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1108,28 +1109,28 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to hide the indicator
   float duration = scrollBar.GetIndicatorHideDuration();
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Hide the indicator
   scrollBar.HideIndicator();
@@ -1142,21 +1143,21 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void)
   application.Render();
 
   // Check that the indicator is now invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Now set the duration to hide the indicator to be a negative value (which should be ignored and therefore means instant)
   scrollBar.SetIndicatorHideDuration(-0.25f);
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), -0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHideDuration(), -0.25f, TEST_LOCATION);
 
   // Make the indicator visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Hide the indicator
   scrollBar.HideIndicator();
@@ -1166,7 +1167,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void)
   application.Render();
 
   // Check that the indicator becomes instantly invisible in the next frame
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1177,19 +1178,19 @@ int UtcDaliToolkitScrollBarGetIndicatorHideDurationP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
   // Set the duration to hide the indicator to be 0.15 second
   scrollBar.SetIndicatorHideDuration(0.15f);
 
   // Check that the duration to hide the indicator is 0.15 second
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.15f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHideDuration(), 0.15f, TEST_LOCATION);
 
   // Set the duration to hide the indicator to be 0.65 second
   scrollBar.SetIndicatorHideDuration(0.65f);
 
   // Check that the duration to hide the indicator is 0.65 second
-  DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.65f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollBar.GetIndicatorHideDuration(), 0.65f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1200,28 +1201,28 @@ int UtcDaliToolkitScrollBarShowIndicatorP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to show the indicator
   float duration = scrollBar.GetIndicatorShowDuration();
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Show the indicator
   scrollBar.ShowIndicator();
@@ -1234,7 +1235,7 @@ int UtcDaliToolkitScrollBarShowIndicatorP(void)
   application.Render();
 
   // Check that the indicator is now visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1245,28 +1246,28 @@ int UtcDaliToolkitScrollBarShowIndicatorN(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Make the indicator initially visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is initially visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Get the default duration to show the indicator
   float duration = scrollBar.GetIndicatorShowDuration();
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Show the indicator
   scrollBar.ShowIndicator();
@@ -1276,7 +1277,7 @@ int UtcDaliToolkitScrollBarShowIndicatorN(void)
   application.Render();
 
   // Check that the indicator is still visible in the very next frame
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1287,28 +1288,28 @@ int UtcDaliToolkitScrollBarHideIndicatorP(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to hide the indicator
   float duration = scrollBar.GetIndicatorHideDuration();
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Hide the indicator
   scrollBar.HideIndicator();
@@ -1321,7 +1322,7 @@ int UtcDaliToolkitScrollBarHideIndicatorP(void)
   application.Render();
 
   // Check that the indicator is now invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1332,28 +1333,28 @@ int UtcDaliToolkitScrollBarHideIndicatorN(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Make the indicator initially invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is initially invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Get the default duration to hide the indicator
   float duration = scrollBar.GetIndicatorHideDuration();
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Hide the indicator
   scrollBar.HideIndicator();
@@ -1363,7 +1364,7 @@ int UtcDaliToolkitScrollBarHideIndicatorN(void)
   application.Render();
 
   // Check that the indicator is still invisible in the very next frame
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1374,32 +1375,32 @@ int UtcDaliToolkitScrollBarActionShowIndicator(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to hide the indicator
-  float duration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_SHOW_DURATION );
+  float duration = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_SHOW_DURATION);
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Do the "ShowIndicator" action
   Property::Map emptyMap;
-  scrollBar.DoAction( "ShowIndicator", emptyMap );
+  scrollBar.DoAction("ShowIndicator", emptyMap);
 
   // Wait for the specified duration
   Wait(application, duration * 1000);
@@ -1409,7 +1410,7 @@ int UtcDaliToolkitScrollBarActionShowIndicator(void)
   application.Render();
 
   // Check that the indicator is now visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1420,32 +1421,32 @@ int UtcDaliToolkitScrollBarActionHideIndicator(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to hide the indicator
-  float duration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_HIDE_DURATION );
+  float duration = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_HIDE_DURATION);
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Do the "HideIndicator" action
   Property::Map emptyMap;
-  scrollBar.DoAction( "HideIndicator", emptyMap );
+  scrollBar.DoAction("HideIndicator", emptyMap);
 
   // Wait for the specified duration
   Wait(application, duration * 1000);
@@ -1455,7 +1456,7 @@ int UtcDaliToolkitScrollBarActionHideIndicator(void)
   application.Render();
 
   // Check that the indicator is now invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1466,32 +1467,32 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to hide the indicator
-  float duration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_SHOW_DURATION );
+  float duration = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_SHOW_DURATION);
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   // Do the "ShowIndicator" action
   Property::Map emptyMap;
-  scrollBar.DoAction( "ShowTransientIndicator", emptyMap );
+  scrollBar.DoAction("ShowTransientIndicator", emptyMap);
 
   // Wait for the specified duration
   Wait(application, duration * 1000);
@@ -1501,15 +1502,15 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void)
   application.Render();
 
   // Check that the indicator is now visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Get the default duration to hide the indicator
-  float hideDuration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_HIDE_DURATION );
-  float transientDuration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_TRANSIENT_DURATION );
+  float hideDuration         = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_HIDE_DURATION);
+  float transientDuration    = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_TRANSIENT_DURATION);
   float totalVisibleDuration = hideDuration + transientDuration;
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( totalVisibleDuration > 0.0f );
+  DALI_TEST_CHECK(totalVisibleDuration > 0.0f);
 
   // Wait for the specified duration
   Wait(application, totalVisibleDuration * 1000);
@@ -1519,7 +1520,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void)
   application.Render();
 
   // Check that the indicator is now invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1530,20 +1531,20 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Make the indicator invisible
-  indicator.SetProperty( Actor::Property::OPACITY,0.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 0.0f);
 
   // Don't use a show animation; the indicator should appear immediately
-  scrollBar.SetProperty( ScrollBar::Property::INDICATOR_SHOW_DURATION, 0.0f );
-  float duration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_SHOW_DURATION );
-  DALI_TEST_EQUALS( duration, 0.0f, TEST_LOCATION );
+  scrollBar.SetProperty(ScrollBar::Property::INDICATOR_SHOW_DURATION, 0.0f);
+  float duration = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_SHOW_DURATION);
+  DALI_TEST_EQUALS(duration, 0.0f, TEST_LOCATION);
 
   // Render and notify
   application.SendNotification();
@@ -1551,7 +1552,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void)
 
   // Do the "ShowIndicator" action
   Property::Map emptyMap;
-  scrollBar.DoAction( "ShowTransientIndicator", emptyMap );
+  scrollBar.DoAction("ShowTransientIndicator", emptyMap);
 
   // Wait for the specified duration
   Wait(application);
@@ -1561,15 +1562,15 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void)
   application.Render();
 
   // Check that the indicator is now visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Get the default duration to hide the indicator
-  float hideDuration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_HIDE_DURATION );
-  float transientDuration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_TRANSIENT_DURATION );
+  float hideDuration         = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_HIDE_DURATION);
+  float transientDuration    = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_TRANSIENT_DURATION);
   float totalVisibleDuration = hideDuration + transientDuration;
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( totalVisibleDuration > 0.0f );
+  DALI_TEST_CHECK(totalVisibleDuration > 0.0f);
 
   // Wait for the specified duration
   Wait(application, totalVisibleDuration * 1000);
@@ -1579,7 +1580,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void)
   application.Render();
 
   // Check that the indicator is now invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1590,28 +1591,28 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void)
 
   // Create a scroll bar
   ScrollBar scrollBar = ScrollBar::New();
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   Actor indicator = scrollBar.GetScrollIndicator();
-  DALI_TEST_CHECK( indicator );
+  DALI_TEST_CHECK(indicator);
 
   // Get the default duration to hide the indicator
   float duration = scrollBar.GetIndicatorHideDuration();
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Make the indicator visible
-  indicator.SetProperty( Actor::Property::OPACITY,1.0f);
+  indicator.SetProperty(Actor::Property::OPACITY, 1.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check that the indicator is visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Hide the indicator
   scrollBar.HideIndicator();
@@ -1624,19 +1625,19 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void)
   application.Render();
 
   // Check that the indicator is now partially hidden
-  DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ) < 1.0f );
+  DALI_TEST_CHECK(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY) < 1.0f);
 
   // Now interrupt the Hide with a DoAction( "ShowTransientIndicator" )
 
   // Get the default duration to hide the indicator
-  duration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_SHOW_DURATION );
+  duration = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_SHOW_DURATION);
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( duration > 0.0f );
+  DALI_TEST_CHECK(duration > 0.0f);
 
   // Do the "ShowIndicator" action
   Property::Map emptyMap;
-  scrollBar.DoAction( "ShowTransientIndicator", emptyMap );
+  scrollBar.DoAction("ShowTransientIndicator", emptyMap);
 
   // Wait for the specified duration
   Wait(application, duration * 1000);
@@ -1646,15 +1647,15 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void)
   application.Render();
 
   // Check that the indicator is now visible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 1.0f, TEST_LOCATION);
 
   // Get the default duration to hide the indicator
-  float hideDuration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_HIDE_DURATION );
-  float transientDuration = scrollBar.GetProperty<float>( ScrollBar::Property::INDICATOR_TRANSIENT_DURATION );
+  float hideDuration         = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_HIDE_DURATION);
+  float transientDuration    = scrollBar.GetProperty<float>(ScrollBar::Property::INDICATOR_TRANSIENT_DURATION);
   float totalVisibleDuration = hideDuration + transientDuration;
 
   // Check that the default duration is greater than 0
-  DALI_TEST_CHECK( totalVisibleDuration > 0.0f );
+  DALI_TEST_CHECK(totalVisibleDuration > 0.0f);
 
   // Wait for the specified duration
   Wait(application, totalVisibleDuration * 1000);
@@ -1664,7 +1665,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void)
   application.Render();
 
   // Check that the indicator is now invisible
-  DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(indicator.GetCurrentProperty<float>(Actor::Property::OPACITY), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1675,23 +1676,23 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) );
+  scrollBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f));
 
   // Set the indicator height to be fixed to 50.0f
   scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED);
   scrollBar.SetIndicatorFixedHeight(50.0f);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   // Connect the pan finished signal
   ConnectionTracker connectionTracker;
-  bool panFinished = false;
-  scrollBar.PanFinishedSignal().Connect( &OnPanFinished );
-  scrollBar.ConnectSignal( &connectionTracker, "panFinished", CallbackFunctor(&panFinished));
+  bool              panFinished = false;
+  scrollBar.PanFinishedSignal().Connect(&OnPanFinished);
+  scrollBar.ConnectSignal(&connectionTracker, "panFinished", CallbackFunctor(&panFinished));
 
   // Render and notify
   application.SendNotification();
@@ -1699,18 +1700,18 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void)
 
   // Create a source actor that owns the scroll properties required by the scroll bar
   Actor sourceActor = Actor::New();
-  application.GetScene().Add( sourceActor );
+  application.GetScene().Add(sourceActor);
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
+  Property::Index propertyScrollPosition    = sourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty("sourcePositionMax", 100.0f);
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty("sourceContentSize", 500.0f);
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePosition"), propertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMin"), propertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMax"), propertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourceContentSize"), propertyScrollContentSize, TEST_LOCATION);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1721,8 +1722,8 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void)
 
   // Perform a swipe gesture on the indicator
   PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 1, 500);
-  DALI_TEST_EQUALS( gOnPanFinishedCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( panFinished, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnPanFinishedCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(panFinished, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1733,23 +1734,23 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) );
+  scrollBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f));
 
   // Set the indicator height to be fixed to 50.0f
   scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED);
   scrollBar.SetIndicatorFixedHeight(50.0f);
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   // Connect the pan finished signal
   ConnectionTracker connectionTracker;
-  bool panFinished = false;
-  scrollBar.PanFinishedSignal().Connect( &OnPanFinished );
-  scrollBar.ConnectSignal( &connectionTracker, "panFinished", CallbackFunctor(&panFinished));
+  bool              panFinished = false;
+  scrollBar.PanFinishedSignal().Connect(&OnPanFinished);
+  scrollBar.ConnectSignal(&connectionTracker, "panFinished", CallbackFunctor(&panFinished));
 
   // Render and notify
   application.SendNotification();
@@ -1757,22 +1758,22 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void)
 
   // Perform a vertical swipe gesture on the indicator when there is no source object set on the scroll bar
   PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 20, 500);
-  DALI_TEST_EQUALS( gOnPanFinishedCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnPanFinishedCalled, false, TEST_LOCATION);
 
   // Create a source actor that owns the scroll properties required by the scroll bar
   Actor sourceActor = Actor::New();
-  application.GetScene().Add( sourceActor );
+  application.GetScene().Add(sourceActor);
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
+  Property::Index propertyScrollPosition    = sourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty("sourcePositionMax", 100.0f);
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty("sourceContentSize", 500.0f);
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePosition"), propertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMin"), propertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMax"), propertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourceContentSize"), propertyScrollContentSize, TEST_LOCATION);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1783,13 +1784,13 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void)
 
   // Perform a swipe gesture on the scroll bar but not on the indicator
   PerformGestureSwipe(application, Vector2(1.0f, 780.0f), Vector2(Vector2::YAXIS * -1.0f), 20, 2000);
-  DALI_TEST_EQUALS( gOnPanFinishedCalled, false, TEST_LOCATION );
-  DALI_TEST_EQUALS( panFinished, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnPanFinishedCalled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(panFinished, false, TEST_LOCATION);
 
   // Perform a swipe gesture on the indicator
   PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 20, 4000);
-  DALI_TEST_EQUALS( gOnPanFinishedCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( panFinished, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnPanFinishedCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(panFinished, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1800,19 +1801,19 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) );
+  scrollBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f));
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
   ConnectionTracker connectionTracker;
 
   // Connect to the ScrollPositionIntervalReached signal
   bool intervalReached = false;
-  scrollBar.ScrollPositionIntervalReachedSignal().Connect( &OnScrollPositionIntervalReached );
-  scrollBar.ConnectSignal( &connectionTracker, "scrollPositionIntervalReached", CallbackFunctor(&intervalReached));
+  scrollBar.ScrollPositionIntervalReachedSignal().Connect(&OnScrollPositionIntervalReached);
+  scrollBar.ConnectSignal(&connectionTracker, "scrollPositionIntervalReached", CallbackFunctor(&intervalReached));
 
   // Render and notify
   application.SendNotification();
@@ -1820,18 +1821,18 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void)
 
   // Create a source actor that owns the scroll properties required by the scroll bar
   Actor sourceActor = Actor::New();
-  application.GetScene().Add( sourceActor );
+  application.GetScene().Add(sourceActor);
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   800.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   2000.0f );
+  Property::Index propertyScrollPosition    = sourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty("sourcePositionMax", 800.0f);
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty("sourceContentSize", 2000.0f);
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePosition"), propertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMin"), propertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMax"), propertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourceContentSize"), propertyScrollContentSize, TEST_LOCATION);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1842,9 +1843,9 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void)
 
   // Set the values to get notified when the scroll positions of the source actor goes above or below these values
   Dali::Vector<float> positionIntervals;
-  for( size_t i = 0; i != 10; ++i )
+  for(size_t i = 0; i != 10; ++i)
   {
-    positionIntervals.PushBack( -80.0f * i ); // should get notified for each 80 pixels
+    positionIntervals.PushBack(-80.0f * i); // should get notified for each 80 pixels
   }
   scrollBar.SetScrollPositionIntervals(positionIntervals);
 
@@ -1857,19 +1858,19 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void)
 
   // Animate the scroll position to cross the specified value
   Animation animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -85.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -85.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( intervalReached, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(intervalReached, true, TEST_LOCATION);
 
   // Reset the flag
   gOnScrollPositionIntervalReachedSignalCalled = false;
-  intervalReached = false;
+  intervalReached                              = false;
 
   // Rest and clear the animation
   animation.Clear();
@@ -1877,19 +1878,19 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void)
 
   // Animate the scroll position to cross another specified value
   animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -170.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -170.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( intervalReached, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(intervalReached, true, TEST_LOCATION);
 
   // Reset the flag
   gOnScrollPositionIntervalReachedSignalCalled = false;
-  intervalReached = false;
+  intervalReached                              = false;
 
   // Rest and clear the animation
   animation.Clear();
@@ -1897,15 +1898,15 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void)
 
   // Animate the scroll position back to the previous value
   animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -85.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -85.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( intervalReached, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(intervalReached, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1916,16 +1917,16 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void)
 
   // Create a vertical scroll bar
   ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL);
-  DALI_TEST_CHECK( scrollBar );
+  DALI_TEST_CHECK(scrollBar);
 
-  scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) );
+  scrollBar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  scrollBar.SetProperty(Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f));
 
-  application.GetScene().Add( scrollBar );
+  application.GetScene().Add(scrollBar);
 
   // Connect to the ScrollPositionIntervalReached signal
-  scrollBar.ScrollPositionIntervalReachedSignal().Connect( &OnScrollPositionIntervalReached );
+  scrollBar.ScrollPositionIntervalReachedSignal().Connect(&OnScrollPositionIntervalReached);
 
   // Render and notify
   application.SendNotification();
@@ -1933,18 +1934,18 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void)
 
   // Create a source actor that owns the scroll properties required by the scroll bar
   Actor sourceActor = Actor::New();
-  application.GetScene().Add( sourceActor );
+  application.GetScene().Add(sourceActor);
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   800.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   2000.0f );
+  Property::Index propertyScrollPosition    = sourceActor.RegisterProperty("sourcePosition", 0.0f);
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty("sourcePositionMin", 0.0f);
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty("sourcePositionMax", 800.0f);
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty("sourceContentSize", 2000.0f);
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePosition"), propertyScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMin"), propertyMinScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourcePositionMax"), propertyMaxScrollPosition, TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceActor.GetPropertyIndex("sourceContentSize"), propertyScrollContentSize, TEST_LOCATION);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1955,9 +1956,9 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void)
 
   // Set the values to get notified when the scroll positions of the source actor goes above or below these values
   Dali::Vector<float> positionIntervals;
-  for( size_t i = 0; i != 10; ++i )
+  for(size_t i = 0; i != 10; ++i)
   {
-    positionIntervals.PushBack( -80.0f * i ); // should get notified for each 80 pixels
+    positionIntervals.PushBack(-80.0f * i); // should get notified for each 80 pixels
   }
   scrollBar.SetScrollPositionIntervals(positionIntervals);
 
@@ -1970,14 +1971,14 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void)
 
   // Animate the scroll position not to cross the specified value
   Animation animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -70.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -70.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is not called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, false, TEST_LOCATION);
 
   // Rest and clear the animation
   animation.Clear();
@@ -1985,14 +1986,14 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void)
 
   // Animate the scroll position to cross another specified value
   animation = Animation::New(0.1f);
-  animation.AnimateTo( Property( sourceActor, propertyScrollPosition ), -85.0f );
+  animation.AnimateTo(Property(sourceActor, propertyScrollPosition), -85.0f);
   animation.Play();
 
   // Wait for 0.1 second
   Wait(application, 100);
 
   // Check that the signal callback is called
-  DALI_TEST_EQUALS( gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gOnScrollPositionIntervalReachedSignalCalled, true, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
index ebba4e9..3c12af6 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -47,7 +47,7 @@ static void TestCallback(BaseHandle handle)
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -58,32 +58,31 @@ struct CallbackFunctor
   bool* mCallbackFlag;
 };
 
-const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
+const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
 
-const int RENDER_DELAY_SCROLL = 1000;                           ///< duration to wait for any scroll to complete.
+const int RENDER_DELAY_SCROLL = 1000; ///< duration to wait for any scroll to complete.
 
 // For Clamp Signal testing...
-const float CLAMP_EXCESS_WIDTH = 200.0f;                        ///< Amount of width that can be panned outside scrollview
-const float CLAMP_EXCESS_HEIGHT = 200.0f;                       ///< Amount of height that can be panned outside scrollview
-const Vector2 CLAMP_START_SCROLL_POSITION(30.0f, 100.0f);       ///< Scroll start position for the Clamping tests.
-const Vector2 CLAMP_TOUCH_START( 100.0f, 100.0f );              ///< Start point to touch from for the Clamping tests.
-const Vector2 CLAMP_TOUCH_MOVEMENT( 5.0f, -5.0f );              ///< Amount to move touch for each frame for the Clamping tests.
-const int CLAMP_GESTURE_FRAMES = 100;                           ///< Number of Frames to synthesize a gesture for the Clamping tests.
-const Vector3 TEST_ACTOR_POSITION(100.0f, 100.0f, 0.0f);        ///< A Test actor position offset (arbitrary value)
-const Vector3 TEST_CONSTRAINT_OFFSET(1.0f, 2.0f, 0.0f);         ///< A Test constraint offset (arbitrary value to test effects)
-
-const float DEFAULT_SNAP_OVERSHOOT_DURATION(0.5f);                  ///< Default overshoot snapping animation time.
-const float DEFAULT_MAX_OVERSHOOT(100.0f);                          ///< Default maximum allowed overshoot in pixels
-
-const int MAX_FRAMES_TO_TEST_OVERSHOOT = 600;                       ///< 10 seconds (at 60 frames per second).
-const Vector2 OVERSHOOT_START_SCROLL_POSITION(100.0f, 100.0f);       ///< Scroll start position for the Overshoot tests.
-const float SCROLL_ANIMATION_DURATION(0.33f);                       ///< Duration of scroll animation in Overshoot tests (i.e. 100 pixels of overshoot in the speed of 500 pixels per 100 frames, 100/(500/(100/60)) = 0.33)
-const Vector2 SNAP_POSITION_WITH_DECELERATED_VELOCITY(74.0f, 74.0f); ///< the snap position for Overshoot tests with the decelerated velocity (i.e. Decelerated from 500 pixels per 100 frames).
-const float TEST_CUSTOM1_SNAP_OVERSHOOT_DURATION = 0.05f;           ///< a Test duration
-const float TEST_CUSTOM2_SNAP_OVERSHOOT_DURATION = 1.5f;            ///< another Test duration
-const float TEST_CUSTOM3_SNAP_OVERSHOOT_DURATION = TEST_CUSTOM2_SNAP_OVERSHOOT_DURATION * 0.5f; // Same as above, but different alpha function.
-const float TIME_TOLERANCE = 0.05f;                                 ///< Allow testing tolerance between a 10th of second (+/- 3 frames)
-
+const float   CLAMP_EXCESS_WIDTH  = 200.0f;               ///< Amount of width that can be panned outside scrollview
+const float   CLAMP_EXCESS_HEIGHT = 200.0f;               ///< Amount of height that can be panned outside scrollview
+const Vector2 CLAMP_START_SCROLL_POSITION(30.0f, 100.0f); ///< Scroll start position for the Clamping tests.
+const Vector2 CLAMP_TOUCH_START(100.0f, 100.0f);          ///< Start point to touch from for the Clamping tests.
+const Vector2 CLAMP_TOUCH_MOVEMENT(5.0f, -5.0f);          ///< Amount to move touch for each frame for the Clamping tests.
+const int     CLAMP_GESTURE_FRAMES = 100;                 ///< Number of Frames to synthesize a gesture for the Clamping tests.
+const Vector3 TEST_ACTOR_POSITION(100.0f, 100.0f, 0.0f);  ///< A Test actor position offset (arbitrary value)
+const Vector3 TEST_CONSTRAINT_OFFSET(1.0f, 2.0f, 0.0f);   ///< A Test constraint offset (arbitrary value to test effects)
+
+const float DEFAULT_SNAP_OVERSHOOT_DURATION(0.5f); ///< Default overshoot snapping animation time.
+const float DEFAULT_MAX_OVERSHOOT(100.0f);         ///< Default maximum allowed overshoot in pixels
+
+const int     MAX_FRAMES_TO_TEST_OVERSHOOT = 600;                                                 ///< 10 seconds (at 60 frames per second).
+const Vector2 OVERSHOOT_START_SCROLL_POSITION(100.0f, 100.0f);                                    ///< Scroll start position for the Overshoot tests.
+const float   SCROLL_ANIMATION_DURATION(0.33f);                                                   ///< Duration of scroll animation in Overshoot tests (i.e. 100 pixels of overshoot in the speed of 500 pixels per 100 frames, 100/(500/(100/60)) = 0.33)
+const Vector2 SNAP_POSITION_WITH_DECELERATED_VELOCITY(74.0f, 74.0f);                              ///< the snap position for Overshoot tests with the decelerated velocity (i.e. Decelerated from 500 pixels per 100 frames).
+const float   TEST_CUSTOM1_SNAP_OVERSHOOT_DURATION = 0.05f;                                       ///< a Test duration
+const float   TEST_CUSTOM2_SNAP_OVERSHOOT_DURATION = 1.5f;                                        ///< another Test duration
+const float   TEST_CUSTOM3_SNAP_OVERSHOOT_DURATION = TEST_CUSTOM2_SNAP_OVERSHOOT_DURATION * 0.5f; // Same as above, but different alpha function.
+const float   TIME_TOLERANCE                       = 0.05f;                                       ///< Allow testing tolerance between a 10th of second (+/- 3 frames)
 
 /*
  * Simulate time passed by.
@@ -98,7 +97,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -110,20 +109,20 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 
 // Callback probes.
 
-static bool gOnScrollStartCalled;                       ///< Whether the OnScrollStart signal was invoked.
-static bool gOnScrollUpdateCalled;                      ///< Whether the OnScrollUpdate signal was invoked.
-static bool gOnScrollCompleteCalled;                    ///< Whether the OnScrollComplete signal was invoked.
-static bool gOnSnapStartCalled;                         ///< Whether the OnSnapStart signal was invoked.
-static bool gOnWheelEventCalled;                        ///< Whether the WheelEventSignal signal was invoked.
-static SnapType gLastSnapType;                          ///< Snaping information from SnapEvent.
-static Vector3 gConstraintResult;                       ///< Result from constraint.
+static bool     gOnScrollStartCalled;    ///< Whether the OnScrollStart signal was invoked.
+static bool     gOnScrollUpdateCalled;   ///< Whether the OnScrollUpdate signal was invoked.
+static bool     gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked.
+static bool     gOnSnapStartCalled;      ///< Whether the OnSnapStart signal was invoked.
+static bool     gOnWheelEventCalled;     ///< Whether the WheelEventSignal signal was invoked.
+static SnapType gLastSnapType;           ///< Snaping information from SnapEvent.
+static Vector3  gConstraintResult;       ///< Result from constraint.
 
 /**
  * Invoked when scrolling starts.
  *
  * @param[in] position The current scroll position.
  */
-static void OnScrollStart( const Vector2& position )
+static void OnScrollStart(const Vector2& position)
 {
   gOnScrollStartCalled = true;
 }
@@ -133,7 +132,7 @@ static void OnScrollStart( const Vector2& position )
  *
  * @param[in] position The current scroll position.
  */
-static void OnScrollUpdate( const Vector2& position )
+static void OnScrollUpdate(const Vector2& position)
 {
   gOnScrollUpdateCalled = true;
 }
@@ -143,7 +142,7 @@ static void OnScrollUpdate( const Vector2& position )
  *
  * @param[in] position The current scroll position.
  */
-static void OnScrollComplete( const Vector2& position )
+static void OnScrollComplete(const Vector2& position)
 {
   gOnScrollCompleteCalled = true;
 }
@@ -153,10 +152,10 @@ static void OnScrollComplete( const Vector2& position )
  *
  * @param[in] event The type of snap and the target position/scale/rotation.
  */
-static void OnSnapStart( const ScrollView::SnapEvent& event )
+static void OnSnapStart(const ScrollView::SnapEvent& event)
 {
   gOnSnapStartCalled = true;
-  gLastSnapType = event.type;
+  gLastSnapType      = event.type;
 }
 
 /**
@@ -166,7 +165,7 @@ static void OnSnapStart( const ScrollView::SnapEvent& event )
  * @param[in] event The wheel event
  * @return True if the event should be consumed
  */
-static bool OnWheelEvent( Actor actor, const Dali::WheelEvent& wheelEvent )
+static bool OnWheelEvent(Actor actor, const Dali::WheelEvent& wheelEvent)
 {
   gOnWheelEventCalled = true;
   return false;
@@ -185,7 +184,7 @@ struct TestSumConstraint
    * @param[in] offset The offset to be added to current.
    */
   TestSumConstraint(const Vector3& offset)
-  :mOffset(offset)
+  : mOffset(offset)
   {
   }
 
@@ -194,14 +193,13 @@ struct TestSumConstraint
    * @param[in] inputs Contains the property to be added to current.
    * @return The new current Vector.
    */
-  void operator()( Vector3& current, const PropertyInputContainer& inputs )
+  void operator()(Vector3& current, const PropertyInputContainer& inputs)
   {
     gConstraintResult = current + Vector3(inputs[0]->GetVector2()) + mOffset;
-    current = gConstraintResult;
+    current           = gConstraintResult;
   }
 
   Vector3 mOffset;
-
 };
 
 /**
@@ -209,13 +207,13 @@ struct TestSumConstraint
  * @param[in] scrollView The scrollView instance
  * @return The time taken for the overshoot to reach origin (zero)
  */
-static float TestOvershootSnapDuration(ToolkitTestApplication &application, ScrollView scrollView)
+static float TestOvershootSnapDuration(ToolkitTestApplication& application, ScrollView scrollView)
 {
   int timeToReachOrigin = -1;
-  for(int i = 0;i<MAX_FRAMES_TO_TEST_OVERSHOOT;i++)
+  for(int i = 0; i < MAX_FRAMES_TO_TEST_OVERSHOOT; i++)
   {
-    float overshootXValue = scrollView.GetCurrentProperty<float>( ScrollView::Property::OVERSHOOT_X );
-    float overshootYValue = scrollView.GetCurrentProperty<float>( ScrollView::Property::OVERSHOOT_Y );
+    float overshootXValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_X);
+    float overshootYValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_Y);
     if(overshootXValue == 0.0f && overshootYValue == 0.0f)
     {
       break;
@@ -238,7 +236,7 @@ static float TestOvershootSnapDuration(ToolkitTestApplication &application, Scro
  */
 float TestAlphaFunction(float progress)
 {
-  return std::min( progress * 2.0f, 1.0f );
+  return std::min(progress * 2.0f, 1.0f);
 }
 
 /**
@@ -247,47 +245,45 @@ float TestAlphaFunction(float progress)
  */
 static Vector2 PerformGestureSwipe(ToolkitTestApplication& application, Vector2 start, Vector2 direction, int frames, uint32_t& time, bool finish = true)
 {
-  gOnScrollStartCalled = false;
-  gOnScrollUpdateCalled = false;
+  gOnScrollStartCalled    = false;
+  gOnScrollUpdateCalled   = false;
   gOnScrollCompleteCalled = false;
-  gOnSnapStartCalled = false;
+  gOnSnapStartCalled      = false;
 
-  Vector2 pos( start );
+  Vector2 pos(start);
 
   // This is created to ensure a pan is started
-  Vector2 pos_start_jump( start + Vector2(11.0f, 11.0f) );
-  TestStartPan( application, start, pos_start_jump, time );
+  Vector2 pos_start_jump(start + Vector2(11.0f, 11.0f));
+  TestStartPan(application, start, pos_start_jump, time);
   pos = pos_start_jump;
 
   Wait(application);
 
-  for(int i = 0;i<frames;i++)
+  for(int i = 0; i < frames; i++)
   {
     pos += direction; // Move in this direction
-    TestMovePan(application, pos, time );
+    TestMovePan(application, pos, time);
     time += Wait(application);
   }
 
   if(finish)
   {
     pos += direction; // Move in this direction.
-    TestEndPan(application, pos, time );
+    TestEndPan(application, pos, time);
     time += Wait(application, RENDER_DELAY_SCROLL);
   }
 
   return pos;
 }
 
-
 } // unnamed namespace
 
-
 int UtcDaliToolkitScrollViewConstructorP(void)
 {
   ToolkitTestApplication application;
 
   ScrollView scrollView;
-  DALI_TEST_CHECK( !scrollView );
+  DALI_TEST_CHECK(!scrollView);
   END_TEST;
 }
 
@@ -296,11 +292,11 @@ int UtcDaliToolkitScrollViewCopyConstructorP(void)
   ToolkitTestApplication application;
 
   ScrollView scrollView = ScrollView::New();
-  scrollView.SetProperty( ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f) );
+  scrollView.SetProperty(ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f));
 
-  ScrollView copy( scrollView );
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ) == scrollView.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ) );
+  ScrollView copy(scrollView);
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION) == scrollView.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION));
   END_TEST;
 }
 
@@ -309,15 +305,15 @@ int UtcDaliScrollViewMoveConstructor(void)
   ToolkitTestApplication application;
 
   ScrollView scrollView = ScrollView::New();
-  DALI_TEST_EQUALS( 1, scrollView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f) );
-  DALI_TEST_EQUALS( scrollView.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ), Vector2(10.0f, 10.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, scrollView.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f));
+  DALI_TEST_EQUALS(scrollView.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION), Vector2(10.0f, 10.0f), TEST_LOCATION);
 
-  ScrollView moved = std::move( scrollView );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ), Vector2(10.0f, 10.0f), TEST_LOCATION );
-  DALI_TEST_CHECK( !scrollView );
+  ScrollView moved = std::move(scrollView);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION), Vector2(10.0f, 10.0f), TEST_LOCATION);
+  DALI_TEST_CHECK(!scrollView);
 
   END_TEST;
 }
@@ -327,12 +323,12 @@ int UtcDaliToolkitScrollViewAssignmentOperatorP(void)
   ToolkitTestApplication application;
 
   ScrollView scrollView = ScrollView::New();
-  scrollView.SetProperty( ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f) );
+  scrollView.SetProperty(ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f));
 
   ScrollView copy;
   copy = scrollView;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ) == scrollView.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ) );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION) == scrollView.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION));
   END_TEST;
 }
 
@@ -341,16 +337,16 @@ int UtcDaliScrollViewMoveAssignment(void)
   ToolkitTestApplication application;
 
   ScrollView scrollView = ScrollView::New();
-  DALI_TEST_EQUALS( 1, scrollView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f) );
-  DALI_TEST_EQUALS( scrollView.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ), Vector2(10.0f, 10.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, scrollView.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_POSITION, Vector2(10.0f, 10.0f));
+  DALI_TEST_EQUALS(scrollView.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION), Vector2(10.0f, 10.0f), TEST_LOCATION);
 
   ScrollView moved;
-  moved = std::move( scrollView );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( moved.GetProperty<Vector2>( ScrollView::Property::SCROLL_POSITION ), Vector2(10.0f, 10.0f), TEST_LOCATION );
-  DALI_TEST_CHECK( !scrollView );
+  moved = std::move(scrollView);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<Vector2>(ScrollView::Property::SCROLL_POSITION), Vector2(10.0f, 10.0f), TEST_LOCATION);
+  DALI_TEST_CHECK(!scrollView);
 
   END_TEST;
 }
@@ -362,7 +358,7 @@ int UtcDaliScrollViewDestructorP(void)
   ScrollView* scrollView = new ScrollView();
   delete scrollView;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -373,26 +369,26 @@ int UtcDaliToolkitScrollViewNewP1(void)
 
   ScrollView scrollView;
 
-  DALI_TEST_CHECK( !scrollView );
+  DALI_TEST_CHECK(!scrollView);
 
   scrollView = ScrollView::New();
 
-  DALI_TEST_CHECK( scrollView );
+  DALI_TEST_CHECK(scrollView);
 
   ScrollView scrollView2(scrollView);
 
-  DALI_TEST_CHECK( scrollView2 == scrollView );
+  DALI_TEST_CHECK(scrollView2 == scrollView);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     ScrollView scrollView = ScrollView::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -402,15 +398,15 @@ int UtcDaliToolkitScrollViewNewP2(void)
   tet_infoline(" UtcDaliToolkitScrollViewNewP2 - create thru type registry");
 
   ScrollView scrollView;
-  DALI_TEST_CHECK( !scrollView );
+  DALI_TEST_CHECK(!scrollView);
 
-  TypeRegistry typeRegistry = TypeRegistry::Get();
-  TypeInfo scrollViewType = typeRegistry.GetTypeInfo("ScrollView");
-  BaseHandle handle = scrollViewType.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  TypeRegistry typeRegistry   = TypeRegistry::Get();
+  TypeInfo     scrollViewType = typeRegistry.GetTypeInfo("ScrollView");
+  BaseHandle   handle         = scrollViewType.CreateInstance();
+  DALI_TEST_CHECK(handle);
 
   scrollView = ScrollView::DownCast(handle);
-  DALI_TEST_CHECK( scrollView );
+  DALI_TEST_CHECK(scrollView);
 
   END_TEST;
 }
@@ -423,9 +419,9 @@ int UtcDaliToolkitScrollViewDownCastP(void)
   ScrollView scrollView = ScrollView::New();
   BaseHandle handle(scrollView);
 
-  ScrollView newScrollView = ScrollView::DownCast( handle );
-  DALI_TEST_CHECK( scrollView );
-  DALI_TEST_CHECK( newScrollView == scrollView );
+  ScrollView newScrollView = ScrollView::DownCast(handle);
+  DALI_TEST_CHECK(scrollView);
+  DALI_TEST_CHECK(newScrollView == scrollView);
   END_TEST;
 }
 
@@ -436,17 +432,17 @@ int UtcDaliToolkitScrollViewScrollToPositionP(void)
 
   // Create the ScrollView actor
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
-  const Vector2 target = Vector2(100.0f, 200.0f);
+  const Vector2 target  = Vector2(100.0f, 200.0f);
   const Vector2 target2 = Vector2(300.0f, 100.0f);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
-  scrollView.ScrollTo( target2 );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
+  scrollView.ScrollTo(target2);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -457,38 +453,38 @@ int UtcDaliToolkitScrollViewScrollToPositionWithDirectionBiasP(void)
   tet_infoline(" UtcDaliToolkitScrollViewScrollToPositionWithDirectionBiasP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
-  RulerPtr rulerX = new FixedRuler( 100.0f );
-  rulerX->SetDomain( RulerDomain(0.0f, 200.0f, true) );
-  RulerPtr rulerY = new FixedRuler( 100.0f );
-  rulerY->SetDomain( RulerDomain(0.0f, 200.0f, true) );
+  application.GetScene().Add(scrollView);
+  RulerPtr rulerX = new FixedRuler(100.0f);
+  rulerX->SetDomain(RulerDomain(0.0f, 200.0f, true));
+  RulerPtr rulerY = new FixedRuler(100.0f);
+  rulerY->SetDomain(RulerDomain(0.0f, 200.0f, true));
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
   scrollView.SetWrapMode(true);
 
-  Property::Value wrapMode = scrollView.GetProperty( Toolkit::ScrollView::Property::WRAP_ENABLED );
-  DALI_TEST_EQUALS( wrapMode.Get<bool>(), true, TEST_LOCATION );
+  Property::Value wrapMode = scrollView.GetProperty(Toolkit::ScrollView::Property::WRAP_ENABLED);
+  DALI_TEST_EQUALS(wrapMode.Get<bool>(), true, TEST_LOCATION);
 
-  const Vector2 target = Vector2(50.0f, 50.0f);
+  const Vector2 target  = Vector2(50.0f, 50.0f);
   const Vector2 target2 = Vector2(150.0f, 150.0f);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
 
-  scrollView.ScrollTo( target2, 0.25f, Dali::Toolkit::DIRECTION_BIAS_LEFT, Dali::Toolkit::DIRECTION_BIAS_LEFT );
+  scrollView.ScrollTo(target2, 0.25f, Dali::Toolkit::DIRECTION_BIAS_LEFT, Dali::Toolkit::DIRECTION_BIAS_LEFT);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
 
-  scrollView.ScrollTo( target2, 0.25f, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT );
+  scrollView.ScrollTo(target2, 0.25f, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -500,25 +496,25 @@ int UtcDaliToolkitScrollViewScrollToPositionWithAlphaFunctionP(void)
 
   // Create the ScrollView actor
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
-  const Vector2 target = Vector2(100.0f, 200.0f);
+  const Vector2 target  = Vector2(100.0f, 200.0f);
   const Vector2 target2 = Vector2(300.0f, 100.0f);
 
-  scrollView.ScrollTo( target, 0.5f, TestAlphaFunction );
+  scrollView.ScrollTo(target, 0.5f, TestAlphaFunction);
   Wait(application, 250);
   // Check that the scroll animation should finish within just half of the specified duration with the above alpha function
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
 
-  scrollView.ScrollTo( target2, 0.5f, AlphaFunction::LINEAR );
+  scrollView.ScrollTo(target2, 0.5f, AlphaFunction::LINEAR);
   Wait(application, 250);
   // Check that the scroll animation has not finished within half of the specified duration with the linear alpha function
-  DALI_TEST_CHECK( scrollView.GetCurrentScrollPosition() != target2 );
+  DALI_TEST_CHECK(scrollView.GetCurrentScrollPosition() != target2);
 
   // Wait till the end of the specified duration
   Wait(application, 250);
   // Check that the scroll animation has finished
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -529,44 +525,44 @@ int UtcDaliToolkitScrollViewScrollToPositionWithAlphaFunctionAndDirectionBiasP(v
   tet_infoline(" UtcDaliToolkitScrollViewScrollToPositionWithAlphaFunctionAndDirectionBiasP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
-  RulerPtr rulerX = new FixedRuler( 100.0f );
-  rulerX->SetDomain( RulerDomain(0.0f, 200.0f, true) );
-  RulerPtr rulerY = new FixedRuler( 100.0f );
-  rulerY->SetDomain( RulerDomain(0.0f, 200.0f, true) );
+  application.GetScene().Add(scrollView);
+  RulerPtr rulerX = new FixedRuler(100.0f);
+  rulerX->SetDomain(RulerDomain(0.0f, 200.0f, true));
+  RulerPtr rulerY = new FixedRuler(100.0f);
+  rulerY->SetDomain(RulerDomain(0.0f, 200.0f, true));
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
   scrollView.SetWrapMode(true);
 
-  const Vector2 target = Vector2(50.0f, 50.0f);
+  const Vector2 target  = Vector2(50.0f, 50.0f);
   const Vector2 target2 = Vector2(150.0f, 150.0f);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
 
-  scrollView.ScrollTo( target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DIRECTION_BIAS_LEFT, Dali::Toolkit::DIRECTION_BIAS_LEFT );
+  scrollView.ScrollTo(target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DIRECTION_BIAS_LEFT, Dali::Toolkit::DIRECTION_BIAS_LEFT);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
 
-  scrollView.ScrollTo( target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT );
+  scrollView.ScrollTo(target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
 
-  scrollView.ScrollTo( target2, 0.25f, TestAlphaFunction, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT );
+  scrollView.ScrollTo(target2, 0.25f, TestAlphaFunction, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT);
   Wait(application, 125);
   // Check that the scroll animation should finish within just half of the specified duration with the above alpha function
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -577,117 +573,116 @@ int UtcDaliToolkitScrollViewScrollToPageP(void)
   tet_infoline(" UtcDaliToolkitScrollViewScrollToPageP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
-  RulerPtr rulerX = new FixedRuler( 100.0f );
-  rulerX->SetDomain( RulerDomain(0.0f, 800.0f, true) );
-  RulerPtr rulerY = new FixedRuler( 100.0f );
-  rulerY->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  application.GetScene().Add(scrollView);
+  RulerPtr rulerX = new FixedRuler(100.0f);
+  rulerX->SetDomain(RulerDomain(0.0f, 800.0f, true));
+  RulerPtr rulerY = new FixedRuler(100.0f);
+  rulerY->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
-  scrollView.ScrollTo( 1, 0.0f );
+  scrollView.ScrollTo(1, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 0.0f), TEST_LOCATION);
 
-  scrollView.ScrollTo( 5, 0.0f );
+  scrollView.ScrollTo(5, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(500.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(500.0f, 0.0f), TEST_LOCATION);
 
-  scrollView.ScrollTo( 10, 0.0f );
+  scrollView.ScrollTo(10, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(200.0f, 100.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(200.0f, 100.0f), TEST_LOCATION);
 
-  scrollView.ScrollTo( 15, 0.0f );
+  scrollView.ScrollTo(15, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(700.0f, 100.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 15, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(700.0f, 100.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 15, TEST_LOCATION);
 
-  scrollView.ScrollTo( 3 );
+  scrollView.ScrollTo(3);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(300.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(300.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 3, TEST_LOCATION);
 
-  scrollView.ScrollTo( 9 );
+  scrollView.ScrollTo(9);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 100.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 9, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 100.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 9, TEST_LOCATION);
 
   // Apply DefaultRulers instead and see what happens.
   rulerX = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, 800.0f, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, 800.0f, true));
   rulerY = new DefaultRuler();
-  rulerY->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  rulerY->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
   // This time should always scroll to origin (0.0f, 0.0f)
-  scrollView.ScrollTo( 1, 0.0f );
+  scrollView.ScrollTo(1, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliToolkitScrollModeP1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliToolkitScrollView ScrollMode property" );
+  tet_infoline(" UtcDaliToolkitScrollView ScrollMode property");
 
   // Set up a scrollView.
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
-  Vector2 viewPageSize( 720.0f, 1280.0f );
-  scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
+  Vector2 viewPageSize(720.0f, 1280.0f);
+  scrollView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  scrollView.SetProperty(Actor::Property::SIZE, viewPageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  scrollView.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
 
   // Position rulers.
   Property::Map rulerMap;
-  rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, true );
-  rulerMap.Add( ScrollMode::X_AXIS_SNAP_TO_INTERVAL, viewPageSize.width );
-  rulerMap.Add( ScrollMode::X_AXIS_SCROLL_BOUNDARY, viewPageSize.width*3 );
-  rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, false );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
+  rulerMap.Add(ScrollMode::X_AXIS_SCROLL_ENABLED, true);
+  rulerMap.Add(ScrollMode::X_AXIS_SNAP_TO_INTERVAL, viewPageSize.width);
+  rulerMap.Add(ScrollMode::X_AXIS_SCROLL_BOUNDARY, viewPageSize.width * 3);
+  rulerMap.Add(ScrollMode::Y_AXIS_SCROLL_ENABLED, false);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_MODE, rulerMap);
 
-  scrollView.SetWrapMode( false );
-  scrollView.SetScrollSensitive( true );
+  scrollView.SetWrapMode(false);
+  scrollView.SetScrollSensitive(true);
 
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   // Set up a gesture to perform.
-  Vector2 startPos( 50.0f, 0.0f );
-  Vector2 direction( -5.0f, 0.0f );
-  int frames = 200;
-  uint32_t time = 0;
+  Vector2  startPos(50.0f, 0.0f);
+  Vector2  direction(-5.0f, 0.0f);
+  int      frames = 200;
+  uint32_t time   = 0;
 
   // Force starting position.
-  scrollView.ScrollTo( startPos, 0.0f );
-  time += Wait( application );
+  scrollView.ScrollTo(startPos, 0.0f);
+  time += Wait(application);
 
   // Deliberately skip the "Finished" part of the gesture, so we can read the coordinates before the snap begins.
-  Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
+  Vector2 currentPos(PerformGestureSwipe(application, startPos, direction, frames - 1, time, false));
 
   // Confirm the final X coord has not moved more than one page from the start X position.
-  DALI_TEST_GREATER( ( startPos.x + viewPageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
+  DALI_TEST_GREATER((startPos.x + viewPageSize.width), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION);
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;
-  TestEndPan( application, currentPos, time );
+  TestEndPan(application, currentPos, time);
   // We add RENDER_FRAME_INTERVAL on to wait for an extra frame (for the last "finished" gesture to complete first.
-  time += Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
+  time += Wait(application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL);
 
   // Confirm the final X coord has snapped to exactly one page ahead of the start page.
-  DALI_TEST_EQUALS( viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   // Change scroll mode during pan, should not crash
-  PerformGestureSwipe( application, startPos, direction, frames - 1, time, false );
+  PerformGestureSwipe(application, startPos, direction, frames - 1, time, false);
   try
   {
     scrollView.SetScrollSensitive(false);
@@ -704,57 +699,57 @@ int UtcDaliToolkitScrollModeP1(void)
 int UtcDaliToolkitScrollModeP2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliToolkitScrollView ScrollMode property" );
+  tet_infoline(" UtcDaliToolkitScrollView ScrollMode property");
 
   // Set up a scrollView.
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
-  Vector2 viewPageSize( 720.0f, 1280.0f );
-  scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
+  Vector2 viewPageSize(720.0f, 1280.0f);
+  scrollView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  scrollView.SetProperty(Actor::Property::SIZE, viewPageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  scrollView.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
 
   // Position rulers.
   Property::Map rulerMap;
-  rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
-  rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
-  rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height );
-  rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height*3 );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
+  rulerMap.Add(ScrollMode::X_AXIS_SCROLL_ENABLED, false);
+  rulerMap.Add(ScrollMode::Y_AXIS_SCROLL_ENABLED, true);
+  rulerMap.Add(ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height);
+  rulerMap.Add(ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height * 3);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_MODE, rulerMap);
 
-  scrollView.SetWrapMode( false );
-  scrollView.SetScrollSensitive( true );
+  scrollView.SetWrapMode(false);
+  scrollView.SetScrollSensitive(true);
 
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   // Set up a gesture to perform.
-  Vector2 startPos( 0.0f, 50.0f );
-  Vector2 direction( 0.0f, -6.0f );
-  int frames = 200;
-  uint32_t time = 0;
+  Vector2  startPos(0.0f, 50.0f);
+  Vector2  direction(0.0f, -6.0f);
+  int      frames = 200;
+  uint32_t time   = 0;
 
   // Force starting position.
-  scrollView.ScrollTo( startPos, 0.0f );
-  time += Wait( application );
+  scrollView.ScrollTo(startPos, 0.0f);
+  time += Wait(application);
 
   // Deliberately skip the "Finished" part of the gesture, so we can read the coordinates before the snap begins.
-  Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
+  Vector2 currentPos(PerformGestureSwipe(application, startPos, direction, frames - 1, time, false));
 
   // Confirm the final X coord has not moved more than one page from the start X position.
-  DALI_TEST_GREATER( ( startPos.y + viewPageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
+  DALI_TEST_GREATER((startPos.y + viewPageSize.height), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION);
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;
-  time += Wait( application );
-  TestEndPan( application, currentPos, time );
+  time += Wait(application);
+  TestEndPan(application, currentPos, time);
   // We add RENDER_FRAME_INTERVAL on to wait for an extra frame (for the last "finished" gesture to complete first.
-  Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
+  Wait(application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL);
 
   // Confirm the final Y coord has snapped to exactly one page ahead of the start page.
-  DALI_TEST_EQUALS( viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -762,56 +757,56 @@ int UtcDaliToolkitScrollModeP2(void)
 int UtcDaliToolkitScrollModeP3(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliToolkitScrollView ScrollMode property" );
+  tet_infoline(" UtcDaliToolkitScrollView ScrollMode property");
 
   // Set up a scrollView.
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
-  Vector2 viewPageSize( 720.0f, 1280.0f );
-  scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
+  Vector2 viewPageSize(720.0f, 1280.0f);
+  scrollView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  scrollView.SetProperty(Actor::Property::SIZE, viewPageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  scrollView.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
 
   // Position rulers.
   Property::Map rulerMap;
-  rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
-  rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
-  rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height );
-  rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height*3 );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
+  rulerMap.Add(ScrollMode::X_AXIS_SCROLL_ENABLED, false);
+  rulerMap.Add(ScrollMode::Y_AXIS_SCROLL_ENABLED, true);
+  rulerMap.Add(ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height);
+  rulerMap.Add(ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height * 3);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_MODE, rulerMap);
 
-  scrollView.SetWrapMode( false );
-  scrollView.SetScrollSensitive( true );
+  scrollView.SetWrapMode(false);
+  scrollView.SetScrollSensitive(true);
 
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   // Set up a gesture to perform.
-  Vector2 startPos( 0.0f, 50.0f );
-  Vector2 direction( 0.0f, -6.0f );
-  int frames = 200;
-  uint32_t time  = 0;
+  Vector2  startPos(0.0f, 50.0f);
+  Vector2  direction(0.0f, -6.0f);
+  int      frames = 200;
+  uint32_t time   = 0;
 
   // Force starting position.
-  scrollView.ScrollTo( startPos, 0.0f );
-  time += Wait( application );
+  scrollView.ScrollTo(startPos, 0.0f);
+  time += Wait(application);
 
   // Deliberately skip the "Finished" part of the gesture, so we can read the coordinates before the snap begins.
-  Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
+  Vector2 currentPos(PerformGestureSwipe(application, startPos, direction, frames - 1, time, false));
 
   // Confirm the final X coord has not moved more than one page from the start X position.
-  DALI_TEST_GREATER( ( startPos.y + viewPageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
+  DALI_TEST_GREATER((startPos.y + viewPageSize.height), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION);
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;
-  TestEndPan( application, currentPos, time );
+  TestEndPan(application, currentPos, time);
   // We add RENDER_FRAME_INTERVAL on to wait for an extra frame (for the last "finished" gesture to complete first.
-  Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
+  Wait(application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL);
 
   // Confirm the final Y coord has snapped to exactly one page ahead of the start page.
-  DALI_TEST_EQUALS( viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -819,29 +814,29 @@ int UtcDaliToolkitScrollModeP3(void)
 int UtcDaliToolkitScrollModeP4(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliToolkitScrollView ScrollMode property, DefaultRulers" );
+  tet_infoline(" UtcDaliToolkitScrollView ScrollMode property, DefaultRulers");
 
   // Set up a scrollView.
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
-  Vector2 viewPageSize( 720.0f, 1280.0f );
-  scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
+  Vector2 viewPageSize(720.0f, 1280.0f);
+  scrollView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  scrollView.SetProperty(Actor::Property::SIZE, viewPageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
 
   // Position rulers - expect Default rulers to be used which don't snap
   Property::Map rulerMap;
-  rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, true );
-  rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
+  rulerMap.Add(ScrollMode::X_AXIS_SCROLL_ENABLED, true);
+  rulerMap.Add(ScrollMode::Y_AXIS_SCROLL_ENABLED, true);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_MODE, rulerMap);
 
-  scrollView.SetWrapMode( false );
-  scrollView.SetScrollSensitive( true );
+  scrollView.SetWrapMode(false);
+  scrollView.SetScrollSensitive(true);
 
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   Vector2 START_POSITION = Vector2(10.0f, 10.0f);
 
@@ -851,27 +846,27 @@ int UtcDaliToolkitScrollModeP4(void)
 
   // Try a vertical swipe.
   // PerformGestureSwipe not used as a different initial direction was required
-  Vector2 pos( START_POSITION + Vector2(0.0f, 15.0f) );
-  Vector2 dir( 0.0f, 1.0f );
+  Vector2 pos(START_POSITION + Vector2(0.0f, 15.0f));
+  Vector2 dir(0.0f, 1.0f);
 
-  TestStartPan( application, START_POSITION, pos, time );
+  TestStartPan(application, START_POSITION, pos, time);
 
   Wait(application);
 
-  for( int i = 0; i<45; i++ )
+  for(int i = 0; i < 45; i++)
   {
     pos += dir;
-    TestMovePan( application, pos, time );
-    time += Wait( application );
+    TestMovePan(application, pos, time);
+    time += Wait(application);
   }
 
   pos += dir;
 
-  TestEndPan( application, pos, time );
-  Wait( application, RENDER_DELAY_SCROLL );
+  TestEndPan(application, pos, time);
+  Wait(application, RENDER_DELAY_SCROLL);
 
   // Take into account resampling done when prediction is off.
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -882,38 +877,38 @@ int UtcDaliToolkitScrollViewScrollToPageWithDirectionBiasP(void)
   tet_infoline(" UtcDaliToolkitScrollViewScrollToPageWithDirectionBiasP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
-  RulerPtr rulerX = new FixedRuler( 100.0f );
-  rulerX->SetDomain( RulerDomain(0.0f, 200.0f, true) );
-  RulerPtr rulerY = new FixedRuler( 100.0f );
-  rulerY->SetDomain( RulerDomain(0.0f, 200.0f, true) );
+  application.GetScene().Add(scrollView);
+  RulerPtr rulerX = new FixedRuler(100.0f);
+  rulerX->SetDomain(RulerDomain(0.0f, 200.0f, true));
+  RulerPtr rulerY = new FixedRuler(100.0f);
+  rulerY->SetDomain(RulerDomain(0.0f, 200.0f, true));
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
   scrollView.SetWrapMode(true);
 
-  scrollView.ScrollTo( 0, 0.25, Dali::Toolkit::DIRECTION_BIAS_LEFT );
+  scrollView.ScrollTo(0, 0.25, Dali::Toolkit::DIRECTION_BIAS_LEFT);
 
   Wait(application, RENDER_FRAME_INTERVAL); // Wait for one frame
   // Check that the scroll position remains the same
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION);
 
   Wait(application, RENDER_DELAY_SCROLL); // Wait for one second
   // Check that it stays at the same page (i.e. the same scroll position)
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION);
 
-  scrollView.ScrollTo( 0, 0.25, Dali::Toolkit::DIRECTION_BIAS_RIGHT );
+  scrollView.ScrollTo(0, 0.25, Dali::Toolkit::DIRECTION_BIAS_RIGHT);
 
   Wait(application, RENDER_FRAME_INTERVAL); // Wait for one frame
   // Check that it scrolls towards the right
-  DALI_TEST_CHECK( scrollView.GetCurrentScrollPosition().x > 0.0f );
+  DALI_TEST_CHECK(scrollView.GetCurrentScrollPosition().x > 0.0f);
 
   Wait(application, RENDER_DELAY_SCROLL); // Wait for one second
   // Check that it scrolls back to the same page (i.e. the same scroll position)
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -924,36 +919,36 @@ int UtcDaliToolkitScrollViewScrollToActorP(void)
   tet_infoline(" UtcDaliToolkitScrollViewScrollToActorP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
-  Actor actorA = Actor::New();
+  Actor         actorA    = Actor::New();
   const Vector3 positionA = Vector3(100.0f, 400.0f, 0.0f);
-  actorA.SetProperty( Actor::Property::POSITION, positionA );
+  actorA.SetProperty(Actor::Property::POSITION, positionA);
   scrollView.Add(actorA);
 
-  Actor actorB = Actor::New();
+  Actor         actorB    = Actor::New();
   const Vector3 positionB = Vector3(500.0f, 200.0f, 0.0f);
-  actorB.SetProperty( Actor::Property::POSITION, positionB );
+  actorB.SetProperty(Actor::Property::POSITION, positionB);
   scrollView.Add(actorB);
 
   Wait(application);
 
   scrollView.ScrollTo(actorA, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), positionA.GetVectorXY(), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), positionA.GetVectorXY(), TEST_LOCATION);
 
   Wait(application);
   scrollView.ScrollTo(actorB, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), positionB.GetVectorXY(), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), positionB.GetVectorXY(), TEST_LOCATION);
 
   scrollView.ScrollTo(actorA);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), positionA.GetVectorXY(), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), positionA.GetVectorXY(), TEST_LOCATION);
 
   scrollView.ScrollTo(actorB);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), positionB.GetVectorXY(), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), positionB.GetVectorXY(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -963,23 +958,23 @@ int UtcDaliToolkitScrollViewScrollToSnapPointP(void)
   tet_infoline(" UtcDaliToolkitScrollViewScrollToSnapPointP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
-  RulerPtr rulerX = new FixedRuler( 100.0f );
-  rulerX->SetDomain( RulerDomain(0.0f, 800.0f, true) );
-  RulerPtr rulerY = new FixedRuler( 100.0f );
-  rulerY->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  application.GetScene().Add(scrollView);
+  RulerPtr rulerX = new FixedRuler(100.0f);
+  rulerX->SetDomain(RulerDomain(0.0f, 800.0f, true));
+  RulerPtr rulerY = new FixedRuler(100.0f);
+  rulerY->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
-  scrollView.ScrollTo( Vector2(120.0f, 190.0f), 0.0f );
+  scrollView.ScrollTo(Vector2(120.0f, 190.0f), 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(120.0f, 190.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(120.0f, 190.0f), TEST_LOCATION);
 
   scrollView.ScrollToSnapPoint();
 
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 200.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 200.0f), TEST_LOCATION);
   END_TEST;
 }
 
@@ -991,11 +986,11 @@ int UtcDaliToolkitScrollViewSetScrollUpdateDistanceP(void)
   ScrollView scrollView = ScrollView::New();
 
   scrollView.SetScrollUpdateDistance(0);
-  DALI_TEST_EQUALS( scrollView.GetScrollUpdateDistance(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetScrollUpdateDistance(), 0, TEST_LOCATION);
   scrollView.SetScrollUpdateDistance(10);
-  DALI_TEST_EQUALS( scrollView.GetScrollUpdateDistance(), 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetScrollUpdateDistance(), 10, TEST_LOCATION);
   scrollView.SetScrollUpdateDistance(1000);
-  DALI_TEST_EQUALS( scrollView.GetScrollUpdateDistance(), 1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetScrollUpdateDistance(), 1000, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1005,28 +1000,28 @@ int UtcDaliToolkitScrollViewSetWrapModeP(void)
   tet_infoline(" UtcDaliToolkitScrollViewSetWrapModeP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   Actor actor = Actor::New();
-  scrollView.Add( actor );
+  scrollView.Add(actor);
 
   // Position rulers. 4x4 grid.
   RulerPtr rulerX = new FixedRuler(50.0f);
   RulerPtr rulerY = new FixedRuler(50.0f);
-  rulerX->SetDomain( RulerDomain(0.0f, 200.0f, false) );
-  rulerY->SetDomain( RulerDomain(0.0f, 200.0f, false) );
+  rulerX->SetDomain(RulerDomain(0.0f, 200.0f, false));
+  rulerY->SetDomain(RulerDomain(0.0f, 200.0f, false));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
 
   scrollView.SetWrapMode(false);
   scrollView.ScrollTo(Vector2(225.0f, 125.0f), 0.0f); // 5th (1st) page across, and 3rd (3rd) page down. (wrapped)
   Wait(application);
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 17, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 17, TEST_LOCATION);
 
   scrollView.SetWrapMode(true);
   scrollView.ScrollTo(Vector2(230.0f, 130.0f), 0.0f); // 5th (1st) page across, and 3rd (3rd) page down. (wrapped)
   Wait(application);
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 13, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 13, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1036,25 +1031,25 @@ int UtcDaliToolkitScrollViewActorAutoSnap(void)
   tet_infoline(" UtcDaliToolkitScrollViewActorAutoSnap");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
-  rulerY->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
+  rulerX->SetDomain(RulerDomain(0.0f, 1000.0f, false));
+  rulerY->SetDomain(RulerDomain(0.0f, 1000.0f, false));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
 
   const Vector3 aPosition = Vector3(200.0f, 50.0f, 0.0f);
-  Actor a = Actor::New();
+  Actor         a         = Actor::New();
   scrollView.Add(a);
-  a.SetProperty( Actor::Property::POSITION, aPosition );
+  a.SetProperty(Actor::Property::POSITION, aPosition);
 
   const Vector3 bPosition = Vector3(600.0f, 600.0f, 0.0f);
-  Actor b = Actor::New();
+  Actor         b         = Actor::New();
   scrollView.Add(b);
-  b.SetProperty( Actor::Property::POSITION, bPosition );
+  b.SetProperty(Actor::Property::POSITION, bPosition);
 
   // Goto a random position, and execute snap (should not move)
   Vector2 targetScroll = Vector2(500.0f, 500.0f);
@@ -1062,19 +1057,19 @@ int UtcDaliToolkitScrollViewActorAutoSnap(void)
   Wait(application);
   scrollView.ScrollToSnapPoint();
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), targetScroll, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), targetScroll, TEST_LOCATION);
 
   // Enable ActorAutoSnap, and now try snapping.
   scrollView.SetActorAutoSnap(true);
   scrollView.ScrollToSnapPoint();
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), bPosition.GetVectorXY(), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), bPosition.GetVectorXY(), TEST_LOCATION);
 
   scrollView.ScrollTo(Vector2(0.0f, 0.0f), 0.0f);
   Wait(application);
   scrollView.ScrollToSnapPoint();
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), aPosition.GetVectorXY(), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), aPosition.GetVectorXY(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -1083,23 +1078,23 @@ int UtcDaliToolkitScrollViewSignalsStartComplete(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewSignalsStartComplete");
 
-  gOnScrollStartCalled = false;
+  gOnScrollStartCalled    = false;
   gOnScrollCompleteCalled = false;
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
-  rulerY->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
+  rulerX->SetDomain(RulerDomain(0.0f, 1000.0f, false));
+  rulerY->SetDomain(RulerDomain(0.0f, 1000.0f, false));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
-  scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
-  scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
-  scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
-  scrollView.ScrollTo( Vector2(100.0f, 100.0f) );
+  scrollView.ScrollStartedSignal().Connect(&OnScrollStart);
+  scrollView.ScrollUpdatedSignal().Connect(&OnScrollUpdate);
+  scrollView.ScrollCompletedSignal().Connect(&OnScrollComplete);
+  scrollView.ScrollTo(Vector2(100.0f, 100.0f));
   Wait(application, RENDER_DELAY_SCROLL);
 
   DALI_TEST_CHECK(gOnScrollStartCalled);
@@ -1112,55 +1107,55 @@ int UtcDaliToolkitScrollViewSignalsUpdate01(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewSignalsUpdate");
 
-  gOnScrollStartCalled = false;
-  gOnScrollUpdateCalled = false;
+  gOnScrollStartCalled    = false;
+  gOnScrollUpdateCalled   = false;
   gOnScrollCompleteCalled = false;
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
-  rulerY->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
+  rulerX->SetDomain(RulerDomain(0.0f, 1000.0f, false));
+  rulerY->SetDomain(RulerDomain(0.0f, 1000.0f, false));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
-  scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
-  scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
-  scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
+  scrollView.ScrollStartedSignal().Connect(&OnScrollStart);
+  scrollView.ScrollUpdatedSignal().Connect(&OnScrollUpdate);
+  scrollView.ScrollCompletedSignal().Connect(&OnScrollComplete);
 
   Actor image = Actor::New();
-  image.SetProperty( Actor::Property::SIZE, stageSize);
-  image.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  image.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  image.SetProperty(Actor::Property::SIZE, stageSize);
+  image.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  image.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   scrollView.Add(image);
 
   Wait(application);
 
   // Do a pan starting from 100,100 and moving down diagonally.
-  Vector2 pos(100.0f, 100.0f);
+  Vector2  pos(100.0f, 100.0f);
   uint32_t time = 100;
-  TestStartPan( application, pos, pos, time );
+  TestStartPan(application, pos, pos, time);
   pos.x += 5.0f;
   pos.y += 5.0f;
   Wait(application, 100);
 
-  for(int i = 0;i<20;i++)
+  for(int i = 0; i < 20; i++)
   {
     time += RENDER_FRAME_INTERVAL;
-    TestMovePan( application, pos, time);
+    TestMovePan(application, pos, time);
     pos.x += 5.0f;
     pos.y += 5.0f;
     Wait(application);
   }
 
   time += RENDER_FRAME_INTERVAL;
-  TestEndPan(application, pos, time );
+  TestEndPan(application, pos, time);
   Wait(application, RENDER_DELAY_SCROLL);
 
   DALI_TEST_CHECK(gOnScrollStartCalled);
@@ -1174,66 +1169,66 @@ int UtcDaliToolkitScrollViewSignalsUpdate02(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewSignalsUpdate");
 
-  gOnScrollStartCalled = false;
-  gOnScrollUpdateCalled = false;
+  gOnScrollStartCalled    = false;
+  gOnScrollUpdateCalled   = false;
   gOnScrollCompleteCalled = false;
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
-  rulerY->SetDomain( RulerDomain(0.0f, 1000.0f, false) );
+  rulerX->SetDomain(RulerDomain(0.0f, 1000.0f, false));
+  rulerY->SetDomain(RulerDomain(0.0f, 1000.0f, false));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
   Dali::ConnectionTracker tracker;
-  bool scrollStarted=false;
-  bool scrollUpdated=false;
-  bool scrollCompleted=false;
-  DALI_TEST_CHECK(scrollView.ConnectSignal( &tracker, "scrollStarted", CallbackFunctor(&scrollStarted) ));
-  DALI_TEST_CHECK(scrollView.ConnectSignal( &tracker, "scrollUpdated", CallbackFunctor(&scrollUpdated) ));
-  DALI_TEST_CHECK(scrollView.ConnectSignal( &tracker, "scrollCompleted", CallbackFunctor(&scrollCompleted) ));
+  bool                    scrollStarted   = false;
+  bool                    scrollUpdated   = false;
+  bool                    scrollCompleted = false;
+  DALI_TEST_CHECK(scrollView.ConnectSignal(&tracker, "scrollStarted", CallbackFunctor(&scrollStarted)));
+  DALI_TEST_CHECK(scrollView.ConnectSignal(&tracker, "scrollUpdated", CallbackFunctor(&scrollUpdated)));
+  DALI_TEST_CHECK(scrollView.ConnectSignal(&tracker, "scrollCompleted", CallbackFunctor(&scrollCompleted)));
 
   Actor image = Actor::New();
-  image.SetProperty( Actor::Property::SIZE, stageSize);
-  image.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  image.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  image.SetProperty(Actor::Property::SIZE, stageSize);
+  image.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  image.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   scrollView.Add(image);
 
   Wait(application);
 
   // Do a pan starting from 100,100 and moving down diagonally.
-  Vector2 pos(100.0f, 100.0f);
+  Vector2  pos(100.0f, 100.0f);
   uint32_t time = 100;
-  TestStartPan( application, pos, pos, time );
+  TestStartPan(application, pos, pos, time);
   pos.x += 5.0f;
   pos.y += 5.0f;
   Wait(application, 100);
 
-  for(int i = 0;i<20;i++)
+  for(int i = 0; i < 20; i++)
   {
     time += RENDER_FRAME_INTERVAL;
-    TestMovePan( application, pos, time);
+    TestMovePan(application, pos, time);
     pos.x += 5.0f;
     pos.y += 5.0f;
     Wait(application);
   }
 
   time += RENDER_FRAME_INTERVAL;
-  TestEndPan(application, pos, time );
+  TestEndPan(application, pos, time);
   Wait(application, RENDER_DELAY_SCROLL);
 
   DALI_TEST_CHECK(scrollStarted);
   DALI_TEST_CHECK(scrollUpdated);
   DALI_TEST_CHECK(scrollCompleted);
 
-  application.GetScene().Remove( scrollView );
+  application.GetScene().Remove(scrollView);
 
   END_TEST;
 }
@@ -1246,43 +1241,43 @@ int UtcDaliToolkitScrollViewScrollSensitive(void)
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
   scrollView.SetOvershootEnabled(true);
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
-  scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
-  scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
-  scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
-  scrollView.SnapStartedSignal().Connect( &OnSnapStart );
+  scrollView.ScrollStartedSignal().Connect(&OnScrollStart);
+  scrollView.ScrollUpdatedSignal().Connect(&OnScrollUpdate);
+  scrollView.ScrollCompletedSignal().Connect(&OnScrollComplete);
+  scrollView.SnapStartedSignal().Connect(&OnSnapStart);
 
   scrollView.ScrollTo(CLAMP_START_SCROLL_POSITION, 0.0f); // move in a little.
   uint32_t time = 0;
-  time +=Wait(application);
+  time += Wait(application);
 
   // First try insensitive swipe.
   scrollView.SetScrollSensitive(false);
   PerformGestureSwipe(application, CLAMP_TOUCH_START, CLAMP_TOUCH_MOVEMENT, CLAMP_GESTURE_FRAMES, time, true);
 
-  DALI_TEST_CHECK( !gOnScrollStartCalled );
-  DALI_TEST_CHECK( !gOnScrollCompleteCalled );
-  DALI_TEST_CHECK( !gOnSnapStartCalled );
+  DALI_TEST_CHECK(!gOnScrollStartCalled);
+  DALI_TEST_CHECK(!gOnScrollCompleteCalled);
+  DALI_TEST_CHECK(!gOnSnapStartCalled);
 
   // Second try sensitive swipe.
   scrollView.SetScrollSensitive(true);
   PerformGestureSwipe(application, CLAMP_TOUCH_START, CLAMP_TOUCH_MOVEMENT, CLAMP_GESTURE_FRAMES, time, true);
 
-  DALI_TEST_CHECK( gOnScrollStartCalled );
-  DALI_TEST_CHECK( gOnScrollCompleteCalled );
-  DALI_TEST_CHECK( gOnSnapStartCalled );
+  DALI_TEST_CHECK(gOnScrollStartCalled);
+  DALI_TEST_CHECK(gOnScrollCompleteCalled);
+  DALI_TEST_CHECK(gOnSnapStartCalled);
   END_TEST;
 }
 
@@ -1293,22 +1288,22 @@ int UtcDaliToolkitScrollViewAxisAutoLock(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
-  scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
-  scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
-  scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
+  scrollView.ScrollStartedSignal().Connect(&OnScrollStart);
+  scrollView.ScrollUpdatedSignal().Connect(&OnScrollUpdate);
+  scrollView.ScrollCompletedSignal().Connect(&OnScrollComplete);
 
   // Normal
   scrollView.ScrollTo(Vector2(100.0f, 100.0f), 0.0f); // move in a little.
@@ -1320,22 +1315,22 @@ int UtcDaliToolkitScrollViewAxisAutoLock(void)
 
   // PerformGestureSwipe not used as a different initial direction was required
 
-  Vector2 pos( CLAMP_TOUCH_START + Vector2(15.0f, 3.0f) );
+  Vector2 pos(CLAMP_TOUCH_START + Vector2(15.0f, 3.0f));
 
-  TestStartPan( application, CLAMP_TOUCH_START, pos, time );
+  TestStartPan(application, CLAMP_TOUCH_START, pos, time);
 
   time += Wait(application);
 
-  for( int i = 0; i<47; i++ )
+  for(int i = 0; i < 47; i++)
   {
     pos += dir;
-    TestMovePan( application, pos, time );
-    time += Wait( application );
+    TestMovePan(application, pos, time);
+    time += Wait(application);
   }
 
   pos += dir;
 
-  TestEndPan( application, pos, time );
+  TestEndPan(application, pos, time);
 
   const Vector2 positionAfterNormal = scrollView.GetCurrentScrollPosition();
 
@@ -1346,27 +1341,27 @@ int UtcDaliToolkitScrollViewAxisAutoLock(void)
   scrollView.ScrollTo(Vector2(100.0f, 100.0f), 0.0f); // move in a little.
   time += Wait(application);
 
-  Vector2 pos2( CLAMP_TOUCH_START + Vector2(15.0f, 3.0f) );
+  Vector2 pos2(CLAMP_TOUCH_START + Vector2(15.0f, 3.0f));
 
-  TestStartPan( application, CLAMP_TOUCH_START, pos2, time );
+  TestStartPan(application, CLAMP_TOUCH_START, pos2, time);
 
   time += Wait(application);
 
-  for( int i = 0; i<47; i++ )
+  for(int i = 0; i < 47; i++)
   {
     pos2 += dir;
-    TestMovePan( application, pos2, time );
-    time += Wait( application );
+    TestMovePan(application, pos2, time);
+    time += Wait(application);
   }
 
   pos2 += dir;
 
-  TestEndPan( application, pos2, time );
+  TestEndPan(application, pos2, time);
 
   const Vector2 positionAfterAutoLock = scrollView.GetCurrentScrollPosition();
 
   // compare how much the Y position has deviated for normal and autolock.
-  const float devianceNormal = fabsf(startPosition.y - positionAfterNormal.y);
+  const float devianceNormal   = fabsf(startPosition.y - positionAfterNormal.y);
   const float devianceAutoLock = fabsf(startPosition.y - positionAfterAutoLock.y);
 
   // in auto-lock it should be a mostly horizontal pan (thus deviance should be much lower)
@@ -1398,41 +1393,41 @@ int UtcDaliToolkitScrollViewConstraints(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
 
   // Add an Actor to ScrollView,
   // Apply TestSumConstraint to ScrollView's children (includes this Actor)
   gConstraintResult = Vector3::ZERO;
-  Actor a = Actor::New();
+  Actor a           = Actor::New();
   scrollView.Add(a);
-  a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
+  a.SetProperty(Actor::Property::POSITION, TEST_ACTOR_POSITION);
   Wait(application);
 
-  Constraint constraint = Constraint::New<Vector3>( scrollView, Actor::Property::POSITION, TestSumConstraint( TEST_CONSTRAINT_OFFSET ) );
-  constraint.AddSource( Source(scrollView, ScrollView::Property::SCROLL_POSITION) );
+  Constraint constraint = Constraint::New<Vector3>(scrollView, Actor::Property::POSITION, TestSumConstraint(TEST_CONSTRAINT_OFFSET));
+  constraint.AddSource(Source(scrollView, ScrollView::Property::SCROLL_POSITION));
   constraint.SetRemoveAction(Constraint::DISCARD);
   scrollView.ApplyConstraintToChildren(constraint);
   Wait(application);
 
-  DALI_TEST_EQUALS( gConstraintResult, TEST_ACTOR_POSITION + TEST_CONSTRAINT_OFFSET, TEST_LOCATION );
+  DALI_TEST_EQUALS(gConstraintResult, TEST_ACTOR_POSITION + TEST_CONSTRAINT_OFFSET, TEST_LOCATION);
 
   gConstraintResult = Vector3::ZERO;
   scrollView.RemoveConstraintsFromChildren();
   Wait(application);
 
-  DALI_TEST_EQUALS( gConstraintResult, Vector3::ZERO, TEST_LOCATION );
+  DALI_TEST_EQUALS(gConstraintResult, Vector3::ZERO, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1443,17 +1438,17 @@ int UtcDaliToolkitScrollViewBind(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
 
@@ -1461,32 +1456,32 @@ int UtcDaliToolkitScrollViewBind(void)
   // Apply TestSumConstraint to ScrollView's children (includes this Actor)
 
   gConstraintResult = Vector3::ZERO;
-  Actor a = Actor::New();
+  Actor a           = Actor::New();
   scrollView.Add(a);
-  a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
+  a.SetProperty(Actor::Property::POSITION, TEST_ACTOR_POSITION);
   Wait(application);
 
   // apply this constraint to scrollview
-  Constraint constraint = Constraint::New<Vector3>( scrollView, Actor::Property::POSITION, TestSumConstraint( TEST_CONSTRAINT_OFFSET ) );
-  constraint.AddSource( Source(scrollView, ScrollView::Property::SCROLL_POSITION) );
+  Constraint constraint = Constraint::New<Vector3>(scrollView, Actor::Property::POSITION, TestSumConstraint(TEST_CONSTRAINT_OFFSET));
+  constraint.AddSource(Source(scrollView, ScrollView::Property::SCROLL_POSITION));
   constraint.SetRemoveAction(Constraint::DISCARD);
   scrollView.ApplyConstraintToChildren(constraint);
 
   Wait(application);
   // Defaulty Bound.
-  DALI_TEST_EQUALS( gConstraintResult, TEST_ACTOR_POSITION + TEST_CONSTRAINT_OFFSET, TEST_LOCATION );
+  DALI_TEST_EQUALS(gConstraintResult, TEST_ACTOR_POSITION + TEST_CONSTRAINT_OFFSET, TEST_LOCATION);
 
   // UnBind
   gConstraintResult = Vector3::ZERO;
-  scrollView.UnbindActor( a );
+  scrollView.UnbindActor(a);
   Wait(application);
-  DALI_TEST_EQUALS( gConstraintResult, Vector3::ZERO, TEST_LOCATION );
+  DALI_TEST_EQUALS(gConstraintResult, Vector3::ZERO, TEST_LOCATION);
 
   // Bind
   gConstraintResult = Vector3::ZERO;
-  scrollView.BindActor( a );
+  scrollView.BindActor(a);
   Wait(application);
-  DALI_TEST_EQUALS( gConstraintResult, TEST_ACTOR_POSITION + TEST_CONSTRAINT_OFFSET, TEST_LOCATION );
+  DALI_TEST_EQUALS(gConstraintResult, TEST_ACTOR_POSITION + TEST_CONSTRAINT_OFFSET, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1499,37 +1494,37 @@ int UtcDaliToolkitScrollViewOvershoot(void)
   ScrollView scrollView = ScrollView::New();
   scrollView.SetOvershootEnabled(true);
 
-  uint32_t time = 0;
-  Vector2 overshootSize = Vector2(100.0f,100.0f);
-  scrollView.SetProperty( Scrollable::Property::OVERSHOOT_SIZE, overshootSize );
-  DALI_TEST_EQUALS( scrollView.GetProperty(Scrollable::Property::OVERSHOOT_SIZE).Get<Vector2>(), overshootSize, TEST_LOCATION );
+  uint32_t time          = 0;
+  Vector2  overshootSize = Vector2(100.0f, 100.0f);
+  scrollView.SetProperty(Scrollable::Property::OVERSHOOT_SIZE, overshootSize);
+  DALI_TEST_EQUALS(scrollView.GetProperty(Scrollable::Property::OVERSHOOT_SIZE).Get<Vector2>(), overshootSize, TEST_LOCATION);
 
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
-  scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
-  scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
-  scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
+  scrollView.ScrollStartedSignal().Connect(&OnScrollStart);
+  scrollView.ScrollUpdatedSignal().Connect(&OnScrollUpdate);
+  scrollView.ScrollCompletedSignal().Connect(&OnScrollComplete);
 
   scrollView.ScrollTo(OVERSHOOT_START_SCROLL_POSITION, 0.0f); // move in a little.
   time += Wait(application);
 
   // 1. Scroll page in NW (-500,-500 pixels), then inspect overshoot. (don't release touch)
-  Vector2 currentPos = Vector2(100.0f, 100.0f);
-  currentPos = PerformGestureSwipe(application, currentPos, Vector2(5.0f, 5.0f), 100, time, false);
-  float overshootXValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_X );
-  float overshootYValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_Y );
-  Vector2 positionValue = scrollView.GetCurrentProperty< Vector2 >( ScrollView::Property::SCROLL_POSITION );
+  Vector2 currentPos      = Vector2(100.0f, 100.0f);
+  currentPos              = PerformGestureSwipe(application, currentPos, Vector2(5.0f, 5.0f), 100, time, false);
+  float   overshootXValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_X);
+  float   overshootYValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_Y);
+  Vector2 positionValue   = scrollView.GetCurrentProperty<Vector2>(ScrollView::Property::SCROLL_POSITION);
   DALI_TEST_EQUALS(overshootXValue, 1.0f, TEST_LOCATION);
   DALI_TEST_EQUALS(overshootYValue, 1.0f, TEST_LOCATION);
   DALI_TEST_EQUALS(positionValue, Vector2::ZERO, TEST_LOCATION);
@@ -1544,8 +1539,8 @@ int UtcDaliToolkitScrollViewOvershoot(void)
   float minTimeToReachOrigin = SCROLL_ANIMATION_DURATION + DEFAULT_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) - TIME_TOLERANCE;
   float maxTimeToReachOrigin = SCROLL_ANIMATION_DURATION + DEFAULT_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) + TIME_TOLERANCE;
 
-  DALI_TEST_CHECK( (timeToReachOrigin > minTimeToReachOrigin) &&
-                   (timeToReachOrigin < maxTimeToReachOrigin) );
+  DALI_TEST_CHECK((timeToReachOrigin > minTimeToReachOrigin) &&
+                  (timeToReachOrigin < maxTimeToReachOrigin));
 
   // 2. Repeat Scroll, but this time change overshoot snap duration to shorter time
   scrollView.SetSnapOvershootDuration(TEST_CUSTOM1_SNAP_OVERSHOOT_DURATION);
@@ -1558,8 +1553,8 @@ int UtcDaliToolkitScrollViewOvershoot(void)
   minTimeToReachOrigin = SCROLL_ANIMATION_DURATION + TEST_CUSTOM1_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) - TIME_TOLERANCE;
   maxTimeToReachOrigin = SCROLL_ANIMATION_DURATION + TEST_CUSTOM1_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) + TIME_TOLERANCE;
 
-  DALI_TEST_CHECK( (timeToReachOrigin > minTimeToReachOrigin) &&
-                   (timeToReachOrigin < maxTimeToReachOrigin) );
+  DALI_TEST_CHECK((timeToReachOrigin > minTimeToReachOrigin) &&
+                  (timeToReachOrigin < maxTimeToReachOrigin));
 
   // 3. Repeat Scroll, but this time change overshoot snap duration to longer time.
   scrollView.SetSnapOvershootDuration(TEST_CUSTOM2_SNAP_OVERSHOOT_DURATION);
@@ -1572,8 +1567,8 @@ int UtcDaliToolkitScrollViewOvershoot(void)
   minTimeToReachOrigin = SCROLL_ANIMATION_DURATION + TEST_CUSTOM2_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) - TIME_TOLERANCE;
   maxTimeToReachOrigin = SCROLL_ANIMATION_DURATION + TEST_CUSTOM2_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) + TIME_TOLERANCE;
 
-  DALI_TEST_CHECK( (timeToReachOrigin > minTimeToReachOrigin) &&
-                   (timeToReachOrigin < maxTimeToReachOrigin) );
+  DALI_TEST_CHECK((timeToReachOrigin > minTimeToReachOrigin) &&
+                  (timeToReachOrigin < maxTimeToReachOrigin));
 
   // 4. Repeat Scroll, but this time change overshoot function.
   scrollView.SetSnapOvershootDuration(TEST_CUSTOM3_SNAP_OVERSHOOT_DURATION);
@@ -1587,8 +1582,8 @@ int UtcDaliToolkitScrollViewOvershoot(void)
   minTimeToReachOrigin = SCROLL_ANIMATION_DURATION + TEST_CUSTOM3_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) - TIME_TOLERANCE;
   maxTimeToReachOrigin = SCROLL_ANIMATION_DURATION + TEST_CUSTOM3_SNAP_OVERSHOOT_DURATION * (SNAP_POSITION_WITH_DECELERATED_VELOCITY.x / DEFAULT_MAX_OVERSHOOT) + TIME_TOLERANCE;
 
-  DALI_TEST_CHECK( (timeToReachOrigin > minTimeToReachOrigin) &&
-                   (timeToReachOrigin < maxTimeToReachOrigin) );
+  DALI_TEST_CHECK((timeToReachOrigin > minTimeToReachOrigin) &&
+                  (timeToReachOrigin < maxTimeToReachOrigin));
   END_TEST;
 }
 
@@ -1599,13 +1594,13 @@ int UtcDaliToolkitScrollViewSnapAlphaFunction(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  scrollView.SetScrollSnapAlphaFunction( AlphaFunction::EASE_IN );
-  DALI_TEST_CHECK( scrollView.GetScrollSnapAlphaFunction().GetBuiltinFunction() == AlphaFunction::EASE_IN );
-  scrollView.SetScrollSnapAlphaFunction( AlphaFunction::EASE_OUT );
-  DALI_TEST_CHECK( scrollView.GetScrollSnapAlphaFunction().GetBuiltinFunction() == AlphaFunction::EASE_OUT );
+  scrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_IN);
+  DALI_TEST_CHECK(scrollView.GetScrollSnapAlphaFunction().GetBuiltinFunction() == AlphaFunction::EASE_IN);
+  scrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_OUT);
+  DALI_TEST_CHECK(scrollView.GetScrollSnapAlphaFunction().GetBuiltinFunction() == AlphaFunction::EASE_OUT);
 
-  scrollView.SetScrollFlickAlphaFunction( AlphaFunction::BOUNCE );
-  DALI_TEST_CHECK( scrollView.GetScrollFlickAlphaFunction().GetBuiltinFunction() == AlphaFunction::BOUNCE );
+  scrollView.SetScrollFlickAlphaFunction(AlphaFunction::BOUNCE);
+  DALI_TEST_CHECK(scrollView.GetScrollFlickAlphaFunction().GetBuiltinFunction() == AlphaFunction::BOUNCE);
 
   END_TEST;
 }
@@ -1617,15 +1612,15 @@ int UtcDaliToolkitScrollViewSnapDuration(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  scrollView.SetScrollSnapDuration( 1.0f );
-  DALI_TEST_EQUALS( scrollView.GetScrollSnapDuration(), 1.0f, TEST_LOCATION );
-  scrollView.SetScrollSnapDuration( 0.5f );
-  DALI_TEST_EQUALS( scrollView.GetScrollSnapDuration(), 0.5f, TEST_LOCATION );
+  scrollView.SetScrollSnapDuration(1.0f);
+  DALI_TEST_EQUALS(scrollView.GetScrollSnapDuration(), 1.0f, TEST_LOCATION);
+  scrollView.SetScrollSnapDuration(0.5f);
+  DALI_TEST_EQUALS(scrollView.GetScrollSnapDuration(), 0.5f, TEST_LOCATION);
 
-  scrollView.SetScrollFlickDuration( 2.0f );
-  DALI_TEST_EQUALS( scrollView.GetScrollFlickDuration(), 2.0f, TEST_LOCATION );
-  scrollView.SetScrollFlickDuration( 1.5f );
-  DALI_TEST_EQUALS( scrollView.GetScrollFlickDuration(), 1.5f, TEST_LOCATION );
+  scrollView.SetScrollFlickDuration(2.0f);
+  DALI_TEST_EQUALS(scrollView.GetScrollFlickDuration(), 2.0f, TEST_LOCATION);
+  scrollView.SetScrollFlickDuration(1.5f);
+  DALI_TEST_EQUALS(scrollView.GetScrollFlickDuration(), 1.5f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1636,20 +1631,20 @@ int UtcDaliToolkitScrollViewSnapStartedSignalP(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
-  scrollView.SnapStartedSignal().Connect( &OnSnapStart );
+  scrollView.SnapStartedSignal().Connect(&OnSnapStart);
 
   scrollView.ScrollTo(CLAMP_START_SCROLL_POSITION, 0.0f); // move in a little.
   uint32_t time = 0;
@@ -1658,14 +1653,14 @@ int UtcDaliToolkitScrollViewSnapStartedSignalP(void)
   // First try a snap.
   PerformGestureSwipe(application, CLAMP_TOUCH_START, Vector2(0.5f, 0.0f), 60, time, true);
 
-  DALI_TEST_CHECK( gOnSnapStartCalled );
-  DALI_TEST_CHECK( gLastSnapType == Toolkit::SNAP );
+  DALI_TEST_CHECK(gOnSnapStartCalled);
+  DALI_TEST_CHECK(gLastSnapType == Toolkit::SNAP);
 
   // Second try a swipe.
   PerformGestureSwipe(application, CLAMP_TOUCH_START, Vector2(20.0f, 0.0f), 60, time, true);
 
-  DALI_TEST_CHECK( gOnSnapStartCalled );
-  DALI_TEST_CHECK( gLastSnapType == Toolkit::FLICK );
+  DALI_TEST_CHECK(gOnSnapStartCalled);
+  DALI_TEST_CHECK(gLastSnapType == Toolkit::FLICK);
   END_TEST;
 }
 
@@ -1675,26 +1670,26 @@ int UtcDaliToolkitScrollViewGetCurrentPageP(void)
   tet_infoline(" UtcDaliToolkitScrollViewGetCurrentPageP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
-  RulerPtr rulerX = new FixedRuler( 100.0f );
-  rulerX->SetDomain( RulerDomain(0.0f, 800.0f, true) );
-  RulerPtr rulerY = new FixedRuler( 100.0f );
-  rulerY->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  application.GetScene().Add(scrollView);
+  RulerPtr rulerX = new FixedRuler(100.0f);
+  rulerX->SetDomain(RulerDomain(0.0f, 800.0f, true));
+  RulerPtr rulerY = new FixedRuler(100.0f);
+  rulerY->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
-  scrollView.ScrollTo( 15 );
+  scrollView.ScrollTo(15);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 15, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 15, TEST_LOCATION);
 
-  scrollView.ScrollTo( 3 );
+  scrollView.ScrollTo(3);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 3, TEST_LOCATION);
 
-  scrollView.ScrollTo( 9 );
+  scrollView.ScrollTo(9);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( static_cast<int>(scrollView.GetCurrentPage()), 9, TEST_LOCATION );
+  DALI_TEST_EQUALS(static_cast<int>(scrollView.GetCurrentPage()), 9, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1706,17 +1701,17 @@ int UtcDaliToolkitScrollViewSetMaxOvershootP(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
 
@@ -1728,39 +1723,39 @@ int UtcDaliToolkitScrollViewSetMaxOvershootP(void)
   time += Wait(application);
 
   // Scroll page in NW (-20,-20 pixels), then check that overshoot should be 0. (don't release touch)
-  Vector2 currentPos = PerformGestureSwipe(application, OVERSHOOT_START_SCROLL_POSITION, Vector2(1.0f, 1.0f), 10, time, false);
-  float overshootXValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_X );
-  float overshootYValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_Y );
+  Vector2 currentPos      = PerformGestureSwipe(application, OVERSHOOT_START_SCROLL_POSITION, Vector2(1.0f, 1.0f), 10, time, false);
+  float   overshootXValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_X);
+  float   overshootYValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_Y);
   DALI_TEST_EQUALS(overshootXValue, 0.0f, TEST_LOCATION);
   DALI_TEST_EQUALS(overshootYValue, 0.0f, TEST_LOCATION);
 
   time += Wait(application);
   // Scroll page further in NW (-105,-105 pixels), then check that overshoot should be around 0.5. (don't release touch)
-  for(int i = 0; i<106; i++)
+  for(int i = 0; i < 106; i++)
   {
-    TestMovePan(application, currentPos, time );
+    TestMovePan(application, currentPos, time);
     currentPos += Vector2(1.0f, 1.0f);
     time += Wait(application);
   }
 
-  overshootXValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_X );
-  overshootYValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_Y );
+  overshootXValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_X);
+  overshootYValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_Y);
   // The overshoot value is a 0.0f - 1.0f ranged value of the amount overshot related to the maximum overshoot.
   // EG. If we move 105, max overshoot is 50, then we overshot 50 / 105.
-  float correctOvershootValue = 0.508f;   // This was measured and then set as the limit
-  DALI_TEST_EQUALS( overshootXValue, correctOvershootValue, 0.001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( overshootYValue, correctOvershootValue, 0.001f, TEST_LOCATION );
+  float correctOvershootValue = 0.508f; // This was measured and then set as the limit
+  DALI_TEST_EQUALS(overshootXValue, correctOvershootValue, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(overshootYValue, correctOvershootValue, 0.001f, TEST_LOCATION);
 
   // Scroll page further in NW (-25,-25 pixels), then check that overshoot should be now 1.0. (don't release touch)
-  for(int i = 0;i<25;i++)
+  for(int i = 0; i < 25; i++)
   {
-    TestMovePan(application, currentPos, time );
+    TestMovePan(application, currentPos, time);
     currentPos += Vector2(1.0f, 1.0f); // Move in this direction
     time += Wait(application);
   }
 
-  overshootXValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_X );
-  overshootYValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_Y );
+  overshootXValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_X);
+  overshootYValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_Y);
   DALI_TEST_EQUALS(overshootXValue, 1.0f, TEST_LOCATION);
   DALI_TEST_EQUALS(overshootYValue, 1.0f, TEST_LOCATION);
 
@@ -1769,21 +1764,21 @@ int UtcDaliToolkitScrollViewSetMaxOvershootP(void)
   time += Wait(application);
 
   // Check that overshoot should be now around 0.8.
-  overshootXValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_X );
-  overshootYValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_Y );
+  overshootXValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_X);
+  overshootYValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_Y);
   DALI_TEST_CHECK(overshootXValue > 0.79f && overshootXValue < 0.81f);
   DALI_TEST_CHECK(overshootYValue > 0.79f && overshootYValue < 0.81f);
 
   // Scroll page further in NW (-50,-50 pixels), then check that overshoot should be now 1.0. (don't release touch)
-  for(int i = 0;i<50;i++)
+  for(int i = 0; i < 50; i++)
   {
-    TestMovePan(application, currentPos, time );
+    TestMovePan(application, currentPos, time);
     currentPos += Vector2(1.0f, 1.0f); // Move in this direction
     time += Wait(application);
   }
 
-  overshootXValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_X );
-  overshootYValue = scrollView.GetCurrentProperty< float >( ScrollView::Property::OVERSHOOT_Y );
+  overshootXValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_X);
+  overshootYValue = scrollView.GetCurrentProperty<float>(ScrollView::Property::OVERSHOOT_Y);
   DALI_TEST_EQUALS(overshootXValue, 1.0f, TEST_LOCATION);
   DALI_TEST_EQUALS(overshootYValue, 1.0f, TEST_LOCATION);
 
@@ -1797,11 +1792,11 @@ int UtcDaliToolkitScrollViewSetScrollingDirectionP(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   Vector2 START_POSITION = Vector2(10.0f, 10.0f);
 
@@ -1812,21 +1807,21 @@ int UtcDaliToolkitScrollViewSetScrollingDirectionP(void)
   // Try a vertical swipe.
   // PerformGestureSwipe not used as a different initial direction was required
 
-  Vector2 pos( START_POSITION + Vector2(0.0f, 15.0f) );
-  TestStartPan( application, START_POSITION, pos, time );
+  Vector2 pos(START_POSITION + Vector2(0.0f, 15.0f));
+  TestStartPan(application, START_POSITION, pos, time);
   time += Wait(application);
-  for( int i = 0; i<45; i++ )
+  for(int i = 0; i < 45; i++)
   {
     pos += Vector2(0.0f, 1.0f);
-    TestMovePan( application, pos, time );
-    time += Wait( application );
+    TestMovePan(application, pos, time);
+    time += Wait(application);
   }
   pos += Vector2(0.0f, 1.0f);
-  TestEndPan( application, pos, time );
-  time += Wait( application );
+  TestEndPan(application, pos, time);
+  time += Wait(application);
 
   // Take into account resampling done when prediction is off.
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION);
 
   scrollView.SetScrollingDirection(Dali::PanGestureDetector::DIRECTION_VERTICAL);
 
@@ -1835,20 +1830,20 @@ int UtcDaliToolkitScrollViewSetScrollingDirectionP(void)
 
   // Try a vertical swipe.
   // PerformGestureSwipe not used as a different initial direction was required
-  pos = ( START_POSITION + Vector2(0.0f, 15.0f) );
-  TestStartPan( application, START_POSITION, pos, time );
+  pos = (START_POSITION + Vector2(0.0f, 15.0f));
+  TestStartPan(application, START_POSITION, pos, time);
   time += Wait(application);
-  for( int i = 0; i<45; i++ )
+  for(int i = 0; i < 45; i++)
   {
     pos += Vector2(0.0f, 1.0f);
-    TestMovePan( application, pos, time );
-    time += Wait( application );
+    TestMovePan(application, pos, time);
+    time += Wait(application);
   }
   pos += Vector2(0.0f, 1.0f);
-  TestEndPan( application, pos, time );
-  time += Wait( application );
+  TestEndPan(application, pos, time);
+  time += Wait(application);
 
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION);
 
   scrollView.RemoveScrollingDirection(Dali::PanGestureDetector::DIRECTION_VERTICAL);
 
@@ -1858,20 +1853,20 @@ int UtcDaliToolkitScrollViewSetScrollingDirectionP(void)
 
   // Try a vertical swipe.
   // PerformGestureSwipe not used as a different initial direction was required
-  pos = ( START_POSITION + Vector2(0.0f, 15.0f) );
-  TestStartPan( application, START_POSITION, pos, time );
+  pos = (START_POSITION + Vector2(0.0f, 15.0f));
+  TestStartPan(application, START_POSITION, pos, time);
   time += Wait(application);
-  for( int i = 0; i<45; i++ )
+  for(int i = 0; i < 45; i++)
   {
     pos += Vector2(0.0f, 1.0f);
-    TestMovePan( application, pos, time );
-    time += Wait( application );
+    TestMovePan(application, pos, time);
+    time += Wait(application);
   }
   pos += Vector2(0.0f, 1.0f);
-  TestEndPan( application, pos, time );
-  time += Wait( application );
+  TestEndPan(application, pos, time);
+  time += Wait(application);
 
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1883,14 +1878,14 @@ int UtcDaliToolkitScrollViewRemoveScrollingDirectionP(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
-  Vector2 START_POSITION = Vector2(10.0f, 10.0f);
-  uint32_t time = 0;
+  Vector2  START_POSITION = Vector2(10.0f, 10.0f);
+  uint32_t time           = 0;
 
   scrollView.SetScrollingDirection(Dali::PanGestureDetector::DIRECTION_VERTICAL);
 
@@ -1898,24 +1893,24 @@ int UtcDaliToolkitScrollViewRemoveScrollingDirectionP(void)
 
   time += Wait(application);
 
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), START_POSITION, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), START_POSITION, TEST_LOCATION);
 
   // Try a vertical swipe.
   // PerformGestureSwipe not used as a different initial direction was required
-  Vector2 pos( START_POSITION + Vector2(0.0f, 15.0f) );
-  TestStartPan( application, START_POSITION, pos, time );
+  Vector2 pos(START_POSITION + Vector2(0.0f, 15.0f));
+  TestStartPan(application, START_POSITION, pos, time);
   time += Wait(application);
-  for( int i = 0; i<45; i++ )
+  for(int i = 0; i < 45; i++)
   {
     pos += Vector2(0.0f, 1.0f);
-    TestMovePan( application, pos, time );
-    time += Wait( application );
+    TestMovePan(application, pos, time);
+    time += Wait(application);
   }
   pos += Vector2(0.0f, 1.0f);
-  TestEndPan( application, pos, time );
-  time += Wait( application );
+  TestEndPan(application, pos, time);
+  time += Wait(application);
 
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION);
 
   scrollView.RemoveScrollingDirection(Dali::PanGestureDetector::DIRECTION_VERTICAL);
   // When the horizontal direction is removed, there are no directions set and therefore all will work
@@ -1923,20 +1918,20 @@ int UtcDaliToolkitScrollViewRemoveScrollingDirectionP(void)
 
   time += Wait(application);
   // Try a vertical swipe.
-  Vector2 pos2( pos + Vector2(0.0f, 15.0f) );
-  TestStartPan( application, pos, pos2, time );
+  Vector2 pos2(pos + Vector2(0.0f, 15.0f));
+  TestStartPan(application, pos, pos2, time);
   time += Wait(application);
-  for( int i = 0; i<45; i++ )
+  for(int i = 0; i < 45; i++)
   {
     pos2 += Vector2(0.0f, 1.0f);
-    TestMovePan( application, pos2, time );
-    time += Wait( application );
+    TestMovePan(application, pos2, time);
+    time += Wait(application);
   }
   pos2 += Vector2(0.0f, 1.0f);
-  TestEndPan( application, pos2, time );
+  TestEndPan(application, pos2, time);
 
   // The previous scroll should not have had any effect
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition() - Vector2(0.0f, 0.5f), Vector2(10.0f, -50.0f), 0.25f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1947,24 +1942,24 @@ int UtcDaliToolkitScrollViewSetRulerXP(void)
   tet_infoline(" UtcDaliToolkitScrollViewSetRulerXP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
-  RulerPtr rulerX = new FixedRuler( 100.0f );
-  rulerX->SetDomain( RulerDomain(0.0f, 800.0f, true) );
+  application.GetScene().Add(scrollView);
+  RulerPtr rulerX = new FixedRuler(100.0f);
+  rulerX->SetDomain(RulerDomain(0.0f, 800.0f, true));
 
-  scrollView.SetRulerX( rulerX );
+  scrollView.SetRulerX(rulerX);
 
-  scrollView.ScrollTo( 1, 0.0f );
+  scrollView.ScrollTo(1, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(100.0f, 0.0f), TEST_LOCATION);
 
-  RulerPtr newRulerX = new FixedRuler( 200.0f );
-  newRulerX->SetDomain( RulerDomain(0.0f, 800.0f, true) );
+  RulerPtr newRulerX = new FixedRuler(200.0f);
+  newRulerX->SetDomain(RulerDomain(0.0f, 800.0f, true));
 
-  scrollView.SetRulerX( newRulerX );
+  scrollView.SetRulerX(newRulerX);
 
-  scrollView.ScrollTo( 1, 0.0f );
+  scrollView.ScrollTo(1, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(200.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(200.0f, 0.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1975,24 +1970,24 @@ int UtcDaliToolkitScrollViewSetRulerYP(void)
   tet_infoline(" UtcDaliToolkitScrollViewSetRulerYP");
 
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
-  RulerPtr rulerY = new FixedRuler( 200.0f );
-  rulerY->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  RulerPtr rulerY = new FixedRuler(200.0f);
+  rulerY->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerY(rulerY);
 
-  scrollView.ScrollTo( Vector2(0.0f, 350.0f), 0.0f );
+  scrollView.ScrollTo(Vector2(0.0f, 350.0f), 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 350.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 350.0f), TEST_LOCATION);
 
-  RulerPtr newRulerY = new FixedRuler( 100.0f );
-  newRulerY->SetDomain( RulerDomain(0.0f, 200.0f, true) );
-  scrollView.SetRulerY( newRulerY );
+  RulerPtr newRulerY = new FixedRuler(100.0f);
+  newRulerY->SetDomain(RulerDomain(0.0f, 200.0f, true));
+  scrollView.SetRulerY(newRulerY);
 
-  scrollView.ScrollTo( Vector2(0.0f, 350.0f), 0.0f );
+  scrollView.ScrollTo(Vector2(0.0f, 350.0f), 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 200.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 200.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2004,9 +1999,9 @@ int UtcDaliToolkitScrollViewSetMinimumSpeedForFlickP(void)
 
   ScrollView scrollView = ScrollView::New();
   scrollView.SetMinimumSpeedForFlick(25.0f);
-  DALI_TEST_EQUALS( scrollView.GetMinimumSpeedForFlick(), 25.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetMinimumSpeedForFlick(), 25.0f, TEST_LOCATION);
   scrollView.SetMinimumSpeedForFlick(60.0f);
-  DALI_TEST_EQUALS( scrollView.GetMinimumSpeedForFlick(), 60.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetMinimumSpeedForFlick(), 60.0f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -2018,9 +2013,9 @@ int UtcDaliToolkitScrollViewSetMinimumDistanceForFlickP(void)
   ScrollView scrollView = ScrollView::New();
 
   scrollView.SetMinimumDistanceForFlick(Vector2(30.0f, 15.0f));
-  DALI_TEST_EQUALS( scrollView.GetMinimumDistanceForFlick(), Vector2(30.0f, 15.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetMinimumDistanceForFlick(), Vector2(30.0f, 15.0f), TEST_LOCATION);
   scrollView.SetMinimumDistanceForFlick(Vector2(60.0f, 30.0f));
-  DALI_TEST_EQUALS( scrollView.GetMinimumDistanceForFlick(), Vector2(60.0f, 30.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetMinimumDistanceForFlick(), Vector2(60.0f, 30.0f), TEST_LOCATION);
   END_TEST;
 }
 
@@ -2032,9 +2027,9 @@ int UtcDaliToolkitScrollViewSetWheelScrollDistanceStepP(void)
   ScrollView scrollView = ScrollView::New();
   // Disable Refresh signal (TET environment cannot use adaptor's Timer)
   scrollView.SetWheelScrollDistanceStep(Vector2(30.0f, 15.0f));
-  DALI_TEST_EQUALS( scrollView.GetWheelScrollDistanceStep(), Vector2(30.0f, 15.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetWheelScrollDistanceStep(), Vector2(30.0f, 15.0f), TEST_LOCATION);
   scrollView.SetWheelScrollDistanceStep(Vector2(60.0f, 30.0f));
-  DALI_TEST_EQUALS( scrollView.GetWheelScrollDistanceStep(), Vector2(60.0f, 30.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetWheelScrollDistanceStep(), Vector2(60.0f, 30.0f), TEST_LOCATION);
   END_TEST;
 }
 
@@ -2047,15 +2042,15 @@ int UtcDaliToolkitScrollViewApplyEffectP(void)
   ScrollView scrollView = ScrollView::New();
 
   // Create two scroll view effects
-  Dali::Path path = Dali::Path::New();
-  ScrollViewEffect effect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
+  Dali::Path       path      = Dali::Path::New();
+  ScrollViewEffect effect    = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
   ScrollViewEffect newEffect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 1.0f, 1.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(200.0f, 150.0f, 0.0f), 5);
 
   // Apply both effects
   scrollView.ApplyEffect(effect);
   scrollView.ApplyEffect(newEffect);
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
 
   END_TEST;
 }
@@ -2069,8 +2064,8 @@ int UtcDaliToolkitScrollViewApplyEffectN(void)
   ScrollView scrollView = ScrollView::New();
 
   // Create two scroll view effects
-  Dali::Path path = Dali::Path::New();
-  ScrollViewEffect effect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
+  Dali::Path       path      = Dali::Path::New();
+  ScrollViewEffect effect    = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
   ScrollViewEffect newEffect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 1.0f, 1.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(200.0f, 150.0f, 0.0f), 5);
 
   // Apply both effects
@@ -2081,11 +2076,11 @@ int UtcDaliToolkitScrollViewApplyEffectN(void)
   try
   {
     scrollView.ApplyEffect(newEffect);
-    tet_result( TET_FAIL );
+    tet_result(TET_FAIL);
   }
-  catch ( DaliException& e )
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT( e, "!effectAlreadyExistsInScrollView", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "!effectAlreadyExistsInScrollView", TEST_LOCATION);
   }
 
   END_TEST;
@@ -2100,8 +2095,8 @@ int UtcDaliToolkitScrollViewRemoveEffectP(void)
   ScrollView scrollView = ScrollView::New();
 
   // Create two scroll view effects
-  Dali::Path path = Dali::Path::New();
-  ScrollViewEffect effect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
+  Dali::Path       path      = Dali::Path::New();
+  ScrollViewEffect effect    = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
   ScrollViewEffect newEffect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 1.0f, 1.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(200.0f, 150.0f, 0.0f), 5);
 
   // Apply both effects
@@ -2112,7 +2107,7 @@ int UtcDaliToolkitScrollViewRemoveEffectP(void)
   scrollView.RemoveEffect(effect);
   scrollView.RemoveEffect(newEffect);
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
 
   END_TEST;
 }
@@ -2126,8 +2121,8 @@ int UtcDaliToolkitScrollViewRemoveEffectN(void)
   ScrollView scrollView = ScrollView::New();
 
   // Create two scroll view effects
-  Dali::Path path = Dali::Path::New();
-  ScrollViewEffect effect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
+  Dali::Path       path      = Dali::Path::New();
+  ScrollViewEffect effect    = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
   ScrollViewEffect newEffect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 1.0f, 1.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(200.0f, 150.0f, 0.0f), 5);
 
   // Apply the first effect
@@ -2137,11 +2132,11 @@ int UtcDaliToolkitScrollViewRemoveEffectN(void)
   try
   {
     scrollView.RemoveEffect(newEffect);
-    tet_result( TET_FAIL );
+    tet_result(TET_FAIL);
   }
-  catch ( DaliException& e )
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT( e, "effectExistedInScrollView", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "effectExistedInScrollView", TEST_LOCATION);
   }
 
   END_TEST;
@@ -2156,8 +2151,8 @@ int UtcDaliToolkitScrollViewRemoveAllEffectsP(void)
   ScrollView scrollView = ScrollView::New();
 
   // Create two scroll view effects
-  Dali::Path path = Dali::Path::New();
-  ScrollViewEffect effect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
+  Dali::Path       path      = Dali::Path::New();
+  ScrollViewEffect effect    = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 0.0f, 0.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(100.0f, 100.0f, 0.0f), 2);
   ScrollViewEffect newEffect = ScrollViewPagePathEffect::New(path, Vector3(-1.0f, 1.0f, 1.0f), Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(200.0f, 150.0f, 0.0f), 5);
 
   // Apply both effects
@@ -2168,11 +2163,11 @@ int UtcDaliToolkitScrollViewRemoveAllEffectsP(void)
   try
   {
     scrollView.ApplyEffect(effect);
-    tet_result( TET_FAIL );
+    tet_result(TET_FAIL);
   }
-  catch ( DaliException& e )
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT( e, "!effectAlreadyExistsInScrollView", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "!effectAlreadyExistsInScrollView", TEST_LOCATION);
   }
 
   // Remove both effects
@@ -2182,7 +2177,7 @@ int UtcDaliToolkitScrollViewRemoveAllEffectsP(void)
   scrollView.ApplyEffect(effect);
   scrollView.ApplyEffect(newEffect);
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
 
   END_TEST;
 }
@@ -2198,7 +2193,7 @@ int UtcDaliToolkitScrollViewRemoveAllEffectsN(void)
   // Remove effects when there is no effect applied previously
   scrollView.RemoveAllEffects();
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
 
   END_TEST;
 }
@@ -2270,14 +2265,14 @@ int UtcDaliToolkitScrollViewRulerDomainConstructorP(void)
   ToolkitTestApplication application;
 
   RulerDomain domainX = RulerDomain(0.0f, 200.0f, true);
-  DALI_TEST_EQUALS( domainX.min, 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( domainX.max, 200.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( domainX.enabled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainX.min, 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainX.max, 200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainX.enabled, true, TEST_LOCATION);
 
   RulerDomain domainY = RulerDomain(100.0f, 500.0f, false);
-  DALI_TEST_EQUALS( domainY.min, 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( domainY.max, 500.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( domainY.enabled, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainY.min, 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainY.max, 500.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainY.enabled, false, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2287,10 +2282,10 @@ int UtcDaliToolkitScrollViewRulerDomainGetSizeP(void)
   ToolkitTestApplication application;
 
   RulerDomain domainX = RulerDomain(0.0f, 200.0f, true);
-  DALI_TEST_EQUALS( domainX.GetSize(), 200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainX.GetSize(), 200.0f, TEST_LOCATION);
 
   RulerDomain domainY = RulerDomain(100.0f, 500.0f, false);
-  DALI_TEST_EQUALS( domainY.GetSize(), 400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(domainY.GetSize(), 400.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2302,16 +2297,16 @@ int UtcDaliToolkitScrollViewRulerDomainClampP(void)
   RulerDomain domainX = RulerDomain(0.0f, 200.0f, true);
 
   float value = domainX.Clamp(50.0f, 100.0f, 1.0f);
-  DALI_TEST_EQUALS( value, 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value, 50.0f, TEST_LOCATION);
 
   value = domainX.Clamp(300.0f, 20.0f, 1.0f);
-  DALI_TEST_EQUALS( value, 180.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value, 180.0f, TEST_LOCATION);
 
   value = domainX.Clamp(300.0f, 20.0f, 0.5f);
-  DALI_TEST_EQUALS( value, 80.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value, 80.0f, TEST_LOCATION);
 
   value = domainX.Clamp(250.0f, 200.0f, 2.0f);
-  DALI_TEST_EQUALS( value, 200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value, 200.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2323,17 +2318,17 @@ int UtcDaliToolkitScrollViewRulerDomainClampWithStateP(void)
   RulerDomain domainX = RulerDomain(0.0f, 200.0f, true);
 
   ClampState clamped;
-  float value = domainX.Clamp(50.0f, 100.0f, 1.0f, clamped);
-  DALI_TEST_EQUALS( value, 50.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, Dali::Toolkit::NOT_CLAMPED, TEST_LOCATION);
+  float      value = domainX.Clamp(50.0f, 100.0f, 1.0f, clamped);
+  DALI_TEST_EQUALS(value, 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, Dali::Toolkit::NOT_CLAMPED, TEST_LOCATION);
 
   value = domainX.Clamp(-100.0f, 200.0f, 1.0f, clamped);
-  DALI_TEST_EQUALS( value, 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, Dali::Toolkit::CLAMPED_TO_MIN, TEST_LOCATION);
+  DALI_TEST_EQUALS(value, 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, Dali::Toolkit::CLAMPED_TO_MIN, TEST_LOCATION);
 
   value = domainX.Clamp(300.0f, 20.0f, 1.0f, clamped);
-  DALI_TEST_EQUALS( value, 180.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, Dali::Toolkit::CLAMPED_TO_MAX, TEST_LOCATION);
+  DALI_TEST_EQUALS(value, 180.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, Dali::Toolkit::CLAMPED_TO_MAX, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2344,7 +2339,7 @@ int UtcDaliToolkitScrollViewDefaultRulerConstructorP(void)
   tet_infoline(" UtcDaliToolkitScrollViewDefaultRulerConstructorP");
 
   RulerPtr defaultRuler = new DefaultRuler();
-  DALI_TEST_CHECK( defaultRuler );
+  DALI_TEST_CHECK(defaultRuler);
 
   END_TEST;
 }
@@ -2356,7 +2351,7 @@ int UtcDaliToolkitScrollViewDefaultRulerDestructorP(void)
 
   RulerPtr defaultRuler = new DefaultRuler();
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -2365,11 +2360,11 @@ int UtcDaliToolkitScrollViewFixedRulerConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewFixedRulerConstructorP");
 
-  RulerPtr fixedRuler = new FixedRuler( 100.0f );
-  DALI_TEST_CHECK( fixedRuler );
+  RulerPtr fixedRuler = new FixedRuler(100.0f);
+  DALI_TEST_CHECK(fixedRuler);
 
-  fixedRuler = new FixedRuler( 0.0f );
-  DALI_TEST_CHECK( fixedRuler );
+  fixedRuler = new FixedRuler(0.0f);
+  DALI_TEST_CHECK(fixedRuler);
 
   END_TEST;
 }
@@ -2379,9 +2374,9 @@ int UtcDaliToolkitScrollViewFixedRulerDestructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewFixedRulerDestructorP");
 
-  RulerPtr fixedRuler = new FixedRuler( 100.0f );
+  RulerPtr fixedRuler = new FixedRuler(100.0f);
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -2391,12 +2386,12 @@ int UtcDaliToolkitScrollViewRulerGetTypeP(void)
   tet_infoline(" UtcDaliToolkitScrollViewRulerGetTypeP");
 
   RulerPtr defaultRuler = new DefaultRuler();
-  DALI_TEST_CHECK( defaultRuler );
-  DALI_TEST_EQUALS( defaultRuler->GetType(), Dali::Toolkit::Ruler::FREE, TEST_LOCATION);
+  DALI_TEST_CHECK(defaultRuler);
+  DALI_TEST_EQUALS(defaultRuler->GetType(), Dali::Toolkit::Ruler::FREE, TEST_LOCATION);
 
-  RulerPtr fixedRuler = new FixedRuler( 100.0f );
-  DALI_TEST_CHECK( fixedRuler );
-  DALI_TEST_EQUALS( fixedRuler->GetType(), Dali::Toolkit::Ruler::FIXED, TEST_LOCATION);
+  RulerPtr fixedRuler = new FixedRuler(100.0f);
+  DALI_TEST_CHECK(fixedRuler);
+  DALI_TEST_EQUALS(fixedRuler->GetType(), Dali::Toolkit::Ruler::FIXED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2407,12 +2402,12 @@ int UtcDaliToolkitScrollViewRulerGetExtensionP(void)
   tet_infoline(" UtcDaliToolkitScrollViewRulerGetExtensionP");
 
   RulerPtr defaultRuler = new DefaultRuler();
-  DALI_TEST_CHECK( defaultRuler );
-  DALI_TEST_CHECK( !defaultRuler->GetExtension() );
+  DALI_TEST_CHECK(defaultRuler);
+  DALI_TEST_CHECK(!defaultRuler->GetExtension());
 
-  RulerPtr fixedRuler = new FixedRuler( 100.0f );
-  DALI_TEST_CHECK( fixedRuler );
-  DALI_TEST_CHECK( !fixedRuler->GetExtension() );
+  RulerPtr fixedRuler = new FixedRuler(100.0f);
+  DALI_TEST_CHECK(fixedRuler);
+  DALI_TEST_CHECK(!fixedRuler->GetExtension());
 
   END_TEST;
 }
@@ -2424,11 +2419,11 @@ int UtcDaliToolkitScrollViewRulerEnableDisable(void)
 
   RulerPtr ruler = new DefaultRuler();
 
-  DALI_TEST_CHECK( ruler->IsEnabled() );
+  DALI_TEST_CHECK(ruler->IsEnabled());
   ruler->Disable();
-  DALI_TEST_CHECK( !ruler->IsEnabled() );
+  DALI_TEST_CHECK(!ruler->IsEnabled());
   ruler->Enable();
-  DALI_TEST_CHECK( ruler->IsEnabled() );
+  DALI_TEST_CHECK(ruler->IsEnabled());
   END_TEST;
 }
 
@@ -2438,17 +2433,17 @@ int UtcDaliToolkitScrollViewRulerDomainEnableDisable(void)
   tet_infoline(" UtcDaliToolkitScrollViewRulerDomainEnableDisable");
 
   RulerPtr ruler = new DefaultRuler();
-  DALI_TEST_EQUALS( ruler->GetDomain().GetSize(), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(ruler->GetDomain().GetSize(), 1.0f, TEST_LOCATION);
 
-  ruler->SetDomain( RulerDomain(0.0f, 100.0f, true) );
-  DALI_TEST_EQUALS( ruler->GetDomain().GetSize(), 100.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->Clamp(-200.0f), 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->Clamp(200.0f), 100.0f, TEST_LOCATION );
+  ruler->SetDomain(RulerDomain(0.0f, 100.0f, true));
+  DALI_TEST_EQUALS(ruler->GetDomain().GetSize(), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->Clamp(-200.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->Clamp(200.0f), 100.0f, TEST_LOCATION);
 
   ruler->DisableDomain();
-  DALI_TEST_EQUALS( ruler->GetDomain().GetSize(), 1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->Clamp(-200.0f), -200.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->Clamp(200.0f), 200.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(ruler->GetDomain().GetSize(), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->Clamp(-200.0f), -200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->Clamp(200.0f), 200.0f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -2457,53 +2452,53 @@ int UtcDaliToolkitScrollViewRulerSnapAndClamp(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewRulerSnapAndClamp");
 
-  RulerPtr ruler = new FixedRuler( 50.0f );
-  ruler->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  RulerPtr ruler = new FixedRuler(50.0f);
+  ruler->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
   // default testing. (snap and clamp)
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(50.0f), 50.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(30.0f), 50.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(10.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(-40.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(390.0f), 400.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(430.0f), 400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(50.0f), 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(30.0f), 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(10.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(-40.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(390.0f), 400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(430.0f), 400.0f, TEST_LOCATION);
 
   // bias testing.
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(40.0f, 0.0f), 0.0f, TEST_LOCATION); // Flick Left
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(40.0f, 0.5f), 50.0f, TEST_LOCATION); // No Flick
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(40.0f, 1.0f), 50.0f, TEST_LOCATION); // Flick Right
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(40.0f, 0.0f), 0.0f, TEST_LOCATION);  // Flick Left
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(40.0f, 0.5f), 50.0f, TEST_LOCATION); // No Flick
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(40.0f, 1.0f), 50.0f, TEST_LOCATION); // Flick Right
 
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(20.0f, 0.0f), 0.0f, TEST_LOCATION); // Flick Left
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(20.0f, 0.5f), 0.0f, TEST_LOCATION); // No Flick
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(20.0f, 1.0f), 50.0f, TEST_LOCATION); // Flick Right
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(20.0f, 0.0f), 0.0f, TEST_LOCATION);  // Flick Left
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(20.0f, 0.5f), 0.0f, TEST_LOCATION);  // No Flick
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(20.0f, 1.0f), 50.0f, TEST_LOCATION); // Flick Right
 
   // length testing.
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(-10.0f, 0.5f, 10.0f), 0.0f, TEST_LOCATION); // 10 units long (over left boundary)
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(-5.0f, 0.5f, 10.0f), 0.0f, TEST_LOCATION); // 10 units long (slightly ovr left boundary)
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(300.0f, 0.5f, 10.0f), 300.0f, TEST_LOCATION); // 10 units long (not over a boundary)
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(395.0f, 0.5f, 10.0f), 390.0f, TEST_LOCATION); // 10 units long (slightly over right boundary)
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(500.0f, 0.5f, 10.0f), 390.0f, TEST_LOCATION); // 10 units long (over right boundary)
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(-10.0f, 0.5f, 10.0f), 0.0f, TEST_LOCATION);   // 10 units long (over left boundary)
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(-5.0f, 0.5f, 10.0f), 0.0f, TEST_LOCATION);    // 10 units long (slightly ovr left boundary)
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(300.0f, 0.5f, 10.0f), 300.0f, TEST_LOCATION); // 10 units long (not over a boundary)
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(395.0f, 0.5f, 10.0f), 390.0f, TEST_LOCATION); // 10 units long (slightly over right boundary)
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(500.0f, 0.5f, 10.0f), 390.0f, TEST_LOCATION); // 10 units long (over right boundary)
 
   // scale testing.
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(-100.0f, 0.5f, 0.0f, 2.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(50.0f, 0.5f, 0.0f, 2.0f), 50.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(700.0f, 0.5f, 0.0f, 2.0f), 700.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(850.0f, 0.5f, 0.0f, 2.0f), 800.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(-100.0f, 0.5f, 0.0f, 2.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(50.0f, 0.5f, 0.0f, 2.0f), 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(700.0f, 0.5f, 0.0f, 2.0f), 700.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(850.0f, 0.5f, 0.0f, 2.0f), 800.0f, TEST_LOCATION);
 
   // clamp state testing.
   ClampState clamped;
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(50.0f, 0.5f, 0.0f, 1.0f, clamped), 50.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(30.0f, 0.5f, 0.0f, 1.0f, clamped), 50.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(10.0f, 0.5f, 0.0f, 1.0f, clamped), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(-40.0f, 0.5f, 0.0f, 1.0f, clamped), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, CLAMPED_TO_MIN, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(390.0f, 0.5f, 0.0f, 1.0f, clamped), 400.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION );
-  DALI_TEST_EQUALS( ruler->SnapAndClamp(430.0f, 0.5f, 0.0f, 1.0f, clamped), 400.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( clamped, CLAMPED_TO_MAX, TEST_LOCATION );
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(50.0f, 0.5f, 0.0f, 1.0f, clamped), 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, NOT_CLAMPED, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(30.0f, 0.5f, 0.0f, 1.0f, clamped), 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, NOT_CLAMPED, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(10.0f, 0.5f, 0.0f, 1.0f, clamped), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, NOT_CLAMPED, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(-40.0f, 0.5f, 0.0f, 1.0f, clamped), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, CLAMPED_TO_MIN, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(390.0f, 0.5f, 0.0f, 1.0f, clamped), 400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, NOT_CLAMPED, TEST_LOCATION);
+  DALI_TEST_EQUALS(ruler->SnapAndClamp(430.0f, 0.5f, 0.0f, 1.0f, clamped), 400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(clamped, CLAMPED_TO_MAX, TEST_LOCATION);
   END_TEST;
 }
 
@@ -2512,30 +2507,30 @@ int UtcDaliToolkitScrollViewFixedRulerGetPositionFromPageP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewFixedRulerGetPositionFromPageP");
 
-  RulerPtr rulerNormal = new FixedRuler( 25.0f );
-  rulerNormal->SetDomain( RulerDomain(10.0f, 90.0f, true) );
+  RulerPtr rulerNormal = new FixedRuler(25.0f);
+  rulerNormal->SetDomain(RulerDomain(10.0f, 90.0f, true));
 
   unsigned int volume;
-  float position;
+  float        position;
 
   position = rulerNormal->GetPositionFromPage(1, volume, true);
-  DALI_TEST_EQUALS( position, 35.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(position, 35.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(volume, 0u, TEST_LOCATION);
 
   position = rulerNormal->GetPositionFromPage(2, volume, true);
-  DALI_TEST_EQUALS( position, 60.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(position, 60.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(volume, 0u, TEST_LOCATION);
 
   // Disable the ruler
   rulerNormal->Disable();
 
   position = rulerNormal->GetPositionFromPage(1, volume, true);
-  DALI_TEST_EQUALS( position, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( volume, 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(position, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(volume, 1u, TEST_LOCATION);
 
   position = rulerNormal->GetPositionFromPage(2, volume, true);
-  DALI_TEST_EQUALS( position, 10.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( volume, 2u, TEST_LOCATION );
+  DALI_TEST_EQUALS(position, 10.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(volume, 2u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2546,8 +2541,8 @@ int UtcDaliToolkitScrollViewDefaultRulerGetTotalPagesP(void)
   tet_infoline(" UtcDaliToolkitScrollViewDefaultRulerGetTotalPagesP");
 
   RulerPtr defaultRuler = new DefaultRuler();
-  DALI_TEST_CHECK( defaultRuler );
-  DALI_TEST_EQUALS( defaultRuler->GetTotalPages(), 1u, TEST_LOCATION);
+  DALI_TEST_CHECK(defaultRuler);
+  DALI_TEST_EQUALS(defaultRuler->GetTotalPages(), 1u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2558,9 +2553,9 @@ int UtcDaliToolkitScrollViewDefaultRulerGetPageFromPositionP(void)
   tet_infoline(" UtcDaliToolkitScrollViewDefaultRulerGetPageFromPositionP");
 
   RulerPtr defaultRuler = new DefaultRuler();
-  DALI_TEST_CHECK( defaultRuler );
-  DALI_TEST_EQUALS( defaultRuler->GetPageFromPosition(100.0f, true), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( defaultRuler->GetPageFromPosition(-300.0f, false), 0u, TEST_LOCATION);
+  DALI_TEST_CHECK(defaultRuler);
+  DALI_TEST_EQUALS(defaultRuler->GetPageFromPosition(100.0f, true), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(defaultRuler->GetPageFromPosition(-300.0f, false), 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2571,14 +2566,14 @@ int UtcDaliToolkitScrollViewDefaultRulerGetPositionFromPageP(void)
   tet_infoline(" UtcDaliToolkitScrollViewDefaultRulerGetPositionFromPageP");
 
   RulerPtr defaultRuler = new DefaultRuler();
-  DALI_TEST_CHECK( defaultRuler );
+  DALI_TEST_CHECK(defaultRuler);
 
   unsigned int volume;
-  DALI_TEST_EQUALS( defaultRuler->GetPositionFromPage(0, volume, true), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(defaultRuler->GetPositionFromPage(0, volume, true), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(volume, 0u, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( defaultRuler->GetPositionFromPage(3, volume, false), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(defaultRuler->GetPositionFromPage(3, volume, false), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(volume, 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2589,10 +2584,10 @@ int UtcDaliToolkitScrollViewDefaultRulerSnapP(void)
   tet_infoline(" UtcDaliToolkitScrollViewDefaultRulerSnapP");
 
   RulerPtr defaultRuler = new DefaultRuler();
-  DALI_TEST_CHECK( defaultRuler );
+  DALI_TEST_CHECK(defaultRuler);
 
-  DALI_TEST_EQUALS( defaultRuler->Snap(50.0f, 0.5f), 50.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( defaultRuler->Snap(-120.0f, 1.0f), -120.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(defaultRuler->Snap(50.0f, 0.5f), 50.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(defaultRuler->Snap(-120.0f, 1.0f), -120.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2602,14 +2597,14 @@ int UtcDaliToolkitScrollViewFixedRulerGetTotalPagesP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewFixedRulerGetTotalPagesP");
 
-  RulerPtr fixedRuler = new FixedRuler( 100.0f );
-  fixedRuler->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  RulerPtr fixedRuler = new FixedRuler(100.0f);
+  fixedRuler->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
   fixedRuler->Enable();
-  DALI_TEST_EQUALS( fixedRuler->GetTotalPages(), 4u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetTotalPages(), 4u, TEST_LOCATION);
 
   fixedRuler->Disable();
-  DALI_TEST_EQUALS( fixedRuler->GetTotalPages(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetTotalPages(), 1u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2619,35 +2614,35 @@ int UtcDaliToolkitScrollViewFixedRulerGetPageFromPositionP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewFixedRulerGetPageFromPositionP");
 
-  RulerPtr fixedRuler = new FixedRuler( 100.0f );
-  fixedRuler->SetDomain( RulerDomain(0.0f, 400.0f, true) );
+  RulerPtr fixedRuler = new FixedRuler(100.0f);
+  fixedRuler->SetDomain(RulerDomain(0.0f, 400.0f, true));
 
   fixedRuler->Enable();
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, true), 3u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, false), 3u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, true), 1u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, true), 3u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, false), 3u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, true), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
 
   fixedRuler->Disable();
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, true), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, false), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, true), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, true), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, false), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, true), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
 
   // Set domain size to be smaller than the ruler space
-  fixedRuler->SetDomain( RulerDomain(0.0f, 50.0f, true) );
+  fixedRuler->SetDomain(RulerDomain(0.0f, 50.0f, true));
 
   fixedRuler->Enable();
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, true), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, false), 3u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, true), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, true), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, false), 3u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, true), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
 
   fixedRuler->Disable();
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, true), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(250.0f, false), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, true), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, true), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(250.0f, false), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, true), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->GetPageFromPosition(-350.0f, false), 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2657,44 +2652,44 @@ int UtcDaliToolkitScrollViewFixedRulerSnapP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitScrollViewFixedRulerSnapP");
 
-  RulerPtr fixedRuler = new FixedRuler( 100.0f );
-  fixedRuler->SetDomain( RulerDomain(0.0f, 400.0f, true) );
-
-  DALI_TEST_EQUALS( fixedRuler->Snap(-30.0f, 0.0f), -100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-70.0f, 0.0f), -100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-120.0f, 0.0f), -200.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-480.0f, 0.0f), -500.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(20.0f, 0.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(50.0f, 0.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(80.0f, 0.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(100.0f, 0.0f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(120.0f, 0.0f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(250.0f, 0.0f), 200.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(620.0f, 0.0f), 600.0f, TEST_LOCATION);
-
-  DALI_TEST_EQUALS( fixedRuler->Snap(-30.0f, 0.5f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-70.0f, 0.5f), -100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-120.0f, 0.5f), -100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-480.0f, 0.5f), -500.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(20.0f, 0.5f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(50.0f, 0.5f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(80.0f, 0.5f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(100.0f, 0.5f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(120.0f, 0.5f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(250.0f, 0.5f), 300.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(620.0f, 0.5f), 600.0f, TEST_LOCATION);
-
-  DALI_TEST_EQUALS( fixedRuler->Snap(-30.0f, 1.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-70.0f, 1.0f), 0.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-120.0f, 1.0f), -100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(-480.0f, 1.0f), -400.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(20.0f, 1.0f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(50.0f, 1.0f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(80.0f, 1.0f), 100.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(100.0f, 1.0f), 200.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(120.0f, 1.0f), 200.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(250.0f, 1.0f), 300.0f, TEST_LOCATION);
-  DALI_TEST_EQUALS( fixedRuler->Snap(620.0f, 1.0f), 700.0f, TEST_LOCATION);
+  RulerPtr fixedRuler = new FixedRuler(100.0f);
+  fixedRuler->SetDomain(RulerDomain(0.0f, 400.0f, true));
+
+  DALI_TEST_EQUALS(fixedRuler->Snap(-30.0f, 0.0f), -100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-70.0f, 0.0f), -100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-120.0f, 0.0f), -200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-480.0f, 0.0f), -500.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(20.0f, 0.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(50.0f, 0.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(80.0f, 0.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(100.0f, 0.0f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(120.0f, 0.0f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(250.0f, 0.0f), 200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(620.0f, 0.0f), 600.0f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(fixedRuler->Snap(-30.0f, 0.5f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-70.0f, 0.5f), -100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-120.0f, 0.5f), -100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-480.0f, 0.5f), -500.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(20.0f, 0.5f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(50.0f, 0.5f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(80.0f, 0.5f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(100.0f, 0.5f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(120.0f, 0.5f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(250.0f, 0.5f), 300.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(620.0f, 0.5f), 600.0f, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(fixedRuler->Snap(-30.0f, 1.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-70.0f, 1.0f), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-120.0f, 1.0f), -100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(-480.0f, 1.0f), -400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(20.0f, 1.0f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(50.0f, 1.0f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(80.0f, 1.0f), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(100.0f, 1.0f), 200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(120.0f, 1.0f), 200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(250.0f, 1.0f), 300.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(fixedRuler->Snap(620.0f, 1.0f), 700.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2706,40 +2701,40 @@ int UtcDaliToolkitScrollViewConstraintsMove(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
 
   // Add an Actor to ScrollView,
   Actor a = Actor::New();
   scrollView.Add(a);
-  a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
+  a.SetProperty(Actor::Property::POSITION, TEST_ACTOR_POSITION);
   Wait(application);
 
-  const Vector2 target = Vector2(100.0f, 100.0f);
+  const Vector2 target  = Vector2(100.0f, 100.0f);
   const Vector2 target2 = Vector2(200.0f, 200.0f);
 
-  Constraint constraint = Constraint::New<Vector3>( scrollView, Actor::Property::POSITION, MoveActorConstraint );
-  constraint.AddSource( Source(scrollView, ScrollView::Property::SCROLL_POSITION) );
+  Constraint constraint = Constraint::New<Vector3>(scrollView, Actor::Property::POSITION, MoveActorConstraint);
+  constraint.AddSource(Source(scrollView, ScrollView::Property::SCROLL_POSITION));
   constraint.SetRemoveAction(Constraint::DISCARD);
   scrollView.ApplyConstraintToChildren(constraint);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
-  scrollView.ScrollTo( target2 );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
+  scrollView.ScrollTo(target2);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2751,45 +2746,45 @@ int UtcDaliToolkitScrollViewConstraintsWrap(void)
 
   // Set up a scrollView...
   ScrollView scrollView = ScrollView::New();
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
   Vector2 stageSize = application.GetScene().GetSize();
-  scrollView.SetProperty( Actor::Property::SIZE, stageSize);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::SIZE, stageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Position rulers.
   RulerPtr rulerX = new DefaultRuler();
   RulerPtr rulerY = new DefaultRuler();
-  rulerX->SetDomain( RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true) );
-  rulerY->SetDomain( RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true) );
+  rulerX->SetDomain(RulerDomain(0.0f, stageSize.width + CLAMP_EXCESS_WIDTH, true));
+  rulerY->SetDomain(RulerDomain(0.0f, stageSize.height + CLAMP_EXCESS_HEIGHT, true));
   scrollView.SetRulerX(rulerX);
   scrollView.SetRulerY(rulerY);
 
   // Add an Actor to ScrollView,
   Actor a = Actor::New();
   scrollView.Add(a);
-  a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
+  a.SetProperty(Actor::Property::POSITION, TEST_ACTOR_POSITION);
   Wait(application);
 
-  const Vector2 target = Vector2(100.0f, 100.0f);
+  const Vector2 target  = Vector2(100.0f, 100.0f);
   const Vector2 target2 = Vector2(200.0f, 200.0f);
 
-  Constraint constraint = Constraint::New<Vector3>( scrollView, Actor::Property::POSITION, WrapActorConstraint );
-  constraint.AddSource( LocalSource( Actor::Property::SCALE ) );
-  constraint.AddSource( LocalSource( Actor::Property::ANCHOR_POINT ) );
-  constraint.AddSource( LocalSource( Actor::Property::SIZE ) );
-  constraint.AddSource( Source( scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN ) );
-  constraint.AddSource( Source( scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX ) );
-  constraint.AddSource( Source( scrollView, Toolkit::ScrollView::Property::WRAP ) );
+  Constraint constraint = Constraint::New<Vector3>(scrollView, Actor::Property::POSITION, WrapActorConstraint);
+  constraint.AddSource(LocalSource(Actor::Property::SCALE));
+  constraint.AddSource(LocalSource(Actor::Property::ANCHOR_POINT));
+  constraint.AddSource(LocalSource(Actor::Property::SIZE));
+  constraint.AddSource(Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
+  constraint.AddSource(Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
+  constraint.AddSource(Source(scrollView, Toolkit::ScrollView::Property::WRAP));
   constraint.SetRemoveAction(Constraint::DISCARD);
   scrollView.ApplyConstraintToChildren(constraint);
 
-  scrollView.ScrollTo( target, 0.0f );
+  scrollView.ScrollTo(target, 0.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION );
-  scrollView.ScrollTo( target2 );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION);
+  scrollView.ScrollTo(target2);
   Wait(application, RENDER_DELAY_SCROLL);
-  DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION);
 
   scrollView.Remove(a);
   Wait(application);
@@ -2801,59 +2796,59 @@ int UtcDaliToolkitScrollViewConstraintsWrap(void)
 int UtcDaliToolkitScrollViewGesturePageLimit(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliToolkitScrollViewGesturePageLimit" );
+  tet_infoline(" UtcDaliToolkitScrollViewGesturePageLimit");
 
   // Set up a scrollView.
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
-  Vector2 viewPageSize( 720.0f, 1280.0f );
-  scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
+  Vector2 viewPageSize(720.0f, 1280.0f);
+  scrollView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  scrollView.SetProperty(Actor::Property::SIZE, viewPageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  scrollView.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
 
   // Position rulers.
   // We set the X ruler to fixed to give us pages to snap to.
-  Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler( viewPageSize.width );
+  Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler(viewPageSize.width);
   // Note: The 3x page width is arbitary, but we need enough to show that we are
   // capping page movement by the page limiter, and not the domain.
-  rulerX->SetDomain( Dali::Toolkit::RulerDomain( 0.0f, viewPageSize.width * 3.0f, false ) );
+  rulerX->SetDomain(Dali::Toolkit::RulerDomain(0.0f, viewPageSize.width * 3.0f, false));
   Dali::Toolkit::RulerPtr rulerY = new Dali::Toolkit::DefaultRuler();
   rulerY->Disable();
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
-  scrollView.SetWrapMode( false );
-  scrollView.SetScrollSensitive( true );
+  scrollView.SetWrapMode(false);
+  scrollView.SetScrollSensitive(true);
 
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   // Set up a gesture to perform.
-  Vector2 startPos( 50.0f, 0.0f );
-  Vector2 direction( -5.0f, 0.0f );
-  int frames = 200;
+  Vector2 startPos(50.0f, 0.0f);
+  Vector2 direction(-5.0f, 0.0f);
+  int     frames = 200;
 
   // Force starting position.
-  scrollView.ScrollTo( startPos, 0.0f );
+  scrollView.ScrollTo(startPos, 0.0f);
   uint32_t time = 0;
-  time += Wait( application );
+  time += Wait(application);
 
   // Deliberately skip the "Finished" part of the gesture, so we can read the coordinates before the snap begins.
-  Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
+  Vector2 currentPos(PerformGestureSwipe(application, startPos, direction, frames - 1, time, false));
 
   // Confirm the final X coord has not moved more than one page from the start X position.
-  DALI_TEST_GREATER( ( startPos.x + viewPageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
+  DALI_TEST_GREATER((startPos.x + viewPageSize.width), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION);
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;
   TestEndPan(application, currentPos, time);
   // We add RENDER_FRAME_INTERVAL on to wait for an extra frame (for the last "finished" gesture to complete first.
-  time += Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
+  time += Wait(application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL);
 
   // Confirm the final X coord has snapped to exactly one page ahead of the start page.
-  DALI_TEST_EQUALS( viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+  DALI_TEST_EQUALS(viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2869,154 +2864,154 @@ int UtcDaliScrollViewSetGetProperty(void)
   // Event side properties
 
   // Test "wrapEnabled" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("wrapEnabled") == ScrollView::Property::WRAP_ENABLED );
-  scrollView.SetProperty( ScrollView::Property::WRAP_ENABLED, true );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::WRAP_ENABLED).Get<bool>(), true, TEST_LOCATION );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("wrapEnabled") == ScrollView::Property::WRAP_ENABLED);
+  scrollView.SetProperty(ScrollView::Property::WRAP_ENABLED, true);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::WRAP_ENABLED).Get<bool>(), true, TEST_LOCATION);
 
   // Test "panningEnabled" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("panningEnabled") == ScrollView::Property::PANNING_ENABLED );
-  scrollView.SetProperty( ScrollView::Property::PANNING_ENABLED, false );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::PANNING_ENABLED).Get<bool>(), false, TEST_LOCATION );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("panningEnabled") == ScrollView::Property::PANNING_ENABLED);
+  scrollView.SetProperty(ScrollView::Property::PANNING_ENABLED, false);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::PANNING_ENABLED).Get<bool>(), false, TEST_LOCATION);
 
   // Test "axisAutoLockEnabled" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("axisAutoLockEnabled") == ScrollView::Property::AXIS_AUTO_LOCK_ENABLED );
-  scrollView.SetProperty( ScrollView::Property::AXIS_AUTO_LOCK_ENABLED, false );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::AXIS_AUTO_LOCK_ENABLED).Get<bool>(), false, TEST_LOCATION );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("axisAutoLockEnabled") == ScrollView::Property::AXIS_AUTO_LOCK_ENABLED);
+  scrollView.SetProperty(ScrollView::Property::AXIS_AUTO_LOCK_ENABLED, false);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::AXIS_AUTO_LOCK_ENABLED).Get<bool>(), false, TEST_LOCATION);
 
   // Test "wheelScrollDistanceStep" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("wheelScrollDistanceStep") == ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP );
-  scrollView.SetProperty( ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP, Vector2(100.0f, 50.0f) );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP).Get<Vector2>(), Vector2(100.0f, 50.0f), TEST_LOCATION );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("wheelScrollDistanceStep") == ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP);
+  scrollView.SetProperty(ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP, Vector2(100.0f, 50.0f));
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP).Get<Vector2>(), Vector2(100.0f, 50.0f), TEST_LOCATION);
 
   // Test "overshootEnabled" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("overshootEnabled") == Scrollable::Property::OVERSHOOT_ENABLED  );
-  DALI_TEST_EQUALS( scrollView.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), scrollView.IsOvershootEnabled(), TEST_LOCATION );
-  scrollView.SetProperty( Scrollable::Property::OVERSHOOT_ENABLED, false );
-  DALI_TEST_EQUALS( scrollView.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), false, TEST_LOCATION );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("overshootEnabled") == Scrollable::Property::OVERSHOOT_ENABLED);
+  DALI_TEST_EQUALS(scrollView.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), scrollView.IsOvershootEnabled(), TEST_LOCATION);
+  scrollView.SetProperty(Scrollable::Property::OVERSHOOT_ENABLED, false);
+  DALI_TEST_EQUALS(scrollView.GetProperty(Scrollable::Property::OVERSHOOT_ENABLED).Get<bool>(), false, TEST_LOCATION);
 
   // Animatable properties
 
   // Test "scrollPosition" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPosition") == ScrollView::Property::SCROLL_POSITION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_POSITION, Vector2(320.0f, 550.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPosition") == ScrollView::Property::SCROLL_POSITION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_POSITION, Vector2(320.0f, 550.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_POSITION).Get<Vector2>(), Vector2(320.0f, 550.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_POSITION).Get<Vector2>(), Vector2(320.0f, 550.0f), TEST_LOCATION);
 
   // Test "scrollPrePosition", "scrollPrePositionX" and "scrollPrePositionY" properties
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPrePosition") == ScrollView::Property::SCROLL_PRE_POSITION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_PRE_POSITION, Vector2(300.0f, 500.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPrePosition") == ScrollView::Property::SCROLL_PRE_POSITION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_PRE_POSITION, Vector2(300.0f, 500.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION).Get<Vector2>(), Vector2(300.0f, 500.0f), TEST_LOCATION );
-
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPrePositionX") == ScrollView::Property::SCROLL_PRE_POSITION_X );
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPrePositionY") == ScrollView::Property::SCROLL_PRE_POSITION_Y );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_X).Get<float>(), 300.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_Y).Get<float>(), 500.0f, TEST_LOCATION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_PRE_POSITION_X, 400.0f );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_PRE_POSITION_Y, 600.0f );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION).Get<Vector2>(), Vector2(300.0f, 500.0f), TEST_LOCATION);
+
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPrePositionX") == ScrollView::Property::SCROLL_PRE_POSITION_X);
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPrePositionY") == ScrollView::Property::SCROLL_PRE_POSITION_Y);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_X).Get<float>(), 300.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_Y).Get<float>(), 500.0f, TEST_LOCATION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_PRE_POSITION_X, 400.0f);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_PRE_POSITION_Y, 600.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_X).Get<float>(), 400.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_Y).Get<float>(), 600.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION).Get<Vector2>(), Vector2(400.0f, 600.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_X).Get<float>(), 400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_Y).Get<float>(), 600.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION).Get<Vector2>(), Vector2(400.0f, 600.0f), TEST_LOCATION);
 
   // Test "scrollPrePositionMax", "scrollPrePositionMaxX" and "scrollPrePositionMaxY" properties
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPrePositionMax") == ScrollView::Property::SCROLL_PRE_POSITION_MAX );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_PRE_POSITION_MAX, Vector2(100.0f, 200.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPrePositionMax") == ScrollView::Property::SCROLL_PRE_POSITION_MAX);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX, Vector2(100.0f, 200.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX).Get<Vector2>(), Vector2(100.0f, 200.0f), TEST_LOCATION );
-
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPrePositionMaxX") == ScrollView::Property::SCROLL_PRE_POSITION_MAX_X );
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPrePositionMaxY") == ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_X).Get<float>(), 100.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y).Get<float>(), 200.0f, TEST_LOCATION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_PRE_POSITION_MAX_X, 300.0f );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y, 400.0f );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX).Get<Vector2>(), Vector2(100.0f, 200.0f), TEST_LOCATION);
+
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPrePositionMaxX") == ScrollView::Property::SCROLL_PRE_POSITION_MAX_X);
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPrePositionMaxY") == ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_X).Get<float>(), 100.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y).Get<float>(), 200.0f, TEST_LOCATION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_X, 300.0f);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y, 400.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_X).Get<float>(), 300.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y).Get<float>(), 400.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX).Get<Vector2>(), Vector2(300.0f, 400.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_X).Get<float>(), 300.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX_Y).Get<float>(), 400.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_PRE_POSITION_MAX).Get<Vector2>(), Vector2(300.0f, 400.0f), TEST_LOCATION);
 
   // Test "overshootX" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("overshootX") == ScrollView::Property::OVERSHOOT_X );
-  scrollView.SetProperty( ScrollView::Property::OVERSHOOT_X, 0.8f );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("overshootX") == ScrollView::Property::OVERSHOOT_X);
+  scrollView.SetProperty(ScrollView::Property::OVERSHOOT_X, 0.8f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::OVERSHOOT_X).Get<float>(), 0.8f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::OVERSHOOT_X).Get<float>(), 0.8f, TEST_LOCATION);
 
   // Test "overshootY" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("overshootY") == ScrollView::Property::OVERSHOOT_Y );
-  scrollView.SetProperty( ScrollView::Property::OVERSHOOT_Y, 0.8f );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("overshootY") == ScrollView::Property::OVERSHOOT_Y);
+  scrollView.SetProperty(ScrollView::Property::OVERSHOOT_Y, 0.8f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::OVERSHOOT_Y).Get<float>(), 0.8f, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::OVERSHOOT_Y).Get<float>(), 0.8f, TEST_LOCATION);
 
   // Test "scrollFinal", "scrollFinalX" and "scrollFinalY" properties
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollFinal") == ScrollView::Property::SCROLL_FINAL );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_FINAL, Vector2(200.0f, 300.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollFinal") == ScrollView::Property::SCROLL_FINAL);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_FINAL, Vector2(200.0f, 300.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL).Get<Vector2>(), Vector2(200.0f, 300.0f), TEST_LOCATION );
-
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollFinalX") == ScrollView::Property::SCROLL_FINAL_X );
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollFinalY") == ScrollView::Property::SCROLL_FINAL_Y );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_X).Get<float>(), 200.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_Y).Get<float>(), 300.0f, TEST_LOCATION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_FINAL_X, 500.0f );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_FINAL_Y, 600.0f );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL).Get<Vector2>(), Vector2(200.0f, 300.0f), TEST_LOCATION);
+
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollFinalX") == ScrollView::Property::SCROLL_FINAL_X);
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollFinalY") == ScrollView::Property::SCROLL_FINAL_Y);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_X).Get<float>(), 200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_Y).Get<float>(), 300.0f, TEST_LOCATION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_FINAL_X, 500.0f);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_FINAL_Y, 600.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_X).Get<float>(), 500.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_Y).Get<float>(), 600.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL).Get<Vector2>(), Vector2(500.0f, 600.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_X).Get<float>(), 500.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL_Y).Get<float>(), 600.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_FINAL).Get<Vector2>(), Vector2(500.0f, 600.0f), TEST_LOCATION);
 
   // Test "wrap" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("wrap") == ScrollView::Property::WRAP );
-  scrollView.SetProperty( ScrollView::Property::WRAP, false );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("wrap") == ScrollView::Property::WRAP);
+  scrollView.SetProperty(ScrollView::Property::WRAP, false);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::WRAP).Get<bool>(), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::WRAP).Get<bool>(), false, TEST_LOCATION);
 
   // Test "panning" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("panning") == ScrollView::Property::PANNING );
-  scrollView.SetProperty( ScrollView::Property::PANNING, true );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("panning") == ScrollView::Property::PANNING);
+  scrollView.SetProperty(ScrollView::Property::PANNING, true);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::PANNING).Get<bool>(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::PANNING).Get<bool>(), true, TEST_LOCATION);
 
   // Test "scrolling" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrolling") == ScrollView::Property::SCROLLING );
-  scrollView.SetProperty( ScrollView::Property::SCROLLING, false );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrolling") == ScrollView::Property::SCROLLING);
+  scrollView.SetProperty(ScrollView::Property::SCROLLING, false);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLLING).Get<bool>(), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLLING).Get<bool>(), false, TEST_LOCATION);
 
   // Test "scrollDomainSize", "scrollDomainSizeX" and "scrollDomainSizeY" properties
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollDomainSize") == ScrollView::Property::SCROLL_DOMAIN_SIZE );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_DOMAIN_SIZE, Vector2(1200.0f, 1300.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollDomainSize") == ScrollView::Property::SCROLL_DOMAIN_SIZE);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE, Vector2(1200.0f, 1300.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE).Get<Vector2>(), Vector2(1200.0f, 1300.0f), TEST_LOCATION );
-
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollDomainSizeX") == ScrollView::Property::SCROLL_DOMAIN_SIZE_X );
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollDomainSizeY") == ScrollView::Property::SCROLL_DOMAIN_SIZE_Y );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_X).Get<float>(), 1200.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_Y).Get<float>(), 1300.0f, TEST_LOCATION );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_DOMAIN_SIZE_X, 1500.0f );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_DOMAIN_SIZE_Y, 1600.0f );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE).Get<Vector2>(), Vector2(1200.0f, 1300.0f), TEST_LOCATION);
+
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollDomainSizeX") == ScrollView::Property::SCROLL_DOMAIN_SIZE_X);
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollDomainSizeY") == ScrollView::Property::SCROLL_DOMAIN_SIZE_Y);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_X).Get<float>(), 1200.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_Y).Get<float>(), 1300.0f, TEST_LOCATION);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_X, 1500.0f);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_Y, 1600.0f);
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_X).Get<float>(), 1500.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_Y).Get<float>(), 1600.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE).Get<Vector2>(), Vector2(1500.0f, 1600.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_X).Get<float>(), 1500.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE_Y).Get<float>(), 1600.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_SIZE).Get<Vector2>(), Vector2(1500.0f, 1600.0f), TEST_LOCATION);
 
   // Test "scrollDomainOffset" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollDomainOffset") == ScrollView::Property::SCROLL_DOMAIN_OFFSET );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_DOMAIN_OFFSET, Vector2(500.0f, 200.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollDomainOffset") == ScrollView::Property::SCROLL_DOMAIN_OFFSET);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_DOMAIN_OFFSET, Vector2(500.0f, 200.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_OFFSET).Get<Vector2>(), Vector2(500.0f, 200.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_DOMAIN_OFFSET).Get<Vector2>(), Vector2(500.0f, 200.0f), TEST_LOCATION);
 
   // Test "scrollPositionDelta" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("scrollPositionDelta") == ScrollView::Property::SCROLL_POSITION_DELTA );
-  scrollView.SetProperty( ScrollView::Property::SCROLL_POSITION_DELTA, Vector2(10.0f, 30.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("scrollPositionDelta") == ScrollView::Property::SCROLL_POSITION_DELTA);
+  scrollView.SetProperty(ScrollView::Property::SCROLL_POSITION_DELTA, Vector2(10.0f, 30.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::SCROLL_POSITION_DELTA).Get<Vector2>(), Vector2(10.0f, 30.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::SCROLL_POSITION_DELTA).Get<Vector2>(), Vector2(10.0f, 30.0f), TEST_LOCATION);
 
   // Test "startPagePosition" property
-  DALI_TEST_CHECK( scrollView.GetPropertyIndex("startPagePosition") == ScrollView::Property::START_PAGE_POSITION );
-  scrollView.SetProperty( ScrollView::Property::START_PAGE_POSITION, Vector3(50.0f, 100.0f, 20.0f) );
+  DALI_TEST_CHECK(scrollView.GetPropertyIndex("startPagePosition") == ScrollView::Property::START_PAGE_POSITION);
+  scrollView.SetProperty(ScrollView::Property::START_PAGE_POSITION, Vector3(50.0f, 100.0f, 20.0f));
   Wait(application);
-  DALI_TEST_EQUALS( scrollView.GetProperty(ScrollView::Property::START_PAGE_POSITION).Get<Vector3>(), Vector3(50.0f, 100.0f, 20.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(scrollView.GetProperty(ScrollView::Property::START_PAGE_POSITION).Get<Vector3>(), Vector3(50.0f, 100.0f, 20.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -3029,32 +3024,32 @@ int UtcDaliToolkitScrollViewWheelEvent(void)
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
-  Vector2 viewPageSize( 720.0f, 1280.0f );
-  scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
+  Vector2 viewPageSize(720.0f, 1280.0f);
+  scrollView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  scrollView.SetProperty(Actor::Property::SIZE, viewPageSize);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  scrollView.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
 
   // Position rulers.
   // We set the X ruler to fixed to give us pages to snap to.
-  Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler( viewPageSize.width );
+  Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler(viewPageSize.width);
   // Note: The 3x page width is arbitary, but we need enough to show that we are
   // capping page movement by the page limiter, and not the domain.
-  rulerX->SetDomain( Dali::Toolkit::RulerDomain( 0.0f, viewPageSize.width * 3.0f, false ) );
+  rulerX->SetDomain(Dali::Toolkit::RulerDomain(0.0f, viewPageSize.width * 3.0f, false));
   Dali::Toolkit::RulerPtr rulerY = new Dali::Toolkit::DefaultRuler();
   rulerY->Disable();
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
 
-  scrollView.SetWrapMode( false );
+  scrollView.SetWrapMode(false);
 
-  application.GetScene().Add( scrollView );
+  application.GetScene().Add(scrollView);
 
   //Connect to wheel event signal
-  scrollView.WheelEventSignal().Connect( &OnWheelEvent );
+  scrollView.WheelEventSignal().Connect(&OnWheelEvent);
 
-  DALI_TEST_CHECK( !gOnWheelEventCalled );
+  DALI_TEST_CHECK(!gOnWheelEventCalled);
 
   // Render and notify
   application.Render();
@@ -3063,38 +3058,38 @@ int UtcDaliToolkitScrollViewWheelEvent(void)
   application.SendNotification();
 
   // Perform a wheel event
-  Dali::Integration::WheelEvent wheelEvent( Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2( 10.0f, 10.0f ), 1, 1000u );
-  application.ProcessEvent( wheelEvent );
-  DALI_TEST_CHECK( gOnWheelEventCalled );
+  Dali::Integration::WheelEvent wheelEvent(Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2(10.0f, 10.0f), 1, 1000u);
+  application.ProcessEvent(wheelEvent);
+  DALI_TEST_CHECK(gOnWheelEventCalled);
 
   // Set X ruler to free
   Dali::Toolkit::DefaultRuler* defaultRuler = new Dali::Toolkit::DefaultRuler();
-  scrollView.SetRulerX( defaultRuler );
+  scrollView.SetRulerX(defaultRuler);
 
   // Perform a wheel event
   gOnWheelEventCalled = false;
-  application.ProcessEvent( wheelEvent );
-  DALI_TEST_CHECK( gOnWheelEventCalled );
+  application.ProcessEvent(wheelEvent);
+  DALI_TEST_CHECK(gOnWheelEventCalled);
 
   // Enable Y ruler
   rulerY->Enable();
 
   // Perform a wheel event
   gOnWheelEventCalled = false;
-  application.ProcessEvent( wheelEvent );
-  DALI_TEST_CHECK( gOnWheelEventCalled );
+  application.ProcessEvent(wheelEvent);
+  DALI_TEST_CHECK(gOnWheelEventCalled);
 
   // Wait until it finishes scrolling
   Wait(application, RENDER_DELAY_SCROLL);
 
   // Set Y ruler to fixed
-  Dali::Toolkit::FixedRuler* fixedRulerY = new Dali::Toolkit::FixedRuler( viewPageSize.height );
-  scrollView.SetRulerY( fixedRulerY );
+  Dali::Toolkit::FixedRuler* fixedRulerY = new Dali::Toolkit::FixedRuler(viewPageSize.height);
+  scrollView.SetRulerY(fixedRulerY);
 
   // Perform a wheel event
   gOnWheelEventCalled = false;
-  application.ProcessEvent( wheelEvent );
-  DALI_TEST_CHECK( gOnWheelEventCalled );
+  application.ProcessEvent(wheelEvent);
+  DALI_TEST_CHECK(gOnWheelEventCalled);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
index fa26940..147df63 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 
 using namespace Dali;
@@ -41,8 +41,7 @@ void utc_dali_toolkit_scroll_view_effect_cleanup(void)
 
 namespace
 {
-
-const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
+const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
 
 /*
  * Simulate time passed by.
@@ -57,7 +56,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -80,25 +79,25 @@ RulerPtr CreateRuler(float gridSize = 0.0f)
 {
   if(gridSize <= Math::MACHINE_EPSILON_0)
   {
-      return new DefaultRuler();
+    return new DefaultRuler();
   }
   return new FixedRuler(gridSize);
 }
 
 // Callback probes.
 
-static bool gOnScrollStartCalled;                       ///< Whether the OnScrollStart signal was invoked.
-static bool gOnScrollUpdateCalled;                      ///< Whether the OnScrollUpdate signal was invoked.
-static bool gOnScrollCompleteCalled;                    ///< Whether the OnScrollComplete signal was invoked.
-static Vector3 gConstraintResult;                       ///< Result from constraint.
+static bool    gOnScrollStartCalled;    ///< Whether the OnScrollStart signal was invoked.
+static bool    gOnScrollUpdateCalled;   ///< Whether the OnScrollUpdate signal was invoked.
+static bool    gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked.
+static Vector3 gConstraintResult;       ///< Result from constraint.
 
-static std::vector< Actor > gPages;                                ///< Keeps track of all the pages for applying effects.
-typedef std::vector< Actor >::iterator ActorIter;
+static std::vector<Actor>            gPages; ///< Keeps track of all the pages for applying effects.
+typedef std::vector<Actor>::iterator ActorIter;
 
 static void ResetScrollCallbackResults()
 {
-  gOnScrollStartCalled = false;
-  gOnScrollUpdateCalled = false;
+  gOnScrollStartCalled    = false;
+  gOnScrollUpdateCalled   = false;
   gOnScrollCompleteCalled = false;
 }
 
@@ -107,7 +106,7 @@ static void ResetScrollCallbackResults()
  *
  * @param[in] position The current scroll position.
  */
-static void OnScrollStart( const Vector2& position )
+static void OnScrollStart(const Vector2& position)
 {
   gOnScrollStartCalled = true;
 }
@@ -117,7 +116,7 @@ static void OnScrollStart( const Vector2& position )
  *
  * @param[in] position The current scroll position.
  */
-static void OnScrollUpdate( const Vector2& position )
+static void OnScrollUpdate(const Vector2& position)
 {
   gOnScrollUpdateCalled = true;
 }
@@ -127,7 +126,7 @@ static void OnScrollUpdate( const Vector2& position )
  *
  * @param[in] position The current scroll position.
  */
-static void OnScrollComplete( const Vector2& position )
+static void OnScrollComplete(const Vector2& position)
 {
   gOnScrollCompleteCalled = true;
 }
@@ -137,19 +136,19 @@ ScrollView SetupTestScrollView(Integration::Scene scene, int rows, int columns,
   Constraint constraint;
 
   ScrollView scrollView = ScrollView::New();
-  scrollView.SetProperty( Actor::Property::SIZE, size);
-  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
-  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  scrollView.SetProperty(Actor::Property::SIZE, size);
+  scrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  scrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
 
-  constraint = Constraint::New<Dali::Vector3>( scrollView, Dali::Actor::Property::SIZE, Dali::EqualToConstraint() );
-  constraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
+  constraint = Constraint::New<Dali::Vector3>(scrollView, Dali::Actor::Property::SIZE, Dali::EqualToConstraint());
+  constraint.AddSource(Dali::ParentSource(Dali::Actor::Property::SIZE));
   constraint.Apply();
 
   scrollView.SetWrapMode(false);
-  scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
-  scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
-  scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
-  scene.Add( scrollView );
+  scrollView.ScrollStartedSignal().Connect(&OnScrollStart);
+  scrollView.ScrollUpdatedSignal().Connect(&OnScrollUpdate);
+  scrollView.ScrollCompletedSignal().Connect(&OnScrollComplete);
+  scene.Add(scrollView);
   RulerPtr rulerX = CreateRuler(size.width);
   RulerPtr rulerY = CreateRuler(size.height);
   if(columns > 1)
@@ -169,33 +168,33 @@ ScrollView SetupTestScrollView(Integration::Scene scene, int rows, int columns,
     rulerY->Disable();
   }
 
-  scrollView.SetRulerX( rulerX );
-  scrollView.SetRulerY( rulerY );
-  scene.Add( scrollView );
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
+  scene.Add(scrollView);
 
   Actor container = Actor::New();
-  container.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  container.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
-  container.SetProperty( Actor::Property::SIZE, size );
-  scrollView.Add( container );
+  container.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  container.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  container.SetProperty(Actor::Property::SIZE, size);
+  scrollView.Add(container);
 
-  constraint = Constraint::New<Vector3>( container, Actor::Property::SIZE, EqualToConstraint() );
-  constraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
+  constraint = Constraint::New<Vector3>(container, Actor::Property::SIZE, EqualToConstraint());
+  constraint.AddSource(Dali::ParentSource(Dali::Actor::Property::SIZE));
   constraint.Apply();
 
   gPages.clear();
-  for(int row = 0;row<rows;row++)
+  for(int row = 0; row < rows; row++)
   {
-    for(int column = 0;column<columns;column++)
+    for(int column = 0; column < columns; column++)
     {
       Actor page = Actor::New();
 
-      constraint = Constraint::New<Vector3>( page, Actor::Property::SIZE, EqualToConstraint() );
-      constraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
+      constraint = Constraint::New<Vector3>(page, Actor::Property::SIZE, EqualToConstraint());
+      constraint.AddSource(Dali::ParentSource(Dali::Actor::Property::SIZE));
       constraint.Apply();
-      page.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-      page.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-      page.SetProperty( Actor::Property::POSITION, Vector2( column * size.x, row * size.y ));
+      page.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+      page.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+      page.SetProperty(Actor::Property::POSITION, Vector2(column * size.x, row * size.y));
       container.Add(page);
 
       gPages.push_back(page);
@@ -221,15 +220,15 @@ int UtcDaliScrollViewPagePathEffectSetup(void)
 
   ScrollViewPagePathEffect effect;
 
-  DALI_TEST_CHECK( !effect );
+  DALI_TEST_CHECK(!effect);
 
-  BaseHandle handle = ScrollViewPagePathEffect::New(Dali::Path::New(), Vector3::ZERO,Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3::ZERO,0);
+  BaseHandle handle = ScrollViewPagePathEffect::New(Dali::Path::New(), Vector3::ZERO, Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3::ZERO, 0);
 
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   effect = ScrollViewPagePathEffect::DownCast(handle);
 
-  DALI_TEST_CHECK( effect );
+  DALI_TEST_CHECK(effect);
   END_TEST;
 }
 
@@ -241,32 +240,32 @@ int UtcDaliScrollViewPagePathEffectTest(void)
   Vector2 size = application.GetScene().GetSize();
 
   ScrollView scrollView = SetupTestScrollView(application.GetScene(), 1, 3, size);
-  Actor testPage = gPages[2];
+  Actor      testPage   = gPages[2];
   Wait(application, 500);
 
   //Create path
-  float xHalfSize( size.x * 0.5f);
+  float xHalfSize(size.x * 0.5f);
 
-  Dali::Path path = Dali::Path::New();
+  Dali::Path            path = Dali::Path::New();
   Dali::Property::Array points;
   points.Resize(3);
-  points[0] = Vector3( xHalfSize, 0.0f,  -xHalfSize);
-  points[1] = Vector3( 0.0f, 0.0f, 0.0f );
-  points[2] = Vector3( -xHalfSize, 0.0f,  -xHalfSize);
-  path.SetProperty( Path::Property::POINTS, points );
+  points[0] = Vector3(xHalfSize, 0.0f, -xHalfSize);
+  points[1] = Vector3(0.0f, 0.0f, 0.0f);
+  points[2] = Vector3(-xHalfSize, 0.0f, -xHalfSize);
+  path.SetProperty(Path::Property::POINTS, points);
 
   Dali::Property::Array controlPoints;
   controlPoints.Resize(4);
-  controlPoints[0] = Vector3( xHalfSize, 0.0f, 0.0f );
-  controlPoints[1] = Vector3( xHalfSize, 0.0f, 0.0f );
-  controlPoints[2] = Vector3(-xHalfSize, 0.0f, 0.0f );
-  controlPoints[3] = Vector3(-xHalfSize, 0.0f, 0.0f );
-  path.SetProperty( Path::Property::CONTROL_POINTS, controlPoints );
+  controlPoints[0] = Vector3(xHalfSize, 0.0f, 0.0f);
+  controlPoints[1] = Vector3(xHalfSize, 0.0f, 0.0f);
+  controlPoints[2] = Vector3(-xHalfSize, 0.0f, 0.0f);
+  controlPoints[3] = Vector3(-xHalfSize, 0.0f, 0.0f);
+  path.SetProperty(Path::Property::CONTROL_POINTS, controlPoints);
 
   ScrollViewPagePathEffect effect = ScrollViewPagePathEffect::New(path,
                                                                   Vector3::ZERO,
                                                                   Toolkit::ScrollView::Property::SCROLL_FINAL_X,
-                                                                  Vector3(size.x,size.y,0.0f),
+                                                                  Vector3(size.x, size.y, 0.0f),
                                                                   3);
   scrollView.ApplyEffect(effect);
 
@@ -275,8 +274,8 @@ int UtcDaliScrollViewPagePathEffectTest(void)
   {
     Actor page = *pageIter;
     page.RemoveConstraints();
-    Constraint constraint = Constraint::New<Vector3>( page, Actor::Property::SIZE, EqualToConstraint() );
-    constraint.AddSource( ParentSource( Actor::Property::SIZE ) );
+    Constraint constraint = Constraint::New<Vector3>(page, Actor::Property::SIZE, EqualToConstraint());
+    constraint.AddSource(ParentSource(Actor::Property::SIZE));
     constraint.Apply();
     effect.ApplyToPage(page, pageCounter++);
   }
@@ -289,7 +288,7 @@ int UtcDaliScrollViewPagePathEffectTest(void)
   }
 
   // test that the test page has reached centre of screen
-  Vector3 pagePos = testPage.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  Vector3 pagePos = testPage.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
   DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   CleanupTest();
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp
index 336efb5..7f7caab 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
 
 #include <dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h>
 #include <dali-toolkit/devel-api/shader-effects/dissolve-effect.h>
@@ -35,87 +35,88 @@ int UtcDaliCreateAlphaDiscardEffect(void)
   ToolkitTestApplication application;
 
   Property::Map effect = Toolkit::CreateAlphaDiscardEffect();
-  DALI_TEST_CHECK( !effect.Empty() );
+  DALI_TEST_CHECK(!effect.Empty());
 
-  Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER );
-  DALI_TEST_CHECK( customShaderValue );
+  Property::Value* customShaderValue = effect.Find(Toolkit::Visual::Property::SHADER);
+  DALI_TEST_CHECK(customShaderValue);
 
   Property::Map customShader;
-  DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
+  DALI_TEST_CHECK(customShaderValue->Get(customShader));
 
-  Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER );
-  DALI_TEST_CHECK( !vertexShaderValue );
+  Property::Value* vertexShaderValue = customShader.Find(Visual::Shader::Property::VERTEX_SHADER);
+  DALI_TEST_CHECK(!vertexShaderValue);
 
-  Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER );
-  DALI_TEST_CHECK( fragmentShaderValue );
+  Property::Value* fragmentShaderValue = customShader.Find(Visual::Shader::Property::FRAGMENT_SHADER);
+  DALI_TEST_CHECK(fragmentShaderValue);
 
   std::string fragmentShader;
-  DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
-  DALI_TEST_CHECK( !fragmentShader.empty() );
+  DALI_TEST_CHECK(fragmentShaderValue->Get(fragmentShader));
+  DALI_TEST_CHECK(!fragmentShader.empty());
 
-  Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X );
-  DALI_TEST_CHECK( !gridXValue );
+  Property::Value* gridXValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_X);
+  DALI_TEST_CHECK(!gridXValue);
 
-  Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y );
-  DALI_TEST_CHECK( !gridYValue );
+  Property::Value* gridYValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_Y);
+  DALI_TEST_CHECK(!gridYValue);
 
-  Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS );
-  DALI_TEST_CHECK( !hintsValue );
+  Property::Value* hintsValue = customShader.Find(Visual::Shader::Property::HINTS);
+  DALI_TEST_CHECK(!hintsValue);
 
   END_TEST;
 }
 
-int UtcDaliCreateDissolveEffect( bool highPrecision )
+int UtcDaliCreateDissolveEffect(bool highPrecision)
 {
   ToolkitTestApplication application;
 
-  Property::Map effect = Toolkit::CreateDissolveEffect( highPrecision );
-  DALI_TEST_CHECK( !effect.Empty() );
+  Property::Map effect = Toolkit::CreateDissolveEffect(highPrecision);
+  DALI_TEST_CHECK(!effect.Empty());
 
-  Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER );
-  DALI_TEST_CHECK( customShaderValue );
+  Property::Value* customShaderValue = effect.Find(Toolkit::Visual::Property::SHADER);
+  DALI_TEST_CHECK(customShaderValue);
 
   Property::Map customShader;
-  DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
+  DALI_TEST_CHECK(customShaderValue->Get(customShader));
 
-  Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER );
-  DALI_TEST_CHECK( vertexShaderValue );
+  Property::Value* vertexShaderValue = customShader.Find(Visual::Shader::Property::VERTEX_SHADER);
+  DALI_TEST_CHECK(vertexShaderValue);
 
   std::string vertexShader;
-  DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
-  DALI_TEST_CHECK( !vertexShader.empty() );
+  DALI_TEST_CHECK(vertexShaderValue->Get(vertexShader));
+  DALI_TEST_CHECK(!vertexShader.empty());
 
-  Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER );
-  DALI_TEST_CHECK( fragmentShaderValue );
+  Property::Value* fragmentShaderValue = customShader.Find(Visual::Shader::Property::FRAGMENT_SHADER);
+  DALI_TEST_CHECK(fragmentShaderValue);
 
   std::string fragmentShader;
-  DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
-  DALI_TEST_CHECK( !fragmentShader.empty() );
+  DALI_TEST_CHECK(fragmentShaderValue->Get(fragmentShader));
+  DALI_TEST_CHECK(!fragmentShader.empty());
 
-  Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X );
-  DALI_TEST_CHECK( gridXValue );
+  Property::Value* gridXValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_X);
+  DALI_TEST_CHECK(gridXValue);
 
   int gridX = 0;
-  DALI_TEST_CHECK( gridXValue->Get( gridX ) );
-  DALI_TEST_CHECK( gridX > 1 );
+  DALI_TEST_CHECK(gridXValue->Get(gridX));
+  DALI_TEST_CHECK(gridX > 1);
 
-  Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y );
-  DALI_TEST_CHECK( gridYValue );
+  Property::Value* gridYValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_Y);
+  DALI_TEST_CHECK(gridYValue);
 
   int gridY = 0;
-  DALI_TEST_CHECK( gridYValue->Get( gridY ) );
-  DALI_TEST_CHECK( gridY > 1 );
+  DALI_TEST_CHECK(gridYValue->Get(gridY));
+  DALI_TEST_CHECK(gridY > 1);
 
-  Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS );
-  DALI_TEST_CHECK( hintsValue );
+  Property::Value* hintsValue = customShader.Find(Visual::Shader::Property::HINTS);
+  DALI_TEST_CHECK(hintsValue);
 
-  int hints;;
-  DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT );
+  int hints;
+  ;
+  DALI_TEST_CHECK(hintsValue->Get(hints));
+  DALI_TEST_CHECK(hints == Shader::Hint::OUTPUT_IS_TRANSPARENT);
 
   Actor actor = Actor::New();
-  Toolkit::DissolveEffectSetCentralLine( actor, Vector2::ONE, Vector2::ONE, 0.0f );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uPercentage" ) != Property::INVALID_INDEX );
+  Toolkit::DissolveEffectSetCentralLine(actor, Vector2::ONE, Vector2::ONE, 0.0f);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uPercentage") != Property::INVALID_INDEX);
 
   END_TEST;
 }
@@ -135,33 +136,34 @@ int UtcDaliCreateDissolveEffect(void)
   ToolkitTestApplication application;
 
   Property::Map effect = Toolkit::CreateDistanceFieldEffect();
-  DALI_TEST_CHECK( !effect.Empty() );
+  DALI_TEST_CHECK(!effect.Empty());
 
-  Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER );
-  DALI_TEST_CHECK( customShaderValue );
+  Property::Value* customShaderValue = effect.Find(Toolkit::Visual::Property::SHADER);
+  DALI_TEST_CHECK(customShaderValue);
 
   Property::Map customShader;
-  DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
+  DALI_TEST_CHECK(customShaderValue->Get(customShader));
 
-  Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER );
-  DALI_TEST_CHECK( !vertexShaderValue );
+  Property::Value* vertexShaderValue = customShader.Find(Visual::Shader::Property::VERTEX_SHADER);
+  DALI_TEST_CHECK(!vertexShaderValue);
 
-  Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER );
-  DALI_TEST_CHECK( fragmentShaderValue );
+  Property::Value* fragmentShaderValue = customShader.Find(Visual::Shader::Property::FRAGMENT_SHADER);
+  DALI_TEST_CHECK(fragmentShaderValue);
 
   std::string fragmentShader;
-  DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
-  DALI_TEST_CHECK( !fragmentShader.empty() );
+  DALI_TEST_CHECK(fragmentShaderValue->Get(fragmentShader));
+  DALI_TEST_CHECK(!fragmentShader.empty());
 
-  Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X );
-  DALI_TEST_CHECK( !gridXValue );
+  Property::Value* gridXValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_X);
+  DALI_TEST_CHECK(!gridXValue);
 
-  Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS );
-  DALI_TEST_CHECK( hintsValue );
+  Property::Value* hintsValue = customShader.Find(Visual::Shader::Property::HINTS);
+  DALI_TEST_CHECK(hintsValue);
 
-  int hints;;
-  DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT );
+  int hints;
+  ;
+  DALI_TEST_CHECK(hintsValue->Get(hints));
+  DALI_TEST_CHECK(hints == Shader::Hint::OUTPUT_IS_TRANSPARENT);
 
   END_TEST;
 }
@@ -171,32 +173,32 @@ int UtcDaliCreateImageRegionEffect(void)
   ToolkitTestApplication application;
 
   Property::Map effect = Toolkit::CreateImageRegionEffect();
-  DALI_TEST_CHECK( !effect.Empty() );
+  DALI_TEST_CHECK(!effect.Empty());
 
-  Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER );
-  DALI_TEST_CHECK( customShaderValue );
+  Property::Value* customShaderValue = effect.Find(Toolkit::Visual::Property::SHADER);
+  DALI_TEST_CHECK(customShaderValue);
 
   Property::Map customShader;
-  DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
+  DALI_TEST_CHECK(customShaderValue->Get(customShader));
 
-  Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER );
-  DALI_TEST_CHECK( vertexShaderValue );
+  Property::Value* vertexShaderValue = customShader.Find(Visual::Shader::Property::VERTEX_SHADER);
+  DALI_TEST_CHECK(vertexShaderValue);
 
   std::string vertexShader;
-  DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
-  DALI_TEST_CHECK( !vertexShader.empty() );
+  DALI_TEST_CHECK(vertexShaderValue->Get(vertexShader));
+  DALI_TEST_CHECK(!vertexShader.empty());
 
-  Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER );
-  DALI_TEST_CHECK( !fragmentShaderValue );
+  Property::Value* fragmentShaderValue = customShader.Find(Visual::Shader::Property::FRAGMENT_SHADER);
+  DALI_TEST_CHECK(!fragmentShaderValue);
 
-  Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X );
-  DALI_TEST_CHECK( !gridXValue );
+  Property::Value* gridXValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_X);
+  DALI_TEST_CHECK(!gridXValue);
 
-  Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y );
-  DALI_TEST_CHECK( !gridYValue );
+  Property::Value* gridYValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_Y);
+  DALI_TEST_CHECK(!gridYValue);
 
-  Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS );
-  DALI_TEST_CHECK( !hintsValue );
+  Property::Value* hintsValue = customShader.Find(Visual::Shader::Property::HINTS);
+  DALI_TEST_CHECK(!hintsValue);
 
   END_TEST;
 }
@@ -206,60 +208,61 @@ int UtcDaliCreateMotionBlurEffect(void)
   ToolkitTestApplication application;
 
   Property::Map effect = Toolkit::CreateMotionBlurEffect();
-  DALI_TEST_CHECK( !effect.Empty() );
+  DALI_TEST_CHECK(!effect.Empty());
 
-  Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER );
-  DALI_TEST_CHECK( customShaderValue );
+  Property::Value* customShaderValue = effect.Find(Toolkit::Visual::Property::SHADER);
+  DALI_TEST_CHECK(customShaderValue);
 
   Property::Map customShader;
-  DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
+  DALI_TEST_CHECK(customShaderValue->Get(customShader));
 
-  Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER );
-  DALI_TEST_CHECK( vertexShaderValue );
+  Property::Value* vertexShaderValue = customShader.Find(Visual::Shader::Property::VERTEX_SHADER);
+  DALI_TEST_CHECK(vertexShaderValue);
 
   std::string vertexShader;
-  DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
-  DALI_TEST_CHECK( !vertexShader.empty() );
+  DALI_TEST_CHECK(vertexShaderValue->Get(vertexShader));
+  DALI_TEST_CHECK(!vertexShader.empty());
 
-  Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER );
-  DALI_TEST_CHECK( fragmentShaderValue );
+  Property::Value* fragmentShaderValue = customShader.Find(Visual::Shader::Property::FRAGMENT_SHADER);
+  DALI_TEST_CHECK(fragmentShaderValue);
 
   std::string fragmentShader;
-  DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
-  DALI_TEST_CHECK( !fragmentShader.empty() );
+  DALI_TEST_CHECK(fragmentShaderValue->Get(fragmentShader));
+  DALI_TEST_CHECK(!fragmentShader.empty());
 
-  Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X );
-  DALI_TEST_CHECK( gridXValue );
+  Property::Value* gridXValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_X);
+  DALI_TEST_CHECK(gridXValue);
 
   int gridX = 0;
-  DALI_TEST_CHECK( gridXValue->Get( gridX ) );
-  DALI_TEST_CHECK( gridX > 1 );
+  DALI_TEST_CHECK(gridXValue->Get(gridX));
+  DALI_TEST_CHECK(gridX > 1);
 
-  Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y );
-  DALI_TEST_CHECK( gridYValue );
+  Property::Value* gridYValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_Y);
+  DALI_TEST_CHECK(gridYValue);
 
   int gridY = 0;
-  DALI_TEST_CHECK( gridYValue->Get( gridY ) );
-  DALI_TEST_CHECK( gridY > 1 );
-
-  Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS );
-  DALI_TEST_CHECK( hintsValue );
-
-  int hints;;
-  DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT );
-
-  unsigned int sampleCount( 4 );
-  Actor actor = Actor::New();
-  Toolkit::SetMotionBlurProperties( actor, sampleCount );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uBlurTexCoordScale" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uGeometryStretchFactor" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uSpeedScalingFactor" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uObjectFadeStart" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uObjectFadeEnd" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uAlphaScale" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uNumSamples" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uModelLastFrame" ) != Property::INVALID_INDEX );
+  DALI_TEST_CHECK(gridYValue->Get(gridY));
+  DALI_TEST_CHECK(gridY > 1);
+
+  Property::Value* hintsValue = customShader.Find(Visual::Shader::Property::HINTS);
+  DALI_TEST_CHECK(hintsValue);
+
+  int hints;
+  ;
+  DALI_TEST_CHECK(hintsValue->Get(hints));
+  DALI_TEST_CHECK(hints == Shader::Hint::OUTPUT_IS_TRANSPARENT);
+
+  unsigned int sampleCount(4);
+  Actor        actor = Actor::New();
+  Toolkit::SetMotionBlurProperties(actor, sampleCount);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uBlurTexCoordScale") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uGeometryStretchFactor") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uSpeedScalingFactor") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uObjectFadeStart") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uObjectFadeEnd") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uAlphaScale") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uNumSamples") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uModelLastFrame") != Property::INVALID_INDEX);
 
   END_TEST;
 }
@@ -269,57 +272,58 @@ int UtcDaliCreateMotionStretchEffect(void)
   ToolkitTestApplication application;
 
   Property::Map effect = Toolkit::CreateMotionStretchEffect();
-  DALI_TEST_CHECK( !effect.Empty() );
+  DALI_TEST_CHECK(!effect.Empty());
 
-  Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER );
-  DALI_TEST_CHECK( customShaderValue );
+  Property::Value* customShaderValue = effect.Find(Toolkit::Visual::Property::SHADER);
+  DALI_TEST_CHECK(customShaderValue);
 
   Property::Map customShader;
-  DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
+  DALI_TEST_CHECK(customShaderValue->Get(customShader));
 
-  Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER );
-  DALI_TEST_CHECK( vertexShaderValue );
+  Property::Value* vertexShaderValue = customShader.Find(Visual::Shader::Property::VERTEX_SHADER);
+  DALI_TEST_CHECK(vertexShaderValue);
 
   std::string vertexShader;
-  DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
-  DALI_TEST_CHECK( !vertexShader.empty() );
+  DALI_TEST_CHECK(vertexShaderValue->Get(vertexShader));
+  DALI_TEST_CHECK(!vertexShader.empty());
 
-  Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER );
-  DALI_TEST_CHECK( fragmentShaderValue );
+  Property::Value* fragmentShaderValue = customShader.Find(Visual::Shader::Property::FRAGMENT_SHADER);
+  DALI_TEST_CHECK(fragmentShaderValue);
 
   std::string fragmentShader;
-  DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
-  DALI_TEST_CHECK( !fragmentShader.empty() );
+  DALI_TEST_CHECK(fragmentShaderValue->Get(fragmentShader));
+  DALI_TEST_CHECK(!fragmentShader.empty());
 
-  Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X );
-  DALI_TEST_CHECK( gridXValue );
+  Property::Value* gridXValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_X);
+  DALI_TEST_CHECK(gridXValue);
 
   int gridX = 0;
-  DALI_TEST_CHECK( gridXValue->Get( gridX ) );
-  DALI_TEST_CHECK( gridX > 1 );
+  DALI_TEST_CHECK(gridXValue->Get(gridX));
+  DALI_TEST_CHECK(gridX > 1);
 
-  Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y );
-  DALI_TEST_CHECK( gridYValue );
+  Property::Value* gridYValue = customShader.Find(Visual::Shader::Property::SUBDIVIDE_GRID_Y);
+  DALI_TEST_CHECK(gridYValue);
 
   int gridY = 0;
-  DALI_TEST_CHECK( gridYValue->Get( gridY ) );
-  DALI_TEST_CHECK( gridY > 1 );
+  DALI_TEST_CHECK(gridYValue->Get(gridY));
+  DALI_TEST_CHECK(gridY > 1);
 
-  Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS );
-  DALI_TEST_CHECK( hintsValue );
+  Property::Value* hintsValue = customShader.Find(Visual::Shader::Property::HINTS);
+  DALI_TEST_CHECK(hintsValue);
 
-  int hints;;
-  DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT );
+  int hints;
+  ;
+  DALI_TEST_CHECK(hintsValue->Get(hints));
+  DALI_TEST_CHECK(hints == Shader::Hint::OUTPUT_IS_TRANSPARENT);
 
   Actor actor = Actor::New();
-  Toolkit::SetMotionStretchProperties( actor );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uGeometryStretchFactor" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uSpeedScalingFactor" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uObjectFadeStart" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uObjectFadeEnd" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uAlphaScale" ) != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( actor.GetPropertyIndex( "uModelLastFrame" ) != Property::INVALID_INDEX );
+  Toolkit::SetMotionStretchProperties(actor);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uGeometryStretchFactor") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uSpeedScalingFactor") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uObjectFadeStart") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uObjectFadeEnd") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uAlphaScale") != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(actor.GetPropertyIndex("uModelLastFrame") != Property::INVALID_INDEX);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp
index 6a4dc31..fcbaf14 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp
@@ -15,12 +15,11 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h>
-
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -35,7 +34,6 @@ void shadow_view_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 // Negative test case for a method
 int UtcDaliShadowViewUninitialized(void)
 {
@@ -47,13 +45,13 @@ int UtcDaliShadowViewUninitialized(void)
   {
     // New() must be called to create a GaussianBlurView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
@@ -66,10 +64,10 @@ int UtcDaliShadowViewNew(void)
   tet_infoline("UtcDaliShadowViewNew");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Toolkit::ShadowView view2 = Toolkit::ShadowView::New(1.0f, 1.0f);
-  DALI_TEST_CHECK( view2 );
+  DALI_TEST_CHECK(view2);
   END_TEST;
 }
 
@@ -80,12 +78,12 @@ int UtcDaliShadowViewDownCast(void)
   tet_infoline("UtcDaliShadowViewDownCast");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  BaseHandle handle(view);
+  BaseHandle          handle(view);
 
-  Toolkit::ShadowView shadowView = Toolkit::ShadowView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( shadowView );
-  DALI_TEST_CHECK( shadowView == view );
+  Toolkit::ShadowView shadowView = Toolkit::ShadowView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(shadowView);
+  DALI_TEST_CHECK(shadowView == view);
   END_TEST;
 }
 
@@ -96,12 +94,12 @@ int UtcDaliShadowViewPropertyNames(void)
   tet_infoline("UtcDaliShadowViewPropertyNames");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // Check the names, this names are used in the shader code,
   // if they change in the shader code, then it has to be updated here.
-  DALI_TEST_EQUALS( view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetShadowColorPropertyIndex(), view.GetPropertyIndex("ShadowColorProperty"), TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetShadowColorPropertyIndex(), view.GetPropertyIndex("ShadowColorProperty"), TEST_LOCATION);
   END_TEST;
 }
 
@@ -112,22 +110,21 @@ int UtcDaliShadowViewAddRemove(void)
   tet_infoline("UtcDaliShadowViewAddRemove");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
-
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(actor);
   application.GetScene().Add(view);
 
-  DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
   view.Remove(actor);
 
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
@@ -138,23 +135,23 @@ int UtcDaliShadowViewActivateDeactivate(void)
   tet_infoline("UtcDaliShadowViewActivateDeactivate");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   RenderTaskList taskList = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList.GetTaskCount());
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.Activate();
 
   RenderTaskList taskList2 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
+  DALI_TEST_CHECK(1u != taskList2.GetTaskCount());
 
   view.Deactivate();
 
   RenderTaskList taskList3 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList3.GetTaskCount());
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SlideTransition.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SlideTransition.cpp
old mode 100755
new mode 100644
index 1e12912..1bfcb8d
--- a/automated-tests/src/dali-toolkit/utc-Dali-SlideTransition.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SlideTransition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/actor-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/transition/transition-set.h>
-#include <dali-toolkit/public-api/transition/transition-base.h>
 #include <dali-toolkit/public-api/transition/slide-transition.h>
+#include <dali-toolkit/public-api/transition/transition-base.h>
+#include <dali-toolkit/public-api/transition/transition-set.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -121,7 +121,7 @@ int UtcDaliSlideTransitionWithOffScene(void)
   transitionSet.AddTransition(slide);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -171,15 +171,15 @@ int UtcDaliSlideTransitionOut(void)
 
   DALI_TEST_EQUALS(Vector2(0, 0), control.GetCurrentProperty<Vector2>(Actor::Property::POSITION), TEST_LOCATION);
 
-  Vector2 windowSize = application.GetScene().GetSize();
-  SlideTransition slide = SlideTransition::New(control, Dali::Toolkit::SlideTransitionDirection::BOTTOM, TimePeriod(0.5f));
+  Vector2         windowSize = application.GetScene().GetSize();
+  SlideTransition slide      = SlideTransition::New(control, Dali::Toolkit::SlideTransitionDirection::BOTTOM, TimePeriod(0.5f));
   slide.SetAppearingTransition(false);
 
   TransitionSet transitionSet = TransitionSet::New();
   transitionSet.AddTransition(slide);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -240,7 +240,7 @@ int UtcDaliSlideTransitionIn(void)
   transitionSet.AddTransition(slide);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
index de98918..1e86e0d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -36,7 +36,6 @@ void dali_slider_cleanup(void)
 
 namespace
 {
-
 static bool gObjectCreatedCallBackCalled;
 
 static void TestCallback(BaseHandle handle)
@@ -44,7 +43,7 @@ static void TestCallback(BaseHandle handle)
   gObjectCreatedCallBackCalled = true;
 }
 
-}
+} // namespace
 
 int UtcDaliSliderNew(void)
 {
@@ -54,26 +53,26 @@ int UtcDaliSliderNew(void)
   // Create the Slider actor
   Slider slider;
 
-  DALI_TEST_CHECK( !slider );
+  DALI_TEST_CHECK(!slider);
 
   slider = Slider::New();
 
-  DALI_TEST_CHECK( slider );
+  DALI_TEST_CHECK(slider);
 
   Slider slider2(slider);
 
-  DALI_TEST_CHECK( slider2 == slider );
+  DALI_TEST_CHECK(slider2 == slider);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     Slider slider = Slider::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -82,10 +81,10 @@ int UtcDaliSliderCopyConstructor(void)
   ToolkitTestApplication application;
 
   Slider slider = Slider::New();
-  DALI_TEST_CHECK( slider );
+  DALI_TEST_CHECK(slider);
 
-  Slider copy( slider );
-  DALI_TEST_CHECK( copy );
+  Slider copy(slider);
+  DALI_TEST_CHECK(copy);
 
   END_TEST;
 }
@@ -95,12 +94,12 @@ int UtcDaliSliderCopyAssignment(void)
   ToolkitTestApplication application;
 
   Slider slider = Slider::New();
-  DALI_TEST_CHECK( slider );
+  DALI_TEST_CHECK(slider);
 
   Slider copy;
   copy = slider;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_EQUALS( slider, copy, TEST_LOCATION );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_EQUALS(slider, copy, TEST_LOCATION);
 
   END_TEST;
 }
@@ -110,15 +109,15 @@ int UtcDaliSliderMoveConstructor(void)
   ToolkitTestApplication application;
 
   Slider slider = Slider::New();
-  DALI_TEST_EQUALS( 1, slider.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  slider.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == slider.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, slider.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  slider.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == slider.GetProperty<bool>(Actor::Property::SENSITIVE));
 
-  Slider moved = std::move( slider );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !slider );
+  Slider moved = std::move(slider);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!slider);
 
   END_TEST;
 }
@@ -128,16 +127,16 @@ int UtcDaliSliderMoveAssignment(void)
   ToolkitTestApplication application;
 
   Slider slider = Slider::New();
-  DALI_TEST_EQUALS( 1, slider.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  slider.SetProperty( Actor::Property::SENSITIVE, false );
-  DALI_TEST_CHECK( false == slider.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_EQUALS(1, slider.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  slider.SetProperty(Actor::Property::SENSITIVE, false);
+  DALI_TEST_CHECK(false == slider.GetProperty<bool>(Actor::Property::SENSITIVE));
 
   Slider moved;
-  moved = std::move( slider );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( !slider );
+  moved = std::move(slider);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(false == moved.GetProperty<bool>(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(!slider);
 
   END_TEST;
 }
@@ -149,7 +148,7 @@ int UtcDaliSliderDestructor(void)
   Slider* slider = new Slider();
   delete slider;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -159,28 +158,28 @@ int UtcDaliSliderDownCast(void)
 
   Handle handle = Slider::New();
 
-  Slider slider = Slider::DownCast( handle );
+  Slider slider = Slider::DownCast(handle);
 
-  DALI_TEST_CHECK( slider == handle );
+  DALI_TEST_CHECK(slider == handle);
   END_TEST;
 }
 
-static bool gSliderValueChangedCallBackCalled=false;
-static bool OnSliderValueChanged( Slider slider, float value )
+static bool gSliderValueChangedCallBackCalled = false;
+static bool OnSliderValueChanged(Slider slider, float value)
 {
   gSliderValueChangedCallBackCalled = true;
   return true;
 }
 
-static bool gSliderMarkCallBackCalled=false;
-static bool OnSliderMark( Slider slider, int value )
+static bool gSliderMarkCallBackCalled = false;
+static bool OnSliderMark(Slider slider, int value)
 {
   gSliderMarkCallBackCalled = true;
   return true;
 }
 
-static bool gSliderSlidingFinishedCallBackCalled=false;
-static bool OnSlidingFinished( Slider slider, float value )
+static bool gSliderSlidingFinishedCallBackCalled = false;
+static bool OnSlidingFinished(Slider slider, float value)
 {
   gSliderSlidingFinishedCallBackCalled = true;
   return true;
@@ -188,72 +187,72 @@ static bool OnSlidingFinished( Slider slider, float value )
 
 int UtcDaliSliderSignals1(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliSliderSignals1");
 
   // Create the Popup actor
   Slider slider = Slider::New();
-  application.GetScene().Add( slider );
-  slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  slider.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) );
-  slider.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-
-  const float MIN_BOUND = 0.0f;
-  const float MAX_BOUND = 1.0f;
-  const int NUM_MARKS = 5;
+  application.GetScene().Add(slider);
+  slider.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  slider.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  slider.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, 20.0f));
+  slider.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+
+  const float     MIN_BOUND = 0.0f;
+  const float     MAX_BOUND = 1.0f;
+  const int       NUM_MARKS = 5;
   Property::Array marks;
-  for( int i = 0; i < NUM_MARKS; ++i )
+  for(int i = 0; i < NUM_MARKS; ++i)
   {
-    marks.PushBack( MIN_BOUND + ( static_cast<float>(i) / ( NUM_MARKS - 1) ) * ( MAX_BOUND - MIN_BOUND ) );
+    marks.PushBack(MIN_BOUND + (static_cast<float>(i) / (NUM_MARKS - 1)) * (MAX_BOUND - MIN_BOUND));
   }
-  slider.SetProperty( Slider::Property::MARKS, marks );
-  slider.SetProperty( Slider::Property::MARK_TOLERANCE, 0.1f );
+  slider.SetProperty(Slider::Property::MARKS, marks);
+  slider.SetProperty(Slider::Property::MARK_TOLERANCE, 0.1f);
 
-  slider.ValueChangedSignal().Connect( &OnSliderValueChanged );
-  slider.MarkReachedSignal().Connect( &OnSliderMark );
-  slider.SlidingFinishedSignal().Connect( &OnSlidingFinished );
+  slider.ValueChangedSignal().Connect(&OnSliderValueChanged);
+  slider.MarkReachedSignal().Connect(&OnSliderMark);
+  slider.SlidingFinishedSignal().Connect(&OnSlidingFinished);
 
   application.SendNotification();
   application.Render();
 
-  gSliderValueChangedCallBackCalled = false;
-  gSliderMarkCallBackCalled = false;
+  gSliderValueChangedCallBackCalled    = false;
+  gSliderMarkCallBackCalled            = false;
   gSliderSlidingFinishedCallBackCalled = false;
 
   {
     Dali::Integration::TouchEvent event = Dali::Integration::TouchEvent();
-    Integration::Point pointDown;
-    pointDown.SetState( PointState::DOWN );
-    pointDown.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-    event.AddPoint( pointDown );
+    Integration::Point            pointDown;
+    pointDown.SetState(PointState::DOWN);
+    pointDown.SetScreenPosition(Vector2(10.0f, 10.0f));
+    event.AddPoint(pointDown);
 
-    application.ProcessEvent( event );
+    application.ProcessEvent(event);
     application.SendNotification();
     application.Render();
   }
 
-  for( int i = 0; i < 5; ++i )
+  for(int i = 0; i < 5; ++i)
   {
     Dali::Integration::TouchEvent event = Dali::Integration::TouchEvent();
-    Integration::Point pointMotion;
-    pointMotion.SetState( PointState::MOTION );
-    pointMotion.SetScreenPosition( Vector2( 10.0f + i * 10.0f, 10.0f ) );
-    event.AddPoint( pointMotion );
+    Integration::Point            pointMotion;
+    pointMotion.SetState(PointState::MOTION);
+    pointMotion.SetScreenPosition(Vector2(10.0f + i * 10.0f, 10.0f));
+    event.AddPoint(pointMotion);
 
-    application.ProcessEvent( event );
+    application.ProcessEvent(event);
     application.SendNotification();
     application.Render();
   }
 
   {
     Dali::Integration::TouchEvent event = Dali::Integration::TouchEvent();
-    Integration::Point pointUp;
-    pointUp.SetState( PointState::UP );
-    pointUp.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-    event.AddPoint( pointUp );
+    Integration::Point            pointUp;
+    pointUp.SetState(PointState::UP);
+    pointUp.SetScreenPosition(Vector2(10.0f, 10.0f));
+    event.AddPoint(pointUp);
 
-    application.ProcessEvent( event );
+    application.ProcessEvent(event);
     application.SendNotification();
     application.Render();
   }
@@ -266,10 +265,9 @@ int UtcDaliSliderSignals1(void)
   END_TEST;
 }
 
-
 namespace
 {
-bool gSliderSignal=false;
+bool gSliderSignal = false;
 struct SliderSignalFunctor
 {
   SliderSignalFunctor()
@@ -281,67 +279,65 @@ struct SliderSignalFunctor
     gSliderSignal = true;
   }
 };
-} // anonymous
-
-
+} // namespace
 
 int UtcDaliSliderSignals2(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliSliderSignals1");
 
   // Create the Popup actor
   Slider slider = Slider::New();
-  application.GetScene().Add( slider );
-  slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  slider.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) );
-  slider.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
-
-  const float MIN_BOUND = 0.0f;
-  const float MAX_BOUND = 1.0f;
-  const int NUM_MARKS = 5;
+  application.GetScene().Add(slider);
+  slider.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  slider.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  slider.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, 20.0f));
+  slider.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+
+  const float     MIN_BOUND = 0.0f;
+  const float     MAX_BOUND = 1.0f;
+  const int       NUM_MARKS = 5;
   Property::Array marks;
-  for( int i = 0; i < NUM_MARKS; ++i )
+  for(int i = 0; i < NUM_MARKS; ++i)
   {
-    marks.PushBack( MIN_BOUND + ( static_cast<float>(i) / ( NUM_MARKS - 1) ) * ( MAX_BOUND - MIN_BOUND ) );
+    marks.PushBack(MIN_BOUND + (static_cast<float>(i) / (NUM_MARKS - 1)) * (MAX_BOUND - MIN_BOUND));
   }
-  slider.SetProperty( Slider::Property::MARKS, marks );
-  slider.SetProperty( Slider::Property::MARK_TOLERANCE, 0.1f );
+  slider.SetProperty(Slider::Property::MARKS, marks);
+  slider.SetProperty(Slider::Property::MARK_TOLERANCE, 0.1f);
 
-  gSliderSignal = false;
+  gSliderSignal                  = false;
   ConnectionTracker* testTracker = new ConnectionTracker();
-  slider.ConnectSignal( testTracker, "valueChanged",   SliderSignalFunctor() );
+  slider.ConnectSignal(testTracker, "valueChanged", SliderSignalFunctor());
 
   application.SendNotification();
   application.Render();
 
   gSliderValueChangedCallBackCalled = false;
-  gSliderMarkCallBackCalled = false;
+  gSliderMarkCallBackCalled         = false;
 
   Dali::Integration::TouchEvent event;
 
   event = Dali::Integration::TouchEvent();
 
   Integration::Point pointDown;
-  pointDown.SetState( PointState::DOWN );
-  pointDown.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  event.AddPoint( pointDown );
+  pointDown.SetState(PointState::DOWN);
+  pointDown.SetScreenPosition(Vector2(10.0f, 10.0f));
+  event.AddPoint(pointDown);
 
-  for( int i = 0; i < 5; ++i )
+  for(int i = 0; i < 5; ++i)
   {
     Integration::Point pointMotion;
-    pointMotion.SetState( PointState::MOTION );
-    pointMotion.SetScreenPosition( Vector2( 10.0f + i * 10.0f, 10.0f ) );
-    event.AddPoint( pointMotion );
+    pointMotion.SetState(PointState::MOTION);
+    pointMotion.SetScreenPosition(Vector2(10.0f + i * 10.0f, 10.0f));
+    event.AddPoint(pointMotion);
   }
 
   Integration::Point pointUp;
-  pointUp.SetState( PointState::UP );
-  pointUp.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  event.AddPoint( pointUp );
+  pointUp.SetState(PointState::UP);
+  pointUp.SetScreenPosition(Vector2(10.0f, 10.0f));
+  event.AddPoint(pointUp);
 
-  application.ProcessEvent( event );
+  application.ProcessEvent(event);
 
   application.SendNotification();
   application.Render();
@@ -350,31 +346,31 @@ int UtcDaliSliderSignals2(void)
   END_TEST;
 }
 
-int UtcDaliSetPropertyP(void)
+int UtcDaliSliderSetPropertyP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliSetPropertyP" );
+  tet_infoline("UtcDaliSliderSetPropertyP");
 
   Slider slider = Slider::New();
-  slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  slider.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) );
-  slider.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
+  slider.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  slider.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  slider.SetProperty(Actor::Property::SIZE, Vector2(application.GetScene().GetSize().x, 20.0f));
+  slider.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
 
   application.GetScene().Add(slider);
   application.SendNotification();
   application.Render();
 
-  slider.SetProperty(Slider::Property::LOWER_BOUND,        1.0f);
-  slider.SetProperty(Slider::Property::UPPER_BOUND,        5.0f);
-  slider.SetProperty(Slider::Property::VALUE,              3.0f);
-  slider.SetProperty(Slider::Property::DISABLED_COLOR,     Color::BLACK);
-  slider.SetProperty(Slider::Property::VALUE_PRECISION,    4);
-  slider.SetProperty(Slider::Property::SHOW_POPUP,         true);
-  slider.SetProperty(Slider::Property::SHOW_VALUE,         true);
-  slider.SetProperty(Slider::Property::MARKS,              false);
-  slider.SetProperty(Slider::Property::SNAP_TO_MARKS,      false);
-  slider.SetProperty(Slider::Property::MARK_TOLERANCE,     0.5f);
+  slider.SetProperty(Slider::Property::LOWER_BOUND, 1.0f);
+  slider.SetProperty(Slider::Property::UPPER_BOUND, 5.0f);
+  slider.SetProperty(Slider::Property::VALUE, 3.0f);
+  slider.SetProperty(Slider::Property::DISABLED_COLOR, Color::BLACK);
+  slider.SetProperty(Slider::Property::VALUE_PRECISION, 4);
+  slider.SetProperty(Slider::Property::SHOW_POPUP, true);
+  slider.SetProperty(Slider::Property::SHOW_VALUE, true);
+  slider.SetProperty(Slider::Property::MARKS, false);
+  slider.SetProperty(Slider::Property::SNAP_TO_MARKS, false);
+  slider.SetProperty(Slider::Property::MARK_TOLERANCE, 0.5f);
 
   float lb = slider.GetProperty<float>(Slider::Property::LOWER_BOUND);
   DALI_TEST_EQUALS(lb, 1.0f, TEST_LOCATION);
@@ -383,76 +379,75 @@ int UtcDaliSetPropertyP(void)
   float val = slider.GetProperty<float>(Slider::Property::VALUE);
   DALI_TEST_EQUALS(val, 3.0f, TEST_LOCATION);
   Vector4 color = slider.GetProperty<Vector4>(Slider::Property::DISABLED_COLOR);
-  DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
+  DALI_TEST_EQUALS(color, Color::BLACK, TEST_LOCATION);
   int precision = slider.GetProperty<int>(Slider::Property::VALUE_PRECISION);
-  DALI_TEST_EQUALS( precision, 4, TEST_LOCATION);
+  DALI_TEST_EQUALS(precision, 4, TEST_LOCATION);
   bool showPopup = slider.GetProperty<bool>(Slider::Property::SHOW_POPUP);
-  DALI_TEST_EQUALS( showPopup, true , TEST_LOCATION);
+  DALI_TEST_EQUALS(showPopup, true, TEST_LOCATION);
   bool showValue = slider.GetProperty<bool>(Slider::Property::SHOW_VALUE);
-  DALI_TEST_EQUALS( showValue, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(showValue, true, TEST_LOCATION);
   bool marks = slider.GetProperty<bool>(Slider::Property::MARKS);
-  DALI_TEST_EQUALS( marks, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(marks, false, TEST_LOCATION);
   bool snapToMarks = slider.GetProperty<bool>(Slider::Property::SNAP_TO_MARKS);
-  DALI_TEST_EQUALS( snapToMarks, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(snapToMarks, false, TEST_LOCATION);
   float tolerance = slider.GetProperty<float>(Slider::Property::MARK_TOLERANCE);
-  DALI_TEST_EQUALS( tolerance, 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(tolerance, 0.5f, TEST_LOCATION);
 
   {
     Property::Map map;
     map["visualType"] = "IMAGE";
-    map["size"] = Vector2(200, 200);
-    map["url"] = "track2.png";
-    slider.SetProperty(Slider::Property::TRACK_VISUAL,       map);
+    map["size"]       = Vector2(200, 200);
+    map["url"]        = "track2.png";
+    slider.SetProperty(Slider::Property::TRACK_VISUAL, map);
     map["url"] = "handle2.png";
-    slider.SetProperty(Slider::Property::HANDLE_VISUAL,      map);
+    slider.SetProperty(Slider::Property::HANDLE_VISUAL, map);
     map["url"] = "progress2.png";
-    slider.SetProperty(Slider::Property::PROGRESS_VISUAL,    map);
+    slider.SetProperty(Slider::Property::PROGRESS_VISUAL, map);
     map["url"] = "popup2.png";
-    slider.SetProperty(Slider::Property::POPUP_VISUAL,       map);
+    slider.SetProperty(Slider::Property::POPUP_VISUAL, map);
     map["url"] = "popupArrow2.png";
     slider.SetProperty(Slider::Property::POPUP_ARROW_VISUAL, map);
 
-    Property::Value value = slider.GetProperty(Slider::Property::TRACK_VISUAL);
-    Property::Map* resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    Property::Value value     = slider.GetProperty(Slider::Property::TRACK_VISUAL);
+    Property::Map*  resultMap = value.GetMap();
+    DALI_TEST_CHECK(resultMap);
     Property::Value* url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "track2.png", TEST_LOCATION );
+    DALI_TEST_CHECK(url);
+    DALI_TEST_EQUALS(*url, "track2.png", TEST_LOCATION);
 
-    value = slider.GetProperty(Slider::Property::HANDLE_VISUAL);
+    value     = slider.GetProperty(Slider::Property::HANDLE_VISUAL);
     resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    DALI_TEST_CHECK(resultMap);
     url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "handle2.png", TEST_LOCATION );
+    DALI_TEST_CHECK(url);
+    DALI_TEST_EQUALS(*url, "handle2.png", TEST_LOCATION);
 
-    value = slider.GetProperty(Slider::Property::PROGRESS_VISUAL);
+    value     = slider.GetProperty(Slider::Property::PROGRESS_VISUAL);
     resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    DALI_TEST_CHECK(resultMap);
     url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "progress2.png", TEST_LOCATION );
+    DALI_TEST_CHECK(url);
+    DALI_TEST_EQUALS(*url, "progress2.png", TEST_LOCATION);
 
-    value = slider.GetProperty(Slider::Property::POPUP_VISUAL);
+    value     = slider.GetProperty(Slider::Property::POPUP_VISUAL);
     resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    DALI_TEST_CHECK(resultMap);
     url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "popup2.png", TEST_LOCATION );
+    DALI_TEST_CHECK(url);
+    DALI_TEST_EQUALS(*url, "popup2.png", TEST_LOCATION);
 
-    value = slider.GetProperty(Slider::Property::POPUP_ARROW_VISUAL);
+    value     = slider.GetProperty(Slider::Property::POPUP_ARROW_VISUAL);
     resultMap = value.GetMap();
-    DALI_TEST_CHECK( resultMap );
+    DALI_TEST_CHECK(resultMap);
     url = resultMap->Find("url");
-    DALI_TEST_CHECK( url ) ;
-    DALI_TEST_EQUALS( *url, "popupArrow2.png", TEST_LOCATION );
+    DALI_TEST_CHECK(url);
+    DALI_TEST_EQUALS(*url, "popupArrow2.png", TEST_LOCATION);
   }
 
   UnparentAndReset(slider);
   END_TEST;
 }
 
-
 // DestroyHandleVisualDisplay
 // CreateValueDisplay
 // SlidingFinishedSignal()
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
index 26d72f1..3a0012e 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,16 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h>
+#include <dali.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -39,14 +39,13 @@ void utc_dali_toolkit_super_blur_view_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 namespace
 {
-const int BLUR_LEVELS = 3;
-const int RENDER_FRAME_INTERVAL = 16;
-static const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-static bool gObjectCreatedCallBackCalled;
-static void TestCallback(BaseHandle handle)
+const int          BLUR_LEVELS           = 3;
+const int          RENDER_FRAME_INTERVAL = 16;
+static const char* TEST_IMAGE_FILE_NAME  = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+static bool        gObjectCreatedCallBackCalled;
+static void        TestCallback(BaseHandle handle)
 {
   gObjectCreatedCallBackCalled = true;
 }
@@ -64,7 +63,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -74,23 +73,23 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
   return time;
 }
 
-Texture CreateSolidColorTexture( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
+Texture CreateSolidColorTexture(ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height)
 {
-  unsigned int size = width * height;
-  uint8_t* pixbuf = new uint8_t[size*4];
+  unsigned int size   = width * height;
+  uint8_t*     pixbuf = new uint8_t[size * 4];
 
-  for( size_t i = 0; i < size; i++ )
+  for(size_t i = 0; i < size; i++)
   {
-    pixbuf[i*4+0] = 0xFF * color.r;
-    pixbuf[i*4+1] = 0xFF * color.g;
-    pixbuf[i*4+2] = 0xFF * color.b;
-    pixbuf[i*4+3] = 0xFF * color.a;
+    pixbuf[i * 4 + 0] = 0xFF * color.r;
+    pixbuf[i * 4 + 1] = 0xFF * color.g;
+    pixbuf[i * 4 + 2] = 0xFF * color.b;
+    pixbuf[i * 4 + 3] = 0xFF * color.a;
   }
 
-  PixelData pixels = PixelData::New( pixbuf, size, width, height, Pixel::RGBA8888, PixelData::ReleaseFunction::DELETE_ARRAY );
+  PixelData pixels = PixelData::New(pixbuf, size, width, height, Pixel::RGBA8888, PixelData::ReleaseFunction::DELETE_ARRAY);
 
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight() );
-  texture.Upload( pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight() );
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight());
+  texture.Upload(pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight());
 
   return texture;
 }
@@ -98,15 +97,15 @@ Texture CreateSolidColorTexture( ToolkitTestApplication& application, const Vect
 class SignalHandler : public Dali::ConnectionTracker
 {
 public:
-  SignalHandler() :
-    mCalls( 0 )
+  SignalHandler()
+  : mCalls(0)
   {
   }
 
-  void Callback( SuperBlurView handle )
+  void Callback(SuperBlurView handle)
   {
     mCalls++;
-    tet_infoline( "Signal called" );
+    tet_infoline("Signal called");
   }
 
   unsigned int GetCalls() const
@@ -115,11 +114,10 @@ public:
   }
 
 private:
-  unsigned int mCalls;  ///< Keeps track of how many times the signal has been called.
+  unsigned int mCalls; ///< Keeps track of how many times the signal has been called.
 };
 
-}//namespace
-
+} //namespace
 
 int UtcDaliSuperBlurViewNew(void)
 {
@@ -129,32 +127,32 @@ int UtcDaliSuperBlurViewNew(void)
 
   // Test default constructor.
   SuperBlurView blurView;
-  DALI_TEST_CHECK( !blurView );
+  DALI_TEST_CHECK(!blurView);
 
   // Test object creation
-  blurView = SuperBlurView::New( BLUR_LEVELS );
-  DALI_TEST_CHECK( blurView );
+  blurView = SuperBlurView::New(BLUR_LEVELS);
+  DALI_TEST_CHECK(blurView);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
+    SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   // Test copy constructor
-  SuperBlurView blurViewCopy2( blurView );
-  DALI_TEST_CHECK( blurViewCopy2 );
+  SuperBlurView blurViewCopy2(blurView);
+  DALI_TEST_CHECK(blurViewCopy2);
 
   // Test down cast
   Actor actorView;
-  actorView = blurView;
-  SuperBlurView downCastView = SuperBlurView::DownCast( actorView );
-  DALI_TEST_CHECK( downCastView );
+  actorView                  = blurView;
+  SuperBlurView downCastView = SuperBlurView::DownCast(actorView);
+  DALI_TEST_CHECK(downCastView);
   END_TEST;
 }
 
@@ -166,47 +164,46 @@ int UtcDaliSuperBlurViewCreate(void)
 
   // Test default constructor.
   SuperBlurView blurView;
-  DALI_TEST_CHECK( !blurView );
+  DALI_TEST_CHECK(!blurView);
 
   // Test object creation
   TypeInfo type = TypeRegistry::Get().GetTypeInfo("SuperBlurView");
-  if( type )
+  if(type)
   {
     Dali::BaseHandle handle = type.CreateInstance();
-    if( handle )
+    if(handle)
     {
-      blurView = Dali::Toolkit::SuperBlurView::DownCast( handle );
+      blurView = Dali::Toolkit::SuperBlurView::DownCast(handle);
     }
   }
 
-  DALI_TEST_CHECK( blurView );
+  DALI_TEST_CHECK(blurView);
 
   END_TEST;
 }
 
-
 int UtcDaliSuperBlurViewSetTexture(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline(" UtcDaliSuperBlurViewSetTexture ");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  blurView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
+  SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
+  blurView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
-  Texture inputTexture = CreateSolidColorTexture( application, Color::GREEN, 50, 50 );
-  blurView.SetTexture( inputTexture );
+  Texture inputTexture = CreateSolidColorTexture(application, Color::GREEN, 50, 50);
+  blurView.SetTexture(inputTexture);
   // start multiple guassian blur call, each guassian blur creates two render tasks
-  DALI_TEST_CHECK( application.GetScene().GetRenderTaskList().GetTaskCount() == 1+BLUR_LEVELS*2);
+  DALI_TEST_CHECK(application.GetScene().GetRenderTaskList().GetTaskCount() == 1 + BLUR_LEVELS * 2);
 
   {
     // create renderers for the original image and each blurred image
-    application.GetScene().Add( blurView );
+    application.GetScene().Add(blurView);
     Wait(application);
-    DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS+1, TEST_LOCATION );
+    DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS + 1, TEST_LOCATION);
 
     Wait(application);
-    application.GetScene().Remove( blurView );
+    application.GetScene().Remove(blurView);
   }
 
   END_TEST;
@@ -215,71 +212,70 @@ int UtcDaliSuperBlurViewSetTexture(void)
 int UtcDaliSuperBlurViewSetTexture2(void)
 {
   ToolkitTestApplication application;
-  Integration::Scene stage = application.GetScene();
+  Integration::Scene     stage = application.GetScene();
 
   tet_infoline(" UtcDaliSuperBlurViewSetTexture2 - test setting a second texture ");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  blurView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
+  SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
+  blurView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
   tet_infoline("Call SetTexture and add blurview to stage");
-  Texture inputTexture = CreateSolidColorTexture( application, Color::GREEN, 50, 50 );
-  blurView.SetTexture( inputTexture );
+  Texture inputTexture = CreateSolidColorTexture(application, Color::GREEN, 50, 50);
+  blurView.SetTexture(inputTexture);
 
   // start multiple guassian blur call, each guassian blur creates two render tasks
-  DALI_TEST_CHECK( application.GetScene().GetRenderTaskList().GetTaskCount() == 1+BLUR_LEVELS*2);
+  DALI_TEST_CHECK(application.GetScene().GetRenderTaskList().GetTaskCount() == 1 + BLUR_LEVELS * 2);
   {
     // create renderers for the original image and each blurred image
-    stage.Add( blurView );
+    stage.Add(blurView);
     Wait(application);
-    DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS+1, TEST_LOCATION );
+    DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS + 1, TEST_LOCATION);
 
     tet_infoline("Wait for a second to allow blur to finish");
     Wait(application, 1000);
 
     tet_infoline("Remove from stage");
-    application.GetScene().Remove( blurView );
+    application.GetScene().Remove(blurView);
   }
 
   tet_infoline("Test that there are no render tasks remaining");
-  DALI_TEST_EQUALS(blurView.GetRendererCount(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(blurView.GetRendererCount(), 0, TEST_LOCATION);
 
   tet_infoline("Call SetTexture a second time and add blurview back to stage");
-  Texture inputTexture2 = CreateSolidColorTexture( application, Color::CYAN, 50, 50 );
-  blurView.SetTexture( inputTexture2 );
+  Texture inputTexture2 = CreateSolidColorTexture(application, Color::CYAN, 50, 50);
+  blurView.SetTexture(inputTexture2);
   // start multiple guassian blur call, each guassian blur creates two render tasks
-  DALI_TEST_CHECK( application.GetScene().GetRenderTaskList().GetTaskCount() == 1+BLUR_LEVELS*2);
+  DALI_TEST_CHECK(application.GetScene().GetRenderTaskList().GetTaskCount() == 1 + BLUR_LEVELS * 2);
 
   {
     // create renderers for the original image and each blurred image
-    application.GetScene().Add( blurView );
+    application.GetScene().Add(blurView);
     Wait(application);
-    DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS+1, TEST_LOCATION );
+    DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS + 1, TEST_LOCATION);
 
     tet_infoline("Wait for a second to allow blur to finish");
     Wait(application, 1000);
 
     tet_infoline("Remove from stage");
-    application.GetScene().Remove( blurView );
+    application.GetScene().Remove(blurView);
   }
 
   tet_infoline("Test that there are no render tasks remaining");
-  DALI_TEST_EQUALS(blurView.GetRendererCount(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(blurView.GetRendererCount(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliSuperBlurViewSetProperty(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline(" UtcDaliSuperBlurViewSetProperty ");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
+  SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
   // create renderers for the original image and each blurred image
-  application.GetScene().Add( blurView );
-  blurView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
+  application.GetScene().Add(blurView);
+  blurView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
   // Will create ResourceImage
   blurView.SetProperty(SuperBlurView::Property::IMAGE_URL, TEST_IMAGE_FILE_NAME);
@@ -288,48 +284,46 @@ int UtcDaliSuperBlurViewSetProperty(void)
   // start multiple guassian blur call, each guassian blur creates two render tasks
 
   unsigned int count = application.GetScene().GetRenderTaskList().GetTaskCount();
-  DALI_TEST_CHECK( count == 1+BLUR_LEVELS*2 );
+  DALI_TEST_CHECK(count == 1 + BLUR_LEVELS * 2);
 
   Wait(application);
 
   END_TEST;
 }
 
-
 int UtcDaliSuperBlurViewGetProperty(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline(" UtcDaliSuperBlurViewSetProperty ");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  blurView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
+  SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
+  blurView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
   blurView.SetProperty(SuperBlurView::Property::IMAGE_URL, TEST_IMAGE_FILE_NAME);
   Wait(application);
 
   // create renderers for the original image and each blurred image
-  application.GetScene().Add( blurView );
+  application.GetScene().Add(blurView);
 
-  std::string imageUrl = blurView.GetProperty<std::string>( SuperBlurView::Property::IMAGE_URL );
-  DALI_TEST_EQUALS( imageUrl, TEST_IMAGE_FILE_NAME, TEST_LOCATION );
+  std::string imageUrl = blurView.GetProperty<std::string>(SuperBlurView::Property::IMAGE_URL);
+  DALI_TEST_EQUALS(imageUrl, TEST_IMAGE_FILE_NAME, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliSuperBlurViewSetGetBlurStrength(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline(" UtcDaliSuperBlurViewSetGetBlurStrength ");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  DALI_TEST_EQUALS(blurView.GetCurrentBlurStrength(), 0.f, TEST_LOCATION );
+  SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
+  DALI_TEST_EQUALS(blurView.GetCurrentBlurStrength(), 0.f, TEST_LOCATION);
 
-  blurView.SetBlurStrength( 0.65f );
+  blurView.SetBlurStrength(0.65f);
   Wait(application);
-  DALI_TEST_EQUALS(blurView.GetCurrentBlurStrength(), 0.65f, TEST_LOCATION );
+  DALI_TEST_EQUALS(blurView.GetCurrentBlurStrength(), 0.65f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -339,17 +333,17 @@ int UtcDaliSuperBlurViewGetBlurStrengthPropertyIndex(void)
 
   tet_infoline(" UtcDaliSuperBlurViewGetBlurStrengthPropertyIndex ");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
+  SuperBlurView   blurView        = SuperBlurView::New(BLUR_LEVELS);
   Property::Index blurPropertyIdx = blurView.GetBlurStrengthPropertyIndex();
 
   float blurStrength;
-  (blurView.GetProperty( blurPropertyIdx )).Get(blurStrength);
-  DALI_TEST_EQUALS(blurStrength, 0.f, TEST_LOCATION );
+  (blurView.GetProperty(blurPropertyIdx)).Get(blurStrength);
+  DALI_TEST_EQUALS(blurStrength, 0.f, TEST_LOCATION);
 
-  blurView.SetBlurStrength( 0.65f );
+  blurView.SetBlurStrength(0.65f);
   Wait(application);
-  (blurView.GetProperty( blurPropertyIdx )).Get(blurStrength);
-  DALI_TEST_EQUALS(blurStrength, 0.65f, TEST_LOCATION );
+  (blurView.GetProperty(blurPropertyIdx)).Get(blurStrength);
+  DALI_TEST_EQUALS(blurStrength, 0.65f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -357,24 +351,24 @@ int UtcDaliSuperBlurViewGetBlurredTexture(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliSuperBlurViewGetBlurredTexture" );
+  tet_infoline("UtcDaliSuperBlurViewGetBlurredTexture");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  blurView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
-  Texture inputTexture = CreateSolidColorTexture( application, Color::GREEN, 100, 100 );
-  blurView.SetTexture( inputTexture );
+  SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
+  blurView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  Texture inputTexture = CreateSolidColorTexture(application, Color::GREEN, 100, 100);
+  blurView.SetTexture(inputTexture);
 
   Wait(application, 200); // Make sure all the gaussian blur finished
 
-  Texture texture1 = blurView.GetBlurredTexture( 1 );
-  DALI_TEST_CHECK( texture1 );
+  Texture texture1 = blurView.GetBlurredTexture(1);
+  DALI_TEST_CHECK(texture1);
 
-  Texture texture2 = blurView.GetBlurredTexture( 2 );
-  DALI_TEST_EQUALS( texture2.GetWidth(), 25u, TEST_LOCATION );
-  DALI_TEST_EQUALS( texture2.GetHeight(), 25u, TEST_LOCATION );
+  Texture texture2 = blurView.GetBlurredTexture(2);
+  DALI_TEST_EQUALS(texture2.GetWidth(), 25u, TEST_LOCATION);
+  DALI_TEST_EQUALS(texture2.GetHeight(), 25u, TEST_LOCATION);
 
-  Texture texture3 = blurView.GetBlurredTexture( 3 );
-  DALI_TEST_CHECK( texture3 );
+  Texture texture3 = blurView.GetBlurredTexture(3);
+  DALI_TEST_CHECK(texture3);
 
   END_TEST;
 }
@@ -385,22 +379,22 @@ int UtcDaliSuperBlurViewBlurSignal(void)
 
   tet_infoline(" UtcDaliSuperBlurViewSignal ");
 
-  SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
-  blurView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
+  SuperBlurView blurView = SuperBlurView::New(BLUR_LEVELS);
+  blurView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
-  Texture inputTexture = CreateSolidColorTexture( application, Color::GREEN, 50, 50 );
-  blurView.SetTexture( inputTexture );
+  Texture inputTexture = CreateSolidColorTexture(application, Color::GREEN, 50, 50);
+  blurView.SetTexture(inputTexture);
   // start multiple guassian blur call, each guassian blur creates two render tasks
-  DALI_TEST_CHECK( application.GetScene().GetRenderTaskList().GetTaskCount() == 1+BLUR_LEVELS*2);
+  DALI_TEST_CHECK(application.GetScene().GetRenderTaskList().GetTaskCount() == 1 + BLUR_LEVELS * 2);
 
   SignalHandler signalHandler;
   blurView.BlurFinishedSignal().Connect(&signalHandler, &SignalHandler::Callback);
 
   // create renderers for the original image and each blurred image
-  application.GetScene().Add( blurView );
+  application.GetScene().Add(blurView);
   Wait(application, 1000);
 
-  DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS+1, TEST_LOCATION );
+  DALI_TEST_EQUALS(blurView.GetRendererCount(), BLUR_LEVELS + 1, TEST_LOCATION);
   //DALI_TEST_EQUALS(signalHandler.GetCalls(), 1, TEST_LOCATION);
 
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SvgVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SvgVisual.cpp
new file mode 100644
index 0000000..48fd4ce
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SvgVisual.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dummy-control.h>
+#include <toolkit-event-thread-callback.h>
+
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+void dali_svg_visual_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void dali_svg_visual_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+namespace
+{
+const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg";
+} // namespace
+
+int UtcDaliSvgVisualChageSize(void)
+{
+  tet_infoline("Test change transform");
+
+  ToolkitTestApplication application;
+
+  TraceCallStack& textureTrace = application.GetGlAbstraction().GetTextureTrace();
+  textureTrace.Enable(true);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(Property::Map().Add(ImageVisual::Property::URL, TEST_SVG_FILE_NAME));
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      control   = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(control.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  application.SendNotification();
+
+  // Wait for loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  control.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  application.GetScene().Add(control);
+
+  visual.SetTransformAndSize(Property::Map(), Vector2(100, 100));
+
+  // Wait for rasterization but not execute the callback
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 30, false), true, TEST_LOCATION);
+
+  // Change actor size before finishing rasterization
+  control.SetProperty(Actor::Property::SIZE, Vector2(300, 300));
+  visual.SetTransformAndSize(Property::Map(), Vector2(300, 300));
+
+  application.SendNotification();
+
+  // Wait for rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  TraceCallStack::NamedParams params;
+  params["width"] << 300;
+  params["height"] << 300;
+  // Should be the final size
+  DALI_TEST_EQUALS(textureTrace.FindMethodAndParams("TexImage2D", params), true, TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SyncImageLoader.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SyncImageLoader.cpp
index d37c5fc..41f97aa 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-SyncImageLoader.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SyncImageLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,60 +15,55 @@
  *
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <dali/dali.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali/dali.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
 namespace
 {
-
 // Resolution: 50*50, pixel format: RGBA8888
 static const char* gImage_50_RGBA = TEST_RESOURCE_DIR "/icon-delete.png";
 
 // Resolution: 128*128, pixel format: RGB888
 static const char* gImage_128_RGB = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
 
-
-void VerifyLoad( PixelData pixelData, uint32_t width, uint32_t height )
+void VerifyLoad(PixelData pixelData, uint32_t width, uint32_t height)
 {
-  DALI_TEST_CHECK( pixelData );
-  DALI_TEST_EQUALS<unsigned int>( pixelData.GetWidth(), width, TEST_LOCATION );
-  DALI_TEST_EQUALS<unsigned int>( pixelData.GetHeight(), height, TEST_LOCATION );
+  DALI_TEST_CHECK(pixelData);
+  DALI_TEST_EQUALS<unsigned int>(pixelData.GetWidth(), width, TEST_LOCATION);
+  DALI_TEST_EQUALS<unsigned int>(pixelData.GetHeight(), height, TEST_LOCATION);
 }
 
 } // anonymous namespace
 
-
 int UtcDaliSyncImageLoaderLoad(void)
 {
-  PixelData pixelData = Toolkit::SyncImageLoader::Load( gImage_50_RGBA );
+  PixelData pixelData = Toolkit::SyncImageLoader::Load(gImage_50_RGBA);
 
-  DALI_TEST_EQUALS<bool>( pixelData, true, TEST_LOCATION );
+  DALI_TEST_CHECK(pixelData);
 
   END_TEST;
 }
 
 int UtcDaliSyncImageLoaderLoadWithDimensions(void)
 {
-  PixelData pixelData = Toolkit::SyncImageLoader::Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
+  PixelData pixelData = Toolkit::SyncImageLoader::Load(gImage_50_RGBA, ImageDimensions(25, 25));
 
-  VerifyLoad( pixelData, 25u, 25u );
+  VerifyLoad(pixelData, 25u, 25u);
 
   END_TEST;
 }
 
 int UtcDaliSyncImageLoaderLoadWithAllOptions(void)
 {
-  PixelData pixelData = Toolkit::SyncImageLoader::Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
+  PixelData pixelData = Toolkit::SyncImageLoader::Load(gImage_128_RGB, ImageDimensions(100, 100), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true);
 
-  VerifyLoad( pixelData, 100u, 100u );
+  VerifyLoad(pixelData, 100u, 100u);
 
   END_TEST;
 }
-
-
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
index 1a540a2..5ec6b5f 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
@@ -15,12 +15,12 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/table-view/table-view.h>
+#include <stdlib.h>
+#include <iostream>
+#include <sstream>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -37,13 +37,12 @@ void dali_tableview_cleanup(void)
 
 namespace
 {
-
-const char* const PROPERTY_NAME_ROWS = "rows";
-const char* const PROPERTY_NAME_COLUMNS = "columns";
-const char* const PROPERTY_NAME_CELL_PADDING = "cellPadding";
-const char* const PROPERTY_NAME_LAYOUT_ROWS = "layoutRows";
+const char* const PROPERTY_NAME_ROWS           = "rows";
+const char* const PROPERTY_NAME_COLUMNS        = "columns";
+const char* const PROPERTY_NAME_CELL_PADDING   = "cellPadding";
+const char* const PROPERTY_NAME_LAYOUT_ROWS    = "layoutRows";
 const char* const PROPERTY_NAME_LAYOUT_COLUMNS = "layoutColumns";
-const Vector2 CELL_SIZE( 10, 10 );
+const Vector2     CELL_SIZE(10, 10);
 
 static bool gObjectCreatedCallBackCalled;
 
@@ -54,14 +53,14 @@ static void TestCallback(BaseHandle handle)
 
 struct Constraint100
 {
-  Constraint100( )
+  Constraint100()
   {
   }
 
   /**
    * function operator to apply the parent size
    */
-  void operator()( Dali::Vector3& current, const PropertyInputContainer& /* inputs */ )
+  void operator()(Dali::Vector3& current, const PropertyInputContainer& /* inputs */)
   {
     current.x = current.y = current.z = 100.0f;
   }
@@ -70,23 +69,23 @@ struct Constraint100
 // Convenience function to quickly set up a 10x10 table with each cell being 10x10 pixels in size by default.
 static void SetupTableViewAndActors(Integration::Scene scene, TableView& tableView, Actor& actor1, Actor& actor2, Actor& actor3)
 {
-  tableView = TableView::New( 10, 10 ); // 10 by 10 grid.
-  DALI_TEST_CHECK( tableView );
+  tableView = TableView::New(10, 10); // 10 by 10 grid.
+  DALI_TEST_CHECK(tableView);
 
-  scene.Add( tableView );
-  tableView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
+  scene.Add(tableView);
+  tableView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
   actor1 = Actor::New();
   actor2 = Actor::New();
   actor3 = Actor::New();
 
-  actor1.SetProperty( Actor::Property::SIZE, CELL_SIZE );
-  actor2.SetProperty( Actor::Property::SIZE, CELL_SIZE );
-  actor3.SetProperty( Actor::Property::SIZE, CELL_SIZE );
+  actor1.SetProperty(Actor::Property::SIZE, CELL_SIZE);
+  actor2.SetProperty(Actor::Property::SIZE, CELL_SIZE);
+  actor3.SetProperty(Actor::Property::SIZE, CELL_SIZE);
 
-  tableView.AddChild( actor1, TableView::CellPosition( 0, 0 ) );
-  tableView.AddChild( actor2, TableView::CellPosition( 0, 1 ) );
-  tableView.AddChild( actor3, TableView::CellPosition( 1, 0 ) );
+  tableView.AddChild(actor1, TableView::CellPosition(0, 0));
+  tableView.AddChild(actor2, TableView::CellPosition(0, 1));
+  tableView.AddChild(actor3, TableView::CellPosition(1, 0));
 }
 
 } // namespace
@@ -95,10 +94,10 @@ int UtcDaliTableViewCtorCopyP(void)
 {
   ToolkitTestApplication application;
 
-  TableView actor1 = TableView::New(10,10);
-  TableView actor2( actor1 );
+  TableView actor1 = TableView::New(10, 10);
+  TableView actor2(actor1);
 
-  DALI_TEST_EQUALS( actor1, actor2, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1, actor2, TEST_LOCATION);
   END_TEST;
 }
 
@@ -106,19 +105,19 @@ int UtcDaliTableViewNew(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(10,10);
+  TableView tableView = TableView::New(10, 10);
   DALI_TEST_CHECK(tableView);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
   registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    TableView tableView = TableView::New(10,10);
+    TableView tableView = TableView::New(10, 10);
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -130,9 +129,9 @@ int UtcDaliTableViewMetricsPadding(void)
   tet_infoline("UtcDaliTableViewMetricsPadding");
 
   TableView tableView;
-  Actor actor1;
-  Actor actor2;
-  Actor actor3;
+  Actor     actor1;
+  Actor     actor2;
+  Actor     actor3;
 
   SetupTableViewAndActors(application.GetScene(), tableView, actor1, actor2, actor3);
 
@@ -141,18 +140,18 @@ int UtcDaliTableViewMetricsPadding(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.GetCellPadding(), Size(0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION);
 
   // 1. check that padding works. some padding:
   tableView.SetCellPadding(Size(5.0f, 10.0f));
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(5.0f, 10.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(5.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.GetCellPadding(), Size(5.0f, 10.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(5.0f, 10.0f, 0.0f), TEST_LOCATION);
   END_TEST;
 }
 
@@ -164,47 +163,47 @@ int UtcDaliTableViewMetricsFit(void)
   tet_infoline("UtcDaliTableViewMetricsFit");
 
   TableView tableView;
-  Actor actor1;
-  Actor actor2;
-  Actor actor3;
+  Actor     actor1;
+  Actor     actor2;
+  Actor     actor3;
 
   SetupTableViewAndActors(application.GetScene(), tableView, actor1, actor2, actor3);
   application.SendNotification();
   application.Render();
 
   // 1. check that with no fixed width/heights, actors are in default position.
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION);
 
   // 2. check that with a fixed width & height, actors to the right and below are offsetted.
   tableView.SetFitHeight(0);
   tableView.SetFitWidth(0);
-  DALI_TEST_EQUALS( tableView.IsFitHeight(0), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.IsFitWidth(0), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.IsFitHeight(0), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(tableView.IsFitWidth(0), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION);
 
-  tableView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION,  Dali::LayoutDirection::RIGHT_TO_LEFT );
+  tableView.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(90.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(80.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(90.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(90.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(80.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(90.0f, 10.0f, 0.0f), TEST_LOCATION);
 
-  tableView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION,  Dali::LayoutDirection::LEFT_TO_RIGHT );
+  tableView.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -217,31 +216,31 @@ int UtcDaliTableViewMetricsFixed(void)
   tet_infoline("UtcDaliTableViewMetricsFixed");
 
   TableView tableView;
-  Actor actor1;
-  Actor actor2;
-  Actor actor3;
+  Actor     actor1;
+  Actor     actor2;
+  Actor     actor3;
 
   SetupTableViewAndActors(application.GetScene(), tableView, actor1, actor2, actor3);
   application.SendNotification();
   application.Render();
 
   // 1. check that with no fixed width/heights, actors are in default position.
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION);
 
   // 2. check that with a fixed width & height, actors to the right and below are offsetted.
   tableView.SetFixedWidth(0, 20.0f);
   tableView.SetFixedHeight(0, 50.0f);
-  DALI_TEST_EQUALS( tableView.GetFixedWidth(0), 20.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetFixedHeight(0), 50.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.GetFixedWidth(0), 20.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(tableView.GetFixedHeight(0), 50.0f, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(20.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(20.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION);
   END_TEST;
 }
 
@@ -253,35 +252,34 @@ int UtcDaliTableViewMetricsRelative(void)
   tet_infoline("UtcDaliTableViewMetricsRelative");
 
   TableView tableView;
-  Actor actor1;
-  Actor actor2;
-  Actor actor3;
+  Actor     actor1;
+  Actor     actor2;
+  Actor     actor3;
 
   SetupTableViewAndActors(application.GetScene(), tableView, actor1, actor2, actor3);
   application.SendNotification();
   application.Render();
 
   // 1. check that with no relative width/heights, actors are in default position.
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION);
 
   // 2. check that with a relative width & height, actors to the right and below are offsetted.
   tableView.SetRelativeWidth(0, 0.3f); // cell 0,0 occupies 30%x50% of the grid (i.e. 30x50 pixels)
   tableView.SetRelativeHeight(0, 0.5f);
-  DALI_TEST_EQUALS( tableView.GetRelativeWidth(0), 0.3f, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetRelativeHeight(0), 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.GetRelativeWidth(0), 0.3f, TEST_LOCATION);
+  DALI_TEST_EQUALS(tableView.GetRelativeHeight(0), 0.5f, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(30.0f, 0.0f, 0.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(30.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION);
   END_TEST;
 }
 
-
 // Test Adding/Removing/Finding Children.
 int UtcDaliTableViewChild(void)
 {
@@ -290,51 +288,51 @@ int UtcDaliTableViewChild(void)
   tet_infoline("UtcDaliTableViewChild");
 
   // Create a 10x10 table-view
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView);
 
   // Check if actor doesn't exist.
-  DALI_TEST_CHECK( !tableView.GetChildAt(TableView::CellPosition(0,0)) );
+  DALI_TEST_CHECK(!tableView.GetChildAt(TableView::CellPosition(0, 0)));
 
   // Add an actor to it at 0,0
   Actor actor = Actor::New();
   tableView.AddChild(actor, TableView::CellPosition());
 
   // Check if exists.
-  DALI_TEST_CHECK( tableView.GetChildAt(TableView::CellPosition(0,0)) );
+  DALI_TEST_CHECK(tableView.GetChildAt(TableView::CellPosition(0, 0)));
 
   // Remove this actor
   tableView.RemoveChildAt(TableView::CellPosition());
 
   // Check if actor no longer exists.
-  DALI_TEST_CHECK( !tableView.GetChildAt(TableView::CellPosition(0,0)) );
+  DALI_TEST_CHECK(!tableView.GetChildAt(TableView::CellPosition(0, 0)));
 
   // Add actor to it again, but at 2,5
-  tableView.AddChild(actor, TableView::CellPosition(2,5));
+  tableView.AddChild(actor, TableView::CellPosition(2, 5));
 
   // Add another actor somewhere else 7,8
   Actor actor2 = Actor::New();
-  tableView.AddChild(actor2, TableView::CellPosition(7,8));
+  tableView.AddChild(actor2, TableView::CellPosition(7, 8));
 
   Actor searchActor;
 
   // Check that no actor exists in a few random places.
-  DALI_TEST_CHECK( !tableView.GetChildAt(TableView::CellPosition(0,0)) );
-  DALI_TEST_CHECK( !tableView.GetChildAt(TableView::CellPosition(2,1)) );
-  DALI_TEST_CHECK( !tableView.GetChildAt(TableView::CellPosition(6,3)) );
-  DALI_TEST_CHECK( !tableView.GetChildAt(TableView::CellPosition(9,5)) );
+  DALI_TEST_CHECK(!tableView.GetChildAt(TableView::CellPosition(0, 0)));
+  DALI_TEST_CHECK(!tableView.GetChildAt(TableView::CellPosition(2, 1)));
+  DALI_TEST_CHECK(!tableView.GetChildAt(TableView::CellPosition(6, 3)));
+  DALI_TEST_CHECK(!tableView.GetChildAt(TableView::CellPosition(9, 5)));
 
   // Check for actors at actual positions.
-  searchActor = tableView.GetChildAt(TableView::CellPosition(2,5));
-  DALI_TEST_CHECK( searchActor == actor);
+  searchActor = tableView.GetChildAt(TableView::CellPosition(2, 5));
+  DALI_TEST_CHECK(searchActor == actor);
 
-  searchActor = tableView.GetChildAt(TableView::CellPosition(7,8));
-  DALI_TEST_CHECK( searchActor == actor2);
+  searchActor = tableView.GetChildAt(TableView::CellPosition(7, 8));
+  DALI_TEST_CHECK(searchActor == actor2);
 
   // Create a second table, and add already added Child to new one.
-  TableView tableView2 = TableView::New(5,5);
-  tableView2.AddChild(actor, TableView::CellPosition(2,2));
-  DALI_TEST_CHECK( tableView2.GetChildAt(TableView::CellPosition(2,2)) );
+  TableView tableView2 = TableView::New(5, 5);
+  tableView2.AddChild(actor, TableView::CellPosition(2, 2));
+  DALI_TEST_CHECK(tableView2.GetChildAt(TableView::CellPosition(2, 2)));
   END_TEST;
 }
 
@@ -346,14 +344,14 @@ int UtcDaliTableViewAdd(void)
   tet_infoline("UtcDaliTableViewAdd");
 
   // Create a 4x1 table-view, and just keep adding.
-  TableView tableView = TableView::New(1,4);
-  DALI_TEST_CHECK( tableView );
+  TableView tableView = TableView::New(1, 4);
+  DALI_TEST_CHECK(tableView);
 
-  for(unsigned int i = 0;i<16;i++)
+  for(unsigned int i = 0; i < 16; i++)
   {
-    Actor currentActor = Actor::New();
-    TableView::CellPosition position = TableView::CellPosition();
-    tableView.Add( currentActor );
+    Actor                   currentActor = Actor::New();
+    TableView::CellPosition position     = TableView::CellPosition();
+    tableView.Add(currentActor);
     tableView.FindChildPosition(currentActor, position);
     tet_printf("%dx%d (%d,%d)\n", tableView.GetColumns(), tableView.GetRows(), position.columnIndex, position.rowIndex);
 
@@ -369,99 +367,99 @@ int UtcDaliTableViewCells(void)
   tet_infoline("UtcDaliTableViewCells");
 
   // Create a 10x10 table-view
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView);
 
   // Add a few actors to the table.
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
   Actor actor3 = Actor::New();
-  actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2");
-  actor3.SetProperty( Dali::Actor::Property::NAME,"Actor3");
+  actor1.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor2.SetProperty(Dali::Actor::Property::NAME, "Actor2");
+  actor3.SetProperty(Dali::Actor::Property::NAME, "Actor3");
 
   // note: positions are specified in reversed cartesian coords - row,col (i.e. y,x)
-  tableView.AddChild(actor1, TableView::CellPosition(0,0));
-  tableView.AddChild(actor2, TableView::CellPosition(5,5));
-  tableView.AddChild(actor3, TableView::CellPosition(7,2));
+  tableView.AddChild(actor1, TableView::CellPosition(0, 0));
+  tableView.AddChild(actor2, TableView::CellPosition(5, 5));
+  tableView.AddChild(actor3, TableView::CellPosition(7, 2));
 
-  DALI_TEST_CHECK( tableView.GetRows() == 10 && tableView.GetColumns() == 10 );
+  DALI_TEST_CHECK(tableView.GetRows() == 10 && tableView.GetColumns() == 10);
 
   // Add a row between actor1 and actor2 | insert column on actor1 and see what happens...
   tableView.InsertRow(3);
   tableView.InsertColumn(0);
-  DALI_TEST_CHECK( tableView.GetRows() == 11 && tableView.GetColumns() == 11 );
+  DALI_TEST_CHECK(tableView.GetRows() == 11 && tableView.GetColumns() == 11);
 
   TableView::CellPosition cellPosition;
-  bool result;
+  bool                    result;
 
   result = tableView.FindChildPosition(actor1, cellPosition);
-  DALI_TEST_CHECK( result && cellPosition.rowIndex == 0 && cellPosition.columnIndex == 1);
+  DALI_TEST_CHECK(result && cellPosition.rowIndex == 0 && cellPosition.columnIndex == 1);
   result = tableView.FindChildPosition(actor2, cellPosition);
-  DALI_TEST_CHECK( result && cellPosition.rowIndex == 6 && cellPosition.columnIndex == 6);
+  DALI_TEST_CHECK(result && cellPosition.rowIndex == 6 && cellPosition.columnIndex == 6);
   result = tableView.FindChildPosition(actor3, cellPosition);
-  DALI_TEST_CHECK( result && cellPosition.rowIndex == 8 && cellPosition.columnIndex == 3);
+  DALI_TEST_CHECK(result && cellPosition.rowIndex == 8 && cellPosition.columnIndex == 3);
 
   // Delete a row between actor2 and actor3 | delete column on actor2 and see what happens...
   tableView.DeleteRow(7);
   tableView.DeleteColumn(6);
-  DALI_TEST_CHECK( tableView.GetRows() == 10 && tableView.GetColumns() == 10 );
+  DALI_TEST_CHECK(tableView.GetRows() == 10 && tableView.GetColumns() == 10);
 
   result = tableView.FindChildPosition(actor1, cellPosition);
-  DALI_TEST_CHECK( result && cellPosition.rowIndex == 0 && cellPosition.columnIndex == 1);
+  DALI_TEST_CHECK(result && cellPosition.rowIndex == 0 && cellPosition.columnIndex == 1);
   result = tableView.FindChildPosition(actor2, cellPosition);
-  DALI_TEST_CHECK( !result );
+  DALI_TEST_CHECK(!result);
   result = tableView.FindChildPosition(actor3, cellPosition);
-  DALI_TEST_CHECK( result && cellPosition.rowIndex == 7 && cellPosition.columnIndex == 3);
+  DALI_TEST_CHECK(result && cellPosition.rowIndex == 7 && cellPosition.columnIndex == 3);
 
   // Delete the other two remaining actors by a row delete and a column delete.
   std::vector<Actor> actorsRemoved;
   tableView.DeleteRow(0, actorsRemoved);
   tet_printf("Row Delete >> Actors Removed: %d {", actorsRemoved.size());
-  for(size_t i = 0;i<actorsRemoved.size();i++) tet_printf("%d => %s, ", i, actorsRemoved[i].GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
+  for(size_t i = 0; i < actorsRemoved.size(); i++) tet_printf("%d => %s, ", i, actorsRemoved[i].GetProperty<std::string>(Dali::Actor::Property::NAME).c_str());
   tet_printf("}\n");
-  DALI_TEST_EQUALS( static_cast<int>(actorsRemoved.size()), 1, TEST_LOCATION );
-  DALI_TEST_CHECK( actorsRemoved[0] == actor1 );
+  DALI_TEST_EQUALS(static_cast<int>(actorsRemoved.size()), 1, TEST_LOCATION);
+  DALI_TEST_CHECK(actorsRemoved[0] == actor1);
 
   actorsRemoved.clear();
   tableView.DeleteColumn(3, actorsRemoved);
   tet_printf("Column Delete >> Actors Removed: %d {", actorsRemoved.size());
-  for(size_t i = 0;i<actorsRemoved.size();i++) tet_printf("%d => %s, ", i, actorsRemoved[i].GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
+  for(size_t i = 0; i < actorsRemoved.size(); i++) tet_printf("%d => %s, ", i, actorsRemoved[i].GetProperty<std::string>(Dali::Actor::Property::NAME).c_str());
   tet_printf("}\n");
-  DALI_TEST_EQUALS( static_cast<int>(actorsRemoved.size()), 1, TEST_LOCATION );
-  DALI_TEST_CHECK( actorsRemoved[0] == actor3 );
+  DALI_TEST_EQUALS(static_cast<int>(actorsRemoved.size()), 1, TEST_LOCATION);
+  DALI_TEST_CHECK(actorsRemoved[0] == actor3);
 
-  DALI_TEST_CHECK( tableView.GetRows() == 9 && tableView.GetColumns() == 9 );
+  DALI_TEST_CHECK(tableView.GetRows() == 9 && tableView.GetColumns() == 9);
 
-  tableView.AddChild(actor1, TableView::CellPosition(5,8));
-  tableView.Resize(100,100);
-  DALI_TEST_CHECK( tableView.GetRows() == 100 && tableView.GetColumns() == 100 );
+  tableView.AddChild(actor1, TableView::CellPosition(5, 8));
+  tableView.Resize(100, 100);
+  DALI_TEST_CHECK(tableView.GetRows() == 100 && tableView.GetColumns() == 100);
 
-  tableView.AddChild(actor2, TableView::CellPosition(69,57));
-  DALI_TEST_CHECK( tableView.FindChildPosition(actor1, cellPosition) && tableView.FindChildPosition(actor2, cellPosition) );
+  tableView.AddChild(actor2, TableView::CellPosition(69, 57));
+  DALI_TEST_CHECK(tableView.FindChildPosition(actor1, cellPosition) && tableView.FindChildPosition(actor2, cellPosition));
 
-  tableView.Resize(20,20);
-  DALI_TEST_CHECK( tableView.FindChildPosition(actor1, cellPosition) && !tableView.FindChildPosition(actor2, cellPosition) );
+  tableView.Resize(20, 20);
+  DALI_TEST_CHECK(tableView.FindChildPosition(actor1, cellPosition) && !tableView.FindChildPosition(actor2, cellPosition));
 
   actorsRemoved.clear();
-  tableView.Resize(1,1, actorsRemoved);
-  DALI_TEST_CHECK( !tableView.FindChildPosition(actor1, cellPosition) && !tableView.FindChildPosition(actor2, cellPosition) );
-  DALI_TEST_EQUALS( static_cast<int>(actorsRemoved.size()), 1, TEST_LOCATION );
-  DALI_TEST_CHECK( actorsRemoved[0] == actor1 );
+  tableView.Resize(1, 1, actorsRemoved);
+  DALI_TEST_CHECK(!tableView.FindChildPosition(actor1, cellPosition) && !tableView.FindChildPosition(actor2, cellPosition));
+  DALI_TEST_EQUALS(static_cast<int>(actorsRemoved.size()), 1, TEST_LOCATION);
+  DALI_TEST_CHECK(actorsRemoved[0] == actor1);
 
   // Add child outside table size, forcing a resize.
   tableView.AddChild(actor1, TableView::CellPosition(100, 100, 1, 1));
-  DALI_TEST_CHECK( tableView.GetRows() == 101 && tableView.GetColumns() == 101 );
+  DALI_TEST_CHECK(tableView.GetRows() == 101 && tableView.GetColumns() == 101);
 
   // Add child outside table size, forcing a resize.
   tableView.AddChild(actor1, TableView::CellPosition(110, 110, 5, 5));
-  DALI_TEST_CHECK( tableView.GetRows() == 115 && tableView.GetColumns() == 115 );
+  DALI_TEST_CHECK(tableView.GetRows() == 115 && tableView.GetColumns() == 115);
 
   // Set the alignment of the cell
-  tableView.SetCellAlignment( TableView::CellPosition(100, 100, 1, 1), HorizontalAlignment::CENTER, VerticalAlignment::CENTER );
-  tableView.SetCellAlignment( TableView::CellPosition(110, 110, 5, 5), HorizontalAlignment::LEFT, VerticalAlignment::TOP );
+  tableView.SetCellAlignment(TableView::CellPosition(100, 100, 1, 1), HorizontalAlignment::CENTER, VerticalAlignment::CENTER);
+  tableView.SetCellAlignment(TableView::CellPosition(110, 110, 5, 5), HorizontalAlignment::LEFT, VerticalAlignment::TOP);
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -471,19 +469,19 @@ int UtcDaliTableViewChildAssert(void)
   tet_infoline("UtcDaliTableViewChildAssert");
 
   // Create a 10x10 table-view
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView);
   Actor childActor;
 
   try
   {
-    tableView.AddChild( childActor, TableView::CellPosition(0,0,5,5) );
+    tableView.AddChild(childActor, TableView::CellPosition(0, 0, 5, 5));
     // should assert
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "child", TEST_LOCATION);
   }
   END_TEST;
@@ -495,56 +493,56 @@ int UtcDaliTableViewMetricsAssert(void)
   tet_infoline("UtcDaliTableViewChildAssert");
 
   // Create a 10x10 table-view
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView);
 
   // fixeds...
 
   try
   {
-    tableView.SetFixedHeight( 10, 1.0f );
+    tableView.SetFixedHeight(10, 1.0f);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION);
   }
 
   try
   {
-    tableView.GetFixedHeight( 10 );
+    tableView.GetFixedHeight(10);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION);
   }
 
   try
   {
-    tableView.SetFixedWidth( 10, 1.0f );
+    tableView.SetFixedWidth(10, 1.0f);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION);
   }
 
   try
   {
-    tableView.GetFixedWidth( 10 );
+    tableView.GetFixedWidth(10);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION);
   }
 
@@ -552,49 +550,49 @@ int UtcDaliTableViewMetricsAssert(void)
 
   try
   {
-    tableView.SetRelativeHeight( 10, 0.1f );
+    tableView.SetRelativeHeight(10, 0.1f);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION);
   }
 
   try
   {
-    tableView.GetRelativeHeight( 10 );
+    tableView.GetRelativeHeight(10);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION);
   }
 
   try
   {
-    tableView.SetRelativeWidth( 10, 0.1f );
+    tableView.SetRelativeWidth(10, 0.1f);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION);
   }
 
   try
   {
-    tableView.GetRelativeWidth( 10 );
+    tableView.GetRelativeWidth(10);
 
     tet_result(TET_FAIL);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION);
   }
   END_TEST;
@@ -606,100 +604,132 @@ int UtcDaliTableViewSetGetProperty(void)
   tet_infoline("UtcDaliTableViewSetGetProperty");
 
   // Create a 1x1 table-view
-  TableView tableView = TableView::New(1,1);
-  tableView.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  DALI_TEST_CHECK( tableView );
+  TableView tableView = TableView::New(1, 1);
+  tableView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  DALI_TEST_CHECK(tableView);
 
   // Test "rows" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_ROWS ) == TableView::Property::ROWS );
+  DALI_TEST_CHECK(tableView.GetPropertyIndex(PROPERTY_NAME_ROWS) == TableView::Property::ROWS);
 
-  tableView.SetProperty( TableView::Property::ROWS, 4 );
+  tableView.SetProperty(TableView::Property::ROWS, 7);
 
-  DALI_TEST_CHECK( tableView.GetRows() == 4u );
-  DALI_TEST_CHECK( tableView.GetProperty(TableView::Property::ROWS).Get<int>() == 4 );
+  DALI_TEST_CHECK(tableView.GetRows() == 7u);
+  DALI_TEST_CHECK(tableView.GetProperty(TableView::Property::ROWS).Get<int>() == 7);
 
   // Test "columns" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_COLUMNS ) == TableView::Property::COLUMNS );
+  DALI_TEST_CHECK(tableView.GetPropertyIndex(PROPERTY_NAME_COLUMNS) == TableView::Property::COLUMNS);
 
-  tableView.SetProperty( TableView::Property::COLUMNS, 5 );
+  tableView.SetProperty(TableView::Property::COLUMNS, 8);
 
-  DALI_TEST_CHECK( tableView.GetColumns() == 5u );
-  DALI_TEST_CHECK( tableView.GetProperty(TableView::Property::COLUMNS).Get<int>() == 5 );
+  DALI_TEST_CHECK(tableView.GetColumns() == 8u);
+  DALI_TEST_CHECK(tableView.GetProperty(TableView::Property::COLUMNS).Get<int>() == 8);
 
   // Test "cellPadding" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_CELL_PADDING ) == TableView::Property::CELL_PADDING );
+  DALI_TEST_CHECK(tableView.GetPropertyIndex(PROPERTY_NAME_CELL_PADDING) == TableView::Property::CELL_PADDING);
 
-  tableView.SetProperty( TableView::Property::CELL_PADDING, Size( 6.f, 8.f ) );
+  tableView.SetProperty(TableView::Property::CELL_PADDING, Size(6.f, 8.f));
 
-  DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(6.f, 8.f), TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetProperty(TableView::Property::CELL_PADDING).Get<Vector2>(), Vector2(6.f,8.f), TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.GetCellPadding(), Size(6.f, 8.f), TEST_LOCATION);
+  DALI_TEST_EQUALS(tableView.GetProperty(TableView::Property::CELL_PADDING).Get<Vector2>(), Vector2(6.f, 8.f), TEST_LOCATION);
 
   //{ "policy": "fixed", "value": 30.0 },
   Property::Map item1;
-  item1[ "policy" ] = "fixed";
-  item1[ "value" ] = 30.f;
+  item1["policy"] = "fixed";
+  item1["value"]  = 30.f;
   //{ "policy": "relative", "value": 0.2 },
   Property::Map item2;
-  item2[ "policy" ] = "relative";
-  item2[ "value" ] = 0.2f;
+  item2["policy"] = "relative";
+  item2["value"]  = 0.2f;
+  //{ "policy": "fill"},
+  Property::Map item3;
+  item3["policy"] = "fill";
+  //{ "policy": "fit"},
+  Property::Map item4;
+  item4["policy"] = "fit";
 
   // Test "layoutRows" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ROWS) == TableView::Property::LAYOUT_ROWS );
+  DALI_TEST_CHECK(tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ROWS) == TableView::Property::LAYOUT_ROWS);
 
   /*
    * "layoutRows":
    *  {
    *    "1": { "policy": "fixed", "value": 30 },
-   *    "3": { "policy": "relative", "value": 0.2 }
+   *    "3": { "policy": "relative", "value": 0.2 },
+   *    "4": { "policy": "fill" },
+   *    "6": { "policy": "fit" },
    *   }
    */
   Property::Map layoutRows;
-  layoutRows[ "1" ] = item1;
-  layoutRows[ "3" ] = item2;
-  tableView.SetProperty( TableView::Property::LAYOUT_ROWS, layoutRows );
+  layoutRows["1"] = item1;
+  layoutRows["3"] = item2;
+  layoutRows["4"] = item3;
+  layoutRows["6"] = item4;
+  tableView.SetProperty(TableView::Property::LAYOUT_ROWS, layoutRows);
 
-  DALI_TEST_EQUALS( tableView.GetFixedHeight( 1u ), 30.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetRelativeHeight( 3u ), 0.2f, TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.GetFixedHeight(1u), 30.f, TEST_LOCATION);
+  DALI_TEST_EQUALS(tableView.GetRelativeHeight(3u), 0.2f, TEST_LOCATION);
 
   Property::Map layoutRowsGet = tableView.GetProperty(TableView::Property::LAYOUT_ROWS).Get<Property::Map>();
 
-  DALI_TEST_EQUALS( layoutRowsGet.GetKey(1).compare(layoutRows.GetKey(0)), 0, TEST_LOCATION );
-  Property::Map* childMap =layoutRowsGet.GetValue(1).GetMap();
-  DALI_TEST_CHECK( childMap->Find( "policy" )->Get<std::string>().compare("fixed") == 0 );
-  DALI_TEST_EQUALS( childMap->Find( "value" )->Get<float>(), 30.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(layoutRowsGet.GetKey(1).compare(layoutRows.GetKey(0)), 0, TEST_LOCATION);
+  Property::Map* childMap = layoutRowsGet.GetValue(1).GetMap();
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("fixed") == 0);
+  DALI_TEST_EQUALS(childMap->Find("value")->Get<float>(), 30.f, TEST_LOCATION);
+
+  childMap = layoutRowsGet.GetValue(3).GetMap();
+  DALI_TEST_CHECK(layoutRowsGet.GetKey(3).compare(layoutRows.GetKey(1)) == 0);
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("relative") == 0);
+  DALI_TEST_EQUALS(childMap->Find("value")->Get<float>(), 0.2f, TEST_LOCATION);
+
+  childMap = layoutRowsGet.GetValue(4).GetMap();
+  DALI_TEST_CHECK(layoutRowsGet.GetKey(4).compare(layoutRows.GetKey(2)) == 0);
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("fill") == 0);
 
-  childMap =layoutRowsGet.GetValue(3).GetMap();
-  DALI_TEST_CHECK( layoutRowsGet.GetKey(3).compare(layoutRows.GetKey(1)) == 0 );
-  DALI_TEST_CHECK( childMap->Find( "policy" )->Get<std::string>().compare("relative") == 0 );
-  DALI_TEST_EQUALS( childMap->Find( "value" )->Get<float>(), 0.2f, TEST_LOCATION );
+  childMap = layoutRowsGet.GetValue(6).GetMap();
+  DALI_TEST_CHECK(layoutRowsGet.GetKey(6).compare(layoutRows.GetKey(3)) == 0);
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("fit") == 0);
 
   // Test "layoutColumns" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_LAYOUT_COLUMNS ) == TableView::Property::LAYOUT_COLUMNS );
+  DALI_TEST_CHECK(tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_COLUMNS) == TableView::Property::LAYOUT_COLUMNS);
 
   /*
    * "layoutColumns":
    *  {
    *    "2": { "policy": "relative", "value": 0.2 },
-   *    "3": { "policy": "fixed", "value": 30 }
+   *    "3": { "policy": "fixed", "value": 30 },
+   *    "5": { "policy": "fit" },
+   *    "7": { "policy": "fill" }
    *   }
    */
   Property::Map layoutColumns;
-  layoutColumns[ "2" ] = item2;
-  layoutColumns[ "3" ] = item1;
-  tableView.SetProperty( TableView::Property::LAYOUT_COLUMNS, layoutColumns );
+  layoutColumns["2"] = item2;
+  layoutColumns["3"] = item1;
+  layoutColumns["5"] = item4;
+  layoutColumns["7"] = item3;
+  tableView.SetProperty(TableView::Property::LAYOUT_COLUMNS, layoutColumns);
 
-  DALI_TEST_EQUALS( tableView.GetRelativeWidth( 2u ), 0.2f, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetFixedWidth( 3u ), 30.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(tableView.GetRelativeWidth(2u), 0.2f, TEST_LOCATION);
+  DALI_TEST_EQUALS(tableView.GetFixedWidth(3u), 30.f, TEST_LOCATION);
 
   Property::Map layoutColumnsGet = tableView.GetProperty(TableView::Property::LAYOUT_COLUMNS).Get<Property::Map>();
-  DALI_TEST_CHECK( layoutColumnsGet.GetKey(2).compare(layoutColumns.GetKey(0)) == 0 );
-  childMap =layoutColumnsGet.GetValue(2).GetMap();
-  DALI_TEST_CHECK( childMap->Find( "policy" )->Get<std::string>().compare("relative") == 0 );
-  DALI_TEST_EQUALS( childMap->Find( "value" )->Get<float>(), 0.2f, TEST_LOCATION );
-  childMap =layoutColumnsGet.GetValue(3).GetMap();
-  DALI_TEST_CHECK( layoutColumnsGet.GetKey(3).compare(layoutColumns.GetKey(1)) == 0 );
-  DALI_TEST_CHECK( childMap->Find( "policy" )->Get<std::string>().compare("fixed") == 0 );
-  DALI_TEST_EQUALS( childMap->Find( "value" )->Get<float>(),30.f, TEST_LOCATION );
+
+  DALI_TEST_CHECK(layoutColumnsGet.GetKey(2).compare(layoutColumns.GetKey(0)) == 0);
+  childMap = layoutColumnsGet.GetValue(2).GetMap();
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("relative") == 0);
+  DALI_TEST_EQUALS(childMap->Find("value")->Get<float>(), 0.2f, TEST_LOCATION);
+
+  childMap = layoutColumnsGet.GetValue(3).GetMap();
+  DALI_TEST_CHECK(layoutColumnsGet.GetKey(3).compare(layoutColumns.GetKey(1)) == 0);
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("fixed") == 0);
+  DALI_TEST_EQUALS(childMap->Find("value")->Get<float>(), 30.f, TEST_LOCATION);
+
+  childMap = layoutColumnsGet.GetValue(5).GetMap();
+  DALI_TEST_CHECK(layoutColumnsGet.GetKey(5).compare(layoutColumns.GetKey(2)) == 0);
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("fit") == 0);
+
+  childMap = layoutColumnsGet.GetValue(7).GetMap();
+  DALI_TEST_CHECK(layoutColumnsGet.GetKey(7).compare(layoutColumns.GetKey(3)) == 0);
+  DALI_TEST_CHECK(childMap->Find("policy")->Get<std::string>().compare("fill") == 0);
 
   END_TEST;
 }
@@ -710,51 +740,51 @@ int UtcDaliTableViewChildProperties(void)
   tet_infoline("UtcDaliTableViewChildProperties");
 
   // Create a 10x10 table-view
-  TableView tableView = TableView::New(10,10);
-  application.GetScene().Add( tableView );
-  tableView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
+  TableView tableView = TableView::New(10, 10);
+  application.GetScene().Add(tableView);
+  tableView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
 
-  DALI_TEST_CHECK( tableView );
+  DALI_TEST_CHECK(tableView);
 
   // Create a child actor with the custom properties
   Actor child1 = Actor::New();
-  child1.SetProperty( TableView::ChildProperty::CELL_INDEX, Vector2( 3, 4 ) );
-  tableView.Add( child1 );
+  child1.SetProperty(TableView::ChildProperty::CELL_INDEX, Vector2(3, 4));
+  tableView.Add(child1);
   // Check for actors at actual positions.
-  DALI_TEST_CHECK( tableView.GetChildAt(TableView::CellPosition(3,4)) == child1);
+  DALI_TEST_CHECK(tableView.GetChildAt(TableView::CellPosition(3, 4)) == child1);
 
   // Create a second child actor with the custom properties
-  Actor child2 = Actor::New();
-  float rowSpan = 3.f;
+  Actor child2     = Actor::New();
+  float rowSpan    = 3.f;
   float columnSpan = 2.f;
-  child2.SetProperty( TableView::ChildProperty::CELL_INDEX, Vector2( 6, 1 ) );
-  child2.SetProperty( TableView::ChildProperty::ROW_SPAN, rowSpan );
-  child2.SetProperty( TableView::ChildProperty::COLUMN_SPAN, columnSpan );
-  tableView.Add( child2 );
+  child2.SetProperty(TableView::ChildProperty::CELL_INDEX, Vector2(6, 1));
+  child2.SetProperty(TableView::ChildProperty::ROW_SPAN, rowSpan);
+  child2.SetProperty(TableView::ChildProperty::COLUMN_SPAN, columnSpan);
+  tableView.Add(child2);
   // Check for actors at actual positions.
-  for( int i=0; i<rowSpan; i++ )
+  for(int i = 0; i < rowSpan; i++)
   {
-    for(int j=0; j<columnSpan; j++)
+    for(int j = 0; j < columnSpan; j++)
     {
-      DALI_TEST_CHECK( tableView.GetChildAt(TableView::CellPosition(6+i,1+j)) == child2);
+      DALI_TEST_CHECK(tableView.GetChildAt(TableView::CellPosition(6 + i, 1 + j)) == child2);
     }
   }
 
   // Create a third child actor with the cell alignment properties
   Actor child3 = Actor::New();
-  child3.SetProperty( Actor::Property::SIZE, Vector2( 5.f, 5.f ) );
-  child3.SetProperty( TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT, "center" );
-  child3.SetProperty( TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT,   "bottom" );
-  tableView.Add( child3 );
+  child3.SetProperty(Actor::Property::SIZE, Vector2(5.f, 5.f));
+  child3.SetProperty(TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT, "center");
+  child3.SetProperty(TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT, "bottom");
+  tableView.Add(child3);
 
   // store the actor in the first available cell
-  DALI_TEST_CHECK( tableView.GetChildAt(TableView::CellPosition(0,0)) == child3)
+  DALI_TEST_CHECK(tableView.GetChildAt(TableView::CellPosition(0, 0)) == child3)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( child3.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ), AnchorPoint::TOP_LEFT, TEST_LOCATION );
-  DALI_TEST_EQUALS( child3.GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ), ParentOrigin::TOP_LEFT, TEST_LOCATION );
-  DALI_TEST_EQUALS( child3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(2.5f, 5.0f, 0.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(child3.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT), AnchorPoint::TOP_LEFT, TEST_LOCATION);
+  DALI_TEST_EQUALS(child3.GetCurrentProperty<Vector3>(Actor::Property::PARENT_ORIGIN), ParentOrigin::TOP_LEFT, TEST_LOCATION);
+  DALI_TEST_EQUALS(child3.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(2.5f, 5.0f, 0.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -763,10 +793,10 @@ int UtcDaliTableViewGetChildAtN(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(10,10);
+  TableView tableView = TableView::New(10, 10);
 
-  Actor actor = tableView.GetChildAt( TableView::CellPosition( 200, 200 ) );
-  DALI_TEST_CHECK( !actor );
+  Actor actor = tableView.GetChildAt(TableView::CellPosition(200, 200));
+  DALI_TEST_CHECK(!actor);
 
   END_TEST;
 }
@@ -775,9 +805,9 @@ int UtcDaliTableViewAddChildN(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView.AddChild( Actor::New(), TableView::CellPosition( 0, 0 ) ) );
-  DALI_TEST_CHECK( ! tableView.AddChild( Actor::New(), TableView::CellPosition( 0, 0 ) ) );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView.AddChild(Actor::New(), TableView::CellPosition(0, 0)));
+  DALI_TEST_CHECK(!tableView.AddChild(Actor::New(), TableView::CellPosition(0, 0)));
 
   END_TEST;
 }
@@ -786,11 +816,11 @@ int UtcDaliTableViewInsertRowAtZero(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView.AddChild( Actor::New(), TableView::CellPosition( 0, 0 , 10, 10 ) ) );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView.AddChild(Actor::New(), TableView::CellPosition(0, 0, 10, 10)));
   tableView.InsertRow(0);
 
-  DALI_TEST_CHECK( tableView.GetRows() == 11 );
+  DALI_TEST_CHECK(tableView.GetRows() == 11);
 
   END_TEST;
 }
@@ -799,11 +829,11 @@ int UtcDaliTableViewDeleteRowAtZero(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView.AddChild( Actor::New(), TableView::CellPosition( 0, 0 , 10, 10 ) ) );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView.AddChild(Actor::New(), TableView::CellPosition(0, 0, 10, 10)));
   tableView.DeleteRow(0);
 
-  DALI_TEST_CHECK( tableView.GetRows() == 9 );
+  DALI_TEST_CHECK(tableView.GetRows() == 9);
 
   END_TEST;
 }
@@ -812,11 +842,11 @@ int UtcDaliTableViewInsertColumnAtZero(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView.AddChild( Actor::New(), TableView::CellPosition( 0, 0 , 10, 10 ) ) );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView.AddChild(Actor::New(), TableView::CellPosition(0, 0, 10, 10)));
   tableView.InsertColumn(0);
 
-  DALI_TEST_CHECK( tableView.GetColumns() == 11 );
+  DALI_TEST_CHECK(tableView.GetColumns() == 11);
 
   END_TEST;
 }
@@ -825,11 +855,11 @@ int UtcDaliTableViewDeleteColumnAtZero(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK( tableView.AddChild( Actor::New(), TableView::CellPosition( 0, 0 , 10, 10 ) ) );
+  TableView tableView = TableView::New(10, 10);
+  DALI_TEST_CHECK(tableView.AddChild(Actor::New(), TableView::CellPosition(0, 0, 10, 10)));
   tableView.DeleteColumn(0);
 
-  DALI_TEST_CHECK( tableView.GetColumns() == 9 );
+  DALI_TEST_CHECK(tableView.GetColumns() == 9);
 
   END_TEST;
 }
@@ -839,16 +869,16 @@ int UtcDaliTableViewTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "TableView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("TableView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  TableView view = TableView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  TableView view = TableView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -857,79 +887,79 @@ int UtcDaliTableViewKeyboardFocus(void)
 {
   ToolkitTestApplication application;
 
-  TableView tableView = TableView::New(4,4);
-  tableView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-  tableView.SetProperty( Dali::Actor::Property::NAME, "TableView");
+  TableView tableView = TableView::New(4, 4);
+  tableView.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  tableView.SetProperty(Dali::Actor::Property::NAME, "TableView");
 
-  for ( int row = 0; row < 4; ++row )
+  for(int row = 0; row < 4; ++row)
   {
-    for ( int col = 0; col < 4; ++col )
+    for(int col = 0; col < 4; ++col)
     {
-      Control control = Control::New();
+      Control            control = Control::New();
       std::ostringstream str;
       str << row << "-" << col;
-      control.SetProperty( Dali::Actor::Property::NAME, str.str() );
-      control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-      tableView.AddChild( control, TableView::CellPosition( row, col ) );
+      control.SetProperty(Dali::Actor::Property::NAME, str.str());
+      control.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+      tableView.AddChild(control, TableView::CellPosition(row, col));
     }
   }
 
-  application.GetScene().Add( tableView );
+  application.GetScene().Add(tableView);
 
   application.SendNotification();
   application.Render();
 
-  Actor firstFocusActor = Toolkit::Internal::GetImplementation( tableView ).GetNextKeyboardFocusableActor( Actor(), Control::KeyboardFocus::RIGHT, true );
-  DALI_TEST_CHECK( firstFocusActor );
-  DALI_TEST_CHECK( firstFocusActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" );
+  Actor firstFocusActor = Toolkit::Internal::GetImplementation(tableView).GetNextKeyboardFocusableActor(Actor(), Control::KeyboardFocus::RIGHT, true);
+  DALI_TEST_CHECK(firstFocusActor);
+  DALI_TEST_CHECK(firstFocusActor.GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-0");
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  manager.SetFocusGroupLoop( true );
-  manager.SetCurrentFocusActor( firstFocusActor );
-
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-3" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-0" );
-
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-3" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "3-3" );
-
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
-
-  manager.MoveFocus( Control::KeyboardFocus::DOWN );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1" );
-  manager.MoveFocus( Control::KeyboardFocus::DOWN );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" );
-  manager.MoveFocus( Control::KeyboardFocus::DOWN );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "3-1" );
-  manager.MoveFocus( Control::KeyboardFocus::DOWN );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
-
-  manager.MoveFocus( Control::KeyboardFocus::UP );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "3-1" );
-  manager.MoveFocus( Control::KeyboardFocus::UP );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" );
-  manager.MoveFocus( Control::KeyboardFocus::UP );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1" );
-  manager.MoveFocus( Control::KeyboardFocus::UP );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
+  manager.SetFocusGroupLoop(true);
+  manager.SetCurrentFocusActor(firstFocusActor);
+
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-0");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-2");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-3");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-0");
+
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-3");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-2");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-0");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "3-3");
+
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-0");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
+
+  manager.MoveFocus(Control::KeyboardFocus::DOWN);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1");
+  manager.MoveFocus(Control::KeyboardFocus::DOWN);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-1");
+  manager.MoveFocus(Control::KeyboardFocus::DOWN);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "3-1");
+  manager.MoveFocus(Control::KeyboardFocus::DOWN);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
+
+  manager.MoveFocus(Control::KeyboardFocus::UP);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "3-1");
+  manager.MoveFocus(Control::KeyboardFocus::UP);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-1");
+  manager.MoveFocus(Control::KeyboardFocus::UP);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1");
+  manager.MoveFocus(Control::KeyboardFocus::UP);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
 
   END_TEST;
 }
@@ -939,121 +969,121 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void)
   ToolkitTestApplication application;
 
   TableView tableView = TableView::New(3, 3);
-  tableView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-  tableView.SetProperty( Dali::Actor::Property::NAME, "TableView");
+  tableView.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  tableView.SetProperty(Dali::Actor::Property::NAME, "TableView");
 
-  for ( int row = 0; row < 3; ++row )
+  for(int row = 0; row < 3; ++row)
   {
-    for ( int col = 0; col < 3; ++col )
+    for(int col = 0; col < 3; ++col)
     {
       std::ostringstream str;
       str << row << "-" << col;
 
-      if (row == 1 && col ==1)
+      if(row == 1 && col == 1)
       {
         // Add a nested 2x2 table view in the middle cell of the parent table view
         TableView childTableView = TableView::New(2, 2);
-        childTableView.SetProperty( Dali::Actor::Property::NAME, str.str() );
+        childTableView.SetProperty(Dali::Actor::Property::NAME, str.str());
 
         for(int childRow = 0; childRow < 2; childRow++)
         {
           for(int childCol = 0; childCol < 2; childCol++)
           {
-            Control control = Control::New();
+            Control            control = Control::New();
             std::ostringstream nameStr;
             nameStr << row << "-" << col << "-" << childRow << "-" << childCol;
-            control.SetProperty( Dali::Actor::Property::NAME, nameStr.str() );
-            control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-            childTableView.AddChild( control, TableView::CellPosition( childRow, childCol ) );
+            control.SetProperty(Dali::Actor::Property::NAME, nameStr.str());
+            control.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+            childTableView.AddChild(control, TableView::CellPosition(childRow, childCol));
           }
         }
-        tableView.AddChild( childTableView, TableView::CellPosition( row, col ) );
+        tableView.AddChild(childTableView, TableView::CellPosition(row, col));
       }
       else
       {
         Control control = Control::New();
-        control.SetProperty( Dali::Actor::Property::NAME, str.str() );
-        control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
-        tableView.AddChild( control, TableView::CellPosition( row, col ) );
+        control.SetProperty(Dali::Actor::Property::NAME, str.str());
+        control.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+        tableView.AddChild(control, TableView::CellPosition(row, col));
       }
     }
   }
 
-  application.GetScene().Add( tableView );
+  application.GetScene().Add(tableView);
 
   application.SendNotification();
   application.Render();
 
-  Actor firstFocusActor = Toolkit::Internal::GetImplementation( tableView ).GetNextKeyboardFocusableActor( Actor(), Control::KeyboardFocus::RIGHT, true );
-  DALI_TEST_CHECK( firstFocusActor );
-  DALI_TEST_CHECK( firstFocusActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" );
+  Actor firstFocusActor = Toolkit::Internal::GetImplementation(tableView).GetNextKeyboardFocusableActor(Actor(), Control::KeyboardFocus::RIGHT, true);
+  DALI_TEST_CHECK(firstFocusActor);
+  DALI_TEST_CHECK(firstFocusActor.GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-0");
 
   KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  manager.SetFocusGroupLoop( false );
-  manager.SetCurrentFocusActor( firstFocusActor );
-
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-0" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-0" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-0" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-1" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-2" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-0" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" );
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-2" );
-
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-0" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-2" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-1" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-0" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-0" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-0" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::LEFT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" );
-
-  manager.MoveFocus( Control::KeyboardFocus::RIGHT );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::DOWN );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-0" );
-  manager.MoveFocus( Control::KeyboardFocus::DOWN );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-0" );
-  manager.MoveFocus( Control::KeyboardFocus::DOWN );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" );
-
-  manager.MoveFocus( Control::KeyboardFocus::UP );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-1" );
-  manager.MoveFocus( Control::KeyboardFocus::UP );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-1" );
-  manager.MoveFocus( Control::KeyboardFocus::UP );
-  DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" );
+  manager.SetFocusGroupLoop(false);
+  manager.SetCurrentFocusActor(firstFocusActor);
+
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-0");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-2");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-0");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-0-0");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-0-1");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-1-0");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-1-1");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-2");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-0");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-1");
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-2");
+
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-1");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-0");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-2");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-1-1");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-1-0");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-0-1");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-0-0");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-0");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-2");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
+  manager.MoveFocus(Control::KeyboardFocus::LEFT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-0");
+
+  manager.MoveFocus(Control::KeyboardFocus::RIGHT);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
+  manager.MoveFocus(Control::KeyboardFocus::DOWN);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-0-0");
+  manager.MoveFocus(Control::KeyboardFocus::DOWN);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-1-0");
+  manager.MoveFocus(Control::KeyboardFocus::DOWN);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "2-1");
+
+  manager.MoveFocus(Control::KeyboardFocus::UP);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-1-1");
+  manager.MoveFocus(Control::KeyboardFocus::UP);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "1-1-0-1");
+  manager.MoveFocus(Control::KeyboardFocus::UP);
+  DALI_TEST_CHECK(manager.GetCurrentFocusActor().GetProperty<std::string>(Dali::Actor::Property::NAME) == "0-1");
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-BackgroundColorSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-BackgroundColorSpan.cpp
new file mode 100644
index 0000000..266f8dc
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-BackgroundColorSpan.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/background-color-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextBackgroundColorSpanNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextBackgroundColorSpanNew");
+
+  auto greenSpan = Text::BackgroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(greenSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetBackgroundColor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextGetBackgroundColor");
+
+  auto greenSpan = Text::BackgroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(greenSpan);
+  DALI_TEST_EQUALS(Color::GREEN, greenSpan.GetBackgroundColor(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsBackgroundColorDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextIsBackgroundColorDefined");
+
+  auto greenSpan = Text::BackgroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(greenSpan);
+  DALI_TEST_EQUALS(true, greenSpan.IsBackgroundColorDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextBackgroundColorSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextBackgroundColorSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::BackgroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(baseSpan);
+
+  Text::BackgroundColorSpan greenSpan = Text::BackgroundColorSpan::DownCast(baseSpan);
+  DALI_TEST_CHECK(greenSpan);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-BaseSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-BaseSpan.cpp
new file mode 100644
index 0000000..f157546
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-BaseSpan.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/background-color-span.h>
+#include <dali-toolkit/devel-api/text/spans/bold-span.h>
+#include <dali-toolkit/devel-api/text/spans/character-spacing-span.h>
+#include <dali-toolkit/devel-api/text/spans/font-span.h>
+#include <dali-toolkit/devel-api/text/spans/foreground-color-span.h>
+#include <dali-toolkit/devel-api/text/spans/italic-span.h>
+#include <dali-toolkit/devel-api/text/spans/strikethrough-span.h>
+#include <dali-toolkit/devel-api/text/spans/underline-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextBaseSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextBaseSpanDownCast");
+
+  BaseHandle baseHandel = Text::ForegroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(baseHandel);
+
+  Text::BaseSpan baseSpan = Text::BaseSpan::DownCast(baseHandel);
+  DALI_TEST_CHECK(baseSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextBaseSpanGetSpanType(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextBaseSpanGetSpanType");
+
+  Text::BaseSpan foregroundColorSpan = Text::ForegroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(foregroundColorSpan);
+  DALI_TEST_EQUALS(foregroundColorSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::FOREGROUND_COLOR, TEST_LOCATION);
+
+  Text::BaseSpan backgroundColorSpan = Text::BackgroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(backgroundColorSpan);
+  DALI_TEST_EQUALS(backgroundColorSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::BACKGROUND_COLOR, TEST_LOCATION);
+
+  Text::BaseSpan fontSpan = Text::FontSpan::New("TizenSans",
+                                                45.0f,
+                                                Dali::TextAbstraction::FontWeight::BOLD,
+                                                Dali::TextAbstraction::FontWidth::SEMI_CONDENSED,
+                                                Dali::TextAbstraction::FontSlant::OBLIQUE);
+  DALI_TEST_CHECK(fontSpan);
+  DALI_TEST_EQUALS(fontSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::FONT, TEST_LOCATION);
+
+  Text::BaseSpan boldSpan = Dali::Toolkit::Text::BoldSpan::New();
+  DALI_TEST_CHECK(boldSpan);
+  DALI_TEST_EQUALS(boldSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::BOLD, TEST_LOCATION);
+
+  Text::BaseSpan italicSpan = Text::ItalicSpan::New();
+  DALI_TEST_CHECK(italicSpan);
+  DALI_TEST_EQUALS(italicSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::ITALIC, TEST_LOCATION);
+
+  Text::BaseSpan underlineSpan = Text::UnderlineSpan::NewDashed(Color::GREEN, 5.0f, 2.0f, 3.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(underlineSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::UNDERLINE, TEST_LOCATION);
+
+  Text::BaseSpan strikethroughSpan = Text::StrikethroughSpan::New(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(strikethroughSpan);
+  DALI_TEST_EQUALS(strikethroughSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::STRIKETHROUGH, TEST_LOCATION);
+
+  Text::BaseSpan characterSpacingSpan = Text::CharacterSpacingSpan::New(5.2f);
+  DALI_TEST_CHECK(characterSpacingSpan);
+  DALI_TEST_EQUALS(characterSpacingSpan.GetSpanType(), Dali::Toolkit::Text::SpanType::Value::CHARACTER_SPACING, TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-BoldSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-BoldSpan.cpp
new file mode 100644
index 0000000..c82643f
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-BoldSpan.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/bold-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextBoldSpanNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextBoldSpanNew");
+
+  auto boldSpan = Text::BoldSpan::New();
+
+  DALI_TEST_CHECK(boldSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextBoldSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextBoldSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::BoldSpan::New();
+  DALI_TEST_CHECK(baseSpan);
+
+  Text::BoldSpan boldSpan = Text::BoldSpan::DownCast(baseSpan);
+  DALI_TEST_CHECK(boldSpan);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-CharacterSpacingSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-CharacterSpacingSpan.cpp
new file mode 100644
index 0000000..2b34c3b
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-CharacterSpacingSpan.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/character-spacing-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitCharacterSpacingSpanNew(void)
+{
+    ToolkitTestApplication application;
+    tet_infoline("UtcDaliToolkitCharacterSpacingSpanNew");
+
+    auto charSpacingSpan = Text::CharacterSpacingSpan::New(5.6f);
+    DALI_TEST_CHECK(charSpacingSpan);
+
+    END_TEST;
+}
+
+int UtcDaliToolkitGetCharacterSpacingSpan(void)
+{
+    ToolkitTestApplication application;
+    tet_infoline("UtcDaliToolkitCharacterSpacingSpanNew");
+
+    auto charSpacingSpan = Text::CharacterSpacingSpan::New(9.1f);
+    DALI_TEST_CHECK(charSpacingSpan);
+    DALI_TEST_EQUALS(9.1f, charSpacingSpan.GetCharacterSpacing(), TEST_LOCATION);
+
+    END_TEST;
+}
+
+int UtcDaliToolkitCharacterSpacingSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitCharacterSpacingSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::CharacterSpacingSpan::New(3.6f);
+  DALI_TEST_CHECK(baseSpan);
+
+  Text::CharacterSpacingSpan charSpacingSpan = Text::CharacterSpacingSpan::DownCast(baseSpan);
+  DALI_TEST_CHECK(charSpacingSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitIsCharacterSpacingDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitIsCharacterSpacingDefined");
+
+  auto charSpacingSpan = Text::CharacterSpacingSpan::New(4.2f);
+  DALI_TEST_CHECK(charSpacingSpan);
+  DALI_TEST_EQUALS(true, charSpacingSpan.IsCharacterSpacingDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-FontSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-FontSpan.cpp
new file mode 100644
index 0000000..59312a0
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-FontSpan.cpp
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/font-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextFontSpanNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFontSpanNew");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetFamilyName(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetFamilyName");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS("DejaVu Sans", fontSpan.GetFamilyName(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsFamilyNameDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsFamilyNameDefined");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(true, fontSpan.IsFamilyNameDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetWeight(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetWeight");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(Dali::TextAbstraction::FontWeight::BOLD, fontSpan.GetWeight(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsWeightDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsWeightDefined");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(true, fontSpan.IsWeightDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetWidth(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetWidth");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(Dali::TextAbstraction::FontWidth::CONDENSED, fontSpan.GetWidth(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsWidthDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsWidthDefined");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(true, fontSpan.IsWidthDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetSlant(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetSlant");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(Dali::TextAbstraction::FontSlant::ITALIC, fontSpan.GetSlant(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsSlantDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsSlantDefined");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(true, fontSpan.IsSlantDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetSize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetSize");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(45.0f, fontSpan.GetSize(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsSizeDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsSizeDefined");
+
+  auto fontSpan = Text::FontSpan::New("DejaVu Sans",
+                                      45.0f,
+                                      Dali::TextAbstraction::FontWeight::BOLD,
+                                      Dali::TextAbstraction::FontWidth::CONDENSED,
+                                      Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(fontSpan);
+
+  DALI_TEST_EQUALS(true, fontSpan.IsSizeDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextFontSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFontSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::FontSpan::New("DejaVu Sans",
+                                                45.0f,
+                                                Dali::TextAbstraction::FontWeight::BOLD,
+                                                Dali::TextAbstraction::FontWidth::CONDENSED,
+                                                Dali::TextAbstraction::FontSlant::ITALIC);
+  DALI_TEST_CHECK(baseSpan);
+
+  Text::FontSpan greenSpan = Text::FontSpan::DownCast(baseSpan);
+  DALI_TEST_CHECK(greenSpan);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-ForegroundColorSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-ForegroundColorSpan.cpp
new file mode 100644
index 0000000..653684a
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-ForegroundColorSpan.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/foreground-color-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextForegroundColorSpanNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextForegroundColorSpanNew");
+
+  auto greenSpan = Text::ForegroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(greenSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetForegroundColor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetForegroundColor");
+
+  auto greenSpan = Text::ForegroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(greenSpan);
+  DALI_TEST_EQUALS(Color::GREEN, greenSpan.GetForegroundColor(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsForegroundColorDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsForegroundColorDefined");
+
+  auto greenSpan = Text::ForegroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(greenSpan);
+  DALI_TEST_EQUALS(true, greenSpan.IsForegroundColorDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextForegroundColorSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextForegroundColorSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::ForegroundColorSpan::New(Color::GREEN);
+  DALI_TEST_CHECK(baseSpan);
+
+  Text::ForegroundColorSpan greenSpan = Text::ForegroundColorSpan::DownCast(baseSpan);
+  DALI_TEST_CHECK(greenSpan);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-ItalicSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-ItalicSpan.cpp
new file mode 100644
index 0000000..91511f1
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-ItalicSpan.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/italic-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextItalicSpanNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextItalicSpanNew");
+
+  auto italicSpan = Text::ItalicSpan::New();
+  DALI_TEST_CHECK(italicSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextItalicSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliToolkitTextItalicSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::ItalicSpan::New();
+
+  DALI_TEST_CHECK(baseSpan);
+  Text::ItalicSpan italicSpan = Text::ItalicSpan::DownCast(baseSpan);
+
+  DALI_TEST_CHECK(italicSpan);
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-Range.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-Range.cpp
new file mode 100644
index 0000000..dabfca8
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-Range.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/range.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextRangeNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextRangeNew");
+
+  auto range15to20 = Dali::Toolkit::Text::Range::New(15u, 20u);
+  DALI_TEST_CHECK(range15to20);
+
+  auto range25to20 = Dali::Toolkit::Text::Range::New(25u, 20u);
+  DALI_TEST_CHECK(range25to20);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextRangeGetStartIndex(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextRangeGetStartIndex");
+
+  auto range15to20 = Dali::Toolkit::Text::Range::New(15u, 20u);
+  DALI_TEST_CHECK(range15to20);
+  DALI_TEST_EQUALS(15u, range15to20.GetStartIndex(), TEST_LOCATION);
+
+  auto range25to20 = Dali::Toolkit::Text::Range::New(25u, 20u);
+  DALI_TEST_CHECK(range25to20);
+  DALI_TEST_EQUALS(20u, range25to20.GetStartIndex(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextRangeGetEndIndex(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextRangeGetEndIndex");
+
+  auto range15to20 = Dali::Toolkit::Text::Range::New(15u, 20u);
+  DALI_TEST_CHECK(range15to20);
+  DALI_TEST_EQUALS(20u, range15to20.GetEndIndex(), TEST_LOCATION);
+
+  auto range25to20 = Dali::Toolkit::Text::Range::New(25u, 20u);
+  DALI_TEST_CHECK(range25to20);
+  DALI_TEST_EQUALS(25u, range25to20.GetEndIndex(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextRangeGetNumberOfIndices(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextRangeGetNumberOfIndices");
+
+  auto range15to20 = Dali::Toolkit::Text::Range::New(15u, 20u);
+  DALI_TEST_CHECK(range15to20);
+  DALI_TEST_EQUALS(6u, range15to20.GetNumberOfIndices(), TEST_LOCATION);
+
+  auto range25to20 = Dali::Toolkit::Text::Range::New(25u, 20u);
+  DALI_TEST_CHECK(range25to20);
+  DALI_TEST_EQUALS(6u, range25to20.GetNumberOfIndices(), TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-SpannableString.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-SpannableString.cpp
new file mode 100644
index 0000000..1b0d19f
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-SpannableString.cpp
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spannable-string.h>
+#include <dali-toolkit/devel-api/text/spans/foreground-color-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextSpannableStringNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringNew");
+
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+
+  DALI_TEST_CHECK(spannableString);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSpannableStringGetCharacters(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringGetCharacters");
+
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannableString);
+
+  Vector<uint32_t> expectedChars;
+  expectedChars.PushBack('H');
+  expectedChars.PushBack('e');
+  expectedChars.PushBack('l');
+  expectedChars.PushBack('l');
+  expectedChars.PushBack('o');
+  expectedChars.PushBack(' ');
+  expectedChars.PushBack(0x0645); //'م'
+  expectedChars.PushBack(0x0631); //'ر'
+  expectedChars.PushBack(0x062D); //'Ø­'
+  expectedChars.PushBack(0x0628); //'ب'
+  expectedChars.PushBack(0x0627); //'ا'
+
+  auto chars = spannableString.GetCharacters();
+  DALI_TEST_EQUALS(expectedChars.Size(), chars.Size(), TEST_LOCATION);
+
+  for(uint32_t i = 0; i < expectedChars.Size(); i++)
+  {
+    DALI_TEST_EQUALS(expectedChars[i], chars[i], TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSpannableStringGetNumberOfCharacters(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringGetNumberOfCharacters");
+
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannableString);
+
+  DALI_TEST_EQUALS(11u, spannableString.GetNumberOfCharacters(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSpannableStringToString(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringToString");
+  std::string text = "Hello مرحبا";
+
+  Text::SpannableString spannableString = Text::SpannableString::New(text);
+  DALI_TEST_CHECK(spannableString);
+
+  DALI_TEST_EQUALS(text, spannableString.ToString(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSpannableStringAttachSpan(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringAttachSpan");
+
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannableString);
+
+  auto greenSpan = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::GREEN);
+
+  auto isAddedGreen = spannableString.AttachSpan(
+    greenSpan,
+    Dali::Toolkit::Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isAddedGreen);
+
+  auto isAddedBlue = spannableString.AttachSpan(
+    Dali::Toolkit::Text::ForegroundColorSpan::New(Color::BLUE),
+    Dali::Toolkit::Text::Range::New(4u, 2u));
+  DALI_TEST_CHECK(isAddedBlue);
+
+  auto isAddedRed = spannableString.AttachSpan(
+    Dali::Toolkit::Text::ForegroundColorSpan::New(Color::RED),
+    Dali::Toolkit::Text::Range::New(15u, 2u));
+  DALI_TEST_CHECK(!isAddedRed);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSpannableStringDetachSpan(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringDetachSpan");
+
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannableString);
+
+  auto greenSpan = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::GREEN);
+
+  auto isAddedGreen = spannableString.AttachSpan(
+    greenSpan,
+    Dali::Toolkit::Text::Range::New(5u, 7u));
+  DALI_TEST_CHECK(isAddedGreen);
+
+  auto isAddedBlue = spannableString.AttachSpan(
+    Dali::Toolkit::Text::ForegroundColorSpan::New(Color::BLUE),
+    Dali::Toolkit::Text::Range::New(4u, 2u));
+  DALI_TEST_CHECK(isAddedBlue);
+
+  auto isRemovedGreen = spannableString.DetachSpan(greenSpan);
+  DALI_TEST_CHECK(isRemovedGreen);
+
+  auto isRemovedGreen2 = spannableString.DetachSpan(greenSpan);
+  DALI_TEST_CHECK(!isRemovedGreen2);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSpannableStringGetAllSpans(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringGetAllSpans");
+
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannableString);
+
+  auto greenSpan = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::GREEN);
+  spannableString.AttachSpan(
+    greenSpan,
+    Dali::Toolkit::Text::Range::New(5u, 7u));
+
+  auto blueSpan = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::BLUE);
+  spannableString.AttachSpan(
+    blueSpan,
+    Dali::Toolkit::Text::Range::New(4u, 2u));
+
+  auto redSpan = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::RED);
+  spannableString.AttachSpan(
+    redSpan,
+    Dali::Toolkit::Text::Range::New(15u, 2u));
+
+  auto spans = spannableString.GetAllSpans();
+
+  DALI_TEST_EQUALS(2u, spans.size(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(greenSpan, spans[0], TEST_LOCATION);
+  DALI_TEST_EQUALS(blueSpan, spans[1], TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSpannableStringRetrieveAllSpansAndRanges(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextSpannableStringRetrieveAllSpansAndRanges");
+
+  Text::SpannableString spannableString = Text::SpannableString::New("Hello مرحبا");
+  DALI_TEST_CHECK(spannableString);
+
+  auto greenSpan  = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::GREEN);
+  auto greenRange = Dali::Toolkit::Text::Range::New(5u, 7u);
+  spannableString.AttachSpan(
+    greenSpan,
+    greenRange);
+
+  auto blueSpan  = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::BLUE);
+  auto blueRange = Dali::Toolkit::Text::Range::New(4u, 2u);
+  spannableString.AttachSpan(
+    blueSpan,
+    blueRange);
+
+  auto redSpan  = Dali::Toolkit::Text::ForegroundColorSpan::New(Color::RED);
+  auto redRange = Dali::Toolkit::Text::Range::New(15u, 2u);
+  spannableString.AttachSpan(
+    redSpan,
+    redRange);
+
+  std::vector<Text::BaseSpan> spans;
+  std::vector<Text::Range>    ranges;
+
+  spannableString.RetrieveAllSpansAndRanges(spans, ranges);
+
+  DALI_TEST_EQUALS(2u, spans.size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(2u, ranges.size(), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(greenSpan, spans[0], TEST_LOCATION);
+  DALI_TEST_EQUALS(blueSpan, spans[1], TEST_LOCATION);
+
+  DALI_TEST_EQUALS(greenRange, ranges[0], TEST_LOCATION);
+  DALI_TEST_EQUALS(blueRange, ranges[1], TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-StrikethroughSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-StrikethroughSpan.cpp
new file mode 100644
index 0000000..f16efee
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-StrikethroughSpan.cpp
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/strikethrough-span.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextStrikethroughSpanNew(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextStrikethroughSpanNew");
+
+  auto strikethroughSpan = Text::StrikethroughSpan::New();
+  DALI_TEST_CHECK(strikethroughSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextStrikethroughSpanNewColorHeight(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextStrikethroughSpanNewColorHeight");
+
+  auto strikethroughSpan = Text::StrikethroughSpan::New(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(strikethroughSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextStrikethroughSpanGetColor(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextStrikethroughSpanGetColor");
+
+  auto strikethroughSpan = Text::StrikethroughSpan::New(Color::GREEN, 5.0f);
+
+  DALI_TEST_CHECK(strikethroughSpan);
+  DALI_TEST_EQUALS(Color::GREEN, strikethroughSpan.GetColor(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextStrikethroughSpanIsColorDefined(void)
+
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextStrikethroughSpanIsColorDefined");
+
+  auto strikethroughSpan = Text::StrikethroughSpan::New(Color::GREEN, 5.0f);
+
+  DALI_TEST_CHECK(strikethroughSpan);
+  DALI_TEST_EQUALS(true, strikethroughSpan.IsColorDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextStrikethroughSpanGetHeight(void)
+
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextStrikethroughSpanGetHeight");
+
+  auto strikethroughSpan = Text::StrikethroughSpan::New(Color::GREEN, 5.0f);
+
+  DALI_TEST_CHECK(strikethroughSpan);
+  DALI_TEST_EQUALS(5.0f, strikethroughSpan.GetHeight(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextStrikethroughSpanIsHeightDefined(void)
+
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextStrikethroughSpanIsHeightDefined");
+
+  auto strikethroughSpan = Text::StrikethroughSpan::New(Color::GREEN, 5.0f);
+
+  DALI_TEST_CHECK(strikethroughSpan);
+  DALI_TEST_EQUALS(true, strikethroughSpan.IsHeightDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextStrikethroughSpanStrikethroughSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliToolkitTextStrikethroughSpanStrikethroughSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::StrikethroughSpan::New();
+  DALI_TEST_CHECK(baseSpan);
+
+  Text::StrikethroughSpan strikethroughSpan = Text::StrikethroughSpan::DownCast(baseSpan);
+  DALI_TEST_CHECK(strikethroughSpan);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Text-UnderlineSpan.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Text-UnderlineSpan.cpp
new file mode 100644
index 0000000..c816cce
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Text-UnderlineSpan.cpp
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/text/spans/underline-span.h>
+
+using namespace Dali;
+using namespace Toolkit;
+
+int UtcDaliToolkitTextUnderlineSpanNew(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextUnderlineSpanNew");
+
+  auto underlineSpan = Text::UnderlineSpan::New();
+  DALI_TEST_CHECK(underlineSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextUnderlineSpanNewSolid(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextUnderlineSpanNewSolid");
+
+  auto underlineSpan = Text::UnderlineSpan::NewSolid(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextUnderlineSpanNewDashed(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextUnderlineSpanNewDashed");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDashed(Color::GREEN, 5.0f, 2.0f, 3.0f);
+  DALI_TEST_CHECK(underlineSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextUnderlineSpanNewDouble(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextUnderlineSpanNewDouble");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDouble(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetType(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetType");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDouble(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(Text::Underline::DOUBLE, underlineSpan.GetType(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsTypeDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsTypeDefined");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDouble(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(true, underlineSpan.IsTypeDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetColor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetColor");
+
+  auto underlineSpan = Text::UnderlineSpan::NewSolid(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(Color::GREEN, underlineSpan.GetColor(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsColorDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsColorDefined");
+
+  auto underlineSpan = Text::UnderlineSpan::NewSolid(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(true, underlineSpan.IsColorDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetHeight(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetHeight");
+
+  auto underlineSpan = Text::UnderlineSpan::NewSolid(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(5.0f, underlineSpan.GetHeight(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsHeightDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsHeightDefined");
+
+  auto underlineSpan = Text::UnderlineSpan::NewSolid(Color::GREEN, 5.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(true, underlineSpan.IsHeightDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetDashGap(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetDashGap");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDashed(Color::GREEN, 5.0f, 2.0f, 3.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(2.0f, underlineSpan.GetDashGap(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsDashGapDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsDashGapDefined");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDashed(Color::GREEN, 5.0f, 2.0f, 3.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(true, underlineSpan.IsDashGapDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextGetDashWidth(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextGetDashWidth");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDashed(Color::GREEN, 5.0f, 2.0f, 3.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(3.0f, underlineSpan.GetDashWidth(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextIsDashWidthDefined(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextIsDashWidthDefined");
+
+  auto underlineSpan = Text::UnderlineSpan::NewDashed(Color::GREEN, 5.0f, 2.0f, 3.0f);
+  DALI_TEST_CHECK(underlineSpan);
+  DALI_TEST_EQUALS(true, underlineSpan.IsDashWidthDefined(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextUnderlineSpanDownCast(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextUnderlineSpanDownCast");
+
+  Text::BaseSpan baseSpan = Text::UnderlineSpan::New();
+  DALI_TEST_CHECK(baseSpan);
+
+  Text::UnderlineSpan underlineSpan = Text::UnderlineSpan::DownCast(baseSpan);
+  DALI_TEST_CHECK(underlineSpan);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
index 02dff2e..bc75ce0 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,26 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dali/public-api/rendering/renderer.h>
-#include <dali/devel-api/adaptor-framework/clipboard.h>
-#include <dali/devel-api/adaptor-framework/key-devel.h>
-#include <dali/devel-api/text-abstraction/font-client.h>
-#include <dali/integration-api/events/key-event-integ.h>
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
 
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/clipboard.h>
+#include <dali/devel-api/adaptor-framework/key-devel.h>
+#include <dali/devel-api/events/pan-gesture-devel.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/integration-api/events/key-event-integ.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/public-api/rendering/renderer.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+#include "test-text-geometry-utils.h"
+
 using namespace Dali;
 using namespace Toolkit;
 
@@ -45,7 +50,6 @@ void dali_texteditor_cleanup(void)
 
 namespace
 {
-
 const char* const PROPERTY_NAME_RENDERING_BACKEND                    = "renderingBackend";
 const char* const PROPERTY_NAME_TEXT                                 = "text";
 const char* const PROPERTY_NAME_TEXT_COLOR                           = "textColor";
@@ -63,6 +67,7 @@ const char* const PROPERTY_NAME_CURSOR_BLINK_DURATION                = "cursorBl
 const char* const PROPERTY_NAME_CURSOR_WIDTH                         = "cursorWidth";
 const char* const PROPERTY_NAME_GRAB_HANDLE_IMAGE                    = "grabHandleImage";
 const char* const PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE            = "grabHandlePressedImage";
+const char* const PROPERTY_NAME_SELECTION_POPUP_STYLE                = "selectionPopupStyle";
 const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT          = "selectionHandleImageLeft";
 const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT         = "selectionHandleImageRight";
 const char* const PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT  = "selectionHandlePressedImageLeft";
@@ -77,81 +82,85 @@ const char* const PROPERTY_NAME_INPUT_FONT_FAMILY                    = "inputFon
 const char* const PROPERTY_NAME_INPUT_FONT_STYLE                     = "inputFontStyle";
 const char* const PROPERTY_NAME_INPUT_POINT_SIZE                     = "inputPointSize";
 
-const char* const PROPERTY_NAME_LINE_SPACING                         = "lineSpacing";
-const char* const PROPERTY_NAME_INPUT_LINE_SPACING                   = "inputLineSpacing";
-const char* const PROPERTY_NAME_UNDERLINE                            = "underline";
-const char* const PROPERTY_NAME_INPUT_UNDERLINE                      = "inputUnderline";
-const char* const PROPERTY_NAME_SHADOW                               = "shadow";
-const char* const PROPERTY_NAME_INPUT_SHADOW                         = "inputShadow";
-const char* const PROPERTY_NAME_EMBOSS                               = "emboss";
-const char* const PROPERTY_NAME_INPUT_EMBOSS                         = "inputEmboss";
-const char* const PROPERTY_NAME_OUTLINE                              = "outline";
-const char* const PROPERTY_NAME_INPUT_OUTLINE                        = "inputOutline";
-
-const char* const PROPERTY_NAME_SMOOTH_SCROLL                        = "smoothScroll";
-const char* const PROPERTY_NAME_SMOOTH_SCROLL_DURATION               = "smoothScrollDuration";
-const char* const PROPERTY_NAME_ENABLE_SCROLL_BAR                    = "enableScrollBar";
-const char* const PROPERTY_NAME_SCROLL_BAR_SHOW_DURATION             = "scrollBarShowDuration";
-const char* const PROPERTY_NAME_SCROLL_BAR_FADE_DURATION             = "scrollBarFadeDuration";
-const char* const PROPERTY_NAME_PIXEL_SIZE                           = "pixelSize";
-const char* const PROPERTY_NAME_LINE_COUNT                           = "lineCount";
-const char* const PROPERTY_NAME_PLACEHOLDER_TEXT                     = "placeholderText";
-const char* const PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR               = "placeholderTextColor";
-const char* const PROPERTY_NAME_ENABLE_SELECTION                     = "enableSelection";
-const char* const PROPERTY_NAME_PLACEHOLDER                          = "placeholder";
-const char* const PROPERTY_NAME_ENABLE_SHIFT_SELECTION               = "enableShiftSelection";
-const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE                   = "enableGrabHandle";
-const char* const PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION      = "matchSystemLanguageDirection";
-const char* const PROPERTY_NAME_MAX_LENGTH                           = "maxLength";
-const char* const PROPERTY_NAME_FONT_SIZE_SCALE                      = "fontSizeScale";
-const char* const PROPERTY_NAME_GRAB_HANDLE_COLOR                    = "grabHandleColor";
-const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP             = "enableGrabHandlePopup";
-const char* const PROPERTY_NAME_INPUT_METHOD_SETTINGS                = "inputMethodSettings";
-const char* const PROPERTY_NAME_INPUT_FILTER                         = "inputFilter";
-
-const Vector4 PLACEHOLDER_TEXT_COLOR( 0.8f, 0.8f, 0.8f, 0.8f );
-const Dali::Vector4 LIGHT_BLUE( 0.75f, 0.96f, 1.f, 1.f ); // The text highlight color.
+const char* const PROPERTY_NAME_LINE_SPACING        = "lineSpacing";
+const char* const PROPERTY_NAME_INPUT_LINE_SPACING  = "inputLineSpacing";
+const char* const PROPERTY_NAME_UNDERLINE           = "underline";
+const char* const PROPERTY_NAME_INPUT_UNDERLINE     = "inputUnderline";
+const char* const PROPERTY_NAME_SHADOW              = "shadow";
+const char* const PROPERTY_NAME_INPUT_SHADOW        = "inputShadow";
+const char* const PROPERTY_NAME_EMBOSS              = "emboss";
+const char* const PROPERTY_NAME_INPUT_EMBOSS        = "inputEmboss";
+const char* const PROPERTY_NAME_OUTLINE             = "outline";
+const char* const PROPERTY_NAME_INPUT_OUTLINE       = "inputOutline";
+const char* const PROPERTY_NAME_STRIKETHROUGH       = "strikethrough";
+const char* const PROPERTY_NAME_INPUT_STRIKETHROUGH = "inputStrikethrough";
+
+const char* const PROPERTY_NAME_SMOOTH_SCROLL                   = "smoothScroll";
+const char* const PROPERTY_NAME_SMOOTH_SCROLL_DURATION          = "smoothScrollDuration";
+const char* const PROPERTY_NAME_ENABLE_SCROLL_BAR               = "enableScrollBar";
+const char* const PROPERTY_NAME_SCROLL_BAR_SHOW_DURATION        = "scrollBarShowDuration";
+const char* const PROPERTY_NAME_SCROLL_BAR_FADE_DURATION        = "scrollBarFadeDuration";
+const char* const PROPERTY_NAME_PIXEL_SIZE                      = "pixelSize";
+const char* const PROPERTY_NAME_LINE_COUNT                      = "lineCount";
+const char* const PROPERTY_NAME_PLACEHOLDER_TEXT                = "placeholderText";
+const char* const PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR          = "placeholderTextColor";
+const char* const PROPERTY_NAME_ENABLE_SELECTION                = "enableSelection";
+const char* const PROPERTY_NAME_PLACEHOLDER                     = "placeholder";
+const char* const PROPERTY_NAME_ENABLE_SHIFT_SELECTION          = "enableShiftSelection";
+const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE              = "enableGrabHandle";
+const char* const PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION = "matchSystemLanguageDirection";
+const char* const PROPERTY_NAME_MAX_LENGTH                      = "maxLength";
+const char* const PROPERTY_NAME_FONT_SIZE_SCALE                 = "fontSizeScale";
+const char* const PROPERTY_NAME_ENABLE_FONT_SIZE_SCALE          = "enableFontSizeScale";
+const char* const PROPERTY_NAME_GRAB_HANDLE_COLOR               = "grabHandleColor";
+const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP        = "enableGrabHandlePopup";
+const char* const PROPERTY_NAME_INPUT_METHOD_SETTINGS           = "inputMethodSettings";
+const char* const PROPERTY_NAME_INPUT_FILTER                    = "inputFilter";
+
+const Vector4       PLACEHOLDER_TEXT_COLOR(0.8f, 0.8f, 0.8f, 0.8f);
+const Dali::Vector4 LIGHT_BLUE(0.75f, 0.96f, 1.f, 1.f); // The text highlight color.
 
 const float RENDER_FRAME_INTERVAL = 16.66f;
 
 const unsigned int DEFAULT_FONT_SIZE = 1152u;
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string  DEFAULT_FONT_DIR("/resources/fonts");
 
-const int KEY_A_CODE = 38;
-const int KEY_D_CODE = 40;
-const int KEY_C_CODE = 54;
-const int KEY_V_CODE = 55;
-const int KEY_X_CODE = 53;
+const int KEY_A_CODE           = 38;
+const int KEY_D_CODE           = 40;
+const int KEY_C_CODE           = 54;
+const int KEY_V_CODE           = 55;
+const int KEY_X_CODE           = 53;
 const int KEY_WHITE_SPACE_CODE = 65;
 
-const int KEY_SHIFT_MODIFIER = 257;
+const int KEY_SHIFT_MODIFIER   = 257;
 const int KEY_CONTROL_MODIFIER = 258;
 
-const char* HANDLE_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insertpoint-icon.png";
-const char* HANDLE_LEFT_SELECTION_FILE_NAME = TEST_RESOURCE_DIR "/selection_handle_drop_left.png";
+const char* HANDLE_IMAGE_FILE_NAME           = TEST_RESOURCE_DIR "/insertpoint-icon.png";
+const char* HANDLE_LEFT_SELECTION_FILE_NAME  = TEST_RESOURCE_DIR "/selection_handle_drop_left.png";
 const char* HANDLE_RIGHT_SELECTION_FILE_NAME = TEST_RESOURCE_DIR "/selection_handle_drop_right.png";
 
 const std::string DEFAULT_DEVICE_NAME("hwKeyboard");
 
-static bool gSelectionChangedCallbackCalled;
-static uint32_t oldSelectionStart;
-static uint32_t oldSelectionEnd;
-static bool gSelectionClearedCallbackCalled;
-static bool gAnchorClickedCallBackCalled;
-static bool gAnchorClickedCallBackNotCalled;
-static bool gTextChangedCallBackCalled;
-static bool gInputFilteredAcceptedCallbackCalled;
-static bool gInputFilteredRejectedCallbackCalled;
-static bool gInputStyleChangedCallbackCalled;
-static bool gMaxCharactersCallBackCalled;
-static bool gCursorPositionChangedCallbackCalled;
-static uint32_t oldCursorPos;
+static bool                                        gSelectionChangedCallbackCalled;
+static uint32_t                                    oldSelectionStart;
+static uint32_t                                    oldSelectionEnd;
+static bool                                        gSelectionClearedCallbackCalled;
+static bool                                        gSelectionStartedCallbackCalled;
+static bool                                        gAnchorClickedCallBackCalled;
+static bool                                        gAnchorClickedCallBackNotCalled;
+static bool                                        gTextChangedCallBackCalled;
+static bool                                        gInputFilteredAcceptedCallbackCalled;
+static bool                                        gInputFilteredRejectedCallbackCalled;
+static bool                                        gInputStyleChangedCallbackCalled;
+static bool                                        gMaxCharactersCallBackCalled;
+static bool                                        gCursorPositionChangedCallbackCalled;
+static uint32_t                                    oldCursorPos;
 static Dali::Toolkit::TextEditor::InputStyle::Mask gInputStyleMask;
 
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -162,6 +171,13 @@ struct CallbackFunctor
   bool* mCallbackFlag;
 };
 
+static void TestSelectionStartedCallback(TextEditor control)
+{
+  tet_infoline(" TestSelectionStartedCallback");
+
+  gSelectionStartedCallbackCalled = true;
+}
+
 static void TestSelectionClearedCallback(TextEditor control)
 {
   tet_infoline(" TestSelectionClearedCallback");
@@ -174,8 +190,8 @@ static void TestSelectionChangedCallback(TextEditor control, uint32_t oldStart,
   tet_infoline(" TestSelectionChangedCallback");
 
   gSelectionChangedCallbackCalled = true;
-  oldSelectionStart = oldStart;
-  oldSelectionEnd   = oldEnd;
+  oldSelectionStart               = oldStart;
+  oldSelectionEnd                 = oldEnd;
 }
 
 static void TestAnchorClickedCallback(TextEditor control, const char* href, unsigned int hrefLength)
@@ -184,36 +200,36 @@ static void TestAnchorClickedCallback(TextEditor control, const char* href, unsi
 
   gAnchorClickedCallBackNotCalled = false;
 
-  if (!strcmp(href, "https://www.tizen.org") && hrefLength == strlen(href))
+  if(!strcmp(href, "https://www.tizen.org") && hrefLength == strlen(href))
   {
     gAnchorClickedCallBackCalled = true;
   }
 }
 
-static void TestCursorPositionChangedCallback( TextEditor control, unsigned int oldPos )
+static void TestCursorPositionChangedCallback(TextEditor control, unsigned int oldPos)
 {
   tet_infoline(" TestCursorPositionChangedCallback");
 
   gCursorPositionChangedCallbackCalled = true;
-  oldCursorPos = oldPos;
+  oldCursorPos                         = oldPos;
 }
 
-static void TestTextChangedCallback( TextEditor control )
+static void TestTextChangedCallback(TextEditor control)
 {
   tet_infoline(" TestTextChangedCallback");
 
   gTextChangedCallBackCalled = true;
 }
 
-static void TestInputStyleChangedCallback( TextEditor control, TextEditor::InputStyle::Mask mask )
+static void TestInputStyleChangedCallback(TextEditor control, TextEditor::InputStyle::Mask mask)
 {
   tet_infoline(" TestInputStyleChangedCallback");
 
   gInputStyleChangedCallbackCalled = true;
-  gInputStyleMask = mask;
+  gInputStyleMask                  = mask;
 }
 
-static void TestMaxLengthReachedCallback( TextEditor control )
+static void TestMaxLengthReachedCallback(TextEditor control)
 {
   tet_infoline(" TestMaxLengthReachedCallback");
 
@@ -235,112 +251,112 @@ static void TestInputFilteredCallback(TextEditor control, Toolkit::InputFilter::
 }
 
 // Generate a KeyEvent to send to Core.
-Integration::KeyEvent GenerateKey( const std::string& keyName,
-                                   const std::string& logicalKey,
-                                   const std::string& keyString,
-                                   int keyCode,
-                                   int keyModifier,
-                                   unsigned long timeStamp,
-                                   const Integration::KeyEvent::State& keyState,
-                                   const std::string& compose = "",
-                                   const std::string& deviceName = DEFAULT_DEVICE_NAME,
-                                   const Device::Class::Type& deviceClass = Device::Class::NONE,
-                                   const Device::Subclass::Type& deviceSubclass = Device::Subclass::NONE )
+Integration::KeyEvent GenerateKey(const std::string&                  keyName,
+                                  const std::string&                  logicalKey,
+                                  const std::string&                  keyString,
+                                  int                                 keyCode,
+                                  int                                 keyModifier,
+                                  unsigned long                       timeStamp,
+                                  const Integration::KeyEvent::State& keyState,
+                                  const std::string&                  compose        = "",
+                                  const std::string&                  deviceName     = DEFAULT_DEVICE_NAME,
+                                  const Device::Class::Type&          deviceClass    = Device::Class::NONE,
+                                  const Device::Subclass::Type&       deviceSubclass = Device::Subclass::NONE)
 {
-  return Integration::KeyEvent( keyName,
-                                logicalKey,
-                                keyString,
-                                keyCode,
-                                keyModifier,
-                                timeStamp,
-                                keyState,
-                                compose,
-                                deviceName,
-                                deviceClass,
-                                deviceSubclass );
+  return Integration::KeyEvent(keyName,
+                               logicalKey,
+                               keyString,
+                               keyCode,
+                               keyModifier,
+                               timeStamp,
+                               keyState,
+                               compose,
+                               deviceName,
+                               deviceClass,
+                               deviceSubclass);
 }
 
-Dali::Integration::Point GetPointDownInside( Vector2& pos )
+Dali::Integration::Point GetPointDownInside(Vector2& pos)
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( pos );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(pos);
   return point;
 }
 
-Dali::Integration::Point GetPointUpInside( Vector2& pos )
+Dali::Integration::Point GetPointUpInside(Vector2& pos)
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( pos );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(pos);
   return point;
 }
 
-bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet )
+bool DaliTestCheckMaps(const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet)
 {
-  if( fontStyleMapGet.Count() == fontStyleMapSet.Count() )
+  if(fontStyleMapGet.Count() == fontStyleMapSet.Count())
   {
-    for( unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index )
+    for(unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index)
     {
-      const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue( index );
+      const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue(index);
 
       Property::Value* valueSet = NULL;
-      if ( valueGet.first.type == Property::Key::INDEX )
+      if(valueGet.first.type == Property::Key::INDEX)
       {
-        valueSet = fontStyleMapSet.Find( valueGet.first.indexKey );
+        valueSet = fontStyleMapSet.Find(valueGet.first.indexKey);
       }
       else
       {
         // Get Key is a string so searching Set Map for a string key
-        valueSet = fontStyleMapSet.Find( valueGet.first.stringKey );
+        valueSet = fontStyleMapSet.Find(valueGet.first.stringKey);
       }
 
-      if( NULL != valueSet )
+      if(NULL != valueSet)
       {
-        if( valueSet->GetType() == Dali::Property::STRING && ( valueGet.second.Get<std::string>() != valueSet->Get<std::string>() ) )
+        if(valueSet->GetType() == Dali::Property::STRING && (valueGet.second.Get<std::string>() != valueSet->Get<std::string>()))
         {
-          tet_printf( "Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str() );
+          tet_printf("Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::BOOLEAN && ( valueGet.second.Get<bool>() != valueSet->Get<bool>() ) )
+        else if(valueSet->GetType() == Dali::Property::BOOLEAN && (valueGet.second.Get<bool>() != valueSet->Get<bool>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::INTEGER && ( valueGet.second.Get<int>() != valueSet->Get<int>() ) )
+        else if(valueSet->GetType() == Dali::Property::INTEGER && (valueGet.second.Get<int>() != valueSet->Get<int>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::FLOAT && ( valueGet.second.Get<float>() != valueSet->Get<float>() ) )
+        else if(valueSet->GetType() == Dali::Property::FLOAT && (valueGet.second.Get<float>() != valueSet->Get<float>()))
         {
-          tet_printf( "Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>() );
+          tet_printf("Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::VECTOR2 && ( valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>() ) )
+        else if(valueSet->GetType() == Dali::Property::VECTOR2 && (valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>()))
         {
           Vector2 vector2Get = valueGet.second.Get<Vector2>();
           Vector2 vector2Set = valueSet->Get<Vector2>();
-          tet_printf( "Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y );
+          tet_printf("Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y);
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::VECTOR4 && ( valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>() ) )
+        else if(valueSet->GetType() == Dali::Property::VECTOR4 && (valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>()))
         {
           Vector4 vector4Get = valueGet.second.Get<Vector4>();
           Vector4 vector4Set = valueSet->Get<Vector4>();
-          tet_printf( "Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a );
+          tet_printf("Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a);
           return false;
         }
       }
       else
       {
-        if ( valueGet.first.type == Property::Key::INDEX )
+        if(valueGet.first.type == Property::Key::INDEX)
         {
-          tet_printf( "  The key %d doesn't exist.", valueGet.first.indexKey );
+          tet_printf("  The key %d doesn't exist.", valueGet.first.indexKey);
         }
         else
         {
-          tet_printf( "  The key %s doesn't exist.", valueGet.first.stringKey.c_str() );
+          tet_printf("  The key %s doesn't exist.", valueGet.first.stringKey.c_str());
         }
         return false;
       }
@@ -354,18 +370,18 @@ class ScrollStateChangeCallback : public Dali::ConnectionTracker
 {
 public:
   ScrollStateChangeCallback(bool& startedCalled, bool& finishedCalled)
-  : mStartedCalled( startedCalled ),
-    mFinishedCalled( finishedCalled )
+  : mStartedCalled(startedCalled),
+    mFinishedCalled(finishedCalled)
   {
   }
 
-  void Callback( TextEditor editor, TextEditor::Scroll::Type type )
+  void Callback(TextEditor editor, TextEditor::Scroll::Type type)
   {
-    if( type == TextEditor::Scroll::STARTED )
+    if(type == TextEditor::Scroll::STARTED)
     {
       mStartedCalled = true;
     }
-    else if( type == TextEditor::Scroll::FINISHED )
+    else if(type == TextEditor::Scroll::FINISHED)
     {
       mFinishedCalled = true;
     }
@@ -375,6 +391,55 @@ public:
   bool& mFinishedCalled;
 };
 
+// Stores data that is populated in the callback and will be read by the test cases
+struct SignalData
+{
+  SignalData()
+  : functorCalled(false),
+    voidFunctorCalled(false),
+    receivedGesture()
+  {
+  }
+
+  void Reset()
+  {
+    functorCalled     = false;
+    voidFunctorCalled = false;
+
+    receivedGesture.Reset();
+
+    pannedActor.Reset();
+  }
+
+  bool       functorCalled;
+  bool       voidFunctorCalled;
+  PanGesture receivedGesture;
+  Actor      pannedActor;
+};
+
+// Functor that sets the data when called
+struct GestureReceivedFunctor
+{
+  GestureReceivedFunctor(SignalData& data)
+  : signalData(data)
+  {
+  }
+
+  void operator()(Actor actor, const PanGesture& pan)
+  {
+    signalData.functorCalled   = true;
+    signalData.receivedGesture = pan;
+    signalData.pannedActor     = actor;
+  }
+
+  void operator()()
+  {
+    signalData.voidFunctorCalled = true;
+  }
+
+  SignalData& signalData;
+};
+
 } // namespace
 
 int UtcDaliToolkitTextEditorConstructorP(void)
@@ -382,7 +447,7 @@ int UtcDaliToolkitTextEditorConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorConstructorP");
   TextEditor textEditor;
-  DALI_TEST_CHECK( !textEditor );
+  DALI_TEST_CHECK(!textEditor);
   END_TEST;
 }
 
@@ -391,7 +456,7 @@ int UtcDaliToolkitTextEditorNewP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorNewP");
   TextEditor textEditor = TextEditor::New();
-  DALI_TEST_CHECK( textEditor );
+  DALI_TEST_CHECK(textEditor);
   END_TEST;
 }
 
@@ -400,13 +465,13 @@ int UtcDaliToolkitTextEditorDownCastP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorDownCastP");
   TextEditor textEditor1 = TextEditor::New();
-  BaseHandle object( textEditor1 );
+  BaseHandle object(textEditor1);
 
-  TextEditor textEditor2 = TextEditor::DownCast( object );
-  DALI_TEST_CHECK( textEditor2 );
+  TextEditor textEditor2 = TextEditor::DownCast(object);
+  DALI_TEST_CHECK(textEditor2);
 
-  TextEditor textEditor3 = DownCast< TextEditor >( object );
-  DALI_TEST_CHECK( textEditor3 );
+  TextEditor textEditor3 = DownCast<TextEditor>(object);
+  DALI_TEST_CHECK(textEditor3);
   END_TEST;
 }
 
@@ -415,11 +480,11 @@ int UtcDaliToolkitTextEditorDownCastN(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorDownCastN");
   BaseHandle uninitializedObject;
-  TextEditor textEditor1 = TextEditor::DownCast( uninitializedObject );
-  DALI_TEST_CHECK( !textEditor1 );
+  TextEditor textEditor1 = TextEditor::DownCast(uninitializedObject);
+  DALI_TEST_CHECK(!textEditor1);
 
-  TextEditor textEditor2 = DownCast< TextEditor >( uninitializedObject );
-  DALI_TEST_CHECK( !textEditor2 );
+  TextEditor textEditor2 = DownCast<TextEditor>(uninitializedObject);
+  DALI_TEST_CHECK(!textEditor2);
   END_TEST;
 }
 
@@ -428,11 +493,11 @@ int UtcDaliToolkitTextEditorCopyConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorCopyConstructorP");
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Test" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
 
-  TextEditor copy( textEditor );
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<std::string>( TextEditor::Property::TEXT ) == textEditor.GetProperty<std::string>( TextEditor::Property::TEXT ) );
+  TextEditor copy(textEditor);
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<std::string>(TextEditor::Property::TEXT) == textEditor.GetProperty<std::string>(TextEditor::Property::TEXT));
   END_TEST;
 }
 
@@ -441,14 +506,14 @@ int UtcDaliTextEditorMoveConstructor(void)
   ToolkitTestApplication application;
 
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Test" );
-  DALI_TEST_CHECK( textEditor.GetProperty<std::string>( TextEditor::Property::TEXT ) == "Test" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
+  DALI_TEST_CHECK(textEditor.GetProperty<std::string>(TextEditor::Property::TEXT) == "Test");
 
-  TextEditor moved = std::move( textEditor );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<std::string>( TextEditor::Property::TEXT ) == "Test" );
-  DALI_TEST_CHECK( !textEditor );
+  TextEditor moved = std::move(textEditor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<std::string>(TextEditor::Property::TEXT) == "Test");
+  DALI_TEST_CHECK(!textEditor);
 
   END_TEST;
 }
@@ -458,11 +523,11 @@ int UtcDaliToolkitTextEditorAssignmentOperatorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorAssignmentOperatorP");
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Test" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
 
   TextEditor copy = textEditor;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<std::string>( TextEditor::Property::TEXT ) == textEditor.GetProperty<std::string>( TextEditor::Property::TEXT ) );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<std::string>(TextEditor::Property::TEXT) == textEditor.GetProperty<std::string>(TextEditor::Property::TEXT));
   END_TEST;
 }
 
@@ -471,15 +536,15 @@ int UtcDaliTextEditorMoveAssignment(void)
   ToolkitTestApplication application;
 
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Test" );
-  DALI_TEST_CHECK( textEditor.GetProperty<std::string>( TextEditor::Property::TEXT ) == "Test" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
+  DALI_TEST_CHECK(textEditor.GetProperty<std::string>(TextEditor::Property::TEXT) == "Test");
 
   TextEditor moved;
-  moved = std::move( textEditor );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<std::string>( TextEditor::Property::TEXT ) == "Test" );
-  DALI_TEST_CHECK( !textEditor );
+  moved = std::move(textEditor);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<std::string>(TextEditor::Property::TEXT) == "Test");
+  DALI_TEST_CHECK(!textEditor);
 
   END_TEST;
 }
@@ -489,7 +554,7 @@ int UtcDaliTextEditorNewP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorNewP");
   TextEditor textEditor = TextEditor::New();
-  DALI_TEST_CHECK( textEditor );
+  DALI_TEST_CHECK(textEditor);
   END_TEST;
 }
 
@@ -499,85 +564,91 @@ int UtcDaliTextEditorGetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorGetPropertyP");
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
   // Check Property Indices are correct
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_RENDERING_BACKEND ) == DevelTextEditor::Property::RENDERING_BACKEND );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_TEXT ) == TextEditor::Property::TEXT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_TEXT_COLOR ) == TextEditor::Property::TEXT_COLOR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_FONT_FAMILY ) == TextEditor::Property::FONT_FAMILY );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_FONT_STYLE ) == TextEditor::Property::FONT_STYLE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_POINT_SIZE ) == TextEditor::Property::POINT_SIZE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_HORIZONTAL_ALIGNMENT ) == TextEditor::Property::HORIZONTAL_ALIGNMENT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SCROLL_THRESHOLD ) == TextEditor::Property::SCROLL_THRESHOLD );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SCROLL_SPEED ) == TextEditor::Property::SCROLL_SPEED );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_PRIMARY_CURSOR_COLOR ) == TextEditor::Property::PRIMARY_CURSOR_COLOR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SECONDARY_CURSOR_COLOR ) == TextEditor::Property::SECONDARY_CURSOR_COLOR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_CURSOR_BLINK ) == TextEditor::Property::ENABLE_CURSOR_BLINK );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_CURSOR_BLINK_INTERVAL ) == TextEditor::Property::CURSOR_BLINK_INTERVAL );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_CURSOR_BLINK_DURATION ) == TextEditor::Property::CURSOR_BLINK_DURATION );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_CURSOR_WIDTH ) == TextEditor::Property::CURSOR_WIDTH );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_GRAB_HANDLE_IMAGE ) == TextEditor::Property::GRAB_HANDLE_IMAGE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE ) == TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT ) == TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT ) == TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT ) == TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT ) == TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_LEFT ) == TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_RIGHT ) == TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SELECTION_HIGHLIGHT_COLOR ) == TextEditor::Property::SELECTION_HIGHLIGHT_COLOR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_DECORATION_BOUNDING_BOX ) == TextEditor::Property::DECORATION_BOUNDING_BOX );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_MARKUP ) == TextEditor::Property::ENABLE_MARKUP );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_COLOR ) == TextEditor::Property::INPUT_COLOR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_FONT_FAMILY ) == TextEditor::Property::INPUT_FONT_FAMILY );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_FONT_STYLE ) == TextEditor::Property::INPUT_FONT_STYLE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_POINT_SIZE ) == TextEditor::Property::INPUT_POINT_SIZE );
-
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_LINE_SPACING ) == TextEditor::Property::LINE_SPACING );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_LINE_SPACING ) == TextEditor::Property::INPUT_LINE_SPACING );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_UNDERLINE ) == TextEditor::Property::UNDERLINE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_UNDERLINE ) == TextEditor::Property::INPUT_UNDERLINE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SHADOW ) == TextEditor::Property::SHADOW );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_SHADOW ) == TextEditor::Property::INPUT_SHADOW );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_EMBOSS ) == TextEditor::Property::EMBOSS );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_EMBOSS ) == TextEditor::Property::INPUT_EMBOSS );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_OUTLINE ) == TextEditor::Property::OUTLINE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_OUTLINE ) == TextEditor::Property::INPUT_OUTLINE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SMOOTH_SCROLL ) == TextEditor::Property::SMOOTH_SCROLL );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SMOOTH_SCROLL_DURATION ) == TextEditor::Property::SMOOTH_SCROLL_DURATION );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_SCROLL_BAR ) == TextEditor::Property::ENABLE_SCROLL_BAR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SCROLL_BAR_SHOW_DURATION ) == TextEditor::Property::SCROLL_BAR_SHOW_DURATION );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SCROLL_BAR_FADE_DURATION ) == TextEditor::Property::SCROLL_BAR_FADE_DURATION );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_PIXEL_SIZE ) == TextEditor::Property::PIXEL_SIZE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_LINE_COUNT) == TextEditor::Property::LINE_COUNT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_SELECTION ) == TextEditor::Property::ENABLE_SELECTION );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER ) == TextEditor::Property::PLACEHOLDER );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_FONT_SIZE_SCALE ) == DevelTextEditor::Property::FONT_SIZE_SCALE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER_TEXT ) == DevelTextEditor::Property::PLACEHOLDER_TEXT );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR ) == DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_SHIFT_SELECTION ) == DevelTextEditor::Property::ENABLE_SHIFT_SELECTION );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_GRAB_HANDLE ) == DevelTextEditor::Property::ENABLE_GRAB_HANDLE );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION ) == DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_MAX_LENGTH ) == DevelTextEditor::Property::MAX_LENGTH );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_GRAB_HANDLE_COLOR ) == DevelTextEditor::Property::GRAB_HANDLE_COLOR );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP ) == DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_METHOD_SETTINGS ) == DevelTextEditor::Property::INPUT_METHOD_SETTINGS );
-  DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_FILTER ) == DevelTextEditor::Property::INPUT_FILTER );
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_RENDERING_BACKEND) == DevelTextEditor::Property::RENDERING_BACKEND);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_TEXT) == TextEditor::Property::TEXT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_TEXT_COLOR) == TextEditor::Property::TEXT_COLOR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_FONT_FAMILY) == TextEditor::Property::FONT_FAMILY);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_FONT_STYLE) == TextEditor::Property::FONT_STYLE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_POINT_SIZE) == TextEditor::Property::POINT_SIZE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_HORIZONTAL_ALIGNMENT) == TextEditor::Property::HORIZONTAL_ALIGNMENT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SCROLL_THRESHOLD) == TextEditor::Property::SCROLL_THRESHOLD);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SCROLL_SPEED) == TextEditor::Property::SCROLL_SPEED);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_PRIMARY_CURSOR_COLOR) == TextEditor::Property::PRIMARY_CURSOR_COLOR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SECONDARY_CURSOR_COLOR) == TextEditor::Property::SECONDARY_CURSOR_COLOR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_CURSOR_BLINK) == TextEditor::Property::ENABLE_CURSOR_BLINK);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_CURSOR_BLINK_INTERVAL) == TextEditor::Property::CURSOR_BLINK_INTERVAL);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_CURSOR_BLINK_DURATION) == TextEditor::Property::CURSOR_BLINK_DURATION);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_CURSOR_WIDTH) == TextEditor::Property::CURSOR_WIDTH);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_GRAB_HANDLE_IMAGE) == TextEditor::Property::GRAB_HANDLE_IMAGE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE) == TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT) == TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT) == TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT) == TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT) == TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_LEFT) == TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_RIGHT) == TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_HIGHLIGHT_COLOR) == TextEditor::Property::SELECTION_HIGHLIGHT_COLOR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_DECORATION_BOUNDING_BOX) == TextEditor::Property::DECORATION_BOUNDING_BOX);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_MARKUP) == TextEditor::Property::ENABLE_MARKUP);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_COLOR) == TextEditor::Property::INPUT_COLOR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_FONT_FAMILY) == TextEditor::Property::INPUT_FONT_FAMILY);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_FONT_STYLE) == TextEditor::Property::INPUT_FONT_STYLE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_POINT_SIZE) == TextEditor::Property::INPUT_POINT_SIZE);
+
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_LINE_SPACING) == TextEditor::Property::LINE_SPACING);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_LINE_SPACING) == TextEditor::Property::INPUT_LINE_SPACING);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_UNDERLINE) == TextEditor::Property::UNDERLINE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_UNDERLINE) == TextEditor::Property::INPUT_UNDERLINE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SHADOW) == TextEditor::Property::SHADOW);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_SHADOW) == TextEditor::Property::INPUT_SHADOW);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_EMBOSS) == TextEditor::Property::EMBOSS);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_EMBOSS) == TextEditor::Property::INPUT_EMBOSS);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_OUTLINE) == TextEditor::Property::OUTLINE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_OUTLINE) == TextEditor::Property::INPUT_OUTLINE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_STRIKETHROUGH) == DevelTextEditor::Property::STRIKETHROUGH);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_STRIKETHROUGH) == DevelTextEditor::Property::INPUT_STRIKETHROUGH);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SMOOTH_SCROLL) == TextEditor::Property::SMOOTH_SCROLL);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SMOOTH_SCROLL_DURATION) == TextEditor::Property::SMOOTH_SCROLL_DURATION);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_SCROLL_BAR) == TextEditor::Property::ENABLE_SCROLL_BAR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SCROLL_BAR_SHOW_DURATION) == TextEditor::Property::SCROLL_BAR_SHOW_DURATION);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SCROLL_BAR_FADE_DURATION) == TextEditor::Property::SCROLL_BAR_FADE_DURATION);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_PIXEL_SIZE) == TextEditor::Property::PIXEL_SIZE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_LINE_COUNT) == TextEditor::Property::LINE_COUNT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_SELECTION) == TextEditor::Property::ENABLE_SELECTION);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_PLACEHOLDER) == TextEditor::Property::PLACEHOLDER);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_FONT_SIZE_SCALE) == DevelTextEditor::Property::FONT_SIZE_SCALE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_FONT_SIZE_SCALE) == DevelTextEditor::Property::ENABLE_FONT_SIZE_SCALE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_PLACEHOLDER_TEXT) == DevelTextEditor::Property::PLACEHOLDER_TEXT);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR) == DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_SHIFT_SELECTION) == DevelTextEditor::Property::ENABLE_SHIFT_SELECTION);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_GRAB_HANDLE) == DevelTextEditor::Property::ENABLE_GRAB_HANDLE);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION) == DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_MAX_LENGTH) == DevelTextEditor::Property::MAX_LENGTH);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_GRAB_HANDLE_COLOR) == DevelTextEditor::Property::GRAB_HANDLE_COLOR);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP) == DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_METHOD_SETTINGS) == DevelTextEditor::Property::INPUT_METHOD_SETTINGS);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_FILTER) == DevelTextEditor::Property::INPUT_FILTER);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_STRIKETHROUGH) == DevelTextEditor::Property::STRIKETHROUGH);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_INPUT_STRIKETHROUGH) == DevelTextEditor::Property::INPUT_STRIKETHROUGH);
+  DALI_TEST_CHECK(editor.GetPropertyIndex(PROPERTY_NAME_SELECTION_POPUP_STYLE) == DevelTextEditor::Property::SELECTION_POPUP_STYLE);
 
   END_TEST;
 }
 
-bool SetPropertyMapRetrieved( TextEditor& editor, const Property::Index property, const std::string mapKey, const std::string mapValue )
+bool SetPropertyMapRetrieved(TextEditor& editor, const Property::Index property, const std::string mapKey, const std::string mapValue)
 {
-  bool result = false;
+  bool          result = false;
   Property::Map imageMap;
-  imageMap[mapKey] =mapValue;
+  imageMap[mapKey] = mapValue;
 
-  editor.SetProperty( property , imageMap );
-  Property::Value propValue = editor.GetProperty( property );
-  Property::Map* resultMap = propValue.GetMap();
+  editor.SetProperty(property, imageMap);
+  Property::Value propValue = editor.GetProperty(property);
+  Property::Map*  resultMap = propValue.GetMap();
 
-  if ( resultMap->Find( mapKey )->Get< std::string>() == mapValue )
+  if(resultMap->Find(mapKey)->Get<std::string>() == mapValue)
   {
     result = true;
   }
@@ -591,250 +662,374 @@ int UtcDaliTextEditorSetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorSetPropertyP");
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-  application.GetScene().Add( editor );
+  DALI_TEST_CHECK(editor);
+  application.GetScene().Add(editor);
 
   // Note - we can't check the defaults since the stylesheets are platform-specific
 
   // Check the render backend property.
-  editor.SetProperty( DevelTextEditor::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS );
-  DALI_TEST_EQUALS( (DevelText::RenderingType)editor.GetProperty<int>( DevelTextEditor::Property::RENDERING_BACKEND ), DevelText::RENDERING_SHARED_ATLAS, TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS);
+  DALI_TEST_EQUALS((DevelText::RenderingType)editor.GetProperty<int>(DevelTextEditor::Property::RENDERING_BACKEND), DevelText::RENDERING_SHARED_ATLAS, TEST_LOCATION);
 
   // Check text property.
-  editor.SetProperty( TextEditor::Property::TEXT, "Setting Text" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("Setting Text"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::TEXT, "Setting Text");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("Setting Text"), TEST_LOCATION);
 
   // Check text's color property
-  editor.SetProperty( TextEditor::Property::TEXT_COLOR, Color::WHITE );
-  DALI_TEST_EQUALS( editor.GetProperty<Vector4>( TextEditor::Property::TEXT_COLOR ), Color::WHITE, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::TEXT_COLOR, Color::WHITE);
+  DALI_TEST_EQUALS(editor.GetProperty<Vector4>(TextEditor::Property::TEXT_COLOR), Color::WHITE, TEST_LOCATION);
 
   // Check font properties.
-  editor.SetProperty( TextEditor::Property::FONT_FAMILY, "Setting font family" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::FONT_FAMILY ), std::string("Setting font family"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::FONT_FAMILY, "Setting font family");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::FONT_FAMILY), std::string("Setting font family"), TEST_LOCATION);
 
-  Property::Map fontStyleMapSet;
-  Property::Map fontStyleMapGet;
+  Property::Map    fontStyleMapSet;
+  Property::Map    fontStyleMapGet;
   Property::Value* slantValue = NULL;
 
-  fontStyleMapSet.Insert( "weight", "bold" );
-  fontStyleMapSet.Insert( "width", "condensed" );
-  fontStyleMapSet.Insert( "slant", "italic" );
+  fontStyleMapSet.Insert("weight", "bold");
+  fontStyleMapSet.Insert("width", "condensed");
+  fontStyleMapSet.Insert("slant", "italic");
 
-  editor.SetProperty( TextEditor::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::POINT_SIZE ), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::POINT_SIZE), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  editor.SetProperty( DevelTextEditor::Property::FONT_SIZE_SCALE, 2.5f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( DevelTextEditor::Property::FONT_SIZE_SCALE ), 2.5f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( DevelTextEditor::Property::FONT_SIZE_SCALE, 1.0f );
+  editor.SetProperty(DevelTextEditor::Property::FONT_SIZE_SCALE, 2.5f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(DevelTextEditor::Property::FONT_SIZE_SCALE), 2.5f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(DevelTextEditor::Property::FONT_SIZE_SCALE, 1.0f);
+
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_FONT_SIZE_SCALE, false);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::ENABLE_FONT_SIZE_SCALE), false, TEST_LOCATION);
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_FONT_SIZE_SCALE, true);
 
   // Reset font style.
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "normal" );
-  fontStyleMapSet.Insert( "slant", "oblique" );
-  editor.SetProperty( TextEditor::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  fontStyleMapSet.Insert("weight", "normal");
+  fontStyleMapSet.Insert("slant", "oblique");
+  editor.SetProperty(TextEditor::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "slant", "roman" );
-  editor.SetProperty( TextEditor::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::FONT_STYLE );
+  fontStyleMapSet.Insert("slant", "roman");
+  editor.SetProperty(TextEditor::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::FONT_STYLE);
 
   // Replace 'roman' for 'normal'.
-  slantValue = fontStyleMapGet.Find( "slant" );
-  if( NULL != slantValue )
+  slantValue = fontStyleMapGet.Find("slant");
+  if(NULL != slantValue)
   {
-    if( "normal" == slantValue->Get<std::string>() )
+    if("normal" == slantValue->Get<std::string>())
     {
       fontStyleMapGet["slant"] = "roman";
     }
   }
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
 
-  editor.SetProperty( TextEditor::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
+
+  // Check that the Alignment properties can be correctly set
+  editor.SetProperty(TextEditor::Property::HORIZONTAL_ALIGNMENT, "END");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::HORIZONTAL_ALIGNMENT), "END", TEST_LOCATION);
 
   // Check that the Alignment properties can be correctly set
-  editor.SetProperty( TextEditor::Property::HORIZONTAL_ALIGNMENT, "END" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::HORIZONTAL_ALIGNMENT ), "END", TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::VERTICAL_ALIGNMENT, "BOTTOM");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(DevelTextEditor::Property::VERTICAL_ALIGNMENT), "BOTTOM", TEST_LOCATION);
+  editor.SetProperty(DevelTextEditor::Property::VERTICAL_ALIGNMENT, "CENTER");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(DevelTextEditor::Property::VERTICAL_ALIGNMENT), "CENTER", TEST_LOCATION);
+  editor.SetProperty(DevelTextEditor::Property::VERTICAL_ALIGNMENT, "TOP");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(DevelTextEditor::Property::VERTICAL_ALIGNMENT), "TOP", TEST_LOCATION);
 
   // Check scroll properties.
-  editor.SetProperty( TextEditor::Property::SCROLL_THRESHOLD, 1.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SCROLL_THRESHOLD ), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::SCROLL_SPEED, 100.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SCROLL_SPEED ), 100.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::SCROLL_THRESHOLD, 1.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SCROLL_THRESHOLD), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::SCROLL_SPEED, 100.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SCROLL_SPEED), 100.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check cursor properties
-  editor.SetProperty( TextEditor::Property::PRIMARY_CURSOR_COLOR, Color::RED );
-  DALI_TEST_EQUALS( editor.GetProperty<Vector4>( TextEditor::Property::PRIMARY_CURSOR_COLOR ), Color::RED, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::SECONDARY_CURSOR_COLOR, Color::BLUE );
-  DALI_TEST_EQUALS( editor.GetProperty<Vector4>( TextEditor::Property::SECONDARY_CURSOR_COLOR ), Color::BLUE, TEST_LOCATION );
-
-  editor.SetProperty( TextEditor::Property::ENABLE_CURSOR_BLINK, false );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::ENABLE_CURSOR_BLINK ), false, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::CURSOR_BLINK_INTERVAL, 1.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::CURSOR_BLINK_INTERVAL ), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::CURSOR_BLINK_DURATION, 10.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::CURSOR_BLINK_DURATION ), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::CURSOR_WIDTH, 1 );
-  DALI_TEST_EQUALS( editor.GetProperty<int>( TextEditor::Property::CURSOR_WIDTH ), 1, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::PRIMARY_CURSOR_COLOR, Color::RED);
+  DALI_TEST_EQUALS(editor.GetProperty<Vector4>(TextEditor::Property::PRIMARY_CURSOR_COLOR), Color::RED, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::SECONDARY_CURSOR_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(editor.GetProperty<Vector4>(TextEditor::Property::SECONDARY_CURSOR_COLOR), Color::BLUE, TEST_LOCATION);
+
+  editor.SetProperty(TextEditor::Property::ENABLE_CURSOR_BLINK, false);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::ENABLE_CURSOR_BLINK), false, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::CURSOR_BLINK_INTERVAL, 1.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::CURSOR_BLINK_INTERVAL), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::CURSOR_BLINK_DURATION, 10.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::CURSOR_BLINK_DURATION), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::CURSOR_WIDTH, 1);
+  DALI_TEST_EQUALS(editor.GetProperty<int>(TextEditor::Property::CURSOR_WIDTH), 1, TEST_LOCATION);
 
   // Check handle images
-  editor.SetProperty( TextEditor::Property::GRAB_HANDLE_IMAGE, "image1" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::GRAB_HANDLE_IMAGE ), "image1", TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE, "image2" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE ), "image2", TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT, "image3" );
+  editor.SetProperty(TextEditor::Property::GRAB_HANDLE_IMAGE, "image1");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::GRAB_HANDLE_IMAGE), "image1", TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE, "image2");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE), "image2", TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT, "image3");
 
   // Check handle images
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( editor, TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT, "filename", "leftHandleImage" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( editor, TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT, "filename", "rightHandleImage" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( editor, TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, "filename", "leftHandleImagePressed" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( editor, TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, "filename", "rightHandleImagePressed" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( editor, TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT, "filename", "leftHandleMarkerImage" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( editor, TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT, "filename", "rightHandleMarkerImage" )  );
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(editor, TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT, "filename", "leftHandleImage"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(editor, TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT, "filename", "rightHandleImage"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(editor, TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, "filename", "leftHandleImagePressed"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(editor, TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, "filename", "rightHandleImagePressed"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(editor, TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT, "filename", "leftHandleMarkerImage"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(editor, TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT, "filename", "rightHandleMarkerImage"));
+
+  // Check the selection popup style
+  const Vector2 popupMaxSize(200.0f, 300.0f);
+  const Vector2 optionDividerSize(30.0f, 5.0f);
+  const Vector4 optionDividerPadding(20.0f, 20.0f, 10.0f, 10.0f);
+  const Vector4 labelPadding(5.0f, 5.0f, 50.0f, 25.0f);
+
+  Property::Map selectionPopupStyle;
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::POPUP_MAX_SIZE, popupMaxSize);
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::OPTION_DIVIDER_SIZE, optionDividerSize);
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::OPTION_DIVIDER_PADDING, optionDividerPadding);
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::LABEL_PADDING, labelPadding);
+
+  editor.SetProperty(DevelTextEditor::Property::SELECTION_POPUP_STYLE, selectionPopupStyle);
+
+  Property::Map selectionPopupStyleGet;
+  selectionPopupStyleGet = editor.GetProperty<Property::Map>(DevelTextEditor::Property::SELECTION_POPUP_STYLE);
+
+  Property::Value* popupValue;
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::POPUP_MAX_SIZE);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector2 popupMaxSizeGet;
+    popupValue->Get(popupMaxSizeGet);
+    DALI_TEST_EQUALS(popupMaxSizeGet, popupMaxSize, TEST_LOCATION);
+  }
+
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::OPTION_DIVIDER_SIZE);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector2 optionDividerSizeGet;
+    popupValue->Get(optionDividerSizeGet);
+    DALI_TEST_EQUALS(optionDividerSizeGet, optionDividerSize, TEST_LOCATION);
+  }
+
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::OPTION_DIVIDER_PADDING);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector4 optionDividerPaddingGet;
+    popupValue->Get(optionDividerPaddingGet);
+    DALI_TEST_EQUALS(optionDividerPaddingGet, optionDividerPadding, TEST_LOCATION);
+  }
+
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::LABEL_PADDING);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector4 labelPaddingGet;
+    popupValue->Get(labelPaddingGet);
+    DALI_TEST_EQUALS(labelPaddingGet, labelPadding, TEST_LOCATION);
+  }
+
+  // Reset selection popup style
+  selectionPopupStyle.Clear();
+  editor.SetProperty(DevelTextEditor::Property::SELECTION_POPUP_STYLE, selectionPopupStyle);
 
   // Check the highlight color
-  editor.SetProperty( TextEditor::Property::SELECTION_HIGHLIGHT_COLOR, Color::GREEN );
-  DALI_TEST_EQUALS( editor.GetProperty<Vector4>( TextEditor::Property::SELECTION_HIGHLIGHT_COLOR ), Color::GREEN, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::SELECTION_HIGHLIGHT_COLOR, Color::GREEN);
+  DALI_TEST_EQUALS(editor.GetProperty<Vector4>(TextEditor::Property::SELECTION_HIGHLIGHT_COLOR), Color::GREEN, TEST_LOCATION);
 
   // Decoration bounding box
-  editor.SetProperty( TextEditor::Property::DECORATION_BOUNDING_BOX, Rect<int>( 0, 0, 1, 1 ) );
-  DALI_TEST_EQUALS( editor.GetProperty<Rect <int > >( TextEditor::Property::DECORATION_BOUNDING_BOX ), Rect<int>( 0, 0, 1, 1 ), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::DECORATION_BOUNDING_BOX, Rect<int>(0, 0, 1, 1));
+  DALI_TEST_EQUALS(editor.GetProperty<Rect<int> >(TextEditor::Property::DECORATION_BOUNDING_BOX), Rect<int>(0, 0, 1, 1), TEST_LOCATION);
 
   // Check the enable markup property.
-  DALI_TEST_CHECK( !editor.GetProperty<bool>( TextEditor::Property::ENABLE_MARKUP ) );
-  editor.SetProperty( TextEditor::Property::ENABLE_MARKUP, true );
-  DALI_TEST_CHECK( editor.GetProperty<bool>( TextEditor::Property::ENABLE_MARKUP ) );
+  DALI_TEST_CHECK(!editor.GetProperty<bool>(TextEditor::Property::ENABLE_MARKUP));
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  DALI_TEST_CHECK(editor.GetProperty<bool>(TextEditor::Property::ENABLE_MARKUP));
 
   // Check input color property.
-  editor.SetProperty( TextEditor::Property::INPUT_COLOR, Color::YELLOW );
-  DALI_TEST_EQUALS( editor.GetProperty<Vector4>( TextEditor::Property::INPUT_COLOR ), Color::YELLOW, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_COLOR, Color::YELLOW);
+  DALI_TEST_EQUALS(editor.GetProperty<Vector4>(TextEditor::Property::INPUT_COLOR), Color::YELLOW, TEST_LOCATION);
 
   // Check input font properties.
-  editor.SetProperty( TextEditor::Property::INPUT_FONT_FAMILY, "Setting input font family" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::INPUT_FONT_FAMILY ), "Setting input font family", TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_FONT_FAMILY, "Setting input font family");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::INPUT_FONT_FAMILY), "Setting input font family", TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "bold" );
-  fontStyleMapSet.Insert( "width", "condensed" );
-  fontStyleMapSet.Insert( "slant", "italic" );
+  fontStyleMapSet.Insert("weight", "bold");
+  fontStyleMapSet.Insert("width", "condensed");
+  fontStyleMapSet.Insert("slant", "italic");
 
-  editor.SetProperty( TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
-  editor.SetProperty( TextEditor::Property::INPUT_POINT_SIZE, 12.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::INPUT_POINT_SIZE ), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_POINT_SIZE, 12.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::INPUT_POINT_SIZE), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Reset input font style.
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "normal" );
-  fontStyleMapSet.Insert( "slant", "oblique" );
+  fontStyleMapSet.Insert("weight", "normal");
+  fontStyleMapSet.Insert("slant", "oblique");
 
-  editor.SetProperty( TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "slant", "roman" );
+  fontStyleMapSet.Insert("slant", "roman");
 
-  editor.SetProperty( TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::INPUT_FONT_STYLE );
+  editor.SetProperty(TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::INPUT_FONT_STYLE);
 
   // Replace 'roman' for 'normal'.
-  slantValue = fontStyleMapGet.Find( "slant" );
-  if( NULL != slantValue )
+  slantValue = fontStyleMapGet.Find("slant");
+  if(NULL != slantValue)
   {
-    if( "normal" == slantValue->Get<std::string>() )
+    if("normal" == slantValue->Get<std::string>())
     {
       fontStyleMapGet["slant"] = "roman";
     }
   }
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
 
-  editor.SetProperty( TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   // Check the line spacing property
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::LINE_SPACING ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::LINE_SPACING, 10.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::LINE_SPACING ), 10.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::LINE_SPACING), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::LINE_SPACING, 10.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::LINE_SPACING), 10.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check the input line spacing property
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::INPUT_LINE_SPACING ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::INPUT_LINE_SPACING, 20.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::INPUT_LINE_SPACING ), 20.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::INPUT_LINE_SPACING), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::INPUT_LINE_SPACING, 20.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::INPUT_LINE_SPACING), 20.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check the underline property
 
   Property::Map underlineMapSet;
   Property::Map underlineMapGet;
 
-  underlineMapSet.Insert( "enable", true );
-  underlineMapSet.Insert( "color", Color::RED );
-  underlineMapSet.Insert( "height", 1 );
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 5);
+  underlineMapSet.Insert("dashGap", 3);
+
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check the dashed underline property
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 5);
+  underlineMapSet.Insert("dashGap", 3);
+
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  // Check the double underline property
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
 
-  editor.SetProperty( TextEditor::Property::UNDERLINE, underlineMapSet );
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 5);
+  underlineMapSet.Insert("dashGap", 3);
+
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
 
-  underlineMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::UNDERLINE );
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet ), true, TEST_LOCATION );
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
 
   // Check the input underline property
-  editor.SetProperty( TextEditor::Property::INPUT_UNDERLINE, "Underline input properties" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::INPUT_UNDERLINE ), std::string("Underline input properties"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_UNDERLINE, "Underline input properties");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::INPUT_UNDERLINE), std::string("Underline input properties"), TEST_LOCATION);
 
   // Check the shadow property
   Property::Map shadowMapSet;
   Property::Map shadowMapGet;
 
-  shadowMapSet.Insert( "color", Color::GREEN );
-  shadowMapSet.Insert( "offset", Vector2(2.0f, 2.0f) );
-  shadowMapSet.Insert( "blurRadius", 3.0f );
+  shadowMapSet.Insert("color", Color::GREEN);
+  shadowMapSet.Insert("offset", Vector2(2.0f, 2.0f));
+  shadowMapSet.Insert("blurRadius", 3.0f);
 
-  editor.SetProperty( TextEditor::Property::SHADOW, shadowMapSet );
+  editor.SetProperty(TextEditor::Property::SHADOW, shadowMapSet);
 
-  shadowMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::SHADOW );
-  DALI_TEST_EQUALS( shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet ), true, TEST_LOCATION );
+  shadowMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::SHADOW);
+  DALI_TEST_EQUALS(shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(shadowMapGet, shadowMapSet), true, TEST_LOCATION);
 
   // Check the input shadow property
-  editor.SetProperty( TextEditor::Property::INPUT_SHADOW, "Shadow input properties" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::INPUT_SHADOW ), std::string("Shadow input properties"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_SHADOW, "Shadow input properties");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::INPUT_SHADOW), std::string("Shadow input properties"), TEST_LOCATION);
 
   // Check the emboss property
-  editor.SetProperty( TextEditor::Property::EMBOSS, "Emboss properties" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::EMBOSS ), std::string("Emboss properties"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::EMBOSS, "Emboss properties");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::EMBOSS), std::string("Emboss properties"), TEST_LOCATION);
 
   // Check the input emboss property
-  editor.SetProperty( TextEditor::Property::INPUT_EMBOSS, "Emboss input properties" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::INPUT_EMBOSS ), std::string("Emboss input properties"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_EMBOSS, "Emboss input properties");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::INPUT_EMBOSS), std::string("Emboss input properties"), TEST_LOCATION);
 
   // Check the outline property
 
   // Test string type first
   // This is purely to maintain backward compatibility, but we don't support string as the outline property type.
-  editor.SetProperty( TextEditor::Property::OUTLINE, "Outline properties" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::OUTLINE ), std::string("Outline properties"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::OUTLINE, "Outline properties");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::OUTLINE), std::string("Outline properties"), TEST_LOCATION);
 
   // Then test the property map type
   Property::Map outlineMapSet;
@@ -843,179 +1038,179 @@ int UtcDaliTextEditorSetPropertyP(void)
   outlineMapSet["color"] = Color::RED;
   outlineMapSet["width"] = 2.0f;
 
-  editor.SetProperty( TextEditor::Property::OUTLINE, outlineMapSet );
+  editor.SetProperty(TextEditor::Property::OUTLINE, outlineMapSet);
 
-  outlineMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::OUTLINE );
-  DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet ), true, TEST_LOCATION );
+  outlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::OUTLINE);
+  DALI_TEST_EQUALS(outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(outlineMapGet, outlineMapSet), true, TEST_LOCATION);
 
   // Check the input outline property
-  editor.SetProperty( TextEditor::Property::INPUT_OUTLINE, "Outline input properties" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::INPUT_OUTLINE ), std::string("Outline input properties"), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::INPUT_OUTLINE, "Outline input properties");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::INPUT_OUTLINE), std::string("Outline input properties"), TEST_LOCATION);
 
   // Check the smooth scroll property
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::SMOOTH_SCROLL ), false, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL, true );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::SMOOTH_SCROLL ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::SMOOTH_SCROLL), false, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::SMOOTH_SCROLL, true);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::SMOOTH_SCROLL), true, TEST_LOCATION);
 
   // Check the smooth scroll duration property
-  editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL_DURATION, 0.2f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SMOOTH_SCROLL_DURATION ), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::SMOOTH_SCROLL_DURATION, 0.2f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SMOOTH_SCROLL_DURATION), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check the scroll bar property
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::ENABLE_SCROLL_BAR ), false, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::ENABLE_SCROLL_BAR, true );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::ENABLE_SCROLL_BAR ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::ENABLE_SCROLL_BAR), false, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::ENABLE_SCROLL_BAR, true);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::ENABLE_SCROLL_BAR), true, TEST_LOCATION);
 
-  editor.SetProperty( TextEditor::Property::SCROLL_BAR_SHOW_DURATION, 0.3f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SCROLL_BAR_SHOW_DURATION ), 0.3f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( TextEditor::Property::SCROLL_BAR_FADE_DURATION, 0.2f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SCROLL_BAR_FADE_DURATION ), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::SCROLL_BAR_SHOW_DURATION, 0.3f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SCROLL_BAR_SHOW_DURATION), 0.3f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(TextEditor::Property::SCROLL_BAR_FADE_DURATION, 0.2f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SCROLL_BAR_FADE_DURATION), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check the pixel size of font
-  editor.SetProperty( TextEditor::Property::PIXEL_SIZE, 20.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::PIXEL_SIZE, 20.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::PIXEL_SIZE), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check placeholder text properties.
-  editor.SetProperty( DevelTextEditor::Property::PLACEHOLDER_TEXT, "Setting Placeholder Text" );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( DevelTextEditor::Property::PLACEHOLDER_TEXT ), std::string("Setting Placeholder Text"), TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::PLACEHOLDER_TEXT, "Setting Placeholder Text");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(DevelTextEditor::Property::PLACEHOLDER_TEXT), std::string("Setting Placeholder Text"), TEST_LOCATION);
 
   // Check placeholder text's color property.
-  editor.SetProperty( DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR, Color::RED );
-  DALI_TEST_EQUALS( editor.GetProperty<Vector4>( DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR ), Color::RED, TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR, Color::RED);
+  DALI_TEST_EQUALS(editor.GetProperty<Vector4>(DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR), Color::RED, TEST_LOCATION);
 
   // Check the enable selection property
-  editor.SetProperty( TextEditor::Property::ENABLE_SELECTION, false );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::ENABLE_SELECTION ), false, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::ENABLE_SELECTION, false);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::ENABLE_SELECTION), false, TEST_LOCATION);
 
   // Check the placeholder property with pixel size
   Property::Map placeholderPixelSizeMapSet;
   Property::Map placeholderPixelSizeMapGet;
   Property::Map placeholderFontstyleMap;
-  placeholderPixelSizeMapSet["text"] = "Setting Placeholder Text";
+  placeholderPixelSizeMapSet["text"]        = "Setting Placeholder Text";
   placeholderPixelSizeMapSet["textFocused"] = "Setting Placeholder Text Focused";
-  placeholderPixelSizeMapSet["color"] = Color::BLUE;
-  placeholderPixelSizeMapSet["fontFamily"] = "Arial";
-  placeholderPixelSizeMapSet["pixelSize"] = 15.0f;
+  placeholderPixelSizeMapSet["color"]       = Color::BLUE;
+  placeholderPixelSizeMapSet["fontFamily"]  = "Arial";
+  placeholderPixelSizeMapSet["pixelSize"]   = 15.0f;
 
-  placeholderFontstyleMap.Insert( "weight", "bold" );
+  placeholderFontstyleMap.Insert("weight", "bold");
   placeholderPixelSizeMapSet["fontStyle"] = placeholderFontstyleMap;
-  editor.SetProperty( TextEditor::Property::PLACEHOLDER, placeholderPixelSizeMapSet );
+  editor.SetProperty(TextEditor::Property::PLACEHOLDER, placeholderPixelSizeMapSet);
 
-  placeholderPixelSizeMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderPixelSizeMapGet.Count(), placeholderPixelSizeMapSet.Count(), TEST_LOCATION );
+  placeholderPixelSizeMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderPixelSizeMapGet.Count(), placeholderPixelSizeMapSet.Count(), TEST_LOCATION);
 
   tet_infoline("Test Placeholder settings set as strings is converted correctly to Property Index key and holds set value");
   Property::Map placeholderConversionMap;
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT ] = placeholderPixelSizeMapSet["text"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = placeholderPixelSizeMapSet["textFocused"] ;
-  placeholderConversionMap[ Text::PlaceHolder::Property::COLOR ] = placeholderPixelSizeMapSet["color"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderPixelSizeMapSet["fontStyle"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_FAMILY ] = placeholderPixelSizeMapSet["fontFamily"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::PIXEL_SIZE ] = placeholderPixelSizeMapSet["pixelSize"];
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT]         = placeholderPixelSizeMapSet["text"];
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT_FOCUSED] = placeholderPixelSizeMapSet["textFocused"];
+  placeholderConversionMap[Text::PlaceHolder::Property::COLOR]        = placeholderPixelSizeMapSet["color"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE]   = placeholderPixelSizeMapSet["fontStyle"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_FAMILY]  = placeholderPixelSizeMapSet["fontFamily"];
+  placeholderConversionMap[Text::PlaceHolder::Property::PIXEL_SIZE]   = placeholderPixelSizeMapSet["pixelSize"];
 
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderPixelSizeMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderPixelSizeMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
   // Check the placeholder property with point size
   Property::Map placeholderMapSet;
   Property::Map placeholderMapGet;
-  placeholderMapSet["text"] = "Setting Placeholder Text";
+  placeholderMapSet["text"]        = "Setting Placeholder Text";
   placeholderMapSet["textFocused"] = "Setting Placeholder Text Focused";
-  placeholderMapSet["color"] = Color::RED;
-  placeholderMapSet["fontFamily"] = "Arial";
-  placeholderMapSet["pointSize"] = 12.0f;
+  placeholderMapSet["color"]       = Color::RED;
+  placeholderMapSet["fontFamily"]  = "Arial";
+  placeholderMapSet["pointSize"]   = 12.0f;
   // Check the placeholder font style property
   placeholderFontstyleMap.Clear();
 
-  placeholderFontstyleMap.Insert( "weight", "bold" );
-  placeholderFontstyleMap.Insert( "width", "condensed" );
-  placeholderFontstyleMap.Insert( "slant", "italic" );
+  placeholderFontstyleMap.Insert("weight", "bold");
+  placeholderFontstyleMap.Insert("width", "condensed");
+  placeholderFontstyleMap.Insert("slant", "italic");
   placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
-  editor.SetProperty( TextEditor::Property::PLACEHOLDER, placeholderMapSet );
+  editor.SetProperty(TextEditor::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
+  placeholderMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
 
   tet_infoline("Test Placeholder settings set as strings is converted correctly to Property Index key and holds set value");
   placeholderConversionMap.Clear();
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT ] = placeholderMapSet["text"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = placeholderMapSet["textFocused"] ;
-  placeholderConversionMap[ Text::PlaceHolder::Property::COLOR ] = placeholderMapSet["color"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderPixelSizeMapSet["fontStyle"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_FAMILY ] = placeholderMapSet["fontFamily"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::POINT_SIZE ] = placeholderMapSet["pointSize"];
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT]         = placeholderMapSet["text"];
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT_FOCUSED] = placeholderMapSet["textFocused"];
+  placeholderConversionMap[Text::PlaceHolder::Property::COLOR]        = placeholderMapSet["color"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE]   = placeholderPixelSizeMapSet["fontStyle"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_FAMILY]  = placeholderMapSet["fontFamily"];
+  placeholderConversionMap[Text::PlaceHolder::Property::POINT_SIZE]   = placeholderMapSet["pointSize"];
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
   // Reset font style.
   placeholderFontstyleMap.Clear();
-  placeholderFontstyleMap.Insert( "weight", "normal" );
-  placeholderFontstyleMap.Insert( "slant", "oblique" );
+  placeholderFontstyleMap.Insert("weight", "normal");
+  placeholderFontstyleMap.Insert("slant", "oblique");
   placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
-  editor.SetProperty( TextEditor::Property::PLACEHOLDER, placeholderMapSet );
+  editor.SetProperty(TextEditor::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderMapSet["fontStyle"];
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  placeholderMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE] = placeholderMapSet["fontStyle"];
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
   placeholderFontstyleMap.Clear();
-  placeholderFontstyleMap.Insert( "slant", "roman" );
+  placeholderFontstyleMap.Insert("slant", "roman");
   placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
-  editor.SetProperty( TextEditor::Property::PLACEHOLDER, placeholderMapSet );
+  editor.SetProperty(TextEditor::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::PLACEHOLDER );
+  placeholderMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::PLACEHOLDER);
 
   placeholderFontstyleMap.Clear();
   placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
 
-  editor.SetProperty( TextEditor::Property::PLACEHOLDER, placeholderMapSet );
-  placeholderMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderMapSet["fontStyle"];
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::PLACEHOLDER, placeholderMapSet);
+  placeholderMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE] = placeholderMapSet["fontStyle"];
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
-  editor.SetProperty( Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT );
-  DALI_TEST_EQUALS( editor.GetProperty<int>( Actor::Property::LAYOUT_DIRECTION ), static_cast<int>( LayoutDirection::RIGHT_TO_LEFT ), TEST_LOCATION );
+  editor.SetProperty(Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT);
+  DALI_TEST_EQUALS(editor.GetProperty<int>(Actor::Property::LAYOUT_DIRECTION), static_cast<int>(LayoutDirection::RIGHT_TO_LEFT), TEST_LOCATION);
 
   // Check handle color
-  editor.SetProperty( DevelTextEditor::Property::GRAB_HANDLE_COLOR, Color::GREEN );
-  DALI_TEST_EQUALS( editor.GetProperty<Vector4>( DevelTextEditor::Property::GRAB_HANDLE_COLOR ), Color::GREEN, TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::GRAB_HANDLE_COLOR, Color::GREEN);
+  DALI_TEST_EQUALS(editor.GetProperty<Vector4>(DevelTextEditor::Property::GRAB_HANDLE_COLOR), Color::GREEN, TEST_LOCATION);
 
   // Test the ENABLE_GRAB_HANDLE_POPUP property
-  editor.SetProperty( DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP, false );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP ), false, TEST_LOCATION);
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP, false);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP), false, TEST_LOCATION);
 
   // Check the input method setting
-  Property::Map propertyMap;
-  InputMethod::PanelLayout::Type panelLayout = InputMethod::PanelLayout::NUMBER;
-  InputMethod::AutoCapital::Type autoCapital = InputMethod::AutoCapital::WORD;
-  InputMethod::ButtonAction::Type buttonAction = InputMethod::ButtonAction::GO;
-  int inputVariation = 1;
-  propertyMap["PANEL_LAYOUT"] = panelLayout;
-  propertyMap["AUTO_CAPITALIZE"] = autoCapital;
-  propertyMap["BUTTON_ACTION"] = buttonAction;
-  propertyMap["VARIATION"] = inputVariation;
-  editor.SetProperty( DevelTextEditor::Property::INPUT_METHOD_SETTINGS, propertyMap );
-
-  Property::Value value = editor.GetProperty( DevelTextEditor::Property::INPUT_METHOD_SETTINGS );
-  Property::Map map;
-  DALI_TEST_CHECK( value.Get( map ) );
+  Property::Map                   propertyMap;
+  InputMethod::PanelLayout::Type  panelLayout    = InputMethod::PanelLayout::NUMBER;
+  InputMethod::AutoCapital::Type  autoCapital    = InputMethod::AutoCapital::WORD;
+  InputMethod::ButtonAction::Type buttonAction   = InputMethod::ButtonAction::GO;
+  int                             inputVariation = 1;
+  propertyMap["PANEL_LAYOUT"]                    = panelLayout;
+  propertyMap["AUTO_CAPITALIZE"]                 = autoCapital;
+  propertyMap["BUTTON_ACTION"]                   = buttonAction;
+  propertyMap["VARIATION"]                       = inputVariation;
+  editor.SetProperty(DevelTextEditor::Property::INPUT_METHOD_SETTINGS, propertyMap);
+
+  Property::Value value = editor.GetProperty(DevelTextEditor::Property::INPUT_METHOD_SETTINGS);
+  Property::Map   map;
+  DALI_TEST_CHECK(value.Get(map));
 
   int layout = 0;
-  DALI_TEST_CHECK( map[ "PANEL_LAYOUT" ].Get( layout ) );
-  DALI_TEST_EQUALS( static_cast<int>(panelLayout), layout, TEST_LOCATION );
+  DALI_TEST_CHECK(map["PANEL_LAYOUT"].Get(layout));
+  DALI_TEST_EQUALS(static_cast<int>(panelLayout), layout, TEST_LOCATION);
 
   int capital = 0;
-  DALI_TEST_CHECK( map[ "AUTO_CAPITALIZE" ].Get( capital ) );
-  DALI_TEST_EQUALS( static_cast<int>(autoCapital), capital, TEST_LOCATION );
+  DALI_TEST_CHECK(map["AUTO_CAPITALIZE"].Get(capital));
+  DALI_TEST_EQUALS(static_cast<int>(autoCapital), capital, TEST_LOCATION);
 
   int action = 0;
-  DALI_TEST_CHECK( map[ "BUTTON_ACTION" ].Get( action ) );
-  DALI_TEST_EQUALS( static_cast<int>(buttonAction), action, TEST_LOCATION );
+  DALI_TEST_CHECK(map["BUTTON_ACTION"].Get(action));
+  DALI_TEST_EQUALS(static_cast<int>(buttonAction), action, TEST_LOCATION);
 
   int variation = 0;
-  DALI_TEST_CHECK( map[ "VARIATION" ].Get( variation ) );
-  DALI_TEST_EQUALS( inputVariation, variation, TEST_LOCATION );
+  DALI_TEST_CHECK(map["VARIATION"].Get(variation));
+  DALI_TEST_EQUALS(inputVariation, variation, TEST_LOCATION);
 
   // Check the input filter property
   Property::Map inputFilterMapSet;
@@ -1032,13 +1227,43 @@ int UtcDaliTextEditorSetPropertyP(void)
   inputFilterMapSet.Clear();
   editor.SetProperty(DevelTextEditor::Property::INPUT_FILTER, inputFilterMapSet);
 
+  // Check the strikethrough property
+
+  Property::Map strikethroughMapSet;
+  Property::Map strikethroughMapGet;
+
+  application.SendNotification();
+  application.Render();
+
+  // Check the input strikethrough property
+
+  strikethroughMapSet.Clear();
+  strikethroughMapGet.Clear();
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::BLUE);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  editor.SetProperty(DevelTextEditor::Property::STRIKETHROUGH, strikethroughMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapGet = editor.GetProperty<Property::Map>(DevelTextEditor::Property::STRIKETHROUGH);
+
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapSet, strikethroughMapGet), true, TEST_LOCATION);
+
+  // Check the input strikethrough property
+  editor.SetProperty(DevelTextEditor::Property::INPUT_STRIKETHROUGH, "Strikethrough input properties");
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(DevelTextEditor::Property::INPUT_STRIKETHROUGH), std::string("Strikethrough input properties"), TEST_LOCATION);
+
   application.SendNotification();
   application.Render();
 
   // Check the line size property
-  DALI_TEST_EQUALS( editor.GetProperty<float>( DevelTextEditor::Property::MIN_LINE_SIZE ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  editor.SetProperty( DevelTextEditor::Property::MIN_LINE_SIZE, 50.f );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( DevelTextEditor::Property::MIN_LINE_SIZE ), 50.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<float>(DevelTextEditor::Property::MIN_LINE_SIZE), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  editor.SetProperty(DevelTextEditor::Property::MIN_LINE_SIZE, 50.f);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(DevelTextEditor::Property::MIN_LINE_SIZE), 50.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1051,22 +1276,22 @@ int utcDaliTextEditorAtlasRenderP(void)
   StyleManager styleManager = StyleManager::Get();
   styleManager.ApplyDefaultTheme();
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  editor.SetProperty( TextEditor::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+  editor.SetProperty(TextEditor::Property::HORIZONTAL_ALIGNMENT, "CENTER");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   try
   {
     // Render some text with the shared atlas backend
-    editor.SetProperty( DevelTextEditor::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS );
+    editor.SetProperty(DevelTextEditor::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS);
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -1125,40 +1350,40 @@ int utcDaliTextEditorTextChangedP(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextEditorTextChangedP");
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
-  editor.TextChangedSignal().Connect( &TestTextChangedCallback );
+  editor.TextChangedSignal().Connect(&TestTextChangedCallback);
   bool textChangedSignal = false;
-  editor.ConnectSignal( testTracker, "textChanged",   CallbackFunctor(&textChangedSignal) );
+  editor.ConnectSignal(testTracker, "textChanged", CallbackFunctor(&textChangedSignal));
 
   gTextChangedCallBackCalled = false;
-  editor.SetProperty( TextEditor::Property::TEXT, "ABC" );
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_CHECK( textChangedSignal );
+  editor.SetProperty(TextEditor::Property::TEXT, "ABC");
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_CHECK(textChangedSignal);
 
   application.SendNotification();
   editor.SetKeyInputFocus();
 
   gTextChangedCallBackCalled = false;
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
 
   // Remove all text
-  editor.SetProperty( TextField::Property::TEXT, "" );
+  editor.SetProperty(TextField::Property::TEXT, "");
 
   // Pressing backspace key: TextChangedCallback should not be called when there is no text in texteditor.
   gTextChangedCallBackCalled = false;
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
   // Pressing delete key: TextChangedCallback should not be called when there is no text in texteditor.
   gTextChangedCallBackCalled = false;
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
   END_TEST;
 }
@@ -1168,73 +1393,70 @@ int utcDaliTextEditorTextChangedWithInputMethodContext(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextEditorTextChangedWithInputMethodContext");
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   editor.TextChangedSignal().Connect(&TestTextChangedCallback);
   bool textChangedSignal = false;
-  editor.ConnectSignal( testTracker, "textChanged",   CallbackFunctor(&textChangedSignal) );
-
+  editor.ConnectSignal(testTracker, "textChanged", CallbackFunctor(&textChangedSignal));
 
   // get InputMethodContext
-  std::string text;
+  std::string                   text;
   InputMethodContext::EventData imfEvent;
-  InputMethodContext inputMethodContext = DevelTextEditor::GetInputMethodContext( editor );
+  InputMethodContext            inputMethodContext = DevelTextEditor::GetInputMethodContext(editor);
 
   editor.SetKeyInputFocus();
-  editor.SetProperty( DevelTextEditor::Property::ENABLE_EDITING, true );
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_EDITING, true);
 
   // input text
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "ㅎ", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "ㅎ", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("ㅎ"), TEST_LOCATION );
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("ㅎ"), TEST_LOCATION);
 
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "호", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "호", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("호"), TEST_LOCATION );
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("호"), TEST_LOCATION);
 
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "혿", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "혿", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("혿"), TEST_LOCATION );
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("혿"), TEST_LOCATION);
 
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "호", 0, 1 );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::COMMIT, "호", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "두", 1, 2 );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "두", 1, 2);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("호두"), TEST_LOCATION );
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("호두"), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int utcDaliTextEditorInputStyleChanged01(void)
 {
   // The text-editor emits signals when the input style changes. These changes of style are
@@ -1247,34 +1469,33 @@ int utcDaliTextEditorInputStyleChanged01(void)
 
   // Load some fonts.
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE);
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-
+  DALI_TEST_CHECK(editor);
 
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
-  editor.SetProperty( TextEditor::Property::ENABLE_MARKUP, true );
-  editor.SetProperty( TextEditor::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='green'>llo</color> <font weight='bold'>world</font> demo</font>" );
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='green'>llo</color> <font weight='bold'>world</font> demo</font>");
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
-  editor.InputStyleChangedSignal().Connect( &TestInputStyleChangedCallback );
+  editor.InputStyleChangedSignal().Connect(&TestInputStyleChangedCallback);
   bool inputStyleChangedSignal = false;
-  editor.ConnectSignal( testTracker, "inputStyleChanged",   CallbackFunctor(&inputStyleChangedSignal) );
+  editor.ConnectSignal(testTracker, "inputStyleChanged", CallbackFunctor(&inputStyleChangedSignal));
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   // Render and notify
   application.SendNotification();
@@ -1284,11 +1505,11 @@ int utcDaliTextEditorInputStyleChanged01(void)
   application.RunIdles();
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 18.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1297,25 +1518,25 @@ int utcDaliTextEditorInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextEditor::InputStyle::FONT_FAMILY | TextEditor::InputStyle::POINT_SIZE ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextEditor::InputStyle::FONT_FAMILY | TextEditor::InputStyle::POINT_SIZE), TEST_LOCATION);
 
-    const std::string fontFamily = editor.GetProperty( TextEditor::Property::INPUT_FONT_FAMILY ).Get<std::string>();
-    DALI_TEST_EQUALS( fontFamily, "DejaVuSerif", TEST_LOCATION );
+    const std::string fontFamily = editor.GetProperty(TextEditor::Property::INPUT_FONT_FAMILY).Get<std::string>();
+    DALI_TEST_EQUALS(fontFamily, "DejaVuSerif", TEST_LOCATION);
 
-    const float pointSize = editor.GetProperty( TextEditor::Property::INPUT_POINT_SIZE ).Get<float>();
-    DALI_TEST_EQUALS( pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+    const float pointSize = editor.GetProperty(TextEditor::Property::INPUT_POINT_SIZE).Get<float>();
+    DALI_TEST_EQUALS(pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 30.0f, 25.0f );
+  TestGenerateTap(application, 30.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1324,15 +1545,15 @@ int utcDaliTextEditorInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 43.0f, 25.0f );
+  TestGenerateTap(application, 43.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1341,22 +1562,22 @@ int utcDaliTextEditorInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextEditor::InputStyle::COLOR ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextEditor::InputStyle::COLOR), TEST_LOCATION);
 
-    const Vector4 color = editor.GetProperty( TextEditor::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::GREEN, TEST_LOCATION );
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::GREEN, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 88.0f, 25.0f );
+  TestGenerateTap(application, 88.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1365,31 +1586,31 @@ int utcDaliTextEditorInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextEditor::InputStyle::COLOR | TextEditor::InputStyle::FONT_STYLE ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextEditor::InputStyle::COLOR | TextEditor::InputStyle::FONT_STYLE), TEST_LOCATION);
 
-    const Vector4 color = editor.GetProperty( TextEditor::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLACK, TEST_LOCATION);
 
     Property::Map fontStyleMapSet;
     Property::Map fontStyleMapGet;
 
-    fontStyleMapSet.Insert( "weight", "bold" );
+    fontStyleMapSet.Insert("weight", "bold");
 
-    fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::INPUT_FONT_STYLE );
-    DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-    DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+    fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::INPUT_FONT_STYLE);
+    DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+    DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 115.0f, 25.0f );
+  TestGenerateTap(application, 115.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1398,15 +1619,15 @@ int utcDaliTextEditorInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 164.0f, 25.0f );
+  TestGenerateTap(application, 164.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1415,26 +1636,26 @@ int utcDaliTextEditorInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextEditor::InputStyle::FONT_STYLE ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextEditor::InputStyle::FONT_STYLE), TEST_LOCATION);
 
     Property::Map fontStyleMapSet;
     Property::Map fontStyleMapGet;
 
-    fontStyleMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::INPUT_FONT_STYLE );
-    DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-    DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+    fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::INPUT_FONT_STYLE);
+    DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+    DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 191.0f, 25.0f );
+  TestGenerateTap(application, 191.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1443,8 +1664,8 @@ int utcDaliTextEditorInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   END_TEST;
 }
@@ -1461,34 +1682,33 @@ int utcDaliTextEditorInputStyleChanged02(void)
 
   // Load some fonts.
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE);
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-
+  DALI_TEST_CHECK(editor);
 
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
-  editor.SetProperty( TextEditor::Property::ENABLE_MARKUP, true );
-  editor.SetProperty( TextEditor::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='blue'> l</color><color value='green'>lo</color> <font weight='bold'>world</font> demo</font>" );
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='blue'> l</color><color value='green'>lo</color> <font weight='bold'>world</font> demo</font>");
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
-  editor.InputStyleChangedSignal().Connect( &TestInputStyleChangedCallback );
+  editor.InputStyleChangedSignal().Connect(&TestInputStyleChangedCallback);
   bool inputStyleChangedSignal = false;
-  editor.ConnectSignal( testTracker, "inputStyleChanged",   CallbackFunctor(&inputStyleChangedSignal) );
+  editor.ConnectSignal(testTracker, "inputStyleChanged", CallbackFunctor(&inputStyleChangedSignal));
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   // Render and notify
   application.SendNotification();
@@ -1498,12 +1718,12 @@ int utcDaliTextEditorInputStyleChanged02(void)
   application.RunIdles();
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 53.0f, 25.0f, 100 );
-  TestGenerateTap( application, 53.0f, 25.0f, 200 );
+  TestGenerateTap(application, 53.0f, 25.0f, 100);
+  TestGenerateTap(application, 53.0f, 25.0f, 200);
 
   // Render and notify
   application.SendNotification();
@@ -1512,31 +1732,31 @@ int utcDaliTextEditorInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextEditor::InputStyle::FONT_FAMILY |
-                                                 TextEditor::InputStyle::POINT_SIZE  |
-                                                 TextEditor::InputStyle::COLOR ),
-                      TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextEditor::InputStyle::FONT_FAMILY |
+                                               TextEditor::InputStyle::POINT_SIZE |
+                                               TextEditor::InputStyle::COLOR),
+                     TEST_LOCATION);
 
-    const Vector4 color = editor.GetProperty( TextEditor::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::GREEN, TEST_LOCATION );
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::GREEN, TEST_LOCATION);
 
-    const std::string fontFamily = editor.GetProperty( TextEditor::Property::INPUT_FONT_FAMILY ).Get<std::string>();
-    DALI_TEST_EQUALS( fontFamily, "DejaVuSerif", TEST_LOCATION );
+    const std::string fontFamily = editor.GetProperty(TextEditor::Property::INPUT_FONT_FAMILY).Get<std::string>();
+    DALI_TEST_EQUALS(fontFamily, "DejaVuSerif", TEST_LOCATION);
 
-    const float pointSize = editor.GetProperty( TextEditor::Property::INPUT_POINT_SIZE ).Get<float>();
-    DALI_TEST_EQUALS( pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+    const float pointSize = editor.GetProperty(TextEditor::Property::INPUT_POINT_SIZE).Get<float>();
+    DALI_TEST_EQUALS(pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -1545,23 +1765,23 @@ int utcDaliTextEditorInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextEditor::InputStyle::COLOR ),
-                      TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextEditor::InputStyle::COLOR),
+                     TEST_LOCATION);
 
-    const Vector4 color = editor.GetProperty( TextEditor::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLUE, TEST_LOCATION );
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLUE, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -1570,14 +1790,14 @@ int utcDaliTextEditorInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -1586,39 +1806,40 @@ int utcDaliTextEditorInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextEditor::InputStyle::COLOR ),
-                      TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextEditor::InputStyle::COLOR),
+                     TEST_LOCATION);
 
-    const Vector4 color = editor.GetProperty( TextEditor::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLACK, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  editor.SetProperty( TextEditor::Property::INPUT_COLOR, Color::YELLOW );
+  editor.SetProperty(TextEditor::Property::INPUT_COLOR, Color::YELLOW);
 
   Property::Map fontStyleMapSet;
-  fontStyleMapSet.Insert( "weight", "thin" );
-  fontStyleMapSet.Insert( "width", "condensed" );
-  fontStyleMapSet.Insert( "slant", "italic" );
+  fontStyleMapSet.Insert("weight", "thin");
+  fontStyleMapSet.Insert("width", "condensed");
+  fontStyleMapSet.Insert("slant", "italic");
 
-  editor.SetProperty( TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  editor.SetProperty( TextEditor::Property::INPUT_POINT_SIZE, 20.f );
-  editor.SetProperty( TextEditor::Property::INPUT_LINE_SPACING, 5.f );
+  editor.SetProperty(TextEditor::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  editor.SetProperty(TextEditor::Property::INPUT_POINT_SIZE, 20.f);
+  editor.SetProperty(TextEditor::Property::INPUT_LINE_SPACING, 5.f);
 
-  editor.SetProperty( TextEditor::Property::INPUT_UNDERLINE, "underline" );
-  editor.SetProperty( TextEditor::Property::INPUT_SHADOW, "shadow" );
-  editor.SetProperty( TextEditor::Property::INPUT_EMBOSS, "emboss" );
-  editor.SetProperty( TextEditor::Property::INPUT_OUTLINE, "outline" );
+  editor.SetProperty(TextEditor::Property::INPUT_UNDERLINE, "underline");
+  editor.SetProperty(TextEditor::Property::INPUT_SHADOW, "shadow");
+  editor.SetProperty(TextEditor::Property::INPUT_EMBOSS, "emboss");
+  editor.SetProperty(TextEditor::Property::INPUT_OUTLINE, "outline");
+  editor.SetProperty(DevelTextEditor::Property::INPUT_STRIKETHROUGH, "strikethrough");
 
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -1627,11 +1848,11 @@ int utcDaliTextEditorInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 63.0f, 25.0f, 900 );
+  TestGenerateTap(application, 63.0f, 25.0f, 900);
 
   // Render and notify
   application.SendNotification();
@@ -1640,40 +1861,40 @@ int utcDaliTextEditorInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextEditor::InputStyle::COLOR |
-                                                 TextEditor::InputStyle::POINT_SIZE |
-                                                 TextEditor::InputStyle::FONT_STYLE |
-                                                 TextEditor::InputStyle::LINE_SPACING |
-                                                 TextEditor::InputStyle::UNDERLINE |
-                                                 TextEditor::InputStyle::SHADOW |
-                                                 TextEditor::InputStyle::EMBOSS |
-                                                 TextEditor::InputStyle::OUTLINE ),
-                      TEST_LOCATION );
-
-    const Vector4 color = editor.GetProperty( TextEditor::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextEditor::InputStyle::COLOR |
+                                               TextEditor::InputStyle::POINT_SIZE |
+                                               TextEditor::InputStyle::FONT_STYLE |
+                                               TextEditor::InputStyle::LINE_SPACING |
+                                               TextEditor::InputStyle::UNDERLINE |
+                                               TextEditor::InputStyle::SHADOW |
+                                               TextEditor::InputStyle::EMBOSS |
+                                               TextEditor::InputStyle::OUTLINE),
+                     TEST_LOCATION);
+
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLACK, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextEditor::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  editor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVuSerif" );
+  editor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVuSerif");
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "black" );
-  fontStyleMapSet.Insert( "width", "expanded" );
-  fontStyleMapSet.Insert( "slant", "oblique" );
+  fontStyleMapSet.Insert("weight", "black");
+  fontStyleMapSet.Insert("width", "expanded");
+  fontStyleMapSet.Insert("slant", "oblique");
 
-  editor.SetProperty( TextEditor::Property::FONT_STYLE, fontStyleMapSet );
+  editor.SetProperty(TextEditor::Property::FONT_STYLE, fontStyleMapSet);
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 30.0f, 25.0f, 1500 );
+  TestGenerateTap(application, 30.0f, 25.0f, 1500);
 
   // Render and notify
   application.SendNotification();
@@ -1682,261 +1903,462 @@ int utcDaliTextEditorInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextEditor::InputStyle::COLOR |
-                                                 TextEditor::InputStyle::POINT_SIZE |
-                                                 TextEditor::InputStyle::FONT_STYLE ),
-                      TEST_LOCATION );
-
-    const Vector4 color = editor.GetProperty( TextEditor::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::YELLOW, TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextEditor::InputStyle::COLOR |
+                                               TextEditor::InputStyle::POINT_SIZE |
+                                               TextEditor::InputStyle::FONT_STYLE),
+                     TEST_LOCATION);
+
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::YELLOW, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   END_TEST;
 }
 
-int utcDaliTextEditorEvent01(void)
+int utcDaliTextEditorInputStyleChanged03(void)
 {
+  // Test InputStyleCahnged signal emitted even if AddIdle failed.
   ToolkitTestApplication application;
-  tet_infoline(" utcDaliTextEditorEvent01");
+  tet_infoline(" utcDaliTextEditorInputStyleChanged03");
 
-  // Creates a tap event. After creating a tap event the text editor should
-  // have the focus and add text with key events should be possible.
+  // Load some fonts.
 
-  TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  application.GetScene().Add( editor );
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.SetDpi(93u, 93u);
 
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE);
 
-  // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
 
-  // Render and notify
-  application.SendNotification();
-  application.Render();
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
-  // Add a key event but as the text editor has not the focus it should do nothing.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='green'>llo</color> <font weight='bold'>world</font> demo</font>");
+
+  // connect to the text changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  editor.InputStyleChangedSignal().Connect(&TestInputStyleChangedCallback);
+  bool inputStyleChangedSignal = false;
+  editor.ConnectSignal(testTracker, "inputStyleChanged", CallbackFunctor(&inputStyleChangedSignal));
+
+  application.GetScene().Add(editor);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string(""), TEST_LOCATION );
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Now the text editor has the focus, so it can handle the key events.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
 
-  // Render and notify
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
+  {
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextEditor::InputStyle::FONT_FAMILY | TextEditor::InputStyle::POINT_SIZE), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("aa"), TEST_LOCATION );
+    const std::string fontFamily = editor.GetProperty(TextEditor::Property::INPUT_FONT_FAMILY).Get<std::string>();
+    DALI_TEST_EQUALS(fontFamily, "DejaVuSerif", TEST_LOCATION);
 
-  // Create a second text editor and send key events to it.
-  TextEditor editor2 = TextEditor::New();
+    const float pointSize = editor.GetProperty(TextEditor::Property::INPUT_POINT_SIZE).Get<float>();
+    DALI_TEST_EQUALS(pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
-  editor2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor2.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  editor2.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  editor2.SetProperty( Actor::Property::POSITION, Vector2( 100.f, 100.f ));
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.GetScene().Add( editor2 );
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 30.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Create a tap event on the second text editor.
-  TestGenerateTap( application, 150.0f, 125.0f );
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
 
-  // Render and notify
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
-  // The second text editor has the focus. It should handle the key events.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 43.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Check the text has been added to the second text editor.
-  DALI_TEST_EQUALS( editor2.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("aa"), TEST_LOCATION );
-
-  END_TEST;
-}
-
-int utcDaliTextEditorEvent02(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" utcDaliTextEditorEvent02");
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
 
-  // Checks if the right number of actors are created.
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
+  {
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextEditor::InputStyle::COLOR), TEST_LOCATION);
 
-  TextEditor editor = TextEditor::New();
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  DALI_TEST_CHECK( editor );
+    const Vector4 color = editor.GetProperty(TextEditor::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::GREEN, TEST_LOCATION);
+  }
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
-  application.GetScene().Add( editor );
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  // Make AddIdle return false.
+  ToolkitApplication::ADD_IDLE_SUCCESS = false;
 
-  // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 88.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Check there are the expected number of children (the stencil).
-  DALI_TEST_EQUALS( editor.GetChildCount(), 1u, TEST_LOCATION );
+  // Execute the idle callbacks.
+  // And check whether we didn't change of input style.
+  application.RunIdles();
 
-  Actor stencil = editor.GetChildAt( 0u );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 150.0f, 25.0f, 100 );
+  TestGenerateTap(application, 115.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Actor layer = editor.GetChildAt( 1u );
-  DALI_TEST_EQUALS( layer.GetChildCount(), 1u, TEST_LOCATION ); // The cursor.
-  DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION );
+  // Execute the idle callbacks.
+  // And check whether we didn't change of input style.
+  application.RunIdles();
 
-  // Now the text editor has the focus, so it can handle the key events.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Revert AddIdle return true.
+  ToolkitApplication::ADD_IDLE_SUCCESS = true;
+
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 164.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Checks the cursor and the renderer have been created.
-  DALI_TEST_EQUALS( layer.GetChildCount(), 1u, TEST_LOCATION ); // The cursor.
-  DALI_TEST_EQUALS( stencil.GetChildCount(), 1u, TEST_LOCATION ); // The renderer
-
-  Control cursor = Control::DownCast( layer.GetChildAt( 0u ) );
-  DALI_TEST_CHECK( cursor );
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
 
-  // The stencil actor has a container with all the actors which contain the text renderers.
-  Actor container = stencil.GetChildAt( 0u );
-  for( unsigned int index = 0; index < container.GetChildCount(); ++index )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    Renderer renderer = container.GetChildAt( index ).GetRendererAt( 0u );
-    DALI_TEST_CHECK( renderer );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextEditor::InputStyle::FONT_STYLE), TEST_LOCATION);
+
+    Property::Map fontStyleMapSet;
+    Property::Map fontStyleMapGet;
+
+    fontStyleMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::INPUT_FONT_STYLE);
+    DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+    DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
   }
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
-  // Move the cursor and check the position changes.
-  Vector3 position1 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextEditor::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 191.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Vector3 position2 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
 
-  DALI_TEST_CHECK( position2.x < position1.x );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  END_TEST;
+}
 
-  // Render and notify
-  application.SendNotification();
-  application.Render();
+int utcDaliTextEditorEvent01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorEvent01");
 
-  Vector3 position3 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  // Creates a tap event. After creating a tap event the text editor should
+  // have the focus and add text with key events should be possible.
 
-  DALI_TEST_EQUALS( position1, position3, TEST_LOCATION ); // Should be in the same position1.
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
 
-  // Send some taps and check the cursor positions.
+  application.GetScene().Add(editor);
 
-  // Try to tap at the beginning.
-  TestGenerateTap( application, 1.0f, 25.0f, 700 );
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Cursor position should be the same than position1.
-  Vector3 position4 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
-
-  DALI_TEST_EQUALS( position2, position4, TEST_LOCATION ); // Should be in the same position2.
-
-  // Tap away from the start position.
-  TestGenerateTap( application, 16.0f, 25.0f, 1400 );
+  // Add a key event but as the text editor has not the focus it should do nothing.
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Vector3 position5 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::TEXT), std::string(""), TEST_LOCATION);
 
-  DALI_TEST_CHECK( position5.x > position4.x );
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 150.0f, 25.0f);
 
-  // Remove all the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  editor.SetProperty( TextEditor::Property::TEXT, "" );
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Now the text editor has the focus, so it can handle the key events.
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Cursor position should be the same than position2.
-  Vector3 position6 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("aa"), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( position2, position6, TEST_LOCATION );// Should be in the same position2.
+  // Create a second text editor and send key events to it.
+  TextEditor editor2 = TextEditor::New();
 
-  // Should not be a renderer.
-  DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION );
+  editor2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor2.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  editor2.SetProperty(Actor::Property::POSITION, Vector2(100.f, 100.f));
 
-  END_TEST;
-}
+  application.GetScene().Add(editor2);
 
-int utcDaliTextEditorEvent03(void)
-{
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Create a tap event on the second text editor.
+  TestGenerateTap(application, 150.0f, 125.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // The second text editor has the focus. It should handle the key events.
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Check the text has been added to the second text editor.
+  DALI_TEST_EQUALS(editor2.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("aa"), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorEvent02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorEvent02");
+
+  // Checks if the right number of actors are created.
+
+  TextEditor editor = TextEditor::New();
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Check there are the expected number of children (the stencil).
+  DALI_TEST_EQUALS(editor.GetChildCount(), 1u, TEST_LOCATION);
+
+  Actor stencil = editor.GetChildAt(0u);
+
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 150.0f, 25.0f, 100);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  Actor layer = editor.GetChildAt(2u);
+  DALI_TEST_EQUALS(layer.GetChildCount(), 1u, TEST_LOCATION); // The cursor.
+  DALI_TEST_EQUALS(stencil.GetChildCount(), 0u, TEST_LOCATION);
+
+  // Now the text editor has the focus, so it can handle the key events.
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Checks the cursor and the renderer have been created.
+  DALI_TEST_EQUALS(layer.GetChildCount(), 1u, TEST_LOCATION);   // The cursor.
+  DALI_TEST_EQUALS(stencil.GetChildCount(), 2u, TEST_LOCATION); // The renderer, clipped cursor
+
+  Control cursor = Control::DownCast(layer.GetChildAt(0u));
+  DALI_TEST_CHECK(cursor);
+
+  // The stencil actor has a container with all the actors which contain the text renderers.
+  Actor container = stencil.GetChildAt(0u);
+  for(unsigned int index = 0; index < container.GetChildCount(); ++index)
+  {
+    Renderer renderer = container.GetChildAt(index).GetRendererAt(0u);
+    DALI_TEST_CHECK(renderer);
+  }
+
+  // Move the cursor and check the position changes.
+  Vector3 position1 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  Vector3 position2 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+
+  DALI_TEST_CHECK(position2.x < position1.x);
+
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  Vector3 position3 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+
+  DALI_TEST_EQUALS(position1, position3, TEST_LOCATION); // Should be in the same position1.
+
+  // Send some taps and check the cursor positions.
+
+  // Try to tap at the beginning.
+  TestGenerateTap(application, 1.0f, 25.0f, 700);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Cursor position should be the same than position1.
+  Vector3 position4 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+
+  DALI_TEST_EQUALS(position2, position4, TEST_LOCATION); // Should be in the same position2.
+
+  // Tap away from the start position.
+  TestGenerateTap(application, 16.0f, 25.0f, 1400);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  Vector3 position5 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+
+  DALI_TEST_CHECK(position5.x > position4.x);
+
+  // Remove all the text.
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  editor.SetProperty(TextEditor::Property::TEXT, "");
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Cursor position should be the same than position2.
+  Vector3 position6 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+
+  DALI_TEST_EQUALS(position2, position6, TEST_LOCATION); // Should be in the same position2.
+
+  // Should not be a renderer, there is only a clipped cursor.
+  DALI_TEST_EQUALS(stencil.GetChildCount(), 1u, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorEvent03(void)
+{
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextEditorEvent03");
 
   // Checks if the highlight actor is created.
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::TEXT, "This is a long text for the size of the text-editor." );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 30.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "This is a long text for the size of the text-editor.");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(30.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
@@ -1945,7 +2367,7 @@ int utcDaliTextEditorEvent03(void)
   // Send some taps and check text controller with clipboard window
   Dali::Clipboard clipboard = Clipboard::Get();
   clipboard.ShowClipboard();
-  TestGenerateTap( application, 3.0f, 25.0f, 100 );
+  TestGenerateTap(application, 3.0f, 25.0f, 100);
   clipboard.HideClipboard();
 
   // Render and notify
@@ -1953,51 +2375,51 @@ int utcDaliTextEditorEvent03(void)
   application.Render();
 
   // Tap first to get the focus.
-  TestGenerateTap( application, 3.0f, 25.0f, 1000 );
+  TestGenerateTap(application, 3.0f, 25.0f, 1000);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Double tap to select a word.
-  TestGenerateTap( application, 3.0f, 25.0f, 1100 );
+  TestGenerateTap(application, 3.0f, 25.0f, 1100);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // The stencil actor should have two actors: the renderer and the highlight actor.
-  Actor stencil = editor.GetChildAt( 0u );
+  Actor stencil = editor.GetChildAt(0u);
 
   // Highlight needs to be drawn before text, so should come first in child order
-  Renderer highlight = stencil.GetChildAt( 0u ).GetRendererAt( 0u );
-  DALI_TEST_CHECK( highlight );
+  Renderer highlight = stencil.GetChildAt(0u).GetRendererAt(0u);
+  DALI_TEST_CHECK(highlight);
 
   // The stencil actor has a container with all the actors which contain the text renderers.
-  Actor container = stencil.GetChildAt( 1u );
-  for( unsigned int index = 0; index < container.GetChildCount(); ++index )
+  Actor container = stencil.GetChildAt(1u);
+  for(unsigned int index = 0; index < container.GetChildCount(); ++index)
   {
-    Renderer renderer = container.GetChildAt( index ).GetRendererAt( 0u );
-    DALI_TEST_CHECK( renderer );
+    Renderer renderer = container.GetChildAt(index).GetRendererAt(0u);
+    DALI_TEST_CHECK(renderer);
   }
 
   // Double tap out of bounds
-  TestGenerateTap( application, 29.0f, 25.0f, 1700 );
-  TestGenerateTap( application, 29.0f, 25.0f, 1800 );
+  TestGenerateTap(application, 29.0f, 25.0f, 1700);
+  TestGenerateTap(application, 29.0f, 25.0f, 1800);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // The stencil actor should have one actors: the renderer actor.
-  stencil = editor.GetChildAt( 0u );
+  stencil = editor.GetChildAt(0u);
 
   // The stencil actor has a container with all the actors which contain the text renderers.
-  container = stencil.GetChildAt( 0u );
-  for( unsigned int index = 0; index < container.GetChildCount(); ++index )
+  container = stencil.GetChildAt(0u);
+  for(unsigned int index = 0; index < container.GetChildCount(); ++index)
   {
-    Renderer renderer = container.GetChildAt( index ).GetRendererAt( 0u );
-    DALI_TEST_CHECK( renderer );
+    Renderer renderer = container.GetChildAt(index).GetRendererAt(0u);
+    DALI_TEST_CHECK(renderer);
   }
 
   // Long Press
@@ -2025,42 +2447,42 @@ int utcDaliTextEditorEvent04(void)
   // Checks if the highlight actor is created.
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworl" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworl");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move at the end of the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  for( unsigned int index = 0u; index < 10u; ++index )
+  for(unsigned int index = 0u; index < 10u; ++index)
   {
-    application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-    application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+    application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+    application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
     // Render and notify
     application.SendNotification();
@@ -2068,26 +2490,26 @@ int utcDaliTextEditorEvent04(void)
   }
 
   // Add a character
-  application.ProcessEvent( GenerateKey( "d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "Hello\nworld", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello\nworld", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Add some key events
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  for( unsigned int index = 0u; index < 10u; ++index )
+  for(unsigned int index = 0u; index < 10u; ++index)
   {
-    application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-    application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+    application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+    application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
     // Render and notify
     application.SendNotification();
@@ -2095,13 +2517,13 @@ int utcDaliTextEditorEvent04(void)
   }
 
   // Add a character
-  application.ProcessEvent( GenerateKey( " ", "", " ", KEY_WHITE_SPACE_CODE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey(" ", "", " ", KEY_WHITE_SPACE_CODE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( " Hello\nworld", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS(" Hello\nworld", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2114,76 +2536,76 @@ int utcDaliTextEditorEvent05(void)
   // Checks if the highlight actor is created.
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworl" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 50.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL, true );
-  editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL_DURATION, 0.2f );
-  editor.SetProperty( TextEditor::Property::ENABLE_SCROLL_BAR, true );
-  editor.SetProperty( TextEditor::Property::SCROLL_BAR_SHOW_DURATION, 0.3f );
-  editor.SetProperty( TextEditor::Property::SCROLL_BAR_FADE_DURATION, 0.2f );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworl");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(50.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::SMOOTH_SCROLL, true);
+  editor.SetProperty(TextEditor::Property::SMOOTH_SCROLL_DURATION, 0.2f);
+  editor.SetProperty(TextEditor::Property::ENABLE_SCROLL_BAR, true);
+  editor.SetProperty(TextEditor::Property::SCROLL_BAR_SHOW_DURATION, 0.3f);
+  editor.SetProperty(TextEditor::Property::SCROLL_BAR_FADE_DURATION, 0.2f);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move at the end of the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  for( unsigned int index = 0u; index < 10u; ++index )
+  for(unsigned int index = 0u; index < 10u; ++index)
   {
     // Add a character
-    application.ProcessEvent( GenerateKey( "d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+    application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
     // Render and notify
     application.SendNotification();
     application.Render();
   }
   // Modify duration after scroll is enabled
-  editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL_DURATION, 0.1f );
+  editor.SetProperty(TextEditor::Property::SMOOTH_SCROLL_DURATION, 0.1f);
 
   // Continuous scroll left to increase coverage
-  for( unsigned int index = 0u; index < 10u; ++index )
+  for(unsigned int index = 0u; index < 10u; ++index)
   {
-    application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+    application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
     // Render and notify
     application.SendNotification();
     application.Render();
   }
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SMOOTH_SCROLL_DURATION ), 0.1f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::SMOOTH_SCROLL ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( TextEditor::Property::ENABLE_SCROLL_BAR ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SCROLL_BAR_SHOW_DURATION ), 0.3f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  DALI_TEST_EQUALS( editor.GetProperty<float>( TextEditor::Property::SCROLL_BAR_FADE_DURATION ), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SMOOTH_SCROLL_DURATION), 0.1f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::SMOOTH_SCROLL), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(TextEditor::Property::ENABLE_SCROLL_BAR), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SCROLL_BAR_SHOW_DURATION), 0.3f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty<float>(TextEditor::Property::SCROLL_BAR_FADE_DURATION), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Press Escape to increase coverage
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( !editor.HasKeyInputFocus() );
+  DALI_TEST_CHECK(!editor.HasKeyInputFocus());
 
   END_TEST;
 }
@@ -2196,82 +2618,81 @@ int utcDaliTextEditorEvent06(void)
   // Checks if the highlight actor is created.
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworld\nHello world");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move to seconds line of the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  float layoutHeight = editor.GetHeightForWidth( 100.f );
-
+  float layoutHeight = editor.GetHeightForWidth(100.f);
 
   // Add  another script characters ( glyph height is defferent )
-  application.ProcessEvent( GenerateKey( "d", "", "ㅁ", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "ㅁ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "d", "", "ኢ", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "ኢ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("d", "", "ㅁ", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "ㅁ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("d", "", "ኢ", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "ኢ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Delete characters
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
-  DALI_TEST_EQUALS( layoutHeight, editor.GetHeightForWidth( 100.f ), TEST_LOCATION );
+  DALI_TEST_EQUALS(layoutHeight, editor.GetHeightForWidth(100.f), TEST_LOCATION);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "Hello\nworld\nHello world", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello\nworld\nHello world", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // For coverage
-  application.ProcessEvent( GenerateKey( "", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", 0, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_VOLUME_UP, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_VOLUME_UP, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_VOLUME_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_VOLUME_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
@@ -2286,155 +2707,154 @@ int utcDaliTextEditorEvent07(void)
   // Checks if the highlight actor is created.
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworld\nHello world");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move to second line of the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Cut the selected text
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "x", "", "x", KEY_X_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("x", "", "x", KEY_X_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "Hello\nld\nHello world", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello\nld\nHello world", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Select some text in the left of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN,  "",DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Copy the selected text
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move the cursor to the third line
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Paste the selected text at the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "v", "", "v", KEY_V_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "v", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("v", "", "v", KEY_V_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "v", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
-
+  DALI_TEST_EQUALS("Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Disable Shift Selection
-  editor.SetProperty( DevelTextEditor::Property::ENABLE_SHIFT_SELECTION, false );
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_SHIFT_SELECTION, false);
 
   // Test to select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Cut the selected text
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "x", "", "x", KEY_X_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("x", "", "x", KEY_X_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // The text isn't selected and not changed because of 'SetProperty( DevelTextEditor::Property::ENABLE_SHIFT_SELECTION, false )'
-  DALI_TEST_EQUALS( "Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Test to select some text in the left of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Copy the selected text
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // The text is not selected and not changed because of 'SetProperty( DevelTextEditor::Property::ENABLE_SHIFT_SELECTION, false )'
-  DALI_TEST_EQUALS( "Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Select all Text
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // replace text with "c"
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   //text is "c"
-  DALI_TEST_EQUALS( "c", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("c", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // select all text
   DevelTextEditor::SelectWholeText(editor);
@@ -2444,8 +2864,8 @@ int utcDaliTextEditorEvent07(void)
   application.Render();
 
   // Copy the selected text using logical keys
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "ؤ", "c", "ؤ", KEY_C_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("ؤ", "c", "ؤ", KEY_C_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -2459,30 +2879,30 @@ int utcDaliTextEditorEvent07(void)
   application.Render();
 
   // Paste the selected using logical keys
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "ر", "v", "ر", KEY_V_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "v", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("ر", "v", "ر", KEY_V_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "v", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   //text is "cc"
-  DALI_TEST_EQUALS( "cc", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("cc", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // select all using logical keys
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "Ø´", "a", "Ø´", KEY_A_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("Ø´", "a", "Ø´", KEY_A_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // cut text using logical keys
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "Ø¡", "x", "Ø¡", KEY_X_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("Ø¡", "x", "Ø¡", KEY_X_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   //text is ""
-  DALI_TEST_EQUALS( "", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2495,25 +2915,25 @@ int utcDaliTextEditorEvent08(void)
   // Checks if the highlight actor is released correctly.
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::TEXT, "DALi" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "DALi");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -2521,164 +2941,164 @@ int utcDaliTextEditorEvent08(void)
 
   // When the left selection handle and the right selection handle are at the same position, the highlight box should be deactivated.
   // Test to select some text in the left of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test to the left selection handle position and the right selection handle position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test to select full text in the left of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test to release the current full text selection
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test to move the current cursor position correctly
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Add a character
-  application.ProcessEvent( GenerateKey( "d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "DdALi", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("DdALi", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Test to select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test the cursor position with right arrow key
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Add a character
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "DdALci", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("DdALci", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Test to select some text in the left of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test the cursor position with left arrow key
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Add a character
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "DcdALci", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("DcdALci", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Test to select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test the cursor position with left arrow key
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Add a character
-  application.ProcessEvent( GenerateKey( "x", "", "x", KEY_X_CODE, 0, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("x", "", "x", KEY_X_CODE, 0, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "DcxdALci", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("DcxdALci", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Test to select some text in the left of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Test the cursor position with right arrow key
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Add a character
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "DcxcdALci", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("DcxcdALci", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2689,62 +3109,62 @@ int utcDaliTextEditorHandles(void)
   tet_infoline(" utcDaliTextEditorHandles");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::TEXT, "This is a long text for the size of the text-editor." );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( TextEditor::Property::GRAB_HANDLE_IMAGE, HANDLE_IMAGE_FILE_NAME );
-  editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL, true );
+  editor.SetProperty(TextEditor::Property::TEXT, "This is a long text for the size of the text-editor.");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(TextEditor::Property::GRAB_HANDLE_IMAGE, HANDLE_IMAGE_FILE_NAME);
+  editor.SetProperty(TextEditor::Property::SMOOTH_SCROLL, true);
 
-  editor.SetProperty( TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT, Property::Map{ {"filename", HANDLE_LEFT_SELECTION_FILE_NAME } } );
-  editor.SetProperty( TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT, Property::Map{ {"filename", HANDLE_LEFT_SELECTION_FILE_NAME } } );
-  editor.SetProperty( TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, Property::Map{ {"filename", HANDLE_RIGHT_SELECTION_FILE_NAME } } );
-  editor.SetProperty( TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, Property::Map{ {"filename", HANDLE_RIGHT_SELECTION_FILE_NAME } } );
+  editor.SetProperty(TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT, Property::Map{{"filename", HANDLE_LEFT_SELECTION_FILE_NAME}});
+  editor.SetProperty(TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT, Property::Map{{"filename", HANDLE_LEFT_SELECTION_FILE_NAME}});
+  editor.SetProperty(TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, Property::Map{{"filename", HANDLE_RIGHT_SELECTION_FILE_NAME}});
+  editor.SetProperty(TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, Property::Map{{"filename", HANDLE_RIGHT_SELECTION_FILE_NAME}});
 
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 30.f, 500.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(Actor::Property::SIZE, Vector2(30.f, 500.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap first to get the focus.
-  TestGenerateTap( application, 3.0f, 25.0f, 100 );
+  TestGenerateTap(application, 3.0f, 25.0f, 100);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap to create the grab handle.
-  TestGenerateTap( application, 3.0f, 25.0f, 700 );
+  TestGenerateTap(application, 3.0f, 25.0f, 700);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Get the active layer where the text's decoration is added.
-  Actor activeLayer = editor.GetChildAt( 1u );
+  Actor activeLayer = editor.GetChildAt(1u);
 
   // Get the handle's actor.
-  Actor handle = activeLayer.GetChildAt( 1u );
-  handle.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+  Actor handle = activeLayer.GetChildAt(0u);
+  handle.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Touch the grab handle to set it as pressed.
-  Vector2 touchPos( 10.0f, 50.0f );
+  Vector2                       touchPos(10.0f, 50.0f);
   Dali::Integration::TouchEvent event;
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside( touchPos ) );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDownInside(touchPos));
+  application.ProcessEvent(event);
 
   // Render and notify
   application.SendNotification();
@@ -2752,42 +3172,41 @@ int utcDaliTextEditorHandles(void)
 
   // Pan the grab handle
   uint32_t time = 100;
-  TestStartPan( application, Vector2(10.0f, 50.0f), Vector2(10.0f, 50.0f), time );
-  TestMovePan( application, Vector2(10.0f, 30.0f), time );
-  TestEndPan( application, Vector2(10.0f, 50.0f), time);
+  TestStartPan(application, Vector2(10.0f, 50.0f), Vector2(10.0f, 50.0f), time);
+  TestMovePan(application, Vector2(10.0f, 30.0f), time);
+  TestEndPan(application, Vector2(10.0f, 50.0f), time);
   application.SendNotification();
   application.Render();
 
-
   // Release the grab handle.
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside( touchPos ) );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside(touchPos));
+  application.ProcessEvent(event);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap first to get the focus.
-  TestGenerateTap( application, 3.0f, 25.0f, 1400 );
+  TestGenerateTap(application, 3.0f, 25.0f, 1400);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Double tap to select a word and create the selection handles.
-  TestGenerateTap( application, 3.0f, 25.0f, 1500 );
+  TestGenerateTap(application, 3.0f, 25.0f, 1500);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  touchPos = Vector2( 10.0f, 50.0f );
+  touchPos = Vector2(10.0f, 50.0f);
 
   // Touch the left selection handle to set it as pressed.
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside( touchPos ) );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDownInside(touchPos));
+  application.ProcessEvent(event);
 
   // Render and notify
   application.SendNotification();
@@ -2795,8 +3214,8 @@ int utcDaliTextEditorHandles(void)
 
   // Release the left selection handle.
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside( touchPos ) );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside(touchPos));
+  application.ProcessEvent(event);
 
   // Render and notify
   application.SendNotification();
@@ -2810,41 +3229,140 @@ int utcDaliTextEditorUnderPropertyStringP(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextEditorUnderPropertyStringP");
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  std::string underlineSettings1( "{\"enable\":\"true\",\"color\":\"red\",\"height\":\"1\"}" );
+  std::string underlineSettings1("{\"enable\":\"true\",\"color\":\"red\",\"height\":\"1\",\"type\":\"SOLID\",\"dashWidth\":\"2\",\"dashGap\":\"1\"}");
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::UNDERLINE, underlineSettings1 );
-  DALI_TEST_EQUALS( editor.GetProperty<std::string>( TextEditor::Property::UNDERLINE ), underlineSettings1, TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineSettings1);
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(TextEditor::Property::UNDERLINE), underlineSettings1, TEST_LOCATION);
 
   tet_infoline("Set underline settings with a map");
   // Check the input underline property
   Property::Map underlineMapSet;
   Property::Map underlineMapGet;
-  underlineMapSet.Insert( "enable", true );
-  underlineMapSet.Insert( "color", Color::BLUE );
-  underlineMapSet.Insert( "height", 2 );
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+  editor.SetProperty(TextEditor::Property::TEXT, "text");
+  underlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapSet, underlineMapGet), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  tet_infoline("Set dashed underline settings with a map");
+  // Check the input underline property
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 5);
+  underlineMapSet.Insert("dashGap", 3);
+
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+  editor.SetProperty(TextEditor::Property::TEXT, "text");
+  underlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapSet, underlineMapGet), true, TEST_LOCATION);
+
+  // Check the input underline property
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 5);
+  underlineMapSet.Insert("dashGap", 3);
+
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+  editor.SetProperty(TextEditor::Property::TEXT, "text");
+  underlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapSet, underlineMapGet), true, TEST_LOCATION);
+
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+  editor.SetProperty(TextEditor::Property::TEXT, "text");
+  underlineMapGet = editor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapSet, underlineMapGet), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
 
-  editor.SetProperty( TextEditor::Property::UNDERLINE, underlineMapSet );
-  underlineMapGet = editor.GetProperty<Property::Map>( TextEditor::Property::UNDERLINE );
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapSet, underlineMapGet ), true,  TEST_LOCATION );
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
 
   tet_infoline("Set underline settings with a string");
-  editor.SetProperty( TextEditor::Property::UNDERLINE, underlineSettings1 );
-  Property::Value value = editor.GetProperty( TextEditor::Property::UNDERLINE );
-  std::string result;
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineSettings1);
+  Property::Value value = editor.GetProperty(TextEditor::Property::UNDERLINE);
+  std::string     result;
   value.Get(result);
-  DALI_TEST_EQUALS( result , underlineSettings1, TEST_LOCATION  );
+  DALI_TEST_EQUALS(result, underlineSettings1, TEST_LOCATION);
 
   tet_infoline("Trying to set invalid underline settings, should not update and stay at previous settings");
-  std::string underlineSettingsVoid( "{\"enable\":\"true\",\"coooolor\":\"blue\",\"heeeight\":\"4\"}" );
-  editor.SetProperty( TextEditor::Property::UNDERLINE, underlineSettingsVoid );
-  value = editor.GetProperty( TextEditor::Property::UNDERLINE );
+  std::string underlineSettingsVoid("{\"enable\":\"true\",\"coooolor\":\"blue\",\"heeeight\":\"4\"}");
+  editor.SetProperty(TextEditor::Property::UNDERLINE, underlineSettingsVoid);
+  value = editor.GetProperty(TextEditor::Property::UNDERLINE);
+  value.Get(result);
+  DALI_TEST_EQUALS(result, underlineSettings1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorStrikethroughPropertyStringP(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorStrikethroughPropertyStringP");
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  std::string strikethroughSettings1("{\"enable\":\"true\",\"color\":\"red\",\"height\":\"2\"}");
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(DevelTextEditor::Property::STRIKETHROUGH, strikethroughSettings1);
+  DALI_TEST_EQUALS(editor.GetProperty<std::string>(DevelTextEditor::Property::STRIKETHROUGH), strikethroughSettings1, TEST_LOCATION);
+
+  tet_infoline("Set strikethrough settings with a map");
+  // Check the input strikethrough property
+  Property::Map strikethroughMapSet;
+  Property::Map strikethroughMapGet;
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::BLUE);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  editor.SetProperty(DevelTextEditor::Property::STRIKETHROUGH, strikethroughMapSet);
+  strikethroughMapGet = editor.GetProperty<Property::Map>(DevelTextEditor::Property::STRIKETHROUGH);
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapSet, strikethroughMapGet), true, TEST_LOCATION);
+
+  tet_infoline("Set strikethrough settings with a string");
+  editor.SetProperty(DevelTextEditor::Property::STRIKETHROUGH, strikethroughSettings1);
+  Property::Value value = editor.GetProperty(DevelTextEditor::Property::STRIKETHROUGH);
+  std::string     result;
+  value.Get(result);
+  DALI_TEST_EQUALS(result, strikethroughSettings1, TEST_LOCATION);
+
+  tet_infoline("Trying to set invalid strikethrough settings, should not update and stay at previous settings");
+  std::string strikethroughSettingsVoid("{\"enable\":\"true\",\"coooolor\":\"blue\",\"height\":\"2\"}");
+  editor.SetProperty(DevelTextEditor::Property::STRIKETHROUGH, strikethroughSettingsVoid);
+  value = editor.GetProperty(TextEditor::Property::UNDERLINE);
   value.Get(result);
-  DALI_TEST_EQUALS( result , underlineSettings1, TEST_LOCATION  );
+  DALI_TEST_EQUALS(result, strikethroughSettings1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2852,21 +3370,21 @@ int utcDaliTextEditorUnderPropertyStringP(void)
 int utcDaliTextEditorShadowPropertyStringP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" utcDaliTextEditorUnderPropertyStringP Setting Shadow propeties by string");
+  tet_infoline(" utcDaliTextEditorShadowPropertyStringP Setting Shadow propeties by string");
 
   TextEditor editor = TextEditor::New();
 
-  std::string shadowSettings( "{\"color\":\"green\",\"offset\":\"2 2\",\"blurRadius\":\"0\"}" );
+  std::string shadowSettings("{\"color\":\"green\",\"offset\":\"2 2\",\"blurRadius\":\"0\"}");
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::SHADOW, "{\"color\":\"green\",\"offset\":\"2 2\",\"blurRadius\":\"0\"}" );
+  editor.SetProperty(TextEditor::Property::SHADOW, "{\"color\":\"green\",\"offset\":\"2 2\",\"blurRadius\":\"0\"}");
 
-  Property::Value value = editor.GetProperty<std::string>( TextEditor::Property::SHADOW );
-  std::string result;
+  Property::Value value = editor.GetProperty<std::string>(TextEditor::Property::SHADOW);
+  std::string     result;
   value.Get(result);
 
-  DALI_TEST_EQUALS( result, shadowSettings, TEST_LOCATION );
+  DALI_TEST_EQUALS(result, shadowSettings, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2878,17 +3396,17 @@ int utcDaliTextEditorFontStylePropertyStringP(void)
 
   TextEditor editor = TextEditor::New();
 
-  std::string fontStyleSettings( "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}" );
+  std::string fontStyleSettings("{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}");
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::FONT_STYLE, "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}" );
+  editor.SetProperty(TextEditor::Property::FONT_STYLE, "{\"weight\":\"bold\",\"width\":\"condensed\",\"slant\":\"italic\"}");
 
-  Property::Value value = editor.GetProperty<std::string>( TextEditor::Property::FONT_STYLE );
-  std::string result;
+  Property::Value value = editor.GetProperty<std::string>(TextEditor::Property::FONT_STYLE);
+  std::string     result;
   value.Get(result);
 
-  DALI_TEST_EQUALS( result, fontStyleSettings, TEST_LOCATION );
+  DALI_TEST_EQUALS(result, fontStyleSettings, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2899,63 +3417,62 @@ int utcDaliTextEditorGetPropertyLinecountP(void)
 
   tet_infoline(" utcDaliTextEditorGetPropertyLinecount getting line count property");
 
-  int lineCount =0 ;
+  int lineCount = 0;
 
   TextEditor editor = TextEditor::New();
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10) ;
-  editor.SetProperty( TextEditor::Property::TEXT,
-                       "TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST ");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  editor.SetProperty(TextEditor::Property::TEXT,
+                     "TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST ");
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  lineCount =  editor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 14, TEST_LOCATION );
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  lineCount = editor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 14, TEST_LOCATION);
 
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 50.f, 100.f ) );
-  lineCount =  editor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 28, TEST_LOCATION );
+  editor.SetProperty(Actor::Property::SIZE, Vector2(50.f, 100.f));
+  lineCount = editor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 28, TEST_LOCATION);
 
   END_TEST;
 }
 
 int utcDaliTextEditorScrollStateChangedSignalTest(void)
 {
-
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextEditorScrollStateChangedSignalTest");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 50.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  editor.SetProperty( TextEditor::Property::ENABLE_SCROLL_BAR, true );
-  editor.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(50.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_SCROLL_BAR, true);
+  editor.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
 
-  bool startedCalled = false;
+  bool startedCalled  = false;
   bool finishedCalled = false;
 
-  ScrollStateChangeCallback callback( startedCalled, finishedCalled );
-  editor.ScrollStateChangedSignal().Connect( &callback, &ScrollStateChangeCallback::Callback );
+  ScrollStateChangeCallback callback(startedCalled, finishedCalled);
+  editor.ScrollStateChangedSignal().Connect(&callback, &ScrollStateChangeCallback::Callback);
 
-  KeyboardFocusManager::Get().SetCurrentFocusActor( editor );
+  KeyboardFocusManager::Get().SetCurrentFocusActor(editor);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Long enough message for TextEditor!");
+  editor.SetProperty(TextEditor::Property::TEXT, "Long enough message for TextEditor!");
   application.SendNotification();
   application.Render(6000);
 
   application.SendNotification();
-  DALI_TEST_EQUALS( startedCalled, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( finishedCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(startedCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(finishedCalled, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2965,49 +3482,49 @@ int UtcDaliToolkitTextEditorTextWrapMode(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextEditorTextWarpMode");
 
-  int lineCount =0 ;
+  int lineCount = 0;
 
   TextEditor editor = TextEditor::New();
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 150.0f, 300.f ) );
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello world Hello world" );
+  editor.SetProperty(Actor::Property::SIZE, Vector2(150.0f, 300.f));
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello world Hello world");
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  editor.SetProperty( TextEditor::Property::LINE_WRAP_MODE, "WORD" );
-  DALI_TEST_EQUALS( editor.GetProperty< int >( TextEditor::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::WORD ), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, "WORD");
+  DALI_TEST_EQUALS(editor.GetProperty<int>(TextEditor::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::WORD), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  editor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 4, TEST_LOCATION );
+  lineCount = editor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 4, TEST_LOCATION);
 
-  editor.SetProperty( TextEditor::Property::LINE_WRAP_MODE, "CHARACTER" );
-  DALI_TEST_EQUALS( editor.GetProperty< int >( TextEditor::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::CHARACTER ), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, "CHARACTER");
+  DALI_TEST_EQUALS(editor.GetProperty<int>(TextEditor::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::CHARACTER), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  editor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 3, TEST_LOCATION );
+  lineCount = editor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 3, TEST_LOCATION);
 
-  editor.SetProperty( TextEditor::Property::LINE_WRAP_MODE, Text::LineWrap::WORD );
-  DALI_TEST_EQUALS( editor.GetProperty< int >( TextEditor::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::WORD ), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, Text::LineWrap::WORD);
+  DALI_TEST_EQUALS(editor.GetProperty<int>(TextEditor::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::WORD), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  editor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 4, TEST_LOCATION );
+  lineCount = editor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 4, TEST_LOCATION);
 
-  editor.SetProperty( TextEditor::Property::LINE_WRAP_MODE, Text::LineWrap::CHARACTER );
-  DALI_TEST_EQUALS( editor.GetProperty< int >( TextEditor::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::CHARACTER ), TEST_LOCATION );
+  editor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, Text::LineWrap::CHARACTER);
+  DALI_TEST_EQUALS(editor.GetProperty<int>(TextEditor::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::CHARACTER), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  editor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 3, TEST_LOCATION );
+  lineCount = editor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 3, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3018,29 +3535,29 @@ int UtcDaliTextEditorSetPaddingProperty(void)
   tet_infoline("UtcDaliTextEditorSetPaddingProperty\n");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( editor );
+  DALI_TEST_CHECK(editor);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(editor);
 
   application.SendNotification();
   application.Render();
 
   Vector3 originalSize = editor.GetNaturalSize();
 
-  editor.SetProperty( Toolkit::Control::Property::PADDING, Extents( 10, 10, 10, 10 ) );
+  editor.SetProperty(Toolkit::Control::Property::PADDING, Extents(10, 10, 10, 10));
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( editor.GetProperty<Extents>( Toolkit::Control::Property::PADDING ), Extents( 10, 10, 10, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<Extents>(Toolkit::Control::Property::PADDING), Extents(10, 10, 10, 10), TEST_LOCATION);
 
   Vector3 paddingAddedSize = editor.GetNaturalSize();
 
-  DALI_TEST_EQUALS( originalSize.width + 10 + 10 , paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(originalSize.width + 10 + 10, paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( originalSize.height + 10 + 10 , paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(originalSize.height + 10 + 10, paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3051,21 +3568,21 @@ int UtcDaliTextEditorEnableShiftSelectionProperty(void)
   tet_infoline("UtcDaliTextEditorEnableShiftSelectionProperty");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( editor );
+  DALI_TEST_CHECK(editor);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(editor);
 
   application.SendNotification();
   application.Render();
 
   // The default value of ENABLE_SHIFT_SELECTION is 'true'.
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( DevelTextEditor::Property::ENABLE_SHIFT_SELECTION ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::ENABLE_SHIFT_SELECTION), true, TEST_LOCATION);
 
   // Check the enable shift selection property
-  editor.SetProperty( DevelTextEditor::Property::ENABLE_SHIFT_SELECTION, false );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( DevelTextEditor::Property::ENABLE_SHIFT_SELECTION ), false, TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_SHIFT_SELECTION, false);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::ENABLE_SHIFT_SELECTION), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -3079,21 +3596,21 @@ int UtcDaliTextEditorEnableGrabHandleProperty(void)
   tet_infoline("UtcDaliTextEditorEnableGrabHandleProperty");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( editor );
+  DALI_TEST_CHECK(editor);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(editor);
 
   application.SendNotification();
   application.Render();
 
   // The default value of ENABLE_GRAB_HANDLE is 'true'.
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( DevelTextEditor::Property::ENABLE_GRAB_HANDLE ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::ENABLE_GRAB_HANDLE), true, TEST_LOCATION);
 
   // Check the enable grab handle property
-  editor.SetProperty( DevelTextEditor::Property::ENABLE_GRAB_HANDLE, false );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( DevelTextEditor::Property::ENABLE_GRAB_HANDLE ), false, TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_GRAB_HANDLE, false);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::ENABLE_GRAB_HANDLE), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -3107,21 +3624,21 @@ int UtcDaliTextEditorMatchSystemLanguageDirectionProperty(void)
   tet_infoline("UtcDaliTextEditorMatchSystemLanguageDirectionProperty");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( editor );
+  DALI_TEST_CHECK(editor);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(editor);
 
   application.SendNotification();
   application.Render();
 
   // The default value of MATCH_SYSTEM_LANGUAGE_DIRECTION is 'true'.
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION), true, TEST_LOCATION);
 
   // Check the disable match system language direction property
-  editor.SetProperty( DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, false );
-  DALI_TEST_EQUALS( editor.GetProperty<bool>( DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION ), false, TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, false);
+  DALI_TEST_EQUALS(editor.GetProperty<bool>(DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -3135,7 +3652,7 @@ int UtcDaliTextEditorGetInputMethodContext(void)
   tet_infoline("UtcDaliTextEditorGetInputMethodContext");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( DevelTextEditor::GetInputMethodContext( editor ) );
+  DALI_TEST_CHECK(DevelTextEditor::GetInputMethodContext(editor));
 
   END_TEST;
 }
@@ -3146,29 +3663,29 @@ int utcDaliTextEditorMaxCharactersReached(void)
   tet_infoline("utcDaliTextEditorMaxCharactersReached");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   const int maxNumberOfCharacters = 1;
-  editor.SetProperty( DevelTextEditor::Property::MAX_LENGTH, maxNumberOfCharacters );
-  DALI_TEST_EQUALS( editor.GetProperty<int>( DevelTextEditor::Property::MAX_LENGTH ), maxNumberOfCharacters, TEST_LOCATION );
+  editor.SetProperty(DevelTextEditor::Property::MAX_LENGTH, maxNumberOfCharacters);
+  DALI_TEST_EQUALS(editor.GetProperty<int>(DevelTextEditor::Property::MAX_LENGTH), maxNumberOfCharacters, TEST_LOCATION);
 
   editor.SetKeyInputFocus();
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
-  DevelTextEditor::MaxLengthReachedSignal( editor ).Connect(&TestMaxLengthReachedCallback);
+  DevelTextEditor::MaxLengthReachedSignal(editor).Connect(&TestMaxLengthReachedCallback);
   bool maxLengthReachedSignal = false;
-  editor.ConnectSignal( testTracker, "maxLengthReached", CallbackFunctor(&maxLengthReachedSignal) );
+  editor.ConnectSignal(testTracker, "maxLengthReached", CallbackFunctor(&maxLengthReachedSignal));
 
   gMaxCharactersCallBackCalled = false;
 
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
-  DALI_TEST_CHECK( gMaxCharactersCallBackCalled );
-  DALI_TEST_CHECK( maxLengthReachedSignal );
+  DALI_TEST_CHECK(gMaxCharactersCallBackCalled);
+  DALI_TEST_CHECK(maxLengthReachedSignal);
 
   END_TEST;
 }
@@ -3200,7 +3717,7 @@ int utcDaliTextEditorInputFiltered(void)
 
   gInputFilteredAcceptedCallbackCalled = false;
 
-  application.ProcessEvent(GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   DALI_TEST_CHECK(gInputFilteredAcceptedCallbackCalled);
   DALI_TEST_CHECK(inputFilteredSignal);
@@ -3214,10 +3731,10 @@ int utcDaliTextEditorInputFiltered(void)
 
   editor.SetKeyInputFocus();
 
-  inputFilteredSignal = false;
+  inputFilteredSignal                  = false;
   gInputFilteredRejectedCallbackCalled = false;
 
-  application.ProcessEvent(GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   DALI_TEST_CHECK(gInputFilteredAcceptedCallbackCalled);
   DALI_TEST_CHECK(inputFilteredSignal);
@@ -3232,47 +3749,47 @@ int UtcDaliTextEditorSelectWholeText(void)
 
   TextEditor textEditor = TextEditor::New();
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 1u, textEditor.GetChildCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1u, textEditor.GetChildCount(), TEST_LOCATION);
 
-  DevelTextEditor::SelectWholeText( textEditor );
+  DevelTextEditor::SelectWholeText(textEditor);
 
   application.SendNotification();
   application.Render();
 
   // Nothing should have been selected. The number of children is still 1
-  DALI_TEST_EQUALS( 1u, textEditor.GetChildCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1u, textEditor.GetChildCount(), TEST_LOCATION);
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hello world" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
-  DevelTextEditor::SelectWholeText( textEditor );
+  DevelTextEditor::SelectWholeText(textEditor);
 
   application.SendNotification();
   application.Render();
 
   // Should be 2 children, the stencil and the layer
-  DALI_TEST_EQUALS( 2u, textEditor.GetChildCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(2u, textEditor.GetChildCount(), TEST_LOCATION);
 
   // The offscreen root actor should have two actors: the renderer and the highlight actor.
-  Actor stencil = textEditor.GetChildAt( 0u );
+  Actor stencil = textEditor.GetChildAt(0u);
 
   // The highlight actor is drawn first, so is the first actor in the list
-  Renderer highlight = stencil.GetChildAt( 0u ).GetRendererAt( 0u );
-  DALI_TEST_CHECK( highlight );
+  Renderer highlight = stencil.GetChildAt(0u).GetRendererAt(0u);
+  DALI_TEST_CHECK(highlight);
 
   END_TEST;
 }
@@ -3284,54 +3801,54 @@ int UtcDaliTextEditorSelectText(void)
 
   TextEditor textEditor = TextEditor::New();
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  DevelTextEditor::SelectText( textEditor ,0, 5 );
+  DevelTextEditor::SelectText(textEditor, 0, 5);
 
   application.SendNotification();
   application.Render();
 
   // Nothing is selected
-  std::string selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION );
+  std::string selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("", selectedText, TEST_LOCATION);
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hello world" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
-  DevelTextEditor::SelectText( textEditor, 0, 5 );
+  DevelTextEditor::SelectText(textEditor, 0, 5);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
   // world is selected
-  DevelTextEditor::SelectText( textEditor, 6, 11 );
+  DevelTextEditor::SelectText(textEditor, 6, 11);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "world", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("world", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 6, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 11, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 6, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 11, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3343,44 +3860,44 @@ int UtcDaliTextEditorSelectNone(void)
 
   TextEditor textEditor = TextEditor::New();
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hello world" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
   // Nothing is selected
-  std::string selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION );
+  std::string selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("", selectedText, TEST_LOCATION);
 
-  DevelTextEditor::SelectWholeText( textEditor );
+  DevelTextEditor::SelectWholeText(textEditor);
 
   application.SendNotification();
   application.Render();
 
   // whole text is selected
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello world", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello world", selectedText, TEST_LOCATION);
 
-  DevelTextEditor::SelectNone( textEditor );
+  DevelTextEditor::SelectNone(textEditor);
 
   application.SendNotification();
   application.Render();
 
   // Nothing is selected
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("", selectedText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3391,27 +3908,27 @@ int UtcDaliTextEditorSelectRange(void)
   tet_infoline("utcDaliTextEditorSelectRange");
 
   TextEditor textEditor = TextEditor::New();
-  DALI_TEST_CHECK( textEditor );
+  DALI_TEST_CHECK(textEditor);
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hello world" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hello world");
 
-  textEditor.SetProperty( DevelTextEditor::Property::SELECTED_TEXT_START, 0 );
-  textEditor.SetProperty( DevelTextEditor::Property::SELECTED_TEXT_END, 5 );
+  textEditor.SetProperty(DevelTextEditor::Property::SELECTED_TEXT_START, 0);
+  textEditor.SetProperty(DevelTextEditor::Property::SELECTED_TEXT_END, 5);
 
   // Hello is selected
-  std::string selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  std::string selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3423,39 +3940,60 @@ int UtcDaliTextEditorEnableEditing(void)
 
   TextEditor textEditor = TextEditor::New();
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  application.SendNotification();
+  application.Render();
+
+  textEditor.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, true);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelActor::Property::USER_INTERACTION_ENABLED).Get<bool>(), true, TEST_LOCATION);
+
+  textEditor.SetKeyInputFocus();
+  textEditor.SetProperty(DevelTextEditor::Property::ENABLE_EDITING, false);
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
+  // Render and notify
   application.SendNotification();
   application.Render();
 
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::ENABLE_EDITING).Get<bool>(), false, TEST_LOCATION);
+
   textEditor.SetKeyInputFocus();
-  textEditor.SetProperty( DevelTextEditor::Property::ENABLE_EDITING, false );
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  textEditor.SetProperty(DevelTextEditor::Property::ENABLE_EDITING, true);
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( TextEditor::Property::TEXT ).Get<std::string>(), "", TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::ENABLE_EDITING ).Get<bool>(), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "D", TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::ENABLE_EDITING).Get<bool>(), true, TEST_LOCATION);
+
+  // Check the user interaction enabled and for coverage
+  DevelTextEditor::SelectWholeText(textEditor);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
 
   textEditor.SetKeyInputFocus();
-  textEditor.SetProperty( DevelTextEditor::Property::ENABLE_EDITING, true );
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  textEditor.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, false);
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( TextEditor::Property::TEXT ).Get<std::string>(), "D", TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::ENABLE_EDITING ).Get<bool>(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "D", TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelActor::Property::USER_INTERACTION_ENABLED).Get<bool>(), false, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3466,12 +4004,12 @@ int UtcDaliTextEditorScrolling(void)
   tet_infoline(" UtcDaliTextEditorScrolling ");
 
   TextEditor textEditor = TextEditor::New();
-  DALI_TEST_CHECK( textEditor );
+  DALI_TEST_CHECK(textEditor);
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
@@ -3484,25 +4022,24 @@ int UtcDaliTextEditorScrolling(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::VERTICAL_SCROLL_POSITION ).Get<float>(), 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION ).Get<float>(), 0.0f, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::VERTICAL_SCROLL_POSITION).Get<float>(), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION).Get<float>(), 0.0f, TEST_LOCATION);
 
   DevelTextEditor::ScrollBy(textEditor, Vector2(1.0f, 1.0f));
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::VERTICAL_SCROLL_POSITION ).Get<float>(), 1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION ).Get<float>(), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::VERTICAL_SCROLL_POSITION).Get<float>(), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION).Get<float>(), 0.0f, TEST_LOCATION);
 
   DevelTextEditor::ScrollBy(textEditor, Vector2(0.0f, 1000.0f));
 
-  DALI_TEST_NOT_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::VERTICAL_SCROLL_POSITION ).Get<float>(), 1.0f, 0.1f, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION ).Get<float>(), 0.0f, TEST_LOCATION );
+  DALI_TEST_NOT_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::VERTICAL_SCROLL_POSITION).Get<float>(), 1.0f, 0.1f, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION).Get<float>(), 0.0f, TEST_LOCATION);
 
-  textEditor.SetProperty(DevelTextEditor::Property::VERTICAL_SCROLL_POSITION , 0.0f);
-  textEditor.SetProperty(DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION , 0.0f);
+  textEditor.SetProperty(DevelTextEditor::Property::VERTICAL_SCROLL_POSITION, 0.0f);
+  textEditor.SetProperty(DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION, 0.0f);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::VERTICAL_SCROLL_POSITION ).Get<float>(), 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION ).Get<float>(), 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::VERTICAL_SCROLL_POSITION).Get<float>(), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION).Get<float>(), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3513,28 +4050,28 @@ int UtcDaliToolkitTextEditorFontSizeScale(void)
   tet_infoline(" UtcDaliToolkitTextEditorFontSizeScale");
 
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 30.f );
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Test" );
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 30.f);
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
   Vector3 nonScaledSize = textEditor.GetNaturalSize();
 
   TextEditor textEditorScaled = TextEditor::New();
-  textEditorScaled.SetProperty( TextEditor::Property::POINT_SIZE, 15.f );
-  textEditorScaled.SetProperty( Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE, 2.f );
-  textEditorScaled.SetProperty( TextEditor::Property::TEXT, "Test" );
+  textEditorScaled.SetProperty(TextEditor::Property::POINT_SIZE, 15.f);
+  textEditorScaled.SetProperty(Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE, 2.f);
+  textEditorScaled.SetProperty(TextEditor::Property::TEXT, "Test");
   Vector3 scaledSize = textEditorScaled.GetNaturalSize();
 
-  DALI_TEST_EQUALS( nonScaledSize, scaledSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(nonScaledSize, scaledSize, TEST_LOCATION);
 
-  textEditor.SetProperty( TextEditor::Property::PIXEL_SIZE, 30.f );
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Test" );
+  textEditor.SetProperty(TextEditor::Property::PIXEL_SIZE, 30.f);
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
   nonScaledSize = textEditor.GetNaturalSize();
 
-  textEditorScaled.SetProperty( TextEditor::Property::PIXEL_SIZE, 15.f );
-  textEditorScaled.SetProperty( Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE, 2.f );
-  textEditorScaled.SetProperty( TextEditor::Property::TEXT, "Test" );
+  textEditorScaled.SetProperty(TextEditor::Property::PIXEL_SIZE, 15.f);
+  textEditorScaled.SetProperty(Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE, 2.f);
+  textEditorScaled.SetProperty(TextEditor::Property::TEXT, "Test");
   scaledSize = textEditorScaled.GetNaturalSize();
 
-  DALI_TEST_EQUALS( nonScaledSize, scaledSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(nonScaledSize, scaledSize, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3546,29 +4083,29 @@ int UtcDaliTextEditorPrimaryCursorPosition(void)
 
   TextEditor textEditor = TextEditor::New();
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "ABCEF");
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "ABCEF");
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  textEditor.SetProperty( DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
+  textEditor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
   application.SendNotification();
   application.Render();
   textEditor.SetKeyInputFocus();
 
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( TextEditor::Property::TEXT ).Get<std::string>(), "ABCDEF", TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::PRIMARY_CURSOR_POSITION ).Get<int>(), 4, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "ABCDEF", TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 4, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3580,74 +4117,73 @@ int UtcDaliTextEditorLineCountAfterGetNaturalSize(void)
 
   TextEditor textEditor = TextEditor::New();
   textEditor.SetProperty(TextEditor::Property::TEXT, "A\nB\nC\nD\nE\nF\n");
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( textEditor );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
   int lineCount = 0;
-  lineCount =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 7, TEST_LOCATION );
+  lineCount     = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 7, TEST_LOCATION);
 
   textEditor.GetNaturalSize();
 
   // Create a tap event to touch the text editor.
-  TestGenerateTap( application, 18.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 7, TEST_LOCATION );
+  lineCount = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 7, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int utcDaliTextEditorGetHeightForWidthDoesNotChangeLineCountScrollingCase(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline(" utcDaliTextEditorGetHeightForWidthDoesNotChangeLineCountScrollingCase ");
 
-  int lineCountBefore =0 ;
-  int lineCountAfter =0 ;
+  int lineCountBefore = 0;
+  int lineCountAfter  = 0;
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set very large font-size using point-size
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 10) ;
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
   //Specify font-family
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
   //Specify size
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
   //Set text longer than width of textEditor
-  textEditor.SetProperty( TextEditor::Property::TEXT, "TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST ");
+  textEditor.SetProperty(TextEditor::Property::TEXT, "TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST ");
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
   //Failed case is the GetHeightForWidth change LineCount then the scrollor will not arrive to latest line
   //GetHeightForWidth is a retrieval method which should not modify object
-  lineCountBefore =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCountBefore = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
   textEditor.GetHeightForWidth(200.f);
 
   //This is to simulate focus into text editor after calling GetHeightForWidth
   //Create a tap event to touch the text editor.
-  TestGenerateTap( application, 18.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   application.SendNotification();
   application.Render();
 
-  lineCountAfter =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCountAfter = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
 
   //The LineCount must not be changed when calling GetHeightForWidth.
-  DALI_TEST_EQUALS( lineCountAfter , lineCountBefore, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCountAfter, lineCountBefore, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3658,43 +4194,43 @@ int utcDaliTextEditorGetHeightForWidthDoesNotChangeLineCountLineWrapCharCase(voi
 
   tet_infoline(" utcDaliTextEditorGetHeightForWidthDoesNotChangeLineCountLineWrapCharCase ");
 
-  int lineCountBefore =0 ;
-  int lineCountAfter =0 ;
+  int lineCountBefore = 0;
+  int lineCountAfter  = 0;
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set very large font-size using point-size
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 10) ;
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
   //Specify font-family
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
   //Specify size
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 50.f, 100.f ) );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(50.f, 100.f));
   //Set text longer than width of textEditor
-  textEditor.SetProperty( TextEditor::Property::TEXT, "qwertyuiopasdfghjklzxcvbnm\n");
+  textEditor.SetProperty(TextEditor::Property::TEXT, "qwertyuiopasdfghjklzxcvbnm\n");
   //Set line wrap mode Character
   textEditor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, "CHARACTER");
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
   //Failed case is the GetHeightForWidth change LineCount which make position of cursor invalid in TextEditor
   //GetHeightForWidth is a retrieval method which should not modify object
-  lineCountBefore =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCountBefore = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
   textEditor.GetHeightForWidth(200.f);
 
   //This is to simulate focus into text editor after calling GetHeightForWidth
   //Create a tap event to touch the text editor.
-  TestGenerateTap( application, 18.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   application.SendNotification();
   application.Render();
 
-  lineCountAfter =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCountAfter = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
 
   //The LineCount must not be changed when calling GetHeightForWidth.
-  DALI_TEST_EQUALS( lineCountAfter , lineCountBefore, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCountAfter, lineCountBefore, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3705,84 +4241,81 @@ int utcDaliTextEditorGetHeightForWidthChangeLineCountWhenTextChanged(void)
 
   tet_infoline(" utcDaliTextEditorGetHeightForWidthChangeLineCountWhenTextChanged ");
 
-  int lineCountBefore =0 ;
-  int lineCountAfter =0 ;
+  int lineCountBefore = 0;
+  int lineCountAfter  = 0;
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set very large font-size using point-size
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 10) ;
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
   //Specify font-family
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
   //Specify size
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 100.f ) );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 100.f));
   //Set text longer than width of textEditor
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Short text");
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Short text");
   //Set line wrap mode Character
   textEditor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, "CHARACTER");
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
+  lineCountBefore = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
 
-  lineCountBefore =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-
-  textEditor.SetProperty( TextEditor::Property::TEXT, "This is very loooooooooooooooooooooooooooooooooooong text for test");
-  lineCountAfter =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "This is very loooooooooooooooooooooooooooooooooooong text for test");
+  lineCountAfter = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
 
   // When the text changed, the Line-count should be updated according to new text.
   // Because the GetHeightForWidth is called in Controller::GetLineCount(float width)
-  DALI_TEST_EQUALS( lineCountBefore ,1, TEST_LOCATION );
-  DALI_TEST_GREATER( lineCountAfter,1, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(lineCountBefore, 1, TEST_LOCATION);
+  DALI_TEST_GREATER(lineCountAfter, 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int utcDaliTextEditorGetNaturalSizeDoesNotChangeLineCountScrollingCase(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline(" utcDaliTextEditorGetNaturalSizeDoesNotChangeLineCountScrollingCase ");
 
-  int lineCountBefore =0 ;
-  int lineCountAfter =0 ;
+  int lineCountBefore = 0;
+  int lineCountAfter  = 0;
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set very large font-size using point-size
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 10) ;
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
   //Specify font-family
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
   //Specify size
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
   //Set text longer than width of textEditor
-  textEditor.SetProperty( TextEditor::Property::TEXT, "TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST ");
+  textEditor.SetProperty(TextEditor::Property::TEXT, "TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST ");
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
   //Failed case is the GetNaturalSize change LineCount then the scrollor will not arrive to latest line
   //GetNaturalSize is a retrieval method which should not modify object
-  lineCountBefore =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCountBefore = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
   textEditor.GetNaturalSize();
 
   //This is to simulate focus into text editor after calling GetNaturalSize
   //Create a tap event to touch the text editor.
-  TestGenerateTap( application, 18.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   application.SendNotification();
   application.Render();
 
-  lineCountAfter =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCountAfter = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
 
   //The LineCount must not be changed when calling GetNaturalSize.
-  DALI_TEST_EQUALS( lineCountAfter , lineCountBefore, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCountAfter, lineCountBefore, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3793,43 +4326,43 @@ int utcDaliTextEditorGetNaturalSizeDoesNotChangeLineCountLineWrapCharCase(void)
 
   tet_infoline(" utcDaliTextEditorGetNaturalSizeDoesNotChangeLineCountLineWrapCharCase ");
 
-  int lineCountBefore =0 ;
-  int lineCountAfter =0 ;
+  int lineCountBefore = 0;
+  int lineCountAfter  = 0;
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set very large font-size using point-size
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 10) ;
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
   //Specify font-family
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
   //Specify size
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 50.f, 100.f ) );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(50.f, 100.f));
   //Set text longer than width of textEditor
-  textEditor.SetProperty( TextEditor::Property::TEXT, "qwertyuiopasdfghjklzxcvbnm\n");
+  textEditor.SetProperty(TextEditor::Property::TEXT, "qwertyuiopasdfghjklzxcvbnm\n");
   //Set line wrap mode Character
   textEditor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, "CHARACTER");
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
 
   //Failed case is the GetNaturalSize change LineCount which make position of cursor invalid in TextEditor
   //GetNaturalSize is a retrieval method which should not modify object
-  lineCountBefore =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
-  textEditor.GetNaturalSize( );
+  lineCountBefore = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
+  textEditor.GetNaturalSize();
 
   //This is to simulate focus into text editor after calling GetNaturalSize
   //Create a tap event to touch the text editor.
-  TestGenerateTap( application, 18.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   application.SendNotification();
   application.Render();
 
-  lineCountAfter =  textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCountAfter = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
 
   //The LineCount must not be changed when calling GetNaturalSize.
-  DALI_TEST_EQUALS( lineCountAfter , lineCountBefore, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCountAfter, lineCountBefore, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3840,30 +4373,30 @@ int UtcDaliTextEditorAtlasLimitationIsEnabledForLargeFontPointSize(void)
   tet_infoline(" UtcDaliTextEditorAtlasLimitationIsEnabledForLargeFontPointSize ");
 
   // +2: First one to handle the equal case. Second one to handle odd to even case of GetNaturalSize
-  const uint32_t lessThanWidth = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
+  const uint32_t lessThanWidth  = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
   const uint32_t lessThanHeight = TextAbstraction::FontClient::MAX_TEXT_ATLAS_HEIGHT - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
 
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
 
   //Set size to avoid automatic eliding
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
   //Set very large font-size using point-size
-  textEditor.SetProperty( TextEditor::Property::POINT_SIZE, 1000) ;
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 1000);
   //Specify font-family
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
   //Set text to check if appear or not
-  textEditor.SetProperty( TextEditor::Property::TEXT, "A");
+  textEditor.SetProperty(TextEditor::Property::TEXT, "A");
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
   application.SendNotification();
   application.Render();
   //Use GetNaturalSize to verify that size of block does not exceed Atlas size
   Vector3 naturalSize = textEditor.GetNaturalSize();
 
-  DALI_TEST_GREATER( lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION );
-  DALI_TEST_GREATER( lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION );
+  DALI_TEST_GREATER(lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION);
+  DALI_TEST_GREATER(lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION);
 
   END_TEST;
 }
@@ -3874,31 +4407,30 @@ int UtcDaliTextEditorAtlasLimitationIsEnabledPerformanceCases(void)
   tet_infoline(" UtcDaliTextEditorAtlasLimitationIsEnabledPerformanceCases ");
 
   // +2: First one to handle the equal case. Second one to handle odd to even case of GetNaturalSize
-  const uint32_t lessThanWidth = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
+  const uint32_t lessThanWidth  = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
   const uint32_t lessThanHeight = TextAbstraction::FontClient::MAX_TEXT_ATLAS_HEIGHT - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
 
   Vector3 naturalSize; //Use GetNaturalSize to verify that size of block does not exceed Atlas size
   // Create a text editor
   TextEditor textEditor = TextEditor::New();
   //Set size to avoid automatic eliding
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
-  textEditor.SetProperty( TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
-  textEditor.SetProperty( TextEditor::Property::TEXT, "A");
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+  textEditor.SetProperty(TextEditor::Property::TEXT, "A");
 
-  const int numberOfCases = 6;
-  int arrayCases[numberOfCases] = {323, 326, 330, 600, 1630, 2500};
+  const int numberOfCases             = 6;
+  int       arrayCases[numberOfCases] = {323, 326, 330, 600, 1630, 2500};
 
-  for (int index=0; index < numberOfCases; index++)
+  for(int index = 0; index < numberOfCases; index++)
   {
     tet_printf(" UtcDaliTextEditorAtlasLimitationIsEnabledPerformanceCases point-size= %d \n", arrayCases[index]);
-    textEditor.SetProperty( TextEditor::Property::POINT_SIZE, arrayCases[index]) ;
-    application.GetScene().Add( textEditor );
+    textEditor.SetProperty(TextEditor::Property::POINT_SIZE, arrayCases[index]);
+    application.GetScene().Add(textEditor);
     application.SendNotification();
     application.Render();
     naturalSize = textEditor.GetNaturalSize();
-    DALI_TEST_GREATER( lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION );
-    DALI_TEST_GREATER( lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION );
-
+    DALI_TEST_GREATER(lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION);
+    DALI_TEST_GREATER(lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION);
   }
 
   END_TEST;
@@ -3909,45 +4441,45 @@ int UtcDaliTextEditorHyphenWrapMode(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextEditorHyphenWrapMode ");
 
-  int lineCount =0;
+  int        lineCount  = 0;
   TextEditor textEditor = TextEditor::New();
 
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 150.0f, 300.f ) );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(150.0f, 300.f));
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
   application.SendNotification();
   application.Render();
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hi Experimen" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hi Experimen");
   textEditor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, DevelText::LineWrap::HYPHENATION);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( TextEditor::Property::LINE_WRAP_MODE ), static_cast< int >( DevelText::LineWrap::HYPHENATION ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(TextEditor::Property::LINE_WRAP_MODE), static_cast<int>(DevelText::LineWrap::HYPHENATION), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount = textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCount = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
   /*
     text will be :
     Hi Exp-
     erimen
   */
-  DALI_TEST_EQUALS( lineCount, 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCount, 2, TEST_LOCATION);
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hi Experimen" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hi Experimen");
   textEditor.SetProperty(TextEditor::Property::LINE_WRAP_MODE, DevelText::LineWrap::MIXED);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( TextEditor::Property::LINE_WRAP_MODE ), static_cast< int >( DevelText::LineWrap::MIXED ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(TextEditor::Property::LINE_WRAP_MODE), static_cast<int>(DevelText::LineWrap::MIXED), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount = textEditor.GetProperty<int>( TextEditor::Property::LINE_COUNT );
+  lineCount = textEditor.GetProperty<int>(TextEditor::Property::LINE_COUNT);
   /*
     text will be :
     Hi
     Experi-
     men
   */
-  DALI_TEST_EQUALS( lineCount, 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCount, 3, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3959,55 +4491,55 @@ int UtcDaliToolkitTextEditorEllipsisPositionProperty(void)
   TextEditor textEditor = TextEditor::New();
 
   tet_infoline(" UtcDaliToolkitTextEditorEllipsisPositionProperty - Default is END");
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextEditorEllipsisPositionProperty - Change to START");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::START);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextEditorEllipsisPositionProperty - Change to MIDDLE");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::MIDDLE);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextEditorEllipsisPositionProperty - Change to END");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::END);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextEditorEllipsisPositionProperty - Change to START using integer");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, 1);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextEditorEllipsisPositionProperty - Change to MIDDLE using integer");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, 2);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextEditorEllipsisPositionProperty - Change to END using integer");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, 0);
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using string - uppercase");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, "START");
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using string - uppercase");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, "MIDDLE");
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using string - uppercase");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, "END");
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using string - lowercase");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, "start");
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using string - lowercase");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, "middle");
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using string - lowercase");
   textEditor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, "end");
-  DALI_TEST_EQUALS( textEditor.GetProperty< int >( DevelTextEditor::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty<int>(DevelTextEditor::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   END_TEST;
 }
@@ -4020,72 +4552,72 @@ int UtcDaliTextEditorCopyText(void)
   TextEditor textEditor = TextEditor::New();
 
   std::string selectedText = "";
-  std::string copiedText = "";
+  std::string copiedText   = "";
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hello world" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
   // Hello is selected
-  DevelTextEditor::SelectText( textEditor, 0, 5 );
+  DevelTextEditor::SelectText(textEditor, 0, 5);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
   // Hello is copied
-  copiedText = DevelTextEditor::CopyText( textEditor );
-  DALI_TEST_EQUALS( "Hello", copiedText, TEST_LOCATION );
+  copiedText = DevelTextEditor::CopyText(textEditor);
+  DALI_TEST_EQUALS("Hello", copiedText, TEST_LOCATION);
 
   // world is selected
-  DevelTextEditor::SelectText( textEditor, 6, 11 );
+  DevelTextEditor::SelectText(textEditor, 6, 11);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "world", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("world", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 6, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 11, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 6, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 11, TEST_LOCATION);
 
   // world is copied
-  copiedText = DevelTextEditor::CopyText( textEditor );
-  DALI_TEST_EQUALS( "world", copiedText, TEST_LOCATION );
+  copiedText = DevelTextEditor::CopyText(textEditor);
+  DALI_TEST_EQUALS("world", copiedText, TEST_LOCATION);
 
   // "lo wo" is selected
-  DevelTextEditor::SelectText( textEditor, 3, 8 );
+  DevelTextEditor::SelectText(textEditor, 3, 8);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "lo wo", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("lo wo", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 3, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 8, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 8, TEST_LOCATION);
 
   // "lo wo" is copied
-  copiedText = DevelTextEditor::CopyText( textEditor );
-  DALI_TEST_EQUALS( "lo wo", copiedText, TEST_LOCATION );
+  copiedText = DevelTextEditor::CopyText(textEditor);
+  DALI_TEST_EQUALS("lo wo", copiedText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -4099,106 +4631,106 @@ int UtcDaliTextEditorCutText(void)
 
   std::string selectedText = "";
 
-  application.GetScene().Add( textEditor );
+  application.GetScene().Add(textEditor);
 
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textEditor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textEditor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textEditor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textEditor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Hello world" );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
   // Hello is selected
-  DevelTextEditor::SelectText( textEditor, 0, 5 );
+  DevelTextEditor::SelectText(textEditor, 0, 5);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
   // Hello is cut
-  DALI_TEST_EQUALS( "Hello", DevelTextEditor::CutText( textEditor ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello", DevelTextEditor::CutText(textEditor), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( TextEditor::Property::TEXT ).Get<std::string>(), " world", TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), " world", TEST_LOCATION);
 
   // " w" is selected
-  DevelTextEditor::SelectText( textEditor, 0, 2 );
+  DevelTextEditor::SelectText(textEditor, 0, 2);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( " w", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS(" w", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 2, TEST_LOCATION);
 
   // " w" is cut
-  DALI_TEST_EQUALS( " w", DevelTextEditor::CutText( textEditor ), TEST_LOCATION );
+  DALI_TEST_EQUALS(" w", DevelTextEditor::CutText(textEditor), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( TextEditor::Property::TEXT ).Get<std::string>(), "orld", TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "orld", TEST_LOCATION);
 
   // Test Cut from the middle
 
   // "rl" is selected
-  DevelTextEditor::SelectText( textEditor, 1, 3 );
+  DevelTextEditor::SelectText(textEditor, 1, 3);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "rl", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("rl", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 3, TEST_LOCATION);
 
   // "rl" is cut
-  DALI_TEST_EQUALS( "rl", DevelTextEditor::CutText( textEditor ), TEST_LOCATION );
+  DALI_TEST_EQUALS("rl", DevelTextEditor::CutText(textEditor), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( TextEditor::Property::TEXT ).Get<std::string>(), "od", TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "od", TEST_LOCATION);
 
   // Test Cut from the end
 
   // "d" is selected
-  DevelTextEditor::SelectText( textEditor, 1, 2 );
+  DevelTextEditor::SelectText(textEditor, 1, 2);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "d", selectedText, TEST_LOCATION );
+  selectedText = textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("d", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_START ).Get<int>(), 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( textEditor.GetProperty( DevelTextEditor::Property::SELECTED_TEXT_END ).Get<int>(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_START).Get<int>(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT_END).Get<int>(), 2, TEST_LOCATION);
 
   // "d" is cut
-  DALI_TEST_EQUALS( "d", DevelTextEditor::CutText( textEditor ), TEST_LOCATION );
+  DALI_TEST_EQUALS("d", DevelTextEditor::CutText(textEditor), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textEditor.GetProperty( TextEditor::Property::TEXT ).Get<std::string>(), "o", TEST_LOCATION );
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "o", TEST_LOCATION);
 
   END_TEST;
 }
@@ -4209,45 +4741,45 @@ int UtcDaliTextEditorPasteText(void)
   tet_infoline(" UtcDaliTextEditorPasteText ");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
-  std::string cutText = "";
+  std::string cutText    = "";
   std::string copiedText = "";
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworld\nHello world");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move to second line of the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4260,14 +4792,14 @@ int UtcDaliTextEditorPasteText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "wor", cutText, TEST_LOCATION );
-  DALI_TEST_EQUALS( "Hello\nld\nHello world", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("wor", cutText, TEST_LOCATION);
+  DALI_TEST_EQUALS("Hello\nld\nHello world", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Select some text in the left of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN,  "",DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4280,13 +4812,12 @@ int UtcDaliTextEditorPasteText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "lo\n", copiedText, TEST_LOCATION );
-  DALI_TEST_EQUALS( "Hello\nld\nHello world", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
-
+  DALI_TEST_EQUALS("lo\n", copiedText, TEST_LOCATION);
+  DALI_TEST_EQUALS("Hello\nld\nHello world", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   // Move the cursor to the third line
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4299,27 +4830,28 @@ int UtcDaliTextEditorPasteText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello\nld\nHello lo\nworld", editor.GetProperty<std::string>(TextEditor::Property::TEXT), TEST_LOCATION);
 
   END_TEST;
 }
+
 int UtcDaliTextEditorLineSpacing(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextEditorLineSpacing ");
 
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.f ) );
-  application.GetScene().Add( textEditor );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(400.0f, 400.f));
+  application.GetScene().Add(textEditor);
   application.SendNotification();
   application.Render();
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Line #1\nLine #2\nLine #3" );
-  textEditor.SetProperty( DevelTextEditor::Property::LINE_SPACING, 0 );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Line #1\nLine #2\nLine #3");
+  textEditor.SetProperty(DevelTextEditor::Property::LINE_SPACING, 0);
 
   Vector3 sizeBefore = textEditor.GetNaturalSize();
 
-  textEditor.SetProperty( DevelTextEditor::Property::LINE_SPACING, 20 );
+  textEditor.SetProperty(DevelTextEditor::Property::LINE_SPACING, 20);
 
   //add 20 for each line  20 * 3
   DALI_TEST_EQUALS(sizeBefore.height + 60.0f, textEditor.GetNaturalSize().height, TEST_LOCATION);
@@ -4327,56 +4859,95 @@ int UtcDaliTextEditorLineSpacing(void)
   END_TEST;
 }
 
-int UtcDaliTextEditorMinLineSize(void)
+int UtcDaliTextEditorSelectionWithLineSpacing(void)
 {
+  //Only for test coverage
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTextEditorMinLineSize ");
+  tet_infoline(" UtcDaliTextEditorSelectionWithLineSpacing ");
 
   TextEditor textEditor = TextEditor::New();
-  textEditor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.f ) );
-  application.GetScene().Add( textEditor );
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(400.0f, 400.f));
+  application.GetScene().Add(textEditor);
   application.SendNotification();
   application.Render();
 
-  textEditor.SetProperty( TextEditor::Property::TEXT, "Line #1\nLine #2\nLine #3" );
-  textEditor.SetProperty( DevelTextEditor::Property::MIN_LINE_SIZE, 0 );
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Line #1\nLine #2\nLine #3");
+  textEditor.SetProperty(DevelTextEditor::Property::LINE_SPACING, -20);
 
-  Vector3 sizeBefore = textEditor.GetNaturalSize();
+  application.SendNotification();
+  application.Render();
+
+  DevelTextEditor::SelectWholeText(textEditor);
 
-  textEditor.SetProperty( DevelTextEditor::Property::MIN_LINE_SIZE, 60 );
+  application.SendNotification();
+  application.Render();
 
-  DALI_TEST_NOT_EQUALS( sizeBefore, textEditor.GetNaturalSize(), 0.0f, TEST_LOCATION);
+  DevelTextEditor::SelectNone(textEditor);
+  textEditor.SetProperty(DevelTextEditor::Property::LINE_SPACING, 20);
 
-  //60 * 3 lines
-  DALI_TEST_EQUALS(180.0f, textEditor.GetNaturalSize().height, TEST_LOCATION);
+  application.SendNotification();
+  application.Render();
+
+  DevelTextEditor::SelectWholeText(textEditor);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(textEditor.GetProperty<float>(DevelTextEditor::Property::LINE_SPACING), 20.0f, TEST_LOCATION);
 
   END_TEST;
 }
 
-int utcDaliTextEditorCursorPositionChangedSignal(void)
+int UtcDaliTextEditorMinLineSize(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorMinLineSize ");
+
+  TextEditor textEditor = TextEditor::New();
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(400.0f, 400.f));
+  application.GetScene().Add(textEditor);
+  application.SendNotification();
+  application.Render();
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Line #1\nLine #2\nLine #3");
+  textEditor.SetProperty(DevelTextEditor::Property::MIN_LINE_SIZE, 0);
+
+  Vector3 sizeBefore = textEditor.GetNaturalSize();
+
+  textEditor.SetProperty(DevelTextEditor::Property::MIN_LINE_SIZE, 60);
+
+  DALI_TEST_NOT_EQUALS(sizeBefore, textEditor.GetNaturalSize(), 0.0f, TEST_LOCATION);
+
+  //60 * 3 lines
+  DALI_TEST_EQUALS(180.0f, textEditor.GetNaturalSize().height, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorCursorPositionChangedSignal(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextEditorCursorPositionChangedSignal");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   // connect to the selection changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   DevelTextEditor::CursorPositionChangedSignal(editor).Connect(&TestCursorPositionChangedCallback);
   bool cursorPositionChangedSignal = false;
-  editor.ConnectSignal( testTracker, "cursorPositionChanged",   CallbackFunctor(&cursorPositionChangedSignal) );
+  editor.ConnectSignal(testTracker, "cursorPositionChanged", CallbackFunctor(&cursorPositionChangedSignal));
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworld\nHello world");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
@@ -4385,7 +4956,7 @@ int utcDaliTextEditorCursorPositionChangedSignal(void)
   editor.SetKeyInputFocus();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -4397,7 +4968,7 @@ int utcDaliTextEditorCursorPositionChangedSignal(void)
   gCursorPositionChangedCallbackCalled = false;
 
   // Move to left.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4409,7 +4980,7 @@ int utcDaliTextEditorCursorPositionChangedSignal(void)
   gCursorPositionChangedCallbackCalled = false;
 
   // Insert C
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4421,7 +4992,7 @@ int utcDaliTextEditorCursorPositionChangedSignal(void)
   gCursorPositionChangedCallbackCalled = false;
 
   //delete one character
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4432,7 +5003,7 @@ int utcDaliTextEditorCursorPositionChangedSignal(void)
 
   gCursorPositionChangedCallbackCalled = false;
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello" );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello");
 
   // Render and notify
   application.SendNotification();
@@ -4443,7 +5014,7 @@ int utcDaliTextEditorCursorPositionChangedSignal(void)
 
   gCursorPositionChangedCallbackCalled = false;
 
-  editor.SetProperty( DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
+  editor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4455,48 +5026,382 @@ int utcDaliTextEditorCursorPositionChangedSignal(void)
   END_TEST;
 }
 
+int utcDaliTextEditorGeometryEllipsisStart(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorGeometryEllipsisStart");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_SCROLL_BAR, false);
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS, true);
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::START);
+  editor.SetProperty(TextEditor::Property::TEXT, "line1 \nline2\nline 3\nline4");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 2;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 24;
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(editor, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(editor, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(38, 0));
+  expectedSizes.PushBack(Vector2(21, 25));
+
+  expectedPositions.PushBack(Vector2(-1, 25));
+  expectedSizes.PushBack(Vector2(53, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorGeometryEllipsisMiddle(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorGeometryEllipsisMiddle");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_SCROLL_BAR, false);
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS, true);
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::MIDDLE);
+  editor.SetProperty(TextEditor::Property::TEXT, "line1 \nline2\nline 3\nline4");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 2;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 24;
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(editor, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(editor, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(-1, 0));
+  expectedSizes.PushBack(Vector2(26, 25));
+
+  expectedPositions.PushBack(Vector2(-1, 25));
+  expectedSizes.PushBack(Vector2(53, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorGeometryEllipsisEnd(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorGeometryEllipsisEnd");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(DevelTextEditor::Property::ENABLE_SCROLL_BAR, false);
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS, true);
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::END);
+  editor.SetProperty(TextEditor::Property::TEXT, "line1 \nline2\nline 3\nline4");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 2;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 24;
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(editor, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(editor, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(-1, 0));
+  expectedSizes.PushBack(Vector2(60, 25));
+
+  expectedPositions.PushBack(Vector2(-1, 25));
+  expectedSizes.PushBack(Vector2(39, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorGeometryRTL(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorGeometryRTL");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "line1 \nline2\nline 3\nالاخيرالسطر");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 4;
+  unsigned int startIndex    = 3;
+  unsigned int endIndex      = 24;
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(editor, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(editor, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(25, 0));
+  expectedSizes.PushBack(Vector2(34, 25));
+
+  expectedPositions.PushBack(Vector2(-1, 25));
+  expectedSizes.PushBack(Vector2(53, 25));
+
+  expectedPositions.PushBack(Vector2(-1, 50));
+  expectedSizes.PushBack(Vector2(60, 25));
+
+  expectedPositions.PushBack(Vector2(63, 75));
+  expectedSizes.PushBack(Vector2(37, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorGeometryGlyphMiddle(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorGeometryGlyphMiddle");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(150.f, 200.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "لا تحتوي على لا");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 1;
+  unsigned int endIndex      = 13;
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(editor, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(editor, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(6, 0));
+  expectedSizes.PushBack(Vector2(125, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorGeometryOneGlyph(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorGeometryOneGlyph ");
+
+  TextEditor label = TextEditor::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  label.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextEditor::Property::TEXT, "H");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 0;
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(label, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(label, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(-2, 0));
+  expectedSizes.PushBack(Vector2(16, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorGeometryNullPtr(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("utcDaliTextEditorGeometryNullPtr");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  unsigned int expectedCount = 0;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 0;
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(editor, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(editor, startIndex, endIndex);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  END_TEST;
+}
+
 int utcDaliTextEditorSelectionClearedSignal(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextEditorSelectionClearedSignal");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   // connect to the selection changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   DevelTextEditor::SelectionClearedSignal(editor).Connect(&TestSelectionClearedCallback);
   bool selectionClearedSignal = false;
-  editor.ConnectSignal( testTracker, "selectionCleared",   CallbackFunctor(&selectionClearedSignal) );
+  editor.ConnectSignal(testTracker, "selectionCleared", CallbackFunctor(&selectionClearedSignal));
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworld\nHello world");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move to second line of the text & Select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // remove selection
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4509,7 +5414,7 @@ int utcDaliTextEditorSelectionClearedSignal(void)
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -4518,11 +5423,11 @@ int utcDaliTextEditorSelectionClearedSignal(void)
   gSelectionClearedCallbackCalled = false;
 
   // Move to second line of the text & select.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   //remove selection
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4537,11 +5442,11 @@ int utcDaliTextEditorSelectionClearedSignal(void)
   application.Render();
 
   // Move to second line of the text & select.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // replace C with selected text
-  application.ProcessEvent( GenerateKey( "c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("c", "", "c", KEY_C_CODE, 0, 0, Integration::KeyEvent::DOWN, "c", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4555,13 +5460,13 @@ int utcDaliTextEditorSelectionClearedSignal(void)
   application.SendNotification();
   application.Render();
 
-  DevelTextEditor::SelectText( editor ,1, 3 );
+  DevelTextEditor::SelectText(editor, 1, 3);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  editor.SetProperty( DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
+  editor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4571,7 +5476,7 @@ int utcDaliTextEditorSelectionClearedSignal(void)
 
   gSelectionClearedCallbackCalled = false;
 
-  DevelTextEditor::SelectText( editor ,1, 3 );
+  DevelTextEditor::SelectText(editor, 1, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4589,92 +5494,205 @@ int utcDaliTextEditorSelectionClearedSignal(void)
   END_TEST;
 }
 
-int utcDaliTextEditorSelectionChangedSignal(void)
+int utcDaliTextEditorSelectionStartedSignal(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" utcDaliTextEditorSelectionChangedSignal");
+  tet_infoline(" utcDaliTextEditorSelectionStartedSignal");
 
   TextEditor editor = TextEditor::New();
-  DALI_TEST_CHECK( editor );
+  DALI_TEST_CHECK(editor);
 
-  application.GetScene().Add( editor );
+  application.GetScene().Add(editor);
 
   // connect to the selection changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
-  DevelTextEditor::SelectionChangedSignal(editor).Connect(&TestSelectionChangedCallback);
-  bool selectionChangedSignal = false;
-  editor.ConnectSignal( testTracker, "selectionChanged",   CallbackFunctor(&selectionChangedSignal) );
+  DevelTextEditor::SelectionStartedSignal(editor).Connect(&TestSelectionStartedCallback);
+  bool selectionStartedSignal = false;
+  editor.ConnectSignal(testTracker, "selectionStarted", CallbackFunctor(&selectionStartedSignal));
 
-  editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" );
-  editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f );
-  editor.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworld\nHello world");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Move to second line of the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  // Move to second line of the text & Select some text in the right of the current cursor position
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  DALI_TEST_CHECK(gSelectionStartedCallbackCalled);
+
+  // remove selection
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK(gSelectionChangedCallbackCalled);
-  DALI_TEST_EQUALS(oldSelectionStart, oldSelectionEnd, TEST_LOCATION);
-
-  gSelectionChangedCallbackCalled = false;
+  gSelectionStartedCallbackCalled = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  DevelTextEditor::SelectText(editor, 1, 3);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK(gSelectionChangedCallbackCalled);
-  DALI_TEST_EQUALS(oldSelectionStart, 6, TEST_LOCATION);
-  DALI_TEST_EQUALS(oldSelectionEnd, 7, TEST_LOCATION);
+  DALI_TEST_CHECK(gSelectionStartedCallbackCalled);
 
-  gSelectionChangedCallbackCalled = false;
+  END_TEST;
+}
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+int utcDaliTextEditorSelectionWithSecondaryCursor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorSelectionWithSecondaryCursor");
 
-  // Render and notify
-  application.SendNotification();
-  application.Render();
+  // Checks if the actor is created.
 
-  DALI_TEST_CHECK(gSelectionChangedCallbackCalled);
-  DALI_TEST_EQUALS(oldSelectionStart, 6, TEST_LOCATION);
-  DALI_TEST_EQUALS(oldSelectionEnd, 8, TEST_LOCATION);
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
 
-  gSelectionChangedCallbackCalled = false;
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::TEXT, "اللغة العربية\nمرحبا بالجميع\nالسلام عليكم <span font-size='12' font-family='DejaVu Sans' >Hello world</span>");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 12.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(DevelTextEditor::Property::MIN_LINE_SIZE, 50.f);
+  editor.SetProperty(DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, false);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Tap on the text editor
+  TestGenerateTap(application, 3.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  //Select the last Arabic word (RTL) & some the space before the English (LTR) letters.
+  DevelTextEditor::SelectText(editor, 35, 41); // This will activate the alternative cursor position and thus 'cursorInfo.isSecondaryCursor' will be true.
+
+  application.SendNotification();
+  application.Render();
+
+  std::string selectedText = editor.GetProperty(DevelTextEditor::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("عليكم ", selectedText, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliTextEditorSelectionChangedSignal(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorSelectionChangedSignal");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  // connect to the selection changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextEditor::SelectionChangedSignal(editor).Connect(&TestSelectionChangedCallback);
+  bool selectionChangedSignal = false;
+  editor.ConnectSignal(testTracker, "selectionChanged", CallbackFunctor(&selectionChangedSignal));
+
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nworld\nHello world");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Tap on the text editor
+  TestGenerateTap(application, 3.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Move to second line of the text.
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Select some text in the right of the current cursor position
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(gSelectionChangedCallbackCalled);
+  DALI_TEST_EQUALS(oldSelectionStart, oldSelectionEnd, TEST_LOCATION);
+
+  gSelectionChangedCallbackCalled = false;
+
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(gSelectionChangedCallbackCalled);
+  DALI_TEST_EQUALS(oldSelectionStart, 6, TEST_LOCATION);
+  DALI_TEST_EQUALS(oldSelectionEnd, 7, TEST_LOCATION);
+
+  gSelectionChangedCallbackCalled = false;
+
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(gSelectionChangedCallbackCalled);
+  DALI_TEST_EQUALS(oldSelectionStart, 6, TEST_LOCATION);
+  DALI_TEST_EQUALS(oldSelectionEnd, 8, TEST_LOCATION);
+
+  gSelectionChangedCallbackCalled = false;
   editor.SetKeyInputFocus();
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DevelTextEditor::SelectText( editor ,0, 5 );
+  DevelTextEditor::SelectText(editor, 0, 5);
 
   application.SendNotification();
   application.Render();
@@ -4684,7 +5702,7 @@ int utcDaliTextEditorSelectionChangedSignal(void)
 
   gSelectionChangedCallbackCalled = false;
 
-  editor.SetProperty( DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
+  editor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4720,4 +5738,892 @@ int utcDaliTextEditorSelectionChangedSignal(void)
   DALI_TEST_EQUALS(oldSelectionEnd, 23, TEST_LOCATION);
 
   END_TEST;
+}
+
+int UtcDaliToolkitTextEditorStrikethroughGeneration(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextEditorStrikethroughGeneration");
+
+  TextEditor textEditor = TextEditor::New();
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+
+  application.GetScene().Add(textEditor);
+  application.SendNotification();
+  application.Render();
+
+  Property::Map strikethroughMapSet;
+  Property::Map strikethroughMapGet;
+
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::RED);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  // Check the strikethrough property
+  textEditor.SetProperty(DevelTextEditor::Property::STRIKETHROUGH, strikethroughMapSet);
+  strikethroughMapGet = textEditor.GetProperty<Property::Map>(DevelTextEditor::Property::STRIKETHROUGH);
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test1");
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapSet.Clear();
+  strikethroughMapGet.Clear();
+
+  END_TEST;
+}
+
+int utcDaliTextEditorInsertCharacterAfterInitWithResizePolicyNaturalSize(void)
+{
+  //This is to test a crash when used Resize Policy equals USE_NATURAL_SIZE
+  //DaliException on vector: "Iterator not inside vector"
+
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorInsertCharacterAfterInitWithResizePolicyNaturalSize");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  //Set multilines text
+  editor.SetProperty(Dali::Toolkit::TextEditor::Property::TEXT, "Hello \n World");
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  //Set ResizePolicy to NaturalSize
+  editor.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Create a tap event to touch the text editor.
+  TestGenerateTap(application, 5.0f, 5.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Set currsor and add character (in first line)
+  editor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 5);
+  application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::UP, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(editor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "Hellod \n World", TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 6, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextEditorRemoveCharacterAfterInitWithResizePolicyNaturalSize(void)
+{
+  //This is to test a crash when used Resize Policy equals USE_NATURAL_SIZE
+  //DaliException on vector: "Iterator not inside vector"
+
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorRemoveCharacterAfterInitWithResizePolicyNaturalSize");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  //Set multilines text
+  editor.SetProperty(Dali::Toolkit::TextEditor::Property::TEXT, "Hello \n World");
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  //Set ResizePolicy to NaturalSize
+  editor.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE);
+
+  // Set currsor
+  editor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 5);
+  application.SendNotification();
+  application.Render();
+
+  // Set focus and remove character
+  editor.SetKeyInputFocus();
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(editor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "Hell \n World", TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 4, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextEditorCutSelectedTextAfterInitWithResizePolicyNaturalSize(void)
+{
+  //This is to test a crash when used Resize Policy equals USE_NATURAL_SIZE
+  //DaliException on vector: "Iterator not inside vector"
+
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorCutSelectedTextAfterInitWithResizePolicyNaturalSize");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  //Set multilines text
+  editor.SetProperty(Dali::Toolkit::TextEditor::Property::TEXT, "Hello \n World");
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  //Set ResizePolicy to NaturalSize
+  editor.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE);
+
+  //Select text at initialization (before the first render)
+  DevelTextEditor::SelectText(editor, 3, 5);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  //Cut text
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_CONTROL_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("x", "x", "x", KEY_X_CODE, KEY_CONTROL_MODIFIER, 0, Integration::KeyEvent::DOWN, "x", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(editor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "Hel \n World", TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 3, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextEditorDoubleEnterAfterInitWithResizePolicyNaturalSize(void)
+{
+  //This is to test a crash when used Resize Policy equals USE_NATURAL_SIZE
+  //DaliException on vector: "Iterator not inside vector"
+
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorDoubleEnterAfterInitWithResizePolicyNaturalSize");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  //Set multilines text
+  editor.SetProperty(Dali::Toolkit::TextEditor::Property::TEXT, "Hello \n World");
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  //Set ResizePolicy to NaturalSize
+  editor.SetProperty(Dali::Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE);
+
+  // Set currsor
+  editor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 5);
+  application.SendNotification();
+  application.Render();
+
+  // Set focus and double enter (new line)
+  editor.SetKeyInputFocus();
+  application.ProcessEvent(GenerateKey("Enter", "", "\n", 13, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("Enter", "", "\n", 13, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(editor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "Hello\n\n \n World", TEST_LOCATION);
+  DALI_TEST_EQUALS(editor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 7, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextEditorUnderlineTypesGeneration1(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextEditorUnderlineTypesGeneration1");
+  TextEditor textEditor = TextEditor::New();
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Test");
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textEditor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  textEditor.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+
+  application.GetScene().Add(textEditor);
+  application.SendNotification();
+  application.Render();
+
+  Property::Map underlineMapSet;
+  Property::Map underlineMapGet;
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  // Check the underline property
+  textEditor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = textEditor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 4);
+  underlineMapSet.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  textEditor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = textEditor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 4);
+  underlineMapSet.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  textEditor.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = textEditor.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextEditorUnderlineTypesGeneration2(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextEditorUnderlineTypesGeneration2");
+
+  TextEditor textEditor1 = TextEditor::New();
+  textEditor1.SetProperty(TextEditor::Property::TEXT, "Test");
+  textEditor1.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textEditor1.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  textEditor1.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet1;
+  Property::Map underlineMapGet1;
+
+  underlineMapSet1.Insert("enable", true);
+  underlineMapSet1.Insert("color", Color::RED);
+  underlineMapSet1.Insert("height", 1);
+  underlineMapSet1.Insert("type", Text::Underline::SOLID);
+  underlineMapSet1.Insert("dashWidth", 2);
+  underlineMapSet1.Insert("dashGap", 1);
+
+  // Check the underline property
+  textEditor1.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet1);
+
+  underlineMapGet1 = textEditor1.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet1.Count(), underlineMapSet1.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet1, underlineMapSet1), true, TEST_LOCATION);
+
+  application.GetScene().Add(textEditor1);
+  application.SendNotification();
+  application.Render();
+
+  TextEditor textEditor2 = TextEditor::New();
+  textEditor2.SetProperty(TextEditor::Property::TEXT, "Test");
+  textEditor2.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textEditor2.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  textEditor2.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet2;
+  Property::Map underlineMapGet2;
+
+  underlineMapSet2.Insert("enable", true);
+  underlineMapSet2.Insert("color", Color::BLUE);
+  underlineMapSet2.Insert("height", 1);
+  underlineMapSet2.Insert("type", Text::Underline::DASHED);
+  underlineMapSet2.Insert("dashWidth", 4);
+  underlineMapSet2.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  textEditor2.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet2);
+
+  underlineMapGet2 = textEditor2.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet2.Count(), underlineMapSet2.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet2, underlineMapSet2), true, TEST_LOCATION);
+
+  application.GetScene().Add(textEditor2);
+  application.SendNotification();
+  application.Render();
+
+  TextEditor textEditor3 = TextEditor::New();
+  textEditor3.SetProperty(TextEditor::Property::TEXT, "Test");
+  textEditor3.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textEditor3.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  textEditor3.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet3;
+  Property::Map underlineMapGet3;
+
+  underlineMapSet3.Insert("enable", true);
+  underlineMapSet3.Insert("color", Color::BLUE);
+  underlineMapSet3.Insert("height", 1);
+  underlineMapSet3.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet3.Insert("dashWidth", 4);
+  underlineMapSet3.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  textEditor3.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet3);
+
+  underlineMapGet3 = textEditor3.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet3.Count(), underlineMapSet3.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet3, underlineMapSet3), true, TEST_LOCATION);
+
+  application.GetScene().Add(textEditor3);
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextEditorUnderlineTypesGeneration3(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextEditorUnderlineTypesGeneration3");
+
+  TextEditor textEditor1 = TextEditor::New();
+  textEditor1.SetProperty(TextEditor::Property::TEXT, "Test1");
+  textEditor1.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textEditor1.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  textEditor1.SetProperty(TextEditor::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet1;
+  Property::Map underlineMapGet1;
+
+  underlineMapSet1.Insert("enable", true);
+  underlineMapSet1.Insert("color", Color::RED);
+  underlineMapSet1.Insert("height", 1);
+  underlineMapSet1.Insert("type", Text::Underline::SOLID);
+  underlineMapSet1.Insert("dashWidth", 2);
+  underlineMapSet1.Insert("dashGap", 1);
+
+  // Check the underline property
+  textEditor1.SetProperty(TextEditor::Property::UNDERLINE, underlineMapSet1);
+  //textEditor1.SetProperty( TextEditor::Property::TEXT, "Test2" );
+
+  underlineMapGet1 = textEditor1.GetProperty<Property::Map>(TextEditor::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet1.Count(), underlineMapSet1.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet1, underlineMapSet1), true, TEST_LOCATION);
+
+  application.GetScene().Add(textEditor1);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextEditorMarkupRelativeLineHeight(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextEditorMarkupRelativeLineHeight");
+
+  TextEditor editor = TextEditor::New();
+  editor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  editor.SetProperty(TextEditor::Property::TEXT, "line 1\nline 2\nline 3\nline 4\nline 5");
+  editor.SetProperty(DevelTextEditor::Property::RELATIVE_LINE_SIZE, 1.0f);
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS, false);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+
+  TextEditor editorSingleLineParagraph = TextEditor::New();
+  editorSingleLineParagraph.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  editorSingleLineParagraph.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  editorSingleLineParagraph.SetProperty(TextEditor::Property::TEXT, "<p>line 1</p><p rel-line-height=0.5>line 2</p>line 3<p rel-line-height=3>line 4</p>line 5");
+  editorSingleLineParagraph.SetProperty(DevelTextEditor::Property::RELATIVE_LINE_SIZE, 1.0f);
+  editorSingleLineParagraph.SetProperty(DevelTextEditor::Property::ELLIPSIS, false);
+  editorSingleLineParagraph.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+
+  TextEditor editorMultiLineParagraph = TextEditor::New();
+  editorMultiLineParagraph.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  editorMultiLineParagraph.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  editorMultiLineParagraph.SetProperty(TextEditor::Property::TEXT, "<p>line 1</p><p rel-line-height=0.5>line\n2</p>line 3<p rel-line-height=3>line\n4</p>line 5");
+  editorMultiLineParagraph.SetProperty(DevelTextEditor::Property::RELATIVE_LINE_SIZE, 1.0f);
+  editorMultiLineParagraph.SetProperty(DevelTextEditor::Property::ELLIPSIS, false);
+  editorMultiLineParagraph.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+
+  application.GetScene().Add(editor);
+  application.GetScene().Add(editorSingleLineParagraph);
+  application.GetScene().Add(editorMultiLineParagraph);
+  application.SendNotification();
+  application.Render();
+
+  Vector3 naturalSize               = editor.GetNaturalSize();
+  Vector3 relativeSingleNaturalSize = editorSingleLineParagraph.GetNaturalSize();
+  Vector3 relativeMultiNaturalSize  = editorMultiLineParagraph.GetNaturalSize();
+
+  float lineSize = naturalSize.y / 5.0f; //total size/number of lines
+
+  //no effect of relative line size for paragraph with single line
+  DALI_TEST_EQUALS(naturalSize.y, relativeSingleNaturalSize.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(lineSize * 8.5f, relativeMultiNaturalSize.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextEditorRelativeLineHeight(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextEditorRelativeLineHeight");
+
+  TextEditor editor = TextEditor::New();
+  editor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10);
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello\nWorld");
+
+  application.GetScene().Add(editor);
+  application.SendNotification();
+  application.Render();
+
+  Vector3 naturalSize = editor.GetNaturalSize();
+
+  editor.SetProperty(DevelTextEditor::Property::RELATIVE_LINE_SIZE, 0.5f);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector3 relativeNaturalSize = editor.GetNaturalSize();
+
+  DALI_TEST_EQUALS(naturalSize.y, relativeNaturalSize.y, TEST_LOCATION);
+
+  editor.SetProperty(DevelTextEditor::Property::RELATIVE_LINE_SIZE, 2.0f);
+
+  application.SendNotification();
+  application.Render();
+
+  relativeNaturalSize = editor.GetNaturalSize();
+
+  DALI_TEST_EQUALS(naturalSize.y * 2, relativeNaturalSize.y, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliTextEditorCharacterSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextEditorCharacterSpacing ");
+
+  TextEditor textEditor = TextEditor::New();
+
+  textEditor.SetProperty(Actor::Property::SIZE, Vector2(150.0f, 300.f));
+
+  application.GetScene().Add(textEditor);
+  application.SendNotification();
+  application.Render();
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "Hi Experiment");
+  textEditor.SetProperty(DevelTextEditor::Property::CHARACTER_SPACING, 10.f);
+  DALI_TEST_EQUALS(textEditor.GetProperty<float>(DevelTextEditor::Property::CHARACTER_SPACING), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorTextSizeNegativeLineSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextEditorTextSizeNegativeLineSpacing");
+
+  TextEditor editor = TextEditor::New();
+
+  float lineSpacing = -20.f;
+
+  editor.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(DevelTextEditor::Property::LINE_SPACING, lineSpacing);
+  editor.SetProperty(TextEditor::Property::TEXT, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.GetScene().Add(editor);
+  application.SendNotification();
+  application.Render();
+
+  Vector<Vector2> positionsList = DevelTextEditor::GetTextPosition(editor, 0, 123);
+  Vector<Vector2> sizeList      = DevelTextEditor::GetTextSize(editor, 0, 123);
+
+  Vector2 lastLinePos  = positionsList[positionsList.Size() - 1];
+  Vector2 lastLineSize = sizeList[sizeList.Size() - 1];
+
+  DALI_TEST_EQUALS(sizeList[0].y * (sizeList.Size() - 1), lastLinePos.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList[0].y - lineSpacing, lastLineSize.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorLineSpacingKeyArrowDown(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextEditorLineSpacingKeyArrowDown");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  std::string cutText    = "";
+  std::string copiedText = "";
+
+  editor.SetProperty(TextEditor::Property::TEXT, "l1\nl2\nl3\n4");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(300.f, 200.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editor.SetProperty(TextEditor::Property::LINE_SPACING, -15);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Tap on the text editor
+  TestGenerateTap(application, 1.0f, 1.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Move to second line of the text.
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(editor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 3, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextEditorNegativeLineSpacingWithEllipsis(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextEditorNegativeLineSpacingWithEllipsis");
+
+  TextEditor editor = TextEditor::New();
+
+  float lineSpacing = -20.f;
+
+  editor.SetProperty(Actor::Property::SIZE, Vector2(480.0f, 100.f));
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 11.0f);
+  editor.SetProperty(DevelTextEditor::Property::LINE_SPACING, lineSpacing);
+  editor.SetProperty(TextEditor::Property::TEXT, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+  editor.SetProperty(DevelTextEditor::Property::ELLIPSIS, true);
+
+  application.GetScene().Add(editor);
+  application.SendNotification();
+  application.Render();
+
+  Vector<Vector2> sizeList = DevelTextEditor::GetTextSize(editor, 0, 123);
+
+  int lineCount = sizeList.Size();
+  DALI_TEST_EQUALS(4, lineCount, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTexteditorParagraphTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTexteditorParagraphTag");
+  TextEditor editorNewlineSeparator = TextEditor::New();
+  TextEditor editorParagraphTag     = TextEditor::New();
+  DALI_TEST_CHECK(editorNewlineSeparator);
+  DALI_TEST_CHECK(editorParagraphTag);
+
+  application.GetScene().Add(editorNewlineSeparator);
+  application.GetScene().Add(editorParagraphTag);
+
+  //Same utterance uses new-line to split paragraphs should give similar results for paragraph tag.
+  editorNewlineSeparator.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editorNewlineSeparator.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editorNewlineSeparator.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editorNewlineSeparator.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editorNewlineSeparator.SetProperty(TextEditor::Property::TEXT, "test paragraph tag \ntest paragraph tag \ntest paragraph tag ");
+
+  editorParagraphTag.SetProperty(TextEditor::Property::ENABLE_MARKUP, true);
+  editorParagraphTag.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editorParagraphTag.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editorParagraphTag.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editorParagraphTag.SetProperty(TextEditor::Property::TEXT, "test paragraph tag <p>test paragraph tag </p>test paragraph tag ");
+
+  application.SendNotification();
+  application.Render();
+
+  Vector3 textNaturalSizeNewlineSeparator = editorNewlineSeparator.GetNaturalSize();
+  Vector3 textNaturalSizeParagraphTag     = editorParagraphTag.GetNaturalSize();
+
+  DALI_TEST_EQUALS(textNaturalSizeNewlineSeparator, textNaturalSizeParagraphTag, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+//Handle Emoji clustering for cursor handling
+int utcDaliTextEditorClusteredEmojiDeletionBackSpaceKey(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorClusteredEmojiDeletionBackSpaceKey ");
+  TextEditor textEditor = TextEditor::New();
+  DALI_TEST_CHECK(textEditor);
+
+  application.GetScene().Add(textEditor);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "ABC&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;XY");
+  textEditor.SetProperty(Dali::Toolkit::TextEditor::Property::ENABLE_MARKUP, true);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Set currsor
+  textEditor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 10);
+  application.SendNotification();
+  application.Render();
+
+  // Set focus and remove Emoji
+  textEditor.SetKeyInputFocus();
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "ABCXY", TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 3, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextEditorClusteredEmojiDeletionDeleteKey(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorClusteredEmojiDeletionDeleteKey ");
+  TextEditor textEditor = TextEditor::New();
+  DALI_TEST_CHECK(textEditor);
+
+  application.GetScene().Add(textEditor);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  textEditor.SetProperty(TextEditor::Property::TEXT, "ABC&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;XY");
+  textEditor.SetProperty(Dali::Toolkit::TextEditor::Property::ENABLE_MARKUP, true);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Set currsor
+  textEditor.SetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION, 3);
+  application.SendNotification();
+  application.Render();
+
+  // Set focus and remove Emoji
+  textEditor.SetKeyInputFocus();
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(textEditor.GetProperty(TextEditor::Property::TEXT).Get<std::string>(), "ABCXY", TEST_LOCATION);
+  DALI_TEST_EQUALS(textEditor.GetProperty(DevelTextEditor::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 3, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextEditorPanGesturePropagation(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorPanGesturePropagation");
+
+  Actor actor = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(actor);
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  editor.SetProperty(TextEditor::Property::TEXT, "This is a long text for the size of the text-editor.");
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+
+  editor.SetProperty(Actor::Property::SIZE, Vector2(30.f, 500.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  actor.Add(editor);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  SignalData             data;
+  GestureReceivedFunctor functor(data);
+
+  PanGestureDetector detector = PanGestureDetector::New();
+  detector.Attach(actor);
+  detector.DetectedSignal().Connect(&application, functor);
+
+  // Tap first to get the focus.
+  TestGenerateTap(application, 3.0f, 25.0f, 100);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Pan the text editor
+  uint32_t time = 100;
+  TestStartPan(application, Vector2(10.0f, 50.0f), Vector2(10.0f, 50.0f), time);
+  TestMovePan(application, Vector2(10.0f, 30.0f), time);
+  TestEndPan(application, Vector2(10.0f, 50.0f), time);
+  application.SendNotification();
+  application.Render();
+
+  // The text scrolls because there is text that is scrolling.
+  DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+  data.Reset();
+
+  // Set the size large enough to prevent scrolling.
+  editor.SetProperty(Actor::Property::SIZE, Vector2(500.f, 500.f));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  time = 200;
+  TestStartPan(application, Vector2(10.0f, 50.0f), Vector2(10.0f, 50.0f), time);
+  TestMovePan(application, Vector2(10.0f, 30.0f), time);
+  TestEndPan(application, Vector2(10.0f, 50.0f), time);
+
+  // Because scrolling is not possible, the pan gesture is propagated.
+  DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+  data.Reset();
+
+  END_TEST;
+}
+
+int utcDaliTextEditorGetTextBoundingRectangle(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextEditorGeometryEllipsisMiddle");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 7.f);
+  editor.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  editor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  editor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello this is the Text Bounding Rectangle TC");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int startIndex = 0;
+  unsigned int endIndex   = 15;
+
+  Rect<> textBoundingRectangle         = DevelTextEditor::GetTextBoundingRectangle(editor, startIndex, endIndex);
+  Rect<> expectedTextBoundingRectangle = {0, 0, 100, 50};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(textBoundingRectangle, expectedTextBoundingRectangle);
+
+  END_TEST;
 }
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
index e8bf4b6..ccc6bb3 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,25 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
-#include <dali/public-api/rendering/renderer.h>
-#include <dali/integration-api/events/key-event-integ.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-
-#include <dali/devel-api/adaptor-framework/key-devel.h>
-#include <dali/devel-api/text-abstraction/font-client.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-field-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
-#include "toolkit-clipboard.h"
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/key-devel.h>
+#include <dali/devel-api/events/pan-gesture-devel.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/integration-api/events/key-event-integ.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/public-api/rendering/renderer.h>
+#include "test-text-geometry-utils.h"
+#include "toolkit-clipboard.h"
 
 using namespace Dali;
 using namespace Toolkit;
@@ -47,7 +50,6 @@ void dali_textfield_cleanup(void)
 
 namespace
 {
-
 const char* const PROPERTY_NAME_RENDERING_BACKEND                    = "renderingBackend";
 const char* const PROPERTY_NAME_TEXT                                 = "text";
 const char* const PROPERTY_NAME_PLACEHOLDER_TEXT                     = "placeholderText";
@@ -71,6 +73,7 @@ const char* const PROPERTY_NAME_GRAB_HANDLE_IMAGE                    = "grabHand
 const char* const PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE            = "grabHandlePressedImage";
 const char* const PROPERTY_NAME_SCROLL_THRESHOLD                     = "scrollThreshold";
 const char* const PROPERTY_NAME_SCROLL_SPEED                         = "scrollSpeed";
+const char* const PROPERTY_NAME_SELECTION_POPUP_STYLE                = "selectionPopupStyle";
 const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT          = "selectionHandleImageLeft";
 const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT         = "selectionHandleImageRight";
 const char* const PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT  = "selectionHandlePressedImageLeft";
@@ -86,62 +89,66 @@ const char* const PROPERTY_NAME_INPUT_FONT_FAMILY                    = "inputFon
 const char* const PROPERTY_NAME_INPUT_FONT_STYLE                     = "inputFontStyle";
 const char* const PROPERTY_NAME_INPUT_POINT_SIZE                     = "inputPointSize";
 
-const char* const PROPERTY_NAME_UNDERLINE                            = "underline";
-const char* const PROPERTY_NAME_INPUT_UNDERLINE                      = "inputUnderline";
-const char* const PROPERTY_NAME_SHADOW                               = "shadow";
-const char* const PROPERTY_NAME_INPUT_SHADOW                         = "inputShadow";
-const char* const PROPERTY_NAME_EMBOSS                               = "emboss";
-const char* const PROPERTY_NAME_INPUT_EMBOSS                         = "inputEmboss";
-const char* const PROPERTY_NAME_OUTLINE                              = "outline";
-const char* const PROPERTY_NAME_INPUT_OUTLINE                        = "inputOutline";
-
-const char* const PROPERTY_NAME_HIDDEN_INPUT_SETTINGS                = "hiddenInputSettings";
-const char* const PROPERTY_NAME_PIXEL_SIZE                           = "pixelSize";
-const char* const PROPERTY_NAME_ENABLE_SELECTION                     = "enableSelection";
-const char* const PROPERTY_NAME_PLACEHOLDER                          = "placeholder";
-const char* const PROPERTY_NAME_ELLIPSIS                             = "ellipsis";
-const char* const PROPERTY_NAME_ENABLE_SHIFT_SELECTION               = "enableShiftSelection";
-const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE                   = "enableGrabHandle";
-const char* const PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION      = "matchSystemLanguageDirection";
-const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP             = "enableGrabHandlePopup";
-const char* const PROPERTY_NAME_BACKGROUND                           = "textBackground";
-const char* const PROPERTY_NAME_FONT_SIZE_SCALE                      = "fontSizeScale";
-const char* const PROPERTY_NAME_GRAB_HANDLE_COLOR                    = "grabHandleColor";
-const char* const PROPERTY_NAME_INPUT_FILTER                         = "inputFilter";
-
-const Vector4 PLACEHOLDER_TEXT_COLOR( 0.8f, 0.8f, 0.8f, 0.8f );
-const Dali::Vector4 LIGHT_BLUE( 0.75f, 0.96f, 1.f, 1.f ); // The text highlight color.
+const char* const PROPERTY_NAME_UNDERLINE           = "underline";
+const char* const PROPERTY_NAME_INPUT_UNDERLINE     = "inputUnderline";
+const char* const PROPERTY_NAME_SHADOW              = "shadow";
+const char* const PROPERTY_NAME_INPUT_SHADOW        = "inputShadow";
+const char* const PROPERTY_NAME_EMBOSS              = "emboss";
+const char* const PROPERTY_NAME_INPUT_EMBOSS        = "inputEmboss";
+const char* const PROPERTY_NAME_OUTLINE             = "outline";
+const char* const PROPERTY_NAME_INPUT_OUTLINE       = "inputOutline";
+const char* const PROPERTY_NAME_STRIKETHROUGH       = "strikethrough";
+const char* const PROPERTY_NAME_INPUT_STRIKETHROUGH = "inputStrikethrough";
+
+const char* const PROPERTY_NAME_HIDDEN_INPUT_SETTINGS           = "hiddenInputSettings";
+const char* const PROPERTY_NAME_PIXEL_SIZE                      = "pixelSize";
+const char* const PROPERTY_NAME_ENABLE_SELECTION                = "enableSelection";
+const char* const PROPERTY_NAME_PLACEHOLDER                     = "placeholder";
+const char* const PROPERTY_NAME_ELLIPSIS                        = "ellipsis";
+const char* const PROPERTY_NAME_ENABLE_SHIFT_SELECTION          = "enableShiftSelection";
+const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE              = "enableGrabHandle";
+const char* const PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION = "matchSystemLanguageDirection";
+const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP        = "enableGrabHandlePopup";
+const char* const PROPERTY_NAME_BACKGROUND                      = "textBackground";
+const char* const PROPERTY_NAME_FONT_SIZE_SCALE                 = "fontSizeScale";
+const char* const PROPERTY_NAME_ENABLE_FONT_SIZE_SCALE          = "enableFontSizeScale";
+const char* const PROPERTY_NAME_GRAB_HANDLE_COLOR               = "grabHandleColor";
+const char* const PROPERTY_NAME_INPUT_FILTER                    = "inputFilter";
+
+const Vector4       PLACEHOLDER_TEXT_COLOR(0.8f, 0.8f, 0.8f, 0.8f);
+const Dali::Vector4 LIGHT_BLUE(0.75f, 0.96f, 1.f, 1.f); // The text highlight color.
 
 const float RENDER_FRAME_INTERVAL = 16.66f;
 
 const unsigned int DEFAULT_FONT_SIZE = 1152u;
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string  DEFAULT_FONT_DIR("/resources/fonts");
 
-const int KEY_RETURN_CODE = 36;
-const int KEY_A_CODE = 38;
-const int KEY_D_CODE = 40;
+const int KEY_RETURN_CODE    = 36;
+const int KEY_A_CODE         = 38;
+const int KEY_D_CODE         = 40;
 const int KEY_SHIFT_MODIFIER = 257;
 
 const std::string DEFAULT_DEVICE_NAME("hwKeyboard");
 
-static bool gSelectionChangedCallbackCalled;
-static uint32_t oldSelectionStart;
-static uint32_t oldSelectionEnd;
-static bool gSelectionClearedCallbackCalled;
-static bool gAnchorClickedCallBackCalled;
-static bool gAnchorClickedCallBackNotCalled;
-static bool gTextChangedCallBackCalled;
-static bool gMaxCharactersCallBackCalled;
-static bool gInputFilteredAcceptedCallbackCalled;
-static bool gInputFilteredRejectedCallbackCalled;
-static bool gInputStyleChangedCallbackCalled;
-static bool gCursorPositionChangedCallbackCalled;
-static uint32_t oldCursorPos;
+static bool                                       gSelectionChangedCallbackCalled;
+static uint32_t                                   oldSelectionStart;
+static uint32_t                                   oldSelectionEnd;
+static bool                                       gSelectionClearedCallbackCalled;
+static bool                                       gSelectionStartedCallbackCalled;
+static bool                                       gAnchorClickedCallBackCalled;
+static bool                                       gAnchorClickedCallBackNotCalled;
+static bool                                       gTextChangedCallBackCalled;
+static bool                                       gMaxCharactersCallBackCalled;
+static bool                                       gInputFilteredAcceptedCallbackCalled;
+static bool                                       gInputFilteredRejectedCallbackCalled;
+static bool                                       gInputStyleChangedCallbackCalled;
+static bool                                       gCursorPositionChangedCallbackCalled;
+static uint32_t                                   oldCursorPos;
 static Dali::Toolkit::TextField::InputStyle::Mask gInputStyleMask;
 
 static void LoadBitmapResource(TestPlatformAbstraction& platform, int width, int height)
 {
-  Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
+  Integration::Bitmap*         bitmap = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD);
   Integration::ResourcePointer resource(bitmap);
   bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, width, height, width, height);
 }
@@ -150,20 +157,20 @@ static void LoadMarkerImages(ToolkitTestApplication& app, TextField textField)
 {
   int width(40);
   int height(40);
-  LoadBitmapResource( app.GetPlatform(), width, height );
+  LoadBitmapResource(app.GetPlatform(), width, height);
 
   Property::Map propertyMap;
   propertyMap["filename"] = "image.png";
-  propertyMap["width"] = width;
-  propertyMap["height"] = height;
-  textField.SetProperty( Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT, propertyMap );
-  textField.SetProperty( Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT, propertyMap );
-  textField.SetProperty( Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, propertyMap );
-  textField.SetProperty( Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, propertyMap );
-  textField.SetProperty( Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT, propertyMap );
-  textField.SetProperty( Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT, propertyMap );
-  textField.SetProperty( Toolkit::TextField::Property::GRAB_HANDLE_IMAGE, propertyMap );
-  textField.SetProperty( Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE, propertyMap );
+  propertyMap["width"]    = width;
+  propertyMap["height"]   = height;
+  textField.SetProperty(Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT, propertyMap);
+  textField.SetProperty(Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT, propertyMap);
+  textField.SetProperty(Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, propertyMap);
+  textField.SetProperty(Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, propertyMap);
+  textField.SetProperty(Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT, propertyMap);
+  textField.SetProperty(Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT, propertyMap);
+  textField.SetProperty(Toolkit::TextField::Property::GRAB_HANDLE_IMAGE, "image.png");
+  textField.SetProperty(Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE, "image.png");
 }
 
 /*
@@ -179,7 +186,7 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -189,26 +196,26 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
   return time;
 }
 
-Dali::Integration::Point GetPointDownInside( Vector2& pos )
+Dali::Integration::Point GetPointDownInside(Vector2& pos)
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( pos );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(pos);
   return point;
 }
 
-Dali::Integration::Point GetPointUpInside( Vector2& pos )
+Dali::Integration::Point GetPointUpInside(Vector2& pos)
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( pos );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(pos);
   return point;
 }
 
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -226,13 +233,20 @@ static void TestSelectionClearedCallback(TextField control)
   gSelectionClearedCallbackCalled = true;
 }
 
+static void TestSelectionStartedCallback(TextField control)
+{
+  tet_infoline(" TestSelectionStartedCallback");
+
+  gSelectionStartedCallbackCalled = true;
+}
+
 static void TestSelectionChangedCallback(TextField control, uint32_t oldStart, uint32_t oldEnd)
 {
   tet_infoline(" TestSelectionChangedCallback");
 
   gSelectionChangedCallbackCalled = true;
-  oldSelectionStart = oldStart;
-  oldSelectionEnd   = oldEnd;
+  oldSelectionStart               = oldStart;
+  oldSelectionEnd                 = oldEnd;
 }
 
 static void TestAnchorClickedCallback(TextField control, const char* href, unsigned int hrefLength)
@@ -241,28 +255,28 @@ static void TestAnchorClickedCallback(TextField control, const char* href, unsig
 
   gAnchorClickedCallBackNotCalled = false;
 
-  if (!strcmp(href, "https://www.tizen.org") && hrefLength == strlen(href))
+  if(!strcmp(href, "https://www.tizen.org") && hrefLength == strlen(href))
   {
     gAnchorClickedCallBackCalled = true;
   }
 }
 
-static void TestCursorPositionChangedCallback( TextField control, unsigned int oldPos )
+static void TestCursorPositionChangedCallback(TextField control, unsigned int oldPos)
 {
   tet_infoline(" TestCursorPositionChangedCallback");
 
   gCursorPositionChangedCallbackCalled = true;
-  oldCursorPos = oldPos;
+  oldCursorPos                         = oldPos;
 }
 
-static void TestTextChangedCallback( TextField control )
+static void TestTextChangedCallback(TextField control)
 {
   tet_infoline(" TestTextChangedCallback");
 
   gTextChangedCallBackCalled = true;
 }
 
-static void TestMaxLengthReachedCallback( TextField control )
+static void TestMaxLengthReachedCallback(TextField control)
 {
   tet_infoline(" TestMaxLengthReachedCallback");
 
@@ -283,105 +297,105 @@ static void TestInputFilteredCallback(TextField control, Toolkit::InputFilter::P
   }
 }
 
-static void TestInputStyleChangedCallback( TextField control, TextField::InputStyle::Mask mask )
+static void TestInputStyleChangedCallback(TextField control, TextField::InputStyle::Mask mask)
 {
   tet_infoline(" TestInputStyleChangedCallback");
 
   gInputStyleChangedCallbackCalled = true;
-  gInputStyleMask = mask;
+  gInputStyleMask                  = mask;
 }
 
 // Generate a KeyEvent to send to Core.
-Integration::KeyEvent GenerateKey( const std::string& keyName,
-                                   const std::string& logicalKey,
-                                   const std::string& keyString,
-                                   int keyCode,
-                                   int keyModifier,
-                                   unsigned long timeStamp,
-                                   const Integration::KeyEvent::State& keyState,
-                                   const std::string& compose = "",
-                                   const std::string& deviceName = DEFAULT_DEVICE_NAME,
-                                   const Device::Class::Type& deviceClass = Device::Class::NONE,
-                                   const Device::Subclass::Type& deviceSubclass = Device::Subclass::NONE )
+Integration::KeyEvent GenerateKey(const std::string&                  keyName,
+                                  const std::string&                  logicalKey,
+                                  const std::string&                  keyString,
+                                  int                                 keyCode,
+                                  int                                 keyModifier,
+                                  unsigned long                       timeStamp,
+                                  const Integration::KeyEvent::State& keyState,
+                                  const std::string&                  compose        = "",
+                                  const std::string&                  deviceName     = DEFAULT_DEVICE_NAME,
+                                  const Device::Class::Type&          deviceClass    = Device::Class::NONE,
+                                  const Device::Subclass::Type&       deviceSubclass = Device::Subclass::NONE)
 {
-  return Integration::KeyEvent( keyName,
-                                logicalKey,
-                                keyString,
-                                keyCode,
-                                keyModifier,
-                                timeStamp,
-                                keyState,
-                                compose,
-                                deviceName,
-                                deviceClass,
-                                deviceSubclass );
+  return Integration::KeyEvent(keyName,
+                               logicalKey,
+                               keyString,
+                               keyCode,
+                               keyModifier,
+                               timeStamp,
+                               keyState,
+                               compose,
+                               deviceName,
+                               deviceClass,
+                               deviceSubclass);
 }
 
-bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet )
+bool DaliTestCheckMaps(const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet)
 {
-  if( fontStyleMapGet.Count() == fontStyleMapSet.Count() )
+  if(fontStyleMapGet.Count() == fontStyleMapSet.Count())
   {
-    for( unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index )
+    for(unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index)
     {
-      const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue( index );
+      const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue(index);
 
       Property::Value* valueSet = NULL;
-      if ( valueGet.first.type == Property::Key::INDEX )
+      if(valueGet.first.type == Property::Key::INDEX)
       {
-        valueSet = fontStyleMapSet.Find( valueGet.first.indexKey );
+        valueSet = fontStyleMapSet.Find(valueGet.first.indexKey);
       }
       else
       {
         // Get Key is a string so searching Set Map for a string key
-        valueSet = fontStyleMapSet.Find( valueGet.first.stringKey );
+        valueSet = fontStyleMapSet.Find(valueGet.first.stringKey);
       }
 
-      if( NULL != valueSet )
+      if(NULL != valueSet)
       {
-        if( valueSet->GetType() == Dali::Property::STRING && ( valueGet.second.Get<std::string>() != valueSet->Get<std::string>() ) )
+        if(valueSet->GetType() == Dali::Property::STRING && (valueGet.second.Get<std::string>() != valueSet->Get<std::string>()))
         {
-          tet_printf( "Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str() );
+          tet_printf("Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::BOOLEAN && ( valueGet.second.Get<bool>() != valueSet->Get<bool>() ) )
+        else if(valueSet->GetType() == Dali::Property::BOOLEAN && (valueGet.second.Get<bool>() != valueSet->Get<bool>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::INTEGER && ( valueGet.second.Get<int>() != valueSet->Get<int>() ) )
+        else if(valueSet->GetType() == Dali::Property::INTEGER && (valueGet.second.Get<int>() != valueSet->Get<int>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::FLOAT && ( valueGet.second.Get<float>() != valueSet->Get<float>() ) )
+        else if(valueSet->GetType() == Dali::Property::FLOAT && (valueGet.second.Get<float>() != valueSet->Get<float>()))
         {
-          tet_printf( "Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>() );
+          tet_printf("Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::VECTOR2 && ( valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>() ) )
+        else if(valueSet->GetType() == Dali::Property::VECTOR2 && (valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>()))
         {
           Vector2 vector2Get = valueGet.second.Get<Vector2>();
           Vector2 vector2Set = valueSet->Get<Vector2>();
-          tet_printf( "Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y );
+          tet_printf("Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y);
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::VECTOR4 && ( valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>() ) )
+        else if(valueSet->GetType() == Dali::Property::VECTOR4 && (valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>()))
         {
           Vector4 vector4Get = valueGet.second.Get<Vector4>();
           Vector4 vector4Set = valueSet->Get<Vector4>();
-          tet_printf( "Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a );
+          tet_printf("Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a);
           return false;
         }
       }
       else
       {
-        if ( valueGet.first.type == Property::Key::INDEX )
+        if(valueGet.first.type == Property::Key::INDEX)
         {
-          tet_printf( "  The key %d doesn't exist.", valueGet.first.indexKey );
+          tet_printf("  The key %d doesn't exist.", valueGet.first.indexKey);
         }
         else
         {
-          tet_printf( "  The key %s doesn't exist.", valueGet.first.stringKey.c_str() );
+          tet_printf("  The key %s doesn't exist.", valueGet.first.stringKey.c_str());
         }
         return false;
       }
@@ -391,6 +405,55 @@ bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Ma
   return true;
 }
 
+// Stores data that is populated in the callback and will be read by the test cases
+struct SignalData
+{
+  SignalData()
+  : functorCalled(false),
+    voidFunctorCalled(false),
+    receivedGesture()
+  {
+  }
+
+  void Reset()
+  {
+    functorCalled     = false;
+    voidFunctorCalled = false;
+
+    receivedGesture.Reset();
+
+    pannedActor.Reset();
+  }
+
+  bool       functorCalled;
+  bool       voidFunctorCalled;
+  PanGesture receivedGesture;
+  Actor      pannedActor;
+};
+
+// Functor that sets the data when called
+struct GestureReceivedFunctor
+{
+  GestureReceivedFunctor(SignalData& data)
+  : signalData(data)
+  {
+  }
+
+  void operator()(Actor actor, const PanGesture& pan)
+  {
+    signalData.functorCalled   = true;
+    signalData.receivedGesture = pan;
+    signalData.pannedActor     = actor;
+  }
+
+  void operator()()
+  {
+    signalData.voidFunctorCalled = true;
+  }
+
+  SignalData& signalData;
+};
+
 } // namespace
 
 int UtcDaliToolkitTextFieldConstructorP(void)
@@ -398,7 +461,7 @@ int UtcDaliToolkitTextFieldConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldConstructorP");
   TextField textField;
-  DALI_TEST_CHECK( !textField );
+  DALI_TEST_CHECK(!textField);
   END_TEST;
 }
 
@@ -407,7 +470,7 @@ int UtcDaliToolkitTextFieldNewP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldNewP");
   TextField textField = TextField::New();
-  DALI_TEST_CHECK( textField );
+  DALI_TEST_CHECK(textField);
   END_TEST;
 }
 
@@ -415,14 +478,14 @@ int UtcDaliToolkitTextFieldDownCastP(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldDownCastP");
-  TextField textField1 = TextField::New();
-  BaseHandle object( textField1 );
+  TextField  textField1 = TextField::New();
+  BaseHandle object(textField1);
 
-  TextField textField2 = TextField::DownCast( object );
-  DALI_TEST_CHECK( textField2 );
+  TextField textField2 = TextField::DownCast(object);
+  DALI_TEST_CHECK(textField2);
 
-  TextField textField3 = DownCast< TextField >( object );
-  DALI_TEST_CHECK( textField3 );
+  TextField textField3 = DownCast<TextField>(object);
+  DALI_TEST_CHECK(textField3);
   END_TEST;
 }
 
@@ -431,11 +494,11 @@ int UtcDaliToolkitTextFieldDownCastN(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldDownCastN");
   BaseHandle uninitializedObject;
-  TextField textField1 = TextField::DownCast( uninitializedObject );
-  DALI_TEST_CHECK( !textField1 );
+  TextField  textField1 = TextField::DownCast(uninitializedObject);
+  DALI_TEST_CHECK(!textField1);
 
-  TextField textField2 = DownCast< TextField >( uninitializedObject );
-  DALI_TEST_CHECK( !textField2 );
+  TextField textField2 = DownCast<TextField>(uninitializedObject);
+  DALI_TEST_CHECK(!textField2);
   END_TEST;
 }
 
@@ -444,11 +507,11 @@ int UtcDaliToolkitTextFieldCopyConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldCopyConstructorP");
   TextField textField = TextField::New();
-  textField.SetProperty( TextField::Property::TEXT, "Test" );
+  textField.SetProperty(TextField::Property::TEXT, "Test");
 
-  TextField copy( textField );
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<std::string>( TextLabel::Property::TEXT ) == textField.GetProperty<std::string>( TextLabel::Property::TEXT ) );
+  TextField copy(textField);
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<std::string>(TextField::Property::TEXT) == textField.GetProperty<std::string>(TextField::Property::TEXT));
   END_TEST;
 }
 
@@ -457,14 +520,14 @@ int UtcDaliTextFieldMoveConstructor(void)
   ToolkitTestApplication application;
 
   TextField textField = TextField::New();
-  textField.SetProperty( TextEditor::Property::TEXT, "Test" );
-  DALI_TEST_CHECK( textField.GetProperty<std::string>( TextField::Property::TEXT ) == "Test" );
+  textField.SetProperty(TextEditor::Property::TEXT, "Test");
+  DALI_TEST_CHECK(textField.GetProperty<std::string>(TextField::Property::TEXT) == "Test");
 
-  TextField moved = std::move( textField );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<std::string>( TextField::Property::TEXT ) == "Test" );
-  DALI_TEST_CHECK( !textField );
+  TextField moved = std::move(textField);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<std::string>(TextField::Property::TEXT) == "Test");
+  DALI_TEST_CHECK(!textField);
 
   END_TEST;
 }
@@ -474,11 +537,11 @@ int UtcDaliToolkitTextFieldAssignmentOperatorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldAssignmentOperatorP");
   TextField textField = TextField::New();
-  textField.SetProperty( TextField::Property::TEXT, "Test" );
+  textField.SetProperty(TextField::Property::TEXT, "Test");
 
   TextField copy = textField;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<std::string>( TextField::Property::TEXT ) == textField.GetProperty<std::string>( TextField::Property::TEXT ) );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<std::string>(TextField::Property::TEXT) == textField.GetProperty<std::string>(TextField::Property::TEXT));
   END_TEST;
 }
 
@@ -487,15 +550,15 @@ int UtcDaliTextFieldMoveAssignment(void)
   ToolkitTestApplication application;
 
   TextField textField = TextField::New();
-  textField.SetProperty( TextEditor::Property::TEXT, "Test" );
-  DALI_TEST_CHECK( textField.GetProperty<std::string>( TextField::Property::TEXT ) == "Test" );
+  textField.SetProperty(TextEditor::Property::TEXT, "Test");
+  DALI_TEST_CHECK(textField.GetProperty<std::string>(TextField::Property::TEXT) == "Test");
 
   TextField moved;
-  moved = std::move( textField );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<std::string>( TextField::Property::TEXT ) == "Test" );
-  DALI_TEST_CHECK( !textField );
+  moved = std::move(textField);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<std::string>(TextField::Property::TEXT) == "Test");
+  DALI_TEST_CHECK(!textField);
 
   END_TEST;
 }
@@ -505,7 +568,7 @@ int UtcDaliTextFieldNewP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldNewP");
   TextField textField = TextField::New();
-  DALI_TEST_CHECK( textField );
+  DALI_TEST_CHECK(textField);
   END_TEST;
 }
 
@@ -515,82 +578,86 @@ int UtcDaliTextFieldGetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldGetPropertyP");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
   // Check Property Indices are correct
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_RENDERING_BACKEND ) == DevelTextField::Property::RENDERING_BACKEND );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_TEXT ) == TextField::Property::TEXT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER_TEXT ) == TextField::Property::PLACEHOLDER_TEXT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER_TEXT_FOCUSED ) == TextField::Property::PLACEHOLDER_TEXT_FOCUSED );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_FONT_FAMILY ) == TextField::Property::FONT_FAMILY );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_FONT_STYLE ) == TextField::Property::FONT_STYLE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_POINT_SIZE ) == TextField::Property::POINT_SIZE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_MAX_LENGTH ) == TextField::Property::MAX_LENGTH );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_EXCEED_POLICY ) == TextField::Property::EXCEED_POLICY );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_HORIZONTAL_ALIGNMENT ) == TextField::Property::HORIZONTAL_ALIGNMENT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_VERTICAL_ALIGNMENT ) == TextField::Property::VERTICAL_ALIGNMENT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_TEXT_COLOR ) == TextField::Property::TEXT_COLOR );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR ) == TextField::Property::PLACEHOLDER_TEXT_COLOR );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PRIMARY_CURSOR_COLOR ) == TextField::Property::PRIMARY_CURSOR_COLOR );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SECONDARY_CURSOR_COLOR ) == TextField::Property::SECONDARY_CURSOR_COLOR );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_CURSOR_BLINK ) == TextField::Property::ENABLE_CURSOR_BLINK );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_CURSOR_BLINK_INTERVAL ) == TextField::Property::CURSOR_BLINK_INTERVAL );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_CURSOR_BLINK_DURATION ) == TextField::Property::CURSOR_BLINK_DURATION );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_CURSOR_WIDTH ) == TextField::Property::CURSOR_WIDTH );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_GRAB_HANDLE_IMAGE ) == TextField::Property::GRAB_HANDLE_IMAGE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE ) == TextField::Property::GRAB_HANDLE_PRESSED_IMAGE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SCROLL_THRESHOLD ) == TextField::Property::SCROLL_THRESHOLD );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SCROLL_SPEED ) == TextField::Property::SCROLL_SPEED );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT ) == TextField::Property::SELECTION_HANDLE_IMAGE_LEFT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT ) == TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT ) == TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT ) == TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_LEFT ) == TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_RIGHT ) == TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SELECTION_HIGHLIGHT_COLOR ) == TextField::Property::SELECTION_HIGHLIGHT_COLOR );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_DECORATION_BOUNDING_BOX ) == TextField::Property::DECORATION_BOUNDING_BOX );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_METHOD_SETTINGS ) == TextField::Property::INPUT_METHOD_SETTINGS );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_COLOR ) == TextField::Property::INPUT_COLOR );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_MARKUP ) == TextField::Property::ENABLE_MARKUP );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_FONT_FAMILY ) == TextField::Property::INPUT_FONT_FAMILY );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_FONT_STYLE ) == TextField::Property::INPUT_FONT_STYLE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_POINT_SIZE ) == TextField::Property::INPUT_POINT_SIZE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_UNDERLINE ) == TextField::Property::UNDERLINE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_UNDERLINE ) == TextField::Property::INPUT_UNDERLINE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_SHADOW ) == TextField::Property::SHADOW );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_SHADOW ) == TextField::Property::INPUT_SHADOW );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_EMBOSS ) == TextField::Property::EMBOSS );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_EMBOSS ) == TextField::Property::INPUT_EMBOSS );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_OUTLINE ) == TextField::Property::OUTLINE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_OUTLINE ) == TextField::Property::INPUT_OUTLINE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_HIDDEN_INPUT_SETTINGS ) == TextField::Property::HIDDEN_INPUT_SETTINGS );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PIXEL_SIZE ) == TextField::Property::PIXEL_SIZE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_SELECTION ) == TextField::Property::ENABLE_SELECTION );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER ) == TextField::Property::PLACEHOLDER );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ELLIPSIS ) == TextField::Property::ELLIPSIS );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_FONT_SIZE_SCALE ) == DevelTextField::Property::FONT_SIZE_SCALE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_SHIFT_SELECTION ) == DevelTextField::Property::ENABLE_SHIFT_SELECTION );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_GRAB_HANDLE ) == DevelTextField::Property::ENABLE_GRAB_HANDLE );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION ) == DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP ) == DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_BACKGROUND ) == DevelTextField::Property::BACKGROUND );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_GRAB_HANDLE_COLOR ) == DevelTextField::Property::GRAB_HANDLE_COLOR );
-  DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_FILTER ) == DevelTextField::Property::INPUT_FILTER );
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_RENDERING_BACKEND) == DevelTextField::Property::RENDERING_BACKEND);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_TEXT) == TextField::Property::TEXT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_PLACEHOLDER_TEXT) == TextField::Property::PLACEHOLDER_TEXT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_PLACEHOLDER_TEXT_FOCUSED) == TextField::Property::PLACEHOLDER_TEXT_FOCUSED);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_FONT_FAMILY) == TextField::Property::FONT_FAMILY);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_FONT_STYLE) == TextField::Property::FONT_STYLE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_POINT_SIZE) == TextField::Property::POINT_SIZE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_MAX_LENGTH) == TextField::Property::MAX_LENGTH);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_EXCEED_POLICY) == TextField::Property::EXCEED_POLICY);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_HORIZONTAL_ALIGNMENT) == TextField::Property::HORIZONTAL_ALIGNMENT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_VERTICAL_ALIGNMENT) == TextField::Property::VERTICAL_ALIGNMENT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_TEXT_COLOR) == TextField::Property::TEXT_COLOR);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR) == TextField::Property::PLACEHOLDER_TEXT_COLOR);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_PRIMARY_CURSOR_COLOR) == TextField::Property::PRIMARY_CURSOR_COLOR);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SECONDARY_CURSOR_COLOR) == TextField::Property::SECONDARY_CURSOR_COLOR);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ENABLE_CURSOR_BLINK) == TextField::Property::ENABLE_CURSOR_BLINK);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_CURSOR_BLINK_INTERVAL) == TextField::Property::CURSOR_BLINK_INTERVAL);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_CURSOR_BLINK_DURATION) == TextField::Property::CURSOR_BLINK_DURATION);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_CURSOR_WIDTH) == TextField::Property::CURSOR_WIDTH);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_GRAB_HANDLE_IMAGE) == TextField::Property::GRAB_HANDLE_IMAGE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE) == TextField::Property::GRAB_HANDLE_PRESSED_IMAGE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SCROLL_THRESHOLD) == TextField::Property::SCROLL_THRESHOLD);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SCROLL_SPEED) == TextField::Property::SCROLL_SPEED);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT) == TextField::Property::SELECTION_HANDLE_IMAGE_LEFT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT) == TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT) == TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT) == TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_LEFT) == TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_RIGHT) == TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_HIGHLIGHT_COLOR) == TextField::Property::SELECTION_HIGHLIGHT_COLOR);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_DECORATION_BOUNDING_BOX) == TextField::Property::DECORATION_BOUNDING_BOX);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_METHOD_SETTINGS) == TextField::Property::INPUT_METHOD_SETTINGS);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_COLOR) == TextField::Property::INPUT_COLOR);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ENABLE_MARKUP) == TextField::Property::ENABLE_MARKUP);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_FONT_FAMILY) == TextField::Property::INPUT_FONT_FAMILY);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_FONT_STYLE) == TextField::Property::INPUT_FONT_STYLE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_POINT_SIZE) == TextField::Property::INPUT_POINT_SIZE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_UNDERLINE) == TextField::Property::UNDERLINE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_UNDERLINE) == TextField::Property::INPUT_UNDERLINE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SHADOW) == TextField::Property::SHADOW);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_SHADOW) == TextField::Property::INPUT_SHADOW);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_EMBOSS) == TextField::Property::EMBOSS);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_EMBOSS) == TextField::Property::INPUT_EMBOSS);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_OUTLINE) == TextField::Property::OUTLINE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_OUTLINE) == TextField::Property::INPUT_OUTLINE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_HIDDEN_INPUT_SETTINGS) == TextField::Property::HIDDEN_INPUT_SETTINGS);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_PIXEL_SIZE) == TextField::Property::PIXEL_SIZE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ENABLE_SELECTION) == TextField::Property::ENABLE_SELECTION);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_PLACEHOLDER) == TextField::Property::PLACEHOLDER);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ELLIPSIS) == TextField::Property::ELLIPSIS);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_FONT_SIZE_SCALE) == DevelTextField::Property::FONT_SIZE_SCALE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ENABLE_FONT_SIZE_SCALE) == DevelTextField::Property::ENABLE_FONT_SIZE_SCALE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ENABLE_SHIFT_SELECTION) == DevelTextField::Property::ENABLE_SHIFT_SELECTION);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ENABLE_GRAB_HANDLE) == DevelTextField::Property::ENABLE_GRAB_HANDLE);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION) == DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_ENABLE_GRAB_HANDLE_POPUP) == DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_BACKGROUND) == DevelTextField::Property::BACKGROUND);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_GRAB_HANDLE_COLOR) == DevelTextField::Property::GRAB_HANDLE_COLOR);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_FILTER) == DevelTextField::Property::INPUT_FILTER);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_STRIKETHROUGH) == DevelTextField::Property::STRIKETHROUGH);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_INPUT_STRIKETHROUGH) == DevelTextField::Property::INPUT_STRIKETHROUGH);
+  DALI_TEST_CHECK(field.GetPropertyIndex(PROPERTY_NAME_SELECTION_POPUP_STYLE) == DevelTextField::Property::SELECTION_POPUP_STYLE);
 
   END_TEST;
 }
 
-bool SetPropertyMapRetrieved( TextField& field, const Property::Index property, const std::string mapKey, const std::string mapValue )
+bool SetPropertyMapRetrieved(TextField& field, const Property::Index property, const std::string mapKey, const std::string mapValue)
 {
-  bool result = false;
+  bool          result = false;
   Property::Map imageMap;
-  imageMap[mapKey] =mapValue;
+  imageMap[mapKey] = mapValue;
 
-  field.SetProperty( property , imageMap );
-  Property::Value propValue = field.GetProperty( property );
-  Property::Map* resultMap = propValue.GetMap();
+  field.SetProperty(property, imageMap);
+  Property::Value propValue = field.GetProperty(property);
+  Property::Map*  resultMap = propValue.GetMap();
 
-  if ( resultMap->Find( mapKey )->Get< std::string>() == mapValue )
+  if(resultMap->Find(mapKey)->Get<std::string>() == mapValue)
   {
     result = true;
   }
@@ -604,299 +671,431 @@ int UtcDaliTextFieldSetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldSetPropertyP");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
 
   // Note - we can't check the defaults since the stylesheets are platform-specific
 
   // Check the render backend property.
-  field.SetProperty( DevelTextField::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS );
-  DALI_TEST_EQUALS( (DevelText::RenderingType)field.GetProperty<int>( DevelTextField::Property::RENDERING_BACKEND ), DevelText::RENDERING_SHARED_ATLAS, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS);
+  DALI_TEST_EQUALS((DevelText::RenderingType)field.GetProperty<int>(DevelTextField::Property::RENDERING_BACKEND), DevelText::RENDERING_SHARED_ATLAS, TEST_LOCATION);
 
-  field.SetProperty( DevelTextField::Property::RENDERING_BACKEND, DevelText::RENDERING_VECTOR_BASED );
-  DALI_TEST_EQUALS( (DevelText::RenderingType)field.GetProperty<int>( DevelTextField::Property::RENDERING_BACKEND ), DevelText::RENDERING_VECTOR_BASED, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::RENDERING_BACKEND, DevelText::RENDERING_VECTOR_BASED);
+  DALI_TEST_EQUALS((DevelText::RenderingType)field.GetProperty<int>(DevelTextField::Property::RENDERING_BACKEND), DevelText::RENDERING_VECTOR_BASED, TEST_LOCATION);
 
   // Check text property.
-  field.SetProperty( TextField::Property::TEXT, "Setting Text" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("Setting Text"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::TEXT, "Setting Text");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("Setting Text"), TEST_LOCATION);
 
   // Check placeholder text properties.
-  field.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Setting Placeholder Text" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::PLACEHOLDER_TEXT ), std::string("Setting Placeholder Text"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::PLACEHOLDER_TEXT, "Setting Placeholder Text");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::PLACEHOLDER_TEXT), std::string("Setting Placeholder Text"), TEST_LOCATION);
 
-  field.SetProperty( TextField::Property::PLACEHOLDER_TEXT_FOCUSED, "Setting Placeholder Text Focused" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::PLACEHOLDER_TEXT_FOCUSED ), std::string("Setting Placeholder Text Focused"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::PLACEHOLDER_TEXT_FOCUSED, "Setting Placeholder Text Focused");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::PLACEHOLDER_TEXT_FOCUSED), std::string("Setting Placeholder Text Focused"), TEST_LOCATION);
 
   // Check font properties.
-  field.SetProperty( TextField::Property::FONT_FAMILY, "Setting font family" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::FONT_FAMILY ), std::string("Setting font family"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::FONT_FAMILY, "Setting font family");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::FONT_FAMILY), std::string("Setting font family"), TEST_LOCATION);
 
-  Property::Map fontStyleMapSet;
-  Property::Map fontStyleMapGet;
+  Property::Map    fontStyleMapSet;
+  Property::Map    fontStyleMapGet;
   Property::Value* slantValue = NULL;
 
-  fontStyleMapSet.Insert( "weight", "bold" );
-  fontStyleMapSet.Insert( "width", "condensed" );
-  fontStyleMapSet.Insert( "slant", "italic" );
-  field.SetProperty( TextField::Property::FONT_STYLE, fontStyleMapSet );
+  fontStyleMapSet.Insert("weight", "bold");
+  fontStyleMapSet.Insert("width", "condensed");
+  fontStyleMapSet.Insert("slant", "italic");
+  field.SetProperty(TextField::Property::FONT_STYLE, fontStyleMapSet);
+
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::POINT_SIZE), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::POINT_SIZE ), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::FONT_SIZE_SCALE, 2.5f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(DevelTextField::Property::FONT_SIZE_SCALE), 2.5f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  field.SetProperty(DevelTextField::Property::FONT_SIZE_SCALE, 1.0f);
 
-  field.SetProperty( DevelTextField::Property::FONT_SIZE_SCALE, 2.5f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( DevelTextField::Property::FONT_SIZE_SCALE ), 2.5f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  field.SetProperty( DevelTextField::Property::FONT_SIZE_SCALE, 1.0f );
+  field.SetProperty(DevelTextField::Property::ENABLE_FONT_SIZE_SCALE, false);
+  DALI_TEST_EQUALS(field.GetProperty<bool>(DevelTextField::Property::ENABLE_FONT_SIZE_SCALE), false, TEST_LOCATION);
+  field.SetProperty(DevelTextField::Property::ENABLE_FONT_SIZE_SCALE, true);
 
   // Reset font style.
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "normal" );
-  fontStyleMapSet.Insert( "slant", "oblique" );
-  field.SetProperty( TextField::Property::FONT_STYLE, fontStyleMapSet );
+  fontStyleMapSet.Insert("weight", "normal");
+  fontStyleMapSet.Insert("slant", "oblique");
+  field.SetProperty(TextField::Property::FONT_STYLE, fontStyleMapSet);
 
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "slant", "roman" );
-  field.SetProperty( TextField::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::FONT_STYLE );
+  fontStyleMapSet.Insert("slant", "roman");
+  field.SetProperty(TextField::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::FONT_STYLE);
 
   // Replace 'roman' for 'normal'.
-  slantValue = fontStyleMapGet.Find( "slant" );
-  if( NULL != slantValue )
+  slantValue = fontStyleMapGet.Find("slant");
+  if(NULL != slantValue)
   {
-    if( "normal" == slantValue->Get<std::string>() )
+    if("normal" == slantValue->Get<std::string>())
     {
       fontStyleMapGet["slant"] = "roman";
     }
   }
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
 
-  field.SetProperty( TextField::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  field.SetProperty(TextField::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   // Check that the MAX_LENGTH property can be correctly set
   const int maxNumberOfCharacters = 20;
-  field.SetProperty( TextField::Property::MAX_LENGTH, maxNumberOfCharacters );
-  DALI_TEST_EQUALS( field.GetProperty<int>( TextField::Property::MAX_LENGTH ), maxNumberOfCharacters, TEST_LOCATION );
+  field.SetProperty(TextField::Property::MAX_LENGTH, maxNumberOfCharacters);
+  DALI_TEST_EQUALS(field.GetProperty<int>(TextField::Property::MAX_LENGTH), maxNumberOfCharacters, TEST_LOCATION);
 
   // Check exceed policy
-  field.SetProperty( TextField::Property::EXCEED_POLICY, Dali::Toolkit::TextField::EXCEED_POLICY_CLIP );
-  DALI_TEST_EQUALS( field.GetProperty<int>( TextField::Property::EXCEED_POLICY ), static_cast<int>( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP ), TEST_LOCATION );
-  field.SetProperty( TextField::Property::EXCEED_POLICY, Dali::Toolkit::TextField::EXCEED_POLICY_ORIGINAL );
-  DALI_TEST_EQUALS( field.GetProperty<int>( TextField::Property::EXCEED_POLICY ), static_cast<int>( Dali::Toolkit::TextField::EXCEED_POLICY_ORIGINAL ), TEST_LOCATION );
+  field.SetProperty(TextField::Property::EXCEED_POLICY, Dali::Toolkit::TextField::EXCEED_POLICY_CLIP);
+  DALI_TEST_EQUALS(field.GetProperty<int>(TextField::Property::EXCEED_POLICY), static_cast<int>(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP), TEST_LOCATION);
+  field.SetProperty(TextField::Property::EXCEED_POLICY, Dali::Toolkit::TextField::EXCEED_POLICY_ORIGINAL);
+  DALI_TEST_EQUALS(field.GetProperty<int>(TextField::Property::EXCEED_POLICY), static_cast<int>(Dali::Toolkit::TextField::EXCEED_POLICY_ORIGINAL), TEST_LOCATION);
 
   // Check that the Alignment properties can be correctly set
-  field.SetProperty( TextField::Property::HORIZONTAL_ALIGNMENT, "END" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::HORIZONTAL_ALIGNMENT ), "END", TEST_LOCATION );
-  field.SetProperty( TextField::Property::VERTICAL_ALIGNMENT, "CENTER" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::VERTICAL_ALIGNMENT ), "CENTER", TEST_LOCATION );
+  field.SetProperty(TextField::Property::HORIZONTAL_ALIGNMENT, "END");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::HORIZONTAL_ALIGNMENT), "END", TEST_LOCATION);
+  field.SetProperty(TextField::Property::VERTICAL_ALIGNMENT, "CENTER");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::VERTICAL_ALIGNMENT), "CENTER", TEST_LOCATION);
 
   // Check text's color property
-  field.SetProperty( TextField::Property::TEXT_COLOR, Color::WHITE );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( TextField::Property::TEXT_COLOR ), Color::WHITE, TEST_LOCATION );
+  field.SetProperty(TextField::Property::TEXT_COLOR, Color::WHITE);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(TextField::Property::TEXT_COLOR), Color::WHITE, TEST_LOCATION);
 
   // Check placeholder text's color property.
-  field.SetProperty( TextField::Property::PLACEHOLDER_TEXT_COLOR, Color::RED );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( TextField::Property::PLACEHOLDER_TEXT_COLOR ), Color::RED, TEST_LOCATION );
+  field.SetProperty(TextField::Property::PLACEHOLDER_TEXT_COLOR, Color::RED);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(TextField::Property::PLACEHOLDER_TEXT_COLOR), Color::RED, TEST_LOCATION);
 
   // Check cursor properties
-  field.SetProperty( TextField::Property::PRIMARY_CURSOR_COLOR, Color::RED );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( TextField::Property::PRIMARY_CURSOR_COLOR ), Color::RED, TEST_LOCATION );
-  field.SetProperty( TextField::Property::SECONDARY_CURSOR_COLOR, Color::BLUE );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( TextField::Property::SECONDARY_CURSOR_COLOR ), Color::BLUE, TEST_LOCATION );
-
-  field.SetProperty( TextField::Property::ENABLE_CURSOR_BLINK, false );
-  DALI_TEST_EQUALS( field.GetProperty<bool>( TextField::Property::ENABLE_CURSOR_BLINK ), false, TEST_LOCATION );
-  field.SetProperty( TextField::Property::CURSOR_BLINK_INTERVAL, 1.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::CURSOR_BLINK_INTERVAL ), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  field.SetProperty( TextField::Property::CURSOR_BLINK_DURATION, 10.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::CURSOR_BLINK_DURATION ), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  field.SetProperty( TextField::Property::CURSOR_WIDTH, 1 );
-  DALI_TEST_EQUALS( field.GetProperty<int>( TextField::Property::CURSOR_WIDTH ), 1, TEST_LOCATION );
+  field.SetProperty(TextField::Property::PRIMARY_CURSOR_COLOR, Color::RED);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(TextField::Property::PRIMARY_CURSOR_COLOR), Color::RED, TEST_LOCATION);
+  field.SetProperty(TextField::Property::SECONDARY_CURSOR_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(TextField::Property::SECONDARY_CURSOR_COLOR), Color::BLUE, TEST_LOCATION);
+
+  field.SetProperty(TextField::Property::ENABLE_CURSOR_BLINK, false);
+  DALI_TEST_EQUALS(field.GetProperty<bool>(TextField::Property::ENABLE_CURSOR_BLINK), false, TEST_LOCATION);
+  field.SetProperty(TextField::Property::CURSOR_BLINK_INTERVAL, 1.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::CURSOR_BLINK_INTERVAL), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  field.SetProperty(TextField::Property::CURSOR_BLINK_DURATION, 10.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::CURSOR_BLINK_DURATION), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  field.SetProperty(TextField::Property::CURSOR_WIDTH, 1);
+  DALI_TEST_EQUALS(field.GetProperty<int>(TextField::Property::CURSOR_WIDTH), 1, TEST_LOCATION);
 
   // Check scroll properties.
-  field.SetProperty( TextField::Property::SCROLL_THRESHOLD, 1.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::SCROLL_THRESHOLD ), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  field.SetProperty( TextField::Property::SCROLL_SPEED, 100.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::SCROLL_SPEED ), 100.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  field.SetProperty(TextField::Property::SCROLL_THRESHOLD, 1.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::SCROLL_THRESHOLD), 1.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  field.SetProperty(TextField::Property::SCROLL_SPEED, 100.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::SCROLL_SPEED), 100.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check handle images
-  field.SetProperty( TextField::Property::GRAB_HANDLE_IMAGE, "image1" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::GRAB_HANDLE_IMAGE ), "image1", TEST_LOCATION );
-  field.SetProperty( TextField::Property::GRAB_HANDLE_PRESSED_IMAGE, "image2" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::GRAB_HANDLE_PRESSED_IMAGE ), "image2", TEST_LOCATION );
-  field.SetProperty( TextField::Property::SELECTION_HANDLE_IMAGE_LEFT, "image3" );
+  field.SetProperty(TextField::Property::GRAB_HANDLE_IMAGE, "image1");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::GRAB_HANDLE_IMAGE), "image1", TEST_LOCATION);
+  field.SetProperty(TextField::Property::GRAB_HANDLE_PRESSED_IMAGE, "image2");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::GRAB_HANDLE_PRESSED_IMAGE), "image2", TEST_LOCATION);
+  field.SetProperty(TextField::Property::SELECTION_HANDLE_IMAGE_LEFT, "image3");
 
   // Check handle images
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( field, TextField::Property::SELECTION_HANDLE_IMAGE_LEFT, "filename", "leftHandleImage" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( field, TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT, "filename", "rightHandleImage" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( field, TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, "filename", "leftHandleImagePressed" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( field, TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, "filename", "rightHandleImagePressed" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( field, TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT, "filename", "leftHandleMarkerImage" )  );
-  DALI_TEST_CHECK( SetPropertyMapRetrieved( field, TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT, "filename", "rightHandleMarkerImage" )  );
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(field, TextField::Property::SELECTION_HANDLE_IMAGE_LEFT, "filename", "leftHandleImage"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(field, TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT, "filename", "rightHandleImage"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(field, TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, "filename", "leftHandleImagePressed"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(field, TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, "filename", "rightHandleImagePressed"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(field, TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT, "filename", "leftHandleMarkerImage"));
+  DALI_TEST_CHECK(SetPropertyMapRetrieved(field, TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT, "filename", "rightHandleMarkerImage"));
+
+  // Check the selection popup style
+  const Vector2 popupMaxSize(200.0f, 300.0f);
+  const Vector2 optionDividerSize(30.0f, 5.0f);
+  const Vector4 optionDividerPadding(20.0f, 20.0f, 10.0f, 10.0f);
+  const Vector4 labelPadding(5.0f, 5.0f, 50.0f, 25.0f);
+
+  Property::Map selectionPopupStyle;
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::POPUP_MAX_SIZE, popupMaxSize);
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::OPTION_DIVIDER_SIZE, optionDividerSize);
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::OPTION_DIVIDER_PADDING, optionDividerPadding);
+  selectionPopupStyle.Insert(TextSelectionPopup::Property::LABEL_PADDING, labelPadding);
+
+  field.SetProperty(DevelTextField::Property::SELECTION_POPUP_STYLE, selectionPopupStyle);
+
+  Property::Map selectionPopupStyleGet;
+  selectionPopupStyleGet = field.GetProperty<Property::Map>(DevelTextField::Property::SELECTION_POPUP_STYLE);
+
+  Property::Value* popupValue;
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::POPUP_MAX_SIZE);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector2 popupMaxSizeGet;
+    popupValue->Get(popupMaxSizeGet);
+    DALI_TEST_EQUALS(popupMaxSizeGet, popupMaxSize, TEST_LOCATION);
+  }
+
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::OPTION_DIVIDER_SIZE);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector2 optionDividerSizeGet;
+    popupValue->Get(optionDividerSizeGet);
+    DALI_TEST_EQUALS(optionDividerSizeGet, optionDividerSize, TEST_LOCATION);
+  }
+
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::OPTION_DIVIDER_PADDING);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector4 optionDividerPaddingGet;
+    popupValue->Get(optionDividerPaddingGet);
+    DALI_TEST_EQUALS(optionDividerPaddingGet, optionDividerPadding, TEST_LOCATION);
+  }
+
+  popupValue = selectionPopupStyleGet.Find(TextSelectionPopup::Property::LABEL_PADDING);
+  DALI_TEST_CHECK(NULL != popupValue);
+  if(popupValue)
+  {
+    Vector4 labelPaddingGet;
+    popupValue->Get(labelPaddingGet);
+    DALI_TEST_EQUALS(labelPaddingGet, labelPadding, TEST_LOCATION);
+  }
+
+  // Reset selection popup style
+  selectionPopupStyle.Clear();
+  field.SetProperty(DevelTextField::Property::SELECTION_POPUP_STYLE, selectionPopupStyle);
 
   // Check the highlight color
-  field.SetProperty( TextField::Property::SELECTION_HIGHLIGHT_COLOR, Color::GREEN );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( TextField::Property::SELECTION_HIGHLIGHT_COLOR ), Color::GREEN, TEST_LOCATION );
+  field.SetProperty(TextField::Property::SELECTION_HIGHLIGHT_COLOR, Color::GREEN);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(TextField::Property::SELECTION_HIGHLIGHT_COLOR), Color::GREEN, TEST_LOCATION);
 
   // Decoration bounding box
-  field.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( 0, 0, 1, 1 ) );
-  DALI_TEST_EQUALS( field.GetProperty<Rect <int > >( TextField::Property::DECORATION_BOUNDING_BOX ), Rect<int>( 0, 0, 1, 1 ), TEST_LOCATION );
+  field.SetProperty(TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>(0, 0, 1, 1));
+  DALI_TEST_EQUALS(field.GetProperty<Rect<int> >(TextField::Property::DECORATION_BOUNDING_BOX), Rect<int>(0, 0, 1, 1), TEST_LOCATION);
 
   // Check the input method setting
-  Property::Map propertyMap;
-  InputMethod::PanelLayout::Type panelLayout = InputMethod::PanelLayout::NUMBER;
-  InputMethod::AutoCapital::Type autoCapital = InputMethod::AutoCapital::WORD;
-  InputMethod::ButtonAction::Type buttonAction = InputMethod::ButtonAction::GO;
-  int inputVariation = 1;
-  propertyMap["PANEL_LAYOUT"] = panelLayout;
-  propertyMap["AUTO_CAPITALIZE"] = autoCapital;
-  propertyMap["BUTTON_ACTION"] = buttonAction;
-  propertyMap["VARIATION"] = inputVariation;
-  field.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, propertyMap );
-
-  Property::Value value = field.GetProperty( TextField::Property::INPUT_METHOD_SETTINGS );
-  Property::Map map;
-  DALI_TEST_CHECK( value.Get( map ) );
+  Property::Map                   propertyMap;
+  InputMethod::PanelLayout::Type  panelLayout    = InputMethod::PanelLayout::NUMBER;
+  InputMethod::AutoCapital::Type  autoCapital    = InputMethod::AutoCapital::WORD;
+  InputMethod::ButtonAction::Type buttonAction   = InputMethod::ButtonAction::GO;
+  int                             inputVariation = 1;
+  propertyMap["PANEL_LAYOUT"]                    = panelLayout;
+  propertyMap["AUTO_CAPITALIZE"]                 = autoCapital;
+  propertyMap["BUTTON_ACTION"]                   = buttonAction;
+  propertyMap["VARIATION"]                       = inputVariation;
+  field.SetProperty(TextField::Property::INPUT_METHOD_SETTINGS, propertyMap);
+
+  Property::Value value = field.GetProperty(TextField::Property::INPUT_METHOD_SETTINGS);
+  Property::Map   map;
+  DALI_TEST_CHECK(value.Get(map));
 
   int layout = 0;
-  DALI_TEST_CHECK( map[ "PANEL_LAYOUT" ].Get( layout ) );
-  DALI_TEST_EQUALS( static_cast<int>(panelLayout), layout, TEST_LOCATION );
+  DALI_TEST_CHECK(map["PANEL_LAYOUT"].Get(layout));
+  DALI_TEST_EQUALS(static_cast<int>(panelLayout), layout, TEST_LOCATION);
 
   int capital = 0;
-  DALI_TEST_CHECK( map[ "AUTO_CAPITALIZE" ].Get( capital ) );
-  DALI_TEST_EQUALS( static_cast<int>(autoCapital), capital, TEST_LOCATION );
+  DALI_TEST_CHECK(map["AUTO_CAPITALIZE"].Get(capital));
+  DALI_TEST_EQUALS(static_cast<int>(autoCapital), capital, TEST_LOCATION);
 
   int action = 0;
-  DALI_TEST_CHECK( map[ "BUTTON_ACTION" ].Get( action ) );
-  DALI_TEST_EQUALS( static_cast<int>(buttonAction), action, TEST_LOCATION );
+  DALI_TEST_CHECK(map["BUTTON_ACTION"].Get(action));
+  DALI_TEST_EQUALS(static_cast<int>(buttonAction), action, TEST_LOCATION);
 
   int variation = 0;
-  DALI_TEST_CHECK( map[ "VARIATION" ].Get( variation ) );
-  DALI_TEST_EQUALS( inputVariation, variation, TEST_LOCATION );
+  DALI_TEST_CHECK(map["VARIATION"].Get(variation));
+  DALI_TEST_EQUALS(inputVariation, variation, TEST_LOCATION);
 
   // Check input color property.
-  field.SetProperty( TextField::Property::INPUT_COLOR, Color::YELLOW );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( TextField::Property::INPUT_COLOR ), Color::YELLOW, TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_COLOR, Color::YELLOW);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(TextField::Property::INPUT_COLOR), Color::YELLOW, TEST_LOCATION);
 
   // Check the enable markup property.
-  DALI_TEST_CHECK( !field.GetProperty<bool>( TextField::Property::ENABLE_MARKUP ) );
-  field.SetProperty( TextField::Property::ENABLE_MARKUP, true );
-  DALI_TEST_CHECK( field.GetProperty<bool>( TextField::Property::ENABLE_MARKUP ) );
+  DALI_TEST_CHECK(!field.GetProperty<bool>(TextField::Property::ENABLE_MARKUP));
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  DALI_TEST_CHECK(field.GetProperty<bool>(TextField::Property::ENABLE_MARKUP));
 
   // Check input font properties.
-  field.SetProperty( TextField::Property::INPUT_FONT_FAMILY, "Setting input font family" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::INPUT_FONT_FAMILY ), "Setting input font family", TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_FONT_FAMILY, "Setting input font family");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::INPUT_FONT_FAMILY), "Setting input font family", TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "bold" );
-  fontStyleMapSet.Insert( "width", "condensed" );
-  fontStyleMapSet.Insert( "slant", "italic" );
+  fontStyleMapSet.Insert("weight", "bold");
+  fontStyleMapSet.Insert("width", "condensed");
+  fontStyleMapSet.Insert("slant", "italic");
 
-  field.SetProperty( TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
-  field.SetProperty( TextField::Property::INPUT_POINT_SIZE, 12.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::INPUT_POINT_SIZE ), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_POINT_SIZE, 12.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::INPUT_POINT_SIZE), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Reset input font style.
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "normal" );
-  fontStyleMapSet.Insert( "slant", "oblique" );
+  fontStyleMapSet.Insert("weight", "normal");
+  fontStyleMapSet.Insert("slant", "oblique");
 
-  field.SetProperty( TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "slant", "roman" );
+  fontStyleMapSet.Insert("slant", "roman");
 
-  field.SetProperty( TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::INPUT_FONT_STYLE );
+  field.SetProperty(TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::INPUT_FONT_STYLE);
 
   // Replace 'roman' for 'normal'.
-  slantValue = fontStyleMapGet.Find( "slant" );
-  if( NULL != slantValue )
+  slantValue = fontStyleMapGet.Find("slant");
+  if(NULL != slantValue)
   {
-    if( "normal" == slantValue->Get<std::string>() )
+    if("normal" == slantValue->Get<std::string>())
     {
       fontStyleMapGet["slant"] = "roman";
     }
   }
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
 
-  field.SetProperty( TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
+
+  Property::Map strikethroughMapSet;
+  Property::Map strikethroughMapGet;
+
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::RED);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  // Check the strikethrough property
+  field.SetProperty(DevelTextField::Property::STRIKETHROUGH, strikethroughMapSet);
+
+  strikethroughMapGet = field.GetProperty<Property::Map>(DevelTextField::Property::STRIKETHROUGH);
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet), true, TEST_LOCATION);
+
+  // Check the input strikethrough property
+  field.SetProperty(DevelTextField::Property::INPUT_STRIKETHROUGH, "Strikethrough input properties");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(DevelTextField::Property::INPUT_STRIKETHROUGH), std::string("Strikethrough input properties"), TEST_LOCATION);
 
   Property::Map underlineMapSet;
   Property::Map underlineMapGet;
 
-  underlineMapSet.Insert( "enable", true );
-  underlineMapSet.Insert( "color", Color::RED );
-  underlineMapSet.Insert( "height", 1 );
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
 
   // Check the underline property
-  field.SetProperty( TextField::Property::UNDERLINE, underlineMapSet );
+  field.SetProperty(TextField::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = field.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 4);
+  underlineMapSet.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  field.SetProperty(TextField::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = field.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 4);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 4);
+  underlineMapSet.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  field.SetProperty(TextField::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = field.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
 
-  underlineMapGet = field.GetProperty<Property::Map>( TextField::Property::UNDERLINE );
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet ), true, TEST_LOCATION );
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
 
   // Check the input underline property
-  field.SetProperty( TextField::Property::INPUT_UNDERLINE, "Underline input properties" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::INPUT_UNDERLINE ), std::string("Underline input properties"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_UNDERLINE, "Underline input properties");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::INPUT_UNDERLINE), std::string("Underline input properties"), TEST_LOCATION);
 
   // Check the shadow property
   Property::Map shadowMapSet;
   Property::Map shadowMapGet;
 
-  shadowMapSet.Insert( "color", Color::GREEN );
-  shadowMapSet.Insert( "offset", Vector2(2.0f, 2.0f) );
-  shadowMapSet.Insert( "blurRadius", 3.0f );
+  shadowMapSet.Insert("color", Color::GREEN);
+  shadowMapSet.Insert("offset", Vector2(2.0f, 2.0f));
+  shadowMapSet.Insert("blurRadius", 3.0f);
 
-  field.SetProperty( TextField::Property::SHADOW, shadowMapSet );
+  field.SetProperty(TextField::Property::SHADOW, shadowMapSet);
 
-  shadowMapGet = field.GetProperty<Property::Map>( TextField::Property::SHADOW );
-  DALI_TEST_EQUALS( shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet ), true, TEST_LOCATION );
+  shadowMapGet = field.GetProperty<Property::Map>(TextField::Property::SHADOW);
+  DALI_TEST_EQUALS(shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(shadowMapGet, shadowMapSet), true, TEST_LOCATION);
 
   // Check the input shadow property
-  field.SetProperty( TextField::Property::INPUT_SHADOW, "Shadow input properties" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::INPUT_SHADOW ), std::string("Shadow input properties"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_SHADOW, "Shadow input properties");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::INPUT_SHADOW), std::string("Shadow input properties"), TEST_LOCATION);
 
   // Check the emboss property
-  field.SetProperty( TextField::Property::EMBOSS, "Emboss properties" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::EMBOSS ), std::string("Emboss properties"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::EMBOSS, "Emboss properties");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::EMBOSS), std::string("Emboss properties"), TEST_LOCATION);
 
   // Check the input emboss property
-  field.SetProperty( TextField::Property::INPUT_EMBOSS, "Emboss input properties" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::INPUT_EMBOSS ), std::string("Emboss input properties"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_EMBOSS, "Emboss input properties");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::INPUT_EMBOSS), std::string("Emboss input properties"), TEST_LOCATION);
 
   // Check the outline property
 
   // Test string type first
   // This is purely to maintain backward compatibility, but we don't support string as the outline property type.
-  field.SetProperty( TextField::Property::OUTLINE, "Outline properties" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::OUTLINE ), std::string("Outline properties"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::OUTLINE, "Outline properties");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::OUTLINE), std::string("Outline properties"), TEST_LOCATION);
 
   // Then test the property map type
   Property::Map outlineMapSet;
@@ -905,150 +1104,150 @@ int UtcDaliTextFieldSetPropertyP(void)
   outlineMapSet["color"] = Color::RED;
   outlineMapSet["width"] = 2.0f;
 
-  field.SetProperty( TextField::Property::OUTLINE, outlineMapSet );
+  field.SetProperty(TextField::Property::OUTLINE, outlineMapSet);
 
-  outlineMapGet = field.GetProperty<Property::Map>( TextField::Property::OUTLINE );
-  DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet ), true, TEST_LOCATION );
+  outlineMapGet = field.GetProperty<Property::Map>(TextField::Property::OUTLINE);
+  DALI_TEST_EQUALS(outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(outlineMapGet, outlineMapSet), true, TEST_LOCATION);
 
   // Check the input outline property
-  field.SetProperty( TextField::Property::INPUT_OUTLINE, "Outline input properties" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::INPUT_OUTLINE ), std::string("Outline input properties"), TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_OUTLINE, "Outline input properties");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::INPUT_OUTLINE), std::string("Outline input properties"), TEST_LOCATION);
 
   // Check the hidden input settings property
   Property::Map hiddenMapSet;
   Property::Map hiddenMapGet;
-  hiddenMapSet[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_ALL;
-  hiddenMapSet[ HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION ] = 2;
-  hiddenMapSet[ HiddenInput::Property::SUBSTITUTE_COUNT ] = 4;
-  hiddenMapSet[ HiddenInput::Property::SUBSTITUTE_CHARACTER ] = 0x23;
-  field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, hiddenMapSet );
+  hiddenMapSet[HiddenInput::Property::MODE]                         = HiddenInput::Mode::HIDE_ALL;
+  hiddenMapSet[HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION] = 2;
+  hiddenMapSet[HiddenInput::Property::SUBSTITUTE_COUNT]             = 4;
+  hiddenMapSet[HiddenInput::Property::SUBSTITUTE_CHARACTER]         = 0x23;
+  field.SetProperty(TextField::Property::HIDDEN_INPUT_SETTINGS, hiddenMapSet);
 
-  hiddenMapGet = field.GetProperty<Property::Map>( TextField::Property::HIDDEN_INPUT_SETTINGS );
-  DALI_TEST_EQUALS( hiddenMapSet.Count(), hiddenMapGet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( hiddenMapSet, hiddenMapGet ), true, TEST_LOCATION );
+  hiddenMapGet = field.GetProperty<Property::Map>(TextField::Property::HIDDEN_INPUT_SETTINGS);
+  DALI_TEST_EQUALS(hiddenMapSet.Count(), hiddenMapGet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(hiddenMapSet, hiddenMapGet), true, TEST_LOCATION);
 
   // Check the pixel size of font
-  field.SetProperty( TextField::Property::PIXEL_SIZE, 20.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  field.SetProperty(TextField::Property::PIXEL_SIZE, 20.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::PIXEL_SIZE), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check the enable selection property
-  field.SetProperty( TextField::Property::ENABLE_SELECTION, false );
-  DALI_TEST_EQUALS( field.GetProperty<bool>( TextField::Property::ENABLE_SELECTION ), false, TEST_LOCATION );
+  field.SetProperty(TextField::Property::ENABLE_SELECTION, false);
+  DALI_TEST_EQUALS(field.GetProperty<bool>(TextField::Property::ENABLE_SELECTION), false, TEST_LOCATION);
 
   // Check the placeholder property with pixel size
   Property::Map placeholderPixelSizeMapSet;
   Property::Map placeholderPixelSizeMapGet;
   Property::Map placeholderFontstyleMap;
-  placeholderPixelSizeMapSet["text"] = "Setting Placeholder Text";
+  placeholderPixelSizeMapSet["text"]        = "Setting Placeholder Text";
   placeholderPixelSizeMapSet["textFocused"] = "Setting Placeholder Text Focused";
-  placeholderPixelSizeMapSet["color"] = Color::BLUE;
-  placeholderPixelSizeMapSet["fontFamily"] = "Arial";
-  placeholderPixelSizeMapSet["pixelSize"] = 15.0f;
-  placeholderPixelSizeMapSet["ellipsis"] = true;
+  placeholderPixelSizeMapSet["color"]       = Color::BLUE;
+  placeholderPixelSizeMapSet["fontFamily"]  = "Arial";
+  placeholderPixelSizeMapSet["pixelSize"]   = 15.0f;
+  placeholderPixelSizeMapSet["ellipsis"]    = true;
 
-  placeholderFontstyleMap.Insert( "weight", "bold" );
+  placeholderFontstyleMap.Insert("weight", "bold");
   placeholderPixelSizeMapSet["placeholderFontStyle"] = placeholderFontstyleMap;
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderPixelSizeMapSet );
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderPixelSizeMapSet);
 
-  placeholderPixelSizeMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderPixelSizeMapGet.Count(), placeholderPixelSizeMapSet.Count(), TEST_LOCATION );
+  placeholderPixelSizeMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderPixelSizeMapGet.Count(), placeholderPixelSizeMapSet.Count(), TEST_LOCATION);
 
   tet_infoline("Test Placeholder settings set as strings is converted correctly to Property Index key and holds set value");
   Property::Map placeholderConversionMap;
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT ] = placeholderPixelSizeMapSet["text"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = placeholderPixelSizeMapSet["textFocused"] ;
-  placeholderConversionMap[ Text::PlaceHolder::Property::COLOR ] = placeholderPixelSizeMapSet["color"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderPixelSizeMapSet["fontStyle"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_FAMILY ] = placeholderPixelSizeMapSet["fontFamily"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::PIXEL_SIZE ] = placeholderPixelSizeMapSet["pixelSize"];
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT]         = placeholderPixelSizeMapSet["text"];
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT_FOCUSED] = placeholderPixelSizeMapSet["textFocused"];
+  placeholderConversionMap[Text::PlaceHolder::Property::COLOR]        = placeholderPixelSizeMapSet["color"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE]   = placeholderPixelSizeMapSet["fontStyle"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_FAMILY]  = placeholderPixelSizeMapSet["fontFamily"];
+  placeholderConversionMap[Text::PlaceHolder::Property::PIXEL_SIZE]   = placeholderPixelSizeMapSet["pixelSize"];
 
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderPixelSizeMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderPixelSizeMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
   // Check the placeholder property with point size
   Property::Map placeholderMapSet;
   Property::Map placeholderMapGet;
-  placeholderMapSet["text"] = "Setting Placeholder Text";
+  placeholderMapSet["text"]        = "Setting Placeholder Text";
   placeholderMapSet["textFocused"] = "Setting Placeholder Text Focused";
-  placeholderMapSet["color"] = Color::RED;
-  placeholderMapSet["fontFamily"] = "Arial";
-  placeholderMapSet["pointSize"] = 12.0f;
-  placeholderMapSet["ellipsis"] = false;
+  placeholderMapSet["color"]       = Color::RED;
+  placeholderMapSet["fontFamily"]  = "Arial";
+  placeholderMapSet["pointSize"]   = 12.0f;
+  placeholderMapSet["ellipsis"]    = false;
 
   // Check the placeholder font style property
   placeholderFontstyleMap.Clear();
 
-  placeholderFontstyleMap.Insert( "weight", "bold" );
-  placeholderFontstyleMap.Insert( "width", "condensed" );
-  placeholderFontstyleMap.Insert( "slant", "italic" );
+  placeholderFontstyleMap.Insert("weight", "bold");
+  placeholderFontstyleMap.Insert("width", "condensed");
+  placeholderFontstyleMap.Insert("slant", "italic");
   placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
 
   placeholderConversionMap.Clear();
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT ] = placeholderPixelSizeMapSet["text"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = placeholderPixelSizeMapSet["textFocused"] ;
-  placeholderConversionMap[ Text::PlaceHolder::Property::COLOR ] = placeholderPixelSizeMapSet["color"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderPixelSizeMapSet["fontStyle"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_FAMILY ] = placeholderPixelSizeMapSet["fontFamily"];
-  placeholderConversionMap[ Text::PlaceHolder::Property::POINT_SIZE ] = placeholderPixelSizeMapSet["pointSize"];
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT]         = placeholderPixelSizeMapSet["text"];
+  placeholderConversionMap[Text::PlaceHolder::Property::TEXT_FOCUSED] = placeholderPixelSizeMapSet["textFocused"];
+  placeholderConversionMap[Text::PlaceHolder::Property::COLOR]        = placeholderPixelSizeMapSet["color"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE]   = placeholderPixelSizeMapSet["fontStyle"];
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_FAMILY]  = placeholderPixelSizeMapSet["fontFamily"];
+  placeholderConversionMap[Text::PlaceHolder::Property::POINT_SIZE]   = placeholderPixelSizeMapSet["pointSize"];
 
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
   // Reset font style.
   placeholderFontstyleMap.Clear();
-  placeholderFontstyleMap.Insert( "weight", "normal" );
-  placeholderFontstyleMap.Insert( "slant", "oblique" );
+  placeholderFontstyleMap.Insert("weight", "normal");
+  placeholderFontstyleMap.Insert("slant", "oblique");
   placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
 
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderPixelSizeMapSet["fontStyle"];
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE] = placeholderPixelSizeMapSet["fontStyle"];
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
   placeholderFontstyleMap.Clear();
-  placeholderFontstyleMap.Insert( "slant", "roman" );
-  placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderPixelSizeMapSet["fontStyle"];
+  placeholderFontstyleMap.Insert("slant", "roman");
+  placeholderMapSet["fontStyle"]                                    = placeholderFontstyleMap;
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE] = placeholderPixelSizeMapSet["fontStyle"];
 
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
 
   placeholderFontstyleMap.Clear();
-  placeholderMapSet["fontStyle"] = placeholderFontstyleMap;
-  placeholderConversionMap[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderPixelSizeMapSet["fontStyle"];
+  placeholderMapSet["fontStyle"]                                    = placeholderFontstyleMap;
+  placeholderConversionMap[Text::PlaceHolder::Property::FONT_STYLE] = placeholderPixelSizeMapSet["fontStyle"];
 
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderConversionMap ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderConversionMap), true, TEST_LOCATION);
 
   // Check the ellipsis property
-  DALI_TEST_CHECK( !field.GetProperty<bool>( TextField::Property::ELLIPSIS ) );
-  field.SetProperty( TextField::Property::ELLIPSIS, true );
-  DALI_TEST_CHECK( field.GetProperty<bool>( TextField::Property::ELLIPSIS ) );
+  DALI_TEST_CHECK(!field.GetProperty<bool>(TextField::Property::ELLIPSIS));
+  field.SetProperty(TextField::Property::ELLIPSIS, true);
+  DALI_TEST_CHECK(field.GetProperty<bool>(TextField::Property::ELLIPSIS));
 
-  field.SetProperty( Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT );
-  DALI_TEST_EQUALS( field.GetProperty<int>( Actor::Property::LAYOUT_DIRECTION ), static_cast<int>( LayoutDirection::RIGHT_TO_LEFT ), TEST_LOCATION );
+  field.SetProperty(Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT);
+  DALI_TEST_EQUALS(field.GetProperty<int>(Actor::Property::LAYOUT_DIRECTION), static_cast<int>(LayoutDirection::RIGHT_TO_LEFT), TEST_LOCATION);
 
   // Test the ENABLE_GRAB_HANDLE_POPUP property
-  DALI_TEST_CHECK( field.GetProperty<bool>( DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP ) );
-  field.SetProperty( DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP, false );
-  DALI_TEST_CHECK( !field.GetProperty<bool>( DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP ) );
+  DALI_TEST_CHECK(field.GetProperty<bool>(DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP));
+  field.SetProperty(DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP, false);
+  DALI_TEST_CHECK(!field.GetProperty<bool>(DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP));
 
   // Check the background property
-  field.SetProperty( DevelTextField::Property::BACKGROUND, Color::RED );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( DevelTextField::Property::BACKGROUND ), Color::RED, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::BACKGROUND, Color::RED);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(DevelTextField::Property::BACKGROUND), Color::RED, TEST_LOCATION);
 
   //Check handle color
-  field.SetProperty( DevelTextField::Property::GRAB_HANDLE_COLOR, Color::GREEN );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( DevelTextField::Property::GRAB_HANDLE_COLOR ), Color::GREEN, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::GRAB_HANDLE_COLOR, Color::GREEN);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(DevelTextField::Property::GRAB_HANDLE_COLOR), Color::GREEN, TEST_LOCATION);
 
   // Check the input filter property
   Property::Map inputFilterMapSet;
@@ -1079,22 +1278,22 @@ int utcDaliTextFieldAtlasRenderP(void)
   StyleManager styleManager = StyleManager::Get();
   styleManager.ApplyDefaultTheme();
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  field.SetProperty( TextField::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+  field.SetProperty(TextField::Property::HORIZONTAL_ALIGNMENT, "CENTER");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   try
   {
     // Render some text with the shared atlas backend
-    field.SetProperty( DevelTextField::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS );
+    field.SetProperty(DevelTextField::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS);
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -1185,7 +1384,6 @@ int utcDaliTextFieldAnchorClicked02(void)
   DALI_TEST_CHECK(gAnchorClickedCallBackCalled);
   DALI_TEST_CHECK(anchorClickedSignal);
 
-
   // For coverage InsertTextAnchor, RemoveTextAnchor
   // first index insert
   field.SetProperty(TextField::Property::TEXT, "<a href='https://www.tizen.org'>TIZEN</a>");
@@ -1193,7 +1391,7 @@ int utcDaliTextFieldAnchorClicked02(void)
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
@@ -1211,7 +1409,7 @@ int utcDaliTextFieldAnchorClicked02(void)
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
@@ -1229,7 +1427,7 @@ int utcDaliTextFieldAnchorClicked02(void)
   application.SendNotification();
   application.Render();
 
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
@@ -1300,8 +1498,8 @@ int utcDaliTextFieldAnchorClicked02(void)
 
   // 0 ~ 1 index remove
   field.SetProperty(TextField::Property::TEXT, "<a href='https://www.tizen.org'>TIZEN</a>");
-  field.SetProperty( DevelTextField::Property::SELECTED_TEXT_START, 0);
-  field.SetProperty( DevelTextField::Property::SELECTED_TEXT_END, 1);
+  field.SetProperty(DevelTextField::Property::SELECTED_TEXT_START, 0);
+  field.SetProperty(DevelTextField::Property::SELECTED_TEXT_END, 1);
   application.SendNotification();
   application.Render();
 
@@ -1319,8 +1517,8 @@ int utcDaliTextFieldAnchorClicked02(void)
 
   // 1 ~ 3 index remove
   field.SetProperty(TextField::Property::TEXT, "<a href='https://www.tizen.org'>TIZEN</a>");
-  field.SetProperty( DevelTextField::Property::SELECTED_TEXT_START, 1);
-  field.SetProperty( DevelTextField::Property::SELECTED_TEXT_END, 3);
+  field.SetProperty(DevelTextField::Property::SELECTED_TEXT_START, 1);
+  field.SetProperty(DevelTextField::Property::SELECTED_TEXT_END, 3);
   application.SendNotification();
   application.Render();
 
@@ -1338,8 +1536,8 @@ int utcDaliTextFieldAnchorClicked02(void)
 
   // 3 ~ 4 index remove
   field.SetProperty(TextField::Property::TEXT, "<a href='https://www.tizen.org'>TIZEN</a>");
-  field.SetProperty( DevelTextField::Property::SELECTED_TEXT_START, 3);
-  field.SetProperty( DevelTextField::Property::SELECTED_TEXT_END, 4);
+  field.SetProperty(DevelTextField::Property::SELECTED_TEXT_START, 3);
+  field.SetProperty(DevelTextField::Property::SELECTED_TEXT_END, 4);
   application.SendNotification();
   application.Render();
 
@@ -1404,40 +1602,40 @@ int utcDaliTextFieldTextChangedP(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldTextChangedP");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   field.TextChangedSignal().Connect(&TestTextChangedCallback);
   bool textChangedSignal = false;
-  field.ConnectSignal( testTracker, "textChanged",   CallbackFunctor(&textChangedSignal) );
+  field.ConnectSignal(testTracker, "textChanged", CallbackFunctor(&textChangedSignal));
 
   gTextChangedCallBackCalled = false;
-  field.SetProperty( TextField::Property::TEXT, "ABC" );
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_CHECK( textChangedSignal );
+  field.SetProperty(TextField::Property::TEXT, "ABC");
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_CHECK(textChangedSignal);
 
   application.SendNotification();
   field.SetKeyInputFocus();
 
   gTextChangedCallBackCalled = false;
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
 
   // Remove all text
-  field.SetProperty( TextField::Property::TEXT, "" );
+  field.SetProperty(TextField::Property::TEXT, "");
 
   // Pressing backspace key: TextChangedCallback should not be called when there is no text in textfield.
   gTextChangedCallBackCalled = false;
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
   // Pressing delete key: TextChangedCallback should not be called when there is no text in textfield.
   gTextChangedCallBackCalled = false;
-  application.ProcessEvent( GenerateKey( "", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
   END_TEST;
 }
@@ -1447,72 +1645,197 @@ int utcDaliTextFieldTextChangedWithInputMethodContext(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldTextChangedWithInputMethodContext");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   field.TextChangedSignal().Connect(&TestTextChangedCallback);
   bool textChangedSignal = false;
-  field.ConnectSignal( testTracker, "textChanged",   CallbackFunctor(&textChangedSignal) );
-
+  field.ConnectSignal(testTracker, "textChanged", CallbackFunctor(&textChangedSignal));
 
   // get InputMethodContext
-  std::string text;
+  std::string                   text;
   InputMethodContext::EventData imfEvent;
-  InputMethodContext inputMethodContext = DevelTextField::GetInputMethodContext( field );
+  InputMethodContext            inputMethodContext = DevelTextField::GetInputMethodContext(field);
 
   field.SetKeyInputFocus();
-  field.SetProperty( DevelTextField::Property::ENABLE_EDITING, true );
+  field.SetProperty(DevelTextField::Property::ENABLE_EDITING, true);
 
   // input text
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "ㅎ", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "ㅎ", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("ㅎ"), TEST_LOCATION );
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("ㅎ"), TEST_LOCATION);
 
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "호", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "호", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("호"), TEST_LOCATION );
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("호"), TEST_LOCATION);
 
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "혿", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "혿", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("혿"), TEST_LOCATION );
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("혿"), TEST_LOCATION);
 
   gTextChangedCallBackCalled = false;
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "", 0, 1 );
+  imfEvent                   = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "호", 0, 1 );
+  imfEvent = InputMethodContext::EventData(InputMethodContext::COMMIT, "호", 0, 1);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
+
+  imfEvent = InputMethodContext::EventData(InputMethodContext::PRE_EDIT, "두", 1, 2);
+  inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
+
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(gTextChangedCallBackCalled);
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("호두"), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldSelectionWithInputMethodContext(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldSelectionWithInputMethodContext");
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  field.SetProperty(TextField::Property::TEXT, "Hello world");
+
+  application.GetScene().Add(field);
+
+  // connect to the selection changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextField::SelectionChangedSignal(field).Connect(&TestSelectionChangedCallback);
+  bool selectionChangedSignal = false;
+  field.ConnectSignal(testTracker, "selectionChanged", CallbackFunctor(&selectionChangedSignal));
+
+  // get InputMethodContext
+  std::string                   text;
+  InputMethodContext::EventData imfEvent;
+  InputMethodContext            inputMethodContext = DevelTextField::GetInputMethodContext(field);
 
-  imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "두", 1, 2 );
+  field.SetKeyInputFocus();
+  field.SetProperty(DevelTextField::Property::ENABLE_EDITING, true);
+
+  // input text
+  gSelectionChangedCallbackCalled = false;
+  imfEvent                        = InputMethodContext::EventData(InputMethodContext::SELECTION_SET, 1, 4);
   inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(gSelectionChangedCallbackCalled);
+
+  DALI_TEST_EQUALS(field.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(field.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 4, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldPositionWithInputMethodContext(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldPositionWithInputMethodContext");
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
 
+  field.SetProperty(TextField::Property::TEXT, "Hello world");
+
+  application.GetScene().Add(field);
+
+  // connect to the selection changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextField::CursorPositionChangedSignal(field).Connect(&TestCursorPositionChangedCallback);
+  bool cursorPositionChangedSignal = false;
+  field.ConnectSignal(testTracker, "cursorPositionChanged", CallbackFunctor(&cursorPositionChangedSignal));
+
+  // get InputMethodContext
+  std::string                   text;
+  InputMethodContext::EventData imfEvent;
+  InputMethodContext            inputMethodContext = DevelTextField::GetInputMethodContext(field);
+
+  field.SetKeyInputFocus();
+  field.SetProperty(DevelTextField::Property::ENABLE_EDITING, true);
+
+  // input text
+  gCursorPositionChangedCallbackCalled = false;
+  imfEvent                             = InputMethodContext::EventData(InputMethodContext::SELECTION_SET, 2, 2);
+  inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( gTextChangedCallBackCalled );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("호두"), TEST_LOCATION );
+  DALI_TEST_CHECK(gCursorPositionChangedCallbackCalled);
+
+  DALI_TEST_EQUALS(field.GetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 2, TEST_LOCATION);
 
   END_TEST;
 }
 
+int utcDaliTextFieldInputFilterWithInputMethodContext(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldInputFilterWithInputMethodContext");
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  Property::Map inputFilter;
+  inputFilter[InputFilter::Property::ACCEPTED] = "[\\d]";
+  inputFilter[InputFilter::Property::REJECTED] = "[5-7]";
+
+  // Set input filter to TextField.
+  field.SetProperty(DevelTextField::Property::INPUT_FILTER, inputFilter);
+
+  application.GetScene().Add(field);
+
+  // connect to the input filtered signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextField::InputFilteredSignal(field).Connect(&TestInputFilteredCallback);
+  bool inputFilteredSignal = false;
+  field.ConnectSignal(testTracker, "inputFiltered", CallbackFunctor(&inputFilteredSignal));
+
+  // get InputMethodContext
+  std::string                   text;
+  InputMethodContext::EventData imfEvent;
+  InputMethodContext            inputMethodContext = DevelTextField::GetInputMethodContext(field);
+
+  field.SetKeyInputFocus();
+  field.SetProperty(DevelTextField::Property::ENABLE_EDITING, true);
+
+  // input text
+  gInputFilteredAcceptedCallbackCalled = false;
+  imfEvent                             = InputMethodContext::EventData(InputMethodContext::COMMIT, "Hello1234", 0, 9);
+  inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(gInputFilteredAcceptedCallbackCalled);
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("1234"), TEST_LOCATION);
+
+  inputFilteredSignal                  = false;
+  gInputFilteredRejectedCallbackCalled = false;
+  imfEvent                             = InputMethodContext::EventData(InputMethodContext::COMMIT, "1234567", 0, 7);
+  inputMethodContext.EventReceivedSignal().Emit(inputMethodContext, imfEvent);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(gInputFilteredRejectedCallbackCalled);
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("12341234"), TEST_LOCATION);
+
+  END_TEST;
+}
 
 // Negative test for the textChanged signal.
 int utcDaliTextFieldTextChangedN(void)
@@ -1520,22 +1843,22 @@ int utcDaliTextFieldTextChangedN(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldTextChangedN");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   field.TextChangedSignal().Connect(&TestTextChangedCallback);
   bool textChangedSignal = false;
-  field.ConnectSignal( testTracker, "textChanged",   CallbackFunctor(&textChangedSignal) );
+  field.ConnectSignal(testTracker, "textChanged", CallbackFunctor(&textChangedSignal));
 
   gTextChangedCallBackCalled = false;
-  field.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "ABC" ); // Setting placeholder, not TEXT
+  field.SetProperty(TextField::Property::PLACEHOLDER_TEXT, "ABC"); // Setting placeholder, not TEXT
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( !gTextChangedCallBackCalled );
-  DALI_TEST_CHECK( !textChangedSignal );
+  DALI_TEST_CHECK(!gTextChangedCallBackCalled);
+  DALI_TEST_CHECK(!textChangedSignal);
 
   END_TEST;
 }
@@ -1546,12 +1869,12 @@ int utcDaliTextFieldMaxCharactersReachedP(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldMaxCharactersReachedP");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   const int maxNumberOfCharacters = 1;
-  field.SetProperty( TextField::Property::MAX_LENGTH, maxNumberOfCharacters );
+  field.SetProperty(TextField::Property::MAX_LENGTH, maxNumberOfCharacters);
 
   field.SetKeyInputFocus();
 
@@ -1559,15 +1882,15 @@ int utcDaliTextFieldMaxCharactersReachedP(void)
   ConnectionTracker* testTracker = new ConnectionTracker();
   field.MaxLengthReachedSignal().Connect(&TestMaxLengthReachedCallback);
   bool maxLengthReachedSignal = false;
-  field.ConnectSignal( testTracker, "maxLengthReached",   CallbackFunctor(&maxLengthReachedSignal) );
+  field.ConnectSignal(testTracker, "maxLengthReached", CallbackFunctor(&maxLengthReachedSignal));
 
   gMaxCharactersCallBackCalled = false;
 
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
-  DALI_TEST_CHECK( gMaxCharactersCallBackCalled );
-  DALI_TEST_CHECK( maxLengthReachedSignal );
+  DALI_TEST_CHECK(gMaxCharactersCallBackCalled);
+  DALI_TEST_CHECK(maxLengthReachedSignal);
 
   END_TEST;
 }
@@ -1578,12 +1901,12 @@ int utcDaliTextFieldMaxCharactersReachedN(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldMaxCharactersReachedN");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   const int maxNumberOfCharacters = 3;
-  field.SetProperty( TextField::Property::MAX_LENGTH, maxNumberOfCharacters );
+  field.SetProperty(TextField::Property::MAX_LENGTH, maxNumberOfCharacters);
 
   field.SetKeyInputFocus();
 
@@ -1591,20 +1914,20 @@ int utcDaliTextFieldMaxCharactersReachedN(void)
   ConnectionTracker* testTracker = new ConnectionTracker();
   field.MaxLengthReachedSignal().Connect(&TestMaxLengthReachedCallback);
   bool maxLengthReachedSignal = false;
-  field.ConnectSignal( testTracker, "maxLengthReached",   CallbackFunctor(&maxLengthReachedSignal) );
+  field.ConnectSignal(testTracker, "maxLengthReached", CallbackFunctor(&maxLengthReachedSignal));
 
   gMaxCharactersCallBackCalled = false;
 
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
-  DALI_TEST_CHECK( !gMaxCharactersCallBackCalled );
-  DALI_TEST_CHECK( !maxLengthReachedSignal );
+  DALI_TEST_CHECK(!gMaxCharactersCallBackCalled);
+  DALI_TEST_CHECK(!maxLengthReachedSignal);
 
-  application.ProcessEvent( GenerateKey( "Return", "", "\r", KEY_RETURN_CODE, 0, 0, Integration::KeyEvent::DOWN, "\r", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("Return", "", "\r", KEY_RETURN_CODE, 0, 0, Integration::KeyEvent::DOWN, "\r", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
-  DALI_TEST_CHECK( !gMaxCharactersCallBackCalled );
-  DALI_TEST_CHECK( !maxLengthReachedSignal );
+  DALI_TEST_CHECK(!gMaxCharactersCallBackCalled);
+  DALI_TEST_CHECK(!maxLengthReachedSignal);
 
   END_TEST;
 }
@@ -1637,7 +1960,7 @@ int utcDaliTextFieldInputFilteredP(void)
 
   gInputFilteredAcceptedCallbackCalled = false;
 
-  application.ProcessEvent(GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   DALI_TEST_CHECK(gInputFilteredAcceptedCallbackCalled);
   DALI_TEST_CHECK(inputFilteredSignal);
@@ -1651,10 +1974,10 @@ int utcDaliTextFieldInputFilteredP(void)
 
   field.SetKeyInputFocus();
 
-  inputFilteredSignal = false;
+  inputFilteredSignal                  = false;
   gInputFilteredRejectedCallbackCalled = false;
 
-  application.ProcessEvent(GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   DALI_TEST_CHECK(gInputFilteredAcceptedCallbackCalled);
   DALI_TEST_CHECK(inputFilteredSignal);
@@ -1697,8 +2020,8 @@ int utcDaliTextFieldInputFilteredN(void)
   application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::UP, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Backspace, Delete should not be filtered.
-  application.ProcessEvent(GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
-  application.ProcessEvent(GenerateKey( "Delete", "", "Delete", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("Delete", "", "Delete", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -1715,7 +2038,7 @@ int utcDaliTextFieldInputFilteredN(void)
 
   field.SetKeyInputFocus();
 
-  inputFilteredSignal = false;
+  inputFilteredSignal                  = false;
   gInputFilteredRejectedCallbackCalled = false;
 
   // Key a, d should not be filtered.
@@ -1725,8 +2048,8 @@ int utcDaliTextFieldInputFilteredN(void)
   application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::UP, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Backspace, Delete should not be filtered.
-  application.ProcessEvent(GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
-  application.ProcessEvent(GenerateKey( "Delete", "", "Delete", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("Delete", "", "Delete", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -1750,34 +2073,33 @@ int utcDaliTextFieldInputStyleChanged01(void)
 
   // Load some fonts.
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE);
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-
+  DALI_TEST_CHECK(field);
 
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
-  field.SetProperty( TextField::Property::ENABLE_MARKUP, true );
-  field.SetProperty( TextField::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='green'>llo</color> <font weight='bold'>world</font> demo</font>" );
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='green'>llo</color> <font weight='bold'>world</font> demo</font>");
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
-  field.InputStyleChangedSignal().Connect( &TestInputStyleChangedCallback );
+  field.InputStyleChangedSignal().Connect(&TestInputStyleChangedCallback);
   bool inputStyleChangedSignal = false;
-  field.ConnectSignal( testTracker, "inputStyleChanged",   CallbackFunctor(&inputStyleChangedSignal) );
+  field.ConnectSignal(testTracker, "inputStyleChanged", CallbackFunctor(&inputStyleChangedSignal));
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // Render and notify
   application.SendNotification();
@@ -1787,11 +2109,11 @@ int utcDaliTextFieldInputStyleChanged01(void)
   application.RunIdles();
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 18.0f, 25.0f );
+  TestGenerateTap(application, 18.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1800,25 +2122,25 @@ int utcDaliTextFieldInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextField::InputStyle::FONT_FAMILY | TextField::InputStyle::POINT_SIZE ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextField::InputStyle::FONT_FAMILY | TextField::InputStyle::POINT_SIZE), TEST_LOCATION);
 
-    const std::string fontFamily = field.GetProperty( TextField::Property::INPUT_FONT_FAMILY ).Get<std::string>();
-    DALI_TEST_EQUALS( fontFamily, "DejaVuSerif", TEST_LOCATION );
+    const std::string fontFamily = field.GetProperty(TextField::Property::INPUT_FONT_FAMILY).Get<std::string>();
+    DALI_TEST_EQUALS(fontFamily, "DejaVuSerif", TEST_LOCATION);
 
-    const float pointSize = field.GetProperty( TextField::Property::INPUT_POINT_SIZE ).Get<float>();
-    DALI_TEST_EQUALS( pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+    const float pointSize = field.GetProperty(TextField::Property::INPUT_POINT_SIZE).Get<float>();
+    DALI_TEST_EQUALS(pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 30.0f, 25.0f );
+  TestGenerateTap(application, 30.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1827,15 +2149,15 @@ int utcDaliTextFieldInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 43.0f, 25.0f );
+  TestGenerateTap(application, 43.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1844,22 +2166,22 @@ int utcDaliTextFieldInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextField::InputStyle::COLOR ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextField::InputStyle::COLOR), TEST_LOCATION);
 
-    const Vector4 color = field.GetProperty( TextField::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::GREEN, TEST_LOCATION );
+    const Vector4 color = field.GetProperty(TextField::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::GREEN, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 88.0f, 25.0f );
+  TestGenerateTap(application, 88.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1868,30 +2190,30 @@ int utcDaliTextFieldInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextField::InputStyle::COLOR | TextField::InputStyle::FONT_STYLE ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextField::InputStyle::COLOR | TextField::InputStyle::FONT_STYLE), TEST_LOCATION);
 
-    const Vector4 color = field.GetProperty( TextField::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
+    const Vector4 color = field.GetProperty(TextField::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLACK, TEST_LOCATION);
 
-    const Property::Map fontStyleMapGet = field.GetProperty( TextField::Property::INPUT_FONT_STYLE ).Get<Property::Map>();
+    const Property::Map fontStyleMapGet = field.GetProperty(TextField::Property::INPUT_FONT_STYLE).Get<Property::Map>();
 
     Property::Map fontStyleMapSet;
-    fontStyleMapSet.Insert( "weight", "bold" );
+    fontStyleMapSet.Insert("weight", "bold");
 
-    DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-    DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+    DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 115.0f, 25.0f );
+  TestGenerateTap(application, 115.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1900,15 +2222,15 @@ int utcDaliTextFieldInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 164.0f, 25.0f );
+  TestGenerateTap(application, 164.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1917,22 +2239,22 @@ int utcDaliTextFieldInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ), static_cast<unsigned int>( TextField::InputStyle::FONT_STYLE ), TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextField::InputStyle::FONT_STYLE), TEST_LOCATION);
 
-    const std::string style = field.GetProperty( TextField::Property::INPUT_FONT_STYLE ).Get<std::string>();
-    DALI_TEST_CHECK( style.empty() );
+    const std::string style = field.GetProperty(TextField::Property::INPUT_FONT_STYLE).Get<std::string>();
+    DALI_TEST_CHECK(style.empty());
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 191.0f, 25.0f );
+  TestGenerateTap(application, 191.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -1941,8 +2263,8 @@ int utcDaliTextFieldInputStyleChanged01(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   END_TEST;
 }
@@ -1959,33 +2281,33 @@ int utcDaliTextFieldInputStyleChanged02(void)
 
   // Load some fonts.
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 93u, 93u );
+  fontClient.SetDpi(93u, 93u);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE );
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE);
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
-  field.SetProperty( TextField::Property::ENABLE_MARKUP, true );
-  field.SetProperty( TextField::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='blue'> l</color><color value='green'>lo</color> <font weight='bold'>world</font> demo</font>" );
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='blue'> l</color><color value='green'>lo</color> <font weight='bold'>world</font> demo</font>");
 
   // connect to the text changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
-  field.InputStyleChangedSignal().Connect( &TestInputStyleChangedCallback );
+  field.InputStyleChangedSignal().Connect(&TestInputStyleChangedCallback);
   bool inputStyleChangedSignal = false;
-  field.ConnectSignal( testTracker, "inputStyleChanged",   CallbackFunctor(&inputStyleChangedSignal) );
+  field.ConnectSignal(testTracker, "inputStyleChanged", CallbackFunctor(&inputStyleChangedSignal));
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // Render and notify
   application.SendNotification();
@@ -1995,12 +2317,12 @@ int utcDaliTextFieldInputStyleChanged02(void)
   application.RunIdles();
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 53.0f, 25.0f, 100 );
-  TestGenerateTap( application, 53.0f, 25.0f, 200 );
+  TestGenerateTap(application, 53.0f, 25.0f, 100);
+  TestGenerateTap(application, 53.0f, 25.0f, 200);
 
   // Render and notify
   application.SendNotification();
@@ -2009,31 +2331,31 @@ int utcDaliTextFieldInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextField::InputStyle::FONT_FAMILY |
-                                                 TextField::InputStyle::POINT_SIZE  |
-                                                 TextField::InputStyle::COLOR ),
-                      TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextField::InputStyle::FONT_FAMILY |
+                                               TextField::InputStyle::POINT_SIZE |
+                                               TextField::InputStyle::COLOR),
+                     TEST_LOCATION);
 
-    const Vector4 color = field.GetProperty( TextField::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::GREEN, TEST_LOCATION );
+    const Vector4 color = field.GetProperty(TextField::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::GREEN, TEST_LOCATION);
 
-    const std::string fontFamily = field.GetProperty( TextField::Property::INPUT_FONT_FAMILY ).Get<std::string>();
-    DALI_TEST_EQUALS( fontFamily, "DejaVuSerif", TEST_LOCATION );
+    const std::string fontFamily = field.GetProperty(TextField::Property::INPUT_FONT_FAMILY).Get<std::string>();
+    DALI_TEST_EQUALS(fontFamily, "DejaVuSerif", TEST_LOCATION);
 
-    const float pointSize = field.GetProperty( TextField::Property::INPUT_POINT_SIZE ).Get<float>();
-    DALI_TEST_EQUALS( pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+    const float pointSize = field.GetProperty(TextField::Property::INPUT_POINT_SIZE).Get<float>();
+    DALI_TEST_EQUALS(pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -2042,23 +2364,23 @@ int utcDaliTextFieldInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextField::InputStyle::COLOR ),
-                      TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextField::InputStyle::COLOR),
+                     TEST_LOCATION);
 
-    const Vector4 color = field.GetProperty( TextField::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLUE, TEST_LOCATION );
+    const Vector4 color = field.GetProperty(TextField::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLUE, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -2067,14 +2389,14 @@ int utcDaliTextFieldInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -2083,36 +2405,37 @@ int utcDaliTextFieldInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextField::InputStyle::COLOR ),
-                      TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextField::InputStyle::COLOR),
+                     TEST_LOCATION);
 
-    const Vector4 color = field.GetProperty( TextField::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
+    const Vector4 color = field.GetProperty(TextField::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLACK, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   gInputStyleChangedCallbackCalled = false;
-  gInputStyleMask = TextField::InputStyle::NONE;
-  inputStyleChangedSignal = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
 
-  field.SetProperty( TextField::Property::INPUT_COLOR, Color::YELLOW );
+  field.SetProperty(TextField::Property::INPUT_COLOR, Color::YELLOW);
 
   Property::Map fontStyleMapSet;
-  fontStyleMapSet.Insert( "weight", "thin" );
-  fontStyleMapSet.Insert( "width", "condensed" );
-  fontStyleMapSet.Insert( "slant", "italic" );
+  fontStyleMapSet.Insert("weight", "thin");
+  fontStyleMapSet.Insert("width", "condensed");
+  fontStyleMapSet.Insert("slant", "italic");
 
-  field.SetProperty( TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet );
-  field.SetProperty( TextField::Property::INPUT_POINT_SIZE, 20.f );
+  field.SetProperty(TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet);
+  field.SetProperty(TextField::Property::INPUT_POINT_SIZE, 20.f);
 
-  field.SetProperty( TextField::Property::INPUT_UNDERLINE, "underline" );
-  field.SetProperty( TextField::Property::INPUT_SHADOW, "shadow" );
-  field.SetProperty( TextField::Property::INPUT_EMBOSS, "emboss" );
-  field.SetProperty( TextField::Property::INPUT_OUTLINE, "outline" );
+  field.SetProperty(TextField::Property::INPUT_UNDERLINE, "underline");
+  field.SetProperty(TextField::Property::INPUT_SHADOW, "shadow");
+  field.SetProperty(TextField::Property::INPUT_EMBOSS, "emboss");
+  field.SetProperty(TextField::Property::INPUT_OUTLINE, "outline");
+  field.SetProperty(DevelTextField::Property::INPUT_STRIKETHROUGH, "strikethrough");
 
   // Render and notify
   application.SendNotification();
@@ -2121,11 +2444,11 @@ int utcDaliTextFieldInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( !gInputStyleChangedCallbackCalled );
-  DALI_TEST_CHECK( !inputStyleChangedSignal );
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 63.0f, 25.0f, 700 );
+  TestGenerateTap(application, 63.0f, 25.0f, 700);
 
   // Render and notify
   application.SendNotification();
@@ -2134,118 +2457,315 @@ int utcDaliTextFieldInputStyleChanged02(void)
   // Executes the idle callbacks added by the text control on the change of input style.
   application.RunIdles();
 
-  DALI_TEST_CHECK( gInputStyleChangedCallbackCalled );
-  if( gInputStyleChangedCallbackCalled )
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
   {
-    DALI_TEST_EQUALS( static_cast<unsigned int>( gInputStyleMask ),
-                      static_cast<unsigned int>( TextField::InputStyle::COLOR |
-                                                 TextField::InputStyle::POINT_SIZE |
-                                                 TextField::InputStyle::FONT_STYLE |
-                                                 TextField::InputStyle::UNDERLINE |
-                                                 TextField::InputStyle::SHADOW |
-                                                 TextField::InputStyle::EMBOSS |
-                                                 TextField::InputStyle::OUTLINE ),
-                      TEST_LOCATION );
-
-    const Vector4 color = field.GetProperty( TextField::Property::INPUT_COLOR ).Get<Vector4>();
-    DALI_TEST_EQUALS( color, Color::BLACK, TEST_LOCATION );
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask),
+                     static_cast<unsigned int>(TextField::InputStyle::COLOR |
+                                               TextField::InputStyle::POINT_SIZE |
+                                               TextField::InputStyle::FONT_STYLE |
+                                               TextField::InputStyle::UNDERLINE |
+                                               TextField::InputStyle::SHADOW |
+                                               TextField::InputStyle::EMBOSS |
+                                               TextField::InputStyle::OUTLINE),
+                     TEST_LOCATION);
+
+    const Vector4 color = field.GetProperty(TextField::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::BLACK, TEST_LOCATION);
   }
-  DALI_TEST_CHECK( inputStyleChangedSignal );
+  DALI_TEST_CHECK(inputStyleChangedSignal);
 
   END_TEST;
 }
 
-int utcDaliTextFieldEvent01(void)
+int utcDaliTextFieldInputStyleChanged03(void)
 {
+  // Test InputStyleCahnged signal emitted even if AddIdle failed.
   ToolkitTestApplication application;
-  tet_infoline(" utcDaliTextFieldEvent01");
+  tet_infoline(" utcDaliTextFieldInputStyleChanged03");
 
-  // Creates a tap event. After creating a tap event the text field should
-  // have the focus and add text with key events should be possible.
+  // Load some fonts.
+
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
+
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.SetDpi(93u, 93u);
+
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif.ttf", DEFAULT_FONT_SIZE);
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/dejavu/DejaVuSerif-Bold.ttf", DEFAULT_FONT_SIZE);
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "<font family='DejaVuSerif' size='18'>He<color value='green'>llo</color> <font weight='bold'>world</font> demo</font>");
+
+  // connect to the text changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  field.InputStyleChangedSignal().Connect(&TestInputStyleChangedCallback);
+  bool inputStyleChangedSignal = false;
+  field.ConnectSignal(testTracker, "inputStyleChanged", CallbackFunctor(&inputStyleChangedSignal));
 
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  application.GetScene().Add(field);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 18.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
+
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
+  {
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextField::InputStyle::FONT_FAMILY | TextField::InputStyle::POINT_SIZE), TEST_LOCATION);
+
+    const std::string fontFamily = field.GetProperty(TextField::Property::INPUT_FONT_FAMILY).Get<std::string>();
+    DALI_TEST_EQUALS(fontFamily, "DejaVuSerif", TEST_LOCATION);
+
+    const float pointSize = field.GetProperty(TextField::Property::INPUT_POINT_SIZE).Get<float>();
+    DALI_TEST_EQUALS(pointSize, 18.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  }
+  DALI_TEST_CHECK(inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 30.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
+
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 43.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
+
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
+  {
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextField::InputStyle::COLOR), TEST_LOCATION);
+
+    const Vector4 color = field.GetProperty(TextField::Property::INPUT_COLOR).Get<Vector4>();
+    DALI_TEST_EQUALS(color, Color::GREEN, TEST_LOCATION);
+  }
+  DALI_TEST_CHECK(inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Make AddIdle return false.
+  ToolkitApplication::ADD_IDLE_SUCCESS = false;
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 88.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Execute the idle callbacks.
+  // And check whether we didn't change of input style.
+  application.RunIdles();
+
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 115.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Execute the idle callbacks.
+  // And check whether we didn't change of input style.
+  application.RunIdles();
+
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Revert AddIdle return true.
+  ToolkitApplication::ADD_IDLE_SUCCESS = true;
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 164.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
+
+  DALI_TEST_CHECK(gInputStyleChangedCallbackCalled);
+  if(gInputStyleChangedCallbackCalled)
+  {
+    DALI_TEST_EQUALS(static_cast<unsigned int>(gInputStyleMask), static_cast<unsigned int>(TextField::InputStyle::FONT_STYLE), TEST_LOCATION);
+
+    const std::string style = field.GetProperty(TextField::Property::INPUT_FONT_STYLE).Get<std::string>();
+    DALI_TEST_CHECK(style.empty());
+  }
+  DALI_TEST_CHECK(inputStyleChangedSignal);
+
+  gInputStyleChangedCallbackCalled = false;
+  gInputStyleMask                  = TextField::InputStyle::NONE;
+  inputStyleChangedSignal          = false;
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 191.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Executes the idle callbacks added by the text control on the change of input style.
+  application.RunIdles();
+
+  DALI_TEST_CHECK(!gInputStyleChangedCallbackCalled);
+  DALI_TEST_CHECK(!inputStyleChangedSignal);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldEvent01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldEvent01");
+
+  // Creates a tap event. After creating a tap event the text field should
+  // have the focus and add text with key events should be possible.
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Add a key event but as the text field has not the focus it should do nothing.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string(""), TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string(""), TEST_LOCATION);
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Pressing delete key should be fine even if there is no text in TextField.
-  application.ProcessEvent( GenerateKey( "Delete", "", "Delete", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("Delete", "", "Delete", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "Delete", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Now the text field has the focus, so it can handle the key events.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("aa"), TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("aa"), TEST_LOCATION);
 
   // Create a second text field and send key events to it.
   TextField field2 = TextField::New();
 
-  field2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field2.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  field2.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  field2.SetProperty( Actor::Property::POSITION, Vector2( 100.0f, 100.0f ));
+  field2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  field2.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  field2.SetProperty(Actor::Property::POSITION, Vector2(100.0f, 100.0f));
 
-  application.GetScene().Add( field2 );
+  application.GetScene().Add(field2);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Create a tap event on the second text field.
-  TestGenerateTap( application, 150.0f, 125.0f );
+  TestGenerateTap(application, 150.0f, 125.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // The second text field has the focus. It should handle the key events.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check the text has been added to the second text field.
-  DALI_TEST_EQUALS( field2.GetProperty<std::string>( TextField::Property::TEXT ), std::string("aa"), TEST_LOCATION );
+  DALI_TEST_EQUALS(field2.GetProperty<std::string>(TextField::Property::TEXT), std::string("aa"), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2258,145 +2778,144 @@ int utcDaliTextFieldEvent02(void)
   // Checks if the right number of actors are created.
 
   TextField field = TextField::New();
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  DALI_TEST_CHECK( field );
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  DALI_TEST_CHECK(field);
   LoadMarkerImages(application, field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Check there are the expected number of children ( stencil ).
-  DALI_TEST_EQUALS( field.GetChildCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetChildCount(), 1u, TEST_LOCATION);
 
-  Actor stencil = field.GetChildAt( 0u );
-  DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION );
+  Actor stencil = field.GetChildAt(0u);
+  DALI_TEST_EQUALS(stencil.GetChildCount(), 0u, TEST_LOCATION);
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f, 300 );
+  TestGenerateTap(application, 150.0f, 25.0f, 300);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Actor layer = field.GetChildAt( 1u );
-  DALI_TEST_EQUALS( layer.GetChildCount(), 1u, TEST_LOCATION ); // The cursor.
-  DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION );
+  Actor layer = field.GetChildAt(2u);
+  DALI_TEST_EQUALS(layer.GetChildCount(), 1u, TEST_LOCATION); // The cursor.
+  DALI_TEST_EQUALS(stencil.GetChildCount(), 0u, TEST_LOCATION);
 
   // Now the text field has the focus, so it can handle the key events.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Checks the cursor and the renderer have been created.
-  DALI_TEST_EQUALS( layer.GetChildCount(), 1u, TEST_LOCATION ); // The cursor.
-  DALI_TEST_EQUALS( stencil.GetChildCount(), 1u, TEST_LOCATION ); // The renderer
+  DALI_TEST_EQUALS(layer.GetChildCount(), 1u, TEST_LOCATION);   // The cursor.
+  DALI_TEST_EQUALS(stencil.GetChildCount(), 2u, TEST_LOCATION); // The renderer, clipped cursor
 
-  Control cursor = Control::DownCast( layer.GetChildAt( 0u ) );
-  DALI_TEST_CHECK( cursor );
+  Control cursor = Control::DownCast(layer.GetChildAt(0u));
+  DALI_TEST_CHECK(cursor);
 
   // The offscreen root actor has a container with all the actors which contain the text renderers.
-  Actor container = stencil.GetChildAt( 0u );
-  for( unsigned int index = 0; index < container.GetChildCount(); ++index )
+  Actor container = stencil.GetChildAt(0u);
+  for(unsigned int index = 0; index < container.GetChildCount(); ++index)
   {
-    Renderer renderer = container.GetChildAt( index ).GetRendererAt( 0u );
-    DALI_TEST_CHECK( renderer );
+    Renderer renderer = container.GetChildAt(index).GetRendererAt(0u);
+    DALI_TEST_CHECK(renderer);
   }
 
   // Move the cursor and check the position changes.
-  Vector3 position1 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  Vector3 position1 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Vector3 position2 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
-  DALI_TEST_CHECK( position2.x < position1.x );
+  Vector3 position2 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+  DALI_TEST_CHECK(position2.x < position1.x);
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Vector3 position3 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
-  DALI_TEST_EQUALS( position1, position3, TEST_LOCATION ); // Should be in the same position1.
-
+  Vector3 position3 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+  DALI_TEST_EQUALS(position1, position3, TEST_LOCATION); // Should be in the same position1.
 
   // Move the cursor to the first position.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Vector3 position4 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  Vector3 position4 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
 
   // Send some taps and check the cursor positions.
 
   // Try to tap at the beginning.
-  TestGenerateTap( application, 1.0f, 25.0f, 900 );
+  TestGenerateTap(application, 1.0f, 25.0f, 900);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Cursor position should be the same than position1.
-  Vector3 position5 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  Vector3 position5 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
 
-  DALI_TEST_EQUALS( position4, position5, TEST_LOCATION ); // Should be in the same position2.
+  DALI_TEST_EQUALS(position4, position5, TEST_LOCATION); // Should be in the same position2.
 
   // Tap away from the start position.
-  TestGenerateTap( application, 16.0f, 25.0f, 1500 );
+  TestGenerateTap(application, 16.0f, 25.0f, 1500);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Vector3 position6 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  Vector3 position6 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
 
-  DALI_TEST_CHECK( position6.x > position5.x );
+  DALI_TEST_CHECK(position6.x > position5.x);
 
   // Remove all the text.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  field.SetProperty( TextField::Property::TEXT, "" );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  field.SetProperty(TextField::Property::TEXT, "");
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Cursor position should be the same than position2.
-  Vector3 position7 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
+  Vector3 position7 = cursor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
 
-  DALI_TEST_EQUALS( position4, position7, TEST_LOCATION );// Should be in the same position2.
+  DALI_TEST_EQUALS(position4, position7, TEST_LOCATION); // Should be in the same position2.
 
-  // Should not be a renderer.
-  DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION );
+  // Should not be a renderer, there is only a clipped cursor.
+  DALI_TEST_EQUALS(stencil.GetChildCount(), 1u, TEST_LOCATION);
 
   // Chanege exceed policy (EXCEED_POLICY_ORIGINAL doesn't use stencil )
-  field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." );
-  field.SetProperty( TextField::Property::EXCEED_POLICY, Dali::Toolkit::TextField::EXCEED_POLICY_ORIGINAL );
+  field.SetProperty(TextField::Property::TEXT, "This is a long text for the size of the text-field.");
+  field.SetProperty(TextField::Property::EXCEED_POLICY, Dali::Toolkit::TextField::EXCEED_POLICY_ORIGINAL);
 
   application.SendNotification();
   application.Render();
 
   // There are renderer and decorator layer
-  DALI_TEST_EQUALS( field.GetChildCount(), 2u, TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetChildCount(), 2u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2409,18 +2928,18 @@ int utcDaliTextFieldEvent03(void)
   // Checks if the highlight actor is created.
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
-  field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 30.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "This is a long text for the size of the text-field.");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(30.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   LoadMarkerImages(application, field);
 
   // Render and notify
@@ -2428,32 +2947,32 @@ int utcDaliTextFieldEvent03(void)
   application.Render();
 
   // Tap first to get the focus.
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f, 100);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Double tap to select a word.
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f, 200);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // The offscreen root actor should have two actors: the renderer and the highlight actor.
-  Actor stencil = field.GetChildAt( 0u );
+  Actor stencil = field.GetChildAt(0u);
 
   // The highlight actor is drawn first, so is the first actor in the list
-  Renderer highlight = stencil.GetChildAt( 0u ).GetRendererAt( 0u );
-  DALI_TEST_CHECK( highlight );
+  Renderer highlight = stencil.GetChildAt(0u).GetRendererAt(0u);
+  DALI_TEST_CHECK(highlight);
 
   // The offscreen root actor has a container with all the actors which contain the text renderers.
-  Actor container = stencil.GetChildAt( 1u );
-  for( unsigned int index = 0; index < container.GetChildCount(); ++index )
+  Actor container = stencil.GetChildAt(1u);
+  for(unsigned int index = 0; index < container.GetChildCount(); ++index)
   {
-    Renderer renderer = container.GetChildAt( index ).GetRendererAt( 0u );
-    DALI_TEST_CHECK( renderer );
+    Renderer renderer = container.GetChildAt(index).GetRendererAt(0u);
+    DALI_TEST_CHECK(renderer);
   }
 
   END_TEST;
@@ -2467,48 +2986,51 @@ int utcDaliTextFieldEvent04(void)
   // Checks if the highlight actor is created.
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "This is a long text for the size of the text-field.");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-
   // Tap first to get the focus.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Double tap to select a word.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap grab handle
-  TestGenerateTap( application, 0.0f, 40.0f );
+  TestGenerateTap(application, 0.0f, 40.0f);
+
+  field.SetProperty(TextField::Property::POINT_SIZE, 12.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::INPUT_POINT_SIZE), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
   END_TEST;
 }
 
@@ -2520,46 +3042,46 @@ int utcDaliTextFieldEvent05(void)
   // Checks dragging of cursor/grab handle
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "This is a long text for the size of the text-field.");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap first to get the focus.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Double tap to select a word.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Actor stencil = field.GetChildAt( 1u );
+  Actor stencil = field.GetChildAt(1u);
   END_TEST;
 }
 
@@ -2571,34 +3093,33 @@ int utcDaliTextFieldEvent06(void)
   // Checks Longpress when in edit mode
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::TEXT, "Thisisalongtextforthesizeofthetextfield." );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "Thisisalongtextforthesizeofthetextfield.");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-
   // Tap first to get the focus.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -2622,24 +3143,24 @@ int utcDaliTextFieldEvent07(void)
   // Checks Longpress to start edit mode
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::TEXT, "Thisisalongtextforthesizeofthetextfield." );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "Thisisalongtextforthesizeofthetextfield.");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   Property::Map propertyMap;
   propertyMap["PANEL_LAYOUT"] = InputMethod::PanelLayout::PASSWORD;
-  field.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, propertyMap );
+  field.SetProperty(TextField::Property::INPUT_METHOD_SETTINGS, propertyMap);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   // Render and notify
   application.SendNotification();
   application.Render();
@@ -2659,33 +3180,34 @@ int utcDaliTextFieldEvent08(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldEvent08");
 
-  Dali::Clipboard clipboard = Clipboard::Get();
-  clipboard.SetItem("testTextFieldEvent");
+  Dali::Clipboard           clipboard = Clipboard::Get();
+  Dali::Clipboard::ClipData data("text/plain;charset=utf-8", "testTextFieldEvent");
+  clipboard.SetData(data);
 
   // Checks Longpress when only place holder text
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Setting Placeholder Text" );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::PLACEHOLDER_TEXT, "Setting Placeholder Text");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Long Press
-  TestGenerateLongPress( application, 1.0f, 25.0f, 20 );
+  TestGenerateLongPress(application, 1.0f, 25.0f, 20);
 
   // Render and notify
   application.SendNotification();
@@ -2693,10 +3215,10 @@ int utcDaliTextFieldEvent08(void)
 
   Wait(application, 500);
 
-  TestEndLongPress( application, 1.0f, 25.0f, 520 );
+  TestEndLongPress(application, 1.0f, 25.0f, 520);
 
   // Long Press
-  TestGenerateLongPress( application, 1.0f, 25.0f, 600 );
+  TestGenerateLongPress(application, 1.0f, 25.0f, 600);
 
   // Render and notify
   application.Render();
@@ -2704,25 +3226,25 @@ int utcDaliTextFieldEvent08(void)
   Wait(application, 500);
 
   Integration::Scene stage = application.GetScene();
-  Layer layer = stage.GetRootLayer();
-  Actor actor = layer.FindChildByName("optionPaste");
+  Layer              layer = stage.GetRootLayer();
+  Actor              actor = layer.FindChildByName("optionPaste");
 
-  if (actor)
+  if(actor)
   {
-    Vector3 worldPosition = actor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION );
+    Vector3 worldPosition = actor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION);
     Vector2 halfStageSize = stage.GetSize() / 2.0f;
     Vector2 position(worldPosition.x + halfStageSize.width, worldPosition.y + halfStageSize.height);
 
     Dali::Integration::TouchEvent event;
     event = Dali::Integration::TouchEvent();
-    event.AddPoint( GetPointDownInside( position ) );
-    application.ProcessEvent( event );
+    event.AddPoint(GetPointDownInside(position));
+    application.ProcessEvent(event);
 
     event = Dali::Integration::TouchEvent();
-    event.AddPoint( GetPointUpInside( position ) );
-    application.ProcessEvent( event );
+    event.AddPoint(GetPointUpInside(position));
+    application.ProcessEvent(event);
   }
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextEditor::Property::TEXT ), std::string("testTextFieldEvent"), TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextEditor::Property::TEXT), std::string("testTextFieldEvent"), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2733,85 +3255,91 @@ int utcDaliTextFieldEvent09(void)
   tet_infoline(" utcDaliTextFieldEvent09");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::TEXT, "Hello" );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "Hello");
+  field.SetProperty(TextField::Property::PLACEHOLDER_TEXT, "Placeholder text");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
   application.SendNotification();
   application.Render();
 
   Property::Map map;
-  map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_NONE;
-  field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map );
-  application.ProcessEvent( GenerateKey( "d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  map[HiddenInput::Property::MODE] = HiddenInput::Mode::HIDE_NONE;
+  field.SetProperty(TextField::Property::HIDDEN_INPUT_SETTINGS, map);
+  application.ProcessEvent(GenerateKey("d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
+  for(unsigned int index = 0u; index < 6u; ++index)
+  {
+    application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+    application.SendNotification();
+    application.Render();
+  }
 
-  map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_ALL;
-  map[ HiddenInput::Property::SUBSTITUTE_CHARACTER ] = 0x23;
-  field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map );
-  application.ProcessEvent( GenerateKey( "d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  map[HiddenInput::Property::MODE]                 = HiddenInput::Mode::HIDE_ALL;
+  map[HiddenInput::Property::SUBSTITUTE_CHARACTER] = 0x23;
+  field.SetProperty(TextField::Property::HIDDEN_INPUT_SETTINGS, map);
+  application.ProcessEvent(GenerateKey("d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_COUNT;
-  map[ HiddenInput::Property::SUBSTITUTE_COUNT ] = 2;
-  field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map );
-  for( unsigned int index = 0u; index < 5u; ++index )
+  map[HiddenInput::Property::MODE]             = HiddenInput::Mode::HIDE_COUNT;
+  map[HiddenInput::Property::SUBSTITUTE_COUNT] = 2;
+  field.SetProperty(TextField::Property::HIDDEN_INPUT_SETTINGS, map);
+  for(unsigned int index = 0u; index < 5u; ++index)
   {
-    application.ProcessEvent( GenerateKey( "d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+    application.ProcessEvent(GenerateKey("d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
     application.SendNotification();
     application.Render();
   }
 
-  map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::SHOW_COUNT;
-  map[ HiddenInput::Property::SUBSTITUTE_COUNT ] = 2;
-  field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map );
-  for( unsigned int index = 0u; index < 5u; ++index )
+  map[HiddenInput::Property::MODE]             = HiddenInput::Mode::SHOW_COUNT;
+  map[HiddenInput::Property::SUBSTITUTE_COUNT] = 2;
+  field.SetProperty(TextField::Property::HIDDEN_INPUT_SETTINGS, map);
+  for(unsigned int index = 0u; index < 5u; ++index)
   {
-    application.ProcessEvent( GenerateKey( "d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+    application.ProcessEvent(GenerateKey("d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
     application.SendNotification();
     application.Render();
   }
 
-  map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::SHOW_LAST_CHARACTER;
-  map[ HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION ] = 0;
-  field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  map[HiddenInput::Property::MODE]                         = HiddenInput::Mode::SHOW_LAST_CHARACTER;
+  map[HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION] = 0;
+  field.SetProperty(TextField::Property::HIDDEN_INPUT_SETTINGS, map);
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
-  application.ProcessEvent( GenerateKey( "d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  map[ HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION ] = 100;
-  field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map );
-  application.ProcessEvent( GenerateKey( "d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  map[HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION] = 100;
+  field.SetProperty(TextField::Property::HIDDEN_INPUT_SETTINGS, map);
+  application.ProcessEvent(GenerateKey("d", "", "d", 0, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
   Property::Map mapGet;
-  mapGet = field.GetProperty<Property::Map>( TextField::Property::HIDDEN_INPUT_SETTINGS );
-  DALI_TEST_EQUALS( map.Count(), mapGet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( map, mapGet ), true, TEST_LOCATION );
+  mapGet = field.GetProperty<Property::Map>(TextField::Property::HIDDEN_INPUT_SETTINGS);
+  DALI_TEST_EQUALS(map.Count(), mapGet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(map, mapGet), true, TEST_LOCATION);
   END_TEST;
 }
 
-
 int utcDaliTextFieldStyleWhilstSelected(void)
 {
   ToolkitTestApplication application;
@@ -2820,100 +3348,99 @@ int utcDaliTextFieldStyleWhilstSelected(void)
   // Change font and styles whilst text is selected whilst word selected
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "This is a long text for the size of the text-field.");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-
   // Tap first to get the focus.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Double tap to select a word.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( TextField::Property::INPUT_FONT_FAMILY, "Setting input font family" );
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::INPUT_FONT_FAMILY ), "Setting input font family", TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_FONT_FAMILY, "Setting input font family");
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::INPUT_FONT_FAMILY), "Setting input font family", TEST_LOCATION);
 
   Property::Map fontStyleMapSet;
   Property::Map fontStyleMapGet;
 
-  fontStyleMapSet.Insert( "weight", "bold" );
-  fontStyleMapSet.Insert( "slant", "italic" );
-  field.SetProperty( TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet );
+  fontStyleMapSet.Insert("weight", "bold");
+  fontStyleMapSet.Insert("slant", "italic");
+  field.SetProperty(TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet);
 
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "width", "expanded" );
-  fontStyleMapSet.Insert( "slant", "italic" );
-  field.SetProperty( TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet );
+  fontStyleMapSet.Insert("width", "expanded");
+  fontStyleMapSet.Insert("slant", "italic");
+  field.SetProperty(TextField::Property::INPUT_FONT_STYLE, fontStyleMapSet);
 
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::INPUT_FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::INPUT_FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
-  field.SetProperty( TextField::Property::INPUT_POINT_SIZE, 12.f );
-  DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::INPUT_POINT_SIZE ), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  field.SetProperty(TextField::Property::INPUT_POINT_SIZE, 12.f);
+  DALI_TEST_EQUALS(field.GetProperty<float>(TextField::Property::INPUT_POINT_SIZE), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  field.SetProperty( TextField::Property::TEXT_COLOR, Color::RED );
-  DALI_TEST_EQUALS( field.GetProperty<Vector4>( TextField::Property::TEXT_COLOR ), Color::RED, TEST_LOCATION );
+  field.SetProperty(TextField::Property::TEXT_COLOR, Color::RED);
+  DALI_TEST_EQUALS(field.GetProperty<Vector4>(TextField::Property::TEXT_COLOR), Color::RED, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "bold" );
-  fontStyleMapSet.Insert( "slant", "italic" );
+  fontStyleMapSet.Insert("weight", "bold");
+  fontStyleMapSet.Insert("slant", "italic");
 
-  field.SetProperty( TextField::Property::FONT_STYLE, fontStyleMapSet );
+  field.SetProperty(TextField::Property::FONT_STYLE, fontStyleMapSet);
 
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "width", "expanded" );
+  fontStyleMapSet.Insert("width", "expanded");
 
-  field.SetProperty( TextField::Property::FONT_STYLE, fontStyleMapSet );
+  field.SetProperty(TextField::Property::FONT_STYLE, fontStyleMapSet);
 
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   // Press Escape to increase coverage
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( !field.HasKeyInputFocus() );
+  DALI_TEST_CHECK(!field.HasKeyInputFocus());
 
   END_TEST;
 }
@@ -2927,69 +3454,69 @@ int utcDaliTextFieldEscKeyLoseFocus(void)
   // have the focus and add text with key events should be possible.
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Add a key event but as the text field has not the focus it should do nothing.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string(""), TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string(""), TEST_LOCATION);
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Now the text field has the focus, so it can handle the key events.
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::UP, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("d", "", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::UP, "d", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("ad"), TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("ad"), TEST_LOCATION);
 
   // Generate a Esc key event. The text field should lose the focus.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( false, field.HasKeyInputFocus(), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, field.HasKeyInputFocus(), TEST_LOCATION);
 
   // No more text should be introduced
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("ad"), TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), std::string("ad"), TEST_LOCATION);
 
   END_TEST;
 }
@@ -3002,74 +3529,82 @@ int utcDaliTextFieldSomeSpecialKeys(void)
   // Checks some special keys when the text is selected.
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
   LoadMarkerImages(application, field);
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  const std::string longText( "This is a long text for the size of the text-field." );
+  const std::string longText("This is a long text for the size of the text-field.");
 
-  field.SetProperty( TextField::Property::TEXT, longText );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, longText);
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap first to get the focus.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Double tap to select a word.
-  TestGenerateTap( application, 1.0f, 25.0f );
+  TestGenerateTap(application, 1.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Generate a Esc key event. The text field should lose the focus.
-  application.ProcessEvent( GenerateKey( "XF86PowerOff", "", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::DOWN, "XF86PowerOff", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "XF86PowerOff", "", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::UP, "XF86PowerOff", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("XF86PowerOff", "", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::DOWN, "XF86PowerOff", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("XF86PowerOff", "", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::UP, "XF86PowerOff", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Generate a Esc key event. The text field should lose the focus.
-  application.ProcessEvent( GenerateKey( "XF86Menu", "", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::DOWN, "XF86Menu", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "XF86Menu", "", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::UP, "XF86Menu", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("XF86Menu", "", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::DOWN, "XF86Menu", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("XF86Menu", "", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::UP, "XF86Menu", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Generate a Esc key event. The text field should lose the focus.
-  application.ProcessEvent( GenerateKey( "XF86Home", "", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::DOWN, "XF86Home", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "XF86Home", "", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::UP, "XF86Home", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("XF86Home", "", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::DOWN, "XF86Home", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("XF86Home", "", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::UP, "XF86Home", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Generate a Back key event. Nothing happens to the text field.
+  application.ProcessEvent(GenerateKey("XF86Back", "", "XF86Back", DALI_KEY_BACK, 0, 0, Integration::KeyEvent::DOWN, "XF86Back", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("XF86Back", "", "XF86Back", DALI_KEY_BACK, 0, 0, Integration::KeyEvent::UP, "XF86Back", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // The text shouldn't be deleted.
-  DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), longText, TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<std::string>(TextField::Property::TEXT), longText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3081,42 +3616,41 @@ int utcDaliTextFieldSizeUpdate(void)
 
   // Checks some special keys when the text is selected.
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
-
-  float previousHeight = 0.0f;
-  float currentHeight = 0.0f;
-  const float fieldWidth = 1920.0f;
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
 
+  float       previousHeight = 0.0f;
+  float       currentHeight  = 0.0f;
+  const float fieldWidth     = 1920.0f;
 
   // "ㅁ" is bigger then "ኢ"
-  field.SetProperty( Actor::Property::SIZE, Vector2( fieldWidth ,10.0f ) );
-  field.SetResizePolicy( ResizePolicy::FIXED , Dimension::WIDTH );
-  field.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY , Dimension::HEIGHT );
+  field.SetProperty(Actor::Property::SIZE, Vector2(fieldWidth, 10.0f));
+  field.SetResizePolicy(ResizePolicy::FIXED, Dimension::WIDTH);
+  field.SetResizePolicy(ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT);
 
-  field.SetProperty( TextField::Property::TEXT, "ኢ");
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "ኢ");
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
-  field.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
-  KeyboardFocusManager::Get().SetCurrentFocusActor( field );
+  field.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  KeyboardFocusManager::Get().SetCurrentFocusActor(field);
 
   application.SendNotification();
   application.Render();
 
-  previousHeight = field.GetHeightForWidth( fieldWidth );
-  DALI_TEST_EQUALS( previousHeight, field.GetProperty<float>( Actor::Property::SIZE_HEIGHT ) , TEST_LOCATION );
+  previousHeight = field.GetHeightForWidth(fieldWidth);
+  DALI_TEST_EQUALS(previousHeight, field.GetProperty<float>(Actor::Property::SIZE_HEIGHT), TEST_LOCATION);
 
   // Add  another script characters ( glyph height is defferent )
-  application.ProcessEvent( GenerateKey( "ㅁ", "", "ㅁ", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "ㅁ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "ㅁ", "", "ㅁ", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "ㅁ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("ㅁ", "", "ㅁ", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "ㅁ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("ㅁ", "", "ㅁ", KEY_A_CODE, 0, 0, Integration::KeyEvent::UP, "ㅁ", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   application.SendNotification();
   application.Render();
 
-  currentHeight = field.GetHeightForWidth( fieldWidth );
-  DALI_TEST_EQUALS( currentHeight, field.GetProperty<float>( Actor::Property::SIZE_HEIGHT ), TEST_LOCATION );
-  DALI_TEST_EQUALS( (previousHeight < currentHeight), true , TEST_LOCATION );
+  currentHeight = field.GetHeightForWidth(fieldWidth);
+  DALI_TEST_EQUALS(currentHeight, field.GetProperty<float>(Actor::Property::SIZE_HEIGHT), TEST_LOCATION);
+  DALI_TEST_EQUALS((previousHeight < currentHeight), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3128,19 +3662,19 @@ int utcDaliTextFieldExtremlyLargePointSize(void)
 
   TextField field = TextField::New();
 
-  field.SetProperty( TextField::Property::TEXT, "Text" );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( field );
+  field.SetProperty(TextField::Property::TEXT, "Text");
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(field);
 
   try
   {
-    field.SetProperty( TextField::Property::POINT_SIZE, 160.0f );
+    field.SetProperty(TextField::Property::POINT_SIZE, 160.0f);
     application.SendNotification();
-    DALI_TEST_CHECK( field );
+    DALI_TEST_CHECK(field);
   }
-  catch (...)
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -3152,22 +3686,22 @@ int UtcDaliTextFieldDefaultFontStylePropertyCoverage(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliTextFieldFontStylePorpertyCoverage");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
 
   Property::Map fontStyleMapGet;
 
-  fontStyleMapGet = field.GetProperty<Property::Map>( TextField::Property::FONT_STYLE );
+  fontStyleMapGet = field.GetProperty<Property::Map>(TextField::Property::FONT_STYLE);
 
   Property::Value* weightValue = NULL;
-  Property::Value* widthValue = NULL;
-  Property::Value* slantValue = NULL;
-  weightValue = fontStyleMapGet.Find( "weight" );
-  widthValue = fontStyleMapGet.Find( "width" );
-  slantValue = fontStyleMapGet.Find( "slant" );
-  DALI_TEST_CHECK( !weightValue );
-  DALI_TEST_CHECK( !widthValue );
-  DALI_TEST_CHECK( !slantValue );
+  Property::Value* widthValue  = NULL;
+  Property::Value* slantValue  = NULL;
+  weightValue                  = fontStyleMapGet.Find("weight");
+  widthValue                   = fontStyleMapGet.Find("width");
+  slantValue                   = fontStyleMapGet.Find("slant");
+  DALI_TEST_CHECK(!weightValue);
+  DALI_TEST_CHECK(!widthValue);
+  DALI_TEST_CHECK(!slantValue);
 
   END_TEST;
 }
@@ -3178,76 +3712,76 @@ int UtcDaliTextFieldSettingPlaceholder(void)
   tet_infoline("UtcDaliTextFieldSettingPlaceholder");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  application.GetScene().Add(field);
 
   // Check the placeholder property with pixel size
   Property::Map placeholderPixelSizeMapSet;
   Property::Map placeholderPixelSizeMapGet;
   Property::Map placeholderFontstyleMap;
-  placeholderPixelSizeMapSet[ Text::PlaceHolder::Property::TEXT ] = "Setting Placeholder Text";
-  placeholderPixelSizeMapSet[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = "Setting Placeholder Text Focused";
-  placeholderPixelSizeMapSet[ Text::PlaceHolder::Property::COLOR ] = Color::BLUE;
-  placeholderPixelSizeMapSet[ Text::PlaceHolder::Property::FONT_FAMILY ] = "Arial";
-  placeholderPixelSizeMapSet[ Text::PlaceHolder::Property::PIXEL_SIZE ] = 15.0f;
-  placeholderPixelSizeMapSet[ Text::PlaceHolder::Property::ELLIPSIS ] = true;
+  placeholderPixelSizeMapSet[Text::PlaceHolder::Property::TEXT]         = "Setting Placeholder Text";
+  placeholderPixelSizeMapSet[Text::PlaceHolder::Property::TEXT_FOCUSED] = "Setting Placeholder Text Focused";
+  placeholderPixelSizeMapSet[Text::PlaceHolder::Property::COLOR]        = Color::BLUE;
+  placeholderPixelSizeMapSet[Text::PlaceHolder::Property::FONT_FAMILY]  = "Arial";
+  placeholderPixelSizeMapSet[Text::PlaceHolder::Property::PIXEL_SIZE]   = 15.0f;
+  placeholderPixelSizeMapSet[Text::PlaceHolder::Property::ELLIPSIS]     = true;
 
-  placeholderFontstyleMap.Insert( "weight", "bold" );
-  placeholderPixelSizeMapSet[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderFontstyleMap;
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderPixelSizeMapSet );
+  placeholderFontstyleMap.Insert("weight", "bold");
+  placeholderPixelSizeMapSet[Text::PlaceHolder::Property::FONT_STYLE] = placeholderFontstyleMap;
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderPixelSizeMapSet);
 
-  placeholderPixelSizeMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderPixelSizeMapGet.Count(), placeholderPixelSizeMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderPixelSizeMapGet, placeholderPixelSizeMapSet ), true, TEST_LOCATION );
+  placeholderPixelSizeMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderPixelSizeMapGet.Count(), placeholderPixelSizeMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderPixelSizeMapGet, placeholderPixelSizeMapSet), true, TEST_LOCATION);
 
   // Check the placeholder property with point size
   Property::Map placeholderMapSet;
   Property::Map placeholderMapGet;
-  placeholderMapSet[ Text::PlaceHolder::Property::TEXT ] = "Setting Placeholder Text";
-  placeholderMapSet[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = "Setting Placeholder Text Focused";
-  placeholderMapSet[ Text::PlaceHolder::Property::COLOR ] = Color::RED;
-  placeholderMapSet[ Text::PlaceHolder::Property::FONT_FAMILY ] = "Arial";
-  placeholderMapSet[ Text::PlaceHolder::Property::POINT_SIZE ] = 12.0f;
-  placeholderMapSet[ Text::PlaceHolder::Property::ELLIPSIS ] = false;
+  placeholderMapSet[Text::PlaceHolder::Property::TEXT]         = "Setting Placeholder Text";
+  placeholderMapSet[Text::PlaceHolder::Property::TEXT_FOCUSED] = "Setting Placeholder Text Focused";
+  placeholderMapSet[Text::PlaceHolder::Property::COLOR]        = Color::RED;
+  placeholderMapSet[Text::PlaceHolder::Property::FONT_FAMILY]  = "Arial";
+  placeholderMapSet[Text::PlaceHolder::Property::POINT_SIZE]   = 12.0f;
+  placeholderMapSet[Text::PlaceHolder::Property::ELLIPSIS]     = false;
 
   // Check the placeholder font style property
   placeholderFontstyleMap.Clear();
 
-  placeholderFontstyleMap.Insert( "weight", "bold" );
-  placeholderFontstyleMap.Insert( "width", "condensed" );
-  placeholderFontstyleMap.Insert( "slant", "italic" );
-  placeholderMapSet[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderFontstyleMap;
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
+  placeholderFontstyleMap.Insert("weight", "bold");
+  placeholderFontstyleMap.Insert("width", "condensed");
+  placeholderFontstyleMap.Insert("slant", "italic");
+  placeholderMapSet[Text::PlaceHolder::Property::FONT_STYLE] = placeholderFontstyleMap;
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderMapSet ), true, TEST_LOCATION );
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderMapSet), true, TEST_LOCATION);
 
   // Reset font style.
   placeholderFontstyleMap.Clear();
-  placeholderFontstyleMap.Insert( "weight", "normal" );
-  placeholderFontstyleMap.Insert( "slant", "oblique" );
-  placeholderMapSet[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderFontstyleMap;
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
+  placeholderFontstyleMap.Insert("weight", "normal");
+  placeholderFontstyleMap.Insert("slant", "oblique");
+  placeholderMapSet[Text::PlaceHolder::Property::FONT_STYLE] = placeholderFontstyleMap;
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderMapSet ), true, TEST_LOCATION );
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderMapSet), true, TEST_LOCATION);
 
   placeholderFontstyleMap.Clear();
-  placeholderFontstyleMap.Insert( "slant", "roman" );
-  placeholderMapSet[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderFontstyleMap;
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
+  placeholderFontstyleMap.Insert("slant", "roman");
+  placeholderMapSet[Text::PlaceHolder::Property::FONT_STYLE] = placeholderFontstyleMap;
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
 
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
 
   placeholderFontstyleMap.Clear();
-  placeholderMapSet[ Text::PlaceHolder::Property::FONT_STYLE ] = placeholderFontstyleMap;
+  placeholderMapSet[Text::PlaceHolder::Property::FONT_STYLE] = placeholderFontstyleMap;
 
-  field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet );
-  placeholderMapGet = field.GetProperty<Property::Map>( TextField::Property::PLACEHOLDER );
-  DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderMapSet ), true, TEST_LOCATION );
+  field.SetProperty(TextField::Property::PLACEHOLDER, placeholderMapSet);
+  placeholderMapGet = field.GetProperty<Property::Map>(TextField::Property::PLACEHOLDER);
+  DALI_TEST_EQUALS(placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(placeholderMapGet, placeholderMapSet), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3322,29 +3856,29 @@ int UtcDaliTextFieldSetPaddingProperty(void)
   tet_infoline("UtcDaliTextFieldSetPaddingProperty\n");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(field);
 
   application.SendNotification();
   application.Render();
 
   Vector3 originalSize = field.GetNaturalSize();
 
-  field.SetProperty( Toolkit::Control::Property::PADDING, Extents( 10, 10, 10, 10 ) );
+  field.SetProperty(Toolkit::Control::Property::PADDING, Extents(10, 10, 10, 10));
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( field.GetProperty<Extents>( Toolkit::Control::Property::PADDING ), Extents( 10, 10, 10, 10 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<Extents>(Toolkit::Control::Property::PADDING), Extents(10, 10, 10, 10), TEST_LOCATION);
 
   Vector3 paddingAddedSize = field.GetNaturalSize();
 
-  DALI_TEST_EQUALS( originalSize.width + 10 + 10 , paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(originalSize.width + 10 + 10, paddingAddedSize.width, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( originalSize.height + 10 + 10 , paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(originalSize.height + 10 + 10, paddingAddedSize.height, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3355,21 +3889,21 @@ int UtcDaliTextFieldEnableShiftSelectionProperty(void)
   tet_infoline("UtcDaliTextFieldEnableShiftSelectionProperty");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(field);
 
   application.SendNotification();
   application.Render();
 
   // The default value of ENABLE_SHIFT_SELECTION is 'true'.
-  DALI_TEST_EQUALS( field.GetProperty<bool>( DevelTextField::Property::ENABLE_SHIFT_SELECTION ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<bool>(DevelTextField::Property::ENABLE_SHIFT_SELECTION), true, TEST_LOCATION);
 
   // Check the enable shift selection property
-  field.SetProperty( DevelTextField::Property::ENABLE_SHIFT_SELECTION, false );
-  DALI_TEST_EQUALS( field.GetProperty<bool>( DevelTextField::Property::ENABLE_SHIFT_SELECTION ), false, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::ENABLE_SHIFT_SELECTION, false);
+  DALI_TEST_EQUALS(field.GetProperty<bool>(DevelTextField::Property::ENABLE_SHIFT_SELECTION), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -3383,21 +3917,21 @@ int UtcDaliTextFieldEnableGrabHandleProperty(void)
   tet_infoline("UtcDaliTextFieldEnableGrabHandleProperty");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(field);
 
   application.SendNotification();
   application.Render();
 
   // The default value of ENABLE_GRAB_HANDLE is 'true'.
-  DALI_TEST_EQUALS( field.GetProperty<bool>( DevelTextField::Property::ENABLE_GRAB_HANDLE ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<bool>(DevelTextField::Property::ENABLE_GRAB_HANDLE), true, TEST_LOCATION);
 
   // Check the enable grab handle property
-  field.SetProperty( DevelTextField::Property::ENABLE_GRAB_HANDLE, false );
-  DALI_TEST_EQUALS( field.GetProperty<bool>( DevelTextField::Property::ENABLE_GRAB_HANDLE ), false, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::ENABLE_GRAB_HANDLE, false);
+  DALI_TEST_EQUALS(field.GetProperty<bool>(DevelTextField::Property::ENABLE_GRAB_HANDLE), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -3411,21 +3945,21 @@ int UtcDaliTextFieldMatchSystemLanguageDirectionProperty(void)
   tet_infoline("UtcDaliTextFieldMatchSystemLanguageDirectionProperty");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  application.GetScene().Add( field );
+  DALI_TEST_CHECK(field);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(field);
 
   application.SendNotification();
   application.Render();
 
   // The default value of MATCH_SYSTEM_LANGUAGE_DIRECTION is 'true'.
-  DALI_TEST_EQUALS( field.GetProperty<bool>( DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty<bool>(DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION), true, TEST_LOCATION);
 
   // Check the match system language direction property
-  field.SetProperty( DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, false );
-  DALI_TEST_EQUALS( field.GetProperty<bool>( DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION ), false, TEST_LOCATION );
+  field.SetProperty(DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, false);
+  DALI_TEST_EQUALS(field.GetProperty<bool>(DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -3441,16 +3975,16 @@ int utcDaliTextFieldLayoutDirectionCoverage(void)
   // Creates a tap event. After creating a tap event the text field should
   // have the focus and add text with key events should be possible.
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
-  field.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
@@ -3458,58 +3992,58 @@ int utcDaliTextFieldLayoutDirectionCoverage(void)
 
   // init direction for coverage
   // Set horizontal alignment END
-  field.SetProperty( TextField::Property::HORIZONTAL_ALIGNMENT, "END");
+  field.SetProperty(TextField::Property::HORIZONTAL_ALIGNMENT, "END");
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Set MATCH_SYSTEM_LANGUAGE_DIRECTION to true to use the layout direction.
-  field.SetProperty( DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, true );
-  field.SetProperty( Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT );
+  field.SetProperty(DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, true);
+  field.SetProperty(Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT);
 
   // Set horizontal alignment BEGIN
-  field.SetProperty( TextField::Property::HORIZONTAL_ALIGNMENT, "BEGIN");
+  field.SetProperty(TextField::Property::HORIZONTAL_ALIGNMENT, "BEGIN");
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Set horizontal alignment CENTER
-  field.SetProperty( TextField::Property::HORIZONTAL_ALIGNMENT, "CENTER");
+  field.SetProperty(TextField::Property::HORIZONTAL_ALIGNMENT, "CENTER");
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Set horizontal alignment END
-  field.SetProperty( TextField::Property::HORIZONTAL_ALIGNMENT, "END");
+  field.SetProperty(TextField::Property::HORIZONTAL_ALIGNMENT, "END");
 
   // Create a tap event to touch the text field.
-  TestGenerateTap( application, 150.0f, 25.0f );
+  TestGenerateTap(application, 150.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Generate a Esc key event. The text field should lose the focus.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( false, field.HasKeyInputFocus(), TEST_LOCATION );
+  DALI_TEST_EQUALS(false, field.HasKeyInputFocus(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -3520,7 +4054,7 @@ int UtcDaliTextFieldGetInputMethodContext(void)
   tet_infoline("UtcDaliTextFieldGetInputMethodContext");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( DevelTextField::GetInputMethodContext( field ) );
+  DALI_TEST_CHECK(DevelTextField::GetInputMethodContext(field));
 
   END_TEST;
 }
@@ -3532,47 +4066,53 @@ int UtcDaliTextFieldSelectWholeText(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( 1u, textField.GetChildCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1u, textField.GetChildCount(), TEST_LOCATION);
 
-  DevelTextField::SelectWholeText( textField );
+  DevelTextField::SelectWholeText(textField);
 
   application.SendNotification();
   application.Render();
 
   // Nothing should have been selected. The number of children is still 1
-  DALI_TEST_EQUALS( 1u, textField.GetChildCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1u, textField.GetChildCount(), TEST_LOCATION);
+
+  textField.SetProperty(TextField::Property::TEXT, "Hello world");
+
+  application.SendNotification();
+  application.Render();
 
-  textField.SetProperty( TextField::Property::TEXT, "Hello world" );
+  DevelTextField::SelectWholeText(textField);
 
   application.SendNotification();
   application.Render();
 
-  DevelTextField::SelectWholeText( textField );
+  // Even if resize, selection should remain.
+  textField.SetProperty(Actor::Property::SIZE, Vector2(150.f, 50.f));
 
   application.SendNotification();
   application.Render();
 
   // Should be 2 children, the stencil and the layer
-  DALI_TEST_EQUALS( 2u, textField.GetChildCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(2u, textField.GetChildCount(), TEST_LOCATION);
 
   // The offscreen root actor should have two actors: the renderer and the highlight actor.
-  Actor stencil = textField.GetChildAt( 0u );
+  Actor stencil = textField.GetChildAt(0u);
 
   // The highlight actor is drawn first, so is the first actor in the list
-  Renderer highlight = stencil.GetChildAt( 0u ).GetRendererAt( 0u );
-  DALI_TEST_CHECK( highlight );
+  Renderer highlight = stencil.GetChildAt(0u).GetRendererAt(0u);
+  DALI_TEST_CHECK(highlight);
 
   END_TEST;
 }
@@ -3584,55 +4124,55 @@ int UtcDaliTextFieldSelectText(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  DevelTextField::SelectText( textField, 0, 5 );
+  DevelTextField::SelectText(textField, 0, 5);
 
   application.SendNotification();
   application.Render();
 
   // Nothing is selected
-  std::string selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION );
+  std::string selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("", selectedText, TEST_LOCATION);
 
-  textField.SetProperty( TextField::Property::TEXT, "Hello world" );
+  textField.SetProperty(TextField::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
   // Hello is selected
-  DevelTextField::SelectText( textField, 0, 5 );
+  DevelTextField::SelectText(textField, 0, 5);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
   // world is selected
-  DevelTextField::SelectText( textField, 6, 11 );
+  DevelTextField::SelectText(textField, 6, 11);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "world", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("world", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 6, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 11, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 6, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 11, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3644,44 +4184,44 @@ int UtcDaliTextFieldSelectNone(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textField.SetProperty( TextField::Property::TEXT, "Hello world" );
+  textField.SetProperty(TextField::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
   // Nothing is selected
-  std::string selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION );
+  std::string selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("", selectedText, TEST_LOCATION);
 
-  DevelTextField::SelectWholeText( textField );
+  DevelTextField::SelectWholeText(textField);
 
   application.SendNotification();
   application.Render();
 
   // whole text is selected
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello world", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello world", selectedText, TEST_LOCATION);
 
-  DevelTextField::SelectNone( textField );
+  DevelTextField::SelectNone(textField);
 
   application.SendNotification();
   application.Render();
 
   // Nothing is selected
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("", selectedText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3693,42 +4233,42 @@ int UtcDaliTextFieldSelectRange(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textField.SetProperty( TextField::Property::TEXT, "Hello world" );
+  textField.SetProperty(TextField::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
-  textField.SetProperty( DevelTextField::Property::SELECTED_TEXT_START , 0);
-  textField.SetProperty( DevelTextField::Property::SELECTED_TEXT_END , 5);
+  textField.SetProperty(DevelTextField::Property::SELECTED_TEXT_START, 0);
+  textField.SetProperty(DevelTextField::Property::SELECTED_TEXT_END, 5);
 
   // Hello is selected
-  std::string selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  std::string selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
-  textField.SetProperty( DevelTextField::Property::SELECTED_TEXT_START , 6);
-  textField.SetProperty( DevelTextField::Property::SELECTED_TEXT_END , 11);
+  textField.SetProperty(DevelTextField::Property::SELECTED_TEXT_START, 6);
+  textField.SetProperty(DevelTextField::Property::SELECTED_TEXT_END, 11);
 
   // world is selected
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "world", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("world", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 6, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 11, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 6, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 11, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3740,72 +4280,92 @@ int UtcDaliTextFieldEnableEditing(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
+  textField.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, true);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelActor::Property::USER_INTERACTION_ENABLED).Get<bool>(), true, TEST_LOCATION);
+
   textField.SetKeyInputFocus();
-  textField.SetProperty( DevelTextField::Property::ENABLE_EDITING, false );
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  textField.SetProperty(DevelTextField::Property::ENABLE_EDITING, false);
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "", TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::ENABLE_EDITING ).Get<bool>(), false, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "", TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::ENABLE_EDITING).Get<bool>(), false, TEST_LOCATION);
 
   textField.SetKeyInputFocus();
-  textField.SetProperty( DevelTextField::Property::ENABLE_EDITING, true );
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  textField.SetProperty(DevelTextField::Property::ENABLE_EDITING, true);
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "D", TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::ENABLE_EDITING ).Get<bool>(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "D", TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::ENABLE_EDITING).Get<bool>(), true, TEST_LOCATION);
 
-  END_TEST;
-}
+  // Check the user interaction enabled and for coverage
+  DevelTextField::SelectWholeText(textField);
 
-int UtcDaliToolkitTextFieldFontSizeScale(void)
-{
-  ToolkitTestApplication application;
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  textField.SetKeyInputFocus();
+  textField.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, false);
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "D", TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelActor::Property::USER_INTERACTION_ENABLED).Get<bool>(), false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextFieldFontSizeScale(void)
+{
+  ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextFieldFontSizeScale");
 
   TextField textField = TextField::New();
-  textField.SetProperty( TextField::Property::POINT_SIZE, 30.f );
-  textField.SetProperty( TextField::Property::TEXT, "Test" );
+  textField.SetProperty(TextField::Property::POINT_SIZE, 30.f);
+  textField.SetProperty(TextField::Property::TEXT, "Test");
   Vector3 nonScaledSize = textField.GetNaturalSize();
 
   TextField textFieldScaled = TextField::New();
-  textFieldScaled.SetProperty( TextField::Property::POINT_SIZE, 15.f );
-  textFieldScaled.SetProperty( Toolkit::DevelTextField::Property::FONT_SIZE_SCALE, 2.f );
-  textFieldScaled.SetProperty( TextField::Property::TEXT, "Test" );
+  textFieldScaled.SetProperty(TextField::Property::POINT_SIZE, 15.f);
+  textFieldScaled.SetProperty(Toolkit::DevelTextField::Property::FONT_SIZE_SCALE, 2.f);
+  textFieldScaled.SetProperty(TextField::Property::TEXT, "Test");
   Vector3 scaledSize = textFieldScaled.GetNaturalSize();
 
-  DALI_TEST_EQUALS( nonScaledSize, scaledSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(nonScaledSize, scaledSize, TEST_LOCATION);
 
-  textField.SetProperty( TextField::Property::PIXEL_SIZE, 30.f );
-  textField.SetProperty( TextField::Property::TEXT, "Test" );
+  textField.SetProperty(TextField::Property::PIXEL_SIZE, 30.f);
+  textField.SetProperty(TextField::Property::TEXT, "Test");
   nonScaledSize = textField.GetNaturalSize();
 
-  textFieldScaled.SetProperty( TextField::Property::PIXEL_SIZE, 15.f );
-  textFieldScaled.SetProperty( Toolkit::DevelTextField::Property::FONT_SIZE_SCALE, 2.f );
-  textFieldScaled.SetProperty( TextField::Property::TEXT, "Test" );
+  textFieldScaled.SetProperty(TextField::Property::PIXEL_SIZE, 15.f);
+  textFieldScaled.SetProperty(Toolkit::DevelTextField::Property::FONT_SIZE_SCALE, 2.f);
+  textFieldScaled.SetProperty(TextField::Property::TEXT, "Test");
   scaledSize = textFieldScaled.GetNaturalSize();
 
-  DALI_TEST_EQUALS( nonScaledSize, scaledSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(nonScaledSize, scaledSize, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3817,29 +4377,29 @@ int UtcDaliTextFieldPrimaryCursorPosition(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( TextField::Property::TEXT, "ABCEF");
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(TextField::Property::TEXT, "ABCEF");
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  textField.SetProperty( DevelTextField::Property::PRIMARY_CURSOR_POSITION, 3);
+  textField.SetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION, 3);
   application.SendNotification();
   application.Render();
   textField.SetKeyInputFocus();
 
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "ABCDEF", TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::PRIMARY_CURSOR_POSITION ).Get<int>(), 4, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "ABCDEF", TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 4, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3850,64 +4410,62 @@ int utcDaliTextFieldMaxCharactersReachedAfterSetText(void)
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldMaxCharactersReachedAfterSetText");
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   field.SetProperty(TextField::Property::TEXT, "123456789");
 
   const int maxNumberOfCharacters = 3;
-  field.SetProperty( TextField::Property::MAX_LENGTH, maxNumberOfCharacters );
+  field.SetProperty(TextField::Property::MAX_LENGTH, maxNumberOfCharacters);
 
   field.SetKeyInputFocus();
 
   // connect to the text max lengh reached signal.
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  bool maxLengthReachedSignal = false;
-  field.ConnectSignal( testTracker, "maxLengthReached",   CallbackFunctor(&maxLengthReachedSignal) );
+  ConnectionTracker* testTracker            = new ConnectionTracker();
+  bool               maxLengthReachedSignal = false;
+  field.ConnectSignal(testTracker, "maxLengthReached", CallbackFunctor(&maxLengthReachedSignal));
 
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("a", "", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
-  DALI_TEST_CHECK( maxLengthReachedSignal );
+  DALI_TEST_CHECK(maxLengthReachedSignal);
 
-  DALI_TEST_EQUALS( field.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "123456789", TEST_LOCATION );
+  DALI_TEST_EQUALS(field.GetProperty(TextField::Property::TEXT).Get<std::string>(), "123456789", TEST_LOCATION);
 
   END_TEST;
 }
 
-
-
 int UtcDaliTextFieldAtlasLimitationIsEnabledForLargeFontPointSize(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextFieldAtlasLimitationIsEnabledForLargeFontPointSize ");
 
   // +2: First one to handle the equal case. Second one to handle odd to even case of GetNaturalSize
-  const uint32_t lessThanWidth = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
+  const uint32_t lessThanWidth  = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
   const uint32_t lessThanHeight = TextAbstraction::FontClient::MAX_TEXT_ATLAS_HEIGHT - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
 
   // Create a text field
   TextField textField = TextField::New();
 
   //Set size to avoid automatic eliding
-  textField.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
+  textField.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
   //Set very large font-size using point-size
-  textField.SetProperty( TextField::Property::POINT_SIZE, 1000) ;
+  textField.SetProperty(TextField::Property::POINT_SIZE, 1000);
   //Specify font-family
-  textField.SetProperty( TextField::Property::FONT_FAMILY, "DejaVu Sans");
+  textField.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
   //Set text to check if appear or not
-  textField.SetProperty( TextField::Property::TEXT, "A");
+  textField.SetProperty(TextField::Property::TEXT, "A");
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
   application.SendNotification();
   application.Render();
   //Use GetNaturalSize to verify that size of block does not exceed Atlas size
   Vector3 naturalSize = textField.GetNaturalSize();
 
-  DALI_TEST_GREATER( lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION );
-  DALI_TEST_GREATER( lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION );
+  DALI_TEST_GREATER(lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION);
+  DALI_TEST_GREATER(lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION);
 
   END_TEST;
 }
@@ -3918,7 +4476,7 @@ int UtcDaliTextFieldAtlasLimitationIsEnabledPerformanceCases(void)
   tet_infoline(" UtcDaliTextFieldAtlasLimitationIsEnabledPerformanceCases ");
 
   // +2: First one to handle the equal case. Second one to handle odd to even case of GetNaturalSize
-  const uint32_t lessThanWidth = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
+  const uint32_t lessThanWidth  = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
   const uint32_t lessThanHeight = TextAbstraction::FontClient::MAX_TEXT_ATLAS_HEIGHT - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
 
   Vector3 naturalSize; //Use GetNaturalSize to verify that size of block does not exceed Atlas size
@@ -3926,24 +4484,23 @@ int UtcDaliTextFieldAtlasLimitationIsEnabledPerformanceCases(void)
   TextField textField = TextField::New();
 
   //Set size to avoid automatic eliding
-  textField.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
-  textField.SetProperty( TextField::Property::FONT_FAMILY, "DejaVu Sans");
-  textField.SetProperty( TextField::Property::TEXT, "A");
+  textField.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
+  textField.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+  textField.SetProperty(TextField::Property::TEXT, "A");
 
-  const int numberOfCases = 6;
-  int arrayCases[numberOfCases] = {323, 326, 330, 600, 1630, 2500};
+  const int numberOfCases             = 6;
+  int       arrayCases[numberOfCases] = {323, 326, 330, 600, 1630, 2500};
 
-  for (int index=0; index < numberOfCases; index++)
+  for(int index = 0; index < numberOfCases; index++)
   {
     tet_printf(" UtcDaliTextFieldAtlasLimitationIsEnabledPerformanceCases point-size= %d \n", arrayCases[index]);
-    textField.SetProperty( TextField::Property::POINT_SIZE, arrayCases[index]) ;
-    application.GetScene().Add( textField );
+    textField.SetProperty(TextField::Property::POINT_SIZE, arrayCases[index]);
+    application.GetScene().Add(textField);
     application.SendNotification();
     application.Render();
     naturalSize = textField.GetNaturalSize();
-    DALI_TEST_GREATER( lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION );
-    DALI_TEST_GREATER( lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION );
-
+    DALI_TEST_GREATER(lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION);
+    DALI_TEST_GREATER(lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION);
   }
 
   END_TEST;
@@ -3956,55 +4513,55 @@ int UtcDaliToolkitTextFieldEllipsisPositionProperty(void)
   TextField textField = TextField::New();
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisPositionProperty - Default is END");
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisPositionProperty - Change to START");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::START);
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisPositionProperty - Change to MIDDLE");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::MIDDLE);
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisPositionProperty - Change to END");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::END);
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisPositionProperty - Change to START using integer");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, 1);
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisPositionProperty - Change to MIDDLE using integer");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, 2);
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextFieldEllipsisPositionProperty - Change to END using integer");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, 0);
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using string - uppercase");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, "START");
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using string - uppercase");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, "MIDDLE");
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using string - uppercase");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, "END");
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using string - lowercase");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, "start");
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using string - lowercase");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, "middle");
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using string - lowercase");
   textField.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, "end");
-  DALI_TEST_EQUALS( textField.GetProperty< int >( DevelTextField::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty<int>(DevelTextField::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   END_TEST;
 }
@@ -4017,72 +4574,72 @@ int UtcDaliTextFieldCopyText(void)
   TextField textField = TextField::New();
 
   std::string selectedText = "";
-  std::string copiedText = "";
+  std::string copiedText   = "";
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textField.SetProperty( TextField::Property::TEXT, "Hello world" );
+  textField.SetProperty(TextField::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
   // Hello is selected
-  DevelTextField::SelectText( textField, 0, 5 );
+  DevelTextField::SelectText(textField, 0, 5);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
   // Hello is copied
-  copiedText = DevelTextField::CopyText( textField );
-  DALI_TEST_EQUALS( "Hello", copiedText, TEST_LOCATION );
+  copiedText = DevelTextField::CopyText(textField);
+  DALI_TEST_EQUALS("Hello", copiedText, TEST_LOCATION);
 
   // world is selected
-  DevelTextField::SelectText( textField, 6, 11 );
+  DevelTextField::SelectText(textField, 6, 11);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "world", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("world", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 6, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 11, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 6, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 11, TEST_LOCATION);
 
   // world is copied
-  copiedText = DevelTextField::CopyText( textField );
-  DALI_TEST_EQUALS( "world", copiedText, TEST_LOCATION );
+  copiedText = DevelTextField::CopyText(textField);
+  DALI_TEST_EQUALS("world", copiedText, TEST_LOCATION);
 
   // "lo wo" is selected
-  DevelTextField::SelectText( textField, 3, 8 );
+  DevelTextField::SelectText(textField, 3, 8);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "lo wo", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("lo wo", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 3, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 8, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 8, TEST_LOCATION);
 
   // "lo wo" is copied
-  copiedText = DevelTextField::CopyText( textField );
-  DALI_TEST_EQUALS( "lo wo", copiedText, TEST_LOCATION );
+  copiedText = DevelTextField::CopyText(textField);
+  DALI_TEST_EQUALS("lo wo", copiedText, TEST_LOCATION);
 
   END_TEST;
 }
@@ -4096,103 +4653,103 @@ int UtcDaliTextFieldCutText(void)
 
   std::string selectedText = "";
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textField.SetProperty( TextField::Property::TEXT, "Hello world" );
+  textField.SetProperty(TextField::Property::TEXT, "Hello world");
 
   application.SendNotification();
   application.Render();
 
   // Hello is selected
-  DevelTextField::SelectText( textField, 0, 5 );
+  DevelTextField::SelectText(textField, 0, 5);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "Hello", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("Hello", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 5, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 5, TEST_LOCATION);
 
   // Hello is cut
-  DALI_TEST_EQUALS( "Hello", DevelTextField::CutText( textField ), TEST_LOCATION );
+  DALI_TEST_EQUALS("Hello", DevelTextField::CutText(textField), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), " world", TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), " world", TEST_LOCATION);
 
   // " w" is selected
-  DevelTextField::SelectText( textField, 0, 2 );
+  DevelTextField::SelectText(textField, 0, 2);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( " w", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS(" w", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 2, TEST_LOCATION);
 
   // " w" is cut
-  DALI_TEST_EQUALS( " w", DevelTextField::CutText( textField ), TEST_LOCATION );
+  DALI_TEST_EQUALS(" w", DevelTextField::CutText(textField), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "orld", TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "orld", TEST_LOCATION);
 
   // Test Cut from the middle
 
   // "rl" is selected
-  DevelTextField::SelectText( textField, 1, 3 );
+  DevelTextField::SelectText(textField, 1, 3);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "rl", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("rl", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 3, TEST_LOCATION);
 
   // "rl" is cut
-  DALI_TEST_EQUALS( "rl", DevelTextField::CutText( textField ), TEST_LOCATION );
+  DALI_TEST_EQUALS("rl", DevelTextField::CutText(textField), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "od", TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "od", TEST_LOCATION);
 
   // Test Cut from the end
 
   // "d" is selected
-  DevelTextField::SelectText( textField, 1, 2 );
+  DevelTextField::SelectText(textField, 1, 2);
 
   application.SendNotification();
   application.Render();
 
-  selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get<std::string>();
-  DALI_TEST_EQUALS( "d", selectedText, TEST_LOCATION );
+  selectedText = textField.GetProperty(DevelTextField::Property::SELECTED_TEXT).Get<std::string>();
+  DALI_TEST_EQUALS("d", selectedText, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_START ).Get<int>(), 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( DevelTextField::Property::SELECTED_TEXT_END ).Get<int>(), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_START).Get<int>(), 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::SELECTED_TEXT_END).Get<int>(), 2, TEST_LOCATION);
 
   // "d" is cut
-  DALI_TEST_EQUALS( "d", DevelTextField::CutText( textField ), TEST_LOCATION );
+  DALI_TEST_EQUALS("d", DevelTextField::CutText(textField), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "o", TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "o", TEST_LOCATION);
 
   END_TEST;
 }
@@ -4204,35 +4761,35 @@ int UtcDaliTextFieldPasteText(void)
 
   TextField textField = TextField::New();
 
-  application.GetScene().Add( textField );
+  application.GetScene().Add(textField);
 
-  std::string cutText = "";
+  std::string cutText    = "";
   std::string copiedText = "";
 
-  textField.SetProperty( Actor::Property::SIZE, Vector2( 300.f, 50.f ) );
-  textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   application.SendNotification();
   application.Render();
 
-  textField.SetProperty( TextField::Property::TEXT, "Hello World" );
+  textField.SetProperty(TextField::Property::TEXT, "Hello World");
 
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Select some text in the right of the current cursor position
-  DevelTextField::SelectText( textField, 0, 3 );
+  DevelTextField::SelectText(textField, 0, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4245,10 +4802,10 @@ int UtcDaliTextFieldPasteText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "Hel", cutText, TEST_LOCATION );
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "lo World", TEST_LOCATION );
+  DALI_TEST_EQUALS("Hel", cutText, TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "lo World", TEST_LOCATION);
 
-  DevelTextField::SelectText( textField, 0, 3 );
+  DevelTextField::SelectText(textField, 0, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4261,18 +4818,18 @@ int UtcDaliTextFieldPasteText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( "lo ", copiedText, TEST_LOCATION );
-  DALI_TEST_EQUALS( "lo World", textField.GetProperty<std::string>( TextField::Property::TEXT ), TEST_LOCATION );
+  DALI_TEST_EQUALS("lo ", copiedText, TEST_LOCATION);
+  DALI_TEST_EQUALS("lo World", textField.GetProperty<std::string>(TextField::Property::TEXT), TEST_LOCATION);
 
   // Move the cursor to the end of the line
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4285,34 +4842,35 @@ int UtcDaliTextFieldPasteText(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textField.GetProperty( TextField::Property::TEXT ).Get<std::string>(), "lo Worldlo ", TEST_LOCATION );
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "lo Worldlo ", TEST_LOCATION);
 
   END_TEST;
 }
+
 int utcDaliTextFieldCursorPositionChangedSignal(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldCursorPositionChangedSignal");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // connect to the selection changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   DevelTextField::CursorPositionChangedSignal(field).Connect(&TestCursorPositionChangedCallback);
   bool cursorPositionChangedSignal = false;
-  field.ConnectSignal( testTracker, "cursorPositionChanged",   CallbackFunctor(&cursorPositionChangedSignal) );
+  field.ConnectSignal(testTracker, "cursorPositionChanged", CallbackFunctor(&cursorPositionChangedSignal));
 
-  field.SetProperty( TextField::Property::TEXT, "Hello world Hello world" );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "Hello world Hello world");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
@@ -4321,7 +4879,7 @@ int utcDaliTextFieldCursorPositionChangedSignal(void)
   field.SetKeyInputFocus();
 
   // Tap on the text field
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -4333,7 +4891,7 @@ int utcDaliTextFieldCursorPositionChangedSignal(void)
   gCursorPositionChangedCallbackCalled = false;
 
   // Move to left.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4345,7 +4903,7 @@ int utcDaliTextFieldCursorPositionChangedSignal(void)
   gCursorPositionChangedCallbackCalled = false;
 
   // Insert D
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4357,7 +4915,7 @@ int utcDaliTextFieldCursorPositionChangedSignal(void)
   gCursorPositionChangedCallbackCalled = false;
 
   //delete one character
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4368,7 +4926,7 @@ int utcDaliTextFieldCursorPositionChangedSignal(void)
 
   gCursorPositionChangedCallbackCalled = false;
 
-  field.SetProperty( TextField::Property::TEXT, "Hello" );
+  field.SetProperty(TextField::Property::TEXT, "Hello");
 
   // Render and notify
   application.SendNotification();
@@ -4391,48 +4949,269 @@ int utcDaliTextFieldCursorPositionChangedSignal(void)
   END_TEST;
 }
 
+int utcDaliTextFieldGeometryEllipsisStart(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldGeometryEllipsisStart");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(TextField::Property::POINT_SIZE, 7.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(250.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(DevelTextField::Property::ELLIPSIS, true);
+  field.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::START);
+  field.SetProperty(TextField::Property::TEXT, "Hello World");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 10;
+
+  Vector<Vector2> positionsList = DevelTextField::GetTextPosition(field, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextField::GetTextSize(field, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(14, 0));
+  expectedSizes.PushBack(Vector2(107, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldGeometryEllipsisEnd(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldGeometryEllipsisEnd");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(TextField::Property::POINT_SIZE, 7.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(250.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(DevelTextField::Property::ELLIPSIS, true);
+  field.SetProperty(DevelTextField::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::END);
+  field.SetProperty(TextField::Property::TEXT, "Hello World");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 10;
+
+  Vector<Vector2> positionsList = DevelTextField::GetTextPosition(field, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextField::GetTextSize(field, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(-2, 0));
+  expectedSizes.PushBack(Vector2(123, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldGeometryRTL(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldGeometryRTL");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(TextField::Property::POINT_SIZE, 7.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "السطر الاخير");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 1;
+  unsigned int endIndex      = 7;
+
+  Vector<Vector2> positionsList = DevelTextField::GetTextPosition(field, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextField::GetTextSize(field, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(38, 0));
+  expectedSizes.PushBack(Vector2(75, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldGeometryGlyphMiddle(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldGeometryGlyphMiddle");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(TextField::Property::POINT_SIZE, 7.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(150.f, 200.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "لا تحتوي على لا");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 1;
+  unsigned int endIndex      = 13;
+
+  Vector<Vector2> positionsList = DevelTextField::GetTextPosition(field, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextField::GetTextSize(field, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(6, 0));
+  expectedSizes.PushBack(Vector2(125, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldGeometryNullPtr(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("utcDaliTextFieldGeometryNullPtr");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(TextField::Property::POINT_SIZE, 7.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  field.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  field.SetProperty(TextField::Property::TEXT, "");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  unsigned int expectedCount = 0;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 0;
+
+  Vector<Vector2> positionsList = DevelTextField::GetTextPosition(field, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextField::GetTextSize(field, startIndex, endIndex);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  END_TEST;
+}
+
 int utcDaliTextFieldSelectionClearedSignal(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldSelectionClearedSignal");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // connect to the selection changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   DevelTextField::SelectionClearedSignal(field).Connect(&TestSelectionClearedCallback);
   bool selectionClearedSignal = false;
-  field.ConnectSignal( testTracker, "selectionCleared",   CallbackFunctor(&selectionClearedSignal) );
+  field.ConnectSignal(testTracker, "selectionCleared", CallbackFunctor(&selectionClearedSignal));
 
-  field.SetProperty( TextField::Property::TEXT, "Hello\nworld\nHello world" );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "Hello\nworld\nHello world");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Move to second line of the text & Select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // remove selection
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4445,7 +5224,7 @@ int utcDaliTextFieldSelectionClearedSignal(void)
   application.Render();
 
   // Tap on the text editor
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
@@ -4454,11 +5233,11 @@ int utcDaliTextFieldSelectionClearedSignal(void)
   gSelectionClearedCallbackCalled = false;
 
   // Move to second line of the text & select.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   //remove selection
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4473,11 +5252,11 @@ int utcDaliTextFieldSelectionClearedSignal(void)
   application.Render();
 
   // Move to second line of the text & select.
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // replace D with selected text
-  application.ProcessEvent( GenerateKey( "D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("D", "", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::DOWN, "D", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4491,13 +5270,13 @@ int utcDaliTextFieldSelectionClearedSignal(void)
   application.SendNotification();
   application.Render();
 
-  DevelTextField::SelectText( field ,1, 3 );
+  DevelTextField::SelectText(field, 1, 3);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  field.SetProperty( DevelTextField::Property::PRIMARY_CURSOR_POSITION, 3);
+  field.SetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4507,7 +5286,7 @@ int utcDaliTextFieldSelectionClearedSignal(void)
 
   gSelectionClearedCallbackCalled = false;
 
-  DevelTextField::SelectText( field ,1, 3 );
+  DevelTextField::SelectText(field, 1, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4525,45 +5304,111 @@ int utcDaliTextFieldSelectionClearedSignal(void)
   END_TEST;
 }
 
+int utcDaliTextFieldSelectionStartedSignal(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldSelectionStartedSignal");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  // connect to the selection changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextField::SelectionStartedSignal(field).Connect(&TestSelectionStartedCallback);
+  bool selectionStartedSignal = false;
+  field.ConnectSignal(testTracker, "selectionStarted", CallbackFunctor(&selectionStartedSignal));
+
+  field.SetProperty(TextField::Property::TEXT, "Hello\nworld\nHello world");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Tap on the text field
+  TestGenerateTap(application, 3.0f, 25.0f);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Move to second line of the text & Select some text in the right of the current cursor position
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(gSelectionStartedCallbackCalled);
+
+  // remove selection
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  gSelectionStartedCallbackCalled = false;
+
+  DevelTextField::SelectText(field, 1, 3);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(gSelectionStartedCallbackCalled);
+
+  END_TEST;
+}
+
 int utcDaliTextFieldSelectionChangedSignal(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" utcDaliTextFieldSelectionChangedSignal");
 
   TextField field = TextField::New();
-  DALI_TEST_CHECK( field );
+  DALI_TEST_CHECK(field);
 
-  application.GetScene().Add( field );
+  application.GetScene().Add(field);
 
   // connect to the selection changed signal.
   ConnectionTracker* testTracker = new ConnectionTracker();
   DevelTextField::SelectionChangedSignal(field).Connect(&TestSelectionChangedCallback);
   bool selectionChangedSignal = false;
-  field.ConnectSignal( testTracker, "selectionChanged",   CallbackFunctor(&selectionChangedSignal) );
+  field.ConnectSignal(testTracker, "selectionChanged", CallbackFunctor(&selectionChangedSignal));
 
-  field.SetProperty( TextField::Property::TEXT, "Hello world Hello world" );
-  field.SetProperty( TextField::Property::POINT_SIZE, 10.f );
-  field.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 50.f ) );
-  field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+  field.SetProperty(TextField::Property::TEXT, "Hello world Hello world");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Tap on the text field
-  TestGenerateTap( application, 3.0f, 25.0f );
+  TestGenerateTap(application, 3.0f, 25.0f);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   // Select some text in the right of the current cursor position
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_SHIFT_LEFT, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4574,7 +5419,7 @@ int utcDaliTextFieldSelectionChangedSignal(void)
 
   gSelectionChangedCallbackCalled = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_CURSOR_RIGHT, KEY_SHIFT_MODIFIER, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4586,7 +5431,7 @@ int utcDaliTextFieldSelectionChangedSignal(void)
 
   gSelectionChangedCallbackCalled = false;
 
-  application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) );
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::UP, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
 
   // Render and notify
   application.SendNotification();
@@ -4603,7 +5448,7 @@ int utcDaliTextFieldSelectionChangedSignal(void)
   application.SendNotification();
   application.Render();
 
-  DevelTextField::SelectText( field ,0, 5 );
+  DevelTextField::SelectText(field, 0, 5);
 
   application.SendNotification();
   application.Render();
@@ -4613,7 +5458,7 @@ int utcDaliTextFieldSelectionChangedSignal(void)
 
   gSelectionChangedCallbackCalled = false;
 
-  field.SetProperty( DevelTextField::Property::PRIMARY_CURSOR_POSITION, 3);
+  field.SetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION, 3);
 
   // Render and notify
   application.SendNotification();
@@ -4649,4 +5494,593 @@ int utcDaliTextFieldSelectionChangedSignal(void)
   DALI_TEST_EQUALS(oldSelectionEnd, 23, TEST_LOCATION);
 
   END_TEST;
+}
+
+int UtcDaliToolkitTextFieldStrikethroughGeneration(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFieldStrikethroughGeneration");
+
+  TextField textField = TextField::New();
+  textField.SetProperty(TextField::Property::TEXT, "Test");
+  textField.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textField.SetProperty(TextField::Property::POINT_SIZE, 10);
+  textField.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+
+  application.GetScene().Add(textField);
+  application.SendNotification();
+  application.Render();
+
+  Property::Map strikethroughMapSet;
+  Property::Map strikethroughMapGet;
+
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::RED);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  // Check the strikethrough property
+  textField.SetProperty(DevelTextField::Property::STRIKETHROUGH, strikethroughMapSet);
+  strikethroughMapGet = textField.GetProperty<Property::Map>(DevelTextField::Property::STRIKETHROUGH);
+  textField.SetProperty(TextField::Property::TEXT, "Test1");
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapSet.Clear();
+  strikethroughMapGet.Clear();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextFieldInputStrikethroughGeneration(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFieldInputStrikethroughGeneration");
+
+  TextField textField = TextField::New();
+  textField.SetProperty(TextField::Property::TEXT, "Test");
+  textField.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textField.SetProperty(TextField::Property::POINT_SIZE, 10);
+  textField.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+
+  application.GetScene().Add(textField);
+  application.SendNotification();
+  application.Render();
+
+  std::string strikethroughSettings1("{\"enable\":\"true\",\"color\":\"red\",\"height\":\"2\"}");
+
+  // Check the strikethrough property
+  textField.SetProperty(DevelTextField::Property::INPUT_STRIKETHROUGH, strikethroughSettings1);
+  textField.SetProperty(TextField::Property::TEXT, "Test1");
+  DALI_TEST_EQUALS(textField.GetProperty<std::string>(DevelTextField::Property::INPUT_STRIKETHROUGH), strikethroughSettings1, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextFieldUnderlineTypesGeneration1(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFieldUnderlineTypesGeneration1");
+  TextField field = TextField::New();
+  field.SetProperty(TextField::Property::TEXT, "Test");
+  field.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  field.SetProperty(TextField::Property::POINT_SIZE, 10);
+  field.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+
+  application.GetScene().Add(field);
+  application.SendNotification();
+  application.Render();
+
+  Property::Map underlineMapSet;
+  Property::Map underlineMapGet;
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  // Check the underline property
+  field.SetProperty(TextField::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = field.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 4);
+  underlineMapSet.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  field.SetProperty(TextField::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = field.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 4);
+  underlineMapSet.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  field.SetProperty(TextField::Property::UNDERLINE, underlineMapSet);
+
+  underlineMapGet = field.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextFieldUnderlineTypesGeneration2(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFieldUnderlineTypesGeneration2");
+
+  TextField field1 = TextField::New();
+  field1.SetProperty(TextField::Property::TEXT, "Test");
+  field1.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  field1.SetProperty(TextField::Property::POINT_SIZE, 10);
+  field1.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet1;
+  Property::Map underlineMapGet1;
+
+  underlineMapSet1.Insert("enable", true);
+  underlineMapSet1.Insert("color", Color::RED);
+  underlineMapSet1.Insert("height", 1);
+  underlineMapSet1.Insert("type", Text::Underline::SOLID);
+  underlineMapSet1.Insert("dashWidth", 2);
+  underlineMapSet1.Insert("dashGap", 1);
+
+  // Check the underline property
+  field1.SetProperty(TextField::Property::UNDERLINE, underlineMapSet1);
+
+  underlineMapGet1 = field1.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet1.Count(), underlineMapSet1.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet1, underlineMapSet1), true, TEST_LOCATION);
+
+  application.GetScene().Add(field1);
+  application.SendNotification();
+  application.Render();
+
+  TextField field2 = TextField::New();
+  field2.SetProperty(TextField::Property::TEXT, "Test");
+  field2.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  field2.SetProperty(TextField::Property::POINT_SIZE, 10);
+  field2.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet2;
+  Property::Map underlineMapGet2;
+
+  underlineMapSet2.Insert("enable", true);
+  underlineMapSet2.Insert("color", Color::BLUE);
+  underlineMapSet2.Insert("height", 1);
+  underlineMapSet2.Insert("type", Text::Underline::DASHED);
+  underlineMapSet2.Insert("dashWidth", 4);
+  underlineMapSet2.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  field2.SetProperty(TextField::Property::UNDERLINE, underlineMapSet2);
+
+  underlineMapGet2 = field2.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet2.Count(), underlineMapSet2.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet2, underlineMapSet2), true, TEST_LOCATION);
+
+  application.GetScene().Add(field2);
+  application.SendNotification();
+  application.Render();
+
+  TextField field3 = TextField::New();
+  field3.SetProperty(TextField::Property::TEXT, "Test");
+  field3.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  field3.SetProperty(TextField::Property::POINT_SIZE, 10);
+  field3.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet3;
+  Property::Map underlineMapGet3;
+
+  underlineMapSet3.Insert("enable", true);
+  underlineMapSet3.Insert("color", Color::BLUE);
+  underlineMapSet3.Insert("height", 1);
+  underlineMapSet3.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet3.Insert("dashWidth", 4);
+  underlineMapSet3.Insert("dashGap", 2);
+
+  // Check the dashed underline property
+  field3.SetProperty(TextField::Property::UNDERLINE, underlineMapSet3);
+
+  underlineMapGet3 = field3.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet3.Count(), underlineMapSet3.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet3, underlineMapSet3), true, TEST_LOCATION);
+
+  application.GetScene().Add(field3);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliTextFieldCharacterSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextFieldCharacterSpacing ");
+
+  TextField textField = TextField::New();
+
+  textField.SetProperty(Actor::Property::SIZE, Vector2(150.0f, 300.f));
+
+  application.GetScene().Add(textField);
+  application.SendNotification();
+  application.Render();
+
+  textField.SetProperty(TextField::Property::TEXT, "Hi Experiment");
+  textField.SetProperty(DevelTextField::Property::CHARACTER_SPACING, 10.f);
+  DALI_TEST_EQUALS(textField.GetProperty<float>(DevelTextField::Property::CHARACTER_SPACING), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextFieldUnderlineTypesGeneration3(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextFieldUnderlineTypesGeneration3");
+
+  TextField field1 = TextField::New();
+  field1.SetProperty(TextField::Property::TEXT, "Test1");
+  field1.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  field1.SetProperty(TextField::Property::POINT_SIZE, 10);
+  field1.SetProperty(TextField::Property::FONT_FAMILY, "DejaVu Sans");
+
+  Property::Map underlineMapSet1;
+  Property::Map underlineMapGet1;
+
+  underlineMapSet1.Insert("enable", true);
+  underlineMapSet1.Insert("color", Color::RED);
+  underlineMapSet1.Insert("height", 1);
+  underlineMapSet1.Insert("type", Text::Underline::SOLID);
+  underlineMapSet1.Insert("dashWidth", 2);
+  underlineMapSet1.Insert("dashGap", 1);
+
+  // Check the underline property
+  field1.SetProperty(TextField::Property::UNDERLINE, underlineMapSet1);
+  //field1.SetProperty( TextField::Property::TEXT, "Test2" );
+
+  underlineMapGet1 = field1.GetProperty<Property::Map>(TextField::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet1.Count(), underlineMapSet1.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet1, underlineMapSet1), true, TEST_LOCATION);
+
+  application.GetScene().Add(field1);
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextfieldParagraphTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextfieldParagraphTag");
+  TextField fieldNewlineSeparator = TextField::New();
+  TextField fieldParagraphTag     = TextField::New();
+  DALI_TEST_CHECK(fieldNewlineSeparator);
+  DALI_TEST_CHECK(fieldParagraphTag);
+
+  application.GetScene().Add(fieldNewlineSeparator);
+  application.GetScene().Add(fieldParagraphTag);
+
+  //Same utterance uses new-line to split paragraphs should give similar results for paragraph tag.
+  fieldNewlineSeparator.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  fieldNewlineSeparator.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  fieldNewlineSeparator.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  fieldNewlineSeparator.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  fieldNewlineSeparator.SetProperty(TextField::Property::TEXT, "test paragraph tag \ntest paragraph tag \ntest paragraph tag ");
+
+  fieldParagraphTag.SetProperty(TextField::Property::ENABLE_MARKUP, true);
+  fieldParagraphTag.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  fieldParagraphTag.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  fieldParagraphTag.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  fieldParagraphTag.SetProperty(TextField::Property::TEXT, "test paragraph tag <p>test paragraph tag </p>test paragraph tag ");
+
+  application.SendNotification();
+  application.Render();
+
+  Vector3 textNaturalSizeNewlineSeparator = fieldNewlineSeparator.GetNaturalSize();
+  Vector3 textNaturalSizeParagraphTag     = fieldParagraphTag.GetNaturalSize();
+
+  DALI_TEST_EQUALS(textNaturalSizeNewlineSeparator, textNaturalSizeParagraphTag, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+//Handle Emoji clustering for cursor handling
+int utcDaliTextFieldClusteredEmojiDeletionBackSpaceKey(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldClusteredEmojiDeletionBackSpaceKey ");
+  TextField textField = TextField::New();
+  DALI_TEST_CHECK(textField);
+
+  application.GetScene().Add(textField);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  textField.SetProperty(TextField::Property::TEXT, "ABC&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;XY");
+  textField.SetProperty(Dali::Toolkit::TextField::Property::ENABLE_MARKUP, true);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Set currsor
+  textField.SetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION, 10);
+  application.SendNotification();
+  application.Render();
+
+  // Set focus and remove Emoji
+  textField.SetKeyInputFocus();
+  application.ProcessEvent(GenerateKey("", "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "ABCXY", TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 3, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextFieldClusteredEmojiDeletionDeleteKey(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldClusteredEmojiDeletionDeleteKey ");
+  TextField textField = TextField::New();
+  DALI_TEST_CHECK(textField);
+
+  application.GetScene().Add(textField);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  textField.SetProperty(TextField::Property::TEXT, "ABC&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;XY");
+  textField.SetProperty(Dali::Toolkit::TextField::Property::ENABLE_MARKUP, true);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Set currsor
+  textField.SetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION, 3);
+  application.SendNotification();
+  application.Render();
+
+  // Set focus and remove Emoji
+  textField.SetKeyInputFocus();
+  application.ProcessEvent(GenerateKey("", "", "", Dali::DevelKey::DALI_KEY_DELETE, 0, 0, Integration::KeyEvent::DOWN, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE));
+
+  //Check the changed text and cursor position
+  DALI_TEST_EQUALS(textField.GetProperty(TextField::Property::TEXT).Get<std::string>(), "ABCXY", TEST_LOCATION);
+  DALI_TEST_EQUALS(textField.GetProperty(DevelTextField::Property::PRIMARY_CURSOR_POSITION).Get<int>(), 3, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextFieldPanGesturePropagation(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldPanGesturePropagation");
+
+  Actor actor = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  application.GetScene().Add(actor);
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  field.SetProperty(TextField::Property::TEXT, "This is a long text for the size of the text-field.");
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+
+  field.SetProperty(Actor::Property::SIZE, Vector2(50.f, 100.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  actor.Add(field);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  SignalData             data;
+  GestureReceivedFunctor functor(data);
+
+  PanGestureDetector detector = PanGestureDetector::New();
+  detector.Attach(actor);
+  detector.DetectedSignal().Connect(&application, functor);
+
+  // Tap first to get the focus.
+  TestGenerateTap(application, 3.0f, 25.0f, 100);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Pan the text field
+  uint32_t time = 100;
+  TestStartPan(application, Vector2(40.0f, 50.0f), Vector2(40.0f, 50.0f), time);
+  TestMovePan(application, Vector2(10.0f, 50.0f), time);
+  TestEndPan(application, Vector2(40.0f, 50.0f), time);
+  application.SendNotification();
+  application.Render();
+
+  // The text scrolls because there is text that is scrolling.
+  DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+  data.Reset();
+
+  // Set the size large enough to prevent scrolling.
+  field.SetProperty(Actor::Property::SIZE, Vector2(700.f, 100.f));
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  time = 200;
+  TestStartPan(application, Vector2(40.0f, 50.0f), Vector2(40.0f, 50.0f), time);
+  TestMovePan(application, Vector2(10.0f, 50.0f), time);
+  TestEndPan(application, Vector2(40.0f, 50.0f), time);
+
+  // Because scrolling is not possible, the pan gesture is propagated.
+  DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+  data.Reset();
+
+  END_TEST;
+}
+
+int utcDaliTextFieldGetTextBoundingRectangle(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldGeometryEllipsisMiddle");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(TextField::Property::POINT_SIZE, 7.f);
+  field.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  field.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  field.SetProperty(TextField::Property::TEXT, "Hello this is the Text Bounding Rectangle TC");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int startIndex = 0;
+  unsigned int endIndex   = 15;
+
+  Rect<> textBoundingRectangle         = DevelTextField::GetTextBoundingRectangle(field, startIndex, endIndex);
+  Rect<> expectedTextBoundingRectangle = {0, 0, 100, 25};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(textBoundingRectangle, expectedTextBoundingRectangle);
+
+  END_TEST;
+}
+
+int utcDaliTextFieldDecoratorColor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextFieldDecoratorColor");
+  TextField textField = TextField::New();
+  DALI_TEST_CHECK(textField);
+  LoadMarkerImages(application, textField);
+  application.GetScene().Add(textField);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  textField.SetProperty(TextField::Property::TEXT, "العالم Hello");
+  textField.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  textField.SetProperty(Actor::Property::SIZE, Vector2(300.f, 50.f));
+  textField.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  textField.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  application.SendNotification();
+  application.Render();
+
+  textField.SetKeyInputFocus();
+
+  application.SendNotification();
+  application.Render();
+
+  // Create a tap event to touch the text field.
+  TestGenerateTap(application, 1.0f, 25.0f, 100);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  // Double tap to select a word.
+  TestGenerateTap(application, 1.0f, 25.0f, 200);
+
+  application.SendNotification();
+  application.Render();
+
+  // At this point, the text decorator's primary/secondary cursor, grab/left/right handle and highlight actor were all created.
+  // Check some properties for coverage.
+  textField.SetProperty(TextField::Property::PRIMARY_CURSOR_COLOR, Color::RED);
+  DALI_TEST_EQUALS(textField.GetProperty<Vector4>(TextField::Property::PRIMARY_CURSOR_COLOR), Color::RED, TEST_LOCATION);
+
+  textField.SetProperty(TextField::Property::SECONDARY_CURSOR_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(textField.GetProperty<Vector4>(TextField::Property::SECONDARY_CURSOR_COLOR), Color::BLUE, TEST_LOCATION);
+
+  textField.SetProperty(DevelTextField::Property::GRAB_HANDLE_COLOR, Color::GREEN);
+  DALI_TEST_EQUALS(textField.GetProperty<Vector4>(DevelTextField::Property::GRAB_HANDLE_COLOR), Color::GREEN, TEST_LOCATION);
+
+  textField.SetProperty(TextField::Property::SELECTION_HIGHLIGHT_COLOR, Color::GREEN);
+  DALI_TEST_EQUALS(textField.GetProperty<Vector4>(TextField::Property::SELECTION_HIGHLIGHT_COLOR), Color::GREEN, TEST_LOCATION);
+
+  textField.SetProperty(TextField::Property::CURSOR_WIDTH, 3);
+  DALI_TEST_EQUALS(textField.GetProperty<int>(TextField::Property::CURSOR_WIDTH), 3, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
 }
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextGeometry.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextGeometry.cpp
new file mode 100644
index 0000000..13e8dee
--- /dev/null
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextGeometry.cpp
@@ -0,0 +1,686 @@
+
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-field-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
+#include <dali-toolkit/devel-api/text/bitmap-font.h>
+#include <dali-toolkit/devel-api/text/rendering-backend.h>
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/devel-api/text/text-utils-devel.h>
+#include <dali-toolkit/devel-api/text/text-geometry-devel.h>
+#include "test-text-geometry-utils.h"
+
+using namespace Dali;
+using namespace Toolkit;
+using namespace Text;
+
+void dali_textgeometry_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void dali_textgeometry_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+int UtcDaliTextGeometryGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  float lineSpacing = -20.f;
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(DevelTextLabel::Property::LINE_SPACING, lineSpacing);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 1);
+
+  Rect<> expectedLineGeometry = {0, 16, 418, 16};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetLineBoundingRectangleEditor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetLineBoundingRectangleEditor");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(Actor::Property::SIZE, Vector2(160.0f, 250.f));
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(TextEditor::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(editor, 0);
+
+  Rect<> expectedLineGeometry = {0, 0, 91, 36};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetLineBoundingRectangleField(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetLineBoundingRectangleField");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  field.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 350.f));
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(TextField::Property::TEXT, "مرحبا بالعالم");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(field, 0);
+
+  Rect<> expectedLineGeometry = {0, 0, 162, 36};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryEmptyTextGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryEmptyTextGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::TEXT, "");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 0);
+
+  Rect<> expectedLineGeometry = {0, 0, 0, 0};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryLineSpacingPositiveGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryLineSpacingPositiveGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  float lineSpacing = 20.f;
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(DevelTextLabel::Property::LINE_SPACING, lineSpacing);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 1);
+
+  Rect<> expectedLineGeometry = {0, 56, 418, 56};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryWithVerticalLineAlignmentTopGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryWithVerticalLineAlignmentTopGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP");
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 1);
+
+  Rect<> expectedLineGeometry = {0, 36, 418, 36};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryWithVerticalLineAlignmentBottomGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryWithVerticalLineAlignmentBottomGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "BOTTOM");
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 1);
+
+  Rect<> expectedLineGeometry = {0, 36, 418, 36};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+int UtcDaliTextGeometryWithEllipsisMiddleGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryWithEllipsisMiddleGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::ELLIPSIS, true);
+  label.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::MIDDLE);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 1);
+
+  Rect<> expectedLineGeometry = {0, 36, 418, 36};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryWithEllipsisStartGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryWithEllipsisStartGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::ELLIPSIS, true);
+  label.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::START);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 1);
+
+  Rect<> expectedLineGeometry = {0, 36, 418, 36};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryWithEllipsisEndGetLineBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryWithEllipsisEndGetLineBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::ELLIPSIS, true);
+  label.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::END);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> lineGeometry = TextGeometry::GetLineBoundingRectangle(label, 1);
+
+  Rect<> expectedLineGeometry = {0, 36, 418, 36};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(lineGeometry, expectedLineGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  float lineSpacing = -20.f;
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(DevelTextLabel::Property::LINE_SPACING, lineSpacing);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> characterGeometry = TextGeometry::GetCharacterBoundingRectangle(label, 1);
+
+  std::cout << " characterGeometry "<< characterGeometry <<std::endl;
+
+  Rect<> expectedCharacterGeometry = {13.0f, 16.0f, 19.0f, 16.0f};
+  std::cout<< " expectedCharacterGeometry " << characterGeometry <<std::endl;
+
+  std:: cout << "if" << (characterGeometry == expectedCharacterGeometry) <<std::endl;
+  TestTextGeometryUtils::CheckRectGeometryResult(characterGeometry, expectedCharacterGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterBoundingRectangleEditor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterBoundingRectangleEditor");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(Actor::Property::SIZE, Vector2(160.0f, 250.f));
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(TextEditor::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> characterGeometry = TextGeometry::GetCharacterBoundingRectangle(editor, 1);
+
+  Rect<> expectedCharacterGeometry = {13.0f, 16.0f, 19.0f, 16.0f};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(characterGeometry, expectedCharacterGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterBoundingRectangleField(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterBoundingRectangleField");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  field.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 350.f));
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(TextField::Property::TEXT, "مرحبا بالعالم");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> characterGeometry = TextGeometry::GetCharacterBoundingRectangle(field, 0);
+
+  Rect<> expectedCharacterGeometry = {142.0f, 10.0f, 16.0f, 11.0f};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(characterGeometry, expectedCharacterGeometry);
+
+  END_TEST;
+}
+// char tc
+
+int UtcDaliTextGeometryEmptyTextGetCharacterBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryEmptyTextGetCharacterBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::TEXT, "");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> charGeometry = TextGeometry::GetCharacterBoundingRectangle(label, 0);
+
+  Rect<> expectedCharGeometry = {0.0f, 0.0f, 0.0f, 0.0f};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(charGeometry, expectedCharGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryLineSpacingPositiveGetCharacterBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryLineSpacingPositiveGetCharacterBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  float lineSpacing = 20.f;
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(DevelTextLabel::Property::LINE_SPACING, lineSpacing);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> charGeometry = TextGeometry::GetCharacterBoundingRectangle(label, 1);
+
+  Rect<> expectedCharGeometry = {13.0f, 16.0f, 19.0f, 16.0f};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(charGeometry, expectedCharGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryWithVerticalLineAlignmentTopGetCharacterBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryWithVerticalLineAlignmentTopGetCharacterBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP");
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> charGeometry = TextGeometry::GetCharacterBoundingRectangle(label, 1);
+
+  Rect<> expectedCharGeometry = {13.0, 16.0f, 19.0f, 16.0f};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(charGeometry, expectedCharGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryWithVerticalLineAlignmentBottomGetCharacterBoundingRectangleLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryWithVerticalLineAlignmentBottomGetCharacterBoundingRectangleLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "BOTTOM");
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, \n consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.SendNotification();
+  application.Render();
+
+  Rect<> charGeometry = TextGeometry::GetCharacterBoundingRectangle(label, 1);
+
+  Rect<> expectedCharGeometry = {13.0, 16.0f, 19.0f, 16.0f};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(charGeometry, expectedCharGeometry);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterIndexAtPositionTextLabel(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterIndexAtPositionTextLabel");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::TEXT, "sara سارة");
+
+  application.SendNotification();
+  application.Render();
+
+  int characterIndex = TextGeometry::GetCharacterIndexAtPosition(label, 1, 1);
+
+  int expectedCharacterIndex = 0;
+
+  DALI_TEST_EQUALS(characterIndex, expectedCharacterIndex, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterIndexAtPositionTextEditor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterIndexAtPositionTextEditor");
+
+  TextEditor editor = TextEditor::New();
+  DALI_TEST_CHECK(editor);
+
+  application.GetScene().Add(editor);
+
+  editor.SetProperty(Actor::Property::SIZE, Vector2(160.0f, 250.f));
+  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.f);
+  editor.SetProperty(TextEditor::Property::TEXT, "Hello everyone.");
+
+  application.SendNotification();
+  application.Render();
+
+  int characterIndex = TextGeometry::GetCharacterIndexAtPosition(editor, 2, 2);
+
+  int expectedCharacterIndex = 0;
+
+  DALI_TEST_EQUALS(characterIndex, expectedCharacterIndex, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterIndexAtPositionTextField(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterIndexAtPositionTextField");
+
+  TextField field = TextField::New();
+  DALI_TEST_CHECK(field);
+
+  application.GetScene().Add(field);
+
+  field.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  field.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 350.f));
+  field.SetProperty(TextField::Property::POINT_SIZE, 10.f);
+  field.SetProperty(TextField::Property::TEXT, "مرحبا بالعالم");
+
+  application.SendNotification();
+  application.Render();
+
+  int characterIndex = TextGeometry::GetCharacterIndexAtPosition(field, 18.6, 6);
+
+  int expectedCharacterIndex = 12;
+
+  DALI_TEST_EQUALS(characterIndex, expectedCharacterIndex, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterIndexAtPositionTextLabelEmptyText(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterIndexAtPositionTextLabelEmptyText");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::TEXT, "");
+
+  application.SendNotification();
+  application.Render();
+
+  int characterIndex = TextGeometry::GetCharacterIndexAtPosition(label, 1, 0);
+
+  int expectedCharacterIndex = -1;
+
+  DALI_TEST_EQUALS(characterIndex, expectedCharacterIndex, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterIndexAtPositionLastCharacter(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterIndexAtPositionLastCharacter");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello");
+
+  application.SendNotification();
+  application.Render();
+
+  int characterIndex = TextGeometry::GetCharacterIndexAtPosition(label, 57, 2);
+
+  int expectedCharacterIndex = 4;
+
+  DALI_TEST_EQUALS(characterIndex, expectedCharacterIndex, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTextGeometryGetCharacterIndexAtPositionXExceedsTextWidth(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextGeometryGetCharacterIndexAtPositionXExceedsTextWidth");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello");
+
+  application.SendNotification();
+  application.Render();
+
+  int characterIndex = TextGeometry::GetCharacterIndexAtPosition(label, 150, 1);
+
+  int expectedCharacterIndex = -1;
+
+  DALI_TEST_EQUALS(characterIndex, expectedCharacterIndex, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
index 5495c9d..dd0b690 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,22 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h>
-#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
-#include <dali/devel-api/text-abstraction/bitmap-font.h>
-#include <dali/devel-api/text-abstraction/font-client.h>
-#include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali-toolkit/devel-api/text/bitmap-font.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
 #include <dali-toolkit/devel-api/text/text-utils-devel.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/text-abstraction/bitmap-font.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include "test-text-geometry-utils.h"
 
 using namespace Dali;
 using namespace Toolkit;
@@ -46,46 +47,54 @@ void dali_textlabel_cleanup(void)
 
 namespace
 {
-
-const char* const PROPERTY_NAME_RENDERING_BACKEND = "renderingBackend";
-const char* const PROPERTY_NAME_TEXT = "text";
-const char* const PROPERTY_NAME_FONT_FAMILY = "fontFamily";
-const char* const PROPERTY_NAME_FONT_STYLE = "fontStyle";
-const char* const PROPERTY_NAME_POINT_SIZE = "pointSize";
-const char* const PROPERTY_NAME_MULTI_LINE =  "multiLine";
-const char* const PROPERTY_NAME_HORIZONTAL_ALIGNMENT = "horizontalAlignment";
-const char* const PROPERTY_NAME_VERTICAL_ALIGNMENT = "verticalAlignment";
-const char* const PROPERTY_NAME_TEXT_COLOR = "textColor";
-const char* const PROPERTY_NAME_ENABLE_MARKUP = "enableMarkup";
-const char* const PROPERTY_NAME_ENABLE_AUTO_SCROLL = "enableAutoScroll";
+const char* const PROPERTY_NAME_RENDERING_BACKEND        = "renderingBackend";
+const char* const PROPERTY_NAME_TEXT                     = "text";
+const char* const PROPERTY_NAME_FONT_FAMILY              = "fontFamily";
+const char* const PROPERTY_NAME_FONT_STYLE               = "fontStyle";
+const char* const PROPERTY_NAME_POINT_SIZE               = "pointSize";
+const char* const PROPERTY_NAME_MULTI_LINE               = "multiLine";
+const char* const PROPERTY_NAME_HORIZONTAL_ALIGNMENT     = "horizontalAlignment";
+const char* const PROPERTY_NAME_VERTICAL_ALIGNMENT       = "verticalAlignment";
+const char* const PROPERTY_NAME_TEXT_COLOR               = "textColor";
+const char* const PROPERTY_NAME_ENABLE_MARKUP            = "enableMarkup";
+const char* const PROPERTY_NAME_ENABLE_AUTO_SCROLL       = "enableAutoScroll";
 const char* const PROPERTY_NAME_ENABLE_AUTO_SCROLL_SPEED = "autoScrollSpeed";
 const char* const PROPERTY_NAME_ENABLE_AUTO_SCROLL_LOOPS = "autoScrollLoopCount";
-const char* const PROPERTY_NAME_ENABLE_AUTO_SCROLL_GAP = "autoScrollGap";
-
-const char* const PROPERTY_NAME_LINE_SPACING = "lineSpacing";
-const char* const PROPERTY_NAME_UNDERLINE = "underline";
-const char* const PROPERTY_NAME_SHADOW = "shadow";
-const char* const PROPERTY_NAME_EMBOSS = "emboss";
-const char* const PROPERTY_NAME_OUTLINE = "outline";
-const char* const PROPERTY_NAME_BACKGROUND = "textBackground";
-
-const char* const PROPERTY_NAME_PIXEL_SIZE = "pixelSize";
-const char* const PROPERTY_NAME_ELLIPSIS = "ellipsis";
+const char* const PROPERTY_NAME_ENABLE_AUTO_SCROLL_GAP   = "autoScrollGap";
+
+const char* const PROPERTY_NAME_LINE_SPACING  = "lineSpacing";
+const char* const PROPERTY_NAME_UNDERLINE     = "underline";
+const char* const PROPERTY_NAME_SHADOW        = "shadow";
+const char* const PROPERTY_NAME_EMBOSS        = "emboss";
+const char* const PROPERTY_NAME_OUTLINE       = "outline";
+const char* const PROPERTY_NAME_BACKGROUND    = "textBackground";
+const char* const PROPERTY_NAME_STRIKETHROUGH = "strikethrough";
+
+const char* const PROPERTY_NAME_PIXEL_SIZE             = "pixelSize";
+const char* const PROPERTY_NAME_ELLIPSIS               = "ellipsis";
 const char* const PROPERTY_NAME_AUTO_SCROLL_LOOP_DELAY = "autoScrollLoopDelay";
-const char* const PROPERTY_NAME_FONT_SIZE_SCALE = "fontSizeScale";
+const char* const PROPERTY_NAME_FONT_SIZE_SCALE        = "fontSizeScale";
+const char* const PROPERTY_NAME_ENABLE_FONT_SIZE_SCALE = "enableFontSizeScale";
+
+const char* const PROPERTY_NAME_ELLIPSIS_POSITION    = "ellipsisPosition";
+const char* const PROPERTY_NAME_ANCHOR_COLOR         = "anchorColor";
+const char* const PROPERTY_NAME_ANCHOR_CLICKED_COLOR = "anchorClickedColor";
 
-const char* const PROPERTY_NAME_ELLIPSIS_POSITION = "ellipsisPosition";
+const char* const PROPERTY_NAME_REMOVE_FRONT_INSET    = "removeFrontInset";
+const char* const PROPERTY_NAME_REMOVE_BACK_INSET     = "removeBackInset";
 
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string  DEFAULT_FONT_DIR("/resources/fonts");
 const unsigned int EMOJI_FONT_SIZE = 3840u; // 60 * 64
 
 static bool gAnchorClickedCallBackCalled;
 static bool gAnchorClickedCallBackNotCalled;
 
+static bool gTextFitChangedCallBackCalled;
+
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -102,39 +111,45 @@ static void TestAnchorClickedCallback(TextLabel control, const char* href, unsig
 
   gAnchorClickedCallBackNotCalled = false;
 
-  if (!strcmp(href, "https://www.tizen.org") && hrefLength == strlen(href))
+  if(!strcmp(href, "https://www.tizen.org") && hrefLength == strlen(href))
   {
     gAnchorClickedCallBackCalled = true;
   }
 }
 
-bool DaliTestCheckMaps( const Property::Map& mapGet, const Property::Map& mapSet, const std::vector<std::string>& indexConversionTable = std::vector<std::string>() )
+static void TestTextFitChangedCallback(TextLabel control)
+{
+  tet_infoline(" TestTextFitChangedCallback");
+  gTextFitChangedCallBackCalled = true;
+}
+
+bool DaliTestCheckMaps(const Property::Map& mapGet, const Property::Map& mapSet, const std::vector<std::string>& indexConversionTable = std::vector<std::string>())
 {
   const Property::Map::SizeType size = mapGet.Count();
 
-  if( size == mapSet.Count() )
+  if(size == mapSet.Count())
   {
-    for( unsigned int index = 0u; index < size; ++index )
+    for(unsigned int index = 0u; index < size; ++index)
     {
-      const KeyValuePair& valueGet = mapGet.GetKeyValue( index );
+      const KeyValuePair& valueGet = mapGet.GetKeyValue(index);
 
       // Find the keys of the 'get' map
-      Property::Index indexKey = valueGet.first.indexKey;
-      std::string stringKey = valueGet.first.stringKey;
+      Property::Index indexKey  = valueGet.first.indexKey;
+      std::string     stringKey = valueGet.first.stringKey;
 
-      if( !indexConversionTable.empty() )
+      if(!indexConversionTable.empty())
       {
-        if( stringKey.empty() )
+        if(stringKey.empty())
         {
-          stringKey = indexConversionTable[ indexKey ];
+          stringKey = indexConversionTable[indexKey];
         }
 
-        if( ( indexKey == Property::INVALID_INDEX ) && !stringKey.empty() )
+        if((indexKey == Property::INVALID_INDEX) && !stringKey.empty())
         {
           Property::Index index = 0u;
-          for( auto key : indexConversionTable )
+          for(auto key : indexConversionTable)
           {
-            if( key == stringKey )
+            if(key == stringKey)
             {
               indexKey = index;
               break;
@@ -144,54 +159,54 @@ bool DaliTestCheckMaps( const Property::Map& mapGet, const Property::Map& mapSet
         }
       }
 
-      const Property::Value* const valueSet = mapSet.Find( indexKey, stringKey );
+      const Property::Value* const valueSet = mapSet.Find(indexKey, stringKey);
 
-      if( nullptr != valueSet )
+      if(nullptr != valueSet)
       {
-        if( ( valueSet->GetType() == Dali::Property::STRING ) && ( valueGet.second.Get<std::string>() != valueSet->Get<std::string>() ) )
+        if((valueSet->GetType() == Dali::Property::STRING) && (valueGet.second.Get<std::string>() != valueSet->Get<std::string>()))
         {
-          tet_printf( "Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str() );
+          tet_printf("Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str());
           return false;
         }
-        else if( ( valueSet->GetType() == Dali::Property::BOOLEAN ) && ( valueGet.second.Get<bool>() != valueSet->Get<bool>() ) )
+        else if((valueSet->GetType() == Dali::Property::BOOLEAN) && (valueGet.second.Get<bool>() != valueSet->Get<bool>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>());
           return false;
         }
-        else if( ( valueSet->GetType() == Dali::Property::INTEGER ) && ( valueGet.second.Get<int>() != valueSet->Get<int>() ) )
+        else if((valueSet->GetType() == Dali::Property::INTEGER) && (valueGet.second.Get<int>() != valueSet->Get<int>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>());
           return false;
         }
-        else if( ( valueSet->GetType() == Dali::Property::FLOAT ) && ( valueGet.second.Get<float>() != valueSet->Get<float>() ) )
+        else if((valueSet->GetType() == Dali::Property::FLOAT) && (valueGet.second.Get<float>() != valueSet->Get<float>()))
         {
-          tet_printf( "Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>() );
+          tet_printf("Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>());
           return false;
         }
-        else if( ( valueSet->GetType() == Dali::Property::VECTOR2 ) && ( valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>() ) )
+        else if((valueSet->GetType() == Dali::Property::VECTOR2) && (valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>()))
         {
           Vector2 vector2Get = valueGet.second.Get<Vector2>();
           Vector2 vector2Set = valueSet->Get<Vector2>();
-          tet_printf( "Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y );
+          tet_printf("Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y);
           return false;
         }
-        else if( ( valueSet->GetType() == Dali::Property::VECTOR4 ) && ( valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>() ) )
+        else if((valueSet->GetType() == Dali::Property::VECTOR4) && (valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>()))
         {
           Vector4 vector4Get = valueGet.second.Get<Vector4>();
           Vector4 vector4Set = valueSet->Get<Vector4>();
-          tet_printf( "Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a );
+          tet_printf("Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a);
           return false;
         }
       }
       else
       {
-        if ( valueGet.first.type == Property::Key::INDEX )
+        if(valueGet.first.type == Property::Key::INDEX)
         {
-          tet_printf( "  The key %d doesn't exist.", valueGet.first.indexKey );
+          tet_printf("  The key %d doesn't exist.", valueGet.first.indexKey);
         }
         else
         {
-          tet_printf( "  The key %s doesn't exist.", valueGet.first.stringKey.c_str() );
+          tet_printf("  The key %s doesn't exist.", valueGet.first.stringKey.c_str());
         }
         return false;
       }
@@ -208,7 +223,7 @@ int UtcDaliToolkitTextLabelConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelConstructorP");
   TextLabel textLabel;
-  DALI_TEST_CHECK( !textLabel );
+  DALI_TEST_CHECK(!textLabel);
   END_TEST;
 }
 
@@ -216,8 +231,8 @@ int UtcDaliToolkitTextLabelNewP(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelNewP");
-  TextLabel textLabel = TextLabel::New( "Test Text" );
-  DALI_TEST_CHECK( textLabel );
+  TextLabel textLabel = TextLabel::New("Test Text");
+  DALI_TEST_CHECK(textLabel);
   END_TEST;
 }
 
@@ -225,14 +240,14 @@ int UtcDaliToolkitTextLabelDownCastP(void)
 {
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelDownCastP");
-  TextLabel textLabel1 = TextLabel::New();
-  BaseHandle object( textLabel1 );
+  TextLabel  textLabel1 = TextLabel::New();
+  BaseHandle object(textLabel1);
 
-  TextLabel textLabel2 = TextLabel::DownCast( object );
-  DALI_TEST_CHECK( textLabel2 );
+  TextLabel textLabel2 = TextLabel::DownCast(object);
+  DALI_TEST_CHECK(textLabel2);
 
-  TextLabel textLabel3 = DownCast< TextLabel >( object );
-  DALI_TEST_CHECK( textLabel3 );
+  TextLabel textLabel3 = DownCast<TextLabel>(object);
+  DALI_TEST_CHECK(textLabel3);
   END_TEST;
 }
 
@@ -241,11 +256,11 @@ int UtcDaliToolkitTextLabelDownCastN(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelDownCastN");
   BaseHandle uninitializedObject;
-  TextLabel textLabel1 = TextLabel::DownCast( uninitializedObject );
-  DALI_TEST_CHECK( !textLabel1 );
+  TextLabel  textLabel1 = TextLabel::DownCast(uninitializedObject);
+  DALI_TEST_CHECK(!textLabel1);
 
-  TextLabel textLabel2 = DownCast< TextLabel >( uninitializedObject );
-  DALI_TEST_CHECK( !textLabel2 );
+  TextLabel textLabel2 = DownCast<TextLabel>(uninitializedObject);
+  DALI_TEST_CHECK(!textLabel2);
   END_TEST;
 }
 
@@ -254,11 +269,11 @@ int UtcDaliToolkitTextLabelCopyConstructorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelCopyConstructorP");
   TextLabel textLabel = TextLabel::New();
-  textLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::RED );
+  textLabel.SetProperty(TextLabel::Property::TEXT_COLOR, Color::RED);
 
-  TextLabel copy( textLabel );
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<Vector4>( TextLabel::Property::TEXT_COLOR ) == textLabel.GetProperty<Vector4>( TextLabel::Property::TEXT_COLOR ) );
+  TextLabel copy(textLabel);
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<Vector4>(TextLabel::Property::TEXT_COLOR) == textLabel.GetProperty<Vector4>(TextLabel::Property::TEXT_COLOR));
   END_TEST;
 }
 
@@ -267,14 +282,14 @@ int UtcDaliTextLabelMoveConstructor(void)
   ToolkitTestApplication application;
 
   TextLabel textLabel = TextLabel::New();
-  textLabel.SetProperty( TextLabel::Property::TEXT, "Test" );
-  DALI_TEST_CHECK( textLabel.GetProperty<std::string>( TextLabel::Property::TEXT ) == "Test" );
+  textLabel.SetProperty(TextLabel::Property::TEXT, "Test");
+  DALI_TEST_CHECK(textLabel.GetProperty<std::string>(TextLabel::Property::TEXT) == "Test");
 
-  TextLabel moved = std::move( textLabel );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<std::string>( TextLabel::Property::TEXT ) == "Test" );
-  DALI_TEST_CHECK( !textLabel );
+  TextLabel moved = std::move(textLabel);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<std::string>(TextLabel::Property::TEXT) == "Test");
+  DALI_TEST_CHECK(!textLabel);
 
   END_TEST;
 }
@@ -284,11 +299,11 @@ int UtcDaliToolkitTextLabelAssignmentOperatorP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelAssingmentOperatorP");
   TextLabel textLabel = TextLabel::New();
-  textLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::RED );
+  textLabel.SetProperty(TextLabel::Property::TEXT_COLOR, Color::RED);
 
   TextLabel copy = textLabel;
-  DALI_TEST_CHECK( copy );
-  DALI_TEST_CHECK( copy.GetProperty<Vector4>( TextLabel::Property::TEXT_COLOR ) == textLabel.GetProperty<Vector4>( TextLabel::Property::TEXT_COLOR ) );
+  DALI_TEST_CHECK(copy);
+  DALI_TEST_CHECK(copy.GetProperty<Vector4>(TextLabel::Property::TEXT_COLOR) == textLabel.GetProperty<Vector4>(TextLabel::Property::TEXT_COLOR));
   END_TEST;
 }
 
@@ -297,15 +312,15 @@ int UtcDaliTextLabelMoveAssignment(void)
   ToolkitTestApplication application;
 
   TextLabel textLabel = TextLabel::New();
-  textLabel.SetProperty( TextLabel::Property::TEXT, "Test" );
-  DALI_TEST_CHECK( textLabel.GetProperty<std::string>( TextLabel::Property::TEXT ) == "Test" );
+  textLabel.SetProperty(TextLabel::Property::TEXT, "Test");
+  DALI_TEST_CHECK(textLabel.GetProperty<std::string>(TextLabel::Property::TEXT) == "Test");
 
   TextLabel moved;
-  moved = std::move( textLabel );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<std::string>( TextLabel::Property::TEXT ) == "Test" );
-  DALI_TEST_CHECK( !textLabel );
+  moved = std::move(textLabel);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<std::string>(TextLabel::Property::TEXT) == "Test");
+  DALI_TEST_CHECK(!textLabel);
 
   END_TEST;
 }
@@ -316,34 +331,40 @@ int UtcDaliToolkitTextLabelGetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelGetPropertyP");
   TextLabel label = TextLabel::New("Test Text");
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
   // Check Property Indices are correct
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_RENDERING_BACKEND ) == DevelTextLabel::Property::RENDERING_BACKEND );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_TEXT ) == TextLabel::Property::TEXT );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_FONT_FAMILY ) == TextLabel::Property::FONT_FAMILY );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_FONT_STYLE ) == TextLabel::Property::FONT_STYLE );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_POINT_SIZE ) == TextLabel::Property::POINT_SIZE );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_MULTI_LINE ) == TextLabel::Property::MULTI_LINE );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_HORIZONTAL_ALIGNMENT ) == TextLabel::Property::HORIZONTAL_ALIGNMENT );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_VERTICAL_ALIGNMENT ) == TextLabel::Property::VERTICAL_ALIGNMENT );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_TEXT_COLOR ) == TextLabel::Property::TEXT_COLOR );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ENABLE_MARKUP) == TextLabel::Property::ENABLE_MARKUP );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ENABLE_AUTO_SCROLL ) == TextLabel::Property::ENABLE_AUTO_SCROLL );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ENABLE_AUTO_SCROLL_SPEED ) == TextLabel::Property::AUTO_SCROLL_SPEED );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ENABLE_AUTO_SCROLL_LOOPS ) == TextLabel::Property::AUTO_SCROLL_LOOP_COUNT );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ENABLE_AUTO_SCROLL_GAP ) == TextLabel::Property::AUTO_SCROLL_GAP );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_LINE_SPACING ) == TextLabel::Property::LINE_SPACING );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_UNDERLINE ) == TextLabel::Property::UNDERLINE );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_SHADOW ) == TextLabel::Property::SHADOW );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_EMBOSS ) == TextLabel::Property::EMBOSS );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_OUTLINE ) == TextLabel::Property::OUTLINE );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_BACKGROUND ) == DevelTextLabel::Property::BACKGROUND );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_PIXEL_SIZE ) == TextLabel::Property::PIXEL_SIZE );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ELLIPSIS ) == TextLabel::Property::ELLIPSIS );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_AUTO_SCROLL_LOOP_DELAY ) == TextLabel::Property::AUTO_SCROLL_LOOP_DELAY );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_FONT_SIZE_SCALE ) == DevelTextLabel::Property::FONT_SIZE_SCALE );
-  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ELLIPSIS_POSITION ) == DevelTextLabel::Property::ELLIPSIS_POSITION );
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_RENDERING_BACKEND) == DevelTextLabel::Property::RENDERING_BACKEND);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_TEXT) == TextLabel::Property::TEXT);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_FONT_FAMILY) == TextLabel::Property::FONT_FAMILY);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_FONT_STYLE) == TextLabel::Property::FONT_STYLE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_POINT_SIZE) == TextLabel::Property::POINT_SIZE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_MULTI_LINE) == TextLabel::Property::MULTI_LINE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_HORIZONTAL_ALIGNMENT) == TextLabel::Property::HORIZONTAL_ALIGNMENT);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_VERTICAL_ALIGNMENT) == TextLabel::Property::VERTICAL_ALIGNMENT);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_TEXT_COLOR) == TextLabel::Property::TEXT_COLOR);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ENABLE_MARKUP) == TextLabel::Property::ENABLE_MARKUP);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ENABLE_AUTO_SCROLL) == TextLabel::Property::ENABLE_AUTO_SCROLL);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ENABLE_AUTO_SCROLL_SPEED) == TextLabel::Property::AUTO_SCROLL_SPEED);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ENABLE_AUTO_SCROLL_LOOPS) == TextLabel::Property::AUTO_SCROLL_LOOP_COUNT);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ENABLE_AUTO_SCROLL_GAP) == TextLabel::Property::AUTO_SCROLL_GAP);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_LINE_SPACING) == TextLabel::Property::LINE_SPACING);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_UNDERLINE) == TextLabel::Property::UNDERLINE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_SHADOW) == TextLabel::Property::SHADOW);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_EMBOSS) == TextLabel::Property::EMBOSS);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_OUTLINE) == TextLabel::Property::OUTLINE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_BACKGROUND) == DevelTextLabel::Property::BACKGROUND);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_PIXEL_SIZE) == TextLabel::Property::PIXEL_SIZE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ELLIPSIS) == TextLabel::Property::ELLIPSIS);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_AUTO_SCROLL_LOOP_DELAY) == TextLabel::Property::AUTO_SCROLL_LOOP_DELAY);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_FONT_SIZE_SCALE) == DevelTextLabel::Property::FONT_SIZE_SCALE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ENABLE_FONT_SIZE_SCALE) == DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ELLIPSIS_POSITION) == DevelTextLabel::Property::ELLIPSIS_POSITION);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_STRIKETHROUGH) == DevelTextLabel::Property::STRIKETHROUGH);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ANCHOR_COLOR) == DevelTextLabel::Property::ANCHOR_COLOR);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ANCHOR_CLICKED_COLOR) == DevelTextLabel::Property::ANCHOR_CLICKED_COLOR);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_REMOVE_FRONT_INSET) == DevelTextLabel::Property::REMOVE_FRONT_INSET);
+  DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_REMOVE_BACK_INSET) == DevelTextLabel::Property::REMOVE_BACK_INSET);
 
   END_TEST;
 }
@@ -353,186 +374,258 @@ int UtcDaliToolkitTextLabelSetPropertyP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelSetPropertyP");
   TextLabel label = TextLabel::New();
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   // Note - we can't check the defaults since the stylesheets are platform-specific
-  label.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS );
-  DALI_TEST_EQUALS( (DevelText::RenderingType)label.GetProperty<int>( DevelTextLabel::Property::RENDERING_BACKEND ), DevelText::RENDERING_SHARED_ATLAS, TEST_LOCATION );
+  label.SetProperty(DevelTextLabel::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS);
+  DALI_TEST_EQUALS((DevelText::RenderingType)label.GetProperty<int>(DevelTextLabel::Property::RENDERING_BACKEND), DevelText::RENDERING_SHARED_ATLAS, TEST_LOCATION);
 
   // Check that text can be correctly reset
-  label.SetProperty( TextLabel::Property::TEXT, "Setting Text" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::TEXT ), std::string("Setting Text"), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "Setting Text");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::TEXT), std::string("Setting Text"), TEST_LOCATION);
 
   // Check font properties.
-  label.SetProperty( TextLabel::Property::FONT_FAMILY, "Setting font family" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::FONT_FAMILY ), std::string("Setting font family"), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::FONT_FAMILY, "Setting font family");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::FONT_FAMILY), std::string("Setting font family"), TEST_LOCATION);
 
   Property::Map fontStyleMapSet;
   Property::Map fontStyleMapGet;
 
-  fontStyleMapSet.Insert( "weight", "bold" );
-  fontStyleMapSet.Insert( "width", "condensed" );
-  fontStyleMapSet.Insert( "slant", "italic" );
-  label.SetProperty( TextLabel::Property::FONT_STYLE, fontStyleMapSet );
+  fontStyleMapSet.Insert("weight", "bold");
+  fontStyleMapSet.Insert("width", "condensed");
+  fontStyleMapSet.Insert("slant", "italic");
+  label.SetProperty(TextLabel::Property::FONT_STYLE, fontStyleMapSet);
 
-  fontStyleMapGet = label.GetProperty<Property::Map>( TextLabel::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  fontStyleMapGet = label.GetProperty<Property::Map>(TextLabel::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   // Check the old font style format.
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "thin" );
-  fontStyleMapSet.Insert( "width", "expanded" );
-  fontStyleMapSet.Insert( "slant", "oblique" );
+  fontStyleMapSet.Insert("weight", "thin");
+  fontStyleMapSet.Insert("width", "expanded");
+  fontStyleMapSet.Insert("slant", "oblique");
   const std::string strFontStyle = "{\"weight\":\"thin\",\"width\":\"expanded\",\"slant\":\"oblique\"}";
 
-  label.SetProperty( TextLabel::Property::FONT_STYLE, "{\"weight\":\"thin\",\"width\":\"expanded\",\"slant\":\"oblique\"}" );
-  std::string getFontStyle = label.GetProperty<std::string>( TextLabel::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( getFontStyle, strFontStyle, TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::FONT_STYLE, "{\"weight\":\"thin\",\"width\":\"expanded\",\"slant\":\"oblique\"}");
+  std::string getFontStyle = label.GetProperty<std::string>(TextLabel::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(getFontStyle, strFontStyle, TEST_LOCATION);
+
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::POINT_SIZE), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 10.f );
-  DALI_TEST_EQUALS( label.GetProperty<float>( TextLabel::Property::POINT_SIZE ), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  label.SetProperty(DevelTextLabel::Property::FONT_SIZE_SCALE, 2.5f);
+  DALI_TEST_EQUALS(label.GetProperty<float>(DevelTextLabel::Property::FONT_SIZE_SCALE), 2.5f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  label.SetProperty(DevelTextLabel::Property::FONT_SIZE_SCALE, 1.0f);
 
-  label.SetProperty( DevelTextLabel::Property::FONT_SIZE_SCALE, 2.5f );
-  DALI_TEST_EQUALS( label.GetProperty<float>( DevelTextLabel::Property::FONT_SIZE_SCALE ), 2.5f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  label.SetProperty( DevelTextLabel::Property::FONT_SIZE_SCALE, 1.0f );
+  label.SetProperty(DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE, false);
+  DALI_TEST_EQUALS(label.GetProperty<bool>(DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE), false, TEST_LOCATION);
+  label.SetProperty(DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE, true);
 
   // Reset font style.
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "weight", "normal" );
-  fontStyleMapSet.Insert( "slant", "oblique" );
+  fontStyleMapSet.Insert("weight", "normal");
+  fontStyleMapSet.Insert("slant", "oblique");
 
-  label.SetProperty( TextLabel::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = label.GetProperty<Property::Map>( TextLabel::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = label.GetProperty<Property::Map>(TextLabel::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
-  fontStyleMapSet.Insert( "slant", "roman" );
+  fontStyleMapSet.Insert("slant", "roman");
 
-  label.SetProperty( TextLabel::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = label.GetProperty<Property::Map>( TextLabel::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = label.GetProperty<Property::Map>(TextLabel::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
 
   // Replace 'roman' for 'normal'.
-  Property::Value* slantValue = fontStyleMapGet.Find( "slant" );
-  if( NULL != slantValue )
+  Property::Value* slantValue = fontStyleMapGet.Find("slant");
+  if(NULL != slantValue)
   {
-    if( "normal" == slantValue->Get<std::string>() )
+    if("normal" == slantValue->Get<std::string>())
     {
       fontStyleMapGet["slant"] = "roman";
     }
   }
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   fontStyleMapSet.Clear();
 
-  label.SetProperty( TextLabel::Property::FONT_STYLE, fontStyleMapSet );
-  fontStyleMapGet = label.GetProperty<Property::Map>( TextLabel::Property::FONT_STYLE );
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::FONT_STYLE, fontStyleMapSet);
+  fontStyleMapGet = label.GetProperty<Property::Map>(TextLabel::Property::FONT_STYLE);
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
   // Toggle multi-line
-  label.SetProperty( TextLabel::Property::MULTI_LINE, true );
-  DALI_TEST_EQUALS( label.GetProperty<bool>( TextLabel::Property::MULTI_LINE ), true, TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  DALI_TEST_EQUALS(label.GetProperty<bool>(TextLabel::Property::MULTI_LINE), true, TEST_LOCATION);
 
   // Check that the Alignment properties can be correctly set
-  label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::HORIZONTAL_ALIGNMENT ), "CENTER", TEST_LOCATION );
-  label.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::VERTICAL_ALIGNMENT ), "CENTER", TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::HORIZONTAL_ALIGNMENT), "CENTER", TEST_LOCATION);
+  label.SetProperty(TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::VERTICAL_ALIGNMENT), "CENTER", TEST_LOCATION);
 
   // Check that text color can be properly set
-  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLUE );
-  DALI_TEST_EQUALS( label.GetProperty<Vector4>( TextLabel::Property::TEXT_COLOR ), Color::BLUE, TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(label.GetProperty<Vector4>(TextLabel::Property::TEXT_COLOR), Color::BLUE, TEST_LOCATION);
+
+  // Check that anchor color can be properly set
+  label.SetProperty(DevelTextLabel::Property::ANCHOR_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(label.GetProperty<Vector4>(DevelTextLabel::Property::ANCHOR_COLOR), Color::BLUE, TEST_LOCATION);
+
+  label.SetProperty(DevelTextLabel::Property::ANCHOR_CLICKED_COLOR, Color::RED);
+  DALI_TEST_EQUALS(label.GetProperty<Vector4>(DevelTextLabel::Property::ANCHOR_CLICKED_COLOR), Color::RED, TEST_LOCATION);
+
+  Property::Map strikethroughMapSet;
+  Property::Map strikethroughMapGet;
+
+  strikethroughMapSet.Insert("enable", false);
+  strikethroughMapSet.Insert("color", Color::BLUE);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+
+  strikethroughMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::STRIKETHROUGH);
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet), true, TEST_LOCATION);
 
   Property::Map underlineMapSet;
   Property::Map underlineMapGet;
 
-  underlineMapSet.Insert( "enable", false );
-  underlineMapSet.Insert( "color", Color::BLUE );
-  underlineMapSet.Insert( "height", 0 );
+  underlineMapSet.Insert("enable", false);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 0);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  //DASHED Underline
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", false);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 0);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  //DOUBLE Underline
+  underlineMapSet.Clear();
+  underlineMapGet.Clear();
+
+  underlineMapSet.Insert("enable", false);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 0);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
 
-  underlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet ), true, TEST_LOCATION );
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
 
-  TextLabel label2 = TextLabel::New( "New text" );
-  DALI_TEST_CHECK( label2 );
-  DALI_TEST_EQUALS( label2.GetProperty<std::string>( TextLabel::Property::TEXT ), std::string("New text"), TEST_LOCATION );
+  TextLabel label2 = TextLabel::New("New text");
+  DALI_TEST_CHECK(label2);
+  DALI_TEST_EQUALS(label2.GetProperty<std::string>(TextLabel::Property::TEXT), std::string("New text"), TEST_LOCATION);
 
   // Check the enable markup property.
-  DALI_TEST_CHECK( !label.GetProperty<bool>( TextLabel::Property::ENABLE_MARKUP ) );
-  label.SetProperty( TextLabel::Property::ENABLE_MARKUP, true );
-  DALI_TEST_CHECK( label.GetProperty<bool>( TextLabel::Property::ENABLE_MARKUP ) );
+  DALI_TEST_CHECK(!label.GetProperty<bool>(TextLabel::Property::ENABLE_MARKUP));
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  DALI_TEST_CHECK(label.GetProperty<bool>(TextLabel::Property::ENABLE_MARKUP));
 
   // Check the text property when markup is enabled
-  label.SetProperty( TextLabel::Property::TEXT, "<color value='white'>Markup</color><color value='cyan'>Text</color>" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::TEXT ), std::string("MarkupText"), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "<color value='white'>Markup</color><color value='cyan'>Text</color>");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::TEXT), std::string("MarkupText"), TEST_LOCATION);
 
   // Check for incomplete marks.
-  label.SetProperty( TextLabel::Property::TEXT, "<color='white'><i>Markup</i><b>Text</b></color>" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::TEXT ), std::string("MarkupText"), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "<color='white'><i>Markup</i><b>Text</b></color>");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::TEXT), std::string("MarkupText"), TEST_LOCATION);
   try
   {
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
 
   // Check autoscroll properties
-  const int SCROLL_SPEED = 80;
-  const int SCROLL_LOOPS = 4;
-  const float SCROLL_GAP = 50.0f;
-  const float SCROLL_LOOP_DELAY = 0.3f;
-  const std::string STOP_IMMEDIATE = std::string( "IMMEDIATE" );
-  const std::string STOP_FINISH_LOOP = std::string( "FINISH_LOOP" );
-
-  label.SetProperty( TextLabel::Property::MULTI_LINE, false ); // Autoscroll only supported in single line
-  DALI_TEST_CHECK( !label.GetProperty<bool>( TextLabel::Property::ENABLE_AUTO_SCROLL ) );
-  label.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-  DALI_TEST_CHECK( label.GetProperty<bool>( TextLabel::Property::ENABLE_AUTO_SCROLL ) );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, SCROLL_SPEED );
-  DALI_TEST_EQUALS( SCROLL_SPEED, label.GetProperty<int>( TextLabel::Property::AUTO_SCROLL_SPEED ), TEST_LOCATION );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, SCROLL_LOOPS );
-  DALI_TEST_EQUALS( SCROLL_LOOPS, label.GetProperty<int>( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT ), TEST_LOCATION );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, SCROLL_GAP );
-  DALI_TEST_EQUALS( SCROLL_GAP, label.GetProperty<float>( TextLabel::Property::AUTO_SCROLL_GAP ), TEST_LOCATION );
-  label.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_DELAY, SCROLL_LOOP_DELAY );
-  DALI_TEST_EQUALS( SCROLL_LOOP_DELAY, label.GetProperty<float>( TextLabel::Property::AUTO_SCROLL_LOOP_DELAY ), TEST_LOCATION );
+  const int         SCROLL_SPEED      = 80;
+  const int         SCROLL_LOOPS      = 4;
+  const float       SCROLL_GAP        = 50.0f;
+  const float       SCROLL_LOOP_DELAY = 0.3f;
+  const std::string STOP_IMMEDIATE    = std::string("IMMEDIATE");
+  const std::string STOP_FINISH_LOOP  = std::string("FINISH_LOOP");
+
+  label.SetProperty(TextLabel::Property::MULTI_LINE, false); // Autoscroll only supported in single line
+  DALI_TEST_CHECK(!label.GetProperty<bool>(TextLabel::Property::ENABLE_AUTO_SCROLL));
+  label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+  DALI_TEST_CHECK(label.GetProperty<bool>(TextLabel::Property::ENABLE_AUTO_SCROLL));
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, SCROLL_SPEED);
+  DALI_TEST_EQUALS(SCROLL_SPEED, label.GetProperty<int>(TextLabel::Property::AUTO_SCROLL_SPEED), TEST_LOCATION);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, SCROLL_LOOPS);
+  DALI_TEST_EQUALS(SCROLL_LOOPS, label.GetProperty<int>(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT), TEST_LOCATION);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, SCROLL_GAP);
+  DALI_TEST_EQUALS(SCROLL_GAP, label.GetProperty<float>(TextLabel::Property::AUTO_SCROLL_GAP), TEST_LOCATION);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_DELAY, SCROLL_LOOP_DELAY);
+  DALI_TEST_EQUALS(SCROLL_LOOP_DELAY, label.GetProperty<float>(TextLabel::Property::AUTO_SCROLL_LOOP_DELAY), TEST_LOCATION);
 
   //Check autoscroll stop type property
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
-  DALI_TEST_EQUALS( STOP_IMMEDIATE, label.GetProperty<std::string>( TextLabel::Property::AUTO_SCROLL_STOP_MODE ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE);
+  DALI_TEST_EQUALS(STOP_IMMEDIATE, label.GetProperty<std::string>(TextLabel::Property::AUTO_SCROLL_STOP_MODE), TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP );
-  DALI_TEST_EQUALS( STOP_FINISH_LOOP, label.GetProperty<std::string>( TextLabel::Property::AUTO_SCROLL_STOP_MODE ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP);
+  DALI_TEST_EQUALS(STOP_FINISH_LOOP, label.GetProperty<std::string>(TextLabel::Property::AUTO_SCROLL_STOP_MODE), TEST_LOCATION);
 
   // test natural size with multi-line and line spacing
   {
-    TextLabel label3 = TextLabel::New("Some text here\nend there\nend here");
-    Vector3 oneLineNaturalSize = label3.GetNaturalSize();
+    TextLabel label3             = TextLabel::New("Some text here\nend there\nend here");
+    Vector3   oneLineNaturalSize = label3.GetNaturalSize();
     label3.SetProperty(TextLabel::Property::MULTI_LINE, true);
     label3.SetProperty(TextLabel::Property::LINE_SPACING, 0);
     Vector3 multiLineNaturalSize = label3.GetNaturalSize();
 
     // The width of the text when multi-line is enabled will be smaller (lines separated on '\n')
     // The height of the text when multi-line is enabled will be larger
-    DALI_TEST_CHECK( oneLineNaturalSize.width > multiLineNaturalSize.width );
-    DALI_TEST_CHECK( oneLineNaturalSize.height < multiLineNaturalSize.height );
+    DALI_TEST_CHECK(oneLineNaturalSize.width > multiLineNaturalSize.width);
+    DALI_TEST_CHECK(oneLineNaturalSize.height < multiLineNaturalSize.height);
 
     // Change line spacing, meaning height will increase by 3 times the amount specified as we have three lines
     // Everything else will remain the same
     int lineSpacing = 20;
-    label3.SetProperty( TextLabel::Property::LINE_SPACING, lineSpacing );
-    Vector3 expectedAfterLineSpacingApplied( multiLineNaturalSize );
+    label3.SetProperty(TextLabel::Property::LINE_SPACING, lineSpacing);
+    Vector3 expectedAfterLineSpacingApplied(multiLineNaturalSize);
     expectedAfterLineSpacingApplied.height += 3 * lineSpacing;
-    DALI_TEST_EQUALS( expectedAfterLineSpacingApplied, label3.GetNaturalSize(), TEST_LOCATION );
+    DALI_TEST_EQUALS(expectedAfterLineSpacingApplied, label3.GetNaturalSize(), TEST_LOCATION);
   }
 
   // single line, line spacing must not affect natural size of the text, only add the spacing to the height
@@ -541,119 +634,317 @@ int UtcDaliToolkitTextLabelSetPropertyP(void)
     label3.SetProperty(TextLabel::Property::MULTI_LINE, false);
     label3.SetProperty(TextLabel::Property::LINE_SPACING, 0);
     Vector3 textNaturalSize = label3.GetNaturalSize();
-    int lineSpacing = 20;
-    label3.SetProperty( TextLabel::Property::LINE_SPACING, lineSpacing );
-    Vector3 expectedNaturalSizeWithLineSpacing( textNaturalSize );
+    int     lineSpacing     = 20;
+    label3.SetProperty(TextLabel::Property::LINE_SPACING, lineSpacing);
+    Vector3 expectedNaturalSizeWithLineSpacing(textNaturalSize);
     expectedNaturalSizeWithLineSpacing.height += lineSpacing;
-    DALI_TEST_EQUALS( expectedNaturalSizeWithLineSpacing, label3.GetNaturalSize(), TEST_LOCATION );
+    DALI_TEST_EQUALS(expectedNaturalSizeWithLineSpacing, label3.GetNaturalSize(), TEST_LOCATION);
   }
   // Check the line spacing property
-  DALI_TEST_EQUALS( label.GetProperty<float>( TextLabel::Property::LINE_SPACING ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  label.SetProperty( TextLabel::Property::LINE_SPACING, 10.f );
-  DALI_TEST_EQUALS( label.GetProperty<float>( TextLabel::Property::LINE_SPACING ), 10.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::LINE_SPACING), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  label.SetProperty(TextLabel::Property::LINE_SPACING, 10.f);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::LINE_SPACING), 10.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  // Check the strikethrough property
+  strikethroughMapSet.Clear();
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::RED);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::STRIKETHROUGH);
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet), true, TEST_LOCATION);
+
+  // Check the transparent strikethrough property for coverage.
+  strikethroughMapSet.Clear();
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::TRANSPARENT);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::STRIKETHROUGH);
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet), true, TEST_LOCATION);
+
+  strikethroughMapSet.Clear();
+  strikethroughMapSet.Insert(Toolkit::DevelText::Strikethrough::Property::ENABLE, true);
+  strikethroughMapSet.Insert(Toolkit::DevelText::Strikethrough::Property::COLOR, Color::RED);
+  strikethroughMapSet.Insert(Toolkit::DevelText::Strikethrough::Property::HEIGHT, 2.0f);
+
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::STRIKETHROUGH);
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  std::vector<std::string> strikethroughIndicesConversionTable = {"enable", "color", "height"};
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet, strikethroughIndicesConversionTable), true, TEST_LOCATION);
+
+  strikethroughMapSet.Clear();
+
+  Property::Map strikethroughDisabledMapGet;
+  strikethroughDisabledMapGet.Insert("enable", false);
+  strikethroughDisabledMapGet.Insert("color", Color::RED);
+  strikethroughDisabledMapGet.Insert("height", 2.0f);
+
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::STRIKETHROUGH);
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughDisabledMapGet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughDisabledMapGet), true, TEST_LOCATION);
 
   // Check the underline property
   underlineMapSet.Clear();
-  underlineMapSet.Insert( "enable", true );
-  underlineMapSet.Insert( "color", Color::RED );
-  underlineMapSet.Insert( "height", 1 );
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
 
-  label.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
 
   application.SendNotification();
   application.Render();
 
-  underlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet ), true, TEST_LOCATION );
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
 
   underlineMapSet.Clear();
-  underlineMapSet.Insert( Toolkit::DevelText::Underline::Property::ENABLE, true );
-  underlineMapSet.Insert( Toolkit::DevelText::Underline::Property::COLOR, Color::GREEN );
-  underlineMapSet.Insert( Toolkit::DevelText::Underline::Property::HEIGHT, 2 );
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::ENABLE, true);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::COLOR, Color::GREEN);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::HEIGHT, 2);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::TYPE, Text::Underline::DASHED);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::DASH_WIDTH, 2);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::DASH_GAP, 1);
 
-  label.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
 
   application.SendNotification();
   application.Render();
 
-  underlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
-  std::vector<std::string> underlineIndicesConversionTable = { "enable", "color", "height" };
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet, underlineIndicesConversionTable ), true, TEST_LOCATION );
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  std::vector<std::string> underlineIndicesConversionTable = {"enable", "color", "height", "type", "dashWidth", "dashGap"};
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet, underlineIndicesConversionTable), true, TEST_LOCATION);
 
   underlineMapSet.Clear();
 
   Property::Map underlineDisabledMapGet;
-  underlineDisabledMapGet.Insert( "enable", false );
-  underlineDisabledMapGet.Insert( "color", Color::GREEN );
-  underlineDisabledMapGet.Insert( "height", 2 );
+  underlineDisabledMapGet.Insert("enable", false);
+  underlineDisabledMapGet.Insert("color", Color::GREEN);
+  underlineDisabledMapGet.Insert("height", 2);
+  underlineDisabledMapGet.Insert("type", Text::Underline::SOLID);
+  underlineDisabledMapGet.Insert("dashWidth", 2);
+  underlineDisabledMapGet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineDisabledMapGet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineDisabledMapGet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineDisabledMapGet), true, TEST_LOCATION);
+
+  // Check the dashed underline property
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  underlineMapSet.Clear();
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::ENABLE, true);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::COLOR, Color::GREEN);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::HEIGHT, 2);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::TYPE, Text::Underline::DASHED);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::DASH_WIDTH, 2);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::DASH_GAP, 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  underlineIndicesConversionTable = {"enable", "color", "height", "type", "dashWidth", "dashGap"};
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet, underlineIndicesConversionTable), true, TEST_LOCATION);
+
+  underlineMapSet.Clear();
 
-  label.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
+  underlineDisabledMapGet.Clear();
+  underlineDisabledMapGet.Insert("enable", false);
+  underlineDisabledMapGet.Insert("color", Color::GREEN);
+  underlineDisabledMapGet.Insert("height", 2);
+  underlineDisabledMapGet.Insert("type", Text::Underline::DASHED);
+  underlineDisabledMapGet.Insert("dashWidth", 2);
+  underlineDisabledMapGet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineDisabledMapGet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineDisabledMapGet), true, TEST_LOCATION);
+
+  // Check the double underline property
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  // Check the transparent double underline property for coverage.
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::TRANSPARENT);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
+
+  underlineMapSet.Clear();
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::ENABLE, true);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::COLOR, Color::GREEN);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::HEIGHT, 2);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::TYPE, Text::Underline::DOUBLE);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::DASH_WIDTH, 2);
+  underlineMapSet.Insert(Toolkit::DevelText::Underline::Property::DASH_GAP, 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+
+  application.SendNotification();
+  application.Render();
+
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  underlineIndicesConversionTable = {"enable", "color", "height", "type", "dashWidth", "dashGap"};
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet, underlineIndicesConversionTable), true, TEST_LOCATION);
+
+  underlineMapSet.Clear();
+
+  underlineDisabledMapGet.Clear();
+  underlineDisabledMapGet.Insert("enable", false);
+  underlineDisabledMapGet.Insert("color", Color::GREEN);
+  underlineDisabledMapGet.Insert("height", 2);
+  underlineDisabledMapGet.Insert("type", Text::Underline::DOUBLE);
+  underlineDisabledMapGet.Insert("dashWidth", 2);
+  underlineDisabledMapGet.Insert("dashGap", 1);
+
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineDisabledMapGet);
 
   application.SendNotification();
   application.Render();
 
-  underlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineDisabledMapGet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineDisabledMapGet ), true, TEST_LOCATION );
+  underlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::UNDERLINE);
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineDisabledMapGet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineDisabledMapGet), true, TEST_LOCATION);
 
   // Check the shadow property
 
   Property::Map shadowMapSet;
   Property::Map shadowMapGet;
 
-  shadowMapSet.Insert( "color", Color::GREEN );
-  shadowMapSet.Insert( "offset", Vector2(2.0f, 2.0f) );
-  shadowMapSet.Insert( "blurRadius", 5.0f );
+  shadowMapSet.Insert("color", Color::GREEN);
+  shadowMapSet.Insert("offset", Vector2(2.0f, 2.0f));
+  shadowMapSet.Insert("blurRadius", 5.0f);
 
-  label.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
+  label.SetProperty(TextLabel::Property::SHADOW, shadowMapSet);
 
-  shadowMapGet = label.GetProperty<Property::Map>( TextLabel::Property::SHADOW );
-  DALI_TEST_EQUALS( shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet ), true, TEST_LOCATION );
+  shadowMapGet = label.GetProperty<Property::Map>(TextLabel::Property::SHADOW);
+  DALI_TEST_EQUALS(shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(shadowMapGet, shadowMapSet), true, TEST_LOCATION);
 
   shadowMapSet.Clear();
 
-  shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::COLOR, Color::BLUE );
-  shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::OFFSET, "3.0 3.0" );
-  shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::BLUR_RADIUS, 3.0f );
+  shadowMapSet.Insert(Toolkit::DevelText::Shadow::Property::COLOR, Color::BLUE);
+  shadowMapSet.Insert(Toolkit::DevelText::Shadow::Property::OFFSET, "3.0 3.0");
+  shadowMapSet.Insert(Toolkit::DevelText::Shadow::Property::BLUR_RADIUS, 3.0f);
 
-  label.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
+  label.SetProperty(TextLabel::Property::SHADOW, shadowMapSet);
 
   // Replace the offset (string) by a vector2
   shadowMapSet.Clear();
-  shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::COLOR, Color::BLUE );
-  shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::OFFSET, Vector2( 3.0, 3.0 ) );
-  shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::BLUR_RADIUS, 3.0f );
+  shadowMapSet.Insert(Toolkit::DevelText::Shadow::Property::COLOR, Color::BLUE);
+  shadowMapSet.Insert(Toolkit::DevelText::Shadow::Property::OFFSET, Vector2(3.0, 3.0));
+  shadowMapSet.Insert(Toolkit::DevelText::Shadow::Property::BLUR_RADIUS, 3.0f);
 
-  shadowMapGet = label.GetProperty<Property::Map>( TextLabel::Property::SHADOW );
-  DALI_TEST_EQUALS( shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION );
-  std::vector<std::string> shadowIndicesConversionTable = { "color", "offset", "blurRadius" };
-  DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet, shadowIndicesConversionTable ), true, TEST_LOCATION );
+  shadowMapGet = label.GetProperty<Property::Map>(TextLabel::Property::SHADOW);
+  DALI_TEST_EQUALS(shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION);
+  std::vector<std::string> shadowIndicesConversionTable = {"color", "offset", "blurRadius"};
+  DALI_TEST_EQUALS(DaliTestCheckMaps(shadowMapGet, shadowMapSet, shadowIndicesConversionTable), true, TEST_LOCATION);
 
   shadowMapSet.Clear();
   Property::Map shadowDisabledMapGet;
-  shadowDisabledMapGet.Insert( "color", Color::BLUE );
-  shadowDisabledMapGet.Insert( "offset", Vector2(0.0f, 0.0f) );
-  shadowDisabledMapGet.Insert( "blurRadius", 3.0f );
+  shadowDisabledMapGet.Insert("color", Color::BLUE);
+  shadowDisabledMapGet.Insert("offset", Vector2(0.0f, 0.0f));
+  shadowDisabledMapGet.Insert("blurRadius", 3.0f);
 
-  label.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
+  label.SetProperty(TextLabel::Property::SHADOW, shadowMapSet);
 
-  shadowMapGet = label.GetProperty<Property::Map>( TextLabel::Property::SHADOW );
-  DALI_TEST_EQUALS( shadowMapGet.Count(), shadowDisabledMapGet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowDisabledMapGet ), true, TEST_LOCATION );
+  shadowMapGet = label.GetProperty<Property::Map>(TextLabel::Property::SHADOW);
+  DALI_TEST_EQUALS(shadowMapGet.Count(), shadowDisabledMapGet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(shadowMapGet, shadowDisabledMapGet), true, TEST_LOCATION);
 
   // Check the emboss property
-  label.SetProperty( TextLabel::Property::EMBOSS, "Emboss properties" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::EMBOSS ), std::string("Emboss properties"), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::EMBOSS, "Emboss properties");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::EMBOSS), std::string("Emboss properties"), TEST_LOCATION);
 
   // Check the outline property
 
   // Test string type first
   // This is purely to maintain backward compatibility, but we don't support string as the outline property type.
-  label.SetProperty( TextLabel::Property::OUTLINE, "Outline properties" );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::OUTLINE ), std::string("Outline properties"), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::OUTLINE, "Outline properties");
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::OUTLINE), std::string("Outline properties"), TEST_LOCATION);
 
   // Then test the property map type
   Property::Map outlineMapSet;
@@ -661,61 +952,86 @@ int UtcDaliToolkitTextLabelSetPropertyP(void)
 
   outlineMapSet["color"] = Color::RED;
   outlineMapSet["width"] = 2.0f;
-  label.SetProperty( TextLabel::Property::OUTLINE, outlineMapSet );
+  label.SetProperty(TextLabel::Property::OUTLINE, outlineMapSet);
 
-  outlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::OUTLINE );
-  DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet ), true, TEST_LOCATION );
+  outlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::OUTLINE);
+  DALI_TEST_EQUALS(outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(outlineMapGet, outlineMapSet), true, TEST_LOCATION);
 
   outlineMapSet.Clear();
   outlineMapSet[Toolkit::DevelText::Outline::Property::COLOR] = Color::BLUE;
   outlineMapSet[Toolkit::DevelText::Outline::Property::WIDTH] = 3.0f;
-  label.SetProperty( TextLabel::Property::OUTLINE, outlineMapSet );
+  label.SetProperty(TextLabel::Property::OUTLINE, outlineMapSet);
 
-  outlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::OUTLINE );
-  DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION );
-  std::vector<std::string> outlineIndicesConversionTable = { "color", "width" };
-  DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet, outlineIndicesConversionTable ), true, TEST_LOCATION );
+  outlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::OUTLINE);
+  DALI_TEST_EQUALS(outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION);
+  std::vector<std::string> outlineIndicesConversionTable = {"color", "width"};
+  DALI_TEST_EQUALS(DaliTestCheckMaps(outlineMapGet, outlineMapSet, outlineIndicesConversionTable), true, TEST_LOCATION);
 
   // Check the background property
   Property::Map backgroundMapSet;
   Property::Map backgroundMapGet;
 
   backgroundMapSet["enable"] = true;
-  backgroundMapSet["color"] = Color::RED;
-  label.SetProperty( DevelTextLabel::Property::BACKGROUND, backgroundMapSet );
+  backgroundMapSet["color"]  = Color::RED;
+  label.SetProperty(DevelTextLabel::Property::BACKGROUND, backgroundMapSet);
+
+  backgroundMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::BACKGROUND);
+  DALI_TEST_EQUALS(backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(backgroundMapGet, backgroundMapSet), true, TEST_LOCATION);
+
+  // Check the transparent background property for coverage
+  backgroundMapSet.Clear();
+  backgroundMapSet["enable"] = true;
+  backgroundMapSet["color"]  = Color::TRANSPARENT;
+  label.SetProperty(DevelTextLabel::Property::BACKGROUND, backgroundMapSet);
+
+  application.SendNotification();
+  application.Render();
 
-  backgroundMapGet = label.GetProperty<Property::Map>( DevelTextLabel::Property::BACKGROUND );
-  DALI_TEST_EQUALS( backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( backgroundMapGet, backgroundMapSet ), true, TEST_LOCATION );
+  backgroundMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::BACKGROUND);
+  DALI_TEST_EQUALS(backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(backgroundMapGet, backgroundMapSet), true, TEST_LOCATION);
 
   backgroundMapSet.Clear();
   backgroundMapSet[Toolkit::DevelText::Background::Property::ENABLE] = true;
-  backgroundMapSet[Toolkit::DevelText::Background::Property::COLOR] = Color::GREEN;
-  label.SetProperty( DevelTextLabel::Property::BACKGROUND, backgroundMapSet );
+  backgroundMapSet[Toolkit::DevelText::Background::Property::COLOR]  = Color::GREEN;
+  label.SetProperty(DevelTextLabel::Property::BACKGROUND, backgroundMapSet);
 
-  backgroundMapGet = label.GetProperty<Property::Map>( DevelTextLabel::Property::BACKGROUND );
-  DALI_TEST_EQUALS( backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION );
-  std::vector<std::string> backgroundIndicesConversionTable = { "enable", "color" };
-  DALI_TEST_EQUALS( DaliTestCheckMaps( backgroundMapGet, backgroundMapSet, backgroundIndicesConversionTable ), true, TEST_LOCATION );
+  backgroundMapGet = label.GetProperty<Property::Map>(DevelTextLabel::Property::BACKGROUND);
+  DALI_TEST_EQUALS(backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION);
+  std::vector<std::string> backgroundIndicesConversionTable = {"enable", "color"};
+  DALI_TEST_EQUALS(DaliTestCheckMaps(backgroundMapGet, backgroundMapSet, backgroundIndicesConversionTable), true, TEST_LOCATION);
 
   // Check the pixel size of font
-  label.SetProperty( TextLabel::Property::PIXEL_SIZE, 20.f );
-  DALI_TEST_EQUALS( label.GetProperty<float>( TextLabel::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::PIXEL_SIZE, 20.f);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::PIXEL_SIZE), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   // Check the ellipsis property
-  DALI_TEST_CHECK( label.GetProperty<bool>( TextLabel::Property::ELLIPSIS ) );
-  label.SetProperty( TextLabel::Property::ELLIPSIS, false );
-  DALI_TEST_CHECK( !label.GetProperty<bool>( TextLabel::Property::ELLIPSIS ) );
+  DALI_TEST_CHECK(label.GetProperty<bool>(TextLabel::Property::ELLIPSIS));
+  label.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  DALI_TEST_CHECK(!label.GetProperty<bool>(TextLabel::Property::ELLIPSIS));
 
   // Check the layout direction property
-  label.SetProperty( Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT );
-  DALI_TEST_EQUALS( label.GetProperty< int >( Actor::Property::LAYOUT_DIRECTION ), static_cast< int >( LayoutDirection::RIGHT_TO_LEFT ), TEST_LOCATION );
+  label.SetProperty(Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT);
+  DALI_TEST_EQUALS(label.GetProperty<int>(Actor::Property::LAYOUT_DIRECTION), static_cast<int>(LayoutDirection::RIGHT_TO_LEFT), TEST_LOCATION);
 
   // Check the line size property
-  DALI_TEST_EQUALS( label.GetProperty<float>( DevelTextLabel::Property::MIN_LINE_SIZE ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
-  label.SetProperty( DevelTextLabel::Property::MIN_LINE_SIZE, 50.f );
-  DALI_TEST_EQUALS( label.GetProperty<float>( DevelTextLabel::Property::MIN_LINE_SIZE ), 50.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(label.GetProperty<float>(DevelTextLabel::Property::MIN_LINE_SIZE), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  label.SetProperty(DevelTextLabel::Property::MIN_LINE_SIZE, 50.f);
+  DALI_TEST_EQUALS(label.GetProperty<float>(DevelTextLabel::Property::MIN_LINE_SIZE), 50.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check Remove Front/Back Inset Property
+  DALI_TEST_CHECK(label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_FRONT_INSET));
+  label.SetProperty(DevelTextLabel::Property::REMOVE_FRONT_INSET, false);
+  DALI_TEST_CHECK(!label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_FRONT_INSET));
+
+  DALI_TEST_CHECK(label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_BACK_INSET));
+  label.SetProperty(DevelTextLabel::Property::REMOVE_BACK_INSET, false);
+  DALI_TEST_CHECK(!label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_BACK_INSET));
 
   application.SendNotification();
   application.Render();
@@ -728,35 +1044,41 @@ int UtcDaliToolkitTextlabelAtlasRenderP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelAtlasRenderP");
   TextLabel label = TextLabel::New("Test Text");
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   // Turn on all the effects
-  label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-  label.SetProperty( TextLabel::Property::MULTI_LINE, true );
+  label.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER");
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
 
   Property::Map underlineMap;
-  underlineMap.Insert( "enable", true );
-  underlineMap.Insert( "color", Color::RED );
-  label.SetProperty( TextLabel::Property::UNDERLINE, underlineMap );
+  underlineMap.Insert("enable", true);
+  underlineMap.Insert("color", Color::RED);
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMap);
 
   Property::Map shadowMap;
-  shadowMap.Insert( "color", Color::BLUE );
-  shadowMap.Insert( "offset", Vector2( 1.0f, 1.0f ) );
-  label.SetProperty( TextLabel::Property::SHADOW, shadowMap );
+  shadowMap.Insert("color", Color::BLUE);
+  shadowMap.Insert("offset", Vector2(1.0f, 1.0f));
+  label.SetProperty(TextLabel::Property::SHADOW, shadowMap);
+
+  Property::Map strikethroughMap;
+  strikethroughMap.Insert("enable", true);
+  strikethroughMap.Insert("color", Color::GREEN);
+  strikethroughMap.Insert("height", 2.0f);
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMap);
 
   try
   {
     // Render some text with the shared atlas backend
-    label.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS );
+    label.SetProperty(DevelTextLabel::Property::RENDERING_BACKEND, DevelText::RENDERING_SHARED_ATLAS);
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -764,11 +1086,11 @@ int UtcDaliToolkitTextlabelAtlasRenderP(void)
   try
   {
     // Render some text with the shared atlas backend
-    label.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, DevelText::RENDERING_VECTOR_BASED );
+    label.SetProperty(DevelTextLabel::Property::RENDERING_BACKEND, DevelText::RENDERING_VECTOR_BASED);
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -780,19 +1102,20 @@ int UtcDaliToolkitTextLabelLanguagesP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelLanguagesP");
   TextLabel label = TextLabel::New();
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
-  const std::string scripts( " привет мир, γειά σου Κόσμε, Hello world, مرحبا بالعالم, שלום עולם, "
-                             "բարեւ աշխարհը, მსოფლიოში, 안녕하세요, 你好世界, ひらがな, カタカナ, "
-                             "ওহে বিশ্ব, မင်္ဂလာပါကမ္ဘာလောက, हैलो वर्ल्ड, હેલો વર્લ્ડ, ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ ਦੁਨਿਆ, ಹಲೋ ವರ್ಲ್ಡ್, "
-                             "ഹലോ വേൾഡ്, ଓଡ଼ିଆ, හෙලෝ වර්ල්ඩ්, ஹலோ உலகம், హలో వరల్డ్, "
-                             "ສະບາຍດີໂລກ, สวัสดีโลก, ជំរាបសួរពិភពលោក, "
-                             "\xF0\x9F\x98\x81 \xF0\x9F\x98\x82 \xF0\x9F\x98\x83 \xF0\x9F\x98\x84." ); // these characters on the last line are emojis.
+  const std::string scripts(
+    " привет мир, γειά σου Κόσμε, Hello world, مرحبا بالعالم, שלום עולם, "
+    "բարեւ աշխարհը, მსოფლიოში, 안녕하세요, 你好世界, ひらがな, カタカナ, "
+    "ওহে বিশ্ব, မင်္ဂလာပါကမ္ဘာလောက, हैलो वर्ल्ड, હેલો વર્લ્ડ, ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ ਦੁਨਿਆ, ಹಲೋ ವರ್ಲ್ಡ್, "
+    "ഹലോ വേൾഡ്, ଓଡ଼ିଆ, හෙලෝ වර්ල්ඩ්, ஹலோ உலகம், హలో వరల్డ్, "
+    "ສະບາຍດີໂລກ, สวัสดีโลก, ជំរាបសួរពិភពលោក, "
+    "\xF0\x9F\x98\x81 \xF0\x9F\x98\x82 \xF0\x9F\x98\x83 \xF0\x9F\x98\x84."); // these characters on the last line are emojis.
 
-  label.SetProperty( TextLabel::Property::TEXT, scripts );
-  DALI_TEST_EQUALS( label.GetProperty<std::string>( TextLabel::Property::TEXT ), scripts, TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, scripts);
+  DALI_TEST_EQUALS(label.GetProperty<std::string>(TextLabel::Property::TEXT), scripts, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
@@ -805,37 +1128,81 @@ int UtcDaliToolkitTextLabelEmojisP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelLanguagesP");
   TextLabel label = TextLabel::New();
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
   TextAbstraction::FontDescription fontDescription;
-  fontDescription.path = pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf";
+  fontDescription.path   = pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf";
   fontDescription.family = "BreezeColorEmoji";
-  fontDescription.width = TextAbstraction::FontWidth::NONE;
+  fontDescription.width  = TextAbstraction::FontWidth::NONE;
   fontDescription.weight = TextAbstraction::FontWeight::NORMAL;
-  fontDescription.slant = TextAbstraction::FontSlant::NONE;
+  fontDescription.slant  = TextAbstraction::FontSlant::NONE;
 
-  fontClient.GetFontId( fontDescription, EMOJI_FONT_SIZE );
+  fontClient.GetFontId(fontDescription, EMOJI_FONT_SIZE);
 
   const std::string emojis = "<font family='BreezeColorEmoji' size='60'>\xF0\x9F\x98\x81 \xF0\x9F\x98\x82 \xF0\x9F\x98\x83 \xF0\x9F\x98\x84</font>";
-  label.SetProperty( TextLabel::Property::ENABLE_MARKUP, true );
-  label.SetProperty( TextLabel::Property::TEXT, emojis );
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, emojis);
 
   Property::Map shadowMap;
-  shadowMap.Insert( "color", "green" );
-  shadowMap.Insert( "offset", "2 2" );
-  label.SetProperty( TextLabel::Property::SHADOW, shadowMap );
+  shadowMap.Insert("color", "green");
+  shadowMap.Insert("offset", "2 2");
+  label.SetProperty(TextLabel::Property::SHADOW, shadowMap);
+
+  application.SendNotification();
+  application.Render();
+
+  // EMOJI + ZWJ + EMOJI case for coverage.
+  const std::string emojiWithZWJ = "&#x1f469;&#x200d;&#x1f52c;";
+  label.SetProperty(TextLabel::Property::TEXT, emojiWithZWJ);
 
   application.SendNotification();
   application.Render();
 
+  // EMOJI Sequences case for coverage.
+  std::string emojiSequences =
+    "Glyphs not included in the font &#xf01a;&#xf01b;&#xf01c;&#xf01d;&#xf01e;&#xf01f;\n"   //case for coverage when glyph is not included in the font
+    "Text VS15 &#x262a;&#xfe0e;\n"                                                         //text presentation sequence and selector
+    "Color VS16 &#x262a;&#xfe0f;\n"                                                        //emoji presentation sequence and selector
+    "Default &#x262a; \n"                                                                  //default presentation
+    "FamilyManWomanGirlBoy &#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;\n" // emoji multi zwj sequence
+    "WomanScientist &#x1f469;&#x200d;&#x1f52c;\n"                                          // emoji zwj sequence
+    "WomanScientistLightSkinTone&#x1F469;&#x1F3FB;&#x200D;&#x1F52C; \n"                    // emoji modifier sequence: skin tone & JWZ
+    "LeftRightArrowText&#x2194;&#xfe0e;\n"                                                 // text presentation sequence and selector
+    "LeftRightArrowEmoji&#x2194;&#xfe0f;\n"                                                // emoji presentation sequence and selector
+    "SouthKoreaFlag&#x1f1f0;&#x1f1f7;\n"                                                   // emoji flag sequence
+    "JordanFlag&#x1f1ef;&#x1f1f4;\n"                                                       // emoji flag sequence
+    "EnglandFlag&#x1F3F4;&#xE0067;&#xE0062;&#xE0065;&#xE006E;&#xE0067;&#xE007F;\n"         // emoji tag sequence like England flag
+    "Runner &#x1f3c3;&#x200d;&#x27a1;&#xfe0f; \n"
+    "VictoryHandMediumLightSkinTone:&#x270C;&#xFE0F;&#x1F3FC;\n"                                                                // emoji modifier sequence: skin tone
+    "RainbowFlag:&#x1F3F3;&#xFE0F;&#x200D;&#x1F308; \n"                                                                         // emoji zwj sequence: Rainbow Flag
+    "keycap# &#x0023;&#xFE0F;&#x20E3; \n"                                                                                       // fully-qualified  emoji keycap sequence
+    "keycap#_text &#x0023;&#x20E3; \n"                                                                                          // unqualified emoji keycap sequence
+    "keycap3 &#x0033;&#xfe0f;&#x20e3; \n"                                                                                       // fully-qualified  emoji keycap sequence
+    "keycap3_text &#x0033;&#x20e3; \n"                                                                                          // unqualified emoji keycap sequence
+    "two adjacent glyphs &#x262a;&#xfe0f;&#xfe0f;&#xfe0f;&#x262a;&#xfe0f;\n"                                                    // This line should be rendered as two adjacent glyphs
+    "Digit 8&#xfe0f; 8&#xfe0e; 8\n"                                                                                             // should be rendered according to selector
+    "Surfing Medium Skin Female:  &#x1f3c4;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;\n"                                                 // Person Surfing + Medium Skin Tone +? Zero Width Joiner + Female Sign
+    "SYMBOLS_NSLCL variation selector: &#x1f170;&#xfe0f;&#x1f171;&#xfe0f;&#x1f172;&#xfe0e;&#x1f173;&#xfe0e;&#x1f174;&#xfe0e;\n" // 1F170 ~ 1F174 with variation selector, text vs emoji
+    "SYMBOLS_NSLCL with VS15: &#x1f170;&#xfe0e;&#x1f171;&#xfe0e;&#x1f172;&#xfe0e;&#x1f173;&#xfe0e;&#x1f174;&#xfe0e;\n"          // 1F170 ~ 1F174 with VS15
+    "SYMBOLS_NSLCL with VS16: &#x1f170;&#xfe0f;&#x1f171;&#xfe0f;&#x1f172;&#xfe0f;&#x1f173;&#xfe0f;&#x1f174;&#xfe0f;\n"          // 1F170 ~ 1F174 with VS16
+
+    ;
+
+  label.SetProperty(TextLabel::Property::TEXT, emojiSequences);
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::ELLIPSIS, false);
+
+  application.SendNotification();
+  application.Render();
   END_TEST;
 }
 
@@ -844,51 +1211,48 @@ int UtcDaliToolkitTextlabelScrollingP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextLabelScrollingP");
   TextLabel labelImmediate = TextLabel::New("Some text to scroll");
-  TextLabel labelFinished = TextLabel::New("مرحبا بالعالم");
+  TextLabel labelFinished  = TextLabel::New("مرحبا بالعالم");
 
-  DALI_TEST_CHECK( labelImmediate );
-  DALI_TEST_CHECK( labelFinished );
+  DALI_TEST_CHECK(labelImmediate);
+  DALI_TEST_CHECK(labelFinished);
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
-  application.GetScene().Add( labelImmediate );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  application.GetScene().Add(labelImmediate);
   // Turn on all the effects
-  labelImmediate.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelImmediate.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelImmediate.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelImmediate.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelImmediate.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
+  labelImmediate.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelImmediate.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelImmediate.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelImmediate.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelImmediate.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE);
 
-  application.GetScene().Add( labelFinished );
+  application.GetScene().Add(labelFinished);
   // Turn on all the effects
-  labelFinished.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelFinished.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelFinished.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelFinished.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelFinished.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP );
-
-
+  labelFinished.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelFinished.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelFinished.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelFinished.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelFinished.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP);
 
   try
   {
     // Render some text with the shared atlas backend
-    labelImmediate.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-    labelFinished.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+    labelImmediate.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    labelFinished.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
 
-    labelImmediate.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
-    labelFinished.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
+    labelImmediate.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
+    labelFinished.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
 
-    labelImmediate.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-    labelFinished.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+    labelImmediate.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    labelFinished.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
     application.SendNotification();
     application.Render();
 
-    labelImmediate.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
-    labelFinished.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
+    labelImmediate.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
+    labelFinished.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
     application.SendNotification();
     application.Render();
-
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -899,46 +1263,45 @@ int UtcDaliToolkitTextlabelScrollingP(void)
 int UtcDaliToolkitTextlabelScrollingCenterAlignP(void)
 {
   ToolkitTestApplication application;
-  TextLabel labelShort = TextLabel::New("Some text to scroll");
-  TextLabel labelLong = TextLabel::New("Some text to scroll that is greater than the width of the text. The quick brown fox jumps over the lazy dog. Hello World, we meet again!");
+  TextLabel              labelShort = TextLabel::New("Some text to scroll");
+  TextLabel              labelLong  = TextLabel::New("Some text to scroll that is greater than the width of the text. The quick brown fox jumps over the lazy dog. Hello World, we meet again!");
 
-  DALI_TEST_CHECK( labelShort );
-  DALI_TEST_CHECK( labelLong );
+  DALI_TEST_CHECK(labelShort);
+  DALI_TEST_CHECK(labelLong);
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
-  application.GetScene().Add( labelShort );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  application.GetScene().Add(labelShort);
   // Turn on all the effects
-  labelShort.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelShort.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
-
-  application.GetScene().Add( labelLong );
+  labelShort.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelShort.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER");
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE);
+
+  application.GetScene().Add(labelLong);
   // Turn on all the effects
-  labelLong.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelLong.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP );
+  labelLong.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelLong.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER");
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP);
 
   try
   {
     // Render some text with the shared atlas backend
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
     application.SendNotification();
     application.Render();
 
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
     application.SendNotification();
     application.Render();
-
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -949,46 +1312,45 @@ int UtcDaliToolkitTextlabelScrollingCenterAlignP(void)
 int UtcDaliToolkitTextlabelScrollingCenterAlignRTLP(void)
 {
   ToolkitTestApplication application;
-  TextLabel labelShort = TextLabel::New("مرحبا بالعالم");
-  TextLabel labelLong = TextLabel::New("لكن لا بد أن أوضح لك أن كل هذه الأفكار المغلوطة حول استنكار  النشوة وتمجيد الألم نشأت بالفعل، وسأعرض لك التفاصيل لتكتشف حقيقة وأساس تلك السعادة البشرية، فلا أحد يرفض أو يكره أو يتجنب الشعور بالسعادة، ولكن بفضل هؤلاء الأشخاص الذين لا يدركون بأن السعادة لا بد أن نستشعرها بصورة أكثر عقلانية ومنطقية فيعرضهم هذا لمواجهة الظروف الأليمة، وأكرر بأنه لا يوجد من يرغب في الحب ونيل المنال ويتلذذ بالآلام، الألم هو الألم ولكن نتيجة لظروف ما قد تكمن السعاده فيما نتحمله من كد وأسي");
+  TextLabel              labelShort = TextLabel::New("مرحبا بالعالم");
+  TextLabel              labelLong  = TextLabel::New("لكن لا بد أن أوضح لك أن كل هذه الأفكار المغلوطة حول استنكار  النشوة وتمجيد الألم نشأت بالفعل، وسأعرض لك التفاصيل لتكتشف حقيقة وأساس تلك السعادة البشرية، فلا أحد يرفض أو يكره أو يتجنب الشعور بالسعادة، ولكن بفضل هؤلاء الأشخاص الذين لا يدركون بأن السعادة لا بد أن نستشعرها بصورة أكثر عقلانية ومنطقية فيعرضهم هذا لمواجهة الظروف الأليمة، وأكرر بأنه لا يوجد من يرغب في الحب ونيل المنال ويتلذذ بالآلام، الألم هو الألم ولكن نتيجة لظروف ما قد تكمن السعاده فيما نتحمله من كد وأسي");
 
-  DALI_TEST_CHECK( labelShort );
-  DALI_TEST_CHECK( labelLong );
+  DALI_TEST_CHECK(labelShort);
+  DALI_TEST_CHECK(labelLong);
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
-  application.GetScene().Add( labelShort );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  application.GetScene().Add(labelShort);
   // Turn on all the effects
-  labelShort.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelShort.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
-
-  application.GetScene().Add( labelLong );
+  labelShort.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelShort.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER");
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE);
+
+  application.GetScene().Add(labelLong);
   // Turn on all the effects
-  labelLong.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelLong.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP );
+  labelLong.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelLong.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER");
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP);
 
   try
   {
     // Render some text with the shared atlas backend
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
     application.SendNotification();
     application.Render();
 
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
     application.SendNotification();
     application.Render();
-
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -999,46 +1361,45 @@ int UtcDaliToolkitTextlabelScrollingCenterAlignRTLP(void)
 int UtcDaliToolkitTextlabelScrollingEndAlignP(void)
 {
   ToolkitTestApplication application;
-  TextLabel labelShort = TextLabel::New("Some text to scroll");
-  TextLabel labelLong = TextLabel::New("Some text to scroll that is greater than the width of the text. The quick brown fox jumps over the lazy dog. Hello World, we meet again!");
+  TextLabel              labelShort = TextLabel::New("Some text to scroll");
+  TextLabel              labelLong  = TextLabel::New("Some text to scroll that is greater than the width of the text. The quick brown fox jumps over the lazy dog. Hello World, we meet again!");
 
-  DALI_TEST_CHECK( labelShort );
-  DALI_TEST_CHECK( labelLong );
+  DALI_TEST_CHECK(labelShort);
+  DALI_TEST_CHECK(labelLong);
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
-  application.GetScene().Add( labelShort );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  application.GetScene().Add(labelShort);
   // Turn on all the effects
-  labelShort.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelShort.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "END" );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
-
-  application.GetScene().Add( labelLong );
+  labelShort.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelShort.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "END");
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE);
+
+  application.GetScene().Add(labelLong);
   // Turn on all the effects
-  labelLong.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelLong.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "END" );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP );
+  labelLong.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelLong.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "END");
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP);
 
   try
   {
     // Render some text with the shared atlas backend
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
     application.SendNotification();
     application.Render();
 
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
     application.SendNotification();
     application.Render();
-
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -1049,46 +1410,45 @@ int UtcDaliToolkitTextlabelScrollingEndAlignP(void)
 int UtcDaliToolkitTextlabelScrollingEndAlignRTLP(void)
 {
   ToolkitTestApplication application;
-  TextLabel labelShort = TextLabel::New("مرحبا بالعالم");
-  TextLabel labelLong = TextLabel::New("لكن لا بد أن أوضح لك أن كل هذه الأفكار المغلوطة حول استنكار  النشوة وتمجيد الألم نشأت بالفعل، وسأعرض لك التفاصيل لتكتشف حقيقة وأساس تلك السعادة البشرية، فلا أحد يرفض أو يكره أو يتجنب الشعور بالسعادة، ولكن بفضل هؤلاء الأشخاص الذين لا يدركون بأن السعادة لا بد أن نستشعرها بصورة أكثر عقلانية ومنطقية فيعرضهم هذا لمواجهة الظروف الأليمة، وأكرر بأنه لا يوجد من يرغب في الحب ونيل المنال ويتلذذ بالآلام، الألم هو الألم ولكن نتيجة لظروف ما قد تكمن السعاده فيما نتحمله من كد وأسي");
+  TextLabel              labelShort = TextLabel::New("مرحبا بالعالم");
+  TextLabel              labelLong  = TextLabel::New("لكن لا بد أن أوضح لك أن كل هذه الأفكار المغلوطة حول استنكار  النشوة وتمجيد الألم نشأت بالفعل، وسأعرض لك التفاصيل لتكتشف حقيقة وأساس تلك السعادة البشرية، فلا أحد يرفض أو يكره أو يتجنب الشعور بالسعادة، ولكن بفضل هؤلاء الأشخاص الذين لا يدركون بأن السعادة لا بد أن نستشعرها بصورة أكثر عقلانية ومنطقية فيعرضهم هذا لمواجهة الظروف الأليمة، وأكرر بأنه لا يوجد من يرغب في الحب ونيل المنال ويتلذذ بالآلام، الألم هو الألم ولكن نتيجة لظروف ما قد تكمن السعاده فيما نتحمله من كد وأسي");
 
-  DALI_TEST_CHECK( labelShort );
-  DALI_TEST_CHECK( labelLong );
+  DALI_TEST_CHECK(labelShort);
+  DALI_TEST_CHECK(labelLong);
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
-  application.GetScene().Add( labelShort );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  application.GetScene().Add(labelShort);
   // Turn on all the effects
-  labelShort.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelShort.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "END" );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelShort.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
-
-  application.GetScene().Add( labelLong );
+  labelShort.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelShort.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "END");
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelShort.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE);
+
+  application.GetScene().Add(labelLong);
   // Turn on all the effects
-  labelLong.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  labelLong.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "END" );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
-  labelLong.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP );
+  labelLong.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  labelLong.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "END");
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
+  labelLong.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP);
 
   try
   {
     // Render some text with the shared atlas backend
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
     application.SendNotification();
     application.Render();
 
-    labelShort.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
-    labelLong.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
+    labelShort.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
+    labelLong.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
     application.SendNotification();
     application.Render();
-
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -1101,47 +1461,46 @@ int UtcDaliToolkitTextlabelScrollingInterruptedP(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextlabelScrollingInterruptedP");
   TextLabel label = TextLabel::New("Some text to scroll");
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
-  application.GetScene().Add( label );
-  label.SetProperty( Actor::Property::SIZE, Vector2( 360.0f, 20.f ) );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  application.GetScene().Add(label);
+  label.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 20.f));
   // Turn on all the effects
-  label.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
+  label.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
 
   // Render the text.
   application.SendNotification();
   application.Render();
 
   unsigned int actorCount1 = label.GetChildCount();
-  tet_printf("Initial actor count is(%d)\n", actorCount1 );
+  tet_printf("Initial actor count is(%d)\n", actorCount1);
 
   try
   {
     // Render some text with the shared atlas backend
-    label.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+    label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
     application.SendNotification();
     application.Render(2000);
 
     unsigned int actorCount1 = label.GetChildCount();
-    tet_printf("Actor count after scrolling is(%d)\n", actorCount1 );
+    tet_printf("Actor count after scrolling is(%d)\n", actorCount1);
 
-    label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::RED );
+    label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::RED);
 
     // Render the text.
     application.SendNotification();
     application.Render();
 
     unsigned int actorCount2 = label.GetChildCount();
-    tet_printf("After changing color the actor count is(%d)\n", actorCount2 );
-
-    DALI_TEST_EQUALS( actorCount1, actorCount2, TEST_LOCATION );
+    tet_printf("After changing color the actor count is(%d)\n", actorCount2);
 
+    DALI_TEST_EQUALS(actorCount1, actorCount2, TEST_LOCATION);
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -1155,27 +1514,65 @@ int UtcDaliToolkitTextlabelScrollingN(void)
   tet_infoline(" UtcDaliToolkitTextlabelScrollingN");
 
   TextLabel label = TextLabel::New("Some text to scroll");
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // The text scrolling works only on single line text.
-  label.SetProperty( TextLabel::Property::MULTI_LINE, true );
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
 
   // Turn on all the effects.
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
 
   // Enable the auto scrolling effect.
-  label.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
+  label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
 
   // The auto scrolling shouldn't be enabled.
-  const bool enabled = label.GetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL ).Get<bool>();
-  DALI_TEST_CHECK( !enabled );
+  const bool enabled = label.GetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL).Get<bool>();
+  DALI_TEST_CHECK(!enabled);
+
+  label.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 1);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 9999.0f);
+  label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+
+  try
+  {
+    // Render the text.
+    application.SendNotification();
+    application.Render(1000);
+
+    application.GetScene().Remove(label);
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(!label.GetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL).Get<bool>());
+
+    label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    application.GetScene().Add(label);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(label.GetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL).Get<bool>());
+
+    label.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, (Toolkit::TextLabel::AutoScrollStopMode::Type)2); // invalid type
+    label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
+
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(label.GetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL).Get<bool>());
+  }
+  catch(...)
+  {
+    tet_result(TET_FAIL);
+  }
 
   END_TEST;
 }
@@ -1186,38 +1583,38 @@ int UtcDaliToolkitTextlabelScrollingWithEllipsis(void)
   tet_infoline(" UtcDaliToolkitTextlabelScrollingWithEllipsis");
 
   TextLabel label = TextLabel::New("Some text to scroll");
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   // Turn on all the effects.
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 );
-  label.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f );
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 50.0f);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
+  label.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f);
 
   try
   {
     // Enable the auto scrolling effect.
-    label.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true );
-    label.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
+    label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true);
+    label.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE);
 
     // Disable the ellipsis
-    label.SetProperty( TextLabel::Property::ELLIPSIS, false );
+    label.SetProperty(TextLabel::Property::ELLIPSIS, false);
 
     // Render the text.
     application.SendNotification();
     application.Render();
 
     // Stop auto scrolling
-    label.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false );
+    label.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, false);
 
     // Check the ellipsis property
-    DALI_TEST_CHECK( !label.GetProperty<bool>( TextLabel::Property::ELLIPSIS ) );
+    DALI_TEST_CHECK(!label.GetProperty<bool>(TextLabel::Property::ELLIPSIS));
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -1231,17 +1628,17 @@ int UtcDaliToolkitTextlabelEllipsis(void)
   tet_infoline(" UtcDaliToolkitTextlabelEllipsis");
 
   TextLabel label = TextLabel::New("Hello world");
-  DALI_TEST_CHECK( label );
+  DALI_TEST_CHECK(label);
 
   // Avoid a crash when core load gl resources.
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   // Turn on all the effects
-  label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  label.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  label.SetProperty( Actor::Property::SIZE, Vector2( 360.0f, 10.f ) );
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  label.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 10.f));
 
   try
   {
@@ -1249,14 +1646,14 @@ int UtcDaliToolkitTextlabelEllipsis(void)
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
 
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world                                        " );
-  label.SetProperty( DevelTextLabel::Property::IGNORE_SPACES_AFTER_TEXT, false );
-  label.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 10.f ) );
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world                                        ");
+  label.SetProperty(DevelTextLabel::Property::IGNORE_SPACES_AFTER_TEXT, false);
+  label.SetProperty(Actor::Property::SIZE, Vector2(400.0f, 10.f));
 
   try
   {
@@ -1264,15 +1661,14 @@ int UtcDaliToolkitTextlabelEllipsis(void)
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
 
-
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world" );
-  label.SetProperty( DevelTextLabel::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, true );
-  label.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 10.f ) );
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world");
+  label.SetProperty(DevelTextLabel::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, true);
+  label.SetProperty(Actor::Property::SIZE, Vector2(400.0f, 10.f));
 
   try
   {
@@ -1280,7 +1676,7 @@ int UtcDaliToolkitTextlabelEllipsis(void)
     application.SendNotification();
     application.Render();
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -1293,54 +1689,52 @@ int UtcDaliToolkitTextlabelTextWrapMode(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextlabelTextWarpMode");
 
-  int lineCount =0 ;
+  int lineCount = 0;
 
   TextLabel label = TextLabel::New();
-  label.SetProperty( Actor::Property::SIZE, Vector2( 300.0f, 300.f ) );
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world Hello world" );
-  label.SetProperty( TextLabel::Property::MULTI_LINE, true );
-
-
+  label.SetProperty(Actor::Property::SIZE, Vector2(300.0f, 300.f));
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world Hello world");
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
 
   //label.SetProperty( TextLabel::Property::POINT_SIZE, 18 );
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
-  label.SetProperty( TextLabel::Property::LINE_WRAP_MODE, "WORD" );
-  DALI_TEST_EQUALS( label.GetProperty< int >( TextLabel::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::WORD ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE, "WORD");
+  DALI_TEST_EQUALS(label.GetProperty<int>(TextLabel::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::WORD), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  label.GetProperty<int>( TextLabel::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 2, TEST_LOCATION );
+  lineCount = label.GetProperty<int>(TextLabel::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 2, TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::LINE_WRAP_MODE, "CHARACTER" );
-  DALI_TEST_EQUALS( label.GetProperty< int >( TextLabel::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::CHARACTER ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE, "CHARACTER");
+  DALI_TEST_EQUALS(label.GetProperty<int>(TextLabel::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::CHARACTER), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  label.SetProperty( TextLabel::Property::LINE_WRAP_MODE, Text::LineWrap::WORD );
-  DALI_TEST_EQUALS( label.GetProperty< int >( TextLabel::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::WORD ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE, Text::LineWrap::WORD);
+  DALI_TEST_EQUALS(label.GetProperty<int>(TextLabel::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::WORD), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  label.GetProperty<int>( TextLabel::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 2, TEST_LOCATION );
+  lineCount = label.GetProperty<int>(TextLabel::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 2, TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::LINE_WRAP_MODE, Text::LineWrap::CHARACTER );
-  DALI_TEST_EQUALS( label.GetProperty< int >( TextLabel::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::CHARACTER ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE, Text::LineWrap::CHARACTER);
+  DALI_TEST_EQUALS(label.GetProperty<int>(TextLabel::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::CHARACTER), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  label.GetProperty<int>( TextLabel::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 2, TEST_LOCATION );
+  lineCount = label.GetProperty<int>(TextLabel::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 2, TEST_LOCATION);
 
-  tet_infoline( "Ensure invalid string does not change wrapping mode" );
-  label.SetProperty( TextLabel::Property::LINE_WRAP_MODE, "InvalidWrapMode" );
-  DALI_TEST_EQUALS( label.GetProperty< int >( TextLabel::Property::LINE_WRAP_MODE ), static_cast< int >( Text::LineWrap::CHARACTER ), TEST_LOCATION );
+  tet_infoline("Ensure invalid string does not change wrapping mode");
+  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE, "InvalidWrapMode");
+  DALI_TEST_EQUALS(label.GetProperty<int>(TextLabel::Property::LINE_WRAP_MODE), static_cast<int>(Text::LineWrap::CHARACTER), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1350,59 +1744,59 @@ int UtcDaliToolkitTextLabelColorComponents(void)
   ToolkitTestApplication application;
 
   TextLabel label = TextLabel::New();
-  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::RED );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_RED ),   1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_GREEN ), 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_BLUE ),  0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_ALPHA ), 1.0f, TEST_LOCATION );
-
-  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_RED ),   0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_GREEN ), 1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_BLUE ),  0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_ALPHA ), 1.0f, TEST_LOCATION );
-
-  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLUE );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_RED ),   0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_GREEN ), 0.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_BLUE ),  1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_ALPHA ), 1.0f, TEST_LOCATION );
-
-  label.SetProperty( TextLabel::Property::TEXT_COLOR_ALPHA, 0.6f );
-  DALI_TEST_EQUALS( label.GetProperty< float >( TextLabel::Property::TEXT_COLOR_ALPHA ), 0.6f, TEST_LOCATION );
-  DALI_TEST_EQUALS( label.GetProperty< Vector4 >( TextLabel::Property::TEXT_COLOR ), Vector4( 0.0f, 0.0f, 1.0f, 0.6f ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::RED);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_RED), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_GREEN), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_BLUE), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_ALPHA), 1.0f, TEST_LOCATION);
+
+  label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::GREEN);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_RED), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_GREEN), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_BLUE), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_ALPHA), 1.0f, TEST_LOCATION);
+
+  label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_RED), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_GREEN), 0.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_BLUE), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_ALPHA), 1.0f, TEST_LOCATION);
+
+  label.SetProperty(TextLabel::Property::TEXT_COLOR_ALPHA, 0.6f);
+  DALI_TEST_EQUALS(label.GetProperty<float>(TextLabel::Property::TEXT_COLOR_ALPHA), 0.6f, TEST_LOCATION);
+  DALI_TEST_EQUALS(label.GetProperty<Vector4>(TextLabel::Property::TEXT_COLOR), Vector4(0.0f, 0.0f, 1.0f, 0.6f), TEST_LOCATION);
 
   // Test a transparent text - Rendering should be skipped.
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world Hello world" );
-  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLUE );
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world Hello world");
+  label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::BLUE);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   TraceCallStack& drawTrace = application.GetGlAbstraction().GetDrawTrace();
-  drawTrace.Enable( true );
+  drawTrace.Enable(true);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( drawTrace.FindMethod( "DrawArrays" ), true, TEST_LOCATION );  // Should be rendered
+  DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION); // Should be rendered
 
-  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::TRANSPARENT );
+  label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::TRANSPARENT);
 
   drawTrace.Reset();
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( drawTrace.FindMethod( "DrawArrays" ), false, TEST_LOCATION ); // Rendering should be skipped
+  DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), false, TEST_LOCATION); // Rendering should be skipped
 
-  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::RED );
+  label.SetProperty(TextLabel::Property::TEXT_COLOR, Color::RED);
 
   drawTrace.Reset();
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( drawTrace.FindMethod( "DrawArrays" ), true, TEST_LOCATION ); // Should be rendered again
+  DALI_TEST_EQUALS(drawTrace.FindMethod("DrawArrays"), true, TEST_LOCATION); // Should be rendered again
 
   END_TEST;
 }
@@ -1413,65 +1807,65 @@ int UtcDaliToolkitTextlabelTextStyle01(void)
   tet_infoline(" UtcDaliToolkitTextlabelTextStyle Setting Outline after Shadow");
 
   TextLabel label = TextLabel::New();
-  label.SetProperty( Actor::Property::SIZE, Vector2( 300.0f, 300.f ) );
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world Hello world" );
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 12 );
-  application.GetScene().Add( label );
+  label.SetProperty(Actor::Property::SIZE, Vector2(300.0f, 300.f));
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world Hello world");
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 12);
+  application.GetScene().Add(label);
 
   Property::Map outlineMapSet;
   Property::Map outlineMapGet;
 
   outlineMapSet["color"] = Color::BLUE;
   outlineMapSet["width"] = 2.0f;
-  label.SetProperty( TextLabel::Property::OUTLINE, outlineMapSet );
+  label.SetProperty(TextLabel::Property::OUTLINE, outlineMapSet);
 
   application.SendNotification();
   application.Render();
 
   Property::Map shadowMapSet;
-  shadowMapSet.Insert( "color", "green" );
-  shadowMapSet.Insert( "offset", "2 2" );
-  shadowMapSet.Insert( "blurRadius", "3" );
-  label.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
+  shadowMapSet.Insert("color", "green");
+  shadowMapSet.Insert("offset", "2 2");
+  shadowMapSet.Insert("blurRadius", "3");
+  label.SetProperty(TextLabel::Property::SHADOW, shadowMapSet);
 
   outlineMapSet["color"] = Color::RED;
   outlineMapSet["width"] = 0.0f;
-  label.SetProperty( TextLabel::Property::OUTLINE, outlineMapSet );
+  label.SetProperty(TextLabel::Property::OUTLINE, outlineMapSet);
 
   application.SendNotification();
   application.Render();
 
-  outlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::OUTLINE );
+  outlineMapGet = label.GetProperty<Property::Map>(TextLabel::Property::OUTLINE);
 
   Property::Value* colorValue = outlineMapGet.Find("color");
 
-  bool colorMatched( false );
+  bool colorMatched(false);
 
-  if ( colorValue )
+  if(colorValue)
   {
-     Property::Type valueType = colorValue->GetType();
-
-     if ( Property::STRING == valueType )
-     {
-       std::string stringValue;
-       colorValue->Get( stringValue );
-       if (  stringValue == "red" )
-       {
-         colorMatched = true;
-       }
-     }
-     else if ( Property::VECTOR4 == valueType )
-     {
-       Vector4 colorVector4;
-       colorValue->Get( colorVector4 );
-       if (  colorVector4 == Color::RED )
-       {
-         colorMatched = true;
-       }
-     }
+    Property::Type valueType = colorValue->GetType();
+
+    if(Property::STRING == valueType)
+    {
+      std::string stringValue;
+      colorValue->Get(stringValue);
+      if(stringValue == "red")
+      {
+        colorMatched = true;
+      }
+    }
+    else if(Property::VECTOR4 == valueType)
+    {
+      Vector4 colorVector4;
+      colorValue->Get(colorVector4);
+      if(colorVector4 == Color::RED)
+      {
+        colorMatched = true;
+      }
+    }
   }
 
-  DALI_TEST_EQUALS( colorMatched, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(colorMatched, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1482,25 +1876,24 @@ int UtcDaliToolkitTextlabelMultiline(void)
   tet_infoline(" UtcDaliToolkitTextlabelMultiline");
 
   TextLabel label = TextLabel::New();
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world Hello world Hello world Hello world Hello world Hello world" );
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 20 );
-  label.SetProperty( TextLabel::Property::MULTI_LINE, false );
-  application.GetScene().Add( label );
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world Hello world Hello world Hello world Hello world Hello world");
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 20);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, false);
+  application.GetScene().Add(label);
 
   application.SendNotification();
   application.Render();
 
-  int lineCount =  label.GetProperty<int>( TextLabel::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( lineCount, 1, TEST_LOCATION );
+  int lineCount = label.GetProperty<int>(TextLabel::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(lineCount, 1, TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::MULTI_LINE, true );
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
 
   application.SendNotification();
   application.Render();
 
-  lineCount =  label.GetProperty<int>( TextLabel::Property::LINE_COUNT );
-  DALI_TEST_EQUALS( true, (lineCount > 1) , TEST_LOCATION );
-
+  lineCount = label.GetProperty<int>(TextLabel::Property::LINE_COUNT);
+  DALI_TEST_EQUALS(true, (lineCount > 1), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1511,27 +1904,27 @@ int UtcDaliToolkitTextlabelTextDirection(void)
   tet_infoline(" UtcDaliToolkitTextlabelTextDirection");
 
   TextLabel label = TextLabel::New();
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::TEXT_DIRECTION ), static_cast< int >( Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ), TEST_LOCATION );
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::TEXT_DIRECTION), static_cast<int>(Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT), TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world" );
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 20 );
-  label.SetProperty( DevelTextLabel::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, false );
-  application.GetScene().Add( label );
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world");
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 20);
+  label.SetProperty(DevelTextLabel::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION, false);
+  application.GetScene().Add(label);
 
   // Test LTR text
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::TEXT_DIRECTION ), static_cast< int >( Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ), TEST_LOCATION );
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::TEXT_DIRECTION), static_cast<int>(Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT), TEST_LOCATION);
 
   // Test RTL text
-  label.SetProperty( TextLabel::Property::TEXT, "ﻡﺮﺤﺑﺍ ﺏﺎﻠﻋﺎﻠﻣ ﻡﺮﺤﺑﺍ" );
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::TEXT_DIRECTION ), static_cast< int >( Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "ﻡﺮﺤﺑﺍ ﺏﺎﻠﻋﺎﻠﻣ ﻡﺮﺤﺑﺍ");
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::TEXT_DIRECTION), static_cast<int>(Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT), TEST_LOCATION);
 
   // Test RTL text starting with weak character
-  label.SetProperty( TextLabel::Property::TEXT, "()ﻡﺮﺤﺑﺍ ﺏﺎﻠﻋﺎﻠﻣ ﻡﺮﺤﺑﺍ" );
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::TEXT_DIRECTION ), static_cast< int >( Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "()ﻡﺮﺤﺑﺍ ﺏﺎﻠﻋﺎﻠﻣ ﻡﺮﺤﺑﺍ");
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::TEXT_DIRECTION), static_cast<int>(Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT), TEST_LOCATION);
 
   // Test RTL text string with emoji and weak character
-  label.SetProperty( TextLabel::Property::TEXT, "\xF0\x9F\x98\x81 () ﻡﺮﺤﺑﺍ ﺏﺎﻠﻋﺎﻠﻣ ﻡﺮﺤﺑﺍ" );
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::TEXT_DIRECTION ), static_cast< int >( Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "\xF0\x9F\x98\x81 () ﻡﺮﺤﺑﺍ ﺏﺎﻠﻋﺎﻠﻣ ﻡﺮﺤﺑﺍ");
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::TEXT_DIRECTION), static_cast<int>(Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1543,18 +1936,18 @@ int UtcDaliToolkitTextlabelVerticalLineAlignment(void)
 
   TextLabel label = TextLabel::New();
 
-  label.SetProperty( DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT, DevelText::VerticalLineAlignment::TOP  );
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world" );
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 15 );
-  label.SetProperty( TextLabel::Property::LINE_SPACING, 12 );
-  application.GetScene().Add( label );
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT ), static_cast< int >( Toolkit::DevelText::VerticalLineAlignment::TOP ), TEST_LOCATION );
+  label.SetProperty(DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT, DevelText::VerticalLineAlignment::TOP);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world");
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 15);
+  label.SetProperty(TextLabel::Property::LINE_SPACING, 12);
+  application.GetScene().Add(label);
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT), static_cast<int>(Toolkit::DevelText::VerticalLineAlignment::TOP), TEST_LOCATION);
 
-  label.SetProperty( DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT, DevelText::VerticalLineAlignment::MIDDLE  );
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT ), static_cast< int >( Toolkit::DevelText::VerticalLineAlignment::MIDDLE ), TEST_LOCATION );
+  label.SetProperty(DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT, DevelText::VerticalLineAlignment::MIDDLE);
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT), static_cast<int>(Toolkit::DevelText::VerticalLineAlignment::MIDDLE), TEST_LOCATION);
 
-  label.SetProperty( DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT, DevelText::VerticalLineAlignment::BOTTOM  );
-  DALI_TEST_EQUALS( label.GetProperty< int >( DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT ), static_cast< int >( Toolkit::DevelText::VerticalLineAlignment::BOTTOM ), TEST_LOCATION );
+  label.SetProperty(DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT, DevelText::VerticalLineAlignment::BOTTOM);
+  DALI_TEST_EQUALS(label.GetProperty<int>(DevelTextLabel::Property::VERTICAL_LINE_ALIGNMENT), static_cast<int>(Toolkit::DevelText::VerticalLineAlignment::BOTTOM), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1565,55 +1958,55 @@ int UtcDaliToolkitTextLabelBitmapFont(void)
   tet_infoline(" UtcDaliToolkitTextLabelBitmapFont");
 
   DevelText::BitmapFontDescription fontDescription;
-  fontDescription.name = "Digits";
-  fontDescription.underlinePosition = 0.f;
+  fontDescription.name               = "Digits";
+  fontDescription.underlinePosition  = 0.f;
   fontDescription.underlineThickness = 0.f;
 
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0030.png", ":", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0031.png", "0", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0032.png", "1", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0033.png", "2", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0034.png", "3", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0035.png", "4", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0036.png", "5", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0037.png", "6", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0038.png", "7", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0039.png", "8", 34.f, 0.f } );
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u003a.png", "9", 34.f, 0.f } );
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0030.png", ":", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0031.png", "0", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0032.png", "1", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0033.png", "2", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0034.png", "3", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0035.png", "4", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0036.png", "5", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0037.png", "6", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0038.png", "7", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0039.png", "8", 34.f, 0.f});
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u003a.png", "9", 34.f, 0.f});
 
   TextAbstraction::BitmapFont bitmapFont;
-  DevelText::CreateBitmapFont( fontDescription, bitmapFont );
+  DevelText::CreateBitmapFont(fontDescription, bitmapFont);
 
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.GetFontId( bitmapFont );
+  fontClient.GetFontId(bitmapFont);
 
   TextLabel label = TextLabel::New();
 
-  label.SetProperty( TextLabel::Property::TEXT, "0123456789:" );
-  label.SetProperty( TextLabel::Property::FONT_FAMILY, "Digits" );
+  label.SetProperty(TextLabel::Property::TEXT, "0123456789:");
+  label.SetProperty(TextLabel::Property::FONT_FAMILY, "Digits");
 
   // The text has been laid out with the bitmap font if the natural size is the sum of all the width (322) and 34 height.
-  DALI_TEST_EQUALS( label.GetNaturalSize(), Vector3(322.f, 34.f, 0.f), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(label.GetNaturalSize(), Vector3(322.f, 34.f, 0.f), Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   application.SendNotification();
   application.Render();
 
   // The text has been rendered if the height of the text-label is the height of the line.
-  DALI_TEST_EQUALS( label.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, 34.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  DALI_TEST_EQUALS(label.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height, 34.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
   END_TEST;
 }
 
-int ConvertPointToPixel( float point )
+int ConvertPointToPixel(float point)
 {
-  unsigned int horizontalDpi = 0u;
-  unsigned int verticalDpi = 0u;
-  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.GetDpi( horizontalDpi, verticalDpi );
+  unsigned int                horizontalDpi = 0u;
+  unsigned int                verticalDpi   = 0u;
+  TextAbstraction::FontClient fontClient    = TextAbstraction::FontClient::Get();
+  fontClient.GetDpi(horizontalDpi, verticalDpi);
 
-  return ( point * 72.f ) / static_cast< float >( horizontalDpi );
+  return (point * 72.f) / static_cast<float>(horizontalDpi);
 }
 
 int UtcDaliToolkitTextlabelTextFit(void)
@@ -1621,142 +2014,590 @@ int UtcDaliToolkitTextlabelTextFit(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliToolkitTextlabelTextFit");
   TextLabel label = TextLabel::New();
-  Vector2 size( 460.0f, 100.0f );
-  label.SetProperty( Actor::Property::SIZE, size );
-  label.SetProperty( TextLabel::Property::TEXT, "Hello world" );
+  Vector2   size(460.0f, 100.0f);
+  label.SetProperty(Actor::Property::SIZE, size);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world");
+
+  // connect to the text git changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextLabel::TextFitChangedSignal(label).Connect(&TestTextFitChangedCallback);
+  bool textFitChangedSignal = false;
+  label.ConnectSignal(testTracker, "textFitChanged", CallbackFunctor(&textFitChangedSignal));
+  gTextFitChangedCallBackCalled = false;
 
   // check point size
   Property::Map textFitMapSet;
-  textFitMapSet["enable"] = true;
-  textFitMapSet["minSize"] = 10.f;
-  textFitMapSet["maxSize"] = 100.f;
-  textFitMapSet["stepSize"] = -1.f;
+  textFitMapSet["enable"]       = true;
+  textFitMapSet["minSize"]      = 10.f;
+  textFitMapSet["maxSize"]      = 100.f;
+  textFitMapSet["stepSize"]     = -1.f;
   textFitMapSet["fontSizeType"] = "pointSize";
 
-  label.SetProperty( Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMapSet );
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 120.f);
+  label.SetProperty(Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMapSet);
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 120.f);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   application.SendNotification();
   application.Render();
 
-  const Vector3 EXPECTED_NATURAL_SIZE( 450.0f, 96.0f, 0.0f );
-  DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION );
+  const Vector3 EXPECTED_NATURAL_SIZE(448.0f, 96.0f, 0.0f);
+  DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION);
+
+  DALI_TEST_CHECK(gTextFitChangedCallBackCalled);
+  DALI_TEST_CHECK(textFitChangedSignal);
 
   // check pixel size
   textFitMapSet.Clear();
-  textFitMapSet["enable"] = true;
-  textFitMapSet["minSize"] = ConvertPointToPixel( 10.f );
-  textFitMapSet["maxSize"] = ConvertPointToPixel( 100.f );
-  textFitMapSet["stepSize"] = ConvertPointToPixel ( 1.f );
+  textFitMapSet["enable"]       = true;
+  textFitMapSet["minSize"]      = ConvertPointToPixel(10.f);
+  textFitMapSet["maxSize"]      = ConvertPointToPixel(100.f);
+  textFitMapSet["stepSize"]     = ConvertPointToPixel(1.f);
   textFitMapSet["fontSizeType"] = "pixelSize";
 
-  label.SetProperty( Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMapSet );
+  label.SetProperty(Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMapSet);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION );
+  DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliToolkitTextlabelMaxTextureSet(void)
+int UtcDaliToolkitTextlabelTextFitStressTest(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliToolkitTextlabelMaxTextureSet");
-
-  DevelText::BitmapFontDescription fontDescription;
-  fontDescription.name = "Digits";
-  fontDescription.glyphs.push_back( { TEST_RESOURCE_DIR "/fonts/bitmap/u0030.png", ":", 200.f, 0.f } );
-
-  TextAbstraction::BitmapFont bitmapFont;
-  DevelText::CreateBitmapFont( fontDescription, bitmapFont );
+  tet_infoline(" UtcDaliToolkitTextlabelTextFitStressTest");
+  TextLabel label = TextLabel::New();
+  Vector2   size(460.0f, 100.0f);
+  label.SetProperty(Actor::Property::SIZE, size);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world");
 
-  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.GetFontId( bitmapFont );
+  // connect to the text git changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextLabel::TextFitChangedSignal(label).Connect(&TestTextFitChangedCallback);
+  bool textFitChangedSignal = false;
+  label.ConnectSignal(testTracker, "textFitChanged", CallbackFunctor(&textFitChangedSignal));
+  gTextFitChangedCallBackCalled = false;
 
-  TextLabel label = TextLabel::New();
-  label.SetProperty( TextLabel::Property::FONT_FAMILY, "Digits" );
-  label.SetProperty( TextLabel::Property::ENABLE_MARKUP, true );
-  label.SetProperty( TextLabel::Property::TEXT, ":This is a long sample text made to allow max texture size to be exceeded." );
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 200.f );
-  label.SetProperty( TextLabel::Property::MULTI_LINE, true );
+  // check point size with veryvery big range
+  Property::Map textFitMapSet;
+  textFitMapSet["enable"]       = true;
+  textFitMapSet["minSize"]      = 10.f;
+  textFitMapSet["maxSize"]      = 10000.f;
+  textFitMapSet["stepSize"]     = -1.0f;
+  textFitMapSet["fontSizeType"] = "pointSize";
 
-  Property::Map underlineMapSet;
-  underlineMapSet.Clear();
-  underlineMapSet.Insert( "enable", true );
-  underlineMapSet.Insert( "color", Color::RED );
-  underlineMapSet.Insert( "height", 1 );
-  label.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
-  label.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE );
+  label.SetProperty(Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMapSet);
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 120.f);
 
-  application.GetScene().Add( label );
+  application.GetScene().Add(label);
 
   application.SendNotification();
   application.Render();
 
-  const int maxTextureSize = Dali::GetMaxTextureSize();
-  // Whether the rendered text is greater than maxTextureSize
-  DALI_TEST_CHECK( label.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height > maxTextureSize );
+  const Vector3 EXPECTED_NATURAL_SIZE(448.0f, 96.0f, 0.0f);
+  DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION);
 
-  // Check if the number of renderers is greater than 1.
-  DALI_TEST_CHECK( label.GetRendererCount() > 1u );
+  DALI_TEST_CHECK(gTextFitChangedCallBackCalled);
+  DALI_TEST_CHECK(textFitChangedSignal);
 
   END_TEST;
 }
 
-int UtcDaliToolkitTextlabelLastCharacterIndex(void)
+int UtcDaliToolkitTextlabelFastTextFitStressTest(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliToolkitTextlabelLastCharacterIndex");
+  tet_infoline(" UtcDaliToolkitTextlabelFastTextFitStressTest");
+  TextLabel label = TextLabel::New();
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world");
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 120.f);
 
-  Vector2 size( 300.0f, 100.0f );
+  // connect to the text git changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextLabel::TextFitChangedSignal(label).Connect(&TestTextFitChangedCallback);
+  bool textFitChangedSignal = false;
+  label.ConnectSignal(testTracker, "textFitChanged", CallbackFunctor(&textFitChangedSignal));
+  gTextFitChangedCallBackCalled = false;
 
-  Dali::Toolkit::DevelText::RendererParameters textParameters;
-  textParameters.text = "This is a sample text to get the last index.";
-  textParameters.layout = "multiLine";
-  textParameters.fontSize = 20.f;
-  textParameters.textWidth = 300u;
-  textParameters.textHeight = 100u;
-  textParameters.ellipsisEnabled = true;
-  Dali::Property::Array indexArray = Dali::Toolkit::DevelText::GetLastCharacterIndex( textParameters );
+  application.GetScene().Add(label);
+
+  // check text label width at range [100, 299]
+  for(int i=100; i<300; i++)
+  {
+    Vector2   size((float)i, 200.f);
+    label.SetProperty(Actor::Property::SIZE, size);
+
+    // check point size with veryvery big range
+    Property::Map textFitMapSet;
+    textFitMapSet["enable"]       = true;
+    textFitMapSet["minSize"]      = 10.f;
+    textFitMapSet["maxSize"]      = 10000.f;
+    textFitMapSet["stepSize"]     = -1.0f;
+    textFitMapSet["fontSizeType"] = "pointSize";
 
-  DALI_TEST_CHECK( !indexArray.Empty() );
-  DALI_TEST_EQUALS( indexArray.GetElementAt(0).Get<int>(), 10, TEST_LOCATION );
+    label.SetProperty(Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMapSet);
+
+    application.SendNotification();
+    application.Render();
+  }
+
+  DALI_TEST_CHECK(gTextFitChangedCallBackCalled);
+  DALI_TEST_CHECK(textFitChangedSignal);
 
   END_TEST;
 }
 
-int UtcDaliToolkitTextlabelFontSizeScale(void)
+int UtcDaliToolkitTextlabelTextFitMultiLine(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliToolkitTextlabelFontSizeScale");
-
+  tet_infoline(" UtcDaliToolkitTextlabelTextFitMultiLine");
   TextLabel label = TextLabel::New();
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 30.f );
-  label.SetProperty( TextLabel::Property::TEXT, "Test" );
+  Vector2   size(500.0f, 100.0f);
+  label.SetProperty(Actor::Property::SIZE, size);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello world\nHello world");
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+
+  // connect to the text git changed signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextLabel::TextFitChangedSignal(label).Connect(&TestTextFitChangedCallback);
+  bool textFitChangedSignal = false;
+  label.ConnectSignal(testTracker, "textFitChanged", CallbackFunctor(&textFitChangedSignal));
+  gTextFitChangedCallBackCalled = false;
+
+  Property::Map textFitMapSet;
+  textFitMapSet["enable"]       = true;
+  textFitMapSet["minSize"]      = 10.f;
+  textFitMapSet["maxSize"]      = 100.f;
+  textFitMapSet["stepSize"]     = -1.0f;
+  textFitMapSet["fontSizeType"] = "pointSize";
+
+  label.SetProperty(Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMapSet);
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 120.f);
+
+  application.GetScene().Add(label);
+
+  application.SendNotification();
+  application.Render();
+
+  float textFitFontSize = (label.GetProperty(Dali::Toolkit::DevelTextLabel::Property::TEXT_FIT).Get<Property::Map>())["fontSize"].Get<float>();
+  DALI_TEST_EQUALS(textFitFontSize, 14.f, TEST_LOCATION);
+
+  DALI_TEST_CHECK(gTextFitChangedCallBackCalled);
+  DALI_TEST_CHECK(textFitChangedSignal);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelTextFitArray(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelTextFitArray");
+  TextLabel label = TextLabel::New();
+  Vector2   size(300.0f, 80.0f);
+  label.SetProperty(Actor::Property::SIZE, size);
+  label.SetProperty(TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog");
+  label.SetProperty(DevelTextLabel::Property::MIN_LINE_SIZE, 80.f);
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  application.GetScene().Add(label);
+
+  // make sorted options.
+  std::vector<DevelTextLabel::FitOption> fitOptions;
+  fitOptions.push_back(DevelTextLabel::FitOption(10, 12));
+  fitOptions.push_back(DevelTextLabel::FitOption(8, 10));
+  fitOptions.push_back(DevelTextLabel::FitOption(6, 8));
+  fitOptions.push_back(DevelTextLabel::FitOption(4, 6));
+  fitOptions.push_back(DevelTextLabel::FitOption(20, 22));
+  fitOptions.push_back(DevelTextLabel::FitOption(22, 24));
+  fitOptions.push_back(DevelTextLabel::FitOption(12, 14));
+
+  DevelTextLabel::SetTextFitArray(label, true, fitOptions);
+
+  application.SendNotification();
+  application.Render();
+
+  bool enable = Dali::Toolkit::DevelTextLabel::IsTextFitArrayEnabled(label);
+  DALI_TEST_EQUALS(true, enable, TEST_LOCATION);
+
+  std::vector<Dali::Toolkit::DevelTextLabel::FitOption> getFitOptions = Dali::Toolkit::DevelTextLabel::GetTextFitArray(label);
+  size_t numberOfFitOptions = getFitOptions.size();
+  DALI_TEST_EQUALS(7u, numberOfFitOptions, TEST_LOCATION);
+
+  const Vector3 EXPECTED_NATURAL_SIZE(276.0f, 16.0f, 0.0f);
+  DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION);
+
+  std::vector<DevelTextLabel::FitOption> emptyFitOptions;
+  DevelTextLabel::SetTextFitArray(label, false, emptyFitOptions);
+
+  application.SendNotification();
+  application.Render();
+
+  enable = Dali::Toolkit::DevelTextLabel::IsTextFitArrayEnabled(label);
+  DALI_TEST_EQUALS(false, enable, TEST_LOCATION);
+
+  const Vector3 EXPECTED_NATURAL_SIZE_DISABLE(690.0f, 80.0f, 0.0f);
+  DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE_DISABLE, label.GetNaturalSize(), TEST_LOCATION);
+
+  // make unsorted options.
+  std::vector<DevelTextLabel::FitOption> unorderedFitOptions;
+  unorderedFitOptions.push_back(DevelTextLabel::FitOption(4, 6));
+  unorderedFitOptions.push_back(DevelTextLabel::FitOption(6, 8));
+  unorderedFitOptions.push_back(DevelTextLabel::FitOption(8, 10));
+  unorderedFitOptions.push_back(DevelTextLabel::FitOption(10, 8));
+
+  DevelTextLabel::SetTextFitArray(label, true, unorderedFitOptions);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelMaxTextureSet(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelMaxTextureSet");
+
+  DevelText::BitmapFontDescription fontDescription;
+  fontDescription.name = "Digits";
+  fontDescription.glyphs.push_back({TEST_RESOURCE_DIR "/fonts/bitmap/u0030.png", ":", 200.f, 0.f});
+
+  TextAbstraction::BitmapFont bitmapFont;
+  DevelText::CreateBitmapFont(fontDescription, bitmapFont);
+
+  TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+  fontClient.GetFontId(bitmapFont);
+
+  TextLabel label = TextLabel::New();
+  label.SetProperty(TextLabel::Property::FONT_FAMILY, "Digits");
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, ":This is a long sample text made to allow max texture size to be exceeded.");
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 200.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+
+  Property::Map underlineMapSet;
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::RED);
+  underlineMapSet.Insert("height", 1);
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+
+  Property::Map strikethroughMapSet;
+  strikethroughMapSet.Clear();
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::RED);
+  strikethroughMapSet.Insert("height", 2.0f);
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+
+  application.GetScene().Add(label);
+
+  application.SendNotification();
+  application.Render();
+
+  const int maxTextureSize = Dali::GetMaxTextureSize();
+  // Whether the rendered text is greater than maxTextureSize
+  DALI_TEST_CHECK(label.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height > maxTextureSize);
+
+  // Check if the number of renderers is greater than 1.
+  DALI_TEST_CHECK(label.GetRendererCount() > 1u);
+
+  //DASHED
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", false);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 0);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+
+  application.GetScene().Add(label);
+
+  application.SendNotification();
+  application.Render();
+
+  // Whether the rendered text is greater than maxTextureSize
+  DALI_TEST_CHECK(label.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height > maxTextureSize);
+
+  // Check if the number of renderers is greater than 1.
+  DALI_TEST_CHECK(label.GetRendererCount() > 1u);
+
+  //DOUBLE
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", false);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 0);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+
+  application.GetScene().Add(label);
+
+  application.SendNotification();
+  application.Render();
+
+  // Whether the rendered text is greater than maxTextureSize
+  DALI_TEST_CHECK(label.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height > maxTextureSize);
+
+  // Check if the number of renderers is greater than 1.
+  DALI_TEST_CHECK(label.GetRendererCount() > 1u);
+
+  // Coverage test for case of layoutSize is bigger than maxTextureSize
+  float max_value = static_cast<float>(std::numeric_limits<uint16_t>::max());
+  label.SetProperty(Actor::Property::SIZE, Vector2(max_value, 30.0f));
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelStrikethroughExceedsWidthAndHeight(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelStrikethroughExceedsWidthAndHeight");
+
+  TextLabel label = TextLabel::New();
+  label.SetProperty(TextLabel::Property::TEXT, "Test");
+  label.SetProperty(TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
+  //Exeeding BufferWidth
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.f, 400.0f));
+  label.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, HorizontalAlignment::RIGHT);
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 200.f);
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  Property::Map strikethroughMapSet;
+  strikethroughMapSet.Clear();
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::BLUE);
+  strikethroughMapSet.Insert("height", 2.0f);
+  label.SetProperty(TextLabel::Property::TEXT, "Test1");
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+  // Check if the number of renderers is 1.
+  DALI_TEST_EQUALS(1, label.GetRendererCount(), TEST_LOCATION);
+
+  label = TextLabel::New();
+  label.SetProperty(TextLabel::Property::TEXT, "Test");
+  label.SetProperty(TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
+
+  //Exeeding BufferHeight
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.f, 100.0f));
+  label.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, HorizontalAlignment::RIGHT);
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 200.f);
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapSet.Clear();
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::BLUE);
+  strikethroughMapSet.Insert("height", 2.0f);
+  label.SetProperty(TextLabel::Property::TEXT, "Test2");
+  label.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+  // Check if the number of renderers is 1.
+  DALI_TEST_EQUALS(1, label.GetRendererCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelUnderlineExceedsWidth(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelUnderlineExceedsWidth");
+
+  TextLabel label = TextLabel::New();
+  label.SetProperty(TextLabel::Property::TEXT, "Test");
+  label.SetProperty(TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
+  //Exeeding BufferWidth
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.f, 400.0f));
+  label.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, HorizontalAlignment::RIGHT);
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 200.f);
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  Property::Map underlineMapSet;
+
+  //SOLID
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::SOLID);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+
+  application.GetScene().Add(label);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check if the number of renderers is 1.
+  DALI_TEST_EQUALS(1, label.GetRendererCount(), TEST_LOCATION);
+
+  //DASHED
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DASHED);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+
+  application.GetScene().Add(label);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check if the number of renderers is 1.
+  DALI_TEST_EQUALS(1, label.GetRendererCount(), TEST_LOCATION);
+
+  //DOUBLE
+  underlineMapSet.Clear();
+  underlineMapSet.Insert("enable", true);
+  underlineMapSet.Insert("color", Color::BLUE);
+  underlineMapSet.Insert("height", 1);
+  underlineMapSet.Insert("type", Text::Underline::DOUBLE);
+  underlineMapSet.Insert("dashWidth", 2);
+  underlineMapSet.Insert("dashGap", 1);
+  label.SetProperty(TextLabel::Property::UNDERLINE, underlineMapSet);
+  label.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+
+  application.GetScene().Add(label);
+
+  application.SendNotification();
+  application.Render();
+
+  // Check if the number of renderers is 1.
+  DALI_TEST_EQUALS(1, label.GetRendererCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelLastCharacterIndex(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelLastCharacterIndex");
+
+  Vector2 size(300.0f, 100.0f);
+
+  Dali::Toolkit::DevelText::RendererParameters textParameters;
+  textParameters.text              = "This is a sample text to get the last index.";
+  textParameters.layout            = "multiLine";
+  textParameters.fontSize          = 20.f;
+  textParameters.textWidth         = 300u;
+  textParameters.textHeight        = 100u;
+  textParameters.ellipsisEnabled   = true;
+  Dali::Property::Array indexArray = Dali::Toolkit::DevelText::GetLastCharacterIndex(textParameters);
+
+  DALI_TEST_CHECK(!indexArray.Empty());
+  DALI_TEST_EQUALS(indexArray.GetElementAt(0).Get<int>(), 10, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelFontSizeScale(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelFontSizeScale");
+
+  TextLabel label = TextLabel::New();
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 30.f);
+  label.SetProperty(TextLabel::Property::TEXT, "Test");
   Vector3 nonScaledSize = label.GetNaturalSize();
 
   TextLabel labelScaled = TextLabel::New();
-  labelScaled.SetProperty( TextLabel::Property::POINT_SIZE, 15.f );
-  labelScaled.SetProperty( Toolkit::DevelTextLabel::Property::FONT_SIZE_SCALE, 2.f );
-  labelScaled.SetProperty( TextLabel::Property::TEXT, "Test" );
+  labelScaled.SetProperty(TextLabel::Property::POINT_SIZE, 15.f);
+  labelScaled.SetProperty(Toolkit::DevelTextLabel::Property::FONT_SIZE_SCALE, 2.f);
+  labelScaled.SetProperty(TextLabel::Property::TEXT, "Test");
   Vector3 scaledSize = labelScaled.GetNaturalSize();
 
-  DALI_TEST_EQUALS( nonScaledSize, scaledSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(nonScaledSize, scaledSize, TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::PIXEL_SIZE, 30.f );
-  label.SetProperty( TextLabel::Property::TEXT, "Test" );
+  label.SetProperty(TextLabel::Property::PIXEL_SIZE, 30.f);
+  label.SetProperty(TextLabel::Property::TEXT, "Test");
   nonScaledSize = label.GetNaturalSize();
 
-  labelScaled.SetProperty( TextLabel::Property::PIXEL_SIZE, 15.f );
-  labelScaled.SetProperty( Toolkit::DevelTextLabel::Property::FONT_SIZE_SCALE, 2.f );
-  labelScaled.SetProperty( TextLabel::Property::TEXT, "Test" );
+  labelScaled.SetProperty(TextLabel::Property::PIXEL_SIZE, 15.f);
+  labelScaled.SetProperty(Toolkit::DevelTextLabel::Property::FONT_SIZE_SCALE, 2.f);
+  labelScaled.SetProperty(TextLabel::Property::TEXT, "Test");
   scaledSize = labelScaled.GetNaturalSize();
 
-  DALI_TEST_EQUALS( nonScaledSize, scaledSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(nonScaledSize, scaledSize, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelAnchorColor(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelAnchorColor");
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  // connect to the anchor clicked signal.
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  DevelTextLabel::AnchorClickedSignal(label).Connect(&TestAnchorClickedCallback);
+  bool anchorClickedSignal = false;
+  label.ConnectSignal(testTracker, "anchorClicked", CallbackFunctor(&anchorClickedSignal));
+
+  gAnchorClickedCallBackCalled = false;
+  label.SetProperty(TextLabel::Property::TEXT, "<a href='https://www.tizen.org'>TIZEN</a>");
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+
+  // Check that anchor color can be properly set
+  label.SetProperty(DevelTextLabel::Property::ANCHOR_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(label.GetProperty<Vector4>(DevelTextLabel::Property::ANCHOR_COLOR), Color::BLUE, TEST_LOCATION);
+
+  label.SetProperty(DevelTextLabel::Property::ANCHOR_CLICKED_COLOR, Color::RED);
+  DALI_TEST_EQUALS(label.GetProperty<Vector4>(DevelTextLabel::Property::ANCHOR_CLICKED_COLOR), Color::RED, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  // Create a tap event to touch the text label.
+  TestGenerateTap(application, 5.0f, 25.0f, 100);
+  application.SendNotification();
+  application.Render();
+
+  // Update clicked color
+  label.SetProperty(DevelTextLabel::Property::ANCHOR_CLICKED_COLOR, Color::BLUE);
+  DALI_TEST_EQUALS(label.GetProperty<Vector4>(DevelTextLabel::Property::ANCHOR_CLICKED_COLOR), Color::BLUE, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(gAnchorClickedCallBackCalled);
+  DALI_TEST_CHECK(anchorClickedSignal);
 
   END_TEST;
 }
@@ -1797,7 +2638,7 @@ int UtcDaliToolkitTextlabelAnchorClicked(void)
 
   // reset
   gAnchorClickedCallBackCalled = false;
-  anchorClickedSignal = false;
+  anchorClickedSignal          = false;
   label.SetProperty(TextLabel::Property::TEXT, "");
   label.SetProperty(TextLabel::Property::ENABLE_MARKUP, false);
 
@@ -1806,7 +2647,7 @@ int UtcDaliToolkitTextlabelAnchorClicked(void)
 
   // sets anchor text
   label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
-  label.SetProperty(TextLabel::Property::TEXT, "<a href='https://www.tizen.org'>TIZEN</a>");
+  label.SetProperty(TextLabel::Property::TEXT, "<a color='red' clicked-color='green' href='https://www.tizen.org'>TIZEN</a>");
   label.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
   label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
   label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
@@ -1822,7 +2663,6 @@ int UtcDaliToolkitTextlabelAnchorClicked(void)
   DALI_TEST_CHECK(gAnchorClickedCallBackCalled);
   DALI_TEST_CHECK(anchorClickedSignal);
 
-
   gAnchorClickedCallBackNotCalled = true;
   // Tap the outside of anchor, callback should not be called.
   TestGenerateTap(application, 150.f, 100.f, 300);
@@ -1842,29 +2682,29 @@ int UtcDaliTextLabelAtlasLimitationIsEnabledForLargeFontPointSize(void)
   //TextLabel is not using Atlas but this is to unify font-size on text-controllers
 
   // +2: First one to handle the equal case. Second one to handle odd to even case of GetNaturalSize
-  const uint32_t lessThanWidth = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
+  const uint32_t lessThanWidth  = TextAbstraction::FontClient::MAX_TEXT_ATLAS_WIDTH - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
   const uint32_t lessThanHeight = TextAbstraction::FontClient::MAX_TEXT_ATLAS_HEIGHT - TextAbstraction::FontClient::PADDING_TEXT_ATLAS_BLOCK + 2;
 
   // Create a text editor
   TextLabel textLabel = TextLabel::New();
   //Set size to avoid automatic eliding
-  textLabel.SetProperty( Actor::Property::SIZE, Vector2(1025, 1025));
+  textLabel.SetProperty(Actor::Property::SIZE, Vector2(1025, 1025));
   //Set very large font-size using point-size
-  textLabel.SetProperty( TextLabel::Property::POINT_SIZE, 1000);
+  textLabel.SetProperty(TextLabel::Property::POINT_SIZE, 1000);
   //Specify font-family
-  textLabel.SetProperty( TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
+  textLabel.SetProperty(TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
   //Set text to check if appear or not
-  textLabel.SetProperty( TextLabel::Property::TEXT, "A");
+  textLabel.SetProperty(TextLabel::Property::TEXT, "A");
 
-  application.GetScene().Add( textLabel );
+  application.GetScene().Add(textLabel);
 
   application.SendNotification();
   application.Render();
   //Use GetNaturalSize to verify that size of block does not exceed Atlas size
   Vector3 naturalSize = textLabel.GetNaturalSize();
 
-  DALI_TEST_GREATER( lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION );
-  DALI_TEST_GREATER( lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION );
+  DALI_TEST_GREATER(lessThanWidth, static_cast<uint32_t>(naturalSize.width), TEST_LOCATION);
+  DALI_TEST_GREATER(lessThanHeight, static_cast<uint32_t>(naturalSize.height), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1874,150 +2714,666 @@ int UtcDaliTextLabelHyphenWrapMode(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextLabelHyphenWrapMode ");
 
-  int lineCount =0;
-  TextLabel label = TextLabel::New();
-  label.SetProperty( Actor::Property::SIZE, Vector2( 150.0f, 300.f ));
-  label.SetProperty( TextLabel::Property::POINT_SIZE, 12.f );
-  label.SetProperty( TextLabel::Property::MULTI_LINE, true);
-  application.GetScene().Add( label );
+  int       lineCount = 0;
+  TextLabel label     = TextLabel::New();
+  label.SetProperty(Actor::Property::SIZE, Vector2(150.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 12.f);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  application.GetScene().Add(label);
   application.SendNotification();
   application.Render();
 
-  label.SetProperty( TextLabel::Property::TEXT, "Hi Experimen" );
-  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE,DevelText::LineWrap::HYPHENATION);
-  DALI_TEST_EQUALS( label.GetProperty< int >( TextLabel::Property::LINE_WRAP_MODE ), static_cast< int >( DevelText::LineWrap::HYPHENATION ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "Hi Experimen");
+  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE, DevelText::LineWrap::HYPHENATION);
+  DALI_TEST_EQUALS(label.GetProperty<int>(TextLabel::Property::LINE_WRAP_MODE), static_cast<int>(DevelText::LineWrap::HYPHENATION), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount = label.GetProperty<int>( TextLabel::Property::LINE_COUNT );
+  lineCount = label.GetProperty<int>(TextLabel::Property::LINE_COUNT);
   /*
     text will be :
     Hi Exp-
     erimen
   */
-  DALI_TEST_EQUALS( lineCount, 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCount, 2, TEST_LOCATION);
 
-  label.SetProperty( TextLabel::Property::TEXT, "Hi Experimen" );
-  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE,DevelText::LineWrap::MIXED);
-  DALI_TEST_EQUALS( label.GetProperty< int >( TextLabel::Property::LINE_WRAP_MODE ), static_cast< int >( DevelText::LineWrap::MIXED ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::TEXT, "Hi Experimen");
+  label.SetProperty(TextLabel::Property::LINE_WRAP_MODE, DevelText::LineWrap::MIXED);
+  DALI_TEST_EQUALS(label.GetProperty<int>(TextLabel::Property::LINE_WRAP_MODE), static_cast<int>(DevelText::LineWrap::MIXED), TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  lineCount = label.GetProperty<int>( TextLabel::Property::LINE_COUNT );
+  lineCount = label.GetProperty<int>(TextLabel::Property::LINE_COUNT);
   /*
     text will be :
     Hi
     Experi-
     men
   */
-  DALI_TEST_EQUALS( lineCount, 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(lineCount, 3, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int utcDaliTextLabelGetHeightForWidthChangeLineCountWhenTextChanged(void)
 {
   ToolkitTestApplication application;
 
   tet_infoline(" utcDaliTextLabelGetHeightForWidthChangeLineCountWhenTextChanged ");
 
-  int lineCountBefore =0 ;
-  int lineCountAfter =0 ;
+  int lineCountBefore = 0;
+  int lineCountAfter  = 0;
 
   // Create a text editor
   TextLabel textLabel = TextLabel::New();
   //Set very large font-size using point-size
-  textLabel.SetProperty( TextLabel::Property::POINT_SIZE, 10) ;
+  textLabel.SetProperty(TextLabel::Property::POINT_SIZE, 10);
   //Specify font-family
-  textLabel.SetProperty( TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
+  textLabel.SetProperty(TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
   //Specify size
-  textLabel.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 100.f ) );
+  textLabel.SetProperty(Actor::Property::SIZE, Vector2(200.f, 100.f));
   //Set text longer than width of textLabel
-  textLabel.SetProperty( TextLabel::Property::TEXT, "Short text");
+  textLabel.SetProperty(TextLabel::Property::TEXT, "Short text");
   //Set line wrap mode Character
   textLabel.SetProperty(TextLabel::Property::LINE_WRAP_MODE, "CHARACTER");
   textLabel.SetProperty(TextLabel::Property::MULTI_LINE, true);
 
-  application.GetScene().Add( textLabel );
+  application.GetScene().Add(textLabel);
 
   application.SendNotification();
   application.Render();
 
+  lineCountBefore = textLabel.GetProperty<int>(TextLabel::Property::LINE_COUNT);
 
-  lineCountBefore =  textLabel.GetProperty<int>( TextLabel::Property::LINE_COUNT );
-
-  textLabel.SetProperty( TextLabel::Property::TEXT, "This is very loooooooooooooooooooooooooooooooooooong text for test");
-  lineCountAfter =  textLabel.GetProperty<int>( TextLabel::Property::LINE_COUNT );
+  textLabel.SetProperty(TextLabel::Property::TEXT, "This is very loooooooooooooooooooooooooooooooooooong text for test");
+  lineCountAfter = textLabel.GetProperty<int>(TextLabel::Property::LINE_COUNT);
 
   // When the text changed, the Line-count should be updated according to new text.
   // Because the GetHeightForWidth is called in Controller::GetLineCount(float width)
-  DALI_TEST_EQUALS( lineCountBefore ,1, TEST_LOCATION );
-  DALI_TEST_GREATER( lineCountAfter,1, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(lineCountBefore, 1, TEST_LOCATION);
+  DALI_TEST_GREATER(lineCountAfter, 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliToolkitTextlabelEllipsisPositionProperty(void)
+int utcDaliTextLabelGeometryRTL(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty ");
-  TextLabel textLabel = TextLabel::New();
+  tet_infoline(" utcDaliTextLabelGeometryRTL");
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Default is END");
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START");
-  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::START);
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  application.GetScene().Add(label);
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE");
-  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::MIDDLE);
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 7.f);
+  label.SetProperty(Actor::Property::SIZE, Vector2(150.f, 100.f));
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "line1 \nline2\nline 3\nالاخيرالسطر");
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END");
-  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::END);
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  // Render and notify
+  application.SendNotification();
+  application.Render();
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using integer");
-  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, 1);
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  unsigned int expectedCount = 4;
+  unsigned int startIndex    = 3;
+  unsigned int endIndex      = 24;
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using integer");
-  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, 2);
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  Vector<Vector2> positionsList = DevelTextLabel::GetTextPosition(label, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextLabel::GetTextSize(label, startIndex, endIndex);
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using integer");
-  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, 0);
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
 
-  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using string - uppercase");
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(25, 0));
+  expectedSizes.PushBack(Vector2(34, 25));
+
+  expectedPositions.PushBack(Vector2(-1, 25));
+  expectedSizes.PushBack(Vector2(53, 25));
+
+  expectedPositions.PushBack(Vector2(-1, 50));
+  expectedSizes.PushBack(Vector2(60, 25));
+
+  expectedPositions.PushBack(Vector2(75, 75));
+  expectedSizes.PushBack(Vector2(37, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextLabelGeometryGlyphMiddle(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextLabelGeometryGlyphMiddle");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 7.f);
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, "لا تحتوي على لا");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 1;
+  unsigned int endIndex      = 13;
+
+  Vector<Vector2> positionsList = DevelTextLabel::GetTextPosition(label, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextLabel::GetTextSize(label, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(6, 0));
+  expectedSizes.PushBack(Vector2(125, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextLabelGeometryOneGlyph(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextLabelGeometryOneGlyph ");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 7.f);
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, "H");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int expectedCount = 1;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 0;
+
+  Vector<Vector2> positionsList = DevelTextLabel::GetTextPosition(label, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextLabel::GetTextSize(label, startIndex, endIndex);
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  Vector<Vector2> expectedSizes;
+  Vector<Vector2> expectedPositions;
+
+  expectedPositions.PushBack(Vector2(-2, 0));
+  expectedSizes.PushBack(Vector2(16, 25));
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  positionsList.Clear();
+  sizeList.Clear();
+
+  startIndex = 2;
+  endIndex   = 0;
+
+  positionsList = DevelTextLabel::GetTextPosition(label, startIndex, endIndex);
+  sizeList      = DevelTextLabel::GetTextSize(label, startIndex, endIndex);
+
+  TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
+
+  END_TEST;
+}
+
+int utcDaliTextLabelGeometryNullPtr(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("utcDaliTextLabelGeometryNullPtr");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 7.f);
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  label.SetProperty(TextLabel::Property::TEXT, "");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  unsigned int expectedCount = 0;
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 0;
+
+  Vector<Vector2> positionsList = DevelTextLabel::GetTextPosition(label, startIndex, endIndex);
+  Vector<Vector2> sizeList      = DevelTextLabel::GetTextSize(label, startIndex, endIndex);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS(positionsList.Size(), expectedCount, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList.Size(), expectedCount, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelEllipsisPositionProperty(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty ");
+  TextLabel textLabel = TextLabel::New();
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Default is END");
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START");
+  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::START);
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE");
+  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::MIDDLE);
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END");
+  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, DevelText::EllipsisPosition::END);
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using integer");
+  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, 1);
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using integer");
+  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, 2);
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using integer");
+  textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, 0);
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
+
+  tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using string - uppercase");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, "START");
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using string - uppercase");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, "MIDDLE");
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using string - uppercase");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, "END");
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to START using string - lowercase");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, "start");
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::START ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::START), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to MIDDLE using string - lowercase");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, "middle");
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::MIDDLE ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::MIDDLE), TEST_LOCATION);
 
   tet_infoline(" UtcDaliToolkitTextlabelEllipsisPositionProperty - Change to END using string - lowercase");
   textLabel.SetProperty(DevelTextLabel::Property::ELLIPSIS_POSITION, "end");
-  DALI_TEST_EQUALS( textLabel.GetProperty< int >( DevelTextLabel::Property::ELLIPSIS_POSITION ), static_cast< int >( Toolkit::DevelText::EllipsisPosition::END ), TEST_LOCATION );
+  DALI_TEST_EQUALS(textLabel.GetProperty<int>(DevelTextLabel::Property::ELLIPSIS_POSITION), static_cast<int>(Toolkit::DevelText::EllipsisPosition::END), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelStrikethroughGeneration(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextLabelStrikethroughGeneration");
+
+  TextLabel textLabel = TextLabel::New();
+  textLabel.SetProperty(TextLabel::Property::TEXT, "Test");
+  textLabel.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 100.f));
+  textLabel.SetProperty(TextLabel::Property::POINT_SIZE, 10);
+  textLabel.SetProperty(TextLabel::Property::FONT_FAMILY, "DejaVu Sans");
+
+  application.GetScene().Add(textLabel);
+  application.SendNotification();
+  application.Render();
+
+  Property::Map strikethroughMapSet;
+  Property::Map strikethroughMapGet;
+
+  strikethroughMapSet.Insert("enable", true);
+  strikethroughMapSet.Insert("color", Color::RED);
+  strikethroughMapSet.Insert("height", 2.0f);
+
+  // Check the strikethrough property
+  textLabel.SetProperty(DevelTextLabel::Property::STRIKETHROUGH, strikethroughMapSet);
+  strikethroughMapGet = textLabel.GetProperty<Property::Map>(DevelTextLabel::Property::STRIKETHROUGH);
+  textLabel.SetProperty(TextLabel::Property::TEXT, "Test1");
+  DALI_TEST_EQUALS(strikethroughMapGet.Count(), strikethroughMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(strikethroughMapGet, strikethroughMapSet), true, TEST_LOCATION);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  strikethroughMapSet.Clear();
+  strikethroughMapGet.Clear();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelMarkupRelativeLineHeight(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextLabelMarkupRelativeLineHeight");
+
+  TextLabel label = TextLabel::New();
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "line 1\nline 2\nline 3\nline 4\nline 5");
+  label.SetProperty(DevelTextLabel::Property::RELATIVE_LINE_SIZE, 1.0f);
+  label.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+
+  TextLabel labelSingleLineParagraph = TextLabel::New();
+  labelSingleLineParagraph.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  labelSingleLineParagraph.SetProperty(TextLabel::Property::POINT_SIZE, 10);
+  labelSingleLineParagraph.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  labelSingleLineParagraph.SetProperty(TextLabel::Property::TEXT, "<p>line 1</p><p rel-line-height=0.5>line 2</p>line 3<p rel-line-height=3>line 4</p>line 5");
+  labelSingleLineParagraph.SetProperty(DevelTextLabel::Property::RELATIVE_LINE_SIZE, 1.0f);
+  labelSingleLineParagraph.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  labelSingleLineParagraph.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+
+  TextLabel labelMultiLineParagraph = TextLabel::New();
+  labelMultiLineParagraph.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  labelMultiLineParagraph.SetProperty(TextLabel::Property::POINT_SIZE, 10);
+  labelMultiLineParagraph.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  labelMultiLineParagraph.SetProperty(TextLabel::Property::TEXT, "<p>line 1</p><p rel-line-height=0.5>line\n2</p>line 3<p rel-line-height=3>line\n4</p>line 5");
+  labelMultiLineParagraph.SetProperty(DevelTextLabel::Property::RELATIVE_LINE_SIZE, 1.0f);
+  labelMultiLineParagraph.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  labelMultiLineParagraph.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+
+  application.GetScene().Add(label);
+  application.GetScene().Add(labelSingleLineParagraph);
+  application.GetScene().Add(labelMultiLineParagraph);
+  application.SendNotification();
+  application.Render();
+
+  Vector3 naturalSize               = label.GetNaturalSize();
+  Vector3 relativeSingleNaturalSize = labelSingleLineParagraph.GetNaturalSize();
+  Vector3 relativeMultiNaturalSize  = labelMultiLineParagraph.GetNaturalSize();
+
+  float lineSize = naturalSize.y / 5.0f; //total size/number of lines
+
+  //no effect of relative line size for paragraph with single line
+  DALI_TEST_EQUALS(naturalSize.y, relativeSingleNaturalSize.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(lineSize * 8.5f, relativeMultiNaturalSize.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextLabelRelativeLineHeight(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextLabelRelativeLineHeight");
+
+  TextLabel label = TextLabel::New();
+  label.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello\nWorld");
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  Vector3 naturalSize = label.GetNaturalSize();
+
+  label.SetProperty(DevelTextLabel::Property::RELATIVE_LINE_SIZE, 0.5f);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector3 relativeNaturalSize = label.GetNaturalSize();
+
+  DALI_TEST_EQUALS(naturalSize.y, relativeNaturalSize.y, TEST_LOCATION);
+
+  label.SetProperty(DevelTextLabel::Property::RELATIVE_LINE_SIZE, 2.0f);
+
+  application.SendNotification();
+  application.Render();
+
+  relativeNaturalSize = label.GetNaturalSize();
+
+  DALI_TEST_EQUALS(naturalSize.y * 2, relativeNaturalSize.y, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliTextLabelCharacterSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTextLabelCharacterSpacing ");
+
+  TextLabel textLabel = TextLabel::New();
+
+  textLabel.SetProperty(Actor::Property::SIZE, Vector2(150.0f, 300.f));
+
+  application.GetScene().Add(textLabel);
+  application.SendNotification();
+  application.Render();
+
+  textLabel.SetProperty(TextLabel::Property::TEXT, "Hi Experiment");
+  textLabel.SetProperty(DevelTextLabel::Property::CHARACTER_SPACING, 10.f);
+  DALI_TEST_EQUALS(textLabel.GetProperty<float>(DevelTextLabel::Property::CHARACTER_SPACING), 10.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliTextTextLabelSizeNegativeLineSpacing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextTextLabelSizeNegativeLineSpacing");
+
+  TextLabel label = TextLabel::New();
+
+  float lineSpacing = -20.f;
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(450.0f, 300.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.f);
+  label.SetProperty(DevelTextLabel::Property::LINE_SPACING, lineSpacing);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  Vector<Vector2> positionsList = DevelTextLabel::GetTextPosition(label, 0, 123);
+  Vector<Vector2> sizeList      = DevelTextLabel::GetTextSize(label, 0, 123);
+
+  Vector2 lastLinePos  = positionsList[positionsList.Size() - 1];
+  Vector2 lastLineSize = sizeList[sizeList.Size() - 1];
+
+  DALI_TEST_EQUALS(sizeList[0].y * (sizeList.Size() - 1), lastLinePos.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+  DALI_TEST_EQUALS(sizeList[0].y - lineSpacing, lastLineSize.y, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliTextLabelNegativeLineSpacingWithEllipsis(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliTextLabelNegativeLineSpacingWithEllipsis");
+
+  TextLabel label = TextLabel::New();
+
+  float lineSpacing = -20.f;
+
+  label.SetProperty(Actor::Property::SIZE, Vector2(480.0f, 100.f));
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 11.0f);
+  label.SetProperty(DevelTextLabel::Property::LINE_SPACING, lineSpacing);
+  label.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  label.SetProperty(TextLabel::Property::TEXT, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
+  label.SetProperty(TextLabel::Property::ELLIPSIS, true);
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  Vector<Vector2> sizeList = DevelTextLabel::GetTextSize(label, 0, 123);
+
+  int lineCount = sizeList.Size();
+  DALI_TEST_EQUALS(4, lineCount, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextlabelParagraphTag(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliToolkitTextlabelParagraphTag");
+  TextLabel labelNewlineSeparator = TextLabel::New();
+  TextLabel labelParagraphTag     = TextLabel::New();
+  DALI_TEST_CHECK(labelNewlineSeparator);
+  DALI_TEST_CHECK(labelParagraphTag);
+
+  application.GetScene().Add(labelNewlineSeparator);
+  application.GetScene().Add(labelParagraphTag);
+
+  //Same utterance uses new-line to split paragraphs should give similar results for paragraph tag.
+  labelNewlineSeparator.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  labelNewlineSeparator.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  labelNewlineSeparator.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  labelNewlineSeparator.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  labelNewlineSeparator.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  labelNewlineSeparator.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  labelNewlineSeparator.SetProperty(TextLabel::Property::TEXT, "test paragraph tag \ntest paragraph tag \ntest paragraph tag ");
+
+  labelParagraphTag.SetProperty(TextLabel::Property::MULTI_LINE, true);
+  labelParagraphTag.SetProperty(TextLabel::Property::ELLIPSIS, false);
+  labelParagraphTag.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
+  labelParagraphTag.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  labelParagraphTag.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  labelParagraphTag.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  labelParagraphTag.SetProperty(TextLabel::Property::TEXT, "test paragraph tag <p>test paragraph tag </p>test paragraph tag ");
+
+  application.SendNotification();
+  application.Render();
+
+  Vector3 textNaturalSizeNewlineSeparator = labelNewlineSeparator.GetNaturalSize();
+  Vector3 textNaturalSizeParagraphTag     = labelParagraphTag.GetNaturalSize();
+
+  DALI_TEST_EQUALS(textNaturalSizeNewlineSeparator, textNaturalSizeParagraphTag, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  END_TEST;
+}
+
+int utcDaliTextLabelGetTextBoundingRectangle(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextLabelGeometryEllipsisMiddle");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+
+  label.SetProperty(TextLabel::Property::POINT_SIZE, 7.f);
+  label.SetProperty(Actor::Property::SIZE, Vector2(100.f, 50.f));
+  label.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  label.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  label.SetProperty(TextLabel::Property::TEXT, "Hello this is the Text Bounding Rectangle TC");
+
+  // Avoid a crash when core load gl resources.
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+
+  // Render and notify
+  application.SendNotification();
+  application.Render();
+
+  unsigned int startIndex    = 0;
+  unsigned int endIndex      = 15;
+
+  Rect<> textBoundingRectangle = DevelTextLabel::GetTextBoundingRectangle(label, startIndex, endIndex);
+  Rect<> expectedTextBoundingRectangle = {0, 0, 100, 25};
+
+  TestTextGeometryUtils::CheckRectGeometryResult(textBoundingRectangle, expectedTextBoundingRectangle);
+
+  END_TEST;
+}
+
+int utcDaliTextLabelRemoveFrontInset(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextLabelRemoveFrontInset");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
+
+  DevelTextLabel::SetRemoveFrontInset(label, false);
+  DALI_TEST_CHECK(!DevelTextLabel::IsRemoveFrontInset(label));
+
+  END_TEST;
+}
+
+int utcDaliTextLabelRemoveBackInset(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" utcDaliTextLabelRemoveBackInset");
+
+  TextLabel label = TextLabel::New();
+  DALI_TEST_CHECK(label);
+
+  application.GetScene().Add(label);
+  application.SendNotification();
+  application.Render();
 
+  DevelTextLabel::SetRemoveBackInset(label, false);
+  DALI_TEST_CHECK(!DevelTextLabel::IsRemoveBackInset(label));
 
   END_TEST;
 }
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
index 11b9f46..00dce10 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
@@ -15,21 +15,20 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
 const char* TEST_IMAGE_FILE_NAME = "selection-popup-border.9.png";
-
+const char* TEST_FONT_FAMILY = "BreezeSans";
 }
 
 void dali_textselectionpopup_startup(void)
@@ -45,13 +44,13 @@ void dali_textselectionpopup_cleanup(void)
 int UtcDaliToolkitTextSelectionPopupNewP(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup textSelectionPopup;
+  TextSelectionPopup     textSelectionPopup;
 
-  DALI_TEST_CHECK( !textSelectionPopup );
+  DALI_TEST_CHECK(!textSelectionPopup);
 
-  textSelectionPopup = TextSelectionPopup::New( NULL );
+  textSelectionPopup = TextSelectionPopup::New(NULL);
 
-  DALI_TEST_CHECK( textSelectionPopup );
+  DALI_TEST_CHECK(textSelectionPopup);
   END_TEST;
 }
 
@@ -59,7 +58,7 @@ int UtcDaliToolkitTextSelectionPopupConstructorP(void)
 {
   TextSelectionPopup textSelectionPopup;
 
-  DALI_TEST_CHECK( !textSelectionPopup );
+  DALI_TEST_CHECK(!textSelectionPopup);
 
   END_TEST;
 }
@@ -67,24 +66,23 @@ int UtcDaliToolkitTextSelectionPopupConstructorP(void)
 int UtcDaliToolkitTextSelectionPopupCopyConstructorP(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup textSelectionPopup;
+  TextSelectionPopup     textSelectionPopup;
 
-  textSelectionPopup = TextSelectionPopup::New( NULL );
-  TextSelectionPopup copy( textSelectionPopup );
+  textSelectionPopup = TextSelectionPopup::New(NULL);
+  TextSelectionPopup copy(textSelectionPopup);
 
-  DALI_TEST_CHECK( copy == textSelectionPopup );
+  DALI_TEST_CHECK(copy == textSelectionPopup);
 
   END_TEST;
 }
 
-
 int UtcDaliToolkitTextSelectionPopupDestructorP(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup* textSelectionPopup = new TextSelectionPopup;
+  TextSelectionPopup*    textSelectionPopup = new TextSelectionPopup;
   delete textSelectionPopup;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
 
   END_TEST;
 }
@@ -92,24 +90,24 @@ int UtcDaliToolkitTextSelectionPopupDestructorP(void)
 int UtcDaliToolkitTextSelectionPopupAssignmentOperatorP(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup textSelectionPopup;
-  textSelectionPopup = TextSelectionPopup::New(  NULL );
+  TextSelectionPopup     textSelectionPopup;
+  textSelectionPopup = TextSelectionPopup::New(NULL);
   TextSelectionPopup copy;
   copy = textSelectionPopup;
 
-  DALI_TEST_CHECK( copy == textSelectionPopup );
+  DALI_TEST_CHECK(copy == textSelectionPopup);
   END_TEST;
 }
 
 int UtcDaliToolkitTextSelectionPopupDownCastP(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup textSelectionPopup;
-  textSelectionPopup = TextSelectionPopup::New( NULL );
+  TextSelectionPopup     textSelectionPopup;
+  textSelectionPopup = TextSelectionPopup::New(NULL);
 
-  TextSelectionPopup cast = TextSelectionPopup::DownCast( textSelectionPopup );
+  TextSelectionPopup cast = TextSelectionPopup::DownCast(textSelectionPopup);
 
-  DALI_TEST_CHECK( cast );
+  DALI_TEST_CHECK(cast);
 
   END_TEST;
 }
@@ -117,25 +115,52 @@ int UtcDaliToolkitTextSelectionPopupDownCastP(void)
 int UtcDaliToolkitTextSelectionPopupBackgroundBorderP(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup textSelectionPopup;
-  textSelectionPopup = TextSelectionPopup::New( NULL );
+  TextSelectionPopup     textSelectionPopup;
+  textSelectionPopup = TextSelectionPopup::New(NULL);
+
+  textSelectionPopup.SetProperty(TextSelectionPopup::Property::BACKGROUND_BORDER,
+                                 Property::Map().Add(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME));
+
+  Property::Value value = textSelectionPopup.GetProperty(TextSelectionPopup::Property::BACKGROUND_BORDER);
+
+  Property::Map map;
+  value.Get(map);
+
+  Property::Value* returnValue = map.Find(Dali::Toolkit::ImageVisual::Property::URL);
+  DALI_TEST_CHECK(NULL != returnValue);
+
+  if(returnValue)
+  {
+    std::string url;
+    returnValue->Get(url);
+    DALI_TEST_EQUALS(TEST_IMAGE_FILE_NAME, url, TEST_LOCATION);
+  }
 
-  textSelectionPopup.SetProperty( TextSelectionPopup::Property::BACKGROUND_BORDER,
-                                  Property::Map().Add( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ) );
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSelectionPopupBackgroundP(void)
+{
+  ToolkitTestApplication application;
+  TextSelectionPopup     textSelectionPopup;
+  textSelectionPopup = TextSelectionPopup::New(NULL);
+
+  textSelectionPopup.SetProperty(TextSelectionPopup::Property::BACKGROUND,
+                                 Property::Map().Add(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME));
 
-  Property::Value value = textSelectionPopup.GetProperty( TextSelectionPopup::Property::BACKGROUND_BORDER );
+  Property::Value value = textSelectionPopup.GetProperty(TextSelectionPopup::Property::BACKGROUND);
 
   Property::Map map;
-  value.Get( map );
+  value.Get(map);
 
-  Property::Value* returnValue = map.Find( Dali::Toolkit::ImageVisual::Property::URL );
-  DALI_TEST_CHECK( NULL != returnValue );
+  Property::Value* returnValue = map.Find(Dali::Toolkit::ImageVisual::Property::URL);
+  DALI_TEST_CHECK(NULL != returnValue);
 
-  if( returnValue )
+  if(returnValue)
   {
     std::string url;
-    returnValue->Get( url );
-    DALI_TEST_EQUALS( TEST_IMAGE_FILE_NAME, url, TEST_LOCATION );
+    returnValue->Get(url);
+    DALI_TEST_EQUALS(TEST_IMAGE_FILE_NAME, url, TEST_LOCATION);
   }
 
   END_TEST;
@@ -150,27 +175,27 @@ int UtcDaliToolkitTextSelectionToolBarP(void)
 
   TextSelectionToolbar toolbar = TextSelectionToolbar::New();
 
-  toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size( 100.0f, 60.0f) );
+  toolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size(100.0f, 60.0f));
 
   Toolkit::PushButton option = Toolkit::PushButton::New();
-  option.SetProperty( Dali::Actor::Property::NAME, "test-option" );
-  option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  toolbar.AddOption( option );
+  option.SetProperty(Dali::Actor::Property::NAME, "test-option");
+  option.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
+  toolbar.AddOption(option);
 
   Toolkit::Control divider = Toolkit::Control::New();
-  divider.SetProperty( Actor::Property::SIZE, Vector2( 2.0f, 0.0f ) );
-  divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
-  toolbar.AddDivider( divider );
+  divider.SetProperty(Actor::Property::SIZE, Vector2(2.0f, 0.0f));
+  divider.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT);
+  toolbar.AddDivider(divider);
 
   Toolkit::PushButton option2 = Toolkit::PushButton::New();
-  option2.SetProperty( Dali::Actor::Property::NAME, "test-option-2" );
-  option2.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  toolbar.AddOption( option2 );
+  option2.SetProperty(Dali::Actor::Property::NAME, "test-option-2");
+  option2.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
+  toolbar.AddOption(option2);
 
-  Size newSize =  Size(3.0f, 0.0f);
-  toolbar.ResizeDividers( newSize );
+  Size newSize = Size(3.0f, 0.0f);
+  toolbar.ResizeDividers(newSize);
 
-  DALI_TEST_CHECK( toolbar );
+  DALI_TEST_CHECK(toolbar);
   END_TEST;
 }
 
@@ -181,20 +206,20 @@ int UtcDaliToolkitTextSelectionToolBarScrollBarP(void)
 
   TextSelectionToolbar toolbar = TextSelectionToolbar::New();
 
-  toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size( 100.0f, 60.0f) );
+  toolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size(100.0f, 60.0f));
 
   Toolkit::PushButton option = Toolkit::PushButton::New();
-  option.SetProperty( Dali::Actor::Property::NAME, "test-option" );
-  option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  toolbar.AddOption( option );
+  option.SetProperty(Dali::Actor::Property::NAME, "test-option");
+  option.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
+  toolbar.AddOption(option);
 
   // Add a scroll-bar
-  toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::ENABLE_SCROLL_BAR, true );
+  toolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::ENABLE_SCROLL_BAR, true);
 
-  bool enabled = toolbar.GetProperty<bool>( Toolkit::TextSelectionToolbar::Property::ENABLE_SCROLL_BAR );
-  DALI_TEST_CHECK( enabled );
+  bool enabled = toolbar.GetProperty<bool>(Toolkit::TextSelectionToolbar::Property::ENABLE_SCROLL_BAR);
+  DALI_TEST_CHECK(enabled);
 
-  DALI_TEST_CHECK( toolbar );
+  DALI_TEST_CHECK(toolbar);
   END_TEST;
 }
 
@@ -204,28 +229,28 @@ int UtcDaliToolkitTextSelectionToolBarScrollView(void)
   ToolkitTestApplication application;
 
   TextSelectionToolbar toolbar = TextSelectionToolbar::New();
-  DALI_TEST_CHECK( toolbar );
-  application.GetScene().Add( toolbar );
+  DALI_TEST_CHECK(toolbar);
+  application.GetScene().Add(toolbar);
 
   Property::Map map;
   map["overshootEffectColor"] = Color::RED;
-  map["overshootSize"] = Vector2(50.0f, 50.f);
-  toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::SCROLL_VIEW, map );
+  map["overshootSize"]        = Vector2(50.0f, 50.f);
+  toolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::SCROLL_VIEW, map);
 
   application.SendNotification();
   application.Render();
 
   Actor actor = toolbar.FindChildByName("TextSelectionScrollView");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  ScrollView scrollView = ScrollView::DownCast( actor );
-  DALI_TEST_CHECK( scrollView );
+  ScrollView scrollView = ScrollView::DownCast(actor);
+  DALI_TEST_CHECK(scrollView);
 
-  Vector4 color = scrollView.GetProperty<Vector4>( Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR );
-  DALI_TEST_EQUALS( color, Color::RED, TEST_LOCATION );
+  Vector4 color = scrollView.GetProperty<Vector4>(Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR);
+  DALI_TEST_EQUALS(color, Color::RED, TEST_LOCATION);
 
-  Vector2 size = scrollView.GetProperty<Vector2>( Toolkit::Scrollable::Property::OVERSHOOT_SIZE );
-  DALI_TEST_EQUALS( size, Vector2(50.0f, 50.f), TEST_LOCATION );
+  Vector2 size = scrollView.GetProperty<Vector2>(Toolkit::Scrollable::Property::OVERSHOOT_SIZE);
+  DALI_TEST_EQUALS(size, Vector2(50.0f, 50.f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -233,20 +258,22 @@ int UtcDaliToolkitTextSelectionToolBarScrollView(void)
 int UtcDaliToolkitTextSelectionPopupIconProperties(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup popup = TextSelectionPopup::New(nullptr);
+  TextSelectionPopup     popup = TextSelectionPopup::New(nullptr);
   popup.SetProperty(TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE, "POPUP_CLIPBOARD_BUTTON_ICON_IMAGE");
   popup.SetProperty(TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE, "POPUP_CUT_BUTTON_ICON_IMAGE");
   popup.SetProperty(TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE, "POPUP_COPY_BUTTON_ICON_IMAGE");
   popup.SetProperty(TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE, "POPUP_PASTE_BUTTON_ICON_IMAGE");
   popup.SetProperty(TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE, "POPUP_SELECT_BUTTON_ICON_IMAGE");
   popup.SetProperty(TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE, "POPUP_SELECT_ALL_BUTTON_ICON_IMAGE");
+  popup.SetProperty(TextSelectionPopup::Property::POPUP_PRESSED_IMAGE, "POPUP_PRESSED_IMAGE");
 
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_CLIPBOARD_BUTTON_ICON_IMAGE", TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_CUT_BUTTON_ICON_IMAGE", TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_COPY_BUTTON_ICON_IMAGE", TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_PASTE_BUTTON_ICON_IMAGE", TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_SELECT_BUTTON_ICON_IMAGE", TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_SELECT_ALL_BUTTON_ICON_IMAGE", TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_CLIPBOARD_BUTTON_ICON_IMAGE", TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_CUT_BUTTON_ICON_IMAGE", TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_COPY_BUTTON_ICON_IMAGE", TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_PASTE_BUTTON_ICON_IMAGE", TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_SELECT_BUTTON_ICON_IMAGE", TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE).Get<std::string>(), "POPUP_SELECT_ALL_BUTTON_ICON_IMAGE", TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_PRESSED_IMAGE).Get<std::string>(), "POPUP_PRESSED_IMAGE", TEST_LOCATION);
 
   END_TEST;
 }
@@ -254,7 +281,7 @@ int UtcDaliToolkitTextSelectionPopupIconProperties(void)
 int UtcDaliToolkitTextSelectionPopupSizeProperties(void)
 {
   ToolkitTestApplication application;
-  TextSelectionPopup popup = TextSelectionPopup::New(nullptr);
+  TextSelectionPopup     popup = TextSelectionPopup::New(nullptr);
 
   const Vector2 popupMaxSize(200.0f, 300.0f);
   const Vector2 optionMaxSize(50.0f, 100.0f);
@@ -267,11 +294,134 @@ int UtcDaliToolkitTextSelectionPopupSizeProperties(void)
   popup.SetProperty(TextSelectionPopup::Property::OPTION_DIVIDER_SIZE, optionDividerSize);
   popup.SetProperty(TextSelectionPopup::Property::OPTION_DIVIDER_PADDING, optionDividerPadding);
 
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::POPUP_MAX_SIZE).Get<Vector2>(), popupMaxSize, TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::OPTION_MAX_SIZE).Get<Vector2>(), optionMaxSize, TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::OPTION_MIN_SIZE).Get<Vector2>(), optionMinSize, TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::OPTION_DIVIDER_SIZE).Get<Vector2>(), optionDividerSize, TEST_LOCATION);
-  DALI_TEST_EQUALS( popup.GetProperty(TextSelectionPopup::Property::OPTION_DIVIDER_PADDING).Get<Vector4>(), optionDividerPadding, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_MAX_SIZE).Get<Vector2>(), popupMaxSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::OPTION_MAX_SIZE).Get<Vector2>(), optionMaxSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::OPTION_MIN_SIZE).Get<Vector2>(), optionMinSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::OPTION_DIVIDER_SIZE).Get<Vector2>(), optionDividerSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::OPTION_DIVIDER_PADDING).Get<Vector4>(), optionDividerPadding, TEST_LOCATION);
 
   END_TEST;
 }
+
+int UtcDaliToolkitTextSelectionPopupFloatProperties(void)
+{
+  ToolkitTestApplication application;
+  TextSelectionPopup     popup = TextSelectionPopup::New(nullptr);
+
+  const float popupFadeInDuration = 5.0f;
+  const float popupFadeOutDuration = 10.0f;
+  const float popupPressedCornerRadius = 15.0f;
+  popup.SetProperty(TextSelectionPopup::Property::POPUP_FADE_IN_DURATION, popupFadeInDuration);
+  popup.SetProperty(TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION, popupFadeOutDuration);
+  popup.SetProperty(TextSelectionPopup::Property::POPUP_PRESSED_CORNER_RADIUS, popupPressedCornerRadius);
+
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_FADE_IN_DURATION).Get<float>(), popupFadeInDuration, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION).Get<float>(), popupFadeOutDuration, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_PRESSED_CORNER_RADIUS).Get<float>(), popupPressedCornerRadius, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSelectionPopupColorProperties(void)
+{
+  ToolkitTestApplication application;
+  TextSelectionPopup     popup = TextSelectionPopup::New(nullptr);
+
+  popup.SetProperty(TextSelectionPopup::Property::POPUP_DIVIDER_COLOR, Color::RED);
+  popup.SetProperty(TextSelectionPopup::Property::POPUP_ICON_COLOR, Color::BLUE);
+  popup.SetProperty(TextSelectionPopup::Property::POPUP_PRESSED_COLOR, Color::BLACK);
+
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_DIVIDER_COLOR).Get<Vector4>(), Color::RED, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_ICON_COLOR).Get<Vector4>(), Color::BLUE, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::POPUP_PRESSED_COLOR).Get<Vector4>(), Color::BLACK, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSelectionPopupScrollBarP(void)
+{
+  ToolkitTestApplication application;
+  TextSelectionPopup     popup = TextSelectionPopup::New(nullptr);
+  DALI_TEST_CHECK(popup);
+
+  popup.SetProperty(TextSelectionPopup::Property::ENABLE_SCROLL_BAR, true);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::ENABLE_SCROLL_BAR).Get<bool>(), true, TEST_LOCATION);
+
+  popup.SetProperty(TextSelectionPopup::Property::ENABLE_SCROLL_BAR, false);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::ENABLE_SCROLL_BAR).Get<bool>(), false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSelectionPopupLabelTextVisualP(void)
+{
+  ToolkitTestApplication application;
+  TextSelectionPopup     popup = TextSelectionPopup::New(nullptr);
+  DALI_TEST_CHECK(popup);
+
+  Property::Map textVisualMapSet;
+
+  textVisualMapSet.Insert(TextVisual::Property::FONT_FAMILY, TEST_FONT_FAMILY);
+  textVisualMapSet.Insert(TextVisual::Property::POINT_SIZE, 50.f);
+  textVisualMapSet.Insert(TextVisual::Property::TEXT_COLOR, Color::RED);
+
+  popup.SetProperty(TextSelectionPopup::Property::LABEL_TEXT_VISUAL, textVisualMapSet);
+
+  Property::Map textVisualMapGet;
+  Property::Map styleMapGet;
+
+  textVisualMapGet = popup.GetProperty(TextSelectionPopup::Property::LABEL_TEXT_VISUAL).Get<Property::Map>();
+  DALI_TEST_EQUALS(textVisualMapGet.Count(), 3u, TEST_LOCATION);
+
+  Property::Value* returnValue;
+
+  returnValue = textVisualMapGet.Find(TextVisual::Property::FONT_FAMILY);
+  DALI_TEST_CHECK(NULL != returnValue);
+
+  if(returnValue)
+  {
+    std::string fontFamily;
+    returnValue->Get(fontFamily);
+    DALI_TEST_EQUALS(fontFamily, TEST_FONT_FAMILY, TEST_LOCATION);
+  }
+
+  returnValue = textVisualMapGet.Find(TextVisual::Property::POINT_SIZE);
+  DALI_TEST_CHECK(NULL != returnValue);
+
+  if(returnValue)
+  {
+    float pointSize;
+    returnValue->Get(pointSize);
+    DALI_TEST_EQUALS(pointSize, 50.0f, TEST_LOCATION);
+  }
+
+  returnValue = textVisualMapGet.Find(TextVisual::Property::TEXT_COLOR);
+  DALI_TEST_CHECK(NULL != returnValue);
+
+  if(returnValue)
+  {
+    Vector4 textColor;
+    returnValue->Get(textColor);
+    DALI_TEST_EQUALS(textColor, Color::RED, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliToolkitTextSelectionPopupLabelProperties(void)
+{
+  ToolkitTestApplication application;
+  TextSelectionPopup     popup = TextSelectionPopup::New(nullptr);
+  DALI_TEST_CHECK(popup);
+
+  const Vector2 labelMinimumSize(100.0f, 50.0f);
+  const Vector4 labelPadding(10.0f, 20.0f, 30.0f, 40.0f);
+
+  popup.SetProperty(TextSelectionPopup::Property::LABEL_MINIMUM_SIZE, labelMinimumSize);
+  popup.SetProperty(TextSelectionPopup::Property::LABEL_PADDING, labelPadding);
+
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::LABEL_MINIMUM_SIZE).Get<Vector2>(), labelMinimumSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(popup.GetProperty(TextSelectionPopup::Property::LABEL_PADDING).Get<Vector4>(), labelPadding, TEST_LOCATION);
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp
index 7d0e107..70284e8 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,39 +15,38 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <stdlib.h>
-#include <locale.h>
-#include <libintl.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
+#include <libintl.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <fstream>
+#include <iostream>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
-const char* DEFAULT_LOCALE_DIR = "/tmp/locale/";
+const char*        DEFAULT_LOCALE_DIR = "/tmp/locale/";
 static std::string gLocaleLang;
 static std::string gLocaleLanguage;
 
-}
+} // namespace
 
 void dali_textselectionpopupmirroringltr_startup(void)
 {
   // Keep the current locale environment.
-  char* langPtr = getenv( "LANG" );
-  gLocaleLang = std::string( langPtr );
+  char* langPtr = getenv("LANG");
+  gLocaleLang   = std::string(langPtr);
 
-  char* languagePtr = getenv( "LANGUAGE" );
-  gLocaleLanguage = std::string( languagePtr );
+  char* languagePtr = getenv("LANGUAGE");
+  gLocaleLanguage   = std::string(languagePtr);
 
   // Set the locale environment to Arabic.
-  setenv( "LANG", "en_GB.UTF-8", 1 );
-  setenv( "LANGUAGE", "en_GB:en", 1 );
+  setenv("LANG", "en_GB.UTF-8", 1);
+  setenv("LANGUAGE", "en_GB:en", 1);
 
   test_return_value = TET_UNDEF;
 }
@@ -55,8 +54,8 @@ void dali_textselectionpopupmirroringltr_startup(void)
 void dali_textselectionpopupmirroringltr_cleanup(void)
 {
   // Restore the locale environment.
-  setenv( "LANG", gLocaleLang.c_str(), 1 );
-  setenv( "LANGUAGE", gLocaleLanguage.c_str(), 1 );
+  setenv("LANG", gLocaleLang.c_str(), 1);
+  setenv("LANGUAGE", gLocaleLanguage.c_str(), 1);
 
   test_return_value = TET_PASS;
 }
@@ -64,41 +63,41 @@ void dali_textselectionpopupmirroringltr_cleanup(void)
 int UtcDaliToolkitTextSelectionPopupMirroringLTR(void)
 {
   // Test the popup mirroring.
-  const std::string CUT( "optionCut" );
-  const std::string COPY( "optionCopy" );
-  const std::string PASTE( "optionPaste" );
+  const std::string CUT("optionCut");
+  const std::string COPY("optionCopy");
+  const std::string PASTE("optionPaste");
 
   ToolkitTestApplication application;
 
-  setlocale( LC_ALL, "en_GB.UTF-8" );
+  setlocale(LC_ALL, "en_GB.UTF-8");
   textdomain("dali-toolkit");
-  bindtextdomain("dali-toolkit", DEFAULT_LOCALE_DIR );
+  bindtextdomain("dali-toolkit", DEFAULT_LOCALE_DIR);
 
-  TextSelectionPopup textSelectionPopup = TextSelectionPopup::New( NULL );
+  TextSelectionPopup textSelectionPopup = TextSelectionPopup::New(NULL);
 
   // Enable some buttons.
-  TextSelectionPopup::Buttons buttons = static_cast<TextSelectionPopup::Buttons>( TextSelectionPopup::COPY | TextSelectionPopup::CUT | TextSelectionPopup::PASTE );
-  textSelectionPopup.EnableButtons( buttons );
+  TextSelectionPopup::Buttons buttons = static_cast<TextSelectionPopup::Buttons>(TextSelectionPopup::COPY | TextSelectionPopup::CUT | TextSelectionPopup::PASTE);
+  textSelectionPopup.EnableButtons(buttons);
 
   // Show the popup.
   textSelectionPopup.ShowPopup();
 
-  Actor cutActor = textSelectionPopup.FindChildByName( CUT );
-  if( !cutActor )
+  Actor cutActor = textSelectionPopup.FindChildByName(CUT);
+  if(!cutActor)
   {
     tet_result(TET_FAIL);
   }
 
   Actor tableOfButtons = cutActor.GetParent();
-  if( !tableOfButtons )
+  if(!tableOfButtons)
   {
     tet_result(TET_FAIL);
   }
 
   // The order should be COPY, CUT, PASTE
-  DALI_TEST_EQUALS( COPY, tableOfButtons.GetChildAt( 0 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION );
-  DALI_TEST_EQUALS( CUT, tableOfButtons.GetChildAt( 2 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION );
-  DALI_TEST_EQUALS( PASTE, tableOfButtons.GetChildAt( 4 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION );
+  DALI_TEST_EQUALS(COPY, tableOfButtons.GetChildAt(0).GetProperty<std::string>(Dali::Actor::Property::NAME), TEST_LOCATION);
+  DALI_TEST_EQUALS(CUT, tableOfButtons.GetChildAt(2).GetProperty<std::string>(Dali::Actor::Property::NAME), TEST_LOCATION);
+  DALI_TEST_EQUALS(PASTE, tableOfButtons.GetChildAt(4).GetProperty<std::string>(Dali::Actor::Property::NAME), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp
index dc76c3c..187de57 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,39 +15,38 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <stdlib.h>
-#include <locale.h>
-#include <libintl.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
+#include <libintl.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <fstream>
+#include <iostream>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
-const char* DEFAULT_LOCALE_DIR = "/tmp/locale/";
+const char*        DEFAULT_LOCALE_DIR = "/tmp/locale/";
 static std::string gLocaleLang;
 static std::string gLocaleLanguage;
 
-}
+} // namespace
 
 void dali_textselectionpopupmirroringrtl_startup(void)
 {
   // Keep the current locale environment.
-  char* langPtr = getenv( "LANG" );
-  gLocaleLang = std::string( langPtr );
+  char* langPtr = getenv("LANG");
+  gLocaleLang   = std::string(langPtr);
 
-  char* languagePtr = getenv( "LANGUAGE" );
-  gLocaleLanguage = std::string( languagePtr );
+  char* languagePtr = getenv("LANGUAGE");
+  gLocaleLanguage   = std::string(languagePtr);
 
   // Set the locale environment to Arabic.
-  setenv( "LANG", "ar_AE.UTF-8", 1 );
-  setenv( "LANGUAGE", "ar_AE:ar", 1 );
+  setenv("LANG", "ar_AE.UTF-8", 1);
+  setenv("LANGUAGE", "ar_AE:ar", 1);
 
   test_return_value = TET_UNDEF;
 }
@@ -55,8 +54,8 @@ void dali_textselectionpopupmirroringrtl_startup(void)
 void dali_textselectionpopupmirroringrtl_cleanup(void)
 {
   // Restore the locale environment.
-  setenv( "LANG", gLocaleLang.c_str(), 1 );
-  setenv( "LANGUAGE", gLocaleLanguage.c_str(), 1 );
+  setenv("LANG", gLocaleLang.c_str(), 1);
+  setenv("LANGUAGE", gLocaleLanguage.c_str(), 1);
 
   test_return_value = TET_PASS;
 }
@@ -64,41 +63,41 @@ void dali_textselectionpopupmirroringrtl_cleanup(void)
 int UtcDaliToolkitTextSelectionPopupMirroringRTL(void)
 {
   // Test the popup mirroring.
-  const std::string CUT( "optionCut" );
-  const std::string COPY( "optionCopy" );
-  const std::string PASTE( "optionPaste" );
+  const std::string CUT("optionCut");
+  const std::string COPY("optionCopy");
+  const std::string PASTE("optionPaste");
 
   ToolkitTestApplication application;
 
-  setlocale( LC_ALL, "ar_AE.UTF-8" );
+  setlocale(LC_ALL, "ar_AE.UTF-8");
   textdomain("dali-toolkit");
-  bindtextdomain("dali-toolkit", DEFAULT_LOCALE_DIR );
+  bindtextdomain("dali-toolkit", DEFAULT_LOCALE_DIR);
 
-  TextSelectionPopup textSelectionPopup = TextSelectionPopup::New( NULL );
+  TextSelectionPopup textSelectionPopup = TextSelectionPopup::New(NULL);
 
   // Enable some buttons.
-  TextSelectionPopup::Buttons buttons = static_cast<TextSelectionPopup::Buttons>( TextSelectionPopup::COPY | TextSelectionPopup::CUT | TextSelectionPopup::PASTE );
-  textSelectionPopup.EnableButtons( buttons );
+  TextSelectionPopup::Buttons buttons = static_cast<TextSelectionPopup::Buttons>(TextSelectionPopup::COPY | TextSelectionPopup::CUT | TextSelectionPopup::PASTE);
+  textSelectionPopup.EnableButtons(buttons);
 
   // Show the popup.
   textSelectionPopup.ShowPopup();
 
-  Actor cutActor = textSelectionPopup.FindChildByName( CUT );
-  if( !cutActor )
+  Actor cutActor = textSelectionPopup.FindChildByName(CUT);
+  if(!cutActor)
   {
     tet_result(TET_FAIL);
   }
 
   Actor tableOfButtons = cutActor.GetParent();
-  if( !tableOfButtons )
+  if(!tableOfButtons)
   {
     tet_result(TET_FAIL);
   }
 
   // The order should be PASTE, CUT, COPY
-  DALI_TEST_EQUALS( PASTE, tableOfButtons.GetChildAt( 0 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION );
-  DALI_TEST_EQUALS( CUT, tableOfButtons.GetChildAt( 2 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION );
-  DALI_TEST_EQUALS( COPY, tableOfButtons.GetChildAt( 4 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION );
+  DALI_TEST_EQUALS(PASTE, tableOfButtons.GetChildAt(0).GetProperty<std::string>(Dali::Actor::Property::NAME), TEST_LOCATION);
+  DALI_TEST_EQUALS(CUT, tableOfButtons.GetChildAt(2).GetProperty<std::string>(Dali::Actor::Property::NAME), TEST_LOCATION);
+  DALI_TEST_EQUALS(COPY, tableOfButtons.GetChildAt(4).GetProperty<std::string>(Dali::Actor::Property::NAME), TEST_LOCATION);
 
   tet_result(TET_PASS);
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextureManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextureManager.cpp
index 72370db..beba867 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextureManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextureManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <dali/public-api/rendering/texture.h>
-#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -28,7 +28,6 @@ namespace
 {
 } // namespace
 
-
 void dali_texture_manager_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -42,66 +41,95 @@ void dali_texture_manager_cleanup(void)
 int UtcDaliTextureManagerAddRemoveP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliTextureManager" );
+  tet_infoline("UtcDaliTextureManager");
 
   std::string url;
   std::string url2;
   std::string url3;
   std::string url4;
+  std::string url5;
+  std::string url6;
   // scope to ensure texturesets are kept alive by texture manager
   {
-    auto texture = Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, 88, 99 );
-    url = TextureManager::AddTexture( texture );
-    DALI_TEST_CHECK( url.size() > 0u );
+    auto texture = Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, 88, 99);
+    url          = TextureManager::AddTexture(texture);
+    DALI_TEST_CHECK(url.size() > 0u);
 
     auto textureSet = TextureSet::New();
-    textureSet.SetTexture( 0u, texture );
-    url2 = TextureManager::AddTexture( textureSet );
-    DALI_TEST_CHECK( url2.size() > 0u );
-    DALI_TEST_CHECK( url2 != url );
+    textureSet.SetTexture(0u, texture);
+    url2 = TextureManager::AddTexture(textureSet);
+    DALI_TEST_CHECK(url2.size() > 0u);
+    DALI_TEST_CHECK(url2 != url);
 
     // add same texture again, should give new Url
-    url3 = TextureManager::AddTexture( texture );
-    DALI_TEST_CHECK( url3.size() > 0u );
-    DALI_TEST_CHECK( url3 != url );
-    DALI_TEST_CHECK( url3 != url2 );
+    url3 = TextureManager::AddTexture(texture);
+    DALI_TEST_CHECK(url3.size() > 0u);
+    DALI_TEST_CHECK(url3 != url);
+    DALI_TEST_CHECK(url3 != url2);
+
+    textureSet = TextureSet::New();
+    url4       = TextureManager::AddTexture(textureSet);
+    DALI_TEST_CHECK(url4.size() > 0u);
+    DALI_TEST_CHECK(url4 != url);
+    DALI_TEST_CHECK(url4 != url2);
+    DALI_TEST_CHECK(url4 != url3);
+
+    // add same texture again with preMultiplied, should give new Url
+    url5 = TextureManager::AddTexture(texture, true);
+    DALI_TEST_CHECK(url5.size() > 0u);
+    DALI_TEST_CHECK(url5 != url);
+    DALI_TEST_CHECK(url5 != url2);
+    DALI_TEST_CHECK(url5 != url3);
+    DALI_TEST_CHECK(url5 != url4);
 
     textureSet = TextureSet::New();
-    url4 = TextureManager::AddTexture( textureSet );
-    DALI_TEST_CHECK( url4.size() > 0u );
-    DALI_TEST_CHECK( url4 != url );
-    DALI_TEST_CHECK( url4 != url2 );
-    DALI_TEST_CHECK( url4 != url3 );
+    url6       = TextureManager::AddTexture(textureSet, true);
+    DALI_TEST_CHECK(url6.size() > 0u);
+    DALI_TEST_CHECK(url6 != url);
+    DALI_TEST_CHECK(url6 != url2);
+    DALI_TEST_CHECK(url6 != url3);
+    DALI_TEST_CHECK(url6 != url4);
+    DALI_TEST_CHECK(url6 != url5);
   }
 
-  auto textureSet = TextureManager::RemoveTexture( url );
-  DALI_TEST_CHECK( textureSet && "Texture needs to be non empty handle" );
-  auto texture = textureSet.GetTexture( 0u );
-  DALI_TEST_EQUAL( texture.GetWidth(), 88u );
-  DALI_TEST_EQUAL( texture.GetHeight(), 99u );
-  textureSet = TextureManager::RemoveTexture( url );
-  DALI_TEST_CHECK( !textureSet && "Texture needs to be removed from texture manager" );
-
-  textureSet = TextureManager::RemoveTexture( url2 );
-  DALI_TEST_CHECK( textureSet && "Texture needs to be non empty handle" );
-  texture = textureSet.GetTexture( 0u );
-  DALI_TEST_EQUAL( texture.GetWidth(), 88u );
-  DALI_TEST_EQUAL( texture.GetHeight(), 99u );
-  textureSet = TextureManager::RemoveTexture( url2 );
-  DALI_TEST_CHECK( !textureSet && "Texture needs to be removed from texture manager" );
-
-  textureSet = TextureManager::RemoveTexture( url3 );
-  DALI_TEST_CHECK( textureSet && "Texture needs to be non empty handle" );
-  texture = textureSet.GetTexture( 0u );
-  DALI_TEST_EQUAL( texture.GetWidth(), 88u );
-  DALI_TEST_EQUAL( texture.GetHeight(), 99u );
-  textureSet = TextureManager::RemoveTexture( url3 );
-  DALI_TEST_CHECK( !textureSet && "Texture needs to be removed from texture manager" );
-
-  textureSet = TextureManager::RemoveTexture( url4 );
-  DALI_TEST_CHECK( textureSet && "Texture needs to be non empty handle" );
-  textureSet = TextureManager::RemoveTexture( url4 );
-  DALI_TEST_CHECK( !textureSet && "Texture needs to be removed from texture manager" );
+  auto textureSet = TextureManager::RemoveTexture(url);
+  DALI_TEST_CHECK(textureSet && "Texture needs to be non empty handle");
+  auto texture = textureSet.GetTexture(0u);
+  DALI_TEST_EQUAL(texture.GetWidth(), 88u);
+  DALI_TEST_EQUAL(texture.GetHeight(), 99u);
+  textureSet = TextureManager::RemoveTexture(url);
+  DALI_TEST_CHECK(!textureSet && "Texture needs to be removed from texture manager");
+
+  textureSet = TextureManager::RemoveTexture(url2);
+  DALI_TEST_CHECK(textureSet && "Texture needs to be non empty handle");
+  texture = textureSet.GetTexture(0u);
+  DALI_TEST_EQUAL(texture.GetWidth(), 88u);
+  DALI_TEST_EQUAL(texture.GetHeight(), 99u);
+  textureSet = TextureManager::RemoveTexture(url2);
+  DALI_TEST_CHECK(!textureSet && "Texture needs to be removed from texture manager");
+
+  textureSet = TextureManager::RemoveTexture(url3);
+  DALI_TEST_CHECK(textureSet && "Texture needs to be non empty handle");
+  texture = textureSet.GetTexture(0u);
+  DALI_TEST_EQUAL(texture.GetWidth(), 88u);
+  DALI_TEST_EQUAL(texture.GetHeight(), 99u);
+  textureSet = TextureManager::RemoveTexture(url3);
+  DALI_TEST_CHECK(!textureSet && "Texture needs to be removed from texture manager");
+
+  textureSet = TextureManager::RemoveTexture(url4);
+  DALI_TEST_CHECK(textureSet && "Texture needs to be non empty handle");
+  textureSet = TextureManager::RemoveTexture(url4);
+  DALI_TEST_CHECK(!textureSet && "Texture needs to be removed from texture manager");
+
+  textureSet = TextureManager::RemoveTexture(url5);
+  DALI_TEST_CHECK(textureSet && "Texture needs to be non empty handle");
+  textureSet = TextureManager::RemoveTexture(url5);
+  DALI_TEST_CHECK(!textureSet && "Texture needs to be removed from texture manager");
+
+  textureSet = TextureManager::RemoveTexture(url6);
+  DALI_TEST_CHECK(textureSet && "Texture needs to be non empty handle");
+  textureSet = TextureManager::RemoveTexture(url6);
+  DALI_TEST_CHECK(!textureSet && "Texture needs to be removed from texture manager");
 
   END_TEST;
 }
@@ -109,12 +137,12 @@ int UtcDaliTextureManagerAddRemoveP(void)
 int UtcDaliTextureManagerAddN(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliTextureManager" );
+  tet_infoline("UtcDaliTextureManager");
 
   // empty texture is ok, though pointless from app point of view
-  TextureSet empty;
-  std::string url = TextureManager::AddTexture( empty );
-  DALI_TEST_CHECK( url.size() > 0u );
+  TextureSet  empty;
+  std::string url = TextureManager::AddTexture(empty);
+  DALI_TEST_CHECK(url.size() > 0u);
 
   END_TEST;
 }
@@ -122,32 +150,32 @@ int UtcDaliTextureManagerAddN(void)
 int UtcDaliTextureManagerRemoveN(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliTextureManager" );
+  tet_infoline("UtcDaliTextureManager");
 
   // removing empty texture returns empty handle
-  auto texture = TextureManager::RemoveTexture( "" );
-  DALI_TEST_CHECK( !texture && "Texture should not be found" );
+  auto texture = TextureManager::RemoveTexture("");
+  DALI_TEST_CHECK(!texture && "Texture should not be found");
 
   // removing empty texture returns empty handle
-  texture = TextureManager::RemoveTexture( "dali://" );
-  DALI_TEST_CHECK( !texture && "Texture should not be found" );
+  texture = TextureManager::RemoveTexture("dali://");
+  DALI_TEST_CHECK(!texture && "Texture should not be found");
 
   // empty texture is ok, though pointless from app point of view
-  TextureSet empty;
-  std::string url = TextureManager::AddTexture( empty );
-  DALI_TEST_CHECK( url.size() > 0u );
+  TextureSet  empty;
+  std::string url = TextureManager::AddTexture(empty);
+  DALI_TEST_CHECK(url.size() > 0u);
   // removing texture with wrong URL returns empty handle
-  texture = TextureManager::RemoveTexture( "dali://" );
-  DALI_TEST_CHECK( !texture && "Texture should not be found" );
+  texture = TextureManager::RemoveTexture("dali://");
+  DALI_TEST_CHECK(!texture && "Texture should not be found");
 
   // removing ftp texture returns empty handle
-  texture = TextureManager::RemoveTexture( "ftp://foobar" );
-  DALI_TEST_CHECK( !texture && "Texture should not be found" );
+  texture = TextureManager::RemoveTexture("ftp://foobar");
+  DALI_TEST_CHECK(!texture && "Texture should not be found");
 
   // add a texture
-  url = TextureManager::AddTexture( texture );
-  texture = TextureManager::RemoveTexture( url + "foo" );
-  DALI_TEST_CHECK( !texture && "Texture should not be found" );
+  url     = TextureManager::AddTexture(texture);
+  texture = TextureManager::RemoveTexture(url + "foo");
+  DALI_TEST_CHECK(!texture && "Texture should not be found");
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp
index 6d3424e..4386a0f 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,12 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
-
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -43,9 +42,9 @@ static const char* TEST_IMAGE_TWO   = TEST_RESOURCE_DIR "/icon-edit.png";
 static const char* TEST_IMAGE_THREE = TEST_RESOURCE_DIR "/popup_tail_down.png";
 static const char* TEST_IMAGE_FOUR  = TEST_RESOURCE_DIR "/popup_tail_up.png";
 
-static const Vector2 INSIDE_TOUCH_POINT_POSITON  = Vector2( 240, 400 );
-static const Vector3 BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS  = Vector3( 200, 360, 0 );
-static const Size BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS  = Size( 100, 100 );
+static const Vector2 INSIDE_TOUCH_POINT_POSITON                = Vector2(240, 400);
+static const Vector3 BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS = Vector3(200, 360, 0);
+static const Size    BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS    = Size(100, 100);
 
 static bool gObjectCreatedCallBackCalled;
 
@@ -57,20 +56,20 @@ static void TestCallback(BaseHandle handle)
 Dali::Integration::Point GetPointDownInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(INSIDE_TOUCH_POINT_POSITON);
   return point;
 }
 
 Dali::Integration::Point GetPointUpInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(INSIDE_TOUCH_POINT_POSITON);
   return point;
 }
 
-}
+} // namespace
 
 int UtcDaliToggleButtonConstructorP(void)
 {
@@ -78,7 +77,7 @@ int UtcDaliToggleButtonConstructorP(void)
   tet_infoline(" UtcDaliToggleButtonConstructorP");
 
   ToggleButton button;
-  DALI_TEST_CHECK( !button );
+  DALI_TEST_CHECK(!button);
   END_TEST;
 }
 
@@ -90,8 +89,8 @@ int UtcDaliToggleButtonCopyConstructorP(void)
   // Initialize an object, ref count == 1
   ToggleButton button = ToggleButton::New();
 
-  ToggleButton copy( button );
-  DALI_TEST_CHECK( copy );
+  ToggleButton copy(button);
+  DALI_TEST_CHECK(copy);
   END_TEST;
 }
 
@@ -102,10 +101,10 @@ int UtcDaliToggleButtonAssignmentOperatorP(void)
 
   ToggleButton button = ToggleButton::New();
 
-  ToggleButton copy( button );
-  DALI_TEST_CHECK( copy );
+  ToggleButton copy(button);
+  DALI_TEST_CHECK(copy);
 
-  DALI_TEST_CHECK( button == copy );
+  DALI_TEST_CHECK(button == copy);
   END_TEST;
 }
 
@@ -117,26 +116,26 @@ int UtcDaliToggleButtonNewP(void)
   // Create the Slider actor
   ToggleButton toggleButton;
 
-  DALI_TEST_CHECK( !toggleButton );
+  DALI_TEST_CHECK(!toggleButton);
 
   toggleButton = ToggleButton::New();
 
-  DALI_TEST_CHECK( toggleButton );
+  DALI_TEST_CHECK(toggleButton);
 
   ToggleButton toggleButton2(toggleButton);
 
-  DALI_TEST_CHECK( toggleButton2 == toggleButton );
+  DALI_TEST_CHECK(toggleButton2 == toggleButton);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     ToggleButton toggleButton = ToggleButton::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -148,7 +147,7 @@ int UtcDaliToggleButtonDestructorP(void)
   ToggleButton* toggleButton = new ToggleButton();
   delete toggleButton;
 
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK(true);
   END_TEST;
 }
 
@@ -157,228 +156,228 @@ int UtcDaliToggleButtonDownCast(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliToggleButtonDownCast");
 
-  Handle handle = ToggleButton::New();
-  ToggleButton toggleButton = ToggleButton::DownCast( handle );
+  Handle       handle       = ToggleButton::New();
+  ToggleButton toggleButton = ToggleButton::DownCast(handle);
 
-  DALI_TEST_CHECK( toggleButton == handle );
+  DALI_TEST_CHECK(toggleButton == handle);
   END_TEST;
 }
 
 int UtcDaliToggleButtonToggleStatesProperty(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliToggleButtonToggleStatesProperty");
 
   // Create the ToggleButton actor
   ToggleButton toggleButton = ToggleButton::New();
-  application.GetScene().Add( toggleButton );
-  toggleButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  toggleButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  toggleButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
+  application.GetScene().Add(toggleButton);
+  toggleButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  toggleButton.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  toggleButton.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
 
-  {// Check empty array
+  { // Check empty array
     Property::Array toggleIcons;
-    toggleButton.SetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons );
+    toggleButton.SetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons);
 
     application.SendNotification();
     application.Render();
 
     Property::Array resultIcons;
-    resultIcons = toggleButton.GetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS ).Get<Property::Array>();
-    DALI_TEST_CHECK( resultIcons.Count() == 0 );
+    resultIcons = toggleButton.GetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS).Get<Property::Array>();
+    DALI_TEST_CHECK(resultIcons.Count() == 0);
   }
 
-  {// Check non-empty Array
+  { // Check non-empty Array
     Property::Array toggleIcons;
-    toggleIcons.PushBack( TEST_IMAGE_ONE ); //Icons path
-    toggleIcons.PushBack( TEST_IMAGE_TWO );
-    toggleIcons.PushBack( TEST_IMAGE_THREE );
-    toggleIcons.PushBack( TEST_IMAGE_FOUR );
-    toggleButton.SetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons );
+    toggleIcons.PushBack(TEST_IMAGE_ONE); //Icons path
+    toggleIcons.PushBack(TEST_IMAGE_TWO);
+    toggleIcons.PushBack(TEST_IMAGE_THREE);
+    toggleIcons.PushBack(TEST_IMAGE_FOUR);
+    toggleButton.SetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons);
 
     application.SendNotification();
     application.Render();
 
     Property::Array resultIcons;
-    resultIcons = toggleButton.GetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS ).Get<Property::Array>();
+    resultIcons = toggleButton.GetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS).Get<Property::Array>();
 
     // Check that the result is the same as
-    DALI_TEST_EQUALS( toggleIcons.Count(), resultIcons.Count(), TEST_LOCATION );
-    DALI_TEST_CHECK( toggleIcons[0].Get<std::string>() == resultIcons[0].Get<std::string>() );
-    DALI_TEST_CHECK( toggleIcons[1].Get<std::string>() == resultIcons[1].Get<std::string>() );
-    DALI_TEST_CHECK( toggleIcons[2].Get<std::string>() == resultIcons[2].Get<std::string>() );
-    DALI_TEST_CHECK( toggleIcons[3].Get<std::string>() == resultIcons[3].Get<std::string>() );
+    DALI_TEST_EQUALS(toggleIcons.Count(), resultIcons.Count(), TEST_LOCATION);
+    DALI_TEST_CHECK(toggleIcons[0].Get<std::string>() == resultIcons[0].Get<std::string>());
+    DALI_TEST_CHECK(toggleIcons[1].Get<std::string>() == resultIcons[1].Get<std::string>());
+    DALI_TEST_CHECK(toggleIcons[2].Get<std::string>() == resultIcons[2].Get<std::string>());
+    DALI_TEST_CHECK(toggleIcons[3].Get<std::string>() == resultIcons[3].Get<std::string>());
   }
 
-  {// Check property::map
+  { // Check property::map
     Property::Map propertyMap1;
-    Vector4 testColor1( 1.f, 0.5f, 0.3f, 0.2f );
-    propertyMap1.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::COLOR);
-    propertyMap1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR,  testColor1);
+    Vector4       testColor1(1.f, 0.5f, 0.3f, 0.2f);
+    propertyMap1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
+    propertyMap1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, testColor1);
 
     Property::Map propertyMap2;
-    Vector4 testColor2( 0.5f, 1.f, 0.3f, 0.2f );
-    propertyMap2.Insert(Toolkit::Visual::Property::TYPE,  Toolkit::Visual::COLOR);
-    propertyMap2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR,  testColor2);
+    Vector4       testColor2(0.5f, 1.f, 0.3f, 0.2f);
+    propertyMap2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
+    propertyMap2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, testColor2);
 
     Property::Map propertyMap3;
-    Vector4 testColor3( 1.f, 0.5f, 1.f, 0.2f );
-    propertyMap3.Insert(Toolkit::Visual::Property::TYPE,  Toolkit::Visual::COLOR);
-    propertyMap3.Insert(Toolkit::ColorVisual::Property::MIX_COLOR,  testColor3);
+    Vector4       testColor3(1.f, 0.5f, 1.f, 0.2f);
+    propertyMap3.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
+    propertyMap3.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, testColor3);
 
     Property::Array toggleMaps;
-    toggleMaps.Add( propertyMap1 );
-    toggleMaps.Add( propertyMap2 );
-    toggleMaps.Add( propertyMap3 );
-    toggleButton.SetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS, toggleMaps );
+    toggleMaps.Add(propertyMap1);
+    toggleMaps.Add(propertyMap2);
+    toggleMaps.Add(propertyMap3);
+    toggleButton.SetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS, toggleMaps);
 
     application.SendNotification();
     application.Render();
 
     Property::Array resultMaps;
-    resultMaps = toggleButton.GetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS ).Get<Property::Array>();
+    resultMaps = toggleButton.GetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS).Get<Property::Array>();
 
     // Check that the result
-    DALI_TEST_EQUALS( toggleMaps.Count(), resultMaps.Count(), TEST_LOCATION );
+    DALI_TEST_EQUALS(toggleMaps.Count(), resultMaps.Count(), TEST_LOCATION);
   }
 
   END_TEST;
 }
 
-int UtcDaliToggleButtonToggleTipsProperty( void )
+int UtcDaliToggleButtonToggleTipsProperty(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliToggleButtonToggleTipsProperty");
 
   // Create the ToggleButton actor
   ToggleButton toggleButton = ToggleButton::New();
-  application.GetScene().Add( toggleButton );
-  toggleButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  toggleButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  toggleButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
+  application.GetScene().Add(toggleButton);
+  toggleButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  toggleButton.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  toggleButton.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
 
   { // Check empty tip array
     Property::Array toggleIcons;
-    toggleIcons.PushBack( TEST_IMAGE_ONE ); //Icons path
-    toggleIcons.PushBack( TEST_IMAGE_TWO );
-    toggleIcons.PushBack( TEST_IMAGE_THREE );
-    toggleButton.SetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons );
+    toggleIcons.PushBack(TEST_IMAGE_ONE); //Icons path
+    toggleIcons.PushBack(TEST_IMAGE_TWO);
+    toggleIcons.PushBack(TEST_IMAGE_THREE);
+    toggleButton.SetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons);
 
     Property::Array toggleTips;
-    toggleButton.SetProperty( Toolkit::ToggleButton::Property::TOOLTIPS, toggleTips );
+    toggleButton.SetProperty(Toolkit::ToggleButton::Property::TOOLTIPS, toggleTips);
 
     application.SendNotification();
     application.Render();
 
     Property::Array resultTips;
-    resultTips = toggleButton.GetProperty( Toolkit::ToggleButton::Property::TOOLTIPS ).Get<Property::Array>();
-    DALI_TEST_CHECK( resultTips.Count() == 0 );
+    resultTips = toggleButton.GetProperty(Toolkit::ToggleButton::Property::TOOLTIPS).Get<Property::Array>();
+    DALI_TEST_CHECK(resultTips.Count() == 0);
   }
 
   { // Check non-empty tip array
     Property::Array toggleIcons;
-    toggleIcons.PushBack( TEST_IMAGE_ONE ); //Icons path
-    toggleIcons.PushBack( TEST_IMAGE_TWO );
-    toggleIcons.PushBack( TEST_IMAGE_THREE );
-    toggleButton.SetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons );
+    toggleIcons.PushBack(TEST_IMAGE_ONE); //Icons path
+    toggleIcons.PushBack(TEST_IMAGE_TWO);
+    toggleIcons.PushBack(TEST_IMAGE_THREE);
+    toggleButton.SetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons);
 
     Property::Array toggleTips;
-    toggleTips.PushBack( "Button State A" ); //Tooltip string
-    toggleTips.PushBack( "Button State B" );
-    toggleTips.PushBack( "Button State C" );
-    toggleButton.SetProperty( Toolkit::ToggleButton::Property::TOOLTIPS, toggleTips );
+    toggleTips.PushBack("Button State A"); //Tooltip string
+    toggleTips.PushBack("Button State B");
+    toggleTips.PushBack("Button State C");
+    toggleButton.SetProperty(Toolkit::ToggleButton::Property::TOOLTIPS, toggleTips);
 
     application.SendNotification();
     application.Render();
 
     Property::Array resultTips;
-    resultTips = toggleButton.GetProperty( Toolkit::ToggleButton::Property::TOOLTIPS ).Get<Property::Array>();
+    resultTips = toggleButton.GetProperty(Toolkit::ToggleButton::Property::TOOLTIPS).Get<Property::Array>();
 
     //Check that the result is the same as
-    DALI_TEST_EQUALS( toggleTips.Count(), resultTips.Count(), TEST_LOCATION );
-    DALI_TEST_CHECK( toggleTips[0].Get<std::string>() == resultTips[0].Get<std::string>() );
-    DALI_TEST_CHECK( toggleTips[1].Get<std::string>() == resultTips[1].Get<std::string>() );
-    DALI_TEST_CHECK( toggleTips[2].Get<std::string>() == resultTips[2].Get<std::string>() );
-    DALI_TEST_CHECK( toggleTips[3].Get<std::string>() == resultTips[3].Get<std::string>() );
+    DALI_TEST_EQUALS(toggleTips.Count(), resultTips.Count(), TEST_LOCATION);
+    DALI_TEST_CHECK(toggleTips[0].Get<std::string>() == resultTips[0].Get<std::string>());
+    DALI_TEST_CHECK(toggleTips[1].Get<std::string>() == resultTips[1].Get<std::string>());
+    DALI_TEST_CHECK(toggleTips[2].Get<std::string>() == resultTips[2].Get<std::string>());
+    DALI_TEST_CHECK(toggleTips[3].Get<std::string>() == resultTips[3].Get<std::string>());
   }
   END_TEST;
 }
 
 int UtcDaliToggleButtonStateChange(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
   tet_infoline(" UtcDaliToggleButtonStateChange");
 
   // Create the ToggleButton actor
   ToggleButton toggleButton = ToggleButton::New();
-  application.GetScene().Add( toggleButton );
-  toggleButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
-  toggleButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
-  toggleButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS );
-  toggleButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS );
+  application.GetScene().Add(toggleButton);
+  toggleButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  toggleButton.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
+  toggleButton.SetProperty(Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS);
+  toggleButton.SetProperty(Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS);
 
   Property::Array toggleIcons;
-  toggleIcons.PushBack( TEST_IMAGE_ONE ); //Icons path
-  toggleIcons.PushBack( TEST_IMAGE_TWO );
-  toggleIcons.PushBack( TEST_IMAGE_THREE );
-  toggleButton.SetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons );
+  toggleIcons.PushBack(TEST_IMAGE_ONE); //Icons path
+  toggleIcons.PushBack(TEST_IMAGE_TWO);
+  toggleIcons.PushBack(TEST_IMAGE_THREE);
+  toggleButton.SetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS, toggleIcons);
 
   Property::Array toggleTips;
-  toggleTips.PushBack( "Button State A" ); //Tooltip string
-  toggleTips.PushBack( "Button State B" );
-  toggleTips.PushBack( "Button State C" );
-  toggleButton.SetProperty( Toolkit::ToggleButton::Property::TOOLTIPS, toggleTips );
+  toggleTips.PushBack("Button State A"); //Tooltip string
+  toggleTips.PushBack("Button State B");
+  toggleTips.PushBack("Button State C");
+  toggleButton.SetProperty(Toolkit::ToggleButton::Property::TOOLTIPS, toggleTips);
 
   application.SendNotification();
   application.Render();
 
   Property::Array resultIcons;
-  resultIcons = toggleButton.GetProperty( Toolkit::ToggleButton::Property::STATE_VISUALS ).Get<Property::Array>();
-  DALI_TEST_EQUALS( toggleIcons.Count(), resultIcons.Count(), TEST_LOCATION );
+  resultIcons = toggleButton.GetProperty(Toolkit::ToggleButton::Property::STATE_VISUALS).Get<Property::Array>();
+  DALI_TEST_EQUALS(toggleIcons.Count(), resultIcons.Count(), TEST_LOCATION);
 
   Property::Array resultTips;
-  resultTips = toggleButton.GetProperty( Toolkit::ToggleButton::Property::TOOLTIPS ).Get<Property::Array>();
-  DALI_TEST_EQUALS( toggleTips.Count(), resultTips.Count(), TEST_LOCATION );
+  resultTips = toggleButton.GetProperty(Toolkit::ToggleButton::Property::TOOLTIPS).Get<Property::Array>();
+  DALI_TEST_EQUALS(toggleTips.Count(), resultTips.Count(), TEST_LOCATION);
 
   int index;
-  DALI_TEST_CHECK( toggleButton.GetProperty( Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX ).Get( index ) );
-  DALI_TEST_EQUALS( index, 0, TEST_LOCATION );
+  DALI_TEST_CHECK(toggleButton.GetProperty(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX).Get(index));
+  DALI_TEST_EQUALS(index, 0, TEST_LOCATION);
 
   Dali::Integration::TouchEvent event;
 
   // Touch point down and up inside the button 3 times.
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( toggleButton.GetProperty( Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX ).Get( index ) );
-  DALI_TEST_EQUALS( index, 1, TEST_LOCATION );
+  DALI_TEST_CHECK(toggleButton.GetProperty(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX).Get(index));
+  DALI_TEST_EQUALS(index, 1, TEST_LOCATION);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( toggleButton.GetProperty( Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX ).Get( index ) );
-  DALI_TEST_EQUALS( index, 2, TEST_LOCATION );
+  DALI_TEST_CHECK(toggleButton.GetProperty(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX).Get(index));
+  DALI_TEST_EQUALS(index, 2, TEST_LOCATION);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( toggleButton.GetProperty( Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX ).Get( index ) );
-  DALI_TEST_EQUALS( index, 0, TEST_LOCATION );
+  DALI_TEST_CHECK(toggleButton.GetProperty(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX).Get(index));
+  DALI_TEST_EQUALS(index, 0, TEST_LOCATION);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
index c4777bc..85f1ceb 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <stdlib.h>
+#include <iostream>
 #include "dummy-control.h"
 
 using namespace Dali;
@@ -36,17 +36,17 @@ static void TestCallback(BaseHandle handle)
   gObjectCreatedCallBackCalled = true;
 }
 
-Actor CreateColorActor( const Vector4& color )
+Actor CreateColorActor(const Vector4& color)
 {
-  DummyControl solidColorActor = DummyControl::New();
-  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(solidColorActor.GetImplementation());
+  DummyControl      solidColorActor = DummyControl::New();
+  DummyControlImpl& dummyImpl       = static_cast<DummyControlImpl&>(solidColorActor.GetImplementation());
 
-  VisualFactory factory = VisualFactory::Get();
+  VisualFactory       factory = VisualFactory::Get();
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
-  map[ ColorVisual::Property::MIX_COLOR ] = color;
-  Visual::Base colorVisual = factory.CreateVisual( map );
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, colorVisual );
+  map[Toolkit::Visual::Property::TYPE]  = Visual::COLOR;
+  map[ColorVisual::Property::MIX_COLOR] = color;
+  Visual::Base colorVisual              = factory.CreateVisual(map);
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, colorVisual);
 
   return solidColorActor;
 }
@@ -63,7 +63,6 @@ void dali_toolbar_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 int UtcDaliToolBarNew(void)
 {
   ToolkitTestApplication application;
@@ -71,31 +70,31 @@ int UtcDaliToolBarNew(void)
 
   ToolBar toolbar;
 
-  DALI_TEST_CHECK( !toolbar );
+  DALI_TEST_CHECK(!toolbar);
 
   toolbar = ToolBar::New();
 
-  DALI_TEST_CHECK( toolbar );
+  DALI_TEST_CHECK(toolbar);
 
   ToolBar toolbar2(toolbar);
 
-  DALI_TEST_CHECK( toolbar2 == toolbar );
+  DALI_TEST_CHECK(toolbar2 == toolbar);
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
   registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     ToolBar toolbar = ToolBar::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   Actor actor = toolbar;
-  toolbar = ToolBar::DownCast( actor );
+  toolbar     = ToolBar::DownCast(actor);
 
-  DALI_TEST_CHECK( toolbar );
+  DALI_TEST_CHECK(toolbar);
   END_TEST;
 }
 
@@ -106,48 +105,48 @@ int UtcDaliToolBarAddControl01(void)
 
   try
   {
-    Actor control1 = CreateColorActor( Color::RED );
-    control1.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-    Actor control2 = CreateColorActor( Color::RED );
-    control2.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-    Actor control3 = CreateColorActor( Color::RED );
-    control3.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-    Actor control4 = CreateColorActor( Color::RED );
-    control4.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-    Actor control5 = CreateColorActor( Color::RED );
-    control5.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+    Actor control1 = CreateColorActor(Color::RED);
+    control1.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+    Actor control2 = CreateColorActor(Color::RED);
+    control2.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+    Actor control3 = CreateColorActor(Color::RED);
+    control3.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+    Actor control4 = CreateColorActor(Color::RED);
+    control4.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+    Actor control5 = CreateColorActor(Color::RED);
+    control5.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
     ToolBar toolbar = ToolBar::New();
-    toolbar.SetProperty( Actor::Property::SIZE, Vector2( 600.f, 100.f ) );
+    toolbar.SetProperty(Actor::Property::SIZE, Vector2(600.f, 100.f));
 
     application.Render();
     application.SendNotification();
     application.Render();
     application.SendNotification();
 
-    toolbar.Add( control1 );
-    toolbar.AddControl( control2, 0.1f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control3, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control4, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control5, 0.1f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.Add(control1);
+    toolbar.AddControl(control2, 0.1f, Alignment::HORIZONTAL_LEFT, Alignment::Padding(1.f, 1.f, 1.f, 1.f));
+    toolbar.AddControl(control3, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding(1.f, 1.f, 1.f, 1.f));
+    toolbar.AddControl(control4, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding(1.f, 1.f, 1.f, 1.f));
+    toolbar.AddControl(control5, 0.1f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding(1.f, 1.f, 1.f, 1.f));
 
-    Actor control6 = CreateColorActor( Color::RED );
-    control6.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-    Actor control7 = CreateColorActor( Color::RED );
-    control7.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-    Actor control8 = CreateColorActor( Color::RED );
-    control8.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+    Actor control6 = CreateColorActor(Color::RED);
+    control6.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+    Actor control7 = CreateColorActor(Color::RED);
+    control7.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+    Actor control8 = CreateColorActor(Color::RED);
+    control8.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
     application.Render();
     application.SendNotification();
     application.Render();
     application.SendNotification();
 
-    toolbar.AddControl( control6, 0.4f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control7, 0.2f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control8, 0.2f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl(control6, 0.4f, Alignment::HORIZONTAL_LEFT, Alignment::Padding(1.f, 1.f, 1.f, 1.f));
+    toolbar.AddControl(control7, 0.2f, Alignment::HORIZONTAL_CENTER, Alignment::Padding(1.f, 1.f, 1.f, 1.f));
+    toolbar.AddControl(control8, 0.2f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding(1.f, 1.f, 1.f, 1.f));
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -165,23 +164,23 @@ int UtcDaliToolBarAddControl02(void)
 
   try
   {
-    Actor control = CreateColorActor( Color::RED );
+    Actor control = CreateColorActor(Color::RED);
 
     ToolBar toolbar = ToolBar::New();
 
-    toolbar.AddControl( control, 0.1f, static_cast<Alignment::Type>( 99 ), Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl(control, 0.1f, static_cast<Alignment::Type>(99), Alignment::Padding(1.f, 1.f, 1.f, 1.f));
   }
-  catch( DaliException e )
+  catch(DaliException e)
   {
     daliAssert = true;
     tet_result(TET_PASS);
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
 
-  if( !daliAssert )
+  if(!daliAssert)
   {
     tet_result(TET_FAIL);
   }
@@ -195,14 +194,14 @@ int UtcDaliToolBarRemoveControl01(void)
 
   try
   {
-    Actor control = CreateColorActor( Color::RED );
+    Actor control = CreateColorActor(Color::RED);
 
     ToolBar toolbar = ToolBar::New();
-    toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT );
+    toolbar.AddControl(control, 0.1f, Alignment::HORIZONTAL_LEFT);
 
-    toolbar.RemoveControl( control );
+    toolbar.RemoveControl(control);
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
@@ -218,37 +217,37 @@ int UtcDaliToolBarRemoveControl02(void)
 
   try
   {
-    Actor control01 = CreateColorActor( Color::RED );
-    Actor control02 = CreateColorActor( Color::RED );
+    Actor control01 = CreateColorActor(Color::RED);
+    Actor control02 = CreateColorActor(Color::RED);
 
     ToolBar toolbar01 = ToolBar::New();
     ToolBar toolbar02 = ToolBar::New();
-    toolbar01.AddControl( control01, 0.1f, Alignment::HORIZONTAL_LEFT );
-    toolbar02.AddControl( control02, 0.1f, Alignment::HORIZONTAL_LEFT );
+    toolbar01.AddControl(control01, 0.1f, Alignment::HORIZONTAL_LEFT);
+    toolbar02.AddControl(control02, 0.1f, Alignment::HORIZONTAL_LEFT);
 
-    toolbar02.RemoveControl( control01 );
+    toolbar02.RemoveControl(control01);
   }
-  catch( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_EQUALS(e.condition, "false", TEST_LOCATION);
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
 
   try
   {
-    Actor control = CreateColorActor( Color::RED );
+    Actor control = CreateColorActor(Color::RED);
 
     ToolBar toolbar = ToolBar::New();
-    toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT );
+    toolbar.AddControl(control, 0.1f, Alignment::HORIZONTAL_LEFT);
 
-    toolbar.RemoveControl( control );
-    toolbar.RemoveControl( control );
+    toolbar.RemoveControl(control);
+    toolbar.RemoveControl(control);
   }
-  catch( ... )
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Toolkit.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Toolkit.cpp
index bf75f39..74339f9 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Toolkit.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Toolkit.cpp
@@ -15,10 +15,10 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -41,10 +41,10 @@ int UtcToolkitIsVertical(void)
 
   tet_infoline(" UtcToolkitIsVertical");
   bRet = IsVertical(ControlOrientation::Up);
-  DALI_TEST_EQUALS( bRet, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(bRet, true, TEST_LOCATION);
 
   bRet = IsVertical(ControlOrientation::Down);
-  DALI_TEST_EQUALS( bRet, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(bRet, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -57,11 +57,10 @@ int UtcToolkitIsHorizontal(void)
 
   tet_infoline(" UtcToolkitIsHorizontal");
   bRet = IsHorizontal(ControlOrientation::Left);
-  DALI_TEST_EQUALS( bRet, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(bRet, true, TEST_LOCATION);
 
   bRet = IsHorizontal(ControlOrientation::Right);
-  DALI_TEST_EQUALS( bRet, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(bRet, true, TEST_LOCATION);
 
   END_TEST;
 }
-
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
index 3d68d5a..709d326 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,19 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-timer.h>
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
 #include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h>
+#include <dali.h>
 #include <dali/integration-api/events/hover-event-integ.h>
 
 using namespace Dali;
@@ -49,14 +49,13 @@ void utc_dali_toolkit_tooltip_cleanup(void)
 
 namespace
 {
-
-Integration::HoverEvent GenerateSingleHover( PointState::Type state, const Vector2& screenPosition )
+Integration::HoverEvent GenerateSingleHover(PointState::Type state, const Vector2& screenPosition)
 {
   Integration::HoverEvent hoverEvent;
-  Integration::Point point;
-  point.SetState( static_cast< PointState::Type >( state ) );
-  point.SetScreenPosition( screenPosition );
-  hoverEvent.points.push_back( point );
+  Integration::Point      point;
+  point.SetState(static_cast<PointState::Type>(state));
+  point.SetScreenPosition(screenPosition);
+  hoverEvent.points.push_back(point);
   return hoverEvent;
 }
 
@@ -66,454 +65,429 @@ Integration::HoverEvent GenerateSingleHover( PointState::Type state, const Vecto
 
 int UtcDaliTooltipGetWithoutSetting(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
 
-  tet_infoline( "Ensure map is valid" );
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Ensure map is empty" );
-  DALI_TEST_EQUALS( true, map->Empty(), TEST_LOCATION );
+  tet_infoline("Ensure map is empty");
+  DALI_TEST_EQUALS(true, map->Empty(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithString(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP, "Hello Test" );
+  control.SetProperty(DevelControl::Property::TOOLTIP, "Hello Test");
 
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
 
-  tet_infoline( "Ensure map is valid" );
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Ensure map contains the content" );
-  Property::Value* contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  tet_infoline("Ensure map contains the content");
+  Property::Value* contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
 
-  tet_infoline( "Check content is a property map" );
+  tet_infoline("Check content is a property map");
   Property::Map* contentMap = contentValue->GetMap();
-  DALI_TEST_CHECK( contentMap );
+  DALI_TEST_CHECK(contentMap);
 
-  tet_infoline( "Check that the map contains the text item" );
-  Property::Value* textStringValue = contentMap->Find( TextVisual::Property::TEXT );
-  DALI_TEST_CHECK( textStringValue );
+  tet_infoline("Check that the map contains the text item");
+  Property::Value* textStringValue = contentMap->Find(TextVisual::Property::TEXT);
+  DALI_TEST_CHECK(textStringValue);
 
-  tet_infoline( "Ensure it matches what we set" );
-  DALI_TEST_EQUALS( "Hello Test", textStringValue->Get< std::string >(), TEST_LOCATION );
+  tet_infoline("Ensure it matches what we set");
+  DALI_TEST_EQUALS("Hello Test", textStringValue->Get<std::string>(), TEST_LOCATION);
 
-  tet_infoline( "We sent valid text, so ensure the hover signal has been connected to" );
-  DALI_TEST_EQUALS( control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+  tet_infoline("We sent valid text, so ensure the hover signal has been connected to");
+  DALI_TEST_EQUALS(control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithTextVisualMap(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
-                                                           .Add( TextVisual::Property::TEXT, "Hello TextVisual Test" ) )
-                     );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT,
+                                          Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::TEXT).Add(TextVisual::Property::TEXT, "Hello TextVisual Test")));
 
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
 
-  tet_infoline( "Ensure map is valid" );
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Ensure map contains the content" );
-  Property::Value* contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  tet_infoline("Ensure map contains the content");
+  Property::Value* contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
 
-  tet_infoline( "Check content is a property map" );
+  tet_infoline("Check content is a property map");
   Property::Map* contentMap = contentValue->GetMap();
-  DALI_TEST_CHECK( contentMap );
+  DALI_TEST_CHECK(contentMap);
 
-  tet_infoline( "Check that the map contains the text item" );
-  Property::Value* textStringValue = contentMap->Find( TextVisual::Property::TEXT );
-  DALI_TEST_CHECK( textStringValue );
+  tet_infoline("Check that the map contains the text item");
+  Property::Value* textStringValue = contentMap->Find(TextVisual::Property::TEXT);
+  DALI_TEST_CHECK(textStringValue);
 
-  tet_infoline( "Ensure it matches what we set" );
-  DALI_TEST_EQUALS( "Hello TextVisual Test", textStringValue->Get< std::string >(), TEST_LOCATION );
+  tet_infoline("Ensure it matches what we set");
+  DALI_TEST_EQUALS("Hello TextVisual Test", textStringValue->Get<std::string>(), TEST_LOCATION);
 
-  tet_infoline( "We sent a text visual with TEXT property set, so ensure the hover signal has been connected to" );
-  DALI_TEST_EQUALS( control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+  tet_infoline("We sent a text visual with TEXT property set, so ensure the hover signal has been connected to");
+  DALI_TEST_EQUALS(control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithTextVisualMapWithoutString(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
-                                                           .Add( TextVisual::Property::POINT_SIZE, 20 ) )
-                     );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT,
+                                          Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::TEXT).Add(TextVisual::Property::POINT_SIZE, 20)));
 
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
 
-  tet_infoline( "Ensure map is valid" );
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Ensure map contains the content" );
-  Property::Value* contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  tet_infoline("Ensure map contains the content");
+  Property::Value* contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
 
-  tet_infoline( "Check content is a property map" );
+  tet_infoline("Check content is a property map");
   Property::Map* contentMap = contentValue->GetMap();
-  DALI_TEST_CHECK( contentMap );
+  DALI_TEST_CHECK(contentMap);
 
-  tet_infoline( "Check that the map contains the point-size item" );
-  Property::Value* pointSizeValue = contentMap->Find( TextVisual::Property::POINT_SIZE );
-  DALI_TEST_CHECK( pointSizeValue );
+  tet_infoline("Check that the map contains the point-size item");
+  Property::Value* pointSizeValue = contentMap->Find(TextVisual::Property::POINT_SIZE);
+  DALI_TEST_CHECK(pointSizeValue);
 
-  tet_infoline( "Ensure it matches what we set" );
-  DALI_TEST_EQUALS( 20, pointSizeValue->Get< int >(), TEST_LOCATION );
+  tet_infoline("Ensure it matches what we set");
+  DALI_TEST_EQUALS(20, pointSizeValue->Get<int>(), TEST_LOCATION);
 
-  tet_infoline( "We sent a text visual without a TEXT property set, so ensure the hover signal has NOT been connected to" );
-  DALI_TEST_EQUALS( control.HoveredSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+  tet_infoline("We sent a text visual without a TEXT property set, so ensure the hover signal has NOT been connected to");
+  DALI_TEST_EQUALS(control.HoveredSignal().GetConnectionCount(), 0u, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithImageVisualMap(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
-                                                           .Add( ImageVisual::Property::URL, "dummy-url.png" ) )
-                     );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT,
+                                          Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE).Add(ImageVisual::Property::URL, "dummy-url.png")));
 
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
 
-  tet_infoline( "Ensure map is valid" );
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Ensure map contains the content" );
-  Property::Value* contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  tet_infoline("Ensure map contains the content");
+  Property::Value* contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
 
-  tet_infoline( "Check content is a property map" );
+  tet_infoline("Check content is a property map");
   Property::Map* contentMap = contentValue->GetMap();
-  DALI_TEST_CHECK( contentMap );
+  DALI_TEST_CHECK(contentMap);
 
-  tet_infoline( "Check that the map contains the url item" );
-  Property::Value* urlValue = contentMap->Find( ImageVisual::Property::URL );
-  DALI_TEST_CHECK( urlValue );
+  tet_infoline("Check that the map contains the url item");
+  Property::Value* urlValue = contentMap->Find(ImageVisual::Property::URL);
+  DALI_TEST_CHECK(urlValue);
 
-  tet_infoline( "Ensure it matches what we set" );
-  DALI_TEST_EQUALS( "dummy-url.png", urlValue->Get< std::string >(), TEST_LOCATION );
+  tet_infoline("Ensure it matches what we set");
+  DALI_TEST_EQUALS("dummy-url.png", urlValue->Get<std::string>(), TEST_LOCATION);
 
-  tet_infoline( "We sent an ImageVisual, so ensure the hover signal has been connected to" );
-  DALI_TEST_EQUALS( control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+  tet_infoline("We sent an ImageVisual, so ensure the hover signal has been connected to");
+  DALI_TEST_EQUALS(control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithArray(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
-                                                             .Add( ImageVisual::Property::URL, "dummy-url.png" ) )
-                                        .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
-                                                             .Add( TextVisual::Property::TEXT, "Hello Array Test" ) )
-                     );
-
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
-
-  tet_infoline( "Ensure map is valid" );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Array().Add(Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE).Add(ImageVisual::Property::URL, "dummy-url.png")).Add(Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::TEXT).Add(TextVisual::Property::TEXT, "Hello Array Test")));
+
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
+
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Ensure map contains the content" );
-  Property::Value* contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  tet_infoline("Ensure map contains the content");
+  Property::Value* contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
 
-  tet_infoline( "Check content is a property array" );
+  tet_infoline("Check content is a property array");
   Property::Array* contentArray = contentValue->GetArray();
-  DALI_TEST_CHECK( contentArray );
-
-  tet_infoline( "Ensure the array contains two items" );
-  DALI_TEST_EQUALS( 2u, contentArray->Count(), TEST_LOCATION );
-
-  tet_infoline( "Ensure first value is a map and contains the right item" );
-  const Property::Value mapValue1 = contentArray->GetElementAt( 0 );
-  const Property::Map* map1 = mapValue1.GetMap();
-  DALI_TEST_CHECK( map1 );
-  Property::Value* urlValue = map1->Find( ImageVisual::Property::URL );
-  DALI_TEST_CHECK( urlValue );
-  DALI_TEST_EQUALS( "dummy-url.png", urlValue->Get< std::string >(), TEST_LOCATION );
-
-  tet_infoline( "Ensure second value is a map and contains the right item" );
-  const Property::Value mapValue2 = contentArray->GetElementAt( 1 );
-  const Property::Map* map2 = mapValue2.GetMap();
-  DALI_TEST_CHECK( map2 );
-  Property::Value* textValue = map2->Find( TextVisual::Property::TEXT );
-  DALI_TEST_CHECK( textValue );
-  DALI_TEST_EQUALS( "Hello Array Test", textValue->Get< std::string >(), TEST_LOCATION );
-
-  tet_infoline( "We sent an array, so ensure the hover signal has been connected to" );
-  DALI_TEST_EQUALS( control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+  DALI_TEST_CHECK(contentArray);
+
+  tet_infoline("Ensure the array contains two items");
+  DALI_TEST_EQUALS(2u, contentArray->Count(), TEST_LOCATION);
+
+  tet_infoline("Ensure first value is a map and contains the right item");
+  const Property::Value mapValue1 = contentArray->GetElementAt(0);
+  const Property::Map*  map1      = mapValue1.GetMap();
+  DALI_TEST_CHECK(map1);
+  Property::Value* urlValue = map1->Find(ImageVisual::Property::URL);
+  DALI_TEST_CHECK(urlValue);
+  DALI_TEST_EQUALS("dummy-url.png", urlValue->Get<std::string>(), TEST_LOCATION);
+
+  tet_infoline("Ensure second value is a map and contains the right item");
+  const Property::Value mapValue2 = contentArray->GetElementAt(1);
+  const Property::Map*  map2      = mapValue2.GetMap();
+  DALI_TEST_CHECK(map2);
+  Property::Value* textValue = map2->Find(TextVisual::Property::TEXT);
+  DALI_TEST_CHECK(textValue);
+  DALI_TEST_EQUALS("Hello Array Test", textValue->Get<std::string>(), TEST_LOCATION);
+
+  tet_infoline("We sent an array, so ensure the hover signal has been connected to");
+  DALI_TEST_EQUALS(control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithFullMap(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
-                                                           .Add( TextVisual::Property::TEXT, "Hello TextVisual Test" ) )
-                                      .Add( Tooltip::Property::LAYOUT, Vector2( 1.0f, 2.0f ) )
-                                      .Add( Tooltip::Property::WAIT_TIME, 2.5f )
-                                      .Add( Tooltip::Property::BACKGROUND, "tooltip-background.png" )
-                                      .Add( Tooltip::Property::TAIL, true )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::HOVER_POINT )
-                                      .Add( Tooltip::Property::HOVER_POINT_OFFSET, Vector2( 100.0f, 50.f ) )
-                                      .Add( Tooltip::Property::MOVEMENT_THRESHOLD, 50 )
-                                      .Add( Tooltip::Property::DISAPPEAR_ON_MOVEMENT, true )
-                     );
-
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
-
-  tet_infoline( "Ensure map is valid" );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT,
+                                          Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::TEXT).Add(TextVisual::Property::TEXT, "Hello TextVisual Test"))
+                        .Add(Tooltip::Property::LAYOUT, Vector2(1.0f, 2.0f))
+                        .Add(Tooltip::Property::WAIT_TIME, 2.5f)
+                        .Add(Tooltip::Property::BACKGROUND, "tooltip-background.png")
+                        .Add(Tooltip::Property::TAIL, true)
+                        .Add(Tooltip::Property::POSITION, Tooltip::Position::HOVER_POINT)
+                        .Add(Tooltip::Property::HOVER_POINT_OFFSET, Vector2(100.0f, 50.f))
+                        .Add(Tooltip::Property::MOVEMENT_THRESHOLD, 50)
+                        .Add(Tooltip::Property::DISAPPEAR_ON_MOVEMENT, true));
+
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
+
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Check content" );
-  Property::Value* contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  tet_infoline("Check content");
+  Property::Value* contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
   Property::Map* contentMap = contentValue->GetMap();
-  DALI_TEST_CHECK( contentMap );
+  DALI_TEST_CHECK(contentMap);
 
-  tet_infoline( "Check layout" );
-  Property::Value* layoutValue = map->Find( Tooltip::Property::LAYOUT );
-  DALI_TEST_CHECK( layoutValue );
-  DALI_TEST_EQUALS( layoutValue->Get< Vector2 >(), Vector2( 1.0f, 2.0f ), TEST_LOCATION );
+  tet_infoline("Check layout");
+  Property::Value* layoutValue = map->Find(Tooltip::Property::LAYOUT);
+  DALI_TEST_CHECK(layoutValue);
+  DALI_TEST_EQUALS(layoutValue->Get<Vector2>(), Vector2(1.0f, 2.0f), TEST_LOCATION);
 
-  tet_infoline( "Check wait time" );
-  Property::Value* waitTimeValue = map->Find( Tooltip::Property::WAIT_TIME );
-  DALI_TEST_CHECK( waitTimeValue );
-  DALI_TEST_EQUALS( waitTimeValue->Get< float >(), 2.5f, TEST_LOCATION );
+  tet_infoline("Check wait time");
+  Property::Value* waitTimeValue = map->Find(Tooltip::Property::WAIT_TIME);
+  DALI_TEST_CHECK(waitTimeValue);
+  DALI_TEST_EQUALS(waitTimeValue->Get<float>(), 2.5f, TEST_LOCATION);
 
-  tet_infoline( "Check background" );
-  Property::Value* backgroundMapValue = map->Find( Tooltip::Property::BACKGROUND );
-  DALI_TEST_CHECK( backgroundMapValue );
+  tet_infoline("Check background");
+  Property::Value* backgroundMapValue = map->Find(Tooltip::Property::BACKGROUND);
+  DALI_TEST_CHECK(backgroundMapValue);
   Property::Map* backgroundMap = backgroundMapValue->GetMap();
-  DALI_TEST_CHECK( backgroundMap );
-  Property::Value* backgroundStringValue = backgroundMap->Find( Tooltip::Background::Property::VISUAL );
-  DALI_TEST_CHECK( backgroundStringValue );
-  DALI_TEST_EQUALS( backgroundStringValue->Get< std::string >(), "tooltip-background.png", TEST_LOCATION );
-
-  tet_infoline( "Check Tail" );
-  Property::Value* tailMapValue = map->Find( Tooltip::Property::TAIL );
-  DALI_TEST_CHECK( tailMapValue );
+  DALI_TEST_CHECK(backgroundMap);
+  Property::Value* backgroundStringValue = backgroundMap->Find(Tooltip::Background::Property::VISUAL);
+  DALI_TEST_CHECK(backgroundStringValue);
+  DALI_TEST_EQUALS(backgroundStringValue->Get<std::string>(), "tooltip-background.png", TEST_LOCATION);
+
+  tet_infoline("Check Tail");
+  Property::Value* tailMapValue = map->Find(Tooltip::Property::TAIL);
+  DALI_TEST_CHECK(tailMapValue);
   Property::Map* tailMap = tailMapValue->GetMap();
-  DALI_TEST_CHECK( tailMap );
-  Property::Value* tailVisibilityValue = tailMap->Find( Tooltip::Tail::Property::VISIBILITY );
-  DALI_TEST_CHECK( tailVisibilityValue );
-  DALI_TEST_EQUALS( tailVisibilityValue->Get< bool >(), true, TEST_LOCATION );
-
-  tet_infoline( "Check position" );
-  Property::Value* positionValue = map->Find( Tooltip::Property::POSITION );
-  DALI_TEST_CHECK( positionValue );
-  DALI_TEST_EQUALS( positionValue->Get< int >(), static_cast< int >( Tooltip::Position::HOVER_POINT ), TEST_LOCATION );
-
-  tet_infoline( "Check hover point offset" );
-  Property::Value* hoverPointOffsetValue = map->Find( Tooltip::Property::HOVER_POINT_OFFSET );
-  DALI_TEST_CHECK( hoverPointOffsetValue );
-  DALI_TEST_EQUALS( hoverPointOffsetValue->Get< Vector2 >(), Vector2( 100.0f, 50.f ), TEST_LOCATION );
-
-  tet_infoline( "Check movement threshold" );
-  Property::Value* movementThresholdValue = map->Find( Tooltip::Property::MOVEMENT_THRESHOLD );
-  DALI_TEST_CHECK( movementThresholdValue );
-  DALI_TEST_EQUALS( movementThresholdValue->Get< int >(), 50, TEST_LOCATION );
-
-  tet_infoline( "Check disappear on movement" );
-  Property::Value* disappearOnMovementValue = map->Find( Tooltip::Property::DISAPPEAR_ON_MOVEMENT );
-  DALI_TEST_CHECK( disappearOnMovementValue );
-  DALI_TEST_EQUALS( disappearOnMovementValue->Get< bool >(), true, TEST_LOCATION );
-
-  tet_infoline( "We sent a text visual with TEXT property set, so ensure the hover signal has been connected to" );
-  DALI_TEST_EQUALS( control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+  DALI_TEST_CHECK(tailMap);
+  Property::Value* tailVisibilityValue = tailMap->Find(Tooltip::Tail::Property::VISIBILITY);
+  DALI_TEST_CHECK(tailVisibilityValue);
+  DALI_TEST_EQUALS(tailVisibilityValue->Get<bool>(), true, TEST_LOCATION);
+
+  tet_infoline("Check position");
+  Property::Value* positionValue = map->Find(Tooltip::Property::POSITION);
+  DALI_TEST_CHECK(positionValue);
+  DALI_TEST_EQUALS(positionValue->Get<int>(), static_cast<int>(Tooltip::Position::HOVER_POINT), TEST_LOCATION);
+
+  tet_infoline("Check hover point offset");
+  Property::Value* hoverPointOffsetValue = map->Find(Tooltip::Property::HOVER_POINT_OFFSET);
+  DALI_TEST_CHECK(hoverPointOffsetValue);
+  DALI_TEST_EQUALS(hoverPointOffsetValue->Get<Vector2>(), Vector2(100.0f, 50.f), TEST_LOCATION);
+
+  tet_infoline("Check movement threshold");
+  Property::Value* movementThresholdValue = map->Find(Tooltip::Property::MOVEMENT_THRESHOLD);
+  DALI_TEST_CHECK(movementThresholdValue);
+  DALI_TEST_EQUALS(movementThresholdValue->Get<int>(), 50, TEST_LOCATION);
+
+  tet_infoline("Check disappear on movement");
+  Property::Value* disappearOnMovementValue = map->Find(Tooltip::Property::DISAPPEAR_ON_MOVEMENT);
+  DALI_TEST_CHECK(disappearOnMovementValue);
+  DALI_TEST_EQUALS(disappearOnMovementValue->Get<bool>(), true, TEST_LOCATION);
+
+  tet_infoline("We sent a text visual with TEXT property set, so ensure the hover signal has been connected to");
+  DALI_TEST_EQUALS(control.HoveredSignal().GetConnectionCount(), 1u, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithBackgroundMap(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Hello TextVisual Test" )
-                                      .Add( Tooltip::Property::BACKGROUND,
-                                            Property::Map().Add( Tooltip::Background::Property::VISUAL, "tooltip-background.png" )
-                                                           .Add( Tooltip::Background::Property::BORDER, Rect< int >( 10, 20, 30, 40 ) ) )
-                     );
-
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
-
-  tet_infoline( "Ensure map is valid" );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Hello TextVisual Test").Add(Tooltip::Property::BACKGROUND, Property::Map().Add(Tooltip::Background::Property::VISUAL, "tooltip-background.png").Add(Tooltip::Background::Property::BORDER, Rect<int>(10, 20, 30, 40))));
+
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
+
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Check background map" );
-  Property::Value* backgroundMapValue = map->Find( Tooltip::Property::BACKGROUND );
-  DALI_TEST_CHECK( backgroundMapValue );
+  tet_infoline("Check background map");
+  Property::Value* backgroundMapValue = map->Find(Tooltip::Property::BACKGROUND);
+  DALI_TEST_CHECK(backgroundMapValue);
   Property::Map* backgroundMap = backgroundMapValue->GetMap();
-  DALI_TEST_CHECK( backgroundMap );
+  DALI_TEST_CHECK(backgroundMap);
 
-  tet_infoline( "Check visual" );
-  Property::Value* backgroundStringValue = backgroundMap->Find( Tooltip::Background::Property::VISUAL );
-  DALI_TEST_CHECK( backgroundStringValue );
-  DALI_TEST_EQUALS( backgroundStringValue->Get< std::string >(), "tooltip-background.png", TEST_LOCATION );
+  tet_infoline("Check visual");
+  Property::Value* backgroundStringValue = backgroundMap->Find(Tooltip::Background::Property::VISUAL);
+  DALI_TEST_CHECK(backgroundStringValue);
+  DALI_TEST_EQUALS(backgroundStringValue->Get<std::string>(), "tooltip-background.png", TEST_LOCATION);
 
-  tet_infoline( "Check border" );
-  Property::Value* borderValue = backgroundMap->Find( Tooltip::Background::Property::BORDER );
-  DALI_TEST_CHECK( borderValue );
-  DALI_TEST_EQUALS( borderValue->Get< Rect< int > >(), Rect< int >( 10, 20, 30, 40 ), TEST_LOCATION );
+  tet_infoline("Check border");
+  Property::Value* borderValue = backgroundMap->Find(Tooltip::Background::Property::BORDER);
+  DALI_TEST_CHECK(borderValue);
+  DALI_TEST_EQUALS(borderValue->Get<Rect<int> >(), Rect<int>(10, 20, 30, 40), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithBackgroundMapVector4(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Hello TextVisual Test" )
-                                      .Add( Tooltip::Property::BACKGROUND,
-                                            Property::Map().Add( Tooltip::Background::Property::VISUAL, "tooltip-background.png" )
-                                                           .Add( Tooltip::Background::Property::BORDER, Vector4( 40.0f, 30.0f, 20.0f, 10.0f ) ) )
-                     );
-
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
-
-  tet_infoline( "Ensure map is valid" );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Hello TextVisual Test").Add(Tooltip::Property::BACKGROUND, Property::Map().Add(Tooltip::Background::Property::VISUAL, "tooltip-background.png").Add(Tooltip::Background::Property::BORDER, Vector4(40.0f, 30.0f, 20.0f, 10.0f))));
+
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
+
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Check background map" );
-  Property::Value* backgroundMapValue = map->Find( Tooltip::Property::BACKGROUND );
-  DALI_TEST_CHECK( backgroundMapValue );
+  tet_infoline("Check background map");
+  Property::Value* backgroundMapValue = map->Find(Tooltip::Property::BACKGROUND);
+  DALI_TEST_CHECK(backgroundMapValue);
   Property::Map* backgroundMap = backgroundMapValue->GetMap();
-  DALI_TEST_CHECK( backgroundMap );
+  DALI_TEST_CHECK(backgroundMap);
 
-  tet_infoline( "Check visual" );
-  Property::Value* backgroundStringValue = backgroundMap->Find( Tooltip::Background::Property::VISUAL );
-  DALI_TEST_CHECK( backgroundStringValue );
-  DALI_TEST_EQUALS( backgroundStringValue->Get< std::string >(), "tooltip-background.png", TEST_LOCATION );
+  tet_infoline("Check visual");
+  Property::Value* backgroundStringValue = backgroundMap->Find(Tooltip::Background::Property::VISUAL);
+  DALI_TEST_CHECK(backgroundStringValue);
+  DALI_TEST_EQUALS(backgroundStringValue->Get<std::string>(), "tooltip-background.png", TEST_LOCATION);
 
-  tet_infoline( "Check border" );
-  Property::Value* borderValue = backgroundMap->Find( Tooltip::Background::Property::BORDER );
-  DALI_TEST_CHECK( borderValue );
-  DALI_TEST_EQUALS( borderValue->Get< Rect< int > >(), Rect< int >( 40, 30, 20, 10 ), TEST_LOCATION );
+  tet_infoline("Check border");
+  Property::Value* borderValue = backgroundMap->Find(Tooltip::Background::Property::BORDER);
+  DALI_TEST_CHECK(borderValue);
+  DALI_TEST_EQUALS(borderValue->Get<Rect<int> >(), Rect<int>(40, 30, 20, 10), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipCreateWithTailMap(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Hello TextVisual Test" )
-                                      .Add( Tooltip::Property::TAIL,
-                                            Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
-                                                           .Add( Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png" )
-                                                           .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ))
-                     );
-
-  tet_infoline( "Check if Property::MAP is returned" );
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
-
-  tet_infoline( "Ensure map is valid" );
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Hello TextVisual Test").Add(Tooltip::Property::TAIL, Property::Map().Add(Tooltip::Tail::Property::VISIBILITY, true).Add(Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png").Add(Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png")));
+
+  tet_infoline("Check if Property::MAP is returned");
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
+
+  tet_infoline("Ensure map is valid");
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  DALI_TEST_CHECK(map);
 
-  tet_infoline( "Check Tail" );
-  Property::Value* tailMapValue = map->Find( Tooltip::Property::TAIL );
-  DALI_TEST_CHECK( tailMapValue );
+  tet_infoline("Check Tail");
+  Property::Value* tailMapValue = map->Find(Tooltip::Property::TAIL);
+  DALI_TEST_CHECK(tailMapValue);
   Property::Map* tailMap = tailMapValue->GetMap();
-  DALI_TEST_CHECK( tailMap );
+  DALI_TEST_CHECK(tailMap);
 
-  tet_infoline( "Check visibility" );
-  Property::Value* tailVisibilityValue = tailMap->Find( Tooltip::Tail::Property::VISIBILITY );
-  DALI_TEST_CHECK( tailVisibilityValue );
-  DALI_TEST_EQUALS( tailVisibilityValue->Get< bool >(), true, TEST_LOCATION );
+  tet_infoline("Check visibility");
+  Property::Value* tailVisibilityValue = tailMap->Find(Tooltip::Tail::Property::VISIBILITY);
+  DALI_TEST_CHECK(tailVisibilityValue);
+  DALI_TEST_EQUALS(tailVisibilityValue->Get<bool>(), true, TEST_LOCATION);
 
-  tet_infoline( "Check above visual" );
-  Property::Value* aboveVisualValue = tailMap->Find( Tooltip::Tail::Property::ABOVE_VISUAL );
-  DALI_TEST_CHECK( aboveVisualValue );
-  DALI_TEST_EQUALS( aboveVisualValue->Get< std::string >(), "above-visual.png", TEST_LOCATION );
+  tet_infoline("Check above visual");
+  Property::Value* aboveVisualValue = tailMap->Find(Tooltip::Tail::Property::ABOVE_VISUAL);
+  DALI_TEST_CHECK(aboveVisualValue);
+  DALI_TEST_EQUALS(aboveVisualValue->Get<std::string>(), "above-visual.png", TEST_LOCATION);
 
-  tet_infoline( "Check below visual" );
-  Property::Value* belowVisualValue = tailMap->Find( Tooltip::Tail::Property::BELOW_VISUAL );
-  DALI_TEST_CHECK( belowVisualValue );
-  DALI_TEST_EQUALS( belowVisualValue->Get< std::string >(), "below-visual.png", TEST_LOCATION );
+  tet_infoline("Check below visual");
+  Property::Value* belowVisualValue = tailMap->Find(Tooltip::Tail::Property::BELOW_VISUAL);
+  DALI_TEST_CHECK(belowVisualValue);
+  DALI_TEST_EQUALS(belowVisualValue->Get<std::string>(), "below-visual.png", TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipDisplay(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+  control.SetProperty(DevelControl::Property::TOOLTIP, "Test");
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
@@ -521,41 +495,36 @@ int UtcDaliTooltipDisplay(void)
   int rootChildCount = rootActor.GetChildCount();
 
   Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should have incremented by one" );
+  tet_infoline("Get number of actors on the Stage, they should have incremented by one");
   ++rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
-  application.ProcessEvent( GenerateSingleHover( PointState::STATIONARY, centerPoint ) ); // Emit for code coverage, will have no effect
+  application.ProcessEvent(GenerateSingleHover(PointState::STATIONARY, centerPoint)); // Emit for code coverage, will have no effect
 
   END_TEST;
 }
 
 int UtcDaliTooltipDisplayWithTail(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::TAIL,
-                                            Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
-                                                           .Add( Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png" )
-                                                           .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ))
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::TAIL, Property::Map().Add(Tooltip::Tail::Property::VISIBILITY, true).Add(Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png").Add(Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png")));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
@@ -563,43 +532,37 @@ int UtcDaliTooltipDisplayWithTail(void)
   int rootChildCount = rootActor.GetChildCount();
 
   Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should have incremented by one" );
+  tet_infoline("Get number of actors on the Stage, they should have incremented by one");
   ++rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipDisplayWithContentArray(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
-                                                                                  .Add( ImageVisual::Property::URL, "dummy-url.png" ) )
-                                                             .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
-                                                                                  .Add( TextVisual::Property::TEXT, "Hello Array Test" ) ))
-                                      .Add( Tooltip::Property::TAIL,
-                                            Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
-                                                           .Add( Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png" )
-                                                           .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ))
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT,
+                                          Property::Array().Add(Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE).Add(ImageVisual::Property::URL, "dummy-url.png")).Add(Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::TEXT).Add(TextVisual::Property::TEXT, "Hello Array Test")))
+                        .Add(Tooltip::Property::TAIL,
+                             Property::Map().Add(Tooltip::Tail::Property::VISIBILITY, true).Add(Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png").Add(Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png")));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
@@ -607,239 +570,231 @@ int UtcDaliTooltipDisplayWithContentArray(void)
   int rootChildCount = rootActor.GetChildCount();
 
   Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should have incremented by one" );
+  tet_infoline("Get number of actors on the Stage, they should have incremented by one");
   ++rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipDisplayBelow(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::POSITION, Tooltip::Position::BELOW));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
   Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
+  Actor tooltip = rootActor.GetChildAt(rootActor.GetChildCount() - 1); // Last actor added will be our tooltip
 
-  tet_infoline( "Ensure tooltip is below control" );
-  DALI_TEST_CHECK( ( control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + 50.0f /* Half Size */) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y );
+  tet_infoline("Ensure tooltip is below control");
+  DALI_TEST_CHECK((control.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y + 50.0f /* Half Size */) < tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y);
 
   END_TEST;
 }
 
 int UtcDaliTooltipDisplayAbove(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::ABOVE )
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::POSITION, Tooltip::Position::ABOVE));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
   Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
+  Actor tooltip = rootActor.GetChildAt(rootActor.GetChildCount() - 1); // Last actor added will be our tooltip
 
-  tet_infoline( "Ensure tooltip is above control" );
-  DALI_TEST_CHECK( ( control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y - 50.0f /* Half Size */) >= ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + 0.5f * tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height ) );
+  tet_infoline("Ensure tooltip is above control");
+  DALI_TEST_CHECK((control.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y - 50.0f /* Half Size */) >= (tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y + 0.5f * tooltip.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height));
 
   END_TEST;
 }
 
 int UtcDaliTooltipDisplayAtHoverPoint(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::HOVER_POINT )
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::POSITION, Tooltip::Position::HOVER_POINT));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
-  const Vector2 stageSize = application.GetScene().GetSize();
-  Vector2 hoverPoint = stageSize * 0.5f;
+  const Vector2 stageSize  = application.GetScene().GetSize();
+  Vector2       hoverPoint = stageSize * 0.5f;
   hoverPoint.x -= 10.0f;
   hoverPoint.y -= 10.0f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, hoverPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
+  Actor tooltip = rootActor.GetChildAt(rootActor.GetChildCount() - 1); // Last actor added will be our tooltip
 
-  tet_infoline( "Ensure tooltip is below and to the right of control" );
-  DALI_TEST_CHECK( ( hoverPoint.y - stageSize.height * 0.5f ) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y );
-  DALI_TEST_CHECK( ( hoverPoint.x - stageSize.width  * 0.5f ) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x );
+  tet_infoline("Ensure tooltip is below and to the right of control");
+  DALI_TEST_CHECK((hoverPoint.y - stageSize.height * 0.5f) < tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y);
+  DALI_TEST_CHECK((hoverPoint.x - stageSize.width * 0.5f) < tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).x);
 
   END_TEST;
 }
 
 int UtcDaliTooltipExceedThreshold(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::MOVEMENT_THRESHOLD, 5 )
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::MOVEMENT_THRESHOLD, 5));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
   int rootChildCount = rootActor.GetChildCount();
 
-  tet_infoline( "Start hover" );
+  tet_infoline("Start hover");
   Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, hoverPoint));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Emit a value which exceeds threshold, timer should start again" );
+  tet_infoline("Emit a value which exceeds threshold, timer should start again");
   hoverPoint.x += 10.0f;
-  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::MOTION, hoverPoint));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Emit Timer signal - timeout at new point which is still within bounds" );
-  Dali::Timer timer = Timer::New( 1u );
+  tet_infoline("Emit Timer signal - timeout at new point which is still within bounds");
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should have incremented by one" );
+  tet_infoline("Get number of actors on the Stage, they should have incremented by one");
   ++rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipGoOutOfBounds(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP, "Test");
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
   int rootChildCount = rootActor.GetChildCount();
 
-  tet_infoline( "Start hover" );
+  tet_infoline("Start hover");
   Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, hoverPoint));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Emit a value which goes out of bounds" );
+  tet_infoline("Emit a value which goes out of bounds");
   hoverPoint.x += 100.0f;
-  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::MOTION, hoverPoint));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Emit Timer signal - nothing should happen" );
-  Dali::Timer timer = Timer::New( 1u );
+  tet_infoline("Emit Timer signal - nothing should happen");
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should be the same as before" );
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  tet_infoline("Get number of actors on the Stage, they should be the same as before");
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipHideTooltipWhenOutOfBounds(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+  control.SetProperty(DevelControl::Property::TOOLTIP, "Test");
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
@@ -847,47 +802,44 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void)
   int rootChildCount = rootActor.GetChildCount();
 
   Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, hoverPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should have incremented by one" );
+  tet_infoline("Get number of actors on the Stage, they should have incremented by one");
   ++rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   hoverPoint.x += 100.0f;
-  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::MOTION, hoverPoint));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should be back to what was there before the tooltip was shown" );
+  tet_infoline("Get number of actors on the Stage, they should be back to what was there before the tooltip was shown");
   --rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::DISAPPEAR_ON_MOVEMENT, true )
-                                      .Add( Tooltip::Property::MOVEMENT_THRESHOLD, 5 )
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::DISAPPEAR_ON_MOVEMENT, true).Add(Tooltip::Property::MOVEMENT_THRESHOLD, 5));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
@@ -895,43 +847,43 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void)
   int rootChildCount = rootActor.GetChildCount();
 
   Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, hoverPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should have incremented by one" );
+  tet_infoline("Get number of actors on the Stage, they should have incremented by one");
   ++rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   hoverPoint.x += 10.0f; // Stay within bounds but exceed threshold
-  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::MOTION, hoverPoint));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should be back to what was there before the tooltip was shown" );
+  tet_infoline("Get number of actors on the Stage, they should be back to what was there before the tooltip was shown");
   --rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipChangeContent(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
+  control.SetProperty(DevelControl::Property::TOOLTIP, "Test");
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
@@ -939,242 +891,218 @@ int UtcDaliTooltipChangeContent(void)
   int rootChildCount = rootActor.GetChildCount();
 
   Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  tet_infoline( "Change content while timer is running and ensure it matches the new value" );
-  control.SetProperty( DevelControl::Property::TOOLTIP, "Second Value" );
+  tet_infoline("Change content while timer is running and ensure it matches the new value");
+  control.SetProperty(DevelControl::Property::TOOLTIP, "Second Value");
 
-  Property::Value value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
+  Property::Value value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
   Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
-  Property::Value* contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  DALI_TEST_CHECK(map);
+  Property::Value* contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
   Property::Map* contentMap = contentValue->GetMap();
-  DALI_TEST_CHECK( contentMap );
-  Property::Value* textStringValue = contentMap->Find( TextVisual::Property::TEXT );
-  DALI_TEST_CHECK( textStringValue );
-  DALI_TEST_EQUALS( "Second Value", textStringValue->Get< std::string >(), TEST_LOCATION );
+  DALI_TEST_CHECK(contentMap);
+  Property::Value* textStringValue = contentMap->Find(TextVisual::Property::TEXT);
+  DALI_TEST_CHECK(textStringValue);
+  DALI_TEST_EQUALS("Second Value", textStringValue->Get<std::string>(), TEST_LOCATION);
 
-  tet_infoline( "Emit signal, nothing should happen as everything has been reset" );
-  Dali::Timer timer = Timer::New( 1u );
+  tet_infoline("Emit signal, nothing should happen as everything has been reset");
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, there should NOT be any new actors" );
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  tet_infoline("Get number of actors on the Stage, there should NOT be any new actors");
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
-  tet_infoline( "More movement at same point, and emit signal, we should get the tooltip" );
-  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, centerPoint ) );
+  tet_infoline("More movement at same point, and emit signal, we should get the tooltip");
+  application.ProcessEvent(GenerateSingleHover(PointState::MOTION, centerPoint));
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, they should have incremented by one" );
+  tet_infoline("Get number of actors on the Stage, they should have incremented by one");
   ++rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
-  tet_infoline( "Change content while tooltip is showing, current one should be removed from the stage and ensure it matches new value" );
-  control.SetProperty( DevelControl::Property::TOOLTIP, "Third Value" );
+  tet_infoline("Change content while tooltip is showing, current one should be removed from the stage and ensure it matches new value");
+  control.SetProperty(DevelControl::Property::TOOLTIP, "Third Value");
 
-  value = control.GetProperty( DevelControl::Property::TOOLTIP );
-  DALI_TEST_EQUALS( value.GetType(), Property::MAP, TEST_LOCATION );
+  value = control.GetProperty(DevelControl::Property::TOOLTIP);
+  DALI_TEST_EQUALS(value.GetType(), Property::MAP, TEST_LOCATION);
   map = value.GetMap();
-  DALI_TEST_CHECK( map );
-  contentValue = map->Find( Tooltip::Property::CONTENT );
-  DALI_TEST_CHECK( contentValue );
+  DALI_TEST_CHECK(map);
+  contentValue = map->Find(Tooltip::Property::CONTENT);
+  DALI_TEST_CHECK(contentValue);
   contentMap = contentValue->GetMap();
-  DALI_TEST_CHECK( contentMap );
-  textStringValue = contentMap->Find( TextVisual::Property::TEXT );
-  DALI_TEST_CHECK( textStringValue );
-  DALI_TEST_EQUALS( "Third Value", textStringValue->Get< std::string >(), TEST_LOCATION );
+  DALI_TEST_CHECK(contentMap);
+  textStringValue = contentMap->Find(TextVisual::Property::TEXT);
+  DALI_TEST_CHECK(textStringValue);
+  DALI_TEST_EQUALS("Third Value", textStringValue->Get<std::string>(), TEST_LOCATION);
 
-  tet_infoline( "Emit signal, nothing should happen as everything has been reset" );
+  tet_infoline("Emit signal, nothing should happen as everything has been reset");
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Get number of actors on the Stage, there should be one less actor on the stage" );
+  tet_infoline("Get number of actors on the Stage, there should be one less actor on the stage");
   --rootChildCount;
-  DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(rootActor.GetChildCount(), rootChildCount, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliTooltipEnsureRemainsOnStage1(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Vector2 stageSize = application.GetScene().GetSize();
 
-  tet_infoline( "Create a control and place it at the bottom of the screen, setting the tooltip to appear below" );
+  tet_infoline("Create a control and place it at the bottom of the screen, setting the tooltip to appear below");
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
-  control.SetProperty( Actor::Property::SIZE, stageSize );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::TAIL,
-                                            Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
-                                                           .Add( Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png" )
-                                                           .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER);
+  control.SetProperty(Actor::Property::SIZE, stageSize);
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::TAIL, Property::Map().Add(Tooltip::Tail::Property::VISIBILITY, true).Add(Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png").Add(Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png")).Add(Tooltip::Property::POSITION, Tooltip::Position::BELOW));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
   Vector2 centerPoint = stageSize * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Ensure tooltip is still on the screen" );
-  Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * 0.5f ) <= centerPoint.height );
+  tet_infoline("Ensure tooltip is still on the screen");
+  Actor tooltip = rootActor.GetChildAt(rootActor.GetChildCount() - 1); // Last actor added will be our tooltip
+  DALI_TEST_CHECK((tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y + tooltip.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height * 0.5f) <= centerPoint.height);
 
   END_TEST;
 }
 
 int UtcDaliTooltipEnsureRemainsOnStage2(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
   Vector2 stageSize = application.GetScene().GetSize();
 
-  tet_infoline( "Create a control and place it at the top of the screen, setting the tooltip to appear above" );
+  tet_infoline("Create a control and place it at the top of the screen, setting the tooltip to appear above");
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
-  control.SetProperty( Actor::Property::SIZE, stageSize );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::TAIL,
-                                            Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
-                                                           .Add( Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png" )
-                                                           .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::ABOVE )
-                     );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER);
+  control.SetProperty(Actor::Property::SIZE, stageSize);
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::TAIL, Property::Map().Add(Tooltip::Tail::Property::VISIBILITY, true).Add(Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png").Add(Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png")).Add(Tooltip::Property::POSITION, Tooltip::Position::ABOVE));
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
   Vector2 centerPoint = stageSize * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Ensure tooltip is still on the screen" );
-  Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y - tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * 0.5f ) >= -centerPoint.height );
+  tet_infoline("Ensure tooltip is still on the screen");
+  Actor tooltip = rootActor.GetChildAt(rootActor.GetChildCount() - 1); // Last actor added will be our tooltip
+  DALI_TEST_CHECK((tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).y - tooltip.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height * 0.5f) >= -centerPoint.height);
 
   END_TEST;
 }
 
 int UtcDaliTooltipEnsureRemainsOnStage3(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
-  Vector2 stageSize = application.GetScene().GetSize();
+  Vector2 stageSize   = application.GetScene().GetSize();
   Vector2 centerPoint = stageSize * 0.5f;
 
-  tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the left of the screen" );
+  tet_infoline("Create a control and adjust it's position so that the tooltip will attempt to appear to the left of the screen");
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
-  control.SetProperty( Actor::Property::SIZE, stageSize );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::TAIL,
-                                            Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
-                                                           .Add( Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png" )
-                                                           .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
-                     );
-  control.SetProperty( Actor::Property::POSITION_X,  -centerPoint.x );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER);
+  control.SetProperty(Actor::Property::SIZE, stageSize);
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::TAIL, Property::Map().Add(Tooltip::Tail::Property::VISIBILITY, true).Add(Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png").Add(Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png")).Add(Tooltip::Property::POSITION, Tooltip::Position::BELOW));
+  control.SetProperty(Actor::Property::POSITION_X, -centerPoint.x);
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
-  Vector2 hoverPoint( centerPoint );
+  Vector2 hoverPoint(centerPoint);
   hoverPoint.x = 1.0f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Ensure tooltip is still on the screen" );
-  Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x - tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width * 0.5f ) >= -centerPoint.width );
+  tet_infoline("Ensure tooltip is still on the screen");
+  Actor tooltip = rootActor.GetChildAt(rootActor.GetChildCount() - 1); // Last actor added will be our tooltip
+  DALI_TEST_CHECK((tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).x - tooltip.GetCurrentProperty<Vector3>(Actor::Property::SIZE).width * 0.5f) >= -centerPoint.width);
 
   END_TEST;
 }
 
 int UtcDaliTooltipEnsureRemainsOnStage4(void)
 {
-  ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
+  ToolkitTestApplication application; // Exceptions require ToolkitTestApplication
 
-  Vector2 stageSize = application.GetScene().GetSize();
+  Vector2 stageSize   = application.GetScene().GetSize();
   Vector2 centerPoint = stageSize * 0.5f;
 
-  tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the right of the screen" );
+  tet_infoline("Create a control and adjust it's position so that the tooltip will attempt to appear to the right of the screen");
   Control control = Control::New();
-  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
-  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
-  control.SetProperty( Actor::Property::SIZE, stageSize );
-  control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
-                                      .Add( Tooltip::Property::TAIL,
-                                            Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
-                                                           .Add( Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png" )
-                                                           .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) )
-                                      .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
-                     );
-  control.SetProperty( Actor::Property::POSITION_X,  centerPoint.x );
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER);
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER);
+  control.SetProperty(Actor::Property::SIZE, stageSize);
+  control.SetProperty(DevelControl::Property::TOOLTIP,
+                      Property::Map().Add(Tooltip::Property::CONTENT, "Test").Add(Tooltip::Property::TAIL, Property::Map().Add(Tooltip::Tail::Property::VISIBILITY, true).Add(Tooltip::Tail::Property::ABOVE_VISUAL, "above-visual.png").Add(Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png")).Add(Tooltip::Property::POSITION, Tooltip::Position::BELOW));
+  control.SetProperty(Actor::Property::POSITION_X, centerPoint.x);
 
   Actor rootActor = application.GetScene().GetRootLayer();
-  rootActor.Add( control );
+  rootActor.Add(control);
 
   application.SendNotification();
   application.Render();
 
-  Vector2 hoverPoint( centerPoint );
+  Vector2 hoverPoint(centerPoint);
   hoverPoint.x = 1.0f;
-  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
+  application.ProcessEvent(GenerateSingleHover(PointState::STARTED, centerPoint));
 
-  Dali::Timer timer = Timer::New( 1u );
+  Dali::Timer timer = Timer::New(1u);
   timer.MockEmitSignal();
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Ensure tooltip is still on the screen" );
-  Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x + tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width * 0.5f ) <= centerPoint.width );
+  tet_infoline("Ensure tooltip is still on the screen");
+  Actor tooltip = rootActor.GetChildAt(rootActor.GetChildCount() - 1); // Last actor added will be our tooltip
+  DALI_TEST_CHECK((tooltip.GetCurrentProperty<Vector3>(Actor::Property::WORLD_POSITION).x + tooltip.GetCurrentProperty<Vector3>(Actor::Property::SIZE).width * 0.5f) <= centerPoint.width);
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp
old mode 100755
new mode 100644
index 7e36d2c..784af73
--- a/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,23 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/actor-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/transition/transition-set.h>
+#include <dali-toolkit/public-api/transition/fade-transition.h>
+#include <dali-toolkit/public-api/transition/slide-transition.h>
 #include <dali-toolkit/public-api/transition/transition-base.h>
+#include <dali-toolkit/public-api/transition/transition-set.h>
 #include <dali-toolkit/public-api/transition/transition.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h> // for Renderer Property Index.
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 namespace
 {
-
 const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
 
 }
@@ -118,7 +120,7 @@ int UtcDaliTransitionSetGetProperty01(void)
   application.SendNotification();
   application.Render(20);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(-0.1f, -0.1f));
+  Transition transition = Transition::New(control1, control2, true, TimePeriod(-0.1f, -0.1f));
   TimePeriod timePeriod = transition.GetTimePeriod();
   DALI_TEST_EQUALS(0.0f, timePeriod.durationSeconds, TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, timePeriod.delaySeconds, TEST_LOCATION);
@@ -178,7 +180,7 @@ int UtcDaliTransitionSetGetProperty02(void)
   application.SendNotification();
   application.Render(20);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(-0.1f));
+  Transition transition = Transition::New(control1, control2, true, TimePeriod(-0.1f));
   TimePeriod timePeriod = transition.GetTimePeriod();
   DALI_TEST_EQUALS(0.0f, timePeriod.durationSeconds, TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, timePeriod.delaySeconds, TEST_LOCATION);
@@ -210,11 +212,11 @@ int UtcDaliTransitionBetweenControlPair(void)
   Vector3 destinationSize(120, 120, 0);
   Vector3 destinationScale(2, 1, 0);
   Vector4 destinationColor(1.0f, 0.5f, 1.0f, 0.8f);
-  float destinationOpacity(0.8f);
-  float destinationRadius(50.f);
-  float destinationBorderlineWidth(80.0f);
+  float   destinationOpacity(0.8f);
+  float   destinationRadius(50.f);
+  float   destinationBorderlineWidth(80.0f);
   Vector4 destinationBorderlineColor(0.5f, 1.0f, 0.5f, 0.3f);
-  float destinationBorderlineOffset(-1.0f);
+  float   destinationBorderlineOffset(-1.0f);
   Vector4 destinationRadiusV4 = Vector4(destinationRadius, destinationRadius, destinationRadius, destinationRadius);
 
   Control control1 = Control::New();
@@ -253,7 +255,7 @@ int UtcDaliTransitionBetweenControlPair(void)
 
   DALI_TEST_EQUALS(destinationPosition, control2.GetProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
   Property::Map backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
+  Vector4       cornerRadius  = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
   DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION);
   float borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get<float>();
   DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION);
@@ -268,12 +270,12 @@ int UtcDaliTransitionBetweenControlPair(void)
   application.SendNotification();
   application.Render(20);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
+  Transition    transition    = Transition::New(control1, control2, true, TimePeriod(0.5f));
   TransitionSet transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -287,17 +289,13 @@ int UtcDaliTransitionBetweenControlPair(void)
   DALI_TEST_NOT_EQUALS(destinationPosition, control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), 0.00001f, TEST_LOCATION);
   DALI_TEST_EQUALS(1, control2.GetRendererCount(), TEST_LOCATION);
   Dali::Renderer renderer = control2.GetRendererAt(0);
-  Property::Index index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS);
-  cornerRadius = renderer.GetCurrentProperty<Vector4>(index);
+  cornerRadius            = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS);
   DALI_TEST_NOT_EQUALS(destinationRadiusV4, cornerRadius, 0.00001f, TEST_LOCATION);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH);
-  borderlineWidth = renderer.GetCurrentProperty<float>(index);
+  borderlineWidth = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
   DALI_TEST_NOT_EQUALS(destinationBorderlineWidth, borderlineWidth, 0.00001f, TEST_LOCATION);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR);
-  borderlineColor = renderer.GetCurrentProperty<Vector4>(index);
+  borderlineColor = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR);
   DALI_TEST_NOT_EQUALS(destinationBorderlineColor, borderlineColor, 0.00001f, TEST_LOCATION);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET);
-  borderlineOffset = renderer.GetCurrentProperty<float>(index);
+  borderlineOffset = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET);
   DALI_TEST_NOT_EQUALS(destinationBorderlineOffset, borderlineOffset, 0.00001f, TEST_LOCATION);
 
   application.SendNotification();
@@ -316,23 +314,186 @@ int UtcDaliTransitionBetweenControlPair(void)
   DALI_TEST_EQUALS(destinationColor, control2.GetCurrentProperty<Vector4>(Actor::Property::COLOR), TEST_LOCATION);
   DALI_TEST_EQUALS(destinationOpacity, control2.GetCurrentProperty<float>(Actor::Property::OPACITY), TEST_LOCATION);
   DALI_TEST_EQUALS(1, control2.GetRendererCount(), TEST_LOCATION);
-  renderer = control2.GetRendererAt(0);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS);
-  cornerRadius = renderer.GetCurrentProperty<Vector4>(index);
+  renderer     = control2.GetRendererAt(0);
+  cornerRadius = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS);
   DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_WIDTH);
-  borderlineWidth = renderer.GetCurrentProperty<float>(index);
+  borderlineWidth = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
   DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_COLOR);
-  borderlineColor = renderer.GetCurrentProperty<Vector4>(index);
+  borderlineColor = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR);
   DALI_TEST_EQUALS(destinationBorderlineColor, borderlineColor, TEST_LOCATION);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::BORDERLINE_OFFSET);
-  borderlineOffset = renderer.GetCurrentProperty<float>(index);
+  borderlineOffset = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET);
   DALI_TEST_EQUALS(destinationBorderlineOffset, borderlineOffset, TEST_LOCATION);
 
   END_TEST;
 }
 
+int UtcDaliTransitionBetweenControlPair2(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliTransitionBetweenControlPair2 - source target will be transitioned.");
+
+  Vector3 sourcePosition(100, 200, 0);
+  Vector3 sourceSize(150, 150, 0);
+  Vector3 sourceScale(1, 2, 0);
+  Vector4 sourceColor(1.0f, 1.0f, 1.0f, 0.5f);
+  float   sourceOpacity(0.5f);
+  float   sourceRadius(30.f);
+  float   sourceBorderlineWidth(60.0f);
+  Vector4 sourceBorderlineColor(1.0f, 0.0f, 0.0f, 1.0f);
+  float   sourceBorderlineOffset(1.f);
+  Vector4 sourceRadiusV4 = Vector4(sourceRadius, sourceRadius, sourceRadius, sourceRadius);
+
+  Vector3 destinationPosition(50, 50, 0);
+  Vector3 destinationSize(120, 120, 0);
+  Vector3 destinationScale(2, 1, 0);
+  Vector4 destinationColor(1.0f, 0.5f, 1.0f, 0.8f);
+  float   destinationOpacity(0.8f);
+  float   destinationRadius(50.f);
+  float   destinationBorderlineWidth(80.0f);
+  Vector4 destinationBorderlineColor(0.5f, 1.0f, 0.5f, 0.3f);
+  float   destinationBorderlineOffset(-1.0f);
+  Vector4 destinationRadiusV4 = Vector4(destinationRadius, destinationRadius, destinationRadius, destinationRadius);
+
+  Control control1 = Control::New();
+  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  control1.SetProperty(Actor::Property::POSITION, sourcePosition);
+  control1.SetProperty(Actor::Property::SIZE, sourceSize);
+  control1.SetProperty(Actor::Property::SCALE, sourceScale);
+  control1.SetProperty(Actor::Property::COLOR, sourceColor);
+  control1.SetProperty(Actor::Property::OPACITY, sourceOpacity);
+  Property::Map controlProperty1;
+  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
+  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
+  controlProperty1.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, sourceRadius);
+  controlProperty1.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, sourceBorderlineWidth);
+  controlProperty1.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, sourceBorderlineColor);
+  controlProperty1.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, sourceBorderlineOffset);
+  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
+
+  Control control2 = Control::New();
+  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  control2.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::CENTER);
+  control2.SetProperty(Actor::Property::POSITION, destinationPosition);
+  control2.SetProperty(Actor::Property::SIZE, destinationSize);
+  control2.SetProperty(Actor::Property::SCALE, destinationScale);
+  control2.SetProperty(Actor::Property::COLOR, destinationColor);
+  control2.SetProperty(Actor::Property::OPACITY, destinationOpacity);
+  Property::Map controlProperty2;
+  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
+  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 1.0f, 0.0f, 0.5f));
+  controlProperty2.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, destinationRadius);
+  controlProperty2.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, destinationBorderlineWidth);
+  controlProperty2.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, destinationBorderlineColor);
+  controlProperty2.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, destinationBorderlineOffset);
+  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
+
+  DALI_TEST_EQUALS(destinationPosition, control2.GetProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
+  Property::Map backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
+  Vector4       cornerRadius  = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
+  DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION);
+  float borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get<float>();
+  DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION);
+  Vector4 borderlineColor = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_COLOR)->Get<Vector4>();
+  DALI_TEST_EQUALS(destinationBorderlineColor, borderlineColor, TEST_LOCATION);
+  float borderlineOffset = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET)->Get<float>();
+  DALI_TEST_EQUALS(destinationBorderlineOffset, borderlineOffset, TEST_LOCATION);
+
+  application.GetScene().Add(control1);
+  application.GetScene().Add(control2);
+
+  application.SendNotification();
+  application.Render(20);
+
+  Transition    transition    = Transition::New(control1, control2, false, TimePeriod(0.5f));
+  TransitionSet transitionSet = TransitionSet::New();
+  transitionSet.AddTransition(transition);
+  transitionSet.Play();
+
+  bool                  signalReceived(false);
+  TransitionFinishCheck finishCheck(signalReceived);
+  transitionSet.FinishedSignal().Connect(&application, finishCheck);
+
+  application.SendNotification();
+  application.Render(50);
+
+  // We didn't expect the animation to finish yet
+  application.SendNotification();
+  finishCheck.CheckSignalNotReceived();
+
+  DALI_TEST_NOT_EQUALS(destinationPosition, control1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), 0.00001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(1, control1.GetRendererCount(), TEST_LOCATION);
+
+  Dali::Renderer renderer = control1.GetRendererAt(0);
+  cornerRadius            = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS);
+  DALI_TEST_NOT_EQUALS(destinationRadiusV4, cornerRadius, 0.00001f, TEST_LOCATION);
+
+  borderlineWidth = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
+  DALI_TEST_NOT_EQUALS(destinationBorderlineWidth, borderlineWidth, 0.00001f, TEST_LOCATION);
+
+  borderlineColor = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR);
+  DALI_TEST_NOT_EQUALS(destinationBorderlineColor, borderlineColor, 0.00001f, TEST_LOCATION);
+
+  borderlineOffset = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET);
+  DALI_TEST_NOT_EQUALS(destinationBorderlineOffset, borderlineOffset, 0.00001f, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(700);
+
+  // We did expect the animation to finish
+  application.SendNotification();
+  finishCheck.CheckSignalReceived();
+
+  // After the transition is finished,
+  // every current and renderer propeties of control1 are equal to destination properties.
+  DALI_TEST_EQUALS(destinationPosition, control1.GetCurrentProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
+  DALI_TEST_EQUALS(destinationSize, control1.GetCurrentProperty<Vector3>(Actor::Property::SIZE), TEST_LOCATION);
+  DALI_TEST_EQUALS(destinationScale, control1.GetCurrentProperty<Vector3>(Actor::Property::SCALE), TEST_LOCATION);
+  DALI_TEST_EQUALS(destinationColor, control1.GetCurrentProperty<Vector4>(Actor::Property::COLOR), TEST_LOCATION);
+  DALI_TEST_EQUALS(destinationOpacity, control1.GetCurrentProperty<float>(Actor::Property::OPACITY), TEST_LOCATION);
+
+  DALI_TEST_EQUALS(1, control1.GetRendererCount(), TEST_LOCATION);
+  renderer     = control1.GetRendererAt(0);
+  cornerRadius = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS);
+  DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION);
+
+  borderlineWidth = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
+  DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION);
+
+  borderlineColor = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR);
+  DALI_TEST_EQUALS(destinationBorderlineColor, borderlineColor, TEST_LOCATION);
+
+  borderlineOffset = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET);
+  DALI_TEST_EQUALS(destinationBorderlineOffset, borderlineOffset, TEST_LOCATION);
+
+  // every actor properties of control1 are returned to the source properties.
+  DALI_TEST_EQUALS(sourcePosition, control1.GetProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceSize, control1.GetProperty<Vector3>(Actor::Property::SIZE), TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceScale, control1.GetProperty<Vector3>(Actor::Property::SCALE), TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceColor, control1.GetProperty<Vector4>(Actor::Property::COLOR), TEST_LOCATION);
+  DALI_TEST_EQUALS(sourceOpacity, control1.GetProperty<float>(Actor::Property::OPACITY), TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(20);
+
+  // after next update, renderer properties are returned to the source properties.
+  DALI_TEST_EQUALS(1, control1.GetRendererCount(), TEST_LOCATION);
+  renderer     = control1.GetRendererAt(0);
+  cornerRadius = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS);
+  DALI_TEST_EQUALS(sourceRadiusV4, cornerRadius, TEST_LOCATION);
+
+  borderlineWidth = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
+  DALI_TEST_EQUALS(sourceBorderlineWidth, borderlineWidth, TEST_LOCATION);
+
+  borderlineColor = renderer.GetCurrentProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR);
+  DALI_TEST_EQUALS(sourceBorderlineColor, borderlineColor, TEST_LOCATION);
+
+  borderlineOffset = renderer.GetCurrentProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET);
+  DALI_TEST_EQUALS(sourceBorderlineOffset, borderlineOffset, TEST_LOCATION);
+
+  END_TEST;
+}
+
 int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void)
 {
   ToolkitTestApplication application;
@@ -362,7 +523,7 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void)
   control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
 
   Property::Map backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
+  Vector4       cornerRadius  = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
   DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION);
   float borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get<float>();
   DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION);
@@ -377,12 +538,12 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void)
   application.SendNotification();
   application.Render(20);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
+  Transition    transition    = Transition::New(control1, control2, true, TimePeriod(0.5f));
   TransitionSet transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -394,7 +555,7 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void)
   finishCheck.CheckSignalNotReceived();
 
   backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
+  cornerRadius  = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
   DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION);
   borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get<float>();
   DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION);
@@ -414,7 +575,7 @@ int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void)
   application.Render(20);
 
   backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
+  cornerRadius  = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
   DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION);
   borderlineWidth = backgroundMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH)->Get<float>();
   DALI_TEST_EQUALS(destinationBorderlineWidth, borderlineWidth, TEST_LOCATION);
@@ -471,15 +632,15 @@ int UtcDaliTransitionBetweenImageViewPair(void)
   application.SendNotification();
   application.Render(20);
 
-  Vector3 startWorldPosition = control1.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
+  Vector3 startWorldPosition  = control1.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
   Vector3 finishWorldPosition = control2.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
+  Transition    transition    = Transition::New(control1, control2, true, TimePeriod(0.5f));
   TransitionSet transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -491,7 +652,7 @@ int UtcDaliTransitionBetweenImageViewPair(void)
   finishCheck.CheckSignalNotReceived();
 
   // control2 moved about 80%
-  Vector3 currentPosition = control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+  Vector3 currentPosition      = control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
   Vector3 expectedPosition_0_7 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.7;
   Vector3 expectedPosition_0_9 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.9;
   DALI_TEST_CHECK(currentPosition.x <= expectedPosition_0_7.x && currentPosition.x >= expectedPosition_0_9.x);
@@ -559,15 +720,15 @@ int UtcDaliTransitionBetweenImageViewPairWithDelay(void)
   application.SendNotification();
   application.Render(20);
 
-  Vector3 startWorldPosition = control1.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
+  Vector3 startWorldPosition  = control1.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
   Vector3 finishWorldPosition = control2.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f, 0.5f));
+  Transition    transition    = Transition::New(control1, control2, true, TimePeriod(0.5f, 0.5f));
   TransitionSet transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -588,7 +749,7 @@ int UtcDaliTransitionBetweenImageViewPairWithDelay(void)
   finishCheck.CheckSignalNotReceived();
 
   // control2 moved about 60% (800ms)
-  Vector3 currentPosition = control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+  Vector3 currentPosition      = control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
   Vector3 expectedPosition_0_5 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.5;
   Vector3 expectedPosition_0_7 = startWorldPosition + (finishWorldPosition - startWorldPosition) * 0.7;
   DALI_TEST_CHECK(currentPosition.x <= expectedPosition_0_5.x && currentPosition.x >= expectedPosition_0_7.x);
@@ -654,12 +815,12 @@ int UtcDaliTransitionBetweenControlPairWithTree(void)
   application.SendNotification();
   application.Render(20);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
+  Transition    transition    = Transition::New(control1, control2, true, TimePeriod(0.5f));
   TransitionSet transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -721,13 +882,13 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithChild(void)
   application.SendNotification();
   application.Render(20);
 
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
+  Transition transition = Transition::New(control1, control2, true, TimePeriod(0.5f));
   transition.TransitionWithChild(true);
   TransitionSet transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
 
-  bool signalReceived(false);
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
   transitionSet.FinishedSignal().Connect(&application, finishCheck);
 
@@ -791,9 +952,9 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutPositionInheritance(void)
   application.SendNotification();
   application.Render(20);
 
-  Transition transition;
-  TransitionSet transitionSet;
-  bool signalReceived(false);
+  Transition            transition;
+  TransitionSet         transitionSet;
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
 
   // not inherit Position.
@@ -801,7 +962,7 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutPositionInheritance(void)
   control3.SetProperty(Actor::Property::INHERIT_ORIENTATION, true);
   control3.SetProperty(Actor::Property::INHERIT_SCALE, true);
 
-  transition = Transition::New(control1, control3, TimePeriod(0.5f));
+  transition    = Transition::New(control1, control3, true, TimePeriod(0.5f));
   transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
@@ -834,8 +995,8 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance(voi
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance");
 
-  Radian sourceAngle(1.0f);
-  Radian destinationAngle(2.0f);
+  Radian     sourceAngle(1.0f);
+  Radian     destinationAngle(2.0f);
   Quaternion sourceOrientation(sourceAngle, Vector3::XAXIS);
   Quaternion destinationOrientation(destinationAngle, Vector3::XAXIS);
 
@@ -875,7 +1036,7 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance(voi
   control3.SetProperty(Actor::Property::INHERIT_SCALE, true);
 
   Vector3 currentAxis;
-  Radian currentRadian;
+  Radian  currentRadian;
 
   application.GetScene().Add(control1);
   application.GetScene().Add(control2);
@@ -887,12 +1048,12 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance(voi
   Quaternion currentOrientation = control3.GetProperty<Quaternion>(Actor::Property::WORLD_ORIENTATION);
   DALI_TEST_EQUALS(currentOrientation, destinationOrientation, 0.0001f, TEST_LOCATION);
 
-  Transition transition;
-  TransitionSet transitionSet;
-  bool signalReceived(false);
+  Transition            transition;
+  TransitionSet         transitionSet;
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
 
-  transition = Transition::New(control1, control3, TimePeriod(0.5f));
+  transition    = Transition::New(control1, control3, true, TimePeriod(0.5f));
   transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
@@ -973,12 +1134,12 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutScaleInheritance(void)
   Vector3 currentScale = control3.GetProperty<Vector3>(Actor::Property::WORLD_SCALE);
   DALI_TEST_EQUALS(currentScale, destinationScale, 0.0001f, TEST_LOCATION);
 
-  Transition transition;
-  TransitionSet transitionSet;
-  bool signalReceived(false);
+  Transition            transition;
+  TransitionSet         transitionSet;
+  bool                  signalReceived(false);
   TransitionFinishCheck finishCheck(signalReceived);
 
-  transition = Transition::New(control1, control3, TimePeriod(0.5f));
+  transition    = Transition::New(control1, control3, true, TimePeriod(0.5f));
   transitionSet = TransitionSet::New();
   transitionSet.AddTransition(transition);
   transitionSet.Play();
@@ -1007,3 +1168,81 @@ int UtcDaliTransitionBetweenControlPairWithTreeWithoutScaleInheritance(void)
 
   END_TEST;
 }
+
+int UtcDaliMultipleTransitionAppearing(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliMultipleTransitionAppearing");
+
+  Control control = Control::New();
+  control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  control.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
+  control.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
+  Property::Map controlProperty;
+  controlProperty.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
+  controlProperty.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
+  control.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty);
+
+  application.GetScene().Add(control);
+
+  application.SendNotification();
+  application.Render(20);
+
+  DALI_TEST_EQUALS(1.0f, control.GetCurrentProperty<float>(Actor::Property::OPACITY), TEST_LOCATION);
+
+  TransitionSet  transitionSet = TransitionSet::New();
+  FadeTransition fade          = FadeTransition::New(control, 0.5, TimePeriod(1.0f, 1.0f));
+  fade.SetAppearingTransition(true); // set fade in
+  transitionSet.AddTransition(fade);
+  SlideTransition slide = SlideTransition::New(control, Dali::Toolkit::SlideTransitionDirection::BOTTOM, TimePeriod(0.5f, 1.0f));
+  slide.SetAppearingTransition(true); // set slide
+  transitionSet.AddTransition(slide);
+  transitionSet.Play();
+
+  bool                  signalReceived(false);
+  TransitionFinishCheck finishCheck(signalReceived);
+  transitionSet.FinishedSignal().Connect(&application, finishCheck);
+
+  application.SendNotification();
+  application.Render(300);
+
+  float currentOpacity = control.GetCurrentProperty<float>(Actor::Property::OPACITY);
+  DALI_TEST_CHECK(currentOpacity == 0.0f);
+
+  application.SendNotification();
+  application.Render(400);
+
+  currentOpacity = control.GetCurrentProperty<float>(Actor::Property::OPACITY);
+  DALI_TEST_CHECK(currentOpacity == 0.5f);
+
+  application.SendNotification();
+  application.Render(500);
+
+  currentOpacity = control.GetCurrentProperty<float>(Actor::Property::OPACITY);
+  DALI_TEST_CHECK(currentOpacity > 0.5f && currentOpacity < 1.0f);
+
+  application.SendNotification();
+  application.Render(500);
+
+  currentOpacity = control.GetCurrentProperty<float>(Actor::Property::OPACITY);
+  DALI_TEST_CHECK(currentOpacity > 0.5f && currentOpacity < 1.0f);
+
+  // We didn't expect the animation to finish yet
+  application.SendNotification();
+  finishCheck.CheckSignalNotReceived();
+
+  application.SendNotification();
+  application.Render(500);
+
+  // We did expect the animation to finish
+  application.SendNotification();
+  finishCheck.CheckSignalReceived();
+
+  application.SendNotification();
+  application.Render(20);
+
+  DALI_TEST_EQUALS(1.0f, control.GetCurrentProperty<float>(Actor::Property::OPACITY), TEST_LOCATION);
+
+  END_TEST;
+}
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp
index 439098f..fb7ecd2 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali.h>
-#include <dali/devel-api/rendering/renderer-devel.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
+#include <stdlib.h>
+#include <iostream>
 #include "dummy-control.h"
 
 using namespace Dali;
 using namespace Toolkit;
 
-
 void utc_dali_toolkit_transition_data_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -42,60 +41,58 @@ Property::Map CreateMap()
 {
   Property::Map map;
 
-  map["target"] = "Actor1";
-  map["property"] = "color";
+  map["target"]       = "Actor1";
+  map["property"]     = "color";
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_OUT_BACK")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "EASE_IN_OUT_BACK")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
   return map;
 }
 
-void CHECK_ARRAY_EQUALS( Property::Array test, Property::Value result )
+void CHECK_ARRAY_EQUALS(Property::Array test, Property::Value result)
 {
-  if( result.GetType() == Property::ARRAY )
+  if(result.GetType() == Property::ARRAY)
   {
     // Compare arrays
-    Property::Array *resultArray = result.GetArray();
-    DALI_TEST_EQUALS( test.Count(), resultArray->Count(), TEST_LOCATION );
-    for( size_t i=0; i < std::min(test.Count(), resultArray->Count()); ++i )
+    Property::Array* resultArray = result.GetArray();
+    DALI_TEST_EQUALS(test.Count(), resultArray->Count(), TEST_LOCATION);
+    for(size_t i = 0; i < std::min(test.Count(), resultArray->Count()); ++i)
     {
       Property::Value a = test.GetElementAt(i);
       Property::Value b = resultArray->GetElementAt(i);
-      DALI_TEST_EQUALS( a.GetType(), b.GetType(), TEST_LOCATION );
-      DALI_TEST_EQUALS( a, b, 0.001, TEST_LOCATION );
+      DALI_TEST_EQUALS(a.GetType(), b.GetType(), TEST_LOCATION);
+      DALI_TEST_EQUALS(a, b, 0.001, TEST_LOCATION);
     }
   }
-  else if( result.GetType() == Property::VECTOR4 )
+  else if(result.GetType() == Property::VECTOR4)
   {
     Vector4 value = result.Get<Vector4>();
-    DALI_TEST_CHECK( test.Count() >= 4 );
-    for( size_t i=0; i < 4; ++i )
+    DALI_TEST_CHECK(test.Count() >= 4);
+    for(size_t i = 0; i < 4; ++i)
     {
       Property::Value a = test.GetElementAt(i);
-      DALI_TEST_EQUALS( a.GetType(), Property::FLOAT, TEST_LOCATION );
-      DALI_TEST_EQUALS( a.Get<float>(), value[i], 0.001, TEST_LOCATION );
+      DALI_TEST_EQUALS(a.GetType(), Property::FLOAT, TEST_LOCATION);
+      DALI_TEST_EQUALS(a.Get<float>(), value[i], 0.001, TEST_LOCATION);
     }
   }
   else
   {
-    DALI_TEST_CHECK( 0 );
+    DALI_TEST_CHECK(0);
   }
 }
 
-void CHECK_MAP_EQUALS( Property::Map test, Property::Map result )
+void CHECK_MAP_EQUALS(Property::Map test, Property::Map result)
 {
   DALI_TEST_EQUALS(test.Count(), result.Count(), TEST_LOCATION);
 
-  for( unsigned int i=0; i< test.Count(); ++i )
+  for(unsigned int i = 0; i < test.Count(); ++i)
   {
-    KeyValuePair keyValue = test.GetKeyValue(i);
+    KeyValuePair     keyValue = test.GetKeyValue(i);
     Property::Value* value;
 
-    if( keyValue.first.type == Property::Key::STRING )
+    if(keyValue.first.type == Property::Key::STRING)
     {
       value = result.Find(keyValue.first.stringKey);
     }
@@ -104,42 +101,41 @@ void CHECK_MAP_EQUALS( Property::Map test, Property::Map result )
       value = result.Find(keyValue.first.indexKey);
     }
 
-    DALI_TEST_CHECK( value != NULL );
-    if( value != NULL )
+    DALI_TEST_CHECK(value != NULL);
+    if(value != NULL)
     {
-      if( keyValue.second.GetType() == Property::MAP )
+      if(keyValue.second.GetType() == Property::MAP)
       {
-        DALI_TEST_EQUALS( keyValue.second.GetType(), value->GetType(), TEST_LOCATION );
-        CHECK_MAP_EQUALS( *(keyValue.second.GetMap()), *(value->GetMap()) );
+        DALI_TEST_EQUALS(keyValue.second.GetType(), value->GetType(), TEST_LOCATION);
+        CHECK_MAP_EQUALS(*(keyValue.second.GetMap()), *(value->GetMap()));
       }
-      else if( keyValue.second.GetType() == Property::ARRAY )
+      else if(keyValue.second.GetType() == Property::ARRAY)
       {
-        CHECK_ARRAY_EQUALS( *(keyValue.second.GetArray()), *value );
+        CHECK_ARRAY_EQUALS(*(keyValue.second.GetArray()), *value);
       }
-      else if( keyValue.second.GetType() == Property::STRING )
+      else if(keyValue.second.GetType() == Property::STRING)
       {
-        DALI_TEST_EQUALS( keyValue.second.GetType(), value->GetType(), TEST_LOCATION );
+        DALI_TEST_EQUALS(keyValue.second.GetType(), value->GetType(), TEST_LOCATION);
         std::string str;
         value->Get(str);
-        DALI_TEST_EQUALS( keyValue.second, str.c_str(), TEST_LOCATION );
+        DALI_TEST_EQUALS(keyValue.second, str.c_str(), TEST_LOCATION);
       }
       else
       {
-        DALI_TEST_EQUALS( keyValue.second.GetType(), value->GetType(), TEST_LOCATION );
-        DALI_TEST_EQUALS( keyValue.second, *value, 0.001f, TEST_LOCATION );
+        DALI_TEST_EQUALS(keyValue.second.GetType(), value->GetType(), TEST_LOCATION);
+        DALI_TEST_EQUALS(keyValue.second, *value, 0.001f, TEST_LOCATION);
       }
     }
   }
 }
 
-
 int UtcDaliTransitionDataNew(void)
 {
   ToolkitTestApplication application;
 
-  Property::Map map = CreateMap();
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
-  DALI_TEST_CHECK( transition );
+  Property::Map                 map        = CreateMap();
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
+  DALI_TEST_CHECK(transition);
 
   END_TEST;
 }
@@ -150,11 +146,11 @@ int UtcDaliTransitionDataDownCast(void)
 
   Property::Map map = CreateMap();
 
-  BaseHandle handle = TransitionData::New( map );
-  DALI_TEST_CHECK( handle );
+  BaseHandle handle = TransitionData::New(map);
+  DALI_TEST_CHECK(handle);
 
-  TransitionData transitionData = TransitionData::DownCast( handle );
-  DALI_TEST_CHECK( transitionData );
+  TransitionData transitionData = TransitionData::DownCast(handle);
+  DALI_TEST_CHECK(transitionData);
   END_TEST;
 }
 
@@ -164,12 +160,12 @@ int UtcDaliTransitionDataCopyConstructor(void)
 
   Property::Map map = CreateMap();
 
-  TransitionData transitionData = TransitionData::New( map );
-  DALI_TEST_CHECK( transitionData );
+  TransitionData transitionData = TransitionData::New(map);
+  DALI_TEST_CHECK(transitionData);
 
-  TransitionData td2( transitionData );
-  DALI_TEST_CHECK( td2 );
-  DALI_TEST_EQUALS( td2.Count(), 1, TEST_LOCATION );
+  TransitionData td2(transitionData);
+  DALI_TEST_CHECK(td2);
+  DALI_TEST_EQUALS(td2.Count(), 1, TEST_LOCATION);
   END_TEST;
 }
 
@@ -179,16 +175,16 @@ int UtcDaliTransitionDataAssignmentOperator(void)
 
   Property::Map map = CreateMap();
 
-  TransitionData transitionData = TransitionData::New( map );
-  DALI_TEST_CHECK( transitionData );
+  TransitionData transitionData = TransitionData::New(map);
+  DALI_TEST_CHECK(transitionData);
 
   TransitionData td2;
-  DALI_TEST_CHECK( !td2 );
+  DALI_TEST_CHECK(!td2);
 
   td2 = transitionData;
-  DALI_TEST_CHECK( td2 );
+  DALI_TEST_CHECK(td2);
 
-  DALI_TEST_EQUALS( td2.Count(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(td2.Count(), 1, TEST_LOCATION);
   END_TEST;
 }
 
@@ -196,19 +192,19 @@ int UtcDaliTransitionDataCount(void)
 {
   ToolkitTestApplication application;
 
-  Property::Map map = CreateMap();
-  TransitionData transitionData = TransitionData::New( map );
-  DALI_TEST_CHECK( transitionData );
-  DALI_TEST_EQUALS( transitionData.Count(), 1, TEST_LOCATION );
+  Property::Map  map            = CreateMap();
+  TransitionData transitionData = TransitionData::New(map);
+  DALI_TEST_CHECK(transitionData);
+  DALI_TEST_EQUALS(transitionData.Count(), 1, TEST_LOCATION);
 
   Property::Array array;
-  array.PushBack( map );
-  array.PushBack( map );
-  array.PushBack( map );
+  array.PushBack(map);
+  array.PushBack(map);
+  array.PushBack(map);
 
-  TransitionData transitionData2 = TransitionData::New( array );
-  DALI_TEST_CHECK( transitionData2 );
-  DALI_TEST_EQUALS( transitionData2.Count(), 3, TEST_LOCATION );
+  TransitionData transitionData2 = TransitionData::New(array);
+  DALI_TEST_CHECK(transitionData2);
+  DALI_TEST_EQUALS(transitionData2.Count(), 3, TEST_LOCATION);
 
   END_TEST;
 }
@@ -220,47 +216,45 @@ int UtcDaliTransitionDataMap1P(void)
   tet_printf("Testing animation of a visual property using stylesheet equivalent maps\n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = "mixColor";
+  map["target"]       = "visual1";
+  map["property"]     = "mixColor";
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_OUT")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "EASE_IN_OUT")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
 
   Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
   application.SendNotification();
   application.Render(0);
 
-  DALI_TEST_EQUALS( renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetProperty<float>( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   anim.Play();
 
@@ -268,19 +262,17 @@ int UtcDaliTransitionDataMap1P(void)
   application.Render(500); // Start animation
   application.Render(500); // Halfway thru anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   application.Render(500); // End of anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::RED), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::RED), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-
 int UtcDaliTransitionDataMap2P(void)
 {
   ToolkitTestApplication application;
@@ -288,47 +280,45 @@ int UtcDaliTransitionDataMap2P(void)
   tet_printf("Testing animation of a visual property using programmatic maps\n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = ColorVisual::Property::MIX_COLOR;
+  map["target"]       = "visual1";
+  map["property"]     = ColorVisual::Property::MIX_COLOR;
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "LINEAR")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
 
   Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
   application.SendNotification();
   application.Render(0);
 
-  DALI_TEST_EQUALS( renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetProperty<float>( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   anim.Play();
 
@@ -337,18 +327,17 @@ int UtcDaliTransitionDataMap2P(void)
   application.Render(500); // Start animation
   application.Render(500); // Halfway thru anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   application.Render(500); // End of anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::RED), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::RED), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliTransitionDataMap2Pb(void)
 {
   ToolkitTestApplication application;
@@ -356,51 +345,49 @@ int UtcDaliTransitionDataMap2Pb(void)
   tet_printf("Testing animation of a visual property using programmatic maps\n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = PrimitiveVisual::Property::MIX_COLOR;
+  map["target"]       = "visual1";
+  map["property"]     = PrimitiveVisual::Property::MIX_COLOR;
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "LINEAR")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
 
   Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::PRIMITIVE;
+  visualMap[Visual::Property::TYPE]               = Visual::PRIMITIVE;
   visualMap[PrimitiveVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  visualMap[ PrimitiveVisual::Property::SHAPE  ] = PrimitiveVisual::Shape::SPHERE;
-  visualMap[ PrimitiveVisual::Property::SLICES ] = 10;
-  visualMap[ PrimitiveVisual::Property::STACKS ] = 10;
+  visualMap[PrimitiveVisual::Property::SHAPE]     = PrimitiveVisual::Shape::SPHERE;
+  visualMap[PrimitiveVisual::Property::SLICES]    = 10;
+  visualMap[PrimitiveVisual::Property::STACKS]    = 10;
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIndex = renderer.GetPropertyIndex( PrimitiveVisual::Property::MIX_COLOR );
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
   application.SendNotification();
   application.Render(0);
 
-  DALI_TEST_EQUALS( renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetProperty<float>( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   anim.Play();
 
@@ -409,18 +396,17 @@ int UtcDaliTransitionDataMap2Pb(void)
   application.Render(500); // Start animation
   application.Render(500); // Halfway thru anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   application.Render(500); // End of anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::RED), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::RED), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliTransitionDataMap3P(void)
 {
   ToolkitTestApplication application;
@@ -428,30 +414,28 @@ int UtcDaliTransitionDataMap3P(void)
   tet_printf("Testing animation of an actor's position property using bezier curve\n");
 
   Property::Map map;
-  map["target"] = "Actor1";
-  map["property"] = "position";
+  map["target"]       = "Actor1";
+  map["property"]     = "position";
   map["initialValue"] = Vector3(0, 0, 0);
-  map["targetValue"] = Vector3(100, 100, 0);
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", Vector4(0.71, -0.57, 0.42, 1.38) )
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Vector3(100, 100, 0);
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", Vector4(0.71, -0.57, 0.42, 1.38))
+                      .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
+  Animation         anim      = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0,0,0), 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0, 0, 0), 0.001f, TEST_LOCATION);
 
   anim.Play();
 
@@ -460,23 +444,22 @@ int UtcDaliTransitionDataMap3P(void)
 
   application.Render(250); // 25%
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(-10,-10,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50%
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(-10, -10, 0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50%
 
   application.Render(250); // Halfway thru map1 anim
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(24,24,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50%
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(24, 24, 0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50%
 
   application.Render(250); // End of map1 anim
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,100,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(100, 100, 0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve
 
   application.Render(250); // End of map1 anim
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,100,0), TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(100, 100, 0), TEST_LOCATION);
   END_TEST;
 }
 
-
 int UtcDaliTransitionDataMap4P(void)
 {
   ToolkitTestApplication application;
@@ -484,54 +467,50 @@ int UtcDaliTransitionDataMap4P(void)
   tet_printf("Testing animation of a visual's transform property using programmatic maps\n");
 
   Property::Map map1;
-  map1["target"] = "testVisual";
-  map1["property"] = "offset";
+  map1["target"]       = "testVisual";
+  map1["property"]     = "offset";
   map1["initialValue"] = Vector2(0.0f, 0.0f);
-  map1["targetValue"] = Vector2(100.0f, 100.0f);
-  map1["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map1["targetValue"]  = Vector2(100.0f, 100.0f);
+  map1["animator"]     = Property::Map()
+                       .Add("alphaFunction", "LINEAR")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
   Property::Map map2;
-  map2["target"] = "testVisual";
-  map2["property"] = "size";
+  map2["target"]       = "testVisual";
+  map2["property"]     = "size";
   map2["initialValue"] = Vector2(10.0f, 10.0f);
-  map2["targetValue"] = Vector2(110.0f, 110.0f);
-  map2["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map2["targetValue"]  = Vector2(110.0f, 110.0f);
+  map2["animator"]     = Property::Map()
+                       .Add("alphaFunction", "LINEAR")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( Property::Array().Add(map1).Add(map2) );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(Property::Array().Add(map1).Add(map2));
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
 
   Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
 
-  visual.SetName( "testVisual" );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  visual.SetName("testVisual");
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index sizeIndex = renderer.GetPropertyIndex( "size" );
+  Renderer        renderer  = actor.GetRendererAt(0);
+  Property::Index sizeIndex = VisualRenderer::Property::TRANSFORM_SIZE;
   application.SendNotification();
   application.Render(0);
 
-  DALI_TEST_EQUALS( renderer.GetProperty<Vector2>(sizeIndex), Vector2(10.0f, 10.0f), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector2 >( sizeIndex ), Vector2(10.0f, 10.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector2>(sizeIndex), Vector2(10.0f, 10.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector2>(sizeIndex), Vector2(10.0f, 10.0f), TEST_LOCATION);
 
   anim.Play();
 
@@ -540,11 +519,11 @@ int UtcDaliTransitionDataMap4P(void)
   application.Render(500); // Start animation
   application.Render(500); // Halfway thru anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector2 >( sizeIndex ), Vector2(60.0f, 60.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector2>(sizeIndex), Vector2(60.0f, 60.0f), TEST_LOCATION);
 
   application.Render(500); // End of anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector2 >( sizeIndex ), Vector2(110.0f, 110.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector2>(sizeIndex), Vector2(110.0f, 110.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -556,58 +535,56 @@ int UtcDaliTransitionDataMap5P(void)
   tet_printf("Testing animation visual opacity using stylesheet equivalent maps\n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = "opacity";
+  map["target"]       = "visual1";
+  map["property"]     = "opacity";
   map["initialValue"] = 0.0f;
-  map["targetValue"] = 1.0f;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_OUT")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = 1.0f;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "EASE_IN_OUT")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
 
   Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
 
   TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  glAbstraction.EnableEnableDisableCallTrace( true );
-  TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace();
+  glAbstraction.EnableEnableDisableCallTrace(true);
+  TraceCallStack&    glEnableStack = glAbstraction.GetEnableDisableTrace();
   std::ostringstream blendStr;
   blendStr << std::hex << GL_BLEND;
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
   application.SendNotification();
   application.Render(0);
 
-  DALI_TEST_EQUALS( renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetProperty<float>( DevelRenderer::Property::OPACITY ), 0.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<float>(DevelRenderer::Property::OPACITY), 0.0f, 0.001f, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 0.0f, 0.001f, TEST_LOCATION);
 
   // The Renderer is transparent. So rendering is skipped. The state should not be changed.
-  DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
-  DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
+  DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
+  DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Disable", blendStr.str()));
 
   anim.Play();
 
@@ -617,26 +594,25 @@ int UtcDaliTransitionDataMap5P(void)
   application.Render(500); // Start animation
   application.Render(500); // Halfway thru anim
   application.SendNotification();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.5f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 0.5f, 0.001f, TEST_LOCATION);
 
   // Should not be changed
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
 
   glEnableStack.Reset();
 
   application.Render(501); // End of anim
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str()));
 
   END_TEST;
 }
 
-
 int UtcDaliTransitionDataMap6P(void)
 {
   ToolkitTestApplication application;
@@ -644,56 +620,53 @@ int UtcDaliTransitionDataMap6P(void)
   tet_printf("Testing animation visual opacity using stylesheet equivalent maps\n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = "opacity";
+  map["target"]      = "visual1";
+  map["property"]    = "opacity";
   map["targetValue"] = 0.0f;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_OUT")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["animator"]    = Property::Map()
+                      .Add("alphaFunction", "EASE_IN_OUT")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
 
   Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
-
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
 
+  Renderer           renderer      = actor.GetRendererAt(0);
+  Property::Index    mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
   TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  glAbstraction.EnableEnableDisableCallTrace( true );
-  TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace();
+  glAbstraction.EnableEnableDisableCallTrace(true);
+  TraceCallStack&    glEnableStack = glAbstraction.GetEnableDisableTrace();
   std::ostringstream blendStr;
   blendStr << std::hex << GL_BLEND;
 
   application.SendNotification();
   application.Render(0);
 
-  DALI_TEST_EQUALS( renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetProperty<float>( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 1.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001f, TEST_LOCATION);
 
   // Default state is disabled. So test if "Enabled" is not called.
-  DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+  DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
 
   anim.Play();
 
@@ -704,54 +677,51 @@ int UtcDaliTransitionDataMap6P(void)
   application.Render(500); // Halfway thru anim
   application.SendNotification();
 
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION);
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.5f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 0.5f, 0.001f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+  DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
 
   glEnableStack.Reset();
 
   application.Render(500); // End of anim
   application.SendNotification();
 
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< Vector3 >( mixColorIndex ), Vector3(Color::MAGENTA), TEST_LOCATION );
-  DALI_TEST_EQUALS( renderer.GetCurrentProperty< float >( DevelRenderer::Property::OPACITY ), 0.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<Vector3>(mixColorIndex), Vector3(Color::MAGENTA), TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetCurrentProperty<float>(DevelRenderer::Property::OPACITY), 0.0f, 0.001f, TEST_LOCATION);
 
   // GL_BLEND should not be changed: Keep enabled
-  DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
+  DALI_TEST_CHECK(!glEnableStack.FindMethodAndParams("Disable", blendStr.str()));
 
   END_TEST;
 }
 
-
 int UtcDaliTransitionDataMap1N(void)
 {
   ToolkitTestApplication application;
 
   Property::Map map;
-  map["target"] = "Actor1";
-  map["property"] = "randomProperty";
+  map["target"]       = "Actor1";
+  map["property"]     = "randomProperty";
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_OUT")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", "EASE_OUT")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( ! anim );
+  Animation         anim      = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(!anim);
 
-  CHECK_MAP_EQUALS( map, transition.GetAnimatorAt(0) );
+  CHECK_MAP_EQUALS(map, transition.GetAnimatorAt(0));
   END_TEST;
 }
 
@@ -762,47 +732,44 @@ int UtcDaliTransitionDataMapN4(void)
   tet_printf("Testing visual doesn't animate with duff bezier data \n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = "mixColor";
+  map["target"]       = "visual1";
+  map["property"]     = "mixColor";
   map["initialValue"] = Vector3(Color::MAGENTA);
-  map["targetValue"] = Vector3(Color::RED);
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", Vector3(.1f,1.0f,0.5f))
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Vector3(Color::RED);
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", Vector3(.1f, 1.0f, 0.5f))
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  Property::Map     visualMap;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( !anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(!anim);
 
   application.SendNotification();
   application.Render(0);
   application.SendNotification();
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIdx = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
-
-  tet_printf( "Test that the property has been set to target value\n");
-  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIdx), Vector3(Color::RED), 0.001, TEST_LOCATION);
-  DALI_TEST_EQUALS(renderer.GetProperty<float>( DevelRenderer::Property::OPACITY ), 1.0f, 0.001, TEST_LOCATION);
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
+  tet_printf("Test that the property has been set to target value\n");
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::RED), 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001, TEST_LOCATION);
 
   END_TEST;
 }
@@ -814,46 +781,43 @@ int UtcDaliTransitionDataMapN5(void)
   tet_printf("Testing visual doesn't animate with duff bezier data \n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = "mixColor";
+  map["target"]       = "visual1";
+  map["property"]     = "mixColor";
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", Property::Array().Add(.1f).Add(1.0f).Add(0.5f))
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", Property::Array().Add(.1f).Add(1.0f).Add(0.5f))
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  Property::Map     visualMap;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( !anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(!anim);
 
   application.SendNotification();
   application.Render(0);
   application.SendNotification();
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIdx = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
-
-  tet_printf( "Test that the property has been set to target value\n");
-  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIdx), Vector3(Color::RED), 0.001, TEST_LOCATION);
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
+  tet_printf("Test that the property has been set to target value\n");
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::RED), 0.001, TEST_LOCATION);
 
   END_TEST;
 }
@@ -865,257 +829,227 @@ int UtcDaliTransitionDataMapN6(void)
   tet_printf("Testing visual doesn't animate with duff bezier data \n");
 
   Property::Map map;
-  map["target"] = "visual1";
-  map["property"] = "mixColor";
+  map["target"]       = "visual1";
+  map["property"]     = "mixColor";
   map["initialValue"] = Color::MAGENTA;
-  map["targetValue"] = Color::RED;
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", Property::Array().Add("1").Add("Two").Add("3").Add("4"))
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map["targetValue"]  = Color::RED;
+  map["animator"]     = Property::Map()
+                      .Add("alphaFunction", Property::Array().Add("1").Add("Two").Add("3").Add("4"))
+                      .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  Property::Map visualMap;
-  visualMap[Visual::Property::TYPE] = Visual::COLOR;
+  Property::Map     visualMap;
+  visualMap[Visual::Property::TYPE]           = Visual::COLOR;
   visualMap[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
-  Visual::Base visual = VisualFactory::Get().CreateVisual( visualMap );
-  visual.SetName( "visual1" );
+  Visual::Base visual                         = VisualFactory::Get().CreateVisual(visualMap);
+  visual.SetName("visual1");
 
   Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
-  dummyImpl.RegisterVisual( visualIndex, visual );
+  dummyImpl.RegisterVisual(visualIndex, visual);
 
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( !anim );
+  Animation anim = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(!anim);
 
   application.SendNotification();
   application.Render(0);
   application.SendNotification();
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIdx = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR;
 
-  tet_printf( "Test that the property has been set to target value\n");
-  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIdx), Vector3(Color::RED), 0.001, TEST_LOCATION);
-  DALI_TEST_EQUALS(renderer.GetProperty<float>( DevelRenderer::Property::OPACITY ), 1.0f, 0.001, TEST_LOCATION);
+  tet_printf("Test that the property has been set to target value\n");
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector3>(mixColorIndex), Vector3(Color::RED), 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(renderer.GetProperty<float>(DevelRenderer::Property::OPACITY), 1.0f, 0.001, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliTransitionDataArrayP(void)
 {
   ToolkitTestApplication application;
 
   Property::Map map1;
-  map1["target"] = "Actor1";
-  map1["property"] = "color";
+  map1["target"]       = "Actor1";
+  map1["property"]     = "color";
   map1["initialValue"] = Color::MAGENTA;
-  map1["targetValue"] = Color::RED;
-  map1["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_OUT")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 1.0f));
+  map1["targetValue"]  = Color::RED;
+  map1["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_IN_OUT")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 1.0f));
 
   Property::Map map2;
-  map2["target"] = "Actor1";
-  map2["property"] = "position";
-  map2["initialValue"] = Vector3(100,0,0);
-  map2["targetValue"] = Vector3(0,100,0);
-  map2["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_OUT")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 1.0f));
+  map2["target"]       = "Actor1";
+  map2["property"]     = "position";
+  map2["initialValue"] = Vector3(100, 0, 0);
+  map2["targetValue"]  = Vector3(0, 100, 0);
+  map2["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_IN_OUT")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f));
 
   Property::Map map3;
-  map3["target"] = "Actor1";
-  map3["property"] = "orientation";
-  map3["targetValue"] = Quaternion( Radian(Math::PI_2), Vector3::ZAXIS );
+  map3["target"]      = "Actor1";
+  map3["property"]    = "orientation";
+  map3["targetValue"] = Quaternion(Radian(Math::PI_2), Vector3::ZAXIS);
 
   Property::Array array;
   array.PushBack(map1);
   array.PushBack(map2);
   array.PushBack(map3);
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( array );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(array);
 
   DummyControl actor = DummyControl::New();
   actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty( Dali::Actor::Property::NAME,"Actor1");
-  actor.SetProperty( Actor::Property::COLOR,Color::CYAN);
+  actor.SetProperty(Dali::Actor::Property::NAME, "Actor1");
+  actor.SetProperty(Actor::Property::COLOR, Color::CYAN);
   application.GetScene().Add(actor);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion(Radian(0), Vector3::ZAXIS), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Radian(0), Vector3::ZAXIS), TEST_LOCATION);
 
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  Animation anim = dummyImpl.CreateTransition( transition );
-  DALI_TEST_CHECK( anim );
+  Animation         anim      = dummyImpl.CreateTransition(transition);
+  DALI_TEST_CHECK(anim);
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::MAGENTA, TEST_LOCATION);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion(Radian(Math::PI_2), Vector3::ZAXIS), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector4>(Actor::Property::COLOR), Color::MAGENTA, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Radian(Math::PI_2), Vector3::ZAXIS), TEST_LOCATION);
   anim.Play();
 
   application.SendNotification();
-  application.Render(0);   // start map2 anim
+  application.Render(0); // start map2 anim
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,0,0), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(100, 0, 0), TEST_LOCATION);
 
   application.Render(500); // Start map1 animation, halfway thru map2 anim
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(50,50,0), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(50, 50, 0), TEST_LOCATION);
 
   application.Render(500); // Halfway thru map1 anim, end of map2 anim
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0,100,0), TEST_LOCATION);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), (Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION), Vector3(0, 100, 0), TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector4>(Actor::Property::COLOR), (Color::MAGENTA + Color::RED) * 0.5f, TEST_LOCATION);
 
   application.Render(500); // End of map1 anim
   application.SendNotification();
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::RED, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector4>(Actor::Property::COLOR), Color::RED, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliTransitionDataGetAnimatorP(void)
 {
   ToolkitTestApplication application;
 
   Property::Map map1;
-  map1["target"] = "Actor1";
-  map1["property"] = "color";
+  map1["target"]       = "Actor1";
+  map1["property"]     = "color";
   map1["initialValue"] = Color::MAGENTA;
-  map1["targetValue"] = Color::RED;
-  map1["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_SQUARE")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 0.5f));
+  map1["targetValue"]  = Color::RED;
+  map1["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_IN_SQUARE")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 0.5f));
 
   Property::Map map2;
-  map2["target"] = "Actor1";
-  map2["property"] = "position";
-  map2["initialValue"] = Vector3(100,0,0);
-  map2["targetValue"] = Vector3(0,100,0);
-  map2["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_OUT_SQUARE")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.2f)
-         .Add("duration", 2.0f));
+  map2["target"]       = "Actor1";
+  map2["property"]     = "position";
+  map2["initialValue"] = Vector3(100, 0, 0);
+  map2["targetValue"]  = Vector3(0, 100, 0);
+  map2["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_OUT_SQUARE")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.2f).Add("duration", 2.0f));
 
   Property::Map map3;
-  map3["target"] = "Actor1";
-  map3["property"] = "size";
-  map3["initialValue"] = Vector2(10,10);
-  map3["targetValue"] = Vector2(100,100);
-  map3["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_OUT_SINE")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.4f)
-         .Add("duration", 3.0f));
+  map3["target"]       = "Actor1";
+  map3["property"]     = "size";
+  map3["initialValue"] = Vector2(10, 10);
+  map3["targetValue"]  = Vector2(100, 100);
+  map3["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_OUT_SINE")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.4f).Add("duration", 3.0f));
 
   Property::Map map4;
-  map4["target"] = "Actor2";
-  map4["property"] = "color";
+  map4["target"]       = "Actor2";
+  map4["property"]     = "color";
   map4["initialValue"] = Color::BLACK;
-  map4["targetValue"] = Color::GREEN;
-  map4["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_OUT_SINE")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.5f)
-         .Add("duration", 0.5f));
+  map4["targetValue"]  = Color::GREEN;
+  map4["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_IN_OUT_SINE")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.5f).Add("duration", 0.5f));
 
   Property::Map map5;
-  map5["target"] = "Actor2";
-  map5["property"] = "position";
-  map5["initialValue"] = Vector3(100,0,0);
-  map5["targetValue"] = Vector3(0,100,0);
-  map5["animator"] = Property::Map()
-    .Add("alphaFunction", "BOUNCE")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.2f)
-         .Add("duration", 2.0f));
+  map5["target"]       = "Actor2";
+  map5["property"]     = "position";
+  map5["initialValue"] = Vector3(100, 0, 0);
+  map5["targetValue"]  = Vector3(0, 100, 0);
+  map5["animator"]     = Property::Map()
+                       .Add("alphaFunction", "BOUNCE")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.2f).Add("duration", 2.0f));
 
   Property::Map map6;
-  map6["target"] = "Actor2";
-  map6["property"] = "size";
-  map6["initialValue"] = Vector2(10,10);
-  map6["targetValue"] = Vector2(100,100);
-  map6["animator"] = Property::Map()
-    .Add("alphaFunction", "SIN")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.4f)
-         .Add("duration", 3.0f));
+  map6["target"]       = "Actor2";
+  map6["property"]     = "size";
+  map6["initialValue"] = Vector2(10, 10);
+  map6["targetValue"]  = Vector2(100, 100);
+  map6["animator"]     = Property::Map()
+                       .Add("alphaFunction", "SIN")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.4f).Add("duration", 3.0f));
 
   Property::Map map7;
-  map7["target"] = "Actor4";
-  map7["property"] = "sizeModeFactor";
-  map7["initialValue"] = Vector3(1,1,1);
-  map7["targetValue"] = Vector3(2,2,2);
-  map7["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN_SINE")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 1.0f));
+  map7["target"]       = "Actor4";
+  map7["property"]     = "sizeModeFactor";
+  map7["initialValue"] = Vector3(1, 1, 1);
+  map7["targetValue"]  = Vector3(2, 2, 2);
+  map7["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_IN_SINE")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f));
 
   Property::Map map8;
-  map8["target"] = "Visual1";
-  map8["property"] = "opacity";
+  map8["target"]       = "Visual1";
+  map8["property"]     = "opacity";
   map8["initialValue"] = 0.0f;
-  map8["targetValue"] = 1.0f;
-  map8["animator"] = Property::Map()
-    .Add("alphaFunction", "EASE_IN")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.3f)
-         .Add("duration", 9.0f));
+  map8["targetValue"]  = 1.0f;
+  map8["animator"]     = Property::Map()
+                       .Add("alphaFunction", "EASE_IN")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.3f).Add("duration", 9.0f));
 
   Property::Map map9;
-  map9["target"] = "Actor2";
-  map9["property"] = "scale";
-  map9["initialValue"] = Vector3(0,0,0);
-  map9["targetValue"] = Vector3(1,1,1);
-  map9["animator"] = Property::Map()
-    .Add("alphaFunction", "REVERSE")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 1.0f));
+  map9["target"]       = "Actor2";
+  map9["property"]     = "scale";
+  map9["initialValue"] = Vector3(0, 0, 0);
+  map9["targetValue"]  = Vector3(1, 1, 1);
+  map9["animator"]     = Property::Map()
+                       .Add("alphaFunction", "REVERSE")
+                       .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f));
 
   Property::Map map10;
-  map10["target"] = "Actor2";
-  map10["property"] = "scale";
-  map10["initialValue"] = Vector3(0,0,0);
-  map10["targetValue"] = Vector3(1,1,1);
-  map10["animator"] = Property::Map()
-    .Add("alphaFunction", Vector4(.23,.4,.8,1.2))
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 1.0f));
+  map10["target"]       = "Actor2";
+  map10["property"]     = "scale";
+  map10["initialValue"] = Vector3(0, 0, 0);
+  map10["targetValue"]  = Vector3(1, 1, 1);
+  map10["animator"]     = Property::Map()
+                        .Add("alphaFunction", Vector4(.23, .4, .8, 1.2))
+                        .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f));
 
   Property::Map map11;
-  map11["target"] = "Actor2";
-  map11["property"] = "scale";
-  map11["initialValue"] = Vector3(0,0,0);
-  map11["targetValue"] = Vector3(1,1,1);
-  map11["animator"] = Property::Map()
-    .Add("alphaFunction", Property::Array().Add(.23f).Add(.4f).Add(.8f).Add(.2f))
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 1.0f));
+  map11["target"]       = "Actor2";
+  map11["property"]     = "scale";
+  map11["initialValue"] = Vector3(0, 0, 0);
+  map11["targetValue"]  = Vector3(1, 1, 1);
+  map11["animator"]     = Property::Map()
+                        .Add("alphaFunction", Property::Array().Add(.23f).Add(.4f).Add(.8f).Add(.2f))
+                        .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 1.0f));
 
   Property::Map map12;
-  map12["target"] = "Actor1";
-  map12["property"] = "orientation";
-  map12["targetValue"] = Quaternion( Radian(Math::PI_2), Vector3::ZAXIS );
+  map12["target"]      = "Actor1";
+  map12["property"]    = "orientation";
+  map12["targetValue"] = Quaternion(Radian(Math::PI_2), Vector3::ZAXIS);
 
   Property::Array array;
   array.PushBack(map1);
@@ -1131,17 +1065,17 @@ int UtcDaliTransitionDataGetAnimatorP(void)
   array.PushBack(map11);
   array.PushBack(map12);
 
-  Dali::Toolkit::TransitionData transition = TransitionData::New( array );
+  Dali::Toolkit::TransitionData transition = TransitionData::New(array);
 
-  DALI_TEST_EQUALS( transition.Count(), array.Count(), TEST_LOCATION );
+  DALI_TEST_EQUALS(transition.Count(), array.Count(), TEST_LOCATION);
 
-  for( unsigned int i=0; i < array.Count(); ++i )
+  for(unsigned int i = 0; i < array.Count(); ++i)
   {
-    Property::Map animatorMap = transition.GetAnimatorAt(i);
-    Property::Value& value = array.GetElementAt(i);
-    Property::Map* inputMap = value.GetMap();
-    DALI_TEST_CHECK( inputMap );
-    CHECK_MAP_EQUALS( *inputMap, animatorMap );
+    Property::Map    animatorMap = transition.GetAnimatorAt(i);
+    Property::Value& value       = array.GetElementAt(i);
+    Property::Map*   inputMap    = value.GetMap();
+    DALI_TEST_CHECK(inputMap);
+    CHECK_MAP_EQUALS(*inputMap, animatorMap);
   }
 
   END_TEST;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
index de842bf..4dbea79 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,30 +15,31 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/public-api/controls/video-view/video-view.h>
 #include <dali-toolkit/devel-api/controls/video-view/video-view-devel.h>
-#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali-toolkit/public-api/controls/video-view/video-view.h>
 #include <dali/devel-api/adaptor-framework/video-sync-mode.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
 namespace
 {
-const char* const TEST_FILE( "test.mp4" );
-const char* const VOLUME_LEFT( "volumeLeft" );
-const char* const VOLUME_RIGHT( "volumeRight" );
-const char* const RENDERING_TYPE( "renderingTarget" );
-const char* const DUMMY_STRING( "dummy string" );
+const char* const TEST_FILE("test.mp4");
+const char* const VOLUME_LEFT("volumeLeft");
+const char* const VOLUME_RIGHT("volumeRight");
+const char* const RENDERING_TYPE("renderingTarget");
+const char* const DUMMY_STRING("dummy string");
 
+// clang-format off
 const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
-  attribute mediump vec2 aPosition;\n
-  varying mediump vec2 vTexCoord;\n
-  uniform mediump mat4 uMvpMatrix;\n
+  attribute mediump vec2     aPosition;\n
+  varying mediump vec2     vTexCoord;\n
+  uniform mediump mat4   uMvpMatrix;\n
   uniform mediump vec3 uSize;\n
   \n
   void main()\n
@@ -46,13 +47,11 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
     mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n
     vertexPosition.xyz *= uSize;\n
     vertexPosition = uMvpMatrix * vertexPosition;\n
-    \n
     vTexCoord = aPosition + vec2(0.5);\n
     gl_Position = vertexPosition;\n
-  }\n
-);
+  }\n);
 
-const char* fragmentShaderPrefix( "#extension GL_OES_EGL_image_external:require\n" );
+const char* fragmentShaderPrefix("#extension GL_OES_EGL_image_external:require\n");
 const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
   varying mediump vec2 vTexCoord;\n
   uniform samplerExternalOES sTexture;\n
@@ -60,11 +59,12 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
   \n
   void main()\n
   {\n
-    gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n
-  }\n
-);
+    gl_FragColor = texture2D(sTexture, vTexCoord) * uColor;\n
+  }\n);
 
-}
+// clang-format on
+
+} // namespace
 
 void video_view_startup(void)
 {
@@ -88,13 +88,13 @@ int UtcDaliVideoViewUninitialized(void)
   {
     // New() must be called to create a VideoView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
@@ -107,11 +107,11 @@ int UtcDaliVideoViewNew(void)
   tet_infoline(" UtcDaliVideoViewNew");
 
   Toolkit::VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  const std::string url( DUMMY_STRING );
-  Toolkit::VideoView view2 = Toolkit::VideoView::New( url );
-  DALI_TEST_CHECK( view2 );
+  const std::string  url(DUMMY_STRING);
+  Toolkit::VideoView view2 = Toolkit::VideoView::New(url);
+  DALI_TEST_CHECK(view2);
   END_TEST;
 }
 
@@ -122,12 +122,12 @@ int UtcDaliVideoViewDownCast(void)
   tet_infoline(" UtcDaliVideoViewDownCast");
 
   Toolkit::VideoView view = Toolkit::VideoView::New();
-  BaseHandle handle(view);
+  BaseHandle         handle(view);
 
-  Toolkit::VideoView view2 = Toolkit::VideoView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( view2 );
-  DALI_TEST_CHECK( view == view2 );
+  Toolkit::VideoView view2 = Toolkit::VideoView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(view2);
+  DALI_TEST_CHECK(view == view2);
   END_TEST;
 }
 
@@ -138,13 +138,13 @@ int UtcDaliVideoViewProperty1(void)
   tet_infoline(" UtcDaliVideoViewProperty1");
 
   Toolkit::VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   std::string file;
-  view.SetProperty( VideoView::Property::VIDEO, TEST_FILE );
-  Property::Value val = view.GetProperty( VideoView::Property::VIDEO );
-  DALI_TEST_CHECK( val.Get( file ) );
-  DALI_TEST_CHECK( file == TEST_FILE );
+  view.SetProperty(VideoView::Property::VIDEO, TEST_FILE);
+  Property::Value val = view.GetProperty(VideoView::Property::VIDEO);
+  DALI_TEST_CHECK(val.Get(file));
+  DALI_TEST_CHECK(file == TEST_FILE);
   END_TEST;
 }
 
@@ -155,30 +155,31 @@ int UtcDaliVideoViewProperty1b(void)
   tet_infoline(" UtcDaliVideoViewProperty1");
 
   Toolkit::VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
   Integration::Scene stage = application.GetScene();
 
-  std::string file;
+  std::string   file;
   Property::Map map;
 
-  view.SetProperty( VideoView::Property::VIDEO, Property::Map()
-                    .Add("rendererType", "IMAGE")
-                    .Add("url", "video.mpg") // Note, videoView doesn't use this url
-                    .Add("RENDERING_TARGET", "windowSurfaceTarget" )
-                    .Add("width", 100)
-                    .Add("height", 100) );
+  view.SetProperty(VideoView::Property::VIDEO,
+                   Property::Map()
+                     .Add("rendererType", "IMAGE")
+                     .Add("url", "video.mpg") // Note, videoView doesn't use this url
+                     .Add("RENDERING_TARGET", "windowSurfaceTarget")
+                     .Add("width", 100)
+                     .Add("height", 100));
 
-  stage.Add( view );
+  stage.Add(view);
 
-  Property::Value val = view.GetProperty( VideoView::Property::VIDEO );
-  Property::Map* resultMap = val.GetMap();
+  Property::Value val       = view.GetProperty(VideoView::Property::VIDEO);
+  Property::Map*  resultMap = val.GetMap();
 
-  DALI_TEST_CHECK( resultMap );
+  DALI_TEST_CHECK(resultMap);
   Property::Value* value = resultMap->Find("url");
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<std::string>(), "video.mpg", TEST_LOCATION );
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), "video.mpg", TEST_LOCATION);
 
-  stage.Remove( view );
+  stage.Remove(view);
 
   END_TEST;
 }
@@ -189,17 +190,17 @@ int UtcDaliVideoViewProperty2(void)
   tet_infoline(" UtcDaliVideoViewProperty2");
 
   Toolkit::VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  bool looping;
-  Property::Value val = view.GetProperty( VideoView::Property::LOOPING );
-  DALI_TEST_CHECK( val.Get( looping ) );
-  DALI_TEST_CHECK( !looping );
+  bool            looping;
+  Property::Value val = view.GetProperty(VideoView::Property::LOOPING);
+  DALI_TEST_CHECK(val.Get(looping));
+  DALI_TEST_CHECK(!looping);
 
-  view.SetProperty( VideoView::Property::LOOPING, true );
-  val = view.GetProperty( VideoView::Property::LOOPING );
-  DALI_TEST_CHECK( val.Get( looping ) );
-  DALI_TEST_CHECK( looping );
+  view.SetProperty(VideoView::Property::LOOPING, true);
+  val = view.GetProperty(VideoView::Property::LOOPING);
+  DALI_TEST_CHECK(val.Get(looping));
+  DALI_TEST_CHECK(looping);
   END_TEST;
 }
 
@@ -209,17 +210,17 @@ int UtcDaliVideoViewProperty3(void)
   tet_infoline(" UtcDaliVideoViewProperty3");
 
   Toolkit::VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  bool muted;
-  Property::Value val = view.GetProperty( VideoView::Property::MUTED );
-  DALI_TEST_CHECK( val.Get( muted ) );
-  DALI_TEST_CHECK( !muted );
+  bool            muted;
+  Property::Value val = view.GetProperty(VideoView::Property::MUTED);
+  DALI_TEST_CHECK(val.Get(muted));
+  DALI_TEST_CHECK(!muted);
 
-  view.SetProperty( VideoView::Property::MUTED, true );
-  val = view.GetProperty( VideoView::Property::MUTED );
-  DALI_TEST_CHECK( val.Get( muted ) );
-  DALI_TEST_CHECK( muted );
+  view.SetProperty(VideoView::Property::MUTED, true);
+  val = view.GetProperty(VideoView::Property::MUTED);
+  DALI_TEST_CHECK(val.Get(muted));
+  DALI_TEST_CHECK(muted);
 
   END_TEST;
 }
@@ -230,28 +231,28 @@ int UtcDaliVideoViewProperty4(void)
   tet_infoline(" UtcDaliVideoViewProperty4");
 
   Toolkit::VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   float left, right;
   left = right = 0.f;
 
   Property::Map map;
-  map.Insert( VOLUME_LEFT, 0.5f );
-  map.Insert( VOLUME_RIGHT, 0.5f );
+  map.Insert(VOLUME_LEFT, 0.5f);
+  map.Insert(VOLUME_RIGHT, 0.5f);
 
-  view.SetProperty( VideoView::Property::VOLUME, map );
-  Property::Value val = view.GetProperty( VideoView::Property::VOLUME );
+  view.SetProperty(VideoView::Property::VOLUME, map);
+  Property::Value val = view.GetProperty(VideoView::Property::VOLUME);
 
   Property::Map map2;
-  DALI_TEST_CHECK( val.Get( map2 ) );
+  DALI_TEST_CHECK(val.Get(map2));
 
-  Property::Value* volumeLeft = map2.Find( VOLUME_LEFT );
-  Property::Value* volumeRight = map2.Find( VOLUME_RIGHT );
+  Property::Value* volumeLeft  = map2.Find(VOLUME_LEFT);
+  Property::Value* volumeRight = map2.Find(VOLUME_RIGHT);
 
-  DALI_TEST_CHECK( volumeLeft && volumeLeft->Get( left ) );
-  DALI_TEST_CHECK( volumeRight && volumeRight->Get( right ) );
-  DALI_TEST_CHECK( left == 0.5f );
-  DALI_TEST_CHECK( right == 0.5f );
+  DALI_TEST_CHECK(volumeLeft && volumeLeft->Get(left));
+  DALI_TEST_CHECK(volumeRight && volumeRight->Get(right));
+  DALI_TEST_CHECK(left == 0.5f);
+  DALI_TEST_CHECK(right == 0.5f);
 
   END_TEST;
 }
@@ -261,16 +262,16 @@ int UtcDaliVideoViewCopyAndAssignment(void)
   ToolkitTestApplication application;
 
   VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  VideoView copy( view );
-  DALI_TEST_CHECK( view == copy );
+  VideoView copy(view);
+  DALI_TEST_CHECK(view == copy);
 
   VideoView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
 
   assign = copy;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -280,15 +281,15 @@ int UtcDaliVideoViewMoveConstructor(void)
   ToolkitTestApplication application;
 
   VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_EQUALS( 1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  view.SetProperty( VideoView::Property::LOOPING, true );
-  DALI_TEST_CHECK( view.GetProperty<bool>( VideoView::Property::LOOPING ) );
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  view.SetProperty(VideoView::Property::LOOPING, true);
+  DALI_TEST_CHECK(view.GetProperty<bool>(VideoView::Property::LOOPING));
 
-  VideoView moved = std::move( view );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<bool>( VideoView::Property::LOOPING ) );
-  DALI_TEST_CHECK( !view );
+  VideoView moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<bool>(VideoView::Property::LOOPING));
+  DALI_TEST_CHECK(!view);
 
   END_TEST;
 }
@@ -298,16 +299,16 @@ int UtcDaliVideoViewMoveAssignment(void)
   ToolkitTestApplication application;
 
   VideoView view = Toolkit::VideoView::New();
-  DALI_TEST_EQUALS( 1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  view.SetProperty( VideoView::Property::LOOPING, true );
-  DALI_TEST_CHECK( view.GetProperty<bool>( VideoView::Property::LOOPING ) );
+  DALI_TEST_EQUALS(1, view.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  view.SetProperty(VideoView::Property::LOOPING, true);
+  DALI_TEST_CHECK(view.GetProperty<bool>(VideoView::Property::LOOPING));
 
   VideoView moved;
-  moved = std::move( view );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( moved.GetProperty<bool>( VideoView::Property::LOOPING ) );
-  DALI_TEST_CHECK( !view );
+  moved = std::move(view);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(moved.GetProperty<bool>(VideoView::Property::LOOPING));
+  DALI_TEST_CHECK(!view);
 
   END_TEST;
 }
@@ -317,16 +318,16 @@ int UtcDaliVideoViewTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "VideoView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("VideoView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  VideoView view = VideoView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  VideoView view = VideoView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -336,7 +337,7 @@ int UtcDaliVideoViewMethodsForCoverage(void)
   ToolkitTestApplication application;
 
   VideoView videoView = VideoView::New();
-  DALI_TEST_CHECK( videoView );
+  DALI_TEST_CHECK(videoView);
 
   videoView.Play();
   videoView.Pause();
@@ -344,10 +345,10 @@ int UtcDaliVideoViewMethodsForCoverage(void)
   videoView.Forward(10);
   videoView.Backward(10);
 
-  Toolkit::DevelVideoView::GetMediaPlayer( videoView );
+  Toolkit::DevelVideoView::GetMediaPlayer(videoView);
 
   VideoView::VideoViewSignalType& signal = videoView.FinishedSignal();
-  DALI_TEST_EQUALS( 0, signal.GetConnectionCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0, signal.GetConnectionCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -355,34 +356,34 @@ int UtcDaliVideoViewMethodsForCoverage(void)
 int UtcDaliVideoViewMethodsForRenderType(void)
 {
   ToolkitTestApplication application;
-  VideoView videoView = VideoView::New();
-  DALI_TEST_CHECK( videoView );
+  VideoView              videoView = VideoView::New();
+  DALI_TEST_CHECK(videoView);
 
   Property::Map windowSurfaceTarget;
   Property::Map nativeImageTarget;
 
-  windowSurfaceTarget.Insert( RENDERING_TYPE, "windowSurfaceTarget" );
-  nativeImageTarget.Insert( RENDERING_TYPE, "nativeImageTarget" );
+  windowSurfaceTarget.Insert(RENDERING_TYPE, "windowSurfaceTarget");
+  nativeImageTarget.Insert(RENDERING_TYPE, "nativeImageTarget");
 
-  Property::Map map;
+  Property::Map   map;
   Property::Value value;
-  videoView.SetProperty( VideoView::Property::VIDEO, windowSurfaceTarget );
+  videoView.SetProperty(VideoView::Property::VIDEO, windowSurfaceTarget);
 
-  value = videoView.GetProperty( VideoView::Property::VIDEO );
-  DALI_TEST_CHECK( value.Get( map ) );
+  value = videoView.GetProperty(VideoView::Property::VIDEO);
+  DALI_TEST_CHECK(value.Get(map));
 
-  Property::Value* type = map.Find( RENDERING_TYPE );
-  DALI_TEST_CHECK( type );
-  DALI_TEST_EQUALS( "windowSurfaceTarget", type->Get<std::string>(), TEST_LOCATION );
+  Property::Value* type = map.Find(RENDERING_TYPE);
+  DALI_TEST_CHECK(type);
+  DALI_TEST_EQUALS("windowSurfaceTarget", type->Get<std::string>(), TEST_LOCATION);
 
-  videoView.SetProperty( VideoView::Property::VIDEO, nativeImageTarget );
+  videoView.SetProperty(VideoView::Property::VIDEO, nativeImageTarget);
 
-  value = videoView.GetProperty( VideoView::Property::VIDEO );
-  DALI_TEST_CHECK( value.Get( map ) );
-  type = map.Find( RENDERING_TYPE );
+  value = videoView.GetProperty(VideoView::Property::VIDEO);
+  DALI_TEST_CHECK(value.Get(map));
+  type = map.Find(RENDERING_TYPE);
 
-  DALI_TEST_CHECK( type );
-  DALI_TEST_EQUALS( "nativeImageTarget", type->Get<std::string>(), TEST_LOCATION );
+  DALI_TEST_CHECK(type);
+  DALI_TEST_EQUALS("nativeImageTarget", type->Get<std::string>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -390,70 +391,70 @@ int UtcDaliVideoViewMethodsForRenderType(void)
 int UtcDaliVideoViewCustomShaderForCoverage(void)
 {
   ToolkitTestApplication application;
-  VideoView videoView = VideoView::New();
-  DALI_TEST_CHECK( videoView );
+  VideoView              videoView = VideoView::New();
+  DALI_TEST_CHECK(videoView);
 
   ToolkitApplication::DECODED_IMAGES_SUPPORTED = true;
 
-  videoView.SetProperty( Toolkit::VideoView::Property::UNDERLAY, false );
-  bool isUnderlay = videoView.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( !isUnderlay );
+  videoView.SetProperty(Toolkit::VideoView::Property::UNDERLAY, false);
+  bool isUnderlay = videoView.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(!isUnderlay);
 
-  application.GetScene().Add( videoView );
-  videoView.SetProperty( VideoView::Property::VIDEO, "testvideo" );
+  application.GetScene().Add(videoView);
+  videoView.SetProperty(VideoView::Property::VIDEO, "testvideo");
 
   Property::Map customShader;
-  customShader.Insert( "vertexShader", VERTEX_SHADER );
-  customShader.Insert( "fragmentShader", FRAGMENT_SHADER );
+  customShader.Insert("vertexShader", VERTEX_SHADER);
+  customShader.Insert("fragmentShader", FRAGMENT_SHADER);
 
   Property::Map map;
-  map.Insert( "shader", customShader );
+  map.Insert("shader", customShader);
 
-  videoView.SetProperty( VideoView::Property::VIDEO, map );
+  videoView.SetProperty(VideoView::Property::VIDEO, map);
 
-  Property::Map map2;
-  Property::Value value = videoView.GetProperty( VideoView::Property::VIDEO );
+  Property::Map   map2;
+  Property::Value value = videoView.GetProperty(VideoView::Property::VIDEO);
 
-  DALI_TEST_CHECK( !value.Get( map2 ) );
+  DALI_TEST_CHECK(!value.Get(map2));
   END_TEST;
 }
 
 int UtcDaliVideoViewMethodsForCoverage2(void)
 {
   ToolkitTestApplication application;
-  VideoView videoView = VideoView::New();
-  DALI_TEST_CHECK( videoView );
+  VideoView              videoView = VideoView::New();
+  DALI_TEST_CHECK(videoView);
 
   Property::Map windowSurfaceTarget;
 
-  windowSurfaceTarget.Insert( RENDERING_TYPE, "windowSurfaceTarget" );
+  windowSurfaceTarget.Insert(RENDERING_TYPE, "windowSurfaceTarget");
 
-  application.GetScene().Add( videoView );
+  application.GetScene().Add(videoView);
 
   application.SendNotification();
   application.Render();
 
-  Property::Map map;
+  Property::Map   map;
   Property::Value value;
-  videoView.SetProperty( VideoView::Property::VIDEO, windowSurfaceTarget );
+  videoView.SetProperty(VideoView::Property::VIDEO, windowSurfaceTarget);
 
-  value = videoView.GetProperty( VideoView::Property::VIDEO );
-  DALI_TEST_CHECK( value.Get( map ) );
+  value = videoView.GetProperty(VideoView::Property::VIDEO);
+  DALI_TEST_CHECK(value.Get(map));
 
-  Property::Value* type = map.Find( RENDERING_TYPE );
-  DALI_TEST_CHECK( type );
-  DALI_TEST_EQUALS( "windowSurfaceTarget", type->Get<std::string>(), TEST_LOCATION );
+  Property::Value* type = map.Find(RENDERING_TYPE);
+  DALI_TEST_CHECK(type);
+  DALI_TEST_EQUALS("windowSurfaceTarget", type->Get<std::string>(), TEST_LOCATION);
 
   Vector3 vector(100.0f, 100.0f, 0.0f);
 
-  DALI_TEST_CHECK(vector != videoView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ));
-  videoView.SetProperty( Actor::Property::SIZE, vector );
+  DALI_TEST_CHECK(vector != videoView.GetCurrentProperty<Vector3>(Actor::Property::SIZE));
+  videoView.SetProperty(Actor::Property::SIZE, vector);
 
   application.SendNotification();
   application.Render();
 
   // Check the size in the new frame
-  DALI_TEST_CHECK(vector == videoView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ));
+  DALI_TEST_CHECK(vector == videoView.GetCurrentProperty<Vector3>(Actor::Property::SIZE));
 
   END_TEST;
 }
@@ -461,30 +462,30 @@ int UtcDaliVideoViewMethodsForCoverage2(void)
 int UtcDaliVideoViewCustomShaderForCoverage3(void)
 {
   ToolkitTestApplication application;
-  VideoView videoView = VideoView::New();
-  DALI_TEST_CHECK( videoView );
+  VideoView              videoView = VideoView::New();
+  DALI_TEST_CHECK(videoView);
 
   ToolkitApplication::DECODED_IMAGES_SUPPORTED = true;
 
-  videoView.SetProperty( Toolkit::VideoView::Property::UNDERLAY, false );
-  bool isUnderlay = videoView.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( !isUnderlay );
+  videoView.SetProperty(Toolkit::VideoView::Property::UNDERLAY, false);
+  bool isUnderlay = videoView.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(!isUnderlay);
 
-  application.GetScene().Add( videoView );
-  videoView.SetProperty( VideoView::Property::VIDEO, "testvideo" );
+  application.GetScene().Add(videoView);
+  videoView.SetProperty(VideoView::Property::VIDEO, "testvideo");
 
   Property::Map customShader;
-  customShader.Insert( "vertexShader", VERTEX_SHADER );
+  customShader.Insert("vertexShader", VERTEX_SHADER);
 
   Property::Map map;
-  map.Insert( "shader", customShader );
+  map.Insert("shader", customShader);
 
-  videoView.SetProperty( VideoView::Property::VIDEO, map );
+  videoView.SetProperty(VideoView::Property::VIDEO, map);
 
-  Property::Map map2;
-  Property::Value value = videoView.GetProperty( VideoView::Property::VIDEO );
+  Property::Map   map2;
+  Property::Value value = videoView.GetProperty(VideoView::Property::VIDEO);
 
-  DALI_TEST_CHECK( !value.Get( map2 ) );
+  DALI_TEST_CHECK(!value.Get(map2));
   END_TEST;
 }
 
@@ -495,42 +496,42 @@ int UtcDaliVideoViewPropertyUnderlay(void)
   ToolkitApplication::DECODED_IMAGES_SUPPORTED = true;
 
   VideoView view = VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   view.Play();
 
   application.SendNotification();
   application.Render();
 
-  bool isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( isUnderlay );
+  bool isUnderlay = view.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(isUnderlay);
 
   view.Play();
-  view.SetProperty( Toolkit::VideoView::Property::UNDERLAY, false );
-  isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( !isUnderlay );
+  view.SetProperty(Toolkit::VideoView::Property::UNDERLAY, false);
+  isUnderlay = view.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(!isUnderlay);
 
   view.Play();
-  view.SetProperty( Toolkit::VideoView::Property::UNDERLAY, true );
-  isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( isUnderlay );
+  view.SetProperty(Toolkit::VideoView::Property::UNDERLAY, true);
+  isUnderlay = view.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(isUnderlay);
 
   // If platform api doesn't provide any API or feature for decoded images of video,
   // UNDERLAY should be true
   ToolkitApplication::DECODED_IMAGES_SUPPORTED = false;
 
-  view.SetProperty( Toolkit::VideoView::Property::UNDERLAY, false );
-  isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( isUnderlay );
+  view.SetProperty(Toolkit::VideoView::Property::UNDERLAY, false);
+  isUnderlay = view.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(isUnderlay);
 
   // For coverage
   ToolkitApplication::DECODED_IMAGES_SUPPORTED = true;
 
-  view.SetProperty( Toolkit::VideoView::Property::UNDERLAY, true );
-  view.SetProperty( Toolkit::VideoView::Property::UNDERLAY, false );
-  isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( !isUnderlay );
+  view.SetProperty(Toolkit::VideoView::Property::UNDERLAY, true);
+  view.SetProperty(Toolkit::VideoView::Property::UNDERLAY, false);
+  isUnderlay = view.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(!isUnderlay);
 
   view.Stop();
 
@@ -543,22 +544,22 @@ int UtcDaliVideoViewPropertyPlayPosition(void)
   tet_infoline("UtcDaliVideoViewPropertyPlayPosition");
 
   VideoView view = VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   view.Play();
 
   application.SendNotification();
   application.Render();
 
-  int playPos = view.GetProperty( Toolkit::VideoView::Property::PLAY_POSITION ).Get< int >();
-  DALI_TEST_CHECK( playPos == 0 );
+  int playPos = view.GetProperty(Toolkit::VideoView::Property::PLAY_POSITION).Get<int>();
+  DALI_TEST_CHECK(playPos == 0);
 
-  view.SetProperty( Toolkit::VideoView::Property::PLAY_POSITION, 10 );
-  playPos = view.GetProperty( Toolkit::VideoView::Property::PLAY_POSITION ).Get< int >();
+  view.SetProperty(Toolkit::VideoView::Property::PLAY_POSITION, 10);
+  playPos = view.GetProperty(Toolkit::VideoView::Property::PLAY_POSITION).Get<int>();
   // Actually setting play position will be async
   // Actual platform result may be different.
-  DALI_TEST_CHECK( playPos == 10 );
+  DALI_TEST_CHECK(playPos == 10);
 
   END_TEST;
 }
@@ -569,19 +570,19 @@ int UtcDaliVideoViewNew2(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliVideoViewNew2");
 
-  VideoView view = VideoView::New( true );
-  DALI_TEST_CHECK( view );
+  VideoView view = VideoView::New(true);
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   view.Play();
 
   application.SendNotification();
   application.Render();
 
-  VideoView view2 = VideoView::New( "", false );
-  DALI_TEST_CHECK( view2 );
+  VideoView view2 = VideoView::New("", false);
+  DALI_TEST_CHECK(view2);
 
-  application.GetScene().Add( view2 );
+  application.GetScene().Add(view2);
   view2.Play();
 
   application.SendNotification();
@@ -595,19 +596,19 @@ int UtcDaliVideoViewRaiseAboveLowerBelow(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliVideoViewRaiseAboveLowerBelow");
 
-  VideoView view = VideoView::New( true );
-  DALI_TEST_CHECK( view );
+  VideoView view = VideoView::New(true);
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   view.Play();
 
   application.SendNotification();
   application.Render();
 
-  VideoView view2 = VideoView::New( "", false );
-  DALI_TEST_CHECK( view2 );
+  VideoView view2 = VideoView::New("", false);
+  DALI_TEST_CHECK(view2);
 
-  application.GetScene().Add( view2 );
+  application.GetScene().Add(view2);
   view2.Play();
 
   application.SendNotification();
@@ -624,19 +625,19 @@ int UtcDaliVideoViewRaiseTopLowerBottom(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliVideoViewRaiseTopLowerBottom");
 
-  VideoView view = VideoView::New( true );
-  DALI_TEST_CHECK( view );
+  VideoView view = VideoView::New(true);
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   view.Play();
 
   application.SendNotification();
   application.Render();
 
-  VideoView view2 = VideoView::New( "", false );
-  DALI_TEST_CHECK( view2 );
+  VideoView view2 = VideoView::New("", false);
+  DALI_TEST_CHECK(view2);
 
-  application.GetScene().Add( view2 );
+  application.GetScene().Add(view2);
   view2.Play();
 
   application.SendNotification();
@@ -648,82 +649,80 @@ int UtcDaliVideoViewRaiseTopLowerBottom(void)
   END_TEST;
 }
 
-
 int UtcDaliVideoViewPropertyDisplayMode(void)
 {
   ToolkitTestApplication application;
   tet_infoline("UtcDaliVideoViewPropertyDisplayMode");
 
   VideoView view = VideoView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   view.Play();
 
   application.SendNotification();
   application.Render();
 
-  view.SetProperty( Toolkit::VideoView::Property::DISPLAY_MODE, Toolkit::VideoView::DisplayMode::DST_ROI );
-  int displayMode = view.GetProperty( Toolkit::VideoView::Property::DISPLAY_MODE ).Get< int >();
-  DALI_TEST_CHECK( displayMode == Toolkit::VideoView::DisplayMode::DST_ROI );
+  view.SetProperty(Toolkit::VideoView::Property::DISPLAY_MODE, Toolkit::VideoView::DisplayMode::DST_ROI);
+  int displayMode = view.GetProperty(Toolkit::VideoView::Property::DISPLAY_MODE).Get<int>();
+  DALI_TEST_CHECK(displayMode == Toolkit::VideoView::DisplayMode::DST_ROI);
 
   END_TEST;
 }
 
-
 int UtcDaliVideoViewCustomShader(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "VideoView with custom shader" );
+  tet_infoline("VideoView with custom shader");
 
-  VideoView view = VideoView::New( false );
-  DALI_TEST_CHECK( view );
+  VideoView view = VideoView::New(false);
+  DALI_TEST_CHECK(view);
 
   ToolkitApplication::DECODED_IMAGES_SUPPORTED = true;
 
-  view.SetProperty( Toolkit::VideoView::Property::UNDERLAY, false );
-  bool isUnderlay = view.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
-  DALI_TEST_CHECK( !isUnderlay );
+  view.SetProperty(Toolkit::VideoView::Property::UNDERLAY, false);
+  bool isUnderlay = view.GetProperty(Toolkit::VideoView::Property::UNDERLAY).Get<bool>();
+  DALI_TEST_CHECK(!isUnderlay);
 
-  application.GetScene().Add( view );
-  view.SetProperty( VideoView::Property::VIDEO, "testvideo" );
+  application.GetScene().Add(view);
+  view.SetProperty(VideoView::Property::VIDEO, "testvideo");
 
   /* insert custom shader */
   Property::Map customShader;
-  std::string fragmentShaderString;
-  fragmentShaderString.reserve( strlen( fragmentShaderPrefix ) + strlen( FRAGMENT_SHADER ) );
-  fragmentShaderString.append( fragmentShaderPrefix );
-  fragmentShaderString.append( FRAGMENT_SHADER );
-  customShader.Insert( "vertexShader", VERTEX_SHADER );
-  customShader.Insert( "fragmentShader", fragmentShaderString );
+  std::string   fragmentShaderString;
+  fragmentShaderString.reserve(strlen(fragmentShaderPrefix) + strlen(FRAGMENT_SHADER));
+  fragmentShaderString.append(fragmentShaderPrefix);
+  fragmentShaderString.append(FRAGMENT_SHADER);
+  customShader.Insert("vertexShader", VERTEX_SHADER);
+  customShader.Insert("fragmentShader", fragmentShaderString);
 
   Property::Map map;
-  map.Insert( "shader", customShader );
+  map.Insert("shader", customShader);
 
-  view.SetProperty( VideoView::Property::VIDEO, map );
+  view.SetProperty(VideoView::Property::VIDEO, map);
 
   /* do render for check custom shader */
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   view.Play();
 
   application.SendNotification();
   application.Render();
 
   /* get renderer */
-  DALI_TEST_CHECK( view.GetRendererCount() == 1u );
-  Renderer renderer = view.GetRendererAt( 0 );
-  Shader shader = renderer.GetShader();
-  DALI_TEST_CHECK( shader );
+  DALI_TEST_CHECK(view.GetRendererCount() == 1u);
+  Renderer renderer = view.GetRendererAt(0);
+  Shader   shader   = renderer.GetShader();
+  DALI_TEST_CHECK(shader);
 
-  Property::Value value = shader.GetProperty(Shader::Property::PROGRAM);
-  Property::Map* shaderMap = value.GetMap();
-  DALI_TEST_CHECK( shaderMap );
+  Property::Value value     = shader.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  shaderMap = value.GetMap();
+  DALI_TEST_CHECK(shaderMap);
 
-  Property::Value* fragment = shaderMap->Find( "fragment" ); // fragment key name from shader-impl.cpp
-  DALI_TEST_EQUALS( fragmentShaderString, fragment->Get<std::string>(), TEST_LOCATION );
+  Property::Value* fragment = shaderMap->Find("fragment"); // fragment key name from shader-impl.cpp
+  DALI_TEST_EQUALS(fragmentShaderString, fragment->Get<std::string>(), TEST_LOCATION);
 
-  Property::Value* vertex = shaderMap->Find( "vertex" ); // vertex key name from shader-impl.cpp
-  DALI_TEST_EQUALS( VERTEX_SHADER, vertex->Get<std::string>(), TEST_LOCATION );
+  Property::Value* vertex = shaderMap->Find("vertex"); // vertex key name from shader-impl.cpp
+  DALI_TEST_EQUALS(VERTEX_SHADER, vertex->Get<std::string>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -748,7 +747,7 @@ struct AnimationFinishCheck
 
   void CheckSignalReceived()
   {
-    if (!mSignalReceived)
+    if(!mSignalReceived)
     {
       tet_printf("Expected Finish signal was not received\n");
       tet_result(TET_FAIL);
@@ -761,7 +760,7 @@ struct AnimationFinishCheck
 
   void CheckSignalNotReceived()
   {
-    if (mSignalReceived)
+    if(mSignalReceived)
     {
       tet_printf("Unexpected Finish signal was received\n");
       tet_result(TET_FAIL);
@@ -779,37 +778,37 @@ int UtcDaliVideoViewSyncAniamtionForCoverage(void)
 {
   ToolkitTestApplication application;
 
-  VideoView videoView = DevelVideoView::New( Dali::VideoSyncMode::ENABLED );
-  DALI_TEST_CHECK( videoView );
+  VideoView videoView = DevelVideoView::New(Dali::VideoSyncMode::ENABLED);
+  DALI_TEST_CHECK(videoView);
 
-  application.GetScene().Add( videoView );
+  application.GetScene().Add(videoView);
 
   // Build the animation
-  float durationSeconds(1.0f);
+  float     durationSeconds(1.0f);
   Animation animation = Animation::New(durationSeconds);
 
   // Start the animation
   Vector3 targetPosition(10.0f, 10.0f, 10.0f);
   animation.AnimateTo(Property(videoView, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
-  DevelVideoView::PlayAnimation( videoView, animation );
+  DevelVideoView::PlayAnimation(videoView, animation);
 
-  bool signalReceived(false);
+  bool                 signalReceived(false);
   AnimationFinishCheck finishCheck(signalReceived);
   animation.FinishedSignal().Connect(&application, finishCheck);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*1000.0f) - 1u/*just less than the animation duration*/);
+  application.Render(static_cast<unsigned int>(durationSeconds * 1000.0f) - 1u /*just less than the animation duration*/);
 
   // We didn't expect the animation to finish yet
   application.SendNotification();
   finishCheck.CheckSignalNotReceived();
 
-  application.Render(2u/*just beyond the animation duration*/);
+  application.Render(2u /*just beyond the animation duration*/);
 
   // We did expect the animation to finish
   application.SendNotification();
   finishCheck.CheckSignalReceived();
-  DALI_TEST_EQUALS( targetPosition, videoView.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), TEST_LOCATION );
+  DALI_TEST_EQUALS(targetPosition, videoView.GetCurrentProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
 
   // Restart the animation, with a different duration
   finishCheck.Reset();
@@ -821,37 +820,37 @@ int UtcDaliVideoViewASyncAniamtionForCoverage(void)
 {
   ToolkitTestApplication application;
 
-  VideoView videoView = DevelVideoView::New( Dali::VideoSyncMode::DISABLED );
-  DALI_TEST_CHECK( videoView );
+  VideoView videoView = DevelVideoView::New(Dali::VideoSyncMode::DISABLED);
+  DALI_TEST_CHECK(videoView);
 
-  application.GetScene().Add( videoView );
+  application.GetScene().Add(videoView);
 
   // Build the animation
-  float durationSeconds(1.0f);
+  float     durationSeconds(1.0f);
   Animation animation = Animation::New(durationSeconds);
 
   // Start the animation
   Vector3 targetPosition(10.0f, 10.0f, 10.0f);
   animation.AnimateTo(Property(videoView, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
-  DevelVideoView::PlayAnimation( videoView, animation );
+  DevelVideoView::PlayAnimation(videoView, animation);
 
-  bool signalReceived(false);
+  bool                 signalReceived(false);
   AnimationFinishCheck finishCheck(signalReceived);
   animation.FinishedSignal().Connect(&application, finishCheck);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*1000.0f) - 1u/*just less than the animation duration*/);
+  application.Render(static_cast<unsigned int>(durationSeconds * 1000.0f) - 1u /*just less than the animation duration*/);
 
   // We didn't expect the animation to finish yet
   application.SendNotification();
   finishCheck.CheckSignalNotReceived();
 
-  application.Render(2u/*just beyond the animation duration*/);
+  application.Render(2u /*just beyond the animation duration*/);
 
   // We did expect the animation to finish
   application.SendNotification();
   finishCheck.CheckSignalReceived();
-  DALI_TEST_EQUALS( targetPosition, videoView.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), TEST_LOCATION );
+  DALI_TEST_EQUALS(targetPosition, videoView.GetCurrentProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
 
   // Restart the animation, with a different duration
   finishCheck.Reset();
@@ -862,18 +861,18 @@ int UtcDaliVideoViewASyncAniamtionForCoverage(void)
 int UtcDaliVideoViewResizeWithSynchronization(void)
 {
   ToolkitTestApplication application;
-  VideoView videoView = DevelVideoView::New( Dali::VideoSyncMode::ENABLED );
-  DALI_TEST_CHECK( videoView );
+  VideoView              videoView = DevelVideoView::New(Dali::VideoSyncMode::ENABLED);
+  DALI_TEST_CHECK(videoView);
 
-  application.GetScene().Add( videoView );
+  application.GetScene().Add(videoView);
 
   Vector3 vector(50.0f, 200.0f, 0.0f);
-  videoView.SetProperty( Actor::Property::SIZE, vector );
+  videoView.SetProperty(Actor::Property::SIZE, vector);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK(vector == videoView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ));
+  DALI_TEST_CHECK(vector == videoView.GetCurrentProperty<Vector3>(Actor::Property::SIZE));
 
   END_TEST;
 }
@@ -884,17 +883,17 @@ int UtcDaliVideoViewSynchronizationForWindowRotation(void)
   ToolkitTestApplication application;
   tet_infoline("UtcDaliVideoViewSynchronizationForWindowRotation");
 
-  Window window = Window::New(PositionSize(0,0,100,100) ,"", false);
-  DALI_TEST_CHECK( window );
+  Window window = Window::New(PositionSize(0, 0, 100, 100), "", false);
+  DALI_TEST_CHECK(window);
 
-  VideoView view = VideoView::New( true );
-  DALI_TEST_CHECK( view );
+  VideoView view = VideoView::New(true);
+  DALI_TEST_CHECK(view);
 
-  window.Add( view );
+  window.Add(view);
 
   view.Play();
 
-  DevelWindow::SetPositionSize(window,PositionSize(0,0,480, 240));
+  DevelWindow::SetPositionSize(window, PositionSize(0, 0, 480, 240));
 
   application.SendNotification();
   application.Render();
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
index bd389ad..5f7d114 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,26 +14,28 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
+#include <iostream>
 
-#include <toolkit-event-thread-callback.h>
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/devel-api/object/handle-devel.h>
-#include <dali/devel-api/text-abstraction/font-client.h>
-#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visuals/animated-gradient-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
 #include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include <dali-toolkit/devel-api/visuals/text-visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/animated-gradient-visual-properties-devel.h>
-#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/object/handle-devel.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include <toolkit-event-thread-callback.h>
 
 #include "dummy-control.h"
 
@@ -42,96 +44,95 @@ using namespace Dali::Toolkit;
 
 namespace
 {
-const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif";
-const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-const char* TEST_NPATCH_FILE_NAME =  TEST_RESOURCE_DIR "/button-up.9.png";
-const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg";
-const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj";
-const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl";
-const char* TEST_VECTOR_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/insta_camera.json";
-const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/";
+const char* TEST_GIF_FILE_NAME          = TEST_RESOURCE_DIR "/anim.gif";
+const char* TEST_IMAGE_FILE_NAME        = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const char* TEST_NPATCH_FILE_NAME       = TEST_RESOURCE_DIR "/button-up.9.png";
+const char* TEST_SVG_FILE_NAME          = TEST_RESOURCE_DIR "/svg1.svg";
+const char* TEST_OBJ_FILE_NAME          = TEST_RESOURCE_DIR "/Cube.obj";
+const char* TEST_MTL_FILE_NAME          = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl";
+const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json";
+const char* TEST_RESOURCE_LOCATION      = TEST_RESOURCE_DIR "/";
 
-
-const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
+const std::string DEFAULT_FONT_DIR("/resources/fonts");
 
 Property::Map DefaultTransform()
 {
   Property::Map transformMap;
   transformMap
-    .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
-    .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
-    .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN )
-    .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN )
-    .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) )
-    .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) );
+    .Add(Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f))
+    .Add(Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f))
+    .Add(Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN)
+    .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN)
+    .Add(Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE))
+    .Add(Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE));
   return transformMap;
 }
 
-bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet )
+bool DaliTestCheckMaps(const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet)
 {
-  if( fontStyleMapGet.Count() == fontStyleMapSet.Count() )
+  if(fontStyleMapGet.Count() == fontStyleMapSet.Count())
   {
-    for( unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index )
+    for(unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index)
     {
-      const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue( index );
+      const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue(index);
 
       Property::Value* valueSet = NULL;
-      if ( valueGet.first.type == Property::Key::INDEX )
+      if(valueGet.first.type == Property::Key::INDEX)
       {
-        valueSet = fontStyleMapSet.Find( valueGet.first.indexKey );
+        valueSet = fontStyleMapSet.Find(valueGet.first.indexKey);
       }
       else
       {
         // Get Key is a string so searching Set Map for a string key
-        valueSet = fontStyleMapSet.Find( valueGet.first.stringKey );
+        valueSet = fontStyleMapSet.Find(valueGet.first.stringKey);
       }
 
-      if( NULL != valueSet )
+      if(NULL != valueSet)
       {
-        if( valueSet->GetType() == Dali::Property::STRING && ( valueGet.second.Get<std::string>() != valueSet->Get<std::string>() ) )
+        if(valueSet->GetType() == Dali::Property::STRING && (valueGet.second.Get<std::string>() != valueSet->Get<std::string>()))
         {
-          tet_printf( "Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str() );
+          tet_printf("Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::BOOLEAN && ( valueGet.second.Get<bool>() != valueSet->Get<bool>() ) )
+        else if(valueSet->GetType() == Dali::Property::BOOLEAN && (valueGet.second.Get<bool>() != valueSet->Get<bool>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::INTEGER && ( valueGet.second.Get<int>() != valueSet->Get<int>() ) )
+        else if(valueSet->GetType() == Dali::Property::INTEGER && (valueGet.second.Get<int>() != valueSet->Get<int>()))
         {
-          tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>() );
+          tet_printf("Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::FLOAT && ( valueGet.second.Get<float>() != valueSet->Get<float>() ) )
+        else if(valueSet->GetType() == Dali::Property::FLOAT && (valueGet.second.Get<float>() != valueSet->Get<float>()))
         {
-          tet_printf( "Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>() );
+          tet_printf("Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>());
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::VECTOR2 && ( valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>() ) )
+        else if(valueSet->GetType() == Dali::Property::VECTOR2 && (valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>()))
         {
           Vector2 vector2Get = valueGet.second.Get<Vector2>();
           Vector2 vector2Set = valueSet->Get<Vector2>();
-          tet_printf( "Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y );
+          tet_printf("Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y);
           return false;
         }
-        else if( valueSet->GetType() == Dali::Property::VECTOR4 && ( valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>() ) )
+        else if(valueSet->GetType() == Dali::Property::VECTOR4 && (valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>()))
         {
           Vector4 vector4Get = valueGet.second.Get<Vector4>();
           Vector4 vector4Set = valueSet->Get<Vector4>();
-          tet_printf( "Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a );
+          tet_printf("Value got : [%f, %f, %f, %f], expected : [%f, %f, %f, %f]", vector4Get.r, vector4Get.g, vector4Get.b, vector4Get.a, vector4Set.r, vector4Set.g, vector4Set.b, vector4Set.a);
           return false;
         }
       }
       else
       {
-        if ( valueGet.first.type == Property::Key::INDEX )
+        if(valueGet.first.type == Property::Key::INDEX)
         {
-          tet_printf( "  The key %d doesn't exist.", valueGet.first.indexKey );
+          tet_printf("  The key %d doesn't exist.", valueGet.first.indexKey);
         }
         else
         {
-          tet_printf( "  The key %s doesn't exist.", valueGet.first.stringKey.c_str() );
+          tet_printf("  The key %s doesn't exist.", valueGet.first.stringKey.c_str());
         }
         return false;
       }
@@ -140,6 +141,69 @@ bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Ma
 
   return true;
 }
+void TestShaderCodeContainSubstrings(Control control, std::vector<std::pair<std::string, bool>> substringCheckList, const char* location)
+{
+  Renderer        renderer = control.GetRendererAt(0);
+  Shader          shader   = renderer.GetShader();
+  Property::Value value    = shader.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
+
+  Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+  std::string      vertexShader;
+  DALI_TEST_CHECK(vertex->Get(vertexShader));
+  for(const auto& checkPair : substringCheckList)
+  {
+    const auto& keyword = checkPair.first;
+    const auto& expect  = checkPair.second;
+    tet_printf("check [%s] %s exist in vertex shader\n", keyword.c_str(), expect ? "is" : "is not");
+    DALI_TEST_EQUALS((vertexShader.find(keyword.c_str()) != std::string::npos), expect, location);
+  }
+
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  DALI_TEST_CHECK(fragment);
+  std::string fragmentShader;
+  DALI_TEST_CHECK(fragment->Get(fragmentShader));
+  for(const auto& checkPair : substringCheckList)
+  {
+    const auto& keyword = checkPair.first;
+    const auto& expect  = checkPair.second;
+    tet_printf("check [%s] %s exist in fragment shader\n", keyword.c_str(), expect ? "is" : "is not");
+    DALI_TEST_EQUALS((fragmentShader.find(keyword.c_str()) != std::string::npos), expect, location);
+  }
+}
+
+void TestShaderCodeContainSubstringsForEachShader(Control control, std::vector<std::pair<std::string, std::pair<bool, bool>>> substringCheckList, const char* location)
+{
+  Renderer        renderer = control.GetRendererAt(0);
+  Shader          shader   = renderer.GetShader();
+  Property::Value value    = shader.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
+
+  Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+  std::string      vertexShader;
+  DALI_TEST_CHECK(vertex->Get(vertexShader));
+  for(const auto& checkPair : substringCheckList)
+  {
+    const auto& keyword = checkPair.first;
+    const auto& expect  = checkPair.second.first;
+    tet_printf("check [%s] %s exist in vertex shader\n", keyword.c_str(), expect ? "is" : "is not");
+    DALI_TEST_EQUALS((vertexShader.find(keyword.c_str()) != std::string::npos), expect, location);
+  }
+
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  DALI_TEST_CHECK(fragment);
+  std::string fragmentShader;
+  DALI_TEST_CHECK(fragment->Get(fragmentShader));
+  for(const auto& checkPair : substringCheckList)
+  {
+    const auto& keyword = checkPair.first;
+    const auto& expect  = checkPair.second.second;
+    tet_printf("check [%s] %s exist in fragment shader\n", keyword.c_str(), expect ? "is" : "is not");
+    DALI_TEST_EQUALS((fragmentShader.find(keyword.c_str()) != std::string::npos), expect, location);
+  }
+}
 
 } //namespace
 
@@ -153,47 +217,45 @@ void dali_visual_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
-static void TestMixColor( Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor )
+static void TestMixColor(Visual::Base visual, Property::Index mixColorIndex, const Vector4& testColor)
 {
   Property::Map map;
   visual.CreatePropertyMap(map);
-  Property::Value* value = map.Find( mixColorIndex );
-  DALI_TEST_CHECK( value );
+  Property::Value* value = map.Find(mixColorIndex);
+  DALI_TEST_CHECK(value);
   Vector3 mixColor1;
-  DALI_TEST_CHECK( value->Get( mixColor1 ) );
-  DALI_TEST_EQUALS( mixColor1, Vector3(testColor), 0.001, TEST_LOCATION );
+  DALI_TEST_CHECK(value->Get(mixColor1));
+  DALI_TEST_EQUALS(mixColor1, Vector3(testColor), 0.001, TEST_LOCATION);
 
-  value = map.Find( Visual::Property::MIX_COLOR );
-  DALI_TEST_CHECK( value );
+  value = map.Find(Visual::Property::MIX_COLOR);
+  DALI_TEST_CHECK(value);
   Vector4 mixColor2;
-  DALI_TEST_CHECK( value->Get( mixColor2 ) );
-  DALI_TEST_EQUALS( mixColor2, testColor, 0.001, TEST_LOCATION );
+  DALI_TEST_CHECK(value->Get(mixColor2));
+  DALI_TEST_EQUALS(mixColor2, testColor, 0.001, TEST_LOCATION);
 
-  value = map.Find( Visual::Property::OPACITY );
-  DALI_TEST_CHECK( value );
+  value = map.Find(Visual::Property::OPACITY);
+  DALI_TEST_CHECK(value);
   float opacity;
-  DALI_TEST_CHECK( value->Get( opacity ) );
-  DALI_TEST_EQUALS( opacity, testColor.a, 0.001, TEST_LOCATION );
+  DALI_TEST_CHECK(value->Get(opacity));
+  DALI_TEST_EQUALS(opacity, testColor.a, 0.001, TEST_LOCATION);
 }
 
-
 int UtcDaliVisualCopyAndAssignment(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualCopyAndAssignment" );
+  tet_infoline("UtcDaliVisualCopyAndAssignment");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
-  Visual::Base visualCopy( visual );
+  Visual::Base visualCopy(visual);
   DALI_TEST_CHECK(visual == visualCopy);
 
   Visual::Base emptyVisual;
-  Visual::Base emptyVisualCopy( emptyVisual );
+  Visual::Base emptyVisualCopy(emptyVisual);
   DALI_TEST_CHECK(emptyVisual == emptyVisualCopy);
 
   Visual::Base visualEquals;
@@ -202,11 +264,11 @@ int UtcDaliVisualCopyAndAssignment(void)
 
   Visual::Base emptyVisualEquals;
   emptyVisualEquals = emptyVisual;
-  DALI_TEST_CHECK( emptyVisual == emptyVisualEquals );
+  DALI_TEST_CHECK(emptyVisual == emptyVisualEquals);
 
   //self assignment
   visual = visual;
-  DALI_TEST_CHECK( visual = visualCopy );
+  DALI_TEST_CHECK(visual = visualCopy);
 
   END_TEST;
 }
@@ -214,18 +276,18 @@ int UtcDaliVisualCopyAndAssignment(void)
 int UtcDaliVisualSetName01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetName" );
+  tet_infoline("UtcDaliVisualSetName");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
   const char* visualName = "backgroundVisual";
-  visual.SetName( visualName );
+  visual.SetName(visualName);
 
-  DALI_TEST_EQUALS( visual.GetName(), visualName, TEST_LOCATION );
+  DALI_TEST_EQUALS(visual.GetName(), visualName, TEST_LOCATION);
 
   END_TEST;
 }
@@ -233,32 +295,31 @@ int UtcDaliVisualSetName01(void)
 int UtcDaliVisualSetGetDepthIndex(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetDepthIndex" );
+  tet_infoline("UtcDaliVisualSetDepthIndex");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-
-  visual.SetDepthIndex( 1 );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  visual.SetDepthIndex(1);
 
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
-  int depthIndex = dummyControl.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
-  DALI_TEST_EQUALS( depthIndex, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( visual.GetDepthIndex(), 1, TEST_LOCATION );
+  int depthIndex = dummyControl.GetRendererAt(0u).GetProperty<int>(Renderer::Property::DEPTH_INDEX);
+  DALI_TEST_EQUALS(depthIndex, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(visual.GetDepthIndex(), 1, TEST_LOCATION);
 
-  visual.SetDepthIndex( -1 );
-  depthIndex = dummyControl.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
-  DALI_TEST_EQUALS( depthIndex, -1, TEST_LOCATION );
-  DALI_TEST_EQUALS( visual.GetDepthIndex(), -1, TEST_LOCATION );
+  visual.SetDepthIndex(-1);
+  depthIndex = dummyControl.GetRendererAt(0u).GetProperty<int>(Renderer::Property::DEPTH_INDEX);
+  DALI_TEST_EQUALS(depthIndex, -1, TEST_LOCATION);
+  DALI_TEST_EQUALS(visual.GetDepthIndex(), -1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -266,133 +327,118 @@ int UtcDaliVisualSetGetDepthIndex(void)
 int UtcDaliVisualSize(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSize" );
+  tet_infoline("UtcDaliVisualSize");
 
   VisualFactory factory = VisualFactory::Get();
-  Vector2 controlSize( 20.f, 30.f );
-  Vector2 naturalSize;
+  Vector2       controlSize(20.f, 30.f);
+  Vector2       naturalSize;
 
   // color colorVisual
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
-  map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA;
+  map[Toolkit::Visual::Property::TYPE]  = Visual::COLOR;
+  map[ColorVisual::Property::MIX_COLOR] = Color::MAGENTA;
 
-  Visual::Base colorVisual = factory.CreateVisual( map );
-  colorVisual.SetTransformAndSize(DefaultTransform(), controlSize );
+  Visual::Base colorVisual = factory.CreateVisual(map);
+  colorVisual.SetTransformAndSize(DefaultTransform(), controlSize);
 
   colorVisual.GetNaturalSize(naturalSize);
-  DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION);
 
   // image visual
   map.Clear();
-  map[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE;
-  map[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
-  map[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = 100.0f;
+  map[Toolkit::Visual::Property::TYPE]                = Toolkit::Visual::IMAGE;
+  map[Toolkit::ImageVisual::Property::URL]            = TEST_IMAGE_FILE_NAME;
+  map[Toolkit::ImageVisual::Property::DESIRED_WIDTH]  = 100.0f;
   map[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = 200.0f;
-  Visual::Base imageVisual = factory.CreateVisual( map );
-  imageVisual.SetTransformAndSize(DefaultTransform(), controlSize );
+  Visual::Base imageVisual                            = factory.CreateVisual(map);
+  imageVisual.SetTransformAndSize(DefaultTransform(), controlSize);
 
   imageVisual.GetNaturalSize(naturalSize);
-  DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 200.f), TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize, Vector2(100.f, 200.f), TEST_LOCATION);
 
   // n patch visual is tested in the utc-Dali-VisualFactory.cpp
 
   // border visual
   float borderSize = 5.f;
   map.Clear();
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
-  map[ BorderVisual::Property::COLOR  ] = Color::RED;
-  map[ BorderVisual::Property::SIZE   ] = borderSize;
-  Visual::Base borderVisual = factory.CreateVisual( map );
-  borderVisual.SetTransformAndSize(DefaultTransform(), controlSize );
+  map[Toolkit::Visual::Property::TYPE] = Visual::BORDER;
+  map[BorderVisual::Property::COLOR]   = Color::RED;
+  map[BorderVisual::Property::SIZE]    = borderSize;
+  Visual::Base borderVisual            = factory.CreateVisual(map);
+  borderVisual.SetTransformAndSize(DefaultTransform(), controlSize);
   borderVisual.GetNaturalSize(naturalSize);
-  DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION);
 
   // gradient gradientVisual
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT);
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
-  propertyMap.Insert( "mixColor", Color::MAGENTA );
-  propertyMap.Insert( GradientVisual::Property::START_POSITION,   start) ;
-  propertyMap.Insert( GradientVisual::Property::END_POSITION,   end );
-  propertyMap.Insert( GradientVisual::Property::STOP_OFFSET,   Vector2(0.f, 1.f) );
-  propertyMap.Insert( GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT) ;
+  propertyMap.Insert("mixColor", Color::MAGENTA);
+  propertyMap.Insert(GradientVisual::Property::START_POSITION, start);
+  propertyMap.Insert(GradientVisual::Property::END_POSITION, end);
+  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector2(0.f, 1.f));
+  propertyMap.Insert(GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT);
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert(GradientVisual::Property::STOP_COLOR,   stopColors);
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::GREEN);
+  propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
   Visual::Base gradientVisual = factory.CreateVisual(propertyMap);
-  gradientVisual.SetTransformAndSize(DefaultTransform(), controlSize );
+  gradientVisual.SetTransformAndSize(DefaultTransform(), controlSize);
   gradientVisual.GetNaturalSize(naturalSize);
-  DALI_TEST_EQUALS( naturalSize, Vector2::ZERO,TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION);
 
   // animated gradient visual
-  Vector2 animated_gradient_visual_size(10.f, 10.f);
   propertyMap.Clear();
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT );
-  Visual::Base animatedGradientVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT);
+  Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap);
   animatedGradientVisual.GetNaturalSize(naturalSize);
-  animatedGradientVisual.SetTransformAndSize(DefaultTransform(), controlSize );
-  DALI_TEST_EQUALS( naturalSize, Vector2::ZERO, TEST_LOCATION );
-
-  // svg visual
-  Visual::Base svgVisual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() );
-  svgVisual.GetNaturalSize(naturalSize);
-  // TEST_SVG_FILE:
-  //  <svg width="100" height="100">
-  //  <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
-  //  </svg>
-  DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION );
-
-  // svg visual with a size
-  Visual::Base svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions(200, 200) );
-  svgVisual2.GetNaturalSize(naturalSize);
-  DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION ); // Natural size should still be 100, 100
+  animatedGradientVisual.SetTransformAndSize(DefaultTransform(), controlSize);
+  DALI_TEST_EQUALS(naturalSize, Vector2::ZERO, TEST_LOCATION);
 
   // Text visual.
 
   // Load some fonts to get the same metrics on different platforms.
   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-  fontClient.SetDpi( 96u, 96u );
+  fontClient.SetDpi(96u, 96u);
 
-  char* pathNamePtr = get_current_dir_name();
-  const std::string pathName( pathNamePtr );
-  free( pathNamePtr );
+  char*             pathNamePtr = get_current_dir_name();
+  const std::string pathName(pathNamePtr);
+  free(pathNamePtr);
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
+  fontClient.GetFontId(pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf");
 
   // Create a TextVisual with a font size of 12 first
   propertyMap.Clear();
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT );
-  propertyMap.Insert( TextVisual::Property::ENABLE_MARKUP, true );
-  propertyMap.Insert( TextVisual::Property::TEXT, "<font family='TizenSans' size='12'>Hello world</font>" );
-  propertyMap.Insert( TextVisual::Property::MULTI_LINE, true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT);
+  propertyMap.Insert(TextVisual::Property::ENABLE_MARKUP, true);
+  propertyMap.Insert(TextVisual::Property::TEXT, "<font family='TizenSans' size='12'>Hello world</font>");
+  propertyMap.Insert(TextVisual::Property::MULTI_LINE, true);
 
-  Visual::Base smallTextVisual = factory.CreateVisual( propertyMap );
-  Vector2 smallTextVisualNaturalSize;
-  smallTextVisual.GetNaturalSize( smallTextVisualNaturalSize );
+  Visual::Base smallTextVisual = factory.CreateVisual(propertyMap);
+  Vector2      smallTextVisualNaturalSize;
+  smallTextVisual.GetNaturalSize(smallTextVisualNaturalSize);
 
   // Then create a TextVisual with a font size of 20
-  propertyMap[ TextVisual::Property::TEXT ] = "<font family='TizenSans' size='20'>Hello world</font>";
-  Visual::Base largeTextVisual = factory.CreateVisual( propertyMap );
-  Vector2 largeTextVisualNaturalSize;
-  largeTextVisual.GetNaturalSize( largeTextVisualNaturalSize );
+  propertyMap[TextVisual::Property::TEXT] = "<font family='TizenSans' size='20'>Hello world</font>";
+  Visual::Base largeTextVisual            = factory.CreateVisual(propertyMap);
+  Vector2      largeTextVisualNaturalSize;
+  largeTextVisual.GetNaturalSize(largeTextVisualNaturalSize);
 
   // Compare the sizes of the two text visuals, the second one should be bigger as it has a larger point size in the markup.
-  DALI_TEST_CHECK( smallTextVisualNaturalSize.width < largeTextVisualNaturalSize.width &&
-                   smallTextVisualNaturalSize.height < largeTextVisualNaturalSize.height );
+  DALI_TEST_CHECK(smallTextVisualNaturalSize.width < largeTextVisualNaturalSize.width &&
+                  smallTextVisualNaturalSize.height < largeTextVisualNaturalSize.height);
 
   // The height returned for a particular width should also be greater for the large text visual
-  DALI_TEST_CHECK( smallTextVisual.GetHeightForWidth( 40.f ) < largeTextVisual.GetHeightForWidth( 40.f ) );
+  DALI_TEST_CHECK(smallTextVisual.GetHeightForWidth(40.f) < largeTextVisual.GetHeightForWidth(40.f));
 
   //AnimatedImageVisual
-  Visual::Base animatedImageVisual = factory.CreateVisual( TEST_GIF_FILE_NAME, ImageDimensions() );
-  animatedImageVisual.SetTransformAndSize(DefaultTransform(), controlSize );
+  Visual::Base animatedImageVisual = factory.CreateVisual(TEST_GIF_FILE_NAME, ImageDimensions());
+  animatedImageVisual.SetTransformAndSize(DefaultTransform(), controlSize);
   animatedImageVisual.GetNaturalSize(naturalSize);
   // TEST_GIF_FILE: anim.gif
   // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame
-  DALI_TEST_EQUALS( naturalSize, Vector2(50.f, 50.f), TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize, Vector2(50.f, 50.f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -400,35 +446,35 @@ int UtcDaliVisualSize(void)
 int UtcDaliVisualSetOnOffScene(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetOnOffScene" );
+  tet_infoline("UtcDaliVisualSetOnOffScene");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl        actor     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
-  application.GetScene().Remove( actor );
+  application.GetScene().Remove(actor);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -436,57 +482,60 @@ int UtcDaliVisualSetOnOffScene(void)
 int UtcDaliVisualSetOnOffScene2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetOnOffScene2" );
+  tet_infoline("UtcDaliVisualSetOnOffScene2");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::SVG );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_SVG_FILE_NAME );
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::SVG);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl        actor     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   // First on/off
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0 );
-  auto textures = renderer.GetTextures();
-  DALI_TEST_CHECK( textures.GetTextureCount() != 0u );
 
-  application.GetScene().Remove( actor );
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
+
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0);
+  auto     textures = renderer.GetTextures();
+  DALI_TEST_CHECK(textures.GetTextureCount() != 0u);
+
+  application.GetScene().Remove(actor);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   // Second on/off
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  renderer = actor.GetRendererAt( 0 );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  renderer = actor.GetRendererAt(0);
   textures = renderer.GetTextures();
-  DALI_TEST_CHECK( textures.GetTextureCount() != 0u );
+  DALI_TEST_CHECK(textures.GetTextureCount() != 0u);
 
-  application.GetScene().Remove( actor );
+  application.GetScene().Remove(actor);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -494,73 +543,73 @@ int UtcDaliVisualSetOnOffScene2(void)
 int UtcDaliVisualGetPropertyMap1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap1: ColorVisual (With base MixColor" );
+  tet_infoline("UtcDaliVisualGetPropertyMap1: ColorVisual (With base MixColor");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(Visual::Property::MIX_COLOR,  Color::BLUE);
-  propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS, 10.0f );
-  propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS_POLICY, Toolkit::Visual::Transform::Policy::RELATIVE );
-  propertyMap.Insert( DevelVisual::Property::BORDERLINE_WIDTH, 20.0f );
-  propertyMap.Insert( DevelVisual::Property::BORDERLINE_COLOR, Color::RED );
-  propertyMap.Insert( DevelVisual::Property::BORDERLINE_OFFSET, -1.0f );
-  propertyMap.Insert( DevelColorVisual::Property::BLUR_RADIUS, 20.0f );
-  Visual::Base colorVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLUE);
+  propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 10.0f);
+  propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Toolkit::Visual::Transform::Policy::RELATIVE);
+  propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 20.0f);
+  propertyMap.Insert(DevelVisual::Property::BORDERLINE_COLOR, Color::RED);
+  propertyMap.Insert(DevelVisual::Property::BORDERLINE_OFFSET, -1.0f);
+  propertyMap.Insert(DevelColorVisual::Property::BLUR_RADIUS, 20.0f);
+  Visual::Base colorVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  colorVisual.CreatePropertyMap( resultMap );
+  colorVisual.CreatePropertyMap(resultMap);
 
-  Property::Value* typeValue = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( typeValue );
-  DALI_TEST_CHECK( typeValue->Get<int>() == Visual::COLOR );
+  Property::Value* typeValue = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(typeValue);
+  DALI_TEST_CHECK(typeValue->Get<int>() == Visual::COLOR);
 
-  Property::Value* colorValue = resultMap.Find( ColorVisual::Property::MIX_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
+  Property::Value* colorValue = resultMap.Find(ColorVisual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_CHECK(colorValue->Get<Vector4>() == Color::BLUE);
 
-  Property::Value* cornerRadiusValue = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 );
-  DALI_TEST_CHECK( cornerRadiusValue );
-  DALI_TEST_CHECK( cornerRadiusValue->Get< Vector4 >() == Vector4(10.0f, 10.0f, 10.0f, 10.0f) );
+  Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_CHECK(cornerRadiusValue->Get<Vector4>() == Vector4(10.0f, 10.0f, 10.0f, 10.0f));
 
-  Property::Value* cornerRadiusPolicyValue = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER );
-  DALI_TEST_CHECK( cornerRadiusPolicyValue );
-  DALI_TEST_CHECK( cornerRadiusPolicyValue->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE );
+  Property::Value* cornerRadiusPolicyValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(cornerRadiusPolicyValue);
+  DALI_TEST_CHECK(cornerRadiusPolicyValue->Get<int>() == Toolkit::Visual::Transform::Policy::RELATIVE);
 
-  Property::Value* borderlineWidthValue = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT );
-  DALI_TEST_CHECK( borderlineWidthValue );
-  DALI_TEST_CHECK( borderlineWidthValue->Get< float >() == 20.0f );
+  Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineWidthValue);
+  DALI_TEST_CHECK(borderlineWidthValue->Get<float>() == 20.0f);
 
-  Property::Value* borderlineColorValue = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( borderlineColorValue );
-  DALI_TEST_CHECK( borderlineColorValue->Get< Vector4 >() == Color::RED );
+  Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(borderlineColorValue);
+  DALI_TEST_CHECK(borderlineColorValue->Get<Vector4>() == Color::RED);
 
-  Property::Value* borderlineOffsetValue = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT );
-  DALI_TEST_CHECK( borderlineOffsetValue );
-  DALI_TEST_CHECK( borderlineOffsetValue->Get< float >() == -1.0f );
+  Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineOffsetValue);
+  DALI_TEST_CHECK(borderlineOffsetValue->Get<float>() == -1.0f);
 
-  Property::Value* blurRadiusValue = resultMap.Find( DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT );
-  DALI_TEST_CHECK( blurRadiusValue );
-  DALI_TEST_CHECK( blurRadiusValue->Get< float >() == 20.0f );
+  Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(blurRadiusValue);
+  DALI_TEST_CHECK(blurRadiusValue->Get<float>() == 20.0f);
 
   // change the blend color
   propertyMap[ColorVisual::Property::MIX_COLOR] = Color::CYAN;
-  colorVisual = factory.CreateVisual( propertyMap  );
-  colorVisual.CreatePropertyMap( resultMap );
+  colorVisual                                   = factory.CreateVisual(propertyMap);
+  colorVisual.CreatePropertyMap(resultMap);
 
-  colorValue = resultMap.Find( ColorVisual::Property::MIX_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
+  colorValue = resultMap.Find(ColorVisual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_CHECK(colorValue->Get<Vector4>() == Color::CYAN);
 
   // Test wrong values
   propertyMap[DevelColorVisual::Property::BLUR_RADIUS] = "3.0f";
 
-  colorVisual = factory.CreateVisual( propertyMap  );
-  colorVisual.CreatePropertyMap( resultMap );
+  colorVisual = factory.CreateVisual(propertyMap);
+  colorVisual.CreatePropertyMap(resultMap);
 
-  blurRadiusValue = resultMap.Find( DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT );
-  DALI_TEST_CHECK( blurRadiusValue );
-  DALI_TEST_CHECK( blurRadiusValue->Get< float >() == 0.0f );
+  blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(blurRadiusValue);
+  DALI_TEST_CHECK(blurRadiusValue->Get<float>() == 0.0f);
 
   END_TEST;
 }
@@ -568,69 +617,55 @@ int UtcDaliVisualGetPropertyMap1(void)
 int UtcDaliVisualGetPropertyMap2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap2: BorderVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap2: BorderVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::BORDER);
-  propertyMap.Insert("mixColor", Vector4(1.0f, 0.0f, 1.0f, 0.5f) );
-  propertyMap.Insert("borderColor",  Color::BLUE);
-  propertyMap.Insert("borderSize",  5.f);
-  propertyMap.Insert("antiAliasing",  true);
-  Visual::Base borderVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER);
+  propertyMap.Insert("mixColor", Vector4(1.0f, 0.0f, 1.0f, 0.5f));
+  propertyMap.Insert("borderColor", Color::BLUE);
+  propertyMap.Insert("borderSize", 5.f);
+  propertyMap.Insert("antiAliasing", true);
+  Visual::Base borderVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  borderVisual.CreatePropertyMap( resultMap );
+  borderVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from visual
-  Property::Value* typeValue = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( typeValue );
-  DALI_TEST_CHECK( typeValue->Get<int>() == Visual::BORDER );
+  Property::Value* typeValue = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(typeValue);
+  DALI_TEST_CHECK(typeValue->Get<int>() == Visual::BORDER);
 
-  Property::Value* colorValue = resultMap.Find( BorderVisual::Property::COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
+  Property::Value* colorValue = resultMap.Find(BorderVisual::Property::COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_CHECK(colorValue->Get<Vector4>() == Color::BLUE);
 
-  Property::Value* sizeValue = resultMap.Find( BorderVisual::Property::SIZE,  Property::FLOAT );
-  DALI_TEST_CHECK( sizeValue );
-  DALI_TEST_CHECK( sizeValue->Get<float>() == 5.f );
+  Property::Value* sizeValue = resultMap.Find(BorderVisual::Property::SIZE, Property::FLOAT);
+  DALI_TEST_CHECK(sizeValue);
+  DALI_TEST_CHECK(sizeValue->Get<float>() == 5.f);
 
-  Property::Value* AAValue = resultMap.Find( BorderVisual::Property::ANTI_ALIASING, Property::BOOLEAN );
-  DALI_TEST_CHECK( AAValue );
-  DALI_TEST_CHECK( AAValue->Get<bool>() == true );
+  Property::Value* AAValue = resultMap.Find(BorderVisual::Property::ANTI_ALIASING, Property::BOOLEAN);
+  DALI_TEST_CHECK(AAValue);
+  DALI_TEST_CHECK(AAValue->Get<bool>() == true);
 
   Property::Map propertyMap1;
-  propertyMap1[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
-  propertyMap1[ BorderVisual::Property::COLOR  ] = Color::CYAN;
-  propertyMap1[ BorderVisual::Property::SIZE   ] = 10.0f;
-  borderVisual = factory.CreateVisual( propertyMap1 );
-  borderVisual.CreatePropertyMap( resultMap );
-
-  typeValue = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( typeValue );
-  DALI_TEST_CHECK( typeValue->Get<int>() == Visual::BORDER );
-
-  colorValue = resultMap.Find( BorderVisual::Property::COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
-
-  sizeValue = resultMap.Find( BorderVisual::Property::SIZE,  Property::FLOAT );
-  DALI_TEST_CHECK( sizeValue );
-  DALI_TEST_CHECK( sizeValue->Get<float>() == 10.f );
+  propertyMap1[Toolkit::Visual::Property::TYPE] = Visual::BORDER;
+  propertyMap1[BorderVisual::Property::COLOR]   = Color::CYAN;
+  propertyMap1[BorderVisual::Property::SIZE]    = 10.0f;
+  borderVisual                                  = factory.CreateVisual(propertyMap1);
+  borderVisual.CreatePropertyMap(resultMap);
 
-  // Get default value of borderline values here
+  typeValue = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(typeValue);
+  DALI_TEST_CHECK(typeValue->Get<int>() == Visual::BORDER);
 
-  sizeValue = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH,  Property::FLOAT );
-  DALI_TEST_CHECK( sizeValue );
-  DALI_TEST_CHECK( sizeValue->Get<float>() == 0.0f );
-
-  colorValue = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( colorValue );
-  DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLACK );
+  colorValue = resultMap.Find(BorderVisual::Property::COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_CHECK(colorValue->Get<Vector4>() == Color::CYAN);
 
-  sizeValue = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET,  Property::FLOAT );
-  DALI_TEST_CHECK( sizeValue );
-  DALI_TEST_CHECK( sizeValue->Get<float>() == 0.0f );
+  sizeValue = resultMap.Find(BorderVisual::Property::SIZE, Property::FLOAT);
+  DALI_TEST_CHECK(sizeValue);
+  DALI_TEST_CHECK(sizeValue->Get<float>() == 10.f);
 
   END_TEST;
 }
@@ -638,103 +673,102 @@ int UtcDaliVisualGetPropertyMap2(void)
 int UtcDaliVisualGetPropertyMap2N(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap2N: BorderVisual with no setup properties" );
+  tet_infoline("UtcDaliVisualGetPropertyMap2N: BorderVisual with no setup properties");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::BORDER);
-  Visual::Base borderVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER);
+  Visual::Base borderVisual = factory.CreateVisual(propertyMap);
 
-  tet_infoline( "Test that the visual is created, with a default renderer" );
-  DALI_TEST_CHECK( borderVisual );
+  tet_infoline("Test that the visual is created, with a default renderer");
+  DALI_TEST_CHECK(borderVisual);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual );
-  application.GetScene().Add( dummyControl );
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual);
+  application.GetScene().Add(dummyControl);
 
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliVisualGetPropertyMap3(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap3: linear GradientVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap3: linear GradientVisual");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT);
 
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
-  propertyMap.Insert( "startPosition", start);
-  propertyMap.Insert( "endPosition", end);
-  propertyMap.Insert( "spreadMethod", GradientVisual::SpreadMethod::REPEAT);
+  propertyMap.Insert("startPosition", start);
+  propertyMap.Insert("endPosition", end);
+  propertyMap.Insert("spreadMethod", GradientVisual::SpreadMethod::REPEAT);
 
-  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET,   Vector2(0.2f, 0.8f));
+  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector2(0.2f, 0.8f));
 
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert(GradientVisual::Property::STOP_COLOR,   stopColors);
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::GREEN);
+  propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
 
-  float borderlineWidth = 4.0f;
+  float   borderlineWidth = 4.0f;
   Vector4 cornerRadius(7.0f, 10.0f, 13.0f, 16.0f);
-  propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH,  borderlineWidth);
-  propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS,  cornerRadius);
+  propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
+  propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, cornerRadius);
 
   Visual::Base gradientVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  gradientVisual.CreatePropertyMap( resultMap );
+  gradientVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::GRADIENT );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::GRADIENT);
 
-  value = resultMap.Find( GradientVisual::Property::UNITS,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == GradientVisual::Units::OBJECT_BOUNDING_BOX );
+  value = resultMap.Find(GradientVisual::Property::UNITS, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == GradientVisual::Units::OBJECT_BOUNDING_BOX);
 
-  value = resultMap.Find( GradientVisual::Property::SPREAD_METHOD,   Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == GradientVisual::SpreadMethod::REPEAT );
+  value = resultMap.Find(GradientVisual::Property::SPREAD_METHOD, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == GradientVisual::SpreadMethod::REPEAT);
 
-  value = resultMap.Find( GradientVisual::Property::START_POSITION,   Property::VECTOR2 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector2>(), start , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(GradientVisual::Property::START_POSITION, Property::VECTOR2);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), start, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( GradientVisual::Property::END_POSITION,   Property::VECTOR2 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector2>(), end , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(GradientVisual::Property::END_POSITION, Property::VECTOR2);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), end, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH,   Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), borderlineWidth , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineWidth, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS,   Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), cornerRadius , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), cornerRadius, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( GradientVisual::Property::STOP_OFFSET,   Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(GradientVisual::Property::STOP_OFFSET, Property::ARRAY);
+  DALI_TEST_CHECK(value);
   Property::Array* offsetArray = value->GetArray();
-  DALI_TEST_CHECK( offsetArray->Count() == 2 );
-  DALI_TEST_EQUALS( offsetArray->GetElementAt(0).Get<float>(), 0.2f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
-  DALI_TEST_EQUALS( offsetArray->GetElementAt(1).Get<float>(), 0.8f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(offsetArray->Count() == 2);
+  DALI_TEST_EQUALS(offsetArray->GetElementAt(0).Get<float>(), 0.2f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+  DALI_TEST_EQUALS(offsetArray->GetElementAt(1).Get<float>(), 0.8f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( GradientVisual::Property::STOP_COLOR,   Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(GradientVisual::Property::STOP_COLOR, Property::ARRAY);
+  DALI_TEST_CHECK(value);
   Property::Array* colorArray = value->GetArray();
-  DALI_TEST_CHECK( colorArray->Count() == 2 );
-  DALI_TEST_EQUALS( colorArray->GetElementAt(0).Get<Vector4>(), Color::RED , Math::MACHINE_EPSILON_100, TEST_LOCATION );
-  DALI_TEST_EQUALS( colorArray->GetElementAt(1).Get<Vector4>(), Color::GREEN , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(colorArray->Count() == 2);
+  DALI_TEST_EQUALS(colorArray->GetElementAt(0).Get<Vector4>(), Color::RED, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorArray->GetElementAt(1).Get<Vector4>(), Color::GREEN, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   END_TEST;
 }
@@ -742,83 +776,83 @@ int UtcDaliVisualGetPropertyMap3(void)
 int UtcDaliVisualGetPropertyMap4(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap4: radial GradientVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap4: radial GradientVisual");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT);
 
   Vector2 center(100.f, 100.f);
-  float radius = 100.f;
-  propertyMap.Insert(GradientVisual::Property::UNITS,  GradientVisual::Units::USER_SPACE);
-  propertyMap.Insert(GradientVisual::Property::CENTER,  center);
-  propertyMap.Insert(GradientVisual::Property::RADIUS,  radius);
-  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET,   Vector3(0.1f, 0.3f, 1.1f));
+  float   radius = 100.f;
+  propertyMap.Insert(GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE);
+  propertyMap.Insert(GradientVisual::Property::CENTER, center);
+  propertyMap.Insert(GradientVisual::Property::RADIUS, radius);
+  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector3(0.1f, 0.3f, 1.1f));
 
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::BLACK );
-  stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert(GradientVisual::Property::STOP_COLOR,   stopColors);
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::BLACK);
+  stopColors.PushBack(Color::GREEN);
+  propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
 
-  float borderlineWidth = 8.0f;
+  float   borderlineWidth = 8.0f;
   Vector4 cornerRadius(1.0f, 2.0f, 4.0f, 8.0f);
-  propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH,  borderlineWidth);
-  propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS,  cornerRadius);
+  propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
+  propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, cornerRadius);
 
   Visual::Base gradientVisual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( gradientVisual );
+  DALI_TEST_CHECK(gradientVisual);
 
   Property::Map resultMap;
-  gradientVisual.CreatePropertyMap( resultMap );
+  gradientVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::GRADIENT );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::GRADIENT);
 
-  value = resultMap.Find( GradientVisual::Property::UNITS,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == GradientVisual::Units::USER_SPACE );
+  value = resultMap.Find(GradientVisual::Property::UNITS, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == GradientVisual::Units::USER_SPACE);
 
-  value = resultMap.Find( GradientVisual::Property::SPREAD_METHOD,   Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == GradientVisual::SpreadMethod::PAD );
+  value = resultMap.Find(GradientVisual::Property::SPREAD_METHOD, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == GradientVisual::SpreadMethod::PAD);
 
-  value = resultMap.Find( GradientVisual::Property::CENTER,  Property::VECTOR2 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector2>(), center , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(GradientVisual::Property::CENTER, Property::VECTOR2);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), center, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( GradientVisual::Property::RADIUS,  Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), radius , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(GradientVisual::Property::RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), radius, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH,   Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), borderlineWidth , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineWidth, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS,   Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), cornerRadius , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), cornerRadius, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( GradientVisual::Property::STOP_OFFSET,   Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(GradientVisual::Property::STOP_OFFSET, Property::ARRAY);
+  DALI_TEST_CHECK(value);
   Property::Array* offsetArray = value->GetArray();
-  DALI_TEST_CHECK( offsetArray->Count() == 3 );
-  DALI_TEST_EQUALS( offsetArray->GetElementAt(0).Get<float>(), 0.1f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
-  DALI_TEST_EQUALS( offsetArray->GetElementAt(1).Get<float>(), 0.3f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(offsetArray->Count() == 3);
+  DALI_TEST_EQUALS(offsetArray->GetElementAt(0).Get<float>(), 0.1f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+  DALI_TEST_EQUALS(offsetArray->GetElementAt(1).Get<float>(), 0.3f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
   // any stop value will be clamped to [0.0, 1.0];
-  DALI_TEST_EQUALS( offsetArray->GetElementAt(2).Get<float>(), 1.0f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_EQUALS(offsetArray->GetElementAt(2).Get<float>(), 1.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( GradientVisual::Property::STOP_COLOR,   Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(GradientVisual::Property::STOP_COLOR, Property::ARRAY);
+  DALI_TEST_CHECK(value);
   Property::Array* colorArray = value->GetArray();
-  DALI_TEST_CHECK( colorArray->Count() == 3 );
-  DALI_TEST_EQUALS( colorArray->GetElementAt(0).Get<Vector4>(), Color::RED , Math::MACHINE_EPSILON_100, TEST_LOCATION );
-  DALI_TEST_EQUALS( colorArray->GetElementAt(1).Get<Vector4>(), Color::BLACK , Math::MACHINE_EPSILON_100, TEST_LOCATION );
-  DALI_TEST_EQUALS( colorArray->GetElementAt(2).Get<Vector4>(), Color::GREEN , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(colorArray->Count() == 3);
+  DALI_TEST_EQUALS(colorArray->GetElementAt(0).Get<Vector4>(), Color::RED, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorArray->GetElementAt(1).Get<Vector4>(), Color::BLACK, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+  DALI_TEST_EQUALS(colorArray->GetElementAt(2).Get<Vector4>(), Color::GREEN, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   END_TEST;
 }
@@ -826,72 +860,72 @@ int UtcDaliVisualGetPropertyMap4(void)
 int UtcDaliVisualGetPropertyMap5(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap5: ImageVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap5: ImageVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::IMAGE );
-  propertyMap.Insert( Visual::Property::MIX_COLOR, Color::MAGENTA );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_WIDTH,   20 );
-  propertyMap.Insert( ImageVisual::Property::DESIRED_HEIGHT,   30 );
-  propertyMap.Insert( "fittingMode",   FittingMode::FIT_HEIGHT );
-  propertyMap.Insert( "samplingMode",   SamplingMode::BOX_THEN_NEAREST );
-  propertyMap.Insert( "pixelArea", Vector4( 0.25f, 0.25f, 0.5f, 0.5f ) );
-  propertyMap.Insert( "wrapModeU", WrapMode::REPEAT );
-  propertyMap.Insert( "wrapModeV", WrapMode::MIRRORED_REPEAT );
-  propertyMap.Insert( "synchronousLoading",   true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::MAGENTA);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_WIDTH, 20);
+  propertyMap.Insert(ImageVisual::Property::DESIRED_HEIGHT, 30);
+  propertyMap.Insert("fittingMode", FittingMode::FIT_HEIGHT);
+  propertyMap.Insert("samplingMode", SamplingMode::BOX_THEN_NEAREST);
+  propertyMap.Insert("pixelArea", Vector4(0.25f, 0.25f, 0.5f, 0.5f));
+  propertyMap.Insert("wrapModeU", WrapMode::REPEAT);
+  propertyMap.Insert("wrapModeV", WrapMode::MIRRORED_REPEAT);
+  propertyMap.Insert("synchronousLoading", true);
 
   Visual::Base imageVisual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( imageVisual );
+  DALI_TEST_CHECK(imageVisual);
 
   Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  imageVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_IMAGE_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_IMAGE_FILE_NAME);
 
-  value = resultMap.Find( Visual::Property::MIX_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<Vector4>() == Color::MAGENTA );
+  value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<Vector4>() == Color::MAGENTA);
 
-  value = resultMap.Find( ImageVisual::Property::FITTING_MODE,   Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == FittingMode::FIT_HEIGHT );
+  value = resultMap.Find(ImageVisual::Property::FITTING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == FittingMode::FIT_HEIGHT);
 
-  value = resultMap.Find( ImageVisual::Property::SAMPLING_MODE,   Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == SamplingMode::BOX_THEN_NEAREST );
+  value = resultMap.Find(ImageVisual::Property::SAMPLING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == SamplingMode::BOX_THEN_NEAREST);
 
-  value = resultMap.Find( ImageVisual::Property::DESIRED_WIDTH,   Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == 20 );
+  value = resultMap.Find(ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 20);
 
-  value = resultMap.Find( ImageVisual::Property::DESIRED_HEIGHT,   Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == 30 );
+  value = resultMap.Find(ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 30);
 
-  value = resultMap.Find( ImageVisual::Property::PIXEL_AREA, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4( 0.25f, 0.25f, 0.5f, 0.5f ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::PIXEL_AREA, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(0.25f, 0.25f, 0.5f, 0.5f), Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::WRAP_MODE_U, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK(  value->Get<int>() == WrapMode::REPEAT);
+  value = resultMap.Find(ImageVisual::Property::WRAP_MODE_U, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == WrapMode::REPEAT);
 
-  value = resultMap.Find( ImageVisual::Property::WRAP_MODE_V, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK(  value->Get<int>() == WrapMode::MIRRORED_REPEAT);
+  value = resultMap.Find(ImageVisual::Property::WRAP_MODE_V, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == WrapMode::MIRRORED_REPEAT);
 
-  value = resultMap.Find( "synchronousLoading",   Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<bool>() == true );
+  value = resultMap.Find(ImageVisual::Property::SYNCHRONOUS_LOADING, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == true);
 
   END_TEST;
 }
@@ -899,85 +933,85 @@ int UtcDaliVisualGetPropertyMap5(void)
 int UtcDaliVisualGetPropertyMap6(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap6: NPatchVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap6: NPatchVisual");
 
-  Rect< int > border( 1, 1, 1, 1 );
+  Rect<int> border(1, 1, 1, 1);
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( "mixColor",  Color::MAGENTA );
-  propertyMap.Insert( ImageVisual::Property::URL,  TEST_NPATCH_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::BORDER_ONLY,  true );
-  propertyMap.Insert( ImageVisual::Property::BORDER, border );
-  propertyMap.Insert( DevelImageVisual::Property::AUXILIARY_IMAGE, "application-icon-30.png" );
-  propertyMap.Insert( DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, 0.9f );
-  Visual::Base nPatchVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert("mixColor", Color::MAGENTA);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true);
+  propertyMap.Insert(ImageVisual::Property::BORDER, border);
+  propertyMap.Insert(DevelImageVisual::Property::AUXILIARY_IMAGE, "application-icon-30.png");
+  propertyMap.Insert(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, 0.9f);
+  Visual::Base nPatchVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  nPatchVisual.CreatePropertyMap( resultMap );
+  nPatchVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::N_PATCH );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::N_PATCH);
 
-  value = resultMap.Find( Visual::Property::MIX_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<Vector4>() == Color::MAGENTA );
+  value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<Vector4>() == Color::MAGENTA);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_NPATCH_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_NPATCH_FILE_NAME);
 
-  value = resultMap.Find( ImageVisual::Property::BORDER_ONLY,  Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<bool>() );
+  value = resultMap.Find(ImageVisual::Property::BORDER_ONLY, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>());
 
-  value = resultMap.Find( ImageVisual::Property::BORDER,  Property::RECTANGLE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< Rect< int > >() == border );
+  value = resultMap.Find(ImageVisual::Property::BORDER, Property::RECTANGLE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<Rect<int>>() == border);
 
-  value = resultMap.Find( DevelImageVisual::Property::AUXILIARY_IMAGE, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "application-icon-30.png" );
+  value = resultMap.Find(DevelImageVisual::Property::AUXILIARY_IMAGE, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == "application-icon-30.png");
 
-  value = resultMap.Find( DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<float>() == 0.9f );
+  value = resultMap.Find(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<float>() == 0.9f);
 
-  Vector4 border1( 1.0f, 1.0f, 1.0f, 1.0f );
+  Vector4 border1(1.0f, 1.0f, 1.0f, 1.0f);
 
   Property::Map propertyMap1;
-  propertyMap1.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap1.Insert( "mixColor",  Color::MAGENTA );
-  propertyMap1.Insert( ImageVisual::Property::URL,  TEST_NPATCH_FILE_NAME );
-  propertyMap1.Insert( ImageVisual::Property::BORDER_ONLY,  true );
-  propertyMap1.Insert( ImageVisual::Property::BORDER, border1 );
-  nPatchVisual = factory.CreateVisual( propertyMap1 );
+  propertyMap1.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap1.Insert("mixColor", Color::MAGENTA);
+  propertyMap1.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME);
+  propertyMap1.Insert(ImageVisual::Property::BORDER_ONLY, true);
+  propertyMap1.Insert(ImageVisual::Property::BORDER, border1);
+  nPatchVisual = factory.CreateVisual(propertyMap1);
 
-  nPatchVisual.CreatePropertyMap( resultMap );
+  nPatchVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from visual
-  value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::N_PATCH );
+  value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::N_PATCH);
 
-  value = resultMap.Find( Visual::Property::MIX_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<Vector4>() == Color::MAGENTA );
+  value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<Vector4>() == Color::MAGENTA);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_NPATCH_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_NPATCH_FILE_NAME);
 
-  value = resultMap.Find( ImageVisual::Property::BORDER_ONLY,  Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<bool>() );
+  value = resultMap.Find(ImageVisual::Property::BORDER_ONLY, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>());
 
-  value = resultMap.Find( ImageVisual::Property::BORDER,  Property::RECTANGLE );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< Rect< int > >() == border );
+  value = resultMap.Find(ImageVisual::Property::BORDER, Property::RECTANGLE);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<Rect<int>>() == border);
 
   END_TEST;
 }
@@ -985,67 +1019,67 @@ int UtcDaliVisualGetPropertyMap6(void)
 int UtcDaliVisualGetPropertyMap7(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap7: SvgVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap7: SvgVisual");
 
   // request SvgVisual with a property map
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::SVG );
-  propertyMap.Insert( Visual::Property::MIX_COLOR, Color::WHITE );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::ATLASING, false );
-  Visual::Base svgVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::SVG);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::WHITE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ATLASING, false);
+  Visual::Base svgVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  svgVisual.CreatePropertyMap( resultMap );
+  svgVisual.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::SVG );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::SVG);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_SVG_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_SVG_FILE_NAME);
 
-  value = resultMap.Find( ImageVisual::Property::ATLASING, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<bool>() == false );
+  value = resultMap.Find(ImageVisual::Property::ATLASING, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == false);
 
   // request SvgVisual with a property map 2
   propertyMap.Clear();
-  propertyMap[ "visualType" ] = Visual::SVG;
-  propertyMap[ "mixColor" ] = Color::WHITE;
-  propertyMap[ "url" ] = TEST_SVG_FILE_NAME;
-  propertyMap[ "atlasing" ] = true;
-  Visual::Base svgVisual1 = factory.CreateVisual( propertyMap );
+  propertyMap["visualType"] = Visual::SVG;
+  propertyMap["mixColor"]   = Color::WHITE;
+  propertyMap["url"]        = TEST_SVG_FILE_NAME;
+  propertyMap["atlasing"]   = true;
+  Visual::Base svgVisual1   = factory.CreateVisual(propertyMap);
 
   resultMap.Clear();
-  svgVisual1.CreatePropertyMap( resultMap );
+  svgVisual1.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::SVG );
+  value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::SVG);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_SVG_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_SVG_FILE_NAME);
 
-  value = resultMap.Find( ImageVisual::Property::ATLASING, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<bool>() == true );
+  value = resultMap.Find(ImageVisual::Property::ATLASING, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == true);
 
   // request SvgVisual with an URL
-  Visual::Base svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() );
+  Visual::Base svgVisual2 = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions());
   resultMap.Clear();
-  svgVisual2.CreatePropertyMap( resultMap );
+  svgVisual2.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::SVG );
+  value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::SVG);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_SVG_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_SVG_FILE_NAME);
 
   END_TEST;
 }
@@ -1054,135 +1088,170 @@ int UtcDaliVisualGetPropertyMap7(void)
 int UtcDaliVisualGetPropertyMap8(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap8: MeshVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap8: MeshVisual");
 
   //Request MeshVisual using a property map.
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( Visual::Property::MIX_COLOR, Color::BLUE );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_LOCATION );
-  propertyMap.Insert( MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING );
-  propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 5.0f, 10.0f, 15.0f) );
-  Visual::Base meshVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLUE);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_LOCATION);
+  propertyMap.Insert(MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING);
+  propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(5.0f, 10.0f, 15.0f));
+  Visual::Base meshVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  meshVisual.CreatePropertyMap( resultMap );
-  TestMixColor( meshVisual, Visual::Property::MIX_COLOR, Color::BLUE );
+  meshVisual.CreatePropertyMap(resultMap);
+  TestMixColor(meshVisual, Visual::Property::MIX_COLOR, Color::BLUE);
 
   //Check values in the result map are identical to the initial map's values.
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), (int)Visual::MESH, TEST_LOCATION );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), (int)Visual::MESH, TEST_LOCATION);
 
-  value = resultMap.Find( MeshVisual::Property::OBJECT_URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<std::string>(), TEST_OBJ_FILE_NAME, TEST_LOCATION );
+  value = resultMap.Find(MeshVisual::Property::OBJECT_URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), TEST_OBJ_FILE_NAME, TEST_LOCATION);
 
-  value = resultMap.Find( MeshVisual::Property::MATERIAL_URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<std::string>(), TEST_MTL_FILE_NAME, TEST_LOCATION );
+  value = resultMap.Find(MeshVisual::Property::MATERIAL_URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), TEST_MTL_FILE_NAME, TEST_LOCATION);
 
-  value = resultMap.Find( MeshVisual::Property::TEXTURES_PATH, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<std::string>(), TEST_RESOURCE_LOCATION, TEST_LOCATION );
+  value = resultMap.Find(MeshVisual::Property::TEXTURES_PATH, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), TEST_RESOURCE_LOCATION, TEST_LOCATION);
 
-  value = resultMap.Find( MeshVisual::Property::SHADING_MODE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), (int)MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING, TEST_LOCATION );
+  value = resultMap.Find(MeshVisual::Property::SHADING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), (int)MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING, TEST_LOCATION);
 
-  value = resultMap.Find( MeshVisual::Property::LIGHT_POSITION, Property::VECTOR3 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector3>(), Vector3( 5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(MeshVisual::Property::LIGHT_POSITION, Property::VECTOR3);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector3>(), Vector3(5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
- END_TEST;
+  END_TEST;
 }
 
 //Primitive shape visual
 int UtcDaliVisualGetPropertyMap9(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap9: PrimitiveVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap9: PrimitiveVisual");
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+    };
+
+  TestGraphicsController& graphics = application.GetGraphicsController();
+  graphics.AddCustomUniforms(customUniforms);
 
-  Vector4 color = Vector4( 1.0, 0.8, 0.6, 1.0);
-  Vector3 dimensions = Vector3( 1.0, 2.0, 3.0 );
+  Vector4 color      = Vector4(1.0, 0.8, 0.6, 1.0);
+  Vector3 dimensions = Vector3(1.0, 2.0, 3.0);
 
   //Request PrimitiveVisual using a property map.
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, color );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 );
-  propertyMap.Insert( PrimitiveVisual::Property::STACKS, 20 );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_RADIUS, 60.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_DIMENSIONS, dimensions );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.3f );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.6f );
-  propertyMap.Insert( PrimitiveVisual::Property::LIGHT_POSITION, Vector3( 5.0f, 10.0f, 15.0f) );
-  Visual::Base primitiveVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, color);
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10);
+  propertyMap.Insert(PrimitiveVisual::Property::STACKS, 20);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_RADIUS, 60.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_DIMENSIONS, dimensions);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.3f);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.6f);
+  propertyMap.Insert(PrimitiveVisual::Property::LIGHT_POSITION, Vector3(5.0f, 10.0f, 15.0f));
+  Visual::Base primitiveVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  primitiveVisual.CreatePropertyMap( resultMap );
+  primitiveVisual.CreatePropertyMap(resultMap);
 
   //Check values in the result map are identical to the initial map's values.
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), (int)Visual::PRIMITIVE, TEST_LOCATION );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), (int)Visual::PRIMITIVE, TEST_LOCATION);
+
+  value = resultMap.Find(PrimitiveVisual::Property::SHAPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), (int)PrimitiveVisual::Shape::CUBE, TEST_LOCATION);
+
+  value = resultMap.Find(PrimitiveVisual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<Vector4>() == color);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), color, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::SHAPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), (int)PrimitiveVisual::Shape::CUBE, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::SLICES, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 10, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::MIX_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<Vector4>() == color );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), color, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::STACKS, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 20, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::SLICES, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 10, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::SCALE_TOP_RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 30.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::STACKS, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 20, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 40.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::SCALE_TOP_RADIUS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 30.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::SCALE_HEIGHT, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 50.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 40.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::SCALE_RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 60.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::SCALE_HEIGHT, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 50.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::SCALE_DIMENSIONS, Property::VECTOR3);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector3>(), dimensions, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::SCALE_RADIUS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 60.0f, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.3f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  value = resultMap.Find(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.6f, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  value = resultMap.Find(PrimitiveVisual::Property::LIGHT_POSITION, Property::VECTOR3);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector3>(), Vector3(5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, primitiveVisual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(actor);
 
-  value = resultMap.Find( PrimitiveVisual::Property::SCALE_DIMENSIONS, Property::VECTOR3 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector3>(), dimensions, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  Animation animation = Animation::New(1.0f);
+  animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, PrimitiveVisual::Property::MIX_COLOR), Vector3(Color::MAGENTA));
+  animation.Play();
+  application.SendNotification();
+  application.Render(0);
+  application.Render(1000);
+  application.SendNotification();
 
-  value = resultMap.Find( PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.3f, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  auto& gl = application.GetGlAbstraction();
+  DALI_TEST_EQUALS(gl.CheckUniformValue<Vector3>("mixColor", Vector3(Color::MAGENTA)), true, TEST_LOCATION);
 
-  value = resultMap.Find( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.6f, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  tet_infoline("Check property map after animation");
 
-  value = resultMap.Find( PrimitiveVisual::Property::LIGHT_POSITION, Property::VECTOR3 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector3>(), Vector3( 5.0f, 10.0f, 15.0f), Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  primitiveVisual.CreatePropertyMap(resultMap);
+  value = resultMap.Find(PrimitiveVisual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  color = value->Get<Vector4>();
+  // Ignore alpha part
+  DALI_TEST_EQUALS(Vector3(color), Vector3(Color::MAGENTA), 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1191,121 +1260,121 @@ int UtcDaliVisualGetPropertyMap9(void)
 int UtcDaliVisualGetPropertyMap10(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap10: TextVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap10: TextVisual");
 
   //Request PrimitiveVisual using a property map.
   VisualFactory factory = VisualFactory::Get();
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT );
-  propertyMap.Insert( Visual::Property::MIX_COLOR, Color::BLACK );
-  propertyMap.Insert( "renderingBackend", static_cast<int>( Toolkit::DevelText::DEFAULT_RENDERING_BACKEND ) );
-  propertyMap.Insert( "enableMarkup", false );
-  propertyMap.Insert( "text", "Hello world" );
-  propertyMap.Insert( "fontFamily", "TizenSans" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLACK);
+  propertyMap.Insert("renderingBackend", static_cast<int>(Toolkit::DevelText::DEFAULT_RENDERING_BACKEND));
+  propertyMap.Insert("enableMarkup", false);
+  propertyMap.Insert("text", "Hello world");
+  propertyMap.Insert("fontFamily", "TizenSans");
 
   Property::Map fontStyleMapSet;
-  fontStyleMapSet.Insert( "weight", "bold" );
-  propertyMap.Insert( "fontStyle", fontStyleMapSet );
+  fontStyleMapSet.Insert("weight", "bold");
+  propertyMap.Insert("fontStyle", fontStyleMapSet);
 
-  propertyMap.Insert( "pointSize", 12.f );
-  propertyMap.Insert( "multiLine", true );
-  propertyMap.Insert( "horizontalAlignment", "CENTER" );
-  propertyMap.Insert( "verticalAlignment", "CENTER" );
-  propertyMap.Insert( "textColor", Color::RED );
+  propertyMap.Insert("pointSize", 12.f);
+  propertyMap.Insert("multiLine", true);
+  propertyMap.Insert("horizontalAlignment", "CENTER");
+  propertyMap.Insert("verticalAlignment", "CENTER");
+  propertyMap.Insert("textColor", Color::RED);
 
   Property::Map shadowMapSet;
-  propertyMap.Insert( "shadow", shadowMapSet.Add("color", Color::RED).Add("offset", Vector2(2.0f, 2.0f)).Add("blurRadius", 3.0f) );
+  propertyMap.Insert("shadow", shadowMapSet.Add("color", Color::RED).Add("offset", Vector2(2.0f, 2.0f)).Add("blurRadius", 3.0f));
 
   Property::Map underlineMapSet;
-  propertyMap.Insert( "underline", underlineMapSet.Add("enable", true).Add("color", Color::GREEN).Add("height", 1) );
+  propertyMap.Insert("underline", underlineMapSet.Add("enable", true).Add("color", Color::GREEN).Add("height", 1).Add("type", Text::Underline::Type::SOLID).Add("dashWidth", 2).Add("dashGap", 1));
 
   Property::Map outlineMapSet;
-  propertyMap.Insert( "outline", outlineMapSet.Add("color", Color::YELLOW).Add("width", 1) );
+  propertyMap.Insert("outline", outlineMapSet.Add("color", Color::YELLOW).Add("width", 1));
 
   Property::Map backgroundMapSet;
-  propertyMap.Insert( "textBackground", backgroundMapSet.Add("enable", true).Add("color", Color::CYAN) );
+  propertyMap.Insert("textBackground", backgroundMapSet.Add("enable", true).Add("color", Color::CYAN));
 
-  Visual::Base textVisual = factory.CreateVisual( propertyMap );
+  Visual::Base textVisual = factory.CreateVisual(propertyMap);
 
   Property::Map resultMap;
-  textVisual.CreatePropertyMap( resultMap );
+  textVisual.CreatePropertyMap(resultMap);
 
   //Check values in the result map are identical to the initial map's values.
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), (int)Visual::TEXT, TEST_LOCATION );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), (int)Visual::TEXT, TEST_LOCATION);
 
-  value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Color::BLACK, 0.001f, TEST_LOCATION );
+  value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::BLACK, 0.001f, TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::TEXT, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<std::string>(), "Hello world", TEST_LOCATION );
+  value = resultMap.Find(TextVisual::Property::TEXT, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), "Hello world", TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::FONT_FAMILY, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<std::string>(), "TizenSans", TEST_LOCATION );
+  value = resultMap.Find(TextVisual::Property::FONT_FAMILY, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<std::string>(), "TizenSans", TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::FONT_STYLE, Property::MAP );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(TextVisual::Property::FONT_STYLE, Property::MAP);
+  DALI_TEST_CHECK(value);
 
   Property::Map fontStyleMapGet = value->Get<Property::Map>();
-  DALI_TEST_EQUALS( fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(fontStyleMapGet.Count(), fontStyleMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(fontStyleMapGet, fontStyleMapSet), true, TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::POINT_SIZE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+  value = resultMap.Find(TextVisual::Property::POINT_SIZE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::MULTI_LINE, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<bool>() );
+  value = resultMap.Find(TextVisual::Property::MULTI_LINE, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>());
 
-  value = resultMap.Find( TextVisual::Property::HORIZONTAL_ALIGNMENT, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), (int)Text::HorizontalAlignment::CENTER, TEST_LOCATION );
+  value = resultMap.Find(TextVisual::Property::HORIZONTAL_ALIGNMENT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), (int)Text::HorizontalAlignment::CENTER, TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::VERTICAL_ALIGNMENT, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), (int)Text::VerticalAlignment::CENTER, TEST_LOCATION );
+  value = resultMap.Find(TextVisual::Property::VERTICAL_ALIGNMENT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), (int)Text::VerticalAlignment::CENTER, TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::TEXT_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Color::RED, TEST_LOCATION );
+  value = resultMap.Find(TextVisual::Property::TEXT_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::ENABLE_MARKUP, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( !value->Get<bool>() );
+  value = resultMap.Find(TextVisual::Property::ENABLE_MARKUP, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(!value->Get<bool>());
 
-  value = resultMap.Find( TextVisual::Property::SHADOW, Property::MAP );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(TextVisual::Property::SHADOW, Property::MAP);
+  DALI_TEST_CHECK(value);
 
   Property::Map shadowMapGet = value->Get<Property::Map>();
-  DALI_TEST_EQUALS( shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(shadowMapGet, shadowMapSet), true, TEST_LOCATION);
 
-  value = resultMap.Find( TextVisual::Property::UNDERLINE, Property::MAP );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(TextVisual::Property::UNDERLINE, Property::MAP);
+  DALI_TEST_CHECK(value);
 
   Property::Map underlineMapGet = value->Get<Property::Map>();
-  DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(underlineMapGet, underlineMapSet), true, TEST_LOCATION);
 
-  value = resultMap.Find( DevelTextVisual::Property::OUTLINE, Property::MAP );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelTextVisual::Property::OUTLINE, Property::MAP);
+  DALI_TEST_CHECK(value);
 
   Property::Map outlineMapGet = value->Get<Property::Map>();
-  DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(outlineMapGet, outlineMapSet), true, TEST_LOCATION);
 
-  value = resultMap.Find( DevelTextVisual::Property::BACKGROUND, Property::MAP );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelTextVisual::Property::BACKGROUND, Property::MAP);
+  DALI_TEST_CHECK(value);
 
   Property::Map backgroundMapGet = value->Get<Property::Map>();
-  DALI_TEST_EQUALS( backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( DaliTestCheckMaps( backgroundMapGet, backgroundMapSet ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(DaliTestCheckMaps(backgroundMapGet, backgroundMapSet), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1313,85 +1382,84 @@ int UtcDaliVisualGetPropertyMap10(void)
 int UtcDaliVisualGetPropertyMap11(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap11: AnimatedGradientVisual" );
+  tet_infoline("UtcDaliVisualGetPropertyMap11: AnimatedGradientVisual");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  DevelVisual::ANIMATED_GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT);
 
   Vector2 start(-0.5f, 0.5f);
-  Vector2 end  (0.5f, -0.0f);
+  Vector2 end(0.5f, -0.0f);
   Vector4 start_color(1.0f, 0.7f, 0.5f, 1.0f);
-  Vector4 end_color  (0.7f, 0.5f, 1.0f, 1.0f);
+  Vector4 end_color(0.7f, 0.5f, 1.0f, 1.0f);
   Vector2 rotate_center(0.0f, 0.4f);
-  float rotate_amount = 1.57f;
-  float offset = 100.f;
+  float   rotate_amount = 1.57f;
+  float   offset        = 100.f;
 
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  DevelAnimatedGradientVisual::GradientType::RADIAL);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE,  DevelAnimatedGradientVisual::UnitType::USER_SPACE);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE,  DevelAnimatedGradientVisual::SpreadType::CLAMP);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::RADIAL);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::USER_SPACE);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::CLAMP);
 
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION,  start);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION,  end);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR,  start_color);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR,  end_color);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER,  rotate_center);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT,  rotate_amount);
-  propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET,  offset);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, start);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, end);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, start_color);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, end_color);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, rotate_center);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, rotate_amount);
+  propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, offset);
 
   Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( animatedGradientVisual );
+  DALI_TEST_CHECK(animatedGradientVisual);
 
   Property::Map resultMap;
-  animatedGradientVisual.CreatePropertyMap( resultMap );
+  animatedGradientVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == DevelVisual::ANIMATED_GRADIENT );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_GRADIENT);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::GradientType::RADIAL );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::GradientType::RADIAL);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::UnitType::USER_SPACE );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::UnitType::USER_SPACE);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::CLAMP );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::CLAMP);
 
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_POSITION, Property::VECTOR2);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), start, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_POSITION,  Property::VECTOR2 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector2>(), start , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_POSITION, Property::VECTOR2);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), end, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_POSITION,  Property::VECTOR2 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector2>(), end , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), start_color, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), start_color , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), end_color, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_COLOR,  Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), end_color , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, Property::VECTOR2);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector2>(), rotate_center, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_CENTER,  Property::VECTOR2 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector2>(), rotate_center , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), rotate_amount, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT,  Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), rotate_amount , Math::MACHINE_EPSILON_100, TEST_LOCATION );
-
-  value = resultMap.Find( DevelAnimatedGradientVisual::Property::OFFSET,  Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), offset , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  value = resultMap.Find(DevelAnimatedGradientVisual::Property::OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), offset, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1399,34 +1467,33 @@ int UtcDaliVisualGetPropertyMap11(void)
 int UtcDaliVisualGetPropertyMap12(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap12: AnimatedGradientVisual with animation param" );
+  tet_infoline("UtcDaliVisualGetPropertyMap12: AnimatedGradientVisual with animation param");
 
   // Case 1 : Set values by index
   {
-    tet_printf( " - Set Values by Index\n" );
+    tet_printf(" - Set Values by Index\n");
     // NOTE : PropertyMap doesn't optimized even delay < -loop_count * (duration + repeat_delay) so this animation will not run
     // _delay = -10.0f is this case. It will progress (10.0f / 1.5f) amount. and 10.0f / 1.5f > 5.
     for(float _delay = -10.0f; _delay <= 5.0f; _delay += 5.0f)
     {
-      tet_printf( "test with delay [%f]\n", _delay );
+      tet_printf("test with delay [%f]\n", _delay);
       VisualFactory factory = VisualFactory::Get();
-      DALI_TEST_CHECK( factory );
+      DALI_TEST_CHECK(factory);
 
       Property::Map propertyMap;
       Property::Map animationMap;
-      propertyMap.Insert(Visual::Property::TYPE,  DevelVisual::ANIMATED_GRADIENT);
+      propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT);
 
-      float duration = 1.1f;
-      float delay = _delay;
+      float duration     = 1.1f;
+      float delay        = _delay;
       float repeat_delay = 0.4f;
 
-      int direction = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD;
+      int direction  = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD;
       int loop_count = 5;
-      int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR;
-      int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::OUT;
+      int motion     = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR;
+      int easing     = DevelAnimatedGradientVisual::AnimationParameter::EasingType::OUT;
 
-      auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value &start, const Property::Value &target)->Property::Map&
-      {
+      auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value& start, const Property::Value& target) -> Property::Map& {
         animationMap.Clear();
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::START, start);
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target);
@@ -1442,222 +1509,217 @@ int UtcDaliVisualGetPropertyMap12(void)
       };
 
       Vector2 start1(-0.5f, 0.5f);
-      Vector2 end1  (0.5f, -0.5f);
+      Vector2 end1(0.5f, -0.5f);
       Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f);
-      Vector4 end_color1  (0.7f, 0.5f, 1.0f, 1.0f);
+      Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f);
       Vector2 rotate_center1(0.0f, 0.4f);
-      float rotate_amount1 = 0.0f;
-      float offset1 = 0.f;
+      float   rotate_amount1 = 0.0f;
+      float   offset1        = 0.f;
 
       Vector2 start2(-0.5f, -0.5f);
-      Vector2 end2  (0.5f, 0.5f);
+      Vector2 end2(0.5f, 0.5f);
       Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f);
-      Vector4 end_color2  (0.3f, 1.0f, 0.1f, 0.0f);
+      Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f);
       Vector2 rotate_center2(0.0f, -0.4f);
-      float rotate_amount2 = 6.2832f;
-      float offset2 = 2.f;
+      float   rotate_amount2 = 6.2832f;
+      float   offset2        = 2.f;
 
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  DevelAnimatedGradientVisual::GradientType::LINEAR);
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE,  DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX);
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE,  DevelAnimatedGradientVisual::SpreadType::REPEAT);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::LINEAR);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::REPEAT);
 
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1        , start2        ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION,   buildAnimatedMap(end1          , end2          ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR,    buildAnimatedMap(start_color1  , start_color2  ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR,      buildAnimatedMap(end_color1    , end_color2    ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER,  buildAnimatedMap(rotate_center1, rotate_center2));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT,  buildAnimatedMap(rotate_amount1, rotate_amount2));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET,         buildAnimatedMap(offset1       , offset2       ));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1, start2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1, end2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1, start_color2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1, end_color2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1, offset2));
 
       Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap);
-      DALI_TEST_CHECK( animatedGradientVisual );
+      DALI_TEST_CHECK(animatedGradientVisual);
 
       Property::Map resultMap;
-      animatedGradientVisual.CreatePropertyMap( resultMap );
+      animatedGradientVisual.CreatePropertyMap(resultMap);
 
       // check the property values from the returned map from visual
-      Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelVisual::ANIMATED_GRADIENT );
+      Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_GRADIENT);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::GradientType::LINEAR );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::GradientType::LINEAR);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::REPEAT );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::REPEAT);
 
-      auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index &index, const Property::Value &start, const Property::Value &target, int line_num)->void
-      {
+      auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index& index, const Property::Value& start, const Property::Value& target, int line_num) -> void {
         tet_printf("Check value at %d\n", line_num);
-        value = resultMap.Find( index, Property::MAP );
-        DALI_TEST_CHECK( value );
-        DALI_TEST_CHECK( value->GetType() == Property::MAP );
-        Property::Map *temp_map = value->GetMap();
-        DALI_TEST_CHECK( temp_map );
-
-        auto checkMapValue = [&temp_map](const Property::Index index)->Property::Value
-        {
-          Property::Value *res = temp_map->Find( index );
-          DALI_TEST_CHECK( res );
+        value = resultMap.Find(index, Property::MAP);
+        DALI_TEST_CHECK(value);
+        DALI_TEST_CHECK(value->GetType() == Property::MAP);
+        Property::Map* temp_map = value->GetMap();
+        DALI_TEST_CHECK(temp_map);
+
+        auto checkMapValue = [&temp_map](const Property::Index index) -> Property::Value {
+          Property::Value* res = temp_map->Find(index);
+          DALI_TEST_CHECK(res);
           return *res;
         };
 
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START)       , start, Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET)      , target, Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION)   , Property::Value( direction ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION)    , Property::Value( duration ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY)       , Property::Value( delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT)      , Property::Value( loop_count ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value( repeat_delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE) , Property::Value( motion ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE) , Property::Value( easing ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START), start, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET), target, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION), Property::Value(direction), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION), Property::Value(duration), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY), Property::Value(delay), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT), Property::Value(loop_count), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value(repeat_delay), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE), Property::Value(motion), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE), Property::Value(easing), Math::MACHINE_EPSILON_100, TEST_LOCATION);
       };
 
       // check the animation map data is good
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1        , start2        , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION  , end1          , end2          , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR   , start_color1  , start_color2  , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR     , end_color1    , end_color2    , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER , rotate_center1, rotate_center2, __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT , rotate_amount1, rotate_amount2, __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET        , offset1       , offset2       , __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1, start2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION, end1, end2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR, start_color1, start_color2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR, end_color1, end_color2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, rotate_center1, rotate_center2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, rotate_amount1, rotate_amount2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET, offset1, offset2, __LINE__);
     }
   }
 
   // Case 2 : Set values by string
   {
-    tet_printf( " - Set Values by String\n" );
+    tet_printf(" - Set Values by String\n");
     // NOTE : PropertyMap doesn't optimized even delay < -loop_count * (duration + repeat_delay) so this animation will not run
     // _delay = -10.0f is this case. It will progress (10.0f / 1.5f) amount. and 10.0f / 1.5f > 5.
     for(float _delay = -10.0f; _delay <= 5.0f; _delay += 5.0f)
     {
-      tet_printf( "test with delay [%f]\n", _delay );
+      tet_printf("test with delay [%f]\n", _delay);
       VisualFactory factory = VisualFactory::Get();
-      DALI_TEST_CHECK( factory );
+      DALI_TEST_CHECK(factory);
 
       Property::Map propertyMap;
       Property::Map animationMap;
       propertyMap.Insert("visualType", "ANIMATED_GRADIENT");
 
-      float duration = 1.1f;
-      float delay = _delay;
+      float duration     = 1.1f;
+      float delay        = _delay;
       float repeat_delay = 0.4f;
 
-      int direction = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD;
+      int direction  = DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD;
       int loop_count = 5;
-      int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR;
-      int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN_OUT;
+      int motion     = DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR;
+      int easing     = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN_OUT;
 
-      auto buildAnimatedMap = [&animationMap, &duration, &delay, &loop_count, &repeat_delay](const Property::Value &start, const Property::Value &target)->Property::Map&
-      {
+      auto buildAnimatedMap = [&animationMap, &duration, &delay, &loop_count, &repeat_delay](const Property::Value& start, const Property::Value& target) -> Property::Map& {
         animationMap.Clear();
-        animationMap.Insert("startValue"   , start);
-        animationMap.Insert("targetValue"  , target);
+        animationMap.Insert("startValue", start);
+        animationMap.Insert("targetValue", target);
         animationMap.Insert("directionType", "BACKWARD");
-        animationMap.Insert("duration"     , duration);
-        animationMap.Insert("delay"        , delay);
-        animationMap.Insert("repeat"       , loop_count);
-        animationMap.Insert("repeatDelay"  , repeat_delay);
-        animationMap.Insert("motionType"   , "MIRROR");
-        animationMap.Insert("easingType"   , "IN_OUT");
+        animationMap.Insert("duration", duration);
+        animationMap.Insert("delay", delay);
+        animationMap.Insert("repeat", loop_count);
+        animationMap.Insert("repeatDelay", repeat_delay);
+        animationMap.Insert("motionType", "MIRROR");
+        animationMap.Insert("easingType", "IN_OUT");
 
         return animationMap;
       };
 
       Vector2 start1(-0.5f, 0.5f);
-      Vector2 end1  (0.5f, -0.5f);
+      Vector2 end1(0.5f, -0.5f);
       Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f);
-      Vector4 end_color1  (0.7f, 0.5f, 1.0f, 1.0f);
+      Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f);
       Vector2 rotate_center1(0.0f, 0.4f);
-      float rotate_amount1 = 0.0f;
-      float offset1 = 0.f;
+      float   rotate_amount1 = 0.0f;
+      float   offset1        = 0.f;
 
       Vector2 start2(-0.5f, -0.5f);
-      Vector2 end2  (0.5f, 0.5f);
+      Vector2 end2(0.5f, 0.5f);
       Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f);
-      Vector4 end_color2  (0.3f, 1.0f, 0.1f, 0.0f);
+      Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f);
       Vector2 rotate_center2(0.0f, -0.4f);
-      float rotate_amount2 = 6.2832f;
-      float offset2 = 2.f;
+      float   rotate_amount2 = 6.2832f;
+      float   offset2        = 2.f;
 
       // For test mix the type string/index key and string/index value works well.
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  "RADIAL");
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE,  DevelAnimatedGradientVisual::UnitType::USER_SPACE);
-      propertyMap.Insert("spreadType"  , DevelAnimatedGradientVisual::SpreadType::REFLECT);
-
-      propertyMap.Insert("startPosition", buildAnimatedMap(start1        , start2        ));
-      propertyMap.Insert("endPosition"  , buildAnimatedMap(end1          , end2          ));
-      propertyMap.Insert("startColor"   , buildAnimatedMap(start_color1  , start_color2  ));
-      propertyMap.Insert("endColor"     , buildAnimatedMap(end_color1    , end_color2    ));
-      propertyMap.Insert("rotateCenter" , buildAnimatedMap(rotate_center1, rotate_center2));
-      propertyMap.Insert("rotateAmount" , buildAnimatedMap(rotate_amount1, rotate_amount2));
-      propertyMap.Insert("offset"       , buildAnimatedMap(offset1       , offset2       ));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, "RADIAL");
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::USER_SPACE);
+      propertyMap.Insert("spreadType", DevelAnimatedGradientVisual::SpreadType::REFLECT);
+
+      propertyMap.Insert("startPosition", buildAnimatedMap(start1, start2));
+      propertyMap.Insert("endPosition", buildAnimatedMap(end1, end2));
+      propertyMap.Insert("startColor", buildAnimatedMap(start_color1, start_color2));
+      propertyMap.Insert("endColor", buildAnimatedMap(end_color1, end_color2));
+      propertyMap.Insert("rotateCenter", buildAnimatedMap(rotate_center1, rotate_center2));
+      propertyMap.Insert("rotateAmount", buildAnimatedMap(rotate_amount1, rotate_amount2));
+      propertyMap.Insert("offset", buildAnimatedMap(offset1, offset2));
 
       Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap);
-      DALI_TEST_CHECK( animatedGradientVisual );
+      DALI_TEST_CHECK(animatedGradientVisual);
 
       Property::Map resultMap;
-      animatedGradientVisual.CreatePropertyMap( resultMap );
+      animatedGradientVisual.CreatePropertyMap(resultMap);
 
       // check the property values from the returned map from visual
       // Note : resultMap from CreatePropertyMap only contain indexKey
-      Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelVisual::ANIMATED_GRADIENT );
+      Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_GRADIENT);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::GradientType::RADIAL );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::GradientType::RADIAL);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::UnitType::USER_SPACE );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::UnitType::USER_SPACE);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::REFLECT );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::REFLECT);
 
-      auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index &index, const Property::Value &start, const Property::Value &target, int line_num)->void
-      {
+      auto checkAnimatedMap = [&value, &resultMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Index& index, const Property::Value& start, const Property::Value& target, int line_num) -> void {
         tet_printf("Check value at %d\n", line_num);
-        value = resultMap.Find( index, Property::MAP );
-        DALI_TEST_CHECK( value );
-        DALI_TEST_CHECK( value->GetType() == Property::MAP );
-        Property::Map *temp_map = value->GetMap();
-        DALI_TEST_CHECK( temp_map );
-
-        auto checkMapValue = [&temp_map](const Property::Index index)->Property::Value
-        {
-          Property::Value *res = temp_map->Find( index );
-          DALI_TEST_CHECK( res );
+        value = resultMap.Find(index, Property::MAP);
+        DALI_TEST_CHECK(value);
+        DALI_TEST_CHECK(value->GetType() == Property::MAP);
+        Property::Map* temp_map = value->GetMap();
+        DALI_TEST_CHECK(temp_map);
+
+        auto checkMapValue = [&temp_map](const Property::Index index) -> Property::Value {
+          Property::Value* res = temp_map->Find(index);
+          DALI_TEST_CHECK(res);
           return *res;
         };
 
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START)       , start, Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET)      , target, Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION)   , Property::Value( direction ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION)    , Property::Value( duration ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY)       , Property::Value( delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT)      , Property::Value( loop_count ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value( repeat_delay ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE) , Property::Value( motion ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
-        DALI_TEST_EQUALS( checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE) , Property::Value( easing ), Math::MACHINE_EPSILON_100, TEST_LOCATION );
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::START), start, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET), target, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION), Property::Value(direction), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION), Property::Value(duration), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY), Property::Value(delay), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT), Property::Value(loop_count), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY), Property::Value(repeat_delay), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE), Property::Value(motion), Math::MACHINE_EPSILON_100, TEST_LOCATION);
+        DALI_TEST_EQUALS(checkMapValue(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE), Property::Value(easing), Math::MACHINE_EPSILON_100, TEST_LOCATION);
       };
 
       // check the animation map data is good
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1        , start2        , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION  , end1          , end2          , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR   , start_color1  , start_color2  , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR     , end_color1    , end_color2    , __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER , rotate_center1, rotate_center2, __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT , rotate_amount1, rotate_amount2, __LINE__);
-      checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET        , offset1       , offset2       , __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_POSITION, start1, start2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_POSITION, end1, end2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::START_COLOR, start_color1, start_color2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::END_COLOR, end_color1, end_color2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, rotate_center1, rotate_center2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, rotate_amount1, rotate_amount2, __LINE__);
+      checkAnimatedMap(DevelAnimatedGradientVisual::Property::OFFSET, offset1, offset2, __LINE__);
     }
   }
 
@@ -1666,36 +1728,37 @@ int UtcDaliVisualGetPropertyMap12(void)
 int UtcDaliVisualGetPropertyMap13(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetPropertyMap13: AnimatedGradientVisual when repeat = 0" );
+  tet_infoline("UtcDaliVisualGetPropertyMap13: AnimatedGradientVisual when repeat = 0");
 
   for(int _direction = 0; _direction <= 1; ++_direction)
   {
     for(float _delay = -10.0f; _delay <= 10.0f; _delay += 10.0f)
     {
-      tet_printf( ((_direction == 0) ? "Forward test with delay [%f]\n" : "Backward test with delay [%f]\n") , _delay );
+      tet_printf(((_direction == 0) ? "Forward test with delay [%f]\n" : "Backward test with delay [%f]\n"), _delay);
       VisualFactory factory = VisualFactory::Get();
-      DALI_TEST_CHECK( factory );
+      DALI_TEST_CHECK(factory);
 
       Property::Map propertyMap;
       Property::Map animationMap;
-      propertyMap.Insert(Visual::Property::TYPE,  DevelVisual::ANIMATED_GRADIENT);
+      propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT);
 
-      float duration = 1.0f;
-      float delay = _delay;
+      float duration     = 1.0f;
+      float delay        = _delay;
       float repeat_delay = 0.5f;
 
-      int direction = _direction;
+      int direction  = _direction;
       int loop_count = 0; // When loop_count is 0, Animation will not be created.
-      int motion = DevelAnimatedGradientVisual::AnimationParameter::MotionType::LOOP;
-      int easing = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN;
+      int motion     = DevelAnimatedGradientVisual::AnimationParameter::MotionType::LOOP;
+      int easing     = DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN;
 
-      auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value &start, const Property::Value &target)->Property::Map&
-      {
+      auto buildAnimatedMap = [&animationMap, &direction, &duration, &delay, &loop_count, &repeat_delay, &motion, &easing](const Property::Value& start, const Property::Value& target) -> Property::Map& {
         animationMap.Clear();
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::START, start);
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target);
-        if(direction == 0)animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::FORWARD);
-        else animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD);
+        if(direction == 0)
+          animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::FORWARD);
+        else
+          animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::BACKWARD);
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, direction);
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DURATION, duration);
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY, delay);
@@ -1708,231 +1771,288 @@ int UtcDaliVisualGetPropertyMap13(void)
       };
 
       Vector2 start1(-0.5f, 0.5f);
-      Vector2 end1  (0.5f, -0.5f);
+      Vector2 end1(0.5f, -0.5f);
       Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f);
-      Vector4 end_color1  (0.7f, 0.5f, 1.0f, 1.0f);
+      Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f);
       Vector2 rotate_center1(1.0f, 0.4f);
-      float rotate_amount1 = 2.0f;
-      float offset1 = 1.f;
+      float   rotate_amount1 = 2.0f;
+      float   offset1        = 1.f;
 
       Vector2 start2(-0.5f, -0.5f);
-      Vector2 end2  (0.5f, 0.5f);
+      Vector2 end2(0.5f, 0.5f);
       Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f);
-      Vector4 end_color2  (0.3f, 1.0f, 0.1f, 0.0f);
+      Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f);
       Vector2 rotate_center2(1.0f, -0.4f);
-      float rotate_amount2 = 1.0f;
-      float offset2 = 3.f;
+      float   rotate_amount2 = 1.0f;
+      float   offset2        = 3.f;
 
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  DevelAnimatedGradientVisual::GradientType::LINEAR);
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE,  DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX);
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE,  DevelAnimatedGradientVisual::SpreadType::REFLECT);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, DevelAnimatedGradientVisual::GradientType::LINEAR);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, DevelAnimatedGradientVisual::SpreadType::REFLECT);
 
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1        , start2        ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION,   buildAnimatedMap(end1          , end2          ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR,    buildAnimatedMap(start_color1  , start_color2  ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR,      buildAnimatedMap(end_color1    , end_color2    ));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER,  buildAnimatedMap(rotate_center1, rotate_center2));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT,  buildAnimatedMap(rotate_amount1, rotate_amount2));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET,         buildAnimatedMap(offset1       , offset2       ));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1, start2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1, end2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1, start_color2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1, end_color2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1, offset2));
 
       Visual::Base animatedGradientVisual = factory.CreateVisual(propertyMap);
-      DALI_TEST_CHECK( animatedGradientVisual );
+      DALI_TEST_CHECK(animatedGradientVisual);
 
       Property::Map resultMap;
-      animatedGradientVisual.CreatePropertyMap( resultMap );
+      animatedGradientVisual.CreatePropertyMap(resultMap);
 
       // check the property values from the returned map from visual
-      Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelVisual::ANIMATED_GRADIENT );
+      Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_GRADIENT);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::GRADIENT_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::GradientType::LINEAR );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::GradientType::LINEAR);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::UNIT_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::UNIT_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::UnitType::OBJECT_BOUNDING_BOX);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::SPREAD_TYPE,  Property::INTEGER );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_CHECK( value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::REFLECT );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, Property::INTEGER);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_CHECK(value->Get<int>() == DevelAnimatedGradientVisual::SpreadType::REFLECT);
 
       // If loop_count = 0, Animation doesn't created.
       // Optimized resultMap only have one value, which is target value
       // Note: target value will be changed by direction option.
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_POSITION,  Property::VECTOR2 );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_EQUALS( value->Get<Vector2>(), direction ? start1 : start2 , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_POSITION, Property::VECTOR2);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_EQUALS(value->Get<Vector2>(), direction ? start1 : start2, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_POSITION,  Property::VECTOR2 );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_EQUALS( value->Get<Vector2>(), direction ? end1 : end2 , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_POSITION, Property::VECTOR2);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_EQUALS(value->Get<Vector2>(), direction ? end1 : end2, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::START_COLOR,  Property::VECTOR4 );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_EQUALS( value->Get<Vector4>(), direction ? start_color1 : start_color2 , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::START_COLOR, Property::VECTOR4);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_EQUALS(value->Get<Vector4>(), direction ? start_color1 : start_color2, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::END_COLOR,  Property::VECTOR4 );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_EQUALS( value->Get<Vector4>(), direction ? end_color1 : end_color2 , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::END_COLOR, Property::VECTOR4);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_EQUALS(value->Get<Vector4>(), direction ? end_color1 : end_color2, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_CENTER,  Property::VECTOR2 );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_EQUALS( value->Get<Vector2>(), direction ? rotate_center1 : rotate_center2 , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, Property::VECTOR2);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_EQUALS(value->Get<Vector2>(), direction ? rotate_center1 : rotate_center2, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT,  Property::FLOAT );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_EQUALS( value->Get<float>(), direction ? rotate_amount1 : rotate_amount2 , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, Property::FLOAT);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_EQUALS(value->Get<float>(), direction ? rotate_amount1 : rotate_amount2, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-      value = resultMap.Find( DevelAnimatedGradientVisual::Property::OFFSET,  Property::FLOAT );
-      DALI_TEST_CHECK( value );
-      DALI_TEST_EQUALS( value->Get<float>(), direction ? offset1 : offset2 , Math::MACHINE_EPSILON_100, TEST_LOCATION );
+      value = resultMap.Find(DevelAnimatedGradientVisual::Property::OFFSET, Property::FLOAT);
+      DALI_TEST_CHECK(value);
+      DALI_TEST_EQUALS(value->Get<float>(), direction ? offset1 : offset2, Math::MACHINE_EPSILON_100, TEST_LOCATION);
     }
   }
 
   END_TEST;
 }
 
+int UtcDaliVisualAnimateArcVisual(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualAnimateArcVisual color");
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("startAngle", Property::Type::FLOAT),
+      UniformData("sweepAngle", Property::Type::FLOAT),
+    };
+
+  TestGraphicsController& graphics = application.GetGraphicsController();
+  graphics.AddCustomUniforms(customUniforms);
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ARC);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::BLUE);
+  propertyMap.Insert(DevelArcVisual::Property::START_ANGLE, 0.0f);
+  propertyMap.Insert(DevelArcVisual::Property::SWEEP_ANGLE, 90.0f);
+  propertyMap.Insert(DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND);
+  propertyMap.Insert(DevelArcVisual::Property::THICKNESS, 20.0f);
+  Visual::Base arcVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        actor     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, arcVisual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(actor);
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  Renderer        renderer = actor.GetRendererAt(0);
+  Property::Index index    = renderer.GetPropertyIndex(DevelArcVisual::Property::SWEEP_ANGLE);
+
+  Animation animation = Animation::New(4.0f);
+  animation.AnimateTo(Property(renderer, index), 50.0f);
+  animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelArcVisual::Property::START_ANGLE), 40.0f);
+  animation.Play();
+
+  application.SendNotification();
+  application.Render(0);
+  application.Render(2000u); // halfway point
+
+  float sweepAngle = renderer.GetCurrentProperty<float>(index);
+  DALI_TEST_EQUALS(sweepAngle, 70.0f, 0.0001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("startAngle", 20.0f), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("sweepAngle", 70.0f), true, TEST_LOCATION);
+
+  application.Render(2000u); // another halfway point
+
+  sweepAngle = renderer.GetCurrentProperty<float>(index);
+  DALI_TEST_EQUALS(sweepAngle, 50.0f, 0.0001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("startAngle", 40.0f), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("sweepAngle", 50.0f), true, TEST_LOCATION);
+
+  END_TEST;
+}
+
 int UtcDaliVisualAnimateBorderVisual01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimateBorderVisual Color" );
+  tet_infoline("UtcDaliAnimateBorderVisual Color");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("borderColor", Property::Type::VECTOR4),
-    UniformData("mixColor", Property::Type::VECTOR3),
-  };
+    {
+      UniformData("borderColor", Property::Type::VECTOR4),
+      UniformData("mixColor", Property::Type::VECTOR3),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::BORDER);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER);
   propertyMap.Insert(Visual::Property::MIX_COLOR, Vector4(1, 1, 1, 0.8f));
-  propertyMap.Insert(BorderVisual::Property::COLOR,  Color::BLUE);
-  propertyMap.Insert(BorderVisual::Property::SIZE,  5.f);
-  Visual::Base borderVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE);
+  propertyMap.Insert(BorderVisual::Property::SIZE, 5.f);
+  Visual::Base borderVisual = factory.CreateVisual(propertyMap);
 
   Property::Map map;
-  map["target"] = "testVisual";
-  map["property"] = "mixColor";
-  map["targetValue"] = Vector4(1,1,1,0.1);
-  map["animator"] = Property::Map()
-    .Add("alphaFunction", "LINEAR")
-    .Add("timePeriod", Property::Map()
-         .Add("delay", 0.0f)
-         .Add("duration", 4.0f));
-
-  Dali::Toolkit::TransitionData transition = TransitionData::New( map );
-
-  DummyControl actor = DummyControl::New(true);
+  map["target"]      = "testVisual";
+  map["property"]    = "mixColor";
+  map["targetValue"] = Vector4(1, 1, 1, 0.1);
+  map["animator"]    = Property::Map()
+                      .Add("alphaFunction", "LINEAR")
+                      .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f));
+
+  Dali::Toolkit::TransitionData transition = TransitionData::New(map);
+
+  DummyControl        actor     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index borderColorIndex = renderer.GetPropertyIndex( BorderVisual::Property::COLOR );
-  Property::Index mixColorIndex = renderer.GetPropertyIndex( Visual::Property::MIX_COLOR );
+  Renderer        renderer         = actor.GetRendererAt(0);
+  Property::Index borderColorIndex = renderer.GetPropertyIndex(BorderVisual::Property::COLOR);
+  Property::Index mixColorIndex    = VisualRenderer::Property::VISUAL_MIX_COLOR; //renderer.GetPropertyIndex( Visual::Property::MIX_COLOR );
 
-  Animation animation = dummyImpl.CreateTransition( transition );
+  Animation animation = dummyImpl.CreateTransition(transition);
 
   // Animate the mix color through the transition, and the border color through
   // programmatic method.
-  animation.AnimateTo( Property(renderer, borderColorIndex), Color::WHITE );
+  animation.AnimateTo(Property(renderer, borderColorIndex), Color::WHITE);
   animation.Play();
 
   application.SendNotification();
   application.Render(0);
   application.Render(2000u); // halfway point between blue and white
 
-  Vector4 color = renderer.GetCurrentProperty< Vector4 >( borderColorIndex );
-  Vector4 testColor = (Color::BLUE + Color::WHITE)*0.5f;
-  DALI_TEST_EQUALS( color, testColor, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>("borderColor", testColor ), true, TEST_LOCATION );
+  Vector4 color     = renderer.GetCurrentProperty<Vector4>(borderColorIndex);
+  Vector4 testColor = (Color::BLUE + Color::WHITE) * 0.5f;
+  DALI_TEST_EQUALS(color, testColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderColor", testColor), true, TEST_LOCATION);
 
-  color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex );
-  testColor = Vector4( 1,1,1,0.45f );
-  DALI_TEST_EQUALS( Vector3(color), Vector3(testColor), 0.0001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(testColor) ), true, TEST_LOCATION );
+  color     = renderer.GetCurrentProperty<Vector3>(mixColorIndex);
+  testColor = Vector4(1, 1, 1, 0.45f);
+  DALI_TEST_EQUALS(Vector3(color), Vector3(testColor), 0.0001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(testColor)), true, TEST_LOCATION);
 
   Vector4 uColor;
-  DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", uColor ) );
-  DALI_TEST_EQUALS( uColor.a, testColor.a, TEST_LOCATION );
+  DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", uColor));
+  DALI_TEST_EQUALS(uColor.a, testColor.a, TEST_LOCATION);
 
   application.Render(2000u);
 
-  color = renderer.GetCurrentProperty< Vector4 >( borderColorIndex );
-  DALI_TEST_EQUALS( color, Color::WHITE, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>("borderColor", Color::WHITE ), true, TEST_LOCATION );
+  color = renderer.GetCurrentProperty<Vector4>(borderColorIndex);
+  DALI_TEST_EQUALS(color, Color::WHITE, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderColor", Color::WHITE), true, TEST_LOCATION);
 
-  color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex );
-  testColor = Vector4(1,1,1,0.1);
-  DALI_TEST_EQUALS( Vector3(color), Vector3(testColor), TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(testColor) ), true, TEST_LOCATION );
+  color     = renderer.GetCurrentProperty<Vector3>(mixColorIndex);
+  testColor = Vector4(1, 1, 1, 0.1);
+  DALI_TEST_EQUALS(Vector3(color), Vector3(testColor), TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(testColor)), true, TEST_LOCATION);
 
-  DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", uColor ) );
-  DALI_TEST_EQUALS( uColor.a, testColor.a, TEST_LOCATION );
+  DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Vector4>("uColor", uColor));
+  DALI_TEST_EQUALS(uColor.a, testColor.a, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliVisualAnimateBorderVisual02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimateBorderVisual Size" );
+  tet_infoline("UtcDaliAnimateBorderVisual Size");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("borderSize", Property::Type::FLOAT),
-  };
+    {
+      UniformData("borderSize", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::BORDER);
-  propertyMap.Insert(BorderVisual::Property::COLOR,  Color::BLUE);
-  propertyMap.Insert(BorderVisual::Property::SIZE,  5.f);
-  Visual::Base borderVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER);
+  propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE);
+  propertyMap.Insert(BorderVisual::Property::SIZE, 5.f);
+  Visual::Base borderVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl        actor     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index index = renderer.GetPropertyIndex( BorderVisual::Property::SIZE );
+  Renderer        renderer = actor.GetRendererAt(0);
+  Property::Index index    = renderer.GetPropertyIndex(BorderVisual::Property::SIZE);
 
   Animation animation = Animation::New(4.0f);
-  animation.AnimateTo( Property(renderer, index), 9.0f );
+  animation.AnimateTo(Property(renderer, index), 9.0f);
   animation.Play();
 
   application.SendNotification();
   application.Render(0);
   application.Render(2000u); // halfway point
 
-  float size = renderer.GetCurrentProperty< float >( index );
-  DALI_TEST_EQUALS( size, 7.0f, 0.0001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<float>("borderSize", 7.0f ), true, TEST_LOCATION );
+  float size = renderer.GetCurrentProperty<float>(index);
+  DALI_TEST_EQUALS(size, 7.0f, 0.0001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderSize", 7.0f), true, TEST_LOCATION);
 
   application.Render(2000u); // halfway point between blue and white
 
-  size = renderer.GetCurrentProperty< float >( index );
-  DALI_TEST_EQUALS( size, 9.0f, 0.0001f, TEST_LOCATION );
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<float>("borderSize", 9.0f ), true, TEST_LOCATION );
+  size = renderer.GetCurrentProperty<float>(index);
+  DALI_TEST_EQUALS(size, 9.0f, 0.0001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderSize", 9.0f), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1940,60 +2060,60 @@ int UtcDaliVisualAnimateBorderVisual02(void)
 int UtcDaliVisualAnimateColorVisual(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimateColorVisual mixColor" );
+  tet_infoline("UtcDaliAnimateColorVisual mixColor");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("mixColor", Property::Type::VECTOR3),
-  };
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
   propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
-  Visual::Base borderVisual = factory.CreateVisual( propertyMap );
+  Visual::Base borderVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl        actor     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   application.GetScene().Add(actor);
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
-  Renderer renderer = actor.GetRendererAt(0);
-  Property::Index mixColorIndex = renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
+  Renderer        renderer      = actor.GetRendererAt(0);
+  Property::Index mixColorIndex = VisualRenderer::Property::VISUAL_MIX_COLOR; //renderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR );
 
-  Property::Value blendModeValue = renderer.GetProperty( Renderer::Property::BLEND_MODE );
-  DALI_TEST_EQUALS( blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION );
+  Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+  DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION);
 
   Animation animation = Animation::New(4.0f);
-  animation.AnimateTo( Property(renderer, mixColorIndex), Vector3(Color::WHITE) );
+  animation.AnimateTo(Property(renderer, mixColorIndex), Vector3(Color::WHITE));
   animation.Play();
 
   application.SendNotification();
   application.Render(0);
   application.Render(2000u); // halfway point
 
-  Vector3 color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex );
-  Vector3 testColor = Vector3(Color::BLUE + Color::WHITE)*0.5f;
-  DALI_TEST_EQUALS( color, testColor, TEST_LOCATION );
+  Vector3 color     = renderer.GetCurrentProperty<Vector3>(mixColorIndex);
+  Vector3 testColor = Vector3(Color::BLUE + Color::WHITE) * 0.5f;
+  DALI_TEST_EQUALS(color, testColor, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", testColor ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", testColor), true, TEST_LOCATION);
 
   application.Render(2000u); // halfway point between blue and white
 
-  color = renderer.GetCurrentProperty< Vector3 >( mixColorIndex );
-  DALI_TEST_EQUALS( color, Vector3(Color::WHITE), TEST_LOCATION );
+  color = renderer.GetCurrentProperty<Vector3>(mixColorIndex);
+  DALI_TEST_EQUALS(color, Vector3(Color::WHITE), TEST_LOCATION);
 
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(Color::WHITE) ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(Color::WHITE)), true, TEST_LOCATION);
 
-  blendModeValue = renderer.GetCurrentProperty( Renderer::Property::BLEND_MODE );
-  DALI_TEST_EQUALS( blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION );
+  blendModeValue = renderer.GetCurrentProperty(Renderer::Property::BLEND_MODE);
+  DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2001,12 +2121,12 @@ int UtcDaliVisualAnimateColorVisual(void)
 int UtcDaliVisualAnimatePrimitiveVisual(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatePrimitiveVisual color" );
+  tet_infoline("UtcDaliAnimatePrimitiveVisual color");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("mixColor", Property::Type::VECTOR3),
-  };
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -2014,50 +2134,44 @@ int UtcDaliVisualAnimatePrimitiveVisual(void)
   {
     VisualFactory factory = VisualFactory::Get();
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE,  Visual::PRIMITIVE);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::PRIMITIVE);
     propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE);
     propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Color::BLUE);
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base visual = factory.CreateVisual(propertyMap);
 
-    DummyControl actor = DummyControl::New(true);
+    DummyControl        actor     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-    actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-    actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-    actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+    actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
     application.GetScene().Add(actor);
 
-    DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
     Renderer renderer = actor.GetRendererAt(0);
-    Property::Index index = renderer.GetPropertyIndex( PrimitiveVisual::Property::MIX_COLOR );
-
-    tet_infoline("Test that the renderer has the Primitive mix color");
-    DALI_TEST_CHECK( index != Property::INVALID_INDEX );
 
-    const Vector4 INITIAL_MIX_COLOR( 1.0f,0.0f,1.0f,0.5f ); // Magenta with half alpha
-    const Vector4 TARGET_MIX_COLOR( Color::RED );
+    const Vector4 INITIAL_MIX_COLOR(1.0f, 0.0f, 1.0f, 0.5f); // Magenta with half alpha
+    const Vector4 TARGET_MIX_COLOR(Color::RED);
 
     Property::Map map;
-    map["target"] = "testVisual";
-    map["property"] = "mixColor";
+    map["target"]       = "testVisual";
+    map["property"]     = "mixColor";
     map["initialValue"] = INITIAL_MIX_COLOR;
-    map["targetValue"] = TARGET_MIX_COLOR;
-    map["animator"] = Property::Map()
-      .Add("alphaFunction", "LINEAR")
-      .Add("timePeriod", Property::Map()
-           .Add("delay", 0.0f)
-           .Add("duration", 4.0f));
+    map["targetValue"]  = TARGET_MIX_COLOR;
+    map["animator"]     = Property::Map()
+                        .Add("alphaFunction", "LINEAR")
+                        .Add("timePeriod", Property::Map().Add("delay", 0.0f).Add("duration", 4.0f));
 
-    Dali::Toolkit::TransitionData transition = TransitionData::New( map );
+    Dali::Toolkit::TransitionData transition = TransitionData::New(map);
 
-    Animation animation = dummyImpl.CreateTransition( transition );
-    animation.AnimateTo( Property(actor, Actor::Property::COLOR), Color::WHITE );
+    Animation animation = dummyImpl.CreateTransition(transition);
+    animation.AnimateTo(Property(actor, Actor::Property::COLOR), Color::WHITE);
     animation.Play();
 
     TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-    glAbstraction.EnableEnableDisableCallTrace( true );
-    TraceCallStack& glEnableStack = glAbstraction.GetEnableDisableTrace();
+    glAbstraction.EnableEnableDisableCallTrace(true);
+    TraceCallStack&    glEnableStack = glAbstraction.GetEnableDisableTrace();
     std::ostringstream blendStr;
     blendStr << std::hex << GL_BLEND;
 
@@ -2066,22 +2180,22 @@ int UtcDaliVisualAnimatePrimitiveVisual(void)
     application.Render(2000u); // halfway point
     application.SendNotification();
 
-    Vector4 halfwayColor = (INITIAL_MIX_COLOR + TARGET_MIX_COLOR)*0.5;
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>("uColor", Vector4(0.5f, 0.5f, 0.5f, halfwayColor.a )), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(halfwayColor) ), true, TEST_LOCATION );
+    Vector4 halfwayColor = (INITIAL_MIX_COLOR + TARGET_MIX_COLOR) * 0.5;
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("uColor", Vector4(0.5f, 0.5f, 0.5f, halfwayColor.a)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(halfwayColor)), true, TEST_LOCATION);
 
-    DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Enable", blendStr.str() ) );
+    DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Enable", blendStr.str()));
 
     glEnableStack.Reset();
 
-    application.Render(2001u); // go past end
+    application.Render(2001u);      // go past end
     application.SendNotification(); // Trigger signals
 
-    DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::WHITE, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>("uColor", Vector4( 1.0f, 1.0f, 1.0f, TARGET_MIX_COLOR.a ) ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(TARGET_MIX_COLOR) ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector4>(Actor::Property::COLOR), Color::WHITE, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("uColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_MIX_COLOR.a)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", Vector3(TARGET_MIX_COLOR)), true, TEST_LOCATION);
 
-    DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str() ) );
+    DALI_TEST_CHECK(glEnableStack.FindMethodAndParams("Disable", blendStr.str()));
 
     actor.Unparent();
   }
@@ -2092,18 +2206,18 @@ int UtcDaliVisualAnimatePrimitiveVisual(void)
 int UtcDaliVisualAnimatedGradientVisual01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedGradientVisual with default" );
+  tet_infoline("UtcDaliAnimatedGradientVisual with default");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("start_point", Property::Type::VECTOR2),
-    UniformData("end_point", Property::Type::VECTOR2),
-    UniformData("start_color", Property::Type::VECTOR4),
-    UniformData("end_color", Property::Type::VECTOR4),
-    UniformData("rotate_center", Property::Type::VECTOR2),
-    UniformData("rotate_angle", Property::Type::FLOAT),
-    UniformData("gradient_offset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("start_point", Property::Type::VECTOR2),
+      UniformData("end_point", Property::Type::VECTOR2),
+      UniformData("start_color", Property::Type::VECTOR4),
+      UniformData("end_color", Property::Type::VECTOR4),
+      UniformData("rotate_center", Property::Type::VECTOR2),
+      UniformData("rotate_angle", Property::Type::FLOAT),
+      UniformData("gradient_offset", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -2111,22 +2225,22 @@ int UtcDaliVisualAnimatedGradientVisual01(void)
   {
     VisualFactory factory = VisualFactory::Get();
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE,  DevelVisual::ANIMATED_GRADIENT);
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT);
+    Visual::Base visual = factory.CreateVisual(propertyMap);
 
-    DummyControl actor = DummyControl::New(true);
+    DummyControl        actor     = DummyControl::New(true);
     Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-    actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-    actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-    actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+    actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
     application.GetScene().Add(actor);
 
     application.SendNotification();
     application.Render(0);
     application.SendNotification();
 
-    DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
     for(int step_iter = 0; step_iter < 3; step_iter++)
     {
@@ -2135,13 +2249,13 @@ int UtcDaliVisualAnimatedGradientVisual01(void)
       application.Render(750u); // step i/4
       application.SendNotification();
 
-      DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector2>( "start_point"  , Vector2( -0.5f, 0.0f ) ), true, TEST_LOCATION );
-      DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector2>( "end_point"    , Vector2( 0.5f, 0.0f ) ), true, TEST_LOCATION );
-      DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>( "start_color"  , Vector4( 143.0f, 170.0f, 220.0f, 255.0f ) / 255.0f ), true, TEST_LOCATION );
-      DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector4>( "end_color"    , Vector4( 255.0f, 163.0f, 163.0f, 255.0f ) / 255.0f ), true, TEST_LOCATION );
-      DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector2>( "rotate_center", Vector2( 0.0f, 0.0f ) ), true, TEST_LOCATION );
-      DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<float>( "rotate_angle"   , 0.0f ), true, TEST_LOCATION );
-      DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<float>( "gradient_offset", 0.5f * step_iter + 0.5f ), true, TEST_LOCATION );
+      DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector2>("start_point", Vector2(-0.5f, 0.0f)), true, TEST_LOCATION);
+      DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector2>("end_point", Vector2(0.5f, 0.0f)), true, TEST_LOCATION);
+      DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("start_color", Vector4(143.0f, 170.0f, 220.0f, 255.0f) / 255.0f), true, TEST_LOCATION);
+      DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("end_color", Vector4(255.0f, 163.0f, 163.0f, 255.0f) / 255.0f), true, TEST_LOCATION);
+      DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector2>("rotate_center", Vector2(0.0f, 0.0f)), true, TEST_LOCATION);
+      DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("rotate_angle", 0.0f), true, TEST_LOCATION);
+      DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("gradient_offset", 0.5f * step_iter + 0.5f), true, TEST_LOCATION);
     }
 
     //Not check here. cause gradient_offset value can be 2.0f or 0.0f
@@ -2163,71 +2277,75 @@ int UtcDaliVisualAnimatedGradientVisual01(void)
 int UtcDaliVisualAnimatedGradientVisual02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedGradientVisual with full-option" );
+  tet_infoline("UtcDaliAnimatedGradientVisual with full-option");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("start_point", Property::Type::VECTOR2),
-    UniformData("end_point", Property::Type::VECTOR2),
-    UniformData("start_color", Property::Type::VECTOR4),
-    UniformData("end_color", Property::Type::VECTOR4),
-    UniformData("rotate_center", Property::Type::VECTOR2),
-    UniformData("rotate_angle", Property::Type::FLOAT),
-    UniformData("gradient_offset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("start_point", Property::Type::VECTOR2),
+      UniformData("end_point", Property::Type::VECTOR2),
+      UniformData("start_color", Property::Type::VECTOR4),
+      UniformData("end_color", Property::Type::VECTOR4),
+      UniformData("rotate_center", Property::Type::VECTOR2),
+      UniformData("rotate_angle", Property::Type::FLOAT),
+      UniformData("gradient_offset", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   {
-    float _delay[4] = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f
-    int _direction[2] = {0, 1};
-    int _loop_count[3] = {-1, 0, 1};
-    int _motion[2] = {0, 1};
-    int _easing[4] = {0, 1, 2, 3};
+    float _delay[4]      = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f
+    int   _direction[2]  = {0, 1};
+    int   _loop_count[3] = {-1, 0, 1};
+    int   _motion[2]     = {0, 1};
+    int   _easing[4]     = {0, 1, 2, 3};
 
     int test_case_max = 4 * 2 * 3 * 2 * 4;
-    int test_case = 0;
-    int test_case_d = 7; // 7 is the number of animated properties.
+    int test_case     = 0;
+    int test_case_d   = 7; // 7 is the number of animated properties.
 
-    float _duration = 0.4f;
+    float _duration     = 0.4f;
     float _repeat_delay = _duration * 0.25f; // < _duration. cause real_duration = _duration - _repeat_delay;
-    float noise_maker = 0.0f;
+    float noise_maker   = 0.0f;
     // total testing time = ceil((4*2*3*2*4) / 7) * (_duration(=0.4) * 2 + 0.01) = 22.68 seconds
-    for( test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d )
+    for(test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d)
     {
-      tet_printf( "test [%d ~ %d / %d]\n" , test_case, test_case + test_case_d - 1, test_case_max);
+      tet_printf("test [%d ~ %d / %d]\n", test_case, test_case + test_case_d - 1, test_case_max);
 
       VisualFactory factory = VisualFactory::Get();
       Property::Map propertyMap;
       Property::Map animationMap;
-      propertyMap.Insert(Visual::Property::TYPE,  DevelVisual::ANIMATED_GRADIENT);
+      propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT);
 
       int gradient_type = DevelAnimatedGradientVisual::GradientType::LINEAR;
-      int unit_type = DevelAnimatedGradientVisual::UnitType::USER_SPACE;
-      int spread_type = DevelAnimatedGradientVisual::SpreadType::REPEAT;
-
-      auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value &start, const Property::Value &target, int tc_offset)->Property::Map&
-      {
-        int tc = (test_case + tc_offset);
-        int idx_easing = tc % 4; tc /= 4;
-        int idx_motion = tc % 2; tc /= 2;
-        int idx_loop_count = tc % 3; tc /= 3;
-        int idx_direction = tc % 2; tc /= 2;
-        int idx_delay = tc % 4; tc /= 4;
-
-        float duration = _duration - _repeat_delay;
+      int unit_type     = DevelAnimatedGradientVisual::UnitType::USER_SPACE;
+      int spread_type   = DevelAnimatedGradientVisual::SpreadType::REPEAT;
+
+      auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value& start, const Property::Value& target, int tc_offset) -> Property::Map& {
+        int tc         = (test_case + tc_offset);
+        int idx_easing = tc % 4;
+        tc /= 4;
+        int idx_motion = tc % 2;
+        tc /= 2;
+        int idx_loop_count = tc % 3;
+        tc /= 3;
+        int idx_direction = tc % 2;
+        tc /= 2;
+        int idx_delay = tc % 4;
+        tc /= 4;
+
+        float duration     = _duration - _repeat_delay;
         float repeat_delay = _repeat_delay;
-        float delay = _delay[idx_delay] * _duration;
-        int direction = _direction[idx_direction];
-        int loop_count = _loop_count[idx_loop_count];
-        int motion = _motion[idx_motion];
-        int easing = _easing[idx_easing];
+        float delay        = _delay[idx_delay] * _duration;
+        int   direction    = _direction[idx_direction];
+        int   loop_count   = _loop_count[idx_loop_count];
+        int   motion       = _motion[idx_motion];
+        int   easing       = _easing[idx_easing];
 
         animationMap.Clear();
-        animationMap.Insert( DevelAnimatedGradientVisual::AnimationParameter::Property::START, start );
-        animationMap.Insert( DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target );
-        if( direction == 0 )
+        animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::START, start);
+        animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::TARGET, target);
+        if(direction == 0)
         {
           animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DIRECTION, DevelAnimatedGradientVisual::AnimationParameter::DirectionType::FORWARD);
         }
@@ -2239,7 +2357,7 @@ int UtcDaliVisualAnimatedGradientVisual02(void)
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::DELAY, delay);
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT, loop_count);
         animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::REPEAT_DELAY, repeat_delay);
-        if( motion == 0 )
+        if(motion == 0)
         {
           animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE, DevelAnimatedGradientVisual::AnimationParameter::MotionType::LOOP);
         }
@@ -2247,15 +2365,15 @@ int UtcDaliVisualAnimatedGradientVisual02(void)
         {
           animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::MOTION_TYPE, DevelAnimatedGradientVisual::AnimationParameter::MotionType::MIRROR);
         }
-        if( easing == 0 )
+        if(easing == 0)
         {
           animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE, DevelAnimatedGradientVisual::AnimationParameter::EasingType::LINEAR);
         }
-        else if( easing == 1 )
+        else if(easing == 1)
         {
           animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE, DevelAnimatedGradientVisual::AnimationParameter::EasingType::IN);
         }
-        else if( easing == 2 )
+        else if(easing == 2)
         {
           animationMap.Insert(DevelAnimatedGradientVisual::AnimationParameter::Property::EASING_TYPE, DevelAnimatedGradientVisual::AnimationParameter::EasingType::OUT);
         }
@@ -2270,173 +2388,177 @@ int UtcDaliVisualAnimatedGradientVisual02(void)
       // Give different values for debuging
       noise_maker += 1.0f;
       Vector2 start1(-0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f);
-      Vector2 end1  (0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f);
+      Vector2 end1(0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f);
       Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f);
-      Vector4 end_color1  (0.7f, 0.5f, 1.0f, 1.0f);
+      Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f);
       Vector2 rotate_center1(0.0f + noise_maker * 0.1f, 0.4f + noise_maker * 0.1f);
-      float rotate_amount1 = 0.0f + noise_maker * 0.1f;
-      float offset1 = 0.f + noise_maker * 0.1f;
+      float   rotate_amount1 = 0.0f + noise_maker * 0.1f;
+      float   offset1        = 0.f + noise_maker * 0.1f;
 
       Vector2 start2(0.2f + noise_maker * 0.1f, -0.7f + noise_maker * 0.1f);
-      Vector2 end2  (0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f);
+      Vector2 end2(0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f);
       Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f);
-      Vector4 end_color2  (0.3f, 1.0f, 0.1f, 0.0f);
+      Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f);
       Vector2 rotate_center2(0.0f + noise_maker * 0.1f, -0.4f + noise_maker * 0.1f);
-      float rotate_amount2 = 7.0f + noise_maker * 0.1f;
-      float offset2 = 2.f + noise_maker * 0.1f;
+      float   rotate_amount2 = 7.0f + noise_maker * 0.1f;
+      float   offset2        = 2.f + noise_maker * 0.1f;
 
       propertyMap.Insert(DevelAnimatedGradientVisual::Property::GRADIENT_TYPE, gradient_type);
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE,     unit_type);
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE,   spread_type);
-
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1        , start2        ,0));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION,   buildAnimatedMap(end1          , end2          ,1));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR,    buildAnimatedMap(start_color1  , start_color2  ,2));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR,      buildAnimatedMap(end_color1    , end_color2    ,3));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER,  buildAnimatedMap(rotate_center1, rotate_center2,4));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT,  buildAnimatedMap(rotate_amount1, rotate_amount2,5));
-      propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET,         buildAnimatedMap(offset1       , offset2       ,6));
-
-      Visual::Base visual = factory.CreateVisual( propertyMap );
-
-      DummyControl actor = DummyControl::New( true );
-      Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>( actor.GetImplementation() );
-      dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-      actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-      actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-      actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::UNIT_TYPE, unit_type);
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::SPREAD_TYPE, spread_type);
+
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_POSITION, buildAnimatedMap(start1, start2, 0));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_POSITION, buildAnimatedMap(end1, end2, 1));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::START_COLOR, buildAnimatedMap(start_color1, start_color2, 2));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::END_COLOR, buildAnimatedMap(end_color1, end_color2, 3));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_CENTER, buildAnimatedMap(rotate_center1, rotate_center2, 4));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, buildAnimatedMap(rotate_amount1, rotate_amount2, 5));
+      propertyMap.Insert(DevelAnimatedGradientVisual::Property::OFFSET, buildAnimatedMap(offset1, offset2, 6));
+
+      Visual::Base visual = factory.CreateVisual(propertyMap);
+
+      DummyControl        actor     = DummyControl::New(true);
+      Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+      dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+      actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+      actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+      actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
       application.GetScene().Add(actor);
 
       application.SendNotification();
-      application.Render( 0 );
+      application.Render(0);
       application.SendNotification();
 
-      DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+      DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
       application.SendNotification();
 
       //Compare between CPU calculated value and Shader Visual calculated value
-      auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress)->void
-      {
-        int tc = (test_case + tc_offset);
-        int idx_easing = tc % 4; tc /= 4;
-        int idx_motion = tc % 2; tc /= 2;
-        int idx_loop_count = tc % 3; tc /= 3;
-        int idx_direction = tc % 2; tc /= 2;
-        int idx_delay = tc % 4; tc /= 4;
-
-        float duration = _duration - _repeat_delay;
+      auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress) -> void {
+        int tc         = (test_case + tc_offset);
+        int idx_easing = tc % 4;
+        tc /= 4;
+        int idx_motion = tc % 2;
+        tc /= 2;
+        int idx_loop_count = tc % 3;
+        tc /= 3;
+        int idx_direction = tc % 2;
+        tc /= 2;
+        int idx_delay = tc % 4;
+        tc /= 4;
+
+        float duration     = _duration - _repeat_delay;
         float repeat_delay = _repeat_delay;
-        float delay = _delay[idx_delay] * _duration;
-        int direction = _direction[idx_direction];
-        int loop_count = _loop_count[idx_loop_count];
-        int motion = _motion[idx_motion];
-        int easing = _easing[idx_easing];
+        float delay        = _delay[idx_delay] * _duration;
+        int   direction    = _direction[idx_direction];
+        int   loop_count   = _loop_count[idx_loop_count];
+        int   motion       = _motion[idx_motion];
+        int   easing       = _easing[idx_easing];
 
         progress -= delay / _duration;
 
         Property::Value s = start;
         Property::Value t = target;
-        if( direction == 1 )
+        if(direction == 1)
         {
           s = target;
           t = start;
         }
         float x; ///< Animator progress value
-        if( loop_count == 0 )
+        if(loop_count == 0)
         {
           x = 1.0f;
         }
-        else if( loop_count > 0 && progress + 0.01f > loop_count )
+        else if(loop_count > 0 && progress + 0.01f > loop_count)
         {
-          x = ( motion == 0 ) ? 1.0f : 0.0f;
+          x = (motion == 0) ? 1.0f : 0.0f;
         }
         else
         {
-          if( progress < 0.0f )
+          if(progress < 0.0f)
           {
             progress = 0.0f;
           }
-          progress = fmodf( progress, 1.0f );
-          progress = Dali::Clamp( (progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f );
+          progress = fmodf(progress, 1.0f);
+          progress = Dali::Clamp((progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f);
 
           x = progress;
-          if( motion == 1 )
+          if(motion == 1)
           {
             x = progress * 2.0f;
-            if( x > 1.0f )
+            if(x > 1.0f)
             {
               x = 2.0f - x;
             }
           }
 
-          if( easing == 1 ) // EASE_IN
+          if(easing == 1) // EASE_IN
           {
-            x = x*x;
+            x = x * x;
           }
-          else if( easing == 2 ) // EASE_OUT
+          else if(easing == 2) // EASE_OUT
           {
-            x = 2.0f*x - x*x;
+            x = 2.0f * x - x * x;
           }
-          else if( easing == 3 ) // EASE_IN_OUT
+          else if(easing == 3) // EASE_IN_OUT
           {
             x = x * x * (3.0f - 2.0f * x);
           }
         }
-        if( value_type == 0 ) // result type is Float
+        if(value_type == 0) // result type is Float
         {
           float res;
           float cur;
           res = s.Get<float>() * (1.0f - x) + t.Get<float>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<float>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<float>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
-        else if( value_type == 1 ) // result type is Vector2
+        else if(value_type == 1) // result type is Vector2
         {
           Vector2 res;
           Vector2 cur;
           res = s.Get<Vector2>() * (1.0f - x) + t.Get<Vector2>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<Vector2>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<Vector2>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
-        else if( value_type == 2 ) // result type is Vector3
+        else if(value_type == 2) // result type is Vector3
         {
           Vector3 res;
           Vector3 cur;
           res = s.Get<Vector3>() * (1.0f - x) + t.Get<Vector3>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<Vector3>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<Vector3>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
         else // result type is Vector4
         {
           Vector4 res;
           Vector4 cur;
           res = s.Get<Vector4>() * (1.0f - x) + t.Get<Vector4>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<Vector4>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<Vector4>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
       };
 
       float step = 0.0f;
-      for( int iter = 0; iter < 2; iter++ ) // test 2*duration seconds
+      for(int iter = 0; iter < 2; iter++) // test 2*duration seconds
       {
-        for( int step_iter = 0; step_iter < 3; step_iter++ )
+        for(int step_iter = 0; step_iter < 3; step_iter++)
         {
           application.SendNotification();
-          application.Render( _duration * 250.f );  // step i/4
+          application.Render(_duration * 250.f); // step i/4
           application.SendNotification();
           step += 0.25f;
 
-          testProperty( "start_point"    , Property::Value( start1 )        , Property::Value( start2 )        , 0, 1, step );
-          testProperty( "end_point"      , Property::Value( end1 )          , Property::Value( end2 )          , 1, 1, step );
-          testProperty( "start_color"    , Property::Value( start_color1 )  , Property::Value( start_color2 )  , 2, 3, step );
-          testProperty( "end_color"      , Property::Value( end_color1 )    , Property::Value( end_color2 )    , 3, 3, step );
-          testProperty( "rotate_center"  , Property::Value( rotate_center1 ), Property::Value( rotate_center2 ), 4, 1, step );
-          testProperty( "rotate_angle"   , Property::Value( rotate_amount1 ), Property::Value( rotate_amount2 ), 5, 0, step );
-          testProperty( "gradient_offset", Property::Value( offset1 )       , Property::Value( offset2 )       , 6, 0, step );
+          testProperty("start_point", Property::Value(start1), Property::Value(start2), 0, 1, step);
+          testProperty("end_point", Property::Value(end1), Property::Value(end2), 1, 1, step);
+          testProperty("start_color", Property::Value(start_color1), Property::Value(start_color2), 2, 3, step);
+          testProperty("end_color", Property::Value(end_color1), Property::Value(end_color2), 3, 3, step);
+          testProperty("rotate_center", Property::Value(rotate_center1), Property::Value(rotate_center2), 4, 1, step);
+          testProperty("rotate_angle", Property::Value(rotate_amount1), Property::Value(rotate_amount2), 5, 0, step);
+          testProperty("gradient_offset", Property::Value(offset1), Property::Value(offset2), 6, 0, step);
         }
         application.SendNotification();
-        application.Render(_duration * 250.f);  // step 4/4 will not test
+        application.Render(_duration * 250.f); // step 4/4 will not test
         application.SendNotification();
         step += 0.25f;
       }
@@ -2444,7 +2566,7 @@ int UtcDaliVisualAnimatedGradientVisual02(void)
       application.SendNotification();
       actor.Unparent();
       application.SendNotification();
-      application.Render(10.f);  // tempral time
+      application.Render(10.f); // tempral time
       application.SendNotification();
     }
   }
@@ -2455,67 +2577,71 @@ int UtcDaliVisualAnimatedGradientVisual02(void)
 int UtcDaliVisualAnimatedGradientVisual03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedGradientVisual with full-option use string key" );
+  tet_infoline("UtcDaliAnimatedGradientVisual with full-option use string key");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("start_point", Property::Type::VECTOR2),
-    UniformData("end_point", Property::Type::VECTOR2),
-    UniformData("start_color", Property::Type::VECTOR4),
-    UniformData("end_color", Property::Type::VECTOR4),
-    UniformData("rotate_center", Property::Type::VECTOR2),
-    UniformData("rotate_angle", Property::Type::FLOAT),
-    UniformData("gradient_offset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("start_point", Property::Type::VECTOR2),
+      UniformData("end_point", Property::Type::VECTOR2),
+      UniformData("start_color", Property::Type::VECTOR4),
+      UniformData("end_color", Property::Type::VECTOR4),
+      UniformData("rotate_center", Property::Type::VECTOR2),
+      UniformData("rotate_angle", Property::Type::FLOAT),
+      UniformData("gradient_offset", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   {
-    float _delay[4] = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f
-    int _direction[2] = {0, 1};
-    int _loop_count[3] = {-1, 0, 1};
-    int _motion[2] = {0, 1};
-    int _easing[4] = {0, 1, 2, 3};
+    float _delay[4]      = {0.0f, -1.35f, 0.15f, -0.4f}; // fract(_delay) must NOT be 1/4, 2/4, 3/4. cause we don't know progress is 1.0f or 0.0f
+    int   _direction[2]  = {0, 1};
+    int   _loop_count[3] = {-1, 0, 1};
+    int   _motion[2]     = {0, 1};
+    int   _easing[4]     = {0, 1, 2, 3};
 
     int test_case_max = 4 * 2 * 3 * 2 * 4;
-    int test_case = 0;
-    int test_case_d = 7; // 7 is the number of animated properties.
+    int test_case     = 0;
+    int test_case_d   = 7; // 7 is the number of animated properties.
 
-    float _duration = 0.4f;
+    float _duration     = 0.4f;
     float _repeat_delay = _duration * 0.25f; // < _duration. cause real_duration = _duration - _repeat_delay;
-    float noise_maker = 0.2f;
+    float noise_maker   = 0.2f;
     // total testing time = ceil((4*2*3*2*4) / 7) * (_duration(=0.4) * 2 + 0.01) = 22.68 seconds
-    for( test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d )
+    for(test_case = 0; test_case < test_case_max + test_case_d; test_case += test_case_d)
     {
-      tet_printf( "test [%d ~ %d / %d]\n" , test_case, test_case + test_case_d - 1, test_case_max);
+      tet_printf("test [%d ~ %d / %d]\n", test_case, test_case + test_case_d - 1, test_case_max);
 
       VisualFactory factory = VisualFactory::Get();
       Property::Map propertyMap;
       Property::Map animationMap;
-      propertyMap.Insert(Visual::Property::TYPE,  DevelVisual::ANIMATED_GRADIENT);
-
-      auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value &start, const Property::Value &target, int tc_offset)->Property::Map&
-      {
-        int tc = (test_case + tc_offset);
-        int idx_easing = tc % 4; tc /= 4;
-        int idx_motion = tc % 2; tc /= 2;
-        int idx_loop_count = tc % 3; tc /= 3;
-        int idx_direction = tc % 2; tc /= 2;
-        int idx_delay = tc % 4; tc /= 4;
-
-        float duration = _duration - _repeat_delay;
+      propertyMap.Insert(Visual::Property::TYPE, DevelVisual::ANIMATED_GRADIENT);
+
+      auto buildAnimatedMap = [&animationMap, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const Property::Value& start, const Property::Value& target, int tc_offset) -> Property::Map& {
+        int tc         = (test_case + tc_offset);
+        int idx_easing = tc % 4;
+        tc /= 4;
+        int idx_motion = tc % 2;
+        tc /= 2;
+        int idx_loop_count = tc % 3;
+        tc /= 3;
+        int idx_direction = tc % 2;
+        tc /= 2;
+        int idx_delay = tc % 4;
+        tc /= 4;
+
+        float duration     = _duration - _repeat_delay;
         float repeat_delay = _repeat_delay;
-        float delay = _delay[idx_delay] * _duration;
-        int direction = _direction[idx_direction];
-        int loop_count = _loop_count[idx_loop_count];
-        int motion = _motion[idx_motion];
-        int easing = _easing[idx_easing];
+        float delay        = _delay[idx_delay] * _duration;
+        int   direction    = _direction[idx_direction];
+        int   loop_count   = _loop_count[idx_loop_count];
+        int   motion       = _motion[idx_motion];
+        int   easing       = _easing[idx_easing];
 
         animationMap.Clear();
-        animationMap.Insert( "startValue", start );
-        animationMap.Insert( "targetValue", target );
-        if( direction == 0 )
+        animationMap.Insert("startValue", start);
+        animationMap.Insert("targetValue", target);
+        if(direction == 0)
         {
           animationMap.Insert("directionType", "FORWARD");
         }
@@ -2527,7 +2653,7 @@ int UtcDaliVisualAnimatedGradientVisual03(void)
         animationMap.Insert("delay", delay);
         animationMap.Insert("repeat", loop_count);
         animationMap.Insert("repeatDelay", repeat_delay);
-        if( motion == 0 )
+        if(motion == 0)
         {
           animationMap.Insert("motionType", "LOOP");
         }
@@ -2535,15 +2661,15 @@ int UtcDaliVisualAnimatedGradientVisual03(void)
         {
           animationMap.Insert("motionType", "MIRROR");
         }
-        if( easing == 0 )
+        if(easing == 0)
         {
           animationMap.Insert("easingType", "LINEAR");
         }
-        else if( easing == 1 )
+        else if(easing == 1)
         {
           animationMap.Insert("easingType", "IN");
         }
-        else if( easing == 2 )
+        else if(easing == 2)
         {
           animationMap.Insert("easingType", "OUT");
         }
@@ -2558,173 +2684,177 @@ int UtcDaliVisualAnimatedGradientVisual03(void)
       // Give different values for debuging
       noise_maker += 0.8f;
       Vector2 start1(-0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f);
-      Vector2 end1  (0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f);
+      Vector2 end1(0.5f + noise_maker * 0.1f, -0.5f + noise_maker * 0.1f);
       Vector4 start_color1(1.0f, 0.7f, 0.5f, 1.0f);
-      Vector4 end_color1  (0.7f, 0.5f, 1.0f, 1.0f);
+      Vector4 end_color1(0.7f, 0.5f, 1.0f, 1.0f);
       Vector2 rotate_center1(0.0f + noise_maker * 0.1f, 0.4f + noise_maker * 0.1f);
-      float rotate_amount1 = 0.0f + noise_maker * 0.1f;
-      float offset1 = 0.f + noise_maker * 0.1f;
+      float   rotate_amount1 = 0.0f + noise_maker * 0.1f;
+      float   offset1        = 0.f + noise_maker * 0.1f;
 
       Vector2 start2(0.2f + noise_maker * 0.1f, -0.7f + noise_maker * 0.1f);
-      Vector2 end2  (0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f);
+      Vector2 end2(0.5f + noise_maker * 0.1f, 0.5f + noise_maker * 0.1f);
       Vector4 start_color2(0.0f, 0.1f, 0.8f, 1.0f);
-      Vector4 end_color2  (0.3f, 1.0f, 0.1f, 0.0f);
+      Vector4 end_color2(0.3f, 1.0f, 0.1f, 0.0f);
       Vector2 rotate_center2(0.0f + noise_maker * 0.1f, -0.4f + noise_maker * 0.1f);
-      float rotate_amount2 = 7.0f + noise_maker * 0.1f;
-      float offset2 = 2.f + noise_maker * 0.1f;
+      float   rotate_amount2 = 7.0f + noise_maker * 0.1f;
+      float   offset2        = 2.f + noise_maker * 0.1f;
 
       propertyMap.Insert("gradientType", "LINEAR");
-      propertyMap.Insert("unitType",     "USER_SPACE");
-      propertyMap.Insert("spreadType",   "CLAMP");
-
-      propertyMap.Insert("startPosition", buildAnimatedMap(start1        , start2        ,0));
-      propertyMap.Insert("endPosition",   buildAnimatedMap(end1          , end2          ,1));
-      propertyMap.Insert("startColor",    buildAnimatedMap(start_color1  , start_color2  ,2));
-      propertyMap.Insert("endColor",      buildAnimatedMap(end_color1    , end_color2    ,3));
-      propertyMap.Insert("rotateCenter",  buildAnimatedMap(rotate_center1, rotate_center2,4));
-      propertyMap.Insert("rotateAmount",  buildAnimatedMap(rotate_amount1, rotate_amount2,5));
-      propertyMap.Insert("offset",        buildAnimatedMap(offset1       , offset2       ,6));
-
-      Visual::Base visual = factory.CreateVisual( propertyMap );
-
-      DummyControl actor = DummyControl::New( true );
-      Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>( actor.GetImplementation() );
-      dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-      actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-      actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-      actor.SetProperty( Actor::Property::COLOR,Color::BLACK);
+      propertyMap.Insert("unitType", "USER_SPACE");
+      propertyMap.Insert("spreadType", "CLAMP");
+
+      propertyMap.Insert("startPosition", buildAnimatedMap(start1, start2, 0));
+      propertyMap.Insert("endPosition", buildAnimatedMap(end1, end2, 1));
+      propertyMap.Insert("startColor", buildAnimatedMap(start_color1, start_color2, 2));
+      propertyMap.Insert("endColor", buildAnimatedMap(end_color1, end_color2, 3));
+      propertyMap.Insert("rotateCenter", buildAnimatedMap(rotate_center1, rotate_center2, 4));
+      propertyMap.Insert("rotateAmount", buildAnimatedMap(rotate_amount1, rotate_amount2, 5));
+      propertyMap.Insert("offset", buildAnimatedMap(offset1, offset2, 6));
+
+      Visual::Base visual = factory.CreateVisual(propertyMap);
+
+      DummyControl        actor     = DummyControl::New(true);
+      Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+      dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+      actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+      actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+      actor.SetProperty(Actor::Property::COLOR, Color::BLACK);
       application.GetScene().Add(actor);
 
       application.SendNotification();
-      application.Render( 0 );
+      application.Render(0);
       application.SendNotification();
 
-      DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
+      DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
       application.SendNotification();
 
       //Compare between CPU calculated value and Shader Visual calculated value
-      auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress)->void
-      {
-        int tc = (test_case + tc_offset);
-        int idx_easing = tc % 4; tc /= 4;
-        int idx_motion = tc % 2; tc /= 2;
-        int idx_loop_count = tc % 3; tc /= 3;
-        int idx_direction = tc % 2; tc /= 2;
-        int idx_delay = tc % 4; tc /= 4;
-
-        float duration = _duration - _repeat_delay;
+      auto testProperty = [&application, &_direction, &_duration, &_delay, &_loop_count, &_repeat_delay, &_motion, &_easing, &test_case](const char* name, const Property::Value& start, const Property::Value& target, int tc_offset, int value_type, float progress) -> void {
+        int tc         = (test_case + tc_offset);
+        int idx_easing = tc % 4;
+        tc /= 4;
+        int idx_motion = tc % 2;
+        tc /= 2;
+        int idx_loop_count = tc % 3;
+        tc /= 3;
+        int idx_direction = tc % 2;
+        tc /= 2;
+        int idx_delay = tc % 4;
+        tc /= 4;
+
+        float duration     = _duration - _repeat_delay;
         float repeat_delay = _repeat_delay;
-        float delay = _delay[idx_delay] * _duration;
-        int direction = _direction[idx_direction];
-        int loop_count = _loop_count[idx_loop_count];
-        int motion = _motion[idx_motion];
-        int easing = _easing[idx_easing];
+        float delay        = _delay[idx_delay] * _duration;
+        int   direction    = _direction[idx_direction];
+        int   loop_count   = _loop_count[idx_loop_count];
+        int   motion       = _motion[idx_motion];
+        int   easing       = _easing[idx_easing];
 
         progress -= delay / _duration;
 
         Property::Value s = start;
         Property::Value t = target;
-        if( direction == 1 )
+        if(direction == 1)
         {
           s = target;
           t = start;
         }
         float x; ///< Animator progress value
-        if( loop_count == 0 )
+        if(loop_count == 0)
         {
           x = 1.0f;
         }
-        else if( loop_count > 0 && progress + 0.01f > loop_count )
+        else if(loop_count > 0 && progress + 0.01f > loop_count)
         {
-          x = ( motion == 0 ) ? 1.0f : 0.0f;
+          x = (motion == 0) ? 1.0f : 0.0f;
         }
         else
         {
-          if( progress < 0.0f )
+          if(progress < 0.0f)
           {
             progress = 0.0f;
           }
-          progress = fmodf( progress, 1.0f );
-          progress = Dali::Clamp( (progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f );
+          progress = fmodf(progress, 1.0f);
+          progress = Dali::Clamp((progress * (duration + repeat_delay) - repeat_delay) / duration, 0.0f, 1.0f);
 
           x = progress;
-          if( motion == 1 )
+          if(motion == 1)
           {
             x = progress * 2.0f;
-            if( x > 1.0f )
+            if(x > 1.0f)
             {
               x = 2.0f - x;
             }
           }
 
-          if( easing == 1 ) // EASE_IN
+          if(easing == 1) // EASE_IN
           {
-            x = x*x;
+            x = x * x;
           }
-          else if( easing == 2 ) // EASE_OUT
+          else if(easing == 2) // EASE_OUT
           {
-            x = 2.0f*x - x*x;
+            x = 2.0f * x - x * x;
           }
-          else if( easing == 3 ) // EASE_IN_OUT
+          else if(easing == 3) // EASE_IN_OUT
           {
             x = x * x * (3.0f - 2.0f * x);
           }
         }
-        if( value_type == 0 ) // result type is Float
+        if(value_type == 0) // result type is Float
         {
           float res;
           float cur;
           res = s.Get<float>() * (1.0f - x) + t.Get<float>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<float>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<float>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
-        else if( value_type == 1 ) // result type is Vector2
+        else if(value_type == 1) // result type is Vector2
         {
           Vector2 res;
           Vector2 cur;
           res = s.Get<Vector2>() * (1.0f - x) + t.Get<Vector2>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<Vector2>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<Vector2>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
-        else if( value_type == 2 ) // result type is Vector3
+        else if(value_type == 2) // result type is Vector3
         {
           Vector3 res;
           Vector3 cur;
           res = s.Get<Vector3>() * (1.0f - x) + t.Get<Vector3>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<Vector3>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<Vector3>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
         else // result type is Vector4
         {
           Vector4 res;
           Vector4 cur;
           res = s.Get<Vector4>() * (1.0f - x) + t.Get<Vector4>() * (x);
-          DALI_TEST_EQUALS( application.GetGlAbstraction().GetUniformValue<Vector4>(name, cur), true, TEST_LOCATION );
-          DALI_TEST_EQUALS( res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+          DALI_TEST_EQUALS(application.GetGlAbstraction().GetUniformValue<Vector4>(name, cur), true, TEST_LOCATION);
+          DALI_TEST_EQUALS(res, cur, Math::MACHINE_EPSILON_100, TEST_LOCATION);
         }
       };
 
       float step = 0.0f;
-      for( int iter = 0; iter < 2; iter++ ) // test 2*duration seconds
+      for(int iter = 0; iter < 2; iter++) // test 2*duration seconds
       {
-        for( int step_iter = 0; step_iter < 3; step_iter++ )
+        for(int step_iter = 0; step_iter < 3; step_iter++)
         {
           application.SendNotification();
-          application.Render( _duration * 250.f );  // step i/4
+          application.Render(_duration * 250.f); // step i/4
           application.SendNotification();
           step += 0.25f;
 
-          testProperty( "start_point"    , Property::Value( start1 )        , Property::Value( start2 )        , 0, 1, step );
-          testProperty( "end_point"      , Property::Value( end1 )          , Property::Value( end2 )          , 1, 1, step );
-          testProperty( "start_color"    , Property::Value( start_color1 )  , Property::Value( start_color2 )  , 2, 3, step );
-          testProperty( "end_color"      , Property::Value( end_color1 )    , Property::Value( end_color2 )    , 3, 3, step );
-          testProperty( "rotate_center"  , Property::Value( rotate_center1 ), Property::Value( rotate_center2 ), 4, 1, step );
-          testProperty( "rotate_angle"   , Property::Value( rotate_amount1 ), Property::Value( rotate_amount2 ), 5, 0, step );
-          testProperty( "gradient_offset", Property::Value( offset1 )       , Property::Value( offset2 )       , 6, 0, step );
+          testProperty("start_point", Property::Value(start1), Property::Value(start2), 0, 1, step);
+          testProperty("end_point", Property::Value(end1), Property::Value(end2), 1, 1, step);
+          testProperty("start_color", Property::Value(start_color1), Property::Value(start_color2), 2, 3, step);
+          testProperty("end_color", Property::Value(end_color1), Property::Value(end_color2), 3, 3, step);
+          testProperty("rotate_center", Property::Value(rotate_center1), Property::Value(rotate_center2), 4, 1, step);
+          testProperty("rotate_angle", Property::Value(rotate_amount1), Property::Value(rotate_amount2), 5, 0, step);
+          testProperty("gradient_offset", Property::Value(offset1), Property::Value(offset2), 6, 0, step);
         }
         application.SendNotification();
-        application.Render(_duration * 250.f);  // step 4/4 will not test
+        application.Render(_duration * 250.f); // step 4/4 will not test
         application.SendNotification();
         step += 0.25f;
       }
@@ -2732,7 +2862,7 @@ int UtcDaliVisualAnimatedGradientVisual03(void)
       application.SendNotification();
       actor.Unparent();
       application.SendNotification();
-      application.Render(10.f);  // tempral time
+      application.Render(10.f); // tempral time
       application.SendNotification();
     }
   }
@@ -2746,20 +2876,20 @@ int UtcDaliVisualWireframeVisual(void)
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::WIREFRAME );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::WIREFRAME);
 
   // Create the visual.
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
-  DALI_TEST_CHECK( visual );
+  DALI_TEST_CHECK(visual);
 
   Property::Map resultMap;
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
   // Check the property values from the returned map from visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::WIREFRAME );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::WIREFRAME);
 
   END_TEST;
 }
@@ -2767,204 +2897,191 @@ int UtcDaliVisualWireframeVisual(void)
 int UtcDaliVisualGetTransform(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetTransform: ColorVisual" );
+  tet_infoline("UtcDaliVisualGetTransform: ColorVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base colorVisual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base colorVisual = factory.CreateVisual(propertyMap);
 
   Dali::Property::Map visualMap;
-  colorVisual.CreatePropertyMap( visualMap );
-  Property::Value* value = visualMap.Find( Dali::Toolkit::Visual::Property::TRANSFORM );
-  Dali::Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  colorVisual.CreatePropertyMap(visualMap);
+  Property::Value*     value = visualMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM);
+  Dali::Property::Map* map   = value->GetMap();
+  DALI_TEST_CHECK(map);
 
   //Test default values
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_CHECK( typeValue->Get<Vector2>() == Vector2(0.0f,0.0f) );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_CHECK(typeValue->Get<Vector2>() == Vector2(0.0f, 0.0f));
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_CHECK( typeValue->Get<Vector2>() == Vector2(1.0f,1.0f) );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_CHECK(typeValue->Get<Vector2>() == Vector2(1.0f, 1.0f));
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET_POLICY );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_CHECK( typeValue->Get< Vector2 >() == Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET_POLICY);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_CHECK(typeValue->Get<Vector2>() == Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE));
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_CHECK( typeValue->Get< Vector2 >() == Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_CHECK(typeValue->Get<Vector2>() == Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE));
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ORIGIN );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_CHECK( (Toolkit::Align::Type)typeValue->Get<int>() == Toolkit::Align::TOP_BEGIN );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ORIGIN);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_CHECK((Toolkit::Align::Type)typeValue->Get<int>() == Toolkit::Align::TOP_BEGIN);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ANCHOR_POINT );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_CHECK( (Toolkit::Align::Type)typeValue->Get<int>() == Toolkit::Align::TOP_BEGIN );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ANCHOR_POINT);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_CHECK((Toolkit::Align::Type)typeValue->Get<int>() == Toolkit::Align::TOP_BEGIN);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_CHECK( typeValue->Get<Vector2>() == Vector2(0.0f,0.0f) );
+    Property::Value* typeValue = map->Find(Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_CHECK(typeValue->Get<Vector2>() == Vector2(0.0f, 0.0f));
   }
 
   END_TEST;
 }
 
-static void TestTransform( ToolkitTestApplication& application, Visual::Base visual )
+static void TestTransform(ToolkitTestApplication& application, Visual::Base visual)
 {
   Property::Map transform;
-  transform.Insert( Visual::Transform::Property::OFFSET, Vector2(10.0f, 10.0f) );
-  transform.Insert( Visual::Transform::Property::SIZE, Vector2(0.2f, 0.2f) );
-  transform.Insert( Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) );
-  transform.Insert( Visual::Transform::Property::ORIGIN, "CENTER" );
-  transform.Insert( Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::BOTTOM_END );
-  transform.Insert( DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(50.0f, 50.0f) );
+  transform.Insert(Visual::Transform::Property::OFFSET, Vector2(10.0f, 10.0f));
+  transform.Insert(Visual::Transform::Property::SIZE, Vector2(0.2f, 0.2f));
+  transform.Insert(Visual::Transform::Property::OFFSET_POLICY, Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE));
+  transform.Insert(Visual::Transform::Property::ORIGIN, "CENTER");
+  transform.Insert(Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::BOTTOM_END);
+  transform.Insert(DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(50.0f, 50.0f));
 
-  visual.SetTransformAndSize( transform, Vector2(100, 100) );
+  visual.SetTransformAndSize(transform, Vector2(100, 100));
 
   Dali::Property::Map visualMap;
-  visual.CreatePropertyMap( visualMap );
-  Property::Value* value = visualMap.Find( Dali::Toolkit::Visual::Property::TRANSFORM );
-  Dali::Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  visual.CreatePropertyMap(visualMap);
+  Property::Value*     value = visualMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM);
+  Dali::Property::Map* map   = value->GetMap();
+  DALI_TEST_CHECK(map);
 
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( typeValue->Get<Vector2>(),Vector2(10.0f,10.0f), TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS(typeValue->Get<Vector2>(), Vector2(10.0f, 10.0f), TEST_LOCATION);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( typeValue->Get<Vector2>(), Vector2(0.2f,0.2f), TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS(typeValue->Get<Vector2>(), Vector2(0.2f, 0.2f), TEST_LOCATION);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET_POLICY );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET_POLICY);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS(typeValue->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ), TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS(typeValue->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE), TEST_LOCATION);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ORIGIN );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( (Toolkit::Align::Type)typeValue->Get<int>(), Toolkit::Align::CENTER, TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ORIGIN);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS((Toolkit::Align::Type)typeValue->Get<int>(), Toolkit::Align::CENTER, TEST_LOCATION);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::ANCHOR_POINT );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( (Toolkit::Align::Type)typeValue->Get<int>(), Toolkit::Align::BOTTOM_END, TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::ANCHOR_POINT);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS((Toolkit::Align::Type)typeValue->Get<int>(), Toolkit::Align::BOTTOM_END, TEST_LOCATION);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( typeValue->Get<Vector2>(),Vector2(50.0f,50.0f), TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS(typeValue->Get<Vector2>(), Vector2(50.0f, 50.0f), TEST_LOCATION);
   }
 
   //Put the visual on the stage
-  DummyControl actor = DummyControl::New(true);
+  DummyControl        actor     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   application.GetScene().Add(actor);
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transform );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  dummyImpl.SetLayout(DummyControl::Property::TEST_VISUAL, transform);
 
   application.SendNotification();
   application.Render(0);
-  Renderer renderer( actor.GetRendererAt(0) );
-
-  //Check that the properties have been registered on the Renderer
-  Property::Index index = renderer.GetPropertyIndex( "offset" );
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
-  Vector2 offset = renderer.GetProperty<Vector2>( index );
-  DALI_TEST_EQUALS( offset, Vector2(10.0f,10.0f), TEST_LOCATION );
-
-  index = renderer.GetPropertyIndex( "size" );
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
-  Vector2 size = renderer.GetProperty<Vector2>( index );
-  DALI_TEST_EQUALS( size, Vector2(0.2f,0.2f), TEST_LOCATION );
-
-  index = renderer.GetPropertyIndex( "offsetSizeMode" );
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
-  Vector4 offsetSizeMode = renderer.GetProperty<Vector4>( index );
-  DALI_TEST_EQUALS( offsetSizeMode, Vector4(1.0f,1.0f,0.0f,0.0f), TEST_LOCATION );
-
-  index = renderer.GetPropertyIndex( "origin" );
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
-  Vector2 parentOrigin = renderer.GetProperty<Vector2>( index );
-  DALI_TEST_EQUALS( parentOrigin, Vector2(0.0f,0.0f), TEST_LOCATION );
-
-  index = renderer.GetPropertyIndex( "anchorPoint" );
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
-  Vector2 anchorPoint = renderer.GetProperty<Vector2>( index );
-  DALI_TEST_EQUALS( anchorPoint, Vector2(-0.5f,-0.5f), TEST_LOCATION );
-
-  index = renderer.GetPropertyIndex( "extraSize" );
-  DALI_TEST_CHECK( index != Property::INVALID_INDEX );
-  Vector2 extraSize = renderer.GetProperty<Vector2>( index );
-  DALI_TEST_EQUALS( extraSize, Vector2(50.0f,50.0f), TEST_LOCATION );
+  Renderer renderer(actor.GetRendererAt(0));
+
+  Vector2 offset = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_OFFSET);
+  DALI_TEST_EQUALS(offset, Vector2(10.0f, 10.0f), TEST_LOCATION);
+
+  Vector2 size = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_SIZE);
+  DALI_TEST_EQUALS(size, Vector2(0.2f, 0.2f), TEST_LOCATION);
+
+  Vector4 offsetSizeMode = renderer.GetProperty<Vector4>(VisualRenderer::Property::TRANSFORM_OFFSET_SIZE_MODE);
+  DALI_TEST_EQUALS(offsetSizeMode, Vector4(1.0f, 1.0f, 0.0f, 0.0f), TEST_LOCATION);
+
+  Vector2 parentOrigin = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_ORIGIN);
+  DALI_TEST_EQUALS(parentOrigin, Vector2(0.0f, 0.0f), TEST_LOCATION);
+
+  Vector2 anchorPoint = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_ANCHOR_POINT);
+  DALI_TEST_EQUALS(anchorPoint, Vector2(-0.5f, -0.5f), TEST_LOCATION);
+
+  Vector2 extraSize = renderer.GetProperty<Vector2>(VisualRenderer::Property::EXTRA_SIZE);
+  DALI_TEST_EQUALS(extraSize, Vector2(50.0f, 50.0f), TEST_LOCATION);
 
   //Set a new transform
   transform.Clear();
   transform = DefaultTransform();
-  transform.Insert( Visual::Transform::Property::OFFSET, Vector2(20.0f, 20.0f) );
-  transform.Insert( Visual::Transform::Property::SIZE, Vector2(100.0f, 100.0f) );
-  transform.Insert( Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) );
-  transform.Insert( DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(0.5f, 0.5f) );
-  visual.SetTransformAndSize( transform, Vector2(100, 100) );
+  transform.Insert(Visual::Transform::Property::OFFSET, Vector2(20.0f, 20.0f));
+  transform.Insert(Visual::Transform::Property::SIZE, Vector2(100.0f, 100.0f));
+  transform.Insert(Visual::Transform::Property::SIZE_POLICY, Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE));
+  transform.Insert(DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(0.5f, 0.5f));
+  visual.SetTransformAndSize(transform, Vector2(100, 100));
   application.SendNotification();
   application.Render(0);
 
   //Check that the values have changed in the renderer
-  offset = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "offset" ) );
-  DALI_TEST_EQUALS( offset, Vector2(20.0f,20.0f), TEST_LOCATION );
+  offset = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_OFFSET);
+  DALI_TEST_EQUALS(offset, Vector2(20.0f, 20.0f), TEST_LOCATION);
 
-  size = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "size" ) );
-  DALI_TEST_EQUALS( size, Vector2(100.0f,100.0f), TEST_LOCATION );
+  size = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_SIZE);
+  DALI_TEST_EQUALS(size, Vector2(100.0f, 100.0f), TEST_LOCATION);
 
-  offsetSizeMode = renderer.GetProperty<Vector4>( renderer.GetPropertyIndex( "offsetSizeMode" ) );
-  DALI_TEST_EQUALS( offsetSizeMode, Vector4(0.0f,0.0f,1.0f,1.0f), TEST_LOCATION );
+  offsetSizeMode = renderer.GetProperty<Vector4>(VisualRenderer::Property::TRANSFORM_OFFSET_SIZE_MODE);
+  DALI_TEST_EQUALS(offsetSizeMode, Vector4(0.0f, 0.0f, 1.0f, 1.0f), TEST_LOCATION);
 
   //Parent origin and anchor point should have the default values
-  parentOrigin = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "origin" ) );
-  DALI_TEST_EQUALS( parentOrigin, Vector2(-0.5f,-0.5f), TEST_LOCATION );
+  parentOrigin = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_ORIGIN);
+  DALI_TEST_EQUALS(parentOrigin, Vector2(-0.5f, -0.5f), TEST_LOCATION);
 
-  anchorPoint = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "anchorPoint" ) );
-  DALI_TEST_EQUALS( anchorPoint, Vector2(0.5f,0.5f), TEST_LOCATION );
+  anchorPoint = renderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_ANCHOR_POINT);
+  DALI_TEST_EQUALS(anchorPoint, Vector2(0.5f, 0.5f), TEST_LOCATION);
 
-  extraSize = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "extraSize" ) );
-  DALI_TEST_EQUALS( extraSize, Vector2(0.5f,0.5f), TEST_LOCATION );
+  extraSize = renderer.GetProperty<Vector2>(VisualRenderer::Property::EXTRA_SIZE);
+  DALI_TEST_EQUALS(extraSize, Vector2(0.5f, 0.5f), TEST_LOCATION);
 }
 
 int UtcDaliVisualSetTransform01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: ColorVisual" );
+  tet_infoline("UtcDaliVisualSetTransform: ColorVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
   propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
   propertyMap.Insert(Visual::Property::OPACITY, 0.5f);
   propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  TestTransform( application, visual );
-  TestMixColor( visual, ColorVisual::Property::MIX_COLOR, Color::BLUE );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, ColorVisual::Property::MIX_COLOR, Color::BLUE);
 
   END_TEST;
 }
@@ -2972,15 +3089,15 @@ int UtcDaliVisualSetTransform01(void)
 int UtcDaliVisualSetTransform0(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: ColorVisual" );
+  tet_infoline("UtcDaliVisualSetTransform: ColorVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  TestTransform( application, visual );
-  TestMixColor( visual, ColorVisual::Property::MIX_COLOR, Color::BLUE );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, ColorVisual::Property::MIX_COLOR, Color::BLUE);
 
   END_TEST;
 }
@@ -2988,18 +3105,18 @@ int UtcDaliVisualSetTransform0(void)
 int UtcDaliVisualSetTransform1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: PrimitiveVisual" );
+  tet_infoline("UtcDaliVisualSetTransform: PrimitiveVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap[ Toolkit::Visual::Property::TYPE           ] = Visual::PRIMITIVE;
-  propertyMap[ PrimitiveVisual::Property::MIX_COLOR ] = Color::WHITE;
-  propertyMap[ PrimitiveVisual::Property::SHAPE  ] = PrimitiveVisual::Shape::SPHERE;
-  propertyMap[ PrimitiveVisual::Property::SLICES ] = 10;
-  propertyMap[ PrimitiveVisual::Property::STACKS ] = 10;
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  TestTransform( application, visual );
-  TestMixColor( visual, PrimitiveVisual::Property::MIX_COLOR, Color::WHITE );
+  propertyMap[Toolkit::Visual::Property::TYPE]      = Visual::PRIMITIVE;
+  propertyMap[PrimitiveVisual::Property::MIX_COLOR] = Color::WHITE;
+  propertyMap[PrimitiveVisual::Property::SHAPE]     = PrimitiveVisual::Shape::SPHERE;
+  propertyMap[PrimitiveVisual::Property::SLICES]    = 10;
+  propertyMap[PrimitiveVisual::Property::STACKS]    = 10;
+  Visual::Base visual                               = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, PrimitiveVisual::Property::MIX_COLOR, Color::WHITE);
 
   END_TEST;
 }
@@ -3007,33 +3124,33 @@ int UtcDaliVisualSetTransform1(void)
 int UtcDaliVisualSetTransform2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: GradientVisual" );
+  tet_infoline("UtcDaliVisualSetTransform: GradientVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::GRADIENT );
-  propertyMap.Insert( Visual::Property::MIX_COLOR,  Color::GREEN );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::GREEN);
 
   Property::Array stopOffsets;
-  stopOffsets.PushBack( 0.0f );
-  stopOffsets.PushBack( 0.3f );
-  stopOffsets.PushBack( 0.6f );
-  stopOffsets.PushBack( 0.8f );
-  stopOffsets.PushBack( 1.0f );
-  propertyMap.Insert( GradientVisual::Property::STOP_OFFSET, stopOffsets );
+  stopOffsets.PushBack(0.0f);
+  stopOffsets.PushBack(0.3f);
+  stopOffsets.PushBack(0.6f);
+  stopOffsets.PushBack(0.8f);
+  stopOffsets.PushBack(1.0f);
+  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets);
 
   Property::Array stopColors;
-  stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 255.f )/255.f );
-  stopColors.PushBack( Vector4( 196.f, 198.f, 71.f, 122.f )/255.f );
-  stopColors.PushBack( Vector4( 214.f, 37.f, 139.f, 191.f )/255.f );
-  stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 150.f )/255.f );
-  stopColors.PushBack( Color::YELLOW );
-  propertyMap.Insert( GradientVisual::Property::STOP_COLOR, stopColors );
-  propertyMap.Insert( GradientVisual::Property::CENTER, Vector2( 0.5f, 0.5f ) );
-  propertyMap.Insert( GradientVisual::Property::RADIUS, 1.414f );
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  TestTransform( application, visual );
-  TestMixColor( visual, Visual::Property::MIX_COLOR, Color::GREEN );
+  stopColors.PushBack(Vector4(129.f, 198.f, 193.f, 255.f) / 255.f);
+  stopColors.PushBack(Vector4(196.f, 198.f, 71.f, 122.f) / 255.f);
+  stopColors.PushBack(Vector4(214.f, 37.f, 139.f, 191.f) / 255.f);
+  stopColors.PushBack(Vector4(129.f, 198.f, 193.f, 150.f) / 255.f);
+  stopColors.PushBack(Color::YELLOW);
+  propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
+  propertyMap.Insert(GradientVisual::Property::CENTER, Vector2(0.5f, 0.5f));
+  propertyMap.Insert(GradientVisual::Property::RADIUS, 1.414f);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, Visual::Property::MIX_COLOR, Color::GREEN);
 
   END_TEST;
 }
@@ -3041,17 +3158,17 @@ int UtcDaliVisualSetTransform2(void)
 int UtcDaliVisualSetTransform3(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: BorderVisual" );
+  tet_infoline("UtcDaliVisualSetTransform: BorderVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
-  propertyMap.Insert( Visual::Property::MIX_COLOR, Color::MAGENTA );
-  propertyMap.Insert( BorderVisual::Property::COLOR, Vector4(0.f, 1.f, 0.f, 0.6f) );
-  propertyMap.Insert( BorderVisual::Property::SIZE, 3.0f );
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  TestTransform( application, visual );
-  TestMixColor( visual, Visual::Property::MIX_COLOR, Color::MAGENTA );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::BORDER);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::MAGENTA);
+  propertyMap.Insert(BorderVisual::Property::COLOR, Vector4(0.f, 1.f, 0.f, 0.6f));
+  propertyMap.Insert(BorderVisual::Property::SIZE, 3.0f);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, Visual::Property::MIX_COLOR, Color::MAGENTA);
 
   END_TEST;
 }
@@ -3059,21 +3176,21 @@ int UtcDaliVisualSetTransform3(void)
 int UtcDaliVisualSetTransform4(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: MeshVisual" );
+  tet_infoline("UtcDaliVisualSetTransform: MeshVisual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( Visual::Property::MIX_COLOR, Color::CYAN );
-
-  propertyMap.Insert( "objectUrl", TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( "materialUrl", TEST_MTL_FILE_NAME );
-  propertyMap.Insert( "texturesPath", TEST_RESOURCE_LOCATION );
-  propertyMap.Insert( "shadingMode", MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING );
-  propertyMap.Insert( "lightPosition", Vector3( 5.0f, 10.0f, 15.0f) );
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  TestTransform( application, visual );
-  TestMixColor( visual, Visual::Property::MIX_COLOR, Color::CYAN );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(Visual::Property::MIX_COLOR, Color::CYAN);
+
+  propertyMap.Insert("objectUrl", TEST_OBJ_FILE_NAME);
+  propertyMap.Insert("materialUrl", TEST_MTL_FILE_NAME);
+  propertyMap.Insert("texturesPath", TEST_RESOURCE_LOCATION);
+  propertyMap.Insert("shadingMode", MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING);
+  propertyMap.Insert("lightPosition", Vector3(5.0f, 10.0f, 15.0f));
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, Visual::Property::MIX_COLOR, Color::CYAN);
 
   END_TEST;
 }
@@ -3081,21 +3198,21 @@ int UtcDaliVisualSetTransform4(void)
 int UtcDaliVisualSetTransform5(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: ImageVisual for URL " );
+  tet_infoline("UtcDaliVisualSetTransform: ImageVisual for URL ");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE;
-  propertyMap[Visual::Property::MIX_COLOR] = Color::YELLOW;
-  propertyMap[Toolkit::ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
-  propertyMap[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = 100.0f;
-  propertyMap[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = 100.0f;
-  propertyMap[Toolkit::ImageVisual::Property::FITTING_MODE] = FittingMode::SCALE_TO_FILL;
-  propertyMap[Toolkit::ImageVisual::Property::SAMPLING_MODE] = SamplingMode::BOX_THEN_LINEAR;
+  propertyMap[Toolkit::Visual::Property::TYPE]                     = Toolkit::Visual::IMAGE;
+  propertyMap[Visual::Property::MIX_COLOR]                         = Color::YELLOW;
+  propertyMap[Toolkit::ImageVisual::Property::URL]                 = TEST_IMAGE_FILE_NAME;
+  propertyMap[Toolkit::ImageVisual::Property::DESIRED_WIDTH]       = 100.0f;
+  propertyMap[Toolkit::ImageVisual::Property::DESIRED_HEIGHT]      = 100.0f;
+  propertyMap[Toolkit::ImageVisual::Property::FITTING_MODE]        = FittingMode::SCALE_TO_FILL;
+  propertyMap[Toolkit::ImageVisual::Property::SAMPLING_MODE]       = SamplingMode::BOX_THEN_LINEAR;
   propertyMap[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = true;
-  Visual::Base visual = factory.CreateVisual(propertyMap);
-  TestTransform( application, visual );
-  TestMixColor( visual, Visual::Property::MIX_COLOR, Color::YELLOW );
+  Visual::Base visual                                              = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, Visual::Property::MIX_COLOR, Color::YELLOW);
 
   END_TEST;
 }
@@ -3103,16 +3220,16 @@ int UtcDaliVisualSetTransform5(void)
 int UtcDaliVisualSetTransform6(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualSetTransform: NPatch visual" );
+  tet_infoline("UtcDaliVisualSetTransform: NPatch visual");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE;
-  propertyMap[Toolkit::ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME;
+  propertyMap[Toolkit::Visual::Property::TYPE]                     = Toolkit::Visual::IMAGE;
+  propertyMap[Toolkit::ImageVisual::Property::URL]                 = TEST_NPATCH_FILE_NAME;
   propertyMap[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = true;
-  Visual::Base visual = factory.CreateVisual(propertyMap);
-  TestTransform( application, visual );
-  TestMixColor( visual, Visual::Property::MIX_COLOR, Color::WHITE );
+  Visual::Base visual                                              = factory.CreateVisual(propertyMap);
+  TestTransform(application, visual);
+  TestMixColor(visual, Visual::Property::MIX_COLOR, Color::WHITE);
 
   END_TEST;
 }
@@ -3120,36 +3237,34 @@ int UtcDaliVisualSetTransform6(void)
 int UtcDaliVisualTestTransformPoliciesAsStrings(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualTestTransformPoliciesAsStrings: Use a ColorVisual and test the offset and size policies as strings" );
+  tet_infoline("UtcDaliVisualTestTransformPoliciesAsStrings: Use a ColorVisual and test the offset and size policies as strings");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
   Property::Map transform;
-  transform[ "offsetPolicy" ] = Property::Array().Add( "ABSOLUTE" )
-                                                 .Add( "RELATIVE" );
-  transform[ "sizePolicy"   ] = Property::Array().Add( "RELATIVE" )
-                                                 .Add( "ABSOLUTE" );
-  visual.SetTransformAndSize( transform, Vector2(100, 100) );
+  transform["offsetPolicy"] = Property::Array().Add("ABSOLUTE").Add("RELATIVE");
+  transform["sizePolicy"]   = Property::Array().Add("RELATIVE").Add("ABSOLUTE");
+  visual.SetTransformAndSize(transform, Vector2(100, 100));
 
   Dali::Property::Map visualMap;
-  visual.CreatePropertyMap( visualMap );
-  Property::Value* value = visualMap.Find( Dali::Toolkit::Visual::Property::TRANSFORM );
-  Dali::Property::Map* map = value->GetMap();
-  DALI_TEST_CHECK( map );
+  visual.CreatePropertyMap(visualMap);
+  Property::Value*     value = visualMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM);
+  Dali::Property::Map* map   = value->GetMap();
+  DALI_TEST_CHECK(map);
 
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::OFFSET_POLICY );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::RELATIVE ), TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::OFFSET_POLICY);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS(typeValue->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::RELATIVE), TEST_LOCATION);
   }
   {
-    Property::Value* typeValue = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY );
-    DALI_TEST_CHECK( typeValue );
-    DALI_TEST_EQUALS( typeValue->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION );
+    Property::Value* typeValue = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY);
+    DALI_TEST_CHECK(typeValue);
+    DALI_TEST_EQUALS(typeValue->Get<Vector2>(), Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
   }
 
   END_TEST;
@@ -3158,61 +3273,61 @@ int UtcDaliVisualTestTransformPoliciesAsStrings(void)
 int UtcDaliNPatchVisualCustomShader(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "NPatchVisual with custom shader" );
+  tet_infoline("NPatchVisual with custom shader");
 
-  VisualFactory factory = VisualFactory::Get();
-  Property::Map properties;
-  Property::Map shader;
-  const std::string vertexShader = "Foobar";
-  const std::string fragmentShader = "Foobar";
+  VisualFactory     factory = VisualFactory::Get();
+  Property::Map     properties;
+  Property::Map     shader;
+  const std::string vertexShader                                   = "Foobar";
+  const std::string fragmentShader                                 = "Foobar";
   shader[Dali::Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-  shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+  shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
   Property::Map transformMap;
-  transformMap["size"] = Vector2( 0.5f, 0.5f ) ;
-  transformMap["offset"] = Vector2( 20.0f, 0.0f ) ;
-  transformMap["offsetPolicy"] = Vector2( Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE );
-  transformMap["anchorPoint"] = Align::CENTER;
-  transformMap["origin"] = Align::CENTER;
-  transformMap["extraSize"] = Vector2( 0.0f, 50.0f );
+  transformMap["size"]                    = Vector2(0.5f, 0.5f);
+  transformMap["offset"]                  = Vector2(20.0f, 0.0f);
+  transformMap["offsetPolicy"]            = Vector2(Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE);
+  transformMap["anchorPoint"]             = Align::CENTER;
+  transformMap["origin"]                  = Align::CENTER;
+  transformMap["extraSize"]               = Vector2(0.0f, 50.0f);
   properties[Visual::Property::TRANSFORM] = transformMap;
 
-  properties[Visual::Property::TYPE] = Visual::IMAGE;
-  properties[Visual::Property::MIX_COLOR] = Color::BLUE;
-  properties[Visual::Property::SHADER]=shader;
-  properties[ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME;
+  properties[Visual::Property::TYPE]                     = Visual::IMAGE;
+  properties[Visual::Property::MIX_COLOR]                = Color::BLUE;
+  properties[Visual::Property::SHADER]                   = shader;
+  properties[ImageVisual::Property::URL]                 = TEST_NPATCH_FILE_NAME;
   properties[ImageVisual::Property::SYNCHRONOUS_LOADING] = true;
 
-  Visual::Base visual = factory.CreateVisual( properties );
-  TestMixColor( visual, Visual::Property::MIX_COLOR, Color::BLUE );
+  Visual::Base visual = factory.CreateVisual(properties);
+  TestMixColor(visual, Visual::Property::MIX_COLOR, Color::BLUE);
 
   // trigger creation through setting on stage
-  DummyControl dummy = DummyControl::New(true);
+  DummyControl        dummy     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transformMap );
-  dummy.SetProperty( Actor::Property::SIZE, Vector2( 2000.f, 2000.f ) );
-  dummy.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  dummyImpl.SetLayout(DummyControl::Property::TEST_VISUAL, transformMap);
+  dummy.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+  dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   application.GetScene().Add(dummy);
   application.SendNotification();
 
-  Renderer renderer = dummy.GetRendererAt( 0 );
-  Shader shader2 = renderer.GetShader();
-  Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  Renderer        renderer = dummy.GetRendererAt(0);
+  Shader          shader2  = renderer.GetShader();
+  Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
 
-  Property::Index index = renderer.GetPropertyIndex("size");
-  DALI_TEST_EQUALS( renderer.GetProperty( index ), Property::Value(Vector2(0.5, 0.5)), 0.001, TEST_LOCATION );
+  Property::Index index = VisualRenderer::Property::TRANSFORM_SIZE;
+  DALI_TEST_EQUALS(renderer.GetProperty(index), Property::Value(Vector2(0.5, 0.5)), 0.001, TEST_LOCATION);
 
-  Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-  DALI_TEST_EQUALS( fragmentShader, fragment->Get<std::string>(), TEST_LOCATION );
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-  Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-  DALI_TEST_EQUALS( vertexShader, vertex->Get<std::string>(), TEST_LOCATION );
+  Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+  DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
 
-  Vector2 extraSize = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "extraSize" ) );
-  DALI_TEST_EQUALS( extraSize, Vector2(0.0f, 50.0f), TEST_LOCATION );
+  Vector2 extraSize = renderer.GetProperty<Vector2>(VisualRenderer::Property::EXTRA_SIZE);
+  DALI_TEST_EQUALS(extraSize, Vector2(0.0f, 50.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -3220,37 +3335,29 @@ int UtcDaliNPatchVisualCustomShader(void)
 int UtcDaliGradientVisualBlendMode(void)
 {
   ToolkitTestApplication application;
-  VisualFactory factory = VisualFactory::Get();
+  VisualFactory          factory = VisualFactory::Get();
 
   Visual::Base opaqueGradientVisual = factory.CreateVisual(
-      Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::GRADIENT )
-                     .Add( GradientVisual::Property::START_POSITION, Vector2( -0.5f, -0.5f ) )
-                     .Add( GradientVisual::Property::END_POSITION, Vector2( 0.5f, 0.5f ) )
-                     .Add( GradientVisual::Property::STOP_COLOR, Property::Array().Add( Color::RED )
-                                                                                  .Add( Color::GREEN ) ) );
+    Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::GRADIENT).Add(GradientVisual::Property::START_POSITION, Vector2(-0.5f, -0.5f)).Add(GradientVisual::Property::END_POSITION, Vector2(0.5f, 0.5f)).Add(GradientVisual::Property::STOP_COLOR, Property::Array().Add(Color::RED).Add(Color::GREEN)));
 
   Visual::Base alphaGradientVisual = factory.CreateVisual(
-      Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::GRADIENT )
-                     .Add( GradientVisual::Property::START_POSITION, Vector2( -0.5f, -0.5f ) )
-                     .Add( GradientVisual::Property::END_POSITION, Vector2( 0.5f, 0.5f ) )
-                     .Add( GradientVisual::Property::STOP_COLOR, Property::Array().Add( Color::RED )
-                                                                                  .Add( Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) ) ) );
+    Property::Map().Add(Toolkit::Visual::Property::TYPE, Visual::GRADIENT).Add(GradientVisual::Property::START_POSITION, Vector2(-0.5f, -0.5f)).Add(GradientVisual::Property::END_POSITION, Vector2(0.5f, 0.5f)).Add(GradientVisual::Property::STOP_COLOR, Property::Array().Add(Color::RED).Add(Vector4(1.0f, 1.0f, 1.0f, 0.5f))));
 
   DummyControl control = DummyControl::New(true);
   control.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-  application.GetScene().Add( control );
+  application.GetScene().Add(control);
 
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>( control.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL,  opaqueGradientVisual );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, alphaGradientVisual );
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(control.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, opaqueGradientVisual);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, alphaGradientVisual);
 
   application.SendNotification();
   application.Render();
 
   // Control should have two renderers, the first one is opaque so our blending mode should be off, the second one has some alpha so should be set to automatic
-  DALI_TEST_EQUALS( 2u, control.GetRendererCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( control.GetRendererAt( 0 ).GetProperty( Renderer::Property::BLEND_MODE ).Get<int>(), (int)BlendMode::OFF, TEST_LOCATION );
-  DALI_TEST_EQUALS( control.GetRendererAt( 1 ).GetProperty( Renderer::Property::BLEND_MODE ).Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION );
+  DALI_TEST_EQUALS(2u, control.GetRendererCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(control.GetRendererAt(0).GetProperty(Renderer::Property::BLEND_MODE).Get<int>(), (int)BlendMode::OFF, TEST_LOCATION);
+  DALI_TEST_EQUALS(control.GetRendererAt(1).GetProperty(Renderer::Property::BLEND_MODE).Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3258,117 +3365,114 @@ int UtcDaliGradientVisualBlendMode(void)
 int UtcDaliVisualRendererRemovalAndReAddition(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualRendererRemoval" );
+  tet_infoline("UtcDaliVisualRendererRemoval");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
 
-  visual.SetDepthIndex( 1 );
+  visual.SetDepthIndex(1);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION );
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION);
 
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  tet_infoline( "Add control with visual to stage and check renderer count is 1" );
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  tet_infoline("Add control with visual to stage and check renderer count is 1");
 
-  application.GetScene().Add( dummyControl );
+  application.GetScene().Add(dummyControl);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION);
 
-  tet_infoline( "Remove control with visual from stage and check renderer count is 0" );
-  application.GetScene().Remove( dummyControl );
+  tet_infoline("Remove control with visual from stage and check renderer count is 0");
+  application.GetScene().Remove(dummyControl);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION);
 
-  tet_infoline( "Re-add control with visual to stage and check renderer count is still 1" );
+  tet_infoline("Re-add control with visual to stage and check renderer count is still 1");
 
-  application.GetScene().Add( dummyControl );
+  application.GetScene().Add(dummyControl);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-
 int UtcDaliVisualTextVisualRender(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualTextVisualRender" );
+  tet_infoline("UtcDaliVisualTextVisualRender");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT );
-  propertyMap.Insert( "mixColor", Color::WHITE );
-  propertyMap.Insert( "renderingBackend", static_cast<int>( Toolkit::DevelText::DEFAULT_RENDERING_BACKEND ) );
-  propertyMap.Insert( "enableMarkup", false );
-  propertyMap.Insert( "text", "Hello world" );
-  propertyMap.Insert( "fontFamily", "TizenSans" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT);
+  propertyMap.Insert("mixColor", Color::WHITE);
+  propertyMap.Insert("renderingBackend", static_cast<int>(Toolkit::DevelText::DEFAULT_RENDERING_BACKEND));
+  propertyMap.Insert("enableMarkup", false);
+  propertyMap.Insert("text", "Hello world");
+  propertyMap.Insert("fontFamily", "TizenSans");
 
   Property::Map fontStyleMapSet;
-  fontStyleMapSet.Insert( "weight", "bold" );
-  propertyMap.Insert( "fontStyle", fontStyleMapSet );
-
-  propertyMap.Insert( "pointSize", 12.f );
-  propertyMap.Insert( "multiLine", true );
-  propertyMap.Insert( "horizontalAlignment", "CENTER" );
-  propertyMap.Insert( "verticalAlignment", "CENTER" );
-  propertyMap.Insert( "textColor", Color::RED );
-  Visual::Base textVisual = factory.CreateVisual( propertyMap );
-  textVisual.SetDepthIndex( 1 );
-
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, textVisual );
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION );
-
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  dummyControl.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-
-  application.GetScene().Add( dummyControl );
+  fontStyleMapSet.Insert("weight", "bold");
+  propertyMap.Insert("fontStyle", fontStyleMapSet);
+
+  propertyMap.Insert("pointSize", 12.f);
+  propertyMap.Insert("multiLine", true);
+  propertyMap.Insert("horizontalAlignment", "CENTER");
+  propertyMap.Insert("verticalAlignment", "CENTER");
+  propertyMap.Insert("textColor", Color::RED);
+  Visual::Base textVisual = factory.CreateVisual(propertyMap);
+  textVisual.SetDepthIndex(1);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, textVisual);
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION);
+
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummyControl.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  application.GetScene().Add(dummyControl);
   application.SendNotification();
   application.Render();
 
-
   // Create a texture bigger than the maximum allowed by the image atlas. Used to increase coverage.
   propertyMap.Clear();
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT );
-  propertyMap.Insert( TextVisual::Property::ENABLE_MARKUP, true );
-  propertyMap.Insert( TextVisual::Property::TEXT, "<font family='TizenSans' size='12'>Hello world</font>" );
-  propertyMap.Insert( TextVisual::Property::MULTI_LINE, true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT);
+  propertyMap.Insert(TextVisual::Property::ENABLE_MARKUP, true);
+  propertyMap.Insert(TextVisual::Property::TEXT, "<font family='TizenSans' size='12'>Hello world</font>");
+  propertyMap.Insert(TextVisual::Property::MULTI_LINE, true);
 
   Property::Map transformMap;
-  transformMap.Insert( "size", Vector2( 0.5f, 0.5f ) );
-  propertyMap.Insert( Visual::Property::TRANSFORM, transformMap );
+  transformMap.Insert("size", Vector2(0.5f, 0.5f));
+  propertyMap.Insert(Visual::Property::TRANSFORM, transformMap);
 
-  textVisual = factory.CreateVisual( propertyMap );
-  textVisual.SetDepthIndex( 1 );
+  textVisual = factory.CreateVisual(propertyMap);
+  textVisual.SetDepthIndex(1);
 
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, textVisual );
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 720.f, 640.f ) );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, textVisual);
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(720.f, 640.f));
 
   application.SendNotification(); // force process events to ensure text visual
   // adds renderer to the dummy control in OnRelayout
   application.Render();
 
-  Renderer renderer = dummyControl.GetRendererAt(0u);
-  Property::Index index = renderer.GetPropertyIndex("size");
+  Renderer        renderer = dummyControl.GetRendererAt(0u);
+  Property::Index index    = renderer.GetPropertyIndex("transformSize");
 
-  tet_infoline( "Test that the TextVisual has NOT overridden what was set by developer" );
-  DALI_TEST_EQUALS( renderer.GetProperty<Vector2>(index), Vector2( 0.5f, 0.5f ), 0.001f, TEST_LOCATION );
+  tet_infoline("Test that the TextVisual has NOT overridden what was set by developer");
+  DALI_TEST_EQUALS(renderer.GetProperty<Vector2>(index), Vector2(0.5f, 0.5f), 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3376,50 +3480,50 @@ int UtcDaliVisualTextVisualRender(void)
 int UtcDaliVisualTextVisualDisableEnable(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualTextVisualDisableEnable Ensure Text visible can be re-enabled" );
+  tet_infoline("UtcDaliVisualTextVisualDisableEnable Ensure Text visible can be re-enabled");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT );
-  propertyMap.Insert( "mixColor", Color::WHITE );
-  propertyMap.Insert( "renderingBackend", static_cast<int>( Toolkit::DevelText::DEFAULT_RENDERING_BACKEND ) );
-  propertyMap.Insert( "enableMarkup", false );
-  propertyMap.Insert( "text", "Hello world" );
-  propertyMap.Insert( "fontFamily", "TizenSans" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::TEXT);
+  propertyMap.Insert("mixColor", Color::WHITE);
+  propertyMap.Insert("renderingBackend", static_cast<int>(Toolkit::DevelText::DEFAULT_RENDERING_BACKEND));
+  propertyMap.Insert("enableMarkup", false);
+  propertyMap.Insert("text", "Hello world");
+  propertyMap.Insert("fontFamily", "TizenSans");
 
   Property::Map fontStyleMapSet;
-  fontStyleMapSet.Insert( "weight", "bold" );
-  propertyMap.Insert( "fontStyle", fontStyleMapSet );
-
-  propertyMap.Insert( "pointSize", 12.f );
-  propertyMap.Insert( "multiLine", true );
-  propertyMap.Insert( "horizontalAlignment", "CENTER" );
-  propertyMap.Insert( "verticalAlignment", "CENTER" );
-  propertyMap.Insert( "textColor", Color::RED );
-  Visual::Base textVisual = factory.CreateVisual( propertyMap );
-  textVisual.SetDepthIndex( 1 );
-
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, textVisual );
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION );
-
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  dummyControl.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-
-  application.GetScene().Add( dummyControl );
+  fontStyleMapSet.Insert("weight", "bold");
+  propertyMap.Insert("fontStyle", fontStyleMapSet);
+
+  propertyMap.Insert("pointSize", 12.f);
+  propertyMap.Insert("multiLine", true);
+  propertyMap.Insert("horizontalAlignment", "CENTER");
+  propertyMap.Insert("verticalAlignment", "CENTER");
+  propertyMap.Insert("textColor", Color::RED);
+  Visual::Base textVisual = factory.CreateVisual(propertyMap);
+  textVisual.SetDepthIndex(1);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, textVisual);
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION);
+
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummyControl.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  application.GetScene().Add(dummyControl);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION);
 
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, false );
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, false);
 
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 0, TEST_LOCATION);
 
-  dummyImpl.EnableVisual( DummyControl::Property::TEST_VISUAL, true );
+  dummyImpl.EnableVisual(DummyControl::Property::TEST_VISUAL, true);
 
-  DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(dummyControl.GetRendererCount(), 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -3427,115 +3531,258 @@ int UtcDaliVisualTextVisualDisableEnable(void)
 int UtcDaliVisualPremultipliedAlpha(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualPremultipliedAlpha" );
+  tet_infoline("UtcDaliVisualPremultipliedAlpha");
 
   VisualFactory factory = VisualFactory::Get();
 
   // image visual, test default value ( true )
   {
     Visual::Base imageVisual = factory.CreateVisual(
-          Property::Map()
-          .Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
-          .Add( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME ) );
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME));
 
     Dali::Property::Map visualMap;
-    imageVisual.CreatePropertyMap( visualMap );
-    Property::Value* value = visualMap.Find( Visual::Property::PREMULTIPLIED_ALPHA );
+    imageVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
 
     // test values
-    DALI_TEST_CHECK( value );
-    DALI_TEST_EQUALS( value->Get<bool>(), true, TEST_LOCATION );
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
   }
 
   // image visual, override premultiplied
   {
     Visual::Base imageVisual = factory.CreateVisual(
-          Property::Map()
-          .Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
-          .Add( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME )
-          .Add( Visual::Property::PREMULTIPLIED_ALPHA, false ) );
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME)
+        .Add(Visual::Property::PREMULTIPLIED_ALPHA, false));
 
     Dali::Property::Map visualMap;
-    imageVisual.CreatePropertyMap( visualMap );
-    Property::Value* value = visualMap.Find( Visual::Property::PREMULTIPLIED_ALPHA );
+    imageVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
 
     // test values
-    DALI_TEST_CHECK( value );
-    DALI_TEST_EQUALS( value->Get<bool>(), false, TEST_LOCATION);
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), false, TEST_LOCATION);
   }
 
-  // svg visual ( premultiplied alpha by default is true )
+  // svg visual ( premultiplied alpha by default is true, and cannot change value )
   {
     Visual::Base imageVisual = factory.CreateVisual(
-          Property::Map()
-          .Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
-          .Add( ImageVisual::Property::URL, TEST_SVG_FILE_NAME ) );
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_SVG_FILE_NAME));
 
     Dali::Property::Map visualMap;
-    imageVisual.CreatePropertyMap( visualMap );
-    Property::Value* value = visualMap.Find( Visual::Property::PREMULTIPLIED_ALPHA );
+    imageVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
 
     // test values
-    DALI_TEST_CHECK( value );
-    DALI_TEST_EQUALS( value->Get<bool>(), true, TEST_LOCATION );
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
   }
+  {
+    Visual::Base imageVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_SVG_FILE_NAME)
+        .Add(Visual::Property::PREMULTIPLIED_ALPHA, false));
 
-  END_TEST;
-}
+    Dali::Property::Map visualMap;
+    imageVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
 
-int UtcDaliRegisterVisualOrder(void)
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+  }
+
+  // animated vector visual ( premultiplied alpha by default is true, and cannot change value )
+  {
+    Visual::Base imageVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE)
+        .Add(ImageVisual::Property::URL, "something.json"));
+
+    Dali::Property::Map visualMap;
+    imageVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+  }
+  {
+    Visual::Base imageVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE)
+        .Add(ImageVisual::Property::URL, "something.json")
+        .Add(Visual::Property::PREMULTIPLIED_ALPHA, false));
+
+    Dali::Property::Map visualMap;
+    imageVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+  }
+
+  // text visual ( premultiplied alpha by default is true, and cannot change value )
+  {
+    Visual::Base textVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::TEXT)
+        .Add(TextVisual::Property::TEXT, "Text"));
+
+    Dali::Property::Map visualMap;
+    textVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+  }
+  {
+    Visual::Base textVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::TEXT)
+        .Add(TextVisual::Property::TEXT, "Text")
+        .Add(Visual::Property::PREMULTIPLIED_ALPHA, false));
+
+    Dali::Property::Map visualMap;
+    textVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+  }
+
+  // gradient visual ( premultiplied alpha by default is true, and cannot change value )
+  {
+    Visual::Base gradientVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::GRADIENT)
+        .Add(GradientVisual::Property::START_POSITION, Vector2(-0.5f, -0.5f))
+        .Add(GradientVisual::Property::END_POSITION, Vector2(0.5f, 0.5f))
+        .Add(GradientVisual::Property::STOP_COLOR, Property::Array().Add(Color::RED).Add(Vector4(1.0f, 1.0f, 1.0f, 0.5f))));
+
+    Dali::Property::Map visualMap;
+    gradientVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+  }
+  {
+    Visual::Base gradientVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::GRADIENT)
+        .Add(GradientVisual::Property::START_POSITION, Vector2(-0.5f, -0.5f))
+        .Add(GradientVisual::Property::END_POSITION, Vector2(0.5f, 0.5f))
+        .Add(GradientVisual::Property::STOP_COLOR, Property::Array().Add(Color::RED).Add(Vector4(1.0f, 1.0f, 1.0f, 0.5f)))
+        .Add(Visual::Property::PREMULTIPLIED_ALPHA, false));
+
+    Dali::Property::Map visualMap;
+    gradientVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), true, TEST_LOCATION);
+  }
+
+  // color visual ( premultiplied alpha by default is false, and cannot change value )
+  {
+    Visual::Base colorVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::COLOR)
+        .Add(ColorVisual::Property::MIX_COLOR, Color::AQUA));
+
+    Dali::Property::Map visualMap;
+    colorVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), false, TEST_LOCATION);
+  }
+  {
+    Visual::Base colorVisual = factory.CreateVisual(
+      Property::Map()
+        .Add(Toolkit::Visual::Property::TYPE, Visual::COLOR)
+        .Add(ColorVisual::Property::MIX_COLOR, Color::AQUA)
+        .Add(Visual::Property::PREMULTIPLIED_ALPHA, true));
+
+    Dali::Property::Map visualMap;
+    colorVisual.CreatePropertyMap(visualMap);
+    Property::Value* value = visualMap.Find(Visual::Property::PREMULTIPLIED_ALPHA);
+
+    // test values
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<bool>(), false, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliRegisterVisualOrder(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Register Visual Order" );
+  tet_infoline("Register Visual Order");
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-
-  tet_infoline( "Register visual, should have depth index of 0.0f" );
-  Visual::Base testVisual = factory.CreateVisual( propertyMap );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, testVisual );
-  DALI_TEST_EQUALS( testVisual.GetDepthIndex(), 0, TEST_LOCATION );
-
-  tet_infoline( "Register more visuals, each added one should have a depth index greater than previous" );
-
-  Visual::Base testVisual2 = factory.CreateVisual( propertyMap );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, testVisual2 );
-  DALI_TEST_CHECK( testVisual2.GetDepthIndex() > testVisual.GetDepthIndex() );
-
-  Visual::Base foregroundVisual = factory.CreateVisual( propertyMap );
-  dummyImpl.RegisterVisual( DummyControl::Property::FOREGROUND_VISUAL, foregroundVisual );
-  DALI_TEST_CHECK( foregroundVisual.GetDepthIndex() > testVisual2.GetDepthIndex() );
-
-  Visual::Base focusVisual = factory.CreateVisual( propertyMap );
-  dummyImpl.RegisterVisual( DummyControl::Property::FOCUS_VISUAL, focusVisual );
-  DALI_TEST_CHECK( focusVisual.GetDepthIndex() > foregroundVisual.GetDepthIndex() );
-
-  tet_infoline( "Set depth index on a new visual before registering, the depth index should not have been changed" );
-  Visual::Base labelVisual = factory.CreateVisual( propertyMap );
-  labelVisual.SetDepthIndex( -2000 );
-  dummyImpl.RegisterVisual( DummyControl::Property::LABEL_VISUAL, labelVisual );
-  DALI_TEST_EQUALS( labelVisual.GetDepthIndex(), -2000, TEST_LOCATION );
-
-  tet_infoline( "Replace visual, the depth index should be the same as what was previously set" );
-  const int testVisual2DepthIndex = testVisual2.GetDepthIndex();
-  Visual::Base testVisual2Replacement = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( testVisual2Replacement.GetDepthIndex() != testVisual2DepthIndex );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, testVisual2Replacement );
-  DALI_TEST_EQUALS( testVisual2Replacement.GetDepthIndex(), testVisual2DepthIndex, TEST_LOCATION );
-
-  tet_infoline( "Replace visual and set a depth index on the replacement, the depth index of the replacement should be honoured" );
-  Visual::Base anotherTestVisual2Replacement = factory.CreateVisual( propertyMap );
-  anotherTestVisual2Replacement.SetDepthIndex( 2000 );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, anotherTestVisual2Replacement );
-  DALI_TEST_EQUALS( anotherTestVisual2Replacement.GetDepthIndex(), 2000, TEST_LOCATION );
-
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+
+  tet_infoline("Register visual, should have depth index of 0.0f");
+  Visual::Base testVisual = factory.CreateVisual(propertyMap);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, testVisual);
+  DALI_TEST_EQUALS(testVisual.GetDepthIndex(), 0, TEST_LOCATION);
+
+  tet_infoline("Register more visuals, each added one should have a depth index greater than previous");
+
+  Visual::Base testVisual2 = factory.CreateVisual(propertyMap);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, testVisual2);
+  DALI_TEST_CHECK(testVisual2.GetDepthIndex() > testVisual.GetDepthIndex());
+
+  Visual::Base foregroundVisual = factory.CreateVisual(propertyMap);
+  dummyImpl.RegisterVisual(DummyControl::Property::FOREGROUND_VISUAL, foregroundVisual);
+  DALI_TEST_CHECK(foregroundVisual.GetDepthIndex() > testVisual2.GetDepthIndex());
+
+  Visual::Base focusVisual = factory.CreateVisual(propertyMap);
+  dummyImpl.RegisterVisual(DummyControl::Property::FOCUS_VISUAL, focusVisual);
+  DALI_TEST_CHECK(focusVisual.GetDepthIndex() > foregroundVisual.GetDepthIndex());
+
+  tet_infoline("Set depth index on a new visual before registering, the depth index should not have been changed");
+  Visual::Base labelVisual = factory.CreateVisual(propertyMap);
+  labelVisual.SetDepthIndex(-2000);
+  dummyImpl.RegisterVisual(DummyControl::Property::LABEL_VISUAL, labelVisual);
+  DALI_TEST_EQUALS(labelVisual.GetDepthIndex(), -2000, TEST_LOCATION);
+
+  tet_infoline("Replace visual, the depth index should be the same as what was previously set");
+  const int    testVisual2DepthIndex  = testVisual2.GetDepthIndex();
+  Visual::Base testVisual2Replacement = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(testVisual2Replacement.GetDepthIndex() != testVisual2DepthIndex);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, testVisual2Replacement);
+  DALI_TEST_EQUALS(testVisual2Replacement.GetDepthIndex(), testVisual2DepthIndex, TEST_LOCATION);
+
+  tet_infoline("Replace visual and set a depth index on the replacement, the depth index of the replacement should be honoured");
+  Visual::Base anotherTestVisual2Replacement = factory.CreateVisual(propertyMap);
+  anotherTestVisual2Replacement.SetDepthIndex(2000);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, anotherTestVisual2Replacement);
+  DALI_TEST_EQUALS(anotherTestVisual2Replacement.GetDepthIndex(), 2000, TEST_LOCATION);
+
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
   END_TEST;
 }
@@ -3543,35 +3790,35 @@ int UtcDaliRegisterVisualOrder(void)
 int UtcDaliRegisterVisualOrder02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Register Visual Order with Background Set" );
+  tet_infoline("Register Visual Order with Background Set");
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
   const int backgroundDepthIndex = Toolkit::DepthIndex::BACKGROUND;
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
 
-  tet_printf( "Register a control background visual, should have depth index of %d\n", backgroundDepthIndex );
+  tet_printf("Register a control background visual, should have depth index of %d\n", backgroundDepthIndex);
 
-  dummyControl.SetProperty( Control::Property::BACKGROUND, propertyMap );
+  dummyControl.SetProperty(Control::Property::BACKGROUND, propertyMap);
 
   const int TEST_VISUAL_1_DEPTH_INDEX = 0;
-  tet_printf( "Register visual, should have depth index of %d\n", TEST_VISUAL_1_DEPTH_INDEX );
-  Visual::Base testVisual1 = factory.CreateVisual( propertyMap );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, testVisual1 );
-  DALI_TEST_EQUALS( testVisual1.GetDepthIndex(), TEST_VISUAL_1_DEPTH_INDEX , TEST_LOCATION );
+  tet_printf("Register visual, should have depth index of %d\n", TEST_VISUAL_1_DEPTH_INDEX);
+  Visual::Base testVisual1 = factory.CreateVisual(propertyMap);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, testVisual1);
+  DALI_TEST_EQUALS(testVisual1.GetDepthIndex(), TEST_VISUAL_1_DEPTH_INDEX, TEST_LOCATION);
 
-  tet_printf( "Register another visual, should have a depth index greater than previous(%d)\n", TEST_VISUAL_1_DEPTH_INDEX );
-  Visual::Base testVisual2 = factory.CreateVisual( propertyMap );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL2, testVisual2 );
-  DALI_TEST_CHECK( testVisual2.GetDepthIndex() >  testVisual1.GetDepthIndex() );
+  tet_printf("Register another visual, should have a depth index greater than previous(%d)\n", TEST_VISUAL_1_DEPTH_INDEX);
+  Visual::Base testVisual2 = factory.CreateVisual(propertyMap);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL2, testVisual2);
+  DALI_TEST_CHECK(testVisual2.GetDepthIndex() > testVisual1.GetDepthIndex());
 
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
   END_TEST;
 }
@@ -3579,36 +3826,36 @@ int UtcDaliRegisterVisualOrder02(void)
 int UtcDaliRegisterVisualWithDepthIndex(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Register a Visual With Depth Index" );
+  tet_infoline("Register a Visual With Depth Index");
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  Color::BLUE);
-
-  tet_infoline( "Register a visual with a depth index, it should be enabled by default too" );
-  Visual::Base testVisual = factory.CreateVisual( propertyMap );
-  DevelControl::RegisterVisual( dummyImpl, DummyControl::Property::TEST_VISUAL, testVisual, 203 );
-  DALI_TEST_EQUALS( testVisual.GetDepthIndex(), 203, TEST_LOCATION );
-  DALI_TEST_EQUALS( DevelControl::IsVisualEnabled( dummyImpl, DummyControl::Property::TEST_VISUAL ), true, TEST_LOCATION );
-
-  tet_infoline( "Register another visual with a depth index and it disabled" );
-  Visual::Base testVisual2 = factory.CreateVisual( propertyMap );
-  DevelControl::RegisterVisual( dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual2, false, 450 );
-  DALI_TEST_EQUALS( testVisual2.GetDepthIndex(), 450, TEST_LOCATION );
-  DALI_TEST_EQUALS( DevelControl::IsVisualEnabled( dummyImpl, DummyControl::Property::TEST_VISUAL2 ), false, TEST_LOCATION );
-
-  tet_infoline( "Register another visual with a depth index and it enabled using the enabled API" );
-  Visual::Base testVisual3 = factory.CreateVisual( propertyMap );
-  DevelControl::RegisterVisual( dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual3, true, 300 );
-  DALI_TEST_EQUALS( testVisual3.GetDepthIndex(), 300, TEST_LOCATION );
-  DALI_TEST_EQUALS( DevelControl::IsVisualEnabled( dummyImpl, DummyControl::Property::TEST_VISUAL2 ), true, TEST_LOCATION );
-
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( dummyControl );
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+
+  tet_infoline("Register a visual with a depth index, it should be enabled by default too");
+  Visual::Base testVisual = factory.CreateVisual(propertyMap);
+  DevelControl::RegisterVisual(dummyImpl, DummyControl::Property::TEST_VISUAL, testVisual, 203);
+  DALI_TEST_EQUALS(testVisual.GetDepthIndex(), 203, TEST_LOCATION);
+  DALI_TEST_EQUALS(DevelControl::IsVisualEnabled(dummyImpl, DummyControl::Property::TEST_VISUAL), true, TEST_LOCATION);
+
+  tet_infoline("Register another visual with a depth index and it disabled");
+  Visual::Base testVisual2 = factory.CreateVisual(propertyMap);
+  DevelControl::RegisterVisual(dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual2, false, 450);
+  DALI_TEST_EQUALS(testVisual2.GetDepthIndex(), 450, TEST_LOCATION);
+  DALI_TEST_EQUALS(DevelControl::IsVisualEnabled(dummyImpl, DummyControl::Property::TEST_VISUAL2), false, TEST_LOCATION);
+
+  tet_infoline("Register another visual with a depth index and it enabled using the enabled API");
+  Visual::Base testVisual3 = factory.CreateVisual(propertyMap);
+  DevelControl::RegisterVisual(dummyImpl, DummyControl::Property::TEST_VISUAL2, testVisual3, true, 300);
+  DALI_TEST_EQUALS(testVisual3.GetDepthIndex(), 300, TEST_LOCATION);
+  DALI_TEST_EQUALS(DevelControl::IsVisualEnabled(dummyImpl, DummyControl::Property::TEST_VISUAL2), true, TEST_LOCATION);
+
+  dummyControl.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(dummyControl);
 
   END_TEST;
 }
@@ -3616,120 +3863,125 @@ int UtcDaliRegisterVisualWithDepthIndex(void)
 int UtcDaliSvgVisualCustomShader(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "SvgVisual with custom shader" );
+  tet_infoline("SvgVisual with custom shader");
 
-  VisualFactory factory = VisualFactory::Get();
-  Property::Map properties;
-  Property::Map shader;
-  const std::string vertexShader = "Foobar";
-  const std::string fragmentShader = "Foobar";
+  VisualFactory     factory = VisualFactory::Get();
+  Property::Map     properties;
+  Property::Map     shader;
+  const std::string vertexShader                                   = "Foobar";
+  const std::string fragmentShader                                 = "Foobar";
   shader[Dali::Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-  shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+  shader[Dali::Toolkit::Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
-  properties[Visual::Property::TYPE] = Visual::IMAGE;
-  properties[Visual::Property::SHADER] = shader;
+  properties[Visual::Property::TYPE]     = Visual::IMAGE;
+  properties[Visual::Property::SHADER]   = shader;
   properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME;
 
-  Visual::Base visual = factory.CreateVisual( properties );
+  Visual::Base visual = factory.CreateVisual(properties);
 
   // trigger creation through setting on stage
-  DummyControl dummy = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl        dummy     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( dummy );
+  dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(dummy);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  Renderer renderer = dummy.GetRendererAt( 0 );
-  Shader shader2 = renderer.GetShader();
-  Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  Renderer        renderer = dummy.GetRendererAt(0);
+  Shader          shader2  = renderer.GetShader();
+  Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
 
-  Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-  DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION );
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  DALI_TEST_EQUALS(fragmentShader, fragment->Get<std::string>(), TEST_LOCATION);
 
-  Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-  DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION );
+  Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+  DALI_TEST_EQUALS(vertexShader, vertex->Get<std::string>(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliVisualRoundedCorner(void)
 {
-  ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualRoundedCorner" );
+  tet_infoline("UtcDaliVisualRoundedCorner");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("cornerRadiusPolicy", Property::Type::FLOAT),
-  };
-
-  TestGraphicsController& graphics = application.GetGraphicsController();
-  graphics.AddCustomUniforms(customUniforms);
+    {
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("cornerRadiusPolicy", Property::Type::FLOAT),
+    };
 
   // image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float cornerRadius = 30.0f;
+    float         cornerRadius = 30.0f;
 
-    properties[Visual::Property::TYPE] = Visual::IMAGE;
-    properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
+    properties[Visual::Property::TYPE]               = Visual::IMAGE;
+    properties[ImageVisual::Property::URL]           = TEST_IMAGE_FILE_NAME;
     properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION);
     // Default corner radius policy is absolute.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
   }
 
   // color visual 1
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float cornerRadius = 30.0f;
+    float         cornerRadius = 30.0f;
 
-    properties[Visual::Property::TYPE] = Visual::COLOR;
+    properties[Visual::Property::TYPE]           = Visual::COLOR;
     properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-    properties["cornerRadius"] = cornerRadius;
-    properties["cornerRadiusPolicy"] = Toolkit::Visual::Transform::Policy::ABSOLUTE;
+    properties["cornerRadius"]                   = cornerRadius;
+    properties["cornerRadiusPolicy"]             = Toolkit::Visual::Transform::Policy::ABSOLUTE;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -3737,34 +3989,36 @@ int UtcDaliVisualRoundedCorner(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
     // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
   }
 
   // color visual 2
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    Vector4 cornerRadius(0.5f, 0.5f, 0.5f, 0.3f);
+    Vector4       cornerRadius(0.5f, 0.5f, 0.5f, 0.3f);
 
-    properties[Visual::Property::TYPE] = Visual::COLOR;
-    properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-    properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
+    properties[Visual::Property::TYPE]                      = Visual::COLOR;
+    properties[ColorVisual::Property::MIX_COLOR]            = Color::BLUE;
+    properties[DevelVisual::Property::CORNER_RADIUS]        = cornerRadius;
     properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -3772,34 +4026,36 @@ int UtcDaliVisualRoundedCorner(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
     // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", cornerRadius), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE), true, TEST_LOCATION);
   }
 
   // color visual 3 - invalid value
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    Vector4 cornerRadius(30.0f, 30.0f, 30.0f, 20.0f);
+    Vector4       cornerRadius(30.0f, 30.0f, 30.0f, 20.0f);
 
-    properties[Visual::Property::TYPE] = Visual::COLOR;
-    properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-    properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
+    properties[Visual::Property::TYPE]                      = Visual::COLOR;
+    properties[ColorVisual::Property::MIX_COLOR]            = Color::BLUE;
+    properties[DevelVisual::Property::CORNER_RADIUS]        = cornerRadius;
     properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = -1; // Set an invalid value
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -3807,49 +4063,51 @@ int UtcDaliVisualRoundedCorner(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
     // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", cornerRadius), true, TEST_LOCATION);
     // Default corner radius policy is absolute.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
   }
 
   // gradient visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float cornerRadius = 30.0f;
+    float         cornerRadius = 30.0f;
 
-    properties[Visual::Property::TYPE] = Visual::GRADIENT;
-    properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-    properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
-    properties[GradientVisual::Property::START_POSITION] = Vector2( 0.5f, 0.5f );
-    properties[GradientVisual::Property::END_POSITION] = Vector2( -0.5f, -0.5f );
-    properties[GradientVisual::Property::UNITS] = GradientVisual::Units::USER_SPACE;
+    properties[Visual::Property::TYPE]                   = Visual::GRADIENT;
+    properties[ColorVisual::Property::MIX_COLOR]         = Color::BLUE;
+    properties[DevelVisual::Property::CORNER_RADIUS]     = cornerRadius;
+    properties[GradientVisual::Property::START_POSITION] = Vector2(0.5f, 0.5f);
+    properties[GradientVisual::Property::END_POSITION]   = Vector2(-0.5f, -0.5f);
+    properties[GradientVisual::Property::UNITS]          = GradientVisual::Units::USER_SPACE;
 
     Property::Array stopOffsets;
-    stopOffsets.PushBack( 0.0f );
-    stopOffsets.PushBack( 0.6f );
-    stopOffsets.PushBack( 1.0f );
+    stopOffsets.PushBack(0.0f);
+    stopOffsets.PushBack(0.6f);
+    stopOffsets.PushBack(1.0f);
     properties[GradientVisual::Property::STOP_OFFSET] = stopOffsets;
 
     Property::Array stopColors;
-    stopColors.PushBack( Color::RED );
-    stopColors.PushBack( Color::YELLOW );
-    stopColors.PushBack( Color::GREEN );
+    stopColors.PushBack(Color::RED);
+    stopColors.PushBack(Color::YELLOW);
+    stopColors.PushBack(Color::GREEN);
     properties[GradientVisual::Property::STOP_COLOR] = stopColors;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -3857,125 +4115,128 @@ int UtcDaliVisualRoundedCorner(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION);
     // Default corner radius policy is absolute.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
   }
 
   // animated image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    Vector4 cornerRadius(24.0f, 23.0f, 22.0f, 21.0f);
+    Vector4       cornerRadius(24.0f, 23.0f, 22.0f, 21.0f);
 
-    properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE;
-    properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME;
+    properties[Visual::Property::TYPE]               = Visual::ANIMATED_IMAGE;
+    properties[ImageVisual::Property::URL]           = TEST_GIF_FILE_NAME;
     properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius.x + 10.0f; // Dummy Input
     properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
-    properties["cornerRadiusPolicy"] = Toolkit::Visual::Transform::Policy::ABSOLUTE;
+    properties["cornerRadiusPolicy"]                 = Toolkit::Visual::Transform::Policy::ABSOLUTE;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", cornerRadius), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
   }
 
   // vector image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    Vector4 cornerRadius(27.0f, 72.0f, 11.0f, 500.5f);
+    Vector4       cornerRadius(27.0f, 72.0f, 11.0f, 500.5f);
 
-    properties[Visual::Property::TYPE] = Visual::SVG;
-    properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME;
+    properties[Visual::Property::TYPE]               = Visual::SVG;
+    properties[ImageVisual::Property::URL]           = TEST_SVG_FILE_NAME;
     properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    // Wait for loading & rasterization
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", cornerRadius), true, TEST_LOCATION);
     // Default corner radius policy is absolute.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
   }
 
   // animated vector image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float cornerRadius = 1.3f;
+    float         cornerRadius = 1.3f;
 
-    properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE;
-    properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME;
-    properties["cornerRadius"] = Vector4(1.0f, 100.0f, 10.0f, 0.1f); // Dummy Input
-    properties["cornerRadius"] = cornerRadius;
+    properties[Visual::Property::TYPE]                      = DevelVisual::ANIMATED_VECTOR_IMAGE;
+    properties[ImageVisual::Property::URL]                  = TEST_VECTOR_IMAGE_FILE_NAME;
+    properties["cornerRadius"]                              = Vector4(1.0f, 100.0f, 10.0f, 0.1f); // Dummy Input
+    properties["cornerRadius"]                              = cornerRadius;
     properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE;
+    properties["synchronousLoading"]                        = false;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    // Trigger count is 2 - load & render a frame
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE), true, TEST_LOCATION);
   }
 
   END_TEST;
@@ -3983,90 +4244,94 @@ int UtcDaliVisualRoundedCorner(void)
 
 int UtcDaliVisualBorderline(void)
 {
-  ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualBorderline" );
+  tet_infoline("UtcDaliVisualBorderline");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("cornerRadiusPolicy", Property::Type::FLOAT),
-    UniformData("borderlineWidth", Property::Type::FLOAT),
-    UniformData("borderlineColor", Property::Type::VECTOR4),
-    UniformData("borderlineOffset", Property::Type::FLOAT),
-  };
-
-  TestGraphicsController& graphics = application.GetGraphicsController();
-  graphics.AddCustomUniforms(customUniforms);
+    {
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("cornerRadiusPolicy", Property::Type::FLOAT),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineColor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT),
+    };
 
   // image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float cornerRadius = 5.0f;
-    float borderlineWidth = 30.0f;
-    Vector4 borderlineColor(1.0f, 0.0f, 0.0f, 1.0f);
-    float borderlineOffset = 1.0f;
-
-    properties[Visual::Property::TYPE] = Visual::IMAGE;
-    properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
-    properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
-    properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth;
-    properties[DevelVisual::Property::BORDERLINE_COLOR] = borderlineColor;
+    float         cornerRadius    = 5.0f;
+    float         borderlineWidth = 30.0f;
+    Vector4       borderlineColor(1.0f, 0.0f, 0.0f, 1.0f);
+    float         borderlineOffset = 1.0f;
+
+    properties[Visual::Property::TYPE]                   = Visual::IMAGE;
+    properties[ImageVisual::Property::URL]               = TEST_IMAGE_FILE_NAME;
+    properties[DevelVisual::Property::CORNER_RADIUS]     = cornerRadius;
+    properties[DevelVisual::Property::BORDERLINE_WIDTH]  = borderlineWidth;
+    properties[DevelVisual::Property::BORDERLINE_COLOR]  = borderlineColor;
     properties[DevelVisual::Property::BORDERLINE_OFFSET] = borderlineOffset;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION);
     // Default corner radius policy is absolute.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", borderlineColor), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", borderlineOffset), true, TEST_LOCATION);
   }
 
   // color visual 1
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    Vector4 cornerRadius(23.0f, 2.0f, 3.0f, 2.3f);
-    float borderlineWidth = 30.0f;
-    Vector4 borderlineColor(0.5f, 0.4f, 0.3f, 0.2f);
-    float borderlineOffset = -0.4f;
+    Vector4       cornerRadius(23.0f, 2.0f, 3.0f, 2.3f);
+    float         borderlineWidth = 30.0f;
+    Vector4       borderlineColor(0.5f, 0.4f, 0.3f, 0.2f);
+    float         borderlineOffset = -0.4f;
 
-    properties[Visual::Property::TYPE] = Visual::COLOR;
+    properties[Visual::Property::TYPE]           = Visual::COLOR;
     properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-    properties["cornerRadius"] = cornerRadius;
-    properties["borderlineWidth"] = borderlineWidth;
-    properties["borderlineColor"] = borderlineColor;
-    properties["borderlineOffset"] = borderlineOffset;
+    properties["cornerRadius"]                   = cornerRadius;
+    properties["borderlineWidth"]                = borderlineWidth;
+    properties["borderlineColor"]                = borderlineColor;
+    properties["borderlineOffset"]               = borderlineOffset;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -4074,35 +4339,36 @@ int UtcDaliVisualBorderline(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", cornerRadius), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", borderlineColor), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", borderlineOffset), true, TEST_LOCATION);
   }
 
   // color visual 2, default color, default offset
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float borderlineWidth = 30.0f;
+    float         borderlineWidth = 30.0f;
 
-    properties[Visual::Property::TYPE] = Visual::COLOR;
-    properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
+    properties[Visual::Property::TYPE]                  = Visual::COLOR;
+    properties[ColorVisual::Property::MIX_COLOR]        = Color::BLUE;
     properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -4110,40 +4376,41 @@ int UtcDaliVisualBorderline(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
     // Default borderline color is BLACK.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", Color::BLACK ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", Color::BLACK), true, TEST_LOCATION);
     // Default borderline offset is 0.0f.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", 0.0f ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", 0.0f), true, TEST_LOCATION);
   }
 
   // color visual 3, offset not [-1.0 ~ 1.0], but uniform value is same anyway
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float borderlineWidth = 30.0f;
-    Vector4 borderlineColor(0.5f, 0.4f, 0.3f, 0.2f);
-    float borderlineOffset = 37.4f;
+    float         borderlineWidth = 30.0f;
+    Vector4       borderlineColor(0.5f, 0.4f, 0.3f, 0.2f);
+    float         borderlineOffset = 37.4f;
 
-    properties[Visual::Property::TYPE] = Visual::COLOR;
+    properties[Visual::Property::TYPE]           = Visual::COLOR;
     properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-    properties["borderlineWidth"] = borderlineWidth;
-    properties["borderlineColor"] = borderlineColor;
-    properties["borderlineOffset"] = borderlineOffset;
+    properties["borderlineWidth"]                = borderlineWidth;
+    properties["borderlineColor"]                = borderlineColor;
+    properties["borderlineOffset"]               = borderlineOffset;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -4151,52 +4418,53 @@ int UtcDaliVisualBorderline(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", borderlineColor), true, TEST_LOCATION);
     // NOTE : borderlineOffset will clamp in fragment shader. not visual itself
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", borderlineOffset), true, TEST_LOCATION);
   }
 
   // gradient visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float borderlineWidth = 30.0f;
-    float cornerRadius = 70.0f;
+    float         borderlineWidth = 30.0f;
+    float         cornerRadius    = 70.0f;
 
-    properties[Visual::Property::TYPE] = Visual::GRADIENT;
-    properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-    properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
-    properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth;
-    properties[GradientVisual::Property::START_POSITION] = Vector2( 0.5f, 0.5f );
-    properties[GradientVisual::Property::END_POSITION] = Vector2( -0.5f, -0.5f );
-    properties[GradientVisual::Property::UNITS] = GradientVisual::Units::USER_SPACE;
+    properties[Visual::Property::TYPE]                   = Visual::GRADIENT;
+    properties[ColorVisual::Property::MIX_COLOR]         = Color::BLUE;
+    properties[DevelVisual::Property::CORNER_RADIUS]     = cornerRadius;
+    properties[DevelVisual::Property::BORDERLINE_WIDTH]  = borderlineWidth;
+    properties[GradientVisual::Property::START_POSITION] = Vector2(0.5f, 0.5f);
+    properties[GradientVisual::Property::END_POSITION]   = Vector2(-0.5f, -0.5f);
+    properties[GradientVisual::Property::UNITS]          = GradientVisual::Units::USER_SPACE;
 
     Property::Array stopOffsets;
-    stopOffsets.PushBack( 0.0f );
-    stopOffsets.PushBack( 0.6f );
-    stopOffsets.PushBack( 1.0f );
+    stopOffsets.PushBack(0.0f);
+    stopOffsets.PushBack(0.6f);
+    stopOffsets.PushBack(1.0f);
     properties[GradientVisual::Property::STOP_OFFSET] = stopOffsets;
 
     Property::Array stopColors;
-    stopColors.PushBack( Color::RED );
-    stopColors.PushBack( Color::YELLOW );
-    stopColors.PushBack( Color::GREEN );
+    stopColors.PushBack(Color::RED);
+    stopColors.PushBack(Color::YELLOW);
+    stopColors.PushBack(Color::GREEN);
     properties[GradientVisual::Property::STOP_COLOR] = stopColors;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
@@ -4204,186 +4472,425 @@ int UtcDaliVisualBorderline(void)
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius) ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)), true, TEST_LOCATION);
     // Default corner radius policy is absolute.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
     // Default borderline color is BLACK.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", Color::BLACK ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", Color::BLACK), true, TEST_LOCATION);
     // Default borderline offset is 0.0f.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", 0.0f ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", 0.0f), true, TEST_LOCATION);
   }
 
   // animated image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    float borderlineWidth = 24.0f;
-    float borderlineOffset = -1.0f;
+    float         borderlineWidth  = 24.0f;
+    float         borderlineOffset = -1.0f;
 
-    properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE;
-    properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME;
+    properties[Visual::Property::TYPE]                  = Visual::ANIMATED_IMAGE;
+    properties[ImageVisual::Property::URL]              = TEST_GIF_FILE_NAME;
     properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth + 10.0f; // Dummy Input
     properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth;
-    properties["borderlineOffset"] = borderlineOffset;
+    properties["borderlineOffset"]                      = borderlineOffset;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
     // Default borderline color is BLACK.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", Color::BLACK ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", Color::BLACK), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", borderlineOffset), true, TEST_LOCATION);
   }
 
   // vector image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    Vector4 cornerRadius(54.0f, 43.0f, 32.0f, 21.0f);
-    float borderlineWidth = 27.0f;
-    Vector4 borderlineColor(0.5f, 0.5f, 0.5f, 0.0f);
+    Vector4       cornerRadius(54.0f, 43.0f, 32.0f, 21.0f);
+    float         borderlineWidth = 27.0f;
+    Vector4       borderlineColor(0.5f, 0.5f, 0.5f, 0.0f);
 
-    properties[Visual::Property::TYPE] = Visual::SVG;
-    properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME;
-    properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius;
+    properties[Visual::Property::TYPE]                  = Visual::SVG;
+    properties[ImageVisual::Property::URL]              = TEST_SVG_FILE_NAME;
+    properties[DevelVisual::Property::CORNER_RADIUS]    = cornerRadius;
     properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth;
     properties[DevelVisual::Property::BORDERLINE_COLOR] = borderlineColor;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    // Wait for loading & rasterization
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", cornerRadius), true, TEST_LOCATION);
     // Default corner radius policy is absolute.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::ABSOLUTE), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", borderlineColor), true, TEST_LOCATION);
     // Default borderline offset is 0.0.
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", 0.0f ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", 0.0f), true, TEST_LOCATION);
   }
 
   // animated vector image visual
   {
+    ToolkitTestApplication  application;
+    TestGraphicsController& graphics = application.GetGraphicsController();
+    graphics.AddCustomUniforms(customUniforms);
+
     VisualFactory factory = VisualFactory::Get();
     Property::Map properties;
-    Vector4 cornerRadius(1.3f, 0.0f, 0.4f, 0.2f);
-    float borderlineWidth = 13.0f;
-    Vector4 borderlineColor(0.3f, 0.3f, 0.3f, 1.0f);
-    float borderlineOffset = 13.0f;
-
-    properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE;
-    properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME;
-    properties["cornerRadius"] = cornerRadius;
+    Vector4       cornerRadius(1.3f, 0.0f, 0.4f, 0.2f);
+    float         borderlineWidth = 13.0f;
+    Vector4       borderlineColor(0.3f, 0.3f, 0.3f, 1.0f);
+    float         borderlineOffset = 13.0f;
+
+    properties[Visual::Property::TYPE]                      = DevelVisual::ANIMATED_VECTOR_IMAGE;
+    properties[ImageVisual::Property::URL]                  = TEST_VECTOR_IMAGE_FILE_NAME;
+    properties["cornerRadius"]                              = cornerRadius;
     properties[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE;
-    properties[DevelVisual::Property::BORDERLINE_WIDTH] = borderlineWidth;
-    properties["borderlineColor"] = borderlineColor;
-    properties[DevelVisual::Property::BORDERLINE_OFFSET] = borderlineOffset;
+    properties[DevelVisual::Property::BORDERLINE_WIDTH]     = borderlineWidth;
+    properties["borderlineColor"]                           = borderlineColor;
+    properties[DevelVisual::Property::BORDERLINE_OFFSET]    = borderlineOffset;
+    properties[ImageVisual::Property::SYNCHRONOUS_LOADING]  = false;
 
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual = factory.CreateVisual(properties);
 
     // trigger creation through setting on stage
-    DummyControl dummy = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummy     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    application.GetScene().Add( dummy );
+    dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(dummy);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    // Trigger count is 2 - load & render a frame
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-#ifdef OLD_GRAPHICS_TEST
-    // Currently test with multiple program doesn't work well. will fix another day
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "cornerRadius", cornerRadius ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineWidth", borderlineWidth ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< Vector4 >( "borderlineColor", borderlineColor ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "borderlineOffset", borderlineOffset ), true, TEST_LOCATION );
-#endif
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", cornerRadius), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("cornerRadiusPolicy", Toolkit::Visual::Transform::Policy::RELATIVE), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", borderlineWidth), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", borderlineColor), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", borderlineOffset), true, TEST_LOCATION);
   }
 
   END_TEST;
 }
 
+int UtcDaliVisualBorderlineBlendModeTest(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualBorderlineBlendModeTest");
+  VisualFactory factory = VisualFactory::Get();
 
-int UtcDaliColorVisualBlurRadius(void)
+  // Case 1 : Test which doesn't support borderline feature.
+  {
+    tet_printf("Test Unsupported visual type\n");
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER);
+    propertyMap.Insert(BorderVisual::Property::COLOR, Color::BLUE);
+    propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f);
+    Visual::Base borderVisual = factory.CreateVisual(propertyMap);
+
+    DummyControl        actor     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, borderVisual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+    actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(actor);
+
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+    Renderer renderer = actor.GetRendererAt(0);
+
+    Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+    // Visual::BORDER doesn't support BORDERLINE. BlendMode is AUTO.
+    DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION);
+
+    application.GetScene().Remove(actor);
+  }
+
+  // Case 2 : Test which support borderline feature.
+  {
+    tet_printf("Test normal case\n");
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+    propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+    propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f);
+    Visual::Base colorVisual = factory.CreateVisual(propertyMap);
+
+    DummyControl        actor     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+    actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(actor);
+
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+    Renderer renderer = actor.GetRendererAt(0);
+
+    Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+    // Visual::COLOR support BORDERLINE. BlendMode is ON_WITHOUT_CULL.
+    DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION);
+
+    application.GetScene().Remove(actor);
+  }
+
+  // Case 3 : Test which animated borderline.
+  {
+    tet_printf("Test borderline animate case\n");
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+    propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+    Visual::Base colorVisual = factory.CreateVisual(propertyMap);
+
+    DummyControl        actor     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+    actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(actor);
+
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+    Renderer renderer = actor.GetRendererAt(0);
+
+    Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+    // BlendMode is AUTO.
+    DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::AUTO, TEST_LOCATION);
+
+    Animation animation = Animation::New(0.1f);
+    animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_WIDTH), 1.0f);
+    animation.Play();
+
+    application.SendNotification();
+    application.Render();
+    application.Render(101u); // End of animation
+
+    blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+    // BlendMode is ON_WITHOUT_CULL.
+    DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION);
+
+    Animation revanimation = Animation::New(0.1f);
+    revanimation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_WIDTH), 0.0f);
+    revanimation.Play();
+
+    application.SendNotification();
+    application.Render();
+    application.Render(101u); // End of animation
+
+    blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+    // BlendMode is still ON_WITHOUT_CULL.
+    DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION);
+
+    application.GetScene().Remove(actor);
+  }
+
+  // Case 4 : Test which animated corner radius occur.
+  {
+    tet_printf("Test borderline animate case\n");
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+    propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+    propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f);
+    Visual::Base colorVisual = factory.CreateVisual(propertyMap);
+
+    DummyControl        actor     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+    actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(actor);
+
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+    Renderer renderer = actor.GetRendererAt(0);
+
+    Property::Value blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+    // BlendMode is ON_WITHOUT_CULL.
+    DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION);
+
+    Animation animation = Animation::New(0.1f);
+    animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::CORNER_RADIUS), Vector4(1.0f, 1.0f, 1.0f, 1.0f));
+    animation.Play();
+
+    application.SendNotification();
+    application.Render();
+    application.Render(101u); // End of animation
+
+    blendModeValue = renderer.GetProperty(Renderer::Property::BLEND_MODE);
+    // BlendMode is ON_WITHOUT_CULL.
+    DALI_TEST_EQUALS(blendModeValue.Get<int>(), (int)BlendMode::ON_WITHOUT_CULL, TEST_LOCATION);
+
+    application.GetScene().Remove(actor);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliVisualBorderlineColorAnimateTest(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliColorVisualBlurRadius" );
+  tet_infoline("UtcDaliVisualBorderlineColorAnimateTest color");
 
+  TestGraphicsController&         graphics = application.GetGraphicsController();
   static std::vector<UniformData> customUniforms =
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("cornerRadiusPolicy", Property::Type::FLOAT),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineColor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT),
+    };
+  graphics.AddCustomUniforms(customUniforms);
+
   {
-    UniformData("blurRadius", Property::Type::FLOAT),
-  };
+    const Vector3 INITIAL_MIX_COLOR(1.0f, 0.0f, 1.0f);
+    const float   INITIAL_MIX_OPACITY(0.5f);
+    const Vector4 INITIAL_BORDERLINE_COLOR(0.0f, 1.0f, 0.0f, 1.0f);
+    const float   INITIAL_ACTOR_OPACITY(1.0f);
+    const Vector3 TARGET_MIX_COLOR(1.0f, 0.0f, 0.0f);
+    const float   TARGET_MIX_OPACITY(0.8f);
+    const Vector4 TARGET_BORDERLINE_COLOR(1.0f, 0.0f, 1.0f, 0.2f);
+    const float   TARGET_ACTOR_OPACITY(0.5f);
+
+    VisualFactory factory = VisualFactory::Get();
+    Property::Map propertyMap;
+    propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+    propertyMap.Insert(Visual::Property::MIX_COLOR, INITIAL_MIX_COLOR);
+    propertyMap.Insert(Visual::Property::OPACITY, INITIAL_MIX_OPACITY);
+    propertyMap.Insert(DevelVisual::Property::BORDERLINE_WIDTH, 1.0f);
+    propertyMap.Insert(DevelVisual::Property::BORDERLINE_COLOR, INITIAL_BORDERLINE_COLOR);
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+
+    DummyControl        actor     = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+    actor.SetProperty(Actor::Property::SIZE, Vector2(2000.f, 2000.f));
+    actor.SetProperty(Actor::Property::OPACITY, INITIAL_ACTOR_OPACITY);
+    actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(actor);
+
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+    Animation animation = Animation::New(4.0f);
+    animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, Visual::Property::MIX_COLOR), TARGET_MIX_COLOR);
+    animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), TARGET_MIX_OPACITY);
+    animation.AnimateTo(DevelControl::GetVisualProperty(actor, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_COLOR), TARGET_BORDERLINE_COLOR);
+    animation.AnimateTo(Property(actor, Actor::Property::OPACITY), TARGET_ACTOR_OPACITY);
+    animation.Play();
+
+    TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+
+    application.SendNotification();
+    application.Render(0);
+    application.Render(2000u); // halfway point
+    application.SendNotification();
+
+    Vector3 halfwayMixColor        = (INITIAL_MIX_COLOR + TARGET_MIX_COLOR) * 0.5f;
+    float   halfwayMixOpacity      = (INITIAL_MIX_OPACITY + TARGET_MIX_OPACITY) * 0.5f;
+    Vector4 halfwayBorderlineColor = (INITIAL_BORDERLINE_COLOR + TARGET_BORDERLINE_COLOR) * 0.5f;
+    float   halfwayActorOpacity    = (INITIAL_ACTOR_OPACITY + TARGET_ACTOR_OPACITY) * 0.5f;
+    halfwayMixOpacity *= halfwayActorOpacity;
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector3>("mixColor", halfwayMixColor), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector4>("uColor", Vector4(1.0f, 1.0f, 1.0f, halfwayMixOpacity)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector4>("uActorColor", Vector4(1.0f, 1.0f, 1.0f, halfwayActorOpacity)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector4>("borderlineColor", halfwayBorderlineColor), true, TEST_LOCATION);
+
+    application.Render(2001u);      // go past end
+    application.SendNotification(); // Trigger signals
+
+    DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector4>(Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, TARGET_ACTOR_OPACITY), TEST_LOCATION);
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector3>("mixColor", TARGET_MIX_COLOR), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector4>("uColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_MIX_OPACITY * TARGET_ACTOR_OPACITY)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector4>("uActorColor", Vector4(1.0f, 1.0f, 1.0f, TARGET_ACTOR_OPACITY)), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(glAbstraction.CheckUniformValue<Vector4>("borderlineColor", TARGET_BORDERLINE_COLOR), true, TEST_LOCATION);
+
+    actor.Unparent();
+  }
+
+  END_TEST;
+}
+
+int UtcDaliColorVisualBlurRadius(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliColorVisualBlurRadius");
+
+  static std::vector<UniformData> customUniforms =
+    {
+      UniformData("blurRadius", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map properties;
-  float blurRadius = 20.0f;
+  float         blurRadius = 20.0f;
 
-  properties[Visual::Property::TYPE] = Visual::COLOR;
+  properties[Visual::Property::TYPE]           = Visual::COLOR;
   properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
-  properties["blurRadius"] = blurRadius;
+  properties["blurRadius"]                     = blurRadius;
 
-  Visual::Base visual = factory.CreateVisual( properties );
+  Visual::Base visual = factory.CreateVisual(properties);
 
   // trigger creation through setting on stage
-  DummyControl dummy = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl        dummy     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( dummy );
+  dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(dummy);
 
   application.SendNotification();
   application.Render();
@@ -4391,7 +4898,7 @@ int UtcDaliColorVisualBlurRadius(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "blurRadius", blurRadius ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("blurRadius", blurRadius), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -4399,134 +4906,134 @@ int UtcDaliColorVisualBlurRadius(void)
 int UtcDaliVisualGetType(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetType" );
+  tet_infoline("UtcDaliVisualGetType");
 
   VisualFactory factory = VisualFactory::Get();
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = Visual::BORDER;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::BORDER );
+    DALI_TEST_CHECK(visual.GetType() == Visual::BORDER);
   }
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = Visual::COLOR;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::COLOR );
+    DALI_TEST_CHECK(visual.GetType() == Visual::COLOR);
   }
 
   {
     Property::Map properties;
-    properties[Visual::Property::TYPE] = Visual::GRADIENT;
-    properties[GradientVisual::Property::START_POSITION] = Vector2( -1.f, -1.f );
-    properties[GradientVisual::Property::END_POSITION] = Vector2( 1.f, 1.f );
-    properties[GradientVisual::Property::STOP_OFFSET] = Vector2(0.f, 1.f);
+    properties[Visual::Property::TYPE]                   = Visual::GRADIENT;
+    properties[GradientVisual::Property::START_POSITION] = Vector2(-1.f, -1.f);
+    properties[GradientVisual::Property::END_POSITION]   = Vector2(1.f, 1.f);
+    properties[GradientVisual::Property::STOP_OFFSET]    = Vector2(0.f, 1.f);
     // propertyMap.Insert( GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT) ;
     Property::Array stopColors;
-    stopColors.PushBack( Color::RED );
-    stopColors.PushBack( Color::GREEN );
+    stopColors.PushBack(Color::RED);
+    stopColors.PushBack(Color::GREEN);
     properties[GradientVisual::Property::STOP_COLOR] = stopColors;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                              = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::GRADIENT );
+    DALI_TEST_CHECK(visual.GetType() == Visual::GRADIENT);
   }
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = Visual::IMAGE;
-    properties.Insert( ImageVisual::Property::URL,  TEST_IMAGE_FILE_NAME );
-    Visual::Base visual = factory.CreateVisual( properties );
+    properties.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+    Visual::Base visual = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::IMAGE );
+    DALI_TEST_CHECK(visual.GetType() == Visual::IMAGE);
   }
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = Visual::MESH;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::MESH );
+    DALI_TEST_CHECK(visual.GetType() == Visual::MESH);
   }
 
   {
     Property::Map properties;
-    properties[Visual::Property::TYPE] = Visual::PRIMITIVE;
+    properties[Visual::Property::TYPE]           = Visual::PRIMITIVE;
     properties[PrimitiveVisual::Property::SHAPE] = PrimitiveVisual::Shape::CUBE;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                          = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::PRIMITIVE );
+    DALI_TEST_CHECK(visual.GetType() == Visual::PRIMITIVE);
   }
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = Visual::WIREFRAME;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::WIREFRAME );
+    DALI_TEST_CHECK(visual.GetType() == Visual::WIREFRAME);
   }
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = Visual::TEXT;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::TEXT );
+    DALI_TEST_CHECK(visual.GetType() == Visual::TEXT);
   }
 
   {
     Property::Map properties;
-    properties[Visual::Property::TYPE] = Visual::N_PATCH;
-    properties[ImageVisual::Property::URL] =  TEST_NPATCH_FILE_NAME;
-    Visual::Base visual = factory.CreateVisual( properties );
+    properties[Visual::Property::TYPE]     = Visual::N_PATCH;
+    properties[ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME;
+    Visual::Base visual                    = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::N_PATCH );
+    DALI_TEST_CHECK(visual.GetType() == Visual::N_PATCH);
   }
 
   {
     Property::Map properties;
-    properties[Visual::Property::TYPE] = Visual::SVG;
+    properties[Visual::Property::TYPE]     = Visual::SVG;
     properties[ImageVisual::Property::URL] = TEST_SVG_FILE_NAME;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                    = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::SVG );
+    DALI_TEST_CHECK(visual.GetType() == Visual::SVG);
   }
 
   {
     Property::Map properties;
-    properties[Visual::Property::TYPE] = Visual::ANIMATED_IMAGE;
+    properties[Visual::Property::TYPE]     = Visual::ANIMATED_IMAGE;
     properties[ImageVisual::Property::URL] = TEST_GIF_FILE_NAME;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                    = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == Visual::ANIMATED_IMAGE );
+    DALI_TEST_CHECK(visual.GetType() == Visual::ANIMATED_IMAGE);
   }
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_GRADIENT;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == static_cast<Visual::Type>( DevelVisual::ANIMATED_GRADIENT ) );
+    DALI_TEST_CHECK(visual.GetType() == static_cast<Visual::Type>(DevelVisual::ANIMATED_GRADIENT));
   }
 
   {
     Property::Map properties;
-    properties[Visual::Property::TYPE] = DevelVisual::ANIMATED_VECTOR_IMAGE;
+    properties[Visual::Property::TYPE]     = DevelVisual::ANIMATED_VECTOR_IMAGE;
     properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                    = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == static_cast<Visual::Type>( DevelVisual::ANIMATED_VECTOR_IMAGE ) );
+    DALI_TEST_CHECK(visual.GetType() == static_cast<Visual::Type>(DevelVisual::ANIMATED_VECTOR_IMAGE));
   }
 
   {
     Property::Map properties;
     properties[Visual::Property::TYPE] = DevelVisual::ARC;
-    Visual::Base visual = factory.CreateVisual( properties );
+    Visual::Base visual                = factory.CreateVisual(properties);
 
-    DALI_TEST_CHECK( visual.GetType() == static_cast<Visual::Type>( DevelVisual::ARC ) );
+    DALI_TEST_CHECK(visual.GetType() == static_cast<Visual::Type>(DevelVisual::ARC));
   }
 
   END_TEST;
@@ -4535,19 +5042,18 @@ int UtcDaliVisualGetType(void)
 int UtcDaliVisualGetVisualProperty01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetVisualProperty01: Test animatable property, Visual::Base, ColorVisual" );
+  tet_infoline("UtcDaliVisualGetVisualProperty01: Test animatable property, Visual::Base, ColorVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("mixColor", Property::Type::VECTOR3),
-    UniformData("offset", Property::Type::VECTOR2),
-    UniformData("size", Property::Type::VECTOR2),
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("blurRadius", Property::Type::FLOAT),
-    UniformData("borderlineWidth", Property::Type::FLOAT),
-    UniformData("borderlineColor", Property::Type::VECTOR4),
-    UniformData("borderlineOffset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+      UniformData("offset", Property::Type::VECTOR2),
+      UniformData("size", Property::Type::VECTOR2),
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("blurRadius", Property::Type::FLOAT),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineColor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT)};
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -4564,8 +5070,8 @@ int UtcDaliVisualGetVisualProperty01(void)
   propertyMap.Insert(DevelVisual::Property::BORDERLINE_OFFSET, 1.0f);
   Visual::Base colorVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual);
   dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
   application.GetScene().Add(dummyControl);
@@ -4576,12 +5082,12 @@ int UtcDaliVisualGetVisualProperty01(void)
   Vector3 targetColor(1.0f, 1.0f, 1.0f);
   Vector2 targetOffset(0.05f, 0.05f);
   Vector2 targetSize(1.1f, 1.1f);
-  float targetOpacity = 0.5f;
+  float   targetOpacity = 0.5f;
   Vector4 targetCornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
-  float targetBlurRadius = 10.0f;
-  float targetBorderlineWidth = 25.0f;
+  float   targetBlurRadius      = 10.0f;
+  float   targetBorderlineWidth = 25.0f;
   Vector4 targetBorderlineColor(1.0f, 1.0f, 1.0f, 1.0f);
-  float targetBorderlineOffset = -1.0f;
+  float   targetBorderlineOffset = -1.0f;
 
   Animation animation = Animation::New(1.0f);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::MIX_COLOR), targetColor);
@@ -4600,15 +5106,15 @@ int UtcDaliVisualGetVisualProperty01(void)
   application.Render(1001u); // End of animation
 
   Property::Map resultMap;
-  colorVisual.CreatePropertyMap( resultMap );
+  colorVisual.CreatePropertyMap(resultMap);
 
   // Test property values: they should be updated
   Property::Value* colorValue = resultMap.Find(ColorVisual::Property::MIX_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(colorValue);
   DALI_TEST_EQUALS(colorValue->Get<Vector4>(), Vector4(targetColor.r, targetColor.g, targetColor.b, targetOpacity), TEST_LOCATION);
 
-  Property::Value* transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM);
-  Dali::Property::Map* transformMap = transformValue->GetMap();
+  Property::Value*     transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM);
+  Dali::Property::Map* transformMap   = transformValue->GetMap();
   DALI_TEST_CHECK(transformMap);
 
   Property::Value* offsetValue = transformMap->Find(Toolkit::Visual::Transform::Property::OFFSET);
@@ -4621,23 +5127,23 @@ int UtcDaliVisualGetVisualProperty01(void)
 
   Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
   DALI_TEST_CHECK(cornerRadiusValue);
-  DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
 
   Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
   DALI_TEST_CHECK(blurRadiusValue);
-  DALI_TEST_EQUALS(blurRadiusValue->Get< float >(), targetBlurRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(blurRadiusValue->Get<float>(), targetBlurRadius, TEST_LOCATION);
 
   Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
   DALI_TEST_CHECK(borderlineWidthValue);
-  DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
 
   Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(borderlineColorValue);
-  DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
 
   Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
   DALI_TEST_CHECK(borderlineOffsetValue);
-  DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
 
   // Test uniform values
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", targetColor), true, TEST_LOCATION);
@@ -4649,11 +5155,6 @@ int UtcDaliVisualGetVisualProperty01(void)
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", targetBorderlineColor), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", targetBorderlineOffset), true, TEST_LOCATION);
 
-  // Test not-supported property
-  Property property1 = DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::PREMULTIPLIED_ALPHA);
-  DALI_TEST_CHECK(!property1.object);
-  DALI_TEST_CHECK(property1.propertyIndex == Property::INVALID_INDEX);
-
   // Test unregistered visual
   Property property3 = DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL2, Visual::Property::MIX_COLOR);
   DALI_TEST_CHECK(!property3.object);
@@ -4665,19 +5166,19 @@ int UtcDaliVisualGetVisualProperty01(void)
 int UtcDaliVisualGetVisualProperty02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetVisualProperty02: Test animatable property, ColorVisual" );
+  tet_infoline("UtcDaliVisualGetVisualProperty02: Test animatable property, ColorVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("mixColor", Property::Type::VECTOR3),
-    UniformData("offset", Property::Type::VECTOR2),
-    UniformData("size", Property::Type::VECTOR2),
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("borderlineWidth", Property::Type::FLOAT),
-    UniformData("borderlineCOlor", Property::Type::VECTOR4),
-    UniformData("borderlineOffset", Property::Type::FLOAT),
-    UniformData("blurRadius", Property::Type::FLOAT),
-  };
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+      UniformData("offset", Property::Type::VECTOR2),
+      UniformData("size", Property::Type::VECTOR2),
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineCOlor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT),
+      UniformData("blurRadius", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -4687,8 +5188,8 @@ int UtcDaliVisualGetVisualProperty02(void)
   propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
   Visual::Base colorVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, colorVisual);
   dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
   application.GetScene().Add(dummyControl);
@@ -4699,12 +5200,12 @@ int UtcDaliVisualGetVisualProperty02(void)
   Vector3 targetColor(1.0f, 1.0f, 1.0f);
   Vector2 targetOffset(0.05f, 0.05f);
   Vector2 targetSize(1.1f, 1.1f);
-  float targetOpacity = 0.5f;
+  float   targetOpacity = 0.5f;
   Vector4 targetCornerRadius(20.0f, 0.0f, 20.0f, 0.0f);
-  float targetBorderlineWidth = 77.7f;
+  float   targetBorderlineWidth = 77.7f;
   Vector4 targetBorderlineColor(0.4f, 0.2f, 0.3f, 0.9f);
-  float targetBorderlineOffset = 1.0f;
-  float targetBlurRadius = 10.0f;
+  float   targetBorderlineOffset = 1.0f;
+  float   targetBlurRadius       = 10.0f;
 
   // Should work when the properties are not set before
   Animation animation = Animation::New(1.0f);
@@ -4731,8 +5232,8 @@ int UtcDaliVisualGetVisualProperty02(void)
   DALI_TEST_CHECK(colorValue);
   DALI_TEST_EQUALS(colorValue->Get<Vector4>(), Vector4(targetColor.r, targetColor.g, targetColor.b, targetOpacity), TEST_LOCATION);
 
-  Property::Value* transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM);
-  Dali::Property::Map* transformMap = transformValue->GetMap();
+  Property::Value*     transformValue = resultMap.Find(Dali::Toolkit::Visual::Property::TRANSFORM);
+  Dali::Property::Map* transformMap   = transformValue->GetMap();
   DALI_TEST_CHECK(transformMap);
 
   Property::Value* offsetValue = transformMap->Find(Toolkit::Visual::Transform::Property::OFFSET);
@@ -4745,33 +5246,30 @@ int UtcDaliVisualGetVisualProperty02(void)
 
   Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
   DALI_TEST_CHECK(cornerRadiusValue);
-  DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
 
   Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
   DALI_TEST_CHECK(borderlineWidthValue);
-  DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
 
   Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(borderlineColorValue);
-  DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
 
   Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
   DALI_TEST_CHECK(borderlineOffsetValue);
-  DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
 
   Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
   DALI_TEST_CHECK(blurRadiusValue);
-  DALI_TEST_EQUALS(blurRadiusValue->Get< float >(), targetBlurRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(blurRadiusValue->Get<float>(), targetBlurRadius, TEST_LOCATION);
 
-#ifdef OLD_GRAPHICS_TEST
-  // Currently test with multiple program doesn't work well. will fix another day
   // Test uniform values
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector3>("mixColor", targetColor), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector2>("offset", targetOffset), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector2>("size", targetSize), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", targetCornerRadius), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("blurRadius", targetBlurRadius), true, TEST_LOCATION);
-#endif
 
   END_TEST;
 }
@@ -4779,15 +5277,16 @@ int UtcDaliVisualGetVisualProperty02(void)
 int UtcDaliVisualGetVisualProperty03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetVisualProperty03: Test animatable property, ImageVisual" );
+  tet_infoline("UtcDaliVisualGetVisualProperty03: Test animatable property, ImageVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("borderlineWidth", Property::Type::FLOAT),
-    UniformData("borderlineColor", Property::Type::VECTOR4),
-    UniformData("borderlineOffset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("pixelArea", Property::Type::VECTOR4),
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineColor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -4799,8 +5298,8 @@ int UtcDaliVisualGetVisualProperty03(void)
 
   Visual::Base imageVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
   dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
   application.GetScene().Add(dummyControl);
@@ -4811,14 +5310,16 @@ int UtcDaliVisualGetVisualProperty03(void)
   application.SendNotification();
   application.Render();
 
-  float targetOpacity = 0.5f;
+  float   targetOpacity = 0.5f;
+  Vector4 targetPixelArea(0.0f, 1.0f, 2.0f, -0.5f);
   Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f);
-  float targetBorderlineWidth = 10.0f;
+  float   targetBorderlineWidth = 10.0f;
   Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f);
-  float targetBorderlineOffset = -1.5f;
+  float   targetBorderlineOffset = -1.5f;
 
   Animation animation = Animation::New(1.0f);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity);
+  animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, ImageVisual::Property::PIXEL_AREA), targetPixelArea);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::CORNER_RADIUS), targetCornerRadius);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_WIDTH), targetBorderlineWidth);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::BORDERLINE_COLOR), targetBorderlineColor);
@@ -4830,37 +5331,42 @@ int UtcDaliVisualGetVisualProperty03(void)
   application.Render(1001u); // End of animation
 
   Property::Map resultMap;
-  imageVisual.CreatePropertyMap( resultMap );
+  imageVisual.CreatePropertyMap(resultMap);
 
   // Test property values: they should be updated
   Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(colorValue);
   DALI_TEST_EQUALS(colorValue->Get<Vector4>(), Vector4(1.0f, 1.0f, 1.0f, targetOpacity), TEST_LOCATION);
 
+  Property::Value* pixelAreaValue = resultMap.Find(ImageVisual::Property::PIXEL_AREA, Property::VECTOR4);
+  DALI_TEST_CHECK(pixelAreaValue);
+  DALI_TEST_EQUALS(pixelAreaValue->Get<Vector4>(), targetPixelArea, TEST_LOCATION);
+
   Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
   DALI_TEST_CHECK(cornerRadiusValue);
-  DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
 
   Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
   DALI_TEST_CHECK(borderlineWidthValue);
-  DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
 
   Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(borderlineColorValue);
-  DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
 
   Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
   DALI_TEST_CHECK(borderlineOffsetValue);
-  DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
 
-#ifdef OLD_GRAPHICS_TEST
-  // Currently test with multiple program doesn't work well. will fix another day
   // Test uniform value
+  DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("pixelArea", targetPixelArea), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", targetCornerRadius), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", targetBorderlineWidth), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", targetBorderlineColor), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", targetBorderlineOffset), true, TEST_LOCATION);
-#endif
+
+  // Test non-animatable index, for coverage.
+  DALI_TEST_EQUALS(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, ImageVisual::Property::URL).propertyIndex, Property::INVALID_INDEX, TEST_LOCATION);
 
   END_TEST;
 }
@@ -4868,25 +5374,25 @@ int UtcDaliVisualGetVisualProperty03(void)
 int UtcDaliVisualGetVisualProperty04(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetVisualProperty04: Test animatable property, GradientVisual" );
+  tet_infoline("UtcDaliVisualGetVisualProperty04: Test animatable property, GradientVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-  };
+    {
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
-  Vector2 start(-1.f, -1.f);
-  Vector2 end(1.f, 1.f);
+  Vector2         start(-1.f, -1.f);
+  Vector2         end(1.f, 1.f);
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::GREEN );
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::GREEN);
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT);
   propertyMap.Insert(GradientVisual::Property::START_POSITION, start);
   propertyMap.Insert(GradientVisual::Property::END_POSITION, end);
   propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, Vector2(0.f, 1.f));
@@ -4894,8 +5400,8 @@ int UtcDaliVisualGetVisualProperty04(void)
   propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
   Visual::Base gradientVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, gradientVisual);
   dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
   application.GetScene().Add(dummyControl);
@@ -4903,7 +5409,7 @@ int UtcDaliVisualGetVisualProperty04(void)
   application.SendNotification();
   application.Render();
 
-  float targetOpacity = 0.5f;
+  float   targetOpacity = 0.5f;
   Vector4 targetCornerRadius(20.0f, 30.0f, 10.0f, 20.0f);
 
   Animation animation = Animation::New(1.0f);
@@ -4916,7 +5422,7 @@ int UtcDaliVisualGetVisualProperty04(void)
   application.Render(1001u); // End of animation
 
   Property::Map resultMap;
-  gradientVisual.CreatePropertyMap( resultMap );
+  gradientVisual.CreatePropertyMap(resultMap);
 
   // Test property values: they should be updated
   Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
@@ -4925,13 +5431,10 @@ int UtcDaliVisualGetVisualProperty04(void)
 
   Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
   DALI_TEST_CHECK(cornerRadiusValue);
-  DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
 
-#ifdef OLD_GRAPHICS_TEST
-  // Currently test with multiple program doesn't work well. will fix another day
   // Test uniform value
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", targetCornerRadius), true, TEST_LOCATION);
-#endif
 
   END_TEST;
 }
@@ -4939,15 +5442,15 @@ int UtcDaliVisualGetVisualProperty04(void)
 int UtcDaliVisualGetVisualProperty05(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetVisualProperty05: Test animatable property, SvgVisual" );
+  tet_infoline("UtcDaliVisualGetVisualProperty05: Test animatable property, SvgVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("borderlineWidth", Property::Type::FLOAT),
-    UniformData("borderlineColor", Property::Type::VECTOR4),
-    UniformData("borderlineOffset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineColor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -4959,8 +5462,8 @@ int UtcDaliVisualGetVisualProperty05(void)
 
   Visual::Base svgVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, svgVisual);
   dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
   application.GetScene().Add(dummyControl);
@@ -4968,17 +5471,17 @@ int UtcDaliVisualGetVisualProperty05(void)
   application.SendNotification();
   application.Render();
 
-  // Wait for image loading
-  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  float targetOpacity = 0.5f;
+  float   targetOpacity = 0.5f;
   Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f);
-  float targetBorderlineWidth = 10.0f;
+  float   targetBorderlineWidth = 10.0f;
   Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f);
-  float targetBorderlineOffset = -1.5f;
+  float   targetBorderlineOffset = -1.5f;
 
   Animation animation = Animation::New(1.0f);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity);
@@ -4993,7 +5496,7 @@ int UtcDaliVisualGetVisualProperty05(void)
   application.Render(1001u); // End of animation
 
   Property::Map resultMap;
-  svgVisual.CreatePropertyMap( resultMap );
+  svgVisual.CreatePropertyMap(resultMap);
 
   // Test property values: they should be updated
   Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
@@ -5002,28 +5505,26 @@ int UtcDaliVisualGetVisualProperty05(void)
 
   Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
   DALI_TEST_CHECK(cornerRadiusValue);
-  DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
 
   Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
   DALI_TEST_CHECK(borderlineWidthValue);
-  DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
 
   Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(borderlineColorValue);
-  DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
 
   Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
   DALI_TEST_CHECK(borderlineOffsetValue);
-  DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
 
-#ifdef OLD_GRAPHICS_TEST
   // Currently test with multiple program doesn't work well. will fix another day
   // Test uniform value
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", targetCornerRadius), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", targetBorderlineWidth), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", targetBorderlineColor), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", targetBorderlineOffset), true, TEST_LOCATION);
-#endif
 
   END_TEST;
 }
@@ -5031,15 +5532,15 @@ int UtcDaliVisualGetVisualProperty05(void)
 int UtcDaliVisualGetVisualProperty06(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetVisualProperty06: Test animatable property, AnimatedImageVisual" );
+  tet_infoline("UtcDaliVisualGetVisualProperty06: Test animatable property, AnimatedImageVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("borderlineWidth", Property::Type::FLOAT),
-    UniformData("borderlineColor", Property::Type::VECTOR4),
-    UniformData("borderlineOffset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineColor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -5051,8 +5552,8 @@ int UtcDaliVisualGetVisualProperty06(void)
 
   Visual::Base animatedImageVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
   dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
   application.GetScene().Add(dummyControl);
@@ -5066,11 +5567,11 @@ int UtcDaliVisualGetVisualProperty06(void)
   application.SendNotification();
   application.Render();
 
-  float targetOpacity = 0.5f;
+  float   targetOpacity = 0.5f;
   Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f);
-  float targetBorderlineWidth = 10.0f;
+  float   targetBorderlineWidth = 10.0f;
   Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f);
-  float targetBorderlineOffset = -1.5f;
+  float   targetBorderlineOffset = -1.5f;
 
   Animation animation = Animation::New(1.0f);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity);
@@ -5085,7 +5586,7 @@ int UtcDaliVisualGetVisualProperty06(void)
   application.Render(1001u); // End of animation
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
 
   // Test property values: they should be updated
   Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
@@ -5094,28 +5595,26 @@ int UtcDaliVisualGetVisualProperty06(void)
 
   Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
   DALI_TEST_CHECK(cornerRadiusValue);
-  DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
 
   Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
   DALI_TEST_CHECK(borderlineWidthValue);
-  DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
 
   Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(borderlineColorValue);
-  DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
 
   Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
   DALI_TEST_CHECK(borderlineOffsetValue);
-  DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
 
-#ifdef OLD_GRAPHICS_TEST
   // Currently test with multiple program doesn't work well. will fix another day
   // Test uniform value
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", targetCornerRadius), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", targetBorderlineWidth), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", targetBorderlineColor), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", targetBorderlineOffset), true, TEST_LOCATION);
-#endif
 
   END_TEST;
 }
@@ -5123,15 +5622,15 @@ int UtcDaliVisualGetVisualProperty06(void)
 int UtcDaliVisualGetVisualProperty07(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualGetVisualProperty07: Test animatable property, AnimatedVectorVisual" );
+  tet_infoline("UtcDaliVisualGetVisualProperty07: Test animatable property, AnimatedVectorVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("cornerRadius", Property::Type::VECTOR4),
-    UniformData("borderlineWidth", Property::Type::FLOAT),
-    UniformData("borderlineColor", Property::Type::VECTOR4),
-    UniformData("borderlineOffset", Property::Type::FLOAT),
-  };
+    {
+      UniformData("cornerRadius", Property::Type::VECTOR4),
+      UniformData("borderlineWidth", Property::Type::FLOAT),
+      UniformData("borderlineColor", Property::Type::VECTOR4),
+      UniformData("borderlineOffset", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
@@ -5140,11 +5639,12 @@ int UtcDaliVisualGetVisualProperty07(void)
   Property::Map propertyMap;
   propertyMap.Insert(Visual::Property::TYPE, DevelVisual::Type::ANIMATED_VECTOR_IMAGE);
   propertyMap.Insert(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
 
   Visual::Base animatedVectorVisual = factory.CreateVisual(propertyMap);
 
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedVectorVisual);
   dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
   application.GetScene().Add(dummyControl);
@@ -5152,17 +5652,17 @@ int UtcDaliVisualGetVisualProperty07(void)
   application.SendNotification();
   application.Render();
 
-  // Wait for image loading
-  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+  // Trigger count is 2 - load & render a frame
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  float targetOpacity = 0.5f;
+  float   targetOpacity = 0.5f;
   Vector4 targetCornerRadius(20.0f, 20.0f, 0.0f, 0.0f);
-  float targetBorderlineWidth = 10.0f;
+  float   targetBorderlineWidth = 10.0f;
   Vector4 targetBorderlineColor(1.0f, 0.0f, 1.0f, 0.5f);
-  float targetBorderlineOffset = -1.5f;
+  float   targetBorderlineOffset = -1.5f;
 
   Animation animation = Animation::New(1.0f);
   animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, Visual::Property::OPACITY), targetOpacity);
@@ -5177,7 +5677,7 @@ int UtcDaliVisualGetVisualProperty07(void)
   application.Render(1001u); // End of animation
 
   Property::Map resultMap;
-  animatedVectorVisual.CreatePropertyMap( resultMap );
+  animatedVectorVisual.CreatePropertyMap(resultMap);
 
   // Test property values: they should be updated
   Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
@@ -5186,28 +5686,963 @@ int UtcDaliVisualGetVisualProperty07(void)
 
   Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
   DALI_TEST_CHECK(cornerRadiusValue);
-  DALI_TEST_EQUALS(cornerRadiusValue->Get< Vector4 >(), targetCornerRadius, TEST_LOCATION);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
 
   Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
   DALI_TEST_CHECK(borderlineWidthValue);
-  DALI_TEST_EQUALS(borderlineWidthValue->Get< float >(), targetBorderlineWidth, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
 
   Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
   DALI_TEST_CHECK(borderlineColorValue);
-  DALI_TEST_EQUALS(borderlineColorValue->Get< Vector4 >(), targetBorderlineColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
 
   Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
   DALI_TEST_CHECK(borderlineOffsetValue);
-  DALI_TEST_EQUALS(borderlineOffsetValue->Get< float >(), targetBorderlineOffset, TEST_LOCATION);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
 
-#ifdef OLD_GRAPHICS_TEST
   // Currently test with multiple program doesn't work well. will fix another day
   // Test uniform value
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("cornerRadius", targetCornerRadius), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineWidth", targetBorderlineWidth), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<Vector4>("borderlineColor", targetBorderlineColor), true, TEST_LOCATION);
   DALI_TEST_EQUALS(application.GetGlAbstraction().CheckUniformValue<float>("borderlineOffset", targetBorderlineOffset), true, TEST_LOCATION);
-#endif
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdateProperty01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdateProperty01: Test update property by DoAction. Standard case");
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap[Visual::Property::TYPE]                     = Visual::Type::IMAGE;
+  propertyMap[ImageVisual::Property::URL]                 = TEST_IMAGE_FILE_NAME;
+  propertyMap[Visual::Property::MIX_COLOR]                = Color::BLUE;
+  propertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = DevelVisual::FIT_WIDTH;
+
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait for image loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  Property::Map originalMap;
+  imageVisual.CreatePropertyMap(originalMap);
+
+  float                    targetOpacity            = 0.5f;
+  Vector3                  targetMixColor           = Vector3(1.0f, 0.4f, 0.2f);
+  bool                     targetPreMultipliedAlpha = originalMap[Visual::Property::PREMULTIPLIED_ALPHA].Get<bool>() ^ true;
+  DevelVisual::FittingMode targetVisualFittingMode  = DevelVisual::CENTER;
+  Vector4                  targetCornerRadius       = Vector4(10.0f, 0.0f, 1.0f, 2.0f);
+  float                    targetBorderlineWidth    = 20.0f;
+  Vector4                  targetBorderlineColor    = Color::RED;
+  float                    targetBorderlineOffset   = 1.0f;
+
+  Property::Map targetPropertyMap;
+  targetPropertyMap[Visual::Property::OPACITY]                  = targetOpacity;
+  targetPropertyMap[ImageVisual::Property::URL]                 = "foobar";
+  targetPropertyMap[Visual::Property::MIX_COLOR]                = targetMixColor;
+  targetPropertyMap[Visual::Property::PREMULTIPLIED_ALPHA]      = targetPreMultipliedAlpha;
+  targetPropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = targetVisualFittingMode;
+  targetPropertyMap[DevelVisual::Property::CORNER_RADIUS]       = targetCornerRadius;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_WIDTH]    = targetBorderlineWidth;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_COLOR]    = targetBorderlineColor;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_OFFSET]   = targetBorderlineOffset;
+
+  // Update Properties
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  // Test property values: they should be updated
+  Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_EQUALS(colorValue->Get<Vector4>(), Vector4(targetMixColor.r, targetMixColor.g, targetMixColor.b, targetOpacity), TEST_LOCATION);
+
+  Property::Value* urlValue = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(urlValue);
+  // NOTE : ImageVisual URL must NOT changed.
+  DALI_TEST_EQUALS(urlValue->Get<std::string>(), TEST_IMAGE_FILE_NAME, TEST_LOCATION);
+
+  Property::Value* preMultipliedValue = resultMap.Find(Visual::Property::PREMULTIPLIED_ALPHA, Property::BOOLEAN);
+  DALI_TEST_CHECK(preMultipliedValue);
+  DALI_TEST_EQUALS(preMultipliedValue->Get<bool>(), targetPreMultipliedAlpha, TEST_LOCATION);
+
+  Property::Value* visualFittingModeValue = resultMap.Find(DevelVisual::Property::VISUAL_FITTING_MODE, Property::STRING);
+  DALI_TEST_CHECK(visualFittingModeValue);
+  DALI_TEST_EQUALS(visualFittingModeValue->Get<std::string>(), "CENTER", TEST_LOCATION);
+
+  Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
+
+  Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineWidthValue);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
+
+  Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(borderlineColorValue);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
+
+  Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineOffsetValue);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdateProperty02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdateProperty02: Test update property by DoAction. Initialize as zero, and update non-zero case");
+
+  Vector4 borderlineColor  = Color::BLUE;
+  float   borderlineOffset = 1.0f;
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap[Visual::Property::TYPE]                      = Visual::Type::IMAGE;
+  propertyMap[ImageVisual::Property::URL]                  = TEST_IMAGE_FILE_NAME;
+  propertyMap[Visual::Property::MIX_COLOR]                 = Color::BLUE;
+  propertyMap[DevelVisual::Property::VISUAL_FITTING_MODE]  = DevelVisual::FIT_WIDTH;
+  propertyMap[DevelVisual::Property::CORNER_RADIUS]        = 0.0f;
+  propertyMap[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE;
+  propertyMap[DevelVisual::Property::BORDERLINE_WIDTH]     = 0.0f;
+  propertyMap[DevelVisual::Property::BORDERLINE_COLOR]     = borderlineColor;
+  propertyMap[DevelVisual::Property::BORDERLINE_OFFSET]    = borderlineOffset;
+
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait for image loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  Property::Map originalMap;
+  imageVisual.CreatePropertyMap(originalMap);
+
+  Vector4 targetCornerRadius    = Vector4(10.0f, 0.0f, 1.0f, 2.0f);
+  float   targetBorderlineWidth = 20.0f;
+
+  Property::Map targetPropertyMap;
+  targetPropertyMap[DevelVisual::Property::CORNER_RADIUS]    = targetCornerRadius;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_WIDTH] = targetBorderlineWidth;
+
+  // Update Properties
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
+
+  Property::Value* cornerRadiusPolicyValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(cornerRadiusPolicyValue);
+  DALI_TEST_EQUALS(cornerRadiusPolicyValue->Get<int>(), static_cast<int>(Toolkit::Visual::Transform::Policy::RELATIVE), TEST_LOCATION);
+
+  Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineWidthValue);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
+
+  Property::Value* borderlineColorValue = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(borderlineColorValue);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), borderlineColor, TEST_LOCATION);
+
+  Property::Value* borderlineOffsetValue = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineOffsetValue);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), borderlineOffset, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdatePropertyInvalidType(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdatePropertyInvalidType: Test update property by DoAction. But some value is not invalid to update");
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  propertyMap[Visual::Property::TYPE]     = Visual::Type::N_PATCH;
+  propertyMap[ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME;
+
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait for image loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  Property::Map originalMap;
+  imageVisual.CreatePropertyMap(originalMap);
+
+  float                    targetOpacity            = 0.5f;
+  Vector3                  targetMixColor           = Vector3(1.0f, 0.4f, 0.2f);
+  bool                     targetPreMultipliedAlpha = originalMap[Visual::Property::PREMULTIPLIED_ALPHA].Get<bool>() ^ true;
+  DevelVisual::FittingMode targetVisualFittingMode  = DevelVisual::CENTER;
+  Vector4                  targetCornerRadius       = Vector4(10.0f, 0.0f, 1.0f, 2.0f);
+  float                    targetBorderlineWidth    = 20.0f;
+  Vector4                  targetBorderlineColor    = Color::RED;
+  float                    targetBorderlineOffset   = 1.0f;
+
+  Property::Map targetPropertyMap;
+  targetPropertyMap[Visual::Property::OPACITY]                  = targetOpacity;
+  targetPropertyMap[ImageVisual::Property::URL]                 = "foobar";
+  targetPropertyMap[Visual::Property::MIX_COLOR]                = targetMixColor;
+  targetPropertyMap[Visual::Property::PREMULTIPLIED_ALPHA]      = targetPreMultipliedAlpha;
+  targetPropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = targetVisualFittingMode;
+
+  // Properties that N_PATCH visual could not used.
+  targetPropertyMap[DevelVisual::Property::CORNER_RADIUS]     = targetCornerRadius;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_WIDTH]  = targetBorderlineWidth;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_COLOR]  = targetBorderlineColor;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_OFFSET] = targetBorderlineOffset;
+
+  // Update Properties
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  // Test property values: they should be updated
+  Property::Value* colorValue = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(colorValue);
+  DALI_TEST_EQUALS(colorValue->Get<Vector4>(), Vector4(targetMixColor.r, targetMixColor.g, targetMixColor.b, targetOpacity), TEST_LOCATION);
+
+  Property::Value* urlValue = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(urlValue);
+  // NOTE : NPatchVisual URL must NOT changed.
+  DALI_TEST_EQUALS(urlValue->Get<std::string>(), TEST_NPATCH_FILE_NAME, TEST_LOCATION);
+
+  Property::Value* preMultipliedValue = resultMap.Find(Visual::Property::PREMULTIPLIED_ALPHA, Property::BOOLEAN);
+  DALI_TEST_CHECK(preMultipliedValue);
+  DALI_TEST_EQUALS(preMultipliedValue->Get<bool>(), targetPreMultipliedAlpha, TEST_LOCATION);
+
+  Property::Value* visualFittingModeValue = resultMap.Find(DevelVisual::Property::VISUAL_FITTING_MODE, Property::STRING);
+  DALI_TEST_CHECK(visualFittingModeValue);
+  DALI_TEST_EQUALS(visualFittingModeValue->Get<std::string>(), "CENTER", TEST_LOCATION);
+
+  // We don't check properties value that N_PATCH visual could not used.
+  // It is undefined.
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdatePropertyChangeShader01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdatePropertyChangeShader01: Test update property by DoAction. Change the shader case");
+
+  TraceCallStack& callStack = application.GetGraphicsController().mCallStack;
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  // Case ImageVisual
+  propertyMap[Visual::Property::TYPE]     = Visual::Type::IMAGE;
+  propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
+
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait for image loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", false},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", false},
+    },
+    TEST_LOCATION);
+
+  callStack.Reset();
+  callStack.Enable(true);
+
+  Vector4 targetCornerRadius = Vector4(1.0f, 12.0f, 2.0f, 21.0f);
+
+  Property::Map targetPropertyMap;
+  targetPropertyMap[DevelVisual::Property::CORNER_RADIUS]        = targetCornerRadius;
+  targetPropertyMap[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::RELATIVE;
+
+  // Update Properties with CornerRadius
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  // Test property values: they should be updated
+  Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
+
+  Property::Value* cornerRadiusPolicyValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(cornerRadiusPolicyValue);
+  DALI_TEST_EQUALS(cornerRadiusPolicyValue->Get<int>(), static_cast<int>(Toolkit::Visual::Transform::Policy::RELATIVE), TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", false},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true},
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+  // Shader changed
+  DALI_TEST_CHECK(callStack.FindMethod("CreateShader"));
+  callStack.Reset();
+  callStack.Enable(true);
+
+  float   targetBorderlineWidth  = 10.0f;
+  Vector4 targetBorderlineColor  = Vector4(1.0f, 0.2f, 0.1f, 0.5f);
+  float   targetBorderlineOffset = -0.3f;
+
+  Property::Map targetPropertyMap2;
+  targetPropertyMap2[DevelVisual::Property::CORNER_RADIUS]        = Vector4::ZERO;
+  targetPropertyMap2[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::ABSOLUTE;
+  targetPropertyMap2[DevelVisual::Property::BORDERLINE_WIDTH]     = targetBorderlineWidth;
+  targetPropertyMap2[DevelVisual::Property::BORDERLINE_COLOR]     = targetBorderlineColor;
+  targetPropertyMap2[DevelVisual::Property::BORDERLINE_OFFSET]    = targetBorderlineOffset;
+
+  // Update Properties with Borderline
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap2);
+
+  Property::Map resultMap2;
+  imageVisual.CreatePropertyMap(resultMap2);
+
+  // Test property values: they should be updated
+  cornerRadiusValue = resultMap2.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION);
+
+  cornerRadiusPolicyValue = resultMap2.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(cornerRadiusPolicyValue);
+  DALI_TEST_EQUALS(cornerRadiusPolicyValue->Get<int>(), static_cast<int>(Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
+
+  Property::Value* borderlineWidthValue = resultMap2.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineWidthValue);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
+
+  Property::Value* borderlineColorValue = resultMap2.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(borderlineColorValue);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
+
+  Property::Value* borderlineOffsetValue = resultMap2.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineOffsetValue);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", true},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true}, // Note : mAlwaysUsingCornerRadius is true.
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+  // Shader changed
+  DALI_TEST_CHECK(callStack.FindMethod("CreateShader"));
+  callStack.Reset();
+  callStack.Enable(true);
+
+  Property::Map targetPropertyMap3;
+  targetPropertyMap3[DevelVisual::Property::CORNER_RADIUS]        = Vector4::ZERO;
+  targetPropertyMap3[DevelVisual::Property::CORNER_RADIUS_POLICY] = Toolkit::Visual::Transform::Policy::ABSOLUTE;
+  targetPropertyMap3[DevelVisual::Property::BORDERLINE_WIDTH]     = 0.0f;
+  targetPropertyMap3[DevelVisual::Property::BORDERLINE_COLOR]     = Vector4::ZERO;
+  targetPropertyMap3[DevelVisual::Property::BORDERLINE_OFFSET]    = 0.0f;
+
+  // Update Properties into zero
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap3);
+
+  Property::Map resultMap3;
+  imageVisual.CreatePropertyMap(resultMap3);
+
+  // Test property values: they should be updated
+  cornerRadiusValue = resultMap3.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION);
+
+  cornerRadiusPolicyValue = resultMap3.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(cornerRadiusPolicyValue);
+  DALI_TEST_EQUALS(cornerRadiusPolicyValue->Get<int>(), static_cast<int>(Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
+
+  borderlineWidthValue = resultMap3.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineWidthValue);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), 0.0f, TEST_LOCATION);
+
+  borderlineColorValue = resultMap3.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(borderlineColorValue);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION);
+
+  borderlineOffsetValue = resultMap3.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineOffsetValue);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), 0.0f, TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", true},     // Note : mAlwaysUsingBorderline is true.
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true}, // Note : mAlwaysUsingCornerRadius is true.
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+  // Shader not changed
+  DALI_TEST_CHECK(!callStack.FindMethod("CreateShader"));
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdatePropertyChangeShader02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdatePropertyChangeShader02: Test update property by DoAction. Fake update");
+
+  TraceCallStack& callStack = application.GetGraphicsController().mCallStack;
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  // Case ImageVisual
+  propertyMap[Visual::Property::TYPE]     = Visual::Type::IMAGE;
+  propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
+
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait for image loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", false},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", false},
+    },
+    TEST_LOCATION);
+
+  Vector4 targetCornerRadius = Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+
+  Property::Map targetPropertyMap;
+  targetPropertyMap[DevelVisual::Property::CORNER_RADIUS] = targetCornerRadius;
+
+  callStack.Reset();
+  callStack.Enable(true);
+
+  // Update Properties with CornerRadius
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  // Test property values: they should be updated
+  Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", false},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", false}, // Note : corner radius is zero. so we don't change shader!
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+
+  // Shader doesn't changed
+  DALI_TEST_CHECK(!(callStack.FindMethod("CreateShader")));
+  callStack.Reset();
+  callStack.Enable(true);
+
+  float   targetBorderlineWidth  = 0.0f;
+  Vector4 targetBorderlineColor  = Vector4(1.0f, 1.0f, 0.0f, 0.0f);
+  float   targetBorderlineOffset = -1.0f;
+
+  Property::Map targetPropertyMap2;
+  targetPropertyMap2[DevelVisual::Property::BORDERLINE_WIDTH]  = targetBorderlineWidth;
+  targetPropertyMap2[DevelVisual::Property::BORDERLINE_COLOR]  = targetBorderlineColor;
+  targetPropertyMap2[DevelVisual::Property::BORDERLINE_OFFSET] = targetBorderlineOffset;
+
+  // Update Properties with Borderline
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap2);
+
+  Property::Map resultMap2;
+  imageVisual.CreatePropertyMap(resultMap2);
+
+  // Test property values: they should be updated
+  Property::Value* borderlineWidthValue = resultMap2.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineWidthValue);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
+
+  Property::Value* borderlineColorValue = resultMap2.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(borderlineColorValue);
+  DALI_TEST_EQUALS(borderlineColorValue->Get<Vector4>(), targetBorderlineColor, TEST_LOCATION);
+
+  Property::Value* borderlineOffsetValue = resultMap2.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineOffsetValue);
+  DALI_TEST_EQUALS(borderlineOffsetValue->Get<float>(), targetBorderlineOffset, TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", false}, // Note : borderline width is zero. so we don't change shader!
+      {"#define IS_REQUIRED_ROUNDED_CORNER", false},
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+
+  // Shader doesn't changed
+  DALI_TEST_CHECK(!(callStack.FindMethod("CreateShader")));
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdatePropertyChangeShader03(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdatePropertyChangeShader03: Test update property by DoAction. Blur Radius");
+
+  TraceCallStack& callStack = application.GetGraphicsController().mCallStack;
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  // Case ImageVisual
+  propertyMap[Visual::Property::TYPE]           = Visual::Type::COLOR;
+  propertyMap[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
+
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  application.SendNotification();
+  application.Render();
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BLUR", false},
+      {"#define IS_REQUIRED_BORDERLINE", false},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", false},
+    },
+    TEST_LOCATION);
+
+  float   targetBlurRadius   = 15.0f;
+  Vector4 targetCornerRadius = Vector4(1.0f, 0.1f, 1.1f, 0.0f);
+
+  Property::Map targetPropertyMap;
+  targetPropertyMap[DevelColorVisual::Property::BLUR_RADIUS] = targetBlurRadius;
+  targetPropertyMap[DevelVisual::Property::CORNER_RADIUS]    = targetCornerRadius;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_WIDTH] = 10.0f; // Don't care. just dummy
+
+  callStack.Reset();
+  callStack.Enable(true);
+
+  // Update Properties with CornerRadius
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  // Test property values: they should be updated
+  Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(blurRadiusValue);
+  DALI_TEST_EQUALS(blurRadiusValue->Get<float>(), targetBlurRadius, TEST_LOCATION);
+
+  Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BLUR", true},
+      {"#define IS_REQUIRED_BORDERLINE", false}, // Note : We ignore borderline when blur radius occured
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true},
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+
+  // Shader changed
+  DALI_TEST_CHECK((callStack.FindMethod("CreateShader")));
+  callStack.Reset();
+  callStack.Enable(true);
+
+  Property::Map targetPropertyMap2;
+  targetPropertyMap2[DevelColorVisual::Property::BLUR_RADIUS] = 0.0f;
+  targetPropertyMap2[DevelVisual::Property::CORNER_RADIUS]    = Vector4::ZERO;
+  targetPropertyMap2[DevelVisual::Property::BORDERLINE_WIDTH] = 15.0f; // Don't care. just dummy
+
+  // Update Properties with CornerRadius
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap2);
+
+  Property::Map resultMap2;
+  imageVisual.CreatePropertyMap(resultMap2);
+
+  // Test property values: they should be updated
+  blurRadiusValue = resultMap2.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
+  DALI_TEST_CHECK(blurRadiusValue);
+  DALI_TEST_EQUALS(blurRadiusValue->Get<float>(), 0.0f, TEST_LOCATION);
+
+  cornerRadiusValue = resultMap2.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BLUR", true},           // Note : mAlwaysUsingBlurRadius is true.
+      {"#define IS_REQUIRED_BORDERLINE", false},    // Note : We ignore borderline when blur radius occured
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true}, // Note : mAlwaysUsingCornerRadius is true.
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+
+  // Shader not changed
+  DALI_TEST_CHECK(!(callStack.FindMethod("CreateShader")));
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdatePropertyChangeShader04(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdatePropertyChangeShader04: Test update property by DoAction during Animation. Change the shader case");
+
+  TraceCallStack& callStack = application.GetGraphicsController().mCallStack;
+
+  VisualFactory factory = VisualFactory::Get();
+  Property::Map propertyMap;
+  // Case ImageVisual
+  propertyMap[Visual::Property::TYPE]               = Visual::Type::IMAGE;
+  propertyMap[ImageVisual::Property::URL]           = TEST_IMAGE_FILE_NAME;
+  propertyMap[DevelVisual::Property::CORNER_RADIUS] = 10.0f;
+
+  Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+  DummyControl        dummyControl = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+  dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+  application.GetScene().Add(dummyControl);
+
+  application.SendNotification();
+  application.Render();
+
+  // Wait for image loading
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", false},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true},
+    },
+    TEST_LOCATION);
+
+  callStack.Reset();
+  callStack.Enable(true);
+
+  Vector4 targetCornerRadius = Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+
+  Animation animation = Animation::New(1.0f);
+  animation.AnimateTo(DevelControl::GetVisualProperty(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Property::CORNER_RADIUS), targetCornerRadius);
+  animation.Play();
+
+  application.SendNotification();
+  application.Render();
+  application.Render(1001u); // End of animation
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", false},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true}, // Note : mAlwaysUsingCornerRadius is true.
+    },
+    TEST_LOCATION);
+
+  callStack.Enable(false);
+  // Shader not changed
+  DALI_TEST_CHECK(!callStack.FindMethod("CreateShader"));
+  callStack.Reset();
+  callStack.Enable(true);
+
+  float         targetBorderlineWidth = 10.0f;
+  Property::Map targetPropertyMap;
+  targetPropertyMap[DevelVisual::Property::BORDERLINE_WIDTH] = targetBorderlineWidth;
+
+  // Update Properties with CornerRadius
+  DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+  Property::Map resultMap;
+  imageVisual.CreatePropertyMap(resultMap);
+
+  // Test property values: they should be updated
+  Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(cornerRadiusValue);
+  DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
+
+  Property::Value* cornerRadiusPolicyValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(cornerRadiusPolicyValue);
+  DALI_TEST_EQUALS(cornerRadiusPolicyValue->Get<int>(), static_cast<int>(Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION);
+
+  Property::Value* borderlineWidthValue = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(borderlineWidthValue);
+  DALI_TEST_EQUALS(borderlineWidthValue->Get<float>(), targetBorderlineWidth, TEST_LOCATION);
+
+  TestShaderCodeContainSubstrings(
+    dummyControl,
+    {
+      {"#define IS_REQUIRED_BORDERLINE", true},
+      {"#define IS_REQUIRED_ROUNDED_CORNER", true}, // Note : mAlwaysUsingCornerRadius is true.
+    },
+    TEST_LOCATION);
+
+  // Send shader compile signal
+  application.SendNotification();
+  application.Render();
+
+  callStack.Enable(false);
+  // Shader changed
+  DALI_TEST_CHECK(callStack.FindMethod("CreateShader"));
+
+  END_TEST;
+}
+
+int UtcDaliVisualUpdatePropertyChangeShader05(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualUpdatePropertyChangeShader05: Test update property under glsl version is under 300");
+
+  auto originalShaderVersion = application.GetGlAbstraction().GetShaderLanguageVersion();
+
+  // Change the shader language version forcely!
+  application.GetGlAbstraction().mShaderLanguageVersion = 200;
+
+  try
+  {
+    TraceCallStack& callStack = application.GetGraphicsController().mCallStack;
+
+    VisualFactory factory = VisualFactory::Get();
+    Property::Map propertyMap;
+    // Case ImageVisual
+    propertyMap[Visual::Property::TYPE]           = Visual::Type::COLOR;
+    propertyMap[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
+
+    Visual::Base imageVisual = factory.CreateVisual(propertyMap);
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, imageVisual);
+    dummyControl[Actor::Property::SIZE] = Vector2(200.f, 200.f);
+    application.GetScene().Add(dummyControl);
+
+    application.SendNotification();
+    application.Render();
+
+    application.SendNotification();
+    application.Render();
+
+    TestShaderCodeContainSubstrings(
+      dummyControl,
+      {
+        {"#define IS_REQUIRED_BLUR", false},
+        {"#define IS_REQUIRED_BORDERLINE", false},
+        {"#define IS_REQUIRED_ROUNDED_CORNER", false},
+      },
+      TEST_LOCATION);
+
+    float   targetBlurRadius   = 15.0f;
+    Vector4 targetCornerRadius = Vector4(1.0f, 0.1f, 1.1f, 0.0f);
+
+    Property::Map targetPropertyMap;
+    targetPropertyMap[DevelColorVisual::Property::BLUR_RADIUS] = targetBlurRadius;
+    targetPropertyMap[DevelVisual::Property::CORNER_RADIUS]    = targetCornerRadius;
+    targetPropertyMap[DevelVisual::Property::BORDERLINE_WIDTH] = 10.0f; // Don't care. just dummy
+
+    callStack.Reset();
+    callStack.Enable(true);
+
+    // Update Properties with CornerRadius
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap);
+
+    Property::Map resultMap;
+    imageVisual.CreatePropertyMap(resultMap);
+
+    // Test property values: they should be updated
+    Property::Value* blurRadiusValue = resultMap.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
+    DALI_TEST_CHECK(blurRadiusValue);
+    DALI_TEST_EQUALS(blurRadiusValue->Get<float>(), targetBlurRadius, TEST_LOCATION);
+
+    Property::Value* cornerRadiusValue = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+    DALI_TEST_CHECK(cornerRadiusValue);
+    DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), targetCornerRadius, TEST_LOCATION);
+
+    TestShaderCodeContainSubstringsForEachShader(
+      dummyControl,
+      {
+        {"#define IS_REQUIRED_BLUR", {true, true}},
+        {"#define IS_REQUIRED_BORDERLINE", {false, false}}, // Note : We ignore borderline when blur radius occured
+        {"#define IS_REQUIRED_ROUNDED_CORNER", {true, true}},
+        {"#define SL_VERSION_LOW", {false, true}},
+      },
+      TEST_LOCATION);
+
+    // Send shader compile signal
+    application.SendNotification();
+    application.Render();
+
+    callStack.Enable(false);
+
+    // Shader changed
+    DALI_TEST_CHECK((callStack.FindMethod("CreateShader")));
+    callStack.Reset();
+    callStack.Enable(true);
+
+    Property::Map targetPropertyMap2;
+    targetPropertyMap2[DevelColorVisual::Property::BLUR_RADIUS] = 0.0f;
+    targetPropertyMap2[DevelVisual::Property::CORNER_RADIUS]    = Vector4::ZERO;
+    targetPropertyMap2[DevelVisual::Property::BORDERLINE_WIDTH] = 15.0f; // Don't care. just dummy
+
+    // Update Properties with CornerRadius
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, DevelVisual::Action::UPDATE_PROPERTY, targetPropertyMap2);
+
+    Property::Map resultMap2;
+    imageVisual.CreatePropertyMap(resultMap2);
+
+    // Test property values: they should be updated
+    blurRadiusValue = resultMap2.Find(DevelColorVisual::Property::BLUR_RADIUS, Property::FLOAT);
+    DALI_TEST_CHECK(blurRadiusValue);
+    DALI_TEST_EQUALS(blurRadiusValue->Get<float>(), 0.0f, TEST_LOCATION);
+
+    cornerRadiusValue = resultMap2.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+    DALI_TEST_CHECK(cornerRadiusValue);
+    DALI_TEST_EQUALS(cornerRadiusValue->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION);
+
+    TestShaderCodeContainSubstringsForEachShader(
+      dummyControl,
+      {
+        {"#define IS_REQUIRED_BLUR", {true, true}},           // Note : mAlwaysUsingBlurRadius is true.
+        {"#define IS_REQUIRED_BORDERLINE", {false, false}},   // Note : We ignore borderline when blur radius occured
+        {"#define IS_REQUIRED_ROUNDED_CORNER", {true, true}}, // Note : mAlwaysUsingCornerRadius is true.
+        {"#define SL_VERSION_LOW", {false, true}},
+      },
+      TEST_LOCATION);
+
+    // Send shader compile signal
+    application.SendNotification();
+    application.Render();
+
+    callStack.Enable(false);
+
+    // Shader not changed
+    DALI_TEST_CHECK(!(callStack.FindMethod("CreateShader")));
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(false);
+  }
+
+  // Revert shader version. We should revert it even if UTC failed.
+  application.GetGlAbstraction().mShaderLanguageVersion = originalShaderVersion;
 
   END_TEST;
 }
\ No newline at end of file
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
index ab67b9d..726a7b8 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,22 @@
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <toolkit-timer.h>
+#include <iostream>
+
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-timer.h>
+#include "dummy-control.h"
+
+#include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include <dali-toolkit/internal/visuals/npatch-loader.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
-#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
-#include "dummy-control.h"
-
 #include <dali/integration-api/debug.h>
+#include <dali/integration-api/adaptor-framework/shader-precompiler.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -36,15 +38,15 @@ namespace
 {
 typedef Toolkit::NPatchUtility::StretchRanges StretchRanges;
 
-const char* TEST_9_PATCH_FILE_NAME =  TEST_RESOURCE_DIR  "/demo-tile-texture-focused.9.png";
-const char* TEST_NPATCH_FILE_NAME =  TEST_RESOURCE_DIR  "/heartsframe.9.png";
-const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg";
-const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj";
-const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl";
+const char* TEST_9_PATCH_FILE_NAME    = TEST_RESOURCE_DIR "/demo-tile-texture-focused.9.png";
+const char* TEST_NPATCH_FILE_NAME     = TEST_RESOURCE_DIR "/heartsframe.9.png";
+const char* TEST_SVG_FILE_NAME        = TEST_RESOURCE_DIR "/svg1.svg";
+const char* TEST_OBJ_FILE_NAME        = TEST_RESOURCE_DIR "/Cube.obj";
+const char* TEST_MTL_FILE_NAME        = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl";
 const char* TEST_SIMPLE_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube-Points-Only.obj";
 const char* TEST_SIMPLE_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal-Simple.mtl";
-const char* TEST_AUX_IMAGE = TEST_RESOURCE_DIR "/folder_appicon_empty_bg.png";
-const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/gallery-small-1.jpg";
+const char* TEST_AUX_IMAGE            = TEST_RESOURCE_DIR "/folder_appicon_empty_bg.png";
+const char* TEST_IMAGE_FILE_NAME      = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
 
 // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame
 const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif";
@@ -52,31 +54,30 @@ const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif";
 // resolution: 34*34, pixel format: RGBA8888
 static const char* gImage_34_RGBA = TEST_RESOURCE_DIR "/icon-edit.png";
 
-
 Property::Map DefaultTransform()
 {
   Property::Map transformMap;
   transformMap
-    .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
-    .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
-    .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
-    .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
-    .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) )
-    .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) );
+    .Add(Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f))
+    .Add(Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f))
+    .Add(Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::CENTER)
+    .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER)
+    .Add(Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE))
+    .Add(Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE));
   return transformMap;
 }
 
-void TestVisualRender( ToolkitTestApplication& application,
-                       DummyControl& actor,
-                       Visual::Base& visual )
+void TestVisualRender(ToolkitTestApplication& application,
+                      DummyControl&           actor,
+                      Visual::Base&           visual)
 {
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
@@ -84,34 +85,40 @@ void TestVisualRender( ToolkitTestApplication& application,
   application.Render();
   application.SendNotification();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 }
 
-void TestVisualAsynchronousRender( ToolkitTestApplication& application,
-                                   DummyControl& actor,
-                                   Visual::Base& visual )
+void TestVisualAsynchronousRender(ToolkitTestApplication& application,
+                                  DummyControl&           actor,
+                                  Visual::Base&           visual)
 {
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 }
 
-} // namespace
+int gResourceReadySignalCounter;
 
+void OnResourceReadySignal(Control control)
+{
+  gResourceReadySignalCounter++;
+}
+
+} // namespace
 
 void dali_visual_factory_startup(void)
 {
@@ -126,21 +133,21 @@ void dali_visual_factory_cleanup(void)
 int UtcDaliVisualFactoryGet(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactory" );
+  tet_infoline("UtcDaliVisualFactory");
 
   //Register type
   TypeInfo type;
-  type = TypeRegistry::Get().GetTypeInfo( "VisualFactory" );
-  DALI_TEST_CHECK( type );
+  type = TypeRegistry::Get().GetTypeInfo("VisualFactory");
+  DALI_TEST_CHECK(type);
   BaseHandle handle = type.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   VisualFactory factory;
   factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   VisualFactory newFactory = VisualFactory::Get();
-  DALI_TEST_CHECK( newFactory );
+  DALI_TEST_CHECK(newFactory);
 
   // Check that visual factory is a singleton
   DALI_TEST_CHECK(factory == newFactory);
@@ -151,14 +158,14 @@ int UtcDaliVisualFactoryGet(void)
 int UtcDaliVisualFactoryCopyAndAssignment(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryCopyAndAssignment" );
+  tet_infoline("UtcDaliVisualFactoryCopyAndAssignment");
   VisualFactory factory = VisualFactory::Get();
 
-  VisualFactory factoryCopy( factory );
+  VisualFactory factoryCopy(factory);
   DALI_TEST_CHECK(factory == factoryCopy);
 
   VisualFactory emptyFactory;
-  VisualFactory emptyFactoryCopy( emptyFactory );
+  VisualFactory emptyFactoryCopy(emptyFactory);
   DALI_TEST_CHECK(emptyFactory == emptyFactoryCopy);
 
   VisualFactory factoryEquals;
@@ -167,11 +174,11 @@ int UtcDaliVisualFactoryCopyAndAssignment(void)
 
   VisualFactory emptyFactoryEquals;
   emptyFactoryEquals = emptyFactory;
-  DALI_TEST_CHECK( emptyFactory == emptyFactoryEquals );
+  DALI_TEST_CHECK(emptyFactory == emptyFactoryEquals);
 
   //self assignment
   factory = factory;
-  DALI_TEST_CHECK( factory = factoryCopy );
+  DALI_TEST_CHECK(factory = factoryCopy);
 
   END_TEST;
 }
@@ -179,37 +186,37 @@ int UtcDaliVisualFactoryCopyAndAssignment(void)
 int UtcDaliVisualFactoryGetColorVisual1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetColorVisual1:  Request color visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetColorVisual1:  Request color visual with a Property::Map");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("mixColor", Property::Type::VECTOR3),
-  };
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f );
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR,  testColor);
+  Vector4       testColor(1.f, 0.5f, 0.3f, 0.2f);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, testColor);
 
   Visual::Base visual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( visual );
+  DALI_TEST_CHECK(visual);
 
   DummyControl actor = DummyControl::New(true);
-  TestVisualRender( application, actor, visual );
+  TestVisualRender(application, actor, visual);
 
-  Vector3 actualValue(Vector4::ZERO);
-  Vector4 actualColor(Vector4::ZERO);
+  Vector3            actualValue(Vector4::ZERO);
+  Vector4            actualColor(Vector4::ZERO);
   TestGlAbstraction& gl = application.GetGlAbstraction();
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector3>( "mixColor", actualValue ) );
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uColor", actualColor ) );
-  DALI_TEST_EQUALS( actualValue, Vector3(testColor), TEST_LOCATION );
-  DALI_TEST_EQUALS( actualColor.a, testColor.a, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector3>("mixColor", actualValue));
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uColor", actualColor));
+  DALI_TEST_EQUALS(actualValue, Vector3(testColor), TEST_LOCATION);
+  DALI_TEST_EQUALS(actualColor.a, testColor.a, TEST_LOCATION);
 
   END_TEST;
 }
@@ -217,39 +224,39 @@ int UtcDaliVisualFactoryGetColorVisual1(void)
 int UtcDaliVisualFactoryGetColorVisual2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetColorVisual2: Request color visual with a Vector4" );
+  tet_infoline("UtcDaliVisualFactoryGetColorVisual2: Request color visual with a Vector4");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("mixColor", Property::Type::VECTOR3),
-  };
+    {
+      UniformData("mixColor", Property::Type::VECTOR3),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f );
+  Vector4             testColor(1.f, 0.5f, 0.3f, 0.2f);
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
-  map[ ColorVisual::Property::MIX_COLOR ] = testColor;
-  Visual::Base visual = factory.CreateVisual( map );
-  DALI_TEST_CHECK( visual );
+  map[Toolkit::Visual::Property::TYPE]  = Visual::COLOR;
+  map[ColorVisual::Property::MIX_COLOR] = testColor;
+  Visual::Base visual                   = factory.CreateVisual(map);
+  DALI_TEST_CHECK(visual);
 
   DummyControl actor = DummyControl::New(true);
-  TestVisualRender( application, actor, visual );
+  TestVisualRender(application, actor, visual);
 
-  Vector3 actualValue;
-  Vector4 actualColor;
+  Vector3            actualValue;
+  Vector4            actualColor;
   TestGlAbstraction& gl = application.GetGlAbstraction();
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector3>( "mixColor", actualValue ) );
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uColor", actualColor ) );
-  DALI_TEST_EQUALS( actualValue, Vector3(testColor), TEST_LOCATION );
-  DALI_TEST_EQUALS( actualColor.a, testColor.a, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector3>("mixColor", actualValue));
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uColor", actualColor));
+  DALI_TEST_EQUALS(actualValue, Vector3(testColor), TEST_LOCATION);
+  DALI_TEST_EQUALS(actualColor.a, testColor.a, TEST_LOCATION);
 
   application.GetScene().Remove(actor);
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -257,40 +264,40 @@ int UtcDaliVisualFactoryGetColorVisual2(void)
 int UtcDaliVisualFactoryGetBorderVisual1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetBorderVisual1:  Request border visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetBorderVisual1:  Request border visual with a Property::Map");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("borderColor", Property::Type::VECTOR4),
-    UniformData("borderSize", Property::Type::FLOAT),
-  };
+    {
+      UniformData("borderColor", Property::Type::VECTOR4),
+      UniformData("borderSize", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f );
-  float testSize = 5.f;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::BORDER);
-  propertyMap.Insert(BorderVisual::Property::COLOR,  testColor);
-  propertyMap.Insert(BorderVisual::Property::SIZE,  testSize);
+  Vector4       testColor(1.f, 0.5f, 0.3f, 0.2f);
+  float         testSize = 5.f;
+  propertyMap.Insert(Visual::Property::TYPE, Visual::BORDER);
+  propertyMap.Insert(BorderVisual::Property::COLOR, testColor);
+  propertyMap.Insert(BorderVisual::Property::SIZE, testSize);
 
   Visual::Base visual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( visual );
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
   visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f));
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  int blendMode = actor.GetRendererAt(0u).GetProperty<int>( Renderer::Property::BLEND_MODE );
-  DALI_TEST_EQUALS( static_cast<BlendMode::Type>(blendMode), BlendMode::ON, TEST_LOCATION );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  int blendMode = actor.GetRendererAt(0u).GetProperty<int>(Renderer::Property::BLEND_MODE);
+  DALI_TEST_EQUALS(static_cast<BlendMode::Type>(blendMode), BlendMode::ON, TEST_LOCATION);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
@@ -298,15 +305,15 @@ int UtcDaliVisualFactoryGetBorderVisual1(void)
   application.Render(0);
 
   Vector4 actualColor(Vector4::ZERO);
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "borderColor", actualColor ) );
-  DALI_TEST_EQUALS( actualColor, testColor, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("borderColor", actualColor));
+  DALI_TEST_EQUALS(actualColor, testColor, TEST_LOCATION);
 
   float actualSize = 0.f;
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "borderSize", actualSize ) );
-  DALI_TEST_EQUALS( actualSize, testSize, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("borderSize", actualSize));
+  DALI_TEST_EQUALS(actualSize, testSize, TEST_LOCATION);
 
   actor.Unparent();
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -314,70 +321,70 @@ int UtcDaliVisualFactoryGetBorderVisual1(void)
 int UtcDaliVisualFactoryGetBorderVisual2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetBorderVisual2:  Request border visual with a borderSize and a borderColor" );
+  tet_infoline("UtcDaliVisualFactoryGetBorderVisual2:  Request border visual with a borderSize and a borderColor");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("borderColor", Property::Type::VECTOR4),
-    UniformData("borderSize", Property::Type::FLOAT),
-  };
+    {
+      UniformData("borderColor", Property::Type::VECTOR4),
+      UniformData("borderSize", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  Vector4 testColor( 1.f, 0.5f, 0.3f, 1.f );
-  float testSize = 5.f;
+  Vector4 testColor(1.f, 0.5f, 0.3f, 1.f);
+  float   testSize = 5.f;
 
   Dali::Property::Map propertyMap;
-  propertyMap[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
-  propertyMap[ BorderVisual::Property::COLOR  ] = testColor;
-  propertyMap[ BorderVisual::Property::SIZE   ] = testSize;
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  propertyMap[Toolkit::Visual::Property::TYPE] = Visual::BORDER;
+  propertyMap[BorderVisual::Property::COLOR]   = testColor;
+  propertyMap[BorderVisual::Property::SIZE]    = testSize;
+  Visual::Base visual                          = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
   visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f));
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
   application.SendNotification();
   application.Render(0);
 
-  int blendMode = actor.GetRendererAt(0u).GetProperty<int>( Renderer::Property::BLEND_MODE );
-  DALI_TEST_EQUALS( static_cast<BlendMode::Type>(blendMode), BlendMode::AUTO, TEST_LOCATION );
+  int blendMode = actor.GetRendererAt(0u).GetProperty<int>(Renderer::Property::BLEND_MODE);
+  DALI_TEST_EQUALS(static_cast<BlendMode::Type>(blendMode), BlendMode::AUTO, TEST_LOCATION);
 
   Vector4 actualColor(Vector4::ZERO);
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "borderColor", actualColor ) );
-  DALI_TEST_EQUALS( actualColor, testColor, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("borderColor", actualColor));
+  DALI_TEST_EQUALS(actualColor, testColor, TEST_LOCATION);
 
   float actualSize = 0.f;
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "borderSize", actualSize ) );
-  DALI_TEST_EQUALS( actualSize, testSize, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("borderSize", actualSize));
+  DALI_TEST_EQUALS(actualSize, testSize, TEST_LOCATION);
 
   actor.Unparent();
 
   // enable the anti-aliasing
   Dali::Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
-  map[ BorderVisual::Property::COLOR  ] = testColor;
-  map[ BorderVisual::Property::SIZE   ] = testSize;
-  map[ BorderVisual::Property::ANTI_ALIASING   ] = true;
-  visual = factory.CreateVisual( map );
+  map[Toolkit::Visual::Property::TYPE]       = Visual::BORDER;
+  map[BorderVisual::Property::COLOR]         = testColor;
+  map[BorderVisual::Property::SIZE]          = testSize;
+  map[BorderVisual::Property::ANTI_ALIASING] = true;
+  visual                                     = factory.CreateVisual(map);
 
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
-  application.GetScene().Add( actor );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  application.GetScene().Add(actor);
 
-  blendMode = actor.GetRendererAt(0u).GetProperty<int>( Renderer::Property::BLEND_MODE );
-  DALI_TEST_EQUALS( static_cast<BlendMode::Type>(blendMode), BlendMode::ON, TEST_LOCATION );
+  blendMode = actor.GetRendererAt(0u).GetProperty<int>(Renderer::Property::BLEND_MODE);
+  DALI_TEST_EQUALS(static_cast<BlendMode::Type>(blendMode), BlendMode::ON, TEST_LOCATION);
 
   END_TEST;
 }
@@ -388,18 +395,18 @@ int UtcDaliVisualFactoryGetLinearGradientVisual(void)
   tet_infoline("UtcDaliVisualFactoryGetRadialGradientVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uAlignmentMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uAlignmentMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT);
 
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
@@ -408,21 +415,21 @@ int UtcDaliVisualFactoryGetLinearGradientVisual(void)
   propertyMap.Insert(GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT);
 
   Property::Array stopOffsets;
-  stopOffsets.PushBack( 0.2f );
-  stopOffsets.PushBack( 0.8f );
+  stopOffsets.PushBack(0.2f);
+  stopOffsets.PushBack(0.8f);
   propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets);
 
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::GREEN );
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::GREEN);
   propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
 
   Visual::Base visual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( visual );
+  DALI_TEST_CHECK(visual);
 
   // A lookup texture is generated and pass to shader as sampler
   DummyControl actor = DummyControl::New(true);
-  TestVisualRender( application, actor, visual );
+  TestVisualRender(application, actor, visual);
 
   END_TEST;
 }
@@ -433,49 +440,49 @@ int UtcDaliVisualFactoryGetRadialGradientVisual(void)
   tet_infoline("UtcDaliVisualFactoryGetRadialGradientVisual");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uAlignmentMatrix", Property::Type::MATRIX3),
-  };
+    {
+      UniformData("uAlignmentMatrix", Property::Type::MATRIX3),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT);
 
   Vector2 center(100.f, 100.f);
-  float radius = 100.f;
-  propertyMap.Insert(GradientVisual::Property::UNITS,  GradientVisual::Units::USER_SPACE);
-  propertyMap.Insert(GradientVisual::Property::CENTER,  center);
-  propertyMap.Insert(GradientVisual::Property::RADIUS,  radius);
+  float   radius = 100.f;
+  propertyMap.Insert(GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE);
+  propertyMap.Insert(GradientVisual::Property::CENTER, center);
+  propertyMap.Insert(GradientVisual::Property::RADIUS, radius);
 
   Property::Array stopOffsets;
-  stopOffsets.PushBack( 0.0f );
-  stopOffsets.PushBack( 1.f );
-  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET,   stopOffsets);
+  stopOffsets.PushBack(0.0f);
+  stopOffsets.PushBack(1.f);
+  propertyMap.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets);
 
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert(GradientVisual::Property::STOP_COLOR,   stopColors);
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::GREEN);
+  propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
 
   Visual::Base visual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( visual );
+  DALI_TEST_CHECK(visual);
 
   // A lookup texture is generated and pass to shader as sampler
   DummyControl actor = DummyControl::New(true);
-  TestVisualRender( application, actor, visual );
+  TestVisualRender(application, actor, visual);
 
-  Matrix3 alignMatrix( radius, 0.f, 0.f, 0.f, radius, 0.f, center.x, center.y, 1.f );
+  Matrix3 alignMatrix(radius, 0.f, 0.f, 0.f, radius, 0.f, center.x, center.y, 1.f);
   alignMatrix.Invert();
 
-  Matrix3 actualValue( Matrix3::IDENTITY );
+  Matrix3            actualValue(Matrix3::IDENTITY);
   TestGlAbstraction& gl = application.GetGlAbstraction();
-  DALI_TEST_CHECK( gl.GetUniformValue<Matrix3>( "uAlignmentMatrix", actualValue ) );
-  DALI_TEST_EQUALS( actualValue, alignMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Matrix3>("uAlignmentMatrix", actualValue));
+  DALI_TEST_EQUALS(actualValue, alignMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   END_TEST;
 }
@@ -486,10 +493,10 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void)
   tet_infoline("UtcDaliVisualFactoryGetRadialGradientVisual");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::GRADIENT);
+  propertyMap.Insert(Visual::Property::TYPE, Visual::GRADIENT);
 
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
@@ -498,19 +505,19 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void)
   propertyMap.Insert(GradientVisual::Property::SPREAD_METHOD, GradientVisual::SpreadMethod::REPEAT);
 
   Property::Array stopColors;
-  stopColors.PushBack( Color::RED );
-  stopColors.PushBack( Color::GREEN );
+  stopColors.PushBack(Color::RED);
+  stopColors.PushBack(Color::GREEN);
   propertyMap.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
 
   Visual::Base visual = factory.CreateVisual(propertyMap);
-  DALI_TEST_CHECK( visual );
+  DALI_TEST_CHECK(visual);
 
   // A lookup texture is generated and pass to shader as sampler
   DummyControl actor = DummyControl::New(true);
-  TestVisualRender( application, actor, visual );
+  TestVisualRender(application, actor, visual);
 
-  application.GetScene().Remove( actor );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  application.GetScene().Remove(actor);
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -518,55 +525,55 @@ int UtcDaliVisualFactoryDefaultOffsetsGradientVisual(void)
 int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1: Request 9-patch visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1: Request 9-patch visual with a Property::Map");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
   {
-    tet_infoline( "whole grid" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("whole grid");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
   }
 
-  propertyMap.Insert( ImageVisual::Property::BORDER_ONLY,  true );
+  propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true);
   {
-    tet_infoline( "border only" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("border only");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
   }
 
   END_TEST;
@@ -575,80 +582,80 @@ int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad1(void)
 int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2: Request 9-patch visual with a Property::Map including border" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2: Request 9-patch visual with a Property::Map including border");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( gImage_34_RGBA );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA );
-  propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 2, 2, 2, 2 ) );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(2, 2, 2, 2));
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
   {
-    tet_infoline( "whole grid" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("whole grid");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
   }
 
-  propertyMap.Insert( ImageVisual::Property::BORDER_ONLY,  true );
+  propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true);
   {
-    tet_infoline( "border only" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("border only");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
   }
 
   propertyMap.Clear();
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA );
-  propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 1, 1, 1, 1 ) );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(1, 1, 1, 1));
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
   {
-    tet_infoline( "whole grid" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("whole grid");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
   }
 
   END_TEST;
@@ -657,58 +664,58 @@ int UtcDaliVisualFactoryGetNPatchVisualSynchronousLoad2(void)
 int UtcDaliVisualFactoryGetNPatchVisual1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual1: Request 9-patch visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual1: Request 9-patch visual with a Property::Map");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, false );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
   {
-    tet_infoline( "whole grid" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("whole grid");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualAsynchronousRender( application, actor, visual );
+    TestVisualAsynchronousRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
   }
 
-  propertyMap.Insert( ImageVisual::Property::BORDER_ONLY,  true );
+  propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true);
   {
-    tet_infoline( "border only" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("border only");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
   }
 
   END_TEST;
@@ -717,78 +724,149 @@ int UtcDaliVisualFactoryGetNPatchVisual1(void)
 int UtcDaliVisualFactoryGetNPatchVisual2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual2: Request 9-patch visual with a Property::Map including border" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual2: Request 9-patch visual with a Property::Map including border");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( gImage_34_RGBA );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA );
-  propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 2, 2, 2, 2 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(2, 2, 2, 2));
+  {
+    tet_infoline("whole grid (2,2,2,2) async");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
+
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
+    DummyControl actor = DummyControl::New(true);
+    TestVisualAsynchronousRender(application, actor, visual);
+
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
+  }
+
+  propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true);
+  {
+    tet_infoline("border only");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
+
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
+    DummyControl actor = DummyControl::New(true);
+    TestVisualRender(application, actor, visual);
+
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
+  }
+
+  propertyMap.Clear();
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(2, 2, 2, 2));
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  {
+    tet_infoline("whole grid (2,2,2,2) sync");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
+
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
+    DummyControl actor = DummyControl::New(true);
+    TestVisualRender(application, actor, visual);
+
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
+  }
+
+  propertyMap.Clear();
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(1, 1, 1, 1));
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
   {
-    tet_infoline( "whole grid" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("whole grid (1,1,1,1) sync : for testing same image, different border");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualAsynchronousRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
   }
 
-  propertyMap.Insert( ImageVisual::Property::BORDER_ONLY,  true );
+  propertyMap.Clear();
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(1, 1, 1, 1));
   {
-    tet_infoline( "border only" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("whole grid (1,1,1,1) async");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
   }
 
   propertyMap.Clear();
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA );
-  propertyMap.Insert( ImageVisual::Property::BORDER, Rect< int >( 1, 1, 1, 1 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(3, 3, 3, 3));
   {
-    tet_infoline( "whole grid" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("whole grid (3,3,3,3) async");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
   }
 
   END_TEST;
@@ -797,55 +875,55 @@ int UtcDaliVisualFactoryGetNPatchVisual2(void)
 int UtcDaliVisualFactoryGetNPatchVisual3(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual3: Request n-patch visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual3: Request n-patch visual with a Property::Map");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_NPATCH_FILE_NAME );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_NPATCH_FILE_NAME);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME);
   {
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualAsynchronousRender( application, actor, visual );
+    TestVisualAsynchronousRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
   }
 
-  propertyMap.Insert( ImageVisual::Property::BORDER_ONLY,  true );
+  propertyMap.Insert(ImageVisual::Property::BORDER_ONLY, true);
   {
-    tet_infoline( "border only" );
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    tet_infoline("border only");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
     DummyControl actor = DummyControl::New(true);
-    TestVisualRender( application, actor, visual );
+    TestVisualRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
 
-    application.GetScene().Remove( actor );
-    DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+    application.GetScene().Remove(actor);
+    DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   }
 
   END_TEST;
@@ -854,28 +932,28 @@ int UtcDaliVisualFactoryGetNPatchVisual3(void)
 int UtcDaliVisualFactoryGetNPatchVisual4(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual4: Request 9-patch visual with an image url" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual4: Request 9-patch visual with an image url");
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  Visual::Base visual = factory.CreateVisual( TEST_9_PATCH_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(TEST_9_PATCH_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
   DummyControl actor = DummyControl::New(true);
-  TestVisualAsynchronousRender( application, actor, visual );
+  TestVisualAsynchronousRender(application, actor, visual);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  Vector2 naturalSize( 0.0f, 0.0f );
-  visual.GetNaturalSize( naturalSize );
-  DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+  Vector2 naturalSize(0.0f, 0.0f);
+  visual.GetNaturalSize(naturalSize);
+  DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
 
   textureTrace.Reset();
 
@@ -885,29 +963,29 @@ int UtcDaliVisualFactoryGetNPatchVisual4(void)
 int UtcDaliVisualFactoryGetNPatchVisual5(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual5: Request n-patch visual with an image url" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual5: Request n-patch visual with an image url");
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_NPATCH_FILE_NAME );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_NPATCH_FILE_NAME);
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  Visual::Base visual = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(TEST_NPATCH_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
   DummyControl actor = DummyControl::New(true);
-  TestVisualAsynchronousRender( application, actor, visual );
+  TestVisualAsynchronousRender(application, actor, visual);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-  Vector2 naturalSize( 0.0f, 0.0f );
-  visual.GetNaturalSize( naturalSize );
-  DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+  Vector2 naturalSize(0.0f, 0.0f);
+  visual.GetNaturalSize(naturalSize);
+  DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -915,65 +993,65 @@ int UtcDaliVisualFactoryGetNPatchVisual5(void)
 int UtcDaliVisualFactoryGetNPatchVisual6(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual6: Request n-patch visual with a general image" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual6: Request n-patch visual with a general image");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   {
     // Get actual size of test image
-    ImageDimensions imageSize = Dali::GetClosestImageSize( gImage_34_RGBA );
+    ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA);
 
     Property::Map propertyMap;
-    propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-    propertyMap.Insert( ImageVisual::Property::URL, gImage_34_RGBA );
+    propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+    propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
 
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualAsynchronousRender( application, actor, visual );
+    TestVisualAsynchronousRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
 
-    application.GetScene().Remove( actor );
-    DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+    application.GetScene().Remove(actor);
+    DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   }
 
   {
     // Get actual size of test image
-    ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_IMAGE_FILE_NAME );
+    ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_IMAGE_FILE_NAME);
 
     Property::Map propertyMap;
-    propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-    propertyMap.Insert( ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME );
+    propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
 
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
-    TestVisualAsynchronousRender( application, actor, visual );
+    TestVisualAsynchronousRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth() - 2.0f, imageSize.GetHeight() - 2.0f), TEST_LOCATION);
 
-    application.GetScene().Remove( actor );
-    DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+    application.GetScene().Remove(actor);
+    DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   }
 
   END_TEST;
@@ -982,50 +1060,50 @@ int UtcDaliVisualFactoryGetNPatchVisual6(void)
 int UtcDaliVisualFactoryGetNPatchVisual7(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual7: Add 9-patch visual on stage and instantly remove it." );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual7: Add 9-patch visual on stage and instantly remove it.");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, false );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
   {
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
 
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+    actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-    application.GetScene().Add( actor );
+    application.GetScene().Add(actor);
     actor.Unparent();
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger(1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
   }
 
   END_TEST;
@@ -1034,71 +1112,229 @@ int UtcDaliVisualFactoryGetNPatchVisual7(void)
 int UtcDaliVisualFactoryGetNPatchVisual8(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisual8: Add 9-patch visual on stage, instantly remove it and add new 9-patch visual with same propertyMap" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual8: Add 9-patch visual on stage, instantly remove it and add new 9-patch visual with same propertyMap");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   // Get actual size of test image
-  ImageDimensions imageSize = Dali::GetClosestImageSize( TEST_9_PATCH_FILE_NAME );
+  ImageDimensions imageSize = Dali::GetClosestImageSize(TEST_9_PATCH_FILE_NAME);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, false );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
   {
-    Visual::Base visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    Vector2 naturalSize( 0.0f, 0.0f );
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
 
-    TestGlAbstraction& gl = application.GetGlAbstraction();
-    TraceCallStack& textureTrace = gl.GetTextureTrace();
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
 
     DummyControl actor = DummyControl::New(true);
 
     DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+    actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-    application.GetScene().Add( actor );
+    application.GetScene().Add(actor);
     actor.Unparent();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    visual = factory.CreateVisual( propertyMap );
-    DALI_TEST_CHECK( visual );
+    visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
 
-    visual.GetNaturalSize( naturalSize );
-    DALI_TEST_EQUALS( naturalSize, Vector2( imageSize.GetWidth(), imageSize.GetHeight() ), TEST_LOCATION );
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
 
     actor = DummyControl::New(true);
 
     DummyControlImpl& dummyImpl2 = static_cast<DummyControlImpl&>(actor.GetImplementation());
-    dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-    DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+    actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 
-    application.GetScene().Add( actor );
+    application.GetScene().Add(actor);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger(1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    Renderer renderer = actor.GetRendererAt( 0 );
-    auto textures = renderer.GetTextures();
+    Renderer renderer = actor.GetRendererAt(0);
+    auto     textures = renderer.GetTextures();
 
-    DALI_TEST_EQUALS( textures.GetTextureCount(), 1, TEST_LOCATION );
+    DALI_TEST_EQUALS(textures.GetTextureCount(), 1, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliVisualFactoryGetNPatchVisual9(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual9: Request n-patch visual sync during another n-patch visual load image asynchronously");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, false);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
+  textureTrace.Enable(true);
+
+  DummyControl actor = DummyControl::New(true);
+
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor);
+
+  propertyMap.Clear();
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_NPATCH_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+  Visual::Base visual2 = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual2);
+
+  DummyControl actor2 = DummyControl::New(true);
+
+  DummyControlImpl& dummyImpl2 = static_cast<DummyControlImpl&>(actor2.GetImplementation());
+  dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual2);
+
+  actor2.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  DALI_TEST_EQUALS(actor2.GetRendererCount(), 0u, TEST_LOCATION);
+
+  application.GetScene().Add(actor2);
+  application.Render();
+
+  // Async loading is not finished yet.
+  {
+    DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  }
+  // Sync loading is finished.
+  {
+    Renderer renderer = actor2.GetRendererAt(0);
+    auto     textures = renderer.GetTextures();
+
+    DALI_TEST_EQUALS(textures.GetTextureCount(), 1, TEST_LOCATION);
+  }
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+  // Async loading is finished.
+  {
+    Renderer renderer = actor.GetRendererAt(0);
+    auto     textures = renderer.GetTextures();
+
+    DALI_TEST_EQUALS(textures.GetTextureCount(), 1, TEST_LOCATION);
+  }
+
+  END_TEST;
+}
+
+int UtcDaliVisualFactoryGetNPatchVisual10(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisual10: Request same 9-patch visual with a different border");
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  // Get actual size of test image
+  ImageDimensions imageSize = Dali::GetClosestImageSize(gImage_34_RGBA);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(2, 2, 2, 2));
+  {
+    tet_infoline("whole grid (2,2,2,2) async");
+    Visual::Base visual = factory.CreateVisual(propertyMap);
+    DALI_TEST_CHECK(visual);
+
+    TestGlAbstraction& gl           = application.GetGlAbstraction();
+    TraceCallStack&    textureTrace = gl.GetTextureTrace();
+    textureTrace.Enable(true);
+
+    DummyControl actor = DummyControl::New(true);
+    TestVisualAsynchronousRender(application, actor, visual);
+
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
+
+    Vector2 naturalSize(0.0f, 0.0f);
+    visual.GetNaturalSize(naturalSize);
+    DALI_TEST_EQUALS(naturalSize, Vector2(imageSize.GetWidth(), imageSize.GetHeight()), TEST_LOCATION);
+  }
+
+  propertyMap.Clear();
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(1, 1, 1, 1));
+  {
+    tet_infoline("whole grid (1,1,1,1) async. Check whether we use cached texture");
+    // We don't use dummyControl here
+
+    const int expectResourceReadySignalCounter = 10;
+    gResourceReadySignalCounter                = 0;
+
+    for(int i = 0; i < expectResourceReadySignalCounter; i++)
+    {
+      ImageView imageView                            = ImageView::New();
+      imageView[Toolkit::ImageView::Property::IMAGE] = propertyMap;
+      imageView.ResourceReadySignal().Connect(&OnResourceReadySignal);
+      application.GetScene().Add(imageView);
+    }
+
+    // Dont wait for loading. All border use cached texture.
+
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, expectResourceReadySignalCounter, TEST_LOCATION);
+  }
+
+  propertyMap.Clear();
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, gImage_34_RGBA);
+  propertyMap.Insert(ImageVisual::Property::BORDER, Rect<int>(1, 2, 1, 2));
+  {
+    tet_infoline("whole grid (1,2,1,2) async. Check whether we use cached texture");
+    // We don't use dummyControl here
+
+    const int expectResourceReadySignalCounter = 10;
+    gResourceReadySignalCounter                = 0;
+
+    for(int i = 0; i < expectResourceReadySignalCounter; i++)
+    {
+      ImageView imageView                            = ImageView::New();
+      imageView[Toolkit::ImageView::Property::IMAGE] = propertyMap;
+      imageView.ResourceReadySignal().Connect(&OnResourceReadySignal);
+      application.GetScene().Add(imageView);
+    }
+
+    // Dont wait for loading. All border use cached texture.
+
+    DALI_TEST_EQUALS(gResourceReadySignalCounter, expectResourceReadySignalCounter, TEST_LOCATION);
   }
 
   END_TEST;
@@ -1107,49 +1343,49 @@ int UtcDaliVisualFactoryGetNPatchVisual8(void)
 int UtcDaliNPatchVisualAuxiliaryImage01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "NPatchVisual with aux image" );
+  tet_infoline("NPatchVisual with aux image");
 
   VisualFactory factory = VisualFactory::Get();
   Property::Map properties;
   Property::Map shader;
 
   Property::Map transformMap;
-  transformMap["size"] = Vector2( 0.5f, 0.5f ) ;
-  transformMap["offset"] = Vector2( 20.0f, 0.0f ) ;
-  transformMap["offsetPolicy"] = Vector2( Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE );
-  transformMap["anchorPoint"] = Align::CENTER;
-  transformMap["origin"] = Align::CENTER;
+  transformMap["size"]                    = Vector2(0.5f, 0.5f);
+  transformMap["offset"]                  = Vector2(20.0f, 0.0f);
+  transformMap["offsetPolicy"]            = Vector2(Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE);
+  transformMap["anchorPoint"]             = Align::CENTER;
+  transformMap["origin"]                  = Align::CENTER;
   properties[Visual::Property::TRANSFORM] = transformMap;
 
-  properties[Visual::Property::TYPE] = Visual::IMAGE;
-  properties[Visual::Property::MIX_COLOR] = Color::BLUE;
-  properties[Visual::Property::SHADER]=shader;
-  properties[ImageVisual::Property::URL] = TEST_9_PATCH_FILE_NAME;
-  properties[DevelImageVisual::Property::AUXILIARY_IMAGE] = TEST_AUX_IMAGE;
+  properties[Visual::Property::TYPE]                            = Visual::IMAGE;
+  properties[Visual::Property::MIX_COLOR]                       = Color::BLUE;
+  properties[Visual::Property::SHADER]                          = shader;
+  properties[ImageVisual::Property::URL]                        = TEST_9_PATCH_FILE_NAME;
+  properties[DevelImageVisual::Property::AUXILIARY_IMAGE]       = TEST_AUX_IMAGE;
   properties[DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA] = 0.9f;
 
-  Visual::Base visual = factory.CreateVisual( properties );
+  Visual::Base visual = factory.CreateVisual(properties);
 
   // trigger creation through setting on stage
-  DummyControl dummy = DummyControl::New(true);
+  DummyControl        dummy     = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transformMap );
-  dummy.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  dummy.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  dummyImpl.SetLayout(DummyControl::Property::TEST_VISUAL, transformMap);
+  dummy.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
+  dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   application.GetScene().Add(dummy);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  Renderer renderer = dummy.GetRendererAt( 0 );
-  auto textures = renderer.GetTextures();
-  DALI_TEST_EQUALS( textures.GetTextureCount(), 2, TEST_LOCATION );
+  Renderer renderer = dummy.GetRendererAt(0);
+  auto     textures = renderer.GetTextures();
+  DALI_TEST_EQUALS(textures.GetTextureCount(), 2, TEST_LOCATION);
   UnparentAndReset(dummy);
 
   END_TEST;
@@ -1158,58 +1394,57 @@ int UtcDaliNPatchVisualAuxiliaryImage01(void)
 int UtcDaliNPatchVisualAuxiliaryImage02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "Multiple NPatchVisual with aux image coincidentally" );
+  tet_infoline("Multiple NPatchVisual with aux image coincidentally");
 
   const Property::Value NPATCH_TEST{
     {ImageVisual::Property::URL, TEST_9_PATCH_FILE_NAME},
     {DevelImageVisual::Property::AUXILIARY_IMAGE, TEST_AUX_IMAGE}};
 
-  ImageView imageView1 = ImageView::New();
+  ImageView imageView1                   = ImageView::New();
   imageView1[ImageView::Property::IMAGE] = NPATCH_TEST;
-  application.GetScene().Add( imageView1 );
+  application.GetScene().Add(imageView1);
 
-  ImageView imageView2 = ImageView::New();
+  ImageView imageView2                   = ImageView::New();
   imageView2[ImageView::Property::IMAGE] = NPATCH_TEST;
-  application.GetScene().Add( imageView2 );
+  application.GetScene().Add(imageView2);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  Renderer renderer1 = imageView1.GetRendererAt( 0 );
-  auto textureSet1 = renderer1.GetTextures();
+  Renderer renderer1   = imageView1.GetRendererAt(0);
+  auto     textureSet1 = renderer1.GetTextures();
 
-  Renderer renderer2 = imageView2.GetRendererAt( 0 );
-  auto textureSet2 = renderer2.GetTextures();
-  DALI_TEST_EQUALS( textureSet1 != textureSet2, true, TEST_LOCATION );
+  Renderer renderer2   = imageView2.GetRendererAt(0);
+  auto     textureSet2 = renderer2.GetTextures();
+  DALI_TEST_EQUALS(textureSet1 != textureSet2, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliVisualFactoryGetNPatchVisualN1(void)
 {
   //This should still load but display an error image
 
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid image url" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid image url");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
-  Visual::Base visual = factory.CreateVisual( "ERROR.9.jpg", ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual("ERROR.9.jpg", ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
   {
     DummyControl actor = DummyControl::New(true);
-    TestVisualAsynchronousRender( application, actor, visual );
+    TestVisualAsynchronousRender(application, actor, visual);
 
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
     UnparentAndReset(actor);
   }
 
@@ -1221,28 +1456,28 @@ int UtcDaliVisualFactoryGetNPatchVisualN2(void)
   //This should still load but display an error image
 
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid URL" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid URL");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::N_PATCH );
-  propertyMap.Insert( ImageVisual::Property::URL,  "ERROR.9.jpg" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::N_PATCH);
+  propertyMap.Insert(ImageVisual::Property::URL, "ERROR.9.jpg");
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
   TraceCallStack& drawTrace = gl.GetDrawTrace();
   drawTrace.Enable(true);
 
   DummyControl actor = DummyControl::New(true);
-  TestVisualAsynchronousRender( application, actor, visual );
+  TestVisualAsynchronousRender(application, actor, visual);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1252,17 +1487,17 @@ int UtcDaliVisualFactoryGetNPatchVisualN3(void)
   // Passing in an invalid visual type so we should not get a visual
 
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid visual type" );
+  tet_infoline("UtcDaliVisualFactoryGetNPatchVisualN: Request n-patch visual with an invalid visual type");
 
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  111 );
-  propertyMap.Insert( ImageVisual::Property::URL,  "ERROR.9.jpg" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, 111);
+  propertyMap.Insert(ImageVisual::Property::URL, "ERROR.9.jpg");
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( !visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(!visual);
 
   END_TEST;
 }
@@ -1270,36 +1505,38 @@ int UtcDaliVisualFactoryGetNPatchVisualN3(void)
 int UtcDaliVisualFactoryGetSvgVisual(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url" );
+  tet_infoline("UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url");
 
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base  visual  = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
-  visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f) );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+  visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f));
 
   // Either application.SendNotification() or the trigger can now complete the task.
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
   // waiting for the resource uploading
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1307,35 +1544,37 @@ int UtcDaliVisualFactoryGetSvgVisual(void)
 int UtcDaliVisualFactoryGetSvgVisualLarge(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url" );
+  tet_infoline("UtcDaliVisualFactoryGetSvgVisual: Request svg visual with a svg url");
 
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions( 2000, 2000 ) );
-  DALI_TEST_CHECK( visual );
+  Visual::Base  visual  = factory.CreateVisual(TEST_SVG_FILE_NAME, ImageDimensions(2000, 2000));
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Only rasterizes when it knows control size.
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  application.GetScene().Add( actor );
+  actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); // Only rasterizes when it knows control size.
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  application.GetScene().Add(actor);
 
   // Either application.SendNotification() or the trigger can now complete the task.
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
   // waiting for the resource uploading
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1343,127 +1582,129 @@ int UtcDaliVisualFactoryGetSvgVisualLarge(void)
 int UtcDaliVisualFactoryGetSvgVisualAtlas(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetSvgVisual: Request svg visual with enabled atlas" );
+  tet_infoline("UtcDaliVisualFactoryGetSvgVisual: Request svg visual with enabled atlas");
 
   VisualFactory factory = VisualFactory::Get();
 
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::SVG );
-  propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME );
-  propertyMap.Insert( ImageVisual::Property::ATLASING, true );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::SVG);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_SVG_FILE_NAME);
+  propertyMap.Insert(ImageVisual::Property::ATLASING, true);
 
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
-  visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f) );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+  visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f));
 
   // Either application.SendNotification() or the trigger can now complete the task.
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  // Wait for loading & rasterization
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
   // waiting for the resource uploading
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
   END_TEST;
 }
 
 //Creates a mesh visual from the given propertyMap and tries to load it on stage in the given application.
 //This is expected to succeed, which will then pass the test.
-void MeshVisualLoadsCorrectlyTest( Property::Map& propertyMap, ToolkitTestApplication& application )
+void MeshVisualLoadsCorrectlyTest(Property::Map& propertyMap, ToolkitTestApplication& application)
 {
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   //Create a mesh visual.
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   //Create an actor on stage to house the visual.
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
-  visual.SetTransformAndSize(DefaultTransform(), Vector2( 200.f, 200.f ) );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+  visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f));
 
   //Ensure set on stage.
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
   //Attempt to render to queue resource load requests.
   application.SendNotification();
-  application.Render( 0 );
+  application.Render(0);
 
   //Render again to upload the now-loaded textures.
   application.SendNotification();
-  application.Render( 0 );
+  application.Render(0);
 
   Matrix testScaleMatrix;
-  testScaleMatrix.SetIdentityAndScale( Vector3( 1.0, -1.0, 1.0 ) );
+  testScaleMatrix.SetIdentityAndScale(Vector3(1.0, -1.0, 1.0));
   Matrix actualScaleMatrix;
 
   //Test to see if the object has been successfully loaded.
-  DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue<Matrix>( "uObjectMatrix", actualScaleMatrix ) );
-  DALI_TEST_EQUALS( actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Matrix>("uObjectMatrix", actualScaleMatrix));
+  DALI_TEST_EQUALS(actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   //Finish by setting off stage, and ensuring this was successful.
   actor.Unparent();
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 }
 
 //Creates a mesh visual from the given propertyMap and tries to load it on stage in the given application.
 //This is expected to fail, which will then pass the test.
-void MeshVisualDoesNotLoadCorrectlyTest( Property::Map& propertyMap, ToolkitTestApplication& application )
+void MeshVisualDoesNotLoadCorrectlyTest(Property::Map& propertyMap, ToolkitTestApplication& application)
 {
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   //Create a mesh visual.
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   //Create an actor on stage to house the visual.
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
-  visual.SetTransformAndSize(DefaultTransform(),  Vector2( 200.f, 200.f ) );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+  visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f));
 
   //Ensure set on stage.
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
   //Attempt to render to queue resource load requests.
   application.SendNotification();
-  application.Render( 0 );
+  application.Render(0);
 
   //Render again to upload the now-loaded textures.
   application.SendNotification();
-  application.Render( 0 );
+  application.Render(0);
 
   //Test to see if the object has not been loaded, as expected.
   Matrix scaleMatrix;
-  DALI_TEST_CHECK( !application.GetGlAbstraction().GetUniformValue<Matrix>( "uObjectMatrix", scaleMatrix ) );
+  DALI_TEST_CHECK(!application.GetGlAbstraction().GetUniformValue<Matrix>("uObjectMatrix", scaleMatrix));
 
   //Finish by setting off stage, and ensuring this was successful.
   actor.Unparent();
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 }
 
 //Test if mesh loads correctly when supplied with only the bare minimum requirements, an object file.
@@ -1472,53 +1713,52 @@ int UtcDaliVisualFactoryGetMeshVisual1(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual1:  Request mesh visual with a valid object file only" );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual1:  Request mesh visual with a valid object file only");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
 
-
 //Test if mesh loads correctly when supplied with an object file as well as a blank material file and images directory.
 int UtcDaliVisualFactoryGetMeshVisual2(void)
 {
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual2:  Request mesh visual with blank material file and images directory" );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual2:  Request mesh visual with blank material file and images directory");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, "" );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, "" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, "");
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, "");
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1529,28 +1769,28 @@ int UtcDaliVisualFactoryGetMeshVisual3b(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual3:  Request mesh visual with all parameters correct" );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual3:  Request mesh visual with all parameters correct");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::USE_MIPMAPPING, Color::GREEN ); // Test that wrong property types don't prevent the object load
-  propertyMap.Insert( MeshVisual::Property::USE_SOFT_NORMALS, 1.0f );
-  propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, 1.0f );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::USE_MIPMAPPING, Color::GREEN); // Test that wrong property types don't prevent the object load
+  propertyMap.Insert(MeshVisual::Property::USE_SOFT_NORMALS, 1.0f);
+  propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, 1.0f);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1561,28 +1801,28 @@ int UtcDaliVisualFactoryGetMeshVisual3(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual3:  Request mesh visual with all parameters correct" );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual3:  Request mesh visual with all parameters correct");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::USE_MIPMAPPING, false );
-  propertyMap.Insert( MeshVisual::Property::USE_SOFT_NORMALS, false );
-  propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3::XAXIS );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::USE_MIPMAPPING, false);
+  propertyMap.Insert(MeshVisual::Property::USE_SOFT_NORMALS, false);
+  propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3::XAXIS);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1593,25 +1833,25 @@ int UtcDaliVisualFactoryGetMeshVisual4(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual4:  Request mesh visual with diffuse texture but not normal or gloss." );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual4:  Request mesh visual with diffuse texture but not normal or gloss.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_SIMPLE_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_SIMPLE_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1622,30 +1862,29 @@ int UtcDaliVisualFactoryGetMeshVisual5(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual5:  Request mesh visual and make it only use diffuse textures." );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual5:  Request mesh visual and make it only use diffuse textures.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( "objectUrl", TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( "materialUrl", TEST_MTL_FILE_NAME );
-  propertyMap.Insert( "texturesPath", TEST_RESOURCE_DIR "/" );
-  propertyMap.Insert( "useMipmapping", false );
-  propertyMap.Insert( "useSoftNormals", false );
-  propertyMap.Insert( "lightPosition", Vector3::ZAXIS );
-  propertyMap.Insert( "shadingMode", MeshVisual::ShadingMode::TEXTURED_WITH_SPECULAR_LIGHTING );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert("objectUrl", TEST_OBJ_FILE_NAME);
+  propertyMap.Insert("materialUrl", TEST_MTL_FILE_NAME);
+  propertyMap.Insert("texturesPath", TEST_RESOURCE_DIR "/");
+  propertyMap.Insert("useMipmapping", false);
+  propertyMap.Insert("useSoftNormals", false);
+  propertyMap.Insert("lightPosition", Vector3::ZAXIS);
+  propertyMap.Insert("shadingMode", MeshVisual::ShadingMode::TEXTURED_WITH_SPECULAR_LIGHTING);
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
-
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1656,26 +1895,26 @@ int UtcDaliVisualFactoryGetMeshVisual6(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual6:  Request mesh visual and make it not use any textures." );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual6:  Request mesh visual and make it not use any textures.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
-  propertyMap.Insert( MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
+  propertyMap.Insert(MeshVisual::Property::SHADING_MODE, MeshVisual::ShadingMode::TEXTURELESS_WITH_DIFFUSE_LIGHTING);
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1685,26 +1924,26 @@ int UtcDaliVisualFactoryGetMeshVisual7(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual7:  Request mesh visual with custom light position." );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual7:  Request mesh visual with custom light position.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
-  propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 0.0, 1.0, 2.0 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
+  propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(0.0, 1.0, 2.0));
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1716,25 +1955,25 @@ int UtcDaliVisualFactoryGetMeshVisual8(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisual5:  Request mesh visual with normal-less object file." );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisual5:  Request mesh visual with normal-less object file.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_SIMPLE_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_SIMPLE_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
 
   //Test to see if mesh loads correctly.
-  MeshVisualLoadsCorrectlyTest( propertyMap, application );
+  MeshVisualLoadsCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1745,17 +1984,16 @@ int UtcDaliVisualFactoryGetMeshVisualN1(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisualN1:  Request mesh visual without object file" );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisualN1:  Request mesh visual without object file");
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
 
   //Test to see if mesh doesn't load with these properties, as expected.
-  MeshVisualDoesNotLoadCorrectlyTest( propertyMap, application );
-
+  MeshVisualDoesNotLoadCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1766,18 +2004,17 @@ int UtcDaliVisualFactoryGetMeshVisualN2(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisualN2:  Request mesh visual with invalid material and images urls" );
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisualN2:  Request mesh visual with invalid material and images urls");
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, "invalid" );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, "also invalid" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, TEST_OBJ_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, "invalid");
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, "also invalid");
 
   //Test to see if mesh doesn't load with these properties, as expected.
-  MeshVisualDoesNotLoadCorrectlyTest( propertyMap, application );
-
+  MeshVisualDoesNotLoadCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
@@ -1787,59 +2024,58 @@ int UtcDaliVisualFactoryGetMeshVisualN3(void)
 {
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetMeshVisualN3:  Request mesh visual with invalid object url" );
-
+  tet_infoline("UtcDaliVisualFactoryGetMeshVisualN3:  Request mesh visual with invalid object url");
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
-  propertyMap.Insert( MeshVisual::Property::OBJECT_URL, "invalid" );
-  propertyMap.Insert( MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME );
-  propertyMap.Insert( MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/" );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::MESH);
+  propertyMap.Insert(MeshVisual::Property::OBJECT_URL, "invalid");
+  propertyMap.Insert(MeshVisual::Property::MATERIAL_URL, TEST_MTL_FILE_NAME);
+  propertyMap.Insert(MeshVisual::Property::TEXTURES_PATH, TEST_RESOURCE_DIR "/");
 
   //Test to see if mesh doesn't load with these properties, as expected.
-  MeshVisualDoesNotLoadCorrectlyTest( propertyMap, application );
+  MeshVisualDoesNotLoadCorrectlyTest(propertyMap, application);
 
   END_TEST;
 }
 
 //Creates a primitive visual with the given property map and tests to see if it correctly loads in the given application.
-void TestPrimitiveVisualWithProperties( Property::Map& propertyMap, ToolkitTestApplication& application )
+void TestPrimitiveVisualWithProperties(Property::Map& propertyMap, ToolkitTestApplication& application)
 {
   VisualFactory factory = VisualFactory::Get();
-  DALI_TEST_CHECK( factory );
+  DALI_TEST_CHECK(factory);
 
   //Create a primitive visual.
-  Visual::Base visual = factory.CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   //Create an actor on stage to house the visual.
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
-  visual.SetTransformAndSize(DefaultTransform(),  Vector2( 200.f, 200.f ) );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+  visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f));
 
   //Ensure set on stage.
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
 
   //Tell test application to load the visual.
   application.SendNotification();
   application.Render(0);
 
   Matrix testScaleMatrix;
-  testScaleMatrix.SetIdentityAndScale( Vector3( 1.0, -1.0, 1.0 ) );
+  testScaleMatrix.SetIdentityAndScale(Vector3(1.0, -1.0, 1.0));
   Matrix actualScaleMatrix;
 
   //Test to see if the object has been successfully loaded.
-  DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue<Matrix>( "uObjectMatrix", actualScaleMatrix ) );
-  DALI_TEST_EQUALS( actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(application.GetGlAbstraction().GetUniformValue<Matrix>("uObjectMatrix", actualScaleMatrix));
+  DALI_TEST_EQUALS(actualScaleMatrix, testScaleMatrix, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
   //Finish by setting off stage, and ensuring this was successful.
   actor.Unparent();
-  DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
 }
 
 //Test if primitive shape loads correctly when supplied with only the bare minimum requirements, the shape to use.
@@ -1848,23 +2084,23 @@ int UtcDaliVisualFactoryGetPrimitiveVisual1(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual1:  Request primitive visual with a shape only" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual1:  Request primitive visual with a shape only");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE);
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -1875,33 +2111,33 @@ int UtcDaliVisualFactoryGetPrimitiveVisual2(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual2:  Request primitive visual with everything" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual2:  Request primitive visual with everything");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 );
-  propertyMap.Insert( PrimitiveVisual::Property::STACKS, 20 );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_RADIUS, 60.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.7f );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.8f );
-  propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 0.9, 1.0, 1.1 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CUBE);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10);
+  propertyMap.Insert(PrimitiveVisual::Property::STACKS, 20);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_RADIUS, 60.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.7f);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, 0.8f);
+  propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(0.9, 1.0, 1.1));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -1912,26 +2148,26 @@ int UtcDaliVisualFactoryGetPrimitiveVisual3(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual3:  Request primitive visual to display a sphere" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual3:  Request primitive visual to display a sphere");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 );
-  propertyMap.Insert( PrimitiveVisual::Property::STACKS, 20 );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10);
+  propertyMap.Insert(PrimitiveVisual::Property::STACKS, 20);
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -1942,28 +2178,28 @@ int UtcDaliVisualFactoryGetPrimitiveVisual4(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual4:  Request primitive visual to display a conic section" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual4:  Request primitive visual to display a conic section");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f);
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -1974,25 +2210,25 @@ int UtcDaliVisualFactoryGetPrimitiveVisual5(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual5:  Request primitive visual to display a bevelled cube" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual5:  Request primitive visual to display a bevelled cube");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::BEVELLED_CUBE );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.7f );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::BEVELLED_CUBE);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, 0.7f);
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2003,24 +2239,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual6(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual6:  Request primitive visual to display an octahedron" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual6:  Request primitive visual to display an octahedron");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::OCTAHEDRON );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::OCTAHEDRON);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2031,27 +2267,27 @@ int UtcDaliVisualFactoryGetPrimitiveVisual7(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual7:  Request primitive visual to display a cone" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual7:  Request primitive visual to display a cone");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONE );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONE);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f);
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2062,25 +2298,25 @@ int UtcDaliVisualFactoryGetPrimitiveVisual8(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual8:  Request primitive visual with set light position" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual8:  Request primitive visual with set light position");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-  propertyMap.Insert( MeshVisual::Property::LIGHT_POSITION, Vector3( 0.0, 1.0, 2.0 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
+  propertyMap.Insert(MeshVisual::Property::LIGHT_POSITION, Vector3(0.0, 1.0, 2.0));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2091,24 +2327,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual9(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual9:  Request primitive visual with above-cap slices." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual9:  Request primitive visual with above-cap slices.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, Property::Value( 1000000 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, Property::Value(1000000));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2119,24 +2355,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual10(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual10:  Request primitive visual with too few slices." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual10:  Request primitive visual with too few slices.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, Property::Value( 2 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, Property::Value(2));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2147,24 +2383,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual11(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual11:  Request primitive visual with too many stacks." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual11:  Request primitive visual with too many stacks.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::STACKS, Property::Value( 1000000 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::STACKS, Property::Value(1000000));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2175,24 +2411,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual12(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual12:  Request primitive visual with too few stacks." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual12:  Request primitive visual with too few stacks.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::STACKS, Property::Value( 1 ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::STACKS, Property::Value(1));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2203,24 +2439,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual13(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual13:  Request primitive visual with invalid scale dimensions." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual13:  Request primitive visual with invalid scale dimensions.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_DIMENSIONS, Vector3::ZERO );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_DIMENSIONS, Vector3::ZERO);
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2231,24 +2467,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual14(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual14:  Request primitive visual with too low a bevel percentage." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual14:  Request primitive visual with too low a bevel percentage.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value( -1.0f ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value(-1.0f));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2259,24 +2495,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual15(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual15:  Request primitive visual with too high a bevel percentage." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual15:  Request primitive visual with too high a bevel percentage.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value( 2.0f ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_PERCENTAGE, Property::Value(2.0f));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2287,24 +2523,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual16(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual16:  Request primitive visual with too low a bevel smoothness." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual16:  Request primitive visual with too low a bevel smoothness.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value( -1.0f ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value(-1.0f));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2315,24 +2551,24 @@ int UtcDaliVisualFactoryGetPrimitiveVisual17(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual17:  Request primitive visual with too high a bevel smoothness." );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual17:  Request primitive visual with too high a bevel smoothness.");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE );
-  propertyMap.Insert( PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value( 2.0f ) );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::SPHERE);
+  propertyMap.Insert(PrimitiveVisual::Property::BEVEL_SMOOTHNESS, Property::Value(2.0f));
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2343,28 +2579,28 @@ int UtcDaliVisualFactoryGetPrimitiveVisual18(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisual18:  Request primitive visual to display a conic section" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisual18:  Request primitive visual to display a conic section");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
-  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM );
-  propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-  propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f );
-  propertyMap.Insert( PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
+  propertyMap.Insert(PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM);
+  propertyMap.Insert(PrimitiveVisual::Property::MIX_COLOR, Vector4(0.5, 0.5, 0.5, 1.0));
+  propertyMap.Insert(PrimitiveVisual::Property::SLICES, 10);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS, 40.0f);
+  propertyMap.Insert(PrimitiveVisual::Property::SCALE_HEIGHT, 50.0f);
 
   //Test to see if shape loads correctly.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2375,22 +2611,22 @@ int UtcDaliVisualFactoryGetPrimitiveVisualN1(void)
   //Set up test application first, so everything else can be handled.
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliVisualFactoryGetPrimitiveVisualN1:  Request primitive visual without shape" );
+  tet_infoline("UtcDaliVisualFactoryGetPrimitiveVisualN1:  Request primitive visual without shape");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uObjectMatrix", Property::Type::MATRIX),
-  };
+    {
+      UniformData("uObjectMatrix", Property::Type::MATRIX),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   //Set up visual properties, without supplying shape.
   Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE);
 
   //Test to see if shape loads regardless of missing input.
-  TestPrimitiveVisualWithProperties( propertyMap, application );
+  TestPrimitiveVisualWithProperties(propertyMap, application);
 
   END_TEST;
 }
@@ -2398,49 +2634,49 @@ int UtcDaliVisualFactoryGetPrimitiveVisualN1(void)
 int UtcDaliVisualFactoryGetAnimatedImageVisual1(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedImageVisual1: Request animated image visual with a gif url" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedImageVisual1: Request animated image visual with a gif url");
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( TEST_GIF_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base  visual  = factory.CreateVisual(TEST_GIF_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
   textureTrace.Reset();
 
   // Force the timer used by the animatedImageVisual to tick,
-  Dali::Timer timer = Timer::New( 0 );
+  Dali::Timer timer = Timer::New(0);
   timer.MockEmitSignal();
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
   textureTrace.Reset();
 
   // Force the timer used by the animatedImageVisual to tick,
@@ -2448,11 +2684,11 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
   textureTrace.Reset();
 
   // Force the timer used by the animatedImageVisual to tick,
@@ -2460,16 +2696,16 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION);
   textureTrace.Reset();
 
   // Test SetOffScene().
   actor.Unparent();
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -2477,79 +2713,117 @@ int UtcDaliVisualFactoryGetAnimatedImageVisual1(void)
 int UtcDaliVisualFactoryGetAnimatedImageVisual2(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedImageVisual2: Request animated image visual with a Property::Map, test custom wrap mode and pixel area" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedImageVisual2: Request animated image visual with a Property::Map, test custom wrap mode and pixel area");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("pixelArea", Property::Type::VECTOR4),
-    UniformData("wrapMode", Property::Type::VECTOR2),
-  };
+    {
+      UniformData("pixelArea", Property::Type::VECTOR4),
+      UniformData("wrapMode", Property::Type::VECTOR2),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   const Vector4 pixelArea(-0.5f, -0.5f, 2.f, 2.f);
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE,  Visual::IMAGE  )
-             .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME  )
-             .Add( ImageVisual::Property::PIXEL_AREA, pixelArea )
-             .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT )
-             .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, Visual::IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+    .Add(ImageVisual::Property::PIXEL_AREA, pixelArea)
+    .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::MIRRORED_REPEAT)
+    .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::REPEAT);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
   TraceCallStack& texParameterTrace = gl.GetTexParameterTrace();
-  texParameterTrace.Enable( true );
+  texParameterTrace.Enable(true);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
-  dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  application.GetScene().Add( actor );
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
-  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
   // For animated image visual, the wrapping is handled manually in shader, so the following gl function should not be called
   std::stringstream out;
   out << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_S << ", " << GL_MIRRORED_REPEAT;
-  DALI_TEST_CHECK( !texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) );
+  DALI_TEST_CHECK(!texParameterTrace.FindMethodAndParams("TexParameteri", out.str()));
   out.str("");
   out << GL_TEXTURE_2D << ", " << GL_TEXTURE_WRAP_T << ", " << GL_REPEAT;
-  DALI_TEST_CHECK( !texParameterTrace.FindMethodAndParams("TexParameteri", out.str()) );
+  DALI_TEST_CHECK(!texParameterTrace.FindMethodAndParams("TexParameteri", out.str()));
 
   // test the uniforms which used to handle the wrap mode
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) );
-  DALI_TEST_EQUALS( pixelAreaValue.Get<Vector4>(), pixelArea, TEST_LOCATION );
+  Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea"));
+  DALI_TEST_EQUALS(pixelAreaValue.Get<Vector4>(), pixelArea, TEST_LOCATION);
   Vector4 pixelAreaUniform;
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "pixelArea", pixelAreaUniform ) );
-  DALI_TEST_EQUALS( pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("pixelArea", pixelAreaUniform));
+  DALI_TEST_EQUALS(pixelArea, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION);
 
-  Property::Value wrapModeValue = renderer.GetProperty( renderer.GetPropertyIndex( "wrapMode" ) );
-  Vector2 wrapMode( WrapMode::MIRRORED_REPEAT-1, WrapMode::REPEAT-1 );
-  DALI_TEST_EQUALS( wrapModeValue.Get<Vector2>(), wrapMode, TEST_LOCATION );
+  Property::Value wrapModeValue = renderer.GetProperty(renderer.GetPropertyIndex("wrapMode"));
+  Vector2         wrapMode(WrapMode::MIRRORED_REPEAT - 1, WrapMode::REPEAT - 1);
+  DALI_TEST_EQUALS(wrapModeValue.Get<Vector2>(), wrapMode, TEST_LOCATION);
   Vector2 wrapModeUniform;
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector2>( "wrapMode", wrapModeUniform ) );
-  DALI_TEST_EQUALS( wrapMode, wrapModeUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector2>("wrapMode", wrapModeUniform));
+  DALI_TEST_EQUALS(wrapMode, wrapModeUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION);
+
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
+
+  END_TEST;
+}
+
+
+int UtcDaliVisualFactoryGetPreCompiler(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedImageVisual2: Request animated image visual with a Property::Map, test custom wrap mode and pixel area");
+
+
+  std::vector<RawShaderData> precompiledShaderList;
+  DALI_TEST_CHECK(precompiledShaderList.size() == 0u); // before Get Shader
+  ShaderPreCompiler::Get().GetPreCompileShaderList(precompiledShaderList);
+  DALI_TEST_CHECK(precompiledShaderList.size() == 0u); // after Get Shader
+
+  VisualFactory factory = VisualFactory::Get();
+  DALI_TEST_CHECK(factory);
+
+  factory.UsePreCompiledShader();
+
+  ShaderPreCompiler::Get().GetPreCompileShaderList(precompiledShaderList);
+  DALI_TEST_CHECK(precompiledShaderList.size() != 0u); // after Get Shader
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Visual::IMAGE);
+  propertyMap.Insert(ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
+  Visual::Base visual = factory.CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(Control::CONTROL_PROPERTY_END_INDEX + 1, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.Render();
 
   END_TEST;
 }
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp
old mode 100755
new mode 100644
index 4e553e8..2ede899
--- a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,99 +15,99 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include "dali-toolkit-test-utils/toolkit-timer.h"
 
+#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-view.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 #include <dali.h>
-#include <dali/devel-api/adaptor-framework/web-engine-certificate.h>
-#include <dali/devel-api/adaptor-framework/web-engine-console-message.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu-item.h>
-#include <dali/devel-api/adaptor-framework/web-engine-form-repost-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-frame.h>
-#include <dali/devel-api/adaptor-framework/web-engine-hit-test.h>
-#include <dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h>
-#include <dali/devel-api/adaptor-framework/web-engine-load-error.h>
-#include <dali/devel-api/adaptor-framework/web-engine-policy-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-request-interceptor.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context.h>
-#include <dali/devel-api/adaptor-framework/web-engine-security-origin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-frame.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-request-interceptor.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h>
 #include <dali/integration-api/events/hover-event-integ.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
 #include <dali/public-api/images/pixel-data.h>
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-context.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-view.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
-
-const char* const TEST_URL1( "http://www.somewhere.valid1.com" );
-const char* const TEST_URL2( "http://www.somewhere.valid2.com" );
-
-static int gPageLoadStartedCallbackCalled = 0;
-static int gPageLoadInProgressCallbackCalled = 0;
-static int gPageLoadFinishedCallbackCalled = 0;
-static int gPageLoadErrorCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineLoadError> gPageLoadErrorInstance = nullptr;
-static int gScrollEdgeReachedCallbackCalled = 0;
-static int gUrlChangedCallbackCalled = 0;
-static int gEvaluateJavaScriptCallbackCalled = 0;
-static int gJavaScriptAlertCallbackCalled = 0;
-static int gJavaScriptConfirmCallbackCalled = 0;
-static int gJavaScriptPromptCallbackCalled = 0;
-static int gScreenshotCapturedCallbackCalled = 0;
-static int gVideoPlayingCallbackCalled = 0;
-static int gGeolocationPermissionCallbackCalled = 0;
-static bool gTouched = false;
-static bool gHovered = false;
-static bool gWheelEventHandled = false;
-static int gFormRepostDecidedCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineFormRepostDecision> gFormRepostDecidedInstance = nullptr;
-static int gFrameRenderedCallbackCalled = 0;
-static int gConsoleMessageCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineConsoleMessage> gConsoleMessageInstance = nullptr;
-static int gResponsePolicyDecidedCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEnginePolicyDecision> gResponsePolicyDecisionInstance = nullptr;
-static int gCertificateConfirmCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineCertificate> gCertificateConfirmInstance = nullptr;
-static int gSslCertificateChangedCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineCertificate> gSslCertificateInstance = nullptr;
-static int gHttpAuthHandlerCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineHttpAuthHandler> gHttpAuthInstance = nullptr;
-static int gSecurityOriginsAcquiredCallbackCalled = 0;
-static int gStorageUsageAcquiredCallbackCalled = 0;
-static int gFormPasswordsAcquiredCallbackCalled = 0;
-static int gDownloadStartedCallbackCalled = 0;
-static int gMimeOverriddenCallbackCalled = 0;
-static int gRequestInterceptedCallbackCalled = 0;
-static Dali::WebEngineRequestInterceptorPtr gRequestInterceptorInstance = nullptr;
-static std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>> gSecurityOriginList;
+const char* const TEST_URL1("http://www.somewhere.valid1.com");
+const char* const TEST_URL2("http://www.somewhere.valid2.com");
+
+static int                                                                gPageLoadStartedCallbackCalled         = 0;
+static int                                                                gPageLoadInProgressCallbackCalled      = 0;
+static int                                                                gPageLoadFinishedCallbackCalled        = 0;
+static int                                                                gPageLoadErrorCallbackCalled           = 0;
+static std::unique_ptr<Dali::WebEngineLoadError>                          gPageLoadErrorInstance                 = nullptr;
+static int                                                                gScrollEdgeReachedCallbackCalled       = 0;
+static int                                                                gUrlChangedCallbackCalled              = 0;
+static int                                                                gEvaluateJavaScriptCallbackCalled      = 0;
+static int                                                                gJavaScriptAlertCallbackCalled         = 0;
+static int                                                                gJavaScriptConfirmCallbackCalled       = 0;
+static int                                                                gJavaScriptPromptCallbackCalled        = 0;
+static int                                                                gScreenshotCapturedCallbackCalled      = 0;
+static int                                                                gVideoPlayingCallbackCalled            = 0;
+static int                                                                gGeolocationPermissionCallbackCalled   = 0;
+static bool                                                               gTouched                               = false;
+static bool                                                               gHovered                               = false;
+static bool                                                               gWheelEventHandled                     = false;
+static int                                                                gFormRepostDecidedCallbackCalled       = 0;
+static std::unique_ptr<Dali::WebEngineFormRepostDecision>                 gFormRepostDecidedInstance             = nullptr;
+static int                                                                gFrameRenderedCallbackCalled           = 0;
+static int                                                                gConsoleMessageCallbackCalled          = 0;
+static std::unique_ptr<Dali::WebEngineConsoleMessage>                     gConsoleMessageInstance                = nullptr;
+static int                                                                gResponsePolicyDecidedCallbackCalled   = 0;
+static int                                                                gNavigationPolicyDecidedCallbackCalled = 0;
+static int                                                                gNewWindowCreatedCallbackCalled        = 0;
+static std::unique_ptr<Dali::WebEnginePolicyDecision>                     gResponsePolicyDecisionInstance        = nullptr;
+static int                                                                gCertificateConfirmCallbackCalled      = 0;
+static std::unique_ptr<Dali::WebEngineCertificate>                        gCertificateConfirmInstance            = nullptr;
+static int                                                                gSslCertificateChangedCallbackCalled   = 0;
+static std::unique_ptr<Dali::WebEngineCertificate>                        gSslCertificateInstance                = nullptr;
+static int                                                                gHttpAuthHandlerCallbackCalled         = 0;
+static std::unique_ptr<Dali::WebEngineHttpAuthHandler>                    gHttpAuthInstance                      = nullptr;
+static int                                                                gSecurityOriginsAcquiredCallbackCalled = 0;
+static int                                                                gStorageUsageAcquiredCallbackCalled    = 0;
+static int                                                                gFormPasswordsAcquiredCallbackCalled   = 0;
+static int                                                                gDownloadStartedCallbackCalled         = 0;
+static int                                                                gMimeOverriddenCallbackCalled          = 0;
+static int                                                                gRequestInterceptedCallbackCalled      = 0;
+static Dali::WebEngineRequestInterceptorPtr                               gRequestInterceptorInstance            = nullptr;
+static std::vector<std::unique_ptr<Dali::WebEngineSecurityOrigin>>        gSecurityOriginList;
 static std::vector<std::unique_ptr<Dali::WebEngineContext::PasswordData>> gPasswordDataList;
-static int gContextMenuShownCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineContextMenu> gContextMenuShownInstance = nullptr;
-static int gContextMenuHiddenCallbackCalled = 0;
-static std::unique_ptr<Dali::WebEngineContextMenu> gContextMenuHiddenInstance = nullptr;
-static int gHitTestCreatedCallbackCalled = 0;
-static int gCookieManagerChangsWatchCallbackCalled = 0;
-static int gPlainTextReceivedCallbackCalled = 0;
+static int                                                                gContextMenuShownCallbackCalled         = 0;
+static std::unique_ptr<Dali::WebEngineContextMenu>                        gContextMenuShownInstance               = nullptr;
+static int                                                                gContextMenuHiddenCallbackCalled        = 0;
+static std::unique_ptr<Dali::WebEngineContextMenu>                        gContextMenuHiddenInstance              = nullptr;
+static int                                                                gHitTestCreatedCallbackCalled           = 0;
+static int                                                                gCookieManagerChangsWatchCallbackCalled = 0;
+static int                                                                gPlainTextReceivedCallbackCalled        = 0;
 
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -144,6 +144,18 @@ static void OnResponsePolicyDecided(std::unique_ptr<Dali::WebEnginePolicyDecisio
   gResponsePolicyDecisionInstance = std::move(decision);
 }
 
+static void OnNavigationPolicyDecided(std::unique_ptr<Dali::WebEnginePolicyDecision> decision)
+{
+  gNavigationPolicyDecidedCallbackCalled++;
+}
+
+static void OnNewWindowCreated(Dali::WebEnginePlugin*& outPlugin)
+{
+  gNewWindowCreatedCallbackCalled++;
+  WebView newView = WebView::New();
+  outPlugin       = newView.GetPlugin();
+}
+
 static void OnUrlChanged(const std::string& url)
 {
   gUrlChangedCallbackCalled++;
@@ -206,7 +218,7 @@ static bool OnGeolocationPermission(const std::string&, const std::string&)
   return true;
 }
 
-static bool OnTouched( Actor actor, const Dali::TouchEvent& touch )
+static bool OnTouched(Actor actor, const Dali::TouchEvent& touch)
 {
   gTouched = true;
   return true;
@@ -330,41 +342,41 @@ int UtcDaliWebViewBasics(void)
   ToolkitTestApplication application;
 
   // Copy and Assignment Test
-  tet_infoline( "UtcDaliWebViewBasic Copy and Assignment Test" );
+  tet_infoline("UtcDaliWebViewBasic Copy and Assignment Test");
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  WebView copy( view );
-  DALI_TEST_CHECK( view == copy );
+  WebView copy(view);
+  DALI_TEST_CHECK(view == copy);
 
   WebView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
 
   assign = copy;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   // DownCast Test
-  tet_infoline( "UtcDaliWebViewBasic DownCast Test" );
+  tet_infoline("UtcDaliWebViewBasic DownCast Test");
   BaseHandle handle(view);
 
-  WebView view2 = WebView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( view2 );
-  DALI_TEST_CHECK( view == view2 );
+  WebView view2 = WebView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(view2);
+  DALI_TEST_CHECK(view == view2);
 
   // TypeRegistry Test
-  tet_infoline( "UtcDaliWebViewBasic TypeRegistry Test" );
+  tet_infoline("UtcDaliWebViewBasic TypeRegistry Test");
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "WebView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("WebView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle2 = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle2 );
+  DALI_TEST_CHECK(handle2);
 
-  WebView view3 = WebView::DownCast( handle2 );
-  DALI_TEST_CHECK( view3 );
+  WebView view3 = WebView::DownCast(handle2);
+  DALI_TEST_CHECK(view3);
 
   END_TEST;
 }
@@ -374,63 +386,63 @@ int UtcDaliWebViewPageNavigation(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
-
-  view.RegisterPageLoadStartedCallback( &OnPageLoadStarted );
-  view.RegisterPageLoadInProgressCallback( &OnPageLoadInProgress );
-  view.RegisterPageLoadFinishedCallback( &OnPageLoadFinished );
-  view.RegisterUrlChangedCallback( &OnUrlChanged );
-  DALI_TEST_EQUALS( gPageLoadStartedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadInProgressCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadFinishedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gUrlChangedCallbackCalled, 0, TEST_LOCATION );
-
-  view.LoadUrl( TEST_URL1 );
+  DALI_TEST_CHECK(view);
+
+  view.RegisterPageLoadStartedCallback(&OnPageLoadStarted);
+  view.RegisterPageLoadInProgressCallback(&OnPageLoadInProgress);
+  view.RegisterPageLoadFinishedCallback(&OnPageLoadFinished);
+  view.RegisterUrlChangedCallback(&OnUrlChanged);
+  DALI_TEST_EQUALS(gPageLoadStartedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadInProgressCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadFinishedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gUrlChangedCallbackCalled, 0, TEST_LOCATION);
+
+  view.LoadUrl(TEST_URL1);
   view.GetNaturalSize();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( view.CanGoBack(), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadStartedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadInProgressCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadFinishedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gUrlChangedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.CanGoBack(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadStartedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadInProgressCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadFinishedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gUrlChangedCallbackCalled, 1, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL2 );
+  view.LoadUrl(TEST_URL2);
   view.Suspend();
-  view.SetProperty( Actor::Property::SIZE, Vector2( 400, 300 ) );
+  view.SetProperty(Actor::Property::SIZE, Vector2(400, 300));
   application.SendNotification();
   application.Render();
   Test::EmitGlobalTimerSignal();
   view.Resume();
-  DALI_TEST_EQUALS( view.CanGoBack(), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( view.CanGoForward(), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadStartedCallbackCalled, 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadInProgressCallbackCalled, 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( gPageLoadFinishedCallbackCalled, 2, TEST_LOCATION );
-  DALI_TEST_EQUALS( gUrlChangedCallbackCalled, 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.CanGoBack(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(view.CanGoForward(), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadStartedCallbackCalled, 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadInProgressCallbackCalled, 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(gPageLoadFinishedCallbackCalled, 2, TEST_LOCATION);
+  DALI_TEST_EQUALS(gUrlChangedCallbackCalled, 2, TEST_LOCATION);
 
   view.GoBack();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_CHECK( !view.CanGoBack() );
-  DALI_TEST_CHECK( view.CanGoForward() );
+  DALI_TEST_CHECK(!view.CanGoBack());
+  DALI_TEST_CHECK(view.CanGoForward());
 
   view.GoForward();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_CHECK( view.CanGoBack() );
-  DALI_TEST_CHECK( !view.CanGoForward() );
+  DALI_TEST_CHECK(view.CanGoBack());
+  DALI_TEST_CHECK(!view.CanGoForward());
 
   view.Reload();
   view.StopLoading();
   view.ClearHistory();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_CHECK( !view.CanGoBack() );
-  DALI_TEST_CHECK( !view.CanGoForward() );
+  DALI_TEST_CHECK(!view.CanGoBack());
+  DALI_TEST_CHECK(!view.CanGoForward());
 
   END_TEST;
 }
@@ -440,24 +452,24 @@ int UtcDaliWebViewPageLoadErrorConsoleMessage(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.RegisterPageLoadErrorCallback( &OnPageLoadError );
-  view.RegisterConsoleMessageReceivedCallback( &OnConsoleMessage );
-  DALI_TEST_EQUALS( gPageLoadErrorCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gConsoleMessageCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterPageLoadErrorCallback(&OnPageLoadError);
+  view.RegisterConsoleMessageReceivedCallback(&OnConsoleMessage);
+  DALI_TEST_EQUALS(gPageLoadErrorCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gConsoleMessageCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gPageLoadErrorCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gConsoleMessageCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gPageLoadErrorCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gConsoleMessageCallbackCalled, 1, TEST_LOCATION);
 
   // error code.
   DALI_TEST_CHECK(gPageLoadErrorInstance);
@@ -477,7 +489,7 @@ int UtcDaliWebViewPageLoadErrorConsoleMessage(void)
   DALI_TEST_EQUALS(gConsoleMessageInstance->GetText(), testConsoleText, TEST_LOCATION);
 
   // reset
-  gPageLoadErrorInstance = nullptr;
+  gPageLoadErrorInstance  = nullptr;
   gConsoleMessageInstance = nullptr;
 
   END_TEST;
@@ -488,41 +500,41 @@ int UtcDaliWebViewTouchAndKeys(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.GetNaturalSize();
-  view.TouchedSignal().Connect( &OnTouched );
+  view.TouchedSignal().Connect(&OnTouched);
 
   // Touch event
   Dali::Integration::TouchEvent event;
-  Dali::Integration::Point pointDown, pointUp;
+  Dali::Integration::Point      pointDown, pointUp;
 
   event = Dali::Integration::TouchEvent();
-  pointDown.SetState( PointState::DOWN );
-  pointDown.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointDown );
-  application.ProcessEvent( event );
+  pointDown.SetState(PointState::DOWN);
+  pointDown.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointDown);
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  pointUp.SetState( PointState::UP );
-  pointUp.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointUp );
-  application.ProcessEvent( event );
+  pointUp.SetState(PointState::UP);
+  pointUp.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointUp);
+  application.ProcessEvent(event);
 
   // Key event
-  Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor( view );
-  application.ProcessEvent( Integration::KeyEvent( "", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE ) );
+  Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor(view);
+  application.ProcessEvent(Integration::KeyEvent("", "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE));
   application.SendNotification();
 
-  DALI_TEST_CHECK( gTouched );
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(gTouched);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -532,23 +544,23 @@ int UtcDaliWebViewFocusGainedAndLost(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.SetKeyInputFocus();
-  DALI_TEST_CHECK( view.HasKeyInputFocus() );
+  DALI_TEST_CHECK(view.HasKeyInputFocus());
 
   // reset
   view.ClearKeyInputFocus();
-  DALI_TEST_CHECK( !view.HasKeyInputFocus() );
+  DALI_TEST_CHECK(!view.HasKeyInputFocus());
 
   END_TEST;
 }
@@ -558,24 +570,24 @@ int UtcDaliWebViewPropertyPageZoomFactor(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  view.SetProperty( WebView::Property::PAGE_ZOOM_FACTOR, 1.5f);
-  float zoomFactor = view.GetProperty<float>( WebView::Property::PAGE_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.5f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::PAGE_ZOOM_FACTOR, 1.5f);
+  float zoomFactor = view.GetProperty<float>(WebView::Property::PAGE_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.5f, TEST_LOCATION);
 
-  view.SetProperty( WebView::Property::PAGE_ZOOM_FACTOR, 1.0f);
-  zoomFactor = view.GetProperty<float>( WebView::Property::PAGE_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.0f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::PAGE_ZOOM_FACTOR, 1.0f);
+  zoomFactor = view.GetProperty<float>(WebView::Property::PAGE_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -585,24 +597,24 @@ int UtcDaliWebViewPropertyTextZoomFactor(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  view.SetProperty( WebView::Property::TEXT_ZOOM_FACTOR, 1.5f);
-  float zoomFactor = view.GetProperty<float>( WebView::Property::TEXT_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.5f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::TEXT_ZOOM_FACTOR, 1.5f);
+  float zoomFactor = view.GetProperty<float>(WebView::Property::TEXT_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.5f, TEST_LOCATION);
 
-  view.SetProperty( WebView::Property::TEXT_ZOOM_FACTOR, 1.0f);
-  zoomFactor = view.GetProperty<float>( WebView::Property::TEXT_ZOOM_FACTOR );
-  DALI_TEST_EQUALS( zoomFactor, 1.0f, TEST_LOCATION );
+  view.SetProperty(WebView::Property::TEXT_ZOOM_FACTOR, 1.0f);
+  zoomFactor = view.GetProperty<float>(WebView::Property::TEXT_ZOOM_FACTOR);
+  DALI_TEST_EQUALS(zoomFactor, 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -612,19 +624,19 @@ int UtcDaliWebViewPropertyLoadProgressPercentage(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  float percentage = view.GetProperty<float>( WebView::Property::LOAD_PROGRESS_PERCENTAGE );
-  DALI_TEST_EQUALS( percentage, 0.5f, TEST_LOCATION );
+  float percentage = view.GetProperty<float>(WebView::Property::LOAD_PROGRESS_PERCENTAGE);
+  DALI_TEST_EQUALS(percentage, 0.5f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -634,20 +646,20 @@ int UtcDaliWebViewMove(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
-  view.SetProperty( Actor::Property::POSITION, Vector2( 100, 100 ));
-  Vector3 viewPos = view.GetProperty<Vector3>( Actor::Property::POSITION );
-  DALI_TEST_EQUALS( viewPos, Vector3( 100, 100, 0 ), TEST_LOCATION );
+  view.SetProperty(Actor::Property::POSITION, Vector2(100, 100));
+  Vector3 viewPos = view.GetProperty<Vector3>(Actor::Property::POSITION);
+  DALI_TEST_EQUALS(viewPos, Vector3(100, 100, 0), TEST_LOCATION);
 
   END_TEST;
 }
@@ -657,22 +669,22 @@ int UtcDaliWebViewPropertyVideoHoleEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const bool kDefaultValue = false;
-  const bool kTestValue = true;
+  const bool kTestValue    = true;
 
   // Check default value
-  bool output;
-  Property::Value value = view.GetProperty( WebView::Property::VIDEO_HOLE_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  bool            output;
+  Property::Value value = view.GetProperty(WebView::Property::VIDEO_HOLE_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::VIDEO_HOLE_ENABLED, kTestValue );
-  value = view.GetProperty( WebView::Property::VIDEO_HOLE_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::VIDEO_HOLE_ENABLED, kTestValue);
+  value = view.GetProperty(WebView::Property::VIDEO_HOLE_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -682,22 +694,22 @@ int UtcDaliWebViewPropertyMouseEventsEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const bool kDefaultValue = true;
-  const bool kTestValue = false;
+  const bool kTestValue    = false;
 
   // Check default value
-  bool output;
-  Property::Value value = view.GetProperty( WebView::Property::MOUSE_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  bool            output;
+  Property::Value value = view.GetProperty(WebView::Property::MOUSE_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::MOUSE_EVENTS_ENABLED, kTestValue );
-  value = view.GetProperty( WebView::Property::MOUSE_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::MOUSE_EVENTS_ENABLED, kTestValue);
+  value = view.GetProperty(WebView::Property::MOUSE_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -707,22 +719,22 @@ int UtcDaliWebViewPropertyKeyEventsEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const bool kDefaultValue = true;
-  const bool kTestValue = false;
+  const bool kTestValue    = false;
 
   // Check default value
-  bool output;
-  Property::Value value = view.GetProperty( WebView::Property::KEY_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  bool            output;
+  Property::Value value = view.GetProperty(WebView::Property::KEY_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::KEY_EVENTS_ENABLED, kTestValue );
-  value = view.GetProperty( WebView::Property::KEY_EVENTS_ENABLED );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::KEY_EVENTS_ENABLED, kTestValue);
+  value = view.GetProperty(WebView::Property::KEY_EVENTS_ENABLED);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -732,53 +744,53 @@ int UtcDaliWebViewHoverAndWheel(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  DALI_TEST_CHECK(view);
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.GetNaturalSize();
-  view.HoveredSignal().Connect( &OnHovered );
-  view.WheelEventSignal().Connect( &OnWheelEvent );
+  view.HoveredSignal().Connect(&OnHovered);
+  view.WheelEventSignal().Connect(&OnWheelEvent);
 
   // Hover event
   Dali::Integration::HoverEvent event = Dali::Integration::HoverEvent();
-  Dali::Integration::Point pointDown;
-  pointDown.SetState( PointState::DOWN );
-  pointDown.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointDown );
-  application.ProcessEvent( event );
+  Dali::Integration::Point      pointDown;
+  pointDown.SetState(PointState::DOWN);
+  pointDown.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointDown);
+  application.ProcessEvent(event);
 
   event = Dali::Integration::HoverEvent();
   Dali::Integration::Point pointUp;
-  pointUp.SetState( PointState::UP );
-  pointUp.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointUp );
-  application.ProcessEvent( event );
+  pointUp.SetState(PointState::UP);
+  pointUp.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointUp);
+  application.ProcessEvent(event);
 
   event = Dali::Integration::HoverEvent();
   Dali::Integration::Point pointMotion;
-  pointUp.SetState( PointState::MOTION );
-  pointUp.SetScreenPosition( Vector2( 10, 10 ) );
-  event.AddPoint( pointMotion );
-  application.ProcessEvent( event );
+  pointUp.SetState(PointState::MOTION);
+  pointUp.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(pointMotion);
+  application.ProcessEvent(event);
 
   // Wheel event
   Dali::Integration::WheelEvent wheelEvent;
-  wheelEvent.type = Dali::Integration::WheelEvent::Type::MOUSE_WHEEL;
+  wheelEvent.type      = Dali::Integration::WheelEvent::Type::MOUSE_WHEEL;
   wheelEvent.direction = 0;
-  wheelEvent.point = Vector2( 20, 20 );
-  wheelEvent.delta = 10;
-  application.ProcessEvent( wheelEvent );
+  wheelEvent.point     = Vector2(20, 20);
+  wheelEvent.delta     = 10;
+  application.ProcessEvent(wheelEvent);
   application.SendNotification();
 
-  DALI_TEST_CHECK( gHovered );
-  DALI_TEST_CHECK( gWheelEventHandled );
+  DALI_TEST_CHECK(gHovered);
+  DALI_TEST_CHECK(gWheelEventHandled);
 
   END_TEST;
 }
@@ -788,24 +800,24 @@ int UtcDaliWebViewFormRepostDecidedFrameRendering(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   view.RegisterFormRepostDecidedCallback(&OnFormRepostDecided);
   view.RegisterFrameRenderedCallback(&OnFrameRendered);
-  DALI_TEST_EQUALS( gFormRepostDecidedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gFrameRenderedCallbackCalled, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gFormRepostDecidedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gFrameRenderedCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gFormRepostDecidedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gFrameRenderedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gFormRepostDecidedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gFrameRenderedCallbackCalled, 1, TEST_LOCATION);
 
   // form repost decision.
   DALI_TEST_CHECK(gFormRepostDecidedInstance);
@@ -822,27 +834,27 @@ int UtcDaliWebViewSslCertificateHttpAuthentication(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
-  application.GetScene().Add( view );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   view.RegisterCertificateConfirmedCallback(&OnCertificateConfirm);
   view.RegisterSslCertificateChangedCallback(&OnSslCertificateChanged);
   view.RegisterHttpAuthHandlerCallback(&OnHttpAuthHandler);
-  DALI_TEST_EQUALS( gCertificateConfirmCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gSslCertificateChangedCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gHttpAuthHandlerCallbackCalled, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCertificateConfirmCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gSslCertificateChangedCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gHttpAuthHandlerCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gCertificateConfirmCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gSslCertificateChangedCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gHttpAuthHandlerCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCertificateConfirmCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gSslCertificateChangedCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gHttpAuthHandlerCallbackCalled, 1, TEST_LOCATION);
 
   // certificate.
   DALI_TEST_CHECK(gCertificateConfirmInstance);
@@ -862,8 +874,8 @@ int UtcDaliWebViewSslCertificateHttpAuthentication(void)
 
   // reset
   gCertificateConfirmInstance = nullptr;
-  gSslCertificateInstance = nullptr;
-  gHttpAuthInstance = nullptr;
+  gSslCertificateInstance     = nullptr;
+  gHttpAuthInstance           = nullptr;
 
   END_TEST;
 }
@@ -873,10 +885,10 @@ int UtcDaliWebViewGetWebBackForwardList(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebBackForwardList* bfList = view.GetBackForwardList();
-  DALI_TEST_CHECK( bfList != 0 );
+  DALI_TEST_CHECK(bfList != 0);
 
   END_TEST;
 }
@@ -885,11 +897,8 @@ int UtcDaliWebViewGetWebContext(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 );
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != nullptr);
 
   END_TEST;
 }
@@ -898,11 +907,8 @@ int UtcDaliWebViewGetWebCookieManager(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
-  DALI_TEST_CHECK( cookieManager != 0 );
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
+  DALI_TEST_CHECK(cookieManager != 0);
 
   END_TEST;
 }
@@ -912,10 +918,10 @@ int UtcDaliWebViewGetWebSettings(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   END_TEST;
 }
@@ -926,13 +932,13 @@ int UtcDaliWebViewProperty1(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   std::string local;
-  view.SetProperty( WebView::Property::URL, TEST_URL1 );
-  Property::Value val = view.GetProperty( WebView::Property::URL );
-  DALI_TEST_CHECK( val.Get( local ) );
-  DALI_TEST_EQUALS( local, TEST_URL1, TEST_LOCATION );
+  view.SetProperty(WebView::Property::URL, TEST_URL1);
+  Property::Value val = view.GetProperty(WebView::Property::URL);
+  DALI_TEST_CHECK(val.Get(local));
+  DALI_TEST_EQUALS(local, TEST_URL1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -943,22 +949,22 @@ int UtcDaliWebViewProperty4(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   const std::string kDefaultValue;
   const std::string kTestValue = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36";
 
   // Check default value
-  std::string output;
-  Property::Value value = view.GetProperty( WebView::Property::USER_AGENT );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kDefaultValue, TEST_LOCATION );
+  std::string     output;
+  Property::Value value = view.GetProperty(WebView::Property::USER_AGENT);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  view.SetProperty( WebView::Property::USER_AGENT, kTestValue );
-  value = view.GetProperty( WebView::Property::USER_AGENT );
-  DALI_TEST_CHECK( value.Get( output ) );
-  DALI_TEST_EQUALS( output, kTestValue, TEST_LOCATION );
+  view.SetProperty(WebView::Property::USER_AGENT, kTestValue);
+  value = view.GetProperty(WebView::Property::USER_AGENT);
+  DALI_TEST_CHECK(value.Get(output));
+  DALI_TEST_EQUALS(output, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -969,28 +975,28 @@ int UtcDaliWebViewProperty9(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // Check default value
   Dali::Vector2 output = Dali::Vector2::ONE;
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_CHECK( output.x == 0 && output.y == 0 );
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_CHECK(output.x == 0 && output.y == 0);
 
   // Check Set/GetProperty
-  Dali::Vector2 testValue = Dali::Vector2( 100, 100 );
-  view.SetProperty( WebView::Property::SCROLL_POSITION, testValue );
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_EQUALS( output, testValue, TEST_LOCATION );
+  Dali::Vector2 testValue = Dali::Vector2(100, 100);
+  view.SetProperty(WebView::Property::SCROLL_POSITION, testValue);
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_EQUALS(output, testValue, TEST_LOCATION);
 
   // Check default value of scroll size
   output = Dali::Vector2::ONE;
-  view.GetProperty( WebView::Property::SCROLL_SIZE ).Get( output );
-  DALI_TEST_CHECK( output.x == 500 && output.y == 500 );
+  view.GetProperty(WebView::Property::SCROLL_SIZE).Get(output);
+  DALI_TEST_CHECK(output.x == 500 && output.y == 500);
 
   // Check default value of content size
   output = Dali::Vector2::ONE;
-  view.GetProperty( WebView::Property::CONTENT_SIZE ).Get( output );
-  DALI_TEST_CHECK( output.x == 500 && output.y == 500 );
+  view.GetProperty(WebView::Property::CONTENT_SIZE).Get(output);
+  DALI_TEST_CHECK(output.x == 500 && output.y == 500);
 
   END_TEST;
 }
@@ -1000,7 +1006,7 @@ int UtcDaliWebViewPropertyBackgroundColorSelectedTextEtc(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Vector4 testValue = Dali::Vector4(0.0f, 0.0f, 0.0f, 0.0f);
   view.SetProperty(WebView::Property::DOCUMENT_BACKGROUND_COLOR, testValue);
@@ -1021,9 +1027,9 @@ int UtcDaliWebViewPropertyTitleFavicon(void)
 {
   ToolkitTestApplication application;
 
-  char argv[] = "--test";
-  WebView view = WebView::New( 1, (char**)&argv );
-  DALI_TEST_CHECK( view );
+  char    argv[] = "--test";
+  WebView view   = WebView::New(1, (char**)&argv);
+  DALI_TEST_CHECK(view);
 
   // reset something
   view.ClearAllTilesResources();
@@ -1031,18 +1037,18 @@ int UtcDaliWebViewPropertyTitleFavicon(void)
   // Check default value of title
   std::string testValue("title");
   std::string output;
-  view.GetProperty( WebView::Property::TITLE ).Get( output );
-  DALI_TEST_EQUALS( output, testValue, TEST_LOCATION );
+  view.GetProperty(WebView::Property::TITLE).Get(output);
+  DALI_TEST_EQUALS(output, testValue, TEST_LOCATION);
 
   // Check the case that favicon is not null.
   Dali::Toolkit::ImageView favicon = view.GetFavicon();
-  DALI_TEST_CHECK( favicon );
-  Dali::Vector3 iconsize = favicon.GetProperty< Vector3 >( Dali::Actor::Property::SIZE );
-  DALI_TEST_CHECK( ( int )iconsize.width == 2 && ( int )iconsize.height == 2 );
+  DALI_TEST_CHECK(favicon);
+  Dali::Vector3 iconsize = favicon.GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+  DALI_TEST_CHECK((int)iconsize.width == 2 && (int)iconsize.height == 2);
 
   // Check the case that favicon is null.
   favicon = view.GetFavicon();
-  DALI_TEST_CHECK( !favicon );
+  DALI_TEST_CHECK(!favicon);
 
   END_TEST;
 }
@@ -1052,20 +1058,20 @@ int UtcDaliWebViewContextMenuShownAndHidden(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.RegisterContextMenuShownCallback( &OnContextMenuShown );
-  view.RegisterContextMenuHiddenCallback( &OnContextMenuHidden );
-  DALI_TEST_EQUALS( gContextMenuShownCallbackCalled, 0, TEST_LOCATION );
-  DALI_TEST_EQUALS( gContextMenuHiddenCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterContextMenuShownCallback(&OnContextMenuShown);
+  view.RegisterContextMenuHiddenCallback(&OnContextMenuHidden);
+  DALI_TEST_EQUALS(gContextMenuShownCallbackCalled, 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(gContextMenuHiddenCallbackCalled, 0, TEST_LOCATION);
   DALI_TEST_CHECK(gContextMenuShownInstance == 0);
   DALI_TEST_CHECK(gContextMenuHiddenInstance == 0);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gContextMenuShownCallbackCalled, 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( gContextMenuHiddenCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gContextMenuShownCallbackCalled, 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(gContextMenuHiddenCallbackCalled, 1, TEST_LOCATION);
 
   // check context meun & its items.
   DALI_TEST_CHECK(gContextMenuShownInstance != 0);
@@ -1094,7 +1100,7 @@ int UtcDaliWebViewContextMenuShownAndHidden(void)
 
   DALI_TEST_CHECK(gContextMenuHiddenInstance != 0);
 
-  gContextMenuShownInstance = nullptr;
+  gContextMenuShownInstance  = nullptr;
   gContextMenuHiddenInstance = nullptr;
 
   END_TEST;
@@ -1105,38 +1111,38 @@ int UtcDaliWebViewScrollBy(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.RegisterScrollEdgeReachedCallback( &OnScrollEdgeReached );
-  DALI_TEST_EQUALS( gScrollEdgeReachedCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterScrollEdgeReachedCallback(&OnScrollEdgeReached);
+  DALI_TEST_EQUALS(gScrollEdgeReachedCallbackCalled, 0, TEST_LOCATION);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
 
   // set scroll position.
-  Dali::Vector2 output = Dali::Vector2::ONE;
-  Dali::Vector2 testValue = Dali::Vector2( 100, 100 );
-  view.SetProperty( WebView::Property::SCROLL_POSITION, testValue );
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_EQUALS( output, testValue, TEST_LOCATION );
+  Dali::Vector2 output    = Dali::Vector2::ONE;
+  Dali::Vector2 testValue = Dali::Vector2(100, 100);
+  view.SetProperty(WebView::Property::SCROLL_POSITION, testValue);
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_EQUALS(output, testValue, TEST_LOCATION);
 
   // scroll by and trigger scrollEdgeReached event.
-  view.ScrollBy( 50, 50 );
+  view.ScrollBy(50, 50);
   Test::EmitGlobalTimerSignal();
 
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_CHECK( output.x == 150 && output.y == 150 );
-  DALI_TEST_EQUALS( gScrollEdgeReachedCallbackCalled, 1, TEST_LOCATION );
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_CHECK(output.x == 150 && output.y == 150);
+  DALI_TEST_EQUALS(gScrollEdgeReachedCallbackCalled, 1, TEST_LOCATION);
 
   // scroll by and trigger scrollEdgeReached event.
-  bool result = view.ScrollEdgeBy( 50, 50 );
-  DALI_TEST_CHECK( result );
+  bool result = view.ScrollEdgeBy(50, 50);
+  DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
 
-  view.GetProperty( WebView::Property::SCROLL_POSITION ).Get( output );
-  DALI_TEST_CHECK( output.x == 200 && output.y == 200 );
-  DALI_TEST_EQUALS( gScrollEdgeReachedCallbackCalled, 2, TEST_LOCATION );
+  view.GetProperty(WebView::Property::SCROLL_POSITION).Get(output);
+  DALI_TEST_CHECK(output.x == 200 && output.y == 200);
+  DALI_TEST_EQUALS(gScrollEdgeReachedCallbackCalled, 2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1146,29 +1152,29 @@ int UtcDaliWebViewSetGetScaleFactorActivateAccessibility(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
 
   view.ActivateAccessibility(true);
   view.AddDynamicCertificatePath("host", "test/to/path");
   bool found = view.HighlightText("test", Dali::WebEnginePlugin::FindOption::CASE_INSENSITIVE, 2);
-  DALI_TEST_CHECK( found );
+  DALI_TEST_CHECK(found);
 
   view.SetScaleFactor(1.5f, Dali::Vector2(0.0f, 0.0f));
   float result = view.GetScaleFactor();
-  DALI_TEST_EQUALS( result, 1.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(result, 1.5f, TEST_LOCATION);
 
   view.SetScaleFactor(1.0f, Dali::Vector2(0.0f, 0.0f));
   result = view.GetScaleFactor();
-  DALI_TEST_EQUALS( result, 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(result, 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1178,33 +1184,33 @@ int UtcDaliWebViewGetScreenshotSyncAndAsync(void)
   // SCROLL_POSITION
   ToolkitTestApplication application;
 
-  char argv[] = "--test";
-  WebView view = WebView::New( 1, (char**)&argv );
-  DALI_TEST_CHECK( view );
+  char    argv[] = "--test";
+  WebView view   = WebView::New(1, (char**)&argv);
+  DALI_TEST_CHECK(view);
 
   // Check GetScreenshot
   Dali::Rect<int> viewArea;
-  viewArea.x = 100;
-  viewArea.y = 100;
-  viewArea.width = 10;
-  viewArea.height = 10;
+  viewArea.x                          = 100;
+  viewArea.y                          = 100;
+  viewArea.width                      = 10;
+  viewArea.height                     = 10;
   Dali::Toolkit::ImageView screenshot = view.GetScreenshot(viewArea, 1.0f);
-  DALI_TEST_CHECK( screenshot );
-  Dali::Vector3 shotsize = screenshot.GetProperty< Vector3 >( Dali::Actor::Property::SIZE );
-  DALI_TEST_CHECK( ( int )shotsize.width == viewArea.width && ( int )shotsize.height == viewArea.height );
+  DALI_TEST_CHECK(screenshot);
+  Dali::Vector3 shotsize = screenshot.GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+  DALI_TEST_CHECK((int)shotsize.width == viewArea.width && (int)shotsize.height == viewArea.height);
 
   // Check GetScreenshotAsynchronously
-  viewArea.x = 100;
-  viewArea.y = 100;
-  viewArea.width = 100;
+  viewArea.x      = 100;
+  viewArea.y      = 100;
+  viewArea.width  = 100;
   viewArea.height = 100;
-  bool result = view.GetScreenshotAsynchronously(viewArea, 1.0f, &OnScreenshotCaptured);
-  DALI_TEST_CHECK( result );
+  bool result     = view.GetScreenshotAsynchronously(viewArea, 1.0f, &OnScreenshotCaptured);
+  DALI_TEST_CHECK(result);
 
   Test::EmitGlobalTimerSignal();
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gScreenshotCapturedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gScreenshotCapturedCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1214,20 +1220,20 @@ int UtcDaliWebViewVideoPlayingGeolocationPermission(void)
   // SCROLL_POSITION
   ToolkitTestApplication application;
 
-  char argv[] = "--test";
-  WebView view = WebView::New( 1, (char**)&argv );
-  DALI_TEST_CHECK( view );
+  char    argv[] = "--test";
+  WebView view   = WebView::New(1, (char**)&argv);
+  DALI_TEST_CHECK(view);
 
   // Check CheckVideoPlayingAsynchronously
   bool result = view.CheckVideoPlayingAsynchronously(&OnVideoPlaying);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gVideoPlayingCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gVideoPlayingCallbackCalled, 1, TEST_LOCATION);
 
   // Check RegisterGeolocationPermissionCallback
   view.RegisterGeolocationPermissionCallback(&OnGeolocationPermission);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gGeolocationPermissionCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gGeolocationPermissionCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1237,16 +1243,16 @@ int UtcDaliWebViewResponsePolicyDecisionRequest(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.RegisterResponsePolicyDecidedCallback( &OnResponsePolicyDecided );
-  DALI_TEST_EQUALS( gResponsePolicyDecidedCallbackCalled, 0, TEST_LOCATION );
+  view.RegisterResponsePolicyDecidedCallback(&OnResponsePolicyDecided);
+  DALI_TEST_EQUALS(gResponsePolicyDecidedCallbackCalled, 0, TEST_LOCATION);
   DALI_TEST_CHECK(gResponsePolicyDecisionInstance == 0);
 
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gResponsePolicyDecidedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gResponsePolicyDecidedCallbackCalled, 1, TEST_LOCATION);
 
   // check response policy decision & its frame.
   DALI_TEST_CHECK(gResponsePolicyDecisionInstance != 0);
@@ -1277,15 +1283,51 @@ int UtcDaliWebViewResponsePolicyDecisionRequest(void)
   END_TEST;
 }
 
+int UtcDaliWebViewNavigationPolicyDecisionRequest(void)
+{
+  ToolkitTestApplication application;
+
+  WebView view = WebView::New();
+  DALI_TEST_CHECK(view);
+
+  // load url.
+  view.RegisterNavigationPolicyDecidedCallback(&OnNavigationPolicyDecided);
+  DALI_TEST_EQUALS(gNavigationPolicyDecidedCallbackCalled, 0, TEST_LOCATION);
+
+  view.LoadUrl(TEST_URL1);
+  Test::EmitGlobalTimerSignal();
+  DALI_TEST_EQUALS(gNavigationPolicyDecidedCallbackCalled, 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliWebViewNewWindowCreated(void)
+{
+  ToolkitTestApplication application;
+
+  WebView view = WebView::New();
+  DALI_TEST_CHECK(view);
+
+  // load url.
+  view.RegisterNewWindowCreatedCallback(&OnNewWindowCreated);
+  DALI_TEST_EQUALS(gNewWindowCreatedCallbackCalled, 0, TEST_LOCATION);
+
+  view.LoadUrl(TEST_URL1);
+  Test::EmitGlobalTimerSignal();
+  DALI_TEST_EQUALS(gNewWindowCreatedCallbackCalled, 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
 int UtcDaliWebViewHitTest(void)
 {
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // load url.
-  view.LoadUrl( TEST_URL1 );
+  view.LoadUrl(TEST_URL1);
 
   // sync hit test.
   std::unique_ptr<Dali::WebEngineHitTest> hitTest = view.CreateHitTest(100, 100, Dali::WebEngineHitTest::HitTestMode::DEFAULT);
@@ -1316,7 +1358,7 @@ int UtcDaliWebViewHitTest(void)
   bool result = view.CreateHitTestAsynchronously(100, 100, Dali::WebEngineHitTest::HitTestMode::DEFAULT, &OnHitTestCreated);
   DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gHitTestCreatedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gHitTestCreatedCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1325,14 +1367,14 @@ int UtcDaliWebViewEvaluteJavaScript(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
 
-  view.LoadHtmlString( "<body>Hello World!</body>" );
-  view.EvaluateJavaScript( "jsObject.postMessage('Hello')" );
-  view.EvaluateJavaScript( "jsObject.postMessage('World')", OnEvaluateJavaScript );
+  view.LoadHtmlString("<body>Hello World!</body>");
+  view.EvaluateJavaScript("jsObject.postMessage('Hello')");
+  view.EvaluateJavaScript("jsObject.postMessage('World')", OnEvaluateJavaScript);
   Test::EmitGlobalTimerSignal();
 
-  DALI_TEST_EQUALS( gEvaluateJavaScriptCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gEvaluateJavaScriptCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1341,25 +1383,25 @@ int UtcDaliWebViewJavaScriptAlertConfirmPrompt(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
 
-  view.RegisterJavaScriptAlertCallback( &OnJavaScriptAlert );
-  view.LoadHtmlString( "<head><script type='text/javascript'>alert('this is an alert popup.');</script></head><body>Hello World!</body>" );
+  view.RegisterJavaScriptAlertCallback(&OnJavaScriptAlert);
+  view.LoadHtmlString("<head><script type='text/javascript'>alert('this is an alert popup.');</script></head><body>Hello World!</body>");
   view.JavaScriptAlertReply();
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gJavaScriptAlertCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gJavaScriptAlertCallbackCalled, 1, TEST_LOCATION);
 
-  view.RegisterJavaScriptConfirmCallback( &OnJavaScriptConfirm );
-  view.LoadHtmlString( "<head><script type='text/javascript'>confirm('this is a confirm popup.');</script></head><body>Hello World!</body>" );
-  view.JavaScriptConfirmReply( true );
+  view.RegisterJavaScriptConfirmCallback(&OnJavaScriptConfirm);
+  view.LoadHtmlString("<head><script type='text/javascript'>confirm('this is a confirm popup.');</script></head><body>Hello World!</body>");
+  view.JavaScriptConfirmReply(true);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gJavaScriptConfirmCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gJavaScriptConfirmCallbackCalled, 1, TEST_LOCATION);
 
-  view.RegisterJavaScriptPromptCallback( &OnJavaScriptPrompt );
-  view.LoadHtmlString( "<head><script type='text/javascript'>prompt('this is a prompt popup.');</script></head><body>Hello World!</body>" );
-  view.JavaScriptPromptReply( "it is a prompt." );
+  view.RegisterJavaScriptPromptCallback(&OnJavaScriptPrompt);
+  view.LoadHtmlString("<head><script type='text/javascript'>prompt('this is a prompt popup.');</script></head><body>Hello World!</body>");
+  view.JavaScriptPromptReply("it is a prompt.");
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gJavaScriptPromptCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gJavaScriptPromptCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1368,21 +1410,21 @@ int UtcDaliWebViewLoadHtmlStringOverrideCurrentEntryAndContents(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
-  DALI_TEST_CHECK( view );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
+  DALI_TEST_CHECK(view);
 
   std::string html("<body>Hello World!</body>");
   std::string basicUri("http://basicurl");
   std::string unreachableUrl("http://unreachableurl");
-  bool result = view.LoadHtmlStringOverrideCurrentEntry( html, basicUri, unreachableUrl );
-  DALI_TEST_CHECK( result );
+  bool        result = view.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
+  DALI_TEST_CHECK(result);
 
   application.SendNotification();
   application.Render();
   Test::EmitGlobalTimerSignal();
 
-  result = view.LoadContents( html, html.length(), "html/text", "utf-8", basicUri );
-  DALI_TEST_CHECK( result );
+  result = view.LoadContents((const int8_t*)html.c_str(), html.length(), "html/text", "utf-8", basicUri);
+  DALI_TEST_CHECK(result);
 
   END_TEST;
 }
@@ -1392,37 +1434,37 @@ int UtcDaliWebViewReloadSuspendResumeNetworkLoadingCustomHeader(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 ));
-  view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) );
+  view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  view.SetProperty(Actor::Property::POSITION, Vector2(0, 0));
+  view.SetProperty(Actor::Property::SIZE, Vector2(800, 600));
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  view.LoadUrl( "http://test.html" );
+  view.LoadUrl("http://test.html");
   bool result = view.AddCustomHeader("key", "value");
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   result = view.ReloadWithoutCache();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   uint32_t portNumber = view.StartInspectorServer(5000);
-  DALI_TEST_EQUALS( portNumber, 5000, TEST_LOCATION );
+  DALI_TEST_EQUALS(portNumber, 5000, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
   Test::EmitGlobalTimerSignal();
 
   result = view.StopInspectorServer();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   view.SuspendNetworkLoading();
 
   result = view.RemoveCustomHeader("key");
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   view.ResumeNetworkLoading();
 
@@ -1433,16 +1475,15 @@ int UtcDaliWebViewMethodsForCoverage(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
+  WebView view = WebView::New("ko-KR", "Asia/Seoul");
 
-  view.LoadHtmlString( "<body>Hello World!</body>" );
-  view.AddJavaScriptMessageHandler( "jsObject",
-    []( const std::string& arg ) {
-    }
-  );
+  view.LoadHtmlString("<body>Hello World!</body>");
+  view.AddJavaScriptMessageHandler("jsObject",
+                                   [](const std::string& arg) {
+                                   });
   view.SetTtsFocus(true);
 
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -1454,67 +1495,64 @@ int UtcDaliWebBackForwardListCheckItem(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebBackForwardList* bfList = view.GetBackForwardList();
-  DALI_TEST_CHECK( bfList != 0 )
+  DALI_TEST_CHECK(bfList != 0)
 
   unsigned int itemCount = bfList->GetItemCount();
-  DALI_TEST_CHECK( itemCount == 1 )
+  DALI_TEST_CHECK(itemCount == 1)
 
   std::unique_ptr<Dali::WebEngineBackForwardListItem> citem = bfList->GetCurrentItem();
-  DALI_TEST_CHECK( citem != 0 );
+  DALI_TEST_CHECK(citem != 0);
 
   std::unique_ptr<Dali::WebEngineBackForwardListItem> citemP = bfList->GetPreviousItem();
-  DALI_TEST_CHECK( citemP != 0 );
+  DALI_TEST_CHECK(citemP != 0);
 
   std::unique_ptr<Dali::WebEngineBackForwardListItem> citemN = bfList->GetNextItem();
-  DALI_TEST_CHECK( citemN != 0 );
+  DALI_TEST_CHECK(citemN != 0);
 
-  const std::string kDefaultUrl( "http://url" );
-  std::string testValue = citem->GetUrl();
-  DALI_TEST_EQUALS( testValue, kDefaultUrl, TEST_LOCATION );
+  const std::string kDefaultUrl("http://url");
+  std::string       testValue = citem->GetUrl();
+  DALI_TEST_EQUALS(testValue, kDefaultUrl, TEST_LOCATION);
 
-  const std::string kDefaultTitle( "title" );
+  const std::string kDefaultTitle("title");
   testValue = citem->GetTitle();
-  DALI_TEST_EQUALS( testValue, kDefaultTitle, TEST_LOCATION );
+  DALI_TEST_EQUALS(testValue, kDefaultTitle, TEST_LOCATION);
 
-  const std::string kDefaultOriginalUrl( "http://originalurl" );
+  const std::string kDefaultOriginalUrl("http://originalurl");
   testValue = citem->GetOriginalUrl();
-  DALI_TEST_EQUALS( testValue, kDefaultOriginalUrl, TEST_LOCATION );
+  DALI_TEST_EQUALS(testValue, kDefaultOriginalUrl, TEST_LOCATION);
 
-  std::unique_ptr<Dali::WebEngineBackForwardListItem> item = bfList->GetItemAtIndex( 0 );
-  DALI_TEST_CHECK( item != 0 );
+  std::unique_ptr<Dali::WebEngineBackForwardListItem> item = bfList->GetItemAtIndex(0);
+  DALI_TEST_CHECK(item != 0);
 
   std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> vecBack = bfList->GetBackwardItems(-1);
-  DALI_TEST_CHECK( vecBack.size() == 1 );
+  DALI_TEST_CHECK(vecBack.size() == 1);
 
   std::vector<std::unique_ptr<Dali::WebEngineBackForwardListItem>> vecForward = bfList->GetForwardItems(-1);
-  DALI_TEST_CHECK( vecForward.size() == 1 );
+  DALI_TEST_CHECK(vecForward.size() == 1);
 
   END_TEST;
 }
 
 // test cases for web context.
 
-int UtcDaliWebContextGetSetCacheModel(void)
+int UtcDaliWebContextGetSetCacheModelEtc(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 )
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != 0)
 
   std::string kDefaultValue;
 
   // Reset something
-  context->SetAppId( "id" );
-  context->SetApplicationType( Dali::WebEngineContext::ApplicationType::OTHER );
-  context->SetTimeOffset( 0 );
-  context->SetTimeZoneOffset( 0, 0 );
-  context->SetDefaultProxyAuth( kDefaultValue, kDefaultValue );
+  context->SetAppId("id");
+  context->SetApplicationType(Dali::WebEngineContext::ApplicationType::OTHER);
+  context->SetTimeOffset(0);
+  context->SetTimeZoneOffset(0, 0);
+  context->SetDefaultProxyAuth(kDefaultValue, kDefaultValue);
   context->DeleteAllWebDatabase();
   context->DeleteAllWebStorage();
   context->DeleteLocalFileSystem();
@@ -1524,47 +1562,47 @@ int UtcDaliWebContextGetSetCacheModel(void)
 
   // Check default value
   Dali::WebEngineContext::CacheModel value = context->GetCacheModel();
-  DALI_TEST_CHECK( value == Dali::WebEngineContext::CacheModel::DOCUMENT_VIEWER );
+  DALI_TEST_CHECK(value == Dali::WebEngineContext::CacheModel::DOCUMENT_VIEWER);
 
   // Check Set/GetProperty
-  context->SetCacheModel( Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER );
+  context->SetCacheModel(Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER);
   value = context->GetCacheModel();
-  DALI_TEST_CHECK( value == Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER );
+  DALI_TEST_CHECK(value == Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER);
 
   // Get cache enabled
-  context->EnableCache( true );
-  DALI_TEST_CHECK( context->IsCacheEnabled() );
+  context->EnableCache(true);
+  DALI_TEST_CHECK(context->IsCacheEnabled());
 
   // Get certificate
-  context->SetCertificateFilePath( "test" );
+  context->SetCertificateFilePath("test");
   std::string str = context->GetCertificateFilePath();
-  DALI_TEST_EQUALS( str, "test", TEST_LOCATION );
+  DALI_TEST_EQUALS(str, "test", TEST_LOCATION);
 
   // Set version
-  DALI_TEST_CHECK( context->SetAppVersion( "test" ) );
+  DALI_TEST_CHECK(context->SetAppVersion("test"));
 
   // Register
   std::vector<std::string> temp;
-  context->RegisterUrlSchemesAsCorsEnabled( temp );
-  context->RegisterJsPluginMimeTypes( temp );
-  context->DeleteFormPasswordDataList( temp );
+  context->RegisterUrlSchemesAsCorsEnabled(temp);
+  context->RegisterJsPluginMimeTypes(temp);
+  context->DeleteFormPasswordDataList(temp);
 
   // Get zoom factor
-  context->SetDefaultZoomFactor( 1.0f );
-  DALI_TEST_EQUALS( context->GetDefaultZoomFactor(), float( 1.0f ), TEST_LOCATION );
+  context->SetDefaultZoomFactor(1.0f);
+  DALI_TEST_EQUALS(context->GetDefaultZoomFactor(), float(1.0f), TEST_LOCATION);
 
   // Delete cache and database
-  DALI_TEST_CHECK( context->DeleteAllApplicationCache() );
-  DALI_TEST_CHECK( context->DeleteAllWebIndexedDatabase() );
+  DALI_TEST_CHECK(context->DeleteAllApplicationCache());
+  DALI_TEST_CHECK(context->DeleteAllWebIndexedDatabase());
 
   // Get contextProxy
-  context->SetProxyUri( "test" );
-  DALI_TEST_EQUALS( context->GetProxyUri(), "test", TEST_LOCATION );
+  context->SetProxyUri("test");
+  DALI_TEST_EQUALS(context->GetProxyUri(), "test", TEST_LOCATION);
   context->SetProxyBypassRule("", "test");
-  DALI_TEST_EQUALS( context->GetProxyBypassRule(), "test", TEST_LOCATION );
+  DALI_TEST_EQUALS(context->GetProxyBypassRule(), "test", TEST_LOCATION);
 
   //Notify low memory
-  DALI_TEST_CHECK( context->FreeUnusedMemory() );
+  DALI_TEST_CHECK(context->FreeUnusedMemory());
 
   END_TEST;
 }
@@ -1573,49 +1611,46 @@ int UtcDaliWebContextGetWebDatabaseStorageOrigins(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 )
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != 0)
 
   std::string kDefaultValue;
 
   // get origins of web database
   bool result = context->GetWebDatabaseOrigins(&OnSecurityOriginsAcquired);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gSecurityOriginsAcquiredCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gSecurityOriginsAcquiredCallbackCalled, 1, TEST_LOCATION);
   DALI_TEST_CHECK(gSecurityOriginList.size() == 1);
 
   Dali::WebEngineSecurityOrigin* origin = gSecurityOriginList[0].get();
-  DALI_TEST_CHECK( origin );
+  DALI_TEST_CHECK(origin);
 
   result = context->DeleteWebDatabase(*origin);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   // get origins of web storage
   result = context->GetWebStorageOrigins(&OnSecurityOriginsAcquired);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gSecurityOriginsAcquiredCallbackCalled, 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(gSecurityOriginsAcquiredCallbackCalled, 2, TEST_LOCATION);
   DALI_TEST_CHECK(gSecurityOriginList.size() == 1);
 
   origin = gSecurityOriginList[0].get();
-  DALI_TEST_CHECK( origin );
+  DALI_TEST_CHECK(origin);
 
   result = context->GetWebStorageUsageForOrigin(*origin, &OnStorageUsageAcquired);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gStorageUsageAcquiredCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gStorageUsageAcquiredCallbackCalled, 1, TEST_LOCATION);
 
   result = context->DeleteWebStorage(*origin);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   result = context->DeleteApplicationCache(*origin);
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
   // form passwords, download state, mime type.
   context->GetFormPasswordList(&OnFormPasswordsAcquired);
@@ -1643,31 +1678,39 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
 {
   ToolkitTestApplication application;
 
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != 0)
+
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK( context != 0 )
+  // Check if web view is found or not when plugin is null.
+  DALI_TEST_CHECK(!WebView::FindWebView(nullptr));
 
   // load url.
   context->RegisterRequestInterceptedCallback(&OnRequestIntercepted);
   DALI_TEST_EQUALS(gRequestInterceptedCallbackCalled, 0, TEST_LOCATION);
-  DALI_TEST_CHECK(gRequestInterceptorInstance == 0);
+  DALI_TEST_CHECK(!gRequestInterceptorInstance);
 
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gRequestInterceptedCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gRequestInterceptedCallbackCalled, 1, TEST_LOCATION);
 
   // check request interceptor.
-  DALI_TEST_CHECK(gRequestInterceptorInstance != 0);
+  DALI_TEST_CHECK(gRequestInterceptorInstance);
   DALI_TEST_CHECK(gRequestInterceptorInstance->Ignore());
   DALI_TEST_CHECK(gRequestInterceptorInstance->SetResponseStatus(400, "error"));
   DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseHeader("key1", "value1"));
   Dali::Property::Map testHeaders;
   testHeaders.Insert("key2", "value2");
   DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseHeaders(testHeaders));
-  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseBody("test", 4));
-  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponse("key:value", "test", 4));
-  DALI_TEST_CHECK(gRequestInterceptorInstance->WriteResponseChunk("test", 4));
+  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseBody((const int8_t*)"test", 4));
+  DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponse("key:value", (const int8_t*)"test", 4));
+  DALI_TEST_CHECK(gRequestInterceptorInstance->WriteResponseChunk((const int8_t*)"test", 4));
+
+  DALI_TEST_CHECK(gRequestInterceptorInstance->GetWebEngine());
+  // Check if web view is found or not when plugin is not null.
+  DALI_TEST_CHECK(WebView::FindWebView(gRequestInterceptorInstance->GetWebEngine()));
+
   std::string testUrl("http://test.html");
   DALI_TEST_EQUALS(gRequestInterceptorInstance->GetUrl(), testUrl, TEST_LOCATION);
   std::string testMethod("GET");
@@ -1675,6 +1718,8 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
   Dali::Property::Map resultHeaders = gRequestInterceptorInstance->GetHeaders();
   DALI_TEST_EQUALS(resultHeaders.Count(), 2, TEST_LOCATION);
 
+  // Destroy web view.
+  view.Reset();
   gRequestInterceptorInstance = nullptr;
 
   END_TEST;
@@ -1686,26 +1731,23 @@ int UtcDaliWebCookieManagerGetSetCookieAcceptPolicy(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
-  DALI_TEST_CHECK( cookieManager != 0 )
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
+  DALI_TEST_CHECK(cookieManager != 0)
 
   const std::string kDefaultValue;
 
   // Reset something
-  cookieManager->SetPersistentStorage( kDefaultValue, Dali::WebEngineCookieManager::CookiePersistentStorage::SQLITE );
+  cookieManager->SetPersistentStorage(kDefaultValue, Dali::WebEngineCookieManager::CookiePersistentStorage::SQLITE);
   cookieManager->ClearCookies();
 
   // Check default value
   Dali::WebEngineCookieManager::CookieAcceptPolicy value = cookieManager->GetCookieAcceptPolicy();
-  DALI_TEST_CHECK( value == Dali::WebEngineCookieManager::CookieAcceptPolicy::NO_THIRD_PARTY );
+  DALI_TEST_CHECK(value == Dali::WebEngineCookieManager::CookieAcceptPolicy::NO_THIRD_PARTY);
 
   // Check Set/GetProperty
-  cookieManager->SetCookieAcceptPolicy( Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS );
+  cookieManager->SetCookieAcceptPolicy(Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS);
   value = cookieManager->GetCookieAcceptPolicy();
-  DALI_TEST_CHECK( value == Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS );
+  DALI_TEST_CHECK(value == Dali::WebEngineCookieManager::CookieAcceptPolicy::ALWAYS);
 
   END_TEST;
 }
@@ -1714,15 +1756,12 @@ int UtcDaliWebCookieManagerChangesWatch(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
-  DALI_TEST_CHECK( cookieManager != 0 )
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
+  DALI_TEST_CHECK(cookieManager != 0)
 
   cookieManager->ChangesWatch(&OnChangesWatch);
   Test::EmitGlobalTimerSignal();
-  DALI_TEST_EQUALS( gCookieManagerChangsWatchCallbackCalled, 1, TEST_LOCATION );
+  DALI_TEST_EQUALS(gCookieManagerChangsWatchCallbackCalled, 1, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1734,29 +1773,29 @@ int UtcDaliWebSettingsGetSetDefaultFontSize(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value
   int value = settings->GetDefaultFontSize();
-  DALI_TEST_CHECK( value == 16 );
+  DALI_TEST_CHECK(value == 16);
 
   // Check Set/GetProperty
-  settings->SetDefaultFontSize( 20 );
+  settings->SetDefaultFontSize(20);
   value = settings->GetDefaultFontSize();
-  DALI_TEST_CHECK( value == 20 );
+  DALI_TEST_CHECK(value == 20);
 
   END_TEST;
 }
@@ -1766,29 +1805,29 @@ int UtcDaliWebSettingsCheckEnableJavaScript(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsJavaScriptEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableJavaScript( false );
+  settings->EnableJavaScript(false);
   value = settings->IsJavaScriptEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1798,29 +1837,29 @@ int UtcDaliWebSettingsCheckEnableAutoFitting(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsAutoFittingEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableAutoFitting( false );
+  settings->EnableAutoFitting(false);
   value = settings->IsAutoFittingEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1830,29 +1869,29 @@ int UtcDaliWebSettingsCheckEnablePlugins(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->ArePluginsEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnablePlugins( false );
+  settings->EnablePlugins(false);
   value = settings->ArePluginsEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1862,29 +1901,29 @@ int UtcDaliWebSettingsCheckEnablePrivateBrowsing(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsPrivateBrowsingEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnablePrivateBrowsing( false );
+  settings->EnablePrivateBrowsing(false);
   value = settings->IsPrivateBrowsingEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1894,29 +1933,29 @@ int UtcDaliWebSettingsCheckEnableLinkMagnifier(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsLinkMagnifierEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableLinkMagnifier( false );
+  settings->EnableLinkMagnifier(false);
   value = settings->IsLinkMagnifierEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1926,29 +1965,29 @@ int UtcDaliWebSettingsCheckUseKeypadWithoutUserAction(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsKeypadWithoutUserActionUsed();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->UseKeypadWithoutUserAction( false );
+  settings->UseKeypadWithoutUserAction(false);
   value = settings->IsKeypadWithoutUserActionUsed();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -1958,27 +1997,27 @@ int UtcDaliWebSettingsCheckEnableAutofillPasswordForm(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsAutofillPasswordFormEnabled();
-  DALI_TEST_CHECK( value );
-  settings->EnableAutofillPasswordForm( false );
+  DALI_TEST_CHECK(value);
+  settings->EnableAutofillPasswordForm(false);
   value = settings->IsAutofillPasswordFormEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
   END_TEST;
 }
 
@@ -1987,29 +2026,29 @@ int UtcDaliWebSettingsCheckEnableFormCandidateData(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsFormCandidateDataEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->EnableFormCandidateData( false );
+  settings->EnableFormCandidateData(false);
   value = settings->IsFormCandidateDataEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2019,29 +2058,29 @@ int UtcDaliWebSettingsCheckEnableTextSelection(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsTextSelectionEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   //Check Set/GetProperty
   settings->EnableTextSelection(false);
   value = settings->IsTextSelectionEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2051,29 +2090,29 @@ int UtcDaliWebSettingsCheckEnableTextAutosizing(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsTextAutosizingEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
   settings->EnableTextAutosizing(false);
   value = settings->IsTextAutosizingEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2083,29 +2122,29 @@ int UtcDaliWebSettingsCheckEnableArrowScroll(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsArrowScrollEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
   settings->EnableArrowScroll(false);
   value = settings->IsArrowScrollEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2115,27 +2154,27 @@ int UtcDaliWebSettingsCheckEnableClipboard(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsClipboardEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
   settings->EnableClipboard(false);
   value = settings->IsClipboardEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
   END_TEST;
 }
 
@@ -2144,29 +2183,29 @@ int UtcDaliWebSettingsCheckEnableImePanel(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 );
+  DALI_TEST_CHECK(settings != 0);
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->IsImePanelEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
   settings->EnableImePanel(false);
   value = settings->IsImePanelEnabled();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2176,29 +2215,29 @@ int UtcDaliWebSettingsCheckAllowImagesLoadAutomatically(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value is true or not
   bool value = settings->AreImagesLoadedAutomatically();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   // Check Set/GetProperty
-  settings->AllowImagesLoadAutomatically( false );
+  settings->AllowImagesLoadAutomatically(false);
   value = settings->AreImagesLoadedAutomatically();
-  DALI_TEST_CHECK( !value );
+  DALI_TEST_CHECK(!value);
 
   END_TEST;
 }
@@ -2208,32 +2247,32 @@ int UtcDaliWebSettingsGetSetDefaultTextEncodingName(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   const std::string kDefaultValue;
   const std::string kTestValue = "UTF-8";
 
   // Reset something
-  settings->AllowMixedContents( false );
-  settings->EnableSpatialNavigation( false );
-  settings->EnableWebSecurity( false );
-  settings->EnableCacheBuilder( false );
-  settings->EnableDoNotTrack( false );
-  settings->UseScrollbarThumbFocusNotifications( false );
-  settings->AllowFileAccessFromExternalUrl( false );
-  settings->AllowScriptsOpenWindows( false );
+  settings->AllowMixedContents(false);
+  settings->EnableSpatialNavigation(false);
+  settings->EnableWebSecurity(false);
+  settings->EnableCacheBuilder(false);
+  settings->EnableDoNotTrack(false);
+  settings->UseScrollbarThumbFocusNotifications(false);
+  settings->AllowFileAccessFromExternalUrl(false);
+  settings->AllowScriptsOpenWindows(false);
 
   // Check default value
   std::string value = settings->GetDefaultTextEncodingName();
-  DALI_TEST_EQUALS( value, kDefaultValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(value, kDefaultValue, TEST_LOCATION);
 
   // Check Set/GetProperty
-  settings->SetDefaultTextEncodingName( kTestValue );
+  settings->SetDefaultTextEncodingName(kTestValue);
   value = settings->GetDefaultTextEncodingName();
-  DALI_TEST_EQUALS( value, kTestValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(value, kTestValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2243,14 +2282,14 @@ int UtcDaliWebSettingsSetViewportMetaTag(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   bool value = settings->SetViewportMetaTag(true);
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
@@ -2260,17 +2299,17 @@ int UtcDaliWebSettingsSetForceZoom(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   bool value = settings->SetForceZoom(true);
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   value = settings->IsZoomForced();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
@@ -2280,17 +2319,17 @@ int UtcDaliWebSettingsSetTextZoomEnabled(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   bool value = settings->SetTextZoomEnabled(true);
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   value = settings->IsTextZoomEnabled();
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
@@ -2300,15 +2339,15 @@ int UtcDaliWebSettingsSetExtraFeature(void)
   ToolkitTestApplication application;
 
   WebView view = WebView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Dali::Toolkit::WebSettings* settings = view.GetSettings();
-  DALI_TEST_CHECK( settings != 0 )
+  DALI_TEST_CHECK(settings != 0)
 
   // Check the value is true or not
   settings->SetExtraFeature("test", true);
   bool value = settings->IsExtraFeatureEnabled("test");
-  DALI_TEST_CHECK( value );
+  DALI_TEST_CHECK(value);
 
   END_TEST;
 }
@@ -2329,3 +2368,49 @@ int UtcDaliWebViewGetPlainText(void)
   END_TEST;
 }
 
+int UtcDaliWebViewVisibilityChange(void)
+{
+  ToolkitTestApplication application;
+
+  WebView view  = WebView::New();
+  Control dummy = Control::New();
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(dummy);
+
+  view.LoadUrl(TEST_URL1);
+
+  dummy.Add(view);
+  auto window = application.GetWindow();
+  window.Add(dummy);
+
+  application.SendNotification();
+  application.Render();
+
+  try
+  {
+    // TODO : There is no way to check visiblity setting result from web engine.
+    // Just call API and exception check.
+    view.SetProperty(Actor::Property::VISIBLE, false);
+    view.SetProperty(Actor::Property::VISIBLE, true);
+    dummy.SetProperty(Actor::Property::VISIBLE, false);
+    dummy.SetProperty(Actor::Property::VISIBLE, true);
+    dummy.Unparent();
+    window.Hide();
+    window.Add(dummy);
+    window.Show();
+    window.Hide();
+    window.Show();
+    dummy.SetProperty(Actor::Property::VISIBLE, false);
+    view.SetProperty(Actor::Property::VISIBLE, false);
+    dummy.SetProperty(Actor::Property::VISIBLE, true);
+    view.SetProperty(Actor::Property::VISIBLE, true);
+    tet_result(TET_PASS);
+  }
+  catch(...)
+  {
+    // Should not throw exception
+    tet_result(TET_FAIL);
+  }
+
+  END_TEST;
+}
\ No newline at end of file
diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index 2d253c9..26782ba 100644
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -2,5 +2,9 @@ build
 dali.info
 *.dylib
 dali2-*-config.cmake
-libdali2-scene-loader.so*
+libdali2-scene3d.so*
 dali-shader-generator
+build.ninja
+rules.ninja
+.ninja_deps
+.ninja_log
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 2258fab..056af0b 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -34,7 +34,8 @@ OPTION(ENABLE_LINK_TEST          "Enable the link test" ON)
 OPTION(INSTALL_DOXYGEN_DOC       "Install doxygen doc" ON)
 OPTION(CONFIGURE_AUTOMATED_TESTS "Configure automated tests" ON)
 OPTION(USE_DEFAULT_RESOURCE_DIR  "Whether to use the default resource folders. Otherwise set environment variables for DALI_IMAGE_DIR, DALI_SOUND_DIR, DALI_STYLE_DIR, DALI_STYLE_IMAGE_DIR and DALI_DATA_READ_ONLY_DIR" ON)
-OPTION(BUILD_SCENE_LOADER        "Whether to build dali-scene-loader." ON)
+OPTION(BUILD_SCENE3D             "Whether to build dali-scene3d." ON)
+OPTION(BUILD_PHYSICS             "Whether to build dali-physics." ON)
 
 IF( ENABLE_PKG_CONFIGURE )
   FIND_PACKAGE( PkgConfig REQUIRED )
@@ -218,19 +219,7 @@ ELSE()
   # Set up compiler flags and warnings
   ADD_COMPILE_OPTIONS( -Wno-ignored-qualifiers )
 
-  # TODO: Clang is a lot more strict with warnings, we should address
-  # those issues at some point.
-  # Matches "Clang" or "AppleClang"
-  IF( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
-    ADD_COMPILE_OPTIONS( -Werror )
-  ENDIF()
-
-  ADD_COMPILE_OPTIONS( -Wall -Wno-unused-parameter -Wno-float-equal )
   ADD_COMPILE_OPTIONS( -Wall -Wno-unused-parameter -Wno-float-equal )
-  CHECK_CXX_COMPILER_FLAG(-Wno-class-memaccess HAVE_NO_CLASS_MEMACCESS)
-  IF (HAVE_NO_CLASS_MEMACCESS)
-    ADD_COMPILE_OPTIONS( -Wno-class-memaccess )
-  ENDIF()
 
   IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage )
     ADD_COMPILE_OPTIONS( --coverage )
@@ -325,9 +314,11 @@ ELSE()
           DESTINATION bin)
 ENDIF()
 
-SET(BUILT_IN_SHADER_GEN_CPP "${GENERATED_SHADER_DIR}/generated/builtin-shader-gen.cpp")
+SET(BUILT_IN_SHADER_GEN_CPP "${GENERATED_SHADER_DIR}/generated/builtin-shader-gen.cpp" )
+
+FILE(GLOB SHADERS_SRC "${SHADER_SOURCE_DIR}/*.vert" "${SHADER_SOURCE_DIR}/*.frag" )
 ADD_CUSTOM_COMMAND(OUTPUT ${BUILT_IN_SHADER_GEN_CPP}
-                   DEPENDS ${SHADER_GENERATOR_NAME}
+                   DEPENDS ${SHADER_GENERATOR_NAME} ${SHADERS_SRC}
                    COMMAND ${SHADER_GENERATOR_BINARY} ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
 
 SET(SOURCES ${SOURCES} ${BUILT_IN_SHADER_GEN_CPP})
@@ -369,6 +360,23 @@ IF ( WIN32 )
 ENDIF()
 
 ADD_LIBRARY( ${name} ${LIBTYPE} ${SOURCES} )
+
+SET(CUSTOM_COMPILE_OPTIONS "")
+
+# TODO: Clang is a lot more strict with warnings, we should address
+# those issues at some point.
+# Matches "Clang" or "AppleClang"
+IF( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
+  SET(CUSTOM_COMPILE_OPTIONS ${MY_COMPILE_OPTIONS} -Werror)
+ENDIF()
+
+CHECK_CXX_COMPILER_FLAG(-Wno-class-memaccess HAVE_NO_CLASS_MEMACCESS)
+IF (HAVE_NO_CLASS_MEMACCESS)
+  SET(CUSTOM_COMPILE_OPTIONS ${MY_COMPILE_OPTIONS} -Wno-class-memaccess)
+ENDIF()
+
+target_compile_options(${name} PRIVATE ${CUSTOM_COMPILE_OPTIONS})
+
 TARGET_LINK_LIBRARIES( ${name}
   ${DALICORE_LDFLAGS}
   ${DALIADAPTOR_LDFLAGS}
@@ -376,7 +384,7 @@ TARGET_LINK_LIBRARIES( ${name}
 )
 
 IF( ANDROID )
-  TARGET_LINK_LIBRARIES( ${name} log )
+  TARGET_LINK_LIBRARIES( ${name} log GLESv3 EGL)
 ENDIF()
 
 SET_TARGET_PROPERTIES( ${name}
@@ -511,7 +519,7 @@ IF( ENABLE_COVERAGE )
     ADD_CUSTOM_TARGET( ${DALI_TOOLKIT_PREFIX}rename_cov_data ./rename-cov-data )
 
     ADD_CUSTOM_TARGET( ${DALI_TOOLKIT_PREFIX}cov_data ${LCOV_BIN} ${LCOV_OPTS} --base-directory . --directory . -c -o dali.info
-      COMMAND ${LCOV_BIN} ${LCOV_OPTS} --remove dali.info \"*/dali-env/*\" \"/usr/include/*\" \"*/dali-env/*\" \"*solid-color-actor*\" \"*/dali-toolkit/third-party/*\" \"*/dali-scene-loader/third-party/*\" -o dali.info )
+      COMMAND ${LCOV_BIN} ${LCOV_OPTS} --remove dali.info \"*/dali-env/*\" \"/usr/include/*\" \"*/third-party/*\" -o dali.info )
 
     ADD_CUSTOM_TARGET( ${DALI_TOOLKIT_PREFIX}coverage genhtml -p ${ROOT_SRC_DIR} ${LCOV_OPTS} -o ${COVERAGE_OUTPUT_DIR} dali.info
       DEPENDS cov_data )
@@ -554,10 +562,13 @@ IF( ENABLE_COVERAGE )
   ENDIF( LCOV_BIN )
 ENDIF()
 
-IF ( BUILD_SCENE_LOADER )
-  ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/dali-scene-loader )
+IF ( BUILD_SCENE3D )
+  ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/dali-scene3d )
 ENDIF()
 
+IF ( BUILD_PHYSICS )
+  ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/dali-physics )
+ENDIF()
 
 # Build documentation if doxygen tool is available
 SET( doxygenEnabled OFF )
@@ -565,6 +576,17 @@ IF( DOXYGEN_FOUND )
   SET( doxygenEnabled ON )
   # 'prefix' is used by doxygen in-files.
   SET( prefix ${PREFIX} )
+
+  # Some doxygen properties not allowed at low version.
+  # We need to get doxygen version, and block in doxygen in-files.
+  EXECUTE_PROCESS( COMMAND bash -c "${DOXYGEN_EXECUTABLE} --version" OUTPUT_VARIABLE DOXYGEN_VERSION )
+
+  IF(${DOXYGEN_VERSION} VERSION_LESS "1.9.1")
+    SET( DOXYGEN_VERSION_LESS_1_9_1_BLOCKED "# ")
+  ELSE()
+    SET( DOXYGEN_VERSION_LESS_1_9_1_BLOCKED "")
+  ENDIF()
+
   SET( DOXYGEN_DOCS_DIR ${ROOT_SRC_DIR}/docs )
   SET( DOXYGEN_ROOT_DIR ${ROOT_SRC_DIR} )
   SET( DOXYGEN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs )
@@ -572,9 +594,9 @@ IF( DOXYGEN_FOUND )
   CONFIGURE_FILE( ${DOXYGEN_SRC_DIR}/dali.doxy.in ${DOXYGEN_SRC_DIR}/dali.doxy @ONLY )
   CONFIGURE_FILE( ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy.in ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy @ONLY )
 
-  IF ( BUILD_SCENE_LOADER )
+  IF ( BUILD_SCENE3D )
     ADD_CUSTOM_TARGET( doc_doxygen ALL
-      DEPENDS ${name} dali2-scene-loader
+      DEPENDS ${name} dali2-scene3d
       COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_SRC_DIR}/dali.doxy
       COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_SRC_DIR}/dali.doxy
       COMMAND ${CMAKE_COMMAND} -P ${DOXYGEN_SRC_DIR}/check_for_errors.cmake
@@ -630,7 +652,8 @@ MESSAGE( STATUS "Use pkg configure:             " ${ENABLE_PKG_CONFIGURE} )
 MESSAGE( STATUS "Vector Based Text Rendering:   " ${ENABLE_VECTOR_BASED_TEXT_RENDERING} )
 MESSAGE( STATUS "Enable link test:              " ${ENABLE_LINK_TEST} )
 MESSAGE( STATUS "Configure automated tests:     " ${CONFIGURE_AUTOMATED_TESTS} )
-MESSAGE( STATUS "Build Dali Scene Loader:       " ${BUILD_SCENE_LOADER} )
+MESSAGE( STATUS "Build Dali Scene3D:            " ${BUILD_SCENE3D} )
+MESSAGE( STATUS "Build Dali Physics:            " ${BUILD_PHYSICS} )
 MESSAGE( STATUS "CXXFLAGS:                      " ${CMAKE_CXX_FLAGS} )
 MESSAGE( STATUS "LDFLAGS:                       " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )
 
diff --git a/build/tizen/dali-physics/CMakeLists.txt b/build/tizen/dali-physics/CMakeLists.txt
new file mode 100644
index 0000000..63f4b9e
--- /dev/null
+++ b/build/tizen/dali-physics/CMakeLists.txt
@@ -0,0 +1,194 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
+set(name "dali2-physics")
+
+project(${name} CXX)
+
+set(${name}_VERSION_MAJOR 1)
+set(${name}_VERSION_MINOR 0)
+set(${name}_VERSION_PATCH 0)
+set(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH} )
+
+SET(DALI_PHYSICS_VERSION ${${name}_VERSION} )
+
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+    add_definitions("-DDEBUG_ENABLED")
+endif()
+
+add_definitions("-DBUILDING_DALI_PHYSICS")
+
+foreach(flag ${PKGS_CFLAGS})
+    set(extra_flags "${extra_flags} ${flag}")
+endforeach(flag)
+
+set(prj_cxx_std c++17)
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    set(extra_flags "${extra_flags} -fPIC -std=${prj_cxx_std}")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(extra_flags "${extra_flags} -fPIC -std=${prj_cxx_std}")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    set(extra_flags "${extra_flags} /std:${prj_cxx_std} /vmg /D_USE_MATH_DEFINES /D_CRT_SECURE_NO_WARNINGS /MP /GS /Oi /GL /EHsc")
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${extra_flags}")
+
+set(prefix ${CMAKE_INSTALL_PREFIX})
+
+set(repo_root_dir "${CMAKE_CURRENT_LIST_DIR}/../../..")
+set(physics_dir "${repo_root_dir}/dali-physics")
+
+option(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
+option(ENABLE_COVERAGE "Coverage" OFF)
+
+if (ENABLE_PKG_CONFIGURE)
+    find_package(PkgConfig REQUIRED)
+
+    pkg_check_modules(DALICORE REQUIRED dali2-core)
+    pkg_check_modules(DALIADAPTOR REQUIRED dali2-adaptor)
+
+    # Configure the pkg-config file
+    # Requires the following variables to be setup:
+    # @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
+    set( LIB_DIR $ENV{libdir} )
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
+    endif()
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${prefix}/lib )
+    endif()
+
+    set(PREFIX ${prefix})
+    set(EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
+    set(DEV_INCLUDE_PATH ${INCLUDE_DIR})
+
+    set(core_pkg_cfg_file_2d dali2-physics-2d.pc)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/${core_pkg_cfg_file_2d}.in ${core_pkg_cfg_file_2d} @ONLY)
+
+    set(core_pkg_cfg_file_3d dali2-physics-3d.pc)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/${core_pkg_cfg_file_3d}.in ${core_pkg_cfg_file_3d} @ONLY)
+endif()
+
+add_subdirectory("${physics_dir}/third-party/chipmunk2d" chipmunk2d)
+add_subdirectory("${physics_dir}/third-party/bullet3" bullet3)
+
+set(physics_src_files "")
+include(${physics_dir}/public-api/file.list)
+include(${physics_dir}/integration-api/file.list)
+# Must come last!
+include(${physics_dir}/internal/file.list)
+
+set(prefix_include_dir "${prefix}/include")
+
+include_directories(BEFORE
+  ${repo_root_dir}
+  "${repo_root_dir}/dali-physics/third-party/bullet3/src"
+  "${repo_root_dir}/dali-physics/third-party/chipmunk2d/include"
+)
+
+include_directories(AFTER "${prefix_include_dir}")
+
+MESSAGE(STATUS "2D sources: ${physics2d_src_files}")
+MESSAGE(STATUS "3D sources: ${physics3d_src_files}")
+
+ADD_LIBRARY("${name}-2d" SHARED ${physics2d_src_files} )
+TARGET_LINK_LIBRARIES("${name}-2d" ${DALICORE_LDFLAGS}
+  dali2-toolkit
+  chipmunk
+  ${COVERAGE})
+TARGET_COMPILE_OPTIONS("${name}-2d" PUBLIC "-I${repo_root_dir}/dali-physics/third-party/chipmunk2d/include")
+
+ADD_LIBRARY("${name}-3d" SHARED ${physics3d_src_files} )
+TARGET_LINK_LIBRARIES("${name}-3d" ${DALICORE_LDFLAGS}
+  dali2-toolkit
+  bullet3
+  ${COVERAGE})
+TARGET_COMPILE_OPTIONS("${name}-3d" PUBLIC "-I${repo_root_dir}/dali-physics/third-party/bullet3/src")
+
+IF (ENABLE_PKG_CONFIGURE)
+  INSTALL(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/${core_pkg_cfg_file_2d}
+    ${CMAKE_CURRENT_BINARY_DIR}/${core_pkg_cfg_file_3d}
+    DESTINATION ${LIB_DIR}/pkgconfig )
+ENDIF()
+
+
+IF( INSTALL_CMAKE_MODULES )
+  MESSAGE(STATUS "Installing cmake modules & libs")
+  SET_TARGET_PROPERTIES( ${name}-2d
+    PROPERTIES
+    VERSION ${DALI_PHYSICS_VERSION}
+    SOVERSION ${${name}_VERSION_MAJOR}
+    CLEAN_DIRECT_OUPUT 1
+    )
+
+  SET_TARGET_PROPERTIES( ${name}-3d
+    PROPERTIES
+    VERSION ${DALI_PHYSICS_VERSION}
+    SOVERSION ${${name}_VERSION_MAJOR}
+    CLEAN_DIRECT_OUPUT 1
+    )
+
+  IF( ENABLE_DEBUG )
+    SET( BIN_DIR "${BIN_DIR}/debug" )
+    SET( LIB_DIR "${LIB_DIR}/debug" )
+  ENDIF()
+
+  # Install library
+  INSTALL( TARGETS ${name}-2d
+    EXPORT ${name}-2d-targets
+    LIBRARY DESTINATION ${LIB_DIR}
+    ARCHIVE DESTINATION ${LIB_DIR}
+    RUNTIME DESTINATION ${BIN_DIR}
+  )
+
+  INSTALL( TARGETS ${name}-3d
+    EXPORT ${name}-3d-targets
+    LIBRARY DESTINATION ${LIB_DIR}
+    ARCHIVE DESTINATION ${LIB_DIR}
+    RUNTIME DESTINATION ${BIN_DIR}
+  )
+
+  # Install the cmake modules.
+  INSTALL(
+    EXPORT ${name}-2d-targets
+    NAMESPACE ${name}-2d::
+    FILE ${name}-2d-targets.cmake
+    DESTINATION share/${name}-2d
+  )
+
+  INSTALL(
+    EXPORT ${name}-3d-targets
+    NAMESPACE ${name}-3d::
+    FILE ${name}-3d-targets.cmake
+    DESTINATION share/${name}-3d
+  )
+
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}-2d-config.cmake "
+    include(CMakeFindDependencyMacro)
+    include(\${CMAKE_CURRENT_LIST_DIR}/${name}-2d-targets.cmake)
+  ")
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-2d-config.cmake DESTINATION share/${name}-2d)
+
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}-3d-config.cmake "
+    include(CMakeFindDependencyMacro)
+    include(\${CMAKE_CURRENT_LIST_DIR}/${name}-3d-targets.cmake)
+  ")
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-3d-config.cmake DESTINATION share/${name}-3d)
+
+ELSE()
+  MESSAGE(STATUS "Installing libs")
+  INSTALL( TARGETS ${name}-2d DESTINATION ${LIB_DIR} )
+  INSTALL( TARGETS ${name}-3d DESTINATION ${LIB_DIR} )
+
+ENDIF()
+
+# Install headers
+install( FILES ${physics_public_api_header_files}
+  DESTINATION "${INCLUDE_DIR}/dali-physics/public-api"
+  )
+install( FILES ${physics_integration_api_header_files}
+  DESTINATION "${INCLUDE_DIR}/dali-physics/integration-api"
+  )
+
+install( FILES ${physics_dir}/dali-physics.h
+  DESTINATION "${INCLUDE_DIR}/dali-physics"
+  )
diff --git a/build/tizen/dali-physics/dali2-physics-2d.pc.in b/build/tizen/dali-physics/dali2-physics-2d.pc.in
new file mode 100644
index 0000000..29dcbc1
--- /dev/null
+++ b/build/tizen/dali-physics/dali2-physics-2d.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@DALI_PHYSICS_2D_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: DALi Engine Physics Library
+Description: Dali Physics 2D library
+Version: ${apiversion}
+Requires: chipmunk2d
+Libs: -L${libdir} -ldali2-physics-2d
+Cflags: -I${includedir}
diff --git a/build/tizen/dali-physics/dali2-physics-3d.pc.in b/build/tizen/dali-physics/dali2-physics-3d.pc.in
new file mode 100644
index 0000000..b5e7001
--- /dev/null
+++ b/build/tizen/dali-physics/dali2-physics-3d.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@DALI_PHYSICS_3D_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: DALi Engine Physics Library
+Description: Dali Physics 3D library
+Version: ${apiversion}
+Requires: bullet3
+Libs: -L${libdir} -ldali2-physics-3d
+Cflags: -I${includedir}
diff --git a/build/tizen/dali-scene-loader/CMakeLists.txt b/build/tizen/dali-scene-loader/CMakeLists.txt
deleted file mode 100644
index 8891e9d..0000000
--- a/build/tizen/dali-scene-loader/CMakeLists.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
-set(name "dali2-scene-loader")
-
-project(${name} CXX)
-
-set(${name}_VERSION_MAJOR 2)
-set(${name}_VERSION_MINOR 0)
-set(${name}_VERSION_PATCH 0)
-set(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH} )
-
-SET(DALI_SCENE_LOADER_VERSION ${${name}_VERSION} )
-
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-	add_definitions("-DDEBUG_ENABLED")
-endif()
-
-ADD_DEFINITIONS( "-DBUILDING_DALI_SCENE_LOADER" )
-
-foreach(flag ${PKGS_CFLAGS})
-	set(extra_flags "${extra_flags} ${flag}")
-endforeach(flag)
-
-set(prj_cxx_std c++17)
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-	set(extra_flags "${extra_flags} -fPIC -std=${prj_cxx_std}")
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-	set(extra_flags "${extra_flags} -fPIC -std=${prj_cxx_std}")
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-	set(extra_flags "${extra_flags} /std:${prj_cxx_std} /vmg /D_USE_MATH_DEFINES /D_CRT_SECURE_NO_WARNINGS /MP /GS /Oi /GL /EHsc")
-endif()
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${extra_flags}")
-
-set(prefix ${CMAKE_INSTALL_PREFIX})
-
-set(repo_root_dir "${CMAKE_CURRENT_LIST_DIR}/../../../")
-set(scene_loader_dir "${repo_root_dir}/dali-scene-loader")
-
-option(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
-option(ENABLE_COVERAGE "Coverage" OFF)
-
-IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage )
-  ADD_COMPILE_OPTIONS( --coverage )
-  SET(ENABLE_COVERAGE ON)
-  SET(COVERAGE --coverage)
-ENDIF()
-
-if (ENABLE_PKG_CONFIGURE)
-	find_package(PkgConfig REQUIRED)
-
-	pkg_check_modules(DALICORE REQUIRED dali2-core)
-	pkg_check_modules(DALIADAPTOR REQUIRED dali2-adaptor)
-
-	# Configure the pkg-config file
-	# Requires the following variables to be setup:
-	# @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
-	set( LIB_DIR $ENV{libdir} )
-	if( NOT LIB_DIR )
-		set( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
-	endif()
-	if( NOT LIB_DIR )
-		set( LIB_DIR ${prefix}/lib )
-	endif()
-
-	set(PREFIX ${prefix})
-	set(EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
-	set(DEV_INCLUDE_PATH ${repo_root_dir})
-
-	set(core_pkg_cfg_file dali2-scene-loader.pc)
-	configure_file(${CMAKE_CURRENT_LIST_DIR}/${core_pkg_cfg_file}.in ${core_pkg_cfg_file} @ONLY)
-endif()
-
-set(scene_loader_src_files "")
-include("${scene_loader_dir}/internal/file.list")
-include("${scene_loader_dir}/public-api/file.list")
-
-set(prefix_include_dir "${prefix}/include")
-include_directories(${repo_root_dir}
-	${prefix_include_dir}
-)
-
-# Generate source files for shaders
-SET(SHADER_SOURCE_DIR "${scene_loader_dir}/internal/graphics/shaders/")
-SET(SHADER_GENERATED_DIR "${scene_loader_dir}/internal/graphics/generated")
-
-SET(GENERATED_SHADER_DIR ${scene_loader_dir}/internal/graphics/)
-SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
-             "${GENERATED_SHADER_DIR}/generated/"
-             "${GENERATED_SHADER_DIR}/builtin-shader-extern-gen.h")
-
-IF( WIN32)
-  # When Using VCPKG, the default is always set to Debug if CMAKE_BUILD_TYPE is not set
-  IF( NOT CMAKE_BUILD_TYPE )
-    SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../Debug/${SHADER_GENERATOR_NAME})
-  ELSE()
-    SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/${SHADER_GENERATOR_NAME})
-  ENDIF()
-ELSE()
-  SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../${SHADER_GENERATOR_NAME})
-ENDIF()
-
-SET( BUILT_IN_SHADER_GEN_CPP "${GENERATED_SHADER_DIR}/generated/builtin-shader-gen.cpp")
-ADD_CUSTOM_COMMAND(OUTPUT ${BUILT_IN_SHADER_GEN_CPP}
-                   DEPENDS ${SHADER_GENERATOR_BINARY}
-                   COMMAND ${SHADER_GENERATOR_BINARY} ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
-
-SET( scene_loader_src_files ${scene_loader_src_files} ${BUILT_IN_SHADER_GEN_CPP} )
-
-add_library(${name} SHARED ${scene_loader_src_files})
-
-target_link_libraries(${name} ${DALICORE_LDFLAGS} ${DALIADAPTOR_LDFLAGS}
-	dali2-toolkit
-	${COVERAGE})
-
-if( ANDROID )
-	target_link_libraries(${name} log)
-endif()
-
-IF( INSTALL_CMAKE_MODULES )
-	SET_TARGET_PROPERTIES( ${name}
-		PROPERTIES
-		VERSION ${DALI_SCENE_LOADER_VERSION}
-		SOVERSION ${${name}_VERSION_MAJOR}
-		CLEAN_DIRECT_OUPUT 1
-	)
-
-	IF( ENABLE_DEBUG )
-		SET( BIN_DIR "${BIN_DIR}/debug" )
-		SET( LIB_DIR "${LIB_DIR}/debug" )
-	ENDIF()
-
-	# Install the library files.
-	INSTALL( TARGETS ${name}
-		EXPORT ${name}-targets
-		LIBRARY DESTINATION ${LIB_DIR}
-		ARCHIVE DESTINATION ${LIB_DIR}
-		RUNTIME DESTINATION ${BIN_DIR}
-	)
-
-	# Install the cmake modules.
-	INSTALL(
-		EXPORT ${name}-targets
-		NAMESPACE ${name}::
-		FILE ${name}-targets.cmake
-		DESTINATION share/${name}
-	)
-
-	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake "
-		include(CMakeFindDependencyMacro)
-		include(\${CMAKE_CURRENT_LIST_DIR}/${name}-targets.cmake)
-	")
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake DESTINATION share/${name})
-
-	# Install the pdb file.
-	IF( ENABLE_DEBUG AND WIN32 )
-		install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
-	ENDIF()
-ELSE()
-	# Install the library so file and symlinks
-	INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} )
-ENDIF()
-
-file(GLOB scene_loader_include_files ${scene_loader_public_api_dir})
-install(DIRECTORY ${scene_loader_include_files}
-	DESTINATION "${prefix_include_dir}/dali-scene-loader"
-	FILES_MATCHING PATTERN "*.h"
-)
-
-if (ENABLE_PKG_CONFIGURE)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${core_pkg_cfg_file}
-		DESTINATION ${LIB_DIR}/pkgconfig
-	)
-endif()
diff --git a/build/tizen/dali-scene-loader/dali2-scene-loader.pc.in b/build/tizen/dali-scene-loader/dali2-scene-loader.pc.in
deleted file mode 100644
index 8f7e885..0000000
--- a/build/tizen/dali-scene-loader/dali2-scene-loader.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-apiversion=@DALI_SCENE_LOADER_VERSION@
-libdir=@LIB_DIR@
-includedir=@DEV_INCLUDE_PATH@
-
-Name: Dali 3D Engine Scene Loader
-Description: Dali Scene Loader library
-Version: ${apiversion}
-Requires: dali2-toolkit
-Libs: -L${libdir} -ldali2-scene-loader
-Cflags: -I${includedir}
diff --git a/build/tizen/dali-scene3d/CMakeLists.txt b/build/tizen/dali-scene3d/CMakeLists.txt
new file mode 100644
index 0000000..57d1b4a
--- /dev/null
+++ b/build/tizen/dali-scene3d/CMakeLists.txt
@@ -0,0 +1,178 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
+set(name "dali2-scene3d")
+
+project(${name} CXX)
+
+set(${name}_VERSION_MAJOR 2)
+set(${name}_VERSION_MINOR 0)
+set(${name}_VERSION_PATCH 0)
+set(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH} )
+
+SET(DALI_SCENE3D_VERSION ${${name}_VERSION} )
+
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+	add_definitions("-DDEBUG_ENABLED")
+endif()
+
+ADD_DEFINITIONS( "-DBUILDING_DALI_SCENE3D" )
+
+foreach(flag ${PKGS_CFLAGS})
+	set(extra_flags "${extra_flags} ${flag}")
+endforeach(flag)
+
+set(prj_cxx_std c++17)
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	set(extra_flags "${extra_flags} -fPIC -std=${prj_cxx_std}")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	set(extra_flags "${extra_flags} -fPIC -std=${prj_cxx_std}")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+	set(extra_flags "${extra_flags} /std:${prj_cxx_std} /vmg /D_USE_MATH_DEFINES /D_CRT_SECURE_NO_WARNINGS /MP /GS /Oi /GL /EHsc")
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${extra_flags}")
+
+set(prefix ${CMAKE_INSTALL_PREFIX})
+
+set(repo_root_dir "${CMAKE_CURRENT_LIST_DIR}/../../../")
+set(scene3d_dir "${repo_root_dir}/dali-scene3d")
+
+option(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
+option(ENABLE_COVERAGE "Coverage" OFF)
+
+IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage )
+  ADD_COMPILE_OPTIONS( --coverage )
+  SET(ENABLE_COVERAGE ON)
+  SET(COVERAGE --coverage)
+ENDIF()
+
+if (ENABLE_PKG_CONFIGURE)
+	find_package(PkgConfig REQUIRED)
+
+	pkg_check_modules(DALICORE REQUIRED dali2-core)
+	pkg_check_modules(DALIADAPTOR REQUIRED dali2-adaptor)
+
+	# Configure the pkg-config file
+	# Requires the following variables to be setup:
+	# @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
+	set( LIB_DIR $ENV{libdir} )
+	if( NOT LIB_DIR )
+		set( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
+	endif()
+	if( NOT LIB_DIR )
+		set( LIB_DIR ${prefix}/lib )
+	endif()
+
+	set(PREFIX ${prefix})
+	set(EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
+	set(DEV_INCLUDE_PATH ${INCLUDE_DIR})
+
+	set(core_pkg_cfg_file dali2-scene3d.pc)
+	configure_file(${CMAKE_CURRENT_LIST_DIR}/${core_pkg_cfg_file}.in ${core_pkg_cfg_file} @ONLY)
+endif()
+
+set(scene3d_src_files "")
+include("${scene3d_dir}/internal/file.list")
+include("${scene3d_dir}/public-api/file.list")
+
+set(prefix_include_dir "${prefix}/include")
+include_directories(${repo_root_dir}
+	${prefix_include_dir}
+)
+
+# Generate source files for shaders
+SET(SHADER_SOURCE_DIR "${scene3d_dir}/internal/graphics/shaders/")
+SET(SHADER_GENERATED_DIR "${scene3d_dir}/internal/graphics/generated")
+
+SET(GENERATED_SHADER_DIR ${scene3d_dir}/internal/graphics/)
+SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
+             "${GENERATED_SHADER_DIR}/generated/"
+             "${GENERATED_SHADER_DIR}/builtin-shader-extern-gen.h")
+
+IF( WIN32)
+  # When Using VCPKG, the default is always set to Debug if CMAKE_BUILD_TYPE is not set
+  IF( NOT CMAKE_BUILD_TYPE )
+    SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../Debug/${SHADER_GENERATOR_NAME})
+  ELSE()
+    SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/${SHADER_GENERATOR_NAME})
+  ENDIF()
+ELSE()
+  SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../${SHADER_GENERATOR_NAME})
+ENDIF()
+
+FILE(GLOB SHADERS_SRC "${SHADER_SOURCE_DIR}/*.vert" "${SHADER_SOURCE_DIR}/*.frag")
+SET( BUILT_IN_SHADER_GEN_CPP "${GENERATED_SHADER_DIR}/generated/builtin-shader-gen.cpp")
+ADD_CUSTOM_COMMAND(OUTPUT ${BUILT_IN_SHADER_GEN_CPP}
+                   DEPENDS ${SHADER_GENERATOR_BINARY} ${SHADERS_SRC}
+                   COMMAND ${SHADER_GENERATOR_BINARY} ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
+
+SET( scene3d_src_files ${scene3d_src_files} ${BUILT_IN_SHADER_GEN_CPP} )
+
+add_library(${name} SHARED ${scene3d_src_files})
+
+target_link_libraries(${name} ${DALICORE_LDFLAGS} ${DALIADAPTOR_LDFLAGS}
+	dali2-toolkit
+	${COVERAGE})
+
+if( ANDROID )
+	target_link_libraries(${name} log)
+endif()
+
+IF( INSTALL_CMAKE_MODULES )
+	SET_TARGET_PROPERTIES( ${name}
+		PROPERTIES
+		VERSION ${DALI_SCENE3D_VERSION}
+		SOVERSION ${${name}_VERSION_MAJOR}
+		CLEAN_DIRECT_OUPUT 1
+	)
+
+	IF( ENABLE_DEBUG )
+		SET( BIN_DIR "${BIN_DIR}/debug" )
+		SET( LIB_DIR "${LIB_DIR}/debug" )
+	ENDIF()
+
+	# Install the library files.
+	INSTALL( TARGETS ${name}
+		EXPORT ${name}-targets
+		LIBRARY DESTINATION ${LIB_DIR}
+		ARCHIVE DESTINATION ${LIB_DIR}
+		RUNTIME DESTINATION ${BIN_DIR}
+	)
+
+	# Install the cmake modules.
+	INSTALL(
+		EXPORT ${name}-targets
+		NAMESPACE ${name}::
+		FILE ${name}-targets.cmake
+		DESTINATION share/${name}
+	)
+
+	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake "
+		include(CMakeFindDependencyMacro)
+		include(\${CMAKE_CURRENT_LIST_DIR}/${name}-targets.cmake)
+	")
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake DESTINATION share/${name})
+
+	# Install the pdb file.
+	IF( ENABLE_DEBUG AND WIN32 )
+		install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
+	ENDIF()
+ELSE()
+	# Install the library so file and symlinks
+	INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} )
+ENDIF()
+
+file(GLOB scene3d_include_files ${scene3d_public_api_dir})
+
+install(DIRECTORY ${scene3d_include_files}
+	DESTINATION "${INCLUDE_DIR}/dali-scene3d"
+	FILES_MATCHING PATTERN "*.h"
+)
+
+# Install dali-scene3d.h
+INSTALL( FILES ${scene3d_dir}/dali-scene3d.h DESTINATION ${INCLUDE_DIR}/dali-scene3d )
+
+if (ENABLE_PKG_CONFIGURE)
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${core_pkg_cfg_file}
+		DESTINATION ${LIB_DIR}/pkgconfig
+	)
+endif()
diff --git a/build/tizen/dali-scene-loader/build.sh b/build/tizen/dali-scene3d/build.sh
similarity index 100%
rename from build/tizen/dali-scene-loader/build.sh
rename to build/tizen/dali-scene3d/build.sh
diff --git a/build/tizen/dali-scene3d/dali2-scene3d.pc.in b/build/tizen/dali-scene3d/dali2-scene3d.pc.in
new file mode 100644
index 0000000..106e032
--- /dev/null
+++ b/build/tizen/dali-scene3d/dali2-scene3d.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@DALI_SCENE3D_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: Dali 3D Engine Scene3D
+Description: Dali Scene3D library
+Version: ${apiversion}
+Requires: dali2-toolkit
+Libs: -L${libdir} -ldali2-scene3d
+Cflags: -I${includedir}
diff --git a/build/tizen/docs-internal/dali-internal.doxy.in b/build/tizen/docs-internal/dali-internal.doxy.in
index 7cf973a..cfb7335 100644
--- a/build/tizen/docs-internal/dali-internal.doxy.in
+++ b/build/tizen/docs-internal/dali-internal.doxy.in
@@ -1,4 +1,8 @@
-# Doxyfile 1.8.11
+# Doxyfile @DOXYGEN_VERSION@
+# Note : Some option need to be blocked if version is lower than 1.9.1.
+# See how "DOXYGEN_VERSION_LESS_1_9_1_BLOCKED" defined in CMakeList.txt.
+
+# TODO : Need to update this file use updated doxygen 1.9.1 format
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -357,6 +361,8 @@ ALIASES += SINCE_1_3="@since 1.3"
 ALIASES += SINCE_1_4="@since 1.4"
 ALIASES += SINCE_1_9="@since 1.9"
 ALIASES += SINCE_2_0="@since 2.0"
+ALIASES += SINCE_2_1="@since 2.1"
+ALIASES += SINCE_2_2="@since 2.2"
 
 # Extra tags for Tizen 3.0
 ALIASES += SINCE_1_2_2="@since 1.2.2"
@@ -385,6 +391,8 @@ ALIASES += DEPRECATED_1_3_39="@deprecated Deprecated since 1.3.39"
 ALIASES += DEPRECATED_1_3_51="@deprecated Deprecated since 1.3.51"
 ALIASES += DEPRECATED_1_4="@deprecated Deprecated since 1.4"
 ALIASES += DEPRECATED_2_0="@deprecated Deprecated since 2.0"
+ALIASES += DEPRECATED_2_1="@deprecated Deprecated since 2.1"
+ALIASES += DEPRECATED_2_2="@deprecated Deprecated since 2.2"
 
 ALIASES += PLATFORM=""
 ALIASES += PRIVLEVEL_PLATFORM=""
@@ -404,7 +412,9 @@ ALIASES += REMARK_RAWVIDEO=""
 #ALIASES += SINCE_1_3="\par Since:\n 5.0, DALi version 1.3"
 #ALIASES += SINCE_1_4="\par Since:\n 5.5, DALi version 1.4"
 #ALIASES += SINCE_1_9="\par Since:\n 6.0, DALi version 1.9"
-#ALIASES += SINCE_2_0="\par Since:\n 6.0, DALi version 2.0"
+#ALIASES += SINCE_2_0="\par Since:\n 6.5, DALi version 2.0"
+#ALIASES += SINCE_2_1="\par Since:\n 7.0, DALi version 2.1"
+#ALIASES += SINCE_2_2="\par Since:\n 7.5, DALi version 2.2"
 
 ## Extra tags for Tizen 3.0
 #ALIASES += SINCE_1_2_2="\par Since:\n 3.0, DALi version 1.2.2"
@@ -434,6 +444,9 @@ ALIASES += REMARK_RAWVIDEO=""
 #ALIASES += DEPRECATED_1_3_39="@deprecated Deprecated since 5.5, DALi version 1.3.39"
 #ALIASES += DEPRECATED_1_3_51="@deprecated Deprecated since 5.5, DALi version 1.3.51"
 #ALIASES += DEPRECATED_1_4="@deprecated Deprecated since 5.5, DALi version 1.4"
+#ALIASES += DEPRECATED_2_0="@deprecated Deprecated since 6.5, DALi version 2.0"
+#ALIASES += DEPRECATED_2_1="@deprecated Deprecated since 7.0, DALi version 2.1"
+#ALIASES += DEPRECATED_2_2="@deprecated Deprecated since 7.5, DALi version 2.2"
 
 #ALIASES += PLATFORM="@platform"
 #ALIASES += PRIVLEVEL_PLATFORM="\par Privilege Level:\n platform"
@@ -2293,7 +2306,7 @@ INCLUDE_FILE_PATTERNS  =
 PREDEFINED             = DALI_CORE_API \
                          DALI_ADAPTOR_API \
                          DALI_TOOLKIT_API \
-                         DALI_SCENE_LOADER_API \
+                         DALI_SCENE3D_API \
                          DALI_INTERNAL \
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in
index 27a21bc..4d281e5 100644
--- a/build/tizen/docs/dali.doxy.in
+++ b/build/tizen/docs/dali.doxy.in
@@ -1,4 +1,6 @@
-# Doxyfile 1.8.11
+# Doxyfile @DOXYGEN_VERSION@
+# Note : Some option need to be blocked if version is lower than 1.9.1.
+# See how "DOXYGEN_VERSION_LESS_1_9_1_BLOCKED" defined in CMakeList.txt.
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,11 +19,11 @@
 # 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.
+# This tag specifies the encoding used for all characters in the configuration
+# 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
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
@@ -93,6 +95,14 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION = None
+
 # If the BRIEF_MEMBER_DESC tag is set to YES, 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.
@@ -189,6 +199,16 @@ SHORT_NAMES            = NO
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER = NO
+
 # 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 Qt-style will behave just like regular Qt-style comments (thus
@@ -209,6 +229,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+@DOXYGEN_VERSION_LESS_1_9_1_BLOCKED@ PYTHON_DOCSTRING = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -236,7 +264,12 @@ TAB_SIZE               = 2
 # 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.
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
 
 ALIASES                =
 # Clip alias inserts the specified file between two text markers.
@@ -357,6 +390,9 @@ ALIASES += SINCE_1_3="@since 1.3"
 ALIASES += SINCE_1_4="@since 1.4"
 ALIASES += SINCE_1_9="@since 1.9"
 ALIASES += SINCE_2_0="@since 2.0"
+ALIASES += SINCE_2_1="@since 2.1"
+ALIASES += SINCE_2_2="@since 2.2"
+ALIASES += SINCE_2_3="@since 2.3"
 
 # Extra tags for Tizen 3.0
 ALIASES += SINCE_1_2_2="@since 1.2.2"
@@ -385,6 +421,9 @@ ALIASES += DEPRECATED_1_3_39="@deprecated Deprecated since 1.3.39"
 ALIASES += DEPRECATED_1_3_51="@deprecated Deprecated since 1.3.51"
 ALIASES += DEPRECATED_1_4="@deprecated Deprecated since 1.4"
 ALIASES += DEPRECATED_2_0="@deprecated Deprecated since 2.0"
+ALIASES += DEPRECATED_2_1="@deprecated Deprecated since 2.1"
+ALIASES += DEPRECATED_2_2="@deprecated Deprecated since 2.2"
+ALIASES += DEPRECATED_2_3="@deprecated Deprecated since 2.3"
 
 ALIASES += PLATFORM=""
 ALIASES += PRIVLEVEL_PLATFORM=""
@@ -404,7 +443,10 @@ ALIASES += REMARK_RAWVIDEO=""
 #ALIASES += SINCE_1_3="\par Since:\n 5.0, DALi version 1.3"
 #ALIASES += SINCE_1_4="\par Since:\n 5.5, DALi version 1.4"
 #ALIASES += SINCE_1_9="\par Since:\n 6.0, DALi version 1.9"
-#ALIASES += SINCE_2_0="\par Since:\n 6.0, DALi version 2.0"
+#ALIASES += SINCE_2_0="\par Since:\n 6.5, DALi version 2.0"
+#ALIASES += SINCE_2_1="\par Since:\n 7.0, DALi version 2.1"
+#ALIASES += SINCE_2_2="\par Since:\n 8.0, DALi version 2.2"
+#ALIASES += SINCE_2_3="\par Since:\n 9.0, DALi version 2.3"
 
 ## Extra tags for Tizen 3.0
 #ALIASES += SINCE_1_2_2="\par Since:\n 3.0, DALi version 1.2.2"
@@ -434,7 +476,10 @@ ALIASES += REMARK_RAWVIDEO=""
 #ALIASES += DEPRECATED_1_3_39="@deprecated Deprecated since 5.5, DALi version 1.3.39"
 #ALIASES += DEPRECATED_1_3_51="@deprecated Deprecated since 5.5, DALi version 1.3.51"
 #ALIASES += DEPRECATED_1_4="@deprecated Deprecated since 5.5, DALi version 1.4"
-#ALIASES += DEPRECATED_2_0="@deprecated Deprecated since 5.5, DALi version 2.0"
+#ALIASES += DEPRECATED_2_0="@deprecated Deprecated since 6.5, DALi version 2.0"
+#ALIASES += DEPRECATED_2_1="@deprecated Deprecated since 7.0, DALi version 2.1"
+#ALIASES += DEPRECATED_2_2="@deprecated Deprecated since 8.0, DALi version 2.2"
+#ALIASES += DEPRECATED_2_3="@deprecated Deprecated since 9.0, DALi version 2.3"
 
 #ALIASES += PLATFORM="@platform"
 #ALIASES += PRIVLEVEL_PLATFORM="\par Privilege Level:\n platform"
@@ -446,12 +491,6 @@ ALIASES += REMARK_RAWVIDEO=""
 #ALIASES += REMARK_STORAGE="@remarks %http://tizen.org/privilege/mediastorage is needed if @a url is relevant to media storage. @remarks %http://tizen.org/privilege/externalstorage is needed if @a url is relevant to external storage."
 #ALIASES += REMARK_RAWVIDEO="@remarks %http://tizen.org/feature/multimedia.raw_video is needed if UNDERLAY is false. If the feature isn't supported, UNDERLAY is always true."
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # 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
@@ -480,28 +519,40 @@ OPTIMIZE_FOR_FORTRAN   = NO
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE = 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 (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. 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.
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). 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: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -509,6 +560,15 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS = 5
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -534,7 +594,7 @@ BUILTIN_STL_SUPPORT    = YES
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# https://www.riverbankcomputing.com/software/sip/intro) 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.
 # The default value is: NO.
@@ -620,6 +680,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which efficively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+@DOXYGEN_VERSION_LESS_1_9_1_BLOCKED@ NUM_PROC_THREADS = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -640,6 +713,12 @@ EXTRACT_ALL            = YES
 
 EXTRACT_PRIVATE        = YES
 
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL = NO
+
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
@@ -677,6 +756,13 @@ EXTRACT_LOCAL_METHODS  = NO
 
 EXTRACT_ANON_NSPACES   = NO
 
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+@DOXYGEN_VERSION_LESS_1_9_1_BLOCKED@ RESOLVE_UNNAMED_PARAMS = YES
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -694,8 +780,8 @@ HIDE_UNDOC_MEMBERS     = NO
 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, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -714,11 +800,18 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# 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.
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -905,7 +998,7 @@ LAYOUT_FILE            = @DOXYGEN_DOCS_DIR@/DaliLayout.xml
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
 # extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
@@ -950,13 +1043,17 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = YES
 
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
@@ -995,14 +1092,14 @@ INPUT                  = @DOXYGEN_DOCS_DIR@/content \
                          @prefix@/include/dali/devel-api \
                          ../../../dali-toolkit/public-api \
                          ../../../dali-toolkit/devel-api \
-                         ../../../dali-scene-loader/public-api \
+                         ../../../dali-scene3d/public-api \
                          ../../../automated-tests/README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
@@ -1015,11 +1112,15 @@ INPUT_ENCODING         = UTF-8
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # read by doxygen.
 #
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
-# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
+# *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.h \
                          *.md
@@ -1179,7 +1280,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = NO
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
@@ -1211,12 +1312,12 @@ SOURCE_TOOLTIPS        = 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
+# (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1239,16 +1340,22 @@ USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 
 # If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
 # Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse-libclang=ON option for CMake.
+# generated with the -Duse_libclang=ON option for CMake.
 # The default value is: NO.
 
 CLANG_ASSISTED_PARSING = NO
 
+# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
+# YES then doxygen will add the directory of each input to the include path.
+# The default value is: YES.
+
+@DOXYGEN_VERSION_LESS_1_9_1_BLOCKED@ CLANG_ADD_INC_PATHS = YES
+
 # If clang assisted parsing is enabled you can provide the compiler with command
 # line options that you would normally use when invoking the compiler. Note that
 # the include paths will already be set by doxygen for the files and directories
@@ -1257,6 +1364,19 @@ CLANG_ASSISTED_PARSING = NO
 
 CLANG_OPTIONS          =
 
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1268,13 +1388,6 @@ CLANG_OPTIONS          =
 
 ALPHABETICAL_INDEX     = NO
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-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 a prefix (or a list of prefixes) that should be ignored
@@ -1375,7 +1488,7 @@ HTML_EXTRA_FILES       =
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
 # Minimum value: 0, maximum value: 359, default value: 220.
@@ -1411,6 +1524,17 @@ HTML_COLORSTYLE_GAMMA  = 80
 
 HTML_TIMESTAMP         = YES
 
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS = 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.
@@ -1434,13 +1558,14 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # 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 (see: http://developer.apple.com/tools/xcode/), 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
+# environment (see:
+# https://developer.apple.com/xcode/), 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.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1479,8 +1604,8 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
+# (see:
+# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1510,7 +1635,7 @@ CHM_FILE               = dali.chm
 HHC_LOCATION           =
 
 # 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).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1555,7 +1680,8 @@ QCH_FILE               = "Dali.qch"
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1563,8 +1689,8 @@ QHP_NAMESPACE          = "Dali"
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1572,30 +1698,30 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# 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.
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1672,6 +1798,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+@DOXYGEN_VERSION_LESS_1_9_1_BLOCKED@ HTML_FORMULA_FORMAT = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1681,7 +1818,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1692,8 +1829,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1705,7 +1848,7 @@ USE_MATHJAX            = NO
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility), NativeMML (i.e. MathML) and SVG.
 # The default value is: HTML-CSS.
@@ -1720,8 +1863,8 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1735,7 +1878,8 @@ MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1763,7 +1907,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = NO
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1782,7 +1926,8 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
+# Xapian (see:
+# https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1795,8 +1940,9 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1847,21 +1993,35 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD = 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.
@@ -1877,7 +2037,7 @@ COMPACT_LATEX          = NO
 # The default value is: a4.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
 # that should be included in the LaTeX output. The package can be specified just
@@ -1946,9 +2106,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1982,7 +2144,7 @@ LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1996,6 +2158,14 @@ LATEX_BIB_STYLE        = plain
 
 LATEX_TIMESTAMP        = NO
 
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -2035,9 +2205,9 @@ COMPACT_RTF            = NO
 
 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.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -2046,8 +2216,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -2133,6 +2303,13 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -2165,9 +2342,9 @@ DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://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.
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -2270,7 +2447,7 @@ INCLUDE_FILE_PATTERNS  =
 PREDEFINED             = DALI_CORE_API \
                          DALI_ADAPTOR_API \
                          DALI_TOOLKIT_API \
-                         DALI_SCENE_LOADER_API \
+                         DALI_SCENE3D_API \
                          DALI_INTERNAL \
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
@@ -2338,12 +2515,6 @@ EXTERNAL_GROUPS        = YES
 
 EXTERNAL_PAGES         = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-#PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
@@ -2357,15 +2528,6 @@ EXTERNAL_PAGES         = YES
 
 CLASS_DIAGRAMS         = YES
 
-# 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            =
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
@@ -2463,9 +2625,31 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+@DOXYGEN_VERSION_LESS_1_9_1_BLOCKED@ DOT_UML_DETAILS = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LIMIT_NUM_FIELDS   = 10
+@DOXYGEN_VERSION_LESS_1_9_1_BLOCKED@ DOT_WRAP_THRESHOLD = 17
 
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
@@ -2595,6 +2779,11 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      =
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE =
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
@@ -2653,9 +2842,11 @@ DOT_MULTI_TARGETS      = NO
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc and
+# plantuml temporary files.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
diff --git a/dali-scene-loader.manifest b/dali-physics-2d.manifest
similarity index 100%
rename from dali-scene-loader.manifest
rename to dali-physics-2d.manifest
diff --git a/dali-scene-loader.manifest-smack b/dali-physics-2d.manifest-smack
similarity index 100%
rename from dali-scene-loader.manifest-smack
rename to dali-physics-2d.manifest-smack
diff --git a/dali-physics-3d.manifest b/dali-physics-3d.manifest
new file mode 100644
index 0000000..a76fdba
--- /dev/null
+++ b/dali-physics-3d.manifest
@@ -0,0 +1,5 @@
+<manifest>
+	<request>
+		<domain name="_" />
+	</request>
+</manifest>
diff --git a/dali-physics-3d.manifest-smack b/dali-physics-3d.manifest-smack
new file mode 100644
index 0000000..08561d6
--- /dev/null
+++ b/dali-physics-3d.manifest-smack
@@ -0,0 +1,8 @@
+<manifest>
+	<assign>
+		<filesystem path="/usr/lib/*" label="_" />
+	</assign>
+	<request>
+		<domain name="dali"/>
+	</request>
+</manifest>
diff --git a/dali-physics/README.md b/dali-physics/README.md
new file mode 100644
index 0000000..a473a61
--- /dev/null
+++ b/dali-physics/README.md
@@ -0,0 +1,13 @@
+# Overview
+
+The physics library is a small frontend to Chipmunk or Bullet libraries. It
+provides a safe mechanism to initialize and access the physics world from the
+event thread, whilst running the integration step in the Update thread.
+
+A queueing mechanism is provided to execute native functions on the Update
+thread prior to running the integration step. (This enables DALi properties
+and physics properties (e.g. position or orientation) to be synced in the same frame)
+
+DALi actors that are mapped to physics bodies are automatically updated after
+the integration step.
+
diff --git a/dali-physics/dali-physics.h b/dali-physics/dali-physics.h
new file mode 100644
index 0000000..7e8135b
--- /dev/null
+++ b/dali-physics/dali-physics.h
@@ -0,0 +1,20 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-physics/public-api/physics-actor.h>
+#include <dali-physics/public-api/physics-adaptor.h>
diff --git a/dali-physics/integration-api/file.list b/dali-physics/integration-api/file.list
new file mode 100644
index 0000000..bc85da7
--- /dev/null
+++ b/dali-physics/integration-api/file.list
@@ -0,0 +1,11 @@
+set(physics_integration_api_dir "${physics_dir}/integration-api")
+
+set(physics_src_files ${physics_src_files}
+	${physics_integration_api_dir}/integ-physics-adaptor.cpp
+	${physics_integration_api_dir}/physics-world.cpp
+)
+
+set(physics_integration_api_header_files
+	${physics_integration_api_dir}/integ-physics-adaptor.h
+	${physics_integration_api_dir}/physics-world.h
+)
diff --git a/dali-physics/integration-api/integ-physics-adaptor.cpp b/dali-physics/integration-api/integ-physics-adaptor.cpp
new file mode 100644
index 0000000..cc26338
--- /dev/null
+++ b/dali-physics/integration-api/integ-physics-adaptor.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-physics/integration-api/integ-physics-adaptor.h>
+
+#include <dali-physics/internal/physics-adaptor-impl.h>
+#include <memory>
+
+namespace Dali::Toolkit::Physics::Integration
+{
+Integration::PhysicsWorld GetPhysicsWorld(PhysicsAdaptor adaptorHandle)
+{
+  std::unique_ptr<Internal::PhysicsWorld>& worldPtr = GetImplementation(adaptorHandle).GetPhysicsWorld();
+  return PhysicsWorld{worldPtr.get()};
+}
+
+} // namespace Dali::Toolkit::Physics::Integration
diff --git a/dali-physics/integration-api/integ-physics-adaptor.h b/dali-physics/integration-api/integ-physics-adaptor.h
new file mode 100644
index 0000000..469c056
--- /dev/null
+++ b/dali-physics/integration-api/integ-physics-adaptor.h
@@ -0,0 +1,27 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-physics/integration-api/physics-world.h>
+
+#include <dali-physics/public-api/physics-adaptor.h>
+
+namespace Dali::Toolkit::Physics::Integration
+{
+DALI_TOOLKIT_API Integration::PhysicsWorld GetPhysicsWorld(PhysicsAdaptor adaptorHandle);
+
+} // namespace Dali::Toolkit::Physics::Integration
diff --git a/dali-physics/integration-api/physics-world.cpp b/dali-physics/integration-api/physics-world.cpp
new file mode 100644
index 0000000..b17fa5c
--- /dev/null
+++ b/dali-physics/integration-api/physics-world.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-physics/integration-api/physics-world.h>
+#include <dali-physics/internal/physics-world-impl.h>
+#include <dali/public-api/common/dali-common.h>
+
+namespace Dali::Toolkit::Physics::Integration
+{
+PhysicsWorld::PhysicsWorld(Dali::Toolkit::Physics::Internal::PhysicsWorld* internalWorld)
+: impl(internalWorld)
+{
+}
+
+PhysicsWorld::~PhysicsWorld() = default;
+
+Dali::Toolkit::Physics::Internal::PhysicsWorld* PhysicsWorld::GetImpl()
+{
+  return impl;
+}
+
+void PhysicsWorld::Lock()
+{
+  DALI_ASSERT_ALWAYS(impl && "Physics world proxy has null impl");
+  impl->Lock();
+}
+
+void PhysicsWorld::Unlock()
+{
+  DALI_ASSERT_ALWAYS(impl && "Physics world proxy has null impl");
+  impl->Unlock();
+}
+
+Dali::Any PhysicsWorld::GetNative()
+{
+  DALI_ASSERT_ALWAYS(impl && "Physics world proxy has null impl");
+  return impl->GetNative();
+}
+
+Dali::Any PhysicsWorld::HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera)
+
+{
+  DALI_ASSERT_ALWAYS(impl && "Physics world proxy has null impl");
+  return impl->HitTest(rayFromWorld, rayToWorld, nativeFilter, localPivot, distanceFromCamera);
+}
+
+} // namespace Dali::Toolkit::Physics::Integration
diff --git a/dali-physics/integration-api/physics-world.h b/dali-physics/integration-api/physics-world.h
new file mode 100644
index 0000000..bf56e40
--- /dev/null
+++ b/dali-physics/integration-api/physics-world.h
@@ -0,0 +1,102 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/object/any.h>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class PhysicsWorld;
+}
+
+namespace Dali::Toolkit::Physics::Integration
+{
+/** Proxy to the physics world impl.
+ *
+ * Does NOT own physics world.
+ * Copyable. Doesn't track lock.
+ */
+class DALI_TOOLKIT_API PhysicsWorld
+{
+public:
+  /**
+   * Constructor
+   * @param[in] impl The physics world implementation class.
+   */
+  PhysicsWorld(Dali::Toolkit::Physics::Internal::PhysicsWorld* impl);
+
+  /**
+   * Destructor.
+   * Does not destroy the physic world.
+   */
+  ~PhysicsWorld();
+
+  /**
+   * Copy Constructor
+   */
+  PhysicsWorld(const PhysicsWorld& rhs) = default;
+
+  /**
+   * Assignment operator
+   */
+  PhysicsWorld& operator=(const PhysicsWorld& rhs) = default;
+
+  /**
+   * Lock the physics world. The caller MUST unlock it afterwards, otherwise
+   * the physics integration step will block, and DALi update thread will be locked.
+   */
+  void Lock();
+
+  /**
+   * Unlock the physics world.
+   */
+  void Unlock();
+
+  /**
+   * Get a handle to the native physics world / space
+   *
+   * This API should be wrapped with Lock/Unlock in any interop implementation
+   * @return a pointer to the native world.
+   */
+  Dali::Any GetNative();
+
+  /**
+   * Hit test the physics world.
+   *
+   * This API should be wrapped with Lock/Unlock in any interop implementation
+   * @param[in] rayFromWorld The origin in physics world space
+   * @param[in] rayToWorld A point along the direction on the far side of the physics world
+   * @param[in] nativeFilter a native body / shape filter
+   * @param[out] localPivot The hit point local to the body
+   * @param[out] distanceFromCamera The distance of the pick point from the camera
+   * @return Either a pointer to the native body, or an empty value.
+   */
+  Dali::Any HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera);
+
+  /**
+   * Get the implementation pointer.
+   *
+   * @return the implementation pointer.
+   */
+  Dali::Toolkit::Physics::Internal::PhysicsWorld* GetImpl();
+
+private:
+  Dali::Toolkit::Physics::Internal::PhysicsWorld* impl;
+};
+
+} // namespace Dali::Toolkit::Physics::Integration
diff --git a/dali-physics/internal/bullet-impl/bullet-physics-actor-impl.cpp b/dali-physics/internal/bullet-impl/bullet-physics-actor-impl.cpp
new file mode 100644
index 0000000..eec3929
--- /dev/null
+++ b/dali-physics/internal/bullet-impl/bullet-physics-actor-impl.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/physics-actor-impl.h>
+
+#include <btBulletDynamicsCommon.h>
+#include <dali-physics/internal/physics-adaptor-impl.h>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+namespace
+{
+inline btVector3 fromVec3(Dali::Vector3 vec3)
+{
+  return btVector3(vec3.x, vec3.y, vec3.z);
+}
+inline Dali::Vector3 toVec3(btVector3 vec3)
+{
+  return Dali::Vector3(vec3.x(), vec3.y(), vec3.z());
+}
+
+inline btQuaternion fromQuat(Dali::Quaternion q)
+{
+  return btQuaternion(q.mVector.x, q.mVector.y, q.mVector.z, q.mVector.w);
+}
+inline Dali::Quaternion toQuat(btQuaternion q)
+{
+  return Dali::Quaternion(q.w(), q.x(), q.y(), q.z());
+}
+
+} //Anonymous namespace
+
+PhysicsActorPtr PhysicsActor::New(Dali::Actor actor, Dali::Any body, Dali::Toolkit::Physics::Internal::PhysicsAdaptor& adaptor)
+{
+  PhysicsActorPtr physicsActor(new Internal::PhysicsActor(actor, body, adaptor));
+  physicsActor->Initialize();
+  return physicsActor;
+}
+
+PhysicsActor::PhysicsActor(Dali::Actor actor, Dali::Any body, PhysicsAdaptor& adaptor)
+: mAdaptor(adaptor),
+  mActorId(actor.GetProperty<int>(Dali::Actor::Property::ID)),
+  mBody(body)
+{
+}
+
+PhysicsActor::~PhysicsActor() = default;
+
+void PhysicsActor::Initialize(void)
+{
+}
+
+void PhysicsActor::AsyncSetPhysicsPosition(Dali::Vector3 actorPosition)
+{
+  // Queue task
+  btRigidBody* body = mBody.Get<btRigidBody*>();
+  auto         pos  = fromVec3(mAdaptor.TranslateToPhysicsSpace(actorPosition));
+  mAdaptor.Queue([body, pos] { body->getWorldTransform().setOrigin(pos); });
+}
+
+void PhysicsActor::AsyncSetPhysicsRotation(Dali::Quaternion rotation)
+{
+  // Queue task
+  btRigidBody* body = mBody.Get<btRigidBody*>();
+  auto         q    = fromQuat(mAdaptor.TranslateToPhysicsSpace(rotation));
+  mAdaptor.Queue([body, q]() { body->getWorldTransform().setRotation(q); });
+}
+
+Dali::Vector3 PhysicsActor::GetPhysicsPosition() const
+{
+  btRigidBody* body = mBody.Get<btRigidBody*>();
+  return toVec3(body->getWorldTransform().getOrigin());
+}
+
+Dali::Quaternion PhysicsActor::GetPhysicsRotation() const
+{
+  btRigidBody* body = mBody.Get<btRigidBody*>();
+  return toQuat(body->getWorldTransform().getRotation());
+}
+
+Dali::Vector3 PhysicsActor::GetActorPosition() const
+{
+  btRigidBody*       body      = mBody.Get<btRigidBody*>();
+  const btTransform& transform = body->getWorldTransform();
+  const btVector3&   position  = transform.getOrigin();
+  return mAdaptor.TranslateFromPhysicsSpace(Vector3(position.getX(), position.getY(), position.getZ()));
+}
+
+Dali::Quaternion PhysicsActor::GetActorRotation() const
+{
+  btRigidBody*       body      = mBody.Get<btRigidBody*>();
+  const btTransform& transform = body->getWorldTransform();
+  btQuaternion       q         = transform.getRotation();
+  return mAdaptor.TranslateFromPhysicsSpace(Quaternion(q.w(), q.x(), q.y(), q.z()));
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/bullet-impl/bullet-physics-adaptor-impl.cpp b/dali-physics/internal/bullet-impl/bullet-physics-adaptor-impl.cpp
new file mode 100644
index 0000000..9e36059
--- /dev/null
+++ b/dali-physics/internal/bullet-impl/bullet-physics-adaptor-impl.cpp
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/bullet-impl/bullet-physics-adaptor-impl.h>
+
+// External Headers
+#include <btBulletDynamicsCommon.h>
+#include <utility>
+
+// Internal Headers
+#include <dali-physics/internal/bullet-impl/bullet-physics-world-impl.h>
+#include <dali/dali.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/drawable-actor.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, false, "LOG_PHYSICS");
+#endif
+
+} // namespace
+
+namespace Dali::Toolkit::Physics::Internal
+{
+PhysicsAdaptorPtr CreateNewPhysicsAdaptor(const Dali::Matrix& transform, Uint16Pair worldSize)
+{
+  PhysicsAdaptorPtr adaptor(new BulletPhysicsAdaptor());
+  adaptor->Initialize(transform, worldSize);
+  return adaptor;
+}
+
+BulletPhysicsAdaptor::BulletPhysicsAdaptor()
+: PhysicsAdaptor()
+{
+}
+
+BulletPhysicsAdaptor::~BulletPhysicsAdaptor()
+{
+  // @todo Ensure physics bodies don't leak
+}
+
+void BulletPhysicsAdaptor::OnInitialize(const Dali::Matrix& transform, Uint16Pair worldSize)
+{
+  mTransform        = transform;
+  mInverseTransform = transform;
+  mInverseTransform.Invert();
+  mSize = worldSize;
+
+  mPhysicsWorld = BulletPhysicsWorld::New(mRootActor,
+                                          Dali::MakeCallback(mSlotDelegate.GetSlot(),
+                                                             &PhysicsAdaptor::OnUpdateActors));
+}
+
+Layer BulletPhysicsAdaptor::CreateDebugLayer(Dali::Window window)
+{
+  Layer debugLayer;
+
+  auto renderTaskList = window.GetRenderTaskList();
+  auto renderTask     = renderTaskList.GetTask(0);
+  auto windowSize     = window.GetSize();
+
+  debugLayer                                 = Layer::New();
+  debugLayer[Actor::Property::NAME]          = "PhysicsDebugLayer";
+  debugLayer[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+  debugLayer[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+
+  Constraint positionConstraint = Constraint::New<Vector3>(debugLayer, Actor::Property::POSITION, EqualToConstraint());
+  positionConstraint.AddSource(Source(mRootActor, Actor::Property::POSITION));
+  positionConstraint.Apply();
+  Constraint sizeConstraint = Constraint::New<Vector2>(debugLayer, Actor::Property::SIZE, EqualToConstraint());
+  sizeConstraint.AddSource(Source(mRootActor, Actor::Property::SIZE));
+  sizeConstraint.Apply();
+
+  mDebugRenderer                              = PhysicsDebugRenderer::New(windowSize.GetWidth(), windowSize.GetHeight(), renderTask.GetCameraActor(), this);
+  mDebugActor                                 = DrawableActor::New(*(mDebugRenderer->GetCallback().get()));
+  mDebugActor[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+  mDebugActor[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+
+  Constraint sizeConstraint2 = Constraint::New<Vector2>(mDebugActor, Actor::Property::SIZE, EqualToConstraint());
+  sizeConstraint2.AddSource(ParentSource(Actor::Property::SIZE));
+  sizeConstraint2.Apply();
+
+  debugLayer.Add(mDebugActor);
+
+  auto bulletWorld = mPhysicsWorld->GetNative().Get<btDiscreteDynamicsWorld*>();
+
+  bulletWorld->setDebugDrawer(mDebugRenderer.get());
+  mDebugRenderer->setDebugMode(btIDebugDraw::DBG_DrawWireframe |
+                               btIDebugDraw::DBG_DrawContactPoints |
+                               btIDebugDraw::DBG_DrawNormals);
+
+  window.Add(debugLayer);
+  return debugLayer;
+}
+
+void BulletPhysicsAdaptor::SetTransformAndSize(const Dali::Matrix& transform, Uint16Pair worldSize)
+{
+  mTransform        = transform;
+  mInverseTransform = transform;
+  mInverseTransform.Invert();
+  mSize = worldSize;
+
+  GetRootActor()[Actor::Property::SIZE] = Vector3(worldSize.GetWidth(), worldSize.GetHeight(), 0);
+
+  if(mDebugRenderer)
+  {
+    Actor layer                  = mDebugActor.GetParent();
+    layer[Actor::Property::SIZE] = Vector3(worldSize);
+    mDebugRenderer->UpdateWindowSize(worldSize);
+  }
+}
+
+PhysicsActorPtr BulletPhysicsAdaptor::AddActorBody(Dali::Actor actor, Dali::Any body)
+{
+  uint32_t     id     = static_cast<uint32_t>(actor.GetProperty<int>(Actor::Property::ID));
+  btRigidBody* btBody = body.Get<btRigidBody*>();
+
+  btBody->setUserIndex(id);
+  mPhysicsActors.insert(std::make_pair(id, PhysicsActor::New(actor, body, *this)));
+  actor[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+  actor[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+  mRootActor.Add(actor);
+  return mPhysicsActors.at(id);
+}
+
+void BulletPhysicsAdaptor::RemoveActorBody(PhysicsActor& physicsActor)
+{
+  auto iter = mPhysicsActors.find(physicsActor.GetId());
+  if(iter != mPhysicsActors.end())
+  {
+    mPhysicsActors.erase(iter);
+  }
+  Dali::Actor actor = mRootActor.FindChildById(physicsActor.GetId());
+  if(actor)
+  {
+    actor.Unparent();
+  }
+
+  auto         body   = physicsActor.GetBody();
+  btRigidBody* btBody = body.Get<btRigidBody*>();
+  if(btBody)
+  {
+    btBody->setUserIndex(-1);
+  }
+}
+
+PhysicsActorPtr BulletPhysicsAdaptor::GetPhysicsActor(Dali::Any body) const
+{
+  btRigidBody* btBody = body.Get<btRigidBody*>();
+  if(btBody)
+  {
+    int  id   = btBody->getUserIndex();
+    auto iter = mPhysicsActors.find(id);
+    if(iter != mPhysicsActors.end())
+    {
+      return iter->second;
+    }
+  }
+  DALI_LOG_ERROR("Body not found in physics actors");
+  return nullptr;
+}
+
+// Convert a position from root actor local space to physics space
+Vector3 BulletPhysicsAdaptor::TranslateToPhysicsSpace(Vector3 vector) const
+{
+  Vector4 position = mTransform * Vector4(vector.x, vector.y, vector.z, 1.0f);
+  return Vector3(position);
+}
+
+// Convert a position from physics space to root actor local space
+Vector3 BulletPhysicsAdaptor::TranslateFromPhysicsSpace(Vector3 vector) const
+{
+  Vector4 position = mInverseTransform * Vector4(vector.x, vector.y, vector.z, 1.0f);
+  return Vector3(position);
+}
+
+Quaternion BulletPhysicsAdaptor::TranslateToPhysicsSpace(Quaternion orientation) const
+{
+  // Naive check for speed. Should pass scale in constructor/transform setter
+
+  if(std::signbit(mTransform.AsFloat()[0])) // mirrored in x
+  {
+    return Quaternion(orientation.mVector.w, orientation.mVector.x, -orientation.mVector.y, -orientation.mVector.z);
+  }
+  else if(std::signbit(mTransform.AsFloat()[5])) // mirrored in y
+  {
+    return Quaternion(orientation.mVector.w, -orientation.mVector.x, orientation.mVector.y, -orientation.mVector.z);
+  }
+  else if(std::signbit(mTransform.AsFloat()[10])) // mirrored in z
+  {
+    return Quaternion(orientation.mVector.w, -orientation.mVector.x, -orientation.mVector.y, orientation.mVector.z);
+  }
+
+  // No mirror, so rotation is invariant.
+  return orientation;
+}
+
+Quaternion BulletPhysicsAdaptor::TranslateFromPhysicsSpace(Quaternion orientation) const
+{
+  // Mirroring conversion is identical in both transforms
+  return TranslateToPhysicsSpace(orientation);
+}
+
+// Convert a vector from dali space to physics space
+Vector3 BulletPhysicsAdaptor::ConvertVectorToPhysicsSpace(Vector3 vector) const
+{
+  Vector4 otherVector(mTransform * Vector4(vector.x, vector.y, vector.z, 0.0f));
+  return Vector3(otherVector);
+}
+
+// Convert a vector from physics space to root actor local space
+Vector3 BulletPhysicsAdaptor::ConvertVectorFromPhysicsSpace(Vector3 vector) const
+{
+  Vector4 otherVector(mInverseTransform * Vector4(vector.x, vector.y, vector.z, 0.0f));
+  return Vector3(otherVector);
+}
+
+void BulletPhysicsAdaptor::BuildPickingRay(Vector3 origin, Vector3 direction, Dali::Vector3& rayFromWorld, Dali::Vector3& rayToWorld)
+{
+  rayFromWorld = TranslateToPhysicsSpace(origin);
+  rayToWorld   = TranslateToPhysicsSpace(origin + direction * 10000.0f);
+}
+
+Vector3 BulletPhysicsAdaptor::ProjectPoint(Vector3 origin, Vector3 direction, float distance)
+{
+  Vector3 rayFromWorld = TranslateToPhysicsSpace(origin);
+  Vector3 rayToWorld   = TranslateToPhysicsSpace(origin + direction * 10000.0f);
+
+  Vector3 dir = rayToWorld - rayFromWorld;
+  dir.Normalize();
+  dir *= distance;
+  return (rayFromWorld + dir);
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/bullet-impl/bullet-physics-adaptor-impl.h b/dali-physics/internal/bullet-impl/bullet-physics-adaptor-impl.h
new file mode 100644
index 0000000..3c9001a
--- /dev/null
+++ b/dali-physics/internal/bullet-impl/bullet-physics-adaptor-impl.h
@@ -0,0 +1,121 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or adaptoried.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES
+#include <dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.h>
+#include <dali-physics/internal/physics-adaptor-impl.h>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class PhysicsDebugRenderer;
+
+class BulletPhysicsAdaptor : public PhysicsAdaptor
+{
+public:
+  BulletPhysicsAdaptor();
+
+  /**
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~BulletPhysicsAdaptor() override;
+
+  // Remove copy constructor and copy assignment
+  BulletPhysicsAdaptor(const PhysicsAdaptor& handle) = delete;
+  BulletPhysicsAdaptor& operator=(const PhysicsAdaptor& handle) = delete;
+
+  static PhysicsAdaptorPtr New(const Dali::Matrix& transform, Uint16Pair size);
+
+  /**
+   * 2nd stage initialization
+   */
+  void Initialize(const Dali::Matrix& transform, Uint16Pair size);
+  void OnInitialize(const Dali::Matrix& transform, Uint16Pair size) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::CreateDebugLayer
+   */
+  Dali::Layer CreateDebugLayer(Dali::Window window) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetTransformAndSize
+   */
+  void SetTransformAndSize(const Dali::Matrix& transform, Uint16Pair size) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateToPhysicsSpace
+   */
+  Dali::Vector3 TranslateToPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateToPhysicsSpace
+   */
+  Dali::Quaternion TranslateToPhysicsSpace(Dali::Quaternion rotation) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateFromPhysicsSpace
+   */
+  Dali::Vector3 TranslateFromPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateFromPhysicsSpace
+   */
+  Dali::Quaternion TranslateFromPhysicsSpace(Quaternion rotation) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ConvertVectorToPhysicsSpace
+   */
+  Dali::Vector3 ConvertVectorToPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ConvertVectorFromPhysicsSpace
+   */
+  Dali::Vector3 ConvertVectorFromPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::AddActorBody
+   */
+  PhysicsActorPtr AddActorBody(Dali::Actor actor, Dali::Any body) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::RemoveActorBody
+   */
+  void RemoveActorBody(PhysicsActor& physicsActor) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetPhysicsActor
+   */
+  PhysicsActorPtr GetPhysicsActor(Dali::Any body) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::BuildPickingRay
+   */
+  void BuildPickingRay(Dali::Vector3 origin, Dali::Vector3 direction, Dali::Vector3& rayFromWorld, Dali::Vector3& rayToWorld) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ProjectPoint
+   */
+  Dali::Vector3 ProjectPoint(Dali::Vector3 origin, Dali::Vector3 direction, float distance) override;
+
+private:
+  Actor                                 mDebugActor;
+  std::unique_ptr<PhysicsDebugRenderer> mDebugRenderer;
+};
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.cpp b/dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.cpp
new file mode 100644
index 0000000..f7b7db1
--- /dev/null
+++ b/dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.cpp
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class header
+#include <dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.h>
+
+// External Includes
+#include <dali/dali.h>
+
+// Internal Includes
+#include <dali-physics/internal/physics-adaptor-impl.h>
+
+using Dali::Degree;
+using Dali::Matrix;
+using Dali::Quaternion;
+using Dali::Radian;
+using Dali::Vector3;
+using Dali::Vector4;
+
+namespace
+{
+GLuint LoadShader(GLenum shaderType, const char* shaderSource)
+{
+  GLuint shader = glCreateShader(shaderType);
+  if(shader != 0)
+  {
+    glShaderSource(shader, 1, &shaderSource, NULL);
+    glCompileShader(shader);
+    GLint compiled = 0;
+    glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+    if(compiled != GL_TRUE)
+    {
+      GLint infoLen = 0;
+      glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
+
+      if(infoLen > 0)
+      {
+        std::vector<char> logBuffer;
+        logBuffer.resize(infoLen + 1);
+        glGetShaderInfoLog(shader, infoLen, NULL, &logBuffer[0]);
+        fprintf(stderr, "%s\n", &logBuffer[0]);
+        fflush(stderr);
+
+        glDeleteShader(shader);
+        shader = 0;
+      }
+    }
+  }
+  return shader;
+}
+
+GLuint CreateProgram(const char* vertexSource, const char* fragmentSource)
+{
+  GLuint vertexShader = LoadShader(GL_VERTEX_SHADER, vertexSource);
+  if(!vertexShader)
+  {
+    return 0;
+  }
+  GLuint fragmentShader = LoadShader(GL_FRAGMENT_SHADER, fragmentSource);
+  if(!fragmentShader)
+  {
+    return 0;
+  }
+  GLuint program = glCreateProgram();
+  if(program)
+  {
+    glAttachShader(program, vertexShader);
+    glAttachShader(program, fragmentShader);
+    glLinkProgram(program);
+    GLint linkStatus = GL_FALSE;
+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
+    if(linkStatus != GL_TRUE)
+    {
+      GLint bufLength = 0;
+      glGetProgramiv(program, GL_INFO_LOG_LENGTH, &bufLength);
+      if(bufLength)
+      {
+        std::vector<char> logBuffer;
+        logBuffer.resize(bufLength + 1);
+        glGetProgramInfoLog(program, bufLength, NULL, &logBuffer[0]);
+        fprintf(stderr, "%s\n", &logBuffer[0]);
+        fflush(stderr);
+      }
+      glDeleteProgram(program);
+      program = 0;
+    }
+  }
+  return program;
+}
+} // namespace
+
+namespace Dali::Toolkit::Physics::Internal
+{
+std::unique_ptr<PhysicsDebugRenderer> PhysicsDebugRenderer::New(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor)
+{
+  auto renderer             = std::make_unique<PhysicsDebugRenderer>(width, height, camera, adaptor);
+  renderer->mRenderCallback = Dali::RenderCallback::New<PhysicsDebugRenderer>(renderer.get(), &PhysicsDebugRenderer::OnRender);
+  return renderer;
+}
+
+PhysicsDebugRenderer::PhysicsDebugRenderer(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor)
+: mCamera(camera),
+  mWidth(width),
+  mHeight(height),
+  mAdaptor(*adaptor),
+  mVertexLocation(-1),
+  mVertexColourLocation(-1),
+  mProjectionLocation(-1),
+  mModelViewLocation(-1),
+  mBufferId(0u),
+  mProgramId(0u)
+{
+}
+
+bool PhysicsDebugRenderer::OnRender(const Dali::RenderCallbackInput& input)
+{
+  if(mState == State::INIT)
+  {
+    Setup();
+    mState = State::RENDER;
+  }
+  glViewport(0, 0, mWidth, mHeight);
+
+  RenderLines(input);
+
+  return false;
+}
+
+// Run on first invocation of callback
+void PhysicsDebugRenderer::Setup()
+{
+  PrepareShader();
+  mVertexLocation       = glGetAttribLocation(mProgramId, "vertexPosition");
+  mVertexColourLocation = glGetAttribLocation(mProgramId, "vertexColour");
+  mProjectionLocation   = glGetUniformLocation(mProgramId, "projection");
+  mModelViewLocation    = glGetUniformLocation(mProgramId, "modelView");
+
+  glEnable(GL_DEPTH_TEST);
+  glViewport(0, 0, mWidth, mHeight);
+
+  glGenBuffers(1, &mBufferId);
+}
+
+void PhysicsDebugRenderer::UpdateWindowSize(Dali::Vector2 size)
+{
+  mWidth  = size.width;
+  mHeight = size.height;
+}
+
+void PhysicsDebugRenderer::PrepareShader()
+{
+  static const char glVertexShader[] =
+    "attribute vec4 vertexPosition;\n"
+    "attribute vec3 vertexColour;\n"
+    "varying vec3 fragColour;\n"
+    "uniform mat4 projection;\n"
+    "uniform mat4 modelView;\n"
+    "void main()\n"
+    "{\n"
+    "    gl_Position = projection * modelView * vertexPosition;\n"
+    "    fragColour = vertexColour;\n"
+    "}\n";
+
+  static const char glFragmentShader[] =
+    "precision mediump float;\n"
+    "varying vec3 fragColour;\n"
+    "void main()\n"
+    "{\n"
+    "    gl_FragColor = vec4(fragColour, 1.0);\n"
+    "}\n";
+
+  mProgramId = CreateProgram(glVertexShader, glFragmentShader);
+}
+
+void PhysicsDebugRenderer::RenderLines(const Dali::RenderCallbackInput& input)
+{
+  mModelViewMatrix.SetIdentity();
+  mProjectionMatrix = input.projection;
+
+  Matrix::Multiply(mModelViewMatrix, mModelViewMatrix, input.view);
+  glUseProgram(mProgramId);
+
+  // In theory, input.clippingBox should tell us the actor position in clip-space.
+  // But, it appears to be bugged.
+
+  glBindBuffer(GL_ARRAY_BUFFER, mBufferId);
+  glBufferData(GL_ARRAY_BUFFER, GLsizeiptr(mLines.size() * sizeof(VertexLine)), &mLines[0], GL_STATIC_DRAW);
+
+  glVertexAttribPointer(mVertexLocation, 3, GL_FLOAT, GL_FALSE, 24, 0);
+  glEnableVertexAttribArray(mVertexLocation);
+  glVertexAttribPointer(mVertexColourLocation, 3, GL_FLOAT, GL_FALSE, 24, reinterpret_cast<const void*>(12));
+  glEnableVertexAttribArray(mVertexColourLocation);
+  glUniformMatrix4fv(mProjectionLocation, 1, GL_FALSE, mProjectionMatrix.AsFloat());
+  glUniformMatrix4fv(mModelViewLocation, 1, GL_FALSE, mModelViewMatrix.AsFloat());
+
+  glDrawArrays(GL_LINES, 0, mLines.size());
+  mLines.clear();
+}
+
+void PhysicsDebugRenderer::drawLine(const btVector3& from, const btVector3& to, const btVector3& color)
+{
+  mLines.push_back(VertexLine{mAdaptor.TranslateFromPhysicsSpace(Vector3(from.x(), from.y(), from.z())),
+                              Vector3(color.x(), color.y(), color.z())});
+  mLines.push_back(VertexLine{mAdaptor.TranslateFromPhysicsSpace(Vector3(to.x(), to.y(), to.z())), Vector3(color.x(), color.y(), color.z())});
+}
+
+void PhysicsDebugRenderer::drawLine(const btVector3& from, const btVector3& to, const btVector3& fromColor, const btVector3& toColor)
+{
+  mLines.push_back(VertexLine{mAdaptor.TranslateFromPhysicsSpace(Vector3(from.x(), from.y(), from.z())), Vector3(fromColor.x(), fromColor.y(), fromColor.z())});
+  mLines.push_back(VertexLine{mAdaptor.TranslateFromPhysicsSpace(Vector3(to.x(), to.y(), to.z())), Vector3(toColor.x(), toColor.y(), toColor.z())});
+}
+
+void PhysicsDebugRenderer::drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color)
+{
+}
+
+void PhysicsDebugRenderer::reportErrorWarning(const char* warningString)
+{
+}
+
+void PhysicsDebugRenderer::draw3dText(const btVector3& location, const char* textString)
+{
+}
+
+void PhysicsDebugRenderer::setDebugMode(int debugMode)
+{
+}
+
+int PhysicsDebugRenderer::getDebugMode() const
+{
+  return true;
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.h b/dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.h
new file mode 100644
index 0000000..5c15601
--- /dev/null
+++ b/dali-physics/internal/bullet-impl/bullet-physics-debug-renderer.h
@@ -0,0 +1,107 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// External includes
+#include <GLES3/gl3.h>
+#include <LinearMath/btIDebugDraw.h>
+#include <dali/dali.h>
+
+using Dali::Actor;
+using Dali::CameraActor;
+using Dali::Geometry;
+using Dali::Renderer;
+using Dali::Shader;
+using Dali::TextureSet;
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class PhysicsAdaptor;
+
+class PhysicsDebugRenderer : public btIDebugDraw
+{
+public:
+  // Creates and initializes a new renderer
+  static std::unique_ptr<PhysicsDebugRenderer> New(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor);
+
+  /**
+   * Get the callback (for actor creation)
+   */
+  std::unique_ptr<Dali::RenderCallback>& GetCallback()
+  {
+    return mRenderCallback;
+  }
+
+  void UpdateWindowSize(Dali::Vector2 size);
+
+  /**
+   * Constructor.
+   * @param[in] width Width of the renderer - viewport
+   * @param[in] height Height of the renderer - viewport
+   */
+  PhysicsDebugRenderer(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor);
+
+public: // Inherited from btIDebugDraw
+  // Assume this is called during FrameCallback (i.e. in update manager, rather than during render...)
+  // Generate stack of lines... render, then clear stack.
+  void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) override;
+  void drawLine(const btVector3& from, const btVector3& to, const btVector3& fromColor, const btVector3& toColor) override;
+  void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color) override;
+  void reportErrorWarning(const char* warningString) override;
+  void draw3dText(const btVector3& location, const char* textString) override;
+  void setDebugMode(int debugMode) override;
+  int  getDebugMode() const override;
+
+private:
+  bool OnRender(const Dali::RenderCallbackInput& input);
+  void Setup();
+  void PrepareShader();
+  void RenderLines(const Dali::RenderCallbackInput& input);
+
+private:
+  CameraActor                           mCamera;
+  Renderer                              mDebugRenderer;
+  std::unique_ptr<Dali::RenderCallback> mRenderCallback;
+
+  enum class State
+  {
+    INIT,
+    RENDER
+  } mState{State::INIT};
+
+  struct VertexLine
+  {
+    Dali::Vector3 position;
+    Dali::Vector3 color;
+  };
+  std::vector<VertexLine> mLines;
+
+  Dali::Matrix    mModelViewMatrix;
+  Dali::Matrix    mViewMatrix;
+  Dali::Matrix    mProjectionMatrix;
+  int             mWidth;
+  int             mHeight;
+  PhysicsAdaptor& mAdaptor;
+  GLint           mVertexLocation;
+  GLint           mVertexColourLocation;
+  GLint           mProjectionLocation;
+  GLint           mModelViewLocation;
+  GLuint          mBufferId;
+  GLuint          mProgramId;
+};
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/bullet-impl/bullet-physics-world-impl.cpp b/dali-physics/internal/bullet-impl/bullet-physics-world-impl.cpp
new file mode 100644
index 0000000..63c000d
--- /dev/null
+++ b/dali-physics/internal/bullet-impl/bullet-physics-world-impl.cpp
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/bullet-impl/bullet-physics-world-impl.h>
+
+// External Headers
+#include <BulletCollision/NarrowPhaseCollision/btRaycastCallback.h>
+#include <btBulletCollisionCommon.h>
+#include <memory>
+
+// Internal Headers
+#include <dali/dali.h>
+#include <dali/devel-api/common/stage-devel.h>
+#include <dali/devel-api/update/frame-callback-interface.h>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+std::unique_ptr<PhysicsWorld> BulletPhysicsWorld::New(Dali::Actor rootActor, Dali::CallbackBase* updateCallback)
+{
+  std::unique_ptr<BulletPhysicsWorld> world = std::make_unique<BulletPhysicsWorld>(rootActor, updateCallback);
+  world->Initialize();
+  return world;
+}
+
+BulletPhysicsWorld::BulletPhysicsWorld(Dali::Actor rootActor, Dali::CallbackBase* updateCallback)
+: PhysicsWorld(rootActor, updateCallback)
+{
+}
+
+void BulletPhysicsWorld::OnInitialize(/*void* dynamicsWorld*/)
+{
+  // @todo Should enable developer to supply their own created DynamicsWorld.
+
+  mCollisionConfiguration = new btDefaultCollisionConfiguration();
+  mDispatcher             = new btCollisionDispatcher(mCollisionConfiguration);
+  mBroadphase             = new btDbvtBroadphase();
+  mSolver                 = new btSequentialImpulseConstraintSolver;
+  mDynamicsWorld          = new btDiscreteDynamicsWorld(mDispatcher, mBroadphase, mSolver, mCollisionConfiguration);
+}
+
+BulletPhysicsWorld::~BulletPhysicsWorld()
+{
+  Lock();
+
+  if(mDynamicsWorld)
+  {
+    int i;
+    for(i = mDynamicsWorld->getNumConstraints() - 1; i >= 0; i--)
+    {
+      mDynamicsWorld->removeConstraint(mDynamicsWorld->getConstraint(i));
+    }
+    for(i = mDynamicsWorld->getNumCollisionObjects() - 1; i >= 0; i--)
+    {
+      btCollisionObject* obj  = mDynamicsWorld->getCollisionObjectArray()[i];
+      btRigidBody*       body = btRigidBody::upcast(obj);
+      if(body && body->getMotionState())
+      {
+        delete body->getMotionState();
+      }
+      mDynamicsWorld->removeCollisionObject(obj);
+      delete obj;
+    }
+  }
+
+  // @todo Should clear down known collision shapes
+
+  delete mDynamicsWorld;
+  delete mSolver;
+  delete mBroadphase;
+  delete mDispatcher;
+  delete mCollisionConfiguration;
+
+  Unlock();
+}
+
+Dali::Any BulletPhysicsWorld::GetNative()
+{
+  return mDynamicsWorld;
+}
+
+void BulletPhysicsWorld::Integrate(float timestep)
+{
+  if(mPhysicsIntegrateState == Physics::PhysicsAdaptor::IntegrationState::ON)
+  {
+    mDynamicsWorld->stepSimulation(timestep);
+  }
+  if(mDynamicsWorld->getDebugDrawer() && mPhysicsDebugState == Physics::PhysicsAdaptor::DebugState::ON)
+  {
+    mDynamicsWorld->debugDrawWorld();
+  }
+}
+
+inline btVector3 ConvertVector(Dali::Vector3 vector)
+{
+  return btVector3(vector.x, vector.y, vector.z);
+}
+
+Dali::Any BulletPhysicsWorld::HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera)
+{
+  btRigidBody* hitBody{nullptr};
+
+  btVector3                                  origin = ConvertVector(rayFromWorld);
+  btVector3                                  end    = ConvertVector(rayToWorld);
+  btCollisionWorld::ClosestRayResultCallback rayResultCallback(origin, end);
+  rayResultCallback.m_flags |= btTriangleRaycastCallback::kF_UseGjkConvexCastRaytest;
+
+  mDynamicsWorld->rayTest(origin, end, rayResultCallback);
+  if(rayResultCallback.hasHit())
+  {
+    auto         pickPos = rayResultCallback.m_hitPointWorld;
+    btRigidBody* body    = (btRigidBody*)btRigidBody::upcast(rayResultCallback.m_collisionObject);
+    if(body)
+    {
+      if(!(body->isStaticObject() || body->isKinematicObject()))
+      {
+        hitBody            = body; // Found a dynamic body.
+        distanceFromCamera = (pickPos - origin).length();
+
+        btVector3 pivot = body->getCenterOfMassTransform().inverse() * pickPos;
+        localPivot.x    = pivot.x();
+        localPivot.y    = pivot.y();
+        localPivot.z    = pivot.z();
+      }
+    }
+  }
+  Dali::Any bodyPtr;
+  if(hitBody)
+  {
+    bodyPtr = hitBody;
+  }
+
+  return bodyPtr;
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/bullet-impl/bullet-physics-world-impl.h b/dali-physics/internal/bullet-impl/bullet-physics-world-impl.h
new file mode 100644
index 0000000..5f9f193
--- /dev/null
+++ b/dali-physics/internal/bullet-impl/bullet-physics-world-impl.h
@@ -0,0 +1,68 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali/dali.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/devel-api/update/frame-callback-interface.h>
+#include <dali/devel-api/update/update-proxy.h>
+
+#include <dali-physics/internal/physics-world-impl.h>
+#include <dali-physics/public-api/physics-adaptor.h>
+
+#include <btBulletDynamicsCommon.h>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class PhysicsWorld;
+class FrameCallback;
+
+class BulletPhysicsWorld : public PhysicsWorld
+{
+public:
+  static std::unique_ptr<PhysicsWorld> New(Dali::Actor rootActor, Dali::CallbackBase* updateCallback);
+
+  BulletPhysicsWorld(Dali::Actor rootActor, Dali::CallbackBase* updateCallback);
+  ~BulletPhysicsWorld();
+
+  void OnInitialize(/*void* dynamicsWorld*/) override;
+
+  Dali::Any GetNative() override;
+
+  /**
+   * Hit test the physics world and return the nearest body.
+   *
+   * @param[in] rayFromWorld The origin in physics world space
+   * @param[in] rayToWorld A point along the direction on the far side of the physics world
+   * @param[in] nativeFilter A native shape/body filter
+   * @param[out] localPivot The hit point local to the body
+   * @param[out] distanceFromCamera The distance of the pick point from the camera
+   * @return Empty value if no dynamic body found, otherwise a valid ptr to the hit body.
+   */
+  Dali::Any HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera) override;
+
+  void Integrate(float timestep) override;
+
+private:
+  btDiscreteDynamicsWorld*             mDynamicsWorld{nullptr};
+  btCollisionDispatcher*               mDispatcher{nullptr};
+  btDefaultCollisionConfiguration*     mCollisionConfiguration{nullptr};
+  btBroadphaseInterface*               mBroadphase{nullptr};
+  btSequentialImpulseConstraintSolver* mSolver{nullptr};
+};
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/chipmunk-impl/chipmunk-physics-actor-impl.cpp b/dali-physics/internal/chipmunk-impl/chipmunk-physics-actor-impl.cpp
new file mode 100644
index 0000000..3cb98f6
--- /dev/null
+++ b/dali-physics/internal/chipmunk-impl/chipmunk-physics-actor-impl.cpp
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/physics-actor-impl.h>
+#include <dali-physics/internal/physics-adaptor-impl.h>
+
+#include <chipmunk/chipmunk.h>
+
+namespace
+{
+inline cpVect fromVec3(Dali::Vector3 vec3)
+{
+  return cpv(vec3.x, vec3.y);
+}
+
+inline Dali::Vector3 toVec3(cpVect vec)
+{
+  return Dali::Vector3(vec.x, vec.y, 0.0f);
+}
+
+} //Anonymous namespace
+
+namespace Dali::Toolkit::Physics::Internal
+{
+PhysicsActorPtr PhysicsActor::New(Dali::Actor actor, Dali::Any body, Dali::Toolkit::Physics::Internal::PhysicsAdaptor& adaptor)
+{
+  PhysicsActorPtr physicsActor(new Internal::PhysicsActor(actor, body, adaptor));
+  physicsActor->Initialize();
+  return physicsActor;
+}
+
+PhysicsActor::PhysicsActor(Dali::Actor actor, Dali::Any body, PhysicsAdaptor& adaptor)
+: mAdaptor(adaptor),
+  mActorId(actor.GetProperty<int>(Dali::Actor::Property::ID)),
+  mBody(body)
+{
+}
+
+PhysicsActor::~PhysicsActor() = default;
+
+void PhysicsActor::Initialize(void)
+{
+  cpBodySetUserData2(mBody.Get<cpBody*>(), this);
+
+  // RegisterObject?
+}
+
+void PhysicsActor::AsyncSetPhysicsPosition(Dali::Vector3 actorPosition)
+{
+  // Queue task
+  cpBody* body = mBody.Get<cpBody*>();
+  cpVect  pos  = fromVec3(mAdaptor.TranslateToPhysicsSpace(actorPosition));
+  mAdaptor.Queue([body, pos] { cpBodySetPosition(body, pos); });
+}
+
+void PhysicsActor::AsyncSetPhysicsRotation(Dali::Quaternion rotation)
+{
+  // Queue task
+  cpBody* body = mBody.Get<cpBody*>();
+  auto    q    = mAdaptor.TranslateToPhysicsSpace(rotation);
+  Vector3 axis;
+  Radian  angle;
+  q.ToAxisAngle(axis, angle);
+  mAdaptor.Queue([body, angle]() { cpBodySetAngle(body, angle); });
+}
+
+Dali::Vector3 PhysicsActor::GetPhysicsPosition() const
+{
+  cpBody* body = mBody.Get<cpBody*>();
+  return toVec3(cpBodyGetPosition(body));
+}
+
+Dali::Quaternion PhysicsActor::GetPhysicsRotation() const
+{
+  cpBody* body  = mBody.Get<cpBody*>();
+  cpFloat angle = cpBodyGetAngle(body);
+  return Quaternion(Radian(angle), Vector3::ZAXIS);
+}
+
+Dali::Vector3 PhysicsActor::GetActorPosition() const
+{
+  cpBody* body       = mBody.Get<cpBody*>();
+  cpVect  cpPosition = cpBodyGetPosition(body);
+  return mAdaptor.TranslateFromPhysicsSpace(Vector3(cpPosition.x, cpPosition.y, 0.0f));
+}
+
+Dali::Quaternion PhysicsActor::GetActorRotation() const
+{
+  cpBody* body  = mBody.Get<cpBody*>();
+  cpFloat angle = cpBodyGetAngle(body);
+  return mAdaptor.TranslateFromPhysicsSpace(Quaternion(Radian(angle), Vector3::ZAXIS));
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.cpp b/dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.cpp
new file mode 100644
index 0000000..b909890
--- /dev/null
+++ b/dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.cpp
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.h>
+
+// External Headers
+#include <utility>
+
+// Internal Headers
+#include <dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.h>
+#include <dali/dali.h>
+#include <dali/integration-api/debug.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, false, "LOG_PHYSICS");
+#endif
+
+inline cpVect ConvertVector(Dali::Vector3 vector)
+{
+  return cpv(vector.x, vector.y);
+}
+
+} // namespace
+
+namespace Dali::Toolkit::Physics::Internal
+{
+PhysicsAdaptorPtr CreateNewPhysicsAdaptor(const Dali::Matrix& transform, Uint16Pair worldSize)
+{
+  PhysicsAdaptorPtr adaptor(new ChipmunkPhysicsAdaptor());
+  adaptor->Initialize(transform, worldSize);
+  return adaptor;
+}
+
+ChipmunkPhysicsAdaptor::ChipmunkPhysicsAdaptor()
+: PhysicsAdaptor()
+{
+}
+
+ChipmunkPhysicsAdaptor::~ChipmunkPhysicsAdaptor()
+{
+  // @todo Ensure physics bodies don't leak
+}
+
+void ChipmunkPhysicsAdaptor::OnInitialize(const Dali::Matrix& transform, Uint16Pair worldSize)
+{
+  mTransform        = transform;
+  mInverseTransform = transform;
+  mInverseTransform.Invert();
+  mSize = worldSize;
+
+  mPhysicsWorld = ChipmunkPhysicsWorld::New(mRootActor,
+                                            Dali::MakeCallback(mSlotDelegate.GetSlot(),
+                                                               &PhysicsAdaptor::OnUpdateActors));
+}
+
+Layer ChipmunkPhysicsAdaptor::CreateDebugLayer(Dali::Window window)
+{
+  Layer debugLayer;
+
+  auto renderTaskList = window.GetRenderTaskList();
+  auto renderTask     = renderTaskList.GetTask(0);
+  auto windowSize     = window.GetSize();
+
+  debugLayer                                 = Layer::New();
+  debugLayer[Actor::Property::NAME]          = "PhysicsDebugLayer";
+  debugLayer[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+  debugLayer[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+
+  Constraint positionConstraint = Constraint::New<Vector3>(debugLayer, Actor::Property::POSITION, EqualToConstraint());
+  positionConstraint.AddSource(Source(mRootActor, Actor::Property::POSITION));
+  positionConstraint.Apply();
+  Constraint sizeConstraint = Constraint::New<Vector2>(debugLayer, Actor::Property::SIZE, EqualToConstraint());
+  sizeConstraint.AddSource(Source(mRootActor, Actor::Property::SIZE));
+  sizeConstraint.Apply();
+
+  auto world = static_cast<ChipmunkPhysicsWorld*>(mPhysicsWorld.get());
+
+  std::unique_ptr<PhysicsDebugRenderer> debugRenderer = PhysicsDebugRenderer::New(windowSize.GetWidth(), windowSize.GetHeight(), renderTask.GetCameraActor(), this);
+
+  mDebugActor = DrawableActor::New(*(debugRenderer->GetCallback().get()));
+  world->SetDebugRenderer(debugRenderer.release());
+
+  mDebugActor[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+  mDebugActor[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+
+  Constraint sizeConstraint2 = Constraint::New<Vector2>(mDebugActor, Actor::Property::SIZE, EqualToConstraint());
+  sizeConstraint2.AddSource(ParentSource(Actor::Property::SIZE));
+  sizeConstraint2.Apply();
+
+  debugLayer.Add(mDebugActor);
+
+  window.Add(debugLayer);
+  return debugLayer;
+}
+
+void ChipmunkPhysicsAdaptor::SetTransformAndSize(const Dali::Matrix& transform, Uint16Pair worldSize)
+{
+  mTransform        = transform;
+  mInverseTransform = transform;
+  mInverseTransform.Invert();
+  mSize = worldSize;
+
+  GetRootActor()[Actor::Property::SIZE] = Vector3(worldSize.GetWidth(), worldSize.GetHeight(), 0);
+
+  auto world = static_cast<ChipmunkPhysicsWorld*>(mPhysicsWorld.get());
+  if(world->HasDebugRenderer())
+  {
+    Actor layer                  = mDebugActor.GetParent();
+    layer[Actor::Property::SIZE] = Vector3(worldSize);
+    world->GetDebugRenderer().UpdateWindowSize(worldSize);
+  }
+}
+
+PhysicsActorPtr ChipmunkPhysicsAdaptor::AddActorBody(Dali::Actor actor, Dali::Any body)
+{
+  uint32_t id    = static_cast<uint32_t>(actor.GetProperty<int>(Actor::Property::ID));
+  cpBody*  cBody = body.Get<cpBody*>();
+  cpBodySetUserData2(cBody, this);
+
+  mPhysicsActors.insert(std::make_pair(id, PhysicsActor::New(actor, body, *this)));
+  actor[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+  actor[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+  mRootActor.Add(actor);
+  return mPhysicsActors.at(id);
+}
+
+void ChipmunkPhysicsAdaptor::RemoveActorBody(PhysicsActor& physicsActor)
+{
+  auto iter = mPhysicsActors.find(physicsActor.GetId());
+  if(iter != mPhysicsActors.end())
+  {
+    mPhysicsActors.erase(iter);
+  }
+  Dali::Actor actor = mRootActor.FindChildById(physicsActor.GetId());
+  if(actor)
+  {
+    actor.Unparent();
+  }
+  auto    body  = physicsActor.GetBody();
+  cpBody* cBody = body.Get<cpBody*>();
+  if(cBody)
+  {
+    cpBodySetUserData2(cBody, nullptr);
+  }
+}
+
+PhysicsActorPtr ChipmunkPhysicsAdaptor::GetPhysicsActor(Dali::Any body) const
+{
+  cpBody* cBody = body.Get<cpBody*>();
+  if(cBody)
+  {
+    return reinterpret_cast<PhysicsActor*>(cpBodyGetUserData2(cBody));
+  }
+  DALI_LOG_ERROR("Body not found in physics actors");
+  return nullptr;
+}
+
+// Convert a position from root actor local space to physics space
+Vector3 ChipmunkPhysicsAdaptor::TranslateToPhysicsSpace(Vector3 vector) const
+{
+  Vector4 position = mTransform * Vector4(vector.x, vector.y, vector.z, 1.0f);
+  return Vector3(position);
+}
+
+// Convert a position from physics space to root actor local space
+Vector3 ChipmunkPhysicsAdaptor::TranslateFromPhysicsSpace(Vector3 vector) const
+{
+  Vector4 position = mInverseTransform * Vector4(vector.x, vector.y, vector.z, 1.0f);
+  return Vector3(position);
+}
+
+Quaternion ChipmunkPhysicsAdaptor::TranslateToPhysicsSpace(Quaternion orientation) const
+{
+  // Actors face outwards (+ve Z)
+  // In DALi world, +ve angle about +ve Z is clockwise.
+  // But, if physics is mirrored in Y axis, so +ve angle is anti-clockwise.
+
+  // Compute angle about Z axis
+  Vector3 axis;
+  Radian  angle;
+  orientation.ToAxisAngle(axis, angle);
+
+  // Check if Transform matrix is mirrored in X xor Y
+  if(std::signbit(mTransform.AsFloat()[0]) ^ std::signbit(mTransform.AsFloat()[5]))
+  {
+    return Quaternion(-angle, axis);
+  }
+
+  return Quaternion(angle, axis);
+}
+
+Quaternion ChipmunkPhysicsAdaptor::TranslateFromPhysicsSpace(Quaternion orientation) const
+{
+  // Mirroring conversion is identical in both transforms
+  return TranslateToPhysicsSpace(orientation);
+}
+
+// Convert a vector from dali space to physics space
+Vector3 ChipmunkPhysicsAdaptor::ConvertVectorToPhysicsSpace(Vector3 vector) const
+{
+  Vector4 otherVector(mTransform * Vector4(vector.x, vector.y, vector.z, 0.0f));
+  return Vector3(otherVector);
+}
+
+// Convert a vector from physics space to root actor local space
+Vector3 ChipmunkPhysicsAdaptor::ConvertVectorFromPhysicsSpace(Vector3 vector) const
+{
+  Vector4 otherVector(mInverseTransform * Vector4(vector.x, vector.y, vector.z, 0.0f));
+  return Vector3(otherVector);
+}
+
+void ChipmunkPhysicsAdaptor::BuildPickingRay(Vector3 origin, Vector3 direction, Dali::Vector3& rayFromWorld, Dali::Vector3& rayToWorld)
+{
+  rayFromWorld = TranslateToPhysicsSpace(origin);
+  rayToWorld   = TranslateToPhysicsSpace(origin); // rayToWorld is identical - there's no depth
+}
+
+Vector3 ChipmunkPhysicsAdaptor::ProjectPoint(Vector3 origin, Vector3 direction, float distance)
+{
+  // Ignore direction & distance.
+  return TranslateToPhysicsSpace(origin);
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.h b/dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.h
new file mode 100644
index 0000000..55f515d
--- /dev/null
+++ b/dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.h
@@ -0,0 +1,115 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or adaptoried.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// External headers
+
+// Internal headers
+#include <dali-physics/internal/physics-adaptor-impl.h>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class ChipmunkPhysicsAdaptor : public PhysicsAdaptor
+{
+public:
+  ChipmunkPhysicsAdaptor();
+
+  /**
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~ChipmunkPhysicsAdaptor() override;
+
+  // Remove copy constructor and copy assignment
+  ChipmunkPhysicsAdaptor(const PhysicsAdaptor& handle) = delete;
+  ChipmunkPhysicsAdaptor& operator=(const PhysicsAdaptor& handle) = delete;
+
+  /**
+   * 2nd stage initialization
+   */
+  void OnInitialize(const Dali::Matrix& transform, Uint16Pair size) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::CreateDebugLayer
+   */
+  Dali::Layer CreateDebugLayer(Dali::Window window) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetTransformAndSize
+   */
+  void SetTransformAndSize(const Dali::Matrix& transform, Uint16Pair size) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateToPhysicsSpace
+   */
+  Dali::Vector3 TranslateToPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateToPhysicsSpace
+   */
+  Dali::Quaternion TranslateToPhysicsSpace(Dali::Quaternion rotation) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateFromPhysicsSpace
+   */
+  Dali::Vector3 TranslateFromPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateFromPhysicsSpace
+   */
+  Dali::Quaternion TranslateFromPhysicsSpace(Quaternion rotation) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ConvertVectorToPhysicsSpace
+   */
+  Dali::Vector3 ConvertVectorToPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ConvertVectorFromPhysicsSpace
+   */
+  Dali::Vector3 ConvertVectorFromPhysicsSpace(Dali::Vector3 vector) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::AddActorBody
+   */
+  PhysicsActorPtr AddActorBody(Dali::Actor actor, Dali::Any body) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::RemoveActorBody
+   */
+  void RemoveActorBody(PhysicsActor& physicsActor) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetPhysicsActor
+   */
+  PhysicsActorPtr GetPhysicsActor(Dali::Any body) const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::BuildPickingRay
+   */
+  void BuildPickingRay(Dali::Vector3 origin, Dali::Vector3 direction, Dali::Vector3& rayFromWorld, Dali::Vector3& rayToWorld) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ProjectPoint
+   */
+  Dali::Vector3 ProjectPoint(Dali::Vector3 origin, Dali::Vector3 direction, float distance) override;
+
+private:
+  Actor mDebugActor;
+  // Physics world owns debug renderer
+};
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.cpp b/dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.cpp
new file mode 100644
index 0000000..9c776c6
--- /dev/null
+++ b/dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.cpp
@@ -0,0 +1,471 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <chipmunk/chipmunk.h>
+#include <dali-physics/internal/chipmunk-impl/chipmunk-physics-adaptor-impl.h>
+#include <dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.h>
+
+namespace
+{
+GLuint LoadShader(GLenum shaderType, const char* shaderSource)
+{
+  GLuint shader = glCreateShader(shaderType);
+  if(shader != 0)
+  {
+    glShaderSource(shader, 1, &shaderSource, NULL);
+    glCompileShader(shader);
+    GLint compiled = 0;
+    glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+    if(compiled != GL_TRUE)
+    {
+      GLint infoLen = 0;
+      glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
+
+      if(infoLen > 0)
+      {
+        std::vector<char> logBuffer;
+        logBuffer.resize(infoLen + 1);
+        glGetShaderInfoLog(shader, infoLen, NULL, &logBuffer[0]);
+        fprintf(stderr, "%s\n", &logBuffer[0]);
+        fflush(stderr);
+
+        glDeleteShader(shader);
+        shader = 0;
+      }
+    }
+  }
+  return shader;
+}
+
+GLuint CreateProgram(const char* vertexSource, const char* fragmentSource)
+{
+  GLuint vertexShader = LoadShader(GL_VERTEX_SHADER, vertexSource);
+  if(!vertexShader)
+  {
+    return 0;
+  }
+  GLuint fragmentShader = LoadShader(GL_FRAGMENT_SHADER, fragmentSource);
+  if(!fragmentShader)
+  {
+    return 0;
+  }
+  GLuint program = glCreateProgram();
+  if(program)
+  {
+    glAttachShader(program, vertexShader);
+    glAttachShader(program, fragmentShader);
+    glLinkProgram(program);
+    GLint linkStatus = GL_FALSE;
+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
+    if(linkStatus != GL_TRUE)
+    {
+      GLint bufLength = 0;
+      glGetProgramiv(program, GL_INFO_LOG_LENGTH, &bufLength);
+      if(bufLength)
+      {
+        std::vector<char> logBuffer;
+        logBuffer.resize(bufLength + 1);
+        glGetProgramInfoLog(program, bufLength, NULL, &logBuffer[0]);
+        fprintf(stderr, "%s\n", &logBuffer[0]);
+        fflush(stderr);
+      }
+      glDeleteProgram(program);
+      program = 0;
+    }
+  }
+  return program;
+}
+} // namespace
+
+namespace Dali::Toolkit::Physics::Internal
+{
+static void DebugDrawCircleImpl(cpVect pos, cpFloat angle, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor, cpDataPointer data)
+{
+  auto debugRenderer = static_cast<PhysicsDebugRenderer*>(data);
+  debugRenderer->DrawCircle(pos, angle, radius, outlineColor, fillColor);
+}
+
+static void DebugDrawSegmentImpl(cpVect a, cpVect b, cpSpaceDebugColor color, cpDataPointer data)
+{
+  auto debugRenderer = static_cast<PhysicsDebugRenderer*>(data);
+  debugRenderer->DrawSegment(a, b, color);
+}
+
+void DebugDrawFatSegmentImpl(cpVect a, cpVect b, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor, cpDataPointer data)
+{
+  auto debugRenderer = static_cast<PhysicsDebugRenderer*>(data);
+  debugRenderer->DrawFatSegment(a, b, radius, outlineColor, fillColor);
+}
+
+void DebugDrawPolygonImpl(int count, const cpVect* verts, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor, cpDataPointer data)
+{
+  auto debugRenderer = static_cast<PhysicsDebugRenderer*>(data);
+  debugRenderer->DrawPolygon(count, verts, radius, outlineColor, fillColor);
+}
+
+void DebugDrawDotImpl(cpFloat size, cpVect pos, cpSpaceDebugColor color, cpDataPointer data)
+{
+  auto debugRenderer = static_cast<PhysicsDebugRenderer*>(data);
+  debugRenderer->DrawDot(size, pos, color);
+}
+
+cpSpaceDebugColor DebugDrawColorForShapeImpl(cpShape* shape, cpDataPointer data)
+{
+  auto debugRenderer = static_cast<PhysicsDebugRenderer*>(data);
+  return debugRenderer->DrawColorForShape(shape);
+}
+
+std::unique_ptr<PhysicsDebugRenderer> PhysicsDebugRenderer::New(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor)
+{
+  auto renderer = std::make_unique<PhysicsDebugRenderer>(width, height, camera, adaptor);
+
+  renderer->mRenderCallback = Dali::RenderCallback::New<PhysicsDebugRenderer>(renderer.get(), &PhysicsDebugRenderer::OnRender);
+  return renderer;
+}
+
+PhysicsDebugRenderer::PhysicsDebugRenderer(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor)
+: mCamera(camera),
+  mWidth(width),
+  mHeight(height),
+  mAdaptor(*adaptor),
+  mPositionLocation(-1),
+  mUvsLocation(-1),
+  mRadiusLocation(-1),
+  mFillColourLocation(-1),
+  mOutlineColourLocation(-1),
+  mProjectionLocation(-1),
+  mModelViewLocation(-1),
+  mIndexBufferId(0u),
+  mVertexBufferId(0u),
+  mProgramId(0u)
+{
+  mDebugDrawOptions.drawCircle     = DebugDrawCircleImpl;
+  mDebugDrawOptions.drawSegment    = DebugDrawSegmentImpl;
+  mDebugDrawOptions.drawFatSegment = DebugDrawFatSegmentImpl;
+  mDebugDrawOptions.drawPolygon    = DebugDrawPolygonImpl;
+  mDebugDrawOptions.drawDot        = DebugDrawDotImpl;
+
+  mDebugDrawOptions.flags               = static_cast<cpSpaceDebugDrawFlags>(CP_SPACE_DEBUG_DRAW_SHAPES |
+                                                               CP_SPACE_DEBUG_DRAW_COLLISION_POINTS |
+                                                               CP_SPACE_DEBUG_DRAW_CONSTRAINTS);
+  mDebugDrawOptions.colorForShape       = DebugDrawColorForShapeImpl;
+  mDebugDrawOptions.shapeOutlineColor   = cpSpaceDebugColor{0.0f, 1.0f, 1.0f, 0.9f};
+  mDebugDrawOptions.constraintColor     = cpSpaceDebugColor{0.5f, 0.5f, 0.5f, 0.9f};
+  mDebugDrawOptions.collisionPointColor = cpSpaceDebugColor{1.0f, 0.0f, 0.0f, 1.0f};
+  mDebugDrawOptions.data                = this;
+}
+
+bool PhysicsDebugRenderer::OnRender(const Dali::RenderCallbackInput& input)
+{
+  if(mState == State::INIT)
+  {
+    Setup();
+    mState = State::RENDER;
+  }
+  glViewport(0, 0, mWidth, mHeight);
+
+  RenderLines(input);
+
+  return false;
+}
+
+// Run on first invocation of callback
+void PhysicsDebugRenderer::Setup()
+{
+  PrepareShader();
+  mPositionLocation      = glGetAttribLocation(mProgramId, "position");
+  mUvsLocation           = glGetAttribLocation(mProgramId, "uvs");
+  mRadiusLocation        = glGetAttribLocation(mProgramId, "radius");
+  mFillColourLocation    = glGetAttribLocation(mProgramId, "fillColor");
+  mOutlineColourLocation = glGetAttribLocation(mProgramId, "outlineColor");
+
+  mProjectionLocation = glGetUniformLocation(mProgramId, "projection");
+  mModelViewLocation  = glGetUniformLocation(mProgramId, "modelView");
+
+  glEnable(GL_DEPTH_TEST);
+  glViewport(0, 0, mWidth, mHeight);
+
+  glGenBuffers(1, &mIndexBufferId);
+  glGenBuffers(1, &mVertexBufferId);
+}
+
+void PhysicsDebugRenderer::UpdateWindowSize(Dali::Vector2 size)
+{
+  mWidth  = size.width;
+  mHeight = size.height;
+}
+
+void PhysicsDebugRenderer::PrepareShader()
+{
+  static const char glVertexShader[] =
+    "#version 300 es\n"
+    "in vec2 position;\n"
+    "in vec2 uvs;\n"
+    "in float radius;\n"
+    "in vec4 fillColor;\n"
+    "in vec4 outlineColor;\n"
+    "out vec2 v_uvs;\n"
+    "out vec4 v_fill;\n"
+    "out vec4 v_outline;\n"
+    "uniform mat4 projection;\n"
+    "uniform mat4 modelView;\n"
+    "void main()\n"
+    "{\n"
+    "    gl_Position = projection * modelView * vec4(position.xy+radius*uvs, 0.0, 1.0);\n"
+    "    v_uvs=uvs;\n"
+    "    v_fill = fillColor;\n"
+    "    v_fill.rgb *= v_fill.a;\n"
+    "    v_outline = outlineColor;\n"
+    "    v_outline.a *= v_outline.a;\n"
+    "}\n";
+
+  static const char glFragmentShader[] =
+    "#version 300 es\n"
+    "precision mediump float;\n"
+    "in vec2 v_uvs;\n"
+    "in vec4 v_fill;\n"
+    "in vec4 v_outline;\n"
+    "out vec4 fragColor;\n"
+    "void main()\n"
+    "{\n"
+    "    float len=length(v_uvs);\n"
+    "    float fw = length(vec2(dFdx(len), dFdy(len)));\n"
+    "    float mask=smoothstep(-1.0, fw-1.0, -len);\n"
+    "    float outline=1.0-fw;\n"
+    "    float outline_mask=smoothstep(outline-fw, outline, len);\n"
+    "    vec4 color = v_fill + (v_outline - v_fill*v_outline.a)*outline_mask;\n"
+    "    fragColor = color*mask;\n"
+    "}\n";
+
+  mProgramId = CreateProgram(glVertexShader, glFragmentShader);
+}
+
+void PhysicsDebugRenderer::RenderLines(const Dali::RenderCallbackInput& input)
+{
+  mModelViewMatrix.SetIdentity();
+  mProjectionMatrix = input.projection;
+
+  Matrix::Multiply(mModelViewMatrix, mModelViewMatrix, input.view);
+  glUseProgram(mProgramId);
+
+  // In theory, input.clippingBox should tell us the actor position in clip-space.
+  // But, it appears to be bugged.
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+  glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBufferId);
+  glBufferData(GL_ELEMENT_ARRAY_BUFFER, GLsizeiptr(mIndices.size() * sizeof(uint16_t)), &mIndices[0], GL_STATIC_DRAW);
+  glBindBuffer(GL_ARRAY_BUFFER, mVertexBufferId);
+  glBufferData(GL_ARRAY_BUFFER, GLsizeiptr(mVertices.size() * sizeof(Vertex)), &mVertices[0], GL_STATIC_DRAW);
+
+  GLint stride = 52; // 4*(2 + 2 + 1 + 4 + 4) = 4*13=52
+  glVertexAttribPointer(mPositionLocation, 2, GL_FLOAT, GL_FALSE, stride, 0);
+  glEnableVertexAttribArray(mPositionLocation);
+
+  glVertexAttribPointer(mUvsLocation, 2, GL_FLOAT, GL_FALSE, stride, (const void*)8);
+  glEnableVertexAttribArray(mUvsLocation);
+
+  glVertexAttribPointer(mRadiusLocation, 1, GL_FLOAT, GL_FALSE, stride, (const void*)16);
+  glEnableVertexAttribArray(mRadiusLocation);
+
+  glVertexAttribPointer(mFillColourLocation, 4, GL_FLOAT, GL_FALSE, stride, reinterpret_cast<const void*>(20));
+  glEnableVertexAttribArray(mFillColourLocation);
+  glVertexAttribPointer(mOutlineColourLocation, 4, GL_FLOAT, GL_FALSE, stride, reinterpret_cast<const void*>(36));
+  glEnableVertexAttribArray(mOutlineColourLocation);
+
+  glUniformMatrix4fv(mProjectionLocation, 1, GL_FALSE, mProjectionMatrix.AsFloat());
+  glUniformMatrix4fv(mModelViewLocation, 1, GL_FALSE, mModelViewMatrix.AsFloat());
+
+  glDrawElements(GL_TRIANGLES, mIndices.size(), GL_UNSIGNED_SHORT, 0);
+  mIndices.clear();
+  mVertices.clear();
+}
+
+PhysicsDebugRenderer::Vertex* PhysicsDebugRenderer::PushVertices(uint32_t vertexCount, uint32_t indexCount, const uint16_t* indices)
+{
+  auto base = mVertices.size();
+  mVertices.resize(mVertices.size() + vertexCount);
+  mIndices.reserve(mIndices.size() + indexCount);
+  for(uint32_t i = 0; i < indexCount; ++i)
+  {
+    mIndices.push_back(base + indices[i]);
+  }
+
+  return &mVertices[base];
+}
+
+PhysicsDebugRenderer::Vertex PhysicsDebugRenderer::MakeVertex(cpVect pos, float u, float v, float r, Vector4 fill, Vector4 outline)
+{
+  auto daliPos = mAdaptor.TranslateFromPhysicsSpace(Vector3((float)pos.x, (float)pos.y, 0.0f));
+  return Vertex{Vector2(daliPos.x, daliPos.y), Vector2(u, v), r, fill, outline};
+}
+
+void PhysicsDebugRenderer::DrawCircle(cpVect pos, cpFloat angle, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor)
+{
+  float                 r = (float)radius + mPointLineScale;
+  Vector4               fill(fillColor.r, fillColor.g, fillColor.b, fillColor.a);
+  Vector4               outline(outlineColor.r, outlineColor.g, outlineColor.b, outlineColor.a);
+  static const uint16_t indices[] = {0, 1, 2, 0, 2, 3};
+
+  Vertex* vertices = PushVertices(4, 6, indices);
+
+  vertices[0] = MakeVertex(pos, -1, -1, r, fill, outline);
+  vertices[1] = MakeVertex(pos, -1, 1, r, fill, outline);
+  vertices[2] = MakeVertex(pos, 1, 1, r, fill, outline);
+  vertices[3] = MakeVertex(pos, 1, -1, r, fill, outline);
+
+  DrawSegment(pos, cpvadd(pos, cpvmult(cpvforangle(angle), 0.75f * radius)), outlineColor);
+}
+
+void PhysicsDebugRenderer::DrawSegment(cpVect a, cpVect b, cpSpaceDebugColor color)
+{
+  DrawFatSegment(a, b, 0.0f, color, color);
+}
+
+void PhysicsDebugRenderer::DrawFatSegment(cpVect a, cpVect b, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor)
+{
+  static const uint16_t indices[] = {0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4, 5, 4, 5, 6, 5, 6, 7};
+  Vertex*               vertices  = PushVertices(8, 18, indices);
+
+  cpVect t = cpvnormalize(cpvsub(b, a));
+
+  float   r = (float)radius * mPointLineScale;
+  Vector4 fill(fillColor.r, fillColor.g, fillColor.b, fillColor.a);
+  Vector4 outline(outlineColor.r, outlineColor.g, outlineColor.b, outlineColor.a);
+
+  vertices[0] = MakeVertex(a, (-t.x + t.y), (-t.x - t.y), r, fill, outline);
+  vertices[1] = MakeVertex(a, (-t.x - t.y), (+t.x - t.y), r, fill, outline);
+  vertices[2] = MakeVertex(a, (-0.0 + t.y), (-t.x + 0.0), r, fill, outline);
+  vertices[3] = MakeVertex(a, (-0.0 - t.y), (+t.x + 0.0), r, fill, outline);
+  vertices[4] = MakeVertex(a, (+0.0 + t.y), (-t.x - 0.0), r, fill, outline);
+  vertices[5] = MakeVertex(a, (+0.0 - t.y), (+t.x - 0.0), r, fill, outline);
+  vertices[6] = MakeVertex(a, (+t.x + t.y), (-t.x + t.y), r, fill, outline);
+  vertices[7] = MakeVertex(a, (+t.x - t.y), (+t.x + t.y), r, fill, outline);
+}
+
+void PhysicsDebugRenderer::DrawPolygon(int count, const cpVect* verts, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor)
+{
+  Vector4 fill(fillColor.r, fillColor.g, fillColor.b, fillColor.a);
+  Vector4 outline(outlineColor.r, outlineColor.g, outlineColor.b, outlineColor.a);
+
+  std::vector<uint16_t> indices;
+  for(int i = 0; i < count - 2; i++)
+  {
+    indices.push_back(0);
+    indices.push_back(4 * (i + 1));
+    indices.push_back(4 * (i + 2));
+  }
+
+  // Polygon outline triangles.
+  for(int i0 = 0; i0 < count; i0++)
+  {
+    int i1 = (i0 + 1) % count;
+    indices.push_back(4 * i0 + 0);
+    indices.push_back(4 * i0 + 1);
+    indices.push_back(4 * i0 + 2);
+    indices.push_back(4 * i0 + 0);
+    indices.push_back(4 * i0 + 2);
+    indices.push_back(4 * i0 + 3);
+    indices.push_back(4 * i0 + 0);
+    indices.push_back(4 * i0 + 3);
+    indices.push_back(4 * i1 + 0);
+    indices.push_back(4 * i0 + 3);
+    indices.push_back(4 * i1 + 0);
+    indices.push_back(4 * i1 + 1);
+  }
+
+  float inset  = (float)-cpfmax(0, 2 * mPointLineScale - radius);
+  float outset = (float)radius + mPointLineScale;
+  float r      = outset - inset;
+
+  Vertex* vertices = PushVertices(4 * count, 3 * (5 * count - 2), &indices[0]);
+  for(int i = 0; i < count; i++)
+  {
+    cpVect v0     = verts[i];
+    cpVect v_prev = verts[(i + (count - 1)) % count];
+    cpVect v_next = verts[(i + (count + 1)) % count];
+
+    cpVect n1 = cpvnormalize(cpvrperp(cpvsub(v0, v_prev)));
+    cpVect n2 = cpvnormalize(cpvrperp(cpvsub(v_next, v0)));
+    cpVect of = cpvmult(cpvadd(n1, n2), 1.0 / (cpvdot(n1, n2) + 1.0f));
+    cpVect v  = cpvadd(v0, cpvmult(of, inset));
+
+    vertices[4 * i + 0] = MakeVertex(v, 0.0f, 0.0f, 0.0f, fill, outline);
+    vertices[4 * i + 1] = MakeVertex(v, (float)n1.x, (float)n1.y, r, fill, outline);
+    vertices[4 * i + 2] = MakeVertex(v, (float)of.x, (float)of.y, r, fill, outline);
+    vertices[4 * i + 3] = MakeVertex(v, (float)n2.x, (float)n2.y, r, fill, outline);
+  }
+}
+
+void PhysicsDebugRenderer::DrawDot(cpFloat size, cpVect pos, cpSpaceDebugColor color)
+{
+  float                 r = (float)(size * 0.5f * mPointLineScale);
+  Vector4               fill(color.r, color.g, color.b, color.a);
+  static const uint16_t indices[] = {0, 1, 2, 0, 2, 3};
+  Vertex*               vertex    = PushVertices(4, 6, indices);
+  vertex[0]                       = MakeVertex(pos, -1, -1, r, fill, fill);
+  vertex[1]                       = MakeVertex(pos, -1, 1, r, fill, fill);
+  vertex[2]                       = MakeVertex(pos, 1, 1, r, fill, fill);
+  vertex[3]                       = MakeVertex(pos, 1, -1, r, fill, fill);
+}
+
+cpSpaceDebugColor PhysicsDebugRenderer::DrawColorForShape(cpShape* shape)
+{
+  static cpSpaceDebugColor Colors[] = {
+    {0xb5 / 255.0f, 0x89 / 255.0f, 0x00 / 255.0f, 1.0f},
+    {0xcb / 255.0f, 0x4b / 255.0f, 0x16 / 255.0f, 1.0f},
+    {0xdc / 255.0f, 0x32 / 255.0f, 0x2f / 255.0f, 1.0f},
+    {0xd3 / 255.0f, 0x36 / 255.0f, 0x82 / 255.0f, 1.0f},
+    {0x6c / 255.0f, 0x71 / 255.0f, 0xc4 / 255.0f, 1.0f},
+    {0x26 / 255.0f, 0x8b / 255.0f, 0xd2 / 255.0f, 1.0f},
+    {0x2a / 255.0f, 0xa1 / 255.0f, 0x98 / 255.0f, 1.0f},
+    {0x85 / 255.0f, 0x99 / 255.0f, 0x00 / 255.0f, 1.0f},
+  };
+
+  if(cpShapeGetSensor(shape))
+  {
+    return cpSpaceDebugColor{1.0f, 1.0f, 1.0f, 0.1f};
+  }
+  else
+  {
+    cpBody* body = cpShapeGetBody(shape);
+
+    if(cpBodyIsSleeping(body))
+    {
+      return cpSpaceDebugColor{0x58 / 255.0f, 0x6e / 255.0f, 0x75 / 255.0f, 1.0f};
+    }
+    else if(cpBodyIsSleepThresholdExceeded(body, shape))
+    {
+      return cpSpaceDebugColor{0x93 / 255.0f, 0xa1 / 255.0f, 0xa1 / 255.0f, 1.0f};
+    }
+    else
+    {
+      uint32_t val = (uint32_t)cpShapeGetHashId(shape);
+
+      // scramble the bits up using Robert Jenkins' 32 bit integer hash function
+      val = (val + 0x7ed55d16) + (val << 12);
+      val = (val ^ 0xc761c23c) ^ (val >> 19);
+      val = (val + 0x165667b1) + (val << 5);
+      val = (val + 0xd3a2646c) ^ (val << 9);
+      val = (val + 0xfd7046c5) + (val << 3);
+      val = (val ^ 0xb55a4f09) ^ (val >> 16);
+
+      return Colors[val & 0x7];
+    }
+  }
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.h b/dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.h
new file mode 100644
index 0000000..2a4335b
--- /dev/null
+++ b/dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.h
@@ -0,0 +1,126 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <GLES3/gl3.h>
+#include <chipmunk/chipmunk.h>
+#include <dali/dali.h>
+
+using Dali::Actor;
+using Dali::CameraActor;
+using Dali::Geometry;
+using Dali::Renderer;
+using Dali::Shader;
+using Dali::TextureSet;
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class PhysicsAdaptor;
+
+class PhysicsDebugRenderer
+{
+public:
+  // Creates and initializes a new renderer
+  static std::unique_ptr<PhysicsDebugRenderer> New(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor);
+  /**
+   * Get the callback (for actor creation)
+   */
+
+  std::unique_ptr<Dali::RenderCallback>& GetCallback()
+  {
+    return mRenderCallback;
+  }
+
+  void UpdateWindowSize(Dali::Vector2 size);
+
+  /**
+   * Constructor.
+   * @param[in] width Width of the renderer - viewport
+   * @param[in] height Height of the renderer - viewport
+   */
+  PhysicsDebugRenderer(uint32_t width, uint32_t height, Dali::CameraActor camera, PhysicsAdaptor* adaptor);
+
+  /**
+   * Get the drawing options struct ( construct only )
+   */
+  const cpSpaceDebugDrawOptions& GetDebugDrawOptions()
+  {
+    return mDebugDrawOptions;
+  }
+
+  struct Vertex
+  {
+    Dali::Vector2 position;
+    Dali::Vector2 uvs;
+    float         radius;
+    Dali::Vector4 fillColor;
+    Dali::Vector4 outlineColor;
+  };
+
+public: // Debug functions (Creates indices & verts)
+  void              DrawCircle(cpVect pos, cpFloat angle, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor);
+  void              DrawSegment(cpVect a, cpVect b, cpSpaceDebugColor color);
+  void              DrawFatSegment(cpVect a, cpVect b, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor);
+  void              DrawPolygon(int count, const cpVect* verts, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor);
+  void              DrawDot(cpFloat size, cpVect pos, cpSpaceDebugColor color);
+  cpSpaceDebugColor DrawColorForShape(cpShape* shape);
+
+private:
+  bool OnRender(const Dali::RenderCallbackInput& input);
+  void Setup();
+  void PrepareShader();
+  void RenderLines(const Dali::RenderCallbackInput& input);
+
+  Vertex* PushVertices(uint32_t vertexCount, uint32_t indexCount, const uint16_t* indices);
+  Vertex  MakeVertex(cpVect pos, float u, float v, float r, Vector4 fill, Vector4 outline);
+
+private:
+  CameraActor                           mCamera;
+  cpSpaceDebugDrawOptions               mDebugDrawOptions;
+  Renderer                              mDebugRenderer;
+  std::unique_ptr<Dali::RenderCallback> mRenderCallback;
+
+  enum class State
+  {
+    INIT,
+    RENDER
+  } mState{State::INIT};
+
+  std::vector<Vertex>   mVertices;
+  std::vector<uint16_t> mIndices;
+
+  Dali::Matrix    mModelViewMatrix;
+  Dali::Matrix    mViewMatrix;
+  Dali::Matrix    mProjectionMatrix;
+  int             mWidth;
+  int             mHeight;
+  PhysicsAdaptor& mAdaptor;
+
+  float  mPointLineScale{2.0f};
+  GLint  mPositionLocation;
+  GLint  mUvsLocation;
+  GLint  mRadiusLocation;
+  GLint  mFillColourLocation;
+  GLint  mOutlineColourLocation;
+  GLint  mProjectionLocation;
+  GLint  mModelViewLocation;
+  GLuint mIndexBufferId;
+  GLuint mVertexBufferId;
+  GLuint mProgramId;
+};
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.cpp b/dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.cpp
new file mode 100644
index 0000000..353dc7f
--- /dev/null
+++ b/dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.cpp
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.h>
+
+// External Headers
+
+// Internal Headers
+#include <dali/dali.h>
+#include <dali/devel-api/common/stage-devel.h>
+#include <dali/devel-api/update/frame-callback-interface.h>
+
+namespace
+{
+inline cpVect ConvertVector(Dali::Vector3 vector)
+{
+  return cpv(vector.x, vector.y);
+}
+
+static void ShapeFreeWrap(cpSpace* space, cpShape* shape, void* unused)
+{
+  cpSpaceRemoveShape(space, shape);
+  cpShapeFree(shape);
+}
+
+static void PostShapeFree(cpShape* shape, cpSpace* space)
+{
+  cpSpaceAddPostStepCallback(space, (cpPostStepFunc)ShapeFreeWrap, shape, NULL);
+}
+
+static void ConstraintFreeWrap(cpSpace* space, cpConstraint* constraint, void* unused)
+{
+  cpSpaceRemoveConstraint(space, constraint);
+  cpConstraintFree(constraint);
+}
+
+static void PostConstraintFree(cpConstraint* constraint, cpSpace* space)
+{
+  cpSpaceAddPostStepCallback(space, (cpPostStepFunc)ConstraintFreeWrap, constraint, NULL);
+}
+
+static void BodyFreeWrap(cpSpace* space, cpBody* body, void* unused)
+{
+  cpSpaceRemoveBody(space, body);
+  cpBodyFree(body);
+}
+
+static void PostBodyFree(cpBody* body, cpSpace* space)
+{
+  cpSpaceAddPostStepCallback(space, (cpPostStepFunc)BodyFreeWrap, body, NULL);
+}
+} // namespace
+
+namespace Dali::Toolkit::Physics::Internal
+{
+std::unique_ptr<PhysicsWorld> ChipmunkPhysicsWorld::New(Dali::Actor rootActor, Dali::CallbackBase* updateCallback)
+{
+  std::unique_ptr<ChipmunkPhysicsWorld> world = std::make_unique<ChipmunkPhysicsWorld>(rootActor, updateCallback);
+  world->Initialize();
+  return world;
+}
+
+ChipmunkPhysicsWorld::ChipmunkPhysicsWorld(Dali::Actor rootActor, Dali::CallbackBase* updateCallback)
+: PhysicsWorld(rootActor, updateCallback)
+{
+}
+
+void ChipmunkPhysicsWorld::OnInitialize(/*void* dynamicsWorld*/)
+{
+  // @todo Should enable developer to optionally supply their own created cpSpace.
+  mSpace = cpSpaceNew();
+  cpSpaceSetIterations(mSpace, 30);
+  cpSpaceSetSleepTimeThreshold(mSpace, 0.5f);
+  cpSpaceSetGravity(mSpace, cpv(0, -200));
+}
+
+ChipmunkPhysicsWorld::~ChipmunkPhysicsWorld()
+{
+  Lock();
+  if(mSpace)
+  {
+    cpSpaceEachShape(mSpace, (cpSpaceShapeIteratorFunc)PostShapeFree, mSpace);
+    cpSpaceEachConstraint(mSpace, (cpSpaceConstraintIteratorFunc)PostConstraintFree, mSpace);
+    cpSpaceEachBody(mSpace, (cpSpaceBodyIteratorFunc)PostBodyFree, mSpace);
+    cpSpaceFree(mSpace);
+    mSpace = nullptr;
+  }
+  Unlock();
+}
+
+Dali::Any ChipmunkPhysicsWorld::GetNative()
+{
+  return mSpace;
+}
+
+void ChipmunkPhysicsWorld::Integrate(float timestep)
+{
+  if(mPhysicsIntegrateState == Physics::PhysicsAdaptor::IntegrationState::ON)
+  {
+    cpSpaceStep(mSpace, timestep);
+  }
+
+  if(mPhysicsDebugState == Physics::PhysicsAdaptor::DebugState::ON)
+  {
+    if(mDebugRenderer)
+    {
+      cpSpaceDebugDraw(mSpace, const_cast<cpSpaceDebugDrawOptions*>(&mDebugRenderer->GetDebugDrawOptions()));
+    }
+  }
+}
+
+Dali::Any ChipmunkPhysicsWorld::HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera)
+{
+  cpVect           spacePosition = cpv(rayFromWorld.x, rayFromWorld.y);
+  cpFloat          radius        = 5.0f;
+  cpPointQueryInfo info          = {0};
+  cpShapeFilter    filter        = nativeFilter.Get<cpShapeFilter>();
+  cpShape*         shape         = cpSpacePointQueryNearest(mSpace, spacePosition, radius, filter, &info);
+  cpBody*          hitBody{nullptr};
+
+  if(shape && cpBodyGetMass(cpShapeGetBody(shape)) < INFINITY)
+  {
+    // Use the closest point on the surface if the click is outside the shape.
+    cpVect nearest = (info.distance > 0.0f ? info.point : spacePosition);
+    hitBody        = cpShapeGetBody(shape);
+    cpVect local   = cpBodyWorldToLocal(hitBody, nearest);
+    localPivot.x   = local.x;
+    localPivot.y   = local.y;
+    localPivot.z   = 0.0;
+  }
+
+  Dali::Any bodyPtr;
+  // Only set non-null ptr into bodyPtr, leave empty if null.
+  if(hitBody)
+  {
+    bodyPtr = hitBody;
+  }
+  return bodyPtr;
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.h b/dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.h
new file mode 100644
index 0000000..10ba5e8
--- /dev/null
+++ b/dali-physics/internal/chipmunk-impl/chipmunk-physics-world-impl.h
@@ -0,0 +1,66 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-physics/internal/physics-world-impl.h>
+
+#include <chipmunk/chipmunk.h>
+#include <dali-physics/internal/chipmunk-impl/chipmunk-physics-debug-renderer.h>
+#include <memory>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class ChipmunkPhysicsWorld : public PhysicsWorld
+{
+public:
+  static std::unique_ptr<PhysicsWorld> New(Dali::Actor rootActor, Dali::CallbackBase* updateCallback);
+
+  ChipmunkPhysicsWorld(Dali::Actor rootActor, Dali::CallbackBase* updateCallback);
+  ~ChipmunkPhysicsWorld() override;
+
+  void OnInitialize(/*void* dynamicsWorld*/) override;
+
+  Dali::Any GetNative() override;
+
+  void Integrate(float timestep) override;
+
+  Dali::Any HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera) override;
+
+  /**
+   * Set the debug renderer. PhysicsWorld will take ownership
+   */
+  void SetDebugRenderer(PhysicsDebugRenderer* renderer)
+  {
+    mDebugRenderer.reset(renderer);
+  }
+
+  PhysicsDebugRenderer& GetDebugRenderer()
+  {
+    return *mDebugRenderer.get();
+  }
+
+  bool HasDebugRenderer()
+  {
+    return mDebugRenderer.get() != nullptr;
+  }
+
+private:
+  cpSpace*                              mSpace{nullptr};
+  std::unique_ptr<PhysicsDebugRenderer> mDebugRenderer;
+};
+
+} //namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/file.list b/dali-physics/internal/file.list
new file mode 100644
index 0000000..19137dd
--- /dev/null
+++ b/dali-physics/internal/file.list
@@ -0,0 +1,21 @@
+set(physics_internal_dir ${physics_dir}/internal)
+set(physics2d_internal_dir ${physics_internal_dir}/chipmunk-impl)
+set(physics3d_internal_dir ${physics_internal_dir}/bullet-impl)
+
+set(physics2d_src_files ${physics_src_files}
+  ${physics2d_internal_dir}/chipmunk-physics-actor-impl.cpp
+  ${physics2d_internal_dir}/chipmunk-physics-adaptor-impl.cpp
+  ${physics2d_internal_dir}/chipmunk-physics-debug-renderer.cpp
+  ${physics2d_internal_dir}/chipmunk-physics-world-impl.cpp
+  ${physics_internal_dir}/physics-adaptor-impl.cpp
+  ${physics_internal_dir}/physics-world-impl.cpp
+)
+
+set(physics3d_src_files ${physics_src_files}
+  ${physics3d_internal_dir}/bullet-physics-actor-impl.cpp
+  ${physics3d_internal_dir}/bullet-physics-adaptor-impl.cpp
+  ${physics3d_internal_dir}/bullet-physics-debug-renderer.cpp
+  ${physics3d_internal_dir}/bullet-physics-world-impl.cpp
+  ${physics_internal_dir}/physics-adaptor-impl.cpp
+  ${physics_internal_dir}/physics-world-impl.cpp
+)
diff --git a/dali-physics/internal/physics-actor-impl.h b/dali-physics/internal/physics-actor-impl.h
new file mode 100644
index 0000000..6aa2624
--- /dev/null
+++ b/dali-physics/internal/physics-actor-impl.h
@@ -0,0 +1,123 @@
+#ifndef DALI_TOOLKIT_PHYSICS_INTERNAL_ACTOR_H
+#define DALI_TOOLKIT_PHYSICS_INTERNAL_ACTOR_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <dali-physics/public-api/physics-actor.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali::Toolkit::Physics
+{
+namespace Internal
+{
+class PhysicsActor;
+class PhysicsAdaptor;
+
+using PhysicsActorPtr = Dali::IntrusivePtr<PhysicsActor>;
+
+class PhysicsActor : public Dali::BaseObject
+{
+public:
+  PhysicsActor(Dali::Actor actor, Dali::Any body, PhysicsAdaptor& adaptor);
+  ~PhysicsActor() override;
+  PhysicsActor(const PhysicsActor& handle) = delete;
+  PhysicsActor& operator=(const PhysicsActor& handle) = delete;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::New()
+   */
+  static PhysicsActorPtr New(Dali::Actor actor, Dali::Any body, PhysicsAdaptor& adaptor);
+
+  void Initialize(void);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::GetId
+   */
+  uint32_t GetId() const
+  {
+    return mActorId;
+  }
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::GetBody
+   */
+  Dali::Any GetBody() const
+  {
+    return mBody;
+  }
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::AsyncSetPhysicsPosition
+   */
+  void AsyncSetPhysicsPosition(Dali::Vector3 actorPosition);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::AsyncSetPhysicsRotation
+   */
+  void AsyncSetPhysicsRotation(Dali::Quaternion actorRotation);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::GetPhysicsPosition
+   */
+  Dali::Vector3 GetPhysicsPosition() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::GetPhysicsRotation
+   */
+  Dali::Quaternion GetPhysicsRotation() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::GetActorPosition
+   */
+  Dali::Vector3 GetActorPosition() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsActor::GetActorRotation
+   */
+  Dali::Quaternion GetActorRotation() const;
+
+private:
+  PhysicsAdaptor& mAdaptor;
+  uint32_t        mActorId{0};
+  Dali::Any       mBody;
+};
+
+} // namespace Internal
+
+inline Internal::PhysicsActor& GetImplementation(Physics::PhysicsActor& physics)
+{
+  DALI_ASSERT_ALWAYS(physics && "Physics actor handle is empty");
+  BaseObject& handle = physics.GetBaseObject();
+  return static_cast<Internal::PhysicsActor&>(handle);
+}
+
+inline const Internal::PhysicsActor& GetImplementation(const Physics::PhysicsActor& physics)
+{
+  DALI_ASSERT_ALWAYS(physics && "Physics actor handle is empty");
+  const BaseObject& handle = physics.GetBaseObject();
+  return static_cast<const Internal::PhysicsActor&>(handle);
+}
+
+} // namespace Dali::Toolkit::Physics
+
+#endif //DALI_TOOLKIT_PHYSICS_INTERNAL_ACTOR_H
diff --git a/dali-physics/internal/physics-adaptor-impl.cpp b/dali-physics/internal/physics-adaptor-impl.cpp
new file mode 100644
index 0000000..e9bfe82
--- /dev/null
+++ b/dali-physics/internal/physics-adaptor-impl.cpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/physics-adaptor-impl.h>
+
+// External Headers
+#include <memory>
+#include <utility>
+
+// Internal Headers
+#include <dali-physics/internal/physics-world-impl.h>
+#include <dali/dali.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/drawable-actor.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, false, "LOG_PHYSICS");
+#endif
+
+} // namespace
+
+namespace Dali::Toolkit::Physics::Internal
+{
+PhysicsAdaptor::PhysicsAdaptor()
+: mSlotDelegate(this)
+{
+}
+
+PhysicsAdaptor::~PhysicsAdaptor()
+{
+}
+
+void PhysicsAdaptor::Initialize(const Dali::Matrix& transform, Uint16Pair worldSize)
+{
+  // Create an actor that can handle mouse events.
+  // @todo Enable this to be fully configured / provided
+  mRootActor                                 = Layer::New();
+  mRootActor[Actor::Property::NAME]          = "PhysicsRootLayer";
+  mRootActor[Layer::Property::BEHAVIOR]      = Layer::LAYER_3D;
+  mRootActor[Layer::Property::DEPTH_TEST]    = true;
+  mRootActor[Actor::Property::SIZE]          = Vector2(worldSize.GetWidth(), worldSize.GetHeight());
+  mRootActor[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+  mRootActor[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+
+  // Initialize derived adaptor (and world)
+  OnInitialize(transform, worldSize);
+}
+
+void PhysicsAdaptor::SetTimestep(float timestep)
+{
+  mPhysicsWorld->SetTimestep(timestep);
+}
+
+float PhysicsAdaptor::GetTimestep() const
+{
+  return mPhysicsWorld->GetTimestep();
+}
+
+Physics::PhysicsAdaptor::ScopedPhysicsAccessorPtr PhysicsAdaptor::GetPhysicsAccessor()
+{
+  return std::unique_ptr<Physics::PhysicsAdaptor::ScopedPhysicsAccessor>(new Physics::PhysicsAdaptor::ScopedPhysicsAccessor(*mPhysicsWorld.get()));
+}
+
+void PhysicsAdaptor::SetIntegrationState(Physics::PhysicsAdaptor::IntegrationState state)
+{
+  mPhysicsWorld->SetIntegrationState(state);
+}
+
+Physics::PhysicsAdaptor::IntegrationState PhysicsAdaptor::GetIntegrationState() const
+{
+  return mPhysicsWorld->GetIntegrationState();
+}
+
+void PhysicsAdaptor::SetDebugState(Physics::PhysicsAdaptor::DebugState state)
+{
+  mPhysicsWorld->SetDebugState(state);
+}
+
+Physics::PhysicsAdaptor::DebugState PhysicsAdaptor::GetDebugState() const
+{
+  return mPhysicsWorld->GetDebugState();
+}
+
+Dali::Actor PhysicsAdaptor::GetRootActor() const
+{
+  return mRootActor;
+}
+
+void PhysicsAdaptor::OnUpdateActors(Dali::UpdateProxy* updateProxy)
+{
+  for(auto&& actor : mPhysicsActors)
+  {
+    // Get position, orientation from physics world.
+    Vector3 position = actor.second->GetActorPosition();
+    updateProxy->BakePosition(actor.first, position);
+    Quaternion rotation = actor.second->GetActorRotation();
+    updateProxy->BakeOrientation(actor.first, rotation);
+  }
+}
+
+void PhysicsAdaptor::Queue(std::function<void()> function)
+{
+  mPhysicsWorld->Queue(function);
+}
+
+void PhysicsAdaptor::CreateSyncPoint()
+{
+  mPhysicsWorld->CreateSyncPoint();
+}
+
+std::unique_ptr<PhysicsWorld>& PhysicsAdaptor::GetPhysicsWorld()
+{
+  return mPhysicsWorld;
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/physics-adaptor-impl.h b/dali-physics/internal/physics-adaptor-impl.h
new file mode 100644
index 0000000..fb3939b
--- /dev/null
+++ b/dali-physics/internal/physics-adaptor-impl.h
@@ -0,0 +1,214 @@
+#ifndef DALI_TOOLKIT_PHYSICS_INTERNAL_ADAPTOR_H
+#define DALI_TOOLKIT_PHYSICS_INTERNAL_ADAPTOR_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or adaptoried.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-object.h>
+#include <memory>
+#include <unordered_map>
+
+// INTERNAL INCLUDES
+#include <dali-physics/internal/physics-actor-impl.h>
+#include <dali-physics/internal/physics-world-impl.h>
+#include <dali-physics/public-api/physics-adaptor.h>
+
+namespace Dali::Toolkit::Physics
+{
+namespace Internal
+{
+class PhysicsAdaptor;
+class PhysicsDebugRenderer;
+
+using PhysicsAdaptorPtr = IntrusivePtr<PhysicsAdaptor>;
+
+// Declaration of factory function, implemented by derived class
+PhysicsAdaptorPtr CreateNewPhysicsAdaptor(const Dali::Matrix& transform, Uint16Pair worldSize);
+
+class PhysicsAdaptor : public BaseObject
+{
+public:
+  PhysicsAdaptor();
+
+  /**
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~PhysicsAdaptor() override;
+
+  // Remove copy constructor and copy assignment
+  PhysicsAdaptor(const PhysicsAdaptor& handle) = delete;
+  PhysicsAdaptor& operator=(const PhysicsAdaptor& handle) = delete;
+
+  /**
+   * 2nd stage initialization
+   */
+  void         Initialize(const Dali::Matrix& transform, Uint16Pair size);
+  virtual void OnInitialize(const Dali::Matrix& transform, Uint16Pair size) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetTimestep
+   */
+  void SetTimestep(float timestep);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetTimestep
+   */
+  float GetTimestep() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetPhysicsAccessor
+   */
+  Physics::PhysicsAdaptor::ScopedPhysicsAccessorPtr GetPhysicsAccessor();
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::CreateDebugLayer
+   */
+  virtual Dali::Layer CreateDebugLayer(Dali::Window window) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateToPhysicsSpace
+   */
+  virtual Dali::Vector3 TranslateToPhysicsSpace(Dali::Vector3 vector) const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateToPhysicsSpace
+   */
+  virtual Dali::Quaternion TranslateToPhysicsSpace(Dali::Quaternion rotation) const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateFromPhysicsSpace
+   */
+  virtual Dali::Vector3 TranslateFromPhysicsSpace(Dali::Vector3 vector) const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::TranslateFromPhysicsSpace
+   */
+  virtual Dali::Quaternion TranslateFromPhysicsSpace(Quaternion rotation) const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ConvertVectorToPhysicsSpace
+   */
+  virtual Dali::Vector3 ConvertVectorToPhysicsSpace(Dali::Vector3 vector) const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ConvertVectorFromPhysicsSpace
+   */
+  virtual Dali::Vector3 ConvertVectorFromPhysicsSpace(Dali::Vector3 vector) const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetTransformAndSize
+   */
+  virtual void SetTransformAndSize(const Dali::Matrix& transform, Uint16Pair size) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetIntegrationState
+   */
+  void SetIntegrationState(Physics::PhysicsAdaptor::IntegrationState state);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetIntegrationState
+   */
+  Physics::PhysicsAdaptor::IntegrationState GetIntegrationState() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetDebugState
+   */
+  void SetDebugState(Physics::PhysicsAdaptor::DebugState state);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetDebugState
+   */
+  Physics::PhysicsAdaptor::DebugState GetDebugState() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::AddActorBody
+   */
+  virtual PhysicsActorPtr AddActorBody(Dali::Actor actor, Dali::Any body) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::RemoveActorBody
+   */
+  virtual void RemoveActorBody(PhysicsActor& physicsActor) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetPhysicsActor
+   */
+  virtual PhysicsActorPtr GetPhysicsActor(Dali::Any body) const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetRootActor
+   */
+  Dali::Actor GetRootActor() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::BuildPickingRay
+   */
+  virtual void BuildPickingRay(Dali::Vector3 origin, Dali::Vector3 direction, Dali::Vector3& rayFromWorld, Dali::Vector3& rayToWorld) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::ProjectPoint
+   */
+  virtual Dali::Vector3 ProjectPoint(Dali::Vector3 origin, Dali::Vector3 direction, float distance) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::Queue
+   */
+  void Queue(std::function<void(void)> function);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::Queue
+   */
+  void CreateSyncPoint();
+
+  /**
+   * Handle the update of all of the known bound actors
+   */
+  void OnUpdateActors(Dali::UpdateProxy* updateProxy);
+
+  std::unique_ptr<PhysicsWorld>& GetPhysicsWorld();
+
+protected:
+  std::unique_ptr<PhysicsWorld>                 mPhysicsWorld;
+  std::unordered_map<uint32_t, PhysicsActorPtr> mPhysicsActors;
+  Dali::Actor                                   mRootActor;
+
+  Dali::Matrix     mTransform;
+  Dali::Matrix     mInverseTransform;
+  Dali::Uint16Pair mSize;
+
+  Dali::SlotDelegate<PhysicsAdaptor> mSlotDelegate;
+};
+
+} //namespace Internal
+
+inline Internal::PhysicsAdaptor& GetImplementation(Dali::Toolkit::Physics::PhysicsAdaptor& handle)
+{
+  DALI_ASSERT_ALWAYS(handle && "Physics adaptor handle is empty");
+  BaseObject& object = handle.GetBaseObject();
+  return static_cast<Internal::PhysicsAdaptor&>(object);
+}
+
+inline const Internal::PhysicsAdaptor& GetImplementation(const Dali::Toolkit::Physics::PhysicsAdaptor& handle)
+{
+  DALI_ASSERT_ALWAYS(handle && "Physics adaptor handle is empty");
+  const BaseObject& object = handle.GetBaseObject();
+  return static_cast<const Internal::PhysicsAdaptor&>(object);
+}
+
+} // namespace Dali::Toolkit::Physics
+
+#endif //DALI_TOOLKIT_PHYSICS_INTERNAL_ADAPTOR_H
diff --git a/dali-physics/internal/physics-world-impl.cpp b/dali-physics/internal/physics-world-impl.cpp
new file mode 100644
index 0000000..41da002
--- /dev/null
+++ b/dali-physics/internal/physics-world-impl.cpp
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/internal/physics-world-impl.h>
+
+// External Headers
+
+// Internal Headers
+#include <dali/dali.h>
+#include <dali/devel-api/common/stage-devel.h>
+#include <dali/devel-api/update/frame-callback-interface.h>
+
+thread_local int gLocked{0};
+
+namespace Dali::Toolkit::Physics::Internal
+{
+/**
+ * FrameCallback implementation. Will run the OnUpdate method.
+ */
+class FrameCallback : public Dali::FrameCallbackInterface
+{
+public:
+  /**
+   * Constructor
+   */
+  explicit FrameCallback(PhysicsWorld& physicsWorld)
+  : mPhysicsWorld(physicsWorld)
+  {
+  }
+
+private:
+  /**
+   * Called each frame.
+   * @param[in] updateProxy Used to set world matrix and size
+   * @param[in] elapsedSeconds Time since last frame
+   * @return Whether we should keep rendering.
+   */
+  bool Update(Dali::UpdateProxy& updateProxy, float elapsedSeconds) override
+  {
+    return mPhysicsWorld.OnUpdate(updateProxy, elapsedSeconds);
+  }
+
+private: // Member variables
+  PhysicsWorld& mPhysicsWorld;
+};
+
+PhysicsWorld::PhysicsWorld(Dali::Actor rootActor, Dali::CallbackBase* updateCallback)
+: mUpdateCallback(updateCallback),
+  mRootActor(rootActor)
+{
+}
+
+void PhysicsWorld::Initialize()
+{
+  // Call derived class's initializer
+  OnInitialize();
+
+  // Automatically start the frame callback. This means everything should
+  // be accessed with a mutex lock, which is automatically locked when
+  // ScopedAccessor is used.
+  mFrameCallback = std::make_unique<FrameCallback>(*this);
+  Dali::DevelStage::AddFrameCallback(Dali::Stage::GetCurrent(), *mFrameCallback, mRootActor);
+  Dali::Stage::GetCurrent().KeepRendering(30); // @todo Remove!
+}
+
+PhysicsWorld::~PhysicsWorld()
+{
+  // Derived class's destructor should clean down physics objects under mutex lock
+  // On completion, can remove the callback.
+
+  Dali::DevelStage::RemoveFrameCallback(Dali::Stage::GetCurrent(), *mFrameCallback);
+}
+
+bool PhysicsWorld::OnUpdate(Dali::UpdateProxy& updateProxy, float elapsedSeconds)
+{
+  ScopedLock lock(*this);
+
+  // Process command queue
+  if(mNotifySyncPoint != Dali::UpdateProxy::INVALID_SYNC &&
+     mNotifySyncPoint == updateProxy.PopSyncPoint())
+  {
+    while(!commandQueue.empty())
+    {
+      commandQueue.front()(); // Execute the queued methods
+      commandQueue.pop();
+    }
+
+    mNotifySyncPoint = Dali::UpdateProxy::INVALID_SYNC;
+  }
+
+  // Perform as many integration steps as needed to handle elapsed time
+  static float frameTime = 0;
+  frameTime += elapsedSeconds;
+  do
+  {
+    Integrate(mPhysicsTimeStep);
+    frameTime -= mPhysicsTimeStep;
+  } while(frameTime > 0);
+
+  // Update the corresponding actors to their physics spaces
+  if(mUpdateCallback)
+  {
+    Dali::CallbackBase::Execute(*mUpdateCallback, &updateProxy); // Don't care about actor update return
+  }
+
+  // @todo Check physics world to see if everything is at rest
+  return true;
+}
+
+void PhysicsWorld::SetTimestep(float timeStep)
+{
+  mPhysicsTimeStep = timeStep;
+}
+
+float PhysicsWorld::GetTimestep()
+{
+  return mPhysicsTimeStep;
+}
+
+/**
+ * Lock the mutex.
+ */
+void PhysicsWorld::Lock()
+{
+  //@todo Could replace the mutex with an atomic flag, if it's not set,
+  // the queue and integration step could be skipped
+  if(!gLocked)
+  {
+    gLocked = true;
+    mMutex.lock();
+  }
+}
+
+/**
+ * Unlock the mutex
+ */
+void PhysicsWorld::Unlock()
+{
+  mMutex.unlock();
+  gLocked = false;
+}
+
+void PhysicsWorld::Queue(std::function<void(void)> function)
+{
+  ScopedLock lock(*this);
+  commandQueue.push(function);
+}
+
+void PhysicsWorld::CreateSyncPoint()
+{
+  mNotifySyncPoint = Dali::DevelStage::NotifyFrameCallback(Dali::Stage::GetCurrent(), *mFrameCallback);
+}
+
+void PhysicsWorld::SetIntegrationState(Physics::PhysicsAdaptor::IntegrationState state)
+{
+  mPhysicsIntegrateState = state;
+}
+
+Physics::PhysicsAdaptor::IntegrationState PhysicsWorld::GetIntegrationState()
+{
+  return mPhysicsIntegrateState;
+}
+
+void PhysicsWorld::SetDebugState(Physics::PhysicsAdaptor::DebugState state)
+{
+  mPhysicsDebugState = state;
+}
+
+Physics::PhysicsAdaptor::DebugState PhysicsWorld::GetDebugState()
+{
+  return mPhysicsDebugState;
+}
+
+} // namespace Dali::Toolkit::Physics::Internal
diff --git a/dali-physics/internal/physics-world-impl.h b/dali-physics/internal/physics-world-impl.h
new file mode 100644
index 0000000..f14f546
--- /dev/null
+++ b/dali-physics/internal/physics-world-impl.h
@@ -0,0 +1,187 @@
+#ifndef DALI_TOOLKIT_PHYSICS_INTERNAL_PHYSICS_WORLD_H
+#define DALI_TOOLKIT_PHYSICS_INTERNAL_PHYSICS_WORLD_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali/dali.h>
+#include <dali/devel-api/update/frame-callback-interface.h>
+#include <dali/devel-api/update/update-proxy.h>
+
+#include <dali-physics/public-api/physics-adaptor.h>
+
+#include <functional>
+#include <mutex>
+#include <queue>
+
+namespace Dali::Toolkit::Physics::Internal
+{
+class PhysicsWorld;
+class FrameCallback;
+
+/**
+ * Abstract class that handles the update frame callback, queuing and calling
+ * functions before the integration step ; calling the integration step,
+ * and owning the mutex for the update callback.
+ *
+ * Implementing classes should also hold the physics world.
+ */
+class PhysicsWorld
+{
+public:
+  /**
+   * Create a new physics world.
+   */
+  static std::unique_ptr<PhysicsWorld> New(Dali::Actor rootActor, Dali::CallbackBase* updateCallback);
+
+  /**
+   * Constructor which takes the root actor and a callback from the PhysicsAdaptor
+   * @param[in] rootActor The root actor that physics actors will be added to
+   * @param[in] updateCallback A callback from the PhysicsAdaptor which updates the physics actors after the integration step
+   */
+  PhysicsWorld(Dali::Actor rootActor, Dali::CallbackBase* updateCallback);
+
+  /**
+   * Virtual destructor.
+   * Note, removes the frame callback.
+   */
+  virtual ~PhysicsWorld();
+
+  /**
+   * Initialize derived classes and creates the frame callback
+   */
+  void Initialize();
+
+  /**
+   * Initialize the derived class
+   */
+  virtual void OnInitialize() = 0;
+
+  /**
+   * Get the native physics world / space.
+   * @return A pointer to the physics world / space
+   */
+  virtual Dali::Any GetNative() = 0;
+
+  /**
+   * Set how long the integration should take.
+   * @param[in] timestep The length of time that the physics integration should take.
+   */
+  void SetTimestep(float timestep);
+
+  /**
+   * Get the current physics integration timestep
+   * @return the current physics integration timestep
+   */
+  float GetTimestep();
+
+  /**
+   * Lock the mutex.
+   */
+  void Lock();
+
+  /**
+   * Unlock the mutex
+   */
+  void Unlock();
+
+  class ScopedLock
+  {
+  public:
+    ScopedLock(PhysicsWorld& world)
+    : mWorld(world)
+    {
+      mWorld.Lock();
+    }
+    ~ScopedLock()
+    {
+      mWorld.Unlock();
+    }
+    PhysicsWorld& mWorld;
+  };
+
+  /**
+   * Queue a function for execution in the update thread, prior to the physics integration.
+   * Enables syncronization of DALi properties and physics controlled properties.
+   */
+  void Queue(std::function<void(void)> function);
+
+  /**
+   * Create a sync point for queued functions.
+   *
+   * Ensures that any queued functions are processed after this sync
+   * point is seen in the Update::FrameCallback, which will be in the
+   * same frame as any other DALi properties set during this event
+   * handler invocation.
+   *
+   * @param[in] None
+   */
+  void CreateSyncPoint();
+
+  /**
+   * Hit test the physics world and return the nearest body.
+   *
+   * @param[in] rayFromWorld The origin in physics world space
+   * @param[in] rayToWorld A point along the direction on the far side of the physics world
+   * @param[in] nativeFilter a native body / shape filter
+   * @param[out] localPivot The hit point local to the body
+   * @param[out] distanceFromCamera The distance of the pick point from the camera
+   * @return Empty value if no dynamic body found, otherwise a valid ptr to the hit body.
+   */
+  virtual Dali::Any HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetIntegrationState
+   */
+  void SetIntegrationState(Physics::PhysicsAdaptor::IntegrationState state);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetIntegrationState
+   */
+  Physics::PhysicsAdaptor::IntegrationState GetIntegrationState();
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::SetDebugState
+   */
+  void SetDebugState(Physics::PhysicsAdaptor::DebugState state);
+
+  /**
+   * @copydoc Dali::Toolkit::Physics::PhysicsAdaptor::GetDebugState
+   */
+  Physics::PhysicsAdaptor::DebugState GetDebugState();
+
+public:
+  bool OnUpdate(Dali::UpdateProxy& updateProxy, float elapsedSeconds);
+
+protected:
+  virtual void Integrate(float timestep) = 0;
+
+protected:
+  std::mutex                            mMutex;
+  std::queue<std::function<void(void)>> commandQueue;
+  Dali::UpdateProxy::NotifySyncPoint    mNotifySyncPoint{Dali::UpdateProxy::INVALID_SYNC};
+  Dali::CallbackBase*                   mUpdateCallback{nullptr};
+  std::unique_ptr<FrameCallback>        mFrameCallback;
+  Dali::Actor                           mRootActor;
+
+  float                                     mPhysicsTimeStep{1.0 / 180.0};
+  Physics::PhysicsAdaptor::IntegrationState mPhysicsIntegrateState{Physics::PhysicsAdaptor::IntegrationState::ON};
+  Physics::PhysicsAdaptor::DebugState       mPhysicsDebugState{Physics::PhysicsAdaptor::DebugState::OFF};
+};
+
+} // namespace Dali::Toolkit::Physics::Internal
+
+#endif //DALI_TOOLKIT_PHYSICS_INTERNAL_PHYSICS_WORLD_H
diff --git a/dali-physics/public-api/file.list b/dali-physics/public-api/file.list
new file mode 100644
index 0000000..6cb7384
--- /dev/null
+++ b/dali-physics/public-api/file.list
@@ -0,0 +1,12 @@
+set(physics_public_api_dir "${physics_dir}/public-api")
+
+set(physics_src_files ${physics_src_files}
+	${physics_public_api_dir}/physics-actor.cpp
+	${physics_public_api_dir}/physics-adaptor.cpp
+	${physics_public_api_dir}/scoped-physics-accessor.cpp
+)
+
+set(physics_public_api_header_files
+	${physics_public_api_dir}/physics-actor.h
+	${physics_public_api_dir}/physics-adaptor.h
+)
diff --git a/dali-physics/public-api/physics-actor.cpp b/dali-physics/public-api/physics-actor.cpp
new file mode 100644
index 0000000..5058520
--- /dev/null
+++ b/dali-physics/public-api/physics-actor.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/public-api/physics-actor.h>
+
+// Internal headers
+#include <dali-physics/internal/physics-actor-impl.h>
+#include <dali-physics/internal/physics-adaptor-impl.h>
+
+namespace Dali::Toolkit::Physics
+{
+PhysicsActor::PhysicsActor()                            = default;
+PhysicsActor::~PhysicsActor()                           = default;
+PhysicsActor::PhysicsActor(const PhysicsActor& handle)  = default;
+PhysicsActor::PhysicsActor(PhysicsActor&& rhs) noexcept = default;
+PhysicsActor& PhysicsActor::operator=(const PhysicsActor& handle) = default;
+PhysicsActor& PhysicsActor::operator=(PhysicsActor&& handle) noexcept = default;
+
+PhysicsActor PhysicsActor::New(Dali::Actor actor, Dali::Any body, PhysicsAdaptor adaptor)
+{
+  Dali::Toolkit::Physics::Internal::PhysicsActorPtr internal = Internal::PhysicsActor::New(actor, body, GetImplementation(adaptor));
+  return PhysicsActor(internal.Get());
+}
+
+PhysicsActor PhysicsActor::DownCast(BaseHandle handle)
+{
+  return PhysicsActor(dynamic_cast<Dali::Toolkit::Physics::Internal::PhysicsActor*>(handle.GetObjectPtr()));
+}
+
+uint32_t PhysicsActor::GetId() const
+{
+  return GetImplementation(*this).GetId();
+}
+
+Dali::Any PhysicsActor::GetBody() const
+{
+  return GetImplementation(*this).GetBody();
+}
+
+void PhysicsActor::AsyncSetPhysicsPosition(Dali::Vector3 actorPosition)
+{
+  GetImplementation(*this).AsyncSetPhysicsPosition(actorPosition);
+}
+
+void PhysicsActor::AsyncSetPhysicsRotation(Dali::Quaternion actorRotation)
+{
+  GetImplementation(*this).AsyncSetPhysicsRotation(actorRotation);
+}
+
+Dali::Vector3 PhysicsActor::GetPhysicsPosition() const
+{
+  return GetImplementation(*this).GetPhysicsPosition();
+}
+
+Dali::Quaternion PhysicsActor::GetPhysicsRotation() const
+{
+  return GetImplementation(*this).GetPhysicsRotation();
+}
+
+Dali::Vector3 PhysicsActor::GetActorPosition() const
+{
+  return GetImplementation(*this).GetActorPosition();
+}
+
+Dali::Quaternion PhysicsActor::GetActorRotation() const
+{
+  return GetImplementation(*this).GetActorRotation();
+}
+
+PhysicsActor::PhysicsActor(Internal::PhysicsActor* impl)
+: BaseHandle(impl)
+{
+}
+
+} // namespace Dali::Toolkit::Physics
diff --git a/dali-physics/public-api/physics-actor.h b/dali-physics/public-api/physics-actor.h
new file mode 100644
index 0000000..616c7b2
--- /dev/null
+++ b/dali-physics/public-api/physics-actor.h
@@ -0,0 +1,227 @@
+#ifndef DALI_TOOLKIT_PHYSICS_ACTOR_H
+#define DALI_TOOLKIT_PHYSICS_ACTOR_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/object/base-handle.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali::Toolkit::Physics
+{
+class PhysicsAdaptor;
+
+namespace Internal
+{
+class PhysicsActor;
+}
+
+/**
+ * Class to associate a physics body (such as btRigidBody*) with a DALi
+ * actor for rendering.
+ *
+ * This object offers methods to modify basic physics properties
+ * asynchronously, that is, on the Update thread. It is also possible
+ * for the developer to queue other physics functions on the body by
+ * using PhysicsWorld::Queue() and passing in a lambda that captures the
+ * body.
+ *
+ * For example:
+ *   btRigidBody* body = physicsActor.GetBody().Get<btRigidBody*>();
+ *   mPhysicsImpl.Queue([body](){ body->clearForces(); });
+ * This enables the developer to synchronize setting physics properties
+ * and setting DALi actor properties.
+ */
+class DALI_TOOLKIT_API PhysicsActor : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Constructor
+   *
+   * @SINCE_2_2.43
+   */
+  PhysicsActor();
+
+  /**
+   * @brief Destructor.
+   *
+   * @SINCE_2_2.43
+   * This is non-virtual since derived Handle types must not contain data or virtual methods
+   */
+  ~PhysicsActor();
+
+  /**
+   * @brief Copy Constructor.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle The handle to copy
+   * @note This creates a new handle, but does not create a new implementation object.
+   */
+  PhysicsActor(const PhysicsActor& handle);
+
+  /**
+   * @brief Move Constructor.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle A reference to the handle to move
+   */
+  PhysicsActor(PhysicsActor&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle A reference to the handle to move
+   * @return a reference to this handle
+   */
+  PhysicsActor& operator=(const PhysicsActor& handle);
+
+  /**
+   * @brief Move Assignment operator.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle A reference to the handle to move
+   * @return a reference to this handle
+   */
+  PhysicsActor& operator=(PhysicsActor&& handle) noexcept;
+
+  /**
+   * New method.
+   * @SINCE_2_2.43
+   *
+   * Binds the actor to the given body. This should be a body that has
+   * been added to the physics world, and has physical postion and
+   * rotation in that space. The Actor is used to render that object in
+   * DALi space.
+   *
+   * @note This object only stores the actor ID, which is used
+   * internally in the FrameCallback. It is up to the caller to ensure
+   * there is a reference to the actor (e.g. by parenting into the scene)
+   *
+   * @note This API is used internally, and is of little benefit to the developer.
+   *
+   * @param[in] actor The DALi actor used to render this object
+   * @param[in] body The physics body used in the physics simulation
+   * @param[in] adaptor The physics adaptor to use. @todo remove?
+   */
+  static PhysicsActor New(Dali::Actor actor, Dali::Any body, PhysicsAdaptor adaptor);
+
+  /**
+   * @brief Downcasts a handle to PhysicsActor handle.
+   *
+   * If handle points to an PhysicsActor object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle to an object
+   * @return handle to a PhysicsActor object or an uninitialized handle
+   */
+  static PhysicsActor DownCast(BaseHandle handle);
+
+  /**
+   * @brief Get the actor ID of the associated actor.
+   *
+   * @SINCE_2_2.43
+   */
+  uint32_t GetId() const;
+
+  /**
+   * @brief Get the actual physics body of this object.
+   *
+   * @SINCE_2_2.43
+   * Using ANY wrapper to enable this interface to be used for any
+   * types of physics bodies from either 2d or 3d physics.
+   * @return The physics body. It can be cast to an appropriate type,
+   * for example:
+   *   btRigidBody* body = actor.GetBody().Get<btRigidBody*>();
+   *
+   * @note Please ensure to get a scoped accessor first to avoid modifying
+   * physics properties during integration step, or use the Async methods
+   * or the Queue.
+   */
+  Dali::Any GetBody() const;
+
+  /**
+   * @brief Queue a method to set the position on the associated physics body
+   * in the update thread before the next integration.
+   *
+   * @SINCE_2_2.43
+   * @param[in] actorPosition The position of the actor in DALi space
+   */
+  void AsyncSetPhysicsPosition(Dali::Vector3 actorPosition);
+
+  /**
+   * @brief Queue a method to set the rotation of the associated physics body
+   * in the update thread before the next integration.
+   *
+   * @SINCE_2_2.43
+   * @param[in] actorRotation The orientation of the actor in DALi space
+   */
+  void AsyncSetPhysicsRotation(Dali::Quaternion actorRotation);
+
+  /**
+   * @brief Get the current position of the physics body in Physics space.
+   *
+   * @SINCE_2_2.43
+   * @return the current position of the physics body in Physics space.
+   */
+  Dali::Vector3 GetPhysicsPosition() const;
+
+  /**
+   * @brief Get the current rotation of the physics body in Physics space.
+   *
+   * @SINCE_2_2.43
+   * @return the current rotation of the physics body in Physics space.
+   */
+  Dali::Quaternion GetPhysicsRotation() const;
+
+  /**
+   * @brief Get the current position of the physics body in DALi space.
+   *
+   * @SINCE_2_2.43
+   * @return the current position of the physics body in DALi space.
+   */
+  Dali::Vector3 GetActorPosition() const;
+
+  /**
+   * @brief Get the current rotation of the physics body in DALi space.
+   *
+   * @SINCE_2_2.43
+   * @return the current rotation of the physics body in DALi space.
+   */
+  Dali::Quaternion GetActorRotation() const;
+
+public: // Not intended for developer use
+  /// @cond internal
+  /**
+   * @brief This constructor is used by PhysicsActor::New() methods.
+   *
+   * @SINCE_2_2.43
+   * @param[in] impl A pointer to a newly allocated Dali resource.
+   * @note Not intended for application developers
+   */
+  explicit DALI_INTERNAL PhysicsActor(Internal::PhysicsActor* impl);
+  /// @endcond
+};
+
+} // namespace Dali::Toolkit::Physics
+
+#endif //DALI_TOOLKIT_PHYSICS_ACTOR_H
diff --git a/dali-physics/public-api/physics-adaptor.cpp b/dali-physics/public-api/physics-adaptor.cpp
new file mode 100644
index 0000000..5cc274b
--- /dev/null
+++ b/dali-physics/public-api/physics-adaptor.cpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Class Header
+#include <dali-physics/public-api/physics-adaptor.h>
+
+// Internal headers
+#include <dali-physics/internal/physics-actor-impl.h>
+#include <dali-physics/internal/physics-adaptor-impl.h>
+#include <dali-physics/public-api/physics-actor.h>
+
+namespace Dali::Toolkit::Physics
+{
+PhysicsAdaptor::PhysicsAdaptor() = default;
+
+PhysicsAdaptor::~PhysicsAdaptor() = default;
+
+PhysicsAdaptor::PhysicsAdaptor(const PhysicsAdaptor& handle) = default;
+
+PhysicsAdaptor::PhysicsAdaptor(PhysicsAdaptor&& rhs) noexcept = default;
+
+PhysicsAdaptor& PhysicsAdaptor::operator=(const PhysicsAdaptor& handle) = default;
+
+PhysicsAdaptor& PhysicsAdaptor::operator=(PhysicsAdaptor&& handle) noexcept = default;
+
+PhysicsAdaptor PhysicsAdaptor::New(const Dali::Matrix& transform, Uint16Pair size)
+{
+  Internal::PhysicsAdaptorPtr internal = Internal::CreateNewPhysicsAdaptor(transform, size);
+  return PhysicsAdaptor(internal.Get());
+}
+
+PhysicsAdaptor PhysicsAdaptor::DownCast(BaseHandle handle)
+{
+  return PhysicsAdaptor(dynamic_cast<Dali::Toolkit::Physics::Internal::PhysicsAdaptor*>(handle.GetObjectPtr()));
+}
+
+void PhysicsAdaptor::SetTimestep(float timestep)
+{
+  GetImplementation(*this).SetTimestep(timestep);
+}
+
+float PhysicsAdaptor::GetTimestep() const
+{
+  return GetImplementation(*this).GetTimestep();
+}
+
+PhysicsAdaptor::ScopedPhysicsAccessorPtr PhysicsAdaptor::GetPhysicsAccessor()
+{
+  return GetImplementation(*this).GetPhysicsAccessor();
+}
+
+Dali::Layer PhysicsAdaptor::CreateDebugLayer(Dali::Window window)
+{
+  return GetImplementation(*this).CreateDebugLayer(window);
+}
+
+Dali::Vector3 PhysicsAdaptor::TranslateToPhysicsSpace(Dali::Vector3 vector) const
+{
+  return GetImplementation(*this).TranslateToPhysicsSpace(vector);
+}
+
+Dali::Quaternion PhysicsAdaptor::TranslateToPhysicsSpace(Dali::Quaternion rotation) const
+{
+  return GetImplementation(*this).TranslateToPhysicsSpace(rotation);
+}
+
+Dali::Vector3 PhysicsAdaptor::TranslateFromPhysicsSpace(Dali::Vector3 vector) const
+{
+  return GetImplementation(*this).TranslateFromPhysicsSpace(vector);
+}
+
+Dali::Vector3 PhysicsAdaptor::ConvertVectorToPhysicsSpace(Dali::Vector3 vector) const
+{
+  return GetImplementation(*this).ConvertVectorToPhysicsSpace(vector);
+}
+
+Dali::Vector3 PhysicsAdaptor::ConvertVectorFromPhysicsSpace(Dali::Vector3 vector) const
+{
+  return GetImplementation(*this).ConvertVectorFromPhysicsSpace(vector);
+}
+
+void PhysicsAdaptor::SetTransformAndSize(const Dali::Matrix& transform, Uint16Pair size)
+{
+  GetImplementation(*this).SetTransformAndSize(transform, size);
+}
+
+void PhysicsAdaptor::SetIntegrationState(Physics::PhysicsAdaptor::IntegrationState state)
+{
+  GetImplementation(*this).SetIntegrationState(state);
+}
+
+Physics::PhysicsAdaptor::IntegrationState PhysicsAdaptor::GetIntegrationState() const
+{
+  return GetImplementation(*this).GetIntegrationState();
+}
+
+void PhysicsAdaptor::SetDebugState(Physics::PhysicsAdaptor::DebugState state)
+{
+  GetImplementation(*this).SetDebugState(state);
+}
+
+Physics::PhysicsAdaptor::DebugState PhysicsAdaptor::GetDebugState() const
+{
+  return GetImplementation(*this).GetDebugState();
+}
+
+PhysicsActor PhysicsAdaptor::AddActorBody(Dali::Actor actor, Dali::Any body)
+{
+  Internal::PhysicsActorPtr physicsActor = GetImplementation(*this).AddActorBody(actor, body);
+  return PhysicsActor(physicsActor.Get());
+}
+
+void PhysicsAdaptor::RemoveActorBody(PhysicsActor physicsActor)
+{
+  GetImplementation(*this).RemoveActorBody(GetImplementation(physicsActor));
+}
+
+PhysicsActor PhysicsAdaptor::GetPhysicsActor(Dali::Any body) const
+{
+  Internal::PhysicsActorPtr physicsActor = GetImplementation(*this).GetPhysicsActor(body);
+  return PhysicsActor(physicsActor.Get());
+}
+
+Dali::Actor PhysicsAdaptor::GetRootActor() const
+{
+  return GetImplementation(*this).GetRootActor();
+}
+
+void PhysicsAdaptor::BuildPickingRay(Dali::Vector3 origin, Dali::Vector3 direction, Dali::Vector3& rayFromWorld, Dali::Vector3& rayToWorld)
+{
+  GetImplementation(*this).BuildPickingRay(origin, direction, rayFromWorld, rayToWorld);
+}
+
+Dali::Vector3 PhysicsAdaptor::ProjectPoint(Dali::Vector3 origin, Dali::Vector3 direction, float distance)
+{
+  return GetImplementation(*this).ProjectPoint(origin, direction, distance);
+}
+
+void PhysicsAdaptor::Queue(std::function<void(void)> function)
+{
+  GetImplementation(*this).Queue(function);
+}
+
+void PhysicsAdaptor::CreateSyncPoint()
+{
+  GetImplementation(*this).CreateSyncPoint();
+}
+
+PhysicsAdaptor::PhysicsAdaptor(Internal::PhysicsAdaptor* impl)
+: BaseHandle(impl)
+{
+}
+
+} // namespace Dali::Toolkit::Physics
diff --git a/dali-physics/public-api/physics-adaptor.h b/dali-physics/public-api/physics-adaptor.h
new file mode 100644
index 0000000..0bdd0c0
--- /dev/null
+++ b/dali-physics/public-api/physics-adaptor.h
@@ -0,0 +1,497 @@
+#ifndef DALI_TOOLKIT_PHYSICS_ADAPTOR_H
+#define DALI_TOOLKIT_PHYSICS_ADAPTOR_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or adaptoried.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/object/base-handle.h>
+#include <functional> ///< for std::function
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali::Toolkit::Physics
+{
+class PhysicsActor;
+
+namespace Internal
+{
+class PhysicsAdaptor;
+class PhysicsWorld;
+} // namespace Internal
+
+/**
+ * Adaptor to manage access to the physics world and pairing actors and physics
+ * bodies, plus some translation methods to/from the physics space and dali space.
+ *
+ * Also manages a debug renderer that may utilize the physics engine debug.
+ * It is up to the developer to retrieve the root actor and parent it into the scene.
+ */
+class DALI_TOOLKIT_API PhysicsAdaptor : public BaseHandle
+{
+public:
+  /**
+   * @brief Enumeration to turn the integration step on or off.
+   */
+  enum class IntegrationState
+  {
+    OFF,
+    ON
+  };
+
+  /**
+   * @brief Enumeration to turn the debug rendering on or off
+   */
+  enum class DebugState
+  {
+    OFF,
+    ON
+  };
+
+  /**
+   * @brief Scoped accessor to the physics world.
+   *
+   * @SINCE_2_2.43
+   * Automatically locks the physics world with a mutex to prevent the
+   * integration step from running whilst the developer is accessing
+   * the world, e.g. to add/remove bodies or constraints, or to
+   * perform hit-test.
+   *
+   * When it goes out of scope, the mutex is unlocked, and the integration step
+   * can resume.
+   */
+  struct ScopedPhysicsAccessor
+  {
+  public:
+    /**
+     * @brief Get a pointer to the native world.
+     *
+     * @SINCE_2_2.43
+     * This uses DALi::Any wrapper to ensure that the same interface can be used
+     * for both 2d and 3d physics. It can be cast to the right type using the
+     * following construct:
+     *   auto accessor = PhysicsAdaptor.GetPhysicsAccessor();
+     *   auto bulletWorld = accessor->GetNative().Get<btDiscreteDynamiscWorld*>();
+     */
+    Dali::Any GetNative();
+
+    /**
+     * @brief Hit test the physics world and return the nearest body.
+     *
+     * @SINCE_2_2.43
+     * @param[in] rayFromWorld The origin in physics world space
+     * @param[in] rayToWorld A point along the direction on the far side of the physics world
+     * @param[in] nativeFilter a native body / shape filter
+     * @param[out] localPivot The hit point local to the body
+     * @param[out] distanceFromCamera The distance of the pick point from the camera
+     * @return Empty value if no dynamic body found, otherwise a valid ptr to the hit body.
+     */
+    Dali::Any HitTest(Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera);
+
+    // Not copyable
+    ScopedPhysicsAccessor(ScopedPhysicsAccessor&) = delete;
+    const ScopedPhysicsAccessor& operator=(const ScopedPhysicsAccessor&) = delete;
+
+    /**
+     * @brief Destructor.
+     *
+     * On leaving scope, the mutex is unlocked and the physics integration step
+     * can resume.
+     */
+    ~ScopedPhysicsAccessor();
+
+  private:
+    /**
+     * @brief Private constructor.
+     *
+     * It is created by the physics adaptor.
+     */
+    ScopedPhysicsAccessor(Internal::PhysicsWorld& world);
+    friend Internal::PhysicsAdaptor;
+
+    struct Impl; ///< Opaque implementation structure
+    Impl* mImpl;
+  };
+
+  /**
+   * @brief Creates an uninitalized PhysicsAdaptor, this can be initialized with PhysicsAdaptor::New().
+   *
+   * @SINCE_2_2.43
+   * Calling member functions with an uninitialized PhysicsAdaptor handle is not allowed.
+   */
+  PhysicsAdaptor();
+
+  /**
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   * @SINCE_2_2.43
+   */
+  ~PhysicsAdaptor();
+
+  /**
+   * @brief Copy Constructor.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle The handle to copy
+   * @note This creates a new handle, but does not create a new implementation object.
+   */
+  PhysicsAdaptor(const PhysicsAdaptor& handle);
+
+  /**
+   * @brief Move Constructor.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle A reference to the handle to move
+   */
+  PhysicsAdaptor(PhysicsAdaptor&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle A reference to the handle to move
+   * @return a reference to this handle
+   */
+  PhysicsAdaptor& operator=(const PhysicsAdaptor& handle);
+
+  /**
+   * @brief Move Assignment operator.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle A reference to the handle to move
+   * @return a reference to this handle
+   */
+  PhysicsAdaptor& operator=(PhysicsAdaptor&& handle) noexcept;
+
+  /**
+   * @brief Initialize the physics system.
+   *
+   * @SINCE_2_2.43
+   * @param[in] transform The transform matrix for DALi to Physics world space
+   * @param[in] size The size of the layer the physics actors will be drawn in
+   */
+  static PhysicsAdaptor New(const Dali::Matrix& transform, Uint16Pair size);
+
+  /**
+   * @brief Downcasts a handle to PhysicsAdaptor handle.
+   *
+   * If handle points to an PhysicsAdaptor object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.43
+   * @param[in] handle to an object
+   * @return handle to a PhysicsAdaptor object or an uninitialized handle
+   */
+  static PhysicsAdaptor DownCast(BaseHandle handle);
+
+  /**
+   * @brief Set how long the integration should take.
+   *
+   * @SINCE_2_2.43
+   * @param[in] timestep The length of time that the physics integration should take.
+   */
+  void SetTimestep(float timestep);
+
+  /**
+   * @brief Get the current physics integration timestep.
+   *
+   * @SINCE_2_2.43
+   * @return the current physics integration timestep
+   */
+  float GetTimestep() const;
+
+  /**
+   * @brief Type to represent a pointer to a scoped accessor.
+   *
+   * @SINCE_2_2.43
+   */
+  using ScopedPhysicsAccessorPtr = std::unique_ptr<PhysicsAdaptor::ScopedPhysicsAccessor>;
+
+  /**
+   * @brief Returns an accessor to the physics world.
+   *
+   * @SINCE_2_2.43
+   * It automatically locks a mutex to prevent the integration step
+   * from running whilst the world is being modified.
+   *
+   * When the pointer goes out of scope, the mutex is unlocked and the physics world
+   * can run again.
+   * @return the scoped accessor
+   */
+  ScopedPhysicsAccessorPtr GetPhysicsAccessor();
+
+  /**
+   * @brief Create a layer & debug renderer.
+   *
+   * @SINCE_2_2.43
+   * The debug renderer may utilize the debug features of the native physics
+   * engine.
+   *
+   * @param[in] window The window to draw in (requires camera)
+   * @return The debug layer
+   */
+  Dali::Layer CreateDebugLayer(Dali::Window window);
+
+  /**
+   * @brief Converts a point in RootActor local coords (e.g. gesture)
+   * into physics space coords.
+   *
+   * @SINCE_2_2.43
+   * @param vector The point to convert
+   * @return The converted point
+   */
+  Dali::Vector3 TranslateToPhysicsSpace(Dali::Vector3 vector) const;
+
+  /**
+   * @brief Convert a rotation in DALi coordinate system into physics space.
+   *
+   * @SINCE_2_2.43
+   * @param[in] rotation The rotation to convert
+   * @return the converted rotation.
+   */
+  Dali::Quaternion TranslateToPhysicsSpace(Dali::Quaternion rotation) const;
+
+  /**
+   * @brief Converts a point in physics space coords into RootActor local coords.
+   *
+   * @SINCE_2_2.43
+   * @param vector The point to convert
+   * @return The converted point
+   */
+  Dali::Vector3 TranslateFromPhysicsSpace(Dali::Vector3 vector) const;
+
+  /**
+   * @brief Convert a rotation in physics coordinate system into DALi space.
+   *
+   * @SINCE_2_2.43
+   * @param[in] rotation The rotation to convert
+   * @return the converted rotation.
+   */
+  Dali::Quaternion TranslateFromPhysicsSpace(Dali::Quaternion rotation) const;
+
+  /**
+   * @brief Converts a vector (not a point) in DALi space into physics space.
+   *
+   * @SINCE_2_2.43
+   * @param vector The vector to convert
+   * @return The converted vector
+   */
+  Dali::Vector3 ConvertVectorToPhysicsSpace(Dali::Vector3 vector) const;
+
+  /**
+   * @brief Converts a vector (not a point) in physics space to DALi space.
+   *
+   * @SINCE_2_2.43
+   * @param vector The vector to convert
+   * @return The converted vector
+   */
+  Dali::Vector3 ConvertVectorFromPhysicsSpace(Dali::Vector3 vector) const;
+
+  /**
+   * @brief Set up the transform from world space to physics space.
+   *
+   * @SINCE_2_2.43
+   * @param[in] transform The transform matrix for DALi to Physics world space
+   * @param[in] size The size of the layer the physics actors will be drawn in
+   */
+  void SetTransformAndSize(const Dali::Matrix& transform, Uint16Pair size);
+
+  /**
+   * @brief Set the integration state.
+   *
+   * @SINCE_2_2.43
+   * If it's turned off, physics will be paused.
+   * @note This is ON by default
+   * @param[in] state the new integration state
+   */
+  void SetIntegrationState(IntegrationState state);
+
+  /**
+   * @brief Get the integration state.
+   *
+   * @SINCE_2_2.43
+   * @return the new integration state
+   */
+  IntegrationState GetIntegrationState() const;
+
+  /**
+   * @brief Set the debug state.
+   *
+   * @SINCE_2_2.43
+   * If debug is turned on, use the physics engine
+   * debug to show wireframes in a layer above the root actor.
+   * @note This is OFF by default
+   * @param[in] state the new debug state
+   */
+  void SetDebugState(DebugState state);
+
+  /**
+   * @brief Get the debug state.
+   *
+   * @SINCE_2_2.43
+   * @return the new debug state
+   */
+  DebugState GetDebugState() const;
+
+  /**
+   * @brief Add an actor / body pair.
+   * @pre It's expected that the client has added the body to the physics world.
+   *
+   * The adaptor does not "take ownership" of the actor or the physics body.
+   * @SINCE_2_2.43
+   * @param[in] actor The actor used for rendering the physics object
+   * @param[in] body The physics object
+   * @return a handle to the actor / body pair.
+   */
+  PhysicsActor AddActorBody(Dali::Actor actor, Dali::Any body);
+
+  /**
+   * @brief Remove the actor / body.
+   *
+   * This will unparent the actor from the root actor and disassociate it from
+   * the body.
+   *
+   * It is the responsibility of the client to remove the body from the physics world
+   * and destroy it at an appropriate time. Create a scoped accessor to ensure
+   * that the integration step isn't being run when doing so.
+   *
+   * If the root actor is holding the last reference to the actor, it will be
+   * destroyed automatically, otherwise it is the responsibility of the client to
+   * dereference the actor.
+   *
+   * @SINCE_2_2.43
+   * @param[in] physicsActor The actor / body pair to remove.
+   */
+  void RemoveActorBody(PhysicsActor physicsActor);
+
+  /**
+   * @brief Get the physics actor associated with the given body.
+   *
+   * @SINCE_2_2.43
+   * @param[in] body The physics body
+   * @return the associated physics actor
+   */
+  PhysicsActor GetPhysicsActor(Dali::Any body) const;
+
+  /**
+   * @brief Get the root actor (which holds all the actor/body pairs).
+   *
+   * @SINCE_2_2.43
+   * @return the root actor.
+   */
+  Dali::Actor GetRootActor() const;
+
+  /**
+   * @brief Convert DALi touch point into a picking ray in the physics world.
+   *
+   * These can then be used to hit test the PhysicsWorld
+   *
+   * @SINCE_2_2.43
+   * @param[in] origin The origin in DALi world space
+   * @param[in] direction The direction of the picking ray
+   * @param[out] rayFromWorld The origin in physics world space
+   * @param[out] rayToWorld A point along the direction on the far side of the physics world
+   *
+   * Example:
+   *   OnTouched(Dali::Actor actor, Dali::TouchEvent& touch)
+   *   {
+   *     ..
+   *     Vector3 origin, direction;
+   *     Dali::HitTestAlgorithm::BuildPickingRay(renderTask, touch.GetScreenPosition(0), origin, direction);
+   *     btVector3 rayFromWorld, rayToWorld;
+   *     physicsAdaptor.BuildPickingRay(origin, direction, rayFromWorld, rayToWorld);
+   *     auto scopedAccessor = physicsAdaptor.GetPhysicsAccessor();
+   *     Dali::Any nativeFilter;
+   *     body = scopedAccessor->Get().HitTest(rayFromWorld, rayToWorld, nativeFilter, ..);
+   *   }
+   */
+  void BuildPickingRay(Dali::Vector3 origin, Dali::Vector3 direction, Dali::Vector3& rayFromWorld, Dali::Vector3& rayToWorld);
+
+  /**
+   * @brief Project a point from the origin (in DALi space) a distance along
+   * the direction vector (in DALi space), and return the projected
+   * point in Physics space.
+   *
+   * @SINCE_2_2.43
+   * @param[in] origin    Origin in DALi world space
+   * @param[in] direction Direction in DALi world space
+   * @param[in] distance  Distance along the direction vector
+   * @return the projected point, converted to the Physics space.
+   */
+  Dali::Vector3 ProjectPoint(Dali::Vector3 origin, Dali::Vector3 direction, float distance);
+
+  /**
+   * @brief Queue a function to be executed before the physics integration in the update thread.
+   *
+   * @SINCE_2_2.43
+   * Multiple functions can be queued up. They are executed in the update frame
+   * callback when the next sync point is seen, so CreateSyncPoint() should be called
+   * afterwards for this to be executed.
+   *
+   * @param[in] function to execute. This can be any method, and it can work fine with
+   * physics bodies etc, but it must not be used with DALI event side objects, as this
+   * will very likely cause the update thread to crash.
+   */
+  void Queue(std::function<void(void)> function);
+
+  /**
+   * @brief Create a sync point for queued functions.
+   *
+   * @SINCE_2_2.43
+   * Ensures that any previously queued functions are processed
+   * in the Update::FrameCallback during the same frame as other
+   * DALi properties set during this event handler invocation.
+   * For example,
+   *   boxActor = Actor::New();
+   *   //... Create box actor renderer ...
+   *   btRigidBodyConstructionInfo info;
+   *   //... set construction properties
+   *   boxBody = new btRigidBody(info);
+   *   auto boxPhysicsActor = physicsAdaptor.AddActorBody(boxActor, boxBody);
+   *   boxActor.SetProperty(Actor::Property::VISIBLE, true);
+   *   boxActor.SetProperty(Actor::Property::OPACITY, 0.5f);
+   *   physicsAdaptor.Queue([boxBody](){ boxBody->activate(true);});
+   *   btVector3 impulse(4, 5, 6);
+   *   btVector3 position();
+   *   physicsAdaptor.Queue([boxBody](){ boxBody->applyImpulse(impulse, position);});
+   *   physicsAdaptor.CreateSyncPoint();
+   *
+   * Ensures that the box has both render properties and physics properties applied
+   * during the same frame.
+   */
+  void CreateSyncPoint();
+
+public: // Not intended for developer use
+  /// @cond internal
+  /**
+   * @brief This constructor is used by PhysicsAdaptor::New() methods.
+   *
+   * @SINCE_2_2.43
+   * @param[in] impl A pointer to a newly allocated Dali resource.
+   * @note Not intended for application developers
+   */
+  explicit DALI_INTERNAL PhysicsAdaptor(Internal::PhysicsAdaptor* impl);
+  /// @endcond
+};
+
+} // namespace Dali::Toolkit::Physics
+
+#endif //DALI_TOOLKIT_PHYSICS_ADAPTOR_H
diff --git a/dali-physics/public-api/scoped-physics-accessor.cpp b/dali-physics/public-api/scoped-physics-accessor.cpp
new file mode 100644
index 0000000..e0804f8
--- /dev/null
+++ b/dali-physics/public-api/scoped-physics-accessor.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-physics/public-api/physics-adaptor.h>
+
+#include <dali-physics/internal/physics-adaptor-impl.h>
+#include <dali-physics/internal/physics-world-impl.h>
+
+namespace Dali::Toolkit::Physics
+{
+struct PhysicsAdaptor::ScopedPhysicsAccessor::Impl
+{
+  Impl(Internal::PhysicsWorld& world)
+  : mPhysicsWorld(world)
+  {
+    mPhysicsWorld.Lock();
+  }
+  Impl(Impl&)         = delete;
+  const Impl& operator=(const Impl&) = delete;
+
+  ~Impl()
+  {
+    mPhysicsWorld.Unlock();
+  }
+  Internal::PhysicsWorld& mPhysicsWorld;
+  friend Internal::PhysicsAdaptor;
+};
+
+PhysicsAdaptor::ScopedPhysicsAccessor::ScopedPhysicsAccessor(Internal::PhysicsWorld& world)
+: mImpl(new Impl(world))
+{
+}
+
+PhysicsAdaptor::ScopedPhysicsAccessor::~ScopedPhysicsAccessor()
+{
+  delete mImpl;
+}
+
+Dali::Any PhysicsAdaptor::ScopedPhysicsAccessor::GetNative()
+{
+  return mImpl->mPhysicsWorld.GetNative();
+}
+
+Dali::Any PhysicsAdaptor::ScopedPhysicsAccessor::HitTest(
+  Dali::Vector3 rayFromWorld, Dali::Vector3 rayToWorld, Dali::Any nativeFilter, Dali::Vector3& localPivot, float& distanceFromCamera)
+{
+  return mImpl->mPhysicsWorld.HitTest(rayFromWorld, rayToWorld, nativeFilter, localPivot, distanceFromCamera);
+}
+
+} // namespace Dali::Toolkit::Physics
diff --git a/dali-scene-loader/third-party/.clang-format b/dali-physics/third-party/.clang-format
similarity index 100%
rename from dali-scene-loader/third-party/.clang-format
rename to dali-physics/third-party/.clang-format
diff --git a/dali-physics/third-party/bullet3/.ci/docker/env.list b/dali-physics/third-party/bullet3/.ci/docker/env.list
new file mode 100644
index 0000000..77dcd5b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/.ci/docker/env.list
@@ -0,0 +1,7 @@
+TRAVIS_OS_NAME
+TRAVIS_PULL_REQUEST
+
+BUILD_NAME
+CC
+CXX
+SUDO
diff --git a/dali-physics/third-party/bullet3/.ci/docker/ubuntu-bionic b/dali-physics/third-party/bullet3/.ci/docker/ubuntu-bionic
new file mode 100644
index 0000000..9b389a4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/.ci/docker/ubuntu-bionic
@@ -0,0 +1,19 @@
+FROM ubuntu:bionic
+
+RUN apt-get update -qq
+RUN apt-get install -y \
+    build-essential  \
+    clang \
+    cmake \
+    curl \
+    git \
+    libgl-dev \
+    libglu-dev \
+    libpython3-dev \
+    lsb-release \
+    pkg-config \
+    python3 \
+    python3-dev \
+    python3-distutils \
+    software-properties-common \
+    sudo
diff --git a/dali-physics/third-party/bullet3/.ci/docker/ubuntu-xenial b/dali-physics/third-party/bullet3/.ci/docker/ubuntu-xenial
new file mode 100644
index 0000000..bce1f2b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/.ci/docker/ubuntu-xenial
@@ -0,0 +1,18 @@
+FROM ubuntu:xenial
+
+RUN apt-get update -qq
+RUN apt-get install -y \
+    build-essential  \
+    clang \
+    cmake \
+    curl \
+    git \
+    libgl-dev \
+    libglu-dev \
+    libpython3-dev \
+    lsb-release \
+    pkg-config \
+    python3 \
+    python3-dev \
+    software-properties-common \
+    sudo
diff --git a/dali-physics/third-party/bullet3/.ci/script.sh b/dali-physics/third-party/bullet3/.ci/script.sh
new file mode 100755
index 0000000..66b814e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/.ci/script.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -ex
+
+echo "CXX="$CXX
+echo "CC="$CC
+if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" = "g++" ]]; then
+  $SUDO apt-get update
+  $SUDO apt-get install -y python3
+  $SUDO apt-get install -y python3-pip
+  $SUDO apt-get install python3-dev
+  $SUDO pip3 install -U wheel
+  $SUDO pip3 install -U setuptools
+  python3 setup.py install --user
+  python3 examples/pybullet/unittests/unittests.py --verbose
+  python3 examples/pybullet/unittests/userDataTest.py --verbose
+  python3 examples/pybullet/unittests/saveRestoreStateTest.py --verbose
+fi
+cmake . -DBUILD_PYBULLET=ON -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror
+make -j8
+ctest -j8 --output-on-failure
+
+# Build again with double precision
+cmake . -G "Unix Makefiles" -DUSE_DOUBLE_PRECISION=ON #-DCMAKE_CXX_FLAGS=-Werror
+make -j8
+ctest -j8 --output-on-failure
+
+# Build again with shared libraries
+cmake . -G "Unix Makefiles" -DBUILD_SHARED_LIBS=ON
+make -j8
+ctest -j8 --output-on-failure
+$SUDO make install
diff --git a/dali-physics/third-party/bullet3/.github/workflows/cmake.yml b/dali-physics/third-party/bullet3/.github/workflows/cmake.yml
new file mode 100644
index 0000000..e282e38
--- /dev/null
+++ b/dali-physics/third-party/bullet3/.github/workflows/cmake.yml
@@ -0,0 +1,38 @@
+name: CMake
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C ${{env.BUILD_TYPE}}
+      
diff --git a/dali-physics/third-party/bullet3/.gitignore b/dali-physics/third-party/bullet3/.gitignore
new file mode 100644
index 0000000..baee182
--- /dev/null
+++ b/dali-physics/third-party/bullet3/.gitignore
@@ -0,0 +1,42 @@
+/bin
+/build3/gmake
+/build3/vs2010
+/build_cmake/
+
+*.pyc
+
+# Python
+__pycache__/
+*.py[cod]
+
+# Pip
+pip-selfcheck.json
+*.whl
+*.egg
+*.egg-info
+
+# Setuptools
+/build
+/dist
+*.eggs
+
+# CMake
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
+CTestTestFile.cmake
+
+# Visual Studio build files
+*.vcxproj
+*.vcxproj.filters
+*.sln
+
+# Apple Finder metadata
+*.DS_Store
+
+# vim temp files
+*.swp
+
+.vscode/
+.idea/
+cmake-build-debug/
diff --git a/dali-physics/third-party/bullet3/.style.yapf b/dali-physics/third-party/bullet3/.style.yapf
new file mode 100644
index 0000000..5e7043e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/.style.yapf
@@ -0,0 +1,5 @@
+[style]
+based_on_style = google
+column_limit = 99
+indent_width = 2
+
diff --git a/dali-physics/third-party/bullet3/AUTHORS.txt b/dali-physics/third-party/bullet3/AUTHORS.txt
new file mode 100644
index 0000000..1bff632
--- /dev/null
+++ b/dali-physics/third-party/bullet3/AUTHORS.txt
@@ -0,0 +1,45 @@
+Bullet Physics is created by Erwin Coumans with contributions from the following authors / copyright holders:
+
+AMD
+Apple
+Yunfei Bai
+Steve Baker
+Gino van den Bergen
+Jeff Bingham
+Nicola Candussi
+Erin Catto
+Lawrence Chai
+Erwin Coumans
+Disney Animation
+Benjamin Ellenberger
+Christer Ericson
+Google
+Dirk Gregorius
+Marcus Hennix
+Jasmine Hsu
+MBSim Development Team
+Takahiro Harada
+Simon Hobbs
+John Hsu
+Ole Kniemeyer
+Jay Lee
+Francisco Leon
+lunkhound
+Vsevolod Klementjev
+Phil Knight
+John McCutchan
+Steven Peters
+Roman Ponomarev
+Nathanael Presson
+Gabor PUHR
+Arthur Shek
+Russel Smith
+Sony
+Jakub Stephien
+Marten Svanfeldt
+Jie Tan
+Pierre Terdiman
+Steven Thompson
+Tamas Umenhoffer
+
+If your name is missing, please send an email to erwin.coumans@gmail.com or file an issue at http://github.com/bulletphysics/bullet3
diff --git a/dali-physics/third-party/bullet3/BulletConfig.cmake.in b/dali-physics/third-party/bullet3/BulletConfig.cmake.in
new file mode 100644
index 0000000..f5dc7bd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/BulletConfig.cmake.in
@@ -0,0 +1,25 @@
+#                                               -*- cmake -*-
+#
+#  BulletConfig.cmake(.in)
+#
+
+# Use the following variables to compile and link against Bullet:
+#  BULLET_FOUND              - True if Bullet was found on your system
+#  BULLET_USE_FILE           - The file making Bullet usable
+#  BULLET_DEFINITIONS        - Definitions needed to build with Bullet
+#  BULLET_INCLUDE_DIR        - Directory where Bullet-C-Api.h can be found
+#  BULLET_INCLUDE_DIRS       - List of directories of Bullet and it's dependencies
+#  BULLET_LIBRARIES          - List of libraries to link against Bullet library
+#  BULLET_LIBRARY_DIRS       - List of directories containing Bullet' libraries
+#  BULLET_ROOT_DIR           - The base directory of Bullet
+#  BULLET_VERSION_STRING     - A human-readable string containing the version
+
+set ( BULLET_FOUND 1 )
+set ( BULLET_USE_FILE     "@BULLET_USE_FILE@" )
+set ( BULLET_DEFINITIONS  "@BULLET_DEFINITIONS@" )
+set ( BULLET_INCLUDE_DIR  "@INCLUDE_INSTALL_DIR@" )
+set ( BULLET_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" )
+set ( BULLET_LIBRARIES    "@BULLET_LIBRARIES@" )
+set ( BULLET_LIBRARY_DIRS "@LIB_DESTINATION@" )
+set ( BULLET_ROOT_DIR     "@CMAKE_INSTALL_PREFIX@" )
+set ( BULLET_VERSION_STRING "@BULLET_VERSION@" )
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/CMakeLists.txt b/dali-physics/third-party/bullet3/CMakeLists.txt
new file mode 100644
index 0000000..5966463
--- /dev/null
+++ b/dali-physics/third-party/bullet3/CMakeLists.txt
@@ -0,0 +1,163 @@
+cmake_minimum_required(VERSION 3.10.2)
+
+unset(PROJECT_IS_TOPLEVEL)
+
+project(bullet3
+    VERSION 3.2.5
+    DESCRIPTION "C++ library portion of bullet"
+    LANGUAGES CXX
+)
+
+FILE (STRINGS "VERSION" BULLET_VERSION)
+
+# PROJECT_IS_TOPLEVEL for older CMake versions
+if(NOT DEFINED PROJECT_IS_TOPLEVEL)
+    set(PROJECT_IS_TOPLEVEL OFF)
+    if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+        set(PROJECT_IS_TOPLEVEL ON)
+    endif()
+endif()
+
+# Build options
+option(BULLET3_BUILD_SHARED "Build bullet3 as a shared library" ON)
+
+set(prefix ${CMAKE_INSTALL_PREFIX})
+option(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
+
+ADD_DEFINITIONS(-DB3_USE_CLEW)
+
+if (WIN32)
+    ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
+    ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
+    ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
+endif(WIN32)
+
+# Bullet is broken into sub-"libraries"; we'll automate handling of these
+set(BULLET_SUBMODULES
+    clew
+    Bullet3Collision
+    Bullet3Common
+    Bullet3Dynamics
+    Bullet3Geometry
+    Bullet3OpenCL
+    Bullet3Serialize
+    BulletCollision
+    BulletDynamics
+    BulletInverseDynamics
+    BulletSoftBody
+    LinearMath
+)
+
+set(repo_root_dir "${CMAKE_CURRENT_LIST_DIR}/../../../")
+set(bullet_SOURCE_DIR "${repo_root_dir}/dali-physics/third-party/bullet3")
+
+set(BULLET3_SOURCES
+    "${bullet_SOURCE_DIR}/src/btBulletCollisionCommon.h"
+    "${bullet_SOURCE_DIR}/src/btBulletDynamicsCommon.h"
+)
+
+foreach(SUB ${BULLET_SUBMODULES})
+    file(GLOB_RECURSE SUBMODULE_SOURCES
+        "${bullet_SOURCE_DIR}/src/${SUB}/*.h"
+        "${bullet_SOURCE_DIR}/src/${SUB}/*.hpp"
+        "${bullet_SOURCE_DIR}/src/${SUB}/*.cpp"
+        "${bullet_SOURCE_DIR}/src/${SUB}/*.c"
+    )
+    list(APPEND BULLET3_SOURCES ${SUBMODULE_SOURCES})
+endforeach()
+
+# CPack support
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+include(CPack)
+
+# Build the main bullet3 library
+set(BULLET3_LIBRARY_TYPE "STATIC")
+if(BULLET3_BUILD_SHARED)
+    set(BULLET3_LIBRARY_TYPE "SHARED")
+endif()
+add_library(bullet3 ${BULLET3_LIBRARY_TYPE} ${BULLET3_SOURCES})
+set_target_properties(bullet3 PROPERTIES
+    WINDOWS_EXPORT_ALL_SYMBOLS 1
+    VERSION ${PROJECT_VERSION}
+    SOVERSION ${PROJECT_VERSION}
+)
+target_include_directories(bullet3
+    SYSTEM INTERFACE
+        $<BUILD_INTERFACE:${bullet_SOURCE_DIR}/src>
+        $<INSTALL_INTERFACE:include/bullet>
+    PRIVATE
+        ${bullet_SOURCE_DIR}/src
+)
+
+# Suppress the warnings in the libbullet source code
+if(MSVC)
+    target_compile_options(bullet3 PRIVATE /w)
+else()
+    target_compile_options(bullet3 PRIVATE -w)
+endif()
+
+target_compile_options(bullet3 PRIVATE -fvisibility=default)
+
+target_link_libraries(bullet3 ${COVERAGE})
+
+if(ENABLE_PKG_CONFIGURE)
+    find_package(PkgConfig REQUIRED)
+
+    set( LIB_DIR $ENV{libdir} )
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
+    endif()
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${prefix}/lib )
+    endif()
+    set(DEV_INCLUDE_PATH ${prefix}/include/bullet)
+
+    set(bullet_pkg_cfg_file bullet3.pc)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/${bullet_pkg_cfg_file}.cmake ${bullet_pkg_cfg_file} @ONLY)
+
+    # Installation
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bullet_pkg_cfg_file}
+        DESTINATION ${LIB_DIR}/pkgconfig
+    )
+endif(ENABLE_PKG_CONFIGURE)
+
+install(
+    TARGETS bullet3
+    DESTINATION ${LIB_DIR}
+    EXPORT bullet3-targets
+)
+
+if(INSTALL_CMAKE_MODULES)
+  install(
+      EXPORT bullet3-targets
+      NAMESPACE bullet3::
+      FILE bullet3-targets.cmake
+      DESTINATION share/bullet3
+  )
+endif()
+
+if(BULLET3_BUILD_SHARED AND MSVC)
+    install(FILES $<TARGET_PDB_FILE:bullet3> DESTINATION lib)
+endif()
+
+install(FILES
+    "${bullet_SOURCE_DIR}/src/btBulletCollisionCommon.h"
+    "${bullet_SOURCE_DIR}/src/btBulletDynamicsCommon.h"
+    DESTINATION "include/bullet"
+)
+foreach(SUB ${BULLET_SUBMODULES})
+    install(
+        DIRECTORY "${bullet_SOURCE_DIR}/src/${SUB}"
+        DESTINATION "include/bullet"
+        FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
+    )
+endforeach()
+
+if(INSTALL_CMAKE_MODULES)
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bullet3-config.cmake "
+    include(CMakeFindDependencyMacro)
+    include(\${CMAKE_CURRENT_LIST_DIR}/bullet3-targets.cmake)
+  ")
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bullet3-config.cmake DESTINATION share/bullet3)
+endif()
diff --git a/dali-physics/third-party/bullet3/Config.cmake.in b/dali-physics/third-party/bullet3/Config.cmake.in
new file mode 100644
index 0000000..f6f434d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/Config.cmake.in
@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/Bullet3Targets.cmake")
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/LICENSE.txt b/dali-physics/third-party/bullet3/LICENSE.txt
new file mode 100644
index 0000000..319c84e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/LICENSE.txt
@@ -0,0 +1,15 @@
+
+The files in this repository are licensed under the zlib license, except for the files under 'Extras' and examples/ThirdPartyLibs.
+
+Bullet Continuous Collision Detection and Physics Library
+http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
diff --git a/dali-physics/third-party/bullet3/MANIFEST.in b/dali-physics/third-party/bullet3/MANIFEST.in
new file mode 100644
index 0000000..a938c6f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/MANIFEST.in
@@ -0,0 +1,16 @@
+include MANIFEST.in *.txt
+recursive-include examples *.h
+recursive-include examples *.hpp
+recursive-include Extras *.h
+recursive-include Extras *.hpp
+recursive-include Extras *.inl
+recursive-include src *.h
+recursive-include src *.hpp
+recursive-include src *.cpp
+recursive-include examples/pybullet/gym *.*
+include examples/ThirdPartyLibs/enet/unix.c
+include examples/OpenGLWindow/*.*
+recursive-include examples/SharedMemory/plugins *.*
+recursive-include examples/ThirdPartyLibs/glad *.*
+include examples/ThirdPartyLibs/enet/win32.c
+recursive-include examples/ThirdPartyLibs/Eigen *
diff --git a/dali-physics/third-party/bullet3/README.md b/dali-physics/third-party/bullet3/README.md
new file mode 100644
index 0000000..7a8308d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/README.md
@@ -0,0 +1,8 @@
+# Bullet Physics SDK
+
+This is the Bullet Physics SDK Version 3.25.
+
+The commit used is: [2c204c4](https://github.com/bulletphysics/bullet3/commit/2c204c49e56ed15ec5fcfa71d199ab6d6570b3f5).
+
+Please refer to [Bullet Physics SDK Github](https://github.com/bulletphysics/bullet3/tree/3.25) for further information.
+
diff --git a/dali-physics/third-party/bullet3/UseBullet.cmake b/dali-physics/third-party/bullet3/UseBullet.cmake
new file mode 100644
index 0000000..5ed9487
--- /dev/null
+++ b/dali-physics/third-party/bullet3/UseBullet.cmake
@@ -0,0 +1,10 @@
+#                                               -*- cmake -*-
+#
+#  UseBullet.cmake
+#
+
+
+add_definitions     ( ${BULLET_DEFINITIONS} )
+include_directories ( ${BULLET_INCLUDE_DIRS} )
+link_directories    ( ${BULLET_LIBRARY_DIRS} )
+
diff --git a/dali-physics/third-party/bullet3/VERSION b/dali-physics/third-party/bullet3/VERSION
new file mode 100644
index 0000000..ed5e66e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/VERSION
@@ -0,0 +1 @@
+3.25
diff --git a/dali-physics/third-party/bullet3/_clang-format b/dali-physics/third-party/bullet3/_clang-format
new file mode 100644
index 0000000..43a8b1d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/_clang-format
@@ -0,0 +1,91 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: true
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     0
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories: 
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IndentCaseLabels: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments:  false
+SortIncludes:    false
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+AccessModifierOffset: -4
+Standard:        Auto
+TabWidth:        4
+UseTab:          ForContinuationAndIndentation
+...
+
diff --git a/dali-physics/third-party/bullet3/appveyor.yml b/dali-physics/third-party/bullet3/appveyor.yml
new file mode 100644
index 0000000..42a1c32
--- /dev/null
+++ b/dali-physics/third-party/bullet3/appveyor.yml
@@ -0,0 +1,19 @@
+build:
+  project: build3/vs2010/0_Bullet3Solution.sln
+
+build_script:
+  - mkdir cm
+  - cd cm
+  - cmake .. -G"Visual Studio 14 2015 Win64"
+  - cmake --build . --target ALL_BUILD --config Release -- /maxcpucount:4 /verbosity:quiet
+
+test_script:
+  - ctest --parallel 4 --build-config Release --output-on-failure
+
+before_build:
+  - echo %CD%
+  - ps: cd build3
+  - echo %CD%
+  - premake4  vs2010
+  - ps: cd ..
+
diff --git a/dali-physics/third-party/bullet3/bullet3.pc.cmake b/dali-physics/third-party/bullet3/bullet3.pc.cmake
new file mode 100644
index 0000000..9e7a760
--- /dev/null
+++ b/dali-physics/third-party/bullet3/bullet3.pc.cmake
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@BULLET_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: bullet
+Description: Bullet Continuous Collision Detection and Physics Library
+Version: ${apiversion}
+Requires:
+Libs: -L${libdir} -lbullet3
+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/setup.py b/dali-physics/third-party/bullet3/setup.py
new file mode 100644
index 0000000..2ef922a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/setup.py
@@ -0,0 +1,537 @@
+from setuptools import find_packages
+from sys import platform as _platform
+import sys
+import glob
+import os
+
+from distutils.core import setup
+from distutils.extension import Extension
+from distutils.util import get_platform
+from glob import glob
+
+# monkey-patch for parallel compilation
+import multiprocessing
+import multiprocessing.pool
+
+
+def parallelCCompile(self,
+                     sources,
+                     output_dir=None,
+                     macros=None,
+                     include_dirs=None,
+                     debug=0,
+                     extra_preargs=None,
+                     extra_postargs=None,
+                     depends=None):
+  # those lines are copied from distutils.ccompiler.CCompiler directly
+  macros, objects, extra_postargs, pp_opts, build = self._setup_compile(
+      output_dir, macros, include_dirs, sources, depends, extra_postargs)
+  cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
+  # parallel code
+  N = 2 * multiprocessing.cpu_count()  # number of parallel compilations
+  try:
+    # On Unix-like platforms attempt to obtain the total memory in the
+    # machine and limit the number of parallel jobs to the number of Gbs
+    # of RAM (to avoid killing smaller platforms like the Pi)
+    mem = os.sysconf('SC_PHYS_PAGES') * os.sysconf('SC_PAGE_SIZE')  # bytes
+  except (AttributeError, ValueError):
+    # Couldn't query RAM; don't limit parallelism (it's probably a well
+    # equipped Windows / Mac OS X box)
+    pass
+  else:
+    mem = max(1, int(round(mem / 1024**3)))  # convert to Gb
+    N = min(mem, N)
+
+  def _single_compile(obj):
+    try:
+      src, ext = build[obj]
+    except KeyError:
+      return
+    newcc_args = cc_args
+    if _platform == "darwin":
+      if src.endswith('.cpp'):
+        newcc_args = cc_args + ["-mmacosx-version-min=10.7", "-stdlib=libc++"]
+    self._compile(obj, src, ext, newcc_args, extra_postargs, pp_opts)
+
+  # convert to list, imap is evaluated on-demand
+  pool = multiprocessing.pool.ThreadPool(N)
+  list(pool.imap(_single_compile, objects))
+  return objects
+
+
+import distutils.ccompiler
+distutils.ccompiler.CCompiler.compile = parallelCCompile
+
+#see http://stackoverflow.com/a/8719066/295157
+import os
+
+platform = get_platform()
+print(platform)
+
+CXX_FLAGS = ''
+CXX_FLAGS += '-DGWEN_COMPILE_STATIC '
+CXX_FLAGS += '-DBT_USE_DOUBLE_PRECISION '
+CXX_FLAGS += '-DBT_ENABLE_ENET '
+CXX_FLAGS += '-DBT_ENABLE_CLSOCKET '
+CXX_FLAGS += '-DB3_DUMP_PYTHON_VERSION '
+CXX_FLAGS += '-DEGL_ADD_PYTHON_INIT '
+CXX_FLAGS += '-DB3_ENABLE_FILEIO_PLUGIN '
+CXX_FLAGS += '-DB3_USE_ZIPFILE_FILEIO '
+CXX_FLAGS += '-DBT_THREADSAFE=1 '
+CXX_FLAGS += '-DSTATIC_LINK_SPD_PLUGIN '
+CXX_FLAGS += '-DBT_ENABLE_VHACD '
+
+EGL_CXX_FLAGS = ''
+
+# libraries += [current_python]
+
+libraries = []
+include_dirs = []
+
+try:
+  import numpy
+  NP_DIRS = [numpy.get_include()]
+except:
+  print("numpy is disabled. getCameraImage maybe slower.")
+else:
+  print("numpy is enabled.")
+  CXX_FLAGS += '-DPYBULLET_USE_NUMPY '
+  for d in NP_DIRS:
+    print("numpy_include_dirs = %s" % d)
+  include_dirs += NP_DIRS
+
+sources = ["examples/pybullet/pybullet.c"]\
++["examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp"]\
++["examples/SharedMemory/plugins/stablePDPlugin/BulletConversion.cpp"]\
++["examples/SharedMemory/plugins/stablePDPlugin/KinTree.cpp"]\
++["examples/SharedMemory/plugins/stablePDPlugin/MathUtil.cpp"]\
++["examples/SharedMemory/plugins/stablePDPlugin/RBDModel.cpp"]\
++["examples/SharedMemory/plugins/stablePDPlugin/RBDUtil.cpp"]\
++["examples/SharedMemory/plugins/stablePDPlugin/Shape.cpp"]\
++["examples/SharedMemory/plugins/stablePDPlugin/SpAlg.cpp"]\
++["src/btLinearMathAll.cpp"]\
++["src/btBulletCollisionAll.cpp"]\
++["src/btBulletDynamicsAll.cpp"]\
++["examples/ExampleBrowser/InProcessExampleBrowser.cpp"]\
++["examples/TinyRenderer/geometry.cpp"]\
++["examples/TinyRenderer/model.cpp"]\
++["examples/TinyRenderer/tgaimage.cpp"]\
++["examples/TinyRenderer/our_gl.cpp"]\
++["examples/TinyRenderer/TinyRenderer.cpp"]\
++["examples/SharedMemory/plugins/pdControlPlugin/pdControlPlugin.cpp"]\
++["examples/SharedMemory/plugins/collisionFilterPlugin/collisionFilterPlugin.cpp"]\
++["examples/SharedMemory/plugins/fileIOPlugin/fileIOPlugin.cpp"]\
++["examples/SharedMemory/b3RobotSimulatorClientAPI_NoDirect.cpp"]\
++["examples/SharedMemory/IKTrajectoryHelper.cpp"]\
++["examples/SharedMemory/InProcessMemory.cpp"]\
++["examples/SharedMemory/PhysicsClient.cpp"]\
++["examples/SharedMemory/PhysicsServer.cpp"]\
++["examples/SharedMemory/GraphicsClientExample.cpp"]\
++["examples/SharedMemory/GraphicsServerExample.cpp"]\
++["examples/SharedMemory/RemoteGUIHelper.cpp"]\
++["examples/SharedMemory/RemoteGUIHelperTCP.cpp"]\
++["examples/SharedMemory/PhysicsServerExample.cpp"]\
++["examples/SharedMemory/PhysicsServerExampleBullet2.cpp"]\
++["examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp"]\
++["examples/SharedMemory/PhysicsServerSharedMemory.cpp"]\
++["examples/SharedMemory/PhysicsDirect.cpp"]\
++["examples/SharedMemory/PhysicsDirectC_API.cpp"]\
++["examples/SharedMemory/PhysicsServerCommandProcessor.cpp"]\
++["examples/SharedMemory/PhysicsClientSharedMemory.cpp"]\
++["examples/SharedMemory/PhysicsClientSharedMemory_C_API.cpp"]\
++["examples/SharedMemory/PhysicsClientC_API.cpp"]\
++["examples/SharedMemory/Win32SharedMemory.cpp"]\
++["examples/SharedMemory/PosixSharedMemory.cpp"]\
++["examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp"]\
++["examples/SharedMemory/plugins/tinyRendererPlugin/tinyRendererPlugin.cpp"]\
++["examples/SharedMemory/PhysicsClientUDP.cpp"]\
++["examples/SharedMemory/PhysicsClientUDP_C_API.cpp"]\
++["examples/SharedMemory/PhysicsClientTCP.cpp"]\
++["examples/SharedMemory/PhysicsClientTCP_C_API.cpp"]\
++["examples/SharedMemory/b3PluginManager.cpp"]\
++["examples/Utils/b3ResourcePath.cpp"]\
++["examples/Utils/RobotLoggingUtil.cpp"]\
++["examples/Utils/ChromeTraceUtil.cpp"]\
++["examples/Utils/b3Clock.cpp"]\
++["examples/Utils/b3Quickprof.cpp"]\
++["examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp"]\
++["examples/ThirdPartyLibs/stb_image/stb_image.cpp"]\
++["examples/ThirdPartyLibs/stb_image/stb_image_write.cpp"]\
++["examples/ThirdPartyLibs/minizip/ioapi.c"]\
++["examples/ThirdPartyLibs/minizip/unzip.c"]\
++["examples/ThirdPartyLibs/minizip/zip.c"]\
++["examples/ThirdPartyLibs/zlib/adler32.c"]\
++["examples/ThirdPartyLibs/zlib/compress.c"]\
++["examples/ThirdPartyLibs/zlib/crc32.c"]\
++["examples/ThirdPartyLibs/zlib/deflate.c"]\
++["examples/ThirdPartyLibs/zlib/gzclose.c"]\
++["examples/ThirdPartyLibs/zlib/gzlib.c"]\
++["examples/ThirdPartyLibs/zlib/gzread.c"]\
++["examples/ThirdPartyLibs/zlib/gzwrite.c"]\
++["examples/ThirdPartyLibs/zlib/infback.c"]\
++["examples/ThirdPartyLibs/zlib/inffast.c"]\
++["examples/ThirdPartyLibs/zlib/inflate.c"]\
++["examples/ThirdPartyLibs/zlib/inftrees.c"]\
++["examples/ThirdPartyLibs/zlib/trees.c"]\
++["examples/ThirdPartyLibs/zlib/uncompr.c"]\
++["examples/ThirdPartyLibs/zlib/zutil.c"]\
++["examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp"]\
++["examples/Importers/ImportObjDemo/LoadMeshFromObj.cpp"]\
++["examples/Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp"]\
++["examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp"]\
++["examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp"]\
++["examples/Importers/ImportURDFDemo/MyMultiBodyCreator.cpp"]\
++["examples/Importers/ImportURDFDemo/URDF2Bullet.cpp"]\
++["examples/Importers/ImportURDFDemo/UrdfParser.cpp"]\
++["examples/Importers/ImportURDFDemo/urdfStringSplit.cpp"]\
++["examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp"]\
++["examples/MultiThreading/b3PosixThreadSupport.cpp"]\
++["examples/MultiThreading/b3Win32ThreadSupport.cpp"]\
++["examples/MultiThreading/b3ThreadSupportInterface.cpp"]\
++["examples/ThirdPartyLibs/enet/callbacks.c"]\
++["examples/ThirdPartyLibs/enet/compress.c"]\
++["examples/ThirdPartyLibs/enet/host.c"]\
++["examples/ThirdPartyLibs/enet/list.c"]\
++["examples/ThirdPartyLibs/enet/packet.c"]\
++["examples/ThirdPartyLibs/enet/peer.c"]\
++["examples/ThirdPartyLibs/enet/protocol.c"]\
++["examples/ExampleBrowser/OpenGLGuiHelper.cpp"]\
++["examples/ExampleBrowser/OpenGLExampleBrowser.cpp"]\
++["examples/ExampleBrowser/CollisionShape2TriangleMesh.cpp"]\
++["examples/ExampleBrowser/GL_ShapeDrawer.cpp"]\
++["examples/OpenGLWindow/SimpleOpenGL2Renderer.cpp"]\
++["examples/OpenGLWindow/GLInstancingRenderer.cpp"]\
++["examples/OpenGLWindow/SimpleOpenGL3App.cpp"]\
++["examples/OpenGLWindow/GLPrimitiveRenderer.cpp"]\
++["examples/OpenGLWindow/TwFonts.cpp"]\
++["examples/OpenGLWindow/GLRenderToTexture.cpp"]\
++["examples/OpenGLWindow/LoadShader.cpp"]\
++["examples/OpenGLWindow/OpenSans.cpp"]\
++["examples/OpenGLWindow/SimpleCamera.cpp"]\
++["examples/OpenGLWindow/fontstash.cpp"]\
++["examples/OpenGLWindow/SimpleOpenGL2App.cpp"]\
++["examples/OpenGLWindow/opengl_fontstashcallbacks.cpp"]\
++["examples/ExampleBrowser/GwenGUISupport/GraphingTexture.cpp"]\
++["examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp"]\
++["examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp"]\
++["examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp"]\
++["examples/ExampleBrowser/GwenGUISupport/GwenTextureWindow.cpp"]\
++["src/Bullet3Common/b3AlignedAllocator.cpp"]\
++["src/Bullet3Common/b3Logging.cpp"]\
++["src/Bullet3Common/b3Vector3.cpp"]\
++["examples/ThirdPartyLibs/clsocket/src/ActiveSocket.cpp"]\
++["examples/ThirdPartyLibs/clsocket/src/PassiveSocket.cpp"]\
++["examples/ThirdPartyLibs/clsocket/src/SimpleSocket.cpp"]\
++["Extras/Serialize/BulletFileLoader/bChunk.cpp"]\
++["Extras/Serialize/BulletFileLoader/bDNA.cpp"]\
++["Extras/Serialize/BulletFileLoader/bFile.cpp"]\
++["Extras/Serialize/BulletFileLoader/btBulletFile.cpp"]\
++["Extras/Serialize/BulletWorldImporter/btMultiBodyWorldImporter.cpp"]\
++["Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp"]\
++["Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp"]\
++["Extras/InverseDynamics/CloneTreeCreator.cpp"]\
++["Extras/InverseDynamics/IDRandomUtil.cpp"]\
++["Extras/InverseDynamics/MultiBodyTreeDebugGraph.cpp"]\
++["Extras/InverseDynamics/User2InternalIndex.cpp"]\
++["Extras/InverseDynamics/CoilCreator.cpp"]\
++["Extras/InverseDynamics/MultiBodyNameMap.cpp"]\
++["Extras/InverseDynamics/RandomTreeCreator.cpp"]\
++["Extras/InverseDynamics/btMultiBodyTreeCreator.cpp"]\
++["Extras/InverseDynamics/DillCreator.cpp"]\
++["Extras/InverseDynamics/MultiBodyTreeCreator.cpp"]\
++["Extras/InverseDynamics/SimpleTreeCreator.cpp"]\
++["Extras/InverseDynamics/invdyn_bullet_comparison.cpp"]\
++["src/BulletSoftBody/btDefaultSoftBodySolver.cpp"]\
++["src/BulletSoftBody/btSoftBodyHelpers.cpp"]\
++["src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp"]\
++["src/BulletSoftBody/btSoftBody.cpp"]\
++["src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp"]\
++["src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp"]\
++["src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp"]\
++["src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp"]\
++["src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp"]\
++["src/BulletSoftBody/btDeformableBackwardEulerObjective.cpp"]\
++["src/BulletSoftBody/btDeformableBodySolver.cpp"]\
++["src/BulletSoftBody/btDeformableContactProjection.cpp"]\
++["src/BulletSoftBody/btDeformableContactConstraint.cpp"]\
++["src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp"]\
++["src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp"]\
++["src/BulletSoftBody/poly34.cpp"]\
++["src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.cpp"]\
++["src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp"]\
++["src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp"]\
++["src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp"]\
++["src/BulletInverseDynamics/IDMath.cpp"]\
++["src/BulletInverseDynamics/MultiBodyTree.cpp"]\
++["src/BulletInverseDynamics/details/MultiBodyTreeImpl.cpp"]\
++["src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp"]\
++["examples/ThirdPartyLibs/BussIK/Jacobian.cpp"]\
++["examples/ThirdPartyLibs/BussIK/LinearR2.cpp"]\
++["examples/ThirdPartyLibs/BussIK/LinearR3.cpp"]\
++["examples/ThirdPartyLibs/BussIK/LinearR4.cpp"]\
++["examples/ThirdPartyLibs/BussIK/MatrixRmn.cpp"]\
++["examples/ThirdPartyLibs/BussIK/Misc.cpp"]\
++["examples/ThirdPartyLibs/BussIK/Node.cpp"]\
++["examples/ThirdPartyLibs/BussIK/Tree.cpp"]\
++["examples/ThirdPartyLibs/BussIK/VectorRn.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Anim.cpp"]\
++["examples/ThirdPartyLibs/Gwen/DragAndDrop.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Hook.cpp"]\
++["examples/ThirdPartyLibs/Gwen/ToolTip.cpp"]\
++["examples/ThirdPartyLibs/Gwen/events.cpp"]\
++["examples/ThirdPartyLibs/Gwen/BaseRender.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Gwen.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Skin.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Utility.cpp"]\
++["examples/ThirdPartyLibs/Gwen/inputhandler.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Base.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Button.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Canvas.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/CheckBox.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ColorControls.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ColorPicker.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ComboBox.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/CrossSplitter.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/DockBase.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/DockedTabControl.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Dragger.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/GroupBox.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/HSVColorPicker.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/HorizontalScrollBar.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ImagePanel.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/HorizontalSlider.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Label.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/LabelClickable.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ListBox.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/MenuItem.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Menu.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/MenuStrip.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/NumericUpDown.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/PanelListPanel.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ProgressBar.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Properties.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/RadioButton.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/RadioButtonController.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ResizableControl.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Resizer.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/RichLabel.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ScrollBar.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ScrollBarBar.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ScrollBarButton.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/ScrollControl.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Slider.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/SplitterBar.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/TabButton.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/TabControl.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/TabStrip.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Text.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/TextBox.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/TextBoxNumeric.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/TreeControl.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/TreeNode.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/VerticalScrollBar.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/VerticalSlider.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/WindowControl.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Dialog/FileOpen.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Dialog/FileSave.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Controls/Dialog/Query.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Platforms/Null.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Platforms/Windows.cpp"]\
++["examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp"]\
++["Extras/VHACD/test/src/main_vhacd.cpp"] \
++["Extras/VHACD/src/VHACD.cpp"] \
++["Extras/VHACD/src/vhacdICHull.cpp"] \
++["Extras/VHACD/src/vhacdManifoldMesh.cpp"] \
++["Extras/VHACD/src/vhacdMesh.cpp"] \
++["Extras/VHACD/src/vhacdVolume.cpp"]
+
+
+egl_renderer_sources = \
+["examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp"]\
++["examples/SharedMemory/plugins/eglPlugin/eglRendererPlugin.cpp"]\
++["examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp"]\
++["examples/Importers/ImportObjDemo/LoadMeshFromObj.cpp"]\
++["examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp"]\
++["examples/Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp"]\
++["examples/TinyRenderer/geometry.cpp"]\
++["examples/TinyRenderer/model.cpp"]\
++["examples/TinyRenderer/tgaimage.cpp"]\
++["examples/TinyRenderer/our_gl.cpp"]\
++["examples/TinyRenderer/TinyRenderer.cpp"]\
++["examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp"]\
++["examples/ThirdPartyLibs/stb_image/stb_image.cpp"]\
++["examples/ThirdPartyLibs/stb_image/stb_image_write.cpp"]\
++["examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp"]\
++["examples/OpenGLWindow/SimpleCamera.cpp"]\
++["examples/Utils/b3Clock.cpp"]\
++["examples/Utils/b3ResourcePath.cpp"]\
++["src/BulletCollision/CollisionShapes/btShapeHull.cpp"]\
++["src/BulletCollision/CollisionShapes/btConvexHullShape.cpp"]\
++["src/BulletCollision/CollisionShapes/btBoxShape.cpp"]\
++["src/BulletCollision/CollisionShapes/btSphereShape.cpp"]\
++["src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp"]\
++["src/BulletCollision/CollisionShapes/btConvexShape.cpp"]\
++["src/BulletCollision/CollisionShapes/btCollisionShape.cpp"]\
++["src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp"]\
++["src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp"]\
++["src/Bullet3Common/b3Logging.cpp"]\
++["src/LinearMath/btAlignedAllocator.cpp"]\
++["src/LinearMath/btConvexHull.cpp"]\
++["src/LinearMath/btConvexHullComputer.cpp"] \
++["src/LinearMath/btGeometryUtil.cpp"]\
++["src/LinearMath/btQuickprof.cpp"] \
++["src/LinearMath/btThreads.cpp"] \
++["src/Bullet3Common/b3AlignedAllocator.cpp"] \
++["examples/ThirdPartyLibs/glad/gl.c"]\
++["examples/OpenGLWindow/GLInstancingRenderer.cpp"]\
++["examples/OpenGLWindow/GLRenderToTexture.cpp"] \
++["examples/OpenGLWindow/LoadShader.cpp"]
+
+if 'BT_USE_EGL' in CXX_FLAGS:
+  sources += ['examples/ThirdPartyLibs/glad/egl.c']
+  sources += ['examples/OpenGLWindow/EGLOpenGLWindow.cpp']
+
+if _platform == "linux" or _platform == "linux2":
+  libraries = ['dl', 'pthread']
+  CXX_FLAGS += '-D_LINUX '
+  CXX_FLAGS += '-DGLEW_STATIC '
+  CXX_FLAGS += '-DGLEW_INIT_OPENGL11_FUNCTIONS=1 '
+  CXX_FLAGS += '-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1 '
+  CXX_FLAGS += '-DDYNAMIC_LOAD_X11_FUNCTIONS '
+  CXX_FLAGS += '-DHAS_SOCKLEN_T '
+  CXX_FLAGS += '-fno-inline-functions-called-once '
+  CXX_FLAGS += '-fvisibility=hidden '
+  CXX_FLAGS += '-fvisibility-inlines-hidden '
+  EGL_CXX_FLAGS += '-DBT_USE_EGL '
+  EGL_CXX_FLAGS += '-fPIC '  # for plugins
+
+  sources = sources + ["examples/ThirdPartyLibs/enet/unix.c"]\
+  +["examples/OpenGLWindow/X11OpenGLWindow.cpp"]\
+  +["examples/ThirdPartyLibs/glad/gl.c"]\
+  +["examples/ThirdPartyLibs/glad/glx.c"]
+  include_dirs += ["examples/ThirdPartyLibs/optionalX11"]
+
+  if 'BT_USE_EGL' in EGL_CXX_FLAGS:
+    egl_renderer_sources = egl_renderer_sources\
+    +["examples/OpenGLWindow/EGLOpenGLWindow.cpp"]\
+    +['examples/ThirdPartyLibs/glad/egl.c']
+  else:
+    egl_renderer_sources = egl_renderer_sources\
+    +["examples/OpenGLWindow/X11OpenGLWindow.cpp"]\
+    +["examples/ThirdPartyLibs/glad/glx.c"]
+
+elif _platform == "win32":
+  print("win32!")
+  libraries = ['Ws2_32', 'Winmm', 'User32', 'Opengl32', 'kernel32', 'glu32', 'Gdi32', 'Comdlg32']
+  CXX_FLAGS += '-DWIN32 '
+  CXX_FLAGS += '-DGLEW_STATIC '
+  sources = sources + ["examples/ThirdPartyLibs/enet/win32.c"]\
+  +["examples/OpenGLWindow/Win32Window.cpp"]\
+  +["examples/OpenGLWindow/Win32OpenGLWindow.cpp"]\
+  +["examples/ThirdPartyLibs/glad/gl.c"]
+elif _platform == "darwin":
+  print("darwin!")
+  os.environ['LDFLAGS'] = '-framework Cocoa -mmacosx-version-min=10.7 -stdlib=libc++ -framework OpenGL'
+  CXX_FLAGS += '-DB3_NO_PYTHON_FRAMEWORK '
+  CXX_FLAGS += '-DHAS_SOCKLEN_T '
+  CXX_FLAGS += '-D_DARWIN '
+  #    CXX_FLAGS += '-framework Cocoa '
+  sources = sources + ["examples/ThirdPartyLibs/enet/unix.c"]\
+  +["examples/OpenGLWindow/MacOpenGLWindow.cpp"]\
+  +["examples/ThirdPartyLibs/glad/gl.c"]\
+  +["examples/OpenGLWindow/MacOpenGLWindowObjC.m"]
+else:
+  print("bsd!")
+  libraries = ['GL', 'GLEW', 'pthread']
+  os.environ['LDFLAGS'] = '-L/usr/X11R6/lib'
+  CXX_FLAGS += '-D_BSD '
+  CXX_FLAGS += '-I/usr/X11R6/include '
+  CXX_FLAGS += '-DHAS_SOCKLEN_T '
+  CXX_FLAGS += '-fno-inline-functions-called-once'
+  sources = ["examples/ThirdPartyLibs/enet/unix.c"]\
+  +["examples/OpenGLWindow/X11OpenGLWindow.cpp"]\
+  +["examples/ThirdPartyLibs/glad/gl.c"]\
+  + sources
+
+setup_py_dir = os.path.dirname(os.path.realpath(__file__))
+
+need_files = []
+datadir = "examples/pybullet/gym/pybullet_data"
+
+hh = setup_py_dir + "/" + datadir
+
+for root, dirs, files in os.walk(hh):
+  for fn in files:
+    ext = os.path.splitext(fn)[1][1:]
+    if ext and ext in 'yaml index meta data-00000-of-00001 png gif jpg urdf sdf obj txt mtl dae off stl STL xml gin npy '.split(
+    ):
+      fn = root + "/" + fn
+      need_files.append(fn[1 + len(hh):])
+
+print("found resource files: %i" % len(need_files))
+for n in need_files:
+  print("-- %s" % n)
+print("packages")
+print(find_packages('examples/pybullet/gym'))
+print("-----")
+
+extensions = []
+
+pybullet_ext = Extension(
+    "pybullet",
+    sources=sources,
+    libraries=libraries,
+    extra_compile_args=CXX_FLAGS.split(),
+    include_dirs=include_dirs + [
+        "src", "examples/ThirdPartyLibs", "examples/ThirdPartyLibs/glad",
+        "examples/ThirdPartyLibs/enet/include", "examples/ThirdPartyLibs/clsocket/src",
+        "Extras/VHACD/inc", "Extras/VHACD/public",
+    ])
+extensions.append(pybullet_ext)
+
+if 'BT_USE_EGL' in EGL_CXX_FLAGS:
+
+  eglRender = Extension(
+      "eglRenderer",
+      sources=egl_renderer_sources,
+      libraries=libraries,
+      extra_compile_args=(CXX_FLAGS + EGL_CXX_FLAGS).split(),
+      include_dirs=include_dirs + [
+          "src", "examples", "examples/ThirdPartyLibs", "examples/ThirdPartyLibs/glad",
+          "examples/ThirdPartyLibs/enet/include", "examples/ThirdPartyLibs/clsocket/src"
+      ])
+
+  extensions.append(eglRender)
+
+setup(
+    name='pybullet',
+    version='3.2.5',
+    description=
+    'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
+    long_description=
+    'pybullet is an easy to use Python module for physics simulation, robotics and deep reinforcement learning based on the Bullet Physics SDK. With pybullet you can load articulated bodies from URDF, SDF and other file formats. pybullet provides forward dynamics simulation, inverse dynamics computation, forward and inverse kinematics and collision detection and ray intersection queries. Aside from physics simulation, pybullet supports to rendering, with a CPU renderer and OpenGL visualization and support for virtual reality headsets.',
+    url='https://github.com/bulletphysics/bullet3',
+    author='Erwin Coumans, Yunfei Bai, Jasmine Hsu',
+    author_email='erwincoumans@google.com',
+    license='zlib',
+    platforms='any',
+    keywords=[
+        'game development', 'virtual reality', 'physics simulation', 'robotics',
+        'collision detection', 'opengl'
+    ],
+    ext_modules=extensions,
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'License :: OSI Approved :: zlib/libpng License',
+        'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX :: Linux',
+        'Operating System :: MacOS', 'Intended Audience :: Science/Research',
+        "Programming Language :: Python", 'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8', 'Topic :: Games/Entertainment :: Simulation',
+        'Topic :: Scientific/Engineering :: Artificial Intelligence',
+        'Framework :: Robot Framework'
+    ],
+    package_dir={'': 'examples/pybullet/gym'},
+    packages=[x for x in find_packages('examples/pybullet/gym')],
+    package_data={'pybullet_data': need_files})
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h
new file mode 100644
index 0000000..bec0800
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h
@@ -0,0 +1,38 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_BROADPHASE_CALLBACK_H
+#define B3_BROADPHASE_CALLBACK_H
+
+#include "Bullet3Common/b3Vector3.h"
+struct b3BroadphaseProxy;
+
+struct b3BroadphaseAabbCallback
+{
+	virtual ~b3BroadphaseAabbCallback() {}
+	virtual bool process(const b3BroadphaseProxy* proxy) = 0;
+};
+
+struct b3BroadphaseRayCallback : public b3BroadphaseAabbCallback
+{
+	///added some cached data to accelerate ray-AABB tests
+	b3Vector3 m_rayDirectionInverse;
+	unsigned int m_signs[3];
+	b3Scalar m_lambda_max;
+
+	virtual ~b3BroadphaseRayCallback() {}
+};
+
+#endif  //B3_BROADPHASE_CALLBACK_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.cpp b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.cpp
new file mode 100644
index 0000000..a0dc1da
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.cpp
@@ -0,0 +1,1352 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///b3DynamicBvh implementation by Nathanael Presson
+
+#include "b3DynamicBvh.h"
+
+//
+typedef b3AlignedObjectArray<b3DbvtNode*> b3NodeArray;
+typedef b3AlignedObjectArray<const b3DbvtNode*> b3ConstNodeArray;
+
+//
+struct b3DbvtNodeEnumerator : b3DynamicBvh::ICollide
+{
+	b3ConstNodeArray nodes;
+	void Process(const b3DbvtNode* n) { nodes.push_back(n); }
+};
+
+//
+static B3_DBVT_INLINE int b3IndexOf(const b3DbvtNode* node)
+{
+	return (node->parent->childs[1] == node);
+}
+
+//
+static B3_DBVT_INLINE b3DbvtVolume b3Merge(const b3DbvtVolume& a,
+										   const b3DbvtVolume& b)
+{
+#if (B3_DBVT_MERGE_IMPL == B3_DBVT_IMPL_SSE)
+	B3_ATTRIBUTE_ALIGNED16(char locals[sizeof(b3DbvtAabbMm)]);
+	b3DbvtVolume& res = *(b3DbvtVolume*)locals;
+#else
+	b3DbvtVolume res;
+#endif
+	b3Merge(a, b, res);
+	return (res);
+}
+
+// volume+edge lengths
+static B3_DBVT_INLINE b3Scalar b3Size(const b3DbvtVolume& a)
+{
+	const b3Vector3 edges = a.Lengths();
+	return (edges.x * edges.y * edges.z +
+			edges.x + edges.y + edges.z);
+}
+
+//
+static void b3GetMaxDepth(const b3DbvtNode* node, int depth, int& maxdepth)
+{
+	if (node->isinternal())
+	{
+		b3GetMaxDepth(node->childs[0], depth + 1, maxdepth);
+		b3GetMaxDepth(node->childs[1], depth + 1, maxdepth);
+	}
+	else
+		maxdepth = b3Max(maxdepth, depth);
+}
+
+//
+static B3_DBVT_INLINE void b3DeleteNode(b3DynamicBvh* pdbvt,
+										b3DbvtNode* node)
+{
+	b3AlignedFree(pdbvt->m_free);
+	pdbvt->m_free = node;
+}
+
+//
+static void b3RecurseDeleteNode(b3DynamicBvh* pdbvt,
+								b3DbvtNode* node)
+{
+	if (!node->isleaf())
+	{
+		b3RecurseDeleteNode(pdbvt, node->childs[0]);
+		b3RecurseDeleteNode(pdbvt, node->childs[1]);
+	}
+	if (node == pdbvt->m_root) pdbvt->m_root = 0;
+	b3DeleteNode(pdbvt, node);
+}
+
+//
+static B3_DBVT_INLINE b3DbvtNode* b3CreateNode(b3DynamicBvh* pdbvt,
+											   b3DbvtNode* parent,
+											   void* data)
+{
+	b3DbvtNode* node;
+	if (pdbvt->m_free)
+	{
+		node = pdbvt->m_free;
+		pdbvt->m_free = 0;
+	}
+	else
+	{
+		node = new (b3AlignedAlloc(sizeof(b3DbvtNode), 16)) b3DbvtNode();
+	}
+	node->parent = parent;
+	node->data = data;
+	node->childs[1] = 0;
+	return (node);
+}
+
+//
+static B3_DBVT_INLINE b3DbvtNode* b3CreateNode(b3DynamicBvh* pdbvt,
+											   b3DbvtNode* parent,
+											   const b3DbvtVolume& volume,
+											   void* data)
+{
+	b3DbvtNode* node = b3CreateNode(pdbvt, parent, data);
+	node->volume = volume;
+	return (node);
+}
+
+//
+static B3_DBVT_INLINE b3DbvtNode* b3CreateNode(b3DynamicBvh* pdbvt,
+											   b3DbvtNode* parent,
+											   const b3DbvtVolume& volume0,
+											   const b3DbvtVolume& volume1,
+											   void* data)
+{
+	b3DbvtNode* node = b3CreateNode(pdbvt, parent, data);
+	b3Merge(volume0, volume1, node->volume);
+	return (node);
+}
+
+//
+static void b3InsertLeaf(b3DynamicBvh* pdbvt,
+						 b3DbvtNode* root,
+						 b3DbvtNode* leaf)
+{
+	if (!pdbvt->m_root)
+	{
+		pdbvt->m_root = leaf;
+		leaf->parent = 0;
+	}
+	else
+	{
+		if (!root->isleaf())
+		{
+			do
+			{
+				root = root->childs[b3Select(leaf->volume,
+											 root->childs[0]->volume,
+											 root->childs[1]->volume)];
+			} while (!root->isleaf());
+		}
+		b3DbvtNode* prev = root->parent;
+		b3DbvtNode* node = b3CreateNode(pdbvt, prev, leaf->volume, root->volume, 0);
+		if (prev)
+		{
+			prev->childs[b3IndexOf(root)] = node;
+			node->childs[0] = root;
+			root->parent = node;
+			node->childs[1] = leaf;
+			leaf->parent = node;
+			do
+			{
+				if (!prev->volume.Contain(node->volume))
+					b3Merge(prev->childs[0]->volume, prev->childs[1]->volume, prev->volume);
+				else
+					break;
+				node = prev;
+			} while (0 != (prev = node->parent));
+		}
+		else
+		{
+			node->childs[0] = root;
+			root->parent = node;
+			node->childs[1] = leaf;
+			leaf->parent = node;
+			pdbvt->m_root = node;
+		}
+	}
+}
+
+//
+static b3DbvtNode* b3RemoveLeaf(b3DynamicBvh* pdbvt,
+								b3DbvtNode* leaf)
+{
+	if (leaf == pdbvt->m_root)
+	{
+		pdbvt->m_root = 0;
+		return (0);
+	}
+	else
+	{
+		b3DbvtNode* parent = leaf->parent;
+		b3DbvtNode* prev = parent->parent;
+		b3DbvtNode* sibling = parent->childs[1 - b3IndexOf(leaf)];
+		if (prev)
+		{
+			prev->childs[b3IndexOf(parent)] = sibling;
+			sibling->parent = prev;
+			b3DeleteNode(pdbvt, parent);
+			while (prev)
+			{
+				const b3DbvtVolume pb = prev->volume;
+				b3Merge(prev->childs[0]->volume, prev->childs[1]->volume, prev->volume);
+				if (b3NotEqual(pb, prev->volume))
+				{
+					prev = prev->parent;
+				}
+				else
+					break;
+			}
+			return (prev ? prev : pdbvt->m_root);
+		}
+		else
+		{
+			pdbvt->m_root = sibling;
+			sibling->parent = 0;
+			b3DeleteNode(pdbvt, parent);
+			return (pdbvt->m_root);
+		}
+	}
+}
+
+//
+static void b3FetchLeaves(b3DynamicBvh* pdbvt,
+						  b3DbvtNode* root,
+						  b3NodeArray& leaves,
+						  int depth = -1)
+{
+	if (root->isinternal() && depth)
+	{
+		b3FetchLeaves(pdbvt, root->childs[0], leaves, depth - 1);
+		b3FetchLeaves(pdbvt, root->childs[1], leaves, depth - 1);
+		b3DeleteNode(pdbvt, root);
+	}
+	else
+	{
+		leaves.push_back(root);
+	}
+}
+
+static bool b3LeftOfAxis(const b3DbvtNode* node,
+						 const b3Vector3& org,
+						 const b3Vector3& axis)
+{
+	return b3Dot(axis, node->volume.Center() - org) <= 0;
+}
+
+// Partitions leaves such that leaves[0, n) are on the
+// left of axis, and leaves[n, count) are on the right
+// of axis. returns N.
+static int b3Split(b3DbvtNode** leaves,
+				   int count,
+				   const b3Vector3& org,
+				   const b3Vector3& axis)
+{
+	int begin = 0;
+	int end = count;
+	for (;;)
+	{
+		while (begin != end && b3LeftOfAxis(leaves[begin], org, axis))
+		{
+			++begin;
+		}
+
+		if (begin == end)
+		{
+			break;
+		}
+
+		while (begin != end && !b3LeftOfAxis(leaves[end - 1], org, axis))
+		{
+			--end;
+		}
+
+		if (begin == end)
+		{
+			break;
+		}
+
+		// swap out of place nodes
+		--end;
+		b3DbvtNode* temp = leaves[begin];
+		leaves[begin] = leaves[end];
+		leaves[end] = temp;
+		++begin;
+	}
+
+	return begin;
+}
+
+//
+static b3DbvtVolume b3Bounds(b3DbvtNode** leaves,
+							 int count)
+{
+#if B3_DBVT_MERGE_IMPL == B3_DBVT_IMPL_SSE
+	B3_ATTRIBUTE_ALIGNED16(char locals[sizeof(b3DbvtVolume)]);
+	b3DbvtVolume& volume = *(b3DbvtVolume*)locals;
+	volume = leaves[0]->volume;
+#else
+	b3DbvtVolume volume = leaves[0]->volume;
+#endif
+	for (int i = 1, ni = count; i < ni; ++i)
+	{
+		b3Merge(volume, leaves[i]->volume, volume);
+	}
+	return (volume);
+}
+
+//
+static void b3BottomUp(b3DynamicBvh* pdbvt,
+					   b3DbvtNode** leaves,
+					   int count)
+{
+	while (count > 1)
+	{
+		b3Scalar minsize = B3_INFINITY;
+		int minidx[2] = {-1, -1};
+		for (int i = 0; i < count; ++i)
+		{
+			for (int j = i + 1; j < count; ++j)
+			{
+				const b3Scalar sz = b3Size(b3Merge(leaves[i]->volume, leaves[j]->volume));
+				if (sz < minsize)
+				{
+					minsize = sz;
+					minidx[0] = i;
+					minidx[1] = j;
+				}
+			}
+		}
+		b3DbvtNode* n[] = {leaves[minidx[0]], leaves[minidx[1]]};
+		b3DbvtNode* p = b3CreateNode(pdbvt, 0, n[0]->volume, n[1]->volume, 0);
+		p->childs[0] = n[0];
+		p->childs[1] = n[1];
+		n[0]->parent = p;
+		n[1]->parent = p;
+		leaves[minidx[0]] = p;
+		leaves[minidx[1]] = leaves[count - 1];
+		--count;
+	}
+}
+
+//
+static b3DbvtNode* b3TopDown(b3DynamicBvh* pdbvt,
+							 b3DbvtNode** leaves,
+							 int count,
+							 int bu_treshold)
+{
+	static const b3Vector3 axis[] = {b3MakeVector3(1, 0, 0),
+									 b3MakeVector3(0, 1, 0),
+									 b3MakeVector3(0, 0, 1)};
+	b3Assert(bu_treshold > 1);
+	if (count > 1)
+	{
+		if (count > bu_treshold)
+		{
+			const b3DbvtVolume vol = b3Bounds(leaves, count);
+			const b3Vector3 org = vol.Center();
+			int partition;
+			int bestaxis = -1;
+			int bestmidp = count;
+			int splitcount[3][2] = {{0, 0}, {0, 0}, {0, 0}};
+			int i;
+			for (i = 0; i < count; ++i)
+			{
+				const b3Vector3 x = leaves[i]->volume.Center() - org;
+				for (int j = 0; j < 3; ++j)
+				{
+					++splitcount[j][b3Dot(x, axis[j]) > 0 ? 1 : 0];
+				}
+			}
+			for (i = 0; i < 3; ++i)
+			{
+				if ((splitcount[i][0] > 0) && (splitcount[i][1] > 0))
+				{
+					const int midp = (int)b3Fabs(b3Scalar(splitcount[i][0] - splitcount[i][1]));
+					if (midp < bestmidp)
+					{
+						bestaxis = i;
+						bestmidp = midp;
+					}
+				}
+			}
+			if (bestaxis >= 0)
+			{
+				partition = b3Split(leaves, count, org, axis[bestaxis]);
+				b3Assert(partition != 0 && partition != count);
+			}
+			else
+			{
+				partition = count / 2 + 1;
+			}
+			b3DbvtNode* node = b3CreateNode(pdbvt, 0, vol, 0);
+			node->childs[0] = b3TopDown(pdbvt, &leaves[0], partition, bu_treshold);
+			node->childs[1] = b3TopDown(pdbvt, &leaves[partition], count - partition, bu_treshold);
+			node->childs[0]->parent = node;
+			node->childs[1]->parent = node;
+			return (node);
+		}
+		else
+		{
+			b3BottomUp(pdbvt, leaves, count);
+			return (leaves[0]);
+		}
+	}
+	return (leaves[0]);
+}
+
+//
+static B3_DBVT_INLINE b3DbvtNode* b3Sort(b3DbvtNode* n, b3DbvtNode*& r)
+{
+	b3DbvtNode* p = n->parent;
+	b3Assert(n->isinternal());
+	if (p > n)
+	{
+		const int i = b3IndexOf(n);
+		const int j = 1 - i;
+		b3DbvtNode* s = p->childs[j];
+		b3DbvtNode* q = p->parent;
+		b3Assert(n == p->childs[i]);
+		if (q)
+			q->childs[b3IndexOf(p)] = n;
+		else
+			r = n;
+		s->parent = n;
+		p->parent = n;
+		n->parent = q;
+		p->childs[0] = n->childs[0];
+		p->childs[1] = n->childs[1];
+		n->childs[0]->parent = p;
+		n->childs[1]->parent = p;
+		n->childs[i] = p;
+		n->childs[j] = s;
+		b3Swap(p->volume, n->volume);
+		return (p);
+	}
+	return (n);
+}
+
+#if 0
+static B3_DBVT_INLINE b3DbvtNode*	walkup(b3DbvtNode* n,int count)
+{
+	while(n&&(count--)) n=n->parent;
+	return(n);
+}
+#endif
+
+//
+// Api
+//
+
+//
+b3DynamicBvh::b3DynamicBvh()
+{
+	m_root = 0;
+	m_free = 0;
+	m_lkhd = -1;
+	m_leaves = 0;
+	m_opath = 0;
+}
+
+//
+b3DynamicBvh::~b3DynamicBvh()
+{
+	clear();
+}
+
+//
+void b3DynamicBvh::clear()
+{
+	if (m_root)
+		b3RecurseDeleteNode(this, m_root);
+	b3AlignedFree(m_free);
+	m_free = 0;
+	m_lkhd = -1;
+	m_stkStack.clear();
+	m_opath = 0;
+}
+
+//
+void b3DynamicBvh::optimizeBottomUp()
+{
+	if (m_root)
+	{
+		b3NodeArray leaves;
+		leaves.reserve(m_leaves);
+		b3FetchLeaves(this, m_root, leaves);
+		b3BottomUp(this, &leaves[0], leaves.size());
+		m_root = leaves[0];
+	}
+}
+
+//
+void b3DynamicBvh::optimizeTopDown(int bu_treshold)
+{
+	if (m_root)
+	{
+		b3NodeArray leaves;
+		leaves.reserve(m_leaves);
+		b3FetchLeaves(this, m_root, leaves);
+		m_root = b3TopDown(this, &leaves[0], leaves.size(), bu_treshold);
+	}
+}
+
+//
+void b3DynamicBvh::optimizeIncremental(int passes)
+{
+	if (passes < 0) passes = m_leaves;
+	if (m_root && (passes > 0))
+	{
+		do
+		{
+			b3DbvtNode* node = m_root;
+			unsigned bit = 0;
+			while (node->isinternal())
+			{
+				node = b3Sort(node, m_root)->childs[(m_opath >> bit) & 1];
+				bit = (bit + 1) & (sizeof(unsigned) * 8 - 1);
+			}
+			update(node);
+			++m_opath;
+		} while (--passes);
+	}
+}
+
+//
+b3DbvtNode* b3DynamicBvh::insert(const b3DbvtVolume& volume, void* data)
+{
+	b3DbvtNode* leaf = b3CreateNode(this, 0, volume, data);
+	b3InsertLeaf(this, m_root, leaf);
+	++m_leaves;
+	return (leaf);
+}
+
+//
+void b3DynamicBvh::update(b3DbvtNode* leaf, int lookahead)
+{
+	b3DbvtNode* root = b3RemoveLeaf(this, leaf);
+	if (root)
+	{
+		if (lookahead >= 0)
+		{
+			for (int i = 0; (i < lookahead) && root->parent; ++i)
+			{
+				root = root->parent;
+			}
+		}
+		else
+			root = m_root;
+	}
+	b3InsertLeaf(this, root, leaf);
+}
+
+//
+void b3DynamicBvh::update(b3DbvtNode* leaf, b3DbvtVolume& volume)
+{
+	b3DbvtNode* root = b3RemoveLeaf(this, leaf);
+	if (root)
+	{
+		if (m_lkhd >= 0)
+		{
+			for (int i = 0; (i < m_lkhd) && root->parent; ++i)
+			{
+				root = root->parent;
+			}
+		}
+		else
+			root = m_root;
+	}
+	leaf->volume = volume;
+	b3InsertLeaf(this, root, leaf);
+}
+
+//
+bool b3DynamicBvh::update(b3DbvtNode* leaf, b3DbvtVolume& volume, const b3Vector3& velocity, b3Scalar margin)
+{
+	if (leaf->volume.Contain(volume)) return (false);
+	volume.Expand(b3MakeVector3(margin, margin, margin));
+	volume.SignedExpand(velocity);
+	update(leaf, volume);
+	return (true);
+}
+
+//
+bool b3DynamicBvh::update(b3DbvtNode* leaf, b3DbvtVolume& volume, const b3Vector3& velocity)
+{
+	if (leaf->volume.Contain(volume)) return (false);
+	volume.SignedExpand(velocity);
+	update(leaf, volume);
+	return (true);
+}
+
+//
+bool b3DynamicBvh::update(b3DbvtNode* leaf, b3DbvtVolume& volume, b3Scalar margin)
+{
+	if (leaf->volume.Contain(volume)) return (false);
+	volume.Expand(b3MakeVector3(margin, margin, margin));
+	update(leaf, volume);
+	return (true);
+}
+
+//
+void b3DynamicBvh::remove(b3DbvtNode* leaf)
+{
+	b3RemoveLeaf(this, leaf);
+	b3DeleteNode(this, leaf);
+	--m_leaves;
+}
+
+//
+void b3DynamicBvh::write(IWriter* iwriter) const
+{
+	b3DbvtNodeEnumerator nodes;
+	nodes.nodes.reserve(m_leaves * 2);
+	enumNodes(m_root, nodes);
+	iwriter->Prepare(m_root, nodes.nodes.size());
+	for (int i = 0; i < nodes.nodes.size(); ++i)
+	{
+		const b3DbvtNode* n = nodes.nodes[i];
+		int p = -1;
+		if (n->parent) p = nodes.nodes.findLinearSearch(n->parent);
+		if (n->isinternal())
+		{
+			const int c0 = nodes.nodes.findLinearSearch(n->childs[0]);
+			const int c1 = nodes.nodes.findLinearSearch(n->childs[1]);
+			iwriter->WriteNode(n, i, p, c0, c1);
+		}
+		else
+		{
+			iwriter->WriteLeaf(n, i, p);
+		}
+	}
+}
+
+//
+void b3DynamicBvh::clone(b3DynamicBvh& dest, IClone* iclone) const
+{
+	dest.clear();
+	if (m_root != 0)
+	{
+		b3AlignedObjectArray<sStkCLN> stack;
+		stack.reserve(m_leaves);
+		stack.push_back(sStkCLN(m_root, 0));
+		do
+		{
+			const int i = stack.size() - 1;
+			const sStkCLN e = stack[i];
+			b3DbvtNode* n = b3CreateNode(&dest, e.parent, e.node->volume, e.node->data);
+			stack.pop_back();
+			if (e.parent != 0)
+				e.parent->childs[i & 1] = n;
+			else
+				dest.m_root = n;
+			if (e.node->isinternal())
+			{
+				stack.push_back(sStkCLN(e.node->childs[0], n));
+				stack.push_back(sStkCLN(e.node->childs[1], n));
+			}
+			else
+			{
+				iclone->CloneLeaf(n);
+			}
+		} while (stack.size() > 0);
+	}
+}
+
+//
+int b3DynamicBvh::maxdepth(const b3DbvtNode* node)
+{
+	int depth = 0;
+	if (node) b3GetMaxDepth(node, 1, depth);
+	return (depth);
+}
+
+//
+int b3DynamicBvh::countLeaves(const b3DbvtNode* node)
+{
+	if (node->isinternal())
+		return (countLeaves(node->childs[0]) + countLeaves(node->childs[1]));
+	else
+		return (1);
+}
+
+//
+void b3DynamicBvh::extractLeaves(const b3DbvtNode* node, b3AlignedObjectArray<const b3DbvtNode*>& leaves)
+{
+	if (node->isinternal())
+	{
+		extractLeaves(node->childs[0], leaves);
+		extractLeaves(node->childs[1], leaves);
+	}
+	else
+	{
+		leaves.push_back(node);
+	}
+}
+
+//
+#if B3_DBVT_ENABLE_BENCHMARK
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+q6600,2.4ghz
+
+/Ox /Ob2 /Oi /Ot /I "." /I "..\.." /I "..\..\src" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"
+/GF /FD /MT /GS- /Gy /arch:SSE2 /Zc:wchar_t- /Fp"..\..\out\release8\build\libbulletcollision\libbulletcollision.pch"
+/Fo"..\..\out\release8\build\libbulletcollision\\"
+/Fd"..\..\out\release8\build\libbulletcollision\bulletcollision.pdb"
+/W3 /nologo /c /Wp64 /Zi /errorReport:prompt
+
+Benchmarking dbvt...
+World scale: 100.000000
+Extents base: 1.000000
+Extents range: 4.000000
+Leaves: 8192
+sizeof(b3DbvtVolume): 32 bytes
+sizeof(b3DbvtNode):   44 bytes
+[1] b3DbvtVolume intersections: 3499 ms (-1%)
+[2] b3DbvtVolume merges: 1934 ms (0%)
+[3] b3DynamicBvh::collideTT: 5485 ms (-21%)
+[4] b3DynamicBvh::collideTT self: 2814 ms (-20%)
+[5] b3DynamicBvh::collideTT xform: 7379 ms (-1%)
+[6] b3DynamicBvh::collideTT xform,self: 7270 ms (-2%)
+[7] b3DynamicBvh::rayTest: 6314 ms (0%),(332143 r/s)
+[8] insert/remove: 2093 ms (0%),(1001983 ir/s)
+[9] updates (teleport): 1879 ms (-3%),(1116100 u/s)
+[10] updates (jitter): 1244 ms (-4%),(1685813 u/s)
+[11] optimize (incremental): 2514 ms (0%),(1668000 o/s)
+[12] b3DbvtVolume notequal: 3659 ms (0%)
+[13] culling(OCL+fullsort): 2218 ms (0%),(461 t/s)
+[14] culling(OCL+qsort): 3688 ms (5%),(2221 t/s)
+[15] culling(KDOP+qsort): 1139 ms (-1%),(7192 t/s)
+[16] insert/remove batch(256): 5092 ms (0%),(823704 bir/s)
+[17] b3DbvtVolume select: 3419 ms (0%)
+*/
+
+struct b3DbvtBenchmark
+{
+	struct NilPolicy : b3DynamicBvh::ICollide
+	{
+		NilPolicy() : m_pcount(0), m_depth(-B3_INFINITY), m_checksort(true) {}
+		void Process(const b3DbvtNode*, const b3DbvtNode*) { ++m_pcount; }
+		void Process(const b3DbvtNode*) { ++m_pcount; }
+		void Process(const b3DbvtNode*, b3Scalar depth)
+		{
+			++m_pcount;
+			if (m_checksort)
+			{
+				if (depth >= m_depth)
+					m_depth = depth;
+				else
+					printf("wrong depth: %f (should be >= %f)\r\n", depth, m_depth);
+			}
+		}
+		int m_pcount;
+		b3Scalar m_depth;
+		bool m_checksort;
+	};
+	struct P14 : b3DynamicBvh::ICollide
+	{
+		struct Node
+		{
+			const b3DbvtNode* leaf;
+			b3Scalar depth;
+		};
+		void Process(const b3DbvtNode* leaf, b3Scalar depth)
+		{
+			Node n;
+			n.leaf = leaf;
+			n.depth = depth;
+		}
+		static int sortfnc(const Node& a, const Node& b)
+		{
+			if (a.depth < b.depth) return (+1);
+			if (a.depth > b.depth) return (-1);
+			return (0);
+		}
+		b3AlignedObjectArray<Node> m_nodes;
+	};
+	struct P15 : b3DynamicBvh::ICollide
+	{
+		struct Node
+		{
+			const b3DbvtNode* leaf;
+			b3Scalar depth;
+		};
+		void Process(const b3DbvtNode* leaf)
+		{
+			Node n;
+			n.leaf = leaf;
+			n.depth = dot(leaf->volume.Center(), m_axis);
+		}
+		static int sortfnc(const Node& a, const Node& b)
+		{
+			if (a.depth < b.depth) return (+1);
+			if (a.depth > b.depth) return (-1);
+			return (0);
+		}
+		b3AlignedObjectArray<Node> m_nodes;
+		b3Vector3 m_axis;
+	};
+	static b3Scalar RandUnit()
+	{
+		return (rand() / (b3Scalar)RAND_MAX);
+	}
+	static b3Vector3 RandVector3()
+	{
+		return (b3Vector3(RandUnit(), RandUnit(), RandUnit()));
+	}
+	static b3Vector3 RandVector3(b3Scalar cs)
+	{
+		return (RandVector3() * cs - b3Vector3(cs, cs, cs) / 2);
+	}
+	static b3DbvtVolume RandVolume(b3Scalar cs, b3Scalar eb, b3Scalar es)
+	{
+		return (b3DbvtVolume::FromCE(RandVector3(cs), b3Vector3(eb, eb, eb) + RandVector3() * es));
+	}
+	static b3Transform RandTransform(b3Scalar cs)
+	{
+		b3Transform t;
+		t.setOrigin(RandVector3(cs));
+		t.setRotation(b3Quaternion(RandUnit() * B3_PI * 2, RandUnit() * B3_PI * 2, RandUnit() * B3_PI * 2).normalized());
+		return (t);
+	}
+	static void RandTree(b3Scalar cs, b3Scalar eb, b3Scalar es, int leaves, b3DynamicBvh& dbvt)
+	{
+		dbvt.clear();
+		for (int i = 0; i < leaves; ++i)
+		{
+			dbvt.insert(RandVolume(cs, eb, es), 0);
+		}
+	}
+};
+
+void b3DynamicBvh::benchmark()
+{
+	static const b3Scalar cfgVolumeCenterScale = 100;
+	static const b3Scalar cfgVolumeExentsBase = 1;
+	static const b3Scalar cfgVolumeExentsScale = 4;
+	static const int cfgLeaves = 8192;
+	static const bool cfgEnable = true;
+
+	//[1] b3DbvtVolume intersections
+	bool cfgBenchmark1_Enable = cfgEnable;
+	static const int cfgBenchmark1_Iterations = 8;
+	static const int cfgBenchmark1_Reference = 3499;
+	//[2] b3DbvtVolume merges
+	bool cfgBenchmark2_Enable = cfgEnable;
+	static const int cfgBenchmark2_Iterations = 4;
+	static const int cfgBenchmark2_Reference = 1945;
+	//[3] b3DynamicBvh::collideTT
+	bool cfgBenchmark3_Enable = cfgEnable;
+	static const int cfgBenchmark3_Iterations = 512;
+	static const int cfgBenchmark3_Reference = 5485;
+	//[4] b3DynamicBvh::collideTT self
+	bool cfgBenchmark4_Enable = cfgEnable;
+	static const int cfgBenchmark4_Iterations = 512;
+	static const int cfgBenchmark4_Reference = 2814;
+	//[5] b3DynamicBvh::collideTT xform
+	bool cfgBenchmark5_Enable = cfgEnable;
+	static const int cfgBenchmark5_Iterations = 512;
+	static const b3Scalar cfgBenchmark5_OffsetScale = 2;
+	static const int cfgBenchmark5_Reference = 7379;
+	//[6] b3DynamicBvh::collideTT xform,self
+	bool cfgBenchmark6_Enable = cfgEnable;
+	static const int cfgBenchmark6_Iterations = 512;
+	static const b3Scalar cfgBenchmark6_OffsetScale = 2;
+	static const int cfgBenchmark6_Reference = 7270;
+	//[7] b3DynamicBvh::rayTest
+	bool cfgBenchmark7_Enable = cfgEnable;
+	static const int cfgBenchmark7_Passes = 32;
+	static const int cfgBenchmark7_Iterations = 65536;
+	static const int cfgBenchmark7_Reference = 6307;
+	//[8] insert/remove
+	bool cfgBenchmark8_Enable = cfgEnable;
+	static const int cfgBenchmark8_Passes = 32;
+	static const int cfgBenchmark8_Iterations = 65536;
+	static const int cfgBenchmark8_Reference = 2105;
+	//[9] updates (teleport)
+	bool cfgBenchmark9_Enable = cfgEnable;
+	static const int cfgBenchmark9_Passes = 32;
+	static const int cfgBenchmark9_Iterations = 65536;
+	static const int cfgBenchmark9_Reference = 1879;
+	//[10] updates (jitter)
+	bool cfgBenchmark10_Enable = cfgEnable;
+	static const b3Scalar cfgBenchmark10_Scale = cfgVolumeCenterScale / 10000;
+	static const int cfgBenchmark10_Passes = 32;
+	static const int cfgBenchmark10_Iterations = 65536;
+	static const int cfgBenchmark10_Reference = 1244;
+	//[11] optimize (incremental)
+	bool cfgBenchmark11_Enable = cfgEnable;
+	static const int cfgBenchmark11_Passes = 64;
+	static const int cfgBenchmark11_Iterations = 65536;
+	static const int cfgBenchmark11_Reference = 2510;
+	//[12] b3DbvtVolume notequal
+	bool cfgBenchmark12_Enable = cfgEnable;
+	static const int cfgBenchmark12_Iterations = 32;
+	static const int cfgBenchmark12_Reference = 3677;
+	//[13] culling(OCL+fullsort)
+	bool cfgBenchmark13_Enable = cfgEnable;
+	static const int cfgBenchmark13_Iterations = 1024;
+	static const int cfgBenchmark13_Reference = 2231;
+	//[14] culling(OCL+qsort)
+	bool cfgBenchmark14_Enable = cfgEnable;
+	static const int cfgBenchmark14_Iterations = 8192;
+	static const int cfgBenchmark14_Reference = 3500;
+	//[15] culling(KDOP+qsort)
+	bool cfgBenchmark15_Enable = cfgEnable;
+	static const int cfgBenchmark15_Iterations = 8192;
+	static const int cfgBenchmark15_Reference = 1151;
+	//[16] insert/remove batch
+	bool cfgBenchmark16_Enable = cfgEnable;
+	static const int cfgBenchmark16_BatchCount = 256;
+	static const int cfgBenchmark16_Passes = 16384;
+	static const int cfgBenchmark16_Reference = 5138;
+	//[17] select
+	bool cfgBenchmark17_Enable = cfgEnable;
+	static const int cfgBenchmark17_Iterations = 4;
+	static const int cfgBenchmark17_Reference = 3390;
+
+	b3Clock wallclock;
+	printf("Benchmarking dbvt...\r\n");
+	printf("\tWorld scale: %f\r\n", cfgVolumeCenterScale);
+	printf("\tExtents base: %f\r\n", cfgVolumeExentsBase);
+	printf("\tExtents range: %f\r\n", cfgVolumeExentsScale);
+	printf("\tLeaves: %u\r\n", cfgLeaves);
+	printf("\tsizeof(b3DbvtVolume): %u bytes\r\n", sizeof(b3DbvtVolume));
+	printf("\tsizeof(b3DbvtNode):   %u bytes\r\n", sizeof(b3DbvtNode));
+	if (cfgBenchmark1_Enable)
+	{  // Benchmark 1
+		srand(380843);
+		b3AlignedObjectArray<b3DbvtVolume> volumes;
+		b3AlignedObjectArray<bool> results;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			volumes[i] = b3DbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		printf("[1] b3DbvtVolume intersections: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark1_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					results[k] = Intersect(volumes[j], volumes[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark1_Reference) * 100 / time);
+	}
+	if (cfgBenchmark2_Enable)
+	{  // Benchmark 2
+		srand(380843);
+		b3AlignedObjectArray<b3DbvtVolume> volumes;
+		b3AlignedObjectArray<b3DbvtVolume> results;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			volumes[i] = b3DbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		printf("[2] b3DbvtVolume merges: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark2_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					Merge(volumes[j], volumes[k], results[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark2_Reference) * 100 / time);
+	}
+	if (cfgBenchmark3_Enable)
+	{  // Benchmark 3
+		srand(380843);
+		b3DynamicBvh dbvt[2];
+		b3DbvtBenchmark::NilPolicy policy;
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[0]);
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[1]);
+		dbvt[0].optimizeTopDown();
+		dbvt[1].optimizeTopDown();
+		printf("[3] b3DynamicBvh::collideTT: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark3_Iterations; ++i)
+		{
+			b3DynamicBvh::collideTT(dbvt[0].m_root, dbvt[1].m_root, policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark3_Reference) * 100 / time);
+	}
+	if (cfgBenchmark4_Enable)
+	{  // Benchmark 4
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3DbvtBenchmark::NilPolicy policy;
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[4] b3DynamicBvh::collideTT self: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark4_Iterations; ++i)
+		{
+			b3DynamicBvh::collideTT(dbvt.m_root, dbvt.m_root, policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark4_Reference) * 100 / time);
+	}
+	if (cfgBenchmark5_Enable)
+	{  // Benchmark 5
+		srand(380843);
+		b3DynamicBvh dbvt[2];
+		b3AlignedObjectArray<b3Transform> transforms;
+		b3DbvtBenchmark::NilPolicy policy;
+		transforms.resize(cfgBenchmark5_Iterations);
+		for (int i = 0; i < transforms.size(); ++i)
+		{
+			transforms[i] = b3DbvtBenchmark::RandTransform(cfgVolumeCenterScale * cfgBenchmark5_OffsetScale);
+		}
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[0]);
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[1]);
+		dbvt[0].optimizeTopDown();
+		dbvt[1].optimizeTopDown();
+		printf("[5] b3DynamicBvh::collideTT xform: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark5_Iterations; ++i)
+		{
+			b3DynamicBvh::collideTT(dbvt[0].m_root, dbvt[1].m_root, transforms[i], policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark5_Reference) * 100 / time);
+	}
+	if (cfgBenchmark6_Enable)
+	{  // Benchmark 6
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<b3Transform> transforms;
+		b3DbvtBenchmark::NilPolicy policy;
+		transforms.resize(cfgBenchmark6_Iterations);
+		for (int i = 0; i < transforms.size(); ++i)
+		{
+			transforms[i] = b3DbvtBenchmark::RandTransform(cfgVolumeCenterScale * cfgBenchmark6_OffsetScale);
+		}
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[6] b3DynamicBvh::collideTT xform,self: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark6_Iterations; ++i)
+		{
+			b3DynamicBvh::collideTT(dbvt.m_root, dbvt.m_root, transforms[i], policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark6_Reference) * 100 / time);
+	}
+	if (cfgBenchmark7_Enable)
+	{  // Benchmark 7
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<b3Vector3> rayorg;
+		b3AlignedObjectArray<b3Vector3> raydir;
+		b3DbvtBenchmark::NilPolicy policy;
+		rayorg.resize(cfgBenchmark7_Iterations);
+		raydir.resize(cfgBenchmark7_Iterations);
+		for (int i = 0; i < rayorg.size(); ++i)
+		{
+			rayorg[i] = b3DbvtBenchmark::RandVector3(cfgVolumeCenterScale * 2);
+			raydir[i] = b3DbvtBenchmark::RandVector3(cfgVolumeCenterScale * 2);
+		}
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[7] b3DynamicBvh::rayTest: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark7_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark7_Iterations; ++j)
+			{
+				b3DynamicBvh::rayTest(dbvt.m_root, rayorg[j], rayorg[j] + raydir[j], policy);
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		unsigned rays = cfgBenchmark7_Passes * cfgBenchmark7_Iterations;
+		printf("%u ms (%i%%),(%u r/s)\r\n", time, (time - cfgBenchmark7_Reference) * 100 / time, (rays * 1000) / time);
+	}
+	if (cfgBenchmark8_Enable)
+	{  // Benchmark 8
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[8] insert/remove: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark8_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark8_Iterations; ++j)
+			{
+				dbvt.remove(dbvt.insert(b3DbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale), 0));
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int ir = cfgBenchmark8_Passes * cfgBenchmark8_Iterations;
+		printf("%u ms (%i%%),(%u ir/s)\r\n", time, (time - cfgBenchmark8_Reference) * 100 / time, ir * 1000 / time);
+	}
+	if (cfgBenchmark9_Enable)
+	{  // Benchmark 9
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<const b3DbvtNode*> leaves;
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		dbvt.extractLeaves(dbvt.m_root, leaves);
+		printf("[9] updates (teleport): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark9_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark9_Iterations; ++j)
+			{
+				dbvt.update(const_cast<b3DbvtNode*>(leaves[rand() % cfgLeaves]),
+							b3DbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale));
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int up = cfgBenchmark9_Passes * cfgBenchmark9_Iterations;
+		printf("%u ms (%i%%),(%u u/s)\r\n", time, (time - cfgBenchmark9_Reference) * 100 / time, up * 1000 / time);
+	}
+	if (cfgBenchmark10_Enable)
+	{  // Benchmark 10
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<const b3DbvtNode*> leaves;
+		b3AlignedObjectArray<b3Vector3> vectors;
+		vectors.resize(cfgBenchmark10_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (b3DbvtBenchmark::RandVector3() * 2 - b3Vector3(1, 1, 1)) * cfgBenchmark10_Scale;
+		}
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		dbvt.extractLeaves(dbvt.m_root, leaves);
+		printf("[10] updates (jitter): ");
+		wallclock.reset();
+
+		for (int i = 0; i < cfgBenchmark10_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark10_Iterations; ++j)
+			{
+				const b3Vector3& d = vectors[j];
+				b3DbvtNode* l = const_cast<b3DbvtNode*>(leaves[rand() % cfgLeaves]);
+				b3DbvtVolume v = b3DbvtVolume::FromMM(l->volume.Mins() + d, l->volume.Maxs() + d);
+				dbvt.update(l, v);
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int up = cfgBenchmark10_Passes * cfgBenchmark10_Iterations;
+		printf("%u ms (%i%%),(%u u/s)\r\n", time, (time - cfgBenchmark10_Reference) * 100 / time, up * 1000 / time);
+	}
+	if (cfgBenchmark11_Enable)
+	{  // Benchmark 11
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[11] optimize (incremental): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark11_Passes; ++i)
+		{
+			dbvt.optimizeIncremental(cfgBenchmark11_Iterations);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int op = cfgBenchmark11_Passes * cfgBenchmark11_Iterations;
+		printf("%u ms (%i%%),(%u o/s)\r\n", time, (time - cfgBenchmark11_Reference) * 100 / time, op / time * 1000);
+	}
+	if (cfgBenchmark12_Enable)
+	{  // Benchmark 12
+		srand(380843);
+		b3AlignedObjectArray<b3DbvtVolume> volumes;
+		b3AlignedObjectArray<bool> results;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			volumes[i] = b3DbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		printf("[12] b3DbvtVolume notequal: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark12_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					results[k] = NotEqual(volumes[j], volumes[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark12_Reference) * 100 / time);
+	}
+	if (cfgBenchmark13_Enable)
+	{  // Benchmark 13
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<b3Vector3> vectors;
+		b3DbvtBenchmark::NilPolicy policy;
+		vectors.resize(cfgBenchmark13_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (b3DbvtBenchmark::RandVector3() * 2 - b3Vector3(1, 1, 1)).normalized();
+		}
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[13] culling(OCL+fullsort): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark13_Iterations; ++i)
+		{
+			static const b3Scalar offset = 0;
+			policy.m_depth = -B3_INFINITY;
+			dbvt.collideOCL(dbvt.m_root, &vectors[i], &offset, vectors[i], 1, policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int t = cfgBenchmark13_Iterations;
+		printf("%u ms (%i%%),(%u t/s)\r\n", time, (time - cfgBenchmark13_Reference) * 100 / time, (t * 1000) / time);
+	}
+	if (cfgBenchmark14_Enable)
+	{  // Benchmark 14
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<b3Vector3> vectors;
+		b3DbvtBenchmark::P14 policy;
+		vectors.resize(cfgBenchmark14_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (b3DbvtBenchmark::RandVector3() * 2 - b3Vector3(1, 1, 1)).normalized();
+		}
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		policy.m_nodes.reserve(cfgLeaves);
+		printf("[14] culling(OCL+qsort): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark14_Iterations; ++i)
+		{
+			static const b3Scalar offset = 0;
+			policy.m_nodes.resize(0);
+			dbvt.collideOCL(dbvt.m_root, &vectors[i], &offset, vectors[i], 1, policy, false);
+			policy.m_nodes.quickSort(b3DbvtBenchmark::P14::sortfnc);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int t = cfgBenchmark14_Iterations;
+		printf("%u ms (%i%%),(%u t/s)\r\n", time, (time - cfgBenchmark14_Reference) * 100 / time, (t * 1000) / time);
+	}
+	if (cfgBenchmark15_Enable)
+	{  // Benchmark 15
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<b3Vector3> vectors;
+		b3DbvtBenchmark::P15 policy;
+		vectors.resize(cfgBenchmark15_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (b3DbvtBenchmark::RandVector3() * 2 - b3Vector3(1, 1, 1)).normalized();
+		}
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		policy.m_nodes.reserve(cfgLeaves);
+		printf("[15] culling(KDOP+qsort): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark15_Iterations; ++i)
+		{
+			static const b3Scalar offset = 0;
+			policy.m_nodes.resize(0);
+			policy.m_axis = vectors[i];
+			dbvt.collideKDOP(dbvt.m_root, &vectors[i], &offset, 1, policy);
+			policy.m_nodes.quickSort(b3DbvtBenchmark::P15::sortfnc);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int t = cfgBenchmark15_Iterations;
+		printf("%u ms (%i%%),(%u t/s)\r\n", time, (time - cfgBenchmark15_Reference) * 100 / time, (t * 1000) / time);
+	}
+	if (cfgBenchmark16_Enable)
+	{  // Benchmark 16
+		srand(380843);
+		b3DynamicBvh dbvt;
+		b3AlignedObjectArray<b3DbvtNode*> batch;
+		b3DbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		batch.reserve(cfgBenchmark16_BatchCount);
+		printf("[16] insert/remove batch(%u): ", cfgBenchmark16_BatchCount);
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark16_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark16_BatchCount; ++j)
+			{
+				batch.push_back(dbvt.insert(b3DbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale), 0));
+			}
+			for (int j = 0; j < cfgBenchmark16_BatchCount; ++j)
+			{
+				dbvt.remove(batch[j]);
+			}
+			batch.resize(0);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int ir = cfgBenchmark16_Passes * cfgBenchmark16_BatchCount;
+		printf("%u ms (%i%%),(%u bir/s)\r\n", time, (time - cfgBenchmark16_Reference) * 100 / time, int(ir * 1000.0 / time));
+	}
+	if (cfgBenchmark17_Enable)
+	{  // Benchmark 17
+		srand(380843);
+		b3AlignedObjectArray<b3DbvtVolume> volumes;
+		b3AlignedObjectArray<int> results;
+		b3AlignedObjectArray<int> indices;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		indices.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			indices[i] = i;
+			volumes[i] = b3DbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			b3Swap(indices[i], indices[rand() % cfgLeaves]);
+		}
+		printf("[17] b3DbvtVolume select: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark17_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					const int idx = indices[k];
+					results[idx] = Select(volumes[idx], volumes[j], volumes[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark17_Reference) * 100 / time);
+	}
+	printf("\r\n\r\n");
+}
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h
new file mode 100644
index 0000000..f44e337
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h
@@ -0,0 +1,1332 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///b3DynamicBvh implementation by Nathanael Presson
+
+#ifndef B3_DYNAMIC_BOUNDING_VOLUME_TREE_H
+#define B3_DYNAMIC_BOUNDING_VOLUME_TREE_H
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3Transform.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
+
+//
+// Compile time configuration
+//
+
+// Implementation profiles
+#define B3_DBVT_IMPL_GENERIC 0  // Generic implementation
+#define B3_DBVT_IMPL_SSE 1      // SSE
+
+// Template implementation of ICollide
+#ifdef _WIN32
+#if (defined(_MSC_VER) && _MSC_VER >= 1400)
+#define B3_DBVT_USE_TEMPLATE 1
+#else
+#define B3_DBVT_USE_TEMPLATE 0
+#endif
+#else
+#define B3_DBVT_USE_TEMPLATE 0
+#endif
+
+// Use only intrinsics instead of inline asm
+#define B3_DBVT_USE_INTRINSIC_SSE 1
+
+// Using memmov for collideOCL
+#define B3_DBVT_USE_MEMMOVE 1
+
+// Enable benchmarking code
+#define B3_DBVT_ENABLE_BENCHMARK 0
+
+// Inlining
+#define B3_DBVT_INLINE B3_FORCE_INLINE
+
+// Specific methods implementation
+
+//SSE gives errors on a MSVC 7.1
+#if defined(B3_USE_SSE)  //&& defined (_WIN32)
+#define B3_DBVT_SELECT_IMPL B3_DBVT_IMPL_SSE
+#define B3_DBVT_MERGE_IMPL B3_DBVT_IMPL_SSE
+#define B3_DBVT_INT0_IMPL B3_DBVT_IMPL_SSE
+#else
+#define B3_DBVT_SELECT_IMPL B3_DBVT_IMPL_GENERIC
+#define B3_DBVT_MERGE_IMPL B3_DBVT_IMPL_GENERIC
+#define B3_DBVT_INT0_IMPL B3_DBVT_IMPL_GENERIC
+#endif
+
+#if (B3_DBVT_SELECT_IMPL == B3_DBVT_IMPL_SSE) || \
+	(B3_DBVT_MERGE_IMPL == B3_DBVT_IMPL_SSE) ||  \
+	(B3_DBVT_INT0_IMPL == B3_DBVT_IMPL_SSE)
+#include <emmintrin.h>
+#endif
+
+//
+// Auto config and checks
+//
+
+#if B3_DBVT_USE_TEMPLATE
+#define B3_DBVT_VIRTUAL
+#define B3_DBVT_VIRTUAL_DTOR(a)
+#define B3_DBVT_PREFIX template <typename T>
+#define B3_DBVT_IPOLICY T& policy
+#define B3_DBVT_CHECKTYPE                        \
+	static const ICollide& typechecker = *(T*)1; \
+	(void)typechecker;
+#else
+#define B3_DBVT_VIRTUAL_DTOR(a) \
+	virtual ~a() {}
+#define B3_DBVT_VIRTUAL virtual
+#define B3_DBVT_PREFIX
+#define B3_DBVT_IPOLICY ICollide& policy
+#define B3_DBVT_CHECKTYPE
+#endif
+
+#if B3_DBVT_USE_MEMMOVE
+#if !defined(__CELLOS_LV2__) && !defined(__MWERKS__)
+#include <memory.h>
+#endif
+#include <string.h>
+#endif
+
+#ifndef B3_DBVT_USE_TEMPLATE
+#error "B3_DBVT_USE_TEMPLATE undefined"
+#endif
+
+#ifndef B3_DBVT_USE_MEMMOVE
+#error "B3_DBVT_USE_MEMMOVE undefined"
+#endif
+
+#ifndef B3_DBVT_ENABLE_BENCHMARK
+#error "B3_DBVT_ENABLE_BENCHMARK undefined"
+#endif
+
+#ifndef B3_DBVT_SELECT_IMPL
+#error "B3_DBVT_SELECT_IMPL undefined"
+#endif
+
+#ifndef B3_DBVT_MERGE_IMPL
+#error "B3_DBVT_MERGE_IMPL undefined"
+#endif
+
+#ifndef B3_DBVT_INT0_IMPL
+#error "B3_DBVT_INT0_IMPL undefined"
+#endif
+
+//
+// Defaults volumes
+//
+
+/* b3DbvtAabbMm			*/
+struct b3DbvtAabbMm
+{
+	B3_DBVT_INLINE b3Vector3 Center() const { return ((mi + mx) / 2); }
+	B3_DBVT_INLINE b3Vector3 Lengths() const { return (mx - mi); }
+	B3_DBVT_INLINE b3Vector3 Extents() const { return ((mx - mi) / 2); }
+	B3_DBVT_INLINE const b3Vector3& Mins() const { return (mi); }
+	B3_DBVT_INLINE const b3Vector3& Maxs() const { return (mx); }
+	static inline b3DbvtAabbMm FromCE(const b3Vector3& c, const b3Vector3& e);
+	static inline b3DbvtAabbMm FromCR(const b3Vector3& c, b3Scalar r);
+	static inline b3DbvtAabbMm FromMM(const b3Vector3& mi, const b3Vector3& mx);
+	static inline b3DbvtAabbMm FromPoints(const b3Vector3* pts, int n);
+	static inline b3DbvtAabbMm FromPoints(const b3Vector3** ppts, int n);
+	B3_DBVT_INLINE void Expand(const b3Vector3& e);
+	B3_DBVT_INLINE void SignedExpand(const b3Vector3& e);
+	B3_DBVT_INLINE bool Contain(const b3DbvtAabbMm& a) const;
+	B3_DBVT_INLINE int Classify(const b3Vector3& n, b3Scalar o, int s) const;
+	B3_DBVT_INLINE b3Scalar ProjectMinimum(const b3Vector3& v, unsigned signs) const;
+	B3_DBVT_INLINE friend bool b3Intersect(const b3DbvtAabbMm& a,
+										   const b3DbvtAabbMm& b);
+
+	B3_DBVT_INLINE friend bool b3Intersect(const b3DbvtAabbMm& a,
+										   const b3Vector3& b);
+
+	B3_DBVT_INLINE friend b3Scalar b3Proximity(const b3DbvtAabbMm& a,
+											   const b3DbvtAabbMm& b);
+	B3_DBVT_INLINE friend int b3Select(const b3DbvtAabbMm& o,
+									   const b3DbvtAabbMm& a,
+									   const b3DbvtAabbMm& b);
+	B3_DBVT_INLINE friend void b3Merge(const b3DbvtAabbMm& a,
+									   const b3DbvtAabbMm& b,
+									   b3DbvtAabbMm& r);
+	B3_DBVT_INLINE friend bool b3NotEqual(const b3DbvtAabbMm& a,
+										  const b3DbvtAabbMm& b);
+
+	B3_DBVT_INLINE b3Vector3& tMins() { return (mi); }
+	B3_DBVT_INLINE b3Vector3& tMaxs() { return (mx); }
+
+private:
+	B3_DBVT_INLINE void AddSpan(const b3Vector3& d, b3Scalar& smi, b3Scalar& smx) const;
+
+private:
+	b3Vector3 mi, mx;
+};
+
+// Types
+typedef b3DbvtAabbMm b3DbvtVolume;
+
+/* b3DbvtNode				*/
+struct b3DbvtNode
+{
+	b3DbvtVolume volume;
+	b3DbvtNode* parent;
+	B3_DBVT_INLINE bool isleaf() const { return (childs[1] == 0); }
+	B3_DBVT_INLINE bool isinternal() const { return (!isleaf()); }
+	union {
+		b3DbvtNode* childs[2];
+		void* data;
+		int dataAsInt;
+	};
+};
+
+///The b3DynamicBvh class implements a fast dynamic bounding volume tree based on axis aligned bounding boxes (aabb tree).
+///This b3DynamicBvh is used for soft body collision detection and for the b3DynamicBvhBroadphase. It has a fast insert, remove and update of nodes.
+///Unlike the b3QuantizedBvh, nodes can be dynamically moved around, which allows for change in topology of the underlying data structure.
+struct b3DynamicBvh
+{
+	/* Stack element	*/
+	struct sStkNN
+	{
+		const b3DbvtNode* a;
+		const b3DbvtNode* b;
+		sStkNN() {}
+		sStkNN(const b3DbvtNode* na, const b3DbvtNode* nb) : a(na), b(nb) {}
+	};
+	struct sStkNP
+	{
+		const b3DbvtNode* node;
+		int mask;
+		sStkNP(const b3DbvtNode* n, unsigned m) : node(n), mask(m) {}
+	};
+	struct sStkNPS
+	{
+		const b3DbvtNode* node;
+		int mask;
+		b3Scalar value;
+		sStkNPS() {}
+		sStkNPS(const b3DbvtNode* n, unsigned m, b3Scalar v) : node(n), mask(m), value(v) {}
+	};
+	struct sStkCLN
+	{
+		const b3DbvtNode* node;
+		b3DbvtNode* parent;
+		sStkCLN(const b3DbvtNode* n, b3DbvtNode* p) : node(n), parent(p) {}
+	};
+	// Policies/Interfaces
+
+	/* ICollide	*/
+	struct ICollide
+	{
+		B3_DBVT_VIRTUAL_DTOR(ICollide)
+		B3_DBVT_VIRTUAL void Process(const b3DbvtNode*, const b3DbvtNode*) {}
+		B3_DBVT_VIRTUAL void Process(const b3DbvtNode*) {}
+		B3_DBVT_VIRTUAL void Process(const b3DbvtNode* n, b3Scalar) { Process(n); }
+		B3_DBVT_VIRTUAL bool Descent(const b3DbvtNode*) { return (true); }
+		B3_DBVT_VIRTUAL bool AllLeaves(const b3DbvtNode*) { return (true); }
+	};
+	/* IWriter	*/
+	struct IWriter
+	{
+		virtual ~IWriter() {}
+		virtual void Prepare(const b3DbvtNode* root, int numnodes) = 0;
+		virtual void WriteNode(const b3DbvtNode*, int index, int parent, int child0, int child1) = 0;
+		virtual void WriteLeaf(const b3DbvtNode*, int index, int parent) = 0;
+	};
+	/* IClone	*/
+	struct IClone
+	{
+		virtual ~IClone() {}
+		virtual void CloneLeaf(b3DbvtNode*) {}
+	};
+
+	// Constants
+	enum
+	{
+		B3_SIMPLE_STACKSIZE = 64,
+		B3_DOUBLE_STACKSIZE = B3_SIMPLE_STACKSIZE * 2
+	};
+
+	// Fields
+	b3DbvtNode* m_root;
+	b3DbvtNode* m_free;
+	int m_lkhd;
+	int m_leaves;
+	unsigned m_opath;
+
+	b3AlignedObjectArray<sStkNN> m_stkStack;
+	mutable b3AlignedObjectArray<const b3DbvtNode*> m_rayTestStack;
+
+	// Methods
+	b3DynamicBvh();
+	~b3DynamicBvh();
+	void clear();
+	bool empty() const { return (0 == m_root); }
+	void optimizeBottomUp();
+	void optimizeTopDown(int bu_treshold = 128);
+	void optimizeIncremental(int passes);
+	b3DbvtNode* insert(const b3DbvtVolume& box, void* data);
+	void update(b3DbvtNode* leaf, int lookahead = -1);
+	void update(b3DbvtNode* leaf, b3DbvtVolume& volume);
+	bool update(b3DbvtNode* leaf, b3DbvtVolume& volume, const b3Vector3& velocity, b3Scalar margin);
+	bool update(b3DbvtNode* leaf, b3DbvtVolume& volume, const b3Vector3& velocity);
+	bool update(b3DbvtNode* leaf, b3DbvtVolume& volume, b3Scalar margin);
+	void remove(b3DbvtNode* leaf);
+	void write(IWriter* iwriter) const;
+	void clone(b3DynamicBvh& dest, IClone* iclone = 0) const;
+	static int maxdepth(const b3DbvtNode* node);
+	static int countLeaves(const b3DbvtNode* node);
+	static void extractLeaves(const b3DbvtNode* node, b3AlignedObjectArray<const b3DbvtNode*>& leaves);
+#if B3_DBVT_ENABLE_BENCHMARK
+	static void benchmark();
+#else
+	static void benchmark()
+	{
+	}
+#endif
+	// B3_DBVT_IPOLICY must support ICollide policy/interface
+	B3_DBVT_PREFIX
+	static void enumNodes(const b3DbvtNode* root,
+						  B3_DBVT_IPOLICY);
+	B3_DBVT_PREFIX
+	static void enumLeaves(const b3DbvtNode* root,
+						   B3_DBVT_IPOLICY);
+	B3_DBVT_PREFIX
+	void collideTT(const b3DbvtNode* root0,
+				   const b3DbvtNode* root1,
+				   B3_DBVT_IPOLICY);
+
+	B3_DBVT_PREFIX
+	void collideTTpersistentStack(const b3DbvtNode* root0,
+								  const b3DbvtNode* root1,
+								  B3_DBVT_IPOLICY);
+#if 0
+	B3_DBVT_PREFIX
+		void		collideTT(	const b3DbvtNode* root0,
+		const b3DbvtNode* root1,
+		const b3Transform& xform,
+		B3_DBVT_IPOLICY);
+	B3_DBVT_PREFIX
+		void		collideTT(	const b3DbvtNode* root0,
+		const b3Transform& xform0,
+		const b3DbvtNode* root1,
+		const b3Transform& xform1,
+		B3_DBVT_IPOLICY);
+#endif
+
+	B3_DBVT_PREFIX
+	void collideTV(const b3DbvtNode* root,
+				   const b3DbvtVolume& volume,
+				   B3_DBVT_IPOLICY) const;
+	///rayTest is a re-entrant ray test, and can be called in parallel as long as the b3AlignedAlloc is thread-safe (uses locking etc)
+	///rayTest is slower than rayTestInternal, because it builds a local stack, using memory allocations, and it recomputes signs/rayDirectionInverses each time
+	B3_DBVT_PREFIX
+	static void rayTest(const b3DbvtNode* root,
+						const b3Vector3& rayFrom,
+						const b3Vector3& rayTo,
+						B3_DBVT_IPOLICY);
+	///rayTestInternal is faster than rayTest, because it uses a persistent stack (to reduce dynamic memory allocations to a minimum) and it uses precomputed signs/rayInverseDirections
+	///rayTestInternal is used by b3DynamicBvhBroadphase to accelerate world ray casts
+	B3_DBVT_PREFIX
+	void rayTestInternal(const b3DbvtNode* root,
+						 const b3Vector3& rayFrom,
+						 const b3Vector3& rayTo,
+						 const b3Vector3& rayDirectionInverse,
+						 unsigned int signs[3],
+						 b3Scalar lambda_max,
+						 const b3Vector3& aabbMin,
+						 const b3Vector3& aabbMax,
+						 B3_DBVT_IPOLICY) const;
+
+	B3_DBVT_PREFIX
+	static void collideKDOP(const b3DbvtNode* root,
+							const b3Vector3* normals,
+							const b3Scalar* offsets,
+							int count,
+							B3_DBVT_IPOLICY);
+	B3_DBVT_PREFIX
+	static void collideOCL(const b3DbvtNode* root,
+						   const b3Vector3* normals,
+						   const b3Scalar* offsets,
+						   const b3Vector3& sortaxis,
+						   int count,
+						   B3_DBVT_IPOLICY,
+						   bool fullsort = true);
+	B3_DBVT_PREFIX
+	static void collideTU(const b3DbvtNode* root,
+						  B3_DBVT_IPOLICY);
+	// Helpers
+	static B3_DBVT_INLINE int nearest(const int* i, const b3DynamicBvh::sStkNPS* a, b3Scalar v, int l, int h)
+	{
+		int m = 0;
+		while (l < h)
+		{
+			m = (l + h) >> 1;
+			if (a[i[m]].value >= v)
+				l = m + 1;
+			else
+				h = m;
+		}
+		return (h);
+	}
+	static B3_DBVT_INLINE int allocate(b3AlignedObjectArray<int>& ifree,
+									   b3AlignedObjectArray<sStkNPS>& stock,
+									   const sStkNPS& value)
+	{
+		int i;
+		if (ifree.size() > 0)
+		{
+			i = ifree[ifree.size() - 1];
+			ifree.pop_back();
+			stock[i] = value;
+		}
+		else
+		{
+			i = stock.size();
+			stock.push_back(value);
+		}
+		return (i);
+	}
+	//
+private:
+	b3DynamicBvh(const b3DynamicBvh&) {}
+};
+
+//
+// Inline's
+//
+
+//
+inline b3DbvtAabbMm b3DbvtAabbMm::FromCE(const b3Vector3& c, const b3Vector3& e)
+{
+	b3DbvtAabbMm box;
+	box.mi = c - e;
+	box.mx = c + e;
+	return (box);
+}
+
+//
+inline b3DbvtAabbMm b3DbvtAabbMm::FromCR(const b3Vector3& c, b3Scalar r)
+{
+	return (FromCE(c, b3MakeVector3(r, r, r)));
+}
+
+//
+inline b3DbvtAabbMm b3DbvtAabbMm::FromMM(const b3Vector3& mi, const b3Vector3& mx)
+{
+	b3DbvtAabbMm box;
+	box.mi = mi;
+	box.mx = mx;
+	return (box);
+}
+
+//
+inline b3DbvtAabbMm b3DbvtAabbMm::FromPoints(const b3Vector3* pts, int n)
+{
+	b3DbvtAabbMm box;
+	box.mi = box.mx = pts[0];
+	for (int i = 1; i < n; ++i)
+	{
+		box.mi.setMin(pts[i]);
+		box.mx.setMax(pts[i]);
+	}
+	return (box);
+}
+
+//
+inline b3DbvtAabbMm b3DbvtAabbMm::FromPoints(const b3Vector3** ppts, int n)
+{
+	b3DbvtAabbMm box;
+	box.mi = box.mx = *ppts[0];
+	for (int i = 1; i < n; ++i)
+	{
+		box.mi.setMin(*ppts[i]);
+		box.mx.setMax(*ppts[i]);
+	}
+	return (box);
+}
+
+//
+B3_DBVT_INLINE void b3DbvtAabbMm::Expand(const b3Vector3& e)
+{
+	mi -= e;
+	mx += e;
+}
+
+//
+B3_DBVT_INLINE void b3DbvtAabbMm::SignedExpand(const b3Vector3& e)
+{
+	if (e.x > 0)
+		mx.setX(mx.x + e[0]);
+	else
+		mi.setX(mi.x + e[0]);
+	if (e.y > 0)
+		mx.setY(mx.y + e[1]);
+	else
+		mi.setY(mi.y + e[1]);
+	if (e.z > 0)
+		mx.setZ(mx.z + e[2]);
+	else
+		mi.setZ(mi.z + e[2]);
+}
+
+//
+B3_DBVT_INLINE bool b3DbvtAabbMm::Contain(const b3DbvtAabbMm& a) const
+{
+	return ((mi.x <= a.mi.x) &&
+			(mi.y <= a.mi.y) &&
+			(mi.z <= a.mi.z) &&
+			(mx.x >= a.mx.x) &&
+			(mx.y >= a.mx.y) &&
+			(mx.z >= a.mx.z));
+}
+
+//
+B3_DBVT_INLINE int b3DbvtAabbMm::Classify(const b3Vector3& n, b3Scalar o, int s) const
+{
+	b3Vector3 pi, px;
+	switch (s)
+	{
+		case (0 + 0 + 0):
+			px = b3MakeVector3(mi.x, mi.y, mi.z);
+			pi = b3MakeVector3(mx.x, mx.y, mx.z);
+			break;
+		case (1 + 0 + 0):
+			px = b3MakeVector3(mx.x, mi.y, mi.z);
+			pi = b3MakeVector3(mi.x, mx.y, mx.z);
+			break;
+		case (0 + 2 + 0):
+			px = b3MakeVector3(mi.x, mx.y, mi.z);
+			pi = b3MakeVector3(mx.x, mi.y, mx.z);
+			break;
+		case (1 + 2 + 0):
+			px = b3MakeVector3(mx.x, mx.y, mi.z);
+			pi = b3MakeVector3(mi.x, mi.y, mx.z);
+			break;
+		case (0 + 0 + 4):
+			px = b3MakeVector3(mi.x, mi.y, mx.z);
+			pi = b3MakeVector3(mx.x, mx.y, mi.z);
+			break;
+		case (1 + 0 + 4):
+			px = b3MakeVector3(mx.x, mi.y, mx.z);
+			pi = b3MakeVector3(mi.x, mx.y, mi.z);
+			break;
+		case (0 + 2 + 4):
+			px = b3MakeVector3(mi.x, mx.y, mx.z);
+			pi = b3MakeVector3(mx.x, mi.y, mi.z);
+			break;
+		case (1 + 2 + 4):
+			px = b3MakeVector3(mx.x, mx.y, mx.z);
+			pi = b3MakeVector3(mi.x, mi.y, mi.z);
+			break;
+	}
+	if ((b3Dot(n, px) + o) < 0) return (-1);
+	if ((b3Dot(n, pi) + o) >= 0) return (+1);
+	return (0);
+}
+
+//
+B3_DBVT_INLINE b3Scalar b3DbvtAabbMm::ProjectMinimum(const b3Vector3& v, unsigned signs) const
+{
+	const b3Vector3* b[] = {&mx, &mi};
+	const b3Vector3 p = b3MakeVector3(b[(signs >> 0) & 1]->x,
+									  b[(signs >> 1) & 1]->y,
+									  b[(signs >> 2) & 1]->z);
+	return (b3Dot(p, v));
+}
+
+//
+B3_DBVT_INLINE void b3DbvtAabbMm::AddSpan(const b3Vector3& d, b3Scalar& smi, b3Scalar& smx) const
+{
+	for (int i = 0; i < 3; ++i)
+	{
+		if (d[i] < 0)
+		{
+			smi += mx[i] * d[i];
+			smx += mi[i] * d[i];
+		}
+		else
+		{
+			smi += mi[i] * d[i];
+			smx += mx[i] * d[i];
+		}
+	}
+}
+
+//
+B3_DBVT_INLINE bool b3Intersect(const b3DbvtAabbMm& a,
+								const b3DbvtAabbMm& b)
+{
+#if B3_DBVT_INT0_IMPL == B3_DBVT_IMPL_SSE
+	const __m128 rt(_mm_or_ps(_mm_cmplt_ps(_mm_load_ps(b.mx), _mm_load_ps(a.mi)),
+							  _mm_cmplt_ps(_mm_load_ps(a.mx), _mm_load_ps(b.mi))));
+#if defined(_WIN32)
+	const __int32* pu((const __int32*)&rt);
+#else
+	const int* pu((const int*)&rt);
+#endif
+	return ((pu[0] | pu[1] | pu[2]) == 0);
+#else
+	return ((a.mi.x <= b.mx.x) &&
+			(a.mx.x >= b.mi.x) &&
+			(a.mi.y <= b.mx.y) &&
+			(a.mx.y >= b.mi.y) &&
+			(a.mi.z <= b.mx.z) &&
+			(a.mx.z >= b.mi.z));
+#endif
+}
+
+//
+B3_DBVT_INLINE bool b3Intersect(const b3DbvtAabbMm& a,
+								const b3Vector3& b)
+{
+	return ((b.x >= a.mi.x) &&
+			(b.y >= a.mi.y) &&
+			(b.z >= a.mi.z) &&
+			(b.x <= a.mx.x) &&
+			(b.y <= a.mx.y) &&
+			(b.z <= a.mx.z));
+}
+
+//////////////////////////////////////
+
+//
+B3_DBVT_INLINE b3Scalar b3Proximity(const b3DbvtAabbMm& a,
+									const b3DbvtAabbMm& b)
+{
+	const b3Vector3 d = (a.mi + a.mx) - (b.mi + b.mx);
+	return (b3Fabs(d.x) + b3Fabs(d.y) + b3Fabs(d.z));
+}
+
+//
+B3_DBVT_INLINE int b3Select(const b3DbvtAabbMm& o,
+							const b3DbvtAabbMm& a,
+							const b3DbvtAabbMm& b)
+{
+#if B3_DBVT_SELECT_IMPL == B3_DBVT_IMPL_SSE
+
+#if defined(_WIN32)
+	static B3_ATTRIBUTE_ALIGNED16(const unsigned __int32) mask[] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff};
+#else
+	static B3_ATTRIBUTE_ALIGNED16(const unsigned int) mask[] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x00000000 /*0x7fffffff*/};
+#endif
+	///@todo: the intrinsic version is 11% slower
+#if B3_DBVT_USE_INTRINSIC_SSE
+
+	union b3SSEUnion  ///NOTE: if we use more intrinsics, move b3SSEUnion into the LinearMath directory
+	{
+		__m128 ssereg;
+		float floats[4];
+		int ints[4];
+	};
+
+	__m128 omi(_mm_load_ps(o.mi));
+	omi = _mm_add_ps(omi, _mm_load_ps(o.mx));
+	__m128 ami(_mm_load_ps(a.mi));
+	ami = _mm_add_ps(ami, _mm_load_ps(a.mx));
+	ami = _mm_sub_ps(ami, omi);
+	ami = _mm_and_ps(ami, _mm_load_ps((const float*)mask));
+	__m128 bmi(_mm_load_ps(b.mi));
+	bmi = _mm_add_ps(bmi, _mm_load_ps(b.mx));
+	bmi = _mm_sub_ps(bmi, omi);
+	bmi = _mm_and_ps(bmi, _mm_load_ps((const float*)mask));
+	__m128 t0(_mm_movehl_ps(ami, ami));
+	ami = _mm_add_ps(ami, t0);
+	ami = _mm_add_ss(ami, _mm_shuffle_ps(ami, ami, 1));
+	__m128 t1(_mm_movehl_ps(bmi, bmi));
+	bmi = _mm_add_ps(bmi, t1);
+	bmi = _mm_add_ss(bmi, _mm_shuffle_ps(bmi, bmi, 1));
+
+	b3SSEUnion tmp;
+	tmp.ssereg = _mm_cmple_ss(bmi, ami);
+	return tmp.ints[0] & 1;
+
+#else
+	B3_ATTRIBUTE_ALIGNED16(__int32 r[1]);
+	__asm
+	{
+		mov		eax,o
+			mov		ecx,a
+			mov		edx,b
+			movaps	xmm0,[eax]
+		movaps	xmm5,mask
+			addps	xmm0,[eax+16]	
+		movaps	xmm1,[ecx]
+		movaps	xmm2,[edx]
+		addps	xmm1,[ecx+16]
+		addps	xmm2,[edx+16]
+		subps	xmm1,xmm0
+			subps	xmm2,xmm0
+			andps	xmm1,xmm5
+			andps	xmm2,xmm5
+			movhlps	xmm3,xmm1
+			movhlps	xmm4,xmm2
+			addps	xmm1,xmm3
+			addps	xmm2,xmm4
+			pshufd	xmm3,xmm1,1
+			pshufd	xmm4,xmm2,1
+			addss	xmm1,xmm3
+			addss	xmm2,xmm4
+			cmpless	xmm2,xmm1
+			movss	r,xmm2
+	}
+	return (r[0] & 1);
+#endif
+#else
+	return (b3Proximity(o, a) < b3Proximity(o, b) ? 0 : 1);
+#endif
+}
+
+//
+B3_DBVT_INLINE void b3Merge(const b3DbvtAabbMm& a,
+							const b3DbvtAabbMm& b,
+							b3DbvtAabbMm& r)
+{
+#if B3_DBVT_MERGE_IMPL == B3_DBVT_IMPL_SSE
+	__m128 ami(_mm_load_ps(a.mi));
+	__m128 amx(_mm_load_ps(a.mx));
+	__m128 bmi(_mm_load_ps(b.mi));
+	__m128 bmx(_mm_load_ps(b.mx));
+	ami = _mm_min_ps(ami, bmi);
+	amx = _mm_max_ps(amx, bmx);
+	_mm_store_ps(r.mi, ami);
+	_mm_store_ps(r.mx, amx);
+#else
+	for (int i = 0; i < 3; ++i)
+	{
+		if (a.mi[i] < b.mi[i])
+			r.mi[i] = a.mi[i];
+		else
+			r.mi[i] = b.mi[i];
+		if (a.mx[i] > b.mx[i])
+			r.mx[i] = a.mx[i];
+		else
+			r.mx[i] = b.mx[i];
+	}
+#endif
+}
+
+//
+B3_DBVT_INLINE bool b3NotEqual(const b3DbvtAabbMm& a,
+							   const b3DbvtAabbMm& b)
+{
+	return ((a.mi.x != b.mi.x) ||
+			(a.mi.y != b.mi.y) ||
+			(a.mi.z != b.mi.z) ||
+			(a.mx.x != b.mx.x) ||
+			(a.mx.y != b.mx.y) ||
+			(a.mx.z != b.mx.z));
+}
+
+//
+// Inline's
+//
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::enumNodes(const b3DbvtNode* root,
+									B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+	policy.Process(root);
+	if (root->isinternal())
+	{
+		enumNodes(root->childs[0], policy);
+		enumNodes(root->childs[1], policy);
+	}
+}
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::enumLeaves(const b3DbvtNode* root,
+									 B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+	if (root->isinternal())
+	{
+		enumLeaves(root->childs[0], policy);
+		enumLeaves(root->childs[1], policy);
+	}
+	else
+	{
+		policy.Process(root);
+	}
+}
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::collideTT(const b3DbvtNode* root0,
+									const b3DbvtNode* root1,
+									B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+	if (root0 && root1)
+	{
+		int depth = 1;
+		int treshold = B3_DOUBLE_STACKSIZE - 4;
+		b3AlignedObjectArray<sStkNN> stkStack;
+		stkStack.resize(B3_DOUBLE_STACKSIZE);
+		stkStack[0] = sStkNN(root0, root1);
+		do
+		{
+			sStkNN p = stkStack[--depth];
+			if (depth > treshold)
+			{
+				stkStack.resize(stkStack.size() * 2);
+				treshold = stkStack.size() - 4;
+			}
+			if (p.a == p.b)
+			{
+				if (p.a->isinternal())
+				{
+					stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[0]);
+					stkStack[depth++] = sStkNN(p.a->childs[1], p.a->childs[1]);
+					stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[1]);
+				}
+			}
+			else if (b3Intersect(p.a->volume, p.b->volume))
+			{
+				if (p.a->isinternal())
+				{
+					if (p.b->isinternal())
+					{
+						stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[0]);
+						stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[0]);
+						stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[1]);
+						stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[1]);
+					}
+					else
+					{
+						stkStack[depth++] = sStkNN(p.a->childs[0], p.b);
+						stkStack[depth++] = sStkNN(p.a->childs[1], p.b);
+					}
+				}
+				else
+				{
+					if (p.b->isinternal())
+					{
+						stkStack[depth++] = sStkNN(p.a, p.b->childs[0]);
+						stkStack[depth++] = sStkNN(p.a, p.b->childs[1]);
+					}
+					else
+					{
+						policy.Process(p.a, p.b);
+					}
+				}
+			}
+		} while (depth);
+	}
+}
+
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::collideTTpersistentStack(const b3DbvtNode* root0,
+												   const b3DbvtNode* root1,
+												   B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+	if (root0 && root1)
+	{
+		int depth = 1;
+		int treshold = B3_DOUBLE_STACKSIZE - 4;
+
+		m_stkStack.resize(B3_DOUBLE_STACKSIZE);
+		m_stkStack[0] = sStkNN(root0, root1);
+		do
+		{
+			sStkNN p = m_stkStack[--depth];
+			if (depth > treshold)
+			{
+				m_stkStack.resize(m_stkStack.size() * 2);
+				treshold = m_stkStack.size() - 4;
+			}
+			if (p.a == p.b)
+			{
+				if (p.a->isinternal())
+				{
+					m_stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[0]);
+					m_stkStack[depth++] = sStkNN(p.a->childs[1], p.a->childs[1]);
+					m_stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[1]);
+				}
+			}
+			else if (b3Intersect(p.a->volume, p.b->volume))
+			{
+				if (p.a->isinternal())
+				{
+					if (p.b->isinternal())
+					{
+						m_stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[0]);
+						m_stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[0]);
+						m_stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[1]);
+						m_stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[1]);
+					}
+					else
+					{
+						m_stkStack[depth++] = sStkNN(p.a->childs[0], p.b);
+						m_stkStack[depth++] = sStkNN(p.a->childs[1], p.b);
+					}
+				}
+				else
+				{
+					if (p.b->isinternal())
+					{
+						m_stkStack[depth++] = sStkNN(p.a, p.b->childs[0]);
+						m_stkStack[depth++] = sStkNN(p.a, p.b->childs[1]);
+					}
+					else
+					{
+						policy.Process(p.a, p.b);
+					}
+				}
+			}
+		} while (depth);
+	}
+}
+
+#if 0
+//
+B3_DBVT_PREFIX
+inline void		b3DynamicBvh::collideTT(	const b3DbvtNode* root0,
+								  const b3DbvtNode* root1,
+								  const b3Transform& xform,
+								  B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+		if(root0&&root1)
+		{
+			int								depth=1;
+			int								treshold=B3_DOUBLE_STACKSIZE-4;
+			b3AlignedObjectArray<sStkNN>	stkStack;
+			stkStack.resize(B3_DOUBLE_STACKSIZE);
+			stkStack[0]=sStkNN(root0,root1);
+			do	{
+				sStkNN	p=stkStack[--depth];
+				if(b3Intersect(p.a->volume,p.b->volume,xform))
+				{
+					if(depth>treshold)
+					{
+						stkStack.resize(stkStack.size()*2);
+						treshold=stkStack.size()-4;
+					}
+					if(p.a->isinternal())
+					{
+						if(p.b->isinternal())
+						{					
+							stkStack[depth++]=sStkNN(p.a->childs[0],p.b->childs[0]);
+							stkStack[depth++]=sStkNN(p.a->childs[1],p.b->childs[0]);
+							stkStack[depth++]=sStkNN(p.a->childs[0],p.b->childs[1]);
+							stkStack[depth++]=sStkNN(p.a->childs[1],p.b->childs[1]);
+						}
+						else
+						{
+							stkStack[depth++]=sStkNN(p.a->childs[0],p.b);
+							stkStack[depth++]=sStkNN(p.a->childs[1],p.b);
+						}
+					}
+					else
+					{
+						if(p.b->isinternal())
+						{
+							stkStack[depth++]=sStkNN(p.a,p.b->childs[0]);
+							stkStack[depth++]=sStkNN(p.a,p.b->childs[1]);
+						}
+						else
+						{
+							policy.Process(p.a,p.b);
+						}
+					}
+				}
+			} while(depth);
+		}
+}
+//
+B3_DBVT_PREFIX
+inline void		b3DynamicBvh::collideTT(	const b3DbvtNode* root0,
+								  const b3Transform& xform0,
+								  const b3DbvtNode* root1,
+								  const b3Transform& xform1,
+								  B3_DBVT_IPOLICY)
+{
+	const b3Transform	xform=xform0.inverse()*xform1;
+	collideTT(root0,root1,xform,policy);
+}
+#endif
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::collideTV(const b3DbvtNode* root,
+									const b3DbvtVolume& vol,
+									B3_DBVT_IPOLICY) const
+{
+	B3_DBVT_CHECKTYPE
+	if (root)
+	{
+		B3_ATTRIBUTE_ALIGNED16(b3DbvtVolume)
+		volume(vol);
+		b3AlignedObjectArray<const b3DbvtNode*> stack;
+		stack.resize(0);
+		stack.reserve(B3_SIMPLE_STACKSIZE);
+		stack.push_back(root);
+		do
+		{
+			const b3DbvtNode* n = stack[stack.size() - 1];
+			stack.pop_back();
+			if (b3Intersect(n->volume, volume))
+			{
+				if (n->isinternal())
+				{
+					stack.push_back(n->childs[0]);
+					stack.push_back(n->childs[1]);
+				}
+				else
+				{
+					policy.Process(n);
+				}
+			}
+		} while (stack.size() > 0);
+	}
+}
+
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::rayTestInternal(const b3DbvtNode* root,
+										  const b3Vector3& rayFrom,
+										  const b3Vector3& rayTo,
+										  const b3Vector3& rayDirectionInverse,
+										  unsigned int signs[3],
+										  b3Scalar lambda_max,
+										  const b3Vector3& aabbMin,
+										  const b3Vector3& aabbMax,
+										  B3_DBVT_IPOLICY) const
+{
+	(void)rayTo;
+	B3_DBVT_CHECKTYPE
+	if (root)
+	{
+		int depth = 1;
+		int treshold = B3_DOUBLE_STACKSIZE - 2;
+		b3AlignedObjectArray<const b3DbvtNode*>& stack = m_rayTestStack;
+		stack.resize(B3_DOUBLE_STACKSIZE);
+		stack[0] = root;
+		b3Vector3 bounds[2];
+		do
+		{
+			const b3DbvtNode* node = stack[--depth];
+			bounds[0] = node->volume.Mins() - aabbMax;
+			bounds[1] = node->volume.Maxs() - aabbMin;
+			b3Scalar tmin = 1.f, lambda_min = 0.f;
+			unsigned int result1 = false;
+			result1 = b3RayAabb2(rayFrom, rayDirectionInverse, signs, bounds, tmin, lambda_min, lambda_max);
+			if (result1)
+			{
+				if (node->isinternal())
+				{
+					if (depth > treshold)
+					{
+						stack.resize(stack.size() * 2);
+						treshold = stack.size() - 2;
+					}
+					stack[depth++] = node->childs[0];
+					stack[depth++] = node->childs[1];
+				}
+				else
+				{
+					policy.Process(node);
+				}
+			}
+		} while (depth);
+	}
+}
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::rayTest(const b3DbvtNode* root,
+								  const b3Vector3& rayFrom,
+								  const b3Vector3& rayTo,
+								  B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+	if (root)
+	{
+		b3Vector3 rayDir = (rayTo - rayFrom);
+		rayDir.normalize();
+
+		///what about division by zero? --> just set rayDirection[i] to INF/B3_LARGE_FLOAT
+		b3Vector3 rayDirectionInverse;
+		rayDirectionInverse[0] = rayDir[0] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDir[0];
+		rayDirectionInverse[1] = rayDir[1] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDir[1];
+		rayDirectionInverse[2] = rayDir[2] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDir[2];
+		unsigned int signs[3] = {rayDirectionInverse[0] < 0.0, rayDirectionInverse[1] < 0.0, rayDirectionInverse[2] < 0.0};
+
+		b3Scalar lambda_max = rayDir.dot(rayTo - rayFrom);
+#ifdef COMPARE_BTRAY_AABB2
+		b3Vector3 resultNormal;
+#endif  //COMPARE_BTRAY_AABB2
+
+		b3AlignedObjectArray<const b3DbvtNode*> stack;
+
+		int depth = 1;
+		int treshold = B3_DOUBLE_STACKSIZE - 2;
+
+		stack.resize(B3_DOUBLE_STACKSIZE);
+		stack[0] = root;
+		b3Vector3 bounds[2];
+		do
+		{
+			const b3DbvtNode* node = stack[--depth];
+
+			bounds[0] = node->volume.Mins();
+			bounds[1] = node->volume.Maxs();
+
+			b3Scalar tmin = 1.f, lambda_min = 0.f;
+			unsigned int result1 = b3RayAabb2(rayFrom, rayDirectionInverse, signs, bounds, tmin, lambda_min, lambda_max);
+
+#ifdef COMPARE_BTRAY_AABB2
+			b3Scalar param = 1.f;
+			bool result2 = b3RayAabb(rayFrom, rayTo, node->volume.Mins(), node->volume.Maxs(), param, resultNormal);
+			b3Assert(result1 == result2);
+#endif  //TEST_BTRAY_AABB2
+
+			if (result1)
+			{
+				if (node->isinternal())
+				{
+					if (depth > treshold)
+					{
+						stack.resize(stack.size() * 2);
+						treshold = stack.size() - 2;
+					}
+					stack[depth++] = node->childs[0];
+					stack[depth++] = node->childs[1];
+				}
+				else
+				{
+					policy.Process(node);
+				}
+			}
+		} while (depth);
+	}
+}
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::collideKDOP(const b3DbvtNode* root,
+									  const b3Vector3* normals,
+									  const b3Scalar* offsets,
+									  int count,
+									  B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+	if (root)
+	{
+		const int inside = (1 << count) - 1;
+		b3AlignedObjectArray<sStkNP> stack;
+		int signs[sizeof(unsigned) * 8];
+		b3Assert(count < int(sizeof(signs) / sizeof(signs[0])));
+		for (int i = 0; i < count; ++i)
+		{
+			signs[i] = ((normals[i].x >= 0) ? 1 : 0) +
+					   ((normals[i].y >= 0) ? 2 : 0) +
+					   ((normals[i].z >= 0) ? 4 : 0);
+		}
+		stack.reserve(B3_SIMPLE_STACKSIZE);
+		stack.push_back(sStkNP(root, 0));
+		do
+		{
+			sStkNP se = stack[stack.size() - 1];
+			bool out = false;
+			stack.pop_back();
+			for (int i = 0, j = 1; (!out) && (i < count); ++i, j <<= 1)
+			{
+				if (0 == (se.mask & j))
+				{
+					const int side = se.node->volume.Classify(normals[i], offsets[i], signs[i]);
+					switch (side)
+					{
+						case -1:
+							out = true;
+							break;
+						case +1:
+							se.mask |= j;
+							break;
+					}
+				}
+			}
+			if (!out)
+			{
+				if ((se.mask != inside) && (se.node->isinternal()))
+				{
+					stack.push_back(sStkNP(se.node->childs[0], se.mask));
+					stack.push_back(sStkNP(se.node->childs[1], se.mask));
+				}
+				else
+				{
+					if (policy.AllLeaves(se.node)) enumLeaves(se.node, policy);
+				}
+			}
+		} while (stack.size());
+	}
+}
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::collideOCL(const b3DbvtNode* root,
+									 const b3Vector3* normals,
+									 const b3Scalar* offsets,
+									 const b3Vector3& sortaxis,
+									 int count,
+									 B3_DBVT_IPOLICY,
+									 bool fsort)
+{
+	B3_DBVT_CHECKTYPE
+	if (root)
+	{
+		const unsigned srtsgns = (sortaxis[0] >= 0 ? 1 : 0) +
+								 (sortaxis[1] >= 0 ? 2 : 0) +
+								 (sortaxis[2] >= 0 ? 4 : 0);
+		const int inside = (1 << count) - 1;
+		b3AlignedObjectArray<sStkNPS> stock;
+		b3AlignedObjectArray<int> ifree;
+		b3AlignedObjectArray<int> stack;
+		int signs[sizeof(unsigned) * 8];
+		b3Assert(count < int(sizeof(signs) / sizeof(signs[0])));
+		for (int i = 0; i < count; ++i)
+		{
+			signs[i] = ((normals[i].x >= 0) ? 1 : 0) +
+					   ((normals[i].y >= 0) ? 2 : 0) +
+					   ((normals[i].z >= 0) ? 4 : 0);
+		}
+		stock.reserve(B3_SIMPLE_STACKSIZE);
+		stack.reserve(B3_SIMPLE_STACKSIZE);
+		ifree.reserve(B3_SIMPLE_STACKSIZE);
+		stack.push_back(allocate(ifree, stock, sStkNPS(root, 0, root->volume.ProjectMinimum(sortaxis, srtsgns))));
+		do
+		{
+			const int id = stack[stack.size() - 1];
+			sStkNPS se = stock[id];
+			stack.pop_back();
+			ifree.push_back(id);
+			if (se.mask != inside)
+			{
+				bool out = false;
+				for (int i = 0, j = 1; (!out) && (i < count); ++i, j <<= 1)
+				{
+					if (0 == (se.mask & j))
+					{
+						const int side = se.node->volume.Classify(normals[i], offsets[i], signs[i]);
+						switch (side)
+						{
+							case -1:
+								out = true;
+								break;
+							case +1:
+								se.mask |= j;
+								break;
+						}
+					}
+				}
+				if (out) continue;
+			}
+			if (policy.Descent(se.node))
+			{
+				if (se.node->isinternal())
+				{
+					const b3DbvtNode* pns[] = {se.node->childs[0], se.node->childs[1]};
+					sStkNPS nes[] = {sStkNPS(pns[0], se.mask, pns[0]->volume.ProjectMinimum(sortaxis, srtsgns)),
+									 sStkNPS(pns[1], se.mask, pns[1]->volume.ProjectMinimum(sortaxis, srtsgns))};
+					const int q = nes[0].value < nes[1].value ? 1 : 0;
+					int j = stack.size();
+					if (fsort && (j > 0))
+					{
+						/* Insert 0	*/
+						j = nearest(&stack[0], &stock[0], nes[q].value, 0, stack.size());
+						stack.push_back(0);
+#if B3_DBVT_USE_MEMMOVE
+						memmove(&stack[j + 1], &stack[j], sizeof(int) * (stack.size() - j - 1));
+#else
+						for (int k = stack.size() - 1; k > j; --k) stack[k] = stack[k - 1];
+#endif
+						stack[j] = allocate(ifree, stock, nes[q]);
+						/* Insert 1	*/
+						j = nearest(&stack[0], &stock[0], nes[1 - q].value, j, stack.size());
+						stack.push_back(0);
+#if B3_DBVT_USE_MEMMOVE
+						memmove(&stack[j + 1], &stack[j], sizeof(int) * (stack.size() - j - 1));
+#else
+						for (int k = stack.size() - 1; k > j; --k) stack[k] = stack[k - 1];
+#endif
+						stack[j] = allocate(ifree, stock, nes[1 - q]);
+					}
+					else
+					{
+						stack.push_back(allocate(ifree, stock, nes[q]));
+						stack.push_back(allocate(ifree, stock, nes[1 - q]));
+					}
+				}
+				else
+				{
+					policy.Process(se.node, se.value);
+				}
+			}
+		} while (stack.size());
+	}
+}
+
+//
+B3_DBVT_PREFIX
+inline void b3DynamicBvh::collideTU(const b3DbvtNode* root,
+									B3_DBVT_IPOLICY)
+{
+	B3_DBVT_CHECKTYPE
+	if (root)
+	{
+		b3AlignedObjectArray<const b3DbvtNode*> stack;
+		stack.reserve(B3_SIMPLE_STACKSIZE);
+		stack.push_back(root);
+		do
+		{
+			const b3DbvtNode* n = stack[stack.size() - 1];
+			stack.pop_back();
+			if (policy.Descent(n))
+			{
+				if (n->isinternal())
+				{
+					stack.push_back(n->childs[0]);
+					stack.push_back(n->childs[1]);
+				}
+				else
+				{
+					policy.Process(n);
+				}
+			}
+		} while (stack.size() > 0);
+	}
+}
+
+//
+// PP Cleanup
+//
+
+#undef B3_DBVT_USE_MEMMOVE
+#undef B3_DBVT_USE_TEMPLATE
+#undef B3_DBVT_VIRTUAL_DTOR
+#undef B3_DBVT_VIRTUAL
+#undef B3_DBVT_PREFIX
+#undef B3_DBVT_IPOLICY
+#undef B3_DBVT_CHECKTYPE
+#undef B3_DBVT_IMPL_GENERIC
+#undef B3_DBVT_IMPL_SSE
+#undef B3_DBVT_USE_INTRINSIC_SSE
+#undef B3_DBVT_SELECT_IMPL
+#undef B3_DBVT_MERGE_IMPL
+#undef B3_DBVT_INT0_IMPL
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.cpp b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
new file mode 100644
index 0000000..dea2ddb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
@@ -0,0 +1,808 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///b3DynamicBvhBroadphase implementation by Nathanael Presson
+
+#include "b3DynamicBvhBroadphase.h"
+#include "b3OverlappingPair.h"
+
+//
+// Profiling
+//
+
+#if B3_DBVT_BP_PROFILE || B3_DBVT_BP_ENABLE_BENCHMARK
+#include <stdio.h>
+#endif
+
+#if B3_DBVT_BP_PROFILE
+struct b3ProfileScope
+{
+	__forceinline b3ProfileScope(b3Clock& clock, unsigned long& value) : m_clock(&clock), m_value(&value), m_base(clock.getTimeMicroseconds())
+	{
+	}
+	__forceinline ~b3ProfileScope()
+	{
+		(*m_value) += m_clock->getTimeMicroseconds() - m_base;
+	}
+	b3Clock* m_clock;
+	unsigned long* m_value;
+	unsigned long m_base;
+};
+#define b3SPC(_value_) b3ProfileScope spc_scope(m_clock, _value_)
+#else
+#define b3SPC(_value_)
+#endif
+
+//
+// Helpers
+//
+
+//
+template <typename T>
+static inline void b3ListAppend(T* item, T*& list)
+{
+	item->links[0] = 0;
+	item->links[1] = list;
+	if (list) list->links[0] = item;
+	list = item;
+}
+
+//
+template <typename T>
+static inline void b3ListRemove(T* item, T*& list)
+{
+	if (item->links[0])
+		item->links[0]->links[1] = item->links[1];
+	else
+		list = item->links[1];
+	if (item->links[1]) item->links[1]->links[0] = item->links[0];
+}
+
+//
+template <typename T>
+static inline int b3ListCount(T* root)
+{
+	int n = 0;
+	while (root)
+	{
+		++n;
+		root = root->links[1];
+	}
+	return (n);
+}
+
+//
+template <typename T>
+static inline void b3Clear(T& value)
+{
+	static const struct ZeroDummy : T
+	{
+	} zerodummy;
+	value = zerodummy;
+}
+
+//
+// Colliders
+//
+
+/* Tree collider	*/
+struct b3DbvtTreeCollider : b3DynamicBvh::ICollide
+{
+	b3DynamicBvhBroadphase* pbp;
+	b3DbvtProxy* proxy;
+	b3DbvtTreeCollider(b3DynamicBvhBroadphase* p) : pbp(p) {}
+	void Process(const b3DbvtNode* na, const b3DbvtNode* nb)
+	{
+		if (na != nb)
+		{
+			b3DbvtProxy* pa = (b3DbvtProxy*)na->data;
+			b3DbvtProxy* pb = (b3DbvtProxy*)nb->data;
+#if B3_DBVT_BP_SORTPAIRS
+			if (pa->m_uniqueId > pb->m_uniqueId)
+				b3Swap(pa, pb);
+#endif
+			pbp->m_paircache->addOverlappingPair(pa->getUid(), pb->getUid());
+			++pbp->m_newpairs;
+		}
+	}
+	void Process(const b3DbvtNode* n)
+	{
+		Process(n, proxy->leaf);
+	}
+};
+
+//
+// b3DynamicBvhBroadphase
+//
+
+//
+b3DynamicBvhBroadphase::b3DynamicBvhBroadphase(int proxyCapacity, b3OverlappingPairCache* paircache)
+{
+	m_deferedcollide = false;
+	m_needcleanup = true;
+	m_releasepaircache = (paircache != 0) ? false : true;
+	m_prediction = 0;
+	m_stageCurrent = 0;
+	m_fixedleft = 0;
+	m_fupdates = 1;
+	m_dupdates = 0;
+	m_cupdates = 10;
+	m_newpairs = 1;
+	m_updates_call = 0;
+	m_updates_done = 0;
+	m_updates_ratio = 0;
+	m_paircache = paircache ? paircache : new (b3AlignedAlloc(sizeof(b3HashedOverlappingPairCache), 16)) b3HashedOverlappingPairCache();
+
+	m_pid = 0;
+	m_cid = 0;
+	for (int i = 0; i <= STAGECOUNT; ++i)
+	{
+		m_stageRoots[i] = 0;
+	}
+#if B3_DBVT_BP_PROFILE
+	b3Clear(m_profiling);
+#endif
+	m_proxies.resize(proxyCapacity);
+}
+
+//
+b3DynamicBvhBroadphase::~b3DynamicBvhBroadphase()
+{
+	if (m_releasepaircache)
+	{
+		m_paircache->~b3OverlappingPairCache();
+		b3AlignedFree(m_paircache);
+	}
+}
+
+//
+b3BroadphaseProxy* b3DynamicBvhBroadphase::createProxy(const b3Vector3& aabbMin,
+													   const b3Vector3& aabbMax,
+													   int objectId,
+													   void* userPtr,
+													   int collisionFilterGroup,
+													   int collisionFilterMask)
+{
+	b3DbvtProxy* mem = &m_proxies[objectId];
+	b3DbvtProxy* proxy = new (mem) b3DbvtProxy(aabbMin, aabbMax, userPtr,
+											   collisionFilterGroup,
+											   collisionFilterMask);
+
+	b3DbvtAabbMm aabb = b3DbvtVolume::FromMM(aabbMin, aabbMax);
+
+	//bproxy->aabb			=	b3DbvtVolume::FromMM(aabbMin,aabbMax);
+	proxy->stage = m_stageCurrent;
+	proxy->m_uniqueId = objectId;
+	proxy->leaf = m_sets[0].insert(aabb, proxy);
+	b3ListAppend(proxy, m_stageRoots[m_stageCurrent]);
+	if (!m_deferedcollide)
+	{
+		b3DbvtTreeCollider collider(this);
+		collider.proxy = proxy;
+		m_sets[0].collideTV(m_sets[0].m_root, aabb, collider);
+		m_sets[1].collideTV(m_sets[1].m_root, aabb, collider);
+	}
+	return (proxy);
+}
+
+//
+void b3DynamicBvhBroadphase::destroyProxy(b3BroadphaseProxy* absproxy,
+										  b3Dispatcher* dispatcher)
+{
+	b3DbvtProxy* proxy = (b3DbvtProxy*)absproxy;
+	if (proxy->stage == STAGECOUNT)
+		m_sets[1].remove(proxy->leaf);
+	else
+		m_sets[0].remove(proxy->leaf);
+	b3ListRemove(proxy, m_stageRoots[proxy->stage]);
+	m_paircache->removeOverlappingPairsContainingProxy(proxy->getUid(), dispatcher);
+
+	m_needcleanup = true;
+}
+
+void b3DynamicBvhBroadphase::getAabb(int objectId, b3Vector3& aabbMin, b3Vector3& aabbMax) const
+{
+	const b3DbvtProxy* proxy = &m_proxies[objectId];
+	aabbMin = proxy->m_aabbMin;
+	aabbMax = proxy->m_aabbMax;
+}
+/*
+void	b3DynamicBvhBroadphase::getAabb(b3BroadphaseProxy* absproxy,b3Vector3& aabbMin, b3Vector3& aabbMax ) const
+{
+	b3DbvtProxy*						proxy=(b3DbvtProxy*)absproxy;
+	aabbMin = proxy->m_aabbMin;
+	aabbMax = proxy->m_aabbMax;
+}
+*/
+
+struct BroadphaseRayTester : b3DynamicBvh::ICollide
+{
+	b3BroadphaseRayCallback& m_rayCallback;
+	BroadphaseRayTester(b3BroadphaseRayCallback& orgCallback)
+		: m_rayCallback(orgCallback)
+	{
+	}
+	void Process(const b3DbvtNode* leaf)
+	{
+		b3DbvtProxy* proxy = (b3DbvtProxy*)leaf->data;
+		m_rayCallback.process(proxy);
+	}
+};
+
+void b3DynamicBvhBroadphase::rayTest(const b3Vector3& rayFrom, const b3Vector3& rayTo, b3BroadphaseRayCallback& rayCallback, const b3Vector3& aabbMin, const b3Vector3& aabbMax)
+{
+	BroadphaseRayTester callback(rayCallback);
+
+	m_sets[0].rayTestInternal(m_sets[0].m_root,
+							  rayFrom,
+							  rayTo,
+							  rayCallback.m_rayDirectionInverse,
+							  rayCallback.m_signs,
+							  rayCallback.m_lambda_max,
+							  aabbMin,
+							  aabbMax,
+							  callback);
+
+	m_sets[1].rayTestInternal(m_sets[1].m_root,
+							  rayFrom,
+							  rayTo,
+							  rayCallback.m_rayDirectionInverse,
+							  rayCallback.m_signs,
+							  rayCallback.m_lambda_max,
+							  aabbMin,
+							  aabbMax,
+							  callback);
+}
+
+struct BroadphaseAabbTester : b3DynamicBvh::ICollide
+{
+	b3BroadphaseAabbCallback& m_aabbCallback;
+	BroadphaseAabbTester(b3BroadphaseAabbCallback& orgCallback)
+		: m_aabbCallback(orgCallback)
+	{
+	}
+	void Process(const b3DbvtNode* leaf)
+	{
+		b3DbvtProxy* proxy = (b3DbvtProxy*)leaf->data;
+		m_aabbCallback.process(proxy);
+	}
+};
+
+void b3DynamicBvhBroadphase::aabbTest(const b3Vector3& aabbMin, const b3Vector3& aabbMax, b3BroadphaseAabbCallback& aabbCallback)
+{
+	BroadphaseAabbTester callback(aabbCallback);
+
+	const B3_ATTRIBUTE_ALIGNED16(b3DbvtVolume) bounds = b3DbvtVolume::FromMM(aabbMin, aabbMax);
+	//process all children, that overlap with  the given AABB bounds
+	m_sets[0].collideTV(m_sets[0].m_root, bounds, callback);
+	m_sets[1].collideTV(m_sets[1].m_root, bounds, callback);
+}
+
+//
+void b3DynamicBvhBroadphase::setAabb(int objectId,
+									 const b3Vector3& aabbMin,
+									 const b3Vector3& aabbMax,
+									 b3Dispatcher* /*dispatcher*/)
+{
+	b3DbvtProxy* proxy = &m_proxies[objectId];
+	//	b3DbvtProxy*						proxy=(b3DbvtProxy*)absproxy;
+	B3_ATTRIBUTE_ALIGNED16(b3DbvtVolume)
+	aabb = b3DbvtVolume::FromMM(aabbMin, aabbMax);
+#if B3_DBVT_BP_PREVENTFALSEUPDATE
+	if (b3NotEqual(aabb, proxy->leaf->volume))
+#endif
+	{
+		bool docollide = false;
+		if (proxy->stage == STAGECOUNT)
+		{ /* fixed -> dynamic set	*/
+			m_sets[1].remove(proxy->leaf);
+			proxy->leaf = m_sets[0].insert(aabb, proxy);
+			docollide = true;
+		}
+		else
+		{ /* dynamic set				*/
+			++m_updates_call;
+			if (b3Intersect(proxy->leaf->volume, aabb))
+			{ /* Moving				*/
+
+				const b3Vector3 delta = aabbMin - proxy->m_aabbMin;
+				b3Vector3 velocity(((proxy->m_aabbMax - proxy->m_aabbMin) / 2) * m_prediction);
+				if (delta[0] < 0) velocity[0] = -velocity[0];
+				if (delta[1] < 0) velocity[1] = -velocity[1];
+				if (delta[2] < 0) velocity[2] = -velocity[2];
+				if (
+#ifdef B3_DBVT_BP_MARGIN
+					m_sets[0].update(proxy->leaf, aabb, velocity, B3_DBVT_BP_MARGIN)
+#else
+					m_sets[0].update(proxy->leaf, aabb, velocity)
+#endif
+				)
+				{
+					++m_updates_done;
+					docollide = true;
+				}
+			}
+			else
+			{ /* Teleporting			*/
+				m_sets[0].update(proxy->leaf, aabb);
+				++m_updates_done;
+				docollide = true;
+			}
+		}
+		b3ListRemove(proxy, m_stageRoots[proxy->stage]);
+		proxy->m_aabbMin = aabbMin;
+		proxy->m_aabbMax = aabbMax;
+		proxy->stage = m_stageCurrent;
+		b3ListAppend(proxy, m_stageRoots[m_stageCurrent]);
+		if (docollide)
+		{
+			m_needcleanup = true;
+			if (!m_deferedcollide)
+			{
+				b3DbvtTreeCollider collider(this);
+				m_sets[1].collideTTpersistentStack(m_sets[1].m_root, proxy->leaf, collider);
+				m_sets[0].collideTTpersistentStack(m_sets[0].m_root, proxy->leaf, collider);
+			}
+		}
+	}
+}
+
+//
+void b3DynamicBvhBroadphase::setAabbForceUpdate(b3BroadphaseProxy* absproxy,
+												const b3Vector3& aabbMin,
+												const b3Vector3& aabbMax,
+												b3Dispatcher* /*dispatcher*/)
+{
+	b3DbvtProxy* proxy = (b3DbvtProxy*)absproxy;
+	B3_ATTRIBUTE_ALIGNED16(b3DbvtVolume)
+	aabb = b3DbvtVolume::FromMM(aabbMin, aabbMax);
+	bool docollide = false;
+	if (proxy->stage == STAGECOUNT)
+	{ /* fixed -> dynamic set	*/
+		m_sets[1].remove(proxy->leaf);
+		proxy->leaf = m_sets[0].insert(aabb, proxy);
+		docollide = true;
+	}
+	else
+	{ /* dynamic set				*/
+		++m_updates_call;
+		/* Teleporting			*/
+		m_sets[0].update(proxy->leaf, aabb);
+		++m_updates_done;
+		docollide = true;
+	}
+	b3ListRemove(proxy, m_stageRoots[proxy->stage]);
+	proxy->m_aabbMin = aabbMin;
+	proxy->m_aabbMax = aabbMax;
+	proxy->stage = m_stageCurrent;
+	b3ListAppend(proxy, m_stageRoots[m_stageCurrent]);
+	if (docollide)
+	{
+		m_needcleanup = true;
+		if (!m_deferedcollide)
+		{
+			b3DbvtTreeCollider collider(this);
+			m_sets[1].collideTTpersistentStack(m_sets[1].m_root, proxy->leaf, collider);
+			m_sets[0].collideTTpersistentStack(m_sets[0].m_root, proxy->leaf, collider);
+		}
+	}
+}
+
+//
+void b3DynamicBvhBroadphase::calculateOverlappingPairs(b3Dispatcher* dispatcher)
+{
+	collide(dispatcher);
+#if B3_DBVT_BP_PROFILE
+	if (0 == (m_pid % B3_DBVT_BP_PROFILING_RATE))
+	{
+		printf("fixed(%u) dynamics(%u) pairs(%u)\r\n", m_sets[1].m_leaves, m_sets[0].m_leaves, m_paircache->getNumOverlappingPairs());
+		unsigned int total = m_profiling.m_total;
+		if (total <= 0) total = 1;
+		printf("ddcollide: %u%% (%uus)\r\n", (50 + m_profiling.m_ddcollide * 100) / total, m_profiling.m_ddcollide / B3_DBVT_BP_PROFILING_RATE);
+		printf("fdcollide: %u%% (%uus)\r\n", (50 + m_profiling.m_fdcollide * 100) / total, m_profiling.m_fdcollide / B3_DBVT_BP_PROFILING_RATE);
+		printf("cleanup:   %u%% (%uus)\r\n", (50 + m_profiling.m_cleanup * 100) / total, m_profiling.m_cleanup / B3_DBVT_BP_PROFILING_RATE);
+		printf("total:     %uus\r\n", total / B3_DBVT_BP_PROFILING_RATE);
+		const unsigned long sum = m_profiling.m_ddcollide +
+								  m_profiling.m_fdcollide +
+								  m_profiling.m_cleanup;
+		printf("leaked: %u%% (%uus)\r\n", 100 - ((50 + sum * 100) / total), (total - sum) / B3_DBVT_BP_PROFILING_RATE);
+		printf("job counts: %u%%\r\n", (m_profiling.m_jobcount * 100) / ((m_sets[0].m_leaves + m_sets[1].m_leaves) * B3_DBVT_BP_PROFILING_RATE));
+		b3Clear(m_profiling);
+		m_clock.reset();
+	}
+#endif
+
+	performDeferredRemoval(dispatcher);
+}
+
+void b3DynamicBvhBroadphase::performDeferredRemoval(b3Dispatcher* dispatcher)
+{
+	if (m_paircache->hasDeferredRemoval())
+	{
+		b3BroadphasePairArray& overlappingPairArray = m_paircache->getOverlappingPairArray();
+
+		//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(b3BroadphasePairSortPredicate());
+
+		int invalidPair = 0;
+
+		int i;
+
+		b3BroadphasePair previousPair = b3MakeBroadphasePair(-1, -1);
+
+		for (i = 0; i < overlappingPairArray.size(); i++)
+		{
+			b3BroadphasePair& pair = overlappingPairArray[i];
+
+			bool isDuplicate = (pair == previousPair);
+
+			previousPair = pair;
+
+			bool needsRemoval = false;
+
+			if (!isDuplicate)
+			{
+				//important to perform AABB check that is consistent with the broadphase
+				b3DbvtProxy* pa = &m_proxies[pair.x];
+				b3DbvtProxy* pb = &m_proxies[pair.y];
+				bool hasOverlap = b3Intersect(pa->leaf->volume, pb->leaf->volume);
+
+				if (hasOverlap)
+				{
+					needsRemoval = false;
+				}
+				else
+				{
+					needsRemoval = true;
+				}
+			}
+			else
+			{
+				//remove duplicate
+				needsRemoval = true;
+				//should have no algorithm
+			}
+
+			if (needsRemoval)
+			{
+				m_paircache->cleanOverlappingPair(pair, dispatcher);
+
+				pair.x = -1;
+				pair.y = -1;
+				invalidPair++;
+			}
+		}
+
+		//perform a sort, to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(b3BroadphasePairSortPredicate());
+		overlappingPairArray.resize(overlappingPairArray.size() - invalidPair);
+	}
+}
+
+//
+void b3DynamicBvhBroadphase::collide(b3Dispatcher* dispatcher)
+{
+	/*printf("---------------------------------------------------------\n");
+	printf("m_sets[0].m_leaves=%d\n",m_sets[0].m_leaves);
+	printf("m_sets[1].m_leaves=%d\n",m_sets[1].m_leaves);
+	printf("numPairs = %d\n",getOverlappingPairCache()->getNumOverlappingPairs());
+	{
+		int i;
+		for (i=0;i<getOverlappingPairCache()->getNumOverlappingPairs();i++)
+		{
+			printf("pair[%d]=(%d,%d),",i,getOverlappingPairCache()->getOverlappingPairArray()[i].m_pProxy0->getUid(),
+				getOverlappingPairCache()->getOverlappingPairArray()[i].m_pProxy1->getUid());
+		}
+		printf("\n");
+	}
+*/
+
+	b3SPC(m_profiling.m_total);
+	/* optimize				*/
+	m_sets[0].optimizeIncremental(1 + (m_sets[0].m_leaves * m_dupdates) / 100);
+	if (m_fixedleft)
+	{
+		const int count = 1 + (m_sets[1].m_leaves * m_fupdates) / 100;
+		m_sets[1].optimizeIncremental(1 + (m_sets[1].m_leaves * m_fupdates) / 100);
+		m_fixedleft = b3Max<int>(0, m_fixedleft - count);
+	}
+	/* dynamic -> fixed set	*/
+	m_stageCurrent = (m_stageCurrent + 1) % STAGECOUNT;
+	b3DbvtProxy* current = m_stageRoots[m_stageCurrent];
+	if (current)
+	{
+		b3DbvtTreeCollider collider(this);
+		do
+		{
+			b3DbvtProxy* next = current->links[1];
+			b3ListRemove(current, m_stageRoots[current->stage]);
+			b3ListAppend(current, m_stageRoots[STAGECOUNT]);
+#if B3_DBVT_BP_ACCURATESLEEPING
+			m_paircache->removeOverlappingPairsContainingProxy(current, dispatcher);
+			collider.proxy = current;
+			b3DynamicBvh::collideTV(m_sets[0].m_root, current->aabb, collider);
+			b3DynamicBvh::collideTV(m_sets[1].m_root, current->aabb, collider);
+#endif
+			m_sets[0].remove(current->leaf);
+			B3_ATTRIBUTE_ALIGNED16(b3DbvtVolume)
+			curAabb = b3DbvtVolume::FromMM(current->m_aabbMin, current->m_aabbMax);
+			current->leaf = m_sets[1].insert(curAabb, current);
+			current->stage = STAGECOUNT;
+			current = next;
+		} while (current);
+		m_fixedleft = m_sets[1].m_leaves;
+		m_needcleanup = true;
+	}
+	/* collide dynamics		*/
+	{
+		b3DbvtTreeCollider collider(this);
+		if (m_deferedcollide)
+		{
+			b3SPC(m_profiling.m_fdcollide);
+			m_sets[0].collideTTpersistentStack(m_sets[0].m_root, m_sets[1].m_root, collider);
+		}
+		if (m_deferedcollide)
+		{
+			b3SPC(m_profiling.m_ddcollide);
+			m_sets[0].collideTTpersistentStack(m_sets[0].m_root, m_sets[0].m_root, collider);
+		}
+	}
+	/* clean up				*/
+	if (m_needcleanup)
+	{
+		b3SPC(m_profiling.m_cleanup);
+		b3BroadphasePairArray& pairs = m_paircache->getOverlappingPairArray();
+		if (pairs.size() > 0)
+		{
+			int ni = b3Min(pairs.size(), b3Max<int>(m_newpairs, (pairs.size() * m_cupdates) / 100));
+			for (int i = 0; i < ni; ++i)
+			{
+				b3BroadphasePair& p = pairs[(m_cid + i) % pairs.size()];
+				b3DbvtProxy* pa = &m_proxies[p.x];
+				b3DbvtProxy* pb = &m_proxies[p.y];
+				if (!b3Intersect(pa->leaf->volume, pb->leaf->volume))
+				{
+#if B3_DBVT_BP_SORTPAIRS
+					if (pa->m_uniqueId > pb->m_uniqueId)
+						b3Swap(pa, pb);
+#endif
+					m_paircache->removeOverlappingPair(pa->getUid(), pb->getUid(), dispatcher);
+					--ni;
+					--i;
+				}
+			}
+			if (pairs.size() > 0)
+				m_cid = (m_cid + ni) % pairs.size();
+			else
+				m_cid = 0;
+		}
+	}
+	++m_pid;
+	m_newpairs = 1;
+	m_needcleanup = false;
+	if (m_updates_call > 0)
+	{
+		m_updates_ratio = m_updates_done / (b3Scalar)m_updates_call;
+	}
+	else
+	{
+		m_updates_ratio = 0;
+	}
+	m_updates_done /= 2;
+	m_updates_call /= 2;
+}
+
+//
+void b3DynamicBvhBroadphase::optimize()
+{
+	m_sets[0].optimizeTopDown();
+	m_sets[1].optimizeTopDown();
+}
+
+//
+b3OverlappingPairCache* b3DynamicBvhBroadphase::getOverlappingPairCache()
+{
+	return (m_paircache);
+}
+
+//
+const b3OverlappingPairCache* b3DynamicBvhBroadphase::getOverlappingPairCache() const
+{
+	return (m_paircache);
+}
+
+//
+void b3DynamicBvhBroadphase::getBroadphaseAabb(b3Vector3& aabbMin, b3Vector3& aabbMax) const
+{
+	B3_ATTRIBUTE_ALIGNED16(b3DbvtVolume)
+	bounds;
+
+	if (!m_sets[0].empty())
+		if (!m_sets[1].empty())
+			b3Merge(m_sets[0].m_root->volume,
+					m_sets[1].m_root->volume, bounds);
+		else
+			bounds = m_sets[0].m_root->volume;
+	else if (!m_sets[1].empty())
+		bounds = m_sets[1].m_root->volume;
+	else
+		bounds = b3DbvtVolume::FromCR(b3MakeVector3(0, 0, 0), 0);
+	aabbMin = bounds.Mins();
+	aabbMax = bounds.Maxs();
+}
+
+void b3DynamicBvhBroadphase::resetPool(b3Dispatcher* dispatcher)
+{
+	int totalObjects = m_sets[0].m_leaves + m_sets[1].m_leaves;
+	if (!totalObjects)
+	{
+		//reset internal dynamic tree data structures
+		m_sets[0].clear();
+		m_sets[1].clear();
+
+		m_deferedcollide = false;
+		m_needcleanup = true;
+		m_stageCurrent = 0;
+		m_fixedleft = 0;
+		m_fupdates = 1;
+		m_dupdates = 0;
+		m_cupdates = 10;
+		m_newpairs = 1;
+		m_updates_call = 0;
+		m_updates_done = 0;
+		m_updates_ratio = 0;
+
+		m_pid = 0;
+		m_cid = 0;
+		for (int i = 0; i <= STAGECOUNT; ++i)
+		{
+			m_stageRoots[i] = 0;
+		}
+	}
+}
+
+//
+void b3DynamicBvhBroadphase::printStats()
+{
+}
+
+//
+#if B3_DBVT_BP_ENABLE_BENCHMARK
+
+struct b3BroadphaseBenchmark
+{
+	struct Experiment
+	{
+		const char* name;
+		int object_count;
+		int update_count;
+		int spawn_count;
+		int iterations;
+		b3Scalar speed;
+		b3Scalar amplitude;
+	};
+	struct Object
+	{
+		b3Vector3 center;
+		b3Vector3 extents;
+		b3BroadphaseProxy* proxy;
+		b3Scalar time;
+		void update(b3Scalar speed, b3Scalar amplitude, b3BroadphaseInterface* pbi)
+		{
+			time += speed;
+			center[0] = b3Cos(time * (b3Scalar)2.17) * amplitude +
+						b3Sin(time) * amplitude / 2;
+			center[1] = b3Cos(time * (b3Scalar)1.38) * amplitude +
+						b3Sin(time) * amplitude;
+			center[2] = b3Sin(time * (b3Scalar)0.777) * amplitude;
+			pbi->setAabb(proxy, center - extents, center + extents, 0);
+		}
+	};
+	static int UnsignedRand(int range = RAND_MAX - 1) { return (rand() % (range + 1)); }
+	static b3Scalar UnitRand() { return (UnsignedRand(16384) / (b3Scalar)16384); }
+	static void OutputTime(const char* name, b3Clock& c, unsigned count = 0)
+	{
+		const unsigned long us = c.getTimeMicroseconds();
+		const unsigned long ms = (us + 500) / 1000;
+		const b3Scalar sec = us / (b3Scalar)(1000 * 1000);
+		if (count > 0)
+			printf("%s : %u us (%u ms), %.2f/s\r\n", name, us, ms, count / sec);
+		else
+			printf("%s : %u us (%u ms)\r\n", name, us, ms);
+	}
+};
+
+void b3DynamicBvhBroadphase::benchmark(b3BroadphaseInterface* pbi)
+{
+	static const b3BroadphaseBenchmark::Experiment experiments[] =
+		{
+			{"1024o.10%", 1024, 10, 0, 8192, (b3Scalar)0.005, (b3Scalar)100},
+			/*{"4096o.10%",4096,10,0,8192,(b3Scalar)0.005,(b3Scalar)100},
+		{"8192o.10%",8192,10,0,8192,(b3Scalar)0.005,(b3Scalar)100},*/
+		};
+	static const int nexperiments = sizeof(experiments) / sizeof(experiments[0]);
+	b3AlignedObjectArray<b3BroadphaseBenchmark::Object*> objects;
+	b3Clock wallclock;
+	/* Begin			*/
+	for (int iexp = 0; iexp < nexperiments; ++iexp)
+	{
+		const b3BroadphaseBenchmark::Experiment& experiment = experiments[iexp];
+		const int object_count = experiment.object_count;
+		const int update_count = (object_count * experiment.update_count) / 100;
+		const int spawn_count = (object_count * experiment.spawn_count) / 100;
+		const b3Scalar speed = experiment.speed;
+		const b3Scalar amplitude = experiment.amplitude;
+		printf("Experiment #%u '%s':\r\n", iexp, experiment.name);
+		printf("\tObjects: %u\r\n", object_count);
+		printf("\tUpdate: %u\r\n", update_count);
+		printf("\tSpawn: %u\r\n", spawn_count);
+		printf("\tSpeed: %f\r\n", speed);
+		printf("\tAmplitude: %f\r\n", amplitude);
+		srand(180673);
+		/* Create objects	*/
+		wallclock.reset();
+		objects.reserve(object_count);
+		for (int i = 0; i < object_count; ++i)
+		{
+			b3BroadphaseBenchmark::Object* po = new b3BroadphaseBenchmark::Object();
+			po->center[0] = b3BroadphaseBenchmark::UnitRand() * 50;
+			po->center[1] = b3BroadphaseBenchmark::UnitRand() * 50;
+			po->center[2] = b3BroadphaseBenchmark::UnitRand() * 50;
+			po->extents[0] = b3BroadphaseBenchmark::UnitRand() * 2 + 2;
+			po->extents[1] = b3BroadphaseBenchmark::UnitRand() * 2 + 2;
+			po->extents[2] = b3BroadphaseBenchmark::UnitRand() * 2 + 2;
+			po->time = b3BroadphaseBenchmark::UnitRand() * 2000;
+			po->proxy = pbi->createProxy(po->center - po->extents, po->center + po->extents, 0, po, 1, 1, 0, 0);
+			objects.push_back(po);
+		}
+		b3BroadphaseBenchmark::OutputTime("\tInitialization", wallclock);
+		/* First update		*/
+		wallclock.reset();
+		for (int i = 0; i < objects.size(); ++i)
+		{
+			objects[i]->update(speed, amplitude, pbi);
+		}
+		b3BroadphaseBenchmark::OutputTime("\tFirst update", wallclock);
+		/* Updates			*/
+		wallclock.reset();
+		for (int i = 0; i < experiment.iterations; ++i)
+		{
+			for (int j = 0; j < update_count; ++j)
+			{
+				objects[j]->update(speed, amplitude, pbi);
+			}
+			pbi->calculateOverlappingPairs(0);
+		}
+		b3BroadphaseBenchmark::OutputTime("\tUpdate", wallclock, experiment.iterations);
+		/* Clean up			*/
+		wallclock.reset();
+		for (int i = 0; i < objects.size(); ++i)
+		{
+			pbi->destroyProxy(objects[i]->proxy, 0);
+			delete objects[i];
+		}
+		objects.resize(0);
+		b3BroadphaseBenchmark::OutputTime("\tRelease", wallclock);
+	}
+}
+#else
+/*void							b3DynamicBvhBroadphase::benchmark(b3BroadphaseInterface*)
+{}
+*/
+#endif
+
+#if B3_DBVT_BP_PROFILE
+#undef b3SPC
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h
new file mode 100644
index 0000000..c235e40
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h
@@ -0,0 +1,197 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///b3DynamicBvhBroadphase implementation by Nathanael Presson
+#ifndef B3_DBVT_BROADPHASE_H
+#define B3_DBVT_BROADPHASE_H
+
+#include "Bullet3Collision/BroadPhaseCollision/b3DynamicBvh.h"
+#include "Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+#include "b3BroadphaseCallback.h"
+
+//
+// Compile time config
+//
+
+#define B3_DBVT_BP_PROFILE 0
+//#define B3_DBVT_BP_SORTPAIRS				1
+#define B3_DBVT_BP_PREVENTFALSEUPDATE 0
+#define B3_DBVT_BP_ACCURATESLEEPING 0
+#define B3_DBVT_BP_ENABLE_BENCHMARK 0
+#define B3_DBVT_BP_MARGIN (b3Scalar)0.05
+
+#if B3_DBVT_BP_PROFILE
+#define B3_DBVT_BP_PROFILING_RATE 256
+
+#endif
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3BroadphaseProxy
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	///optional filtering to cull potential collisions
+	enum CollisionFilterGroups
+	{
+		DefaultFilter = 1,
+		StaticFilter = 2,
+		KinematicFilter = 4,
+		DebrisFilter = 8,
+		SensorTrigger = 16,
+		CharacterFilter = 32,
+		AllFilter = -1  //all bits sets: DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger
+	};
+
+	//Usually the client b3CollisionObject or Rigidbody class
+	void* m_clientObject;
+	int m_collisionFilterGroup;
+	int m_collisionFilterMask;
+	int m_uniqueId;  //m_uniqueId is introduced for paircache. could get rid of this, by calculating the address offset etc.
+
+	b3Vector3 m_aabbMin;
+	b3Vector3 m_aabbMax;
+
+	B3_FORCE_INLINE int getUid() const
+	{
+		return m_uniqueId;
+	}
+
+	//used for memory pools
+	b3BroadphaseProxy() : m_clientObject(0)
+	{
+	}
+
+	b3BroadphaseProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, void* userPtr, int collisionFilterGroup, int collisionFilterMask)
+		: m_clientObject(userPtr),
+		  m_collisionFilterGroup(collisionFilterGroup),
+		  m_collisionFilterMask(collisionFilterMask),
+		  m_aabbMin(aabbMin),
+		  m_aabbMax(aabbMax)
+	{
+	}
+};
+
+//
+// b3DbvtProxy
+//
+struct b3DbvtProxy : b3BroadphaseProxy
+{
+	/* Fields		*/
+	//b3DbvtAabbMm	aabb;
+	b3DbvtNode* leaf;
+	b3DbvtProxy* links[2];
+	int stage;
+	/* ctor			*/
+
+	explicit b3DbvtProxy() {}
+	b3DbvtProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, void* userPtr, int collisionFilterGroup, int collisionFilterMask) : b3BroadphaseProxy(aabbMin, aabbMax, userPtr, collisionFilterGroup, collisionFilterMask)
+	{
+		links[0] = links[1] = 0;
+	}
+};
+
+typedef b3AlignedObjectArray<b3DbvtProxy*> b3DbvtProxyArray;
+
+///The b3DynamicBvhBroadphase implements a broadphase using two dynamic AABB bounding volume hierarchies/trees (see b3DynamicBvh).
+///One tree is used for static/non-moving objects, and another tree is used for dynamic objects. Objects can move from one tree to the other.
+///This is a very fast broadphase, especially for very dynamic worlds where many objects are moving. Its insert/add and remove of objects is generally faster than the sweep and prune broadphases b3AxisSweep3 and b332BitAxisSweep3.
+struct b3DynamicBvhBroadphase
+{
+	/* Config		*/
+	enum
+	{
+		DYNAMIC_SET = 0, /* Dynamic set index	*/
+		FIXED_SET = 1,   /* Fixed set index		*/
+		STAGECOUNT = 2   /* Number of stages		*/
+	};
+	/* Fields		*/
+	b3DynamicBvh m_sets[2];                     // Dbvt sets
+	b3DbvtProxy* m_stageRoots[STAGECOUNT + 1];  // Stages list
+
+	b3AlignedObjectArray<b3DbvtProxy> m_proxies;
+	b3OverlappingPairCache* m_paircache;  // Pair cache
+	b3Scalar m_prediction;                // Velocity prediction
+	int m_stageCurrent;                   // Current stage
+	int m_fupdates;                       // % of fixed updates per frame
+	int m_dupdates;                       // % of dynamic updates per frame
+	int m_cupdates;                       // % of cleanup updates per frame
+	int m_newpairs;                       // Number of pairs created
+	int m_fixedleft;                      // Fixed optimization left
+	unsigned m_updates_call;              // Number of updates call
+	unsigned m_updates_done;              // Number of updates done
+	b3Scalar m_updates_ratio;             // m_updates_done/m_updates_call
+	int m_pid;                            // Parse id
+	int m_cid;                            // Cleanup index
+	bool m_releasepaircache;              // Release pair cache on delete
+	bool m_deferedcollide;                // Defere dynamic/static collision to collide call
+	bool m_needcleanup;                   // Need to run cleanup?
+#if B3_DBVT_BP_PROFILE
+	b3Clock m_clock;
+	struct
+	{
+		unsigned long m_total;
+		unsigned long m_ddcollide;
+		unsigned long m_fdcollide;
+		unsigned long m_cleanup;
+		unsigned long m_jobcount;
+	} m_profiling;
+#endif
+	/* Methods		*/
+	b3DynamicBvhBroadphase(int proxyCapacity, b3OverlappingPairCache* paircache = 0);
+	virtual ~b3DynamicBvhBroadphase();
+	void collide(b3Dispatcher* dispatcher);
+	void optimize();
+
+	/* b3BroadphaseInterface Implementation	*/
+	b3BroadphaseProxy* createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int objectIndex, void* userPtr, int collisionFilterGroup, int collisionFilterMask);
+	virtual void destroyProxy(b3BroadphaseProxy* proxy, b3Dispatcher* dispatcher);
+	virtual void setAabb(int objectId, const b3Vector3& aabbMin, const b3Vector3& aabbMax, b3Dispatcher* dispatcher);
+	virtual void rayTest(const b3Vector3& rayFrom, const b3Vector3& rayTo, b3BroadphaseRayCallback& rayCallback, const b3Vector3& aabbMin = b3MakeVector3(0, 0, 0), const b3Vector3& aabbMax = b3MakeVector3(0, 0, 0));
+	virtual void aabbTest(const b3Vector3& aabbMin, const b3Vector3& aabbMax, b3BroadphaseAabbCallback& callback);
+
+	//virtual void					getAabb(b3BroadphaseProxy* proxy,b3Vector3& aabbMin, b3Vector3& aabbMax ) const;
+	virtual void getAabb(int objectId, b3Vector3& aabbMin, b3Vector3& aabbMax) const;
+	virtual void calculateOverlappingPairs(b3Dispatcher* dispatcher = 0);
+	virtual b3OverlappingPairCache* getOverlappingPairCache();
+	virtual const b3OverlappingPairCache* getOverlappingPairCache() const;
+	virtual void getBroadphaseAabb(b3Vector3& aabbMin, b3Vector3& aabbMax) const;
+	virtual void printStats();
+
+	///reset broadphase internal structures, to ensure determinism/reproducability
+	virtual void resetPool(b3Dispatcher* dispatcher);
+
+	void performDeferredRemoval(b3Dispatcher* dispatcher);
+
+	void setVelocityPrediction(b3Scalar prediction)
+	{
+		m_prediction = prediction;
+	}
+	b3Scalar getVelocityPrediction() const
+	{
+		return m_prediction;
+	}
+
+	///this setAabbForceUpdate is similar to setAabb but always forces the aabb update.
+	///it is not part of the b3BroadphaseInterface but specific to b3DynamicBvhBroadphase.
+	///it bypasses certain optimizations that prevent aabb updates (when the aabb shrinks), see
+	///http://code.google.com/p/bullet/issues/detail?id=223
+	void setAabbForceUpdate(b3BroadphaseProxy* absproxy, const b3Vector3& aabbMin, const b3Vector3& aabbMax, b3Dispatcher* /*dispatcher*/);
+
+	//static void						benchmark(b3BroadphaseInterface*);
+};
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h
new file mode 100644
index 0000000..4ff9eba
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h
@@ -0,0 +1,70 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_OVERLAPPING_PAIR_H
+#define B3_OVERLAPPING_PAIR_H
+
+#include "Bullet3Common/shared/b3Int4.h"
+
+#define B3_NEW_PAIR_MARKER -1
+#define B3_REMOVED_PAIR_MARKER -2
+
+typedef b3Int4 b3BroadphasePair;
+
+inline b3Int4 b3MakeBroadphasePair(int xx, int yy)
+{
+	b3Int4 pair;
+
+	if (xx < yy)
+	{
+		pair.x = xx;
+		pair.y = yy;
+	}
+	else
+	{
+		pair.x = yy;
+		pair.y = xx;
+	}
+	pair.z = B3_NEW_PAIR_MARKER;
+	pair.w = B3_NEW_PAIR_MARKER;
+	return pair;
+}
+
+/*struct b3BroadphasePair : public b3Int4
+{
+	explicit b3BroadphasePair(){}
+	
+};
+*/
+
+class b3BroadphasePairSortPredicate
+{
+public:
+	bool operator()(const b3BroadphasePair& a, const b3BroadphasePair& b) const
+	{
+		const int uidA0 = a.x;
+		const int uidB0 = b.x;
+		const int uidA1 = a.y;
+		const int uidB1 = b.y;
+		return uidA0 > uidB0 || (uidA0 == uidB0 && uidA1 > uidB1);
+	}
+};
+
+B3_FORCE_INLINE bool operator==(const b3BroadphasePair& a, const b3BroadphasePair& b)
+{
+	return (a.x == b.x) && (a.y == b.y);
+}
+
+#endif  //B3_OVERLAPPING_PAIR_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.cpp b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.cpp
new file mode 100644
index 0000000..1977324
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.cpp
@@ -0,0 +1,559 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3OverlappingPairCache.h"
+
+//#include "b3Dispatcher.h"
+//#include "b3CollisionAlgorithm.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
+
+#include <stdio.h>
+
+int b3g_overlappingPairs = 0;
+int b3g_removePairs = 0;
+int b3g_addedPairs = 0;
+int b3g_findPairs = 0;
+
+b3HashedOverlappingPairCache::b3HashedOverlappingPairCache() : m_overlapFilterCallback(0)
+//,	m_blockedForChanges(false)
+{
+	int initialAllocatedSize = 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+	growTables();
+}
+
+b3HashedOverlappingPairCache::~b3HashedOverlappingPairCache()
+{
+}
+
+void b3HashedOverlappingPairCache::cleanOverlappingPair(b3BroadphasePair& pair, b3Dispatcher* dispatcher)
+{
+	/*	if (pair.m_algorithm)
+	{
+		{
+			pair.m_algorithm->~b3CollisionAlgorithm();
+			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
+			pair.m_algorithm=0;
+		}
+	}
+	*/
+}
+
+void b3HashedOverlappingPairCache::cleanProxyFromPairs(int proxy, b3Dispatcher* dispatcher)
+{
+	class CleanPairCallback : public b3OverlapCallback
+	{
+		int m_cleanProxy;
+		b3OverlappingPairCache* m_pairCache;
+		b3Dispatcher* m_dispatcher;
+
+	public:
+		CleanPairCallback(int cleanProxy, b3OverlappingPairCache* pairCache, b3Dispatcher* dispatcher)
+			: m_cleanProxy(cleanProxy),
+			  m_pairCache(pairCache),
+			  m_dispatcher(dispatcher)
+		{
+		}
+		virtual bool processOverlap(b3BroadphasePair& pair)
+		{
+			if ((pair.x == m_cleanProxy) ||
+				(pair.y == m_cleanProxy))
+			{
+				m_pairCache->cleanOverlappingPair(pair, m_dispatcher);
+			}
+			return false;
+		}
+	};
+
+	CleanPairCallback cleanPairs(proxy, this, dispatcher);
+
+	processAllOverlappingPairs(&cleanPairs, dispatcher);
+}
+
+void b3HashedOverlappingPairCache::removeOverlappingPairsContainingProxy(int proxy, b3Dispatcher* dispatcher)
+{
+	class RemovePairCallback : public b3OverlapCallback
+	{
+		int m_obsoleteProxy;
+
+	public:
+		RemovePairCallback(int obsoleteProxy)
+			: m_obsoleteProxy(obsoleteProxy)
+		{
+		}
+		virtual bool processOverlap(b3BroadphasePair& pair)
+		{
+			return ((pair.x == m_obsoleteProxy) ||
+					(pair.y == m_obsoleteProxy));
+		}
+	};
+
+	RemovePairCallback removeCallback(proxy);
+
+	processAllOverlappingPairs(&removeCallback, dispatcher);
+}
+
+b3BroadphasePair* b3HashedOverlappingPairCache::findPair(int proxy0, int proxy1)
+{
+	b3g_findPairs++;
+	if (proxy0 > proxy1)
+		b3Swap(proxy0, proxy1);
+	int proxyId1 = proxy0;
+	int proxyId2 = proxy1;
+
+	/*if (proxyId1 > proxyId2) 
+		b3Swap(proxyId1, proxyId2);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));
+
+	if (hash >= m_hashTable.size())
+	{
+		return NULL;
+	}
+
+	int index = m_hashTable[hash];
+	while (index != B3_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
+	{
+		index = m_next[index];
+	}
+
+	if (index == B3_NULL_PAIR)
+	{
+		return NULL;
+	}
+
+	b3Assert(index < m_overlappingPairArray.size());
+
+	return &m_overlappingPairArray[index];
+}
+
+//#include <stdio.h>
+
+void b3HashedOverlappingPairCache::growTables()
+{
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (m_hashTable.size() < newCapacity)
+	{
+		//grow hashtable and next table
+		int curHashtableSize = m_hashTable.size();
+
+		m_hashTable.resize(newCapacity);
+		m_next.resize(newCapacity);
+
+		int i;
+
+		for (i = 0; i < newCapacity; ++i)
+		{
+			m_hashTable[i] = B3_NULL_PAIR;
+		}
+		for (i = 0; i < newCapacity; ++i)
+		{
+			m_next[i] = B3_NULL_PAIR;
+		}
+
+		for (i = 0; i < curHashtableSize; i++)
+		{
+			const b3BroadphasePair& pair = m_overlappingPairArray[i];
+			int proxyId1 = pair.x;
+			int proxyId2 = pair.y;
+			/*if (proxyId1 > proxyId2) 
+				b3Swap(proxyId1, proxyId2);*/
+			int hashValue = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));  // New hash value with new mask
+			m_next[i] = m_hashTable[hashValue];
+			m_hashTable[hashValue] = i;
+		}
+	}
+}
+
+b3BroadphasePair* b3HashedOverlappingPairCache::internalAddPair(int proxy0, int proxy1)
+{
+	if (proxy0 > proxy1)
+		b3Swap(proxy0, proxy1);
+	int proxyId1 = proxy0;
+	int proxyId2 = proxy1;
+
+	/*if (proxyId1 > proxyId2) 
+		b3Swap(proxyId1, proxyId2);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));  // New hash value with new mask
+
+	b3BroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
+	if (pair != NULL)
+	{
+		return pair;
+	}
+	/*for(int i=0;i<m_overlappingPairArray.size();++i)
+		{
+		if(	(m_overlappingPairArray[i].m_pProxy0==proxy0)&&
+			(m_overlappingPairArray[i].m_pProxy1==proxy1))
+			{
+			printf("Adding duplicated %u<>%u\r\n",proxyId1,proxyId2);
+			internalFindPair(proxy0, proxy1, hash);
+			}
+		}*/
+	int count = m_overlappingPairArray.size();
+	int oldCapacity = m_overlappingPairArray.capacity();
+	pair = &m_overlappingPairArray.expandNonInitializing();
+
+	//this is where we add an actual pair, so also call the 'ghost'
+	//	if (m_ghostPairCallback)
+	//		m_ghostPairCallback->addOverlappingPair(proxy0,proxy1);
+
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (oldCapacity < newCapacity)
+	{
+		growTables();
+		//hash with new capacity
+		hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));
+	}
+
+	*pair = b3MakeBroadphasePair(proxy0, proxy1);
+
+	//	pair->m_pProxy0 = proxy0;
+	//	pair->m_pProxy1 = proxy1;
+	//pair->m_algorithm = 0;
+	//pair->m_internalTmpValue = 0;
+
+	m_next[count] = m_hashTable[hash];
+	m_hashTable[hash] = count;
+
+	return pair;
+}
+
+void* b3HashedOverlappingPairCache::removeOverlappingPair(int proxy0, int proxy1, b3Dispatcher* dispatcher)
+{
+	b3g_removePairs++;
+	if (proxy0 > proxy1)
+		b3Swap(proxy0, proxy1);
+	int proxyId1 = proxy0;
+	int proxyId2 = proxy1;
+
+	/*if (proxyId1 > proxyId2) 
+		b3Swap(proxyId1, proxyId2);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));
+
+	b3BroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
+	if (pair == NULL)
+	{
+		return 0;
+	}
+
+	cleanOverlappingPair(*pair, dispatcher);
+
+	int pairIndex = int(pair - &m_overlappingPairArray[0]);
+	b3Assert(pairIndex < m_overlappingPairArray.size());
+
+	// Remove the pair from the hash table.
+	int index = m_hashTable[hash];
+	b3Assert(index != B3_NULL_PAIR);
+
+	int previous = B3_NULL_PAIR;
+	while (index != pairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != B3_NULL_PAIR)
+	{
+		b3Assert(m_next[previous] == pairIndex);
+		m_next[previous] = m_next[pairIndex];
+	}
+	else
+	{
+		m_hashTable[hash] = m_next[pairIndex];
+	}
+
+	// We now move the last pair into spot of the
+	// pair being removed. We need to fix the hash
+	// table indices to support the move.
+
+	int lastPairIndex = m_overlappingPairArray.size() - 1;
+
+	//if (m_ghostPairCallback)
+	//	m_ghostPairCallback->removeOverlappingPair(proxy0, proxy1,dispatcher);
+
+	// If the removed pair is the last pair, we are done.
+	if (lastPairIndex == pairIndex)
+	{
+		m_overlappingPairArray.pop_back();
+		return 0;
+	}
+
+	// Remove the last pair from the hash table.
+	const b3BroadphasePair* last = &m_overlappingPairArray[lastPairIndex];
+	/* missing swap here too, Nat. */
+	int lastHash = static_cast<int>(getHash(static_cast<unsigned int>(last->x), static_cast<unsigned int>(last->y)) & (m_overlappingPairArray.capacity() - 1));
+
+	index = m_hashTable[lastHash];
+	b3Assert(index != B3_NULL_PAIR);
+
+	previous = B3_NULL_PAIR;
+	while (index != lastPairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != B3_NULL_PAIR)
+	{
+		b3Assert(m_next[previous] == lastPairIndex);
+		m_next[previous] = m_next[lastPairIndex];
+	}
+	else
+	{
+		m_hashTable[lastHash] = m_next[lastPairIndex];
+	}
+
+	// Copy the last pair into the remove pair's spot.
+	m_overlappingPairArray[pairIndex] = m_overlappingPairArray[lastPairIndex];
+
+	// Insert the last pair into the hash table
+	m_next[pairIndex] = m_hashTable[lastHash];
+	m_hashTable[lastHash] = pairIndex;
+
+	m_overlappingPairArray.pop_back();
+
+	return 0;
+}
+//#include <stdio.h>
+
+void b3HashedOverlappingPairCache::processAllOverlappingPairs(b3OverlapCallback* callback, b3Dispatcher* dispatcher)
+{
+	int i;
+
+	//	printf("m_overlappingPairArray.size()=%d\n",m_overlappingPairArray.size());
+	for (i = 0; i < m_overlappingPairArray.size();)
+	{
+		b3BroadphasePair* pair = &m_overlappingPairArray[i];
+		if (callback->processOverlap(*pair))
+		{
+			removeOverlappingPair(pair->x, pair->y, dispatcher);
+
+			b3g_overlappingPairs--;
+		}
+		else
+		{
+			i++;
+		}
+	}
+}
+
+void b3HashedOverlappingPairCache::sortOverlappingPairs(b3Dispatcher* dispatcher)
+{
+	///need to keep hashmap in sync with pair address, so rebuild all
+	b3BroadphasePairArray tmpPairs;
+	int i;
+	for (i = 0; i < m_overlappingPairArray.size(); i++)
+	{
+		tmpPairs.push_back(m_overlappingPairArray[i]);
+	}
+
+	for (i = 0; i < tmpPairs.size(); i++)
+	{
+		removeOverlappingPair(tmpPairs[i].x, tmpPairs[i].y, dispatcher);
+	}
+
+	for (i = 0; i < m_next.size(); i++)
+	{
+		m_next[i] = B3_NULL_PAIR;
+	}
+
+	tmpPairs.quickSort(b3BroadphasePairSortPredicate());
+
+	for (i = 0; i < tmpPairs.size(); i++)
+	{
+		addOverlappingPair(tmpPairs[i].x, tmpPairs[i].y);
+	}
+}
+
+void* b3SortedOverlappingPairCache::removeOverlappingPair(int proxy0, int proxy1, b3Dispatcher* dispatcher)
+{
+	if (!hasDeferredRemoval())
+	{
+		b3BroadphasePair findPair = b3MakeBroadphasePair(proxy0, proxy1);
+
+		int findIndex = m_overlappingPairArray.findLinearSearch(findPair);
+		if (findIndex < m_overlappingPairArray.size())
+		{
+			b3g_overlappingPairs--;
+			b3BroadphasePair& pair = m_overlappingPairArray[findIndex];
+
+			cleanOverlappingPair(pair, dispatcher);
+			//if (m_ghostPairCallback)
+			//	m_ghostPairCallback->removeOverlappingPair(proxy0, proxy1,dispatcher);
+
+			m_overlappingPairArray.swap(findIndex, m_overlappingPairArray.capacity() - 1);
+			m_overlappingPairArray.pop_back();
+			return 0;
+		}
+	}
+
+	return 0;
+}
+
+b3BroadphasePair* b3SortedOverlappingPairCache::addOverlappingPair(int proxy0, int proxy1)
+{
+	//don't add overlap with own
+	b3Assert(proxy0 != proxy1);
+
+	if (!needsBroadphaseCollision(proxy0, proxy1))
+		return 0;
+
+	b3BroadphasePair* pair = &m_overlappingPairArray.expandNonInitializing();
+	*pair = b3MakeBroadphasePair(proxy0, proxy1);
+
+	b3g_overlappingPairs++;
+	b3g_addedPairs++;
+
+	//	if (m_ghostPairCallback)
+	//		m_ghostPairCallback->addOverlappingPair(proxy0, proxy1);
+	return pair;
+}
+
+///this findPair becomes really slow. Either sort the list to speedup the query, or
+///use a different solution. It is mainly used for Removing overlapping pairs. Removal could be delayed.
+///we could keep a linked list in each proxy, and store pair in one of the proxies (with lowest memory address)
+///Also we can use a 2D bitmap, which can be useful for a future GPU implementation
+b3BroadphasePair* b3SortedOverlappingPairCache::findPair(int proxy0, int proxy1)
+{
+	if (!needsBroadphaseCollision(proxy0, proxy1))
+		return 0;
+
+	b3BroadphasePair tmpPair = b3MakeBroadphasePair(proxy0, proxy1);
+	int findIndex = m_overlappingPairArray.findLinearSearch(tmpPair);
+
+	if (findIndex < m_overlappingPairArray.size())
+	{
+		//b3Assert(it != m_overlappingPairSet.end());
+		b3BroadphasePair* pair = &m_overlappingPairArray[findIndex];
+		return pair;
+	}
+	return 0;
+}
+
+//#include <stdio.h>
+
+void b3SortedOverlappingPairCache::processAllOverlappingPairs(b3OverlapCallback* callback, b3Dispatcher* dispatcher)
+{
+	int i;
+
+	for (i = 0; i < m_overlappingPairArray.size();)
+	{
+		b3BroadphasePair* pair = &m_overlappingPairArray[i];
+		if (callback->processOverlap(*pair))
+		{
+			cleanOverlappingPair(*pair, dispatcher);
+			pair->x = -1;
+			pair->y = -1;
+			m_overlappingPairArray.swap(i, m_overlappingPairArray.size() - 1);
+			m_overlappingPairArray.pop_back();
+			b3g_overlappingPairs--;
+		}
+		else
+		{
+			i++;
+		}
+	}
+}
+
+b3SortedOverlappingPairCache::b3SortedOverlappingPairCache() : m_blockedForChanges(false),
+															   m_hasDeferredRemoval(true),
+															   m_overlapFilterCallback(0)
+
+{
+	int initialAllocatedSize = 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+}
+
+b3SortedOverlappingPairCache::~b3SortedOverlappingPairCache()
+{
+}
+
+void b3SortedOverlappingPairCache::cleanOverlappingPair(b3BroadphasePair& pair, b3Dispatcher* dispatcher)
+{
+	/*	if (pair.m_algorithm)
+	{
+		{
+			pair.m_algorithm->~b3CollisionAlgorithm();
+			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
+			pair.m_algorithm=0;
+			b3g_removePairs--;
+		}
+	}
+	*/
+}
+
+void b3SortedOverlappingPairCache::cleanProxyFromPairs(int proxy, b3Dispatcher* dispatcher)
+{
+	class CleanPairCallback : public b3OverlapCallback
+	{
+		int m_cleanProxy;
+		b3OverlappingPairCache* m_pairCache;
+		b3Dispatcher* m_dispatcher;
+
+	public:
+		CleanPairCallback(int cleanProxy, b3OverlappingPairCache* pairCache, b3Dispatcher* dispatcher)
+			: m_cleanProxy(cleanProxy),
+			  m_pairCache(pairCache),
+			  m_dispatcher(dispatcher)
+		{
+		}
+		virtual bool processOverlap(b3BroadphasePair& pair)
+		{
+			if ((pair.x == m_cleanProxy) ||
+				(pair.y == m_cleanProxy))
+			{
+				m_pairCache->cleanOverlappingPair(pair, m_dispatcher);
+			}
+			return false;
+		}
+	};
+
+	CleanPairCallback cleanPairs(proxy, this, dispatcher);
+
+	processAllOverlappingPairs(&cleanPairs, dispatcher);
+}
+
+void b3SortedOverlappingPairCache::removeOverlappingPairsContainingProxy(int proxy, b3Dispatcher* dispatcher)
+{
+	class RemovePairCallback : public b3OverlapCallback
+	{
+		int m_obsoleteProxy;
+
+	public:
+		RemovePairCallback(int obsoleteProxy)
+			: m_obsoleteProxy(obsoleteProxy)
+		{
+		}
+		virtual bool processOverlap(b3BroadphasePair& pair)
+		{
+			return ((pair.x == m_obsoleteProxy) ||
+					(pair.y == m_obsoleteProxy));
+		}
+	};
+
+	RemovePairCallback removeCallback(proxy);
+
+	processAllOverlappingPairs(&removeCallback, dispatcher);
+}
+
+void b3SortedOverlappingPairCache::sortOverlappingPairs(b3Dispatcher* dispatcher)
+{
+	//should already be sorted
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h
new file mode 100644
index 0000000..f1de1d9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3OverlappingPairCache.h
@@ -0,0 +1,427 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_OVERLAPPING_PAIR_CACHE_H
+#define B3_OVERLAPPING_PAIR_CACHE_H
+
+#include "Bullet3Common/shared/b3Int2.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+class b3Dispatcher;
+#include "b3OverlappingPair.h"
+
+typedef b3AlignedObjectArray<b3BroadphasePair> b3BroadphasePairArray;
+
+struct b3OverlapCallback
+{
+	virtual ~b3OverlapCallback()
+	{
+	}
+	//return true for deletion of the pair
+	virtual bool processOverlap(b3BroadphasePair& pair) = 0;
+};
+
+struct b3OverlapFilterCallback
+{
+	virtual ~b3OverlapFilterCallback()
+	{
+	}
+	// return true when pairs need collision
+	virtual bool needBroadphaseCollision(int proxy0, int proxy1) const = 0;
+};
+
+extern int b3g_removePairs;
+extern int b3g_addedPairs;
+extern int b3g_findPairs;
+
+const int B3_NULL_PAIR = 0xffffffff;
+
+///The b3OverlappingPairCache provides an interface for overlapping pair management (add, remove, storage), used by the b3BroadphaseInterface broadphases.
+///The b3HashedOverlappingPairCache and b3SortedOverlappingPairCache classes are two implementations.
+class b3OverlappingPairCache
+{
+public:
+	virtual ~b3OverlappingPairCache() {}  // this is needed so we can get to the derived class destructor
+
+	virtual b3BroadphasePair* getOverlappingPairArrayPtr() = 0;
+
+	virtual const b3BroadphasePair* getOverlappingPairArrayPtr() const = 0;
+
+	virtual b3BroadphasePairArray& getOverlappingPairArray() = 0;
+
+	virtual void cleanOverlappingPair(b3BroadphasePair& pair, b3Dispatcher* dispatcher) = 0;
+
+	virtual int getNumOverlappingPairs() const = 0;
+
+	virtual void cleanProxyFromPairs(int proxy, b3Dispatcher* dispatcher) = 0;
+
+	virtual void setOverlapFilterCallback(b3OverlapFilterCallback* callback) = 0;
+
+	virtual void processAllOverlappingPairs(b3OverlapCallback*, b3Dispatcher* dispatcher) = 0;
+
+	virtual b3BroadphasePair* findPair(int proxy0, int proxy1) = 0;
+
+	virtual bool hasDeferredRemoval() = 0;
+
+	//virtual	void	setInternalGhostPairCallback(b3OverlappingPairCallback* ghostPairCallback)=0;
+
+	virtual b3BroadphasePair* addOverlappingPair(int proxy0, int proxy1) = 0;
+	virtual void* removeOverlappingPair(int proxy0, int proxy1, b3Dispatcher* dispatcher) = 0;
+	virtual void removeOverlappingPairsContainingProxy(int /*proxy0*/, b3Dispatcher* /*dispatcher*/) = 0;
+
+	virtual void sortOverlappingPairs(b3Dispatcher* dispatcher) = 0;
+};
+
+/// Hash-space based Pair Cache, thanks to Erin Catto, Box2D, http://www.box2d.org, and Pierre Terdiman, Codercorner, http://codercorner.com
+class b3HashedOverlappingPairCache : public b3OverlappingPairCache
+{
+	b3BroadphasePairArray m_overlappingPairArray;
+	b3OverlapFilterCallback* m_overlapFilterCallback;
+	//	bool		m_blockedForChanges;
+
+public:
+	b3HashedOverlappingPairCache();
+	virtual ~b3HashedOverlappingPairCache();
+
+	virtual void removeOverlappingPairsContainingProxy(int proxy, b3Dispatcher* dispatcher);
+
+	virtual void* removeOverlappingPair(int proxy0, int proxy1, b3Dispatcher* dispatcher);
+
+	B3_FORCE_INLINE bool needsBroadphaseCollision(int proxy0, int proxy1) const
+	{
+		if (m_overlapFilterCallback)
+			return m_overlapFilterCallback->needBroadphaseCollision(proxy0, proxy1);
+
+		bool collides = true;  //(proxy0->m_collisionFilterGroup & proxy1->m_collisionFilterMask) != 0;
+		//collides = collides && (proxy1->m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+
+		return collides;
+	}
+
+	// Add a pair and return the new pair. If the pair already exists,
+	// no new pair is created and the old one is returned.
+	virtual b3BroadphasePair* addOverlappingPair(int proxy0, int proxy1)
+	{
+		b3g_addedPairs++;
+
+		if (!needsBroadphaseCollision(proxy0, proxy1))
+			return 0;
+
+		return internalAddPair(proxy0, proxy1);
+	}
+
+	void cleanProxyFromPairs(int proxy, b3Dispatcher* dispatcher);
+
+	virtual void processAllOverlappingPairs(b3OverlapCallback*, b3Dispatcher* dispatcher);
+
+	virtual b3BroadphasePair* getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	const b3BroadphasePair* getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	b3BroadphasePairArray& getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	const b3BroadphasePairArray& getOverlappingPairArray() const
+	{
+		return m_overlappingPairArray;
+	}
+
+	void cleanOverlappingPair(b3BroadphasePair& pair, b3Dispatcher* dispatcher);
+
+	b3BroadphasePair* findPair(int proxy0, int proxy1);
+
+	int GetCount() const { return m_overlappingPairArray.size(); }
+	//	b3BroadphasePair* GetPairs() { return m_pairs; }
+
+	b3OverlapFilterCallback* getOverlapFilterCallback()
+	{
+		return m_overlapFilterCallback;
+	}
+
+	void setOverlapFilterCallback(b3OverlapFilterCallback* callback)
+	{
+		m_overlapFilterCallback = callback;
+	}
+
+	int getNumOverlappingPairs() const
+	{
+		return m_overlappingPairArray.size();
+	}
+
+private:
+	b3BroadphasePair* internalAddPair(int proxy0, int proxy1);
+
+	void growTables();
+
+	B3_FORCE_INLINE bool equalsPair(const b3BroadphasePair& pair, int proxyId1, int proxyId2)
+	{
+		return pair.x == proxyId1 && pair.y == proxyId2;
+	}
+
+	/*
+	// Thomas Wang's hash, see: http://www.concentric.net/~Ttwang/tech/inthash.htm
+	// This assumes proxyId1 and proxyId2 are 16-bit.
+	B3_FORCE_INLINE int getHash(int proxyId1, int proxyId2)
+	{
+		int key = (proxyId2 << 16) | proxyId1;
+		key = ~key + (key << 15);
+		key = key ^ (key >> 12);
+		key = key + (key << 2);
+		key = key ^ (key >> 4);
+		key = key * 2057;
+		key = key ^ (key >> 16);
+		return key;
+	}
+	*/
+
+	B3_FORCE_INLINE unsigned int getHash(unsigned int proxyId1, unsigned int proxyId2)
+	{
+		int key = static_cast<int>(((unsigned int)proxyId1) | (((unsigned int)proxyId2) << 16));
+		// Thomas Wang's hash
+
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return static_cast<unsigned int>(key);
+	}
+
+	B3_FORCE_INLINE b3BroadphasePair* internalFindPair(int proxy0, int proxy1, int hash)
+	{
+		int proxyId1 = proxy0;
+		int proxyId2 = proxy1;
+#if 0  // wrong, 'equalsPair' use unsorted uids, copy-past devil striked again. Nat.
+		if (proxyId1 > proxyId2) 
+			b3Swap(proxyId1, proxyId2);
+#endif
+
+		int index = m_hashTable[hash];
+
+		while (index != B3_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
+		{
+			index = m_next[index];
+		}
+
+		if (index == B3_NULL_PAIR)
+		{
+			return NULL;
+		}
+
+		b3Assert(index < m_overlappingPairArray.size());
+
+		return &m_overlappingPairArray[index];
+	}
+
+	virtual bool hasDeferredRemoval()
+	{
+		return false;
+	}
+
+	/*	virtual	void	setInternalGhostPairCallback(b3OverlappingPairCallback* ghostPairCallback)
+	{
+		m_ghostPairCallback = ghostPairCallback;
+	}
+	*/
+
+	virtual void sortOverlappingPairs(b3Dispatcher* dispatcher);
+
+protected:
+	b3AlignedObjectArray<int> m_hashTable;
+	b3AlignedObjectArray<int> m_next;
+	//	b3OverlappingPairCallback*	m_ghostPairCallback;
+};
+
+///b3SortedOverlappingPairCache maintains the objects with overlapping AABB
+///Typically managed by the Broadphase, Axis3Sweep or b3SimpleBroadphase
+class b3SortedOverlappingPairCache : public b3OverlappingPairCache
+{
+protected:
+	//avoid brute-force finding all the time
+	b3BroadphasePairArray m_overlappingPairArray;
+
+	//during the dispatch, check that user doesn't destroy/create proxy
+	bool m_blockedForChanges;
+
+	///by default, do the removal during the pair traversal
+	bool m_hasDeferredRemoval;
+
+	//if set, use the callback instead of the built in filter in needBroadphaseCollision
+	b3OverlapFilterCallback* m_overlapFilterCallback;
+
+	//		b3OverlappingPairCallback*	m_ghostPairCallback;
+
+public:
+	b3SortedOverlappingPairCache();
+	virtual ~b3SortedOverlappingPairCache();
+
+	virtual void processAllOverlappingPairs(b3OverlapCallback*, b3Dispatcher* dispatcher);
+
+	void* removeOverlappingPair(int proxy0, int proxy1, b3Dispatcher* dispatcher);
+
+	void cleanOverlappingPair(b3BroadphasePair& pair, b3Dispatcher* dispatcher);
+
+	b3BroadphasePair* addOverlappingPair(int proxy0, int proxy1);
+
+	b3BroadphasePair* findPair(int proxy0, int proxy1);
+
+	void cleanProxyFromPairs(int proxy, b3Dispatcher* dispatcher);
+
+	virtual void removeOverlappingPairsContainingProxy(int proxy, b3Dispatcher* dispatcher);
+
+	inline bool needsBroadphaseCollision(int proxy0, int proxy1) const
+	{
+		if (m_overlapFilterCallback)
+			return m_overlapFilterCallback->needBroadphaseCollision(proxy0, proxy1);
+
+		bool collides = true;  //(proxy0->m_collisionFilterGroup & proxy1->m_collisionFilterMask) != 0;
+		//collides = collides && (proxy1->m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+
+		return collides;
+	}
+
+	b3BroadphasePairArray& getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	const b3BroadphasePairArray& getOverlappingPairArray() const
+	{
+		return m_overlappingPairArray;
+	}
+
+	b3BroadphasePair* getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	const b3BroadphasePair* getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	int getNumOverlappingPairs() const
+	{
+		return m_overlappingPairArray.size();
+	}
+
+	b3OverlapFilterCallback* getOverlapFilterCallback()
+	{
+		return m_overlapFilterCallback;
+	}
+
+	void setOverlapFilterCallback(b3OverlapFilterCallback* callback)
+	{
+		m_overlapFilterCallback = callback;
+	}
+
+	virtual bool hasDeferredRemoval()
+	{
+		return m_hasDeferredRemoval;
+	}
+
+	/*		virtual	void	setInternalGhostPairCallback(b3OverlappingPairCallback* ghostPairCallback)
+		{
+			m_ghostPairCallback = ghostPairCallback;
+		}
+		*/
+	virtual void sortOverlappingPairs(b3Dispatcher* dispatcher);
+};
+
+///b3NullPairCache skips add/removal of overlapping pairs. Userful for benchmarking and unit testing.
+class b3NullPairCache : public b3OverlappingPairCache
+{
+	b3BroadphasePairArray m_overlappingPairArray;
+
+public:
+	virtual b3BroadphasePair* getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+	const b3BroadphasePair* getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+	b3BroadphasePairArray& getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	virtual void cleanOverlappingPair(b3BroadphasePair& /*pair*/, b3Dispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual int getNumOverlappingPairs() const
+	{
+		return 0;
+	}
+
+	virtual void cleanProxyFromPairs(int /*proxy*/, b3Dispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual void setOverlapFilterCallback(b3OverlapFilterCallback* /*callback*/)
+	{
+	}
+
+	virtual void processAllOverlappingPairs(b3OverlapCallback*, b3Dispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual b3BroadphasePair* findPair(int /*proxy0*/, int /*proxy1*/)
+	{
+		return 0;
+	}
+
+	virtual bool hasDeferredRemoval()
+	{
+		return true;
+	}
+
+	//	virtual	void	setInternalGhostPairCallback(b3OverlappingPairCallback* /* ghostPairCallback */)
+	//	{
+	//
+	//	}
+
+	virtual b3BroadphasePair* addOverlappingPair(int /*proxy0*/, int /*proxy1*/)
+	{
+		return 0;
+	}
+
+	virtual void* removeOverlappingPair(int /*proxy0*/, int /*proxy1*/, b3Dispatcher* /*dispatcher*/)
+	{
+		return 0;
+	}
+
+	virtual void removeOverlappingPairsContainingProxy(int /*proxy0*/, b3Dispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual void sortOverlappingPairs(b3Dispatcher* dispatcher)
+	{
+		(void)dispatcher;
+	}
+};
+
+#endif  //B3_OVERLAPPING_PAIR_CACHE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h
new file mode 100644
index 0000000..343a2c0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h
@@ -0,0 +1,56 @@
+
+#ifndef B3_AABB_H
+#define B3_AABB_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+#include "Bullet3Common/shared/b3Mat3x3.h"
+
+typedef struct b3Aabb b3Aabb_t;
+
+struct b3Aabb
+{
+	union {
+		float m_min[4];
+		b3Float4 m_minVec;
+		int m_minIndices[4];
+	};
+	union {
+		float m_max[4];
+		b3Float4 m_maxVec;
+		int m_signedMaxIndices[4];
+	};
+};
+
+inline void b3TransformAabb2(b3Float4ConstArg localAabbMin, b3Float4ConstArg localAabbMax, float margin,
+							 b3Float4ConstArg pos,
+							 b3QuatConstArg orn,
+							 b3Float4* aabbMinOut, b3Float4* aabbMaxOut)
+{
+	b3Float4 localHalfExtents = 0.5f * (localAabbMax - localAabbMin);
+	localHalfExtents += b3MakeFloat4(margin, margin, margin, 0.f);
+	b3Float4 localCenter = 0.5f * (localAabbMax + localAabbMin);
+	b3Mat3x3 m;
+	m = b3QuatGetRotationMatrix(orn);
+	b3Mat3x3 abs_b = b3AbsoluteMat3x3(m);
+	b3Float4 center = b3TransformPoint(localCenter, pos, orn);
+
+	b3Float4 extent = b3MakeFloat4(b3Dot3F4(localHalfExtents, b3GetRow(abs_b, 0)),
+								   b3Dot3F4(localHalfExtents, b3GetRow(abs_b, 1)),
+								   b3Dot3F4(localHalfExtents, b3GetRow(abs_b, 2)),
+								   0.f);
+	*aabbMinOut = center - extent;
+	*aabbMaxOut = center + extent;
+}
+
+/// conservative test for overlap between two aabbs
+inline bool b3TestAabbAgainstAabb(b3Float4ConstArg aabbMin1, b3Float4ConstArg aabbMax1,
+								  b3Float4ConstArg aabbMin2, b3Float4ConstArg aabbMax2)
+{
+	bool overlap = true;
+	overlap = (aabbMin1.x > aabbMax2.x || aabbMax1.x < aabbMin2.x) ? false : overlap;
+	overlap = (aabbMin1.z > aabbMax2.z || aabbMax1.z < aabbMin2.z) ? false : overlap;
+	overlap = (aabbMin1.y > aabbMax2.y || aabbMax1.y < aabbMin2.y) ? false : overlap;
+	return overlap;
+}
+
+#endif  //B3_AABB_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/CMakeLists.txt b/dali-physics/third-party/bullet3/src/Bullet3Collision/CMakeLists.txt
new file mode 100644
index 0000000..130095c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/CMakeLists.txt
@@ -0,0 +1,93 @@
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+)
+
+SET(Bullet3Collision_SRCS
+	BroadPhaseCollision/b3DynamicBvh.cpp
+	BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
+	BroadPhaseCollision/b3OverlappingPairCache.cpp
+	NarrowPhaseCollision/b3ConvexUtility.cpp
+	NarrowPhaseCollision/b3CpuNarrowPhase.cpp
+)
+
+SET(Bullet3CollisionBroadPhase_HDRS
+	BroadPhaseCollision/b3BroadphaseCallback.h
+	BroadPhaseCollision/b3DynamicBvh.h
+	BroadPhaseCollision/b3DynamicBvhBroadphase.h
+	BroadPhaseCollision/b3OverlappingPair.h
+	BroadPhaseCollision/b3OverlappingPairCache.h
+)
+SET(Bullet3CollisionBroadPhaseShared_HDRS
+	BroadPhaseCollision/shared/b3Aabb.h
+)
+
+SET(Bullet3CollisionNarrowPhase_HDRS
+	NarrowPhaseCollision/b3Config.h
+	NarrowPhaseCollision/b3Contact4.h
+	NarrowPhaseCollision/b3ConvexUtility.h
+	NarrowPhaseCollision/b3CpuNarrowPhase.h
+	NarrowPhaseCollision/b3RaycastInfo.h
+	NarrowPhaseCollision/b3RigidBodyCL.h
+)
+SET(Bullet3CollisionNarrowPhaseShared_HDRS
+
+	NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h
+	NarrowPhaseCollision/shared/b3BvhTraversal.h
+	NarrowPhaseCollision/shared/b3ClipFaces.h
+	NarrowPhaseCollision/shared/b3Collidable.h
+	NarrowPhaseCollision/shared/b3Contact4Data.h
+	NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h
+	NarrowPhaseCollision/shared/b3ContactSphereSphere.h
+	NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h
+	NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h
+	NarrowPhaseCollision/shared/b3FindSeparatingAxis.h
+	NarrowPhaseCollision/shared/b3MprPenetration.h
+	NarrowPhaseCollision/shared/b3NewContactReduction.h
+	NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h
+	NarrowPhaseCollision/shared/b3ReduceContacts.h
+	NarrowPhaseCollision/shared/b3RigidBodyData.h
+	NarrowPhaseCollision/shared/b3UpdateAabbs.h
+)
+
+SET(Bullet3Collision_HDRS
+	${Bullet3CollisionBroadPhase_HDRS}
+	${Bullet3CollisionBroadPhaseShared_HDRS}
+	${Bullet3CollisionNarrowPhaseShared_HDRS}
+	${Bullet3CollisionNarrowPhase_HDRS}
+)
+
+ADD_LIBRARY(Bullet3Collision ${Bullet3Collision_SRCS} ${Bullet3Collision_HDRS})
+if (BUILD_SHARED_LIBS)
+  target_link_libraries(Bullet3Collision Bullet3Geometry)
+endif ()
+SET_TARGET_PROPERTIES(Bullet3Collision PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(Bullet3Collision PROPERTIES SOVERSION ${BULLET_VERSION})
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#FILES_MATCHING requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Collision DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Collision
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(Bullet3Collision PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(Bullet3Collision PROPERTIES PUBLIC_HEADER "${Bullet3Collision_HDRS}")
+			# Have to list out sub-directories manually:
+			#todo
+			#SET_PROPERTY(SOURCE ${Bullet3CollisionBroadPhase_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadPhaseCollision)
+
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Config.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Config.h
new file mode 100644
index 0000000..518da89
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Config.h
@@ -0,0 +1,39 @@
+#ifndef B3_CONFIG_H
+#define B3_CONFIG_H
+
+struct b3Config
+{
+	int m_maxConvexBodies;
+	int m_maxConvexShapes;
+	int m_maxBroadphasePairs;
+	int m_maxContactCapacity;
+	int m_compoundPairCapacity;
+
+	int m_maxVerticesPerFace;
+	int m_maxFacesPerShape;
+	int m_maxConvexVertices;
+	int m_maxConvexIndices;
+	int m_maxConvexUniqueEdges;
+
+	int m_maxCompoundChildShapes;
+
+	int m_maxTriConvexPairCapacity;
+
+	b3Config()
+		: m_maxConvexBodies(128 * 1024),
+		  m_maxVerticesPerFace(64),
+		  m_maxFacesPerShape(12),
+		  m_maxConvexVertices(8192),
+		  m_maxConvexIndices(81920),
+		  m_maxConvexUniqueEdges(8192),
+		  m_maxCompoundChildShapes(8192),
+		  m_maxTriConvexPairCapacity(256 * 1024)
+	{
+		m_maxConvexShapes = m_maxConvexBodies;
+		m_maxBroadphasePairs = 16 * m_maxConvexBodies;
+		m_maxContactCapacity = m_maxBroadphasePairs;
+		m_compoundPairCapacity = 1024 * 1024;
+	}
+};
+
+#endif  //B3_CONFIG_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h
new file mode 100644
index 0000000..c2cd3c7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3Contact4.h
@@ -0,0 +1,55 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_CONTACT4_H
+#define B3_CONTACT4_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3Contact4 : public b3Contact4Data
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	int getBodyA() const { return abs(m_bodyAPtrAndSignBit); }
+	int getBodyB() const { return abs(m_bodyBPtrAndSignBit); }
+	bool isBodyAFixed() const { return m_bodyAPtrAndSignBit < 0; }
+	bool isBodyBFixed() const { return m_bodyBPtrAndSignBit < 0; }
+	//	todo. make it safer
+	int& getBatchIdx() { return m_batchIdx; }
+	const int& getBatchIdx() const { return m_batchIdx; }
+	float getRestituitionCoeff() const { return ((float)m_restituitionCoeffCmp / (float)0xffff); }
+	void setRestituitionCoeff(float c)
+	{
+		b3Assert(c >= 0.f && c <= 1.f);
+		m_restituitionCoeffCmp = (unsigned short)(c * 0xffff);
+	}
+	float getFrictionCoeff() const { return ((float)m_frictionCoeffCmp / (float)0xffff); }
+	void setFrictionCoeff(float c)
+	{
+		b3Assert(c >= 0.f && c <= 1.f);
+		m_frictionCoeffCmp = (unsigned short)(c * 0xffff);
+	}
+
+	//float& getNPoints() { return m_worldNormal[3]; }
+	int getNPoints() const { return (int)m_worldNormalOnB.w; }
+
+	float getPenetration(int idx) const { return m_worldPosB[idx].w; }
+
+	bool isInvalid() const { return (getBodyA() == 0 || getBodyB() == 0); }
+};
+
+#endif  //B3_CONTACT4_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.cpp b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.cpp
new file mode 100644
index 0000000..a5dab74
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.cpp
@@ -0,0 +1,500 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#include "b3ConvexUtility.h"
+#include "Bullet3Geometry/b3ConvexHullComputer.h"
+#include "Bullet3Geometry/b3GrahamScan2dConvexHull.h"
+#include "Bullet3Common/b3Quaternion.h"
+#include "Bullet3Common/b3HashMap.h"
+
+b3ConvexUtility::~b3ConvexUtility()
+{
+}
+
+bool b3ConvexUtility::initializePolyhedralFeatures(const b3Vector3* orgVertices, int numPoints, bool mergeCoplanarTriangles)
+{
+	b3ConvexHullComputer conv;
+	conv.compute(&orgVertices[0].getX(), sizeof(b3Vector3), numPoints, 0.f, 0.f);
+
+	b3AlignedObjectArray<b3Vector3> faceNormals;
+	int numFaces = conv.faces.size();
+	faceNormals.resize(numFaces);
+	b3ConvexHullComputer* convexUtil = &conv;
+
+	b3AlignedObjectArray<b3MyFace> tmpFaces;
+	tmpFaces.resize(numFaces);
+
+	int numVertices = convexUtil->vertices.size();
+	m_vertices.resize(numVertices);
+	for (int p = 0; p < numVertices; p++)
+	{
+		m_vertices[p] = convexUtil->vertices[p];
+	}
+
+	for (int i = 0; i < numFaces; i++)
+	{
+		int face = convexUtil->faces[i];
+		//printf("face=%d\n",face);
+		const b3ConvexHullComputer::Edge* firstEdge = &convexUtil->edges[face];
+		const b3ConvexHullComputer::Edge* edge = firstEdge;
+
+		b3Vector3 edges[3];
+		int numEdges = 0;
+		//compute face normals
+
+		do
+		{
+			int src = edge->getSourceVertex();
+			tmpFaces[i].m_indices.push_back(src);
+			int targ = edge->getTargetVertex();
+			b3Vector3 wa = convexUtil->vertices[src];
+
+			b3Vector3 wb = convexUtil->vertices[targ];
+			b3Vector3 newEdge = wb - wa;
+			newEdge.normalize();
+			if (numEdges < 2)
+				edges[numEdges++] = newEdge;
+
+			edge = edge->getNextEdgeOfFace();
+		} while (edge != firstEdge);
+
+		b3Scalar planeEq = 1e30f;
+
+		if (numEdges == 2)
+		{
+			faceNormals[i] = edges[0].cross(edges[1]);
+			faceNormals[i].normalize();
+			tmpFaces[i].m_plane[0] = faceNormals[i].getX();
+			tmpFaces[i].m_plane[1] = faceNormals[i].getY();
+			tmpFaces[i].m_plane[2] = faceNormals[i].getZ();
+			tmpFaces[i].m_plane[3] = planeEq;
+		}
+		else
+		{
+			b3Assert(0);  //degenerate?
+			faceNormals[i].setZero();
+		}
+
+		for (int v = 0; v < tmpFaces[i].m_indices.size(); v++)
+		{
+			b3Scalar eq = m_vertices[tmpFaces[i].m_indices[v]].dot(faceNormals[i]);
+			if (planeEq > eq)
+			{
+				planeEq = eq;
+			}
+		}
+		tmpFaces[i].m_plane[3] = -planeEq;
+	}
+
+	//merge coplanar faces and copy them to m_polyhedron
+
+	b3Scalar faceWeldThreshold = 0.999f;
+	b3AlignedObjectArray<int> todoFaces;
+	for (int i = 0; i < tmpFaces.size(); i++)
+		todoFaces.push_back(i);
+
+	while (todoFaces.size())
+	{
+		b3AlignedObjectArray<int> coplanarFaceGroup;
+		int refFace = todoFaces[todoFaces.size() - 1];
+
+		coplanarFaceGroup.push_back(refFace);
+		b3MyFace& faceA = tmpFaces[refFace];
+		todoFaces.pop_back();
+
+		b3Vector3 faceNormalA = b3MakeVector3(faceA.m_plane[0], faceA.m_plane[1], faceA.m_plane[2]);
+		for (int j = todoFaces.size() - 1; j >= 0; j--)
+		{
+			int i = todoFaces[j];
+			b3MyFace& faceB = tmpFaces[i];
+			b3Vector3 faceNormalB = b3MakeVector3(faceB.m_plane[0], faceB.m_plane[1], faceB.m_plane[2]);
+			if (faceNormalA.dot(faceNormalB) > faceWeldThreshold)
+			{
+				coplanarFaceGroup.push_back(i);
+				todoFaces.remove(i);
+			}
+		}
+
+		bool did_merge = false;
+		if (coplanarFaceGroup.size() > 1)
+		{
+			//do the merge: use Graham Scan 2d convex hull
+
+			b3AlignedObjectArray<b3GrahamVector3> orgpoints;
+			b3Vector3 averageFaceNormal = b3MakeVector3(0, 0, 0);
+
+			for (int i = 0; i < coplanarFaceGroup.size(); i++)
+			{
+				//				m_polyhedron->m_faces.push_back(tmpFaces[coplanarFaceGroup[i]]);
+
+				b3MyFace& face = tmpFaces[coplanarFaceGroup[i]];
+				b3Vector3 faceNormal = b3MakeVector3(face.m_plane[0], face.m_plane[1], face.m_plane[2]);
+				averageFaceNormal += faceNormal;
+				for (int f = 0; f < face.m_indices.size(); f++)
+				{
+					int orgIndex = face.m_indices[f];
+					b3Vector3 pt = m_vertices[orgIndex];
+
+					bool found = false;
+
+					for (int i = 0; i < orgpoints.size(); i++)
+					{
+						//if ((orgpoints[i].m_orgIndex == orgIndex) || ((rotatedPt-orgpoints[i]).length2()<0.0001))
+						if (orgpoints[i].m_orgIndex == orgIndex)
+						{
+							found = true;
+							break;
+						}
+					}
+					if (!found)
+						orgpoints.push_back(b3GrahamVector3(pt, orgIndex));
+				}
+			}
+
+			b3MyFace combinedFace;
+			for (int i = 0; i < 4; i++)
+				combinedFace.m_plane[i] = tmpFaces[coplanarFaceGroup[0]].m_plane[i];
+
+			b3AlignedObjectArray<b3GrahamVector3> hull;
+
+			averageFaceNormal.normalize();
+			b3GrahamScanConvexHull2D(orgpoints, hull, averageFaceNormal);
+
+			for (int i = 0; i < hull.size(); i++)
+			{
+				combinedFace.m_indices.push_back(hull[i].m_orgIndex);
+				for (int k = 0; k < orgpoints.size(); k++)
+				{
+					if (orgpoints[k].m_orgIndex == hull[i].m_orgIndex)
+					{
+						orgpoints[k].m_orgIndex = -1;  // invalidate...
+						break;
+					}
+				}
+			}
+
+			// are there rejected vertices?
+			bool reject_merge = false;
+
+			for (int i = 0; i < orgpoints.size(); i++)
+			{
+				if (orgpoints[i].m_orgIndex == -1)
+					continue;  // this is in the hull...
+				// this vertex is rejected -- is anybody else using this vertex?
+				for (int j = 0; j < tmpFaces.size(); j++)
+				{
+					b3MyFace& face = tmpFaces[j];
+					// is this a face of the current coplanar group?
+					bool is_in_current_group = false;
+					for (int k = 0; k < coplanarFaceGroup.size(); k++)
+					{
+						if (coplanarFaceGroup[k] == j)
+						{
+							is_in_current_group = true;
+							break;
+						}
+					}
+					if (is_in_current_group)  // ignore this face...
+						continue;
+					// does this face use this rejected vertex?
+					for (int v = 0; v < face.m_indices.size(); v++)
+					{
+						if (face.m_indices[v] == orgpoints[i].m_orgIndex)
+						{
+							// this rejected vertex is used in another face -- reject merge
+							reject_merge = true;
+							break;
+						}
+					}
+					if (reject_merge)
+						break;
+				}
+				if (reject_merge)
+					break;
+			}
+
+			if (!reject_merge)
+			{
+				// do this merge!
+				did_merge = true;
+				m_faces.push_back(combinedFace);
+			}
+		}
+		if (!did_merge)
+		{
+			for (int i = 0; i < coplanarFaceGroup.size(); i++)
+			{
+				b3MyFace face = tmpFaces[coplanarFaceGroup[i]];
+				m_faces.push_back(face);
+			}
+		}
+	}
+
+	initialize();
+
+	return true;
+}
+
+inline bool IsAlmostZero(const b3Vector3& v)
+{
+	if (fabsf(v.getX()) > 1e-6 || fabsf(v.getY()) > 1e-6 || fabsf(v.getZ()) > 1e-6) return false;
+	return true;
+}
+
+struct b3InternalVertexPair
+{
+	b3InternalVertexPair(short int v0, short int v1)
+		: m_v0(v0),
+		  m_v1(v1)
+	{
+		if (m_v1 > m_v0)
+			b3Swap(m_v0, m_v1);
+	}
+	short int m_v0;
+	short int m_v1;
+	int getHash() const
+	{
+		return m_v0 + (m_v1 << 16);
+	}
+	bool equals(const b3InternalVertexPair& other) const
+	{
+		return m_v0 == other.m_v0 && m_v1 == other.m_v1;
+	}
+};
+
+struct b3InternalEdge
+{
+	b3InternalEdge()
+		: m_face0(-1),
+		  m_face1(-1)
+	{
+	}
+	short int m_face0;
+	short int m_face1;
+};
+
+//
+
+#ifdef TEST_INTERNAL_OBJECTS
+bool b3ConvexUtility::testContainment() const
+{
+	for (int p = 0; p < 8; p++)
+	{
+		b3Vector3 LocalPt;
+		if (p == 0)
+			LocalPt = m_localCenter + b3Vector3(m_extents[0], m_extents[1], m_extents[2]);
+		else if (p == 1)
+			LocalPt = m_localCenter + b3Vector3(m_extents[0], m_extents[1], -m_extents[2]);
+		else if (p == 2)
+			LocalPt = m_localCenter + b3Vector3(m_extents[0], -m_extents[1], m_extents[2]);
+		else if (p == 3)
+			LocalPt = m_localCenter + b3Vector3(m_extents[0], -m_extents[1], -m_extents[2]);
+		else if (p == 4)
+			LocalPt = m_localCenter + b3Vector3(-m_extents[0], m_extents[1], m_extents[2]);
+		else if (p == 5)
+			LocalPt = m_localCenter + b3Vector3(-m_extents[0], m_extents[1], -m_extents[2]);
+		else if (p == 6)
+			LocalPt = m_localCenter + b3Vector3(-m_extents[0], -m_extents[1], m_extents[2]);
+		else if (p == 7)
+			LocalPt = m_localCenter + b3Vector3(-m_extents[0], -m_extents[1], -m_extents[2]);
+
+		for (int i = 0; i < m_faces.size(); i++)
+		{
+			const b3Vector3 Normal(m_faces[i].m_plane[0], m_faces[i].m_plane[1], m_faces[i].m_plane[2]);
+			const b3Scalar d = LocalPt.dot(Normal) + m_faces[i].m_plane[3];
+			if (d > 0.0f)
+				return false;
+		}
+	}
+	return true;
+}
+#endif
+
+void b3ConvexUtility::initialize()
+{
+	b3HashMap<b3InternalVertexPair, b3InternalEdge> edges;
+
+	b3Scalar TotalArea = 0.0f;
+
+	m_localCenter.setValue(0, 0, 0);
+	for (int i = 0; i < m_faces.size(); i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		int NbTris = numVertices;
+		for (int j = 0; j < NbTris; j++)
+		{
+			int k = (j + 1) % numVertices;
+			b3InternalVertexPair vp(m_faces[i].m_indices[j], m_faces[i].m_indices[k]);
+			b3InternalEdge* edptr = edges.find(vp);
+			b3Vector3 edge = m_vertices[vp.m_v1] - m_vertices[vp.m_v0];
+			edge.normalize();
+
+			bool found = false;
+			b3Vector3 diff, diff2;
+
+			for (int p = 0; p < m_uniqueEdges.size(); p++)
+			{
+				diff = m_uniqueEdges[p] - edge;
+				diff2 = m_uniqueEdges[p] + edge;
+
+				//	if ((diff.length2()==0.f) ||
+				//	(diff2.length2()==0.f))
+
+				if (IsAlmostZero(diff) ||
+					IsAlmostZero(diff2))
+				{
+					found = true;
+					break;
+				}
+			}
+
+			if (!found)
+			{
+				m_uniqueEdges.push_back(edge);
+			}
+
+			if (edptr)
+			{
+				//TBD: figure out why I added this assert
+				//				b3Assert(edptr->m_face0>=0);
+				//			b3Assert(edptr->m_face1<0);
+				edptr->m_face1 = i;
+			}
+			else
+			{
+				b3InternalEdge ed;
+				ed.m_face0 = i;
+				edges.insert(vp, ed);
+			}
+		}
+	}
+
+#ifdef USE_CONNECTED_FACES
+	for (int i = 0; i < m_faces.size(); i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		m_faces[i].m_connectedFaces.resize(numVertices);
+
+		for (int j = 0; j < numVertices; j++)
+		{
+			int k = (j + 1) % numVertices;
+			b3InternalVertexPair vp(m_faces[i].m_indices[j], m_faces[i].m_indices[k]);
+			b3InternalEdge* edptr = edges.find(vp);
+			b3Assert(edptr);
+			b3Assert(edptr->m_face0 >= 0);
+			b3Assert(edptr->m_face1 >= 0);
+
+			int connectedFace = (edptr->m_face0 == i) ? edptr->m_face1 : edptr->m_face0;
+			m_faces[i].m_connectedFaces[j] = connectedFace;
+		}
+	}
+#endif  //USE_CONNECTED_FACES
+
+	for (int i = 0; i < m_faces.size(); i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		int NbTris = numVertices - 2;
+
+		const b3Vector3& p0 = m_vertices[m_faces[i].m_indices[0]];
+		for (int j = 1; j <= NbTris; j++)
+		{
+			int k = (j + 1) % numVertices;
+			const b3Vector3& p1 = m_vertices[m_faces[i].m_indices[j]];
+			const b3Vector3& p2 = m_vertices[m_faces[i].m_indices[k]];
+			b3Scalar Area = ((p0 - p1).cross(p0 - p2)).length() * 0.5f;
+			b3Vector3 Center = (p0 + p1 + p2) / 3.0f;
+			m_localCenter += Area * Center;
+			TotalArea += Area;
+		}
+	}
+	m_localCenter /= TotalArea;
+
+#ifdef TEST_INTERNAL_OBJECTS
+	if (1)
+	{
+		m_radius = FLT_MAX;
+		for (int i = 0; i < m_faces.size(); i++)
+		{
+			const b3Vector3 Normal(m_faces[i].m_plane[0], m_faces[i].m_plane[1], m_faces[i].m_plane[2]);
+			const b3Scalar dist = b3Fabs(m_localCenter.dot(Normal) + m_faces[i].m_plane[3]);
+			if (dist < m_radius)
+				m_radius = dist;
+		}
+
+		b3Scalar MinX = FLT_MAX;
+		b3Scalar MinY = FLT_MAX;
+		b3Scalar MinZ = FLT_MAX;
+		b3Scalar MaxX = -FLT_MAX;
+		b3Scalar MaxY = -FLT_MAX;
+		b3Scalar MaxZ = -FLT_MAX;
+		for (int i = 0; i < m_vertices.size(); i++)
+		{
+			const b3Vector3& pt = m_vertices[i];
+			if (pt.getX() < MinX) MinX = pt.getX();
+			if (pt.getX() > MaxX) MaxX = pt.getX();
+			if (pt.getY() < MinY) MinY = pt.getY();
+			if (pt.getY() > MaxY) MaxY = pt.getY();
+			if (pt.getZ() < MinZ) MinZ = pt.getZ();
+			if (pt.getZ() > MaxZ) MaxZ = pt.getZ();
+		}
+		mC.setValue(MaxX + MinX, MaxY + MinY, MaxZ + MinZ);
+		mE.setValue(MaxX - MinX, MaxY - MinY, MaxZ - MinZ);
+
+		//		const b3Scalar r = m_radius / sqrtf(2.0f);
+		const b3Scalar r = m_radius / sqrtf(3.0f);
+		const int LargestExtent = mE.maxAxis();
+		const b3Scalar Step = (mE[LargestExtent] * 0.5f - r) / 1024.0f;
+		m_extents[0] = m_extents[1] = m_extents[2] = r;
+		m_extents[LargestExtent] = mE[LargestExtent] * 0.5f;
+		bool FoundBox = false;
+		for (int j = 0; j < 1024; j++)
+		{
+			if (testContainment())
+			{
+				FoundBox = true;
+				break;
+			}
+
+			m_extents[LargestExtent] -= Step;
+		}
+		if (!FoundBox)
+		{
+			m_extents[0] = m_extents[1] = m_extents[2] = r;
+		}
+		else
+		{
+			// Refine the box
+			const b3Scalar Step = (m_radius - r) / 1024.0f;
+			const int e0 = (1 << LargestExtent) & 3;
+			const int e1 = (1 << e0) & 3;
+
+			for (int j = 0; j < 1024; j++)
+			{
+				const b3Scalar Saved0 = m_extents[e0];
+				const b3Scalar Saved1 = m_extents[e1];
+				m_extents[e0] += Step;
+				m_extents[e1] += Step;
+
+				if (!testContainment())
+				{
+					m_extents[e0] = Saved0;
+					m_extents[e1] = Saved1;
+					break;
+				}
+			}
+		}
+	}
+#endif
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h
new file mode 100644
index 0000000..4c8a88c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h
@@ -0,0 +1,55 @@
+
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#ifndef _BT_CONVEX_UTILITY_H
+#define _BT_CONVEX_UTILITY_H
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Transform.h"
+
+struct b3MyFace
+{
+	b3AlignedObjectArray<int> m_indices;
+	b3Scalar m_plane[4];
+};
+
+B3_ATTRIBUTE_ALIGNED16(class)
+b3ConvexUtility
+{
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3Vector3 m_localCenter;
+	b3Vector3 m_extents;
+	b3Vector3 mC;
+	b3Vector3 mE;
+	b3Scalar m_radius;
+
+	b3AlignedObjectArray<b3Vector3> m_vertices;
+	b3AlignedObjectArray<b3MyFace> m_faces;
+	b3AlignedObjectArray<b3Vector3> m_uniqueEdges;
+
+	b3ConvexUtility()
+	{
+	}
+	virtual ~b3ConvexUtility();
+
+	bool initializePolyhedralFeatures(const b3Vector3* orgVertices, int numVertices, bool mergeCoplanarTriangles = true);
+
+	void initialize();
+	bool testContainment() const;
+};
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.cpp b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.cpp
new file mode 100644
index 0000000..e0b2161
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.cpp
@@ -0,0 +1,297 @@
+#include "b3CpuNarrowPhase.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h"
+
+struct b3CpuNarrowPhaseInternalData
+{
+	b3AlignedObjectArray<b3Aabb> m_localShapeAABBCPU;
+	b3AlignedObjectArray<b3Collidable> m_collidablesCPU;
+	b3AlignedObjectArray<b3ConvexUtility*> m_convexData;
+	b3Config m_config;
+
+	b3AlignedObjectArray<b3ConvexPolyhedronData> m_convexPolyhedra;
+	b3AlignedObjectArray<b3Vector3> m_uniqueEdges;
+	b3AlignedObjectArray<b3Vector3> m_convexVertices;
+	b3AlignedObjectArray<int> m_convexIndices;
+	b3AlignedObjectArray<b3GpuFace> m_convexFaces;
+
+	b3AlignedObjectArray<b3Contact4Data> m_contacts;
+
+	int m_numAcceleratedShapes;
+};
+
+const b3AlignedObjectArray<b3Contact4Data>& b3CpuNarrowPhase::getContacts() const
+{
+	return m_data->m_contacts;
+}
+
+b3Collidable& b3CpuNarrowPhase::getCollidableCpu(int collidableIndex)
+{
+	return m_data->m_collidablesCPU[collidableIndex];
+}
+
+const b3Collidable& b3CpuNarrowPhase::getCollidableCpu(int collidableIndex) const
+{
+	return m_data->m_collidablesCPU[collidableIndex];
+}
+
+b3CpuNarrowPhase::b3CpuNarrowPhase(const struct b3Config& config)
+{
+	m_data = new b3CpuNarrowPhaseInternalData;
+	m_data->m_config = config;
+	m_data->m_numAcceleratedShapes = 0;
+}
+
+b3CpuNarrowPhase::~b3CpuNarrowPhase()
+{
+	delete m_data;
+}
+
+void b3CpuNarrowPhase::computeContacts(b3AlignedObjectArray<b3Int4>& pairs, b3AlignedObjectArray<b3Aabb>& aabbsWorldSpace, b3AlignedObjectArray<b3RigidBodyData>& bodies)
+{
+	int nPairs = pairs.size();
+	int numContacts = 0;
+	int maxContactCapacity = m_data->m_config.m_maxContactCapacity;
+	m_data->m_contacts.resize(maxContactCapacity);
+
+	for (int i = 0; i < nPairs; i++)
+	{
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+		int collidableIndexA = bodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = bodies[bodyIndexB].m_collidableIdx;
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_SPHERE &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+			//			computeContactSphereConvex(i,bodyIndexA,bodyIndexB,collidableIndexA,collidableIndexB,&bodies[0],
+			//				&m_data->m_collidablesCPU[0],&hostConvexData[0],&hostVertices[0],&hostIndices[0],&hostFaces[0],&hostContacts[0],nContacts,maxContactCapacity);
+		}
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_SPHERE)
+		{
+			//			computeContactSphereConvex(i,bodyIndexB,bodyIndexA,collidableIndexB,collidableIndexA,&bodies[0],
+			//				&m_data->m_collidablesCPU[0],&hostConvexData[0],&hostVertices[0],&hostIndices[0],&hostFaces[0],&hostContacts[0],nContacts,maxContactCapacity);
+			//printf("convex-sphere\n");
+		}
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_PLANE)
+		{
+			//			computeContactPlaneConvex(i,bodyIndexB,bodyIndexA,collidableIndexB,collidableIndexA,&bodies[0],
+			//			&m_data->m_collidablesCPU[0],&hostConvexData[0],&hostVertices[0],&hostIndices[0],&hostFaces[0],&hostContacts[0],nContacts,maxContactCapacity);
+			//			printf("convex-plane\n");
+		}
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_PLANE &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+			//			computeContactPlaneConvex(i,bodyIndexA,bodyIndexB,collidableIndexA,collidableIndexB,&bodies[0],
+			//			&m_data->m_collidablesCPU[0],&hostConvexData[0],&hostVertices[0],&hostIndices[0],&hostFaces[0],&hostContacts[0],nContacts,maxContactCapacity);
+			//			printf("plane-convex\n");
+		}
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			//			computeContactCompoundCompound(i,bodyIndexB,bodyIndexA,collidableIndexB,collidableIndexA,&bodies[0],
+			//			&m_data->m_collidablesCPU[0],&hostConvexData[0],&cpuChildShapes[0], hostAabbsWorldSpace,hostAabbsLocalSpace,hostVertices,hostUniqueEdges,hostIndices,hostFaces,&hostContacts[0],
+			//			nContacts,maxContactCapacity,treeNodesCPU,subTreesCPU,bvhInfoCPU);
+			//			printf("convex-plane\n");
+		}
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_PLANE)
+		{
+			//			computeContactPlaneCompound(i,bodyIndexB,bodyIndexA,collidableIndexB,collidableIndexA,&bodies[0],
+			//			&m_data->m_collidablesCPU[0],&hostConvexData[0],&cpuChildShapes[0], &hostVertices[0],&hostIndices[0],&hostFaces[0],&hostContacts[0],nContacts,maxContactCapacity);
+			//			printf("convex-plane\n");
+		}
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_PLANE &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			//			computeContactPlaneCompound(i,bodyIndexA,bodyIndexB,collidableIndexA,collidableIndexB,&bodies[0],
+			//			&m_data->m_collidablesCPU[0],&hostConvexData[0],&cpuChildShapes[0],&hostVertices[0],&hostIndices[0],&hostFaces[0],&hostContacts[0],nContacts,maxContactCapacity);
+			//			printf("plane-convex\n");
+		}
+
+		if (m_data->m_collidablesCPU[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			m_data->m_collidablesCPU[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+			//printf("pairs[i].z=%d\n",pairs[i].z);
+			//int contactIndex = computeContactConvexConvex2(i,bodyIndexA,bodyIndexB,collidableIndexA,collidableIndexB,bodies,
+			//		m_data->m_collidablesCPU,hostConvexData,hostVertices,hostUniqueEdges,hostIndices,hostFaces,hostContacts,nContacts,maxContactCapacity,oldHostContacts);
+			int contactIndex = b3ContactConvexConvexSAT(i, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, bodies,
+														m_data->m_collidablesCPU, m_data->m_convexPolyhedra, m_data->m_convexVertices, m_data->m_uniqueEdges, m_data->m_convexIndices, m_data->m_convexFaces, m_data->m_contacts, numContacts, maxContactCapacity);
+
+			if (contactIndex >= 0)
+			{
+				pairs[i].z = contactIndex;
+			}
+			//			printf("plane-convex\n");
+		}
+	}
+
+	m_data->m_contacts.resize(numContacts);
+}
+
+int b3CpuNarrowPhase::registerConvexHullShape(b3ConvexUtility* utilPtr)
+{
+	int collidableIndex = allocateCollidable();
+	if (collidableIndex < 0)
+		return collidableIndex;
+
+	b3Collidable& col = m_data->m_collidablesCPU[collidableIndex];
+	col.m_shapeType = SHAPE_CONVEX_HULL;
+	col.m_shapeIndex = -1;
+
+	{
+		b3Vector3 localCenter = b3MakeVector3(0, 0, 0);
+		for (int i = 0; i < utilPtr->m_vertices.size(); i++)
+			localCenter += utilPtr->m_vertices[i];
+		localCenter *= (1.f / utilPtr->m_vertices.size());
+		utilPtr->m_localCenter = localCenter;
+
+		col.m_shapeIndex = registerConvexHullShapeInternal(utilPtr, col);
+	}
+
+	if (col.m_shapeIndex >= 0)
+	{
+		b3Aabb aabb;
+
+		b3Vector3 myAabbMin = b3MakeVector3(1e30f, 1e30f, 1e30f);
+		b3Vector3 myAabbMax = b3MakeVector3(-1e30f, -1e30f, -1e30f);
+
+		for (int i = 0; i < utilPtr->m_vertices.size(); i++)
+		{
+			myAabbMin.setMin(utilPtr->m_vertices[i]);
+			myAabbMax.setMax(utilPtr->m_vertices[i]);
+		}
+		aabb.m_min[0] = myAabbMin[0];
+		aabb.m_min[1] = myAabbMin[1];
+		aabb.m_min[2] = myAabbMin[2];
+		aabb.m_minIndices[3] = 0;
+
+		aabb.m_max[0] = myAabbMax[0];
+		aabb.m_max[1] = myAabbMax[1];
+		aabb.m_max[2] = myAabbMax[2];
+		aabb.m_signedMaxIndices[3] = 0;
+
+		m_data->m_localShapeAABBCPU.push_back(aabb);
+	}
+
+	return collidableIndex;
+}
+
+int b3CpuNarrowPhase::allocateCollidable()
+{
+	int curSize = m_data->m_collidablesCPU.size();
+	if (curSize < m_data->m_config.m_maxConvexShapes)
+	{
+		m_data->m_collidablesCPU.expand();
+		return curSize;
+	}
+	else
+	{
+		b3Error("allocateCollidable out-of-range %d\n", m_data->m_config.m_maxConvexShapes);
+	}
+	return -1;
+}
+
+int b3CpuNarrowPhase::registerConvexHullShape(const float* vertices, int strideInBytes, int numVertices, const float* scaling)
+{
+	b3AlignedObjectArray<b3Vector3> verts;
+
+	unsigned char* vts = (unsigned char*)vertices;
+	for (int i = 0; i < numVertices; i++)
+	{
+		float* vertex = (float*)&vts[i * strideInBytes];
+		verts.push_back(b3MakeVector3(vertex[0] * scaling[0], vertex[1] * scaling[1], vertex[2] * scaling[2]));
+	}
+
+	b3ConvexUtility* utilPtr = new b3ConvexUtility();
+	bool merge = true;
+	if (numVertices)
+	{
+		utilPtr->initializePolyhedralFeatures(&verts[0], verts.size(), merge);
+	}
+
+	int collidableIndex = registerConvexHullShape(utilPtr);
+
+	delete utilPtr;
+	return collidableIndex;
+}
+
+int b3CpuNarrowPhase::registerConvexHullShapeInternal(b3ConvexUtility* convexPtr, b3Collidable& col)
+{
+	m_data->m_convexData.resize(m_data->m_numAcceleratedShapes + 1);
+	m_data->m_convexPolyhedra.resize(m_data->m_numAcceleratedShapes + 1);
+
+	b3ConvexPolyhedronData& convex = m_data->m_convexPolyhedra.at(m_data->m_convexPolyhedra.size() - 1);
+	convex.mC = convexPtr->mC;
+	convex.mE = convexPtr->mE;
+	convex.m_extents = convexPtr->m_extents;
+	convex.m_localCenter = convexPtr->m_localCenter;
+	convex.m_radius = convexPtr->m_radius;
+
+	convex.m_numUniqueEdges = convexPtr->m_uniqueEdges.size();
+	int edgeOffset = m_data->m_uniqueEdges.size();
+	convex.m_uniqueEdgesOffset = edgeOffset;
+
+	m_data->m_uniqueEdges.resize(edgeOffset + convex.m_numUniqueEdges);
+
+	//convex data here
+	int i;
+	for (i = 0; i < convexPtr->m_uniqueEdges.size(); i++)
+	{
+		m_data->m_uniqueEdges[edgeOffset + i] = convexPtr->m_uniqueEdges[i];
+	}
+
+	int faceOffset = m_data->m_convexFaces.size();
+	convex.m_faceOffset = faceOffset;
+	convex.m_numFaces = convexPtr->m_faces.size();
+
+	m_data->m_convexFaces.resize(faceOffset + convex.m_numFaces);
+
+	for (i = 0; i < convexPtr->m_faces.size(); i++)
+	{
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_plane = b3MakeVector3(convexPtr->m_faces[i].m_plane[0],
+																			   convexPtr->m_faces[i].m_plane[1],
+																			   convexPtr->m_faces[i].m_plane[2],
+																			   convexPtr->m_faces[i].m_plane[3]);
+
+		int indexOffset = m_data->m_convexIndices.size();
+		int numIndices = convexPtr->m_faces[i].m_indices.size();
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_numIndices = numIndices;
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_indexOffset = indexOffset;
+		m_data->m_convexIndices.resize(indexOffset + numIndices);
+		for (int p = 0; p < numIndices; p++)
+		{
+			m_data->m_convexIndices[indexOffset + p] = convexPtr->m_faces[i].m_indices[p];
+		}
+	}
+
+	convex.m_numVertices = convexPtr->m_vertices.size();
+	int vertexOffset = m_data->m_convexVertices.size();
+	convex.m_vertexOffset = vertexOffset;
+
+	m_data->m_convexVertices.resize(vertexOffset + convex.m_numVertices);
+	for (int i = 0; i < convexPtr->m_vertices.size(); i++)
+	{
+		m_data->m_convexVertices[vertexOffset + i] = convexPtr->m_vertices[i];
+	}
+
+	(m_data->m_convexData)[m_data->m_numAcceleratedShapes] = convexPtr;
+
+	return m_data->m_numAcceleratedShapes++;
+}
+
+const b3Aabb& b3CpuNarrowPhase::getLocalSpaceAabb(int collidableIndex) const
+{
+	return m_data->m_localShapeAABBCPU[collidableIndex];
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h
new file mode 100644
index 0000000..f02353c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h
@@ -0,0 +1,92 @@
+#ifndef B3_CPU_NARROWPHASE_H
+#define B3_CPU_NARROWPHASE_H
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Common/shared/b3Int4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+class b3CpuNarrowPhase
+{
+protected:
+	struct b3CpuNarrowPhaseInternalData* m_data;
+	int m_acceleratedCompanionShapeIndex;
+	int m_planeBodyIndex;
+	int m_static0Index;
+
+	int registerConvexHullShapeInternal(class b3ConvexUtility* convexPtr, b3Collidable& col);
+	int registerConcaveMeshShape(b3AlignedObjectArray<b3Vector3>* vertices, b3AlignedObjectArray<int>* indices, b3Collidable& col, const float* scaling);
+
+public:
+	b3CpuNarrowPhase(const struct b3Config& config);
+
+	virtual ~b3CpuNarrowPhase(void);
+
+	int registerSphereShape(float radius);
+	int registerPlaneShape(const b3Vector3& planeNormal, float planeConstant);
+
+	int registerCompoundShape(b3AlignedObjectArray<b3GpuChildShape>* childShapes);
+	int registerFace(const b3Vector3& faceNormal, float faceConstant);
+
+	int registerConcaveMesh(b3AlignedObjectArray<b3Vector3>* vertices, b3AlignedObjectArray<int>* indices, const float* scaling);
+
+	//do they need to be merged?
+
+	int registerConvexHullShape(b3ConvexUtility* utilPtr);
+	int registerConvexHullShape(const float* vertices, int strideInBytes, int numVertices, const float* scaling);
+
+	//int registerRigidBody(int collidableIndex, float mass, const float* position, const float* orientation, const float* aabbMin, const float* aabbMax,bool writeToGpu);
+	void setObjectTransform(const float* position, const float* orientation, int bodyIndex);
+
+	void writeAllBodiesToGpu();
+	void reset();
+	void readbackAllBodiesToCpu();
+	bool getObjectTransformFromCpu(float* position, float* orientation, int bodyIndex) const;
+
+	void setObjectTransformCpu(float* position, float* orientation, int bodyIndex);
+	void setObjectVelocityCpu(float* linVel, float* angVel, int bodyIndex);
+
+	//virtual void computeContacts(cl_mem broadphasePairs, int numBroadphasePairs, cl_mem aabbsWorldSpace, int numObjects);
+	virtual void computeContacts(b3AlignedObjectArray<b3Int4>& pairs, b3AlignedObjectArray<b3Aabb>& aabbsWorldSpace, b3AlignedObjectArray<b3RigidBodyData>& bodies);
+
+	const struct b3RigidBodyData* getBodiesCpu() const;
+	//struct b3RigidBodyData* getBodiesCpu();
+
+	int getNumBodiesGpu() const;
+
+	int getNumBodyInertiasGpu() const;
+
+	const struct b3Collidable* getCollidablesCpu() const;
+	int getNumCollidablesGpu() const;
+
+	/*const struct b3Contact4* getContactsCPU() const;
+
+	
+	int	getNumContactsGpu() const;
+	*/
+
+	const b3AlignedObjectArray<b3Contact4Data>& getContacts() const;
+
+	int getNumRigidBodies() const;
+
+	int allocateCollidable();
+
+	int getStatic0Index() const
+	{
+		return m_static0Index;
+	}
+	b3Collidable& getCollidableCpu(int collidableIndex);
+	const b3Collidable& getCollidableCpu(int collidableIndex) const;
+
+	const b3CpuNarrowPhaseInternalData* getInternalData() const
+	{
+		return m_data;
+	}
+
+	const struct b3Aabb& getLocalSpaceAabb(int collidableIndex) const;
+};
+
+#endif  //B3_CPU_NARROWPHASE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h
new file mode 100644
index 0000000..b50c0ec
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h
@@ -0,0 +1,25 @@
+
+#ifndef B3_RAYCAST_INFO_H
+#define B3_RAYCAST_INFO_H
+
+#include "Bullet3Common/b3Vector3.h"
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3RayInfo
+{
+	b3Vector3 m_from;
+	b3Vector3 m_to;
+};
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3RayHit
+{
+	b3Scalar m_hitFraction;
+	int m_hitBody;
+	int m_hitResult1;
+	int m_hitResult2;
+	b3Vector3 m_hitPoint;
+	b3Vector3 m_hitNormal;
+};
+
+#endif  //B3_RAYCAST_INFO_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h
new file mode 100644
index 0000000..be1be57
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h
@@ -0,0 +1,28 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_RIGID_BODY_CL
+#define B3_RIGID_BODY_CL
+
+#include "Bullet3Common/b3Scalar.h"
+#include "Bullet3Common/b3Matrix3x3.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+inline float b3GetInvMass(const b3RigidBodyData& body)
+{
+	return body.m_invMass;
+}
+
+#endif  //B3_RIGID_BODY_CL
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h
new file mode 100644
index 0000000..d6beb66
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h
@@ -0,0 +1,19 @@
+
+#ifndef B3_BVH_SUBTREE_INFO_DATA_H
+#define B3_BVH_SUBTREE_INFO_DATA_H
+
+typedef struct b3BvhSubtreeInfoData b3BvhSubtreeInfoData_t;
+
+struct b3BvhSubtreeInfoData
+{
+	//12 bytes
+	unsigned short int m_quantizedAabbMin[3];
+	unsigned short int m_quantizedAabbMax[3];
+	//4 bytes, points to the root of the subtree
+	int m_rootNodeIndex;
+	//4 bytes
+	int m_subtreeSize;
+	int m_padding[3];
+};
+
+#endif  //B3_BVH_SUBTREE_INFO_DATA_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhTraversal.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhTraversal.h
new file mode 100644
index 0000000..7c2507c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3BvhTraversal.h
@@ -0,0 +1,123 @@
+
+
+#include "Bullet3Common/shared/b3Int4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h"
+
+// work-in-progress
+void b3BvhTraversal(__global const b3Int4* pairs,
+					__global const b3RigidBodyData* rigidBodies,
+					__global const b3Collidable* collidables,
+					__global b3Aabb* aabbs,
+					__global b3Int4* concavePairsOut,
+					__global volatile int* numConcavePairsOut,
+					__global const b3BvhSubtreeInfo* subtreeHeadersRoot,
+					__global const b3QuantizedBvhNode* quantizedNodesRoot,
+					__global const b3BvhInfo* bvhInfos,
+					int numPairs,
+					int maxNumConcavePairsCapacity,
+					int id)
+{
+	int bodyIndexA = pairs[id].x;
+	int bodyIndexB = pairs[id].y;
+	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+
+	//once the broadphase avoids static-static pairs, we can remove this test
+	if ((rigidBodies[bodyIndexA].m_invMass == 0) && (rigidBodies[bodyIndexB].m_invMass == 0))
+	{
+		return;
+	}
+
+	if (collidables[collidableIndexA].m_shapeType != SHAPE_CONCAVE_TRIMESH)
+		return;
+
+	int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+
+	if (shapeTypeB != SHAPE_CONVEX_HULL &&
+		shapeTypeB != SHAPE_SPHERE &&
+		shapeTypeB != SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		return;
+
+	b3BvhInfo bvhInfo = bvhInfos[collidables[collidableIndexA].m_numChildShapes];
+
+	b3Float4 bvhAabbMin = bvhInfo.m_aabbMin;
+	b3Float4 bvhAabbMax = bvhInfo.m_aabbMax;
+	b3Float4 bvhQuantization = bvhInfo.m_quantization;
+	int numSubtreeHeaders = bvhInfo.m_numSubTrees;
+	__global const b3BvhSubtreeInfoData* subtreeHeaders = &subtreeHeadersRoot[bvhInfo.m_subTreeOffset];
+	__global const b3QuantizedBvhNodeData* quantizedNodes = &quantizedNodesRoot[bvhInfo.m_nodeOffset];
+
+	unsigned short int quantizedQueryAabbMin[3];
+	unsigned short int quantizedQueryAabbMax[3];
+	b3QuantizeWithClamp(quantizedQueryAabbMin, aabbs[bodyIndexB].m_minVec, false, bvhAabbMin, bvhAabbMax, bvhQuantization);
+	b3QuantizeWithClamp(quantizedQueryAabbMax, aabbs[bodyIndexB].m_maxVec, true, bvhAabbMin, bvhAabbMax, bvhQuantization);
+
+	for (int i = 0; i < numSubtreeHeaders; i++)
+	{
+		b3BvhSubtreeInfoData subtree = subtreeHeaders[i];
+
+		int overlap = b3TestQuantizedAabbAgainstQuantizedAabbSlow(quantizedQueryAabbMin, quantizedQueryAabbMax, subtree.m_quantizedAabbMin, subtree.m_quantizedAabbMax);
+		if (overlap != 0)
+		{
+			int startNodeIndex = subtree.m_rootNodeIndex;
+			int endNodeIndex = subtree.m_rootNodeIndex + subtree.m_subtreeSize;
+			int curIndex = startNodeIndex;
+			int escapeIndex;
+			int isLeafNode;
+			int aabbOverlap;
+			while (curIndex < endNodeIndex)
+			{
+				b3QuantizedBvhNodeData rootNode = quantizedNodes[curIndex];
+				aabbOverlap = b3TestQuantizedAabbAgainstQuantizedAabbSlow(quantizedQueryAabbMin, quantizedQueryAabbMax, rootNode.m_quantizedAabbMin, rootNode.m_quantizedAabbMax);
+				isLeafNode = b3IsLeaf(&rootNode);
+				if (aabbOverlap)
+				{
+					if (isLeafNode)
+					{
+						int triangleIndex = b3GetTriangleIndex(&rootNode);
+						if (shapeTypeB == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+						{
+							int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+							int pairIdx = b3AtomicAdd(numConcavePairsOut, numChildrenB);
+							for (int b = 0; b < numChildrenB; b++)
+							{
+								if ((pairIdx + b) < maxNumConcavePairsCapacity)
+								{
+									int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex + b;
+									b3Int4 newPair = b3MakeInt4(bodyIndexA, bodyIndexB, triangleIndex, childShapeIndexB);
+									concavePairsOut[pairIdx + b] = newPair;
+								}
+							}
+						}
+						else
+						{
+							int pairIdx = b3AtomicInc(numConcavePairsOut);
+							if (pairIdx < maxNumConcavePairsCapacity)
+							{
+								b3Int4 newPair = b3MakeInt4(bodyIndexA, bodyIndexB, triangleIndex, 0);
+								concavePairsOut[pairIdx] = newPair;
+							}
+						}
+					}
+					curIndex++;
+				}
+				else
+				{
+					if (isLeafNode)
+					{
+						curIndex++;
+					}
+					else
+					{
+						escapeIndex = b3GetEscapeIndex(&rootNode);
+						curIndex += escapeIndex;
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h
new file mode 100644
index 0000000..0d9b13f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h
@@ -0,0 +1,171 @@
+#ifndef B3_CLIP_FACES_H
+#define B3_CLIP_FACES_H
+
+#include "Bullet3Common/shared/b3Int4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+
+inline b3Float4 b3Lerp3(b3Float4ConstArg a, b3Float4ConstArg b, float t)
+{
+	return b3MakeFloat4(a.x + (b.x - a.x) * t,
+						a.y + (b.y - a.y) * t,
+						a.z + (b.z - a.z) * t,
+						0.f);
+}
+
+// Clips a face to the back of a plane, return the number of vertices out, stored in ppVtxOut
+int clipFaceGlobal(__global const b3Float4* pVtxIn, int numVertsIn, b3Float4ConstArg planeNormalWS, float planeEqWS, __global b3Float4* ppVtxOut)
+{
+	int ve;
+	float ds, de;
+	int numVertsOut = 0;
+	//double-check next test
+	//	if (numVertsIn < 2)
+	//		return 0;
+
+	b3Float4 firstVertex = pVtxIn[numVertsIn - 1];
+	b3Float4 endVertex = pVtxIn[0];
+
+	ds = b3Dot(planeNormalWS, firstVertex) + planeEqWS;
+
+	for (ve = 0; ve < numVertsIn; ve++)
+	{
+		endVertex = pVtxIn[ve];
+		de = b3Dot(planeNormalWS, endVertex) + planeEqWS;
+		if (ds < 0)
+		{
+			if (de < 0)
+			{
+				// Start < 0, end < 0, so output endVertex
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+			else
+			{
+				// Start < 0, end >= 0, so output intersection
+				ppVtxOut[numVertsOut++] = b3Lerp3(firstVertex, endVertex, (ds * 1.f / (ds - de)));
+			}
+		}
+		else
+		{
+			if (de < 0)
+			{
+				// Start >= 0, end < 0 so output intersection and end
+				ppVtxOut[numVertsOut++] = b3Lerp3(firstVertex, endVertex, (ds * 1.f / (ds - de)));
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+		}
+		firstVertex = endVertex;
+		ds = de;
+	}
+	return numVertsOut;
+}
+
+__kernel void clipFacesAndFindContactsKernel(__global const b3Float4* separatingNormals,
+											 __global const int* hasSeparatingAxis,
+											 __global b3Int4* clippingFacesOut,
+											 __global b3Float4* worldVertsA1,
+											 __global b3Float4* worldNormalsA1,
+											 __global b3Float4* worldVertsB1,
+											 __global b3Float4* worldVertsB2,
+											 int vertexFaceCapacity,
+											 int pairIndex)
+{
+	//    int i = get_global_id(0);
+	//int pairIndex = i;
+	int i = pairIndex;
+
+	float minDist = -1e30f;
+	float maxDist = 0.02f;
+
+	//	if (i<numPairs)
+	{
+		if (hasSeparatingAxis[i])
+		{
+			//			int bodyIndexA = pairs[i].x;
+			//		int bodyIndexB = pairs[i].y;
+
+			int numLocalContactsOut = 0;
+
+			int capacityWorldVertsB2 = vertexFaceCapacity;
+
+			__global b3Float4* pVtxIn = &worldVertsB1[pairIndex * capacityWorldVertsB2];
+			__global b3Float4* pVtxOut = &worldVertsB2[pairIndex * capacityWorldVertsB2];
+
+			{
+				__global b3Int4* clippingFaces = clippingFacesOut;
+
+				int closestFaceA = clippingFaces[pairIndex].x;
+				// int closestFaceB = clippingFaces[pairIndex].y;
+				int numVertsInA = clippingFaces[pairIndex].z;
+				int numVertsInB = clippingFaces[pairIndex].w;
+
+				int numVertsOut = 0;
+
+				if (closestFaceA >= 0)
+				{
+					// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+
+					for (int e0 = 0; e0 < numVertsInA; e0++)
+					{
+						const b3Float4 aw = worldVertsA1[pairIndex * capacityWorldVertsB2 + e0];
+						const b3Float4 bw = worldVertsA1[pairIndex * capacityWorldVertsB2 + ((e0 + 1) % numVertsInA)];
+						const b3Float4 WorldEdge0 = aw - bw;
+						b3Float4 worldPlaneAnormal1 = worldNormalsA1[pairIndex];
+						b3Float4 planeNormalWS1 = -b3Cross(WorldEdge0, worldPlaneAnormal1);
+						b3Float4 worldA1 = aw;
+						float planeEqWS1 = -b3Dot(worldA1, planeNormalWS1);
+						b3Float4 planeNormalWS = planeNormalWS1;
+						float planeEqWS = planeEqWS1;
+						numVertsOut = clipFaceGlobal(pVtxIn, numVertsInB, planeNormalWS, planeEqWS, pVtxOut);
+						__global b3Float4* tmp = pVtxOut;
+						pVtxOut = pVtxIn;
+						pVtxIn = tmp;
+						numVertsInB = numVertsOut;
+						numVertsOut = 0;
+					}
+
+					b3Float4 planeNormalWS = worldNormalsA1[pairIndex];
+					float planeEqWS = -b3Dot(planeNormalWS, worldVertsA1[pairIndex * capacityWorldVertsB2]);
+
+					for (int i = 0; i < numVertsInB; i++)
+					{
+						float depth = b3Dot(planeNormalWS, pVtxIn[i]) + planeEqWS;
+						if (depth <= minDist)
+						{
+							depth = minDist;
+						}
+						/*
+						static float maxDepth = 0.f;
+						if (depth < maxDepth)
+						{
+							maxDepth = depth;
+							if (maxDepth < -10)
+							{
+								printf("error at framecount %d?\n",myframecount);
+							}
+							printf("maxDepth = %f\n", maxDepth);
+
+						}
+*/
+						if (depth <= maxDist)
+						{
+							b3Float4 pointInWorld = pVtxIn[i];
+							pVtxOut[numLocalContactsOut++] = b3MakeFloat4(pointInWorld.x, pointInWorld.y, pointInWorld.z, depth);
+						}
+					}
+				}
+				clippingFaces[pairIndex].w = numLocalContactsOut;
+			}
+
+			for (int i = 0; i < numLocalContactsOut; i++)
+				pVtxIn[i] = pVtxOut[i];
+
+		}  //		if (hasSeparatingAxis[i])
+	}      //	if (i<numPairs)
+}
+
+#endif  //B3_CLIP_FACES_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h
new file mode 100644
index 0000000..9a8c668
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h
@@ -0,0 +1,69 @@
+
+#ifndef B3_COLLIDABLE_H
+#define B3_COLLIDABLE_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+#include "Bullet3Common/shared/b3Quat.h"
+
+enum b3ShapeTypes
+{
+	SHAPE_HEIGHT_FIELD = 1,
+
+	SHAPE_CONVEX_HULL = 3,
+	SHAPE_PLANE = 4,
+	SHAPE_CONCAVE_TRIMESH = 5,
+	SHAPE_COMPOUND_OF_CONVEX_HULLS = 6,
+	SHAPE_SPHERE = 7,
+	MAX_NUM_SHAPE_TYPES,
+};
+
+typedef struct b3Collidable b3Collidable_t;
+
+struct b3Collidable
+{
+	union {
+		int m_numChildShapes;
+		int m_bvhIndex;
+	};
+	union {
+		float m_radius;
+		int m_compoundBvhIndex;
+	};
+
+	int m_shapeType;
+	union {
+		int m_shapeIndex;
+		float m_height;
+	};
+};
+
+typedef struct b3GpuChildShape b3GpuChildShape_t;
+struct b3GpuChildShape
+{
+	b3Float4 m_childPosition;
+	b3Quat m_childOrientation;
+	union {
+		int m_shapeIndex;  //used for SHAPE_COMPOUND_OF_CONVEX_HULLS
+		int m_capsuleAxis;
+	};
+	union {
+		float m_radius;        //used for childshape of SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES
+		int m_numChildShapes;  //used for compound shape
+	};
+	union {
+		float m_height;  //used for childshape of SHAPE_COMPOUND_OF_CAPSULES
+		int m_collidableShapeIndex;
+	};
+	int m_shapeType;
+};
+
+struct b3CompoundOverlappingPair
+{
+	int m_bodyIndexA;
+	int m_bodyIndexB;
+	//	int	m_pairType;
+	int m_childShapeIndexA;
+	int m_childShapeIndexB;
+};
+
+#endif  //B3_COLLIDABLE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h
new file mode 100644
index 0000000..d5f6daa
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h
@@ -0,0 +1,36 @@
+#ifndef B3_CONTACT4DATA_H
+#define B3_CONTACT4DATA_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+
+typedef struct b3Contact4Data b3Contact4Data_t;
+
+struct b3Contact4Data
+{
+	b3Float4 m_worldPosB[4];
+	//	b3Float4	m_localPosA[4];
+	//	b3Float4	m_localPosB[4];
+	b3Float4 m_worldNormalOnB;  //	w: m_nPoints
+	unsigned short m_restituitionCoeffCmp;
+	unsigned short m_frictionCoeffCmp;
+	int m_batchIdx;
+	int m_bodyAPtrAndSignBit;  //x:m_bodyAPtr, y:m_bodyBPtr
+	int m_bodyBPtrAndSignBit;
+
+	int m_childIndexA;
+	int m_childIndexB;
+	int m_unused1;
+	int m_unused2;
+};
+
+inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)
+{
+	return (int)contact->m_worldNormalOnB.w;
+};
+
+inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)
+{
+	contact->m_worldNormalOnB.w = (float)numPoints;
+};
+
+#endif  //B3_CONTACT4DATA_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h
new file mode 100644
index 0000000..ca68f4b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactConvexConvexSAT.h
@@ -0,0 +1,486 @@
+
+#ifndef B3_CONTACT_CONVEX_CONVEX_SAT_H
+#define B3_CONTACT_CONVEX_CONVEX_SAT_H
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3FindSeparatingAxis.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ReduceContacts.h"
+
+#define B3_MAX_VERTS 1024
+
+inline b3Float4 b3Lerp3(const b3Float4& a, const b3Float4& b, float t)
+{
+	return b3MakeVector3(a.x + (b.x - a.x) * t,
+						 a.y + (b.y - a.y) * t,
+						 a.z + (b.z - a.z) * t,
+						 0.f);
+}
+
+// Clips a face to the back of a plane, return the number of vertices out, stored in ppVtxOut
+inline int b3ClipFace(const b3Float4* pVtxIn, int numVertsIn, b3Float4& planeNormalWS, float planeEqWS, b3Float4* ppVtxOut)
+{
+	int ve;
+	float ds, de;
+	int numVertsOut = 0;
+	if (numVertsIn < 2)
+		return 0;
+
+	b3Float4 firstVertex = pVtxIn[numVertsIn - 1];
+	b3Float4 endVertex = pVtxIn[0];
+
+	ds = b3Dot3F4(planeNormalWS, firstVertex) + planeEqWS;
+
+	for (ve = 0; ve < numVertsIn; ve++)
+	{
+		endVertex = pVtxIn[ve];
+
+		de = b3Dot3F4(planeNormalWS, endVertex) + planeEqWS;
+
+		if (ds < 0)
+		{
+			if (de < 0)
+			{
+				// Start < 0, end < 0, so output endVertex
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+			else
+			{
+				// Start < 0, end >= 0, so output intersection
+				ppVtxOut[numVertsOut++] = b3Lerp3(firstVertex, endVertex, (ds * 1.f / (ds - de)));
+			}
+		}
+		else
+		{
+			if (de < 0)
+			{
+				// Start >= 0, end < 0 so output intersection and end
+				ppVtxOut[numVertsOut++] = b3Lerp3(firstVertex, endVertex, (ds * 1.f / (ds - de)));
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+		}
+		firstVertex = endVertex;
+		ds = de;
+	}
+	return numVertsOut;
+}
+
+inline int b3ClipFaceAgainstHull(const b3Float4& separatingNormal, const b3ConvexPolyhedronData* hullA,
+								 const b3Float4& posA, const b3Quaternion& ornA, b3Float4* worldVertsB1, int numWorldVertsB1,
+								 b3Float4* worldVertsB2, int capacityWorldVertsB2,
+								 const float minDist, float maxDist,
+								 const b3AlignedObjectArray<b3Float4>& verticesA, const b3AlignedObjectArray<b3GpuFace>& facesA, const b3AlignedObjectArray<int>& indicesA,
+								 //const b3Float4* verticesB,	const b3GpuFace* facesB,	const int* indicesB,
+								 b3Float4* contactsOut,
+								 int contactCapacity)
+{
+	int numContactsOut = 0;
+
+	b3Float4* pVtxIn = worldVertsB1;
+	b3Float4* pVtxOut = worldVertsB2;
+
+	int numVertsIn = numWorldVertsB1;
+	int numVertsOut = 0;
+
+	int closestFaceA = -1;
+	{
+		float dmin = FLT_MAX;
+		for (int face = 0; face < hullA->m_numFaces; face++)
+		{
+			const b3Float4 Normal = b3MakeVector3(
+				facesA[hullA->m_faceOffset + face].m_plane.x,
+				facesA[hullA->m_faceOffset + face].m_plane.y,
+				facesA[hullA->m_faceOffset + face].m_plane.z, 0.f);
+			const b3Float4 faceANormalWS = b3QuatRotate(ornA, Normal);
+
+			float d = b3Dot3F4(faceANormalWS, separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+			}
+		}
+	}
+	if (closestFaceA < 0)
+		return numContactsOut;
+
+	b3GpuFace polyA = facesA[hullA->m_faceOffset + closestFaceA];
+
+	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+	//int numContacts = numWorldVertsB1;
+	int numVerticesA = polyA.m_numIndices;
+	for (int e0 = 0; e0 < numVerticesA; e0++)
+	{
+		const b3Float4 a = verticesA[hullA->m_vertexOffset + indicesA[polyA.m_indexOffset + e0]];
+		const b3Float4 b = verticesA[hullA->m_vertexOffset + indicesA[polyA.m_indexOffset + ((e0 + 1) % numVerticesA)]];
+		const b3Float4 edge0 = a - b;
+		const b3Float4 WorldEdge0 = b3QuatRotate(ornA, edge0);
+		b3Float4 planeNormalA = b3MakeFloat4(polyA.m_plane.x, polyA.m_plane.y, polyA.m_plane.z, 0.f);
+		b3Float4 worldPlaneAnormal1 = b3QuatRotate(ornA, planeNormalA);
+
+		b3Float4 planeNormalWS1 = -b3Cross3(WorldEdge0, worldPlaneAnormal1);
+		b3Float4 worldA1 = b3TransformPoint(a, posA, ornA);
+		float planeEqWS1 = -b3Dot3F4(worldA1, planeNormalWS1);
+
+		b3Float4 planeNormalWS = planeNormalWS1;
+		float planeEqWS = planeEqWS1;
+
+		//clip face
+		//clipFace(*pVtxIn, *pVtxOut,planeNormalWS,planeEqWS);
+		numVertsOut = b3ClipFace(pVtxIn, numVertsIn, planeNormalWS, planeEqWS, pVtxOut);
+
+		//btSwap(pVtxIn,pVtxOut);
+		b3Float4* tmp = pVtxOut;
+		pVtxOut = pVtxIn;
+		pVtxIn = tmp;
+		numVertsIn = numVertsOut;
+		numVertsOut = 0;
+	}
+
+	// only keep points that are behind the witness face
+	{
+		b3Float4 localPlaneNormal = b3MakeFloat4(polyA.m_plane.x, polyA.m_plane.y, polyA.m_plane.z, 0.f);
+		float localPlaneEq = polyA.m_plane.w;
+		b3Float4 planeNormalWS = b3QuatRotate(ornA, localPlaneNormal);
+		float planeEqWS = localPlaneEq - b3Dot3F4(planeNormalWS, posA);
+		for (int i = 0; i < numVertsIn; i++)
+		{
+			float depth = b3Dot3F4(planeNormalWS, pVtxIn[i]) + planeEqWS;
+			if (depth <= minDist)
+			{
+				depth = minDist;
+			}
+			if (numContactsOut < contactCapacity)
+			{
+				if (depth <= maxDist)
+				{
+					b3Float4 pointInWorld = pVtxIn[i];
+					//resultOut.addContactPoint(separatingNormal,point,depth);
+					contactsOut[numContactsOut++] = b3MakeVector3(pointInWorld.x, pointInWorld.y, pointInWorld.z, depth);
+					//printf("depth=%f\n",depth);
+				}
+			}
+			else
+			{
+				b3Error("exceeding contact capacity (%d,%df)\n", numContactsOut, contactCapacity);
+			}
+		}
+	}
+
+	return numContactsOut;
+}
+
+inline int b3ClipHullAgainstHull(const b3Float4& separatingNormal,
+								 const b3ConvexPolyhedronData& hullA, const b3ConvexPolyhedronData& hullB,
+								 const b3Float4& posA, const b3Quaternion& ornA, const b3Float4& posB, const b3Quaternion& ornB,
+								 b3Float4* worldVertsB1, b3Float4* worldVertsB2, int capacityWorldVerts,
+								 const float minDist, float maxDist,
+								 const b3AlignedObjectArray<b3Float4>& verticesA, const b3AlignedObjectArray<b3GpuFace>& facesA, const b3AlignedObjectArray<int>& indicesA,
+								 const b3AlignedObjectArray<b3Float4>& verticesB, const b3AlignedObjectArray<b3GpuFace>& facesB, const b3AlignedObjectArray<int>& indicesB,
+
+								 b3Float4* contactsOut,
+								 int contactCapacity)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1 = 0;
+
+	B3_PROFILE("clipHullAgainstHull");
+
+	//float curMaxDist=maxDist;
+	int closestFaceB = -1;
+	float dmax = -FLT_MAX;
+
+	{
+		//B3_PROFILE("closestFaceB");
+		if (hullB.m_numFaces != 1)
+		{
+			//printf("wtf\n");
+		}
+		static bool once = true;
+		//printf("separatingNormal=%f,%f,%f\n",separatingNormal.x,separatingNormal.y,separatingNormal.z);
+
+		for (int face = 0; face < hullB.m_numFaces; face++)
+		{
+#ifdef BT_DEBUG_SAT_FACE
+			if (once)
+				printf("face %d\n", face);
+			const b3GpuFace* faceB = &facesB[hullB.m_faceOffset + face];
+			if (once)
+			{
+				for (int i = 0; i < faceB->m_numIndices; i++)
+				{
+					b3Float4 vert = verticesB[hullB.m_vertexOffset + indicesB[faceB->m_indexOffset + i]];
+					printf("vert[%d] = %f,%f,%f\n", i, vert.x, vert.y, vert.z);
+				}
+			}
+#endif  //BT_DEBUG_SAT_FACE \
+	//if (facesB[hullB.m_faceOffset+face].m_numIndices>2)
+			{
+				const b3Float4 Normal = b3MakeVector3(facesB[hullB.m_faceOffset + face].m_plane.x,
+													  facesB[hullB.m_faceOffset + face].m_plane.y, facesB[hullB.m_faceOffset + face].m_plane.z, 0.f);
+				const b3Float4 WorldNormal = b3QuatRotate(ornB, Normal);
+#ifdef BT_DEBUG_SAT_FACE
+				if (once)
+					printf("faceNormal = %f,%f,%f\n", Normal.x, Normal.y, Normal.z);
+#endif
+				float d = b3Dot3F4(WorldNormal, separatingNormal);
+				if (d > dmax)
+				{
+					dmax = d;
+					closestFaceB = face;
+				}
+			}
+		}
+		once = false;
+	}
+
+	b3Assert(closestFaceB >= 0);
+	{
+		//B3_PROFILE("worldVertsB1");
+		const b3GpuFace& polyB = facesB[hullB.m_faceOffset + closestFaceB];
+		const int numVertices = polyB.m_numIndices;
+		for (int e0 = 0; e0 < numVertices; e0++)
+		{
+			const b3Float4& b = verticesB[hullB.m_vertexOffset + indicesB[polyB.m_indexOffset + e0]];
+			worldVertsB1[numWorldVertsB1++] = b3TransformPoint(b, posB, ornB);
+		}
+	}
+
+	if (closestFaceB >= 0)
+	{
+		//B3_PROFILE("clipFaceAgainstHull");
+		numContactsOut = b3ClipFaceAgainstHull((b3Float4&)separatingNormal, &hullA,
+											   posA, ornA,
+											   worldVertsB1, numWorldVertsB1, worldVertsB2, capacityWorldVerts, minDist, maxDist,
+											   verticesA, facesA, indicesA,
+											   contactsOut, contactCapacity);
+	}
+
+	return numContactsOut;
+}
+
+inline int b3ClipHullHullSingle(
+	int bodyIndexA, int bodyIndexB,
+	const b3Float4& posA,
+	const b3Quaternion& ornA,
+	const b3Float4& posB,
+	const b3Quaternion& ornB,
+
+	int collidableIndexA, int collidableIndexB,
+
+	const b3AlignedObjectArray<b3RigidBodyData>* bodyBuf,
+	b3AlignedObjectArray<b3Contact4Data>* globalContactOut,
+	int& nContacts,
+
+	const b3AlignedObjectArray<b3ConvexPolyhedronData>& hostConvexDataA,
+	const b3AlignedObjectArray<b3ConvexPolyhedronData>& hostConvexDataB,
+
+	const b3AlignedObjectArray<b3Vector3>& verticesA,
+	const b3AlignedObjectArray<b3Vector3>& uniqueEdgesA,
+	const b3AlignedObjectArray<b3GpuFace>& facesA,
+	const b3AlignedObjectArray<int>& indicesA,
+
+	const b3AlignedObjectArray<b3Vector3>& verticesB,
+	const b3AlignedObjectArray<b3Vector3>& uniqueEdgesB,
+	const b3AlignedObjectArray<b3GpuFace>& facesB,
+	const b3AlignedObjectArray<int>& indicesB,
+
+	const b3AlignedObjectArray<b3Collidable>& hostCollidablesA,
+	const b3AlignedObjectArray<b3Collidable>& hostCollidablesB,
+	const b3Vector3& sepNormalWorldSpace,
+	int maxContactCapacity)
+{
+	int contactIndex = -1;
+	b3ConvexPolyhedronData hullA, hullB;
+
+	b3Collidable colA = hostCollidablesA[collidableIndexA];
+	hullA = hostConvexDataA[colA.m_shapeIndex];
+	//printf("numvertsA = %d\n",hullA.m_numVertices);
+
+	b3Collidable colB = hostCollidablesB[collidableIndexB];
+	hullB = hostConvexDataB[colB.m_shapeIndex];
+	//printf("numvertsB = %d\n",hullB.m_numVertices);
+
+	b3Float4 contactsOut[B3_MAX_VERTS];
+	int localContactCapacity = B3_MAX_VERTS;
+
+#ifdef _WIN32
+	b3Assert(_finite(bodyBuf->at(bodyIndexA).m_pos.x));
+	b3Assert(_finite(bodyBuf->at(bodyIndexB).m_pos.x));
+#endif
+
+	{
+		b3Float4 worldVertsB1[B3_MAX_VERTS];
+		b3Float4 worldVertsB2[B3_MAX_VERTS];
+		int capacityWorldVerts = B3_MAX_VERTS;
+
+		b3Float4 hostNormal = b3MakeFloat4(sepNormalWorldSpace.x, sepNormalWorldSpace.y, sepNormalWorldSpace.z, 0.f);
+		int shapeA = hostCollidablesA[collidableIndexA].m_shapeIndex;
+		int shapeB = hostCollidablesB[collidableIndexB].m_shapeIndex;
+
+		b3Scalar minDist = -1;
+		b3Scalar maxDist = 0.;
+
+		b3Transform trA, trB;
+		{
+			//B3_PROFILE("b3TransformPoint computation");
+			//trA.setIdentity();
+			trA.setOrigin(b3MakeVector3(posA.x, posA.y, posA.z));
+			trA.setRotation(b3Quaternion(ornA.x, ornA.y, ornA.z, ornA.w));
+
+			//trB.setIdentity();
+			trB.setOrigin(b3MakeVector3(posB.x, posB.y, posB.z));
+			trB.setRotation(b3Quaternion(ornB.x, ornB.y, ornB.z, ornB.w));
+		}
+
+		b3Quaternion trAorn = trA.getRotation();
+		b3Quaternion trBorn = trB.getRotation();
+
+		int numContactsOut = b3ClipHullAgainstHull(hostNormal,
+												   hostConvexDataA.at(shapeA),
+												   hostConvexDataB.at(shapeB),
+												   (b3Float4&)trA.getOrigin(), (b3Quaternion&)trAorn,
+												   (b3Float4&)trB.getOrigin(), (b3Quaternion&)trBorn,
+												   worldVertsB1, worldVertsB2, capacityWorldVerts,
+												   minDist, maxDist,
+												   verticesA, facesA, indicesA,
+												   verticesB, facesB, indicesB,
+
+												   contactsOut, localContactCapacity);
+
+		if (numContactsOut > 0)
+		{
+			B3_PROFILE("overlap");
+
+			b3Float4 normalOnSurfaceB = (b3Float4&)hostNormal;
+			//			b3Float4 centerOut;
+
+			b3Int4 contactIdx;
+			contactIdx.x = 0;
+			contactIdx.y = 1;
+			contactIdx.z = 2;
+			contactIdx.w = 3;
+
+			int numPoints = 0;
+
+			{
+				B3_PROFILE("extractManifold");
+				numPoints = b3ReduceContacts(contactsOut, numContactsOut, normalOnSurfaceB, &contactIdx);
+			}
+
+			b3Assert(numPoints);
+
+			if (nContacts < maxContactCapacity)
+			{
+				contactIndex = nContacts;
+				globalContactOut->expand();
+				b3Contact4Data& contact = globalContactOut->at(nContacts);
+				contact.m_batchIdx = 0;  //i;
+				contact.m_bodyAPtrAndSignBit = (bodyBuf->at(bodyIndexA).m_invMass == 0) ? -bodyIndexA : bodyIndexA;
+				contact.m_bodyBPtrAndSignBit = (bodyBuf->at(bodyIndexB).m_invMass == 0) ? -bodyIndexB : bodyIndexB;
+
+				contact.m_frictionCoeffCmp = 45874;
+				contact.m_restituitionCoeffCmp = 0;
+
+				//	float distance = 0.f;
+				for (int p = 0; p < numPoints; p++)
+				{
+					contact.m_worldPosB[p] = contactsOut[contactIdx.s[p]];  //check if it is actually on B
+					contact.m_worldNormalOnB = normalOnSurfaceB;
+				}
+				//printf("bodyIndexA %d,bodyIndexB %d,normal=%f,%f,%f numPoints %d\n",bodyIndexA,bodyIndexB,normalOnSurfaceB.x,normalOnSurfaceB.y,normalOnSurfaceB.z,numPoints);
+				contact.m_worldNormalOnB.w = (b3Scalar)numPoints;
+				nContacts++;
+			}
+			else
+			{
+				b3Error("Error: exceeding contact capacity (%d/%d)\n", nContacts, maxContactCapacity);
+			}
+		}
+	}
+	return contactIndex;
+}
+
+inline int b3ContactConvexConvexSAT(
+	int pairIndex,
+	int bodyIndexA, int bodyIndexB,
+	int collidableIndexA, int collidableIndexB,
+	const b3AlignedObjectArray<b3RigidBodyData>& rigidBodies,
+	const b3AlignedObjectArray<b3Collidable>& collidables,
+	const b3AlignedObjectArray<b3ConvexPolyhedronData>& convexShapes,
+	const b3AlignedObjectArray<b3Float4>& convexVertices,
+	const b3AlignedObjectArray<b3Float4>& uniqueEdges,
+	const b3AlignedObjectArray<int>& convexIndices,
+	const b3AlignedObjectArray<b3GpuFace>& faces,
+	b3AlignedObjectArray<b3Contact4Data>& globalContactsOut,
+	int& nGlobalContactsOut,
+	int maxContactCapacity)
+{
+	int contactIndex = -1;
+
+	b3Float4 posA = rigidBodies[bodyIndexA].m_pos;
+	b3Quaternion ornA = rigidBodies[bodyIndexA].m_quat;
+	b3Float4 posB = rigidBodies[bodyIndexB].m_pos;
+	b3Quaternion ornB = rigidBodies[bodyIndexB].m_quat;
+
+	b3ConvexPolyhedronData hullA, hullB;
+
+	b3Float4 sepNormalWorldSpace;
+
+	b3Collidable colA = collidables[collidableIndexA];
+	hullA = convexShapes[colA.m_shapeIndex];
+	//printf("numvertsA = %d\n",hullA.m_numVertices);
+
+	b3Collidable colB = collidables[collidableIndexB];
+	hullB = convexShapes[colB.m_shapeIndex];
+	//printf("numvertsB = %d\n",hullB.m_numVertices);
+
+#ifdef _WIN32
+	b3Assert(_finite(rigidBodies[bodyIndexA].m_pos.x));
+	b3Assert(_finite(rigidBodies[bodyIndexB].m_pos.x));
+#endif
+
+	bool foundSepAxis = b3FindSeparatingAxis(hullA, hullB,
+											 posA,
+											 ornA,
+											 posB,
+											 ornB,
+
+											 convexVertices, uniqueEdges, faces, convexIndices,
+											 convexVertices, uniqueEdges, faces, convexIndices,
+
+											 sepNormalWorldSpace);
+
+	if (foundSepAxis)
+	{
+		contactIndex = b3ClipHullHullSingle(
+			bodyIndexA, bodyIndexB,
+			posA, ornA,
+			posB, ornB,
+			collidableIndexA, collidableIndexB,
+			&rigidBodies,
+			&globalContactsOut,
+			nGlobalContactsOut,
+
+			convexShapes,
+			convexShapes,
+
+			convexVertices,
+			uniqueEdges,
+			faces,
+			convexIndices,
+
+			convexVertices,
+			uniqueEdges,
+			faces,
+			convexIndices,
+
+			collidables,
+			collidables,
+			sepNormalWorldSpace,
+			maxContactCapacity);
+	}
+
+	return contactIndex;
+}
+
+#endif  //B3_CONTACT_CONVEX_CONVEX_SAT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactSphereSphere.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactSphereSphere.h
new file mode 100644
index 0000000..acf7c1b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ContactSphereSphere.h
@@ -0,0 +1,153 @@
+
+#ifndef B3_CONTACT_SPHERE_SPHERE_H
+#define B3_CONTACT_SPHERE_SPHERE_H
+
+void computeContactSphereConvex(int pairIndex,
+								int bodyIndexA, int bodyIndexB,
+								int collidableIndexA, int collidableIndexB,
+								const b3RigidBodyData* rigidBodies,
+								const b3Collidable* collidables,
+								const b3ConvexPolyhedronData* convexShapes,
+								const b3Vector3* convexVertices,
+								const int* convexIndices,
+								const b3GpuFace* faces,
+								b3Contact4* globalContactsOut,
+								int& nGlobalContactsOut,
+								int maxContactCapacity)
+{
+	float radius = collidables[collidableIndexA].m_radius;
+	float4 spherePos1 = rigidBodies[bodyIndexA].m_pos;
+	b3Quaternion sphereOrn = rigidBodies[bodyIndexA].m_quat;
+
+	float4 pos = rigidBodies[bodyIndexB].m_pos;
+
+	b3Quaternion quat = rigidBodies[bodyIndexB].m_quat;
+
+	b3Transform tr;
+	tr.setIdentity();
+	tr.setOrigin(pos);
+	tr.setRotation(quat);
+	b3Transform trInv = tr.inverse();
+
+	float4 spherePos = trInv(spherePos1);
+
+	int collidableIndex = rigidBodies[bodyIndexB].m_collidableIdx;
+	int shapeIndex = collidables[collidableIndex].m_shapeIndex;
+	int numFaces = convexShapes[shapeIndex].m_numFaces;
+	float4 closestPnt = b3MakeVector3(0, 0, 0, 0);
+	float4 hitNormalWorld = b3MakeVector3(0, 0, 0, 0);
+	float minDist = -1000000.f;  // TODO: What is the largest/smallest float?
+	bool bCollide = true;
+	int region = -1;
+	float4 localHitNormal;
+	for (int f = 0; f < numFaces; f++)
+	{
+		b3GpuFace face = faces[convexShapes[shapeIndex].m_faceOffset + f];
+		float4 planeEqn;
+		float4 localPlaneNormal = b3MakeVector3(face.m_plane.x, face.m_plane.y, face.m_plane.z, 0.f);
+		float4 n1 = localPlaneNormal;  //quatRotate(quat,localPlaneNormal);
+		planeEqn = n1;
+		planeEqn[3] = face.m_plane.w;
+
+		float4 pntReturn;
+		float dist = signedDistanceFromPointToPlane(spherePos, planeEqn, &pntReturn);
+
+		if (dist > radius)
+		{
+			bCollide = false;
+			break;
+		}
+
+		if (dist > 0)
+		{
+			//might hit an edge or vertex
+			b3Vector3 out;
+
+			bool isInPoly = IsPointInPolygon(spherePos,
+											 &face,
+											 &convexVertices[convexShapes[shapeIndex].m_vertexOffset],
+											 convexIndices,
+											 &out);
+			if (isInPoly)
+			{
+				if (dist > minDist)
+				{
+					minDist = dist;
+					closestPnt = pntReturn;
+					localHitNormal = planeEqn;
+					region = 1;
+				}
+			}
+			else
+			{
+				b3Vector3 tmp = spherePos - out;
+				b3Scalar l2 = tmp.length2();
+				if (l2 < radius * radius)
+				{
+					dist = b3Sqrt(l2);
+					if (dist > minDist)
+					{
+						minDist = dist;
+						closestPnt = out;
+						localHitNormal = tmp / dist;
+						region = 2;
+					}
+				}
+				else
+				{
+					bCollide = false;
+					break;
+				}
+			}
+		}
+		else
+		{
+			if (dist > minDist)
+			{
+				minDist = dist;
+				closestPnt = pntReturn;
+				localHitNormal = planeEqn;
+				region = 3;
+			}
+		}
+	}
+	static int numChecks = 0;
+	numChecks++;
+
+	if (bCollide && minDist > -10000)
+	{
+		float4 normalOnSurfaceB1 = tr.getBasis() * localHitNormal;  //-hitNormalWorld;
+		float4 pOnB1 = tr(closestPnt);
+		//printf("dist ,%f,",minDist);
+		float actualDepth = minDist - radius;
+		if (actualDepth < 0)
+		{
+			//printf("actualDepth = ,%f,", actualDepth);
+			//printf("normalOnSurfaceB1 = ,%f,%f,%f,", normalOnSurfaceB1.x,normalOnSurfaceB1.y,normalOnSurfaceB1.z);
+			//printf("region=,%d,\n", region);
+			pOnB1[3] = actualDepth;
+
+			int dstIdx;
+			//    dstIdx = nGlobalContactsOut++;//AppendInc( nGlobalContactsOut, dstIdx );
+
+			if (nGlobalContactsOut < maxContactCapacity)
+			{
+				dstIdx = nGlobalContactsOut;
+				nGlobalContactsOut++;
+
+				b3Contact4* c = &globalContactsOut[dstIdx];
+				c->m_worldNormalOnB = normalOnSurfaceB1;
+				c->setFrictionCoeff(0.7);
+				c->setRestituitionCoeff(0.f);
+
+				c->m_batchIdx = pairIndex;
+				c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass == 0 ? -bodyIndexA : bodyIndexA;
+				c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass == 0 ? -bodyIndexB : bodyIndexB;
+				c->m_worldPosB[0] = pOnB1;
+				int numPoints = 1;
+				c->m_worldNormalOnB.w = (b3Scalar)numPoints;
+			}  //if (dstIdx < numPairs)
+		}
+	}  //if (hasCollision)
+}
+#endif  //B3_CONTACT_SPHERE_SPHERE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h
new file mode 100644
index 0000000..d5a73bd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h
@@ -0,0 +1,38 @@
+
+#ifndef B3_CONVEX_POLYHEDRON_DATA_H
+#define B3_CONVEX_POLYHEDRON_DATA_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+#include "Bullet3Common/shared/b3Quat.h"
+
+typedef struct b3GpuFace b3GpuFace_t;
+struct b3GpuFace
+{
+	b3Float4 m_plane;
+	int m_indexOffset;
+	int m_numIndices;
+	int m_unusedPadding1;
+	int m_unusedPadding2;
+};
+
+typedef struct b3ConvexPolyhedronData b3ConvexPolyhedronData_t;
+
+struct b3ConvexPolyhedronData
+{
+	b3Float4 m_localCenter;
+	b3Float4 m_extents;
+	b3Float4 mC;
+	b3Float4 mE;
+
+	float m_radius;
+	int m_faceOffset;
+	int m_numFaces;
+	int m_numVertices;
+
+	int m_vertexOffset;
+	int m_uniqueEdgesOffset;
+	int m_numUniqueEdges;
+	int m_unused;
+};
+
+#endif  //B3_CONVEX_POLYHEDRON_DATA_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h
new file mode 100644
index 0000000..983554e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h
@@ -0,0 +1,797 @@
+#ifndef B3_FIND_CONCAVE_SEPARATING_AXIS_H
+#define B3_FIND_CONCAVE_SEPARATING_AXIS_H
+
+#define B3_TRIANGLE_NUM_CONVEX_FACES 5
+
+#include "Bullet3Common/shared/b3Int4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+
+inline void b3Project(__global const b3ConvexPolyhedronData* hull, b3Float4ConstArg pos, b3QuatConstArg orn,
+					  const b3Float4* dir, __global const b3Float4* vertices, float* min, float* max)
+{
+	min[0] = FLT_MAX;
+	max[0] = -FLT_MAX;
+	int numVerts = hull->m_numVertices;
+
+	const b3Float4 localDir = b3QuatRotate(b3QuatInverse(orn), *dir);
+	float offset = b3Dot(pos, *dir);
+	for (int i = 0; i < numVerts; i++)
+	{
+		float dp = b3Dot(vertices[hull->m_vertexOffset + i], localDir);
+		if (dp < min[0])
+			min[0] = dp;
+		if (dp > max[0])
+			max[0] = dp;
+	}
+	if (min[0] > max[0])
+	{
+		float tmp = min[0];
+		min[0] = max[0];
+		max[0] = tmp;
+	}
+	min[0] += offset;
+	max[0] += offset;
+}
+
+inline bool b3TestSepAxis(const b3ConvexPolyhedronData* hullA, __global const b3ConvexPolyhedronData* hullB,
+						  b3Float4ConstArg posA, b3QuatConstArg ornA,
+						  b3Float4ConstArg posB, b3QuatConstArg ornB,
+						  b3Float4* sep_axis, const b3Float4* verticesA, __global const b3Float4* verticesB, float* depth)
+{
+	float Min0, Max0;
+	float Min1, Max1;
+	b3Project(hullA, posA, ornA, sep_axis, verticesA, &Min0, &Max0);
+	b3Project(hullB, posB, ornB, sep_axis, verticesB, &Min1, &Max1);
+
+	if (Max0 < Min1 || Max1 < Min0)
+		return false;
+
+	float d0 = Max0 - Min1;
+	float d1 = Max1 - Min0;
+	*depth = d0 < d1 ? d0 : d1;
+	return true;
+}
+
+bool b3FindSeparatingAxis(const b3ConvexPolyhedronData* hullA, __global const b3ConvexPolyhedronData* hullB,
+						  b3Float4ConstArg posA1,
+						  b3QuatConstArg ornA,
+						  b3Float4ConstArg posB1,
+						  b3QuatConstArg ornB,
+						  b3Float4ConstArg DeltaC2,
+
+						  const b3Float4* verticesA,
+						  const b3Float4* uniqueEdgesA,
+						  const b3GpuFace* facesA,
+						  const int* indicesA,
+
+						  __global const b3Float4* verticesB,
+						  __global const b3Float4* uniqueEdgesB,
+						  __global const b3GpuFace* facesB,
+						  __global const int* indicesB,
+						  b3Float4* sep,
+						  float* dmin)
+{
+	b3Float4 posA = posA1;
+	posA.w = 0.f;
+	b3Float4 posB = posB1;
+	posB.w = 0.f;
+	/*
+	static int maxFaceVertex = 0;
+
+	int curFaceVertexAB = hullA->m_numFaces*hullB->m_numVertices;
+	curFaceVertexAB+= hullB->m_numFaces*hullA->m_numVertices;
+
+	if (curFaceVertexAB>maxFaceVertex)
+	{
+		maxFaceVertex = curFaceVertexAB;
+		printf("curFaceVertexAB = %d\n",curFaceVertexAB);
+		printf("hullA->m_numFaces = %d\n",hullA->m_numFaces);
+		printf("hullA->m_numVertices = %d\n",hullA->m_numVertices);
+		printf("hullB->m_numVertices = %d\n",hullB->m_numVertices);
+	}
+*/
+
+	int curPlaneTests = 0;
+	{
+		int numFacesA = hullA->m_numFaces;
+		// Test normals from hullA
+		for (int i = 0; i < numFacesA; i++)
+		{
+			const b3Float4 normal = facesA[hullA->m_faceOffset + i].m_plane;
+			b3Float4 faceANormalWS = b3QuatRotate(ornA, normal);
+			if (b3Dot(DeltaC2, faceANormalWS) < 0)
+				faceANormalWS *= -1.f;
+			curPlaneTests++;
+			float d;
+			if (!b3TestSepAxis(hullA, hullB, posA, ornA, posB, ornB, &faceANormalWS, verticesA, verticesB, &d))
+				return false;
+			if (d < *dmin)
+			{
+				*dmin = d;
+				*sep = faceANormalWS;
+			}
+		}
+	}
+	if ((b3Dot(-DeltaC2, *sep)) > 0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+b3Vector3 unitSphere162[] =
+	{
+		b3MakeVector3(0.000000, -1.000000, 0.000000),
+		b3MakeVector3(0.203181, -0.967950, 0.147618),
+		b3MakeVector3(-0.077607, -0.967950, 0.238853),
+		b3MakeVector3(0.723607, -0.447220, 0.525725),
+		b3MakeVector3(0.609547, -0.657519, 0.442856),
+		b3MakeVector3(0.812729, -0.502301, 0.295238),
+		b3MakeVector3(-0.251147, -0.967949, 0.000000),
+		b3MakeVector3(-0.077607, -0.967950, -0.238853),
+		b3MakeVector3(0.203181, -0.967950, -0.147618),
+		b3MakeVector3(0.860698, -0.251151, 0.442858),
+		b3MakeVector3(-0.276388, -0.447220, 0.850649),
+		b3MakeVector3(-0.029639, -0.502302, 0.864184),
+		b3MakeVector3(-0.155215, -0.251152, 0.955422),
+		b3MakeVector3(-0.894426, -0.447216, 0.000000),
+		b3MakeVector3(-0.831051, -0.502299, 0.238853),
+		b3MakeVector3(-0.956626, -0.251149, 0.147618),
+		b3MakeVector3(-0.276388, -0.447220, -0.850649),
+		b3MakeVector3(-0.483971, -0.502302, -0.716565),
+		b3MakeVector3(-0.436007, -0.251152, -0.864188),
+		b3MakeVector3(0.723607, -0.447220, -0.525725),
+		b3MakeVector3(0.531941, -0.502302, -0.681712),
+		b3MakeVector3(0.687159, -0.251152, -0.681715),
+		b3MakeVector3(0.687159, -0.251152, 0.681715),
+		b3MakeVector3(-0.436007, -0.251152, 0.864188),
+		b3MakeVector3(-0.956626, -0.251149, -0.147618),
+		b3MakeVector3(-0.155215, -0.251152, -0.955422),
+		b3MakeVector3(0.860698, -0.251151, -0.442858),
+		b3MakeVector3(0.276388, 0.447220, 0.850649),
+		b3MakeVector3(0.483971, 0.502302, 0.716565),
+		b3MakeVector3(0.232822, 0.657519, 0.716563),
+		b3MakeVector3(-0.723607, 0.447220, 0.525725),
+		b3MakeVector3(-0.531941, 0.502302, 0.681712),
+		b3MakeVector3(-0.609547, 0.657519, 0.442856),
+		b3MakeVector3(-0.723607, 0.447220, -0.525725),
+		b3MakeVector3(-0.812729, 0.502301, -0.295238),
+		b3MakeVector3(-0.609547, 0.657519, -0.442856),
+		b3MakeVector3(0.276388, 0.447220, -0.850649),
+		b3MakeVector3(0.029639, 0.502302, -0.864184),
+		b3MakeVector3(0.232822, 0.657519, -0.716563),
+		b3MakeVector3(0.894426, 0.447216, 0.000000),
+		b3MakeVector3(0.831051, 0.502299, -0.238853),
+		b3MakeVector3(0.753442, 0.657515, 0.000000),
+		b3MakeVector3(-0.232822, -0.657519, 0.716563),
+		b3MakeVector3(-0.162456, -0.850654, 0.499995),
+		b3MakeVector3(0.052790, -0.723612, 0.688185),
+		b3MakeVector3(0.138199, -0.894429, 0.425321),
+		b3MakeVector3(0.262869, -0.525738, 0.809012),
+		b3MakeVector3(0.361805, -0.723611, 0.587779),
+		b3MakeVector3(0.531941, -0.502302, 0.681712),
+		b3MakeVector3(0.425323, -0.850654, 0.309011),
+		b3MakeVector3(0.812729, -0.502301, -0.295238),
+		b3MakeVector3(0.609547, -0.657519, -0.442856),
+		b3MakeVector3(0.850648, -0.525736, 0.000000),
+		b3MakeVector3(0.670817, -0.723611, -0.162457),
+		b3MakeVector3(0.670817, -0.723610, 0.162458),
+		b3MakeVector3(0.425323, -0.850654, -0.309011),
+		b3MakeVector3(0.447211, -0.894428, 0.000001),
+		b3MakeVector3(-0.753442, -0.657515, 0.000000),
+		b3MakeVector3(-0.525730, -0.850652, 0.000000),
+		b3MakeVector3(-0.638195, -0.723609, 0.262864),
+		b3MakeVector3(-0.361801, -0.894428, 0.262864),
+		b3MakeVector3(-0.688189, -0.525736, 0.499997),
+		b3MakeVector3(-0.447211, -0.723610, 0.525729),
+		b3MakeVector3(-0.483971, -0.502302, 0.716565),
+		b3MakeVector3(-0.232822, -0.657519, -0.716563),
+		b3MakeVector3(-0.162456, -0.850654, -0.499995),
+		b3MakeVector3(-0.447211, -0.723611, -0.525727),
+		b3MakeVector3(-0.361801, -0.894429, -0.262863),
+		b3MakeVector3(-0.688189, -0.525736, -0.499997),
+		b3MakeVector3(-0.638195, -0.723609, -0.262863),
+		b3MakeVector3(-0.831051, -0.502299, -0.238853),
+		b3MakeVector3(0.361804, -0.723612, -0.587779),
+		b3MakeVector3(0.138197, -0.894429, -0.425321),
+		b3MakeVector3(0.262869, -0.525738, -0.809012),
+		b3MakeVector3(0.052789, -0.723611, -0.688186),
+		b3MakeVector3(-0.029639, -0.502302, -0.864184),
+		b3MakeVector3(0.956626, 0.251149, 0.147618),
+		b3MakeVector3(0.956626, 0.251149, -0.147618),
+		b3MakeVector3(0.951058, -0.000000, 0.309013),
+		b3MakeVector3(1.000000, 0.000000, 0.000000),
+		b3MakeVector3(0.947213, -0.276396, 0.162458),
+		b3MakeVector3(0.951058, 0.000000, -0.309013),
+		b3MakeVector3(0.947213, -0.276396, -0.162458),
+		b3MakeVector3(0.155215, 0.251152, 0.955422),
+		b3MakeVector3(0.436007, 0.251152, 0.864188),
+		b3MakeVector3(-0.000000, -0.000000, 1.000000),
+		b3MakeVector3(0.309017, 0.000000, 0.951056),
+		b3MakeVector3(0.138199, -0.276398, 0.951055),
+		b3MakeVector3(0.587786, 0.000000, 0.809017),
+		b3MakeVector3(0.447216, -0.276398, 0.850648),
+		b3MakeVector3(-0.860698, 0.251151, 0.442858),
+		b3MakeVector3(-0.687159, 0.251152, 0.681715),
+		b3MakeVector3(-0.951058, -0.000000, 0.309013),
+		b3MakeVector3(-0.809018, 0.000000, 0.587783),
+		b3MakeVector3(-0.861803, -0.276396, 0.425324),
+		b3MakeVector3(-0.587786, 0.000000, 0.809017),
+		b3MakeVector3(-0.670819, -0.276397, 0.688191),
+		b3MakeVector3(-0.687159, 0.251152, -0.681715),
+		b3MakeVector3(-0.860698, 0.251151, -0.442858),
+		b3MakeVector3(-0.587786, -0.000000, -0.809017),
+		b3MakeVector3(-0.809018, -0.000000, -0.587783),
+		b3MakeVector3(-0.670819, -0.276397, -0.688191),
+		b3MakeVector3(-0.951058, 0.000000, -0.309013),
+		b3MakeVector3(-0.861803, -0.276396, -0.425324),
+		b3MakeVector3(0.436007, 0.251152, -0.864188),
+		b3MakeVector3(0.155215, 0.251152, -0.955422),
+		b3MakeVector3(0.587786, -0.000000, -0.809017),
+		b3MakeVector3(0.309017, -0.000000, -0.951056),
+		b3MakeVector3(0.447216, -0.276398, -0.850648),
+		b3MakeVector3(0.000000, 0.000000, -1.000000),
+		b3MakeVector3(0.138199, -0.276398, -0.951055),
+		b3MakeVector3(0.670820, 0.276396, 0.688190),
+		b3MakeVector3(0.809019, -0.000002, 0.587783),
+		b3MakeVector3(0.688189, 0.525736, 0.499997),
+		b3MakeVector3(0.861804, 0.276394, 0.425323),
+		b3MakeVector3(0.831051, 0.502299, 0.238853),
+		b3MakeVector3(-0.447216, 0.276397, 0.850649),
+		b3MakeVector3(-0.309017, -0.000001, 0.951056),
+		b3MakeVector3(-0.262869, 0.525738, 0.809012),
+		b3MakeVector3(-0.138199, 0.276397, 0.951055),
+		b3MakeVector3(0.029639, 0.502302, 0.864184),
+		b3MakeVector3(-0.947213, 0.276396, -0.162458),
+		b3MakeVector3(-1.000000, 0.000001, 0.000000),
+		b3MakeVector3(-0.850648, 0.525736, -0.000000),
+		b3MakeVector3(-0.947213, 0.276397, 0.162458),
+		b3MakeVector3(-0.812729, 0.502301, 0.295238),
+		b3MakeVector3(-0.138199, 0.276397, -0.951055),
+		b3MakeVector3(-0.309016, -0.000000, -0.951057),
+		b3MakeVector3(-0.262869, 0.525738, -0.809012),
+		b3MakeVector3(-0.447215, 0.276397, -0.850649),
+		b3MakeVector3(-0.531941, 0.502302, -0.681712),
+		b3MakeVector3(0.861804, 0.276396, -0.425322),
+		b3MakeVector3(0.809019, 0.000000, -0.587782),
+		b3MakeVector3(0.688189, 0.525736, -0.499997),
+		b3MakeVector3(0.670821, 0.276397, -0.688189),
+		b3MakeVector3(0.483971, 0.502302, -0.716565),
+		b3MakeVector3(0.077607, 0.967950, 0.238853),
+		b3MakeVector3(0.251147, 0.967949, 0.000000),
+		b3MakeVector3(0.000000, 1.000000, 0.000000),
+		b3MakeVector3(0.162456, 0.850654, 0.499995),
+		b3MakeVector3(0.361800, 0.894429, 0.262863),
+		b3MakeVector3(0.447209, 0.723612, 0.525728),
+		b3MakeVector3(0.525730, 0.850652, 0.000000),
+		b3MakeVector3(0.638194, 0.723610, 0.262864),
+		b3MakeVector3(-0.203181, 0.967950, 0.147618),
+		b3MakeVector3(-0.425323, 0.850654, 0.309011),
+		b3MakeVector3(-0.138197, 0.894430, 0.425320),
+		b3MakeVector3(-0.361804, 0.723612, 0.587778),
+		b3MakeVector3(-0.052790, 0.723612, 0.688185),
+		b3MakeVector3(-0.203181, 0.967950, -0.147618),
+		b3MakeVector3(-0.425323, 0.850654, -0.309011),
+		b3MakeVector3(-0.447210, 0.894429, 0.000000),
+		b3MakeVector3(-0.670817, 0.723611, -0.162457),
+		b3MakeVector3(-0.670817, 0.723611, 0.162457),
+		b3MakeVector3(0.077607, 0.967950, -0.238853),
+		b3MakeVector3(0.162456, 0.850654, -0.499995),
+		b3MakeVector3(-0.138197, 0.894430, -0.425320),
+		b3MakeVector3(-0.052790, 0.723612, -0.688185),
+		b3MakeVector3(-0.361804, 0.723612, -0.587778),
+		b3MakeVector3(0.361800, 0.894429, -0.262863),
+		b3MakeVector3(0.638194, 0.723610, -0.262864),
+		b3MakeVector3(0.447209, 0.723612, -0.525728)};
+
+bool b3FindSeparatingAxisEdgeEdge(const b3ConvexPolyhedronData* hullA, __global const b3ConvexPolyhedronData* hullB,
+								  b3Float4ConstArg posA1,
+								  b3QuatConstArg ornA,
+								  b3Float4ConstArg posB1,
+								  b3QuatConstArg ornB,
+								  b3Float4ConstArg DeltaC2,
+								  const b3Float4* verticesA,
+								  const b3Float4* uniqueEdgesA,
+								  const b3GpuFace* facesA,
+								  const int* indicesA,
+								  __global const b3Float4* verticesB,
+								  __global const b3Float4* uniqueEdgesB,
+								  __global const b3GpuFace* facesB,
+								  __global const int* indicesB,
+								  b3Float4* sep,
+								  float* dmin,
+								  bool searchAllEdgeEdge)
+{
+	b3Float4 posA = posA1;
+	posA.w = 0.f;
+	b3Float4 posB = posB1;
+	posB.w = 0.f;
+
+	//	int curPlaneTests=0;
+
+	int curEdgeEdge = 0;
+	// Test edges
+	static int maxEdgeTests = 0;
+	int curEdgeTests = hullA->m_numUniqueEdges * hullB->m_numUniqueEdges;
+	if (curEdgeTests > maxEdgeTests)
+	{
+		maxEdgeTests = curEdgeTests;
+		printf("maxEdgeTests = %d\n", maxEdgeTests);
+		printf("hullA->m_numUniqueEdges = %d\n", hullA->m_numUniqueEdges);
+		printf("hullB->m_numUniqueEdges = %d\n", hullB->m_numUniqueEdges);
+	}
+
+	if (searchAllEdgeEdge)
+	{
+		for (int e0 = 0; e0 < hullA->m_numUniqueEdges; e0++)
+		{
+			const b3Float4 edge0 = uniqueEdgesA[hullA->m_uniqueEdgesOffset + e0];
+			b3Float4 edge0World = b3QuatRotate(ornA, edge0);
+
+			for (int e1 = 0; e1 < hullB->m_numUniqueEdges; e1++)
+			{
+				const b3Float4 edge1 = uniqueEdgesB[hullB->m_uniqueEdgesOffset + e1];
+				b3Float4 edge1World = b3QuatRotate(ornB, edge1);
+
+				b3Float4 crossje = b3Cross(edge0World, edge1World);
+
+				curEdgeEdge++;
+				if (!b3IsAlmostZero(crossje))
+				{
+					crossje = b3Normalized(crossje);
+					if (b3Dot(DeltaC2, crossje) < 0)
+						crossje *= -1.f;
+
+					float dist;
+					bool result = true;
+					{
+						float Min0, Max0;
+						float Min1, Max1;
+						b3Project(hullA, posA, ornA, &crossje, verticesA, &Min0, &Max0);
+						b3Project(hullB, posB, ornB, &crossje, verticesB, &Min1, &Max1);
+
+						if (Max0 < Min1 || Max1 < Min0)
+							return false;
+
+						float d0 = Max0 - Min1;
+						float d1 = Max1 - Min0;
+						dist = d0 < d1 ? d0 : d1;
+						result = true;
+					}
+
+					if (dist < *dmin)
+					{
+						*dmin = dist;
+						*sep = crossje;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		int numDirections = sizeof(unitSphere162) / sizeof(b3Vector3);
+		//printf("numDirections =%d\n",numDirections );
+
+		for (int i = 0; i < numDirections; i++)
+		{
+			b3Float4 crossje = unitSphere162[i];
+			{
+				//if (b3Dot(DeltaC2,crossje)>0)
+				{
+					float dist;
+					bool result = true;
+					{
+						float Min0, Max0;
+						float Min1, Max1;
+						b3Project(hullA, posA, ornA, &crossje, verticesA, &Min0, &Max0);
+						b3Project(hullB, posB, ornB, &crossje, verticesB, &Min1, &Max1);
+
+						if (Max0 < Min1 || Max1 < Min0)
+							return false;
+
+						float d0 = Max0 - Min1;
+						float d1 = Max1 - Min0;
+						dist = d0 < d1 ? d0 : d1;
+						result = true;
+					}
+
+					if (dist < *dmin)
+					{
+						*dmin = dist;
+						*sep = crossje;
+					}
+				}
+			}
+		}
+	}
+
+	if ((b3Dot(-DeltaC2, *sep)) > 0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+inline int b3FindClippingFaces(b3Float4ConstArg separatingNormal,
+							   __global const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB,
+							   b3Float4ConstArg posA, b3QuatConstArg ornA, b3Float4ConstArg posB, b3QuatConstArg ornB,
+							   __global b3Float4* worldVertsA1,
+							   __global b3Float4* worldNormalsA1,
+							   __global b3Float4* worldVertsB1,
+							   int capacityWorldVerts,
+							   const float minDist, float maxDist,
+							   __global const b3Float4* verticesA,
+							   __global const b3GpuFace_t* facesA,
+							   __global const int* indicesA,
+							   __global const b3Float4* verticesB,
+							   __global const b3GpuFace_t* facesB,
+							   __global const int* indicesB,
+
+							   __global b3Int4* clippingFaces, int pairIndex)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1 = 0;
+
+	int closestFaceB = -1;
+	float dmax = -FLT_MAX;
+
+	{
+		for (int face = 0; face < hullB->m_numFaces; face++)
+		{
+			const b3Float4 Normal = b3MakeFloat4(facesB[hullB->m_faceOffset + face].m_plane.x,
+												 facesB[hullB->m_faceOffset + face].m_plane.y, facesB[hullB->m_faceOffset + face].m_plane.z, 0.f);
+			const b3Float4 WorldNormal = b3QuatRotate(ornB, Normal);
+			float d = b3Dot(WorldNormal, separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+
+	{
+		const b3GpuFace_t polyB = facesB[hullB->m_faceOffset + closestFaceB];
+		const int numVertices = polyB.m_numIndices;
+		for (int e0 = 0; e0 < numVertices; e0++)
+		{
+			const b3Float4 b = verticesB[hullB->m_vertexOffset + indicesB[polyB.m_indexOffset + e0]];
+			worldVertsB1[pairIndex * capacityWorldVerts + numWorldVertsB1++] = b3TransformPoint(b, posB, ornB);
+		}
+	}
+
+	int closestFaceA = -1;
+	{
+		float dmin = FLT_MAX;
+		for (int face = 0; face < hullA->m_numFaces; face++)
+		{
+			const b3Float4 Normal = b3MakeFloat4(
+				facesA[hullA->m_faceOffset + face].m_plane.x,
+				facesA[hullA->m_faceOffset + face].m_plane.y,
+				facesA[hullA->m_faceOffset + face].m_plane.z,
+				0.f);
+			const b3Float4 faceANormalWS = b3QuatRotate(ornA, Normal);
+
+			float d = b3Dot(faceANormalWS, separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+				worldNormalsA1[pairIndex] = faceANormalWS;
+			}
+		}
+	}
+
+	int numVerticesA = facesA[hullA->m_faceOffset + closestFaceA].m_numIndices;
+	for (int e0 = 0; e0 < numVerticesA; e0++)
+	{
+		const b3Float4 a = verticesA[hullA->m_vertexOffset + indicesA[facesA[hullA->m_faceOffset + closestFaceA].m_indexOffset + e0]];
+		worldVertsA1[pairIndex * capacityWorldVerts + e0] = b3TransformPoint(a, posA, ornA);
+	}
+
+	clippingFaces[pairIndex].x = closestFaceA;
+	clippingFaces[pairIndex].y = closestFaceB;
+	clippingFaces[pairIndex].z = numVerticesA;
+	clippingFaces[pairIndex].w = numWorldVertsB1;
+
+	return numContactsOut;
+}
+
+__kernel void b3FindConcaveSeparatingAxisKernel(__global b3Int4* concavePairs,
+												__global const b3RigidBodyData* rigidBodies,
+												__global const b3Collidable* collidables,
+												__global const b3ConvexPolyhedronData* convexShapes,
+												__global const b3Float4* vertices,
+												__global const b3Float4* uniqueEdges,
+												__global const b3GpuFace* faces,
+												__global const int* indices,
+												__global const b3GpuChildShape* gpuChildShapes,
+												__global b3Aabb* aabbs,
+												__global b3Float4* concaveSeparatingNormalsOut,
+												__global b3Int4* clippingFacesOut,
+												__global b3Vector3* worldVertsA1Out,
+												__global b3Vector3* worldNormalsA1Out,
+												__global b3Vector3* worldVertsB1Out,
+												__global int* hasSeparatingNormals,
+												int vertexFaceCapacity,
+												int numConcavePairs,
+												int pairIdx)
+{
+	int i = pairIdx;
+	/*	int i = get_global_id(0);
+	if (i>=numConcavePairs)
+		return;
+	int pairIdx = i;
+	*/
+
+	int bodyIndexA = concavePairs[i].x;
+	int bodyIndexB = concavePairs[i].y;
+
+	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+
+	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+
+	if (collidables[collidableIndexB].m_shapeType != SHAPE_CONVEX_HULL &&
+		collidables[collidableIndexB].m_shapeType != SHAPE_COMPOUND_OF_CONVEX_HULLS)
+	{
+		concavePairs[pairIdx].w = -1;
+		return;
+	}
+
+	hasSeparatingNormals[i] = 0;
+
+	//	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+	int numActualConcaveConvexTests = 0;
+
+	int f = concavePairs[i].z;
+
+	bool overlap = false;
+
+	b3ConvexPolyhedronData convexPolyhedronA;
+
+	//add 3 vertices of the triangle
+	convexPolyhedronA.m_numVertices = 3;
+	convexPolyhedronA.m_vertexOffset = 0;
+	b3Float4 localCenter = b3MakeFloat4(0.f, 0.f, 0.f, 0.f);
+
+	b3GpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset + f];
+	b3Aabb triAabb;
+	triAabb.m_minVec = b3MakeFloat4(1e30f, 1e30f, 1e30f, 0.f);
+	triAabb.m_maxVec = b3MakeFloat4(-1e30f, -1e30f, -1e30f, 0.f);
+
+	b3Float4 verticesA[3];
+	for (int i = 0; i < 3; i++)
+	{
+		int index = indices[face.m_indexOffset + i];
+		b3Float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset + index];
+		verticesA[i] = vert;
+		localCenter += vert;
+
+		triAabb.m_minVec = b3MinFloat4(triAabb.m_minVec, vert);
+		triAabb.m_maxVec = b3MaxFloat4(triAabb.m_maxVec, vert);
+	}
+
+	overlap = true;
+	overlap = (triAabb.m_minVec.x > aabbs[bodyIndexB].m_maxVec.x || triAabb.m_maxVec.x < aabbs[bodyIndexB].m_minVec.x) ? false : overlap;
+	overlap = (triAabb.m_minVec.z > aabbs[bodyIndexB].m_maxVec.z || triAabb.m_maxVec.z < aabbs[bodyIndexB].m_minVec.z) ? false : overlap;
+	overlap = (triAabb.m_minVec.y > aabbs[bodyIndexB].m_maxVec.y || triAabb.m_maxVec.y < aabbs[bodyIndexB].m_minVec.y) ? false : overlap;
+
+	if (overlap)
+	{
+		float dmin = FLT_MAX;
+		int hasSeparatingAxis = 5;
+		b3Float4 sepAxis = b3MakeFloat4(1, 2, 3, 4);
+
+		//	int localCC=0;
+		numActualConcaveConvexTests++;
+
+		//a triangle has 3 unique edges
+		convexPolyhedronA.m_numUniqueEdges = 3;
+		convexPolyhedronA.m_uniqueEdgesOffset = 0;
+		b3Float4 uniqueEdgesA[3];
+
+		uniqueEdgesA[0] = (verticesA[1] - verticesA[0]);
+		uniqueEdgesA[1] = (verticesA[2] - verticesA[1]);
+		uniqueEdgesA[2] = (verticesA[0] - verticesA[2]);
+
+		convexPolyhedronA.m_faceOffset = 0;
+
+		b3Float4 normal = b3MakeFloat4(face.m_plane.x, face.m_plane.y, face.m_plane.z, 0.f);
+
+		b3GpuFace facesA[B3_TRIANGLE_NUM_CONVEX_FACES];
+		int indicesA[3 + 3 + 2 + 2 + 2];
+		int curUsedIndices = 0;
+		int fidx = 0;
+
+		//front size of triangle
+		{
+			facesA[fidx].m_indexOffset = curUsedIndices;
+			indicesA[0] = 0;
+			indicesA[1] = 1;
+			indicesA[2] = 2;
+			curUsedIndices += 3;
+			float c = face.m_plane.w;
+			facesA[fidx].m_plane.x = normal.x;
+			facesA[fidx].m_plane.y = normal.y;
+			facesA[fidx].m_plane.z = normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices = 3;
+		}
+		fidx++;
+		//back size of triangle
+		{
+			facesA[fidx].m_indexOffset = curUsedIndices;
+			indicesA[3] = 2;
+			indicesA[4] = 1;
+			indicesA[5] = 0;
+			curUsedIndices += 3;
+			float c = b3Dot(normal, verticesA[0]);
+			//	float c1 = -face.m_plane.w;
+			facesA[fidx].m_plane.x = -normal.x;
+			facesA[fidx].m_plane.y = -normal.y;
+			facesA[fidx].m_plane.z = -normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices = 3;
+		}
+		fidx++;
+
+		bool addEdgePlanes = true;
+		if (addEdgePlanes)
+		{
+			int numVertices = 3;
+			int prevVertex = numVertices - 1;
+			for (int i = 0; i < numVertices; i++)
+			{
+				b3Float4 v0 = verticesA[i];
+				b3Float4 v1 = verticesA[prevVertex];
+
+				b3Float4 edgeNormal = b3Normalized(b3Cross(normal, v1 - v0));
+				float c = -b3Dot(edgeNormal, v0);
+
+				facesA[fidx].m_numIndices = 2;
+				facesA[fidx].m_indexOffset = curUsedIndices;
+				indicesA[curUsedIndices++] = i;
+				indicesA[curUsedIndices++] = prevVertex;
+
+				facesA[fidx].m_plane.x = edgeNormal.x;
+				facesA[fidx].m_plane.y = edgeNormal.y;
+				facesA[fidx].m_plane.z = edgeNormal.z;
+				facesA[fidx].m_plane.w = c;
+				fidx++;
+				prevVertex = i;
+			}
+		}
+		convexPolyhedronA.m_numFaces = B3_TRIANGLE_NUM_CONVEX_FACES;
+		convexPolyhedronA.m_localCenter = localCenter * (1.f / 3.f);
+
+		b3Float4 posA = rigidBodies[bodyIndexA].m_pos;
+		posA.w = 0.f;
+		b3Float4 posB = rigidBodies[bodyIndexB].m_pos;
+		posB.w = 0.f;
+
+		b3Quaternion ornA = rigidBodies[bodyIndexA].m_quat;
+		b3Quaternion ornB = rigidBodies[bodyIndexB].m_quat;
+
+		///////////////////
+		///compound shape support
+
+		if (collidables[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			int compoundChild = concavePairs[pairIdx].w;
+			int childShapeIndexB = compoundChild;  //collidables[collidableIndexB].m_shapeIndex+compoundChild;
+			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			b3Float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			b3Quaternion childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			b3Float4 newPosB = b3TransformPoint(childPosB, posB, ornB);
+			b3Quaternion newOrnB = b3QuatMul(ornB, childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+			shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+		}
+		//////////////////
+
+		b3Float4 c0local = convexPolyhedronA.m_localCenter;
+		b3Float4 c0 = b3TransformPoint(c0local, posA, ornA);
+		b3Float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		b3Float4 c1 = b3TransformPoint(c1local, posB, ornB);
+		const b3Float4 DeltaC2 = c0 - c1;
+
+		bool sepA = b3FindSeparatingAxis(&convexPolyhedronA, &convexShapes[shapeIndexB],
+										 posA, ornA,
+										 posB, ornB,
+										 DeltaC2,
+										 verticesA, uniqueEdgesA, facesA, indicesA,
+										 vertices, uniqueEdges, faces, indices,
+										 &sepAxis, &dmin);
+		hasSeparatingAxis = 4;
+		if (!sepA)
+		{
+			hasSeparatingAxis = 0;
+		}
+		else
+		{
+			bool sepB = b3FindSeparatingAxis(&convexShapes[shapeIndexB], &convexPolyhedronA,
+											 posB, ornB,
+											 posA, ornA,
+											 DeltaC2,
+											 vertices, uniqueEdges, faces, indices,
+											 verticesA, uniqueEdgesA, facesA, indicesA,
+											 &sepAxis, &dmin);
+
+			if (!sepB)
+			{
+				hasSeparatingAxis = 0;
+			}
+			else
+			{
+				bool sepEE = b3FindSeparatingAxisEdgeEdge(&convexPolyhedronA, &convexShapes[shapeIndexB],
+														  posA, ornA,
+														  posB, ornB,
+														  DeltaC2,
+														  verticesA, uniqueEdgesA, facesA, indicesA,
+														  vertices, uniqueEdges, faces, indices,
+														  &sepAxis, &dmin, true);
+
+				if (!sepEE)
+				{
+					hasSeparatingAxis = 0;
+				}
+				else
+				{
+					hasSeparatingAxis = 1;
+				}
+			}
+		}
+
+		if (hasSeparatingAxis)
+		{
+			hasSeparatingNormals[i] = 1;
+			sepAxis.w = dmin;
+			concaveSeparatingNormalsOut[pairIdx] = sepAxis;
+
+			//now compute clipping faces A and B, and world-space clipping vertices A and B...
+
+			float minDist = -1e30f;
+			float maxDist = 0.02f;
+
+			b3FindClippingFaces(sepAxis,
+								&convexPolyhedronA,
+								&convexShapes[shapeIndexB],
+								posA, ornA,
+								posB, ornB,
+								worldVertsA1Out,
+								worldNormalsA1Out,
+								worldVertsB1Out,
+								vertexFaceCapacity,
+								minDist, maxDist,
+								verticesA,
+								facesA,
+								indicesA,
+
+								vertices,
+								faces,
+								indices,
+								clippingFacesOut, pairIdx);
+		}
+		else
+		{
+			//mark this pair as in-active
+			concavePairs[pairIdx].w = -1;
+		}
+	}
+	else
+	{
+		//mark this pair as in-active
+		concavePairs[pairIdx].w = -1;
+	}
+}
+
+#endif  //B3_FIND_CONCAVE_SEPARATING_AXIS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindSeparatingAxis.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindSeparatingAxis.h
new file mode 100644
index 0000000..b4981ae
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3FindSeparatingAxis.h
@@ -0,0 +1,197 @@
+#ifndef B3_FIND_SEPARATING_AXIS_H
+#define B3_FIND_SEPARATING_AXIS_H
+
+inline void b3ProjectAxis(const b3ConvexPolyhedronData& hull, const b3Float4& pos, const b3Quaternion& orn, const b3Float4& dir, const b3AlignedObjectArray<b3Vector3>& vertices, b3Scalar& min, b3Scalar& max)
+{
+	min = FLT_MAX;
+	max = -FLT_MAX;
+	int numVerts = hull.m_numVertices;
+
+	const b3Float4 localDir = b3QuatRotate(orn.inverse(), dir);
+
+	b3Scalar offset = b3Dot3F4(pos, dir);
+
+	for (int i = 0; i < numVerts; i++)
+	{
+		//b3Vector3 pt = trans * vertices[m_vertexOffset+i];
+		//b3Scalar dp = pt.dot(dir);
+		//b3Vector3 vertex = vertices[hull.m_vertexOffset+i];
+		b3Scalar dp = b3Dot3F4((b3Float4&)vertices[hull.m_vertexOffset + i], localDir);
+		//b3Assert(dp==dpL);
+		if (dp < min) min = dp;
+		if (dp > max) max = dp;
+	}
+	if (min > max)
+	{
+		b3Scalar tmp = min;
+		min = max;
+		max = tmp;
+	}
+	min += offset;
+	max += offset;
+}
+
+inline bool b3TestSepAxis(const b3ConvexPolyhedronData& hullA, const b3ConvexPolyhedronData& hullB,
+						  const b3Float4& posA, const b3Quaternion& ornA,
+						  const b3Float4& posB, const b3Quaternion& ornB,
+						  const b3Float4& sep_axis, const b3AlignedObjectArray<b3Vector3>& verticesA, const b3AlignedObjectArray<b3Vector3>& verticesB, b3Scalar& depth)
+{
+	b3Scalar Min0, Max0;
+	b3Scalar Min1, Max1;
+	b3ProjectAxis(hullA, posA, ornA, sep_axis, verticesA, Min0, Max0);
+	b3ProjectAxis(hullB, posB, ornB, sep_axis, verticesB, Min1, Max1);
+
+	if (Max0 < Min1 || Max1 < Min0)
+		return false;
+
+	b3Scalar d0 = Max0 - Min1;
+	b3Assert(d0 >= 0.0f);
+	b3Scalar d1 = Max1 - Min0;
+	b3Assert(d1 >= 0.0f);
+	depth = d0 < d1 ? d0 : d1;
+	return true;
+}
+
+inline bool b3FindSeparatingAxis(const b3ConvexPolyhedronData& hullA, const b3ConvexPolyhedronData& hullB,
+								 const b3Float4& posA1,
+								 const b3Quaternion& ornA,
+								 const b3Float4& posB1,
+								 const b3Quaternion& ornB,
+								 const b3AlignedObjectArray<b3Vector3>& verticesA,
+								 const b3AlignedObjectArray<b3Vector3>& uniqueEdgesA,
+								 const b3AlignedObjectArray<b3GpuFace>& facesA,
+								 const b3AlignedObjectArray<int>& indicesA,
+								 const b3AlignedObjectArray<b3Vector3>& verticesB,
+								 const b3AlignedObjectArray<b3Vector3>& uniqueEdgesB,
+								 const b3AlignedObjectArray<b3GpuFace>& facesB,
+								 const b3AlignedObjectArray<int>& indicesB,
+
+								 b3Vector3& sep)
+{
+	B3_PROFILE("findSeparatingAxis");
+
+	b3Float4 posA = posA1;
+	posA.w = 0.f;
+	b3Float4 posB = posB1;
+	posB.w = 0.f;
+	//#ifdef TEST_INTERNAL_OBJECTS
+	b3Float4 c0local = (b3Float4&)hullA.m_localCenter;
+
+	b3Float4 c0 = b3TransformPoint(c0local, posA, ornA);
+	b3Float4 c1local = (b3Float4&)hullB.m_localCenter;
+	b3Float4 c1 = b3TransformPoint(c1local, posB, ornB);
+	const b3Float4 deltaC2 = c0 - c1;
+	//#endif
+
+	b3Scalar dmin = FLT_MAX;
+	int curPlaneTests = 0;
+
+	int numFacesA = hullA.m_numFaces;
+	// Test normals from hullA
+	for (int i = 0; i < numFacesA; i++)
+	{
+		const b3Float4& normal = (b3Float4&)facesA[hullA.m_faceOffset + i].m_plane;
+		b3Float4 faceANormalWS = b3QuatRotate(ornA, normal);
+
+		if (b3Dot3F4(deltaC2, faceANormalWS) < 0)
+			faceANormalWS *= -1.f;
+
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, faceANormalWS, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		b3Scalar d;
+		if (!b3TestSepAxis(hullA, hullB, posA, ornA, posB, ornB, faceANormalWS, verticesA, verticesB, d))
+			return false;
+
+		if (d < dmin)
+		{
+			dmin = d;
+			sep = (b3Vector3&)faceANormalWS;
+		}
+	}
+
+	int numFacesB = hullB.m_numFaces;
+	// Test normals from hullB
+	for (int i = 0; i < numFacesB; i++)
+	{
+		b3Float4 normal = (b3Float4&)facesB[hullB.m_faceOffset + i].m_plane;
+		b3Float4 WorldNormal = b3QuatRotate(ornB, normal);
+
+		if (b3Dot3F4(deltaC2, WorldNormal) < 0)
+		{
+			WorldNormal *= -1.f;
+		}
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, WorldNormal, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		b3Scalar d;
+		if (!b3TestSepAxis(hullA, hullB, posA, ornA, posB, ornB, WorldNormal, verticesA, verticesB, d))
+			return false;
+
+		if (d < dmin)
+		{
+			dmin = d;
+			sep = (b3Vector3&)WorldNormal;
+		}
+	}
+
+	//	b3Vector3 edgeAstart,edgeAend,edgeBstart,edgeBend;
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for (int e0 = 0; e0 < hullA.m_numUniqueEdges; e0++)
+	{
+		const b3Float4& edge0 = (b3Float4&)uniqueEdgesA[hullA.m_uniqueEdgesOffset + e0];
+		b3Float4 edge0World = b3QuatRotate(ornA, (b3Float4&)edge0);
+
+		for (int e1 = 0; e1 < hullB.m_numUniqueEdges; e1++)
+		{
+			const b3Vector3 edge1 = uniqueEdgesB[hullB.m_uniqueEdgesOffset + e1];
+			b3Float4 edge1World = b3QuatRotate(ornB, (b3Float4&)edge1);
+
+			b3Float4 crossje = b3Cross3(edge0World, edge1World);
+
+			curEdgeEdge++;
+			if (!b3IsAlmostZero((b3Vector3&)crossje))
+			{
+				crossje = b3FastNormalized3(crossje);
+				if (b3Dot3F4(deltaC2, crossje) < 0)
+					crossje *= -1.f;
+
+#ifdef TEST_INTERNAL_OBJECTS
+				gExpectedNbTests++;
+				if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, Cross, hullA, hullB, dmin))
+					continue;
+				gActualNbTests++;
+#endif
+
+				b3Scalar dist;
+				if (!b3TestSepAxis(hullA, hullB, posA, ornA, posB, ornB, crossje, verticesA, verticesB, dist))
+					return false;
+
+				if (dist < dmin)
+				{
+					dmin = dist;
+					sep = (b3Vector3&)crossje;
+				}
+			}
+		}
+	}
+
+	if ((b3Dot3F4(-deltaC2, (b3Float4&)sep)) > 0.0f)
+		sep = -sep;
+
+	return true;
+}
+
+#endif  //B3_FIND_SEPARATING_AXIS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h
new file mode 100644
index 0000000..a3bfbf2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h
@@ -0,0 +1,888 @@
+
+/***
+ * ---------------------------------
+ * Copyright (c)2012 Daniel Fiser <danfis@danfis.cz>
+ *
+ *  This file was ported from mpr.c file, part of libccd.
+ *  The Minkoski Portal Refinement implementation was ported 
+ *  to OpenCL by Erwin Coumans for the Bullet 3 Physics library.
+ *  at http://github.com/erwincoumans/bullet3
+ *
+ *  Distributed under the OSI-approved BSD License (the "License");
+ *  see <http://www.opensource.org/licenses/bsd-license.php>.
+ *  This software is distributed WITHOUT ANY WARRANTY; without even the
+ *  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the License for more information.
+ */
+
+#ifndef B3_MPR_PENETRATION_H
+#define B3_MPR_PENETRATION_H
+
+#include "Bullet3Common/shared/b3PlatformDefinitions.h"
+#include "Bullet3Common/shared/b3Float4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+
+#ifdef __cplusplus
+#define B3_MPR_SQRT sqrtf
+#else
+#define B3_MPR_SQRT sqrt
+#endif
+#define B3_MPR_FMIN(x, y) ((x) < (y) ? (x) : (y))
+#define B3_MPR_FABS fabs
+
+#define B3_MPR_TOLERANCE 1E-6f
+#define B3_MPR_MAX_ITERATIONS 1000
+
+struct _b3MprSupport_t
+{
+	b3Float4 v;   //!< Support point in minkowski sum
+	b3Float4 v1;  //!< Support point in obj1
+	b3Float4 v2;  //!< Support point in obj2
+};
+typedef struct _b3MprSupport_t b3MprSupport_t;
+
+struct _b3MprSimplex_t
+{
+	b3MprSupport_t ps[4];
+	int last;  //!< index of last added point
+};
+typedef struct _b3MprSimplex_t b3MprSimplex_t;
+
+inline b3MprSupport_t *b3MprSimplexPointW(b3MprSimplex_t *s, int idx)
+{
+	return &s->ps[idx];
+}
+
+inline void b3MprSimplexSetSize(b3MprSimplex_t *s, int size)
+{
+	s->last = size - 1;
+}
+
+inline int b3MprSimplexSize(const b3MprSimplex_t *s)
+{
+	return s->last + 1;
+}
+
+inline const b3MprSupport_t *b3MprSimplexPoint(const b3MprSimplex_t *s, int idx)
+{
+	// here is no check on boundaries
+	return &s->ps[idx];
+}
+
+inline void b3MprSupportCopy(b3MprSupport_t *d, const b3MprSupport_t *s)
+{
+	*d = *s;
+}
+
+inline void b3MprSimplexSet(b3MprSimplex_t *s, size_t pos, const b3MprSupport_t *a)
+{
+	b3MprSupportCopy(s->ps + pos, a);
+}
+
+inline void b3MprSimplexSwap(b3MprSimplex_t *s, size_t pos1, size_t pos2)
+{
+	b3MprSupport_t supp;
+
+	b3MprSupportCopy(&supp, &s->ps[pos1]);
+	b3MprSupportCopy(&s->ps[pos1], &s->ps[pos2]);
+	b3MprSupportCopy(&s->ps[pos2], &supp);
+}
+
+inline int b3MprIsZero(float val)
+{
+	return B3_MPR_FABS(val) < FLT_EPSILON;
+}
+
+inline int b3MprEq(float _a, float _b)
+{
+	float ab;
+	float a, b;
+
+	ab = B3_MPR_FABS(_a - _b);
+	if (B3_MPR_FABS(ab) < FLT_EPSILON)
+		return 1;
+
+	a = B3_MPR_FABS(_a);
+	b = B3_MPR_FABS(_b);
+	if (b > a)
+	{
+		return ab < FLT_EPSILON * b;
+	}
+	else
+	{
+		return ab < FLT_EPSILON * a;
+	}
+}
+
+inline int b3MprVec3Eq(const b3Float4 *a, const b3Float4 *b)
+{
+	return b3MprEq((*a).x, (*b).x) && b3MprEq((*a).y, (*b).y) && b3MprEq((*a).z, (*b).z);
+}
+
+inline b3Float4 b3LocalGetSupportVertex(b3Float4ConstArg supportVec, __global const b3ConvexPolyhedronData_t *hull, b3ConstArray(b3Float4) verticesA)
+{
+	b3Float4 supVec = b3MakeFloat4(0, 0, 0, 0);
+	float maxDot = -B3_LARGE_FLOAT;
+
+	if (0 < hull->m_numVertices)
+	{
+		const b3Float4 scaled = supportVec;
+		int index = b3MaxDot(scaled, &verticesA[hull->m_vertexOffset], hull->m_numVertices, &maxDot);
+		return verticesA[hull->m_vertexOffset + index];
+	}
+
+	return supVec;
+}
+
+B3_STATIC void b3MprConvexSupport(int pairIndex, int bodyIndex, b3ConstArray(b3RigidBodyData_t) cpuBodyBuf,
+								  b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData,
+								  b3ConstArray(b3Collidable_t) cpuCollidables,
+								  b3ConstArray(b3Float4) cpuVertices,
+								  __global b3Float4 *sepAxis,
+								  const b3Float4 *_dir, b3Float4 *outp, int logme)
+{
+	//dir is in worldspace, move to local space
+
+	b3Float4 pos = cpuBodyBuf[bodyIndex].m_pos;
+	b3Quat orn = cpuBodyBuf[bodyIndex].m_quat;
+
+	b3Float4 dir = b3MakeFloat4((*_dir).x, (*_dir).y, (*_dir).z, 0.f);
+
+	const b3Float4 localDir = b3QuatRotate(b3QuatInverse(orn), dir);
+
+	//find local support vertex
+	int colIndex = cpuBodyBuf[bodyIndex].m_collidableIdx;
+
+	b3Assert(cpuCollidables[colIndex].m_shapeType == SHAPE_CONVEX_HULL);
+	__global const b3ConvexPolyhedronData_t *hull = &cpuConvexData[cpuCollidables[colIndex].m_shapeIndex];
+
+	b3Float4 pInA;
+	if (logme)
+	{
+		//	b3Float4 supVec = b3MakeFloat4(0,0,0,0);
+		float maxDot = -B3_LARGE_FLOAT;
+
+		if (0 < hull->m_numVertices)
+		{
+			const b3Float4 scaled = localDir;
+			int index = b3MaxDot(scaled, &cpuVertices[hull->m_vertexOffset], hull->m_numVertices, &maxDot);
+			pInA = cpuVertices[hull->m_vertexOffset + index];
+		}
+	}
+	else
+	{
+		pInA = b3LocalGetSupportVertex(localDir, hull, cpuVertices);
+	}
+
+	//move vertex to world space
+	*outp = b3TransformPoint(pInA, pos, orn);
+}
+
+inline void b3MprSupport(int pairIndex, int bodyIndexA, int bodyIndexB, b3ConstArray(b3RigidBodyData_t) cpuBodyBuf,
+						 b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData,
+						 b3ConstArray(b3Collidable_t) cpuCollidables,
+						 b3ConstArray(b3Float4) cpuVertices,
+						 __global b3Float4 *sepAxis,
+						 const b3Float4 *_dir, b3MprSupport_t *supp)
+{
+	b3Float4 dir;
+	dir = *_dir;
+	b3MprConvexSupport(pairIndex, bodyIndexA, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &dir, &supp->v1, 0);
+	dir = *_dir * -1.f;
+	b3MprConvexSupport(pairIndex, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &dir, &supp->v2, 0);
+	supp->v = supp->v1 - supp->v2;
+}
+
+inline void b3FindOrigin(int bodyIndexA, int bodyIndexB, b3ConstArray(b3RigidBodyData_t) cpuBodyBuf, b3MprSupport_t *center)
+{
+	center->v1 = cpuBodyBuf[bodyIndexA].m_pos;
+	center->v2 = cpuBodyBuf[bodyIndexB].m_pos;
+	center->v = center->v1 - center->v2;
+}
+
+inline void b3MprVec3Set(b3Float4 *v, float x, float y, float z)
+{
+	(*v).x = x;
+	(*v).y = y;
+	(*v).z = z;
+	(*v).w = 0.f;
+}
+
+inline void b3MprVec3Add(b3Float4 *v, const b3Float4 *w)
+{
+	(*v).x += (*w).x;
+	(*v).y += (*w).y;
+	(*v).z += (*w).z;
+}
+
+inline void b3MprVec3Copy(b3Float4 *v, const b3Float4 *w)
+{
+	*v = *w;
+}
+
+inline void b3MprVec3Scale(b3Float4 *d, float k)
+{
+	*d *= k;
+}
+
+inline float b3MprVec3Dot(const b3Float4 *a, const b3Float4 *b)
+{
+	float dot;
+
+	dot = b3Dot3F4(*a, *b);
+	return dot;
+}
+
+inline float b3MprVec3Len2(const b3Float4 *v)
+{
+	return b3MprVec3Dot(v, v);
+}
+
+inline void b3MprVec3Normalize(b3Float4 *d)
+{
+	float k = 1.f / B3_MPR_SQRT(b3MprVec3Len2(d));
+	b3MprVec3Scale(d, k);
+}
+
+inline void b3MprVec3Cross(b3Float4 *d, const b3Float4 *a, const b3Float4 *b)
+{
+	*d = b3Cross3(*a, *b);
+}
+
+inline void b3MprVec3Sub2(b3Float4 *d, const b3Float4 *v, const b3Float4 *w)
+{
+	*d = *v - *w;
+}
+
+inline void b3PortalDir(const b3MprSimplex_t *portal, b3Float4 *dir)
+{
+	b3Float4 v2v1, v3v1;
+
+	b3MprVec3Sub2(&v2v1, &b3MprSimplexPoint(portal, 2)->v,
+				  &b3MprSimplexPoint(portal, 1)->v);
+	b3MprVec3Sub2(&v3v1, &b3MprSimplexPoint(portal, 3)->v,
+				  &b3MprSimplexPoint(portal, 1)->v);
+	b3MprVec3Cross(dir, &v2v1, &v3v1);
+	b3MprVec3Normalize(dir);
+}
+
+inline int portalEncapsulesOrigin(const b3MprSimplex_t *portal,
+								  const b3Float4 *dir)
+{
+	float dot;
+	dot = b3MprVec3Dot(dir, &b3MprSimplexPoint(portal, 1)->v);
+	return b3MprIsZero(dot) || dot > 0.f;
+}
+
+inline int portalReachTolerance(const b3MprSimplex_t *portal,
+								const b3MprSupport_t *v4,
+								const b3Float4 *dir)
+{
+	float dv1, dv2, dv3, dv4;
+	float dot1, dot2, dot3;
+
+	// find the smallest dot product of dir and {v1-v4, v2-v4, v3-v4}
+
+	dv1 = b3MprVec3Dot(&b3MprSimplexPoint(portal, 1)->v, dir);
+	dv2 = b3MprVec3Dot(&b3MprSimplexPoint(portal, 2)->v, dir);
+	dv3 = b3MprVec3Dot(&b3MprSimplexPoint(portal, 3)->v, dir);
+	dv4 = b3MprVec3Dot(&v4->v, dir);
+
+	dot1 = dv4 - dv1;
+	dot2 = dv4 - dv2;
+	dot3 = dv4 - dv3;
+
+	dot1 = B3_MPR_FMIN(dot1, dot2);
+	dot1 = B3_MPR_FMIN(dot1, dot3);
+
+	return b3MprEq(dot1, B3_MPR_TOLERANCE) || dot1 < B3_MPR_TOLERANCE;
+}
+
+inline int portalCanEncapsuleOrigin(const b3MprSimplex_t *portal,
+									const b3MprSupport_t *v4,
+									const b3Float4 *dir)
+{
+	float dot;
+	dot = b3MprVec3Dot(&v4->v, dir);
+	return b3MprIsZero(dot) || dot > 0.f;
+}
+
+inline void b3ExpandPortal(b3MprSimplex_t *portal,
+						   const b3MprSupport_t *v4)
+{
+	float dot;
+	b3Float4 v4v0;
+
+	b3MprVec3Cross(&v4v0, &v4->v, &b3MprSimplexPoint(portal, 0)->v);
+	dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 1)->v, &v4v0);
+	if (dot > 0.f)
+	{
+		dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 2)->v, &v4v0);
+		if (dot > 0.f)
+		{
+			b3MprSimplexSet(portal, 1, v4);
+		}
+		else
+		{
+			b3MprSimplexSet(portal, 3, v4);
+		}
+	}
+	else
+	{
+		dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 3)->v, &v4v0);
+		if (dot > 0.f)
+		{
+			b3MprSimplexSet(portal, 2, v4);
+		}
+		else
+		{
+			b3MprSimplexSet(portal, 1, v4);
+		}
+	}
+}
+
+B3_STATIC int b3DiscoverPortal(int pairIndex, int bodyIndexA, int bodyIndexB, b3ConstArray(b3RigidBodyData_t) cpuBodyBuf,
+							   b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData,
+							   b3ConstArray(b3Collidable_t) cpuCollidables,
+							   b3ConstArray(b3Float4) cpuVertices,
+							   __global b3Float4 *sepAxis,
+							   __global int *hasSepAxis,
+							   b3MprSimplex_t *portal)
+{
+	b3Float4 dir, va, vb;
+	float dot;
+	int cont;
+
+	// vertex 0 is center of portal
+	b3FindOrigin(bodyIndexA, bodyIndexB, cpuBodyBuf, b3MprSimplexPointW(portal, 0));
+	// vertex 0 is center of portal
+	b3MprSimplexSetSize(portal, 1);
+
+	b3Float4 zero = b3MakeFloat4(0, 0, 0, 0);
+	b3Float4 *b3mpr_vec3_origin = &zero;
+
+	if (b3MprVec3Eq(&b3MprSimplexPoint(portal, 0)->v, b3mpr_vec3_origin))
+	{
+		// Portal's center lies on origin (0,0,0) => we know that objects
+		// intersect but we would need to know penetration info.
+		// So move center little bit...
+		b3MprVec3Set(&va, FLT_EPSILON * 10.f, 0.f, 0.f);
+		b3MprVec3Add(&b3MprSimplexPointW(portal, 0)->v, &va);
+	}
+
+	// vertex 1 = support in direction of origin
+	b3MprVec3Copy(&dir, &b3MprSimplexPoint(portal, 0)->v);
+	b3MprVec3Scale(&dir, -1.f);
+	b3MprVec3Normalize(&dir);
+
+	b3MprSupport(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &dir, b3MprSimplexPointW(portal, 1));
+
+	b3MprSimplexSetSize(portal, 2);
+
+	// test if origin isn't outside of v1
+	dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 1)->v, &dir);
+
+	if (b3MprIsZero(dot) || dot < 0.f)
+		return -1;
+
+	// vertex 2
+	b3MprVec3Cross(&dir, &b3MprSimplexPoint(portal, 0)->v,
+				   &b3MprSimplexPoint(portal, 1)->v);
+	if (b3MprIsZero(b3MprVec3Len2(&dir)))
+	{
+		if (b3MprVec3Eq(&b3MprSimplexPoint(portal, 1)->v, b3mpr_vec3_origin))
+		{
+			// origin lies on v1
+			return 1;
+		}
+		else
+		{
+			// origin lies on v0-v1 segment
+			return 2;
+		}
+	}
+
+	b3MprVec3Normalize(&dir);
+	b3MprSupport(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &dir, b3MprSimplexPointW(portal, 2));
+
+	dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 2)->v, &dir);
+	if (b3MprIsZero(dot) || dot < 0.f)
+		return -1;
+
+	b3MprSimplexSetSize(portal, 3);
+
+	// vertex 3 direction
+	b3MprVec3Sub2(&va, &b3MprSimplexPoint(portal, 1)->v,
+				  &b3MprSimplexPoint(portal, 0)->v);
+	b3MprVec3Sub2(&vb, &b3MprSimplexPoint(portal, 2)->v,
+				  &b3MprSimplexPoint(portal, 0)->v);
+	b3MprVec3Cross(&dir, &va, &vb);
+	b3MprVec3Normalize(&dir);
+
+	// it is better to form portal faces to be oriented "outside" origin
+	dot = b3MprVec3Dot(&dir, &b3MprSimplexPoint(portal, 0)->v);
+	if (dot > 0.f)
+	{
+		b3MprSimplexSwap(portal, 1, 2);
+		b3MprVec3Scale(&dir, -1.f);
+	}
+
+	while (b3MprSimplexSize(portal) < 4)
+	{
+		b3MprSupport(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &dir, b3MprSimplexPointW(portal, 3));
+
+		dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 3)->v, &dir);
+		if (b3MprIsZero(dot) || dot < 0.f)
+			return -1;
+
+		cont = 0;
+
+		// test if origin is outside (v1, v0, v3) - set v2 as v3 and
+		// continue
+		b3MprVec3Cross(&va, &b3MprSimplexPoint(portal, 1)->v,
+					   &b3MprSimplexPoint(portal, 3)->v);
+		dot = b3MprVec3Dot(&va, &b3MprSimplexPoint(portal, 0)->v);
+		if (dot < 0.f && !b3MprIsZero(dot))
+		{
+			b3MprSimplexSet(portal, 2, b3MprSimplexPoint(portal, 3));
+			cont = 1;
+		}
+
+		if (!cont)
+		{
+			// test if origin is outside (v3, v0, v2) - set v1 as v3 and
+			// continue
+			b3MprVec3Cross(&va, &b3MprSimplexPoint(portal, 3)->v,
+						   &b3MprSimplexPoint(portal, 2)->v);
+			dot = b3MprVec3Dot(&va, &b3MprSimplexPoint(portal, 0)->v);
+			if (dot < 0.f && !b3MprIsZero(dot))
+			{
+				b3MprSimplexSet(portal, 1, b3MprSimplexPoint(portal, 3));
+				cont = 1;
+			}
+		}
+
+		if (cont)
+		{
+			b3MprVec3Sub2(&va, &b3MprSimplexPoint(portal, 1)->v,
+						  &b3MprSimplexPoint(portal, 0)->v);
+			b3MprVec3Sub2(&vb, &b3MprSimplexPoint(portal, 2)->v,
+						  &b3MprSimplexPoint(portal, 0)->v);
+			b3MprVec3Cross(&dir, &va, &vb);
+			b3MprVec3Normalize(&dir);
+		}
+		else
+		{
+			b3MprSimplexSetSize(portal, 4);
+		}
+	}
+
+	return 0;
+}
+
+B3_STATIC int b3RefinePortal(int pairIndex, int bodyIndexA, int bodyIndexB, b3ConstArray(b3RigidBodyData_t) cpuBodyBuf,
+							 b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData,
+							 b3ConstArray(b3Collidable_t) cpuCollidables,
+							 b3ConstArray(b3Float4) cpuVertices,
+							 __global b3Float4 *sepAxis,
+							 b3MprSimplex_t *portal)
+{
+	b3Float4 dir;
+	b3MprSupport_t v4;
+
+	for (int i = 0; i < B3_MPR_MAX_ITERATIONS; i++)
+	//while (1)
+	{
+		// compute direction outside the portal (from v0 throught v1,v2,v3
+		// face)
+		b3PortalDir(portal, &dir);
+
+		// test if origin is inside the portal
+		if (portalEncapsulesOrigin(portal, &dir))
+			return 0;
+
+		// get next support point
+
+		b3MprSupport(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &dir, &v4);
+
+		// test if v4 can expand portal to contain origin and if portal
+		// expanding doesn't reach given tolerance
+		if (!portalCanEncapsuleOrigin(portal, &v4, &dir) || portalReachTolerance(portal, &v4, &dir))
+		{
+			return -1;
+		}
+
+		// v1-v2-v3 triangle must be rearranged to face outside Minkowski
+		// difference (direction from v0).
+		b3ExpandPortal(portal, &v4);
+	}
+
+	return -1;
+}
+
+B3_STATIC void b3FindPos(const b3MprSimplex_t *portal, b3Float4 *pos)
+{
+	b3Float4 zero = b3MakeFloat4(0, 0, 0, 0);
+	b3Float4 *b3mpr_vec3_origin = &zero;
+
+	b3Float4 dir;
+	size_t i;
+	float b[4], sum, inv;
+	b3Float4 vec, p1, p2;
+
+	b3PortalDir(portal, &dir);
+
+	// use barycentric coordinates of tetrahedron to find origin
+	b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 1)->v,
+				   &b3MprSimplexPoint(portal, 2)->v);
+	b[0] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 3)->v);
+
+	b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 3)->v,
+				   &b3MprSimplexPoint(portal, 2)->v);
+	b[1] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 0)->v);
+
+	b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 0)->v,
+				   &b3MprSimplexPoint(portal, 1)->v);
+	b[2] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 3)->v);
+
+	b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 2)->v,
+				   &b3MprSimplexPoint(portal, 1)->v);
+	b[3] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 0)->v);
+
+	sum = b[0] + b[1] + b[2] + b[3];
+
+	if (b3MprIsZero(sum) || sum < 0.f)
+	{
+		b[0] = 0.f;
+
+		b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 2)->v,
+					   &b3MprSimplexPoint(portal, 3)->v);
+		b[1] = b3MprVec3Dot(&vec, &dir);
+		b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 3)->v,
+					   &b3MprSimplexPoint(portal, 1)->v);
+		b[2] = b3MprVec3Dot(&vec, &dir);
+		b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 1)->v,
+					   &b3MprSimplexPoint(portal, 2)->v);
+		b[3] = b3MprVec3Dot(&vec, &dir);
+
+		sum = b[1] + b[2] + b[3];
+	}
+
+	inv = 1.f / sum;
+
+	b3MprVec3Copy(&p1, b3mpr_vec3_origin);
+	b3MprVec3Copy(&p2, b3mpr_vec3_origin);
+	for (i = 0; i < 4; i++)
+	{
+		b3MprVec3Copy(&vec, &b3MprSimplexPoint(portal, i)->v1);
+		b3MprVec3Scale(&vec, b[i]);
+		b3MprVec3Add(&p1, &vec);
+
+		b3MprVec3Copy(&vec, &b3MprSimplexPoint(portal, i)->v2);
+		b3MprVec3Scale(&vec, b[i]);
+		b3MprVec3Add(&p2, &vec);
+	}
+	b3MprVec3Scale(&p1, inv);
+	b3MprVec3Scale(&p2, inv);
+
+	b3MprVec3Copy(pos, &p1);
+	b3MprVec3Add(pos, &p2);
+	b3MprVec3Scale(pos, 0.5);
+}
+
+inline float b3MprVec3Dist2(const b3Float4 *a, const b3Float4 *b)
+{
+	b3Float4 ab;
+	b3MprVec3Sub2(&ab, a, b);
+	return b3MprVec3Len2(&ab);
+}
+
+inline float _b3MprVec3PointSegmentDist2(const b3Float4 *P,
+										 const b3Float4 *x0,
+										 const b3Float4 *b,
+										 b3Float4 *witness)
+{
+	// The computation comes from solving equation of segment:
+	//      S(t) = x0 + t.d
+	//          where - x0 is initial point of segment
+	//                - d is direction of segment from x0 (|d| > 0)
+	//                - t belongs to <0, 1> interval
+	//
+	// Than, distance from a segment to some point P can be expressed:
+	//      D(t) = |x0 + t.d - P|^2
+	//          which is distance from any point on segment. Minimization
+	//          of this function brings distance from P to segment.
+	// Minimization of D(t) leads to simple quadratic equation that's
+	// solving is straightforward.
+	//
+	// Bonus of this method is witness point for free.
+
+	float dist, t;
+	b3Float4 d, a;
+
+	// direction of segment
+	b3MprVec3Sub2(&d, b, x0);
+
+	// precompute vector from P to x0
+	b3MprVec3Sub2(&a, x0, P);
+
+	t = -1.f * b3MprVec3Dot(&a, &d);
+	t /= b3MprVec3Len2(&d);
+
+	if (t < 0.f || b3MprIsZero(t))
+	{
+		dist = b3MprVec3Dist2(x0, P);
+		if (witness)
+			b3MprVec3Copy(witness, x0);
+	}
+	else if (t > 1.f || b3MprEq(t, 1.f))
+	{
+		dist = b3MprVec3Dist2(b, P);
+		if (witness)
+			b3MprVec3Copy(witness, b);
+	}
+	else
+	{
+		if (witness)
+		{
+			b3MprVec3Copy(witness, &d);
+			b3MprVec3Scale(witness, t);
+			b3MprVec3Add(witness, x0);
+			dist = b3MprVec3Dist2(witness, P);
+		}
+		else
+		{
+			// recycling variables
+			b3MprVec3Scale(&d, t);
+			b3MprVec3Add(&d, &a);
+			dist = b3MprVec3Len2(&d);
+		}
+	}
+
+	return dist;
+}
+
+inline float b3MprVec3PointTriDist2(const b3Float4 *P,
+									const b3Float4 *x0, const b3Float4 *B,
+									const b3Float4 *C,
+									b3Float4 *witness)
+{
+	// Computation comes from analytic expression for triangle (x0, B, C)
+	//      T(s, t) = x0 + s.d1 + t.d2, where d1 = B - x0 and d2 = C - x0 and
+	// Then equation for distance is:
+	//      D(s, t) = | T(s, t) - P |^2
+	// This leads to minimization of quadratic function of two variables.
+	// The solution from is taken only if s is between 0 and 1, t is
+	// between 0 and 1 and t + s < 1, otherwise distance from segment is
+	// computed.
+
+	b3Float4 d1, d2, a;
+	float u, v, w, p, q, r;
+	float s, t, dist, dist2;
+	b3Float4 witness2;
+
+	b3MprVec3Sub2(&d1, B, x0);
+	b3MprVec3Sub2(&d2, C, x0);
+	b3MprVec3Sub2(&a, x0, P);
+
+	u = b3MprVec3Dot(&a, &a);
+	v = b3MprVec3Dot(&d1, &d1);
+	w = b3MprVec3Dot(&d2, &d2);
+	p = b3MprVec3Dot(&a, &d1);
+	q = b3MprVec3Dot(&a, &d2);
+	r = b3MprVec3Dot(&d1, &d2);
+
+	s = (q * r - w * p) / (w * v - r * r);
+	t = (-s * r - q) / w;
+
+	if ((b3MprIsZero(s) || s > 0.f) && (b3MprEq(s, 1.f) || s < 1.f) && (b3MprIsZero(t) || t > 0.f) && (b3MprEq(t, 1.f) || t < 1.f) && (b3MprEq(t + s, 1.f) || t + s < 1.f))
+	{
+		if (witness)
+		{
+			b3MprVec3Scale(&d1, s);
+			b3MprVec3Scale(&d2, t);
+			b3MprVec3Copy(witness, x0);
+			b3MprVec3Add(witness, &d1);
+			b3MprVec3Add(witness, &d2);
+
+			dist = b3MprVec3Dist2(witness, P);
+		}
+		else
+		{
+			dist = s * s * v;
+			dist += t * t * w;
+			dist += 2.f * s * t * r;
+			dist += 2.f * s * p;
+			dist += 2.f * t * q;
+			dist += u;
+		}
+	}
+	else
+	{
+		dist = _b3MprVec3PointSegmentDist2(P, x0, B, witness);
+
+		dist2 = _b3MprVec3PointSegmentDist2(P, x0, C, &witness2);
+		if (dist2 < dist)
+		{
+			dist = dist2;
+			if (witness)
+				b3MprVec3Copy(witness, &witness2);
+		}
+
+		dist2 = _b3MprVec3PointSegmentDist2(P, B, C, &witness2);
+		if (dist2 < dist)
+		{
+			dist = dist2;
+			if (witness)
+				b3MprVec3Copy(witness, &witness2);
+		}
+	}
+
+	return dist;
+}
+
+B3_STATIC void b3FindPenetr(int pairIndex, int bodyIndexA, int bodyIndexB, b3ConstArray(b3RigidBodyData_t) cpuBodyBuf,
+							b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData,
+							b3ConstArray(b3Collidable_t) cpuCollidables,
+							b3ConstArray(b3Float4) cpuVertices,
+							__global b3Float4 *sepAxis,
+							b3MprSimplex_t *portal,
+							float *depth, b3Float4 *pdir, b3Float4 *pos)
+{
+	b3Float4 dir;
+	b3MprSupport_t v4;
+	unsigned long iterations;
+
+	b3Float4 zero = b3MakeFloat4(0, 0, 0, 0);
+	b3Float4 *b3mpr_vec3_origin = &zero;
+
+	iterations = 1UL;
+	for (int i = 0; i < B3_MPR_MAX_ITERATIONS; i++)
+	//while (1)
+	{
+		// compute portal direction and obtain next support point
+		b3PortalDir(portal, &dir);
+
+		b3MprSupport(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &dir, &v4);
+
+		// reached tolerance -> find penetration info
+		if (portalReachTolerance(portal, &v4, &dir) || iterations == B3_MPR_MAX_ITERATIONS)
+		{
+			*depth = b3MprVec3PointTriDist2(b3mpr_vec3_origin, &b3MprSimplexPoint(portal, 1)->v, &b3MprSimplexPoint(portal, 2)->v, &b3MprSimplexPoint(portal, 3)->v, pdir);
+			*depth = B3_MPR_SQRT(*depth);
+
+			if (b3MprIsZero((*pdir).x) && b3MprIsZero((*pdir).y) && b3MprIsZero((*pdir).z))
+			{
+				*pdir = dir;
+			}
+			b3MprVec3Normalize(pdir);
+
+			// barycentric coordinates:
+			b3FindPos(portal, pos);
+
+			return;
+		}
+
+		b3ExpandPortal(portal, &v4);
+
+		iterations++;
+	}
+}
+
+B3_STATIC void b3FindPenetrTouch(b3MprSimplex_t *portal, float *depth, b3Float4 *dir, b3Float4 *pos)
+{
+	// Touching contact on portal's v1 - so depth is zero and direction
+	// is unimportant and pos can be guessed
+	*depth = 0.f;
+	b3Float4 zero = b3MakeFloat4(0, 0, 0, 0);
+	b3Float4 *b3mpr_vec3_origin = &zero;
+
+	b3MprVec3Copy(dir, b3mpr_vec3_origin);
+
+	b3MprVec3Copy(pos, &b3MprSimplexPoint(portal, 1)->v1);
+	b3MprVec3Add(pos, &b3MprSimplexPoint(portal, 1)->v2);
+	b3MprVec3Scale(pos, 0.5);
+}
+
+B3_STATIC void b3FindPenetrSegment(b3MprSimplex_t *portal,
+								   float *depth, b3Float4 *dir, b3Float4 *pos)
+{
+	// Origin lies on v0-v1 segment.
+	// Depth is distance to v1, direction also and position must be
+	// computed
+
+	b3MprVec3Copy(pos, &b3MprSimplexPoint(portal, 1)->v1);
+	b3MprVec3Add(pos, &b3MprSimplexPoint(portal, 1)->v2);
+	b3MprVec3Scale(pos, 0.5f);
+
+	b3MprVec3Copy(dir, &b3MprSimplexPoint(portal, 1)->v);
+	*depth = B3_MPR_SQRT(b3MprVec3Len2(dir));
+	b3MprVec3Normalize(dir);
+}
+
+inline int b3MprPenetration(int pairIndex, int bodyIndexA, int bodyIndexB,
+							b3ConstArray(b3RigidBodyData_t) cpuBodyBuf,
+							b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData,
+							b3ConstArray(b3Collidable_t) cpuCollidables,
+							b3ConstArray(b3Float4) cpuVertices,
+							__global b3Float4 *sepAxis,
+							__global int *hasSepAxis,
+							float *depthOut, b3Float4 *dirOut, b3Float4 *posOut)
+{
+	b3MprSimplex_t portal;
+
+	//	if (!hasSepAxis[pairIndex])
+	//	return -1;
+
+	hasSepAxis[pairIndex] = 0;
+	int res;
+
+	// Phase 1: Portal discovery
+	res = b3DiscoverPortal(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, hasSepAxis, &portal);
+
+	//sepAxis[pairIndex] = *pdir;//or -dir?
+
+	switch (res)
+	{
+		case 0:
+		{
+			// Phase 2: Portal refinement
+
+			res = b3RefinePortal(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &portal);
+			if (res < 0)
+				return -1;
+
+			// Phase 3. Penetration info
+			b3FindPenetr(pairIndex, bodyIndexA, bodyIndexB, cpuBodyBuf, cpuConvexData, cpuCollidables, cpuVertices, sepAxis, &portal, depthOut, dirOut, posOut);
+			hasSepAxis[pairIndex] = 1;
+			sepAxis[pairIndex] = -*dirOut;
+			break;
+		}
+		case 1:
+		{
+			// Touching contact on portal's v1.
+			b3FindPenetrTouch(&portal, depthOut, dirOut, posOut);
+			break;
+		}
+		case 2:
+		{
+			b3FindPenetrSegment(&portal, depthOut, dirOut, posOut);
+			break;
+		}
+		default:
+		{
+			hasSepAxis[pairIndex] = 0;
+			//if (res < 0)
+			//{
+			// Origin isn't inside portal - no collision.
+			return -1;
+			//}
+		}
+	};
+
+	return 0;
+};
+
+#endif  //B3_MPR_PENETRATION_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3NewContactReduction.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3NewContactReduction.h
new file mode 100644
index 0000000..6e991e1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3NewContactReduction.h
@@ -0,0 +1,175 @@
+
+#ifndef B3_NEW_CONTACT_REDUCTION_H
+#define B3_NEW_CONTACT_REDUCTION_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+#define GET_NPOINTS(x) (x).m_worldNormalOnB.w
+
+int b3ExtractManifoldSequentialGlobal(__global const b3Float4* p, int nPoints, b3Float4ConstArg nearNormal, b3Int4* contactIdx)
+{
+	if (nPoints == 0)
+		return 0;
+
+	if (nPoints <= 4)
+		return nPoints;
+
+	if (nPoints > 64)
+		nPoints = 64;
+
+	b3Float4 center = b3MakeFloat4(0, 0, 0, 0);
+	{
+		for (int i = 0; i < nPoints; i++)
+			center += p[i];
+		center /= (float)nPoints;
+	}
+
+	//	sample 4 directions
+
+	b3Float4 aVector = p[0] - center;
+	b3Float4 u = b3Cross(nearNormal, aVector);
+	b3Float4 v = b3Cross(nearNormal, u);
+	u = b3Normalized(u);
+	v = b3Normalized(v);
+
+	//keep point with deepest penetration
+	float minW = FLT_MAX;
+
+	int minIndex = -1;
+
+	b3Float4 maxDots;
+	maxDots.x = FLT_MIN;
+	maxDots.y = FLT_MIN;
+	maxDots.z = FLT_MIN;
+	maxDots.w = FLT_MIN;
+
+	//	idx, distance
+	for (int ie = 0; ie < nPoints; ie++)
+	{
+		if (p[ie].w < minW)
+		{
+			minW = p[ie].w;
+			minIndex = ie;
+		}
+		float f;
+		b3Float4 r = p[ie] - center;
+		f = b3Dot(u, r);
+		if (f < maxDots.x)
+		{
+			maxDots.x = f;
+			contactIdx[0].x = ie;
+		}
+
+		f = b3Dot(-u, r);
+		if (f < maxDots.y)
+		{
+			maxDots.y = f;
+			contactIdx[0].y = ie;
+		}
+
+		f = b3Dot(v, r);
+		if (f < maxDots.z)
+		{
+			maxDots.z = f;
+			contactIdx[0].z = ie;
+		}
+
+		f = b3Dot(-v, r);
+		if (f < maxDots.w)
+		{
+			maxDots.w = f;
+			contactIdx[0].w = ie;
+		}
+	}
+
+	if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)
+	{
+		//replace the first contact with minimum (todo: replace contact with least penetration)
+		contactIdx[0].x = minIndex;
+	}
+
+	return 4;
+}
+
+__kernel void b3NewContactReductionKernel(__global b3Int4* pairs,
+										  __global const b3RigidBodyData_t* rigidBodies,
+										  __global const b3Float4* separatingNormals,
+										  __global const int* hasSeparatingAxis,
+										  __global struct b3Contact4Data* globalContactsOut,
+										  __global b3Int4* clippingFaces,
+										  __global b3Float4* worldVertsB2,
+										  volatile __global int* nGlobalContactsOut,
+										  int vertexFaceCapacity,
+										  int contactCapacity,
+										  int numPairs,
+										  int pairIndex)
+{
+	//    int i = get_global_id(0);
+	//int pairIndex = i;
+	int i = pairIndex;
+
+	b3Int4 contactIdx;
+	contactIdx = b3MakeInt4(0, 1, 2, 3);
+
+	if (i < numPairs)
+	{
+		if (hasSeparatingAxis[i])
+		{
+			int nPoints = clippingFaces[pairIndex].w;
+
+			if (nPoints > 0)
+			{
+				__global b3Float4* pointsIn = &worldVertsB2[pairIndex * vertexFaceCapacity];
+				b3Float4 normal = -separatingNormals[i];
+
+				int nReducedContacts = b3ExtractManifoldSequentialGlobal(pointsIn, nPoints, normal, &contactIdx);
+
+				int dstIdx;
+				dstIdx = b3AtomicInc(nGlobalContactsOut);
+
+				//#if 0
+				b3Assert(dstIdx < contactCapacity);
+				if (dstIdx < contactCapacity)
+				{
+					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+					c->m_worldNormalOnB = -normal;
+					c->m_restituitionCoeffCmp = (0.f * 0xffff);
+					c->m_frictionCoeffCmp = (0.7f * 0xffff);
+					c->m_batchIdx = pairIndex;
+					int bodyA = pairs[pairIndex].x;
+					int bodyB = pairs[pairIndex].y;
+
+					pairs[pairIndex].w = dstIdx;
+
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass == 0 ? -bodyA : bodyA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass == 0 ? -bodyB : bodyB;
+					c->m_childIndexA = -1;
+					c->m_childIndexB = -1;
+
+					switch (nReducedContacts)
+					{
+						case 4:
+							c->m_worldPosB[3] = pointsIn[contactIdx.w];
+						case 3:
+							c->m_worldPosB[2] = pointsIn[contactIdx.z];
+						case 2:
+							c->m_worldPosB[1] = pointsIn[contactIdx.y];
+						case 1:
+							c->m_worldPosB[0] = pointsIn[contactIdx.x];
+						default:
+						{
+						}
+					};
+
+					GET_NPOINTS(*c) = nReducedContacts;
+				}
+
+				//#endif
+
+			}  //		if (numContactsOut>0)
+		}      //		if (hasSeparatingAxis[i])
+	}          //	if (i<numPairs)
+}
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h
new file mode 100644
index 0000000..ba796ea
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h
@@ -0,0 +1,88 @@
+
+
+#ifndef B3_QUANTIZED_BVH_NODE_H
+#define B3_QUANTIZED_BVH_NODE_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+
+#define B3_MAX_NUM_PARTS_IN_BITS 10
+
+///b3QuantizedBvhNodeData is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+typedef struct b3QuantizedBvhNodeData b3QuantizedBvhNodeData_t;
+
+struct b3QuantizedBvhNodeData
+{
+	//12 bytes
+	unsigned short int m_quantizedAabbMin[3];
+	unsigned short int m_quantizedAabbMax[3];
+	//4 bytes
+	int m_escapeIndexOrTriangleIndex;
+};
+
+inline int b3GetTriangleIndex(const b3QuantizedBvhNodeData* rootNode)
+{
+	unsigned int x = 0;
+	unsigned int y = (~(x & 0)) << (31 - B3_MAX_NUM_PARTS_IN_BITS);
+	// Get only the lower bits where the triangle index is stored
+	return (rootNode->m_escapeIndexOrTriangleIndex & ~(y));
+}
+
+inline int b3IsLeaf(const b3QuantizedBvhNodeData* rootNode)
+{
+	//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+	return (rootNode->m_escapeIndexOrTriangleIndex >= 0) ? 1 : 0;
+}
+
+inline int b3GetEscapeIndex(const b3QuantizedBvhNodeData* rootNode)
+{
+	return -rootNode->m_escapeIndexOrTriangleIndex;
+}
+
+inline void b3QuantizeWithClamp(unsigned short* out, b3Float4ConstArg point2, int isMax, b3Float4ConstArg bvhAabbMin, b3Float4ConstArg bvhAabbMax, b3Float4ConstArg bvhQuantization)
+{
+	b3Float4 clampedPoint = b3MaxFloat4(point2, bvhAabbMin);
+	clampedPoint = b3MinFloat4(clampedPoint, bvhAabbMax);
+
+	b3Float4 v = (clampedPoint - bvhAabbMin) * bvhQuantization;
+	if (isMax)
+	{
+		out[0] = (unsigned short)(((unsigned short)(v.x + 1.f) | 1));
+		out[1] = (unsigned short)(((unsigned short)(v.y + 1.f) | 1));
+		out[2] = (unsigned short)(((unsigned short)(v.z + 1.f) | 1));
+	}
+	else
+	{
+		out[0] = (unsigned short)(((unsigned short)(v.x) & 0xfffe));
+		out[1] = (unsigned short)(((unsigned short)(v.y) & 0xfffe));
+		out[2] = (unsigned short)(((unsigned short)(v.z) & 0xfffe));
+	}
+}
+
+inline int b3TestQuantizedAabbAgainstQuantizedAabbSlow(
+	const unsigned short int* aabbMin1,
+	const unsigned short int* aabbMax1,
+	const unsigned short int* aabbMin2,
+	const unsigned short int* aabbMax2)
+{
+	//int overlap = 1;
+	if (aabbMin1[0] > aabbMax2[0])
+		return 0;
+	if (aabbMax1[0] < aabbMin2[0])
+		return 0;
+	if (aabbMin1[1] > aabbMax2[1])
+		return 0;
+	if (aabbMax1[1] < aabbMin2[1])
+		return 0;
+	if (aabbMin1[2] > aabbMax2[2])
+		return 0;
+	if (aabbMax1[2] < aabbMin2[2])
+		return 0;
+	return 1;
+	//overlap = ((aabbMin1[0] > aabbMax2[0]) || (aabbMax1[0] < aabbMin2[0])) ? 0 : overlap;
+	//overlap = ((aabbMin1[2] > aabbMax2[2]) || (aabbMax1[2] < aabbMin2[2])) ? 0 : overlap;
+	//overlap = ((aabbMin1[1] > aabbMax2[1]) || (aabbMax1[1] < aabbMin2[1])) ? 0 : overlap;
+	//return overlap;
+}
+
+#endif  //B3_QUANTIZED_BVH_NODE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ReduceContacts.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ReduceContacts.h
new file mode 100644
index 0000000..c108255
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3ReduceContacts.h
@@ -0,0 +1,89 @@
+#ifndef B3_REDUCE_CONTACTS_H
+#define B3_REDUCE_CONTACTS_H
+
+inline int b3ReduceContacts(const b3Float4* p, int nPoints, const b3Float4& nearNormal, b3Int4* contactIdx)
+{
+	if (nPoints == 0)
+		return 0;
+
+	if (nPoints <= 4)
+		return nPoints;
+
+	if (nPoints > 64)
+		nPoints = 64;
+
+	b3Float4 center = b3MakeFloat4(0, 0, 0, 0);
+	{
+		for (int i = 0; i < nPoints; i++)
+			center += p[i];
+		center /= (float)nPoints;
+	}
+
+	//	sample 4 directions
+
+	b3Float4 aVector = p[0] - center;
+	b3Float4 u = b3Cross3(nearNormal, aVector);
+	b3Float4 v = b3Cross3(nearNormal, u);
+	u = b3FastNormalized3(u);
+	v = b3FastNormalized3(v);
+
+	//keep point with deepest penetration
+	float minW = FLT_MAX;
+
+	int minIndex = -1;
+
+	b3Float4 maxDots;
+	maxDots.x = FLT_MIN;
+	maxDots.y = FLT_MIN;
+	maxDots.z = FLT_MIN;
+	maxDots.w = FLT_MIN;
+
+	//	idx, distance
+	for (int ie = 0; ie < nPoints; ie++)
+	{
+		if (p[ie].w < minW)
+		{
+			minW = p[ie].w;
+			minIndex = ie;
+		}
+		float f;
+		b3Float4 r = p[ie] - center;
+		f = b3Dot3F4(u, r);
+		if (f < maxDots.x)
+		{
+			maxDots.x = f;
+			contactIdx[0].x = ie;
+		}
+
+		f = b3Dot3F4(-u, r);
+		if (f < maxDots.y)
+		{
+			maxDots.y = f;
+			contactIdx[0].y = ie;
+		}
+
+		f = b3Dot3F4(v, r);
+		if (f < maxDots.z)
+		{
+			maxDots.z = f;
+			contactIdx[0].z = ie;
+		}
+
+		f = b3Dot3F4(-v, r);
+		if (f < maxDots.w)
+		{
+			maxDots.w = f;
+			contactIdx[0].w = ie;
+		}
+	}
+
+	if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)
+	{
+		//replace the first contact with minimum (todo: replace contact with least penetration)
+		contactIdx[0].x = minIndex;
+	}
+
+	return 4;
+}
+
+#endif  //B3_REDUCE_CONTACTS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h
new file mode 100644
index 0000000..663e946
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h
@@ -0,0 +1,31 @@
+#ifndef B3_RIGIDBODY_DATA_H
+#define B3_RIGIDBODY_DATA_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+#include "Bullet3Common/shared/b3Quat.h"
+#include "Bullet3Common/shared/b3Mat3x3.h"
+
+typedef struct b3RigidBodyData b3RigidBodyData_t;
+
+struct b3RigidBodyData
+{
+	b3Float4 m_pos;
+	b3Quat m_quat;
+	b3Float4 m_linVel;
+	b3Float4 m_angVel;
+
+	int m_collidableIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+};
+
+typedef struct b3InertiaData b3InertiaData_t;
+
+struct b3InertiaData
+{
+	b3Mat3x3 m_invInertiaWorld;
+	b3Mat3x3 m_initInvInertia;
+};
+
+#endif  //B3_RIGIDBODY_DATA_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h
new file mode 100644
index 0000000..e0c3a5c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h
@@ -0,0 +1,35 @@
+#ifndef B3_UPDATE_AABBS_H
+#define B3_UPDATE_AABBS_H
+
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+void b3ComputeWorldAabb(int bodyId, __global const b3RigidBodyData_t* bodies, __global const b3Collidable_t* collidables, __global const b3Aabb_t* localShapeAABB, __global b3Aabb_t* worldAabbs)
+{
+	__global const b3RigidBodyData_t* body = &bodies[bodyId];
+
+	b3Float4 position = body->m_pos;
+	b3Quat orientation = body->m_quat;
+
+	int collidableIndex = body->m_collidableIdx;
+	int shapeIndex = collidables[collidableIndex].m_shapeIndex;
+
+	if (shapeIndex >= 0)
+	{
+		b3Aabb_t localAabb = localShapeAABB[collidableIndex];
+		b3Aabb_t worldAabb;
+
+		b3Float4 aabbAMinOut, aabbAMaxOut;
+		float margin = 0.f;
+		b3TransformAabb2(localAabb.m_minVec, localAabb.m_maxVec, margin, position, orientation, &aabbAMinOut, &aabbAMaxOut);
+
+		worldAabb.m_minVec = aabbAMinOut;
+		worldAabb.m_minIndices[3] = bodyId;
+		worldAabb.m_maxVec = aabbAMaxOut;
+		worldAabb.m_signedMaxIndices[3] = body[bodyId].m_invMass == 0.f ? 0 : 1;
+		worldAabbs[bodyId] = worldAabb;
+	}
+}
+
+#endif  //B3_UPDATE_AABBS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Collision/premake4.lua b/dali-physics/third-party/bullet3/src/Bullet3Collision/premake4.lua
new file mode 100644
index 0000000..bd0da54
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Collision/premake4.lua
@@ -0,0 +1,16 @@
+	project "Bullet3Collision"
+
+	language "C++"
+				
+	kind "StaticLib"
+		
+	includedirs {".."}
+
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+
+	files {
+		"**.cpp",
+		"**.h"
+	}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/CMakeLists.txt b/dali-physics/third-party/bullet3/src/Bullet3Common/CMakeLists.txt
new file mode 100644
index 0000000..03a3b40
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/CMakeLists.txt
@@ -0,0 +1,63 @@
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+)
+
+SET(Bullet3Common_SRCS
+	b3AlignedAllocator.cpp
+	b3Vector3.cpp
+	b3Logging.cpp
+)
+
+SET(Bullet3Common_HDRS
+	b3AlignedAllocator.h
+	b3AlignedObjectArray.h
+	b3CommandLineArgs.h
+	b3HashMap.h
+	b3Logging.h
+	b3Matrix3x3.h
+	b3MinMax.h
+	b3PoolAllocator.h
+	b3QuadWord.h
+	b3Quaternion.h
+	b3Random.h
+	b3Scalar.h
+	b3StackAlloc.h
+	b3Transform.h
+	b3TransformUtil.h
+	b3Vector3.h
+	shared/b3Float4.h
+	shared/b3Int2.h
+	shared/b3Int4.h
+	shared/b3Mat3x3.h
+	shared/b3PlatformDefinitions.h
+	shared/b3Quat.h
+)
+
+ADD_LIBRARY(Bullet3Common ${Bullet3Common_SRCS} ${Bullet3Common_HDRS})
+SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES SOVERSION ${BULLET_VERSION})
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#FILES_MATCHING requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Common DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Common
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES PUBLIC_HEADER "${Bullet3Common_HDRS}")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedAllocator.cpp b/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedAllocator.cpp
new file mode 100644
index 0000000..d546d5e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedAllocator.cpp
@@ -0,0 +1,186 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3AlignedAllocator.h"
+
+#ifdef B3_ALLOCATOR_STATISTICS
+int b3g_numAlignedAllocs = 0;
+int b3g_numAlignedFree = 0;
+int b3g_totalBytesAlignedAllocs = 0;  //detect memory leaks
+#endif
+
+static void *b3AllocDefault(size_t size)
+{
+	return malloc(size);
+}
+
+static void b3FreeDefault(void *ptr)
+{
+	free(ptr);
+}
+
+static b3AllocFunc *b3s_allocFunc = b3AllocDefault;
+static b3FreeFunc *b3s_freeFunc = b3FreeDefault;
+
+#if defined(B3_HAS_ALIGNED_ALLOCATOR)
+#include <malloc.h>
+static void *b3AlignedAllocDefault(size_t size, int alignment)
+{
+	return _aligned_malloc(size, (size_t)alignment);
+}
+
+static void b3AlignedFreeDefault(void *ptr)
+{
+	_aligned_free(ptr);
+}
+#elif defined(__CELLOS_LV2__)
+#include <stdlib.h>
+
+static inline void *b3AlignedAllocDefault(size_t size, int alignment)
+{
+	return memalign(alignment, size);
+}
+
+static inline void b3AlignedFreeDefault(void *ptr)
+{
+	free(ptr);
+}
+#else
+
+static inline void *b3AlignedAllocDefault(size_t size, int alignment)
+{
+	void *ret;
+	char *real;
+	real = (char *)b3s_allocFunc(size + sizeof(void *) + (alignment - 1));
+	if (real)
+	{
+		ret = b3AlignPointer(real + sizeof(void *), alignment);
+		*((void **)(ret)-1) = (void *)(real);
+	}
+	else
+	{
+		ret = (void *)(real);
+	}
+	return (ret);
+}
+
+static inline void b3AlignedFreeDefault(void *ptr)
+{
+	void *real;
+
+	if (ptr)
+	{
+		real = *((void **)(ptr)-1);
+		b3s_freeFunc(real);
+	}
+}
+#endif
+
+static b3AlignedAllocFunc *b3s_alignedAllocFunc = b3AlignedAllocDefault;
+static b3AlignedFreeFunc *b3s_alignedFreeFunc = b3AlignedFreeDefault;
+
+void b3AlignedAllocSetCustomAligned(b3AlignedAllocFunc *allocFunc, b3AlignedFreeFunc *freeFunc)
+{
+	b3s_alignedAllocFunc = allocFunc ? allocFunc : b3AlignedAllocDefault;
+	b3s_alignedFreeFunc = freeFunc ? freeFunc : b3AlignedFreeDefault;
+}
+
+void b3AlignedAllocSetCustom(b3AllocFunc *allocFunc, b3FreeFunc *freeFunc)
+{
+	b3s_allocFunc = allocFunc ? allocFunc : b3AllocDefault;
+	b3s_freeFunc = freeFunc ? freeFunc : b3FreeDefault;
+}
+
+#ifdef B3_DEBUG_MEMORY_ALLOCATIONS
+//this generic allocator provides the total allocated number of bytes
+#include <stdio.h>
+
+void *b3AlignedAllocInternal(size_t size, int alignment, int line, char *filename)
+{
+	void *ret;
+	char *real;
+#ifdef B3_ALLOCATOR_STATISTICS
+	b3g_totalBytesAlignedAllocs += size;
+	b3g_numAlignedAllocs++;
+#endif
+	real = (char *)b3s_allocFunc(size + 2 * sizeof(void *) + (alignment - 1));
+	if (real)
+	{
+		ret = (void *)b3AlignPointer(real + 2 * sizeof(void *), alignment);
+		*((void **)(ret)-1) = (void *)(real);
+		*((int *)(ret)-2) = size;
+	}
+	else
+	{
+		ret = (void *)(real);  //??
+	}
+
+	b3Printf("allocation#%d at address %x, from %s,line %d, size %d\n", b3g_numAlignedAllocs, real, filename, line, size);
+
+	int *ptr = (int *)ret;
+	*ptr = 12;
+	return (ret);
+}
+
+void b3AlignedFreeInternal(void *ptr, int line, char *filename)
+{
+	void *real;
+#ifdef B3_ALLOCATOR_STATISTICS
+	b3g_numAlignedFree++;
+#endif
+	if (ptr)
+	{
+		real = *((void **)(ptr)-1);
+		int size = *((int *)(ptr)-2);
+#ifdef B3_ALLOCATOR_STATISTICS
+		b3g_totalBytesAlignedAllocs -= size;
+#endif
+		b3Printf("free #%d at address %x, from %s,line %d, size %d\n", b3g_numAlignedFree, real, filename, line, size);
+
+		b3s_freeFunc(real);
+	}
+	else
+	{
+		b3Printf("NULL ptr\n");
+	}
+}
+
+#else  //B3_DEBUG_MEMORY_ALLOCATIONS
+
+void *b3AlignedAllocInternal(size_t size, int alignment)
+{
+#ifdef B3_ALLOCATOR_STATISTICS
+	b3g_numAlignedAllocs++;
+#endif
+	void *ptr;
+	ptr = b3s_alignedAllocFunc(size, alignment);
+	//	b3Printf("b3AlignedAllocInternal %d, %x\n",size,ptr);
+	return ptr;
+}
+
+void b3AlignedFreeInternal(void *ptr)
+{
+	if (!ptr)
+	{
+		return;
+	}
+#ifdef B3_ALLOCATOR_STATISTICS
+	b3g_numAlignedFree++;
+#endif
+	//	b3Printf("b3AlignedFreeInternal %x\n",ptr);
+	b3s_alignedFreeFunc(ptr);
+}
+
+#endif  //B3_DEBUG_MEMORY_ALLOCATIONS
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedAllocator.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedAllocator.h
new file mode 100644
index 0000000..bcff9f1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedAllocator.h
@@ -0,0 +1,110 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_ALIGNED_ALLOCATOR
+#define B3_ALIGNED_ALLOCATOR
+
+///we probably replace this with our own aligned memory allocator
+///so we replace _aligned_malloc and _aligned_free with our own
+///that is better portable and more predictable
+
+#include "b3Scalar.h"
+//#define B3_DEBUG_MEMORY_ALLOCATIONS 1
+#ifdef B3_DEBUG_MEMORY_ALLOCATIONS
+
+#define b3AlignedAlloc(a, b) \
+	b3AlignedAllocInternal(a, b, __LINE__, __FILE__)
+
+#define b3AlignedFree(ptr) \
+	b3AlignedFreeInternal(ptr, __LINE__, __FILE__)
+
+void* b3AlignedAllocInternal(size_t size, int alignment, int line, char* filename);
+
+void b3AlignedFreeInternal(void* ptr, int line, char* filename);
+
+#else
+void* b3AlignedAllocInternal(size_t size, int alignment);
+void b3AlignedFreeInternal(void* ptr);
+
+#define b3AlignedAlloc(size, alignment) b3AlignedAllocInternal(size, alignment)
+#define b3AlignedFree(ptr) b3AlignedFreeInternal(ptr)
+
+#endif
+typedef int btSizeType;
+
+typedef void*(b3AlignedAllocFunc)(size_t size, int alignment);
+typedef void(b3AlignedFreeFunc)(void* memblock);
+typedef void*(b3AllocFunc)(size_t size);
+typedef void(b3FreeFunc)(void* memblock);
+
+///The developer can let all Bullet memory allocations go through a custom memory allocator, using b3AlignedAllocSetCustom
+void b3AlignedAllocSetCustom(b3AllocFunc* allocFunc, b3FreeFunc* freeFunc);
+///If the developer has already an custom aligned allocator, then b3AlignedAllocSetCustomAligned can be used. The default aligned allocator pre-allocates extra memory using the non-aligned allocator, and instruments it.
+void b3AlignedAllocSetCustomAligned(b3AlignedAllocFunc* allocFunc, b3AlignedFreeFunc* freeFunc);
+
+///The b3AlignedAllocator is a portable class for aligned memory allocations.
+///Default implementations for unaligned and aligned allocations can be overridden by a custom allocator using b3AlignedAllocSetCustom and b3AlignedAllocSetCustomAligned.
+template <typename T, unsigned Alignment>
+class b3AlignedAllocator
+{
+	typedef b3AlignedAllocator<T, Alignment> self_type;
+
+public:
+	//just going down a list:
+	b3AlignedAllocator() {}
+	/*
+	b3AlignedAllocator( const self_type & ) {}
+	*/
+
+	template <typename Other>
+	b3AlignedAllocator(const b3AlignedAllocator<Other, Alignment>&)
+	{
+	}
+
+	typedef const T* const_pointer;
+	typedef const T& const_reference;
+	typedef T* pointer;
+	typedef T& reference;
+	typedef T value_type;
+
+	pointer address(reference ref) const { return &ref; }
+	const_pointer address(const_reference ref) const { return &ref; }
+	pointer allocate(btSizeType n, const_pointer* hint = 0)
+	{
+		(void)hint;
+		return reinterpret_cast<pointer>(b3AlignedAlloc(sizeof(value_type) * n, Alignment));
+	}
+	void construct(pointer ptr, const value_type& value) { new (ptr) value_type(value); }
+	void deallocate(pointer ptr)
+	{
+		b3AlignedFree(reinterpret_cast<void*>(ptr));
+	}
+	void destroy(pointer ptr) { ptr->~value_type(); }
+
+	template <typename O>
+	struct rebind
+	{
+		typedef b3AlignedAllocator<O, Alignment> other;
+	};
+	template <typename O>
+	self_type& operator=(const b3AlignedAllocator<O, Alignment>&)
+	{
+		return *this;
+	}
+
+	friend bool operator==(const self_type&, const self_type&) { return true; }
+};
+
+#endif  //B3_ALIGNED_ALLOCATOR
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedObjectArray.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedObjectArray.h
new file mode 100644
index 0000000..8ef3331
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3AlignedObjectArray.h
@@ -0,0 +1,530 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_OBJECT_ARRAY__
+#define B3_OBJECT_ARRAY__
+
+#include "b3Scalar.h"  // has definitions like B3_FORCE_INLINE
+#include "b3AlignedAllocator.h"
+
+///If the platform doesn't support placement new, you can disable B3_USE_PLACEMENT_NEW
+///then the b3AlignedObjectArray doesn't support objects with virtual methods, and non-trivial constructors/destructors
+///You can enable B3_USE_MEMCPY, then swapping elements in the array will use memcpy instead of operator=
+///see discussion here: https://bulletphysics.orgphpBB2/viewtopic.php?t=1231 and
+///http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1240
+
+#define B3_USE_PLACEMENT_NEW 1
+//#define B3_USE_MEMCPY 1 //disable, because it is cumbersome to find out for each platform where memcpy is defined. It can be in <memory.h> or <string.h> or otherwise...
+#define B3_ALLOW_ARRAY_COPY_OPERATOR  // enabling this can accidently perform deep copies of data if you are not careful
+
+#ifdef B3_USE_MEMCPY
+#include <memory.h>
+#include <string.h>
+#endif  //B3_USE_MEMCPY
+
+#ifdef B3_USE_PLACEMENT_NEW
+#include <new>  //for placement new
+#endif          //B3_USE_PLACEMENT_NEW
+
+///The b3AlignedObjectArray template class uses a subset of the stl::vector interface for its methods
+///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data
+template <typename T>
+//template <class T>
+class b3AlignedObjectArray
+{
+	b3AlignedAllocator<T, 16> m_allocator;
+
+	int m_size;
+	int m_capacity;
+	T* m_data;
+	//PCK: added this line
+	bool m_ownsMemory;
+
+#ifdef B3_ALLOW_ARRAY_COPY_OPERATOR
+public:
+	B3_FORCE_INLINE b3AlignedObjectArray<T>& operator=(const b3AlignedObjectArray<T>& other)
+	{
+		copyFromArray(other);
+		return *this;
+	}
+#else   //B3_ALLOW_ARRAY_COPY_OPERATOR
+private:
+	B3_FORCE_INLINE b3AlignedObjectArray<T>& operator=(const b3AlignedObjectArray<T>& other);
+#endif  //B3_ALLOW_ARRAY_COPY_OPERATOR
+
+protected:
+	B3_FORCE_INLINE int allocSize(int size)
+	{
+		return (size ? size * 2 : 1);
+	}
+	B3_FORCE_INLINE void copy(int start, int end, T* dest) const
+	{
+		int i;
+		for (i = start; i < end; ++i)
+#ifdef B3_USE_PLACEMENT_NEW
+			new (&dest[i]) T(m_data[i]);
+#else
+			dest[i] = m_data[i];
+#endif  //B3_USE_PLACEMENT_NEW
+	}
+
+	B3_FORCE_INLINE void init()
+	{
+		//PCK: added this line
+		m_ownsMemory = true;
+		m_data = 0;
+		m_size = 0;
+		m_capacity = 0;
+	}
+	B3_FORCE_INLINE void destroy(int first, int last)
+	{
+		int i;
+		for (i = first; i < last; i++)
+		{
+			m_data[i].~T();
+		}
+	}
+
+	B3_FORCE_INLINE void* allocate(int size)
+	{
+		if (size)
+			return m_allocator.allocate(size);
+		return 0;
+	}
+
+	B3_FORCE_INLINE void deallocate()
+	{
+		if (m_data)
+		{
+			//PCK: enclosed the deallocation in this block
+			if (m_ownsMemory)
+			{
+				m_allocator.deallocate(m_data);
+			}
+			m_data = 0;
+		}
+	}
+
+public:
+	b3AlignedObjectArray()
+	{
+		init();
+	}
+
+	~b3AlignedObjectArray()
+	{
+		clear();
+	}
+
+	///Generally it is best to avoid using the copy constructor of an b3AlignedObjectArray, and use a (const) reference to the array instead.
+	b3AlignedObjectArray(const b3AlignedObjectArray& otherArray)
+	{
+		init();
+
+		int otherSize = otherArray.size();
+		resize(otherSize);
+		//don't use otherArray.copy, it can leak memory
+		for (int i = 0; i < otherSize; i++)
+		{
+			m_data[i] = otherArray[i];
+		}
+	}
+
+	/// return the number of elements in the array
+	B3_FORCE_INLINE int size() const
+	{
+		return m_size;
+	}
+
+	B3_FORCE_INLINE const T& at(int n) const
+	{
+		b3Assert(n >= 0);
+		b3Assert(n < size());
+		return m_data[n];
+	}
+
+	B3_FORCE_INLINE T& at(int n)
+	{
+		b3Assert(n >= 0);
+		b3Assert(n < size());
+		return m_data[n];
+	}
+
+	B3_FORCE_INLINE const T& operator[](int n) const
+	{
+		b3Assert(n >= 0);
+		b3Assert(n < size());
+		return m_data[n];
+	}
+
+	B3_FORCE_INLINE T& operator[](int n)
+	{
+		b3Assert(n >= 0);
+		b3Assert(n < size());
+		return m_data[n];
+	}
+
+	///clear the array, deallocated memory. Generally it is better to use array.resize(0), to reduce performance overhead of run-time memory (de)allocations.
+	B3_FORCE_INLINE void clear()
+	{
+		destroy(0, size());
+
+		deallocate();
+
+		init();
+	}
+
+	B3_FORCE_INLINE void pop_back()
+	{
+		b3Assert(m_size > 0);
+		m_size--;
+		m_data[m_size].~T();
+	}
+
+	///resize changes the number of elements in the array. If the new size is larger, the new elements will be constructed using the optional second argument.
+	///when the new number of elements is smaller, the destructor will be called, but memory will not be freed, to reduce performance overhead of run-time memory (de)allocations.
+	B3_FORCE_INLINE void resizeNoInitialize(int newsize)
+	{
+		int curSize = size();
+
+		if (newsize < curSize)
+		{
+		}
+		else
+		{
+			if (newsize > size())
+			{
+				reserve(newsize);
+			}
+			//leave this uninitialized
+		}
+		m_size = newsize;
+	}
+
+	B3_FORCE_INLINE void resize(int newsize, const T& fillData = T())
+	{
+		int curSize = size();
+
+		if (newsize < curSize)
+		{
+			for (int i = newsize; i < curSize; i++)
+			{
+				m_data[i].~T();
+			}
+		}
+		else
+		{
+			if (newsize > size())
+			{
+				reserve(newsize);
+			}
+#ifdef B3_USE_PLACEMENT_NEW
+			for (int i = curSize; i < newsize; i++)
+			{
+				new (&m_data[i]) T(fillData);
+			}
+#endif  //B3_USE_PLACEMENT_NEW
+		}
+
+		m_size = newsize;
+	}
+	B3_FORCE_INLINE T& expandNonInitializing()
+	{
+		int sz = size();
+		if (sz == capacity())
+		{
+			reserve(allocSize(size()));
+		}
+		m_size++;
+
+		return m_data[sz];
+	}
+
+	B3_FORCE_INLINE T& expand(const T& fillValue = T())
+	{
+		int sz = size();
+		if (sz == capacity())
+		{
+			reserve(allocSize(size()));
+		}
+		m_size++;
+#ifdef B3_USE_PLACEMENT_NEW
+		new (&m_data[sz]) T(fillValue);  //use the in-place new (not really allocating heap memory)
+#endif
+
+		return m_data[sz];
+	}
+
+	B3_FORCE_INLINE void push_back(const T& _Val)
+	{
+		int sz = size();
+		if (sz == capacity())
+		{
+			reserve(allocSize(size()));
+		}
+
+#ifdef B3_USE_PLACEMENT_NEW
+		new (&m_data[m_size]) T(_Val);
+#else
+		m_data[size()] = _Val;
+#endif  //B3_USE_PLACEMENT_NEW
+
+		m_size++;
+	}
+
+	/// return the pre-allocated (reserved) elements, this is at least as large as the total number of elements,see size() and reserve()
+	B3_FORCE_INLINE int capacity() const
+	{
+		return m_capacity;
+	}
+
+	B3_FORCE_INLINE void reserve(int _Count)
+	{  // determine new minimum length of allocated storage
+		if (capacity() < _Count)
+		{  // not enough room, reallocate
+			T* s = (T*)allocate(_Count);
+			b3Assert(s);
+			if (s == 0)
+			{
+				b3Error("b3AlignedObjectArray reserve out-of-memory\n");
+				_Count = 0;
+				m_size = 0;
+			}
+			copy(0, size(), s);
+
+			destroy(0, size());
+
+			deallocate();
+
+			//PCK: added this line
+			m_ownsMemory = true;
+
+			m_data = s;
+
+			m_capacity = _Count;
+		}
+	}
+
+	class less
+	{
+	public:
+		bool operator()(const T& a, const T& b)
+		{
+			return (a < b);
+		}
+	};
+
+	template <typename L>
+	void quickSortInternal(const L& CompareFunc, int lo, int hi)
+	{
+		//  lo is the lower index, hi is the upper index
+		//  of the region of array a that is to be sorted
+		int i = lo, j = hi;
+		T x = m_data[(lo + hi) / 2];
+
+		//  partition
+		do
+		{
+			while (CompareFunc(m_data[i], x))
+				i++;
+			while (CompareFunc(x, m_data[j]))
+				j--;
+			if (i <= j)
+			{
+				swap(i, j);
+				i++;
+				j--;
+			}
+		} while (i <= j);
+
+		//  recursion
+		if (lo < j)
+			quickSortInternal(CompareFunc, lo, j);
+		if (i < hi)
+			quickSortInternal(CompareFunc, i, hi);
+	}
+
+	template <typename L>
+	void quickSort(const L& CompareFunc)
+	{
+		//don't sort 0 or 1 elements
+		if (size() > 1)
+		{
+			quickSortInternal(CompareFunc, 0, size() - 1);
+		}
+	}
+
+	///heap sort from http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Sort/Heap/
+	template <typename L>
+	void downHeap(T* pArr, int k, int n, const L& CompareFunc)
+	{
+		/*  PRE: a[k+1..N] is a heap */
+		/* POST:  a[k..N]  is a heap */
+
+		T temp = pArr[k - 1];
+		/* k has child(s) */
+		while (k <= n / 2)
+		{
+			int child = 2 * k;
+
+			if ((child < n) && CompareFunc(pArr[child - 1], pArr[child]))
+			{
+				child++;
+			}
+			/* pick larger child */
+			if (CompareFunc(temp, pArr[child - 1]))
+			{
+				/* move child up */
+				pArr[k - 1] = pArr[child - 1];
+				k = child;
+			}
+			else
+			{
+				break;
+			}
+		}
+		pArr[k - 1] = temp;
+	} /*downHeap*/
+
+	void swap(int index0, int index1)
+	{
+#ifdef B3_USE_MEMCPY
+		char temp[sizeof(T)];
+		memcpy(temp, &m_data[index0], sizeof(T));
+		memcpy(&m_data[index0], &m_data[index1], sizeof(T));
+		memcpy(&m_data[index1], temp, sizeof(T));
+#else
+		T temp = m_data[index0];
+		m_data[index0] = m_data[index1];
+		m_data[index1] = temp;
+#endif  //B3_USE_PLACEMENT_NEW
+	}
+
+	template <typename L>
+	void heapSort(const L& CompareFunc)
+	{
+		/* sort a[0..N-1],  N.B. 0 to N-1 */
+		int k;
+		int n = m_size;
+		for (k = n / 2; k > 0; k--)
+		{
+			downHeap(m_data, k, n, CompareFunc);
+		}
+
+		/* a[1..N] is now a heap */
+		while (n >= 1)
+		{
+			swap(0, n - 1); /* largest of a[0..n-1] */
+
+			n = n - 1;
+			/* restore a[1..i-1] heap */
+			downHeap(m_data, 1, n, CompareFunc);
+		}
+	}
+
+	///non-recursive binary search, assumes sorted array
+	int findBinarySearch(const T& key) const
+	{
+		int first = 0;
+		int last = size() - 1;
+
+		//assume sorted array
+		while (first <= last)
+		{
+			int mid = (first + last) / 2;  // compute mid point.
+			if (key > m_data[mid])
+				first = mid + 1;  // repeat search in top half.
+			else if (key < m_data[mid])
+				last = mid - 1;  // repeat search in bottom half.
+			else
+				return mid;  // found it. return position /////
+		}
+		return size();  // failed to find key
+	}
+
+	int findLinearSearch(const T& key) const
+	{
+		int index = size();
+		int i;
+
+		for (i = 0; i < size(); i++)
+		{
+			if (m_data[i] == key)
+			{
+				index = i;
+				break;
+			}
+		}
+		return index;
+	}
+
+	int findLinearSearch2(const T& key) const
+	{
+		int index = -1;
+		int i;
+
+		for (i = 0; i < size(); i++)
+		{
+			if (m_data[i] == key)
+			{
+				index = i;
+				break;
+			}
+		}
+		return index;
+	}
+
+	void remove(const T& key)
+	{
+		int findIndex = findLinearSearch(key);
+		if (findIndex < size())
+		{
+			swap(findIndex, size() - 1);
+			pop_back();
+		}
+	}
+
+	//PCK: whole function
+	void initializeFromBuffer(void* buffer, int size, int capacity)
+	{
+		clear();
+		m_ownsMemory = false;
+		m_data = (T*)buffer;
+		m_size = size;
+		m_capacity = capacity;
+	}
+
+	void copyFromArray(const b3AlignedObjectArray& otherArray)
+	{
+		int otherSize = otherArray.size();
+		resize(otherSize);
+		//don't use otherArray.copy, it can leak memory
+		for (int i = 0; i < otherSize; i++)
+		{
+			m_data[i] = otherArray[i];
+		}
+	}
+
+	void removeAtIndex(int index)
+	{
+		if (index < size())
+		{
+			swap(index, size() - 1);
+			pop_back();
+		}
+	}
+};
+
+#endif  //B3_OBJECT_ARRAY__
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3CommandLineArgs.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3CommandLineArgs.h
new file mode 100644
index 0000000..5fe4f25
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3CommandLineArgs.h
@@ -0,0 +1,106 @@
+#ifndef COMMAND_LINE_ARGS_H
+#define COMMAND_LINE_ARGS_H
+
+/******************************************************************************
+ * Command-line parsing
+ ******************************************************************************/
+#include <map>
+#include <algorithm>
+#include <string>
+#include <cstring>
+#include <sstream>
+class b3CommandLineArgs
+{
+protected:
+	std::map<std::string, std::string> pairs;
+
+public:
+	// Constructor
+	b3CommandLineArgs(int argc, char **argv)
+	{
+		addArgs(argc, argv);
+	}
+
+	void addArgs(int argc, char **argv)
+	{
+		for (int i = 1; i < argc; i++)
+		{
+			std::string arg = argv[i];
+
+			if ((arg.length() < 2) || (arg[0] != '-') || (arg[1] != '-'))
+			{
+				continue;
+			}
+
+			std::string::size_type pos;
+			std::string key, val;
+			if ((pos = arg.find('=')) == std::string::npos)
+			{
+				key = std::string(arg, 2, arg.length() - 2);
+				val = "";
+			}
+			else
+			{
+				key = std::string(arg, 2, pos - 2);
+				val = std::string(arg, pos + 1, arg.length() - 1);
+			}
+
+			//only add new keys, don't replace existing
+			if (pairs.find(key) == pairs.end())
+			{
+				pairs[key] = val;
+			}
+		}
+	}
+
+	bool CheckCmdLineFlag(const char *arg_name)
+	{
+		std::map<std::string, std::string>::iterator itr;
+		if ((itr = pairs.find(arg_name)) != pairs.end())
+		{
+			return true;
+		}
+		return false;
+	}
+
+	template <typename T>
+	bool GetCmdLineArgument(const char *arg_name, T &val);
+
+	int ParsedArgc()
+	{
+		return pairs.size();
+	}
+};
+
+template <typename T>
+inline bool b3CommandLineArgs::GetCmdLineArgument(const char *arg_name, T &val)
+{
+	std::map<std::string, std::string>::iterator itr;
+	if ((itr = pairs.find(arg_name)) != pairs.end())
+	{
+		std::istringstream strstream(itr->second);
+		strstream >> val;
+		return true;
+	}
+	return false;
+}
+
+template <>
+inline bool b3CommandLineArgs::GetCmdLineArgument<char *>(const char *arg_name, char *&val)
+{
+	std::map<std::string, std::string>::iterator itr;
+	if ((itr = pairs.find(arg_name)) != pairs.end())
+	{
+		std::string s = itr->second;
+		val = (char *)malloc(sizeof(char) * (s.length() + 1));
+		std::strcpy(val, s.c_str());
+		return true;
+	}
+	else
+	{
+		val = NULL;
+	}
+	return false;
+}
+
+#endif  //COMMAND_LINE_ARGS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3FileUtils.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3FileUtils.h
new file mode 100644
index 0000000..9ded17e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3FileUtils.h
@@ -0,0 +1,133 @@
+#ifndef B3_FILE_UTILS_H
+#define B3_FILE_UTILS_H
+
+#include <stdio.h>
+#include "b3Scalar.h"
+#include <stddef.h>  //ptrdiff_h
+#include <string.h>
+
+struct b3FileUtils
+{
+	b3FileUtils()
+	{
+	}
+	virtual ~b3FileUtils()
+	{
+	}
+
+	static bool findFile(const char* orgFileName, char* relativeFileName, int maxRelativeFileNameMaxLen)
+	{
+		FILE* f = 0;
+		f = fopen(orgFileName, "rb");
+		if (f)
+		{
+			//printf("original file found: [%s]\n", orgFileName);
+			sprintf(relativeFileName, "%s", orgFileName);
+			fclose(f);
+			return true;
+		}
+
+		//printf("Trying various directories, relative to current working directory\n");
+		const char* prefix[] = {"./", "./data/", "../data/", "../../data/", "../../../data/", "../../../../data/"};
+		int numPrefixes = sizeof(prefix) / sizeof(const char*);
+
+		f = 0;
+		bool fileFound = false;
+
+		for (int i = 0; !f && i < numPrefixes; i++)
+		{
+#ifdef _MSC_VER
+			sprintf_s(relativeFileName, maxRelativeFileNameMaxLen, "%s%s", prefix[i], orgFileName);
+#else
+			sprintf(relativeFileName, "%s%s", prefix[i], orgFileName);
+#endif
+			f = fopen(relativeFileName, "rb");
+			if (f)
+			{
+				fileFound = true;
+				break;
+			}
+		}
+		if (f)
+		{
+			fclose(f);
+		}
+
+		return fileFound;
+	}
+
+	static const char* strip2(const char* name, const char* pattern)
+	{
+		size_t const patlen = strlen(pattern);
+		size_t patcnt = 0;
+		const char* oriptr;
+		const char* patloc;
+		// find how many times the pattern occurs in the original string
+		for (oriptr = name; (patloc = strstr(oriptr, pattern)); oriptr = patloc + patlen)
+		{
+			patcnt++;
+		}
+		return oriptr;
+	}
+
+	static int extractPath(const char* fileName, char* path, int maxPathLength)
+	{
+		const char* stripped = strip2(fileName, "/");
+		stripped = strip2(stripped, "\\");
+
+		ptrdiff_t len = stripped - fileName;
+		b3Assert((len + 1) < maxPathLength);
+
+		if (len && ((len + 1) < maxPathLength))
+		{
+			for (int i = 0; i < len; i++)
+			{
+				path[i] = fileName[i];
+			}
+			path[len] = 0;
+		}
+		else
+		{
+			len = 0;
+			b3Assert(maxPathLength > 0);
+			if (maxPathLength > 0)
+			{
+				path[len] = 0;
+			}
+		}
+		return len;
+	}
+
+	static char toLowerChar(const char t)
+	{
+		if (t >= (char)'A' && t <= (char)'Z')
+			return t + ((char)'a' - (char)'A');
+		else
+			return t;
+	}
+
+	static void toLower(char* str)
+	{
+		int len = strlen(str);
+		for (int i = 0; i < len; i++)
+		{
+			str[i] = toLowerChar(str[i]);
+		}
+	}
+
+	/*static const char* strip2(const char* name, const char* pattern)
+	{
+		size_t const patlen = strlen(pattern);
+		size_t patcnt = 0;
+		const char * oriptr;
+		const char * patloc;
+		// find how many times the pattern occurs in the original string
+		for (oriptr = name; patloc = strstr(oriptr, pattern); oriptr = patloc + patlen)
+		{
+			patcnt++;
+		}
+		return oriptr;
+	}
+	*/
+};
+#endif  //B3_FILE_UTILS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3HashMap.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3HashMap.h
new file mode 100644
index 0000000..3009e2c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3HashMap.h
@@ -0,0 +1,462 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_HASH_MAP_H
+#define B3_HASH_MAP_H
+
+#include "b3AlignedObjectArray.h"
+
+#include <string>
+
+///very basic hashable string implementation, compatible with b3HashMap
+struct b3HashString
+{
+	std::string m_string;
+	unsigned int m_hash;
+
+	B3_FORCE_INLINE unsigned int getHash() const
+	{
+		return m_hash;
+	}
+
+	b3HashString(const char* name)
+		: m_string(name)
+	{
+		/* magic numbers from http://www.isthe.com/chongo/tech/comp/fnv/ */
+		static const unsigned int InitialFNV = 2166136261u;
+		static const unsigned int FNVMultiple = 16777619u;
+
+		/* Fowler / Noll / Vo (FNV) Hash */
+		unsigned int hash = InitialFNV;
+		int len = m_string.length();
+		for (int i = 0; i < len; i++)
+		{
+			hash = hash ^ (m_string[i]); /* xor  the low 8 bits */
+			hash = hash * FNVMultiple;   /* multiply by the magic number */
+		}
+		m_hash = hash;
+	}
+
+	int portableStringCompare(const char* src, const char* dst) const
+	{
+		int ret = 0;
+
+		while (!(ret = *(unsigned char*)src - *(unsigned char*)dst) && *dst)
+			++src, ++dst;
+
+		if (ret < 0)
+			ret = -1;
+		else if (ret > 0)
+			ret = 1;
+
+		return (ret);
+	}
+
+	bool equals(const b3HashString& other) const
+	{
+		return (m_string == other.m_string);
+	}
+};
+
+const int B3_HASH_NULL = 0xffffffff;
+
+class b3HashInt
+{
+	int m_uid;
+
+public:
+	b3HashInt(int uid) : m_uid(uid)
+	{
+	}
+
+	int getUid1() const
+	{
+		return m_uid;
+	}
+
+	void setUid1(int uid)
+	{
+		m_uid = uid;
+	}
+
+	bool equals(const b3HashInt& other) const
+	{
+		return getUid1() == other.getUid1();
+	}
+	//to our success
+	B3_FORCE_INLINE unsigned int getHash() const
+	{
+		int key = m_uid;
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+};
+
+class b3HashPtr
+{
+	union {
+		const void* m_pointer;
+		int m_hashValues[2];
+	};
+
+public:
+	b3HashPtr(const void* ptr)
+		: m_pointer(ptr)
+	{
+	}
+
+	const void* getPointer() const
+	{
+		return m_pointer;
+	}
+
+	bool equals(const b3HashPtr& other) const
+	{
+		return getPointer() == other.getPointer();
+	}
+
+	//to our success
+	B3_FORCE_INLINE unsigned int getHash() const
+	{
+		const bool VOID_IS_8 = ((sizeof(void*) == 8));
+
+		int key = VOID_IS_8 ? m_hashValues[0] + m_hashValues[1] : m_hashValues[0];
+
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+};
+
+template <class Value>
+class b3HashKeyPtr
+{
+	int m_uid;
+
+public:
+	b3HashKeyPtr(int uid) : m_uid(uid)
+	{
+	}
+
+	int getUid1() const
+	{
+		return m_uid;
+	}
+
+	bool equals(const b3HashKeyPtr<Value>& other) const
+	{
+		return getUid1() == other.getUid1();
+	}
+
+	//to our success
+	B3_FORCE_INLINE unsigned int getHash() const
+	{
+		int key = m_uid;
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+};
+
+template <class Value>
+class b3HashKey
+{
+	int m_uid;
+
+public:
+	b3HashKey(int uid) : m_uid(uid)
+	{
+	}
+
+	int getUid1() const
+	{
+		return m_uid;
+	}
+
+	bool equals(const b3HashKey<Value>& other) const
+	{
+		return getUid1() == other.getUid1();
+	}
+	//to our success
+	B3_FORCE_INLINE unsigned int getHash() const
+	{
+		int key = m_uid;
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+};
+
+///The b3HashMap template class implements a generic and lightweight hashmap.
+///A basic sample of how to use b3HashMap is located in Demos\BasicDemo\main.cpp
+template <class Key, class Value>
+class b3HashMap
+{
+protected:
+	b3AlignedObjectArray<int> m_hashTable;
+	b3AlignedObjectArray<int> m_next;
+
+	b3AlignedObjectArray<Value> m_valueArray;
+	b3AlignedObjectArray<Key> m_keyArray;
+
+	void growTables(const Key& /*key*/)
+	{
+		int newCapacity = m_valueArray.capacity();
+
+		if (m_hashTable.size() < newCapacity)
+		{
+			//grow hashtable and next table
+			int curHashtableSize = m_hashTable.size();
+
+			m_hashTable.resize(newCapacity);
+			m_next.resize(newCapacity);
+
+			int i;
+
+			for (i = 0; i < newCapacity; ++i)
+			{
+				m_hashTable[i] = B3_HASH_NULL;
+			}
+			for (i = 0; i < newCapacity; ++i)
+			{
+				m_next[i] = B3_HASH_NULL;
+			}
+
+			for (i = 0; i < curHashtableSize; i++)
+			{
+				//const Value& value = m_valueArray[i];
+				//const Key& key = m_keyArray[i];
+
+				int hashValue = m_keyArray[i].getHash() & (m_valueArray.capacity() - 1);  // New hash value with new mask
+				m_next[i] = m_hashTable[hashValue];
+				m_hashTable[hashValue] = i;
+			}
+		}
+	}
+
+public:
+	void insert(const Key& key, const Value& value)
+	{
+		int hash = key.getHash() & (m_valueArray.capacity() - 1);
+
+		//replace value if the key is already there
+		int index = findIndex(key);
+		if (index != B3_HASH_NULL)
+		{
+			m_valueArray[index] = value;
+			return;
+		}
+
+		int count = m_valueArray.size();
+		int oldCapacity = m_valueArray.capacity();
+		m_valueArray.push_back(value);
+		m_keyArray.push_back(key);
+
+		int newCapacity = m_valueArray.capacity();
+		if (oldCapacity < newCapacity)
+		{
+			growTables(key);
+			//hash with new capacity
+			hash = key.getHash() & (m_valueArray.capacity() - 1);
+		}
+		m_next[count] = m_hashTable[hash];
+		m_hashTable[hash] = count;
+	}
+
+	void remove(const Key& key)
+	{
+		int hash = key.getHash() & (m_valueArray.capacity() - 1);
+
+		int pairIndex = findIndex(key);
+
+		if (pairIndex == B3_HASH_NULL)
+		{
+			return;
+		}
+
+		// Remove the pair from the hash table.
+		int index = m_hashTable[hash];
+		b3Assert(index != B3_HASH_NULL);
+
+		int previous = B3_HASH_NULL;
+		while (index != pairIndex)
+		{
+			previous = index;
+			index = m_next[index];
+		}
+
+		if (previous != B3_HASH_NULL)
+		{
+			b3Assert(m_next[previous] == pairIndex);
+			m_next[previous] = m_next[pairIndex];
+		}
+		else
+		{
+			m_hashTable[hash] = m_next[pairIndex];
+		}
+
+		// We now move the last pair into spot of the
+		// pair being removed. We need to fix the hash
+		// table indices to support the move.
+
+		int lastPairIndex = m_valueArray.size() - 1;
+
+		// If the removed pair is the last pair, we are done.
+		if (lastPairIndex == pairIndex)
+		{
+			m_valueArray.pop_back();
+			m_keyArray.pop_back();
+			return;
+		}
+
+		// Remove the last pair from the hash table.
+		int lastHash = m_keyArray[lastPairIndex].getHash() & (m_valueArray.capacity() - 1);
+
+		index = m_hashTable[lastHash];
+		b3Assert(index != B3_HASH_NULL);
+
+		previous = B3_HASH_NULL;
+		while (index != lastPairIndex)
+		{
+			previous = index;
+			index = m_next[index];
+		}
+
+		if (previous != B3_HASH_NULL)
+		{
+			b3Assert(m_next[previous] == lastPairIndex);
+			m_next[previous] = m_next[lastPairIndex];
+		}
+		else
+		{
+			m_hashTable[lastHash] = m_next[lastPairIndex];
+		}
+
+		// Copy the last pair into the remove pair's spot.
+		m_valueArray[pairIndex] = m_valueArray[lastPairIndex];
+		m_keyArray[pairIndex] = m_keyArray[lastPairIndex];
+
+		// Insert the last pair into the hash table
+		m_next[pairIndex] = m_hashTable[lastHash];
+		m_hashTable[lastHash] = pairIndex;
+
+		m_valueArray.pop_back();
+		m_keyArray.pop_back();
+	}
+
+	int size() const
+	{
+		return m_valueArray.size();
+	}
+
+	const Value* getAtIndex(int index) const
+	{
+		b3Assert(index < m_valueArray.size());
+
+		return &m_valueArray[index];
+	}
+
+	Value* getAtIndex(int index)
+	{
+		b3Assert(index < m_valueArray.size());
+
+		return &m_valueArray[index];
+	}
+
+	Key getKeyAtIndex(int index)
+	{
+		b3Assert(index < m_keyArray.size());
+		return m_keyArray[index];
+	}
+
+	const Key getKeyAtIndex(int index) const
+	{
+		b3Assert(index < m_keyArray.size());
+		return m_keyArray[index];
+	}
+
+	Value* operator[](const Key& key)
+	{
+		return find(key);
+	}
+
+	const Value* find(const Key& key) const
+	{
+		int index = findIndex(key);
+		if (index == B3_HASH_NULL)
+		{
+			return NULL;
+		}
+		return &m_valueArray[index];
+	}
+
+	Value* find(const Key& key)
+	{
+		int index = findIndex(key);
+		if (index == B3_HASH_NULL)
+		{
+			return NULL;
+		}
+		return &m_valueArray[index];
+	}
+
+	int findIndex(const Key& key) const
+	{
+		unsigned int hash = key.getHash() & (m_valueArray.capacity() - 1);
+
+		if (hash >= (unsigned int)m_hashTable.size())
+		{
+			return B3_HASH_NULL;
+		}
+
+		int index = m_hashTable[hash];
+		while ((index != B3_HASH_NULL) && key.equals(m_keyArray[index]) == false)
+		{
+			index = m_next[index];
+		}
+		return index;
+	}
+
+	void clear()
+	{
+		m_hashTable.clear();
+		m_next.clear();
+		m_valueArray.clear();
+		m_keyArray.clear();
+	}
+};
+
+#endif  //B3_HASH_MAP_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Logging.cpp b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Logging.cpp
new file mode 100644
index 0000000..9c9f7c0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Logging.cpp
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#include "b3Logging.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif  //_WIN32
+
+void b3PrintfFuncDefault(const char* msg)
+{
+#ifdef _WIN32
+	OutputDebugStringA(msg);
+#endif
+	printf("%s", msg);
+	//is this portable?
+	fflush(stdout);
+}
+
+void b3WarningMessageFuncDefault(const char* msg)
+{
+#ifdef _WIN32
+	OutputDebugStringA(msg);
+#endif
+	printf("%s", msg);
+	//is this portable?
+	fflush(stdout);
+}
+
+void b3ErrorMessageFuncDefault(const char* msg)
+{
+#ifdef _WIN32
+	OutputDebugStringA(msg);
+#endif
+	printf("%s", msg);
+
+	//is this portable?
+	fflush(stdout);
+}
+
+static b3PrintfFunc* b3s_printfFunc = b3PrintfFuncDefault;
+static b3WarningMessageFunc* b3s_warningMessageFunc = b3WarningMessageFuncDefault;
+static b3ErrorMessageFunc* b3s_errorMessageFunc = b3ErrorMessageFuncDefault;
+
+///The developer can route b3Printf output using their own implementation
+void b3SetCustomPrintfFunc(b3PrintfFunc* printfFunc)
+{
+	b3s_printfFunc = printfFunc;
+}
+void b3SetCustomWarningMessageFunc(b3PrintfFunc* warningMessageFunc)
+{
+	b3s_warningMessageFunc = warningMessageFunc;
+}
+void b3SetCustomErrorMessageFunc(b3PrintfFunc* errorMessageFunc)
+{
+	b3s_errorMessageFunc = errorMessageFunc;
+}
+
+//#define B3_MAX_DEBUG_STRING_LENGTH 2048
+#define B3_MAX_DEBUG_STRING_LENGTH 32768
+
+void b3OutputPrintfVarArgsInternal(const char* str, ...)
+{
+	char strDebug[B3_MAX_DEBUG_STRING_LENGTH] = {0};
+	va_list argList;
+	va_start(argList, str);
+#ifdef _MSC_VER
+	vsprintf_s(strDebug, B3_MAX_DEBUG_STRING_LENGTH, str, argList);
+#else
+	vsnprintf(strDebug, B3_MAX_DEBUG_STRING_LENGTH, str, argList);
+#endif
+	(b3s_printfFunc)(strDebug);
+	va_end(argList);
+}
+void b3OutputWarningMessageVarArgsInternal(const char* str, ...)
+{
+	char strDebug[B3_MAX_DEBUG_STRING_LENGTH] = {0};
+	va_list argList;
+	va_start(argList, str);
+#ifdef _MSC_VER
+	vsprintf_s(strDebug, B3_MAX_DEBUG_STRING_LENGTH, str, argList);
+#else
+	vsnprintf(strDebug, B3_MAX_DEBUG_STRING_LENGTH, str, argList);
+#endif
+	(b3s_warningMessageFunc)(strDebug);
+	va_end(argList);
+}
+void b3OutputErrorMessageVarArgsInternal(const char* str, ...)
+{
+	char strDebug[B3_MAX_DEBUG_STRING_LENGTH] = {0};
+	va_list argList;
+	va_start(argList, str);
+#ifdef _MSC_VER
+	vsprintf_s(strDebug, B3_MAX_DEBUG_STRING_LENGTH, str, argList);
+#else
+	vsnprintf(strDebug, B3_MAX_DEBUG_STRING_LENGTH, str, argList);
+#endif
+	(b3s_errorMessageFunc)(strDebug);
+	va_end(argList);
+}
+
+void b3EnterProfileZoneDefault(const char* name)
+{
+}
+void b3LeaveProfileZoneDefault()
+{
+}
+static b3EnterProfileZoneFunc* b3s_enterFunc = b3EnterProfileZoneDefault;
+static b3LeaveProfileZoneFunc* b3s_leaveFunc = b3LeaveProfileZoneDefault;
+void b3EnterProfileZone(const char* name)
+{
+	(b3s_enterFunc)(name);
+}
+void b3LeaveProfileZone()
+{
+	(b3s_leaveFunc)();
+}
+
+void b3SetCustomEnterProfileZoneFunc(b3EnterProfileZoneFunc* enterFunc)
+{
+	b3s_enterFunc = enterFunc;
+}
+void b3SetCustomLeaveProfileZoneFunc(b3LeaveProfileZoneFunc* leaveFunc)
+{
+	b3s_leaveFunc = leaveFunc;
+}
+
+#ifndef _MSC_VER
+#undef vsprintf_s
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Logging.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Logging.h
new file mode 100644
index 0000000..f61149d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Logging.h
@@ -0,0 +1,74 @@
+
+#ifndef B3_LOGGING_H
+#define B3_LOGGING_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+///We add the do/while so that the statement "if (condition) b3Printf("test"); else {...}" would fail
+///You can also customize the message by uncommenting out a different line below
+#define b3Printf(...) b3OutputPrintfVarArgsInternal(__VA_ARGS__)
+	//#define b3Printf(...) do {b3OutputPrintfVarArgsInternal("b3Printf[%s,%d]:",__FILE__,__LINE__);b3OutputPrintfVarArgsInternal(__VA_ARGS__); } while(0)
+	//#define b3Printf b3OutputPrintfVarArgsInternal
+	//#define b3Printf(...) printf(__VA_ARGS__)
+	//#define b3Printf(...)
+#define b3Warning(...) do{	b3OutputWarningMessageVarArgsInternal("b3Warning[%s,%d]:\n", __FILE__, __LINE__);b3OutputWarningMessageVarArgsInternal(__VA_ARGS__);} while (0)
+#define b3Error(...)do	{b3OutputErrorMessageVarArgsInternal("b3Error[%s,%d]:\n", __FILE__, __LINE__);b3OutputErrorMessageVarArgsInternal(__VA_ARGS__);} while (0)
+#ifndef B3_NO_PROFILE
+
+	void b3EnterProfileZone(const char* name);
+	void b3LeaveProfileZone();
+#ifdef __cplusplus
+
+	class b3ProfileZone
+	{
+	public:
+		b3ProfileZone(const char* name)
+		{
+			b3EnterProfileZone(name);
+		}
+
+		~b3ProfileZone()
+		{
+			b3LeaveProfileZone();
+		}
+	};
+
+#define B3_PROFILE(name) b3ProfileZone __profile(name)
+#endif
+
+#else  //B3_NO_PROFILE
+
+#define B3_PROFILE(name)
+#define b3StartProfile(a)
+#define b3StopProfile
+
+#endif  //#ifndef B3_NO_PROFILE
+
+	typedef void(b3PrintfFunc)(const char* msg);
+	typedef void(b3WarningMessageFunc)(const char* msg);
+	typedef void(b3ErrorMessageFunc)(const char* msg);
+	typedef void(b3EnterProfileZoneFunc)(const char* msg);
+	typedef void(b3LeaveProfileZoneFunc)();
+
+	///The developer can route b3Printf output using their own implementation
+	void b3SetCustomPrintfFunc(b3PrintfFunc* printfFunc);
+	void b3SetCustomWarningMessageFunc(b3WarningMessageFunc* warningMsgFunc);
+	void b3SetCustomErrorMessageFunc(b3ErrorMessageFunc* errorMsgFunc);
+
+	///Set custom profile zone functions (zones can be nested)
+	void b3SetCustomEnterProfileZoneFunc(b3EnterProfileZoneFunc* enterFunc);
+	void b3SetCustomLeaveProfileZoneFunc(b3LeaveProfileZoneFunc* leaveFunc);
+
+	///Don't use those internal functions directly, use the b3Printf or b3SetCustomPrintfFunc instead (or warning/error version)
+	void b3OutputPrintfVarArgsInternal(const char* str, ...);
+	void b3OutputWarningMessageVarArgsInternal(const char* str, ...);
+	void b3OutputErrorMessageVarArgsInternal(const char* str, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  //B3_LOGGING_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Matrix3x3.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Matrix3x3.h
new file mode 100644
index 0000000..6c46536
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Matrix3x3.h
@@ -0,0 +1,1354 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_MATRIX3x3_H
+#define B3_MATRIX3x3_H
+
+#include "b3Vector3.h"
+#include "b3Quaternion.h"
+#include <stdio.h>
+
+#ifdef B3_USE_SSE
+//const __m128 B3_ATTRIBUTE_ALIGNED16(b3v2220) = {2.0f, 2.0f, 2.0f, 0.0f};
+const __m128 B3_ATTRIBUTE_ALIGNED16(b3vMPPP) = {-0.0f, +0.0f, +0.0f, +0.0f};
+#endif
+
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+const b3SimdFloat4 B3_ATTRIBUTE_ALIGNED16(b3v1000) = {1.0f, 0.0f, 0.0f, 0.0f};
+const b3SimdFloat4 B3_ATTRIBUTE_ALIGNED16(b3v0100) = {0.0f, 1.0f, 0.0f, 0.0f};
+const b3SimdFloat4 B3_ATTRIBUTE_ALIGNED16(b3v0010) = {0.0f, 0.0f, 1.0f, 0.0f};
+#endif
+
+#ifdef B3_USE_DOUBLE_PRECISION
+#define b3Matrix3x3Data b3Matrix3x3DoubleData
+#else
+#define b3Matrix3x3Data b3Matrix3x3FloatData
+#endif  //B3_USE_DOUBLE_PRECISION
+
+/**@brief The b3Matrix3x3 class implements a 3x3 rotation matrix, to perform linear algebra in combination with b3Quaternion, b3Transform and b3Vector3.
+* Make sure to only include a pure orthogonal matrix without scaling. */
+B3_ATTRIBUTE_ALIGNED16(class)
+b3Matrix3x3
+{
+	///Data storage for the matrix, each vector is a row of the matrix
+	b3Vector3 m_el[3];
+
+public:
+	/** @brief No initializaion constructor */
+	b3Matrix3x3() {}
+
+	//		explicit b3Matrix3x3(const b3Scalar *m) { setFromOpenGLSubMatrix(m); }
+
+	/**@brief Constructor from Quaternion */
+	explicit b3Matrix3x3(const b3Quaternion& q) { setRotation(q); }
+	/*
+	template <typename b3Scalar>
+	Matrix3x3(const b3Scalar& yaw, const b3Scalar& pitch, const b3Scalar& roll)
+	{ 
+	setEulerYPR(yaw, pitch, roll);
+	}
+	*/
+	/** @brief Constructor with row major formatting */
+	b3Matrix3x3(const b3Scalar& xx, const b3Scalar& xy, const b3Scalar& xz,
+				const b3Scalar& yx, const b3Scalar& yy, const b3Scalar& yz,
+				const b3Scalar& zx, const b3Scalar& zy, const b3Scalar& zz)
+	{
+		setValue(xx, xy, xz,
+				 yx, yy, yz,
+				 zx, zy, zz);
+	}
+
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+	B3_FORCE_INLINE b3Matrix3x3(const b3SimdFloat4 v0, const b3SimdFloat4 v1, const b3SimdFloat4 v2)
+	{
+		m_el[0].mVec128 = v0;
+		m_el[1].mVec128 = v1;
+		m_el[2].mVec128 = v2;
+	}
+
+	B3_FORCE_INLINE b3Matrix3x3(const b3Vector3& v0, const b3Vector3& v1, const b3Vector3& v2)
+	{
+		m_el[0] = v0;
+		m_el[1] = v1;
+		m_el[2] = v2;
+	}
+
+	// Copy constructor
+	B3_FORCE_INLINE b3Matrix3x3(const b3Matrix3x3& rhs)
+	{
+		m_el[0].mVec128 = rhs.m_el[0].mVec128;
+		m_el[1].mVec128 = rhs.m_el[1].mVec128;
+		m_el[2].mVec128 = rhs.m_el[2].mVec128;
+	}
+
+	// Assignment Operator
+	B3_FORCE_INLINE b3Matrix3x3& operator=(const b3Matrix3x3& m)
+	{
+		m_el[0].mVec128 = m.m_el[0].mVec128;
+		m_el[1].mVec128 = m.m_el[1].mVec128;
+		m_el[2].mVec128 = m.m_el[2].mVec128;
+
+		return *this;
+	}
+
+#else
+
+	/** @brief Copy constructor */
+	B3_FORCE_INLINE b3Matrix3x3(const b3Matrix3x3& other)
+	{
+		m_el[0] = other.m_el[0];
+		m_el[1] = other.m_el[1];
+		m_el[2] = other.m_el[2];
+	}
+
+	/** @brief Assignment Operator */
+	B3_FORCE_INLINE b3Matrix3x3& operator=(const b3Matrix3x3& other)
+	{
+		m_el[0] = other.m_el[0];
+		m_el[1] = other.m_el[1];
+		m_el[2] = other.m_el[2];
+		return *this;
+	}
+
+#endif
+
+	/** @brief Get a column of the matrix as a vector 
+	*  @param i Column number 0 indexed */
+	B3_FORCE_INLINE b3Vector3 getColumn(int i) const
+	{
+		return b3MakeVector3(m_el[0][i], m_el[1][i], m_el[2][i]);
+	}
+
+	/** @brief Get a row of the matrix as a vector 
+	*  @param i Row number 0 indexed */
+	B3_FORCE_INLINE const b3Vector3& getRow(int i) const
+	{
+		b3FullAssert(0 <= i && i < 3);
+		return m_el[i];
+	}
+
+	/** @brief Get a mutable reference to a row of the matrix as a vector 
+	*  @param i Row number 0 indexed */
+	B3_FORCE_INLINE b3Vector3& operator[](int i)
+	{
+		b3FullAssert(0 <= i && i < 3);
+		return m_el[i];
+	}
+
+	/** @brief Get a const reference to a row of the matrix as a vector 
+	*  @param i Row number 0 indexed */
+	B3_FORCE_INLINE const b3Vector3& operator[](int i) const
+	{
+		b3FullAssert(0 <= i && i < 3);
+		return m_el[i];
+	}
+
+	/** @brief Multiply by the target matrix on the right
+	*  @param m Rotation matrix to be applied 
+	* Equivilant to this = this * m */
+	b3Matrix3x3& operator*=(const b3Matrix3x3& m);
+
+	/** @brief Adds by the target matrix on the right
+	*  @param m matrix to be applied 
+	* Equivilant to this = this + m */
+	b3Matrix3x3& operator+=(const b3Matrix3x3& m);
+
+	/** @brief Substractss by the target matrix on the right
+	*  @param m matrix to be applied 
+	* Equivilant to this = this - m */
+	b3Matrix3x3& operator-=(const b3Matrix3x3& m);
+
+	/** @brief Set from the rotational part of a 4x4 OpenGL matrix
+	*  @param m A pointer to the beginning of the array of scalars*/
+	void setFromOpenGLSubMatrix(const b3Scalar* m)
+	{
+		m_el[0].setValue(m[0], m[4], m[8]);
+		m_el[1].setValue(m[1], m[5], m[9]);
+		m_el[2].setValue(m[2], m[6], m[10]);
+	}
+	/** @brief Set the values of the matrix explicitly (row major)
+	*  @param xx Top left
+	*  @param xy Top Middle
+	*  @param xz Top Right
+	*  @param yx Middle Left
+	*  @param yy Middle Middle
+	*  @param yz Middle Right
+	*  @param zx Bottom Left
+	*  @param zy Bottom Middle
+	*  @param zz Bottom Right*/
+	void setValue(const b3Scalar& xx, const b3Scalar& xy, const b3Scalar& xz,
+				  const b3Scalar& yx, const b3Scalar& yy, const b3Scalar& yz,
+				  const b3Scalar& zx, const b3Scalar& zy, const b3Scalar& zz)
+	{
+		m_el[0].setValue(xx, xy, xz);
+		m_el[1].setValue(yx, yy, yz);
+		m_el[2].setValue(zx, zy, zz);
+	}
+
+	/** @brief Set the matrix from a quaternion
+	*  @param q The Quaternion to match */
+	void setRotation(const b3Quaternion& q)
+	{
+		b3Scalar d = q.length2();
+		b3FullAssert(d != b3Scalar(0.0));
+		b3Scalar s = b3Scalar(2.0) / d;
+
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vs, Q = q.get128();
+		__m128i Qi = b3CastfTo128i(Q);
+		__m128 Y, Z;
+		__m128 V1, V2, V3;
+		__m128 V11, V21, V31;
+		__m128 NQ = _mm_xor_ps(Q, b3vMzeroMask);
+		__m128i NQi = b3CastfTo128i(NQ);
+
+		V1 = b3CastiTo128f(_mm_shuffle_epi32(Qi, B3_SHUFFLE(1, 0, 2, 3)));  // Y X Z W
+		V2 = _mm_shuffle_ps(NQ, Q, B3_SHUFFLE(0, 0, 1, 3));                 // -X -X  Y  W
+		V3 = b3CastiTo128f(_mm_shuffle_epi32(Qi, B3_SHUFFLE(2, 1, 0, 3)));  // Z Y X W
+		V1 = _mm_xor_ps(V1, b3vMPPP);                                       //	change the sign of the first element
+
+		V11 = b3CastiTo128f(_mm_shuffle_epi32(Qi, B3_SHUFFLE(1, 1, 0, 3)));  // Y Y X W
+		V21 = _mm_unpackhi_ps(Q, Q);                                         //  Z  Z  W  W
+		V31 = _mm_shuffle_ps(Q, NQ, B3_SHUFFLE(0, 2, 0, 3));                 //  X  Z -X -W
+
+		V2 = V2 * V1;   //
+		V1 = V1 * V11;  //
+		V3 = V3 * V31;  //
+
+		V11 = _mm_shuffle_ps(NQ, Q, B3_SHUFFLE(2, 3, 1, 3));                //	-Z -W  Y  W
+		V11 = V11 * V21;                                                    //
+		V21 = _mm_xor_ps(V21, b3vMPPP);                                     //	change the sign of the first element
+		V31 = _mm_shuffle_ps(Q, NQ, B3_SHUFFLE(3, 3, 1, 3));                //	 W  W -Y -W
+		V31 = _mm_xor_ps(V31, b3vMPPP);                                     //	change the sign of the first element
+		Y = b3CastiTo128f(_mm_shuffle_epi32(NQi, B3_SHUFFLE(3, 2, 0, 3)));  // -W -Z -X -W
+		Z = b3CastiTo128f(_mm_shuffle_epi32(Qi, B3_SHUFFLE(1, 0, 1, 3)));   //  Y  X  Y  W
+
+		vs = _mm_load_ss(&s);
+		V21 = V21 * Y;
+		V31 = V31 * Z;
+
+		V1 = V1 + V11;
+		V2 = V2 + V21;
+		V3 = V3 + V31;
+
+		vs = b3_splat3_ps(vs, 0);
+		//	s ready
+		V1 = V1 * vs;
+		V2 = V2 * vs;
+		V3 = V3 * vs;
+
+		V1 = V1 + b3v1000;
+		V2 = V2 + b3v0100;
+		V3 = V3 + b3v0010;
+
+		m_el[0] = b3MakeVector3(V1);
+		m_el[1] = b3MakeVector3(V2);
+		m_el[2] = b3MakeVector3(V3);
+#else
+		b3Scalar xs = q.getX() * s, ys = q.getY() * s, zs = q.getZ() * s;
+		b3Scalar wx = q.getW() * xs, wy = q.getW() * ys, wz = q.getW() * zs;
+		b3Scalar xx = q.getX() * xs, xy = q.getX() * ys, xz = q.getX() * zs;
+		b3Scalar yy = q.getY() * ys, yz = q.getY() * zs, zz = q.getZ() * zs;
+		setValue(
+			b3Scalar(1.0) - (yy + zz), xy - wz, xz + wy,
+			xy + wz, b3Scalar(1.0) - (xx + zz), yz - wx,
+			xz - wy, yz + wx, b3Scalar(1.0) - (xx + yy));
+#endif
+	}
+
+	/** @brief Set the matrix from euler angles using YPR around YXZ respectively
+	*  @param yaw Yaw about Y axis
+	*  @param pitch Pitch about X axis
+	*  @param roll Roll about Z axis 
+	*/
+	void setEulerYPR(const b3Scalar& yaw, const b3Scalar& pitch, const b3Scalar& roll)
+	{
+		setEulerZYX(roll, pitch, yaw);
+	}
+
+	/** @brief Set the matrix from euler angles YPR around ZYX axes
+	* @param eulerX Roll about X axis
+	* @param eulerY Pitch around Y axis
+	* @param eulerZ Yaw aboud Z axis
+	* 
+	* These angles are used to produce a rotation matrix. The euler
+	* angles are applied in ZYX order. I.e a vector is first rotated 
+	* about X then Y and then Z
+	**/
+	void setEulerZYX(b3Scalar eulerX, b3Scalar eulerY, b3Scalar eulerZ)
+	{
+		///@todo proposed to reverse this since it's labeled zyx but takes arguments xyz and it will match all other parts of the code
+		b3Scalar ci(b3Cos(eulerX));
+		b3Scalar cj(b3Cos(eulerY));
+		b3Scalar ch(b3Cos(eulerZ));
+		b3Scalar si(b3Sin(eulerX));
+		b3Scalar sj(b3Sin(eulerY));
+		b3Scalar sh(b3Sin(eulerZ));
+		b3Scalar cc = ci * ch;
+		b3Scalar cs = ci * sh;
+		b3Scalar sc = si * ch;
+		b3Scalar ss = si * sh;
+
+		setValue(cj * ch, sj * sc - cs, sj * cc + ss,
+				 cj * sh, sj * ss + cc, sj * cs - sc,
+				 -sj, cj * si, cj * ci);
+	}
+
+	/**@brief Set the matrix to the identity */
+	void setIdentity()
+	{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+		m_el[0] = b3MakeVector3(b3v1000);
+		m_el[1] = b3MakeVector3(b3v0100);
+		m_el[2] = b3MakeVector3(b3v0010);
+#else
+		setValue(b3Scalar(1.0), b3Scalar(0.0), b3Scalar(0.0),
+				 b3Scalar(0.0), b3Scalar(1.0), b3Scalar(0.0),
+				 b3Scalar(0.0), b3Scalar(0.0), b3Scalar(1.0));
+#endif
+	}
+
+	static const b3Matrix3x3& getIdentity()
+	{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+		static const b3Matrix3x3
+			identityMatrix(b3v1000, b3v0100, b3v0010);
+#else
+		static const b3Matrix3x3
+			identityMatrix(
+				b3Scalar(1.0), b3Scalar(0.0), b3Scalar(0.0),
+				b3Scalar(0.0), b3Scalar(1.0), b3Scalar(0.0),
+				b3Scalar(0.0), b3Scalar(0.0), b3Scalar(1.0));
+#endif
+		return identityMatrix;
+	}
+
+	/**@brief Fill the rotational part of an OpenGL matrix and clear the shear/perspective
+	* @param m The array to be filled */
+	void getOpenGLSubMatrix(b3Scalar * m) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 v0 = m_el[0].mVec128;
+		__m128 v1 = m_el[1].mVec128;
+		__m128 v2 = m_el[2].mVec128;  //  x2 y2 z2 w2
+		__m128* vm = (__m128*)m;
+		__m128 vT;
+
+		v2 = _mm_and_ps(v2, b3vFFF0fMask);  //  x2 y2 z2 0
+
+		vT = _mm_unpackhi_ps(v0, v1);  //	z0 z1 * *
+		v0 = _mm_unpacklo_ps(v0, v1);  //	x0 x1 y0 y1
+
+		v1 = _mm_shuffle_ps(v0, v2, B3_SHUFFLE(2, 3, 1, 3));                    // y0 y1 y2 0
+		v0 = _mm_shuffle_ps(v0, v2, B3_SHUFFLE(0, 1, 0, 3));                    // x0 x1 x2 0
+		v2 = b3CastdTo128f(_mm_move_sd(b3CastfTo128d(v2), b3CastfTo128d(vT)));  // z0 z1 z2 0
+
+		vm[0] = v0;
+		vm[1] = v1;
+		vm[2] = v2;
+#elif defined(B3_USE_NEON)
+		// note: zeros the w channel. We can preserve it at the cost of two more vtrn instructions.
+		static const uint32x2_t zMask = (const uint32x2_t){-1, 0};
+		float32x4_t* vm = (float32x4_t*)m;
+		float32x4x2_t top = vtrnq_f32(m_el[0].mVec128, m_el[1].mVec128);               // {x0 x1 z0 z1}, {y0 y1 w0 w1}
+		float32x2x2_t bl = vtrn_f32(vget_low_f32(m_el[2].mVec128), vdup_n_f32(0.0f));  // {x2  0 }, {y2 0}
+		float32x4_t v0 = vcombine_f32(vget_low_f32(top.val[0]), bl.val[0]);
+		float32x4_t v1 = vcombine_f32(vget_low_f32(top.val[1]), bl.val[1]);
+		float32x2_t q = (float32x2_t)vand_u32((uint32x2_t)vget_high_f32(m_el[2].mVec128), zMask);
+		float32x4_t v2 = vcombine_f32(vget_high_f32(top.val[0]), q);  // z0 z1 z2  0
+
+		vm[0] = v0;
+		vm[1] = v1;
+		vm[2] = v2;
+#else
+		m[0] = b3Scalar(m_el[0].getX());
+		m[1] = b3Scalar(m_el[1].getX());
+		m[2] = b3Scalar(m_el[2].getX());
+		m[3] = b3Scalar(0.0);
+		m[4] = b3Scalar(m_el[0].getY());
+		m[5] = b3Scalar(m_el[1].getY());
+		m[6] = b3Scalar(m_el[2].getY());
+		m[7] = b3Scalar(0.0);
+		m[8] = b3Scalar(m_el[0].getZ());
+		m[9] = b3Scalar(m_el[1].getZ());
+		m[10] = b3Scalar(m_el[2].getZ());
+		m[11] = b3Scalar(0.0);
+#endif
+	}
+
+	/**@brief Get the matrix represented as a quaternion 
+	* @param q The quaternion which will be set */
+	void getRotation(b3Quaternion & q) const
+	{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+		b3Scalar trace = m_el[0].getX() + m_el[1].getY() + m_el[2].getZ();
+		b3Scalar s, x;
+
+		union {
+			b3SimdFloat4 vec;
+			b3Scalar f[4];
+		} temp;
+
+		if (trace > b3Scalar(0.0))
+		{
+			x = trace + b3Scalar(1.0);
+
+			temp.f[0] = m_el[2].getY() - m_el[1].getZ();
+			temp.f[1] = m_el[0].getZ() - m_el[2].getX();
+			temp.f[2] = m_el[1].getX() - m_el[0].getY();
+			temp.f[3] = x;
+			//temp.f[3]= s * b3Scalar(0.5);
+		}
+		else
+		{
+			int i, j, k;
+			if (m_el[0].getX() < m_el[1].getY())
+			{
+				if (m_el[1].getY() < m_el[2].getZ())
+				{
+					i = 2;
+					j = 0;
+					k = 1;
+				}
+				else
+				{
+					i = 1;
+					j = 2;
+					k = 0;
+				}
+			}
+			else
+			{
+				if (m_el[0].getX() < m_el[2].getZ())
+				{
+					i = 2;
+					j = 0;
+					k = 1;
+				}
+				else
+				{
+					i = 0;
+					j = 1;
+					k = 2;
+				}
+			}
+
+			x = m_el[i][i] - m_el[j][j] - m_el[k][k] + b3Scalar(1.0);
+
+			temp.f[3] = (m_el[k][j] - m_el[j][k]);
+			temp.f[j] = (m_el[j][i] + m_el[i][j]);
+			temp.f[k] = (m_el[k][i] + m_el[i][k]);
+			temp.f[i] = x;
+			//temp.f[i] = s * b3Scalar(0.5);
+		}
+
+		s = b3Sqrt(x);
+		q.set128(temp.vec);
+		s = b3Scalar(0.5) / s;
+
+		q *= s;
+#else
+		b3Scalar trace = m_el[0].getX() + m_el[1].getY() + m_el[2].getZ();
+
+		b3Scalar temp[4];
+
+		if (trace > b3Scalar(0.0))
+		{
+			b3Scalar s = b3Sqrt(trace + b3Scalar(1.0));
+			temp[3] = (s * b3Scalar(0.5));
+			s = b3Scalar(0.5) / s;
+
+			temp[0] = ((m_el[2].getY() - m_el[1].getZ()) * s);
+			temp[1] = ((m_el[0].getZ() - m_el[2].getX()) * s);
+			temp[2] = ((m_el[1].getX() - m_el[0].getY()) * s);
+		}
+		else
+		{
+			int i = m_el[0].getX() < m_el[1].getY() ? (m_el[1].getY() < m_el[2].getZ() ? 2 : 1) : (m_el[0].getX() < m_el[2].getZ() ? 2 : 0);
+			int j = (i + 1) % 3;
+			int k = (i + 2) % 3;
+
+			b3Scalar s = b3Sqrt(m_el[i][i] - m_el[j][j] - m_el[k][k] + b3Scalar(1.0));
+			temp[i] = s * b3Scalar(0.5);
+			s = b3Scalar(0.5) / s;
+
+			temp[3] = (m_el[k][j] - m_el[j][k]) * s;
+			temp[j] = (m_el[j][i] + m_el[i][j]) * s;
+			temp[k] = (m_el[k][i] + m_el[i][k]) * s;
+		}
+		q.setValue(temp[0], temp[1], temp[2], temp[3]);
+#endif
+	}
+
+	/**@brief Get the matrix represented as euler angles around YXZ, roundtrip with setEulerYPR
+	* @param yaw Yaw around Y axis
+	* @param pitch Pitch around X axis
+	* @param roll around Z axis */
+	void getEulerYPR(b3Scalar & yaw, b3Scalar & pitch, b3Scalar & roll) const
+	{
+		// first use the normal calculus
+		yaw = b3Scalar(b3Atan2(m_el[1].getX(), m_el[0].getX()));
+		pitch = b3Scalar(b3Asin(-m_el[2].getX()));
+		roll = b3Scalar(b3Atan2(m_el[2].getY(), m_el[2].getZ()));
+
+		// on pitch = +/-HalfPI
+		if (b3Fabs(pitch) == B3_HALF_PI)
+		{
+			if (yaw > 0)
+				yaw -= B3_PI;
+			else
+				yaw += B3_PI;
+
+			if (roll > 0)
+				roll -= B3_PI;
+			else
+				roll += B3_PI;
+		}
+	};
+
+	/**@brief Get the matrix represented as euler angles around ZYX
+	* @param yaw Yaw around X axis
+	* @param pitch Pitch around Y axis
+	* @param roll around X axis 
+	* @param solution_number Which solution of two possible solutions ( 1 or 2) are possible values*/
+	void getEulerZYX(b3Scalar & yaw, b3Scalar & pitch, b3Scalar & roll, unsigned int solution_number = 1) const
+	{
+		struct Euler
+		{
+			b3Scalar yaw;
+			b3Scalar pitch;
+			b3Scalar roll;
+		};
+
+		Euler euler_out;
+		Euler euler_out2;  //second solution
+		//get the pointer to the raw data
+
+		// Check that pitch is not at a singularity
+		if (b3Fabs(m_el[2].getX()) >= 1)
+		{
+			euler_out.yaw = 0;
+			euler_out2.yaw = 0;
+
+			// From difference of angles formula
+			b3Scalar delta = b3Atan2(m_el[0].getX(), m_el[0].getZ());
+			if (m_el[2].getX() > 0)  //gimbal locked up
+			{
+				euler_out.pitch = B3_PI / b3Scalar(2.0);
+				euler_out2.pitch = B3_PI / b3Scalar(2.0);
+				euler_out.roll = euler_out.pitch + delta;
+				euler_out2.roll = euler_out.pitch + delta;
+			}
+			else  // gimbal locked down
+			{
+				euler_out.pitch = -B3_PI / b3Scalar(2.0);
+				euler_out2.pitch = -B3_PI / b3Scalar(2.0);
+				euler_out.roll = -euler_out.pitch + delta;
+				euler_out2.roll = -euler_out.pitch + delta;
+			}
+		}
+		else
+		{
+			euler_out.pitch = -b3Asin(m_el[2].getX());
+			euler_out2.pitch = B3_PI - euler_out.pitch;
+
+			euler_out.roll = b3Atan2(m_el[2].getY() / b3Cos(euler_out.pitch),
+									 m_el[2].getZ() / b3Cos(euler_out.pitch));
+			euler_out2.roll = b3Atan2(m_el[2].getY() / b3Cos(euler_out2.pitch),
+									  m_el[2].getZ() / b3Cos(euler_out2.pitch));
+
+			euler_out.yaw = b3Atan2(m_el[1].getX() / b3Cos(euler_out.pitch),
+									m_el[0].getX() / b3Cos(euler_out.pitch));
+			euler_out2.yaw = b3Atan2(m_el[1].getX() / b3Cos(euler_out2.pitch),
+									 m_el[0].getX() / b3Cos(euler_out2.pitch));
+		}
+
+		if (solution_number == 1)
+		{
+			yaw = euler_out.yaw;
+			pitch = euler_out.pitch;
+			roll = euler_out.roll;
+		}
+		else
+		{
+			yaw = euler_out2.yaw;
+			pitch = euler_out2.pitch;
+			roll = euler_out2.roll;
+		}
+	}
+
+	/**@brief Create a scaled copy of the matrix 
+	* @param s Scaling vector The elements of the vector will scale each column */
+
+	b3Matrix3x3 scaled(const b3Vector3& s) const
+	{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+		return b3Matrix3x3(m_el[0] * s, m_el[1] * s, m_el[2] * s);
+#else
+		return b3Matrix3x3(
+			m_el[0].getX() * s.getX(), m_el[0].getY() * s.getY(), m_el[0].getZ() * s.getZ(),
+			m_el[1].getX() * s.getX(), m_el[1].getY() * s.getY(), m_el[1].getZ() * s.getZ(),
+			m_el[2].getX() * s.getX(), m_el[2].getY() * s.getY(), m_el[2].getZ() * s.getZ());
+#endif
+	}
+
+	/**@brief Return the determinant of the matrix */
+	b3Scalar determinant() const;
+	/**@brief Return the adjoint of the matrix */
+	b3Matrix3x3 adjoint() const;
+	/**@brief Return the matrix with all values non negative */
+	b3Matrix3x3 absolute() const;
+	/**@brief Return the transpose of the matrix */
+	b3Matrix3x3 transpose() const;
+	/**@brief Return the inverse of the matrix */
+	b3Matrix3x3 inverse() const;
+
+	b3Matrix3x3 transposeTimes(const b3Matrix3x3& m) const;
+	b3Matrix3x3 timesTranspose(const b3Matrix3x3& m) const;
+
+	B3_FORCE_INLINE b3Scalar tdotx(const b3Vector3& v) const
+	{
+		return m_el[0].getX() * v.getX() + m_el[1].getX() * v.getY() + m_el[2].getX() * v.getZ();
+	}
+	B3_FORCE_INLINE b3Scalar tdoty(const b3Vector3& v) const
+	{
+		return m_el[0].getY() * v.getX() + m_el[1].getY() * v.getY() + m_el[2].getY() * v.getZ();
+	}
+	B3_FORCE_INLINE b3Scalar tdotz(const b3Vector3& v) const
+	{
+		return m_el[0].getZ() * v.getX() + m_el[1].getZ() * v.getY() + m_el[2].getZ() * v.getZ();
+	}
+
+	/**@brief diagonalizes this matrix by the Jacobi method.
+	* @param rot stores the rotation from the coordinate system in which the matrix is diagonal to the original
+	* coordinate system, i.e., old_this = rot * new_this * rot^T. 
+	* @param threshold See iteration
+	* @param iteration The iteration stops when all off-diagonal elements are less than the threshold multiplied 
+	* by the sum of the absolute values of the diagonal, or when maxSteps have been executed. 
+	* 
+	* Note that this matrix is assumed to be symmetric. 
+	*/
+	void diagonalize(b3Matrix3x3 & rot, b3Scalar threshold, int maxSteps)
+	{
+		rot.setIdentity();
+		for (int step = maxSteps; step > 0; step--)
+		{
+			// find off-diagonal element [p][q] with largest magnitude
+			int p = 0;
+			int q = 1;
+			int r = 2;
+			b3Scalar max = b3Fabs(m_el[0][1]);
+			b3Scalar v = b3Fabs(m_el[0][2]);
+			if (v > max)
+			{
+				q = 2;
+				r = 1;
+				max = v;
+			}
+			v = b3Fabs(m_el[1][2]);
+			if (v > max)
+			{
+				p = 1;
+				q = 2;
+				r = 0;
+				max = v;
+			}
+
+			b3Scalar t = threshold * (b3Fabs(m_el[0][0]) + b3Fabs(m_el[1][1]) + b3Fabs(m_el[2][2]));
+			if (max <= t)
+			{
+				if (max <= B3_EPSILON * t)
+				{
+					return;
+				}
+				step = 1;
+			}
+
+			// compute Jacobi rotation J which leads to a zero for element [p][q]
+			b3Scalar mpq = m_el[p][q];
+			b3Scalar theta = (m_el[q][q] - m_el[p][p]) / (2 * mpq);
+			b3Scalar theta2 = theta * theta;
+			b3Scalar cos;
+			b3Scalar sin;
+			if (theta2 * theta2 < b3Scalar(10 / B3_EPSILON))
+			{
+				t = (theta >= 0) ? 1 / (theta + b3Sqrt(1 + theta2))
+								 : 1 / (theta - b3Sqrt(1 + theta2));
+				cos = 1 / b3Sqrt(1 + t * t);
+				sin = cos * t;
+			}
+			else
+			{
+				// approximation for large theta-value, i.e., a nearly diagonal matrix
+				t = 1 / (theta * (2 + b3Scalar(0.5) / theta2));
+				cos = 1 - b3Scalar(0.5) * t * t;
+				sin = cos * t;
+			}
+
+			// apply rotation to matrix (this = J^T * this * J)
+			m_el[p][q] = m_el[q][p] = 0;
+			m_el[p][p] -= t * mpq;
+			m_el[q][q] += t * mpq;
+			b3Scalar mrp = m_el[r][p];
+			b3Scalar mrq = m_el[r][q];
+			m_el[r][p] = m_el[p][r] = cos * mrp - sin * mrq;
+			m_el[r][q] = m_el[q][r] = cos * mrq + sin * mrp;
+
+			// apply rotation to rot (rot = rot * J)
+			for (int i = 0; i < 3; i++)
+			{
+				b3Vector3& row = rot[i];
+				mrp = row[p];
+				mrq = row[q];
+				row[p] = cos * mrp - sin * mrq;
+				row[q] = cos * mrq + sin * mrp;
+			}
+		}
+	}
+
+	/**@brief Calculate the matrix cofactor 
+	* @param r1 The first row to use for calculating the cofactor
+	* @param c1 The first column to use for calculating the cofactor
+	* @param r1 The second row to use for calculating the cofactor
+	* @param c1 The second column to use for calculating the cofactor
+	* See http://en.wikipedia.org/wiki/Cofactor_(linear_algebra) for more details
+	*/
+	b3Scalar cofac(int r1, int c1, int r2, int c2) const
+	{
+		return m_el[r1][c1] * m_el[r2][c2] - m_el[r1][c2] * m_el[r2][c1];
+	}
+
+	void serialize(struct b3Matrix3x3Data & dataOut) const;
+
+	void serializeFloat(struct b3Matrix3x3FloatData & dataOut) const;
+
+	void deSerialize(const struct b3Matrix3x3Data& dataIn);
+
+	void deSerializeFloat(const struct b3Matrix3x3FloatData& dataIn);
+
+	void deSerializeDouble(const struct b3Matrix3x3DoubleData& dataIn);
+};
+
+B3_FORCE_INLINE b3Matrix3x3&
+b3Matrix3x3::operator*=(const b3Matrix3x3& m)
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	__m128 rv00, rv01, rv02;
+	__m128 rv10, rv11, rv12;
+	__m128 rv20, rv21, rv22;
+	__m128 mv0, mv1, mv2;
+
+	rv02 = m_el[0].mVec128;
+	rv12 = m_el[1].mVec128;
+	rv22 = m_el[2].mVec128;
+
+	mv0 = _mm_and_ps(m[0].mVec128, b3vFFF0fMask);
+	mv1 = _mm_and_ps(m[1].mVec128, b3vFFF0fMask);
+	mv2 = _mm_and_ps(m[2].mVec128, b3vFFF0fMask);
+
+	// rv0
+	rv00 = b3_splat_ps(rv02, 0);
+	rv01 = b3_splat_ps(rv02, 1);
+	rv02 = b3_splat_ps(rv02, 2);
+
+	rv00 = _mm_mul_ps(rv00, mv0);
+	rv01 = _mm_mul_ps(rv01, mv1);
+	rv02 = _mm_mul_ps(rv02, mv2);
+
+	// rv1
+	rv10 = b3_splat_ps(rv12, 0);
+	rv11 = b3_splat_ps(rv12, 1);
+	rv12 = b3_splat_ps(rv12, 2);
+
+	rv10 = _mm_mul_ps(rv10, mv0);
+	rv11 = _mm_mul_ps(rv11, mv1);
+	rv12 = _mm_mul_ps(rv12, mv2);
+
+	// rv2
+	rv20 = b3_splat_ps(rv22, 0);
+	rv21 = b3_splat_ps(rv22, 1);
+	rv22 = b3_splat_ps(rv22, 2);
+
+	rv20 = _mm_mul_ps(rv20, mv0);
+	rv21 = _mm_mul_ps(rv21, mv1);
+	rv22 = _mm_mul_ps(rv22, mv2);
+
+	rv00 = _mm_add_ps(rv00, rv01);
+	rv10 = _mm_add_ps(rv10, rv11);
+	rv20 = _mm_add_ps(rv20, rv21);
+
+	m_el[0].mVec128 = _mm_add_ps(rv00, rv02);
+	m_el[1].mVec128 = _mm_add_ps(rv10, rv12);
+	m_el[2].mVec128 = _mm_add_ps(rv20, rv22);
+
+#elif defined(B3_USE_NEON)
+
+	float32x4_t rv0, rv1, rv2;
+	float32x4_t v0, v1, v2;
+	float32x4_t mv0, mv1, mv2;
+
+	v0 = m_el[0].mVec128;
+	v1 = m_el[1].mVec128;
+	v2 = m_el[2].mVec128;
+
+	mv0 = (float32x4_t)vandq_s32((int32x4_t)m[0].mVec128, b3vFFF0Mask);
+	mv1 = (float32x4_t)vandq_s32((int32x4_t)m[1].mVec128, b3vFFF0Mask);
+	mv2 = (float32x4_t)vandq_s32((int32x4_t)m[2].mVec128, b3vFFF0Mask);
+
+	rv0 = vmulq_lane_f32(mv0, vget_low_f32(v0), 0);
+	rv1 = vmulq_lane_f32(mv0, vget_low_f32(v1), 0);
+	rv2 = vmulq_lane_f32(mv0, vget_low_f32(v2), 0);
+
+	rv0 = vmlaq_lane_f32(rv0, mv1, vget_low_f32(v0), 1);
+	rv1 = vmlaq_lane_f32(rv1, mv1, vget_low_f32(v1), 1);
+	rv2 = vmlaq_lane_f32(rv2, mv1, vget_low_f32(v2), 1);
+
+	rv0 = vmlaq_lane_f32(rv0, mv2, vget_high_f32(v0), 0);
+	rv1 = vmlaq_lane_f32(rv1, mv2, vget_high_f32(v1), 0);
+	rv2 = vmlaq_lane_f32(rv2, mv2, vget_high_f32(v2), 0);
+
+	m_el[0].mVec128 = rv0;
+	m_el[1].mVec128 = rv1;
+	m_el[2].mVec128 = rv2;
+#else
+	setValue(
+		m.tdotx(m_el[0]), m.tdoty(m_el[0]), m.tdotz(m_el[0]),
+		m.tdotx(m_el[1]), m.tdoty(m_el[1]), m.tdotz(m_el[1]),
+		m.tdotx(m_el[2]), m.tdoty(m_el[2]), m.tdotz(m_el[2]));
+#endif
+	return *this;
+}
+
+B3_FORCE_INLINE b3Matrix3x3&
+b3Matrix3x3::operator+=(const b3Matrix3x3& m)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+	m_el[0].mVec128 = m_el[0].mVec128 + m.m_el[0].mVec128;
+	m_el[1].mVec128 = m_el[1].mVec128 + m.m_el[1].mVec128;
+	m_el[2].mVec128 = m_el[2].mVec128 + m.m_el[2].mVec128;
+#else
+	setValue(
+		m_el[0][0] + m.m_el[0][0],
+		m_el[0][1] + m.m_el[0][1],
+		m_el[0][2] + m.m_el[0][2],
+		m_el[1][0] + m.m_el[1][0],
+		m_el[1][1] + m.m_el[1][1],
+		m_el[1][2] + m.m_el[1][2],
+		m_el[2][0] + m.m_el[2][0],
+		m_el[2][1] + m.m_el[2][1],
+		m_el[2][2] + m.m_el[2][2]);
+#endif
+	return *this;
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+operator*(const b3Matrix3x3& m, const b3Scalar& k)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+	__m128 vk = b3_splat_ps(_mm_load_ss((float*)&k), 0x80);
+	return b3Matrix3x3(
+		_mm_mul_ps(m[0].mVec128, vk),
+		_mm_mul_ps(m[1].mVec128, vk),
+		_mm_mul_ps(m[2].mVec128, vk));
+#elif defined(B3_USE_NEON)
+	return b3Matrix3x3(
+		vmulq_n_f32(m[0].mVec128, k),
+		vmulq_n_f32(m[1].mVec128, k),
+		vmulq_n_f32(m[2].mVec128, k));
+#else
+	return b3Matrix3x3(
+		m[0].getX() * k, m[0].getY() * k, m[0].getZ() * k,
+		m[1].getX() * k, m[1].getY() * k, m[1].getZ() * k,
+		m[2].getX() * k, m[2].getY() * k, m[2].getZ() * k);
+#endif
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+operator+(const b3Matrix3x3& m1, const b3Matrix3x3& m2)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+	return b3Matrix3x3(
+		m1[0].mVec128 + m2[0].mVec128,
+		m1[1].mVec128 + m2[1].mVec128,
+		m1[2].mVec128 + m2[2].mVec128);
+#else
+	return b3Matrix3x3(
+		m1[0][0] + m2[0][0],
+		m1[0][1] + m2[0][1],
+		m1[0][2] + m2[0][2],
+
+		m1[1][0] + m2[1][0],
+		m1[1][1] + m2[1][1],
+		m1[1][2] + m2[1][2],
+
+		m1[2][0] + m2[2][0],
+		m1[2][1] + m2[2][1],
+		m1[2][2] + m2[2][2]);
+#endif
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+operator-(const b3Matrix3x3& m1, const b3Matrix3x3& m2)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+	return b3Matrix3x3(
+		m1[0].mVec128 - m2[0].mVec128,
+		m1[1].mVec128 - m2[1].mVec128,
+		m1[2].mVec128 - m2[2].mVec128);
+#else
+	return b3Matrix3x3(
+		m1[0][0] - m2[0][0],
+		m1[0][1] - m2[0][1],
+		m1[0][2] - m2[0][2],
+
+		m1[1][0] - m2[1][0],
+		m1[1][1] - m2[1][1],
+		m1[1][2] - m2[1][2],
+
+		m1[2][0] - m2[2][0],
+		m1[2][1] - m2[2][1],
+		m1[2][2] - m2[2][2]);
+#endif
+}
+
+B3_FORCE_INLINE b3Matrix3x3&
+b3Matrix3x3::operator-=(const b3Matrix3x3& m)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+	m_el[0].mVec128 = m_el[0].mVec128 - m.m_el[0].mVec128;
+	m_el[1].mVec128 = m_el[1].mVec128 - m.m_el[1].mVec128;
+	m_el[2].mVec128 = m_el[2].mVec128 - m.m_el[2].mVec128;
+#else
+	setValue(
+		m_el[0][0] - m.m_el[0][0],
+		m_el[0][1] - m.m_el[0][1],
+		m_el[0][2] - m.m_el[0][2],
+		m_el[1][0] - m.m_el[1][0],
+		m_el[1][1] - m.m_el[1][1],
+		m_el[1][2] - m.m_el[1][2],
+		m_el[2][0] - m.m_el[2][0],
+		m_el[2][1] - m.m_el[2][1],
+		m_el[2][2] - m.m_el[2][2]);
+#endif
+	return *this;
+}
+
+B3_FORCE_INLINE b3Scalar
+b3Matrix3x3::determinant() const
+{
+	return b3Triple((*this)[0], (*this)[1], (*this)[2]);
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+b3Matrix3x3::absolute() const
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+	return b3Matrix3x3(
+		_mm_and_ps(m_el[0].mVec128, b3vAbsfMask),
+		_mm_and_ps(m_el[1].mVec128, b3vAbsfMask),
+		_mm_and_ps(m_el[2].mVec128, b3vAbsfMask));
+#elif defined(B3_USE_NEON)
+	return b3Matrix3x3(
+		(float32x4_t)vandq_s32((int32x4_t)m_el[0].mVec128, b3v3AbsMask),
+		(float32x4_t)vandq_s32((int32x4_t)m_el[1].mVec128, b3v3AbsMask),
+		(float32x4_t)vandq_s32((int32x4_t)m_el[2].mVec128, b3v3AbsMask));
+#else
+	return b3Matrix3x3(
+		b3Fabs(m_el[0].getX()), b3Fabs(m_el[0].getY()), b3Fabs(m_el[0].getZ()),
+		b3Fabs(m_el[1].getX()), b3Fabs(m_el[1].getY()), b3Fabs(m_el[1].getZ()),
+		b3Fabs(m_el[2].getX()), b3Fabs(m_el[2].getY()), b3Fabs(m_el[2].getZ()));
+#endif
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+b3Matrix3x3::transpose() const
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+	__m128 v0 = m_el[0].mVec128;
+	__m128 v1 = m_el[1].mVec128;
+	__m128 v2 = m_el[2].mVec128;  //  x2 y2 z2 w2
+	__m128 vT;
+
+	v2 = _mm_and_ps(v2, b3vFFF0fMask);  //  x2 y2 z2 0
+
+	vT = _mm_unpackhi_ps(v0, v1);  //	z0 z1 * *
+	v0 = _mm_unpacklo_ps(v0, v1);  //	x0 x1 y0 y1
+
+	v1 = _mm_shuffle_ps(v0, v2, B3_SHUFFLE(2, 3, 1, 3));                    // y0 y1 y2 0
+	v0 = _mm_shuffle_ps(v0, v2, B3_SHUFFLE(0, 1, 0, 3));                    // x0 x1 x2 0
+	v2 = b3CastdTo128f(_mm_move_sd(b3CastfTo128d(v2), b3CastfTo128d(vT)));  // z0 z1 z2 0
+
+	return b3Matrix3x3(v0, v1, v2);
+#elif defined(B3_USE_NEON)
+	// note: zeros the w channel. We can preserve it at the cost of two more vtrn instructions.
+	static const uint32x2_t zMask = (const uint32x2_t){-1, 0};
+	float32x4x2_t top = vtrnq_f32(m_el[0].mVec128, m_el[1].mVec128);               // {x0 x1 z0 z1}, {y0 y1 w0 w1}
+	float32x2x2_t bl = vtrn_f32(vget_low_f32(m_el[2].mVec128), vdup_n_f32(0.0f));  // {x2  0 }, {y2 0}
+	float32x4_t v0 = vcombine_f32(vget_low_f32(top.val[0]), bl.val[0]);
+	float32x4_t v1 = vcombine_f32(vget_low_f32(top.val[1]), bl.val[1]);
+	float32x2_t q = (float32x2_t)vand_u32((uint32x2_t)vget_high_f32(m_el[2].mVec128), zMask);
+	float32x4_t v2 = vcombine_f32(vget_high_f32(top.val[0]), q);  // z0 z1 z2  0
+	return b3Matrix3x3(v0, v1, v2);
+#else
+	return b3Matrix3x3(m_el[0].getX(), m_el[1].getX(), m_el[2].getX(),
+					   m_el[0].getY(), m_el[1].getY(), m_el[2].getY(),
+					   m_el[0].getZ(), m_el[1].getZ(), m_el[2].getZ());
+#endif
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+b3Matrix3x3::adjoint() const
+{
+	return b3Matrix3x3(cofac(1, 1, 2, 2), cofac(0, 2, 2, 1), cofac(0, 1, 1, 2),
+					   cofac(1, 2, 2, 0), cofac(0, 0, 2, 2), cofac(0, 2, 1, 0),
+					   cofac(1, 0, 2, 1), cofac(0, 1, 2, 0), cofac(0, 0, 1, 1));
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+b3Matrix3x3::inverse() const
+{
+	b3Vector3 co = b3MakeVector3(cofac(1, 1, 2, 2), cofac(1, 2, 2, 0), cofac(1, 0, 2, 1));
+	b3Scalar det = (*this)[0].dot(co);
+	b3FullAssert(det != b3Scalar(0.0));
+	b3Scalar s = b3Scalar(1.0) / det;
+	return b3Matrix3x3(co.getX() * s, cofac(0, 2, 2, 1) * s, cofac(0, 1, 1, 2) * s,
+					   co.getY() * s, cofac(0, 0, 2, 2) * s, cofac(0, 2, 1, 0) * s,
+					   co.getZ() * s, cofac(0, 1, 2, 0) * s, cofac(0, 0, 1, 1) * s);
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+b3Matrix3x3::transposeTimes(const b3Matrix3x3& m) const
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+	// zeros w
+	//    static const __m128i xyzMask = (const __m128i){ -1ULL, 0xffffffffULL };
+	__m128 row = m_el[0].mVec128;
+	__m128 m0 = _mm_and_ps(m.getRow(0).mVec128, b3vFFF0fMask);
+	__m128 m1 = _mm_and_ps(m.getRow(1).mVec128, b3vFFF0fMask);
+	__m128 m2 = _mm_and_ps(m.getRow(2).mVec128, b3vFFF0fMask);
+	__m128 r0 = _mm_mul_ps(m0, _mm_shuffle_ps(row, row, 0));
+	__m128 r1 = _mm_mul_ps(m0, _mm_shuffle_ps(row, row, 0x55));
+	__m128 r2 = _mm_mul_ps(m0, _mm_shuffle_ps(row, row, 0xaa));
+	row = m_el[1].mVec128;
+	r0 = _mm_add_ps(r0, _mm_mul_ps(m1, _mm_shuffle_ps(row, row, 0)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(m1, _mm_shuffle_ps(row, row, 0x55)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(m1, _mm_shuffle_ps(row, row, 0xaa)));
+	row = m_el[2].mVec128;
+	r0 = _mm_add_ps(r0, _mm_mul_ps(m2, _mm_shuffle_ps(row, row, 0)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(m2, _mm_shuffle_ps(row, row, 0x55)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(m2, _mm_shuffle_ps(row, row, 0xaa)));
+	return b3Matrix3x3(r0, r1, r2);
+
+#elif defined B3_USE_NEON
+	// zeros w
+	static const uint32x4_t xyzMask = (const uint32x4_t){-1, -1, -1, 0};
+	float32x4_t m0 = (float32x4_t)vandq_u32((uint32x4_t)m.getRow(0).mVec128, xyzMask);
+	float32x4_t m1 = (float32x4_t)vandq_u32((uint32x4_t)m.getRow(1).mVec128, xyzMask);
+	float32x4_t m2 = (float32x4_t)vandq_u32((uint32x4_t)m.getRow(2).mVec128, xyzMask);
+	float32x4_t row = m_el[0].mVec128;
+	float32x4_t r0 = vmulq_lane_f32(m0, vget_low_f32(row), 0);
+	float32x4_t r1 = vmulq_lane_f32(m0, vget_low_f32(row), 1);
+	float32x4_t r2 = vmulq_lane_f32(m0, vget_high_f32(row), 0);
+	row = m_el[1].mVec128;
+	r0 = vmlaq_lane_f32(r0, m1, vget_low_f32(row), 0);
+	r1 = vmlaq_lane_f32(r1, m1, vget_low_f32(row), 1);
+	r2 = vmlaq_lane_f32(r2, m1, vget_high_f32(row), 0);
+	row = m_el[2].mVec128;
+	r0 = vmlaq_lane_f32(r0, m2, vget_low_f32(row), 0);
+	r1 = vmlaq_lane_f32(r1, m2, vget_low_f32(row), 1);
+	r2 = vmlaq_lane_f32(r2, m2, vget_high_f32(row), 0);
+	return b3Matrix3x3(r0, r1, r2);
+#else
+	return b3Matrix3x3(
+		m_el[0].getX() * m[0].getX() + m_el[1].getX() * m[1].getX() + m_el[2].getX() * m[2].getX(),
+		m_el[0].getX() * m[0].getY() + m_el[1].getX() * m[1].getY() + m_el[2].getX() * m[2].getY(),
+		m_el[0].getX() * m[0].getZ() + m_el[1].getX() * m[1].getZ() + m_el[2].getX() * m[2].getZ(),
+		m_el[0].getY() * m[0].getX() + m_el[1].getY() * m[1].getX() + m_el[2].getY() * m[2].getX(),
+		m_el[0].getY() * m[0].getY() + m_el[1].getY() * m[1].getY() + m_el[2].getY() * m[2].getY(),
+		m_el[0].getY() * m[0].getZ() + m_el[1].getY() * m[1].getZ() + m_el[2].getY() * m[2].getZ(),
+		m_el[0].getZ() * m[0].getX() + m_el[1].getZ() * m[1].getX() + m_el[2].getZ() * m[2].getX(),
+		m_el[0].getZ() * m[0].getY() + m_el[1].getZ() * m[1].getY() + m_el[2].getZ() * m[2].getY(),
+		m_el[0].getZ() * m[0].getZ() + m_el[1].getZ() * m[1].getZ() + m_el[2].getZ() * m[2].getZ());
+#endif
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+b3Matrix3x3::timesTranspose(const b3Matrix3x3& m) const
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+	__m128 a0 = m_el[0].mVec128;
+	__m128 a1 = m_el[1].mVec128;
+	__m128 a2 = m_el[2].mVec128;
+
+	b3Matrix3x3 mT = m.transpose();  // we rely on transpose() zeroing w channel so that we don't have to do it here
+	__m128 mx = mT[0].mVec128;
+	__m128 my = mT[1].mVec128;
+	__m128 mz = mT[2].mVec128;
+
+	__m128 r0 = _mm_mul_ps(mx, _mm_shuffle_ps(a0, a0, 0x00));
+	__m128 r1 = _mm_mul_ps(mx, _mm_shuffle_ps(a1, a1, 0x00));
+	__m128 r2 = _mm_mul_ps(mx, _mm_shuffle_ps(a2, a2, 0x00));
+	r0 = _mm_add_ps(r0, _mm_mul_ps(my, _mm_shuffle_ps(a0, a0, 0x55)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(my, _mm_shuffle_ps(a1, a1, 0x55)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(my, _mm_shuffle_ps(a2, a2, 0x55)));
+	r0 = _mm_add_ps(r0, _mm_mul_ps(mz, _mm_shuffle_ps(a0, a0, 0xaa)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(mz, _mm_shuffle_ps(a1, a1, 0xaa)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(mz, _mm_shuffle_ps(a2, a2, 0xaa)));
+	return b3Matrix3x3(r0, r1, r2);
+
+#elif defined B3_USE_NEON
+	float32x4_t a0 = m_el[0].mVec128;
+	float32x4_t a1 = m_el[1].mVec128;
+	float32x4_t a2 = m_el[2].mVec128;
+
+	b3Matrix3x3 mT = m.transpose();  // we rely on transpose() zeroing w channel so that we don't have to do it here
+	float32x4_t mx = mT[0].mVec128;
+	float32x4_t my = mT[1].mVec128;
+	float32x4_t mz = mT[2].mVec128;
+
+	float32x4_t r0 = vmulq_lane_f32(mx, vget_low_f32(a0), 0);
+	float32x4_t r1 = vmulq_lane_f32(mx, vget_low_f32(a1), 0);
+	float32x4_t r2 = vmulq_lane_f32(mx, vget_low_f32(a2), 0);
+	r0 = vmlaq_lane_f32(r0, my, vget_low_f32(a0), 1);
+	r1 = vmlaq_lane_f32(r1, my, vget_low_f32(a1), 1);
+	r2 = vmlaq_lane_f32(r2, my, vget_low_f32(a2), 1);
+	r0 = vmlaq_lane_f32(r0, mz, vget_high_f32(a0), 0);
+	r1 = vmlaq_lane_f32(r1, mz, vget_high_f32(a1), 0);
+	r2 = vmlaq_lane_f32(r2, mz, vget_high_f32(a2), 0);
+	return b3Matrix3x3(r0, r1, r2);
+
+#else
+	return b3Matrix3x3(
+		m_el[0].dot(m[0]), m_el[0].dot(m[1]), m_el[0].dot(m[2]),
+		m_el[1].dot(m[0]), m_el[1].dot(m[1]), m_el[1].dot(m[2]),
+		m_el[2].dot(m[0]), m_el[2].dot(m[1]), m_el[2].dot(m[2]));
+#endif
+}
+
+B3_FORCE_INLINE b3Vector3
+operator*(const b3Matrix3x3& m, const b3Vector3& v)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+	return v.dot3(m[0], m[1], m[2]);
+#else
+	return b3MakeVector3(m[0].dot(v), m[1].dot(v), m[2].dot(v));
+#endif
+}
+
+B3_FORCE_INLINE b3Vector3
+operator*(const b3Vector3& v, const b3Matrix3x3& m)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+
+	const __m128 vv = v.mVec128;
+
+	__m128 c0 = b3_splat_ps(vv, 0);
+	__m128 c1 = b3_splat_ps(vv, 1);
+	__m128 c2 = b3_splat_ps(vv, 2);
+
+	c0 = _mm_mul_ps(c0, _mm_and_ps(m[0].mVec128, b3vFFF0fMask));
+	c1 = _mm_mul_ps(c1, _mm_and_ps(m[1].mVec128, b3vFFF0fMask));
+	c0 = _mm_add_ps(c0, c1);
+	c2 = _mm_mul_ps(c2, _mm_and_ps(m[2].mVec128, b3vFFF0fMask));
+
+	return b3MakeVector3(_mm_add_ps(c0, c2));
+#elif defined(B3_USE_NEON)
+	const float32x4_t vv = v.mVec128;
+	const float32x2_t vlo = vget_low_f32(vv);
+	const float32x2_t vhi = vget_high_f32(vv);
+
+	float32x4_t c0, c1, c2;
+
+	c0 = (float32x4_t)vandq_s32((int32x4_t)m[0].mVec128, b3vFFF0Mask);
+	c1 = (float32x4_t)vandq_s32((int32x4_t)m[1].mVec128, b3vFFF0Mask);
+	c2 = (float32x4_t)vandq_s32((int32x4_t)m[2].mVec128, b3vFFF0Mask);
+
+	c0 = vmulq_lane_f32(c0, vlo, 0);
+	c1 = vmulq_lane_f32(c1, vlo, 1);
+	c2 = vmulq_lane_f32(c2, vhi, 0);
+	c0 = vaddq_f32(c0, c1);
+	c0 = vaddq_f32(c0, c2);
+
+	return b3MakeVector3(c0);
+#else
+	return b3MakeVector3(m.tdotx(v), m.tdoty(v), m.tdotz(v));
+#endif
+}
+
+B3_FORCE_INLINE b3Matrix3x3
+operator*(const b3Matrix3x3& m1, const b3Matrix3x3& m2)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+
+	__m128 m10 = m1[0].mVec128;
+	__m128 m11 = m1[1].mVec128;
+	__m128 m12 = m1[2].mVec128;
+
+	__m128 m2v = _mm_and_ps(m2[0].mVec128, b3vFFF0fMask);
+
+	__m128 c0 = b3_splat_ps(m10, 0);
+	__m128 c1 = b3_splat_ps(m11, 0);
+	__m128 c2 = b3_splat_ps(m12, 0);
+
+	c0 = _mm_mul_ps(c0, m2v);
+	c1 = _mm_mul_ps(c1, m2v);
+	c2 = _mm_mul_ps(c2, m2v);
+
+	m2v = _mm_and_ps(m2[1].mVec128, b3vFFF0fMask);
+
+	__m128 c0_1 = b3_splat_ps(m10, 1);
+	__m128 c1_1 = b3_splat_ps(m11, 1);
+	__m128 c2_1 = b3_splat_ps(m12, 1);
+
+	c0_1 = _mm_mul_ps(c0_1, m2v);
+	c1_1 = _mm_mul_ps(c1_1, m2v);
+	c2_1 = _mm_mul_ps(c2_1, m2v);
+
+	m2v = _mm_and_ps(m2[2].mVec128, b3vFFF0fMask);
+
+	c0 = _mm_add_ps(c0, c0_1);
+	c1 = _mm_add_ps(c1, c1_1);
+	c2 = _mm_add_ps(c2, c2_1);
+
+	m10 = b3_splat_ps(m10, 2);
+	m11 = b3_splat_ps(m11, 2);
+	m12 = b3_splat_ps(m12, 2);
+
+	m10 = _mm_mul_ps(m10, m2v);
+	m11 = _mm_mul_ps(m11, m2v);
+	m12 = _mm_mul_ps(m12, m2v);
+
+	c0 = _mm_add_ps(c0, m10);
+	c1 = _mm_add_ps(c1, m11);
+	c2 = _mm_add_ps(c2, m12);
+
+	return b3Matrix3x3(c0, c1, c2);
+
+#elif defined(B3_USE_NEON)
+
+	float32x4_t rv0, rv1, rv2;
+	float32x4_t v0, v1, v2;
+	float32x4_t mv0, mv1, mv2;
+
+	v0 = m1[0].mVec128;
+	v1 = m1[1].mVec128;
+	v2 = m1[2].mVec128;
+
+	mv0 = (float32x4_t)vandq_s32((int32x4_t)m2[0].mVec128, b3vFFF0Mask);
+	mv1 = (float32x4_t)vandq_s32((int32x4_t)m2[1].mVec128, b3vFFF0Mask);
+	mv2 = (float32x4_t)vandq_s32((int32x4_t)m2[2].mVec128, b3vFFF0Mask);
+
+	rv0 = vmulq_lane_f32(mv0, vget_low_f32(v0), 0);
+	rv1 = vmulq_lane_f32(mv0, vget_low_f32(v1), 0);
+	rv2 = vmulq_lane_f32(mv0, vget_low_f32(v2), 0);
+
+	rv0 = vmlaq_lane_f32(rv0, mv1, vget_low_f32(v0), 1);
+	rv1 = vmlaq_lane_f32(rv1, mv1, vget_low_f32(v1), 1);
+	rv2 = vmlaq_lane_f32(rv2, mv1, vget_low_f32(v2), 1);
+
+	rv0 = vmlaq_lane_f32(rv0, mv2, vget_high_f32(v0), 0);
+	rv1 = vmlaq_lane_f32(rv1, mv2, vget_high_f32(v1), 0);
+	rv2 = vmlaq_lane_f32(rv2, mv2, vget_high_f32(v2), 0);
+
+	return b3Matrix3x3(rv0, rv1, rv2);
+
+#else
+	return b3Matrix3x3(
+		m2.tdotx(m1[0]), m2.tdoty(m1[0]), m2.tdotz(m1[0]),
+		m2.tdotx(m1[1]), m2.tdoty(m1[1]), m2.tdotz(m1[1]),
+		m2.tdotx(m1[2]), m2.tdoty(m1[2]), m2.tdotz(m1[2]));
+#endif
+}
+
+/*
+B3_FORCE_INLINE b3Matrix3x3 b3MultTransposeLeft(const b3Matrix3x3& m1, const b3Matrix3x3& m2) {
+return b3Matrix3x3(
+m1[0][0] * m2[0][0] + m1[1][0] * m2[1][0] + m1[2][0] * m2[2][0],
+m1[0][0] * m2[0][1] + m1[1][0] * m2[1][1] + m1[2][0] * m2[2][1],
+m1[0][0] * m2[0][2] + m1[1][0] * m2[1][2] + m1[2][0] * m2[2][2],
+m1[0][1] * m2[0][0] + m1[1][1] * m2[1][0] + m1[2][1] * m2[2][0],
+m1[0][1] * m2[0][1] + m1[1][1] * m2[1][1] + m1[2][1] * m2[2][1],
+m1[0][1] * m2[0][2] + m1[1][1] * m2[1][2] + m1[2][1] * m2[2][2],
+m1[0][2] * m2[0][0] + m1[1][2] * m2[1][0] + m1[2][2] * m2[2][0],
+m1[0][2] * m2[0][1] + m1[1][2] * m2[1][1] + m1[2][2] * m2[2][1],
+m1[0][2] * m2[0][2] + m1[1][2] * m2[1][2] + m1[2][2] * m2[2][2]);
+}
+*/
+
+/**@brief Equality operator between two matrices
+* It will test all elements are equal.  */
+B3_FORCE_INLINE bool operator==(const b3Matrix3x3& m1, const b3Matrix3x3& m2)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+
+	__m128 c0, c1, c2;
+
+	c0 = _mm_cmpeq_ps(m1[0].mVec128, m2[0].mVec128);
+	c1 = _mm_cmpeq_ps(m1[1].mVec128, m2[1].mVec128);
+	c2 = _mm_cmpeq_ps(m1[2].mVec128, m2[2].mVec128);
+
+	c0 = _mm_and_ps(c0, c1);
+	c0 = _mm_and_ps(c0, c2);
+
+	return (0x7 == _mm_movemask_ps((__m128)c0));
+#else
+	return (m1[0][0] == m2[0][0] && m1[1][0] == m2[1][0] && m1[2][0] == m2[2][0] &&
+			m1[0][1] == m2[0][1] && m1[1][1] == m2[1][1] && m1[2][1] == m2[2][1] &&
+			m1[0][2] == m2[0][2] && m1[1][2] == m2[1][2] && m1[2][2] == m2[2][2]);
+#endif
+}
+
+///for serialization
+struct b3Matrix3x3FloatData
+{
+	b3Vector3FloatData m_el[3];
+};
+
+///for serialization
+struct b3Matrix3x3DoubleData
+{
+	b3Vector3DoubleData m_el[3];
+};
+
+B3_FORCE_INLINE void b3Matrix3x3::serialize(struct b3Matrix3x3Data& dataOut) const
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].serialize(dataOut.m_el[i]);
+}
+
+B3_FORCE_INLINE void b3Matrix3x3::serializeFloat(struct b3Matrix3x3FloatData& dataOut) const
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].serializeFloat(dataOut.m_el[i]);
+}
+
+B3_FORCE_INLINE void b3Matrix3x3::deSerialize(const struct b3Matrix3x3Data& dataIn)
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].deSerialize(dataIn.m_el[i]);
+}
+
+B3_FORCE_INLINE void b3Matrix3x3::deSerializeFloat(const struct b3Matrix3x3FloatData& dataIn)
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].deSerializeFloat(dataIn.m_el[i]);
+}
+
+B3_FORCE_INLINE void b3Matrix3x3::deSerializeDouble(const struct b3Matrix3x3DoubleData& dataIn)
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].deSerializeDouble(dataIn.m_el[i]);
+}
+
+#endif  //B3_MATRIX3x3_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3MinMax.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3MinMax.h
new file mode 100644
index 0000000..c09c3db
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3MinMax.h
@@ -0,0 +1,69 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_GEN_MINMAX_H
+#define B3_GEN_MINMAX_H
+
+#include "b3Scalar.h"
+
+template <class T>
+B3_FORCE_INLINE const T& b3Min(const T& a, const T& b)
+{
+	return a < b ? a : b;
+}
+
+template <class T>
+B3_FORCE_INLINE const T& b3Max(const T& a, const T& b)
+{
+	return a > b ? a : b;
+}
+
+template <class T>
+B3_FORCE_INLINE const T& b3Clamped(const T& a, const T& lb, const T& ub)
+{
+	return a < lb ? lb : (ub < a ? ub : a);
+}
+
+template <class T>
+B3_FORCE_INLINE void b3SetMin(T& a, const T& b)
+{
+	if (b < a)
+	{
+		a = b;
+	}
+}
+
+template <class T>
+B3_FORCE_INLINE void b3SetMax(T& a, const T& b)
+{
+	if (a < b)
+	{
+		a = b;
+	}
+}
+
+template <class T>
+B3_FORCE_INLINE void b3Clamp(T& a, const T& lb, const T& ub)
+{
+	if (a < lb)
+	{
+		a = lb;
+	}
+	else if (ub < a)
+	{
+		a = ub;
+	}
+}
+
+#endif  //B3_GEN_MINMAX_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3PoolAllocator.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3PoolAllocator.h
new file mode 100644
index 0000000..ed56bc6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3PoolAllocator.h
@@ -0,0 +1,121 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _BT_POOL_ALLOCATOR_H
+#define _BT_POOL_ALLOCATOR_H
+
+#include "b3Scalar.h"
+#include "b3AlignedAllocator.h"
+
+///The b3PoolAllocator class allows to efficiently allocate a large pool of objects, instead of dynamically allocating them separately.
+class b3PoolAllocator
+{
+	int m_elemSize;
+	int m_maxElements;
+	int m_freeCount;
+	void* m_firstFree;
+	unsigned char* m_pool;
+
+public:
+	b3PoolAllocator(int elemSize, int maxElements)
+		: m_elemSize(elemSize),
+		  m_maxElements(maxElements)
+	{
+		m_pool = (unsigned char*)b3AlignedAlloc(static_cast<unsigned int>(m_elemSize * m_maxElements), 16);
+
+		unsigned char* p = m_pool;
+		m_firstFree = p;
+		m_freeCount = m_maxElements;
+		int count = m_maxElements;
+		while (--count)
+		{
+			*(void**)p = (p + m_elemSize);
+			p += m_elemSize;
+		}
+		*(void**)p = 0;
+	}
+
+	~b3PoolAllocator()
+	{
+		b3AlignedFree(m_pool);
+	}
+
+	int getFreeCount() const
+	{
+		return m_freeCount;
+	}
+
+	int getUsedCount() const
+	{
+		return m_maxElements - m_freeCount;
+	}
+
+	int getMaxCount() const
+	{
+		return m_maxElements;
+	}
+
+	void* allocate(int size)
+	{
+		// release mode fix
+		(void)size;
+		b3Assert(!size || size <= m_elemSize);
+		b3Assert(m_freeCount > 0);
+		void* result = m_firstFree;
+		m_firstFree = *(void**)m_firstFree;
+		--m_freeCount;
+		return result;
+	}
+
+	bool validPtr(void* ptr)
+	{
+		if (ptr)
+		{
+			if (((unsigned char*)ptr >= m_pool && (unsigned char*)ptr < m_pool + m_maxElements * m_elemSize))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	void freeMemory(void* ptr)
+	{
+		if (ptr)
+		{
+			b3Assert((unsigned char*)ptr >= m_pool && (unsigned char*)ptr < m_pool + m_maxElements * m_elemSize);
+
+			*(void**)ptr = m_firstFree;
+			m_firstFree = ptr;
+			++m_freeCount;
+		}
+	}
+
+	int getElementSize() const
+	{
+		return m_elemSize;
+	}
+
+	unsigned char* getPoolAddress()
+	{
+		return m_pool;
+	}
+
+	const unsigned char* getPoolAddress() const
+	{
+		return m_pool;
+	}
+};
+
+#endif  //_BT_POOL_ALLOCATOR_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3QuadWord.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3QuadWord.h
new file mode 100644
index 0000000..0def305
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3QuadWord.h
@@ -0,0 +1,242 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_SIMD_QUADWORD_H
+#define B3_SIMD_QUADWORD_H
+
+#include "b3Scalar.h"
+#include "b3MinMax.h"
+
+#if defined(__CELLOS_LV2) && defined(__SPU__)
+#include <altivec.h>
+#endif
+
+/**@brief The b3QuadWord class is base class for b3Vector3 and b3Quaternion. 
+ * Some issues under PS3 Linux with IBM 2.1 SDK, gcc compiler prevent from using aligned quadword.
+ */
+#ifndef USE_LIBSPE2
+B3_ATTRIBUTE_ALIGNED16(class)
+b3QuadWord
+#else
+class b3QuadWord
+#endif
+{
+protected:
+#if defined(__SPU__) && defined(__CELLOS_LV2__)
+	union {
+		vec_float4 mVec128;
+		b3Scalar m_floats[4];
+	};
+
+public:
+	vec_float4 get128() const
+	{
+		return mVec128;
+	}
+
+#else  //__CELLOS_LV2__ __SPU__
+
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+public:
+	union {
+		b3SimdFloat4 mVec128;
+		b3Scalar m_floats[4];
+		struct
+		{
+			b3Scalar x, y, z, w;
+		};
+	};
+
+public:
+	B3_FORCE_INLINE b3SimdFloat4 get128() const
+	{
+		return mVec128;
+	}
+	B3_FORCE_INLINE void set128(b3SimdFloat4 v128)
+	{
+		mVec128 = v128;
+	}
+#else
+public:
+	union {
+		b3Scalar m_floats[4];
+		struct
+		{
+			b3Scalar x, y, z, w;
+		};
+	};
+#endif  // B3_USE_SSE
+
+#endif  //__CELLOS_LV2__ __SPU__
+
+public:
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+
+	// Set Vector
+	B3_FORCE_INLINE b3QuadWord(const b3SimdFloat4 vec)
+	{
+		mVec128 = vec;
+	}
+
+	// Copy constructor
+	B3_FORCE_INLINE b3QuadWord(const b3QuadWord& rhs)
+	{
+		mVec128 = rhs.mVec128;
+	}
+
+	// Assignment Operator
+	B3_FORCE_INLINE b3QuadWord&
+	operator=(const b3QuadWord& v)
+	{
+		mVec128 = v.mVec128;
+
+		return *this;
+	}
+
+#endif
+
+	/**@brief Return the x value */
+	B3_FORCE_INLINE const b3Scalar& getX() const { return m_floats[0]; }
+	/**@brief Return the y value */
+	B3_FORCE_INLINE const b3Scalar& getY() const { return m_floats[1]; }
+	/**@brief Return the z value */
+	B3_FORCE_INLINE const b3Scalar& getZ() const { return m_floats[2]; }
+	/**@brief Set the x value */
+	B3_FORCE_INLINE void setX(b3Scalar _x) { m_floats[0] = _x; };
+	/**@brief Set the y value */
+	B3_FORCE_INLINE void setY(b3Scalar _y) { m_floats[1] = _y; };
+	/**@brief Set the z value */
+	B3_FORCE_INLINE void setZ(b3Scalar _z) { m_floats[2] = _z; };
+	/**@brief Set the w value */
+	B3_FORCE_INLINE void setW(b3Scalar _w) { m_floats[3] = _w; };
+	/**@brief Return the x value */
+
+	//B3_FORCE_INLINE b3Scalar&       operator[](int i)       { return (&m_floats[0])[i];	}
+	//B3_FORCE_INLINE const b3Scalar& operator[](int i) const { return (&m_floats[0])[i]; }
+	///operator b3Scalar*() replaces operator[], using implicit conversion. We added operator != and operator == to avoid pointer comparisons.
+	B3_FORCE_INLINE operator b3Scalar*() { return &m_floats[0]; }
+	B3_FORCE_INLINE operator const b3Scalar*() const { return &m_floats[0]; }
+
+	B3_FORCE_INLINE bool operator==(const b3QuadWord& other) const
+	{
+#ifdef B3_USE_SSE
+		return (0xf == _mm_movemask_ps((__m128)_mm_cmpeq_ps(mVec128, other.mVec128)));
+#else
+		return ((m_floats[3] == other.m_floats[3]) &&
+				(m_floats[2] == other.m_floats[2]) &&
+				(m_floats[1] == other.m_floats[1]) &&
+				(m_floats[0] == other.m_floats[0]));
+#endif
+	}
+
+	B3_FORCE_INLINE bool operator!=(const b3QuadWord& other) const
+	{
+		return !(*this == other);
+	}
+
+	/**@brief Set x,y,z and zero w 
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   */
+	B3_FORCE_INLINE void setValue(const b3Scalar& _x, const b3Scalar& _y, const b3Scalar& _z)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = 0.f;
+	}
+
+	/*		void getValue(b3Scalar *m) const 
+		{
+			m[0] = m_floats[0];
+			m[1] = m_floats[1];
+			m[2] = m_floats[2];
+		}
+*/
+	/**@brief Set the values 
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   * @param w Value of w
+   */
+	B3_FORCE_INLINE void setValue(const b3Scalar& _x, const b3Scalar& _y, const b3Scalar& _z, const b3Scalar& _w)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = _w;
+	}
+	/**@brief No initialization constructor */
+	B3_FORCE_INLINE b3QuadWord()
+	//	:m_floats[0](b3Scalar(0.)),m_floats[1](b3Scalar(0.)),m_floats[2](b3Scalar(0.)),m_floats[3](b3Scalar(0.))
+	{
+	}
+
+	/**@brief Three argument constructor (zeros w)
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   */
+	B3_FORCE_INLINE b3QuadWord(const b3Scalar& _x, const b3Scalar& _y, const b3Scalar& _z)
+	{
+		m_floats[0] = _x, m_floats[1] = _y, m_floats[2] = _z, m_floats[3] = 0.0f;
+	}
+
+	/**@brief Initializing constructor
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   * @param w Value of w
+   */
+	B3_FORCE_INLINE b3QuadWord(const b3Scalar& _x, const b3Scalar& _y, const b3Scalar& _z, const b3Scalar& _w)
+	{
+		m_floats[0] = _x, m_floats[1] = _y, m_floats[2] = _z, m_floats[3] = _w;
+	}
+
+	/**@brief Set each element to the max of the current values and the values of another b3QuadWord
+   * @param other The other b3QuadWord to compare with 
+   */
+	B3_FORCE_INLINE void setMax(const b3QuadWord& other)
+	{
+#ifdef B3_USE_SSE
+		mVec128 = _mm_max_ps(mVec128, other.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vmaxq_f32(mVec128, other.mVec128);
+#else
+		b3SetMax(m_floats[0], other.m_floats[0]);
+		b3SetMax(m_floats[1], other.m_floats[1]);
+		b3SetMax(m_floats[2], other.m_floats[2]);
+		b3SetMax(m_floats[3], other.m_floats[3]);
+#endif
+	}
+	/**@brief Set each element to the min of the current values and the values of another b3QuadWord
+   * @param other The other b3QuadWord to compare with 
+   */
+	B3_FORCE_INLINE void setMin(const b3QuadWord& other)
+	{
+#ifdef B3_USE_SSE
+		mVec128 = _mm_min_ps(mVec128, other.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vminq_f32(mVec128, other.mVec128);
+#else
+		b3SetMin(m_floats[0], other.m_floats[0]);
+		b3SetMin(m_floats[1], other.m_floats[1]);
+		b3SetMin(m_floats[2], other.m_floats[2]);
+		b3SetMin(m_floats[3], other.m_floats[3]);
+#endif
+	}
+};
+
+#endif  //B3_SIMD_QUADWORD_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Quaternion.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Quaternion.h
new file mode 100644
index 0000000..4fdd72d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Quaternion.h
@@ -0,0 +1,908 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_SIMD__QUATERNION_H_
+#define B3_SIMD__QUATERNION_H_
+
+#include "b3Vector3.h"
+#include "b3QuadWord.h"
+
+#ifdef B3_USE_SSE
+
+const __m128 B3_ATTRIBUTE_ALIGNED16(b3vOnes) = {1.0f, 1.0f, 1.0f, 1.0f};
+
+#endif
+
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+
+const b3SimdFloat4 B3_ATTRIBUTE_ALIGNED16(b3vQInv) = {-0.0f, -0.0f, -0.0f, +0.0f};
+const b3SimdFloat4 B3_ATTRIBUTE_ALIGNED16(b3vPPPM) = {+0.0f, +0.0f, +0.0f, -0.0f};
+
+#endif
+
+/**@brief The b3Quaternion implements quaternion to perform linear algebra rotations in combination with b3Matrix3x3, b3Vector3 and b3Transform. */
+class b3Quaternion : public b3QuadWord
+{
+public:
+	/**@brief No initialization constructor */
+	b3Quaternion() {}
+
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)) || defined(B3_USE_NEON)
+	// Set Vector
+	B3_FORCE_INLINE b3Quaternion(const b3SimdFloat4 vec)
+	{
+		mVec128 = vec;
+	}
+
+	// Copy constructor
+	B3_FORCE_INLINE b3Quaternion(const b3Quaternion& rhs)
+	{
+		mVec128 = rhs.mVec128;
+	}
+
+	// Assignment Operator
+	B3_FORCE_INLINE b3Quaternion&
+	operator=(const b3Quaternion& v)
+	{
+		mVec128 = v.mVec128;
+
+		return *this;
+	}
+
+#endif
+
+	//		template <typename b3Scalar>
+	//		explicit Quaternion(const b3Scalar *v) : Tuple4<b3Scalar>(v) {}
+	/**@brief Constructor from scalars */
+	b3Quaternion(const b3Scalar& _x, const b3Scalar& _y, const b3Scalar& _z, const b3Scalar& _w)
+		: b3QuadWord(_x, _y, _z, _w)
+	{
+		//b3Assert(!((_x==1.f) && (_y==0.f) && (_z==0.f) && (_w==0.f)));
+	}
+	/**@brief Axis angle Constructor
+   * @param axis The axis which the rotation is around
+   * @param angle The magnitude of the rotation around the angle (Radians) */
+	b3Quaternion(const b3Vector3& _axis, const b3Scalar& _angle)
+	{
+		setRotation(_axis, _angle);
+	}
+	/**@brief Constructor from Euler angles
+   * @param yaw Angle around Y unless B3_EULER_DEFAULT_ZYX defined then Z
+   * @param pitch Angle around X unless B3_EULER_DEFAULT_ZYX defined then Y
+   * @param roll Angle around Z unless B3_EULER_DEFAULT_ZYX defined then X */
+	b3Quaternion(const b3Scalar& yaw, const b3Scalar& pitch, const b3Scalar& roll)
+	{
+#ifndef B3_EULER_DEFAULT_ZYX
+		setEuler(yaw, pitch, roll);
+#else
+		setEulerZYX(yaw, pitch, roll);
+#endif
+	}
+	/**@brief Set the rotation using axis angle notation 
+   * @param axis The axis around which to rotate
+   * @param angle The magnitude of the rotation in Radians */
+	void setRotation(const b3Vector3& axis1, const b3Scalar& _angle)
+	{
+		b3Vector3 axis = axis1;
+		axis.safeNormalize();
+		
+		b3Scalar d = axis.length();
+		b3Assert(d != b3Scalar(0.0));
+		if (d < B3_EPSILON)
+		{
+			setValue(0, 0, 0, 1);
+		}
+		else
+		{
+			b3Scalar s = b3Sin(_angle * b3Scalar(0.5)) / d;
+			setValue(axis.getX() * s, axis.getY() * s, axis.getZ() * s,
+				b3Cos(_angle * b3Scalar(0.5)));
+		}
+	}
+	/**@brief Set the quaternion using Euler angles
+   * @param yaw Angle around Y
+   * @param pitch Angle around X
+   * @param roll Angle around Z */
+	void setEuler(const b3Scalar& yaw, const b3Scalar& pitch, const b3Scalar& roll)
+	{
+		b3Scalar halfYaw = b3Scalar(yaw) * b3Scalar(0.5);
+		b3Scalar halfPitch = b3Scalar(pitch) * b3Scalar(0.5);
+		b3Scalar halfRoll = b3Scalar(roll) * b3Scalar(0.5);
+		b3Scalar cosYaw = b3Cos(halfYaw);
+		b3Scalar sinYaw = b3Sin(halfYaw);
+		b3Scalar cosPitch = b3Cos(halfPitch);
+		b3Scalar sinPitch = b3Sin(halfPitch);
+		b3Scalar cosRoll = b3Cos(halfRoll);
+		b3Scalar sinRoll = b3Sin(halfRoll);
+		setValue(cosRoll * sinPitch * cosYaw + sinRoll * cosPitch * sinYaw,
+				 cosRoll * cosPitch * sinYaw - sinRoll * sinPitch * cosYaw,
+				 sinRoll * cosPitch * cosYaw - cosRoll * sinPitch * sinYaw,
+				 cosRoll * cosPitch * cosYaw + sinRoll * sinPitch * sinYaw);
+	}
+
+	/**@brief Set the quaternion using euler angles 
+   * @param yaw Angle around Z
+   * @param pitch Angle around Y
+   * @param roll Angle around X */
+	void setEulerZYX(const b3Scalar& yawZ, const b3Scalar& pitchY, const b3Scalar& rollX)
+	{
+		b3Scalar halfYaw = b3Scalar(yawZ) * b3Scalar(0.5);
+		b3Scalar halfPitch = b3Scalar(pitchY) * b3Scalar(0.5);
+		b3Scalar halfRoll = b3Scalar(rollX) * b3Scalar(0.5);
+		b3Scalar cosYaw = b3Cos(halfYaw);
+		b3Scalar sinYaw = b3Sin(halfYaw);
+		b3Scalar cosPitch = b3Cos(halfPitch);
+		b3Scalar sinPitch = b3Sin(halfPitch);
+		b3Scalar cosRoll = b3Cos(halfRoll);
+		b3Scalar sinRoll = b3Sin(halfRoll);
+		setValue(sinRoll * cosPitch * cosYaw - cosRoll * sinPitch * sinYaw,   //x
+				 cosRoll * sinPitch * cosYaw + sinRoll * cosPitch * sinYaw,   //y
+				 cosRoll * cosPitch * sinYaw - sinRoll * sinPitch * cosYaw,   //z
+				 cosRoll * cosPitch * cosYaw + sinRoll * sinPitch * sinYaw);  //formerly yzx
+		normalize();
+	}
+
+	/**@brief Get the euler angles from this quaternion
+	   * @param yaw Angle around Z
+	   * @param pitch Angle around Y
+	   * @param roll Angle around X */
+	void getEulerZYX(b3Scalar& yawZ, b3Scalar& pitchY, b3Scalar& rollX) const
+	{
+		b3Scalar squ;
+		b3Scalar sqx;
+		b3Scalar sqy;
+		b3Scalar sqz;
+		b3Scalar sarg;
+		sqx = m_floats[0] * m_floats[0];
+		sqy = m_floats[1] * m_floats[1];
+		sqz = m_floats[2] * m_floats[2];
+		squ = m_floats[3] * m_floats[3];
+		rollX = b3Atan2(2 * (m_floats[1] * m_floats[2] + m_floats[3] * m_floats[0]), squ - sqx - sqy + sqz);
+		sarg = b3Scalar(-2.) * (m_floats[0] * m_floats[2] - m_floats[3] * m_floats[1]);
+		pitchY = sarg <= b3Scalar(-1.0) ? b3Scalar(-0.5) * B3_PI : (sarg >= b3Scalar(1.0) ? b3Scalar(0.5) * B3_PI : b3Asin(sarg));
+		yawZ = b3Atan2(2 * (m_floats[0] * m_floats[1] + m_floats[3] * m_floats[2]), squ + sqx - sqy - sqz);
+	}
+
+	/**@brief Add two quaternions
+   * @param q The quaternion to add to this one */
+	B3_FORCE_INLINE b3Quaternion& operator+=(const b3Quaternion& q)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = _mm_add_ps(mVec128, q.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vaddq_f32(mVec128, q.mVec128);
+#else
+		m_floats[0] += q.getX();
+		m_floats[1] += q.getY();
+		m_floats[2] += q.getZ();
+		m_floats[3] += q.m_floats[3];
+#endif
+		return *this;
+	}
+
+	/**@brief Subtract out a quaternion
+   * @param q The quaternion to subtract from this one */
+	b3Quaternion& operator-=(const b3Quaternion& q)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = _mm_sub_ps(mVec128, q.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vsubq_f32(mVec128, q.mVec128);
+#else
+		m_floats[0] -= q.getX();
+		m_floats[1] -= q.getY();
+		m_floats[2] -= q.getZ();
+		m_floats[3] -= q.m_floats[3];
+#endif
+		return *this;
+	}
+
+	/**@brief Scale this quaternion
+   * @param s The scalar to scale by */
+	b3Quaternion& operator*=(const b3Scalar& s)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = b3_pshufd_ps(vs, 0);     //	(S S S S)
+		mVec128 = _mm_mul_ps(mVec128, vs);
+#elif defined(B3_USE_NEON)
+		mVec128 = vmulq_n_f32(mVec128, s);
+#else
+		m_floats[0] *= s;
+		m_floats[1] *= s;
+		m_floats[2] *= s;
+		m_floats[3] *= s;
+#endif
+		return *this;
+	}
+
+	/**@brief Multiply this quaternion by q on the right
+   * @param q The other quaternion 
+   * Equivilant to this = this * q */
+	b3Quaternion& operator*=(const b3Quaternion& q)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vQ2 = q.get128();
+
+		__m128 A1 = b3_pshufd_ps(mVec128, B3_SHUFFLE(0, 1, 2, 0));
+		__m128 B1 = b3_pshufd_ps(vQ2, B3_SHUFFLE(3, 3, 3, 0));
+
+		A1 = A1 * B1;
+
+		__m128 A2 = b3_pshufd_ps(mVec128, B3_SHUFFLE(1, 2, 0, 1));
+		__m128 B2 = b3_pshufd_ps(vQ2, B3_SHUFFLE(2, 0, 1, 1));
+
+		A2 = A2 * B2;
+
+		B1 = b3_pshufd_ps(mVec128, B3_SHUFFLE(2, 0, 1, 2));
+		B2 = b3_pshufd_ps(vQ2, B3_SHUFFLE(1, 2, 0, 2));
+
+		B1 = B1 * B2;  //	A3 *= B3
+
+		mVec128 = b3_splat_ps(mVec128, 3);  //	A0
+		mVec128 = mVec128 * vQ2;            //	A0 * B0
+
+		A1 = A1 + A2;                  //	AB12
+		mVec128 = mVec128 - B1;        //	AB03 = AB0 - AB3
+		A1 = _mm_xor_ps(A1, b3vPPPM);  //	change sign of the last element
+		mVec128 = mVec128 + A1;        //	AB03 + AB12
+
+#elif defined(B3_USE_NEON)
+
+		float32x4_t vQ1 = mVec128;
+		float32x4_t vQ2 = q.get128();
+		float32x4_t A0, A1, B1, A2, B2, A3, B3;
+		float32x2_t vQ1zx, vQ2wx, vQ1yz, vQ2zx, vQ2yz, vQ2xz;
+
+		{
+			float32x2x2_t tmp;
+			tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+			vQ1zx = tmp.val[0];
+
+			tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+			vQ2zx = tmp.val[0];
+		}
+		vQ2wx = vext_f32(vget_high_f32(vQ2), vget_low_f32(vQ2), 1);
+
+		vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+		vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+		vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+		A1 = vcombine_f32(vget_low_f32(vQ1), vQ1zx);                     // X Y  z x
+		B1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ2), 1), vQ2wx);  // W W  W X
+
+		A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+		B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+		A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+		B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+		A1 = vmulq_f32(A1, B1);
+		A2 = vmulq_f32(A2, B2);
+		A3 = vmulq_f32(A3, B3);                           //	A3 *= B3
+		A0 = vmulq_lane_f32(vQ2, vget_high_f32(vQ1), 1);  //	A0 * B0
+
+		A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+		A0 = vsubq_f32(A0, A3);  //	AB03 = AB0 - AB3
+
+		//	change the sign of the last element
+		A1 = (b3SimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)b3vPPPM);
+		A0 = vaddq_f32(A0, A1);  //	AB03 + AB12
+
+		mVec128 = A0;
+#else
+		setValue(
+			m_floats[3] * q.getX() + m_floats[0] * q.m_floats[3] + m_floats[1] * q.getZ() - m_floats[2] * q.getY(),
+			m_floats[3] * q.getY() + m_floats[1] * q.m_floats[3] + m_floats[2] * q.getX() - m_floats[0] * q.getZ(),
+			m_floats[3] * q.getZ() + m_floats[2] * q.m_floats[3] + m_floats[0] * q.getY() - m_floats[1] * q.getX(),
+			m_floats[3] * q.m_floats[3] - m_floats[0] * q.getX() - m_floats[1] * q.getY() - m_floats[2] * q.getZ());
+#endif
+		return *this;
+	}
+	/**@brief Return the dot product between this quaternion and another
+   * @param q The other quaternion */
+	b3Scalar dot(const b3Quaternion& q) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vd;
+
+		vd = _mm_mul_ps(mVec128, q.mVec128);
+
+		__m128 t = _mm_movehl_ps(vd, vd);
+		vd = _mm_add_ps(vd, t);
+		t = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, t);
+
+		return _mm_cvtss_f32(vd);
+#elif defined(B3_USE_NEON)
+		float32x4_t vd = vmulq_f32(mVec128, q.mVec128);
+		float32x2_t x = vpadd_f32(vget_low_f32(vd), vget_high_f32(vd));
+		x = vpadd_f32(x, x);
+		return vget_lane_f32(x, 0);
+#else
+		return m_floats[0] * q.getX() +
+			   m_floats[1] * q.getY() +
+			   m_floats[2] * q.getZ() +
+			   m_floats[3] * q.m_floats[3];
+#endif
+	}
+
+	/**@brief Return the length squared of the quaternion */
+	b3Scalar length2() const
+	{
+		return dot(*this);
+	}
+
+	/**@brief Return the length of the quaternion */
+	b3Scalar length() const
+	{
+		return b3Sqrt(length2());
+	}
+
+	/**@brief Normalize the quaternion 
+   * Such that x^2 + y^2 + z^2 +w^2 = 1 */
+	b3Quaternion& normalize()
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vd;
+
+		vd = _mm_mul_ps(mVec128, mVec128);
+
+		__m128 t = _mm_movehl_ps(vd, vd);
+		vd = _mm_add_ps(vd, t);
+		t = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, t);
+
+		vd = _mm_sqrt_ss(vd);
+		vd = _mm_div_ss(b3vOnes, vd);
+		vd = b3_pshufd_ps(vd, 0);  // splat
+		mVec128 = _mm_mul_ps(mVec128, vd);
+
+		return *this;
+#else
+		return *this /= length();
+#endif
+	}
+
+	/**@brief Return a scaled version of this quaternion
+   * @param s The scale factor */
+	B3_FORCE_INLINE b3Quaternion
+	operator*(const b3Scalar& s) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = b3_pshufd_ps(vs, 0x00);  //	(S S S S)
+
+		return b3Quaternion(_mm_mul_ps(mVec128, vs));
+#elif defined(B3_USE_NEON)
+		return b3Quaternion(vmulq_n_f32(mVec128, s));
+#else
+		return b3Quaternion(getX() * s, getY() * s, getZ() * s, m_floats[3] * s);
+#endif
+	}
+
+	/**@brief Return an inversely scaled versionof this quaternion
+   * @param s The inverse scale factor */
+	b3Quaternion operator/(const b3Scalar& s) const
+	{
+		b3Assert(s != b3Scalar(0.0));
+		return *this * (b3Scalar(1.0) / s);
+	}
+
+	/**@brief Inversely scale this quaternion
+   * @param s The scale factor */
+	b3Quaternion& operator/=(const b3Scalar& s)
+	{
+		b3Assert(s != b3Scalar(0.0));
+		return *this *= b3Scalar(1.0) / s;
+	}
+
+	/**@brief Return a normalized version of this quaternion */
+	b3Quaternion normalized() const
+	{
+		return *this / length();
+	}
+	/**@brief Return the angle between this quaternion and the other 
+   * @param q The other quaternion */
+	b3Scalar angle(const b3Quaternion& q) const
+	{
+		b3Scalar s = b3Sqrt(length2() * q.length2());
+		b3Assert(s != b3Scalar(0.0));
+		return b3Acos(dot(q) / s);
+	}
+	/**@brief Return the angle of rotation represented by this quaternion */
+	b3Scalar getAngle() const
+	{
+		b3Scalar s = b3Scalar(2.) * b3Acos(m_floats[3]);
+		return s;
+	}
+
+	/**@brief Return the axis of the rotation represented by this quaternion */
+	b3Vector3 getAxis() const
+	{
+		b3Scalar s_squared = 1.f - m_floats[3] * m_floats[3];
+
+		if (s_squared < b3Scalar(10.) * B3_EPSILON)  //Check for divide by zero
+			return b3MakeVector3(1.0, 0.0, 0.0);     // Arbitrary
+		b3Scalar s = 1.f / b3Sqrt(s_squared);
+		return b3MakeVector3(m_floats[0] * s, m_floats[1] * s, m_floats[2] * s);
+	}
+
+	/**@brief Return the inverse of this quaternion */
+	b3Quaternion inverse() const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		return b3Quaternion(_mm_xor_ps(mVec128, b3vQInv));
+#elif defined(B3_USE_NEON)
+		return b3Quaternion((b3SimdFloat4)veorq_s32((int32x4_t)mVec128, (int32x4_t)b3vQInv));
+#else
+		return b3Quaternion(-m_floats[0], -m_floats[1], -m_floats[2], m_floats[3]);
+#endif
+	}
+
+	/**@brief Return the sum of this quaternion and the other 
+   * @param q2 The other quaternion */
+	B3_FORCE_INLINE b3Quaternion
+	operator+(const b3Quaternion& q2) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		return b3Quaternion(_mm_add_ps(mVec128, q2.mVec128));
+#elif defined(B3_USE_NEON)
+		return b3Quaternion(vaddq_f32(mVec128, q2.mVec128));
+#else
+		const b3Quaternion& q1 = *this;
+		return b3Quaternion(q1.getX() + q2.getX(), q1.getY() + q2.getY(), q1.getZ() + q2.getZ(), q1.m_floats[3] + q2.m_floats[3]);
+#endif
+	}
+
+	/**@brief Return the difference between this quaternion and the other 
+   * @param q2 The other quaternion */
+	B3_FORCE_INLINE b3Quaternion
+	operator-(const b3Quaternion& q2) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		return b3Quaternion(_mm_sub_ps(mVec128, q2.mVec128));
+#elif defined(B3_USE_NEON)
+		return b3Quaternion(vsubq_f32(mVec128, q2.mVec128));
+#else
+		const b3Quaternion& q1 = *this;
+		return b3Quaternion(q1.getX() - q2.getX(), q1.getY() - q2.getY(), q1.getZ() - q2.getZ(), q1.m_floats[3] - q2.m_floats[3]);
+#endif
+	}
+
+	/**@brief Return the negative of this quaternion 
+   * This simply negates each element */
+	B3_FORCE_INLINE b3Quaternion operator-() const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		return b3Quaternion(_mm_xor_ps(mVec128, b3vMzeroMask));
+#elif defined(B3_USE_NEON)
+		return b3Quaternion((b3SimdFloat4)veorq_s32((int32x4_t)mVec128, (int32x4_t)b3vMzeroMask));
+#else
+		const b3Quaternion& q2 = *this;
+		return b3Quaternion(-q2.getX(), -q2.getY(), -q2.getZ(), -q2.m_floats[3]);
+#endif
+	}
+	/**@todo document this and it's use */
+	B3_FORCE_INLINE b3Quaternion farthest(const b3Quaternion& qd) const
+	{
+		b3Quaternion diff, sum;
+		diff = *this - qd;
+		sum = *this + qd;
+		if (diff.dot(diff) > sum.dot(sum))
+			return qd;
+		return (-qd);
+	}
+
+	/**@todo document this and it's use */
+	B3_FORCE_INLINE b3Quaternion nearest(const b3Quaternion& qd) const
+	{
+		b3Quaternion diff, sum;
+		diff = *this - qd;
+		sum = *this + qd;
+		if (diff.dot(diff) < sum.dot(sum))
+			return qd;
+		return (-qd);
+	}
+
+	/**@brief Return the quaternion which is the result of Spherical Linear Interpolation between this and the other quaternion
+   * @param q The other quaternion to interpolate with 
+   * @param t The ratio between this and q to interpolate.  If t = 0 the result is this, if t=1 the result is q.
+   * Slerp interpolates assuming constant velocity.  */
+	b3Quaternion slerp(const b3Quaternion& q, const b3Scalar& t) const
+	{
+		b3Scalar magnitude = b3Sqrt(length2() * q.length2());
+		b3Assert(magnitude > b3Scalar(0));
+
+		b3Scalar product = dot(q) / magnitude;
+		if (b3Fabs(product) < b3Scalar(1))
+		{
+			// Take care of long angle case see http://en.wikipedia.org/wiki/Slerp
+			const b3Scalar sign = (product < 0) ? b3Scalar(-1) : b3Scalar(1);
+
+			const b3Scalar theta = b3Acos(sign * product);
+			const b3Scalar s1 = b3Sin(sign * t * theta);
+			const b3Scalar d = b3Scalar(1.0) / b3Sin(theta);
+			const b3Scalar s0 = b3Sin((b3Scalar(1.0) - t) * theta);
+
+			return b3Quaternion(
+				(m_floats[0] * s0 + q.getX() * s1) * d,
+				(m_floats[1] * s0 + q.getY() * s1) * d,
+				(m_floats[2] * s0 + q.getZ() * s1) * d,
+				(m_floats[3] * s0 + q.m_floats[3] * s1) * d);
+		}
+		else
+		{
+			return *this;
+		}
+	}
+
+	static const b3Quaternion& getIdentity()
+	{
+		static const b3Quaternion identityQuat(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.), b3Scalar(1.));
+		return identityQuat;
+	}
+
+	B3_FORCE_INLINE const b3Scalar& getW() const { return m_floats[3]; }
+};
+
+/**@brief Return the product of two quaternions */
+B3_FORCE_INLINE b3Quaternion
+operator*(const b3Quaternion& q1, const b3Quaternion& q2)
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	__m128 vQ1 = q1.get128();
+	__m128 vQ2 = q2.get128();
+	__m128 A0, A1, B1, A2, B2;
+
+	A1 = b3_pshufd_ps(vQ1, B3_SHUFFLE(0, 1, 2, 0));  // X Y  z x     //      vtrn
+	B1 = b3_pshufd_ps(vQ2, B3_SHUFFLE(3, 3, 3, 0));  // W W  W X     // vdup vext
+
+	A1 = A1 * B1;
+
+	A2 = b3_pshufd_ps(vQ1, B3_SHUFFLE(1, 2, 0, 1));  // Y Z  X Y     // vext
+	B2 = b3_pshufd_ps(vQ2, B3_SHUFFLE(2, 0, 1, 1));  // z x  Y Y     // vtrn vdup
+
+	A2 = A2 * B2;
+
+	B1 = b3_pshufd_ps(vQ1, B3_SHUFFLE(2, 0, 1, 2));  // z x Y Z      // vtrn vext
+	B2 = b3_pshufd_ps(vQ2, B3_SHUFFLE(1, 2, 0, 2));  // Y Z x z      // vext vtrn
+
+	B1 = B1 * B2;  //	A3 *= B3
+
+	A0 = b3_splat_ps(vQ1, 3);  //	A0
+	A0 = A0 * vQ2;             //	A0 * B0
+
+	A1 = A1 + A2;  //	AB12
+	A0 = A0 - B1;  //	AB03 = AB0 - AB3
+
+	A1 = _mm_xor_ps(A1, b3vPPPM);  //	change sign of the last element
+	A0 = A0 + A1;                  //	AB03 + AB12
+
+	return b3Quaternion(A0);
+
+#elif defined(B3_USE_NEON)
+
+	float32x4_t vQ1 = q1.get128();
+	float32x4_t vQ2 = q2.get128();
+	float32x4_t A0, A1, B1, A2, B2, A3, B3;
+	float32x2_t vQ1zx, vQ2wx, vQ1yz, vQ2zx, vQ2yz, vQ2xz;
+
+	{
+		float32x2x2_t tmp;
+		tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+		vQ1zx = tmp.val[0];
+
+		tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+		vQ2zx = tmp.val[0];
+	}
+	vQ2wx = vext_f32(vget_high_f32(vQ2), vget_low_f32(vQ2), 1);
+
+	vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+	vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+	vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+	A1 = vcombine_f32(vget_low_f32(vQ1), vQ1zx);                     // X Y  z x
+	B1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ2), 1), vQ2wx);  // W W  W X
+
+	A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+	B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+	A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+	B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+	A1 = vmulq_f32(A1, B1);
+	A2 = vmulq_f32(A2, B2);
+	A3 = vmulq_f32(A3, B3);                           //	A3 *= B3
+	A0 = vmulq_lane_f32(vQ2, vget_high_f32(vQ1), 1);  //	A0 * B0
+
+	A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+	A0 = vsubq_f32(A0, A3);  //	AB03 = AB0 - AB3
+
+	//	change the sign of the last element
+	A1 = (b3SimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)b3vPPPM);
+	A0 = vaddq_f32(A0, A1);  //	AB03 + AB12
+
+	return b3Quaternion(A0);
+
+#else
+	return b3Quaternion(
+		q1.getW() * q2.getX() + q1.getX() * q2.getW() + q1.getY() * q2.getZ() - q1.getZ() * q2.getY(),
+		q1.getW() * q2.getY() + q1.getY() * q2.getW() + q1.getZ() * q2.getX() - q1.getX() * q2.getZ(),
+		q1.getW() * q2.getZ() + q1.getZ() * q2.getW() + q1.getX() * q2.getY() - q1.getY() * q2.getX(),
+		q1.getW() * q2.getW() - q1.getX() * q2.getX() - q1.getY() * q2.getY() - q1.getZ() * q2.getZ());
+#endif
+}
+
+B3_FORCE_INLINE b3Quaternion
+operator*(const b3Quaternion& q, const b3Vector3& w)
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	__m128 vQ1 = q.get128();
+	__m128 vQ2 = w.get128();
+	__m128 A1, B1, A2, B2, A3, B3;
+
+	A1 = b3_pshufd_ps(vQ1, B3_SHUFFLE(3, 3, 3, 0));
+	B1 = b3_pshufd_ps(vQ2, B3_SHUFFLE(0, 1, 2, 0));
+
+	A1 = A1 * B1;
+
+	A2 = b3_pshufd_ps(vQ1, B3_SHUFFLE(1, 2, 0, 1));
+	B2 = b3_pshufd_ps(vQ2, B3_SHUFFLE(2, 0, 1, 1));
+
+	A2 = A2 * B2;
+
+	A3 = b3_pshufd_ps(vQ1, B3_SHUFFLE(2, 0, 1, 2));
+	B3 = b3_pshufd_ps(vQ2, B3_SHUFFLE(1, 2, 0, 2));
+
+	A3 = A3 * B3;  //	A3 *= B3
+
+	A1 = A1 + A2;                  //	AB12
+	A1 = _mm_xor_ps(A1, b3vPPPM);  //	change sign of the last element
+	A1 = A1 - A3;                  //	AB123 = AB12 - AB3
+
+	return b3Quaternion(A1);
+
+#elif defined(B3_USE_NEON)
+
+	float32x4_t vQ1 = q.get128();
+	float32x4_t vQ2 = w.get128();
+	float32x4_t A1, B1, A2, B2, A3, B3;
+	float32x2_t vQ1wx, vQ2zx, vQ1yz, vQ2yz, vQ1zx, vQ2xz;
+
+	vQ1wx = vext_f32(vget_high_f32(vQ1), vget_low_f32(vQ1), 1);
+	{
+		float32x2x2_t tmp;
+
+		tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+		vQ2zx = tmp.val[0];
+
+		tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+		vQ1zx = tmp.val[0];
+	}
+
+	vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+	vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+	vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+	A1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ1), 1), vQ1wx);  // W W  W X
+	B1 = vcombine_f32(vget_low_f32(vQ2), vQ2zx);                     // X Y  z x
+
+	A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+	B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+	A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+	B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+	A1 = vmulq_f32(A1, B1);
+	A2 = vmulq_f32(A2, B2);
+	A3 = vmulq_f32(A3, B3);  //	A3 *= B3
+
+	A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+
+	//	change the sign of the last element
+	A1 = (b3SimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)b3vPPPM);
+
+	A1 = vsubq_f32(A1, A3);  //	AB123 = AB12 - AB3
+
+	return b3Quaternion(A1);
+
+#else
+	return b3Quaternion(
+		q.getW() * w.getX() + q.getY() * w.getZ() - q.getZ() * w.getY(),
+		q.getW() * w.getY() + q.getZ() * w.getX() - q.getX() * w.getZ(),
+		q.getW() * w.getZ() + q.getX() * w.getY() - q.getY() * w.getX(),
+		-q.getX() * w.getX() - q.getY() * w.getY() - q.getZ() * w.getZ());
+#endif
+}
+
+B3_FORCE_INLINE b3Quaternion
+operator*(const b3Vector3& w, const b3Quaternion& q)
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	__m128 vQ1 = w.get128();
+	__m128 vQ2 = q.get128();
+	__m128 A1, B1, A2, B2, A3, B3;
+
+	A1 = b3_pshufd_ps(vQ1, B3_SHUFFLE(0, 1, 2, 0));  // X Y  z x
+	B1 = b3_pshufd_ps(vQ2, B3_SHUFFLE(3, 3, 3, 0));  // W W  W X
+
+	A1 = A1 * B1;
+
+	A2 = b3_pshufd_ps(vQ1, B3_SHUFFLE(1, 2, 0, 1));
+	B2 = b3_pshufd_ps(vQ2, B3_SHUFFLE(2, 0, 1, 1));
+
+	A2 = A2 * B2;
+
+	A3 = b3_pshufd_ps(vQ1, B3_SHUFFLE(2, 0, 1, 2));
+	B3 = b3_pshufd_ps(vQ2, B3_SHUFFLE(1, 2, 0, 2));
+
+	A3 = A3 * B3;  //	A3 *= B3
+
+	A1 = A1 + A2;                  //	AB12
+	A1 = _mm_xor_ps(A1, b3vPPPM);  //	change sign of the last element
+	A1 = A1 - A3;                  //	AB123 = AB12 - AB3
+
+	return b3Quaternion(A1);
+
+#elif defined(B3_USE_NEON)
+
+	float32x4_t vQ1 = w.get128();
+	float32x4_t vQ2 = q.get128();
+	float32x4_t A1, B1, A2, B2, A3, B3;
+	float32x2_t vQ1zx, vQ2wx, vQ1yz, vQ2zx, vQ2yz, vQ2xz;
+
+	{
+		float32x2x2_t tmp;
+
+		tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+		vQ1zx = tmp.val[0];
+
+		tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+		vQ2zx = tmp.val[0];
+	}
+	vQ2wx = vext_f32(vget_high_f32(vQ2), vget_low_f32(vQ2), 1);
+
+	vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+	vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+	vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+	A1 = vcombine_f32(vget_low_f32(vQ1), vQ1zx);                     // X Y  z x
+	B1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ2), 1), vQ2wx);  // W W  W X
+
+	A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+	B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+	A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+	B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+	A1 = vmulq_f32(A1, B1);
+	A2 = vmulq_f32(A2, B2);
+	A3 = vmulq_f32(A3, B3);  //	A3 *= B3
+
+	A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+
+	//	change the sign of the last element
+	A1 = (b3SimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)b3vPPPM);
+
+	A1 = vsubq_f32(A1, A3);  //	AB123 = AB12 - AB3
+
+	return b3Quaternion(A1);
+
+#else
+	return b3Quaternion(
+		+w.getX() * q.getW() + w.getY() * q.getZ() - w.getZ() * q.getY(),
+		+w.getY() * q.getW() + w.getZ() * q.getX() - w.getX() * q.getZ(),
+		+w.getZ() * q.getW() + w.getX() * q.getY() - w.getY() * q.getX(),
+		-w.getX() * q.getX() - w.getY() * q.getY() - w.getZ() * q.getZ());
+#endif
+}
+
+/**@brief Calculate the dot product between two quaternions */
+B3_FORCE_INLINE b3Scalar
+b3Dot(const b3Quaternion& q1, const b3Quaternion& q2)
+{
+	return q1.dot(q2);
+}
+
+/**@brief Return the length of a quaternion */
+B3_FORCE_INLINE b3Scalar
+b3Length(const b3Quaternion& q)
+{
+	return q.length();
+}
+
+/**@brief Return the angle between two quaternions*/
+B3_FORCE_INLINE b3Scalar
+b3Angle(const b3Quaternion& q1, const b3Quaternion& q2)
+{
+	return q1.angle(q2);
+}
+
+/**@brief Return the inverse of a quaternion*/
+B3_FORCE_INLINE b3Quaternion
+b3Inverse(const b3Quaternion& q)
+{
+	return q.inverse();
+}
+
+/**@brief Return the result of spherical linear interpolation betwen two quaternions 
+ * @param q1 The first quaternion
+ * @param q2 The second quaternion 
+ * @param t The ration between q1 and q2.  t = 0 return q1, t=1 returns q2 
+ * Slerp assumes constant velocity between positions. */
+B3_FORCE_INLINE b3Quaternion
+b3Slerp(const b3Quaternion& q1, const b3Quaternion& q2, const b3Scalar& t)
+{
+	return q1.slerp(q2, t);
+}
+
+B3_FORCE_INLINE b3Quaternion
+b3QuatMul(const b3Quaternion& rot0, const b3Quaternion& rot1)
+{
+	return rot0 * rot1;
+}
+
+B3_FORCE_INLINE b3Quaternion
+b3QuatNormalized(const b3Quaternion& orn)
+{
+	return orn.normalized();
+}
+
+B3_FORCE_INLINE b3Vector3
+b3QuatRotate(const b3Quaternion& rotation, const b3Vector3& v)
+{
+	b3Quaternion q = rotation * v;
+	q *= rotation.inverse();
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	return b3MakeVector3(_mm_and_ps(q.get128(), b3vFFF0fMask));
+#elif defined(B3_USE_NEON)
+	return b3MakeVector3((float32x4_t)vandq_s32((int32x4_t)q.get128(), b3vFFF0Mask));
+#else
+	return b3MakeVector3(q.getX(), q.getY(), q.getZ());
+#endif
+}
+
+B3_FORCE_INLINE b3Quaternion
+b3ShortestArcQuat(const b3Vector3& v0, const b3Vector3& v1)  // Game Programming Gems 2.10. make sure v0,v1 are normalized
+{
+	b3Vector3 c = v0.cross(v1);
+	b3Scalar d = v0.dot(v1);
+
+	if (d < -1.0 + B3_EPSILON)
+	{
+		b3Vector3 n, unused;
+		b3PlaneSpace1(v0, n, unused);
+		return b3Quaternion(n.getX(), n.getY(), n.getZ(), 0.0f);  // just pick any vector that is orthogonal to v0
+	}
+
+	b3Scalar s = b3Sqrt((1.0f + d) * 2.0f);
+	b3Scalar rs = 1.0f / s;
+
+	return b3Quaternion(c.getX() * rs, c.getY() * rs, c.getZ() * rs, s * 0.5f);
+}
+
+B3_FORCE_INLINE b3Quaternion
+b3ShortestArcQuatNormalize2(b3Vector3& v0, b3Vector3& v1)
+{
+	v0.normalize();
+	v1.normalize();
+	return b3ShortestArcQuat(v0, v1);
+}
+
+#endif  //B3_SIMD__QUATERNION_H_
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Random.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Random.h
new file mode 100644
index 0000000..c2e2149
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Random.h
@@ -0,0 +1,46 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_GEN_RANDOM_H
+#define B3_GEN_RANDOM_H
+
+#include "b3Scalar.h"
+
+#ifdef MT19937
+
+#include <limits.h>
+#include <mt19937.h>
+
+#define B3_RAND_MAX UINT_MAX
+
+B3_FORCE_INLINE void b3Srand(unsigned int seed) { init_genrand(seed); }
+B3_FORCE_INLINE unsigned int b3rand() { return genrand_int32(); }
+
+#else
+
+#include <stdlib.h>
+
+#define B3_RAND_MAX RAND_MAX
+
+B3_FORCE_INLINE void b3Srand(unsigned int seed) { srand(seed); }
+B3_FORCE_INLINE unsigned int b3rand() { return rand(); }
+
+#endif
+
+inline b3Scalar b3RandRange(b3Scalar minRange, b3Scalar maxRange)
+{
+	return (b3rand() / (b3Scalar(B3_RAND_MAX) + b3Scalar(1.0))) * (maxRange - minRange) + minRange;
+}
+
+#endif  //B3_GEN_RANDOM_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3ResizablePool.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3ResizablePool.h
new file mode 100644
index 0000000..cafe3ff
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3ResizablePool.h
@@ -0,0 +1,171 @@
+
+#ifndef B3_RESIZABLE_POOL_H
+#define B3_RESIZABLE_POOL_H
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+enum
+{
+	B3_POOL_HANDLE_TERMINAL_FREE = -1,
+	B3_POOL_HANDLE_TERMINAL_USED = -2
+};
+
+template <typename U>
+struct b3PoolBodyHandle : public U
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_nextFreeHandle;
+	void setNextFree(int next)
+	{
+		m_nextFreeHandle = next;
+	}
+	int getNextFree() const
+	{
+		return m_nextFreeHandle;
+	}
+};
+
+template <typename T>
+class b3ResizablePool
+{
+protected:
+	b3AlignedObjectArray<T> m_bodyHandles;
+	int m_numUsedHandles;   // number of active handles
+	int m_firstFreeHandle;  // free handles list
+
+	T* getHandleInternal(int handle)
+	{
+		return &m_bodyHandles[handle];
+	}
+	const T* getHandleInternal(int handle) const
+	{
+		return &m_bodyHandles[handle];
+	}
+
+public:
+	b3ResizablePool()
+	{
+		initHandles();
+	}
+
+	virtual ~b3ResizablePool()
+	{
+		exitHandles();
+	}
+	///handle management
+
+	int getNumHandles() const
+	{
+		return m_bodyHandles.size();
+	}
+
+	void getUsedHandles(b3AlignedObjectArray<int>& usedHandles) const
+	{
+		for (int i = 0; i < m_bodyHandles.size(); i++)
+		{
+			if (m_bodyHandles[i].getNextFree() == B3_POOL_HANDLE_TERMINAL_USED)
+			{
+				usedHandles.push_back(i);
+			}
+		}
+	}
+
+	T* getHandle(int handle)
+	{
+		b3Assert(handle >= 0);
+		b3Assert(handle < m_bodyHandles.size());
+		if ((handle < 0) || (handle >= m_bodyHandles.size()))
+		{
+			return 0;
+		}
+
+		if (m_bodyHandles[handle].getNextFree() == B3_POOL_HANDLE_TERMINAL_USED)
+		{
+			return &m_bodyHandles[handle];
+		}
+		return 0;
+	}
+	const T* getHandle(int handle) const
+	{
+		b3Assert(handle >= 0);
+		b3Assert(handle < m_bodyHandles.size());
+		if ((handle < 0) || (handle >= m_bodyHandles.size()))
+		{
+			return 0;
+		}
+
+		if (m_bodyHandles[handle].getNextFree() == B3_POOL_HANDLE_TERMINAL_USED)
+		{
+			return &m_bodyHandles[handle];
+		}
+		return 0;
+	}
+
+	void increaseHandleCapacity(int extraCapacity)
+	{
+		int curCapacity = m_bodyHandles.size();
+		//b3Assert(curCapacity == m_numUsedHandles);
+		int newCapacity = curCapacity + extraCapacity;
+		m_bodyHandles.resize(newCapacity);
+
+		{
+			for (int i = curCapacity; i < newCapacity; i++)
+				m_bodyHandles[i].setNextFree(i + 1);
+
+			m_bodyHandles[newCapacity - 1].setNextFree(-1);
+		}
+		m_firstFreeHandle = curCapacity;
+	}
+	void initHandles()
+	{
+		m_numUsedHandles = 0;
+		m_firstFreeHandle = -1;
+
+		increaseHandleCapacity(1);
+	}
+
+	void exitHandles()
+	{
+		m_bodyHandles.resize(0);
+		m_firstFreeHandle = -1;
+		m_numUsedHandles = 0;
+	}
+
+	int allocHandle()
+	{
+		b3Assert(m_firstFreeHandle >= 0);
+
+		int handle = m_firstFreeHandle;
+		m_firstFreeHandle = getHandleInternal(handle)->getNextFree();
+		m_numUsedHandles++;
+
+		if (m_firstFreeHandle < 0)
+		{
+			//int curCapacity = m_bodyHandles.size();
+			int additionalCapacity = m_bodyHandles.size();
+			increaseHandleCapacity(additionalCapacity);
+
+			getHandleInternal(handle)->setNextFree(m_firstFreeHandle);
+		}
+		getHandleInternal(handle)->setNextFree(B3_POOL_HANDLE_TERMINAL_USED);
+		getHandleInternal(handle)->clear();
+		return handle;
+	}
+
+	void freeHandle(int handle)
+	{
+		b3Assert(handle >= 0);
+
+		if (m_bodyHandles[handle].getNextFree() == B3_POOL_HANDLE_TERMINAL_USED)
+		{
+			getHandleInternal(handle)->clear();
+			getHandleInternal(handle)->setNextFree(m_firstFreeHandle);
+			m_firstFreeHandle = handle;
+			m_numUsedHandles--;
+		}
+	}
+};
+///end handle management
+
+#endif  //B3_RESIZABLE_POOL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Scalar.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Scalar.h
new file mode 100644
index 0000000..eeb70ed
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Scalar.h
@@ -0,0 +1,689 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_SCALAR_H
+#define B3_SCALAR_H
+
+#ifdef B3_MANAGED_CODE
+//Aligned data types not supported in managed code
+#pragma unmanaged
+#endif
+
+#include <math.h>
+#include <stdlib.h>  //size_t for MSVC 6.0
+#include <float.h>
+
+//Original repository is at http://github.com/erwincoumans/bullet3
+#define B3_BULLET_VERSION 300
+
+inline int b3GetVersion()
+{
+	return B3_BULLET_VERSION;
+}
+
+#if defined(DEBUG) || defined(_DEBUG)
+#define B3_DEBUG
+#endif
+
+#include "b3Logging.h"  //for b3Error
+
+#ifdef _WIN32
+
+#if  defined(__GNUC__)	// it should handle both MINGW and CYGWIN
+#define B3_FORCE_INLINE             __inline__ __attribute__((always_inline))
+#define B3_ATTRIBUTE_ALIGNED16(a)   a __attribute__((aligned(16)))
+#define B3_ATTRIBUTE_ALIGNED64(a)   a __attribute__((aligned(64)))
+#define B3_ATTRIBUTE_ALIGNED128(a)  a __attribute__((aligned(128)))
+#elif ( defined(_MSC_VER) && _MSC_VER < 1300 )
+#define B3_FORCE_INLINE inline
+#define B3_ATTRIBUTE_ALIGNED16(a) a
+#define B3_ATTRIBUTE_ALIGNED64(a) a
+#define B3_ATTRIBUTE_ALIGNED128(a) a
+#else
+//#define B3_HAS_ALIGNED_ALLOCATOR
+#pragma warning(disable : 4324)  // disable padding warning
+//			#pragma warning(disable:4530) // Disable the exception disable but used in MSCV Stl warning.
+#pragma warning(disable : 4996)  //Turn off warnings about deprecated C routines
+//			#pragma warning(disable:4786) // Disable the "debug name too long" warning
+
+#define B3_FORCE_INLINE __forceinline
+#define B3_ATTRIBUTE_ALIGNED16(a) __declspec(align(16)) a
+#define B3_ATTRIBUTE_ALIGNED64(a) __declspec(align(64)) a
+#define B3_ATTRIBUTE_ALIGNED128(a) __declspec(align(128)) a
+#ifdef _XBOX
+#define B3_USE_VMX128
+
+#include <ppcintrinsics.h>
+#define B3_HAVE_NATIVE_FSEL
+#define b3Fsel(a, b, c) __fsel((a), (b), (c))
+#else
+
+#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(B3_USE_DOUBLE_PRECISION))
+#if (defined(_M_IX86) || defined(_M_X64))
+
+
+#ifdef __clang__
+//#define B3_NO_SIMD_OPERATOR_OVERLOADS
+#define B3_DISABLE_SSE
+#endif //__clang__
+
+#ifndef B3_DISABLE_SSE
+#define B3_USE_SSE
+#endif //B3_DISABLE_SSE
+
+#ifdef B3_USE_SSE
+//B3_USE_SSE_IN_API is disabled under Windows by default, because
+//it makes it harder to integrate Bullet into your application under Windows
+//(structured embedding Bullet structs/classes need to be 16-byte aligned)
+//with relatively little performance gain
+//If you are not embedded Bullet data in your classes, or make sure that you align those classes on 16-byte boundaries
+//you can manually enable this line or set it in the build system for a bit of performance gain (a few percent, dependent on usage)
+//#define B3_USE_SSE_IN_API
+#endif  //B3_USE_SSE
+#include <emmintrin.h>
+#endif
+#endif
+
+#endif  //_XBOX
+
+#endif  //__MINGW32__
+
+#ifdef B3_DEBUG
+#ifdef _MSC_VER
+#include <stdio.h>
+#define b3Assert(x) { if(!(x)){b3Error("Assert " __FILE__ ":%u (%s)\n", __LINE__, #x);__debugbreak();	}}
+#else  //_MSC_VER
+#include <assert.h>
+#define b3Assert assert
+#endif  //_MSC_VER
+#else
+#define b3Assert(x)
+#endif
+//b3FullAssert is optional, slows down a lot
+#define b3FullAssert(x)
+
+#define b3Likely(_c) _c
+#define b3Unlikely(_c) _c
+
+#else
+
+#if defined(__CELLOS_LV2__)
+#define B3_FORCE_INLINE inline __attribute__((always_inline))
+#define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__((aligned(16)))
+#define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__((aligned(64)))
+#define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__((aligned(128)))
+#ifndef assert
+#include <assert.h>
+#endif
+#ifdef B3_DEBUG
+#ifdef __SPU__
+#include <spu_printf.h>
+#define printf spu_printf
+#define b3Assert(x)               \
+	{                             \
+		if (!(x))                 \
+		{                         \
+			b3Error(              \
+				"Assert "__FILE__ \
+				":%u (" #x ")\n", \
+				__LINE__);        \
+			spu_hcmpeq(0, 0);     \
+		}                         \
+	}
+#else
+#define b3Assert assert
+#endif
+
+#else
+#define b3Assert(x)
+#endif
+//b3FullAssert is optional, slows down a lot
+#define b3FullAssert(x)
+
+#define b3Likely(_c) _c
+#define b3Unlikely(_c) _c
+
+#else
+
+#ifdef USE_LIBSPE2
+
+#define B3_FORCE_INLINE __inline
+#define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__((aligned(16)))
+#define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__((aligned(64)))
+#define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__((aligned(128)))
+#ifndef assert
+#include <assert.h>
+#endif
+#ifdef B3_DEBUG
+#define b3Assert assert
+#else
+#define b3Assert(x)
+#endif
+//b3FullAssert is optional, slows down a lot
+#define b3FullAssert(x)
+
+#define b3Likely(_c) __builtin_expect((_c), 1)
+#define b3Unlikely(_c) __builtin_expect((_c), 0)
+
+#else
+//non-windows systems
+
+#if (defined(__APPLE__) && (!defined(B3_USE_DOUBLE_PRECISION)))
+#if defined(__i386__) || defined(__x86_64__)
+#define B3_USE_SSE
+//B3_USE_SSE_IN_API is enabled on Mac OSX by default, because memory is automatically aligned on 16-byte boundaries
+//if apps run into issues, we will disable the next line
+#define B3_USE_SSE_IN_API
+#ifdef B3_USE_SSE
+// include appropriate SSE level
+#if defined(__SSE4_1__)
+#include <smmintrin.h>
+#elif defined(__SSSE3__)
+#include <tmmintrin.h>
+#elif defined(__SSE3__)
+#include <pmmintrin.h>
+#else
+#include <emmintrin.h>
+#endif
+#endif  //B3_USE_SSE
+#elif defined(__armv7__)
+#ifdef __clang__
+#define B3_USE_NEON 1
+
+#if defined B3_USE_NEON && defined(__clang__)
+#include <arm_neon.h>
+#endif  //B3_USE_NEON
+#endif  //__clang__
+#endif  //__arm__
+
+#define B3_FORCE_INLINE inline __attribute__((always_inline))
+///@todo: check out alignment methods for other platforms/compilers
+#define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__((aligned(16)))
+#define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__((aligned(64)))
+#define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__((aligned(128)))
+#ifndef assert
+#include <assert.h>
+#endif
+
+#if defined(DEBUG) || defined(_DEBUG)
+#if defined(__i386__) || defined(__x86_64__)
+#include <stdio.h>
+#define b3Assert(x)                                                             \
+	{                                                                           \
+		if (!(x))                                                               \
+		{                                                                       \
+			b3Error("Assert %s in line %d, file %s\n", #x, __LINE__, __FILE__); \
+			asm volatile("int3");                                               \
+		}                                                                       \
+	}
+#else  //defined (__i386__) || defined (__x86_64__)
+#define b3Assert assert
+#endif  //defined (__i386__) || defined (__x86_64__)
+#else   //defined(DEBUG) || defined (_DEBUG)
+#define b3Assert(x)
+#endif  //defined(DEBUG) || defined (_DEBUG)
+
+//b3FullAssert is optional, slows down a lot
+#define b3FullAssert(x)
+#define b3Likely(_c) _c
+#define b3Unlikely(_c) _c
+
+#else
+
+#define B3_FORCE_INLINE inline
+///@todo: check out alignment methods for other platforms/compilers
+#define B3_ATTRIBUTE_ALIGNED16(a) a __attribute__((aligned(16)))
+#define B3_ATTRIBUTE_ALIGNED64(a) a __attribute__((aligned(64)))
+#define B3_ATTRIBUTE_ALIGNED128(a) a __attribute__((aligned(128)))
+///#define B3_ATTRIBUTE_ALIGNED16(a) a
+///#define B3_ATTRIBUTE_ALIGNED64(a) a
+///#define B3_ATTRIBUTE_ALIGNED128(a) a
+#ifndef assert
+#include <assert.h>
+#endif
+
+#if defined(DEBUG) || defined(_DEBUG)
+#define b3Assert assert
+#else
+#define b3Assert(x)
+#endif
+
+//b3FullAssert is optional, slows down a lot
+#define b3FullAssert(x)
+#define b3Likely(_c) _c
+#define b3Unlikely(_c) _c
+#endif  //__APPLE__
+
+#endif  // LIBSPE2
+
+#endif  //__CELLOS_LV2__
+#endif
+
+///The b3Scalar type abstracts floating point numbers, to easily switch between double and single floating point precision.
+#if defined(B3_USE_DOUBLE_PRECISION)
+typedef double b3Scalar;
+//this number could be bigger in double precision
+#define B3_LARGE_FLOAT 1e30
+#else
+typedef float b3Scalar;
+//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX
+#define B3_LARGE_FLOAT 1e18f
+#endif
+
+#ifdef B3_USE_SSE
+typedef __m128 b3SimdFloat4;
+#endif  //B3_USE_SSE
+
+#if defined B3_USE_SSE_IN_API && defined(B3_USE_SSE)
+#ifdef _WIN32
+
+#ifndef B3_NAN
+static int b3NanMask = 0x7F800001;
+#define B3_NAN (*(float *)&b3NanMask)
+#endif
+
+#ifndef B3_INFINITY_MASK
+static int b3InfinityMask = 0x7F800000;
+#define B3_INFINITY_MASK (*(float *)&b3InfinityMask)
+#endif
+#ifndef B3_NO_SIMD_OPERATOR_OVERLOADS
+inline __m128 operator+(const __m128 A, const __m128 B)
+{
+	return _mm_add_ps(A, B);
+}
+
+inline __m128 operator-(const __m128 A, const __m128 B)
+{
+	return _mm_sub_ps(A, B);
+}
+
+inline __m128 operator*(const __m128 A, const __m128 B)
+{
+	return _mm_mul_ps(A, B);
+}
+#endif //B3_NO_SIMD_OPERATOR_OVERLOADS
+#define b3CastfTo128i(a) (_mm_castps_si128(a))
+#define b3CastfTo128d(a) (_mm_castps_pd(a))
+#define b3CastiTo128f(a) (_mm_castsi128_ps(a))
+#define b3CastdTo128f(a) (_mm_castpd_ps(a))
+#define b3CastdTo128i(a) (_mm_castpd_si128(a))
+#define b3Assign128(r0, r1, r2, r3) _mm_setr_ps(r0, r1, r2, r3)
+
+#else  //_WIN32
+
+#define b3CastfTo128i(a) ((__m128i)(a))
+#define b3CastfTo128d(a) ((__m128d)(a))
+#define b3CastiTo128f(a) ((__m128)(a))
+#define b3CastdTo128f(a) ((__m128)(a))
+#define b3CastdTo128i(a) ((__m128i)(a))
+#define b3Assign128(r0, r1, r2, r3) \
+	(__m128) { r0, r1, r2, r3 }
+#endif  //_WIN32
+#endif  //B3_USE_SSE_IN_API
+
+#ifdef B3_USE_NEON
+#include <arm_neon.h>
+
+typedef float32x4_t b3SimdFloat4;
+#define B3_INFINITY INFINITY
+#define B3_NAN NAN
+#define b3Assign128(r0, r1, r2, r3) \
+	(float32x4_t) { r0, r1, r2, r3 }
+#endif
+
+#define B3_DECLARE_ALIGNED_ALLOCATOR()                                                                   \
+	B3_FORCE_INLINE void *operator new(size_t sizeInBytes) { return b3AlignedAlloc(sizeInBytes, 16); }   \
+	B3_FORCE_INLINE void operator delete(void *ptr) { b3AlignedFree(ptr); }                              \
+	B3_FORCE_INLINE void *operator new(size_t, void *ptr) { return ptr; }                                \
+	B3_FORCE_INLINE void operator delete(void *, void *) {}                                              \
+	B3_FORCE_INLINE void *operator new[](size_t sizeInBytes) { return b3AlignedAlloc(sizeInBytes, 16); } \
+	B3_FORCE_INLINE void operator delete[](void *ptr) { b3AlignedFree(ptr); }                            \
+	B3_FORCE_INLINE void *operator new[](size_t, void *ptr) { return ptr; }                              \
+	B3_FORCE_INLINE void operator delete[](void *, void *) {}
+
+#if defined(B3_USE_DOUBLE_PRECISION) || defined(B3_FORCE_DOUBLE_FUNCTIONS)
+
+B3_FORCE_INLINE b3Scalar b3Sqrt(b3Scalar x)
+{
+	return sqrt(x);
+}
+B3_FORCE_INLINE b3Scalar b3Fabs(b3Scalar x) { return fabs(x); }
+B3_FORCE_INLINE b3Scalar b3Cos(b3Scalar x) { return cos(x); }
+B3_FORCE_INLINE b3Scalar b3Sin(b3Scalar x) { return sin(x); }
+B3_FORCE_INLINE b3Scalar b3Tan(b3Scalar x) { return tan(x); }
+B3_FORCE_INLINE b3Scalar b3Acos(b3Scalar x)
+{
+	if (x < b3Scalar(-1)) x = b3Scalar(-1);
+	if (x > b3Scalar(1)) x = b3Scalar(1);
+	return acos(x);
+}
+B3_FORCE_INLINE b3Scalar b3Asin(b3Scalar x)
+{
+	if (x < b3Scalar(-1)) x = b3Scalar(-1);
+	if (x > b3Scalar(1)) x = b3Scalar(1);
+	return asin(x);
+}
+B3_FORCE_INLINE b3Scalar b3Atan(b3Scalar x) { return atan(x); }
+B3_FORCE_INLINE b3Scalar b3Atan2(b3Scalar x, b3Scalar y) { return atan2(x, y); }
+B3_FORCE_INLINE b3Scalar b3Exp(b3Scalar x) { return exp(x); }
+B3_FORCE_INLINE b3Scalar b3Log(b3Scalar x) { return log(x); }
+B3_FORCE_INLINE b3Scalar b3Pow(b3Scalar x, b3Scalar y) { return pow(x, y); }
+B3_FORCE_INLINE b3Scalar b3Fmod(b3Scalar x, b3Scalar y) { return fmod(x, y); }
+
+#else
+
+B3_FORCE_INLINE b3Scalar b3Sqrt(b3Scalar y)
+{
+#ifdef USE_APPROXIMATION
+	double x, z, tempf;
+	unsigned long *tfptr = ((unsigned long *)&tempf) + 1;
+
+	tempf = y;
+	*tfptr = (0xbfcdd90a - *tfptr) >> 1; /* estimate of 1/sqrt(y) */
+	x = tempf;
+	z = y * b3Scalar(0.5);
+	x = (b3Scalar(1.5) * x) - (x * x) * (x * z); /* iteration formula     */
+	x = (b3Scalar(1.5) * x) - (x * x) * (x * z);
+	x = (b3Scalar(1.5) * x) - (x * x) * (x * z);
+	x = (b3Scalar(1.5) * x) - (x * x) * (x * z);
+	x = (b3Scalar(1.5) * x) - (x * x) * (x * z);
+	return x * y;
+#else
+	return sqrtf(y);
+#endif
+}
+B3_FORCE_INLINE b3Scalar b3Fabs(b3Scalar x) { return fabsf(x); }
+B3_FORCE_INLINE b3Scalar b3Cos(b3Scalar x) { return cosf(x); }
+B3_FORCE_INLINE b3Scalar b3Sin(b3Scalar x) { return sinf(x); }
+B3_FORCE_INLINE b3Scalar b3Tan(b3Scalar x) { return tanf(x); }
+B3_FORCE_INLINE b3Scalar b3Acos(b3Scalar x)
+{
+	if (x < b3Scalar(-1))
+		x = b3Scalar(-1);
+	if (x > b3Scalar(1))
+		x = b3Scalar(1);
+	return acosf(x);
+}
+B3_FORCE_INLINE b3Scalar b3Asin(b3Scalar x)
+{
+	if (x < b3Scalar(-1))
+		x = b3Scalar(-1);
+	if (x > b3Scalar(1))
+		x = b3Scalar(1);
+	return asinf(x);
+}
+B3_FORCE_INLINE b3Scalar b3Atan(b3Scalar x) { return atanf(x); }
+B3_FORCE_INLINE b3Scalar b3Atan2(b3Scalar x, b3Scalar y) { return atan2f(x, y); }
+B3_FORCE_INLINE b3Scalar b3Exp(b3Scalar x) { return expf(x); }
+B3_FORCE_INLINE b3Scalar b3Log(b3Scalar x) { return logf(x); }
+B3_FORCE_INLINE b3Scalar b3Pow(b3Scalar x, b3Scalar y) { return powf(x, y); }
+B3_FORCE_INLINE b3Scalar b3Fmod(b3Scalar x, b3Scalar y) { return fmodf(x, y); }
+
+#endif
+
+#define B3_2_PI b3Scalar(6.283185307179586232)
+#define B3_PI (B3_2_PI * b3Scalar(0.5))
+#define B3_HALF_PI (B3_2_PI * b3Scalar(0.25))
+#define B3_RADS_PER_DEG (B3_2_PI / b3Scalar(360.0))
+#define B3_DEGS_PER_RAD (b3Scalar(360.0) / B3_2_PI)
+#define B3_SQRT12 b3Scalar(0.7071067811865475244008443621048490)
+
+#define b3RecipSqrt(x) ((b3Scalar)(b3Scalar(1.0) / b3Sqrt(b3Scalar(x)))) /* reciprocal square root */
+
+#ifdef B3_USE_DOUBLE_PRECISION
+#define B3_EPSILON DBL_EPSILON
+#define B3_INFINITY DBL_MAX
+#else
+#define B3_EPSILON FLT_EPSILON
+#define B3_INFINITY FLT_MAX
+#endif
+
+B3_FORCE_INLINE b3Scalar b3Atan2Fast(b3Scalar y, b3Scalar x)
+{
+	b3Scalar coeff_1 = B3_PI / 4.0f;
+	b3Scalar coeff_2 = 3.0f * coeff_1;
+	b3Scalar abs_y = b3Fabs(y);
+	b3Scalar angle;
+	if (x >= 0.0f)
+	{
+		b3Scalar r = (x - abs_y) / (x + abs_y);
+		angle = coeff_1 - coeff_1 * r;
+	}
+	else
+	{
+		b3Scalar r = (x + abs_y) / (abs_y - x);
+		angle = coeff_2 - coeff_1 * r;
+	}
+	return (y < 0.0f) ? -angle : angle;
+}
+
+B3_FORCE_INLINE bool b3FuzzyZero(b3Scalar x) { return b3Fabs(x) < B3_EPSILON; }
+
+B3_FORCE_INLINE bool b3Equal(b3Scalar a, b3Scalar eps)
+{
+	return (((a) <= eps) && !((a) < -eps));
+}
+B3_FORCE_INLINE bool b3GreaterEqual(b3Scalar a, b3Scalar eps)
+{
+	return (!((a) <= eps));
+}
+
+B3_FORCE_INLINE int b3IsNegative(b3Scalar x)
+{
+	return x < b3Scalar(0.0) ? 1 : 0;
+}
+
+B3_FORCE_INLINE b3Scalar b3Radians(b3Scalar x) { return x * B3_RADS_PER_DEG; }
+B3_FORCE_INLINE b3Scalar b3Degrees(b3Scalar x) { return x * B3_DEGS_PER_RAD; }
+
+#define B3_DECLARE_HANDLE(name) \
+	typedef struct name##__     \
+	{                           \
+		int unused;             \
+	} * name
+
+#ifndef b3Fsel
+B3_FORCE_INLINE b3Scalar b3Fsel(b3Scalar a, b3Scalar b, b3Scalar c)
+{
+	return a >= 0 ? b : c;
+}
+#endif
+#define b3Fsels(a, b, c) (b3Scalar) b3Fsel(a, b, c)
+
+B3_FORCE_INLINE bool b3MachineIsLittleEndian()
+{
+	long int i = 1;
+	const char *p = (const char *)&i;
+	if (p[0] == 1)  // Lowest address contains the least significant byte
+		return true;
+	else
+		return false;
+}
+
+///b3Select avoids branches, which makes performance much better for consoles like Playstation 3 and XBox 360
+///Thanks Phil Knight. See also http://www.cellperformance.com/articles/2006/04/more_techniques_for_eliminatin_1.html
+B3_FORCE_INLINE unsigned b3Select(unsigned condition, unsigned valueIfConditionNonZero, unsigned valueIfConditionZero)
+{
+	// Set testNz to 0xFFFFFFFF if condition is nonzero, 0x00000000 if condition is zero
+	// Rely on positive value or'ed with its negative having sign bit on
+	// and zero value or'ed with its negative (which is still zero) having sign bit off
+	// Use arithmetic shift right, shifting the sign bit through all 32 bits
+	unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
+	unsigned testEqz = ~testNz;
+	return ((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz));
+}
+B3_FORCE_INLINE int b3Select(unsigned condition, int valueIfConditionNonZero, int valueIfConditionZero)
+{
+	unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
+	unsigned testEqz = ~testNz;
+	return static_cast<int>((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz));
+}
+B3_FORCE_INLINE float b3Select(unsigned condition, float valueIfConditionNonZero, float valueIfConditionZero)
+{
+#ifdef B3_HAVE_NATIVE_FSEL
+	return (float)b3Fsel((b3Scalar)condition - b3Scalar(1.0f), valueIfConditionNonZero, valueIfConditionZero);
+#else
+	return (condition != 0) ? valueIfConditionNonZero : valueIfConditionZero;
+#endif
+}
+
+template <typename T>
+B3_FORCE_INLINE void b3Swap(T &a, T &b)
+{
+	T tmp = a;
+	a = b;
+	b = tmp;
+}
+
+//PCK: endian swapping functions
+B3_FORCE_INLINE unsigned b3SwapEndian(unsigned val)
+{
+	return (((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24));
+}
+
+B3_FORCE_INLINE unsigned short b3SwapEndian(unsigned short val)
+{
+	return static_cast<unsigned short>(((val & 0xff00) >> 8) | ((val & 0x00ff) << 8));
+}
+
+B3_FORCE_INLINE unsigned b3SwapEndian(int val)
+{
+	return b3SwapEndian((unsigned)val);
+}
+
+B3_FORCE_INLINE unsigned short b3SwapEndian(short val)
+{
+	return b3SwapEndian((unsigned short)val);
+}
+
+///b3SwapFloat uses using char pointers to swap the endianness
+////b3SwapFloat/b3SwapDouble will NOT return a float, because the machine might 'correct' invalid floating point values
+///Not all values of sign/exponent/mantissa are valid floating point numbers according to IEEE 754.
+///When a floating point unit is faced with an invalid value, it may actually change the value, or worse, throw an exception.
+///In most systems, running user mode code, you wouldn't get an exception, but instead the hardware/os/runtime will 'fix' the number for you.
+///so instead of returning a float/double, we return integer/long long integer
+B3_FORCE_INLINE unsigned int b3SwapEndianFloat(float d)
+{
+	unsigned int a = 0;
+	unsigned char *dst = (unsigned char *)&a;
+	unsigned char *src = (unsigned char *)&d;
+
+	dst[0] = src[3];
+	dst[1] = src[2];
+	dst[2] = src[1];
+	dst[3] = src[0];
+	return a;
+}
+
+// unswap using char pointers
+B3_FORCE_INLINE float b3UnswapEndianFloat(unsigned int a)
+{
+	float d = 0.0f;
+	unsigned char *src = (unsigned char *)&a;
+	unsigned char *dst = (unsigned char *)&d;
+
+	dst[0] = src[3];
+	dst[1] = src[2];
+	dst[2] = src[1];
+	dst[3] = src[0];
+
+	return d;
+}
+
+// swap using char pointers
+B3_FORCE_INLINE void b3SwapEndianDouble(double d, unsigned char *dst)
+{
+	unsigned char *src = (unsigned char *)&d;
+
+	dst[0] = src[7];
+	dst[1] = src[6];
+	dst[2] = src[5];
+	dst[3] = src[4];
+	dst[4] = src[3];
+	dst[5] = src[2];
+	dst[6] = src[1];
+	dst[7] = src[0];
+}
+
+// unswap using char pointers
+B3_FORCE_INLINE double b3UnswapEndianDouble(const unsigned char *src)
+{
+	double d = 0.0;
+	unsigned char *dst = (unsigned char *)&d;
+
+	dst[0] = src[7];
+	dst[1] = src[6];
+	dst[2] = src[5];
+	dst[3] = src[4];
+	dst[4] = src[3];
+	dst[5] = src[2];
+	dst[6] = src[1];
+	dst[7] = src[0];
+
+	return d;
+}
+
+// returns normalized value in range [-B3_PI, B3_PI]
+B3_FORCE_INLINE b3Scalar b3NormalizeAngle(b3Scalar angleInRadians)
+{
+	angleInRadians = b3Fmod(angleInRadians, B3_2_PI);
+	if (angleInRadians < -B3_PI)
+	{
+		return angleInRadians + B3_2_PI;
+	}
+	else if (angleInRadians > B3_PI)
+	{
+		return angleInRadians - B3_2_PI;
+	}
+	else
+	{
+		return angleInRadians;
+	}
+}
+
+///rudimentary class to provide type info
+struct b3TypedObject
+{
+	b3TypedObject(int objectType)
+		: m_objectType(objectType)
+	{
+	}
+	int m_objectType;
+	inline int getObjectType() const
+	{
+		return m_objectType;
+	}
+};
+
+///align a pointer to the provided alignment, upwards
+template <typename T>
+T *b3AlignPointer(T *unalignedPtr, size_t alignment)
+{
+	struct b3ConvertPointerSizeT
+	{
+		union {
+			T *ptr;
+			size_t integer;
+		};
+	};
+	b3ConvertPointerSizeT converter;
+
+	const size_t bit_mask = ~(alignment - 1);
+	converter.ptr = unalignedPtr;
+	converter.integer += alignment - 1;
+	converter.integer &= bit_mask;
+	return converter.ptr;
+}
+
+#endif  //B3_SCALAR_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3StackAlloc.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3StackAlloc.h
new file mode 100644
index 0000000..4972236
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3StackAlloc.h
@@ -0,0 +1,118 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+StackAlloc extracted from GJK-EPA collision solver by Nathanael Presson
+Nov.2006
+*/
+
+#ifndef B3_STACK_ALLOC
+#define B3_STACK_ALLOC
+
+#include "b3Scalar.h"  //for b3Assert
+#include "b3AlignedAllocator.h"
+
+///The b3Block class is an internal structure for the b3StackAlloc memory allocator.
+struct b3Block
+{
+	b3Block* previous;
+	unsigned char* address;
+};
+
+///The StackAlloc class provides some fast stack-based memory allocator (LIFO last-in first-out)
+class b3StackAlloc
+{
+public:
+	b3StackAlloc(unsigned int size)
+	{
+		ctor();
+		create(size);
+	}
+	~b3StackAlloc() { destroy(); }
+
+	inline void create(unsigned int size)
+	{
+		destroy();
+		data = (unsigned char*)b3AlignedAlloc(size, 16);
+		totalsize = size;
+	}
+	inline void destroy()
+	{
+		b3Assert(usedsize == 0);
+		//Raise(L"StackAlloc is still in use");
+
+		if (usedsize == 0)
+		{
+			if (!ischild && data)
+				b3AlignedFree(data);
+
+			data = 0;
+			usedsize = 0;
+		}
+	}
+
+	int getAvailableMemory() const
+	{
+		return static_cast<int>(totalsize - usedsize);
+	}
+
+	unsigned char* allocate(unsigned int size)
+	{
+		const unsigned int nus(usedsize + size);
+		if (nus < totalsize)
+		{
+			usedsize = nus;
+			return (data + (usedsize - size));
+		}
+		b3Assert(0);
+		//&& (L"Not enough memory"));
+
+		return (0);
+	}
+	B3_FORCE_INLINE b3Block* beginBlock()
+	{
+		b3Block* pb = (b3Block*)allocate(sizeof(b3Block));
+		pb->previous = current;
+		pb->address = data + usedsize;
+		current = pb;
+		return (pb);
+	}
+	B3_FORCE_INLINE void endBlock(b3Block* block)
+	{
+		b3Assert(block == current);
+		//Raise(L"Unmatched blocks");
+		if (block == current)
+		{
+			current = block->previous;
+			usedsize = (unsigned int)((block->address - data) - sizeof(b3Block));
+		}
+	}
+
+private:
+	void ctor()
+	{
+		data = 0;
+		totalsize = 0;
+		usedsize = 0;
+		current = 0;
+		ischild = false;
+	}
+	unsigned char* data;
+	unsigned int totalsize;
+	unsigned int usedsize;
+	b3Block* current;
+	bool ischild;
+};
+
+#endif  //B3_STACK_ALLOC
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Transform.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Transform.h
new file mode 100644
index 0000000..149da9d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Transform.h
@@ -0,0 +1,286 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_TRANSFORM_H
+#define B3_TRANSFORM_H
+
+#include "b3Matrix3x3.h"
+
+#ifdef B3_USE_DOUBLE_PRECISION
+#define b3TransformData b3TransformDoubleData
+#else
+#define b3TransformData b3TransformFloatData
+#endif
+
+/**@brief The b3Transform class supports rigid transforms with only translation and rotation and no scaling/shear.
+ *It can be used in combination with b3Vector3, b3Quaternion and b3Matrix3x3 linear algebra classes. */
+B3_ATTRIBUTE_ALIGNED16(class)
+b3Transform
+{
+	///Storage for the rotation
+	b3Matrix3x3 m_basis;
+	///Storage for the translation
+	b3Vector3 m_origin;
+
+public:
+	/**@brief No initialization constructor */
+	b3Transform() {}
+	/**@brief Constructor from b3Quaternion (optional b3Vector3 )
+   * @param q Rotation from quaternion 
+   * @param c Translation from Vector (default 0,0,0) */
+	explicit B3_FORCE_INLINE b3Transform(const b3Quaternion& q,
+										 const b3Vector3& c = b3MakeVector3(b3Scalar(0), b3Scalar(0), b3Scalar(0)))
+		: m_basis(q),
+		  m_origin(c)
+	{
+	}
+
+	/**@brief Constructor from b3Matrix3x3 (optional b3Vector3)
+   * @param b Rotation from Matrix 
+   * @param c Translation from Vector default (0,0,0)*/
+	explicit B3_FORCE_INLINE b3Transform(const b3Matrix3x3& b,
+										 const b3Vector3& c = b3MakeVector3(b3Scalar(0), b3Scalar(0), b3Scalar(0)))
+		: m_basis(b),
+		  m_origin(c)
+	{
+	}
+	/**@brief Copy constructor */
+	B3_FORCE_INLINE b3Transform(const b3Transform& other)
+		: m_basis(other.m_basis),
+		  m_origin(other.m_origin)
+	{
+	}
+	/**@brief Assignment Operator */
+	B3_FORCE_INLINE b3Transform& operator=(const b3Transform& other)
+	{
+		m_basis = other.m_basis;
+		m_origin = other.m_origin;
+		return *this;
+	}
+
+	/**@brief Set the current transform as the value of the product of two transforms
+   * @param t1 Transform 1
+   * @param t2 Transform 2
+   * This = Transform1 * Transform2 */
+	B3_FORCE_INLINE void mult(const b3Transform& t1, const b3Transform& t2)
+	{
+		m_basis = t1.m_basis * t2.m_basis;
+		m_origin = t1(t2.m_origin);
+	}
+
+	/*		void multInverseLeft(const b3Transform& t1, const b3Transform& t2) {
+			b3Vector3 v = t2.m_origin - t1.m_origin;
+			m_basis = b3MultTransposeLeft(t1.m_basis, t2.m_basis);
+			m_origin = v * t1.m_basis;
+		}
+		*/
+
+	/**@brief Return the transform of the vector */
+	B3_FORCE_INLINE b3Vector3 operator()(const b3Vector3& x) const
+	{
+		return x.dot3(m_basis[0], m_basis[1], m_basis[2]) + m_origin;
+	}
+
+	/**@brief Return the transform of the vector */
+	B3_FORCE_INLINE b3Vector3 operator*(const b3Vector3& x) const
+	{
+		return (*this)(x);
+	}
+
+	/**@brief Return the transform of the b3Quaternion */
+	B3_FORCE_INLINE b3Quaternion operator*(const b3Quaternion& q) const
+	{
+		return getRotation() * q;
+	}
+
+	/**@brief Return the basis matrix for the rotation */
+	B3_FORCE_INLINE b3Matrix3x3& getBasis() { return m_basis; }
+	/**@brief Return the basis matrix for the rotation */
+	B3_FORCE_INLINE const b3Matrix3x3& getBasis() const { return m_basis; }
+
+	/**@brief Return the origin vector translation */
+	B3_FORCE_INLINE b3Vector3& getOrigin() { return m_origin; }
+	/**@brief Return the origin vector translation */
+	B3_FORCE_INLINE const b3Vector3& getOrigin() const { return m_origin; }
+
+	/**@brief Return a quaternion representing the rotation */
+	b3Quaternion getRotation() const
+	{
+		b3Quaternion q;
+		m_basis.getRotation(q);
+		return q;
+	}
+
+	/**@brief Set from an array 
+   * @param m A pointer to a 15 element array (12 rotation(row major padded on the right by 1), and 3 translation */
+	void setFromOpenGLMatrix(const b3Scalar* m)
+	{
+		m_basis.setFromOpenGLSubMatrix(m);
+		m_origin.setValue(m[12], m[13], m[14]);
+	}
+
+	/**@brief Fill an array representation
+   * @param m A pointer to a 15 element array (12 rotation(row major padded on the right by 1), and 3 translation */
+	void getOpenGLMatrix(b3Scalar * m) const
+	{
+		m_basis.getOpenGLSubMatrix(m);
+		m[12] = m_origin.getX();
+		m[13] = m_origin.getY();
+		m[14] = m_origin.getZ();
+		m[15] = b3Scalar(1.0);
+	}
+
+	/**@brief Set the translational element
+   * @param origin The vector to set the translation to */
+	B3_FORCE_INLINE void setOrigin(const b3Vector3& origin)
+	{
+		m_origin = origin;
+	}
+
+	B3_FORCE_INLINE b3Vector3 invXform(const b3Vector3& inVec) const;
+
+	/**@brief Set the rotational element by b3Matrix3x3 */
+	B3_FORCE_INLINE void setBasis(const b3Matrix3x3& basis)
+	{
+		m_basis = basis;
+	}
+
+	/**@brief Set the rotational element by b3Quaternion */
+	B3_FORCE_INLINE void setRotation(const b3Quaternion& q)
+	{
+		m_basis.setRotation(q);
+	}
+
+	/**@brief Set this transformation to the identity */
+	void setIdentity()
+	{
+		m_basis.setIdentity();
+		m_origin.setValue(b3Scalar(0.0), b3Scalar(0.0), b3Scalar(0.0));
+	}
+
+	/**@brief Multiply this Transform by another(this = this * another) 
+   * @param t The other transform */
+	b3Transform& operator*=(const b3Transform& t)
+	{
+		m_origin += m_basis * t.m_origin;
+		m_basis *= t.m_basis;
+		return *this;
+	}
+
+	/**@brief Return the inverse of this transform */
+	b3Transform inverse() const
+	{
+		b3Matrix3x3 inv = m_basis.transpose();
+		return b3Transform(inv, inv * -m_origin);
+	}
+
+	/**@brief Return the inverse of this transform times the other transform
+   * @param t The other transform 
+   * return this.inverse() * the other */
+	b3Transform inverseTimes(const b3Transform& t) const;
+
+	/**@brief Return the product of this transform and the other */
+	b3Transform operator*(const b3Transform& t) const;
+
+	/**@brief Return an identity transform */
+	static const b3Transform& getIdentity()
+	{
+		static const b3Transform identityTransform(b3Matrix3x3::getIdentity());
+		return identityTransform;
+	}
+
+	void serialize(struct b3TransformData & dataOut) const;
+
+	void serializeFloat(struct b3TransformFloatData & dataOut) const;
+
+	void deSerialize(const struct b3TransformData& dataIn);
+
+	void deSerializeDouble(const struct b3TransformDoubleData& dataIn);
+
+	void deSerializeFloat(const struct b3TransformFloatData& dataIn);
+};
+
+B3_FORCE_INLINE b3Vector3
+b3Transform::invXform(const b3Vector3& inVec) const
+{
+	b3Vector3 v = inVec - m_origin;
+	return (m_basis.transpose() * v);
+}
+
+B3_FORCE_INLINE b3Transform
+b3Transform::inverseTimes(const b3Transform& t) const
+{
+	b3Vector3 v = t.getOrigin() - m_origin;
+	return b3Transform(m_basis.transposeTimes(t.m_basis),
+					   v * m_basis);
+}
+
+B3_FORCE_INLINE b3Transform
+	b3Transform::operator*(const b3Transform& t) const
+{
+	return b3Transform(m_basis * t.m_basis,
+					   (*this)(t.m_origin));
+}
+
+/**@brief Test if two transforms have all elements equal */
+B3_FORCE_INLINE bool operator==(const b3Transform& t1, const b3Transform& t2)
+{
+	return (t1.getBasis() == t2.getBasis() &&
+			t1.getOrigin() == t2.getOrigin());
+}
+
+///for serialization
+struct b3TransformFloatData
+{
+	b3Matrix3x3FloatData m_basis;
+	b3Vector3FloatData m_origin;
+};
+
+struct b3TransformDoubleData
+{
+	b3Matrix3x3DoubleData m_basis;
+	b3Vector3DoubleData m_origin;
+};
+
+B3_FORCE_INLINE void b3Transform::serialize(b3TransformData& dataOut) const
+{
+	m_basis.serialize(dataOut.m_basis);
+	m_origin.serialize(dataOut.m_origin);
+}
+
+B3_FORCE_INLINE void b3Transform::serializeFloat(b3TransformFloatData& dataOut) const
+{
+	m_basis.serializeFloat(dataOut.m_basis);
+	m_origin.serializeFloat(dataOut.m_origin);
+}
+
+B3_FORCE_INLINE void b3Transform::deSerialize(const b3TransformData& dataIn)
+{
+	m_basis.deSerialize(dataIn.m_basis);
+	m_origin.deSerialize(dataIn.m_origin);
+}
+
+B3_FORCE_INLINE void b3Transform::deSerializeFloat(const b3TransformFloatData& dataIn)
+{
+	m_basis.deSerializeFloat(dataIn.m_basis);
+	m_origin.deSerializeFloat(dataIn.m_origin);
+}
+
+B3_FORCE_INLINE void b3Transform::deSerializeDouble(const b3TransformDoubleData& dataIn)
+{
+	m_basis.deSerializeDouble(dataIn.m_basis);
+	m_origin.deSerializeDouble(dataIn.m_origin);
+}
+
+#endif  //B3_TRANSFORM_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3TransformUtil.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3TransformUtil.h
new file mode 100644
index 0000000..1850a9b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3TransformUtil.h
@@ -0,0 +1,210 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_TRANSFORM_UTIL_H
+#define B3_TRANSFORM_UTIL_H
+
+#include "b3Transform.h"
+#define B3_ANGULAR_MOTION_THRESHOLD b3Scalar(0.5) * B3_HALF_PI
+
+B3_FORCE_INLINE b3Vector3 b3AabbSupport(const b3Vector3& halfExtents, const b3Vector3& supportDir)
+{
+	return b3MakeVector3(supportDir.getX() < b3Scalar(0.0) ? -halfExtents.getX() : halfExtents.getX(),
+						 supportDir.getY() < b3Scalar(0.0) ? -halfExtents.getY() : halfExtents.getY(),
+						 supportDir.getZ() < b3Scalar(0.0) ? -halfExtents.getZ() : halfExtents.getZ());
+}
+
+/// Utils related to temporal transforms
+class b3TransformUtil
+{
+public:
+	static void integrateTransform(const b3Transform& curTrans, const b3Vector3& linvel, const b3Vector3& angvel, b3Scalar timeStep, b3Transform& predictedTransform)
+	{
+		predictedTransform.setOrigin(curTrans.getOrigin() + linvel * timeStep);
+		//	#define QUATERNION_DERIVATIVE
+#ifdef QUATERNION_DERIVATIVE
+		b3Quaternion predictedOrn = curTrans.getRotation();
+		predictedOrn += (angvel * predictedOrn) * (timeStep * b3Scalar(0.5));
+		predictedOrn.normalize();
+#else
+		//Exponential map
+		//google for "Practical Parameterization of Rotations Using the Exponential Map", F. Sebastian Grassia
+
+		b3Vector3 axis;
+		b3Scalar fAngle = angvel.length();
+		//limit the angular motion
+		if (fAngle * timeStep > B3_ANGULAR_MOTION_THRESHOLD)
+		{
+			fAngle = B3_ANGULAR_MOTION_THRESHOLD / timeStep;
+		}
+
+		if (fAngle < b3Scalar(0.001))
+		{
+			// use Taylor's expansions of sync function
+			axis = angvel * (b3Scalar(0.5) * timeStep - (timeStep * timeStep * timeStep) * (b3Scalar(0.020833333333)) * fAngle * fAngle);
+		}
+		else
+		{
+			// sync(fAngle) = sin(c*fAngle)/t
+			axis = angvel * (b3Sin(b3Scalar(0.5) * fAngle * timeStep) / fAngle);
+		}
+		b3Quaternion dorn(axis.getX(), axis.getY(), axis.getZ(), b3Cos(fAngle * timeStep * b3Scalar(0.5)));
+		b3Quaternion orn0 = curTrans.getRotation();
+
+		b3Quaternion predictedOrn = dorn * orn0;
+		predictedOrn.normalize();
+#endif
+		predictedTransform.setRotation(predictedOrn);
+	}
+
+	static void calculateVelocityQuaternion(const b3Vector3& pos0, const b3Vector3& pos1, const b3Quaternion& orn0, const b3Quaternion& orn1, b3Scalar timeStep, b3Vector3& linVel, b3Vector3& angVel)
+	{
+		linVel = (pos1 - pos0) / timeStep;
+		b3Vector3 axis;
+		b3Scalar angle;
+		if (orn0 != orn1)
+		{
+			calculateDiffAxisAngleQuaternion(orn0, orn1, axis, angle);
+			angVel = axis * angle / timeStep;
+		}
+		else
+		{
+			angVel.setValue(0, 0, 0);
+		}
+	}
+
+	static void calculateDiffAxisAngleQuaternion(const b3Quaternion& orn0, const b3Quaternion& orn1a, b3Vector3& axis, b3Scalar& angle)
+	{
+		b3Quaternion orn1 = orn0.nearest(orn1a);
+		b3Quaternion dorn = orn1 * orn0.inverse();
+		angle = dorn.getAngle();
+		axis = b3MakeVector3(dorn.getX(), dorn.getY(), dorn.getZ());
+		axis[3] = b3Scalar(0.);
+		//check for axis length
+		b3Scalar len = axis.length2();
+		if (len < B3_EPSILON * B3_EPSILON)
+			axis = b3MakeVector3(b3Scalar(1.), b3Scalar(0.), b3Scalar(0.));
+		else
+			axis /= b3Sqrt(len);
+	}
+
+	static void calculateVelocity(const b3Transform& transform0, const b3Transform& transform1, b3Scalar timeStep, b3Vector3& linVel, b3Vector3& angVel)
+	{
+		linVel = (transform1.getOrigin() - transform0.getOrigin()) / timeStep;
+		b3Vector3 axis;
+		b3Scalar angle;
+		calculateDiffAxisAngle(transform0, transform1, axis, angle);
+		angVel = axis * angle / timeStep;
+	}
+
+	static void calculateDiffAxisAngle(const b3Transform& transform0, const b3Transform& transform1, b3Vector3& axis, b3Scalar& angle)
+	{
+		b3Matrix3x3 dmat = transform1.getBasis() * transform0.getBasis().inverse();
+		b3Quaternion dorn;
+		dmat.getRotation(dorn);
+
+		///floating point inaccuracy can lead to w component > 1..., which breaks
+		dorn.normalize();
+
+		angle = dorn.getAngle();
+		axis = b3MakeVector3(dorn.getX(), dorn.getY(), dorn.getZ());
+		axis[3] = b3Scalar(0.);
+		//check for axis length
+		b3Scalar len = axis.length2();
+		if (len < B3_EPSILON * B3_EPSILON)
+			axis = b3MakeVector3(b3Scalar(1.), b3Scalar(0.), b3Scalar(0.));
+		else
+			axis /= b3Sqrt(len);
+	}
+};
+
+///The b3ConvexSeparatingDistanceUtil can help speed up convex collision detection
+///by conservatively updating a cached separating distance/vector instead of re-calculating the closest distance
+class b3ConvexSeparatingDistanceUtil
+{
+	b3Quaternion m_ornA;
+	b3Quaternion m_ornB;
+	b3Vector3 m_posA;
+	b3Vector3 m_posB;
+
+	b3Vector3 m_separatingNormal;
+
+	b3Scalar m_boundingRadiusA;
+	b3Scalar m_boundingRadiusB;
+	b3Scalar m_separatingDistance;
+
+public:
+	b3ConvexSeparatingDistanceUtil(b3Scalar boundingRadiusA, b3Scalar boundingRadiusB)
+		: m_boundingRadiusA(boundingRadiusA),
+		  m_boundingRadiusB(boundingRadiusB),
+		  m_separatingDistance(0.f)
+	{
+	}
+
+	b3Scalar getConservativeSeparatingDistance()
+	{
+		return m_separatingDistance;
+	}
+
+	void updateSeparatingDistance(const b3Transform& transA, const b3Transform& transB)
+	{
+		const b3Vector3& toPosA = transA.getOrigin();
+		const b3Vector3& toPosB = transB.getOrigin();
+		b3Quaternion toOrnA = transA.getRotation();
+		b3Quaternion toOrnB = transB.getRotation();
+
+		if (m_separatingDistance > 0.f)
+		{
+			b3Vector3 linVelA, angVelA, linVelB, angVelB;
+			b3TransformUtil::calculateVelocityQuaternion(m_posA, toPosA, m_ornA, toOrnA, b3Scalar(1.), linVelA, angVelA);
+			b3TransformUtil::calculateVelocityQuaternion(m_posB, toPosB, m_ornB, toOrnB, b3Scalar(1.), linVelB, angVelB);
+			b3Scalar maxAngularProjectedVelocity = angVelA.length() * m_boundingRadiusA + angVelB.length() * m_boundingRadiusB;
+			b3Vector3 relLinVel = (linVelB - linVelA);
+			b3Scalar relLinVelocLength = relLinVel.dot(m_separatingNormal);
+			if (relLinVelocLength < 0.f)
+			{
+				relLinVelocLength = 0.f;
+			}
+
+			b3Scalar projectedMotion = maxAngularProjectedVelocity + relLinVelocLength;
+			m_separatingDistance -= projectedMotion;
+		}
+
+		m_posA = toPosA;
+		m_posB = toPosB;
+		m_ornA = toOrnA;
+		m_ornB = toOrnB;
+	}
+
+	void initSeparatingDistance(const b3Vector3& separatingVector, b3Scalar separatingDistance, const b3Transform& transA, const b3Transform& transB)
+	{
+		m_separatingDistance = separatingDistance;
+
+		if (m_separatingDistance > 0.f)
+		{
+			m_separatingNormal = separatingVector;
+
+			const b3Vector3& toPosA = transA.getOrigin();
+			const b3Vector3& toPosB = transB.getOrigin();
+			b3Quaternion toOrnA = transA.getRotation();
+			b3Quaternion toOrnB = transB.getRotation();
+			m_posA = toPosA;
+			m_posB = toPosB;
+			m_ornA = toOrnA;
+			m_ornB = toOrnB;
+		}
+	}
+};
+
+#endif  //B3_TRANSFORM_UTIL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Vector3.cpp b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Vector3.cpp
new file mode 100644
index 0000000..100fb77
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Vector3.cpp
@@ -0,0 +1,1637 @@
+/*
+ Copyright (c) 2011-213 Apple Inc. http://bulletphysics.org
+
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ This source version has been altered.
+ */
+
+#if defined(_WIN32) || defined(__i386__)
+#define B3_USE_SSE_IN_API
+#endif
+
+#include "b3Vector3.h"
+
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+
+#ifdef __APPLE__
+#include <stdint.h>
+typedef float float4 __attribute__((vector_size(16)));
+#else
+#define float4 __m128
+#endif
+//typedef  uint32_t uint4 __attribute__ ((vector_size(16)));
+
+#if defined B3_USE_SSE || defined _WIN32
+
+#define LOG2_ARRAY_SIZE 6
+#define STACK_ARRAY_COUNT (1UL << LOG2_ARRAY_SIZE)
+
+#include <emmintrin.h>
+
+long b3_maxdot_large(const float *vv, const float *vec, unsigned long count, float *dotResult);
+long b3_maxdot_large(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	const float4 *vertices = (const float4 *)vv;
+	static const unsigned char indexTable[16] = {(unsigned char)-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0};
+	float4 dotMax = b3Assign128(-B3_INFINITY, -B3_INFINITY, -B3_INFINITY, -B3_INFINITY);
+	float4 vvec = _mm_loadu_ps(vec);
+	float4 vHi = b3CastiTo128f(_mm_shuffle_epi32(b3CastfTo128i(vvec), 0xaa));  /// zzzz
+	float4 vLo = _mm_movelh_ps(vvec, vvec);                                    /// xyxy
+
+	long maxIndex = -1L;
+
+	size_t segment = 0;
+	float4 stack_array[STACK_ARRAY_COUNT];
+
+#if DEBUG
+	// memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) );
+#endif
+
+	size_t index;
+	float4 max;
+	// Faster loop without cleanup code for full tiles
+	for (segment = 0; segment + STACK_ARRAY_COUNT * 4 <= count; segment += STACK_ARRAY_COUNT * 4)
+	{
+		max = dotMax;
+
+		for (index = 0; index < STACK_ARRAY_COUNT; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			// It is too costly to keep the index of the max here. We will look for it again later.  We save a lot of work this way.
+		}
+
+		// If we found a new max
+		if (0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(max, dotMax)))
+		{
+			// copy the new max across all lanes of our max accumulator
+			max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0x4e));
+			max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0xb1));
+
+			dotMax = max;
+
+			// find first occurrence of that max
+			size_t test;
+			for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], max))); index++)  // local_count must be a multiple of 4
+			{
+			}
+			// record where it is.
+			maxIndex = 4 * index + segment + indexTable[test];
+		}
+	}
+
+	// account for work we've already done
+	count -= segment;
+
+	// Deal with the last < STACK_ARRAY_COUNT vectors
+	max = dotMax;
+	index = 0;
+
+	if (b3Unlikely(count > 16))
+	{
+		for (; index + 4 <= count / 4; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			// It is too costly to keep the index of the max here. We will look for it again later.  We save a lot of work this way.
+		}
+	}
+
+	size_t localCount = (count & -4L) - 4 * index;
+	if (localCount)
+	{
+#ifdef __APPLE__
+		float4 t0, t1, t2, t3, t4;
+		float4 *sap = &stack_array[index + localCount / 4];
+		vertices += localCount;  // counter the offset
+		size_t byteIndex = -(localCount) * sizeof(float);
+		//AT&T Code style assembly
+		asm volatile(
+			".align 4                                                                   \n\
+             0: movaps  %[max], %[t2]                            // move max out of the way to avoid propagating NaNs in max \n\
+          movaps  (%[vertices], %[byteIndex], 4),    %[t0]    // vertices[0]      \n\
+          movaps  16(%[vertices], %[byteIndex], 4),  %[t1]    // vertices[1]      \n\
+          movaps  %[t0], %[max]                               // vertices[0]      \n\
+          movlhps %[t1], %[max]                               // x0y0x1y1         \n\
+         movaps  32(%[vertices], %[byteIndex], 4),  %[t3]    // vertices[2]      \n\
+         movaps  48(%[vertices], %[byteIndex], 4),  %[t4]    // vertices[3]      \n\
+          mulps   %[vLo], %[max]                              // x0y0x1y1 * vLo   \n\
+         movhlps %[t0], %[t1]                                // z0w0z1w1         \n\
+         movaps  %[t3], %[t0]                                // vertices[2]      \n\
+         movlhps %[t4], %[t0]                                // x2y2x3y3         \n\
+         mulps   %[vLo], %[t0]                               // x2y2x3y3 * vLo   \n\
+          movhlps %[t3], %[t4]                                // z2w2z3w3         \n\
+          shufps  $0x88, %[t4], %[t1]                         // z0z1z2z3         \n\
+          mulps   %[vHi], %[t1]                               // z0z1z2z3 * vHi   \n\
+         movaps  %[max], %[t3]                               // x0y0x1y1 * vLo   \n\
+         shufps  $0x88, %[t0], %[max]                        // x0x1x2x3 * vLo.x \n\
+         shufps  $0xdd, %[t0], %[t3]                         // y0y1y2y3 * vLo.y \n\
+         addps   %[t3], %[max]                               // x + y            \n\
+         addps   %[t1], %[max]                               // x + y + z        \n\
+         movaps  %[max], (%[sap], %[byteIndex])              // record result for later scrutiny \n\
+         maxps   %[t2], %[max]                               // record max, restore max   \n\
+         add     $16, %[byteIndex]                           // advance loop counter\n\
+         jnz     0b                                          \n\
+     "
+			: [max] "+x"(max), [t0] "=&x"(t0), [t1] "=&x"(t1), [t2] "=&x"(t2), [t3] "=&x"(t3), [t4] "=&x"(t4), [byteIndex] "+r"(byteIndex)
+			: [vLo] "x"(vLo), [vHi] "x"(vHi), [vertices] "r"(vertices), [sap] "r"(sap)
+			: "memory", "cc");
+		index += localCount / 4;
+#else
+		{
+			for (unsigned int i = 0; i < localCount / 4; i++, index++)
+			{  // do four dot products at a time. Carefully avoid touching the w element.
+				float4 v0 = vertices[0];
+				float4 v1 = vertices[1];
+				float4 v2 = vertices[2];
+				float4 v3 = vertices[3];
+				vertices += 4;
+
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+				float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+				float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+				lo0 = lo0 * vLo;
+				lo1 = lo1 * vLo;
+				float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+				float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+				z = z * vHi;
+				x = x + y;
+				x = x + z;
+				stack_array[index] = x;
+				max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+			}
+		}
+#endif  //__APPLE__
+	}
+
+	// process the last few points
+	if (count & 3)
+	{
+		float4 v0, v1, v2, x, y, z;
+		switch (count & 3)
+		{
+			case 3:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				v2 = vertices[2];
+
+				// Calculate 3 dot products, transpose, duplicate v2
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // xyxy.lo
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z?z?.lo
+				lo0 = lo0 * vLo;
+				z = _mm_shuffle_ps(hi0, v2, 0xa8);  // z0z1z2z2
+				z = z * vHi;
+				float4 lo1 = _mm_movelh_ps(v2, v2);  // xyxy
+				lo1 = lo1 * vLo;
+				x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			}
+			break;
+			case 2:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				float4 xy = _mm_movelh_ps(v0, v1);
+				z = _mm_movehl_ps(v1, v0);
+				xy = xy * vLo;
+				z = _mm_shuffle_ps(z, z, 0xa8);
+				x = _mm_shuffle_ps(xy, xy, 0xa8);
+				y = _mm_shuffle_ps(xy, xy, 0xfd);
+				z = z * vHi;
+			}
+			break;
+			case 1:
+			{
+				float4 xy = vertices[0];
+				z = _mm_shuffle_ps(xy, xy, 0xaa);
+				xy = xy * vLo;
+				z = z * vHi;
+				x = _mm_shuffle_ps(xy, xy, 0);
+				y = _mm_shuffle_ps(xy, xy, 0x55);
+			}
+			break;
+		}
+		x = x + y;
+		x = x + z;
+		stack_array[index] = x;
+		max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+		index++;
+	}
+
+	// if we found a new max.
+	if (0 == segment || 0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(max, dotMax)))
+	{  // we found a new max. Search for it
+		// find max across the max vector, place in all elements of max -- big latency hit here
+		max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0x4e));
+		max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0xb1));
+
+		// It is slightly faster to do this part in scalar code when count < 8. However, the common case for
+		// this where it actually makes a difference is handled in the early out at the top of the function,
+		// so it is less than a 1% difference here. I opted for improved code size, fewer branches and reduced
+		// complexity, and removed it.
+
+		dotMax = max;
+
+		// scan for the first occurence of max in the array
+		size_t test;
+		for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], max))); index++)  // local_count must be a multiple of 4
+		{
+		}
+		maxIndex = 4 * index + segment + indexTable[test];
+	}
+
+	_mm_store_ss(dotResult, dotMax);
+	return maxIndex;
+}
+
+long b3_mindot_large(const float *vv, const float *vec, unsigned long count, float *dotResult);
+
+long b3_mindot_large(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	const float4 *vertices = (const float4 *)vv;
+	static const unsigned char indexTable[16] = {(unsigned char)-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0};
+
+	float4 dotmin = b3Assign128(B3_INFINITY, B3_INFINITY, B3_INFINITY, B3_INFINITY);
+	float4 vvec = _mm_loadu_ps(vec);
+	float4 vHi = b3CastiTo128f(_mm_shuffle_epi32(b3CastfTo128i(vvec), 0xaa));  /// zzzz
+	float4 vLo = _mm_movelh_ps(vvec, vvec);                                    /// xyxy
+
+	long minIndex = -1L;
+
+	size_t segment = 0;
+	float4 stack_array[STACK_ARRAY_COUNT];
+
+#if DEBUG
+	// memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) );
+#endif
+
+	size_t index;
+	float4 min;
+	// Faster loop without cleanup code for full tiles
+	for (segment = 0; segment + STACK_ARRAY_COUNT * 4 <= count; segment += STACK_ARRAY_COUNT * 4)
+	{
+		min = dotmin;
+
+		for (index = 0; index < STACK_ARRAY_COUNT; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			// It is too costly to keep the index of the min here. We will look for it again later.  We save a lot of work this way.
+		}
+
+		// If we found a new min
+		if (0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(min, dotmin)))
+		{
+			// copy the new min across all lanes of our min accumulator
+			min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0x4e));
+			min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0xb1));
+
+			dotmin = min;
+
+			// find first occurrence of that min
+			size_t test;
+			for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], min))); index++)  // local_count must be a multiple of 4
+			{
+			}
+			// record where it is.
+			minIndex = 4 * index + segment + indexTable[test];
+		}
+	}
+
+	// account for work we've already done
+	count -= segment;
+
+	// Deal with the last < STACK_ARRAY_COUNT vectors
+	min = dotmin;
+	index = 0;
+
+	if (b3Unlikely(count > 16))
+	{
+		for (; index + 4 <= count / 4; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			// It is too costly to keep the index of the min here. We will look for it again later.  We save a lot of work this way.
+		}
+	}
+
+	size_t localCount = (count & -4L) - 4 * index;
+	if (localCount)
+	{
+#ifdef __APPLE__
+		vertices += localCount;  // counter the offset
+		float4 t0, t1, t2, t3, t4;
+		size_t byteIndex = -(localCount) * sizeof(float);
+		float4 *sap = &stack_array[index + localCount / 4];
+
+		asm volatile(
+			".align 4                                                                   \n\
+             0: movaps  %[min], %[t2]                            // move min out of the way to avoid propagating NaNs in min \n\
+             movaps  (%[vertices], %[byteIndex], 4),    %[t0]    // vertices[0]      \n\
+             movaps  16(%[vertices], %[byteIndex], 4),  %[t1]    // vertices[1]      \n\
+             movaps  %[t0], %[min]                               // vertices[0]      \n\
+             movlhps %[t1], %[min]                               // x0y0x1y1         \n\
+             movaps  32(%[vertices], %[byteIndex], 4),  %[t3]    // vertices[2]      \n\
+             movaps  48(%[vertices], %[byteIndex], 4),  %[t4]    // vertices[3]      \n\
+             mulps   %[vLo], %[min]                              // x0y0x1y1 * vLo   \n\
+             movhlps %[t0], %[t1]                                // z0w0z1w1         \n\
+             movaps  %[t3], %[t0]                                // vertices[2]      \n\
+             movlhps %[t4], %[t0]                                // x2y2x3y3         \n\
+             movhlps %[t3], %[t4]                                // z2w2z3w3         \n\
+             mulps   %[vLo], %[t0]                               // x2y2x3y3 * vLo   \n\
+             shufps  $0x88, %[t4], %[t1]                         // z0z1z2z3         \n\
+             mulps   %[vHi], %[t1]                               // z0z1z2z3 * vHi   \n\
+             movaps  %[min], %[t3]                               // x0y0x1y1 * vLo   \n\
+             shufps  $0x88, %[t0], %[min]                        // x0x1x2x3 * vLo.x \n\
+             shufps  $0xdd, %[t0], %[t3]                         // y0y1y2y3 * vLo.y \n\
+             addps   %[t3], %[min]                               // x + y            \n\
+             addps   %[t1], %[min]                               // x + y + z        \n\
+             movaps  %[min], (%[sap], %[byteIndex])              // record result for later scrutiny \n\
+             minps   %[t2], %[min]                               // record min, restore min   \n\
+             add     $16, %[byteIndex]                           // advance loop counter\n\
+             jnz     0b                                          \n\
+             "
+			: [min] "+x"(min), [t0] "=&x"(t0), [t1] "=&x"(t1), [t2] "=&x"(t2), [t3] "=&x"(t3), [t4] "=&x"(t4), [byteIndex] "+r"(byteIndex)
+			: [vLo] "x"(vLo), [vHi] "x"(vHi), [vertices] "r"(vertices), [sap] "r"(sap)
+			: "memory", "cc");
+		index += localCount / 4;
+#else
+		{
+			for (unsigned int i = 0; i < localCount / 4; i++, index++)
+			{  // do four dot products at a time. Carefully avoid touching the w element.
+				float4 v0 = vertices[0];
+				float4 v1 = vertices[1];
+				float4 v2 = vertices[2];
+				float4 v3 = vertices[3];
+				vertices += 4;
+
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+				float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+				float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+				lo0 = lo0 * vLo;
+				lo1 = lo1 * vLo;
+				float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+				float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+				z = z * vHi;
+				x = x + y;
+				x = x + z;
+				stack_array[index] = x;
+				min = _mm_min_ps(x, min);  // control the order here so that max is never NaN even if x is nan
+			}
+		}
+
+#endif
+	}
+
+	// process the last few points
+	if (count & 3)
+	{
+		float4 v0, v1, v2, x, y, z;
+		switch (count & 3)
+		{
+			case 3:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				v2 = vertices[2];
+
+				// Calculate 3 dot products, transpose, duplicate v2
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // xyxy.lo
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z?z?.lo
+				lo0 = lo0 * vLo;
+				z = _mm_shuffle_ps(hi0, v2, 0xa8);  // z0z1z2z2
+				z = z * vHi;
+				float4 lo1 = _mm_movelh_ps(v2, v2);  // xyxy
+				lo1 = lo1 * vLo;
+				x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			}
+			break;
+			case 2:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				float4 xy = _mm_movelh_ps(v0, v1);
+				z = _mm_movehl_ps(v1, v0);
+				xy = xy * vLo;
+				z = _mm_shuffle_ps(z, z, 0xa8);
+				x = _mm_shuffle_ps(xy, xy, 0xa8);
+				y = _mm_shuffle_ps(xy, xy, 0xfd);
+				z = z * vHi;
+			}
+			break;
+			case 1:
+			{
+				float4 xy = vertices[0];
+				z = _mm_shuffle_ps(xy, xy, 0xaa);
+				xy = xy * vLo;
+				z = z * vHi;
+				x = _mm_shuffle_ps(xy, xy, 0);
+				y = _mm_shuffle_ps(xy, xy, 0x55);
+			}
+			break;
+		}
+		x = x + y;
+		x = x + z;
+		stack_array[index] = x;
+		min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+		index++;
+	}
+
+	// if we found a new min.
+	if (0 == segment || 0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(min, dotmin)))
+	{  // we found a new min. Search for it
+		// find min across the min vector, place in all elements of min -- big latency hit here
+		min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0x4e));
+		min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0xb1));
+
+		// It is slightly faster to do this part in scalar code when count < 8. However, the common case for
+		// this where it actually makes a difference is handled in the early out at the top of the function,
+		// so it is less than a 1% difference here. I opted for improved code size, fewer branches and reduced
+		// complexity, and removed it.
+
+		dotmin = min;
+
+		// scan for the first occurence of min in the array
+		size_t test;
+		for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], min))); index++)  // local_count must be a multiple of 4
+		{
+		}
+		minIndex = 4 * index + segment + indexTable[test];
+	}
+
+	_mm_store_ss(dotResult, dotmin);
+	return minIndex;
+}
+
+#elif defined B3_USE_NEON
+#define ARM_NEON_GCC_COMPATIBILITY 1
+#include <arm_neon.h>
+
+static long b3_maxdot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long b3_maxdot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long b3_maxdot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long b3_mindot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long b3_mindot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long b3_mindot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult);
+
+long (*b3_maxdot_large)(const float *vv, const float *vec, unsigned long count, float *dotResult) = b3_maxdot_large_sel;
+long (*b3_mindot_large)(const float *vv, const float *vec, unsigned long count, float *dotResult) = b3_mindot_large_sel;
+
+extern "C"
+{
+	int _get_cpu_capabilities(void);
+}
+
+static long b3_maxdot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	if (_get_cpu_capabilities() & 0x2000)
+		b3_maxdot_large = _maxdot_large_v1;
+	else
+		b3_maxdot_large = _maxdot_large_v0;
+
+	return b3_maxdot_large(vv, vec, count, dotResult);
+}
+
+static long b3_mindot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	if (_get_cpu_capabilities() & 0x2000)
+		b3_mindot_large = _mindot_large_v1;
+	else
+		b3_mindot_large = _mindot_large_v0;
+
+	return b3_mindot_large(vv, vec, count, dotResult);
+}
+
+#define vld1q_f32_aligned_postincrement(_ptr) ({ float32x4_t _r; asm( "vld1.f32  {%0}, [%1, :128]!\n" : "=w" (_r), "+r" (_ptr) ); /*return*/ _r; })
+
+long b3_maxdot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	unsigned long i = 0;
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x2_t vLo = vget_low_f32(vvec);
+	float32x2_t vHi = vdup_lane_f32(vget_high_f32(vvec), 0);
+	float32x2_t dotMaxLo = (float32x2_t){-B3_INFINITY, -B3_INFINITY};
+	float32x2_t dotMaxHi = (float32x2_t){-B3_INFINITY, -B3_INFINITY};
+	uint32x2_t indexLo = (uint32x2_t){0, 1};
+	uint32x2_t indexHi = (uint32x2_t){2, 3};
+	uint32x2_t iLo = (uint32x2_t){-1, -1};
+	uint32x2_t iHi = (uint32x2_t){-1, -1};
+	const uint32x2_t four = (uint32x2_t){4, 4};
+
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+		uint32x2_t maskHi = vcgt_f32(rHi, dotMaxHi);
+		dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+		dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		zLo = vmul_f32(z0.val[0], vHi);
+		zHi = vmul_f32(z1.val[0], vHi);
+
+		rLo = vpadd_f32(xy0, xy1);
+		rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		maskLo = vcgt_f32(rLo, dotMaxLo);
+		maskHi = vcgt_f32(rHi, dotMaxHi);
+		dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+		dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+		uint32x2_t maskHi = vcgt_f32(rHi, dotMaxHi);
+		dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+		dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+			float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+			float32x2_t zHi = vmul_f32(vdup_lane_f32(vget_high_f32(v2), 0), vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			float32x2_t rHi = vpadd_f32(xy2, xy2);
+			rLo = vadd_f32(rLo, zLo);
+			rHi = vadd_f32(rHi, zHi);
+
+			uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+			uint32x2_t maskHi = vcgt_f32(rHi, dotMaxHi);
+			dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+			dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+			iHi = vbsl_u32(maskHi, indexHi, iHi);
+		}
+		break;
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			rLo = vadd_f32(rLo, zLo);
+
+			uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+			dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t z0 = vdup_lane_f32(vget_high_f32(v0), 0);
+			float32x2_t zLo = vmul_f32(z0, vHi);
+			float32x2_t rLo = vpadd_f32(xy0, xy0);
+			rLo = vadd_f32(rLo, zLo);
+			uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+			dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vcgt_f32(dotMaxHi, dotMaxLo);
+	dotMaxLo = vbsl_f32(mask, dotMaxHi, dotMaxLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	// select best answer between even and odd results
+	dotMaxHi = vdup_lane_f32(dotMaxLo, 1);
+	iHi = vdup_lane_u32(iLo, 1);
+	mask = vcgt_f32(dotMaxHi, dotMaxLo);
+	dotMaxLo = vbsl_f32(mask, dotMaxHi, dotMaxLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	*dotResult = vget_lane_f32(dotMaxLo, 0);
+	return vget_lane_u32(iLo, 0);
+}
+
+long b3_maxdot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x4_t vLo = vcombine_f32(vget_low_f32(vvec), vget_low_f32(vvec));
+	float32x4_t vHi = vdupq_lane_f32(vget_high_f32(vvec), 0);
+	const uint32x4_t four = (uint32x4_t){4, 4, 4, 4};
+	uint32x4_t local_index = (uint32x4_t){0, 1, 2, 3};
+	uint32x4_t index = (uint32x4_t){-1, -1, -1, -1};
+	float32x4_t maxDot = (float32x4_t){-B3_INFINITY, -B3_INFINITY, -B3_INFINITY, -B3_INFINITY};
+
+	unsigned long i = 0;
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcgtq_f32(x, maxDot);
+		maxDot = vbslq_f32(mask, x, maxDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		zb = vuzpq_f32(z0, z1);
+		z = vmulq_f32(zb.val[0], vHi);
+		xy = vuzpq_f32(xy0, xy1);
+		x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		mask = vcgtq_f32(x, maxDot);
+		maxDot = vbslq_f32(mask, x, maxDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcgtq_f32(x, maxDot);
+		maxDot = vbslq_f32(mask, x, maxDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v2));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v2));
+
+			xy0 = vmulq_f32(xy0, vLo);
+			xy1 = vmulq_f32(xy1, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z1);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcgtq_f32(x, maxDot);
+			maxDot = vbslq_f32(mask, x, maxDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z0);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcgtq_f32(x, maxDot);
+			maxDot = vbslq_f32(mask, x, maxDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v0));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z = vdupq_lane_f32(vget_high_f32(v0), 0);
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			z = vmulq_f32(z, vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcgtq_f32(x, maxDot);
+			maxDot = vbslq_f32(mask, x, maxDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vcgt_f32(vget_high_f32(maxDot), vget_low_f32(maxDot));
+	float32x2_t maxDot2 = vbsl_f32(mask, vget_high_f32(maxDot), vget_low_f32(maxDot));
+	uint32x2_t index2 = vbsl_u32(mask, vget_high_u32(index), vget_low_u32(index));
+
+	// select best answer between even and odd results
+	float32x2_t maxDotO = vdup_lane_f32(maxDot2, 1);
+	uint32x2_t indexHi = vdup_lane_u32(index2, 1);
+	mask = vcgt_f32(maxDotO, maxDot2);
+	maxDot2 = vbsl_f32(mask, maxDotO, maxDot2);
+	index2 = vbsl_u32(mask, indexHi, index2);
+
+	*dotResult = vget_lane_f32(maxDot2, 0);
+	return vget_lane_u32(index2, 0);
+}
+
+long b3_mindot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	unsigned long i = 0;
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x2_t vLo = vget_low_f32(vvec);
+	float32x2_t vHi = vdup_lane_f32(vget_high_f32(vvec), 0);
+	float32x2_t dotMinLo = (float32x2_t){B3_INFINITY, B3_INFINITY};
+	float32x2_t dotMinHi = (float32x2_t){B3_INFINITY, B3_INFINITY};
+	uint32x2_t indexLo = (uint32x2_t){0, 1};
+	uint32x2_t indexHi = (uint32x2_t){2, 3};
+	uint32x2_t iLo = (uint32x2_t){-1, -1};
+	uint32x2_t iHi = (uint32x2_t){-1, -1};
+	const uint32x2_t four = (uint32x2_t){4, 4};
+
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+		uint32x2_t maskHi = vclt_f32(rHi, dotMinHi);
+		dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+		dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		zLo = vmul_f32(z0.val[0], vHi);
+		zHi = vmul_f32(z1.val[0], vHi);
+
+		rLo = vpadd_f32(xy0, xy1);
+		rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		maskLo = vclt_f32(rLo, dotMinLo);
+		maskHi = vclt_f32(rHi, dotMinHi);
+		dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+		dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+		uint32x2_t maskHi = vclt_f32(rHi, dotMinHi);
+		dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+		dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+			float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+			float32x2_t zHi = vmul_f32(vdup_lane_f32(vget_high_f32(v2), 0), vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			float32x2_t rHi = vpadd_f32(xy2, xy2);
+			rLo = vadd_f32(rLo, zLo);
+			rHi = vadd_f32(rHi, zHi);
+
+			uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+			uint32x2_t maskHi = vclt_f32(rHi, dotMinHi);
+			dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+			dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+			iHi = vbsl_u32(maskHi, indexHi, iHi);
+		}
+		break;
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			rLo = vadd_f32(rLo, zLo);
+
+			uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+			dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t z0 = vdup_lane_f32(vget_high_f32(v0), 0);
+			float32x2_t zLo = vmul_f32(z0, vHi);
+			float32x2_t rLo = vpadd_f32(xy0, xy0);
+			rLo = vadd_f32(rLo, zLo);
+			uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+			dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vclt_f32(dotMinHi, dotMinLo);
+	dotMinLo = vbsl_f32(mask, dotMinHi, dotMinLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	// select best answer between even and odd results
+	dotMinHi = vdup_lane_f32(dotMinLo, 1);
+	iHi = vdup_lane_u32(iLo, 1);
+	mask = vclt_f32(dotMinHi, dotMinLo);
+	dotMinLo = vbsl_f32(mask, dotMinHi, dotMinLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	*dotResult = vget_lane_f32(dotMinLo, 0);
+	return vget_lane_u32(iLo, 0);
+}
+
+long b3_mindot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x4_t vLo = vcombine_f32(vget_low_f32(vvec), vget_low_f32(vvec));
+	float32x4_t vHi = vdupq_lane_f32(vget_high_f32(vvec), 0);
+	const uint32x4_t four = (uint32x4_t){4, 4, 4, 4};
+	uint32x4_t local_index = (uint32x4_t){0, 1, 2, 3};
+	uint32x4_t index = (uint32x4_t){-1, -1, -1, -1};
+	float32x4_t minDot = (float32x4_t){B3_INFINITY, B3_INFINITY, B3_INFINITY, B3_INFINITY};
+
+	unsigned long i = 0;
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcltq_f32(x, minDot);
+		minDot = vbslq_f32(mask, x, minDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		zb = vuzpq_f32(z0, z1);
+		z = vmulq_f32(zb.val[0], vHi);
+		xy = vuzpq_f32(xy0, xy1);
+		x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		mask = vcltq_f32(x, minDot);
+		minDot = vbslq_f32(mask, x, minDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcltq_f32(x, minDot);
+		minDot = vbslq_f32(mask, x, minDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v2));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v2));
+
+			xy0 = vmulq_f32(xy0, vLo);
+			xy1 = vmulq_f32(xy1, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z1);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcltq_f32(x, minDot);
+			minDot = vbslq_f32(mask, x, minDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z0);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcltq_f32(x, minDot);
+			minDot = vbslq_f32(mask, x, minDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v0));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z = vdupq_lane_f32(vget_high_f32(v0), 0);
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			z = vmulq_f32(z, vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcltq_f32(x, minDot);
+			minDot = vbslq_f32(mask, x, minDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vclt_f32(vget_high_f32(minDot), vget_low_f32(minDot));
+	float32x2_t minDot2 = vbsl_f32(mask, vget_high_f32(minDot), vget_low_f32(minDot));
+	uint32x2_t index2 = vbsl_u32(mask, vget_high_u32(index), vget_low_u32(index));
+
+	// select best answer between even and odd results
+	float32x2_t minDotO = vdup_lane_f32(minDot2, 1);
+	uint32x2_t indexHi = vdup_lane_u32(index2, 1);
+	mask = vclt_f32(minDotO, minDot2);
+	minDot2 = vbsl_f32(mask, minDotO, minDot2);
+	index2 = vbsl_u32(mask, indexHi, index2);
+
+	*dotResult = vget_lane_f32(minDot2, 0);
+	return vget_lane_u32(index2, 0);
+}
+
+#else
+#error Unhandled __APPLE__ arch
+#endif
+
+#endif /* __APPLE__ */
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/b3Vector3.h b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Vector3.h
new file mode 100644
index 0000000..a70d68d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/b3Vector3.h
@@ -0,0 +1,1303 @@
+/*
+Copyright (c) 2003-2013 Gino van den Bergen / Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_VECTOR3_H
+#define B3_VECTOR3_H
+
+//#include <stdint.h>
+#include "b3Scalar.h"
+#include "b3MinMax.h"
+#include "b3AlignedAllocator.h"
+
+#ifdef B3_USE_DOUBLE_PRECISION
+#define b3Vector3Data b3Vector3DoubleData
+#define b3Vector3DataName "b3Vector3DoubleData"
+#else
+#define b3Vector3Data b3Vector3FloatData
+#define b3Vector3DataName "b3Vector3FloatData"
+#endif  //B3_USE_DOUBLE_PRECISION
+
+#if defined B3_USE_SSE
+
+//typedef  uint32_t __m128i __attribute__ ((vector_size(16)));
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4556)  // value of intrinsic immediate argument '4294967239' is out of range '0 - 255'
+#endif
+
+#define B3_SHUFFLE(x, y, z, w) (((w) << 6 | (z) << 4 | (y) << 2 | (x)) & 0xff)
+//#define b3_pshufd_ps( _a, _mask ) (__m128) _mm_shuffle_epi32((__m128i)(_a), (_mask) )
+#define b3_pshufd_ps(_a, _mask) _mm_shuffle_ps((_a), (_a), (_mask))
+#define b3_splat3_ps(_a, _i) b3_pshufd_ps((_a), B3_SHUFFLE(_i, _i, _i, 3))
+#define b3_splat_ps(_a, _i) b3_pshufd_ps((_a), B3_SHUFFLE(_i, _i, _i, _i))
+
+#define b3v3AbsiMask (_mm_set_epi32(0x00000000, 0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF))
+#define b3vAbsMask (_mm_set_epi32(0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF))
+#define b3vFFF0Mask (_mm_set_epi32(0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF))
+#define b3v3AbsfMask b3CastiTo128f(b3v3AbsiMask)
+#define b3vFFF0fMask b3CastiTo128f(b3vFFF0Mask)
+#define b3vxyzMaskf b3vFFF0fMask
+#define b3vAbsfMask b3CastiTo128f(b3vAbsMask)
+
+const __m128 B3_ATTRIBUTE_ALIGNED16(b3vMzeroMask) = {-0.0f, -0.0f, -0.0f, -0.0f};
+const __m128 B3_ATTRIBUTE_ALIGNED16(b3v1110) = {1.0f, 1.0f, 1.0f, 0.0f};
+const __m128 B3_ATTRIBUTE_ALIGNED16(b3vHalf) = {0.5f, 0.5f, 0.5f, 0.5f};
+const __m128 B3_ATTRIBUTE_ALIGNED16(b3v1_5) = {1.5f, 1.5f, 1.5f, 1.5f};
+
+#endif
+
+#ifdef B3_USE_NEON
+
+const float32x4_t B3_ATTRIBUTE_ALIGNED16(b3vMzeroMask) = (float32x4_t){-0.0f, -0.0f, -0.0f, -0.0f};
+const int32x4_t B3_ATTRIBUTE_ALIGNED16(b3vFFF0Mask) = (int32x4_t){0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0};
+const int32x4_t B3_ATTRIBUTE_ALIGNED16(b3vAbsMask) = (int32x4_t){0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF};
+const int32x4_t B3_ATTRIBUTE_ALIGNED16(b3v3AbsMask) = (int32x4_t){0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF, 0x0};
+
+#endif
+
+class b3Vector3;
+class b3Vector4;
+
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+//#if defined (B3_USE_SSE) || defined (B3_USE_NEON)
+inline b3Vector3 b3MakeVector3(b3SimdFloat4 v);
+inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec);
+#endif
+
+inline b3Vector3 b3MakeVector3(b3Scalar x, b3Scalar y, b3Scalar z);
+inline b3Vector3 b3MakeVector3(b3Scalar x, b3Scalar y, b3Scalar z, b3Scalar w);
+inline b3Vector4 b3MakeVector4(b3Scalar x, b3Scalar y, b3Scalar z, b3Scalar w);
+
+/**@brief b3Vector3 can be used to represent 3D points and vectors.
+ * It has an un-used w component to suit 16-byte alignment when b3Vector3 is stored in containers. This extra component can be used by derived classes (Quaternion?) or by user
+ * Ideally, this class should be replaced by a platform optimized SIMD version that keeps the data in registers
+ */
+B3_ATTRIBUTE_ALIGNED16(class)
+b3Vector3
+{
+public:
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)  // _WIN32 || ARM
+	union {
+		b3SimdFloat4 mVec128;
+		float m_floats[4];
+		struct
+		{
+			float x, y, z, w;
+		};
+	};
+#else
+	union {
+		float m_floats[4];
+		struct
+		{
+			float x, y, z, w;
+		};
+	};
+#endif
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)  // _WIN32 || ARM
+
+	/*B3_FORCE_INLINE		b3Vector3()
+	{
+	}
+	*/
+
+	B3_FORCE_INLINE b3SimdFloat4 get128() const
+	{
+		return mVec128;
+	}
+	B3_FORCE_INLINE void set128(b3SimdFloat4 v128)
+	{
+		mVec128 = v128;
+	}
+#endif
+
+public:
+	/**@brief Add a vector to this one
+ * @param The vector to add to this one */
+	B3_FORCE_INLINE b3Vector3& operator+=(const b3Vector3& v)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = _mm_add_ps(mVec128, v.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vaddq_f32(mVec128, v.mVec128);
+#else
+		m_floats[0] += v.m_floats[0];
+		m_floats[1] += v.m_floats[1];
+		m_floats[2] += v.m_floats[2];
+#endif
+		return *this;
+	}
+
+	/**@brief Subtract a vector from this one
+   * @param The vector to subtract */
+	B3_FORCE_INLINE b3Vector3& operator-=(const b3Vector3& v)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = _mm_sub_ps(mVec128, v.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vsubq_f32(mVec128, v.mVec128);
+#else
+		m_floats[0] -= v.m_floats[0];
+		m_floats[1] -= v.m_floats[1];
+		m_floats[2] -= v.m_floats[2];
+#endif
+		return *this;
+	}
+
+	/**@brief Scale the vector
+   * @param s Scale factor */
+	B3_FORCE_INLINE b3Vector3& operator*=(const b3Scalar& s)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = b3_pshufd_ps(vs, 0x80);  //	(S S S 0.0)
+		mVec128 = _mm_mul_ps(mVec128, vs);
+#elif defined(B3_USE_NEON)
+		mVec128 = vmulq_n_f32(mVec128, s);
+#else
+		m_floats[0] *= s;
+		m_floats[1] *= s;
+		m_floats[2] *= s;
+#endif
+		return *this;
+	}
+
+	/**@brief Inversely scale the vector
+   * @param s Scale factor to divide by */
+	B3_FORCE_INLINE b3Vector3& operator/=(const b3Scalar& s)
+	{
+		b3FullAssert(s != b3Scalar(0.0));
+
+#if 0  //defined(B3_USE_SSE_IN_API)
+// this code is not faster !
+		__m128 vs = _mm_load_ss(&s);
+		vs = _mm_div_ss(b3v1110, vs);
+		vs = b3_pshufd_ps(vs, 0x00);	//	(S S S S)
+
+		mVec128 = _mm_mul_ps(mVec128, vs);
+
+		return *this;
+#else
+		return *this *= b3Scalar(1.0) / s;
+#endif
+	}
+
+	/**@brief Return the dot product
+   * @param v The other vector in the dot product */
+	B3_FORCE_INLINE b3Scalar dot(const b3Vector3& v) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vd = _mm_mul_ps(mVec128, v.mVec128);
+		__m128 z = _mm_movehl_ps(vd, vd);
+		__m128 y = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, y);
+		vd = _mm_add_ss(vd, z);
+		return _mm_cvtss_f32(vd);
+#elif defined(B3_USE_NEON)
+		float32x4_t vd = vmulq_f32(mVec128, v.mVec128);
+		float32x2_t x = vpadd_f32(vget_low_f32(vd), vget_low_f32(vd));
+		x = vadd_f32(x, vget_high_f32(vd));
+		return vget_lane_f32(x, 0);
+#else
+		return m_floats[0] * v.m_floats[0] +
+			   m_floats[1] * v.m_floats[1] +
+			   m_floats[2] * v.m_floats[2];
+#endif
+	}
+
+	/**@brief Return the length of the vector squared */
+	B3_FORCE_INLINE b3Scalar length2() const
+	{
+		return dot(*this);
+	}
+
+	/**@brief Return the length of the vector */
+	B3_FORCE_INLINE b3Scalar length() const
+	{
+		return b3Sqrt(length2());
+	}
+
+	/**@brief Return the distance squared between the ends of this and another vector
+   * This is symantically treating the vector like a point */
+	B3_FORCE_INLINE b3Scalar distance2(const b3Vector3& v) const;
+
+	/**@brief Return the distance between the ends of this and another vector
+   * This is symantically treating the vector like a point */
+	B3_FORCE_INLINE b3Scalar distance(const b3Vector3& v) const;
+
+	B3_FORCE_INLINE b3Vector3& safeNormalize()
+	{
+		b3Scalar l2 = length2();
+		//triNormal.normalize();
+		if (l2 >= B3_EPSILON * B3_EPSILON)
+		{
+			(*this) /= b3Sqrt(l2);
+		}
+		else
+		{
+			setValue(1, 0, 0);
+		}
+		return *this;
+	}
+
+	/**@brief Normalize this vector
+   * x^2 + y^2 + z^2 = 1 */
+	B3_FORCE_INLINE b3Vector3& normalize()
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		// dot product first
+		__m128 vd = _mm_mul_ps(mVec128, mVec128);
+		__m128 z = _mm_movehl_ps(vd, vd);
+		__m128 y = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, y);
+		vd = _mm_add_ss(vd, z);
+
+#if 0
+        vd = _mm_sqrt_ss(vd);
+		vd = _mm_div_ss(b3v1110, vd);
+		vd = b3_splat_ps(vd, 0x80);
+		mVec128 = _mm_mul_ps(mVec128, vd);
+#else
+
+		// NR step 1/sqrt(x) - vd is x, y is output
+		y = _mm_rsqrt_ss(vd);  // estimate
+
+		//  one step NR
+		z = b3v1_5;
+		vd = _mm_mul_ss(vd, b3vHalf);  // vd * 0.5
+		//x2 = vd;
+		vd = _mm_mul_ss(vd, y);  // vd * 0.5 * y0
+		vd = _mm_mul_ss(vd, y);  // vd * 0.5 * y0 * y0
+		z = _mm_sub_ss(z, vd);   // 1.5 - vd * 0.5 * y0 * y0
+
+		y = _mm_mul_ss(y, z);  // y0 * (1.5 - vd * 0.5 * y0 * y0)
+
+		y = b3_splat_ps(y, 0x80);
+		mVec128 = _mm_mul_ps(mVec128, y);
+
+#endif
+
+		return *this;
+#else
+		return *this /= length();
+#endif
+	}
+
+	/**@brief Return a normalized version of this vector */
+	B3_FORCE_INLINE b3Vector3 normalized() const;
+
+	/**@brief Return a rotated version of this vector
+   * @param wAxis The axis to rotate about
+   * @param angle The angle to rotate by */
+	B3_FORCE_INLINE b3Vector3 rotate(const b3Vector3& wAxis, const b3Scalar angle) const;
+
+	/**@brief Return the angle between this and another vector
+   * @param v The other vector */
+	B3_FORCE_INLINE b3Scalar angle(const b3Vector3& v) const
+	{
+		b3Scalar s = b3Sqrt(length2() * v.length2());
+		b3FullAssert(s != b3Scalar(0.0));
+		return b3Acos(dot(v) / s);
+	}
+
+	/**@brief Return a vector will the absolute values of each element */
+	B3_FORCE_INLINE b3Vector3 absolute() const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		return b3MakeVector3(_mm_and_ps(mVec128, b3v3AbsfMask));
+#elif defined(B3_USE_NEON)
+		return b3Vector3(vabsq_f32(mVec128));
+#else
+		return b3MakeVector3(
+			b3Fabs(m_floats[0]),
+			b3Fabs(m_floats[1]),
+			b3Fabs(m_floats[2]));
+#endif
+	}
+
+	/**@brief Return the cross product between this and another vector
+   * @param v The other vector */
+	B3_FORCE_INLINE b3Vector3 cross(const b3Vector3& v) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 T, V;
+
+		T = b3_pshufd_ps(mVec128, B3_SHUFFLE(1, 2, 0, 3));    //	(Y Z X 0)
+		V = b3_pshufd_ps(v.mVec128, B3_SHUFFLE(1, 2, 0, 3));  //	(Y Z X 0)
+
+		V = _mm_mul_ps(V, mVec128);
+		T = _mm_mul_ps(T, v.mVec128);
+		V = _mm_sub_ps(V, T);
+
+		V = b3_pshufd_ps(V, B3_SHUFFLE(1, 2, 0, 3));
+		return b3MakeVector3(V);
+#elif defined(B3_USE_NEON)
+		float32x4_t T, V;
+		// form (Y, Z, X, _) of mVec128 and v.mVec128
+		float32x2_t Tlow = vget_low_f32(mVec128);
+		float32x2_t Vlow = vget_low_f32(v.mVec128);
+		T = vcombine_f32(vext_f32(Tlow, vget_high_f32(mVec128), 1), Tlow);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(v.mVec128), 1), Vlow);
+
+		V = vmulq_f32(V, mVec128);
+		T = vmulq_f32(T, v.mVec128);
+		V = vsubq_f32(V, T);
+		Vlow = vget_low_f32(V);
+		// form (Y, Z, X, _);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(V), 1), Vlow);
+		V = (float32x4_t)vandq_s32((int32x4_t)V, b3vFFF0Mask);
+
+		return b3Vector3(V);
+#else
+		return b3MakeVector3(
+			m_floats[1] * v.m_floats[2] - m_floats[2] * v.m_floats[1],
+			m_floats[2] * v.m_floats[0] - m_floats[0] * v.m_floats[2],
+			m_floats[0] * v.m_floats[1] - m_floats[1] * v.m_floats[0]);
+#endif
+	}
+
+	B3_FORCE_INLINE b3Scalar triple(const b3Vector3& v1, const b3Vector3& v2) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		// cross:
+		__m128 T = _mm_shuffle_ps(v1.mVec128, v1.mVec128, B3_SHUFFLE(1, 2, 0, 3));  //	(Y Z X 0)
+		__m128 V = _mm_shuffle_ps(v2.mVec128, v2.mVec128, B3_SHUFFLE(1, 2, 0, 3));  //	(Y Z X 0)
+
+		V = _mm_mul_ps(V, v1.mVec128);
+		T = _mm_mul_ps(T, v2.mVec128);
+		V = _mm_sub_ps(V, T);
+
+		V = _mm_shuffle_ps(V, V, B3_SHUFFLE(1, 2, 0, 3));
+
+		// dot:
+		V = _mm_mul_ps(V, mVec128);
+		__m128 z = _mm_movehl_ps(V, V);
+		__m128 y = _mm_shuffle_ps(V, V, 0x55);
+		V = _mm_add_ss(V, y);
+		V = _mm_add_ss(V, z);
+		return _mm_cvtss_f32(V);
+
+#elif defined(B3_USE_NEON)
+		// cross:
+		float32x4_t T, V;
+		// form (Y, Z, X, _) of mVec128 and v.mVec128
+		float32x2_t Tlow = vget_low_f32(v1.mVec128);
+		float32x2_t Vlow = vget_low_f32(v2.mVec128);
+		T = vcombine_f32(vext_f32(Tlow, vget_high_f32(v1.mVec128), 1), Tlow);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(v2.mVec128), 1), Vlow);
+
+		V = vmulq_f32(V, v1.mVec128);
+		T = vmulq_f32(T, v2.mVec128);
+		V = vsubq_f32(V, T);
+		Vlow = vget_low_f32(V);
+		// form (Y, Z, X, _);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(V), 1), Vlow);
+
+		// dot:
+		V = vmulq_f32(mVec128, V);
+		float32x2_t x = vpadd_f32(vget_low_f32(V), vget_low_f32(V));
+		x = vadd_f32(x, vget_high_f32(V));
+		return vget_lane_f32(x, 0);
+#else
+		return m_floats[0] * (v1.m_floats[1] * v2.m_floats[2] - v1.m_floats[2] * v2.m_floats[1]) +
+			   m_floats[1] * (v1.m_floats[2] * v2.m_floats[0] - v1.m_floats[0] * v2.m_floats[2]) +
+			   m_floats[2] * (v1.m_floats[0] * v2.m_floats[1] - v1.m_floats[1] * v2.m_floats[0]);
+#endif
+	}
+
+	/**@brief Return the axis with the smallest value
+   * Note return values are 0,1,2 for x, y, or z */
+	B3_FORCE_INLINE int minAxis() const
+	{
+		return m_floats[0] < m_floats[1] ? (m_floats[0] < m_floats[2] ? 0 : 2) : (m_floats[1] < m_floats[2] ? 1 : 2);
+	}
+
+	/**@brief Return the axis with the largest value
+   * Note return values are 0,1,2 for x, y, or z */
+	B3_FORCE_INLINE int maxAxis() const
+	{
+		return m_floats[0] < m_floats[1] ? (m_floats[1] < m_floats[2] ? 2 : 1) : (m_floats[0] < m_floats[2] ? 2 : 0);
+	}
+
+	B3_FORCE_INLINE int furthestAxis() const
+	{
+		return absolute().minAxis();
+	}
+
+	B3_FORCE_INLINE int closestAxis() const
+	{
+		return absolute().maxAxis();
+	}
+
+	B3_FORCE_INLINE void setInterpolate3(const b3Vector3& v0, const b3Vector3& v1, b3Scalar rt)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vrt = _mm_load_ss(&rt);  //	(rt 0 0 0)
+		b3Scalar s = b3Scalar(1.0) - rt;
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = b3_pshufd_ps(vs, 0x80);  //	(S S S 0.0)
+		__m128 r0 = _mm_mul_ps(v0.mVec128, vs);
+		vrt = b3_pshufd_ps(vrt, 0x80);  //	(rt rt rt 0.0)
+		__m128 r1 = _mm_mul_ps(v1.mVec128, vrt);
+		__m128 tmp3 = _mm_add_ps(r0, r1);
+		mVec128 = tmp3;
+#elif defined(B3_USE_NEON)
+		float32x4_t vl = vsubq_f32(v1.mVec128, v0.mVec128);
+		vl = vmulq_n_f32(vl, rt);
+		mVec128 = vaddq_f32(vl, v0.mVec128);
+#else
+		b3Scalar s = b3Scalar(1.0) - rt;
+		m_floats[0] = s * v0.m_floats[0] + rt * v1.m_floats[0];
+		m_floats[1] = s * v0.m_floats[1] + rt * v1.m_floats[1];
+		m_floats[2] = s * v0.m_floats[2] + rt * v1.m_floats[2];
+		//don't do the unused w component
+		//		m_co[3] = s * v0[3] + rt * v1[3];
+#endif
+	}
+
+	/**@brief Return the linear interpolation between this and another vector
+   * @param v The other vector
+   * @param t The ration of this to v (t = 0 => return this, t=1 => return other) */
+	B3_FORCE_INLINE b3Vector3 lerp(const b3Vector3& v, const b3Scalar& t) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		__m128 vt = _mm_load_ss(&t);  //	(t 0 0 0)
+		vt = b3_pshufd_ps(vt, 0x80);  //	(rt rt rt 0.0)
+		__m128 vl = _mm_sub_ps(v.mVec128, mVec128);
+		vl = _mm_mul_ps(vl, vt);
+		vl = _mm_add_ps(vl, mVec128);
+
+		return b3MakeVector3(vl);
+#elif defined(B3_USE_NEON)
+		float32x4_t vl = vsubq_f32(v.mVec128, mVec128);
+		vl = vmulq_n_f32(vl, t);
+		vl = vaddq_f32(vl, mVec128);
+
+		return b3Vector3(vl);
+#else
+		return b3MakeVector3(m_floats[0] + (v.m_floats[0] - m_floats[0]) * t,
+							 m_floats[1] + (v.m_floats[1] - m_floats[1]) * t,
+							 m_floats[2] + (v.m_floats[2] - m_floats[2]) * t);
+#endif
+	}
+
+	/**@brief Elementwise multiply this vector by the other
+   * @param v The other vector */
+	B3_FORCE_INLINE b3Vector3& operator*=(const b3Vector3& v)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = _mm_mul_ps(mVec128, v.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vmulq_f32(mVec128, v.mVec128);
+#else
+		m_floats[0] *= v.m_floats[0];
+		m_floats[1] *= v.m_floats[1];
+		m_floats[2] *= v.m_floats[2];
+#endif
+		return *this;
+	}
+
+	/**@brief Return the x value */
+	B3_FORCE_INLINE const b3Scalar& getX() const { return m_floats[0]; }
+	/**@brief Return the y value */
+	B3_FORCE_INLINE const b3Scalar& getY() const { return m_floats[1]; }
+	/**@brief Return the z value */
+	B3_FORCE_INLINE const b3Scalar& getZ() const { return m_floats[2]; }
+	/**@brief Return the w value */
+	B3_FORCE_INLINE const b3Scalar& getW() const { return m_floats[3]; }
+
+	/**@brief Set the x value */
+	B3_FORCE_INLINE void setX(b3Scalar _x) { m_floats[0] = _x; };
+	/**@brief Set the y value */
+	B3_FORCE_INLINE void setY(b3Scalar _y) { m_floats[1] = _y; };
+	/**@brief Set the z value */
+	B3_FORCE_INLINE void setZ(b3Scalar _z) { m_floats[2] = _z; };
+	/**@brief Set the w value */
+	B3_FORCE_INLINE void setW(b3Scalar _w) { m_floats[3] = _w; };
+
+	//B3_FORCE_INLINE b3Scalar&       operator[](int i)       { return (&m_floats[0])[i];	}
+	//B3_FORCE_INLINE const b3Scalar& operator[](int i) const { return (&m_floats[0])[i]; }
+	///operator b3Scalar*() replaces operator[], using implicit conversion. We added operator != and operator == to avoid pointer comparisons.
+	B3_FORCE_INLINE operator b3Scalar*() { return &m_floats[0]; }
+	B3_FORCE_INLINE operator const b3Scalar*() const { return &m_floats[0]; }
+
+	B3_FORCE_INLINE bool operator==(const b3Vector3& other) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		return (0xf == _mm_movemask_ps((__m128)_mm_cmpeq_ps(mVec128, other.mVec128)));
+#else
+		return ((m_floats[3] == other.m_floats[3]) &&
+				(m_floats[2] == other.m_floats[2]) &&
+				(m_floats[1] == other.m_floats[1]) &&
+				(m_floats[0] == other.m_floats[0]));
+#endif
+	}
+
+	B3_FORCE_INLINE bool operator!=(const b3Vector3& other) const
+	{
+		return !(*this == other);
+	}
+
+	/**@brief Set each element to the max of the current values and the values of another b3Vector3
+   * @param other The other b3Vector3 to compare with
+   */
+	B3_FORCE_INLINE void setMax(const b3Vector3& other)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = _mm_max_ps(mVec128, other.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vmaxq_f32(mVec128, other.mVec128);
+#else
+		b3SetMax(m_floats[0], other.m_floats[0]);
+		b3SetMax(m_floats[1], other.m_floats[1]);
+		b3SetMax(m_floats[2], other.m_floats[2]);
+		b3SetMax(m_floats[3], other.m_floats[3]);
+#endif
+	}
+
+	/**@brief Set each element to the min of the current values and the values of another b3Vector3
+   * @param other The other b3Vector3 to compare with
+   */
+	B3_FORCE_INLINE void setMin(const b3Vector3& other)
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = _mm_min_ps(mVec128, other.mVec128);
+#elif defined(B3_USE_NEON)
+		mVec128 = vminq_f32(mVec128, other.mVec128);
+#else
+		b3SetMin(m_floats[0], other.m_floats[0]);
+		b3SetMin(m_floats[1], other.m_floats[1]);
+		b3SetMin(m_floats[2], other.m_floats[2]);
+		b3SetMin(m_floats[3], other.m_floats[3]);
+#endif
+	}
+
+	B3_FORCE_INLINE void setValue(const b3Scalar& _x, const b3Scalar& _y, const b3Scalar& _z)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = b3Scalar(0.f);
+	}
+
+	void getSkewSymmetricMatrix(b3Vector3 * v0, b3Vector3 * v1, b3Vector3 * v2) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+
+		__m128 V = _mm_and_ps(mVec128, b3vFFF0fMask);
+		__m128 V0 = _mm_xor_ps(b3vMzeroMask, V);
+		__m128 V2 = _mm_movelh_ps(V0, V);
+
+		__m128 V1 = _mm_shuffle_ps(V, V0, 0xCE);
+
+		V0 = _mm_shuffle_ps(V0, V, 0xDB);
+		V2 = _mm_shuffle_ps(V2, V, 0xF9);
+
+		v0->mVec128 = V0;
+		v1->mVec128 = V1;
+		v2->mVec128 = V2;
+#else
+		v0->setValue(0., -getZ(), getY());
+		v1->setValue(getZ(), 0., -getX());
+		v2->setValue(-getY(), getX(), 0.);
+#endif
+	}
+
+	void setZero()
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		mVec128 = (__m128)_mm_xor_ps(mVec128, mVec128);
+#elif defined(B3_USE_NEON)
+		int32x4_t vi = vdupq_n_s32(0);
+		mVec128 = vreinterpretq_f32_s32(vi);
+#else
+		setValue(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+#endif
+	}
+
+	B3_FORCE_INLINE bool isZero() const
+	{
+		return m_floats[0] == b3Scalar(0) && m_floats[1] == b3Scalar(0) && m_floats[2] == b3Scalar(0);
+	}
+
+	B3_FORCE_INLINE bool fuzzyZero() const
+	{
+		return length2() < B3_EPSILON;
+	}
+
+	B3_FORCE_INLINE void serialize(struct b3Vector3Data & dataOut) const;
+
+	B3_FORCE_INLINE void deSerialize(const struct b3Vector3Data& dataIn);
+
+	B3_FORCE_INLINE void serializeFloat(struct b3Vector3FloatData & dataOut) const;
+
+	B3_FORCE_INLINE void deSerializeFloat(const struct b3Vector3FloatData& dataIn);
+
+	B3_FORCE_INLINE void serializeDouble(struct b3Vector3DoubleData & dataOut) const;
+
+	B3_FORCE_INLINE void deSerializeDouble(const struct b3Vector3DoubleData& dataIn);
+
+	/**@brief returns index of maximum dot product between this and vectors in array[]
+         * @param array The other vectors
+         * @param array_count The number of other vectors
+         * @param dotOut The maximum dot product */
+	B3_FORCE_INLINE long maxDot(const b3Vector3* array, long array_count, b3Scalar& dotOut) const;
+
+	/**@brief returns index of minimum dot product between this and vectors in array[]
+         * @param array The other vectors
+         * @param array_count The number of other vectors
+         * @param dotOut The minimum dot product */
+	B3_FORCE_INLINE long minDot(const b3Vector3* array, long array_count, b3Scalar& dotOut) const;
+
+	/* create a vector as  b3Vector3( this->dot( b3Vector3 v0 ), this->dot( b3Vector3 v1), this->dot( b3Vector3 v2 ))  */
+	B3_FORCE_INLINE b3Vector3 dot3(const b3Vector3& v0, const b3Vector3& v1, const b3Vector3& v2) const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+
+		__m128 a0 = _mm_mul_ps(v0.mVec128, this->mVec128);
+		__m128 a1 = _mm_mul_ps(v1.mVec128, this->mVec128);
+		__m128 a2 = _mm_mul_ps(v2.mVec128, this->mVec128);
+		__m128 b0 = _mm_unpacklo_ps(a0, a1);
+		__m128 b1 = _mm_unpackhi_ps(a0, a1);
+		__m128 b2 = _mm_unpacklo_ps(a2, _mm_setzero_ps());
+		__m128 r = _mm_movelh_ps(b0, b2);
+		r = _mm_add_ps(r, _mm_movehl_ps(b2, b0));
+		a2 = _mm_and_ps(a2, b3vxyzMaskf);
+		r = _mm_add_ps(r, b3CastdTo128f(_mm_move_sd(b3CastfTo128d(a2), b3CastfTo128d(b1))));
+		return b3MakeVector3(r);
+
+#elif defined(B3_USE_NEON)
+		static const uint32x4_t xyzMask = (const uint32x4_t){-1, -1, -1, 0};
+		float32x4_t a0 = vmulq_f32(v0.mVec128, this->mVec128);
+		float32x4_t a1 = vmulq_f32(v1.mVec128, this->mVec128);
+		float32x4_t a2 = vmulq_f32(v2.mVec128, this->mVec128);
+		float32x2x2_t zLo = vtrn_f32(vget_high_f32(a0), vget_high_f32(a1));
+		a2 = (float32x4_t)vandq_u32((uint32x4_t)a2, xyzMask);
+		float32x2_t b0 = vadd_f32(vpadd_f32(vget_low_f32(a0), vget_low_f32(a1)), zLo.val[0]);
+		float32x2_t b1 = vpadd_f32(vpadd_f32(vget_low_f32(a2), vget_high_f32(a2)), vdup_n_f32(0.0f));
+		return b3Vector3(vcombine_f32(b0, b1));
+#else
+		return b3MakeVector3(dot(v0), dot(v1), dot(v2));
+#endif
+	}
+};
+
+/**@brief Return the sum of two vectors (Point symantics)*/
+B3_FORCE_INLINE b3Vector3
+operator+(const b3Vector3& v1, const b3Vector3& v2)
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	return b3MakeVector3(_mm_add_ps(v1.mVec128, v2.mVec128));
+#elif defined(B3_USE_NEON)
+	return b3MakeVector3(vaddq_f32(v1.mVec128, v2.mVec128));
+#else
+	return b3MakeVector3(
+		v1.m_floats[0] + v2.m_floats[0],
+		v1.m_floats[1] + v2.m_floats[1],
+		v1.m_floats[2] + v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the elementwise product of two vectors */
+B3_FORCE_INLINE b3Vector3
+operator*(const b3Vector3& v1, const b3Vector3& v2)
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	return b3MakeVector3(_mm_mul_ps(v1.mVec128, v2.mVec128));
+#elif defined(B3_USE_NEON)
+	return b3MakeVector3(vmulq_f32(v1.mVec128, v2.mVec128));
+#else
+	return b3MakeVector3(
+		v1.m_floats[0] * v2.m_floats[0],
+		v1.m_floats[1] * v2.m_floats[1],
+		v1.m_floats[2] * v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the difference between two vectors */
+B3_FORCE_INLINE b3Vector3
+operator-(const b3Vector3& v1, const b3Vector3& v2)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+
+	//	without _mm_and_ps this code causes slowdown in Concave moving
+	__m128 r = _mm_sub_ps(v1.mVec128, v2.mVec128);
+	return b3MakeVector3(_mm_and_ps(r, b3vFFF0fMask));
+#elif defined(B3_USE_NEON)
+	float32x4_t r = vsubq_f32(v1.mVec128, v2.mVec128);
+	return b3MakeVector3((float32x4_t)vandq_s32((int32x4_t)r, b3vFFF0Mask));
+#else
+	return b3MakeVector3(
+		v1.m_floats[0] - v2.m_floats[0],
+		v1.m_floats[1] - v2.m_floats[1],
+		v1.m_floats[2] - v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the negative of the vector */
+B3_FORCE_INLINE b3Vector3
+operator-(const b3Vector3& v)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+	__m128 r = _mm_xor_ps(v.mVec128, b3vMzeroMask);
+	return b3MakeVector3(_mm_and_ps(r, b3vFFF0fMask));
+#elif defined(B3_USE_NEON)
+	return b3MakeVector3((b3SimdFloat4)veorq_s32((int32x4_t)v.mVec128, (int32x4_t)b3vMzeroMask));
+#else
+	return b3MakeVector3(-v.m_floats[0], -v.m_floats[1], -v.m_floats[2]);
+#endif
+}
+
+/**@brief Return the vector scaled by s */
+B3_FORCE_INLINE b3Vector3
+operator*(const b3Vector3& v, const b3Scalar& s)
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+	vs = b3_pshufd_ps(vs, 0x80);  //	(S S S 0.0)
+	return b3MakeVector3(_mm_mul_ps(v.mVec128, vs));
+#elif defined(B3_USE_NEON)
+	float32x4_t r = vmulq_n_f32(v.mVec128, s);
+	return b3MakeVector3((float32x4_t)vandq_s32((int32x4_t)r, b3vFFF0Mask));
+#else
+	return b3MakeVector3(v.m_floats[0] * s, v.m_floats[1] * s, v.m_floats[2] * s);
+#endif
+}
+
+/**@brief Return the vector scaled by s */
+B3_FORCE_INLINE b3Vector3
+operator*(const b3Scalar& s, const b3Vector3& v)
+{
+	return v * s;
+}
+
+/**@brief Return the vector inversely scaled by s */
+B3_FORCE_INLINE b3Vector3
+operator/(const b3Vector3& v, const b3Scalar& s)
+{
+	b3FullAssert(s != b3Scalar(0.0));
+#if 0  //defined(B3_USE_SSE_IN_API)
+// this code is not faster !
+	__m128 vs = _mm_load_ss(&s);
+    vs = _mm_div_ss(b3v1110, vs);
+	vs = b3_pshufd_ps(vs, 0x00);	//	(S S S S)
+
+	return b3Vector3(_mm_mul_ps(v.mVec128, vs));
+#else
+	return v * (b3Scalar(1.0) / s);
+#endif
+}
+
+/**@brief Return the vector inversely scaled by s */
+B3_FORCE_INLINE b3Vector3
+operator/(const b3Vector3& v1, const b3Vector3& v2)
+{
+#if (defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE))
+	__m128 vec = _mm_div_ps(v1.mVec128, v2.mVec128);
+	vec = _mm_and_ps(vec, b3vFFF0fMask);
+	return b3MakeVector3(vec);
+#elif defined(B3_USE_NEON)
+	float32x4_t x, y, v, m;
+
+	x = v1.mVec128;
+	y = v2.mVec128;
+
+	v = vrecpeq_f32(y);     // v ~ 1/y
+	m = vrecpsq_f32(y, v);  // m = (2-v*y)
+	v = vmulq_f32(v, m);    // vv = v*m ~~ 1/y
+	m = vrecpsq_f32(y, v);  // mm = (2-vv*y)
+	v = vmulq_f32(v, x);    // x*vv
+	v = vmulq_f32(v, m);    // (x*vv)*(2-vv*y) = x*(vv(2-vv*y)) ~~~ x/y
+
+	return b3Vector3(v);
+#else
+	return b3MakeVector3(
+		v1.m_floats[0] / v2.m_floats[0],
+		v1.m_floats[1] / v2.m_floats[1],
+		v1.m_floats[2] / v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the dot product between two vectors */
+B3_FORCE_INLINE b3Scalar
+b3Dot(const b3Vector3& v1, const b3Vector3& v2)
+{
+	return v1.dot(v2);
+}
+
+/**@brief Return the distance squared between two vectors */
+B3_FORCE_INLINE b3Scalar
+b3Distance2(const b3Vector3& v1, const b3Vector3& v2)
+{
+	return v1.distance2(v2);
+}
+
+/**@brief Return the distance between two vectors */
+B3_FORCE_INLINE b3Scalar
+b3Distance(const b3Vector3& v1, const b3Vector3& v2)
+{
+	return v1.distance(v2);
+}
+
+/**@brief Return the angle between two vectors */
+B3_FORCE_INLINE b3Scalar
+b3Angle(const b3Vector3& v1, const b3Vector3& v2)
+{
+	return v1.angle(v2);
+}
+
+/**@brief Return the cross product of two vectors */
+B3_FORCE_INLINE b3Vector3
+b3Cross(const b3Vector3& v1, const b3Vector3& v2)
+{
+	return v1.cross(v2);
+}
+
+B3_FORCE_INLINE b3Scalar
+b3Triple(const b3Vector3& v1, const b3Vector3& v2, const b3Vector3& v3)
+{
+	return v1.triple(v2, v3);
+}
+
+/**@brief Return the linear interpolation between two vectors
+ * @param v1 One vector
+ * @param v2 The other vector
+ * @param t The ration of this to v (t = 0 => return v1, t=1 => return v2) */
+B3_FORCE_INLINE b3Vector3
+b3Lerp(const b3Vector3& v1, const b3Vector3& v2, const b3Scalar& t)
+{
+	return v1.lerp(v2, t);
+}
+
+B3_FORCE_INLINE b3Scalar b3Vector3::distance2(const b3Vector3& v) const
+{
+	return (v - *this).length2();
+}
+
+B3_FORCE_INLINE b3Scalar b3Vector3::distance(const b3Vector3& v) const
+{
+	return (v - *this).length();
+}
+
+B3_FORCE_INLINE b3Vector3 b3Vector3::normalized() const
+{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+	b3Vector3 norm = *this;
+
+	return norm.normalize();
+#else
+	return *this / length();
+#endif
+}
+
+B3_FORCE_INLINE b3Vector3 b3Vector3::rotate(const b3Vector3& wAxis, const b3Scalar _angle) const
+{
+	// wAxis must be a unit lenght vector
+
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+
+	__m128 O = _mm_mul_ps(wAxis.mVec128, mVec128);
+	b3Scalar ssin = b3Sin(_angle);
+	__m128 C = wAxis.cross(b3MakeVector3(mVec128)).mVec128;
+	O = _mm_and_ps(O, b3vFFF0fMask);
+	b3Scalar scos = b3Cos(_angle);
+
+	__m128 vsin = _mm_load_ss(&ssin);  //	(S 0 0 0)
+	__m128 vcos = _mm_load_ss(&scos);  //	(S 0 0 0)
+
+	__m128 Y = b3_pshufd_ps(O, 0xC9);  //	(Y Z X 0)
+	__m128 Z = b3_pshufd_ps(O, 0xD2);  //	(Z X Y 0)
+	O = _mm_add_ps(O, Y);
+	vsin = b3_pshufd_ps(vsin, 0x80);  //	(S S S 0)
+	O = _mm_add_ps(O, Z);
+	vcos = b3_pshufd_ps(vcos, 0x80);  //	(S S S 0)
+
+	vsin = vsin * C;
+	O = O * wAxis.mVec128;
+	__m128 X = mVec128 - O;
+
+	O = O + vsin;
+	vcos = vcos * X;
+	O = O + vcos;
+
+	return b3MakeVector3(O);
+#else
+	b3Vector3 o = wAxis * wAxis.dot(*this);
+	b3Vector3 _x = *this - o;
+	b3Vector3 _y;
+
+	_y = wAxis.cross(*this);
+
+	return (o + _x * b3Cos(_angle) + _y * b3Sin(_angle));
+#endif
+}
+
+B3_FORCE_INLINE long b3Vector3::maxDot(const b3Vector3* array, long array_count, b3Scalar& dotOut) const
+{
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+#if defined _WIN32 || defined(B3_USE_SSE)
+	const long scalar_cutoff = 10;
+	long b3_maxdot_large(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#elif defined B3_USE_NEON
+	const long scalar_cutoff = 4;
+	extern long (*_maxdot_large)(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#endif
+	if (array_count < scalar_cutoff)
+#else
+
+#endif  //B3_USE_SSE || B3_USE_NEON
+	{
+		b3Scalar maxDot = -B3_INFINITY;
+		int i = 0;
+		int ptIndex = -1;
+		for (i = 0; i < array_count; i++)
+		{
+			b3Scalar dot = array[i].dot(*this);
+
+			if (dot > maxDot)
+			{
+				maxDot = dot;
+				ptIndex = i;
+			}
+		}
+
+		b3Assert(ptIndex >= 0);
+		if (ptIndex < 0)
+		{
+			ptIndex = 0;
+		}
+		dotOut = maxDot;
+		return ptIndex;
+	}
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+	return b3_maxdot_large((float*)array, (float*)&m_floats[0], array_count, &dotOut);
+#endif
+}
+
+B3_FORCE_INLINE long b3Vector3::minDot(const b3Vector3* array, long array_count, b3Scalar& dotOut) const
+{
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+#if defined B3_USE_SSE
+	const long scalar_cutoff = 10;
+	long b3_mindot_large(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#elif defined B3_USE_NEON
+	const long scalar_cutoff = 4;
+	extern long (*b3_mindot_large)(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#else
+#error unhandled arch!
+#endif
+
+	if (array_count < scalar_cutoff)
+#endif  //B3_USE_SSE || B3_USE_NEON
+	{
+		b3Scalar minDot = B3_INFINITY;
+		int i = 0;
+		int ptIndex = -1;
+
+		for (i = 0; i < array_count; i++)
+		{
+			b3Scalar dot = array[i].dot(*this);
+
+			if (dot < minDot)
+			{
+				minDot = dot;
+				ptIndex = i;
+			}
+		}
+
+		dotOut = minDot;
+
+		return ptIndex;
+	}
+#if defined(B3_USE_SSE) || defined(B3_USE_NEON)
+	return b3_mindot_large((float*)array, (float*)&m_floats[0], array_count, &dotOut);
+#endif
+}
+
+class b3Vector4 : public b3Vector3
+{
+public:
+	B3_FORCE_INLINE b3Vector4 absolute4() const
+	{
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+		return b3MakeVector4(_mm_and_ps(mVec128, b3vAbsfMask));
+#elif defined(B3_USE_NEON)
+		return b3Vector4(vabsq_f32(mVec128));
+#else
+		return b3MakeVector4(
+			b3Fabs(m_floats[0]),
+			b3Fabs(m_floats[1]),
+			b3Fabs(m_floats[2]),
+			b3Fabs(m_floats[3]));
+#endif
+	}
+
+	b3Scalar getW() const { return m_floats[3]; }
+
+	B3_FORCE_INLINE int maxAxis4() const
+	{
+		int maxIndex = -1;
+		b3Scalar maxVal = b3Scalar(-B3_LARGE_FLOAT);
+		if (m_floats[0] > maxVal)
+		{
+			maxIndex = 0;
+			maxVal = m_floats[0];
+		}
+		if (m_floats[1] > maxVal)
+		{
+			maxIndex = 1;
+			maxVal = m_floats[1];
+		}
+		if (m_floats[2] > maxVal)
+		{
+			maxIndex = 2;
+			maxVal = m_floats[2];
+		}
+		if (m_floats[3] > maxVal)
+		{
+			maxIndex = 3;
+		}
+
+		return maxIndex;
+	}
+
+	B3_FORCE_INLINE int minAxis4() const
+	{
+		int minIndex = -1;
+		b3Scalar minVal = b3Scalar(B3_LARGE_FLOAT);
+		if (m_floats[0] < minVal)
+		{
+			minIndex = 0;
+			minVal = m_floats[0];
+		}
+		if (m_floats[1] < minVal)
+		{
+			minIndex = 1;
+			minVal = m_floats[1];
+		}
+		if (m_floats[2] < minVal)
+		{
+			minIndex = 2;
+			minVal = m_floats[2];
+		}
+		if (m_floats[3] < minVal)
+		{
+			minIndex = 3;
+			minVal = m_floats[3];
+		}
+
+		return minIndex;
+	}
+
+	B3_FORCE_INLINE int closestAxis4() const
+	{
+		return absolute4().maxAxis4();
+	}
+
+	/**@brief Set x,y,z and zero w
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   */
+
+	/*		void getValue(b3Scalar *m) const
+		{
+			m[0] = m_floats[0];
+			m[1] = m_floats[1];
+			m[2] =m_floats[2];
+		}
+*/
+	/**@brief Set the values
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   * @param w Value of w
+   */
+	B3_FORCE_INLINE void setValue(const b3Scalar& _x, const b3Scalar& _y, const b3Scalar& _z, const b3Scalar& _w)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = _w;
+	}
+};
+
+///b3SwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+B3_FORCE_INLINE void b3SwapScalarEndian(const b3Scalar& sourceVal, b3Scalar& destVal)
+{
+#ifdef B3_USE_DOUBLE_PRECISION
+	unsigned char* dest = (unsigned char*)&destVal;
+	unsigned char* src = (unsigned char*)&sourceVal;
+	dest[0] = src[7];
+	dest[1] = src[6];
+	dest[2] = src[5];
+	dest[3] = src[4];
+	dest[4] = src[3];
+	dest[5] = src[2];
+	dest[6] = src[1];
+	dest[7] = src[0];
+#else
+	unsigned char* dest = (unsigned char*)&destVal;
+	unsigned char* src = (unsigned char*)&sourceVal;
+	dest[0] = src[3];
+	dest[1] = src[2];
+	dest[2] = src[1];
+	dest[3] = src[0];
+#endif  //B3_USE_DOUBLE_PRECISION
+}
+///b3SwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+B3_FORCE_INLINE void b3SwapVector3Endian(const b3Vector3& sourceVec, b3Vector3& destVec)
+{
+	for (int i = 0; i < 4; i++)
+	{
+		b3SwapScalarEndian(sourceVec[i], destVec[i]);
+	}
+}
+
+///b3UnSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+B3_FORCE_INLINE void b3UnSwapVector3Endian(b3Vector3& vector)
+{
+	b3Vector3 swappedVec;
+	for (int i = 0; i < 4; i++)
+	{
+		b3SwapScalarEndian(vector[i], swappedVec[i]);
+	}
+	vector = swappedVec;
+}
+
+template <class T>
+B3_FORCE_INLINE void b3PlaneSpace1(const T& n, T& p, T& q)
+{
+	if (b3Fabs(n[2]) > B3_SQRT12)
+	{
+		// choose p in y-z plane
+		b3Scalar a = n[1] * n[1] + n[2] * n[2];
+		b3Scalar k = b3RecipSqrt(a);
+		p[0] = 0;
+		p[1] = -n[2] * k;
+		p[2] = n[1] * k;
+		// set q = n x p
+		q[0] = a * k;
+		q[1] = -n[0] * p[2];
+		q[2] = n[0] * p[1];
+	}
+	else
+	{
+		// choose p in x-y plane
+		b3Scalar a = n[0] * n[0] + n[1] * n[1];
+		b3Scalar k = b3RecipSqrt(a);
+		p[0] = -n[1] * k;
+		p[1] = n[0] * k;
+		p[2] = 0;
+		// set q = n x p
+		q[0] = -n[2] * p[1];
+		q[1] = n[2] * p[0];
+		q[2] = a * k;
+	}
+}
+
+struct b3Vector3FloatData
+{
+	float m_floats[4];
+};
+
+struct b3Vector3DoubleData
+{
+	double m_floats[4];
+};
+
+B3_FORCE_INLINE void b3Vector3::serializeFloat(struct b3Vector3FloatData& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = float(m_floats[i]);
+}
+
+B3_FORCE_INLINE void b3Vector3::deSerializeFloat(const struct b3Vector3FloatData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = b3Scalar(dataIn.m_floats[i]);
+}
+
+B3_FORCE_INLINE void b3Vector3::serializeDouble(struct b3Vector3DoubleData& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = double(m_floats[i]);
+}
+
+B3_FORCE_INLINE void b3Vector3::deSerializeDouble(const struct b3Vector3DoubleData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = b3Scalar(dataIn.m_floats[i]);
+}
+
+B3_FORCE_INLINE void b3Vector3::serialize(struct b3Vector3Data& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = m_floats[i];
+}
+
+B3_FORCE_INLINE void b3Vector3::deSerialize(const struct b3Vector3Data& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = dataIn.m_floats[i];
+}
+
+inline b3Vector3 b3MakeVector3(b3Scalar x, b3Scalar y, b3Scalar z)
+{
+	b3Vector3 tmp;
+	tmp.setValue(x, y, z);
+	return tmp;
+}
+
+inline b3Vector3 b3MakeVector3(b3Scalar x, b3Scalar y, b3Scalar z, b3Scalar w)
+{
+	b3Vector3 tmp;
+	tmp.setValue(x, y, z);
+	tmp.w = w;
+	return tmp;
+}
+
+inline b3Vector4 b3MakeVector4(b3Scalar x, b3Scalar y, b3Scalar z, b3Scalar w)
+{
+	b3Vector4 tmp;
+	tmp.setValue(x, y, z, w);
+	return tmp;
+}
+
+#if defined(B3_USE_SSE_IN_API) && defined(B3_USE_SSE)
+
+inline b3Vector3 b3MakeVector3(b3SimdFloat4 v)
+{
+	b3Vector3 tmp;
+	tmp.set128(v);
+	return tmp;
+}
+
+inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec)
+{
+	b3Vector4 tmp;
+	tmp.set128(vec);
+	return tmp;
+}
+
+#endif
+
+#endif  //B3_VECTOR3_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/premake4.lua b/dali-physics/third-party/bullet3/src/Bullet3Common/premake4.lua
new file mode 100644
index 0000000..f03573e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/premake4.lua
@@ -0,0 +1,16 @@
+	project "Bullet3Common"
+
+	language "C++"
+				
+	kind "StaticLib"
+		
+	if os.is("Linux") then
+	    buildoptions{"-fPIC"}
+	end
+
+	includedirs {".."}
+
+	files {
+		"*.cpp",
+		"*.h"
+	}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Float4.h b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Float4.h
new file mode 100644
index 0000000..d8a9f47
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Float4.h
@@ -0,0 +1,90 @@
+#ifndef B3_FLOAT4_H
+#define B3_FLOAT4_H
+
+#include "Bullet3Common/shared/b3PlatformDefinitions.h"
+
+#ifdef __cplusplus
+#include "Bullet3Common/b3Vector3.h"
+#define b3Float4 b3Vector3
+#define b3Float4ConstArg const b3Vector3&
+#define b3Dot3F4 b3Dot
+#define b3Cross3 b3Cross
+#define b3MakeFloat4 b3MakeVector3
+inline b3Vector3 b3Normalized(const b3Vector3& vec)
+{
+	return vec.normalized();
+}
+
+inline b3Float4 b3FastNormalized3(b3Float4ConstArg v)
+{
+	return v.normalized();
+}
+
+inline b3Float4 b3MaxFloat4(const b3Float4& a, const b3Float4& b)
+{
+	b3Float4 tmp = a;
+	tmp.setMax(b);
+	return tmp;
+}
+inline b3Float4 b3MinFloat4(const b3Float4& a, const b3Float4& b)
+{
+	b3Float4 tmp = a;
+	tmp.setMin(b);
+	return tmp;
+}
+
+#else
+typedef float4 b3Float4;
+#define b3Float4ConstArg const b3Float4
+#define b3MakeFloat4 (float4)
+float b3Dot3F4(b3Float4ConstArg v0, b3Float4ConstArg v1)
+{
+	float4 a1 = b3MakeFloat4(v0.xyz, 0.f);
+	float4 b1 = b3MakeFloat4(v1.xyz, 0.f);
+	return dot(a1, b1);
+}
+b3Float4 b3Cross3(b3Float4ConstArg v0, b3Float4ConstArg v1)
+{
+	float4 a1 = b3MakeFloat4(v0.xyz, 0.f);
+	float4 b1 = b3MakeFloat4(v1.xyz, 0.f);
+	return cross(a1, b1);
+}
+#define b3MinFloat4 min
+#define b3MaxFloat4 max
+
+#define b3Normalized(a) normalize(a)
+
+#endif
+
+inline bool b3IsAlmostZero(b3Float4ConstArg v)
+{
+	if (b3Fabs(v.x) > 1e-6 || b3Fabs(v.y) > 1e-6 || b3Fabs(v.z) > 1e-6)
+		return false;
+	return true;
+}
+
+inline int b3MaxDot(b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut)
+{
+	float maxDot = -B3_INFINITY;
+	int i = 0;
+	int ptIndex = -1;
+	for (i = 0; i < vecLen; i++)
+	{
+		float dot = b3Dot3F4(vecArray[i], vec);
+
+		if (dot > maxDot)
+		{
+			maxDot = dot;
+			ptIndex = i;
+		}
+	}
+	b3Assert(ptIndex >= 0);
+	if (ptIndex < 0)
+	{
+		ptIndex = 0;
+	}
+	*dotOut = maxDot;
+	return ptIndex;
+}
+
+#endif  //B3_FLOAT4_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Int2.h b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Int2.h
new file mode 100644
index 0000000..7b84de4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Int2.h
@@ -0,0 +1,63 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_INT2_H
+#define B3_INT2_H
+
+#ifdef __cplusplus
+
+struct b3UnsignedInt2
+{
+	union {
+		struct
+		{
+			unsigned int x, y;
+		};
+		struct
+		{
+			unsigned int s[2];
+		};
+	};
+};
+
+struct b3Int2
+{
+	union {
+		struct
+		{
+			int x, y;
+		};
+		struct
+		{
+			int s[2];
+		};
+	};
+};
+
+inline b3Int2 b3MakeInt2(int x, int y)
+{
+	b3Int2 v;
+	v.s[0] = x;
+	v.s[1] = y;
+	return v;
+}
+#else
+
+#define b3UnsignedInt2 uint2
+#define b3Int2 int2
+#define b3MakeInt2 (int2)
+
+#endif  //__cplusplus
+#endif
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Int4.h b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Int4.h
new file mode 100644
index 0000000..f6a1754
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Int4.h
@@ -0,0 +1,71 @@
+#ifndef B3_INT4_H
+#define B3_INT4_H
+
+#ifdef __cplusplus
+
+#include "Bullet3Common/b3Scalar.h"
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3UnsignedInt4
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	union {
+		struct
+		{
+			unsigned int x, y, z, w;
+		};
+		struct
+		{
+			unsigned int s[4];
+		};
+	};
+};
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3Int4
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	union {
+		struct
+		{
+			int x, y, z, w;
+		};
+		struct
+		{
+			int s[4];
+		};
+	};
+};
+
+B3_FORCE_INLINE b3Int4 b3MakeInt4(int x, int y, int z, int w = 0)
+{
+	b3Int4 v;
+	v.s[0] = x;
+	v.s[1] = y;
+	v.s[2] = z;
+	v.s[3] = w;
+	return v;
+}
+
+B3_FORCE_INLINE b3UnsignedInt4 b3MakeUnsignedInt4(unsigned int x, unsigned int y, unsigned int z, unsigned int w = 0)
+{
+	b3UnsignedInt4 v;
+	v.s[0] = x;
+	v.s[1] = y;
+	v.s[2] = z;
+	v.s[3] = w;
+	return v;
+}
+
+#else
+
+#define b3UnsignedInt4 uint4
+#define b3Int4 int4
+#define b3MakeInt4 (int4)
+#define b3MakeUnsignedInt4 (uint4)
+
+#endif  //__cplusplus
+
+#endif  //B3_INT4_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Mat3x3.h b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Mat3x3.h
new file mode 100644
index 0000000..ce6482b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Mat3x3.h
@@ -0,0 +1,157 @@
+
+#ifndef B3_MAT3x3_H
+#define B3_MAT3x3_H
+
+#include "Bullet3Common/shared/b3Quat.h"
+
+#ifdef __cplusplus
+
+#include "Bullet3Common/b3Matrix3x3.h"
+
+#define b3Mat3x3 b3Matrix3x3
+#define b3Mat3x3ConstArg const b3Matrix3x3&
+
+inline b3Mat3x3 b3QuatGetRotationMatrix(b3QuatConstArg quat)
+{
+	return b3Mat3x3(quat);
+}
+
+inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg mat)
+{
+	return mat.absolute();
+}
+
+#define b3GetRow(m, row) m.getRow(row)
+
+__inline b3Float4 mtMul3(b3Float4ConstArg a, b3Mat3x3ConstArg b)
+{
+	return b * a;
+}
+
+#else
+
+typedef struct
+{
+	b3Float4 m_row[3];
+} b3Mat3x3;
+
+#define b3Mat3x3ConstArg const b3Mat3x3
+#define b3GetRow(m, row) (m.m_row[row])
+
+inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)
+{
+	b3Float4 quat2 = (b3Float4)(quat.x * quat.x, quat.y * quat.y, quat.z * quat.z, 0.f);
+	b3Mat3x3 out;
+
+	out.m_row[0].x = 1 - 2 * quat2.y - 2 * quat2.z;
+	out.m_row[0].y = 2 * quat.x * quat.y - 2 * quat.w * quat.z;
+	out.m_row[0].z = 2 * quat.x * quat.z + 2 * quat.w * quat.y;
+	out.m_row[0].w = 0.f;
+
+	out.m_row[1].x = 2 * quat.x * quat.y + 2 * quat.w * quat.z;
+	out.m_row[1].y = 1 - 2 * quat2.x - 2 * quat2.z;
+	out.m_row[1].z = 2 * quat.y * quat.z - 2 * quat.w * quat.x;
+	out.m_row[1].w = 0.f;
+
+	out.m_row[2].x = 2 * quat.x * quat.z - 2 * quat.w * quat.y;
+	out.m_row[2].y = 2 * quat.y * quat.z + 2 * quat.w * quat.x;
+	out.m_row[2].z = 1 - 2 * quat2.x - 2 * quat2.y;
+	out.m_row[2].w = 0.f;
+
+	return out;
+}
+
+inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)
+{
+	b3Mat3x3 out;
+	out.m_row[0] = fabs(matIn.m_row[0]);
+	out.m_row[1] = fabs(matIn.m_row[1]);
+	out.m_row[2] = fabs(matIn.m_row[2]);
+	return out;
+}
+
+__inline b3Mat3x3 mtZero();
+
+__inline b3Mat3x3 mtIdentity();
+
+__inline b3Mat3x3 mtTranspose(b3Mat3x3 m);
+
+__inline b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);
+
+__inline b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);
+
+__inline b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);
+
+__inline b3Mat3x3 mtZero()
+{
+	b3Mat3x3 m;
+	m.m_row[0] = (b3Float4)(0.f);
+	m.m_row[1] = (b3Float4)(0.f);
+	m.m_row[2] = (b3Float4)(0.f);
+	return m;
+}
+
+__inline b3Mat3x3 mtIdentity()
+{
+	b3Mat3x3 m;
+	m.m_row[0] = (b3Float4)(1, 0, 0, 0);
+	m.m_row[1] = (b3Float4)(0, 1, 0, 0);
+	m.m_row[2] = (b3Float4)(0, 0, 1, 0);
+	return m;
+}
+
+__inline b3Mat3x3 mtTranspose(b3Mat3x3 m)
+{
+	b3Mat3x3 out;
+	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);
+	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);
+	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);
+	return out;
+}
+
+__inline b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)
+{
+	b3Mat3x3 transB;
+	transB = mtTranspose(b);
+	b3Mat3x3 ans;
+	//	why this doesn't run when 0ing in the for{}
+	a.m_row[0].w = 0.f;
+	a.m_row[1].w = 0.f;
+	a.m_row[2].w = 0.f;
+	for (int i = 0; i < 3; i++)
+	{
+		//	a.m_row[i].w = 0.f;
+		ans.m_row[i].x = b3Dot3F4(a.m_row[i], transB.m_row[0]);
+		ans.m_row[i].y = b3Dot3F4(a.m_row[i], transB.m_row[1]);
+		ans.m_row[i].z = b3Dot3F4(a.m_row[i], transB.m_row[2]);
+		ans.m_row[i].w = 0.f;
+	}
+	return ans;
+}
+
+__inline b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)
+{
+	b3Float4 ans;
+	ans.x = b3Dot3F4(a.m_row[0], b);
+	ans.y = b3Dot3F4(a.m_row[1], b);
+	ans.z = b3Dot3F4(a.m_row[2], b);
+	ans.w = 0.f;
+	return ans;
+}
+
+__inline b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)
+{
+	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);
+	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);
+	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);
+
+	b3Float4 ans;
+	ans.x = b3Dot3F4(a, colx);
+	ans.y = b3Dot3F4(a, coly);
+	ans.z = b3Dot3F4(a, colz);
+	return ans;
+}
+
+#endif
+
+#endif  //B3_MAT3x3_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3PlatformDefinitions.h b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3PlatformDefinitions.h
new file mode 100644
index 0000000..b72bee9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3PlatformDefinitions.h
@@ -0,0 +1,41 @@
+#ifndef B3_PLATFORM_DEFINITIONS_H
+#define B3_PLATFORM_DEFINITIONS_H
+
+struct MyTest
+{
+	int bla;
+};
+
+#ifdef __cplusplus
+//#define b3ConstArray(a) const b3AlignedObjectArray<a>&
+#define b3ConstArray(a) const a *
+#define b3AtomicInc(a) ((*a)++)
+
+inline int b3AtomicAdd(volatile int *p, int val)
+{
+	int oldValue = *p;
+	int newValue = oldValue + val;
+	*p = newValue;
+	return oldValue;
+}
+
+#define __global
+
+#define B3_STATIC static
+#else
+//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX
+#define B3_LARGE_FLOAT 1e18f
+#define B3_INFINITY 1e18f
+#define b3Assert(a)
+#define b3ConstArray(a) __global const a *
+#define b3AtomicInc atomic_inc
+#define b3AtomicAdd atomic_add
+#define b3Fabs fabs
+#define b3Sqrt native_sqrt
+#define b3Sin native_sin
+#define b3Cos native_cos
+
+#define B3_STATIC
+#endif
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Quat.h b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Quat.h
new file mode 100644
index 0000000..940610c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Common/shared/b3Quat.h
@@ -0,0 +1,100 @@
+#ifndef B3_QUAT_H
+#define B3_QUAT_H
+
+#include "Bullet3Common/shared/b3PlatformDefinitions.h"
+#include "Bullet3Common/shared/b3Float4.h"
+
+#ifdef __cplusplus
+#include "Bullet3Common/b3Quaternion.h"
+#include "Bullet3Common/b3Transform.h"
+
+#define b3Quat b3Quaternion
+#define b3QuatConstArg const b3Quaternion&
+inline b3Quat b3QuatInverse(b3QuatConstArg orn)
+{
+	return orn.inverse();
+}
+
+inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg orientation)
+{
+	b3Transform tr;
+	tr.setOrigin(translation);
+	tr.setRotation(orientation);
+	return tr(point);
+}
+
+#else
+typedef float4 b3Quat;
+#define b3QuatConstArg const b3Quat
+
+inline float4 b3FastNormalize4(float4 v)
+{
+	v = (float4)(v.xyz, 0.f);
+	return fast_normalize(v);
+}
+
+inline b3Quat b3QuatMul(b3Quat a, b3Quat b);
+inline b3Quat b3QuatNormalized(b3QuatConstArg in);
+inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);
+inline b3Quat b3QuatInvert(b3QuatConstArg q);
+inline b3Quat b3QuatInverse(b3QuatConstArg q);
+
+inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)
+{
+	b3Quat ans;
+	ans = b3Cross3(a, b);
+	ans += a.w * b + b.w * a;
+	//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w * b.w - b3Dot3F4(a, b);
+	return ans;
+}
+
+inline b3Quat b3QuatNormalized(b3QuatConstArg in)
+{
+	b3Quat q;
+	q = in;
+	//return b3FastNormalize4(in);
+	float len = native_sqrt(dot(q, q));
+	if (len > 0.f)
+	{
+		q *= 1.f / len;
+	}
+	else
+	{
+		q.x = q.y = q.z = 0.f;
+		q.w = 1.f;
+	}
+	return q;
+}
+inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)
+{
+	b3Quat qInv = b3QuatInvert(q);
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = b3QuatMul(b3QuatMul(q, vcpy), qInv);
+	return out;
+}
+
+inline b3Quat b3QuatInverse(b3QuatConstArg q)
+{
+	return (b3Quat)(-q.xyz, q.w);
+}
+
+inline b3Quat b3QuatInvert(b3QuatConstArg q)
+{
+	return (b3Quat)(-q.xyz, q.w);
+}
+
+inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)
+{
+	return b3QuatRotate(b3QuatInvert(q), vec);
+}
+
+inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg orientation)
+{
+	return b3QuatRotate(orientation, point) + (translation);
+}
+
+#endif
+
+#endif  //B3_QUAT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/CMakeLists.txt b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/CMakeLists.txt
new file mode 100644
index 0000000..94c120d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/CMakeLists.txt
@@ -0,0 +1,61 @@
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+)
+
+SET(Bullet3Dynamics_SRCS
+	b3CpuRigidBodyPipeline.cpp
+	ConstraintSolver/b3FixedConstraint.cpp
+	ConstraintSolver/b3Generic6DofConstraint.cpp
+	ConstraintSolver/b3PgsJacobiSolver.cpp
+	ConstraintSolver/b3Point2PointConstraint.cpp
+	ConstraintSolver/b3TypedConstraint.cpp
+)
+
+SET(Bullet3Dynamics_HDRS
+	  b3CpuRigidBodyPipeline.h
+	ConstraintSolver/b3ContactSolverInfo.h
+	ConstraintSolver/b3FixedConstraint.h
+	ConstraintSolver/b3Generic6DofConstraint.h
+	ConstraintSolver/b3JacobianEntry.h
+	ConstraintSolver/b3PgsJacobiSolver.h
+	ConstraintSolver/b3Point2PointConstraint.h
+	ConstraintSolver/b3SolverBody.h
+	ConstraintSolver/b3SolverConstraint.h
+	ConstraintSolver/b3TypedConstraint.h
+	shared/b3ContactConstraint4.h
+	shared/b3ConvertConstraint4.h
+	shared/b3Inertia.h
+	shared/b3IntegrateTransforms.h
+)
+
+ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS})
+if (BUILD_SHARED_LIBS)
+  target_link_libraries(Bullet3Dynamics Bullet3Collision)
+endif ()
+SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES SOVERSION ${BULLET_VERSION})
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#FILES_MATCHING requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Dynamics DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Dynamics
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES PUBLIC_HEADER "${Bullet3Dynamics_HDRS}")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h
new file mode 100644
index 0000000..e946c2a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h
@@ -0,0 +1,149 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_CONTACT_SOLVER_INFO
+#define B3_CONTACT_SOLVER_INFO
+
+#include "Bullet3Common/b3Scalar.h"
+
+enum b3SolverMode
+{
+	B3_SOLVER_RANDMIZE_ORDER = 1,
+	B3_SOLVER_FRICTION_SEPARATE = 2,
+	B3_SOLVER_USE_WARMSTARTING = 4,
+	B3_SOLVER_USE_2_FRICTION_DIRECTIONS = 16,
+	B3_SOLVER_ENABLE_FRICTION_DIRECTION_CACHING = 32,
+	B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION = 64,
+	B3_SOLVER_CACHE_FRIENDLY = 128,
+	B3_SOLVER_SIMD = 256,
+	B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS = 512,
+	B3_SOLVER_ALLOW_ZERO_LENGTH_FRICTION_DIRECTIONS = 1024
+};
+
+struct b3ContactSolverInfoData
+{
+	b3Scalar m_tau;
+	b3Scalar m_damping;  //global non-contact constraint damping, can be locally overridden by constraints during 'getInfo2'.
+	b3Scalar m_friction;
+	b3Scalar m_timeStep;
+	b3Scalar m_restitution;
+	int m_numIterations;
+	b3Scalar m_maxErrorReduction;
+	b3Scalar m_sor;
+	b3Scalar m_erp;        //used as Baumgarte factor
+	b3Scalar m_erp2;       //used in Split Impulse
+	b3Scalar m_globalCfm;  //constraint force mixing
+	int m_splitImpulse;
+	b3Scalar m_splitImpulsePenetrationThreshold;
+	b3Scalar m_splitImpulseTurnErp;
+	b3Scalar m_linearSlop;
+	b3Scalar m_warmstartingFactor;
+
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+	int m_minimumSolverBatchSize;
+	b3Scalar m_maxGyroscopicForce;
+	b3Scalar m_singleAxisRollingFrictionThreshold;
+};
+
+struct b3ContactSolverInfo : public b3ContactSolverInfoData
+{
+	inline b3ContactSolverInfo()
+	{
+		m_tau = b3Scalar(0.6);
+		m_damping = b3Scalar(1.0);
+		m_friction = b3Scalar(0.3);
+		m_timeStep = b3Scalar(1.f / 60.f);
+		m_restitution = b3Scalar(0.);
+		m_maxErrorReduction = b3Scalar(20.);
+		m_numIterations = 10;
+		m_erp = b3Scalar(0.2);
+		m_erp2 = b3Scalar(0.8);
+		m_globalCfm = b3Scalar(0.);
+		m_sor = b3Scalar(1.);
+		m_splitImpulse = true;
+		m_splitImpulsePenetrationThreshold = -.04f;
+		m_splitImpulseTurnErp = 0.1f;
+		m_linearSlop = b3Scalar(0.0);
+		m_warmstartingFactor = b3Scalar(0.85);
+		//m_solverMode =  B3_SOLVER_USE_WARMSTARTING |  B3_SOLVER_SIMD | B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION|B3_SOLVER_USE_2_FRICTION_DIRECTIONS|B3_SOLVER_ENABLE_FRICTION_DIRECTION_CACHING;// | B3_SOLVER_RANDMIZE_ORDER;
+		m_solverMode = B3_SOLVER_USE_WARMSTARTING | B3_SOLVER_SIMD;  // | B3_SOLVER_RANDMIZE_ORDER;
+		m_restingContactRestitutionThreshold = 2;                    //unused as of 2.81
+		m_minimumSolverBatchSize = 128;                              //try to combine islands until the amount of constraints reaches this limit
+		m_maxGyroscopicForce = 100.f;                                ///only used to clamp forces for bodies that have their B3_ENABLE_GYROPSCOPIC_FORCE flag set (using b3RigidBody::setFlag)
+		m_singleAxisRollingFrictionThreshold = 1e30f;                ///if the velocity is above this threshold, it will use a single constraint row (axis), otherwise 3 rows.
+	}
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct b3ContactSolverInfoDoubleData
+{
+	double m_tau;
+	double m_damping;  //global non-contact constraint damping, can be locally overridden by constraints during 'getInfo2'.
+	double m_friction;
+	double m_timeStep;
+	double m_restitution;
+	double m_maxErrorReduction;
+	double m_sor;
+	double m_erp;        //used as Baumgarte factor
+	double m_erp2;       //used in Split Impulse
+	double m_globalCfm;  //constraint force mixing
+	double m_splitImpulsePenetrationThreshold;
+	double m_splitImpulseTurnErp;
+	double m_linearSlop;
+	double m_warmstartingFactor;
+	double m_maxGyroscopicForce;
+	double m_singleAxisRollingFrictionThreshold;
+
+	int m_numIterations;
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+	int m_minimumSolverBatchSize;
+	int m_splitImpulse;
+	char m_padding[4];
+};
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct b3ContactSolverInfoFloatData
+{
+	float m_tau;
+	float m_damping;  //global non-contact constraint damping, can be locally overridden by constraints during 'getInfo2'.
+	float m_friction;
+	float m_timeStep;
+
+	float m_restitution;
+	float m_maxErrorReduction;
+	float m_sor;
+	float m_erp;  //used as Baumgarte factor
+
+	float m_erp2;       //used in Split Impulse
+	float m_globalCfm;  //constraint force mixing
+	float m_splitImpulsePenetrationThreshold;
+	float m_splitImpulseTurnErp;
+
+	float m_linearSlop;
+	float m_warmstartingFactor;
+	float m_maxGyroscopicForce;
+	float m_singleAxisRollingFrictionThreshold;
+
+	int m_numIterations;
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+	int m_minimumSolverBatchSize;
+
+	int m_splitImpulse;
+	char m_padding[4];
+};
+
+#endif  //B3_CONTACT_SOLVER_INFO
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.cpp b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.cpp
new file mode 100644
index 0000000..ace4b18
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.cpp
@@ -0,0 +1,103 @@
+
+#include "b3FixedConstraint.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Common/b3TransformUtil.h"
+#include <new>
+
+b3FixedConstraint::b3FixedConstraint(int rbA, int rbB, const b3Transform& frameInA, const b3Transform& frameInB)
+	: b3TypedConstraint(B3_FIXED_CONSTRAINT_TYPE, rbA, rbB)
+{
+	m_pivotInA = frameInA.getOrigin();
+	m_pivotInB = frameInB.getOrigin();
+	m_relTargetAB = frameInA.getRotation() * frameInB.getRotation().inverse();
+}
+
+b3FixedConstraint::~b3FixedConstraint()
+{
+}
+
+void b3FixedConstraint::getInfo1(b3ConstraintInfo1* info, const b3RigidBodyData* bodies)
+{
+	info->m_numConstraintRows = 6;
+	info->nub = 6;
+}
+
+void b3FixedConstraint::getInfo2(b3ConstraintInfo2* info, const b3RigidBodyData* bodies)
+{
+	//fix the 3 linear degrees of freedom
+
+	const b3Vector3& worldPosA = bodies[m_rbA].m_pos;
+	const b3Quaternion& worldOrnA = bodies[m_rbA].m_quat;
+	const b3Vector3& worldPosB = bodies[m_rbB].m_pos;
+	const b3Quaternion& worldOrnB = bodies[m_rbB].m_quat;
+
+	info->m_J1linearAxis[0] = 1;
+	info->m_J1linearAxis[info->rowskip + 1] = 1;
+	info->m_J1linearAxis[2 * info->rowskip + 2] = 1;
+
+	b3Vector3 a1 = b3QuatRotate(worldOrnA, m_pivotInA);
+	{
+		b3Vector3* angular0 = (b3Vector3*)(info->m_J1angularAxis);
+		b3Vector3* angular1 = (b3Vector3*)(info->m_J1angularAxis + info->rowskip);
+		b3Vector3* angular2 = (b3Vector3*)(info->m_J1angularAxis + 2 * info->rowskip);
+		b3Vector3 a1neg = -a1;
+		a1neg.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	if (info->m_J2linearAxis)
+	{
+		info->m_J2linearAxis[0] = -1;
+		info->m_J2linearAxis[info->rowskip + 1] = -1;
+		info->m_J2linearAxis[2 * info->rowskip + 2] = -1;
+	}
+
+	b3Vector3 a2 = b3QuatRotate(worldOrnB, m_pivotInB);
+
+	{
+		//	b3Vector3 a2n = -a2;
+		b3Vector3* angular0 = (b3Vector3*)(info->m_J2angularAxis);
+		b3Vector3* angular1 = (b3Vector3*)(info->m_J2angularAxis + info->rowskip);
+		b3Vector3* angular2 = (b3Vector3*)(info->m_J2angularAxis + 2 * info->rowskip);
+		a2.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	// set right hand side for the linear dofs
+	b3Scalar k = info->fps * info->erp;
+	b3Vector3 linearError = k * (a2 + worldPosB - a1 - worldPosA);
+	int j;
+	for (j = 0; j < 3; j++)
+	{
+		info->m_constraintError[j * info->rowskip] = linearError[j];
+		//printf("info->m_constraintError[%d]=%f\n",j,info->m_constraintError[j]);
+	}
+
+	//fix the 3 angular degrees of freedom
+
+	int start_row = 3;
+	int s = info->rowskip;
+	int start_index = start_row * s;
+
+	// 3 rows to make body rotations equal
+	info->m_J1angularAxis[start_index] = 1;
+	info->m_J1angularAxis[start_index + s + 1] = 1;
+	info->m_J1angularAxis[start_index + s * 2 + 2] = 1;
+	if (info->m_J2angularAxis)
+	{
+		info->m_J2angularAxis[start_index] = -1;
+		info->m_J2angularAxis[start_index + s + 1] = -1;
+		info->m_J2angularAxis[start_index + s * 2 + 2] = -1;
+	}
+
+	// set right hand side for the angular dofs
+
+	b3Vector3 diff;
+	b3Scalar angle;
+	b3Quaternion qrelCur = worldOrnA * worldOrnB.inverse();
+
+	b3TransformUtil::calculateDiffAxisAngleQuaternion(m_relTargetAB, qrelCur, diff, angle);
+	diff *= -angle;
+	for (j = 0; j < 3; j++)
+	{
+		info->m_constraintError[(3 + j) * info->rowskip] = k * diff[j];
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h
new file mode 100644
index 0000000..6480966
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3FixedConstraint.h
@@ -0,0 +1,34 @@
+
+#ifndef B3_FIXED_CONSTRAINT_H
+#define B3_FIXED_CONSTRAINT_H
+
+#include "b3TypedConstraint.h"
+
+B3_ATTRIBUTE_ALIGNED16(class)
+b3FixedConstraint : public b3TypedConstraint
+{
+	b3Vector3 m_pivotInA;
+	b3Vector3 m_pivotInB;
+	b3Quaternion m_relTargetAB;
+
+public:
+	b3FixedConstraint(int rbA, int rbB, const b3Transform& frameInA, const b3Transform& frameInB);
+
+	virtual ~b3FixedConstraint();
+
+	virtual void getInfo1(b3ConstraintInfo1 * info, const b3RigidBodyData* bodies);
+
+	virtual void getInfo2(b3ConstraintInfo2 * info, const b3RigidBodyData* bodies);
+
+	virtual void setParam(int num, b3Scalar value, int axis = -1)
+	{
+		b3Assert(0);
+	}
+	virtual b3Scalar getParam(int num, int axis = -1) const
+	{
+		b3Assert(0);
+		return 0.f;
+	}
+};
+
+#endif  //B3_FIXED_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.cpp b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.cpp
new file mode 100644
index 0000000..fd3e518
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.cpp
@@ -0,0 +1,737 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+/*
+2007-09-09
+Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
+
+#include "b3Generic6DofConstraint.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+#include "Bullet3Common/b3TransformUtil.h"
+#include "Bullet3Common/b3TransformUtil.h"
+#include <new>
+
+#define D6_USE_OBSOLETE_METHOD false
+#define D6_USE_FRAME_OFFSET true
+
+b3Generic6DofConstraint::b3Generic6DofConstraint(int rbA, int rbB, const b3Transform& frameInA, const b3Transform& frameInB, bool useLinearReferenceFrameA, const b3RigidBodyData* bodies)
+	: b3TypedConstraint(B3_D6_CONSTRAINT_TYPE, rbA, rbB), m_frameInA(frameInA), m_frameInB(frameInB), m_useLinearReferenceFrameA(useLinearReferenceFrameA), m_useOffsetForConstraintFrame(D6_USE_FRAME_OFFSET), m_flags(0)
+{
+	calculateTransforms(bodies);
+}
+
+#define GENERIC_D6_DISABLE_WARMSTARTING 1
+
+b3Scalar btGetMatrixElem(const b3Matrix3x3& mat, int index);
+b3Scalar btGetMatrixElem(const b3Matrix3x3& mat, int index)
+{
+	int i = index % 3;
+	int j = index / 3;
+	return mat[i][j];
+}
+
+///MatrixToEulerXYZ from http://www.geometrictools.com/LibFoundation/Mathematics/Wm4Matrix3.inl.html
+bool matrixToEulerXYZ(const b3Matrix3x3& mat, b3Vector3& xyz);
+bool matrixToEulerXYZ(const b3Matrix3x3& mat, b3Vector3& xyz)
+{
+	//	// rot =  cy*cz          -cy*sz           sy
+	//	//        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
+	//	//       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
+	//
+
+	b3Scalar fi = btGetMatrixElem(mat, 2);
+	if (fi < b3Scalar(1.0f))
+	{
+		if (fi > b3Scalar(-1.0f))
+		{
+			xyz[0] = b3Atan2(-btGetMatrixElem(mat, 5), btGetMatrixElem(mat, 8));
+			xyz[1] = b3Asin(btGetMatrixElem(mat, 2));
+			xyz[2] = b3Atan2(-btGetMatrixElem(mat, 1), btGetMatrixElem(mat, 0));
+			return true;
+		}
+		else
+		{
+			// WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
+			xyz[0] = -b3Atan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 4));
+			xyz[1] = -B3_HALF_PI;
+			xyz[2] = b3Scalar(0.0);
+			return false;
+		}
+	}
+	else
+	{
+		// WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
+		xyz[0] = b3Atan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 4));
+		xyz[1] = B3_HALF_PI;
+		xyz[2] = 0.0;
+	}
+	return false;
+}
+
+//////////////////////////// b3RotationalLimitMotor ////////////////////////////////////
+
+int b3RotationalLimitMotor::testLimitValue(b3Scalar test_value)
+{
+	if (m_loLimit > m_hiLimit)
+	{
+		m_currentLimit = 0;  //Free from violation
+		return 0;
+	}
+	if (test_value < m_loLimit)
+	{
+		m_currentLimit = 1;  //low limit violation
+		m_currentLimitError = test_value - m_loLimit;
+		if (m_currentLimitError > B3_PI)
+			m_currentLimitError -= B3_2_PI;
+		else if (m_currentLimitError < -B3_PI)
+			m_currentLimitError += B3_2_PI;
+		return 1;
+	}
+	else if (test_value > m_hiLimit)
+	{
+		m_currentLimit = 2;  //High limit violation
+		m_currentLimitError = test_value - m_hiLimit;
+		if (m_currentLimitError > B3_PI)
+			m_currentLimitError -= B3_2_PI;
+		else if (m_currentLimitError < -B3_PI)
+			m_currentLimitError += B3_2_PI;
+		return 2;
+	};
+
+	m_currentLimit = 0;  //Free from violation
+	return 0;
+}
+
+//////////////////////////// End b3RotationalLimitMotor ////////////////////////////////////
+
+//////////////////////////// b3TranslationalLimitMotor ////////////////////////////////////
+
+int b3TranslationalLimitMotor::testLimitValue(int limitIndex, b3Scalar test_value)
+{
+	b3Scalar loLimit = m_lowerLimit[limitIndex];
+	b3Scalar hiLimit = m_upperLimit[limitIndex];
+	if (loLimit > hiLimit)
+	{
+		m_currentLimit[limitIndex] = 0;  //Free from violation
+		m_currentLimitError[limitIndex] = b3Scalar(0.f);
+		return 0;
+	}
+
+	if (test_value < loLimit)
+	{
+		m_currentLimit[limitIndex] = 2;  //low limit violation
+		m_currentLimitError[limitIndex] = test_value - loLimit;
+		return 2;
+	}
+	else if (test_value > hiLimit)
+	{
+		m_currentLimit[limitIndex] = 1;  //High limit violation
+		m_currentLimitError[limitIndex] = test_value - hiLimit;
+		return 1;
+	};
+
+	m_currentLimit[limitIndex] = 0;  //Free from violation
+	m_currentLimitError[limitIndex] = b3Scalar(0.f);
+	return 0;
+}
+
+//////////////////////////// b3TranslationalLimitMotor ////////////////////////////////////
+
+void b3Generic6DofConstraint::calculateAngleInfo()
+{
+	b3Matrix3x3 relative_frame = m_calculatedTransformA.getBasis().inverse() * m_calculatedTransformB.getBasis();
+	matrixToEulerXYZ(relative_frame, m_calculatedAxisAngleDiff);
+	// in euler angle mode we do not actually constrain the angular velocity
+	// along the axes axis[0] and axis[2] (although we do use axis[1]) :
+	//
+	//    to get			constrain w2-w1 along		...not
+	//    ------			---------------------		------
+	//    d(angle[0])/dt = 0	ax[1] x ax[2]			ax[0]
+	//    d(angle[1])/dt = 0	ax[1]
+	//    d(angle[2])/dt = 0	ax[0] x ax[1]			ax[2]
+	//
+	// constraining w2-w1 along an axis 'a' means that a'*(w2-w1)=0.
+	// to prove the result for angle[0], write the expression for angle[0] from
+	// GetInfo1 then take the derivative. to prove this for angle[2] it is
+	// easier to take the euler rate expression for d(angle[2])/dt with respect
+	// to the components of w and set that to 0.
+	b3Vector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0);
+	b3Vector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2);
+
+	m_calculatedAxis[1] = axis2.cross(axis0);
+	m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2);
+	m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]);
+
+	m_calculatedAxis[0].normalize();
+	m_calculatedAxis[1].normalize();
+	m_calculatedAxis[2].normalize();
+}
+
+static b3Transform getCenterOfMassTransform(const b3RigidBodyData& body)
+{
+	b3Transform tr(body.m_quat, body.m_pos);
+	return tr;
+}
+
+void b3Generic6DofConstraint::calculateTransforms(const b3RigidBodyData* bodies)
+{
+	b3Transform transA;
+	b3Transform transB;
+	transA = getCenterOfMassTransform(bodies[m_rbA]);
+	transB = getCenterOfMassTransform(bodies[m_rbB]);
+	calculateTransforms(transA, transB, bodies);
+}
+
+void b3Generic6DofConstraint::calculateTransforms(const b3Transform& transA, const b3Transform& transB, const b3RigidBodyData* bodies)
+{
+	m_calculatedTransformA = transA * m_frameInA;
+	m_calculatedTransformB = transB * m_frameInB;
+	calculateLinearInfo();
+	calculateAngleInfo();
+	if (m_useOffsetForConstraintFrame)
+	{  //  get weight factors depending on masses
+		b3Scalar miA = bodies[m_rbA].m_invMass;
+		b3Scalar miB = bodies[m_rbB].m_invMass;
+		m_hasStaticBody = (miA < B3_EPSILON) || (miB < B3_EPSILON);
+		b3Scalar miS = miA + miB;
+		if (miS > b3Scalar(0.f))
+		{
+			m_factA = miB / miS;
+		}
+		else
+		{
+			m_factA = b3Scalar(0.5f);
+		}
+		m_factB = b3Scalar(1.0f) - m_factA;
+	}
+}
+
+bool b3Generic6DofConstraint::testAngularLimitMotor(int axis_index)
+{
+	b3Scalar angle = m_calculatedAxisAngleDiff[axis_index];
+	angle = b3AdjustAngleToLimits(angle, m_angularLimits[axis_index].m_loLimit, m_angularLimits[axis_index].m_hiLimit);
+	m_angularLimits[axis_index].m_currentPosition = angle;
+	//test limits
+	m_angularLimits[axis_index].testLimitValue(angle);
+	return m_angularLimits[axis_index].needApplyTorques();
+}
+
+void b3Generic6DofConstraint::getInfo1(b3ConstraintInfo1* info, const b3RigidBodyData* bodies)
+{
+	//prepare constraint
+	calculateTransforms(getCenterOfMassTransform(bodies[m_rbA]), getCenterOfMassTransform(bodies[m_rbB]), bodies);
+	info->m_numConstraintRows = 0;
+	info->nub = 6;
+	int i;
+	//test linear limits
+	for (i = 0; i < 3; i++)
+	{
+		if (m_linearLimits.needApplyForce(i))
+		{
+			info->m_numConstraintRows++;
+			info->nub--;
+		}
+	}
+	//test angular limits
+	for (i = 0; i < 3; i++)
+	{
+		if (testAngularLimitMotor(i))
+		{
+			info->m_numConstraintRows++;
+			info->nub--;
+		}
+	}
+	//	printf("info->m_numConstraintRows=%d\n",info->m_numConstraintRows);
+}
+
+void b3Generic6DofConstraint::getInfo1NonVirtual(b3ConstraintInfo1* info, const b3RigidBodyData* bodies)
+{
+	//pre-allocate all 6
+	info->m_numConstraintRows = 6;
+	info->nub = 0;
+}
+
+void b3Generic6DofConstraint::getInfo2(b3ConstraintInfo2* info, const b3RigidBodyData* bodies)
+{
+	b3Transform transA = getCenterOfMassTransform(bodies[m_rbA]);
+	b3Transform transB = getCenterOfMassTransform(bodies[m_rbB]);
+	const b3Vector3& linVelA = bodies[m_rbA].m_linVel;
+	const b3Vector3& linVelB = bodies[m_rbB].m_linVel;
+	const b3Vector3& angVelA = bodies[m_rbA].m_angVel;
+	const b3Vector3& angVelB = bodies[m_rbB].m_angVel;
+
+	if (m_useOffsetForConstraintFrame)
+	{  // for stability better to solve angular limits first
+		int row = setAngularLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setLinearLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+	else
+	{  // leave old version for compatibility
+		int row = setLinearLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setAngularLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+}
+
+void b3Generic6DofConstraint::getInfo2NonVirtual(b3ConstraintInfo2* info, const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB, const b3RigidBodyData* bodies)
+{
+	//prepare constraint
+	calculateTransforms(transA, transB, bodies);
+
+	int i;
+	for (i = 0; i < 3; i++)
+	{
+		testAngularLimitMotor(i);
+	}
+
+	if (m_useOffsetForConstraintFrame)
+	{  // for stability better to solve angular limits first
+		int row = setAngularLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setLinearLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+	else
+	{  // leave old version for compatibility
+		int row = setLinearLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setAngularLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+}
+
+int b3Generic6DofConstraint::setLinearLimits(b3ConstraintInfo2* info, int row, const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB)
+{
+	//	int row = 0;
+	//solve linear limits
+	b3RotationalLimitMotor limot;
+	for (int i = 0; i < 3; i++)
+	{
+		if (m_linearLimits.needApplyForce(i))
+		{  // re-use rotational motor code
+			limot.m_bounce = b3Scalar(0.f);
+			limot.m_currentLimit = m_linearLimits.m_currentLimit[i];
+			limot.m_currentPosition = m_linearLimits.m_currentLinearDiff[i];
+			limot.m_currentLimitError = m_linearLimits.m_currentLimitError[i];
+			limot.m_damping = m_linearLimits.m_damping;
+			limot.m_enableMotor = m_linearLimits.m_enableMotor[i];
+			limot.m_hiLimit = m_linearLimits.m_upperLimit[i];
+			limot.m_limitSoftness = m_linearLimits.m_limitSoftness;
+			limot.m_loLimit = m_linearLimits.m_lowerLimit[i];
+			limot.m_maxLimitForce = b3Scalar(0.f);
+			limot.m_maxMotorForce = m_linearLimits.m_maxMotorForce[i];
+			limot.m_targetVelocity = m_linearLimits.m_targetVelocity[i];
+			b3Vector3 axis = m_calculatedTransformA.getBasis().getColumn(i);
+			int flags = m_flags >> (i * B3_6DOF_FLAGS_AXIS_SHIFT);
+			limot.m_normalCFM = (flags & B3_6DOF_FLAGS_CFM_NORM) ? m_linearLimits.m_normalCFM[i] : info->cfm[0];
+			limot.m_stopCFM = (flags & B3_6DOF_FLAGS_CFM_STOP) ? m_linearLimits.m_stopCFM[i] : info->cfm[0];
+			limot.m_stopERP = (flags & B3_6DOF_FLAGS_ERP_STOP) ? m_linearLimits.m_stopERP[i] : info->erp;
+			if (m_useOffsetForConstraintFrame)
+			{
+				int indx1 = (i + 1) % 3;
+				int indx2 = (i + 2) % 3;
+				int rotAllowed = 1;  // rotations around orthos to current axis
+				if (m_angularLimits[indx1].m_currentLimit && m_angularLimits[indx2].m_currentLimit)
+				{
+					rotAllowed = 0;
+				}
+				row += get_limit_motor_info2(&limot, transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 0, rotAllowed);
+			}
+			else
+			{
+				row += get_limit_motor_info2(&limot, transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 0);
+			}
+		}
+	}
+	return row;
+}
+
+int b3Generic6DofConstraint::setAngularLimits(b3ConstraintInfo2* info, int row_offset, const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB)
+{
+	b3Generic6DofConstraint* d6constraint = this;
+	int row = row_offset;
+	//solve angular limits
+	for (int i = 0; i < 3; i++)
+	{
+		if (d6constraint->getRotationalLimitMotor(i)->needApplyTorques())
+		{
+			b3Vector3 axis = d6constraint->getAxis(i);
+			int flags = m_flags >> ((i + 3) * B3_6DOF_FLAGS_AXIS_SHIFT);
+			if (!(flags & B3_6DOF_FLAGS_CFM_NORM))
+			{
+				m_angularLimits[i].m_normalCFM = info->cfm[0];
+			}
+			if (!(flags & B3_6DOF_FLAGS_CFM_STOP))
+			{
+				m_angularLimits[i].m_stopCFM = info->cfm[0];
+			}
+			if (!(flags & B3_6DOF_FLAGS_ERP_STOP))
+			{
+				m_angularLimits[i].m_stopERP = info->erp;
+			}
+			row += get_limit_motor_info2(d6constraint->getRotationalLimitMotor(i),
+										 transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 1);
+		}
+	}
+
+	return row;
+}
+
+void b3Generic6DofConstraint::updateRHS(b3Scalar timeStep)
+{
+	(void)timeStep;
+}
+
+void b3Generic6DofConstraint::setFrames(const b3Transform& frameA, const b3Transform& frameB, const b3RigidBodyData* bodies)
+{
+	m_frameInA = frameA;
+	m_frameInB = frameB;
+
+	calculateTransforms(bodies);
+}
+
+b3Vector3 b3Generic6DofConstraint::getAxis(int axis_index) const
+{
+	return m_calculatedAxis[axis_index];
+}
+
+b3Scalar b3Generic6DofConstraint::getRelativePivotPosition(int axisIndex) const
+{
+	return m_calculatedLinearDiff[axisIndex];
+}
+
+b3Scalar b3Generic6DofConstraint::getAngle(int axisIndex) const
+{
+	return m_calculatedAxisAngleDiff[axisIndex];
+}
+
+void b3Generic6DofConstraint::calcAnchorPos(const b3RigidBodyData* bodies)
+{
+	b3Scalar imA = bodies[m_rbA].m_invMass;
+	b3Scalar imB = bodies[m_rbB].m_invMass;
+	b3Scalar weight;
+	if (imB == b3Scalar(0.0))
+	{
+		weight = b3Scalar(1.0);
+	}
+	else
+	{
+		weight = imA / (imA + imB);
+	}
+	const b3Vector3& pA = m_calculatedTransformA.getOrigin();
+	const b3Vector3& pB = m_calculatedTransformB.getOrigin();
+	m_AnchorPos = pA * weight + pB * (b3Scalar(1.0) - weight);
+	return;
+}
+
+void b3Generic6DofConstraint::calculateLinearInfo()
+{
+	m_calculatedLinearDiff = m_calculatedTransformB.getOrigin() - m_calculatedTransformA.getOrigin();
+	m_calculatedLinearDiff = m_calculatedTransformA.getBasis().inverse() * m_calculatedLinearDiff;
+	for (int i = 0; i < 3; i++)
+	{
+		m_linearLimits.m_currentLinearDiff[i] = m_calculatedLinearDiff[i];
+		m_linearLimits.testLimitValue(i, m_calculatedLinearDiff[i]);
+	}
+}
+
+int b3Generic6DofConstraint::get_limit_motor_info2(
+	b3RotationalLimitMotor* limot,
+	const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB,
+	b3ConstraintInfo2* info, int row, b3Vector3& ax1, int rotational, int rotAllowed)
+{
+	int srow = row * info->rowskip;
+	bool powered = limot->m_enableMotor;
+	int limit = limot->m_currentLimit;
+	if (powered || limit)
+	{  // if the joint is powered, or has joint limits, add in the extra row
+		b3Scalar* J1 = rotational ? info->m_J1angularAxis : info->m_J1linearAxis;
+		b3Scalar* J2 = rotational ? info->m_J2angularAxis : info->m_J2linearAxis;
+		if (J1)
+		{
+			J1[srow + 0] = ax1[0];
+			J1[srow + 1] = ax1[1];
+			J1[srow + 2] = ax1[2];
+		}
+		if (J2)
+		{
+			J2[srow + 0] = -ax1[0];
+			J2[srow + 1] = -ax1[1];
+			J2[srow + 2] = -ax1[2];
+		}
+		if ((!rotational))
+		{
+			if (m_useOffsetForConstraintFrame)
+			{
+				b3Vector3 tmpA, tmpB, relA, relB;
+				// get vector from bodyB to frameB in WCS
+				relB = m_calculatedTransformB.getOrigin() - transB.getOrigin();
+				// get its projection to constraint axis
+				b3Vector3 projB = ax1 * relB.dot(ax1);
+				// get vector directed from bodyB to constraint axis (and orthogonal to it)
+				b3Vector3 orthoB = relB - projB;
+				// same for bodyA
+				relA = m_calculatedTransformA.getOrigin() - transA.getOrigin();
+				b3Vector3 projA = ax1 * relA.dot(ax1);
+				b3Vector3 orthoA = relA - projA;
+				// get desired offset between frames A and B along constraint axis
+				b3Scalar desiredOffs = limot->m_currentPosition - limot->m_currentLimitError;
+				// desired vector from projection of center of bodyA to projection of center of bodyB to constraint axis
+				b3Vector3 totalDist = projA + ax1 * desiredOffs - projB;
+				// get offset vectors relA and relB
+				relA = orthoA + totalDist * m_factA;
+				relB = orthoB - totalDist * m_factB;
+				tmpA = relA.cross(ax1);
+				tmpB = relB.cross(ax1);
+				if (m_hasStaticBody && (!rotAllowed))
+				{
+					tmpA *= m_factA;
+					tmpB *= m_factB;
+				}
+				int i;
+				for (i = 0; i < 3; i++) info->m_J1angularAxis[srow + i] = tmpA[i];
+				for (i = 0; i < 3; i++) info->m_J2angularAxis[srow + i] = -tmpB[i];
+			}
+			else
+			{
+				b3Vector3 ltd;  // Linear Torque Decoupling vector
+				b3Vector3 c = m_calculatedTransformB.getOrigin() - transA.getOrigin();
+				ltd = c.cross(ax1);
+				info->m_J1angularAxis[srow + 0] = ltd[0];
+				info->m_J1angularAxis[srow + 1] = ltd[1];
+				info->m_J1angularAxis[srow + 2] = ltd[2];
+
+				c = m_calculatedTransformB.getOrigin() - transB.getOrigin();
+				ltd = -c.cross(ax1);
+				info->m_J2angularAxis[srow + 0] = ltd[0];
+				info->m_J2angularAxis[srow + 1] = ltd[1];
+				info->m_J2angularAxis[srow + 2] = ltd[2];
+			}
+		}
+		// if we're limited low and high simultaneously, the joint motor is
+		// ineffective
+		if (limit && (limot->m_loLimit == limot->m_hiLimit)) powered = false;
+		info->m_constraintError[srow] = b3Scalar(0.f);
+		if (powered)
+		{
+			info->cfm[srow] = limot->m_normalCFM;
+			if (!limit)
+			{
+				b3Scalar tag_vel = rotational ? limot->m_targetVelocity : -limot->m_targetVelocity;
+
+				b3Scalar mot_fact = getMotorFactor(limot->m_currentPosition,
+												   limot->m_loLimit,
+												   limot->m_hiLimit,
+												   tag_vel,
+												   info->fps * limot->m_stopERP);
+				info->m_constraintError[srow] += mot_fact * limot->m_targetVelocity;
+				info->m_lowerLimit[srow] = -limot->m_maxMotorForce / info->fps;
+				info->m_upperLimit[srow] = limot->m_maxMotorForce / info->fps;
+			}
+		}
+		if (limit)
+		{
+			b3Scalar k = info->fps * limot->m_stopERP;
+			if (!rotational)
+			{
+				info->m_constraintError[srow] += k * limot->m_currentLimitError;
+			}
+			else
+			{
+				info->m_constraintError[srow] += -k * limot->m_currentLimitError;
+			}
+			info->cfm[srow] = limot->m_stopCFM;
+			if (limot->m_loLimit == limot->m_hiLimit)
+			{  // limited low and high simultaneously
+				info->m_lowerLimit[srow] = -B3_INFINITY;
+				info->m_upperLimit[srow] = B3_INFINITY;
+			}
+			else
+			{
+				if (limit == 1)
+				{
+					info->m_lowerLimit[srow] = 0;
+					info->m_upperLimit[srow] = B3_INFINITY;
+				}
+				else
+				{
+					info->m_lowerLimit[srow] = -B3_INFINITY;
+					info->m_upperLimit[srow] = 0;
+				}
+				// deal with bounce
+				if (limot->m_bounce > 0)
+				{
+					// calculate joint velocity
+					b3Scalar vel;
+					if (rotational)
+					{
+						vel = angVelA.dot(ax1);
+						//make sure that if no body -> angVelB == zero vec
+						//                        if (body1)
+						vel -= angVelB.dot(ax1);
+					}
+					else
+					{
+						vel = linVelA.dot(ax1);
+						//make sure that if no body -> angVelB == zero vec
+						//                        if (body1)
+						vel -= linVelB.dot(ax1);
+					}
+					// only apply bounce if the velocity is incoming, and if the
+					// resulting c[] exceeds what we already have.
+					if (limit == 1)
+					{
+						if (vel < 0)
+						{
+							b3Scalar newc = -limot->m_bounce * vel;
+							if (newc > info->m_constraintError[srow])
+								info->m_constraintError[srow] = newc;
+						}
+					}
+					else
+					{
+						if (vel > 0)
+						{
+							b3Scalar newc = -limot->m_bounce * vel;
+							if (newc < info->m_constraintError[srow])
+								info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+			}
+		}
+		return 1;
+	}
+	else
+		return 0;
+}
+
+///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+///If no axis is provided, it uses the default axis for this constraint.
+void b3Generic6DofConstraint::setParam(int num, b3Scalar value, int axis)
+{
+	if ((axis >= 0) && (axis < 3))
+	{
+		switch (num)
+		{
+			case B3_CONSTRAINT_STOP_ERP:
+				m_linearLimits.m_stopERP[axis] = value;
+				m_flags |= B3_6DOF_FLAGS_ERP_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case B3_CONSTRAINT_STOP_CFM:
+				m_linearLimits.m_stopCFM[axis] = value;
+				m_flags |= B3_6DOF_FLAGS_CFM_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case B3_CONSTRAINT_CFM:
+				m_linearLimits.m_normalCFM[axis] = value;
+				m_flags |= B3_6DOF_FLAGS_CFM_NORM << (axis * B3_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			default:
+				b3AssertConstrParams(0);
+		}
+	}
+	else if ((axis >= 3) && (axis < 6))
+	{
+		switch (num)
+		{
+			case B3_CONSTRAINT_STOP_ERP:
+				m_angularLimits[axis - 3].m_stopERP = value;
+				m_flags |= B3_6DOF_FLAGS_ERP_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case B3_CONSTRAINT_STOP_CFM:
+				m_angularLimits[axis - 3].m_stopCFM = value;
+				m_flags |= B3_6DOF_FLAGS_CFM_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case B3_CONSTRAINT_CFM:
+				m_angularLimits[axis - 3].m_normalCFM = value;
+				m_flags |= B3_6DOF_FLAGS_CFM_NORM << (axis * B3_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			default:
+				b3AssertConstrParams(0);
+		}
+	}
+	else
+	{
+		b3AssertConstrParams(0);
+	}
+}
+
+///return the local value of parameter
+b3Scalar b3Generic6DofConstraint::getParam(int num, int axis) const
+{
+	b3Scalar retVal = 0;
+	if ((axis >= 0) && (axis < 3))
+	{
+		switch (num)
+		{
+			case B3_CONSTRAINT_STOP_ERP:
+				b3AssertConstrParams(m_flags & (B3_6DOF_FLAGS_ERP_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_linearLimits.m_stopERP[axis];
+				break;
+			case B3_CONSTRAINT_STOP_CFM:
+				b3AssertConstrParams(m_flags & (B3_6DOF_FLAGS_CFM_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_linearLimits.m_stopCFM[axis];
+				break;
+			case B3_CONSTRAINT_CFM:
+				b3AssertConstrParams(m_flags & (B3_6DOF_FLAGS_CFM_NORM << (axis * B3_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_linearLimits.m_normalCFM[axis];
+				break;
+			default:
+				b3AssertConstrParams(0);
+		}
+	}
+	else if ((axis >= 3) && (axis < 6))
+	{
+		switch (num)
+		{
+			case B3_CONSTRAINT_STOP_ERP:
+				b3AssertConstrParams(m_flags & (B3_6DOF_FLAGS_ERP_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_angularLimits[axis - 3].m_stopERP;
+				break;
+			case B3_CONSTRAINT_STOP_CFM:
+				b3AssertConstrParams(m_flags & (B3_6DOF_FLAGS_CFM_STOP << (axis * B3_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_angularLimits[axis - 3].m_stopCFM;
+				break;
+			case B3_CONSTRAINT_CFM:
+				b3AssertConstrParams(m_flags & (B3_6DOF_FLAGS_CFM_NORM << (axis * B3_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_angularLimits[axis - 3].m_normalCFM;
+				break;
+			default:
+				b3AssertConstrParams(0);
+		}
+	}
+	else
+	{
+		b3AssertConstrParams(0);
+	}
+	return retVal;
+}
+
+void b3Generic6DofConstraint::setAxis(const b3Vector3& axis1, const b3Vector3& axis2, const b3RigidBodyData* bodies)
+{
+	b3Vector3 zAxis = axis1.normalized();
+	b3Vector3 yAxis = axis2.normalized();
+	b3Vector3 xAxis = yAxis.cross(zAxis);  // we want right coordinate system
+
+	b3Transform frameInW;
+	frameInW.setIdentity();
+	frameInW.getBasis().setValue(xAxis[0], yAxis[0], zAxis[0],
+								 xAxis[1], yAxis[1], zAxis[1],
+								 xAxis[2], yAxis[2], zAxis[2]);
+
+	// now get constraint frame in local coordinate systems
+	m_frameInA = getCenterOfMassTransform(bodies[m_rbA]).inverse() * frameInW;
+	m_frameInB = getCenterOfMassTransform(bodies[m_rbB]).inverse() * frameInW;
+
+	calculateTransforms(bodies);
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h
new file mode 100644
index 0000000..d162d58
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h
@@ -0,0 +1,517 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// 2009 March: b3Generic6DofConstraint refactored by Roman Ponomarev
+/// Added support for generic constraint solver through getInfo1/getInfo2 methods
+
+/*
+2007-09-09
+b3Generic6DofConstraint Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
+
+#ifndef B3_GENERIC_6DOF_CONSTRAINT_H
+#define B3_GENERIC_6DOF_CONSTRAINT_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "b3JacobianEntry.h"
+#include "b3TypedConstraint.h"
+
+struct b3RigidBodyData;
+
+//! Rotation Limit structure for generic joints
+class b3RotationalLimitMotor
+{
+public:
+	//! limit_parameters
+	//!@{
+	b3Scalar m_loLimit;         //!< joint limit
+	b3Scalar m_hiLimit;         //!< joint limit
+	b3Scalar m_targetVelocity;  //!< target motor velocity
+	b3Scalar m_maxMotorForce;   //!< max force on motor
+	b3Scalar m_maxLimitForce;   //!< max force on limit
+	b3Scalar m_damping;         //!< Damping.
+	b3Scalar m_limitSoftness;   //! Relaxation factor
+	b3Scalar m_normalCFM;       //!< Constraint force mixing factor
+	b3Scalar m_stopERP;         //!< Error tolerance factor when joint is at limit
+	b3Scalar m_stopCFM;         //!< Constraint force mixing factor when joint is at limit
+	b3Scalar m_bounce;          //!< restitution factor
+	bool m_enableMotor;
+
+	//!@}
+
+	//! temp_variables
+	//!@{
+	b3Scalar m_currentLimitError;  //!  How much is violated this limit
+	b3Scalar m_currentPosition;    //!  current value of angle
+	int m_currentLimit;            //!< 0=free, 1=at lo limit, 2=at hi limit
+	b3Scalar m_accumulatedImpulse;
+	//!@}
+
+	b3RotationalLimitMotor()
+	{
+		m_accumulatedImpulse = 0.f;
+		m_targetVelocity = 0;
+		m_maxMotorForce = 6.0f;
+		m_maxLimitForce = 300.0f;
+		m_loLimit = 1.0f;
+		m_hiLimit = -1.0f;
+		m_normalCFM = 0.f;
+		m_stopERP = 0.2f;
+		m_stopCFM = 0.f;
+		m_bounce = 0.0f;
+		m_damping = 1.0f;
+		m_limitSoftness = 0.5f;
+		m_currentLimit = 0;
+		m_currentLimitError = 0;
+		m_enableMotor = false;
+	}
+
+	b3RotationalLimitMotor(const b3RotationalLimitMotor& limot)
+	{
+		m_targetVelocity = limot.m_targetVelocity;
+		m_maxMotorForce = limot.m_maxMotorForce;
+		m_limitSoftness = limot.m_limitSoftness;
+		m_loLimit = limot.m_loLimit;
+		m_hiLimit = limot.m_hiLimit;
+		m_normalCFM = limot.m_normalCFM;
+		m_stopERP = limot.m_stopERP;
+		m_stopCFM = limot.m_stopCFM;
+		m_bounce = limot.m_bounce;
+		m_currentLimit = limot.m_currentLimit;
+		m_currentLimitError = limot.m_currentLimitError;
+		m_enableMotor = limot.m_enableMotor;
+	}
+
+	//! Is limited
+	bool isLimited()
+	{
+		if (m_loLimit > m_hiLimit) return false;
+		return true;
+	}
+
+	//! Need apply correction
+	bool needApplyTorques()
+	{
+		if (m_currentLimit == 0 && m_enableMotor == false) return false;
+		return true;
+	}
+
+	//! calculates  error
+	/*!
+	calculates m_currentLimit and m_currentLimitError.
+	*/
+	int testLimitValue(b3Scalar test_value);
+
+	//! apply the correction impulses for two bodies
+	b3Scalar solveAngularLimits(b3Scalar timeStep, b3Vector3& axis, b3Scalar jacDiagABInv, b3RigidBodyData* body0, b3RigidBodyData* body1);
+};
+
+class b3TranslationalLimitMotor
+{
+public:
+	b3Vector3 m_lowerLimit;  //!< the constraint lower limits
+	b3Vector3 m_upperLimit;  //!< the constraint upper limits
+	b3Vector3 m_accumulatedImpulse;
+	//! Linear_Limit_parameters
+	//!@{
+	b3Vector3 m_normalCFM;          //!< Constraint force mixing factor
+	b3Vector3 m_stopERP;            //!< Error tolerance factor when joint is at limit
+	b3Vector3 m_stopCFM;            //!< Constraint force mixing factor when joint is at limit
+	b3Vector3 m_targetVelocity;     //!< target motor velocity
+	b3Vector3 m_maxMotorForce;      //!< max force on motor
+	b3Vector3 m_currentLimitError;  //!  How much is violated this limit
+	b3Vector3 m_currentLinearDiff;  //!  Current relative offset of constraint frames
+	b3Scalar m_limitSoftness;       //!< Softness for linear limit
+	b3Scalar m_damping;             //!< Damping for linear limit
+	b3Scalar m_restitution;         //! Bounce parameter for linear limit
+	//!@}
+	bool m_enableMotor[3];
+	int m_currentLimit[3];  //!< 0=free, 1=at lower limit, 2=at upper limit
+
+	b3TranslationalLimitMotor()
+	{
+		m_lowerLimit.setValue(0.f, 0.f, 0.f);
+		m_upperLimit.setValue(0.f, 0.f, 0.f);
+		m_accumulatedImpulse.setValue(0.f, 0.f, 0.f);
+		m_normalCFM.setValue(0.f, 0.f, 0.f);
+		m_stopERP.setValue(0.2f, 0.2f, 0.2f);
+		m_stopCFM.setValue(0.f, 0.f, 0.f);
+
+		m_limitSoftness = 0.7f;
+		m_damping = b3Scalar(1.0f);
+		m_restitution = b3Scalar(0.5f);
+		for (int i = 0; i < 3; i++)
+		{
+			m_enableMotor[i] = false;
+			m_targetVelocity[i] = b3Scalar(0.f);
+			m_maxMotorForce[i] = b3Scalar(0.f);
+		}
+	}
+
+	b3TranslationalLimitMotor(const b3TranslationalLimitMotor& other)
+	{
+		m_lowerLimit = other.m_lowerLimit;
+		m_upperLimit = other.m_upperLimit;
+		m_accumulatedImpulse = other.m_accumulatedImpulse;
+
+		m_limitSoftness = other.m_limitSoftness;
+		m_damping = other.m_damping;
+		m_restitution = other.m_restitution;
+		m_normalCFM = other.m_normalCFM;
+		m_stopERP = other.m_stopERP;
+		m_stopCFM = other.m_stopCFM;
+
+		for (int i = 0; i < 3; i++)
+		{
+			m_enableMotor[i] = other.m_enableMotor[i];
+			m_targetVelocity[i] = other.m_targetVelocity[i];
+			m_maxMotorForce[i] = other.m_maxMotorForce[i];
+		}
+	}
+
+	//! Test limit
+	/*!
+    - free means upper < lower,
+    - locked means upper == lower
+    - limited means upper > lower
+    - limitIndex: first 3 are linear, next 3 are angular
+    */
+	inline bool isLimited(int limitIndex)
+	{
+		return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]);
+	}
+	inline bool needApplyForce(int limitIndex)
+	{
+		if (m_currentLimit[limitIndex] == 0 && m_enableMotor[limitIndex] == false) return false;
+		return true;
+	}
+	int testLimitValue(int limitIndex, b3Scalar test_value);
+
+	b3Scalar solveLinearAxis(
+		b3Scalar timeStep,
+		b3Scalar jacDiagABInv,
+		b3RigidBodyData& body1, const b3Vector3& pointInA,
+		b3RigidBodyData& body2, const b3Vector3& pointInB,
+		int limit_index,
+		const b3Vector3& axis_normal_on_a,
+		const b3Vector3& anchorPos);
+};
+
+enum b36DofFlags
+{
+	B3_6DOF_FLAGS_CFM_NORM = 1,
+	B3_6DOF_FLAGS_CFM_STOP = 2,
+	B3_6DOF_FLAGS_ERP_STOP = 4
+};
+#define B3_6DOF_FLAGS_AXIS_SHIFT 3  // bits per axis
+
+/// b3Generic6DofConstraint between two rigidbodies each with a pivotpoint that descibes the axis location in local space
+/*!
+b3Generic6DofConstraint can leave any of the 6 degree of freedom 'free' or 'locked'.
+currently this limit supports rotational motors<br>
+<ul>
+<li> For Linear limits, use b3Generic6DofConstraint.setLinearUpperLimit, b3Generic6DofConstraint.setLinearLowerLimit. You can set the parameters with the b3TranslationalLimitMotor structure accsesible through the b3Generic6DofConstraint.getTranslationalLimitMotor method.
+At this moment translational motors are not supported. May be in the future. </li>
+
+<li> For Angular limits, use the b3RotationalLimitMotor structure for configuring the limit.
+This is accessible through b3Generic6DofConstraint.getLimitMotor method,
+This brings support for limit parameters and motors. </li>
+
+<li> Angulars limits have these possible ranges:
+<table border=1 >
+<tr>
+	<td><b>AXIS</b></td>
+	<td><b>MIN ANGLE</b></td>
+	<td><b>MAX ANGLE</b></td>
+</tr><tr>
+	<td>X</td>
+	<td>-PI</td>
+	<td>PI</td>
+</tr><tr>
+	<td>Y</td>
+	<td>-PI/2</td>
+	<td>PI/2</td>
+</tr><tr>
+	<td>Z</td>
+	<td>-PI</td>
+	<td>PI</td>
+</tr>
+</table>
+</li>
+</ul>
+
+*/
+B3_ATTRIBUTE_ALIGNED16(class)
+b3Generic6DofConstraint : public b3TypedConstraint
+{
+protected:
+	//! relative_frames
+	//!@{
+	b3Transform m_frameInA;  //!< the constraint space w.r.t body A
+	b3Transform m_frameInB;  //!< the constraint space w.r.t body B
+	//!@}
+
+	//! Jacobians
+	//!@{
+	//    b3JacobianEntry	m_jacLinear[3];//!< 3 orthogonal linear constraints
+	//    b3JacobianEntry	m_jacAng[3];//!< 3 orthogonal angular constraints
+	//!@}
+
+	//! Linear_Limit_parameters
+	//!@{
+	b3TranslationalLimitMotor m_linearLimits;
+	//!@}
+
+	//! hinge_parameters
+	//!@{
+	b3RotationalLimitMotor m_angularLimits[3];
+	//!@}
+
+protected:
+	//! temporal variables
+	//!@{
+	b3Transform m_calculatedTransformA;
+	b3Transform m_calculatedTransformB;
+	b3Vector3 m_calculatedAxisAngleDiff;
+	b3Vector3 m_calculatedAxis[3];
+	b3Vector3 m_calculatedLinearDiff;
+	b3Scalar m_timeStep;
+	b3Scalar m_factA;
+	b3Scalar m_factB;
+	bool m_hasStaticBody;
+
+	b3Vector3 m_AnchorPos;  // point betwen pivots of bodies A and B to solve linear axes
+
+	bool m_useLinearReferenceFrameA;
+	bool m_useOffsetForConstraintFrame;
+
+	int m_flags;
+
+	//!@}
+
+	b3Generic6DofConstraint& operator=(b3Generic6DofConstraint& other)
+	{
+		b3Assert(0);
+		(void)other;
+		return *this;
+	}
+
+	int setAngularLimits(b3ConstraintInfo2 * info, int row_offset, const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB);
+
+	int setLinearLimits(b3ConstraintInfo2 * info, int row, const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB);
+
+	// tests linear limits
+	void calculateLinearInfo();
+
+	//! calcs the euler angles between the two bodies.
+	void calculateAngleInfo();
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3Generic6DofConstraint(int rbA, int rbB, const b3Transform& frameInA, const b3Transform& frameInB, bool useLinearReferenceFrameA, const b3RigidBodyData* bodies);
+
+	//! Calcs global transform of the offsets
+	/*!
+	Calcs the global transform for the joint offset for body A an B, and also calcs the agle differences between the bodies.
+	\sa b3Generic6DofConstraint.getCalculatedTransformA , b3Generic6DofConstraint.getCalculatedTransformB, b3Generic6DofConstraint.calculateAngleInfo
+	*/
+	void calculateTransforms(const b3Transform& transA, const b3Transform& transB, const b3RigidBodyData* bodies);
+
+	void calculateTransforms(const b3RigidBodyData* bodies);
+
+	//! Gets the global transform of the offset for body A
+	/*!
+    \sa b3Generic6DofConstraint.getFrameOffsetA, b3Generic6DofConstraint.getFrameOffsetB, b3Generic6DofConstraint.calculateAngleInfo.
+    */
+	const b3Transform& getCalculatedTransformA() const
+	{
+		return m_calculatedTransformA;
+	}
+
+	//! Gets the global transform of the offset for body B
+	/*!
+    \sa b3Generic6DofConstraint.getFrameOffsetA, b3Generic6DofConstraint.getFrameOffsetB, b3Generic6DofConstraint.calculateAngleInfo.
+    */
+	const b3Transform& getCalculatedTransformB() const
+	{
+		return m_calculatedTransformB;
+	}
+
+	const b3Transform& getFrameOffsetA() const
+	{
+		return m_frameInA;
+	}
+
+	const b3Transform& getFrameOffsetB() const
+	{
+		return m_frameInB;
+	}
+
+	b3Transform& getFrameOffsetA()
+	{
+		return m_frameInA;
+	}
+
+	b3Transform& getFrameOffsetB()
+	{
+		return m_frameInB;
+	}
+
+	virtual void getInfo1(b3ConstraintInfo1 * info, const b3RigidBodyData* bodies);
+
+	void getInfo1NonVirtual(b3ConstraintInfo1 * info, const b3RigidBodyData* bodies);
+
+	virtual void getInfo2(b3ConstraintInfo2 * info, const b3RigidBodyData* bodies);
+
+	void getInfo2NonVirtual(b3ConstraintInfo2 * info, const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB, const b3RigidBodyData* bodies);
+
+	void updateRHS(b3Scalar timeStep);
+
+	//! Get the rotation axis in global coordinates
+	b3Vector3 getAxis(int axis_index) const;
+
+	//! Get the relative Euler angle
+	/*!
+	\pre b3Generic6DofConstraint::calculateTransforms() must be called previously.
+	*/
+	b3Scalar getAngle(int axis_index) const;
+
+	//! Get the relative position of the constraint pivot
+	/*!
+	\pre b3Generic6DofConstraint::calculateTransforms() must be called previously.
+	*/
+	b3Scalar getRelativePivotPosition(int axis_index) const;
+
+	void setFrames(const b3Transform& frameA, const b3Transform& frameB, const b3RigidBodyData* bodies);
+
+	//! Test angular limit.
+	/*!
+	Calculates angular correction and returns true if limit needs to be corrected.
+	\pre b3Generic6DofConstraint::calculateTransforms() must be called previously.
+	*/
+	bool testAngularLimitMotor(int axis_index);
+
+	void setLinearLowerLimit(const b3Vector3& linearLower)
+	{
+		m_linearLimits.m_lowerLimit = linearLower;
+	}
+
+	void getLinearLowerLimit(b3Vector3 & linearLower)
+	{
+		linearLower = m_linearLimits.m_lowerLimit;
+	}
+
+	void setLinearUpperLimit(const b3Vector3& linearUpper)
+	{
+		m_linearLimits.m_upperLimit = linearUpper;
+	}
+
+	void getLinearUpperLimit(b3Vector3 & linearUpper)
+	{
+		linearUpper = m_linearLimits.m_upperLimit;
+	}
+
+	void setAngularLowerLimit(const b3Vector3& angularLower)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_loLimit = b3NormalizeAngle(angularLower[i]);
+	}
+
+	void getAngularLowerLimit(b3Vector3 & angularLower)
+	{
+		for (int i = 0; i < 3; i++)
+			angularLower[i] = m_angularLimits[i].m_loLimit;
+	}
+
+	void setAngularUpperLimit(const b3Vector3& angularUpper)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_hiLimit = b3NormalizeAngle(angularUpper[i]);
+	}
+
+	void getAngularUpperLimit(b3Vector3 & angularUpper)
+	{
+		for (int i = 0; i < 3; i++)
+			angularUpper[i] = m_angularLimits[i].m_hiLimit;
+	}
+
+	//! Retrieves the angular limit informacion
+	b3RotationalLimitMotor* getRotationalLimitMotor(int index)
+	{
+		return &m_angularLimits[index];
+	}
+
+	//! Retrieves the  limit informacion
+	b3TranslationalLimitMotor* getTranslationalLimitMotor()
+	{
+		return &m_linearLimits;
+	}
+
+	//first 3 are linear, next 3 are angular
+	void setLimit(int axis, b3Scalar lo, b3Scalar hi)
+	{
+		if (axis < 3)
+		{
+			m_linearLimits.m_lowerLimit[axis] = lo;
+			m_linearLimits.m_upperLimit[axis] = hi;
+		}
+		else
+		{
+			lo = b3NormalizeAngle(lo);
+			hi = b3NormalizeAngle(hi);
+			m_angularLimits[axis - 3].m_loLimit = lo;
+			m_angularLimits[axis - 3].m_hiLimit = hi;
+		}
+	}
+
+	//! Test limit
+	/*!
+    - free means upper < lower,
+    - locked means upper == lower
+    - limited means upper > lower
+    - limitIndex: first 3 are linear, next 3 are angular
+    */
+	bool isLimited(int limitIndex)
+	{
+		if (limitIndex < 3)
+		{
+			return m_linearLimits.isLimited(limitIndex);
+		}
+		return m_angularLimits[limitIndex - 3].isLimited();
+	}
+
+	virtual void calcAnchorPos(const b3RigidBodyData* bodies);  // overridable
+
+	int get_limit_motor_info2(b3RotationalLimitMotor * limot,
+							  const b3Transform& transA, const b3Transform& transB, const b3Vector3& linVelA, const b3Vector3& linVelB, const b3Vector3& angVelA, const b3Vector3& angVelB,
+							  b3ConstraintInfo2* info, int row, b3Vector3& ax1, int rotational, int rotAllowed = false);
+
+	// access for UseFrameOffset
+	bool getUseFrameOffset() { return m_useOffsetForConstraintFrame; }
+	void setUseFrameOffset(bool frameOffsetOnOff) { m_useOffsetForConstraintFrame = frameOffsetOnOff; }
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, b3Scalar value, int axis = -1);
+	///return the local value of parameter
+	virtual b3Scalar getParam(int num, int axis = -1) const;
+
+	void setAxis(const b3Vector3& axis1, const b3Vector3& axis2, const b3RigidBodyData* bodies);
+};
+
+#endif  //B3_GENERIC_6DOF_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h
new file mode 100644
index 0000000..3cc4f60
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3JacobianEntry.h
@@ -0,0 +1,150 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_JACOBIAN_ENTRY_H
+#define B3_JACOBIAN_ENTRY_H
+
+#include "Bullet3Common/b3Matrix3x3.h"
+
+//notes:
+// Another memory optimization would be to store m_1MinvJt in the remaining 3 w components
+// which makes the b3JacobianEntry memory layout 16 bytes
+// if you only are interested in angular part, just feed massInvA and massInvB zero
+
+/// Jacobian entry is an abstraction that allows to describe constraints
+/// it can be used in combination with a constraint solver
+/// Can be used to relate the effect of an impulse to the constraint error
+B3_ATTRIBUTE_ALIGNED16(class)
+b3JacobianEntry
+{
+public:
+	b3JacobianEntry(){};
+	//constraint between two different rigidbodies
+	b3JacobianEntry(
+		const b3Matrix3x3& world2A,
+		const b3Matrix3x3& world2B,
+		const b3Vector3& rel_pos1, const b3Vector3& rel_pos2,
+		const b3Vector3& jointAxis,
+		const b3Vector3& inertiaInvA,
+		const b3Scalar massInvA,
+		const b3Vector3& inertiaInvB,
+		const b3Scalar massInvB)
+		: m_linearJointAxis(jointAxis)
+	{
+		m_aJ = world2A * (rel_pos1.cross(m_linearJointAxis));
+		m_bJ = world2B * (rel_pos2.cross(-m_linearJointAxis));
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = inertiaInvB * m_bJ;
+		m_Adiag = massInvA + m_0MinvJt.dot(m_aJ) + massInvB + m_1MinvJt.dot(m_bJ);
+
+		b3Assert(m_Adiag > b3Scalar(0.0));
+	}
+
+	//angular constraint between two different rigidbodies
+	b3JacobianEntry(const b3Vector3& jointAxis,
+					const b3Matrix3x3& world2A,
+					const b3Matrix3x3& world2B,
+					const b3Vector3& inertiaInvA,
+					const b3Vector3& inertiaInvB)
+		: m_linearJointAxis(b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.)))
+	{
+		m_aJ = world2A * jointAxis;
+		m_bJ = world2B * -jointAxis;
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = inertiaInvB * m_bJ;
+		m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ);
+
+		b3Assert(m_Adiag > b3Scalar(0.0));
+	}
+
+	//angular constraint between two different rigidbodies
+	b3JacobianEntry(const b3Vector3& axisInA,
+					const b3Vector3& axisInB,
+					const b3Vector3& inertiaInvA,
+					const b3Vector3& inertiaInvB)
+		: m_linearJointAxis(b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.))), m_aJ(axisInA), m_bJ(-axisInB)
+	{
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = inertiaInvB * m_bJ;
+		m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ);
+
+		b3Assert(m_Adiag > b3Scalar(0.0));
+	}
+
+	//constraint on one rigidbody
+	b3JacobianEntry(
+		const b3Matrix3x3& world2A,
+		const b3Vector3& rel_pos1, const b3Vector3& rel_pos2,
+		const b3Vector3& jointAxis,
+		const b3Vector3& inertiaInvA,
+		const b3Scalar massInvA)
+		: m_linearJointAxis(jointAxis)
+	{
+		m_aJ = world2A * (rel_pos1.cross(jointAxis));
+		m_bJ = world2A * (rel_pos2.cross(-jointAxis));
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+		m_Adiag = massInvA + m_0MinvJt.dot(m_aJ);
+
+		b3Assert(m_Adiag > b3Scalar(0.0));
+	}
+
+	b3Scalar getDiagonal() const { return m_Adiag; }
+
+	// for two constraints on the same rigidbody (for example vehicle friction)
+	b3Scalar getNonDiagonal(const b3JacobianEntry& jacB, const b3Scalar massInvA) const
+	{
+		const b3JacobianEntry& jacA = *this;
+		b3Scalar lin = massInvA * jacA.m_linearJointAxis.dot(jacB.m_linearJointAxis);
+		b3Scalar ang = jacA.m_0MinvJt.dot(jacB.m_aJ);
+		return lin + ang;
+	}
+
+	// for two constraints on sharing two same rigidbodies (for example two contact points between two rigidbodies)
+	b3Scalar getNonDiagonal(const b3JacobianEntry& jacB, const b3Scalar massInvA, const b3Scalar massInvB) const
+	{
+		const b3JacobianEntry& jacA = *this;
+		b3Vector3 lin = jacA.m_linearJointAxis * jacB.m_linearJointAxis;
+		b3Vector3 ang0 = jacA.m_0MinvJt * jacB.m_aJ;
+		b3Vector3 ang1 = jacA.m_1MinvJt * jacB.m_bJ;
+		b3Vector3 lin0 = massInvA * lin;
+		b3Vector3 lin1 = massInvB * lin;
+		b3Vector3 sum = ang0 + ang1 + lin0 + lin1;
+		return sum[0] + sum[1] + sum[2];
+	}
+
+	b3Scalar getRelativeVelocity(const b3Vector3& linvelA, const b3Vector3& angvelA, const b3Vector3& linvelB, const b3Vector3& angvelB)
+	{
+		b3Vector3 linrel = linvelA - linvelB;
+		b3Vector3 angvela = angvelA * m_aJ;
+		b3Vector3 angvelb = angvelB * m_bJ;
+		linrel *= m_linearJointAxis;
+		angvela += angvelb;
+		angvela += linrel;
+		b3Scalar rel_vel2 = angvela[0] + angvela[1] + angvela[2];
+		return rel_vel2 + B3_EPSILON;
+	}
+	//private:
+
+	b3Vector3 m_linearJointAxis;
+	b3Vector3 m_aJ;
+	b3Vector3 m_bJ;
+	b3Vector3 m_0MinvJt;
+	b3Vector3 m_1MinvJt;
+	//Optimization: can be stored in the w/last component of one of the vectors
+	b3Scalar m_Adiag;
+};
+
+#endif  //B3_JACOBIAN_ENTRY_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.cpp b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.cpp
new file mode 100644
index 0000000..b7050b1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.cpp
@@ -0,0 +1,1696 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2012 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//enable B3_SOLVER_DEBUG if you experience solver crashes
+//#define B3_SOLVER_DEBUG
+//#define COMPUTE_IMPULSE_DENOM 1
+//It is not necessary (redundant) to refresh contact manifolds, this refresh has been moved to the collision algorithms.
+
+//#define DISABLE_JOINTS
+
+#include "b3PgsJacobiSolver.h"
+#include "Bullet3Common/b3MinMax.h"
+#include "b3TypedConstraint.h"
+#include <new>
+#include "Bullet3Common/b3StackAlloc.h"
+
+//#include "b3SolverBody.h"
+//#include "b3SolverConstraint.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include <string.h>  //for memset
+//#include "../../dynamics/basic_demo/Stubs/AdlContact4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+static b3Transform getWorldTransform(b3RigidBodyData* rb)
+{
+	b3Transform newTrans;
+	newTrans.setOrigin(rb->m_pos);
+	newTrans.setRotation(rb->m_quat);
+	return newTrans;
+}
+
+static const b3Matrix3x3& getInvInertiaTensorWorld(b3InertiaData* inertia)
+{
+	return inertia->m_invInertiaWorld;
+}
+
+static const b3Vector3& getLinearVelocity(b3RigidBodyData* rb)
+{
+	return rb->m_linVel;
+}
+
+static const b3Vector3& getAngularVelocity(b3RigidBodyData* rb)
+{
+	return rb->m_angVel;
+}
+
+static b3Vector3 getVelocityInLocalPoint(b3RigidBodyData* rb, const b3Vector3& rel_pos)
+{
+	//we also calculate lin/ang velocity for kinematic objects
+	return getLinearVelocity(rb) + getAngularVelocity(rb).cross(rel_pos);
+}
+
+struct b3ContactPoint
+{
+	b3Vector3 m_positionWorldOnA;
+	b3Vector3 m_positionWorldOnB;
+	b3Vector3 m_normalWorldOnB;
+	b3Scalar m_appliedImpulse;
+	b3Scalar m_distance;
+	b3Scalar m_combinedRestitution;
+
+	///information related to friction
+	b3Scalar m_combinedFriction;
+	b3Vector3 m_lateralFrictionDir1;
+	b3Vector3 m_lateralFrictionDir2;
+	b3Scalar m_appliedImpulseLateral1;
+	b3Scalar m_appliedImpulseLateral2;
+	b3Scalar m_combinedRollingFriction;
+	b3Scalar m_contactMotion1;
+	b3Scalar m_contactMotion2;
+	b3Scalar m_contactCFM1;
+	b3Scalar m_contactCFM2;
+
+	bool m_lateralFrictionInitialized;
+
+	b3Vector3 getPositionWorldOnA()
+	{
+		return m_positionWorldOnA;
+	}
+	b3Vector3 getPositionWorldOnB()
+	{
+		return m_positionWorldOnB;
+	}
+	b3Scalar getDistance()
+	{
+		return m_distance;
+	}
+};
+
+void getContactPoint(b3Contact4* contact, int contactIndex, b3ContactPoint& pointOut)
+{
+	pointOut.m_appliedImpulse = 0.f;
+	pointOut.m_appliedImpulseLateral1 = 0.f;
+	pointOut.m_appliedImpulseLateral2 = 0.f;
+	pointOut.m_combinedFriction = contact->getFrictionCoeff();
+	pointOut.m_combinedRestitution = contact->getRestituitionCoeff();
+	pointOut.m_combinedRollingFriction = 0.f;
+	pointOut.m_contactCFM1 = 0.f;
+	pointOut.m_contactCFM2 = 0.f;
+	pointOut.m_contactMotion1 = 0.f;
+	pointOut.m_contactMotion2 = 0.f;
+	pointOut.m_distance = contact->getPenetration(contactIndex);  //??0.01f
+	b3Vector3 normalOnB = contact->m_worldNormalOnB;
+	normalOnB.normalize();  //is this needed?
+
+	b3Vector3 l1, l2;
+	b3PlaneSpace1(normalOnB, l1, l2);
+
+	pointOut.m_normalWorldOnB = normalOnB;
+	//printf("normalOnB = %f,%f,%f\n",normalOnB.getX(),normalOnB.getY(),normalOnB.getZ());
+	pointOut.m_lateralFrictionDir1 = l1;
+	pointOut.m_lateralFrictionDir2 = l2;
+	pointOut.m_lateralFrictionInitialized = true;
+
+	b3Vector3 worldPosB = contact->m_worldPosB[contactIndex];
+	pointOut.m_positionWorldOnB = worldPosB;
+	pointOut.m_positionWorldOnA = worldPosB + normalOnB * pointOut.m_distance;
+}
+
+int getNumContacts(b3Contact4* contact)
+{
+	return contact->getNPoints();
+}
+
+b3PgsJacobiSolver::b3PgsJacobiSolver(bool usePgs)
+	: m_usePgs(usePgs),
+	  m_numSplitImpulseRecoveries(0),
+	  m_btSeed2(0)
+{
+}
+
+b3PgsJacobiSolver::~b3PgsJacobiSolver()
+{
+}
+
+void b3PgsJacobiSolver::solveContacts(int numBodies, b3RigidBodyData* bodies, b3InertiaData* inertias, int numContacts, b3Contact4* contacts, int numConstraints, b3TypedConstraint** constraints)
+{
+	b3ContactSolverInfo infoGlobal;
+	infoGlobal.m_splitImpulse = false;
+	infoGlobal.m_timeStep = 1.f / 60.f;
+	infoGlobal.m_numIterations = 4;  //4;
+									 //	infoGlobal.m_solverMode|=B3_SOLVER_USE_2_FRICTION_DIRECTIONS|B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS|B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION;
+	//infoGlobal.m_solverMode|=B3_SOLVER_USE_2_FRICTION_DIRECTIONS|B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS;
+	infoGlobal.m_solverMode |= B3_SOLVER_USE_2_FRICTION_DIRECTIONS;
+
+	//if (infoGlobal.m_solverMode & B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS)
+	//if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION))
+
+	solveGroup(bodies, inertias, numBodies, contacts, numContacts, constraints, numConstraints, infoGlobal);
+
+	if (!numContacts)
+		return;
+}
+
+/// b3PgsJacobiSolver Sequentially applies impulses
+b3Scalar b3PgsJacobiSolver::solveGroup(b3RigidBodyData* bodies,
+									   b3InertiaData* inertias,
+									   int numBodies,
+									   b3Contact4* manifoldPtr,
+									   int numManifolds,
+									   b3TypedConstraint** constraints,
+									   int numConstraints,
+									   const b3ContactSolverInfo& infoGlobal)
+{
+	B3_PROFILE("solveGroup");
+	//you need to provide at least some bodies
+
+	solveGroupCacheFriendlySetup(bodies, inertias, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal);
+
+	solveGroupCacheFriendlyIterations(constraints, numConstraints, infoGlobal);
+
+	solveGroupCacheFriendlyFinish(bodies, inertias, numBodies, infoGlobal);
+
+	return 0.f;
+}
+
+#ifdef USE_SIMD
+#include <emmintrin.h>
+#define b3VecSplat(x, e) _mm_shuffle_ps(x, x, _MM_SHUFFLE(e, e, e, e))
+static inline __m128 b3SimdDot3(__m128 vec0, __m128 vec1)
+{
+	__m128 result = _mm_mul_ps(vec0, vec1);
+	return _mm_add_ps(b3VecSplat(result, 0), _mm_add_ps(b3VecSplat(result, 1), b3VecSplat(result, 2)));
+}
+#endif  //USE_SIMD
+
+// Project Gauss Seidel or the equivalent Sequential Impulse
+void b3PgsJacobiSolver::resolveSingleConstraintRowGenericSIMD(b3SolverBody& body1, b3SolverBody& body2, const b3SolverConstraint& c)
+{
+#ifdef USE_SIMD
+	__m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse);
+	__m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit);
+	__m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit);
+	__m128 deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse), _mm_set1_ps(c.m_cfm)));
+	__m128 deltaVel1Dotn = _mm_add_ps(b3SimdDot3(c.m_contactNormal.mVec128, body1.internalGetDeltaLinearVelocity().mVec128), b3SimdDot3(c.m_relpos1CrossNormal.mVec128, body1.internalGetDeltaAngularVelocity().mVec128));
+	__m128 deltaVel2Dotn = _mm_sub_ps(b3SimdDot3(c.m_relpos2CrossNormal.mVec128, body2.internalGetDeltaAngularVelocity().mVec128), b3SimdDot3((c.m_contactNormal).mVec128, body2.internalGetDeltaLinearVelocity().mVec128));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	b3SimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse);
+	b3SimdScalar resultLowerLess, resultUpperLess;
+	resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1);
+	resultUpperLess = _mm_cmplt_ps(sum, upperLimit1);
+	__m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse));
+	c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum));
+	__m128 upperMinApplied = _mm_sub_ps(upperLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultUpperLess, deltaImpulse), _mm_andnot_ps(resultUpperLess, upperMinApplied));
+	c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultUpperLess, c.m_appliedImpulse), _mm_andnot_ps(resultUpperLess, upperLimit1));
+	__m128 linearComponentA = _mm_mul_ps(c.m_contactNormal.mVec128, body1.internalGetInvMass().mVec128);
+	__m128 linearComponentB = _mm_mul_ps((c.m_contactNormal).mVec128, body2.internalGetInvMass().mVec128);
+	__m128 impulseMagnitude = deltaImpulse;
+	body1.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude));
+	body1.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude));
+	body2.internalGetDeltaLinearVelocity().mVec128 = _mm_sub_ps(body2.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude));
+	body2.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude));
+#else
+	resolveSingleConstraintRowGeneric(body1, body2, c);
+#endif
+}
+
+// Project Gauss Seidel or the equivalent Sequential Impulse
+void b3PgsJacobiSolver::resolveSingleConstraintRowGeneric(b3SolverBody& body1, b3SolverBody& body2, const b3SolverConstraint& c)
+{
+	b3Scalar deltaImpulse = c.m_rhs - b3Scalar(c.m_appliedImpulse) * c.m_cfm;
+	const b3Scalar deltaVel1Dotn = c.m_contactNormal.dot(body1.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetDeltaAngularVelocity());
+	const b3Scalar deltaVel2Dotn = -c.m_contactNormal.dot(body2.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetDeltaAngularVelocity());
+
+	//	const b3Scalar delta_rel_vel	=	deltaVel1Dotn-deltaVel2Dotn;
+	deltaImpulse -= deltaVel1Dotn * c.m_jacDiagABInv;
+	deltaImpulse -= deltaVel2Dotn * c.m_jacDiagABInv;
+
+	const b3Scalar sum = b3Scalar(c.m_appliedImpulse) + deltaImpulse;
+	if (sum < c.m_lowerLimit)
+	{
+		deltaImpulse = c.m_lowerLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_lowerLimit;
+	}
+	else if (sum > c.m_upperLimit)
+	{
+		deltaImpulse = c.m_upperLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_upperLimit;
+	}
+	else
+	{
+		c.m_appliedImpulse = sum;
+	}
+
+	body1.internalApplyImpulse(c.m_contactNormal * body1.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+	body2.internalApplyImpulse(-c.m_contactNormal * body2.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+}
+
+void b3PgsJacobiSolver::resolveSingleConstraintRowLowerLimitSIMD(b3SolverBody& body1, b3SolverBody& body2, const b3SolverConstraint& c)
+{
+#ifdef USE_SIMD
+	__m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse);
+	__m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit);
+	__m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit);
+	__m128 deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse), _mm_set1_ps(c.m_cfm)));
+	__m128 deltaVel1Dotn = _mm_add_ps(b3SimdDot3(c.m_contactNormal.mVec128, body1.internalGetDeltaLinearVelocity().mVec128), b3SimdDot3(c.m_relpos1CrossNormal.mVec128, body1.internalGetDeltaAngularVelocity().mVec128));
+	__m128 deltaVel2Dotn = _mm_sub_ps(b3SimdDot3(c.m_relpos2CrossNormal.mVec128, body2.internalGetDeltaAngularVelocity().mVec128), b3SimdDot3((c.m_contactNormal).mVec128, body2.internalGetDeltaLinearVelocity().mVec128));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	b3SimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse);
+	b3SimdScalar resultLowerLess, resultUpperLess;
+	resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1);
+	resultUpperLess = _mm_cmplt_ps(sum, upperLimit1);
+	__m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse));
+	c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum));
+	__m128 linearComponentA = _mm_mul_ps(c.m_contactNormal.mVec128, body1.internalGetInvMass().mVec128);
+	__m128 linearComponentB = _mm_mul_ps((c.m_contactNormal).mVec128, body2.internalGetInvMass().mVec128);
+	__m128 impulseMagnitude = deltaImpulse;
+	body1.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude));
+	body1.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude));
+	body2.internalGetDeltaLinearVelocity().mVec128 = _mm_sub_ps(body2.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude));
+	body2.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude));
+#else
+	resolveSingleConstraintRowLowerLimit(body1, body2, c);
+#endif
+}
+
+// Project Gauss Seidel or the equivalent Sequential Impulse
+void b3PgsJacobiSolver::resolveSingleConstraintRowLowerLimit(b3SolverBody& body1, b3SolverBody& body2, const b3SolverConstraint& c)
+{
+	b3Scalar deltaImpulse = c.m_rhs - b3Scalar(c.m_appliedImpulse) * c.m_cfm;
+	const b3Scalar deltaVel1Dotn = c.m_contactNormal.dot(body1.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetDeltaAngularVelocity());
+	const b3Scalar deltaVel2Dotn = -c.m_contactNormal.dot(body2.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetDeltaAngularVelocity());
+
+	deltaImpulse -= deltaVel1Dotn * c.m_jacDiagABInv;
+	deltaImpulse -= deltaVel2Dotn * c.m_jacDiagABInv;
+	const b3Scalar sum = b3Scalar(c.m_appliedImpulse) + deltaImpulse;
+	if (sum < c.m_lowerLimit)
+	{
+		deltaImpulse = c.m_lowerLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_lowerLimit;
+	}
+	else
+	{
+		c.m_appliedImpulse = sum;
+	}
+	body1.internalApplyImpulse(c.m_contactNormal * body1.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+	body2.internalApplyImpulse(-c.m_contactNormal * body2.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+}
+
+void b3PgsJacobiSolver::resolveSplitPenetrationImpulseCacheFriendly(
+	b3SolverBody& body1,
+	b3SolverBody& body2,
+	const b3SolverConstraint& c)
+{
+	if (c.m_rhsPenetration)
+	{
+		m_numSplitImpulseRecoveries++;
+		b3Scalar deltaImpulse = c.m_rhsPenetration - b3Scalar(c.m_appliedPushImpulse) * c.m_cfm;
+		const b3Scalar deltaVel1Dotn = c.m_contactNormal.dot(body1.internalGetPushVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetTurnVelocity());
+		const b3Scalar deltaVel2Dotn = -c.m_contactNormal.dot(body2.internalGetPushVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetTurnVelocity());
+
+		deltaImpulse -= deltaVel1Dotn * c.m_jacDiagABInv;
+		deltaImpulse -= deltaVel2Dotn * c.m_jacDiagABInv;
+		const b3Scalar sum = b3Scalar(c.m_appliedPushImpulse) + deltaImpulse;
+		if (sum < c.m_lowerLimit)
+		{
+			deltaImpulse = c.m_lowerLimit - c.m_appliedPushImpulse;
+			c.m_appliedPushImpulse = c.m_lowerLimit;
+		}
+		else
+		{
+			c.m_appliedPushImpulse = sum;
+		}
+		body1.internalApplyPushImpulse(c.m_contactNormal * body1.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+		body2.internalApplyPushImpulse(-c.m_contactNormal * body2.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+	}
+}
+
+void b3PgsJacobiSolver::resolveSplitPenetrationSIMD(b3SolverBody& body1, b3SolverBody& body2, const b3SolverConstraint& c)
+{
+#ifdef USE_SIMD
+	if (!c.m_rhsPenetration)
+		return;
+
+	m_numSplitImpulseRecoveries++;
+
+	__m128 cpAppliedImp = _mm_set1_ps(c.m_appliedPushImpulse);
+	__m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit);
+	__m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit);
+	__m128 deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhsPenetration), _mm_mul_ps(_mm_set1_ps(c.m_appliedPushImpulse), _mm_set1_ps(c.m_cfm)));
+	__m128 deltaVel1Dotn = _mm_add_ps(b3SimdDot3(c.m_contactNormal.mVec128, body1.internalGetPushVelocity().mVec128), b3SimdDot3(c.m_relpos1CrossNormal.mVec128, body1.internalGetTurnVelocity().mVec128));
+	__m128 deltaVel2Dotn = _mm_sub_ps(b3SimdDot3(c.m_relpos2CrossNormal.mVec128, body2.internalGetTurnVelocity().mVec128), b3SimdDot3((c.m_contactNormal).mVec128, body2.internalGetPushVelocity().mVec128));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	b3SimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse);
+	b3SimdScalar resultLowerLess, resultUpperLess;
+	resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1);
+	resultUpperLess = _mm_cmplt_ps(sum, upperLimit1);
+	__m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse));
+	c.m_appliedPushImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum));
+	__m128 linearComponentA = _mm_mul_ps(c.m_contactNormal.mVec128, body1.internalGetInvMass().mVec128);
+	__m128 linearComponentB = _mm_mul_ps((c.m_contactNormal).mVec128, body2.internalGetInvMass().mVec128);
+	__m128 impulseMagnitude = deltaImpulse;
+	body1.internalGetPushVelocity().mVec128 = _mm_add_ps(body1.internalGetPushVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude));
+	body1.internalGetTurnVelocity().mVec128 = _mm_add_ps(body1.internalGetTurnVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude));
+	body2.internalGetPushVelocity().mVec128 = _mm_sub_ps(body2.internalGetPushVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude));
+	body2.internalGetTurnVelocity().mVec128 = _mm_add_ps(body2.internalGetTurnVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude));
+#else
+	resolveSplitPenetrationImpulseCacheFriendly(body1, body2, c);
+#endif
+}
+
+unsigned long b3PgsJacobiSolver::b3Rand2()
+{
+	m_btSeed2 = (1664525L * m_btSeed2 + 1013904223L) & 0xffffffff;
+	return m_btSeed2;
+}
+
+//See ODE: adam's all-int straightforward(?) dRandInt (0..n-1)
+int b3PgsJacobiSolver::b3RandInt2(int n)
+{
+	// seems good; xor-fold and modulus
+	const unsigned long un = static_cast<unsigned long>(n);
+	unsigned long r = b3Rand2();
+
+	// note: probably more aggressive than it needs to be -- might be
+	//       able to get away without one or two of the innermost branches.
+	if (un <= 0x00010000UL)
+	{
+		r ^= (r >> 16);
+		if (un <= 0x00000100UL)
+		{
+			r ^= (r >> 8);
+			if (un <= 0x00000010UL)
+			{
+				r ^= (r >> 4);
+				if (un <= 0x00000004UL)
+				{
+					r ^= (r >> 2);
+					if (un <= 0x00000002UL)
+					{
+						r ^= (r >> 1);
+					}
+				}
+			}
+		}
+	}
+
+	return (int)(r % un);
+}
+
+void b3PgsJacobiSolver::initSolverBody(int bodyIndex, b3SolverBody* solverBody, b3RigidBodyData* rb)
+{
+	solverBody->m_deltaLinearVelocity.setValue(0.f, 0.f, 0.f);
+	solverBody->m_deltaAngularVelocity.setValue(0.f, 0.f, 0.f);
+	solverBody->internalGetPushVelocity().setValue(0.f, 0.f, 0.f);
+	solverBody->internalGetTurnVelocity().setValue(0.f, 0.f, 0.f);
+
+	if (rb)
+	{
+		solverBody->m_worldTransform = getWorldTransform(rb);
+		solverBody->internalSetInvMass(b3MakeVector3(rb->m_invMass, rb->m_invMass, rb->m_invMass));
+		solverBody->m_originalBodyIndex = bodyIndex;
+		solverBody->m_angularFactor = b3MakeVector3(1, 1, 1);
+		solverBody->m_linearFactor = b3MakeVector3(1, 1, 1);
+		solverBody->m_linearVelocity = getLinearVelocity(rb);
+		solverBody->m_angularVelocity = getAngularVelocity(rb);
+	}
+	else
+	{
+		solverBody->m_worldTransform.setIdentity();
+		solverBody->internalSetInvMass(b3MakeVector3(0, 0, 0));
+		solverBody->m_originalBodyIndex = bodyIndex;
+		solverBody->m_angularFactor.setValue(1, 1, 1);
+		solverBody->m_linearFactor.setValue(1, 1, 1);
+		solverBody->m_linearVelocity.setValue(0, 0, 0);
+		solverBody->m_angularVelocity.setValue(0, 0, 0);
+	}
+}
+
+b3Scalar b3PgsJacobiSolver::restitutionCurve(b3Scalar rel_vel, b3Scalar restitution)
+{
+	b3Scalar rest = restitution * -rel_vel;
+	return rest;
+}
+
+void b3PgsJacobiSolver::setupFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, b3SolverConstraint& solverConstraint, const b3Vector3& normalAxis, int solverBodyIdA, int solverBodyIdB, b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2, b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation, b3Scalar desiredVelocity, b3Scalar cfmSlip)
+{
+	solverConstraint.m_contactNormal = normalAxis;
+	b3SolverBody& solverBodyA = m_tmpSolverBodyPool[solverBodyIdA];
+	b3SolverBody& solverBodyB = m_tmpSolverBodyPool[solverBodyIdB];
+
+	b3RigidBodyData* body0 = &bodies[solverBodyA.m_originalBodyIndex];
+	b3RigidBodyData* body1 = &bodies[solverBodyB.m_originalBodyIndex];
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+
+	solverConstraint.m_friction = cp.m_combinedFriction;
+	solverConstraint.m_originalContactPoint = 0;
+
+	solverConstraint.m_appliedImpulse = 0.f;
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	{
+		b3Vector3 ftorqueAxis1 = rel_pos1.cross(solverConstraint.m_contactNormal);
+		solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentA = body0 ? getInvInertiaTensorWorld(&inertias[solverBodyA.m_originalBodyIndex]) * ftorqueAxis1 : b3MakeVector3(0, 0, 0);
+	}
+	{
+		b3Vector3 ftorqueAxis1 = rel_pos2.cross(-solverConstraint.m_contactNormal);
+		solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentB = body1 ? getInvInertiaTensorWorld(&inertias[solverBodyB.m_originalBodyIndex]) * ftorqueAxis1 : b3MakeVector3(0, 0, 0);
+	}
+
+	b3Scalar scaledDenom;
+
+	{
+		b3Vector3 vec;
+		b3Scalar denom0 = 0.f;
+		b3Scalar denom1 = 0.f;
+		if (body0)
+		{
+			vec = (solverConstraint.m_angularComponentA).cross(rel_pos1);
+			denom0 = body0->m_invMass + normalAxis.dot(vec);
+		}
+		if (body1)
+		{
+			vec = (-solverConstraint.m_angularComponentB).cross(rel_pos2);
+			denom1 = body1->m_invMass + normalAxis.dot(vec);
+		}
+
+		b3Scalar denom;
+		if (m_usePgs)
+		{
+			scaledDenom = denom = relaxation / (denom0 + denom1);
+		}
+		else
+		{
+			denom = relaxation / (denom0 + denom1);
+			b3Scalar countA = body0->m_invMass ? b3Scalar(m_bodyCount[solverBodyA.m_originalBodyIndex]) : 1.f;
+			b3Scalar countB = body1->m_invMass ? b3Scalar(m_bodyCount[solverBodyB.m_originalBodyIndex]) : 1.f;
+
+			scaledDenom = relaxation / (denom0 * countA + denom1 * countB);
+		}
+
+		solverConstraint.m_jacDiagABInv = denom;
+	}
+
+	{
+		b3Scalar rel_vel;
+		b3Scalar vel1Dotn = solverConstraint.m_contactNormal.dot(body0 ? solverBodyA.m_linearVelocity : b3MakeVector3(0, 0, 0)) + solverConstraint.m_relpos1CrossNormal.dot(body0 ? solverBodyA.m_angularVelocity : b3MakeVector3(0, 0, 0));
+		b3Scalar vel2Dotn = -solverConstraint.m_contactNormal.dot(body1 ? solverBodyB.m_linearVelocity : b3MakeVector3(0, 0, 0)) + solverConstraint.m_relpos2CrossNormal.dot(body1 ? solverBodyB.m_angularVelocity : b3MakeVector3(0, 0, 0));
+
+		rel_vel = vel1Dotn + vel2Dotn;
+
+		//		b3Scalar positionalError = 0.f;
+
+		b3SimdScalar velocityError = desiredVelocity - rel_vel;
+		b3SimdScalar velocityImpulse = velocityError * b3SimdScalar(scaledDenom);  //solverConstraint.m_jacDiagABInv);
+		solverConstraint.m_rhs = velocityImpulse;
+		solverConstraint.m_cfm = cfmSlip;
+		solverConstraint.m_lowerLimit = 0;
+		solverConstraint.m_upperLimit = 1e10f;
+	}
+}
+
+b3SolverConstraint& b3PgsJacobiSolver::addFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, const b3Vector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2, b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation, b3Scalar desiredVelocity, b3Scalar cfmSlip)
+{
+	b3SolverConstraint& solverConstraint = m_tmpSolverContactFrictionConstraintPool.expandNonInitializing();
+	solverConstraint.m_frictionIndex = frictionIndex;
+	setupFrictionConstraint(bodies, inertias, solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2,
+							colObj0, colObj1, relaxation, desiredVelocity, cfmSlip);
+	return solverConstraint;
+}
+
+void b3PgsJacobiSolver::setupRollingFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, b3SolverConstraint& solverConstraint, const b3Vector3& normalAxis1, int solverBodyIdA, int solverBodyIdB,
+													   b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2,
+													   b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation,
+													   b3Scalar desiredVelocity, b3Scalar cfmSlip)
+
+{
+	b3Vector3 normalAxis = b3MakeVector3(0, 0, 0);
+
+	solverConstraint.m_contactNormal = normalAxis;
+	b3SolverBody& solverBodyA = m_tmpSolverBodyPool[solverBodyIdA];
+	b3SolverBody& solverBodyB = m_tmpSolverBodyPool[solverBodyIdB];
+
+	b3RigidBodyData* body0 = &bodies[m_tmpSolverBodyPool[solverBodyIdA].m_originalBodyIndex];
+	b3RigidBodyData* body1 = &bodies[m_tmpSolverBodyPool[solverBodyIdB].m_originalBodyIndex];
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+
+	solverConstraint.m_friction = cp.m_combinedRollingFriction;
+	solverConstraint.m_originalContactPoint = 0;
+
+	solverConstraint.m_appliedImpulse = 0.f;
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	{
+		b3Vector3 ftorqueAxis1 = -normalAxis1;
+		solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentA = body0 ? getInvInertiaTensorWorld(&inertias[solverBodyA.m_originalBodyIndex]) * ftorqueAxis1 : b3MakeVector3(0, 0, 0);
+	}
+	{
+		b3Vector3 ftorqueAxis1 = normalAxis1;
+		solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentB = body1 ? getInvInertiaTensorWorld(&inertias[solverBodyB.m_originalBodyIndex]) * ftorqueAxis1 : b3MakeVector3(0, 0, 0);
+	}
+
+	{
+		b3Vector3 iMJaA = body0 ? getInvInertiaTensorWorld(&inertias[solverBodyA.m_originalBodyIndex]) * solverConstraint.m_relpos1CrossNormal : b3MakeVector3(0, 0, 0);
+		b3Vector3 iMJaB = body1 ? getInvInertiaTensorWorld(&inertias[solverBodyB.m_originalBodyIndex]) * solverConstraint.m_relpos2CrossNormal : b3MakeVector3(0, 0, 0);
+		b3Scalar sum = 0;
+		sum += iMJaA.dot(solverConstraint.m_relpos1CrossNormal);
+		sum += iMJaB.dot(solverConstraint.m_relpos2CrossNormal);
+		solverConstraint.m_jacDiagABInv = b3Scalar(1.) / sum;
+	}
+
+	{
+		b3Scalar rel_vel;
+		b3Scalar vel1Dotn = solverConstraint.m_contactNormal.dot(body0 ? solverBodyA.m_linearVelocity : b3MakeVector3(0, 0, 0)) + solverConstraint.m_relpos1CrossNormal.dot(body0 ? solverBodyA.m_angularVelocity : b3MakeVector3(0, 0, 0));
+		b3Scalar vel2Dotn = -solverConstraint.m_contactNormal.dot(body1 ? solverBodyB.m_linearVelocity : b3MakeVector3(0, 0, 0)) + solverConstraint.m_relpos2CrossNormal.dot(body1 ? solverBodyB.m_angularVelocity : b3MakeVector3(0, 0, 0));
+
+		rel_vel = vel1Dotn + vel2Dotn;
+
+		//		b3Scalar positionalError = 0.f;
+
+		b3SimdScalar velocityError = desiredVelocity - rel_vel;
+		b3SimdScalar velocityImpulse = velocityError * b3SimdScalar(solverConstraint.m_jacDiagABInv);
+		solverConstraint.m_rhs = velocityImpulse;
+		solverConstraint.m_cfm = cfmSlip;
+		solverConstraint.m_lowerLimit = 0;
+		solverConstraint.m_upperLimit = 1e10f;
+	}
+}
+
+b3SolverConstraint& b3PgsJacobiSolver::addRollingFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, const b3Vector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2, b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation, b3Scalar desiredVelocity, b3Scalar cfmSlip)
+{
+	b3SolverConstraint& solverConstraint = m_tmpSolverContactRollingFrictionConstraintPool.expandNonInitializing();
+	solverConstraint.m_frictionIndex = frictionIndex;
+	setupRollingFrictionConstraint(bodies, inertias, solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2,
+								   colObj0, colObj1, relaxation, desiredVelocity, cfmSlip);
+	return solverConstraint;
+}
+
+int b3PgsJacobiSolver::getOrInitSolverBody(int bodyIndex, b3RigidBodyData* bodies, b3InertiaData* inertias)
+{
+	//b3Assert(bodyIndex< m_tmpSolverBodyPool.size());
+
+	b3RigidBodyData& body = bodies[bodyIndex];
+	int curIndex = -1;
+	if (m_usePgs || body.m_invMass == 0.f)
+	{
+		if (m_bodyCount[bodyIndex] < 0)
+		{
+			curIndex = m_tmpSolverBodyPool.size();
+			b3SolverBody& solverBody = m_tmpSolverBodyPool.expand();
+			initSolverBody(bodyIndex, &solverBody, &body);
+			solverBody.m_originalBodyIndex = bodyIndex;
+			m_bodyCount[bodyIndex] = curIndex;
+		}
+		else
+		{
+			curIndex = m_bodyCount[bodyIndex];
+		}
+	}
+	else
+	{
+		b3Assert(m_bodyCount[bodyIndex] > 0);
+		m_bodyCountCheck[bodyIndex]++;
+		curIndex = m_tmpSolverBodyPool.size();
+		b3SolverBody& solverBody = m_tmpSolverBodyPool.expand();
+		initSolverBody(bodyIndex, &solverBody, &body);
+		solverBody.m_originalBodyIndex = bodyIndex;
+	}
+
+	b3Assert(curIndex >= 0);
+	return curIndex;
+}
+#include <stdio.h>
+
+void b3PgsJacobiSolver::setupContactConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, b3SolverConstraint& solverConstraint,
+											   int solverBodyIdA, int solverBodyIdB,
+											   b3ContactPoint& cp, const b3ContactSolverInfo& infoGlobal,
+											   b3Vector3& vel, b3Scalar& rel_vel, b3Scalar& relaxation,
+											   b3Vector3& rel_pos1, b3Vector3& rel_pos2)
+{
+	const b3Vector3& pos1 = cp.getPositionWorldOnA();
+	const b3Vector3& pos2 = cp.getPositionWorldOnB();
+
+	b3SolverBody* bodyA = &m_tmpSolverBodyPool[solverBodyIdA];
+	b3SolverBody* bodyB = &m_tmpSolverBodyPool[solverBodyIdB];
+
+	b3RigidBodyData* rb0 = &bodies[bodyA->m_originalBodyIndex];
+	b3RigidBodyData* rb1 = &bodies[bodyB->m_originalBodyIndex];
+
+	//			b3Vector3 rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin();
+	//			b3Vector3 rel_pos2 = pos2 - colObj1->getWorldTransform().getOrigin();
+	rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin();
+	rel_pos2 = pos2 - bodyB->getWorldTransform().getOrigin();
+
+	relaxation = 1.f;
+
+	b3Vector3 torqueAxis0 = rel_pos1.cross(cp.m_normalWorldOnB);
+	solverConstraint.m_angularComponentA = rb0 ? getInvInertiaTensorWorld(&inertias[bodyA->m_originalBodyIndex]) * torqueAxis0 : b3MakeVector3(0, 0, 0);
+	b3Vector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB);
+	solverConstraint.m_angularComponentB = rb1 ? getInvInertiaTensorWorld(&inertias[bodyB->m_originalBodyIndex]) * -torqueAxis1 : b3MakeVector3(0, 0, 0);
+
+	b3Scalar scaledDenom;
+	{
+#ifdef COMPUTE_IMPULSE_DENOM
+		b3Scalar denom0 = rb0->computeImpulseDenominator(pos1, cp.m_normalWorldOnB);
+		b3Scalar denom1 = rb1->computeImpulseDenominator(pos2, cp.m_normalWorldOnB);
+#else
+		b3Vector3 vec;
+		b3Scalar denom0 = 0.f;
+		b3Scalar denom1 = 0.f;
+		if (rb0)
+		{
+			vec = (solverConstraint.m_angularComponentA).cross(rel_pos1);
+			denom0 = rb0->m_invMass + cp.m_normalWorldOnB.dot(vec);
+		}
+		if (rb1)
+		{
+			vec = (-solverConstraint.m_angularComponentB).cross(rel_pos2);
+			denom1 = rb1->m_invMass + cp.m_normalWorldOnB.dot(vec);
+		}
+#endif  //COMPUTE_IMPULSE_DENOM
+
+		b3Scalar denom;
+		if (m_usePgs)
+		{
+			scaledDenom = denom = relaxation / (denom0 + denom1);
+		}
+		else
+		{
+			denom = relaxation / (denom0 + denom1);
+
+			b3Scalar countA = rb0->m_invMass ? b3Scalar(m_bodyCount[bodyA->m_originalBodyIndex]) : 1.f;
+			b3Scalar countB = rb1->m_invMass ? b3Scalar(m_bodyCount[bodyB->m_originalBodyIndex]) : 1.f;
+			scaledDenom = relaxation / (denom0 * countA + denom1 * countB);
+		}
+		solverConstraint.m_jacDiagABInv = denom;
+	}
+
+	solverConstraint.m_contactNormal = cp.m_normalWorldOnB;
+	solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+	solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
+
+	b3Scalar restitution = 0.f;
+	b3Scalar penetration = cp.getDistance() + infoGlobal.m_linearSlop;
+
+	{
+		b3Vector3 vel1, vel2;
+
+		vel1 = rb0 ? getVelocityInLocalPoint(rb0, rel_pos1) : b3MakeVector3(0, 0, 0);
+		vel2 = rb1 ? getVelocityInLocalPoint(rb1, rel_pos2) : b3MakeVector3(0, 0, 0);
+
+		//			b3Vector3 vel2 = rb1 ? rb1->getVelocityInLocalPoint(rel_pos2) : b3Vector3(0,0,0);
+		vel = vel1 - vel2;
+		rel_vel = cp.m_normalWorldOnB.dot(vel);
+
+		solverConstraint.m_friction = cp.m_combinedFriction;
+
+		restitution = restitutionCurve(rel_vel, cp.m_combinedRestitution);
+		if (restitution <= b3Scalar(0.))
+		{
+			restitution = 0.f;
+		};
+	}
+
+	///warm starting (or zero if disabled)
+	if (infoGlobal.m_solverMode & B3_SOLVER_USE_WARMSTARTING)
+	{
+		solverConstraint.m_appliedImpulse = cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor;
+		if (rb0)
+			bodyA->internalApplyImpulse(solverConstraint.m_contactNormal * bodyA->internalGetInvMass(), solverConstraint.m_angularComponentA, solverConstraint.m_appliedImpulse);
+		if (rb1)
+			bodyB->internalApplyImpulse(solverConstraint.m_contactNormal * bodyB->internalGetInvMass(), -solverConstraint.m_angularComponentB, -(b3Scalar)solverConstraint.m_appliedImpulse);
+	}
+	else
+	{
+		solverConstraint.m_appliedImpulse = 0.f;
+	}
+
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	{
+		b3Scalar vel1Dotn = solverConstraint.m_contactNormal.dot(rb0 ? bodyA->m_linearVelocity : b3MakeVector3(0, 0, 0)) + solverConstraint.m_relpos1CrossNormal.dot(rb0 ? bodyA->m_angularVelocity : b3MakeVector3(0, 0, 0));
+		b3Scalar vel2Dotn = -solverConstraint.m_contactNormal.dot(rb1 ? bodyB->m_linearVelocity : b3MakeVector3(0, 0, 0)) + solverConstraint.m_relpos2CrossNormal.dot(rb1 ? bodyB->m_angularVelocity : b3MakeVector3(0, 0, 0));
+		b3Scalar rel_vel = vel1Dotn + vel2Dotn;
+
+		b3Scalar positionalError = 0.f;
+		b3Scalar velocityError = restitution - rel_vel;  // * damping;
+
+		b3Scalar erp = infoGlobal.m_erp2;
+		if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+		{
+			erp = infoGlobal.m_erp;
+		}
+
+		if (penetration > 0)
+		{
+			positionalError = 0;
+
+			velocityError -= penetration / infoGlobal.m_timeStep;
+		}
+		else
+		{
+			positionalError = -penetration * erp / infoGlobal.m_timeStep;
+		}
+
+		b3Scalar penetrationImpulse = positionalError * scaledDenom;  //solverConstraint.m_jacDiagABInv;
+		b3Scalar velocityImpulse = velocityError * scaledDenom;       //solverConstraint.m_jacDiagABInv;
+
+		if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+		{
+			//combine position and velocity into rhs
+			solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+			solverConstraint.m_rhsPenetration = 0.f;
+		}
+		else
+		{
+			//split position and velocity into rhs and m_rhsPenetration
+			solverConstraint.m_rhs = velocityImpulse;
+			solverConstraint.m_rhsPenetration = penetrationImpulse;
+		}
+		solverConstraint.m_cfm = 0.f;
+		solverConstraint.m_lowerLimit = 0;
+		solverConstraint.m_upperLimit = 1e10f;
+	}
+}
+
+void b3PgsJacobiSolver::setFrictionConstraintImpulse(b3RigidBodyData* bodies, b3InertiaData* inertias, b3SolverConstraint& solverConstraint,
+													 int solverBodyIdA, int solverBodyIdB,
+													 b3ContactPoint& cp, const b3ContactSolverInfo& infoGlobal)
+{
+	b3SolverBody* bodyA = &m_tmpSolverBodyPool[solverBodyIdA];
+	b3SolverBody* bodyB = &m_tmpSolverBodyPool[solverBodyIdB];
+
+	{
+		b3SolverConstraint& frictionConstraint1 = m_tmpSolverContactFrictionConstraintPool[solverConstraint.m_frictionIndex];
+		if (infoGlobal.m_solverMode & B3_SOLVER_USE_WARMSTARTING)
+		{
+			frictionConstraint1.m_appliedImpulse = cp.m_appliedImpulseLateral1 * infoGlobal.m_warmstartingFactor;
+			if (bodies[bodyA->m_originalBodyIndex].m_invMass)
+				bodyA->internalApplyImpulse(frictionConstraint1.m_contactNormal * bodies[bodyA->m_originalBodyIndex].m_invMass, frictionConstraint1.m_angularComponentA, frictionConstraint1.m_appliedImpulse);
+			if (bodies[bodyB->m_originalBodyIndex].m_invMass)
+				bodyB->internalApplyImpulse(frictionConstraint1.m_contactNormal * bodies[bodyB->m_originalBodyIndex].m_invMass, -frictionConstraint1.m_angularComponentB, -(b3Scalar)frictionConstraint1.m_appliedImpulse);
+		}
+		else
+		{
+			frictionConstraint1.m_appliedImpulse = 0.f;
+		}
+	}
+
+	if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS))
+	{
+		b3SolverConstraint& frictionConstraint2 = m_tmpSolverContactFrictionConstraintPool[solverConstraint.m_frictionIndex + 1];
+		if (infoGlobal.m_solverMode & B3_SOLVER_USE_WARMSTARTING)
+		{
+			frictionConstraint2.m_appliedImpulse = cp.m_appliedImpulseLateral2 * infoGlobal.m_warmstartingFactor;
+			if (bodies[bodyA->m_originalBodyIndex].m_invMass)
+				bodyA->internalApplyImpulse(frictionConstraint2.m_contactNormal * bodies[bodyA->m_originalBodyIndex].m_invMass, frictionConstraint2.m_angularComponentA, frictionConstraint2.m_appliedImpulse);
+			if (bodies[bodyB->m_originalBodyIndex].m_invMass)
+				bodyB->internalApplyImpulse(frictionConstraint2.m_contactNormal * bodies[bodyB->m_originalBodyIndex].m_invMass, -frictionConstraint2.m_angularComponentB, -(b3Scalar)frictionConstraint2.m_appliedImpulse);
+		}
+		else
+		{
+			frictionConstraint2.m_appliedImpulse = 0.f;
+		}
+	}
+}
+
+void b3PgsJacobiSolver::convertContact(b3RigidBodyData* bodies, b3InertiaData* inertias, b3Contact4* manifold, const b3ContactSolverInfo& infoGlobal)
+{
+	b3RigidBodyData *colObj0 = 0, *colObj1 = 0;
+
+	int solverBodyIdA = getOrInitSolverBody(manifold->getBodyA(), bodies, inertias);
+	int solverBodyIdB = getOrInitSolverBody(manifold->getBodyB(), bodies, inertias);
+
+	//	b3RigidBody* bodyA = b3RigidBody::upcast(colObj0);
+	//	b3RigidBody* bodyB = b3RigidBody::upcast(colObj1);
+
+	b3SolverBody* solverBodyA = &m_tmpSolverBodyPool[solverBodyIdA];
+	b3SolverBody* solverBodyB = &m_tmpSolverBodyPool[solverBodyIdB];
+
+	///avoid collision response between two static objects
+	if (solverBodyA->m_invMass.isZero() && solverBodyB->m_invMass.isZero())
+		return;
+
+	int rollingFriction = 1;
+	int numContacts = getNumContacts(manifold);
+	for (int j = 0; j < numContacts; j++)
+	{
+		b3ContactPoint cp;
+		getContactPoint(manifold, j, cp);
+
+		if (cp.getDistance() <= getContactProcessingThreshold(manifold))
+		{
+			b3Vector3 rel_pos1;
+			b3Vector3 rel_pos2;
+			b3Scalar relaxation;
+			b3Scalar rel_vel;
+			b3Vector3 vel;
+
+			int frictionIndex = m_tmpSolverContactConstraintPool.size();
+			b3SolverConstraint& solverConstraint = m_tmpSolverContactConstraintPool.expandNonInitializing();
+			//			b3RigidBody* rb0 = b3RigidBody::upcast(colObj0);
+			//			b3RigidBody* rb1 = b3RigidBody::upcast(colObj1);
+			solverConstraint.m_solverBodyIdA = solverBodyIdA;
+			solverConstraint.m_solverBodyIdB = solverBodyIdB;
+
+			solverConstraint.m_originalContactPoint = &cp;
+
+			setupContactConstraint(bodies, inertias, solverConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal, vel, rel_vel, relaxation, rel_pos1, rel_pos2);
+
+			//			const b3Vector3& pos1 = cp.getPositionWorldOnA();
+			//			const b3Vector3& pos2 = cp.getPositionWorldOnB();
+
+			/////setup the friction constraints
+
+			solverConstraint.m_frictionIndex = m_tmpSolverContactFrictionConstraintPool.size();
+
+			b3Vector3 angVelA, angVelB;
+			solverBodyA->getAngularVelocity(angVelA);
+			solverBodyB->getAngularVelocity(angVelB);
+			b3Vector3 relAngVel = angVelB - angVelA;
+
+			if ((cp.m_combinedRollingFriction > 0.f) && (rollingFriction > 0))
+			{
+				//only a single rollingFriction per manifold
+				rollingFriction--;
+				if (relAngVel.length() > infoGlobal.m_singleAxisRollingFrictionThreshold)
+				{
+					relAngVel.normalize();
+					if (relAngVel.length() > 0.001)
+						addRollingFrictionConstraint(bodies, inertias, relAngVel, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+				}
+				else
+				{
+					addRollingFrictionConstraint(bodies, inertias, cp.m_normalWorldOnB, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+					b3Vector3 axis0, axis1;
+					b3PlaneSpace1(cp.m_normalWorldOnB, axis0, axis1);
+					if (axis0.length() > 0.001)
+						addRollingFrictionConstraint(bodies, inertias, axis0, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+					if (axis1.length() > 0.001)
+						addRollingFrictionConstraint(bodies, inertias, axis1, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+				}
+			}
+
+			///Bullet has several options to set the friction directions
+			///By default, each contact has only a single friction direction that is recomputed automatically very frame
+			///based on the relative linear velocity.
+			///If the relative velocity it zero, it will automatically compute a friction direction.
+
+			///You can also enable two friction directions, using the B3_SOLVER_USE_2_FRICTION_DIRECTIONS.
+			///In that case, the second friction direction will be orthogonal to both contact normal and first friction direction.
+			///
+			///If you choose B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION, then the friction will be independent from the relative projected velocity.
+			///
+			///The user can manually override the friction directions for certain contacts using a contact callback,
+			///and set the cp.m_lateralFrictionInitialized to true
+			///In that case, you can set the target relative motion in each friction direction (cp.m_contactMotion1 and cp.m_contactMotion2)
+			///this will give a conveyor belt effect
+			///
+			if (!(infoGlobal.m_solverMode & B3_SOLVER_ENABLE_FRICTION_DIRECTION_CACHING) || !cp.m_lateralFrictionInitialized)
+			{
+				cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
+				b3Scalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
+				if (!(infoGlobal.m_solverMode & B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION) && lat_rel_vel > B3_EPSILON)
+				{
+					cp.m_lateralFrictionDir1 *= 1.f / b3Sqrt(lat_rel_vel);
+					if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS))
+					{
+						cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
+						cp.m_lateralFrictionDir2.normalize();  //??
+						addFrictionConstraint(bodies, inertias, cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+					}
+
+					addFrictionConstraint(bodies, inertias, cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+				}
+				else
+				{
+					b3PlaneSpace1(cp.m_normalWorldOnB, cp.m_lateralFrictionDir1, cp.m_lateralFrictionDir2);
+
+					if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS))
+					{
+						addFrictionConstraint(bodies, inertias, cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+					}
+
+					addFrictionConstraint(bodies, inertias, cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+
+					if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION))
+					{
+						cp.m_lateralFrictionInitialized = true;
+					}
+				}
+			}
+			else
+			{
+				addFrictionConstraint(bodies, inertias, cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, cp.m_contactMotion1, cp.m_contactCFM1);
+
+				if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS))
+					addFrictionConstraint(bodies, inertias, cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, cp.m_contactMotion2, cp.m_contactCFM2);
+
+				setFrictionConstraintImpulse(bodies, inertias, solverConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal);
+			}
+		}
+	}
+}
+
+b3Scalar b3PgsJacobiSolver::solveGroupCacheFriendlySetup(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, b3Contact4* manifoldPtr, int numManifolds, b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	B3_PROFILE("solveGroupCacheFriendlySetup");
+
+	m_maxOverrideNumSolverIterations = 0;
+
+	m_tmpSolverBodyPool.resize(0);
+
+	m_bodyCount.resize(0);
+	m_bodyCount.resize(numBodies, 0);
+	m_bodyCountCheck.resize(0);
+	m_bodyCountCheck.resize(numBodies, 0);
+
+	m_deltaLinearVelocities.resize(0);
+	m_deltaLinearVelocities.resize(numBodies, b3MakeVector3(0, 0, 0));
+	m_deltaAngularVelocities.resize(0);
+	m_deltaAngularVelocities.resize(numBodies, b3MakeVector3(0, 0, 0));
+
+	//int totalBodies = 0;
+
+	for (int i = 0; i < numConstraints; i++)
+	{
+		int bodyIndexA = constraints[i]->getRigidBodyA();
+		int bodyIndexB = constraints[i]->getRigidBodyB();
+		if (m_usePgs)
+		{
+			m_bodyCount[bodyIndexA] = -1;
+			m_bodyCount[bodyIndexB] = -1;
+		}
+		else
+		{
+			//didn't implement joints with Jacobi version yet
+			b3Assert(0);
+		}
+	}
+	for (int i = 0; i < numManifolds; i++)
+	{
+		int bodyIndexA = manifoldPtr[i].getBodyA();
+		int bodyIndexB = manifoldPtr[i].getBodyB();
+		if (m_usePgs)
+		{
+			m_bodyCount[bodyIndexA] = -1;
+			m_bodyCount[bodyIndexB] = -1;
+		}
+		else
+		{
+			if (bodies[bodyIndexA].m_invMass)
+			{
+				//m_bodyCount[bodyIndexA]+=manifoldPtr[i].getNPoints();
+				m_bodyCount[bodyIndexA]++;
+			}
+			else
+				m_bodyCount[bodyIndexA] = -1;
+
+			if (bodies[bodyIndexB].m_invMass)
+				//	m_bodyCount[bodyIndexB]+=manifoldPtr[i].getNPoints();
+				m_bodyCount[bodyIndexB]++;
+			else
+				m_bodyCount[bodyIndexB] = -1;
+		}
+	}
+
+	if (1)
+	{
+		int j;
+		for (j = 0; j < numConstraints; j++)
+		{
+			b3TypedConstraint* constraint = constraints[j];
+
+			constraint->internalSetAppliedImpulse(0.0f);
+		}
+	}
+
+	//b3RigidBody* rb0=0,*rb1=0;
+	//if (1)
+	{
+		{
+			int totalNumRows = 0;
+			int i;
+
+			m_tmpConstraintSizesPool.resizeNoInitialize(numConstraints);
+			//calculate the total number of contraint rows
+			for (i = 0; i < numConstraints; i++)
+			{
+				b3TypedConstraint::b3ConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
+				b3JointFeedback* fb = constraints[i]->getJointFeedback();
+				if (fb)
+				{
+					fb->m_appliedForceBodyA.setZero();
+					fb->m_appliedTorqueBodyA.setZero();
+					fb->m_appliedForceBodyB.setZero();
+					fb->m_appliedTorqueBodyB.setZero();
+				}
+
+				if (constraints[i]->isEnabled())
+				{
+				}
+				if (constraints[i]->isEnabled())
+				{
+					constraints[i]->getInfo1(&info1, bodies);
+				}
+				else
+				{
+					info1.m_numConstraintRows = 0;
+					info1.nub = 0;
+				}
+				totalNumRows += info1.m_numConstraintRows;
+			}
+			m_tmpSolverNonContactConstraintPool.resizeNoInitialize(totalNumRows);
+
+#ifndef DISABLE_JOINTS
+			///setup the b3SolverConstraints
+			int currentRow = 0;
+
+			for (i = 0; i < numConstraints; i++)
+			{
+				const b3TypedConstraint::b3ConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
+
+				if (info1.m_numConstraintRows)
+				{
+					b3Assert(currentRow < totalNumRows);
+
+					b3SolverConstraint* currentConstraintRow = &m_tmpSolverNonContactConstraintPool[currentRow];
+					b3TypedConstraint* constraint = constraints[i];
+
+					b3RigidBodyData& rbA = bodies[constraint->getRigidBodyA()];
+					//b3RigidBody& rbA = constraint->getRigidBodyA();
+					//				b3RigidBody& rbB = constraint->getRigidBodyB();
+					b3RigidBodyData& rbB = bodies[constraint->getRigidBodyB()];
+
+					int solverBodyIdA = getOrInitSolverBody(constraint->getRigidBodyA(), bodies, inertias);
+					int solverBodyIdB = getOrInitSolverBody(constraint->getRigidBodyB(), bodies, inertias);
+
+					b3SolverBody* bodyAPtr = &m_tmpSolverBodyPool[solverBodyIdA];
+					b3SolverBody* bodyBPtr = &m_tmpSolverBodyPool[solverBodyIdB];
+
+					int overrideNumSolverIterations = constraint->getOverrideNumSolverIterations() > 0 ? constraint->getOverrideNumSolverIterations() : infoGlobal.m_numIterations;
+					if (overrideNumSolverIterations > m_maxOverrideNumSolverIterations)
+						m_maxOverrideNumSolverIterations = overrideNumSolverIterations;
+
+					int j;
+					for (j = 0; j < info1.m_numConstraintRows; j++)
+					{
+						memset(&currentConstraintRow[j], 0, sizeof(b3SolverConstraint));
+						currentConstraintRow[j].m_lowerLimit = -B3_INFINITY;
+						currentConstraintRow[j].m_upperLimit = B3_INFINITY;
+						currentConstraintRow[j].m_appliedImpulse = 0.f;
+						currentConstraintRow[j].m_appliedPushImpulse = 0.f;
+						currentConstraintRow[j].m_solverBodyIdA = solverBodyIdA;
+						currentConstraintRow[j].m_solverBodyIdB = solverBodyIdB;
+						currentConstraintRow[j].m_overrideNumSolverIterations = overrideNumSolverIterations;
+					}
+
+					bodyAPtr->internalGetDeltaLinearVelocity().setValue(0.f, 0.f, 0.f);
+					bodyAPtr->internalGetDeltaAngularVelocity().setValue(0.f, 0.f, 0.f);
+					bodyAPtr->internalGetPushVelocity().setValue(0.f, 0.f, 0.f);
+					bodyAPtr->internalGetTurnVelocity().setValue(0.f, 0.f, 0.f);
+					bodyBPtr->internalGetDeltaLinearVelocity().setValue(0.f, 0.f, 0.f);
+					bodyBPtr->internalGetDeltaAngularVelocity().setValue(0.f, 0.f, 0.f);
+					bodyBPtr->internalGetPushVelocity().setValue(0.f, 0.f, 0.f);
+					bodyBPtr->internalGetTurnVelocity().setValue(0.f, 0.f, 0.f);
+
+					b3TypedConstraint::b3ConstraintInfo2 info2;
+					info2.fps = 1.f / infoGlobal.m_timeStep;
+					info2.erp = infoGlobal.m_erp;
+					info2.m_J1linearAxis = currentConstraintRow->m_contactNormal;
+					info2.m_J1angularAxis = currentConstraintRow->m_relpos1CrossNormal;
+					info2.m_J2linearAxis = 0;
+					info2.m_J2angularAxis = currentConstraintRow->m_relpos2CrossNormal;
+					info2.rowskip = sizeof(b3SolverConstraint) / sizeof(b3Scalar);  //check this
+																					///the size of b3SolverConstraint needs be a multiple of b3Scalar
+					b3Assert(info2.rowskip * sizeof(b3Scalar) == sizeof(b3SolverConstraint));
+					info2.m_constraintError = &currentConstraintRow->m_rhs;
+					currentConstraintRow->m_cfm = infoGlobal.m_globalCfm;
+					info2.m_damping = infoGlobal.m_damping;
+					info2.cfm = &currentConstraintRow->m_cfm;
+					info2.m_lowerLimit = &currentConstraintRow->m_lowerLimit;
+					info2.m_upperLimit = &currentConstraintRow->m_upperLimit;
+					info2.m_numIterations = infoGlobal.m_numIterations;
+					constraints[i]->getInfo2(&info2, bodies);
+
+					///finalize the constraint setup
+					for (j = 0; j < info1.m_numConstraintRows; j++)
+					{
+						b3SolverConstraint& solverConstraint = currentConstraintRow[j];
+
+						if (solverConstraint.m_upperLimit >= constraints[i]->getBreakingImpulseThreshold())
+						{
+							solverConstraint.m_upperLimit = constraints[i]->getBreakingImpulseThreshold();
+						}
+
+						if (solverConstraint.m_lowerLimit <= -constraints[i]->getBreakingImpulseThreshold())
+						{
+							solverConstraint.m_lowerLimit = -constraints[i]->getBreakingImpulseThreshold();
+						}
+
+						solverConstraint.m_originalContactPoint = constraint;
+
+						b3Matrix3x3& invInertiaWorldA = inertias[constraint->getRigidBodyA()].m_invInertiaWorld;
+						{
+							//b3Vector3 angularFactorA(1,1,1);
+							const b3Vector3& ftorqueAxis1 = solverConstraint.m_relpos1CrossNormal;
+							solverConstraint.m_angularComponentA = invInertiaWorldA * ftorqueAxis1;  //*angularFactorA;
+						}
+
+						b3Matrix3x3& invInertiaWorldB = inertias[constraint->getRigidBodyB()].m_invInertiaWorld;
+						{
+							const b3Vector3& ftorqueAxis2 = solverConstraint.m_relpos2CrossNormal;
+							solverConstraint.m_angularComponentB = invInertiaWorldB * ftorqueAxis2;  //*constraint->getRigidBodyB().getAngularFactor();
+						}
+
+						{
+							//it is ok to use solverConstraint.m_contactNormal instead of -solverConstraint.m_contactNormal
+							//because it gets multiplied iMJlB
+							b3Vector3 iMJlA = solverConstraint.m_contactNormal * rbA.m_invMass;
+							b3Vector3 iMJaA = invInertiaWorldA * solverConstraint.m_relpos1CrossNormal;
+							b3Vector3 iMJlB = solverConstraint.m_contactNormal * rbB.m_invMass;  //sign of normal?
+							b3Vector3 iMJaB = invInertiaWorldB * solverConstraint.m_relpos2CrossNormal;
+
+							b3Scalar sum = iMJlA.dot(solverConstraint.m_contactNormal);
+							sum += iMJaA.dot(solverConstraint.m_relpos1CrossNormal);
+							sum += iMJlB.dot(solverConstraint.m_contactNormal);
+							sum += iMJaB.dot(solverConstraint.m_relpos2CrossNormal);
+							b3Scalar fsum = b3Fabs(sum);
+							b3Assert(fsum > B3_EPSILON);
+							solverConstraint.m_jacDiagABInv = fsum > B3_EPSILON ? b3Scalar(1.) / sum : 0.f;
+						}
+
+						///fix rhs
+						///todo: add force/torque accelerators
+						{
+							b3Scalar rel_vel;
+							b3Scalar vel1Dotn = solverConstraint.m_contactNormal.dot(rbA.m_linVel) + solverConstraint.m_relpos1CrossNormal.dot(rbA.m_angVel);
+							b3Scalar vel2Dotn = -solverConstraint.m_contactNormal.dot(rbB.m_linVel) + solverConstraint.m_relpos2CrossNormal.dot(rbB.m_angVel);
+
+							rel_vel = vel1Dotn + vel2Dotn;
+
+							b3Scalar restitution = 0.f;
+							b3Scalar positionalError = solverConstraint.m_rhs;  //already filled in by getConstraintInfo2
+							b3Scalar velocityError = restitution - rel_vel * info2.m_damping;
+							b3Scalar penetrationImpulse = positionalError * solverConstraint.m_jacDiagABInv;
+							b3Scalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+							solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+							solverConstraint.m_appliedImpulse = 0.f;
+						}
+					}
+				}
+				currentRow += m_tmpConstraintSizesPool[i].m_numConstraintRows;
+			}
+#endif  //DISABLE_JOINTS
+		}
+
+		{
+			int i;
+
+			for (i = 0; i < numManifolds; i++)
+			{
+				b3Contact4& manifold = manifoldPtr[i];
+				convertContact(bodies, inertias, &manifold, infoGlobal);
+			}
+		}
+	}
+
+	//	b3ContactSolverInfo info = infoGlobal;
+
+	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
+	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
+	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
+
+	///@todo: use stack allocator for such temporarily memory, same for solver bodies/constraints
+	m_orderNonContactConstraintPool.resizeNoInitialize(numNonContactPool);
+	if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS))
+		m_orderTmpConstraintPool.resizeNoInitialize(numConstraintPool * 2);
+	else
+		m_orderTmpConstraintPool.resizeNoInitialize(numConstraintPool);
+
+	m_orderFrictionConstraintPool.resizeNoInitialize(numFrictionPool);
+	{
+		int i;
+		for (i = 0; i < numNonContactPool; i++)
+		{
+			m_orderNonContactConstraintPool[i] = i;
+		}
+		for (i = 0; i < numConstraintPool; i++)
+		{
+			m_orderTmpConstraintPool[i] = i;
+		}
+		for (i = 0; i < numFrictionPool; i++)
+		{
+			m_orderFrictionConstraintPool[i] = i;
+		}
+	}
+
+	return 0.f;
+}
+
+b3Scalar b3PgsJacobiSolver::solveSingleIteration(int iteration, b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
+	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
+	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
+
+	if (infoGlobal.m_solverMode & B3_SOLVER_RANDMIZE_ORDER)
+	{
+		if (1)  // uncomment this for a bit less random ((iteration & 7) == 0)
+		{
+			for (int j = 0; j < numNonContactPool; ++j)
+			{
+				int tmp = m_orderNonContactConstraintPool[j];
+				int swapi = b3RandInt2(j + 1);
+				m_orderNonContactConstraintPool[j] = m_orderNonContactConstraintPool[swapi];
+				m_orderNonContactConstraintPool[swapi] = tmp;
+			}
+
+			//contact/friction constraints are not solved more than
+			if (iteration < infoGlobal.m_numIterations)
+			{
+				for (int j = 0; j < numConstraintPool; ++j)
+				{
+					int tmp = m_orderTmpConstraintPool[j];
+					int swapi = b3RandInt2(j + 1);
+					m_orderTmpConstraintPool[j] = m_orderTmpConstraintPool[swapi];
+					m_orderTmpConstraintPool[swapi] = tmp;
+				}
+
+				for (int j = 0; j < numFrictionPool; ++j)
+				{
+					int tmp = m_orderFrictionConstraintPool[j];
+					int swapi = b3RandInt2(j + 1);
+					m_orderFrictionConstraintPool[j] = m_orderFrictionConstraintPool[swapi];
+					m_orderFrictionConstraintPool[swapi] = tmp;
+				}
+			}
+		}
+	}
+
+	if (infoGlobal.m_solverMode & B3_SOLVER_SIMD)
+	{
+		///solve all joint constraints, using SIMD, if available
+		for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++)
+		{
+			b3SolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+			if (iteration < constraint.m_overrideNumSolverIterations)
+				resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[constraint.m_solverBodyIdA], m_tmpSolverBodyPool[constraint.m_solverBodyIdB], constraint);
+		}
+
+		if (iteration < infoGlobal.m_numIterations)
+		{
+			///solve all contact constraints using SIMD, if available
+			if (infoGlobal.m_solverMode & B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS)
+			{
+				int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+				int multiplier = (infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS) ? 2 : 1;
+
+				for (int c = 0; c < numPoolConstraints; c++)
+				{
+					b3Scalar totalImpulse = 0;
+
+					{
+						const b3SolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[c]];
+						resolveSingleConstraintRowLowerLimitSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+						totalImpulse = solveManifold.m_appliedImpulse;
+					}
+					bool applyFriction = true;
+					if (applyFriction)
+					{
+						{
+							b3SolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[c * multiplier]];
+
+							if (totalImpulse > b3Scalar(0))
+							{
+								solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+								solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+								resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+							}
+						}
+
+						if (infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS)
+						{
+							b3SolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[c * multiplier + 1]];
+
+							if (totalImpulse > b3Scalar(0))
+							{
+								solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+								solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+								resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+							}
+						}
+					}
+				}
+			}
+			else  //B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS
+			{
+				//solve the friction constraints after all contact constraints, don't interleave them
+				int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+				int j;
+
+				for (j = 0; j < numPoolConstraints; j++)
+				{
+					const b3SolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+					resolveSingleConstraintRowLowerLimitSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+				}
+
+				if (!m_usePgs)
+					averageVelocities();
+
+				///solve all friction constraints, using SIMD, if available
+
+				int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
+				for (j = 0; j < numFrictionPoolConstraints; j++)
+				{
+					b3SolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+					b3Scalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+
+					if (totalImpulse > b3Scalar(0))
+					{
+						solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+						solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+						resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+					}
+				}
+
+				int numRollingFrictionPoolConstraints = m_tmpSolverContactRollingFrictionConstraintPool.size();
+				for (j = 0; j < numRollingFrictionPoolConstraints; j++)
+				{
+					b3SolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[j];
+					b3Scalar totalImpulse = m_tmpSolverContactConstraintPool[rollingFrictionConstraint.m_frictionIndex].m_appliedImpulse;
+					if (totalImpulse > b3Scalar(0))
+					{
+						b3Scalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction * totalImpulse;
+						if (rollingFrictionMagnitude > rollingFrictionConstraint.m_friction)
+							rollingFrictionMagnitude = rollingFrictionConstraint.m_friction;
+
+						rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude;
+						rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude;
+
+						resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA], m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB], rollingFrictionConstraint);
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		//non-SIMD version
+		///solve all joint constraints
+		for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++)
+		{
+			b3SolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+			if (iteration < constraint.m_overrideNumSolverIterations)
+				resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[constraint.m_solverBodyIdA], m_tmpSolverBodyPool[constraint.m_solverBodyIdB], constraint);
+		}
+
+		if (iteration < infoGlobal.m_numIterations)
+		{
+			///solve all contact constraints
+			int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+			for (int j = 0; j < numPoolConstraints; j++)
+			{
+				const b3SolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+				resolveSingleConstraintRowLowerLimit(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+			}
+			///solve all friction constraints
+			int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
+			for (int j = 0; j < numFrictionPoolConstraints; j++)
+			{
+				b3SolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+				b3Scalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+
+				if (totalImpulse > b3Scalar(0))
+				{
+					solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+					solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+					resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+				}
+			}
+
+			int numRollingFrictionPoolConstraints = m_tmpSolverContactRollingFrictionConstraintPool.size();
+			for (int j = 0; j < numRollingFrictionPoolConstraints; j++)
+			{
+				b3SolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[j];
+				b3Scalar totalImpulse = m_tmpSolverContactConstraintPool[rollingFrictionConstraint.m_frictionIndex].m_appliedImpulse;
+				if (totalImpulse > b3Scalar(0))
+				{
+					b3Scalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction * totalImpulse;
+					if (rollingFrictionMagnitude > rollingFrictionConstraint.m_friction)
+						rollingFrictionMagnitude = rollingFrictionConstraint.m_friction;
+
+					rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude;
+					rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude;
+
+					resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA], m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB], rollingFrictionConstraint);
+				}
+			}
+		}
+	}
+	return 0.f;
+}
+
+void b3PgsJacobiSolver::solveGroupCacheFriendlySplitImpulseIterations(b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	int iteration;
+	if (infoGlobal.m_splitImpulse)
+	{
+		if (infoGlobal.m_solverMode & B3_SOLVER_SIMD)
+		{
+			for (iteration = 0; iteration < infoGlobal.m_numIterations; iteration++)
+			{
+				{
+					int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+					int j;
+					for (j = 0; j < numPoolConstraints; j++)
+					{
+						const b3SolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+
+						resolveSplitPenetrationSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+					}
+				}
+			}
+		}
+		else
+		{
+			for (iteration = 0; iteration < infoGlobal.m_numIterations; iteration++)
+			{
+				{
+					int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+					int j;
+					for (j = 0; j < numPoolConstraints; j++)
+					{
+						const b3SolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+
+						resolveSplitPenetrationImpulseCacheFriendly(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+					}
+				}
+			}
+		}
+	}
+}
+
+b3Scalar b3PgsJacobiSolver::solveGroupCacheFriendlyIterations(b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	B3_PROFILE("solveGroupCacheFriendlyIterations");
+
+	{
+		///this is a special step to resolve penetrations (just for contacts)
+		solveGroupCacheFriendlySplitImpulseIterations(constraints, numConstraints, infoGlobal);
+
+		int maxIterations = m_maxOverrideNumSolverIterations > infoGlobal.m_numIterations ? m_maxOverrideNumSolverIterations : infoGlobal.m_numIterations;
+
+		for (int iteration = 0; iteration < maxIterations; iteration++)
+		//for ( int iteration = maxIterations-1  ; iteration >= 0;iteration--)
+		{
+			solveSingleIteration(iteration, constraints, numConstraints, infoGlobal);
+
+			if (!m_usePgs)
+			{
+				averageVelocities();
+			}
+		}
+	}
+	return 0.f;
+}
+
+void b3PgsJacobiSolver::averageVelocities()
+{
+	B3_PROFILE("averaging");
+	//average the velocities
+	int numBodies = m_bodyCount.size();
+
+	m_deltaLinearVelocities.resize(0);
+	m_deltaLinearVelocities.resize(numBodies, b3MakeVector3(0, 0, 0));
+	m_deltaAngularVelocities.resize(0);
+	m_deltaAngularVelocities.resize(numBodies, b3MakeVector3(0, 0, 0));
+
+	for (int i = 0; i < m_tmpSolverBodyPool.size(); i++)
+	{
+		if (!m_tmpSolverBodyPool[i].m_invMass.isZero())
+		{
+			int orgBodyIndex = m_tmpSolverBodyPool[i].m_originalBodyIndex;
+			m_deltaLinearVelocities[orgBodyIndex] += m_tmpSolverBodyPool[i].getDeltaLinearVelocity();
+			m_deltaAngularVelocities[orgBodyIndex] += m_tmpSolverBodyPool[i].getDeltaAngularVelocity();
+		}
+	}
+
+	for (int i = 0; i < m_tmpSolverBodyPool.size(); i++)
+	{
+		int orgBodyIndex = m_tmpSolverBodyPool[i].m_originalBodyIndex;
+
+		if (!m_tmpSolverBodyPool[i].m_invMass.isZero())
+		{
+			b3Assert(m_bodyCount[orgBodyIndex] == m_bodyCountCheck[orgBodyIndex]);
+
+			b3Scalar factor = 1.f / b3Scalar(m_bodyCount[orgBodyIndex]);
+
+			m_tmpSolverBodyPool[i].m_deltaLinearVelocity = m_deltaLinearVelocities[orgBodyIndex] * factor;
+			m_tmpSolverBodyPool[i].m_deltaAngularVelocity = m_deltaAngularVelocities[orgBodyIndex] * factor;
+		}
+	}
+}
+
+b3Scalar b3PgsJacobiSolver::solveGroupCacheFriendlyFinish(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, const b3ContactSolverInfo& infoGlobal)
+{
+	B3_PROFILE("solveGroupCacheFriendlyFinish");
+	int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+	int i, j;
+
+	if (infoGlobal.m_solverMode & B3_SOLVER_USE_WARMSTARTING)
+	{
+		for (j = 0; j < numPoolConstraints; j++)
+		{
+			const b3SolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[j];
+			b3ContactPoint* pt = (b3ContactPoint*)solveManifold.m_originalContactPoint;
+			b3Assert(pt);
+			pt->m_appliedImpulse = solveManifold.m_appliedImpulse;
+			//	float f = m_tmpSolverContactFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+			//	printf("pt->m_appliedImpulseLateral1 = %f\n", f);
+			pt->m_appliedImpulseLateral1 = m_tmpSolverContactFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+			//printf("pt->m_appliedImpulseLateral1 = %f\n", pt->m_appliedImpulseLateral1);
+			if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS))
+			{
+				pt->m_appliedImpulseLateral2 = m_tmpSolverContactFrictionConstraintPool[solveManifold.m_frictionIndex + 1].m_appliedImpulse;
+			}
+			//do a callback here?
+		}
+	}
+
+	numPoolConstraints = m_tmpSolverNonContactConstraintPool.size();
+	for (j = 0; j < numPoolConstraints; j++)
+	{
+		const b3SolverConstraint& solverConstr = m_tmpSolverNonContactConstraintPool[j];
+		b3TypedConstraint* constr = (b3TypedConstraint*)solverConstr.m_originalContactPoint;
+		b3JointFeedback* fb = constr->getJointFeedback();
+		if (fb)
+		{
+			b3SolverBody* bodyA = &m_tmpSolverBodyPool[solverConstr.m_solverBodyIdA];
+			b3SolverBody* bodyB = &m_tmpSolverBodyPool[solverConstr.m_solverBodyIdB];
+
+			fb->m_appliedForceBodyA += solverConstr.m_contactNormal * solverConstr.m_appliedImpulse * bodyA->m_linearFactor / infoGlobal.m_timeStep;
+			fb->m_appliedForceBodyB += -solverConstr.m_contactNormal * solverConstr.m_appliedImpulse * bodyB->m_linearFactor / infoGlobal.m_timeStep;
+			fb->m_appliedTorqueBodyA += solverConstr.m_relpos1CrossNormal * bodyA->m_angularFactor * solverConstr.m_appliedImpulse / infoGlobal.m_timeStep;
+			fb->m_appliedTorqueBodyB += -solverConstr.m_relpos1CrossNormal * bodyB->m_angularFactor * solverConstr.m_appliedImpulse / infoGlobal.m_timeStep;
+		}
+
+		constr->internalSetAppliedImpulse(solverConstr.m_appliedImpulse);
+		if (b3Fabs(solverConstr.m_appliedImpulse) >= constr->getBreakingImpulseThreshold())
+		{
+			constr->setEnabled(false);
+		}
+	}
+
+	{
+		B3_PROFILE("write back velocities and transforms");
+		for (i = 0; i < m_tmpSolverBodyPool.size(); i++)
+		{
+			int bodyIndex = m_tmpSolverBodyPool[i].m_originalBodyIndex;
+			//b3Assert(i==bodyIndex);
+
+			b3RigidBodyData* body = &bodies[bodyIndex];
+			if (body->m_invMass)
+			{
+				if (infoGlobal.m_splitImpulse)
+					m_tmpSolverBodyPool[i].writebackVelocityAndTransform(infoGlobal.m_timeStep, infoGlobal.m_splitImpulseTurnErp);
+				else
+					m_tmpSolverBodyPool[i].writebackVelocity();
+
+				if (m_usePgs)
+				{
+					body->m_linVel = m_tmpSolverBodyPool[i].m_linearVelocity;
+					body->m_angVel = m_tmpSolverBodyPool[i].m_angularVelocity;
+				}
+				else
+				{
+					b3Scalar factor = 1.f / b3Scalar(m_bodyCount[bodyIndex]);
+
+					b3Vector3 deltaLinVel = m_deltaLinearVelocities[bodyIndex] * factor;
+					b3Vector3 deltaAngVel = m_deltaAngularVelocities[bodyIndex] * factor;
+					//printf("body %d\n",bodyIndex);
+					//printf("deltaLinVel = %f,%f,%f\n",deltaLinVel.getX(),deltaLinVel.getY(),deltaLinVel.getZ());
+					//printf("deltaAngVel = %f,%f,%f\n",deltaAngVel.getX(),deltaAngVel.getY(),deltaAngVel.getZ());
+
+					body->m_linVel += deltaLinVel;
+					body->m_angVel += deltaAngVel;
+				}
+
+				if (infoGlobal.m_splitImpulse)
+				{
+					body->m_pos = m_tmpSolverBodyPool[i].m_worldTransform.getOrigin();
+					b3Quaternion orn;
+					orn = m_tmpSolverBodyPool[i].m_worldTransform.getRotation();
+					body->m_quat = orn;
+				}
+			}
+		}
+	}
+
+	m_tmpSolverContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverNonContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactFrictionConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactRollingFrictionConstraintPool.resizeNoInitialize(0);
+
+	m_tmpSolverBodyPool.resizeNoInitialize(0);
+	return 0.f;
+}
+
+void b3PgsJacobiSolver::reset()
+{
+	m_btSeed2 = 0;
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.h
new file mode 100644
index 0000000..5b61654
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.h
@@ -0,0 +1,133 @@
+#ifndef B3_PGS_JACOBI_SOLVER
+#define B3_PGS_JACOBI_SOLVER
+
+struct b3Contact4;
+struct b3ContactPoint;
+
+class b3Dispatcher;
+
+#include "b3TypedConstraint.h"
+#include "b3ContactSolverInfo.h"
+#include "b3SolverBody.h"
+#include "b3SolverConstraint.h"
+
+struct b3RigidBodyData;
+struct b3InertiaData;
+
+class b3PgsJacobiSolver
+{
+protected:
+	b3AlignedObjectArray<b3SolverBody> m_tmpSolverBodyPool;
+	b3ConstraintArray m_tmpSolverContactConstraintPool;
+	b3ConstraintArray m_tmpSolverNonContactConstraintPool;
+	b3ConstraintArray m_tmpSolverContactFrictionConstraintPool;
+	b3ConstraintArray m_tmpSolverContactRollingFrictionConstraintPool;
+
+	b3AlignedObjectArray<int> m_orderTmpConstraintPool;
+	b3AlignedObjectArray<int> m_orderNonContactConstraintPool;
+	b3AlignedObjectArray<int> m_orderFrictionConstraintPool;
+	b3AlignedObjectArray<b3TypedConstraint::b3ConstraintInfo1> m_tmpConstraintSizesPool;
+
+	b3AlignedObjectArray<int> m_bodyCount;
+	b3AlignedObjectArray<int> m_bodyCountCheck;
+
+	b3AlignedObjectArray<b3Vector3> m_deltaLinearVelocities;
+	b3AlignedObjectArray<b3Vector3> m_deltaAngularVelocities;
+
+	bool m_usePgs;
+	void averageVelocities();
+
+	int m_maxOverrideNumSolverIterations;
+
+	int m_numSplitImpulseRecoveries;
+
+	b3Scalar getContactProcessingThreshold(b3Contact4* contact)
+	{
+		return 0.02f;
+	}
+	void setupFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, b3SolverConstraint& solverConstraint, const b3Vector3& normalAxis, int solverBodyIdA, int solverBodyIdB,
+								 b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2,
+								 b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation,
+								 b3Scalar desiredVelocity = 0., b3Scalar cfmSlip = 0.);
+
+	void setupRollingFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, b3SolverConstraint& solverConstraint, const b3Vector3& normalAxis, int solverBodyIdA, int solverBodyIdB,
+										b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2,
+										b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation,
+										b3Scalar desiredVelocity = 0., b3Scalar cfmSlip = 0.);
+
+	b3SolverConstraint& addFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, const b3Vector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2, b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation, b3Scalar desiredVelocity = 0., b3Scalar cfmSlip = 0.);
+	b3SolverConstraint& addRollingFrictionConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias, const b3Vector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, b3ContactPoint& cp, const b3Vector3& rel_pos1, const b3Vector3& rel_pos2, b3RigidBodyData* colObj0, b3RigidBodyData* colObj1, b3Scalar relaxation, b3Scalar desiredVelocity = 0, b3Scalar cfmSlip = 0.f);
+
+	void setupContactConstraint(b3RigidBodyData* bodies, b3InertiaData* inertias,
+								b3SolverConstraint& solverConstraint, int solverBodyIdA, int solverBodyIdB, b3ContactPoint& cp,
+								const b3ContactSolverInfo& infoGlobal, b3Vector3& vel, b3Scalar& rel_vel, b3Scalar& relaxation,
+								b3Vector3& rel_pos1, b3Vector3& rel_pos2);
+
+	void setFrictionConstraintImpulse(b3RigidBodyData* bodies, b3InertiaData* inertias, b3SolverConstraint& solverConstraint, int solverBodyIdA, int solverBodyIdB,
+									  b3ContactPoint& cp, const b3ContactSolverInfo& infoGlobal);
+
+	///m_btSeed2 is used for re-arranging the constraint rows. improves convergence/quality of friction
+	unsigned long m_btSeed2;
+
+	b3Scalar restitutionCurve(b3Scalar rel_vel, b3Scalar restitution);
+
+	void convertContact(b3RigidBodyData* bodies, b3InertiaData* inertias, b3Contact4* manifold, const b3ContactSolverInfo& infoGlobal);
+
+	void resolveSplitPenetrationSIMD(
+		b3SolverBody& bodyA, b3SolverBody& bodyB,
+		const b3SolverConstraint& contactConstraint);
+
+	void resolveSplitPenetrationImpulseCacheFriendly(
+		b3SolverBody& bodyA, b3SolverBody& bodyB,
+		const b3SolverConstraint& contactConstraint);
+
+	//internal method
+	int getOrInitSolverBody(int bodyIndex, b3RigidBodyData* bodies, b3InertiaData* inertias);
+	void initSolverBody(int bodyIndex, b3SolverBody* solverBody, b3RigidBodyData* collisionObject);
+
+	void resolveSingleConstraintRowGeneric(b3SolverBody& bodyA, b3SolverBody& bodyB, const b3SolverConstraint& contactConstraint);
+
+	void resolveSingleConstraintRowGenericSIMD(b3SolverBody& bodyA, b3SolverBody& bodyB, const b3SolverConstraint& contactConstraint);
+
+	void resolveSingleConstraintRowLowerLimit(b3SolverBody& bodyA, b3SolverBody& bodyB, const b3SolverConstraint& contactConstraint);
+
+	void resolveSingleConstraintRowLowerLimitSIMD(b3SolverBody& bodyA, b3SolverBody& bodyB, const b3SolverConstraint& contactConstraint);
+
+protected:
+	virtual b3Scalar solveGroupCacheFriendlySetup(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, b3Contact4* manifoldPtr, int numManifolds, b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+
+	virtual b3Scalar solveGroupCacheFriendlyIterations(b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+	virtual void solveGroupCacheFriendlySplitImpulseIterations(b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+	b3Scalar solveSingleIteration(int iteration, b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+
+	virtual b3Scalar solveGroupCacheFriendlyFinish(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, const b3ContactSolverInfo& infoGlobal);
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3PgsJacobiSolver(bool usePgs);
+	virtual ~b3PgsJacobiSolver();
+
+	//	void	solveContacts(int numBodies, b3RigidBodyData* bodies, b3InertiaData* inertias, int numContacts, b3Contact4* contacts);
+	void solveContacts(int numBodies, b3RigidBodyData* bodies, b3InertiaData* inertias, int numContacts, b3Contact4* contacts, int numConstraints, b3TypedConstraint** constraints);
+
+	b3Scalar solveGroup(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, b3Contact4* manifoldPtr, int numManifolds, b3TypedConstraint** constraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+
+	///clear internal cached data and reset random seed
+	virtual void reset();
+
+	unsigned long b3Rand2();
+
+	int b3RandInt2(int n);
+
+	void setRandSeed(unsigned long seed)
+	{
+		m_btSeed2 = seed;
+	}
+	unsigned long getRandSeed() const
+	{
+		return m_btSeed2;
+	}
+};
+
+#endif  //B3_PGS_JACOBI_SOLVER
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.cpp b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.cpp
new file mode 100644
index 0000000..f9b103e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.cpp
@@ -0,0 +1,190 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3Point2PointConstraint.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+#include <new>
+
+b3Point2PointConstraint::b3Point2PointConstraint(int rbA, int rbB, const b3Vector3& pivotInA, const b3Vector3& pivotInB)
+	: b3TypedConstraint(B3_POINT2POINT_CONSTRAINT_TYPE, rbA, rbB), m_pivotInA(pivotInA), m_pivotInB(pivotInB), m_flags(0)
+{
+}
+
+/*
+b3Point2PointConstraint::b3Point2PointConstraint(int  rbA,const b3Vector3& pivotInA)
+:b3TypedConstraint(B3_POINT2POINT_CONSTRAINT_TYPE,rbA),m_pivotInA(pivotInA),m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA)),
+m_flags(0),
+m_useSolveConstraintObsolete(false)
+{
+	
+}
+*/
+
+void b3Point2PointConstraint::getInfo1(b3ConstraintInfo1* info, const b3RigidBodyData* bodies)
+{
+	getInfo1NonVirtual(info, bodies);
+}
+
+void b3Point2PointConstraint::getInfo1NonVirtual(b3ConstraintInfo1* info, const b3RigidBodyData* bodies)
+{
+	info->m_numConstraintRows = 3;
+	info->nub = 3;
+}
+
+void b3Point2PointConstraint::getInfo2(b3ConstraintInfo2* info, const b3RigidBodyData* bodies)
+{
+	b3Transform trA;
+	trA.setIdentity();
+	trA.setOrigin(bodies[m_rbA].m_pos);
+	trA.setRotation(bodies[m_rbA].m_quat);
+
+	b3Transform trB;
+	trB.setIdentity();
+	trB.setOrigin(bodies[m_rbB].m_pos);
+	trB.setRotation(bodies[m_rbB].m_quat);
+
+	getInfo2NonVirtual(info, trA, trB);
+}
+
+void b3Point2PointConstraint::getInfo2NonVirtual(b3ConstraintInfo2* info, const b3Transform& body0_trans, const b3Transform& body1_trans)
+{
+	//retrieve matrices
+
+	// anchor points in global coordinates with respect to body PORs.
+
+	// set jacobian
+	info->m_J1linearAxis[0] = 1;
+	info->m_J1linearAxis[info->rowskip + 1] = 1;
+	info->m_J1linearAxis[2 * info->rowskip + 2] = 1;
+
+	b3Vector3 a1 = body0_trans.getBasis() * getPivotInA();
+	//b3Vector3 a1a = b3QuatRotate(body0_trans.getRotation(),getPivotInA());
+
+	{
+		b3Vector3* angular0 = (b3Vector3*)(info->m_J1angularAxis);
+		b3Vector3* angular1 = (b3Vector3*)(info->m_J1angularAxis + info->rowskip);
+		b3Vector3* angular2 = (b3Vector3*)(info->m_J1angularAxis + 2 * info->rowskip);
+		b3Vector3 a1neg = -a1;
+		a1neg.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	if (info->m_J2linearAxis)
+	{
+		info->m_J2linearAxis[0] = -1;
+		info->m_J2linearAxis[info->rowskip + 1] = -1;
+		info->m_J2linearAxis[2 * info->rowskip + 2] = -1;
+	}
+
+	b3Vector3 a2 = body1_trans.getBasis() * getPivotInB();
+
+	{
+		//	b3Vector3 a2n = -a2;
+		b3Vector3* angular0 = (b3Vector3*)(info->m_J2angularAxis);
+		b3Vector3* angular1 = (b3Vector3*)(info->m_J2angularAxis + info->rowskip);
+		b3Vector3* angular2 = (b3Vector3*)(info->m_J2angularAxis + 2 * info->rowskip);
+		a2.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	// set right hand side
+	b3Scalar currERP = (m_flags & B3_P2P_FLAGS_ERP) ? m_erp : info->erp;
+	b3Scalar k = info->fps * currERP;
+	int j;
+	for (j = 0; j < 3; j++)
+	{
+		info->m_constraintError[j * info->rowskip] = k * (a2[j] + body1_trans.getOrigin()[j] - a1[j] - body0_trans.getOrigin()[j]);
+		//printf("info->m_constraintError[%d]=%f\n",j,info->m_constraintError[j]);
+	}
+	if (m_flags & B3_P2P_FLAGS_CFM)
+	{
+		for (j = 0; j < 3; j++)
+		{
+			info->cfm[j * info->rowskip] = m_cfm;
+		}
+	}
+
+	b3Scalar impulseClamp = m_setting.m_impulseClamp;  //
+	for (j = 0; j < 3; j++)
+	{
+		if (m_setting.m_impulseClamp > 0)
+		{
+			info->m_lowerLimit[j * info->rowskip] = -impulseClamp;
+			info->m_upperLimit[j * info->rowskip] = impulseClamp;
+		}
+	}
+	info->m_damping = m_setting.m_damping;
+}
+
+void b3Point2PointConstraint::updateRHS(b3Scalar timeStep)
+{
+	(void)timeStep;
+}
+
+///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+///If no axis is provided, it uses the default axis for this constraint.
+void b3Point2PointConstraint::setParam(int num, b3Scalar value, int axis)
+{
+	if (axis != -1)
+	{
+		b3AssertConstrParams(0);
+	}
+	else
+	{
+		switch (num)
+		{
+			case B3_CONSTRAINT_ERP:
+			case B3_CONSTRAINT_STOP_ERP:
+				m_erp = value;
+				m_flags |= B3_P2P_FLAGS_ERP;
+				break;
+			case B3_CONSTRAINT_CFM:
+			case B3_CONSTRAINT_STOP_CFM:
+				m_cfm = value;
+				m_flags |= B3_P2P_FLAGS_CFM;
+				break;
+			default:
+				b3AssertConstrParams(0);
+		}
+	}
+}
+
+///return the local value of parameter
+b3Scalar b3Point2PointConstraint::getParam(int num, int axis) const
+{
+	b3Scalar retVal(B3_INFINITY);
+	if (axis != -1)
+	{
+		b3AssertConstrParams(0);
+	}
+	else
+	{
+		switch (num)
+		{
+			case B3_CONSTRAINT_ERP:
+			case B3_CONSTRAINT_STOP_ERP:
+				b3AssertConstrParams(m_flags & B3_P2P_FLAGS_ERP);
+				retVal = m_erp;
+				break;
+			case B3_CONSTRAINT_CFM:
+			case B3_CONSTRAINT_STOP_CFM:
+				b3AssertConstrParams(m_flags & B3_P2P_FLAGS_CFM);
+				retVal = m_cfm;
+				break;
+			default:
+				b3AssertConstrParams(0);
+		}
+	}
+	return retVal;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h
new file mode 100644
index 0000000..a6c21d2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h
@@ -0,0 +1,153 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_POINT2POINTCONSTRAINT_H
+#define B3_POINT2POINTCONSTRAINT_H
+
+#include "Bullet3Common/b3Vector3.h"
+//#include "b3JacobianEntry.h"
+#include "b3TypedConstraint.h"
+
+class b3RigidBody;
+
+#ifdef B3_USE_DOUBLE_PRECISION
+#define b3Point2PointConstraintData b3Point2PointConstraintDoubleData
+#define b3Point2PointConstraintDataName "b3Point2PointConstraintDoubleData"
+#else
+#define b3Point2PointConstraintData b3Point2PointConstraintFloatData
+#define b3Point2PointConstraintDataName "b3Point2PointConstraintFloatData"
+#endif  //B3_USE_DOUBLE_PRECISION
+
+struct b3ConstraintSetting
+{
+	b3ConstraintSetting() : m_tau(b3Scalar(0.3)),
+							m_damping(b3Scalar(1.)),
+							m_impulseClamp(b3Scalar(0.))
+	{
+	}
+	b3Scalar m_tau;
+	b3Scalar m_damping;
+	b3Scalar m_impulseClamp;
+};
+
+enum b3Point2PointFlags
+{
+	B3_P2P_FLAGS_ERP = 1,
+	B3_P2P_FLAGS_CFM = 2
+};
+
+/// point to point constraint between two rigidbodies each with a pivotpoint that descibes the 'ballsocket' location in local space
+B3_ATTRIBUTE_ALIGNED16(class)
+b3Point2PointConstraint : public b3TypedConstraint
+{
+#ifdef IN_PARALLELL_SOLVER
+public:
+#endif
+
+	b3Vector3 m_pivotInA;
+	b3Vector3 m_pivotInB;
+
+	int m_flags;
+	b3Scalar m_erp;
+	b3Scalar m_cfm;
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3ConstraintSetting m_setting;
+
+	b3Point2PointConstraint(int rbA, int rbB, const b3Vector3& pivotInA, const b3Vector3& pivotInB);
+
+	//b3Point2PointConstraint(int  rbA,const b3Vector3& pivotInA);
+
+	virtual void getInfo1(b3ConstraintInfo1 * info, const b3RigidBodyData* bodies);
+
+	void getInfo1NonVirtual(b3ConstraintInfo1 * info, const b3RigidBodyData* bodies);
+
+	virtual void getInfo2(b3ConstraintInfo2 * info, const b3RigidBodyData* bodies);
+
+	void getInfo2NonVirtual(b3ConstraintInfo2 * info, const b3Transform& body0_trans, const b3Transform& body1_trans);
+
+	void updateRHS(b3Scalar timeStep);
+
+	void setPivotA(const b3Vector3& pivotA)
+	{
+		m_pivotInA = pivotA;
+	}
+
+	void setPivotB(const b3Vector3& pivotB)
+	{
+		m_pivotInB = pivotB;
+	}
+
+	const b3Vector3& getPivotInA() const
+	{
+		return m_pivotInA;
+	}
+
+	const b3Vector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, b3Scalar value, int axis = -1);
+	///return the local value of parameter
+	virtual b3Scalar getParam(int num, int axis = -1) const;
+
+	//	virtual	int	calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	//	virtual	const char*	serialize(void* dataBuffer, b3Serializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct b3Point2PointConstraintFloatData
+{
+	b3TypedConstraintData m_typeConstraintData;
+	b3Vector3FloatData m_pivotInA;
+	b3Vector3FloatData m_pivotInB;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct b3Point2PointConstraintDoubleData
+{
+	b3TypedConstraintData m_typeConstraintData;
+	b3Vector3DoubleData m_pivotInA;
+	b3Vector3DoubleData m_pivotInB;
+};
+
+/*
+B3_FORCE_INLINE	int	b3Point2PointConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(b3Point2PointConstraintData);
+
+}
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+B3_FORCE_INLINE	const char*	b3Point2PointConstraint::serialize(void* dataBuffer, b3Serializer* serializer) const
+{
+	b3Point2PointConstraintData* p2pData = (b3Point2PointConstraintData*)dataBuffer;
+
+	b3TypedConstraint::serialize(&p2pData->m_typeConstraintData,serializer);
+	m_pivotInA.serialize(p2pData->m_pivotInA);
+	m_pivotInB.serialize(p2pData->m_pivotInB);
+
+	return b3Point2PointConstraintDataName;
+}
+*/
+
+#endif  //B3_POINT2POINTCONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h
new file mode 100644
index 0000000..c9056ec
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverBody.h
@@ -0,0 +1,281 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_SOLVER_BODY_H
+#define B3_SOLVER_BODY_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3Matrix3x3.h"
+
+#include "Bullet3Common/b3AlignedAllocator.h"
+#include "Bullet3Common/b3TransformUtil.h"
+
+///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision
+#ifdef B3_USE_SSE
+#define USE_SIMD 1
+#endif  //
+
+#ifdef USE_SIMD
+
+struct b3SimdScalar
+{
+	B3_FORCE_INLINE b3SimdScalar()
+	{
+	}
+
+	B3_FORCE_INLINE b3SimdScalar(float fl)
+		: m_vec128(_mm_set1_ps(fl))
+	{
+	}
+
+	B3_FORCE_INLINE b3SimdScalar(__m128 v128)
+		: m_vec128(v128)
+	{
+	}
+	union {
+		__m128 m_vec128;
+		float m_floats[4];
+		float x, y, z, w;
+		int m_ints[4];
+		b3Scalar m_unusedPadding;
+	};
+	B3_FORCE_INLINE __m128 get128()
+	{
+		return m_vec128;
+	}
+
+	B3_FORCE_INLINE const __m128 get128() const
+	{
+		return m_vec128;
+	}
+
+	B3_FORCE_INLINE void set128(__m128 v128)
+	{
+		m_vec128 = v128;
+	}
+
+	B3_FORCE_INLINE operator __m128()
+	{
+		return m_vec128;
+	}
+	B3_FORCE_INLINE operator const __m128() const
+	{
+		return m_vec128;
+	}
+
+	B3_FORCE_INLINE operator float() const
+	{
+		return m_floats[0];
+	}
+};
+
+///@brief Return the elementwise product of two b3SimdScalar
+B3_FORCE_INLINE b3SimdScalar
+operator*(const b3SimdScalar& v1, const b3SimdScalar& v2)
+{
+	return b3SimdScalar(_mm_mul_ps(v1.get128(), v2.get128()));
+}
+
+///@brief Return the elementwise product of two b3SimdScalar
+B3_FORCE_INLINE b3SimdScalar
+operator+(const b3SimdScalar& v1, const b3SimdScalar& v2)
+{
+	return b3SimdScalar(_mm_add_ps(v1.get128(), v2.get128()));
+}
+
+#else
+#define b3SimdScalar b3Scalar
+#endif
+
+///The b3SolverBody is an internal datastructure for the constraint solver. Only necessary data is packed to increase cache coherence/performance.
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3SolverBody
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+	b3Transform m_worldTransform;
+	b3Vector3 m_deltaLinearVelocity;
+	b3Vector3 m_deltaAngularVelocity;
+	b3Vector3 m_angularFactor;
+	b3Vector3 m_linearFactor;
+	b3Vector3 m_invMass;
+	b3Vector3 m_pushVelocity;
+	b3Vector3 m_turnVelocity;
+	b3Vector3 m_linearVelocity;
+	b3Vector3 m_angularVelocity;
+
+	union {
+		void* m_originalBody;
+		int m_originalBodyIndex;
+	};
+
+	int padding[3];
+
+	void setWorldTransform(const b3Transform& worldTransform)
+	{
+		m_worldTransform = worldTransform;
+	}
+
+	const b3Transform& getWorldTransform() const
+	{
+		return m_worldTransform;
+	}
+
+	B3_FORCE_INLINE void getVelocityInLocalPointObsolete(const b3Vector3& rel_pos, b3Vector3& velocity) const
+	{
+		if (m_originalBody)
+			velocity = m_linearVelocity + m_deltaLinearVelocity + (m_angularVelocity + m_deltaAngularVelocity).cross(rel_pos);
+		else
+			velocity.setValue(0, 0, 0);
+	}
+
+	B3_FORCE_INLINE void getAngularVelocity(b3Vector3 & angVel) const
+	{
+		if (m_originalBody)
+			angVel = m_angularVelocity + m_deltaAngularVelocity;
+		else
+			angVel.setValue(0, 0, 0);
+	}
+
+	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
+	B3_FORCE_INLINE void applyImpulse(const b3Vector3& linearComponent, const b3Vector3& angularComponent, const b3Scalar impulseMagnitude)
+	{
+		if (m_originalBody)
+		{
+			m_deltaLinearVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_deltaAngularVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	B3_FORCE_INLINE void internalApplyPushImpulse(const b3Vector3& linearComponent, const b3Vector3& angularComponent, b3Scalar impulseMagnitude)
+	{
+		if (m_originalBody)
+		{
+			m_pushVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_turnVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	const b3Vector3& getDeltaLinearVelocity() const
+	{
+		return m_deltaLinearVelocity;
+	}
+
+	const b3Vector3& getDeltaAngularVelocity() const
+	{
+		return m_deltaAngularVelocity;
+	}
+
+	const b3Vector3& getPushVelocity() const
+	{
+		return m_pushVelocity;
+	}
+
+	const b3Vector3& getTurnVelocity() const
+	{
+		return m_turnVelocity;
+	}
+
+	////////////////////////////////////////////////
+	///some internal methods, don't use them
+
+	b3Vector3& internalGetDeltaLinearVelocity()
+	{
+		return m_deltaLinearVelocity;
+	}
+
+	b3Vector3& internalGetDeltaAngularVelocity()
+	{
+		return m_deltaAngularVelocity;
+	}
+
+	const b3Vector3& internalGetAngularFactor() const
+	{
+		return m_angularFactor;
+	}
+
+	const b3Vector3& internalGetInvMass() const
+	{
+		return m_invMass;
+	}
+
+	void internalSetInvMass(const b3Vector3& invMass)
+	{
+		m_invMass = invMass;
+	}
+
+	b3Vector3& internalGetPushVelocity()
+	{
+		return m_pushVelocity;
+	}
+
+	b3Vector3& internalGetTurnVelocity()
+	{
+		return m_turnVelocity;
+	}
+
+	B3_FORCE_INLINE void internalGetVelocityInLocalPointObsolete(const b3Vector3& rel_pos, b3Vector3& velocity) const
+	{
+		velocity = m_linearVelocity + m_deltaLinearVelocity + (m_angularVelocity + m_deltaAngularVelocity).cross(rel_pos);
+	}
+
+	B3_FORCE_INLINE void internalGetAngularVelocity(b3Vector3 & angVel) const
+	{
+		angVel = m_angularVelocity + m_deltaAngularVelocity;
+	}
+
+	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
+	B3_FORCE_INLINE void internalApplyImpulse(const b3Vector3& linearComponent, const b3Vector3& angularComponent, const b3Scalar impulseMagnitude)
+	{
+		//if (m_originalBody)
+		{
+			m_deltaLinearVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_deltaAngularVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	void writebackVelocity()
+	{
+		//if (m_originalBody>=0)
+		{
+			m_linearVelocity += m_deltaLinearVelocity;
+			m_angularVelocity += m_deltaAngularVelocity;
+
+			//m_originalBody->setCompanionId(-1);
+		}
+	}
+
+	void writebackVelocityAndTransform(b3Scalar timeStep, b3Scalar splitImpulseTurnErp)
+	{
+		(void)timeStep;
+		if (m_originalBody)
+		{
+			m_linearVelocity += m_deltaLinearVelocity;
+			m_angularVelocity += m_deltaAngularVelocity;
+
+			//correct the position/orientation based on push/turn recovery
+			b3Transform newTransform;
+			if (m_pushVelocity[0] != 0.f || m_pushVelocity[1] != 0 || m_pushVelocity[2] != 0 || m_turnVelocity[0] != 0.f || m_turnVelocity[1] != 0 || m_turnVelocity[2] != 0)
+			{
+				//	b3Quaternion orn = m_worldTransform.getRotation();
+				b3TransformUtil::integrateTransform(m_worldTransform, m_pushVelocity, m_turnVelocity * splitImpulseTurnErp, timeStep, newTransform);
+				m_worldTransform = newTransform;
+			}
+			//m_worldTransform.setRotation(orn);
+			//m_originalBody->setCompanionId(-1);
+		}
+	}
+};
+
+#endif  //B3_SOLVER_BODY_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h
new file mode 100644
index 0000000..1e9533f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3SolverConstraint.h
@@ -0,0 +1,73 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_SOLVER_CONSTRAINT_H
+#define B3_SOLVER_CONSTRAINT_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3Matrix3x3.h"
+//#include "b3JacobianEntry.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+//#define NO_FRICTION_TANGENTIALS 1
+#include "b3SolverBody.h"
+
+///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints.
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3SolverConstraint
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3Vector3 m_relpos1CrossNormal;
+	b3Vector3 m_contactNormal;
+
+	b3Vector3 m_relpos2CrossNormal;
+	//b3Vector3		m_contactNormal2;//usually m_contactNormal2 == -m_contactNormal
+
+	b3Vector3 m_angularComponentA;
+	b3Vector3 m_angularComponentB;
+
+	mutable b3SimdScalar m_appliedPushImpulse;
+	mutable b3SimdScalar m_appliedImpulse;
+	int m_padding1;
+	int m_padding2;
+	b3Scalar m_friction;
+	b3Scalar m_jacDiagABInv;
+	b3Scalar m_rhs;
+	b3Scalar m_cfm;
+
+	b3Scalar m_lowerLimit;
+	b3Scalar m_upperLimit;
+	b3Scalar m_rhsPenetration;
+	union {
+		void* m_originalContactPoint;
+		b3Scalar m_unusedPadding4;
+	};
+
+	int m_overrideNumSolverIterations;
+	int m_frictionIndex;
+	int m_solverBodyIdA;
+	int m_solverBodyIdB;
+
+	enum b3SolverConstraintType
+	{
+		B3_SOLVER_CONTACT_1D = 0,
+		B3_SOLVER_FRICTION_1D
+	};
+};
+
+typedef b3AlignedObjectArray<b3SolverConstraint> b3ConstraintArray;
+
+#endif  //B3_SOLVER_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp
new file mode 100644
index 0000000..eab17b9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.cpp
@@ -0,0 +1,151 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3TypedConstraint.h"
+//#include "Bullet3Common/b3Serializer.h"
+
+#define B3_DEFAULT_DEBUGDRAW_SIZE b3Scalar(0.3f)
+
+b3TypedConstraint::b3TypedConstraint(b3TypedConstraintType type, int rbA, int rbB)
+	: b3TypedObject(type),
+	  m_userConstraintType(-1),
+	  m_userConstraintPtr((void*)-1),
+	  m_breakingImpulseThreshold(B3_INFINITY),
+	  m_isEnabled(true),
+	  m_needsFeedback(false),
+	  m_overrideNumSolverIterations(-1),
+	  m_rbA(rbA),
+	  m_rbB(rbB),
+	  m_appliedImpulse(b3Scalar(0.)),
+	  m_dbgDrawSize(B3_DEFAULT_DEBUGDRAW_SIZE),
+	  m_jointFeedback(0)
+{
+}
+
+b3Scalar b3TypedConstraint::getMotorFactor(b3Scalar pos, b3Scalar lowLim, b3Scalar uppLim, b3Scalar vel, b3Scalar timeFact)
+{
+	if (lowLim > uppLim)
+	{
+		return b3Scalar(1.0f);
+	}
+	else if (lowLim == uppLim)
+	{
+		return b3Scalar(0.0f);
+	}
+	b3Scalar lim_fact = b3Scalar(1.0f);
+	b3Scalar delta_max = vel / timeFact;
+	if (delta_max < b3Scalar(0.0f))
+	{
+		if ((pos >= lowLim) && (pos < (lowLim - delta_max)))
+		{
+			lim_fact = (lowLim - pos) / delta_max;
+		}
+		else if (pos < lowLim)
+		{
+			lim_fact = b3Scalar(0.0f);
+		}
+		else
+		{
+			lim_fact = b3Scalar(1.0f);
+		}
+	}
+	else if (delta_max > b3Scalar(0.0f))
+	{
+		if ((pos <= uppLim) && (pos > (uppLim - delta_max)))
+		{
+			lim_fact = (uppLim - pos) / delta_max;
+		}
+		else if (pos > uppLim)
+		{
+			lim_fact = b3Scalar(0.0f);
+		}
+		else
+		{
+			lim_fact = b3Scalar(1.0f);
+		}
+	}
+	else
+	{
+		lim_fact = b3Scalar(0.0f);
+	}
+	return lim_fact;
+}
+
+void b3AngularLimit::set(b3Scalar low, b3Scalar high, b3Scalar _softness, b3Scalar _biasFactor, b3Scalar _relaxationFactor)
+{
+	m_halfRange = (high - low) / 2.0f;
+	m_center = b3NormalizeAngle(low + m_halfRange);
+	m_softness = _softness;
+	m_biasFactor = _biasFactor;
+	m_relaxationFactor = _relaxationFactor;
+}
+
+void b3AngularLimit::test(const b3Scalar angle)
+{
+	m_correction = 0.0f;
+	m_sign = 0.0f;
+	m_solveLimit = false;
+
+	if (m_halfRange >= 0.0f)
+	{
+		b3Scalar deviation = b3NormalizeAngle(angle - m_center);
+		if (deviation < -m_halfRange)
+		{
+			m_solveLimit = true;
+			m_correction = -(deviation + m_halfRange);
+			m_sign = +1.0f;
+		}
+		else if (deviation > m_halfRange)
+		{
+			m_solveLimit = true;
+			m_correction = m_halfRange - deviation;
+			m_sign = -1.0f;
+		}
+	}
+}
+
+b3Scalar b3AngularLimit::getError() const
+{
+	return m_correction * m_sign;
+}
+
+void b3AngularLimit::fit(b3Scalar& angle) const
+{
+	if (m_halfRange > 0.0f)
+	{
+		b3Scalar relativeAngle = b3NormalizeAngle(angle - m_center);
+		if (!b3Equal(relativeAngle, m_halfRange))
+		{
+			if (relativeAngle > 0.0f)
+			{
+				angle = getHigh();
+			}
+			else
+			{
+				angle = getLow();
+			}
+		}
+	}
+}
+
+b3Scalar b3AngularLimit::getLow() const
+{
+	return b3NormalizeAngle(m_center - m_halfRange);
+}
+
+b3Scalar b3AngularLimit::getHigh() const
+{
+	return b3NormalizeAngle(m_center + m_halfRange);
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h
new file mode 100644
index 0000000..82075db
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h
@@ -0,0 +1,469 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2010 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_TYPED_CONSTRAINT_H
+#define B3_TYPED_CONSTRAINT_H
+
+#include "Bullet3Common/b3Scalar.h"
+#include "b3SolverConstraint.h"
+
+class b3Serializer;
+
+//Don't change any of the existing enum values, so add enum types at the end for serialization compatibility
+enum b3TypedConstraintType
+{
+	B3_POINT2POINT_CONSTRAINT_TYPE = 3,
+	B3_HINGE_CONSTRAINT_TYPE,
+	B3_CONETWIST_CONSTRAINT_TYPE,
+	B3_D6_CONSTRAINT_TYPE,
+	B3_SLIDER_CONSTRAINT_TYPE,
+	B3_CONTACT_CONSTRAINT_TYPE,
+	B3_D6_SPRING_CONSTRAINT_TYPE,
+	B3_GEAR_CONSTRAINT_TYPE,
+	B3_FIXED_CONSTRAINT_TYPE,
+	B3_MAX_CONSTRAINT_TYPE
+};
+
+enum b3ConstraintParams
+{
+	B3_CONSTRAINT_ERP = 1,
+	B3_CONSTRAINT_STOP_ERP,
+	B3_CONSTRAINT_CFM,
+	B3_CONSTRAINT_STOP_CFM
+};
+
+#if 1
+#define b3AssertConstrParams(_par) b3Assert(_par)
+#else
+#define b3AssertConstrParams(_par)
+#endif
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3JointFeedback
+{
+	b3Vector3 m_appliedForceBodyA;
+	b3Vector3 m_appliedTorqueBodyA;
+	b3Vector3 m_appliedForceBodyB;
+	b3Vector3 m_appliedTorqueBodyB;
+};
+
+struct b3RigidBodyData;
+
+///TypedConstraint is the baseclass for Bullet constraints and vehicles
+B3_ATTRIBUTE_ALIGNED16(class)
+b3TypedConstraint : public b3TypedObject
+{
+	int m_userConstraintType;
+
+	union {
+		int m_userConstraintId;
+		void* m_userConstraintPtr;
+	};
+
+	b3Scalar m_breakingImpulseThreshold;
+	bool m_isEnabled;
+	bool m_needsFeedback;
+	int m_overrideNumSolverIterations;
+
+	b3TypedConstraint& operator=(b3TypedConstraint& other)
+	{
+		b3Assert(0);
+		(void)other;
+		return *this;
+	}
+
+protected:
+	int m_rbA;
+	int m_rbB;
+	b3Scalar m_appliedImpulse;
+	b3Scalar m_dbgDrawSize;
+	b3JointFeedback* m_jointFeedback;
+
+	///internal method used by the constraint solver, don't use them directly
+	b3Scalar getMotorFactor(b3Scalar pos, b3Scalar lowLim, b3Scalar uppLim, b3Scalar vel, b3Scalar timeFact);
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	virtual ~b3TypedConstraint(){};
+	b3TypedConstraint(b3TypedConstraintType type, int bodyA, int bodyB);
+
+	struct b3ConstraintInfo1
+	{
+		int m_numConstraintRows, nub;
+	};
+
+	struct b3ConstraintInfo2
+	{
+		// integrator parameters: frames per second (1/stepsize), default error
+		// reduction parameter (0..1).
+		b3Scalar fps, erp;
+
+		// for the first and second body, pointers to two (linear and angular)
+		// n*3 jacobian sub matrices, stored by rows. these matrices will have
+		// been initialized to 0 on entry. if the second body is zero then the
+		// J2xx pointers may be 0.
+		b3Scalar *m_J1linearAxis, *m_J1angularAxis, *m_J2linearAxis, *m_J2angularAxis;
+
+		// elements to jump from one row to the next in J's
+		int rowskip;
+
+		// right hand sides of the equation J*v = c + cfm * lambda. cfm is the
+		// "constraint force mixing" vector. c is set to zero on entry, cfm is
+		// set to a constant value (typically very small or zero) value on entry.
+		b3Scalar *m_constraintError, *cfm;
+
+		// lo and hi limits for variables (set to -/+ infinity on entry).
+		b3Scalar *m_lowerLimit, *m_upperLimit;
+
+		// findex vector for variables. see the LCP solver interface for a
+		// description of what this does. this is set to -1 on entry.
+		// note that the returned indexes are relative to the first index of
+		// the constraint.
+		int* findex;
+		// number of solver iterations
+		int m_numIterations;
+
+		//damping of the velocity
+		b3Scalar m_damping;
+	};
+
+	int getOverrideNumSolverIterations() const
+	{
+		return m_overrideNumSolverIterations;
+	}
+
+	///override the number of constraint solver iterations used to solve this constraint
+	///-1 will use the default number of iterations, as specified in SolverInfo.m_numIterations
+	void setOverrideNumSolverIterations(int overideNumIterations)
+	{
+		m_overrideNumSolverIterations = overideNumIterations;
+	}
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void setupSolverConstraint(b3ConstraintArray & ca, int solverBodyA, int solverBodyB, b3Scalar timeStep)
+	{
+		(void)ca;
+		(void)solverBodyA;
+		(void)solverBodyB;
+		(void)timeStep;
+	}
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void getInfo1(b3ConstraintInfo1 * info, const b3RigidBodyData* bodies) = 0;
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void getInfo2(b3ConstraintInfo2 * info, const b3RigidBodyData* bodies) = 0;
+
+	///internal method used by the constraint solver, don't use them directly
+	void internalSetAppliedImpulse(b3Scalar appliedImpulse)
+	{
+		m_appliedImpulse = appliedImpulse;
+	}
+	///internal method used by the constraint solver, don't use them directly
+	b3Scalar internalGetAppliedImpulse()
+	{
+		return m_appliedImpulse;
+	}
+
+	b3Scalar getBreakingImpulseThreshold() const
+	{
+		return m_breakingImpulseThreshold;
+	}
+
+	void setBreakingImpulseThreshold(b3Scalar threshold)
+	{
+		m_breakingImpulseThreshold = threshold;
+	}
+
+	bool isEnabled() const
+	{
+		return m_isEnabled;
+	}
+
+	void setEnabled(bool enabled)
+	{
+		m_isEnabled = enabled;
+	}
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void solveConstraintObsolete(b3SolverBody& /*bodyA*/, b3SolverBody& /*bodyB*/, b3Scalar /*timeStep*/){};
+
+	int getRigidBodyA() const
+	{
+		return m_rbA;
+	}
+	int getRigidBodyB() const
+	{
+		return m_rbB;
+	}
+
+	int getRigidBodyA()
+	{
+		return m_rbA;
+	}
+	int getRigidBodyB()
+	{
+		return m_rbB;
+	}
+
+	int getUserConstraintType() const
+	{
+		return m_userConstraintType;
+	}
+
+	void setUserConstraintType(int userConstraintType)
+	{
+		m_userConstraintType = userConstraintType;
+	};
+
+	void setUserConstraintId(int uid)
+	{
+		m_userConstraintId = uid;
+	}
+
+	int getUserConstraintId() const
+	{
+		return m_userConstraintId;
+	}
+
+	void setUserConstraintPtr(void* ptr)
+	{
+		m_userConstraintPtr = ptr;
+	}
+
+	void* getUserConstraintPtr()
+	{
+		return m_userConstraintPtr;
+	}
+
+	void setJointFeedback(b3JointFeedback * jointFeedback)
+	{
+		m_jointFeedback = jointFeedback;
+	}
+
+	const b3JointFeedback* getJointFeedback() const
+	{
+		return m_jointFeedback;
+	}
+
+	b3JointFeedback* getJointFeedback()
+	{
+		return m_jointFeedback;
+	}
+
+	int getUid() const
+	{
+		return m_userConstraintId;
+	}
+
+	bool needsFeedback() const
+	{
+		return m_needsFeedback;
+	}
+
+	///enableFeedback will allow to read the applied linear and angular impulse
+	///use getAppliedImpulse, getAppliedLinearImpulse and getAppliedAngularImpulse to read feedback information
+	void enableFeedback(bool needsFeedback)
+	{
+		m_needsFeedback = needsFeedback;
+	}
+
+	///getAppliedImpulse is an estimated total applied impulse.
+	///This feedback could be used to determine breaking constraints or playing sounds.
+	b3Scalar getAppliedImpulse() const
+	{
+		b3Assert(m_needsFeedback);
+		return m_appliedImpulse;
+	}
+
+	b3TypedConstraintType getConstraintType() const
+	{
+		return b3TypedConstraintType(m_objectType);
+	}
+
+	void setDbgDrawSize(b3Scalar dbgDrawSize)
+	{
+		m_dbgDrawSize = dbgDrawSize;
+	}
+	b3Scalar getDbgDrawSize()
+	{
+		return m_dbgDrawSize;
+	}
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, b3Scalar value, int axis = -1) = 0;
+
+	///return the local value of parameter
+	virtual b3Scalar getParam(int num, int axis = -1) const = 0;
+
+	//	virtual	int	calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	//virtual	const char*	serialize(void* dataBuffer, b3Serializer* serializer) const;
+};
+
+// returns angle in range [-B3_2_PI, B3_2_PI], closest to one of the limits
+// all arguments should be normalized angles (i.e. in range [-B3_PI, B3_PI])
+B3_FORCE_INLINE b3Scalar b3AdjustAngleToLimits(b3Scalar angleInRadians, b3Scalar angleLowerLimitInRadians, b3Scalar angleUpperLimitInRadians)
+{
+	if (angleLowerLimitInRadians >= angleUpperLimitInRadians)
+	{
+		return angleInRadians;
+	}
+	else if (angleInRadians < angleLowerLimitInRadians)
+	{
+		b3Scalar diffLo = b3Fabs(b3NormalizeAngle(angleLowerLimitInRadians - angleInRadians));
+		b3Scalar diffHi = b3Fabs(b3NormalizeAngle(angleUpperLimitInRadians - angleInRadians));
+		return (diffLo < diffHi) ? angleInRadians : (angleInRadians + B3_2_PI);
+	}
+	else if (angleInRadians > angleUpperLimitInRadians)
+	{
+		b3Scalar diffHi = b3Fabs(b3NormalizeAngle(angleInRadians - angleUpperLimitInRadians));
+		b3Scalar diffLo = b3Fabs(b3NormalizeAngle(angleInRadians - angleLowerLimitInRadians));
+		return (diffLo < diffHi) ? (angleInRadians - B3_2_PI) : angleInRadians;
+	}
+	else
+	{
+		return angleInRadians;
+	}
+}
+
+// clang-format off
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	b3TypedConstraintData
+{
+	int		m_bodyA;
+	int		m_bodyB;
+	char	*m_name;
+
+	int	m_objectType;
+	int	m_userConstraintType;
+	int	m_userConstraintId;
+	int	m_needsFeedback;
+
+	float	m_appliedImpulse;
+	float	m_dbgDrawSize;
+
+	int	m_disableCollisionsBetweenLinkedBodies;
+	int	m_overrideNumSolverIterations;
+
+	float	m_breakingImpulseThreshold;
+	int		m_isEnabled;
+	
+};
+
+// clang-format on
+
+/*B3_FORCE_INLINE	int	b3TypedConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(b3TypedConstraintData);
+}
+*/
+
+class b3AngularLimit
+{
+private:
+	b3Scalar
+		m_center,
+		m_halfRange,
+		m_softness,
+		m_biasFactor,
+		m_relaxationFactor,
+		m_correction,
+		m_sign;
+
+	bool
+		m_solveLimit;
+
+public:
+	/// Default constructor initializes limit as inactive, allowing free constraint movement
+	b3AngularLimit()
+		: m_center(0.0f),
+		  m_halfRange(-1.0f),
+		  m_softness(0.9f),
+		  m_biasFactor(0.3f),
+		  m_relaxationFactor(1.0f),
+		  m_correction(0.0f),
+		  m_sign(0.0f),
+		  m_solveLimit(false)
+	{
+	}
+
+	/// Sets all limit's parameters.
+	/// When low > high limit becomes inactive.
+	/// When high - low > 2PI limit is ineffective too becouse no angle can exceed the limit
+	void set(b3Scalar low, b3Scalar high, b3Scalar _softness = 0.9f, b3Scalar _biasFactor = 0.3f, b3Scalar _relaxationFactor = 1.0f);
+
+	/// Checks conastaint angle against limit. If limit is active and the angle violates the limit
+	/// correction is calculated.
+	void test(const b3Scalar angle);
+
+	/// Returns limit's softness
+	inline b3Scalar getSoftness() const
+	{
+		return m_softness;
+	}
+
+	/// Returns limit's bias factor
+	inline b3Scalar getBiasFactor() const
+	{
+		return m_biasFactor;
+	}
+
+	/// Returns limit's relaxation factor
+	inline b3Scalar getRelaxationFactor() const
+	{
+		return m_relaxationFactor;
+	}
+
+	/// Returns correction value evaluated when test() was invoked
+	inline b3Scalar getCorrection() const
+	{
+		return m_correction;
+	}
+
+	/// Returns sign value evaluated when test() was invoked
+	inline b3Scalar getSign() const
+	{
+		return m_sign;
+	}
+
+	/// Gives half of the distance between min and max limit angle
+	inline b3Scalar getHalfRange() const
+	{
+		return m_halfRange;
+	}
+
+	/// Returns true when the last test() invocation recognized limit violation
+	inline bool isLimit() const
+	{
+		return m_solveLimit;
+	}
+
+	/// Checks given angle against limit. If limit is active and angle doesn't fit it, the angle
+	/// returned is modified so it equals to the limit closest to given angle.
+	void fit(b3Scalar& angle) const;
+
+	/// Returns correction value multiplied by sign value
+	b3Scalar getError() const;
+
+	b3Scalar getLow() const;
+
+	b3Scalar getHigh() const;
+};
+
+#endif  //B3_TYPED_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.cpp b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.cpp
new file mode 100644
index 0000000..f1080d9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.cpp
@@ -0,0 +1,447 @@
+#include "b3CpuRigidBodyPipeline.h"
+
+#include "Bullet3Dynamics/shared/b3IntegrateTransforms.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Dynamics/shared/b3ContactConstraint4.h"
+#include "Bullet3Dynamics/shared/b3Inertia.h"
+
+struct b3CpuRigidBodyPipelineInternalData
+{
+	b3AlignedObjectArray<b3RigidBodyData> m_rigidBodies;
+	b3AlignedObjectArray<b3Inertia> m_inertias;
+	b3AlignedObjectArray<b3Aabb> m_aabbWorldSpace;
+
+	b3DynamicBvhBroadphase* m_bp;
+	b3CpuNarrowPhase* m_np;
+	b3Config m_config;
+};
+
+b3CpuRigidBodyPipeline::b3CpuRigidBodyPipeline(class b3CpuNarrowPhase* narrowphase, struct b3DynamicBvhBroadphase* broadphaseDbvt, const b3Config& config)
+{
+	m_data = new b3CpuRigidBodyPipelineInternalData;
+	m_data->m_np = narrowphase;
+	m_data->m_bp = broadphaseDbvt;
+	m_data->m_config = config;
+}
+
+b3CpuRigidBodyPipeline::~b3CpuRigidBodyPipeline()
+{
+	delete m_data;
+}
+
+void b3CpuRigidBodyPipeline::updateAabbWorldSpace()
+{
+	for (int i = 0; i < this->getNumBodies(); i++)
+	{
+		b3RigidBodyData* body = &m_data->m_rigidBodies[i];
+		b3Float4 position = body->m_pos;
+		b3Quat orientation = body->m_quat;
+
+		int collidableIndex = body->m_collidableIdx;
+		b3Collidable& collidable = m_data->m_np->getCollidableCpu(collidableIndex);
+		int shapeIndex = collidable.m_shapeIndex;
+
+		if (shapeIndex >= 0)
+		{
+			b3Aabb localAabb = m_data->m_np->getLocalSpaceAabb(shapeIndex);
+			b3Aabb& worldAabb = m_data->m_aabbWorldSpace[i];
+			float margin = 0.f;
+			b3TransformAabb2(localAabb.m_minVec, localAabb.m_maxVec, margin, position, orientation, &worldAabb.m_minVec, &worldAabb.m_maxVec);
+			m_data->m_bp->setAabb(i, worldAabb.m_minVec, worldAabb.m_maxVec, 0);
+		}
+	}
+}
+
+void b3CpuRigidBodyPipeline::computeOverlappingPairs()
+{
+	int numPairs = m_data->m_bp->getOverlappingPairCache()->getNumOverlappingPairs();
+	m_data->m_bp->calculateOverlappingPairs();
+	numPairs = m_data->m_bp->getOverlappingPairCache()->getNumOverlappingPairs();
+	printf("numPairs=%d\n", numPairs);
+}
+
+void b3CpuRigidBodyPipeline::computeContactPoints()
+{
+	b3AlignedObjectArray<b3Int4>& pairs = m_data->m_bp->getOverlappingPairCache()->getOverlappingPairArray();
+
+	m_data->m_np->computeContacts(pairs, m_data->m_aabbWorldSpace, m_data->m_rigidBodies);
+}
+void b3CpuRigidBodyPipeline::stepSimulation(float deltaTime)
+{
+	//update world space aabb's
+	updateAabbWorldSpace();
+
+	//compute overlapping pairs
+	computeOverlappingPairs();
+
+	//compute contacts
+	computeContactPoints();
+
+	//solve contacts
+
+	//update transforms
+	integrate(deltaTime);
+}
+
+static inline float b3CalcRelVel(const b3Vector3& l0, const b3Vector3& l1, const b3Vector3& a0, const b3Vector3& a1,
+								 const b3Vector3& linVel0, const b3Vector3& angVel0, const b3Vector3& linVel1, const b3Vector3& angVel1)
+{
+	return b3Dot(l0, linVel0) + b3Dot(a0, angVel0) + b3Dot(l1, linVel1) + b3Dot(a1, angVel1);
+}
+
+static inline void b3SetLinearAndAngular(const b3Vector3& n, const b3Vector3& r0, const b3Vector3& r1,
+										 b3Vector3& linear, b3Vector3& angular0, b3Vector3& angular1)
+{
+	linear = -n;
+	angular0 = -b3Cross(r0, n);
+	angular1 = b3Cross(r1, n);
+}
+
+static inline void b3SolveContact(b3ContactConstraint4& cs,
+								  const b3Vector3& posA, b3Vector3& linVelA, b3Vector3& angVelA, float invMassA, const b3Matrix3x3& invInertiaA,
+								  const b3Vector3& posB, b3Vector3& linVelB, b3Vector3& angVelB, float invMassB, const b3Matrix3x3& invInertiaB,
+								  float maxRambdaDt[4], float minRambdaDt[4])
+{
+	b3Vector3 dLinVelA;
+	dLinVelA.setZero();
+	b3Vector3 dAngVelA;
+	dAngVelA.setZero();
+	b3Vector3 dLinVelB;
+	dLinVelB.setZero();
+	b3Vector3 dAngVelB;
+	dAngVelB.setZero();
+
+	for (int ic = 0; ic < 4; ic++)
+	{
+		//	dont necessary because this makes change to 0
+		if (cs.m_jacCoeffInv[ic] == 0.f) continue;
+
+		{
+			b3Vector3 angular0, angular1, linear;
+			b3Vector3 r0 = cs.m_worldPos[ic] - (b3Vector3&)posA;
+			b3Vector3 r1 = cs.m_worldPos[ic] - (b3Vector3&)posB;
+			b3SetLinearAndAngular((const b3Vector3&)-cs.m_linear, (const b3Vector3&)r0, (const b3Vector3&)r1, linear, angular0, angular1);
+
+			float rambdaDt = b3CalcRelVel((const b3Vector3&)cs.m_linear, (const b3Vector3&)-cs.m_linear, angular0, angular1,
+										  linVelA, angVelA, linVelB, angVelB) +
+							 cs.m_b[ic];
+			rambdaDt *= cs.m_jacCoeffInv[ic];
+
+			{
+				float prevSum = cs.m_appliedRambdaDt[ic];
+				float updated = prevSum;
+				updated += rambdaDt;
+				updated = b3Max(updated, minRambdaDt[ic]);
+				updated = b3Min(updated, maxRambdaDt[ic]);
+				rambdaDt = updated - prevSum;
+				cs.m_appliedRambdaDt[ic] = updated;
+			}
+
+			b3Vector3 linImp0 = invMassA * linear * rambdaDt;
+			b3Vector3 linImp1 = invMassB * (-linear) * rambdaDt;
+			b3Vector3 angImp0 = (invInertiaA * angular0) * rambdaDt;
+			b3Vector3 angImp1 = (invInertiaB * angular1) * rambdaDt;
+#ifdef _WIN32
+			b3Assert(_finite(linImp0.getX()));
+			b3Assert(_finite(linImp1.getX()));
+#endif
+			{
+				linVelA += linImp0;
+				angVelA += angImp0;
+				linVelB += linImp1;
+				angVelB += angImp1;
+			}
+		}
+	}
+}
+
+static inline void b3SolveFriction(b3ContactConstraint4& cs,
+								   const b3Vector3& posA, b3Vector3& linVelA, b3Vector3& angVelA, float invMassA, const b3Matrix3x3& invInertiaA,
+								   const b3Vector3& posB, b3Vector3& linVelB, b3Vector3& angVelB, float invMassB, const b3Matrix3x3& invInertiaB,
+								   float maxRambdaDt[4], float minRambdaDt[4])
+{
+	if (cs.m_fJacCoeffInv[0] == 0 && cs.m_fJacCoeffInv[0] == 0) return;
+	const b3Vector3& center = (const b3Vector3&)cs.m_center;
+
+	b3Vector3 n = -(const b3Vector3&)cs.m_linear;
+
+	b3Vector3 tangent[2];
+
+	b3PlaneSpace1(n, tangent[0], tangent[1]);
+
+	b3Vector3 angular0, angular1, linear;
+	b3Vector3 r0 = center - posA;
+	b3Vector3 r1 = center - posB;
+	for (int i = 0; i < 2; i++)
+	{
+		b3SetLinearAndAngular(tangent[i], r0, r1, linear, angular0, angular1);
+		float rambdaDt = b3CalcRelVel(linear, -linear, angular0, angular1,
+									  linVelA, angVelA, linVelB, angVelB);
+		rambdaDt *= cs.m_fJacCoeffInv[i];
+
+		{
+			float prevSum = cs.m_fAppliedRambdaDt[i];
+			float updated = prevSum;
+			updated += rambdaDt;
+			updated = b3Max(updated, minRambdaDt[i]);
+			updated = b3Min(updated, maxRambdaDt[i]);
+			rambdaDt = updated - prevSum;
+			cs.m_fAppliedRambdaDt[i] = updated;
+		}
+
+		b3Vector3 linImp0 = invMassA * linear * rambdaDt;
+		b3Vector3 linImp1 = invMassB * (-linear) * rambdaDt;
+		b3Vector3 angImp0 = (invInertiaA * angular0) * rambdaDt;
+		b3Vector3 angImp1 = (invInertiaB * angular1) * rambdaDt;
+#ifdef _WIN32
+		b3Assert(_finite(linImp0.getX()));
+		b3Assert(_finite(linImp1.getX()));
+#endif
+		linVelA += linImp0;
+		angVelA += angImp0;
+		linVelB += linImp1;
+		angVelB += angImp1;
+	}
+
+	{  //	angular damping for point constraint
+		b3Vector3 ab = (posB - posA).normalized();
+		b3Vector3 ac = (center - posA).normalized();
+		if (b3Dot(ab, ac) > 0.95f || (invMassA == 0.f || invMassB == 0.f))
+		{
+			float angNA = b3Dot(n, angVelA);
+			float angNB = b3Dot(n, angVelB);
+
+			angVelA -= (angNA * 0.1f) * n;
+			angVelB -= (angNB * 0.1f) * n;
+		}
+	}
+}
+
+struct b3SolveTask  // : public ThreadPool::Task
+{
+	b3SolveTask(b3AlignedObjectArray<b3RigidBodyData>& bodies,
+				b3AlignedObjectArray<b3Inertia>& shapes,
+				b3AlignedObjectArray<b3ContactConstraint4>& constraints,
+				int start, int nConstraints,
+				int maxNumBatches,
+				b3AlignedObjectArray<int>* wgUsedBodies, int curWgidx)
+		: m_bodies(bodies), m_shapes(shapes), m_constraints(constraints), m_wgUsedBodies(wgUsedBodies), m_curWgidx(curWgidx), m_start(start), m_nConstraints(nConstraints), m_solveFriction(true), m_maxNumBatches(maxNumBatches)
+	{
+	}
+
+	unsigned short int getType() { return 0; }
+
+	void run(int tIdx)
+	{
+		b3AlignedObjectArray<int> usedBodies;
+		//printf("run..............\n");
+
+		for (int bb = 0; bb < m_maxNumBatches; bb++)
+		{
+			usedBodies.resize(0);
+			for (int ic = m_nConstraints - 1; ic >= 0; ic--)
+			//for(int ic=0; ic<m_nConstraints; ic++)
+			{
+				int i = m_start + ic;
+				if (m_constraints[i].m_batchIdx != bb)
+					continue;
+
+				float frictionCoeff = b3GetFrictionCoeff(&m_constraints[i]);
+				int aIdx = (int)m_constraints[i].m_bodyA;
+				int bIdx = (int)m_constraints[i].m_bodyB;
+				//int localBatch = m_constraints[i].m_batchIdx;
+				b3RigidBodyData& bodyA = m_bodies[aIdx];
+				b3RigidBodyData& bodyB = m_bodies[bIdx];
+
+#if 0
+				if ((bodyA.m_invMass) && (bodyB.m_invMass))
+				{
+				//	printf("aIdx=%d, bIdx=%d\n", aIdx,bIdx);
+				}
+				if (bIdx==10)
+				{
+					//printf("ic(b)=%d, localBatch=%d\n",ic,localBatch);
+				}
+#endif
+				if (aIdx == 10)
+				{
+					//printf("ic(a)=%d, localBatch=%d\n",ic,localBatch);
+				}
+				if (usedBodies.size() < (aIdx + 1))
+				{
+					usedBodies.resize(aIdx + 1, 0);
+				}
+
+				if (usedBodies.size() < (bIdx + 1))
+				{
+					usedBodies.resize(bIdx + 1, 0);
+				}
+
+				if (bodyA.m_invMass)
+				{
+					b3Assert(usedBodies[aIdx] == 0);
+					usedBodies[aIdx]++;
+				}
+
+				if (bodyB.m_invMass)
+				{
+					b3Assert(usedBodies[bIdx] == 0);
+					usedBodies[bIdx]++;
+				}
+
+				if (!m_solveFriction)
+				{
+					float maxRambdaDt[4] = {FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX};
+					float minRambdaDt[4] = {0.f, 0.f, 0.f, 0.f};
+
+					b3SolveContact(m_constraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, (const b3Matrix3x3&)m_shapes[aIdx].m_invInertiaWorld,
+								   (b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, (const b3Matrix3x3&)m_shapes[bIdx].m_invInertiaWorld,
+								   maxRambdaDt, minRambdaDt);
+				}
+				else
+				{
+					float maxRambdaDt[4] = {FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX};
+					float minRambdaDt[4] = {0.f, 0.f, 0.f, 0.f};
+
+					float sum = 0;
+					for (int j = 0; j < 4; j++)
+					{
+						sum += m_constraints[i].m_appliedRambdaDt[j];
+					}
+					frictionCoeff = 0.7f;
+					for (int j = 0; j < 4; j++)
+					{
+						maxRambdaDt[j] = frictionCoeff * sum;
+						minRambdaDt[j] = -maxRambdaDt[j];
+					}
+
+					b3SolveFriction(m_constraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, (const b3Matrix3x3&)m_shapes[aIdx].m_invInertiaWorld,
+									(b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, (const b3Matrix3x3&)m_shapes[bIdx].m_invInertiaWorld,
+									maxRambdaDt, minRambdaDt);
+				}
+			}
+
+			if (m_wgUsedBodies)
+			{
+				if (m_wgUsedBodies[m_curWgidx].size() < usedBodies.size())
+				{
+					m_wgUsedBodies[m_curWgidx].resize(usedBodies.size());
+				}
+				for (int i = 0; i < usedBodies.size(); i++)
+				{
+					if (usedBodies[i])
+					{
+						//printf("cell %d uses body %d\n", m_curWgidx,i);
+						m_wgUsedBodies[m_curWgidx][i] = 1;
+					}
+				}
+			}
+		}
+	}
+
+	b3AlignedObjectArray<b3RigidBodyData>& m_bodies;
+	b3AlignedObjectArray<b3Inertia>& m_shapes;
+	b3AlignedObjectArray<b3ContactConstraint4>& m_constraints;
+	b3AlignedObjectArray<int>* m_wgUsedBodies;
+	int m_curWgidx;
+	int m_start;
+	int m_nConstraints;
+	bool m_solveFriction;
+	int m_maxNumBatches;
+};
+
+void b3CpuRigidBodyPipeline::solveContactConstraints()
+{
+	int m_nIterations = 4;
+
+	b3AlignedObjectArray<b3ContactConstraint4> contactConstraints;
+	//	const b3AlignedObjectArray<b3Contact4Data>& contacts = m_data->m_np->getContacts();
+	int n = contactConstraints.size();
+	//convert contacts...
+
+	int maxNumBatches = 250;
+
+	for (int iter = 0; iter < m_nIterations; iter++)
+	{
+		b3SolveTask task(m_data->m_rigidBodies, m_data->m_inertias, contactConstraints, 0, n, maxNumBatches, 0, 0);
+		task.m_solveFriction = false;
+		task.run(0);
+	}
+
+	for (int iter = 0; iter < m_nIterations; iter++)
+	{
+		b3SolveTask task(m_data->m_rigidBodies, m_data->m_inertias, contactConstraints, 0, n, maxNumBatches, 0, 0);
+		task.m_solveFriction = true;
+		task.run(0);
+	}
+}
+
+void b3CpuRigidBodyPipeline::integrate(float deltaTime)
+{
+	float angDamping = 0.f;
+	b3Vector3 gravityAcceleration = b3MakeVector3(0, -9, 0);
+
+	//integrate transforms (external forces/gravity should be moved into constraint solver)
+	for (int i = 0; i < m_data->m_rigidBodies.size(); i++)
+	{
+		b3IntegrateTransform(&m_data->m_rigidBodies[i], deltaTime, angDamping, gravityAcceleration);
+	}
+}
+
+int b3CpuRigidBodyPipeline::registerPhysicsInstance(float mass, const float* position, const float* orientation, int collidableIndex, int userData)
+{
+	b3RigidBodyData body;
+	int bodyIndex = m_data->m_rigidBodies.size();
+	body.m_invMass = mass ? 1.f / mass : 0.f;
+	body.m_angVel.setValue(0, 0, 0);
+	body.m_collidableIdx = collidableIndex;
+	body.m_frictionCoeff = 0.3f;
+	body.m_linVel.setValue(0, 0, 0);
+	body.m_pos.setValue(position[0], position[1], position[2]);
+	body.m_quat.setValue(orientation[0], orientation[1], orientation[2], orientation[3]);
+	body.m_restituitionCoeff = 0.f;
+
+	m_data->m_rigidBodies.push_back(body);
+
+	if (collidableIndex >= 0)
+	{
+		b3Aabb& worldAabb = m_data->m_aabbWorldSpace.expand();
+
+		b3Aabb localAabb = m_data->m_np->getLocalSpaceAabb(collidableIndex);
+		b3Vector3 localAabbMin = b3MakeVector3(localAabb.m_min[0], localAabb.m_min[1], localAabb.m_min[2]);
+		b3Vector3 localAabbMax = b3MakeVector3(localAabb.m_max[0], localAabb.m_max[1], localAabb.m_max[2]);
+
+		b3Scalar margin = 0.01f;
+		b3Transform t;
+		t.setIdentity();
+		t.setOrigin(b3MakeVector3(position[0], position[1], position[2]));
+		t.setRotation(b3Quaternion(orientation[0], orientation[1], orientation[2], orientation[3]));
+		b3TransformAabb(localAabbMin, localAabbMax, margin, t, worldAabb.m_minVec, worldAabb.m_maxVec);
+
+		m_data->m_bp->createProxy(worldAabb.m_minVec, worldAabb.m_maxVec, bodyIndex, 0, 1, 1);
+		//		b3Vector3 aabbMin,aabbMax;
+		//	m_data->m_bp->getAabb(bodyIndex,aabbMin,aabbMax);
+	}
+	else
+	{
+		b3Error("registerPhysicsInstance using invalid collidableIndex\n");
+	}
+
+	return bodyIndex;
+}
+
+const struct b3RigidBodyData* b3CpuRigidBodyPipeline::getBodyBuffer() const
+{
+	return m_data->m_rigidBodies.size() ? &m_data->m_rigidBodies[0] : 0;
+}
+
+int b3CpuRigidBodyPipeline::getNumBodies() const
+{
+	return m_data->m_rigidBodies.size();
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.h
new file mode 100644
index 0000000..9c65419
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/b3CpuRigidBodyPipeline.h
@@ -0,0 +1,62 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#ifndef B3_CPU_RIGIDBODY_PIPELINE_H
+#define B3_CPU_RIGIDBODY_PIPELINE_H
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"
+
+class b3CpuRigidBodyPipeline
+{
+protected:
+	struct b3CpuRigidBodyPipelineInternalData* m_data;
+
+	int allocateCollidable();
+
+public:
+	b3CpuRigidBodyPipeline(class b3CpuNarrowPhase* narrowphase, struct b3DynamicBvhBroadphase* broadphaseDbvt, const struct b3Config& config);
+	virtual ~b3CpuRigidBodyPipeline();
+
+	virtual void stepSimulation(float deltaTime);
+	virtual void integrate(float timeStep);
+	virtual void updateAabbWorldSpace();
+	virtual void computeOverlappingPairs();
+	virtual void computeContactPoints();
+	virtual void solveContactConstraints();
+
+	int registerConvexPolyhedron(class b3ConvexUtility* convex);
+
+	int registerPhysicsInstance(float mass, const float* position, const float* orientation, int collisionShapeIndex, int userData);
+	void writeAllInstancesToGpu();
+	void copyConstraintsToHost();
+	void setGravity(const float* grav);
+	void reset();
+
+	int createPoint2PointConstraint(int bodyA, int bodyB, const float* pivotInA, const float* pivotInB, float breakingThreshold);
+	int createFixedConstraint(int bodyA, int bodyB, const float* pivotInA, const float* pivotInB, const float* relTargetAB, float breakingThreshold);
+	void removeConstraintByUid(int uid);
+
+	void addConstraint(class b3TypedConstraint* constraint);
+	void removeConstraint(b3TypedConstraint* constraint);
+
+	void castRays(const b3AlignedObjectArray<b3RayInfo>& rays, b3AlignedObjectArray<b3RayHit>& hitResults);
+
+	const struct b3RigidBodyData* getBodyBuffer() const;
+
+	int getNumBodies() const;
+};
+
+#endif  //B3_CPU_RIGIDBODY_PIPELINE_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/premake4.lua b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/premake4.lua
new file mode 100644
index 0000000..e05b2cd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/premake4.lua
@@ -0,0 +1,18 @@
+	project "Bullet3Dynamics"
+
+	language "C++"
+				
+	kind "StaticLib"
+
+	includedirs {
+		".."
+	}		
+	
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+
+	files {
+		"**.cpp",
+		"**.h"
+	}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3ContactConstraint4.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3ContactConstraint4.h
new file mode 100644
index 0000000..cf2eed0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3ContactConstraint4.h
@@ -0,0 +1,31 @@
+#ifndef B3_CONTACT_CONSTRAINT5_H
+#define B3_CONTACT_CONSTRAINT5_H
+
+#include "Bullet3Common/shared/b3Float4.h"
+
+typedef struct b3ContactConstraint4 b3ContactConstraint4_t;
+
+struct b3ContactConstraint4
+{
+	b3Float4 m_linear;  //normal?
+	b3Float4 m_worldPos[4];
+	b3Float4 m_center;  //	friction
+	float m_jacCoeffInv[4];
+	float m_b[4];
+	float m_appliedRambdaDt[4];
+	float m_fJacCoeffInv[2];      //	friction
+	float m_fAppliedRambdaDt[2];  //	friction
+
+	unsigned int m_bodyA;
+	unsigned int m_bodyB;
+	int m_batchIdx;
+	unsigned int m_paddings;
+};
+
+//inline	void setFrictionCoeff(float value) { m_linear[3] = value; }
+inline float b3GetFrictionCoeff(b3ContactConstraint4_t* constraint)
+{
+	return constraint->m_linear.w;
+}
+
+#endif  //B3_CONTACT_CONSTRAINT5_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3ConvertConstraint4.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3ConvertConstraint4.h
new file mode 100644
index 0000000..3e72f1c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3ConvertConstraint4.h
@@ -0,0 +1,148 @@
+
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+#include "Bullet3Dynamics/shared/b3ContactConstraint4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+void b3PlaneSpace1(b3Float4ConstArg n, b3Float4* p, b3Float4* q);
+void b3PlaneSpace1(b3Float4ConstArg n, b3Float4* p, b3Float4* q)
+{
+	if (b3Fabs(n.z) > 0.70710678f)
+	{
+		// choose p in y-z plane
+		float a = n.y * n.y + n.z * n.z;
+		float k = 1.f / sqrt(a);
+		p[0].x = 0;
+		p[0].y = -n.z * k;
+		p[0].z = n.y * k;
+		// set q = n x p
+		q[0].x = a * k;
+		q[0].y = -n.x * p[0].z;
+		q[0].z = n.x * p[0].y;
+	}
+	else
+	{
+		// choose p in x-y plane
+		float a = n.x * n.x + n.y * n.y;
+		float k = 1.f / sqrt(a);
+		p[0].x = -n.y * k;
+		p[0].y = n.x * k;
+		p[0].z = 0;
+		// set q = n x p
+		q[0].x = -n.z * p[0].y;
+		q[0].y = n.z * p[0].x;
+		q[0].z = a * k;
+	}
+}
+
+void setLinearAndAngular(b3Float4ConstArg n, b3Float4ConstArg r0, b3Float4ConstArg r1, b3Float4* linear, b3Float4* angular0, b3Float4* angular1)
+{
+	*linear = b3MakeFloat4(n.x, n.y, n.z, 0.f);
+	*angular0 = b3Cross3(r0, n);
+	*angular1 = -b3Cross3(r1, n);
+}
+
+float calcRelVel(b3Float4ConstArg l0, b3Float4ConstArg l1, b3Float4ConstArg a0, b3Float4ConstArg a1, b3Float4ConstArg linVel0,
+				 b3Float4ConstArg angVel0, b3Float4ConstArg linVel1, b3Float4ConstArg angVel1)
+{
+	return b3Dot3F4(l0, linVel0) + b3Dot3F4(a0, angVel0) + b3Dot3F4(l1, linVel1) + b3Dot3F4(a1, angVel1);
+}
+
+float calcJacCoeff(b3Float4ConstArg linear0, b3Float4ConstArg linear1, b3Float4ConstArg angular0, b3Float4ConstArg angular1,
+				   float invMass0, const b3Mat3x3* invInertia0, float invMass1, const b3Mat3x3* invInertia1)
+{
+	//	linear0,1 are normlized
+	float jmj0 = invMass0;  //b3Dot3F4(linear0, linear0)*invMass0;
+	float jmj1 = b3Dot3F4(mtMul3(angular0, *invInertia0), angular0);
+	float jmj2 = invMass1;  //b3Dot3F4(linear1, linear1)*invMass1;
+	float jmj3 = b3Dot3F4(mtMul3(angular1, *invInertia1), angular1);
+	return -1.f / (jmj0 + jmj1 + jmj2 + jmj3);
+}
+
+void setConstraint4(b3Float4ConstArg posA, b3Float4ConstArg linVelA, b3Float4ConstArg angVelA, float invMassA, b3Mat3x3ConstArg invInertiaA,
+					b3Float4ConstArg posB, b3Float4ConstArg linVelB, b3Float4ConstArg angVelB, float invMassB, b3Mat3x3ConstArg invInertiaB,
+					__global struct b3Contact4Data* src, float dt, float positionDrift, float positionConstraintCoeff,
+					b3ContactConstraint4_t* dstC)
+{
+	dstC->m_bodyA = abs(src->m_bodyAPtrAndSignBit);
+	dstC->m_bodyB = abs(src->m_bodyBPtrAndSignBit);
+
+	float dtInv = 1.f / dt;
+	for (int ic = 0; ic < 4; ic++)
+	{
+		dstC->m_appliedRambdaDt[ic] = 0.f;
+	}
+	dstC->m_fJacCoeffInv[0] = dstC->m_fJacCoeffInv[1] = 0.f;
+
+	dstC->m_linear = src->m_worldNormalOnB;
+	dstC->m_linear.w = 0.7f;  //src->getFrictionCoeff() );
+	for (int ic = 0; ic < 4; ic++)
+	{
+		b3Float4 r0 = src->m_worldPosB[ic] - posA;
+		b3Float4 r1 = src->m_worldPosB[ic] - posB;
+
+		if (ic >= src->m_worldNormalOnB.w)  //npoints
+		{
+			dstC->m_jacCoeffInv[ic] = 0.f;
+			continue;
+		}
+
+		float relVelN;
+		{
+			b3Float4 linear, angular0, angular1;
+			setLinearAndAngular(src->m_worldNormalOnB, r0, r1, &linear, &angular0, &angular1);
+
+			dstC->m_jacCoeffInv[ic] = calcJacCoeff(linear, -linear, angular0, angular1,
+												   invMassA, &invInertiaA, invMassB, &invInertiaB);
+
+			relVelN = calcRelVel(linear, -linear, angular0, angular1,
+								 linVelA, angVelA, linVelB, angVelB);
+
+			float e = 0.f;  //src->getRestituitionCoeff();
+			if (relVelN * relVelN < 0.004f) e = 0.f;
+
+			dstC->m_b[ic] = e * relVelN;
+			//float penetration = src->m_worldPosB[ic].w;
+			dstC->m_b[ic] += (src->m_worldPosB[ic].w + positionDrift) * positionConstraintCoeff * dtInv;
+			dstC->m_appliedRambdaDt[ic] = 0.f;
+		}
+	}
+
+	if (src->m_worldNormalOnB.w > 0)  //npoints
+	{                                 //	prepare friction
+		b3Float4 center = b3MakeFloat4(0.f, 0.f, 0.f, 0.f);
+		for (int i = 0; i < src->m_worldNormalOnB.w; i++)
+			center += src->m_worldPosB[i];
+		center /= (float)src->m_worldNormalOnB.w;
+
+		b3Float4 tangent[2];
+		b3PlaneSpace1(src->m_worldNormalOnB, &tangent[0], &tangent[1]);
+
+		b3Float4 r[2];
+		r[0] = center - posA;
+		r[1] = center - posB;
+
+		for (int i = 0; i < 2; i++)
+		{
+			b3Float4 linear, angular0, angular1;
+			setLinearAndAngular(tangent[i], r[0], r[1], &linear, &angular0, &angular1);
+
+			dstC->m_fJacCoeffInv[i] = calcJacCoeff(linear, -linear, angular0, angular1,
+												   invMassA, &invInertiaA, invMassB, &invInertiaB);
+			dstC->m_fAppliedRambdaDt[i] = 0.f;
+		}
+		dstC->m_center = center;
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		if (i < src->m_worldNormalOnB.w)
+		{
+			dstC->m_worldPos[i] = src->m_worldPosB[i];
+		}
+		else
+		{
+			dstC->m_worldPos[i] = b3MakeFloat4(0.f, 0.f, 0.f, 0.f);
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3Inertia.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3Inertia.h
new file mode 100644
index 0000000..602a133
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3Inertia.h
@@ -0,0 +1,14 @@
+
+
+#ifndef B3_INERTIA_H
+#define B3_INERTIA_H
+
+#include "Bullet3Common/shared/b3Mat3x3.h"
+
+struct b3Inertia
+{
+	b3Mat3x3 m_invInertiaWorld;
+	b3Mat3x3 m_initInvInertia;
+};
+
+#endif  //B3_INERTIA_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3IntegrateTransforms.h b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3IntegrateTransforms.h
new file mode 100644
index 0000000..56d9118
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Dynamics/shared/b3IntegrateTransforms.h
@@ -0,0 +1,106 @@
+
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+inline void integrateSingleTransform(__global b3RigidBodyData_t* bodies, int nodeID, float timeStep, float angularDamping, b3Float4ConstArg gravityAcceleration)
+{
+	if (bodies[nodeID].m_invMass != 0.f)
+	{
+		float BT_GPU_ANGULAR_MOTION_THRESHOLD = (0.25f * 3.14159254f);
+
+		//angular velocity
+		{
+			b3Float4 axis;
+			//add some hardcoded angular damping
+			bodies[nodeID].m_angVel.x *= angularDamping;
+			bodies[nodeID].m_angVel.y *= angularDamping;
+			bodies[nodeID].m_angVel.z *= angularDamping;
+
+			b3Float4 angvel = bodies[nodeID].m_angVel;
+
+			float fAngle = b3Sqrt(b3Dot3F4(angvel, angvel));
+
+			//limit the angular motion
+			if (fAngle * timeStep > BT_GPU_ANGULAR_MOTION_THRESHOLD)
+			{
+				fAngle = BT_GPU_ANGULAR_MOTION_THRESHOLD / timeStep;
+			}
+			if (fAngle < 0.001f)
+			{
+				// use Taylor's expansions of sync function
+				axis = angvel * (0.5f * timeStep - (timeStep * timeStep * timeStep) * 0.020833333333f * fAngle * fAngle);
+			}
+			else
+			{
+				// sync(fAngle) = sin(c*fAngle)/t
+				axis = angvel * (b3Sin(0.5f * fAngle * timeStep) / fAngle);
+			}
+
+			b3Quat dorn;
+			dorn.x = axis.x;
+			dorn.y = axis.y;
+			dorn.z = axis.z;
+			dorn.w = b3Cos(fAngle * timeStep * 0.5f);
+			b3Quat orn0 = bodies[nodeID].m_quat;
+			b3Quat predictedOrn = b3QuatMul(dorn, orn0);
+			predictedOrn = b3QuatNormalized(predictedOrn);
+			bodies[nodeID].m_quat = predictedOrn;
+		}
+		//linear velocity
+		bodies[nodeID].m_pos += bodies[nodeID].m_linVel * timeStep;
+
+		//apply gravity
+		bodies[nodeID].m_linVel += gravityAcceleration * timeStep;
+	}
+}
+
+inline void b3IntegrateTransform(__global b3RigidBodyData_t* body, float timeStep, float angularDamping, b3Float4ConstArg gravityAcceleration)
+{
+	float BT_GPU_ANGULAR_MOTION_THRESHOLD = (0.25f * 3.14159254f);
+
+	if ((body->m_invMass != 0.f))
+	{
+		//angular velocity
+		{
+			b3Float4 axis;
+			//add some hardcoded angular damping
+			body->m_angVel.x *= angularDamping;
+			body->m_angVel.y *= angularDamping;
+			body->m_angVel.z *= angularDamping;
+
+			b3Float4 angvel = body->m_angVel;
+			float fAngle = b3Sqrt(b3Dot3F4(angvel, angvel));
+			//limit the angular motion
+			if (fAngle * timeStep > BT_GPU_ANGULAR_MOTION_THRESHOLD)
+			{
+				fAngle = BT_GPU_ANGULAR_MOTION_THRESHOLD / timeStep;
+			}
+			if (fAngle < 0.001f)
+			{
+				// use Taylor's expansions of sync function
+				axis = angvel * (0.5f * timeStep - (timeStep * timeStep * timeStep) * 0.020833333333f * fAngle * fAngle);
+			}
+			else
+			{
+				// sync(fAngle) = sin(c*fAngle)/t
+				axis = angvel * (b3Sin(0.5f * fAngle * timeStep) / fAngle);
+			}
+			b3Quat dorn;
+			dorn.x = axis.x;
+			dorn.y = axis.y;
+			dorn.z = axis.z;
+			dorn.w = b3Cos(fAngle * timeStep * 0.5f);
+			b3Quat orn0 = body->m_quat;
+
+			b3Quat predictedOrn = b3QuatMul(dorn, orn0);
+			predictedOrn = b3QuatNormalized(predictedOrn);
+			body->m_quat = predictedOrn;
+		}
+
+		//apply gravity
+		body->m_linVel += gravityAcceleration * timeStep;
+
+		//linear velocity
+		body->m_pos += body->m_linVel * timeStep;
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/CMakeLists.txt b/dali-physics/third-party/bullet3/src/Bullet3Geometry/CMakeLists.txt
new file mode 100644
index 0000000..8206872
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/CMakeLists.txt
@@ -0,0 +1,47 @@
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+)
+
+SET(Bullet3Geometry_SRCS
+	b3ConvexHullComputer.cpp
+	b3GeometryUtil.cpp
+)
+
+SET(Bullet3Geometry_HDRS
+	b3AabbUtil.h
+	b3ConvexHullComputer.h
+	b3GeometryUtil.h
+	b3GrahamScan2dConvexHull.h
+)
+
+ADD_LIBRARY(Bullet3Geometry ${Bullet3Geometry_SRCS} ${Bullet3Geometry_HDRS})
+if (BUILD_SHARED_LIBS)
+  target_link_libraries(Bullet3Geometry Bullet3Common)
+endif()
+SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES SOVERSION ${BULLET_VERSION})
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#FILES_MATCHING requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Geometry DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3Geometry
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES PUBLIC_HEADER "${Bullet3Geometry_HDRS}")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3AabbUtil.h b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3AabbUtil.h
new file mode 100644
index 0000000..04c52d8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3AabbUtil.h
@@ -0,0 +1,217 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_AABB_UTIL2
+#define B3_AABB_UTIL2
+
+#include "Bullet3Common/b3Transform.h"
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3MinMax.h"
+
+B3_FORCE_INLINE void b3AabbExpand(b3Vector3& aabbMin,
+								  b3Vector3& aabbMax,
+								  const b3Vector3& expansionMin,
+								  const b3Vector3& expansionMax)
+{
+	aabbMin = aabbMin + expansionMin;
+	aabbMax = aabbMax + expansionMax;
+}
+
+/// conservative test for overlap between two aabbs
+B3_FORCE_INLINE bool b3TestPointAgainstAabb2(const b3Vector3& aabbMin1, const b3Vector3& aabbMax1,
+											 const b3Vector3& point)
+{
+	bool overlap = true;
+	overlap = (aabbMin1.getX() > point.getX() || aabbMax1.getX() < point.getX()) ? false : overlap;
+	overlap = (aabbMin1.getZ() > point.getZ() || aabbMax1.getZ() < point.getZ()) ? false : overlap;
+	overlap = (aabbMin1.getY() > point.getY() || aabbMax1.getY() < point.getY()) ? false : overlap;
+	return overlap;
+}
+
+/// conservative test for overlap between two aabbs
+B3_FORCE_INLINE bool b3TestAabbAgainstAabb2(const b3Vector3& aabbMin1, const b3Vector3& aabbMax1,
+											const b3Vector3& aabbMin2, const b3Vector3& aabbMax2)
+{
+	bool overlap = true;
+	overlap = (aabbMin1.getX() > aabbMax2.getX() || aabbMax1.getX() < aabbMin2.getX()) ? false : overlap;
+	overlap = (aabbMin1.getZ() > aabbMax2.getZ() || aabbMax1.getZ() < aabbMin2.getZ()) ? false : overlap;
+	overlap = (aabbMin1.getY() > aabbMax2.getY() || aabbMax1.getY() < aabbMin2.getY()) ? false : overlap;
+	return overlap;
+}
+
+/// conservative test for overlap between triangle and aabb
+B3_FORCE_INLINE bool b3TestTriangleAgainstAabb2(const b3Vector3* vertices,
+												const b3Vector3& aabbMin, const b3Vector3& aabbMax)
+{
+	const b3Vector3& p1 = vertices[0];
+	const b3Vector3& p2 = vertices[1];
+	const b3Vector3& p3 = vertices[2];
+
+	if (b3Min(b3Min(p1[0], p2[0]), p3[0]) > aabbMax[0]) return false;
+	if (b3Max(b3Max(p1[0], p2[0]), p3[0]) < aabbMin[0]) return false;
+
+	if (b3Min(b3Min(p1[2], p2[2]), p3[2]) > aabbMax[2]) return false;
+	if (b3Max(b3Max(p1[2], p2[2]), p3[2]) < aabbMin[2]) return false;
+
+	if (b3Min(b3Min(p1[1], p2[1]), p3[1]) > aabbMax[1]) return false;
+	if (b3Max(b3Max(p1[1], p2[1]), p3[1]) < aabbMin[1]) return false;
+	return true;
+}
+
+B3_FORCE_INLINE int b3Outcode(const b3Vector3& p, const b3Vector3& halfExtent)
+{
+	return (p.getX() < -halfExtent.getX() ? 0x01 : 0x0) |
+		   (p.getX() > halfExtent.getX() ? 0x08 : 0x0) |
+		   (p.getY() < -halfExtent.getY() ? 0x02 : 0x0) |
+		   (p.getY() > halfExtent.getY() ? 0x10 : 0x0) |
+		   (p.getZ() < -halfExtent.getZ() ? 0x4 : 0x0) |
+		   (p.getZ() > halfExtent.getZ() ? 0x20 : 0x0);
+}
+
+B3_FORCE_INLINE bool b3RayAabb2(const b3Vector3& rayFrom,
+								const b3Vector3& rayInvDirection,
+								const unsigned int raySign[3],
+								const b3Vector3 bounds[2],
+								b3Scalar& tmin,
+								b3Scalar lambda_min,
+								b3Scalar lambda_max)
+{
+	b3Scalar tmax, tymin, tymax, tzmin, tzmax;
+	tmin = (bounds[raySign[0]].getX() - rayFrom.getX()) * rayInvDirection.getX();
+	tmax = (bounds[1 - raySign[0]].getX() - rayFrom.getX()) * rayInvDirection.getX();
+	tymin = (bounds[raySign[1]].getY() - rayFrom.getY()) * rayInvDirection.getY();
+	tymax = (bounds[1 - raySign[1]].getY() - rayFrom.getY()) * rayInvDirection.getY();
+
+	if ((tmin > tymax) || (tymin > tmax))
+		return false;
+
+	if (tymin > tmin)
+		tmin = tymin;
+
+	if (tymax < tmax)
+		tmax = tymax;
+
+	tzmin = (bounds[raySign[2]].getZ() - rayFrom.getZ()) * rayInvDirection.getZ();
+	tzmax = (bounds[1 - raySign[2]].getZ() - rayFrom.getZ()) * rayInvDirection.getZ();
+
+	if ((tmin > tzmax) || (tzmin > tmax))
+		return false;
+	if (tzmin > tmin)
+		tmin = tzmin;
+	if (tzmax < tmax)
+		tmax = tzmax;
+	return ((tmin < lambda_max) && (tmax > lambda_min));
+}
+
+B3_FORCE_INLINE bool b3RayAabb(const b3Vector3& rayFrom,
+							   const b3Vector3& rayTo,
+							   const b3Vector3& aabbMin,
+							   const b3Vector3& aabbMax,
+							   b3Scalar& param, b3Vector3& normal)
+{
+	b3Vector3 aabbHalfExtent = (aabbMax - aabbMin) * b3Scalar(0.5);
+	b3Vector3 aabbCenter = (aabbMax + aabbMin) * b3Scalar(0.5);
+	b3Vector3 source = rayFrom - aabbCenter;
+	b3Vector3 target = rayTo - aabbCenter;
+	int sourceOutcode = b3Outcode(source, aabbHalfExtent);
+	int targetOutcode = b3Outcode(target, aabbHalfExtent);
+	if ((sourceOutcode & targetOutcode) == 0x0)
+	{
+		b3Scalar lambda_enter = b3Scalar(0.0);
+		b3Scalar lambda_exit = param;
+		b3Vector3 r = target - source;
+		int i;
+		b3Scalar normSign = 1;
+		b3Vector3 hitNormal = b3MakeVector3(0, 0, 0);
+		int bit = 1;
+
+		for (int j = 0; j < 2; j++)
+		{
+			for (i = 0; i != 3; ++i)
+			{
+				if (sourceOutcode & bit)
+				{
+					b3Scalar lambda = (-source[i] - aabbHalfExtent[i] * normSign) / r[i];
+					if (lambda_enter <= lambda)
+					{
+						lambda_enter = lambda;
+						hitNormal.setValue(0, 0, 0);
+						hitNormal[i] = normSign;
+					}
+				}
+				else if (targetOutcode & bit)
+				{
+					b3Scalar lambda = (-source[i] - aabbHalfExtent[i] * normSign) / r[i];
+					b3SetMin(lambda_exit, lambda);
+				}
+				bit <<= 1;
+			}
+			normSign = b3Scalar(-1.);
+		}
+		if (lambda_enter <= lambda_exit)
+		{
+			param = lambda_enter;
+			normal = hitNormal;
+			return true;
+		}
+	}
+	return false;
+}
+
+B3_FORCE_INLINE void b3TransformAabb(const b3Vector3& halfExtents, b3Scalar margin, const b3Transform& t, b3Vector3& aabbMinOut, b3Vector3& aabbMaxOut)
+{
+	b3Vector3 halfExtentsWithMargin = halfExtents + b3MakeVector3(margin, margin, margin);
+	b3Matrix3x3 abs_b = t.getBasis().absolute();
+	b3Vector3 center = t.getOrigin();
+	b3Vector3 extent = halfExtentsWithMargin.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	aabbMinOut = center - extent;
+	aabbMaxOut = center + extent;
+}
+
+B3_FORCE_INLINE void b3TransformAabb(const b3Vector3& localAabbMin, const b3Vector3& localAabbMax, b3Scalar margin, const b3Transform& trans, b3Vector3& aabbMinOut, b3Vector3& aabbMaxOut)
+{
+	//b3Assert(localAabbMin.getX() <= localAabbMax.getX());
+	//b3Assert(localAabbMin.getY() <= localAabbMax.getY());
+	//b3Assert(localAabbMin.getZ() <= localAabbMax.getZ());
+	b3Vector3 localHalfExtents = b3Scalar(0.5) * (localAabbMax - localAabbMin);
+	localHalfExtents += b3MakeVector3(margin, margin, margin);
+
+	b3Vector3 localCenter = b3Scalar(0.5) * (localAabbMax + localAabbMin);
+	b3Matrix3x3 abs_b = trans.getBasis().absolute();
+	b3Vector3 center = trans(localCenter);
+	b3Vector3 extent = localHalfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	aabbMinOut = center - extent;
+	aabbMaxOut = center + extent;
+}
+
+#define B3_USE_BANCHLESS 1
+#ifdef B3_USE_BANCHLESS
+//This block replaces the block below and uses no branches, and replaces the 8 bit return with a 32 bit return for improved performance (~3x on XBox 360)
+B3_FORCE_INLINE unsigned b3TestQuantizedAabbAgainstQuantizedAabb(const unsigned short int* aabbMin1, const unsigned short int* aabbMax1, const unsigned short int* aabbMin2, const unsigned short int* aabbMax2)
+{
+	return static_cast<unsigned int>(b3Select((unsigned)((aabbMin1[0] <= aabbMax2[0]) & (aabbMax1[0] >= aabbMin2[0]) & (aabbMin1[2] <= aabbMax2[2]) & (aabbMax1[2] >= aabbMin2[2]) & (aabbMin1[1] <= aabbMax2[1]) & (aabbMax1[1] >= aabbMin2[1])),
+											  1, 0));
+}
+#else
+B3_FORCE_INLINE bool b3TestQuantizedAabbAgainstQuantizedAabb(const unsigned short int* aabbMin1, const unsigned short int* aabbMax1, const unsigned short int* aabbMin2, const unsigned short int* aabbMax2)
+{
+	bool overlap = true;
+	overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap;
+	overlap = (aabbMin1[2] > aabbMax2[2] || aabbMax1[2] < aabbMin2[2]) ? false : overlap;
+	overlap = (aabbMin1[1] > aabbMax2[1] || aabbMax1[1] < aabbMin2[1]) ? false : overlap;
+	return overlap;
+}
+#endif  //B3_USE_BANCHLESS
+
+#endif  //B3_AABB_UTIL2
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3ConvexHullComputer.cpp b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3ConvexHullComputer.cpp
new file mode 100644
index 0000000..b376524
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3ConvexHullComputer.cpp
@@ -0,0 +1,2745 @@
+/*
+Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+
+#include "b3ConvexHullComputer.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3MinMax.h"
+#include "Bullet3Common/b3Vector3.h"
+
+#ifdef __GNUC__
+#include <stdint.h>
+typedef int32_t btInt32_t;
+typedef int64_t btInt64_t;
+typedef uint32_t btUint32_t;
+typedef uint64_t btUint64_t;
+#elif defined(_MSC_VER)
+typedef __int32 btInt32_t;
+typedef __int64 btInt64_t;
+typedef unsigned __int32 btUint32_t;
+typedef unsigned __int64 btUint64_t;
+#else
+typedef int btInt32_t;
+typedef long long int btInt64_t;
+typedef unsigned int btUint32_t;
+typedef unsigned long long int btUint64_t;
+#endif
+
+//The definition of USE_X86_64_ASM is moved into the build system. You can enable it manually by commenting out the following lines
+//#if (defined(__GNUC__) && defined(__x86_64__) && !defined(__ICL))  // || (defined(__ICL) && defined(_M_X64))   bug in Intel compiler, disable inline assembly
+//	#define USE_X86_64_ASM
+//#endif
+
+//#define DEBUG_CONVEX_HULL
+//#define SHOW_ITERATIONS
+
+#if defined(DEBUG_CONVEX_HULL) || defined(SHOW_ITERATIONS)
+#include <stdio.h>
+#endif
+
+// Convex hull implementation based on Preparata and Hong
+// Ole Kniemeyer, MAXON Computer GmbH
+class b3ConvexHullInternal
+{
+public:
+	class Point64
+	{
+	public:
+		btInt64_t x;
+		btInt64_t y;
+		btInt64_t z;
+
+		Point64(btInt64_t x, btInt64_t y, btInt64_t z) : x(x), y(y), z(z)
+		{
+		}
+
+		bool isZero()
+		{
+			return (x == 0) && (y == 0) && (z == 0);
+		}
+
+		btInt64_t dot(const Point64& b) const
+		{
+			return x * b.x + y * b.y + z * b.z;
+		}
+	};
+
+	class Point32
+	{
+	public:
+		btInt32_t x;
+		btInt32_t y;
+		btInt32_t z;
+		int index;
+
+		Point32()
+		{
+		}
+
+		Point32(btInt32_t x, btInt32_t y, btInt32_t z) : x(x), y(y), z(z), index(-1)
+		{
+		}
+
+		bool operator==(const Point32& b) const
+		{
+			return (x == b.x) && (y == b.y) && (z == b.z);
+		}
+
+		bool operator!=(const Point32& b) const
+		{
+			return (x != b.x) || (y != b.y) || (z != b.z);
+		}
+
+		bool isZero()
+		{
+			return (x == 0) && (y == 0) && (z == 0);
+		}
+
+		Point64 cross(const Point32& b) const
+		{
+			return Point64(y * b.z - z * b.y, z * b.x - x * b.z, x * b.y - y * b.x);
+		}
+
+		Point64 cross(const Point64& b) const
+		{
+			return Point64(y * b.z - z * b.y, z * b.x - x * b.z, x * b.y - y * b.x);
+		}
+
+		btInt64_t dot(const Point32& b) const
+		{
+			return x * b.x + y * b.y + z * b.z;
+		}
+
+		btInt64_t dot(const Point64& b) const
+		{
+			return x * b.x + y * b.y + z * b.z;
+		}
+
+		Point32 operator+(const Point32& b) const
+		{
+			return Point32(x + b.x, y + b.y, z + b.z);
+		}
+
+		Point32 operator-(const Point32& b) const
+		{
+			return Point32(x - b.x, y - b.y, z - b.z);
+		}
+	};
+
+	class Int128
+	{
+	public:
+		btUint64_t low;
+		btUint64_t high;
+
+		Int128()
+		{
+		}
+
+		Int128(btUint64_t low, btUint64_t high) : low(low), high(high)
+		{
+		}
+
+		Int128(btUint64_t low) : low(low), high(0)
+		{
+		}
+
+		Int128(btInt64_t value) : low(value), high((value >= 0) ? 0 : (btUint64_t)-1LL)
+		{
+		}
+
+		static Int128 mul(btInt64_t a, btInt64_t b);
+
+		static Int128 mul(btUint64_t a, btUint64_t b);
+
+		Int128 operator-() const
+		{
+			return Int128((btUint64_t) - (btInt64_t)low, ~high + (low == 0));
+		}
+
+		Int128 operator+(const Int128& b) const
+		{
+#ifdef USE_X86_64_ASM
+			Int128 result;
+			__asm__(
+				"addq %[bl], %[rl]\n\t"
+				"adcq %[bh], %[rh]\n\t"
+				: [rl] "=r"(result.low), [rh] "=r"(result.high)
+				: "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+				: "cc");
+			return result;
+#else
+			btUint64_t lo = low + b.low;
+			return Int128(lo, high + b.high + (lo < low));
+#endif
+		}
+
+		Int128 operator-(const Int128& b) const
+		{
+#ifdef USE_X86_64_ASM
+			Int128 result;
+			__asm__(
+				"subq %[bl], %[rl]\n\t"
+				"sbbq %[bh], %[rh]\n\t"
+				: [rl] "=r"(result.low), [rh] "=r"(result.high)
+				: "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+				: "cc");
+			return result;
+#else
+			return *this + -b;
+#endif
+		}
+
+		Int128& operator+=(const Int128& b)
+		{
+#ifdef USE_X86_64_ASM
+			__asm__(
+				"addq %[bl], %[rl]\n\t"
+				"adcq %[bh], %[rh]\n\t"
+				: [rl] "=r"(low), [rh] "=r"(high)
+				: "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+				: "cc");
+#else
+			btUint64_t lo = low + b.low;
+			if (lo < low)
+			{
+				++high;
+			}
+			low = lo;
+			high += b.high;
+#endif
+			return *this;
+		}
+
+		Int128& operator++()
+		{
+			if (++low == 0)
+			{
+				++high;
+			}
+			return *this;
+		}
+
+		Int128 operator*(btInt64_t b) const;
+
+		b3Scalar toScalar() const
+		{
+			return ((btInt64_t)high >= 0) ? b3Scalar(high) * (b3Scalar(0x100000000LL) * b3Scalar(0x100000000LL)) + b3Scalar(low)
+										  : -(-*this).toScalar();
+		}
+
+		int getSign() const
+		{
+			return ((btInt64_t)high < 0) ? -1 : (high || low) ? 1 : 0;
+		}
+
+		bool operator<(const Int128& b) const
+		{
+			return (high < b.high) || ((high == b.high) && (low < b.low));
+		}
+
+		int ucmp(const Int128& b) const
+		{
+			if (high < b.high)
+			{
+				return -1;
+			}
+			if (high > b.high)
+			{
+				return 1;
+			}
+			if (low < b.low)
+			{
+				return -1;
+			}
+			if (low > b.low)
+			{
+				return 1;
+			}
+			return 0;
+		}
+	};
+
+	class Rational64
+	{
+	private:
+		btUint64_t m_numerator;
+		btUint64_t m_denominator;
+		int sign;
+
+	public:
+		Rational64(btInt64_t numerator, btInt64_t denominator)
+		{
+			if (numerator > 0)
+			{
+				sign = 1;
+				m_numerator = (btUint64_t)numerator;
+			}
+			else if (numerator < 0)
+			{
+				sign = -1;
+				m_numerator = (btUint64_t)-numerator;
+			}
+			else
+			{
+				sign = 0;
+				m_numerator = 0;
+			}
+			if (denominator > 0)
+			{
+				m_denominator = (btUint64_t)denominator;
+			}
+			else if (denominator < 0)
+			{
+				sign = -sign;
+				m_denominator = (btUint64_t)-denominator;
+			}
+			else
+			{
+				m_denominator = 0;
+			}
+		}
+
+		bool isNegativeInfinity() const
+		{
+			return (sign < 0) && (m_denominator == 0);
+		}
+
+		bool isNaN() const
+		{
+			return (sign == 0) && (m_denominator == 0);
+		}
+
+		int compare(const Rational64& b) const;
+
+		b3Scalar toScalar() const
+		{
+			return sign * ((m_denominator == 0) ? B3_INFINITY : (b3Scalar)m_numerator / m_denominator);
+		}
+	};
+
+	class Rational128
+	{
+	private:
+		Int128 numerator;
+		Int128 denominator;
+		int sign;
+		bool isInt64;
+
+	public:
+		Rational128(btInt64_t value)
+		{
+			if (value > 0)
+			{
+				sign = 1;
+				this->numerator = value;
+			}
+			else if (value < 0)
+			{
+				sign = -1;
+				this->numerator = -value;
+			}
+			else
+			{
+				sign = 0;
+				this->numerator = (btUint64_t)0;
+			}
+			this->denominator = (btUint64_t)1;
+			isInt64 = true;
+		}
+
+		Rational128(const Int128& numerator, const Int128& denominator)
+		{
+			sign = numerator.getSign();
+			if (sign >= 0)
+			{
+				this->numerator = numerator;
+			}
+			else
+			{
+				this->numerator = -numerator;
+			}
+			int dsign = denominator.getSign();
+			if (dsign >= 0)
+			{
+				this->denominator = denominator;
+			}
+			else
+			{
+				sign = -sign;
+				this->denominator = -denominator;
+			}
+			isInt64 = false;
+		}
+
+		int compare(const Rational128& b) const;
+
+		int compare(btInt64_t b) const;
+
+		b3Scalar toScalar() const
+		{
+			return sign * ((denominator.getSign() == 0) ? B3_INFINITY : numerator.toScalar() / denominator.toScalar());
+		}
+	};
+
+	class PointR128
+	{
+	public:
+		Int128 x;
+		Int128 y;
+		Int128 z;
+		Int128 denominator;
+
+		PointR128()
+		{
+		}
+
+		PointR128(Int128 x, Int128 y, Int128 z, Int128 denominator) : x(x), y(y), z(z), denominator(denominator)
+		{
+		}
+
+		b3Scalar xvalue() const
+		{
+			return x.toScalar() / denominator.toScalar();
+		}
+
+		b3Scalar yvalue() const
+		{
+			return y.toScalar() / denominator.toScalar();
+		}
+
+		b3Scalar zvalue() const
+		{
+			return z.toScalar() / denominator.toScalar();
+		}
+	};
+
+	class Edge;
+	class Face;
+
+	class Vertex
+	{
+	public:
+		Vertex* next;
+		Vertex* prev;
+		Edge* edges;
+		Face* firstNearbyFace;
+		Face* lastNearbyFace;
+		PointR128 point128;
+		Point32 point;
+		int copy;
+
+		Vertex() : next(NULL), prev(NULL), edges(NULL), firstNearbyFace(NULL), lastNearbyFace(NULL), copy(-1)
+		{
+		}
+
+#ifdef DEBUG_CONVEX_HULL
+		void print()
+		{
+			b3Printf("V%d (%d, %d, %d)", point.index, point.x, point.y, point.z);
+		}
+
+		void printGraph();
+#endif
+
+		Point32 operator-(const Vertex& b) const
+		{
+			return point - b.point;
+		}
+
+		Rational128 dot(const Point64& b) const
+		{
+			return (point.index >= 0) ? Rational128(point.dot(b))
+									  : Rational128(point128.x * b.x + point128.y * b.y + point128.z * b.z, point128.denominator);
+		}
+
+		b3Scalar xvalue() const
+		{
+			return (point.index >= 0) ? b3Scalar(point.x) : point128.xvalue();
+		}
+
+		b3Scalar yvalue() const
+		{
+			return (point.index >= 0) ? b3Scalar(point.y) : point128.yvalue();
+		}
+
+		b3Scalar zvalue() const
+		{
+			return (point.index >= 0) ? b3Scalar(point.z) : point128.zvalue();
+		}
+
+		void receiveNearbyFaces(Vertex* src)
+		{
+			if (lastNearbyFace)
+			{
+				lastNearbyFace->nextWithSameNearbyVertex = src->firstNearbyFace;
+			}
+			else
+			{
+				firstNearbyFace = src->firstNearbyFace;
+			}
+			if (src->lastNearbyFace)
+			{
+				lastNearbyFace = src->lastNearbyFace;
+			}
+			for (Face* f = src->firstNearbyFace; f; f = f->nextWithSameNearbyVertex)
+			{
+				b3Assert(f->nearbyVertex == src);
+				f->nearbyVertex = this;
+			}
+			src->firstNearbyFace = NULL;
+			src->lastNearbyFace = NULL;
+		}
+	};
+
+	class Edge
+	{
+	public:
+		Edge* next;
+		Edge* prev;
+		Edge* reverse;
+		Vertex* target;
+		Face* face;
+		int copy;
+
+		~Edge()
+		{
+			next = NULL;
+			prev = NULL;
+			reverse = NULL;
+			target = NULL;
+			face = NULL;
+		}
+
+		void link(Edge* n)
+		{
+			b3Assert(reverse->target == n->reverse->target);
+			next = n;
+			n->prev = this;
+		}
+
+#ifdef DEBUG_CONVEX_HULL
+		void print()
+		{
+			b3Printf("E%p : %d -> %d,  n=%p p=%p   (0 %d\t%d\t%d) -> (%d %d %d)", this, reverse->target->point.index, target->point.index, next, prev,
+					 reverse->target->point.x, reverse->target->point.y, reverse->target->point.z, target->point.x, target->point.y, target->point.z);
+		}
+#endif
+	};
+
+	class Face
+	{
+	public:
+		Face* next;
+		Vertex* nearbyVertex;
+		Face* nextWithSameNearbyVertex;
+		Point32 origin;
+		Point32 dir0;
+		Point32 dir1;
+
+		Face() : next(NULL), nearbyVertex(NULL), nextWithSameNearbyVertex(NULL)
+		{
+		}
+
+		void init(Vertex* a, Vertex* b, Vertex* c)
+		{
+			nearbyVertex = a;
+			origin = a->point;
+			dir0 = *b - *a;
+			dir1 = *c - *a;
+			if (a->lastNearbyFace)
+			{
+				a->lastNearbyFace->nextWithSameNearbyVertex = this;
+			}
+			else
+			{
+				a->firstNearbyFace = this;
+			}
+			a->lastNearbyFace = this;
+		}
+
+		Point64 getNormal()
+		{
+			return dir0.cross(dir1);
+		}
+	};
+
+	template <typename UWord, typename UHWord>
+	class DMul
+	{
+	private:
+		static btUint32_t high(btUint64_t value)
+		{
+			return (btUint32_t)(value >> 32);
+		}
+
+		static btUint32_t low(btUint64_t value)
+		{
+			return (btUint32_t)value;
+		}
+
+		static btUint64_t mul(btUint32_t a, btUint32_t b)
+		{
+			return (btUint64_t)a * (btUint64_t)b;
+		}
+
+		static void shlHalf(btUint64_t& value)
+		{
+			value <<= 32;
+		}
+
+		static btUint64_t high(Int128 value)
+		{
+			return value.high;
+		}
+
+		static btUint64_t low(Int128 value)
+		{
+			return value.low;
+		}
+
+		static Int128 mul(btUint64_t a, btUint64_t b)
+		{
+			return Int128::mul(a, b);
+		}
+
+		static void shlHalf(Int128& value)
+		{
+			value.high = value.low;
+			value.low = 0;
+		}
+
+	public:
+		static void mul(UWord a, UWord b, UWord& resLow, UWord& resHigh)
+		{
+			UWord p00 = mul(low(a), low(b));
+			UWord p01 = mul(low(a), high(b));
+			UWord p10 = mul(high(a), low(b));
+			UWord p11 = mul(high(a), high(b));
+			UWord p0110 = UWord(low(p01)) + UWord(low(p10));
+			p11 += high(p01);
+			p11 += high(p10);
+			p11 += high(p0110);
+			shlHalf(p0110);
+			p00 += p0110;
+			if (p00 < p0110)
+			{
+				++p11;
+			}
+			resLow = p00;
+			resHigh = p11;
+		}
+	};
+
+private:
+	class IntermediateHull
+	{
+	public:
+		Vertex* minXy;
+		Vertex* maxXy;
+		Vertex* minYx;
+		Vertex* maxYx;
+
+		IntermediateHull() : minXy(NULL), maxXy(NULL), minYx(NULL), maxYx(NULL)
+		{
+		}
+
+		void print();
+	};
+
+	enum Orientation
+	{
+		NONE,
+		CLOCKWISE,
+		COUNTER_CLOCKWISE
+	};
+
+	template <typename T>
+	class PoolArray
+	{
+	private:
+		T* array;
+		int size;
+
+	public:
+		PoolArray<T>* next;
+
+		PoolArray(int size) : size(size), next(NULL)
+		{
+			array = (T*)b3AlignedAlloc(sizeof(T) * size, 16);
+		}
+
+		~PoolArray()
+		{
+			b3AlignedFree(array);
+		}
+
+		T* init()
+		{
+			T* o = array;
+			for (int i = 0; i < size; i++, o++)
+			{
+				o->next = (i + 1 < size) ? o + 1 : NULL;
+			}
+			return array;
+		}
+	};
+
+	template <typename T>
+	class Pool
+	{
+	private:
+		PoolArray<T>* arrays;
+		PoolArray<T>* nextArray;
+		T* freeObjects;
+		int arraySize;
+
+	public:
+		Pool() : arrays(NULL), nextArray(NULL), freeObjects(NULL), arraySize(256)
+		{
+		}
+
+		~Pool()
+		{
+			while (arrays)
+			{
+				PoolArray<T>* p = arrays;
+				arrays = p->next;
+				p->~PoolArray<T>();
+				b3AlignedFree(p);
+			}
+		}
+
+		void reset()
+		{
+			nextArray = arrays;
+			freeObjects = NULL;
+		}
+
+		void setArraySize(int arraySize)
+		{
+			this->arraySize = arraySize;
+		}
+
+		T* newObject()
+		{
+			T* o = freeObjects;
+			if (!o)
+			{
+				PoolArray<T>* p = nextArray;
+				if (p)
+				{
+					nextArray = p->next;
+				}
+				else
+				{
+					p = new (b3AlignedAlloc(sizeof(PoolArray<T>), 16)) PoolArray<T>(arraySize);
+					p->next = arrays;
+					arrays = p;
+				}
+				o = p->init();
+			}
+			freeObjects = o->next;
+			return new (o) T();
+		};
+
+		void freeObject(T* object)
+		{
+			object->~T();
+			object->next = freeObjects;
+			freeObjects = object;
+		}
+	};
+
+	b3Vector3 scaling;
+	b3Vector3 center;
+	Pool<Vertex> vertexPool;
+	Pool<Edge> edgePool;
+	Pool<Face> facePool;
+	b3AlignedObjectArray<Vertex*> originalVertices;
+	int mergeStamp;
+	int minAxis;
+	int medAxis;
+	int maxAxis;
+	int usedEdgePairs;
+	int maxUsedEdgePairs;
+
+	static Orientation getOrientation(const Edge* prev, const Edge* next, const Point32& s, const Point32& t);
+	Edge* findMaxAngle(bool ccw, const Vertex* start, const Point32& s, const Point64& rxs, const Point64& sxrxs, Rational64& minCot);
+	void findEdgeForCoplanarFaces(Vertex* c0, Vertex* c1, Edge*& e0, Edge*& e1, Vertex* stop0, Vertex* stop1);
+
+	Edge* newEdgePair(Vertex* from, Vertex* to);
+
+	void removeEdgePair(Edge* edge)
+	{
+		Edge* n = edge->next;
+		Edge* r = edge->reverse;
+
+		b3Assert(edge->target && r->target);
+
+		if (n != edge)
+		{
+			n->prev = edge->prev;
+			edge->prev->next = n;
+			r->target->edges = n;
+		}
+		else
+		{
+			r->target->edges = NULL;
+		}
+
+		n = r->next;
+
+		if (n != r)
+		{
+			n->prev = r->prev;
+			r->prev->next = n;
+			edge->target->edges = n;
+		}
+		else
+		{
+			edge->target->edges = NULL;
+		}
+
+		edgePool.freeObject(edge);
+		edgePool.freeObject(r);
+		usedEdgePairs--;
+	}
+
+	void computeInternal(int start, int end, IntermediateHull& result);
+
+	bool mergeProjection(IntermediateHull& h0, IntermediateHull& h1, Vertex*& c0, Vertex*& c1);
+
+	void merge(IntermediateHull& h0, IntermediateHull& h1);
+
+	b3Vector3 toBtVector(const Point32& v);
+
+	b3Vector3 getBtNormal(Face* face);
+
+	bool shiftFace(Face* face, b3Scalar amount, b3AlignedObjectArray<Vertex*> stack);
+
+public:
+	Vertex* vertexList;
+
+	void compute(const void* coords, bool doubleCoords, int stride, int count);
+
+	b3Vector3 getCoordinates(const Vertex* v);
+
+	b3Scalar shrink(b3Scalar amount, b3Scalar clampAmount);
+};
+
+b3ConvexHullInternal::Int128 b3ConvexHullInternal::Int128::operator*(btInt64_t b) const
+{
+	bool negative = (btInt64_t)high < 0;
+	Int128 a = negative ? -*this : *this;
+	if (b < 0)
+	{
+		negative = !negative;
+		b = -b;
+	}
+	Int128 result = mul(a.low, (btUint64_t)b);
+	result.high += a.high * (btUint64_t)b;
+	return negative ? -result : result;
+}
+
+b3ConvexHullInternal::Int128 b3ConvexHullInternal::Int128::mul(btInt64_t a, btInt64_t b)
+{
+	Int128 result;
+
+#ifdef USE_X86_64_ASM
+	__asm__("imulq %[b]"
+			: "=a"(result.low), "=d"(result.high)
+			: "0"(a), [b] "r"(b)
+			: "cc");
+	return result;
+
+#else
+	bool negative = a < 0;
+	if (negative)
+	{
+		a = -a;
+	}
+	if (b < 0)
+	{
+		negative = !negative;
+		b = -b;
+	}
+	DMul<btUint64_t, btUint32_t>::mul((btUint64_t)a, (btUint64_t)b, result.low, result.high);
+	return negative ? -result : result;
+#endif
+}
+
+b3ConvexHullInternal::Int128 b3ConvexHullInternal::Int128::mul(btUint64_t a, btUint64_t b)
+{
+	Int128 result;
+
+#ifdef USE_X86_64_ASM
+	__asm__("mulq %[b]"
+			: "=a"(result.low), "=d"(result.high)
+			: "0"(a), [b] "r"(b)
+			: "cc");
+
+#else
+	DMul<btUint64_t, btUint32_t>::mul(a, b, result.low, result.high);
+#endif
+
+	return result;
+}
+
+int b3ConvexHullInternal::Rational64::compare(const Rational64& b) const
+{
+	if (sign != b.sign)
+	{
+		return sign - b.sign;
+	}
+	else if (sign == 0)
+	{
+		return 0;
+	}
+
+	//	return (numerator * b.denominator > b.numerator * denominator) ? sign : (numerator * b.denominator < b.numerator * denominator) ? -sign : 0;
+
+#ifdef USE_X86_64_ASM
+
+	int result;
+	btInt64_t tmp;
+	btInt64_t dummy;
+	__asm__(
+		"mulq %[bn]\n\t"
+		"movq %%rax, %[tmp]\n\t"
+		"movq %%rdx, %%rbx\n\t"
+		"movq %[tn], %%rax\n\t"
+		"mulq %[bd]\n\t"
+		"subq %[tmp], %%rax\n\t"
+		"sbbq %%rbx, %%rdx\n\t"  // rdx:rax contains 128-bit-difference "numerator*b.denominator - b.numerator*denominator"
+		"setnsb %%bh\n\t"        // bh=1 if difference is non-negative, bh=0 otherwise
+		"orq %%rdx, %%rax\n\t"
+		"setnzb %%bl\n\t"      // bl=1 if difference if non-zero, bl=0 if it is zero
+		"decb %%bh\n\t"        // now bx=0x0000 if difference is zero, 0xff01 if it is negative, 0x0001 if it is positive (i.e., same sign as difference)
+		"shll $16, %%ebx\n\t"  // ebx has same sign as difference
+		: "=&b"(result), [tmp] "=&r"(tmp), "=a"(dummy)
+		: "a"(denominator), [bn] "g"(b.numerator), [tn] "g"(numerator), [bd] "g"(b.denominator)
+		: "%rdx", "cc");
+	return result ? result ^ sign  // if sign is +1, only bit 0 of result is inverted, which does not change the sign of result (and cannot result in zero)
+								   // if sign is -1, all bits of result are inverted, which changes the sign of result (and again cannot result in zero)
+				  : 0;
+
+#else
+
+	return sign * Int128::mul(m_numerator, b.m_denominator).ucmp(Int128::mul(m_denominator, b.m_numerator));
+
+#endif
+}
+
+int b3ConvexHullInternal::Rational128::compare(const Rational128& b) const
+{
+	if (sign != b.sign)
+	{
+		return sign - b.sign;
+	}
+	else if (sign == 0)
+	{
+		return 0;
+	}
+	if (isInt64)
+	{
+		return -b.compare(sign * (btInt64_t)numerator.low);
+	}
+
+	Int128 nbdLow, nbdHigh, dbnLow, dbnHigh;
+	DMul<Int128, btUint64_t>::mul(numerator, b.denominator, nbdLow, nbdHigh);
+	DMul<Int128, btUint64_t>::mul(denominator, b.numerator, dbnLow, dbnHigh);
+
+	int cmp = nbdHigh.ucmp(dbnHigh);
+	if (cmp)
+	{
+		return cmp * sign;
+	}
+	return nbdLow.ucmp(dbnLow) * sign;
+}
+
+int b3ConvexHullInternal::Rational128::compare(btInt64_t b) const
+{
+	if (isInt64)
+	{
+		btInt64_t a = sign * (btInt64_t)numerator.low;
+		return (a > b) ? 1 : (a < b) ? -1 : 0;
+	}
+	if (b > 0)
+	{
+		if (sign <= 0)
+		{
+			return -1;
+		}
+	}
+	else if (b < 0)
+	{
+		if (sign >= 0)
+		{
+			return 1;
+		}
+		b = -b;
+	}
+	else
+	{
+		return sign;
+	}
+
+	return numerator.ucmp(denominator * b) * sign;
+}
+
+b3ConvexHullInternal::Edge* b3ConvexHullInternal::newEdgePair(Vertex* from, Vertex* to)
+{
+	b3Assert(from && to);
+	Edge* e = edgePool.newObject();
+	Edge* r = edgePool.newObject();
+	e->reverse = r;
+	r->reverse = e;
+	e->copy = mergeStamp;
+	r->copy = mergeStamp;
+	e->target = to;
+	r->target = from;
+	e->face = NULL;
+	r->face = NULL;
+	usedEdgePairs++;
+	if (usedEdgePairs > maxUsedEdgePairs)
+	{
+		maxUsedEdgePairs = usedEdgePairs;
+	}
+	return e;
+}
+
+bool b3ConvexHullInternal::mergeProjection(IntermediateHull& h0, IntermediateHull& h1, Vertex*& c0, Vertex*& c1)
+{
+	Vertex* v0 = h0.maxYx;
+	Vertex* v1 = h1.minYx;
+	if ((v0->point.x == v1->point.x) && (v0->point.y == v1->point.y))
+	{
+		b3Assert(v0->point.z < v1->point.z);
+		Vertex* v1p = v1->prev;
+		if (v1p == v1)
+		{
+			c0 = v0;
+			if (v1->edges)
+			{
+				b3Assert(v1->edges->next == v1->edges);
+				v1 = v1->edges->target;
+				b3Assert(v1->edges->next == v1->edges);
+			}
+			c1 = v1;
+			return false;
+		}
+		Vertex* v1n = v1->next;
+		v1p->next = v1n;
+		v1n->prev = v1p;
+		if (v1 == h1.minXy)
+		{
+			if ((v1n->point.x < v1p->point.x) || ((v1n->point.x == v1p->point.x) && (v1n->point.y < v1p->point.y)))
+			{
+				h1.minXy = v1n;
+			}
+			else
+			{
+				h1.minXy = v1p;
+			}
+		}
+		if (v1 == h1.maxXy)
+		{
+			if ((v1n->point.x > v1p->point.x) || ((v1n->point.x == v1p->point.x) && (v1n->point.y > v1p->point.y)))
+			{
+				h1.maxXy = v1n;
+			}
+			else
+			{
+				h1.maxXy = v1p;
+			}
+		}
+	}
+
+	v0 = h0.maxXy;
+	v1 = h1.maxXy;
+	Vertex* v00 = NULL;
+	Vertex* v10 = NULL;
+	btInt32_t sign = 1;
+
+	for (int side = 0; side <= 1; side++)
+	{
+		btInt32_t dx = (v1->point.x - v0->point.x) * sign;
+		if (dx > 0)
+		{
+			while (true)
+			{
+				btInt32_t dy = v1->point.y - v0->point.y;
+
+				Vertex* w0 = side ? v0->next : v0->prev;
+				if (w0 != v0)
+				{
+					btInt32_t dx0 = (w0->point.x - v0->point.x) * sign;
+					btInt32_t dy0 = w0->point.y - v0->point.y;
+					if ((dy0 <= 0) && ((dx0 == 0) || ((dx0 < 0) && (dy0 * dx <= dy * dx0))))
+					{
+						v0 = w0;
+						dx = (v1->point.x - v0->point.x) * sign;
+						continue;
+					}
+				}
+
+				Vertex* w1 = side ? v1->next : v1->prev;
+				if (w1 != v1)
+				{
+					btInt32_t dx1 = (w1->point.x - v1->point.x) * sign;
+					btInt32_t dy1 = w1->point.y - v1->point.y;
+					btInt32_t dxn = (w1->point.x - v0->point.x) * sign;
+					if ((dxn > 0) && (dy1 < 0) && ((dx1 == 0) || ((dx1 < 0) && (dy1 * dx < dy * dx1))))
+					{
+						v1 = w1;
+						dx = dxn;
+						continue;
+					}
+				}
+
+				break;
+			}
+		}
+		else if (dx < 0)
+		{
+			while (true)
+			{
+				btInt32_t dy = v1->point.y - v0->point.y;
+
+				Vertex* w1 = side ? v1->prev : v1->next;
+				if (w1 != v1)
+				{
+					btInt32_t dx1 = (w1->point.x - v1->point.x) * sign;
+					btInt32_t dy1 = w1->point.y - v1->point.y;
+					if ((dy1 >= 0) && ((dx1 == 0) || ((dx1 < 0) && (dy1 * dx <= dy * dx1))))
+					{
+						v1 = w1;
+						dx = (v1->point.x - v0->point.x) * sign;
+						continue;
+					}
+				}
+
+				Vertex* w0 = side ? v0->prev : v0->next;
+				if (w0 != v0)
+				{
+					btInt32_t dx0 = (w0->point.x - v0->point.x) * sign;
+					btInt32_t dy0 = w0->point.y - v0->point.y;
+					btInt32_t dxn = (v1->point.x - w0->point.x) * sign;
+					if ((dxn < 0) && (dy0 > 0) && ((dx0 == 0) || ((dx0 < 0) && (dy0 * dx < dy * dx0))))
+					{
+						v0 = w0;
+						dx = dxn;
+						continue;
+					}
+				}
+
+				break;
+			}
+		}
+		else
+		{
+			btInt32_t x = v0->point.x;
+			btInt32_t y0 = v0->point.y;
+			Vertex* w0 = v0;
+			Vertex* t;
+			while (((t = side ? w0->next : w0->prev) != v0) && (t->point.x == x) && (t->point.y <= y0))
+			{
+				w0 = t;
+				y0 = t->point.y;
+			}
+			v0 = w0;
+
+			btInt32_t y1 = v1->point.y;
+			Vertex* w1 = v1;
+			while (((t = side ? w1->prev : w1->next) != v1) && (t->point.x == x) && (t->point.y >= y1))
+			{
+				w1 = t;
+				y1 = t->point.y;
+			}
+			v1 = w1;
+		}
+
+		if (side == 0)
+		{
+			v00 = v0;
+			v10 = v1;
+
+			v0 = h0.minXy;
+			v1 = h1.minXy;
+			sign = -1;
+		}
+	}
+
+	v0->prev = v1;
+	v1->next = v0;
+
+	v00->next = v10;
+	v10->prev = v00;
+
+	if (h1.minXy->point.x < h0.minXy->point.x)
+	{
+		h0.minXy = h1.minXy;
+	}
+	if (h1.maxXy->point.x >= h0.maxXy->point.x)
+	{
+		h0.maxXy = h1.maxXy;
+	}
+
+	h0.maxYx = h1.maxYx;
+
+	c0 = v00;
+	c1 = v10;
+
+	return true;
+}
+
+void b3ConvexHullInternal::computeInternal(int start, int end, IntermediateHull& result)
+{
+	int n = end - start;
+	switch (n)
+	{
+		case 0:
+			result.minXy = NULL;
+			result.maxXy = NULL;
+			result.minYx = NULL;
+			result.maxYx = NULL;
+			return;
+		case 2:
+		{
+			Vertex* v = originalVertices[start];
+			Vertex* w = v + 1;
+			if (v->point != w->point)
+			{
+				btInt32_t dx = v->point.x - w->point.x;
+				btInt32_t dy = v->point.y - w->point.y;
+
+				if ((dx == 0) && (dy == 0))
+				{
+					if (v->point.z > w->point.z)
+					{
+						Vertex* t = w;
+						w = v;
+						v = t;
+					}
+					b3Assert(v->point.z < w->point.z);
+					v->next = v;
+					v->prev = v;
+					result.minXy = v;
+					result.maxXy = v;
+					result.minYx = v;
+					result.maxYx = v;
+				}
+				else
+				{
+					v->next = w;
+					v->prev = w;
+					w->next = v;
+					w->prev = v;
+
+					if ((dx < 0) || ((dx == 0) && (dy < 0)))
+					{
+						result.minXy = v;
+						result.maxXy = w;
+					}
+					else
+					{
+						result.minXy = w;
+						result.maxXy = v;
+					}
+
+					if ((dy < 0) || ((dy == 0) && (dx < 0)))
+					{
+						result.minYx = v;
+						result.maxYx = w;
+					}
+					else
+					{
+						result.minYx = w;
+						result.maxYx = v;
+					}
+				}
+
+				Edge* e = newEdgePair(v, w);
+				e->link(e);
+				v->edges = e;
+
+				e = e->reverse;
+				e->link(e);
+				w->edges = e;
+
+				return;
+			}
+		}
+		// lint -fallthrough
+		case 1:
+		{
+			Vertex* v = originalVertices[start];
+			v->edges = NULL;
+			v->next = v;
+			v->prev = v;
+
+			result.minXy = v;
+			result.maxXy = v;
+			result.minYx = v;
+			result.maxYx = v;
+
+			return;
+		}
+	}
+
+	int split0 = start + n / 2;
+	Point32 p = originalVertices[split0 - 1]->point;
+	int split1 = split0;
+	while ((split1 < end) && (originalVertices[split1]->point == p))
+	{
+		split1++;
+	}
+	computeInternal(start, split0, result);
+	IntermediateHull hull1;
+	computeInternal(split1, end, hull1);
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("\n\nMerge\n");
+	result.print();
+	hull1.print();
+#endif
+	merge(result, hull1);
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("\n  Result\n");
+	result.print();
+#endif
+}
+
+#ifdef DEBUG_CONVEX_HULL
+void b3ConvexHullInternal::IntermediateHull::print()
+{
+	b3Printf("    Hull\n");
+	for (Vertex* v = minXy; v;)
+	{
+		b3Printf("      ");
+		v->print();
+		if (v == maxXy)
+		{
+			b3Printf(" maxXy");
+		}
+		if (v == minYx)
+		{
+			b3Printf(" minYx");
+		}
+		if (v == maxYx)
+		{
+			b3Printf(" maxYx");
+		}
+		if (v->next->prev != v)
+		{
+			b3Printf(" Inconsistency");
+		}
+		b3Printf("\n");
+		v = v->next;
+		if (v == minXy)
+		{
+			break;
+		}
+	}
+	if (minXy)
+	{
+		minXy->copy = (minXy->copy == -1) ? -2 : -1;
+		minXy->printGraph();
+	}
+}
+
+void b3ConvexHullInternal::Vertex::printGraph()
+{
+	print();
+	b3Printf("\nEdges\n");
+	Edge* e = edges;
+	if (e)
+	{
+		do
+		{
+			e->print();
+			b3Printf("\n");
+			e = e->next;
+		} while (e != edges);
+		do
+		{
+			Vertex* v = e->target;
+			if (v->copy != copy)
+			{
+				v->copy = copy;
+				v->printGraph();
+			}
+			e = e->next;
+		} while (e != edges);
+	}
+}
+#endif
+
+b3ConvexHullInternal::Orientation b3ConvexHullInternal::getOrientation(const Edge* prev, const Edge* next, const Point32& s, const Point32& t)
+{
+	b3Assert(prev->reverse->target == next->reverse->target);
+	if (prev->next == next)
+	{
+		if (prev->prev == next)
+		{
+			Point64 n = t.cross(s);
+			Point64 m = (*prev->target - *next->reverse->target).cross(*next->target - *next->reverse->target);
+			b3Assert(!m.isZero());
+			btInt64_t dot = n.dot(m);
+			b3Assert(dot != 0);
+			return (dot > 0) ? COUNTER_CLOCKWISE : CLOCKWISE;
+		}
+		return COUNTER_CLOCKWISE;
+	}
+	else if (prev->prev == next)
+	{
+		return CLOCKWISE;
+	}
+	else
+	{
+		return NONE;
+	}
+}
+
+b3ConvexHullInternal::Edge* b3ConvexHullInternal::findMaxAngle(bool ccw, const Vertex* start, const Point32& s, const Point64& rxs, const Point64& sxrxs, Rational64& minCot)
+{
+	Edge* minEdge = NULL;
+
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("find max edge for %d\n", start->point.index);
+#endif
+	Edge* e = start->edges;
+	if (e)
+	{
+		do
+		{
+			if (e->copy > mergeStamp)
+			{
+				Point32 t = *e->target - *start;
+				Rational64 cot(t.dot(sxrxs), t.dot(rxs));
+#ifdef DEBUG_CONVEX_HULL
+				b3Printf("      Angle is %f (%d) for ", (float)b3Atan(cot.toScalar()), (int)cot.isNaN());
+				e->print();
+#endif
+				if (cot.isNaN())
+				{
+					b3Assert(ccw ? (t.dot(s) < 0) : (t.dot(s) > 0));
+				}
+				else
+				{
+					int cmp;
+					if (minEdge == NULL)
+					{
+						minCot = cot;
+						minEdge = e;
+					}
+					else if ((cmp = cot.compare(minCot)) < 0)
+					{
+						minCot = cot;
+						minEdge = e;
+					}
+					else if ((cmp == 0) && (ccw == (getOrientation(minEdge, e, s, t) == COUNTER_CLOCKWISE)))
+					{
+						minEdge = e;
+					}
+				}
+#ifdef DEBUG_CONVEX_HULL
+				b3Printf("\n");
+#endif
+			}
+			e = e->next;
+		} while (e != start->edges);
+	}
+	return minEdge;
+}
+
+void b3ConvexHullInternal::findEdgeForCoplanarFaces(Vertex* c0, Vertex* c1, Edge*& e0, Edge*& e1, Vertex* stop0, Vertex* stop1)
+{
+	Edge* start0 = e0;
+	Edge* start1 = e1;
+	Point32 et0 = start0 ? start0->target->point : c0->point;
+	Point32 et1 = start1 ? start1->target->point : c1->point;
+	Point32 s = c1->point - c0->point;
+	Point64 normal = ((start0 ? start0 : start1)->target->point - c0->point).cross(s);
+	btInt64_t dist = c0->point.dot(normal);
+	b3Assert(!start1 || (start1->target->point.dot(normal) == dist));
+	Point64 perp = s.cross(normal);
+	b3Assert(!perp.isZero());
+
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("   Advancing %d %d  (%p %p, %d %d)\n", c0->point.index, c1->point.index, start0, start1, start0 ? start0->target->point.index : -1, start1 ? start1->target->point.index : -1);
+#endif
+
+	btInt64_t maxDot0 = et0.dot(perp);
+	if (e0)
+	{
+		while (e0->target != stop0)
+		{
+			Edge* e = e0->reverse->prev;
+			if (e->target->point.dot(normal) < dist)
+			{
+				break;
+			}
+			b3Assert(e->target->point.dot(normal) == dist);
+			if (e->copy == mergeStamp)
+			{
+				break;
+			}
+			btInt64_t dot = e->target->point.dot(perp);
+			if (dot <= maxDot0)
+			{
+				break;
+			}
+			maxDot0 = dot;
+			e0 = e;
+			et0 = e->target->point;
+		}
+	}
+
+	btInt64_t maxDot1 = et1.dot(perp);
+	if (e1)
+	{
+		while (e1->target != stop1)
+		{
+			Edge* e = e1->reverse->next;
+			if (e->target->point.dot(normal) < dist)
+			{
+				break;
+			}
+			b3Assert(e->target->point.dot(normal) == dist);
+			if (e->copy == mergeStamp)
+			{
+				break;
+			}
+			btInt64_t dot = e->target->point.dot(perp);
+			if (dot <= maxDot1)
+			{
+				break;
+			}
+			maxDot1 = dot;
+			e1 = e;
+			et1 = e->target->point;
+		}
+	}
+
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("   Starting at %d %d\n", et0.index, et1.index);
+#endif
+
+	btInt64_t dx = maxDot1 - maxDot0;
+	if (dx > 0)
+	{
+		while (true)
+		{
+			btInt64_t dy = (et1 - et0).dot(s);
+
+			if (e0 && (e0->target != stop0))
+			{
+				Edge* f0 = e0->next->reverse;
+				if (f0->copy > mergeStamp)
+				{
+					btInt64_t dx0 = (f0->target->point - et0).dot(perp);
+					btInt64_t dy0 = (f0->target->point - et0).dot(s);
+					if ((dx0 == 0) ? (dy0 < 0) : ((dx0 < 0) && (Rational64(dy0, dx0).compare(Rational64(dy, dx)) >= 0)))
+					{
+						et0 = f0->target->point;
+						dx = (et1 - et0).dot(perp);
+						e0 = (e0 == start0) ? NULL : f0;
+						continue;
+					}
+				}
+			}
+
+			if (e1 && (e1->target != stop1))
+			{
+				Edge* f1 = e1->reverse->next;
+				if (f1->copy > mergeStamp)
+				{
+					Point32 d1 = f1->target->point - et1;
+					if (d1.dot(normal) == 0)
+					{
+						btInt64_t dx1 = d1.dot(perp);
+						btInt64_t dy1 = d1.dot(s);
+						btInt64_t dxn = (f1->target->point - et0).dot(perp);
+						if ((dxn > 0) && ((dx1 == 0) ? (dy1 < 0) : ((dx1 < 0) && (Rational64(dy1, dx1).compare(Rational64(dy, dx)) > 0))))
+						{
+							e1 = f1;
+							et1 = e1->target->point;
+							dx = dxn;
+							continue;
+						}
+					}
+					else
+					{
+						b3Assert((e1 == start1) && (d1.dot(normal) < 0));
+					}
+				}
+			}
+
+			break;
+		}
+	}
+	else if (dx < 0)
+	{
+		while (true)
+		{
+			btInt64_t dy = (et1 - et0).dot(s);
+
+			if (e1 && (e1->target != stop1))
+			{
+				Edge* f1 = e1->prev->reverse;
+				if (f1->copy > mergeStamp)
+				{
+					btInt64_t dx1 = (f1->target->point - et1).dot(perp);
+					btInt64_t dy1 = (f1->target->point - et1).dot(s);
+					if ((dx1 == 0) ? (dy1 > 0) : ((dx1 < 0) && (Rational64(dy1, dx1).compare(Rational64(dy, dx)) <= 0)))
+					{
+						et1 = f1->target->point;
+						dx = (et1 - et0).dot(perp);
+						e1 = (e1 == start1) ? NULL : f1;
+						continue;
+					}
+				}
+			}
+
+			if (e0 && (e0->target != stop0))
+			{
+				Edge* f0 = e0->reverse->prev;
+				if (f0->copy > mergeStamp)
+				{
+					Point32 d0 = f0->target->point - et0;
+					if (d0.dot(normal) == 0)
+					{
+						btInt64_t dx0 = d0.dot(perp);
+						btInt64_t dy0 = d0.dot(s);
+						btInt64_t dxn = (et1 - f0->target->point).dot(perp);
+						if ((dxn < 0) && ((dx0 == 0) ? (dy0 > 0) : ((dx0 < 0) && (Rational64(dy0, dx0).compare(Rational64(dy, dx)) < 0))))
+						{
+							e0 = f0;
+							et0 = e0->target->point;
+							dx = dxn;
+							continue;
+						}
+					}
+					else
+					{
+						b3Assert((e0 == start0) && (d0.dot(normal) < 0));
+					}
+				}
+			}
+
+			break;
+		}
+	}
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("   Advanced edges to %d %d\n", et0.index, et1.index);
+#endif
+}
+
+void b3ConvexHullInternal::merge(IntermediateHull& h0, IntermediateHull& h1)
+{
+	if (!h1.maxXy)
+	{
+		return;
+	}
+	if (!h0.maxXy)
+	{
+		h0 = h1;
+		return;
+	}
+
+	mergeStamp--;
+
+	Vertex* c0 = NULL;
+	Edge* toPrev0 = NULL;
+	Edge* firstNew0 = NULL;
+	Edge* pendingHead0 = NULL;
+	Edge* pendingTail0 = NULL;
+	Vertex* c1 = NULL;
+	Edge* toPrev1 = NULL;
+	Edge* firstNew1 = NULL;
+	Edge* pendingHead1 = NULL;
+	Edge* pendingTail1 = NULL;
+	Point32 prevPoint;
+
+	if (mergeProjection(h0, h1, c0, c1))
+	{
+		Point32 s = *c1 - *c0;
+		Point64 normal = Point32(0, 0, -1).cross(s);
+		Point64 t = s.cross(normal);
+		b3Assert(!t.isZero());
+
+		Edge* e = c0->edges;
+		Edge* start0 = NULL;
+		if (e)
+		{
+			do
+			{
+				btInt64_t dot = (*e->target - *c0).dot(normal);
+				b3Assert(dot <= 0);
+				if ((dot == 0) && ((*e->target - *c0).dot(t) > 0))
+				{
+					if (!start0 || (getOrientation(start0, e, s, Point32(0, 0, -1)) == CLOCKWISE))
+					{
+						start0 = e;
+					}
+				}
+				e = e->next;
+			} while (e != c0->edges);
+		}
+
+		e = c1->edges;
+		Edge* start1 = NULL;
+		if (e)
+		{
+			do
+			{
+				btInt64_t dot = (*e->target - *c1).dot(normal);
+				b3Assert(dot <= 0);
+				if ((dot == 0) && ((*e->target - *c1).dot(t) > 0))
+				{
+					if (!start1 || (getOrientation(start1, e, s, Point32(0, 0, -1)) == COUNTER_CLOCKWISE))
+					{
+						start1 = e;
+					}
+				}
+				e = e->next;
+			} while (e != c1->edges);
+		}
+
+		if (start0 || start1)
+		{
+			findEdgeForCoplanarFaces(c0, c1, start0, start1, NULL, NULL);
+			if (start0)
+			{
+				c0 = start0->target;
+			}
+			if (start1)
+			{
+				c1 = start1->target;
+			}
+		}
+
+		prevPoint = c1->point;
+		prevPoint.z++;
+	}
+	else
+	{
+		prevPoint = c1->point;
+		prevPoint.x++;
+	}
+
+	Vertex* first0 = c0;
+	Vertex* first1 = c1;
+	bool firstRun = true;
+
+	while (true)
+	{
+		Point32 s = *c1 - *c0;
+		Point32 r = prevPoint - c0->point;
+		Point64 rxs = r.cross(s);
+		Point64 sxrxs = s.cross(rxs);
+
+#ifdef DEBUG_CONVEX_HULL
+		b3Printf("\n  Checking %d %d\n", c0->point.index, c1->point.index);
+#endif
+		Rational64 minCot0(0, 0);
+		Edge* min0 = findMaxAngle(false, c0, s, rxs, sxrxs, minCot0);
+		Rational64 minCot1(0, 0);
+		Edge* min1 = findMaxAngle(true, c1, s, rxs, sxrxs, minCot1);
+		if (!min0 && !min1)
+		{
+			Edge* e = newEdgePair(c0, c1);
+			e->link(e);
+			c0->edges = e;
+
+			e = e->reverse;
+			e->link(e);
+			c1->edges = e;
+			return;
+		}
+		else
+		{
+			int cmp = !min0 ? 1 : !min1 ? -1 : minCot0.compare(minCot1);
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("    -> Result %d\n", cmp);
+#endif
+			if (firstRun || ((cmp >= 0) ? !minCot1.isNegativeInfinity() : !minCot0.isNegativeInfinity()))
+			{
+				Edge* e = newEdgePair(c0, c1);
+				if (pendingTail0)
+				{
+					pendingTail0->prev = e;
+				}
+				else
+				{
+					pendingHead0 = e;
+				}
+				e->next = pendingTail0;
+				pendingTail0 = e;
+
+				e = e->reverse;
+				if (pendingTail1)
+				{
+					pendingTail1->next = e;
+				}
+				else
+				{
+					pendingHead1 = e;
+				}
+				e->prev = pendingTail1;
+				pendingTail1 = e;
+			}
+
+			Edge* e0 = min0;
+			Edge* e1 = min1;
+
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("   Found min edges to %d %d\n", e0 ? e0->target->point.index : -1, e1 ? e1->target->point.index : -1);
+#endif
+
+			if (cmp == 0)
+			{
+				findEdgeForCoplanarFaces(c0, c1, e0, e1, NULL, NULL);
+			}
+
+			if ((cmp >= 0) && e1)
+			{
+				if (toPrev1)
+				{
+					for (Edge *e = toPrev1->next, *n = NULL; e != min1; e = n)
+					{
+						n = e->next;
+						removeEdgePair(e);
+					}
+				}
+
+				if (pendingTail1)
+				{
+					if (toPrev1)
+					{
+						toPrev1->link(pendingHead1);
+					}
+					else
+					{
+						min1->prev->link(pendingHead1);
+						firstNew1 = pendingHead1;
+					}
+					pendingTail1->link(min1);
+					pendingHead1 = NULL;
+					pendingTail1 = NULL;
+				}
+				else if (!toPrev1)
+				{
+					firstNew1 = min1;
+				}
+
+				prevPoint = c1->point;
+				c1 = e1->target;
+				toPrev1 = e1->reverse;
+			}
+
+			if ((cmp <= 0) && e0)
+			{
+				if (toPrev0)
+				{
+					for (Edge *e = toPrev0->prev, *n = NULL; e != min0; e = n)
+					{
+						n = e->prev;
+						removeEdgePair(e);
+					}
+				}
+
+				if (pendingTail0)
+				{
+					if (toPrev0)
+					{
+						pendingHead0->link(toPrev0);
+					}
+					else
+					{
+						pendingHead0->link(min0->next);
+						firstNew0 = pendingHead0;
+					}
+					min0->link(pendingTail0);
+					pendingHead0 = NULL;
+					pendingTail0 = NULL;
+				}
+				else if (!toPrev0)
+				{
+					firstNew0 = min0;
+				}
+
+				prevPoint = c0->point;
+				c0 = e0->target;
+				toPrev0 = e0->reverse;
+			}
+		}
+
+		if ((c0 == first0) && (c1 == first1))
+		{
+			if (toPrev0 == NULL)
+			{
+				pendingHead0->link(pendingTail0);
+				c0->edges = pendingTail0;
+			}
+			else
+			{
+				for (Edge *e = toPrev0->prev, *n = NULL; e != firstNew0; e = n)
+				{
+					n = e->prev;
+					removeEdgePair(e);
+				}
+				if (pendingTail0)
+				{
+					pendingHead0->link(toPrev0);
+					firstNew0->link(pendingTail0);
+				}
+			}
+
+			if (toPrev1 == NULL)
+			{
+				pendingTail1->link(pendingHead1);
+				c1->edges = pendingTail1;
+			}
+			else
+			{
+				for (Edge *e = toPrev1->next, *n = NULL; e != firstNew1; e = n)
+				{
+					n = e->next;
+					removeEdgePair(e);
+				}
+				if (pendingTail1)
+				{
+					toPrev1->link(pendingHead1);
+					pendingTail1->link(firstNew1);
+				}
+			}
+
+			return;
+		}
+
+		firstRun = false;
+	}
+}
+
+static bool b3PointCmp(const b3ConvexHullInternal::Point32& p, const b3ConvexHullInternal::Point32& q)
+{
+	return (p.y < q.y) || ((p.y == q.y) && ((p.x < q.x) || ((p.x == q.x) && (p.z < q.z))));
+}
+
+void b3ConvexHullInternal::compute(const void* coords, bool doubleCoords, int stride, int count)
+{
+	b3Vector3 min = b3MakeVector3(b3Scalar(1e30), b3Scalar(1e30), b3Scalar(1e30)), max = b3MakeVector3(b3Scalar(-1e30), b3Scalar(-1e30), b3Scalar(-1e30));
+	const char* ptr = (const char*)coords;
+	if (doubleCoords)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const double* v = (const double*)ptr;
+			b3Vector3 p = b3MakeVector3((b3Scalar)v[0], (b3Scalar)v[1], (b3Scalar)v[2]);
+			ptr += stride;
+			min.setMin(p);
+			max.setMax(p);
+		}
+	}
+	else
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const float* v = (const float*)ptr;
+			b3Vector3 p = b3MakeVector3(v[0], v[1], v[2]);
+			ptr += stride;
+			min.setMin(p);
+			max.setMax(p);
+		}
+	}
+
+	b3Vector3 s = max - min;
+	maxAxis = s.maxAxis();
+	minAxis = s.minAxis();
+	if (minAxis == maxAxis)
+	{
+		minAxis = (maxAxis + 1) % 3;
+	}
+	medAxis = 3 - maxAxis - minAxis;
+
+	s /= b3Scalar(10216);
+	if (((medAxis + 1) % 3) != maxAxis)
+	{
+		s *= -1;
+	}
+	scaling = s;
+
+	if (s[0] != 0)
+	{
+		s[0] = b3Scalar(1) / s[0];
+	}
+	if (s[1] != 0)
+	{
+		s[1] = b3Scalar(1) / s[1];
+	}
+	if (s[2] != 0)
+	{
+		s[2] = b3Scalar(1) / s[2];
+	}
+
+	center = (min + max) * b3Scalar(0.5);
+
+	b3AlignedObjectArray<Point32> points;
+	points.resize(count);
+	ptr = (const char*)coords;
+	if (doubleCoords)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const double* v = (const double*)ptr;
+			b3Vector3 p = b3MakeVector3((b3Scalar)v[0], (b3Scalar)v[1], (b3Scalar)v[2]);
+			ptr += stride;
+			p = (p - center) * s;
+			points[i].x = (btInt32_t)p[medAxis];
+			points[i].y = (btInt32_t)p[maxAxis];
+			points[i].z = (btInt32_t)p[minAxis];
+			points[i].index = i;
+		}
+	}
+	else
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const float* v = (const float*)ptr;
+			b3Vector3 p = b3MakeVector3(v[0], v[1], v[2]);
+			ptr += stride;
+			p = (p - center) * s;
+			points[i].x = (btInt32_t)p[medAxis];
+			points[i].y = (btInt32_t)p[maxAxis];
+			points[i].z = (btInt32_t)p[minAxis];
+			points[i].index = i;
+		}
+	}
+	points.quickSort(b3PointCmp);
+
+	vertexPool.reset();
+	vertexPool.setArraySize(count);
+	originalVertices.resize(count);
+	for (int i = 0; i < count; i++)
+	{
+		Vertex* v = vertexPool.newObject();
+		v->edges = NULL;
+		v->point = points[i];
+		v->copy = -1;
+		originalVertices[i] = v;
+	}
+
+	points.clear();
+
+	edgePool.reset();
+	edgePool.setArraySize(6 * count);
+
+	usedEdgePairs = 0;
+	maxUsedEdgePairs = 0;
+
+	mergeStamp = -3;
+
+	IntermediateHull hull;
+	computeInternal(0, count, hull);
+	vertexList = hull.minXy;
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("max. edges %d (3v = %d)", maxUsedEdgePairs, 3 * count);
+#endif
+}
+
+b3Vector3 b3ConvexHullInternal::toBtVector(const Point32& v)
+{
+	b3Vector3 p;
+	p[medAxis] = b3Scalar(v.x);
+	p[maxAxis] = b3Scalar(v.y);
+	p[minAxis] = b3Scalar(v.z);
+	return p * scaling;
+}
+
+b3Vector3 b3ConvexHullInternal::getBtNormal(Face* face)
+{
+	return toBtVector(face->dir0).cross(toBtVector(face->dir1)).normalized();
+}
+
+b3Vector3 b3ConvexHullInternal::getCoordinates(const Vertex* v)
+{
+	b3Vector3 p;
+	p[medAxis] = v->xvalue();
+	p[maxAxis] = v->yvalue();
+	p[minAxis] = v->zvalue();
+	return p * scaling + center;
+}
+
+b3Scalar b3ConvexHullInternal::shrink(b3Scalar amount, b3Scalar clampAmount)
+{
+	if (!vertexList)
+	{
+		return 0;
+	}
+	int stamp = --mergeStamp;
+	b3AlignedObjectArray<Vertex*> stack;
+	vertexList->copy = stamp;
+	stack.push_back(vertexList);
+	b3AlignedObjectArray<Face*> faces;
+
+	Point32 ref = vertexList->point;
+	Int128 hullCenterX(0, 0);
+	Int128 hullCenterY(0, 0);
+	Int128 hullCenterZ(0, 0);
+	Int128 volume(0, 0);
+
+	while (stack.size() > 0)
+	{
+		Vertex* v = stack[stack.size() - 1];
+		stack.pop_back();
+		Edge* e = v->edges;
+		if (e)
+		{
+			do
+			{
+				if (e->target->copy != stamp)
+				{
+					e->target->copy = stamp;
+					stack.push_back(e->target);
+				}
+				if (e->copy != stamp)
+				{
+					Face* face = facePool.newObject();
+					face->init(e->target, e->reverse->prev->target, v);
+					faces.push_back(face);
+					Edge* f = e;
+
+					Vertex* a = NULL;
+					Vertex* b = NULL;
+					do
+					{
+						if (a && b)
+						{
+							btInt64_t vol = (v->point - ref).dot((a->point - ref).cross(b->point - ref));
+							b3Assert(vol >= 0);
+							Point32 c = v->point + a->point + b->point + ref;
+							hullCenterX += vol * c.x;
+							hullCenterY += vol * c.y;
+							hullCenterZ += vol * c.z;
+							volume += vol;
+						}
+
+						b3Assert(f->copy != stamp);
+						f->copy = stamp;
+						f->face = face;
+
+						a = b;
+						b = f->target;
+
+						f = f->reverse->prev;
+					} while (f != e);
+				}
+				e = e->next;
+			} while (e != v->edges);
+		}
+	}
+
+	if (volume.getSign() <= 0)
+	{
+		return 0;
+	}
+
+	b3Vector3 hullCenter;
+	hullCenter[medAxis] = hullCenterX.toScalar();
+	hullCenter[maxAxis] = hullCenterY.toScalar();
+	hullCenter[minAxis] = hullCenterZ.toScalar();
+	hullCenter /= 4 * volume.toScalar();
+	hullCenter *= scaling;
+
+	int faceCount = faces.size();
+
+	if (clampAmount > 0)
+	{
+		b3Scalar minDist = B3_INFINITY;
+		for (int i = 0; i < faceCount; i++)
+		{
+			b3Vector3 normal = getBtNormal(faces[i]);
+			b3Scalar dist = normal.dot(toBtVector(faces[i]->origin) - hullCenter);
+			if (dist < minDist)
+			{
+				minDist = dist;
+			}
+		}
+
+		if (minDist <= 0)
+		{
+			return 0;
+		}
+
+		amount = b3Min(amount, minDist * clampAmount);
+	}
+
+	unsigned int seed = 243703;
+	for (int i = 0; i < faceCount; i++, seed = 1664525 * seed + 1013904223)
+	{
+		b3Swap(faces[i], faces[seed % faceCount]);
+	}
+
+	for (int i = 0; i < faceCount; i++)
+	{
+		if (!shiftFace(faces[i], amount, stack))
+		{
+			return -amount;
+		}
+	}
+
+	return amount;
+}
+
+bool b3ConvexHullInternal::shiftFace(Face* face, b3Scalar amount, b3AlignedObjectArray<Vertex*> stack)
+{
+	b3Vector3 origShift = getBtNormal(face) * -amount;
+	if (scaling[0] != 0)
+	{
+		origShift[0] /= scaling[0];
+	}
+	if (scaling[1] != 0)
+	{
+		origShift[1] /= scaling[1];
+	}
+	if (scaling[2] != 0)
+	{
+		origShift[2] /= scaling[2];
+	}
+	Point32 shift((btInt32_t)origShift[medAxis], (btInt32_t)origShift[maxAxis], (btInt32_t)origShift[minAxis]);
+	if (shift.isZero())
+	{
+		return true;
+	}
+	Point64 normal = face->getNormal();
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("\nShrinking face (%d %d %d) (%d %d %d) (%d %d %d) by (%d %d %d)\n",
+			 face->origin.x, face->origin.y, face->origin.z, face->dir0.x, face->dir0.y, face->dir0.z, face->dir1.x, face->dir1.y, face->dir1.z, shift.x, shift.y, shift.z);
+#endif
+	btInt64_t origDot = face->origin.dot(normal);
+	Point32 shiftedOrigin = face->origin + shift;
+	btInt64_t shiftedDot = shiftedOrigin.dot(normal);
+	b3Assert(shiftedDot <= origDot);
+	if (shiftedDot >= origDot)
+	{
+		return false;
+	}
+
+	Edge* intersection = NULL;
+
+	Edge* startEdge = face->nearbyVertex->edges;
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("Start edge is ");
+	startEdge->print();
+	b3Printf(", normal is (%lld %lld %lld), shifted dot is %lld\n", normal.x, normal.y, normal.z, shiftedDot);
+#endif
+	Rational128 optDot = face->nearbyVertex->dot(normal);
+	int cmp = optDot.compare(shiftedDot);
+#ifdef SHOW_ITERATIONS
+	int n = 0;
+#endif
+	if (cmp >= 0)
+	{
+		Edge* e = startEdge;
+		do
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			Rational128 dot = e->target->dot(normal);
+			b3Assert(dot.compare(origDot) <= 0);
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("Moving downwards, edge is ");
+			e->print();
+			b3Printf(", dot is %f (%f %lld)\n", (float)dot.toScalar(), (float)optDot.toScalar(), shiftedDot);
+#endif
+			if (dot.compare(optDot) < 0)
+			{
+				int c = dot.compare(shiftedDot);
+				optDot = dot;
+				e = e->reverse;
+				startEdge = e;
+				if (c < 0)
+				{
+					intersection = e;
+					break;
+				}
+				cmp = c;
+			}
+			e = e->prev;
+		} while (e != startEdge);
+
+		if (!intersection)
+		{
+			return false;
+		}
+	}
+	else
+	{
+		Edge* e = startEdge;
+		do
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			Rational128 dot = e->target->dot(normal);
+			b3Assert(dot.compare(origDot) <= 0);
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("Moving upwards, edge is ");
+			e->print();
+			b3Printf(", dot is %f (%f %lld)\n", (float)dot.toScalar(), (float)optDot.toScalar(), shiftedDot);
+#endif
+			if (dot.compare(optDot) > 0)
+			{
+				cmp = dot.compare(shiftedDot);
+				if (cmp >= 0)
+				{
+					intersection = e;
+					break;
+				}
+				optDot = dot;
+				e = e->reverse;
+				startEdge = e;
+			}
+			e = e->prev;
+		} while (e != startEdge);
+
+		if (!intersection)
+		{
+			return true;
+		}
+	}
+
+#ifdef SHOW_ITERATIONS
+	b3Printf("Needed %d iterations to find initial intersection\n", n);
+#endif
+
+	if (cmp == 0)
+	{
+		Edge* e = intersection->reverse->next;
+#ifdef SHOW_ITERATIONS
+		n = 0;
+#endif
+		while (e->target->dot(normal).compare(shiftedDot) <= 0)
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			e = e->next;
+			if (e == intersection->reverse)
+			{
+				return true;
+			}
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("Checking for outwards edge, current edge is ");
+			e->print();
+			b3Printf("\n");
+#endif
+		}
+#ifdef SHOW_ITERATIONS
+		b3Printf("Needed %d iterations to check for complete containment\n", n);
+#endif
+	}
+
+	Edge* firstIntersection = NULL;
+	Edge* faceEdge = NULL;
+	Edge* firstFaceEdge = NULL;
+
+#ifdef SHOW_ITERATIONS
+	int m = 0;
+#endif
+	while (true)
+	{
+#ifdef SHOW_ITERATIONS
+		m++;
+#endif
+#ifdef DEBUG_CONVEX_HULL
+		b3Printf("Intersecting edge is ");
+		intersection->print();
+		b3Printf("\n");
+#endif
+		if (cmp == 0)
+		{
+			Edge* e = intersection->reverse->next;
+			startEdge = e;
+#ifdef SHOW_ITERATIONS
+			n = 0;
+#endif
+			while (true)
+			{
+#ifdef SHOW_ITERATIONS
+				n++;
+#endif
+				if (e->target->dot(normal).compare(shiftedDot) >= 0)
+				{
+					break;
+				}
+				intersection = e->reverse;
+				e = e->next;
+				if (e == startEdge)
+				{
+					return true;
+				}
+			}
+#ifdef SHOW_ITERATIONS
+			b3Printf("Needed %d iterations to advance intersection\n", n);
+#endif
+		}
+
+#ifdef DEBUG_CONVEX_HULL
+		b3Printf("Advanced intersecting edge to ");
+		intersection->print();
+		b3Printf(", cmp = %d\n", cmp);
+#endif
+
+		if (!firstIntersection)
+		{
+			firstIntersection = intersection;
+		}
+		else if (intersection == firstIntersection)
+		{
+			break;
+		}
+
+		int prevCmp = cmp;
+		Edge* prevIntersection = intersection;
+		Edge* prevFaceEdge = faceEdge;
+
+		Edge* e = intersection->reverse;
+#ifdef SHOW_ITERATIONS
+		n = 0;
+#endif
+		while (true)
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			e = e->reverse->prev;
+			b3Assert(e != intersection->reverse);
+			cmp = e->target->dot(normal).compare(shiftedDot);
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("Testing edge ");
+			e->print();
+			b3Printf(" -> cmp = %d\n", cmp);
+#endif
+			if (cmp >= 0)
+			{
+				intersection = e;
+				break;
+			}
+		}
+#ifdef SHOW_ITERATIONS
+		b3Printf("Needed %d iterations to find other intersection of face\n", n);
+#endif
+
+		if (cmp > 0)
+		{
+			Vertex* removed = intersection->target;
+			e = intersection->reverse;
+			if (e->prev == e)
+			{
+				removed->edges = NULL;
+			}
+			else
+			{
+				removed->edges = e->prev;
+				e->prev->link(e->next);
+				e->link(e);
+			}
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("1: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+
+			Point64 n0 = intersection->face->getNormal();
+			Point64 n1 = intersection->reverse->face->getNormal();
+			btInt64_t m00 = face->dir0.dot(n0);
+			btInt64_t m01 = face->dir1.dot(n0);
+			btInt64_t m10 = face->dir0.dot(n1);
+			btInt64_t m11 = face->dir1.dot(n1);
+			btInt64_t r0 = (intersection->face->origin - shiftedOrigin).dot(n0);
+			btInt64_t r1 = (intersection->reverse->face->origin - shiftedOrigin).dot(n1);
+			Int128 det = Int128::mul(m00, m11) - Int128::mul(m01, m10);
+			b3Assert(det.getSign() != 0);
+			Vertex* v = vertexPool.newObject();
+			v->point.index = -1;
+			v->copy = -1;
+			v->point128 = PointR128(Int128::mul(face->dir0.x * r0, m11) - Int128::mul(face->dir0.x * r1, m01) + Int128::mul(face->dir1.x * r1, m00) - Int128::mul(face->dir1.x * r0, m10) + det * shiftedOrigin.x,
+									Int128::mul(face->dir0.y * r0, m11) - Int128::mul(face->dir0.y * r1, m01) + Int128::mul(face->dir1.y * r1, m00) - Int128::mul(face->dir1.y * r0, m10) + det * shiftedOrigin.y,
+									Int128::mul(face->dir0.z * r0, m11) - Int128::mul(face->dir0.z * r1, m01) + Int128::mul(face->dir1.z * r1, m00) - Int128::mul(face->dir1.z * r0, m10) + det * shiftedOrigin.z,
+									det);
+			v->point.x = (btInt32_t)v->point128.xvalue();
+			v->point.y = (btInt32_t)v->point128.yvalue();
+			v->point.z = (btInt32_t)v->point128.zvalue();
+			intersection->target = v;
+			v->edges = e;
+
+			stack.push_back(v);
+			stack.push_back(removed);
+			stack.push_back(NULL);
+		}
+
+		if (cmp || prevCmp || (prevIntersection->reverse->next->target != intersection->target))
+		{
+			faceEdge = newEdgePair(prevIntersection->target, intersection->target);
+			if (prevCmp == 0)
+			{
+				faceEdge->link(prevIntersection->reverse->next);
+			}
+			if ((prevCmp == 0) || prevFaceEdge)
+			{
+				prevIntersection->reverse->link(faceEdge);
+			}
+			if (cmp == 0)
+			{
+				intersection->reverse->prev->link(faceEdge->reverse);
+			}
+			faceEdge->reverse->link(intersection->reverse);
+		}
+		else
+		{
+			faceEdge = prevIntersection->reverse->next;
+		}
+
+		if (prevFaceEdge)
+		{
+			if (prevCmp > 0)
+			{
+				faceEdge->link(prevFaceEdge->reverse);
+			}
+			else if (faceEdge != prevFaceEdge->reverse)
+			{
+				stack.push_back(prevFaceEdge->target);
+				while (faceEdge->next != prevFaceEdge->reverse)
+				{
+					Vertex* removed = faceEdge->next->target;
+					removeEdgePair(faceEdge->next);
+					stack.push_back(removed);
+#ifdef DEBUG_CONVEX_HULL
+					b3Printf("2: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+				}
+				stack.push_back(NULL);
+			}
+		}
+		faceEdge->face = face;
+		faceEdge->reverse->face = intersection->face;
+
+		if (!firstFaceEdge)
+		{
+			firstFaceEdge = faceEdge;
+		}
+	}
+#ifdef SHOW_ITERATIONS
+	b3Printf("Needed %d iterations to process all intersections\n", m);
+#endif
+
+	if (cmp > 0)
+	{
+		firstFaceEdge->reverse->target = faceEdge->target;
+		firstIntersection->reverse->link(firstFaceEdge);
+		firstFaceEdge->link(faceEdge->reverse);
+	}
+	else if (firstFaceEdge != faceEdge->reverse)
+	{
+		stack.push_back(faceEdge->target);
+		while (firstFaceEdge->next != faceEdge->reverse)
+		{
+			Vertex* removed = firstFaceEdge->next->target;
+			removeEdgePair(firstFaceEdge->next);
+			stack.push_back(removed);
+#ifdef DEBUG_CONVEX_HULL
+			b3Printf("3: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+		}
+		stack.push_back(NULL);
+	}
+
+	b3Assert(stack.size() > 0);
+	vertexList = stack[0];
+
+#ifdef DEBUG_CONVEX_HULL
+	b3Printf("Removing part\n");
+#endif
+#ifdef SHOW_ITERATIONS
+	n = 0;
+#endif
+	int pos = 0;
+	while (pos < stack.size())
+	{
+		int end = stack.size();
+		while (pos < end)
+		{
+			Vertex* kept = stack[pos++];
+#ifdef DEBUG_CONVEX_HULL
+			kept->print();
+#endif
+			bool deeper = false;
+			Vertex* removed;
+			while ((removed = stack[pos++]) != NULL)
+			{
+#ifdef SHOW_ITERATIONS
+				n++;
+#endif
+				kept->receiveNearbyFaces(removed);
+				while (removed->edges)
+				{
+					if (!deeper)
+					{
+						deeper = true;
+						stack.push_back(kept);
+					}
+					stack.push_back(removed->edges->target);
+					removeEdgePair(removed->edges);
+				}
+			}
+			if (deeper)
+			{
+				stack.push_back(NULL);
+			}
+		}
+	}
+#ifdef SHOW_ITERATIONS
+	b3Printf("Needed %d iterations to remove part\n", n);
+#endif
+
+	stack.resize(0);
+	face->origin = shiftedOrigin;
+
+	return true;
+}
+
+static int getVertexCopy(b3ConvexHullInternal::Vertex* vertex, b3AlignedObjectArray<b3ConvexHullInternal::Vertex*>& vertices)
+{
+	int index = vertex->copy;
+	if (index < 0)
+	{
+		index = vertices.size();
+		vertex->copy = index;
+		vertices.push_back(vertex);
+#ifdef DEBUG_CONVEX_HULL
+		b3Printf("Vertex %d gets index *%d\n", vertex->point.index, index);
+#endif
+	}
+	return index;
+}
+
+b3Scalar b3ConvexHullComputer::compute(const void* coords, bool doubleCoords, int stride, int count, b3Scalar shrink, b3Scalar shrinkClamp)
+{
+	if (count <= 0)
+	{
+		vertices.clear();
+		edges.clear();
+		faces.clear();
+		return 0;
+	}
+
+	b3ConvexHullInternal hull;
+	hull.compute(coords, doubleCoords, stride, count);
+
+	b3Scalar shift = 0;
+	if ((shrink > 0) && ((shift = hull.shrink(shrink, shrinkClamp)) < 0))
+	{
+		vertices.clear();
+		edges.clear();
+		faces.clear();
+		return shift;
+	}
+
+	vertices.resize(0);
+	edges.resize(0);
+	faces.resize(0);
+
+	b3AlignedObjectArray<b3ConvexHullInternal::Vertex*> oldVertices;
+	getVertexCopy(hull.vertexList, oldVertices);
+	int copied = 0;
+	while (copied < oldVertices.size())
+	{
+		b3ConvexHullInternal::Vertex* v = oldVertices[copied];
+		vertices.push_back(hull.getCoordinates(v));
+		b3ConvexHullInternal::Edge* firstEdge = v->edges;
+		if (firstEdge)
+		{
+			int firstCopy = -1;
+			int prevCopy = -1;
+			b3ConvexHullInternal::Edge* e = firstEdge;
+			do
+			{
+				if (e->copy < 0)
+				{
+					int s = edges.size();
+					edges.push_back(Edge());
+					edges.push_back(Edge());
+					Edge* c = &edges[s];
+					Edge* r = &edges[s + 1];
+					e->copy = s;
+					e->reverse->copy = s + 1;
+					c->reverse = 1;
+					r->reverse = -1;
+					c->targetVertex = getVertexCopy(e->target, oldVertices);
+					r->targetVertex = copied;
+#ifdef DEBUG_CONVEX_HULL
+					b3Printf("      CREATE: Vertex *%d has edge to *%d\n", copied, c->getTargetVertex());
+#endif
+				}
+				if (prevCopy >= 0)
+				{
+					edges[e->copy].next = prevCopy - e->copy;
+				}
+				else
+				{
+					firstCopy = e->copy;
+				}
+				prevCopy = e->copy;
+				e = e->next;
+			} while (e != firstEdge);
+			edges[firstCopy].next = prevCopy - firstCopy;
+		}
+		copied++;
+	}
+
+	for (int i = 0; i < copied; i++)
+	{
+		b3ConvexHullInternal::Vertex* v = oldVertices[i];
+		b3ConvexHullInternal::Edge* firstEdge = v->edges;
+		if (firstEdge)
+		{
+			b3ConvexHullInternal::Edge* e = firstEdge;
+			do
+			{
+				if (e->copy >= 0)
+				{
+#ifdef DEBUG_CONVEX_HULL
+					b3Printf("Vertex *%d has edge to *%d\n", i, edges[e->copy].getTargetVertex());
+#endif
+					faces.push_back(e->copy);
+					b3ConvexHullInternal::Edge* f = e;
+					do
+					{
+#ifdef DEBUG_CONVEX_HULL
+						b3Printf("   Face *%d\n", edges[f->copy].getTargetVertex());
+#endif
+						f->copy = -1;
+						f = f->reverse->prev;
+					} while (f != e);
+				}
+				e = e->next;
+			} while (e != firstEdge);
+		}
+	}
+
+	return shift;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3ConvexHullComputer.h b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3ConvexHullComputer.h
new file mode 100644
index 0000000..8852c5a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3ConvexHullComputer.h
@@ -0,0 +1,99 @@
+/*
+Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_CONVEX_HULL_COMPUTER_H
+#define B3_CONVEX_HULL_COMPUTER_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+/// Convex hull implementation based on Preparata and Hong
+/// See http://code.google.com/p/bullet/issues/detail?id=275
+/// Ole Kniemeyer, MAXON Computer GmbH
+class b3ConvexHullComputer
+{
+private:
+	b3Scalar compute(const void* coords, bool doubleCoords, int stride, int count, b3Scalar shrink, b3Scalar shrinkClamp);
+
+public:
+	class Edge
+	{
+	private:
+		int next;
+		int reverse;
+		int targetVertex;
+
+		friend class b3ConvexHullComputer;
+
+	public:
+		int getSourceVertex() const
+		{
+			return (this + reverse)->targetVertex;
+		}
+
+		int getTargetVertex() const
+		{
+			return targetVertex;
+		}
+
+		const Edge* getNextEdgeOfVertex() const  // clockwise list of all edges of a vertex
+		{
+			return this + next;
+		}
+
+		const Edge* getNextEdgeOfFace() const  // counter-clockwise list of all edges of a face
+		{
+			return (this + reverse)->getNextEdgeOfVertex();
+		}
+
+		const Edge* getReverseEdge() const
+		{
+			return this + reverse;
+		}
+	};
+
+	// Vertices of the output hull
+	b3AlignedObjectArray<b3Vector3> vertices;
+
+	// Edges of the output hull
+	b3AlignedObjectArray<Edge> edges;
+
+	// Faces of the convex hull. Each entry is an index into the "edges" array pointing to an edge of the face. Faces are planar n-gons
+	b3AlignedObjectArray<int> faces;
+
+	/*
+		Compute convex hull of "count" vertices stored in "coords". "stride" is the difference in bytes
+		between the addresses of consecutive vertices. If "shrink" is positive, the convex hull is shrunken
+		by that amount (each face is moved by "shrink" length units towards the center along its normal).
+		If "shrinkClamp" is positive, "shrink" is clamped to not exceed "shrinkClamp * innerRadius", where "innerRadius"
+		is the minimum distance of a face to the center of the convex hull.
+
+		The returned value is the amount by which the hull has been shrunken. If it is negative, the amount was so large
+		that the resulting convex hull is empty.
+
+		The output convex hull can be found in the member variables "vertices", "edges", "faces".
+		*/
+	b3Scalar compute(const float* coords, int stride, int count, b3Scalar shrink, b3Scalar shrinkClamp)
+	{
+		return compute(coords, false, stride, count, shrink, shrinkClamp);
+	}
+
+	// same as above, but double precision
+	b3Scalar compute(const double* coords, int stride, int count, b3Scalar shrink, b3Scalar shrinkClamp)
+	{
+		return compute(coords, true, stride, count, shrink, shrinkClamp);
+	}
+};
+
+#endif  //B3_CONVEX_HULL_COMPUTER_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GeometryUtil.cpp b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GeometryUtil.cpp
new file mode 100644
index 0000000..1c5d5a7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GeometryUtil.cpp
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3GeometryUtil.h"
+
+/*
+  Make sure this dummy function never changes so that it
+  can be used by probes that are checking whether the
+  library is actually installed.
+*/
+extern "C"
+{
+	void b3BulletMathProbe();
+
+	void b3BulletMathProbe() {}
+}
+
+bool b3GeometryUtil::isPointInsidePlanes(const b3AlignedObjectArray<b3Vector3>& planeEquations, const b3Vector3& point, b3Scalar margin)
+{
+	int numbrushes = planeEquations.size();
+	for (int i = 0; i < numbrushes; i++)
+	{
+		const b3Vector3& N1 = planeEquations[i];
+		b3Scalar dist = b3Scalar(N1.dot(point)) + b3Scalar(N1[3]) - margin;
+		if (dist > b3Scalar(0.))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+bool b3GeometryUtil::areVerticesBehindPlane(const b3Vector3& planeNormal, const b3AlignedObjectArray<b3Vector3>& vertices, b3Scalar margin)
+{
+	int numvertices = vertices.size();
+	for (int i = 0; i < numvertices; i++)
+	{
+		const b3Vector3& N1 = vertices[i];
+		b3Scalar dist = b3Scalar(planeNormal.dot(N1)) + b3Scalar(planeNormal[3]) - margin;
+		if (dist > b3Scalar(0.))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+bool notExist(const b3Vector3& planeEquation, const b3AlignedObjectArray<b3Vector3>& planeEquations);
+
+bool notExist(const b3Vector3& planeEquation, const b3AlignedObjectArray<b3Vector3>& planeEquations)
+{
+	int numbrushes = planeEquations.size();
+	for (int i = 0; i < numbrushes; i++)
+	{
+		const b3Vector3& N1 = planeEquations[i];
+		if (planeEquation.dot(N1) > b3Scalar(0.999))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+void b3GeometryUtil::getPlaneEquationsFromVertices(b3AlignedObjectArray<b3Vector3>& vertices, b3AlignedObjectArray<b3Vector3>& planeEquationsOut)
+{
+	const int numvertices = vertices.size();
+	// brute force:
+	for (int i = 0; i < numvertices; i++)
+	{
+		const b3Vector3& N1 = vertices[i];
+
+		for (int j = i + 1; j < numvertices; j++)
+		{
+			const b3Vector3& N2 = vertices[j];
+
+			for (int k = j + 1; k < numvertices; k++)
+			{
+				const b3Vector3& N3 = vertices[k];
+
+				b3Vector3 planeEquation, edge0, edge1;
+				edge0 = N2 - N1;
+				edge1 = N3 - N1;
+				b3Scalar normalSign = b3Scalar(1.);
+				for (int ww = 0; ww < 2; ww++)
+				{
+					planeEquation = normalSign * edge0.cross(edge1);
+					if (planeEquation.length2() > b3Scalar(0.0001))
+					{
+						planeEquation.normalize();
+						if (notExist(planeEquation, planeEquationsOut))
+						{
+							planeEquation[3] = -planeEquation.dot(N1);
+
+							//check if inside, and replace supportingVertexOut if needed
+							if (areVerticesBehindPlane(planeEquation, vertices, b3Scalar(0.01)))
+							{
+								planeEquationsOut.push_back(planeEquation);
+							}
+						}
+					}
+					normalSign = b3Scalar(-1.);
+				}
+			}
+		}
+	}
+}
+
+void b3GeometryUtil::getVerticesFromPlaneEquations(const b3AlignedObjectArray<b3Vector3>& planeEquations, b3AlignedObjectArray<b3Vector3>& verticesOut)
+{
+	const int numbrushes = planeEquations.size();
+	// brute force:
+	for (int i = 0; i < numbrushes; i++)
+	{
+		const b3Vector3& N1 = planeEquations[i];
+
+		for (int j = i + 1; j < numbrushes; j++)
+		{
+			const b3Vector3& N2 = planeEquations[j];
+
+			for (int k = j + 1; k < numbrushes; k++)
+			{
+				const b3Vector3& N3 = planeEquations[k];
+
+				b3Vector3 n2n3;
+				n2n3 = N2.cross(N3);
+				b3Vector3 n3n1;
+				n3n1 = N3.cross(N1);
+				b3Vector3 n1n2;
+				n1n2 = N1.cross(N2);
+
+				if ((n2n3.length2() > b3Scalar(0.0001)) &&
+					(n3n1.length2() > b3Scalar(0.0001)) &&
+					(n1n2.length2() > b3Scalar(0.0001)))
+				{
+					//point P out of 3 plane equations:
+
+					//	d1 ( N2 * N3 ) + d2 ( N3 * N1 ) + d3 ( N1 * N2 )
+					//P =  -------------------------------------------------------------------------
+					//   N1 . ( N2 * N3 )
+
+					b3Scalar quotient = (N1.dot(n2n3));
+					if (b3Fabs(quotient) > b3Scalar(0.000001))
+					{
+						quotient = b3Scalar(-1.) / quotient;
+						n2n3 *= N1[3];
+						n3n1 *= N2[3];
+						n1n2 *= N3[3];
+						b3Vector3 potentialVertex = n2n3;
+						potentialVertex += n3n1;
+						potentialVertex += n1n2;
+						potentialVertex *= quotient;
+
+						//check if inside, and replace supportingVertexOut if needed
+						if (isPointInsidePlanes(planeEquations, potentialVertex, b3Scalar(0.01)))
+						{
+							verticesOut.push_back(potentialVertex);
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GeometryUtil.h b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GeometryUtil.h
new file mode 100644
index 0000000..9a7bf7e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GeometryUtil.h
@@ -0,0 +1,36 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_GEOMETRY_UTIL_H
+#define B3_GEOMETRY_UTIL_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+///The b3GeometryUtil helper class provides a few methods to convert between plane equations and vertices.
+class b3GeometryUtil
+{
+public:
+	static void getPlaneEquationsFromVertices(b3AlignedObjectArray<b3Vector3>& vertices, b3AlignedObjectArray<b3Vector3>& planeEquationsOut);
+
+	static void getVerticesFromPlaneEquations(const b3AlignedObjectArray<b3Vector3>& planeEquations, b3AlignedObjectArray<b3Vector3>& verticesOut);
+
+	static bool isInside(const b3AlignedObjectArray<b3Vector3>& vertices, const b3Vector3& planeNormal, b3Scalar margin);
+
+	static bool isPointInsidePlanes(const b3AlignedObjectArray<b3Vector3>& planeEquations, const b3Vector3& point, b3Scalar margin);
+
+	static bool areVerticesBehindPlane(const b3Vector3& planeNormal, const b3AlignedObjectArray<b3Vector3>& vertices, b3Scalar margin);
+};
+
+#endif  //B3_GEOMETRY_UTIL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GrahamScan2dConvexHull.h b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GrahamScan2dConvexHull.h
new file mode 100644
index 0000000..8881c9a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/b3GrahamScan2dConvexHull.h
@@ -0,0 +1,116 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_GRAHAM_SCAN_2D_CONVEX_HULL_H
+#define B3_GRAHAM_SCAN_2D_CONVEX_HULL_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+struct b3GrahamVector3 : public b3Vector3
+{
+	b3GrahamVector3(const b3Vector3& org, int orgIndex)
+		: b3Vector3(org),
+		  m_orgIndex(orgIndex)
+	{
+	}
+	b3Scalar m_angle;
+	int m_orgIndex;
+};
+
+struct b3AngleCompareFunc
+{
+	b3Vector3 m_anchor;
+	b3AngleCompareFunc(const b3Vector3& anchor)
+		: m_anchor(anchor)
+	{
+	}
+	bool operator()(const b3GrahamVector3& a, const b3GrahamVector3& b) const
+	{
+		if (a.m_angle != b.m_angle)
+			return a.m_angle < b.m_angle;
+		else
+		{
+			b3Scalar al = (a - m_anchor).length2();
+			b3Scalar bl = (b - m_anchor).length2();
+			if (al != bl)
+				return al < bl;
+			else
+			{
+				return a.m_orgIndex < b.m_orgIndex;
+			}
+		}
+	}
+};
+
+inline void b3GrahamScanConvexHull2D(b3AlignedObjectArray<b3GrahamVector3>& originalPoints, b3AlignedObjectArray<b3GrahamVector3>& hull, const b3Vector3& normalAxis)
+{
+	b3Vector3 axis0, axis1;
+	b3PlaneSpace1(normalAxis, axis0, axis1);
+
+	if (originalPoints.size() <= 1)
+	{
+		for (int i = 0; i < originalPoints.size(); i++)
+			hull.push_back(originalPoints[0]);
+		return;
+	}
+	//step1 : find anchor point with smallest projection on axis0 and move it to first location
+	for (int i = 0; i < originalPoints.size(); i++)
+	{
+		//		const b3Vector3& left = originalPoints[i];
+		//		const b3Vector3& right = originalPoints[0];
+		b3Scalar projL = originalPoints[i].dot(axis0);
+		b3Scalar projR = originalPoints[0].dot(axis0);
+		if (projL < projR)
+		{
+			originalPoints.swap(0, i);
+		}
+	}
+
+	//also precompute angles
+	originalPoints[0].m_angle = -1e30f;
+	for (int i = 1; i < originalPoints.size(); i++)
+	{
+		b3Vector3 xvec = axis0;
+		b3Vector3 ar = originalPoints[i] - originalPoints[0];
+		originalPoints[i].m_angle = b3Cross(xvec, ar).dot(normalAxis) / ar.length();
+	}
+
+	//step 2: sort all points, based on 'angle' with this anchor
+	b3AngleCompareFunc comp(originalPoints[0]);
+	originalPoints.quickSortInternal(comp, 1, originalPoints.size() - 1);
+
+	int i;
+	for (i = 0; i < 2; i++)
+		hull.push_back(originalPoints[i]);
+
+	//step 3: keep all 'convex' points and discard concave points (using back tracking)
+	for (; i != originalPoints.size(); i++)
+	{
+		bool isConvex = false;
+		while (!isConvex && hull.size() > 1)
+		{
+			b3Vector3& a = hull[hull.size() - 2];
+			b3Vector3& b = hull[hull.size() - 1];
+			isConvex = b3Cross(a - b, a - originalPoints[i]).dot(normalAxis) > 0;
+			if (!isConvex)
+				hull.pop_back();
+			else
+				hull.push_back(originalPoints[i]);
+		}
+	}
+}
+
+#endif  //B3_GRAHAM_SCAN_2D_CONVEX_HULL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Geometry/premake4.lua b/dali-physics/third-party/bullet3/src/Bullet3Geometry/premake4.lua
new file mode 100644
index 0000000..cce93f7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Geometry/premake4.lua
@@ -0,0 +1,16 @@
+	project "Bullet3Geometry"
+
+	language "C++"
+				
+	kind "StaticLib"
+		
+	includedirs {".."}
+	
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+
+	files {
+		"**.cpp",
+		"**.h"
+	}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h
new file mode 100644
index 0000000..b296992
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h
@@ -0,0 +1,42 @@
+
+#ifndef B3_GPU_BROADPHASE_INTERFACE_H
+#define B3_GPU_BROADPHASE_INTERFACE_H
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+#include "Bullet3Common/b3Vector3.h"
+#include "b3SapAabb.h"
+#include "Bullet3Common/shared/b3Int2.h"
+#include "Bullet3Common/shared/b3Int4.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+
+class b3GpuBroadphaseInterface
+{
+public:
+	typedef class b3GpuBroadphaseInterface*(CreateFunc)(cl_context ctx, cl_device_id device, cl_command_queue q);
+
+	virtual ~b3GpuBroadphaseInterface()
+	{
+	}
+
+	virtual void createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask) = 0;
+	virtual void createLargeProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask) = 0;
+
+	virtual void calculateOverlappingPairs(int maxPairs) = 0;
+	virtual void calculateOverlappingPairsHost(int maxPairs) = 0;
+
+	//call writeAabbsToGpu after done making all changes (createProxy etc)
+	virtual void writeAabbsToGpu() = 0;
+
+	virtual cl_mem getAabbBufferWS() = 0;
+	virtual int getNumOverlap() = 0;
+	virtual cl_mem getOverlappingPairBuffer() = 0;
+
+	virtual b3OpenCLArray<b3SapAabb>& getAllAabbsGPU() = 0;
+	virtual b3AlignedObjectArray<b3SapAabb>& getAllAabbsCPU() = 0;
+
+	virtual b3OpenCLArray<b3Int4>& getOverlappingPairsGPU() = 0;
+	virtual b3OpenCLArray<int>& getSmallAabbIndicesGPU() = 0;
+	virtual b3OpenCLArray<int>& getLargeAabbIndicesGPU() = 0;
+};
+
+#endif  //B3_GPU_BROADPHASE_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.cpp
new file mode 100644
index 0000000..e714fad
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.cpp
@@ -0,0 +1,338 @@
+
+#include "b3GpuGridBroadphase.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
+#include "kernels/gridBroadphaseKernels.h"
+#include "kernels/sapKernels.h"
+//#include "kernels/gridBroadphase.cl"
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+
+#define B3_BROADPHASE_SAP_PATH "src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl"
+#define B3_GRID_BROADPHASE_PATH "src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl"
+
+cl_kernel kCalcHashAABB;
+cl_kernel kClearCellStart;
+cl_kernel kFindCellStart;
+cl_kernel kFindOverlappingPairs;
+cl_kernel m_copyAabbsKernel;
+cl_kernel m_sap2Kernel;
+
+//int maxPairsPerBody = 64;
+int maxBodiesPerCell = 256;  //??
+
+b3GpuGridBroadphase::b3GpuGridBroadphase(cl_context ctx, cl_device_id device, cl_command_queue q)
+	: m_context(ctx),
+	  m_device(device),
+	  m_queue(q),
+	  m_allAabbsGPU1(ctx, q),
+	  m_smallAabbsMappingGPU(ctx, q),
+	  m_largeAabbsMappingGPU(ctx, q),
+	  m_gpuPairs(ctx, q),
+
+	  m_hashGpu(ctx, q),
+
+	  m_cellStartGpu(ctx, q),
+	  m_paramsGPU(ctx, q)
+{
+	b3Vector3 gridSize = b3MakeVector3(3, 3, 3);
+	b3Vector3 invGridSize = b3MakeVector3(1.f / gridSize[0], 1.f / gridSize[1], 1.f / gridSize[2]);
+
+	m_paramsCPU.m_gridSize[0] = 128;
+	m_paramsCPU.m_gridSize[1] = 128;
+	m_paramsCPU.m_gridSize[2] = 128;
+	m_paramsCPU.m_gridSize[3] = maxBodiesPerCell;
+	m_paramsCPU.setMaxBodiesPerCell(maxBodiesPerCell);
+	m_paramsCPU.m_invCellSize[0] = invGridSize[0];
+	m_paramsCPU.m_invCellSize[1] = invGridSize[1];
+	m_paramsCPU.m_invCellSize[2] = invGridSize[2];
+	m_paramsCPU.m_invCellSize[3] = 0.f;
+	m_paramsGPU.push_back(m_paramsCPU);
+
+	cl_int errNum = 0;
+
+	{
+		const char* sapSrc = sapCL;
+		cl_program sapProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, sapSrc, &errNum, "", B3_BROADPHASE_SAP_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+		m_copyAabbsKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "copyAabbsKernel", &errNum, sapProg);
+		m_sap2Kernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "computePairsKernelTwoArrays", &errNum, sapProg);
+		b3Assert(errNum == CL_SUCCESS);
+	}
+
+	{
+		cl_program gridProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, gridBroadphaseCL, &errNum, "", B3_GRID_BROADPHASE_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+
+		kCalcHashAABB = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, gridBroadphaseCL, "kCalcHashAABB", &errNum, gridProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		kClearCellStart = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, gridBroadphaseCL, "kClearCellStart", &errNum, gridProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		kFindCellStart = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, gridBroadphaseCL, "kFindCellStart", &errNum, gridProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		kFindOverlappingPairs = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, gridBroadphaseCL, "kFindOverlappingPairs", &errNum, gridProg);
+		b3Assert(errNum == CL_SUCCESS);
+	}
+
+	m_sorter = new b3RadixSort32CL(m_context, m_device, m_queue);
+}
+b3GpuGridBroadphase::~b3GpuGridBroadphase()
+{
+	clReleaseKernel(kCalcHashAABB);
+	clReleaseKernel(kClearCellStart);
+	clReleaseKernel(kFindCellStart);
+	clReleaseKernel(kFindOverlappingPairs);
+	clReleaseKernel(m_sap2Kernel);
+	clReleaseKernel(m_copyAabbsKernel);
+
+	delete m_sorter;
+}
+
+void b3GpuGridBroadphase::createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask)
+{
+	b3SapAabb aabb;
+	aabb.m_minVec = aabbMin;
+	aabb.m_maxVec = aabbMax;
+	aabb.m_minIndices[3] = userPtr;
+	aabb.m_signedMaxIndices[3] = m_allAabbsCPU1.size();  //NOT userPtr;
+	m_smallAabbsMappingCPU.push_back(m_allAabbsCPU1.size());
+
+	m_allAabbsCPU1.push_back(aabb);
+}
+void b3GpuGridBroadphase::createLargeProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask)
+{
+	b3SapAabb aabb;
+	aabb.m_minVec = aabbMin;
+	aabb.m_maxVec = aabbMax;
+	aabb.m_minIndices[3] = userPtr;
+	aabb.m_signedMaxIndices[3] = m_allAabbsCPU1.size();  //NOT userPtr;
+	m_largeAabbsMappingCPU.push_back(m_allAabbsCPU1.size());
+
+	m_allAabbsCPU1.push_back(aabb);
+}
+
+void b3GpuGridBroadphase::calculateOverlappingPairs(int maxPairs)
+{
+	B3_PROFILE("b3GpuGridBroadphase::calculateOverlappingPairs");
+
+	if (0)
+	{
+		calculateOverlappingPairsHost(maxPairs);
+		/*
+		b3AlignedObjectArray<b3Int4> cpuPairs;
+		m_gpuPairs.copyToHost(cpuPairs);
+		printf("host m_gpuPairs.size()=%d\n",m_gpuPairs.size());
+		for (int i=0;i<m_gpuPairs.size();i++)
+		{
+			printf("host pair %d = %d,%d\n",i,cpuPairs[i].x,cpuPairs[i].y);
+		}
+		*/
+		return;
+	}
+
+	int numSmallAabbs = m_smallAabbsMappingGPU.size();
+
+	b3OpenCLArray<int> pairCount(m_context, m_queue);
+	pairCount.push_back(0);
+	m_gpuPairs.resize(maxPairs);  //numSmallAabbs*maxPairsPerBody);
+
+	{
+		int numLargeAabbs = m_largeAabbsMappingGPU.size();
+		if (numLargeAabbs && numSmallAabbs)
+		{
+			B3_PROFILE("sap2Kernel");
+			b3BufferInfoCL bInfo[] = {
+				b3BufferInfoCL(m_allAabbsGPU1.getBufferCL()),
+				b3BufferInfoCL(m_largeAabbsMappingGPU.getBufferCL()),
+				b3BufferInfoCL(m_smallAabbsMappingGPU.getBufferCL()),
+				b3BufferInfoCL(m_gpuPairs.getBufferCL()),
+				b3BufferInfoCL(pairCount.getBufferCL())};
+			b3LauncherCL launcher(m_queue, m_sap2Kernel, "m_sap2Kernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numLargeAabbs);
+			launcher.setConst(numSmallAabbs);
+			launcher.setConst(0);  //axis is not used
+			launcher.setConst(maxPairs);
+			//@todo: use actual maximum work item sizes of the device instead of hardcoded values
+			launcher.launch2D(numLargeAabbs, numSmallAabbs, 4, 64);
+
+			int numPairs = pairCount.at(0);
+
+			if (numPairs > maxPairs)
+			{
+				b3Error("Error running out of pairs: numPairs = %d, maxPairs = %d.\n", numPairs, maxPairs);
+				numPairs = maxPairs;
+			}
+		}
+	}
+
+	if (numSmallAabbs)
+	{
+		B3_PROFILE("gridKernel");
+		m_hashGpu.resize(numSmallAabbs);
+		{
+			B3_PROFILE("kCalcHashAABB");
+			b3LauncherCL launch(m_queue, kCalcHashAABB, "kCalcHashAABB");
+			launch.setConst(numSmallAabbs);
+			launch.setBuffer(m_allAabbsGPU1.getBufferCL());
+			launch.setBuffer(m_smallAabbsMappingGPU.getBufferCL());
+			launch.setBuffer(m_hashGpu.getBufferCL());
+			launch.setBuffer(this->m_paramsGPU.getBufferCL());
+			launch.launch1D(numSmallAabbs);
+		}
+
+		m_sorter->execute(m_hashGpu);
+
+		int numCells = this->m_paramsCPU.m_gridSize[0] * this->m_paramsCPU.m_gridSize[1] * this->m_paramsCPU.m_gridSize[2];
+		m_cellStartGpu.resize(numCells);
+		//b3AlignedObjectArray<int >			cellStartCpu;
+
+		{
+			B3_PROFILE("kClearCellStart");
+			b3LauncherCL launch(m_queue, kClearCellStart, "kClearCellStart");
+			launch.setConst(numCells);
+			launch.setBuffer(m_cellStartGpu.getBufferCL());
+			launch.launch1D(numCells);
+			//m_cellStartGpu.copyToHost(cellStartCpu);
+			//printf("??\n");
+		}
+
+		{
+			B3_PROFILE("kFindCellStart");
+			b3LauncherCL launch(m_queue, kFindCellStart, "kFindCellStart");
+			launch.setConst(numSmallAabbs);
+			launch.setBuffer(m_hashGpu.getBufferCL());
+			launch.setBuffer(m_cellStartGpu.getBufferCL());
+			launch.launch1D(numSmallAabbs);
+			//m_cellStartGpu.copyToHost(cellStartCpu);
+			//printf("??\n");
+		}
+
+		{
+			B3_PROFILE("kFindOverlappingPairs");
+
+			b3LauncherCL launch(m_queue, kFindOverlappingPairs, "kFindOverlappingPairs");
+			launch.setConst(numSmallAabbs);
+			launch.setBuffer(m_allAabbsGPU1.getBufferCL());
+			launch.setBuffer(m_smallAabbsMappingGPU.getBufferCL());
+			launch.setBuffer(m_hashGpu.getBufferCL());
+			launch.setBuffer(m_cellStartGpu.getBufferCL());
+
+			launch.setBuffer(m_paramsGPU.getBufferCL());
+			//launch.setBuffer(0);
+			launch.setBuffer(pairCount.getBufferCL());
+			launch.setBuffer(m_gpuPairs.getBufferCL());
+
+			launch.setConst(maxPairs);
+			launch.launch1D(numSmallAabbs);
+
+			int numPairs = pairCount.at(0);
+			if (numPairs > maxPairs)
+			{
+				b3Error("Error running out of pairs: numPairs = %d, maxPairs = %d.\n", numPairs, maxPairs);
+				numPairs = maxPairs;
+			}
+
+			m_gpuPairs.resize(numPairs);
+
+			if (0)
+			{
+				b3AlignedObjectArray<b3Int4> pairsCpu;
+				m_gpuPairs.copyToHost(pairsCpu);
+
+				int sz = m_gpuPairs.size();
+				printf("m_gpuPairs.size()=%d\n", sz);
+				for (int i = 0; i < m_gpuPairs.size(); i++)
+				{
+					printf("pair %d = %d,%d\n", i, pairsCpu[i].x, pairsCpu[i].y);
+				}
+
+				printf("?!?\n");
+			}
+		}
+	}
+
+	//calculateOverlappingPairsHost(maxPairs);
+}
+void b3GpuGridBroadphase::calculateOverlappingPairsHost(int maxPairs)
+{
+	m_hostPairs.resize(0);
+	m_allAabbsGPU1.copyToHost(m_allAabbsCPU1);
+	for (int i = 0; i < m_allAabbsCPU1.size(); i++)
+	{
+		for (int j = i + 1; j < m_allAabbsCPU1.size(); j++)
+		{
+			if (b3TestAabbAgainstAabb2(m_allAabbsCPU1[i].m_minVec, m_allAabbsCPU1[i].m_maxVec,
+									   m_allAabbsCPU1[j].m_minVec, m_allAabbsCPU1[j].m_maxVec))
+			{
+				b3Int4 pair;
+				int a = m_allAabbsCPU1[j].m_minIndices[3];
+				int b = m_allAabbsCPU1[i].m_minIndices[3];
+				if (a <= b)
+				{
+					pair.x = a;
+					pair.y = b;  //store the original index in the unsorted aabb array
+				}
+				else
+				{
+					pair.x = b;
+					pair.y = a;  //store the original index in the unsorted aabb array
+				}
+
+				if (m_hostPairs.size() < maxPairs)
+				{
+					m_hostPairs.push_back(pair);
+				}
+			}
+		}
+	}
+
+	m_gpuPairs.copyFromHost(m_hostPairs);
+}
+
+//call writeAabbsToGpu after done making all changes (createProxy etc)
+void b3GpuGridBroadphase::writeAabbsToGpu()
+{
+	m_allAabbsGPU1.copyFromHost(m_allAabbsCPU1);
+	m_smallAabbsMappingGPU.copyFromHost(m_smallAabbsMappingCPU);
+	m_largeAabbsMappingGPU.copyFromHost(m_largeAabbsMappingCPU);
+}
+
+cl_mem b3GpuGridBroadphase::getAabbBufferWS()
+{
+	return this->m_allAabbsGPU1.getBufferCL();
+}
+int b3GpuGridBroadphase::getNumOverlap()
+{
+	return m_gpuPairs.size();
+}
+cl_mem b3GpuGridBroadphase::getOverlappingPairBuffer()
+{
+	return m_gpuPairs.getBufferCL();
+}
+
+b3OpenCLArray<b3SapAabb>& b3GpuGridBroadphase::getAllAabbsGPU()
+{
+	return m_allAabbsGPU1;
+}
+
+b3AlignedObjectArray<b3SapAabb>& b3GpuGridBroadphase::getAllAabbsCPU()
+{
+	return m_allAabbsCPU1;
+}
+
+b3OpenCLArray<b3Int4>& b3GpuGridBroadphase::getOverlappingPairsGPU()
+{
+	return m_gpuPairs;
+}
+b3OpenCLArray<int>& b3GpuGridBroadphase::getSmallAabbIndicesGPU()
+{
+	return m_smallAabbsMappingGPU;
+}
+b3OpenCLArray<int>& b3GpuGridBroadphase::getLargeAabbIndicesGPU()
+{
+	return m_largeAabbsMappingGPU;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.h
new file mode 100644
index 0000000..b76cb43
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.h
@@ -0,0 +1,80 @@
+#ifndef B3_GPU_GRID_BROADPHASE_H
+#define B3_GPU_GRID_BROADPHASE_H
+
+#include "b3GpuBroadphaseInterface.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h"
+
+struct b3ParamsGridBroadphaseCL
+{
+	float m_invCellSize[4];
+	int m_gridSize[4];
+
+	int getMaxBodiesPerCell() const
+	{
+		return m_gridSize[3];
+	}
+
+	void setMaxBodiesPerCell(int maxOverlap)
+	{
+		m_gridSize[3] = maxOverlap;
+	}
+};
+
+class b3GpuGridBroadphase : public b3GpuBroadphaseInterface
+{
+protected:
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+
+	b3OpenCLArray<b3SapAabb> m_allAabbsGPU1;
+	b3AlignedObjectArray<b3SapAabb> m_allAabbsCPU1;
+
+	b3OpenCLArray<int> m_smallAabbsMappingGPU;
+	b3AlignedObjectArray<int> m_smallAabbsMappingCPU;
+
+	b3OpenCLArray<int> m_largeAabbsMappingGPU;
+	b3AlignedObjectArray<int> m_largeAabbsMappingCPU;
+
+	b3AlignedObjectArray<b3Int4> m_hostPairs;
+	b3OpenCLArray<b3Int4> m_gpuPairs;
+
+	b3OpenCLArray<b3SortData> m_hashGpu;
+	b3OpenCLArray<int> m_cellStartGpu;
+
+	b3ParamsGridBroadphaseCL m_paramsCPU;
+	b3OpenCLArray<b3ParamsGridBroadphaseCL> m_paramsGPU;
+
+	class b3RadixSort32CL* m_sorter;
+
+public:
+	b3GpuGridBroadphase(cl_context ctx, cl_device_id device, cl_command_queue q);
+	virtual ~b3GpuGridBroadphase();
+
+	static b3GpuBroadphaseInterface* CreateFunc(cl_context ctx, cl_device_id device, cl_command_queue q)
+	{
+		return new b3GpuGridBroadphase(ctx, device, q);
+	}
+
+	virtual void createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask);
+	virtual void createLargeProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask);
+
+	virtual void calculateOverlappingPairs(int maxPairs);
+	virtual void calculateOverlappingPairsHost(int maxPairs);
+
+	//call writeAabbsToGpu after done making all changes (createProxy etc)
+	virtual void writeAabbsToGpu();
+
+	virtual cl_mem getAabbBufferWS();
+	virtual int getNumOverlap();
+	virtual cl_mem getOverlappingPairBuffer();
+
+	virtual b3OpenCLArray<b3SapAabb>& getAllAabbsGPU();
+	virtual b3AlignedObjectArray<b3SapAabb>& getAllAabbsCPU();
+
+	virtual b3OpenCLArray<b3Int4>& getOverlappingPairsGPU();
+	virtual b3OpenCLArray<int>& getSmallAabbIndicesGPU();
+	virtual b3OpenCLArray<int>& getLargeAabbIndicesGPU();
+};
+
+#endif  //B3_GPU_GRID_BROADPHASE_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.cpp
new file mode 100644
index 0000000..616fc34
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.cpp
@@ -0,0 +1,557 @@
+/*
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Initial Author Jackson Lee, 2014
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+
+#include "b3GpuParallelLinearBvh.h"
+
+b3GpuParallelLinearBvh::b3GpuParallelLinearBvh(cl_context context, cl_device_id device, cl_command_queue queue) : m_queue(queue),
+																												  m_radixSorter(context, device, queue),
+
+																												  m_rootNodeIndex(context, queue),
+																												  m_maxDistanceFromRoot(context, queue),
+																												  m_temp(context, queue),
+
+																												  m_internalNodeAabbs(context, queue),
+																												  m_internalNodeLeafIndexRanges(context, queue),
+																												  m_internalNodeChildNodes(context, queue),
+																												  m_internalNodeParentNodes(context, queue),
+
+																												  m_commonPrefixes(context, queue),
+																												  m_commonPrefixLengths(context, queue),
+																												  m_distanceFromRoot(context, queue),
+
+																												  m_leafNodeParentNodes(context, queue),
+																												  m_mortonCodesAndAabbIndicies(context, queue),
+																												  m_mergedAabb(context, queue),
+																												  m_leafNodeAabbs(context, queue),
+
+																												  m_largeAabbs(context, queue)
+{
+	m_rootNodeIndex.resize(1);
+	m_maxDistanceFromRoot.resize(1);
+	m_temp.resize(1);
+
+	//
+	const char CL_PROGRAM_PATH[] = "src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl";
+
+	const char* kernelSource = parallelLinearBvhCL;  //parallelLinearBvhCL.h
+	cl_int error;
+	char* additionalMacros = 0;
+	m_parallelLinearBvhProgram = b3OpenCLUtils::compileCLProgramFromString(context, device, kernelSource, &error, additionalMacros, CL_PROGRAM_PATH);
+	b3Assert(m_parallelLinearBvhProgram);
+
+	m_separateAabbsKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "separateAabbs", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_separateAabbsKernel);
+	m_findAllNodesMergedAabbKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "findAllNodesMergedAabb", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_findAllNodesMergedAabbKernel);
+	m_assignMortonCodesAndAabbIndiciesKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "assignMortonCodesAndAabbIndicies", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_assignMortonCodesAndAabbIndiciesKernel);
+
+	m_computeAdjacentPairCommonPrefixKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "computeAdjacentPairCommonPrefix", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_computeAdjacentPairCommonPrefixKernel);
+	m_buildBinaryRadixTreeLeafNodesKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "buildBinaryRadixTreeLeafNodes", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_buildBinaryRadixTreeLeafNodesKernel);
+	m_buildBinaryRadixTreeInternalNodesKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "buildBinaryRadixTreeInternalNodes", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_buildBinaryRadixTreeInternalNodesKernel);
+	m_findDistanceFromRootKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "findDistanceFromRoot", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_findDistanceFromRootKernel);
+	m_buildBinaryRadixTreeAabbsRecursiveKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "buildBinaryRadixTreeAabbsRecursive", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_buildBinaryRadixTreeAabbsRecursiveKernel);
+
+	m_findLeafIndexRangesKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "findLeafIndexRanges", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_findLeafIndexRangesKernel);
+
+	m_plbvhCalculateOverlappingPairsKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "plbvhCalculateOverlappingPairs", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_plbvhCalculateOverlappingPairsKernel);
+	m_plbvhRayTraverseKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "plbvhRayTraverse", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_plbvhRayTraverseKernel);
+	m_plbvhLargeAabbAabbTestKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "plbvhLargeAabbAabbTest", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_plbvhLargeAabbAabbTestKernel);
+	m_plbvhLargeAabbRayTestKernel = b3OpenCLUtils::compileCLKernelFromString(context, device, kernelSource, "plbvhLargeAabbRayTest", &error, m_parallelLinearBvhProgram, additionalMacros);
+	b3Assert(m_plbvhLargeAabbRayTestKernel);
+}
+
+b3GpuParallelLinearBvh::~b3GpuParallelLinearBvh()
+{
+	clReleaseKernel(m_separateAabbsKernel);
+	clReleaseKernel(m_findAllNodesMergedAabbKernel);
+	clReleaseKernel(m_assignMortonCodesAndAabbIndiciesKernel);
+
+	clReleaseKernel(m_computeAdjacentPairCommonPrefixKernel);
+	clReleaseKernel(m_buildBinaryRadixTreeLeafNodesKernel);
+	clReleaseKernel(m_buildBinaryRadixTreeInternalNodesKernel);
+	clReleaseKernel(m_findDistanceFromRootKernel);
+	clReleaseKernel(m_buildBinaryRadixTreeAabbsRecursiveKernel);
+
+	clReleaseKernel(m_findLeafIndexRangesKernel);
+
+	clReleaseKernel(m_plbvhCalculateOverlappingPairsKernel);
+	clReleaseKernel(m_plbvhRayTraverseKernel);
+	clReleaseKernel(m_plbvhLargeAabbAabbTestKernel);
+	clReleaseKernel(m_plbvhLargeAabbRayTestKernel);
+
+	clReleaseProgram(m_parallelLinearBvhProgram);
+}
+
+void b3GpuParallelLinearBvh::build(const b3OpenCLArray<b3SapAabb>& worldSpaceAabbs, const b3OpenCLArray<int>& smallAabbIndices,
+								   const b3OpenCLArray<int>& largeAabbIndices)
+{
+	B3_PROFILE("b3ParallelLinearBvh::build()");
+
+	int numLargeAabbs = largeAabbIndices.size();
+	int numSmallAabbs = smallAabbIndices.size();
+
+	//Since all AABBs(both large and small) are input as a contiguous array,
+	//with 2 additional arrays used to indicate the indices of large and small AABBs,
+	//it is necessary to separate the AABBs so that the large AABBs will not degrade the quality of the BVH.
+	{
+		B3_PROFILE("Separate large and small AABBs");
+
+		m_largeAabbs.resize(numLargeAabbs);
+		m_leafNodeAabbs.resize(numSmallAabbs);
+
+		//Write large AABBs into m_largeAabbs
+		{
+			b3BufferInfoCL bufferInfo[] =
+				{
+					b3BufferInfoCL(worldSpaceAabbs.getBufferCL()),
+					b3BufferInfoCL(largeAabbIndices.getBufferCL()),
+
+					b3BufferInfoCL(m_largeAabbs.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_separateAabbsKernel, "m_separateAabbsKernel");
+			launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numLargeAabbs);
+
+			launcher.launch1D(numLargeAabbs);
+		}
+
+		//Write small AABBs into m_leafNodeAabbs
+		{
+			b3BufferInfoCL bufferInfo[] =
+				{
+					b3BufferInfoCL(worldSpaceAabbs.getBufferCL()),
+					b3BufferInfoCL(smallAabbIndices.getBufferCL()),
+
+					b3BufferInfoCL(m_leafNodeAabbs.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_separateAabbsKernel, "m_separateAabbsKernel");
+			launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numSmallAabbs);
+
+			launcher.launch1D(numSmallAabbs);
+		}
+
+		clFinish(m_queue);
+	}
+
+	//
+	int numLeaves = numSmallAabbs;  //Number of leaves in the BVH == Number of rigid bodies with small AABBs
+	int numInternalNodes = numLeaves - 1;
+
+	if (numLeaves < 2)
+	{
+		//Number of leaf nodes is checked in calculateOverlappingPairs() and testRaysAgainstBvhAabbs(),
+		//so it does not matter if numLeaves == 0 and rootNodeIndex == -1
+		int rootNodeIndex = numLeaves - 1;
+		m_rootNodeIndex.copyFromHostPointer(&rootNodeIndex, 1);
+
+		//Since the AABBs need to be rearranged(sorted) for the BVH construction algorithm,
+		//m_mortonCodesAndAabbIndicies.m_value is used to map a sorted AABB index to the unsorted AABB index
+		//instead of directly moving the AABBs. It needs to be set for the ray cast traversal kernel to work.
+		//( m_mortonCodesAndAabbIndicies[].m_value == unsorted index == index of m_leafNodeAabbs )
+		if (numLeaves == 1)
+		{
+			b3SortData leaf;
+			leaf.m_value = 0;  //1 leaf so index is always 0; leaf.m_key does not need to be set
+
+			m_mortonCodesAndAabbIndicies.resize(1);
+			m_mortonCodesAndAabbIndicies.copyFromHostPointer(&leaf, 1);
+		}
+
+		return;
+	}
+
+	//
+	{
+		m_internalNodeAabbs.resize(numInternalNodes);
+		m_internalNodeLeafIndexRanges.resize(numInternalNodes);
+		m_internalNodeChildNodes.resize(numInternalNodes);
+		m_internalNodeParentNodes.resize(numInternalNodes);
+
+		m_commonPrefixes.resize(numInternalNodes);
+		m_commonPrefixLengths.resize(numInternalNodes);
+		m_distanceFromRoot.resize(numInternalNodes);
+
+		m_leafNodeParentNodes.resize(numLeaves);
+		m_mortonCodesAndAabbIndicies.resize(numLeaves);
+		m_mergedAabb.resize(numLeaves);
+	}
+
+	//Find the merged AABB of all small AABBs; this is used to define the size of
+	//each cell in the virtual grid for the next kernel(2^10 cells in each dimension).
+	{
+		B3_PROFILE("Find AABB of merged nodes");
+
+		m_mergedAabb.copyFromOpenCLArray(m_leafNodeAabbs);  //Need to make a copy since the kernel modifies the array
+
+		for (int numAabbsNeedingMerge = numLeaves; numAabbsNeedingMerge >= 2;
+			 numAabbsNeedingMerge = numAabbsNeedingMerge / 2 + numAabbsNeedingMerge % 2)
+		{
+			b3BufferInfoCL bufferInfo[] =
+				{
+					b3BufferInfoCL(m_mergedAabb.getBufferCL())  //Resulting AABB is stored in m_mergedAabb[0]
+				};
+
+			b3LauncherCL launcher(m_queue, m_findAllNodesMergedAabbKernel, "m_findAllNodesMergedAabbKernel");
+			launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numAabbsNeedingMerge);
+
+			launcher.launch1D(numAabbsNeedingMerge);
+		}
+
+		clFinish(m_queue);
+	}
+
+	//Insert the center of the AABBs into a virtual grid,
+	//then convert the discrete grid coordinates into a morton code
+	//For each element in m_mortonCodesAndAabbIndicies, set
+	//	m_key == morton code (value to sort by)
+	//	m_value == small AABB index
+	{
+		B3_PROFILE("Assign morton codes");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_leafNodeAabbs.getBufferCL()),
+				b3BufferInfoCL(m_mergedAabb.getBufferCL()),
+				b3BufferInfoCL(m_mortonCodesAndAabbIndicies.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_assignMortonCodesAndAabbIndiciesKernel, "m_assignMortonCodesAndAabbIndiciesKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(numLeaves);
+
+		launcher.launch1D(numLeaves);
+		clFinish(m_queue);
+	}
+
+	//
+	{
+		B3_PROFILE("Sort leaves by morton codes");
+
+		m_radixSorter.execute(m_mortonCodesAndAabbIndicies);
+		clFinish(m_queue);
+	}
+
+	//
+	constructBinaryRadixTree();
+
+	//Since it is a sorted binary radix tree, each internal node contains a contiguous subset of leaf node indices.
+	//The root node contains leaf node indices in the range [0, numLeafNodes - 1].
+	//The child nodes of each node split their parent's index range into 2 contiguous halves.
+	//
+	//For example, if the root has indices [0, 31], its children might partition that range into [0, 11] and [12, 31].
+	//The next level in the tree could then split those ranges into [0, 2], [3, 11], [12, 22], and [23, 31].
+	//
+	//This property can be used for optimizing calculateOverlappingPairs(), to avoid testing each AABB pair twice
+	{
+		B3_PROFILE("m_findLeafIndexRangesKernel");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_internalNodeChildNodes.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeLeafIndexRanges.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_findLeafIndexRangesKernel, "m_findLeafIndexRangesKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(numInternalNodes);
+
+		launcher.launch1D(numInternalNodes);
+		clFinish(m_queue);
+	}
+}
+
+void b3GpuParallelLinearBvh::calculateOverlappingPairs(b3OpenCLArray<b3Int4>& out_overlappingPairs)
+{
+	int maxPairs = out_overlappingPairs.size();
+	b3OpenCLArray<int>& numPairsGpu = m_temp;
+
+	int reset = 0;
+	numPairsGpu.copyFromHostPointer(&reset, 1);
+
+	//
+	if (m_leafNodeAabbs.size() > 1)
+	{
+		B3_PROFILE("PLBVH small-small AABB test");
+
+		int numQueryAabbs = m_leafNodeAabbs.size();
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_leafNodeAabbs.getBufferCL()),
+
+				b3BufferInfoCL(m_rootNodeIndex.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeChildNodes.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeAabbs.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeLeafIndexRanges.getBufferCL()),
+				b3BufferInfoCL(m_mortonCodesAndAabbIndicies.getBufferCL()),
+
+				b3BufferInfoCL(numPairsGpu.getBufferCL()),
+				b3BufferInfoCL(out_overlappingPairs.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_plbvhCalculateOverlappingPairsKernel, "m_plbvhCalculateOverlappingPairsKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(maxPairs);
+		launcher.setConst(numQueryAabbs);
+
+		launcher.launch1D(numQueryAabbs);
+		clFinish(m_queue);
+	}
+
+	int numLargeAabbRigids = m_largeAabbs.size();
+	if (numLargeAabbRigids > 0 && m_leafNodeAabbs.size() > 0)
+	{
+		B3_PROFILE("PLBVH large-small AABB test");
+
+		int numQueryAabbs = m_leafNodeAabbs.size();
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_leafNodeAabbs.getBufferCL()),
+				b3BufferInfoCL(m_largeAabbs.getBufferCL()),
+
+				b3BufferInfoCL(numPairsGpu.getBufferCL()),
+				b3BufferInfoCL(out_overlappingPairs.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_plbvhLargeAabbAabbTestKernel, "m_plbvhLargeAabbAabbTestKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(maxPairs);
+		launcher.setConst(numLargeAabbRigids);
+		launcher.setConst(numQueryAabbs);
+
+		launcher.launch1D(numQueryAabbs);
+		clFinish(m_queue);
+	}
+
+	//
+	int numPairs = -1;
+	numPairsGpu.copyToHostPointer(&numPairs, 1);
+	if (numPairs > maxPairs)
+	{
+		b3Error("Error running out of pairs: numPairs = %d, maxPairs = %d.\n", numPairs, maxPairs);
+		numPairs = maxPairs;
+		numPairsGpu.copyFromHostPointer(&maxPairs, 1);
+	}
+
+	out_overlappingPairs.resize(numPairs);
+}
+
+void b3GpuParallelLinearBvh::testRaysAgainstBvhAabbs(const b3OpenCLArray<b3RayInfo>& rays,
+													 b3OpenCLArray<int>& out_numRayRigidPairs, b3OpenCLArray<b3Int2>& out_rayRigidPairs)
+{
+	B3_PROFILE("PLBVH testRaysAgainstBvhAabbs()");
+
+	int numRays = rays.size();
+	int maxRayRigidPairs = out_rayRigidPairs.size();
+
+	int reset = 0;
+	out_numRayRigidPairs.copyFromHostPointer(&reset, 1);
+
+	//
+	if (m_leafNodeAabbs.size() > 0)
+	{
+		B3_PROFILE("PLBVH ray test small AABB");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_leafNodeAabbs.getBufferCL()),
+
+				b3BufferInfoCL(m_rootNodeIndex.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeChildNodes.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeAabbs.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeLeafIndexRanges.getBufferCL()),
+				b3BufferInfoCL(m_mortonCodesAndAabbIndicies.getBufferCL()),
+
+				b3BufferInfoCL(rays.getBufferCL()),
+
+				b3BufferInfoCL(out_numRayRigidPairs.getBufferCL()),
+				b3BufferInfoCL(out_rayRigidPairs.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_plbvhRayTraverseKernel, "m_plbvhRayTraverseKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(maxRayRigidPairs);
+		launcher.setConst(numRays);
+
+		launcher.launch1D(numRays);
+		clFinish(m_queue);
+	}
+
+	int numLargeAabbRigids = m_largeAabbs.size();
+	if (numLargeAabbRigids > 0)
+	{
+		B3_PROFILE("PLBVH ray test large AABB");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_largeAabbs.getBufferCL()),
+				b3BufferInfoCL(rays.getBufferCL()),
+
+				b3BufferInfoCL(out_numRayRigidPairs.getBufferCL()),
+				b3BufferInfoCL(out_rayRigidPairs.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_plbvhLargeAabbRayTestKernel, "m_plbvhLargeAabbRayTestKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(numLargeAabbRigids);
+		launcher.setConst(maxRayRigidPairs);
+		launcher.setConst(numRays);
+
+		launcher.launch1D(numRays);
+		clFinish(m_queue);
+	}
+
+	//
+	int numRayRigidPairs = -1;
+	out_numRayRigidPairs.copyToHostPointer(&numRayRigidPairs, 1);
+
+	if (numRayRigidPairs > maxRayRigidPairs)
+		b3Error("Error running out of rayRigid pairs: numRayRigidPairs = %d, maxRayRigidPairs = %d.\n", numRayRigidPairs, maxRayRigidPairs);
+}
+
+void b3GpuParallelLinearBvh::constructBinaryRadixTree()
+{
+	B3_PROFILE("b3GpuParallelLinearBvh::constructBinaryRadixTree()");
+
+	int numLeaves = m_leafNodeAabbs.size();
+	int numInternalNodes = numLeaves - 1;
+
+	//Each internal node is placed in between 2 leaf nodes.
+	//By using this arrangement and computing the common prefix between
+	//these 2 adjacent leaf nodes, it is possible to quickly construct a binary radix tree.
+	{
+		B3_PROFILE("m_computeAdjacentPairCommonPrefixKernel");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_mortonCodesAndAabbIndicies.getBufferCL()),
+				b3BufferInfoCL(m_commonPrefixes.getBufferCL()),
+				b3BufferInfoCL(m_commonPrefixLengths.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_computeAdjacentPairCommonPrefixKernel, "m_computeAdjacentPairCommonPrefixKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(numInternalNodes);
+
+		launcher.launch1D(numInternalNodes);
+		clFinish(m_queue);
+	}
+
+	//For each leaf node, select its parent node by
+	//comparing the 2 nearest internal nodes and assign child node indices
+	{
+		B3_PROFILE("m_buildBinaryRadixTreeLeafNodesKernel");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_commonPrefixLengths.getBufferCL()),
+				b3BufferInfoCL(m_leafNodeParentNodes.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeChildNodes.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_buildBinaryRadixTreeLeafNodesKernel, "m_buildBinaryRadixTreeLeafNodesKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(numLeaves);
+
+		launcher.launch1D(numLeaves);
+		clFinish(m_queue);
+	}
+
+	//For each internal node, perform 2 binary searches among the other internal nodes
+	//to its left and right to find its potential parent nodes and assign child node indices
+	{
+		B3_PROFILE("m_buildBinaryRadixTreeInternalNodesKernel");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_commonPrefixes.getBufferCL()),
+				b3BufferInfoCL(m_commonPrefixLengths.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeChildNodes.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeParentNodes.getBufferCL()),
+				b3BufferInfoCL(m_rootNodeIndex.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_buildBinaryRadixTreeInternalNodesKernel, "m_buildBinaryRadixTreeInternalNodesKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(numInternalNodes);
+
+		launcher.launch1D(numInternalNodes);
+		clFinish(m_queue);
+	}
+
+	//Find the number of nodes separating each internal node and the root node
+	//so that the AABBs can be set using the next kernel.
+	//Also determine the maximum number of nodes separating an internal node and the root node.
+	{
+		B3_PROFILE("m_findDistanceFromRootKernel");
+
+		b3BufferInfoCL bufferInfo[] =
+			{
+				b3BufferInfoCL(m_rootNodeIndex.getBufferCL()),
+				b3BufferInfoCL(m_internalNodeParentNodes.getBufferCL()),
+				b3BufferInfoCL(m_maxDistanceFromRoot.getBufferCL()),
+				b3BufferInfoCL(m_distanceFromRoot.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_findDistanceFromRootKernel, "m_findDistanceFromRootKernel");
+		launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(numInternalNodes);
+
+		launcher.launch1D(numInternalNodes);
+		clFinish(m_queue);
+	}
+
+	//Starting from the internal nodes nearest to the leaf nodes, recursively move up
+	//the tree towards the root to set the AABBs of each internal node; each internal node
+	//checks its children and merges their AABBs
+	{
+		B3_PROFILE("m_buildBinaryRadixTreeAabbsRecursiveKernel");
+
+		int maxDistanceFromRoot = -1;
+		{
+			B3_PROFILE("copy maxDistanceFromRoot to CPU");
+			m_maxDistanceFromRoot.copyToHostPointer(&maxDistanceFromRoot, 1);
+			clFinish(m_queue);
+		}
+
+		for (int distanceFromRoot = maxDistanceFromRoot; distanceFromRoot >= 0; --distanceFromRoot)
+		{
+			b3BufferInfoCL bufferInfo[] =
+				{
+					b3BufferInfoCL(m_distanceFromRoot.getBufferCL()),
+					b3BufferInfoCL(m_mortonCodesAndAabbIndicies.getBufferCL()),
+					b3BufferInfoCL(m_internalNodeChildNodes.getBufferCL()),
+					b3BufferInfoCL(m_leafNodeAabbs.getBufferCL()),
+					b3BufferInfoCL(m_internalNodeAabbs.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_buildBinaryRadixTreeAabbsRecursiveKernel, "m_buildBinaryRadixTreeAabbsRecursiveKernel");
+			launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(maxDistanceFromRoot);
+			launcher.setConst(distanceFromRoot);
+			launcher.setConst(numInternalNodes);
+
+			//It may seem inefficent to launch a thread for each internal node when a
+			//much smaller number of nodes is actually processed, but this is actually
+			//faster than determining the exact nodes that are ready to merge their child AABBs.
+			launcher.launch1D(numInternalNodes);
+		}
+
+		clFinish(m_queue);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h
new file mode 100644
index 0000000..b390775
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h
@@ -0,0 +1,125 @@
+/*
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Initial Author Jackson Lee, 2014
+
+#ifndef B3_GPU_PARALLEL_LINEAR_BVH_H
+#define B3_GPU_PARALLEL_LINEAR_BVH_H
+
+//#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h"
+#include "Bullet3Common/shared/b3Int2.h"
+#include "Bullet3Common/shared/b3Int4.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3FillCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h"
+
+#include "Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvhKernels.h"
+
+#define b3Int64 cl_long
+
+///@brief GPU Parallel Linearized Bounding Volume Heirarchy(LBVH) that is reconstructed every frame
+///@remarks
+///See presentation in docs/b3GpuParallelLinearBvh.pdf for algorithm details.
+///@par
+///Related papers: \n
+///"Fast BVH Construction on GPUs" [Lauterbach et al. 2009] \n
+///"Maximizing Parallelism in the Construction of BVHs, Octrees, and k-d trees" [Karras 2012] \n
+///@par
+///The basic algorithm for building the BVH as presented in [Lauterbach et al. 2009] consists of 4 stages:
+/// - [fully parallel] Assign morton codes for each AABB using its center (after quantizing the AABB centers into a virtual grid)
+/// - [fully parallel] Sort morton codes
+/// - [somewhat parallel] Build binary radix tree (assign parent/child pointers for internal nodes of the BVH)
+/// - [somewhat parallel] Set internal node AABBs
+///@par
+///[Karras 2012] improves on the algorithm by introducing fully parallel methods for the last 2 stages.
+///The BVH implementation here shares many concepts with [Karras 2012], but a different method is used for constructing the tree.
+///Instead of searching for the child nodes of each internal node, we search for the parent node of each node.
+///Additionally, a non-atomic traversal that starts from the leaf nodes and moves towards the root node is used to set the AABBs.
+class b3GpuParallelLinearBvh
+{
+	cl_command_queue m_queue;
+
+	cl_program m_parallelLinearBvhProgram;
+
+	cl_kernel m_separateAabbsKernel;
+	cl_kernel m_findAllNodesMergedAabbKernel;
+	cl_kernel m_assignMortonCodesAndAabbIndiciesKernel;
+
+	//Binary radix tree construction kernels
+	cl_kernel m_computeAdjacentPairCommonPrefixKernel;
+	cl_kernel m_buildBinaryRadixTreeLeafNodesKernel;
+	cl_kernel m_buildBinaryRadixTreeInternalNodesKernel;
+	cl_kernel m_findDistanceFromRootKernel;
+	cl_kernel m_buildBinaryRadixTreeAabbsRecursiveKernel;
+
+	cl_kernel m_findLeafIndexRangesKernel;
+
+	//Traversal kernels
+	cl_kernel m_plbvhCalculateOverlappingPairsKernel;
+	cl_kernel m_plbvhRayTraverseKernel;
+	cl_kernel m_plbvhLargeAabbAabbTestKernel;
+	cl_kernel m_plbvhLargeAabbRayTestKernel;
+
+	b3RadixSort32CL m_radixSorter;
+
+	//1 element
+	b3OpenCLArray<int> m_rootNodeIndex;        //Most significant bit(0x80000000) is set to indicate internal node
+	b3OpenCLArray<int> m_maxDistanceFromRoot;  //Max number of internal nodes between an internal node and the root node
+	b3OpenCLArray<int> m_temp;                 //Used to hold the number of pairs in calculateOverlappingPairs()
+
+	//1 element per internal node (number_of_internal_nodes == number_of_leaves - 1)
+	b3OpenCLArray<b3SapAabb> m_internalNodeAabbs;
+	b3OpenCLArray<b3Int2> m_internalNodeLeafIndexRanges;  //x == min leaf index, y == max leaf index
+	b3OpenCLArray<b3Int2> m_internalNodeChildNodes;       //x == left child, y == right child; msb(0x80000000) is set to indicate internal node
+	b3OpenCLArray<int> m_internalNodeParentNodes;         //For parent node index, msb(0x80000000) is not set since it is always internal
+
+	//1 element per internal node; for binary radix tree construction
+	b3OpenCLArray<b3Int64> m_commonPrefixes;
+	b3OpenCLArray<int> m_commonPrefixLengths;
+	b3OpenCLArray<int> m_distanceFromRoot;  //Number of internal nodes between this node and the root
+
+	//1 element per leaf node (leaf nodes only include small AABBs)
+	b3OpenCLArray<int> m_leafNodeParentNodes;                //For parent node index, msb(0x80000000) is not set since it is always internal
+	b3OpenCLArray<b3SortData> m_mortonCodesAndAabbIndicies;  //m_key == morton code, m_value == aabb index in m_leafNodeAabbs
+	b3OpenCLArray<b3SapAabb> m_mergedAabb;                   //m_mergedAabb[0] contains the merged AABB of all leaf nodes
+	b3OpenCLArray<b3SapAabb> m_leafNodeAabbs;                //Contains only small AABBs
+
+	//1 element per large AABB, which is not stored in the BVH
+	b3OpenCLArray<b3SapAabb> m_largeAabbs;
+
+public:
+	b3GpuParallelLinearBvh(cl_context context, cl_device_id device, cl_command_queue queue);
+	virtual ~b3GpuParallelLinearBvh();
+
+	///Must be called before any other function
+	void build(const b3OpenCLArray<b3SapAabb>& worldSpaceAabbs, const b3OpenCLArray<int>& smallAabbIndices,
+			   const b3OpenCLArray<int>& largeAabbIndices);
+
+	///calculateOverlappingPairs() uses the worldSpaceAabbs parameter of b3GpuParallelLinearBvh::build() as the query AABBs.
+	///@param out_overlappingPairs The size() of this array is used to determine the max number of pairs.
+	///If the number of overlapping pairs is < out_overlappingPairs.size(), out_overlappingPairs is resized.
+	void calculateOverlappingPairs(b3OpenCLArray<b3Int4>& out_overlappingPairs);
+
+	///@param out_numRigidRayPairs Array of length 1; contains the number of detected ray-rigid AABB intersections;
+	///this value may be greater than out_rayRigidPairs.size() if out_rayRigidPairs is not large enough.
+	///@param out_rayRigidPairs Contains an array of rays intersecting rigid AABBs; x == ray index, y == rigid body index.
+	///If the size of this array is insufficient to hold all ray-rigid AABB intersections, additional intersections are discarded.
+	void testRaysAgainstBvhAabbs(const b3OpenCLArray<b3RayInfo>& rays,
+								 b3OpenCLArray<int>& out_numRayRigidPairs, b3OpenCLArray<b3Int2>& out_rayRigidPairs);
+
+private:
+	void constructBinaryRadixTree();
+};
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp
new file mode 100644
index 0000000..62ea7a3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp
@@ -0,0 +1,76 @@
+/*
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Initial Author Jackson Lee, 2014
+
+#include "b3GpuParallelLinearBvhBroadphase.h"
+
+b3GpuParallelLinearBvhBroadphase::b3GpuParallelLinearBvhBroadphase(cl_context context, cl_device_id device, cl_command_queue queue) : m_plbvh(context, device, queue),
+
+																																	  m_overlappingPairsGpu(context, queue),
+
+																																	  m_aabbsGpu(context, queue),
+																																	  m_smallAabbsMappingGpu(context, queue),
+																																	  m_largeAabbsMappingGpu(context, queue)
+{
+}
+
+void b3GpuParallelLinearBvhBroadphase::createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask)
+{
+	int newAabbIndex = m_aabbsCpu.size();
+
+	b3SapAabb aabb;
+	aabb.m_minVec = aabbMin;
+	aabb.m_maxVec = aabbMax;
+
+	aabb.m_minIndices[3] = userPtr;
+	aabb.m_signedMaxIndices[3] = newAabbIndex;
+
+	m_smallAabbsMappingCpu.push_back(newAabbIndex);
+
+	m_aabbsCpu.push_back(aabb);
+}
+void b3GpuParallelLinearBvhBroadphase::createLargeProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask)
+{
+	int newAabbIndex = m_aabbsCpu.size();
+
+	b3SapAabb aabb;
+	aabb.m_minVec = aabbMin;
+	aabb.m_maxVec = aabbMax;
+
+	aabb.m_minIndices[3] = userPtr;
+	aabb.m_signedMaxIndices[3] = newAabbIndex;
+
+	m_largeAabbsMappingCpu.push_back(newAabbIndex);
+
+	m_aabbsCpu.push_back(aabb);
+}
+
+void b3GpuParallelLinearBvhBroadphase::calculateOverlappingPairs(int maxPairs)
+{
+	//Reconstruct BVH
+	m_plbvh.build(m_aabbsGpu, m_smallAabbsMappingGpu, m_largeAabbsMappingGpu);
+
+	//
+	m_overlappingPairsGpu.resize(maxPairs);
+	m_plbvh.calculateOverlappingPairs(m_overlappingPairsGpu);
+}
+void b3GpuParallelLinearBvhBroadphase::calculateOverlappingPairsHost(int maxPairs)
+{
+	b3Assert(0);  //CPU version not implemented
+}
+
+void b3GpuParallelLinearBvhBroadphase::writeAabbsToGpu()
+{
+	m_aabbsGpu.copyFromHost(m_aabbsCpu);
+	m_smallAabbsMappingGpu.copyFromHost(m_smallAabbsMappingCpu);
+	m_largeAabbsMappingGpu.copyFromHost(m_largeAabbsMappingCpu);
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h
new file mode 100644
index 0000000..dda0eea
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h
@@ -0,0 +1,66 @@
+/*
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Initial Author Jackson Lee, 2014
+
+#ifndef B3_GPU_PARALLEL_LINEAR_BVH_BROADPHASE_H
+#define B3_GPU_PARALLEL_LINEAR_BVH_BROADPHASE_H
+
+#include "Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h"
+
+#include "b3GpuParallelLinearBvh.h"
+
+class b3GpuParallelLinearBvhBroadphase : public b3GpuBroadphaseInterface
+{
+	b3GpuParallelLinearBvh m_plbvh;
+
+	b3OpenCLArray<b3Int4> m_overlappingPairsGpu;
+
+	b3OpenCLArray<b3SapAabb> m_aabbsGpu;
+	b3OpenCLArray<int> m_smallAabbsMappingGpu;
+	b3OpenCLArray<int> m_largeAabbsMappingGpu;
+
+	b3AlignedObjectArray<b3SapAabb> m_aabbsCpu;
+	b3AlignedObjectArray<int> m_smallAabbsMappingCpu;
+	b3AlignedObjectArray<int> m_largeAabbsMappingCpu;
+
+public:
+	b3GpuParallelLinearBvhBroadphase(cl_context context, cl_device_id device, cl_command_queue queue);
+	virtual ~b3GpuParallelLinearBvhBroadphase() {}
+
+	virtual void createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask);
+	virtual void createLargeProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask);
+
+	virtual void calculateOverlappingPairs(int maxPairs);
+	virtual void calculateOverlappingPairsHost(int maxPairs);
+
+	//call writeAabbsToGpu after done making all changes (createProxy etc)
+	virtual void writeAabbsToGpu();
+
+	virtual int getNumOverlap() { return m_overlappingPairsGpu.size(); }
+	virtual cl_mem getOverlappingPairBuffer() { return m_overlappingPairsGpu.getBufferCL(); }
+
+	virtual cl_mem getAabbBufferWS() { return m_aabbsGpu.getBufferCL(); }
+	virtual b3OpenCLArray<b3SapAabb>& getAllAabbsGPU() { return m_aabbsGpu; }
+
+	virtual b3OpenCLArray<b3Int4>& getOverlappingPairsGPU() { return m_overlappingPairsGpu; }
+	virtual b3OpenCLArray<int>& getSmallAabbIndicesGPU() { return m_smallAabbsMappingGpu; }
+	virtual b3OpenCLArray<int>& getLargeAabbIndicesGPU() { return m_largeAabbsMappingGpu; }
+
+	virtual b3AlignedObjectArray<b3SapAabb>& getAllAabbsCPU() { return m_aabbsCpu; }
+
+	static b3GpuBroadphaseInterface* CreateFunc(cl_context context, cl_device_id device, cl_command_queue queue)
+	{
+		return new b3GpuParallelLinearBvhBroadphase(context, device, queue);
+	}
+};
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp
new file mode 100644
index 0000000..4126d03
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp
@@ -0,0 +1,1298 @@
+
+bool searchIncremental3dSapOnGpu = true;
+#include <limits.h>
+#include "b3GpuSapBroadphase.h"
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.h"
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "kernels/sapKernels.h"
+
+#include "Bullet3Common/b3MinMax.h"
+
+#define B3_BROADPHASE_SAP_PATH "src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl"
+
+/*
+	
+ 
+	
+	
+	
+ 
+	b3OpenCLArray<int> m_pairCount;
+ 
+ 
+	b3OpenCLArray<b3SapAabb>	m_allAabbsGPU;
+	b3AlignedObjectArray<b3SapAabb>	m_allAabbsCPU;
+ 
+	virtual b3OpenCLArray<b3SapAabb>&	getAllAabbsGPU()
+	{
+ return m_allAabbsGPU;
+	}
+	virtual b3AlignedObjectArray<b3SapAabb>&	getAllAabbsCPU()
+	{
+ return m_allAabbsCPU;
+	}
+ 
+	b3OpenCLArray<b3Vector3>	m_sum;
+	b3OpenCLArray<b3Vector3>	m_sum2;
+	b3OpenCLArray<b3Vector3>	m_dst;
+ 
+	b3OpenCLArray<int>	m_smallAabbsMappingGPU;
+	b3AlignedObjectArray<int> m_smallAabbsMappingCPU;
+ 
+	b3OpenCLArray<int>	m_largeAabbsMappingGPU;
+	b3AlignedObjectArray<int> m_largeAabbsMappingCPU;
+ 
+	
+	b3OpenCLArray<b3Int4>		m_overlappingPairs;
+ 
+	//temporary gpu work memory
+	b3OpenCLArray<b3SortData>	m_gpuSmallSortData;
+	b3OpenCLArray<b3SapAabb>	m_gpuSmallSortedAabbs;
+ 
+	class b3PrefixScanFloat4CL*		m_prefixScanFloat4;
+ */
+
+b3GpuSapBroadphase::b3GpuSapBroadphase(cl_context ctx, cl_device_id device, cl_command_queue q, b3GpuSapKernelType kernelType)
+	: m_context(ctx),
+	  m_device(device),
+	  m_queue(q),
+
+	  m_objectMinMaxIndexGPUaxis0(ctx, q),
+	  m_objectMinMaxIndexGPUaxis1(ctx, q),
+	  m_objectMinMaxIndexGPUaxis2(ctx, q),
+	  m_objectMinMaxIndexGPUaxis0prev(ctx, q),
+	  m_objectMinMaxIndexGPUaxis1prev(ctx, q),
+	  m_objectMinMaxIndexGPUaxis2prev(ctx, q),
+	  m_sortedAxisGPU0(ctx, q),
+	  m_sortedAxisGPU1(ctx, q),
+	  m_sortedAxisGPU2(ctx, q),
+	  m_sortedAxisGPU0prev(ctx, q),
+	  m_sortedAxisGPU1prev(ctx, q),
+	  m_sortedAxisGPU2prev(ctx, q),
+	  m_addedHostPairsGPU(ctx, q),
+	  m_removedHostPairsGPU(ctx, q),
+	  m_addedCountGPU(ctx, q),
+	  m_removedCountGPU(ctx, q),
+	  m_currentBuffer(-1),
+	  m_pairCount(ctx, q),
+	  m_allAabbsGPU(ctx, q),
+	  m_sum(ctx, q),
+	  m_sum2(ctx, q),
+	  m_dst(ctx, q),
+	  m_smallAabbsMappingGPU(ctx, q),
+	  m_largeAabbsMappingGPU(ctx, q),
+	  m_overlappingPairs(ctx, q),
+	  m_gpuSmallSortData(ctx, q),
+	  m_gpuSmallSortedAabbs(ctx, q)
+{
+	const char* sapSrc = sapCL;
+
+	cl_int errNum = 0;
+
+	b3Assert(m_context);
+	b3Assert(m_device);
+	cl_program sapProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, sapSrc, &errNum, "", B3_BROADPHASE_SAP_PATH);
+	b3Assert(errNum == CL_SUCCESS);
+
+	b3Assert(errNum == CL_SUCCESS);
+#ifndef __APPLE__
+	m_prefixScanFloat4 = new b3PrefixScanFloat4CL(m_context, m_device, m_queue);
+#else
+	m_prefixScanFloat4 = 0;
+#endif
+	m_sapKernel = 0;
+
+	switch (kernelType)
+	{
+		case B3_GPU_SAP_KERNEL_BRUTE_FORCE_CPU:
+		{
+			m_sapKernel = 0;
+			break;
+		}
+		case B3_GPU_SAP_KERNEL_BRUTE_FORCE_GPU:
+		{
+			m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "computePairsKernelBruteForce", &errNum, sapProg);
+			break;
+		}
+
+		case B3_GPU_SAP_KERNEL_ORIGINAL:
+		{
+			m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "computePairsKernelOriginal", &errNum, sapProg);
+			break;
+		}
+		case B3_GPU_SAP_KERNEL_BARRIER:
+		{
+			m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "computePairsKernelBarrier", &errNum, sapProg);
+			break;
+		}
+		case B3_GPU_SAP_KERNEL_LOCAL_SHARED_MEMORY:
+		{
+			m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "computePairsKernelLocalSharedMemory", &errNum, sapProg);
+			break;
+		}
+
+		default:
+		{
+			m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "computePairsKernelLocalSharedMemory", &errNum, sapProg);
+			b3Error("Unknown 3D GPU SAP provided, fallback to computePairsKernelLocalSharedMemory");
+		}
+	};
+
+	m_sap2Kernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "computePairsKernelTwoArrays", &errNum, sapProg);
+	b3Assert(errNum == CL_SUCCESS);
+
+	m_prepareSumVarianceKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "prepareSumVarianceKernel", &errNum, sapProg);
+	b3Assert(errNum == CL_SUCCESS);
+
+	m_flipFloatKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "flipFloatKernel", &errNum, sapProg);
+
+	m_copyAabbsKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "copyAabbsKernel", &errNum, sapProg);
+
+	m_scatterKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, sapSrc, "scatterKernel", &errNum, sapProg);
+
+	m_sorter = new b3RadixSort32CL(m_context, m_device, m_queue);
+}
+
+b3GpuSapBroadphase::~b3GpuSapBroadphase()
+{
+	delete m_sorter;
+	delete m_prefixScanFloat4;
+
+	clReleaseKernel(m_scatterKernel);
+	clReleaseKernel(m_flipFloatKernel);
+	clReleaseKernel(m_copyAabbsKernel);
+	clReleaseKernel(m_sapKernel);
+	clReleaseKernel(m_sap2Kernel);
+	clReleaseKernel(m_prepareSumVarianceKernel);
+}
+
+/// conservative test for overlap between two aabbs
+static bool TestAabbAgainstAabb2(const b3Vector3& aabbMin1, const b3Vector3& aabbMax1,
+								 const b3Vector3& aabbMin2, const b3Vector3& aabbMax2)
+{
+	bool overlap = true;
+	overlap = (aabbMin1.getX() > aabbMax2.getX() || aabbMax1.getX() < aabbMin2.getX()) ? false : overlap;
+	overlap = (aabbMin1.getZ() > aabbMax2.getZ() || aabbMax1.getZ() < aabbMin2.getZ()) ? false : overlap;
+	overlap = (aabbMin1.getY() > aabbMax2.getY() || aabbMax1.getY() < aabbMin2.getY()) ? false : overlap;
+	return overlap;
+}
+
+//http://stereopsis.com/radix.html
+static unsigned int FloatFlip(float fl)
+{
+	unsigned int f = *(unsigned int*)&fl;
+	unsigned int mask = -(int)(f >> 31) | 0x80000000;
+	return f ^ mask;
+};
+
+void b3GpuSapBroadphase::init3dSap()
+{
+	if (m_currentBuffer < 0)
+	{
+		m_allAabbsGPU.copyToHost(m_allAabbsCPU);
+
+		m_currentBuffer = 0;
+		for (int axis = 0; axis < 3; axis++)
+		{
+			for (int buf = 0; buf < 2; buf++)
+			{
+				int totalNumAabbs = m_allAabbsCPU.size();
+				int numEndPoints = 2 * totalNumAabbs;
+				m_sortedAxisCPU[axis][buf].resize(numEndPoints);
+
+				if (buf == m_currentBuffer)
+				{
+					for (int i = 0; i < totalNumAabbs; i++)
+					{
+						m_sortedAxisCPU[axis][buf][i * 2].m_key = FloatFlip(m_allAabbsCPU[i].m_min[axis]) - 1;
+						m_sortedAxisCPU[axis][buf][i * 2].m_value = i * 2;
+						m_sortedAxisCPU[axis][buf][i * 2 + 1].m_key = FloatFlip(m_allAabbsCPU[i].m_max[axis]) + 1;
+						m_sortedAxisCPU[axis][buf][i * 2 + 1].m_value = i * 2 + 1;
+					}
+				}
+			}
+		}
+
+		for (int axis = 0; axis < 3; axis++)
+		{
+			m_sorter->executeHost(m_sortedAxisCPU[axis][m_currentBuffer]);
+		}
+
+		for (int axis = 0; axis < 3; axis++)
+		{
+			//int totalNumAabbs = m_allAabbsCPU.size();
+			int numEndPoints = m_sortedAxisCPU[axis][m_currentBuffer].size();
+			m_objectMinMaxIndexCPU[axis][m_currentBuffer].resize(numEndPoints);
+			for (int i = 0; i < numEndPoints; i++)
+			{
+				int destIndex = m_sortedAxisCPU[axis][m_currentBuffer][i].m_value;
+				int newDest = destIndex / 2;
+				if (destIndex & 1)
+				{
+					m_objectMinMaxIndexCPU[axis][m_currentBuffer][newDest].y = i;
+				}
+				else
+				{
+					m_objectMinMaxIndexCPU[axis][m_currentBuffer][newDest].x = i;
+				}
+			}
+		}
+	}
+}
+
+static bool b3PairCmp(const b3Int4& p, const b3Int4& q)
+{
+	return ((p.x < q.x) || ((p.x == q.x) && (p.y < q.y)));
+}
+
+static bool operator==(const b3Int4& a, const b3Int4& b)
+{
+	return a.x == b.x && a.y == b.y;
+};
+
+static bool operator<(const b3Int4& a, const b3Int4& b)
+{
+	return a.x < b.x || (a.x == b.x && a.y < b.y);
+};
+
+static bool operator>(const b3Int4& a, const b3Int4& b)
+{
+	return a.x > b.x || (a.x == b.x && a.y > b.y);
+};
+
+b3AlignedObjectArray<b3Int4> addedHostPairs;
+b3AlignedObjectArray<b3Int4> removedHostPairs;
+
+b3AlignedObjectArray<b3SapAabb> preAabbs;
+
+void b3GpuSapBroadphase::calculateOverlappingPairsHostIncremental3Sap()
+{
+	//static int framepje = 0;
+	//printf("framepje=%d\n",framepje++);
+
+	B3_PROFILE("calculateOverlappingPairsHostIncremental3Sap");
+
+	addedHostPairs.resize(0);
+	removedHostPairs.resize(0);
+
+	b3Assert(m_currentBuffer >= 0);
+
+	{
+		preAabbs.resize(m_allAabbsCPU.size());
+		for (int i = 0; i < preAabbs.size(); i++)
+		{
+			preAabbs[i] = m_allAabbsCPU[i];
+		}
+	}
+
+	if (m_currentBuffer < 0)
+		return;
+	{
+		B3_PROFILE("m_allAabbsGPU.copyToHost");
+		m_allAabbsGPU.copyToHost(m_allAabbsCPU);
+	}
+
+	b3AlignedObjectArray<b3Int4> allPairs;
+	{
+		B3_PROFILE("m_overlappingPairs.copyToHost");
+		m_overlappingPairs.copyToHost(allPairs);
+	}
+	if (0)
+	{
+		{
+			printf("ab[40].min=%f,%f,%f,ab[40].max=%f,%f,%f\n",
+				   m_allAabbsCPU[40].m_min[0], m_allAabbsCPU[40].m_min[1], m_allAabbsCPU[40].m_min[2],
+				   m_allAabbsCPU[40].m_max[0], m_allAabbsCPU[40].m_max[1], m_allAabbsCPU[40].m_max[2]);
+		}
+
+		{
+			printf("ab[53].min=%f,%f,%f,ab[53].max=%f,%f,%f\n",
+				   m_allAabbsCPU[53].m_min[0], m_allAabbsCPU[53].m_min[1], m_allAabbsCPU[53].m_min[2],
+				   m_allAabbsCPU[53].m_max[0], m_allAabbsCPU[53].m_max[1], m_allAabbsCPU[53].m_max[2]);
+		}
+
+		{
+			b3Int4 newPair;
+			newPair.x = 40;
+			newPair.y = 53;
+			int index = allPairs.findBinarySearch(newPair);
+			printf("hasPair(40,53)=%d out of %d\n", index, allPairs.size());
+
+			{
+				int overlap = TestAabbAgainstAabb2((const b3Vector3&)m_allAabbsCPU[40].m_min, (const b3Vector3&)m_allAabbsCPU[40].m_max, (const b3Vector3&)m_allAabbsCPU[53].m_min, (const b3Vector3&)m_allAabbsCPU[53].m_max);
+				printf("overlap=%d\n", overlap);
+			}
+
+			if (preAabbs.size())
+			{
+				int prevOverlap = TestAabbAgainstAabb2((const b3Vector3&)preAabbs[40].m_min, (const b3Vector3&)preAabbs[40].m_max, (const b3Vector3&)preAabbs[53].m_min, (const b3Vector3&)preAabbs[53].m_max);
+				printf("prevoverlap=%d\n", prevOverlap);
+			}
+			else
+			{
+				printf("unknown prevoverlap\n");
+			}
+		}
+	}
+
+	if (0)
+	{
+		for (int i = 0; i < m_allAabbsCPU.size(); i++)
+		{
+			//printf("aabb[%d] min=%f,%f,%f max=%f,%f,%f\n",i,m_allAabbsCPU[i].m_min[0],m_allAabbsCPU[i].m_min[1],m_allAabbsCPU[i].m_min[2],			m_allAabbsCPU[i].m_max[0],m_allAabbsCPU[i].m_max[1],m_allAabbsCPU[i].m_max[2]);
+		}
+
+		for (int axis = 0; axis < 3; axis++)
+		{
+			for (int buf = 0; buf < 2; buf++)
+			{
+				b3Assert(m_sortedAxisCPU[axis][buf].size() == m_allAabbsCPU.size() * 2);
+			}
+		}
+	}
+
+	m_currentBuffer = 1 - m_currentBuffer;
+
+	int totalNumAabbs = m_allAabbsCPU.size();
+
+	{
+		B3_PROFILE("assign m_sortedAxisCPU(FloatFlip)");
+		for (int i = 0; i < totalNumAabbs; i++)
+		{
+			unsigned int keyMin[3];
+			unsigned int keyMax[3];
+			for (int axis = 0; axis < 3; axis++)
+			{
+				float vmin = m_allAabbsCPU[i].m_min[axis];
+				float vmax = m_allAabbsCPU[i].m_max[axis];
+				keyMin[axis] = FloatFlip(vmin);
+				keyMax[axis] = FloatFlip(vmax);
+
+				m_sortedAxisCPU[axis][m_currentBuffer][i * 2].m_key = keyMin[axis] - 1;
+				m_sortedAxisCPU[axis][m_currentBuffer][i * 2].m_value = i * 2;
+				m_sortedAxisCPU[axis][m_currentBuffer][i * 2 + 1].m_key = keyMax[axis] + 1;
+				m_sortedAxisCPU[axis][m_currentBuffer][i * 2 + 1].m_value = i * 2 + 1;
+			}
+			//printf("aabb[%d] min=%u,%u,%u max %u,%u,%u\n", i,keyMin[0],keyMin[1],keyMin[2],keyMax[0],keyMax[1],keyMax[2]);
+		}
+	}
+
+	{
+		B3_PROFILE("sort m_sortedAxisCPU");
+		for (int axis = 0; axis < 3; axis++)
+			m_sorter->executeHost(m_sortedAxisCPU[axis][m_currentBuffer]);
+	}
+
+#if 0
+	if (0)
+	{
+		for (int axis=0;axis<3;axis++)
+		{
+			//printf("axis %d\n",axis);
+			for (int i=0;i<m_sortedAxisCPU[axis][m_currentBuffer].size();i++)
+			{
+				//int key = m_sortedAxisCPU[axis][m_currentBuffer][i].m_key;
+				//int value = m_sortedAxisCPU[axis][m_currentBuffer][i].m_value;
+				//printf("[%d]=%d\n",i,value);
+			}
+
+		}
+	}
+#endif
+
+	{
+		B3_PROFILE("assign m_objectMinMaxIndexCPU");
+		for (int axis = 0; axis < 3; axis++)
+		{
+			int totalNumAabbs = m_allAabbsCPU.size();
+			int numEndPoints = m_sortedAxisCPU[axis][m_currentBuffer].size();
+			m_objectMinMaxIndexCPU[axis][m_currentBuffer].resize(totalNumAabbs);
+			for (int i = 0; i < numEndPoints; i++)
+			{
+				int destIndex = m_sortedAxisCPU[axis][m_currentBuffer][i].m_value;
+				int newDest = destIndex / 2;
+				if (destIndex & 1)
+				{
+					m_objectMinMaxIndexCPU[axis][m_currentBuffer][newDest].y = i;
+				}
+				else
+				{
+					m_objectMinMaxIndexCPU[axis][m_currentBuffer][newDest].x = i;
+				}
+			}
+		}
+	}
+
+#if 0
+	if (0)
+	{	
+		printf("==========================\n");
+		for (int axis=0;axis<3;axis++)
+		{
+			unsigned int curMinIndex40 = m_objectMinMaxIndexCPU[axis][m_currentBuffer][40].x;
+			unsigned int curMaxIndex40 = m_objectMinMaxIndexCPU[axis][m_currentBuffer][40].y;
+			unsigned int prevMaxIndex40 = m_objectMinMaxIndexCPU[axis][1-m_currentBuffer][40].y;
+			unsigned int prevMinIndex40 = m_objectMinMaxIndexCPU[axis][1-m_currentBuffer][40].x;
+
+			int dmin40 = curMinIndex40 - prevMinIndex40;
+			int dmax40 = curMinIndex40 - prevMinIndex40;
+			printf("axis %d curMinIndex40=%d prevMinIndex40=%d\n",axis,curMinIndex40, prevMinIndex40);
+			printf("axis %d curMaxIndex40=%d prevMaxIndex40=%d\n",axis,curMaxIndex40, prevMaxIndex40);
+		}
+		printf(".........................\n");
+		for (int axis=0;axis<3;axis++)
+		{
+			unsigned int curMinIndex53 = m_objectMinMaxIndexCPU[axis][m_currentBuffer][53].x;
+			unsigned int curMaxIndex53 = m_objectMinMaxIndexCPU[axis][m_currentBuffer][53].y;
+			unsigned int prevMaxIndex53 = m_objectMinMaxIndexCPU[axis][1-m_currentBuffer][53].y;
+			unsigned int prevMinIndex53 = m_objectMinMaxIndexCPU[axis][1-m_currentBuffer][53].x;
+
+			int dmin40 = curMinIndex53 - prevMinIndex53;
+			int dmax40 = curMinIndex53 - prevMinIndex53;
+			printf("axis %d curMinIndex53=%d prevMinIndex53=%d\n",axis,curMinIndex53, prevMinIndex53);
+			printf("axis %d curMaxIndex53=%d prevMaxIndex53=%d\n",axis,curMaxIndex53, prevMaxIndex53);
+		}
+
+	}
+#endif
+
+	int a = m_objectMinMaxIndexCPU[0][m_currentBuffer].size();
+	int b = m_objectMinMaxIndexCPU[1][m_currentBuffer].size();
+	int c = m_objectMinMaxIndexCPU[2][m_currentBuffer].size();
+	b3Assert(a == b);
+	b3Assert(b == c);
+	/*
+	if (searchIncremental3dSapOnGpu)
+	{
+		B3_PROFILE("computePairsIncremental3dSapKernelGPU");
+		int numObjects = m_objectMinMaxIndexCPU[0][m_currentBuffer].size();
+		int maxCapacity = 1024*1024;
+		{
+			B3_PROFILE("copy from host");
+			m_objectMinMaxIndexGPUaxis0.copyFromHost(m_objectMinMaxIndexCPU[0][m_currentBuffer]);
+			m_objectMinMaxIndexGPUaxis1.copyFromHost(m_objectMinMaxIndexCPU[1][m_currentBuffer]);
+			m_objectMinMaxIndexGPUaxis2.copyFromHost(m_objectMinMaxIndexCPU[2][m_currentBuffer]);
+			m_objectMinMaxIndexGPUaxis0prev.copyFromHost(m_objectMinMaxIndexCPU[0][1-m_currentBuffer]);
+			m_objectMinMaxIndexGPUaxis1prev.copyFromHost(m_objectMinMaxIndexCPU[1][1-m_currentBuffer]);
+			m_objectMinMaxIndexGPUaxis2prev.copyFromHost(m_objectMinMaxIndexCPU[2][1-m_currentBuffer]);
+
+			m_sortedAxisGPU0.copyFromHost(m_sortedAxisCPU[0][m_currentBuffer]);
+			m_sortedAxisGPU1.copyFromHost(m_sortedAxisCPU[1][m_currentBuffer]);
+			m_sortedAxisGPU2.copyFromHost(m_sortedAxisCPU[2][m_currentBuffer]);
+			m_sortedAxisGPU0prev.copyFromHost(m_sortedAxisCPU[0][1-m_currentBuffer]);
+			m_sortedAxisGPU1prev.copyFromHost(m_sortedAxisCPU[1][1-m_currentBuffer]);
+			m_sortedAxisGPU2prev.copyFromHost(m_sortedAxisCPU[2][1-m_currentBuffer]);
+
+		
+			m_addedHostPairsGPU.resize(maxCapacity);
+			m_removedHostPairsGPU.resize(maxCapacity);
+
+			m_addedCountGPU.resize(0);
+			m_addedCountGPU.push_back(0);
+			m_removedCountGPU.resize(0);
+			m_removedCountGPU.push_back(0);
+		}
+
+		{
+			B3_PROFILE("launch1D");
+			b3LauncherCL launcher(m_queue,  m_computePairsIncremental3dSapKernel,"m_computePairsIncremental3dSapKernel");
+			launcher.setBuffer(m_objectMinMaxIndexGPUaxis0.getBufferCL());
+			launcher.setBuffer(m_objectMinMaxIndexGPUaxis1.getBufferCL());
+			launcher.setBuffer(m_objectMinMaxIndexGPUaxis2.getBufferCL());
+			launcher.setBuffer(m_objectMinMaxIndexGPUaxis0prev.getBufferCL());
+			launcher.setBuffer(m_objectMinMaxIndexGPUaxis1prev.getBufferCL());
+			launcher.setBuffer(m_objectMinMaxIndexGPUaxis2prev.getBufferCL());
+
+			launcher.setBuffer(m_sortedAxisGPU0.getBufferCL());
+			launcher.setBuffer(m_sortedAxisGPU1.getBufferCL());
+			launcher.setBuffer(m_sortedAxisGPU2.getBufferCL());
+			launcher.setBuffer(m_sortedAxisGPU0prev.getBufferCL());
+			launcher.setBuffer(m_sortedAxisGPU1prev.getBufferCL());
+			launcher.setBuffer(m_sortedAxisGPU2prev.getBufferCL());
+
+		
+			launcher.setBuffer(m_addedHostPairsGPU.getBufferCL());
+			launcher.setBuffer(m_removedHostPairsGPU.getBufferCL());
+			launcher.setBuffer(m_addedCountGPU.getBufferCL());
+			launcher.setBuffer(m_removedCountGPU.getBufferCL());
+			launcher.setConst(maxCapacity);
+			launcher.setConst( numObjects);
+			launcher.launch1D( numObjects);
+			clFinish(m_queue);
+		}
+
+		{
+			B3_PROFILE("copy to host");
+			int addedCountGPU = m_addedCountGPU.at(0);
+			m_addedHostPairsGPU.resize(addedCountGPU);
+			m_addedHostPairsGPU.copyToHost(addedHostPairs);
+
+			//printf("addedCountGPU=%d\n",addedCountGPU);
+			int removedCountGPU = m_removedCountGPU.at(0);
+			m_removedHostPairsGPU.resize(removedCountGPU);
+			m_removedHostPairsGPU.copyToHost(removedHostPairs);
+			//printf("removedCountGPU=%d\n",removedCountGPU);
+
+		}
+
+
+
+	} 
+	else
+	*/
+	{
+		int numObjects = m_objectMinMaxIndexCPU[0][m_currentBuffer].size();
+
+		B3_PROFILE("actual search");
+		for (int i = 0; i < numObjects; i++)
+		{
+			//int numObjects = m_objectMinMaxIndexCPU[axis][m_currentBuffer].size();
+			//int checkObjects[]={40,53};
+			//int numCheckObjects = sizeof(checkObjects)/sizeof(int);
+
+			//for (int a=0;a<numCheckObjects ;a++)
+
+			for (int axis = 0; axis < 3; axis++)
+			{
+				//int i = checkObjects[a];
+
+				unsigned int curMinIndex = m_objectMinMaxIndexCPU[axis][m_currentBuffer][i].x;
+				unsigned int curMaxIndex = m_objectMinMaxIndexCPU[axis][m_currentBuffer][i].y;
+				unsigned int prevMinIndex = m_objectMinMaxIndexCPU[axis][1 - m_currentBuffer][i].x;
+				int dmin = curMinIndex - prevMinIndex;
+
+				unsigned int prevMaxIndex = m_objectMinMaxIndexCPU[axis][1 - m_currentBuffer][i].y;
+
+				int dmax = curMaxIndex - prevMaxIndex;
+				if (dmin != 0)
+				{
+					//printf("for object %d, dmin=%d\n",i,dmin);
+				}
+				if (dmax != 0)
+				{
+					//printf("for object %d, dmax=%d\n",i,dmax);
+				}
+				for (int otherbuffer = 0; otherbuffer < 2; otherbuffer++)
+				{
+					if (dmin != 0)
+					{
+						int stepMin = dmin < 0 ? -1 : 1;
+						for (int j = prevMinIndex; j != curMinIndex; j += stepMin)
+						{
+							int otherIndex2 = m_sortedAxisCPU[axis][otherbuffer][j].y;
+							int otherIndex = otherIndex2 / 2;
+							if (otherIndex != i)
+							{
+								bool otherIsMax = ((otherIndex2 & 1) != 0);
+
+								if (otherIsMax)
+								{
+									//bool overlap = TestAabbAgainstAabb2((const b3Vector3&)m_allAabbsCPU[i].m_min, (const b3Vector3&)m_allAabbsCPU[i].m_max,(const b3Vector3&)m_allAabbsCPU[otherIndex].m_min,(const b3Vector3&)m_allAabbsCPU[otherIndex].m_max);
+									//bool prevOverlap = TestAabbAgainstAabb2((const b3Vector3&)preAabbs[i].m_min, (const b3Vector3&)preAabbs[i].m_max,(const b3Vector3&)preAabbs[otherIndex].m_min,(const b3Vector3&)preAabbs[otherIndex].m_max);
+
+									bool overlap = true;
+
+									for (int ax = 0; ax < 3; ax++)
+									{
+										if ((m_objectMinMaxIndexCPU[ax][m_currentBuffer][i].x > m_objectMinMaxIndexCPU[ax][m_currentBuffer][otherIndex].y) ||
+											(m_objectMinMaxIndexCPU[ax][m_currentBuffer][i].y < m_objectMinMaxIndexCPU[ax][m_currentBuffer][otherIndex].x))
+											overlap = false;
+									}
+
+									//	b3Assert(overlap2==overlap);
+
+									bool prevOverlap = true;
+
+									for (int ax = 0; ax < 3; ax++)
+									{
+										if ((m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][i].x > m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][otherIndex].y) ||
+											(m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][i].y < m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][otherIndex].x))
+											prevOverlap = false;
+									}
+
+									//b3Assert(overlap==overlap2);
+
+									if (dmin < 0)
+									{
+										if (overlap && !prevOverlap)
+										{
+											//add a pair
+											b3Int4 newPair;
+											if (i <= otherIndex)
+											{
+												newPair.x = i;
+												newPair.y = otherIndex;
+											}
+											else
+											{
+												newPair.x = otherIndex;
+												newPair.y = i;
+											}
+											addedHostPairs.push_back(newPair);
+										}
+									}
+									else
+									{
+										if (!overlap && prevOverlap)
+										{
+											//remove a pair
+											b3Int4 removedPair;
+											if (i <= otherIndex)
+											{
+												removedPair.x = i;
+												removedPair.y = otherIndex;
+											}
+											else
+											{
+												removedPair.x = otherIndex;
+												removedPair.y = i;
+											}
+											removedHostPairs.push_back(removedPair);
+										}
+									}  //otherisMax
+								}      //if (dmin<0)
+							}          //if (otherIndex!=i)
+						}              //for (int j=
+					}
+
+					if (dmax != 0)
+					{
+						int stepMax = dmax < 0 ? -1 : 1;
+						for (int j = prevMaxIndex; j != curMaxIndex; j += stepMax)
+						{
+							int otherIndex2 = m_sortedAxisCPU[axis][otherbuffer][j].y;
+							int otherIndex = otherIndex2 / 2;
+							if (otherIndex != i)
+							{
+								//bool otherIsMin = ((otherIndex2&1)==0);
+								//if (otherIsMin)
+								{
+									//bool overlap = TestAabbAgainstAabb2((const b3Vector3&)m_allAabbsCPU[i].m_min, (const b3Vector3&)m_allAabbsCPU[i].m_max,(const b3Vector3&)m_allAabbsCPU[otherIndex].m_min,(const b3Vector3&)m_allAabbsCPU[otherIndex].m_max);
+									//bool prevOverlap = TestAabbAgainstAabb2((const b3Vector3&)preAabbs[i].m_min, (const b3Vector3&)preAabbs[i].m_max,(const b3Vector3&)preAabbs[otherIndex].m_min,(const b3Vector3&)preAabbs[otherIndex].m_max);
+
+									bool overlap = true;
+
+									for (int ax = 0; ax < 3; ax++)
+									{
+										if ((m_objectMinMaxIndexCPU[ax][m_currentBuffer][i].x > m_objectMinMaxIndexCPU[ax][m_currentBuffer][otherIndex].y) ||
+											(m_objectMinMaxIndexCPU[ax][m_currentBuffer][i].y < m_objectMinMaxIndexCPU[ax][m_currentBuffer][otherIndex].x))
+											overlap = false;
+									}
+									//b3Assert(overlap2==overlap);
+
+									bool prevOverlap = true;
+
+									for (int ax = 0; ax < 3; ax++)
+									{
+										if ((m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][i].x > m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][otherIndex].y) ||
+											(m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][i].y < m_objectMinMaxIndexCPU[ax][1 - m_currentBuffer][otherIndex].x))
+											prevOverlap = false;
+									}
+
+									if (dmax > 0)
+									{
+										if (overlap && !prevOverlap)
+										{
+											//add a pair
+											b3Int4 newPair;
+											if (i <= otherIndex)
+											{
+												newPair.x = i;
+												newPair.y = otherIndex;
+											}
+											else
+											{
+												newPair.x = otherIndex;
+												newPair.y = i;
+											}
+											addedHostPairs.push_back(newPair);
+										}
+									}
+									else
+									{
+										if (!overlap && prevOverlap)
+										{
+											//if (otherIndex2&1==0) -> min?
+											//remove a pair
+											b3Int4 removedPair;
+											if (i <= otherIndex)
+											{
+												removedPair.x = i;
+												removedPair.y = otherIndex;
+											}
+											else
+											{
+												removedPair.x = otherIndex;
+												removedPair.y = i;
+											}
+											removedHostPairs.push_back(removedPair);
+										}
+									}
+
+								}  //if (dmin<0)
+							}      //if (otherIndex!=i)
+						}          //for (int j=
+					}
+				}  //for (int otherbuffer
+			}      //for (int axis=0;
+		}          //for (int i=0;i<numObjects
+	}
+
+	//remove duplicates and add/remove then to existing m_overlappingPairs
+
+	{
+		{
+			B3_PROFILE("sort allPairs");
+			allPairs.quickSort(b3PairCmp);
+		}
+		{
+			B3_PROFILE("sort addedHostPairs");
+			addedHostPairs.quickSort(b3PairCmp);
+		}
+		{
+			B3_PROFILE("sort removedHostPairs");
+			removedHostPairs.quickSort(b3PairCmp);
+		}
+	}
+
+	b3Int4 prevPair;
+	prevPair.x = -1;
+	prevPair.y = -1;
+
+	int uniqueRemovedPairs = 0;
+
+	b3AlignedObjectArray<int> removedPositions;
+
+	{
+		B3_PROFILE("actual removing");
+		for (int i = 0; i < removedHostPairs.size(); i++)
+		{
+			b3Int4 removedPair = removedHostPairs[i];
+			if ((removedPair.x != prevPair.x) || (removedPair.y != prevPair.y))
+			{
+				int index1 = allPairs.findBinarySearch(removedPair);
+
+				//#ifdef _DEBUG
+
+				int index2 = allPairs.findLinearSearch(removedPair);
+				b3Assert(index1 == index2);
+
+				//b3Assert(index1!=allPairs.size());
+				if (index1 < allPairs.size())
+				//#endif//_DEBUG
+				{
+					uniqueRemovedPairs++;
+					removedPositions.push_back(index1);
+					{
+						//printf("framepje(%d) remove pair(%d):%d,%d\n",framepje,i,removedPair.x,removedPair.y);
+					}
+				}
+			}
+			prevPair = removedPair;
+		}
+
+		if (uniqueRemovedPairs)
+		{
+			for (int i = 0; i < removedPositions.size(); i++)
+			{
+				allPairs[removedPositions[i]].x = INT_MAX;
+				allPairs[removedPositions[i]].y = INT_MAX;
+			}
+			allPairs.quickSort(b3PairCmp);
+			allPairs.resize(allPairs.size() - uniqueRemovedPairs);
+		}
+	}
+	//if (uniqueRemovedPairs)
+	//	printf("uniqueRemovedPairs=%d\n",uniqueRemovedPairs);
+	//printf("removedHostPairs.size = %d\n",removedHostPairs.size());
+
+	prevPair.x = -1;
+	prevPair.y = -1;
+
+	int uniqueAddedPairs = 0;
+	b3AlignedObjectArray<b3Int4> actualAddedPairs;
+
+	{
+		B3_PROFILE("actual adding");
+		for (int i = 0; i < addedHostPairs.size(); i++)
+		{
+			b3Int4 newPair = addedHostPairs[i];
+			if ((newPair.x != prevPair.x) || (newPair.y != prevPair.y))
+			{
+				//#ifdef _DEBUG
+				int index1 = allPairs.findBinarySearch(newPair);
+
+				int index2 = allPairs.findLinearSearch(newPair);
+				b3Assert(index1 == index2);
+
+				b3Assert(index1 == allPairs.size());
+				if (index1 != allPairs.size())
+				{
+					printf("??\n");
+				}
+
+				if (index1 == allPairs.size())
+				//#endif //_DEBUG
+				{
+					uniqueAddedPairs++;
+					actualAddedPairs.push_back(newPair);
+				}
+			}
+			prevPair = newPair;
+		}
+		for (int i = 0; i < actualAddedPairs.size(); i++)
+		{
+			//printf("framepje (%d), new pair(%d):%d,%d\n",framepje,i,actualAddedPairs[i].x,actualAddedPairs[i].y);
+			allPairs.push_back(actualAddedPairs[i]);
+		}
+	}
+
+	//if (uniqueAddedPairs)
+	//	printf("uniqueAddedPairs=%d\n", uniqueAddedPairs);
+
+	{
+		B3_PROFILE("m_overlappingPairs.copyFromHost");
+		m_overlappingPairs.copyFromHost(allPairs);
+	}
+}
+
+void b3GpuSapBroadphase::calculateOverlappingPairsHost(int maxPairs)
+{
+	//test
+	//	if (m_currentBuffer>=0)
+	//	return calculateOverlappingPairsHostIncremental3Sap();
+
+	b3Assert(m_allAabbsCPU.size() == m_allAabbsGPU.size());
+	m_allAabbsGPU.copyToHost(m_allAabbsCPU);
+
+	int axis = 0;
+	{
+		B3_PROFILE("CPU compute best variance axis");
+		b3Vector3 s = b3MakeVector3(0, 0, 0), s2 = b3MakeVector3(0, 0, 0);
+		int numRigidBodies = m_smallAabbsMappingCPU.size();
+
+		for (int i = 0; i < numRigidBodies; i++)
+		{
+			b3SapAabb aabb = this->m_allAabbsCPU[m_smallAabbsMappingCPU[i]];
+
+			b3Vector3 maxAabb = b3MakeVector3(aabb.m_max[0], aabb.m_max[1], aabb.m_max[2]);
+			b3Vector3 minAabb = b3MakeVector3(aabb.m_min[0], aabb.m_min[1], aabb.m_min[2]);
+			b3Vector3 centerAabb = (maxAabb + minAabb) * 0.5f;
+
+			s += centerAabb;
+			s2 += centerAabb * centerAabb;
+		}
+		b3Vector3 v = s2 - (s * s) / (float)numRigidBodies;
+
+		if (v[1] > v[0])
+			axis = 1;
+		if (v[2] > v[axis])
+			axis = 2;
+	}
+
+	b3AlignedObjectArray<b3Int4> hostPairs;
+
+	{
+		int numSmallAabbs = m_smallAabbsMappingCPU.size();
+		for (int i = 0; i < numSmallAabbs; i++)
+		{
+			b3SapAabb smallAabbi = m_allAabbsCPU[m_smallAabbsMappingCPU[i]];
+			//float reference = smallAabbi.m_max[axis];
+
+			for (int j = i + 1; j < numSmallAabbs; j++)
+			{
+				b3SapAabb smallAabbj = m_allAabbsCPU[m_smallAabbsMappingCPU[j]];
+
+				if (TestAabbAgainstAabb2((b3Vector3&)smallAabbi.m_min, (b3Vector3&)smallAabbi.m_max,
+										 (b3Vector3&)smallAabbj.m_min, (b3Vector3&)smallAabbj.m_max))
+				{
+					b3Int4 pair;
+					int a = smallAabbi.m_minIndices[3];
+					int b = smallAabbj.m_minIndices[3];
+					if (a <= b)
+					{
+						pair.x = a;  //store the original index in the unsorted aabb array
+						pair.y = b;
+					}
+					else
+					{
+						pair.x = b;  //store the original index in the unsorted aabb array
+						pair.y = a;
+					}
+					hostPairs.push_back(pair);
+				}
+			}
+		}
+	}
+
+	{
+		int numSmallAabbs = m_smallAabbsMappingCPU.size();
+		for (int i = 0; i < numSmallAabbs; i++)
+		{
+			b3SapAabb smallAabbi = m_allAabbsCPU[m_smallAabbsMappingCPU[i]];
+
+			//float reference = smallAabbi.m_max[axis];
+			int numLargeAabbs = m_largeAabbsMappingCPU.size();
+
+			for (int j = 0; j < numLargeAabbs; j++)
+			{
+				b3SapAabb largeAabbj = m_allAabbsCPU[m_largeAabbsMappingCPU[j]];
+				if (TestAabbAgainstAabb2((b3Vector3&)smallAabbi.m_min, (b3Vector3&)smallAabbi.m_max,
+										 (b3Vector3&)largeAabbj.m_min, (b3Vector3&)largeAabbj.m_max))
+				{
+					b3Int4 pair;
+					int a = largeAabbj.m_minIndices[3];
+					int b = smallAabbi.m_minIndices[3];
+					if (a <= b)
+					{
+						pair.x = a;
+						pair.y = b;  //store the original index in the unsorted aabb array
+					}
+					else
+					{
+						pair.x = b;
+						pair.y = a;  //store the original index in the unsorted aabb array
+					}
+
+					hostPairs.push_back(pair);
+				}
+			}
+		}
+	}
+
+	if (hostPairs.size() > maxPairs)
+	{
+		hostPairs.resize(maxPairs);
+	}
+
+	if (hostPairs.size())
+	{
+		m_overlappingPairs.copyFromHost(hostPairs);
+	}
+	else
+	{
+		m_overlappingPairs.resize(0);
+	}
+
+	//init3dSap();
+}
+
+void b3GpuSapBroadphase::reset()
+{
+	m_allAabbsGPU.resize(0);
+	m_allAabbsCPU.resize(0);
+
+	m_smallAabbsMappingGPU.resize(0);
+	m_smallAabbsMappingCPU.resize(0);
+
+	m_pairCount.resize(0);
+
+	m_largeAabbsMappingGPU.resize(0);
+	m_largeAabbsMappingCPU.resize(0);
+}
+
+void b3GpuSapBroadphase::calculateOverlappingPairs(int maxPairs)
+{
+	if (m_sapKernel == 0)
+	{
+		calculateOverlappingPairsHost(maxPairs);
+		return;
+	}
+
+	//if (m_currentBuffer>=0)
+	//	return calculateOverlappingPairsHostIncremental3Sap();
+
+	//calculateOverlappingPairsHost(maxPairs);
+
+	B3_PROFILE("GPU 1-axis SAP calculateOverlappingPairs");
+
+	int axis = 0;
+
+	{
+		//bool syncOnHost = false;
+
+		int numSmallAabbs = m_smallAabbsMappingCPU.size();
+		if (m_prefixScanFloat4 && numSmallAabbs)
+		{
+			B3_PROFILE("GPU compute best variance axis");
+
+			if (m_dst.size() != (numSmallAabbs + 1))
+			{
+				m_dst.resize(numSmallAabbs + 128);
+				m_sum.resize(numSmallAabbs + 128);
+				m_sum2.resize(numSmallAabbs + 128);
+				m_sum.at(numSmallAabbs) = b3MakeVector3(0, 0, 0);   //slow?
+				m_sum2.at(numSmallAabbs) = b3MakeVector3(0, 0, 0);  //slow?
+			}
+
+			b3LauncherCL launcher(m_queue, m_prepareSumVarianceKernel, "m_prepareSumVarianceKernel");
+			launcher.setBuffer(m_allAabbsGPU.getBufferCL());
+
+			launcher.setBuffer(m_smallAabbsMappingGPU.getBufferCL());
+			launcher.setBuffer(m_sum.getBufferCL());
+			launcher.setBuffer(m_sum2.getBufferCL());
+			launcher.setConst(numSmallAabbs);
+			int num = numSmallAabbs;
+			launcher.launch1D(num);
+
+			b3Vector3 s;
+			b3Vector3 s2;
+			m_prefixScanFloat4->execute(m_sum, m_dst, numSmallAabbs + 1, &s);
+			m_prefixScanFloat4->execute(m_sum2, m_dst, numSmallAabbs + 1, &s2);
+
+			b3Vector3 v = s2 - (s * s) / (float)numSmallAabbs;
+
+			if (v[1] > v[0])
+				axis = 1;
+			if (v[2] > v[axis])
+				axis = 2;
+		}
+
+		m_gpuSmallSortData.resize(numSmallAabbs);
+
+#if 1
+		if (m_smallAabbsMappingGPU.size())
+		{
+			B3_PROFILE("flipFloatKernel");
+			b3BufferInfoCL bInfo[] = {
+				b3BufferInfoCL(m_allAabbsGPU.getBufferCL(), true),
+				b3BufferInfoCL(m_smallAabbsMappingGPU.getBufferCL(), true),
+				b3BufferInfoCL(m_gpuSmallSortData.getBufferCL())};
+			b3LauncherCL launcher(m_queue, m_flipFloatKernel, "m_flipFloatKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numSmallAabbs);
+			launcher.setConst(axis);
+
+			int num = numSmallAabbs;
+			launcher.launch1D(num);
+			clFinish(m_queue);
+		}
+
+		if (m_gpuSmallSortData.size())
+		{
+			B3_PROFILE("gpu radix sort");
+			m_sorter->execute(m_gpuSmallSortData);
+			clFinish(m_queue);
+		}
+
+		m_gpuSmallSortedAabbs.resize(numSmallAabbs);
+		if (numSmallAabbs)
+		{
+			B3_PROFILE("scatterKernel");
+
+			b3BufferInfoCL bInfo[] = {
+				b3BufferInfoCL(m_allAabbsGPU.getBufferCL(), true),
+				b3BufferInfoCL(m_smallAabbsMappingGPU.getBufferCL(), true),
+				b3BufferInfoCL(m_gpuSmallSortData.getBufferCL(), true),
+				b3BufferInfoCL(m_gpuSmallSortedAabbs.getBufferCL())};
+			b3LauncherCL launcher(m_queue, m_scatterKernel, "m_scatterKernel ");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numSmallAabbs);
+			int num = numSmallAabbs;
+			launcher.launch1D(num);
+			clFinish(m_queue);
+		}
+
+		m_overlappingPairs.resize(maxPairs);
+
+		m_pairCount.resize(0);
+		m_pairCount.push_back(0);
+		int numPairs = 0;
+
+		{
+			int numLargeAabbs = m_largeAabbsMappingGPU.size();
+			if (numLargeAabbs && numSmallAabbs)
+			{
+				//@todo
+				B3_PROFILE("sap2Kernel");
+				b3BufferInfoCL bInfo[] = {
+					b3BufferInfoCL(m_allAabbsGPU.getBufferCL()),
+					b3BufferInfoCL(m_largeAabbsMappingGPU.getBufferCL()),
+					b3BufferInfoCL(m_smallAabbsMappingGPU.getBufferCL()),
+					b3BufferInfoCL(m_overlappingPairs.getBufferCL()),
+					b3BufferInfoCL(m_pairCount.getBufferCL())};
+				b3LauncherCL launcher(m_queue, m_sap2Kernel, "m_sap2Kernel");
+				launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+				launcher.setConst(numLargeAabbs);
+				launcher.setConst(numSmallAabbs);
+				launcher.setConst(axis);
+				launcher.setConst(maxPairs);
+				//@todo: use actual maximum work item sizes of the device instead of hardcoded values
+				launcher.launch2D(numLargeAabbs, numSmallAabbs, 4, 64);
+
+				numPairs = m_pairCount.at(0);
+				if (numPairs > maxPairs)
+				{
+					b3Error("Error running out of pairs: numPairs = %d, maxPairs = %d.\n", numPairs, maxPairs);
+					numPairs = maxPairs;
+				}
+			}
+		}
+		if (m_gpuSmallSortedAabbs.size())
+		{
+			B3_PROFILE("sapKernel");
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(m_gpuSmallSortedAabbs.getBufferCL()), b3BufferInfoCL(m_overlappingPairs.getBufferCL()), b3BufferInfoCL(m_pairCount.getBufferCL())};
+			b3LauncherCL launcher(m_queue, m_sapKernel, "m_sapKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numSmallAabbs);
+			launcher.setConst(axis);
+			launcher.setConst(maxPairs);
+
+			int num = numSmallAabbs;
+#if 0                
+                int buffSize = launcher.getSerializationBufferSize();
+                unsigned char* buf = new unsigned char[buffSize+sizeof(int)];
+                for (int i=0;i<buffSize+1;i++)
+                {
+                    unsigned char* ptr = (unsigned char*)&buf[i];
+                    *ptr = 0xff;
+                }
+                int actualWrite = launcher.serializeArguments(buf,buffSize);
+                
+                unsigned char* cptr = (unsigned char*)&buf[buffSize];
+    //            printf("buf[buffSize] = %d\n",*cptr);
+                
+                assert(buf[buffSize]==0xff);//check for buffer overrun
+                int* ptr = (int*)&buf[buffSize];
+                
+                *ptr = num;
+                
+                FILE* f = fopen("m_sapKernelArgs.bin","wb");
+                fwrite(buf,buffSize+sizeof(int),1,f);
+                fclose(f);
+#endif  //
+
+			launcher.launch1D(num);
+			clFinish(m_queue);
+
+			numPairs = m_pairCount.at(0);
+			if (numPairs > maxPairs)
+			{
+				b3Error("Error running out of pairs: numPairs = %d, maxPairs = %d.\n", numPairs, maxPairs);
+				numPairs = maxPairs;
+				m_pairCount.resize(0);
+				m_pairCount.push_back(maxPairs);
+			}
+		}
+
+#else
+		int numPairs = 0;
+
+		b3LauncherCL launcher(m_queue, m_sapKernel);
+
+		const char* fileName = "m_sapKernelArgs.bin";
+		FILE* f = fopen(fileName, "rb");
+		if (f)
+		{
+			int sizeInBytes = 0;
+			if (fseek(f, 0, SEEK_END) || (sizeInBytes = ftell(f)) == EOF || fseek(f, 0, SEEK_SET))
+			{
+				printf("error, cannot get file size\n");
+				exit(0);
+			}
+
+			unsigned char* buf = (unsigned char*)malloc(sizeInBytes);
+			fread(buf, sizeInBytes, 1, f);
+			int serializedBytes = launcher.deserializeArgs(buf, sizeInBytes, m_context);
+			int num = *(int*)&buf[serializedBytes];
+			launcher.launch1D(num);
+
+			b3OpenCLArray<int> pairCount(m_context, m_queue);
+			int numElements = launcher.m_arrays[2]->size() / sizeof(int);
+			pairCount.setFromOpenCLBuffer(launcher.m_arrays[2]->getBufferCL(), numElements);
+			numPairs = pairCount.at(0);
+			//printf("overlapping pairs = %d\n",numPairs);
+			b3AlignedObjectArray<b3Int4> hostOoverlappingPairs;
+			b3OpenCLArray<b3Int4> tmpGpuPairs(m_context, m_queue);
+			tmpGpuPairs.setFromOpenCLBuffer(launcher.m_arrays[1]->getBufferCL(), numPairs);
+
+			tmpGpuPairs.copyToHost(hostOoverlappingPairs);
+			m_overlappingPairs.copyFromHost(hostOoverlappingPairs);
+			//printf("hello %d\n", m_overlappingPairs.size());
+			free(buf);
+			fclose(f);
+		}
+		else
+		{
+			printf("error: cannot find file %s\n", fileName);
+		}
+
+		clFinish(m_queue);
+
+#endif
+
+		m_overlappingPairs.resize(numPairs);
+
+	}  //B3_PROFILE("GPU_RADIX SORT");
+	   //init3dSap();
+}
+
+void b3GpuSapBroadphase::writeAabbsToGpu()
+{
+	m_smallAabbsMappingGPU.copyFromHost(m_smallAabbsMappingCPU);
+	m_largeAabbsMappingGPU.copyFromHost(m_largeAabbsMappingCPU);
+
+	m_allAabbsGPU.copyFromHost(m_allAabbsCPU);  //might not be necessary, the 'setupGpuAabbsFull' already takes care of this
+}
+
+void b3GpuSapBroadphase::createLargeProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask)
+{
+	int index = userPtr;
+	b3SapAabb aabb;
+	for (int i = 0; i < 4; i++)
+	{
+		aabb.m_min[i] = aabbMin[i];
+		aabb.m_max[i] = aabbMax[i];
+	}
+	aabb.m_minIndices[3] = index;
+	aabb.m_signedMaxIndices[3] = m_allAabbsCPU.size();
+	m_largeAabbsMappingCPU.push_back(m_allAabbsCPU.size());
+
+	m_allAabbsCPU.push_back(aabb);
+}
+
+void b3GpuSapBroadphase::createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask)
+{
+	int index = userPtr;
+	b3SapAabb aabb;
+	for (int i = 0; i < 4; i++)
+	{
+		aabb.m_min[i] = aabbMin[i];
+		aabb.m_max[i] = aabbMax[i];
+	}
+	aabb.m_minIndices[3] = index;
+	aabb.m_signedMaxIndices[3] = m_allAabbsCPU.size();
+	m_smallAabbsMappingCPU.push_back(m_allAabbsCPU.size());
+
+	m_allAabbsCPU.push_back(aabb);
+}
+
+cl_mem b3GpuSapBroadphase::getAabbBufferWS()
+{
+	return m_allAabbsGPU.getBufferCL();
+}
+
+int b3GpuSapBroadphase::getNumOverlap()
+{
+	return m_overlappingPairs.size();
+}
+cl_mem b3GpuSapBroadphase::getOverlappingPairBuffer()
+{
+	return m_overlappingPairs.getBufferCL();
+}
+
+b3OpenCLArray<b3Int4>& b3GpuSapBroadphase::getOverlappingPairsGPU()
+{
+	return m_overlappingPairs;
+}
+b3OpenCLArray<int>& b3GpuSapBroadphase::getSmallAabbIndicesGPU()
+{
+	return m_smallAabbsMappingGPU;
+}
+b3OpenCLArray<int>& b3GpuSapBroadphase::getLargeAabbIndicesGPU()
+{
+	return m_largeAabbsMappingGPU;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.h
new file mode 100644
index 0000000..d17590b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.h
@@ -0,0 +1,143 @@
+#ifndef B3_GPU_SAP_BROADPHASE_H
+#define B3_GPU_SAP_BROADPHASE_H
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3FillCL.h"  //b3Int2
+class b3Vector3;
+#include "Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h"
+
+#include "b3SapAabb.h"
+#include "Bullet3Common/shared/b3Int2.h"
+
+#include "b3GpuBroadphaseInterface.h"
+
+class b3GpuSapBroadphase : public b3GpuBroadphaseInterface
+{
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+	cl_kernel m_flipFloatKernel;
+	cl_kernel m_scatterKernel;
+	cl_kernel m_copyAabbsKernel;
+	cl_kernel m_sapKernel;
+	cl_kernel m_sap2Kernel;
+	cl_kernel m_prepareSumVarianceKernel;
+
+	class b3RadixSort32CL* m_sorter;
+
+	///test for 3d SAP
+	b3AlignedObjectArray<b3SortData> m_sortedAxisCPU[3][2];
+	b3AlignedObjectArray<b3UnsignedInt2> m_objectMinMaxIndexCPU[3][2];
+	b3OpenCLArray<b3UnsignedInt2> m_objectMinMaxIndexGPUaxis0;
+	b3OpenCLArray<b3UnsignedInt2> m_objectMinMaxIndexGPUaxis1;
+	b3OpenCLArray<b3UnsignedInt2> m_objectMinMaxIndexGPUaxis2;
+	b3OpenCLArray<b3UnsignedInt2> m_objectMinMaxIndexGPUaxis0prev;
+	b3OpenCLArray<b3UnsignedInt2> m_objectMinMaxIndexGPUaxis1prev;
+	b3OpenCLArray<b3UnsignedInt2> m_objectMinMaxIndexGPUaxis2prev;
+
+	b3OpenCLArray<b3SortData> m_sortedAxisGPU0;
+	b3OpenCLArray<b3SortData> m_sortedAxisGPU1;
+	b3OpenCLArray<b3SortData> m_sortedAxisGPU2;
+	b3OpenCLArray<b3SortData> m_sortedAxisGPU0prev;
+	b3OpenCLArray<b3SortData> m_sortedAxisGPU1prev;
+	b3OpenCLArray<b3SortData> m_sortedAxisGPU2prev;
+
+	b3OpenCLArray<b3Int4> m_addedHostPairsGPU;
+	b3OpenCLArray<b3Int4> m_removedHostPairsGPU;
+	b3OpenCLArray<int> m_addedCountGPU;
+	b3OpenCLArray<int> m_removedCountGPU;
+
+	int m_currentBuffer;
+
+public:
+	b3OpenCLArray<int> m_pairCount;
+
+	b3OpenCLArray<b3SapAabb> m_allAabbsGPU;
+	b3AlignedObjectArray<b3SapAabb> m_allAabbsCPU;
+
+	virtual b3OpenCLArray<b3SapAabb>& getAllAabbsGPU()
+	{
+		return m_allAabbsGPU;
+	}
+	virtual b3AlignedObjectArray<b3SapAabb>& getAllAabbsCPU()
+	{
+		return m_allAabbsCPU;
+	}
+
+	b3OpenCLArray<b3Vector3> m_sum;
+	b3OpenCLArray<b3Vector3> m_sum2;
+	b3OpenCLArray<b3Vector3> m_dst;
+
+	b3OpenCLArray<int> m_smallAabbsMappingGPU;
+	b3AlignedObjectArray<int> m_smallAabbsMappingCPU;
+
+	b3OpenCLArray<int> m_largeAabbsMappingGPU;
+	b3AlignedObjectArray<int> m_largeAabbsMappingCPU;
+
+	b3OpenCLArray<b3Int4> m_overlappingPairs;
+
+	//temporary gpu work memory
+	b3OpenCLArray<b3SortData> m_gpuSmallSortData;
+	b3OpenCLArray<b3SapAabb> m_gpuSmallSortedAabbs;
+
+	class b3PrefixScanFloat4CL* m_prefixScanFloat4;
+
+	enum b3GpuSapKernelType
+	{
+		B3_GPU_SAP_KERNEL_BRUTE_FORCE_CPU = 1,
+		B3_GPU_SAP_KERNEL_BRUTE_FORCE_GPU,
+		B3_GPU_SAP_KERNEL_ORIGINAL,
+		B3_GPU_SAP_KERNEL_BARRIER,
+		B3_GPU_SAP_KERNEL_LOCAL_SHARED_MEMORY
+	};
+
+	b3GpuSapBroadphase(cl_context ctx, cl_device_id device, cl_command_queue q, b3GpuSapKernelType kernelType = B3_GPU_SAP_KERNEL_LOCAL_SHARED_MEMORY);
+	virtual ~b3GpuSapBroadphase();
+
+	static b3GpuBroadphaseInterface* CreateFuncBruteForceCpu(cl_context ctx, cl_device_id device, cl_command_queue q)
+	{
+		return new b3GpuSapBroadphase(ctx, device, q, B3_GPU_SAP_KERNEL_BRUTE_FORCE_CPU);
+	}
+
+	static b3GpuBroadphaseInterface* CreateFuncBruteForceGpu(cl_context ctx, cl_device_id device, cl_command_queue q)
+	{
+		return new b3GpuSapBroadphase(ctx, device, q, B3_GPU_SAP_KERNEL_BRUTE_FORCE_GPU);
+	}
+
+	static b3GpuBroadphaseInterface* CreateFuncOriginal(cl_context ctx, cl_device_id device, cl_command_queue q)
+	{
+		return new b3GpuSapBroadphase(ctx, device, q, B3_GPU_SAP_KERNEL_ORIGINAL);
+	}
+	static b3GpuBroadphaseInterface* CreateFuncBarrier(cl_context ctx, cl_device_id device, cl_command_queue q)
+	{
+		return new b3GpuSapBroadphase(ctx, device, q, B3_GPU_SAP_KERNEL_BARRIER);
+	}
+	static b3GpuBroadphaseInterface* CreateFuncLocalMemory(cl_context ctx, cl_device_id device, cl_command_queue q)
+	{
+		return new b3GpuSapBroadphase(ctx, device, q, B3_GPU_SAP_KERNEL_LOCAL_SHARED_MEMORY);
+	}
+
+	virtual void calculateOverlappingPairs(int maxPairs);
+	virtual void calculateOverlappingPairsHost(int maxPairs);
+
+	void reset();
+
+	void init3dSap();
+	virtual void calculateOverlappingPairsHostIncremental3Sap();
+
+	virtual void createProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask);
+	virtual void createLargeProxy(const b3Vector3& aabbMin, const b3Vector3& aabbMax, int userPtr, int collisionFilterGroup, int collisionFilterMask);
+
+	//call writeAabbsToGpu after done making all changes (createProxy etc)
+	virtual void writeAabbsToGpu();
+
+	virtual cl_mem getAabbBufferWS();
+	virtual int getNumOverlap();
+	virtual cl_mem getOverlappingPairBuffer();
+
+	virtual b3OpenCLArray<b3Int4>& getOverlappingPairsGPU();
+	virtual b3OpenCLArray<int>& getSmallAabbIndicesGPU();
+	virtual b3OpenCLArray<int>& getLargeAabbIndicesGPU();
+};
+
+#endif  //B3_GPU_SAP_BROADPHASE_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h
new file mode 100644
index 0000000..60570f2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h
@@ -0,0 +1,13 @@
+#ifndef B3_SAP_AABB_H
+#define B3_SAP_AABB_H
+
+#include "Bullet3Common/b3Scalar.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+
+///just make sure that the b3Aabb is 16-byte aligned
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3SapAabb : public b3Aabb{
+
+			};
+
+#endif  //B3_SAP_AABB_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl
new file mode 100644
index 0000000..ded4796
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl
@@ -0,0 +1,216 @@
+
+
+int getPosHash(int4 gridPos, __global float4* pParams)
+{
+	int4 gridDim = *((__global int4*)(pParams + 1));
+	gridPos.x &= gridDim.x - 1;
+	gridPos.y &= gridDim.y - 1;
+	gridPos.z &= gridDim.z - 1;
+	int hash = gridPos.z * gridDim.y * gridDim.x + gridPos.y * gridDim.x + gridPos.x;
+	return hash;
+} 
+
+int4 getGridPos(float4 worldPos, __global float4* pParams)
+{
+    int4 gridPos;
+	int4 gridDim = *((__global int4*)(pParams + 1));
+    gridPos.x = (int)floor(worldPos.x * pParams[0].x) & (gridDim.x - 1);
+    gridPos.y = (int)floor(worldPos.y * pParams[0].y) & (gridDim.y - 1);
+    gridPos.z = (int)floor(worldPos.z * pParams[0].z) & (gridDim.z - 1);
+    return gridPos;
+}
+
+
+// calculate grid hash value for each body using its AABB
+__kernel void kCalcHashAABB(int numObjects, __global float4* allpAABB, __global const int* smallAabbMapping, __global int2* pHash, __global float4* pParams )
+{
+    int index = get_global_id(0);
+    if(index >= numObjects)
+	{
+		return;
+	}
+	float4 bbMin = allpAABB[smallAabbMapping[index]*2];
+	float4 bbMax = allpAABB[smallAabbMapping[index]*2 + 1];
+	float4 pos;
+	pos.x = (bbMin.x + bbMax.x) * 0.5f;
+	pos.y = (bbMin.y + bbMax.y) * 0.5f;
+	pos.z = (bbMin.z + bbMax.z) * 0.5f;
+	pos.w = 0.f;
+    // get address in grid
+    int4 gridPos = getGridPos(pos, pParams);
+    int gridHash = getPosHash(gridPos, pParams);
+    // store grid hash and body index
+    int2 hashVal;
+    hashVal.x = gridHash;
+    hashVal.y = index;
+    pHash[index] = hashVal;
+}
+
+__kernel void kClearCellStart(	int numCells, 
+								__global int* pCellStart )
+{
+    int index = get_global_id(0);
+    if(index >= numCells)
+	{
+		return;
+	}
+	pCellStart[index] = -1;
+}
+
+__kernel void kFindCellStart(int numObjects, __global int2* pHash, __global int* cellStart )
+{
+	__local int sharedHash[513];
+    int index = get_global_id(0);
+	int2 sortedData;
+
+    if(index < numObjects)
+	{
+		sortedData = pHash[index];
+		// Load hash data into shared memory so that we can look 
+		// at neighboring body's hash value without loading
+		// two hash values per thread
+		sharedHash[get_local_id(0) + 1] = sortedData.x;
+		if((index > 0) && (get_local_id(0) == 0))
+		{
+			// first thread in block must load neighbor body hash
+			sharedHash[0] = pHash[index-1].x;
+		}
+	}
+    barrier(CLK_LOCAL_MEM_FENCE);
+    if(index < numObjects)
+	{
+		if((index == 0) || (sortedData.x != sharedHash[get_local_id(0)]))
+		{
+			cellStart[sortedData.x] = index;
+		}
+	}
+}
+
+int testAABBOverlap(float4 min0, float4 max0, float4 min1, float4 max1)
+{
+	return	(min0.x <= max1.x)&& (min1.x <= max0.x) && 
+			(min0.y <= max1.y)&& (min1.y <= max0.y) && 
+			(min0.z <= max1.z)&& (min1.z <= max0.z); 
+}
+
+
+
+
+//search for AABB 'index' against other AABBs' in this cell
+void findPairsInCell(	int numObjects,
+						int4	gridPos,
+						int    index,
+						__global int2*  pHash,
+						__global int*   pCellStart,
+						__global float4* allpAABB, 
+						__global const int* smallAabbMapping,
+						__global float4* pParams,
+							volatile  __global int* pairCount,
+						__global int4*   pPairBuff2,
+						int maxPairs
+						)
+{
+	int4 pGridDim = *((__global int4*)(pParams + 1));
+	int maxBodiesPerCell = pGridDim.w;
+    int gridHash = getPosHash(gridPos, pParams);
+    // get start of bucket for this cell
+    int bucketStart = pCellStart[gridHash];
+    if (bucketStart == -1)
+	{
+        return;   // cell empty
+	}
+	// iterate over bodies in this cell
+    int2 sortedData = pHash[index];
+	int unsorted_indx = sortedData.y;
+    float4 min0 = allpAABB[smallAabbMapping[unsorted_indx]*2 + 0]; 
+	float4 max0 = allpAABB[smallAabbMapping[unsorted_indx]*2 + 1];
+	int handleIndex =  as_int(min0.w);
+	
+	int bucketEnd = bucketStart + maxBodiesPerCell;
+	bucketEnd = (bucketEnd > numObjects) ? numObjects : bucketEnd;
+	for(int index2 = bucketStart; index2 < bucketEnd; index2++) 
+	{
+        int2 cellData = pHash[index2];
+        if (cellData.x != gridHash)
+        {
+			break;   // no longer in same bucket
+		}
+		int unsorted_indx2 = cellData.y;
+        //if (unsorted_indx2 < unsorted_indx) // check not colliding with self
+		if (unsorted_indx2 != unsorted_indx) // check not colliding with self
+        {   
+			float4 min1 = allpAABB[smallAabbMapping[unsorted_indx2]*2 + 0];
+			float4 max1 = allpAABB[smallAabbMapping[unsorted_indx2]*2 + 1];
+			if(testAABBOverlap(min0, max0, min1, max1))
+			{
+				if (pairCount)
+				{
+					int handleIndex2 = as_int(min1.w);
+					if (handleIndex<handleIndex2)
+					{
+						int curPair = atomic_add(pairCount,1);
+						if (curPair<maxPairs)
+						{
+							int4 newpair;
+							newpair.x = handleIndex;
+							newpair.y = handleIndex2;
+							newpair.z = -1;
+							newpair.w = -1;
+							pPairBuff2[curPair] = newpair;
+						}
+					}
+				
+				}
+			}
+		}
+	}
+}
+
+__kernel void kFindOverlappingPairs(	int numObjects,
+										__global float4* allpAABB, 
+										__global const int* smallAabbMapping,
+										__global int2* pHash, 
+										__global int* pCellStart, 
+										__global float4* pParams ,
+										volatile  __global int* pairCount,
+										__global int4*   pPairBuff2,
+										int maxPairs
+										)
+
+{
+    int index = get_global_id(0);
+    if(index >= numObjects)
+	{
+		return;
+	}
+    int2 sortedData = pHash[index];
+	int unsorted_indx = sortedData.y;
+	float4 bbMin = allpAABB[smallAabbMapping[unsorted_indx]*2 + 0];
+	float4 bbMax = allpAABB[smallAabbMapping[unsorted_indx]*2 + 1];
+	float4 pos;
+	pos.x = (bbMin.x + bbMax.x) * 0.5f;
+	pos.y = (bbMin.y + bbMax.y) * 0.5f;
+	pos.z = (bbMin.z + bbMax.z) * 0.5f;
+    // get address in grid
+    int4 gridPosA = getGridPos(pos, pParams);
+    int4 gridPosB; 
+    // examine only neighbouring cells
+    for(int z=-1; z<=1; z++) 
+    {
+		gridPosB.z = gridPosA.z + z;
+        for(int y=-1; y<=1; y++) 
+        {
+			gridPosB.y = gridPosA.y + y;
+            for(int x=-1; x<=1; x++) 
+            {
+				gridPosB.x = gridPosA.x + x;
+                findPairsInCell(numObjects, gridPosB, index, pHash, pCellStart, allpAABB,smallAabbMapping, pParams, pairCount,pPairBuff2, maxPairs);
+            }
+        }
+    }
+}
+
+
+
+
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphaseKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphaseKernels.h
new file mode 100644
index 0000000..0185417
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphaseKernels.h
@@ -0,0 +1,198 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* gridBroadphaseCL =
+	"int getPosHash(int4 gridPos, __global float4* pParams)\n"
+	"{\n"
+	"	int4 gridDim = *((__global int4*)(pParams + 1));\n"
+	"	gridPos.x &= gridDim.x - 1;\n"
+	"	gridPos.y &= gridDim.y - 1;\n"
+	"	gridPos.z &= gridDim.z - 1;\n"
+	"	int hash = gridPos.z * gridDim.y * gridDim.x + gridPos.y * gridDim.x + gridPos.x;\n"
+	"	return hash;\n"
+	"} \n"
+	"int4 getGridPos(float4 worldPos, __global float4* pParams)\n"
+	"{\n"
+	"    int4 gridPos;\n"
+	"	int4 gridDim = *((__global int4*)(pParams + 1));\n"
+	"    gridPos.x = (int)floor(worldPos.x * pParams[0].x) & (gridDim.x - 1);\n"
+	"    gridPos.y = (int)floor(worldPos.y * pParams[0].y) & (gridDim.y - 1);\n"
+	"    gridPos.z = (int)floor(worldPos.z * pParams[0].z) & (gridDim.z - 1);\n"
+	"    return gridPos;\n"
+	"}\n"
+	"// calculate grid hash value for each body using its AABB\n"
+	"__kernel void kCalcHashAABB(int numObjects, __global float4* allpAABB, __global const int* smallAabbMapping, __global int2* pHash, __global float4* pParams )\n"
+	"{\n"
+	"    int index = get_global_id(0);\n"
+	"    if(index >= numObjects)\n"
+	"	{\n"
+	"		return;\n"
+	"	}\n"
+	"	float4 bbMin = allpAABB[smallAabbMapping[index]*2];\n"
+	"	float4 bbMax = allpAABB[smallAabbMapping[index]*2 + 1];\n"
+	"	float4 pos;\n"
+	"	pos.x = (bbMin.x + bbMax.x) * 0.5f;\n"
+	"	pos.y = (bbMin.y + bbMax.y) * 0.5f;\n"
+	"	pos.z = (bbMin.z + bbMax.z) * 0.5f;\n"
+	"	pos.w = 0.f;\n"
+	"    // get address in grid\n"
+	"    int4 gridPos = getGridPos(pos, pParams);\n"
+	"    int gridHash = getPosHash(gridPos, pParams);\n"
+	"    // store grid hash and body index\n"
+	"    int2 hashVal;\n"
+	"    hashVal.x = gridHash;\n"
+	"    hashVal.y = index;\n"
+	"    pHash[index] = hashVal;\n"
+	"}\n"
+	"__kernel void kClearCellStart(	int numCells, \n"
+	"								__global int* pCellStart )\n"
+	"{\n"
+	"    int index = get_global_id(0);\n"
+	"    if(index >= numCells)\n"
+	"	{\n"
+	"		return;\n"
+	"	}\n"
+	"	pCellStart[index] = -1;\n"
+	"}\n"
+	"__kernel void kFindCellStart(int numObjects, __global int2* pHash, __global int* cellStart )\n"
+	"{\n"
+	"	__local int sharedHash[513];\n"
+	"    int index = get_global_id(0);\n"
+	"	int2 sortedData;\n"
+	"    if(index < numObjects)\n"
+	"	{\n"
+	"		sortedData = pHash[index];\n"
+	"		// Load hash data into shared memory so that we can look \n"
+	"		// at neighboring body's hash value without loading\n"
+	"		// two hash values per thread\n"
+	"		sharedHash[get_local_id(0) + 1] = sortedData.x;\n"
+	"		if((index > 0) && (get_local_id(0) == 0))\n"
+	"		{\n"
+	"			// first thread in block must load neighbor body hash\n"
+	"			sharedHash[0] = pHash[index-1].x;\n"
+	"		}\n"
+	"	}\n"
+	"    barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"    if(index < numObjects)\n"
+	"	{\n"
+	"		if((index == 0) || (sortedData.x != sharedHash[get_local_id(0)]))\n"
+	"		{\n"
+	"			cellStart[sortedData.x] = index;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"int testAABBOverlap(float4 min0, float4 max0, float4 min1, float4 max1)\n"
+	"{\n"
+	"	return	(min0.x <= max1.x)&& (min1.x <= max0.x) && \n"
+	"			(min0.y <= max1.y)&& (min1.y <= max0.y) && \n"
+	"			(min0.z <= max1.z)&& (min1.z <= max0.z); \n"
+	"}\n"
+	"//search for AABB 'index' against other AABBs' in this cell\n"
+	"void findPairsInCell(	int numObjects,\n"
+	"						int4	gridPos,\n"
+	"						int    index,\n"
+	"						__global int2*  pHash,\n"
+	"						__global int*   pCellStart,\n"
+	"						__global float4* allpAABB, \n"
+	"						__global const int* smallAabbMapping,\n"
+	"						__global float4* pParams,\n"
+	"							volatile  __global int* pairCount,\n"
+	"						__global int4*   pPairBuff2,\n"
+	"						int maxPairs\n"
+	"						)\n"
+	"{\n"
+	"	int4 pGridDim = *((__global int4*)(pParams + 1));\n"
+	"	int maxBodiesPerCell = pGridDim.w;\n"
+	"    int gridHash = getPosHash(gridPos, pParams);\n"
+	"    // get start of bucket for this cell\n"
+	"    int bucketStart = pCellStart[gridHash];\n"
+	"    if (bucketStart == -1)\n"
+	"	{\n"
+	"        return;   // cell empty\n"
+	"	}\n"
+	"	// iterate over bodies in this cell\n"
+	"    int2 sortedData = pHash[index];\n"
+	"	int unsorted_indx = sortedData.y;\n"
+	"    float4 min0 = allpAABB[smallAabbMapping[unsorted_indx]*2 + 0]; \n"
+	"	float4 max0 = allpAABB[smallAabbMapping[unsorted_indx]*2 + 1];\n"
+	"	int handleIndex =  as_int(min0.w);\n"
+	"	\n"
+	"	int bucketEnd = bucketStart + maxBodiesPerCell;\n"
+	"	bucketEnd = (bucketEnd > numObjects) ? numObjects : bucketEnd;\n"
+	"	for(int index2 = bucketStart; index2 < bucketEnd; index2++) \n"
+	"	{\n"
+	"        int2 cellData = pHash[index2];\n"
+	"        if (cellData.x != gridHash)\n"
+	"        {\n"
+	"			break;   // no longer in same bucket\n"
+	"		}\n"
+	"		int unsorted_indx2 = cellData.y;\n"
+	"        //if (unsorted_indx2 < unsorted_indx) // check not colliding with self\n"
+	"		if (unsorted_indx2 != unsorted_indx) // check not colliding with self\n"
+	"        {   \n"
+	"			float4 min1 = allpAABB[smallAabbMapping[unsorted_indx2]*2 + 0];\n"
+	"			float4 max1 = allpAABB[smallAabbMapping[unsorted_indx2]*2 + 1];\n"
+	"			if(testAABBOverlap(min0, max0, min1, max1))\n"
+	"			{\n"
+	"				if (pairCount)\n"
+	"				{\n"
+	"					int handleIndex2 = as_int(min1.w);\n"
+	"					if (handleIndex<handleIndex2)\n"
+	"					{\n"
+	"						int curPair = atomic_add(pairCount,1);\n"
+	"						if (curPair<maxPairs)\n"
+	"						{\n"
+	"							int4 newpair;\n"
+	"							newpair.x = handleIndex;\n"
+	"							newpair.y = handleIndex2;\n"
+	"							newpair.z = -1;\n"
+	"							newpair.w = -1;\n"
+	"							pPairBuff2[curPair] = newpair;\n"
+	"						}\n"
+	"					}\n"
+	"				\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void kFindOverlappingPairs(	int numObjects,\n"
+	"										__global float4* allpAABB, \n"
+	"										__global const int* smallAabbMapping,\n"
+	"										__global int2* pHash, \n"
+	"										__global int* pCellStart, \n"
+	"										__global float4* pParams ,\n"
+	"										volatile  __global int* pairCount,\n"
+	"										__global int4*   pPairBuff2,\n"
+	"										int maxPairs\n"
+	"										)\n"
+	"{\n"
+	"    int index = get_global_id(0);\n"
+	"    if(index >= numObjects)\n"
+	"	{\n"
+	"		return;\n"
+	"	}\n"
+	"    int2 sortedData = pHash[index];\n"
+	"	int unsorted_indx = sortedData.y;\n"
+	"	float4 bbMin = allpAABB[smallAabbMapping[unsorted_indx]*2 + 0];\n"
+	"	float4 bbMax = allpAABB[smallAabbMapping[unsorted_indx]*2 + 1];\n"
+	"	float4 pos;\n"
+	"	pos.x = (bbMin.x + bbMax.x) * 0.5f;\n"
+	"	pos.y = (bbMin.y + bbMax.y) * 0.5f;\n"
+	"	pos.z = (bbMin.z + bbMax.z) * 0.5f;\n"
+	"    // get address in grid\n"
+	"    int4 gridPosA = getGridPos(pos, pParams);\n"
+	"    int4 gridPosB; \n"
+	"    // examine only neighbouring cells\n"
+	"    for(int z=-1; z<=1; z++) \n"
+	"    {\n"
+	"		gridPosB.z = gridPosA.z + z;\n"
+	"        for(int y=-1; y<=1; y++) \n"
+	"        {\n"
+	"			gridPosB.y = gridPosA.y + y;\n"
+	"            for(int x=-1; x<=1; x++) \n"
+	"            {\n"
+	"				gridPosB.x = gridPosA.x + x;\n"
+	"                findPairsInCell(numObjects, gridPosB, index, pHash, pCellStart, allpAABB,smallAabbMapping, pParams, pairCount,pPairBuff2, maxPairs);\n"
+	"            }\n"
+	"        }\n"
+	"    }\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl
new file mode 100644
index 0000000..c375b9b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl
@@ -0,0 +1,767 @@
+/*
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Initial Author Jackson Lee, 2014
+
+typedef float b3Scalar;
+typedef float4 b3Vector3;
+#define b3Max max
+#define b3Min min
+#define b3Sqrt sqrt
+
+typedef struct
+{
+	unsigned int m_key;
+	unsigned int m_value;
+} SortDataCL;
+
+typedef struct 
+{
+	union
+	{
+		float4	m_min;
+		float   m_minElems[4];
+		int			m_minIndices[4];
+	};
+	union
+	{
+		float4	m_max;
+		float   m_maxElems[4];
+		int			m_maxIndices[4];
+	};
+} b3AabbCL;
+
+
+unsigned int interleaveBits(unsigned int x)
+{
+	//........ ........ ......12 3456789A	//x
+	//....1..2 ..3..4.. 5..6..7. .8..9..A	//x after interleaving bits
+	
+	//......12 3456789A ......12 3456789A	//x ^ (x << 16)
+	//11111111 ........ ........ 11111111	//0x FF 00 00 FF
+	//......12 ........ ........ 3456789A	//x = (x ^ (x << 16)) & 0xFF0000FF;
+	
+	//......12 ........ 3456789A 3456789A	//x ^ (x <<  8)
+	//......11 ........ 1111.... ....1111	//0x 03 00 F0 0F
+	//......12 ........ 3456.... ....789A	//x = (x ^ (x <<  8)) & 0x0300F00F;
+	
+	//..12..12 ....3456 3456.... 789A789A	//x ^ (x <<  4)
+	//......11 ....11.. ..11.... 11....11	//0x 03 0C 30 C3
+	//......12 ....34.. ..56.... 78....9A	//x = (x ^ (x <<  4)) & 0x030C30C3;
+	
+	//....1212 ..3434.. 5656..78 78..9A9A	//x ^ (x <<  2)
+	//....1..1 ..1..1.. 1..1..1. .1..1..1	//0x 09 24 92 49
+	//....1..2 ..3..4.. 5..6..7. .8..9..A	//x = (x ^ (x <<  2)) & 0x09249249;
+	
+	//........ ........ ......11 11111111	//0x000003FF
+	x &= 0x000003FF;		//Clear all bits above bit 10
+	
+	x = (x ^ (x << 16)) & 0xFF0000FF;
+	x = (x ^ (x <<  8)) & 0x0300F00F;
+	x = (x ^ (x <<  4)) & 0x030C30C3;
+	x = (x ^ (x <<  2)) & 0x09249249;
+	
+	return x;
+}
+unsigned int getMortonCode(unsigned int x, unsigned int y, unsigned int z)
+{
+	return interleaveBits(x) << 0 | interleaveBits(y) << 1 | interleaveBits(z) << 2;
+}
+
+__kernel void separateAabbs(__global b3AabbCL* unseparatedAabbs, __global int* aabbIndices, __global b3AabbCL* out_aabbs, int numAabbsToSeparate)
+{
+	int separatedAabbIndex = get_global_id(0);
+	if(separatedAabbIndex >= numAabbsToSeparate) return;
+
+	int unseparatedAabbIndex = aabbIndices[separatedAabbIndex];
+	out_aabbs[separatedAabbIndex] = unseparatedAabbs[unseparatedAabbIndex];
+}
+
+//Should replace with an optimized parallel reduction
+__kernel void findAllNodesMergedAabb(__global b3AabbCL* out_mergedAabb, int numAabbsNeedingMerge)
+{
+	//Each time this kernel is added to the command queue, 
+	//the number of AABBs needing to be merged is halved
+	//
+	//Example with 159 AABBs:
+	//	numRemainingAabbs == 159 / 2 + 159 % 2 == 80
+	//	numMergedAabbs == 159 - 80 == 79
+	//So, indices [0, 78] are merged with [0 + 80, 78 + 80]
+	
+	int numRemainingAabbs = numAabbsNeedingMerge / 2 + numAabbsNeedingMerge % 2;
+	int numMergedAabbs = numAabbsNeedingMerge - numRemainingAabbs;
+	
+	int aabbIndex = get_global_id(0);
+	if(aabbIndex >= numMergedAabbs) return;
+	
+	int otherAabbIndex = aabbIndex + numRemainingAabbs;
+	
+	b3AabbCL aabb = out_mergedAabb[aabbIndex];
+	b3AabbCL otherAabb = out_mergedAabb[otherAabbIndex];
+		
+	b3AabbCL mergedAabb;
+	mergedAabb.m_min = b3Min(aabb.m_min, otherAabb.m_min);
+	mergedAabb.m_max = b3Max(aabb.m_max, otherAabb.m_max);
+	out_mergedAabb[aabbIndex] = mergedAabb;
+}
+
+__kernel void assignMortonCodesAndAabbIndicies(__global b3AabbCL* worldSpaceAabbs, __global b3AabbCL* mergedAabbOfAllNodes, 
+												__global SortDataCL* out_mortonCodesAndAabbIndices, int numAabbs)
+{
+	int leafNodeIndex = get_global_id(0);	//Leaf node index == AABB index
+	if(leafNodeIndex >= numAabbs) return;
+	
+	b3AabbCL mergedAabb = mergedAabbOfAllNodes[0];
+	b3Vector3 gridCenter = (mergedAabb.m_min + mergedAabb.m_max) * 0.5f;
+	b3Vector3 gridCellSize = (mergedAabb.m_max - mergedAabb.m_min) / (float)1024;
+	
+	b3AabbCL aabb = worldSpaceAabbs[leafNodeIndex];
+	b3Vector3 aabbCenter = (aabb.m_min + aabb.m_max) * 0.5f;
+	b3Vector3 aabbCenterRelativeToGrid = aabbCenter - gridCenter;
+	
+	//Quantize into integer coordinates
+	//floor() is needed to prevent the center cell, at (0,0,0) from being twice the size
+	b3Vector3 gridPosition = aabbCenterRelativeToGrid / gridCellSize;
+	
+	int4 discretePosition;
+	discretePosition.x = (int)( (gridPosition.x >= 0.0f) ? gridPosition.x : floor(gridPosition.x) );
+	discretePosition.y = (int)( (gridPosition.y >= 0.0f) ? gridPosition.y : floor(gridPosition.y) );
+	discretePosition.z = (int)( (gridPosition.z >= 0.0f) ? gridPosition.z : floor(gridPosition.z) );
+	
+	//Clamp coordinates into [-512, 511], then convert range from [-512, 511] to [0, 1023]
+	discretePosition = b3Max( -512, b3Min(discretePosition, 511) );
+	discretePosition += 512;
+	
+	//Interleave bits(assign a morton code, also known as a z-curve)
+	unsigned int mortonCode = getMortonCode(discretePosition.x, discretePosition.y, discretePosition.z);
+	
+	//
+	SortDataCL mortonCodeIndexPair;
+	mortonCodeIndexPair.m_key = mortonCode;
+	mortonCodeIndexPair.m_value = leafNodeIndex;
+	
+	out_mortonCodesAndAabbIndices[leafNodeIndex] = mortonCodeIndexPair;
+}
+
+#define B3_PLVBH_TRAVERSE_MAX_STACK_SIZE 128
+
+//The most significant bit(0x80000000) of a int32 is used to distinguish between leaf and internal nodes.
+//If it is set, then the index is for an internal node; otherwise, it is a leaf node. 
+//In both cases, the bit should be cleared to access the actual node index.
+int isLeafNode(int index) { return (index >> 31 == 0); }
+int getIndexWithInternalNodeMarkerRemoved(int index) { return index & (~0x80000000); }
+int getIndexWithInternalNodeMarkerSet(int isLeaf, int index) { return (isLeaf) ? index : (index | 0x80000000); }
+
+//From sap.cl
+#define NEW_PAIR_MARKER -1
+
+bool TestAabbAgainstAabb2(const b3AabbCL* aabb1, const b3AabbCL* aabb2)
+{
+	bool overlap = true;
+	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;
+	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;
+	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;
+	return overlap;
+}
+//From sap.cl
+
+__kernel void plbvhCalculateOverlappingPairs(__global b3AabbCL* rigidAabbs, 
+
+											__global int* rootNodeIndex, 
+											__global int2* internalNodeChildIndices, 
+											__global b3AabbCL* internalNodeAabbs,
+											__global int2* internalNodeLeafIndexRanges,
+											
+											__global SortDataCL* mortonCodesAndAabbIndices,
+											__global int* out_numPairs, __global int4* out_overlappingPairs, 
+											int maxPairs, int numQueryAabbs)
+{
+	//Using get_group_id()/get_local_id() is Faster than get_global_id(0) since
+	//mortonCodesAndAabbIndices[] contains rigid body indices sorted along the z-curve (more spatially coherent)
+	int queryBvhNodeIndex = get_group_id(0) * get_local_size(0) + get_local_id(0);
+	if(queryBvhNodeIndex >= numQueryAabbs) return;
+	
+	int queryRigidIndex = mortonCodesAndAabbIndices[queryBvhNodeIndex].m_value;
+	b3AabbCL queryAabb = rigidAabbs[queryRigidIndex];
+	
+	int stack[B3_PLVBH_TRAVERSE_MAX_STACK_SIZE];
+	
+	int stackSize = 1;
+	stack[0] = *rootNodeIndex;
+	
+	while(stackSize)
+	{
+		int internalOrLeafNodeIndex = stack[ stackSize - 1 ];
+		--stackSize;
+		
+		int isLeaf = isLeafNode(internalOrLeafNodeIndex);	//Internal node if false
+		int bvhNodeIndex = getIndexWithInternalNodeMarkerRemoved(internalOrLeafNodeIndex);
+		
+		//Optimization - if the BVH is structured as a binary radix tree, then
+		//each internal node corresponds to a contiguous range of leaf nodes(internalNodeLeafIndexRanges[]).
+		//This can be used to avoid testing each AABB-AABB pair twice, including preventing each node from colliding with itself.
+		{
+			int highestLeafIndex = (isLeaf) ? bvhNodeIndex : internalNodeLeafIndexRanges[bvhNodeIndex].y;
+			if(highestLeafIndex <= queryBvhNodeIndex) continue;
+		}
+		
+		//bvhRigidIndex is not used if internal node
+		int bvhRigidIndex = (isLeaf) ? mortonCodesAndAabbIndices[bvhNodeIndex].m_value : -1;
+	
+		b3AabbCL bvhNodeAabb = (isLeaf) ? rigidAabbs[bvhRigidIndex] : internalNodeAabbs[bvhNodeIndex];
+		if( TestAabbAgainstAabb2(&queryAabb, &bvhNodeAabb) )
+		{
+			if(isLeaf)
+			{
+				int4 pair;
+				pair.x = rigidAabbs[queryRigidIndex].m_minIndices[3];
+				pair.y = rigidAabbs[bvhRigidIndex].m_minIndices[3];
+				pair.z = NEW_PAIR_MARKER;
+				pair.w = NEW_PAIR_MARKER;
+				
+				int pairIndex = atomic_inc(out_numPairs);
+				if(pairIndex < maxPairs) out_overlappingPairs[pairIndex] = pair;
+			}
+			
+			if(!isLeaf)	//Internal node
+			{
+				if(stackSize + 2 > B3_PLVBH_TRAVERSE_MAX_STACK_SIZE)
+				{
+					//Error
+				}
+				else
+				{
+					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].x;
+					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].y;
+				}
+			}
+		}
+		
+	}
+}
+
+
+//From rayCastKernels.cl
+typedef struct
+{
+	float4 m_from;
+	float4 m_to;
+} b3RayInfo;
+//From rayCastKernels.cl
+
+b3Vector3 b3Vector3_normalize(b3Vector3 v)
+{
+	b3Vector3 normal = (b3Vector3){v.x, v.y, v.z, 0.f};
+	return normalize(normal);	//OpenCL normalize == vector4 normalize
+}
+b3Scalar b3Vector3_length2(b3Vector3 v) { return v.x*v.x + v.y*v.y + v.z*v.z; }
+b3Scalar b3Vector3_dot(b3Vector3 a, b3Vector3 b) { return a.x*b.x + a.y*b.y + a.z*b.z; }
+
+int rayIntersectsAabb(b3Vector3 rayOrigin, b3Scalar rayLength, b3Vector3 rayNormalizedDirection, b3AabbCL aabb)
+{
+	//AABB is considered as 3 pairs of 2 planes( {x_min, x_max}, {y_min, y_max}, {z_min, z_max} ).
+	//t_min is the point of intersection with the closer plane, t_max is the point of intersection with the farther plane.
+	//
+	//if (rayNormalizedDirection.x < 0.0f), then max.x will be the near plane 
+	//and min.x will be the far plane; otherwise, it is reversed.
+	//
+	//In order for there to be a collision, the t_min and t_max of each pair must overlap.
+	//This can be tested for by selecting the highest t_min and lowest t_max and comparing them.
+	
+	int4 isNegative = isless( rayNormalizedDirection, ((b3Vector3){0.0f, 0.0f, 0.0f, 0.0f}) );	//isless(x,y) returns (x < y)
+	
+	//When using vector types, the select() function checks the most signficant bit, 
+	//but isless() sets the least significant bit.
+	isNegative <<= 31;
+
+	//select(b, a, condition) == condition ? a : b
+	//When using select() with vector types, (condition[i]) is true if its most significant bit is 1
+	b3Vector3 t_min = ( select(aabb.m_min, aabb.m_max, isNegative) - rayOrigin ) / rayNormalizedDirection;
+	b3Vector3 t_max = ( select(aabb.m_max, aabb.m_min, isNegative) - rayOrigin ) / rayNormalizedDirection;
+	
+	b3Scalar t_min_final = 0.0f;
+	b3Scalar t_max_final = rayLength;
+	
+	//Must use fmin()/fmax(); if one of the parameters is NaN, then the parameter that is not NaN is returned. 
+	//Behavior of min()/max() with NaNs is undefined. (See OpenCL Specification 1.2 [6.12.2] and [6.12.4])
+	//Since the innermost fmin()/fmax() is always not NaN, this should never return NaN.
+	t_min_final = fmax( t_min.z, fmax(t_min.y, fmax(t_min.x, t_min_final)) );
+	t_max_final = fmin( t_max.z, fmin(t_max.y, fmin(t_max.x, t_max_final)) );
+	
+	return (t_min_final <= t_max_final);
+}
+
+__kernel void plbvhRayTraverse(__global b3AabbCL* rigidAabbs,
+
+								__global int* rootNodeIndex, 
+								__global int2* internalNodeChildIndices, 
+								__global b3AabbCL* internalNodeAabbs,
+								__global int2* internalNodeLeafIndexRanges,
+								__global SortDataCL* mortonCodesAndAabbIndices,
+								
+								__global b3RayInfo* rays,
+								
+								__global int* out_numRayRigidPairs, 
+								__global int2* out_rayRigidPairs,
+								int maxRayRigidPairs, int numRays)
+{
+	int rayIndex = get_global_id(0);
+	if(rayIndex >= numRays) return;
+	
+	//
+	b3Vector3 rayFrom = rays[rayIndex].m_from;
+	b3Vector3 rayTo = rays[rayIndex].m_to;
+	b3Vector3 rayNormalizedDirection = b3Vector3_normalize(rayTo - rayFrom);
+	b3Scalar rayLength = b3Sqrt( b3Vector3_length2(rayTo - rayFrom) );
+	
+	//
+	int stack[B3_PLVBH_TRAVERSE_MAX_STACK_SIZE];
+	
+	int stackSize = 1;
+	stack[0] = *rootNodeIndex;
+	
+	while(stackSize)
+	{
+		int internalOrLeafNodeIndex = stack[ stackSize - 1 ];
+		--stackSize;
+		
+		int isLeaf = isLeafNode(internalOrLeafNodeIndex);	//Internal node if false
+		int bvhNodeIndex = getIndexWithInternalNodeMarkerRemoved(internalOrLeafNodeIndex);
+		
+		//bvhRigidIndex is not used if internal node
+		int bvhRigidIndex = (isLeaf) ? mortonCodesAndAabbIndices[bvhNodeIndex].m_value : -1;
+	
+		b3AabbCL bvhNodeAabb = (isLeaf) ? rigidAabbs[bvhRigidIndex] : internalNodeAabbs[bvhNodeIndex];
+		if( rayIntersectsAabb(rayFrom, rayLength, rayNormalizedDirection, bvhNodeAabb)  )
+		{
+			if(isLeaf)
+			{
+				int2 rayRigidPair;
+				rayRigidPair.x = rayIndex;
+				rayRigidPair.y = rigidAabbs[bvhRigidIndex].m_minIndices[3];
+				
+				int pairIndex = atomic_inc(out_numRayRigidPairs);
+				if(pairIndex < maxRayRigidPairs) out_rayRigidPairs[pairIndex] = rayRigidPair;
+			}
+			
+			if(!isLeaf)	//Internal node
+			{
+				if(stackSize + 2 > B3_PLVBH_TRAVERSE_MAX_STACK_SIZE)
+				{
+					//Error
+				}
+				else
+				{
+					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].x;
+					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].y;
+				}
+			}
+		}
+	}
+}
+
+__kernel void plbvhLargeAabbAabbTest(__global b3AabbCL* smallAabbs, __global b3AabbCL* largeAabbs, 
+									__global int* out_numPairs, __global int4* out_overlappingPairs, 
+									int maxPairs, int numLargeAabbRigids, int numSmallAabbRigids)
+{
+	int smallAabbIndex = get_global_id(0);
+	if(smallAabbIndex >= numSmallAabbRigids) return;
+	
+	b3AabbCL smallAabb = smallAabbs[smallAabbIndex];
+	for(int i = 0; i < numLargeAabbRigids; ++i)
+	{
+		b3AabbCL largeAabb = largeAabbs[i];
+		if( TestAabbAgainstAabb2(&smallAabb, &largeAabb) )
+		{
+			int4 pair;
+			pair.x = largeAabb.m_minIndices[3];
+			pair.y = smallAabb.m_minIndices[3];
+			pair.z = NEW_PAIR_MARKER;
+			pair.w = NEW_PAIR_MARKER;
+			
+			int pairIndex = atomic_inc(out_numPairs);
+			if(pairIndex < maxPairs) out_overlappingPairs[pairIndex] = pair;
+		}
+	}
+}
+__kernel void plbvhLargeAabbRayTest(__global b3AabbCL* largeRigidAabbs, __global b3RayInfo* rays,
+									__global int* out_numRayRigidPairs,  __global int2* out_rayRigidPairs,
+									int numLargeAabbRigids, int maxRayRigidPairs, int numRays)
+{
+	int rayIndex = get_global_id(0);
+	if(rayIndex >= numRays) return;
+	
+	b3Vector3 rayFrom = rays[rayIndex].m_from;
+	b3Vector3 rayTo = rays[rayIndex].m_to;
+	b3Vector3 rayNormalizedDirection = b3Vector3_normalize(rayTo - rayFrom);
+	b3Scalar rayLength = b3Sqrt( b3Vector3_length2(rayTo - rayFrom) );
+	
+	for(int i = 0; i < numLargeAabbRigids; ++i)
+	{
+		b3AabbCL rigidAabb = largeRigidAabbs[i];
+		if( rayIntersectsAabb(rayFrom, rayLength, rayNormalizedDirection, rigidAabb) )
+		{
+			int2 rayRigidPair;
+			rayRigidPair.x = rayIndex;
+			rayRigidPair.y = rigidAabb.m_minIndices[3];
+			
+			int pairIndex = atomic_inc(out_numRayRigidPairs);
+			if(pairIndex < maxRayRigidPairs) out_rayRigidPairs[pairIndex] = rayRigidPair;
+		}
+	}
+}
+
+
+//Set so that it is always greater than the actual common prefixes, and never selected as a parent node.
+//If there are no duplicates, then the highest common prefix is 32 or 64, depending on the number of bits used for the z-curve.
+//Duplicate common prefixes increase the highest common prefix at most by the number of bits used to index the leaf node.
+//Since 32 bit ints are used to index leaf nodes, the max prefix is 64(32 + 32 bit z-curve) or 96(32 + 64 bit z-curve).
+#define B3_PLBVH_INVALID_COMMON_PREFIX 128
+
+#define B3_PLBVH_ROOT_NODE_MARKER -1
+
+#define b3Int64 long
+
+int computeCommonPrefixLength(b3Int64 i, b3Int64 j) { return (int)clz(i ^ j); }
+b3Int64 computeCommonPrefix(b3Int64 i, b3Int64 j) 
+{
+	//This function only needs to return (i & j) in order for the algorithm to work,
+	//but it may help with debugging to mask out the lower bits.
+
+	b3Int64 commonPrefixLength = (b3Int64)computeCommonPrefixLength(i, j);
+
+	b3Int64 sharedBits = i & j;
+	b3Int64 bitmask = ((b3Int64)(~0)) << (64 - commonPrefixLength);	//Set all bits after the common prefix to 0
+	
+	return sharedBits & bitmask;
+}
+
+//Same as computeCommonPrefixLength(), but allows for prefixes with different lengths
+int getSharedPrefixLength(b3Int64 prefixA, int prefixLengthA, b3Int64 prefixB, int prefixLengthB)
+{
+	return b3Min( computeCommonPrefixLength(prefixA, prefixB), b3Min(prefixLengthA, prefixLengthB) );
+}
+
+__kernel void computeAdjacentPairCommonPrefix(__global SortDataCL* mortonCodesAndAabbIndices,
+											__global b3Int64* out_commonPrefixes,
+											__global int* out_commonPrefixLengths,
+											int numInternalNodes)
+{
+	int internalNodeIndex = get_global_id(0);
+	if (internalNodeIndex >= numInternalNodes) return;
+	
+	//Here, (internalNodeIndex + 1) is never out of bounds since it is a leaf node index,
+	//and the number of internal nodes is always numLeafNodes - 1
+	int leftLeafIndex = internalNodeIndex;
+	int rightLeafIndex = internalNodeIndex + 1;
+	
+	int leftLeafMortonCode = mortonCodesAndAabbIndices[leftLeafIndex].m_key;
+	int rightLeafMortonCode = mortonCodesAndAabbIndices[rightLeafIndex].m_key;
+	
+	//Binary radix tree construction algorithm does not work if there are duplicate morton codes.
+	//Append the index of each leaf node to each morton code so that there are no duplicates.
+	//The algorithm also requires that the morton codes are sorted in ascending order; this requirement
+	//is also satisfied with this method, as (leftLeafIndex < rightLeafIndex) is always true.
+	//
+	//upsample(a, b) == ( ((b3Int64)a) << 32) | b
+	b3Int64 nonduplicateLeftMortonCode = upsample(leftLeafMortonCode, leftLeafIndex);
+	b3Int64 nonduplicateRightMortonCode = upsample(rightLeafMortonCode, rightLeafIndex);
+	
+	out_commonPrefixes[internalNodeIndex] = computeCommonPrefix(nonduplicateLeftMortonCode, nonduplicateRightMortonCode);
+	out_commonPrefixLengths[internalNodeIndex] = computeCommonPrefixLength(nonduplicateLeftMortonCode, nonduplicateRightMortonCode);
+}
+
+
+__kernel void buildBinaryRadixTreeLeafNodes(__global int* commonPrefixLengths, __global int* out_leafNodeParentNodes,
+											__global int2* out_childNodes, int numLeafNodes)
+{
+	int leafNodeIndex = get_global_id(0);
+	if (leafNodeIndex >= numLeafNodes) return;
+	
+	int numInternalNodes = numLeafNodes - 1;
+	
+	int leftSplitIndex = leafNodeIndex - 1;
+	int rightSplitIndex = leafNodeIndex;
+	
+	int leftCommonPrefix = (leftSplitIndex >= 0) ? commonPrefixLengths[leftSplitIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;
+	int rightCommonPrefix = (rightSplitIndex < numInternalNodes) ? commonPrefixLengths[rightSplitIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;
+	
+	//Parent node is the highest adjacent common prefix that is lower than the node's common prefix
+	//Leaf nodes are considered as having the highest common prefix
+	int isLeftHigherCommonPrefix = (leftCommonPrefix > rightCommonPrefix);
+	
+	//Handle cases for the edge nodes; the first and last node
+	//For leaf nodes, leftCommonPrefix and rightCommonPrefix should never both be B3_PLBVH_INVALID_COMMON_PREFIX
+	if(leftCommonPrefix == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherCommonPrefix = false;
+	if(rightCommonPrefix == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherCommonPrefix = true;
+	
+	int parentNodeIndex = (isLeftHigherCommonPrefix) ? leftSplitIndex : rightSplitIndex;
+	out_leafNodeParentNodes[leafNodeIndex] = parentNodeIndex;
+	
+	int isRightChild = (isLeftHigherCommonPrefix);	//If the left node is the parent, then this node is its right child and vice versa
+	
+	//out_childNodesAsInt[0] == int2.x == left child
+	//out_childNodesAsInt[1] == int2.y == right child
+	int isLeaf = 1;
+	__global int* out_childNodesAsInt = (__global int*)(&out_childNodes[parentNodeIndex]);
+	out_childNodesAsInt[isRightChild] = getIndexWithInternalNodeMarkerSet(isLeaf, leafNodeIndex);
+}
+
+__kernel void buildBinaryRadixTreeInternalNodes(__global b3Int64* commonPrefixes, __global int* commonPrefixLengths,
+												__global int2* out_childNodes,
+												__global int* out_internalNodeParentNodes, __global int* out_rootNodeIndex,
+												int numInternalNodes)
+{
+	int internalNodeIndex = get_group_id(0) * get_local_size(0) + get_local_id(0);
+	if(internalNodeIndex >= numInternalNodes) return;
+	
+	b3Int64 nodePrefix = commonPrefixes[internalNodeIndex];
+	int nodePrefixLength = commonPrefixLengths[internalNodeIndex];
+	
+//#define USE_LINEAR_SEARCH
+#ifdef USE_LINEAR_SEARCH
+	int leftIndex = -1;
+	int rightIndex = -1;
+	
+	//Find nearest element to left with a lower common prefix
+	for(int i = internalNodeIndex - 1; i >= 0; --i)
+	{
+		int nodeLeftSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, commonPrefixes[i], commonPrefixLengths[i]);
+		if(nodeLeftSharedPrefixLength < nodePrefixLength)
+		{
+			leftIndex = i;
+			break;
+		}
+	}
+	
+	//Find nearest element to right with a lower common prefix
+	for(int i = internalNodeIndex + 1; i < numInternalNodes; ++i)
+	{
+		int nodeRightSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, commonPrefixes[i], commonPrefixLengths[i]);
+		if(nodeRightSharedPrefixLength < nodePrefixLength)
+		{
+			rightIndex = i;
+			break;
+		}
+	}
+	
+#else //Use binary search
+
+	//Find nearest element to left with a lower common prefix
+	int leftIndex = -1;
+	{
+		int lower = 0;
+		int upper = internalNodeIndex - 1;
+		
+		while(lower <= upper)
+		{
+			int mid = (lower + upper) / 2;
+			b3Int64 midPrefix = commonPrefixes[mid];
+			int midPrefixLength = commonPrefixLengths[mid];
+			
+			int nodeMidSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, midPrefix, midPrefixLength);
+			if(nodeMidSharedPrefixLength < nodePrefixLength) 
+			{
+				int right = mid + 1;
+				if(right < internalNodeIndex)
+				{
+					b3Int64 rightPrefix = commonPrefixes[right];
+					int rightPrefixLength = commonPrefixLengths[right];
+					
+					int nodeRightSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, rightPrefix, rightPrefixLength);
+					if(nodeRightSharedPrefixLength < nodePrefixLength) 
+					{
+						lower = right;
+						leftIndex = right;
+					}
+					else 
+					{
+						leftIndex = mid;
+						break;
+					}
+				}
+				else 
+				{
+					leftIndex = mid;
+					break;
+				}
+			}
+			else upper = mid - 1;
+		}
+	}
+	
+	//Find nearest element to right with a lower common prefix
+	int rightIndex = -1;
+	{
+		int lower = internalNodeIndex + 1;
+		int upper = numInternalNodes - 1;
+		
+		while(lower <= upper)
+		{
+			int mid = (lower + upper) / 2;
+			b3Int64 midPrefix = commonPrefixes[mid];
+			int midPrefixLength = commonPrefixLengths[mid];
+			
+			int nodeMidSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, midPrefix, midPrefixLength);
+			if(nodeMidSharedPrefixLength < nodePrefixLength) 
+			{
+				int left = mid - 1;
+				if(left > internalNodeIndex)
+				{
+					b3Int64 leftPrefix = commonPrefixes[left];
+					int leftPrefixLength = commonPrefixLengths[left];
+				
+					int nodeLeftSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, leftPrefix, leftPrefixLength);
+					if(nodeLeftSharedPrefixLength < nodePrefixLength) 
+					{
+						upper = left;
+						rightIndex = left;
+					}
+					else 
+					{
+						rightIndex = mid;
+						break;
+					}
+				}
+				else 
+				{
+					rightIndex = mid;
+					break;
+				}
+			}
+			else lower = mid + 1;
+		}
+	}
+#endif
+	
+	//Select parent
+	{
+		int leftPrefixLength = (leftIndex != -1) ? commonPrefixLengths[leftIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;
+		int rightPrefixLength =  (rightIndex != -1) ? commonPrefixLengths[rightIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;
+		
+		int isLeftHigherPrefixLength = (leftPrefixLength > rightPrefixLength);
+		
+		if(leftPrefixLength == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherPrefixLength = false;
+		else if(rightPrefixLength == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherPrefixLength = true;
+		
+		int parentNodeIndex = (isLeftHigherPrefixLength) ? leftIndex : rightIndex;
+		
+		int isRootNode = (leftIndex == -1 && rightIndex == -1);
+		out_internalNodeParentNodes[internalNodeIndex] = (!isRootNode) ? parentNodeIndex : B3_PLBVH_ROOT_NODE_MARKER;
+		
+		int isLeaf = 0;
+		if(!isRootNode)
+		{
+			int isRightChild = (isLeftHigherPrefixLength);	//If the left node is the parent, then this node is its right child and vice versa
+			
+			//out_childNodesAsInt[0] == int2.x == left child
+			//out_childNodesAsInt[1] == int2.y == right child
+			__global int* out_childNodesAsInt = (__global int*)(&out_childNodes[parentNodeIndex]);
+			out_childNodesAsInt[isRightChild] = getIndexWithInternalNodeMarkerSet(isLeaf, internalNodeIndex);
+		}
+		else *out_rootNodeIndex = getIndexWithInternalNodeMarkerSet(isLeaf, internalNodeIndex);
+	}
+}
+
+__kernel void findDistanceFromRoot(__global int* rootNodeIndex, __global int* internalNodeParentNodes,
+									__global int* out_maxDistanceFromRoot, __global int* out_distanceFromRoot, int numInternalNodes)
+{
+	if( get_global_id(0) == 0 ) atomic_xchg(out_maxDistanceFromRoot, 0);
+
+	int internalNodeIndex = get_global_id(0);
+	if(internalNodeIndex >= numInternalNodes) return;
+	
+	//
+	int distanceFromRoot = 0;
+	{
+		int parentIndex = internalNodeParentNodes[internalNodeIndex];
+		while(parentIndex != B3_PLBVH_ROOT_NODE_MARKER)
+		{
+			parentIndex = internalNodeParentNodes[parentIndex];
+			++distanceFromRoot;
+		}
+	}
+	out_distanceFromRoot[internalNodeIndex] = distanceFromRoot;
+	
+	//
+	__local int localMaxDistanceFromRoot;
+	if( get_local_id(0) == 0 ) localMaxDistanceFromRoot = 0;
+	barrier(CLK_LOCAL_MEM_FENCE);
+	
+	atomic_max(&localMaxDistanceFromRoot, distanceFromRoot);
+	barrier(CLK_LOCAL_MEM_FENCE);
+	
+	if( get_local_id(0) == 0 ) atomic_max(out_maxDistanceFromRoot, localMaxDistanceFromRoot);
+}
+
+__kernel void buildBinaryRadixTreeAabbsRecursive(__global int* distanceFromRoot, __global SortDataCL* mortonCodesAndAabbIndices,
+												__global int2* childNodes,
+												__global b3AabbCL* leafNodeAabbs, __global b3AabbCL* internalNodeAabbs,
+												int maxDistanceFromRoot, int processedDistance, int numInternalNodes)
+{
+	int internalNodeIndex = get_global_id(0);
+	if(internalNodeIndex >= numInternalNodes) return;
+	
+	int distance = distanceFromRoot[internalNodeIndex];
+	
+	if(distance == processedDistance)
+	{
+		int leftChildIndex = childNodes[internalNodeIndex].x;
+		int rightChildIndex = childNodes[internalNodeIndex].y;
+		
+		int isLeftChildLeaf = isLeafNode(leftChildIndex);
+		int isRightChildLeaf = isLeafNode(rightChildIndex);
+		
+		leftChildIndex = getIndexWithInternalNodeMarkerRemoved(leftChildIndex);
+		rightChildIndex = getIndexWithInternalNodeMarkerRemoved(rightChildIndex);
+		
+		//leftRigidIndex/rightRigidIndex is not used if internal node
+		int leftRigidIndex = (isLeftChildLeaf) ? mortonCodesAndAabbIndices[leftChildIndex].m_value : -1;
+		int rightRigidIndex = (isRightChildLeaf) ? mortonCodesAndAabbIndices[rightChildIndex].m_value : -1;
+		
+		b3AabbCL leftChildAabb = (isLeftChildLeaf) ? leafNodeAabbs[leftRigidIndex] : internalNodeAabbs[leftChildIndex];
+		b3AabbCL rightChildAabb = (isRightChildLeaf) ? leafNodeAabbs[rightRigidIndex] : internalNodeAabbs[rightChildIndex];
+		
+		b3AabbCL mergedAabb;
+		mergedAabb.m_min = b3Min(leftChildAabb.m_min, rightChildAabb.m_min);
+		mergedAabb.m_max = b3Max(leftChildAabb.m_max, rightChildAabb.m_max);
+		internalNodeAabbs[internalNodeIndex] = mergedAabb;
+	}
+}
+
+__kernel void findLeafIndexRanges(__global int2* internalNodeChildNodes, __global int2* out_leafIndexRanges, int numInternalNodes)
+{
+	int internalNodeIndex = get_global_id(0);
+	if(internalNodeIndex >= numInternalNodes) return;
+	
+	int numLeafNodes = numInternalNodes + 1;
+	
+	int2 childNodes = internalNodeChildNodes[internalNodeIndex];
+	
+	int2 leafIndexRange;	//x == min leaf index, y == max leaf index
+	
+	//Find lowest leaf index covered by this internal node
+	{
+		int lowestIndex = childNodes.x;		//childNodes.x == Left child
+		while( !isLeafNode(lowestIndex) ) lowestIndex = internalNodeChildNodes[ getIndexWithInternalNodeMarkerRemoved(lowestIndex) ].x;
+		leafIndexRange.x = lowestIndex;
+	}
+	
+	//Find highest leaf index covered by this internal node
+	{
+		int highestIndex = childNodes.y;	//childNodes.y == Right child
+		while( !isLeafNode(highestIndex) ) highestIndex = internalNodeChildNodes[ getIndexWithInternalNodeMarkerRemoved(highestIndex) ].y;
+		leafIndexRange.y = highestIndex;
+	}
+	
+	//
+	out_leafIndexRanges[internalNodeIndex] = leafIndexRange;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvhKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvhKernels.h
new file mode 100644
index 0000000..c02877d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvhKernels.h
@@ -0,0 +1,728 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* parallelLinearBvhCL =
+	"/*\n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose,\n"
+	"including commercial applications, and to alter it and redistribute it freely,\n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Initial Author Jackson Lee, 2014\n"
+	"typedef float b3Scalar;\n"
+	"typedef float4 b3Vector3;\n"
+	"#define b3Max max\n"
+	"#define b3Min min\n"
+	"#define b3Sqrt sqrt\n"
+	"typedef struct\n"
+	"{\n"
+	"	unsigned int m_key;\n"
+	"	unsigned int m_value;\n"
+	"} SortDataCL;\n"
+	"typedef struct \n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_min;\n"
+	"		float   m_minElems[4];\n"
+	"		int			m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_max;\n"
+	"		float   m_maxElems[4];\n"
+	"		int			m_maxIndices[4];\n"
+	"	};\n"
+	"} b3AabbCL;\n"
+	"unsigned int interleaveBits(unsigned int x)\n"
+	"{\n"
+	"	//........ ........ ......12 3456789A	//x\n"
+	"	//....1..2 ..3..4.. 5..6..7. .8..9..A	//x after interleaving bits\n"
+	"	\n"
+	"	//......12 3456789A ......12 3456789A	//x ^ (x << 16)\n"
+	"	//11111111 ........ ........ 11111111	//0x FF 00 00 FF\n"
+	"	//......12 ........ ........ 3456789A	//x = (x ^ (x << 16)) & 0xFF0000FF;\n"
+	"	\n"
+	"	//......12 ........ 3456789A 3456789A	//x ^ (x <<  8)\n"
+	"	//......11 ........ 1111.... ....1111	//0x 03 00 F0 0F\n"
+	"	//......12 ........ 3456.... ....789A	//x = (x ^ (x <<  8)) & 0x0300F00F;\n"
+	"	\n"
+	"	//..12..12 ....3456 3456.... 789A789A	//x ^ (x <<  4)\n"
+	"	//......11 ....11.. ..11.... 11....11	//0x 03 0C 30 C3\n"
+	"	//......12 ....34.. ..56.... 78....9A	//x = (x ^ (x <<  4)) & 0x030C30C3;\n"
+	"	\n"
+	"	//....1212 ..3434.. 5656..78 78..9A9A	//x ^ (x <<  2)\n"
+	"	//....1..1 ..1..1.. 1..1..1. .1..1..1	//0x 09 24 92 49\n"
+	"	//....1..2 ..3..4.. 5..6..7. .8..9..A	//x = (x ^ (x <<  2)) & 0x09249249;\n"
+	"	\n"
+	"	//........ ........ ......11 11111111	//0x000003FF\n"
+	"	x &= 0x000003FF;		//Clear all bits above bit 10\n"
+	"	\n"
+	"	x = (x ^ (x << 16)) & 0xFF0000FF;\n"
+	"	x = (x ^ (x <<  8)) & 0x0300F00F;\n"
+	"	x = (x ^ (x <<  4)) & 0x030C30C3;\n"
+	"	x = (x ^ (x <<  2)) & 0x09249249;\n"
+	"	\n"
+	"	return x;\n"
+	"}\n"
+	"unsigned int getMortonCode(unsigned int x, unsigned int y, unsigned int z)\n"
+	"{\n"
+	"	return interleaveBits(x) << 0 | interleaveBits(y) << 1 | interleaveBits(z) << 2;\n"
+	"}\n"
+	"__kernel void separateAabbs(__global b3AabbCL* unseparatedAabbs, __global int* aabbIndices, __global b3AabbCL* out_aabbs, int numAabbsToSeparate)\n"
+	"{\n"
+	"	int separatedAabbIndex = get_global_id(0);\n"
+	"	if(separatedAabbIndex >= numAabbsToSeparate) return;\n"
+	"	int unseparatedAabbIndex = aabbIndices[separatedAabbIndex];\n"
+	"	out_aabbs[separatedAabbIndex] = unseparatedAabbs[unseparatedAabbIndex];\n"
+	"}\n"
+	"//Should replace with an optimized parallel reduction\n"
+	"__kernel void findAllNodesMergedAabb(__global b3AabbCL* out_mergedAabb, int numAabbsNeedingMerge)\n"
+	"{\n"
+	"	//Each time this kernel is added to the command queue, \n"
+	"	//the number of AABBs needing to be merged is halved\n"
+	"	//\n"
+	"	//Example with 159 AABBs:\n"
+	"	//	numRemainingAabbs == 159 / 2 + 159 % 2 == 80\n"
+	"	//	numMergedAabbs == 159 - 80 == 79\n"
+	"	//So, indices [0, 78] are merged with [0 + 80, 78 + 80]\n"
+	"	\n"
+	"	int numRemainingAabbs = numAabbsNeedingMerge / 2 + numAabbsNeedingMerge % 2;\n"
+	"	int numMergedAabbs = numAabbsNeedingMerge - numRemainingAabbs;\n"
+	"	\n"
+	"	int aabbIndex = get_global_id(0);\n"
+	"	if(aabbIndex >= numMergedAabbs) return;\n"
+	"	\n"
+	"	int otherAabbIndex = aabbIndex + numRemainingAabbs;\n"
+	"	\n"
+	"	b3AabbCL aabb = out_mergedAabb[aabbIndex];\n"
+	"	b3AabbCL otherAabb = out_mergedAabb[otherAabbIndex];\n"
+	"		\n"
+	"	b3AabbCL mergedAabb;\n"
+	"	mergedAabb.m_min = b3Min(aabb.m_min, otherAabb.m_min);\n"
+	"	mergedAabb.m_max = b3Max(aabb.m_max, otherAabb.m_max);\n"
+	"	out_mergedAabb[aabbIndex] = mergedAabb;\n"
+	"}\n"
+	"__kernel void assignMortonCodesAndAabbIndicies(__global b3AabbCL* worldSpaceAabbs, __global b3AabbCL* mergedAabbOfAllNodes, \n"
+	"												__global SortDataCL* out_mortonCodesAndAabbIndices, int numAabbs)\n"
+	"{\n"
+	"	int leafNodeIndex = get_global_id(0);	//Leaf node index == AABB index\n"
+	"	if(leafNodeIndex >= numAabbs) return;\n"
+	"	\n"
+	"	b3AabbCL mergedAabb = mergedAabbOfAllNodes[0];\n"
+	"	b3Vector3 gridCenter = (mergedAabb.m_min + mergedAabb.m_max) * 0.5f;\n"
+	"	b3Vector3 gridCellSize = (mergedAabb.m_max - mergedAabb.m_min) / (float)1024;\n"
+	"	\n"
+	"	b3AabbCL aabb = worldSpaceAabbs[leafNodeIndex];\n"
+	"	b3Vector3 aabbCenter = (aabb.m_min + aabb.m_max) * 0.5f;\n"
+	"	b3Vector3 aabbCenterRelativeToGrid = aabbCenter - gridCenter;\n"
+	"	\n"
+	"	//Quantize into integer coordinates\n"
+	"	//floor() is needed to prevent the center cell, at (0,0,0) from being twice the size\n"
+	"	b3Vector3 gridPosition = aabbCenterRelativeToGrid / gridCellSize;\n"
+	"	\n"
+	"	int4 discretePosition;\n"
+	"	discretePosition.x = (int)( (gridPosition.x >= 0.0f) ? gridPosition.x : floor(gridPosition.x) );\n"
+	"	discretePosition.y = (int)( (gridPosition.y >= 0.0f) ? gridPosition.y : floor(gridPosition.y) );\n"
+	"	discretePosition.z = (int)( (gridPosition.z >= 0.0f) ? gridPosition.z : floor(gridPosition.z) );\n"
+	"	\n"
+	"	//Clamp coordinates into [-512, 511], then convert range from [-512, 511] to [0, 1023]\n"
+	"	discretePosition = b3Max( -512, b3Min(discretePosition, 511) );\n"
+	"	discretePosition += 512;\n"
+	"	\n"
+	"	//Interleave bits(assign a morton code, also known as a z-curve)\n"
+	"	unsigned int mortonCode = getMortonCode(discretePosition.x, discretePosition.y, discretePosition.z);\n"
+	"	\n"
+	"	//\n"
+	"	SortDataCL mortonCodeIndexPair;\n"
+	"	mortonCodeIndexPair.m_key = mortonCode;\n"
+	"	mortonCodeIndexPair.m_value = leafNodeIndex;\n"
+	"	\n"
+	"	out_mortonCodesAndAabbIndices[leafNodeIndex] = mortonCodeIndexPair;\n"
+	"}\n"
+	"#define B3_PLVBH_TRAVERSE_MAX_STACK_SIZE 128\n"
+	"//The most significant bit(0x80000000) of a int32 is used to distinguish between leaf and internal nodes.\n"
+	"//If it is set, then the index is for an internal node; otherwise, it is a leaf node. \n"
+	"//In both cases, the bit should be cleared to access the actual node index.\n"
+	"int isLeafNode(int index) { return (index >> 31 == 0); }\n"
+	"int getIndexWithInternalNodeMarkerRemoved(int index) { return index & (~0x80000000); }\n"
+	"int getIndexWithInternalNodeMarkerSet(int isLeaf, int index) { return (isLeaf) ? index : (index | 0x80000000); }\n"
+	"//From sap.cl\n"
+	"#define NEW_PAIR_MARKER -1\n"
+	"bool TestAabbAgainstAabb2(const b3AabbCL* aabb1, const b3AabbCL* aabb2)\n"
+	"{\n"
+	"	bool overlap = true;\n"
+	"	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;\n"
+	"	return overlap;\n"
+	"}\n"
+	"//From sap.cl\n"
+	"__kernel void plbvhCalculateOverlappingPairs(__global b3AabbCL* rigidAabbs, \n"
+	"											__global int* rootNodeIndex, \n"
+	"											__global int2* internalNodeChildIndices, \n"
+	"											__global b3AabbCL* internalNodeAabbs,\n"
+	"											__global int2* internalNodeLeafIndexRanges,\n"
+	"											\n"
+	"											__global SortDataCL* mortonCodesAndAabbIndices,\n"
+	"											__global int* out_numPairs, __global int4* out_overlappingPairs, \n"
+	"											int maxPairs, int numQueryAabbs)\n"
+	"{\n"
+	"	//Using get_group_id()/get_local_id() is Faster than get_global_id(0) since\n"
+	"	//mortonCodesAndAabbIndices[] contains rigid body indices sorted along the z-curve (more spatially coherent)\n"
+	"	int queryBvhNodeIndex = get_group_id(0) * get_local_size(0) + get_local_id(0);\n"
+	"	if(queryBvhNodeIndex >= numQueryAabbs) return;\n"
+	"	\n"
+	"	int queryRigidIndex = mortonCodesAndAabbIndices[queryBvhNodeIndex].m_value;\n"
+	"	b3AabbCL queryAabb = rigidAabbs[queryRigidIndex];\n"
+	"	\n"
+	"	int stack[B3_PLVBH_TRAVERSE_MAX_STACK_SIZE];\n"
+	"	\n"
+	"	int stackSize = 1;\n"
+	"	stack[0] = *rootNodeIndex;\n"
+	"	\n"
+	"	while(stackSize)\n"
+	"	{\n"
+	"		int internalOrLeafNodeIndex = stack[ stackSize - 1 ];\n"
+	"		--stackSize;\n"
+	"		\n"
+	"		int isLeaf = isLeafNode(internalOrLeafNodeIndex);	//Internal node if false\n"
+	"		int bvhNodeIndex = getIndexWithInternalNodeMarkerRemoved(internalOrLeafNodeIndex);\n"
+	"		\n"
+	"		//Optimization - if the BVH is structured as a binary radix tree, then\n"
+	"		//each internal node corresponds to a contiguous range of leaf nodes(internalNodeLeafIndexRanges[]).\n"
+	"		//This can be used to avoid testing each AABB-AABB pair twice, including preventing each node from colliding with itself.\n"
+	"		{\n"
+	"			int highestLeafIndex = (isLeaf) ? bvhNodeIndex : internalNodeLeafIndexRanges[bvhNodeIndex].y;\n"
+	"			if(highestLeafIndex <= queryBvhNodeIndex) continue;\n"
+	"		}\n"
+	"		\n"
+	"		//bvhRigidIndex is not used if internal node\n"
+	"		int bvhRigidIndex = (isLeaf) ? mortonCodesAndAabbIndices[bvhNodeIndex].m_value : -1;\n"
+	"	\n"
+	"		b3AabbCL bvhNodeAabb = (isLeaf) ? rigidAabbs[bvhRigidIndex] : internalNodeAabbs[bvhNodeIndex];\n"
+	"		if( TestAabbAgainstAabb2(&queryAabb, &bvhNodeAabb) )\n"
+	"		{\n"
+	"			if(isLeaf)\n"
+	"			{\n"
+	"				int4 pair;\n"
+	"				pair.x = rigidAabbs[queryRigidIndex].m_minIndices[3];\n"
+	"				pair.y = rigidAabbs[bvhRigidIndex].m_minIndices[3];\n"
+	"				pair.z = NEW_PAIR_MARKER;\n"
+	"				pair.w = NEW_PAIR_MARKER;\n"
+	"				\n"
+	"				int pairIndex = atomic_inc(out_numPairs);\n"
+	"				if(pairIndex < maxPairs) out_overlappingPairs[pairIndex] = pair;\n"
+	"			}\n"
+	"			\n"
+	"			if(!isLeaf)	//Internal node\n"
+	"			{\n"
+	"				if(stackSize + 2 > B3_PLVBH_TRAVERSE_MAX_STACK_SIZE)\n"
+	"				{\n"
+	"					//Error\n"
+	"				}\n"
+	"				else\n"
+	"				{\n"
+	"					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].x;\n"
+	"					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].y;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"	}\n"
+	"}\n"
+	"//From rayCastKernels.cl\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_from;\n"
+	"	float4 m_to;\n"
+	"} b3RayInfo;\n"
+	"//From rayCastKernels.cl\n"
+	"b3Vector3 b3Vector3_normalize(b3Vector3 v)\n"
+	"{\n"
+	"	b3Vector3 normal = (b3Vector3){v.x, v.y, v.z, 0.f};\n"
+	"	return normalize(normal);	//OpenCL normalize == vector4 normalize\n"
+	"}\n"
+	"b3Scalar b3Vector3_length2(b3Vector3 v) { return v.x*v.x + v.y*v.y + v.z*v.z; }\n"
+	"b3Scalar b3Vector3_dot(b3Vector3 a, b3Vector3 b) { return a.x*b.x + a.y*b.y + a.z*b.z; }\n"
+	"int rayIntersectsAabb(b3Vector3 rayOrigin, b3Scalar rayLength, b3Vector3 rayNormalizedDirection, b3AabbCL aabb)\n"
+	"{\n"
+	"	//AABB is considered as 3 pairs of 2 planes( {x_min, x_max}, {y_min, y_max}, {z_min, z_max} ).\n"
+	"	//t_min is the point of intersection with the closer plane, t_max is the point of intersection with the farther plane.\n"
+	"	//\n"
+	"	//if (rayNormalizedDirection.x < 0.0f), then max.x will be the near plane \n"
+	"	//and min.x will be the far plane; otherwise, it is reversed.\n"
+	"	//\n"
+	"	//In order for there to be a collision, the t_min and t_max of each pair must overlap.\n"
+	"	//This can be tested for by selecting the highest t_min and lowest t_max and comparing them.\n"
+	"	\n"
+	"	int4 isNegative = isless( rayNormalizedDirection, ((b3Vector3){0.0f, 0.0f, 0.0f, 0.0f}) );	//isless(x,y) returns (x < y)\n"
+	"	\n"
+	"	//When using vector types, the select() function checks the most signficant bit, \n"
+	"	//but isless() sets the least significant bit.\n"
+	"	isNegative <<= 31;\n"
+	"	//select(b, a, condition) == condition ? a : b\n"
+	"	//When using select() with vector types, (condition[i]) is true if its most significant bit is 1\n"
+	"	b3Vector3 t_min = ( select(aabb.m_min, aabb.m_max, isNegative) - rayOrigin ) / rayNormalizedDirection;\n"
+	"	b3Vector3 t_max = ( select(aabb.m_max, aabb.m_min, isNegative) - rayOrigin ) / rayNormalizedDirection;\n"
+	"	\n"
+	"	b3Scalar t_min_final = 0.0f;\n"
+	"	b3Scalar t_max_final = rayLength;\n"
+	"	\n"
+	"	//Must use fmin()/fmax(); if one of the parameters is NaN, then the parameter that is not NaN is returned. \n"
+	"	//Behavior of min()/max() with NaNs is undefined. (See OpenCL Specification 1.2 [6.12.2] and [6.12.4])\n"
+	"	//Since the innermost fmin()/fmax() is always not NaN, this should never return NaN.\n"
+	"	t_min_final = fmax( t_min.z, fmax(t_min.y, fmax(t_min.x, t_min_final)) );\n"
+	"	t_max_final = fmin( t_max.z, fmin(t_max.y, fmin(t_max.x, t_max_final)) );\n"
+	"	\n"
+	"	return (t_min_final <= t_max_final);\n"
+	"}\n"
+	"__kernel void plbvhRayTraverse(__global b3AabbCL* rigidAabbs,\n"
+	"								__global int* rootNodeIndex, \n"
+	"								__global int2* internalNodeChildIndices, \n"
+	"								__global b3AabbCL* internalNodeAabbs,\n"
+	"								__global int2* internalNodeLeafIndexRanges,\n"
+	"								__global SortDataCL* mortonCodesAndAabbIndices,\n"
+	"								\n"
+	"								__global b3RayInfo* rays,\n"
+	"								\n"
+	"								__global int* out_numRayRigidPairs, \n"
+	"								__global int2* out_rayRigidPairs,\n"
+	"								int maxRayRigidPairs, int numRays)\n"
+	"{\n"
+	"	int rayIndex = get_global_id(0);\n"
+	"	if(rayIndex >= numRays) return;\n"
+	"	\n"
+	"	//\n"
+	"	b3Vector3 rayFrom = rays[rayIndex].m_from;\n"
+	"	b3Vector3 rayTo = rays[rayIndex].m_to;\n"
+	"	b3Vector3 rayNormalizedDirection = b3Vector3_normalize(rayTo - rayFrom);\n"
+	"	b3Scalar rayLength = b3Sqrt( b3Vector3_length2(rayTo - rayFrom) );\n"
+	"	\n"
+	"	//\n"
+	"	int stack[B3_PLVBH_TRAVERSE_MAX_STACK_SIZE];\n"
+	"	\n"
+	"	int stackSize = 1;\n"
+	"	stack[0] = *rootNodeIndex;\n"
+	"	\n"
+	"	while(stackSize)\n"
+	"	{\n"
+	"		int internalOrLeafNodeIndex = stack[ stackSize - 1 ];\n"
+	"		--stackSize;\n"
+	"		\n"
+	"		int isLeaf = isLeafNode(internalOrLeafNodeIndex);	//Internal node if false\n"
+	"		int bvhNodeIndex = getIndexWithInternalNodeMarkerRemoved(internalOrLeafNodeIndex);\n"
+	"		\n"
+	"		//bvhRigidIndex is not used if internal node\n"
+	"		int bvhRigidIndex = (isLeaf) ? mortonCodesAndAabbIndices[bvhNodeIndex].m_value : -1;\n"
+	"	\n"
+	"		b3AabbCL bvhNodeAabb = (isLeaf) ? rigidAabbs[bvhRigidIndex] : internalNodeAabbs[bvhNodeIndex];\n"
+	"		if( rayIntersectsAabb(rayFrom, rayLength, rayNormalizedDirection, bvhNodeAabb)  )\n"
+	"		{\n"
+	"			if(isLeaf)\n"
+	"			{\n"
+	"				int2 rayRigidPair;\n"
+	"				rayRigidPair.x = rayIndex;\n"
+	"				rayRigidPair.y = rigidAabbs[bvhRigidIndex].m_minIndices[3];\n"
+	"				\n"
+	"				int pairIndex = atomic_inc(out_numRayRigidPairs);\n"
+	"				if(pairIndex < maxRayRigidPairs) out_rayRigidPairs[pairIndex] = rayRigidPair;\n"
+	"			}\n"
+	"			\n"
+	"			if(!isLeaf)	//Internal node\n"
+	"			{\n"
+	"				if(stackSize + 2 > B3_PLVBH_TRAVERSE_MAX_STACK_SIZE)\n"
+	"				{\n"
+	"					//Error\n"
+	"				}\n"
+	"				else\n"
+	"				{\n"
+	"					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].x;\n"
+	"					stack[ stackSize++ ] = internalNodeChildIndices[bvhNodeIndex].y;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void plbvhLargeAabbAabbTest(__global b3AabbCL* smallAabbs, __global b3AabbCL* largeAabbs, \n"
+	"									__global int* out_numPairs, __global int4* out_overlappingPairs, \n"
+	"									int maxPairs, int numLargeAabbRigids, int numSmallAabbRigids)\n"
+	"{\n"
+	"	int smallAabbIndex = get_global_id(0);\n"
+	"	if(smallAabbIndex >= numSmallAabbRigids) return;\n"
+	"	\n"
+	"	b3AabbCL smallAabb = smallAabbs[smallAabbIndex];\n"
+	"	for(int i = 0; i < numLargeAabbRigids; ++i)\n"
+	"	{\n"
+	"		b3AabbCL largeAabb = largeAabbs[i];\n"
+	"		if( TestAabbAgainstAabb2(&smallAabb, &largeAabb) )\n"
+	"		{\n"
+	"			int4 pair;\n"
+	"			pair.x = largeAabb.m_minIndices[3];\n"
+	"			pair.y = smallAabb.m_minIndices[3];\n"
+	"			pair.z = NEW_PAIR_MARKER;\n"
+	"			pair.w = NEW_PAIR_MARKER;\n"
+	"			\n"
+	"			int pairIndex = atomic_inc(out_numPairs);\n"
+	"			if(pairIndex < maxPairs) out_overlappingPairs[pairIndex] = pair;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void plbvhLargeAabbRayTest(__global b3AabbCL* largeRigidAabbs, __global b3RayInfo* rays,\n"
+	"									__global int* out_numRayRigidPairs,  __global int2* out_rayRigidPairs,\n"
+	"									int numLargeAabbRigids, int maxRayRigidPairs, int numRays)\n"
+	"{\n"
+	"	int rayIndex = get_global_id(0);\n"
+	"	if(rayIndex >= numRays) return;\n"
+	"	\n"
+	"	b3Vector3 rayFrom = rays[rayIndex].m_from;\n"
+	"	b3Vector3 rayTo = rays[rayIndex].m_to;\n"
+	"	b3Vector3 rayNormalizedDirection = b3Vector3_normalize(rayTo - rayFrom);\n"
+	"	b3Scalar rayLength = b3Sqrt( b3Vector3_length2(rayTo - rayFrom) );\n"
+	"	\n"
+	"	for(int i = 0; i < numLargeAabbRigids; ++i)\n"
+	"	{\n"
+	"		b3AabbCL rigidAabb = largeRigidAabbs[i];\n"
+	"		if( rayIntersectsAabb(rayFrom, rayLength, rayNormalizedDirection, rigidAabb) )\n"
+	"		{\n"
+	"			int2 rayRigidPair;\n"
+	"			rayRigidPair.x = rayIndex;\n"
+	"			rayRigidPair.y = rigidAabb.m_minIndices[3];\n"
+	"			\n"
+	"			int pairIndex = atomic_inc(out_numRayRigidPairs);\n"
+	"			if(pairIndex < maxRayRigidPairs) out_rayRigidPairs[pairIndex] = rayRigidPair;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"//Set so that it is always greater than the actual common prefixes, and never selected as a parent node.\n"
+	"//If there are no duplicates, then the highest common prefix is 32 or 64, depending on the number of bits used for the z-curve.\n"
+	"//Duplicate common prefixes increase the highest common prefix at most by the number of bits used to index the leaf node.\n"
+	"//Since 32 bit ints are used to index leaf nodes, the max prefix is 64(32 + 32 bit z-curve) or 96(32 + 64 bit z-curve).\n"
+	"#define B3_PLBVH_INVALID_COMMON_PREFIX 128\n"
+	"#define B3_PLBVH_ROOT_NODE_MARKER -1\n"
+	"#define b3Int64 long\n"
+	"int computeCommonPrefixLength(b3Int64 i, b3Int64 j) { return (int)clz(i ^ j); }\n"
+	"b3Int64 computeCommonPrefix(b3Int64 i, b3Int64 j) \n"
+	"{\n"
+	"	//This function only needs to return (i & j) in order for the algorithm to work,\n"
+	"	//but it may help with debugging to mask out the lower bits.\n"
+	"	b3Int64 commonPrefixLength = (b3Int64)computeCommonPrefixLength(i, j);\n"
+	"	b3Int64 sharedBits = i & j;\n"
+	"	b3Int64 bitmask = ((b3Int64)(~0)) << (64 - commonPrefixLength);	//Set all bits after the common prefix to 0\n"
+	"	\n"
+	"	return sharedBits & bitmask;\n"
+	"}\n"
+	"//Same as computeCommonPrefixLength(), but allows for prefixes with different lengths\n"
+	"int getSharedPrefixLength(b3Int64 prefixA, int prefixLengthA, b3Int64 prefixB, int prefixLengthB)\n"
+	"{\n"
+	"	return b3Min( computeCommonPrefixLength(prefixA, prefixB), b3Min(prefixLengthA, prefixLengthB) );\n"
+	"}\n"
+	"__kernel void computeAdjacentPairCommonPrefix(__global SortDataCL* mortonCodesAndAabbIndices,\n"
+	"											__global b3Int64* out_commonPrefixes,\n"
+	"											__global int* out_commonPrefixLengths,\n"
+	"											int numInternalNodes)\n"
+	"{\n"
+	"	int internalNodeIndex = get_global_id(0);\n"
+	"	if (internalNodeIndex >= numInternalNodes) return;\n"
+	"	\n"
+	"	//Here, (internalNodeIndex + 1) is never out of bounds since it is a leaf node index,\n"
+	"	//and the number of internal nodes is always numLeafNodes - 1\n"
+	"	int leftLeafIndex = internalNodeIndex;\n"
+	"	int rightLeafIndex = internalNodeIndex + 1;\n"
+	"	\n"
+	"	int leftLeafMortonCode = mortonCodesAndAabbIndices[leftLeafIndex].m_key;\n"
+	"	int rightLeafMortonCode = mortonCodesAndAabbIndices[rightLeafIndex].m_key;\n"
+	"	\n"
+	"	//Binary radix tree construction algorithm does not work if there are duplicate morton codes.\n"
+	"	//Append the index of each leaf node to each morton code so that there are no duplicates.\n"
+	"	//The algorithm also requires that the morton codes are sorted in ascending order; this requirement\n"
+	"	//is also satisfied with this method, as (leftLeafIndex < rightLeafIndex) is always true.\n"
+	"	//\n"
+	"	//upsample(a, b) == ( ((b3Int64)a) << 32) | b\n"
+	"	b3Int64 nonduplicateLeftMortonCode = upsample(leftLeafMortonCode, leftLeafIndex);\n"
+	"	b3Int64 nonduplicateRightMortonCode = upsample(rightLeafMortonCode, rightLeafIndex);\n"
+	"	\n"
+	"	out_commonPrefixes[internalNodeIndex] = computeCommonPrefix(nonduplicateLeftMortonCode, nonduplicateRightMortonCode);\n"
+	"	out_commonPrefixLengths[internalNodeIndex] = computeCommonPrefixLength(nonduplicateLeftMortonCode, nonduplicateRightMortonCode);\n"
+	"}\n"
+	"__kernel void buildBinaryRadixTreeLeafNodes(__global int* commonPrefixLengths, __global int* out_leafNodeParentNodes,\n"
+	"											__global int2* out_childNodes, int numLeafNodes)\n"
+	"{\n"
+	"	int leafNodeIndex = get_global_id(0);\n"
+	"	if (leafNodeIndex >= numLeafNodes) return;\n"
+	"	\n"
+	"	int numInternalNodes = numLeafNodes - 1;\n"
+	"	\n"
+	"	int leftSplitIndex = leafNodeIndex - 1;\n"
+	"	int rightSplitIndex = leafNodeIndex;\n"
+	"	\n"
+	"	int leftCommonPrefix = (leftSplitIndex >= 0) ? commonPrefixLengths[leftSplitIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;\n"
+	"	int rightCommonPrefix = (rightSplitIndex < numInternalNodes) ? commonPrefixLengths[rightSplitIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;\n"
+	"	\n"
+	"	//Parent node is the highest adjacent common prefix that is lower than the node's common prefix\n"
+	"	//Leaf nodes are considered as having the highest common prefix\n"
+	"	int isLeftHigherCommonPrefix = (leftCommonPrefix > rightCommonPrefix);\n"
+	"	\n"
+	"	//Handle cases for the edge nodes; the first and last node\n"
+	"	//For leaf nodes, leftCommonPrefix and rightCommonPrefix should never both be B3_PLBVH_INVALID_COMMON_PREFIX\n"
+	"	if(leftCommonPrefix == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherCommonPrefix = false;\n"
+	"	if(rightCommonPrefix == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherCommonPrefix = true;\n"
+	"	\n"
+	"	int parentNodeIndex = (isLeftHigherCommonPrefix) ? leftSplitIndex : rightSplitIndex;\n"
+	"	out_leafNodeParentNodes[leafNodeIndex] = parentNodeIndex;\n"
+	"	\n"
+	"	int isRightChild = (isLeftHigherCommonPrefix);	//If the left node is the parent, then this node is its right child and vice versa\n"
+	"	\n"
+	"	//out_childNodesAsInt[0] == int2.x == left child\n"
+	"	//out_childNodesAsInt[1] == int2.y == right child\n"
+	"	int isLeaf = 1;\n"
+	"	__global int* out_childNodesAsInt = (__global int*)(&out_childNodes[parentNodeIndex]);\n"
+	"	out_childNodesAsInt[isRightChild] = getIndexWithInternalNodeMarkerSet(isLeaf, leafNodeIndex);\n"
+	"}\n"
+	"__kernel void buildBinaryRadixTreeInternalNodes(__global b3Int64* commonPrefixes, __global int* commonPrefixLengths,\n"
+	"												__global int2* out_childNodes,\n"
+	"												__global int* out_internalNodeParentNodes, __global int* out_rootNodeIndex,\n"
+	"												int numInternalNodes)\n"
+	"{\n"
+	"	int internalNodeIndex = get_group_id(0) * get_local_size(0) + get_local_id(0);\n"
+	"	if(internalNodeIndex >= numInternalNodes) return;\n"
+	"	\n"
+	"	b3Int64 nodePrefix = commonPrefixes[internalNodeIndex];\n"
+	"	int nodePrefixLength = commonPrefixLengths[internalNodeIndex];\n"
+	"	\n"
+	"//#define USE_LINEAR_SEARCH\n"
+	"#ifdef USE_LINEAR_SEARCH\n"
+	"	int leftIndex = -1;\n"
+	"	int rightIndex = -1;\n"
+	"	\n"
+	"	//Find nearest element to left with a lower common prefix\n"
+	"	for(int i = internalNodeIndex - 1; i >= 0; --i)\n"
+	"	{\n"
+	"		int nodeLeftSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, commonPrefixes[i], commonPrefixLengths[i]);\n"
+	"		if(nodeLeftSharedPrefixLength < nodePrefixLength)\n"
+	"		{\n"
+	"			leftIndex = i;\n"
+	"			break;\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	//Find nearest element to right with a lower common prefix\n"
+	"	for(int i = internalNodeIndex + 1; i < numInternalNodes; ++i)\n"
+	"	{\n"
+	"		int nodeRightSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, commonPrefixes[i], commonPrefixLengths[i]);\n"
+	"		if(nodeRightSharedPrefixLength < nodePrefixLength)\n"
+	"		{\n"
+	"			rightIndex = i;\n"
+	"			break;\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"#else //Use binary search\n"
+	"	//Find nearest element to left with a lower common prefix\n"
+	"	int leftIndex = -1;\n"
+	"	{\n"
+	"		int lower = 0;\n"
+	"		int upper = internalNodeIndex - 1;\n"
+	"		\n"
+	"		while(lower <= upper)\n"
+	"		{\n"
+	"			int mid = (lower + upper) / 2;\n"
+	"			b3Int64 midPrefix = commonPrefixes[mid];\n"
+	"			int midPrefixLength = commonPrefixLengths[mid];\n"
+	"			\n"
+	"			int nodeMidSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, midPrefix, midPrefixLength);\n"
+	"			if(nodeMidSharedPrefixLength < nodePrefixLength) \n"
+	"			{\n"
+	"				int right = mid + 1;\n"
+	"				if(right < internalNodeIndex)\n"
+	"				{\n"
+	"					b3Int64 rightPrefix = commonPrefixes[right];\n"
+	"					int rightPrefixLength = commonPrefixLengths[right];\n"
+	"					\n"
+	"					int nodeRightSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, rightPrefix, rightPrefixLength);\n"
+	"					if(nodeRightSharedPrefixLength < nodePrefixLength) \n"
+	"					{\n"
+	"						lower = right;\n"
+	"						leftIndex = right;\n"
+	"					}\n"
+	"					else \n"
+	"					{\n"
+	"						leftIndex = mid;\n"
+	"						break;\n"
+	"					}\n"
+	"				}\n"
+	"				else \n"
+	"				{\n"
+	"					leftIndex = mid;\n"
+	"					break;\n"
+	"				}\n"
+	"			}\n"
+	"			else upper = mid - 1;\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	//Find nearest element to right with a lower common prefix\n"
+	"	int rightIndex = -1;\n"
+	"	{\n"
+	"		int lower = internalNodeIndex + 1;\n"
+	"		int upper = numInternalNodes - 1;\n"
+	"		\n"
+	"		while(lower <= upper)\n"
+	"		{\n"
+	"			int mid = (lower + upper) / 2;\n"
+	"			b3Int64 midPrefix = commonPrefixes[mid];\n"
+	"			int midPrefixLength = commonPrefixLengths[mid];\n"
+	"			\n"
+	"			int nodeMidSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, midPrefix, midPrefixLength);\n"
+	"			if(nodeMidSharedPrefixLength < nodePrefixLength) \n"
+	"			{\n"
+	"				int left = mid - 1;\n"
+	"				if(left > internalNodeIndex)\n"
+	"				{\n"
+	"					b3Int64 leftPrefix = commonPrefixes[left];\n"
+	"					int leftPrefixLength = commonPrefixLengths[left];\n"
+	"				\n"
+	"					int nodeLeftSharedPrefixLength = getSharedPrefixLength(nodePrefix, nodePrefixLength, leftPrefix, leftPrefixLength);\n"
+	"					if(nodeLeftSharedPrefixLength < nodePrefixLength) \n"
+	"					{\n"
+	"						upper = left;\n"
+	"						rightIndex = left;\n"
+	"					}\n"
+	"					else \n"
+	"					{\n"
+	"						rightIndex = mid;\n"
+	"						break;\n"
+	"					}\n"
+	"				}\n"
+	"				else \n"
+	"				{\n"
+	"					rightIndex = mid;\n"
+	"					break;\n"
+	"				}\n"
+	"			}\n"
+	"			else lower = mid + 1;\n"
+	"		}\n"
+	"	}\n"
+	"#endif\n"
+	"	\n"
+	"	//Select parent\n"
+	"	{\n"
+	"		int leftPrefixLength = (leftIndex != -1) ? commonPrefixLengths[leftIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;\n"
+	"		int rightPrefixLength =  (rightIndex != -1) ? commonPrefixLengths[rightIndex] : B3_PLBVH_INVALID_COMMON_PREFIX;\n"
+	"		\n"
+	"		int isLeftHigherPrefixLength = (leftPrefixLength > rightPrefixLength);\n"
+	"		\n"
+	"		if(leftPrefixLength == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherPrefixLength = false;\n"
+	"		else if(rightPrefixLength == B3_PLBVH_INVALID_COMMON_PREFIX) isLeftHigherPrefixLength = true;\n"
+	"		\n"
+	"		int parentNodeIndex = (isLeftHigherPrefixLength) ? leftIndex : rightIndex;\n"
+	"		\n"
+	"		int isRootNode = (leftIndex == -1 && rightIndex == -1);\n"
+	"		out_internalNodeParentNodes[internalNodeIndex] = (!isRootNode) ? parentNodeIndex : B3_PLBVH_ROOT_NODE_MARKER;\n"
+	"		\n"
+	"		int isLeaf = 0;\n"
+	"		if(!isRootNode)\n"
+	"		{\n"
+	"			int isRightChild = (isLeftHigherPrefixLength);	//If the left node is the parent, then this node is its right child and vice versa\n"
+	"			\n"
+	"			//out_childNodesAsInt[0] == int2.x == left child\n"
+	"			//out_childNodesAsInt[1] == int2.y == right child\n"
+	"			__global int* out_childNodesAsInt = (__global int*)(&out_childNodes[parentNodeIndex]);\n"
+	"			out_childNodesAsInt[isRightChild] = getIndexWithInternalNodeMarkerSet(isLeaf, internalNodeIndex);\n"
+	"		}\n"
+	"		else *out_rootNodeIndex = getIndexWithInternalNodeMarkerSet(isLeaf, internalNodeIndex);\n"
+	"	}\n"
+	"}\n"
+	"__kernel void findDistanceFromRoot(__global int* rootNodeIndex, __global int* internalNodeParentNodes,\n"
+	"									__global int* out_maxDistanceFromRoot, __global int* out_distanceFromRoot, int numInternalNodes)\n"
+	"{\n"
+	"	if( get_global_id(0) == 0 ) atomic_xchg(out_maxDistanceFromRoot, 0);\n"
+	"	int internalNodeIndex = get_global_id(0);\n"
+	"	if(internalNodeIndex >= numInternalNodes) return;\n"
+	"	\n"
+	"	//\n"
+	"	int distanceFromRoot = 0;\n"
+	"	{\n"
+	"		int parentIndex = internalNodeParentNodes[internalNodeIndex];\n"
+	"		while(parentIndex != B3_PLBVH_ROOT_NODE_MARKER)\n"
+	"		{\n"
+	"			parentIndex = internalNodeParentNodes[parentIndex];\n"
+	"			++distanceFromRoot;\n"
+	"		}\n"
+	"	}\n"
+	"	out_distanceFromRoot[internalNodeIndex] = distanceFromRoot;\n"
+	"	\n"
+	"	//\n"
+	"	__local int localMaxDistanceFromRoot;\n"
+	"	if( get_local_id(0) == 0 ) localMaxDistanceFromRoot = 0;\n"
+	"	barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	\n"
+	"	atomic_max(&localMaxDistanceFromRoot, distanceFromRoot);\n"
+	"	barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	\n"
+	"	if( get_local_id(0) == 0 ) atomic_max(out_maxDistanceFromRoot, localMaxDistanceFromRoot);\n"
+	"}\n"
+	"__kernel void buildBinaryRadixTreeAabbsRecursive(__global int* distanceFromRoot, __global SortDataCL* mortonCodesAndAabbIndices,\n"
+	"												__global int2* childNodes,\n"
+	"												__global b3AabbCL* leafNodeAabbs, __global b3AabbCL* internalNodeAabbs,\n"
+	"												int maxDistanceFromRoot, int processedDistance, int numInternalNodes)\n"
+	"{\n"
+	"	int internalNodeIndex = get_global_id(0);\n"
+	"	if(internalNodeIndex >= numInternalNodes) return;\n"
+	"	\n"
+	"	int distance = distanceFromRoot[internalNodeIndex];\n"
+	"	\n"
+	"	if(distance == processedDistance)\n"
+	"	{\n"
+	"		int leftChildIndex = childNodes[internalNodeIndex].x;\n"
+	"		int rightChildIndex = childNodes[internalNodeIndex].y;\n"
+	"		\n"
+	"		int isLeftChildLeaf = isLeafNode(leftChildIndex);\n"
+	"		int isRightChildLeaf = isLeafNode(rightChildIndex);\n"
+	"		\n"
+	"		leftChildIndex = getIndexWithInternalNodeMarkerRemoved(leftChildIndex);\n"
+	"		rightChildIndex = getIndexWithInternalNodeMarkerRemoved(rightChildIndex);\n"
+	"		\n"
+	"		//leftRigidIndex/rightRigidIndex is not used if internal node\n"
+	"		int leftRigidIndex = (isLeftChildLeaf) ? mortonCodesAndAabbIndices[leftChildIndex].m_value : -1;\n"
+	"		int rightRigidIndex = (isRightChildLeaf) ? mortonCodesAndAabbIndices[rightChildIndex].m_value : -1;\n"
+	"		\n"
+	"		b3AabbCL leftChildAabb = (isLeftChildLeaf) ? leafNodeAabbs[leftRigidIndex] : internalNodeAabbs[leftChildIndex];\n"
+	"		b3AabbCL rightChildAabb = (isRightChildLeaf) ? leafNodeAabbs[rightRigidIndex] : internalNodeAabbs[rightChildIndex];\n"
+	"		\n"
+	"		b3AabbCL mergedAabb;\n"
+	"		mergedAabb.m_min = b3Min(leftChildAabb.m_min, rightChildAabb.m_min);\n"
+	"		mergedAabb.m_max = b3Max(leftChildAabb.m_max, rightChildAabb.m_max);\n"
+	"		internalNodeAabbs[internalNodeIndex] = mergedAabb;\n"
+	"	}\n"
+	"}\n"
+	"__kernel void findLeafIndexRanges(__global int2* internalNodeChildNodes, __global int2* out_leafIndexRanges, int numInternalNodes)\n"
+	"{\n"
+	"	int internalNodeIndex = get_global_id(0);\n"
+	"	if(internalNodeIndex >= numInternalNodes) return;\n"
+	"	\n"
+	"	int numLeafNodes = numInternalNodes + 1;\n"
+	"	\n"
+	"	int2 childNodes = internalNodeChildNodes[internalNodeIndex];\n"
+	"	\n"
+	"	int2 leafIndexRange;	//x == min leaf index, y == max leaf index\n"
+	"	\n"
+	"	//Find lowest leaf index covered by this internal node\n"
+	"	{\n"
+	"		int lowestIndex = childNodes.x;		//childNodes.x == Left child\n"
+	"		while( !isLeafNode(lowestIndex) ) lowestIndex = internalNodeChildNodes[ getIndexWithInternalNodeMarkerRemoved(lowestIndex) ].x;\n"
+	"		leafIndexRange.x = lowestIndex;\n"
+	"	}\n"
+	"	\n"
+	"	//Find highest leaf index covered by this internal node\n"
+	"	{\n"
+	"		int highestIndex = childNodes.y;	//childNodes.y == Right child\n"
+	"		while( !isLeafNode(highestIndex) ) highestIndex = internalNodeChildNodes[ getIndexWithInternalNodeMarkerRemoved(highestIndex) ].y;\n"
+	"		leafIndexRange.y = highestIndex;\n"
+	"	}\n"
+	"	\n"
+	"	//\n"
+	"	out_leafIndexRanges[internalNodeIndex] = leafIndexRange;\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl
new file mode 100644
index 0000000..93f77a6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl
@@ -0,0 +1,389 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#define NEW_PAIR_MARKER -1
+
+typedef struct 
+{
+	union
+	{
+		float4	m_min;
+		float   m_minElems[4];
+		int			m_minIndices[4];
+	};
+	union
+	{
+		float4	m_max;
+		float   m_maxElems[4];
+		int			m_maxIndices[4];
+	};
+} btAabbCL;
+
+
+/// conservative test for overlap between two aabbs
+bool TestAabbAgainstAabb2(const btAabbCL* aabb1, __local const btAabbCL* aabb2);
+bool TestAabbAgainstAabb2(const btAabbCL* aabb1, __local const btAabbCL* aabb2)
+{
+	bool overlap = true;
+	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;
+	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;
+	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;
+	return overlap;
+}
+bool TestAabbAgainstAabb2GlobalGlobal(__global const btAabbCL* aabb1, __global const btAabbCL* aabb2);
+bool TestAabbAgainstAabb2GlobalGlobal(__global const btAabbCL* aabb1, __global const btAabbCL* aabb2)
+{
+	bool overlap = true;
+	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;
+	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;
+	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;
+	return overlap;
+}
+
+bool TestAabbAgainstAabb2Global(const btAabbCL* aabb1, __global const btAabbCL* aabb2);
+bool TestAabbAgainstAabb2Global(const btAabbCL* aabb1, __global const btAabbCL* aabb2)
+{
+	bool overlap = true;
+	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;
+	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;
+	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;
+	return overlap;
+}
+
+
+__kernel void   computePairsKernelTwoArrays( __global const btAabbCL* unsortedAabbs, __global const int* unsortedAabbMapping,  __global const int* unsortedAabbMapping2, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numUnsortedAabbs, int numUnSortedAabbs2, int axis, int maxPairs)
+{
+	int i = get_global_id(0);
+	if (i>=numUnsortedAabbs)
+		return;
+
+	int j = get_global_id(1);
+	if (j>=numUnSortedAabbs2)
+		return;
+
+
+	__global const btAabbCL* unsortedAabbPtr = &unsortedAabbs[unsortedAabbMapping[i]];
+	__global const btAabbCL* unsortedAabbPtr2 = &unsortedAabbs[unsortedAabbMapping2[j]];
+
+	if (TestAabbAgainstAabb2GlobalGlobal(unsortedAabbPtr,unsortedAabbPtr2))
+	{
+		int4 myPair;
+		
+		int xIndex = unsortedAabbPtr[0].m_minIndices[3];
+		int yIndex = unsortedAabbPtr2[0].m_minIndices[3];
+		if (xIndex>yIndex)
+		{
+			int tmp = xIndex;
+			xIndex=yIndex;
+			yIndex=tmp;
+		}
+		
+		myPair.x = xIndex;
+		myPair.y = yIndex;
+		myPair.z = NEW_PAIR_MARKER;
+		myPair.w = NEW_PAIR_MARKER;
+
+
+		int curPair = atomic_inc (pairCount);
+		if (curPair<maxPairs)
+		{
+				pairsOut[curPair] = myPair; //flush to main memory
+		}
+	}
+}
+
+
+
+__kernel void   computePairsKernelBruteForce( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)
+{
+	int i = get_global_id(0);
+	if (i>=numObjects)
+		return;
+	for (int j=i+1;j<numObjects;j++)
+	{
+		if (TestAabbAgainstAabb2GlobalGlobal(&aabbs[i],&aabbs[j]))
+		{
+			int4 myPair;
+			myPair.x = aabbs[i].m_minIndices[3];
+			myPair.y = aabbs[j].m_minIndices[3];
+			myPair.z = NEW_PAIR_MARKER;
+			myPair.w = NEW_PAIR_MARKER;
+
+			int curPair = atomic_inc (pairCount);
+			if (curPair<maxPairs)
+			{
+					pairsOut[curPair] = myPair; //flush to main memory
+			}
+		}
+	}
+}
+
+__kernel void   computePairsKernelOriginal( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)
+{
+	int i = get_global_id(0);
+	if (i>=numObjects)
+		return;
+	for (int j=i+1;j<numObjects;j++)
+	{
+  	if(aabbs[i].m_maxElems[axis] < (aabbs[j].m_minElems[axis])) 
+		{
+			break;
+		}
+		if (TestAabbAgainstAabb2GlobalGlobal(&aabbs[i],&aabbs[j]))
+		{
+			int4 myPair;
+			myPair.x = aabbs[i].m_minIndices[3];
+			myPair.y = aabbs[j].m_minIndices[3];
+			myPair.z = NEW_PAIR_MARKER;
+			myPair.w = NEW_PAIR_MARKER;
+
+			int curPair = atomic_inc (pairCount);
+			if (curPair<maxPairs)
+			{
+					pairsOut[curPair] = myPair; //flush to main memory
+			}
+		}
+	}
+}
+
+
+
+
+__kernel void   computePairsKernelBarrier( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)
+{
+	int i = get_global_id(0);
+	int localId = get_local_id(0);
+
+	__local int numActiveWgItems[1];
+	__local int breakRequest[1];
+
+	if (localId==0)
+	{
+		numActiveWgItems[0] = 0;
+		breakRequest[0] = 0;
+	}
+	barrier(CLK_LOCAL_MEM_FENCE);
+	atomic_inc(numActiveWgItems);
+	barrier(CLK_LOCAL_MEM_FENCE);
+	int localBreak = 0;
+
+	int j=i+1;
+	do
+	{
+		barrier(CLK_LOCAL_MEM_FENCE);
+	
+		if (j<numObjects)
+		{
+	  	if(aabbs[i].m_maxElems[axis] < (aabbs[j].m_minElems[axis])) 
+			{
+				if (!localBreak)
+				{
+					atomic_inc(breakRequest);
+					localBreak = 1;
+				}
+			}
+		}
+		
+		barrier(CLK_LOCAL_MEM_FENCE);
+		
+		if (j>=numObjects && !localBreak)
+		{
+			atomic_inc(breakRequest);
+			localBreak = 1;
+		}
+		barrier(CLK_LOCAL_MEM_FENCE);
+		
+		if (!localBreak)
+		{
+			if (TestAabbAgainstAabb2GlobalGlobal(&aabbs[i],&aabbs[j]))
+			{
+				int4 myPair;
+				myPair.x = aabbs[i].m_minIndices[3];
+				myPair.y = aabbs[j].m_minIndices[3];
+				myPair.z = NEW_PAIR_MARKER;
+				myPair.w = NEW_PAIR_MARKER;
+
+				int curPair = atomic_inc (pairCount);
+				if (curPair<maxPairs)
+				{
+						pairsOut[curPair] = myPair; //flush to main memory
+				}
+			}
+		}
+		j++;
+
+	} while (breakRequest[0]<numActiveWgItems[0]);
+}
+
+
+__kernel void   computePairsKernelLocalSharedMemory( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)
+{
+	int i = get_global_id(0);
+	int localId = get_local_id(0);
+
+	__local int numActiveWgItems[1];
+	__local int breakRequest[1];
+	__local btAabbCL localAabbs[128];// = aabbs[i];
+	
+	btAabbCL myAabb;
+	
+	myAabb = (i<numObjects)? aabbs[i]:aabbs[0];
+	float testValue = 	myAabb.m_maxElems[axis];
+	
+	if (localId==0)
+	{
+		numActiveWgItems[0] = 0;
+		breakRequest[0] = 0;
+	}
+	int localCount=0;
+	int block=0;
+	localAabbs[localId] = (i+block)<numObjects? aabbs[i+block] : aabbs[0];
+	localAabbs[localId+64] = (i+block+64)<numObjects? aabbs[i+block+64]: aabbs[0];
+	
+	barrier(CLK_LOCAL_MEM_FENCE);
+	atomic_inc(numActiveWgItems);
+	barrier(CLK_LOCAL_MEM_FENCE);
+	int localBreak = 0;
+	
+	int j=i+1;
+	do
+	{
+		barrier(CLK_LOCAL_MEM_FENCE);
+	
+		if (j<numObjects)
+		{
+	  	if(testValue < (localAabbs[localCount+localId+1].m_minElems[axis])) 
+			{
+				if (!localBreak)
+				{
+					atomic_inc(breakRequest);
+					localBreak = 1;
+				}
+			}
+		}
+		
+		barrier(CLK_LOCAL_MEM_FENCE);
+		
+		if (j>=numObjects && !localBreak)
+		{
+			atomic_inc(breakRequest);
+			localBreak = 1;
+		}
+		barrier(CLK_LOCAL_MEM_FENCE);
+		
+		if (!localBreak)
+		{
+			if (TestAabbAgainstAabb2(&myAabb,&localAabbs[localCount+localId+1]))
+			{
+				int4 myPair;
+				myPair.x = myAabb.m_minIndices[3];
+				myPair.y = localAabbs[localCount+localId+1].m_minIndices[3];
+				myPair.z = NEW_PAIR_MARKER;
+				myPair.w = NEW_PAIR_MARKER;
+
+				int curPair = atomic_inc (pairCount);
+				if (curPair<maxPairs)
+				{
+						pairsOut[curPair] = myPair; //flush to main memory
+				}
+			}
+		}
+		
+		barrier(CLK_LOCAL_MEM_FENCE);
+
+		localCount++;
+		if (localCount==64)
+		{
+			localCount = 0;
+			block+=64;			
+			localAabbs[localId] = ((i+block)<numObjects) ? aabbs[i+block] : aabbs[0];
+			localAabbs[localId+64] = ((i+64+block)<numObjects) ? aabbs[i+block+64] : aabbs[0];
+		}
+		j++;
+		
+	} while (breakRequest[0]<numActiveWgItems[0]);
+	
+}
+
+
+
+
+//http://stereopsis.com/radix.html
+unsigned int FloatFlip(float fl);
+unsigned int FloatFlip(float fl)
+{
+	unsigned int f = *(unsigned int*)&fl;
+	unsigned int mask = -(int)(f >> 31) | 0x80000000;
+	return f ^ mask;
+}
+float IFloatFlip(unsigned int f);
+float IFloatFlip(unsigned int f)
+{
+	unsigned int mask = ((f >> 31) - 1) | 0x80000000;
+	unsigned int fl = f ^ mask;
+	return *(float*)&fl;
+}
+
+
+
+
+__kernel void   copyAabbsKernel( __global const btAabbCL* allAabbs, __global btAabbCL* destAabbs, int numObjects)
+{
+	int i = get_global_id(0);
+	if (i>=numObjects)
+		return;
+	int src = destAabbs[i].m_maxIndices[3];
+	destAabbs[i] = allAabbs[src];
+	destAabbs[i].m_maxIndices[3] = src;
+}
+
+
+__kernel void   flipFloatKernel( __global const btAabbCL* allAabbs, __global const int* smallAabbMapping, __global int2* sortData, int numObjects, int axis)
+{
+	int i = get_global_id(0);
+	if (i>=numObjects)
+		return;
+	
+	
+	sortData[i].x = FloatFlip(allAabbs[smallAabbMapping[i]].m_minElems[axis]);
+	sortData[i].y = i;
+		
+}
+
+
+__kernel void   scatterKernel( __global const btAabbCL* allAabbs, __global const int* smallAabbMapping, volatile __global const int2* sortData, __global btAabbCL* sortedAabbs, int numObjects)
+{
+	int i = get_global_id(0);
+	if (i>=numObjects)
+		return;
+	
+	sortedAabbs[i] = allAabbs[smallAabbMapping[sortData[i].y]];
+}
+
+
+
+__kernel void   prepareSumVarianceKernel( __global const btAabbCL* allAabbs, __global const int* smallAabbMapping, __global float4* sum, __global float4* sum2,int numAabbs)
+{
+	int i = get_global_id(0);
+	if (i>=numAabbs)
+		return;
+	
+	btAabbCL smallAabb = allAabbs[smallAabbMapping[i]];
+	
+	float4 s;
+	s = (smallAabb.m_max+smallAabb.m_min)*0.5f;
+	sum[i]=s;
+	sum2[i]=s*s;	
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h
new file mode 100644
index 0000000..d6999b9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h
@@ -0,0 +1,341 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* sapCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Erwin Coumans\n"
+	"#define NEW_PAIR_MARKER -1\n"
+	"typedef struct \n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_min;\n"
+	"		float   m_minElems[4];\n"
+	"		int			m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_max;\n"
+	"		float   m_maxElems[4];\n"
+	"		int			m_maxIndices[4];\n"
+	"	};\n"
+	"} btAabbCL;\n"
+	"/// conservative test for overlap between two aabbs\n"
+	"bool TestAabbAgainstAabb2(const btAabbCL* aabb1, __local const btAabbCL* aabb2);\n"
+	"bool TestAabbAgainstAabb2(const btAabbCL* aabb1, __local const btAabbCL* aabb2)\n"
+	"{\n"
+	"	bool overlap = true;\n"
+	"	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;\n"
+	"	return overlap;\n"
+	"}\n"
+	"bool TestAabbAgainstAabb2GlobalGlobal(__global const btAabbCL* aabb1, __global const btAabbCL* aabb2);\n"
+	"bool TestAabbAgainstAabb2GlobalGlobal(__global const btAabbCL* aabb1, __global const btAabbCL* aabb2)\n"
+	"{\n"
+	"	bool overlap = true;\n"
+	"	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;\n"
+	"	return overlap;\n"
+	"}\n"
+	"bool TestAabbAgainstAabb2Global(const btAabbCL* aabb1, __global const btAabbCL* aabb2);\n"
+	"bool TestAabbAgainstAabb2Global(const btAabbCL* aabb1, __global const btAabbCL* aabb2)\n"
+	"{\n"
+	"	bool overlap = true;\n"
+	"	overlap = (aabb1->m_min.x > aabb2->m_max.x || aabb1->m_max.x < aabb2->m_min.x) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.z > aabb2->m_max.z || aabb1->m_max.z < aabb2->m_min.z) ? false : overlap;\n"
+	"	overlap = (aabb1->m_min.y > aabb2->m_max.y || aabb1->m_max.y < aabb2->m_min.y) ? false : overlap;\n"
+	"	return overlap;\n"
+	"}\n"
+	"__kernel void   computePairsKernelTwoArrays( __global const btAabbCL* unsortedAabbs, __global const int* unsortedAabbMapping,  __global const int* unsortedAabbMapping2, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numUnsortedAabbs, int numUnSortedAabbs2, int axis, int maxPairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numUnsortedAabbs)\n"
+	"		return;\n"
+	"	int j = get_global_id(1);\n"
+	"	if (j>=numUnSortedAabbs2)\n"
+	"		return;\n"
+	"	__global const btAabbCL* unsortedAabbPtr = &unsortedAabbs[unsortedAabbMapping[i]];\n"
+	"	__global const btAabbCL* unsortedAabbPtr2 = &unsortedAabbs[unsortedAabbMapping2[j]];\n"
+	"	if (TestAabbAgainstAabb2GlobalGlobal(unsortedAabbPtr,unsortedAabbPtr2))\n"
+	"	{\n"
+	"		int4 myPair;\n"
+	"		\n"
+	"		int xIndex = unsortedAabbPtr[0].m_minIndices[3];\n"
+	"		int yIndex = unsortedAabbPtr2[0].m_minIndices[3];\n"
+	"		if (xIndex>yIndex)\n"
+	"		{\n"
+	"			int tmp = xIndex;\n"
+	"			xIndex=yIndex;\n"
+	"			yIndex=tmp;\n"
+	"		}\n"
+	"		\n"
+	"		myPair.x = xIndex;\n"
+	"		myPair.y = yIndex;\n"
+	"		myPair.z = NEW_PAIR_MARKER;\n"
+	"		myPair.w = NEW_PAIR_MARKER;\n"
+	"		int curPair = atomic_inc (pairCount);\n"
+	"		if (curPair<maxPairs)\n"
+	"		{\n"
+	"				pairsOut[curPair] = myPair; //flush to main memory\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void   computePairsKernelBruteForce( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numObjects)\n"
+	"		return;\n"
+	"	for (int j=i+1;j<numObjects;j++)\n"
+	"	{\n"
+	"		if (TestAabbAgainstAabb2GlobalGlobal(&aabbs[i],&aabbs[j]))\n"
+	"		{\n"
+	"			int4 myPair;\n"
+	"			myPair.x = aabbs[i].m_minIndices[3];\n"
+	"			myPair.y = aabbs[j].m_minIndices[3];\n"
+	"			myPair.z = NEW_PAIR_MARKER;\n"
+	"			myPair.w = NEW_PAIR_MARKER;\n"
+	"			int curPair = atomic_inc (pairCount);\n"
+	"			if (curPair<maxPairs)\n"
+	"			{\n"
+	"					pairsOut[curPair] = myPair; //flush to main memory\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void   computePairsKernelOriginal( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numObjects)\n"
+	"		return;\n"
+	"	for (int j=i+1;j<numObjects;j++)\n"
+	"	{\n"
+	"  	if(aabbs[i].m_maxElems[axis] < (aabbs[j].m_minElems[axis])) \n"
+	"		{\n"
+	"			break;\n"
+	"		}\n"
+	"		if (TestAabbAgainstAabb2GlobalGlobal(&aabbs[i],&aabbs[j]))\n"
+	"		{\n"
+	"			int4 myPair;\n"
+	"			myPair.x = aabbs[i].m_minIndices[3];\n"
+	"			myPair.y = aabbs[j].m_minIndices[3];\n"
+	"			myPair.z = NEW_PAIR_MARKER;\n"
+	"			myPair.w = NEW_PAIR_MARKER;\n"
+	"			int curPair = atomic_inc (pairCount);\n"
+	"			if (curPair<maxPairs)\n"
+	"			{\n"
+	"					pairsOut[curPair] = myPair; //flush to main memory\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void   computePairsKernelBarrier( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int localId = get_local_id(0);\n"
+	"	__local int numActiveWgItems[1];\n"
+	"	__local int breakRequest[1];\n"
+	"	if (localId==0)\n"
+	"	{\n"
+	"		numActiveWgItems[0] = 0;\n"
+	"		breakRequest[0] = 0;\n"
+	"	}\n"
+	"	barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	atomic_inc(numActiveWgItems);\n"
+	"	barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	int localBreak = 0;\n"
+	"	int j=i+1;\n"
+	"	do\n"
+	"	{\n"
+	"		barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	\n"
+	"		if (j<numObjects)\n"
+	"		{\n"
+	"	  	if(aabbs[i].m_maxElems[axis] < (aabbs[j].m_minElems[axis])) \n"
+	"			{\n"
+	"				if (!localBreak)\n"
+	"				{\n"
+	"					atomic_inc(breakRequest);\n"
+	"					localBreak = 1;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"		barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"		\n"
+	"		if (j>=numObjects && !localBreak)\n"
+	"		{\n"
+	"			atomic_inc(breakRequest);\n"
+	"			localBreak = 1;\n"
+	"		}\n"
+	"		barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"		\n"
+	"		if (!localBreak)\n"
+	"		{\n"
+	"			if (TestAabbAgainstAabb2GlobalGlobal(&aabbs[i],&aabbs[j]))\n"
+	"			{\n"
+	"				int4 myPair;\n"
+	"				myPair.x = aabbs[i].m_minIndices[3];\n"
+	"				myPair.y = aabbs[j].m_minIndices[3];\n"
+	"				myPair.z = NEW_PAIR_MARKER;\n"
+	"				myPair.w = NEW_PAIR_MARKER;\n"
+	"				int curPair = atomic_inc (pairCount);\n"
+	"				if (curPair<maxPairs)\n"
+	"				{\n"
+	"						pairsOut[curPair] = myPair; //flush to main memory\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		j++;\n"
+	"	} while (breakRequest[0]<numActiveWgItems[0]);\n"
+	"}\n"
+	"__kernel void   computePairsKernelLocalSharedMemory( __global const btAabbCL* aabbs, volatile __global int4* pairsOut,volatile  __global int* pairCount, int numObjects, int axis, int maxPairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int localId = get_local_id(0);\n"
+	"	__local int numActiveWgItems[1];\n"
+	"	__local int breakRequest[1];\n"
+	"	__local btAabbCL localAabbs[128];// = aabbs[i];\n"
+	"	\n"
+	"	btAabbCL myAabb;\n"
+	"	\n"
+	"	myAabb = (i<numObjects)? aabbs[i]:aabbs[0];\n"
+	"	float testValue = 	myAabb.m_maxElems[axis];\n"
+	"	\n"
+	"	if (localId==0)\n"
+	"	{\n"
+	"		numActiveWgItems[0] = 0;\n"
+	"		breakRequest[0] = 0;\n"
+	"	}\n"
+	"	int localCount=0;\n"
+	"	int block=0;\n"
+	"	localAabbs[localId] = (i+block)<numObjects? aabbs[i+block] : aabbs[0];\n"
+	"	localAabbs[localId+64] = (i+block+64)<numObjects? aabbs[i+block+64]: aabbs[0];\n"
+	"	\n"
+	"	barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	atomic_inc(numActiveWgItems);\n"
+	"	barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	int localBreak = 0;\n"
+	"	\n"
+	"	int j=i+1;\n"
+	"	do\n"
+	"	{\n"
+	"		barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"	\n"
+	"		if (j<numObjects)\n"
+	"		{\n"
+	"	  	if(testValue < (localAabbs[localCount+localId+1].m_minElems[axis])) \n"
+	"			{\n"
+	"				if (!localBreak)\n"
+	"				{\n"
+	"					atomic_inc(breakRequest);\n"
+	"					localBreak = 1;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"		barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"		\n"
+	"		if (j>=numObjects && !localBreak)\n"
+	"		{\n"
+	"			atomic_inc(breakRequest);\n"
+	"			localBreak = 1;\n"
+	"		}\n"
+	"		barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"		\n"
+	"		if (!localBreak)\n"
+	"		{\n"
+	"			if (TestAabbAgainstAabb2(&myAabb,&localAabbs[localCount+localId+1]))\n"
+	"			{\n"
+	"				int4 myPair;\n"
+	"				myPair.x = myAabb.m_minIndices[3];\n"
+	"				myPair.y = localAabbs[localCount+localId+1].m_minIndices[3];\n"
+	"				myPair.z = NEW_PAIR_MARKER;\n"
+	"				myPair.w = NEW_PAIR_MARKER;\n"
+	"				int curPair = atomic_inc (pairCount);\n"
+	"				if (curPair<maxPairs)\n"
+	"				{\n"
+	"						pairsOut[curPair] = myPair; //flush to main memory\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"		barrier(CLK_LOCAL_MEM_FENCE);\n"
+	"		localCount++;\n"
+	"		if (localCount==64)\n"
+	"		{\n"
+	"			localCount = 0;\n"
+	"			block+=64;			\n"
+	"			localAabbs[localId] = ((i+block)<numObjects) ? aabbs[i+block] : aabbs[0];\n"
+	"			localAabbs[localId+64] = ((i+64+block)<numObjects) ? aabbs[i+block+64] : aabbs[0];\n"
+	"		}\n"
+	"		j++;\n"
+	"		\n"
+	"	} while (breakRequest[0]<numActiveWgItems[0]);\n"
+	"	\n"
+	"}\n"
+	"//http://stereopsis.com/radix.html\n"
+	"unsigned int FloatFlip(float fl);\n"
+	"unsigned int FloatFlip(float fl)\n"
+	"{\n"
+	"	unsigned int f = *(unsigned int*)&fl;\n"
+	"	unsigned int mask = -(int)(f >> 31) | 0x80000000;\n"
+	"	return f ^ mask;\n"
+	"}\n"
+	"float IFloatFlip(unsigned int f);\n"
+	"float IFloatFlip(unsigned int f)\n"
+	"{\n"
+	"	unsigned int mask = ((f >> 31) - 1) | 0x80000000;\n"
+	"	unsigned int fl = f ^ mask;\n"
+	"	return *(float*)&fl;\n"
+	"}\n"
+	"__kernel void   copyAabbsKernel( __global const btAabbCL* allAabbs, __global btAabbCL* destAabbs, int numObjects)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numObjects)\n"
+	"		return;\n"
+	"	int src = destAabbs[i].m_maxIndices[3];\n"
+	"	destAabbs[i] = allAabbs[src];\n"
+	"	destAabbs[i].m_maxIndices[3] = src;\n"
+	"}\n"
+	"__kernel void   flipFloatKernel( __global const btAabbCL* allAabbs, __global const int* smallAabbMapping, __global int2* sortData, int numObjects, int axis)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numObjects)\n"
+	"		return;\n"
+	"	\n"
+	"	\n"
+	"	sortData[i].x = FloatFlip(allAabbs[smallAabbMapping[i]].m_minElems[axis]);\n"
+	"	sortData[i].y = i;\n"
+	"		\n"
+	"}\n"
+	"__kernel void   scatterKernel( __global const btAabbCL* allAabbs, __global const int* smallAabbMapping, volatile __global const int2* sortData, __global btAabbCL* sortedAabbs, int numObjects)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numObjects)\n"
+	"		return;\n"
+	"	\n"
+	"	sortedAabbs[i] = allAabbs[smallAabbMapping[sortData[i].y]];\n"
+	"}\n"
+	"__kernel void   prepareSumVarianceKernel( __global const btAabbCL* allAabbs, __global const int* smallAabbMapping, __global float4* sum, __global float4* sum2,int numAabbs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numAabbs)\n"
+	"		return;\n"
+	"	\n"
+	"	btAabbCL smallAabb = allAabbs[smallAabbMapping[i]];\n"
+	"	\n"
+	"	float4 s;\n"
+	"	s = (smallAabb.m_max+smallAabb.m_min)*0.5f;\n"
+	"	sum[i]=s;\n"
+	"	sum2[i]=s*s;	\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/CMakeLists.txt b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/CMakeLists.txt
new file mode 100644
index 0000000..1da58d4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/CMakeLists.txt
@@ -0,0 +1,77 @@
+INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src  )
+
+ADD_DEFINITIONS(-DB3_USE_CLEW)
+
+SET(Bullet3OpenCL_clew_SRCS
+	../clew/clew.c
+	BroadphaseCollision/b3GpuGridBroadphase.cpp
+	BroadphaseCollision/b3GpuSapBroadphase.cpp
+	BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp
+	BroadphaseCollision/b3GpuParallelLinearBvh.cpp
+	Initialize/b3OpenCLUtils.cpp
+	NarrowphaseCollision/b3ContactCache.cpp
+	NarrowphaseCollision/b3ConvexHullContact.cpp
+	NarrowphaseCollision/b3GjkEpa.cpp
+	NarrowphaseCollision/b3OptimizedBvh.cpp
+	NarrowphaseCollision/b3QuantizedBvh.cpp
+	NarrowphaseCollision/b3StridingMeshInterface.cpp
+	NarrowphaseCollision/b3TriangleCallback.cpp
+	NarrowphaseCollision/b3TriangleIndexVertexArray.cpp
+	NarrowphaseCollision/b3VoronoiSimplexSolver.cpp
+	ParallelPrimitives/b3BoundSearchCL.cpp
+	ParallelPrimitives/b3FillCL.cpp
+	ParallelPrimitives/b3LauncherCL.cpp
+	ParallelPrimitives/b3PrefixScanCL.cpp
+	ParallelPrimitives/b3PrefixScanFloat4CL.cpp
+	ParallelPrimitives/b3RadixSort32CL.cpp
+	Raycast/b3GpuRaycast.cpp
+	RigidBody/b3GpuGenericConstraint.cpp
+	RigidBody/b3GpuJacobiContactSolver.cpp
+	RigidBody/b3GpuNarrowPhase.cpp
+	RigidBody/b3GpuPgsConstraintSolver.cpp
+	RigidBody/b3GpuPgsContactSolver.cpp
+	RigidBody/b3GpuRigidBodyPipeline.cpp
+	RigidBody/b3Solver.cpp
+)
+
+
+SET(Bullet3OpenCL_clew_HDRS
+#	${Root_HDRS}
+)
+
+
+ADD_LIBRARY(Bullet3OpenCL_clew ${Bullet3OpenCL_clew_SRCS} ${Bullet3OpenCL_clew_HDRS})
+SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION})
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS})
+ENDIF (BUILD_SHARED_LIBS)
+
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#INSTALL of other files requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3OpenCL_clew DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet3OpenCL_clew RUNTIME DESTINATION bin
+								LIBRARY DESTINATION lib${LIB_SUFFIX}
+								ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+#				INSTALL(FILES ../btBullet3OpenCL_clewCommon.h
+#DESTINATION ${INCLUDE_INSTALL_DIR}/Bullet3OpenCL_clew)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES FRAMEWORK true)
+
+			SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
+			# Have to list out sub-directories manually:
+			SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
+
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLInclude.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLInclude.h
new file mode 100644
index 0000000..6146538
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLInclude.h
@@ -0,0 +1,51 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_OPENCL_INCLUDE_H
+#define B3_OPENCL_INCLUDE_H
+
+#ifdef B3_USE_CLEW
+#include "clew/clew.h"
+#else
+
+#ifdef __APPLE__
+#ifdef USE_MINICL
+#include <MiniCL/cl.h>
+#else
+#include <OpenCL/cl.h>
+#include <OpenCL/cl_ext.h>  //clLogMessagesToStderrAPPLE
+#endif
+#else
+#ifdef USE_MINICL
+#include <MiniCL/cl.h>
+#else
+#include <CL/cl.h>
+#ifdef _WIN32
+#include "CL/cl_gl.h"
+#endif  //_WIN32
+#endif
+#endif  //__APPLE__
+#endif  //B3_USE_CLEW
+
+#include <assert.h>
+#include <stdio.h>
+#define oclCHECKERROR(a, b)              \
+	if ((a) != (b))                      \
+	{                                    \
+		printf("OCL Error : %d\n", (a)); \
+		assert((a) == (b));              \
+	}
+
+#endif  //B3_OPENCL_INCLUDE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp
new file mode 100644
index 0000000..fe54ea5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp
@@ -0,0 +1,963 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006 - 2011 Sony Computer Entertainment Inc.
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//Original author: Roman Ponomarev
+//Mostly Reimplemented by Erwin Coumans
+
+bool gDebugForceLoadingFromSource = false;
+bool gDebugSkipLoadingBinary = false;
+
+#include "Bullet3Common/b3Logging.h"
+
+#include <string.h>
+
+#ifdef _WIN32
+#pragma warning(disable : 4996)
+#endif
+#include "b3OpenCLUtils.h"
+//#include "b3OpenCLInclude.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define B3_MAX_CL_DEVICES 16  //who needs 16 devices?
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include <assert.h>
+#define b3Assert assert
+#ifndef _WIN32
+#include <sys/stat.h>
+
+#endif
+
+static const char* sCachedBinaryPath = "cache";
+
+//Set the preferred platform vendor using the OpenCL SDK
+static const char* spPlatformVendor =
+#if defined(CL_PLATFORM_MINI_CL)
+	"MiniCL, SCEA";
+#elif defined(CL_PLATFORM_AMD)
+	"Advanced Micro Devices, Inc.";
+#elif defined(CL_PLATFORM_NVIDIA)
+	"NVIDIA Corporation";
+#elif defined(CL_PLATFORM_INTEL)
+	"Intel(R) Corporation";
+#elif defined(B3_USE_CLEW)
+	"clew (OpenCL Extension Wrangler library)";
+#else
+	"Unknown Vendor";
+#endif
+
+#ifndef CL_PLATFORM_MINI_CL
+#ifdef _WIN32
+#ifndef B3_USE_CLEW
+#include "CL/cl_gl.h"
+#endif  //B3_USE_CLEW
+#endif  //_WIN32
+#endif
+
+void MyFatalBreakAPPLE(const char* errstr,
+					   const void* private_info,
+					   size_t cb,
+					   void* user_data)
+{
+	const char* patloc = strstr(errstr, "Warning");
+	//find out if it is a warning or error, exit if error
+
+	if (patloc)
+	{
+		b3Warning("Warning: %s\n", errstr);
+	}
+	else
+	{
+		b3Error("Error: %s\n", errstr);
+		b3Assert(0);
+	}
+}
+
+#ifdef B3_USE_CLEW
+
+int b3OpenCLUtils_clewInit()
+{
+	int result = -1;
+
+#ifdef _WIN32
+	const char* cl = "OpenCL.dll";
+#elif defined __APPLE__
+	const char* cl = "/System/Library/Frameworks/OpenCL.framework/Versions/Current/OpenCL";
+#else  //presumable Linux? \
+	   //linux (tested on Ubuntu 12.10 with Catalyst 13.4 beta drivers, not that there is no symbolic link from libOpenCL.so
+	const char* cl = "libOpenCL.so.1";
+	result = clewInit(cl);
+	if (result != CLEW_SUCCESS)
+	{
+		cl = "libOpenCL.so";
+	}
+	else
+	{
+		clewExit();
+	}
+#endif
+	result = clewInit(cl);
+	if (result != CLEW_SUCCESS)
+	{
+		b3Error("clewInit failed with error code %d\n", result);
+	}
+	else
+	{
+		b3Printf("clewInit succesfull using %s\n", cl);
+	}
+	return result;
+}
+#endif
+
+int b3OpenCLUtils_getNumPlatforms(cl_int* pErrNum)
+{
+#ifdef B3_USE_CLEW
+	b3OpenCLUtils_clewInit();
+#endif
+
+	cl_platform_id pPlatforms[10] = {0};
+
+	cl_uint numPlatforms = 0;
+	cl_int ciErrNum = clGetPlatformIDs(10, pPlatforms, &numPlatforms);
+	//cl_int ciErrNum = clGetPlatformIDs(0, NULL, &numPlatforms);
+
+	if (ciErrNum != CL_SUCCESS)
+	{
+		if (pErrNum != NULL)
+			*pErrNum = ciErrNum;
+	}
+	return numPlatforms;
+}
+
+const char* b3OpenCLUtils_getSdkVendorName()
+{
+	return spPlatformVendor;
+}
+
+void b3OpenCLUtils_setCachePath(const char* path)
+{
+	sCachedBinaryPath = path;
+}
+
+cl_platform_id b3OpenCLUtils_getPlatform(int platformIndex0, cl_int* pErrNum)
+{
+#ifdef B3_USE_CLEW
+	b3OpenCLUtils_clewInit();
+#endif
+
+	cl_platform_id platform = 0;
+	unsigned int platformIndex = (unsigned int)platformIndex0;
+	cl_uint numPlatforms;
+	cl_int ciErrNum = clGetPlatformIDs(0, NULL, &numPlatforms);
+
+	if (platformIndex < numPlatforms)
+	{
+		cl_platform_id* platforms = (cl_platform_id*)malloc(sizeof(cl_platform_id) * numPlatforms);
+		ciErrNum = clGetPlatformIDs(numPlatforms, platforms, NULL);
+		if (ciErrNum != CL_SUCCESS)
+		{
+			if (pErrNum != NULL)
+				*pErrNum = ciErrNum;
+			return platform;
+		}
+
+		platform = platforms[platformIndex];
+
+		free(platforms);
+	}
+
+	return platform;
+}
+
+void b3OpenCLUtils::getPlatformInfo(cl_platform_id platform, b3OpenCLPlatformInfo* platformInfo)
+{
+	b3Assert(platform);
+	cl_int ciErrNum;
+	ciErrNum = clGetPlatformInfo(platform, CL_PLATFORM_VENDOR, B3_MAX_STRING_LENGTH, platformInfo->m_platformVendor, NULL);
+	oclCHECKERROR(ciErrNum, CL_SUCCESS);
+	ciErrNum = clGetPlatformInfo(platform, CL_PLATFORM_NAME, B3_MAX_STRING_LENGTH, platformInfo->m_platformName, NULL);
+	oclCHECKERROR(ciErrNum, CL_SUCCESS);
+	ciErrNum = clGetPlatformInfo(platform, CL_PLATFORM_VERSION, B3_MAX_STRING_LENGTH, platformInfo->m_platformVersion, NULL);
+	oclCHECKERROR(ciErrNum, CL_SUCCESS);
+}
+
+void b3OpenCLUtils_printPlatformInfo(cl_platform_id platform)
+{
+	b3OpenCLPlatformInfo platformInfo;
+	b3OpenCLUtils::getPlatformInfo(platform, &platformInfo);
+	b3Printf("Platform info:\n");
+	b3Printf("  CL_PLATFORM_VENDOR: \t\t\t%s\n", platformInfo.m_platformVendor);
+	b3Printf("  CL_PLATFORM_NAME: \t\t\t%s\n", platformInfo.m_platformName);
+	b3Printf("  CL_PLATFORM_VERSION: \t\t\t%s\n", platformInfo.m_platformVersion);
+}
+
+cl_context b3OpenCLUtils_createContextFromPlatform(cl_platform_id platform, cl_device_type deviceType, cl_int* pErrNum, void* pGLContext, void* pGLDC, int preferredDeviceIndex, int preferredPlatformIndex)
+{
+	cl_context retContext = 0;
+	cl_int ciErrNum = 0;
+	cl_uint num_entries;
+	cl_device_id devices[B3_MAX_CL_DEVICES];
+	cl_uint num_devices;
+	cl_context_properties* cprops;
+
+	/*
+	* If we could find our platform, use it. Otherwise pass a NULL and get whatever the
+	* implementation thinks we should be using.
+	*/
+	cl_context_properties cps[7] = {0, 0, 0, 0, 0, 0, 0};
+	cps[0] = CL_CONTEXT_PLATFORM;
+	cps[1] = (cl_context_properties)platform;
+#ifdef _WIN32
+#ifndef B3_USE_CLEW
+	if (pGLContext && pGLDC)
+	{
+		cps[2] = CL_GL_CONTEXT_KHR;
+		cps[3] = (cl_context_properties)pGLContext;
+		cps[4] = CL_WGL_HDC_KHR;
+		cps[5] = (cl_context_properties)pGLDC;
+	}
+#endif  //B3_USE_CLEW
+#endif  //_WIN32
+	num_entries = B3_MAX_CL_DEVICES;
+
+	num_devices = -1;
+
+	ciErrNum = clGetDeviceIDs(
+		platform,
+		deviceType,
+		num_entries,
+		devices,
+		&num_devices);
+
+	if (ciErrNum < 0)
+	{
+		b3Printf("clGetDeviceIDs returned %d\n", ciErrNum);
+		return 0;
+	}
+	cprops = (NULL == platform) ? NULL : cps;
+
+	if (!num_devices)
+		return 0;
+
+	if (pGLContext)
+	{
+		//search for the GPU that relates to the OpenCL context
+		unsigned int i;
+		for (i = 0; i < num_devices; i++)
+		{
+			retContext = clCreateContext(cprops, 1, &devices[i], NULL, NULL, &ciErrNum);
+			if (ciErrNum == CL_SUCCESS)
+				break;
+		}
+	}
+	else
+	{
+		if (preferredDeviceIndex >= 0 && (unsigned int)preferredDeviceIndex < num_devices)
+		{
+			//create a context of the preferred device index
+			retContext = clCreateContext(cprops, 1, &devices[preferredDeviceIndex], NULL, NULL, &ciErrNum);
+		}
+		else
+		{
+			//create a context of all devices
+#if defined(__APPLE__)
+			retContext = clCreateContext(cprops, num_devices, devices, MyFatalBreakAPPLE, NULL, &ciErrNum);
+#else
+			b3Printf("numDevices=%d\n", num_devices);
+
+			retContext = clCreateContext(cprops, num_devices, devices, NULL, NULL, &ciErrNum);
+#endif
+		}
+	}
+	if (pErrNum != NULL)
+	{
+		*pErrNum = ciErrNum;
+	};
+
+	return retContext;
+}
+
+cl_context b3OpenCLUtils_createContextFromType(cl_device_type deviceType, cl_int* pErrNum, void* pGLContext, void* pGLDC, int preferredDeviceIndex, int preferredPlatformIndex, cl_platform_id* retPlatformId)
+{
+#ifdef B3_USE_CLEW
+	b3OpenCLUtils_clewInit();
+#endif
+
+	cl_uint numPlatforms;
+	cl_context retContext = 0;
+	unsigned int i;
+
+	cl_int ciErrNum = clGetPlatformIDs(0, NULL, &numPlatforms);
+	if (ciErrNum != CL_SUCCESS)
+	{
+		if (pErrNum != NULL) *pErrNum = ciErrNum;
+		return NULL;
+	}
+	if (numPlatforms > 0)
+	{
+		cl_platform_id* platforms = (cl_platform_id*)malloc(sizeof(cl_platform_id) * numPlatforms);
+		ciErrNum = clGetPlatformIDs(numPlatforms, platforms, NULL);
+		if (ciErrNum != CL_SUCCESS)
+		{
+			if (pErrNum != NULL)
+				*pErrNum = ciErrNum;
+			free(platforms);
+			return NULL;
+		}
+
+		for (i = 0; i < numPlatforms; ++i)
+		{
+			char pbuf[128];
+			ciErrNum = clGetPlatformInfo(platforms[i],
+										 CL_PLATFORM_VENDOR,
+										 sizeof(pbuf),
+										 pbuf,
+										 NULL);
+			if (ciErrNum != CL_SUCCESS)
+			{
+				if (pErrNum != NULL) *pErrNum = ciErrNum;
+				return NULL;
+			}
+
+			if (preferredPlatformIndex >= 0 && i == preferredPlatformIndex)
+			{
+				cl_platform_id tmpPlatform = platforms[0];
+				platforms[0] = platforms[i];
+				platforms[i] = tmpPlatform;
+				break;
+			}
+			else
+			{
+				if (!strcmp(pbuf, spPlatformVendor))
+				{
+					cl_platform_id tmpPlatform = platforms[0];
+					platforms[0] = platforms[i];
+					platforms[i] = tmpPlatform;
+				}
+			}
+		}
+
+		for (i = 0; i < numPlatforms; ++i)
+		{
+			cl_platform_id platform = platforms[i];
+			assert(platform);
+
+			retContext = b3OpenCLUtils_createContextFromPlatform(platform, deviceType, pErrNum, pGLContext, pGLDC, preferredDeviceIndex, preferredPlatformIndex);
+
+			if (retContext)
+			{
+				//				printf("OpenCL platform details:\n");
+				b3OpenCLPlatformInfo platformInfo;
+
+				b3OpenCLUtils::getPlatformInfo(platform, &platformInfo);
+
+				if (retPlatformId)
+					*retPlatformId = platform;
+
+				break;
+			}
+		}
+
+		free(platforms);
+	}
+	return retContext;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//! Gets the id of the nth device from the context
+//!
+//! @return the id or -1 when out of range
+//! @param cxMainContext         OpenCL context
+//! @param device_idx            index of the device of interest
+//////////////////////////////////////////////////////////////////////////////
+cl_device_id b3OpenCLUtils_getDevice(cl_context cxMainContext, int deviceIndex)
+{
+	assert(cxMainContext);
+
+	size_t szParmDataBytes;
+	cl_device_id* cdDevices;
+	cl_device_id device;
+
+	// get the list of devices associated with context
+	clGetContextInfo(cxMainContext, CL_CONTEXT_DEVICES, 0, NULL, &szParmDataBytes);
+
+	if (szParmDataBytes / sizeof(cl_device_id) < (unsigned int)deviceIndex)
+	{
+		return (cl_device_id)-1;
+	}
+
+	cdDevices = (cl_device_id*)malloc(szParmDataBytes);
+
+	clGetContextInfo(cxMainContext, CL_CONTEXT_DEVICES, szParmDataBytes, cdDevices, NULL);
+
+	device = cdDevices[deviceIndex];
+	free(cdDevices);
+
+	return device;
+}
+
+int b3OpenCLUtils_getNumDevices(cl_context cxMainContext)
+{
+	size_t szParamDataBytes;
+	int device_count;
+	clGetContextInfo(cxMainContext, CL_CONTEXT_DEVICES, 0, NULL, &szParamDataBytes);
+	device_count = (int)szParamDataBytes / sizeof(cl_device_id);
+	return device_count;
+}
+
+void b3OpenCLUtils::getDeviceInfo(cl_device_id device, b3OpenCLDeviceInfo* info)
+{
+	// CL_DEVICE_NAME
+	clGetDeviceInfo(device, CL_DEVICE_NAME, B3_MAX_STRING_LENGTH, &info->m_deviceName, NULL);
+
+	// CL_DEVICE_VENDOR
+	clGetDeviceInfo(device, CL_DEVICE_VENDOR, B3_MAX_STRING_LENGTH, &info->m_deviceVendor, NULL);
+
+	// CL_DRIVER_VERSION
+	clGetDeviceInfo(device, CL_DRIVER_VERSION, B3_MAX_STRING_LENGTH, &info->m_driverVersion, NULL);
+
+	// CL_DEVICE_INFO
+	clGetDeviceInfo(device, CL_DEVICE_TYPE, sizeof(cl_device_type), &info->m_deviceType, NULL);
+
+	// CL_DEVICE_MAX_COMPUTE_UNITS
+	clGetDeviceInfo(device, CL_DEVICE_MAX_COMPUTE_UNITS, sizeof(info->m_computeUnits), &info->m_computeUnits, NULL);
+
+	// CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS
+	clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS, sizeof(info->m_workitemDims), &info->m_workitemDims, NULL);
+
+	// CL_DEVICE_MAX_WORK_ITEM_SIZES
+	clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES, sizeof(info->m_workItemSize), &info->m_workItemSize, NULL);
+
+	// CL_DEVICE_MAX_WORK_GROUP_SIZE
+	clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_GROUP_SIZE, sizeof(info->m_workgroupSize), &info->m_workgroupSize, NULL);
+
+	// CL_DEVICE_MAX_CLOCK_FREQUENCY
+	clGetDeviceInfo(device, CL_DEVICE_MAX_CLOCK_FREQUENCY, sizeof(info->m_clockFrequency), &info->m_clockFrequency, NULL);
+
+	// CL_DEVICE_ADDRESS_BITS
+	clGetDeviceInfo(device, CL_DEVICE_ADDRESS_BITS, sizeof(info->m_addressBits), &info->m_addressBits, NULL);
+
+	// CL_DEVICE_MAX_MEM_ALLOC_SIZE
+	clGetDeviceInfo(device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(info->m_maxMemAllocSize), &info->m_maxMemAllocSize, NULL);
+
+	// CL_DEVICE_GLOBAL_MEM_SIZE
+	clGetDeviceInfo(device, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof(info->m_globalMemSize), &info->m_globalMemSize, NULL);
+
+	// CL_DEVICE_ERROR_CORRECTION_SUPPORT
+	clGetDeviceInfo(device, CL_DEVICE_ERROR_CORRECTION_SUPPORT, sizeof(info->m_errorCorrectionSupport), &info->m_errorCorrectionSupport, NULL);
+
+	// CL_DEVICE_LOCAL_MEM_TYPE
+	clGetDeviceInfo(device, CL_DEVICE_LOCAL_MEM_TYPE, sizeof(info->m_localMemType), &info->m_localMemType, NULL);
+
+	// CL_DEVICE_LOCAL_MEM_SIZE
+	clGetDeviceInfo(device, CL_DEVICE_LOCAL_MEM_SIZE, sizeof(info->m_localMemSize), &info->m_localMemSize, NULL);
+
+	// CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE
+	clGetDeviceInfo(device, CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE, sizeof(info->m_constantBufferSize), &info->m_constantBufferSize, NULL);
+
+	// CL_DEVICE_QUEUE_PROPERTIES
+	clGetDeviceInfo(device, CL_DEVICE_QUEUE_PROPERTIES, sizeof(info->m_queueProperties), &info->m_queueProperties, NULL);
+
+	// CL_DEVICE_IMAGE_SUPPORT
+	clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(info->m_imageSupport), &info->m_imageSupport, NULL);
+
+	// CL_DEVICE_MAX_READ_IMAGE_ARGS
+	clGetDeviceInfo(device, CL_DEVICE_MAX_READ_IMAGE_ARGS, sizeof(info->m_maxReadImageArgs), &info->m_maxReadImageArgs, NULL);
+
+	// CL_DEVICE_MAX_WRITE_IMAGE_ARGS
+	clGetDeviceInfo(device, CL_DEVICE_MAX_WRITE_IMAGE_ARGS, sizeof(info->m_maxWriteImageArgs), &info->m_maxWriteImageArgs, NULL);
+
+	// CL_DEVICE_IMAGE2D_MAX_WIDTH, CL_DEVICE_IMAGE2D_MAX_HEIGHT, CL_DEVICE_IMAGE3D_MAX_WIDTH, CL_DEVICE_IMAGE3D_MAX_HEIGHT, CL_DEVICE_IMAGE3D_MAX_DEPTH
+	clGetDeviceInfo(device, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof(size_t), &info->m_image2dMaxWidth, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_IMAGE2D_MAX_HEIGHT, sizeof(size_t), &info->m_image2dMaxHeight, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_IMAGE3D_MAX_WIDTH, sizeof(size_t), &info->m_image3dMaxWidth, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_IMAGE3D_MAX_HEIGHT, sizeof(size_t), &info->m_image3dMaxHeight, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_IMAGE3D_MAX_DEPTH, sizeof(size_t), &info->m_image3dMaxDepth, NULL);
+
+	// CL_DEVICE_EXTENSIONS: get device extensions, and if any then parse & log the string onto separate lines
+	clGetDeviceInfo(device, CL_DEVICE_EXTENSIONS, B3_MAX_STRING_LENGTH, &info->m_deviceExtensions, NULL);
+
+	// CL_DEVICE_PREFERRED_VECTOR_WIDTH_<type>
+	clGetDeviceInfo(device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR, sizeof(cl_uint), &info->m_vecWidthChar, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT, sizeof(cl_uint), &info->m_vecWidthShort, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT, sizeof(cl_uint), &info->m_vecWidthInt, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG, sizeof(cl_uint), &info->m_vecWidthLong, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT, sizeof(cl_uint), &info->m_vecWidthFloat, NULL);
+	clGetDeviceInfo(device, CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE, sizeof(cl_uint), &info->m_vecWidthDouble, NULL);
+}
+
+void b3OpenCLUtils_printDeviceInfo(cl_device_id device)
+{
+	b3OpenCLDeviceInfo info;
+	b3OpenCLUtils::getDeviceInfo(device, &info);
+	b3Printf("Device Info:\n");
+	b3Printf("  CL_DEVICE_NAME: \t\t\t%s\n", info.m_deviceName);
+	b3Printf("  CL_DEVICE_VENDOR: \t\t\t%s\n", info.m_deviceVendor);
+	b3Printf("  CL_DRIVER_VERSION: \t\t\t%s\n", info.m_driverVersion);
+
+	if (info.m_deviceType & CL_DEVICE_TYPE_CPU)
+		b3Printf("  CL_DEVICE_TYPE:\t\t\t%s\n", "CL_DEVICE_TYPE_CPU");
+	if (info.m_deviceType & CL_DEVICE_TYPE_GPU)
+		b3Printf("  CL_DEVICE_TYPE:\t\t\t%s\n", "CL_DEVICE_TYPE_GPU");
+	if (info.m_deviceType & CL_DEVICE_TYPE_ACCELERATOR)
+		b3Printf("  CL_DEVICE_TYPE:\t\t\t%s\n", "CL_DEVICE_TYPE_ACCELERATOR");
+	if (info.m_deviceType & CL_DEVICE_TYPE_DEFAULT)
+		b3Printf("  CL_DEVICE_TYPE:\t\t\t%s\n", "CL_DEVICE_TYPE_DEFAULT");
+
+	b3Printf("  CL_DEVICE_MAX_COMPUTE_UNITS:\t\t%u\n", info.m_computeUnits);
+	b3Printf("  CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS:\t%u\n", info.m_workitemDims);
+	b3Printf("  CL_DEVICE_MAX_WORK_ITEM_SIZES:\t%u / %u / %u \n", info.m_workItemSize[0], info.m_workItemSize[1], info.m_workItemSize[2]);
+	b3Printf("  CL_DEVICE_MAX_WORK_GROUP_SIZE:\t%u\n", info.m_workgroupSize);
+	b3Printf("  CL_DEVICE_MAX_CLOCK_FREQUENCY:\t%u MHz\n", info.m_clockFrequency);
+	b3Printf("  CL_DEVICE_ADDRESS_BITS:\t\t%u\n", info.m_addressBits);
+	b3Printf("  CL_DEVICE_MAX_MEM_ALLOC_SIZE:\t\t%u MByte\n", (unsigned int)(info.m_maxMemAllocSize / (1024 * 1024)));
+	b3Printf("  CL_DEVICE_GLOBAL_MEM_SIZE:\t\t%u MByte\n", (unsigned int)(info.m_globalMemSize / (1024 * 1024)));
+	b3Printf("  CL_DEVICE_ERROR_CORRECTION_SUPPORT:\t%s\n", info.m_errorCorrectionSupport == CL_TRUE ? "yes" : "no");
+	b3Printf("  CL_DEVICE_LOCAL_MEM_TYPE:\t\t%s\n", info.m_localMemType == 1 ? "local" : "global");
+	b3Printf("  CL_DEVICE_LOCAL_MEM_SIZE:\t\t%u KByte\n", (unsigned int)(info.m_localMemSize / 1024));
+	b3Printf("  CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE:\t%u KByte\n", (unsigned int)(info.m_constantBufferSize / 1024));
+	if (info.m_queueProperties & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE)
+		b3Printf("  CL_DEVICE_QUEUE_PROPERTIES:\t\t%s\n", "CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE");
+	if (info.m_queueProperties & CL_QUEUE_PROFILING_ENABLE)
+		b3Printf("  CL_DEVICE_QUEUE_PROPERTIES:\t\t%s\n", "CL_QUEUE_PROFILING_ENABLE");
+
+	b3Printf("  CL_DEVICE_IMAGE_SUPPORT:\t\t%u\n", info.m_imageSupport);
+
+	b3Printf("  CL_DEVICE_MAX_READ_IMAGE_ARGS:\t%u\n", info.m_maxReadImageArgs);
+	b3Printf("  CL_DEVICE_MAX_WRITE_IMAGE_ARGS:\t%u\n", info.m_maxWriteImageArgs);
+	b3Printf("\n  CL_DEVICE_IMAGE <dim>");
+	b3Printf("\t\t\t2D_MAX_WIDTH\t %u\n", info.m_image2dMaxWidth);
+	b3Printf("\t\t\t\t\t2D_MAX_HEIGHT\t %u\n", info.m_image2dMaxHeight);
+	b3Printf("\t\t\t\t\t3D_MAX_WIDTH\t %u\n", info.m_image3dMaxWidth);
+	b3Printf("\t\t\t\t\t3D_MAX_HEIGHT\t %u\n", info.m_image3dMaxHeight);
+	b3Printf("\t\t\t\t\t3D_MAX_DEPTH\t %u\n", info.m_image3dMaxDepth);
+	if (*info.m_deviceExtensions != 0)
+	{
+		b3Printf("\n  CL_DEVICE_EXTENSIONS:%s\n", info.m_deviceExtensions);
+	}
+	else
+	{
+		b3Printf("  CL_DEVICE_EXTENSIONS: None\n");
+	}
+	b3Printf("  CL_DEVICE_PREFERRED_VECTOR_WIDTH_<t>\t");
+	b3Printf("CHAR %u, SHORT %u, INT %u,LONG %u, FLOAT %u, DOUBLE %u\n\n\n",
+			 info.m_vecWidthChar, info.m_vecWidthShort, info.m_vecWidthInt, info.m_vecWidthLong, info.m_vecWidthFloat, info.m_vecWidthDouble);
+}
+
+static const char* strip2(const char* name, const char* pattern)
+{
+	size_t const patlen = strlen(pattern);
+	size_t patcnt = 0;
+	const char* oriptr;
+	const char* patloc;
+	// find how many times the pattern occurs in the original string
+	for (oriptr = name; (patloc = strstr(oriptr, pattern)); oriptr = patloc + patlen)
+	{
+		patcnt++;
+	}
+	return oriptr;
+}
+
+cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_device_id device, const char* kernelSourceOrg, cl_int* pErrNum, const char* additionalMacrosArg, const char* clFileNameForCaching, bool disableBinaryCaching)
+{
+	const char* additionalMacros = additionalMacrosArg ? additionalMacrosArg : "";
+
+	if (disableBinaryCaching)
+	{
+		//kernelSourceOrg = 0;
+	}
+
+	cl_program m_cpProgram = 0;
+	cl_int status;
+
+	char binaryFileName[B3_MAX_STRING_LENGTH];
+
+	char deviceName[256];
+	char driverVersion[256];
+	const char* strippedName;
+	int fileUpToDate = 0;
+#ifdef _WIN32
+	int binaryFileValid = 0;
+#endif
+	if (!disableBinaryCaching && clFileNameForCaching)
+	{
+		clGetDeviceInfo(device, CL_DEVICE_NAME, 256, &deviceName, NULL);
+		clGetDeviceInfo(device, CL_DRIVER_VERSION, 256, &driverVersion, NULL);
+
+		strippedName = strip2(clFileNameForCaching, "\\");
+		strippedName = strip2(strippedName, "/");
+
+#ifdef _MSC_VER
+		sprintf_s(binaryFileName, B3_MAX_STRING_LENGTH, "%s/%s.%s.%s.bin", sCachedBinaryPath, strippedName, deviceName, driverVersion);
+#else
+		sprintf(binaryFileName, "%s/%s.%s.%s.bin", sCachedBinaryPath, strippedName, deviceName, driverVersion);
+#endif
+	}
+	if (clFileNameForCaching && !(disableBinaryCaching || gDebugSkipLoadingBinary || gDebugForceLoadingFromSource))
+	{
+#ifdef _WIN32
+		char* bla = 0;
+
+		//printf("searching for %s\n", binaryFileName);
+
+		FILETIME modtimeBinary;
+		CreateDirectoryA(sCachedBinaryPath, 0);
+		{
+			HANDLE binaryFileHandle = CreateFileA(binaryFileName, GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+			if (binaryFileHandle == INVALID_HANDLE_VALUE)
+			{
+				DWORD errorCode;
+				errorCode = GetLastError();
+				switch (errorCode)
+				{
+					case ERROR_FILE_NOT_FOUND:
+					{
+						b3Warning("\nCached file not found %s\n", binaryFileName);
+						break;
+					}
+					case ERROR_PATH_NOT_FOUND:
+					{
+						b3Warning("\nCached file path not found %s\n", binaryFileName);
+						break;
+					}
+					default:
+					{
+						b3Warning("\nFailed reading cached file with errorCode = %d\n", errorCode);
+					}
+				}
+			}
+			else
+			{
+				if (GetFileTime(binaryFileHandle, NULL, NULL, &modtimeBinary) == 0)
+				{
+					DWORD errorCode;
+					errorCode = GetLastError();
+					b3Warning("\nGetFileTime errorCode = %d\n", errorCode);
+				}
+				else
+				{
+					binaryFileValid = 1;
+				}
+				CloseHandle(binaryFileHandle);
+			}
+
+			if (binaryFileValid)
+			{
+				HANDLE srcFileHandle = CreateFileA(clFileNameForCaching, GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+
+				if (srcFileHandle == INVALID_HANDLE_VALUE)
+				{
+					const char* prefix[] = {"./", "../", "../../", "../../../", "../../../../"};
+					for (int i = 0; (srcFileHandle == INVALID_HANDLE_VALUE) && i < 5; i++)
+					{
+						char relativeFileName[1024];
+						sprintf(relativeFileName, "%s%s", prefix[i], clFileNameForCaching);
+						srcFileHandle = CreateFileA(relativeFileName, GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+					}
+				}
+
+				if (srcFileHandle != INVALID_HANDLE_VALUE)
+				{
+					FILETIME modtimeSrc;
+					if (GetFileTime(srcFileHandle, NULL, NULL, &modtimeSrc) == 0)
+					{
+						DWORD errorCode;
+						errorCode = GetLastError();
+						b3Warning("\nGetFileTime errorCode = %d\n", errorCode);
+					}
+					if ((modtimeSrc.dwHighDateTime < modtimeBinary.dwHighDateTime) || ((modtimeSrc.dwHighDateTime == modtimeBinary.dwHighDateTime) && (modtimeSrc.dwLowDateTime <= modtimeBinary.dwLowDateTime)))
+					{
+						fileUpToDate = 1;
+					}
+					else
+					{
+						b3Warning("\nCached binary file out-of-date (%s)\n", binaryFileName);
+					}
+					CloseHandle(srcFileHandle);
+				}
+				else
+				{
+#ifdef _DEBUG
+					DWORD errorCode;
+					errorCode = GetLastError();
+					switch (errorCode)
+					{
+						case ERROR_FILE_NOT_FOUND:
+						{
+							b3Warning("\nSrc file not found %s\n", clFileNameForCaching);
+							break;
+						}
+						case ERROR_PATH_NOT_FOUND:
+						{
+							b3Warning("\nSrc path not found %s\n", clFileNameForCaching);
+							break;
+						}
+						default:
+						{
+							b3Warning("\nnSrc file reading errorCode = %d\n", errorCode);
+						}
+					}
+
+					//we should make sure the src file exists so we can verify the timestamp with binary
+					//					assert(0);
+					b3Warning("Warning: cannot find OpenCL kernel %s to verify timestamp of binary cached kernel %s\n", clFileNameForCaching, binaryFileName);
+					fileUpToDate = true;
+#else
+					//if we cannot find the source, assume it is OK in release builds
+					fileUpToDate = true;
+#endif
+				}
+			}
+		}
+
+#else
+		fileUpToDate = true;
+		if (mkdir(sCachedBinaryPath, 0777) == -1)
+		{
+		}
+		else
+		{
+			b3Printf("Succesfully created cache directory: %s\n", sCachedBinaryPath);
+		}
+#endif  //_WIN32
+	}
+
+	if (fileUpToDate)
+	{
+#ifdef _MSC_VER
+		FILE* file;
+		if (fopen_s(&file, binaryFileName, "rb") != 0)
+			file = 0;
+#else
+		FILE* file = fopen(binaryFileName, "rb");
+#endif
+
+		if (file)
+		{
+			size_t binarySize = 0;
+			char* binary = 0;
+
+			fseek(file, 0L, SEEK_END);
+			binarySize = ftell(file);
+			rewind(file);
+			binary = (char*)malloc(sizeof(char) * binarySize);
+			int bytesRead;
+			bytesRead = fread(binary, sizeof(char), binarySize, file);
+			fclose(file);
+
+			m_cpProgram = clCreateProgramWithBinary(clContext, 1, &device, &binarySize, (const unsigned char**)&binary, 0, &status);
+			b3Assert(status == CL_SUCCESS);
+			status = clBuildProgram(m_cpProgram, 1, &device, additionalMacros, 0, 0);
+			b3Assert(status == CL_SUCCESS);
+
+			if (status != CL_SUCCESS)
+			{
+				char* build_log;
+				size_t ret_val_size;
+				clGetProgramBuildInfo(m_cpProgram, device, CL_PROGRAM_BUILD_LOG, 0, NULL, &ret_val_size);
+				build_log = (char*)malloc(sizeof(char) * (ret_val_size + 1));
+				clGetProgramBuildInfo(m_cpProgram, device, CL_PROGRAM_BUILD_LOG, ret_val_size, build_log, NULL);
+				build_log[ret_val_size] = '\0';
+				b3Error("%s\n", build_log);
+				free(build_log);
+				b3Assert(0);
+				m_cpProgram = 0;
+
+				b3Warning("clBuildProgram reported failure on cached binary: %s\n", binaryFileName);
+			}
+			else
+			{
+				b3Printf("clBuildProgram successfully compiled cached binary: %s\n", binaryFileName);
+			}
+			free(binary);
+		}
+		else
+		{
+			b3Warning("Cannot open cached binary: %s\n", binaryFileName);
+		}
+	}
+
+	if (!m_cpProgram)
+	{
+		cl_int localErrNum;
+		char* compileFlags;
+		int flagsize;
+
+		const char* kernelSource = kernelSourceOrg;
+
+		if (!kernelSourceOrg || gDebugForceLoadingFromSource)
+		{
+			if (clFileNameForCaching)
+			{
+				FILE* file = fopen(clFileNameForCaching, "rb");
+				//in many cases the relative path is a few levels up the directory hierarchy, so try it
+				if (!file)
+				{
+					const char* prefix[] = {"../", "../../", "../../../", "../../../../"};
+					for (int i = 0; !file && i < 3; i++)
+					{
+						char relativeFileName[1024];
+						sprintf(relativeFileName, "%s%s", prefix[i], clFileNameForCaching);
+						file = fopen(relativeFileName, "rb");
+					}
+				}
+
+				if (file)
+				{
+					char* kernelSrc = 0;
+					fseek(file, 0L, SEEK_END);
+					int kernelSize = ftell(file);
+					rewind(file);
+					kernelSrc = (char*)malloc(kernelSize + 1);
+					int readBytes;
+					readBytes = fread((void*)kernelSrc, 1, kernelSize, file);
+					kernelSrc[kernelSize] = 0;
+					fclose(file);
+					kernelSource = kernelSrc;
+				}
+			}
+		}
+
+		size_t program_length = kernelSource ? strlen(kernelSource) : 0;
+#ifdef MAC  //or __APPLE__?
+		char* flags = "-cl-mad-enable -DMAC ";
+#else
+		const char* flags = "";
+#endif
+
+		m_cpProgram = clCreateProgramWithSource(clContext, 1, (const char**)&kernelSource, &program_length, &localErrNum);
+		if (localErrNum != CL_SUCCESS)
+		{
+			if (pErrNum)
+				*pErrNum = localErrNum;
+			return 0;
+		}
+
+		// Build the program with 'mad' Optimization option
+
+		flagsize = sizeof(char) * (strlen(additionalMacros) + strlen(flags) + 5);
+		compileFlags = (char*)malloc(flagsize);
+#ifdef _MSC_VER
+		sprintf_s(compileFlags, flagsize, "%s %s", flags, additionalMacros);
+#else
+		sprintf(compileFlags, "%s %s", flags, additionalMacros);
+#endif
+		localErrNum = clBuildProgram(m_cpProgram, 1, &device, compileFlags, NULL, NULL);
+		if (localErrNum != CL_SUCCESS)
+		{
+			char* build_log;
+			size_t ret_val_size;
+			clGetProgramBuildInfo(m_cpProgram, device, CL_PROGRAM_BUILD_LOG, 0, NULL, &ret_val_size);
+			build_log = (char*)malloc(sizeof(char) * (ret_val_size + 1));
+			clGetProgramBuildInfo(m_cpProgram, device, CL_PROGRAM_BUILD_LOG, ret_val_size, build_log, NULL);
+
+			// to be carefully, terminate with \0
+			// there's no information in the reference whether the string is 0 terminated or not
+			build_log[ret_val_size] = '\0';
+
+			b3Error("Error in clBuildProgram, Line %u in file %s, Log: \n%s\n !!!\n\n", __LINE__, __FILE__, build_log);
+			free(build_log);
+			if (pErrNum)
+				*pErrNum = localErrNum;
+			return 0;
+		}
+
+		if (!disableBinaryCaching && clFileNameForCaching)
+		{  //	write to binary
+
+			cl_uint numAssociatedDevices;
+			status = clGetProgramInfo(m_cpProgram, CL_PROGRAM_NUM_DEVICES, sizeof(cl_uint), &numAssociatedDevices, 0);
+			b3Assert(status == CL_SUCCESS);
+			if (numAssociatedDevices == 1)
+			{
+				size_t binarySize;
+				char* binary;
+
+				status = clGetProgramInfo(m_cpProgram, CL_PROGRAM_BINARY_SIZES, sizeof(size_t), &binarySize, 0);
+				b3Assert(status == CL_SUCCESS);
+
+				binary = (char*)malloc(sizeof(char) * binarySize);
+
+				status = clGetProgramInfo(m_cpProgram, CL_PROGRAM_BINARIES, sizeof(char*), &binary, 0);
+				b3Assert(status == CL_SUCCESS);
+
+				{
+					FILE* file = 0;
+#ifdef _MSC_VER
+					if (fopen_s(&file, binaryFileName, "wb") != 0)
+						file = 0;
+#else
+					file = fopen(binaryFileName, "wb");
+#endif
+					if (file)
+					{
+						fwrite(binary, sizeof(char), binarySize, file);
+						fclose(file);
+					}
+					else
+					{
+						b3Warning("cannot write file %s\n", binaryFileName);
+					}
+				}
+
+				free(binary);
+			}
+		}
+
+		free(compileFlags);
+	}
+	return m_cpProgram;
+}
+
+cl_kernel b3OpenCLUtils_compileCLKernelFromString(cl_context clContext, cl_device_id device, const char* kernelSource, const char* kernelName, cl_int* pErrNum, cl_program prog, const char* additionalMacros)
+{
+	cl_kernel kernel;
+	cl_int localErrNum;
+
+	cl_program m_cpProgram = prog;
+
+	b3Printf("compiling kernel %s ", kernelName);
+
+	if (!m_cpProgram)
+	{
+		m_cpProgram = b3OpenCLUtils_compileCLProgramFromString(clContext, device, kernelSource, pErrNum, additionalMacros, 0, false);
+	}
+
+	// Create the kernel
+	kernel = clCreateKernel(m_cpProgram, kernelName, &localErrNum);
+	if (localErrNum != CL_SUCCESS)
+	{
+		b3Error("Error in clCreateKernel, Line %u in file %s, cannot find kernel function %s !!!\n\n", __LINE__, __FILE__, kernelName);
+		assert(0);
+		if (pErrNum)
+			*pErrNum = localErrNum;
+		return 0;
+	}
+
+	if (!prog && m_cpProgram)
+	{
+		clReleaseProgram(m_cpProgram);
+	}
+	b3Printf("ready. \n");
+
+	if (pErrNum)
+		*pErrNum = CL_SUCCESS;
+	return kernel;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.h
new file mode 100644
index 0000000..6c82eed
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Initialize/b3OpenCLUtils.h
@@ -0,0 +1,190 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006 - 2011 Sony Computer Entertainment Inc. 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//original author: Roman Ponomarev
+//cleanup by Erwin Coumans
+
+#ifndef B3_OPENCL_UTILS_H
+#define B3_OPENCL_UTILS_H
+
+#include "b3OpenCLInclude.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	///C API for OpenCL utilities: convenience functions, see below for C++ API
+
+	/// CL Context optionally takes a GL context. This is a generic type because we don't really want this code
+	/// to have to understand GL types. It is a HGLRC in _WIN32 or a GLXContext otherwise.
+	cl_context b3OpenCLUtils_createContextFromType(cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx, void* pGLDC, int preferredDeviceIndex, int preferredPlatformIndex, cl_platform_id* platformId);
+
+	int b3OpenCLUtils_getNumDevices(cl_context cxMainContext);
+
+	cl_device_id b3OpenCLUtils_getDevice(cl_context cxMainContext, int nr);
+
+	void b3OpenCLUtils_printDeviceInfo(cl_device_id device);
+
+	cl_kernel b3OpenCLUtils_compileCLKernelFromString(cl_context clContext, cl_device_id device, const char* kernelSource, const char* kernelName, cl_int* pErrNum, cl_program prog, const char* additionalMacros);
+
+	//optional
+	cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_device_id device, const char* kernelSource, cl_int* pErrNum, const char* additionalMacros, const char* srcFileNameForCaching, bool disableBinaryCaching);
+
+	//the following optional APIs provide access using specific platform information
+	int b3OpenCLUtils_getNumPlatforms(cl_int* pErrNum);
+
+	///get the nr'th platform, where nr is in the range [0..getNumPlatforms)
+	cl_platform_id b3OpenCLUtils_getPlatform(int nr, cl_int* pErrNum);
+
+	void b3OpenCLUtils_printPlatformInfo(cl_platform_id platform);
+
+	const char* b3OpenCLUtils_getSdkVendorName();
+
+	///set the path (directory/folder) where the compiled OpenCL kernel are stored
+	void b3OpenCLUtils_setCachePath(const char* path);
+
+	cl_context b3OpenCLUtils_createContextFromPlatform(cl_platform_id platform, cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx, void* pGLDC, int preferredDeviceIndex, int preferredPlatformIndex);
+
+#ifdef __cplusplus
+}
+
+#define B3_MAX_STRING_LENGTH 1024
+
+typedef struct
+{
+	char m_deviceName[B3_MAX_STRING_LENGTH];
+	char m_deviceVendor[B3_MAX_STRING_LENGTH];
+	char m_driverVersion[B3_MAX_STRING_LENGTH];
+	char m_deviceExtensions[B3_MAX_STRING_LENGTH];
+
+	cl_device_type m_deviceType;
+	cl_uint m_computeUnits;
+	size_t m_workitemDims;
+	size_t m_workItemSize[3];
+	size_t m_image2dMaxWidth;
+	size_t m_image2dMaxHeight;
+	size_t m_image3dMaxWidth;
+	size_t m_image3dMaxHeight;
+	size_t m_image3dMaxDepth;
+	size_t m_workgroupSize;
+	cl_uint m_clockFrequency;
+	cl_ulong m_constantBufferSize;
+	cl_ulong m_localMemSize;
+	cl_ulong m_globalMemSize;
+	cl_bool m_errorCorrectionSupport;
+	cl_device_local_mem_type m_localMemType;
+	cl_uint m_maxReadImageArgs;
+	cl_uint m_maxWriteImageArgs;
+
+	cl_uint m_addressBits;
+	cl_ulong m_maxMemAllocSize;
+	cl_command_queue_properties m_queueProperties;
+	cl_bool m_imageSupport;
+	cl_uint m_vecWidthChar;
+	cl_uint m_vecWidthShort;
+	cl_uint m_vecWidthInt;
+	cl_uint m_vecWidthLong;
+	cl_uint m_vecWidthFloat;
+	cl_uint m_vecWidthDouble;
+
+} b3OpenCLDeviceInfo;
+
+struct b3OpenCLPlatformInfo
+{
+	char m_platformVendor[B3_MAX_STRING_LENGTH];
+	char m_platformName[B3_MAX_STRING_LENGTH];
+	char m_platformVersion[B3_MAX_STRING_LENGTH];
+
+	b3OpenCLPlatformInfo()
+	{
+		m_platformVendor[0] = 0;
+		m_platformName[0] = 0;
+		m_platformVersion[0] = 0;
+	}
+};
+
+///C++ API for OpenCL utilities: convenience functions
+struct b3OpenCLUtils
+{
+	/// CL Context optionally takes a GL context. This is a generic type because we don't really want this code
+	/// to have to understand GL types. It is a HGLRC in _WIN32 or a GLXContext otherwise.
+	static inline cl_context createContextFromType(cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx = 0, void* pGLDC = 0, int preferredDeviceIndex = -1, int preferredPlatformIndex = -1, cl_platform_id* platformId = 0)
+	{
+		return b3OpenCLUtils_createContextFromType(deviceType, pErrNum, pGLCtx, pGLDC, preferredDeviceIndex, preferredPlatformIndex, platformId);
+	}
+
+	static inline int getNumDevices(cl_context cxMainContext)
+	{
+		return b3OpenCLUtils_getNumDevices(cxMainContext);
+	}
+	static inline cl_device_id getDevice(cl_context cxMainContext, int nr)
+	{
+		return b3OpenCLUtils_getDevice(cxMainContext, nr);
+	}
+
+	static void getDeviceInfo(cl_device_id device, b3OpenCLDeviceInfo* info);
+
+	static inline void printDeviceInfo(cl_device_id device)
+	{
+		b3OpenCLUtils_printDeviceInfo(device);
+	}
+
+	static inline cl_kernel compileCLKernelFromString(cl_context clContext, cl_device_id device, const char* kernelSource, const char* kernelName, cl_int* pErrNum = 0, cl_program prog = 0, const char* additionalMacros = "")
+	{
+		return b3OpenCLUtils_compileCLKernelFromString(clContext, device, kernelSource, kernelName, pErrNum, prog, additionalMacros);
+	}
+
+	//optional
+	static inline cl_program compileCLProgramFromString(cl_context clContext, cl_device_id device, const char* kernelSource, cl_int* pErrNum = 0, const char* additionalMacros = "", const char* srcFileNameForCaching = 0, bool disableBinaryCaching = false)
+	{
+		return b3OpenCLUtils_compileCLProgramFromString(clContext, device, kernelSource, pErrNum, additionalMacros, srcFileNameForCaching, disableBinaryCaching);
+	}
+
+	//the following optional APIs provide access using specific platform information
+	static inline int getNumPlatforms(cl_int* pErrNum = 0)
+	{
+		return b3OpenCLUtils_getNumPlatforms(pErrNum);
+	}
+	///get the nr'th platform, where nr is in the range [0..getNumPlatforms)
+	static inline cl_platform_id getPlatform(int nr, cl_int* pErrNum = 0)
+	{
+		return b3OpenCLUtils_getPlatform(nr, pErrNum);
+	}
+
+	static void getPlatformInfo(cl_platform_id platform, b3OpenCLPlatformInfo* platformInfo);
+
+	static inline void printPlatformInfo(cl_platform_id platform)
+	{
+		b3OpenCLUtils_printPlatformInfo(platform);
+	}
+
+	static inline const char* getSdkVendorName()
+	{
+		return b3OpenCLUtils_getSdkVendorName();
+	}
+	static inline cl_context createContextFromPlatform(cl_platform_id platform, cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx = 0, void* pGLDC = 0, int preferredDeviceIndex = -1, int preferredPlatformIndex = -1)
+	{
+		return b3OpenCLUtils_createContextFromPlatform(platform, deviceType, pErrNum, pGLCtx, pGLDC, preferredDeviceIndex, preferredPlatformIndex);
+	}
+	static void setCachePath(const char* path)
+	{
+		b3OpenCLUtils_setCachePath(path);
+	}
+};
+
+#endif  //__cplusplus
+
+#endif  // B3_OPENCL_UTILS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3BvhInfo.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3BvhInfo.h
new file mode 100644
index 0000000..27835bb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3BvhInfo.h
@@ -0,0 +1,17 @@
+#ifndef B3_BVH_INFO_H
+#define B3_BVH_INFO_H
+
+#include "Bullet3Common/b3Vector3.h"
+
+struct b3BvhInfo
+{
+	b3Vector3 m_aabbMin;
+	b3Vector3 m_aabbMax;
+	b3Vector3 m_quantization;
+	int m_numNodes;
+	int m_numSubTrees;
+	int m_nodeOffset;
+	int m_subTreeOffset;
+};
+
+#endif  //B3_BVH_INFO_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.cpp
new file mode 100644
index 0000000..867b3e0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.cpp
@@ -0,0 +1,253 @@
+
+#if 0
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3ContactCache.h"
+#include "Bullet3Common/b3Transform.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+b3Scalar					gContactBreakingThreshold = b3Scalar(0.02);
+
+///gContactCalcArea3Points will approximate the convex hull area using 3 points
+///when setting it to false, it will use 4 points to compute the area: it is more accurate but slower
+bool						gContactCalcArea3Points = true;
+
+
+
+
+static inline b3Scalar calcArea4Points(const b3Vector3 &p0,const b3Vector3 &p1,const b3Vector3 &p2,const b3Vector3 &p3)
+{
+	// It calculates possible 3 area constructed from random 4 points and returns the biggest one.
+
+	b3Vector3 a[3],b[3];
+	a[0] = p0 - p1;
+	a[1] = p0 - p2;
+	a[2] = p0 - p3;
+	b[0] = p2 - p3;
+	b[1] = p1 - p3;
+	b[2] = p1 - p2;
+
+	//todo: Following 3 cross production can be easily optimized by SIMD.
+	b3Vector3 tmp0 = a[0].cross(b[0]);
+	b3Vector3 tmp1 = a[1].cross(b[1]);
+	b3Vector3 tmp2 = a[2].cross(b[2]);
+
+	return b3Max(b3Max(tmp0.length2(),tmp1.length2()),tmp2.length2());
+}
+#if 0
+
+//using localPointA for all points
+int b3ContactCache::sortCachedPoints(const b3Vector3& pt) 
+{
+		//calculate 4 possible cases areas, and take biggest area
+		//also need to keep 'deepest'
+		
+		int maxPenetrationIndex = -1;
+#define KEEP_DEEPEST_POINT 1
+#ifdef KEEP_DEEPEST_POINT
+		b3Scalar maxPenetration = pt.getDistance();
+		for (int i=0;i<4;i++)
+		{
+			if (m_pointCache[i].getDistance() < maxPenetration)
+			{
+				maxPenetrationIndex = i;
+				maxPenetration = m_pointCache[i].getDistance();
+			}
+		}
+#endif  //KEEP_DEEPEST_POINT
+		
+		b3Scalar res0(b3Scalar(0.)),res1(b3Scalar(0.)),res2(b3Scalar(0.)),res3(b3Scalar(0.));
+
+	if (gContactCalcArea3Points)
+	{
+		if (maxPenetrationIndex != 0)
+		{
+			b3Vector3 a0 = pt.m_localPointA-m_pointCache[1].m_localPointA;
+			b3Vector3 b0 = m_pointCache[3].m_localPointA-m_pointCache[2].m_localPointA;
+			b3Vector3 cross = a0.cross(b0);
+			res0 = cross.length2();
+		}
+		if (maxPenetrationIndex != 1)
+		{
+			b3Vector3 a1 = pt.m_localPointA-m_pointCache[0].m_localPointA;
+			b3Vector3 b1 = m_pointCache[3].m_localPointA-m_pointCache[2].m_localPointA;
+			b3Vector3 cross = a1.cross(b1);
+			res1 = cross.length2();
+		}
+
+		if (maxPenetrationIndex != 2)
+		{
+			b3Vector3 a2 = pt.m_localPointA-m_pointCache[0].m_localPointA;
+			b3Vector3 b2 = m_pointCache[3].m_localPointA-m_pointCache[1].m_localPointA;
+			b3Vector3 cross = a2.cross(b2);
+			res2 = cross.length2();
+		}
+
+		if (maxPenetrationIndex != 3)
+		{
+			b3Vector3 a3 = pt.m_localPointA-m_pointCache[0].m_localPointA;
+			b3Vector3 b3 = m_pointCache[2].m_localPointA-m_pointCache[1].m_localPointA;
+			b3Vector3 cross = a3.cross(b3);
+			res3 = cross.length2();
+		}
+	} 
+	else
+	{
+		if(maxPenetrationIndex != 0) {
+			res0 = calcArea4Points(pt.m_localPointA,m_pointCache[1].m_localPointA,m_pointCache[2].m_localPointA,m_pointCache[3].m_localPointA);
+		}
+
+		if(maxPenetrationIndex != 1) {
+			res1 = calcArea4Points(pt.m_localPointA,m_pointCache[0].m_localPointA,m_pointCache[2].m_localPointA,m_pointCache[3].m_localPointA);
+		}
+
+		if(maxPenetrationIndex != 2) {
+			res2 = calcArea4Points(pt.m_localPointA,m_pointCache[0].m_localPointA,m_pointCache[1].m_localPointA,m_pointCache[3].m_localPointA);
+		}
+
+		if(maxPenetrationIndex != 3) {
+			res3 = calcArea4Points(pt.m_localPointA,m_pointCache[0].m_localPointA,m_pointCache[1].m_localPointA,m_pointCache[2].m_localPointA);
+		}
+	}
+	b3Vector4 maxvec(res0,res1,res2,res3);
+	int biggestarea = maxvec.closestAxis4();
+	return biggestarea;
+	
+}
+
+
+int b3ContactCache::getCacheEntry(const b3Vector3& newPoint) const
+{
+	b3Scalar shortestDist =  getContactBreakingThreshold() * getContactBreakingThreshold();
+	int size = getNumContacts();
+	int nearestPoint = -1;
+	for( int i = 0; i < size; i++ )
+	{
+		const b3Vector3 &mp = m_pointCache[i];
+
+		b3Vector3 diffA =  mp.m_localPointA- newPoint.m_localPointA;
+		const b3Scalar distToManiPoint = diffA.dot(diffA);
+		if( distToManiPoint < shortestDist )
+		{
+			shortestDist = distToManiPoint;
+			nearestPoint = i;
+		}
+	}
+	return nearestPoint;
+}
+
+int b3ContactCache::addManifoldPoint(const b3Vector3& newPoint)
+{
+	b3Assert(validContactDistance(newPoint));
+	
+	int insertIndex = getNumContacts();
+	if (insertIndex == MANIFOLD_CACHE_SIZE)
+	{
+#if MANIFOLD_CACHE_SIZE >= 4
+		//sort cache so best points come first, based on area
+		insertIndex = sortCachedPoints(newPoint);
+#else
+		insertIndex = 0;
+#endif
+		clearUserCache(m_pointCache[insertIndex]);
+		
+	} else
+	{
+		m_cachedPoints++;
+
+		
+	}
+	if (insertIndex<0)
+		insertIndex=0;
+
+	//b3Assert(m_pointCache[insertIndex].m_userPersistentData==0);
+	m_pointCache[insertIndex] = newPoint;
+	return insertIndex;
+}
+
+#endif
+
+bool b3ContactCache::validContactDistance(const b3Vector3& pt)
+{
+	return pt.w <= gContactBreakingThreshold;
+}
+
+void b3ContactCache::removeContactPoint(struct b3Contact4Data& newContactCache,int i)
+{
+	int numContacts = b3Contact4Data_getNumPoints(&newContactCache);
+	if (i!=(numContacts-1))
+	{
+		b3Swap(newContactCache.m_localPosA[i],newContactCache.m_localPosA[numContacts-1]);
+		b3Swap(newContactCache.m_localPosB[i],newContactCache.m_localPosB[numContacts-1]);
+		b3Swap(newContactCache.m_worldPosB[i],newContactCache.m_worldPosB[numContacts-1]);
+	}
+	b3Contact4Data_setNumPoints(&newContactCache,numContacts-1);
+
+}
+
+
+void b3ContactCache::refreshContactPoints(const b3Transform& trA,const b3Transform& trB, struct b3Contact4Data& contacts)
+{
+
+	int numContacts = b3Contact4Data_getNumPoints(&contacts);
+	
+
+	int i;
+	/// first refresh worldspace positions and distance
+	for (i=numContacts-1;i>=0;i--)
+	{
+		b3Vector3 worldPosA = trA( contacts.m_localPosA[i]);
+		b3Vector3 worldPosB = trB( contacts.m_localPosB[i]);
+		contacts.m_worldPosB[i] = worldPosB;
+		float distance = (worldPosA -  worldPosB).dot(contacts.m_worldNormalOnB);
+		contacts.m_worldPosB[i].w = distance;
+	}
+
+	/// then 
+	b3Scalar distance2d;
+	b3Vector3 projectedDifference,projectedPoint;
+	for (i=numContacts-1;i>=0;i--)
+	{
+		b3Vector3 worldPosA = trA( contacts.m_localPosA[i]);
+		b3Vector3 worldPosB = trB( contacts.m_localPosB[i]);
+		b3Vector3&pt = contacts.m_worldPosB[i];
+		//contact becomes invalid when signed distance exceeds margin (projected on contactnormal direction)
+		if (!validContactDistance(pt))
+		{
+			removeContactPoint(contacts,i);
+		} else
+		{
+			//contact also becomes invalid when relative movement orthogonal to normal exceeds margin
+			projectedPoint = worldPosA - contacts.m_worldNormalOnB * contacts.m_worldPosB[i].w;
+			projectedDifference = contacts.m_worldPosB[i] - projectedPoint;
+			distance2d = projectedDifference.dot(projectedDifference);
+			if (distance2d  > gContactBreakingThreshold*gContactBreakingThreshold )
+			{
+				removeContactPoint(contacts,i);
+			} else
+			{
+				////contact point processed callback
+				//if (gContactProcessedCallback)
+				//	(*gContactProcessedCallback)(manifoldPoint,(void*)m_body0,(void*)m_body1);
+			}
+		}
+	}
+	
+
+}
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h
new file mode 100644
index 0000000..a15fd0b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h
@@ -0,0 +1,62 @@
+
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_CONTACT_CACHE_H
+#define B3_CONTACT_CACHE_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3Transform.h"
+#include "Bullet3Common/b3AlignedAllocator.h"
+
+///maximum contact breaking and merging threshold
+extern b3Scalar gContactBreakingThreshold;
+
+#define MANIFOLD_CACHE_SIZE 4
+
+///b3ContactCache is a contact point cache, it stays persistent as long as objects are overlapping in the broadphase.
+///Those contact points are created by the collision narrow phase.
+///The cache can be empty, or hold 1,2,3 or 4 points. Some collision algorithms (GJK) might only add one point at a time.
+///updates/refreshes old contact points, and throw them away if necessary (distance becomes too large)
+///reduces the cache to 4 points, when more then 4 points are added, using following rules:
+///the contact point with deepest penetration is always kept, and it tries to maximuze the area covered by the points
+///note that some pairs of objects might have more then one contact manifold.
+B3_ATTRIBUTE_ALIGNED16(class)
+b3ContactCache
+{
+	/// sort cached points so most isolated points come first
+	int sortCachedPoints(const b3Vector3& pt);
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	int addManifoldPoint(const b3Vector3& newPoint);
+
+	/*void replaceContactPoint(const b3Vector3& newPoint,int insertIndex)
+	{
+		b3Assert(validContactDistance(newPoint));
+		m_pointCache[insertIndex] = newPoint;
+	}
+	*/
+
+	static bool validContactDistance(const b3Vector3& pt);
+
+	/// calculated new worldspace coordinates and depth, and reject points that exceed the collision margin
+	static void refreshContactPoints(const b3Transform& trA, const b3Transform& trB, struct b3Contact4Data& newContactCache);
+
+	static void removeContactPoint(struct b3Contact4Data & newContactCache, int i);
+};
+
+#endif  //B3_CONTACT_CACHE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp
new file mode 100644
index 0000000..54a104c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp
@@ -0,0 +1,4408 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+bool findSeparatingAxisOnGpu = true;
+bool splitSearchSepAxisConcave = false;
+bool splitSearchSepAxisConvex = true;
+bool useMprGpu = true;  //use mpr for edge-edge  (+contact point) or sat. Needs testing on main OpenCL platforms, before enabling...
+bool bvhTraversalKernelGPU = true;
+bool findConcaveSeparatingAxisKernelGPU = true;
+bool clipConcaveFacesAndFindContactsCPU = false;  //false;//true;
+bool clipConvexFacesAndFindContactsCPU = false;   //false;//true;
+bool reduceConcaveContactsOnGPU = true;           //false;
+bool reduceConvexContactsOnGPU = true;            //false;
+bool findConvexClippingFacesGPU = true;
+bool useGjk = false;          ///option for CPU/host testing, when findSeparatingAxisOnGpu = false
+bool useGjkContacts = false;  //////option for CPU/host testing when findSeparatingAxisOnGpu = false
+
+static int myframecount = 0;  ///for testing
+
+///This file was written by Erwin Coumans
+///Separating axis rest based on work from Pierre Terdiman, see
+///And contact clipping based on work from Simon Hobbs
+
+//#define B3_DEBUG_SAT_FACE
+
+//#define CHECK_ON_HOST
+
+#ifdef CHECK_ON_HOST
+//#define PERSISTENT_CONTACTS_HOST
+#endif
+
+int b3g_actualSATPairTests = 0;
+
+#include "b3ConvexHullContact.h"
+#include <string.h>  //memcpy
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h"
+
+#include "Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
+
+typedef b3AlignedObjectArray<b3Vector3> b3VertexArray;
+
+#include <float.h>  //for FLT_MAX
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+//#include "AdlQuaternion.h"
+
+#include "kernels/satKernels.h"
+#include "kernels/mprKernels.h"
+
+#include "kernels/satConcaveKernels.h"
+
+#include "kernels/satClipHullContacts.h"
+#include "kernels/bvhTraversal.h"
+#include "kernels/primitiveContacts.h"
+
+#include "Bullet3Geometry/b3AabbUtil.h"
+
+#define BT_NARROWPHASE_SAT_PATH "src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl"
+#define BT_NARROWPHASE_SAT_CONCAVE_PATH "src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl"
+
+#define BT_NARROWPHASE_MPR_PATH "src/Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl"
+
+#define BT_NARROWPHASE_CLIPHULL_PATH "src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl"
+#define BT_NARROWPHASE_BVH_TRAVERSAL_PATH "src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl"
+#define BT_NARROWPHASE_PRIMITIVE_CONTACT_PATH "src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl"
+
+#ifndef __global
+#define __global
+#endif
+
+#ifndef __kernel
+#define __kernel
+#endif
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3BvhTraversal.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3FindConcaveSatAxis.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ClipFaces.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3NewContactReduction.h"
+
+#define dot3F4 b3Dot
+
+GpuSatCollision::GpuSatCollision(cl_context ctx, cl_device_id device, cl_command_queue q)
+	: m_context(ctx),
+	  m_device(device),
+	  m_queue(q),
+
+	  m_findSeparatingAxisKernel(0),
+	  m_findSeparatingAxisVertexFaceKernel(0),
+	  m_findSeparatingAxisEdgeEdgeKernel(0),
+	  m_unitSphereDirections(m_context, m_queue),
+
+	  m_totalContactsOut(m_context, m_queue),
+	  m_sepNormals(m_context, m_queue),
+	  m_dmins(m_context, m_queue),
+
+	  m_hasSeparatingNormals(m_context, m_queue),
+	  m_concaveSepNormals(m_context, m_queue),
+	  m_concaveHasSeparatingNormals(m_context, m_queue),
+	  m_numConcavePairsOut(m_context, m_queue),
+
+	  m_gpuCompoundPairs(m_context, m_queue),
+
+	  m_gpuCompoundSepNormals(m_context, m_queue),
+	  m_gpuHasCompoundSepNormals(m_context, m_queue),
+
+	  m_numCompoundPairsOut(m_context, m_queue)
+{
+	m_totalContactsOut.push_back(0);
+
+	cl_int errNum = 0;
+
+	if (1)
+	{
+		const char* mprSrc = mprKernelsCL;
+
+		const char* srcConcave = satConcaveKernelsCL;
+		char flags[1024] = {0};
+		//#ifdef CL_PLATFORM_INTEL
+		//		sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_narrowphase/kernels/sat.cl");
+		//#endif
+		m_mprPenetrationKernel = 0;
+		m_findSeparatingAxisUnitSphereKernel = 0;
+
+		if (useMprGpu)
+		{
+			cl_program mprProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, mprSrc, &errNum, flags, BT_NARROWPHASE_MPR_PATH);
+			b3Assert(errNum == CL_SUCCESS);
+
+			m_mprPenetrationKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, mprSrc, "mprPenetrationKernel", &errNum, mprProg);
+			b3Assert(m_mprPenetrationKernel);
+			b3Assert(errNum == CL_SUCCESS);
+
+			m_findSeparatingAxisUnitSphereKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, mprSrc, "findSeparatingAxisUnitSphereKernel", &errNum, mprProg);
+			b3Assert(m_findSeparatingAxisUnitSphereKernel);
+			b3Assert(errNum == CL_SUCCESS);
+
+			int numDirections = sizeof(unitSphere162) / sizeof(b3Vector3);
+			m_unitSphereDirections.resize(numDirections);
+			m_unitSphereDirections.copyFromHostPointer(unitSphere162, numDirections, 0, true);
+		}
+
+		cl_program satProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, satKernelsCL, &errNum, flags, BT_NARROWPHASE_SAT_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+
+		cl_program satConcaveProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, srcConcave, &errNum, flags, BT_NARROWPHASE_SAT_CONCAVE_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_findSeparatingAxisKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, satKernelsCL, "findSeparatingAxisKernel", &errNum, satProg);
+		b3Assert(m_findSeparatingAxisKernel);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_findSeparatingAxisVertexFaceKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, satKernelsCL, "findSeparatingAxisVertexFaceKernel", &errNum, satProg);
+		b3Assert(m_findSeparatingAxisVertexFaceKernel);
+
+		m_findSeparatingAxisEdgeEdgeKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, satKernelsCL, "findSeparatingAxisEdgeEdgeKernel", &errNum, satProg);
+		b3Assert(m_findSeparatingAxisVertexFaceKernel);
+
+		m_findConcaveSeparatingAxisKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, satKernelsCL, "findConcaveSeparatingAxisKernel", &errNum, satProg);
+		b3Assert(m_findConcaveSeparatingAxisKernel);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_findConcaveSeparatingAxisVertexFaceKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcConcave, "findConcaveSeparatingAxisVertexFaceKernel", &errNum, satConcaveProg);
+		b3Assert(m_findConcaveSeparatingAxisVertexFaceKernel);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_findConcaveSeparatingAxisEdgeEdgeKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcConcave, "findConcaveSeparatingAxisEdgeEdgeKernel", &errNum, satConcaveProg);
+		b3Assert(m_findConcaveSeparatingAxisEdgeEdgeKernel);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_findCompoundPairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, satKernelsCL, "findCompoundPairsKernel", &errNum, satProg);
+		b3Assert(m_findCompoundPairsKernel);
+		b3Assert(errNum == CL_SUCCESS);
+		m_processCompoundPairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, satKernelsCL, "processCompoundPairsKernel", &errNum, satProg);
+		b3Assert(m_processCompoundPairsKernel);
+		b3Assert(errNum == CL_SUCCESS);
+	}
+
+	if (1)
+	{
+		const char* srcClip = satClipKernelsCL;
+
+		char flags[1024] = {0};
+		//#ifdef CL_PLATFORM_INTEL
+		//		sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_narrowphase/kernels/satClipHullContacts.cl");
+		//#endif
+
+		cl_program satClipContactsProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, srcClip, &errNum, flags, BT_NARROWPHASE_CLIPHULL_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_clipHullHullKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcClip, "clipHullHullKernel", &errNum, satClipContactsProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_clipCompoundsHullHullKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcClip, "clipCompoundsHullHullKernel", &errNum, satClipContactsProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_findClippingFacesKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcClip, "findClippingFacesKernel", &errNum, satClipContactsProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_clipFacesAndFindContacts = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcClip, "clipFacesAndFindContactsKernel", &errNum, satClipContactsProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_clipHullHullConcaveConvexKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcClip, "clipHullHullConcaveConvexKernel", &errNum, satClipContactsProg);
+		b3Assert(errNum == CL_SUCCESS);
+
+		//		m_extractManifoldAndAddContactKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device,srcClip, "extractManifoldAndAddContactKernel",&errNum,satClipContactsProg);
+		//	b3Assert(errNum==CL_SUCCESS);
+
+		m_newContactReductionKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcClip,
+																			   "newContactReductionKernel", &errNum, satClipContactsProg);
+		b3Assert(errNum == CL_SUCCESS);
+	}
+	else
+	{
+		m_clipHullHullKernel = 0;
+		m_clipCompoundsHullHullKernel = 0;
+		m_findClippingFacesKernel = 0;
+		m_newContactReductionKernel = 0;
+		m_clipFacesAndFindContacts = 0;
+		m_clipHullHullConcaveConvexKernel = 0;
+		//		m_extractManifoldAndAddContactKernel = 0;
+	}
+
+	if (1)
+	{
+		const char* srcBvh = bvhTraversalKernelCL;
+		cl_program bvhTraversalProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, srcBvh, &errNum, "", BT_NARROWPHASE_BVH_TRAVERSAL_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_bvhTraversalKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, srcBvh, "bvhTraversalKernel", &errNum, bvhTraversalProg, "");
+		b3Assert(errNum == CL_SUCCESS);
+	}
+
+	{
+		const char* primitiveContactsSrc = primitiveContactsKernelsCL;
+		cl_program primitiveContactsProg = b3OpenCLUtils::compileCLProgramFromString(m_context, m_device, primitiveContactsSrc, &errNum, "", BT_NARROWPHASE_PRIMITIVE_CONTACT_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_primitiveContactsKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, primitiveContactsSrc, "primitiveContactsKernel", &errNum, primitiveContactsProg, "");
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_findConcaveSphereContactsKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, primitiveContactsSrc, "findConcaveSphereContactsKernel", &errNum, primitiveContactsProg);
+		b3Assert(errNum == CL_SUCCESS);
+		b3Assert(m_findConcaveSphereContactsKernel);
+
+		m_processCompoundPairsPrimitivesKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device, primitiveContactsSrc, "processCompoundPairsPrimitivesKernel", &errNum, primitiveContactsProg, "");
+		b3Assert(errNum == CL_SUCCESS);
+		b3Assert(m_processCompoundPairsPrimitivesKernel);
+	}
+}
+
+GpuSatCollision::~GpuSatCollision()
+{
+	if (m_findSeparatingAxisVertexFaceKernel)
+		clReleaseKernel(m_findSeparatingAxisVertexFaceKernel);
+
+	if (m_findSeparatingAxisEdgeEdgeKernel)
+		clReleaseKernel(m_findSeparatingAxisEdgeEdgeKernel);
+
+	if (m_findSeparatingAxisUnitSphereKernel)
+		clReleaseKernel(m_findSeparatingAxisUnitSphereKernel);
+
+	if (m_mprPenetrationKernel)
+		clReleaseKernel(m_mprPenetrationKernel);
+
+	if (m_findSeparatingAxisKernel)
+		clReleaseKernel(m_findSeparatingAxisKernel);
+
+	if (m_findConcaveSeparatingAxisVertexFaceKernel)
+		clReleaseKernel(m_findConcaveSeparatingAxisVertexFaceKernel);
+
+	if (m_findConcaveSeparatingAxisEdgeEdgeKernel)
+		clReleaseKernel(m_findConcaveSeparatingAxisEdgeEdgeKernel);
+
+	if (m_findConcaveSeparatingAxisKernel)
+		clReleaseKernel(m_findConcaveSeparatingAxisKernel);
+
+	if (m_findCompoundPairsKernel)
+		clReleaseKernel(m_findCompoundPairsKernel);
+
+	if (m_processCompoundPairsKernel)
+		clReleaseKernel(m_processCompoundPairsKernel);
+
+	if (m_findClippingFacesKernel)
+		clReleaseKernel(m_findClippingFacesKernel);
+
+	if (m_clipFacesAndFindContacts)
+		clReleaseKernel(m_clipFacesAndFindContacts);
+	if (m_newContactReductionKernel)
+		clReleaseKernel(m_newContactReductionKernel);
+	if (m_primitiveContactsKernel)
+		clReleaseKernel(m_primitiveContactsKernel);
+
+	if (m_findConcaveSphereContactsKernel)
+		clReleaseKernel(m_findConcaveSphereContactsKernel);
+
+	if (m_processCompoundPairsPrimitivesKernel)
+		clReleaseKernel(m_processCompoundPairsPrimitivesKernel);
+
+	if (m_clipHullHullKernel)
+		clReleaseKernel(m_clipHullHullKernel);
+	if (m_clipCompoundsHullHullKernel)
+		clReleaseKernel(m_clipCompoundsHullHullKernel);
+
+	if (m_clipHullHullConcaveConvexKernel)
+		clReleaseKernel(m_clipHullHullConcaveConvexKernel);
+	//	if (m_extractManifoldAndAddContactKernel)
+	//	clReleaseKernel(m_extractManifoldAndAddContactKernel);
+
+	if (m_bvhTraversalKernel)
+		clReleaseKernel(m_bvhTraversalKernel);
+}
+
+struct MyTriangleCallback : public b3NodeOverlapCallback
+{
+	int m_bodyIndexA;
+	int m_bodyIndexB;
+
+	virtual void processNode(int subPart, int triangleIndex)
+	{
+		printf("bodyIndexA %d, bodyIndexB %d\n", m_bodyIndexA, m_bodyIndexB);
+		printf("triangleIndex %d\n", triangleIndex);
+	}
+};
+
+#define float4 b3Vector3
+#define make_float4(x, y, z, w) b3MakeVector3(x, y, z, w)
+
+float signedDistanceFromPointToPlane(const float4& point, const float4& planeEqn, float4* closestPointOnFace)
+{
+	float4 n = planeEqn;
+	n[3] = 0.f;
+	float dist = dot3F4(n, point) + planeEqn[3];
+	*closestPointOnFace = point - dist * n;
+	return dist;
+}
+
+#define cross3(a, b) (a.cross(b))
+b3Vector3 transform(const b3Vector3* v, const b3Vector3* pos, const b3Quaternion* orn)
+{
+	b3Transform tr;
+	tr.setIdentity();
+	tr.setOrigin(*pos);
+	tr.setRotation(*orn);
+	b3Vector3 res = tr(*v);
+	return res;
+}
+
+inline bool IsPointInPolygon(const float4& p,
+							 const b3GpuFace* face,
+							 const float4* baseVertex,
+							 const int* convexIndices,
+							 float4* out)
+{
+	float4 a;
+	float4 b;
+	float4 ab;
+	float4 ap;
+	float4 v;
+
+	float4 plane = b3MakeVector3(face->m_plane.x, face->m_plane.y, face->m_plane.z, 0.f);
+
+	if (face->m_numIndices < 2)
+		return false;
+
+	float4 v0 = baseVertex[convexIndices[face->m_indexOffset + face->m_numIndices - 1]];
+	b = v0;
+
+	for (unsigned i = 0; i != face->m_numIndices; ++i)
+	{
+		a = b;
+		float4 vi = baseVertex[convexIndices[face->m_indexOffset + i]];
+		b = vi;
+		ab = b - a;
+		ap = p - a;
+		v = cross3(ab, plane);
+
+		if (b3Dot(ap, v) > 0.f)
+		{
+			float ab_m2 = b3Dot(ab, ab);
+			float rt = ab_m2 != 0.f ? b3Dot(ab, ap) / ab_m2 : 0.f;
+			if (rt <= 0.f)
+			{
+				*out = a;
+			}
+			else if (rt >= 1.f)
+			{
+				*out = b;
+			}
+			else
+			{
+				float s = 1.f - rt;
+				out[0].x = s * a.x + rt * b.x;
+				out[0].y = s * a.y + rt * b.y;
+				out[0].z = s * a.z + rt * b.z;
+			}
+			return false;
+		}
+	}
+	return true;
+}
+
+#define normalize3(a) (a.normalize())
+
+int extractManifoldSequentialGlobal(const float4* p, int nPoints, const float4& nearNormal, b3Int4* contactIdx)
+{
+	if (nPoints == 0)
+		return 0;
+
+	if (nPoints <= 4)
+		return nPoints;
+
+	if (nPoints > 64)
+		nPoints = 64;
+
+	float4 center = b3MakeVector3(0, 0, 0, 0);
+	{
+		for (int i = 0; i < nPoints; i++)
+			center += p[i];
+		center /= (float)nPoints;
+	}
+
+	//	sample 4 directions
+
+	float4 aVector = p[0] - center;
+	float4 u = cross3(nearNormal, aVector);
+	float4 v = cross3(nearNormal, u);
+	u = normalize3(u);
+	v = normalize3(v);
+
+	//keep point with deepest penetration
+	float minW = FLT_MAX;
+
+	int minIndex = -1;
+
+	float4 maxDots;
+	maxDots.x = FLT_MIN;
+	maxDots.y = FLT_MIN;
+	maxDots.z = FLT_MIN;
+	maxDots.w = FLT_MIN;
+
+	//	idx, distance
+	for (int ie = 0; ie < nPoints; ie++)
+	{
+		if (p[ie].w < minW)
+		{
+			minW = p[ie].w;
+			minIndex = ie;
+		}
+		float f;
+		float4 r = p[ie] - center;
+		f = dot3F4(u, r);
+		if (f < maxDots.x)
+		{
+			maxDots.x = f;
+			contactIdx[0].x = ie;
+		}
+
+		f = dot3F4(-u, r);
+		if (f < maxDots.y)
+		{
+			maxDots.y = f;
+			contactIdx[0].y = ie;
+		}
+
+		f = dot3F4(v, r);
+		if (f < maxDots.z)
+		{
+			maxDots.z = f;
+			contactIdx[0].z = ie;
+		}
+
+		f = dot3F4(-v, r);
+		if (f < maxDots.w)
+		{
+			maxDots.w = f;
+			contactIdx[0].w = ie;
+		}
+	}
+
+	if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)
+	{
+		//replace the first contact with minimum (todo: replace contact with least penetration)
+		contactIdx[0].x = minIndex;
+	}
+
+	return 4;
+}
+
+#define MAX_VERTS 1024
+
+inline void project(const b3ConvexPolyhedronData& hull, const float4& pos, const b3Quaternion& orn, const float4& dir, const b3AlignedObjectArray<b3Vector3>& vertices, b3Scalar& min, b3Scalar& max)
+{
+	min = FLT_MAX;
+	max = -FLT_MAX;
+	int numVerts = hull.m_numVertices;
+
+	const float4 localDir = b3QuatRotate(orn.inverse(), dir);
+
+	b3Scalar offset = dot3F4(pos, dir);
+
+	for (int i = 0; i < numVerts; i++)
+	{
+		//b3Vector3 pt = trans * vertices[m_vertexOffset+i];
+		//b3Scalar dp = pt.dot(dir);
+		//b3Vector3 vertex = vertices[hull.m_vertexOffset+i];
+		b3Scalar dp = dot3F4((float4&)vertices[hull.m_vertexOffset + i], localDir);
+		//b3Assert(dp==dpL);
+		if (dp < min) min = dp;
+		if (dp > max) max = dp;
+	}
+	if (min > max)
+	{
+		b3Scalar tmp = min;
+		min = max;
+		max = tmp;
+	}
+	min += offset;
+	max += offset;
+}
+
+static bool TestSepAxis(const b3ConvexPolyhedronData& hullA, const b3ConvexPolyhedronData& hullB,
+						const float4& posA, const b3Quaternion& ornA,
+						const float4& posB, const b3Quaternion& ornB,
+						const float4& sep_axis, const b3AlignedObjectArray<b3Vector3>& verticesA, const b3AlignedObjectArray<b3Vector3>& verticesB, b3Scalar& depth)
+{
+	b3Scalar Min0, Max0;
+	b3Scalar Min1, Max1;
+	project(hullA, posA, ornA, sep_axis, verticesA, Min0, Max0);
+	project(hullB, posB, ornB, sep_axis, verticesB, Min1, Max1);
+
+	if (Max0 < Min1 || Max1 < Min0)
+		return false;
+
+	b3Scalar d0 = Max0 - Min1;
+	assert(d0 >= 0.0f);
+	b3Scalar d1 = Max1 - Min0;
+	assert(d1 >= 0.0f);
+	depth = d0 < d1 ? d0 : d1;
+	return true;
+}
+
+inline bool IsAlmostZero(const b3Vector3& v)
+{
+	if (fabsf(v.x) > 1e-6 || fabsf(v.y) > 1e-6 || fabsf(v.z) > 1e-6) return false;
+	return true;
+}
+
+static bool findSeparatingAxis(const b3ConvexPolyhedronData& hullA, const b3ConvexPolyhedronData& hullB,
+							   const float4& posA1,
+							   const b3Quaternion& ornA,
+							   const float4& posB1,
+							   const b3Quaternion& ornB,
+							   const b3AlignedObjectArray<b3Vector3>& verticesA,
+							   const b3AlignedObjectArray<b3Vector3>& uniqueEdgesA,
+							   const b3AlignedObjectArray<b3GpuFace>& facesA,
+							   const b3AlignedObjectArray<int>& indicesA,
+							   const b3AlignedObjectArray<b3Vector3>& verticesB,
+							   const b3AlignedObjectArray<b3Vector3>& uniqueEdgesB,
+							   const b3AlignedObjectArray<b3GpuFace>& facesB,
+							   const b3AlignedObjectArray<int>& indicesB,
+
+							   b3Vector3& sep)
+{
+	B3_PROFILE("findSeparatingAxis");
+
+	b3g_actualSATPairTests++;
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+	//#ifdef TEST_INTERNAL_OBJECTS
+	float4 c0local = (float4&)hullA.m_localCenter;
+	float4 c0 = transform(&c0local, &posA, &ornA);
+	float4 c1local = (float4&)hullB.m_localCenter;
+	float4 c1 = transform(&c1local, &posB, &ornB);
+	const float4 deltaC2 = c0 - c1;
+	//#endif
+
+	b3Scalar dmin = FLT_MAX;
+	int curPlaneTests = 0;
+
+	int numFacesA = hullA.m_numFaces;
+	// Test normals from hullA
+	for (int i = 0; i < numFacesA; i++)
+	{
+		const float4& normal = (float4&)facesA[hullA.m_faceOffset + i].m_plane;
+		float4 faceANormalWS = b3QuatRotate(ornA, normal);
+
+		if (dot3F4(deltaC2, faceANormalWS) < 0)
+			faceANormalWS *= -1.f;
+
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, faceANormalWS, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		b3Scalar d;
+		if (!TestSepAxis(hullA, hullB, posA, ornA, posB, ornB, faceANormalWS, verticesA, verticesB, d))
+			return false;
+
+		if (d < dmin)
+		{
+			dmin = d;
+			sep = (b3Vector3&)faceANormalWS;
+		}
+	}
+
+	int numFacesB = hullB.m_numFaces;
+	// Test normals from hullB
+	for (int i = 0; i < numFacesB; i++)
+	{
+		float4 normal = (float4&)facesB[hullB.m_faceOffset + i].m_plane;
+		float4 WorldNormal = b3QuatRotate(ornB, normal);
+
+		if (dot3F4(deltaC2, WorldNormal) < 0)
+		{
+			WorldNormal *= -1.f;
+		}
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, WorldNormal, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		b3Scalar d;
+		if (!TestSepAxis(hullA, hullB, posA, ornA, posB, ornB, WorldNormal, verticesA, verticesB, d))
+			return false;
+
+		if (d < dmin)
+		{
+			dmin = d;
+			sep = (b3Vector3&)WorldNormal;
+		}
+	}
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for (int e0 = 0; e0 < hullA.m_numUniqueEdges; e0++)
+	{
+		const float4& edge0 = (float4&)uniqueEdgesA[hullA.m_uniqueEdgesOffset + e0];
+		float4 edge0World = b3QuatRotate(ornA, (float4&)edge0);
+
+		for (int e1 = 0; e1 < hullB.m_numUniqueEdges; e1++)
+		{
+			const b3Vector3 edge1 = uniqueEdgesB[hullB.m_uniqueEdgesOffset + e1];
+			float4 edge1World = b3QuatRotate(ornB, (float4&)edge1);
+
+			float4 crossje = cross3(edge0World, edge1World);
+
+			curEdgeEdge++;
+			if (!IsAlmostZero((b3Vector3&)crossje))
+			{
+				crossje = normalize3(crossje);
+				if (dot3F4(deltaC2, crossje) < 0)
+					crossje *= -1.f;
+
+#ifdef TEST_INTERNAL_OBJECTS
+				gExpectedNbTests++;
+				if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, Cross, hullA, hullB, dmin))
+					continue;
+				gActualNbTests++;
+#endif
+
+				b3Scalar dist;
+				if (!TestSepAxis(hullA, hullB, posA, ornA, posB, ornB, crossje, verticesA, verticesB, dist))
+					return false;
+
+				if (dist < dmin)
+				{
+					dmin = dist;
+					sep = (b3Vector3&)crossje;
+				}
+			}
+		}
+	}
+
+	if ((dot3F4(-deltaC2, (float4&)sep)) > 0.0f)
+		sep = -sep;
+
+	return true;
+}
+
+bool findSeparatingAxisEdgeEdge(__global const b3ConvexPolyhedronData* hullA, __global const b3ConvexPolyhedronData* hullB,
+								const b3Float4& posA1,
+								const b3Quat& ornA,
+								const b3Float4& posB1,
+								const b3Quat& ornB,
+								const b3Float4& DeltaC2,
+								__global const b3AlignedObjectArray<float4>& vertices,
+								__global const b3AlignedObjectArray<float4>& uniqueEdges,
+								__global const b3AlignedObjectArray<b3GpuFace>& faces,
+								__global const b3AlignedObjectArray<int>& indices,
+								float4* sep,
+								float* dmin)
+{
+	//	int i = get_global_id(0);
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+
+	//int curPlaneTests=0;
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for (int e0 = 0; e0 < hullA->m_numUniqueEdges; e0++)
+	{
+		const float4 edge0 = uniqueEdges[hullA->m_uniqueEdgesOffset + e0];
+		float4 edge0World = b3QuatRotate(ornA, edge0);
+
+		for (int e1 = 0; e1 < hullB->m_numUniqueEdges; e1++)
+		{
+			const float4 edge1 = uniqueEdges[hullB->m_uniqueEdgesOffset + e1];
+			float4 edge1World = b3QuatRotate(ornB, edge1);
+
+			float4 crossje = cross3(edge0World, edge1World);
+
+			curEdgeEdge++;
+			if (!IsAlmostZero(crossje))
+			{
+				crossje = normalize3(crossje);
+				if (dot3F4(DeltaC2, crossje) < 0)
+					crossje *= -1.f;
+
+				float dist;
+				bool result = true;
+				{
+					float Min0, Max0;
+					float Min1, Max1;
+					project(*hullA, posA, ornA, crossje, vertices, Min0, Max0);
+					project(*hullB, posB, ornB, crossje, vertices, Min1, Max1);
+
+					if (Max0 < Min1 || Max1 < Min0)
+						result = false;
+
+					float d0 = Max0 - Min1;
+					float d1 = Max1 - Min0;
+					dist = d0 < d1 ? d0 : d1;
+					result = true;
+				}
+
+				if (dist < *dmin)
+				{
+					*dmin = dist;
+					*sep = crossje;
+				}
+			}
+		}
+	}
+
+	if ((dot3F4(-DeltaC2, *sep)) > 0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+__inline float4 lerp3(const float4& a, const float4& b, float t)
+{
+	return b3MakeVector3(a.x + (b.x - a.x) * t,
+						 a.y + (b.y - a.y) * t,
+						 a.z + (b.z - a.z) * t,
+						 0.f);
+}
+
+// Clips a face to the back of a plane, return the number of vertices out, stored in ppVtxOut
+int clipFace(const float4* pVtxIn, int numVertsIn, float4& planeNormalWS, float planeEqWS, float4* ppVtxOut)
+{
+	int ve;
+	float ds, de;
+	int numVertsOut = 0;
+	if (numVertsIn < 2)
+		return 0;
+
+	float4 firstVertex = pVtxIn[numVertsIn - 1];
+	float4 endVertex = pVtxIn[0];
+
+	ds = dot3F4(planeNormalWS, firstVertex) + planeEqWS;
+
+	for (ve = 0; ve < numVertsIn; ve++)
+	{
+		endVertex = pVtxIn[ve];
+
+		de = dot3F4(planeNormalWS, endVertex) + planeEqWS;
+
+		if (ds < 0)
+		{
+			if (de < 0)
+			{
+				// Start < 0, end < 0, so output endVertex
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+			else
+			{
+				// Start < 0, end >= 0, so output intersection
+				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex, (ds * 1.f / (ds - de)));
+			}
+		}
+		else
+		{
+			if (de < 0)
+			{
+				// Start >= 0, end < 0 so output intersection and end
+				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex, (ds * 1.f / (ds - de)));
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+		}
+		firstVertex = endVertex;
+		ds = de;
+	}
+	return numVertsOut;
+}
+
+int clipFaceAgainstHull(const float4& separatingNormal, const b3ConvexPolyhedronData* hullA,
+						const float4& posA, const b3Quaternion& ornA, float4* worldVertsB1, int numWorldVertsB1,
+						float4* worldVertsB2, int capacityWorldVertsB2,
+						const float minDist, float maxDist,
+						const b3AlignedObjectArray<float4>& verticesA, const b3AlignedObjectArray<b3GpuFace>& facesA, const b3AlignedObjectArray<int>& indicesA,
+						//const float4* verticesB,	const b3GpuFace* facesB,	const int* indicesB,
+						float4* contactsOut,
+						int contactCapacity)
+{
+	int numContactsOut = 0;
+
+	float4* pVtxIn = worldVertsB1;
+	float4* pVtxOut = worldVertsB2;
+
+	int numVertsIn = numWorldVertsB1;
+	int numVertsOut = 0;
+
+	int closestFaceA = -1;
+	{
+		float dmin = FLT_MAX;
+		for (int face = 0; face < hullA->m_numFaces; face++)
+		{
+			const float4 Normal = b3MakeVector3(
+				facesA[hullA->m_faceOffset + face].m_plane.x,
+				facesA[hullA->m_faceOffset + face].m_plane.y,
+				facesA[hullA->m_faceOffset + face].m_plane.z, 0.f);
+			const float4 faceANormalWS = b3QuatRotate(ornA, Normal);
+
+			float d = dot3F4(faceANormalWS, separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+			}
+		}
+	}
+	if (closestFaceA < 0)
+		return numContactsOut;
+
+	b3GpuFace polyA = facesA[hullA->m_faceOffset + closestFaceA];
+
+	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+	//	int numContacts = numWorldVertsB1;
+	int numVerticesA = polyA.m_numIndices;
+	for (int e0 = 0; e0 < numVerticesA; e0++)
+	{
+		const float4 a = verticesA[hullA->m_vertexOffset + indicesA[polyA.m_indexOffset + e0]];
+		const float4 b = verticesA[hullA->m_vertexOffset + indicesA[polyA.m_indexOffset + ((e0 + 1) % numVerticesA)]];
+		const float4 edge0 = a - b;
+		const float4 WorldEdge0 = b3QuatRotate(ornA, edge0);
+		float4 planeNormalA = make_float4(polyA.m_plane.x, polyA.m_plane.y, polyA.m_plane.z, 0.f);
+		float4 worldPlaneAnormal1 = b3QuatRotate(ornA, planeNormalA);
+
+		float4 planeNormalWS1 = -cross3(WorldEdge0, worldPlaneAnormal1);
+		float4 worldA1 = transform(&a, &posA, &ornA);
+		float planeEqWS1 = -dot3F4(worldA1, planeNormalWS1);
+
+		float4 planeNormalWS = planeNormalWS1;
+		float planeEqWS = planeEqWS1;
+
+		//clip face
+		//clipFace(*pVtxIn, *pVtxOut,planeNormalWS,planeEqWS);
+		numVertsOut = clipFace(pVtxIn, numVertsIn, planeNormalWS, planeEqWS, pVtxOut);
+
+		//btSwap(pVtxIn,pVtxOut);
+		float4* tmp = pVtxOut;
+		pVtxOut = pVtxIn;
+		pVtxIn = tmp;
+		numVertsIn = numVertsOut;
+		numVertsOut = 0;
+	}
+
+	// only keep points that are behind the witness face
+	{
+		float4 localPlaneNormal = make_float4(polyA.m_plane.x, polyA.m_plane.y, polyA.m_plane.z, 0.f);
+		float localPlaneEq = polyA.m_plane.w;
+		float4 planeNormalWS = b3QuatRotate(ornA, localPlaneNormal);
+		float planeEqWS = localPlaneEq - dot3F4(planeNormalWS, posA);
+		for (int i = 0; i < numVertsIn; i++)
+		{
+			float depth = dot3F4(planeNormalWS, pVtxIn[i]) + planeEqWS;
+			if (depth <= minDist)
+			{
+				depth = minDist;
+			}
+			if (numContactsOut < contactCapacity)
+			{
+				if (depth <= maxDist)
+				{
+					float4 pointInWorld = pVtxIn[i];
+					//resultOut.addContactPoint(separatingNormal,point,depth);
+					contactsOut[numContactsOut++] = b3MakeVector3(pointInWorld.x, pointInWorld.y, pointInWorld.z, depth);
+					//printf("depth=%f\n",depth);
+				}
+			}
+			else
+			{
+				b3Error("exceeding contact capacity (%d,%df)\n", numContactsOut, contactCapacity);
+			}
+		}
+	}
+
+	return numContactsOut;
+}
+
+static int clipHullAgainstHull(const float4& separatingNormal,
+							   const b3ConvexPolyhedronData& hullA, const b3ConvexPolyhedronData& hullB,
+							   const float4& posA, const b3Quaternion& ornA, const float4& posB, const b3Quaternion& ornB,
+							   float4* worldVertsB1, float4* worldVertsB2, int capacityWorldVerts,
+							   const float minDist, float maxDist,
+							   const b3AlignedObjectArray<float4>& verticesA, const b3AlignedObjectArray<b3GpuFace>& facesA, const b3AlignedObjectArray<int>& indicesA,
+							   const b3AlignedObjectArray<float4>& verticesB, const b3AlignedObjectArray<b3GpuFace>& facesB, const b3AlignedObjectArray<int>& indicesB,
+
+							   float4* contactsOut,
+							   int contactCapacity)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1 = 0;
+
+	B3_PROFILE("clipHullAgainstHull");
+
+	//	float curMaxDist=maxDist;
+	int closestFaceB = -1;
+	float dmax = -FLT_MAX;
+
+	{
+		//B3_PROFILE("closestFaceB");
+		if (hullB.m_numFaces != 1)
+		{
+			//printf("wtf\n");
+		}
+		static bool once = true;
+		//printf("separatingNormal=%f,%f,%f\n",separatingNormal.x,separatingNormal.y,separatingNormal.z);
+
+		for (int face = 0; face < hullB.m_numFaces; face++)
+		{
+#ifdef BT_DEBUG_SAT_FACE
+			if (once)
+				printf("face %d\n", face);
+			const b3GpuFace* faceB = &facesB[hullB.m_faceOffset + face];
+			if (once)
+			{
+				for (int i = 0; i < faceB->m_numIndices; i++)
+				{
+					float4 vert = verticesB[hullB.m_vertexOffset + indicesB[faceB->m_indexOffset + i]];
+					printf("vert[%d] = %f,%f,%f\n", i, vert.x, vert.y, vert.z);
+				}
+			}
+#endif  //BT_DEBUG_SAT_FACE \
+	//if (facesB[hullB.m_faceOffset+face].m_numIndices>2)
+			{
+				const float4 Normal = b3MakeVector3(facesB[hullB.m_faceOffset + face].m_plane.x,
+													facesB[hullB.m_faceOffset + face].m_plane.y, facesB[hullB.m_faceOffset + face].m_plane.z, 0.f);
+				const float4 WorldNormal = b3QuatRotate(ornB, Normal);
+#ifdef BT_DEBUG_SAT_FACE
+				if (once)
+					printf("faceNormal = %f,%f,%f\n", Normal.x, Normal.y, Normal.z);
+#endif
+				float d = dot3F4(WorldNormal, separatingNormal);
+				if (d > dmax)
+				{
+					dmax = d;
+					closestFaceB = face;
+				}
+			}
+		}
+		once = false;
+	}
+
+	b3Assert(closestFaceB >= 0);
+	{
+		//B3_PROFILE("worldVertsB1");
+		const b3GpuFace& polyB = facesB[hullB.m_faceOffset + closestFaceB];
+		const int numVertices = polyB.m_numIndices;
+		for (int e0 = 0; e0 < numVertices; e0++)
+		{
+			const float4& b = verticesB[hullB.m_vertexOffset + indicesB[polyB.m_indexOffset + e0]];
+			worldVertsB1[numWorldVertsB1++] = transform(&b, &posB, &ornB);
+		}
+	}
+
+	if (closestFaceB >= 0)
+	{
+		//B3_PROFILE("clipFaceAgainstHull");
+		numContactsOut = clipFaceAgainstHull((float4&)separatingNormal, &hullA,
+											 posA, ornA,
+											 worldVertsB1, numWorldVertsB1, worldVertsB2, capacityWorldVerts, minDist, maxDist,
+											 verticesA, facesA, indicesA,
+											 contactsOut, contactCapacity);
+	}
+
+	return numContactsOut;
+}
+
+#define PARALLEL_SUM(v, n) \
+	for (int j = 1; j < n; j++) v[0] += v[j];
+#define PARALLEL_DO(execution, n)  \
+	for (int ie = 0; ie < n; ie++) \
+	{                              \
+		execution;                 \
+	}
+#define REDUCE_MAX(v, n)                                                                                     \
+	{                                                                                                        \
+		int i = 0;                                                                                           \
+		for (int offset = 0; offset < n; offset++) v[i] = (v[i].y > v[i + offset].y) ? v[i] : v[i + offset]; \
+	}
+#define REDUCE_MIN(v, n)                                                                                     \
+	{                                                                                                        \
+		int i = 0;                                                                                           \
+		for (int offset = 0; offset < n; offset++) v[i] = (v[i].y < v[i + offset].y) ? v[i] : v[i + offset]; \
+	}
+
+int extractManifold(const float4* p, int nPoints, const float4& nearNormal, b3Int4* contactIdx)
+{
+	if (nPoints == 0)
+		return 0;
+
+	if (nPoints <= 4)
+		return nPoints;
+
+	if (nPoints > 64)
+		nPoints = 64;
+
+	float4 center = make_float4(0, 0, 0, 0);
+	{
+		for (int i = 0; i < nPoints; i++)
+			center += p[i];
+		center /= (float)nPoints;
+	}
+
+	//	sample 4 directions
+
+	float4 aVector = p[0] - center;
+	float4 u = cross3(nearNormal, aVector);
+	float4 v = cross3(nearNormal, u);
+	u = normalize3(u);
+	v = normalize3(v);
+
+	//keep point with deepest penetration
+	float minW = FLT_MAX;
+
+	int minIndex = -1;
+
+	float4 maxDots;
+	maxDots.x = FLT_MIN;
+	maxDots.y = FLT_MIN;
+	maxDots.z = FLT_MIN;
+	maxDots.w = FLT_MIN;
+
+	//	idx, distance
+	for (int ie = 0; ie < nPoints; ie++)
+	{
+		if (p[ie].w < minW)
+		{
+			minW = p[ie].w;
+			minIndex = ie;
+		}
+		float f;
+		float4 r = p[ie] - center;
+		f = dot3F4(u, r);
+		if (f < maxDots.x)
+		{
+			maxDots.x = f;
+			contactIdx[0].x = ie;
+		}
+
+		f = dot3F4(-u, r);
+		if (f < maxDots.y)
+		{
+			maxDots.y = f;
+			contactIdx[0].y = ie;
+		}
+
+		f = dot3F4(v, r);
+		if (f < maxDots.z)
+		{
+			maxDots.z = f;
+			contactIdx[0].z = ie;
+		}
+
+		f = dot3F4(-v, r);
+		if (f < maxDots.w)
+		{
+			maxDots.w = f;
+			contactIdx[0].w = ie;
+		}
+	}
+
+	if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)
+	{
+		//replace the first contact with minimum (todo: replace contact with least penetration)
+		contactIdx[0].x = minIndex;
+	}
+
+	return 4;
+}
+
+int clipHullHullSingle(
+	int bodyIndexA, int bodyIndexB,
+	const float4& posA,
+	const b3Quaternion& ornA,
+	const float4& posB,
+	const b3Quaternion& ornB,
+
+	int collidableIndexA, int collidableIndexB,
+
+	const b3AlignedObjectArray<b3RigidBodyData>* bodyBuf,
+	b3AlignedObjectArray<b3Contact4>* globalContactOut,
+	int& nContacts,
+
+	const b3AlignedObjectArray<b3ConvexPolyhedronData>& hostConvexDataA,
+	const b3AlignedObjectArray<b3ConvexPolyhedronData>& hostConvexDataB,
+
+	const b3AlignedObjectArray<b3Vector3>& verticesA,
+	const b3AlignedObjectArray<b3Vector3>& uniqueEdgesA,
+	const b3AlignedObjectArray<b3GpuFace>& facesA,
+	const b3AlignedObjectArray<int>& indicesA,
+
+	const b3AlignedObjectArray<b3Vector3>& verticesB,
+	const b3AlignedObjectArray<b3Vector3>& uniqueEdgesB,
+	const b3AlignedObjectArray<b3GpuFace>& facesB,
+	const b3AlignedObjectArray<int>& indicesB,
+
+	const b3AlignedObjectArray<b3Collidable>& hostCollidablesA,
+	const b3AlignedObjectArray<b3Collidable>& hostCollidablesB,
+	const b3Vector3& sepNormalWorldSpace,
+	int maxContactCapacity)
+{
+	int contactIndex = -1;
+	b3ConvexPolyhedronData hullA, hullB;
+
+	b3Collidable colA = hostCollidablesA[collidableIndexA];
+	hullA = hostConvexDataA[colA.m_shapeIndex];
+	//printf("numvertsA = %d\n",hullA.m_numVertices);
+
+	b3Collidable colB = hostCollidablesB[collidableIndexB];
+	hullB = hostConvexDataB[colB.m_shapeIndex];
+	//printf("numvertsB = %d\n",hullB.m_numVertices);
+
+	float4 contactsOut[MAX_VERTS];
+	int localContactCapacity = MAX_VERTS;
+
+#ifdef _WIN32
+	b3Assert(_finite(bodyBuf->at(bodyIndexA).m_pos.x));
+	b3Assert(_finite(bodyBuf->at(bodyIndexB).m_pos.x));
+#endif
+
+	{
+		float4 worldVertsB1[MAX_VERTS];
+		float4 worldVertsB2[MAX_VERTS];
+		int capacityWorldVerts = MAX_VERTS;
+
+		float4 hostNormal = make_float4(sepNormalWorldSpace.x, sepNormalWorldSpace.y, sepNormalWorldSpace.z, 0.f);
+		int shapeA = hostCollidablesA[collidableIndexA].m_shapeIndex;
+		int shapeB = hostCollidablesB[collidableIndexB].m_shapeIndex;
+
+		b3Scalar minDist = -1;
+		b3Scalar maxDist = 0.;
+
+		b3Transform trA, trB;
+		{
+			//B3_PROFILE("transform computation");
+			//trA.setIdentity();
+			trA.setOrigin(b3MakeVector3(posA.x, posA.y, posA.z));
+			trA.setRotation(b3Quaternion(ornA.x, ornA.y, ornA.z, ornA.w));
+
+			//trB.setIdentity();
+			trB.setOrigin(b3MakeVector3(posB.x, posB.y, posB.z));
+			trB.setRotation(b3Quaternion(ornB.x, ornB.y, ornB.z, ornB.w));
+		}
+
+		b3Quaternion trAorn = trA.getRotation();
+		b3Quaternion trBorn = trB.getRotation();
+
+		int numContactsOut = clipHullAgainstHull(hostNormal,
+												 hostConvexDataA.at(shapeA),
+												 hostConvexDataB.at(shapeB),
+												 (float4&)trA.getOrigin(), (b3Quaternion&)trAorn,
+												 (float4&)trB.getOrigin(), (b3Quaternion&)trBorn,
+												 worldVertsB1, worldVertsB2, capacityWorldVerts,
+												 minDist, maxDist,
+												 verticesA, facesA, indicesA,
+												 verticesB, facesB, indicesB,
+
+												 contactsOut, localContactCapacity);
+
+		if (numContactsOut > 0)
+		{
+			B3_PROFILE("overlap");
+
+			float4 normalOnSurfaceB = (float4&)hostNormal;
+
+			b3Int4 contactIdx;
+			contactIdx.x = 0;
+			contactIdx.y = 1;
+			contactIdx.z = 2;
+			contactIdx.w = 3;
+
+			int numPoints = 0;
+
+			{
+				//	B3_PROFILE("extractManifold");
+				numPoints = extractManifold(contactsOut, numContactsOut, normalOnSurfaceB, &contactIdx);
+			}
+
+			b3Assert(numPoints);
+
+			if (nContacts < maxContactCapacity)
+			{
+				contactIndex = nContacts;
+				globalContactOut->expand();
+				b3Contact4& contact = globalContactOut->at(nContacts);
+				contact.m_batchIdx = 0;  //i;
+				contact.m_bodyAPtrAndSignBit = (bodyBuf->at(bodyIndexA).m_invMass == 0) ? -bodyIndexA : bodyIndexA;
+				contact.m_bodyBPtrAndSignBit = (bodyBuf->at(bodyIndexB).m_invMass == 0) ? -bodyIndexB : bodyIndexB;
+
+				contact.m_frictionCoeffCmp = 45874;
+				contact.m_restituitionCoeffCmp = 0;
+
+				//			float distance = 0.f;
+				for (int p = 0; p < numPoints; p++)
+				{
+					contact.m_worldPosB[p] = contactsOut[contactIdx.s[p]];  //check if it is actually on B
+					contact.m_worldNormalOnB = normalOnSurfaceB;
+				}
+				//printf("bodyIndexA %d,bodyIndexB %d,normal=%f,%f,%f numPoints %d\n",bodyIndexA,bodyIndexB,normalOnSurfaceB.x,normalOnSurfaceB.y,normalOnSurfaceB.z,numPoints);
+				contact.m_worldNormalOnB.w = (b3Scalar)numPoints;
+				nContacts++;
+			}
+			else
+			{
+				b3Error("Error: exceeding contact capacity (%d/%d)\n", nContacts, maxContactCapacity);
+			}
+		}
+	}
+	return contactIndex;
+}
+
+void computeContactPlaneConvex(int pairIndex,
+							   int bodyIndexA, int bodyIndexB,
+							   int collidableIndexA, int collidableIndexB,
+							   const b3RigidBodyData* rigidBodies,
+							   const b3Collidable* collidables,
+							   const b3ConvexPolyhedronData* convexShapes,
+							   const b3Vector3* convexVertices,
+							   const int* convexIndices,
+							   const b3GpuFace* faces,
+							   b3Contact4* globalContactsOut,
+							   int& nGlobalContactsOut,
+							   int maxContactCapacity)
+{
+	int shapeIndex = collidables[collidableIndexB].m_shapeIndex;
+	const b3ConvexPolyhedronData* hullB = &convexShapes[shapeIndex];
+
+	b3Vector3 posB = rigidBodies[bodyIndexB].m_pos;
+	b3Quaternion ornB = rigidBodies[bodyIndexB].m_quat;
+	b3Vector3 posA = rigidBodies[bodyIndexA].m_pos;
+	b3Quaternion ornA = rigidBodies[bodyIndexA].m_quat;
+
+	//	int numContactsOut = 0;
+	//	int numWorldVertsB1= 0;
+
+	b3Vector3 planeEq = faces[collidables[collidableIndexA].m_shapeIndex].m_plane;
+	b3Vector3 planeNormal = b3MakeVector3(planeEq.x, planeEq.y, planeEq.z);
+	b3Vector3 planeNormalWorld = b3QuatRotate(ornA, planeNormal);
+	float planeConstant = planeEq.w;
+	b3Transform convexWorldTransform;
+	convexWorldTransform.setIdentity();
+	convexWorldTransform.setOrigin(posB);
+	convexWorldTransform.setRotation(ornB);
+	b3Transform planeTransform;
+	planeTransform.setIdentity();
+	planeTransform.setOrigin(posA);
+	planeTransform.setRotation(ornA);
+
+	b3Transform planeInConvex;
+	planeInConvex = convexWorldTransform.inverse() * planeTransform;
+	b3Transform convexInPlane;
+	convexInPlane = planeTransform.inverse() * convexWorldTransform;
+
+	b3Vector3 planeNormalInConvex = planeInConvex.getBasis() * -planeNormal;
+	float maxDot = -1e30;
+	int hitVertex = -1;
+	b3Vector3 hitVtx;
+
+#define MAX_PLANE_CONVEX_POINTS 64
+
+	b3Vector3 contactPoints[MAX_PLANE_CONVEX_POINTS];
+	int numPoints = 0;
+
+	b3Int4 contactIdx;
+	contactIdx.s[0] = 0;
+	contactIdx.s[1] = 1;
+	contactIdx.s[2] = 2;
+	contactIdx.s[3] = 3;
+
+	for (int i = 0; i < hullB->m_numVertices; i++)
+	{
+		b3Vector3 vtx = convexVertices[hullB->m_vertexOffset + i];
+		float curDot = vtx.dot(planeNormalInConvex);
+
+		if (curDot > maxDot)
+		{
+			hitVertex = i;
+			maxDot = curDot;
+			hitVtx = vtx;
+			//make sure the deepest points is always included
+			if (numPoints == MAX_PLANE_CONVEX_POINTS)
+				numPoints--;
+		}
+
+		if (numPoints < MAX_PLANE_CONVEX_POINTS)
+		{
+			b3Vector3 vtxWorld = convexWorldTransform * vtx;
+			b3Vector3 vtxInPlane = planeTransform.inverse() * vtxWorld;
+			float dist = planeNormal.dot(vtxInPlane) - planeConstant;
+			if (dist < 0.f)
+			{
+				vtxWorld.w = dist;
+				contactPoints[numPoints] = vtxWorld;
+				numPoints++;
+			}
+		}
+	}
+
+	int numReducedPoints = 0;
+
+	numReducedPoints = numPoints;
+
+	if (numPoints > 4)
+	{
+		numReducedPoints = extractManifoldSequentialGlobal(contactPoints, numPoints, planeNormalInConvex, &contactIdx);
+	}
+	int dstIdx;
+	//    dstIdx = nGlobalContactsOut++;//AppendInc( nGlobalContactsOut, dstIdx );
+
+	if (numReducedPoints > 0)
+	{
+		if (nGlobalContactsOut < maxContactCapacity)
+		{
+			dstIdx = nGlobalContactsOut;
+			nGlobalContactsOut++;
+
+			b3Contact4* c = &globalContactsOut[dstIdx];
+			c->m_worldNormalOnB = -planeNormalWorld;
+			c->setFrictionCoeff(0.7);
+			c->setRestituitionCoeff(0.f);
+
+			c->m_batchIdx = pairIndex;
+			c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass == 0 ? -bodyIndexA : bodyIndexA;
+			c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass == 0 ? -bodyIndexB : bodyIndexB;
+			for (int i = 0; i < numReducedPoints; i++)
+			{
+				b3Vector3 pOnB1 = contactPoints[contactIdx.s[i]];
+				c->m_worldPosB[i] = pOnB1;
+			}
+			c->m_worldNormalOnB.w = (b3Scalar)numReducedPoints;
+		}  //if (dstIdx < numPairs)
+	}
+
+	//	printf("computeContactPlaneConvex\n");
+}
+
+B3_FORCE_INLINE b3Vector3 MyUnQuantize(const unsigned short* vecIn, const b3Vector3& quantization, const b3Vector3& bvhAabbMin)
+{
+	b3Vector3 vecOut;
+	vecOut.setValue(
+		(b3Scalar)(vecIn[0]) / (quantization.x),
+		(b3Scalar)(vecIn[1]) / (quantization.y),
+		(b3Scalar)(vecIn[2]) / (quantization.z));
+	vecOut += bvhAabbMin;
+	return vecOut;
+}
+
+void traverseTreeTree()
+{
+}
+
+#include "Bullet3Common/shared/b3Mat3x3.h"
+
+int numAabbChecks = 0;
+int maxNumAabbChecks = 0;
+int maxDepth = 0;
+
+// work-in-progress
+__kernel void findCompoundPairsKernel(
+	int pairIndex,
+	int bodyIndexA,
+	int bodyIndexB,
+	int collidableIndexA,
+	int collidableIndexB,
+	__global const b3RigidBodyData* rigidBodies,
+	__global const b3Collidable* collidables,
+	__global const b3ConvexPolyhedronData* convexShapes,
+	__global const b3AlignedObjectArray<b3Float4>& vertices,
+	__global const b3AlignedObjectArray<b3Aabb>& aabbsWorldSpace,
+	__global const b3AlignedObjectArray<b3Aabb>& aabbsLocalSpace,
+	__global const b3GpuChildShape* gpuChildShapes,
+	__global b3Int4* gpuCompoundPairsOut,
+	__global int* numCompoundPairsOut,
+	int maxNumCompoundPairsCapacity,
+	b3AlignedObjectArray<b3QuantizedBvhNode>& treeNodesCPU,
+	b3AlignedObjectArray<b3BvhSubtreeInfo>& subTreesCPU,
+	b3AlignedObjectArray<b3BvhInfo>& bvhInfoCPU)
+{
+	numAabbChecks = 0;
+	maxNumAabbChecks = 0;
+	//	int i = pairIndex;
+	{
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+
+		//once the broadphase avoids static-static pairs, we can remove this test
+		if ((rigidBodies[bodyIndexA].m_invMass == 0) && (rigidBodies[bodyIndexB].m_invMass == 0))
+		{
+			return;
+		}
+
+		if ((collidables[collidableIndexA].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS) && (collidables[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS))
+		{
+			int bvhA = collidables[collidableIndexA].m_compoundBvhIndex;
+			int bvhB = collidables[collidableIndexB].m_compoundBvhIndex;
+			int numSubTreesA = bvhInfoCPU[bvhA].m_numSubTrees;
+			int subTreesOffsetA = bvhInfoCPU[bvhA].m_subTreeOffset;
+			int subTreesOffsetB = bvhInfoCPU[bvhB].m_subTreeOffset;
+
+			int numSubTreesB = bvhInfoCPU[bvhB].m_numSubTrees;
+
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+			b3Quat ornA = rigidBodies[bodyIndexA].m_quat;
+
+			b3Transform transA;
+			transA.setIdentity();
+			transA.setOrigin(posA);
+			transA.setRotation(ornA);
+
+			b3Quat ornB = rigidBodies[bodyIndexB].m_quat;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+
+			b3Transform transB;
+			transB.setIdentity();
+			transB.setOrigin(posB);
+			transB.setRotation(ornB);
+
+			for (int p = 0; p < numSubTreesA; p++)
+			{
+				b3BvhSubtreeInfo subtreeA = subTreesCPU[subTreesOffsetA + p];
+				//bvhInfoCPU[bvhA].m_quantization
+				b3Vector3 treeAminLocal = MyUnQuantize(subtreeA.m_quantizedAabbMin, bvhInfoCPU[bvhA].m_quantization, bvhInfoCPU[bvhA].m_aabbMin);
+				b3Vector3 treeAmaxLocal = MyUnQuantize(subtreeA.m_quantizedAabbMax, bvhInfoCPU[bvhA].m_quantization, bvhInfoCPU[bvhA].m_aabbMin);
+
+				b3Vector3 aabbAMinOut, aabbAMaxOut;
+				float margin = 0.f;
+				b3TransformAabb2(treeAminLocal, treeAmaxLocal, margin, transA.getOrigin(), transA.getRotation(), &aabbAMinOut, &aabbAMaxOut);
+
+				for (int q = 0; q < numSubTreesB; q++)
+				{
+					b3BvhSubtreeInfo subtreeB = subTreesCPU[subTreesOffsetB + q];
+
+					b3Vector3 treeBminLocal = MyUnQuantize(subtreeB.m_quantizedAabbMin, bvhInfoCPU[bvhB].m_quantization, bvhInfoCPU[bvhB].m_aabbMin);
+					b3Vector3 treeBmaxLocal = MyUnQuantize(subtreeB.m_quantizedAabbMax, bvhInfoCPU[bvhB].m_quantization, bvhInfoCPU[bvhB].m_aabbMin);
+
+					b3Vector3 aabbBMinOut, aabbBMaxOut;
+					float margin = 0.f;
+					b3TransformAabb2(treeBminLocal, treeBmaxLocal, margin, transB.getOrigin(), transB.getRotation(), &aabbBMinOut, &aabbBMaxOut);
+
+					numAabbChecks = 0;
+					bool aabbOverlap = b3TestAabbAgainstAabb(aabbAMinOut, aabbAMaxOut, aabbBMinOut, aabbBMaxOut);
+					if (aabbOverlap)
+					{
+						int startNodeIndexA = subtreeA.m_rootNodeIndex + bvhInfoCPU[bvhA].m_nodeOffset;
+						//				int endNodeIndexA = startNodeIndexA+subtreeA.m_subtreeSize;
+
+						int startNodeIndexB = subtreeB.m_rootNodeIndex + bvhInfoCPU[bvhB].m_nodeOffset;
+						//				int endNodeIndexB = startNodeIndexB+subtreeB.m_subtreeSize;
+
+						b3AlignedObjectArray<b3Int2> nodeStack;
+						b3Int2 node0;
+						node0.x = startNodeIndexA;
+						node0.y = startNodeIndexB;
+
+						int maxStackDepth = 1024;
+						nodeStack.resize(maxStackDepth);
+						int depth = 0;
+						nodeStack[depth++] = node0;
+
+						do
+						{
+							if (depth > maxDepth)
+							{
+								maxDepth = depth;
+								printf("maxDepth=%d\n", maxDepth);
+							}
+							b3Int2 node = nodeStack[--depth];
+
+							b3Vector3 aMinLocal = MyUnQuantize(treeNodesCPU[node.x].m_quantizedAabbMin, bvhInfoCPU[bvhA].m_quantization, bvhInfoCPU[bvhA].m_aabbMin);
+							b3Vector3 aMaxLocal = MyUnQuantize(treeNodesCPU[node.x].m_quantizedAabbMax, bvhInfoCPU[bvhA].m_quantization, bvhInfoCPU[bvhA].m_aabbMin);
+
+							b3Vector3 bMinLocal = MyUnQuantize(treeNodesCPU[node.y].m_quantizedAabbMin, bvhInfoCPU[bvhB].m_quantization, bvhInfoCPU[bvhB].m_aabbMin);
+							b3Vector3 bMaxLocal = MyUnQuantize(treeNodesCPU[node.y].m_quantizedAabbMax, bvhInfoCPU[bvhB].m_quantization, bvhInfoCPU[bvhB].m_aabbMin);
+
+							float margin = 0.f;
+							b3Vector3 aabbAMinOut, aabbAMaxOut;
+							b3TransformAabb2(aMinLocal, aMaxLocal, margin, transA.getOrigin(), transA.getRotation(), &aabbAMinOut, &aabbAMaxOut);
+
+							b3Vector3 aabbBMinOut, aabbBMaxOut;
+							b3TransformAabb2(bMinLocal, bMaxLocal, margin, transB.getOrigin(), transB.getRotation(), &aabbBMinOut, &aabbBMaxOut);
+
+							numAabbChecks++;
+							bool nodeOverlap = b3TestAabbAgainstAabb(aabbAMinOut, aabbAMaxOut, aabbBMinOut, aabbBMaxOut);
+							if (nodeOverlap)
+							{
+								bool isLeafA = treeNodesCPU[node.x].isLeafNode();
+								bool isLeafB = treeNodesCPU[node.y].isLeafNode();
+								bool isInternalA = !isLeafA;
+								bool isInternalB = !isLeafB;
+
+								//fail, even though it might hit two leaf nodes
+								if (depth + 4 > maxStackDepth && !(isLeafA && isLeafB))
+								{
+									b3Error("Error: traversal exceeded maxStackDepth\n");
+									continue;
+								}
+
+								if (isInternalA)
+								{
+									int nodeAleftChild = node.x + 1;
+									bool isNodeALeftChildLeaf = treeNodesCPU[node.x + 1].isLeafNode();
+									int nodeArightChild = isNodeALeftChildLeaf ? node.x + 2 : node.x + 1 + treeNodesCPU[node.x + 1].getEscapeIndex();
+
+									if (isInternalB)
+									{
+										int nodeBleftChild = node.y + 1;
+										bool isNodeBLeftChildLeaf = treeNodesCPU[node.y + 1].isLeafNode();
+										int nodeBrightChild = isNodeBLeftChildLeaf ? node.y + 2 : node.y + 1 + treeNodesCPU[node.y + 1].getEscapeIndex();
+
+										nodeStack[depth++] = b3MakeInt2(nodeAleftChild, nodeBleftChild);
+										nodeStack[depth++] = b3MakeInt2(nodeArightChild, nodeBleftChild);
+										nodeStack[depth++] = b3MakeInt2(nodeAleftChild, nodeBrightChild);
+										nodeStack[depth++] = b3MakeInt2(nodeArightChild, nodeBrightChild);
+									}
+									else
+									{
+										nodeStack[depth++] = b3MakeInt2(nodeAleftChild, node.y);
+										nodeStack[depth++] = b3MakeInt2(nodeArightChild, node.y);
+									}
+								}
+								else
+								{
+									if (isInternalB)
+									{
+										int nodeBleftChild = node.y + 1;
+										bool isNodeBLeftChildLeaf = treeNodesCPU[node.y + 1].isLeafNode();
+										int nodeBrightChild = isNodeBLeftChildLeaf ? node.y + 2 : node.y + 1 + treeNodesCPU[node.y + 1].getEscapeIndex();
+										nodeStack[depth++] = b3MakeInt2(node.x, nodeBleftChild);
+										nodeStack[depth++] = b3MakeInt2(node.x, nodeBrightChild);
+									}
+									else
+									{
+										int compoundPairIdx = b3AtomicInc(numCompoundPairsOut);
+										if (compoundPairIdx < maxNumCompoundPairsCapacity)
+										{
+											int childShapeIndexA = treeNodesCPU[node.x].getTriangleIndex();
+											int childShapeIndexB = treeNodesCPU[node.y].getTriangleIndex();
+											gpuCompoundPairsOut[compoundPairIdx] = b3MakeInt4(bodyIndexA, bodyIndexB, childShapeIndexA, childShapeIndexB);
+										}
+									}
+								}
+							}
+						} while (depth);
+						maxNumAabbChecks = b3Max(numAabbChecks, maxNumAabbChecks);
+					}
+				}
+			}
+
+			return;
+		}
+
+		if ((collidables[collidableIndexA].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS) || (collidables[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS))
+		{
+			if (collidables[collidableIndexA].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+			{
+				int numChildrenA = collidables[collidableIndexA].m_numChildShapes;
+				for (int c = 0; c < numChildrenA; c++)
+				{
+					int childShapeIndexA = collidables[collidableIndexA].m_shapeIndex + c;
+					int childColIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+
+					float4 posA = rigidBodies[bodyIndexA].m_pos;
+					b3Quat ornA = rigidBodies[bodyIndexA].m_quat;
+					float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+					b3Quat childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+					float4 newPosA = b3QuatRotate(ornA, childPosA) + posA;
+					b3Quat newOrnA = b3QuatMul(ornA, childOrnA);
+
+					b3Aabb aabbA = aabbsLocalSpace[childColIndexA];
+
+					b3Transform transA;
+					transA.setIdentity();
+					transA.setOrigin(newPosA);
+					transA.setRotation(newOrnA);
+					b3Scalar margin = 0.0f;
+
+					b3Vector3 aabbAMinOut, aabbAMaxOut;
+
+					b3TransformAabb2((const b3Float4&)aabbA.m_min, (const b3Float4&)aabbA.m_max, margin, transA.getOrigin(), transA.getRotation(), &aabbAMinOut, &aabbAMaxOut);
+
+					if (collidables[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+					{
+						int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+						for (int b = 0; b < numChildrenB; b++)
+						{
+							int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex + b;
+							int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+							b3Quat ornB = rigidBodies[bodyIndexB].m_quat;
+							float4 posB = rigidBodies[bodyIndexB].m_pos;
+							float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+							b3Quat childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+							float4 newPosB = transform(&childPosB, &posB, &ornB);
+							b3Quat newOrnB = b3QuatMul(ornB, childOrnB);
+
+							b3Aabb aabbB = aabbsLocalSpace[childColIndexB];
+
+							b3Transform transB;
+							transB.setIdentity();
+							transB.setOrigin(newPosB);
+							transB.setRotation(newOrnB);
+
+							b3Vector3 aabbBMinOut, aabbBMaxOut;
+							b3TransformAabb2((const b3Float4&)aabbB.m_min, (const b3Float4&)aabbB.m_max, margin, transB.getOrigin(), transB.getRotation(), &aabbBMinOut, &aabbBMaxOut);
+
+							numAabbChecks++;
+							bool aabbOverlap = b3TestAabbAgainstAabb(aabbAMinOut, aabbAMaxOut, aabbBMinOut, aabbBMaxOut);
+							if (aabbOverlap)
+							{
+								/*
+								int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+								float dmin = FLT_MAX;
+								float4 posA = newPosA;
+								posA.w = 0.f;
+								float4 posB = newPosB;
+								posB.w = 0.f;
+								float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+								b3Quat ornA = newOrnA;
+								float4 c0 = transform(&c0local, &posA, &ornA);
+								float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+								b3Quat ornB =newOrnB;
+								float4 c1 = transform(&c1local,&posB,&ornB);
+								const float4 DeltaC2 = c0 - c1;
+								*/
+								{  //
+									int compoundPairIdx = b3AtomicInc(numCompoundPairsOut);
+									if (compoundPairIdx < maxNumCompoundPairsCapacity)
+									{
+										gpuCompoundPairsOut[compoundPairIdx] = b3MakeInt4(bodyIndexA, bodyIndexB, childShapeIndexA, childShapeIndexB);
+									}
+								}  //
+							}      //fi(1)
+						}          //for (int b=0
+					}              //if (collidables[collidableIndexB].
+					else           //if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+					{
+						if (1)
+						{
+							//	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+							//	float dmin = FLT_MAX;
+							float4 posA = newPosA;
+							posA.w = 0.f;
+							float4 posB = rigidBodies[bodyIndexB].m_pos;
+							posB.w = 0.f;
+							float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+							b3Quat ornA = newOrnA;
+							float4 c0;
+							c0 = transform(&c0local, &posA, &ornA);
+							float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+							b3Quat ornB = rigidBodies[bodyIndexB].m_quat;
+							float4 c1;
+							c1 = transform(&c1local, &posB, &ornB);
+							//	const float4 DeltaC2 = c0 - c1;
+
+							{
+								int compoundPairIdx = b3AtomicInc(numCompoundPairsOut);
+								if (compoundPairIdx < maxNumCompoundPairsCapacity)
+								{
+									gpuCompoundPairsOut[compoundPairIdx] = b3MakeInt4(bodyIndexA, bodyIndexB, childShapeIndexA, -1);
+								}  //if (compoundPairIdx<maxNumCompoundPairsCapacity)
+							}      //
+						}          //fi (1)
+					}              //if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+				}                  //for (int b=0;b<numChildrenB;b++)
+				return;
+			}  //if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+			if ((collidables[collidableIndexA].m_shapeType != SHAPE_CONCAVE_TRIMESH) && (collidables[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS))
+			{
+				int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+				for (int b = 0; b < numChildrenB; b++)
+				{
+					int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex + b;
+					int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+					b3Quat ornB = rigidBodies[bodyIndexB].m_quat;
+					float4 posB = rigidBodies[bodyIndexB].m_pos;
+					float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+					b3Quat childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+					float4 newPosB = b3QuatRotate(ornB, childPosB) + posB;
+					b3Quat newOrnB = b3QuatMul(ornB, childOrnB);
+
+					int shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+
+					//////////////////////////////////////
+
+					if (1)
+					{
+						//	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+						//	float dmin = FLT_MAX;
+						float4 posA = rigidBodies[bodyIndexA].m_pos;
+						posA.w = 0.f;
+						float4 posB = newPosB;
+						posB.w = 0.f;
+						float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+						b3Quat ornA = rigidBodies[bodyIndexA].m_quat;
+						float4 c0;
+						c0 = transform(&c0local, &posA, &ornA);
+						float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+						b3Quat ornB = newOrnB;
+						float4 c1;
+						c1 = transform(&c1local, &posB, &ornB);
+						//	const float4 DeltaC2 = c0 - c1;
+						{  //
+							int compoundPairIdx = b3AtomicInc(numCompoundPairsOut);
+							if (compoundPairIdx < maxNumCompoundPairsCapacity)
+							{
+								gpuCompoundPairsOut[compoundPairIdx] = b3MakeInt4(bodyIndexA, bodyIndexB, -1, childShapeIndexB);
+							}  //fi (compoundPairIdx<maxNumCompoundPairsCapacity)
+						}      //
+					}          //fi (1)
+				}              //for (int b=0;b<numChildrenB;b++)
+				return;
+			}  //if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+			return;
+		}  //fi ((collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) ||(collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))
+	}      //i<numPairs
+}
+
+__kernel void processCompoundPairsKernel(__global const b3Int4* gpuCompoundPairs,
+										 __global const b3RigidBodyData* rigidBodies,
+										 __global const b3Collidable* collidables,
+										 __global const b3ConvexPolyhedronData* convexShapes,
+										 __global const b3AlignedObjectArray<b3Float4>& vertices,
+										 __global const b3AlignedObjectArray<b3Float4>& uniqueEdges,
+										 __global const b3AlignedObjectArray<b3GpuFace>& faces,
+										 __global const b3AlignedObjectArray<int>& indices,
+										 __global b3Aabb* aabbs,
+										 __global const b3GpuChildShape* gpuChildShapes,
+										 __global b3AlignedObjectArray<b3Float4>& gpuCompoundSepNormalsOut,
+										 __global b3AlignedObjectArray<int>& gpuHasCompoundSepNormalsOut,
+										 int numCompoundPairs,
+										 int i)
+{
+	//	int i = get_global_id(0);
+	if (i < numCompoundPairs)
+	{
+		int bodyIndexA = gpuCompoundPairs[i].x;
+		int bodyIndexB = gpuCompoundPairs[i].y;
+
+		int childShapeIndexA = gpuCompoundPairs[i].z;
+		int childShapeIndexB = gpuCompoundPairs[i].w;
+
+		int collidableIndexA = -1;
+		int collidableIndexB = -1;
+
+		b3Quat ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+
+		b3Quat ornB = rigidBodies[bodyIndexB].m_quat;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+
+		if (childShapeIndexA >= 0)
+		{
+			collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+			float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+			b3Quat childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+			float4 newPosA = b3QuatRotate(ornA, childPosA) + posA;
+			b3Quat newOrnA = b3QuatMul(ornA, childOrnA);
+			posA = newPosA;
+			ornA = newOrnA;
+		}
+		else
+		{
+			collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		}
+
+		if (childShapeIndexB >= 0)
+		{
+			collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			b3Quat childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			float4 newPosB = b3QuatRotate(ornB, childPosB) + posB;
+			b3Quat newOrnB = b3QuatMul(ornB, childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+		}
+		else
+		{
+			collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+		}
+
+		gpuHasCompoundSepNormalsOut[i] = 0;
+
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+
+		int shapeTypeA = collidables[collidableIndexA].m_shapeType;
+		int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+
+		if ((shapeTypeA != SHAPE_CONVEX_HULL) || (shapeTypeB != SHAPE_CONVEX_HULL))
+		{
+			return;
+		}
+
+		int hasSeparatingAxis = 5;
+
+		//	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+		float dmin = FLT_MAX;
+		posA.w = 0.f;
+		posB.w = 0.f;
+		float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+		float4 c0 = transform(&c0local, &posA, &ornA);
+		float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		float4 c1 = transform(&c1local, &posB, &ornB);
+		const float4 DeltaC2 = c0 - c1;
+		float4 sepNormal = make_float4(1, 0, 0, 0);
+		//		bool sepA = findSeparatingAxis(	convexShapes[shapeIndexA], convexShapes[shapeIndexB],posA,ornA,posB,ornB,DeltaC2,vertices,uniqueEdges,faces,indices,&sepNormal,&dmin);
+		bool sepA = findSeparatingAxis(convexShapes[shapeIndexA], convexShapes[shapeIndexB], posA, ornA, posB, ornB, vertices, uniqueEdges, faces, indices, vertices, uniqueEdges, faces, indices, sepNormal);  //,&dmin);
+
+		hasSeparatingAxis = 4;
+		if (!sepA)
+		{
+			hasSeparatingAxis = 0;
+		}
+		else
+		{
+			bool sepB = findSeparatingAxis(convexShapes[shapeIndexB], convexShapes[shapeIndexA], posB, ornB, posA, ornA, vertices, uniqueEdges, faces, indices, vertices, uniqueEdges, faces, indices, sepNormal);  //,&dmin);
+
+			if (!sepB)
+			{
+				hasSeparatingAxis = 0;
+			}
+			else  //(!sepB)
+			{
+				bool sepEE = findSeparatingAxisEdgeEdge(&convexShapes[shapeIndexA], &convexShapes[shapeIndexB], posA, ornA, posB, ornB, DeltaC2, vertices, uniqueEdges, faces, indices, &sepNormal, &dmin);
+				if (sepEE)
+				{
+					gpuCompoundSepNormalsOut[i] = sepNormal;  //fastNormalize4(sepNormal);
+					gpuHasCompoundSepNormalsOut[i] = 1;
+				}  //sepEE
+			}      //(!sepB)
+		}          //(!sepA)
+	}
+}
+
+__kernel void clipCompoundsHullHullKernel(__global const b3Int4* gpuCompoundPairs,
+										  __global const b3RigidBodyData* rigidBodies,
+										  __global const b3Collidable* collidables,
+										  __global const b3ConvexPolyhedronData* convexShapes,
+										  __global const b3AlignedObjectArray<b3Float4>& vertices,
+										  __global const b3AlignedObjectArray<b3Float4>& uniqueEdges,
+										  __global const b3AlignedObjectArray<b3GpuFace>& faces,
+										  __global const b3AlignedObjectArray<int>& indices,
+										  __global const b3GpuChildShape* gpuChildShapes,
+										  __global const b3AlignedObjectArray<b3Float4>& gpuCompoundSepNormalsOut,
+										  __global const b3AlignedObjectArray<int>& gpuHasCompoundSepNormalsOut,
+										  __global struct b3Contact4Data* globalContactsOut,
+										  int* nGlobalContactsOut,
+										  int numCompoundPairs, int maxContactCapacity, int i)
+{
+	//	int i = get_global_id(0);
+	int pairIndex = i;
+
+	float4 worldVertsB1[64];
+	float4 worldVertsB2[64];
+	int capacityWorldVerts = 64;
+
+	float4 localContactsOut[64];
+	int localContactCapacity = 64;
+
+	float minDist = -1e30f;
+	float maxDist = 0.0f;
+
+	if (i < numCompoundPairs)
+	{
+		if (gpuHasCompoundSepNormalsOut[i])
+		{
+			int bodyIndexA = gpuCompoundPairs[i].x;
+			int bodyIndexB = gpuCompoundPairs[i].y;
+
+			int childShapeIndexA = gpuCompoundPairs[i].z;
+			int childShapeIndexB = gpuCompoundPairs[i].w;
+
+			int collidableIndexA = -1;
+			int collidableIndexB = -1;
+
+			b3Quat ornA = rigidBodies[bodyIndexA].m_quat;
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+
+			b3Quat ornB = rigidBodies[bodyIndexB].m_quat;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+
+			if (childShapeIndexA >= 0)
+			{
+				collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+				float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+				b3Quat childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+				float4 newPosA = b3QuatRotate(ornA, childPosA) + posA;
+				b3Quat newOrnA = b3QuatMul(ornA, childOrnA);
+				posA = newPosA;
+				ornA = newOrnA;
+			}
+			else
+			{
+				collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+			}
+
+			if (childShapeIndexB >= 0)
+			{
+				collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+				float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+				b3Quat childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+				float4 newPosB = b3QuatRotate(ornB, childPosB) + posB;
+				b3Quat newOrnB = b3QuatMul(ornB, childOrnB);
+				posB = newPosB;
+				ornB = newOrnB;
+			}
+			else
+			{
+				collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+			}
+
+			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+
+			int numLocalContactsOut = clipHullAgainstHull(gpuCompoundSepNormalsOut[i],
+														  convexShapes[shapeIndexA], convexShapes[shapeIndexB],
+														  posA, ornA,
+														  posB, ornB,
+														  worldVertsB1, worldVertsB2, capacityWorldVerts,
+														  minDist, maxDist,
+														  vertices, faces, indices,
+														  vertices, faces, indices,
+														  localContactsOut, localContactCapacity);
+
+			if (numLocalContactsOut > 0)
+			{
+				float4 normal = -gpuCompoundSepNormalsOut[i];
+				int nPoints = numLocalContactsOut;
+				float4* pointsIn = localContactsOut;
+				b3Int4 contactIdx;  // = {-1,-1,-1,-1};
+
+				contactIdx.s[0] = 0;
+				contactIdx.s[1] = 1;
+				contactIdx.s[2] = 2;
+				contactIdx.s[3] = 3;
+
+				int nReducedContacts = extractManifoldSequentialGlobal(pointsIn, nPoints, normal, &contactIdx);
+
+				int dstIdx;
+				dstIdx = b3AtomicInc(nGlobalContactsOut);
+				if ((dstIdx + nReducedContacts) < maxContactCapacity)
+				{
+					__global struct b3Contact4Data* c = globalContactsOut + dstIdx;
+					c->m_worldNormalOnB = -normal;
+					c->m_restituitionCoeffCmp = (0.f * 0xffff);
+					c->m_frictionCoeffCmp = (0.7f * 0xffff);
+					c->m_batchIdx = pairIndex;
+					int bodyA = gpuCompoundPairs[pairIndex].x;
+					int bodyB = gpuCompoundPairs[pairIndex].y;
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass == 0 ? -bodyA : bodyA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass == 0 ? -bodyB : bodyB;
+					c->m_childIndexA = childShapeIndexA;
+					c->m_childIndexB = childShapeIndexB;
+					for (int i = 0; i < nReducedContacts; i++)
+					{
+						c->m_worldPosB[i] = pointsIn[contactIdx.s[i]];
+					}
+					b3Contact4Data_setNumPoints(c, nReducedContacts);
+				}
+
+			}  //		if (numContactsOut>0)
+		}      //		if (gpuHasCompoundSepNormalsOut[i])
+	}          //	if (i<numCompoundPairs)
+}
+
+void computeContactCompoundCompound(int pairIndex,
+									int bodyIndexA, int bodyIndexB,
+									int collidableIndexA, int collidableIndexB,
+									const b3RigidBodyData* rigidBodies,
+									const b3Collidable* collidables,
+									const b3ConvexPolyhedronData* convexShapes,
+									const b3GpuChildShape* cpuChildShapes,
+									const b3AlignedObjectArray<b3Aabb>& hostAabbsWorldSpace,
+									const b3AlignedObjectArray<b3Aabb>& hostAabbsLocalSpace,
+
+									const b3AlignedObjectArray<b3Vector3>& convexVertices,
+									const b3AlignedObjectArray<b3Vector3>& hostUniqueEdges,
+									const b3AlignedObjectArray<int>& convexIndices,
+									const b3AlignedObjectArray<b3GpuFace>& faces,
+
+									b3Contact4* globalContactsOut,
+									int& nGlobalContactsOut,
+									int maxContactCapacity,
+									b3AlignedObjectArray<b3QuantizedBvhNode>& treeNodesCPU,
+									b3AlignedObjectArray<b3BvhSubtreeInfo>& subTreesCPU,
+									b3AlignedObjectArray<b3BvhInfo>& bvhInfoCPU)
+{
+	int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+	b3Assert(shapeTypeB == SHAPE_COMPOUND_OF_CONVEX_HULLS);
+
+	b3AlignedObjectArray<b3Int4> cpuCompoundPairsOut;
+	int numCompoundPairsOut = 0;
+	int maxNumCompoundPairsCapacity = 8192;  //1024;
+	cpuCompoundPairsOut.resize(maxNumCompoundPairsCapacity);
+
+	// work-in-progress
+	findCompoundPairsKernel(
+		pairIndex,
+		bodyIndexA, bodyIndexB,
+		collidableIndexA, collidableIndexB,
+		rigidBodies,
+		collidables,
+		convexShapes,
+		convexVertices,
+		hostAabbsWorldSpace,
+		hostAabbsLocalSpace,
+		cpuChildShapes,
+		&cpuCompoundPairsOut[0],
+		&numCompoundPairsOut,
+		maxNumCompoundPairsCapacity,
+		treeNodesCPU,
+		subTreesCPU,
+		bvhInfoCPU);
+
+	printf("maxNumAabbChecks=%d\n", maxNumAabbChecks);
+	if (numCompoundPairsOut > maxNumCompoundPairsCapacity)
+	{
+		b3Error("numCompoundPairsOut exceeded maxNumCompoundPairsCapacity (%d)\n", maxNumCompoundPairsCapacity);
+		numCompoundPairsOut = maxNumCompoundPairsCapacity;
+	}
+	b3AlignedObjectArray<b3Float4> cpuCompoundSepNormalsOut;
+	b3AlignedObjectArray<int> cpuHasCompoundSepNormalsOut;
+	cpuCompoundSepNormalsOut.resize(numCompoundPairsOut);
+	cpuHasCompoundSepNormalsOut.resize(numCompoundPairsOut);
+
+	for (int i = 0; i < numCompoundPairsOut; i++)
+	{
+		processCompoundPairsKernel(&cpuCompoundPairsOut[0], rigidBodies, collidables, convexShapes, convexVertices, hostUniqueEdges, faces, convexIndices, 0, cpuChildShapes,
+								   cpuCompoundSepNormalsOut, cpuHasCompoundSepNormalsOut, numCompoundPairsOut, i);
+	}
+
+	for (int i = 0; i < numCompoundPairsOut; i++)
+	{
+		clipCompoundsHullHullKernel(&cpuCompoundPairsOut[0], rigidBodies, collidables, convexShapes, convexVertices, hostUniqueEdges, faces, convexIndices, cpuChildShapes,
+									cpuCompoundSepNormalsOut, cpuHasCompoundSepNormalsOut, globalContactsOut, &nGlobalContactsOut, numCompoundPairsOut, maxContactCapacity, i);
+	}
+	/*
+		int childColIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+
+					float4 posA = rigidBodies[bodyIndexA].m_pos;
+					b3Quat ornA = rigidBodies[bodyIndexA].m_quat;
+					float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+					b3Quat childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+					float4 newPosA = b3QuatRotate(ornA,childPosA)+posA;
+					b3Quat newOrnA = b3QuatMul(ornA,childOrnA);
+
+					int shapeIndexA = collidables[childColIndexA].m_shapeIndex;
+
+
+			bool foundSepAxis = findSeparatingAxis(hullA,hullB,
+							posA,
+							ornA,
+							posB,
+							ornB,
+
+							convexVertices,uniqueEdges,faces,convexIndices,
+							convexVertices,uniqueEdges,faces,convexIndices,
+							
+							sepNormalWorldSpace
+							);
+							*/
+
+	/*
+	if (foundSepAxis)
+	{
+		
+		
+		contactIndex = clipHullHullSingle(
+			bodyIndexA, bodyIndexB,
+						   posA,ornA,
+						   posB,ornB,
+			collidableIndexA, collidableIndexB,
+			&rigidBodies, 
+			&globalContactsOut,
+			nGlobalContactsOut,
+			
+			convexShapes,
+			convexShapes,
+	
+			convexVertices, 
+			uniqueEdges, 
+			faces,
+			convexIndices,
+	
+			convexVertices,
+			uniqueEdges,
+			faces,
+			convexIndices,
+
+			collidables,
+			collidables,
+			sepNormalWorldSpace,
+			maxContactCapacity);
+			
+	}
+	*/
+
+	//	return contactIndex;
+
+	/*
+
+	int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+	for (int c=0;c<numChildrenB;c++)
+	{
+		int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex+c;
+		int childColIndexB = cpuChildShapes[childShapeIndexB].m_shapeIndex;
+
+		float4 rootPosB = rigidBodies[bodyIndexB].m_pos;
+		b3Quaternion rootOrnB = rigidBodies[bodyIndexB].m_quat;
+		b3Vector3 childPosB = cpuChildShapes[childShapeIndexB].m_childPosition;
+		b3Quaternion childOrnB = cpuChildShapes[childShapeIndexB].m_childOrientation;
+		float4  posB = b3QuatRotate(rootOrnB,childPosB)+rootPosB;
+		b3Quaternion ornB = b3QuatMul(rootOrnB,childOrnB);//b3QuatMul(ornB,childOrnB);
+
+		int shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+
+		const b3ConvexPolyhedronData* hullB = &convexShapes[shapeIndexB];
+
+	}
+	*/
+}
+
+void computeContactPlaneCompound(int pairIndex,
+								 int bodyIndexA, int bodyIndexB,
+								 int collidableIndexA, int collidableIndexB,
+								 const b3RigidBodyData* rigidBodies,
+								 const b3Collidable* collidables,
+								 const b3ConvexPolyhedronData* convexShapes,
+								 const b3GpuChildShape* cpuChildShapes,
+								 const b3Vector3* convexVertices,
+								 const int* convexIndices,
+								 const b3GpuFace* faces,
+
+								 b3Contact4* globalContactsOut,
+								 int& nGlobalContactsOut,
+								 int maxContactCapacity)
+{
+	int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+	b3Assert(shapeTypeB == SHAPE_COMPOUND_OF_CONVEX_HULLS);
+
+	int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+	for (int c = 0; c < numChildrenB; c++)
+	{
+		int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex + c;
+		int childColIndexB = cpuChildShapes[childShapeIndexB].m_shapeIndex;
+
+		float4 rootPosB = rigidBodies[bodyIndexB].m_pos;
+		b3Quaternion rootOrnB = rigidBodies[bodyIndexB].m_quat;
+		b3Vector3 childPosB = cpuChildShapes[childShapeIndexB].m_childPosition;
+		b3Quaternion childOrnB = cpuChildShapes[childShapeIndexB].m_childOrientation;
+		float4 posB = b3QuatRotate(rootOrnB, childPosB) + rootPosB;
+		b3Quaternion ornB = rootOrnB * childOrnB;  //b3QuatMul(ornB,childOrnB);
+
+		int shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+
+		const b3ConvexPolyhedronData* hullB = &convexShapes[shapeIndexB];
+
+		b3Vector3 posA = rigidBodies[bodyIndexA].m_pos;
+		b3Quaternion ornA = rigidBodies[bodyIndexA].m_quat;
+
+		//	int numContactsOut = 0;
+		//	int numWorldVertsB1= 0;
+
+		b3Vector3 planeEq = faces[collidables[collidableIndexA].m_shapeIndex].m_plane;
+		b3Vector3 planeNormal = b3MakeVector3(planeEq.x, planeEq.y, planeEq.z);
+		b3Vector3 planeNormalWorld = b3QuatRotate(ornA, planeNormal);
+		float planeConstant = planeEq.w;
+		b3Transform convexWorldTransform;
+		convexWorldTransform.setIdentity();
+		convexWorldTransform.setOrigin(posB);
+		convexWorldTransform.setRotation(ornB);
+		b3Transform planeTransform;
+		planeTransform.setIdentity();
+		planeTransform.setOrigin(posA);
+		planeTransform.setRotation(ornA);
+
+		b3Transform planeInConvex;
+		planeInConvex = convexWorldTransform.inverse() * planeTransform;
+		b3Transform convexInPlane;
+		convexInPlane = planeTransform.inverse() * convexWorldTransform;
+
+		b3Vector3 planeNormalInConvex = planeInConvex.getBasis() * -planeNormal;
+		float maxDot = -1e30;
+		int hitVertex = -1;
+		b3Vector3 hitVtx;
+
+#define MAX_PLANE_CONVEX_POINTS 64
+
+		b3Vector3 contactPoints[MAX_PLANE_CONVEX_POINTS];
+		int numPoints = 0;
+
+		b3Int4 contactIdx;
+		contactIdx.s[0] = 0;
+		contactIdx.s[1] = 1;
+		contactIdx.s[2] = 2;
+		contactIdx.s[3] = 3;
+
+		for (int i = 0; i < hullB->m_numVertices; i++)
+		{
+			b3Vector3 vtx = convexVertices[hullB->m_vertexOffset + i];
+			float curDot = vtx.dot(planeNormalInConvex);
+
+			if (curDot > maxDot)
+			{
+				hitVertex = i;
+				maxDot = curDot;
+				hitVtx = vtx;
+				//make sure the deepest points is always included
+				if (numPoints == MAX_PLANE_CONVEX_POINTS)
+					numPoints--;
+			}
+
+			if (numPoints < MAX_PLANE_CONVEX_POINTS)
+			{
+				b3Vector3 vtxWorld = convexWorldTransform * vtx;
+				b3Vector3 vtxInPlane = planeTransform.inverse() * vtxWorld;
+				float dist = planeNormal.dot(vtxInPlane) - planeConstant;
+				if (dist < 0.f)
+				{
+					vtxWorld.w = dist;
+					contactPoints[numPoints] = vtxWorld;
+					numPoints++;
+				}
+			}
+		}
+
+		int numReducedPoints = 0;
+
+		numReducedPoints = numPoints;
+
+		if (numPoints > 4)
+		{
+			numReducedPoints = extractManifoldSequentialGlobal(contactPoints, numPoints, planeNormalInConvex, &contactIdx);
+		}
+		int dstIdx;
+		//    dstIdx = nGlobalContactsOut++;//AppendInc( nGlobalContactsOut, dstIdx );
+
+		if (numReducedPoints > 0)
+		{
+			if (nGlobalContactsOut < maxContactCapacity)
+			{
+				dstIdx = nGlobalContactsOut;
+				nGlobalContactsOut++;
+
+				b3Contact4* c = &globalContactsOut[dstIdx];
+				c->m_worldNormalOnB = -planeNormalWorld;
+				c->setFrictionCoeff(0.7);
+				c->setRestituitionCoeff(0.f);
+
+				c->m_batchIdx = pairIndex;
+				c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass == 0 ? -bodyIndexA : bodyIndexA;
+				c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass == 0 ? -bodyIndexB : bodyIndexB;
+				for (int i = 0; i < numReducedPoints; i++)
+				{
+					b3Vector3 pOnB1 = contactPoints[contactIdx.s[i]];
+					c->m_worldPosB[i] = pOnB1;
+				}
+				c->m_worldNormalOnB.w = (b3Scalar)numReducedPoints;
+			}  //if (dstIdx < numPairs)
+		}
+	}
+}
+
+void computeContactSphereConvex(int pairIndex,
+								int bodyIndexA, int bodyIndexB,
+								int collidableIndexA, int collidableIndexB,
+								const b3RigidBodyData* rigidBodies,
+								const b3Collidable* collidables,
+								const b3ConvexPolyhedronData* convexShapes,
+								const b3Vector3* convexVertices,
+								const int* convexIndices,
+								const b3GpuFace* faces,
+								b3Contact4* globalContactsOut,
+								int& nGlobalContactsOut,
+								int maxContactCapacity)
+{
+	float radius = collidables[collidableIndexA].m_radius;
+	float4 spherePos1 = rigidBodies[bodyIndexA].m_pos;
+	b3Quaternion sphereOrn = rigidBodies[bodyIndexA].m_quat;
+
+	float4 pos = rigidBodies[bodyIndexB].m_pos;
+
+	b3Quaternion quat = rigidBodies[bodyIndexB].m_quat;
+
+	b3Transform tr;
+	tr.setIdentity();
+	tr.setOrigin(pos);
+	tr.setRotation(quat);
+	b3Transform trInv = tr.inverse();
+
+	float4 spherePos = trInv(spherePos1);
+
+	int collidableIndex = rigidBodies[bodyIndexB].m_collidableIdx;
+	int shapeIndex = collidables[collidableIndex].m_shapeIndex;
+	int numFaces = convexShapes[shapeIndex].m_numFaces;
+	float4 closestPnt = b3MakeVector3(0, 0, 0, 0);
+	//	float4 hitNormalWorld = b3MakeVector3(0, 0, 0, 0);
+	float minDist = -1000000.f;  // TODO: What is the largest/smallest float?
+	bool bCollide = true;
+	int region = -1;
+	float4 localHitNormal;
+	for (int f = 0; f < numFaces; f++)
+	{
+		b3GpuFace face = faces[convexShapes[shapeIndex].m_faceOffset + f];
+		float4 planeEqn;
+		float4 localPlaneNormal = b3MakeVector3(face.m_plane.x, face.m_plane.y, face.m_plane.z, 0.f);
+		float4 n1 = localPlaneNormal;  //quatRotate(quat,localPlaneNormal);
+		planeEqn = n1;
+		planeEqn[3] = face.m_plane.w;
+
+		float4 pntReturn;
+		float dist = signedDistanceFromPointToPlane(spherePos, planeEqn, &pntReturn);
+
+		if (dist > radius)
+		{
+			bCollide = false;
+			break;
+		}
+
+		if (dist > 0)
+		{
+			//might hit an edge or vertex
+			b3Vector3 out;
+
+			bool isInPoly = IsPointInPolygon(spherePos,
+											 &face,
+											 &convexVertices[convexShapes[shapeIndex].m_vertexOffset],
+											 convexIndices,
+											 &out);
+			if (isInPoly)
+			{
+				if (dist > minDist)
+				{
+					minDist = dist;
+					closestPnt = pntReturn;
+					localHitNormal = planeEqn;
+					region = 1;
+				}
+			}
+			else
+			{
+				b3Vector3 tmp = spherePos - out;
+				b3Scalar l2 = tmp.length2();
+				if (l2 < radius * radius)
+				{
+					dist = b3Sqrt(l2);
+					if (dist > minDist)
+					{
+						minDist = dist;
+						closestPnt = out;
+						localHitNormal = tmp / dist;
+						region = 2;
+					}
+				}
+				else
+				{
+					bCollide = false;
+					break;
+				}
+			}
+		}
+		else
+		{
+			if (dist > minDist)
+			{
+				minDist = dist;
+				closestPnt = pntReturn;
+				localHitNormal = planeEqn;
+				region = 3;
+			}
+		}
+	}
+	static int numChecks = 0;
+	numChecks++;
+
+	if (bCollide && minDist > -10000)
+	{
+		float4 normalOnSurfaceB1 = tr.getBasis() * localHitNormal;  //-hitNormalWorld;
+		float4 pOnB1 = tr(closestPnt);
+		//printf("dist ,%f,",minDist);
+		float actualDepth = minDist - radius;
+		if (actualDepth < 0)
+		{
+			//printf("actualDepth = ,%f,", actualDepth);
+			//printf("normalOnSurfaceB1 = ,%f,%f,%f,", normalOnSurfaceB1.x,normalOnSurfaceB1.y,normalOnSurfaceB1.z);
+			//printf("region=,%d,\n", region);
+			pOnB1[3] = actualDepth;
+
+			int dstIdx;
+			//    dstIdx = nGlobalContactsOut++;//AppendInc( nGlobalContactsOut, dstIdx );
+
+			if (nGlobalContactsOut < maxContactCapacity)
+			{
+				dstIdx = nGlobalContactsOut;
+				nGlobalContactsOut++;
+
+				b3Contact4* c = &globalContactsOut[dstIdx];
+				c->m_worldNormalOnB = normalOnSurfaceB1;
+				c->setFrictionCoeff(0.7);
+				c->setRestituitionCoeff(0.f);
+
+				c->m_batchIdx = pairIndex;
+				c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass == 0 ? -bodyIndexA : bodyIndexA;
+				c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass == 0 ? -bodyIndexB : bodyIndexB;
+				c->m_worldPosB[0] = pOnB1;
+				int numPoints = 1;
+				c->m_worldNormalOnB.w = (b3Scalar)numPoints;
+			}  //if (dstIdx < numPairs)
+		}
+	}  //if (hasCollision)
+}
+
+int computeContactConvexConvex2(
+	int pairIndex,
+	int bodyIndexA, int bodyIndexB,
+	int collidableIndexA, int collidableIndexB,
+	const b3AlignedObjectArray<b3RigidBodyData>& rigidBodies,
+	const b3AlignedObjectArray<b3Collidable>& collidables,
+	const b3AlignedObjectArray<b3ConvexPolyhedronData>& convexShapes,
+	const b3AlignedObjectArray<b3Vector3>& convexVertices,
+	const b3AlignedObjectArray<b3Vector3>& uniqueEdges,
+	const b3AlignedObjectArray<int>& convexIndices,
+	const b3AlignedObjectArray<b3GpuFace>& faces,
+	b3AlignedObjectArray<b3Contact4>& globalContactsOut,
+	int& nGlobalContactsOut,
+	int maxContactCapacity,
+	const b3AlignedObjectArray<b3Contact4>& oldContacts)
+{
+	int contactIndex = -1;
+	b3Vector3 posA = rigidBodies[bodyIndexA].m_pos;
+	b3Quaternion ornA = rigidBodies[bodyIndexA].m_quat;
+	b3Vector3 posB = rigidBodies[bodyIndexB].m_pos;
+	b3Quaternion ornB = rigidBodies[bodyIndexB].m_quat;
+
+	b3ConvexPolyhedronData hullA, hullB;
+
+	b3Vector3 sepNormalWorldSpace;
+
+	b3Collidable colA = collidables[collidableIndexA];
+	hullA = convexShapes[colA.m_shapeIndex];
+	//printf("numvertsA = %d\n",hullA.m_numVertices);
+
+	b3Collidable colB = collidables[collidableIndexB];
+	hullB = convexShapes[colB.m_shapeIndex];
+	//printf("numvertsB = %d\n",hullB.m_numVertices);
+
+	//	int contactCapacity = MAX_VERTS;
+	//int numContactsOut=0;
+
+#ifdef _WIN32
+	b3Assert(_finite(rigidBodies[bodyIndexA].m_pos.x));
+	b3Assert(_finite(rigidBodies[bodyIndexB].m_pos.x));
+#endif
+
+	bool foundSepAxis = findSeparatingAxis(hullA, hullB,
+										   posA,
+										   ornA,
+										   posB,
+										   ornB,
+
+										   convexVertices, uniqueEdges, faces, convexIndices,
+										   convexVertices, uniqueEdges, faces, convexIndices,
+
+										   sepNormalWorldSpace);
+
+	if (foundSepAxis)
+	{
+		contactIndex = clipHullHullSingle(
+			bodyIndexA, bodyIndexB,
+			posA, ornA,
+			posB, ornB,
+			collidableIndexA, collidableIndexB,
+			&rigidBodies,
+			&globalContactsOut,
+			nGlobalContactsOut,
+
+			convexShapes,
+			convexShapes,
+
+			convexVertices,
+			uniqueEdges,
+			faces,
+			convexIndices,
+
+			convexVertices,
+			uniqueEdges,
+			faces,
+			convexIndices,
+
+			collidables,
+			collidables,
+			sepNormalWorldSpace,
+			maxContactCapacity);
+	}
+
+	return contactIndex;
+}
+
+void GpuSatCollision::computeConvexConvexContactsGPUSAT(b3OpenCLArray<b3Int4>* pairs, int nPairs,
+														const b3OpenCLArray<b3RigidBodyData>* bodyBuf,
+														b3OpenCLArray<b3Contact4>* contactOut, int& nContacts,
+														const b3OpenCLArray<b3Contact4>* oldContacts,
+														int maxContactCapacity,
+														int compoundPairCapacity,
+														const b3OpenCLArray<b3ConvexPolyhedronData>& convexData,
+														const b3OpenCLArray<b3Vector3>& gpuVertices,
+														const b3OpenCLArray<b3Vector3>& gpuUniqueEdges,
+														const b3OpenCLArray<b3GpuFace>& gpuFaces,
+														const b3OpenCLArray<int>& gpuIndices,
+														const b3OpenCLArray<b3Collidable>& gpuCollidables,
+														const b3OpenCLArray<b3GpuChildShape>& gpuChildShapes,
+
+														const b3OpenCLArray<b3Aabb>& clAabbsWorldSpace,
+														const b3OpenCLArray<b3Aabb>& clAabbsLocalSpace,
+
+														b3OpenCLArray<b3Vector3>& worldVertsB1GPU,
+														b3OpenCLArray<b3Int4>& clippingFacesOutGPU,
+														b3OpenCLArray<b3Vector3>& worldNormalsAGPU,
+														b3OpenCLArray<b3Vector3>& worldVertsA1GPU,
+														b3OpenCLArray<b3Vector3>& worldVertsB2GPU,
+														b3AlignedObjectArray<class b3OptimizedBvh*>& bvhDataUnused,
+														b3OpenCLArray<b3QuantizedBvhNode>* treeNodesGPU,
+														b3OpenCLArray<b3BvhSubtreeInfo>* subTreesGPU,
+														b3OpenCLArray<b3BvhInfo>* bvhInfo,
+
+														int numObjects,
+														int maxTriConvexPairCapacity,
+														b3OpenCLArray<b3Int4>& triangleConvexPairsOut,
+														int& numTriConvexPairsOut)
+{
+	myframecount++;
+
+	if (!nPairs)
+		return;
+
+#ifdef CHECK_ON_HOST
+
+	b3AlignedObjectArray<b3QuantizedBvhNode> treeNodesCPU;
+	treeNodesGPU->copyToHost(treeNodesCPU);
+
+	b3AlignedObjectArray<b3BvhSubtreeInfo> subTreesCPU;
+	subTreesGPU->copyToHost(subTreesCPU);
+
+	b3AlignedObjectArray<b3BvhInfo> bvhInfoCPU;
+	bvhInfo->copyToHost(bvhInfoCPU);
+
+	b3AlignedObjectArray<b3Aabb> hostAabbsWorldSpace;
+	clAabbsWorldSpace.copyToHost(hostAabbsWorldSpace);
+
+	b3AlignedObjectArray<b3Aabb> hostAabbsLocalSpace;
+	clAabbsLocalSpace.copyToHost(hostAabbsLocalSpace);
+
+	b3AlignedObjectArray<b3Int4> hostPairs;
+	pairs->copyToHost(hostPairs);
+
+	b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+	bodyBuf->copyToHost(hostBodyBuf);
+
+	b3AlignedObjectArray<b3ConvexPolyhedronData> hostConvexData;
+	convexData.copyToHost(hostConvexData);
+
+	b3AlignedObjectArray<b3Vector3> hostVertices;
+	gpuVertices.copyToHost(hostVertices);
+
+	b3AlignedObjectArray<b3Vector3> hostUniqueEdges;
+	gpuUniqueEdges.copyToHost(hostUniqueEdges);
+	b3AlignedObjectArray<b3GpuFace> hostFaces;
+	gpuFaces.copyToHost(hostFaces);
+	b3AlignedObjectArray<int> hostIndices;
+	gpuIndices.copyToHost(hostIndices);
+	b3AlignedObjectArray<b3Collidable> hostCollidables;
+	gpuCollidables.copyToHost(hostCollidables);
+
+	b3AlignedObjectArray<b3GpuChildShape> cpuChildShapes;
+	gpuChildShapes.copyToHost(cpuChildShapes);
+
+	b3AlignedObjectArray<b3Int4> hostTriangleConvexPairs;
+
+	b3AlignedObjectArray<b3Contact4> hostContacts;
+	if (nContacts)
+	{
+		contactOut->copyToHost(hostContacts);
+	}
+
+	b3AlignedObjectArray<b3Contact4> oldHostContacts;
+
+	if (oldContacts->size())
+	{
+		oldContacts->copyToHost(oldHostContacts);
+	}
+
+	hostContacts.resize(maxContactCapacity);
+
+	for (int i = 0; i < nPairs; i++)
+	{
+		int bodyIndexA = hostPairs[i].x;
+		int bodyIndexB = hostPairs[i].y;
+		int collidableIndexA = hostBodyBuf[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = hostBodyBuf[bodyIndexB].m_collidableIdx;
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+			computeContactSphereConvex(i, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, &hostBodyBuf[0],
+									   &hostCollidables[0], &hostConvexData[0], &hostVertices[0], &hostIndices[0], &hostFaces[0], &hostContacts[0], nContacts, maxContactCapacity);
+		}
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)
+		{
+			computeContactSphereConvex(i, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, &hostBodyBuf[0],
+									   &hostCollidables[0], &hostConvexData[0], &hostVertices[0], &hostIndices[0], &hostFaces[0], &hostContacts[0], nContacts, maxContactCapacity);
+			//printf("convex-sphere\n");
+		}
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_PLANE)
+		{
+			computeContactPlaneConvex(i, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, &hostBodyBuf[0],
+									  &hostCollidables[0], &hostConvexData[0], &hostVertices[0], &hostIndices[0], &hostFaces[0], &hostContacts[0], nContacts, maxContactCapacity);
+			//			printf("convex-plane\n");
+		}
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_PLANE &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+			computeContactPlaneConvex(i, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, &hostBodyBuf[0],
+									  &hostCollidables[0], &hostConvexData[0], &hostVertices[0], &hostIndices[0], &hostFaces[0], &hostContacts[0], nContacts, maxContactCapacity);
+			//			printf("plane-convex\n");
+		}
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			computeContactCompoundCompound(i, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, &hostBodyBuf[0],
+										   &hostCollidables[0], &hostConvexData[0], &cpuChildShapes[0], hostAabbsWorldSpace, hostAabbsLocalSpace, hostVertices, hostUniqueEdges, hostIndices, hostFaces, &hostContacts[0],
+										   nContacts, maxContactCapacity, treeNodesCPU, subTreesCPU, bvhInfoCPU);
+			//			printf("convex-plane\n");
+		}
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_PLANE)
+		{
+			computeContactPlaneCompound(i, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, &hostBodyBuf[0],
+										&hostCollidables[0], &hostConvexData[0], &cpuChildShapes[0], &hostVertices[0], &hostIndices[0], &hostFaces[0], &hostContacts[0], nContacts, maxContactCapacity);
+			//			printf("convex-plane\n");
+		}
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_PLANE &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			computeContactPlaneCompound(i, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, &hostBodyBuf[0],
+										&hostCollidables[0], &hostConvexData[0], &cpuChildShapes[0], &hostVertices[0], &hostIndices[0], &hostFaces[0], &hostContacts[0], nContacts, maxContactCapacity);
+			//			printf("plane-convex\n");
+		}
+
+		if (hostCollidables[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			hostCollidables[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+			//printf("hostPairs[i].z=%d\n",hostPairs[i].z);
+			int contactIndex = computeContactConvexConvex2(i, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, hostBodyBuf, hostCollidables, hostConvexData, hostVertices, hostUniqueEdges, hostIndices, hostFaces, hostContacts, nContacts, maxContactCapacity, oldHostContacts);
+			//int contactIndex = computeContactConvexConvex(hostPairs,i,bodyIndexA,bodyIndexB,collidableIndexA,collidableIndexB,hostBodyBuf,hostCollidables,hostConvexData,hostVertices,hostUniqueEdges,hostIndices,hostFaces,hostContacts,nContacts,maxContactCapacity,oldHostContacts);
+
+			if (contactIndex >= 0)
+			{
+				//				printf("convex convex contactIndex = %d\n",contactIndex);
+				hostPairs[i].z = contactIndex;
+			}
+			//			printf("plane-convex\n");
+		}
+	}
+
+	if (hostPairs.size())
+	{
+		pairs->copyFromHost(hostPairs);
+	}
+
+	hostContacts.resize(nContacts);
+	if (nContacts)
+	{
+		contactOut->copyFromHost(hostContacts);
+	}
+	else
+	{
+		contactOut->resize(0);
+	}
+
+	m_totalContactsOut.copyFromHostPointer(&nContacts, 1, 0, true);
+	//printf("(HOST) nContacts = %d\n",nContacts);
+
+#else
+
+	{
+		if (nPairs)
+		{
+			m_totalContactsOut.copyFromHostPointer(&nContacts, 1, 0, true);
+
+			B3_PROFILE("primitiveContactsKernel");
+			b3BufferInfoCL bInfo[] = {
+				b3BufferInfoCL(pairs->getBufferCL(), true),
+				b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+				b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+				b3BufferInfoCL(convexData.getBufferCL(), true),
+				b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+				b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+				b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+				b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+				b3BufferInfoCL(contactOut->getBufferCL()),
+				b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_primitiveContactsKernel, "m_primitiveContactsKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(nPairs);
+			launcher.setConst(maxContactCapacity);
+			int num = nPairs;
+			launcher.launch1D(num);
+			clFinish(m_queue);
+
+			nContacts = m_totalContactsOut.at(0);
+			contactOut->resize(nContacts);
+		}
+	}
+
+#endif  //CHECK_ON_HOST
+
+	B3_PROFILE("computeConvexConvexContactsGPUSAT");
+	// printf("nContacts = %d\n",nContacts);
+
+	m_sepNormals.resize(nPairs);
+	m_hasSeparatingNormals.resize(nPairs);
+
+	int concaveCapacity = maxTriConvexPairCapacity;
+	m_concaveSepNormals.resize(concaveCapacity);
+	m_concaveHasSeparatingNormals.resize(concaveCapacity);
+	m_numConcavePairsOut.resize(0);
+	m_numConcavePairsOut.push_back(0);
+
+	m_gpuCompoundPairs.resize(compoundPairCapacity);
+
+	m_gpuCompoundSepNormals.resize(compoundPairCapacity);
+
+	m_gpuHasCompoundSepNormals.resize(compoundPairCapacity);
+
+	m_numCompoundPairsOut.resize(0);
+	m_numCompoundPairsOut.push_back(0);
+
+	int numCompoundPairs = 0;
+
+	int numConcavePairs = 0;
+
+	{
+		clFinish(m_queue);
+		if (findSeparatingAxisOnGpu)
+		{
+			m_dmins.resize(nPairs);
+			if (splitSearchSepAxisConvex)
+			{
+				if (useMprGpu)
+				{
+					nContacts = m_totalContactsOut.at(0);
+					{
+						B3_PROFILE("mprPenetrationKernel");
+						b3BufferInfoCL bInfo[] = {
+							b3BufferInfoCL(pairs->getBufferCL(), true),
+							b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+							b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+							b3BufferInfoCL(convexData.getBufferCL(), true),
+							b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+							b3BufferInfoCL(m_sepNormals.getBufferCL()),
+							b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+							b3BufferInfoCL(contactOut->getBufferCL()),
+							b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+
+						b3LauncherCL launcher(m_queue, m_mprPenetrationKernel, "mprPenetrationKernel");
+						launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+
+						launcher.setConst(maxContactCapacity);
+						launcher.setConst(nPairs);
+
+						int num = nPairs;
+						launcher.launch1D(num);
+						clFinish(m_queue);
+						/*
+						b3AlignedObjectArray<int>hostHasSepAxis;
+						m_hasSeparatingNormals.copyToHost(hostHasSepAxis);
+						b3AlignedObjectArray<b3Vector3>hostSepAxis;
+						m_sepNormals.copyToHost(hostSepAxis);
+						*/
+						nContacts = m_totalContactsOut.at(0);
+						contactOut->resize(nContacts);
+						//	printf("nContacts (after mprPenetrationKernel) = %d\n",nContacts);
+						if (nContacts > maxContactCapacity)
+						{
+							b3Error("Error: contacts exceeds capacity (%d/%d)\n", nContacts, maxContactCapacity);
+							nContacts = maxContactCapacity;
+						}
+					}
+				}
+
+				if (1)
+				{
+					if (1)
+					{
+						{
+							B3_PROFILE("findSeparatingAxisVertexFaceKernel");
+							b3BufferInfoCL bInfo[] = {
+								b3BufferInfoCL(pairs->getBufferCL(), true),
+								b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+								b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+								b3BufferInfoCL(convexData.getBufferCL(), true),
+								b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+								b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+								b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+								b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+								b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+								b3BufferInfoCL(m_sepNormals.getBufferCL()),
+								b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+								b3BufferInfoCL(m_dmins.getBufferCL())};
+
+							b3LauncherCL launcher(m_queue, m_findSeparatingAxisVertexFaceKernel, "findSeparatingAxisVertexFaceKernel");
+							launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+							launcher.setConst(nPairs);
+
+							int num = nPairs;
+							launcher.launch1D(num);
+							clFinish(m_queue);
+						}
+
+						int numDirections = sizeof(unitSphere162) / sizeof(b3Vector3);
+
+						{
+							B3_PROFILE("findSeparatingAxisEdgeEdgeKernel");
+							b3BufferInfoCL bInfo[] = {
+								b3BufferInfoCL(pairs->getBufferCL(), true),
+								b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+								b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+								b3BufferInfoCL(convexData.getBufferCL(), true),
+								b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+								b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+								b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+								b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+								b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+								b3BufferInfoCL(m_sepNormals.getBufferCL()),
+								b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+								b3BufferInfoCL(m_dmins.getBufferCL()),
+								b3BufferInfoCL(m_unitSphereDirections.getBufferCL(), true)
+
+							};
+
+							b3LauncherCL launcher(m_queue, m_findSeparatingAxisEdgeEdgeKernel, "findSeparatingAxisEdgeEdgeKernel");
+							launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+							launcher.setConst(numDirections);
+							launcher.setConst(nPairs);
+							int num = nPairs;
+							launcher.launch1D(num);
+							clFinish(m_queue);
+						}
+					}
+					if (useMprGpu)
+					{
+						B3_PROFILE("findSeparatingAxisUnitSphereKernel");
+						b3BufferInfoCL bInfo[] = {
+							b3BufferInfoCL(pairs->getBufferCL(), true),
+							b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+							b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+							b3BufferInfoCL(convexData.getBufferCL(), true),
+							b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+							b3BufferInfoCL(m_unitSphereDirections.getBufferCL(), true),
+							b3BufferInfoCL(m_sepNormals.getBufferCL()),
+							b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+							b3BufferInfoCL(m_dmins.getBufferCL())};
+
+						b3LauncherCL launcher(m_queue, m_findSeparatingAxisUnitSphereKernel, "findSeparatingAxisUnitSphereKernel");
+						launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+						int numDirections = sizeof(unitSphere162) / sizeof(b3Vector3);
+						launcher.setConst(numDirections);
+
+						launcher.setConst(nPairs);
+
+						int num = nPairs;
+						launcher.launch1D(num);
+						clFinish(m_queue);
+					}
+				}
+			}
+			else
+			{
+				B3_PROFILE("findSeparatingAxisKernel");
+				b3BufferInfoCL bInfo[] = {
+					b3BufferInfoCL(pairs->getBufferCL(), true),
+					b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+					b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+					b3BufferInfoCL(convexData.getBufferCL(), true),
+					b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+					b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+					b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+					b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+					b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+					b3BufferInfoCL(m_sepNormals.getBufferCL()),
+					b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL())};
+
+				b3LauncherCL launcher(m_queue, m_findSeparatingAxisKernel, "m_findSeparatingAxisKernel");
+				launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+				launcher.setConst(nPairs);
+
+				int num = nPairs;
+				launcher.launch1D(num);
+				clFinish(m_queue);
+			}
+		}
+		else
+		{
+			B3_PROFILE("findSeparatingAxisKernel CPU");
+
+			b3AlignedObjectArray<b3Int4> hostPairs;
+			pairs->copyToHost(hostPairs);
+			b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+			bodyBuf->copyToHost(hostBodyBuf);
+
+			b3AlignedObjectArray<b3Collidable> hostCollidables;
+			gpuCollidables.copyToHost(hostCollidables);
+
+			b3AlignedObjectArray<b3GpuChildShape> cpuChildShapes;
+			gpuChildShapes.copyToHost(cpuChildShapes);
+
+			b3AlignedObjectArray<b3ConvexPolyhedronData> hostConvexShapeData;
+			convexData.copyToHost(hostConvexShapeData);
+
+			b3AlignedObjectArray<b3Vector3> hostVertices;
+			gpuVertices.copyToHost(hostVertices);
+
+			b3AlignedObjectArray<int> hostHasSepAxis;
+			hostHasSepAxis.resize(nPairs);
+			b3AlignedObjectArray<b3Vector3> hostSepAxis;
+			hostSepAxis.resize(nPairs);
+
+			b3AlignedObjectArray<b3Vector3> hostUniqueEdges;
+			gpuUniqueEdges.copyToHost(hostUniqueEdges);
+			b3AlignedObjectArray<b3GpuFace> hostFaces;
+			gpuFaces.copyToHost(hostFaces);
+
+			b3AlignedObjectArray<int> hostIndices;
+			gpuIndices.copyToHost(hostIndices);
+
+			b3AlignedObjectArray<b3Contact4> hostContacts;
+			if (nContacts)
+			{
+				contactOut->copyToHost(hostContacts);
+			}
+			hostContacts.resize(maxContactCapacity);
+			int nGlobalContactsOut = nContacts;
+
+			for (int i = 0; i < nPairs; i++)
+			{
+				int bodyIndexA = hostPairs[i].x;
+				int bodyIndexB = hostPairs[i].y;
+				int collidableIndexA = hostBodyBuf[bodyIndexA].m_collidableIdx;
+				int collidableIndexB = hostBodyBuf[bodyIndexB].m_collidableIdx;
+
+				int shapeIndexA = hostCollidables[collidableIndexA].m_shapeIndex;
+				int shapeIndexB = hostCollidables[collidableIndexB].m_shapeIndex;
+
+				hostHasSepAxis[i] = 0;
+
+				//once the broadphase avoids static-static pairs, we can remove this test
+				if ((hostBodyBuf[bodyIndexA].m_invMass == 0) && (hostBodyBuf[bodyIndexB].m_invMass == 0))
+				{
+					continue;
+				}
+
+				if ((hostCollidables[collidableIndexA].m_shapeType != SHAPE_CONVEX_HULL) || (hostCollidables[collidableIndexB].m_shapeType != SHAPE_CONVEX_HULL))
+				{
+					continue;
+				}
+
+				float dmin = FLT_MAX;
+
+				b3ConvexPolyhedronData* convexShapeA = &hostConvexShapeData[shapeIndexA];
+				b3ConvexPolyhedronData* convexShapeB = &hostConvexShapeData[shapeIndexB];
+				b3Vector3 posA = hostBodyBuf[bodyIndexA].m_pos;
+				b3Vector3 posB = hostBodyBuf[bodyIndexB].m_pos;
+				b3Quaternion ornA = hostBodyBuf[bodyIndexA].m_quat;
+				b3Quaternion ornB = hostBodyBuf[bodyIndexB].m_quat;
+
+				if (useGjk)
+				{
+					//first approximate the separating axis, to 'fail-proof' GJK+EPA or MPR
+					{
+						b3Vector3 c0local = hostConvexShapeData[shapeIndexA].m_localCenter;
+						b3Vector3 c0 = b3TransformPoint(c0local, posA, ornA);
+						b3Vector3 c1local = hostConvexShapeData[shapeIndexB].m_localCenter;
+						b3Vector3 c1 = b3TransformPoint(c1local, posB, ornB);
+						b3Vector3 DeltaC2 = c0 - c1;
+
+						b3Vector3 sepAxis;
+
+						bool hasSepAxisA = b3FindSeparatingAxis(convexShapeA, convexShapeB, posA, ornA, posB, ornB, DeltaC2,
+																&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																&sepAxis, &dmin);
+
+						if (hasSepAxisA)
+						{
+							bool hasSepAxisB = b3FindSeparatingAxis(convexShapeB, convexShapeA, posB, ornB, posA, ornA, DeltaC2,
+																	&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																	&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																	&sepAxis, &dmin);
+							if (hasSepAxisB)
+							{
+								bool hasEdgeEdge = b3FindSeparatingAxisEdgeEdge(convexShapeA, convexShapeB, posA, ornA, posB, ornB, DeltaC2,
+																				&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																				&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																				&sepAxis, &dmin, false);
+
+								if (hasEdgeEdge)
+								{
+									hostHasSepAxis[i] = 1;
+									hostSepAxis[i] = sepAxis;
+									hostSepAxis[i].w = dmin;
+								}
+							}
+						}
+					}
+
+					if (hostHasSepAxis[i])
+					{
+						int pairIndex = i;
+
+						bool useMpr = true;
+						if (useMpr)
+						{
+							int res = 0;
+							float depth = 0.f;
+							b3Vector3 sepAxis2 = b3MakeVector3(1, 0, 0);
+							b3Vector3 resultPointOnBWorld = b3MakeVector3(0, 0, 0);
+
+							float depthOut;
+							b3Vector3 dirOut;
+							b3Vector3 posOut;
+
+							//res = b3MprPenetration(bodyIndexA,bodyIndexB,hostBodyBuf,hostConvexShapeData,hostCollidables,hostVertices,&mprConfig,&depthOut,&dirOut,&posOut);
+							res = b3MprPenetration(pairIndex, bodyIndexA, bodyIndexB, &hostBodyBuf[0], &hostConvexShapeData[0], &hostCollidables[0], &hostVertices[0], &hostSepAxis[0], &hostHasSepAxis[0], &depthOut, &dirOut, &posOut);
+							depth = depthOut;
+							sepAxis2 = b3MakeVector3(-dirOut.x, -dirOut.y, -dirOut.z);
+							resultPointOnBWorld = posOut;
+							//hostHasSepAxis[i] = 0;
+
+							if (res == 0)
+							{
+								//add point?
+								//printf("depth = %f\n",depth);
+								//printf("normal = %f,%f,%f\n",dir.v[0],dir.v[1],dir.v[2]);
+								//qprintf("pos = %f,%f,%f\n",pos.v[0],pos.v[1],pos.v[2]);
+
+								float dist = 0.f;
+
+								const b3ConvexPolyhedronData& hullA = hostConvexShapeData[hostCollidables[hostBodyBuf[bodyIndexA].m_collidableIdx].m_shapeIndex];
+								const b3ConvexPolyhedronData& hullB = hostConvexShapeData[hostCollidables[hostBodyBuf[bodyIndexB].m_collidableIdx].m_shapeIndex];
+
+								if (b3TestSepAxis(&hullA, &hullB, posA, ornA, posB, ornB, &sepAxis2, &hostVertices[0], &hostVertices[0], &dist))
+								{
+									if (depth > dist)
+									{
+										float diff = depth - dist;
+
+										static float maxdiff = 0.f;
+										if (maxdiff < diff)
+										{
+											maxdiff = diff;
+											printf("maxdiff = %20.10f\n", maxdiff);
+										}
+									}
+								}
+								if (depth > dmin)
+								{
+									b3Vector3 oldAxis = hostSepAxis[i];
+									depth = dmin;
+									sepAxis2 = oldAxis;
+								}
+
+								if (b3TestSepAxis(&hullA, &hullB, posA, ornA, posB, ornB, &sepAxis2, &hostVertices[0], &hostVertices[0], &dist))
+								{
+									if (depth > dist)
+									{
+										float diff = depth - dist;
+										//printf("?diff  = %f\n",diff );
+										static float maxdiff = 0.f;
+										if (maxdiff < diff)
+										{
+											maxdiff = diff;
+											printf("maxdiff = %20.10f\n", maxdiff);
+										}
+									}
+									//this is used for SAT
+									//hostHasSepAxis[i] = 1;
+									//hostSepAxis[i] = sepAxis2;
+
+									//add contact point
+
+									//int contactIndex = nGlobalContactsOut;
+									b3Contact4& newContact = hostContacts.at(nGlobalContactsOut);
+									nGlobalContactsOut++;
+									newContact.m_batchIdx = 0;  //i;
+									newContact.m_bodyAPtrAndSignBit = (hostBodyBuf.at(bodyIndexA).m_invMass == 0) ? -bodyIndexA : bodyIndexA;
+									newContact.m_bodyBPtrAndSignBit = (hostBodyBuf.at(bodyIndexB).m_invMass == 0) ? -bodyIndexB : bodyIndexB;
+
+									newContact.m_frictionCoeffCmp = 45874;
+									newContact.m_restituitionCoeffCmp = 0;
+
+									static float maxDepth = 0.f;
+
+									if (depth > maxDepth)
+									{
+										maxDepth = depth;
+										printf("MPR maxdepth = %f\n", maxDepth);
+									}
+
+									resultPointOnBWorld.w = -depth;
+									newContact.m_worldPosB[0] = resultPointOnBWorld;
+									//b3Vector3 resultPointOnAWorld = resultPointOnBWorld+depth*sepAxis2;
+									newContact.m_worldNormalOnB = sepAxis2;
+									newContact.m_worldNormalOnB.w = (b3Scalar)1;
+								}
+								else
+								{
+									printf("rejected\n");
+								}
+							}
+						}
+						else
+						{
+							//int contactIndex = computeContactConvexConvex2(           i,bodyIndexA,bodyIndexB,collidableIndexA,collidableIndexB,hostBodyBuf, hostCollidables,hostConvexData,hostVertices,hostUniqueEdges,hostIndices,hostFaces,hostContacts,nContacts,maxContactCapacity,oldHostContacts);
+							b3AlignedObjectArray<b3Contact4> oldHostContacts;
+							int result;
+							result = computeContactConvexConvex2(  //hostPairs,
+								pairIndex,
+								bodyIndexA, bodyIndexB,
+								collidableIndexA, collidableIndexB,
+								hostBodyBuf,
+								hostCollidables,
+								hostConvexShapeData,
+								hostVertices,
+								hostUniqueEdges,
+								hostIndices,
+								hostFaces,
+								hostContacts,
+								nGlobalContactsOut,
+								maxContactCapacity,
+								oldHostContacts
+								//hostHasSepAxis,
+								//hostSepAxis
+
+							);
+						}  //mpr
+					}      //hostHasSepAxis[i] = 1;
+				}
+				else
+				{
+					b3Vector3 c0local = hostConvexShapeData[shapeIndexA].m_localCenter;
+					b3Vector3 c0 = b3TransformPoint(c0local, posA, ornA);
+					b3Vector3 c1local = hostConvexShapeData[shapeIndexB].m_localCenter;
+					b3Vector3 c1 = b3TransformPoint(c1local, posB, ornB);
+					b3Vector3 DeltaC2 = c0 - c1;
+
+					b3Vector3 sepAxis;
+
+					bool hasSepAxisA = b3FindSeparatingAxis(convexShapeA, convexShapeB, posA, ornA, posB, ornB, DeltaC2,
+															&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+															&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+															&sepAxis, &dmin);
+
+					if (hasSepAxisA)
+					{
+						bool hasSepAxisB = b3FindSeparatingAxis(convexShapeB, convexShapeA, posB, ornB, posA, ornA, DeltaC2,
+																&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																&sepAxis, &dmin);
+						if (hasSepAxisB)
+						{
+							bool hasEdgeEdge = b3FindSeparatingAxisEdgeEdge(convexShapeA, convexShapeB, posA, ornA, posB, ornB, DeltaC2,
+																			&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																			&hostVertices.at(0), &hostUniqueEdges.at(0), &hostFaces.at(0), &hostIndices.at(0),
+																			&sepAxis, &dmin, true);
+
+							if (hasEdgeEdge)
+							{
+								hostHasSepAxis[i] = 1;
+								hostSepAxis[i] = sepAxis;
+							}
+						}
+					}
+				}
+			}
+
+			if (useGjkContacts)  //nGlobalContactsOut>0)
+			{
+				//printf("nGlobalContactsOut=%d\n",nGlobalContactsOut);
+				nContacts = nGlobalContactsOut;
+				contactOut->copyFromHost(hostContacts);
+
+				m_totalContactsOut.copyFromHostPointer(&nContacts, 1, 0, true);
+			}
+
+			m_hasSeparatingNormals.copyFromHost(hostHasSepAxis);
+			m_sepNormals.copyFromHost(hostSepAxis);
+
+			/*
+             //double-check results from GPU (comment-out the 'else' so both paths are executed
+            b3AlignedObjectArray<int> checkHasSepAxis;
+            m_hasSeparatingNormals.copyToHost(checkHasSepAxis);
+            static int frameCount = 0;
+            frameCount++;
+            for (int i=0;i<nPairs;i++)
+            {
+                if (hostHasSepAxis[i] != checkHasSepAxis[i])
+                {
+                    printf("at frameCount %d hostHasSepAxis[%d] = %d but checkHasSepAxis[i] = %d\n",
+                           frameCount,i,hostHasSepAxis[i],checkHasSepAxis[i]);
+                }
+            }
+            //m_hasSeparatingNormals.copyFromHost(hostHasSepAxis);
+            //    m_sepNormals.copyFromHost(hostSepAxis);
+            */
+		}
+
+		numCompoundPairs = m_numCompoundPairsOut.at(0);
+		bool useGpuFindCompoundPairs = true;
+		if (useGpuFindCompoundPairs)
+		{
+			B3_PROFILE("findCompoundPairsKernel");
+			b3BufferInfoCL bInfo[] =
+				{
+					b3BufferInfoCL(pairs->getBufferCL(), true),
+					b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+					b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+					b3BufferInfoCL(convexData.getBufferCL(), true),
+					b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+					b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+					b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+					b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+					b3BufferInfoCL(clAabbsLocalSpace.getBufferCL(), true),
+					b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+					b3BufferInfoCL(m_gpuCompoundPairs.getBufferCL()),
+					b3BufferInfoCL(m_numCompoundPairsOut.getBufferCL()),
+					b3BufferInfoCL(subTreesGPU->getBufferCL()),
+					b3BufferInfoCL(treeNodesGPU->getBufferCL()),
+					b3BufferInfoCL(bvhInfo->getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_findCompoundPairsKernel, "m_findCompoundPairsKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(nPairs);
+			launcher.setConst(compoundPairCapacity);
+
+			int num = nPairs;
+			launcher.launch1D(num);
+			clFinish(m_queue);
+
+			numCompoundPairs = m_numCompoundPairsOut.at(0);
+			//printf("numCompoundPairs =%d\n",numCompoundPairs );
+			if (numCompoundPairs)
+			{
+				//printf("numCompoundPairs=%d\n",numCompoundPairs);
+			}
+		}
+		else
+		{
+			b3AlignedObjectArray<b3QuantizedBvhNode> treeNodesCPU;
+			treeNodesGPU->copyToHost(treeNodesCPU);
+
+			b3AlignedObjectArray<b3BvhSubtreeInfo> subTreesCPU;
+			subTreesGPU->copyToHost(subTreesCPU);
+
+			b3AlignedObjectArray<b3BvhInfo> bvhInfoCPU;
+			bvhInfo->copyToHost(bvhInfoCPU);
+
+			b3AlignedObjectArray<b3Aabb> hostAabbsWorldSpace;
+			clAabbsWorldSpace.copyToHost(hostAabbsWorldSpace);
+
+			b3AlignedObjectArray<b3Aabb> hostAabbsLocalSpace;
+			clAabbsLocalSpace.copyToHost(hostAabbsLocalSpace);
+
+			b3AlignedObjectArray<b3Int4> hostPairs;
+			pairs->copyToHost(hostPairs);
+
+			b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+			bodyBuf->copyToHost(hostBodyBuf);
+
+			b3AlignedObjectArray<b3Int4> cpuCompoundPairsOut;
+			cpuCompoundPairsOut.resize(compoundPairCapacity);
+
+			b3AlignedObjectArray<b3Collidable> hostCollidables;
+			gpuCollidables.copyToHost(hostCollidables);
+
+			b3AlignedObjectArray<b3GpuChildShape> cpuChildShapes;
+			gpuChildShapes.copyToHost(cpuChildShapes);
+
+			b3AlignedObjectArray<b3ConvexPolyhedronData> hostConvexData;
+			convexData.copyToHost(hostConvexData);
+
+			b3AlignedObjectArray<b3Vector3> hostVertices;
+			gpuVertices.copyToHost(hostVertices);
+
+			for (int pairIndex = 0; pairIndex < nPairs; pairIndex++)
+			{
+				int bodyIndexA = hostPairs[pairIndex].x;
+				int bodyIndexB = hostPairs[pairIndex].y;
+				int collidableIndexA = hostBodyBuf[bodyIndexA].m_collidableIdx;
+				int collidableIndexB = hostBodyBuf[bodyIndexB].m_collidableIdx;
+				if (cpuChildShapes.size())
+				{
+					findCompoundPairsKernel(
+						pairIndex,
+						bodyIndexA,
+						bodyIndexB,
+						collidableIndexA,
+						collidableIndexB,
+						&hostBodyBuf[0],
+						&hostCollidables[0],
+						&hostConvexData[0],
+						hostVertices,
+						hostAabbsWorldSpace,
+						hostAabbsLocalSpace,
+						&cpuChildShapes[0],
+						&cpuCompoundPairsOut[0],
+						&numCompoundPairs,
+						compoundPairCapacity,
+						treeNodesCPU,
+						subTreesCPU,
+						bvhInfoCPU);
+				}
+			}
+
+			m_numCompoundPairsOut.copyFromHostPointer(&numCompoundPairs, 1, 0, true);
+			if (numCompoundPairs)
+			{
+				b3CompoundOverlappingPair* ptr = (b3CompoundOverlappingPair*)&cpuCompoundPairsOut[0];
+				m_gpuCompoundPairs.copyFromHostPointer(ptr, numCompoundPairs, 0, true);
+			}
+			//cpuCompoundPairsOut
+		}
+		if (numCompoundPairs)
+		{
+			printf("numCompoundPairs=%d\n", numCompoundPairs);
+		}
+
+		if (numCompoundPairs > compoundPairCapacity)
+		{
+			b3Error("Exceeded compound pair capacity (%d/%d)\n", numCompoundPairs, compoundPairCapacity);
+			numCompoundPairs = compoundPairCapacity;
+		}
+
+		m_gpuCompoundPairs.resize(numCompoundPairs);
+		m_gpuHasCompoundSepNormals.resize(numCompoundPairs);
+		m_gpuCompoundSepNormals.resize(numCompoundPairs);
+
+		if (numCompoundPairs)
+		{
+			B3_PROFILE("processCompoundPairsPrimitivesKernel");
+			b3BufferInfoCL bInfo[] =
+				{
+					b3BufferInfoCL(m_gpuCompoundPairs.getBufferCL(), true),
+					b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+					b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+					b3BufferInfoCL(convexData.getBufferCL(), true),
+					b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+					b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+					b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+					b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+					b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+					b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+					b3BufferInfoCL(contactOut->getBufferCL()),
+					b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_processCompoundPairsPrimitivesKernel, "m_processCompoundPairsPrimitivesKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numCompoundPairs);
+			launcher.setConst(maxContactCapacity);
+
+			int num = numCompoundPairs;
+			launcher.launch1D(num);
+			clFinish(m_queue);
+			nContacts = m_totalContactsOut.at(0);
+			//printf("nContacts (after processCompoundPairsPrimitivesKernel) = %d\n",nContacts);
+			if (nContacts > maxContactCapacity)
+			{
+				b3Error("Error: contacts exceeds capacity (%d/%d)\n", nContacts, maxContactCapacity);
+				nContacts = maxContactCapacity;
+			}
+		}
+
+		if (numCompoundPairs)
+		{
+			B3_PROFILE("processCompoundPairsKernel");
+			b3BufferInfoCL bInfo[] =
+				{
+					b3BufferInfoCL(m_gpuCompoundPairs.getBufferCL(), true),
+					b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+					b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+					b3BufferInfoCL(convexData.getBufferCL(), true),
+					b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+					b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+					b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+					b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+					b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+					b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+					b3BufferInfoCL(m_gpuCompoundSepNormals.getBufferCL()),
+					b3BufferInfoCL(m_gpuHasCompoundSepNormals.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_processCompoundPairsKernel, "m_processCompoundPairsKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numCompoundPairs);
+
+			int num = numCompoundPairs;
+			launcher.launch1D(num);
+			clFinish(m_queue);
+		}
+
+		//printf("numConcave  = %d\n",numConcave);
+
+		//		printf("hostNormals.size()=%d\n",hostNormals.size());
+		//int numPairs = pairCount.at(0);
+	}
+	int vertexFaceCapacity = 64;
+
+	{
+		//now perform the tree query on GPU
+
+		if (treeNodesGPU->size() && treeNodesGPU->size())
+		{
+			if (bvhTraversalKernelGPU)
+			{
+				B3_PROFILE("m_bvhTraversalKernel");
+
+				numConcavePairs = m_numConcavePairsOut.at(0);
+
+				b3LauncherCL launcher(m_queue, m_bvhTraversalKernel, "m_bvhTraversalKernel");
+				launcher.setBuffer(pairs->getBufferCL());
+				launcher.setBuffer(bodyBuf->getBufferCL());
+				launcher.setBuffer(gpuCollidables.getBufferCL());
+				launcher.setBuffer(clAabbsWorldSpace.getBufferCL());
+				launcher.setBuffer(triangleConvexPairsOut.getBufferCL());
+				launcher.setBuffer(m_numConcavePairsOut.getBufferCL());
+				launcher.setBuffer(subTreesGPU->getBufferCL());
+				launcher.setBuffer(treeNodesGPU->getBufferCL());
+				launcher.setBuffer(bvhInfo->getBufferCL());
+
+				launcher.setConst(nPairs);
+				launcher.setConst(maxTriConvexPairCapacity);
+				int num = nPairs;
+				launcher.launch1D(num);
+				clFinish(m_queue);
+				numConcavePairs = m_numConcavePairsOut.at(0);
+			}
+			else
+			{
+				b3AlignedObjectArray<b3Int4> hostPairs;
+				pairs->copyToHost(hostPairs);
+				b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+				bodyBuf->copyToHost(hostBodyBuf);
+				b3AlignedObjectArray<b3Collidable> hostCollidables;
+				gpuCollidables.copyToHost(hostCollidables);
+				b3AlignedObjectArray<b3Aabb> hostAabbsWorldSpace;
+				clAabbsWorldSpace.copyToHost(hostAabbsWorldSpace);
+
+				//int maxTriConvexPairCapacity,
+				b3AlignedObjectArray<b3Int4> triangleConvexPairsOutHost;
+				triangleConvexPairsOutHost.resize(maxTriConvexPairCapacity);
+
+				//int numTriConvexPairsOutHost=0;
+				numConcavePairs = 0;
+				//m_numConcavePairsOut
+
+				b3AlignedObjectArray<b3QuantizedBvhNode> treeNodesCPU;
+				treeNodesGPU->copyToHost(treeNodesCPU);
+				b3AlignedObjectArray<b3BvhSubtreeInfo> subTreesCPU;
+				subTreesGPU->copyToHost(subTreesCPU);
+				b3AlignedObjectArray<b3BvhInfo> bvhInfoCPU;
+				bvhInfo->copyToHost(bvhInfoCPU);
+				//compute it...
+
+				volatile int hostNumConcavePairsOut = 0;
+
+				//
+				for (int i = 0; i < nPairs; i++)
+				{
+					b3BvhTraversal(&hostPairs.at(0),
+								   &hostBodyBuf.at(0),
+								   &hostCollidables.at(0),
+								   &hostAabbsWorldSpace.at(0),
+								   &triangleConvexPairsOutHost.at(0),
+								   &hostNumConcavePairsOut,
+								   &subTreesCPU.at(0),
+								   &treeNodesCPU.at(0),
+								   &bvhInfoCPU.at(0),
+								   nPairs,
+								   maxTriConvexPairCapacity,
+								   i);
+				}
+				numConcavePairs = hostNumConcavePairsOut;
+
+				if (hostNumConcavePairsOut)
+				{
+					triangleConvexPairsOutHost.resize(hostNumConcavePairsOut);
+					triangleConvexPairsOut.copyFromHost(triangleConvexPairsOutHost);
+				}
+				//
+
+				m_numConcavePairsOut.resize(0);
+				m_numConcavePairsOut.push_back(numConcavePairs);
+			}
+
+			//printf("numConcavePairs=%d (max = %d\n",numConcavePairs,maxTriConvexPairCapacity);
+
+			if (numConcavePairs > maxTriConvexPairCapacity)
+			{
+				static int exceeded_maxTriConvexPairCapacity_count = 0;
+				b3Error("Exceeded the maxTriConvexPairCapacity (found %d but max is %d, it happened %d times)\n",
+						numConcavePairs, maxTriConvexPairCapacity, exceeded_maxTriConvexPairCapacity_count++);
+				numConcavePairs = maxTriConvexPairCapacity;
+			}
+			triangleConvexPairsOut.resize(numConcavePairs);
+
+			if (numConcavePairs)
+			{
+				clippingFacesOutGPU.resize(numConcavePairs);
+				worldNormalsAGPU.resize(numConcavePairs);
+				worldVertsA1GPU.resize(vertexFaceCapacity * (numConcavePairs));
+				worldVertsB1GPU.resize(vertexFaceCapacity * (numConcavePairs));
+
+				if (findConcaveSeparatingAxisKernelGPU)
+				{
+					/*
+					m_concaveHasSeparatingNormals.copyFromHost(concaveHasSeparatingNormalsCPU);
+						clippingFacesOutGPU.copyFromHost(clippingFacesOutCPU);
+						worldVertsA1GPU.copyFromHost(worldVertsA1CPU);
+						worldNormalsAGPU.copyFromHost(worldNormalsACPU);
+						worldVertsB1GPU.copyFromHost(worldVertsB1CPU);
+					*/
+
+					//now perform a SAT test for each triangle-convex element (stored in triangleConvexPairsOut)
+					if (splitSearchSepAxisConcave)
+					{
+						//printf("numConcavePairs = %d\n",numConcavePairs);
+						m_dmins.resize(numConcavePairs);
+						{
+							B3_PROFILE("findConcaveSeparatingAxisVertexFaceKernel");
+							b3BufferInfoCL bInfo[] = {
+								b3BufferInfoCL(triangleConvexPairsOut.getBufferCL()),
+								b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+								b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+								b3BufferInfoCL(convexData.getBufferCL(), true),
+								b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+								b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+								b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+								b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+								b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+								b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+								b3BufferInfoCL(m_concaveSepNormals.getBufferCL()),
+								b3BufferInfoCL(m_concaveHasSeparatingNormals.getBufferCL()),
+								b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+								b3BufferInfoCL(worldVertsA1GPU.getBufferCL()),
+								b3BufferInfoCL(worldNormalsAGPU.getBufferCL()),
+								b3BufferInfoCL(worldVertsB1GPU.getBufferCL()),
+								b3BufferInfoCL(m_dmins.getBufferCL())};
+
+							b3LauncherCL launcher(m_queue, m_findConcaveSeparatingAxisVertexFaceKernel, "m_findConcaveSeparatingAxisVertexFaceKernel");
+							launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+							launcher.setConst(vertexFaceCapacity);
+							launcher.setConst(numConcavePairs);
+
+							int num = numConcavePairs;
+							launcher.launch1D(num);
+							clFinish(m_queue);
+						}
+						//                        numConcavePairs = 0;
+						if (1)
+						{
+							B3_PROFILE("findConcaveSeparatingAxisEdgeEdgeKernel");
+							b3BufferInfoCL bInfo[] = {
+								b3BufferInfoCL(triangleConvexPairsOut.getBufferCL()),
+								b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+								b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+								b3BufferInfoCL(convexData.getBufferCL(), true),
+								b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+								b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+								b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+								b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+								b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+								b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+								b3BufferInfoCL(m_concaveSepNormals.getBufferCL()),
+								b3BufferInfoCL(m_concaveHasSeparatingNormals.getBufferCL()),
+								b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+								b3BufferInfoCL(worldVertsA1GPU.getBufferCL()),
+								b3BufferInfoCL(worldNormalsAGPU.getBufferCL()),
+								b3BufferInfoCL(worldVertsB1GPU.getBufferCL()),
+								b3BufferInfoCL(m_dmins.getBufferCL())};
+
+							b3LauncherCL launcher(m_queue, m_findConcaveSeparatingAxisEdgeEdgeKernel, "m_findConcaveSeparatingAxisEdgeEdgeKernel");
+							launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+							launcher.setConst(vertexFaceCapacity);
+							launcher.setConst(numConcavePairs);
+
+							int num = numConcavePairs;
+							launcher.launch1D(num);
+							clFinish(m_queue);
+						}
+
+						// numConcavePairs = 0;
+					}
+					else
+					{
+						B3_PROFILE("findConcaveSeparatingAxisKernel");
+						b3BufferInfoCL bInfo[] = {
+							b3BufferInfoCL(triangleConvexPairsOut.getBufferCL()),
+							b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+							b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+							b3BufferInfoCL(convexData.getBufferCL(), true),
+							b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+							b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+							b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+							b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+							b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+							b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+							b3BufferInfoCL(m_concaveSepNormals.getBufferCL()),
+							b3BufferInfoCL(m_concaveHasSeparatingNormals.getBufferCL()),
+							b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsA1GPU.getBufferCL()),
+							b3BufferInfoCL(worldNormalsAGPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsB1GPU.getBufferCL())};
+
+						b3LauncherCL launcher(m_queue, m_findConcaveSeparatingAxisKernel, "m_findConcaveSeparatingAxisKernel");
+						launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+						launcher.setConst(vertexFaceCapacity);
+						launcher.setConst(numConcavePairs);
+
+						int num = numConcavePairs;
+						launcher.launch1D(num);
+						clFinish(m_queue);
+					}
+				}
+				else
+				{
+					b3AlignedObjectArray<b3Int4> clippingFacesOutCPU;
+					b3AlignedObjectArray<b3Vector3> worldVertsA1CPU;
+					b3AlignedObjectArray<b3Vector3> worldNormalsACPU;
+					b3AlignedObjectArray<b3Vector3> worldVertsB1CPU;
+					b3AlignedObjectArray<int> concaveHasSeparatingNormalsCPU;
+
+					b3AlignedObjectArray<b3Int4> triangleConvexPairsOutHost;
+					triangleConvexPairsOut.copyToHost(triangleConvexPairsOutHost);
+					//triangleConvexPairsOutHost.resize(maxTriConvexPairCapacity);
+					b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+					bodyBuf->copyToHost(hostBodyBuf);
+					b3AlignedObjectArray<b3Collidable> hostCollidables;
+					gpuCollidables.copyToHost(hostCollidables);
+					b3AlignedObjectArray<b3Aabb> hostAabbsWorldSpace;
+					clAabbsWorldSpace.copyToHost(hostAabbsWorldSpace);
+
+					b3AlignedObjectArray<b3ConvexPolyhedronData> hostConvexData;
+					convexData.copyToHost(hostConvexData);
+
+					b3AlignedObjectArray<b3Vector3> hostVertices;
+					gpuVertices.copyToHost(hostVertices);
+
+					b3AlignedObjectArray<b3Vector3> hostUniqueEdges;
+					gpuUniqueEdges.copyToHost(hostUniqueEdges);
+					b3AlignedObjectArray<b3GpuFace> hostFaces;
+					gpuFaces.copyToHost(hostFaces);
+					b3AlignedObjectArray<int> hostIndices;
+					gpuIndices.copyToHost(hostIndices);
+					b3AlignedObjectArray<b3GpuChildShape> cpuChildShapes;
+					gpuChildShapes.copyToHost(cpuChildShapes);
+
+					b3AlignedObjectArray<b3Vector3> concaveSepNormalsHost;
+					m_concaveSepNormals.copyToHost(concaveSepNormalsHost);
+					concaveHasSeparatingNormalsCPU.resize(concaveSepNormalsHost.size());
+
+					b3GpuChildShape* childShapePointerCPU = 0;
+					if (cpuChildShapes.size())
+						childShapePointerCPU = &cpuChildShapes.at(0);
+
+					clippingFacesOutCPU.resize(clippingFacesOutGPU.size());
+					worldVertsA1CPU.resize(worldVertsA1GPU.size());
+					worldNormalsACPU.resize(worldNormalsAGPU.size());
+					worldVertsB1CPU.resize(worldVertsB1GPU.size());
+
+					for (int i = 0; i < numConcavePairs; i++)
+					{
+						b3FindConcaveSeparatingAxisKernel(&triangleConvexPairsOutHost.at(0),
+														  &hostBodyBuf.at(0),
+														  &hostCollidables.at(0),
+														  &hostConvexData.at(0), &hostVertices.at(0), &hostUniqueEdges.at(0),
+														  &hostFaces.at(0), &hostIndices.at(0), childShapePointerCPU,
+														  &hostAabbsWorldSpace.at(0),
+														  &concaveSepNormalsHost.at(0),
+														  &clippingFacesOutCPU.at(0),
+														  &worldVertsA1CPU.at(0),
+														  &worldNormalsACPU.at(0),
+														  &worldVertsB1CPU.at(0),
+														  &concaveHasSeparatingNormalsCPU.at(0),
+														  vertexFaceCapacity,
+														  numConcavePairs, i);
+					};
+
+					m_concaveSepNormals.copyFromHost(concaveSepNormalsHost);
+					m_concaveHasSeparatingNormals.copyFromHost(concaveHasSeparatingNormalsCPU);
+					clippingFacesOutGPU.copyFromHost(clippingFacesOutCPU);
+					worldVertsA1GPU.copyFromHost(worldVertsA1CPU);
+					worldNormalsAGPU.copyFromHost(worldNormalsACPU);
+					worldVertsB1GPU.copyFromHost(worldVertsB1CPU);
+				}
+				//							b3AlignedObjectArray<b3Vector3> cpuCompoundSepNormals;
+				//						m_concaveSepNormals.copyToHost(cpuCompoundSepNormals);
+				//					b3AlignedObjectArray<b3Int4> cpuConcavePairs;
+				//				triangleConvexPairsOut.copyToHost(cpuConcavePairs);
+			}
+		}
+	}
+
+	if (numConcavePairs)
+	{
+		if (numConcavePairs)
+		{
+			B3_PROFILE("findConcaveSphereContactsKernel");
+			nContacts = m_totalContactsOut.at(0);
+			//				printf("nContacts1 = %d\n",nContacts);
+			b3BufferInfoCL bInfo[] = {
+				b3BufferInfoCL(triangleConvexPairsOut.getBufferCL()),
+				b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+				b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+				b3BufferInfoCL(convexData.getBufferCL(), true),
+				b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+				b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+				b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+				b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+				b3BufferInfoCL(clAabbsWorldSpace.getBufferCL(), true),
+				b3BufferInfoCL(contactOut->getBufferCL()),
+				b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_findConcaveSphereContactsKernel, "m_findConcaveSphereContactsKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+
+			launcher.setConst(numConcavePairs);
+			launcher.setConst(maxContactCapacity);
+
+			int num = numConcavePairs;
+			launcher.launch1D(num);
+			clFinish(m_queue);
+			nContacts = m_totalContactsOut.at(0);
+			//printf("nContacts (after findConcaveSphereContactsKernel) = %d\n",nContacts);
+
+			//printf("nContacts2 = %d\n",nContacts);
+
+			if (nContacts >= maxContactCapacity)
+			{
+				b3Error("Error: contacts exceeds capacity (%d/%d)\n", nContacts, maxContactCapacity);
+				nContacts = maxContactCapacity;
+			}
+		}
+	}
+
+#ifdef __APPLE__
+	bool contactClippingOnGpu = true;
+#else
+	bool contactClippingOnGpu = true;
+#endif
+
+	if (contactClippingOnGpu)
+	{
+		m_totalContactsOut.copyFromHostPointer(&nContacts, 1, 0, true);
+		//		printf("nContacts3 = %d\n",nContacts);
+
+		//B3_PROFILE("clipHullHullKernel");
+
+		bool breakupConcaveConvexKernel = true;
+
+#ifdef __APPLE__
+		//actually, some Apple OpenCL platform/device combinations work fine...
+		breakupConcaveConvexKernel = true;
+#endif
+		//concave-convex contact clipping
+		if (numConcavePairs)
+		{
+			//			printf("numConcavePairs = %d\n", numConcavePairs);
+			//		nContacts = m_totalContactsOut.at(0);
+			//	printf("nContacts before = %d\n", nContacts);
+
+			if (breakupConcaveConvexKernel)
+			{
+				worldVertsB2GPU.resize(vertexFaceCapacity * numConcavePairs);
+
+				//clipFacesAndFindContacts
+
+				if (clipConcaveFacesAndFindContactsCPU)
+				{
+					b3AlignedObjectArray<b3Int4> clippingFacesOutCPU;
+					b3AlignedObjectArray<b3Vector3> worldVertsA1CPU;
+					b3AlignedObjectArray<b3Vector3> worldNormalsACPU;
+					b3AlignedObjectArray<b3Vector3> worldVertsB1CPU;
+
+					clippingFacesOutGPU.copyToHost(clippingFacesOutCPU);
+					worldVertsA1GPU.copyToHost(worldVertsA1CPU);
+					worldNormalsAGPU.copyToHost(worldNormalsACPU);
+					worldVertsB1GPU.copyToHost(worldVertsB1CPU);
+
+					b3AlignedObjectArray<int> concaveHasSeparatingNormalsCPU;
+					m_concaveHasSeparatingNormals.copyToHost(concaveHasSeparatingNormalsCPU);
+
+					b3AlignedObjectArray<b3Vector3> concaveSepNormalsHost;
+					m_concaveSepNormals.copyToHost(concaveSepNormalsHost);
+
+					b3AlignedObjectArray<b3Vector3> worldVertsB2CPU;
+					worldVertsB2CPU.resize(worldVertsB2GPU.size());
+
+					for (int i = 0; i < numConcavePairs; i++)
+					{
+						clipFacesAndFindContactsKernel(&concaveSepNormalsHost.at(0),
+													   &concaveHasSeparatingNormalsCPU.at(0),
+													   &clippingFacesOutCPU.at(0),
+													   &worldVertsA1CPU.at(0),
+													   &worldNormalsACPU.at(0),
+													   &worldVertsB1CPU.at(0),
+													   &worldVertsB2CPU.at(0),
+													   vertexFaceCapacity,
+													   i);
+					}
+
+					clippingFacesOutGPU.copyFromHost(clippingFacesOutCPU);
+					worldVertsB2GPU.copyFromHost(worldVertsB2CPU);
+				}
+				else
+				{
+					if (1)
+					{
+						B3_PROFILE("clipFacesAndFindContacts");
+						//nContacts = m_totalContactsOut.at(0);
+						//int h = m_hasSeparatingNormals.at(0);
+						//int4 p = clippingFacesOutGPU.at(0);
+						b3BufferInfoCL bInfo[] = {
+							b3BufferInfoCL(m_concaveSepNormals.getBufferCL()),
+							b3BufferInfoCL(m_concaveHasSeparatingNormals.getBufferCL()),
+							b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsA1GPU.getBufferCL()),
+							b3BufferInfoCL(worldNormalsAGPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsB1GPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsB2GPU.getBufferCL())};
+						b3LauncherCL launcher(m_queue, m_clipFacesAndFindContacts, "m_clipFacesAndFindContacts");
+						launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+						launcher.setConst(vertexFaceCapacity);
+
+						launcher.setConst(numConcavePairs);
+						int debugMode = 0;
+						launcher.setConst(debugMode);
+						int num = numConcavePairs;
+						launcher.launch1D(num);
+						clFinish(m_queue);
+						//int bla = m_totalContactsOut.at(0);
+					}
+				}
+				//contactReduction
+				{
+					int newContactCapacity = nContacts + numConcavePairs;
+					contactOut->reserve(newContactCapacity);
+					if (reduceConcaveContactsOnGPU)
+					{
+						//						printf("newReservation = %d\n",newReservation);
+						{
+							B3_PROFILE("newContactReductionKernel");
+							b3BufferInfoCL bInfo[] =
+								{
+									b3BufferInfoCL(triangleConvexPairsOut.getBufferCL(), true),
+									b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+									b3BufferInfoCL(m_concaveSepNormals.getBufferCL()),
+									b3BufferInfoCL(m_concaveHasSeparatingNormals.getBufferCL()),
+									b3BufferInfoCL(contactOut->getBufferCL()),
+									b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+									b3BufferInfoCL(worldVertsB2GPU.getBufferCL()),
+									b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+
+							b3LauncherCL launcher(m_queue, m_newContactReductionKernel, "m_newContactReductionKernel");
+							launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+							launcher.setConst(vertexFaceCapacity);
+							launcher.setConst(newContactCapacity);
+							launcher.setConst(numConcavePairs);
+							int num = numConcavePairs;
+
+							launcher.launch1D(num);
+						}
+						nContacts = m_totalContactsOut.at(0);
+						contactOut->resize(nContacts);
+
+						//printf("contactOut4 (after newContactReductionKernel) = %d\n",nContacts);
+					}
+					else
+					{
+						volatile int nGlobalContactsOut = nContacts;
+						b3AlignedObjectArray<b3Int4> triangleConvexPairsOutHost;
+						triangleConvexPairsOut.copyToHost(triangleConvexPairsOutHost);
+						b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+						bodyBuf->copyToHost(hostBodyBuf);
+
+						b3AlignedObjectArray<int> concaveHasSeparatingNormalsCPU;
+						m_concaveHasSeparatingNormals.copyToHost(concaveHasSeparatingNormalsCPU);
+
+						b3AlignedObjectArray<b3Vector3> concaveSepNormalsHost;
+						m_concaveSepNormals.copyToHost(concaveSepNormalsHost);
+
+						b3AlignedObjectArray<b3Contact4> hostContacts;
+						if (nContacts)
+						{
+							contactOut->copyToHost(hostContacts);
+						}
+						hostContacts.resize(newContactCapacity);
+
+						b3AlignedObjectArray<b3Int4> clippingFacesOutCPU;
+						b3AlignedObjectArray<b3Vector3> worldVertsB2CPU;
+
+						clippingFacesOutGPU.copyToHost(clippingFacesOutCPU);
+						worldVertsB2GPU.copyToHost(worldVertsB2CPU);
+
+						for (int i = 0; i < numConcavePairs; i++)
+						{
+							b3NewContactReductionKernel(&triangleConvexPairsOutHost.at(0),
+														&hostBodyBuf.at(0),
+														&concaveSepNormalsHost.at(0),
+														&concaveHasSeparatingNormalsCPU.at(0),
+														&hostContacts.at(0),
+														&clippingFacesOutCPU.at(0),
+														&worldVertsB2CPU.at(0),
+														&nGlobalContactsOut,
+														vertexFaceCapacity,
+														newContactCapacity,
+														numConcavePairs,
+														i);
+						}
+
+						nContacts = nGlobalContactsOut;
+						m_totalContactsOut.copyFromHostPointer(&nContacts, 1, 0, true);
+						//						nContacts = m_totalContactsOut.at(0);
+						//contactOut->resize(nContacts);
+						hostContacts.resize(nContacts);
+						//printf("contactOut4 (after newContactReductionKernel) = %d\n",nContacts);
+						contactOut->copyFromHost(hostContacts);
+					}
+				}
+				//re-use?
+			}
+			else
+			{
+				B3_PROFILE("clipHullHullConcaveConvexKernel");
+				nContacts = m_totalContactsOut.at(0);
+				int newContactCapacity = contactOut->capacity();
+
+				//printf("contactOut5 = %d\n",nContacts);
+				b3BufferInfoCL bInfo[] = {
+					b3BufferInfoCL(triangleConvexPairsOut.getBufferCL(), true),
+					b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+					b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+					b3BufferInfoCL(convexData.getBufferCL(), true),
+					b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+					b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+					b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+					b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+					b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+					b3BufferInfoCL(m_concaveSepNormals.getBufferCL()),
+					b3BufferInfoCL(contactOut->getBufferCL()),
+					b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+				b3LauncherCL launcher(m_queue, m_clipHullHullConcaveConvexKernel, "m_clipHullHullConcaveConvexKernel");
+				launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+				launcher.setConst(newContactCapacity);
+				launcher.setConst(numConcavePairs);
+				int num = numConcavePairs;
+				launcher.launch1D(num);
+				clFinish(m_queue);
+				nContacts = m_totalContactsOut.at(0);
+				contactOut->resize(nContacts);
+				//printf("contactOut6 = %d\n",nContacts);
+				b3AlignedObjectArray<b3Contact4> cpuContacts;
+				contactOut->copyToHost(cpuContacts);
+			}
+			//			printf("nContacts after = %d\n", nContacts);
+		}  //numConcavePairs
+
+		//convex-convex contact clipping
+
+		bool breakupKernel = false;
+
+#ifdef __APPLE__
+		breakupKernel = true;
+#endif
+
+#ifdef CHECK_ON_HOST
+		bool computeConvexConvex = false;
+#else
+		bool computeConvexConvex = true;
+#endif  //CHECK_ON_HOST
+		if (computeConvexConvex)
+		{
+			B3_PROFILE("clipHullHullKernel");
+			if (breakupKernel)
+			{
+				worldVertsB1GPU.resize(vertexFaceCapacity * nPairs);
+				clippingFacesOutGPU.resize(nPairs);
+				worldNormalsAGPU.resize(nPairs);
+				worldVertsA1GPU.resize(vertexFaceCapacity * nPairs);
+				worldVertsB2GPU.resize(vertexFaceCapacity * nPairs);
+
+				if (findConvexClippingFacesGPU)
+				{
+					B3_PROFILE("findClippingFacesKernel");
+					b3BufferInfoCL bInfo[] = {
+						b3BufferInfoCL(pairs->getBufferCL(), true),
+						b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+						b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+						b3BufferInfoCL(convexData.getBufferCL(), true),
+						b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+						b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+						b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+						b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+						b3BufferInfoCL(m_sepNormals.getBufferCL()),
+						b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+						b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+						b3BufferInfoCL(worldVertsA1GPU.getBufferCL()),
+						b3BufferInfoCL(worldNormalsAGPU.getBufferCL()),
+						b3BufferInfoCL(worldVertsB1GPU.getBufferCL())};
+
+					b3LauncherCL launcher(m_queue, m_findClippingFacesKernel, "m_findClippingFacesKernel");
+					launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+					launcher.setConst(vertexFaceCapacity);
+					launcher.setConst(nPairs);
+					int num = nPairs;
+					launcher.launch1D(num);
+					clFinish(m_queue);
+				}
+				else
+				{
+					float minDist = -1e30f;
+					float maxDist = 0.02f;
+
+					b3AlignedObjectArray<b3ConvexPolyhedronData> hostConvexData;
+					convexData.copyToHost(hostConvexData);
+					b3AlignedObjectArray<b3Collidable> hostCollidables;
+					gpuCollidables.copyToHost(hostCollidables);
+
+					b3AlignedObjectArray<int> hostHasSepNormals;
+					m_hasSeparatingNormals.copyToHost(hostHasSepNormals);
+					b3AlignedObjectArray<b3Vector3> cpuSepNormals;
+					m_sepNormals.copyToHost(cpuSepNormals);
+
+					b3AlignedObjectArray<b3Int4> hostPairs;
+					pairs->copyToHost(hostPairs);
+					b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+					bodyBuf->copyToHost(hostBodyBuf);
+
+					//worldVertsB1GPU.resize(vertexFaceCapacity*nPairs);
+					b3AlignedObjectArray<b3Vector3> worldVertsB1CPU;
+					worldVertsB1GPU.copyToHost(worldVertsB1CPU);
+
+					b3AlignedObjectArray<b3Int4> clippingFacesOutCPU;
+					clippingFacesOutGPU.copyToHost(clippingFacesOutCPU);
+
+					b3AlignedObjectArray<b3Vector3> worldNormalsACPU;
+					worldNormalsACPU.resize(nPairs);
+
+					b3AlignedObjectArray<b3Vector3> worldVertsA1CPU;
+					worldVertsA1CPU.resize(worldVertsA1GPU.size());
+
+					b3AlignedObjectArray<b3Vector3> hostVertices;
+					gpuVertices.copyToHost(hostVertices);
+					b3AlignedObjectArray<b3GpuFace> hostFaces;
+					gpuFaces.copyToHost(hostFaces);
+					b3AlignedObjectArray<int> hostIndices;
+					gpuIndices.copyToHost(hostIndices);
+
+					for (int i = 0; i < nPairs; i++)
+					{
+						int bodyIndexA = hostPairs[i].x;
+						int bodyIndexB = hostPairs[i].y;
+
+						int collidableIndexA = hostBodyBuf[bodyIndexA].m_collidableIdx;
+						int collidableIndexB = hostBodyBuf[bodyIndexB].m_collidableIdx;
+
+						int shapeIndexA = hostCollidables[collidableIndexA].m_shapeIndex;
+						int shapeIndexB = hostCollidables[collidableIndexB].m_shapeIndex;
+
+						if (hostHasSepNormals[i])
+						{
+							b3FindClippingFaces(cpuSepNormals[i],
+												&hostConvexData[shapeIndexA],
+												&hostConvexData[shapeIndexB],
+												hostBodyBuf[bodyIndexA].m_pos, hostBodyBuf[bodyIndexA].m_quat,
+												hostBodyBuf[bodyIndexB].m_pos, hostBodyBuf[bodyIndexB].m_quat,
+												&worldVertsA1CPU.at(0), &worldNormalsACPU.at(0),
+												&worldVertsB1CPU.at(0),
+												vertexFaceCapacity, minDist, maxDist,
+												&hostVertices.at(0), &hostFaces.at(0),
+												&hostIndices.at(0),
+												&hostVertices.at(0), &hostFaces.at(0),
+												&hostIndices.at(0), &clippingFacesOutCPU.at(0), i);
+						}
+					}
+
+					clippingFacesOutGPU.copyFromHost(clippingFacesOutCPU);
+					worldVertsA1GPU.copyFromHost(worldVertsA1CPU);
+					worldNormalsAGPU.copyFromHost(worldNormalsACPU);
+					worldVertsB1GPU.copyFromHost(worldVertsB1CPU);
+				}
+
+				///clip face B against face A, reduce contacts and append them to a global contact array
+				if (1)
+				{
+					if (clipConvexFacesAndFindContactsCPU)
+					{
+						//b3AlignedObjectArray<b3Int4> hostPairs;
+						//pairs->copyToHost(hostPairs);
+
+						b3AlignedObjectArray<b3Vector3> hostSepNormals;
+						m_sepNormals.copyToHost(hostSepNormals);
+						b3AlignedObjectArray<int> hostHasSepAxis;
+						m_hasSeparatingNormals.copyToHost(hostHasSepAxis);
+
+						b3AlignedObjectArray<b3Int4> hostClippingFaces;
+						clippingFacesOutGPU.copyToHost(hostClippingFaces);
+						b3AlignedObjectArray<b3Vector3> worldVertsB2CPU;
+						worldVertsB2CPU.resize(vertexFaceCapacity * nPairs);
+
+						b3AlignedObjectArray<b3Vector3> worldVertsA1CPU;
+						worldVertsA1GPU.copyToHost(worldVertsA1CPU);
+						b3AlignedObjectArray<b3Vector3> worldNormalsACPU;
+						worldNormalsAGPU.copyToHost(worldNormalsACPU);
+
+						b3AlignedObjectArray<b3Vector3> worldVertsB1CPU;
+						worldVertsB1GPU.copyToHost(worldVertsB1CPU);
+
+						/*
+					  __global const b3Float4* separatingNormals,
+                                                   __global const int* hasSeparatingAxis,
+                                                   __global b3Int4* clippingFacesOut,
+                                                   __global b3Float4* worldVertsA1,
+                                                   __global b3Float4* worldNormalsA1,
+                                                   __global b3Float4* worldVertsB1,
+                                                   __global b3Float4* worldVertsB2,
+                                                    int vertexFaceCapacity,
+															int pairIndex
+					*/
+						for (int i = 0; i < nPairs; i++)
+						{
+							clipFacesAndFindContactsKernel(
+								&hostSepNormals.at(0),
+								&hostHasSepAxis.at(0),
+								&hostClippingFaces.at(0),
+								&worldVertsA1CPU.at(0),
+								&worldNormalsACPU.at(0),
+								&worldVertsB1CPU.at(0),
+								&worldVertsB2CPU.at(0),
+
+								vertexFaceCapacity,
+								i);
+						}
+
+						clippingFacesOutGPU.copyFromHost(hostClippingFaces);
+						worldVertsB2GPU.copyFromHost(worldVertsB2CPU);
+					}
+					else
+					{
+						B3_PROFILE("clipFacesAndFindContacts");
+						//nContacts = m_totalContactsOut.at(0);
+						//int h = m_hasSeparatingNormals.at(0);
+						//int4 p = clippingFacesOutGPU.at(0);
+						b3BufferInfoCL bInfo[] = {
+							b3BufferInfoCL(m_sepNormals.getBufferCL()),
+							b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+							b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsA1GPU.getBufferCL()),
+							b3BufferInfoCL(worldNormalsAGPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsB1GPU.getBufferCL()),
+							b3BufferInfoCL(worldVertsB2GPU.getBufferCL())};
+
+						b3LauncherCL launcher(m_queue, m_clipFacesAndFindContacts, "m_clipFacesAndFindContacts");
+						launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+						launcher.setConst(vertexFaceCapacity);
+
+						launcher.setConst(nPairs);
+						int debugMode = 0;
+						launcher.setConst(debugMode);
+						int num = nPairs;
+						launcher.launch1D(num);
+						clFinish(m_queue);
+					}
+
+					{
+						nContacts = m_totalContactsOut.at(0);
+						//printf("nContacts = %d\n",nContacts);
+
+						int newContactCapacity = nContacts + nPairs;
+						contactOut->reserve(newContactCapacity);
+
+						if (reduceConvexContactsOnGPU)
+						{
+							{
+								B3_PROFILE("newContactReductionKernel");
+								b3BufferInfoCL bInfo[] =
+									{
+										b3BufferInfoCL(pairs->getBufferCL(), true),
+										b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+										b3BufferInfoCL(m_sepNormals.getBufferCL()),
+										b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+										b3BufferInfoCL(contactOut->getBufferCL()),
+										b3BufferInfoCL(clippingFacesOutGPU.getBufferCL()),
+										b3BufferInfoCL(worldVertsB2GPU.getBufferCL()),
+										b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+
+								b3LauncherCL launcher(m_queue, m_newContactReductionKernel, "m_newContactReductionKernel");
+								launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+								launcher.setConst(vertexFaceCapacity);
+								launcher.setConst(newContactCapacity);
+								launcher.setConst(nPairs);
+								int num = nPairs;
+
+								launcher.launch1D(num);
+							}
+							nContacts = m_totalContactsOut.at(0);
+							contactOut->resize(nContacts);
+						}
+						else
+						{
+							volatile int nGlobalContactsOut = nContacts;
+							b3AlignedObjectArray<b3Int4> hostPairs;
+							pairs->copyToHost(hostPairs);
+							b3AlignedObjectArray<b3RigidBodyData> hostBodyBuf;
+							bodyBuf->copyToHost(hostBodyBuf);
+							b3AlignedObjectArray<b3Vector3> hostSepNormals;
+							m_sepNormals.copyToHost(hostSepNormals);
+							b3AlignedObjectArray<int> hostHasSepAxis;
+							m_hasSeparatingNormals.copyToHost(hostHasSepAxis);
+							b3AlignedObjectArray<b3Contact4> hostContactsOut;
+							contactOut->copyToHost(hostContactsOut);
+							hostContactsOut.resize(newContactCapacity);
+
+							b3AlignedObjectArray<b3Int4> hostClippingFaces;
+							clippingFacesOutGPU.copyToHost(hostClippingFaces);
+							b3AlignedObjectArray<b3Vector3> worldVertsB2CPU;
+							worldVertsB2GPU.copyToHost(worldVertsB2CPU);
+
+							for (int i = 0; i < nPairs; i++)
+							{
+								b3NewContactReductionKernel(&hostPairs.at(0),
+															&hostBodyBuf.at(0),
+															&hostSepNormals.at(0),
+															&hostHasSepAxis.at(0),
+															&hostContactsOut.at(0),
+															&hostClippingFaces.at(0),
+															&worldVertsB2CPU.at(0),
+															&nGlobalContactsOut,
+															vertexFaceCapacity,
+															newContactCapacity,
+															nPairs,
+															i);
+							}
+
+							nContacts = nGlobalContactsOut;
+							m_totalContactsOut.copyFromHostPointer(&nContacts, 1, 0, true);
+							hostContactsOut.resize(nContacts);
+							//printf("contactOut4 (after newContactReductionKernel) = %d\n",nContacts);
+							contactOut->copyFromHost(hostContactsOut);
+						}
+						//                    b3Contact4 pt = contactOut->at(0);
+						//                  printf("nContacts = %d\n",nContacts);
+					}
+				}
+			}
+			else  //breakupKernel
+			{
+				if (nPairs)
+				{
+					b3BufferInfoCL bInfo[] = {
+						b3BufferInfoCL(pairs->getBufferCL(), true),
+						b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+						b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+						b3BufferInfoCL(convexData.getBufferCL(), true),
+						b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+						b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+						b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+						b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+						b3BufferInfoCL(m_sepNormals.getBufferCL()),
+						b3BufferInfoCL(m_hasSeparatingNormals.getBufferCL()),
+						b3BufferInfoCL(contactOut->getBufferCL()),
+						b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+					b3LauncherCL launcher(m_queue, m_clipHullHullKernel, "m_clipHullHullKernel");
+					launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+					launcher.setConst(nPairs);
+					launcher.setConst(maxContactCapacity);
+
+					int num = nPairs;
+					launcher.launch1D(num);
+					clFinish(m_queue);
+
+					nContacts = m_totalContactsOut.at(0);
+					if (nContacts >= maxContactCapacity)
+					{
+						b3Error("Exceeded contact capacity (%d/%d)\n", nContacts, maxContactCapacity);
+						nContacts = maxContactCapacity;
+					}
+					contactOut->resize(nContacts);
+				}
+			}
+
+			int nCompoundsPairs = m_gpuCompoundPairs.size();
+
+			if (nCompoundsPairs)
+			{
+				b3BufferInfoCL bInfo[] = {
+					b3BufferInfoCL(m_gpuCompoundPairs.getBufferCL(), true),
+					b3BufferInfoCL(bodyBuf->getBufferCL(), true),
+					b3BufferInfoCL(gpuCollidables.getBufferCL(), true),
+					b3BufferInfoCL(convexData.getBufferCL(), true),
+					b3BufferInfoCL(gpuVertices.getBufferCL(), true),
+					b3BufferInfoCL(gpuUniqueEdges.getBufferCL(), true),
+					b3BufferInfoCL(gpuFaces.getBufferCL(), true),
+					b3BufferInfoCL(gpuIndices.getBufferCL(), true),
+					b3BufferInfoCL(gpuChildShapes.getBufferCL(), true),
+					b3BufferInfoCL(m_gpuCompoundSepNormals.getBufferCL(), true),
+					b3BufferInfoCL(m_gpuHasCompoundSepNormals.getBufferCL(), true),
+					b3BufferInfoCL(contactOut->getBufferCL()),
+					b3BufferInfoCL(m_totalContactsOut.getBufferCL())};
+				b3LauncherCL launcher(m_queue, m_clipCompoundsHullHullKernel, "m_clipCompoundsHullHullKernel");
+				launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+				launcher.setConst(nCompoundsPairs);
+				launcher.setConst(maxContactCapacity);
+
+				int num = nCompoundsPairs;
+				launcher.launch1D(num);
+				clFinish(m_queue);
+
+				nContacts = m_totalContactsOut.at(0);
+				if (nContacts > maxContactCapacity)
+				{
+					b3Error("Error: contacts exceeds capacity (%d/%d)\n", nContacts, maxContactCapacity);
+					nContacts = maxContactCapacity;
+				}
+				contactOut->resize(nContacts);
+			}  //if nCompoundsPairs
+		}
+	}  //contactClippingOnGpu
+
+	//printf("nContacts end = %d\n",nContacts);
+
+	//printf("frameCount = %d\n",frameCount++);
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.h
new file mode 100644
index 0000000..53e8c4e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.h
@@ -0,0 +1,106 @@
+
+#ifndef _CONVEX_HULL_CONTACT_H
+#define _CONVEX_HULL_CONTACT_H
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+#include "Bullet3Common/shared/b3Int2.h"
+#include "Bullet3Common/shared/b3Int4.h"
+#include "b3OptimizedBvh.h"
+#include "b3BvhInfo.h"
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+
+//#include "../../dynamics/basic_demo/Stubs/ChNarrowPhase.h"
+
+struct GpuSatCollision
+{
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+	cl_kernel m_findSeparatingAxisKernel;
+	cl_kernel m_mprPenetrationKernel;
+	cl_kernel m_findSeparatingAxisUnitSphereKernel;
+
+	cl_kernel m_findSeparatingAxisVertexFaceKernel;
+	cl_kernel m_findSeparatingAxisEdgeEdgeKernel;
+
+	cl_kernel m_findConcaveSeparatingAxisKernel;
+	cl_kernel m_findConcaveSeparatingAxisVertexFaceKernel;
+	cl_kernel m_findConcaveSeparatingAxisEdgeEdgeKernel;
+
+	cl_kernel m_findCompoundPairsKernel;
+	cl_kernel m_processCompoundPairsKernel;
+
+	cl_kernel m_clipHullHullKernel;
+	cl_kernel m_clipCompoundsHullHullKernel;
+
+	cl_kernel m_clipFacesAndFindContacts;
+	cl_kernel m_findClippingFacesKernel;
+
+	cl_kernel m_clipHullHullConcaveConvexKernel;
+	//	cl_kernel				m_extractManifoldAndAddContactKernel;
+	cl_kernel m_newContactReductionKernel;
+
+	cl_kernel m_bvhTraversalKernel;
+	cl_kernel m_primitiveContactsKernel;
+	cl_kernel m_findConcaveSphereContactsKernel;
+
+	cl_kernel m_processCompoundPairsPrimitivesKernel;
+
+	b3OpenCLArray<b3Vector3> m_unitSphereDirections;
+
+	b3OpenCLArray<int> m_totalContactsOut;
+
+	b3OpenCLArray<b3Vector3> m_sepNormals;
+	b3OpenCLArray<float> m_dmins;
+
+	b3OpenCLArray<int> m_hasSeparatingNormals;
+	b3OpenCLArray<b3Vector3> m_concaveSepNormals;
+	b3OpenCLArray<int> m_concaveHasSeparatingNormals;
+	b3OpenCLArray<int> m_numConcavePairsOut;
+	b3OpenCLArray<b3CompoundOverlappingPair> m_gpuCompoundPairs;
+	b3OpenCLArray<b3Vector3> m_gpuCompoundSepNormals;
+	b3OpenCLArray<int> m_gpuHasCompoundSepNormals;
+	b3OpenCLArray<int> m_numCompoundPairsOut;
+
+	GpuSatCollision(cl_context ctx, cl_device_id device, cl_command_queue q);
+	virtual ~GpuSatCollision();
+
+	void computeConvexConvexContactsGPUSAT(b3OpenCLArray<b3Int4>* pairs, int nPairs,
+										   const b3OpenCLArray<b3RigidBodyData>* bodyBuf,
+										   b3OpenCLArray<b3Contact4>* contactOut, int& nContacts,
+										   const b3OpenCLArray<b3Contact4>* oldContacts,
+										   int maxContactCapacity,
+										   int compoundPairCapacity,
+										   const b3OpenCLArray<b3ConvexPolyhedronData>& hostConvexData,
+										   const b3OpenCLArray<b3Vector3>& vertices,
+										   const b3OpenCLArray<b3Vector3>& uniqueEdges,
+										   const b3OpenCLArray<b3GpuFace>& faces,
+										   const b3OpenCLArray<int>& indices,
+										   const b3OpenCLArray<b3Collidable>& gpuCollidables,
+										   const b3OpenCLArray<b3GpuChildShape>& gpuChildShapes,
+
+										   const b3OpenCLArray<b3Aabb>& clAabbsWorldSpace,
+										   const b3OpenCLArray<b3Aabb>& clAabbsLocalSpace,
+
+										   b3OpenCLArray<b3Vector3>& worldVertsB1GPU,
+										   b3OpenCLArray<b3Int4>& clippingFacesOutGPU,
+										   b3OpenCLArray<b3Vector3>& worldNormalsAGPU,
+										   b3OpenCLArray<b3Vector3>& worldVertsA1GPU,
+										   b3OpenCLArray<b3Vector3>& worldVertsB2GPU,
+										   b3AlignedObjectArray<class b3OptimizedBvh*>& bvhData,
+										   b3OpenCLArray<b3QuantizedBvhNode>* treeNodesGPU,
+										   b3OpenCLArray<b3BvhSubtreeInfo>* subTreesGPU,
+										   b3OpenCLArray<b3BvhInfo>* bvhInfo,
+										   int numObjects,
+										   int maxTriConvexPairCapacity,
+										   b3OpenCLArray<b3Int4>& triangleConvexPairs,
+										   int& numTriConvexPairsOut);
+};
+
+#endif  //_CONVEX_HULL_CONTACT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h
new file mode 100644
index 0000000..c4cf700
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h
@@ -0,0 +1,7 @@
+#ifndef CONVEX_POLYHEDRON_CL
+#define CONVEX_POLYHEDRON_CL
+
+#include "Bullet3Common/b3Transform.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+
+#endif  //CONVEX_POLYHEDRON_CL
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp
new file mode 100644
index 0000000..3a554fe
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp
@@ -0,0 +1,1062 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+GJK-EPA collision solver by Nathanael Presson, 2008
+*/
+
+#include "b3GjkEpa.h"
+
+#include "b3SupportMappings.h"
+
+namespace gjkepa2_impl2
+{
+// Config
+
+/* GJK	*/
+#define GJK_MAX_ITERATIONS 128
+#define GJK_ACCURACY ((b3Scalar)0.0001)
+#define GJK_MIN_DISTANCE ((b3Scalar)0.0001)
+#define GJK_DUPLICATED_EPS ((b3Scalar)0.0001)
+#define GJK_SIMPLEX2_EPS ((b3Scalar)0.0)
+#define GJK_SIMPLEX3_EPS ((b3Scalar)0.0)
+#define GJK_SIMPLEX4_EPS ((b3Scalar)0.0)
+
+/* EPA	*/
+#define EPA_MAX_VERTICES 64
+#define EPA_MAX_FACES (EPA_MAX_VERTICES * 2)
+#define EPA_MAX_ITERATIONS 255
+#define EPA_ACCURACY ((b3Scalar)0.0001)
+#define EPA_FALLBACK (10 * EPA_ACCURACY)
+#define EPA_PLANE_EPS ((b3Scalar)0.00001)
+#define EPA_INSIDE_EPS ((b3Scalar)0.01)
+
+// Shorthands
+
+// MinkowskiDiff
+struct b3MinkowskiDiff
+{
+	const b3ConvexPolyhedronData* m_shapes[2];
+
+	b3Matrix3x3 m_toshape1;
+	b3Transform m_toshape0;
+
+	bool m_enableMargin;
+
+	void EnableMargin(bool enable)
+	{
+		m_enableMargin = enable;
+	}
+	inline b3Vector3 Support0(const b3Vector3& d, const b3AlignedObjectArray<b3Vector3>& verticesA) const
+	{
+		if (m_enableMargin)
+		{
+			return localGetSupportVertexWithMargin(d, m_shapes[0], verticesA, 0.f);
+		}
+		else
+		{
+			return localGetSupportVertexWithoutMargin(d, m_shapes[0], verticesA);
+		}
+	}
+	inline b3Vector3 Support1(const b3Vector3& d, const b3AlignedObjectArray<b3Vector3>& verticesB) const
+	{
+		if (m_enableMargin)
+		{
+			return m_toshape0 * (localGetSupportVertexWithMargin(m_toshape1 * d, m_shapes[1], verticesB, 0.f));
+		}
+		else
+		{
+			return m_toshape0 * (localGetSupportVertexWithoutMargin(m_toshape1 * d, m_shapes[1], verticesB));
+		}
+	}
+
+	inline b3Vector3 Support(const b3Vector3& d, const b3AlignedObjectArray<b3Vector3>& verticesA, const b3AlignedObjectArray<b3Vector3>& verticesB) const
+	{
+		return (Support0(d, verticesA) - Support1(-d, verticesB));
+	}
+	b3Vector3 Support(const b3Vector3& d, unsigned int index, const b3AlignedObjectArray<b3Vector3>& verticesA, const b3AlignedObjectArray<b3Vector3>& verticesB) const
+	{
+		if (index)
+			return (Support1(d, verticesA));
+		else
+			return (Support0(d, verticesB));
+	}
+};
+
+typedef b3MinkowskiDiff tShape;
+
+// GJK
+struct b3GJK
+{
+	/* Types		*/
+	struct sSV
+	{
+		b3Vector3 d, w;
+	};
+	struct sSimplex
+	{
+		sSV* c[4];
+		b3Scalar p[4];
+		unsigned int rank;
+	};
+	struct eStatus
+	{
+		enum _
+		{
+			Valid,
+			Inside,
+			Failed
+		};
+	};
+	/* Fields		*/
+	tShape m_shape;
+	const b3AlignedObjectArray<b3Vector3>& m_verticesA;
+	const b3AlignedObjectArray<b3Vector3>& m_verticesB;
+	b3Vector3 m_ray;
+	b3Scalar m_distance;
+	sSimplex m_simplices[2];
+	sSV m_store[4];
+	sSV* m_free[4];
+	unsigned int m_nfree;
+	unsigned int m_current;
+	sSimplex* m_simplex;
+	eStatus::_ m_status;
+	/* Methods		*/
+	b3GJK(const b3AlignedObjectArray<b3Vector3>& verticesA, const b3AlignedObjectArray<b3Vector3>& verticesB)
+		: m_verticesA(verticesA), m_verticesB(verticesB)
+	{
+		Initialize();
+	}
+	void Initialize()
+	{
+		m_ray = b3MakeVector3(0, 0, 0);
+		m_nfree = 0;
+		m_status = eStatus::Failed;
+		m_current = 0;
+		m_distance = 0;
+	}
+	eStatus::_ Evaluate(const tShape& shapearg, const b3Vector3& guess)
+	{
+		unsigned int iterations = 0;
+		b3Scalar sqdist = 0;
+		b3Scalar alpha = 0;
+		b3Vector3 lastw[4];
+		unsigned int clastw = 0;
+		/* Initialize solver		*/
+		m_free[0] = &m_store[0];
+		m_free[1] = &m_store[1];
+		m_free[2] = &m_store[2];
+		m_free[3] = &m_store[3];
+		m_nfree = 4;
+		m_current = 0;
+		m_status = eStatus::Valid;
+		m_shape = shapearg;
+		m_distance = 0;
+		/* Initialize simplex		*/
+		m_simplices[0].rank = 0;
+		m_ray = guess;
+		const b3Scalar sqrl = m_ray.length2();
+		appendvertice(m_simplices[0], sqrl > 0 ? -m_ray : b3MakeVector3(1, 0, 0));
+		m_simplices[0].p[0] = 1;
+		m_ray = m_simplices[0].c[0]->w;
+		sqdist = sqrl;
+		lastw[0] =
+			lastw[1] =
+				lastw[2] =
+					lastw[3] = m_ray;
+		/* Loop						*/
+		do
+		{
+			const unsigned int next = 1 - m_current;
+			sSimplex& cs = m_simplices[m_current];
+			sSimplex& ns = m_simplices[next];
+			/* Check zero							*/
+			const b3Scalar rl = m_ray.length();
+			if (rl < GJK_MIN_DISTANCE)
+			{ /* Touching or inside				*/
+				m_status = eStatus::Inside;
+				break;
+			}
+			/* Append new vertice in -'v' direction	*/
+			appendvertice(cs, -m_ray);
+			const b3Vector3& w = cs.c[cs.rank - 1]->w;
+			bool found = false;
+			for (unsigned int i = 0; i < 4; ++i)
+			{
+				if ((w - lastw[i]).length2() < GJK_DUPLICATED_EPS)
+				{
+					found = true;
+					break;
+				}
+			}
+			if (found)
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			else
+			{ /* Update lastw					*/
+				lastw[clastw = (clastw + 1) & 3] = w;
+			}
+			/* Check for termination				*/
+			const b3Scalar omega = b3Dot(m_ray, w) / rl;
+			alpha = b3Max(omega, alpha);
+			if (((rl - alpha) - (GJK_ACCURACY * rl)) <= 0)
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			/* Reduce simplex						*/
+			b3Scalar weights[4];
+			unsigned int mask = 0;
+			switch (cs.rank)
+			{
+				case 2:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   weights, mask);
+					break;
+				case 3:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   cs.c[2]->w,
+										   weights, mask);
+					break;
+				case 4:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   cs.c[2]->w,
+										   cs.c[3]->w,
+										   weights, mask);
+					break;
+			}
+			if (sqdist >= 0)
+			{ /* Valid	*/
+				ns.rank = 0;
+				m_ray = b3MakeVector3(0, 0, 0);
+				m_current = next;
+				for (unsigned int i = 0, ni = cs.rank; i < ni; ++i)
+				{
+					if (mask & (1 << i))
+					{
+						ns.c[ns.rank] = cs.c[i];
+						ns.p[ns.rank++] = weights[i];
+						m_ray += cs.c[i]->w * weights[i];
+					}
+					else
+					{
+						m_free[m_nfree++] = cs.c[i];
+					}
+				}
+				if (mask == 15) m_status = eStatus::Inside;
+			}
+			else
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			m_status = ((++iterations) < GJK_MAX_ITERATIONS) ? m_status : eStatus::Failed;
+		} while (m_status == eStatus::Valid);
+		m_simplex = &m_simplices[m_current];
+		switch (m_status)
+		{
+			case eStatus::Valid:
+				m_distance = m_ray.length();
+				break;
+			case eStatus::Inside:
+				m_distance = 0;
+				break;
+			default:
+			{
+			}
+		}
+		return (m_status);
+	}
+	bool EncloseOrigin()
+	{
+		switch (m_simplex->rank)
+		{
+			case 1:
+			{
+				for (unsigned int i = 0; i < 3; ++i)
+				{
+					b3Vector3 axis = b3MakeVector3(0, 0, 0);
+					axis[i] = 1;
+					appendvertice(*m_simplex, axis);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+					appendvertice(*m_simplex, -axis);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+				}
+			}
+			break;
+			case 2:
+			{
+				const b3Vector3 d = m_simplex->c[1]->w - m_simplex->c[0]->w;
+				for (unsigned int i = 0; i < 3; ++i)
+				{
+					b3Vector3 axis = b3MakeVector3(0, 0, 0);
+					axis[i] = 1;
+					const b3Vector3 p = b3Cross(d, axis);
+					if (p.length2() > 0)
+					{
+						appendvertice(*m_simplex, p);
+						if (EncloseOrigin()) return (true);
+						removevertice(*m_simplex);
+						appendvertice(*m_simplex, -p);
+						if (EncloseOrigin()) return (true);
+						removevertice(*m_simplex);
+					}
+				}
+			}
+			break;
+			case 3:
+			{
+				const b3Vector3 n = b3Cross(m_simplex->c[1]->w - m_simplex->c[0]->w,
+											m_simplex->c[2]->w - m_simplex->c[0]->w);
+				if (n.length2() > 0)
+				{
+					appendvertice(*m_simplex, n);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+					appendvertice(*m_simplex, -n);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+				}
+			}
+			break;
+			case 4:
+			{
+				if (b3Fabs(det(m_simplex->c[0]->w - m_simplex->c[3]->w,
+							   m_simplex->c[1]->w - m_simplex->c[3]->w,
+							   m_simplex->c[2]->w - m_simplex->c[3]->w)) > 0)
+					return (true);
+			}
+			break;
+		}
+		return (false);
+	}
+	/* Internals	*/
+	void getsupport(const b3Vector3& d, sSV& sv) const
+	{
+		sv.d = d / d.length();
+		sv.w = m_shape.Support(sv.d, m_verticesA, m_verticesB);
+	}
+	void removevertice(sSimplex& simplex)
+	{
+		m_free[m_nfree++] = simplex.c[--simplex.rank];
+	}
+	void appendvertice(sSimplex& simplex, const b3Vector3& v)
+	{
+		simplex.p[simplex.rank] = 0;
+		simplex.c[simplex.rank] = m_free[--m_nfree];
+		getsupport(v, *simplex.c[simplex.rank++]);
+	}
+	static b3Scalar det(const b3Vector3& a, const b3Vector3& b, const b3Vector3& c)
+	{
+		return (a.y * b.z * c.x + a.z * b.x * c.y -
+				a.x * b.z * c.y - a.y * b.x * c.z +
+				a.x * b.y * c.z - a.z * b.y * c.x);
+	}
+	static b3Scalar projectorigin(const b3Vector3& a,
+								  const b3Vector3& b,
+								  b3Scalar* w, unsigned int& m)
+	{
+		const b3Vector3 d = b - a;
+		const b3Scalar l = d.length2();
+		if (l > GJK_SIMPLEX2_EPS)
+		{
+			const b3Scalar t(l > 0 ? -b3Dot(a, d) / l : 0);
+			if (t >= 1)
+			{
+				w[0] = 0;
+				w[1] = 1;
+				m = 2;
+				return (b.length2());
+			}
+			else if (t <= 0)
+			{
+				w[0] = 1;
+				w[1] = 0;
+				m = 1;
+				return (a.length2());
+			}
+			else
+			{
+				w[0] = 1 - (w[1] = t);
+				m = 3;
+				return ((a + d * t).length2());
+			}
+		}
+		return (-1);
+	}
+	static b3Scalar projectorigin(const b3Vector3& a,
+								  const b3Vector3& b,
+								  const b3Vector3& c,
+								  b3Scalar* w, unsigned int& m)
+	{
+		static const unsigned int imd3[] = {1, 2, 0};
+		const b3Vector3* vt[] = {&a, &b, &c};
+		const b3Vector3 dl[] = {a - b, b - c, c - a};
+		const b3Vector3 n = b3Cross(dl[0], dl[1]);
+		const b3Scalar l = n.length2();
+		if (l > GJK_SIMPLEX3_EPS)
+		{
+			b3Scalar mindist = -1;
+			b3Scalar subw[2] = {0.f, 0.f};
+			unsigned int subm(0);
+			for (unsigned int i = 0; i < 3; ++i)
+			{
+				if (b3Dot(*vt[i], b3Cross(dl[i], n)) > 0)
+				{
+					const unsigned int j = imd3[i];
+					const b3Scalar subd(projectorigin(*vt[i], *vt[j], subw, subm));
+					if ((mindist < 0) || (subd < mindist))
+					{
+						mindist = subd;
+						m = static_cast<unsigned int>(((subm & 1) ? 1 << i : 0) + ((subm & 2) ? 1 << j : 0));
+						w[i] = subw[0];
+						w[j] = subw[1];
+						w[imd3[j]] = 0;
+					}
+				}
+			}
+			if (mindist < 0)
+			{
+				const b3Scalar d = b3Dot(a, n);
+				const b3Scalar s = b3Sqrt(l);
+				const b3Vector3 p = n * (d / l);
+				mindist = p.length2();
+				m = 7;
+				w[0] = (b3Cross(dl[1], b - p)).length() / s;
+				w[1] = (b3Cross(dl[2], c - p)).length() / s;
+				w[2] = 1 - (w[0] + w[1]);
+			}
+			return (mindist);
+		}
+		return (-1);
+	}
+	static b3Scalar projectorigin(const b3Vector3& a,
+								  const b3Vector3& b,
+								  const b3Vector3& c,
+								  const b3Vector3& d,
+								  b3Scalar* w, unsigned int& m)
+	{
+		static const unsigned int imd3[] = {1, 2, 0};
+		const b3Vector3* vt[] = {&a, &b, &c, &d};
+		const b3Vector3 dl[] = {a - d, b - d, c - d};
+		const b3Scalar vl = det(dl[0], dl[1], dl[2]);
+		const bool ng = (vl * b3Dot(a, b3Cross(b - c, a - b))) <= 0;
+		if (ng && (b3Fabs(vl) > GJK_SIMPLEX4_EPS))
+		{
+			b3Scalar mindist = -1;
+			b3Scalar subw[3] = {0.f, 0.f, 0.f};
+			unsigned int subm(0);
+			for (unsigned int i = 0; i < 3; ++i)
+			{
+				const unsigned int j = imd3[i];
+				const b3Scalar s = vl * b3Dot(d, b3Cross(dl[i], dl[j]));
+				if (s > 0)
+				{
+					const b3Scalar subd = projectorigin(*vt[i], *vt[j], d, subw, subm);
+					if ((mindist < 0) || (subd < mindist))
+					{
+						mindist = subd;
+						m = static_cast<unsigned int>((subm & 1 ? 1 << i : 0) +
+													  (subm & 2 ? 1 << j : 0) +
+													  (subm & 4 ? 8 : 0));
+						w[i] = subw[0];
+						w[j] = subw[1];
+						w[imd3[j]] = 0;
+						w[3] = subw[2];
+					}
+				}
+			}
+			if (mindist < 0)
+			{
+				mindist = 0;
+				m = 15;
+				w[0] = det(c, b, d) / vl;
+				w[1] = det(a, c, d) / vl;
+				w[2] = det(b, a, d) / vl;
+				w[3] = 1 - (w[0] + w[1] + w[2]);
+			}
+			return (mindist);
+		}
+		return (-1);
+	}
+};
+
+// EPA
+struct b3EPA
+{
+	/* Types		*/
+	typedef b3GJK::sSV sSV;
+	struct sFace
+	{
+		b3Vector3 n;
+		b3Scalar d;
+		sSV* c[3];
+		sFace* f[3];
+		sFace* l[2];
+		unsigned char e[3];
+		unsigned char pass;
+	};
+	struct sList
+	{
+		sFace* root;
+		unsigned int count;
+		sList() : root(0), count(0) {}
+	};
+	struct sHorizon
+	{
+		sFace* cf;
+		sFace* ff;
+		unsigned int nf;
+		sHorizon() : cf(0), ff(0), nf(0) {}
+	};
+	struct eStatus
+	{
+		enum _
+		{
+			Valid,
+			Touching,
+			Degenerated,
+			NonConvex,
+			InvalidHull,
+			OutOfFaces,
+			OutOfVertices,
+			AccuraryReached,
+			FallBack,
+			Failed
+		};
+	};
+	/* Fields		*/
+	eStatus::_ m_status;
+	b3GJK::sSimplex m_result;
+	b3Vector3 m_normal;
+	b3Scalar m_depth;
+	sSV m_sv_store[EPA_MAX_VERTICES];
+	sFace m_fc_store[EPA_MAX_FACES];
+	unsigned int m_nextsv;
+	sList m_hull;
+	sList m_stock;
+	/* Methods		*/
+	b3EPA()
+	{
+		Initialize();
+	}
+
+	static inline void bind(sFace* fa, unsigned int ea, sFace* fb, unsigned int eb)
+	{
+		fa->e[ea] = (unsigned char)eb;
+		fa->f[ea] = fb;
+		fb->e[eb] = (unsigned char)ea;
+		fb->f[eb] = fa;
+	}
+	static inline void append(sList& list, sFace* face)
+	{
+		face->l[0] = 0;
+		face->l[1] = list.root;
+		if (list.root) list.root->l[0] = face;
+		list.root = face;
+		++list.count;
+	}
+	static inline void remove(sList& list, sFace* face)
+	{
+		if (face->l[1]) face->l[1]->l[0] = face->l[0];
+		if (face->l[0]) face->l[0]->l[1] = face->l[1];
+		if (face == list.root) list.root = face->l[1];
+		--list.count;
+	}
+
+	void Initialize()
+	{
+		m_status = eStatus::Failed;
+		m_normal = b3MakeVector3(0, 0, 0);
+		m_depth = 0;
+		m_nextsv = 0;
+		for (unsigned int i = 0; i < EPA_MAX_FACES; ++i)
+		{
+			append(m_stock, &m_fc_store[EPA_MAX_FACES - i - 1]);
+		}
+	}
+	eStatus::_ Evaluate(b3GJK& gjk, const b3Vector3& guess)
+	{
+		b3GJK::sSimplex& simplex = *gjk.m_simplex;
+		if ((simplex.rank > 1) && gjk.EncloseOrigin())
+		{
+			/* Clean up				*/
+			while (m_hull.root)
+			{
+				sFace* f = m_hull.root;
+				remove(m_hull, f);
+				append(m_stock, f);
+			}
+			m_status = eStatus::Valid;
+			m_nextsv = 0;
+			/* Orient simplex		*/
+			if (gjk.det(simplex.c[0]->w - simplex.c[3]->w,
+						simplex.c[1]->w - simplex.c[3]->w,
+						simplex.c[2]->w - simplex.c[3]->w) < 0)
+			{
+				b3Swap(simplex.c[0], simplex.c[1]);
+				b3Swap(simplex.p[0], simplex.p[1]);
+			}
+			/* Build initial hull	*/
+			sFace* tetra[] = {newface(simplex.c[0], simplex.c[1], simplex.c[2], true),
+							  newface(simplex.c[1], simplex.c[0], simplex.c[3], true),
+							  newface(simplex.c[2], simplex.c[1], simplex.c[3], true),
+							  newface(simplex.c[0], simplex.c[2], simplex.c[3], true)};
+			if (m_hull.count == 4)
+			{
+				sFace* best = findbest();
+				sFace outer = *best;
+				unsigned int pass = 0;
+				unsigned int iterations = 0;
+				bind(tetra[0], 0, tetra[1], 0);
+				bind(tetra[0], 1, tetra[2], 0);
+				bind(tetra[0], 2, tetra[3], 0);
+				bind(tetra[1], 1, tetra[3], 2);
+				bind(tetra[1], 2, tetra[2], 1);
+				bind(tetra[2], 2, tetra[3], 1);
+				m_status = eStatus::Valid;
+				for (; iterations < EPA_MAX_ITERATIONS; ++iterations)
+				{
+					if (m_nextsv < EPA_MAX_VERTICES)
+					{
+						sHorizon horizon;
+						sSV* w = &m_sv_store[m_nextsv++];
+						bool valid = true;
+						best->pass = (unsigned char)(++pass);
+						gjk.getsupport(best->n, *w);
+						const b3Scalar wdist = b3Dot(best->n, w->w) - best->d;
+						if (wdist > EPA_ACCURACY)
+						{
+							for (unsigned int j = 0; (j < 3) && valid; ++j)
+							{
+								valid &= expand(pass, w,
+												best->f[j], best->e[j],
+												horizon);
+							}
+							if (valid && (horizon.nf >= 3))
+							{
+								bind(horizon.cf, 1, horizon.ff, 2);
+								remove(m_hull, best);
+								append(m_stock, best);
+								best = findbest();
+								outer = *best;
+							}
+							else
+							{
+								m_status = eStatus::Failed;
+								//m_status=eStatus::InvalidHull;
+								break;
+							}
+						}
+						else
+						{
+							m_status = eStatus::AccuraryReached;
+							break;
+						}
+					}
+					else
+					{
+						m_status = eStatus::OutOfVertices;
+						break;
+					}
+				}
+				const b3Vector3 projection = outer.n * outer.d;
+				m_normal = outer.n;
+				m_depth = outer.d;
+				m_result.rank = 3;
+				m_result.c[0] = outer.c[0];
+				m_result.c[1] = outer.c[1];
+				m_result.c[2] = outer.c[2];
+				m_result.p[0] = b3Cross(outer.c[1]->w - projection,
+										outer.c[2]->w - projection)
+									.length();
+				m_result.p[1] = b3Cross(outer.c[2]->w - projection,
+										outer.c[0]->w - projection)
+									.length();
+				m_result.p[2] = b3Cross(outer.c[0]->w - projection,
+										outer.c[1]->w - projection)
+									.length();
+				const b3Scalar sum = m_result.p[0] + m_result.p[1] + m_result.p[2];
+				m_result.p[0] /= sum;
+				m_result.p[1] /= sum;
+				m_result.p[2] /= sum;
+				return (m_status);
+			}
+		}
+		/* Fallback		*/
+		m_status = eStatus::FallBack;
+		m_normal = -guess;
+		const b3Scalar nl = m_normal.length();
+		if (nl > 0)
+			m_normal = m_normal / nl;
+		else
+			m_normal = b3MakeVector3(1, 0, 0);
+		m_depth = 0;
+		m_result.rank = 1;
+		m_result.c[0] = simplex.c[0];
+		m_result.p[0] = 1;
+		return (m_status);
+	}
+	bool getedgedist(sFace* face, sSV* a, sSV* b, b3Scalar& dist)
+	{
+		const b3Vector3 ba = b->w - a->w;
+		const b3Vector3 n_ab = b3Cross(ba, face->n);   // Outward facing edge normal direction, on triangle plane
+		const b3Scalar a_dot_nab = b3Dot(a->w, n_ab);  // Only care about the sign to determine inside/outside, so not normalization required
+
+		if (a_dot_nab < 0)
+		{
+			// Outside of edge a->b
+
+			const b3Scalar ba_l2 = ba.length2();
+			const b3Scalar a_dot_ba = b3Dot(a->w, ba);
+			const b3Scalar b_dot_ba = b3Dot(b->w, ba);
+
+			if (a_dot_ba > 0)
+			{
+				// Pick distance vertex a
+				dist = a->w.length();
+			}
+			else if (b_dot_ba < 0)
+			{
+				// Pick distance vertex b
+				dist = b->w.length();
+			}
+			else
+			{
+				// Pick distance to edge a->b
+				const b3Scalar a_dot_b = b3Dot(a->w, b->w);
+				dist = b3Sqrt(b3Max((a->w.length2() * b->w.length2() - a_dot_b * a_dot_b) / ba_l2, (b3Scalar)0));
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+	sFace* newface(sSV* a, sSV* b, sSV* c, bool forced)
+	{
+		if (m_stock.root)
+		{
+			sFace* face = m_stock.root;
+			remove(m_stock, face);
+			append(m_hull, face);
+			face->pass = 0;
+			face->c[0] = a;
+			face->c[1] = b;
+			face->c[2] = c;
+			face->n = b3Cross(b->w - a->w, c->w - a->w);
+			const b3Scalar l = face->n.length();
+			const bool v = l > EPA_ACCURACY;
+
+			if (v)
+			{
+				if (!(getedgedist(face, a, b, face->d) ||
+					  getedgedist(face, b, c, face->d) ||
+					  getedgedist(face, c, a, face->d)))
+				{
+					// Origin projects to the interior of the triangle
+					// Use distance to triangle plane
+					face->d = b3Dot(a->w, face->n) / l;
+				}
+
+				face->n /= l;
+				if (forced || (face->d >= -EPA_PLANE_EPS))
+				{
+					return face;
+				}
+				else
+					m_status = eStatus::NonConvex;
+			}
+			else
+				m_status = eStatus::Degenerated;
+
+			remove(m_hull, face);
+			append(m_stock, face);
+			return 0;
+		}
+		m_status = m_stock.root ? eStatus::OutOfVertices : eStatus::OutOfFaces;
+		return 0;
+	}
+	sFace* findbest()
+	{
+		sFace* minf = m_hull.root;
+		b3Scalar mind = minf->d * minf->d;
+		for (sFace* f = minf->l[1]; f; f = f->l[1])
+		{
+			const b3Scalar sqd = f->d * f->d;
+			if (sqd < mind)
+			{
+				minf = f;
+				mind = sqd;
+			}
+		}
+		return (minf);
+	}
+	bool expand(unsigned int pass, sSV* w, sFace* f, unsigned int e, sHorizon& horizon)
+	{
+		static const unsigned int i1m3[] = {1, 2, 0};
+		static const unsigned int i2m3[] = {2, 0, 1};
+		if (f->pass != pass)
+		{
+			const unsigned int e1 = i1m3[e];
+			if ((b3Dot(f->n, w->w) - f->d) < -EPA_PLANE_EPS)
+			{
+				sFace* nf = newface(f->c[e1], f->c[e], w, false);
+				if (nf)
+				{
+					bind(nf, 0, f, e);
+					if (horizon.cf)
+						bind(horizon.cf, 1, nf, 2);
+					else
+						horizon.ff = nf;
+					horizon.cf = nf;
+					++horizon.nf;
+					return (true);
+				}
+			}
+			else
+			{
+				const unsigned int e2 = i2m3[e];
+				f->pass = (unsigned char)pass;
+				if (expand(pass, w, f->f[e1], f->e[e1], horizon) &&
+					expand(pass, w, f->f[e2], f->e[e2], horizon))
+				{
+					remove(m_hull, f);
+					append(m_stock, f);
+					return (true);
+				}
+			}
+		}
+		return (false);
+	}
+};
+
+//
+static void Initialize(const b3Transform& transA, const b3Transform& transB,
+					   const b3ConvexPolyhedronData* hullA, const b3ConvexPolyhedronData* hullB,
+					   const b3AlignedObjectArray<b3Vector3>& verticesA,
+					   const b3AlignedObjectArray<b3Vector3>& verticesB,
+					   b3GjkEpaSolver2::sResults& results,
+					   tShape& shape,
+					   bool withmargins)
+{
+	/* Results		*/
+	results.witnesses[0] =
+		results.witnesses[1] = b3MakeVector3(0, 0, 0);
+	results.status = b3GjkEpaSolver2::sResults::Separated;
+	/* Shape		*/
+	shape.m_shapes[0] = hullA;
+	shape.m_shapes[1] = hullB;
+	shape.m_toshape1 = transB.getBasis().transposeTimes(transA.getBasis());
+	shape.m_toshape0 = transA.inverseTimes(transB);
+	shape.EnableMargin(withmargins);
+}
+
+}  // namespace gjkepa2_impl2
+
+//
+// Api
+//
+
+using namespace gjkepa2_impl2;
+
+//
+int b3GjkEpaSolver2::StackSizeRequirement()
+{
+	return (sizeof(b3GJK) + sizeof(b3EPA));
+}
+
+//
+bool b3GjkEpaSolver2::Distance(const b3Transform& transA, const b3Transform& transB,
+							   const b3ConvexPolyhedronData* hullA, const b3ConvexPolyhedronData* hullB,
+							   const b3AlignedObjectArray<b3Vector3>& verticesA,
+							   const b3AlignedObjectArray<b3Vector3>& verticesB,
+							   const b3Vector3& guess,
+							   sResults& results)
+{
+	tShape shape;
+	Initialize(transA, transB, hullA, hullB, verticesA, verticesB, results, shape, false);
+	b3GJK gjk(verticesA, verticesB);
+	b3GJK::eStatus::_ gjk_status = gjk.Evaluate(shape, guess);
+	if (gjk_status == b3GJK::eStatus::Valid)
+	{
+		b3Vector3 w0 = b3MakeVector3(0, 0, 0);
+		b3Vector3 w1 = b3MakeVector3(0, 0, 0);
+		for (unsigned int i = 0; i < gjk.m_simplex->rank; ++i)
+		{
+			const b3Scalar p = gjk.m_simplex->p[i];
+			w0 += shape.Support(gjk.m_simplex->c[i]->d, 0, verticesA, verticesB) * p;
+			w1 += shape.Support(-gjk.m_simplex->c[i]->d, 1, verticesA, verticesB) * p;
+		}
+		results.witnesses[0] = transA * w0;
+		results.witnesses[1] = transA * w1;
+		results.normal = w0 - w1;
+		results.distance = results.normal.length();
+		results.normal /= results.distance > GJK_MIN_DISTANCE ? results.distance : 1;
+		return (true);
+	}
+	else
+	{
+		results.status = gjk_status == b3GJK::eStatus::Inside ? sResults::Penetrating : sResults::GJK_Failed;
+		return (false);
+	}
+}
+
+//
+bool b3GjkEpaSolver2::Penetration(const b3Transform& transA, const b3Transform& transB,
+								  const b3ConvexPolyhedronData* hullA, const b3ConvexPolyhedronData* hullB,
+								  const b3AlignedObjectArray<b3Vector3>& verticesA,
+								  const b3AlignedObjectArray<b3Vector3>& verticesB,
+								  const b3Vector3& guess,
+								  sResults& results,
+								  bool usemargins)
+{
+	tShape shape;
+	Initialize(transA, transB, hullA, hullB, verticesA, verticesB, results, shape, usemargins);
+	b3GJK gjk(verticesA, verticesB);
+	b3GJK::eStatus::_ gjk_status = gjk.Evaluate(shape, guess);
+	switch (gjk_status)
+	{
+		case b3GJK::eStatus::Inside:
+		{
+			b3EPA epa;
+			b3EPA::eStatus::_ epa_status = epa.Evaluate(gjk, -guess);
+			if (epa_status != b3EPA::eStatus::Failed)
+			{
+				b3Vector3 w0 = b3MakeVector3(0, 0, 0);
+				for (unsigned int i = 0; i < epa.m_result.rank; ++i)
+				{
+					w0 += shape.Support(epa.m_result.c[i]->d, 0, verticesA, verticesB) * epa.m_result.p[i];
+				}
+				results.status = sResults::Penetrating;
+				results.witnesses[0] = transA * w0;
+				results.witnesses[1] = transA * (w0 - epa.m_normal * epa.m_depth);
+				results.normal = -epa.m_normal;
+				results.distance = -epa.m_depth;
+				return (true);
+			}
+			else
+				results.status = sResults::EPA_Failed;
+		}
+		break;
+		case b3GJK::eStatus::Failed:
+			results.status = sResults::GJK_Failed;
+			break;
+		default:
+		{
+		}
+	}
+	return (false);
+}
+
+#if 0
+//
+b3Scalar	b3GjkEpaSolver2::SignedDistance(const b3Vector3& position,
+											b3Scalar margin,
+											const b3Transform&	transA,
+											const b3ConvexPolyhedronData& hullA, 
+											const b3AlignedObjectArray<b3Vector3>& verticesA,
+											sResults& results)
+{
+	tShape			shape;
+	btSphereShape	shape1(margin);
+	b3Transform		wtrs1(b3Quaternion(0,0,0,1),position);
+	Initialize(shape0,wtrs0,&shape1,wtrs1,results,shape,false);
+	GJK				gjk;	
+	GJK::eStatus::_	gjk_status=gjk.Evaluate(shape,b3Vector3(1,1,1));
+	if(gjk_status==GJK::eStatus::Valid)
+	{
+		b3Vector3	w0=b3Vector3(0,0,0);
+		b3Vector3	w1=b3Vector3(0,0,0);
+		for(unsigned int i=0;i<gjk.m_simplex->rank;++i)
+		{
+			const b3Scalar	p=gjk.m_simplex->p[i];
+			w0+=shape.Support( gjk.m_simplex->c[i]->d,0)*p;
+			w1+=shape.Support(-gjk.m_simplex->c[i]->d,1)*p;
+		}
+		results.witnesses[0]	=	wtrs0*w0;
+		results.witnesses[1]	=	wtrs0*w1;
+		const b3Vector3	delta=	results.witnesses[1]-
+			results.witnesses[0];
+		const b3Scalar	margin=	shape0->getMarginNonVirtual()+
+			shape1.getMarginNonVirtual();
+		const b3Scalar	length=	delta.length();	
+		results.normal			=	delta/length;
+		results.witnesses[0]	+=	results.normal*margin;
+		return(length-margin);
+	}
+	else
+	{
+		if(gjk_status==GJK::eStatus::Inside)
+		{
+			if(Penetration(shape0,wtrs0,&shape1,wtrs1,gjk.m_ray,results))
+			{
+				const b3Vector3	delta=	results.witnesses[0]-
+					results.witnesses[1];
+				const b3Scalar	length=	delta.length();
+				if (length >= B3_EPSILON)
+					results.normal	=	delta/length;			
+				return(-length);
+			}
+		}	
+	}
+	return(B3_INFINITY);
+}
+
+//
+bool	b3GjkEpaSolver2::SignedDistance(const btConvexShape*	shape0,
+										const b3Transform&		wtrs0,
+										const btConvexShape*	shape1,
+										const b3Transform&		wtrs1,
+										const b3Vector3&		guess,
+										sResults&				results)
+{
+	if(!Distance(shape0,wtrs0,shape1,wtrs1,guess,results))
+		return(Penetration(shape0,wtrs0,shape1,wtrs1,guess,results,false));
+	else
+		return(true);
+}
+#endif
+
+/* Symbols cleanup		*/
+
+#undef GJK_MAX_ITERATIONS
+#undef GJK_ACCURACY
+#undef GJK_MIN_DISTANCE
+#undef GJK_DUPLICATED_EPS
+#undef GJK_SIMPLEX2_EPS
+#undef GJK_SIMPLEX3_EPS
+#undef GJK_SIMPLEX4_EPS
+
+#undef EPA_MAX_VERTICES
+#undef EPA_MAX_FACES
+#undef EPA_MAX_ITERATIONS
+#undef EPA_ACCURACY
+#undef EPA_FALLBACK
+#undef EPA_PLANE_EPS
+#undef EPA_INSIDE_EPS
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h
new file mode 100644
index 0000000..1a67a51
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h
@@ -0,0 +1,79 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+GJK-EPA collision solver by Nathanael Presson, 2008
+*/
+#ifndef B3_GJK_EPA2_H
+#define B3_GJK_EPA2_H
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Transform.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+
+///btGjkEpaSolver contributed under zlib by Nathanael Presson
+struct b3GjkEpaSolver2
+{
+	struct sResults
+	{
+		enum eStatus
+		{
+			Separated,   /* Shapes doesnt penetrate												*/
+			Penetrating, /* Shapes are penetrating												*/
+			GJK_Failed,  /* GJK phase fail, no big issue, shapes are probably just 'touching'	*/
+			EPA_Failed   /* EPA phase fail, bigger problem, need to save parameters, and debug	*/
+		} status;
+		b3Vector3 witnesses[2];
+		b3Vector3 normal;
+		b3Scalar distance;
+	};
+
+	static int StackSizeRequirement();
+
+	static bool Distance(const b3Transform& transA, const b3Transform& transB,
+						 const b3ConvexPolyhedronData* hullA, const b3ConvexPolyhedronData* hullB,
+						 const b3AlignedObjectArray<b3Vector3>& verticesA,
+						 const b3AlignedObjectArray<b3Vector3>& verticesB,
+						 const b3Vector3& guess,
+						 sResults& results);
+
+	static bool Penetration(const b3Transform& transA, const b3Transform& transB,
+							const b3ConvexPolyhedronData* hullA, const b3ConvexPolyhedronData* hullB,
+							const b3AlignedObjectArray<b3Vector3>& verticesA,
+							const b3AlignedObjectArray<b3Vector3>& verticesB,
+							const b3Vector3& guess,
+							sResults& results,
+							bool usemargins = true);
+#if 0
+static b3Scalar	SignedDistance(	const b3Vector3& position,
+								b3Scalar margin,
+								const btConvexShape* shape,
+								const btTransform& wtrs,
+								sResults& results);
+							
+static bool		SignedDistance(	const btConvexShape* shape0,const btTransform& wtrs0,
+								const btConvexShape* shape1,const btTransform& wtrs1,
+								const b3Vector3& guess,
+								sResults& results);
+#endif
+};
+
+#endif  //B3_GJK_EPA2_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.cpp
new file mode 100644
index 0000000..4938fa1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.cpp
@@ -0,0 +1,363 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3OptimizedBvh.h"
+#include "b3StridingMeshInterface.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
+
+b3OptimizedBvh::b3OptimizedBvh()
+{
+}
+
+b3OptimizedBvh::~b3OptimizedBvh()
+{
+}
+
+void b3OptimizedBvh::build(b3StridingMeshInterface* triangles, bool useQuantizedAabbCompression, const b3Vector3& bvhAabbMin, const b3Vector3& bvhAabbMax)
+{
+	m_useQuantization = useQuantizedAabbCompression;
+
+	// NodeArray	triangleNodes;
+
+	struct NodeTriangleCallback : public b3InternalTriangleIndexCallback
+	{
+		NodeArray& m_triangleNodes;
+
+		NodeTriangleCallback& operator=(NodeTriangleCallback& other)
+		{
+			m_triangleNodes.copyFromArray(other.m_triangleNodes);
+			return *this;
+		}
+
+		NodeTriangleCallback(NodeArray& triangleNodes)
+			: m_triangleNodes(triangleNodes)
+		{
+		}
+
+		virtual void internalProcessTriangleIndex(b3Vector3* triangle, int partId, int triangleIndex)
+		{
+			b3OptimizedBvhNode node;
+			b3Vector3 aabbMin, aabbMax;
+			aabbMin.setValue(b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT));
+			aabbMax.setValue(b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT));
+			aabbMin.setMin(triangle[0]);
+			aabbMax.setMax(triangle[0]);
+			aabbMin.setMin(triangle[1]);
+			aabbMax.setMax(triangle[1]);
+			aabbMin.setMin(triangle[2]);
+			aabbMax.setMax(triangle[2]);
+
+			//with quantization?
+			node.m_aabbMinOrg = aabbMin;
+			node.m_aabbMaxOrg = aabbMax;
+
+			node.m_escapeIndex = -1;
+
+			//for child nodes
+			node.m_subPart = partId;
+			node.m_triangleIndex = triangleIndex;
+			m_triangleNodes.push_back(node);
+		}
+	};
+	struct QuantizedNodeTriangleCallback : public b3InternalTriangleIndexCallback
+	{
+		QuantizedNodeArray& m_triangleNodes;
+		const b3QuantizedBvh* m_optimizedTree;  // for quantization
+
+		QuantizedNodeTriangleCallback& operator=(QuantizedNodeTriangleCallback& other)
+		{
+			m_triangleNodes.copyFromArray(other.m_triangleNodes);
+			m_optimizedTree = other.m_optimizedTree;
+			return *this;
+		}
+
+		QuantizedNodeTriangleCallback(QuantizedNodeArray& triangleNodes, const b3QuantizedBvh* tree)
+			: m_triangleNodes(triangleNodes), m_optimizedTree(tree)
+		{
+		}
+
+		virtual void internalProcessTriangleIndex(b3Vector3* triangle, int partId, int triangleIndex)
+		{
+			// The partId and triangle index must fit in the same (positive) integer
+			b3Assert(partId < (1 << MAX_NUM_PARTS_IN_BITS));
+			b3Assert(triangleIndex < (1 << (31 - MAX_NUM_PARTS_IN_BITS)));
+			//negative indices are reserved for escapeIndex
+			b3Assert(triangleIndex >= 0);
+
+			b3QuantizedBvhNode node;
+			b3Vector3 aabbMin, aabbMax;
+			aabbMin.setValue(b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT));
+			aabbMax.setValue(b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT));
+			aabbMin.setMin(triangle[0]);
+			aabbMax.setMax(triangle[0]);
+			aabbMin.setMin(triangle[1]);
+			aabbMax.setMax(triangle[1]);
+			aabbMin.setMin(triangle[2]);
+			aabbMax.setMax(triangle[2]);
+
+			//PCK: add these checks for zero dimensions of aabb
+			const b3Scalar MIN_AABB_DIMENSION = b3Scalar(0.002);
+			const b3Scalar MIN_AABB_HALF_DIMENSION = b3Scalar(0.001);
+			if (aabbMax.getX() - aabbMin.getX() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setX(aabbMax.getX() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setX(aabbMin.getX() - MIN_AABB_HALF_DIMENSION);
+			}
+			if (aabbMax.getY() - aabbMin.getY() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setY(aabbMax.getY() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setY(aabbMin.getY() - MIN_AABB_HALF_DIMENSION);
+			}
+			if (aabbMax.getZ() - aabbMin.getZ() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setZ(aabbMax.getZ() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setZ(aabbMin.getZ() - MIN_AABB_HALF_DIMENSION);
+			}
+
+			m_optimizedTree->quantize(&node.m_quantizedAabbMin[0], aabbMin, 0);
+			m_optimizedTree->quantize(&node.m_quantizedAabbMax[0], aabbMax, 1);
+
+			node.m_escapeIndexOrTriangleIndex = (partId << (31 - MAX_NUM_PARTS_IN_BITS)) | triangleIndex;
+
+			m_triangleNodes.push_back(node);
+		}
+	};
+
+	int numLeafNodes = 0;
+
+	if (m_useQuantization)
+	{
+		//initialize quantization values
+		setQuantizationValues(bvhAabbMin, bvhAabbMax);
+
+		QuantizedNodeTriangleCallback callback(m_quantizedLeafNodes, this);
+
+		triangles->InternalProcessAllTriangles(&callback, m_bvhAabbMin, m_bvhAabbMax);
+
+		//now we have an array of leafnodes in m_leafNodes
+		numLeafNodes = m_quantizedLeafNodes.size();
+
+		m_quantizedContiguousNodes.resize(2 * numLeafNodes);
+	}
+	else
+	{
+		NodeTriangleCallback callback(m_leafNodes);
+
+		b3Vector3 aabbMin = b3MakeVector3(b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT));
+		b3Vector3 aabbMax = b3MakeVector3(b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT));
+
+		triangles->InternalProcessAllTriangles(&callback, aabbMin, aabbMax);
+
+		//now we have an array of leafnodes in m_leafNodes
+		numLeafNodes = m_leafNodes.size();
+
+		m_contiguousNodes.resize(2 * numLeafNodes);
+	}
+
+	m_curNodeIndex = 0;
+
+	buildTree(0, numLeafNodes);
+
+	///if the entire tree is small then subtree size, we need to create a header info for the tree
+	if (m_useQuantization && !m_SubtreeHeaders.size())
+	{
+		b3BvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[0]);
+		subtree.m_rootNodeIndex = 0;
+		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
+	m_quantizedLeafNodes.clear();
+	m_leafNodes.clear();
+}
+
+void b3OptimizedBvh::refit(b3StridingMeshInterface* meshInterface, const b3Vector3& aabbMin, const b3Vector3& aabbMax)
+{
+	if (m_useQuantization)
+	{
+		setQuantizationValues(aabbMin, aabbMax);
+
+		updateBvhNodes(meshInterface, 0, m_curNodeIndex, 0);
+
+		///now update all subtree headers
+
+		int i;
+		for (i = 0; i < m_SubtreeHeaders.size(); i++)
+		{
+			b3BvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
+		}
+	}
+	else
+	{
+	}
+}
+
+void b3OptimizedBvh::refitPartial(b3StridingMeshInterface* meshInterface, const b3Vector3& aabbMin, const b3Vector3& aabbMax)
+{
+	//incrementally initialize quantization values
+	b3Assert(m_useQuantization);
+
+	b3Assert(aabbMin.getX() > m_bvhAabbMin.getX());
+	b3Assert(aabbMin.getY() > m_bvhAabbMin.getY());
+	b3Assert(aabbMin.getZ() > m_bvhAabbMin.getZ());
+
+	b3Assert(aabbMax.getX() < m_bvhAabbMax.getX());
+	b3Assert(aabbMax.getY() < m_bvhAabbMax.getY());
+	b3Assert(aabbMax.getZ() < m_bvhAabbMax.getZ());
+
+	///we should update all quantization values, using updateBvhNodes(meshInterface);
+	///but we only update chunks that overlap the given aabb
+
+	unsigned short quantizedQueryAabbMin[3];
+	unsigned short quantizedQueryAabbMax[3];
+
+	quantize(&quantizedQueryAabbMin[0], aabbMin, 0);
+	quantize(&quantizedQueryAabbMax[0], aabbMax, 1);
+
+	int i;
+	for (i = 0; i < this->m_SubtreeHeaders.size(); i++)
+	{
+		b3BvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+
+		//PCK: unsigned instead of bool
+		unsigned overlap = b3TestQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, subtree.m_quantizedAabbMin, subtree.m_quantizedAabbMax);
+		if (overlap != 0)
+		{
+			updateBvhNodes(meshInterface, subtree.m_rootNodeIndex, subtree.m_rootNodeIndex + subtree.m_subtreeSize, i);
+
+			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
+		}
+	}
+}
+
+void b3OptimizedBvh::updateBvhNodes(b3StridingMeshInterface* meshInterface, int firstNode, int endNode, int index)
+{
+	(void)index;
+
+	b3Assert(m_useQuantization);
+
+	int curNodeSubPart = -1;
+
+	//get access info to trianglemesh data
+	const unsigned char* vertexbase = 0;
+	int numverts = 0;
+	PHY_ScalarType type = PHY_INTEGER;
+	int stride = 0;
+	const unsigned char* indexbase = 0;
+	int indexstride = 0;
+	int numfaces = 0;
+	PHY_ScalarType indicestype = PHY_INTEGER;
+
+	b3Vector3 triangleVerts[3];
+	b3Vector3 aabbMin, aabbMax;
+	const b3Vector3& meshScaling = meshInterface->getScaling();
+
+	int i;
+	for (i = endNode - 1; i >= firstNode; i--)
+	{
+		b3QuantizedBvhNode& curNode = m_quantizedContiguousNodes[i];
+		if (curNode.isLeafNode())
+		{
+			//recalc aabb from triangle data
+			int nodeSubPart = curNode.getPartId();
+			int nodeTriangleIndex = curNode.getTriangleIndex();
+			if (nodeSubPart != curNodeSubPart)
+			{
+				if (curNodeSubPart >= 0)
+					meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
+				meshInterface->getLockedReadOnlyVertexIndexBase(&vertexbase, numverts, type, stride, &indexbase, indexstride, numfaces, indicestype, nodeSubPart);
+
+				curNodeSubPart = nodeSubPart;
+			}
+			//triangles->getLockedReadOnlyVertexIndexBase(vertexBase,numVerts,
+
+			unsigned int* gfxbase = (unsigned int*)(indexbase + nodeTriangleIndex * indexstride);
+
+			for (int j = 2; j >= 0; j--)
+			{
+				int graphicsindex;
+                                switch (indicestype) {
+                                        case PHY_INTEGER: graphicsindex = gfxbase[j]; break;
+                                        case PHY_SHORT: graphicsindex = ((unsigned short*)gfxbase)[j]; break;
+                                        case PHY_UCHAR: graphicsindex = ((unsigned char*)gfxbase)[j]; break;
+                                        default: b3Assert(0);
+                                }
+				if (type == PHY_FLOAT)
+				{
+					float* graphicsbase = (float*)(vertexbase + graphicsindex * stride);
+					triangleVerts[j] = b3MakeVector3(
+						graphicsbase[0] * meshScaling.getX(),
+						graphicsbase[1] * meshScaling.getY(),
+						graphicsbase[2] * meshScaling.getZ());
+				}
+				else
+				{
+					double* graphicsbase = (double*)(vertexbase + graphicsindex * stride);
+					triangleVerts[j] = b3MakeVector3(b3Scalar(graphicsbase[0] * meshScaling.getX()), b3Scalar(graphicsbase[1] * meshScaling.getY()), b3Scalar(graphicsbase[2] * meshScaling.getZ()));
+				}
+			}
+
+			aabbMin.setValue(b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT));
+			aabbMax.setValue(b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT));
+			aabbMin.setMin(triangleVerts[0]);
+			aabbMax.setMax(triangleVerts[0]);
+			aabbMin.setMin(triangleVerts[1]);
+			aabbMax.setMax(triangleVerts[1]);
+			aabbMin.setMin(triangleVerts[2]);
+			aabbMax.setMax(triangleVerts[2]);
+
+			quantize(&curNode.m_quantizedAabbMin[0], aabbMin, 0);
+			quantize(&curNode.m_quantizedAabbMax[0], aabbMax, 1);
+		}
+		else
+		{
+			//combine aabb from both children
+
+			b3QuantizedBvhNode* leftChildNode = &m_quantizedContiguousNodes[i + 1];
+
+			b3QuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? &m_quantizedContiguousNodes[i + 2] : &m_quantizedContiguousNodes[i + 1 + leftChildNode->getEscapeIndex()];
+
+			{
+				for (int i = 0; i < 3; i++)
+				{
+					curNode.m_quantizedAabbMin[i] = leftChildNode->m_quantizedAabbMin[i];
+					if (curNode.m_quantizedAabbMin[i] > rightChildNode->m_quantizedAabbMin[i])
+						curNode.m_quantizedAabbMin[i] = rightChildNode->m_quantizedAabbMin[i];
+
+					curNode.m_quantizedAabbMax[i] = leftChildNode->m_quantizedAabbMax[i];
+					if (curNode.m_quantizedAabbMax[i] < rightChildNode->m_quantizedAabbMax[i])
+						curNode.m_quantizedAabbMax[i] = rightChildNode->m_quantizedAabbMax[i];
+				}
+			}
+		}
+	}
+
+	if (curNodeSubPart >= 0)
+		meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
+}
+
+///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+b3OptimizedBvh* b3OptimizedBvh::deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
+{
+	b3QuantizedBvh* bvh = b3QuantizedBvh::deSerializeInPlace(i_alignedDataBuffer, i_dataBufferSize, i_swapEndian);
+
+	//we don't add additional data so just do a static upcast
+	return static_cast<b3OptimizedBvh*>(bvh);
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h
new file mode 100644
index 0000000..1286552
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h
@@ -0,0 +1,56 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///Contains contributions from Disney Studio's
+
+#ifndef B3_OPTIMIZED_BVH_H
+#define B3_OPTIMIZED_BVH_H
+
+#include "b3QuantizedBvh.h"
+
+class b3StridingMeshInterface;
+
+///The b3OptimizedBvh extends the b3QuantizedBvh to create AABB tree for triangle meshes, through the b3StridingMeshInterface.
+B3_ATTRIBUTE_ALIGNED16(class)
+b3OptimizedBvh : public b3QuantizedBvh
+{
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+protected:
+public:
+	b3OptimizedBvh();
+
+	virtual ~b3OptimizedBvh();
+
+	void build(b3StridingMeshInterface * triangles, bool useQuantizedAabbCompression, const b3Vector3& bvhAabbMin, const b3Vector3& bvhAabbMax);
+
+	void refit(b3StridingMeshInterface * triangles, const b3Vector3& aabbMin, const b3Vector3& aabbMax);
+
+	void refitPartial(b3StridingMeshInterface * triangles, const b3Vector3& aabbMin, const b3Vector3& aabbMax);
+
+	void updateBvhNodes(b3StridingMeshInterface * meshInterface, int firstNode, int endNode, int index);
+
+	/// Data buffer MUST be 16 byte aligned
+	virtual bool serializeInPlace(void* o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian) const
+	{
+		return b3QuantizedBvh::serialize(o_alignedDataBuffer, i_dataBufferSize, i_swapEndian);
+	}
+
+	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+	static b3OptimizedBvh* deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
+};
+
+#endif  //B3_OPTIMIZED_BVH_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp
new file mode 100644
index 0000000..e9a3d08
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp
@@ -0,0 +1,1254 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3QuantizedBvh.h"
+
+#include "Bullet3Geometry/b3AabbUtil.h"
+
+#define RAYAABB2
+
+b3QuantizedBvh::b3QuantizedBvh() : m_bulletVersion(B3_BULLET_VERSION),
+								   m_useQuantization(false),
+								   m_traversalMode(TRAVERSAL_STACKLESS_CACHE_FRIENDLY)
+								   //m_traversalMode(TRAVERSAL_STACKLESS)
+								   //m_traversalMode(TRAVERSAL_RECURSIVE)
+								   ,
+								   m_subtreeHeaderCount(0)  //PCK: add this line
+{
+	m_bvhAabbMin.setValue(-B3_INFINITY, -B3_INFINITY, -B3_INFINITY);
+	m_bvhAabbMax.setValue(B3_INFINITY, B3_INFINITY, B3_INFINITY);
+}
+
+void b3QuantizedBvh::buildInternal()
+{
+	///assumes that caller filled in the m_quantizedLeafNodes
+	m_useQuantization = true;
+	int numLeafNodes = 0;
+
+	if (m_useQuantization)
+	{
+		//now we have an array of leafnodes in m_leafNodes
+		numLeafNodes = m_quantizedLeafNodes.size();
+
+		m_quantizedContiguousNodes.resize(2 * numLeafNodes);
+	}
+
+	m_curNodeIndex = 0;
+
+	buildTree(0, numLeafNodes);
+
+	///if the entire tree is small then subtree size, we need to create a header info for the tree
+	if (m_useQuantization && !m_SubtreeHeaders.size())
+	{
+		b3BvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[0]);
+		subtree.m_rootNodeIndex = 0;
+		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
+	m_quantizedLeafNodes.clear();
+	m_leafNodes.clear();
+}
+
+///just for debugging, to visualize the individual patches/subtrees
+#ifdef DEBUG_PATCH_COLORS
+b3Vector3 color[4] =
+	{
+		b3Vector3(1, 0, 0),
+		b3Vector3(0, 1, 0),
+		b3Vector3(0, 0, 1),
+		b3Vector3(0, 1, 1)};
+#endif  //DEBUG_PATCH_COLORS
+
+void b3QuantizedBvh::setQuantizationValues(const b3Vector3& bvhAabbMin, const b3Vector3& bvhAabbMax, b3Scalar quantizationMargin)
+{
+	//enlarge the AABB to avoid division by zero when initializing the quantization values
+	b3Vector3 clampValue = b3MakeVector3(quantizationMargin, quantizationMargin, quantizationMargin);
+	m_bvhAabbMin = bvhAabbMin - clampValue;
+	m_bvhAabbMax = bvhAabbMax + clampValue;
+	b3Vector3 aabbSize = m_bvhAabbMax - m_bvhAabbMin;
+	m_bvhQuantization = b3MakeVector3(b3Scalar(65533.0), b3Scalar(65533.0), b3Scalar(65533.0)) / aabbSize;
+	m_useQuantization = true;
+}
+
+b3QuantizedBvh::~b3QuantizedBvh()
+{
+}
+
+#ifdef DEBUG_TREE_BUILDING
+int gStackDepth = 0;
+int gMaxStackDepth = 0;
+#endif  //DEBUG_TREE_BUILDING
+
+void b3QuantizedBvh::buildTree(int startIndex, int endIndex)
+{
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth++;
+	if (gStackDepth > gMaxStackDepth)
+		gMaxStackDepth = gStackDepth;
+#endif  //DEBUG_TREE_BUILDING
+
+	int splitAxis, splitIndex, i;
+	int numIndices = endIndex - startIndex;
+	int curIndex = m_curNodeIndex;
+
+	b3Assert(numIndices > 0);
+
+	if (numIndices == 1)
+	{
+#ifdef DEBUG_TREE_BUILDING
+		gStackDepth--;
+#endif  //DEBUG_TREE_BUILDING
+
+		assignInternalNodeFromLeafNode(m_curNodeIndex, startIndex);
+
+		m_curNodeIndex++;
+		return;
+	}
+	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+
+	splitAxis = calcSplittingAxis(startIndex, endIndex);
+
+	splitIndex = sortAndCalcSplittingIndex(startIndex, endIndex, splitAxis);
+
+	int internalNodeIndex = m_curNodeIndex;
+
+	//set the min aabb to 'inf' or a max value, and set the max aabb to a -inf/minimum value.
+	//the aabb will be expanded during buildTree/mergeInternalNodeAabb with actual node values
+	setInternalNodeAabbMin(m_curNodeIndex, m_bvhAabbMax);  //can't use b3Vector3(B3_INFINITY,B3_INFINITY,B3_INFINITY)) because of quantization
+	setInternalNodeAabbMax(m_curNodeIndex, m_bvhAabbMin);  //can't use b3Vector3(-B3_INFINITY,-B3_INFINITY,-B3_INFINITY)) because of quantization
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		mergeInternalNodeAabb(m_curNodeIndex, getAabbMin(i), getAabbMax(i));
+	}
+
+	m_curNodeIndex++;
+
+	//internalNode->m_escapeIndex;
+
+	int leftChildNodexIndex = m_curNodeIndex;
+
+	//build left child tree
+	buildTree(startIndex, splitIndex);
+
+	int rightChildNodexIndex = m_curNodeIndex;
+	//build right child tree
+	buildTree(splitIndex, endIndex);
+
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth--;
+#endif  //DEBUG_TREE_BUILDING
+
+	int escapeIndex = m_curNodeIndex - curIndex;
+
+	if (m_useQuantization)
+	{
+		//escapeIndex is the number of nodes of this subtree
+		const int sizeQuantizedNode = sizeof(b3QuantizedBvhNode);
+		const int treeSizeInBytes = escapeIndex * sizeQuantizedNode;
+		if (treeSizeInBytes > MAX_SUBTREE_SIZE_IN_BYTES)
+		{
+			updateSubtreeHeaders(leftChildNodexIndex, rightChildNodexIndex);
+		}
+	}
+	else
+	{
+	}
+
+	setInternalNodeEscapeIndex(internalNodeIndex, escapeIndex);
+}
+
+void b3QuantizedBvh::updateSubtreeHeaders(int leftChildNodexIndex, int rightChildNodexIndex)
+{
+	b3Assert(m_useQuantization);
+
+	b3QuantizedBvhNode& leftChildNode = m_quantizedContiguousNodes[leftChildNodexIndex];
+	int leftSubTreeSize = leftChildNode.isLeafNode() ? 1 : leftChildNode.getEscapeIndex();
+	int leftSubTreeSizeInBytes = leftSubTreeSize * static_cast<int>(sizeof(b3QuantizedBvhNode));
+
+	b3QuantizedBvhNode& rightChildNode = m_quantizedContiguousNodes[rightChildNodexIndex];
+	int rightSubTreeSize = rightChildNode.isLeafNode() ? 1 : rightChildNode.getEscapeIndex();
+	int rightSubTreeSizeInBytes = rightSubTreeSize * static_cast<int>(sizeof(b3QuantizedBvhNode));
+
+	if (leftSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		b3BvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(leftChildNode);
+		subtree.m_rootNodeIndex = leftChildNodexIndex;
+		subtree.m_subtreeSize = leftSubTreeSize;
+	}
+
+	if (rightSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		b3BvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(rightChildNode);
+		subtree.m_rootNodeIndex = rightChildNodexIndex;
+		subtree.m_subtreeSize = rightSubTreeSize;
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+}
+
+int b3QuantizedBvh::sortAndCalcSplittingIndex(int startIndex, int endIndex, int splitAxis)
+{
+	int i;
+	int splitIndex = startIndex;
+	int numIndices = endIndex - startIndex;
+	b3Scalar splitValue;
+
+	b3Vector3 means = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+	for (i = startIndex; i < endIndex; i++)
+	{
+		b3Vector3 center = b3Scalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		means += center;
+	}
+	means *= (b3Scalar(1.) / (b3Scalar)numIndices);
+
+	splitValue = means[splitAxis];
+
+	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
+	for (i = startIndex; i < endIndex; i++)
+	{
+		b3Vector3 center = b3Scalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		if (center[splitAxis] > splitValue)
+		{
+			//swap
+			swapLeafNodes(i, splitIndex);
+			splitIndex++;
+		}
+	}
+
+	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
+	//otherwise the tree-building might fail due to stack-overflows in certain cases.
+	//unbalanced1 is unsafe: it can cause stack overflows
+	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
+
+	//unbalanced2 should work too: always use center (perfect balanced trees)
+	//bool unbalanced2 = true;
+
+	//this should be safe too:
+	int rangeBalancedIndices = numIndices / 3;
+	bool unbalanced = ((splitIndex <= (startIndex + rangeBalancedIndices)) || (splitIndex >= (endIndex - 1 - rangeBalancedIndices)));
+
+	if (unbalanced)
+	{
+		splitIndex = startIndex + (numIndices >> 1);
+	}
+
+	bool unbal = (splitIndex == startIndex) || (splitIndex == (endIndex));
+	(void)unbal;
+	b3Assert(!unbal);
+
+	return splitIndex;
+}
+
+int b3QuantizedBvh::calcSplittingAxis(int startIndex, int endIndex)
+{
+	int i;
+
+	b3Vector3 means = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+	b3Vector3 variance = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+	int numIndices = endIndex - startIndex;
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		b3Vector3 center = b3Scalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		means += center;
+	}
+	means *= (b3Scalar(1.) / (b3Scalar)numIndices);
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		b3Vector3 center = b3Scalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		b3Vector3 diff2 = center - means;
+		diff2 = diff2 * diff2;
+		variance += diff2;
+	}
+	variance *= (b3Scalar(1.) / ((b3Scalar)numIndices - 1));
+
+	return variance.maxAxis();
+}
+
+void b3QuantizedBvh::reportAabbOverlappingNodex(b3NodeOverlapCallback* nodeCallback, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const
+{
+	//either choose recursive traversal (walkTree) or stackless (walkStacklessTree)
+
+	if (m_useQuantization)
+	{
+		///quantize query AABB
+		unsigned short int quantizedQueryAabbMin[3];
+		unsigned short int quantizedQueryAabbMax[3];
+		quantizeWithClamp(quantizedQueryAabbMin, aabbMin, 0);
+		quantizeWithClamp(quantizedQueryAabbMax, aabbMax, 1);
+
+		switch (m_traversalMode)
+		{
+			case TRAVERSAL_STACKLESS:
+				walkStacklessQuantizedTree(nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax, 0, m_curNodeIndex);
+				break;
+			case TRAVERSAL_STACKLESS_CACHE_FRIENDLY:
+				walkStacklessQuantizedTreeCacheFriendly(nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+				break;
+			case TRAVERSAL_RECURSIVE:
+			{
+				const b3QuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[0];
+				walkRecursiveQuantizedTreeAgainstQueryAabb(rootNode, nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+			}
+			break;
+			default:
+				//unsupported
+				b3Assert(0);
+		}
+	}
+	else
+	{
+		walkStacklessTree(nodeCallback, aabbMin, aabbMax);
+	}
+}
+
+static int b3s_maxIterations = 0;
+
+void b3QuantizedBvh::walkStacklessTree(b3NodeOverlapCallback* nodeCallback, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const
+{
+	b3Assert(!m_useQuantization);
+
+	const b3OptimizedBvhNode* rootNode = &m_contiguousNodes[0];
+	int escapeIndex, curIndex = 0;
+	int walkIterations = 0;
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	while (curIndex < m_curNodeIndex)
+	{
+		//catch bugs in tree data
+		b3Assert(walkIterations < m_curNodeIndex);
+
+		walkIterations++;
+		aabbOverlap = b3TestAabbAgainstAabb2(aabbMin, aabbMax, rootNode->m_aabbMinOrg, rootNode->m_aabbMaxOrg);
+		isLeafNode = rootNode->m_escapeIndex == -1;
+
+		//PCK: unsigned instead of bool
+		if (isLeafNode && (aabbOverlap != 0))
+		{
+			nodeCallback->processNode(rootNode->m_subPart, rootNode->m_triangleIndex);
+		}
+
+		//PCK: unsigned instead of bool
+		if ((aabbOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->m_escapeIndex;
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (b3s_maxIterations < walkIterations)
+		b3s_maxIterations = walkIterations;
+}
+
+/*
+///this was the original recursive traversal, before we optimized towards stackless traversal
+void	b3QuantizedBvh::walkTree(b3OptimizedBvhNode* rootNode,b3NodeOverlapCallback* nodeCallback,const b3Vector3& aabbMin,const b3Vector3& aabbMax) const
+{
+	bool isLeafNode, aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMin,rootNode->m_aabbMax);
+	if (aabbOverlap)
+	{
+		isLeafNode = (!rootNode->m_leftChild && !rootNode->m_rightChild);
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(rootNode);
+		} else
+		{
+			walkTree(rootNode->m_leftChild,nodeCallback,aabbMin,aabbMax);
+			walkTree(rootNode->m_rightChild,nodeCallback,aabbMin,aabbMax);
+		}
+	}
+
+}
+*/
+
+void b3QuantizedBvh::walkRecursiveQuantizedTreeAgainstQueryAabb(const b3QuantizedBvhNode* currentNode, b3NodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const
+{
+	b3Assert(m_useQuantization);
+
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	//PCK: unsigned instead of bool
+	aabbOverlap = b3TestQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, currentNode->m_quantizedAabbMin, currentNode->m_quantizedAabbMax);
+	isLeafNode = currentNode->isLeafNode();
+
+	//PCK: unsigned instead of bool
+	if (aabbOverlap != 0)
+	{
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(currentNode->getPartId(), currentNode->getTriangleIndex());
+		}
+		else
+		{
+			//process left and right children
+			const b3QuantizedBvhNode* leftChildNode = currentNode + 1;
+			walkRecursiveQuantizedTreeAgainstQueryAabb(leftChildNode, nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+
+			const b3QuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? leftChildNode + 1 : leftChildNode + leftChildNode->getEscapeIndex();
+			walkRecursiveQuantizedTreeAgainstQueryAabb(rightChildNode, nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+		}
+	}
+}
+
+void b3QuantizedBvh::walkStacklessTreeAgainstRay(b3NodeOverlapCallback* nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget, const b3Vector3& aabbMin, const b3Vector3& aabbMax, int startNodeIndex, int endNodeIndex) const
+{
+	b3Assert(!m_useQuantization);
+
+	const b3OptimizedBvhNode* rootNode = &m_contiguousNodes[0];
+	int escapeIndex, curIndex = 0;
+	int walkIterations = 0;
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap = 0;
+	unsigned rayBoxOverlap = 0;
+	b3Scalar lambda_max = 1.0;
+
+	/* Quick pruning by quantized box */
+	b3Vector3 rayAabbMin = raySource;
+	b3Vector3 rayAabbMax = raySource;
+	rayAabbMin.setMin(rayTarget);
+	rayAabbMax.setMax(rayTarget);
+
+	/* Add box cast extents to bounding box */
+	rayAabbMin += aabbMin;
+	rayAabbMax += aabbMax;
+
+#ifdef RAYAABB2
+	b3Vector3 rayDir = (rayTarget - raySource);
+	rayDir.normalize();
+	lambda_max = rayDir.dot(rayTarget - raySource);
+	///what about division by zero? --> just set rayDirection[i] to 1.0
+	b3Vector3 rayDirectionInverse;
+	rayDirectionInverse[0] = rayDir[0] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDir[0];
+	rayDirectionInverse[1] = rayDir[1] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDir[1];
+	rayDirectionInverse[2] = rayDir[2] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDir[2];
+	unsigned int sign[3] = {rayDirectionInverse[0] < 0.0, rayDirectionInverse[1] < 0.0, rayDirectionInverse[2] < 0.0};
+#endif
+
+	b3Vector3 bounds[2];
+
+	while (curIndex < m_curNodeIndex)
+	{
+		b3Scalar param = 1.0;
+		//catch bugs in tree data
+		b3Assert(walkIterations < m_curNodeIndex);
+
+		walkIterations++;
+
+		bounds[0] = rootNode->m_aabbMinOrg;
+		bounds[1] = rootNode->m_aabbMaxOrg;
+		/* Add box cast extents */
+		bounds[0] -= aabbMax;
+		bounds[1] -= aabbMin;
+
+		aabbOverlap = b3TestAabbAgainstAabb2(rayAabbMin, rayAabbMax, rootNode->m_aabbMinOrg, rootNode->m_aabbMaxOrg);
+		//perhaps profile if it is worth doing the aabbOverlap test first
+
+#ifdef RAYAABB2
+		///careful with this check: need to check division by zero (above) and fix the unQuantize method
+		///thanks Joerg/hiker for the reproduction case!
+		///http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1858
+		rayBoxOverlap = aabbOverlap ? b3RayAabb2(raySource, rayDirectionInverse, sign, bounds, param, 0.0f, lambda_max) : false;
+
+#else
+		b3Vector3 normal;
+		rayBoxOverlap = b3RayAabb(raySource, rayTarget, bounds[0], bounds[1], param, normal);
+#endif
+
+		isLeafNode = rootNode->m_escapeIndex == -1;
+
+		//PCK: unsigned instead of bool
+		if (isLeafNode && (rayBoxOverlap != 0))
+		{
+			nodeCallback->processNode(rootNode->m_subPart, rootNode->m_triangleIndex);
+		}
+
+		//PCK: unsigned instead of bool
+		if ((rayBoxOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->m_escapeIndex;
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (b3s_maxIterations < walkIterations)
+		b3s_maxIterations = walkIterations;
+}
+
+void b3QuantizedBvh::walkStacklessQuantizedTreeAgainstRay(b3NodeOverlapCallback* nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget, const b3Vector3& aabbMin, const b3Vector3& aabbMax, int startNodeIndex, int endNodeIndex) const
+{
+	b3Assert(m_useQuantization);
+
+	int curIndex = startNodeIndex;
+	int walkIterations = 0;
+	int subTreeSize = endNodeIndex - startNodeIndex;
+	(void)subTreeSize;
+
+	const b3QuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
+	int escapeIndex;
+
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned boxBoxOverlap = 0;
+	unsigned rayBoxOverlap = 0;
+
+	b3Scalar lambda_max = 1.0;
+
+#ifdef RAYAABB2
+	b3Vector3 rayDirection = (rayTarget - raySource);
+	rayDirection.normalize();
+	lambda_max = rayDirection.dot(rayTarget - raySource);
+	///what about division by zero? --> just set rayDirection[i] to 1.0
+	rayDirection[0] = rayDirection[0] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDirection[0];
+	rayDirection[1] = rayDirection[1] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDirection[1];
+	rayDirection[2] = rayDirection[2] == b3Scalar(0.0) ? b3Scalar(B3_LARGE_FLOAT) : b3Scalar(1.0) / rayDirection[2];
+	unsigned int sign[3] = {rayDirection[0] < 0.0, rayDirection[1] < 0.0, rayDirection[2] < 0.0};
+#endif
+
+	/* Quick pruning by quantized box */
+	b3Vector3 rayAabbMin = raySource;
+	b3Vector3 rayAabbMax = raySource;
+	rayAabbMin.setMin(rayTarget);
+	rayAabbMax.setMax(rayTarget);
+
+	/* Add box cast extents to bounding box */
+	rayAabbMin += aabbMin;
+	rayAabbMax += aabbMax;
+
+	unsigned short int quantizedQueryAabbMin[3];
+	unsigned short int quantizedQueryAabbMax[3];
+	quantizeWithClamp(quantizedQueryAabbMin, rayAabbMin, 0);
+	quantizeWithClamp(quantizedQueryAabbMax, rayAabbMax, 1);
+
+	while (curIndex < endNodeIndex)
+	{
+//#define VISUALLY_ANALYZE_BVH 1
+#ifdef VISUALLY_ANALYZE_BVH
+		//some code snippet to debugDraw aabb, to visually analyze bvh structure
+		static int drawPatch = 0;
+		//need some global access to a debugDrawer
+		extern b3IDebugDraw* debugDrawerPtr;
+		if (curIndex == drawPatch)
+		{
+			b3Vector3 aabbMin, aabbMax;
+			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
+			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
+			b3Vector3 color(1, 0, 0);
+			debugDrawerPtr->drawAabb(aabbMin, aabbMax, color);
+		}
+#endif  //VISUALLY_ANALYZE_BVH
+
+		//catch bugs in tree data
+		b3Assert(walkIterations < subTreeSize);
+
+		walkIterations++;
+		//PCK: unsigned instead of bool
+		// only interested if this is closer than any previous hit
+		b3Scalar param = 1.0;
+		rayBoxOverlap = 0;
+		boxBoxOverlap = b3TestQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, rootNode->m_quantizedAabbMin, rootNode->m_quantizedAabbMax);
+		isLeafNode = rootNode->isLeafNode();
+		if (boxBoxOverlap)
+		{
+			b3Vector3 bounds[2];
+			bounds[0] = unQuantize(rootNode->m_quantizedAabbMin);
+			bounds[1] = unQuantize(rootNode->m_quantizedAabbMax);
+			/* Add box cast extents */
+			bounds[0] -= aabbMax;
+			bounds[1] -= aabbMin;
+#if 0
+			b3Vector3 normal;
+			bool ra2 = b3RayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0, lambda_max);
+			bool ra = b3RayAabb (raySource, rayTarget, bounds[0], bounds[1], param, normal);
+			if (ra2 != ra)
+			{
+				printf("functions don't match\n");
+			}
+#endif
+#ifdef RAYAABB2
+			///careful with this check: need to check division by zero (above) and fix the unQuantize method
+			///thanks Joerg/hiker for the reproduction case!
+			///http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1858
+
+			//B3_PROFILE("b3RayAabb2");
+			rayBoxOverlap = b3RayAabb2(raySource, rayDirection, sign, bounds, param, 0.0f, lambda_max);
+
+#else
+			rayBoxOverlap = true;  //b3RayAabb(raySource, rayTarget, bounds[0], bounds[1], param, normal);
+#endif
+		}
+
+		if (isLeafNode && rayBoxOverlap)
+		{
+			nodeCallback->processNode(rootNode->getPartId(), rootNode->getTriangleIndex());
+		}
+
+		//PCK: unsigned instead of bool
+		if ((rayBoxOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->getEscapeIndex();
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (b3s_maxIterations < walkIterations)
+		b3s_maxIterations = walkIterations;
+}
+
+void b3QuantizedBvh::walkStacklessQuantizedTree(b3NodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax, int startNodeIndex, int endNodeIndex) const
+{
+	b3Assert(m_useQuantization);
+
+	int curIndex = startNodeIndex;
+	int walkIterations = 0;
+	int subTreeSize = endNodeIndex - startNodeIndex;
+	(void)subTreeSize;
+
+	const b3QuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
+	int escapeIndex;
+
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	while (curIndex < endNodeIndex)
+	{
+//#define VISUALLY_ANALYZE_BVH 1
+#ifdef VISUALLY_ANALYZE_BVH
+		//some code snippet to debugDraw aabb, to visually analyze bvh structure
+		static int drawPatch = 0;
+		//need some global access to a debugDrawer
+		extern b3IDebugDraw* debugDrawerPtr;
+		if (curIndex == drawPatch)
+		{
+			b3Vector3 aabbMin, aabbMax;
+			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
+			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
+			b3Vector3 color(1, 0, 0);
+			debugDrawerPtr->drawAabb(aabbMin, aabbMax, color);
+		}
+#endif  //VISUALLY_ANALYZE_BVH
+
+		//catch bugs in tree data
+		b3Assert(walkIterations < subTreeSize);
+
+		walkIterations++;
+		//PCK: unsigned instead of bool
+		aabbOverlap = b3TestQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, rootNode->m_quantizedAabbMin, rootNode->m_quantizedAabbMax);
+		isLeafNode = rootNode->isLeafNode();
+
+		if (isLeafNode && aabbOverlap)
+		{
+			nodeCallback->processNode(rootNode->getPartId(), rootNode->getTriangleIndex());
+		}
+
+		//PCK: unsigned instead of bool
+		if ((aabbOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->getEscapeIndex();
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (b3s_maxIterations < walkIterations)
+		b3s_maxIterations = walkIterations;
+}
+
+//This traversal can be called from Playstation 3 SPU
+void b3QuantizedBvh::walkStacklessQuantizedTreeCacheFriendly(b3NodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const
+{
+	b3Assert(m_useQuantization);
+
+	int i;
+
+	for (i = 0; i < this->m_SubtreeHeaders.size(); i++)
+	{
+		const b3BvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+
+		//PCK: unsigned instead of bool
+		unsigned overlap = b3TestQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, subtree.m_quantizedAabbMin, subtree.m_quantizedAabbMax);
+		if (overlap != 0)
+		{
+			walkStacklessQuantizedTree(nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax,
+									   subtree.m_rootNodeIndex,
+									   subtree.m_rootNodeIndex + subtree.m_subtreeSize);
+		}
+	}
+}
+
+void b3QuantizedBvh::reportRayOverlappingNodex(b3NodeOverlapCallback* nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget) const
+{
+	reportBoxCastOverlappingNodex(nodeCallback, raySource, rayTarget, b3MakeVector3(0, 0, 0), b3MakeVector3(0, 0, 0));
+}
+
+void b3QuantizedBvh::reportBoxCastOverlappingNodex(b3NodeOverlapCallback* nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const
+{
+	//always use stackless
+
+	if (m_useQuantization)
+	{
+		walkStacklessQuantizedTreeAgainstRay(nodeCallback, raySource, rayTarget, aabbMin, aabbMax, 0, m_curNodeIndex);
+	}
+	else
+	{
+		walkStacklessTreeAgainstRay(nodeCallback, raySource, rayTarget, aabbMin, aabbMax, 0, m_curNodeIndex);
+	}
+	/*
+	{
+		//recursive traversal
+		b3Vector3 qaabbMin = raySource;
+		b3Vector3 qaabbMax = raySource;
+		qaabbMin.setMin(rayTarget);
+		qaabbMax.setMax(rayTarget);
+		qaabbMin += aabbMin;
+		qaabbMax += aabbMax;
+		reportAabbOverlappingNodex(nodeCallback,qaabbMin,qaabbMax);
+	}
+	*/
+}
+
+void b3QuantizedBvh::swapLeafNodes(int i, int splitIndex)
+{
+	if (m_useQuantization)
+	{
+		b3QuantizedBvhNode tmp = m_quantizedLeafNodes[i];
+		m_quantizedLeafNodes[i] = m_quantizedLeafNodes[splitIndex];
+		m_quantizedLeafNodes[splitIndex] = tmp;
+	}
+	else
+	{
+		b3OptimizedBvhNode tmp = m_leafNodes[i];
+		m_leafNodes[i] = m_leafNodes[splitIndex];
+		m_leafNodes[splitIndex] = tmp;
+	}
+}
+
+void b3QuantizedBvh::assignInternalNodeFromLeafNode(int internalNode, int leafNodeIndex)
+{
+	if (m_useQuantization)
+	{
+		m_quantizedContiguousNodes[internalNode] = m_quantizedLeafNodes[leafNodeIndex];
+	}
+	else
+	{
+		m_contiguousNodes[internalNode] = m_leafNodes[leafNodeIndex];
+	}
+}
+
+//PCK: include
+#include <new>
+
+#if 0
+//PCK: consts
+static const unsigned BVH_ALIGNMENT = 16;
+static const unsigned BVH_ALIGNMENT_MASK = BVH_ALIGNMENT-1;
+
+static const unsigned BVH_ALIGNMENT_BLOCKS = 2;
+#endif
+
+unsigned int b3QuantizedBvh::getAlignmentSerializationPadding()
+{
+	// I changed this to 0 since the extra padding is not needed or used.
+	return 0;  //BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT;
+}
+
+unsigned b3QuantizedBvh::calculateSerializeBufferSize() const
+{
+	unsigned baseSize = sizeof(b3QuantizedBvh) + getAlignmentSerializationPadding();
+	baseSize += sizeof(b3BvhSubtreeInfo) * m_subtreeHeaderCount;
+	if (m_useQuantization)
+	{
+		return baseSize + m_curNodeIndex * sizeof(b3QuantizedBvhNode);
+	}
+	return baseSize + m_curNodeIndex * sizeof(b3OptimizedBvhNode);
+}
+
+bool b3QuantizedBvh::serialize(void* o_alignedDataBuffer, unsigned /*i_dataBufferSize */, bool i_swapEndian) const
+{
+	b3Assert(m_subtreeHeaderCount == m_SubtreeHeaders.size());
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	/*	if (i_dataBufferSize < calculateSerializeBufferSize() || o_alignedDataBuffer == NULL || (((unsigned)o_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
+	{
+		///check alignedment for buffer?
+		b3Assert(0);
+		return false;
+	}
+*/
+
+	b3QuantizedBvh* targetBvh = (b3QuantizedBvh*)o_alignedDataBuffer;
+
+	// construct the class so the virtual function table, etc will be set up
+	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
+	new (targetBvh) b3QuantizedBvh;
+
+	if (i_swapEndian)
+	{
+		targetBvh->m_curNodeIndex = static_cast<int>(b3SwapEndian(m_curNodeIndex));
+
+		b3SwapVector3Endian(m_bvhAabbMin, targetBvh->m_bvhAabbMin);
+		b3SwapVector3Endian(m_bvhAabbMax, targetBvh->m_bvhAabbMax);
+		b3SwapVector3Endian(m_bvhQuantization, targetBvh->m_bvhQuantization);
+
+		targetBvh->m_traversalMode = (b3TraversalMode)b3SwapEndian(m_traversalMode);
+		targetBvh->m_subtreeHeaderCount = static_cast<int>(b3SwapEndian(m_subtreeHeaderCount));
+	}
+	else
+	{
+		targetBvh->m_curNodeIndex = m_curNodeIndex;
+		targetBvh->m_bvhAabbMin = m_bvhAabbMin;
+		targetBvh->m_bvhAabbMax = m_bvhAabbMax;
+		targetBvh->m_bvhQuantization = m_bvhQuantization;
+		targetBvh->m_traversalMode = m_traversalMode;
+		targetBvh->m_subtreeHeaderCount = m_subtreeHeaderCount;
+	}
+
+	targetBvh->m_useQuantization = m_useQuantization;
+
+	unsigned char* nodeData = (unsigned char*)targetBvh;
+	nodeData += sizeof(b3QuantizedBvh);
+
+	unsigned sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	int nodeCount = m_curNodeIndex;
+
+	if (m_useQuantization)
+	{
+		targetBvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = b3SwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = b3SwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = b3SwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = b3SwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = b3SwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = b3SwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(b3SwapEndian(m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
+			}
+		}
+		else
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2];
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2];
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex;
+			}
+		}
+		nodeData += sizeof(b3QuantizedBvhNode) * nodeCount;
+
+		// this clears the pointer in the member variable it doesn't really do anything to the data
+		// it does call the destructor on the contained objects, but they are all classes with no destructor defined
+		// so the memory (which is not freed) is left alone
+		targetBvh->m_quantizedContiguousNodes.initializeFromBuffer(NULL, 0, 0);
+	}
+	else
+	{
+		targetBvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				b3SwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMinOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
+				b3SwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMaxOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
+
+				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(b3SwapEndian(m_contiguousNodes[nodeIndex].m_escapeIndex));
+				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(b3SwapEndian(m_contiguousNodes[nodeIndex].m_subPart));
+				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(b3SwapEndian(m_contiguousNodes[nodeIndex].m_triangleIndex));
+			}
+		}
+		else
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg = m_contiguousNodes[nodeIndex].m_aabbMinOrg;
+				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg = m_contiguousNodes[nodeIndex].m_aabbMaxOrg;
+
+				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = m_contiguousNodes[nodeIndex].m_escapeIndex;
+				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = m_contiguousNodes[nodeIndex].m_subPart;
+				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = m_contiguousNodes[nodeIndex].m_triangleIndex;
+			}
+		}
+		nodeData += sizeof(b3OptimizedBvhNode) * nodeCount;
+
+		// this clears the pointer in the member variable it doesn't really do anything to the data
+		// it does call the destructor on the contained objects, but they are all classes with no destructor defined
+		// so the memory (which is not freed) is left alone
+		targetBvh->m_contiguousNodes.initializeFromBuffer(NULL, 0, 0);
+	}
+
+	sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	// Now serialize the subtree headers
+	targetBvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, m_subtreeHeaderCount, m_subtreeHeaderCount);
+	if (i_swapEndian)
+	{
+		for (int i = 0; i < m_subtreeHeaderCount; i++)
+		{
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = b3SwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = b3SwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = b3SwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = b3SwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = b3SwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = b3SwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(b3SwapEndian(m_SubtreeHeaders[i].m_rootNodeIndex));
+			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(b3SwapEndian(m_SubtreeHeaders[i].m_subtreeSize));
+		}
+	}
+	else
+	{
+		for (int i = 0; i < m_subtreeHeaderCount; i++)
+		{
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = (m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = (m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = (m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = (m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = (m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = (m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = (m_SubtreeHeaders[i].m_rootNodeIndex);
+			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = (m_SubtreeHeaders[i].m_subtreeSize);
+
+			// need to clear padding in destination buffer
+			targetBvh->m_SubtreeHeaders[i].m_padding[0] = 0;
+			targetBvh->m_SubtreeHeaders[i].m_padding[1] = 0;
+			targetBvh->m_SubtreeHeaders[i].m_padding[2] = 0;
+		}
+	}
+	nodeData += sizeof(b3BvhSubtreeInfo) * m_subtreeHeaderCount;
+
+	// this clears the pointer in the member variable it doesn't really do anything to the data
+	// it does call the destructor on the contained objects, but they are all classes with no destructor defined
+	// so the memory (which is not freed) is left alone
+	targetBvh->m_SubtreeHeaders.initializeFromBuffer(NULL, 0, 0);
+
+	// this wipes the virtual function table pointer at the start of the buffer for the class
+	*((void**)o_alignedDataBuffer) = NULL;
+
+	return true;
+}
+
+b3QuantizedBvh* b3QuantizedBvh::deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
+{
+	if (i_alignedDataBuffer == NULL)  // || (((unsigned)i_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
+	{
+		return NULL;
+	}
+	b3QuantizedBvh* bvh = (b3QuantizedBvh*)i_alignedDataBuffer;
+
+	if (i_swapEndian)
+	{
+		bvh->m_curNodeIndex = static_cast<int>(b3SwapEndian(bvh->m_curNodeIndex));
+
+		b3UnSwapVector3Endian(bvh->m_bvhAabbMin);
+		b3UnSwapVector3Endian(bvh->m_bvhAabbMax);
+		b3UnSwapVector3Endian(bvh->m_bvhQuantization);
+
+		bvh->m_traversalMode = (b3TraversalMode)b3SwapEndian(bvh->m_traversalMode);
+		bvh->m_subtreeHeaderCount = static_cast<int>(b3SwapEndian(bvh->m_subtreeHeaderCount));
+	}
+
+	unsigned int calculatedBufSize = bvh->calculateSerializeBufferSize();
+	b3Assert(calculatedBufSize <= i_dataBufferSize);
+
+	if (calculatedBufSize > i_dataBufferSize)
+	{
+		return NULL;
+	}
+
+	unsigned char* nodeData = (unsigned char*)bvh;
+	nodeData += sizeof(b3QuantizedBvh);
+
+	unsigned sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	int nodeCount = bvh->m_curNodeIndex;
+
+	// Must call placement new to fill in virtual function table, etc, but we don't want to overwrite most data, so call a special version of the constructor
+	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
+	new (bvh) b3QuantizedBvh(*bvh, false);
+
+	if (bvh->m_useQuantization)
+	{
+		bvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = b3SwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = b3SwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = b3SwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
+
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = b3SwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = b3SwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = b3SwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
+
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(b3SwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
+			}
+		}
+		nodeData += sizeof(b3QuantizedBvhNode) * nodeCount;
+	}
+	else
+	{
+		bvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				b3UnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
+				b3UnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
+
+				bvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(b3SwapEndian(bvh->m_contiguousNodes[nodeIndex].m_escapeIndex));
+				bvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(b3SwapEndian(bvh->m_contiguousNodes[nodeIndex].m_subPart));
+				bvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(b3SwapEndian(bvh->m_contiguousNodes[nodeIndex].m_triangleIndex));
+			}
+		}
+		nodeData += sizeof(b3OptimizedBvhNode) * nodeCount;
+	}
+
+	sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	// Now serialize the subtree headers
+	bvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, bvh->m_subtreeHeaderCount, bvh->m_subtreeHeaderCount);
+	if (i_swapEndian)
+	{
+		for (int i = 0; i < bvh->m_subtreeHeaderCount; i++)
+		{
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = b3SwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = b3SwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = b3SwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = b3SwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = b3SwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = b3SwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			bvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(b3SwapEndian(bvh->m_SubtreeHeaders[i].m_rootNodeIndex));
+			bvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(b3SwapEndian(bvh->m_SubtreeHeaders[i].m_subtreeSize));
+		}
+	}
+
+	return bvh;
+}
+
+// Constructor that prevents b3Vector3's default constructor from being called
+b3QuantizedBvh::b3QuantizedBvh(b3QuantizedBvh& self, bool /* ownsMemory */) : m_bvhAabbMin(self.m_bvhAabbMin),
+																			  m_bvhAabbMax(self.m_bvhAabbMax),
+																			  m_bvhQuantization(self.m_bvhQuantization),
+																			  m_bulletVersion(B3_BULLET_VERSION)
+{
+}
+
+void b3QuantizedBvh::deSerializeFloat(struct b3QuantizedBvhFloatData& quantizedBvhFloatData)
+{
+	m_bvhAabbMax.deSerializeFloat(quantizedBvhFloatData.m_bvhAabbMax);
+	m_bvhAabbMin.deSerializeFloat(quantizedBvhFloatData.m_bvhAabbMin);
+	m_bvhQuantization.deSerializeFloat(quantizedBvhFloatData.m_bvhQuantization);
+
+	m_curNodeIndex = quantizedBvhFloatData.m_curNodeIndex;
+	m_useQuantization = quantizedBvhFloatData.m_useQuantization != 0;
+
+	{
+		int numElem = quantizedBvhFloatData.m_numContiguousLeafNodes;
+		m_contiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			b3OptimizedBvhNodeFloatData* memPtr = quantizedBvhFloatData.m_contiguousNodesPtr;
+
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_contiguousNodes[i].m_aabbMaxOrg.deSerializeFloat(memPtr->m_aabbMaxOrg);
+				m_contiguousNodes[i].m_aabbMinOrg.deSerializeFloat(memPtr->m_aabbMinOrg);
+				m_contiguousNodes[i].m_escapeIndex = memPtr->m_escapeIndex;
+				m_contiguousNodes[i].m_subPart = memPtr->m_subPart;
+				m_contiguousNodes[i].m_triangleIndex = memPtr->m_triangleIndex;
+			}
+		}
+	}
+
+	{
+		int numElem = quantizedBvhFloatData.m_numQuantizedContiguousNodes;
+		m_quantizedContiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			b3QuantizedBvhNodeData* memPtr = quantizedBvhFloatData.m_quantizedContiguousNodesPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_quantizedContiguousNodes[i].m_escapeIndexOrTriangleIndex = memPtr->m_escapeIndexOrTriangleIndex;
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+			}
+		}
+	}
+
+	m_traversalMode = b3TraversalMode(quantizedBvhFloatData.m_traversalMode);
+
+	{
+		int numElem = quantizedBvhFloatData.m_numSubtreeHeaders;
+		m_SubtreeHeaders.resize(numElem);
+		if (numElem)
+		{
+			b3BvhSubtreeInfoData* memPtr = quantizedBvhFloatData.m_subTreeInfoPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_SubtreeHeaders[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+				m_SubtreeHeaders[i].m_rootNodeIndex = memPtr->m_rootNodeIndex;
+				m_SubtreeHeaders[i].m_subtreeSize = memPtr->m_subtreeSize;
+			}
+		}
+	}
+}
+
+void b3QuantizedBvh::deSerializeDouble(struct b3QuantizedBvhDoubleData& quantizedBvhDoubleData)
+{
+	m_bvhAabbMax.deSerializeDouble(quantizedBvhDoubleData.m_bvhAabbMax);
+	m_bvhAabbMin.deSerializeDouble(quantizedBvhDoubleData.m_bvhAabbMin);
+	m_bvhQuantization.deSerializeDouble(quantizedBvhDoubleData.m_bvhQuantization);
+
+	m_curNodeIndex = quantizedBvhDoubleData.m_curNodeIndex;
+	m_useQuantization = quantizedBvhDoubleData.m_useQuantization != 0;
+
+	{
+		int numElem = quantizedBvhDoubleData.m_numContiguousLeafNodes;
+		m_contiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			b3OptimizedBvhNodeDoubleData* memPtr = quantizedBvhDoubleData.m_contiguousNodesPtr;
+
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_contiguousNodes[i].m_aabbMaxOrg.deSerializeDouble(memPtr->m_aabbMaxOrg);
+				m_contiguousNodes[i].m_aabbMinOrg.deSerializeDouble(memPtr->m_aabbMinOrg);
+				m_contiguousNodes[i].m_escapeIndex = memPtr->m_escapeIndex;
+				m_contiguousNodes[i].m_subPart = memPtr->m_subPart;
+				m_contiguousNodes[i].m_triangleIndex = memPtr->m_triangleIndex;
+			}
+		}
+	}
+
+	{
+		int numElem = quantizedBvhDoubleData.m_numQuantizedContiguousNodes;
+		m_quantizedContiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			b3QuantizedBvhNodeData* memPtr = quantizedBvhDoubleData.m_quantizedContiguousNodesPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_quantizedContiguousNodes[i].m_escapeIndexOrTriangleIndex = memPtr->m_escapeIndexOrTriangleIndex;
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+			}
+		}
+	}
+
+	m_traversalMode = b3TraversalMode(quantizedBvhDoubleData.m_traversalMode);
+
+	{
+		int numElem = quantizedBvhDoubleData.m_numSubtreeHeaders;
+		m_SubtreeHeaders.resize(numElem);
+		if (numElem)
+		{
+			b3BvhSubtreeInfoData* memPtr = quantizedBvhDoubleData.m_subTreeInfoPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_SubtreeHeaders[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+				m_SubtreeHeaders[i].m_rootNodeIndex = memPtr->m_rootNodeIndex;
+				m_SubtreeHeaders[i].m_subtreeSize = memPtr->m_subtreeSize;
+			}
+		}
+	}
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* b3QuantizedBvh::serialize(void* dataBuffer, b3Serializer* serializer) const
+{
+	b3Assert(0);
+	return 0;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h
new file mode 100644
index 0000000..1347082
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h
@@ -0,0 +1,511 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_QUANTIZED_BVH_H
+#define B3_QUANTIZED_BVH_H
+
+class b3Serializer;
+
+//#define DEBUG_CHECK_DEQUANTIZATION 1
+#ifdef DEBUG_CHECK_DEQUANTIZATION
+#ifdef __SPU__
+#define printf spu_printf
+#endif  //__SPU__
+
+#include <stdio.h>
+#include <stdlib.h>
+#endif  //DEBUG_CHECK_DEQUANTIZATION
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3AlignedAllocator.h"
+
+#ifdef B3_USE_DOUBLE_PRECISION
+#define b3QuantizedBvhData b3QuantizedBvhDoubleData
+#define b3OptimizedBvhNodeData b3OptimizedBvhNodeDoubleData
+#define b3QuantizedBvhDataName "b3QuantizedBvhDoubleData"
+#else
+#define b3QuantizedBvhData b3QuantizedBvhFloatData
+#define b3OptimizedBvhNodeData b3OptimizedBvhNodeFloatData
+#define b3QuantizedBvhDataName "b3QuantizedBvhFloatData"
+#endif
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3QuantizedBvhNodeData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3BvhSubtreeInfoData.h"
+
+//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclang/html/vclrf__m128.asp
+
+//Note: currently we have 16 bytes per quantized node
+#define MAX_SUBTREE_SIZE_IN_BYTES 2048
+
+// 10 gives the potential for 1024 parts, with at most 2^21 (2097152) (minus one
+// actually) triangles each (since the sign bit is reserved
+#define MAX_NUM_PARTS_IN_BITS 10
+
+///b3QuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3QuantizedBvhNode : public b3QuantizedBvhNodeData
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	bool isLeafNode() const
+	{
+		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+		return (m_escapeIndexOrTriangleIndex >= 0);
+	}
+	int getEscapeIndex() const
+	{
+		b3Assert(!isLeafNode());
+		return -m_escapeIndexOrTriangleIndex;
+	}
+	int getTriangleIndex() const
+	{
+		b3Assert(isLeafNode());
+		unsigned int x = 0;
+		unsigned int y = (~(x & 0)) << (31 - MAX_NUM_PARTS_IN_BITS);
+		// Get only the lower bits where the triangle index is stored
+		return (m_escapeIndexOrTriangleIndex & ~(y));
+	}
+	int getPartId() const
+	{
+		b3Assert(isLeafNode());
+		// Get only the highest bits where the part index is stored
+		return (m_escapeIndexOrTriangleIndex >> (31 - MAX_NUM_PARTS_IN_BITS));
+	}
+};
+
+/// b3OptimizedBvhNode contains both internal and leaf node information.
+/// Total node size is 44 bytes / node. You can use the compressed version of 16 bytes.
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3OptimizedBvhNode
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	//32 bytes
+	b3Vector3 m_aabbMinOrg;
+	b3Vector3 m_aabbMaxOrg;
+
+	//4
+	int m_escapeIndex;
+
+	//8
+	//for child nodes
+	int m_subPart;
+	int m_triangleIndex;
+
+	//pad the size to 64 bytes
+	char m_padding[20];
+};
+
+///b3BvhSubtreeInfo provides info to gather a subtree of limited size
+B3_ATTRIBUTE_ALIGNED16(class)
+b3BvhSubtreeInfo : public b3BvhSubtreeInfoData
+{
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3BvhSubtreeInfo()
+	{
+		//memset(&m_padding[0], 0, sizeof(m_padding));
+	}
+
+	void setAabbFromQuantizeNode(const b3QuantizedBvhNode& quantizedNode)
+	{
+		m_quantizedAabbMin[0] = quantizedNode.m_quantizedAabbMin[0];
+		m_quantizedAabbMin[1] = quantizedNode.m_quantizedAabbMin[1];
+		m_quantizedAabbMin[2] = quantizedNode.m_quantizedAabbMin[2];
+		m_quantizedAabbMax[0] = quantizedNode.m_quantizedAabbMax[0];
+		m_quantizedAabbMax[1] = quantizedNode.m_quantizedAabbMax[1];
+		m_quantizedAabbMax[2] = quantizedNode.m_quantizedAabbMax[2];
+	}
+};
+
+class b3NodeOverlapCallback
+{
+public:
+	virtual ~b3NodeOverlapCallback(){};
+
+	virtual void processNode(int subPart, int triangleIndex) = 0;
+};
+
+#include "Bullet3Common/b3AlignedAllocator.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+///for code readability:
+typedef b3AlignedObjectArray<b3OptimizedBvhNode> NodeArray;
+typedef b3AlignedObjectArray<b3QuantizedBvhNode> QuantizedNodeArray;
+typedef b3AlignedObjectArray<b3BvhSubtreeInfo> BvhSubtreeInfoArray;
+
+///The b3QuantizedBvh class stores an AABB tree that can be quickly traversed on CPU and Cell SPU.
+///It is used by the b3BvhTriangleMeshShape as midphase
+///It is recommended to use quantization for better performance and lower memory requirements.
+B3_ATTRIBUTE_ALIGNED16(class)
+b3QuantizedBvh
+{
+public:
+	enum b3TraversalMode
+	{
+		TRAVERSAL_STACKLESS = 0,
+		TRAVERSAL_STACKLESS_CACHE_FRIENDLY,
+		TRAVERSAL_RECURSIVE
+	};
+
+	b3Vector3 m_bvhAabbMin;
+	b3Vector3 m_bvhAabbMax;
+	b3Vector3 m_bvhQuantization;
+
+protected:
+	int m_bulletVersion;  //for serialization versioning. It could also be used to detect endianess.
+
+	int m_curNodeIndex;
+	//quantization data
+	bool m_useQuantization;
+
+	NodeArray m_leafNodes;
+	NodeArray m_contiguousNodes;
+	QuantizedNodeArray m_quantizedLeafNodes;
+	QuantizedNodeArray m_quantizedContiguousNodes;
+
+	b3TraversalMode m_traversalMode;
+	BvhSubtreeInfoArray m_SubtreeHeaders;
+
+	//This is only used for serialization so we don't have to add serialization directly to b3AlignedObjectArray
+	mutable int m_subtreeHeaderCount;
+
+	///two versions, one for quantized and normal nodes. This allows code-reuse while maintaining readability (no template/macro!)
+	///this might be refactored into a virtual, it is usually not calculated at run-time
+	void setInternalNodeAabbMin(int nodeIndex, const b3Vector3& aabbMin)
+	{
+		if (m_useQuantization)
+		{
+			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0], aabbMin, 0);
+		}
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg = aabbMin;
+		}
+	}
+	void setInternalNodeAabbMax(int nodeIndex, const b3Vector3& aabbMax)
+	{
+		if (m_useQuantization)
+		{
+			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0], aabbMax, 1);
+		}
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg = aabbMax;
+		}
+	}
+
+	b3Vector3 getAabbMin(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMin[0]);
+		}
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMinOrg;
+	}
+	b3Vector3 getAabbMax(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMax[0]);
+		}
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMaxOrg;
+	}
+
+	void setInternalNodeEscapeIndex(int nodeIndex, int escapeIndex)
+	{
+		if (m_useQuantization)
+		{
+			m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = -escapeIndex;
+		}
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_escapeIndex = escapeIndex;
+		}
+	}
+
+	void mergeInternalNodeAabb(int nodeIndex, const b3Vector3& newAabbMin, const b3Vector3& newAabbMax)
+	{
+		if (m_useQuantization)
+		{
+			unsigned short int quantizedAabbMin[3];
+			unsigned short int quantizedAabbMax[3];
+			quantize(quantizedAabbMin, newAabbMin, 0);
+			quantize(quantizedAabbMax, newAabbMax, 1);
+			for (int i = 0; i < 3; i++)
+			{
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] > quantizedAabbMin[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] = quantizedAabbMin[i];
+
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] < quantizedAabbMax[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] = quantizedAabbMax[i];
+			}
+		}
+		else
+		{
+			//non-quantized
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg.setMin(newAabbMin);
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg.setMax(newAabbMax);
+		}
+	}
+
+	void swapLeafNodes(int firstIndex, int secondIndex);
+
+	void assignInternalNodeFromLeafNode(int internalNode, int leafNodeIndex);
+
+protected:
+	void buildTree(int startIndex, int endIndex);
+
+	int calcSplittingAxis(int startIndex, int endIndex);
+
+	int sortAndCalcSplittingIndex(int startIndex, int endIndex, int splitAxis);
+
+	void walkStacklessTree(b3NodeOverlapCallback * nodeCallback, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const;
+
+	void walkStacklessQuantizedTreeAgainstRay(b3NodeOverlapCallback * nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget, const b3Vector3& aabbMin, const b3Vector3& aabbMax, int startNodeIndex, int endNodeIndex) const;
+	void walkStacklessQuantizedTree(b3NodeOverlapCallback * nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax, int startNodeIndex, int endNodeIndex) const;
+	void walkStacklessTreeAgainstRay(b3NodeOverlapCallback * nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget, const b3Vector3& aabbMin, const b3Vector3& aabbMax, int startNodeIndex, int endNodeIndex) const;
+
+	///tree traversal designed for small-memory processors like PS3 SPU
+	void walkStacklessQuantizedTreeCacheFriendly(b3NodeOverlapCallback * nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void walkRecursiveQuantizedTreeAgainstQueryAabb(const b3QuantizedBvhNode* currentNode, b3NodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void walkRecursiveQuantizedTreeAgainstQuantizedTree(const b3QuantizedBvhNode* treeNodeA, const b3QuantizedBvhNode* treeNodeB, b3NodeOverlapCallback* nodeCallback) const;
+
+	void updateSubtreeHeaders(int leftChildNodexIndex, int rightChildNodexIndex);
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3QuantizedBvh();
+
+	virtual ~b3QuantizedBvh();
+
+	///***************************************** expert/internal use only *************************
+	void setQuantizationValues(const b3Vector3& bvhAabbMin, const b3Vector3& bvhAabbMax, b3Scalar quantizationMargin = b3Scalar(1.0));
+	QuantizedNodeArray& getLeafNodeArray() { return m_quantizedLeafNodes; }
+	///buildInternal is expert use only: assumes that setQuantizationValues and LeafNodeArray are initialized
+	void buildInternal();
+	///***************************************** expert/internal use only *************************
+
+	void reportAabbOverlappingNodex(b3NodeOverlapCallback * nodeCallback, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const;
+	void reportRayOverlappingNodex(b3NodeOverlapCallback * nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget) const;
+	void reportBoxCastOverlappingNodex(b3NodeOverlapCallback * nodeCallback, const b3Vector3& raySource, const b3Vector3& rayTarget, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const;
+
+	B3_FORCE_INLINE void quantize(unsigned short* out, const b3Vector3& point, int isMax) const
+	{
+		b3Assert(m_useQuantization);
+
+		b3Assert(point.getX() <= m_bvhAabbMax.getX());
+		b3Assert(point.getY() <= m_bvhAabbMax.getY());
+		b3Assert(point.getZ() <= m_bvhAabbMax.getZ());
+
+		b3Assert(point.getX() >= m_bvhAabbMin.getX());
+		b3Assert(point.getY() >= m_bvhAabbMin.getY());
+		b3Assert(point.getZ() >= m_bvhAabbMin.getZ());
+
+		b3Vector3 v = (point - m_bvhAabbMin) * m_bvhQuantization;
+		///Make sure rounding is done in a way that unQuantize(quantizeWithClamp(...)) is conservative
+		///end-points always set the first bit, so that they are sorted properly (so that neighbouring AABBs overlap properly)
+		///@todo: double-check this
+		if (isMax)
+		{
+			out[0] = (unsigned short)(((unsigned short)(v.getX() + b3Scalar(1.)) | 1));
+			out[1] = (unsigned short)(((unsigned short)(v.getY() + b3Scalar(1.)) | 1));
+			out[2] = (unsigned short)(((unsigned short)(v.getZ() + b3Scalar(1.)) | 1));
+		}
+		else
+		{
+			out[0] = (unsigned short)(((unsigned short)(v.getX()) & 0xfffe));
+			out[1] = (unsigned short)(((unsigned short)(v.getY()) & 0xfffe));
+			out[2] = (unsigned short)(((unsigned short)(v.getZ()) & 0xfffe));
+		}
+
+#ifdef DEBUG_CHECK_DEQUANTIZATION
+		b3Vector3 newPoint = unQuantize(out);
+		if (isMax)
+		{
+			if (newPoint.getX() < point.getX())
+			{
+				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n", newPoint.getX() - point.getX(), newPoint.getX(), point.getX());
+			}
+			if (newPoint.getY() < point.getY())
+			{
+				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n", newPoint.getY() - point.getY(), newPoint.getY(), point.getY());
+			}
+			if (newPoint.getZ() < point.getZ())
+			{
+				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n", newPoint.getZ() - point.getZ(), newPoint.getZ(), point.getZ());
+			}
+		}
+		else
+		{
+			if (newPoint.getX() > point.getX())
+			{
+				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n", newPoint.getX() - point.getX(), newPoint.getX(), point.getX());
+			}
+			if (newPoint.getY() > point.getY())
+			{
+				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n", newPoint.getY() - point.getY(), newPoint.getY(), point.getY());
+			}
+			if (newPoint.getZ() > point.getZ())
+			{
+				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n", newPoint.getZ() - point.getZ(), newPoint.getZ(), point.getZ());
+			}
+		}
+#endif  //DEBUG_CHECK_DEQUANTIZATION
+	}
+
+	B3_FORCE_INLINE void quantizeWithClamp(unsigned short* out, const b3Vector3& point2, int isMax) const
+	{
+		b3Assert(m_useQuantization);
+
+		b3Vector3 clampedPoint(point2);
+		clampedPoint.setMax(m_bvhAabbMin);
+		clampedPoint.setMin(m_bvhAabbMax);
+
+		quantize(out, clampedPoint, isMax);
+	}
+
+	B3_FORCE_INLINE b3Vector3 unQuantize(const unsigned short* vecIn) const
+	{
+		b3Vector3 vecOut;
+		vecOut.setValue(
+			(b3Scalar)(vecIn[0]) / (m_bvhQuantization.getX()),
+			(b3Scalar)(vecIn[1]) / (m_bvhQuantization.getY()),
+			(b3Scalar)(vecIn[2]) / (m_bvhQuantization.getZ()));
+		vecOut += m_bvhAabbMin;
+		return vecOut;
+	}
+
+	///setTraversalMode let's you choose between stackless, recursive or stackless cache friendly tree traversal. Note this is only implemented for quantized trees.
+	void setTraversalMode(b3TraversalMode traversalMode)
+	{
+		m_traversalMode = traversalMode;
+	}
+
+	B3_FORCE_INLINE QuantizedNodeArray& getQuantizedNodeArray()
+	{
+		return m_quantizedContiguousNodes;
+	}
+
+	B3_FORCE_INLINE BvhSubtreeInfoArray& getSubtreeInfoArray()
+	{
+		return m_SubtreeHeaders;
+	}
+
+	////////////////////////////////////////////////////////////////////
+
+	/////Calculate space needed to store BVH for serialization
+	unsigned calculateSerializeBufferSize() const;
+
+	/// Data buffer MUST be 16 byte aligned
+	virtual bool serialize(void* o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian) const;
+
+	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+	static b3QuantizedBvh* deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
+
+	static unsigned int getAlignmentSerializationPadding();
+	//////////////////////////////////////////////////////////////////////
+
+	virtual int calculateSerializeBufferSizeNew() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, b3Serializer* serializer) const;
+
+	virtual void deSerializeFloat(struct b3QuantizedBvhFloatData & quantizedBvhFloatData);
+
+	virtual void deSerializeDouble(struct b3QuantizedBvhDoubleData & quantizedBvhDoubleData);
+
+	////////////////////////////////////////////////////////////////////
+
+	B3_FORCE_INLINE bool isQuantized()
+	{
+		return m_useQuantization;
+	}
+
+private:
+	// Special "copy" constructor that allows for in-place deserialization
+	// Prevents b3Vector3's default constructor from being called, but doesn't inialize much else
+	// ownsMemory should most likely be false if deserializing, and if you are not, don't call this (it also changes the function signature, which we need)
+	b3QuantizedBvh(b3QuantizedBvh & other, bool ownsMemory);
+};
+
+struct b3OptimizedBvhNodeFloatData
+{
+	b3Vector3FloatData m_aabbMinOrg;
+	b3Vector3FloatData m_aabbMaxOrg;
+	int m_escapeIndex;
+	int m_subPart;
+	int m_triangleIndex;
+	char m_pad[4];
+};
+
+struct b3OptimizedBvhNodeDoubleData
+{
+	b3Vector3DoubleData m_aabbMinOrg;
+	b3Vector3DoubleData m_aabbMaxOrg;
+	int m_escapeIndex;
+	int m_subPart;
+	int m_triangleIndex;
+	char m_pad[4];
+};
+
+struct b3QuantizedBvhFloatData
+{
+	b3Vector3FloatData m_bvhAabbMin;
+	b3Vector3FloatData m_bvhAabbMax;
+	b3Vector3FloatData m_bvhQuantization;
+	int m_curNodeIndex;
+	int m_useQuantization;
+	int m_numContiguousLeafNodes;
+	int m_numQuantizedContiguousNodes;
+	b3OptimizedBvhNodeFloatData* m_contiguousNodesPtr;
+	b3QuantizedBvhNodeData* m_quantizedContiguousNodesPtr;
+	b3BvhSubtreeInfoData* m_subTreeInfoPtr;
+	int m_traversalMode;
+	int m_numSubtreeHeaders;
+};
+
+struct b3QuantizedBvhDoubleData
+{
+	b3Vector3DoubleData m_bvhAabbMin;
+	b3Vector3DoubleData m_bvhAabbMax;
+	b3Vector3DoubleData m_bvhQuantization;
+	int m_curNodeIndex;
+	int m_useQuantization;
+	int m_numContiguousLeafNodes;
+	int m_numQuantizedContiguousNodes;
+	b3OptimizedBvhNodeDoubleData* m_contiguousNodesPtr;
+	b3QuantizedBvhNodeData* m_quantizedContiguousNodesPtr;
+
+	int m_traversalMode;
+	int m_numSubtreeHeaders;
+	b3BvhSubtreeInfoData* m_subTreeInfoPtr;
+};
+
+B3_FORCE_INLINE int b3QuantizedBvh::calculateSerializeBufferSizeNew() const
+{
+	return sizeof(b3QuantizedBvhData);
+}
+
+#endif  //B3_QUANTIZED_BVH_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.cpp
new file mode 100644
index 0000000..6b0c941
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.cpp
@@ -0,0 +1,207 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3StridingMeshInterface.h"
+
+b3StridingMeshInterface::~b3StridingMeshInterface()
+{
+}
+
+void b3StridingMeshInterface::InternalProcessAllTriangles(b3InternalTriangleIndexCallback* callback, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const
+{
+	(void)aabbMin;
+	(void)aabbMax;
+	int numtotalphysicsverts = 0;
+	int part, graphicssubparts = getNumSubParts();
+	const unsigned char* vertexbase;
+	const unsigned char* indexbase;
+	int indexstride;
+	PHY_ScalarType type;
+	PHY_ScalarType gfxindextype;
+	int stride, numverts, numtriangles;
+	int gfxindex;
+	b3Vector3 triangle[3];
+
+	b3Vector3 meshScaling = getScaling();
+
+	///if the number of parts is big, the performance might drop due to the innerloop switch on indextype
+	for (part = 0; part < graphicssubparts; part++)
+	{
+		getLockedReadOnlyVertexIndexBase(&vertexbase, numverts, type, stride, &indexbase, indexstride, numtriangles, gfxindextype, part);
+		numtotalphysicsverts += numtriangles * 3;  //upper bound
+
+		///unlike that developers want to pass in double-precision meshes in single-precision Bullet build
+		///so disable this feature by default
+		///see patch http://code.google.com/p/bullet/issues/detail?id=213
+
+		switch (type)
+		{
+			case PHY_FLOAT:
+			{
+				float* graphicsbase;
+
+				switch (gfxindextype)
+				{
+					case PHY_INTEGER:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned int* tri_indices = (unsigned int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (float*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_SHORT:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned short int* tri_indices = (unsigned short int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (float*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_UCHAR:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned char* tri_indices = (unsigned char*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (float*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					default:
+						b3Assert((gfxindextype == PHY_INTEGER) || (gfxindextype == PHY_SHORT));
+				}
+				break;
+			}
+
+			case PHY_DOUBLE:
+			{
+				double* graphicsbase;
+
+				switch (gfxindextype)
+				{
+					case PHY_INTEGER:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned int* tri_indices = (unsigned int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (double*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_SHORT:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned short int* tri_indices = (unsigned short int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (double*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_UCHAR:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned char* tri_indices = (unsigned char*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (double*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue((b3Scalar)graphicsbase[0] * meshScaling.getX(), (b3Scalar)graphicsbase[1] * meshScaling.getY(), (b3Scalar)graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					default:
+						b3Assert((gfxindextype == PHY_INTEGER) || (gfxindextype == PHY_SHORT));
+				}
+				break;
+			}
+			default:
+				b3Assert((type == PHY_FLOAT) || (type == PHY_DOUBLE));
+		}
+
+		unLockReadOnlyVertexBase(part);
+	}
+}
+
+void b3StridingMeshInterface::calculateAabbBruteForce(b3Vector3& aabbMin, b3Vector3& aabbMax)
+{
+	struct AabbCalculationCallback : public b3InternalTriangleIndexCallback
+	{
+		b3Vector3 m_aabbMin;
+		b3Vector3 m_aabbMax;
+
+		AabbCalculationCallback()
+		{
+			m_aabbMin.setValue(b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT));
+			m_aabbMax.setValue(b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT));
+		}
+
+		virtual void internalProcessTriangleIndex(b3Vector3* triangle, int partId, int triangleIndex)
+		{
+			(void)partId;
+			(void)triangleIndex;
+
+			m_aabbMin.setMin(triangle[0]);
+			m_aabbMax.setMax(triangle[0]);
+			m_aabbMin.setMin(triangle[1]);
+			m_aabbMax.setMax(triangle[1]);
+			m_aabbMin.setMin(triangle[2]);
+			m_aabbMax.setMax(triangle[2]);
+		}
+	};
+
+	//first calculate the total aabb for all triangles
+	AabbCalculationCallback aabbCallback;
+	aabbMin.setValue(b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT), b3Scalar(-B3_LARGE_FLOAT));
+	aabbMax.setValue(b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT));
+	InternalProcessAllTriangles(&aabbCallback, aabbMin, aabbMax);
+
+	aabbMin = aabbCallback.m_aabbMin;
+	aabbMax = aabbCallback.m_aabbMax;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h
new file mode 100644
index 0000000..2b1e63b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h
@@ -0,0 +1,158 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_STRIDING_MESHINTERFACE_H
+#define B3_STRIDING_MESHINTERFACE_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "b3TriangleCallback.h"
+//#include "b3ConcaveShape.h"
+
+enum PHY_ScalarType
+{
+	PHY_FLOAT,
+	PHY_DOUBLE,
+	PHY_INTEGER,
+	PHY_SHORT,
+	PHY_FIXEDPOINT88,
+	PHY_UCHAR
+};
+
+///	The b3StridingMeshInterface is the interface class for high performance generic access to triangle meshes, used in combination with b3BvhTriangleMeshShape and some other collision shapes.
+/// Using index striding of 3*sizeof(integer) it can use triangle arrays, using index striding of 1*sizeof(integer) it can handle triangle strips.
+/// It allows for sharing graphics and collision meshes. Also it provides locking/unlocking of graphics meshes that are in gpu memory.
+B3_ATTRIBUTE_ALIGNED16(class)
+b3StridingMeshInterface
+{
+protected:
+	b3Vector3 m_scaling;
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3StridingMeshInterface() : m_scaling(b3MakeVector3(b3Scalar(1.), b3Scalar(1.), b3Scalar(1.)))
+	{
+	}
+
+	virtual ~b3StridingMeshInterface();
+
+	virtual void InternalProcessAllTriangles(b3InternalTriangleIndexCallback * callback, const b3Vector3& aabbMin, const b3Vector3& aabbMax) const;
+
+	///brute force method to calculate aabb
+	void calculateAabbBruteForce(b3Vector3 & aabbMin, b3Vector3 & aabbMax);
+
+	/// get read and write access to a subpart of a triangle mesh
+	/// this subpart has a continuous array of vertices and indices
+	/// in this way the mesh can be handled as chunks of memory with striding
+	/// very similar to OpenGL vertexarray support
+	/// make a call to unLockVertexBase when the read and write access is finished
+	virtual void getLockedVertexIndexBase(unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& stride, unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0) = 0;
+
+	virtual void getLockedReadOnlyVertexIndexBase(const unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& stride, const unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0) const = 0;
+
+	/// unLockVertexBase finishes the access to a subpart of the triangle mesh
+	/// make a call to unLockVertexBase when the read and write access (using getLockedVertexIndexBase) is finished
+	virtual void unLockVertexBase(int subpart) = 0;
+
+	virtual void unLockReadOnlyVertexBase(int subpart) const = 0;
+
+	/// getNumSubParts returns the number of separate subparts
+	/// each subpart has a continuous array of vertices and indices
+	virtual int getNumSubParts() const = 0;
+
+	virtual void preallocateVertices(int numverts) = 0;
+	virtual void preallocateIndices(int numindices) = 0;
+
+	virtual bool hasPremadeAabb() const { return false; }
+	virtual void setPremadeAabb(const b3Vector3& aabbMin, const b3Vector3& aabbMax) const
+	{
+		(void)aabbMin;
+		(void)aabbMax;
+	}
+	virtual void getPremadeAabb(b3Vector3 * aabbMin, b3Vector3 * aabbMax) const
+	{
+		(void)aabbMin;
+		(void)aabbMax;
+	}
+
+	const b3Vector3& getScaling() const
+	{
+		return m_scaling;
+	}
+	void setScaling(const b3Vector3& scaling)
+	{
+		m_scaling = scaling;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	//virtual	const char*	serialize(void* dataBuffer, b3Serializer* serializer) const;
+};
+
+struct b3IntIndexData
+{
+	int m_value;
+};
+
+struct b3ShortIntIndexData
+{
+	short m_value;
+	char m_pad[2];
+};
+
+struct b3ShortIntIndexTripletData
+{
+	short m_values[3];
+	char m_pad[2];
+};
+
+struct b3CharIndexTripletData
+{
+	unsigned char m_values[3];
+	char m_pad;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct b3MeshPartData
+{
+	b3Vector3FloatData* m_vertices3f;
+	b3Vector3DoubleData* m_vertices3d;
+
+	b3IntIndexData* m_indices32;
+	b3ShortIntIndexTripletData* m_3indices16;
+	b3CharIndexTripletData* m_3indices8;
+
+	b3ShortIntIndexData* m_indices16;  //backwards compatibility
+
+	int m_numTriangles;  //length of m_indices = m_numTriangles
+	int m_numVertices;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct b3StridingMeshInterfaceData
+{
+	b3MeshPartData* m_meshPartsPtr;
+	b3Vector3FloatData m_scaling;
+	int m_numMeshParts;
+	char m_padding[4];
+};
+
+B3_FORCE_INLINE int b3StridingMeshInterface::calculateSerializeBufferSize() const
+{
+	return sizeof(b3StridingMeshInterfaceData);
+}
+
+#endif  //B3_STRIDING_MESHINTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3SupportMappings.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3SupportMappings.h
new file mode 100644
index 0000000..9ca1e22
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3SupportMappings.h
@@ -0,0 +1,34 @@
+
+#ifndef B3_SUPPORT_MAPPINGS_H
+#define B3_SUPPORT_MAPPINGS_H
+
+#include "Bullet3Common/b3Transform.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "b3VectorFloat4.h"
+
+struct b3GjkPairDetector;
+
+inline b3Vector3 localGetSupportVertexWithMargin(const float4& supportVec, const struct b3ConvexPolyhedronData* hull,
+												 const b3AlignedObjectArray<b3Vector3>& verticesA, b3Scalar margin)
+{
+	b3Vector3 supVec = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+	b3Scalar maxDot = b3Scalar(-B3_LARGE_FLOAT);
+
+	// Here we take advantage of dot(a, b*c) = dot(a*b, c).  Note: This is true mathematically, but not numerically.
+	if (0 < hull->m_numVertices)
+	{
+		const b3Vector3 scaled = supportVec;
+		int index = (int)scaled.maxDot(&verticesA[hull->m_vertexOffset], hull->m_numVertices, maxDot);
+		return verticesA[hull->m_vertexOffset + index];
+	}
+
+	return supVec;
+}
+
+inline b3Vector3 localGetSupportVertexWithoutMargin(const float4& supportVec, const struct b3ConvexPolyhedronData* hull,
+													const b3AlignedObjectArray<b3Vector3>& verticesA)
+{
+	return localGetSupportVertexWithMargin(supportVec, hull, verticesA, 0.f);
+}
+
+#endif  //B3_SUPPORT_MAPPINGS_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.cpp
new file mode 100644
index 0000000..3908c6d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.cpp
@@ -0,0 +1,24 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3TriangleCallback.h"
+
+b3TriangleCallback::~b3TriangleCallback()
+{
+}
+
+b3InternalTriangleIndexCallback::~b3InternalTriangleIndexCallback()
+{
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h
new file mode 100644
index 0000000..a0fd3e7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h
@@ -0,0 +1,37 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_TRIANGLE_CALLBACK_H
+#define B3_TRIANGLE_CALLBACK_H
+
+#include "Bullet3Common/b3Vector3.h"
+
+///The b3TriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles.
+///This callback is called by processAllTriangles for all b3ConcaveShape derived class, such as  b3BvhTriangleMeshShape, b3StaticPlaneShape and b3HeightfieldTerrainShape.
+class b3TriangleCallback
+{
+public:
+	virtual ~b3TriangleCallback();
+	virtual void processTriangle(b3Vector3* triangle, int partId, int triangleIndex) = 0;
+};
+
+class b3InternalTriangleIndexCallback
+{
+public:
+	virtual ~b3InternalTriangleIndexCallback();
+	virtual void internalProcessTriangleIndex(b3Vector3* triangle, int partId, int triangleIndex) = 0;
+};
+
+#endif  //B3_TRIANGLE_CALLBACK_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.cpp
new file mode 100644
index 0000000..73faadb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.cpp
@@ -0,0 +1,90 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3TriangleIndexVertexArray.h"
+
+b3TriangleIndexVertexArray::b3TriangleIndexVertexArray(int numTriangles, int* triangleIndexBase, int triangleIndexStride, int numVertices, b3Scalar* vertexBase, int vertexStride)
+	: m_hasAabb(0)
+{
+	b3IndexedMesh mesh;
+
+	mesh.m_numTriangles = numTriangles;
+	mesh.m_triangleIndexBase = (const unsigned char*)triangleIndexBase;
+	mesh.m_triangleIndexStride = triangleIndexStride;
+	mesh.m_numVertices = numVertices;
+	mesh.m_vertexBase = (const unsigned char*)vertexBase;
+	mesh.m_vertexStride = vertexStride;
+
+	addIndexedMesh(mesh);
+}
+
+b3TriangleIndexVertexArray::~b3TriangleIndexVertexArray()
+{
+}
+
+void b3TriangleIndexVertexArray::getLockedVertexIndexBase(unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart)
+{
+	b3Assert(subpart < getNumSubParts());
+
+	b3IndexedMesh& mesh = m_indexedMeshes[subpart];
+
+	numverts = mesh.m_numVertices;
+	(*vertexbase) = (unsigned char*)mesh.m_vertexBase;
+
+	type = mesh.m_vertexType;
+
+	vertexStride = mesh.m_vertexStride;
+
+	numfaces = mesh.m_numTriangles;
+
+	(*indexbase) = (unsigned char*)mesh.m_triangleIndexBase;
+	indexstride = mesh.m_triangleIndexStride;
+	indicestype = mesh.m_indexType;
+}
+
+void b3TriangleIndexVertexArray::getLockedReadOnlyVertexIndexBase(const unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, const unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart) const
+{
+	const b3IndexedMesh& mesh = m_indexedMeshes[subpart];
+
+	numverts = mesh.m_numVertices;
+	(*vertexbase) = (const unsigned char*)mesh.m_vertexBase;
+
+	type = mesh.m_vertexType;
+
+	vertexStride = mesh.m_vertexStride;
+
+	numfaces = mesh.m_numTriangles;
+	(*indexbase) = (const unsigned char*)mesh.m_triangleIndexBase;
+	indexstride = mesh.m_triangleIndexStride;
+	indicestype = mesh.m_indexType;
+}
+
+bool b3TriangleIndexVertexArray::hasPremadeAabb() const
+{
+	return (m_hasAabb == 1);
+}
+
+void b3TriangleIndexVertexArray::setPremadeAabb(const b3Vector3& aabbMin, const b3Vector3& aabbMax) const
+{
+	m_aabbMin = aabbMin;
+	m_aabbMax = aabbMax;
+	m_hasAabb = 1;  // this is intentionally an int see notes in header
+}
+
+void b3TriangleIndexVertexArray::getPremadeAabb(b3Vector3* aabbMin, b3Vector3* aabbMax) const
+{
+	*aabbMin = m_aabbMin;
+	*aabbMax = m_aabbMax;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h
new file mode 100644
index 0000000..57cbf03
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h
@@ -0,0 +1,128 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_TRIANGLE_INDEX_VERTEX_ARRAY_H
+#define B3_TRIANGLE_INDEX_VERTEX_ARRAY_H
+
+#include "b3StridingMeshInterface.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Scalar.h"
+
+///The b3IndexedMesh indexes a single vertex and index array. Multiple b3IndexedMesh objects can be passed into a b3TriangleIndexVertexArray using addIndexedMesh.
+///Instead of the number of indices, we pass the number of triangles.
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3IndexedMesh
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_numTriangles;
+	const unsigned char* m_triangleIndexBase;
+	// Size in byte of the indices for one triangle (3*sizeof(index_type) if the indices are tightly packed)
+	int m_triangleIndexStride;
+	int m_numVertices;
+	const unsigned char* m_vertexBase;
+	// Size of a vertex, in bytes
+	int m_vertexStride;
+
+	// The index type is set when adding an indexed mesh to the
+	// b3TriangleIndexVertexArray, do not set it manually
+	PHY_ScalarType m_indexType;
+
+	// The vertex type has a default type similar to Bullet's precision mode (float or double)
+	// but can be set manually if you for example run Bullet with double precision but have
+	// mesh data in single precision..
+	PHY_ScalarType m_vertexType;
+
+	b3IndexedMesh()
+		: m_indexType(PHY_INTEGER),
+#ifdef B3_USE_DOUBLE_PRECISION
+		  m_vertexType(PHY_DOUBLE)
+#else   // B3_USE_DOUBLE_PRECISION
+		  m_vertexType(PHY_FLOAT)
+#endif  // B3_USE_DOUBLE_PRECISION
+	{
+	}
+};
+
+typedef b3AlignedObjectArray<b3IndexedMesh> IndexedMeshArray;
+
+///The b3TriangleIndexVertexArray allows to access multiple triangle meshes, by indexing into existing triangle/index arrays.
+///Additional meshes can be added using addIndexedMesh
+///No duplcate is made of the vertex/index data, it only indexes into external vertex/index arrays.
+///So keep those arrays around during the lifetime of this b3TriangleIndexVertexArray.
+B3_ATTRIBUTE_ALIGNED16(class)
+b3TriangleIndexVertexArray : public b3StridingMeshInterface
+{
+protected:
+	IndexedMeshArray m_indexedMeshes;
+	int m_pad[2];
+	mutable int m_hasAabb;  // using int instead of bool to maintain alignment
+	mutable b3Vector3 m_aabbMin;
+	mutable b3Vector3 m_aabbMax;
+
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3TriangleIndexVertexArray() : m_hasAabb(0)
+	{
+	}
+
+	virtual ~b3TriangleIndexVertexArray();
+
+	//just to be backwards compatible
+	b3TriangleIndexVertexArray(int numTriangles, int* triangleIndexBase, int triangleIndexStride, int numVertices, b3Scalar* vertexBase, int vertexStride);
+
+	void addIndexedMesh(const b3IndexedMesh& mesh, PHY_ScalarType indexType = PHY_INTEGER)
+	{
+		m_indexedMeshes.push_back(mesh);
+		m_indexedMeshes[m_indexedMeshes.size() - 1].m_indexType = indexType;
+	}
+
+	virtual void getLockedVertexIndexBase(unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0);
+
+	virtual void getLockedReadOnlyVertexIndexBase(const unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, const unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0) const;
+
+	/// unLockVertexBase finishes the access to a subpart of the triangle mesh
+	/// make a call to unLockVertexBase when the read and write access (using getLockedVertexIndexBase) is finished
+	virtual void unLockVertexBase(int subpart) { (void)subpart; }
+
+	virtual void unLockReadOnlyVertexBase(int subpart) const { (void)subpart; }
+
+	/// getNumSubParts returns the number of separate subparts
+	/// each subpart has a continuous array of vertices and indices
+	virtual int getNumSubParts() const
+	{
+		return (int)m_indexedMeshes.size();
+	}
+
+	IndexedMeshArray& getIndexedMeshArray()
+	{
+		return m_indexedMeshes;
+	}
+
+	const IndexedMeshArray& getIndexedMeshArray() const
+	{
+		return m_indexedMeshes;
+	}
+
+	virtual void preallocateVertices(int numverts) { (void)numverts; }
+	virtual void preallocateIndices(int numindices) { (void)numindices; }
+
+	virtual bool hasPremadeAabb() const;
+	virtual void setPremadeAabb(const b3Vector3& aabbMin, const b3Vector3& aabbMax) const;
+	virtual void getPremadeAabb(b3Vector3 * aabbMin, b3Vector3 * aabbMax) const;
+};
+
+#endif  //B3_TRIANGLE_INDEX_VERTEX_ARRAY_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VectorFloat4.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VectorFloat4.h
new file mode 100644
index 0000000..5cc4b5a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VectorFloat4.h
@@ -0,0 +1,10 @@
+#ifndef B3_VECTOR_FLOAT4_H
+#define B3_VECTOR_FLOAT4_H
+
+#include "Bullet3Common/b3Transform.h"
+
+//#define cross3(a,b) (a.cross(b))
+#define float4 b3Vector3
+//#define make_float4(x,y,z,w) b3Vector4(x,y,z,w)
+
+#endif  //B3_VECTOR_FLOAT4_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.cpp
new file mode 100644
index 0000000..c599bca
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.cpp
@@ -0,0 +1,574 @@
+
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+	
+	Elsevier CDROM license agreements grants nonexclusive license to use the software
+	for any purpose, commercial or non-commercial as long as the following credit is included
+	identifying the original source of the software:
+
+	Parts of the source are "from the book Real-Time Collision Detection by
+	Christer Ericson, published by Morgan Kaufmann Publishers,
+	(c) 2005 Elsevier Inc."
+		
+*/
+
+#include "b3VoronoiSimplexSolver.h"
+
+#define VERTA 0
+#define VERTB 1
+#define VERTC 2
+#define VERTD 3
+
+#define B3_CATCH_DEGENERATE_TETRAHEDRON 1
+void b3VoronoiSimplexSolver::removeVertex(int index)
+{
+	b3Assert(m_numVertices > 0);
+	m_numVertices--;
+	m_simplexVectorW[index] = m_simplexVectorW[m_numVertices];
+	m_simplexPointsP[index] = m_simplexPointsP[m_numVertices];
+	m_simplexPointsQ[index] = m_simplexPointsQ[m_numVertices];
+}
+
+void b3VoronoiSimplexSolver::reduceVertices(const b3UsageBitfield& usedVerts)
+{
+	if ((numVertices() >= 4) && (!usedVerts.usedVertexD))
+		removeVertex(3);
+
+	if ((numVertices() >= 3) && (!usedVerts.usedVertexC))
+		removeVertex(2);
+
+	if ((numVertices() >= 2) && (!usedVerts.usedVertexB))
+		removeVertex(1);
+
+	if ((numVertices() >= 1) && (!usedVerts.usedVertexA))
+		removeVertex(0);
+}
+
+//clear the simplex, remove all the vertices
+void b3VoronoiSimplexSolver::reset()
+{
+	m_cachedValidClosest = false;
+	m_numVertices = 0;
+	m_needsUpdate = true;
+	m_lastW = b3MakeVector3(b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT), b3Scalar(B3_LARGE_FLOAT));
+	m_cachedBC.reset();
+}
+
+//add a vertex
+void b3VoronoiSimplexSolver::addVertex(const b3Vector3& w, const b3Vector3& p, const b3Vector3& q)
+{
+	m_lastW = w;
+	m_needsUpdate = true;
+
+	m_simplexVectorW[m_numVertices] = w;
+	m_simplexPointsP[m_numVertices] = p;
+	m_simplexPointsQ[m_numVertices] = q;
+
+	m_numVertices++;
+}
+
+bool b3VoronoiSimplexSolver::updateClosestVectorAndPoints()
+{
+	if (m_needsUpdate)
+	{
+		m_cachedBC.reset();
+
+		m_needsUpdate = false;
+
+		switch (numVertices())
+		{
+			case 0:
+				m_cachedValidClosest = false;
+				break;
+			case 1:
+			{
+				m_cachedP1 = m_simplexPointsP[0];
+				m_cachedP2 = m_simplexPointsQ[0];
+				m_cachedV = m_cachedP1 - m_cachedP2;  //== m_simplexVectorW[0]
+				m_cachedBC.reset();
+				m_cachedBC.setBarycentricCoordinates(b3Scalar(1.), b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+				m_cachedValidClosest = m_cachedBC.isValid();
+				break;
+			};
+			case 2:
+			{
+				//closest point origin from line segment
+				const b3Vector3& from = m_simplexVectorW[0];
+				const b3Vector3& to = m_simplexVectorW[1];
+				b3Vector3 nearest;
+
+				b3Vector3 p = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+				b3Vector3 diff = p - from;
+				b3Vector3 v = to - from;
+				b3Scalar t = v.dot(diff);
+
+				if (t > 0)
+				{
+					b3Scalar dotVV = v.dot(v);
+					if (t < dotVV)
+					{
+						t /= dotVV;
+						diff -= t * v;
+						m_cachedBC.m_usedVertices.usedVertexA = true;
+						m_cachedBC.m_usedVertices.usedVertexB = true;
+					}
+					else
+					{
+						t = 1;
+						diff -= v;
+						//reduce to 1 point
+						m_cachedBC.m_usedVertices.usedVertexB = true;
+					}
+				}
+				else
+				{
+					t = 0;
+					//reduce to 1 point
+					m_cachedBC.m_usedVertices.usedVertexA = true;
+				}
+				m_cachedBC.setBarycentricCoordinates(1 - t, t);
+				nearest = from + t * v;
+
+				m_cachedP1 = m_simplexPointsP[0] + t * (m_simplexPointsP[1] - m_simplexPointsP[0]);
+				m_cachedP2 = m_simplexPointsQ[0] + t * (m_simplexPointsQ[1] - m_simplexPointsQ[0]);
+				m_cachedV = m_cachedP1 - m_cachedP2;
+
+				reduceVertices(m_cachedBC.m_usedVertices);
+
+				m_cachedValidClosest = m_cachedBC.isValid();
+				break;
+			}
+			case 3:
+			{
+				//closest point origin from triangle
+				b3Vector3 p = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+
+				const b3Vector3& a = m_simplexVectorW[0];
+				const b3Vector3& b = m_simplexVectorW[1];
+				const b3Vector3& c = m_simplexVectorW[2];
+
+				closestPtPointTriangle(p, a, b, c, m_cachedBC);
+				m_cachedP1 = m_simplexPointsP[0] * m_cachedBC.m_barycentricCoords[0] +
+							 m_simplexPointsP[1] * m_cachedBC.m_barycentricCoords[1] +
+							 m_simplexPointsP[2] * m_cachedBC.m_barycentricCoords[2];
+
+				m_cachedP2 = m_simplexPointsQ[0] * m_cachedBC.m_barycentricCoords[0] +
+							 m_simplexPointsQ[1] * m_cachedBC.m_barycentricCoords[1] +
+							 m_simplexPointsQ[2] * m_cachedBC.m_barycentricCoords[2];
+
+				m_cachedV = m_cachedP1 - m_cachedP2;
+
+				reduceVertices(m_cachedBC.m_usedVertices);
+				m_cachedValidClosest = m_cachedBC.isValid();
+
+				break;
+			}
+			case 4:
+			{
+				b3Vector3 p = b3MakeVector3(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+
+				const b3Vector3& a = m_simplexVectorW[0];
+				const b3Vector3& b = m_simplexVectorW[1];
+				const b3Vector3& c = m_simplexVectorW[2];
+				const b3Vector3& d = m_simplexVectorW[3];
+
+				bool hasSeparation = closestPtPointTetrahedron(p, a, b, c, d, m_cachedBC);
+
+				if (hasSeparation)
+				{
+					m_cachedP1 = m_simplexPointsP[0] * m_cachedBC.m_barycentricCoords[0] +
+								 m_simplexPointsP[1] * m_cachedBC.m_barycentricCoords[1] +
+								 m_simplexPointsP[2] * m_cachedBC.m_barycentricCoords[2] +
+								 m_simplexPointsP[3] * m_cachedBC.m_barycentricCoords[3];
+
+					m_cachedP2 = m_simplexPointsQ[0] * m_cachedBC.m_barycentricCoords[0] +
+								 m_simplexPointsQ[1] * m_cachedBC.m_barycentricCoords[1] +
+								 m_simplexPointsQ[2] * m_cachedBC.m_barycentricCoords[2] +
+								 m_simplexPointsQ[3] * m_cachedBC.m_barycentricCoords[3];
+
+					m_cachedV = m_cachedP1 - m_cachedP2;
+					reduceVertices(m_cachedBC.m_usedVertices);
+				}
+				else
+				{
+					//					printf("sub distance got penetration\n");
+
+					if (m_cachedBC.m_degenerate)
+					{
+						m_cachedValidClosest = false;
+					}
+					else
+					{
+						m_cachedValidClosest = true;
+						//degenerate case == false, penetration = true + zero
+						m_cachedV.setValue(b3Scalar(0.), b3Scalar(0.), b3Scalar(0.));
+					}
+					break;
+				}
+
+				m_cachedValidClosest = m_cachedBC.isValid();
+
+				//closest point origin from tetrahedron
+				break;
+			}
+			default:
+			{
+				m_cachedValidClosest = false;
+			}
+		};
+	}
+
+	return m_cachedValidClosest;
+}
+
+//return/calculate the closest vertex
+bool b3VoronoiSimplexSolver::closest(b3Vector3& v)
+{
+	bool succes = updateClosestVectorAndPoints();
+	v = m_cachedV;
+	return succes;
+}
+
+b3Scalar b3VoronoiSimplexSolver::maxVertex()
+{
+	int i, numverts = numVertices();
+	b3Scalar maxV = b3Scalar(0.);
+	for (i = 0; i < numverts; i++)
+	{
+		b3Scalar curLen2 = m_simplexVectorW[i].length2();
+		if (maxV < curLen2)
+			maxV = curLen2;
+	}
+	return maxV;
+}
+
+//return the current simplex
+int b3VoronoiSimplexSolver::getSimplex(b3Vector3* pBuf, b3Vector3* qBuf, b3Vector3* yBuf) const
+{
+	int i;
+	for (i = 0; i < numVertices(); i++)
+	{
+		yBuf[i] = m_simplexVectorW[i];
+		pBuf[i] = m_simplexPointsP[i];
+		qBuf[i] = m_simplexPointsQ[i];
+	}
+	return numVertices();
+}
+
+bool b3VoronoiSimplexSolver::inSimplex(const b3Vector3& w)
+{
+	bool found = false;
+	int i, numverts = numVertices();
+	//b3Scalar maxV = b3Scalar(0.);
+
+	//w is in the current (reduced) simplex
+	for (i = 0; i < numverts; i++)
+	{
+#ifdef BT_USE_EQUAL_VERTEX_THRESHOLD
+		if (m_simplexVectorW[i].distance2(w) <= m_equalVertexThreshold)
+#else
+		if (m_simplexVectorW[i] == w)
+#endif
+			found = true;
+	}
+
+	//check in case lastW is already removed
+	if (w == m_lastW)
+		return true;
+
+	return found;
+}
+
+void b3VoronoiSimplexSolver::backup_closest(b3Vector3& v)
+{
+	v = m_cachedV;
+}
+
+bool b3VoronoiSimplexSolver::emptySimplex() const
+{
+	return (numVertices() == 0);
+}
+
+void b3VoronoiSimplexSolver::compute_points(b3Vector3& p1, b3Vector3& p2)
+{
+	updateClosestVectorAndPoints();
+	p1 = m_cachedP1;
+	p2 = m_cachedP2;
+}
+
+bool b3VoronoiSimplexSolver::closestPtPointTriangle(const b3Vector3& p, const b3Vector3& a, const b3Vector3& b, const b3Vector3& c, b3SubSimplexClosestResult& result)
+{
+	result.m_usedVertices.reset();
+
+	// Check if P in vertex region outside A
+	b3Vector3 ab = b - a;
+	b3Vector3 ac = c - a;
+	b3Vector3 ap = p - a;
+	b3Scalar d1 = ab.dot(ap);
+	b3Scalar d2 = ac.dot(ap);
+	if (d1 <= b3Scalar(0.0) && d2 <= b3Scalar(0.0))
+	{
+		result.m_closestPointOnSimplex = a;
+		result.m_usedVertices.usedVertexA = true;
+		result.setBarycentricCoordinates(1, 0, 0);
+		return true;  // a; // barycentric coordinates (1,0,0)
+	}
+
+	// Check if P in vertex region outside B
+	b3Vector3 bp = p - b;
+	b3Scalar d3 = ab.dot(bp);
+	b3Scalar d4 = ac.dot(bp);
+	if (d3 >= b3Scalar(0.0) && d4 <= d3)
+	{
+		result.m_closestPointOnSimplex = b;
+		result.m_usedVertices.usedVertexB = true;
+		result.setBarycentricCoordinates(0, 1, 0);
+
+		return true;  // b; // barycentric coordinates (0,1,0)
+	}
+	// Check if P in edge region of AB, if so return projection of P onto AB
+	b3Scalar vc = d1 * d4 - d3 * d2;
+	if (vc <= b3Scalar(0.0) && d1 >= b3Scalar(0.0) && d3 <= b3Scalar(0.0))
+	{
+		b3Scalar v = d1 / (d1 - d3);
+		result.m_closestPointOnSimplex = a + v * ab;
+		result.m_usedVertices.usedVertexA = true;
+		result.m_usedVertices.usedVertexB = true;
+		result.setBarycentricCoordinates(1 - v, v, 0);
+		return true;
+		//return a + v * ab; // barycentric coordinates (1-v,v,0)
+	}
+
+	// Check if P in vertex region outside C
+	b3Vector3 cp = p - c;
+	b3Scalar d5 = ab.dot(cp);
+	b3Scalar d6 = ac.dot(cp);
+	if (d6 >= b3Scalar(0.0) && d5 <= d6)
+	{
+		result.m_closestPointOnSimplex = c;
+		result.m_usedVertices.usedVertexC = true;
+		result.setBarycentricCoordinates(0, 0, 1);
+		return true;  //c; // barycentric coordinates (0,0,1)
+	}
+
+	// Check if P in edge region of AC, if so return projection of P onto AC
+	b3Scalar vb = d5 * d2 - d1 * d6;
+	if (vb <= b3Scalar(0.0) && d2 >= b3Scalar(0.0) && d6 <= b3Scalar(0.0))
+	{
+		b3Scalar w = d2 / (d2 - d6);
+		result.m_closestPointOnSimplex = a + w * ac;
+		result.m_usedVertices.usedVertexA = true;
+		result.m_usedVertices.usedVertexC = true;
+		result.setBarycentricCoordinates(1 - w, 0, w);
+		return true;
+		//return a + w * ac; // barycentric coordinates (1-w,0,w)
+	}
+
+	// Check if P in edge region of BC, if so return projection of P onto BC
+	b3Scalar va = d3 * d6 - d5 * d4;
+	if (va <= b3Scalar(0.0) && (d4 - d3) >= b3Scalar(0.0) && (d5 - d6) >= b3Scalar(0.0))
+	{
+		b3Scalar w = (d4 - d3) / ((d4 - d3) + (d5 - d6));
+
+		result.m_closestPointOnSimplex = b + w * (c - b);
+		result.m_usedVertices.usedVertexB = true;
+		result.m_usedVertices.usedVertexC = true;
+		result.setBarycentricCoordinates(0, 1 - w, w);
+		return true;
+		// return b + w * (c - b); // barycentric coordinates (0,1-w,w)
+	}
+
+	// P inside face region. Compute Q through its barycentric coordinates (u,v,w)
+	b3Scalar denom = b3Scalar(1.0) / (va + vb + vc);
+	b3Scalar v = vb * denom;
+	b3Scalar w = vc * denom;
+
+	result.m_closestPointOnSimplex = a + ab * v + ac * w;
+	result.m_usedVertices.usedVertexA = true;
+	result.m_usedVertices.usedVertexB = true;
+	result.m_usedVertices.usedVertexC = true;
+	result.setBarycentricCoordinates(1 - v - w, v, w);
+
+	return true;
+	//	return a + ab * v + ac * w; // = u*a + v*b + w*c, u = va * denom = b3Scalar(1.0) - v - w
+}
+
+/// Test if point p and d lie on opposite sides of plane through abc
+int b3VoronoiSimplexSolver::pointOutsideOfPlane(const b3Vector3& p, const b3Vector3& a, const b3Vector3& b, const b3Vector3& c, const b3Vector3& d)
+{
+	b3Vector3 normal = (b - a).cross(c - a);
+
+	b3Scalar signp = (p - a).dot(normal);  // [AP AB AC]
+	b3Scalar signd = (d - a).dot(normal);  // [AD AB AC]
+
+#ifdef B3_CATCH_DEGENERATE_TETRAHEDRON
+#ifdef BT_USE_DOUBLE_PRECISION
+	if (signd * signd < (b3Scalar(1e-8) * b3Scalar(1e-8)))
+	{
+		return -1;
+	}
+#else
+	if (signd * signd < (b3Scalar(1e-4) * b3Scalar(1e-4)))
+	{
+		//		printf("affine dependent/degenerate\n");//
+		return -1;
+	}
+#endif
+
+#endif
+	// Points on opposite sides if expression signs are opposite
+	return signp * signd < b3Scalar(0.);
+}
+
+bool b3VoronoiSimplexSolver::closestPtPointTetrahedron(const b3Vector3& p, const b3Vector3& a, const b3Vector3& b, const b3Vector3& c, const b3Vector3& d, b3SubSimplexClosestResult& finalResult)
+{
+	b3SubSimplexClosestResult tempResult;
+
+	// Start out assuming point inside all halfspaces, so closest to itself
+	finalResult.m_closestPointOnSimplex = p;
+	finalResult.m_usedVertices.reset();
+	finalResult.m_usedVertices.usedVertexA = true;
+	finalResult.m_usedVertices.usedVertexB = true;
+	finalResult.m_usedVertices.usedVertexC = true;
+	finalResult.m_usedVertices.usedVertexD = true;
+
+	int pointOutsideABC = pointOutsideOfPlane(p, a, b, c, d);
+	int pointOutsideACD = pointOutsideOfPlane(p, a, c, d, b);
+	int pointOutsideADB = pointOutsideOfPlane(p, a, d, b, c);
+	int pointOutsideBDC = pointOutsideOfPlane(p, b, d, c, a);
+
+	if (pointOutsideABC < 0 || pointOutsideACD < 0 || pointOutsideADB < 0 || pointOutsideBDC < 0)
+	{
+		finalResult.m_degenerate = true;
+		return false;
+	}
+
+	if (!pointOutsideABC && !pointOutsideACD && !pointOutsideADB && !pointOutsideBDC)
+	{
+		return false;
+	}
+
+	b3Scalar bestSqDist = FLT_MAX;
+	// If point outside face abc then compute closest point on abc
+	if (pointOutsideABC)
+	{
+		closestPtPointTriangle(p, a, b, c, tempResult);
+		b3Vector3 q = tempResult.m_closestPointOnSimplex;
+
+		b3Scalar sqDist = (q - p).dot(q - p);
+		// Update best closest point if (squared) distance is less than current best
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			//convert result bitmask!
+			finalResult.m_usedVertices.reset();
+			finalResult.m_usedVertices.usedVertexA = tempResult.m_usedVertices.usedVertexA;
+			finalResult.m_usedVertices.usedVertexB = tempResult.m_usedVertices.usedVertexB;
+			finalResult.m_usedVertices.usedVertexC = tempResult.m_usedVertices.usedVertexC;
+			finalResult.setBarycentricCoordinates(
+				tempResult.m_barycentricCoords[VERTA],
+				tempResult.m_barycentricCoords[VERTB],
+				tempResult.m_barycentricCoords[VERTC],
+				0);
+		}
+	}
+
+	// Repeat test for face acd
+	if (pointOutsideACD)
+	{
+		closestPtPointTriangle(p, a, c, d, tempResult);
+		b3Vector3 q = tempResult.m_closestPointOnSimplex;
+		//convert result bitmask!
+
+		b3Scalar sqDist = (q - p).dot(q - p);
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			finalResult.m_usedVertices.reset();
+			finalResult.m_usedVertices.usedVertexA = tempResult.m_usedVertices.usedVertexA;
+
+			finalResult.m_usedVertices.usedVertexC = tempResult.m_usedVertices.usedVertexB;
+			finalResult.m_usedVertices.usedVertexD = tempResult.m_usedVertices.usedVertexC;
+			finalResult.setBarycentricCoordinates(
+				tempResult.m_barycentricCoords[VERTA],
+				0,
+				tempResult.m_barycentricCoords[VERTB],
+				tempResult.m_barycentricCoords[VERTC]);
+		}
+	}
+	// Repeat test for face adb
+
+	if (pointOutsideADB)
+	{
+		closestPtPointTriangle(p, a, d, b, tempResult);
+		b3Vector3 q = tempResult.m_closestPointOnSimplex;
+		//convert result bitmask!
+
+		b3Scalar sqDist = (q - p).dot(q - p);
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			finalResult.m_usedVertices.reset();
+			finalResult.m_usedVertices.usedVertexA = tempResult.m_usedVertices.usedVertexA;
+			finalResult.m_usedVertices.usedVertexB = tempResult.m_usedVertices.usedVertexC;
+
+			finalResult.m_usedVertices.usedVertexD = tempResult.m_usedVertices.usedVertexB;
+			finalResult.setBarycentricCoordinates(
+				tempResult.m_barycentricCoords[VERTA],
+				tempResult.m_barycentricCoords[VERTC],
+				0,
+				tempResult.m_barycentricCoords[VERTB]);
+		}
+	}
+	// Repeat test for face bdc
+
+	if (pointOutsideBDC)
+	{
+		closestPtPointTriangle(p, b, d, c, tempResult);
+		b3Vector3 q = tempResult.m_closestPointOnSimplex;
+		//convert result bitmask!
+		b3Scalar sqDist = (q - p).dot(q - p);
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			finalResult.m_usedVertices.reset();
+			//
+			finalResult.m_usedVertices.usedVertexB = tempResult.m_usedVertices.usedVertexA;
+			finalResult.m_usedVertices.usedVertexC = tempResult.m_usedVertices.usedVertexC;
+			finalResult.m_usedVertices.usedVertexD = tempResult.m_usedVertices.usedVertexB;
+
+			finalResult.setBarycentricCoordinates(
+				0,
+				tempResult.m_barycentricCoords[VERTA],
+				tempResult.m_barycentricCoords[VERTC],
+				tempResult.m_barycentricCoords[VERTB]);
+		}
+	}
+
+	//help! we ended up full !
+
+	if (finalResult.m_usedVertices.usedVertexA &&
+		finalResult.m_usedVertices.usedVertexB &&
+		finalResult.m_usedVertices.usedVertexC &&
+		finalResult.m_usedVertices.usedVertexD)
+	{
+		return true;
+	}
+
+	return true;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h
new file mode 100644
index 0000000..46e36a3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h
@@ -0,0 +1,164 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_VORONOI_SIMPLEX_SOLVER_H
+#define B3_VORONOI_SIMPLEX_SOLVER_H
+
+#include "Bullet3Common/b3Vector3.h"
+
+#define VORONOI_SIMPLEX_MAX_VERTS 5
+
+///disable next define, or use defaultCollisionConfiguration->getSimplexSolver()->setEqualVertexThreshold(0.f) to disable/configure
+//#define BT_USE_EQUAL_VERTEX_THRESHOLD
+#define VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD 0.0001f
+
+struct b3UsageBitfield
+{
+	b3UsageBitfield()
+	{
+		reset();
+	}
+
+	void reset()
+	{
+		usedVertexA = false;
+		usedVertexB = false;
+		usedVertexC = false;
+		usedVertexD = false;
+	}
+	unsigned short usedVertexA : 1;
+	unsigned short usedVertexB : 1;
+	unsigned short usedVertexC : 1;
+	unsigned short usedVertexD : 1;
+	unsigned short unused1 : 1;
+	unsigned short unused2 : 1;
+	unsigned short unused3 : 1;
+	unsigned short unused4 : 1;
+};
+
+struct b3SubSimplexClosestResult
+{
+	b3Vector3 m_closestPointOnSimplex;
+	//MASK for m_usedVertices
+	//stores the simplex vertex-usage, using the MASK,
+	// if m_usedVertices & MASK then the related vertex is used
+	b3UsageBitfield m_usedVertices;
+	b3Scalar m_barycentricCoords[4];
+	bool m_degenerate;
+
+	void reset()
+	{
+		m_degenerate = false;
+		setBarycentricCoordinates();
+		m_usedVertices.reset();
+	}
+	bool isValid()
+	{
+		bool valid = (m_barycentricCoords[0] >= b3Scalar(0.)) &&
+					 (m_barycentricCoords[1] >= b3Scalar(0.)) &&
+					 (m_barycentricCoords[2] >= b3Scalar(0.)) &&
+					 (m_barycentricCoords[3] >= b3Scalar(0.));
+
+		return valid;
+	}
+	void setBarycentricCoordinates(b3Scalar a = b3Scalar(0.), b3Scalar b = b3Scalar(0.), b3Scalar c = b3Scalar(0.), b3Scalar d = b3Scalar(0.))
+	{
+		m_barycentricCoords[0] = a;
+		m_barycentricCoords[1] = b;
+		m_barycentricCoords[2] = c;
+		m_barycentricCoords[3] = d;
+	}
+};
+
+/// b3VoronoiSimplexSolver is an implementation of the closest point distance algorithm from a 1-4 points simplex to the origin.
+/// Can be used with GJK, as an alternative to Johnson distance algorithm.
+
+B3_ATTRIBUTE_ALIGNED16(class)
+b3VoronoiSimplexSolver
+{
+public:
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_numVertices;
+
+	b3Vector3 m_simplexVectorW[VORONOI_SIMPLEX_MAX_VERTS];
+	b3Vector3 m_simplexPointsP[VORONOI_SIMPLEX_MAX_VERTS];
+	b3Vector3 m_simplexPointsQ[VORONOI_SIMPLEX_MAX_VERTS];
+
+	b3Vector3 m_cachedP1;
+	b3Vector3 m_cachedP2;
+	b3Vector3 m_cachedV;
+	b3Vector3 m_lastW;
+
+	b3Scalar m_equalVertexThreshold;
+	bool m_cachedValidClosest;
+
+	b3SubSimplexClosestResult m_cachedBC;
+
+	bool m_needsUpdate;
+
+	void removeVertex(int index);
+	void reduceVertices(const b3UsageBitfield& usedVerts);
+	bool updateClosestVectorAndPoints();
+
+	bool closestPtPointTetrahedron(const b3Vector3& p, const b3Vector3& a, const b3Vector3& b, const b3Vector3& c, const b3Vector3& d, b3SubSimplexClosestResult& finalResult);
+	int pointOutsideOfPlane(const b3Vector3& p, const b3Vector3& a, const b3Vector3& b, const b3Vector3& c, const b3Vector3& d);
+	bool closestPtPointTriangle(const b3Vector3& p, const b3Vector3& a, const b3Vector3& b, const b3Vector3& c, b3SubSimplexClosestResult& result);
+
+public:
+	b3VoronoiSimplexSolver()
+		: m_equalVertexThreshold(VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD)
+	{
+	}
+	void reset();
+
+	void addVertex(const b3Vector3& w, const b3Vector3& p, const b3Vector3& q);
+
+	void setEqualVertexThreshold(b3Scalar threshold)
+	{
+		m_equalVertexThreshold = threshold;
+	}
+
+	b3Scalar getEqualVertexThreshold() const
+	{
+		return m_equalVertexThreshold;
+	}
+
+	bool closest(b3Vector3 & v);
+
+	b3Scalar maxVertex();
+
+	bool fullSimplex() const
+	{
+		return (m_numVertices == 4);
+	}
+
+	int getSimplex(b3Vector3 * pBuf, b3Vector3 * qBuf, b3Vector3 * yBuf) const;
+
+	bool inSimplex(const b3Vector3& w);
+
+	void backup_closest(b3Vector3 & v);
+
+	bool emptySimplex() const;
+
+	void compute_points(b3Vector3 & p1, b3Vector3 & p2);
+
+	int numVertices() const
+	{
+		return m_numVertices;
+	}
+};
+
+#endif  //B3_VORONOI_SIMPLEX_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl
new file mode 100644
index 0000000..faa4134
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl
@@ -0,0 +1,283 @@
+//keep this enum in sync with the CPU version (in btCollidable.h)
+//written by Erwin Coumans
+
+#define SHAPE_CONVEX_HULL 3
+#define SHAPE_CONCAVE_TRIMESH 5
+#define TRIANGLE_NUM_CONVEX_FACES 5
+#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6
+#define SHAPE_SPHERE 7
+
+typedef unsigned int u32;
+
+#define MAX_NUM_PARTS_IN_BITS 10
+
+///btQuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+typedef struct
+{
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes
+	int	m_escapeIndexOrTriangleIndex;
+} btQuantizedBvhNode;
+
+typedef struct
+{
+	float4		m_aabbMin;
+	float4		m_aabbMax;
+	float4		m_quantization;
+	int			m_numNodes;
+	int			m_numSubTrees;
+	int			m_nodeOffset;
+	int			m_subTreeOffset;
+
+} b3BvhInfo;
+
+int	getTriangleIndex(const btQuantizedBvhNode* rootNode)
+{
+	unsigned int x=0;
+	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
+	// Get only the lower bits where the triangle index is stored
+	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));
+}
+
+int isLeaf(const btQuantizedBvhNode* rootNode)
+{
+	//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;
+}
+	
+int getEscapeIndex(const btQuantizedBvhNode* rootNode)
+{
+	return -rootNode->m_escapeIndexOrTriangleIndex;
+}
+
+typedef struct
+{
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes, points to the root of the subtree
+	int			m_rootNodeIndex;
+	//4 bytes
+	int			m_subtreeSize;
+	int			m_padding[3];
+} btBvhSubtreeInfo;
+
+///keep this in sync with btCollidable.h
+typedef struct
+{
+	int m_numChildShapes;
+	int blaat2;
+	int m_shapeType;
+	int m_shapeIndex;
+	
+} btCollidableGpu;
+
+typedef struct
+{
+	float4	m_childPosition;
+	float4	m_childOrientation;
+	int m_shapeIndex;
+	int m_unused0;
+	int m_unused1;
+	int m_unused2;
+} btGpuChildShape;
+
+
+typedef struct
+{
+	float4 m_pos;
+	float4 m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_collidableIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} BodyData;
+
+typedef struct 
+{
+	union
+	{
+		float4	m_min;
+		float   m_minElems[4];
+		int			m_minIndices[4];
+	};
+	union
+	{
+		float4	m_max;
+		float   m_maxElems[4];
+		int			m_maxIndices[4];
+	};
+} btAabbCL;
+
+
+int testQuantizedAabbAgainstQuantizedAabb(
+								const unsigned short int* aabbMin1,
+								const unsigned short int* aabbMax1,
+								const unsigned short int* aabbMin2,
+								const unsigned short int* aabbMax2)
+{
+	//int overlap = 1;
+	if (aabbMin1[0] > aabbMax2[0])
+		return 0;
+	if (aabbMax1[0] < aabbMin2[0])
+		return 0;
+	if (aabbMin1[1] > aabbMax2[1])
+		return 0;
+	if (aabbMax1[1] < aabbMin2[1])
+		return 0;
+	if (aabbMin1[2] > aabbMax2[2])
+		return 0;
+	if (aabbMax1[2] < aabbMin2[2])
+		return 0;
+	return 1;
+	//overlap = ((aabbMin1[0] > aabbMax2[0]) || (aabbMax1[0] < aabbMin2[0])) ? 0 : overlap;
+	//overlap = ((aabbMin1[2] > aabbMax2[2]) || (aabbMax1[2] < aabbMin2[2])) ? 0 : overlap;
+	//overlap = ((aabbMin1[1] > aabbMax2[1]) || (aabbMax1[1] < aabbMin2[1])) ? 0 : overlap;
+	//return overlap;
+}
+
+
+void quantizeWithClamp(unsigned short* out, float4 point2,int isMax, float4 bvhAabbMin, float4 bvhAabbMax, float4 bvhQuantization)
+{
+	float4 clampedPoint = max(point2,bvhAabbMin);
+	clampedPoint = min (clampedPoint, bvhAabbMax);
+
+	float4 v = (clampedPoint - bvhAabbMin) * bvhQuantization;
+	if (isMax)
+	{
+		out[0] = (unsigned short) (((unsigned short)(v.x+1.f) | 1));
+		out[1] = (unsigned short) (((unsigned short)(v.y+1.f) | 1));
+		out[2] = (unsigned short) (((unsigned short)(v.z+1.f) | 1));
+	} else
+	{
+		out[0] = (unsigned short) (((unsigned short)(v.x) & 0xfffe));
+		out[1] = (unsigned short) (((unsigned short)(v.y) & 0xfffe));
+		out[2] = (unsigned short) (((unsigned short)(v.z) & 0xfffe));
+	}
+
+}
+
+
+// work-in-progress
+__kernel void   bvhTraversalKernel( __global const int4* pairs, 
+									__global const BodyData* rigidBodies, 
+									__global const btCollidableGpu* collidables,
+									__global btAabbCL* aabbs,
+									__global int4* concavePairsOut,
+									__global volatile int* numConcavePairsOut,
+									__global const btBvhSubtreeInfo* subtreeHeadersRoot,
+									__global const btQuantizedBvhNode* quantizedNodesRoot,
+									__global const b3BvhInfo* bvhInfos,
+									int numPairs,
+									int maxNumConcavePairsCapacity)
+{
+	int id = get_global_id(0);
+	if (id>=numPairs)
+		return;
+	
+	int bodyIndexA = pairs[id].x;
+	int bodyIndexB = pairs[id].y;
+	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+	
+	//once the broadphase avoids static-static pairs, we can remove this test
+	if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))
+	{
+		return;
+	}
+		
+	if (collidables[collidableIndexA].m_shapeType!=SHAPE_CONCAVE_TRIMESH)
+		return;
+
+	int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+		
+	if (shapeTypeB!=SHAPE_CONVEX_HULL &&
+		shapeTypeB!=SHAPE_SPHERE	&&
+		shapeTypeB!=SHAPE_COMPOUND_OF_CONVEX_HULLS
+		)
+		return;
+
+	b3BvhInfo bvhInfo = bvhInfos[collidables[collidableIndexA].m_numChildShapes];
+
+	float4 bvhAabbMin = bvhInfo.m_aabbMin;
+	float4 bvhAabbMax = bvhInfo.m_aabbMax;
+	float4 bvhQuantization = bvhInfo.m_quantization;
+	int numSubtreeHeaders = bvhInfo.m_numSubTrees;
+	__global const btBvhSubtreeInfo* subtreeHeaders = &subtreeHeadersRoot[bvhInfo.m_subTreeOffset];
+	__global const btQuantizedBvhNode* quantizedNodes = &quantizedNodesRoot[bvhInfo.m_nodeOffset];
+	
+
+	unsigned short int quantizedQueryAabbMin[3];
+	unsigned short int quantizedQueryAabbMax[3];
+	quantizeWithClamp(quantizedQueryAabbMin,aabbs[bodyIndexB].m_min,false,bvhAabbMin, bvhAabbMax,bvhQuantization);
+	quantizeWithClamp(quantizedQueryAabbMax,aabbs[bodyIndexB].m_max,true ,bvhAabbMin, bvhAabbMax,bvhQuantization);
+	
+	for (int i=0;i<numSubtreeHeaders;i++)
+	{
+		btBvhSubtreeInfo subtree = subtreeHeaders[i];
+				
+		int overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
+		if (overlap != 0)
+		{
+			int startNodeIndex = subtree.m_rootNodeIndex;
+			int endNodeIndex = subtree.m_rootNodeIndex+subtree.m_subtreeSize;
+			int curIndex = startNodeIndex;
+			int escapeIndex;
+			int isLeafNode;
+			int aabbOverlap;
+			while (curIndex < endNodeIndex)
+			{
+				btQuantizedBvhNode rootNode = quantizedNodes[curIndex];
+				aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode.m_quantizedAabbMin,rootNode.m_quantizedAabbMax);
+				isLeafNode = isLeaf(&rootNode);
+				if (aabbOverlap)
+				{
+					if (isLeafNode)
+					{
+						int triangleIndex = getTriangleIndex(&rootNode);
+						if (shapeTypeB==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+						{
+								int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+								int pairIdx = atomic_add(numConcavePairsOut,numChildrenB);
+								for (int b=0;b<numChildrenB;b++)
+								{
+									if ((pairIdx+b)<maxNumConcavePairsCapacity)
+									{
+										int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex+b;
+										int4 newPair = (int4)(bodyIndexA,bodyIndexB,triangleIndex,childShapeIndexB);
+										concavePairsOut[pairIdx+b] = newPair;
+									}
+								}
+						} else
+						{
+							int pairIdx = atomic_inc(numConcavePairsOut);
+							if (pairIdx<maxNumConcavePairsCapacity)
+							{
+								int4 newPair = (int4)(bodyIndexA,bodyIndexB,triangleIndex,0);
+								concavePairsOut[pairIdx] = newPair;
+							}
+						}
+					} 
+					curIndex++;
+				} else
+				{
+					if (isLeafNode)
+					{
+						curIndex++;
+					} else
+					{
+						escapeIndex = getEscapeIndex(&rootNode);
+						curIndex += escapeIndex;
+					}
+				}
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h
new file mode 100644
index 0000000..f1df8a6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h
@@ -0,0 +1,257 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* bvhTraversalKernelCL =
+	"//keep this enum in sync with the CPU version (in btCollidable.h)\n"
+	"//written by Erwin Coumans\n"
+	"#define SHAPE_CONVEX_HULL 3\n"
+	"#define SHAPE_CONCAVE_TRIMESH 5\n"
+	"#define TRIANGLE_NUM_CONVEX_FACES 5\n"
+	"#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6\n"
+	"#define SHAPE_SPHERE 7\n"
+	"typedef unsigned int u32;\n"
+	"#define MAX_NUM_PARTS_IN_BITS 10\n"
+	"///btQuantizedBvhNode is a compressed aabb node, 16 bytes.\n"
+	"///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).\n"
+	"typedef struct\n"
+	"{\n"
+	"	//12 bytes\n"
+	"	unsigned short int	m_quantizedAabbMin[3];\n"
+	"	unsigned short int	m_quantizedAabbMax[3];\n"
+	"	//4 bytes\n"
+	"	int	m_escapeIndexOrTriangleIndex;\n"
+	"} btQuantizedBvhNode;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4		m_aabbMin;\n"
+	"	float4		m_aabbMax;\n"
+	"	float4		m_quantization;\n"
+	"	int			m_numNodes;\n"
+	"	int			m_numSubTrees;\n"
+	"	int			m_nodeOffset;\n"
+	"	int			m_subTreeOffset;\n"
+	"} b3BvhInfo;\n"
+	"int	getTriangleIndex(const btQuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	unsigned int x=0;\n"
+	"	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);\n"
+	"	// Get only the lower bits where the triangle index is stored\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));\n"
+	"}\n"
+	"int isLeaf(const btQuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	//skipindex is negative (internal node), triangleindex >=0 (leafnode)\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;\n"
+	"}\n"
+	"	\n"
+	"int getEscapeIndex(const btQuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	return -rootNode->m_escapeIndexOrTriangleIndex;\n"
+	"}\n"
+	"typedef struct\n"
+	"{\n"
+	"	//12 bytes\n"
+	"	unsigned short int	m_quantizedAabbMin[3];\n"
+	"	unsigned short int	m_quantizedAabbMax[3];\n"
+	"	//4 bytes, points to the root of the subtree\n"
+	"	int			m_rootNodeIndex;\n"
+	"	//4 bytes\n"
+	"	int			m_subtreeSize;\n"
+	"	int			m_padding[3];\n"
+	"} btBvhSubtreeInfo;\n"
+	"///keep this in sync with btCollidable.h\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_numChildShapes;\n"
+	"	int blaat2;\n"
+	"	int m_shapeType;\n"
+	"	int m_shapeIndex;\n"
+	"	\n"
+	"} btCollidableGpu;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4	m_childPosition;\n"
+	"	float4	m_childOrientation;\n"
+	"	int m_shapeIndex;\n"
+	"	int m_unused0;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"} btGpuChildShape;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	float4 m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_collidableIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} BodyData;\n"
+	"typedef struct \n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_min;\n"
+	"		float   m_minElems[4];\n"
+	"		int			m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_max;\n"
+	"		float   m_maxElems[4];\n"
+	"		int			m_maxIndices[4];\n"
+	"	};\n"
+	"} btAabbCL;\n"
+	"int testQuantizedAabbAgainstQuantizedAabb(\n"
+	"								const unsigned short int* aabbMin1,\n"
+	"								const unsigned short int* aabbMax1,\n"
+	"								const unsigned short int* aabbMin2,\n"
+	"								const unsigned short int* aabbMax2)\n"
+	"{\n"
+	"	//int overlap = 1;\n"
+	"	if (aabbMin1[0] > aabbMax2[0])\n"
+	"		return 0;\n"
+	"	if (aabbMax1[0] < aabbMin2[0])\n"
+	"		return 0;\n"
+	"	if (aabbMin1[1] > aabbMax2[1])\n"
+	"		return 0;\n"
+	"	if (aabbMax1[1] < aabbMin2[1])\n"
+	"		return 0;\n"
+	"	if (aabbMin1[2] > aabbMax2[2])\n"
+	"		return 0;\n"
+	"	if (aabbMax1[2] < aabbMin2[2])\n"
+	"		return 0;\n"
+	"	return 1;\n"
+	"	//overlap = ((aabbMin1[0] > aabbMax2[0]) || (aabbMax1[0] < aabbMin2[0])) ? 0 : overlap;\n"
+	"	//overlap = ((aabbMin1[2] > aabbMax2[2]) || (aabbMax1[2] < aabbMin2[2])) ? 0 : overlap;\n"
+	"	//overlap = ((aabbMin1[1] > aabbMax2[1]) || (aabbMax1[1] < aabbMin2[1])) ? 0 : overlap;\n"
+	"	//return overlap;\n"
+	"}\n"
+	"void quantizeWithClamp(unsigned short* out, float4 point2,int isMax, float4 bvhAabbMin, float4 bvhAabbMax, float4 bvhQuantization)\n"
+	"{\n"
+	"	float4 clampedPoint = max(point2,bvhAabbMin);\n"
+	"	clampedPoint = min (clampedPoint, bvhAabbMax);\n"
+	"	float4 v = (clampedPoint - bvhAabbMin) * bvhQuantization;\n"
+	"	if (isMax)\n"
+	"	{\n"
+	"		out[0] = (unsigned short) (((unsigned short)(v.x+1.f) | 1));\n"
+	"		out[1] = (unsigned short) (((unsigned short)(v.y+1.f) | 1));\n"
+	"		out[2] = (unsigned short) (((unsigned short)(v.z+1.f) | 1));\n"
+	"	} else\n"
+	"	{\n"
+	"		out[0] = (unsigned short) (((unsigned short)(v.x) & 0xfffe));\n"
+	"		out[1] = (unsigned short) (((unsigned short)(v.y) & 0xfffe));\n"
+	"		out[2] = (unsigned short) (((unsigned short)(v.z) & 0xfffe));\n"
+	"	}\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   bvhTraversalKernel( __global const int4* pairs, \n"
+	"									__global const BodyData* rigidBodies, \n"
+	"									__global const btCollidableGpu* collidables,\n"
+	"									__global btAabbCL* aabbs,\n"
+	"									__global int4* concavePairsOut,\n"
+	"									__global volatile int* numConcavePairsOut,\n"
+	"									__global const btBvhSubtreeInfo* subtreeHeadersRoot,\n"
+	"									__global const btQuantizedBvhNode* quantizedNodesRoot,\n"
+	"									__global const b3BvhInfo* bvhInfos,\n"
+	"									int numPairs,\n"
+	"									int maxNumConcavePairsCapacity)\n"
+	"{\n"
+	"	int id = get_global_id(0);\n"
+	"	if (id>=numPairs)\n"
+	"		return;\n"
+	"	\n"
+	"	int bodyIndexA = pairs[id].x;\n"
+	"	int bodyIndexB = pairs[id].y;\n"
+	"	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"	\n"
+	"	//once the broadphase avoids static-static pairs, we can remove this test\n"
+	"	if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))\n"
+	"	{\n"
+	"		return;\n"
+	"	}\n"
+	"		\n"
+	"	if (collidables[collidableIndexA].m_shapeType!=SHAPE_CONCAVE_TRIMESH)\n"
+	"		return;\n"
+	"	int shapeTypeB = collidables[collidableIndexB].m_shapeType;\n"
+	"		\n"
+	"	if (shapeTypeB!=SHAPE_CONVEX_HULL &&\n"
+	"		shapeTypeB!=SHAPE_SPHERE	&&\n"
+	"		shapeTypeB!=SHAPE_COMPOUND_OF_CONVEX_HULLS\n"
+	"		)\n"
+	"		return;\n"
+	"	b3BvhInfo bvhInfo = bvhInfos[collidables[collidableIndexA].m_numChildShapes];\n"
+	"	float4 bvhAabbMin = bvhInfo.m_aabbMin;\n"
+	"	float4 bvhAabbMax = bvhInfo.m_aabbMax;\n"
+	"	float4 bvhQuantization = bvhInfo.m_quantization;\n"
+	"	int numSubtreeHeaders = bvhInfo.m_numSubTrees;\n"
+	"	__global const btBvhSubtreeInfo* subtreeHeaders = &subtreeHeadersRoot[bvhInfo.m_subTreeOffset];\n"
+	"	__global const btQuantizedBvhNode* quantizedNodes = &quantizedNodesRoot[bvhInfo.m_nodeOffset];\n"
+	"	\n"
+	"	unsigned short int quantizedQueryAabbMin[3];\n"
+	"	unsigned short int quantizedQueryAabbMax[3];\n"
+	"	quantizeWithClamp(quantizedQueryAabbMin,aabbs[bodyIndexB].m_min,false,bvhAabbMin, bvhAabbMax,bvhQuantization);\n"
+	"	quantizeWithClamp(quantizedQueryAabbMax,aabbs[bodyIndexB].m_max,true ,bvhAabbMin, bvhAabbMax,bvhQuantization);\n"
+	"	\n"
+	"	for (int i=0;i<numSubtreeHeaders;i++)\n"
+	"	{\n"
+	"		btBvhSubtreeInfo subtree = subtreeHeaders[i];\n"
+	"				\n"
+	"		int overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);\n"
+	"		if (overlap != 0)\n"
+	"		{\n"
+	"			int startNodeIndex = subtree.m_rootNodeIndex;\n"
+	"			int endNodeIndex = subtree.m_rootNodeIndex+subtree.m_subtreeSize;\n"
+	"			int curIndex = startNodeIndex;\n"
+	"			int escapeIndex;\n"
+	"			int isLeafNode;\n"
+	"			int aabbOverlap;\n"
+	"			while (curIndex < endNodeIndex)\n"
+	"			{\n"
+	"				btQuantizedBvhNode rootNode = quantizedNodes[curIndex];\n"
+	"				aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode.m_quantizedAabbMin,rootNode.m_quantizedAabbMax);\n"
+	"				isLeafNode = isLeaf(&rootNode);\n"
+	"				if (aabbOverlap)\n"
+	"				{\n"
+	"					if (isLeafNode)\n"
+	"					{\n"
+	"						int triangleIndex = getTriangleIndex(&rootNode);\n"
+	"						if (shapeTypeB==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"						{\n"
+	"								int numChildrenB = collidables[collidableIndexB].m_numChildShapes;\n"
+	"								int pairIdx = atomic_add(numConcavePairsOut,numChildrenB);\n"
+	"								for (int b=0;b<numChildrenB;b++)\n"
+	"								{\n"
+	"									if ((pairIdx+b)<maxNumConcavePairsCapacity)\n"
+	"									{\n"
+	"										int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex+b;\n"
+	"										int4 newPair = (int4)(bodyIndexA,bodyIndexB,triangleIndex,childShapeIndexB);\n"
+	"										concavePairsOut[pairIdx+b] = newPair;\n"
+	"									}\n"
+	"								}\n"
+	"						} else\n"
+	"						{\n"
+	"							int pairIdx = atomic_inc(numConcavePairsOut);\n"
+	"							if (pairIdx<maxNumConcavePairsCapacity)\n"
+	"							{\n"
+	"								int4 newPair = (int4)(bodyIndexA,bodyIndexB,triangleIndex,0);\n"
+	"								concavePairsOut[pairIdx] = newPair;\n"
+	"							}\n"
+	"						}\n"
+	"					} \n"
+	"					curIndex++;\n"
+	"				} else\n"
+	"				{\n"
+	"					if (isLeafNode)\n"
+	"					{\n"
+	"						curIndex++;\n"
+	"					} else\n"
+	"					{\n"
+	"						escapeIndex = getEscapeIndex(&rootNode);\n"
+	"						curIndex += escapeIndex;\n"
+	"					}\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl
new file mode 100644
index 0000000..e754f4e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl
@@ -0,0 +1,311 @@
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3MprPenetration.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+#define AppendInc(x, out) out = atomic_inc(x)
+#define GET_NPOINTS(x) (x).m_worldNormalOnB.w
+#ifdef cl_ext_atomic_counters_32
+	#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+	#define counter32_t volatile __global int*
+#endif
+
+
+__kernel void   mprPenetrationKernel( __global int4* pairs,
+																					__global const b3RigidBodyData_t* rigidBodies, 
+																					__global const b3Collidable_t* collidables,
+																					__global const b3ConvexPolyhedronData_t* convexShapes, 
+																					__global const float4* vertices,
+																					__global float4* separatingNormals,
+																					__global int* hasSeparatingAxis,
+																					__global struct b3Contact4Data* restrict globalContactsOut,
+																					counter32_t nGlobalContactsOut,
+																					int contactCapacity,
+																					int numPairs)
+{
+	int i = get_global_id(0);
+	int pairIndex = i;
+	if (i<numPairs)
+	{
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+	
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+		
+		
+		//once the broadphase avoids static-static pairs, we can remove this test
+		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))
+		{
+			return;
+		}
+		
+
+		if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONVEX_HULL) ||(collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL))
+		{
+			return;
+		}
+
+		float depthOut;
+		b3Float4 dirOut;
+		b3Float4 posOut;
+
+
+		int res = b3MprPenetration(pairIndex, bodyIndexA, bodyIndexB,rigidBodies,convexShapes,collidables,vertices,separatingNormals,hasSeparatingAxis,&depthOut, &dirOut, &posOut);
+		
+		
+		
+		
+
+		if (res==0)
+		{
+			//add a contact
+
+			int dstIdx;
+			AppendInc( nGlobalContactsOut, dstIdx );
+			if (dstIdx<contactCapacity)
+			{
+				pairs[pairIndex].z = dstIdx;
+				__global struct b3Contact4Data* c = globalContactsOut + dstIdx;
+				c->m_worldNormalOnB = -dirOut;//normal;
+				c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+				c->m_batchIdx = pairIndex;
+				int bodyA = pairs[pairIndex].x;
+				int bodyB = pairs[pairIndex].y;
+				c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0 ? -bodyA:bodyA;
+				c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0 ? -bodyB:bodyB;
+				c->m_childIndexA = -1;
+				c->m_childIndexB = -1;
+				//for (int i=0;i<nContacts;i++)
+				posOut.w = -depthOut;
+				c->m_worldPosB[0] = posOut;//localPoints[contactIdx[i]];
+				GET_NPOINTS(*c) = 1;//nContacts;
+			}
+		}
+
+	}
+}
+
+typedef float4 Quaternion;
+#define make_float4 (float4)
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)
+{
+	return qtRotate( *orientation, *p ) + (*translation);
+}
+
+
+__inline
+float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+
+inline void project(__global const b3ConvexPolyhedronData_t* hull,  const float4 pos, const float4 orn, 
+const float4* dir, __global const float4* vertices, float* min, float* max)
+{
+	min[0] = FLT_MAX;
+	max[0] = -FLT_MAX;
+	int numVerts = hull->m_numVertices;
+
+	const float4 localDir = qtInvRotate(orn,*dir);
+	float offset = dot(pos,*dir);
+	for(int i=0;i<numVerts;i++)
+	{
+		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);
+		if(dp < min[0])	
+			min[0] = dp;
+		if(dp > max[0])	
+			max[0] = dp;
+	}
+	if(min[0]>max[0])
+	{
+		float tmp = min[0];
+		min[0] = max[0];
+		max[0] = tmp;
+	}
+	min[0] += offset;
+	max[0] += offset;
+}
+
+
+bool findSeparatingAxisUnitSphere(	__global const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	__global const float4* vertices,
+	__global const float4* unitSphereDirections,
+	int numUnitSphereDirections,
+	float4* sep,
+	float* dmin)
+{
+	
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+
+	int curPlaneTests=0;
+
+	int curEdgeEdge = 0;
+	// Test unit sphere directions
+	for (int i=0;i<numUnitSphereDirections;i++)
+	{
+
+		float4 crossje;
+		crossje = unitSphereDirections[i];	
+
+		if (dot3F4(DeltaC2,crossje)>0)
+			crossje *= -1.f;
+		{
+			float dist;
+			bool result = true;
+			float Min0,Max0;
+			float Min1,Max1;
+			project(hullA,posA,ornA,&crossje,vertices, &Min0, &Max0);
+			project(hullB,posB,ornB,&crossje,vertices, &Min1, &Max1);
+		
+			if(Max0<Min1 || Max1<Min0)
+				return false;
+		
+			float d0 = Max0 - Min1;
+			float d1 = Max1 - Min0;
+			dist = d0<d1 ? d0:d1;
+			result = true;
+	
+			if(dist<*dmin)
+			{
+				*dmin = dist;
+				*sep = crossje;
+			}
+		}
+	}
+
+	
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+
+
+__kernel void   findSeparatingAxisUnitSphereKernel( __global const int4* pairs, 
+																					__global const b3RigidBodyData_t* rigidBodies, 
+																					__global const b3Collidable_t* collidables,
+																					__global const b3ConvexPolyhedronData_t* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* unitSphereDirections,
+																					__global  float4* separatingNormals,
+																					__global  int* hasSeparatingAxis,
+																					__global  float* dmins,
+																					int numUnitSphereDirections,
+																					int numPairs
+																					)
+{
+
+	int i = get_global_id(0);
+	
+	if (i<numPairs)
+	{
+
+		if (hasSeparatingAxis[i])
+		{
+	
+			int bodyIndexA = pairs[i].x;
+			int bodyIndexB = pairs[i].y;
+	
+			int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+			int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+		
+			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+			
+			
+			int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+	
+			float dmin = dmins[i];
+	
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+			posA.w = 0.f;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+			posB.w = 0.f;
+			float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+			float4 ornA = rigidBodies[bodyIndexA].m_quat;
+			float4 c0 = transform(&c0local, &posA, &ornA);
+			float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+			float4 ornB =rigidBodies[bodyIndexB].m_quat;
+			float4 c1 = transform(&c1local,&posB,&ornB);
+			const float4 DeltaC2 = c0 - c1;
+			float4 sepNormal = separatingNormals[i];
+			
+			int numEdgeEdgeDirections = convexShapes[shapeIndexA].m_numUniqueEdges*convexShapes[shapeIndexB].m_numUniqueEdges;
+			if (numEdgeEdgeDirections>numUnitSphereDirections)
+			{
+				bool sepEE = findSeparatingAxisUnitSphere(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,
+																										posB,ornB,
+																										DeltaC2,
+																										vertices,unitSphereDirections,numUnitSphereDirections,&sepNormal,&dmin);
+				if (!sepEE)
+				{
+					hasSeparatingAxis[i] = 0;
+				} else
+				{
+					hasSeparatingAxis[i] = 1;
+					separatingNormals[i] = sepNormal;
+				}
+			}
+		}		//if (hasSeparatingAxis[i])
+	}//(i<numPairs)
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h
new file mode 100644
index 0000000..74959a9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h
@@ -0,0 +1,1445 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* mprKernelsCL =
+	"/***\n"
+	" * ---------------------------------\n"
+	" * Copyright (c)2012 Daniel Fiser <danfis@danfis.cz>\n"
+	" *\n"
+	" *  This file was ported from mpr.c file, part of libccd.\n"
+	" *  The Minkoski Portal Refinement implementation was ported \n"
+	" *  to OpenCL by Erwin Coumans for the Bullet 3 Physics library.\n"
+	" *  at http://github.com/erwincoumans/bullet3\n"
+	" *\n"
+	" *  Distributed under the OSI-approved BSD License (the \"License\");\n"
+	" *  see <http://www.opensource.org/licenses/bsd-license.php>.\n"
+	" *  This software is distributed WITHOUT ANY WARRANTY; without even the\n"
+	" *  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+	" *  See the License for more information.\n"
+	" */\n"
+	"#ifndef B3_MPR_PENETRATION_H\n"
+	"#define B3_MPR_PENETRATION_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_RIGIDBODY_DATA_H\n"
+	"#define B3_RIGIDBODY_DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#define B3_QUAT_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Quat;\n"
+	"	#define b3QuatConstArg const b3Quat\n"
+	"	\n"
+	"	\n"
+	"inline float4 b3FastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = (float4)(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"	\n"
+	"inline b3Quat b3QuatMul(b3Quat a, b3Quat b);\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in);\n"
+	"inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)\n"
+	"{\n"
+	"	b3Quat ans;\n"
+	"	ans = b3Cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - b3Dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in)\n"
+	"{\n"
+	"	b3Quat q;\n"
+	"	q=in;\n"
+	"	//return b3FastNormalize4(in);\n"
+	"	float len = native_sqrt(dot(q, q));\n"
+	"	if(len > 0.f)\n"
+	"	{\n"
+	"		q *= 1.f / len;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		q.x = q.y = q.z = 0.f;\n"
+	"		q.w = 1.f;\n"
+	"	}\n"
+	"	return q;\n"
+	"}\n"
+	"inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	b3Quat qInv = b3QuatInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = b3QuatMul(b3QuatMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	return b3QuatRotate( b3QuatInvert( q ), vec );\n"
+	"}\n"
+	"inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg  orientation)\n"
+	"{\n"
+	"	return b3QuatRotate( orientation, point ) + (translation);\n"
+	"}\n"
+	"	\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#define B3_MAT3x3_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"typedef struct\n"
+	"{\n"
+	"	b3Float4 m_row[3];\n"
+	"}b3Mat3x3;\n"
+	"#define b3Mat3x3ConstArg const b3Mat3x3\n"
+	"#define b3GetRow(m,row) (m.m_row[row])\n"
+	"inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)\n"
+	"{\n"
+	"	b3Float4 quat2 = (b3Float4)(quat.x*quat.x, quat.y*quat.y, quat.z*quat.z, 0.f);\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0].x=1-2*quat2.y-2*quat2.z;\n"
+	"	out.m_row[0].y=2*quat.x*quat.y-2*quat.w*quat.z;\n"
+	"	out.m_row[0].z=2*quat.x*quat.z+2*quat.w*quat.y;\n"
+	"	out.m_row[0].w = 0.f;\n"
+	"	out.m_row[1].x=2*quat.x*quat.y+2*quat.w*quat.z;\n"
+	"	out.m_row[1].y=1-2*quat2.x-2*quat2.z;\n"
+	"	out.m_row[1].z=2*quat.y*quat.z-2*quat.w*quat.x;\n"
+	"	out.m_row[1].w = 0.f;\n"
+	"	out.m_row[2].x=2*quat.x*quat.z-2*quat.w*quat.y;\n"
+	"	out.m_row[2].y=2*quat.y*quat.z+2*quat.w*quat.x;\n"
+	"	out.m_row[2].z=1-2*quat2.x-2*quat2.y;\n"
+	"	out.m_row[2].w = 0.f;\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = fabs(matIn.m_row[0]);\n"
+	"	out.m_row[1] = fabs(matIn.m_row[1]);\n"
+	"	out.m_row[2] = fabs(matIn.m_row[2]);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero();\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity();\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m);\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(0.f);\n"
+	"	m.m_row[1] = (b3Float4)(0.f);\n"
+	"	m.m_row[2] = (b3Float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (b3Float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (b3Float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Mat3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	b3Mat3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = b3Dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = b3Dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = b3Dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)\n"
+	"{\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a.m_row[0], b );\n"
+	"	ans.y = b3Dot3F4( a.m_row[1], b );\n"
+	"	ans.z = b3Dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a, colx );\n"
+	"	ans.y = b3Dot3F4( a, coly );\n"
+	"	ans.z = b3Dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3RigidBodyData b3RigidBodyData_t;\n"
+	"struct b3RigidBodyData\n"
+	"{\n"
+	"	b3Float4				m_pos;\n"
+	"	b3Quat					m_quat;\n"
+	"	b3Float4				m_linVel;\n"
+	"	b3Float4				m_angVel;\n"
+	"	int 					m_collidableIdx;\n"
+	"	float 				m_invMass;\n"
+	"	float 				m_restituitionCoeff;\n"
+	"	float 				m_frictionCoeff;\n"
+	"};\n"
+	"typedef struct b3InertiaData b3InertiaData_t;\n"
+	"struct b3InertiaData\n"
+	"{\n"
+	"	b3Mat3x3 m_invInertiaWorld;\n"
+	"	b3Mat3x3 m_initInvInertia;\n"
+	"};\n"
+	"#endif //B3_RIGIDBODY_DATA_H\n"
+	"	\n"
+	"#ifndef B3_CONVEX_POLYHEDRON_DATA_H\n"
+	"#define B3_CONVEX_POLYHEDRON_DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"typedef struct b3GpuFace b3GpuFace_t;\n"
+	"struct b3GpuFace\n"
+	"{\n"
+	"	b3Float4 m_plane;\n"
+	"	int m_indexOffset;\n"
+	"	int m_numIndices;\n"
+	"	int m_unusedPadding1;\n"
+	"	int m_unusedPadding2;\n"
+	"};\n"
+	"typedef struct b3ConvexPolyhedronData b3ConvexPolyhedronData_t;\n"
+	"struct b3ConvexPolyhedronData\n"
+	"{\n"
+	"	b3Float4		m_localCenter;\n"
+	"	b3Float4		m_extents;\n"
+	"	b3Float4		mC;\n"
+	"	b3Float4		mE;\n"
+	"	float			m_radius;\n"
+	"	int	m_faceOffset;\n"
+	"	int m_numFaces;\n"
+	"	int	m_numVertices;\n"
+	"	int m_vertexOffset;\n"
+	"	int	m_uniqueEdgesOffset;\n"
+	"	int	m_numUniqueEdges;\n"
+	"	int m_unused;\n"
+	"};\n"
+	"#endif //B3_CONVEX_POLYHEDRON_DATA_H\n"
+	"#ifndef B3_COLLIDABLE_H\n"
+	"#define B3_COLLIDABLE_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"enum b3ShapeTypes\n"
+	"{\n"
+	"	SHAPE_HEIGHT_FIELD=1,\n"
+	"	SHAPE_CONVEX_HULL=3,\n"
+	"	SHAPE_PLANE=4,\n"
+	"	SHAPE_CONCAVE_TRIMESH=5,\n"
+	"	SHAPE_COMPOUND_OF_CONVEX_HULLS=6,\n"
+	"	SHAPE_SPHERE=7,\n"
+	"	MAX_NUM_SHAPE_TYPES,\n"
+	"};\n"
+	"typedef struct b3Collidable b3Collidable_t;\n"
+	"struct b3Collidable\n"
+	"{\n"
+	"	union {\n"
+	"		int m_numChildShapes;\n"
+	"		int m_bvhIndex;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float m_radius;\n"
+	"		int	m_compoundBvhIndex;\n"
+	"	};\n"
+	"	int m_shapeType;\n"
+	"	int m_shapeIndex;\n"
+	"};\n"
+	"typedef struct b3GpuChildShape b3GpuChildShape_t;\n"
+	"struct b3GpuChildShape\n"
+	"{\n"
+	"	b3Float4	m_childPosition;\n"
+	"	b3Quat		m_childOrientation;\n"
+	"	int m_shapeIndex;\n"
+	"	int m_unused0;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"struct b3CompoundOverlappingPair\n"
+	"{\n"
+	"	int m_bodyIndexA;\n"
+	"	int m_bodyIndexB;\n"
+	"//	int	m_pairType;\n"
+	"	int m_childShapeIndexA;\n"
+	"	int m_childShapeIndexB;\n"
+	"};\n"
+	"#endif //B3_COLLIDABLE_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#define B3_MPR_SQRT sqrt\n"
+	"#endif\n"
+	"#define B3_MPR_FMIN(x, y) ((x) < (y) ? (x) : (y))\n"
+	"#define B3_MPR_FABS fabs\n"
+	"#define B3_MPR_TOLERANCE 1E-6f\n"
+	"#define B3_MPR_MAX_ITERATIONS 1000\n"
+	"struct _b3MprSupport_t \n"
+	"{\n"
+	"    b3Float4 v;  //!< Support point in minkowski sum\n"
+	"    b3Float4 v1; //!< Support point in obj1\n"
+	"    b3Float4 v2; //!< Support point in obj2\n"
+	"};\n"
+	"typedef struct _b3MprSupport_t b3MprSupport_t;\n"
+	"struct _b3MprSimplex_t \n"
+	"{\n"
+	"    b3MprSupport_t ps[4];\n"
+	"    int last; //!< index of last added point\n"
+	"};\n"
+	"typedef struct _b3MprSimplex_t b3MprSimplex_t;\n"
+	"inline b3MprSupport_t* b3MprSimplexPointW(b3MprSimplex_t *s, int idx)\n"
+	"{\n"
+	"    return &s->ps[idx];\n"
+	"}\n"
+	"inline void b3MprSimplexSetSize(b3MprSimplex_t *s, int size)\n"
+	"{\n"
+	"    s->last = size - 1;\n"
+	"}\n"
+	"inline int b3MprSimplexSize(const b3MprSimplex_t *s)\n"
+	"{\n"
+	"    return s->last + 1;\n"
+	"}\n"
+	"inline const b3MprSupport_t* b3MprSimplexPoint(const b3MprSimplex_t* s, int idx)\n"
+	"{\n"
+	"    // here is no check on boundaries\n"
+	"    return &s->ps[idx];\n"
+	"}\n"
+	"inline void b3MprSupportCopy(b3MprSupport_t *d, const b3MprSupport_t *s)\n"
+	"{\n"
+	"    *d = *s;\n"
+	"}\n"
+	"inline void b3MprSimplexSet(b3MprSimplex_t *s, size_t pos, const b3MprSupport_t *a)\n"
+	"{\n"
+	"    b3MprSupportCopy(s->ps + pos, a);\n"
+	"}\n"
+	"inline void b3MprSimplexSwap(b3MprSimplex_t *s, size_t pos1, size_t pos2)\n"
+	"{\n"
+	"    b3MprSupport_t supp;\n"
+	"    b3MprSupportCopy(&supp, &s->ps[pos1]);\n"
+	"    b3MprSupportCopy(&s->ps[pos1], &s->ps[pos2]);\n"
+	"    b3MprSupportCopy(&s->ps[pos2], &supp);\n"
+	"}\n"
+	"inline int b3MprIsZero(float val)\n"
+	"{\n"
+	"    return B3_MPR_FABS(val) < FLT_EPSILON;\n"
+	"}\n"
+	"inline int b3MprEq(float _a, float _b)\n"
+	"{\n"
+	"    float ab;\n"
+	"    float a, b;\n"
+	"    ab = B3_MPR_FABS(_a - _b);\n"
+	"    if (B3_MPR_FABS(ab) < FLT_EPSILON)\n"
+	"        return 1;\n"
+	"    a = B3_MPR_FABS(_a);\n"
+	"    b = B3_MPR_FABS(_b);\n"
+	"    if (b > a){\n"
+	"        return ab < FLT_EPSILON * b;\n"
+	"    }else{\n"
+	"        return ab < FLT_EPSILON * a;\n"
+	"    }\n"
+	"}\n"
+	"inline int b3MprVec3Eq(const b3Float4* a, const b3Float4 *b)\n"
+	"{\n"
+	"    return b3MprEq((*a).x, (*b).x)\n"
+	"            && b3MprEq((*a).y, (*b).y)\n"
+	"            && b3MprEq((*a).z, (*b).z);\n"
+	"}\n"
+	"inline b3Float4 b3LocalGetSupportVertex(b3Float4ConstArg supportVec,__global const b3ConvexPolyhedronData_t* hull, 	b3ConstArray(b3Float4) verticesA)\n"
+	"{\n"
+	"	b3Float4 supVec = b3MakeFloat4(0,0,0,0);\n"
+	"	float maxDot = -B3_LARGE_FLOAT;\n"
+	"    if( 0 < hull->m_numVertices )\n"
+	"    {\n"
+	"        const b3Float4 scaled = supportVec;\n"
+	"		int index = b3MaxDot(scaled, &verticesA[hull->m_vertexOffset], hull->m_numVertices, &maxDot);\n"
+	"        return verticesA[hull->m_vertexOffset+index];\n"
+	"    }\n"
+	"    return supVec;\n"
+	"}\n"
+	"B3_STATIC void b3MprConvexSupport(int pairIndex,int bodyIndex,  b3ConstArray(b3RigidBodyData_t) cpuBodyBuf, \n"
+	"													b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData, \n"
+	"													b3ConstArray(b3Collidable_t)				cpuCollidables,\n"
+	"													b3ConstArray(b3Float4)					cpuVertices,\n"
+	"													__global b3Float4* sepAxis,\n"
+	"														const b3Float4* _dir, b3Float4* outp, int logme)\n"
+	"{\n"
+	"	//dir is in worldspace, move to local space\n"
+	"	\n"
+	"	b3Float4 pos = cpuBodyBuf[bodyIndex].m_pos;\n"
+	"	b3Quat orn = cpuBodyBuf[bodyIndex].m_quat;\n"
+	"	\n"
+	"	b3Float4 dir = b3MakeFloat4((*_dir).x,(*_dir).y,(*_dir).z,0.f);\n"
+	"	\n"
+	"	const b3Float4 localDir = b3QuatRotate(b3QuatInverse(orn),dir);\n"
+	"	\n"
+	"	//find local support vertex\n"
+	"	int colIndex = cpuBodyBuf[bodyIndex].m_collidableIdx;\n"
+	"	\n"
+	"	b3Assert(cpuCollidables[colIndex].m_shapeType==SHAPE_CONVEX_HULL);\n"
+	"	__global const b3ConvexPolyhedronData_t* hull = &cpuConvexData[cpuCollidables[colIndex].m_shapeIndex];\n"
+	"	\n"
+	"	b3Float4 pInA;\n"
+	"	if (logme)\n"
+	"	{\n"
+	"		b3Float4 supVec = b3MakeFloat4(0,0,0,0);\n"
+	"		float maxDot = -B3_LARGE_FLOAT;\n"
+	"		if( 0 < hull->m_numVertices )\n"
+	"		{\n"
+	"			const b3Float4 scaled = localDir;\n"
+	"			int index = b3MaxDot(scaled, &cpuVertices[hull->m_vertexOffset], hull->m_numVertices, &maxDot);\n"
+	"			pInA = cpuVertices[hull->m_vertexOffset+index];\n"
+	"			\n"
+	"		}\n"
+	"	} else\n"
+	"	{\n"
+	"		pInA = b3LocalGetSupportVertex(localDir,hull,cpuVertices);\n"
+	"	}\n"
+	"	//move vertex to world space\n"
+	"	*outp = b3TransformPoint(pInA,pos,orn);\n"
+	"	\n"
+	"}\n"
+	"inline void b3MprSupport(int pairIndex,int bodyIndexA, int bodyIndexB,   b3ConstArray(b3RigidBodyData_t) cpuBodyBuf, \n"
+	"													b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData, \n"
+	"													b3ConstArray(b3Collidable_t)				cpuCollidables,\n"
+	"													b3ConstArray(b3Float4)					cpuVertices,\n"
+	"													__global b3Float4* sepAxis,\n"
+	"													const b3Float4* _dir, b3MprSupport_t *supp)\n"
+	"{\n"
+	"    b3Float4 dir;\n"
+	"	dir = *_dir;\n"
+	"	b3MprConvexSupport(pairIndex,bodyIndexA,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices,sepAxis,&dir, &supp->v1,0);\n"
+	"    dir = *_dir*-1.f;\n"
+	"	b3MprConvexSupport(pairIndex,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices,sepAxis,&dir, &supp->v2,0);\n"
+	"    supp->v = supp->v1 - supp->v2;\n"
+	"}\n"
+	"inline void b3FindOrigin(int bodyIndexA, int bodyIndexB, b3ConstArray(b3RigidBodyData_t) cpuBodyBuf, b3MprSupport_t *center)\n"
+	"{\n"
+	"    center->v1 = cpuBodyBuf[bodyIndexA].m_pos;\n"
+	"	center->v2 = cpuBodyBuf[bodyIndexB].m_pos;\n"
+	"    center->v = center->v1 - center->v2;\n"
+	"}\n"
+	"inline void b3MprVec3Set(b3Float4 *v, float x, float y, float z)\n"
+	"{\n"
+	"	(*v).x = x;\n"
+	"	(*v).y = y;\n"
+	"	(*v).z = z;\n"
+	"	(*v).w = 0.f;\n"
+	"}\n"
+	"inline void b3MprVec3Add(b3Float4 *v, const b3Float4 *w)\n"
+	"{\n"
+	"    (*v).x += (*w).x;\n"
+	"    (*v).y += (*w).y;\n"
+	"    (*v).z += (*w).z;\n"
+	"}\n"
+	"inline void b3MprVec3Copy(b3Float4 *v, const b3Float4 *w)\n"
+	"{\n"
+	"    *v = *w;\n"
+	"}\n"
+	"inline void b3MprVec3Scale(b3Float4 *d, float k)\n"
+	"{\n"
+	"    *d *= k;\n"
+	"}\n"
+	"inline float b3MprVec3Dot(const b3Float4 *a, const b3Float4 *b)\n"
+	"{\n"
+	"    float dot;\n"
+	"	dot = b3Dot3F4(*a,*b);\n"
+	"    return dot;\n"
+	"}\n"
+	"inline float b3MprVec3Len2(const b3Float4 *v)\n"
+	"{\n"
+	"    return b3MprVec3Dot(v, v);\n"
+	"}\n"
+	"inline void b3MprVec3Normalize(b3Float4 *d)\n"
+	"{\n"
+	"    float k = 1.f / B3_MPR_SQRT(b3MprVec3Len2(d));\n"
+	"    b3MprVec3Scale(d, k);\n"
+	"}\n"
+	"inline void b3MprVec3Cross(b3Float4 *d, const b3Float4 *a, const b3Float4 *b)\n"
+	"{\n"
+	"	*d = b3Cross3(*a,*b);\n"
+	"	\n"
+	"}\n"
+	"inline void b3MprVec3Sub2(b3Float4 *d, const b3Float4 *v, const b3Float4 *w)\n"
+	"{\n"
+	"	*d = *v - *w;\n"
+	"}\n"
+	"inline void b3PortalDir(const b3MprSimplex_t *portal, b3Float4 *dir)\n"
+	"{\n"
+	"    b3Float4 v2v1, v3v1;\n"
+	"    b3MprVec3Sub2(&v2v1, &b3MprSimplexPoint(portal, 2)->v,\n"
+	"                       &b3MprSimplexPoint(portal, 1)->v);\n"
+	"    b3MprVec3Sub2(&v3v1, &b3MprSimplexPoint(portal, 3)->v,\n"
+	"                       &b3MprSimplexPoint(portal, 1)->v);\n"
+	"    b3MprVec3Cross(dir, &v2v1, &v3v1);\n"
+	"    b3MprVec3Normalize(dir);\n"
+	"}\n"
+	"inline int portalEncapsulesOrigin(const b3MprSimplex_t *portal,\n"
+	"                                       const b3Float4 *dir)\n"
+	"{\n"
+	"    float dot;\n"
+	"    dot = b3MprVec3Dot(dir, &b3MprSimplexPoint(portal, 1)->v);\n"
+	"    return b3MprIsZero(dot) || dot > 0.f;\n"
+	"}\n"
+	"inline int portalReachTolerance(const b3MprSimplex_t *portal,\n"
+	"                                     const b3MprSupport_t *v4,\n"
+	"                                     const b3Float4 *dir)\n"
+	"{\n"
+	"    float dv1, dv2, dv3, dv4;\n"
+	"    float dot1, dot2, dot3;\n"
+	"    // find the smallest dot product of dir and {v1-v4, v2-v4, v3-v4}\n"
+	"    dv1 = b3MprVec3Dot(&b3MprSimplexPoint(portal, 1)->v, dir);\n"
+	"    dv2 = b3MprVec3Dot(&b3MprSimplexPoint(portal, 2)->v, dir);\n"
+	"    dv3 = b3MprVec3Dot(&b3MprSimplexPoint(portal, 3)->v, dir);\n"
+	"    dv4 = b3MprVec3Dot(&v4->v, dir);\n"
+	"    dot1 = dv4 - dv1;\n"
+	"    dot2 = dv4 - dv2;\n"
+	"    dot3 = dv4 - dv3;\n"
+	"    dot1 = B3_MPR_FMIN(dot1, dot2);\n"
+	"    dot1 = B3_MPR_FMIN(dot1, dot3);\n"
+	"    return b3MprEq(dot1, B3_MPR_TOLERANCE) || dot1 < B3_MPR_TOLERANCE;\n"
+	"}\n"
+	"inline int portalCanEncapsuleOrigin(const b3MprSimplex_t *portal,   \n"
+	"                                         const b3MprSupport_t *v4,\n"
+	"                                         const b3Float4 *dir)\n"
+	"{\n"
+	"    float dot;\n"
+	"    dot = b3MprVec3Dot(&v4->v, dir);\n"
+	"    return b3MprIsZero(dot) || dot > 0.f;\n"
+	"}\n"
+	"inline void b3ExpandPortal(b3MprSimplex_t *portal,\n"
+	"                              const b3MprSupport_t *v4)\n"
+	"{\n"
+	"    float dot;\n"
+	"    b3Float4 v4v0;\n"
+	"    b3MprVec3Cross(&v4v0, &v4->v, &b3MprSimplexPoint(portal, 0)->v);\n"
+	"    dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 1)->v, &v4v0);\n"
+	"    if (dot > 0.f){\n"
+	"        dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 2)->v, &v4v0);\n"
+	"        if (dot > 0.f){\n"
+	"            b3MprSimplexSet(portal, 1, v4);\n"
+	"        }else{\n"
+	"            b3MprSimplexSet(portal, 3, v4);\n"
+	"        }\n"
+	"    }else{\n"
+	"        dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 3)->v, &v4v0);\n"
+	"        if (dot > 0.f){\n"
+	"            b3MprSimplexSet(portal, 2, v4);\n"
+	"        }else{\n"
+	"            b3MprSimplexSet(portal, 1, v4);\n"
+	"        }\n"
+	"    }\n"
+	"}\n"
+	"B3_STATIC int b3DiscoverPortal(int pairIndex, int bodyIndexA, int bodyIndexB,  b3ConstArray(b3RigidBodyData_t) cpuBodyBuf, \n"
+	"													b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData, \n"
+	"													b3ConstArray(b3Collidable_t)				cpuCollidables,\n"
+	"													b3ConstArray(b3Float4)					cpuVertices,\n"
+	"													__global b3Float4* sepAxis,\n"
+	"													__global int*	hasSepAxis,\n"
+	"													b3MprSimplex_t *portal)\n"
+	"{\n"
+	"    b3Float4 dir, va, vb;\n"
+	"    float dot;\n"
+	"    int cont;\n"
+	"	\n"
+	"	\n"
+	"    // vertex 0 is center of portal\n"
+	"    b3FindOrigin(bodyIndexA,bodyIndexB,cpuBodyBuf, b3MprSimplexPointW(portal, 0));\n"
+	"    // vertex 0 is center of portal\n"
+	"    b3MprSimplexSetSize(portal, 1);\n"
+	"	\n"
+	"	b3Float4 zero = b3MakeFloat4(0,0,0,0);\n"
+	"	b3Float4* b3mpr_vec3_origin = &zero;\n"
+	"    if (b3MprVec3Eq(&b3MprSimplexPoint(portal, 0)->v, b3mpr_vec3_origin)){\n"
+	"        // Portal's center lies on origin (0,0,0) => we know that objects\n"
+	"        // intersect but we would need to know penetration info.\n"
+	"        // So move center little bit...\n"
+	"        b3MprVec3Set(&va, FLT_EPSILON * 10.f, 0.f, 0.f);\n"
+	"        b3MprVec3Add(&b3MprSimplexPointW(portal, 0)->v, &va);\n"
+	"    }\n"
+	"    // vertex 1 = support in direction of origin\n"
+	"    b3MprVec3Copy(&dir, &b3MprSimplexPoint(portal, 0)->v);\n"
+	"    b3MprVec3Scale(&dir, -1.f);\n"
+	"    b3MprVec3Normalize(&dir);\n"
+	"    b3MprSupport(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices, sepAxis,&dir, b3MprSimplexPointW(portal, 1));\n"
+	"    b3MprSimplexSetSize(portal, 2);\n"
+	"    // test if origin isn't outside of v1\n"
+	"    dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 1)->v, &dir);\n"
+	"	\n"
+	"    if (b3MprIsZero(dot) || dot < 0.f)\n"
+	"        return -1;\n"
+	"    // vertex 2\n"
+	"    b3MprVec3Cross(&dir, &b3MprSimplexPoint(portal, 0)->v,\n"
+	"                       &b3MprSimplexPoint(portal, 1)->v);\n"
+	"    if (b3MprIsZero(b3MprVec3Len2(&dir))){\n"
+	"        if (b3MprVec3Eq(&b3MprSimplexPoint(portal, 1)->v, b3mpr_vec3_origin)){\n"
+	"            // origin lies on v1\n"
+	"            return 1;\n"
+	"        }else{\n"
+	"            // origin lies on v0-v1 segment\n"
+	"            return 2;\n"
+	"        }\n"
+	"    }\n"
+	"    b3MprVec3Normalize(&dir);\n"
+	"	 b3MprSupport(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices, sepAxis,&dir, b3MprSimplexPointW(portal, 2));\n"
+	"    \n"
+	"    dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 2)->v, &dir);\n"
+	"    if (b3MprIsZero(dot) || dot < 0.f)\n"
+	"        return -1;\n"
+	"    b3MprSimplexSetSize(portal, 3);\n"
+	"    // vertex 3 direction\n"
+	"    b3MprVec3Sub2(&va, &b3MprSimplexPoint(portal, 1)->v,\n"
+	"                     &b3MprSimplexPoint(portal, 0)->v);\n"
+	"    b3MprVec3Sub2(&vb, &b3MprSimplexPoint(portal, 2)->v,\n"
+	"                     &b3MprSimplexPoint(portal, 0)->v);\n"
+	"    b3MprVec3Cross(&dir, &va, &vb);\n"
+	"    b3MprVec3Normalize(&dir);\n"
+	"    // it is better to form portal faces to be oriented \"outside\" origin\n"
+	"    dot = b3MprVec3Dot(&dir, &b3MprSimplexPoint(portal, 0)->v);\n"
+	"    if (dot > 0.f){\n"
+	"        b3MprSimplexSwap(portal, 1, 2);\n"
+	"        b3MprVec3Scale(&dir, -1.f);\n"
+	"    }\n"
+	"    while (b3MprSimplexSize(portal) < 4){\n"
+	"		 b3MprSupport(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices, sepAxis,&dir, b3MprSimplexPointW(portal, 3));\n"
+	"        \n"
+	"        dot = b3MprVec3Dot(&b3MprSimplexPoint(portal, 3)->v, &dir);\n"
+	"        if (b3MprIsZero(dot) || dot < 0.f)\n"
+	"            return -1;\n"
+	"        cont = 0;\n"
+	"        // test if origin is outside (v1, v0, v3) - set v2 as v3 and\n"
+	"        // continue\n"
+	"        b3MprVec3Cross(&va, &b3MprSimplexPoint(portal, 1)->v,\n"
+	"                          &b3MprSimplexPoint(portal, 3)->v);\n"
+	"        dot = b3MprVec3Dot(&va, &b3MprSimplexPoint(portal, 0)->v);\n"
+	"        if (dot < 0.f && !b3MprIsZero(dot)){\n"
+	"            b3MprSimplexSet(portal, 2, b3MprSimplexPoint(portal, 3));\n"
+	"            cont = 1;\n"
+	"        }\n"
+	"        if (!cont){\n"
+	"            // test if origin is outside (v3, v0, v2) - set v1 as v3 and\n"
+	"            // continue\n"
+	"            b3MprVec3Cross(&va, &b3MprSimplexPoint(portal, 3)->v,\n"
+	"                              &b3MprSimplexPoint(portal, 2)->v);\n"
+	"            dot = b3MprVec3Dot(&va, &b3MprSimplexPoint(portal, 0)->v);\n"
+	"            if (dot < 0.f && !b3MprIsZero(dot)){\n"
+	"                b3MprSimplexSet(portal, 1, b3MprSimplexPoint(portal, 3));\n"
+	"                cont = 1;\n"
+	"            }\n"
+	"        }\n"
+	"        if (cont){\n"
+	"            b3MprVec3Sub2(&va, &b3MprSimplexPoint(portal, 1)->v,\n"
+	"                             &b3MprSimplexPoint(portal, 0)->v);\n"
+	"            b3MprVec3Sub2(&vb, &b3MprSimplexPoint(portal, 2)->v,\n"
+	"                             &b3MprSimplexPoint(portal, 0)->v);\n"
+	"            b3MprVec3Cross(&dir, &va, &vb);\n"
+	"            b3MprVec3Normalize(&dir);\n"
+	"        }else{\n"
+	"            b3MprSimplexSetSize(portal, 4);\n"
+	"        }\n"
+	"    }\n"
+	"    return 0;\n"
+	"}\n"
+	"B3_STATIC int b3RefinePortal(int pairIndex,int bodyIndexA, int bodyIndexB,  b3ConstArray(b3RigidBodyData_t) cpuBodyBuf, \n"
+	"													b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData, \n"
+	"													b3ConstArray(b3Collidable_t)				cpuCollidables,\n"
+	"													b3ConstArray(b3Float4)					cpuVertices,\n"
+	"													__global b3Float4* sepAxis,\n"
+	"													b3MprSimplex_t *portal)\n"
+	"{\n"
+	"    b3Float4 dir;\n"
+	"    b3MprSupport_t v4;\n"
+	"	for (int i=0;i<B3_MPR_MAX_ITERATIONS;i++)\n"
+	"    //while (1)\n"
+	"	{\n"
+	"        // compute direction outside the portal (from v0 throught v1,v2,v3\n"
+	"        // face)\n"
+	"        b3PortalDir(portal, &dir);\n"
+	"        // test if origin is inside the portal\n"
+	"        if (portalEncapsulesOrigin(portal, &dir))\n"
+	"            return 0;\n"
+	"        // get next support point\n"
+	"        \n"
+	"		 b3MprSupport(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices, sepAxis,&dir, &v4);\n"
+	"        // test if v4 can expand portal to contain origin and if portal\n"
+	"        // expanding doesn't reach given tolerance\n"
+	"        if (!portalCanEncapsuleOrigin(portal, &v4, &dir)\n"
+	"                || portalReachTolerance(portal, &v4, &dir))\n"
+	"		{\n"
+	"            return -1;\n"
+	"        }\n"
+	"        // v1-v2-v3 triangle must be rearranged to face outside Minkowski\n"
+	"        // difference (direction from v0).\n"
+	"        b3ExpandPortal(portal, &v4);\n"
+	"    }\n"
+	"    return -1;\n"
+	"}\n"
+	"B3_STATIC void b3FindPos(const b3MprSimplex_t *portal, b3Float4 *pos)\n"
+	"{\n"
+	"	b3Float4 zero = b3MakeFloat4(0,0,0,0);\n"
+	"	b3Float4* b3mpr_vec3_origin = &zero;\n"
+	"    b3Float4 dir;\n"
+	"    size_t i;\n"
+	"    float b[4], sum, inv;\n"
+	"    b3Float4 vec, p1, p2;\n"
+	"    b3PortalDir(portal, &dir);\n"
+	"    // use barycentric coordinates of tetrahedron to find origin\n"
+	"    b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 1)->v,\n"
+	"                       &b3MprSimplexPoint(portal, 2)->v);\n"
+	"    b[0] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 3)->v);\n"
+	"    b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 3)->v,\n"
+	"                       &b3MprSimplexPoint(portal, 2)->v);\n"
+	"    b[1] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 0)->v);\n"
+	"    b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 0)->v,\n"
+	"                       &b3MprSimplexPoint(portal, 1)->v);\n"
+	"    b[2] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 3)->v);\n"
+	"    b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 2)->v,\n"
+	"                       &b3MprSimplexPoint(portal, 1)->v);\n"
+	"    b[3] = b3MprVec3Dot(&vec, &b3MprSimplexPoint(portal, 0)->v);\n"
+	"	sum = b[0] + b[1] + b[2] + b[3];\n"
+	"    if (b3MprIsZero(sum) || sum < 0.f){\n"
+	"		b[0] = 0.f;\n"
+	"        b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 2)->v,\n"
+	"                           &b3MprSimplexPoint(portal, 3)->v);\n"
+	"        b[1] = b3MprVec3Dot(&vec, &dir);\n"
+	"        b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 3)->v,\n"
+	"                           &b3MprSimplexPoint(portal, 1)->v);\n"
+	"        b[2] = b3MprVec3Dot(&vec, &dir);\n"
+	"        b3MprVec3Cross(&vec, &b3MprSimplexPoint(portal, 1)->v,\n"
+	"                           &b3MprSimplexPoint(portal, 2)->v);\n"
+	"        b[3] = b3MprVec3Dot(&vec, &dir);\n"
+	"		sum = b[1] + b[2] + b[3];\n"
+	"	}\n"
+	"	inv = 1.f / sum;\n"
+	"    b3MprVec3Copy(&p1, b3mpr_vec3_origin);\n"
+	"    b3MprVec3Copy(&p2, b3mpr_vec3_origin);\n"
+	"    for (i = 0; i < 4; i++){\n"
+	"        b3MprVec3Copy(&vec, &b3MprSimplexPoint(portal, i)->v1);\n"
+	"        b3MprVec3Scale(&vec, b[i]);\n"
+	"        b3MprVec3Add(&p1, &vec);\n"
+	"        b3MprVec3Copy(&vec, &b3MprSimplexPoint(portal, i)->v2);\n"
+	"        b3MprVec3Scale(&vec, b[i]);\n"
+	"        b3MprVec3Add(&p2, &vec);\n"
+	"    }\n"
+	"    b3MprVec3Scale(&p1, inv);\n"
+	"    b3MprVec3Scale(&p2, inv);\n"
+	"    b3MprVec3Copy(pos, &p1);\n"
+	"    b3MprVec3Add(pos, &p2);\n"
+	"    b3MprVec3Scale(pos, 0.5);\n"
+	"}\n"
+	"inline float b3MprVec3Dist2(const b3Float4 *a, const b3Float4 *b)\n"
+	"{\n"
+	"    b3Float4 ab;\n"
+	"    b3MprVec3Sub2(&ab, a, b);\n"
+	"    return b3MprVec3Len2(&ab);\n"
+	"}\n"
+	"inline float _b3MprVec3PointSegmentDist2(const b3Float4 *P,\n"
+	"                                                  const b3Float4 *x0,\n"
+	"                                                  const b3Float4 *b,\n"
+	"                                                  b3Float4 *witness)\n"
+	"{\n"
+	"    // The computation comes from solving equation of segment:\n"
+	"    //      S(t) = x0 + t.d\n"
+	"    //          where - x0 is initial point of segment\n"
+	"    //                - d is direction of segment from x0 (|d| > 0)\n"
+	"    //                - t belongs to <0, 1> interval\n"
+	"    // \n"
+	"    // Than, distance from a segment to some point P can be expressed:\n"
+	"    //      D(t) = |x0 + t.d - P|^2\n"
+	"    //          which is distance from any point on segment. Minimization\n"
+	"    //          of this function brings distance from P to segment.\n"
+	"    // Minimization of D(t) leads to simple quadratic equation that's\n"
+	"    // solving is straightforward.\n"
+	"    //\n"
+	"    // Bonus of this method is witness point for free.\n"
+	"    float dist, t;\n"
+	"    b3Float4 d, a;\n"
+	"    // direction of segment\n"
+	"    b3MprVec3Sub2(&d, b, x0);\n"
+	"    // precompute vector from P to x0\n"
+	"    b3MprVec3Sub2(&a, x0, P);\n"
+	"    t  = -1.f * b3MprVec3Dot(&a, &d);\n"
+	"    t /= b3MprVec3Len2(&d);\n"
+	"    if (t < 0.f || b3MprIsZero(t)){\n"
+	"        dist = b3MprVec3Dist2(x0, P);\n"
+	"        if (witness)\n"
+	"            b3MprVec3Copy(witness, x0);\n"
+	"    }else if (t > 1.f || b3MprEq(t, 1.f)){\n"
+	"        dist = b3MprVec3Dist2(b, P);\n"
+	"        if (witness)\n"
+	"            b3MprVec3Copy(witness, b);\n"
+	"    }else{\n"
+	"        if (witness){\n"
+	"            b3MprVec3Copy(witness, &d);\n"
+	"            b3MprVec3Scale(witness, t);\n"
+	"            b3MprVec3Add(witness, x0);\n"
+	"            dist = b3MprVec3Dist2(witness, P);\n"
+	"        }else{\n"
+	"            // recycling variables\n"
+	"            b3MprVec3Scale(&d, t);\n"
+	"            b3MprVec3Add(&d, &a);\n"
+	"            dist = b3MprVec3Len2(&d);\n"
+	"        }\n"
+	"    }\n"
+	"    return dist;\n"
+	"}\n"
+	"inline float b3MprVec3PointTriDist2(const b3Float4 *P,\n"
+	"                                const b3Float4 *x0, const b3Float4 *B,\n"
+	"                                const b3Float4 *C,\n"
+	"                                b3Float4 *witness)\n"
+	"{\n"
+	"    // Computation comes from analytic expression for triangle (x0, B, C)\n"
+	"    //      T(s, t) = x0 + s.d1 + t.d2, where d1 = B - x0 and d2 = C - x0 and\n"
+	"    // Then equation for distance is:\n"
+	"    //      D(s, t) = | T(s, t) - P |^2\n"
+	"    // This leads to minimization of quadratic function of two variables.\n"
+	"    // The solution from is taken only if s is between 0 and 1, t is\n"
+	"    // between 0 and 1 and t + s < 1, otherwise distance from segment is\n"
+	"    // computed.\n"
+	"    b3Float4 d1, d2, a;\n"
+	"    float u, v, w, p, q, r;\n"
+	"    float s, t, dist, dist2;\n"
+	"    b3Float4 witness2;\n"
+	"    b3MprVec3Sub2(&d1, B, x0);\n"
+	"    b3MprVec3Sub2(&d2, C, x0);\n"
+	"    b3MprVec3Sub2(&a, x0, P);\n"
+	"    u = b3MprVec3Dot(&a, &a);\n"
+	"    v = b3MprVec3Dot(&d1, &d1);\n"
+	"    w = b3MprVec3Dot(&d2, &d2);\n"
+	"    p = b3MprVec3Dot(&a, &d1);\n"
+	"    q = b3MprVec3Dot(&a, &d2);\n"
+	"    r = b3MprVec3Dot(&d1, &d2);\n"
+	"    s = (q * r - w * p) / (w * v - r * r);\n"
+	"    t = (-s * r - q) / w;\n"
+	"    if ((b3MprIsZero(s) || s > 0.f)\n"
+	"            && (b3MprEq(s, 1.f) || s < 1.f)\n"
+	"            && (b3MprIsZero(t) || t > 0.f)\n"
+	"            && (b3MprEq(t, 1.f) || t < 1.f)\n"
+	"            && (b3MprEq(t + s, 1.f) || t + s < 1.f)){\n"
+	"        if (witness){\n"
+	"            b3MprVec3Scale(&d1, s);\n"
+	"            b3MprVec3Scale(&d2, t);\n"
+	"            b3MprVec3Copy(witness, x0);\n"
+	"            b3MprVec3Add(witness, &d1);\n"
+	"            b3MprVec3Add(witness, &d2);\n"
+	"            dist = b3MprVec3Dist2(witness, P);\n"
+	"        }else{\n"
+	"            dist  = s * s * v;\n"
+	"            dist += t * t * w;\n"
+	"            dist += 2.f * s * t * r;\n"
+	"            dist += 2.f * s * p;\n"
+	"            dist += 2.f * t * q;\n"
+	"            dist += u;\n"
+	"        }\n"
+	"    }else{\n"
+	"        dist = _b3MprVec3PointSegmentDist2(P, x0, B, witness);\n"
+	"        dist2 = _b3MprVec3PointSegmentDist2(P, x0, C, &witness2);\n"
+	"        if (dist2 < dist){\n"
+	"            dist = dist2;\n"
+	"            if (witness)\n"
+	"                b3MprVec3Copy(witness, &witness2);\n"
+	"        }\n"
+	"        dist2 = _b3MprVec3PointSegmentDist2(P, B, C, &witness2);\n"
+	"        if (dist2 < dist){\n"
+	"            dist = dist2;\n"
+	"            if (witness)\n"
+	"                b3MprVec3Copy(witness, &witness2);\n"
+	"        }\n"
+	"    }\n"
+	"    return dist;\n"
+	"}\n"
+	"B3_STATIC void b3FindPenetr(int pairIndex,int bodyIndexA, int bodyIndexB,  b3ConstArray(b3RigidBodyData_t) cpuBodyBuf, \n"
+	"													b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData, \n"
+	"													b3ConstArray(b3Collidable_t)				cpuCollidables,\n"
+	"													b3ConstArray(b3Float4)					cpuVertices,\n"
+	"													__global b3Float4* sepAxis,\n"
+	"                       b3MprSimplex_t *portal,\n"
+	"                       float *depth, b3Float4 *pdir, b3Float4 *pos)\n"
+	"{\n"
+	"    b3Float4 dir;\n"
+	"    b3MprSupport_t v4;\n"
+	"    unsigned long iterations;\n"
+	"	b3Float4 zero = b3MakeFloat4(0,0,0,0);\n"
+	"	b3Float4* b3mpr_vec3_origin = &zero;\n"
+	"    iterations = 1UL;\n"
+	"	for (int i=0;i<B3_MPR_MAX_ITERATIONS;i++)\n"
+	"    //while (1)\n"
+	"	{\n"
+	"        // compute portal direction and obtain next support point\n"
+	"        b3PortalDir(portal, &dir);\n"
+	"        \n"
+	"		 b3MprSupport(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices, sepAxis,&dir, &v4);\n"
+	"        // reached tolerance -> find penetration info\n"
+	"        if (portalReachTolerance(portal, &v4, &dir)\n"
+	"                || iterations ==B3_MPR_MAX_ITERATIONS)\n"
+	"		{\n"
+	"            *depth = b3MprVec3PointTriDist2(b3mpr_vec3_origin,&b3MprSimplexPoint(portal, 1)->v,&b3MprSimplexPoint(portal, 2)->v,&b3MprSimplexPoint(portal, 3)->v,pdir);\n"
+	"            *depth = B3_MPR_SQRT(*depth);\n"
+	"			\n"
+	"			if (b3MprIsZero((*pdir).x) && b3MprIsZero((*pdir).y) && b3MprIsZero((*pdir).z))\n"
+	"			{\n"
+	"				\n"
+	"				*pdir = dir;\n"
+	"			} \n"
+	"			b3MprVec3Normalize(pdir);\n"
+	"			\n"
+	"            // barycentric coordinates:\n"
+	"            b3FindPos(portal, pos);\n"
+	"            return;\n"
+	"        }\n"
+	"        b3ExpandPortal(portal, &v4);\n"
+	"        iterations++;\n"
+	"    }\n"
+	"}\n"
+	"B3_STATIC void b3FindPenetrTouch(b3MprSimplex_t *portal,float *depth, b3Float4 *dir, b3Float4 *pos)\n"
+	"{\n"
+	"    // Touching contact on portal's v1 - so depth is zero and direction\n"
+	"    // is unimportant and pos can be guessed\n"
+	"    *depth = 0.f;\n"
+	"    b3Float4 zero = b3MakeFloat4(0,0,0,0);\n"
+	"	b3Float4* b3mpr_vec3_origin = &zero;\n"
+	"	b3MprVec3Copy(dir, b3mpr_vec3_origin);\n"
+	"    b3MprVec3Copy(pos, &b3MprSimplexPoint(portal, 1)->v1);\n"
+	"    b3MprVec3Add(pos, &b3MprSimplexPoint(portal, 1)->v2);\n"
+	"    b3MprVec3Scale(pos, 0.5);\n"
+	"}\n"
+	"B3_STATIC void b3FindPenetrSegment(b3MprSimplex_t *portal,\n"
+	"                              float *depth, b3Float4 *dir, b3Float4 *pos)\n"
+	"{\n"
+	"    \n"
+	"    // Origin lies on v0-v1 segment.\n"
+	"    // Depth is distance to v1, direction also and position must be\n"
+	"    // computed\n"
+	"    b3MprVec3Copy(pos, &b3MprSimplexPoint(portal, 1)->v1);\n"
+	"    b3MprVec3Add(pos, &b3MprSimplexPoint(portal, 1)->v2);\n"
+	"    b3MprVec3Scale(pos, 0.5f);\n"
+	"    \n"
+	"    b3MprVec3Copy(dir, &b3MprSimplexPoint(portal, 1)->v);\n"
+	"    *depth = B3_MPR_SQRT(b3MprVec3Len2(dir));\n"
+	"    b3MprVec3Normalize(dir);\n"
+	"}\n"
+	"inline int b3MprPenetration(int pairIndex, int bodyIndexA, int bodyIndexB,\n"
+	"					b3ConstArray(b3RigidBodyData_t) cpuBodyBuf,\n"
+	"					b3ConstArray(b3ConvexPolyhedronData_t) cpuConvexData, \n"
+	"					b3ConstArray(b3Collidable_t)	cpuCollidables,\n"
+	"					b3ConstArray(b3Float4)	cpuVertices,\n"
+	"					__global b3Float4* sepAxis,\n"
+	"					__global int*	hasSepAxis,\n"
+	"					float *depthOut, b3Float4* dirOut, b3Float4* posOut)\n"
+	"{\n"
+	"	\n"
+	"	 b3MprSimplex_t portal;\n"
+	"	 \n"
+	"//	if (!hasSepAxis[pairIndex])\n"
+	"	//	return -1;\n"
+	"	\n"
+	"	hasSepAxis[pairIndex] = 0;\n"
+	"	 int res;\n"
+	"    // Phase 1: Portal discovery\n"
+	"    res = b3DiscoverPortal(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices,sepAxis,hasSepAxis, &portal);\n"
+	"	\n"
+	"	  \n"
+	"	//sepAxis[pairIndex] = *pdir;//or -dir?\n"
+	"	switch (res)\n"
+	"	{\n"
+	"	case 0:\n"
+	"		{\n"
+	"			// Phase 2: Portal refinement\n"
+	"		\n"
+	"			res = b3RefinePortal(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices, sepAxis,&portal);\n"
+	"			if (res < 0)\n"
+	"				return -1;\n"
+	"			// Phase 3. Penetration info\n"
+	"			b3FindPenetr(pairIndex,bodyIndexA,bodyIndexB,cpuBodyBuf,cpuConvexData,cpuCollidables,cpuVertices, sepAxis,&portal, depthOut, dirOut, posOut);\n"
+	"			hasSepAxis[pairIndex] = 1;\n"
+	"			sepAxis[pairIndex] = -*dirOut;\n"
+	"			break;\n"
+	"		}\n"
+	"	case 1:\n"
+	"		{\n"
+	"			 // Touching contact on portal's v1.\n"
+	"			b3FindPenetrTouch(&portal, depthOut, dirOut, posOut);\n"
+	"			break;\n"
+	"		}\n"
+	"	case 2:\n"
+	"		{\n"
+	"			\n"
+	"			b3FindPenetrSegment( &portal, depthOut, dirOut, posOut);\n"
+	"			break;\n"
+	"		}\n"
+	"	default:\n"
+	"		{\n"
+	"			hasSepAxis[pairIndex]=0;\n"
+	"			//if (res < 0)\n"
+	"			//{\n"
+	"				// Origin isn't inside portal - no collision.\n"
+	"				return -1;\n"
+	"			//}\n"
+	"		}\n"
+	"	};\n"
+	"	\n"
+	"	return 0;\n"
+	"};\n"
+	"#endif //B3_MPR_PENETRATION_H\n"
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define GET_NPOINTS(x) (x).m_worldNormalOnB.w\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"	#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"	#define counter32_t volatile __global int*\n"
+	"#endif\n"
+	"__kernel void   mprPenetrationKernel( __global int4* pairs,\n"
+	"																					__global const b3RigidBodyData_t* rigidBodies, \n"
+	"																					__global const b3Collidable_t* collidables,\n"
+	"																					__global const b3ConvexPolyhedronData_t* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global float4* separatingNormals,\n"
+	"																					__global int* hasSeparatingAxis,\n"
+	"																					__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																					counter32_t nGlobalContactsOut,\n"
+	"																					int contactCapacity,\n"
+	"																					int numPairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"		int bodyIndexA = pairs[i].x;\n"
+	"		int bodyIndexB = pairs[i].y;\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"	\n"
+	"		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"		\n"
+	"		\n"
+	"		//once the broadphase avoids static-static pairs, we can remove this test\n"
+	"		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))\n"
+	"		{\n"
+	"			return;\n"
+	"		}\n"
+	"		\n"
+	"		if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONVEX_HULL) ||(collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL))\n"
+	"		{\n"
+	"			return;\n"
+	"		}\n"
+	"		float depthOut;\n"
+	"		b3Float4 dirOut;\n"
+	"		b3Float4 posOut;\n"
+	"		int res = b3MprPenetration(pairIndex, bodyIndexA, bodyIndexB,rigidBodies,convexShapes,collidables,vertices,separatingNormals,hasSeparatingAxis,&depthOut, &dirOut, &posOut);\n"
+	"		\n"
+	"		\n"
+	"		\n"
+	"		\n"
+	"		if (res==0)\n"
+	"		{\n"
+	"			//add a contact\n"
+	"			int dstIdx;\n"
+	"			AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"			if (dstIdx<contactCapacity)\n"
+	"			{\n"
+	"				pairs[pairIndex].z = dstIdx;\n"
+	"				__global struct b3Contact4Data* c = globalContactsOut + dstIdx;\n"
+	"				c->m_worldNormalOnB = -dirOut;//normal;\n"
+	"				c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"				c->m_batchIdx = pairIndex;\n"
+	"				int bodyA = pairs[pairIndex].x;\n"
+	"				int bodyB = pairs[pairIndex].y;\n"
+	"				c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0 ? -bodyA:bodyA;\n"
+	"				c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0 ? -bodyB:bodyB;\n"
+	"				c->m_childIndexA = -1;\n"
+	"				c->m_childIndexB = -1;\n"
+	"				//for (int i=0;i<nContacts;i++)\n"
+	"				posOut.w = -depthOut;\n"
+	"				c->m_worldPosB[0] = posOut;//localPoints[contactIdx[i]];\n"
+	"				GET_NPOINTS(*c) = 1;//nContacts;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"typedef float4 Quaternion;\n"
+	"#define make_float4 (float4)\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)\n"
+	"{\n"
+	"	return qtRotate( *orientation, *p ) + (*translation);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"inline void project(__global const b3ConvexPolyhedronData_t* hull,  const float4 pos, const float4 orn, \n"
+	"const float4* dir, __global const float4* vertices, float* min, float* max)\n"
+	"{\n"
+	"	min[0] = FLT_MAX;\n"
+	"	max[0] = -FLT_MAX;\n"
+	"	int numVerts = hull->m_numVertices;\n"
+	"	const float4 localDir = qtInvRotate(orn,*dir);\n"
+	"	float offset = dot(pos,*dir);\n"
+	"	for(int i=0;i<numVerts;i++)\n"
+	"	{\n"
+	"		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);\n"
+	"		if(dp < min[0])	\n"
+	"			min[0] = dp;\n"
+	"		if(dp > max[0])	\n"
+	"			max[0] = dp;\n"
+	"	}\n"
+	"	if(min[0]>max[0])\n"
+	"	{\n"
+	"		float tmp = min[0];\n"
+	"		min[0] = max[0];\n"
+	"		max[0] = tmp;\n"
+	"	}\n"
+	"	min[0] += offset;\n"
+	"	max[0] += offset;\n"
+	"}\n"
+	"bool findSeparatingAxisUnitSphere(	__global const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	__global const float4* vertices,\n"
+	"	__global const float4* unitSphereDirections,\n"
+	"	int numUnitSphereDirections,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	int curEdgeEdge = 0;\n"
+	"	// Test unit sphere directions\n"
+	"	for (int i=0;i<numUnitSphereDirections;i++)\n"
+	"	{\n"
+	"		float4 crossje;\n"
+	"		crossje = unitSphereDirections[i];	\n"
+	"		if (dot3F4(DeltaC2,crossje)>0)\n"
+	"			crossje *= -1.f;\n"
+	"		{\n"
+	"			float dist;\n"
+	"			bool result = true;\n"
+	"			float Min0,Max0;\n"
+	"			float Min1,Max1;\n"
+	"			project(hullA,posA,ornA,&crossje,vertices, &Min0, &Max0);\n"
+	"			project(hullB,posB,ornB,&crossje,vertices, &Min1, &Max1);\n"
+	"		\n"
+	"			if(Max0<Min1 || Max1<Min0)\n"
+	"				return false;\n"
+	"		\n"
+	"			float d0 = Max0 - Min1;\n"
+	"			float d1 = Max1 - Min0;\n"
+	"			dist = d0<d1 ? d0:d1;\n"
+	"			result = true;\n"
+	"	\n"
+	"			if(dist<*dmin)\n"
+	"			{\n"
+	"				*dmin = dist;\n"
+	"				*sep = crossje;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"__kernel void   findSeparatingAxisUnitSphereKernel( __global const int4* pairs, \n"
+	"																					__global const b3RigidBodyData_t* rigidBodies, \n"
+	"																					__global const b3Collidable_t* collidables,\n"
+	"																					__global const b3ConvexPolyhedronData_t* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* unitSphereDirections,\n"
+	"																					__global  float4* separatingNormals,\n"
+	"																					__global  int* hasSeparatingAxis,\n"
+	"																					__global  float* dmins,\n"
+	"																					int numUnitSphereDirections,\n"
+	"																					int numPairs\n"
+	"																					)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"		if (hasSeparatingAxis[i])\n"
+	"		{\n"
+	"	\n"
+	"			int bodyIndexA = pairs[i].x;\n"
+	"			int bodyIndexB = pairs[i].y;\n"
+	"	\n"
+	"			int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"			int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"		\n"
+	"			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"			\n"
+	"			\n"
+	"			int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"	\n"
+	"			float dmin = dmins[i];\n"
+	"	\n"
+	"			float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"			posA.w = 0.f;\n"
+	"			float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"			posB.w = 0.f;\n"
+	"			float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"			float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"			float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"			float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"			float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"			float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"			const float4 DeltaC2 = c0 - c1;\n"
+	"			float4 sepNormal = separatingNormals[i];\n"
+	"			\n"
+	"			int numEdgeEdgeDirections = convexShapes[shapeIndexA].m_numUniqueEdges*convexShapes[shapeIndexB].m_numUniqueEdges;\n"
+	"			if (numEdgeEdgeDirections>numUnitSphereDirections)\n"
+	"			{\n"
+	"				bool sepEE = findSeparatingAxisUnitSphere(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,\n"
+	"																										posB,ornB,\n"
+	"																										DeltaC2,\n"
+	"																										vertices,unitSphereDirections,numUnitSphereDirections,&sepNormal,&dmin);\n"
+	"				if (!sepEE)\n"
+	"				{\n"
+	"					hasSeparatingAxis[i] = 0;\n"
+	"				} else\n"
+	"				{\n"
+	"					hasSeparatingAxis[i] = 1;\n"
+	"					separatingNormals[i] = sepNormal;\n"
+	"				}\n"
+	"			}\n"
+	"		}		//if (hasSeparatingAxis[i])\n"
+	"	}//(i<numPairs)\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl
new file mode 100644
index 0000000..9c9e920
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl
@@ -0,0 +1,1374 @@
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+#define SHAPE_CONVEX_HULL 3
+#define SHAPE_PLANE 4
+#define SHAPE_CONCAVE_TRIMESH 5
+#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6
+#define SHAPE_SPHERE 7
+
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile __global int*
+#endif
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+#define max2 max
+#define min2 min
+
+typedef unsigned int u32;
+
+
+
+
+typedef struct 
+{
+	union
+	{
+		float4	m_min;
+		float   m_minElems[4];
+		int			m_minIndices[4];
+	};
+	union
+	{
+		float4	m_max;
+		float   m_maxElems[4];
+		int			m_maxIndices[4];
+	};
+} btAabbCL;
+
+///keep this in sync with btCollidable.h
+typedef struct
+{
+	int m_numChildShapes;
+	float m_radius;
+	int m_shapeType;
+	int m_shapeIndex;
+	
+} btCollidableGpu;
+
+typedef struct
+{
+	float4	m_childPosition;
+	float4	m_childOrientation;
+	int m_shapeIndex;
+	int m_unused0;
+	int m_unused1;
+	int m_unused2;
+} btGpuChildShape;
+
+#define GET_NPOINTS(x) (x).m_worldNormalOnB.w
+
+typedef struct
+{
+	float4 m_pos;
+	float4 m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_collidableIdx;	
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} BodyData;
+
+
+typedef struct  
+{
+	float4		m_localCenter;
+	float4		m_extents;
+	float4		mC;
+	float4		mE;
+	
+	float			m_radius;
+	int	m_faceOffset;
+	int m_numFaces;
+	int	m_numVertices;
+	
+	int m_vertexOffset;
+	int	m_uniqueEdgesOffset;
+	int	m_numUniqueEdges;
+	int m_unused;
+
+} ConvexPolyhedronCL;
+
+typedef struct
+{
+	float4 m_plane;
+	int m_indexOffset;
+	int m_numIndices;
+} btGpuFace;
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define make_float4 (float4)
+#define make_float2 (float2)
+#define make_uint4 (uint4)
+#define make_int4 (int4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+
+__inline
+float fastDiv(float numerator, float denominator)
+{
+	return native_divide(numerator, denominator);	
+//	return numerator/denominator;	
+}
+
+__inline
+float4 fastDiv4(float4 numerator, float4 denominator)
+{
+	return native_divide(numerator, denominator);	
+}
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+
+//#define dot3F4 dot
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	return fast_normalize(v);
+}
+
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+Quaternion qtNormalize(Quaternion in);
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec);
+
+__inline
+Quaternion qtInvert(Quaternion q);
+
+
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtNormalize(Quaternion in)
+{
+	return fastNormalize4(in);
+//	in /= length( in );
+//	return in;
+}
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+__inline
+float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)
+{
+	return qtRotate( *orientation, *p ) + (*translation);
+}
+
+void	trInverse(float4 translationIn, Quaternion orientationIn,
+		float4* translationOut, Quaternion* orientationOut)
+{
+	*orientationOut = qtInvert(orientationIn);
+	*translationOut = qtRotate(*orientationOut, -translationIn);
+}
+
+void	trMul(float4 translationA, Quaternion orientationA,
+						float4 translationB, Quaternion orientationB,
+		float4* translationOut, Quaternion* orientationOut)
+{
+	*orientationOut = qtMul(orientationA,orientationB);
+	*translationOut = transform(&translationB,&translationA,&orientationA);
+}
+
+
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = make_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+}
+
+
+__inline float4 lerp3(const float4 a,const float4 b, float  t)
+{
+	return make_float4(	a.x + (b.x - a.x) * t,
+						a.y + (b.y - a.y) * t,
+						a.z + (b.z - a.z) * t,
+						0.f);
+}
+
+
+float signedDistanceFromPointToPlane(float4 point, float4 planeEqn, float4* closestPointOnFace)
+{
+	float4 n = (float4)(planeEqn.x, planeEqn.y, planeEqn.z, 0);
+	float dist = dot3F4(n, point) + planeEqn.w;
+	*closestPointOnFace = point - dist * n;
+	return dist;
+}
+
+
+
+inline bool IsPointInPolygon(float4 p, 
+							const btGpuFace* face,
+							__global const float4* baseVertex,
+							__global const  int* convexIndices,
+							float4* out)
+{
+    float4 a;
+    float4 b;
+    float4 ab;
+    float4 ap;
+    float4 v;
+
+	float4 plane = make_float4(face->m_plane.x,face->m_plane.y,face->m_plane.z,0.f);
+	
+	if (face->m_numIndices<2)
+		return false;
+
+	
+	float4 v0 = baseVertex[convexIndices[face->m_indexOffset + face->m_numIndices-1]];
+	
+	b = v0;
+
+    for(unsigned i=0; i != face->m_numIndices; ++i)
+    {
+		a = b;
+		float4 vi = baseVertex[convexIndices[face->m_indexOffset + i]];
+		b = vi;
+        ab = b-a;
+        ap = p-a;
+        v = cross3(ab,plane);
+
+        if (dot(ap, v) > 0.f)
+        {
+            float ab_m2 = dot(ab, ab);
+            float rt = ab_m2 != 0.f ? dot(ab, ap) / ab_m2 : 0.f;
+            if (rt <= 0.f)
+            {
+                *out = a;
+            }
+            else if (rt >= 1.f) 
+            {
+                *out = b;
+            }
+            else
+            {
+            	float s = 1.f - rt;
+				out[0].x = s * a.x + rt * b.x;
+				out[0].y = s * a.y + rt * b.y;
+				out[0].z = s * a.z + rt * b.z;
+            }
+            return false;
+        }
+    }
+    return true;
+}
+
+
+
+
+void	computeContactSphereConvex(int pairIndex,
+																int bodyIndexA, int bodyIndexB, 
+																int collidableIndexA, int collidableIndexB, 
+																__global const BodyData* rigidBodies, 
+																__global const btCollidableGpu* collidables,
+																__global const ConvexPolyhedronCL* convexShapes,
+																__global const float4* convexVertices,
+																__global const int* convexIndices,
+																__global const btGpuFace* faces,
+																__global struct b3Contact4Data* restrict globalContactsOut,
+																counter32_t nGlobalContactsOut,
+																int maxContactCapacity,
+																float4 spherePos2,
+																float radius,
+																float4 pos,
+																float4 quat
+																)
+{
+
+	float4 invPos;
+	float4 invOrn;
+
+	trInverse(pos,quat, &invPos,&invOrn);
+
+	float4 spherePos = transform(&spherePos2,&invPos,&invOrn);
+
+	int shapeIndex = collidables[collidableIndexB].m_shapeIndex;
+	int numFaces = convexShapes[shapeIndex].m_numFaces;
+	float4 closestPnt = (float4)(0, 0, 0, 0);
+	float4 hitNormalWorld = (float4)(0, 0, 0, 0);
+	float minDist = -1000000.f;
+	bool bCollide = true;
+
+	for ( int f = 0; f < numFaces; f++ )
+	{
+		btGpuFace face = faces[convexShapes[shapeIndex].m_faceOffset+f];
+
+		// set up a plane equation 
+		float4 planeEqn;
+		float4 n1 = face.m_plane;
+		n1.w = 0.f;
+		planeEqn = n1;
+		planeEqn.w = face.m_plane.w;
+		
+	
+		// compute a signed distance from the vertex in cloth to the face of rigidbody.
+		float4 pntReturn;
+		float dist = signedDistanceFromPointToPlane(spherePos, planeEqn, &pntReturn);
+
+		// If the distance is positive, the plane is a separating plane. 
+		if ( dist > radius )
+		{
+			bCollide = false;
+			break;
+		}
+
+
+		if (dist>0)
+		{
+			//might hit an edge or vertex
+			float4 out;
+			float4 zeroPos = make_float4(0,0,0,0);
+
+			bool isInPoly = IsPointInPolygon(spherePos,
+					&face,
+					&convexVertices[convexShapes[shapeIndex].m_vertexOffset],
+					convexIndices,
+           &out);
+			if (isInPoly)
+			{
+				if (dist>minDist)
+				{
+					minDist = dist;
+					closestPnt = pntReturn;
+					hitNormalWorld = planeEqn;
+					
+				}
+			} else
+			{
+				float4 tmp = spherePos-out;
+				float l2 = dot(tmp,tmp);
+				if (l2<radius*radius)
+				{
+					dist  = sqrt(l2);
+					if (dist>minDist)
+					{
+						minDist = dist;
+						closestPnt = out;
+						hitNormalWorld = tmp/dist;
+						
+					}
+					
+				} else
+				{
+					bCollide = false;
+					break;
+				}
+			}
+		} else
+		{
+			if ( dist > minDist )
+			{
+				minDist = dist;
+				closestPnt = pntReturn;
+				hitNormalWorld.xyz = planeEqn.xyz;
+			}
+		}
+		
+	}
+
+	
+
+	if (bCollide && minDist > -10000)
+	{
+		float4 normalOnSurfaceB1 = qtRotate(quat,-hitNormalWorld);
+		float4 pOnB1 = transform(&closestPnt,&pos,&quat);
+		
+		float actualDepth = minDist-radius;
+		if (actualDepth<=0.f)
+		{
+			
+
+			pOnB1.w = actualDepth;
+
+			int dstIdx;
+			AppendInc( nGlobalContactsOut, dstIdx );
+		
+			
+			if (1)//dstIdx < maxContactCapacity)
+			{
+				__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+				c->m_worldNormalOnB = -normalOnSurfaceB1;
+				c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+				c->m_batchIdx = pairIndex;
+				c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;
+				c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;
+				c->m_worldPosB[0] = pOnB1;
+				c->m_childIndexA = -1;
+				c->m_childIndexB = -1;
+
+				GET_NPOINTS(*c) = 1;
+			} 
+
+		}
+	}//if (hasCollision)
+
+}
+							
+
+
+int extractManifoldSequential(const float4* p, int nPoints, float4 nearNormal, int4* contactIdx)
+{
+	if( nPoints == 0 )
+        return 0;
+    
+    if (nPoints <=4)
+        return nPoints;
+    
+    
+    if (nPoints >64)
+        nPoints = 64;
+    
+	float4 center = make_float4(0.f);
+	{
+		
+		for (int i=0;i<nPoints;i++)
+			center += p[i];
+		center /= (float)nPoints;
+	}
+    
+	
+    
+	//	sample 4 directions
+    
+    float4 aVector = p[0] - center;
+    float4 u = cross3( nearNormal, aVector );
+    float4 v = cross3( nearNormal, u );
+    u = normalize3( u );
+    v = normalize3( v );
+    
+    
+    //keep point with deepest penetration
+    float minW= FLT_MAX;
+    
+    int minIndex=-1;
+    
+    float4 maxDots;
+    maxDots.x = FLT_MIN;
+    maxDots.y = FLT_MIN;
+    maxDots.z = FLT_MIN;
+    maxDots.w = FLT_MIN;
+    
+    //	idx, distance
+    for(int ie = 0; ie<nPoints; ie++ )
+    {
+        if (p[ie].w<minW)
+        {
+            minW = p[ie].w;
+            minIndex=ie;
+        }
+        float f;
+        float4 r = p[ie]-center;
+        f = dot3F4( u, r );
+        if (f<maxDots.x)
+        {
+            maxDots.x = f;
+            contactIdx[0].x = ie;
+        }
+        
+        f = dot3F4( -u, r );
+        if (f<maxDots.y)
+        {
+            maxDots.y = f;
+            contactIdx[0].y = ie;
+        }
+        
+        
+        f = dot3F4( v, r );
+        if (f<maxDots.z)
+        {
+            maxDots.z = f;
+            contactIdx[0].z = ie;
+        }
+        
+        f = dot3F4( -v, r );
+        if (f<maxDots.w)
+        {
+            maxDots.w = f;
+            contactIdx[0].w = ie;
+        }
+        
+    }
+    
+    if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)
+    {
+        //replace the first contact with minimum (todo: replace contact with least penetration)
+        contactIdx[0].x = minIndex;
+    }
+    
+    return 4;
+    
+}
+
+#define MAX_PLANE_CONVEX_POINTS 64
+
+int computeContactPlaneConvex(int pairIndex,
+								int bodyIndexA, int bodyIndexB, 
+								int collidableIndexA, int collidableIndexB, 
+								__global const BodyData* rigidBodies, 
+								__global const btCollidableGpu*collidables,
+								__global const ConvexPolyhedronCL* convexShapes,
+								__global const float4* convexVertices,
+								__global const int* convexIndices,
+								__global const btGpuFace* faces,
+								__global struct b3Contact4Data* restrict globalContactsOut,
+								counter32_t nGlobalContactsOut,
+								int maxContactCapacity,
+								float4 posB,
+								Quaternion ornB
+								)
+{
+	int resultIndex=-1;
+
+		int shapeIndex = collidables[collidableIndexB].m_shapeIndex;
+	__global const ConvexPolyhedronCL* hullB = &convexShapes[shapeIndex];
+	
+	float4 posA;
+	posA = rigidBodies[bodyIndexA].m_pos;
+	Quaternion ornA;
+	ornA = rigidBodies[bodyIndexA].m_quat;
+
+	int numContactsOut = 0;
+	int numWorldVertsB1= 0;
+
+	float4 planeEq;
+	 planeEq = faces[collidables[collidableIndexA].m_shapeIndex].m_plane;
+	float4 planeNormal = make_float4(planeEq.x,planeEq.y,planeEq.z,0.f);
+	float4 planeNormalWorld;
+	planeNormalWorld = qtRotate(ornA,planeNormal);
+	float planeConstant = planeEq.w;
+	
+	float4 invPosA;Quaternion invOrnA;
+	float4 convexInPlaneTransPos1; Quaternion convexInPlaneTransOrn1;
+	{
+		
+		trInverse(posA,ornA,&invPosA,&invOrnA);
+		trMul(invPosA,invOrnA,posB,ornB,&convexInPlaneTransPos1,&convexInPlaneTransOrn1);
+	}
+	float4 invPosB;Quaternion invOrnB;
+	float4 planeInConvexPos1;	Quaternion planeInConvexOrn1;
+	{
+		
+		trInverse(posB,ornB,&invPosB,&invOrnB);
+		trMul(invPosB,invOrnB,posA,ornA,&planeInConvexPos1,&planeInConvexOrn1);	
+	}
+
+	
+	float4 planeNormalInConvex = qtRotate(planeInConvexOrn1,-planeNormal);
+	float maxDot = -1e30;
+	int hitVertex=-1;
+	float4 hitVtx;
+
+
+
+	float4 contactPoints[MAX_PLANE_CONVEX_POINTS];
+	int numPoints = 0;
+
+	int4 contactIdx;
+	contactIdx=make_int4(0,1,2,3);
+    
+	
+	for (int i=0;i<hullB->m_numVertices;i++)
+	{
+		float4 vtx = convexVertices[hullB->m_vertexOffset+i];
+		float curDot = dot(vtx,planeNormalInConvex);
+
+
+		if (curDot>maxDot)
+		{
+			hitVertex=i;
+			maxDot=curDot;
+			hitVtx = vtx;
+			//make sure the deepest points is always included
+			if (numPoints==MAX_PLANE_CONVEX_POINTS)
+				numPoints--;
+		}
+
+		if (numPoints<MAX_PLANE_CONVEX_POINTS)
+		{
+			float4 vtxWorld = transform(&vtx, &posB, &ornB);
+			float4 vtxInPlane = transform(&vtxWorld, &invPosA, &invOrnA);//oplaneTransform.inverse()*vtxWorld;
+			float dist = dot(planeNormal,vtxInPlane)-planeConstant;
+			if (dist<0.f)
+			{
+				vtxWorld.w = dist;
+				contactPoints[numPoints] = vtxWorld;
+				numPoints++;
+			}
+		}
+
+	}
+
+	int numReducedPoints  = numPoints;
+	if (numPoints>4)
+	{
+		numReducedPoints = extractManifoldSequential( contactPoints, numPoints, planeNormalInConvex, &contactIdx);
+	}
+
+	if (numReducedPoints>0)
+	{
+		int dstIdx;
+	    AppendInc( nGlobalContactsOut, dstIdx );
+
+		if (dstIdx < maxContactCapacity)
+		{
+			resultIndex = dstIdx;
+			__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+			c->m_worldNormalOnB = -planeNormalWorld;
+			//c->setFrictionCoeff(0.7);
+			//c->setRestituitionCoeff(0.f);
+			c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+			c->m_batchIdx = pairIndex;
+			c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;
+			c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;
+			c->m_childIndexA = -1;
+			c->m_childIndexB = -1;
+
+			switch (numReducedPoints)
+            {
+                case 4:
+                    c->m_worldPosB[3] = contactPoints[contactIdx.w];
+                case 3:
+                    c->m_worldPosB[2] = contactPoints[contactIdx.z];
+                case 2:
+                    c->m_worldPosB[1] = contactPoints[contactIdx.y];
+                case 1:
+                    c->m_worldPosB[0] = contactPoints[contactIdx.x];
+                default:
+                {
+                }
+            };
+			
+			GET_NPOINTS(*c) = numReducedPoints;
+		}//if (dstIdx < numPairs)
+	}	
+
+	return resultIndex;
+}
+
+
+void	computeContactPlaneSphere(int pairIndex,
+																int bodyIndexA, int bodyIndexB, 
+																int collidableIndexA, int collidableIndexB, 
+																__global const BodyData* rigidBodies, 
+																__global const btCollidableGpu* collidables,
+																__global const btGpuFace* faces,
+																__global struct b3Contact4Data* restrict globalContactsOut,
+																counter32_t nGlobalContactsOut,
+																int maxContactCapacity)
+{
+	float4 planeEq = faces[collidables[collidableIndexA].m_shapeIndex].m_plane;
+	float radius = collidables[collidableIndexB].m_radius;
+	float4 posA1 = rigidBodies[bodyIndexA].m_pos;
+	float4 ornA1 = rigidBodies[bodyIndexA].m_quat;
+	float4 posB1 = rigidBodies[bodyIndexB].m_pos;
+	float4 ornB1 = rigidBodies[bodyIndexB].m_quat;
+	
+	bool hasCollision = false;
+	float4 planeNormal1 = make_float4(planeEq.x,planeEq.y,planeEq.z,0.f);
+	float planeConstant = planeEq.w;
+	float4 convexInPlaneTransPos1; Quaternion convexInPlaneTransOrn1;
+	{
+		float4 invPosA;Quaternion invOrnA;
+		trInverse(posA1,ornA1,&invPosA,&invOrnA);
+		trMul(invPosA,invOrnA,posB1,ornB1,&convexInPlaneTransPos1,&convexInPlaneTransOrn1);
+	}
+	float4 planeInConvexPos1;	Quaternion planeInConvexOrn1;
+	{
+		float4 invPosB;Quaternion invOrnB;
+		trInverse(posB1,ornB1,&invPosB,&invOrnB);
+		trMul(invPosB,invOrnB,posA1,ornA1,&planeInConvexPos1,&planeInConvexOrn1);	
+	}
+	float4 vtx1 = qtRotate(planeInConvexOrn1,-planeNormal1)*radius;
+	float4 vtxInPlane1 = transform(&vtx1,&convexInPlaneTransPos1,&convexInPlaneTransOrn1);
+	float distance = dot3F4(planeNormal1,vtxInPlane1) - planeConstant;
+	hasCollision = distance < 0.f;//m_manifoldPtr->getContactBreakingThreshold();
+	if (hasCollision)
+	{
+		float4 vtxInPlaneProjected1 = vtxInPlane1 -   distance*planeNormal1;
+		float4 vtxInPlaneWorld1 = transform(&vtxInPlaneProjected1,&posA1,&ornA1);
+		float4 normalOnSurfaceB1 = qtRotate(ornA1,planeNormal1);
+		float4 pOnB1 = vtxInPlaneWorld1+normalOnSurfaceB1*distance;
+		pOnB1.w = distance;
+
+		int dstIdx;
+    AppendInc( nGlobalContactsOut, dstIdx );
+		
+		if (dstIdx < maxContactCapacity)
+		{
+			__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+			c->m_worldNormalOnB = -normalOnSurfaceB1;
+			c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+			c->m_batchIdx = pairIndex;
+			c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;
+			c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;
+			c->m_worldPosB[0] = pOnB1;
+			c->m_childIndexA = -1;
+			c->m_childIndexB = -1;
+			GET_NPOINTS(*c) = 1;
+		}//if (dstIdx < numPairs)
+	}//if (hasCollision)
+}
+
+
+__kernel void   primitiveContactsKernel( __global int4* pairs, 
+																					__global const BodyData* rigidBodies, 
+																					__global const btCollidableGpu* collidables,
+																					__global const ConvexPolyhedronCL* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const btGpuFace* faces,
+																					__global const int* indices,
+																					__global struct b3Contact4Data* restrict globalContactsOut,
+																					counter32_t nGlobalContactsOut,
+																					int numPairs, int maxContactCapacity)
+{
+
+	int i = get_global_id(0);
+	int pairIndex = i;
+	
+	float4 worldVertsB1[64];
+	float4 worldVertsB2[64];
+	int capacityWorldVerts = 64;	
+
+	float4 localContactsOut[64];
+	int localContactCapacity=64;
+	
+	float minDist = -1e30f;
+	float maxDist = 0.02f;
+
+	if (i<numPairs)
+	{
+
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+			
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+	
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_PLANE &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+
+			float4 posB;
+			posB = rigidBodies[bodyIndexB].m_pos;
+			Quaternion ornB;
+			ornB = rigidBodies[bodyIndexB].m_quat;
+			int contactIndex = computeContactPlaneConvex(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, 
+																rigidBodies,collidables,convexShapes,vertices,indices,
+																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity, posB,ornB);
+			if (contactIndex>=0)
+				pairs[pairIndex].z = contactIndex;
+
+			return;
+		}
+
+
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_PLANE)
+		{
+
+			float4 posA;
+			posA = rigidBodies[bodyIndexA].m_pos;
+			Quaternion ornA;
+			ornA = rigidBodies[bodyIndexA].m_quat;
+
+
+			int contactIndex = computeContactPlaneConvex( pairIndex, bodyIndexB,bodyIndexA,  collidableIndexB,collidableIndexA, 
+																rigidBodies,collidables,convexShapes,vertices,indices,
+																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity,posA,ornA);
+
+			if (contactIndex>=0)
+				pairs[pairIndex].z = contactIndex;
+
+			return;
+		}
+
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_PLANE &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)
+		{
+			computeContactPlaneSphere(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, 
+																rigidBodies,collidables,faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity);
+			return;
+		}
+
+
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_PLANE)
+		{
+
+
+			computeContactPlaneSphere( pairIndex, bodyIndexB,bodyIndexA,  collidableIndexB,collidableIndexA, 
+																rigidBodies,collidables,
+																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity);
+
+			return;
+		}
+
+		
+
+	
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)
+		{
+		
+			float4 spherePos = rigidBodies[bodyIndexA].m_pos;
+			float sphereRadius = collidables[collidableIndexA].m_radius;
+			float4 convexPos = rigidBodies[bodyIndexB].m_pos;
+			float4 convexOrn = rigidBodies[bodyIndexB].m_quat;
+
+			computeContactSphereConvex(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, 
+																rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,
+																spherePos,sphereRadius,convexPos,convexOrn);
+
+			return;
+		}
+
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)
+		{
+		
+			float4 spherePos = rigidBodies[bodyIndexB].m_pos;
+			float sphereRadius = collidables[collidableIndexB].m_radius;
+			float4 convexPos = rigidBodies[bodyIndexA].m_pos;
+			float4 convexOrn = rigidBodies[bodyIndexA].m_quat;
+
+			computeContactSphereConvex(pairIndex, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, 
+																rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,
+																spherePos,sphereRadius,convexPos,convexOrn);
+			return;
+		}
+	
+	
+	
+		
+	
+	
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)
+		{
+			//sphere-sphere
+			float radiusA = collidables[collidableIndexA].m_radius;
+			float radiusB = collidables[collidableIndexB].m_radius;
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+
+			float4 diff = posA-posB;
+			float len = length(diff);
+			
+			///iff distance positive, don't generate a new contact
+			if ( len <= (radiusA+radiusB))
+			{
+				///distance (negative means penetration)
+				float dist = len - (radiusA+radiusB);
+				float4 normalOnSurfaceB = make_float4(1.f,0.f,0.f,0.f);
+				if (len > 0.00001)
+				{
+					normalOnSurfaceB = diff / len;
+				}
+				float4 contactPosB = posB + normalOnSurfaceB*radiusB;
+				contactPosB.w = dist;
+								
+				int dstIdx;
+				 AppendInc( nGlobalContactsOut, dstIdx );
+				
+				if (dstIdx < maxContactCapacity)
+				{
+					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+					c->m_worldNormalOnB = normalOnSurfaceB;
+					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+					c->m_batchIdx = pairIndex;
+					int bodyA = pairs[pairIndex].x;
+					int bodyB = pairs[pairIndex].y;
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;
+					c->m_worldPosB[0] = contactPosB;
+					c->m_childIndexA = -1;
+					c->m_childIndexB = -1;
+					GET_NPOINTS(*c) = 1;
+				}//if (dstIdx < numPairs)
+			}//if ( len <= (radiusA+radiusB))
+
+			return;
+		}//SHAPE_SPHERE SHAPE_SPHERE
+
+	}//	if (i<numPairs)
+
+}
+
+
+// work-in-progress
+__kernel void   processCompoundPairsPrimitivesKernel( __global const int4* gpuCompoundPairs,
+													__global const BodyData* rigidBodies, 
+													__global const btCollidableGpu* collidables,
+													__global const ConvexPolyhedronCL* convexShapes, 
+													__global const float4* vertices,
+													__global const float4* uniqueEdges,
+													__global const btGpuFace* faces,
+													__global const int* indices,
+													__global btAabbCL* aabbs,
+													__global const btGpuChildShape* gpuChildShapes,
+													__global struct b3Contact4Data* restrict globalContactsOut,
+													counter32_t nGlobalContactsOut,
+													int numCompoundPairs, int maxContactCapacity
+													)
+{
+
+	int i = get_global_id(0);
+	if (i<numCompoundPairs)
+	{
+		int bodyIndexA = gpuCompoundPairs[i].x;
+		int bodyIndexB = gpuCompoundPairs[i].y;
+
+		int childShapeIndexA = gpuCompoundPairs[i].z;
+		int childShapeIndexB = gpuCompoundPairs[i].w;
+		
+		int collidableIndexA = -1;
+		int collidableIndexB = -1;
+		
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		
+		float4 ornB = rigidBodies[bodyIndexB].m_quat;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+							
+		if (childShapeIndexA >= 0)
+		{
+			collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+			float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+			float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+			float4 newPosA = qtRotate(ornA,childPosA)+posA;
+			float4 newOrnA = qtMul(ornA,childOrnA);
+			posA = newPosA;
+			ornA = newOrnA;
+		} else
+		{
+			collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		}
+		
+		if (childShapeIndexB>=0)
+		{
+			collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			float4 newPosB = transform(&childPosB,&posB,&ornB);
+			float4 newOrnB = qtMul(ornB,childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+		} else
+		{
+			collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;	
+		}
+	
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+	
+		int shapeTypeA = collidables[collidableIndexA].m_shapeType;
+		int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+
+		int pairIndex = i;
+		if ((shapeTypeA == SHAPE_PLANE) && (shapeTypeB==SHAPE_CONVEX_HULL))
+		{
+
+			computeContactPlaneConvex( pairIndex, bodyIndexA,bodyIndexB,  collidableIndexA,collidableIndexB, 
+																rigidBodies,collidables,convexShapes,vertices,indices,
+																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity,posB,ornB);
+			return;
+		}
+
+		if ((shapeTypeA == SHAPE_CONVEX_HULL) && (shapeTypeB==SHAPE_PLANE))
+		{
+
+			computeContactPlaneConvex( pairIndex, bodyIndexB,bodyIndexA,  collidableIndexB,collidableIndexA, 
+																rigidBodies,collidables,convexShapes,vertices,indices,
+																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity,posA,ornA);
+			return;
+		}
+
+		if ((shapeTypeA == SHAPE_CONVEX_HULL) && (shapeTypeB == SHAPE_SPHERE))
+		{
+			float4 spherePos = rigidBodies[bodyIndexB].m_pos;
+			float sphereRadius = collidables[collidableIndexB].m_radius;
+			float4 convexPos = posA;
+			float4 convexOrn = ornA;
+			
+			computeContactSphereConvex(pairIndex, bodyIndexB, bodyIndexA , collidableIndexB,collidableIndexA, 
+										rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,
+										spherePos,sphereRadius,convexPos,convexOrn);
+	
+			return;
+		}
+
+		if ((shapeTypeA == SHAPE_SPHERE) && (shapeTypeB == SHAPE_CONVEX_HULL))
+		{
+
+			float4 spherePos = rigidBodies[bodyIndexA].m_pos;
+			float sphereRadius = collidables[collidableIndexA].m_radius;
+			float4 convexPos = posB;
+			float4 convexOrn = ornB;
+
+			
+			computeContactSphereConvex(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, 
+										rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,
+										spherePos,sphereRadius,convexPos,convexOrn);
+	
+			return;
+		}
+	}//	if (i<numCompoundPairs)
+}
+
+
+bool pointInTriangle(const float4* vertices, const float4* normal, float4 *p )
+{
+
+	const float4* p1 = &vertices[0];
+	const float4* p2 = &vertices[1];
+	const float4* p3 = &vertices[2];
+
+	float4 edge1;	edge1 = (*p2 - *p1);
+	float4 edge2;	edge2 = ( *p3 - *p2 );
+	float4 edge3;	edge3 = ( *p1 - *p3 );
+
+	
+	float4 p1_to_p; p1_to_p = ( *p - *p1 );
+	float4 p2_to_p; p2_to_p = ( *p - *p2 );
+	float4 p3_to_p; p3_to_p = ( *p - *p3 );
+
+	float4 edge1_normal; edge1_normal = ( cross(edge1,*normal));
+	float4 edge2_normal; edge2_normal = ( cross(edge2,*normal));
+	float4 edge3_normal; edge3_normal = ( cross(edge3,*normal));
+
+	
+	
+	float r1, r2, r3;
+	r1 = dot(edge1_normal,p1_to_p );
+	r2 = dot(edge2_normal,p2_to_p );
+	r3 = dot(edge3_normal,p3_to_p );
+	
+	if ( r1 > 0 && r2 > 0 && r3 > 0 )
+		return true;
+    if ( r1 <= 0 && r2 <= 0 && r3 <= 0 ) 
+		return true;
+	return false;
+
+}
+
+
+float segmentSqrDistance(float4 from, float4 to,float4 p, float4* nearest) 
+{
+	float4 diff = p - from;
+	float4 v = to - from;
+	float t = dot(v,diff);
+	
+	if (t > 0) 
+	{
+		float dotVV = dot(v,v);
+		if (t < dotVV) 
+		{
+			t /= dotVV;
+			diff -= t*v;
+		} else 
+		{
+			t = 1;
+			diff -= v;
+		}
+	} else
+	{
+		t = 0;
+	}
+	*nearest = from + t*v;
+	return dot(diff,diff);	
+}
+
+
+void	computeContactSphereTriangle(int pairIndex,
+									int bodyIndexA, int bodyIndexB,
+									int collidableIndexA, int collidableIndexB, 
+									__global const BodyData* rigidBodies, 
+									__global const btCollidableGpu* collidables,
+									const float4* triangleVertices,
+									__global struct b3Contact4Data* restrict globalContactsOut,
+									counter32_t nGlobalContactsOut,
+									int maxContactCapacity,
+									float4 spherePos2,
+									float radius,
+									float4 pos,
+									float4 quat,
+									int faceIndex
+									)
+{
+
+	float4 invPos;
+	float4 invOrn;
+
+	trInverse(pos,quat, &invPos,&invOrn);
+	float4 spherePos = transform(&spherePos2,&invPos,&invOrn);
+	int numFaces = 3;
+	float4 closestPnt = (float4)(0, 0, 0, 0);
+	float4 hitNormalWorld = (float4)(0, 0, 0, 0);
+	float minDist = -1000000.f;
+	bool bCollide = false;
+
+	
+	//////////////////////////////////////
+
+	float4 sphereCenter;
+	sphereCenter = spherePos;
+
+	const float4* vertices = triangleVertices;
+	float contactBreakingThreshold = 0.f;//todo?
+	float radiusWithThreshold = radius + contactBreakingThreshold;
+	float4 edge10;
+	edge10 = vertices[1]-vertices[0];
+	edge10.w = 0.f;//is this needed?
+	float4 edge20;
+	edge20 = vertices[2]-vertices[0];
+	edge20.w = 0.f;//is this needed?
+	float4 normal = cross3(edge10,edge20);
+	normal = normalize(normal);
+	float4 p1ToCenter;
+	p1ToCenter = sphereCenter - vertices[0];
+	
+	float distanceFromPlane = dot(p1ToCenter,normal);
+
+	if (distanceFromPlane < 0.f)
+	{
+		//triangle facing the other way
+		distanceFromPlane *= -1.f;
+		normal *= -1.f;
+	}
+	hitNormalWorld = normal;
+
+	bool isInsideContactPlane = distanceFromPlane < radiusWithThreshold;
+	
+	// Check for contact / intersection
+	bool hasContact = false;
+	float4 contactPoint;
+	if (isInsideContactPlane) 
+	{
+	
+		if (pointInTriangle(vertices,&normal, &sphereCenter)) 
+		{
+			// Inside the contact wedge - touches a point on the shell plane
+			hasContact = true;
+			contactPoint = sphereCenter - normal*distanceFromPlane;
+			
+		} else {
+			// Could be inside one of the contact capsules
+			float contactCapsuleRadiusSqr = radiusWithThreshold*radiusWithThreshold;
+			float4 nearestOnEdge;
+			int numEdges = 3;
+			for (int i = 0; i < numEdges; i++) 
+			{
+				float4 pa =vertices[i];
+				float4 pb = vertices[(i+1)%3];
+
+				float distanceSqr = segmentSqrDistance(pa,pb,sphereCenter, &nearestOnEdge);
+				if (distanceSqr < contactCapsuleRadiusSqr) 
+				{
+					// Yep, we're inside a capsule
+					hasContact = true;
+					contactPoint = nearestOnEdge;
+					
+				}
+				
+			}
+		}
+	}
+
+	if (hasContact) 
+	{
+
+		closestPnt = contactPoint;
+		float4 contactToCenter = sphereCenter - contactPoint;
+		minDist = length(contactToCenter);
+		if (minDist>FLT_EPSILON)
+		{
+			hitNormalWorld = normalize(contactToCenter);//*(1./minDist);
+			bCollide  = true;
+		}
+		
+	}
+
+
+	/////////////////////////////////////
+
+	if (bCollide && minDist > -10000)
+	{
+		
+		float4 normalOnSurfaceB1 = qtRotate(quat,-hitNormalWorld);
+		float4 pOnB1 = transform(&closestPnt,&pos,&quat);
+		float actualDepth = minDist-radius;
+
+		
+		if (actualDepth<=0.f)
+		{
+			pOnB1.w = actualDepth;
+			int dstIdx;
+
+			
+			float lenSqr = dot3F4(normalOnSurfaceB1,normalOnSurfaceB1);
+			if (lenSqr>FLT_EPSILON)
+			{
+				AppendInc( nGlobalContactsOut, dstIdx );
+			
+				if (dstIdx < maxContactCapacity)
+				{
+					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+					c->m_worldNormalOnB = -normalOnSurfaceB1;
+					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+					c->m_batchIdx = pairIndex;
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;
+					c->m_worldPosB[0] = pOnB1;
+
+					c->m_childIndexA = -1;
+					c->m_childIndexB = faceIndex;
+
+					GET_NPOINTS(*c) = 1;
+				} 
+			}
+
+		}
+	}//if (hasCollision)
+
+}
+
+
+
+// work-in-progress
+__kernel void   findConcaveSphereContactsKernel( __global int4* concavePairs,
+												__global const BodyData* rigidBodies,
+												__global const btCollidableGpu* collidables,
+												__global const ConvexPolyhedronCL* convexShapes, 
+												__global const float4* vertices,
+												__global const float4* uniqueEdges,
+												__global const btGpuFace* faces,
+												__global const int* indices,
+												__global btAabbCL* aabbs,
+												__global struct b3Contact4Data* restrict globalContactsOut,
+												counter32_t nGlobalContactsOut,
+													int numConcavePairs, int maxContactCapacity
+												)
+{
+
+	int i = get_global_id(0);
+	if (i>=numConcavePairs)
+		return;
+	int pairIdx = i;
+
+	int bodyIndexA = concavePairs[i].x;
+	int bodyIndexB = concavePairs[i].y;
+
+	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+
+	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+
+	if (collidables[collidableIndexB].m_shapeType==SHAPE_SPHERE)
+	{
+		int f = concavePairs[i].z;
+		btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];
+		
+		float4 verticesA[3];
+		for (int i=0;i<3;i++)
+		{
+			int index = indices[face.m_indexOffset+i];
+			float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];
+			verticesA[i] = vert;
+		}
+
+		float4 spherePos = rigidBodies[bodyIndexB].m_pos;
+		float sphereRadius = collidables[collidableIndexB].m_radius;
+		float4 convexPos = rigidBodies[bodyIndexA].m_pos;
+		float4 convexOrn = rigidBodies[bodyIndexA].m_quat;
+
+		computeContactSphereTriangle(i, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, 
+																rigidBodies,collidables,
+																verticesA,
+																globalContactsOut, nGlobalContactsOut,maxContactCapacity,
+																spherePos,sphereRadius,convexPos,convexOrn, f);
+
+		return;
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h
new file mode 100644
index 0000000..b2e0a2d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h
@@ -0,0 +1,1288 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* primitiveContactsKernelsCL =
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#define SHAPE_CONVEX_HULL 3\n"
+	"#define SHAPE_PLANE 4\n"
+	"#define SHAPE_CONCAVE_TRIMESH 5\n"
+	"#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6\n"
+	"#define SHAPE_SPHERE 7\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile __global int*\n"
+	"#endif\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"typedef unsigned int u32;\n"
+	"typedef struct \n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_min;\n"
+	"		float   m_minElems[4];\n"
+	"		int			m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_max;\n"
+	"		float   m_maxElems[4];\n"
+	"		int			m_maxIndices[4];\n"
+	"	};\n"
+	"} btAabbCL;\n"
+	"///keep this in sync with btCollidable.h\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_numChildShapes;\n"
+	"	float m_radius;\n"
+	"	int m_shapeType;\n"
+	"	int m_shapeIndex;\n"
+	"	\n"
+	"} btCollidableGpu;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4	m_childPosition;\n"
+	"	float4	m_childOrientation;\n"
+	"	int m_shapeIndex;\n"
+	"	int m_unused0;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"} btGpuChildShape;\n"
+	"#define GET_NPOINTS(x) (x).m_worldNormalOnB.w\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	float4 m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_collidableIdx;	\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} BodyData;\n"
+	"typedef struct  \n"
+	"{\n"
+	"	float4		m_localCenter;\n"
+	"	float4		m_extents;\n"
+	"	float4		mC;\n"
+	"	float4		mE;\n"
+	"	\n"
+	"	float			m_radius;\n"
+	"	int	m_faceOffset;\n"
+	"	int m_numFaces;\n"
+	"	int	m_numVertices;\n"
+	"	\n"
+	"	int m_vertexOffset;\n"
+	"	int	m_uniqueEdgesOffset;\n"
+	"	int	m_numUniqueEdges;\n"
+	"	int m_unused;\n"
+	"} ConvexPolyhedronCL;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_plane;\n"
+	"	int m_indexOffset;\n"
+	"	int m_numIndices;\n"
+	"} btGpuFace;\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_float4 (float4)\n"
+	"#define make_float2 (float2)\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_int4 (int4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"__inline\n"
+	"float fastDiv(float numerator, float denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"//	return numerator/denominator;	\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastDiv4(float4 numerator, float4 denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"//#define dot3F4 dot\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec);\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fastNormalize4(in);\n"
+	"//	in /= length( in );\n"
+	"//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"__inline\n"
+	"float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)\n"
+	"{\n"
+	"	return qtRotate( *orientation, *p ) + (*translation);\n"
+	"}\n"
+	"void	trInverse(float4 translationIn, Quaternion orientationIn,\n"
+	"		float4* translationOut, Quaternion* orientationOut)\n"
+	"{\n"
+	"	*orientationOut = qtInvert(orientationIn);\n"
+	"	*translationOut = qtRotate(*orientationOut, -translationIn);\n"
+	"}\n"
+	"void	trMul(float4 translationA, Quaternion orientationA,\n"
+	"						float4 translationB, Quaternion orientationB,\n"
+	"		float4* translationOut, Quaternion* orientationOut)\n"
+	"{\n"
+	"	*orientationOut = qtMul(orientationA,orientationB);\n"
+	"	*translationOut = transform(&translationB,&translationA,&orientationA);\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = make_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"}\n"
+	"__inline float4 lerp3(const float4 a,const float4 b, float  t)\n"
+	"{\n"
+	"	return make_float4(	a.x + (b.x - a.x) * t,\n"
+	"						a.y + (b.y - a.y) * t,\n"
+	"						a.z + (b.z - a.z) * t,\n"
+	"						0.f);\n"
+	"}\n"
+	"float signedDistanceFromPointToPlane(float4 point, float4 planeEqn, float4* closestPointOnFace)\n"
+	"{\n"
+	"	float4 n = (float4)(planeEqn.x, planeEqn.y, planeEqn.z, 0);\n"
+	"	float dist = dot3F4(n, point) + planeEqn.w;\n"
+	"	*closestPointOnFace = point - dist * n;\n"
+	"	return dist;\n"
+	"}\n"
+	"inline bool IsPointInPolygon(float4 p, \n"
+	"							const btGpuFace* face,\n"
+	"							__global const float4* baseVertex,\n"
+	"							__global const  int* convexIndices,\n"
+	"							float4* out)\n"
+	"{\n"
+	"    float4 a;\n"
+	"    float4 b;\n"
+	"    float4 ab;\n"
+	"    float4 ap;\n"
+	"    float4 v;\n"
+	"	float4 plane = make_float4(face->m_plane.x,face->m_plane.y,face->m_plane.z,0.f);\n"
+	"	\n"
+	"	if (face->m_numIndices<2)\n"
+	"		return false;\n"
+	"	\n"
+	"	float4 v0 = baseVertex[convexIndices[face->m_indexOffset + face->m_numIndices-1]];\n"
+	"	\n"
+	"	b = v0;\n"
+	"    for(unsigned i=0; i != face->m_numIndices; ++i)\n"
+	"    {\n"
+	"		a = b;\n"
+	"		float4 vi = baseVertex[convexIndices[face->m_indexOffset + i]];\n"
+	"		b = vi;\n"
+	"        ab = b-a;\n"
+	"        ap = p-a;\n"
+	"        v = cross3(ab,plane);\n"
+	"        if (dot(ap, v) > 0.f)\n"
+	"        {\n"
+	"            float ab_m2 = dot(ab, ab);\n"
+	"            float rt = ab_m2 != 0.f ? dot(ab, ap) / ab_m2 : 0.f;\n"
+	"            if (rt <= 0.f)\n"
+	"            {\n"
+	"                *out = a;\n"
+	"            }\n"
+	"            else if (rt >= 1.f) \n"
+	"            {\n"
+	"                *out = b;\n"
+	"            }\n"
+	"            else\n"
+	"            {\n"
+	"            	float s = 1.f - rt;\n"
+	"				out[0].x = s * a.x + rt * b.x;\n"
+	"				out[0].y = s * a.y + rt * b.y;\n"
+	"				out[0].z = s * a.z + rt * b.z;\n"
+	"            }\n"
+	"            return false;\n"
+	"        }\n"
+	"    }\n"
+	"    return true;\n"
+	"}\n"
+	"void	computeContactSphereConvex(int pairIndex,\n"
+	"																int bodyIndexA, int bodyIndexB, \n"
+	"																int collidableIndexA, int collidableIndexB, \n"
+	"																__global const BodyData* rigidBodies, \n"
+	"																__global const btCollidableGpu* collidables,\n"
+	"																__global const ConvexPolyhedronCL* convexShapes,\n"
+	"																__global const float4* convexVertices,\n"
+	"																__global const int* convexIndices,\n"
+	"																__global const btGpuFace* faces,\n"
+	"																__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																counter32_t nGlobalContactsOut,\n"
+	"																int maxContactCapacity,\n"
+	"																float4 spherePos2,\n"
+	"																float radius,\n"
+	"																float4 pos,\n"
+	"																float4 quat\n"
+	"																)\n"
+	"{\n"
+	"	float4 invPos;\n"
+	"	float4 invOrn;\n"
+	"	trInverse(pos,quat, &invPos,&invOrn);\n"
+	"	float4 spherePos = transform(&spherePos2,&invPos,&invOrn);\n"
+	"	int shapeIndex = collidables[collidableIndexB].m_shapeIndex;\n"
+	"	int numFaces = convexShapes[shapeIndex].m_numFaces;\n"
+	"	float4 closestPnt = (float4)(0, 0, 0, 0);\n"
+	"	float4 hitNormalWorld = (float4)(0, 0, 0, 0);\n"
+	"	float minDist = -1000000.f;\n"
+	"	bool bCollide = true;\n"
+	"	for ( int f = 0; f < numFaces; f++ )\n"
+	"	{\n"
+	"		btGpuFace face = faces[convexShapes[shapeIndex].m_faceOffset+f];\n"
+	"		// set up a plane equation \n"
+	"		float4 planeEqn;\n"
+	"		float4 n1 = face.m_plane;\n"
+	"		n1.w = 0.f;\n"
+	"		planeEqn = n1;\n"
+	"		planeEqn.w = face.m_plane.w;\n"
+	"		\n"
+	"	\n"
+	"		// compute a signed distance from the vertex in cloth to the face of rigidbody.\n"
+	"		float4 pntReturn;\n"
+	"		float dist = signedDistanceFromPointToPlane(spherePos, planeEqn, &pntReturn);\n"
+	"		// If the distance is positive, the plane is a separating plane. \n"
+	"		if ( dist > radius )\n"
+	"		{\n"
+	"			bCollide = false;\n"
+	"			break;\n"
+	"		}\n"
+	"		if (dist>0)\n"
+	"		{\n"
+	"			//might hit an edge or vertex\n"
+	"			float4 out;\n"
+	"			float4 zeroPos = make_float4(0,0,0,0);\n"
+	"			bool isInPoly = IsPointInPolygon(spherePos,\n"
+	"					&face,\n"
+	"					&convexVertices[convexShapes[shapeIndex].m_vertexOffset],\n"
+	"					convexIndices,\n"
+	"           &out);\n"
+	"			if (isInPoly)\n"
+	"			{\n"
+	"				if (dist>minDist)\n"
+	"				{\n"
+	"					minDist = dist;\n"
+	"					closestPnt = pntReturn;\n"
+	"					hitNormalWorld = planeEqn;\n"
+	"					\n"
+	"				}\n"
+	"			} else\n"
+	"			{\n"
+	"				float4 tmp = spherePos-out;\n"
+	"				float l2 = dot(tmp,tmp);\n"
+	"				if (l2<radius*radius)\n"
+	"				{\n"
+	"					dist  = sqrt(l2);\n"
+	"					if (dist>minDist)\n"
+	"					{\n"
+	"						minDist = dist;\n"
+	"						closestPnt = out;\n"
+	"						hitNormalWorld = tmp/dist;\n"
+	"						\n"
+	"					}\n"
+	"					\n"
+	"				} else\n"
+	"				{\n"
+	"					bCollide = false;\n"
+	"					break;\n"
+	"				}\n"
+	"			}\n"
+	"		} else\n"
+	"		{\n"
+	"			if ( dist > minDist )\n"
+	"			{\n"
+	"				minDist = dist;\n"
+	"				closestPnt = pntReturn;\n"
+	"				hitNormalWorld.xyz = planeEqn.xyz;\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"	}\n"
+	"	\n"
+	"	if (bCollide && minDist > -10000)\n"
+	"	{\n"
+	"		float4 normalOnSurfaceB1 = qtRotate(quat,-hitNormalWorld);\n"
+	"		float4 pOnB1 = transform(&closestPnt,&pos,&quat);\n"
+	"		\n"
+	"		float actualDepth = minDist-radius;\n"
+	"		if (actualDepth<=0.f)\n"
+	"		{\n"
+	"			\n"
+	"			pOnB1.w = actualDepth;\n"
+	"			int dstIdx;\n"
+	"			AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"		\n"
+	"			\n"
+	"			if (1)//dstIdx < maxContactCapacity)\n"
+	"			{\n"
+	"				__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];\n"
+	"				c->m_worldNormalOnB = -normalOnSurfaceB1;\n"
+	"				c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"				c->m_batchIdx = pairIndex;\n"
+	"				c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;\n"
+	"				c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;\n"
+	"				c->m_worldPosB[0] = pOnB1;\n"
+	"				c->m_childIndexA = -1;\n"
+	"				c->m_childIndexB = -1;\n"
+	"				GET_NPOINTS(*c) = 1;\n"
+	"			} \n"
+	"		}\n"
+	"	}//if (hasCollision)\n"
+	"}\n"
+	"							\n"
+	"int extractManifoldSequential(const float4* p, int nPoints, float4 nearNormal, int4* contactIdx)\n"
+	"{\n"
+	"	if( nPoints == 0 )\n"
+	"        return 0;\n"
+	"    \n"
+	"    if (nPoints <=4)\n"
+	"        return nPoints;\n"
+	"    \n"
+	"    \n"
+	"    if (nPoints >64)\n"
+	"        nPoints = 64;\n"
+	"    \n"
+	"	float4 center = make_float4(0.f);\n"
+	"	{\n"
+	"		\n"
+	"		for (int i=0;i<nPoints;i++)\n"
+	"			center += p[i];\n"
+	"		center /= (float)nPoints;\n"
+	"	}\n"
+	"    \n"
+	"	\n"
+	"    \n"
+	"	//	sample 4 directions\n"
+	"    \n"
+	"    float4 aVector = p[0] - center;\n"
+	"    float4 u = cross3( nearNormal, aVector );\n"
+	"    float4 v = cross3( nearNormal, u );\n"
+	"    u = normalize3( u );\n"
+	"    v = normalize3( v );\n"
+	"    \n"
+	"    \n"
+	"    //keep point with deepest penetration\n"
+	"    float minW= FLT_MAX;\n"
+	"    \n"
+	"    int minIndex=-1;\n"
+	"    \n"
+	"    float4 maxDots;\n"
+	"    maxDots.x = FLT_MIN;\n"
+	"    maxDots.y = FLT_MIN;\n"
+	"    maxDots.z = FLT_MIN;\n"
+	"    maxDots.w = FLT_MIN;\n"
+	"    \n"
+	"    //	idx, distance\n"
+	"    for(int ie = 0; ie<nPoints; ie++ )\n"
+	"    {\n"
+	"        if (p[ie].w<minW)\n"
+	"        {\n"
+	"            minW = p[ie].w;\n"
+	"            minIndex=ie;\n"
+	"        }\n"
+	"        float f;\n"
+	"        float4 r = p[ie]-center;\n"
+	"        f = dot3F4( u, r );\n"
+	"        if (f<maxDots.x)\n"
+	"        {\n"
+	"            maxDots.x = f;\n"
+	"            contactIdx[0].x = ie;\n"
+	"        }\n"
+	"        \n"
+	"        f = dot3F4( -u, r );\n"
+	"        if (f<maxDots.y)\n"
+	"        {\n"
+	"            maxDots.y = f;\n"
+	"            contactIdx[0].y = ie;\n"
+	"        }\n"
+	"        \n"
+	"        \n"
+	"        f = dot3F4( v, r );\n"
+	"        if (f<maxDots.z)\n"
+	"        {\n"
+	"            maxDots.z = f;\n"
+	"            contactIdx[0].z = ie;\n"
+	"        }\n"
+	"        \n"
+	"        f = dot3F4( -v, r );\n"
+	"        if (f<maxDots.w)\n"
+	"        {\n"
+	"            maxDots.w = f;\n"
+	"            contactIdx[0].w = ie;\n"
+	"        }\n"
+	"        \n"
+	"    }\n"
+	"    \n"
+	"    if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)\n"
+	"    {\n"
+	"        //replace the first contact with minimum (todo: replace contact with least penetration)\n"
+	"        contactIdx[0].x = minIndex;\n"
+	"    }\n"
+	"    \n"
+	"    return 4;\n"
+	"    \n"
+	"}\n"
+	"#define MAX_PLANE_CONVEX_POINTS 64\n"
+	"int computeContactPlaneConvex(int pairIndex,\n"
+	"								int bodyIndexA, int bodyIndexB, \n"
+	"								int collidableIndexA, int collidableIndexB, \n"
+	"								__global const BodyData* rigidBodies, \n"
+	"								__global const btCollidableGpu*collidables,\n"
+	"								__global const ConvexPolyhedronCL* convexShapes,\n"
+	"								__global const float4* convexVertices,\n"
+	"								__global const int* convexIndices,\n"
+	"								__global const btGpuFace* faces,\n"
+	"								__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"								counter32_t nGlobalContactsOut,\n"
+	"								int maxContactCapacity,\n"
+	"								float4 posB,\n"
+	"								Quaternion ornB\n"
+	"								)\n"
+	"{\n"
+	"	int resultIndex=-1;\n"
+	"		int shapeIndex = collidables[collidableIndexB].m_shapeIndex;\n"
+	"	__global const ConvexPolyhedronCL* hullB = &convexShapes[shapeIndex];\n"
+	"	\n"
+	"	float4 posA;\n"
+	"	posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"	Quaternion ornA;\n"
+	"	ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"	int numContactsOut = 0;\n"
+	"	int numWorldVertsB1= 0;\n"
+	"	float4 planeEq;\n"
+	"	 planeEq = faces[collidables[collidableIndexA].m_shapeIndex].m_plane;\n"
+	"	float4 planeNormal = make_float4(planeEq.x,planeEq.y,planeEq.z,0.f);\n"
+	"	float4 planeNormalWorld;\n"
+	"	planeNormalWorld = qtRotate(ornA,planeNormal);\n"
+	"	float planeConstant = planeEq.w;\n"
+	"	\n"
+	"	float4 invPosA;Quaternion invOrnA;\n"
+	"	float4 convexInPlaneTransPos1; Quaternion convexInPlaneTransOrn1;\n"
+	"	{\n"
+	"		\n"
+	"		trInverse(posA,ornA,&invPosA,&invOrnA);\n"
+	"		trMul(invPosA,invOrnA,posB,ornB,&convexInPlaneTransPos1,&convexInPlaneTransOrn1);\n"
+	"	}\n"
+	"	float4 invPosB;Quaternion invOrnB;\n"
+	"	float4 planeInConvexPos1;	Quaternion planeInConvexOrn1;\n"
+	"	{\n"
+	"		\n"
+	"		trInverse(posB,ornB,&invPosB,&invOrnB);\n"
+	"		trMul(invPosB,invOrnB,posA,ornA,&planeInConvexPos1,&planeInConvexOrn1);	\n"
+	"	}\n"
+	"	\n"
+	"	float4 planeNormalInConvex = qtRotate(planeInConvexOrn1,-planeNormal);\n"
+	"	float maxDot = -1e30;\n"
+	"	int hitVertex=-1;\n"
+	"	float4 hitVtx;\n"
+	"	float4 contactPoints[MAX_PLANE_CONVEX_POINTS];\n"
+	"	int numPoints = 0;\n"
+	"	int4 contactIdx;\n"
+	"	contactIdx=make_int4(0,1,2,3);\n"
+	"    \n"
+	"	\n"
+	"	for (int i=0;i<hullB->m_numVertices;i++)\n"
+	"	{\n"
+	"		float4 vtx = convexVertices[hullB->m_vertexOffset+i];\n"
+	"		float curDot = dot(vtx,planeNormalInConvex);\n"
+	"		if (curDot>maxDot)\n"
+	"		{\n"
+	"			hitVertex=i;\n"
+	"			maxDot=curDot;\n"
+	"			hitVtx = vtx;\n"
+	"			//make sure the deepest points is always included\n"
+	"			if (numPoints==MAX_PLANE_CONVEX_POINTS)\n"
+	"				numPoints--;\n"
+	"		}\n"
+	"		if (numPoints<MAX_PLANE_CONVEX_POINTS)\n"
+	"		{\n"
+	"			float4 vtxWorld = transform(&vtx, &posB, &ornB);\n"
+	"			float4 vtxInPlane = transform(&vtxWorld, &invPosA, &invOrnA);//oplaneTransform.inverse()*vtxWorld;\n"
+	"			float dist = dot(planeNormal,vtxInPlane)-planeConstant;\n"
+	"			if (dist<0.f)\n"
+	"			{\n"
+	"				vtxWorld.w = dist;\n"
+	"				contactPoints[numPoints] = vtxWorld;\n"
+	"				numPoints++;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	int numReducedPoints  = numPoints;\n"
+	"	if (numPoints>4)\n"
+	"	{\n"
+	"		numReducedPoints = extractManifoldSequential( contactPoints, numPoints, planeNormalInConvex, &contactIdx);\n"
+	"	}\n"
+	"	if (numReducedPoints>0)\n"
+	"	{\n"
+	"		int dstIdx;\n"
+	"	    AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"		if (dstIdx < maxContactCapacity)\n"
+	"		{\n"
+	"			resultIndex = dstIdx;\n"
+	"			__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];\n"
+	"			c->m_worldNormalOnB = -planeNormalWorld;\n"
+	"			//c->setFrictionCoeff(0.7);\n"
+	"			//c->setRestituitionCoeff(0.f);\n"
+	"			c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"			c->m_batchIdx = pairIndex;\n"
+	"			c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;\n"
+	"			c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;\n"
+	"			c->m_childIndexA = -1;\n"
+	"			c->m_childIndexB = -1;\n"
+	"			switch (numReducedPoints)\n"
+	"            {\n"
+	"                case 4:\n"
+	"                    c->m_worldPosB[3] = contactPoints[contactIdx.w];\n"
+	"                case 3:\n"
+	"                    c->m_worldPosB[2] = contactPoints[contactIdx.z];\n"
+	"                case 2:\n"
+	"                    c->m_worldPosB[1] = contactPoints[contactIdx.y];\n"
+	"                case 1:\n"
+	"                    c->m_worldPosB[0] = contactPoints[contactIdx.x];\n"
+	"                default:\n"
+	"                {\n"
+	"                }\n"
+	"            };\n"
+	"			\n"
+	"			GET_NPOINTS(*c) = numReducedPoints;\n"
+	"		}//if (dstIdx < numPairs)\n"
+	"	}	\n"
+	"	return resultIndex;\n"
+	"}\n"
+	"void	computeContactPlaneSphere(int pairIndex,\n"
+	"																int bodyIndexA, int bodyIndexB, \n"
+	"																int collidableIndexA, int collidableIndexB, \n"
+	"																__global const BodyData* rigidBodies, \n"
+	"																__global const btCollidableGpu* collidables,\n"
+	"																__global const btGpuFace* faces,\n"
+	"																__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																counter32_t nGlobalContactsOut,\n"
+	"																int maxContactCapacity)\n"
+	"{\n"
+	"	float4 planeEq = faces[collidables[collidableIndexA].m_shapeIndex].m_plane;\n"
+	"	float radius = collidables[collidableIndexB].m_radius;\n"
+	"	float4 posA1 = rigidBodies[bodyIndexA].m_pos;\n"
+	"	float4 ornA1 = rigidBodies[bodyIndexA].m_quat;\n"
+	"	float4 posB1 = rigidBodies[bodyIndexB].m_pos;\n"
+	"	float4 ornB1 = rigidBodies[bodyIndexB].m_quat;\n"
+	"	\n"
+	"	bool hasCollision = false;\n"
+	"	float4 planeNormal1 = make_float4(planeEq.x,planeEq.y,planeEq.z,0.f);\n"
+	"	float planeConstant = planeEq.w;\n"
+	"	float4 convexInPlaneTransPos1; Quaternion convexInPlaneTransOrn1;\n"
+	"	{\n"
+	"		float4 invPosA;Quaternion invOrnA;\n"
+	"		trInverse(posA1,ornA1,&invPosA,&invOrnA);\n"
+	"		trMul(invPosA,invOrnA,posB1,ornB1,&convexInPlaneTransPos1,&convexInPlaneTransOrn1);\n"
+	"	}\n"
+	"	float4 planeInConvexPos1;	Quaternion planeInConvexOrn1;\n"
+	"	{\n"
+	"		float4 invPosB;Quaternion invOrnB;\n"
+	"		trInverse(posB1,ornB1,&invPosB,&invOrnB);\n"
+	"		trMul(invPosB,invOrnB,posA1,ornA1,&planeInConvexPos1,&planeInConvexOrn1);	\n"
+	"	}\n"
+	"	float4 vtx1 = qtRotate(planeInConvexOrn1,-planeNormal1)*radius;\n"
+	"	float4 vtxInPlane1 = transform(&vtx1,&convexInPlaneTransPos1,&convexInPlaneTransOrn1);\n"
+	"	float distance = dot3F4(planeNormal1,vtxInPlane1) - planeConstant;\n"
+	"	hasCollision = distance < 0.f;//m_manifoldPtr->getContactBreakingThreshold();\n"
+	"	if (hasCollision)\n"
+	"	{\n"
+	"		float4 vtxInPlaneProjected1 = vtxInPlane1 -   distance*planeNormal1;\n"
+	"		float4 vtxInPlaneWorld1 = transform(&vtxInPlaneProjected1,&posA1,&ornA1);\n"
+	"		float4 normalOnSurfaceB1 = qtRotate(ornA1,planeNormal1);\n"
+	"		float4 pOnB1 = vtxInPlaneWorld1+normalOnSurfaceB1*distance;\n"
+	"		pOnB1.w = distance;\n"
+	"		int dstIdx;\n"
+	"    AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"		\n"
+	"		if (dstIdx < maxContactCapacity)\n"
+	"		{\n"
+	"			__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];\n"
+	"			c->m_worldNormalOnB = -normalOnSurfaceB1;\n"
+	"			c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"			c->m_batchIdx = pairIndex;\n"
+	"			c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;\n"
+	"			c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;\n"
+	"			c->m_worldPosB[0] = pOnB1;\n"
+	"			c->m_childIndexA = -1;\n"
+	"			c->m_childIndexB = -1;\n"
+	"			GET_NPOINTS(*c) = 1;\n"
+	"		}//if (dstIdx < numPairs)\n"
+	"	}//if (hasCollision)\n"
+	"}\n"
+	"__kernel void   primitiveContactsKernel( __global int4* pairs, \n"
+	"																					__global const BodyData* rigidBodies, \n"
+	"																					__global const btCollidableGpu* collidables,\n"
+	"																					__global const ConvexPolyhedronCL* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const btGpuFace* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																					counter32_t nGlobalContactsOut,\n"
+	"																					int numPairs, int maxContactCapacity)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	\n"
+	"	float4 worldVertsB1[64];\n"
+	"	float4 worldVertsB2[64];\n"
+	"	int capacityWorldVerts = 64;	\n"
+	"	float4 localContactsOut[64];\n"
+	"	int localContactCapacity=64;\n"
+	"	\n"
+	"	float minDist = -1e30f;\n"
+	"	float maxDist = 0.02f;\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"		int bodyIndexA = pairs[i].x;\n"
+	"		int bodyIndexB = pairs[i].y;\n"
+	"			\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"	\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_PLANE &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)\n"
+	"		{\n"
+	"			float4 posB;\n"
+	"			posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"			Quaternion ornB;\n"
+	"			ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"			int contactIndex = computeContactPlaneConvex(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, \n"
+	"																rigidBodies,collidables,convexShapes,vertices,indices,\n"
+	"																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity, posB,ornB);\n"
+	"			if (contactIndex>=0)\n"
+	"				pairs[pairIndex].z = contactIndex;\n"
+	"			return;\n"
+	"		}\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_PLANE)\n"
+	"		{\n"
+	"			float4 posA;\n"
+	"			posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"			Quaternion ornA;\n"
+	"			ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"			int contactIndex = computeContactPlaneConvex( pairIndex, bodyIndexB,bodyIndexA,  collidableIndexB,collidableIndexA, \n"
+	"																rigidBodies,collidables,convexShapes,vertices,indices,\n"
+	"																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity,posA,ornA);\n"
+	"			if (contactIndex>=0)\n"
+	"				pairs[pairIndex].z = contactIndex;\n"
+	"			return;\n"
+	"		}\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_PLANE &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)\n"
+	"		{\n"
+	"			computeContactPlaneSphere(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, \n"
+	"																rigidBodies,collidables,faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity);\n"
+	"			return;\n"
+	"		}\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_PLANE)\n"
+	"		{\n"
+	"			computeContactPlaneSphere( pairIndex, bodyIndexB,bodyIndexA,  collidableIndexB,collidableIndexA, \n"
+	"																rigidBodies,collidables,\n"
+	"																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity);\n"
+	"			return;\n"
+	"		}\n"
+	"		\n"
+	"	\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_CONVEX_HULL)\n"
+	"		{\n"
+	"		\n"
+	"			float4 spherePos = rigidBodies[bodyIndexA].m_pos;\n"
+	"			float sphereRadius = collidables[collidableIndexA].m_radius;\n"
+	"			float4 convexPos = rigidBodies[bodyIndexB].m_pos;\n"
+	"			float4 convexOrn = rigidBodies[bodyIndexB].m_quat;\n"
+	"			computeContactSphereConvex(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, \n"
+	"																rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,\n"
+	"																spherePos,sphereRadius,convexPos,convexOrn);\n"
+	"			return;\n"
+	"		}\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_CONVEX_HULL &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)\n"
+	"		{\n"
+	"		\n"
+	"			float4 spherePos = rigidBodies[bodyIndexB].m_pos;\n"
+	"			float sphereRadius = collidables[collidableIndexB].m_radius;\n"
+	"			float4 convexPos = rigidBodies[bodyIndexA].m_pos;\n"
+	"			float4 convexOrn = rigidBodies[bodyIndexA].m_quat;\n"
+	"			computeContactSphereConvex(pairIndex, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, \n"
+	"																rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,\n"
+	"																spherePos,sphereRadius,convexPos,convexOrn);\n"
+	"			return;\n"
+	"		}\n"
+	"	\n"
+	"	\n"
+	"	\n"
+	"		\n"
+	"	\n"
+	"	\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)\n"
+	"		{\n"
+	"			//sphere-sphere\n"
+	"			float radiusA = collidables[collidableIndexA].m_radius;\n"
+	"			float radiusB = collidables[collidableIndexB].m_radius;\n"
+	"			float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"			float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"			float4 diff = posA-posB;\n"
+	"			float len = length(diff);\n"
+	"			\n"
+	"			///iff distance positive, don't generate a new contact\n"
+	"			if ( len <= (radiusA+radiusB))\n"
+	"			{\n"
+	"				///distance (negative means penetration)\n"
+	"				float dist = len - (radiusA+radiusB);\n"
+	"				float4 normalOnSurfaceB = make_float4(1.f,0.f,0.f,0.f);\n"
+	"				if (len > 0.00001)\n"
+	"				{\n"
+	"					normalOnSurfaceB = diff / len;\n"
+	"				}\n"
+	"				float4 contactPosB = posB + normalOnSurfaceB*radiusB;\n"
+	"				contactPosB.w = dist;\n"
+	"								\n"
+	"				int dstIdx;\n"
+	"				 AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"				\n"
+	"				if (dstIdx < maxContactCapacity)\n"
+	"				{\n"
+	"					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];\n"
+	"					c->m_worldNormalOnB = normalOnSurfaceB;\n"
+	"					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"					c->m_batchIdx = pairIndex;\n"
+	"					int bodyA = pairs[pairIndex].x;\n"
+	"					int bodyB = pairs[pairIndex].y;\n"
+	"					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;\n"
+	"					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;\n"
+	"					c->m_worldPosB[0] = contactPosB;\n"
+	"					c->m_childIndexA = -1;\n"
+	"					c->m_childIndexB = -1;\n"
+	"					GET_NPOINTS(*c) = 1;\n"
+	"				}//if (dstIdx < numPairs)\n"
+	"			}//if ( len <= (radiusA+radiusB))\n"
+	"			return;\n"
+	"		}//SHAPE_SPHERE SHAPE_SPHERE\n"
+	"	}//	if (i<numPairs)\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   processCompoundPairsPrimitivesKernel( __global const int4* gpuCompoundPairs,\n"
+	"													__global const BodyData* rigidBodies, \n"
+	"													__global const btCollidableGpu* collidables,\n"
+	"													__global const ConvexPolyhedronCL* convexShapes, \n"
+	"													__global const float4* vertices,\n"
+	"													__global const float4* uniqueEdges,\n"
+	"													__global const btGpuFace* faces,\n"
+	"													__global const int* indices,\n"
+	"													__global btAabbCL* aabbs,\n"
+	"													__global const btGpuChildShape* gpuChildShapes,\n"
+	"													__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"													counter32_t nGlobalContactsOut,\n"
+	"													int numCompoundPairs, int maxContactCapacity\n"
+	"													)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i<numCompoundPairs)\n"
+	"	{\n"
+	"		int bodyIndexA = gpuCompoundPairs[i].x;\n"
+	"		int bodyIndexB = gpuCompoundPairs[i].y;\n"
+	"		int childShapeIndexA = gpuCompoundPairs[i].z;\n"
+	"		int childShapeIndexB = gpuCompoundPairs[i].w;\n"
+	"		\n"
+	"		int collidableIndexA = -1;\n"
+	"		int collidableIndexB = -1;\n"
+	"		\n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		\n"
+	"		float4 ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"							\n"
+	"		if (childShapeIndexA >= 0)\n"
+	"		{\n"
+	"			collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;\n"
+	"			float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;\n"
+	"			float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;\n"
+	"			float4 newPosA = qtRotate(ornA,childPosA)+posA;\n"
+	"			float4 newOrnA = qtMul(ornA,childOrnA);\n"
+	"			posA = newPosA;\n"
+	"			ornA = newOrnA;\n"
+	"		} else\n"
+	"		{\n"
+	"			collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		}\n"
+	"		\n"
+	"		if (childShapeIndexB>=0)\n"
+	"		{\n"
+	"			collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"			float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"			float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"			posB = newPosB;\n"
+	"			ornB = newOrnB;\n"
+	"		} else\n"
+	"		{\n"
+	"			collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;	\n"
+	"		}\n"
+	"	\n"
+	"		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"	\n"
+	"		int shapeTypeA = collidables[collidableIndexA].m_shapeType;\n"
+	"		int shapeTypeB = collidables[collidableIndexB].m_shapeType;\n"
+	"		int pairIndex = i;\n"
+	"		if ((shapeTypeA == SHAPE_PLANE) && (shapeTypeB==SHAPE_CONVEX_HULL))\n"
+	"		{\n"
+	"			computeContactPlaneConvex( pairIndex, bodyIndexA,bodyIndexB,  collidableIndexA,collidableIndexB, \n"
+	"																rigidBodies,collidables,convexShapes,vertices,indices,\n"
+	"																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity,posB,ornB);\n"
+	"			return;\n"
+	"		}\n"
+	"		if ((shapeTypeA == SHAPE_CONVEX_HULL) && (shapeTypeB==SHAPE_PLANE))\n"
+	"		{\n"
+	"			computeContactPlaneConvex( pairIndex, bodyIndexB,bodyIndexA,  collidableIndexB,collidableIndexA, \n"
+	"																rigidBodies,collidables,convexShapes,vertices,indices,\n"
+	"																faces,	globalContactsOut, nGlobalContactsOut,maxContactCapacity,posA,ornA);\n"
+	"			return;\n"
+	"		}\n"
+	"		if ((shapeTypeA == SHAPE_CONVEX_HULL) && (shapeTypeB == SHAPE_SPHERE))\n"
+	"		{\n"
+	"			float4 spherePos = rigidBodies[bodyIndexB].m_pos;\n"
+	"			float sphereRadius = collidables[collidableIndexB].m_radius;\n"
+	"			float4 convexPos = posA;\n"
+	"			float4 convexOrn = ornA;\n"
+	"			\n"
+	"			computeContactSphereConvex(pairIndex, bodyIndexB, bodyIndexA , collidableIndexB,collidableIndexA, \n"
+	"										rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,\n"
+	"										spherePos,sphereRadius,convexPos,convexOrn);\n"
+	"	\n"
+	"			return;\n"
+	"		}\n"
+	"		if ((shapeTypeA == SHAPE_SPHERE) && (shapeTypeB == SHAPE_CONVEX_HULL))\n"
+	"		{\n"
+	"			float4 spherePos = rigidBodies[bodyIndexA].m_pos;\n"
+	"			float sphereRadius = collidables[collidableIndexA].m_radius;\n"
+	"			float4 convexPos = posB;\n"
+	"			float4 convexOrn = ornB;\n"
+	"			\n"
+	"			computeContactSphereConvex(pairIndex, bodyIndexA, bodyIndexB, collidableIndexA, collidableIndexB, \n"
+	"										rigidBodies,collidables,convexShapes,vertices,indices,faces, globalContactsOut, nGlobalContactsOut,maxContactCapacity,\n"
+	"										spherePos,sphereRadius,convexPos,convexOrn);\n"
+	"	\n"
+	"			return;\n"
+	"		}\n"
+	"	}//	if (i<numCompoundPairs)\n"
+	"}\n"
+	"bool pointInTriangle(const float4* vertices, const float4* normal, float4 *p )\n"
+	"{\n"
+	"	const float4* p1 = &vertices[0];\n"
+	"	const float4* p2 = &vertices[1];\n"
+	"	const float4* p3 = &vertices[2];\n"
+	"	float4 edge1;	edge1 = (*p2 - *p1);\n"
+	"	float4 edge2;	edge2 = ( *p3 - *p2 );\n"
+	"	float4 edge3;	edge3 = ( *p1 - *p3 );\n"
+	"	\n"
+	"	float4 p1_to_p; p1_to_p = ( *p - *p1 );\n"
+	"	float4 p2_to_p; p2_to_p = ( *p - *p2 );\n"
+	"	float4 p3_to_p; p3_to_p = ( *p - *p3 );\n"
+	"	float4 edge1_normal; edge1_normal = ( cross(edge1,*normal));\n"
+	"	float4 edge2_normal; edge2_normal = ( cross(edge2,*normal));\n"
+	"	float4 edge3_normal; edge3_normal = ( cross(edge3,*normal));\n"
+	"	\n"
+	"	\n"
+	"	float r1, r2, r3;\n"
+	"	r1 = dot(edge1_normal,p1_to_p );\n"
+	"	r2 = dot(edge2_normal,p2_to_p );\n"
+	"	r3 = dot(edge3_normal,p3_to_p );\n"
+	"	\n"
+	"	if ( r1 > 0 && r2 > 0 && r3 > 0 )\n"
+	"		return true;\n"
+	"    if ( r1 <= 0 && r2 <= 0 && r3 <= 0 ) \n"
+	"		return true;\n"
+	"	return false;\n"
+	"}\n"
+	"float segmentSqrDistance(float4 from, float4 to,float4 p, float4* nearest) \n"
+	"{\n"
+	"	float4 diff = p - from;\n"
+	"	float4 v = to - from;\n"
+	"	float t = dot(v,diff);\n"
+	"	\n"
+	"	if (t > 0) \n"
+	"	{\n"
+	"		float dotVV = dot(v,v);\n"
+	"		if (t < dotVV) \n"
+	"		{\n"
+	"			t /= dotVV;\n"
+	"			diff -= t*v;\n"
+	"		} else \n"
+	"		{\n"
+	"			t = 1;\n"
+	"			diff -= v;\n"
+	"		}\n"
+	"	} else\n"
+	"	{\n"
+	"		t = 0;\n"
+	"	}\n"
+	"	*nearest = from + t*v;\n"
+	"	return dot(diff,diff);	\n"
+	"}\n"
+	"void	computeContactSphereTriangle(int pairIndex,\n"
+	"									int bodyIndexA, int bodyIndexB,\n"
+	"									int collidableIndexA, int collidableIndexB, \n"
+	"									__global const BodyData* rigidBodies, \n"
+	"									__global const btCollidableGpu* collidables,\n"
+	"									const float4* triangleVertices,\n"
+	"									__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"									counter32_t nGlobalContactsOut,\n"
+	"									int maxContactCapacity,\n"
+	"									float4 spherePos2,\n"
+	"									float radius,\n"
+	"									float4 pos,\n"
+	"									float4 quat,\n"
+	"									int faceIndex\n"
+	"									)\n"
+	"{\n"
+	"	float4 invPos;\n"
+	"	float4 invOrn;\n"
+	"	trInverse(pos,quat, &invPos,&invOrn);\n"
+	"	float4 spherePos = transform(&spherePos2,&invPos,&invOrn);\n"
+	"	int numFaces = 3;\n"
+	"	float4 closestPnt = (float4)(0, 0, 0, 0);\n"
+	"	float4 hitNormalWorld = (float4)(0, 0, 0, 0);\n"
+	"	float minDist = -1000000.f;\n"
+	"	bool bCollide = false;\n"
+	"	\n"
+	"	//////////////////////////////////////\n"
+	"	float4 sphereCenter;\n"
+	"	sphereCenter = spherePos;\n"
+	"	const float4* vertices = triangleVertices;\n"
+	"	float contactBreakingThreshold = 0.f;//todo?\n"
+	"	float radiusWithThreshold = radius + contactBreakingThreshold;\n"
+	"	float4 edge10;\n"
+	"	edge10 = vertices[1]-vertices[0];\n"
+	"	edge10.w = 0.f;//is this needed?\n"
+	"	float4 edge20;\n"
+	"	edge20 = vertices[2]-vertices[0];\n"
+	"	edge20.w = 0.f;//is this needed?\n"
+	"	float4 normal = cross3(edge10,edge20);\n"
+	"	normal = normalize(normal);\n"
+	"	float4 p1ToCenter;\n"
+	"	p1ToCenter = sphereCenter - vertices[0];\n"
+	"	\n"
+	"	float distanceFromPlane = dot(p1ToCenter,normal);\n"
+	"	if (distanceFromPlane < 0.f)\n"
+	"	{\n"
+	"		//triangle facing the other way\n"
+	"		distanceFromPlane *= -1.f;\n"
+	"		normal *= -1.f;\n"
+	"	}\n"
+	"	hitNormalWorld = normal;\n"
+	"	bool isInsideContactPlane = distanceFromPlane < radiusWithThreshold;\n"
+	"	\n"
+	"	// Check for contact / intersection\n"
+	"	bool hasContact = false;\n"
+	"	float4 contactPoint;\n"
+	"	if (isInsideContactPlane) \n"
+	"	{\n"
+	"	\n"
+	"		if (pointInTriangle(vertices,&normal, &sphereCenter)) \n"
+	"		{\n"
+	"			// Inside the contact wedge - touches a point on the shell plane\n"
+	"			hasContact = true;\n"
+	"			contactPoint = sphereCenter - normal*distanceFromPlane;\n"
+	"			\n"
+	"		} else {\n"
+	"			// Could be inside one of the contact capsules\n"
+	"			float contactCapsuleRadiusSqr = radiusWithThreshold*radiusWithThreshold;\n"
+	"			float4 nearestOnEdge;\n"
+	"			int numEdges = 3;\n"
+	"			for (int i = 0; i < numEdges; i++) \n"
+	"			{\n"
+	"				float4 pa =vertices[i];\n"
+	"				float4 pb = vertices[(i+1)%3];\n"
+	"				float distanceSqr = segmentSqrDistance(pa,pb,sphereCenter, &nearestOnEdge);\n"
+	"				if (distanceSqr < contactCapsuleRadiusSqr) \n"
+	"				{\n"
+	"					// Yep, we're inside a capsule\n"
+	"					hasContact = true;\n"
+	"					contactPoint = nearestOnEdge;\n"
+	"					\n"
+	"				}\n"
+	"				\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if (hasContact) \n"
+	"	{\n"
+	"		closestPnt = contactPoint;\n"
+	"		float4 contactToCenter = sphereCenter - contactPoint;\n"
+	"		minDist = length(contactToCenter);\n"
+	"		if (minDist>FLT_EPSILON)\n"
+	"		{\n"
+	"			hitNormalWorld = normalize(contactToCenter);//*(1./minDist);\n"
+	"			bCollide  = true;\n"
+	"		}\n"
+	"		\n"
+	"	}\n"
+	"	/////////////////////////////////////\n"
+	"	if (bCollide && minDist > -10000)\n"
+	"	{\n"
+	"		\n"
+	"		float4 normalOnSurfaceB1 = qtRotate(quat,-hitNormalWorld);\n"
+	"		float4 pOnB1 = transform(&closestPnt,&pos,&quat);\n"
+	"		float actualDepth = minDist-radius;\n"
+	"		\n"
+	"		if (actualDepth<=0.f)\n"
+	"		{\n"
+	"			pOnB1.w = actualDepth;\n"
+	"			int dstIdx;\n"
+	"			\n"
+	"			float lenSqr = dot3F4(normalOnSurfaceB1,normalOnSurfaceB1);\n"
+	"			if (lenSqr>FLT_EPSILON)\n"
+	"			{\n"
+	"				AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"			\n"
+	"				if (dstIdx < maxContactCapacity)\n"
+	"				{\n"
+	"					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];\n"
+	"					c->m_worldNormalOnB = -normalOnSurfaceB1;\n"
+	"					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"					c->m_batchIdx = pairIndex;\n"
+	"					c->m_bodyAPtrAndSignBit = rigidBodies[bodyIndexA].m_invMass==0?-bodyIndexA:bodyIndexA;\n"
+	"					c->m_bodyBPtrAndSignBit = rigidBodies[bodyIndexB].m_invMass==0?-bodyIndexB:bodyIndexB;\n"
+	"					c->m_worldPosB[0] = pOnB1;\n"
+	"					c->m_childIndexA = -1;\n"
+	"					c->m_childIndexB = faceIndex;\n"
+	"					GET_NPOINTS(*c) = 1;\n"
+	"				} \n"
+	"			}\n"
+	"		}\n"
+	"	}//if (hasCollision)\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   findConcaveSphereContactsKernel( __global int4* concavePairs,\n"
+	"												__global const BodyData* rigidBodies,\n"
+	"												__global const btCollidableGpu* collidables,\n"
+	"												__global const ConvexPolyhedronCL* convexShapes, \n"
+	"												__global const float4* vertices,\n"
+	"												__global const float4* uniqueEdges,\n"
+	"												__global const btGpuFace* faces,\n"
+	"												__global const int* indices,\n"
+	"												__global btAabbCL* aabbs,\n"
+	"												__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"												counter32_t nGlobalContactsOut,\n"
+	"													int numConcavePairs, int maxContactCapacity\n"
+	"												)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numConcavePairs)\n"
+	"		return;\n"
+	"	int pairIdx = i;\n"
+	"	int bodyIndexA = concavePairs[i].x;\n"
+	"	int bodyIndexB = concavePairs[i].y;\n"
+	"	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"	if (collidables[collidableIndexB].m_shapeType==SHAPE_SPHERE)\n"
+	"	{\n"
+	"		int f = concavePairs[i].z;\n"
+	"		btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];\n"
+	"		\n"
+	"		float4 verticesA[3];\n"
+	"		for (int i=0;i<3;i++)\n"
+	"		{\n"
+	"			int index = indices[face.m_indexOffset+i];\n"
+	"			float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];\n"
+	"			verticesA[i] = vert;\n"
+	"		}\n"
+	"		float4 spherePos = rigidBodies[bodyIndexB].m_pos;\n"
+	"		float sphereRadius = collidables[collidableIndexB].m_radius;\n"
+	"		float4 convexPos = rigidBodies[bodyIndexA].m_pos;\n"
+	"		float4 convexOrn = rigidBodies[bodyIndexA].m_quat;\n"
+	"		computeContactSphereTriangle(i, bodyIndexB, bodyIndexA, collidableIndexB, collidableIndexA, \n"
+	"																rigidBodies,collidables,\n"
+	"																verticesA,\n"
+	"																globalContactsOut, nGlobalContactsOut,maxContactCapacity,\n"
+	"																spherePos,sphereRadius,convexPos,convexOrn, f);\n"
+	"		return;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl
new file mode 100644
index 0000000..a6565fd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl
@@ -0,0 +1,2018 @@
+//keep this enum in sync with the CPU version (in btCollidable.h)
+//written by Erwin Coumans
+
+
+#define SHAPE_CONVEX_HULL 3
+#define SHAPE_CONCAVE_TRIMESH 5
+#define TRIANGLE_NUM_CONVEX_FACES 5
+#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6
+
+#define B3_MAX_STACK_DEPTH 256
+
+
+typedef unsigned int u32;
+
+///keep this in sync with btCollidable.h
+typedef struct
+{
+	union {
+		int m_numChildShapes;
+		int m_bvhIndex;
+	};
+	union
+	{
+		float m_radius;
+		int	m_compoundBvhIndex;
+	};
+	
+	int m_shapeType;
+	int m_shapeIndex;
+	
+} btCollidableGpu;
+
+#define MAX_NUM_PARTS_IN_BITS 10
+
+///b3QuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+typedef struct
+{
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes
+	int	m_escapeIndexOrTriangleIndex;
+} b3QuantizedBvhNode;
+
+typedef struct
+{
+	float4		m_aabbMin;
+	float4		m_aabbMax;
+	float4		m_quantization;
+	int			m_numNodes;
+	int			m_numSubTrees;
+	int			m_nodeOffset;
+	int			m_subTreeOffset;
+
+} b3BvhInfo;
+
+
+int	getTriangleIndex(const b3QuantizedBvhNode* rootNode)
+{
+	unsigned int x=0;
+	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
+	// Get only the lower bits where the triangle index is stored
+	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));
+}
+
+int	getTriangleIndexGlobal(__global const b3QuantizedBvhNode* rootNode)
+{
+	unsigned int x=0;
+	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
+	// Get only the lower bits where the triangle index is stored
+	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));
+}
+
+int isLeafNode(const b3QuantizedBvhNode* rootNode)
+{
+	//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;
+}
+
+int isLeafNodeGlobal(__global const b3QuantizedBvhNode* rootNode)
+{
+	//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;
+}
+	
+int getEscapeIndex(const b3QuantizedBvhNode* rootNode)
+{
+	return -rootNode->m_escapeIndexOrTriangleIndex;
+}
+
+int getEscapeIndexGlobal(__global const b3QuantizedBvhNode* rootNode)
+{
+	return -rootNode->m_escapeIndexOrTriangleIndex;
+}
+
+
+typedef struct
+{
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes, points to the root of the subtree
+	int			m_rootNodeIndex;
+	//4 bytes
+	int			m_subtreeSize;
+	int			m_padding[3];
+} b3BvhSubtreeInfo;
+
+
+
+
+
+
+
+typedef struct
+{
+	float4	m_childPosition;
+	float4	m_childOrientation;
+	int m_shapeIndex;
+	int m_unused0;
+	int m_unused1;
+	int m_unused2;
+} btGpuChildShape;
+
+
+typedef struct
+{
+	float4 m_pos;
+	float4 m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_collidableIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} BodyData;
+
+
+typedef struct  
+{
+	float4		m_localCenter;
+	float4		m_extents;
+	float4		mC;
+	float4		mE;
+	
+	float			m_radius;
+	int	m_faceOffset;
+	int m_numFaces;
+	int	m_numVertices;
+
+	int m_vertexOffset;
+	int	m_uniqueEdgesOffset;
+	int	m_numUniqueEdges;
+	int m_unused;
+} ConvexPolyhedronCL;
+
+typedef struct 
+{
+	union
+	{
+		float4	m_min;
+		float   m_minElems[4];
+		int			m_minIndices[4];
+	};
+	union
+	{
+		float4	m_max;
+		float   m_maxElems[4];
+		int			m_maxIndices[4];
+	};
+} btAabbCL;
+
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Common/shared/b3Int2.h"
+
+
+
+typedef struct
+{
+	float4 m_plane;
+	int m_indexOffset;
+	int m_numIndices;
+} btGpuFace;
+
+#define make_float4 (float4)
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+
+	
+//	float4 a1 = make_float4(a.xyz,0.f);
+//	float4 b1 = make_float4(b.xyz,0.f);
+
+//	return cross(a1,b1);
+
+//float4 c = make_float4(a.y*b.z - a.z*b.y,a.z*b.x - a.x*b.z,a.x*b.y - a.y*b.x,0.f);
+	
+	//	float4 c = make_float4(a.y*b.z - a.z*b.y,1.f,a.x*b.y - a.y*b.x,0.f);
+	
+	//return c;
+}
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	v = make_float4(v.xyz,0.f);
+	return fast_normalize(v);
+}
+
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+Quaternion qtNormalize(Quaternion in);
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec);
+
+__inline
+Quaternion qtInvert(Quaternion q);
+
+
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtNormalize(Quaternion in)
+{
+	return fastNormalize4(in);
+//	in /= length( in );
+//	return in;
+}
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+__inline
+float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)
+{
+	return qtRotate( *orientation, *p ) + (*translation);
+}
+
+
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = make_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+}
+
+inline void projectLocal(const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, 
+const float4* dir, const float4* vertices, float* min, float* max)
+{
+	min[0] = FLT_MAX;
+	max[0] = -FLT_MAX;
+	int numVerts = hull->m_numVertices;
+
+	const float4 localDir = qtInvRotate(orn,*dir);
+	float offset = dot(pos,*dir);
+	for(int i=0;i<numVerts;i++)
+	{
+		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);
+		if(dp < min[0])	
+			min[0] = dp;
+		if(dp > max[0])	
+			max[0] = dp;
+	}
+	if(min[0]>max[0])
+	{
+		float tmp = min[0];
+		min[0] = max[0];
+		max[0] = tmp;
+	}
+	min[0] += offset;
+	max[0] += offset;
+}
+
+inline void project(__global const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, 
+const float4* dir, __global const float4* vertices, float* min, float* max)
+{
+	min[0] = FLT_MAX;
+	max[0] = -FLT_MAX;
+	int numVerts = hull->m_numVertices;
+
+	const float4 localDir = qtInvRotate(orn,*dir);
+	float offset = dot(pos,*dir);
+	for(int i=0;i<numVerts;i++)
+	{
+		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);
+		if(dp < min[0])	
+			min[0] = dp;
+		if(dp > max[0])	
+			max[0] = dp;
+	}
+	if(min[0]>max[0])
+	{
+		float tmp = min[0];
+		min[0] = max[0];
+		max[0] = tmp;
+	}
+	min[0] += offset;
+	max[0] += offset;
+}
+
+inline bool TestSepAxisLocalA(const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA,const float4 ornA,
+	const float4 posB,const float4 ornB,
+	float4* sep_axis, const float4* verticesA, __global const float4* verticesB,float* depth)
+{
+	float Min0,Max0;
+	float Min1,Max1;
+	projectLocal(hullA,posA,ornA,sep_axis,verticesA, &Min0, &Max0);
+	project(hullB,posB,ornB, sep_axis,verticesB, &Min1, &Max1);
+
+	if(Max0<Min1 || Max1<Min0)
+		return false;
+
+	float d0 = Max0 - Min1;
+	float d1 = Max1 - Min0;
+	*depth = d0<d1 ? d0:d1;
+	return true;
+}
+
+
+
+
+inline bool IsAlmostZero(const float4 v)
+{
+	if(fabs(v.x)>1e-6f || fabs(v.y)>1e-6f || fabs(v.z)>1e-6f)
+		return false;
+	return true;
+}
+
+
+
+bool findSeparatingAxisLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	
+	const float4* verticesA, 
+	const float4* uniqueEdgesA, 
+	const btGpuFace* facesA,
+	const int*  indicesA,
+
+	__global const float4* verticesB, 
+	__global const float4* uniqueEdgesB, 
+	__global const btGpuFace* facesB,
+	__global const int*  indicesB,
+	float4* sep,
+	float* dmin)
+{
+	
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+	int curPlaneTests=0;
+	{
+		int numFacesA = hullA->m_numFaces;
+		// Test normals from hullA
+		for(int i=0;i<numFacesA;i++)
+		{
+			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;
+			float4 faceANormalWS = qtRotate(ornA,normal);
+			if (dot3F4(DeltaC2,faceANormalWS)<0)
+				faceANormalWS*=-1.f;
+			curPlaneTests++;
+			float d;
+			if(!TestSepAxisLocalA( hullA, hullB, posA,ornA,posB,ornB,&faceANormalWS, verticesA, verticesB,&d))
+				return false;
+			if(d<*dmin)
+			{
+				*dmin = d;
+				*sep = faceANormalWS;
+			}
+		}
+	}
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+bool findSeparatingAxisLocalB(	__global const ConvexPolyhedronCL* hullA,  const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	__global const float4* verticesA, 
+	__global const float4* uniqueEdgesA, 
+	__global const btGpuFace* facesA,
+	__global const int*  indicesA,
+	const float4* verticesB,
+	const float4* uniqueEdgesB, 
+	const btGpuFace* facesB,
+	const int*  indicesB,
+	float4* sep,
+	float* dmin)
+{
+
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+	int curPlaneTests=0;
+	{
+		int numFacesA = hullA->m_numFaces;
+		// Test normals from hullA
+		for(int i=0;i<numFacesA;i++)
+		{
+			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;
+			float4 faceANormalWS = qtRotate(ornA,normal);
+			if (dot3F4(DeltaC2,faceANormalWS)<0)
+				faceANormalWS *= -1.f;
+			curPlaneTests++;
+			float d;
+			if(!TestSepAxisLocalA( hullB, hullA, posB,ornB,posA,ornA, &faceANormalWS, verticesB,verticesA, &d))
+				return false;
+			if(d<*dmin)
+			{
+				*dmin = d;
+				*sep = faceANormalWS;
+			}
+		}
+	}
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+
+
+bool findSeparatingAxisEdgeEdgeLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	const float4* verticesA, 
+	const float4* uniqueEdgesA, 
+	const btGpuFace* facesA,
+	const int*  indicesA,
+	__global const float4* verticesB, 
+	__global const float4* uniqueEdgesB, 
+	__global const btGpuFace* facesB,
+	__global const int*  indicesB,
+		float4* sep,
+	float* dmin)
+{
+
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+
+	int curPlaneTests=0;
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for(int e0=0;e0<hullA->m_numUniqueEdges;e0++)
+	{
+		const float4 edge0 = uniqueEdgesA[hullA->m_uniqueEdgesOffset+e0];
+		float4 edge0World = qtRotate(ornA,edge0);
+
+		for(int e1=0;e1<hullB->m_numUniqueEdges;e1++)
+		{
+			const float4 edge1 = uniqueEdgesB[hullB->m_uniqueEdgesOffset+e1];
+			float4 edge1World = qtRotate(ornB,edge1);
+
+
+			float4 crossje = cross3(edge0World,edge1World);
+
+			curEdgeEdge++;
+			if(!IsAlmostZero(crossje))
+			{
+				crossje = normalize3(crossje);
+				if (dot3F4(DeltaC2,crossje)<0)
+					crossje *= -1.f;
+
+				float dist;
+				bool result = true;
+				{
+					float Min0,Max0;
+					float Min1,Max1;
+					projectLocal(hullA,posA,ornA,&crossje,verticesA, &Min0, &Max0);
+					project(hullB,posB,ornB,&crossje,verticesB, &Min1, &Max1);
+				
+					if(Max0<Min1 || Max1<Min0)
+						result = false;
+				
+					float d0 = Max0 - Min1;
+					float d1 = Max1 - Min0;
+					dist = d0<d1 ? d0:d1;
+					result = true;
+
+				}
+				
+
+				if(dist<*dmin)
+				{
+					*dmin = dist;
+					*sep = crossje;
+				}
+			}
+		}
+
+	}
+
+	
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+
+inline bool TestSepAxis(__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA,const float4 ornA,
+	const float4 posB,const float4 ornB,
+	float4* sep_axis, __global const float4* vertices,float* depth)
+{
+	float Min0,Max0;
+	float Min1,Max1;
+	project(hullA,posA,ornA,sep_axis,vertices, &Min0, &Max0);
+	project(hullB,posB,ornB, sep_axis,vertices, &Min1, &Max1);
+
+	if(Max0<Min1 || Max1<Min0)
+		return false;
+
+	float d0 = Max0 - Min1;
+	float d1 = Max1 - Min0;
+	*depth = d0<d1 ? d0:d1;
+	return true;
+}
+
+
+bool findSeparatingAxis(	__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	__global const float4* vertices, 
+	__global const float4* uniqueEdges, 
+	__global const btGpuFace* faces,
+	__global const int*  indices,
+	float4* sep,
+	float* dmin)
+{
+	
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+	
+	int curPlaneTests=0;
+
+	{
+		int numFacesA = hullA->m_numFaces;
+		// Test normals from hullA
+		for(int i=0;i<numFacesA;i++)
+		{
+			const float4 normal = faces[hullA->m_faceOffset+i].m_plane;
+			float4 faceANormalWS = qtRotate(ornA,normal);
+	
+			if (dot3F4(DeltaC2,faceANormalWS)<0)
+				faceANormalWS*=-1.f;
+				
+			curPlaneTests++;
+	
+			float d;
+			if(!TestSepAxis( hullA, hullB, posA,ornA,posB,ornB,&faceANormalWS, vertices,&d))
+				return false;
+	
+			if(d<*dmin)
+			{
+				*dmin = d;
+				*sep = faceANormalWS;
+			}
+		}
+	}
+
+
+		if((dot3F4(-DeltaC2,*sep))>0.0f)
+		{
+			*sep = -(*sep);
+		}
+	
+	return true;
+}
+
+
+
+
+bool findSeparatingAxisUnitSphere(	__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	__global const float4* vertices,
+	__global const float4* unitSphereDirections,
+	int numUnitSphereDirections,
+	float4* sep,
+	float* dmin)
+{
+	
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+
+	int curPlaneTests=0;
+
+	int curEdgeEdge = 0;
+	// Test unit sphere directions
+	for (int i=0;i<numUnitSphereDirections;i++)
+	{
+
+		float4 crossje;
+		crossje = unitSphereDirections[i];	
+
+		if (dot3F4(DeltaC2,crossje)>0)
+			crossje *= -1.f;
+		{
+			float dist;
+			bool result = true;
+			float Min0,Max0;
+			float Min1,Max1;
+			project(hullA,posA,ornA,&crossje,vertices, &Min0, &Max0);
+			project(hullB,posB,ornB,&crossje,vertices, &Min1, &Max1);
+		
+			if(Max0<Min1 || Max1<Min0)
+				return false;
+		
+			float d0 = Max0 - Min1;
+			float d1 = Max1 - Min0;
+			dist = d0<d1 ? d0:d1;
+			result = true;
+	
+			if(dist<*dmin)
+			{
+				*dmin = dist;
+				*sep = crossje;
+			}
+		}
+	}
+
+	
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+
+bool findSeparatingAxisEdgeEdge(	__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	__global const float4* vertices, 
+	__global const float4* uniqueEdges, 
+	__global const btGpuFace* faces,
+	__global const int*  indices,
+	float4* sep,
+	float* dmin)
+{
+	
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+
+	int curPlaneTests=0;
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for(int e0=0;e0<hullA->m_numUniqueEdges;e0++)
+	{
+		const float4 edge0 = uniqueEdges[hullA->m_uniqueEdgesOffset+e0];
+		float4 edge0World = qtRotate(ornA,edge0);
+
+		for(int e1=0;e1<hullB->m_numUniqueEdges;e1++)
+		{
+			const float4 edge1 = uniqueEdges[hullB->m_uniqueEdgesOffset+e1];
+			float4 edge1World = qtRotate(ornB,edge1);
+
+
+			float4 crossje = cross3(edge0World,edge1World);
+
+			curEdgeEdge++;
+			if(!IsAlmostZero(crossje))
+			{
+				crossje = normalize3(crossje);
+				if (dot3F4(DeltaC2,crossje)<0)
+					crossje*=-1.f;
+					
+				float dist;
+				bool result = true;
+				{
+					float Min0,Max0;
+					float Min1,Max1;
+					project(hullA,posA,ornA,&crossje,vertices, &Min0, &Max0);
+					project(hullB,posB,ornB,&crossje,vertices, &Min1, &Max1);
+				
+					if(Max0<Min1 || Max1<Min0)
+						return false;
+				
+					float d0 = Max0 - Min1;
+					float d1 = Max1 - Min0;
+					dist = d0<d1 ? d0:d1;
+					result = true;
+
+				}
+				
+
+				if(dist<*dmin)
+				{
+					*dmin = dist;
+					*sep = crossje;
+				}
+			}
+		}
+
+	}
+
+	
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+
+// work-in-progress
+__kernel void   processCompoundPairsKernel( __global const int4* gpuCompoundPairs,
+																					__global const BodyData* rigidBodies, 
+																					__global const btCollidableGpu* collidables,
+																					__global const ConvexPolyhedronCL* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const btGpuFace* faces,
+																					__global const int* indices,
+																					__global btAabbCL* aabbs,
+																					__global const btGpuChildShape* gpuChildShapes,
+																					__global volatile float4* gpuCompoundSepNormalsOut,
+																					__global volatile int* gpuHasCompoundSepNormalsOut,
+																					int numCompoundPairs
+																					)
+{
+
+	int i = get_global_id(0);
+	if (i<numCompoundPairs)
+	{
+		int bodyIndexA = gpuCompoundPairs[i].x;
+		int bodyIndexB = gpuCompoundPairs[i].y;
+
+		int childShapeIndexA = gpuCompoundPairs[i].z;
+		int childShapeIndexB = gpuCompoundPairs[i].w;
+		
+		int collidableIndexA = -1;
+		int collidableIndexB = -1;
+		
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		
+		float4 ornB = rigidBodies[bodyIndexB].m_quat;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+							
+		if (childShapeIndexA >= 0)
+		{
+			collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+			float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+			float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+			float4 newPosA = qtRotate(ornA,childPosA)+posA;
+			float4 newOrnA = qtMul(ornA,childOrnA);
+			posA = newPosA;
+			ornA = newOrnA;
+		} else
+		{
+			collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		}
+		
+		if (childShapeIndexB>=0)
+		{
+			collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			float4 newPosB = transform(&childPosB,&posB,&ornB);
+			float4 newOrnB = qtMul(ornB,childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+		} else
+		{
+			collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;	
+		}
+	
+		gpuHasCompoundSepNormalsOut[i] = 0;
+	
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+	
+		int shapeTypeA = collidables[collidableIndexA].m_shapeType;
+		int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+	
+
+		if ((shapeTypeA != SHAPE_CONVEX_HULL) || (shapeTypeB != SHAPE_CONVEX_HULL))
+		{
+			return;
+		}
+
+		int hasSeparatingAxis = 5;
+							
+		int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+		float dmin = FLT_MAX;
+		posA.w = 0.f;
+		posB.w = 0.f;
+		float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+		float4 c0 = transform(&c0local, &posA, &ornA);
+		float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		float4 c1 = transform(&c1local,&posB,&ornB);
+		const float4 DeltaC2 = c0 - c1;
+		float4 sepNormal = make_float4(1,0,0,0);
+		bool sepA = findSeparatingAxis(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,posB,ornB,DeltaC2,vertices,uniqueEdges,faces,indices,&sepNormal,&dmin);
+		hasSeparatingAxis = 4;
+		if (!sepA)
+		{
+			hasSeparatingAxis = 0;
+		} else
+		{
+			bool sepB = findSeparatingAxis(	&convexShapes[shapeIndexB],&convexShapes[shapeIndexA],posB,ornB,posA,ornA,DeltaC2,vertices,uniqueEdges,faces,indices,&sepNormal,&dmin);
+
+			if (!sepB)
+			{
+				hasSeparatingAxis = 0;
+			} else//(!sepB)
+			{
+				bool sepEE = findSeparatingAxisEdgeEdge(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,posB,ornB,DeltaC2,vertices,uniqueEdges,faces,indices,&sepNormal,&dmin);
+				if (sepEE)
+				{
+						gpuCompoundSepNormalsOut[i] = sepNormal;//fastNormalize4(sepNormal);
+						gpuHasCompoundSepNormalsOut[i] = 1;
+				}//sepEE
+			}//(!sepB)
+		}//(!sepA)
+		
+		
+	}
+		
+}
+
+
+inline b3Float4 MyUnQuantize(const unsigned short* vecIn, b3Float4 quantization, b3Float4 bvhAabbMin)
+{
+		b3Float4 vecOut;
+		vecOut = b3MakeFloat4(
+			(float)(vecIn[0]) / (quantization.x),
+			(float)(vecIn[1]) / (quantization.y),
+			(float)(vecIn[2]) / (quantization.z),
+			0.f);
+
+		vecOut += bvhAabbMin;
+		return vecOut;
+}
+
+inline b3Float4 MyUnQuantizeGlobal(__global const unsigned short* vecIn, b3Float4 quantization, b3Float4 bvhAabbMin)
+{
+		b3Float4 vecOut;
+		vecOut = b3MakeFloat4(
+			(float)(vecIn[0]) / (quantization.x),
+			(float)(vecIn[1]) / (quantization.y),
+			(float)(vecIn[2]) / (quantization.z),
+			0.f);
+
+		vecOut += bvhAabbMin;
+		return vecOut;
+}
+
+
+// work-in-progress
+__kernel void   findCompoundPairsKernel( __global const int4* pairs, 
+	__global const BodyData* rigidBodies, 
+	__global const btCollidableGpu* collidables,
+	__global const ConvexPolyhedronCL* convexShapes, 
+	__global const float4* vertices,
+	__global const float4* uniqueEdges,
+	__global const btGpuFace* faces,
+	__global const int* indices,
+	__global b3Aabb_t* aabbLocalSpace,
+	__global const btGpuChildShape* gpuChildShapes,
+	__global volatile int4* gpuCompoundPairsOut,
+	__global volatile int* numCompoundPairsOut,
+	__global const b3BvhSubtreeInfo* subtrees,
+	__global const b3QuantizedBvhNode* quantizedNodes,
+	__global const b3BvhInfo* bvhInfos,
+	int numPairs,
+	int maxNumCompoundPairsCapacity
+	)
+{
+
+	int i = get_global_id(0);
+
+	if (i<numPairs)
+	{
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+
+
+		//once the broadphase avoids static-static pairs, we can remove this test
+		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))
+		{
+			return;
+		}
+
+		if ((collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) &&(collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))
+		{
+			int bvhA = collidables[collidableIndexA].m_compoundBvhIndex;
+			int bvhB = collidables[collidableIndexB].m_compoundBvhIndex;
+			int numSubTreesA = bvhInfos[bvhA].m_numSubTrees;
+			int subTreesOffsetA = bvhInfos[bvhA].m_subTreeOffset;
+			int subTreesOffsetB = bvhInfos[bvhB].m_subTreeOffset;
+
+
+			int numSubTreesB = bvhInfos[bvhB].m_numSubTrees;
+			
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+			b3Quat ornA = rigidBodies[bodyIndexA].m_quat;
+
+			b3Quat ornB = rigidBodies[bodyIndexB].m_quat;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+
+			
+			for (int p=0;p<numSubTreesA;p++)
+			{
+				b3BvhSubtreeInfo subtreeA = subtrees[subTreesOffsetA+p];
+				//bvhInfos[bvhA].m_quantization
+				b3Float4 treeAminLocal = MyUnQuantize(subtreeA.m_quantizedAabbMin,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);
+				b3Float4 treeAmaxLocal = MyUnQuantize(subtreeA.m_quantizedAabbMax,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);
+
+				b3Float4 aabbAMinOut,aabbAMaxOut;
+				float margin=0.f;
+				b3TransformAabb2(treeAminLocal,treeAmaxLocal, margin,posA,ornA,&aabbAMinOut,&aabbAMaxOut);
+				
+				for (int q=0;q<numSubTreesB;q++)
+				{
+					b3BvhSubtreeInfo subtreeB = subtrees[subTreesOffsetB+q];
+
+					b3Float4 treeBminLocal = MyUnQuantize(subtreeB.m_quantizedAabbMin,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);
+					b3Float4 treeBmaxLocal = MyUnQuantize(subtreeB.m_quantizedAabbMax,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);
+
+					b3Float4 aabbBMinOut,aabbBMaxOut;
+					float margin=0.f;
+					b3TransformAabb2(treeBminLocal,treeBmaxLocal, margin,posB,ornB,&aabbBMinOut,&aabbBMaxOut);
+
+					
+					
+					bool aabbOverlap = b3TestAabbAgainstAabb(aabbAMinOut,aabbAMaxOut,aabbBMinOut,aabbBMaxOut);
+					if (aabbOverlap)
+					{
+						
+						int startNodeIndexA = subtreeA.m_rootNodeIndex+bvhInfos[bvhA].m_nodeOffset;
+						int endNodeIndexA = startNodeIndexA+subtreeA.m_subtreeSize;
+
+						int startNodeIndexB = subtreeB.m_rootNodeIndex+bvhInfos[bvhB].m_nodeOffset;
+						int endNodeIndexB = startNodeIndexB+subtreeB.m_subtreeSize;
+
+
+						b3Int2 nodeStack[B3_MAX_STACK_DEPTH];
+						b3Int2 node0;
+						node0.x = startNodeIndexA;
+						node0.y = startNodeIndexB;
+						int maxStackDepth = B3_MAX_STACK_DEPTH;
+						int depth=0;
+						nodeStack[depth++]=node0;
+
+						do
+						{
+							b3Int2 node = nodeStack[--depth];
+
+							b3Float4 aMinLocal = MyUnQuantizeGlobal(quantizedNodes[node.x].m_quantizedAabbMin,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);
+							b3Float4 aMaxLocal = MyUnQuantizeGlobal(quantizedNodes[node.x].m_quantizedAabbMax,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);
+
+							b3Float4 bMinLocal = MyUnQuantizeGlobal(quantizedNodes[node.y].m_quantizedAabbMin,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);
+							b3Float4 bMaxLocal = MyUnQuantizeGlobal(quantizedNodes[node.y].m_quantizedAabbMax,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);
+
+							float margin=0.f;
+							b3Float4 aabbAMinOut,aabbAMaxOut;
+							b3TransformAabb2(aMinLocal,aMaxLocal, margin,posA,ornA,&aabbAMinOut,&aabbAMaxOut);
+
+							b3Float4 aabbBMinOut,aabbBMaxOut;
+							b3TransformAabb2(bMinLocal,bMaxLocal, margin,posB,ornB,&aabbBMinOut,&aabbBMaxOut);
+
+							
+							bool nodeOverlap = b3TestAabbAgainstAabb(aabbAMinOut,aabbAMaxOut,aabbBMinOut,aabbBMaxOut);
+							if (nodeOverlap)
+							{
+								bool isLeafA = isLeafNodeGlobal(&quantizedNodes[node.x]);
+								bool isLeafB = isLeafNodeGlobal(&quantizedNodes[node.y]);
+								bool isInternalA = !isLeafA;
+								bool isInternalB = !isLeafB;
+
+								//fail, even though it might hit two leaf nodes
+								if (depth+4>maxStackDepth && !(isLeafA && isLeafB))
+								{
+									//printf("Error: traversal exceeded maxStackDepth");
+									continue;
+								}
+
+								if(isInternalA)
+								{
+									int nodeAleftChild = node.x+1;
+									bool isNodeALeftChildLeaf = isLeafNodeGlobal(&quantizedNodes[node.x+1]);
+									int nodeArightChild = isNodeALeftChildLeaf? node.x+2 : node.x+1 + getEscapeIndexGlobal(&quantizedNodes[node.x+1]);
+
+									if(isInternalB)
+									{					
+										int nodeBleftChild = node.y+1;
+										bool isNodeBLeftChildLeaf = isLeafNodeGlobal(&quantizedNodes[node.y+1]);
+										int nodeBrightChild = isNodeBLeftChildLeaf? node.y+2 : node.y+1 + getEscapeIndexGlobal(&quantizedNodes[node.y+1]);
+
+										nodeStack[depth++] = b3MakeInt2(nodeAleftChild, nodeBleftChild);
+										nodeStack[depth++] = b3MakeInt2(nodeArightChild, nodeBleftChild);
+										nodeStack[depth++] = b3MakeInt2(nodeAleftChild, nodeBrightChild);
+										nodeStack[depth++] = b3MakeInt2(nodeArightChild, nodeBrightChild);
+									}
+									else
+									{
+										nodeStack[depth++] = b3MakeInt2(nodeAleftChild,node.y);
+										nodeStack[depth++] = b3MakeInt2(nodeArightChild,node.y);
+									}
+								}
+								else
+								{
+									if(isInternalB)
+									{
+										int nodeBleftChild = node.y+1;
+										bool isNodeBLeftChildLeaf = isLeafNodeGlobal(&quantizedNodes[node.y+1]);
+										int nodeBrightChild = isNodeBLeftChildLeaf? node.y+2 : node.y+1 + getEscapeIndexGlobal(&quantizedNodes[node.y+1]);
+										nodeStack[depth++] = b3MakeInt2(node.x,nodeBleftChild);
+										nodeStack[depth++] = b3MakeInt2(node.x,nodeBrightChild);
+									}
+									else
+									{
+										int compoundPairIdx = atomic_inc(numCompoundPairsOut);
+										if (compoundPairIdx<maxNumCompoundPairsCapacity)
+										{
+											int childShapeIndexA = getTriangleIndexGlobal(&quantizedNodes[node.x]);
+											int childShapeIndexB = getTriangleIndexGlobal(&quantizedNodes[node.y]);
+											gpuCompoundPairsOut[compoundPairIdx]  = (int4)(bodyIndexA,bodyIndexB,childShapeIndexA,childShapeIndexB);
+										}
+									}
+								}
+							}
+						} while (depth);
+					}
+				}
+			}
+			
+			return;
+		}
+
+
+
+
+
+		if ((collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) ||(collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))
+		{
+
+			if (collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) 
+			{
+
+				int numChildrenA = collidables[collidableIndexA].m_numChildShapes;
+				for (int c=0;c<numChildrenA;c++)
+				{
+					int childShapeIndexA = collidables[collidableIndexA].m_shapeIndex+c;
+					int childColIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+
+					float4 posA = rigidBodies[bodyIndexA].m_pos;
+					float4 ornA = rigidBodies[bodyIndexA].m_quat;
+					float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+					float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+					float4 newPosA = qtRotate(ornA,childPosA)+posA;
+					float4 newOrnA = qtMul(ornA,childOrnA);
+
+					int shapeIndexA = collidables[childColIndexA].m_shapeIndex;
+					b3Aabb_t aabbAlocal = aabbLocalSpace[shapeIndexA];
+					float margin = 0.f;
+					
+					b3Float4 aabbAMinWS;
+					b3Float4 aabbAMaxWS;
+					
+					b3TransformAabb2(aabbAlocal.m_minVec,aabbAlocal.m_maxVec,margin,
+						newPosA,
+						newOrnA,
+						&aabbAMinWS,&aabbAMaxWS);
+						
+					
+					if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+					{
+						int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+						for (int b=0;b<numChildrenB;b++)
+						{
+							int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex+b;
+							int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+							float4 ornB = rigidBodies[bodyIndexB].m_quat;
+							float4 posB = rigidBodies[bodyIndexB].m_pos;
+							float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+							float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+							float4 newPosB = transform(&childPosB,&posB,&ornB);
+							float4 newOrnB = qtMul(ornB,childOrnB);
+
+							int shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+							b3Aabb_t aabbBlocal = aabbLocalSpace[shapeIndexB];
+							
+							b3Float4 aabbBMinWS;
+							b3Float4 aabbBMaxWS;
+							
+							b3TransformAabb2(aabbBlocal.m_minVec,aabbBlocal.m_maxVec,margin,
+								newPosB,
+								newOrnB,
+								&aabbBMinWS,&aabbBMaxWS);
+								
+								
+							
+							bool aabbOverlap = b3TestAabbAgainstAabb(aabbAMinWS,aabbAMaxWS,aabbBMinWS,aabbBMaxWS);
+							if (aabbOverlap)
+							{
+								int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+								float dmin = FLT_MAX;
+								float4 posA = newPosA;
+								posA.w = 0.f;
+								float4 posB = newPosB;
+								posB.w = 0.f;
+								float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+								float4 ornA = newOrnA;
+								float4 c0 = transform(&c0local, &posA, &ornA);
+								float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+								float4 ornB =newOrnB;
+								float4 c1 = transform(&c1local,&posB,&ornB);
+								const float4 DeltaC2 = c0 - c1;
+
+								{//
+									int compoundPairIdx = atomic_inc(numCompoundPairsOut);
+									if (compoundPairIdx<maxNumCompoundPairsCapacity)
+									{
+										gpuCompoundPairsOut[compoundPairIdx]  = (int4)(bodyIndexA,bodyIndexB,childShapeIndexA,childShapeIndexB);
+									}
+								}//
+							}//fi(1)
+						} //for (int b=0
+					}//if (collidables[collidableIndexB].
+					else//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+					{
+						if (1)
+						{
+							int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+							float dmin = FLT_MAX;
+							float4 posA = newPosA;
+							posA.w = 0.f;
+							float4 posB = rigidBodies[bodyIndexB].m_pos;
+							posB.w = 0.f;
+							float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+							float4 ornA = newOrnA;
+							float4 c0 = transform(&c0local, &posA, &ornA);
+							float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+							float4 ornB = rigidBodies[bodyIndexB].m_quat;
+							float4 c1 = transform(&c1local,&posB,&ornB);
+							const float4 DeltaC2 = c0 - c1;
+
+							{
+								int compoundPairIdx = atomic_inc(numCompoundPairsOut);
+								if (compoundPairIdx<maxNumCompoundPairsCapacity)
+								{
+									gpuCompoundPairsOut[compoundPairIdx] = (int4)(bodyIndexA,bodyIndexB,childShapeIndexA,-1);
+								}//if (compoundPairIdx<maxNumCompoundPairsCapacity)
+							}//
+						}//fi (1)
+					}//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+				}//for (int b=0;b<numChildrenB;b++)	
+				return;
+			}//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+			if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONCAVE_TRIMESH) 
+				&& (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))
+			{
+				int numChildrenB = collidables[collidableIndexB].m_numChildShapes;
+				for (int b=0;b<numChildrenB;b++)
+				{
+					int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex+b;
+					int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+					float4 ornB = rigidBodies[bodyIndexB].m_quat;
+					float4 posB = rigidBodies[bodyIndexB].m_pos;
+					float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+					float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+					float4 newPosB = qtRotate(ornB,childPosB)+posB;
+					float4 newOrnB = qtMul(ornB,childOrnB);
+
+					int shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+
+
+					//////////////////////////////////////
+
+					if (1)
+					{
+						int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+						float dmin = FLT_MAX;
+						float4 posA = rigidBodies[bodyIndexA].m_pos;
+						posA.w = 0.f;
+						float4 posB = newPosB;
+						posB.w = 0.f;
+						float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+						float4 ornA = rigidBodies[bodyIndexA].m_quat;
+						float4 c0 = transform(&c0local, &posA, &ornA);
+						float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+						float4 ornB =newOrnB;
+						float4 c1 = transform(&c1local,&posB,&ornB);
+						const float4 DeltaC2 = c0 - c1;
+						{//
+							int compoundPairIdx = atomic_inc(numCompoundPairsOut);
+							if (compoundPairIdx<maxNumCompoundPairsCapacity)
+							{
+								gpuCompoundPairsOut[compoundPairIdx] = (int4)(bodyIndexA,bodyIndexB,-1,childShapeIndexB);
+							}//fi (compoundPairIdx<maxNumCompoundPairsCapacity)
+						}//
+					}//fi (1)	
+				}//for (int b=0;b<numChildrenB;b++)
+				return;
+			}//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+			return;
+		}//fi ((collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) ||(collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))
+	}//i<numPairs
+}
+
+// work-in-progress
+__kernel void   findSeparatingAxisKernel( __global const int4* pairs, 
+																					__global const BodyData* rigidBodies, 
+																					__global const btCollidableGpu* collidables,
+																					__global const ConvexPolyhedronCL* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const btGpuFace* faces,
+																					__global const int* indices,
+																					__global btAabbCL* aabbs,
+																					__global volatile float4* separatingNormals,
+																					__global volatile int* hasSeparatingAxis,
+																					int numPairs
+																					)
+{
+
+	int i = get_global_id(0);
+	
+	if (i<numPairs)
+	{
+
+	
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+	
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+		
+		
+		//once the broadphase avoids static-static pairs, we can remove this test
+		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))
+		{
+			hasSeparatingAxis[i] = 0;
+			return;
+		}
+		
+
+		if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONVEX_HULL) ||(collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL))
+		{
+			hasSeparatingAxis[i] = 0;
+			return;
+		}
+			
+		if ((collidables[collidableIndexA].m_shapeType==SHAPE_CONCAVE_TRIMESH))
+		{
+			hasSeparatingAxis[i] = 0;
+			return;
+		}
+
+		int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+
+		float dmin = FLT_MAX;
+
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		posA.w = 0.f;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+		posB.w = 0.f;
+		float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 c0 = transform(&c0local, &posA, &ornA);
+		float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		float4 ornB =rigidBodies[bodyIndexB].m_quat;
+		float4 c1 = transform(&c1local,&posB,&ornB);
+		const float4 DeltaC2 = c0 - c1;
+		float4 sepNormal;
+		
+		bool sepA = findSeparatingAxis(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,
+																								posB,ornB,
+																								DeltaC2,
+																								vertices,uniqueEdges,faces,
+																								indices,&sepNormal,&dmin);
+		hasSeparatingAxis[i] = 4;
+		if (!sepA)
+		{
+			hasSeparatingAxis[i] = 0;
+		} else
+		{
+			bool sepB = findSeparatingAxis(	&convexShapes[shapeIndexB],&convexShapes[shapeIndexA],posB,ornB,
+																									posA,ornA,
+																									DeltaC2,
+																									vertices,uniqueEdges,faces,
+																									indices,&sepNormal,&dmin);
+
+			if (!sepB)
+			{
+				hasSeparatingAxis[i] = 0;
+			} else
+			{
+				bool sepEE = findSeparatingAxisEdgeEdge(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,
+																									posB,ornB,
+																									DeltaC2,
+																									vertices,uniqueEdges,faces,
+																									indices,&sepNormal,&dmin);
+				if (!sepEE)
+				{
+					hasSeparatingAxis[i] = 0;
+				} else
+				{
+					hasSeparatingAxis[i] = 1;
+					separatingNormals[i] = sepNormal;
+				}
+			}
+		}
+		
+	}
+
+}
+
+
+__kernel void   findSeparatingAxisVertexFaceKernel( __global const int4* pairs, 
+																					__global const BodyData* rigidBodies, 
+																					__global const btCollidableGpu* collidables,
+																					__global const ConvexPolyhedronCL* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const btGpuFace* faces,
+																					__global const int* indices,
+																					__global btAabbCL* aabbs,
+																					__global volatile float4* separatingNormals,
+																					__global volatile int* hasSeparatingAxis,
+																					__global  float* dmins,
+																					int numPairs
+																					)
+{
+
+	int i = get_global_id(0);
+	
+	if (i<numPairs)
+	{
+
+	
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+	
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+	
+		hasSeparatingAxis[i] = 0;	
+		
+		//once the broadphase avoids static-static pairs, we can remove this test
+		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))
+		{
+			return;
+		}
+		
+
+		if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONVEX_HULL) ||(collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL))
+		{
+			return;
+		}
+			
+
+		int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+
+		float dmin = FLT_MAX;
+
+		dmins[i] = dmin;
+		
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		posA.w = 0.f;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+		posB.w = 0.f;
+		float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 c0 = transform(&c0local, &posA, &ornA);
+		float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		float4 ornB =rigidBodies[bodyIndexB].m_quat;
+		float4 c1 = transform(&c1local,&posB,&ornB);
+		const float4 DeltaC2 = c0 - c1;
+		float4 sepNormal;
+		
+		bool sepA = findSeparatingAxis(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,
+																								posB,ornB,
+																								DeltaC2,
+																								vertices,uniqueEdges,faces,
+																								indices,&sepNormal,&dmin);
+		hasSeparatingAxis[i] = 4;
+		if (!sepA)
+		{
+			hasSeparatingAxis[i] = 0;
+		} else
+		{
+			bool sepB = findSeparatingAxis(	&convexShapes[shapeIndexB],&convexShapes[shapeIndexA],posB,ornB,
+																									posA,ornA,
+																									DeltaC2,
+																									vertices,uniqueEdges,faces,
+																									indices,&sepNormal,&dmin);
+
+			if (sepB)
+			{
+				dmins[i] = dmin;
+				hasSeparatingAxis[i] = 1;
+				separatingNormals[i] = sepNormal;
+			}
+		}
+		
+	}
+
+}
+
+
+__kernel void   findSeparatingAxisEdgeEdgeKernel( __global const int4* pairs, 
+																					__global const BodyData* rigidBodies, 
+																					__global const btCollidableGpu* collidables,
+																					__global const ConvexPolyhedronCL* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const btGpuFace* faces,
+																					__global const int* indices,
+																					__global btAabbCL* aabbs,
+																					__global  float4* separatingNormals,
+																					__global  int* hasSeparatingAxis,
+																					__global  float* dmins,
+																					__global const float4* unitSphereDirections,
+																					int numUnitSphereDirections,
+																					int numPairs
+																					)
+{
+
+	int i = get_global_id(0);
+	
+	if (i<numPairs)
+	{
+
+		if (hasSeparatingAxis[i])
+		{
+	
+			int bodyIndexA = pairs[i].x;
+			int bodyIndexB = pairs[i].y;
+	
+			int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+			int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+		
+			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+			
+			
+			int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+	
+			float dmin = dmins[i];
+	
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+			posA.w = 0.f;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+			posB.w = 0.f;
+			float4 c0local = convexShapes[shapeIndexA].m_localCenter;
+			float4 ornA = rigidBodies[bodyIndexA].m_quat;
+			float4 c0 = transform(&c0local, &posA, &ornA);
+			float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+			float4 ornB =rigidBodies[bodyIndexB].m_quat;
+			float4 c1 = transform(&c1local,&posB,&ornB);
+			const float4 DeltaC2 = c0 - c1;
+			float4 sepNormal = separatingNormals[i];
+			
+			
+			
+			bool sepEE = false;
+			int numEdgeEdgeDirections = convexShapes[shapeIndexA].m_numUniqueEdges*convexShapes[shapeIndexB].m_numUniqueEdges;
+			if (numEdgeEdgeDirections<=numUnitSphereDirections)
+			{
+				sepEE = findSeparatingAxisEdgeEdge(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,
+																									posB,ornB,
+																									DeltaC2,
+																									vertices,uniqueEdges,faces,
+																									indices,&sepNormal,&dmin);
+																									
+					if (!sepEE)
+					{
+						hasSeparatingAxis[i] = 0;
+					} else
+					{
+						hasSeparatingAxis[i] = 1;
+						separatingNormals[i] = sepNormal;
+					}
+			}
+			/*
+			///else case is a separate kernel, to make Mac OSX OpenCL compiler happy
+			else
+			{
+				sepEE = findSeparatingAxisUnitSphere(&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,
+																									posB,ornB,
+																									DeltaC2,
+																									vertices,unitSphereDirections,numUnitSphereDirections,
+																									&sepNormal,&dmin);
+					if (!sepEE)
+					{
+						hasSeparatingAxis[i] = 0;
+					} else
+					{
+						hasSeparatingAxis[i] = 1;
+						separatingNormals[i] = sepNormal;
+					}
+			}
+			*/
+		}		//if (hasSeparatingAxis[i])
+	}//(i<numPairs)
+}
+
+
+
+
+
+inline int	findClippingFaces(const float4 separatingNormal,
+                      const ConvexPolyhedronCL* hullA, 
+					  __global const ConvexPolyhedronCL* hullB,
+                      const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB,
+                       __global float4* worldVertsA1,
+                      __global float4* worldNormalsA1,
+                      __global float4* worldVertsB1,
+                      int capacityWorldVerts,
+                      const float minDist, float maxDist,
+					  const float4* verticesA,
+                      const btGpuFace* facesA,
+                      const int* indicesA,
+					  __global const float4* verticesB,
+                      __global const btGpuFace* facesB,
+                      __global const int* indicesB,
+                      __global int4* clippingFaces, int pairIndex)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1= 0;
+    
+    
+	int closestFaceB=0;
+	float dmax = -FLT_MAX;
+    
+	{
+		for(int face=0;face<hullB->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(facesB[hullB->m_faceOffset+face].m_plane.x,
+                                              facesB[hullB->m_faceOffset+face].m_plane.y, facesB[hullB->m_faceOffset+face].m_plane.z,0.f);
+			const float4 WorldNormal = qtRotate(ornB, Normal);
+			float d = dot3F4(WorldNormal,separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+    
+	{
+		const btGpuFace polyB = facesB[hullB->m_faceOffset+closestFaceB];
+		int numVertices = polyB.m_numIndices;
+        if (numVertices>capacityWorldVerts)
+            numVertices = capacityWorldVerts;
+        
+		for(int e0=0;e0<numVertices;e0++)
+		{
+            if (e0<capacityWorldVerts)
+            {
+                const float4 b = verticesB[hullB->m_vertexOffset+indicesB[polyB.m_indexOffset+e0]];
+                worldVertsB1[pairIndex*capacityWorldVerts+numWorldVertsB1++] = transform(&b,&posB,&ornB);
+            }
+		}
+	}
+    
+    int closestFaceA=0;
+	{
+		float dmin = FLT_MAX;
+		for(int face=0;face<hullA->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(
+                                              facesA[hullA->m_faceOffset+face].m_plane.x,
+                                              facesA[hullA->m_faceOffset+face].m_plane.y,
+                                              facesA[hullA->m_faceOffset+face].m_plane.z,
+                                              0.f);
+			const float4 faceANormalWS = qtRotate(ornA,Normal);
+            
+			float d = dot3F4(faceANormalWS,separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+                worldNormalsA1[pairIndex] = faceANormalWS;
+			}
+		}
+	}
+    
+    int numVerticesA = facesA[hullA->m_faceOffset+closestFaceA].m_numIndices;
+    if (numVerticesA>capacityWorldVerts)
+       numVerticesA = capacityWorldVerts;
+    
+	for(int e0=0;e0<numVerticesA;e0++)
+	{
+        if (e0<capacityWorldVerts)
+        {
+            const float4 a = verticesA[hullA->m_vertexOffset+indicesA[facesA[hullA->m_faceOffset+closestFaceA].m_indexOffset+e0]];
+            worldVertsA1[pairIndex*capacityWorldVerts+e0] = transform(&a, &posA,&ornA);
+        }
+    }
+    
+    clippingFaces[pairIndex].x = closestFaceA;
+    clippingFaces[pairIndex].y = closestFaceB;
+    clippingFaces[pairIndex].z = numVerticesA;
+    clippingFaces[pairIndex].w = numWorldVertsB1;
+    
+    
+	return numContactsOut;
+}
+
+
+
+
+// work-in-progress
+__kernel void   findConcaveSeparatingAxisKernel( __global int4* concavePairs,
+																					__global const BodyData* rigidBodies,
+																					__global const btCollidableGpu* collidables,
+																					__global const ConvexPolyhedronCL* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const btGpuFace* faces,
+																					__global const int* indices,
+																					__global const btGpuChildShape* gpuChildShapes,
+																					__global btAabbCL* aabbs,
+																					__global float4* concaveSeparatingNormalsOut,
+																					__global int* concaveHasSeparatingNormals,
+																					__global int4* clippingFacesOut,
+																					__global float4* worldVertsA1GPU,
+																					__global float4*  worldNormalsAGPU,
+																					__global float4* worldVertsB1GPU,
+																					int vertexFaceCapacity,
+																					int numConcavePairs
+																					)
+{
+
+	int i = get_global_id(0);
+	if (i>=numConcavePairs)
+		return;
+
+	concaveHasSeparatingNormals[i] = 0;
+
+	int pairIdx = i;
+
+	int bodyIndexA = concavePairs[i].x;
+	int bodyIndexB = concavePairs[i].y;
+
+	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+
+	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+
+	if (collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL&&
+		collidables[collidableIndexB].m_shapeType!=SHAPE_COMPOUND_OF_CONVEX_HULLS)
+	{
+		concavePairs[pairIdx].w = -1;
+		return;
+	}
+
+
+
+	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+	int numActualConcaveConvexTests = 0;
+	
+	int f = concavePairs[i].z;
+	
+	bool overlap = false;
+	
+	ConvexPolyhedronCL convexPolyhedronA;
+
+	//add 3 vertices of the triangle
+	convexPolyhedronA.m_numVertices = 3;
+	convexPolyhedronA.m_vertexOffset = 0;
+	float4	localCenter = make_float4(0.f,0.f,0.f,0.f);
+
+	btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];
+	float4 triMinAabb, triMaxAabb;
+	btAabbCL triAabb;
+	triAabb.m_min = make_float4(1e30f,1e30f,1e30f,0.f);
+	triAabb.m_max = make_float4(-1e30f,-1e30f,-1e30f,0.f);
+	
+	float4 verticesA[3];
+	for (int i=0;i<3;i++)
+	{
+		int index = indices[face.m_indexOffset+i];
+		float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];
+		verticesA[i] = vert;
+		localCenter += vert;
+			
+		triAabb.m_min = min(triAabb.m_min,vert);		
+		triAabb.m_max = max(triAabb.m_max,vert);		
+
+	}
+
+	overlap = true;
+	overlap = (triAabb.m_min.x > aabbs[bodyIndexB].m_max.x || triAabb.m_max.x < aabbs[bodyIndexB].m_min.x) ? false : overlap;
+	overlap = (triAabb.m_min.z > aabbs[bodyIndexB].m_max.z || triAabb.m_max.z < aabbs[bodyIndexB].m_min.z) ? false : overlap;
+	overlap = (triAabb.m_min.y > aabbs[bodyIndexB].m_max.y || triAabb.m_max.y < aabbs[bodyIndexB].m_min.y) ? false : overlap;
+		
+	if (overlap)
+	{
+		float dmin = FLT_MAX;
+		int hasSeparatingAxis=5;
+		float4 sepAxis=make_float4(1,2,3,4);
+
+		int localCC=0;
+		numActualConcaveConvexTests++;
+
+		//a triangle has 3 unique edges
+		convexPolyhedronA.m_numUniqueEdges = 3;
+		convexPolyhedronA.m_uniqueEdgesOffset = 0;
+		float4 uniqueEdgesA[3];
+		
+		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);
+		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);
+		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);
+
+
+		convexPolyhedronA.m_faceOffset = 0;
+                                  
+		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);
+                             
+		btGpuFace facesA[TRIANGLE_NUM_CONVEX_FACES];
+		int indicesA[3+3+2+2+2];
+		int curUsedIndices=0;
+		int fidx=0;
+
+		//front size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[0] = 0;
+			indicesA[1] = 1;
+			indicesA[2] = 2;
+			curUsedIndices+=3;
+			float c = face.m_plane.w;
+			facesA[fidx].m_plane.x = normal.x;
+			facesA[fidx].m_plane.y = normal.y;
+			facesA[fidx].m_plane.z = normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+		//back size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[3]=2;
+			indicesA[4]=1;
+			indicesA[5]=0;
+			curUsedIndices+=3;
+			float c = dot(normal,verticesA[0]);
+			float c1 = -face.m_plane.w;
+			facesA[fidx].m_plane.x = -normal.x;
+			facesA[fidx].m_plane.y = -normal.y;
+			facesA[fidx].m_plane.z = -normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+
+		bool addEdgePlanes = true;
+		if (addEdgePlanes)
+		{
+			int numVertices=3;
+			int prevVertex = numVertices-1;
+			for (int i=0;i<numVertices;i++)
+			{
+				float4 v0 = verticesA[i];
+				float4 v1 = verticesA[prevVertex];
+                                            
+				float4 edgeNormal = normalize(cross(normal,v1-v0));
+				float c = -dot(edgeNormal,v0);
+
+				facesA[fidx].m_numIndices = 2;
+				facesA[fidx].m_indexOffset=curUsedIndices;
+				indicesA[curUsedIndices++]=i;
+				indicesA[curUsedIndices++]=prevVertex;
+                                            
+				facesA[fidx].m_plane.x = edgeNormal.x;
+				facesA[fidx].m_plane.y = edgeNormal.y;
+				facesA[fidx].m_plane.z = edgeNormal.z;
+				facesA[fidx].m_plane.w = c;
+				fidx++;
+				prevVertex = i;
+			}
+		}
+		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;
+		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);
+
+
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		posA.w = 0.f;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+		posB.w = 0.f;
+
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 ornB =rigidBodies[bodyIndexB].m_quat;
+
+		
+
+
+		///////////////////
+		///compound shape support
+
+		if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			int compoundChild = concavePairs[pairIdx].w;
+			int childShapeIndexB = compoundChild;//collidables[collidableIndexB].m_shapeIndex+compoundChild;
+			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			float4 newPosB = transform(&childPosB,&posB,&ornB);
+			float4 newOrnB = qtMul(ornB,childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+			shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+		}
+		//////////////////
+
+		float4 c0local = convexPolyhedronA.m_localCenter;
+		float4 c0 = transform(&c0local, &posA, &ornA);
+		float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		float4 c1 = transform(&c1local,&posB,&ornB);
+		const float4 DeltaC2 = c0 - c1;
+
+
+		bool sepA = findSeparatingAxisLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],
+												posA,ornA,
+												posB,ornB,
+												DeltaC2,
+												verticesA,uniqueEdgesA,facesA,indicesA,
+												vertices,uniqueEdges,faces,indices,
+												&sepAxis,&dmin);
+		hasSeparatingAxis = 4;
+		if (!sepA)
+		{
+			hasSeparatingAxis = 0;
+		} else
+		{
+			bool sepB = findSeparatingAxisLocalB(	&convexShapes[shapeIndexB],&convexPolyhedronA,
+												posB,ornB,
+												posA,ornA,
+												DeltaC2,
+												vertices,uniqueEdges,faces,indices,
+												verticesA,uniqueEdgesA,facesA,indicesA,
+												&sepAxis,&dmin);
+
+			if (!sepB)
+			{
+				hasSeparatingAxis = 0;
+			} else
+			{
+				bool sepEE = findSeparatingAxisEdgeEdgeLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],
+															posA,ornA,
+															posB,ornB,
+															DeltaC2,
+															verticesA,uniqueEdgesA,facesA,indicesA,
+															vertices,uniqueEdges,faces,indices,
+															&sepAxis,&dmin);
+	
+				if (!sepEE)
+				{
+					hasSeparatingAxis = 0;
+				} else
+				{
+					hasSeparatingAxis = 1;
+				}
+			}
+		}	
+		
+		if (hasSeparatingAxis)
+		{
+			sepAxis.w = dmin;
+			concaveSeparatingNormalsOut[pairIdx]=sepAxis;
+			concaveHasSeparatingNormals[i]=1;
+
+
+			float minDist = -1e30f;
+			float maxDist = 0.02f;
+
+		
+
+			findClippingFaces(sepAxis,
+                     &convexPolyhedronA,
+					 &convexShapes[shapeIndexB],
+					 posA,ornA,
+					 posB,ornB,
+                      worldVertsA1GPU,
+                      worldNormalsAGPU,
+                      worldVertsB1GPU,
+					  vertexFaceCapacity,
+                      minDist, maxDist,
+                      verticesA,
+                      facesA,
+                      indicesA,
+ 					  vertices,
+                      faces,
+                      indices,
+                      clippingFacesOut, pairIdx);
+
+
+		} else
+		{	
+			//mark this pair as in-active
+			concavePairs[pairIdx].w = -1;
+		}
+	}
+	else
+	{	
+		//mark this pair as in-active
+		concavePairs[pairIdx].w = -1;
+	}
+	
+	concavePairs[pairIdx].z = -1;//now z is used for existing/persistent contacts
+}
+
+
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl
new file mode 100644
index 0000000..f433971
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl
@@ -0,0 +1,1888 @@
+
+#define TRIANGLE_NUM_CONVEX_FACES 5
+
+
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile __global int*
+#endif
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+#define max2 max
+#define min2 min
+
+typedef unsigned int u32;
+
+
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+
+
+#define GET_NPOINTS(x) (x).m_worldNormalOnB.w
+
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define make_float4 (float4)
+#define make_float2 (float2)
+#define make_uint4 (uint4)
+#define make_int4 (int4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+
+__inline
+float fastDiv(float numerator, float denominator)
+{
+	return native_divide(numerator, denominator);	
+//	return numerator/denominator;	
+}
+
+__inline
+float4 fastDiv4(float4 numerator, float4 denominator)
+{
+	return native_divide(numerator, denominator);	
+}
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+
+//#define dot3F4 dot
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	return fast_normalize(v);
+}
+
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+Quaternion qtNormalize(Quaternion in);
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec);
+
+__inline
+Quaternion qtInvert(Quaternion q);
+
+
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtNormalize(Quaternion in)
+{
+	return fastNormalize4(in);
+//	in /= length( in );
+//	return in;
+}
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+__inline
+float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)
+{
+	return qtRotate( *orientation, *p ) + (*translation);
+}
+
+
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = make_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+}
+
+
+__inline float4 lerp3(const float4 a,const float4 b, float  t)
+{
+	return make_float4(	a.x + (b.x - a.x) * t,
+						a.y + (b.y - a.y) * t,
+						a.z + (b.z - a.z) * t,
+						0.f);
+}
+
+
+
+// Clips a face to the back of a plane, return the number of vertices out, stored in ppVtxOut
+int clipFaceGlobal(__global const float4* pVtxIn, int numVertsIn, float4 planeNormalWS,float planeEqWS, __global float4* ppVtxOut)
+{
+	
+	int ve;
+	float ds, de;
+	int numVertsOut = 0;
+    //double-check next test
+    	if (numVertsIn < 2)
+    		return 0;
+    
+	float4 firstVertex=pVtxIn[numVertsIn-1];
+	float4 endVertex = pVtxIn[0];
+	
+	ds = dot3F4(planeNormalWS,firstVertex)+planeEqWS;
+    
+	for (ve = 0; ve < numVertsIn; ve++)
+	{
+		endVertex=pVtxIn[ve];
+		de = dot3F4(planeNormalWS,endVertex)+planeEqWS;
+		if (ds<0)
+		{
+			if (de<0)
+			{
+				// Start < 0, end < 0, so output endVertex
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+			else
+			{
+				// Start < 0, end >= 0, so output intersection
+				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );
+			}
+		}
+		else
+		{
+			if (de<0)
+			{
+				// Start >= 0, end < 0 so output intersection and end
+				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+		}
+		firstVertex = endVertex;
+		ds = de;
+	}
+	return numVertsOut;
+}
+
+
+
+// Clips a face to the back of a plane, return the number of vertices out, stored in ppVtxOut
+int clipFace(const float4* pVtxIn, int numVertsIn, float4 planeNormalWS,float planeEqWS, float4* ppVtxOut)
+{
+	
+	int ve;
+	float ds, de;
+	int numVertsOut = 0;
+//double-check next test
+	if (numVertsIn < 2)
+		return 0;
+
+	float4 firstVertex=pVtxIn[numVertsIn-1];
+	float4 endVertex = pVtxIn[0];
+	
+	ds = dot3F4(planeNormalWS,firstVertex)+planeEqWS;
+
+	for (ve = 0; ve < numVertsIn; ve++)
+	{
+		endVertex=pVtxIn[ve];
+
+		de = dot3F4(planeNormalWS,endVertex)+planeEqWS;
+
+		if (ds<0)
+		{
+			if (de<0)
+			{
+				// Start < 0, end < 0, so output endVertex
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+			else
+			{
+				// Start < 0, end >= 0, so output intersection
+				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );
+			}
+		}
+		else
+		{
+			if (de<0)
+			{
+				// Start >= 0, end < 0 so output intersection and end
+				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );
+				ppVtxOut[numVertsOut++] = endVertex;
+			}
+		}
+		firstVertex = endVertex;
+		ds = de;
+	}
+	return numVertsOut;
+}
+
+
+int clipFaceAgainstHull(const float4 separatingNormal, __global const b3ConvexPolyhedronData_t* hullA,  
+	const float4 posA, const Quaternion ornA, float4* worldVertsB1, int numWorldVertsB1,
+	float4* worldVertsB2, int capacityWorldVertsB2,
+	const float minDist, float maxDist,
+	__global const float4* vertices,
+	__global const b3GpuFace_t* faces,
+	__global const int* indices,
+	float4* contactsOut,
+	int contactCapacity)
+{
+	int numContactsOut = 0;
+
+	float4* pVtxIn = worldVertsB1;
+	float4* pVtxOut = worldVertsB2;
+	
+	int numVertsIn = numWorldVertsB1;
+	int numVertsOut = 0;
+
+	int closestFaceA=-1;
+	{
+		float dmin = FLT_MAX;
+		for(int face=0;face<hullA->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(
+				faces[hullA->m_faceOffset+face].m_plane.x, 
+				faces[hullA->m_faceOffset+face].m_plane.y, 
+				faces[hullA->m_faceOffset+face].m_plane.z,0.f);
+			const float4 faceANormalWS = qtRotate(ornA,Normal);
+		
+			float d = dot3F4(faceANormalWS,separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+			}
+		}
+	}
+	if (closestFaceA<0)
+		return numContactsOut;
+
+	b3GpuFace_t polyA = faces[hullA->m_faceOffset+closestFaceA];
+
+	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+	int numVerticesA = polyA.m_numIndices;
+	for(int e0=0;e0<numVerticesA;e0++)
+	{
+		const float4 a = vertices[hullA->m_vertexOffset+indices[polyA.m_indexOffset+e0]];
+		const float4 b = vertices[hullA->m_vertexOffset+indices[polyA.m_indexOffset+((e0+1)%numVerticesA)]];
+		const float4 edge0 = a - b;
+		const float4 WorldEdge0 = qtRotate(ornA,edge0);
+		float4 planeNormalA = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);
+		float4 worldPlaneAnormal1 = qtRotate(ornA,planeNormalA);
+
+		float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);
+		float4 worldA1 = transform(&a,&posA,&ornA);
+		float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);
+		
+		float4 planeNormalWS = planeNormalWS1;
+		float planeEqWS=planeEqWS1;
+		
+		//clip face
+		//clipFace(*pVtxIn, *pVtxOut,planeNormalWS,planeEqWS);
+		numVertsOut = clipFace(pVtxIn, numVertsIn, planeNormalWS,planeEqWS, pVtxOut);
+
+		//btSwap(pVtxIn,pVtxOut);
+		float4* tmp = pVtxOut;
+		pVtxOut = pVtxIn;
+		pVtxIn = tmp;
+		numVertsIn = numVertsOut;
+		numVertsOut = 0;
+	}
+
+	
+	// only keep points that are behind the witness face
+	{
+		float4 localPlaneNormal  = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);
+		float localPlaneEq = polyA.m_plane.w;
+		float4 planeNormalWS = qtRotate(ornA,localPlaneNormal);
+		float planeEqWS=localPlaneEq-dot3F4(planeNormalWS,posA);
+		for (int i=0;i<numVertsIn;i++)
+		{
+			float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;
+			if (depth <=minDist)
+			{
+				depth = minDist;
+			}
+
+			if (depth <=maxDist)
+			{
+				float4 pointInWorld = pVtxIn[i];
+				//resultOut.addContactPoint(separatingNormal,point,depth);
+				contactsOut[numContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);
+			}
+		}
+	}
+
+	return numContactsOut;
+}
+
+
+
+int clipFaceAgainstHullLocalA(const float4 separatingNormal, const b3ConvexPolyhedronData_t* hullA,  
+	const float4 posA, const Quaternion ornA, float4* worldVertsB1, int numWorldVertsB1,
+	float4* worldVertsB2, int capacityWorldVertsB2,
+	const float minDist, float maxDist,
+	const float4* verticesA,
+	const b3GpuFace_t* facesA,
+	const int* indicesA,
+	__global const float4* verticesB,
+	__global const b3GpuFace_t* facesB,
+	__global const int* indicesB,
+	float4* contactsOut,
+	int contactCapacity)
+{
+	int numContactsOut = 0;
+
+	float4* pVtxIn = worldVertsB1;
+	float4* pVtxOut = worldVertsB2;
+	
+	int numVertsIn = numWorldVertsB1;
+	int numVertsOut = 0;
+
+	int closestFaceA=-1;
+	{
+		float dmin = FLT_MAX;
+		for(int face=0;face<hullA->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(
+				facesA[hullA->m_faceOffset+face].m_plane.x, 
+				facesA[hullA->m_faceOffset+face].m_plane.y, 
+				facesA[hullA->m_faceOffset+face].m_plane.z,0.f);
+			const float4 faceANormalWS = qtRotate(ornA,Normal);
+		
+			float d = dot3F4(faceANormalWS,separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+			}
+		}
+	}
+	if (closestFaceA<0)
+		return numContactsOut;
+
+	b3GpuFace_t polyA = facesA[hullA->m_faceOffset+closestFaceA];
+
+	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+	int numVerticesA = polyA.m_numIndices;
+	for(int e0=0;e0<numVerticesA;e0++)
+	{
+		const float4 a = verticesA[hullA->m_vertexOffset+indicesA[polyA.m_indexOffset+e0]];
+		const float4 b = verticesA[hullA->m_vertexOffset+indicesA[polyA.m_indexOffset+((e0+1)%numVerticesA)]];
+		const float4 edge0 = a - b;
+		const float4 WorldEdge0 = qtRotate(ornA,edge0);
+		float4 planeNormalA = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);
+		float4 worldPlaneAnormal1 = qtRotate(ornA,planeNormalA);
+
+		float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);
+		float4 worldA1 = transform(&a,&posA,&ornA);
+		float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);
+		
+		float4 planeNormalWS = planeNormalWS1;
+		float planeEqWS=planeEqWS1;
+		
+		//clip face
+		//clipFace(*pVtxIn, *pVtxOut,planeNormalWS,planeEqWS);
+		numVertsOut = clipFace(pVtxIn, numVertsIn, planeNormalWS,planeEqWS, pVtxOut);
+
+		//btSwap(pVtxIn,pVtxOut);
+		float4* tmp = pVtxOut;
+		pVtxOut = pVtxIn;
+		pVtxIn = tmp;
+		numVertsIn = numVertsOut;
+		numVertsOut = 0;
+	}
+
+	
+	// only keep points that are behind the witness face
+	{
+		float4 localPlaneNormal  = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);
+		float localPlaneEq = polyA.m_plane.w;
+		float4 planeNormalWS = qtRotate(ornA,localPlaneNormal);
+		float planeEqWS=localPlaneEq-dot3F4(planeNormalWS,posA);
+		for (int i=0;i<numVertsIn;i++)
+		{
+			float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;
+			if (depth <=minDist)
+			{
+				depth = minDist;
+			}
+
+			if (depth <=maxDist)
+			{
+				float4 pointInWorld = pVtxIn[i];
+				//resultOut.addContactPoint(separatingNormal,point,depth);
+				contactsOut[numContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);
+			}
+		}
+	}
+
+	return numContactsOut;
+}
+
+int	clipHullAgainstHull(const float4 separatingNormal,
+	__global const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB, 
+	const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB, 
+	float4* worldVertsB1, float4* worldVertsB2, int capacityWorldVerts,
+	const float minDist, float maxDist,
+	__global const float4* vertices,
+	__global const b3GpuFace_t* faces,
+	__global const int* indices,
+	float4*	localContactsOut,
+	int localContactCapacity)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1= 0;
+
+
+	int closestFaceB=-1;
+	float dmax = -FLT_MAX;
+
+	{
+		for(int face=0;face<hullB->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(faces[hullB->m_faceOffset+face].m_plane.x, 
+				faces[hullB->m_faceOffset+face].m_plane.y, faces[hullB->m_faceOffset+face].m_plane.z,0.f);
+			const float4 WorldNormal = qtRotate(ornB, Normal);
+			float d = dot3F4(WorldNormal,separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+
+	{
+		const b3GpuFace_t polyB = faces[hullB->m_faceOffset+closestFaceB];
+		const int numVertices = polyB.m_numIndices;
+		for(int e0=0;e0<numVertices;e0++)
+		{
+			const float4 b = vertices[hullB->m_vertexOffset+indices[polyB.m_indexOffset+e0]];
+			worldVertsB1[numWorldVertsB1++] = transform(&b,&posB,&ornB);
+		}
+	}
+
+	if (closestFaceB>=0)
+	{
+		numContactsOut = clipFaceAgainstHull(separatingNormal, hullA, 
+				posA,ornA,
+				worldVertsB1,numWorldVertsB1,worldVertsB2,capacityWorldVerts, minDist, maxDist,vertices,
+				faces,
+				indices,localContactsOut,localContactCapacity);
+	}
+
+	return numContactsOut;
+}
+
+
+int	clipHullAgainstHullLocalA(const float4 separatingNormal,
+	const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB, 
+	const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB, 
+	float4* worldVertsB1, float4* worldVertsB2, int capacityWorldVerts,
+	const float minDist, float maxDist,
+	const float4* verticesA,
+	const b3GpuFace_t* facesA,
+	const int* indicesA,
+	__global const float4* verticesB,
+	__global const b3GpuFace_t* facesB,
+	__global const int* indicesB,
+	float4*	localContactsOut,
+	int localContactCapacity)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1= 0;
+
+
+	int closestFaceB=-1;
+	float dmax = -FLT_MAX;
+
+	{
+		for(int face=0;face<hullB->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(facesB[hullB->m_faceOffset+face].m_plane.x, 
+				facesB[hullB->m_faceOffset+face].m_plane.y, facesB[hullB->m_faceOffset+face].m_plane.z,0.f);
+			const float4 WorldNormal = qtRotate(ornB, Normal);
+			float d = dot3F4(WorldNormal,separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+
+	{
+		const b3GpuFace_t polyB = facesB[hullB->m_faceOffset+closestFaceB];
+		const int numVertices = polyB.m_numIndices;
+		for(int e0=0;e0<numVertices;e0++)
+		{
+			const float4 b = verticesB[hullB->m_vertexOffset+indicesB[polyB.m_indexOffset+e0]];
+			worldVertsB1[numWorldVertsB1++] = transform(&b,&posB,&ornB);
+		}
+	}
+
+	if (closestFaceB>=0)
+	{
+		numContactsOut = clipFaceAgainstHullLocalA(separatingNormal, hullA, 
+				posA,ornA,
+				worldVertsB1,numWorldVertsB1,worldVertsB2,capacityWorldVerts, minDist, maxDist,
+				verticesA,facesA,indicesA,
+				verticesB,facesB,indicesB,
+				localContactsOut,localContactCapacity);
+	}
+
+	return numContactsOut;
+}
+
+#define PARALLEL_SUM(v, n) for(int j=1; j<n; j++) v[0] += v[j];
+#define PARALLEL_DO(execution, n) for(int ie=0; ie<n; ie++){execution;}
+#define REDUCE_MAX(v, n) {int i=0;\
+for(int offset=0; offset<n; offset++) v[i] = (v[i].y > v[i+offset].y)? v[i]: v[i+offset]; }
+#define REDUCE_MIN(v, n) {int i=0;\
+for(int offset=0; offset<n; offset++) v[i] = (v[i].y < v[i+offset].y)? v[i]: v[i+offset]; }
+
+int extractManifoldSequentialGlobal(__global const float4* p, int nPoints, float4 nearNormal, int4* contactIdx)
+{
+	if( nPoints == 0 )
+        return 0;
+    
+    if (nPoints <=4)
+        return nPoints;
+    
+    
+    if (nPoints >64)
+        nPoints = 64;
+    
+	float4 center = make_float4(0.f);
+	{
+		
+		for (int i=0;i<nPoints;i++)
+			center += p[i];
+		center /= (float)nPoints;
+	}
+    
+	
+    
+	//	sample 4 directions
+    
+    float4 aVector = p[0] - center;
+    float4 u = cross3( nearNormal, aVector );
+    float4 v = cross3( nearNormal, u );
+    u = normalize3( u );
+    v = normalize3( v );
+    
+    
+    //keep point with deepest penetration
+    float minW= FLT_MAX;
+    
+    int minIndex=-1;
+    
+    float4 maxDots;
+    maxDots.x = FLT_MIN;
+    maxDots.y = FLT_MIN;
+    maxDots.z = FLT_MIN;
+    maxDots.w = FLT_MIN;
+    
+    //	idx, distance
+    for(int ie = 0; ie<nPoints; ie++ )
+    {
+        if (p[ie].w<minW)
+        {
+            minW = p[ie].w;
+            minIndex=ie;
+        }
+        float f;
+        float4 r = p[ie]-center;
+        f = dot3F4( u, r );
+        if (f<maxDots.x)
+        {
+            maxDots.x = f;
+            contactIdx[0].x = ie;
+        }
+        
+        f = dot3F4( -u, r );
+        if (f<maxDots.y)
+        {
+            maxDots.y = f;
+            contactIdx[0].y = ie;
+        }
+        
+        
+        f = dot3F4( v, r );
+        if (f<maxDots.z)
+        {
+            maxDots.z = f;
+            contactIdx[0].z = ie;
+        }
+        
+        f = dot3F4( -v, r );
+        if (f<maxDots.w)
+        {
+            maxDots.w = f;
+            contactIdx[0].w = ie;
+        }
+        
+    }
+    
+    if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)
+    {
+        //replace the first contact with minimum (todo: replace contact with least penetration)
+        contactIdx[0].x = minIndex;
+    }
+    
+    return 4;
+    
+}
+
+
+int extractManifoldSequentialGlobalFake(__global const float4* p, int nPoints, float4 nearNormal, int* contactIdx)
+{
+    contactIdx[0] = 0;
+    contactIdx[1] = 1;
+    contactIdx[2] = 2;
+    contactIdx[3] = 3;
+    
+	if( nPoints == 0 ) return 0;
+    
+	nPoints = min2( nPoints, 4 );
+    return nPoints;
+    
+}
+
+
+
+int extractManifoldSequential(const float4* p, int nPoints, float4 nearNormal, int* contactIdx)
+{
+	if( nPoints == 0 ) return 0;
+
+	nPoints = min2( nPoints, 64 );
+
+	float4 center = make_float4(0.f);
+	{
+		float4 v[64];
+		for (int i=0;i<nPoints;i++)
+			v[i] = p[i];
+		//memcpy( v, p, nPoints*sizeof(float4) );
+		PARALLEL_SUM( v, nPoints );
+		center = v[0]/(float)nPoints;
+	}
+
+	
+
+	{	//	sample 4 directions
+		if( nPoints < 4 )
+		{
+			for(int i=0; i<nPoints; i++) 
+				contactIdx[i] = i;
+			return nPoints;
+		}
+
+		float4 aVector = p[0] - center;
+		float4 u = cross3( nearNormal, aVector );
+		float4 v = cross3( nearNormal, u );
+		u = normalize3( u );
+		v = normalize3( v );
+
+		int idx[4];
+
+		float2 max00 = make_float2(0,FLT_MAX);
+		{
+			//	idx, distance
+			{
+				{
+					int4 a[64];
+					for(int ie = 0; ie<nPoints; ie++ )
+					{
+						
+						
+						float f;
+						float4 r = p[ie]-center;
+						f = dot3F4( u, r );
+						a[ie].x = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);
+
+						f = dot3F4( -u, r );
+						a[ie].y = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);
+
+						f = dot3F4( v, r );
+						a[ie].z = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);
+
+						f = dot3F4( -v, r );
+						a[ie].w = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);
+					}
+
+					for(int ie=0; ie<nPoints; ie++)
+					{
+						a[0].x = (a[0].x > a[ie].x )? a[0].x: a[ie].x;
+						a[0].y = (a[0].y > a[ie].y )? a[0].y: a[ie].y;
+						a[0].z = (a[0].z > a[ie].z )? a[0].z: a[ie].z;
+						a[0].w = (a[0].w > a[ie].w )? a[0].w: a[ie].w;
+					}
+
+					idx[0] = (int)a[0].x & 0xff;
+					idx[1] = (int)a[0].y & 0xff;
+					idx[2] = (int)a[0].z & 0xff;
+					idx[3] = (int)a[0].w & 0xff;
+				}
+			}
+
+			{
+				float2 h[64];
+				PARALLEL_DO( h[ie] = make_float2((float)ie, p[ie].w), nPoints );
+				REDUCE_MIN( h, nPoints );
+				max00 = h[0];
+			}
+		}
+
+		contactIdx[0] = idx[0];
+		contactIdx[1] = idx[1];
+		contactIdx[2] = idx[2];
+		contactIdx[3] = idx[3];
+
+
+		return 4;
+	}
+}
+
+
+
+__kernel void   extractManifoldAndAddContactKernel(__global const int4* pairs, 
+																	__global const b3RigidBodyData_t* rigidBodies, 
+																	__global const float4* closestPointsWorld,
+																	__global const float4* separatingNormalsWorld,
+																	__global const int* contactCounts,
+																	__global const int* contactOffsets,
+																	__global struct b3Contact4Data* restrict contactsOut,
+																	counter32_t nContactsOut,
+																	int contactCapacity,
+																	int numPairs,
+																	int pairIndex
+																	)
+{
+	int idx = get_global_id(0);
+	
+	if (idx<numPairs)
+	{
+		float4 normal = separatingNormalsWorld[idx];
+		int nPoints = contactCounts[idx];
+		__global const float4* pointsIn = &closestPointsWorld[contactOffsets[idx]];
+		float4 localPoints[64];
+		for (int i=0;i<nPoints;i++)
+		{
+			localPoints[i] = pointsIn[i];
+		}
+
+		int contactIdx[4];// = {-1,-1,-1,-1};
+		contactIdx[0] = -1;
+		contactIdx[1] = -1;
+		contactIdx[2] = -1;
+		contactIdx[3] = -1;
+
+		int nContacts = extractManifoldSequential(localPoints, nPoints, normal, contactIdx);
+
+		int dstIdx;
+		AppendInc( nContactsOut, dstIdx );
+		if (dstIdx<contactCapacity)
+		{
+			__global struct b3Contact4Data* c = contactsOut + dstIdx;
+			c->m_worldNormalOnB = -normal;
+			c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+			c->m_batchIdx = idx;
+			int bodyA = pairs[pairIndex].x;
+			int bodyB = pairs[pairIndex].y;
+			c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0 ? -bodyA:bodyA;
+			c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0 ? -bodyB:bodyB;
+			c->m_childIndexA = -1;
+			c->m_childIndexB = -1;
+			for (int i=0;i<nContacts;i++)
+			{
+				c->m_worldPosB[i] = localPoints[contactIdx[i]];
+			}
+			GET_NPOINTS(*c) = nContacts;
+		}
+	}
+}
+
+
+void	trInverse(float4 translationIn, Quaternion orientationIn,
+		float4* translationOut, Quaternion* orientationOut)
+{
+	*orientationOut = qtInvert(orientationIn);
+	*translationOut = qtRotate(*orientationOut, -translationIn);
+}
+
+void	trMul(float4 translationA, Quaternion orientationA,
+						float4 translationB, Quaternion orientationB,
+		float4* translationOut, Quaternion* orientationOut)
+{
+	*orientationOut = qtMul(orientationA,orientationB);
+	*translationOut = transform(&translationB,&translationA,&orientationA);
+}
+
+
+
+
+__kernel void   clipHullHullKernel( __global int4* pairs, 
+																					__global const b3RigidBodyData_t* rigidBodies, 
+																					__global const b3Collidable_t* collidables,
+																					__global const b3ConvexPolyhedronData_t* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const b3GpuFace_t* faces,
+																					__global const int* indices,
+																					__global const float4* separatingNormals,
+																					__global const int* hasSeparatingAxis,
+																					__global struct b3Contact4Data* restrict globalContactsOut,
+																					counter32_t nGlobalContactsOut,
+																					int numPairs,
+																					int contactCapacity)
+{
+
+	int i = get_global_id(0);
+	int pairIndex = i;
+	
+	float4 worldVertsB1[64];
+	float4 worldVertsB2[64];
+	int capacityWorldVerts = 64;	
+
+	float4 localContactsOut[64];
+	int localContactCapacity=64;
+	
+	float minDist = -1e30f;
+	float maxDist = 0.02f;
+
+	if (i<numPairs)
+	{
+
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+			
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+
+		if (hasSeparatingAxis[i])
+		{
+
+			
+			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+			
+
+
+		
+			int numLocalContactsOut = clipHullAgainstHull(separatingNormals[i],
+														&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],
+														rigidBodies[bodyIndexA].m_pos,rigidBodies[bodyIndexA].m_quat,
+													  rigidBodies[bodyIndexB].m_pos,rigidBodies[bodyIndexB].m_quat,
+													  worldVertsB1,worldVertsB2,capacityWorldVerts,
+														minDist, maxDist,
+														vertices,faces,indices,
+														localContactsOut,localContactCapacity);
+												
+		if (numLocalContactsOut>0)
+		{
+				float4 normal = -separatingNormals[i];
+				int nPoints = numLocalContactsOut;
+				float4* pointsIn = localContactsOut;
+				int contactIdx[4];// = {-1,-1,-1,-1};
+
+				contactIdx[0] = -1;
+				contactIdx[1] = -1;
+				contactIdx[2] = -1;
+				contactIdx[3] = -1;
+		
+				int nReducedContacts = extractManifoldSequential(pointsIn, nPoints, normal, contactIdx);
+		
+				
+				int mprContactIndex = pairs[pairIndex].z;
+
+				int dstIdx = mprContactIndex;
+				if (dstIdx<0)
+				{
+					AppendInc( nGlobalContactsOut, dstIdx );
+				}
+
+				if (dstIdx<contactCapacity)
+				{
+					pairs[pairIndex].z = dstIdx;
+
+					__global struct b3Contact4Data* c = globalContactsOut+ dstIdx;
+					c->m_worldNormalOnB = -normal;
+					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+					c->m_batchIdx = pairIndex;
+					int bodyA = pairs[pairIndex].x;
+					int bodyB = pairs[pairIndex].y;
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;
+					c->m_childIndexA = -1;
+					c->m_childIndexB = -1;
+
+					for (int i=0;i<nReducedContacts;i++)
+					{
+					//this condition means: overwrite contact point, unless at index i==0 we have a valid 'mpr' contact
+						if (i>0||(mprContactIndex<0))
+						{
+							c->m_worldPosB[i] = pointsIn[contactIdx[i]];
+						}
+					}
+					GET_NPOINTS(*c) = nReducedContacts;
+				}
+				
+			}//		if (numContactsOut>0)
+		}//		if (hasSeparatingAxis[i])
+	}//	if (i<numPairs)
+
+}
+
+
+__kernel void   clipCompoundsHullHullKernel( __global const int4* gpuCompoundPairs, 
+																					__global const b3RigidBodyData_t* rigidBodies, 
+																					__global const b3Collidable_t* collidables,
+																					__global const b3ConvexPolyhedronData_t* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const b3GpuFace_t* faces,
+																					__global const int* indices,
+																					__global const b3GpuChildShape_t* gpuChildShapes,
+																					__global const float4* gpuCompoundSepNormalsOut,
+																					__global const int* gpuHasCompoundSepNormalsOut,
+																					__global struct b3Contact4Data* restrict globalContactsOut,
+																					counter32_t nGlobalContactsOut,
+																					int numCompoundPairs, int maxContactCapacity)
+{
+
+	int i = get_global_id(0);
+	int pairIndex = i;
+	
+	float4 worldVertsB1[64];
+	float4 worldVertsB2[64];
+	int capacityWorldVerts = 64;	
+
+	float4 localContactsOut[64];
+	int localContactCapacity=64;
+	
+	float minDist = -1e30f;
+	float maxDist = 0.02f;
+
+	if (i<numCompoundPairs)
+	{
+
+		if (gpuHasCompoundSepNormalsOut[i])
+		{
+
+			int bodyIndexA = gpuCompoundPairs[i].x;
+			int bodyIndexB = gpuCompoundPairs[i].y;
+			
+			int childShapeIndexA = gpuCompoundPairs[i].z;
+			int childShapeIndexB = gpuCompoundPairs[i].w;
+			
+			int collidableIndexA = -1;
+			int collidableIndexB = -1;
+			
+			float4 ornA = rigidBodies[bodyIndexA].m_quat;
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+			
+			float4 ornB = rigidBodies[bodyIndexB].m_quat;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+								
+			if (childShapeIndexA >= 0)
+			{
+				collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;
+				float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;
+				float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;
+				float4 newPosA = qtRotate(ornA,childPosA)+posA;
+				float4 newOrnA = qtMul(ornA,childOrnA);
+				posA = newPosA;
+				ornA = newOrnA;
+			} else
+			{
+				collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+			}
+			
+			if (childShapeIndexB>=0)
+			{
+				collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+				float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+				float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+				float4 newPosB = transform(&childPosB,&posB,&ornB);
+				float4 newOrnB = qtMul(ornB,childOrnB);
+				posB = newPosB;
+				ornB = newOrnB;
+			} else
+			{
+				collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;	
+			}
+			
+			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+		
+			int numLocalContactsOut = clipHullAgainstHull(gpuCompoundSepNormalsOut[i],
+														&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],
+														posA,ornA,
+													  posB,ornB,
+													  worldVertsB1,worldVertsB2,capacityWorldVerts,
+														minDist, maxDist,
+														vertices,faces,indices,
+														localContactsOut,localContactCapacity);
+												
+		if (numLocalContactsOut>0)
+		{
+				float4 normal = -gpuCompoundSepNormalsOut[i];
+				int nPoints = numLocalContactsOut;
+				float4* pointsIn = localContactsOut;
+				int contactIdx[4];// = {-1,-1,-1,-1};
+
+				contactIdx[0] = -1;
+				contactIdx[1] = -1;
+				contactIdx[2] = -1;
+				contactIdx[3] = -1;
+		
+				int nReducedContacts = extractManifoldSequential(pointsIn, nPoints, normal, contactIdx);
+		
+				int dstIdx;
+				AppendInc( nGlobalContactsOut, dstIdx );
+				if ((dstIdx+nReducedContacts) < maxContactCapacity)
+				{
+					__global struct b3Contact4Data* c = globalContactsOut+ dstIdx;
+					c->m_worldNormalOnB = -normal;
+					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+					c->m_batchIdx = pairIndex;
+					int bodyA = gpuCompoundPairs[pairIndex].x;
+					int bodyB = gpuCompoundPairs[pairIndex].y;
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;
+					c->m_childIndexA = childShapeIndexA;
+					c->m_childIndexB = childShapeIndexB;
+					for (int i=0;i<nReducedContacts;i++)
+					{
+						c->m_worldPosB[i] = pointsIn[contactIdx[i]];
+					}
+					GET_NPOINTS(*c) = nReducedContacts;
+				}
+				
+			}//		if (numContactsOut>0)
+		}//		if (gpuHasCompoundSepNormalsOut[i])
+	}//	if (i<numCompoundPairs)
+
+}
+
+
+
+__kernel void   sphereSphereCollisionKernel( __global const int4* pairs, 
+																					__global const b3RigidBodyData_t* rigidBodies, 
+																					__global const b3Collidable_t* collidables,
+																					__global const float4* separatingNormals,
+																					__global const int* hasSeparatingAxis,
+																					__global struct b3Contact4Data* restrict globalContactsOut,
+																					counter32_t nGlobalContactsOut,
+																					int contactCapacity,
+																					int numPairs)
+{
+
+	int i = get_global_id(0);
+	int pairIndex = i;
+	
+	if (i<numPairs)
+	{
+		int bodyIndexA = pairs[i].x;
+		int bodyIndexB = pairs[i].y;
+			
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+
+		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&
+			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)
+		{
+			//sphere-sphere
+			float radiusA = collidables[collidableIndexA].m_radius;
+			float radiusB = collidables[collidableIndexB].m_radius;
+			float4 posA = rigidBodies[bodyIndexA].m_pos;
+			float4 posB = rigidBodies[bodyIndexB].m_pos;
+
+			float4 diff = posA-posB;
+			float len = length(diff);
+			
+			///iff distance positive, don't generate a new contact
+			if ( len <= (radiusA+radiusB))
+			{
+				///distance (negative means penetration)
+				float dist = len - (radiusA+radiusB);
+				float4 normalOnSurfaceB = make_float4(1.f,0.f,0.f,0.f);
+				if (len > 0.00001)
+				{
+					normalOnSurfaceB = diff / len;
+				}
+				float4 contactPosB = posB + normalOnSurfaceB*radiusB;
+				contactPosB.w = dist;
+								
+				int dstIdx;
+				AppendInc( nGlobalContactsOut, dstIdx );
+				if (dstIdx < contactCapacity)
+				{
+					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+					c->m_worldNormalOnB = -normalOnSurfaceB;
+					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+					c->m_batchIdx = pairIndex;
+					int bodyA = pairs[pairIndex].x;
+					int bodyB = pairs[pairIndex].y;
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;
+					c->m_worldPosB[0] = contactPosB;
+					c->m_childIndexA = -1;
+					c->m_childIndexB = -1;
+
+					GET_NPOINTS(*c) = 1;
+				}//if (dstIdx < numPairs)
+			}//if ( len <= (radiusA+radiusB))
+		}//SHAPE_SPHERE SHAPE_SPHERE
+	}//if (i<numPairs)
+}				
+
+__kernel void   clipHullHullConcaveConvexKernel( __global int4* concavePairsIn,
+																					__global const b3RigidBodyData_t* rigidBodies, 
+																					__global const b3Collidable_t* collidables,
+																					__global const b3ConvexPolyhedronData_t* convexShapes, 
+																					__global const float4* vertices,
+																					__global const float4* uniqueEdges,
+																					__global const b3GpuFace_t* faces,
+																					__global const int* indices,
+																					__global const b3GpuChildShape_t* gpuChildShapes,
+																					__global const float4* separatingNormals,
+																					__global struct b3Contact4Data* restrict globalContactsOut,
+																					counter32_t nGlobalContactsOut,
+																					int contactCapacity,
+																					int numConcavePairs)
+{
+
+	int i = get_global_id(0);
+	int pairIndex = i;
+	
+	float4 worldVertsB1[64];
+	float4 worldVertsB2[64];
+	int capacityWorldVerts = 64;	
+
+	float4 localContactsOut[64];
+	int localContactCapacity=64;
+	
+	float minDist = -1e30f;
+	float maxDist = 0.02f;
+
+	if (i<numConcavePairs)
+	{
+		//negative value means that the pair is invalid
+		if (concavePairsIn[i].w<0)
+			return;
+
+		int bodyIndexA = concavePairsIn[i].x;
+		int bodyIndexB = concavePairsIn[i].y;
+		int f = concavePairsIn[i].z;
+		int childShapeIndexA = f;
+		
+		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+		
+		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+		
+		///////////////////////////////////////////////////////////////
+		
+	
+		bool overlap = false;
+		
+		b3ConvexPolyhedronData_t convexPolyhedronA;
+
+	//add 3 vertices of the triangle
+		convexPolyhedronA.m_numVertices = 3;
+		convexPolyhedronA.m_vertexOffset = 0;
+		float4	localCenter = make_float4(0.f,0.f,0.f,0.f);
+
+		b3GpuFace_t face = faces[convexShapes[shapeIndexA].m_faceOffset+f];
+		
+		float4 verticesA[3];
+		for (int i=0;i<3;i++)
+		{
+			int index = indices[face.m_indexOffset+i];
+			float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];
+			verticesA[i] = vert;
+			localCenter += vert;
+		}
+
+		float dmin = FLT_MAX;
+
+		int localCC=0;
+
+		//a triangle has 3 unique edges
+		convexPolyhedronA.m_numUniqueEdges = 3;
+		convexPolyhedronA.m_uniqueEdgesOffset = 0;
+		float4 uniqueEdgesA[3];
+		
+		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);
+		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);
+		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);
+
+
+		convexPolyhedronA.m_faceOffset = 0;
+                                  
+		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);
+                             
+		b3GpuFace_t facesA[TRIANGLE_NUM_CONVEX_FACES];
+		int indicesA[3+3+2+2+2];
+		int curUsedIndices=0;
+		int fidx=0;
+
+		//front size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[0] = 0;
+			indicesA[1] = 1;
+			indicesA[2] = 2;
+			curUsedIndices+=3;
+			float c = face.m_plane.w;
+			facesA[fidx].m_plane.x = normal.x;
+			facesA[fidx].m_plane.y = normal.y;
+			facesA[fidx].m_plane.z = normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+		//back size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[3]=2;
+			indicesA[4]=1;
+			indicesA[5]=0;
+			curUsedIndices+=3;
+			float c = dot3F4(normal,verticesA[0]);
+			float c1 = -face.m_plane.w;
+			facesA[fidx].m_plane.x = -normal.x;
+			facesA[fidx].m_plane.y = -normal.y;
+			facesA[fidx].m_plane.z = -normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+
+		bool addEdgePlanes = true;
+		if (addEdgePlanes)
+		{
+			int numVertices=3;
+			int prevVertex = numVertices-1;
+			for (int i=0;i<numVertices;i++)
+			{
+				float4 v0 = verticesA[i];
+				float4 v1 = verticesA[prevVertex];
+                                            
+				float4 edgeNormal = normalize(cross(normal,v1-v0));
+				float c = -dot3F4(edgeNormal,v0);
+
+				facesA[fidx].m_numIndices = 2;
+				facesA[fidx].m_indexOffset=curUsedIndices;
+				indicesA[curUsedIndices++]=i;
+				indicesA[curUsedIndices++]=prevVertex;
+                                            
+				facesA[fidx].m_plane.x = edgeNormal.x;
+				facesA[fidx].m_plane.y = edgeNormal.y;
+				facesA[fidx].m_plane.z = edgeNormal.z;
+				facesA[fidx].m_plane.w = c;
+				fidx++;
+				prevVertex = i;
+			}
+		}
+		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;
+		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);
+
+
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		posA.w = 0.f;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+		posB.w = 0.f;
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 ornB =rigidBodies[bodyIndexB].m_quat;
+
+
+		float4 sepAxis = separatingNormals[i];
+		
+		int shapeTypeB = collidables[collidableIndexB].m_shapeType;
+		int childShapeIndexB =-1;
+		if (shapeTypeB==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			///////////////////
+			///compound shape support
+			
+			childShapeIndexB = concavePairsIn[pairIndex].w;
+			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			float4 newPosB = transform(&childPosB,&posB,&ornB);
+			float4 newOrnB = qtMul(ornB,childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+			
+		}
+		
+		////////////////////////////////////////
+		
+		
+		
+		int numLocalContactsOut = clipHullAgainstHullLocalA(sepAxis,
+														&convexPolyhedronA, &convexShapes[shapeIndexB],
+														posA,ornA,
+													  posB,ornB,
+													  worldVertsB1,worldVertsB2,capacityWorldVerts,
+														minDist, maxDist,
+														&verticesA,&facesA,&indicesA,
+														vertices,faces,indices,
+														localContactsOut,localContactCapacity);
+												
+		if (numLocalContactsOut>0)
+		{
+			float4 normal = -separatingNormals[i];
+			int nPoints = numLocalContactsOut;
+			float4* pointsIn = localContactsOut;
+			int contactIdx[4];// = {-1,-1,-1,-1};
+
+			contactIdx[0] = -1;
+			contactIdx[1] = -1;
+			contactIdx[2] = -1;
+			contactIdx[3] = -1;
+	
+			int nReducedContacts = extractManifoldSequential(pointsIn, nPoints, normal, contactIdx);
+	
+			int dstIdx;
+			AppendInc( nGlobalContactsOut, dstIdx );
+			if (dstIdx<contactCapacity)
+			{
+				__global struct b3Contact4Data* c = globalContactsOut+ dstIdx;
+				c->m_worldNormalOnB = -normal;
+				c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+				c->m_batchIdx = pairIndex;
+				int bodyA = concavePairsIn[pairIndex].x;
+				int bodyB = concavePairsIn[pairIndex].y;
+				c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;
+				c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;
+				c->m_childIndexA = childShapeIndexA;
+				c->m_childIndexB = childShapeIndexB;
+				for (int i=0;i<nReducedContacts;i++)
+				{
+					c->m_worldPosB[i] = pointsIn[contactIdx[i]];
+				}
+				GET_NPOINTS(*c) = nReducedContacts;
+			}
+				
+		}//		if (numContactsOut>0)
+	}//	if (i<numPairs)
+}
+
+
+
+
+
+
+int	findClippingFaces(const float4 separatingNormal,
+                      __global const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB,
+                      const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB,
+                       __global float4* worldVertsA1,
+                      __global float4* worldNormalsA1,
+                      __global float4* worldVertsB1,
+                      int capacityWorldVerts,
+                      const float minDist, float maxDist,
+                      __global const float4* vertices,
+                      __global const b3GpuFace_t* faces,
+                      __global const int* indices,
+                      __global int4* clippingFaces, int pairIndex)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1= 0;
+    
+    
+	int closestFaceB=-1;
+	float dmax = -FLT_MAX;
+    
+	{
+		for(int face=0;face<hullB->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(faces[hullB->m_faceOffset+face].m_plane.x,
+                                              faces[hullB->m_faceOffset+face].m_plane.y, faces[hullB->m_faceOffset+face].m_plane.z,0.f);
+			const float4 WorldNormal = qtRotate(ornB, Normal);
+			float d = dot3F4(WorldNormal,separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+    
+	{
+		const b3GpuFace_t polyB = faces[hullB->m_faceOffset+closestFaceB];
+		const int numVertices = polyB.m_numIndices;
+		for(int e0=0;e0<numVertices;e0++)
+		{
+			const float4 b = vertices[hullB->m_vertexOffset+indices[polyB.m_indexOffset+e0]];
+			worldVertsB1[pairIndex*capacityWorldVerts+numWorldVertsB1++] = transform(&b,&posB,&ornB);
+		}
+	}
+    
+    int closestFaceA=-1;
+	{
+		float dmin = FLT_MAX;
+		for(int face=0;face<hullA->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(
+                                              faces[hullA->m_faceOffset+face].m_plane.x,
+                                              faces[hullA->m_faceOffset+face].m_plane.y,
+                                              faces[hullA->m_faceOffset+face].m_plane.z,
+                                              0.f);
+			const float4 faceANormalWS = qtRotate(ornA,Normal);
+            
+			float d = dot3F4(faceANormalWS,separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+                worldNormalsA1[pairIndex] = faceANormalWS;
+			}
+		}
+	}
+    
+    int numVerticesA = faces[hullA->m_faceOffset+closestFaceA].m_numIndices;
+	for(int e0=0;e0<numVerticesA;e0++)
+	{
+        const float4 a = vertices[hullA->m_vertexOffset+indices[faces[hullA->m_faceOffset+closestFaceA].m_indexOffset+e0]];
+        worldVertsA1[pairIndex*capacityWorldVerts+e0] = transform(&a, &posA,&ornA);
+    }
+    
+    clippingFaces[pairIndex].x = closestFaceA;
+    clippingFaces[pairIndex].y = closestFaceB;
+    clippingFaces[pairIndex].z = numVerticesA;
+    clippingFaces[pairIndex].w = numWorldVertsB1;
+    
+    
+	return numContactsOut;
+}
+
+
+
+int clipFaces(__global float4* worldVertsA1,
+              __global float4* worldNormalsA1,
+              __global float4* worldVertsB1,
+              __global float4* worldVertsB2, 
+              int capacityWorldVertsB2,
+              const float minDist, float maxDist,
+              __global int4* clippingFaces,
+              int pairIndex)
+{
+	int numContactsOut = 0;
+    
+    int closestFaceA = clippingFaces[pairIndex].x;
+    int closestFaceB = clippingFaces[pairIndex].y;
+	int numVertsInA = clippingFaces[pairIndex].z;
+	int numVertsInB = clippingFaces[pairIndex].w;
+    
+	int numVertsOut = 0;
+    
+	if (closestFaceA<0)
+		return numContactsOut;
+    
+    __global float4* pVtxIn = &worldVertsB1[pairIndex*capacityWorldVertsB2];
+    __global float4* pVtxOut = &worldVertsB2[pairIndex*capacityWorldVertsB2];
+    
+    
+	
+	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+    
+	for(int e0=0;e0<numVertsInA;e0++)
+	{
+		const float4 aw = worldVertsA1[pairIndex*capacityWorldVertsB2+e0];
+		const float4 bw = worldVertsA1[pairIndex*capacityWorldVertsB2+((e0+1)%numVertsInA)];
+		const float4 WorldEdge0 = aw - bw;
+		float4 worldPlaneAnormal1 = worldNormalsA1[pairIndex];
+		float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);
+		float4 worldA1 = aw;
+		float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);
+		float4 planeNormalWS = planeNormalWS1;
+		float planeEqWS=planeEqWS1;
+		numVertsOut = clipFaceGlobal(pVtxIn, numVertsInB, planeNormalWS,planeEqWS, pVtxOut);
+		__global float4* tmp = pVtxOut;
+		pVtxOut = pVtxIn;
+		pVtxIn = tmp;
+		numVertsInB = numVertsOut;
+		numVertsOut = 0;
+	}
+    
+    //float4 planeNormalWS = worldNormalsA1[pairIndex];
+    //float planeEqWS=-dot3F4(planeNormalWS,worldVertsA1[pairIndex*capacityWorldVertsB2]);
+
+
+    
+    /*for (int i=0;i<numVertsInB;i++)
+    {
+        pVtxOut[i] = pVtxIn[i];
+    }*/
+    
+    
+    
+    
+    //numVertsInB=0;
+	
+    float4 planeNormalWS = worldNormalsA1[pairIndex];
+    float planeEqWS=-dot3F4(planeNormalWS,worldVertsA1[pairIndex*capacityWorldVertsB2]);
+
+    for (int i=0;i<numVertsInB;i++)
+    {
+        float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;
+        if (depth <=minDist)
+        {
+            depth = minDist;
+        }
+        
+        if (depth <=maxDist)
+        {
+            float4 pointInWorld = pVtxIn[i];
+            pVtxOut[numContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);
+        }
+    }
+   
+    clippingFaces[pairIndex].w =numContactsOut;
+   
+    
+	return numContactsOut;
+
+}
+
+
+
+
+__kernel void   findClippingFacesKernel(  __global const int4* pairs,
+                                        __global const b3RigidBodyData_t* rigidBodies,
+                                        __global const b3Collidable_t* collidables,
+                                        __global const b3ConvexPolyhedronData_t* convexShapes,
+                                        __global const float4* vertices,
+                                        __global const float4* uniqueEdges,
+                                        __global const b3GpuFace_t* faces,
+                                        __global const int* indices,
+                                        __global const float4* separatingNormals,
+                                        __global const int* hasSeparatingAxis,
+                                        __global int4* clippingFacesOut,
+                                        __global float4* worldVertsA1,
+                                        __global float4* worldNormalsA1,
+                                        __global float4* worldVertsB1,
+                                        int capacityWorldVerts,
+                                        int numPairs
+                                        )
+{
+    
+	int i = get_global_id(0);
+	int pairIndex = i;
+    
+	
+	float minDist = -1e30f;
+	float maxDist = 0.02f;
+    
+	if (i<numPairs)
+	{
+        
+		if (hasSeparatingAxis[i])
+		{
+            
+			int bodyIndexA = pairs[i].x;
+			int bodyIndexB = pairs[i].y;
+			
+			int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+			int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+			
+			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+			
+            
+            
+			int numLocalContactsOut = findClippingFaces(separatingNormals[i],
+                                                        &convexShapes[shapeIndexA], &convexShapes[shapeIndexB],
+                                                        rigidBodies[bodyIndexA].m_pos,rigidBodies[bodyIndexA].m_quat,
+                                                        rigidBodies[bodyIndexB].m_pos,rigidBodies[bodyIndexB].m_quat,
+                                                        worldVertsA1,
+                                                        worldNormalsA1,
+                                                        worldVertsB1,capacityWorldVerts,
+                                                        minDist, maxDist,
+                                                        vertices,faces,indices,
+                                                        clippingFacesOut,i);
+            
+            
+		}//		if (hasSeparatingAxis[i])
+	}//	if (i<numPairs)
+    
+}
+
+
+
+
+__kernel void   clipFacesAndFindContactsKernel(    __global const float4* separatingNormals,
+                                                   __global const int* hasSeparatingAxis,
+                                                   __global int4* clippingFacesOut,
+                                                   __global float4* worldVertsA1,
+                                                   __global float4* worldNormalsA1,
+                                                   __global float4* worldVertsB1,
+                                                   __global float4* worldVertsB2,
+                                                    int vertexFaceCapacity,
+                                                   int numPairs,
+					                                        int debugMode
+                                                   )
+{
+    int i = get_global_id(0);
+	int pairIndex = i;
+	
+    
+	float minDist = -1e30f;
+	float maxDist = 0.02f;
+    
+	if (i<numPairs)
+	{
+        
+		if (hasSeparatingAxis[i])
+		{
+            
+//			int bodyIndexA = pairs[i].x;
+	//		int bodyIndexB = pairs[i].y;
+		    
+            int numLocalContactsOut = 0;
+
+            int capacityWorldVertsB2 = vertexFaceCapacity;
+            
+            __global float4* pVtxIn = &worldVertsB1[pairIndex*capacityWorldVertsB2];
+            __global float4* pVtxOut = &worldVertsB2[pairIndex*capacityWorldVertsB2];
+            
+
+            {
+                __global int4* clippingFaces = clippingFacesOut;
+            
+                
+                int closestFaceA = clippingFaces[pairIndex].x;
+                int closestFaceB = clippingFaces[pairIndex].y;
+                int numVertsInA = clippingFaces[pairIndex].z;
+                int numVertsInB = clippingFaces[pairIndex].w;
+                
+                int numVertsOut = 0;
+                
+                if (closestFaceA>=0)
+                {
+                    
+                    
+                    
+                    // clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+                    
+                    for(int e0=0;e0<numVertsInA;e0++)
+                    {
+                        const float4 aw = worldVertsA1[pairIndex*capacityWorldVertsB2+e0];
+                        const float4 bw = worldVertsA1[pairIndex*capacityWorldVertsB2+((e0+1)%numVertsInA)];
+                        const float4 WorldEdge0 = aw - bw;
+                        float4 worldPlaneAnormal1 = worldNormalsA1[pairIndex];
+                        float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);
+                        float4 worldA1 = aw;
+                        float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);
+                        float4 planeNormalWS = planeNormalWS1;
+                        float planeEqWS=planeEqWS1;
+                        numVertsOut = clipFaceGlobal(pVtxIn, numVertsInB, planeNormalWS,planeEqWS, pVtxOut);
+                        __global float4* tmp = pVtxOut;
+                        pVtxOut = pVtxIn;
+                        pVtxIn = tmp;
+                        numVertsInB = numVertsOut;
+                        numVertsOut = 0;
+                    }
+                    
+                    float4 planeNormalWS = worldNormalsA1[pairIndex];
+                    float planeEqWS=-dot3F4(planeNormalWS,worldVertsA1[pairIndex*capacityWorldVertsB2]);
+                    
+                    for (int i=0;i<numVertsInB;i++)
+                    {
+                        float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;
+                        if (depth <=minDist)
+                        {
+                            depth = minDist;
+                        }
+                        
+                        if (depth <=maxDist)
+                        {
+                            float4 pointInWorld = pVtxIn[i];
+                            pVtxOut[numLocalContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);
+                        }
+                    }
+                    
+                }
+                clippingFaces[pairIndex].w =numLocalContactsOut;
+                
+
+            }
+            
+            for (int i=0;i<numLocalContactsOut;i++)
+                pVtxIn[i] = pVtxOut[i];
+                
+		}//		if (hasSeparatingAxis[i])
+	}//	if (i<numPairs)
+    
+}
+
+
+
+
+
+__kernel void   newContactReductionKernel( __global int4* pairs,
+                                                   __global const b3RigidBodyData_t* rigidBodies,
+                                                   __global const float4* separatingNormals,
+                                                   __global const int* hasSeparatingAxis,
+                                                   __global struct b3Contact4Data* globalContactsOut,
+                                                   __global int4* clippingFaces,
+                                                   __global float4* worldVertsB2,
+                                                   volatile __global int* nGlobalContactsOut,
+                                                   int vertexFaceCapacity,
+												   int contactCapacity,
+                                                   int numPairs
+                                                   )
+{
+    int i = get_global_id(0);
+	int pairIndex = i;
+	
+    int4 contactIdx;
+    contactIdx=make_int4(0,1,2,3);
+    
+	if (i<numPairs)
+	{
+        
+		if (hasSeparatingAxis[i])
+		{
+            
+			
+            
+            
+			int nPoints = clippingFaces[pairIndex].w;
+           
+            if (nPoints>0)
+            {
+
+                 __global float4* pointsIn = &worldVertsB2[pairIndex*vertexFaceCapacity];
+                float4 normal = -separatingNormals[i];
+                
+                int nReducedContacts = extractManifoldSequentialGlobal(pointsIn, nPoints, normal, &contactIdx);
+            
+				int mprContactIndex = pairs[pairIndex].z;
+
+                int dstIdx = mprContactIndex;
+
+				if (dstIdx<0)
+				{
+	                AppendInc( nGlobalContactsOut, dstIdx );
+				}
+//#if 0
+                
+				if (dstIdx < contactCapacity)
+				{
+
+					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];
+					c->m_worldNormalOnB = -normal;
+					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);
+					c->m_batchIdx = pairIndex;
+					int bodyA = pairs[pairIndex].x;
+					int bodyB = pairs[pairIndex].y;
+
+					pairs[pairIndex].w = dstIdx;
+
+					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;
+					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;
+                    c->m_childIndexA =-1;
+					c->m_childIndexB =-1;
+
+                    switch (nReducedContacts)
+                    {
+                        case 4:
+                            c->m_worldPosB[3] = pointsIn[contactIdx.w];
+                        case 3:
+                            c->m_worldPosB[2] = pointsIn[contactIdx.z];
+                        case 2:
+                            c->m_worldPosB[1] = pointsIn[contactIdx.y];
+                        case 1:
+							if (mprContactIndex<0)//test
+	                            c->m_worldPosB[0] = pointsIn[contactIdx.x];
+                        default:
+                        {
+                        }
+                    };
+                    
+					GET_NPOINTS(*c) = nReducedContacts;
+                    
+                 }
+                 
+                
+//#endif
+				
+			}//		if (numContactsOut>0)
+		}//		if (hasSeparatingAxis[i])
+	}//	if (i<numPairs)
+
+    
+    
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h
new file mode 100644
index 0000000..907809d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h
@@ -0,0 +1,2098 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* satClipKernelsCL =
+	"#define TRIANGLE_NUM_CONVEX_FACES 5\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile __global int*\n"
+	"#endif\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"typedef unsigned int u32;\n"
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#ifndef B3_CONVEX_POLYHEDRON_DATA_H\n"
+	"#define B3_CONVEX_POLYHEDRON_DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#define B3_QUAT_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Quat;\n"
+	"	#define b3QuatConstArg const b3Quat\n"
+	"	\n"
+	"	\n"
+	"inline float4 b3FastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = (float4)(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"	\n"
+	"inline b3Quat b3QuatMul(b3Quat a, b3Quat b);\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in);\n"
+	"inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)\n"
+	"{\n"
+	"	b3Quat ans;\n"
+	"	ans = b3Cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - b3Dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in)\n"
+	"{\n"
+	"	b3Quat q;\n"
+	"	q=in;\n"
+	"	//return b3FastNormalize4(in);\n"
+	"	float len = native_sqrt(dot(q, q));\n"
+	"	if(len > 0.f)\n"
+	"	{\n"
+	"		q *= 1.f / len;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		q.x = q.y = q.z = 0.f;\n"
+	"		q.w = 1.f;\n"
+	"	}\n"
+	"	return q;\n"
+	"}\n"
+	"inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	b3Quat qInv = b3QuatInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = b3QuatMul(b3QuatMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	return b3QuatRotate( b3QuatInvert( q ), vec );\n"
+	"}\n"
+	"inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg  orientation)\n"
+	"{\n"
+	"	return b3QuatRotate( orientation, point ) + (translation);\n"
+	"}\n"
+	"	\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"typedef struct b3GpuFace b3GpuFace_t;\n"
+	"struct b3GpuFace\n"
+	"{\n"
+	"	b3Float4 m_plane;\n"
+	"	int m_indexOffset;\n"
+	"	int m_numIndices;\n"
+	"	int m_unusedPadding1;\n"
+	"	int m_unusedPadding2;\n"
+	"};\n"
+	"typedef struct b3ConvexPolyhedronData b3ConvexPolyhedronData_t;\n"
+	"struct b3ConvexPolyhedronData\n"
+	"{\n"
+	"	b3Float4		m_localCenter;\n"
+	"	b3Float4		m_extents;\n"
+	"	b3Float4		mC;\n"
+	"	b3Float4		mE;\n"
+	"	float			m_radius;\n"
+	"	int	m_faceOffset;\n"
+	"	int m_numFaces;\n"
+	"	int	m_numVertices;\n"
+	"	int m_vertexOffset;\n"
+	"	int	m_uniqueEdgesOffset;\n"
+	"	int	m_numUniqueEdges;\n"
+	"	int m_unused;\n"
+	"};\n"
+	"#endif //B3_CONVEX_POLYHEDRON_DATA_H\n"
+	"#ifndef B3_COLLIDABLE_H\n"
+	"#define B3_COLLIDABLE_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"enum b3ShapeTypes\n"
+	"{\n"
+	"	SHAPE_HEIGHT_FIELD=1,\n"
+	"	SHAPE_CONVEX_HULL=3,\n"
+	"	SHAPE_PLANE=4,\n"
+	"	SHAPE_CONCAVE_TRIMESH=5,\n"
+	"	SHAPE_COMPOUND_OF_CONVEX_HULLS=6,\n"
+	"	SHAPE_SPHERE=7,\n"
+	"	MAX_NUM_SHAPE_TYPES,\n"
+	"};\n"
+	"typedef struct b3Collidable b3Collidable_t;\n"
+	"struct b3Collidable\n"
+	"{\n"
+	"	union {\n"
+	"		int m_numChildShapes;\n"
+	"		int m_bvhIndex;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float m_radius;\n"
+	"		int	m_compoundBvhIndex;\n"
+	"	};\n"
+	"	int m_shapeType;\n"
+	"	int m_shapeIndex;\n"
+	"};\n"
+	"typedef struct b3GpuChildShape b3GpuChildShape_t;\n"
+	"struct b3GpuChildShape\n"
+	"{\n"
+	"	b3Float4	m_childPosition;\n"
+	"	b3Quat		m_childOrientation;\n"
+	"	int m_shapeIndex;\n"
+	"	int m_unused0;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"struct b3CompoundOverlappingPair\n"
+	"{\n"
+	"	int m_bodyIndexA;\n"
+	"	int m_bodyIndexB;\n"
+	"//	int	m_pairType;\n"
+	"	int m_childShapeIndexA;\n"
+	"	int m_childShapeIndexB;\n"
+	"};\n"
+	"#endif //B3_COLLIDABLE_H\n"
+	"#ifndef B3_RIGIDBODY_DATA_H\n"
+	"#define B3_RIGIDBODY_DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#define B3_MAT3x3_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"typedef struct\n"
+	"{\n"
+	"	b3Float4 m_row[3];\n"
+	"}b3Mat3x3;\n"
+	"#define b3Mat3x3ConstArg const b3Mat3x3\n"
+	"#define b3GetRow(m,row) (m.m_row[row])\n"
+	"inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)\n"
+	"{\n"
+	"	b3Float4 quat2 = (b3Float4)(quat.x*quat.x, quat.y*quat.y, quat.z*quat.z, 0.f);\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0].x=1-2*quat2.y-2*quat2.z;\n"
+	"	out.m_row[0].y=2*quat.x*quat.y-2*quat.w*quat.z;\n"
+	"	out.m_row[0].z=2*quat.x*quat.z+2*quat.w*quat.y;\n"
+	"	out.m_row[0].w = 0.f;\n"
+	"	out.m_row[1].x=2*quat.x*quat.y+2*quat.w*quat.z;\n"
+	"	out.m_row[1].y=1-2*quat2.x-2*quat2.z;\n"
+	"	out.m_row[1].z=2*quat.y*quat.z-2*quat.w*quat.x;\n"
+	"	out.m_row[1].w = 0.f;\n"
+	"	out.m_row[2].x=2*quat.x*quat.z-2*quat.w*quat.y;\n"
+	"	out.m_row[2].y=2*quat.y*quat.z+2*quat.w*quat.x;\n"
+	"	out.m_row[2].z=1-2*quat2.x-2*quat2.y;\n"
+	"	out.m_row[2].w = 0.f;\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = fabs(matIn.m_row[0]);\n"
+	"	out.m_row[1] = fabs(matIn.m_row[1]);\n"
+	"	out.m_row[2] = fabs(matIn.m_row[2]);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero();\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity();\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m);\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(0.f);\n"
+	"	m.m_row[1] = (b3Float4)(0.f);\n"
+	"	m.m_row[2] = (b3Float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (b3Float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (b3Float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Mat3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	b3Mat3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = b3Dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = b3Dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = b3Dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)\n"
+	"{\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a.m_row[0], b );\n"
+	"	ans.y = b3Dot3F4( a.m_row[1], b );\n"
+	"	ans.z = b3Dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a, colx );\n"
+	"	ans.y = b3Dot3F4( a, coly );\n"
+	"	ans.z = b3Dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3RigidBodyData b3RigidBodyData_t;\n"
+	"struct b3RigidBodyData\n"
+	"{\n"
+	"	b3Float4				m_pos;\n"
+	"	b3Quat					m_quat;\n"
+	"	b3Float4				m_linVel;\n"
+	"	b3Float4				m_angVel;\n"
+	"	int 					m_collidableIdx;\n"
+	"	float 				m_invMass;\n"
+	"	float 				m_restituitionCoeff;\n"
+	"	float 				m_frictionCoeff;\n"
+	"};\n"
+	"typedef struct b3InertiaData b3InertiaData_t;\n"
+	"struct b3InertiaData\n"
+	"{\n"
+	"	b3Mat3x3 m_invInertiaWorld;\n"
+	"	b3Mat3x3 m_initInvInertia;\n"
+	"};\n"
+	"#endif //B3_RIGIDBODY_DATA_H\n"
+	"	\n"
+	"#define GET_NPOINTS(x) (x).m_worldNormalOnB.w\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_float4 (float4)\n"
+	"#define make_float2 (float2)\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_int4 (int4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"__inline\n"
+	"float fastDiv(float numerator, float denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"//	return numerator/denominator;	\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastDiv4(float4 numerator, float4 denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"//#define dot3F4 dot\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec);\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fastNormalize4(in);\n"
+	"//	in /= length( in );\n"
+	"//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"__inline\n"
+	"float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)\n"
+	"{\n"
+	"	return qtRotate( *orientation, *p ) + (*translation);\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = make_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"}\n"
+	"__inline float4 lerp3(const float4 a,const float4 b, float  t)\n"
+	"{\n"
+	"	return make_float4(	a.x + (b.x - a.x) * t,\n"
+	"						a.y + (b.y - a.y) * t,\n"
+	"						a.z + (b.z - a.z) * t,\n"
+	"						0.f);\n"
+	"}\n"
+	"// Clips a face to the back of a plane, return the number of vertices out, stored in ppVtxOut\n"
+	"int clipFaceGlobal(__global const float4* pVtxIn, int numVertsIn, float4 planeNormalWS,float planeEqWS, __global float4* ppVtxOut)\n"
+	"{\n"
+	"	\n"
+	"	int ve;\n"
+	"	float ds, de;\n"
+	"	int numVertsOut = 0;\n"
+	"    //double-check next test\n"
+	"    	if (numVertsIn < 2)\n"
+	"    		return 0;\n"
+	"    \n"
+	"	float4 firstVertex=pVtxIn[numVertsIn-1];\n"
+	"	float4 endVertex = pVtxIn[0];\n"
+	"	\n"
+	"	ds = dot3F4(planeNormalWS,firstVertex)+planeEqWS;\n"
+	"    \n"
+	"	for (ve = 0; ve < numVertsIn; ve++)\n"
+	"	{\n"
+	"		endVertex=pVtxIn[ve];\n"
+	"		de = dot3F4(planeNormalWS,endVertex)+planeEqWS;\n"
+	"		if (ds<0)\n"
+	"		{\n"
+	"			if (de<0)\n"
+	"			{\n"
+	"				// Start < 0, end < 0, so output endVertex\n"
+	"				ppVtxOut[numVertsOut++] = endVertex;\n"
+	"			}\n"
+	"			else\n"
+	"			{\n"
+	"				// Start < 0, end >= 0, so output intersection\n"
+	"				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );\n"
+	"			}\n"
+	"		}\n"
+	"		else\n"
+	"		{\n"
+	"			if (de<0)\n"
+	"			{\n"
+	"				// Start >= 0, end < 0 so output intersection and end\n"
+	"				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );\n"
+	"				ppVtxOut[numVertsOut++] = endVertex;\n"
+	"			}\n"
+	"		}\n"
+	"		firstVertex = endVertex;\n"
+	"		ds = de;\n"
+	"	}\n"
+	"	return numVertsOut;\n"
+	"}\n"
+	"// Clips a face to the back of a plane, return the number of vertices out, stored in ppVtxOut\n"
+	"int clipFace(const float4* pVtxIn, int numVertsIn, float4 planeNormalWS,float planeEqWS, float4* ppVtxOut)\n"
+	"{\n"
+	"	\n"
+	"	int ve;\n"
+	"	float ds, de;\n"
+	"	int numVertsOut = 0;\n"
+	"//double-check next test\n"
+	"	if (numVertsIn < 2)\n"
+	"		return 0;\n"
+	"	float4 firstVertex=pVtxIn[numVertsIn-1];\n"
+	"	float4 endVertex = pVtxIn[0];\n"
+	"	\n"
+	"	ds = dot3F4(planeNormalWS,firstVertex)+planeEqWS;\n"
+	"	for (ve = 0; ve < numVertsIn; ve++)\n"
+	"	{\n"
+	"		endVertex=pVtxIn[ve];\n"
+	"		de = dot3F4(planeNormalWS,endVertex)+planeEqWS;\n"
+	"		if (ds<0)\n"
+	"		{\n"
+	"			if (de<0)\n"
+	"			{\n"
+	"				// Start < 0, end < 0, so output endVertex\n"
+	"				ppVtxOut[numVertsOut++] = endVertex;\n"
+	"			}\n"
+	"			else\n"
+	"			{\n"
+	"				// Start < 0, end >= 0, so output intersection\n"
+	"				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );\n"
+	"			}\n"
+	"		}\n"
+	"		else\n"
+	"		{\n"
+	"			if (de<0)\n"
+	"			{\n"
+	"				// Start >= 0, end < 0 so output intersection and end\n"
+	"				ppVtxOut[numVertsOut++] = lerp3(firstVertex, endVertex,(ds * 1.f/(ds - de)) );\n"
+	"				ppVtxOut[numVertsOut++] = endVertex;\n"
+	"			}\n"
+	"		}\n"
+	"		firstVertex = endVertex;\n"
+	"		ds = de;\n"
+	"	}\n"
+	"	return numVertsOut;\n"
+	"}\n"
+	"int clipFaceAgainstHull(const float4 separatingNormal, __global const b3ConvexPolyhedronData_t* hullA,  \n"
+	"	const float4 posA, const Quaternion ornA, float4* worldVertsB1, int numWorldVertsB1,\n"
+	"	float4* worldVertsB2, int capacityWorldVertsB2,\n"
+	"	const float minDist, float maxDist,\n"
+	"	__global const float4* vertices,\n"
+	"	__global const b3GpuFace_t* faces,\n"
+	"	__global const int* indices,\n"
+	"	float4* contactsOut,\n"
+	"	int contactCapacity)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"	float4* pVtxIn = worldVertsB1;\n"
+	"	float4* pVtxOut = worldVertsB2;\n"
+	"	\n"
+	"	int numVertsIn = numWorldVertsB1;\n"
+	"	int numVertsOut = 0;\n"
+	"	int closestFaceA=-1;\n"
+	"	{\n"
+	"		float dmin = FLT_MAX;\n"
+	"		for(int face=0;face<hullA->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(\n"
+	"				faces[hullA->m_faceOffset+face].m_plane.x, \n"
+	"				faces[hullA->m_faceOffset+face].m_plane.y, \n"
+	"				faces[hullA->m_faceOffset+face].m_plane.z,0.f);\n"
+	"			const float4 faceANormalWS = qtRotate(ornA,Normal);\n"
+	"		\n"
+	"			float d = dot3F4(faceANormalWS,separatingNormal);\n"
+	"			if (d < dmin)\n"
+	"			{\n"
+	"				dmin = d;\n"
+	"				closestFaceA = face;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if (closestFaceA<0)\n"
+	"		return numContactsOut;\n"
+	"	b3GpuFace_t polyA = faces[hullA->m_faceOffset+closestFaceA];\n"
+	"	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face\n"
+	"	int numVerticesA = polyA.m_numIndices;\n"
+	"	for(int e0=0;e0<numVerticesA;e0++)\n"
+	"	{\n"
+	"		const float4 a = vertices[hullA->m_vertexOffset+indices[polyA.m_indexOffset+e0]];\n"
+	"		const float4 b = vertices[hullA->m_vertexOffset+indices[polyA.m_indexOffset+((e0+1)%numVerticesA)]];\n"
+	"		const float4 edge0 = a - b;\n"
+	"		const float4 WorldEdge0 = qtRotate(ornA,edge0);\n"
+	"		float4 planeNormalA = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);\n"
+	"		float4 worldPlaneAnormal1 = qtRotate(ornA,planeNormalA);\n"
+	"		float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);\n"
+	"		float4 worldA1 = transform(&a,&posA,&ornA);\n"
+	"		float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);\n"
+	"		\n"
+	"		float4 planeNormalWS = planeNormalWS1;\n"
+	"		float planeEqWS=planeEqWS1;\n"
+	"		\n"
+	"		//clip face\n"
+	"		//clipFace(*pVtxIn, *pVtxOut,planeNormalWS,planeEqWS);\n"
+	"		numVertsOut = clipFace(pVtxIn, numVertsIn, planeNormalWS,planeEqWS, pVtxOut);\n"
+	"		//btSwap(pVtxIn,pVtxOut);\n"
+	"		float4* tmp = pVtxOut;\n"
+	"		pVtxOut = pVtxIn;\n"
+	"		pVtxIn = tmp;\n"
+	"		numVertsIn = numVertsOut;\n"
+	"		numVertsOut = 0;\n"
+	"	}\n"
+	"	\n"
+	"	// only keep points that are behind the witness face\n"
+	"	{\n"
+	"		float4 localPlaneNormal  = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);\n"
+	"		float localPlaneEq = polyA.m_plane.w;\n"
+	"		float4 planeNormalWS = qtRotate(ornA,localPlaneNormal);\n"
+	"		float planeEqWS=localPlaneEq-dot3F4(planeNormalWS,posA);\n"
+	"		for (int i=0;i<numVertsIn;i++)\n"
+	"		{\n"
+	"			float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;\n"
+	"			if (depth <=minDist)\n"
+	"			{\n"
+	"				depth = minDist;\n"
+	"			}\n"
+	"			if (depth <=maxDist)\n"
+	"			{\n"
+	"				float4 pointInWorld = pVtxIn[i];\n"
+	"				//resultOut.addContactPoint(separatingNormal,point,depth);\n"
+	"				contactsOut[numContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"int clipFaceAgainstHullLocalA(const float4 separatingNormal, const b3ConvexPolyhedronData_t* hullA,  \n"
+	"	const float4 posA, const Quaternion ornA, float4* worldVertsB1, int numWorldVertsB1,\n"
+	"	float4* worldVertsB2, int capacityWorldVertsB2,\n"
+	"	const float minDist, float maxDist,\n"
+	"	const float4* verticesA,\n"
+	"	const b3GpuFace_t* facesA,\n"
+	"	const int* indicesA,\n"
+	"	__global const float4* verticesB,\n"
+	"	__global const b3GpuFace_t* facesB,\n"
+	"	__global const int* indicesB,\n"
+	"	float4* contactsOut,\n"
+	"	int contactCapacity)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"	float4* pVtxIn = worldVertsB1;\n"
+	"	float4* pVtxOut = worldVertsB2;\n"
+	"	\n"
+	"	int numVertsIn = numWorldVertsB1;\n"
+	"	int numVertsOut = 0;\n"
+	"	int closestFaceA=-1;\n"
+	"	{\n"
+	"		float dmin = FLT_MAX;\n"
+	"		for(int face=0;face<hullA->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(\n"
+	"				facesA[hullA->m_faceOffset+face].m_plane.x, \n"
+	"				facesA[hullA->m_faceOffset+face].m_plane.y, \n"
+	"				facesA[hullA->m_faceOffset+face].m_plane.z,0.f);\n"
+	"			const float4 faceANormalWS = qtRotate(ornA,Normal);\n"
+	"		\n"
+	"			float d = dot3F4(faceANormalWS,separatingNormal);\n"
+	"			if (d < dmin)\n"
+	"			{\n"
+	"				dmin = d;\n"
+	"				closestFaceA = face;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if (closestFaceA<0)\n"
+	"		return numContactsOut;\n"
+	"	b3GpuFace_t polyA = facesA[hullA->m_faceOffset+closestFaceA];\n"
+	"	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face\n"
+	"	int numVerticesA = polyA.m_numIndices;\n"
+	"	for(int e0=0;e0<numVerticesA;e0++)\n"
+	"	{\n"
+	"		const float4 a = verticesA[hullA->m_vertexOffset+indicesA[polyA.m_indexOffset+e0]];\n"
+	"		const float4 b = verticesA[hullA->m_vertexOffset+indicesA[polyA.m_indexOffset+((e0+1)%numVerticesA)]];\n"
+	"		const float4 edge0 = a - b;\n"
+	"		const float4 WorldEdge0 = qtRotate(ornA,edge0);\n"
+	"		float4 planeNormalA = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);\n"
+	"		float4 worldPlaneAnormal1 = qtRotate(ornA,planeNormalA);\n"
+	"		float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);\n"
+	"		float4 worldA1 = transform(&a,&posA,&ornA);\n"
+	"		float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);\n"
+	"		\n"
+	"		float4 planeNormalWS = planeNormalWS1;\n"
+	"		float planeEqWS=planeEqWS1;\n"
+	"		\n"
+	"		//clip face\n"
+	"		//clipFace(*pVtxIn, *pVtxOut,planeNormalWS,planeEqWS);\n"
+	"		numVertsOut = clipFace(pVtxIn, numVertsIn, planeNormalWS,planeEqWS, pVtxOut);\n"
+	"		//btSwap(pVtxIn,pVtxOut);\n"
+	"		float4* tmp = pVtxOut;\n"
+	"		pVtxOut = pVtxIn;\n"
+	"		pVtxIn = tmp;\n"
+	"		numVertsIn = numVertsOut;\n"
+	"		numVertsOut = 0;\n"
+	"	}\n"
+	"	\n"
+	"	// only keep points that are behind the witness face\n"
+	"	{\n"
+	"		float4 localPlaneNormal  = make_float4(polyA.m_plane.x,polyA.m_plane.y,polyA.m_plane.z,0.f);\n"
+	"		float localPlaneEq = polyA.m_plane.w;\n"
+	"		float4 planeNormalWS = qtRotate(ornA,localPlaneNormal);\n"
+	"		float planeEqWS=localPlaneEq-dot3F4(planeNormalWS,posA);\n"
+	"		for (int i=0;i<numVertsIn;i++)\n"
+	"		{\n"
+	"			float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;\n"
+	"			if (depth <=minDist)\n"
+	"			{\n"
+	"				depth = minDist;\n"
+	"			}\n"
+	"			if (depth <=maxDist)\n"
+	"			{\n"
+	"				float4 pointInWorld = pVtxIn[i];\n"
+	"				//resultOut.addContactPoint(separatingNormal,point,depth);\n"
+	"				contactsOut[numContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"int	clipHullAgainstHull(const float4 separatingNormal,\n"
+	"	__global const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB, \n"
+	"	const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB, \n"
+	"	float4* worldVertsB1, float4* worldVertsB2, int capacityWorldVerts,\n"
+	"	const float minDist, float maxDist,\n"
+	"	__global const float4* vertices,\n"
+	"	__global const b3GpuFace_t* faces,\n"
+	"	__global const int* indices,\n"
+	"	float4*	localContactsOut,\n"
+	"	int localContactCapacity)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"	int numWorldVertsB1= 0;\n"
+	"	int closestFaceB=-1;\n"
+	"	float dmax = -FLT_MAX;\n"
+	"	{\n"
+	"		for(int face=0;face<hullB->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(faces[hullB->m_faceOffset+face].m_plane.x, \n"
+	"				faces[hullB->m_faceOffset+face].m_plane.y, faces[hullB->m_faceOffset+face].m_plane.z,0.f);\n"
+	"			const float4 WorldNormal = qtRotate(ornB, Normal);\n"
+	"			float d = dot3F4(WorldNormal,separatingNormal);\n"
+	"			if (d > dmax)\n"
+	"			{\n"
+	"				dmax = d;\n"
+	"				closestFaceB = face;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	{\n"
+	"		const b3GpuFace_t polyB = faces[hullB->m_faceOffset+closestFaceB];\n"
+	"		const int numVertices = polyB.m_numIndices;\n"
+	"		for(int e0=0;e0<numVertices;e0++)\n"
+	"		{\n"
+	"			const float4 b = vertices[hullB->m_vertexOffset+indices[polyB.m_indexOffset+e0]];\n"
+	"			worldVertsB1[numWorldVertsB1++] = transform(&b,&posB,&ornB);\n"
+	"		}\n"
+	"	}\n"
+	"	if (closestFaceB>=0)\n"
+	"	{\n"
+	"		numContactsOut = clipFaceAgainstHull(separatingNormal, hullA, \n"
+	"				posA,ornA,\n"
+	"				worldVertsB1,numWorldVertsB1,worldVertsB2,capacityWorldVerts, minDist, maxDist,vertices,\n"
+	"				faces,\n"
+	"				indices,localContactsOut,localContactCapacity);\n"
+	"	}\n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"int	clipHullAgainstHullLocalA(const float4 separatingNormal,\n"
+	"	const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB, \n"
+	"	const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB, \n"
+	"	float4* worldVertsB1, float4* worldVertsB2, int capacityWorldVerts,\n"
+	"	const float minDist, float maxDist,\n"
+	"	const float4* verticesA,\n"
+	"	const b3GpuFace_t* facesA,\n"
+	"	const int* indicesA,\n"
+	"	__global const float4* verticesB,\n"
+	"	__global const b3GpuFace_t* facesB,\n"
+	"	__global const int* indicesB,\n"
+	"	float4*	localContactsOut,\n"
+	"	int localContactCapacity)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"	int numWorldVertsB1= 0;\n"
+	"	int closestFaceB=-1;\n"
+	"	float dmax = -FLT_MAX;\n"
+	"	{\n"
+	"		for(int face=0;face<hullB->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(facesB[hullB->m_faceOffset+face].m_plane.x, \n"
+	"				facesB[hullB->m_faceOffset+face].m_plane.y, facesB[hullB->m_faceOffset+face].m_plane.z,0.f);\n"
+	"			const float4 WorldNormal = qtRotate(ornB, Normal);\n"
+	"			float d = dot3F4(WorldNormal,separatingNormal);\n"
+	"			if (d > dmax)\n"
+	"			{\n"
+	"				dmax = d;\n"
+	"				closestFaceB = face;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	{\n"
+	"		const b3GpuFace_t polyB = facesB[hullB->m_faceOffset+closestFaceB];\n"
+	"		const int numVertices = polyB.m_numIndices;\n"
+	"		for(int e0=0;e0<numVertices;e0++)\n"
+	"		{\n"
+	"			const float4 b = verticesB[hullB->m_vertexOffset+indicesB[polyB.m_indexOffset+e0]];\n"
+	"			worldVertsB1[numWorldVertsB1++] = transform(&b,&posB,&ornB);\n"
+	"		}\n"
+	"	}\n"
+	"	if (closestFaceB>=0)\n"
+	"	{\n"
+	"		numContactsOut = clipFaceAgainstHullLocalA(separatingNormal, hullA, \n"
+	"				posA,ornA,\n"
+	"				worldVertsB1,numWorldVertsB1,worldVertsB2,capacityWorldVerts, minDist, maxDist,\n"
+	"				verticesA,facesA,indicesA,\n"
+	"				verticesB,facesB,indicesB,\n"
+	"				localContactsOut,localContactCapacity);\n"
+	"	}\n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"#define PARALLEL_SUM(v, n) for(int j=1; j<n; j++) v[0] += v[j];\n"
+	"#define PARALLEL_DO(execution, n) for(int ie=0; ie<n; ie++){execution;}\n"
+	"#define REDUCE_MAX(v, n) {int i=0; for(int offset=0; offset<n; offset++) v[i] = (v[i].y > v[i+offset].y)? v[i]: v[i+offset]; }\n"
+	"#define REDUCE_MIN(v, n) {int i=0; for(int offset=0; offset<n; offset++) v[i] = (v[i].y < v[i+offset].y)? v[i]: v[i+offset]; }\n"
+	"int extractManifoldSequentialGlobal(__global const float4* p, int nPoints, float4 nearNormal, int4* contactIdx)\n"
+	"{\n"
+	"	if( nPoints == 0 )\n"
+	"        return 0;\n"
+	"    \n"
+	"    if (nPoints <=4)\n"
+	"        return nPoints;\n"
+	"    \n"
+	"    \n"
+	"    if (nPoints >64)\n"
+	"        nPoints = 64;\n"
+	"    \n"
+	"	float4 center = make_float4(0.f);\n"
+	"	{\n"
+	"		\n"
+	"		for (int i=0;i<nPoints;i++)\n"
+	"			center += p[i];\n"
+	"		center /= (float)nPoints;\n"
+	"	}\n"
+	"    \n"
+	"	\n"
+	"    \n"
+	"	//	sample 4 directions\n"
+	"    \n"
+	"    float4 aVector = p[0] - center;\n"
+	"    float4 u = cross3( nearNormal, aVector );\n"
+	"    float4 v = cross3( nearNormal, u );\n"
+	"    u = normalize3( u );\n"
+	"    v = normalize3( v );\n"
+	"    \n"
+	"    \n"
+	"    //keep point with deepest penetration\n"
+	"    float minW= FLT_MAX;\n"
+	"    \n"
+	"    int minIndex=-1;\n"
+	"    \n"
+	"    float4 maxDots;\n"
+	"    maxDots.x = FLT_MIN;\n"
+	"    maxDots.y = FLT_MIN;\n"
+	"    maxDots.z = FLT_MIN;\n"
+	"    maxDots.w = FLT_MIN;\n"
+	"    \n"
+	"    //	idx, distance\n"
+	"    for(int ie = 0; ie<nPoints; ie++ )\n"
+	"    {\n"
+	"        if (p[ie].w<minW)\n"
+	"        {\n"
+	"            minW = p[ie].w;\n"
+	"            minIndex=ie;\n"
+	"        }\n"
+	"        float f;\n"
+	"        float4 r = p[ie]-center;\n"
+	"        f = dot3F4( u, r );\n"
+	"        if (f<maxDots.x)\n"
+	"        {\n"
+	"            maxDots.x = f;\n"
+	"            contactIdx[0].x = ie;\n"
+	"        }\n"
+	"        \n"
+	"        f = dot3F4( -u, r );\n"
+	"        if (f<maxDots.y)\n"
+	"        {\n"
+	"            maxDots.y = f;\n"
+	"            contactIdx[0].y = ie;\n"
+	"        }\n"
+	"        \n"
+	"        \n"
+	"        f = dot3F4( v, r );\n"
+	"        if (f<maxDots.z)\n"
+	"        {\n"
+	"            maxDots.z = f;\n"
+	"            contactIdx[0].z = ie;\n"
+	"        }\n"
+	"        \n"
+	"        f = dot3F4( -v, r );\n"
+	"        if (f<maxDots.w)\n"
+	"        {\n"
+	"            maxDots.w = f;\n"
+	"            contactIdx[0].w = ie;\n"
+	"        }\n"
+	"        \n"
+	"    }\n"
+	"    \n"
+	"    if (contactIdx[0].x != minIndex && contactIdx[0].y != minIndex && contactIdx[0].z != minIndex && contactIdx[0].w != minIndex)\n"
+	"    {\n"
+	"        //replace the first contact with minimum (todo: replace contact with least penetration)\n"
+	"        contactIdx[0].x = minIndex;\n"
+	"    }\n"
+	"    \n"
+	"    return 4;\n"
+	"    \n"
+	"}\n"
+	"int extractManifoldSequentialGlobalFake(__global const float4* p, int nPoints, float4 nearNormal, int* contactIdx)\n"
+	"{\n"
+	"    contactIdx[0] = 0;\n"
+	"    contactIdx[1] = 1;\n"
+	"    contactIdx[2] = 2;\n"
+	"    contactIdx[3] = 3;\n"
+	"    \n"
+	"	if( nPoints == 0 ) return 0;\n"
+	"    \n"
+	"	nPoints = min2( nPoints, 4 );\n"
+	"    return nPoints;\n"
+	"    \n"
+	"}\n"
+	"int extractManifoldSequential(const float4* p, int nPoints, float4 nearNormal, int* contactIdx)\n"
+	"{\n"
+	"	if( nPoints == 0 ) return 0;\n"
+	"	nPoints = min2( nPoints, 64 );\n"
+	"	float4 center = make_float4(0.f);\n"
+	"	{\n"
+	"		float4 v[64];\n"
+	"		for (int i=0;i<nPoints;i++)\n"
+	"			v[i] = p[i];\n"
+	"		//memcpy( v, p, nPoints*sizeof(float4) );\n"
+	"		PARALLEL_SUM( v, nPoints );\n"
+	"		center = v[0]/(float)nPoints;\n"
+	"	}\n"
+	"	\n"
+	"	{	//	sample 4 directions\n"
+	"		if( nPoints < 4 )\n"
+	"		{\n"
+	"			for(int i=0; i<nPoints; i++) \n"
+	"				contactIdx[i] = i;\n"
+	"			return nPoints;\n"
+	"		}\n"
+	"		float4 aVector = p[0] - center;\n"
+	"		float4 u = cross3( nearNormal, aVector );\n"
+	"		float4 v = cross3( nearNormal, u );\n"
+	"		u = normalize3( u );\n"
+	"		v = normalize3( v );\n"
+	"		int idx[4];\n"
+	"		float2 max00 = make_float2(0,FLT_MAX);\n"
+	"		{\n"
+	"			//	idx, distance\n"
+	"			{\n"
+	"				{\n"
+	"					int4 a[64];\n"
+	"					for(int ie = 0; ie<nPoints; ie++ )\n"
+	"					{\n"
+	"						\n"
+	"						\n"
+	"						float f;\n"
+	"						float4 r = p[ie]-center;\n"
+	"						f = dot3F4( u, r );\n"
+	"						a[ie].x = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);\n"
+	"						f = dot3F4( -u, r );\n"
+	"						a[ie].y = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);\n"
+	"						f = dot3F4( v, r );\n"
+	"						a[ie].z = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);\n"
+	"						f = dot3F4( -v, r );\n"
+	"						a[ie].w = ((*(u32*)&f) & 0xffffff00) | (0xff & ie);\n"
+	"					}\n"
+	"					for(int ie=0; ie<nPoints; ie++)\n"
+	"					{\n"
+	"						a[0].x = (a[0].x > a[ie].x )? a[0].x: a[ie].x;\n"
+	"						a[0].y = (a[0].y > a[ie].y )? a[0].y: a[ie].y;\n"
+	"						a[0].z = (a[0].z > a[ie].z )? a[0].z: a[ie].z;\n"
+	"						a[0].w = (a[0].w > a[ie].w )? a[0].w: a[ie].w;\n"
+	"					}\n"
+	"					idx[0] = (int)a[0].x & 0xff;\n"
+	"					idx[1] = (int)a[0].y & 0xff;\n"
+	"					idx[2] = (int)a[0].z & 0xff;\n"
+	"					idx[3] = (int)a[0].w & 0xff;\n"
+	"				}\n"
+	"			}\n"
+	"			{\n"
+	"				float2 h[64];\n"
+	"				PARALLEL_DO( h[ie] = make_float2((float)ie, p[ie].w), nPoints );\n"
+	"				REDUCE_MIN( h, nPoints );\n"
+	"				max00 = h[0];\n"
+	"			}\n"
+	"		}\n"
+	"		contactIdx[0] = idx[0];\n"
+	"		contactIdx[1] = idx[1];\n"
+	"		contactIdx[2] = idx[2];\n"
+	"		contactIdx[3] = idx[3];\n"
+	"		return 4;\n"
+	"	}\n"
+	"}\n"
+	"__kernel void   extractManifoldAndAddContactKernel(__global const int4* pairs, \n"
+	"																	__global const b3RigidBodyData_t* rigidBodies, \n"
+	"																	__global const float4* closestPointsWorld,\n"
+	"																	__global const float4* separatingNormalsWorld,\n"
+	"																	__global const int* contactCounts,\n"
+	"																	__global const int* contactOffsets,\n"
+	"																	__global struct b3Contact4Data* restrict contactsOut,\n"
+	"																	counter32_t nContactsOut,\n"
+	"																	int contactCapacity,\n"
+	"																	int numPairs,\n"
+	"																	int pairIndex\n"
+	"																	)\n"
+	"{\n"
+	"	int idx = get_global_id(0);\n"
+	"	\n"
+	"	if (idx<numPairs)\n"
+	"	{\n"
+	"		float4 normal = separatingNormalsWorld[idx];\n"
+	"		int nPoints = contactCounts[idx];\n"
+	"		__global const float4* pointsIn = &closestPointsWorld[contactOffsets[idx]];\n"
+	"		float4 localPoints[64];\n"
+	"		for (int i=0;i<nPoints;i++)\n"
+	"		{\n"
+	"			localPoints[i] = pointsIn[i];\n"
+	"		}\n"
+	"		int contactIdx[4];// = {-1,-1,-1,-1};\n"
+	"		contactIdx[0] = -1;\n"
+	"		contactIdx[1] = -1;\n"
+	"		contactIdx[2] = -1;\n"
+	"		contactIdx[3] = -1;\n"
+	"		int nContacts = extractManifoldSequential(localPoints, nPoints, normal, contactIdx);\n"
+	"		int dstIdx;\n"
+	"		AppendInc( nContactsOut, dstIdx );\n"
+	"		if (dstIdx<contactCapacity)\n"
+	"		{\n"
+	"			__global struct b3Contact4Data* c = contactsOut + dstIdx;\n"
+	"			c->m_worldNormalOnB = -normal;\n"
+	"			c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"			c->m_batchIdx = idx;\n"
+	"			int bodyA = pairs[pairIndex].x;\n"
+	"			int bodyB = pairs[pairIndex].y;\n"
+	"			c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0 ? -bodyA:bodyA;\n"
+	"			c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0 ? -bodyB:bodyB;\n"
+	"			c->m_childIndexA = -1;\n"
+	"			c->m_childIndexB = -1;\n"
+	"			for (int i=0;i<nContacts;i++)\n"
+	"			{\n"
+	"				c->m_worldPosB[i] = localPoints[contactIdx[i]];\n"
+	"			}\n"
+	"			GET_NPOINTS(*c) = nContacts;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"void	trInverse(float4 translationIn, Quaternion orientationIn,\n"
+	"		float4* translationOut, Quaternion* orientationOut)\n"
+	"{\n"
+	"	*orientationOut = qtInvert(orientationIn);\n"
+	"	*translationOut = qtRotate(*orientationOut, -translationIn);\n"
+	"}\n"
+	"void	trMul(float4 translationA, Quaternion orientationA,\n"
+	"						float4 translationB, Quaternion orientationB,\n"
+	"		float4* translationOut, Quaternion* orientationOut)\n"
+	"{\n"
+	"	*orientationOut = qtMul(orientationA,orientationB);\n"
+	"	*translationOut = transform(&translationB,&translationA,&orientationA);\n"
+	"}\n"
+	"__kernel void   clipHullHullKernel( __global int4* pairs, \n"
+	"																					__global const b3RigidBodyData_t* rigidBodies, \n"
+	"																					__global const b3Collidable_t* collidables,\n"
+	"																					__global const b3ConvexPolyhedronData_t* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const b3GpuFace_t* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global const float4* separatingNormals,\n"
+	"																					__global const int* hasSeparatingAxis,\n"
+	"																					__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																					counter32_t nGlobalContactsOut,\n"
+	"																					int numPairs,\n"
+	"																					int contactCapacity)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	\n"
+	"	float4 worldVertsB1[64];\n"
+	"	float4 worldVertsB2[64];\n"
+	"	int capacityWorldVerts = 64;	\n"
+	"	float4 localContactsOut[64];\n"
+	"	int localContactCapacity=64;\n"
+	"	\n"
+	"	float minDist = -1e30f;\n"
+	"	float maxDist = 0.02f;\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"		int bodyIndexA = pairs[i].x;\n"
+	"		int bodyIndexB = pairs[i].y;\n"
+	"			\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"		if (hasSeparatingAxis[i])\n"
+	"		{\n"
+	"			\n"
+	"			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"			\n"
+	"		\n"
+	"			int numLocalContactsOut = clipHullAgainstHull(separatingNormals[i],\n"
+	"														&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],\n"
+	"														rigidBodies[bodyIndexA].m_pos,rigidBodies[bodyIndexA].m_quat,\n"
+	"													  rigidBodies[bodyIndexB].m_pos,rigidBodies[bodyIndexB].m_quat,\n"
+	"													  worldVertsB1,worldVertsB2,capacityWorldVerts,\n"
+	"														minDist, maxDist,\n"
+	"														vertices,faces,indices,\n"
+	"														localContactsOut,localContactCapacity);\n"
+	"												\n"
+	"		if (numLocalContactsOut>0)\n"
+	"		{\n"
+	"				float4 normal = -separatingNormals[i];\n"
+	"				int nPoints = numLocalContactsOut;\n"
+	"				float4* pointsIn = localContactsOut;\n"
+	"				int contactIdx[4];// = {-1,-1,-1,-1};\n"
+	"				contactIdx[0] = -1;\n"
+	"				contactIdx[1] = -1;\n"
+	"				contactIdx[2] = -1;\n"
+	"				contactIdx[3] = -1;\n"
+	"		\n"
+	"				int nReducedContacts = extractManifoldSequential(pointsIn, nPoints, normal, contactIdx);\n"
+	"		\n"
+	"				\n"
+	"				int mprContactIndex = pairs[pairIndex].z;\n"
+	"				int dstIdx = mprContactIndex;\n"
+	"				if (dstIdx<0)\n"
+	"				{\n"
+	"					AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"				}\n"
+	"				if (dstIdx<contactCapacity)\n"
+	"				{\n"
+	"					pairs[pairIndex].z = dstIdx;\n"
+	"					__global struct b3Contact4Data* c = globalContactsOut+ dstIdx;\n"
+	"					c->m_worldNormalOnB = -normal;\n"
+	"					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"					c->m_batchIdx = pairIndex;\n"
+	"					int bodyA = pairs[pairIndex].x;\n"
+	"					int bodyB = pairs[pairIndex].y;\n"
+	"					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;\n"
+	"					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;\n"
+	"					c->m_childIndexA = -1;\n"
+	"					c->m_childIndexB = -1;\n"
+	"					for (int i=0;i<nReducedContacts;i++)\n"
+	"					{\n"
+	"					//this condition means: overwrite contact point, unless at index i==0 we have a valid 'mpr' contact\n"
+	"						if (i>0||(mprContactIndex<0))\n"
+	"						{\n"
+	"							c->m_worldPosB[i] = pointsIn[contactIdx[i]];\n"
+	"						}\n"
+	"					}\n"
+	"					GET_NPOINTS(*c) = nReducedContacts;\n"
+	"				}\n"
+	"				\n"
+	"			}//		if (numContactsOut>0)\n"
+	"		}//		if (hasSeparatingAxis[i])\n"
+	"	}//	if (i<numPairs)\n"
+	"}\n"
+	"__kernel void   clipCompoundsHullHullKernel( __global const int4* gpuCompoundPairs, \n"
+	"																					__global const b3RigidBodyData_t* rigidBodies, \n"
+	"																					__global const b3Collidable_t* collidables,\n"
+	"																					__global const b3ConvexPolyhedronData_t* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const b3GpuFace_t* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global const b3GpuChildShape_t* gpuChildShapes,\n"
+	"																					__global const float4* gpuCompoundSepNormalsOut,\n"
+	"																					__global const int* gpuHasCompoundSepNormalsOut,\n"
+	"																					__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																					counter32_t nGlobalContactsOut,\n"
+	"																					int numCompoundPairs, int maxContactCapacity)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	\n"
+	"	float4 worldVertsB1[64];\n"
+	"	float4 worldVertsB2[64];\n"
+	"	int capacityWorldVerts = 64;	\n"
+	"	float4 localContactsOut[64];\n"
+	"	int localContactCapacity=64;\n"
+	"	\n"
+	"	float minDist = -1e30f;\n"
+	"	float maxDist = 0.02f;\n"
+	"	if (i<numCompoundPairs)\n"
+	"	{\n"
+	"		if (gpuHasCompoundSepNormalsOut[i])\n"
+	"		{\n"
+	"			int bodyIndexA = gpuCompoundPairs[i].x;\n"
+	"			int bodyIndexB = gpuCompoundPairs[i].y;\n"
+	"			\n"
+	"			int childShapeIndexA = gpuCompoundPairs[i].z;\n"
+	"			int childShapeIndexB = gpuCompoundPairs[i].w;\n"
+	"			\n"
+	"			int collidableIndexA = -1;\n"
+	"			int collidableIndexB = -1;\n"
+	"			\n"
+	"			float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"			float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"			\n"
+	"			float4 ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"			float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"								\n"
+	"			if (childShapeIndexA >= 0)\n"
+	"			{\n"
+	"				collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;\n"
+	"				float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;\n"
+	"				float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;\n"
+	"				float4 newPosA = qtRotate(ornA,childPosA)+posA;\n"
+	"				float4 newOrnA = qtMul(ornA,childOrnA);\n"
+	"				posA = newPosA;\n"
+	"				ornA = newOrnA;\n"
+	"			} else\n"
+	"			{\n"
+	"				collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"			}\n"
+	"			\n"
+	"			if (childShapeIndexB>=0)\n"
+	"			{\n"
+	"				collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"				float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"				float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"				float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"				float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"				posB = newPosB;\n"
+	"				ornB = newOrnB;\n"
+	"			} else\n"
+	"			{\n"
+	"				collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;	\n"
+	"			}\n"
+	"			\n"
+	"			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"		\n"
+	"			int numLocalContactsOut = clipHullAgainstHull(gpuCompoundSepNormalsOut[i],\n"
+	"														&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],\n"
+	"														posA,ornA,\n"
+	"													  posB,ornB,\n"
+	"													  worldVertsB1,worldVertsB2,capacityWorldVerts,\n"
+	"														minDist, maxDist,\n"
+	"														vertices,faces,indices,\n"
+	"														localContactsOut,localContactCapacity);\n"
+	"												\n"
+	"		if (numLocalContactsOut>0)\n"
+	"		{\n"
+	"				float4 normal = -gpuCompoundSepNormalsOut[i];\n"
+	"				int nPoints = numLocalContactsOut;\n"
+	"				float4* pointsIn = localContactsOut;\n"
+	"				int contactIdx[4];// = {-1,-1,-1,-1};\n"
+	"				contactIdx[0] = -1;\n"
+	"				contactIdx[1] = -1;\n"
+	"				contactIdx[2] = -1;\n"
+	"				contactIdx[3] = -1;\n"
+	"		\n"
+	"				int nReducedContacts = extractManifoldSequential(pointsIn, nPoints, normal, contactIdx);\n"
+	"		\n"
+	"				int dstIdx;\n"
+	"				AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"				if ((dstIdx+nReducedContacts) < maxContactCapacity)\n"
+	"				{\n"
+	"					__global struct b3Contact4Data* c = globalContactsOut+ dstIdx;\n"
+	"					c->m_worldNormalOnB = -normal;\n"
+	"					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"					c->m_batchIdx = pairIndex;\n"
+	"					int bodyA = gpuCompoundPairs[pairIndex].x;\n"
+	"					int bodyB = gpuCompoundPairs[pairIndex].y;\n"
+	"					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;\n"
+	"					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;\n"
+	"					c->m_childIndexA = childShapeIndexA;\n"
+	"					c->m_childIndexB = childShapeIndexB;\n"
+	"					for (int i=0;i<nReducedContacts;i++)\n"
+	"					{\n"
+	"						c->m_worldPosB[i] = pointsIn[contactIdx[i]];\n"
+	"					}\n"
+	"					GET_NPOINTS(*c) = nReducedContacts;\n"
+	"				}\n"
+	"				\n"
+	"			}//		if (numContactsOut>0)\n"
+	"		}//		if (gpuHasCompoundSepNormalsOut[i])\n"
+	"	}//	if (i<numCompoundPairs)\n"
+	"}\n"
+	"__kernel void   sphereSphereCollisionKernel( __global const int4* pairs, \n"
+	"																					__global const b3RigidBodyData_t* rigidBodies, \n"
+	"																					__global const b3Collidable_t* collidables,\n"
+	"																					__global const float4* separatingNormals,\n"
+	"																					__global const int* hasSeparatingAxis,\n"
+	"																					__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																					counter32_t nGlobalContactsOut,\n"
+	"																					int contactCapacity,\n"
+	"																					int numPairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"		int bodyIndexA = pairs[i].x;\n"
+	"		int bodyIndexB = pairs[i].y;\n"
+	"			\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"		if (collidables[collidableIndexA].m_shapeType == SHAPE_SPHERE &&\n"
+	"			collidables[collidableIndexB].m_shapeType == SHAPE_SPHERE)\n"
+	"		{\n"
+	"			//sphere-sphere\n"
+	"			float radiusA = collidables[collidableIndexA].m_radius;\n"
+	"			float radiusB = collidables[collidableIndexB].m_radius;\n"
+	"			float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"			float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"			float4 diff = posA-posB;\n"
+	"			float len = length(diff);\n"
+	"			\n"
+	"			///iff distance positive, don't generate a new contact\n"
+	"			if ( len <= (radiusA+radiusB))\n"
+	"			{\n"
+	"				///distance (negative means penetration)\n"
+	"				float dist = len - (radiusA+radiusB);\n"
+	"				float4 normalOnSurfaceB = make_float4(1.f,0.f,0.f,0.f);\n"
+	"				if (len > 0.00001)\n"
+	"				{\n"
+	"					normalOnSurfaceB = diff / len;\n"
+	"				}\n"
+	"				float4 contactPosB = posB + normalOnSurfaceB*radiusB;\n"
+	"				contactPosB.w = dist;\n"
+	"								\n"
+	"				int dstIdx;\n"
+	"				AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"				if (dstIdx < contactCapacity)\n"
+	"				{\n"
+	"					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];\n"
+	"					c->m_worldNormalOnB = -normalOnSurfaceB;\n"
+	"					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"					c->m_batchIdx = pairIndex;\n"
+	"					int bodyA = pairs[pairIndex].x;\n"
+	"					int bodyB = pairs[pairIndex].y;\n"
+	"					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;\n"
+	"					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;\n"
+	"					c->m_worldPosB[0] = contactPosB;\n"
+	"					c->m_childIndexA = -1;\n"
+	"					c->m_childIndexB = -1;\n"
+	"					GET_NPOINTS(*c) = 1;\n"
+	"				}//if (dstIdx < numPairs)\n"
+	"			}//if ( len <= (radiusA+radiusB))\n"
+	"		}//SHAPE_SPHERE SHAPE_SPHERE\n"
+	"	}//if (i<numPairs)\n"
+	"}				\n"
+	"__kernel void   clipHullHullConcaveConvexKernel( __global int4* concavePairsIn,\n"
+	"																					__global const b3RigidBodyData_t* rigidBodies, \n"
+	"																					__global const b3Collidable_t* collidables,\n"
+	"																					__global const b3ConvexPolyhedronData_t* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const b3GpuFace_t* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global const b3GpuChildShape_t* gpuChildShapes,\n"
+	"																					__global const float4* separatingNormals,\n"
+	"																					__global struct b3Contact4Data* restrict globalContactsOut,\n"
+	"																					counter32_t nGlobalContactsOut,\n"
+	"																					int contactCapacity,\n"
+	"																					int numConcavePairs)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	\n"
+	"	float4 worldVertsB1[64];\n"
+	"	float4 worldVertsB2[64];\n"
+	"	int capacityWorldVerts = 64;	\n"
+	"	float4 localContactsOut[64];\n"
+	"	int localContactCapacity=64;\n"
+	"	\n"
+	"	float minDist = -1e30f;\n"
+	"	float maxDist = 0.02f;\n"
+	"	if (i<numConcavePairs)\n"
+	"	{\n"
+	"		//negative value means that the pair is invalid\n"
+	"		if (concavePairsIn[i].w<0)\n"
+	"			return;\n"
+	"		int bodyIndexA = concavePairsIn[i].x;\n"
+	"		int bodyIndexB = concavePairsIn[i].y;\n"
+	"		int f = concavePairsIn[i].z;\n"
+	"		int childShapeIndexA = f;\n"
+	"		\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"		\n"
+	"		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"		\n"
+	"		///////////////////////////////////////////////////////////////\n"
+	"		\n"
+	"	\n"
+	"		bool overlap = false;\n"
+	"		\n"
+	"		b3ConvexPolyhedronData_t convexPolyhedronA;\n"
+	"	//add 3 vertices of the triangle\n"
+	"		convexPolyhedronA.m_numVertices = 3;\n"
+	"		convexPolyhedronA.m_vertexOffset = 0;\n"
+	"		float4	localCenter = make_float4(0.f,0.f,0.f,0.f);\n"
+	"		b3GpuFace_t face = faces[convexShapes[shapeIndexA].m_faceOffset+f];\n"
+	"		\n"
+	"		float4 verticesA[3];\n"
+	"		for (int i=0;i<3;i++)\n"
+	"		{\n"
+	"			int index = indices[face.m_indexOffset+i];\n"
+	"			float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];\n"
+	"			verticesA[i] = vert;\n"
+	"			localCenter += vert;\n"
+	"		}\n"
+	"		float dmin = FLT_MAX;\n"
+	"		int localCC=0;\n"
+	"		//a triangle has 3 unique edges\n"
+	"		convexPolyhedronA.m_numUniqueEdges = 3;\n"
+	"		convexPolyhedronA.m_uniqueEdgesOffset = 0;\n"
+	"		float4 uniqueEdgesA[3];\n"
+	"		\n"
+	"		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);\n"
+	"		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);\n"
+	"		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);\n"
+	"		convexPolyhedronA.m_faceOffset = 0;\n"
+	"                                  \n"
+	"		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);\n"
+	"                             \n"
+	"		b3GpuFace_t facesA[TRIANGLE_NUM_CONVEX_FACES];\n"
+	"		int indicesA[3+3+2+2+2];\n"
+	"		int curUsedIndices=0;\n"
+	"		int fidx=0;\n"
+	"		//front size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[0] = 0;\n"
+	"			indicesA[1] = 1;\n"
+	"			indicesA[2] = 2;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = normal.x;\n"
+	"			facesA[fidx].m_plane.y = normal.y;\n"
+	"			facesA[fidx].m_plane.z = normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"		//back size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[3]=2;\n"
+	"			indicesA[4]=1;\n"
+	"			indicesA[5]=0;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = dot3F4(normal,verticesA[0]);\n"
+	"			float c1 = -face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = -normal.x;\n"
+	"			facesA[fidx].m_plane.y = -normal.y;\n"
+	"			facesA[fidx].m_plane.z = -normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"		bool addEdgePlanes = true;\n"
+	"		if (addEdgePlanes)\n"
+	"		{\n"
+	"			int numVertices=3;\n"
+	"			int prevVertex = numVertices-1;\n"
+	"			for (int i=0;i<numVertices;i++)\n"
+	"			{\n"
+	"				float4 v0 = verticesA[i];\n"
+	"				float4 v1 = verticesA[prevVertex];\n"
+	"                                            \n"
+	"				float4 edgeNormal = normalize(cross(normal,v1-v0));\n"
+	"				float c = -dot3F4(edgeNormal,v0);\n"
+	"				facesA[fidx].m_numIndices = 2;\n"
+	"				facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"				indicesA[curUsedIndices++]=i;\n"
+	"				indicesA[curUsedIndices++]=prevVertex;\n"
+	"                                            \n"
+	"				facesA[fidx].m_plane.x = edgeNormal.x;\n"
+	"				facesA[fidx].m_plane.y = edgeNormal.y;\n"
+	"				facesA[fidx].m_plane.z = edgeNormal.z;\n"
+	"				facesA[fidx].m_plane.w = c;\n"
+	"				fidx++;\n"
+	"				prevVertex = i;\n"
+	"			}\n"
+	"		}\n"
+	"		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;\n"
+	"		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);\n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		posA.w = 0.f;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"		posB.w = 0.f;\n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"		float4 sepAxis = separatingNormals[i];\n"
+	"		\n"
+	"		int shapeTypeB = collidables[collidableIndexB].m_shapeType;\n"
+	"		int childShapeIndexB =-1;\n"
+	"		if (shapeTypeB==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"		{\n"
+	"			///////////////////\n"
+	"			///compound shape support\n"
+	"			\n"
+	"			childShapeIndexB = concavePairsIn[pairIndex].w;\n"
+	"			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"			shapeIndexB = collidables[childColIndexB].m_shapeIndex;\n"
+	"			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"			float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"			float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"			posB = newPosB;\n"
+	"			ornB = newOrnB;\n"
+	"			\n"
+	"		}\n"
+	"		\n"
+	"		////////////////////////////////////////\n"
+	"		\n"
+	"		\n"
+	"		\n"
+	"		int numLocalContactsOut = clipHullAgainstHullLocalA(sepAxis,\n"
+	"														&convexPolyhedronA, &convexShapes[shapeIndexB],\n"
+	"														posA,ornA,\n"
+	"													  posB,ornB,\n"
+	"													  worldVertsB1,worldVertsB2,capacityWorldVerts,\n"
+	"														minDist, maxDist,\n"
+	"														&verticesA,&facesA,&indicesA,\n"
+	"														vertices,faces,indices,\n"
+	"														localContactsOut,localContactCapacity);\n"
+	"												\n"
+	"		if (numLocalContactsOut>0)\n"
+	"		{\n"
+	"			float4 normal = -separatingNormals[i];\n"
+	"			int nPoints = numLocalContactsOut;\n"
+	"			float4* pointsIn = localContactsOut;\n"
+	"			int contactIdx[4];// = {-1,-1,-1,-1};\n"
+	"			contactIdx[0] = -1;\n"
+	"			contactIdx[1] = -1;\n"
+	"			contactIdx[2] = -1;\n"
+	"			contactIdx[3] = -1;\n"
+	"	\n"
+	"			int nReducedContacts = extractManifoldSequential(pointsIn, nPoints, normal, contactIdx);\n"
+	"	\n"
+	"			int dstIdx;\n"
+	"			AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"			if (dstIdx<contactCapacity)\n"
+	"			{\n"
+	"				__global struct b3Contact4Data* c = globalContactsOut+ dstIdx;\n"
+	"				c->m_worldNormalOnB = -normal;\n"
+	"				c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"				c->m_batchIdx = pairIndex;\n"
+	"				int bodyA = concavePairsIn[pairIndex].x;\n"
+	"				int bodyB = concavePairsIn[pairIndex].y;\n"
+	"				c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;\n"
+	"				c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;\n"
+	"				c->m_childIndexA = childShapeIndexA;\n"
+	"				c->m_childIndexB = childShapeIndexB;\n"
+	"				for (int i=0;i<nReducedContacts;i++)\n"
+	"				{\n"
+	"					c->m_worldPosB[i] = pointsIn[contactIdx[i]];\n"
+	"				}\n"
+	"				GET_NPOINTS(*c) = nReducedContacts;\n"
+	"			}\n"
+	"				\n"
+	"		}//		if (numContactsOut>0)\n"
+	"	}//	if (i<numPairs)\n"
+	"}\n"
+	"int	findClippingFaces(const float4 separatingNormal,\n"
+	"                      __global const b3ConvexPolyhedronData_t* hullA, __global const b3ConvexPolyhedronData_t* hullB,\n"
+	"                      const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB,\n"
+	"                       __global float4* worldVertsA1,\n"
+	"                      __global float4* worldNormalsA1,\n"
+	"                      __global float4* worldVertsB1,\n"
+	"                      int capacityWorldVerts,\n"
+	"                      const float minDist, float maxDist,\n"
+	"                      __global const float4* vertices,\n"
+	"                      __global const b3GpuFace_t* faces,\n"
+	"                      __global const int* indices,\n"
+	"                      __global int4* clippingFaces, int pairIndex)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"	int numWorldVertsB1= 0;\n"
+	"    \n"
+	"    \n"
+	"	int closestFaceB=-1;\n"
+	"	float dmax = -FLT_MAX;\n"
+	"    \n"
+	"	{\n"
+	"		for(int face=0;face<hullB->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(faces[hullB->m_faceOffset+face].m_plane.x,\n"
+	"                                              faces[hullB->m_faceOffset+face].m_plane.y, faces[hullB->m_faceOffset+face].m_plane.z,0.f);\n"
+	"			const float4 WorldNormal = qtRotate(ornB, Normal);\n"
+	"			float d = dot3F4(WorldNormal,separatingNormal);\n"
+	"			if (d > dmax)\n"
+	"			{\n"
+	"				dmax = d;\n"
+	"				closestFaceB = face;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"	{\n"
+	"		const b3GpuFace_t polyB = faces[hullB->m_faceOffset+closestFaceB];\n"
+	"		const int numVertices = polyB.m_numIndices;\n"
+	"		for(int e0=0;e0<numVertices;e0++)\n"
+	"		{\n"
+	"			const float4 b = vertices[hullB->m_vertexOffset+indices[polyB.m_indexOffset+e0]];\n"
+	"			worldVertsB1[pairIndex*capacityWorldVerts+numWorldVertsB1++] = transform(&b,&posB,&ornB);\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"    int closestFaceA=-1;\n"
+	"	{\n"
+	"		float dmin = FLT_MAX;\n"
+	"		for(int face=0;face<hullA->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(\n"
+	"                                              faces[hullA->m_faceOffset+face].m_plane.x,\n"
+	"                                              faces[hullA->m_faceOffset+face].m_plane.y,\n"
+	"                                              faces[hullA->m_faceOffset+face].m_plane.z,\n"
+	"                                              0.f);\n"
+	"			const float4 faceANormalWS = qtRotate(ornA,Normal);\n"
+	"            \n"
+	"			float d = dot3F4(faceANormalWS,separatingNormal);\n"
+	"			if (d < dmin)\n"
+	"			{\n"
+	"				dmin = d;\n"
+	"				closestFaceA = face;\n"
+	"                worldNormalsA1[pairIndex] = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"    int numVerticesA = faces[hullA->m_faceOffset+closestFaceA].m_numIndices;\n"
+	"	for(int e0=0;e0<numVerticesA;e0++)\n"
+	"	{\n"
+	"        const float4 a = vertices[hullA->m_vertexOffset+indices[faces[hullA->m_faceOffset+closestFaceA].m_indexOffset+e0]];\n"
+	"        worldVertsA1[pairIndex*capacityWorldVerts+e0] = transform(&a, &posA,&ornA);\n"
+	"    }\n"
+	"    \n"
+	"    clippingFaces[pairIndex].x = closestFaceA;\n"
+	"    clippingFaces[pairIndex].y = closestFaceB;\n"
+	"    clippingFaces[pairIndex].z = numVerticesA;\n"
+	"    clippingFaces[pairIndex].w = numWorldVertsB1;\n"
+	"    \n"
+	"    \n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"int clipFaces(__global float4* worldVertsA1,\n"
+	"              __global float4* worldNormalsA1,\n"
+	"              __global float4* worldVertsB1,\n"
+	"              __global float4* worldVertsB2, \n"
+	"              int capacityWorldVertsB2,\n"
+	"              const float minDist, float maxDist,\n"
+	"              __global int4* clippingFaces,\n"
+	"              int pairIndex)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"    \n"
+	"    int closestFaceA = clippingFaces[pairIndex].x;\n"
+	"    int closestFaceB = clippingFaces[pairIndex].y;\n"
+	"	int numVertsInA = clippingFaces[pairIndex].z;\n"
+	"	int numVertsInB = clippingFaces[pairIndex].w;\n"
+	"    \n"
+	"	int numVertsOut = 0;\n"
+	"    \n"
+	"	if (closestFaceA<0)\n"
+	"		return numContactsOut;\n"
+	"    \n"
+	"    __global float4* pVtxIn = &worldVertsB1[pairIndex*capacityWorldVertsB2];\n"
+	"    __global float4* pVtxOut = &worldVertsB2[pairIndex*capacityWorldVertsB2];\n"
+	"    \n"
+	"    \n"
+	"	\n"
+	"	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face\n"
+	"    \n"
+	"	for(int e0=0;e0<numVertsInA;e0++)\n"
+	"	{\n"
+	"		const float4 aw = worldVertsA1[pairIndex*capacityWorldVertsB2+e0];\n"
+	"		const float4 bw = worldVertsA1[pairIndex*capacityWorldVertsB2+((e0+1)%numVertsInA)];\n"
+	"		const float4 WorldEdge0 = aw - bw;\n"
+	"		float4 worldPlaneAnormal1 = worldNormalsA1[pairIndex];\n"
+	"		float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);\n"
+	"		float4 worldA1 = aw;\n"
+	"		float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);\n"
+	"		float4 planeNormalWS = planeNormalWS1;\n"
+	"		float planeEqWS=planeEqWS1;\n"
+	"		numVertsOut = clipFaceGlobal(pVtxIn, numVertsInB, planeNormalWS,planeEqWS, pVtxOut);\n"
+	"		__global float4* tmp = pVtxOut;\n"
+	"		pVtxOut = pVtxIn;\n"
+	"		pVtxIn = tmp;\n"
+	"		numVertsInB = numVertsOut;\n"
+	"		numVertsOut = 0;\n"
+	"	}\n"
+	"    \n"
+	"    //float4 planeNormalWS = worldNormalsA1[pairIndex];\n"
+	"    //float planeEqWS=-dot3F4(planeNormalWS,worldVertsA1[pairIndex*capacityWorldVertsB2]);\n"
+	"    \n"
+	"    /*for (int i=0;i<numVertsInB;i++)\n"
+	"    {\n"
+	"        pVtxOut[i] = pVtxIn[i];\n"
+	"    }*/\n"
+	"    \n"
+	"    \n"
+	"    \n"
+	"    \n"
+	"    //numVertsInB=0;\n"
+	"	\n"
+	"    float4 planeNormalWS = worldNormalsA1[pairIndex];\n"
+	"    float planeEqWS=-dot3F4(planeNormalWS,worldVertsA1[pairIndex*capacityWorldVertsB2]);\n"
+	"    for (int i=0;i<numVertsInB;i++)\n"
+	"    {\n"
+	"        float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;\n"
+	"        if (depth <=minDist)\n"
+	"        {\n"
+	"            depth = minDist;\n"
+	"        }\n"
+	"        \n"
+	"        if (depth <=maxDist)\n"
+	"        {\n"
+	"            float4 pointInWorld = pVtxIn[i];\n"
+	"            pVtxOut[numContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);\n"
+	"        }\n"
+	"    }\n"
+	"   \n"
+	"    clippingFaces[pairIndex].w =numContactsOut;\n"
+	"   \n"
+	"    \n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"__kernel void   findClippingFacesKernel(  __global const int4* pairs,\n"
+	"                                        __global const b3RigidBodyData_t* rigidBodies,\n"
+	"                                        __global const b3Collidable_t* collidables,\n"
+	"                                        __global const b3ConvexPolyhedronData_t* convexShapes,\n"
+	"                                        __global const float4* vertices,\n"
+	"                                        __global const float4* uniqueEdges,\n"
+	"                                        __global const b3GpuFace_t* faces,\n"
+	"                                        __global const int* indices,\n"
+	"                                        __global const float4* separatingNormals,\n"
+	"                                        __global const int* hasSeparatingAxis,\n"
+	"                                        __global int4* clippingFacesOut,\n"
+	"                                        __global float4* worldVertsA1,\n"
+	"                                        __global float4* worldNormalsA1,\n"
+	"                                        __global float4* worldVertsB1,\n"
+	"                                        int capacityWorldVerts,\n"
+	"                                        int numPairs\n"
+	"                                        )\n"
+	"{\n"
+	"    \n"
+	"	int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"    \n"
+	"	\n"
+	"	float minDist = -1e30f;\n"
+	"	float maxDist = 0.02f;\n"
+	"    \n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"        \n"
+	"		if (hasSeparatingAxis[i])\n"
+	"		{\n"
+	"            \n"
+	"			int bodyIndexA = pairs[i].x;\n"
+	"			int bodyIndexB = pairs[i].y;\n"
+	"			\n"
+	"			int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"			int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"			\n"
+	"			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"			\n"
+	"            \n"
+	"            \n"
+	"			int numLocalContactsOut = findClippingFaces(separatingNormals[i],\n"
+	"                                                        &convexShapes[shapeIndexA], &convexShapes[shapeIndexB],\n"
+	"                                                        rigidBodies[bodyIndexA].m_pos,rigidBodies[bodyIndexA].m_quat,\n"
+	"                                                        rigidBodies[bodyIndexB].m_pos,rigidBodies[bodyIndexB].m_quat,\n"
+	"                                                        worldVertsA1,\n"
+	"                                                        worldNormalsA1,\n"
+	"                                                        worldVertsB1,capacityWorldVerts,\n"
+	"                                                        minDist, maxDist,\n"
+	"                                                        vertices,faces,indices,\n"
+	"                                                        clippingFacesOut,i);\n"
+	"            \n"
+	"            \n"
+	"		}//		if (hasSeparatingAxis[i])\n"
+	"	}//	if (i<numPairs)\n"
+	"    \n"
+	"}\n"
+	"__kernel void   clipFacesAndFindContactsKernel(    __global const float4* separatingNormals,\n"
+	"                                                   __global const int* hasSeparatingAxis,\n"
+	"                                                   __global int4* clippingFacesOut,\n"
+	"                                                   __global float4* worldVertsA1,\n"
+	"                                                   __global float4* worldNormalsA1,\n"
+	"                                                   __global float4* worldVertsB1,\n"
+	"                                                   __global float4* worldVertsB2,\n"
+	"                                                    int vertexFaceCapacity,\n"
+	"                                                   int numPairs,\n"
+	"					                                        int debugMode\n"
+	"                                                   )\n"
+	"{\n"
+	"    int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	\n"
+	"    \n"
+	"	float minDist = -1e30f;\n"
+	"	float maxDist = 0.02f;\n"
+	"    \n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"        \n"
+	"		if (hasSeparatingAxis[i])\n"
+	"		{\n"
+	"            \n"
+	"//			int bodyIndexA = pairs[i].x;\n"
+	"	//		int bodyIndexB = pairs[i].y;\n"
+	"		    \n"
+	"            int numLocalContactsOut = 0;\n"
+	"            int capacityWorldVertsB2 = vertexFaceCapacity;\n"
+	"            \n"
+	"            __global float4* pVtxIn = &worldVertsB1[pairIndex*capacityWorldVertsB2];\n"
+	"            __global float4* pVtxOut = &worldVertsB2[pairIndex*capacityWorldVertsB2];\n"
+	"            \n"
+	"            {\n"
+	"                __global int4* clippingFaces = clippingFacesOut;\n"
+	"            \n"
+	"                \n"
+	"                int closestFaceA = clippingFaces[pairIndex].x;\n"
+	"                int closestFaceB = clippingFaces[pairIndex].y;\n"
+	"                int numVertsInA = clippingFaces[pairIndex].z;\n"
+	"                int numVertsInB = clippingFaces[pairIndex].w;\n"
+	"                \n"
+	"                int numVertsOut = 0;\n"
+	"                \n"
+	"                if (closestFaceA>=0)\n"
+	"                {\n"
+	"                    \n"
+	"                    \n"
+	"                    \n"
+	"                    // clip polygon to back of planes of all faces of hull A that are adjacent to witness face\n"
+	"                    \n"
+	"                    for(int e0=0;e0<numVertsInA;e0++)\n"
+	"                    {\n"
+	"                        const float4 aw = worldVertsA1[pairIndex*capacityWorldVertsB2+e0];\n"
+	"                        const float4 bw = worldVertsA1[pairIndex*capacityWorldVertsB2+((e0+1)%numVertsInA)];\n"
+	"                        const float4 WorldEdge0 = aw - bw;\n"
+	"                        float4 worldPlaneAnormal1 = worldNormalsA1[pairIndex];\n"
+	"                        float4 planeNormalWS1 = -cross3(WorldEdge0,worldPlaneAnormal1);\n"
+	"                        float4 worldA1 = aw;\n"
+	"                        float planeEqWS1 = -dot3F4(worldA1,planeNormalWS1);\n"
+	"                        float4 planeNormalWS = planeNormalWS1;\n"
+	"                        float planeEqWS=planeEqWS1;\n"
+	"                        numVertsOut = clipFaceGlobal(pVtxIn, numVertsInB, planeNormalWS,planeEqWS, pVtxOut);\n"
+	"                        __global float4* tmp = pVtxOut;\n"
+	"                        pVtxOut = pVtxIn;\n"
+	"                        pVtxIn = tmp;\n"
+	"                        numVertsInB = numVertsOut;\n"
+	"                        numVertsOut = 0;\n"
+	"                    }\n"
+	"                    \n"
+	"                    float4 planeNormalWS = worldNormalsA1[pairIndex];\n"
+	"                    float planeEqWS=-dot3F4(planeNormalWS,worldVertsA1[pairIndex*capacityWorldVertsB2]);\n"
+	"                    \n"
+	"                    for (int i=0;i<numVertsInB;i++)\n"
+	"                    {\n"
+	"                        float depth = dot3F4(planeNormalWS,pVtxIn[i])+planeEqWS;\n"
+	"                        if (depth <=minDist)\n"
+	"                        {\n"
+	"                            depth = minDist;\n"
+	"                        }\n"
+	"                        \n"
+	"                        if (depth <=maxDist)\n"
+	"                        {\n"
+	"                            float4 pointInWorld = pVtxIn[i];\n"
+	"                            pVtxOut[numLocalContactsOut++] = make_float4(pointInWorld.x,pointInWorld.y,pointInWorld.z,depth);\n"
+	"                        }\n"
+	"                    }\n"
+	"                    \n"
+	"                }\n"
+	"                clippingFaces[pairIndex].w =numLocalContactsOut;\n"
+	"                \n"
+	"            }\n"
+	"            \n"
+	"            for (int i=0;i<numLocalContactsOut;i++)\n"
+	"                pVtxIn[i] = pVtxOut[i];\n"
+	"                \n"
+	"		}//		if (hasSeparatingAxis[i])\n"
+	"	}//	if (i<numPairs)\n"
+	"    \n"
+	"}\n"
+	"__kernel void   newContactReductionKernel( __global int4* pairs,\n"
+	"                                                   __global const b3RigidBodyData_t* rigidBodies,\n"
+	"                                                   __global const float4* separatingNormals,\n"
+	"                                                   __global const int* hasSeparatingAxis,\n"
+	"                                                   __global struct b3Contact4Data* globalContactsOut,\n"
+	"                                                   __global int4* clippingFaces,\n"
+	"                                                   __global float4* worldVertsB2,\n"
+	"                                                   volatile __global int* nGlobalContactsOut,\n"
+	"                                                   int vertexFaceCapacity,\n"
+	"												   int contactCapacity,\n"
+	"                                                   int numPairs\n"
+	"                                                   )\n"
+	"{\n"
+	"    int i = get_global_id(0);\n"
+	"	int pairIndex = i;\n"
+	"	\n"
+	"    int4 contactIdx;\n"
+	"    contactIdx=make_int4(0,1,2,3);\n"
+	"    \n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"        \n"
+	"		if (hasSeparatingAxis[i])\n"
+	"		{\n"
+	"            \n"
+	"			\n"
+	"            \n"
+	"            \n"
+	"			int nPoints = clippingFaces[pairIndex].w;\n"
+	"           \n"
+	"            if (nPoints>0)\n"
+	"            {\n"
+	"                 __global float4* pointsIn = &worldVertsB2[pairIndex*vertexFaceCapacity];\n"
+	"                float4 normal = -separatingNormals[i];\n"
+	"                \n"
+	"                int nReducedContacts = extractManifoldSequentialGlobal(pointsIn, nPoints, normal, &contactIdx);\n"
+	"            \n"
+	"				int mprContactIndex = pairs[pairIndex].z;\n"
+	"                int dstIdx = mprContactIndex;\n"
+	"				if (dstIdx<0)\n"
+	"				{\n"
+	"	                AppendInc( nGlobalContactsOut, dstIdx );\n"
+	"				}\n"
+	"//#if 0\n"
+	"                \n"
+	"				if (dstIdx < contactCapacity)\n"
+	"				{\n"
+	"					__global struct b3Contact4Data* c = &globalContactsOut[dstIdx];\n"
+	"					c->m_worldNormalOnB = -normal;\n"
+	"					c->m_restituitionCoeffCmp = (0.f*0xffff);c->m_frictionCoeffCmp = (0.7f*0xffff);\n"
+	"					c->m_batchIdx = pairIndex;\n"
+	"					int bodyA = pairs[pairIndex].x;\n"
+	"					int bodyB = pairs[pairIndex].y;\n"
+	"					pairs[pairIndex].w = dstIdx;\n"
+	"					c->m_bodyAPtrAndSignBit = rigidBodies[bodyA].m_invMass==0?-bodyA:bodyA;\n"
+	"					c->m_bodyBPtrAndSignBit = rigidBodies[bodyB].m_invMass==0?-bodyB:bodyB;\n"
+	"                    c->m_childIndexA =-1;\n"
+	"					c->m_childIndexB =-1;\n"
+	"                    switch (nReducedContacts)\n"
+	"                    {\n"
+	"                        case 4:\n"
+	"                            c->m_worldPosB[3] = pointsIn[contactIdx.w];\n"
+	"                        case 3:\n"
+	"                            c->m_worldPosB[2] = pointsIn[contactIdx.z];\n"
+	"                        case 2:\n"
+	"                            c->m_worldPosB[1] = pointsIn[contactIdx.y];\n"
+	"                        case 1:\n"
+	"							if (mprContactIndex<0)//test\n"
+	"	                            c->m_worldPosB[0] = pointsIn[contactIdx.x];\n"
+	"                        default:\n"
+	"                        {\n"
+	"                        }\n"
+	"                    };\n"
+	"                    \n"
+	"					GET_NPOINTS(*c) = nReducedContacts;\n"
+	"                    \n"
+	"                 }\n"
+	"                 \n"
+	"                \n"
+	"//#endif\n"
+	"				\n"
+	"			}//		if (numContactsOut>0)\n"
+	"		}//		if (hasSeparatingAxis[i])\n"
+	"	}//	if (i<numPairs)\n"
+	"    \n"
+	"    \n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl
new file mode 100644
index 0000000..31ca43b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl
@@ -0,0 +1,1220 @@
+
+//keep this enum in sync with the CPU version (in btCollidable.h)
+//written by Erwin Coumans
+
+
+#define SHAPE_CONVEX_HULL 3
+#define SHAPE_CONCAVE_TRIMESH 5
+#define TRIANGLE_NUM_CONVEX_FACES 5
+#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6
+
+#define B3_MAX_STACK_DEPTH 256
+
+
+typedef unsigned int u32;
+
+///keep this in sync with btCollidable.h
+typedef struct
+{
+	union {
+		int m_numChildShapes;
+		int m_bvhIndex;
+	};
+	union
+	{
+		float m_radius;
+		int	m_compoundBvhIndex;
+	};
+	
+	int m_shapeType;
+	int m_shapeIndex;
+	
+} btCollidableGpu;
+
+#define MAX_NUM_PARTS_IN_BITS 10
+
+///b3QuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+typedef struct
+{
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes
+	int	m_escapeIndexOrTriangleIndex;
+} b3QuantizedBvhNode;
+
+typedef struct
+{
+	float4		m_aabbMin;
+	float4		m_aabbMax;
+	float4		m_quantization;
+	int			m_numNodes;
+	int			m_numSubTrees;
+	int			m_nodeOffset;
+	int			m_subTreeOffset;
+
+} b3BvhInfo;
+
+
+int	getTriangleIndex(const b3QuantizedBvhNode* rootNode)
+{
+	unsigned int x=0;
+	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
+	// Get only the lower bits where the triangle index is stored
+	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));
+}
+
+int	getTriangleIndexGlobal(__global const b3QuantizedBvhNode* rootNode)
+{
+	unsigned int x=0;
+	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
+	// Get only the lower bits where the triangle index is stored
+	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));
+}
+
+int isLeafNode(const b3QuantizedBvhNode* rootNode)
+{
+	//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;
+}
+
+int isLeafNodeGlobal(__global const b3QuantizedBvhNode* rootNode)
+{
+	//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;
+}
+	
+int getEscapeIndex(const b3QuantizedBvhNode* rootNode)
+{
+	return -rootNode->m_escapeIndexOrTriangleIndex;
+}
+
+int getEscapeIndexGlobal(__global const b3QuantizedBvhNode* rootNode)
+{
+	return -rootNode->m_escapeIndexOrTriangleIndex;
+}
+
+
+typedef struct
+{
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes, points to the root of the subtree
+	int			m_rootNodeIndex;
+	//4 bytes
+	int			m_subtreeSize;
+	int			m_padding[3];
+} b3BvhSubtreeInfo;
+
+
+
+
+
+
+
+typedef struct
+{
+	float4	m_childPosition;
+	float4	m_childOrientation;
+	int m_shapeIndex;
+	int m_unused0;
+	int m_unused1;
+	int m_unused2;
+} btGpuChildShape;
+
+
+typedef struct
+{
+	float4 m_pos;
+	float4 m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_collidableIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} BodyData;
+
+
+typedef struct  
+{
+	float4		m_localCenter;
+	float4		m_extents;
+	float4		mC;
+	float4		mE;
+	
+	float			m_radius;
+	int	m_faceOffset;
+	int m_numFaces;
+	int	m_numVertices;
+
+	int m_vertexOffset;
+	int	m_uniqueEdgesOffset;
+	int	m_numUniqueEdges;
+	int m_unused;
+} ConvexPolyhedronCL;
+
+typedef struct 
+{
+	union
+	{
+		float4	m_min;
+		float   m_minElems[4];
+		int			m_minIndices[4];
+	};
+	union
+	{
+		float4	m_max;
+		float   m_maxElems[4];
+		int			m_maxIndices[4];
+	};
+} btAabbCL;
+
+#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
+#include "Bullet3Common/shared/b3Int2.h"
+
+
+
+typedef struct
+{
+	float4 m_plane;
+	int m_indexOffset;
+	int m_numIndices;
+} btGpuFace;
+
+#define make_float4 (float4)
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+
+	
+//	float4 a1 = make_float4(a.xyz,0.f);
+//	float4 b1 = make_float4(b.xyz,0.f);
+
+//	return cross(a1,b1);
+
+//float4 c = make_float4(a.y*b.z - a.z*b.y,a.z*b.x - a.x*b.z,a.x*b.y - a.y*b.x,0.f);
+	
+	//	float4 c = make_float4(a.y*b.z - a.z*b.y,1.f,a.x*b.y - a.y*b.x,0.f);
+	
+	//return c;
+}
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	v = make_float4(v.xyz,0.f);
+	return fast_normalize(v);
+}
+
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+Quaternion qtNormalize(Quaternion in);
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec);
+
+__inline
+Quaternion qtInvert(Quaternion q);
+
+
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtNormalize(Quaternion in)
+{
+	return fastNormalize4(in);
+//	in /= length( in );
+//	return in;
+}
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+__inline
+float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)
+{
+	return qtRotate( *orientation, *p ) + (*translation);
+}
+
+
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = make_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+}
+
+inline void projectLocal(const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, 
+const float4* dir, const float4* vertices, float* min, float* max)
+{
+	min[0] = FLT_MAX;
+	max[0] = -FLT_MAX;
+	int numVerts = hull->m_numVertices;
+
+	const float4 localDir = qtInvRotate(orn,*dir);
+	float offset = dot(pos,*dir);
+	for(int i=0;i<numVerts;i++)
+	{
+		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);
+		if(dp < min[0])	
+			min[0] = dp;
+		if(dp > max[0])	
+			max[0] = dp;
+	}
+	if(min[0]>max[0])
+	{
+		float tmp = min[0];
+		min[0] = max[0];
+		max[0] = tmp;
+	}
+	min[0] += offset;
+	max[0] += offset;
+}
+
+inline void project(__global const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, 
+const float4* dir, __global const float4* vertices, float* min, float* max)
+{
+	min[0] = FLT_MAX;
+	max[0] = -FLT_MAX;
+	int numVerts = hull->m_numVertices;
+
+	const float4 localDir = qtInvRotate(orn,*dir);
+	float offset = dot(pos,*dir);
+	for(int i=0;i<numVerts;i++)
+	{
+		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);
+		if(dp < min[0])	
+			min[0] = dp;
+		if(dp > max[0])	
+			max[0] = dp;
+	}
+	if(min[0]>max[0])
+	{
+		float tmp = min[0];
+		min[0] = max[0];
+		max[0] = tmp;
+	}
+	min[0] += offset;
+	max[0] += offset;
+}
+
+inline bool TestSepAxisLocalA(const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA,const float4 ornA,
+	const float4 posB,const float4 ornB,
+	float4* sep_axis, const float4* verticesA, __global const float4* verticesB,float* depth)
+{
+	float Min0,Max0;
+	float Min1,Max1;
+	projectLocal(hullA,posA,ornA,sep_axis,verticesA, &Min0, &Max0);
+	project(hullB,posB,ornB, sep_axis,verticesB, &Min1, &Max1);
+
+	if(Max0<Min1 || Max1<Min0)
+		return false;
+
+	float d0 = Max0 - Min1;
+	float d1 = Max1 - Min0;
+	*depth = d0<d1 ? d0:d1;
+	return true;
+}
+
+
+
+
+inline bool IsAlmostZero(const float4 v)
+{
+	if(fabs(v.x)>1e-6f || fabs(v.y)>1e-6f || fabs(v.z)>1e-6f)
+		return false;
+	return true;
+}
+
+
+
+bool findSeparatingAxisLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	
+	const float4* verticesA, 
+	const float4* uniqueEdgesA, 
+	const btGpuFace* facesA,
+	const int*  indicesA,
+
+	__global const float4* verticesB, 
+	__global const float4* uniqueEdgesB, 
+	__global const btGpuFace* facesB,
+	__global const int*  indicesB,
+	float4* sep,
+	float* dmin)
+{
+	
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+	int curPlaneTests=0;
+	{
+		int numFacesA = hullA->m_numFaces;
+		// Test normals from hullA
+		for(int i=0;i<numFacesA;i++)
+		{
+			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;
+			float4 faceANormalWS = qtRotate(ornA,normal);
+			if (dot3F4(DeltaC2,faceANormalWS)<0)
+				faceANormalWS*=-1.f;
+			curPlaneTests++;
+			float d;
+			if(!TestSepAxisLocalA( hullA, hullB, posA,ornA,posB,ornB,&faceANormalWS, verticesA, verticesB,&d))
+				return false;
+			if(d<*dmin)
+			{
+				*dmin = d;
+				*sep = faceANormalWS;
+			}
+		}
+	}
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+bool findSeparatingAxisLocalB(	__global const ConvexPolyhedronCL* hullA,  const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	__global const float4* verticesA, 
+	__global const float4* uniqueEdgesA, 
+	__global const btGpuFace* facesA,
+	__global const int*  indicesA,
+	const float4* verticesB,
+	const float4* uniqueEdgesB, 
+	const btGpuFace* facesB,
+	const int*  indicesB,
+	float4* sep,
+	float* dmin)
+{
+
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+	int curPlaneTests=0;
+	{
+		int numFacesA = hullA->m_numFaces;
+		// Test normals from hullA
+		for(int i=0;i<numFacesA;i++)
+		{
+			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;
+			float4 faceANormalWS = qtRotate(ornA,normal);
+			if (dot3F4(DeltaC2,faceANormalWS)<0)
+				faceANormalWS *= -1.f;
+			curPlaneTests++;
+			float d;
+			if(!TestSepAxisLocalA( hullB, hullA, posB,ornB,posA,ornA, &faceANormalWS, verticesB,verticesA, &d))
+				return false;
+			if(d<*dmin)
+			{
+				*dmin = d;
+				*sep = faceANormalWS;
+			}
+		}
+	}
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+
+
+bool findSeparatingAxisEdgeEdgeLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, 
+	const float4 posA1,
+	const float4 ornA,
+	const float4 posB1,
+	const float4 ornB,
+	const float4 DeltaC2,
+	const float4* verticesA, 
+	const float4* uniqueEdgesA, 
+	const btGpuFace* facesA,
+	const int*  indicesA,
+	__global const float4* verticesB, 
+	__global const float4* uniqueEdgesB, 
+	__global const btGpuFace* facesB,
+	__global const int*  indicesB,
+		float4* sep,
+	float* dmin)
+{
+
+
+	float4 posA = posA1;
+	posA.w = 0.f;
+	float4 posB = posB1;
+	posB.w = 0.f;
+
+	int curPlaneTests=0;
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for(int e0=0;e0<hullA->m_numUniqueEdges;e0++)
+	{
+		const float4 edge0 = uniqueEdgesA[hullA->m_uniqueEdgesOffset+e0];
+		float4 edge0World = qtRotate(ornA,edge0);
+
+		for(int e1=0;e1<hullB->m_numUniqueEdges;e1++)
+		{
+			const float4 edge1 = uniqueEdgesB[hullB->m_uniqueEdgesOffset+e1];
+			float4 edge1World = qtRotate(ornB,edge1);
+
+
+			float4 crossje = cross3(edge0World,edge1World);
+
+			curEdgeEdge++;
+			if(!IsAlmostZero(crossje))
+			{
+				crossje = normalize3(crossje);
+				if (dot3F4(DeltaC2,crossje)<0)
+					crossje *= -1.f;
+
+				float dist;
+				bool result = true;
+				{
+					float Min0,Max0;
+					float Min1,Max1;
+					projectLocal(hullA,posA,ornA,&crossje,verticesA, &Min0, &Max0);
+					project(hullB,posB,ornB,&crossje,verticesB, &Min1, &Max1);
+				
+					if(Max0<Min1 || Max1<Min0)
+						result = false;
+				
+					float d0 = Max0 - Min1;
+					float d1 = Max1 - Min0;
+					dist = d0<d1 ? d0:d1;
+					result = true;
+
+				}
+				
+
+				if(dist<*dmin)
+				{
+					*dmin = dist;
+					*sep = crossje;
+				}
+			}
+		}
+
+	}
+
+	
+	if((dot3F4(-DeltaC2,*sep))>0.0f)
+	{
+		*sep = -(*sep);
+	}
+	return true;
+}
+
+
+
+inline int	findClippingFaces(const float4 separatingNormal,
+                      const ConvexPolyhedronCL* hullA, 
+					  __global const ConvexPolyhedronCL* hullB,
+                      const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB,
+                       __global float4* worldVertsA1,
+                      __global float4* worldNormalsA1,
+                      __global float4* worldVertsB1,
+                      int capacityWorldVerts,
+                      const float minDist, float maxDist,
+					  const float4* verticesA,
+                      const btGpuFace* facesA,
+                      const int* indicesA,
+					  __global const float4* verticesB,
+                      __global const btGpuFace* facesB,
+                      __global const int* indicesB,
+                      __global int4* clippingFaces, int pairIndex)
+{
+	int numContactsOut = 0;
+	int numWorldVertsB1= 0;
+    
+    
+	int closestFaceB=0;
+	float dmax = -FLT_MAX;
+    
+	{
+		for(int face=0;face<hullB->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(facesB[hullB->m_faceOffset+face].m_plane.x,
+                                              facesB[hullB->m_faceOffset+face].m_plane.y, facesB[hullB->m_faceOffset+face].m_plane.z,0.f);
+			const float4 WorldNormal = qtRotate(ornB, Normal);
+			float d = dot3F4(WorldNormal,separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+    
+	{
+		const btGpuFace polyB = facesB[hullB->m_faceOffset+closestFaceB];
+		int numVertices = polyB.m_numIndices;
+        if (numVertices>capacityWorldVerts)
+            numVertices = capacityWorldVerts;
+        if (numVertices<0)
+            numVertices = 0;
+        
+		for(int e0=0;e0<numVertices;e0++)
+		{
+            if (e0<capacityWorldVerts)
+            {
+                const float4 b = verticesB[hullB->m_vertexOffset+indicesB[polyB.m_indexOffset+e0]];
+                worldVertsB1[pairIndex*capacityWorldVerts+numWorldVertsB1++] = transform(&b,&posB,&ornB);
+            }
+		}
+	}
+    
+    int closestFaceA=0;
+	{
+		float dmin = FLT_MAX;
+		for(int face=0;face<hullA->m_numFaces;face++)
+		{
+			const float4 Normal = make_float4(
+                                              facesA[hullA->m_faceOffset+face].m_plane.x,
+                                              facesA[hullA->m_faceOffset+face].m_plane.y,
+                                              facesA[hullA->m_faceOffset+face].m_plane.z,
+                                              0.f);
+			const float4 faceANormalWS = qtRotate(ornA,Normal);
+            
+			float d = dot3F4(faceANormalWS,separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+                worldNormalsA1[pairIndex] = faceANormalWS;
+			}
+		}
+	}
+    
+    int numVerticesA = facesA[hullA->m_faceOffset+closestFaceA].m_numIndices;
+    if (numVerticesA>capacityWorldVerts)
+       numVerticesA = capacityWorldVerts;
+    if (numVerticesA<0)
+        numVerticesA=0;
+    
+	for(int e0=0;e0<numVerticesA;e0++)
+	{
+        if (e0<capacityWorldVerts)
+        {
+            const float4 a = verticesA[hullA->m_vertexOffset+indicesA[facesA[hullA->m_faceOffset+closestFaceA].m_indexOffset+e0]];
+            worldVertsA1[pairIndex*capacityWorldVerts+e0] = transform(&a, &posA,&ornA);
+        }
+    }
+    
+    clippingFaces[pairIndex].x = closestFaceA;
+    clippingFaces[pairIndex].y = closestFaceB;
+    clippingFaces[pairIndex].z = numVerticesA;
+    clippingFaces[pairIndex].w = numWorldVertsB1;
+    
+    
+	return numContactsOut;
+}
+
+
+
+
+// work-in-progress
+__kernel void   findConcaveSeparatingAxisVertexFaceKernel( __global int4* concavePairs,
+                                                __global const BodyData* rigidBodies,
+                                                __global const btCollidableGpu* collidables,
+                                                __global const ConvexPolyhedronCL* convexShapes,
+                                                __global const float4* vertices,
+                                                __global const float4* uniqueEdges,
+                                                __global const btGpuFace* faces,
+                                                __global const int* indices,
+                                                __global const btGpuChildShape* gpuChildShapes,
+                                                __global btAabbCL* aabbs,
+                                                __global float4* concaveSeparatingNormalsOut,
+                                                __global int* concaveHasSeparatingNormals,
+                                                __global int4* clippingFacesOut,
+                                                __global float4* worldVertsA1GPU,
+                                                __global float4*  worldNormalsAGPU,
+                                                __global float4* worldVertsB1GPU,
+                                                __global float* dmins,
+                                                int vertexFaceCapacity,
+                                                int numConcavePairs
+                                                )
+{
+    
+	int i = get_global_id(0);
+	if (i>=numConcavePairs)
+		return;
+    
+	concaveHasSeparatingNormals[i] = 0;
+    
+	int pairIdx = i;
+    
+	int bodyIndexA = concavePairs[i].x;
+	int bodyIndexB = concavePairs[i].y;
+    
+	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+    
+	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+    
+	if (collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL&&
+		collidables[collidableIndexB].m_shapeType!=SHAPE_COMPOUND_OF_CONVEX_HULLS)
+	{
+		concavePairs[pairIdx].w = -1;
+		return;
+	}
+    
+    
+    
+	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+	int numActualConcaveConvexTests = 0;
+	
+	int f = concavePairs[i].z;
+	
+	bool overlap = false;
+	
+	ConvexPolyhedronCL convexPolyhedronA;
+    
+	//add 3 vertices of the triangle
+	convexPolyhedronA.m_numVertices = 3;
+	convexPolyhedronA.m_vertexOffset = 0;
+	float4	localCenter = make_float4(0.f,0.f,0.f,0.f);
+    
+	btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];
+	float4 triMinAabb, triMaxAabb;
+	btAabbCL triAabb;
+	triAabb.m_min = make_float4(1e30f,1e30f,1e30f,0.f);
+	triAabb.m_max = make_float4(-1e30f,-1e30f,-1e30f,0.f);
+	
+	float4 verticesA[3];
+	for (int i=0;i<3;i++)
+	{
+		int index = indices[face.m_indexOffset+i];
+		float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];
+		verticesA[i] = vert;
+		localCenter += vert;
+        
+		triAabb.m_min = min(triAabb.m_min,vert);
+		triAabb.m_max = max(triAabb.m_max,vert);
+        
+	}
+    
+	overlap = true;
+	overlap = (triAabb.m_min.x > aabbs[bodyIndexB].m_max.x || triAabb.m_max.x < aabbs[bodyIndexB].m_min.x) ? false : overlap;
+	overlap = (triAabb.m_min.z > aabbs[bodyIndexB].m_max.z || triAabb.m_max.z < aabbs[bodyIndexB].m_min.z) ? false : overlap;
+	overlap = (triAabb.m_min.y > aabbs[bodyIndexB].m_max.y || triAabb.m_max.y < aabbs[bodyIndexB].m_min.y) ? false : overlap;
+    
+	if (overlap)
+	{
+		float dmin = FLT_MAX;
+		int hasSeparatingAxis=5;
+		float4 sepAxis=make_float4(1,2,3,4);
+        
+		int localCC=0;
+		numActualConcaveConvexTests++;
+        
+		//a triangle has 3 unique edges
+		convexPolyhedronA.m_numUniqueEdges = 3;
+		convexPolyhedronA.m_uniqueEdgesOffset = 0;
+		float4 uniqueEdgesA[3];
+		
+		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);
+		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);
+		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);
+        
+        
+		convexPolyhedronA.m_faceOffset = 0;
+        
+		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);
+        
+		btGpuFace facesA[TRIANGLE_NUM_CONVEX_FACES];
+		int indicesA[3+3+2+2+2];
+		int curUsedIndices=0;
+		int fidx=0;
+        
+		//front size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[0] = 0;
+			indicesA[1] = 1;
+			indicesA[2] = 2;
+			curUsedIndices+=3;
+			float c = face.m_plane.w;
+			facesA[fidx].m_plane.x = normal.x;
+			facesA[fidx].m_plane.y = normal.y;
+			facesA[fidx].m_plane.z = normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+		//back size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[3]=2;
+			indicesA[4]=1;
+			indicesA[5]=0;
+			curUsedIndices+=3;
+			float c = dot(normal,verticesA[0]);
+			float c1 = -face.m_plane.w;
+			facesA[fidx].m_plane.x = -normal.x;
+			facesA[fidx].m_plane.y = -normal.y;
+			facesA[fidx].m_plane.z = -normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+        
+		bool addEdgePlanes = true;
+		if (addEdgePlanes)
+		{
+			int numVertices=3;
+			int prevVertex = numVertices-1;
+			for (int i=0;i<numVertices;i++)
+			{
+				float4 v0 = verticesA[i];
+				float4 v1 = verticesA[prevVertex];
+                
+				float4 edgeNormal = normalize(cross(normal,v1-v0));
+				float c = -dot(edgeNormal,v0);
+                
+				facesA[fidx].m_numIndices = 2;
+				facesA[fidx].m_indexOffset=curUsedIndices;
+				indicesA[curUsedIndices++]=i;
+				indicesA[curUsedIndices++]=prevVertex;
+                
+				facesA[fidx].m_plane.x = edgeNormal.x;
+				facesA[fidx].m_plane.y = edgeNormal.y;
+				facesA[fidx].m_plane.z = edgeNormal.z;
+				facesA[fidx].m_plane.w = c;
+				fidx++;
+				prevVertex = i;
+			}
+		}
+		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;
+		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);
+        
+        
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		posA.w = 0.f;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+		posB.w = 0.f;
+        
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 ornB =rigidBodies[bodyIndexB].m_quat;
+        
+		
+        
+        
+		///////////////////
+		///compound shape support
+        
+		if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			int compoundChild = concavePairs[pairIdx].w;
+			int childShapeIndexB = compoundChild;//collidables[collidableIndexB].m_shapeIndex+compoundChild;
+			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			float4 newPosB = transform(&childPosB,&posB,&ornB);
+			float4 newOrnB = qtMul(ornB,childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+			shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+		}
+		//////////////////
+        
+		float4 c0local = convexPolyhedronA.m_localCenter;
+		float4 c0 = transform(&c0local, &posA, &ornA);
+		float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		float4 c1 = transform(&c1local,&posB,&ornB);
+		const float4 DeltaC2 = c0 - c1;
+        
+        
+		bool sepA = findSeparatingAxisLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],
+                                             posA,ornA,
+                                             posB,ornB,
+                                             DeltaC2,
+                                             verticesA,uniqueEdgesA,facesA,indicesA,
+                                             vertices,uniqueEdges,faces,indices,
+                                             &sepAxis,&dmin);
+		hasSeparatingAxis = 4;
+		if (!sepA)
+		{
+			hasSeparatingAxis = 0;
+		} else
+		{
+			bool sepB = findSeparatingAxisLocalB(	&convexShapes[shapeIndexB],&convexPolyhedronA,
+                                                 posB,ornB,
+                                                 posA,ornA,
+                                                 DeltaC2,
+                                                 vertices,uniqueEdges,faces,indices,
+                                                 verticesA,uniqueEdgesA,facesA,indicesA,
+                                                 &sepAxis,&dmin);
+            
+			if (!sepB)
+			{
+				hasSeparatingAxis = 0;
+			} else
+			{
+				hasSeparatingAxis = 1;
+			}
+		}	
+		
+		if (hasSeparatingAxis)
+		{
+            dmins[i] = dmin;
+			concaveSeparatingNormalsOut[pairIdx]=sepAxis;
+			concaveHasSeparatingNormals[i]=1;
+            
+		} else
+		{	
+			//mark this pair as in-active
+			concavePairs[pairIdx].w = -1;
+		}
+	}
+	else
+	{	
+		//mark this pair as in-active
+		concavePairs[pairIdx].w = -1;
+	}
+}
+
+
+
+
+// work-in-progress
+__kernel void   findConcaveSeparatingAxisEdgeEdgeKernel( __global int4* concavePairs,
+                                                          __global const BodyData* rigidBodies,
+                                                          __global const btCollidableGpu* collidables,
+                                                          __global const ConvexPolyhedronCL* convexShapes,
+                                                          __global const float4* vertices,
+                                                          __global const float4* uniqueEdges,
+                                                          __global const btGpuFace* faces,
+                                                          __global const int* indices,
+                                                          __global const btGpuChildShape* gpuChildShapes,
+                                                          __global btAabbCL* aabbs,
+                                                          __global float4* concaveSeparatingNormalsOut,
+                                                          __global int* concaveHasSeparatingNormals,
+                                                          __global int4* clippingFacesOut,
+                                                          __global float4* worldVertsA1GPU,
+                                                          __global float4*  worldNormalsAGPU,
+                                                          __global float4* worldVertsB1GPU,
+                                                          __global float* dmins,
+                                                          int vertexFaceCapacity,
+                                                          int numConcavePairs
+                                                          )
+{
+    
+	int i = get_global_id(0);
+	if (i>=numConcavePairs)
+		return;
+    
+	if (!concaveHasSeparatingNormals[i])
+        return;
+    
+	int pairIdx = i;
+    
+	int bodyIndexA = concavePairs[i].x;
+	int bodyIndexB = concavePairs[i].y;
+    
+	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;
+	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;
+    
+	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;
+	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;
+    
+    
+	int numFacesA = convexShapes[shapeIndexA].m_numFaces;
+	int numActualConcaveConvexTests = 0;
+	
+	int f = concavePairs[i].z;
+	
+	bool overlap = false;
+	
+	ConvexPolyhedronCL convexPolyhedronA;
+    
+	//add 3 vertices of the triangle
+	convexPolyhedronA.m_numVertices = 3;
+	convexPolyhedronA.m_vertexOffset = 0;
+	float4	localCenter = make_float4(0.f,0.f,0.f,0.f);
+    
+	btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];
+	float4 triMinAabb, triMaxAabb;
+	btAabbCL triAabb;
+	triAabb.m_min = make_float4(1e30f,1e30f,1e30f,0.f);
+	triAabb.m_max = make_float4(-1e30f,-1e30f,-1e30f,0.f);
+	
+	float4 verticesA[3];
+	for (int i=0;i<3;i++)
+	{
+		int index = indices[face.m_indexOffset+i];
+		float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];
+		verticesA[i] = vert;
+		localCenter += vert;
+        
+		triAabb.m_min = min(triAabb.m_min,vert);
+		triAabb.m_max = max(triAabb.m_max,vert);
+        
+	}
+    
+	overlap = true;
+	overlap = (triAabb.m_min.x > aabbs[bodyIndexB].m_max.x || triAabb.m_max.x < aabbs[bodyIndexB].m_min.x) ? false : overlap;
+	overlap = (triAabb.m_min.z > aabbs[bodyIndexB].m_max.z || triAabb.m_max.z < aabbs[bodyIndexB].m_min.z) ? false : overlap;
+	overlap = (triAabb.m_min.y > aabbs[bodyIndexB].m_max.y || triAabb.m_max.y < aabbs[bodyIndexB].m_min.y) ? false : overlap;
+    
+	if (overlap)
+	{
+		float dmin = dmins[i];
+		int hasSeparatingAxis=5;
+		float4 sepAxis=make_float4(1,2,3,4);
+        sepAxis = concaveSeparatingNormalsOut[pairIdx];
+        
+		int localCC=0;
+		numActualConcaveConvexTests++;
+        
+		//a triangle has 3 unique edges
+		convexPolyhedronA.m_numUniqueEdges = 3;
+		convexPolyhedronA.m_uniqueEdgesOffset = 0;
+		float4 uniqueEdgesA[3];
+		
+		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);
+		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);
+		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);
+        
+        
+		convexPolyhedronA.m_faceOffset = 0;
+        
+		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);
+        
+		btGpuFace facesA[TRIANGLE_NUM_CONVEX_FACES];
+		int indicesA[3+3+2+2+2];
+		int curUsedIndices=0;
+		int fidx=0;
+        
+		//front size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[0] = 0;
+			indicesA[1] = 1;
+			indicesA[2] = 2;
+			curUsedIndices+=3;
+			float c = face.m_plane.w;
+			facesA[fidx].m_plane.x = normal.x;
+			facesA[fidx].m_plane.y = normal.y;
+			facesA[fidx].m_plane.z = normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+		//back size of triangle
+		{
+			facesA[fidx].m_indexOffset=curUsedIndices;
+			indicesA[3]=2;
+			indicesA[4]=1;
+			indicesA[5]=0;
+			curUsedIndices+=3;
+			float c = dot(normal,verticesA[0]);
+			float c1 = -face.m_plane.w;
+			facesA[fidx].m_plane.x = -normal.x;
+			facesA[fidx].m_plane.y = -normal.y;
+			facesA[fidx].m_plane.z = -normal.z;
+			facesA[fidx].m_plane.w = c;
+			facesA[fidx].m_numIndices=3;
+		}
+		fidx++;
+        
+		bool addEdgePlanes = true;
+		if (addEdgePlanes)
+		{
+			int numVertices=3;
+			int prevVertex = numVertices-1;
+			for (int i=0;i<numVertices;i++)
+			{
+				float4 v0 = verticesA[i];
+				float4 v1 = verticesA[prevVertex];
+                
+				float4 edgeNormal = normalize(cross(normal,v1-v0));
+				float c = -dot(edgeNormal,v0);
+                
+				facesA[fidx].m_numIndices = 2;
+				facesA[fidx].m_indexOffset=curUsedIndices;
+				indicesA[curUsedIndices++]=i;
+				indicesA[curUsedIndices++]=prevVertex;
+                
+				facesA[fidx].m_plane.x = edgeNormal.x;
+				facesA[fidx].m_plane.y = edgeNormal.y;
+				facesA[fidx].m_plane.z = edgeNormal.z;
+				facesA[fidx].m_plane.w = c;
+				fidx++;
+				prevVertex = i;
+			}
+		}
+		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;
+		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);
+        
+        
+		float4 posA = rigidBodies[bodyIndexA].m_pos;
+		posA.w = 0.f;
+		float4 posB = rigidBodies[bodyIndexB].m_pos;
+		posB.w = 0.f;
+        
+		float4 ornA = rigidBodies[bodyIndexA].m_quat;
+		float4 ornB =rigidBodies[bodyIndexB].m_quat;
+        
+		
+        
+        
+		///////////////////
+		///compound shape support
+        
+		if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)
+		{
+			int compoundChild = concavePairs[pairIdx].w;
+			int childShapeIndexB = compoundChild;//collidables[collidableIndexB].m_shapeIndex+compoundChild;
+			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;
+			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;
+			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;
+			float4 newPosB = transform(&childPosB,&posB,&ornB);
+			float4 newOrnB = qtMul(ornB,childOrnB);
+			posB = newPosB;
+			ornB = newOrnB;
+			shapeIndexB = collidables[childColIndexB].m_shapeIndex;
+		}
+		//////////////////
+        
+		float4 c0local = convexPolyhedronA.m_localCenter;
+		float4 c0 = transform(&c0local, &posA, &ornA);
+		float4 c1local = convexShapes[shapeIndexB].m_localCenter;
+		float4 c1 = transform(&c1local,&posB,&ornB);
+		const float4 DeltaC2 = c0 - c1;
+        
+        
+		{
+			bool sepEE = findSeparatingAxisEdgeEdgeLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],
+                                                              posA,ornA,
+                                                              posB,ornB,
+                                                              DeltaC2,
+                                                              verticesA,uniqueEdgesA,facesA,indicesA,
+                                                              vertices,uniqueEdges,faces,indices,
+                                                              &sepAxis,&dmin);
+                
+			if (!sepEE)
+			{
+				hasSeparatingAxis = 0;
+			} else
+			{
+				hasSeparatingAxis = 1;
+			}
+		}
+		
+		
+		if (hasSeparatingAxis)
+		{
+			sepAxis.w = dmin;
+            dmins[i] = dmin;
+			concaveSeparatingNormalsOut[pairIdx]=sepAxis;
+			concaveHasSeparatingNormals[i]=1;
+           
+ 	float minDist = -1e30f;
+			float maxDist = 0.02f;
+
+            
+            findClippingFaces(sepAxis,
+                              &convexPolyhedronA,
+                              &convexShapes[shapeIndexB],
+                              posA,ornA,
+                              posB,ornB,
+                              worldVertsA1GPU,
+                              worldNormalsAGPU,
+                              worldVertsB1GPU,
+                              vertexFaceCapacity,
+                              minDist, maxDist,
+                              verticesA,
+                              facesA,
+                              indicesA,
+                              vertices,
+                              faces,
+                              indices,
+                              clippingFacesOut, pairIdx);
+	           
+            
+		} else
+		{	
+			//mark this pair as in-active
+			concavePairs[pairIdx].w = -1;
+		}
+	}
+	else
+	{	
+		//mark this pair as in-active
+		concavePairs[pairIdx].w = -1;
+	}
+	
+	concavePairs[i].z = -1;//for the next stage, z is used to determine existing contact points
+}
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcaveKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcaveKernels.h
new file mode 100644
index 0000000..a60702c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satConcaveKernels.h
@@ -0,0 +1,1456 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* satConcaveKernelsCL =
+	"//keep this enum in sync with the CPU version (in btCollidable.h)\n"
+	"//written by Erwin Coumans\n"
+	"#define SHAPE_CONVEX_HULL 3\n"
+	"#define SHAPE_CONCAVE_TRIMESH 5\n"
+	"#define TRIANGLE_NUM_CONVEX_FACES 5\n"
+	"#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6\n"
+	"#define B3_MAX_STACK_DEPTH 256\n"
+	"typedef unsigned int u32;\n"
+	"///keep this in sync with btCollidable.h\n"
+	"typedef struct\n"
+	"{\n"
+	"	union {\n"
+	"		int m_numChildShapes;\n"
+	"		int m_bvhIndex;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float m_radius;\n"
+	"		int	m_compoundBvhIndex;\n"
+	"	};\n"
+	"	\n"
+	"	int m_shapeType;\n"
+	"	int m_shapeIndex;\n"
+	"	\n"
+	"} btCollidableGpu;\n"
+	"#define MAX_NUM_PARTS_IN_BITS 10\n"
+	"///b3QuantizedBvhNode is a compressed aabb node, 16 bytes.\n"
+	"///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).\n"
+	"typedef struct\n"
+	"{\n"
+	"	//12 bytes\n"
+	"	unsigned short int	m_quantizedAabbMin[3];\n"
+	"	unsigned short int	m_quantizedAabbMax[3];\n"
+	"	//4 bytes\n"
+	"	int	m_escapeIndexOrTriangleIndex;\n"
+	"} b3QuantizedBvhNode;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4		m_aabbMin;\n"
+	"	float4		m_aabbMax;\n"
+	"	float4		m_quantization;\n"
+	"	int			m_numNodes;\n"
+	"	int			m_numSubTrees;\n"
+	"	int			m_nodeOffset;\n"
+	"	int			m_subTreeOffset;\n"
+	"} b3BvhInfo;\n"
+	"int	getTriangleIndex(const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	unsigned int x=0;\n"
+	"	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);\n"
+	"	// Get only the lower bits where the triangle index is stored\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));\n"
+	"}\n"
+	"int	getTriangleIndexGlobal(__global const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	unsigned int x=0;\n"
+	"	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);\n"
+	"	// Get only the lower bits where the triangle index is stored\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));\n"
+	"}\n"
+	"int isLeafNode(const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	//skipindex is negative (internal node), triangleindex >=0 (leafnode)\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;\n"
+	"}\n"
+	"int isLeafNodeGlobal(__global const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	//skipindex is negative (internal node), triangleindex >=0 (leafnode)\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;\n"
+	"}\n"
+	"	\n"
+	"int getEscapeIndex(const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	return -rootNode->m_escapeIndexOrTriangleIndex;\n"
+	"}\n"
+	"int getEscapeIndexGlobal(__global const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	return -rootNode->m_escapeIndexOrTriangleIndex;\n"
+	"}\n"
+	"typedef struct\n"
+	"{\n"
+	"	//12 bytes\n"
+	"	unsigned short int	m_quantizedAabbMin[3];\n"
+	"	unsigned short int	m_quantizedAabbMax[3];\n"
+	"	//4 bytes, points to the root of the subtree\n"
+	"	int			m_rootNodeIndex;\n"
+	"	//4 bytes\n"
+	"	int			m_subtreeSize;\n"
+	"	int			m_padding[3];\n"
+	"} b3BvhSubtreeInfo;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4	m_childPosition;\n"
+	"	float4	m_childOrientation;\n"
+	"	int m_shapeIndex;\n"
+	"	int m_unused0;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"} btGpuChildShape;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	float4 m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_collidableIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} BodyData;\n"
+	"typedef struct  \n"
+	"{\n"
+	"	float4		m_localCenter;\n"
+	"	float4		m_extents;\n"
+	"	float4		mC;\n"
+	"	float4		mE;\n"
+	"	\n"
+	"	float			m_radius;\n"
+	"	int	m_faceOffset;\n"
+	"	int m_numFaces;\n"
+	"	int	m_numVertices;\n"
+	"	int m_vertexOffset;\n"
+	"	int	m_uniqueEdgesOffset;\n"
+	"	int	m_numUniqueEdges;\n"
+	"	int m_unused;\n"
+	"} ConvexPolyhedronCL;\n"
+	"typedef struct \n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_min;\n"
+	"		float   m_minElems[4];\n"
+	"		int			m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_max;\n"
+	"		float   m_maxElems[4];\n"
+	"		int			m_maxIndices[4];\n"
+	"	};\n"
+	"} btAabbCL;\n"
+	"#ifndef B3_AABB_H\n"
+	"#define B3_AABB_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#define B3_MAT3x3_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#define B3_QUAT_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Quat;\n"
+	"	#define b3QuatConstArg const b3Quat\n"
+	"	\n"
+	"	\n"
+	"inline float4 b3FastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = (float4)(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"	\n"
+	"inline b3Quat b3QuatMul(b3Quat a, b3Quat b);\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in);\n"
+	"inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)\n"
+	"{\n"
+	"	b3Quat ans;\n"
+	"	ans = b3Cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - b3Dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in)\n"
+	"{\n"
+	"	b3Quat q;\n"
+	"	q=in;\n"
+	"	//return b3FastNormalize4(in);\n"
+	"	float len = native_sqrt(dot(q, q));\n"
+	"	if(len > 0.f)\n"
+	"	{\n"
+	"		q *= 1.f / len;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		q.x = q.y = q.z = 0.f;\n"
+	"		q.w = 1.f;\n"
+	"	}\n"
+	"	return q;\n"
+	"}\n"
+	"inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	b3Quat qInv = b3QuatInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = b3QuatMul(b3QuatMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	return b3QuatRotate( b3QuatInvert( q ), vec );\n"
+	"}\n"
+	"inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg  orientation)\n"
+	"{\n"
+	"	return b3QuatRotate( orientation, point ) + (translation);\n"
+	"}\n"
+	"	\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"typedef struct\n"
+	"{\n"
+	"	b3Float4 m_row[3];\n"
+	"}b3Mat3x3;\n"
+	"#define b3Mat3x3ConstArg const b3Mat3x3\n"
+	"#define b3GetRow(m,row) (m.m_row[row])\n"
+	"inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)\n"
+	"{\n"
+	"	b3Float4 quat2 = (b3Float4)(quat.x*quat.x, quat.y*quat.y, quat.z*quat.z, 0.f);\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0].x=1-2*quat2.y-2*quat2.z;\n"
+	"	out.m_row[0].y=2*quat.x*quat.y-2*quat.w*quat.z;\n"
+	"	out.m_row[0].z=2*quat.x*quat.z+2*quat.w*quat.y;\n"
+	"	out.m_row[0].w = 0.f;\n"
+	"	out.m_row[1].x=2*quat.x*quat.y+2*quat.w*quat.z;\n"
+	"	out.m_row[1].y=1-2*quat2.x-2*quat2.z;\n"
+	"	out.m_row[1].z=2*quat.y*quat.z-2*quat.w*quat.x;\n"
+	"	out.m_row[1].w = 0.f;\n"
+	"	out.m_row[2].x=2*quat.x*quat.z-2*quat.w*quat.y;\n"
+	"	out.m_row[2].y=2*quat.y*quat.z+2*quat.w*quat.x;\n"
+	"	out.m_row[2].z=1-2*quat2.x-2*quat2.y;\n"
+	"	out.m_row[2].w = 0.f;\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = fabs(matIn.m_row[0]);\n"
+	"	out.m_row[1] = fabs(matIn.m_row[1]);\n"
+	"	out.m_row[2] = fabs(matIn.m_row[2]);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero();\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity();\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m);\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(0.f);\n"
+	"	m.m_row[1] = (b3Float4)(0.f);\n"
+	"	m.m_row[2] = (b3Float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (b3Float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (b3Float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Mat3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	b3Mat3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = b3Dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = b3Dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = b3Dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)\n"
+	"{\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a.m_row[0], b );\n"
+	"	ans.y = b3Dot3F4( a.m_row[1], b );\n"
+	"	ans.z = b3Dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a, colx );\n"
+	"	ans.y = b3Dot3F4( a, coly );\n"
+	"	ans.z = b3Dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3Aabb b3Aabb_t;\n"
+	"struct b3Aabb\n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float m_min[4];\n"
+	"		b3Float4 m_minVec;\n"
+	"		int m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float	m_max[4];\n"
+	"		b3Float4 m_maxVec;\n"
+	"		int m_signedMaxIndices[4];\n"
+	"	};\n"
+	"};\n"
+	"inline void b3TransformAabb2(b3Float4ConstArg localAabbMin,b3Float4ConstArg localAabbMax, float margin,\n"
+	"						b3Float4ConstArg pos,\n"
+	"						b3QuatConstArg orn,\n"
+	"						b3Float4* aabbMinOut,b3Float4* aabbMaxOut)\n"
+	"{\n"
+	"		b3Float4 localHalfExtents = 0.5f*(localAabbMax-localAabbMin);\n"
+	"		localHalfExtents+=b3MakeFloat4(margin,margin,margin,0.f);\n"
+	"		b3Float4 localCenter = 0.5f*(localAabbMax+localAabbMin);\n"
+	"		b3Mat3x3 m;\n"
+	"		m = b3QuatGetRotationMatrix(orn);\n"
+	"		b3Mat3x3 abs_b = b3AbsoluteMat3x3(m);\n"
+	"		b3Float4 center = b3TransformPoint(localCenter,pos,orn);\n"
+	"		\n"
+	"		b3Float4 extent = b3MakeFloat4(b3Dot3F4(localHalfExtents,b3GetRow(abs_b,0)),\n"
+	"										 b3Dot3F4(localHalfExtents,b3GetRow(abs_b,1)),\n"
+	"										 b3Dot3F4(localHalfExtents,b3GetRow(abs_b,2)),\n"
+	"										 0.f);\n"
+	"		*aabbMinOut = center-extent;\n"
+	"		*aabbMaxOut = center+extent;\n"
+	"}\n"
+	"/// conservative test for overlap between two aabbs\n"
+	"inline bool b3TestAabbAgainstAabb(b3Float4ConstArg aabbMin1,b3Float4ConstArg aabbMax1,\n"
+	"								b3Float4ConstArg aabbMin2, b3Float4ConstArg aabbMax2)\n"
+	"{\n"
+	"	bool overlap = true;\n"
+	"	overlap = (aabbMin1.x > aabbMax2.x || aabbMax1.x < aabbMin2.x) ? false : overlap;\n"
+	"	overlap = (aabbMin1.z > aabbMax2.z || aabbMax1.z < aabbMin2.z) ? false : overlap;\n"
+	"	overlap = (aabbMin1.y > aabbMax2.y || aabbMax1.y < aabbMin2.y) ? false : overlap;\n"
+	"	return overlap;\n"
+	"}\n"
+	"#endif //B3_AABB_H\n"
+	"/*\n"
+	"Bullet Continuous Collision Detection and Physics Library\n"
+	"Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org\n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose,\n"
+	"including commercial applications, and to alter it and redistribute it freely,\n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"#ifndef B3_INT2_H\n"
+	"#define B3_INT2_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#define b3UnsignedInt2 uint2\n"
+	"#define b3Int2 int2\n"
+	"#define b3MakeInt2 (int2)\n"
+	"#endif //__cplusplus\n"
+	"#endif\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_plane;\n"
+	"	int m_indexOffset;\n"
+	"	int m_numIndices;\n"
+	"} btGpuFace;\n"
+	"#define make_float4 (float4)\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"	\n"
+	"//	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"//	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"//	return cross(a1,b1);\n"
+	"//float4 c = make_float4(a.y*b.z - a.z*b.y,a.z*b.x - a.x*b.z,a.x*b.y - a.y*b.x,0.f);\n"
+	"	\n"
+	"	//	float4 c = make_float4(a.y*b.z - a.z*b.y,1.f,a.x*b.y - a.y*b.x,0.f);\n"
+	"	\n"
+	"	//return c;\n"
+	"}\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = make_float4(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec);\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fastNormalize4(in);\n"
+	"//	in /= length( in );\n"
+	"//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"__inline\n"
+	"float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)\n"
+	"{\n"
+	"	return qtRotate( *orientation, *p ) + (*translation);\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = make_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"}\n"
+	"inline void projectLocal(const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, \n"
+	"const float4* dir, const float4* vertices, float* min, float* max)\n"
+	"{\n"
+	"	min[0] = FLT_MAX;\n"
+	"	max[0] = -FLT_MAX;\n"
+	"	int numVerts = hull->m_numVertices;\n"
+	"	const float4 localDir = qtInvRotate(orn,*dir);\n"
+	"	float offset = dot(pos,*dir);\n"
+	"	for(int i=0;i<numVerts;i++)\n"
+	"	{\n"
+	"		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);\n"
+	"		if(dp < min[0])	\n"
+	"			min[0] = dp;\n"
+	"		if(dp > max[0])	\n"
+	"			max[0] = dp;\n"
+	"	}\n"
+	"	if(min[0]>max[0])\n"
+	"	{\n"
+	"		float tmp = min[0];\n"
+	"		min[0] = max[0];\n"
+	"		max[0] = tmp;\n"
+	"	}\n"
+	"	min[0] += offset;\n"
+	"	max[0] += offset;\n"
+	"}\n"
+	"inline void project(__global const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, \n"
+	"const float4* dir, __global const float4* vertices, float* min, float* max)\n"
+	"{\n"
+	"	min[0] = FLT_MAX;\n"
+	"	max[0] = -FLT_MAX;\n"
+	"	int numVerts = hull->m_numVertices;\n"
+	"	const float4 localDir = qtInvRotate(orn,*dir);\n"
+	"	float offset = dot(pos,*dir);\n"
+	"	for(int i=0;i<numVerts;i++)\n"
+	"	{\n"
+	"		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);\n"
+	"		if(dp < min[0])	\n"
+	"			min[0] = dp;\n"
+	"		if(dp > max[0])	\n"
+	"			max[0] = dp;\n"
+	"	}\n"
+	"	if(min[0]>max[0])\n"
+	"	{\n"
+	"		float tmp = min[0];\n"
+	"		min[0] = max[0];\n"
+	"		max[0] = tmp;\n"
+	"	}\n"
+	"	min[0] += offset;\n"
+	"	max[0] += offset;\n"
+	"}\n"
+	"inline bool TestSepAxisLocalA(const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA,const float4 ornA,\n"
+	"	const float4 posB,const float4 ornB,\n"
+	"	float4* sep_axis, const float4* verticesA, __global const float4* verticesB,float* depth)\n"
+	"{\n"
+	"	float Min0,Max0;\n"
+	"	float Min1,Max1;\n"
+	"	projectLocal(hullA,posA,ornA,sep_axis,verticesA, &Min0, &Max0);\n"
+	"	project(hullB,posB,ornB, sep_axis,verticesB, &Min1, &Max1);\n"
+	"	if(Max0<Min1 || Max1<Min0)\n"
+	"		return false;\n"
+	"	float d0 = Max0 - Min1;\n"
+	"	float d1 = Max1 - Min0;\n"
+	"	*depth = d0<d1 ? d0:d1;\n"
+	"	return true;\n"
+	"}\n"
+	"inline bool IsAlmostZero(const float4 v)\n"
+	"{\n"
+	"	if(fabs(v.x)>1e-6f || fabs(v.y)>1e-6f || fabs(v.z)>1e-6f)\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	\n"
+	"	const float4* verticesA, \n"
+	"	const float4* uniqueEdgesA, \n"
+	"	const btGpuFace* facesA,\n"
+	"	const int*  indicesA,\n"
+	"	__global const float4* verticesB, \n"
+	"	__global const float4* uniqueEdgesB, \n"
+	"	__global const btGpuFace* facesB,\n"
+	"	__global const int*  indicesB,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	{\n"
+	"		int numFacesA = hullA->m_numFaces;\n"
+	"		// Test normals from hullA\n"
+	"		for(int i=0;i<numFacesA;i++)\n"
+	"		{\n"
+	"			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;\n"
+	"			float4 faceANormalWS = qtRotate(ornA,normal);\n"
+	"			if (dot3F4(DeltaC2,faceANormalWS)<0)\n"
+	"				faceANormalWS*=-1.f;\n"
+	"			curPlaneTests++;\n"
+	"			float d;\n"
+	"			if(!TestSepAxisLocalA( hullA, hullB, posA,ornA,posB,ornB,&faceANormalWS, verticesA, verticesB,&d))\n"
+	"				return false;\n"
+	"			if(d<*dmin)\n"
+	"			{\n"
+	"				*dmin = d;\n"
+	"				*sep = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisLocalB(	__global const ConvexPolyhedronCL* hullA,  const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	__global const float4* verticesA, \n"
+	"	__global const float4* uniqueEdgesA, \n"
+	"	__global const btGpuFace* facesA,\n"
+	"	__global const int*  indicesA,\n"
+	"	const float4* verticesB,\n"
+	"	const float4* uniqueEdgesB, \n"
+	"	const btGpuFace* facesB,\n"
+	"	const int*  indicesB,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	{\n"
+	"		int numFacesA = hullA->m_numFaces;\n"
+	"		// Test normals from hullA\n"
+	"		for(int i=0;i<numFacesA;i++)\n"
+	"		{\n"
+	"			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;\n"
+	"			float4 faceANormalWS = qtRotate(ornA,normal);\n"
+	"			if (dot3F4(DeltaC2,faceANormalWS)<0)\n"
+	"				faceANormalWS *= -1.f;\n"
+	"			curPlaneTests++;\n"
+	"			float d;\n"
+	"			if(!TestSepAxisLocalA( hullB, hullA, posB,ornB,posA,ornA, &faceANormalWS, verticesB,verticesA, &d))\n"
+	"				return false;\n"
+	"			if(d<*dmin)\n"
+	"			{\n"
+	"				*dmin = d;\n"
+	"				*sep = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisEdgeEdgeLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	const float4* verticesA, \n"
+	"	const float4* uniqueEdgesA, \n"
+	"	const btGpuFace* facesA,\n"
+	"	const int*  indicesA,\n"
+	"	__global const float4* verticesB, \n"
+	"	__global const float4* uniqueEdgesB, \n"
+	"	__global const btGpuFace* facesB,\n"
+	"	__global const int*  indicesB,\n"
+	"		float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	int curEdgeEdge = 0;\n"
+	"	// Test edges\n"
+	"	for(int e0=0;e0<hullA->m_numUniqueEdges;e0++)\n"
+	"	{\n"
+	"		const float4 edge0 = uniqueEdgesA[hullA->m_uniqueEdgesOffset+e0];\n"
+	"		float4 edge0World = qtRotate(ornA,edge0);\n"
+	"		for(int e1=0;e1<hullB->m_numUniqueEdges;e1++)\n"
+	"		{\n"
+	"			const float4 edge1 = uniqueEdgesB[hullB->m_uniqueEdgesOffset+e1];\n"
+	"			float4 edge1World = qtRotate(ornB,edge1);\n"
+	"			float4 crossje = cross3(edge0World,edge1World);\n"
+	"			curEdgeEdge++;\n"
+	"			if(!IsAlmostZero(crossje))\n"
+	"			{\n"
+	"				crossje = normalize3(crossje);\n"
+	"				if (dot3F4(DeltaC2,crossje)<0)\n"
+	"					crossje *= -1.f;\n"
+	"				float dist;\n"
+	"				bool result = true;\n"
+	"				{\n"
+	"					float Min0,Max0;\n"
+	"					float Min1,Max1;\n"
+	"					projectLocal(hullA,posA,ornA,&crossje,verticesA, &Min0, &Max0);\n"
+	"					project(hullB,posB,ornB,&crossje,verticesB, &Min1, &Max1);\n"
+	"				\n"
+	"					if(Max0<Min1 || Max1<Min0)\n"
+	"						result = false;\n"
+	"				\n"
+	"					float d0 = Max0 - Min1;\n"
+	"					float d1 = Max1 - Min0;\n"
+	"					dist = d0<d1 ? d0:d1;\n"
+	"					result = true;\n"
+	"				}\n"
+	"				\n"
+	"				if(dist<*dmin)\n"
+	"				{\n"
+	"					*dmin = dist;\n"
+	"					*sep = crossje;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"inline int	findClippingFaces(const float4 separatingNormal,\n"
+	"                      const ConvexPolyhedronCL* hullA, \n"
+	"					  __global const ConvexPolyhedronCL* hullB,\n"
+	"                      const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB,\n"
+	"                       __global float4* worldVertsA1,\n"
+	"                      __global float4* worldNormalsA1,\n"
+	"                      __global float4* worldVertsB1,\n"
+	"                      int capacityWorldVerts,\n"
+	"                      const float minDist, float maxDist,\n"
+	"					  const float4* verticesA,\n"
+	"                      const btGpuFace* facesA,\n"
+	"                      const int* indicesA,\n"
+	"					  __global const float4* verticesB,\n"
+	"                      __global const btGpuFace* facesB,\n"
+	"                      __global const int* indicesB,\n"
+	"                      __global int4* clippingFaces, int pairIndex)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"	int numWorldVertsB1= 0;\n"
+	"    \n"
+	"    \n"
+	"	int closestFaceB=0;\n"
+	"	float dmax = -FLT_MAX;\n"
+	"    \n"
+	"	{\n"
+	"		for(int face=0;face<hullB->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(facesB[hullB->m_faceOffset+face].m_plane.x,\n"
+	"                                              facesB[hullB->m_faceOffset+face].m_plane.y, facesB[hullB->m_faceOffset+face].m_plane.z,0.f);\n"
+	"			const float4 WorldNormal = qtRotate(ornB, Normal);\n"
+	"			float d = dot3F4(WorldNormal,separatingNormal);\n"
+	"			if (d > dmax)\n"
+	"			{\n"
+	"				dmax = d;\n"
+	"				closestFaceB = face;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"	{\n"
+	"		const btGpuFace polyB = facesB[hullB->m_faceOffset+closestFaceB];\n"
+	"		int numVertices = polyB.m_numIndices;\n"
+	"        if (numVertices>capacityWorldVerts)\n"
+	"            numVertices = capacityWorldVerts;\n"
+	"        if (numVertices<0)\n"
+	"            numVertices = 0;\n"
+	"        \n"
+	"		for(int e0=0;e0<numVertices;e0++)\n"
+	"		{\n"
+	"            if (e0<capacityWorldVerts)\n"
+	"            {\n"
+	"                const float4 b = verticesB[hullB->m_vertexOffset+indicesB[polyB.m_indexOffset+e0]];\n"
+	"                worldVertsB1[pairIndex*capacityWorldVerts+numWorldVertsB1++] = transform(&b,&posB,&ornB);\n"
+	"            }\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"    int closestFaceA=0;\n"
+	"	{\n"
+	"		float dmin = FLT_MAX;\n"
+	"		for(int face=0;face<hullA->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(\n"
+	"                                              facesA[hullA->m_faceOffset+face].m_plane.x,\n"
+	"                                              facesA[hullA->m_faceOffset+face].m_plane.y,\n"
+	"                                              facesA[hullA->m_faceOffset+face].m_plane.z,\n"
+	"                                              0.f);\n"
+	"			const float4 faceANormalWS = qtRotate(ornA,Normal);\n"
+	"            \n"
+	"			float d = dot3F4(faceANormalWS,separatingNormal);\n"
+	"			if (d < dmin)\n"
+	"			{\n"
+	"				dmin = d;\n"
+	"				closestFaceA = face;\n"
+	"                worldNormalsA1[pairIndex] = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"    int numVerticesA = facesA[hullA->m_faceOffset+closestFaceA].m_numIndices;\n"
+	"    if (numVerticesA>capacityWorldVerts)\n"
+	"       numVerticesA = capacityWorldVerts;\n"
+	"    if (numVerticesA<0)\n"
+	"        numVerticesA=0;\n"
+	"    \n"
+	"	for(int e0=0;e0<numVerticesA;e0++)\n"
+	"	{\n"
+	"        if (e0<capacityWorldVerts)\n"
+	"        {\n"
+	"            const float4 a = verticesA[hullA->m_vertexOffset+indicesA[facesA[hullA->m_faceOffset+closestFaceA].m_indexOffset+e0]];\n"
+	"            worldVertsA1[pairIndex*capacityWorldVerts+e0] = transform(&a, &posA,&ornA);\n"
+	"        }\n"
+	"    }\n"
+	"    \n"
+	"    clippingFaces[pairIndex].x = closestFaceA;\n"
+	"    clippingFaces[pairIndex].y = closestFaceB;\n"
+	"    clippingFaces[pairIndex].z = numVerticesA;\n"
+	"    clippingFaces[pairIndex].w = numWorldVertsB1;\n"
+	"    \n"
+	"    \n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   findConcaveSeparatingAxisVertexFaceKernel( __global int4* concavePairs,\n"
+	"                                                __global const BodyData* rigidBodies,\n"
+	"                                                __global const btCollidableGpu* collidables,\n"
+	"                                                __global const ConvexPolyhedronCL* convexShapes,\n"
+	"                                                __global const float4* vertices,\n"
+	"                                                __global const float4* uniqueEdges,\n"
+	"                                                __global const btGpuFace* faces,\n"
+	"                                                __global const int* indices,\n"
+	"                                                __global const btGpuChildShape* gpuChildShapes,\n"
+	"                                                __global btAabbCL* aabbs,\n"
+	"                                                __global float4* concaveSeparatingNormalsOut,\n"
+	"                                                __global int* concaveHasSeparatingNormals,\n"
+	"                                                __global int4* clippingFacesOut,\n"
+	"                                                __global float4* worldVertsA1GPU,\n"
+	"                                                __global float4*  worldNormalsAGPU,\n"
+	"                                                __global float4* worldVertsB1GPU,\n"
+	"                                                __global float* dmins,\n"
+	"                                                int vertexFaceCapacity,\n"
+	"                                                int numConcavePairs\n"
+	"                                                )\n"
+	"{\n"
+	"    \n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numConcavePairs)\n"
+	"		return;\n"
+	"    \n"
+	"	concaveHasSeparatingNormals[i] = 0;\n"
+	"    \n"
+	"	int pairIdx = i;\n"
+	"    \n"
+	"	int bodyIndexA = concavePairs[i].x;\n"
+	"	int bodyIndexB = concavePairs[i].y;\n"
+	"    \n"
+	"	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"    \n"
+	"	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"    \n"
+	"	if (collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL&&\n"
+	"		collidables[collidableIndexB].m_shapeType!=SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"	{\n"
+	"		concavePairs[pairIdx].w = -1;\n"
+	"		return;\n"
+	"	}\n"
+	"    \n"
+	"    \n"
+	"    \n"
+	"	int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"	int numActualConcaveConvexTests = 0;\n"
+	"	\n"
+	"	int f = concavePairs[i].z;\n"
+	"	\n"
+	"	bool overlap = false;\n"
+	"	\n"
+	"	ConvexPolyhedronCL convexPolyhedronA;\n"
+	"    \n"
+	"	//add 3 vertices of the triangle\n"
+	"	convexPolyhedronA.m_numVertices = 3;\n"
+	"	convexPolyhedronA.m_vertexOffset = 0;\n"
+	"	float4	localCenter = make_float4(0.f,0.f,0.f,0.f);\n"
+	"    \n"
+	"	btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];\n"
+	"	float4 triMinAabb, triMaxAabb;\n"
+	"	btAabbCL triAabb;\n"
+	"	triAabb.m_min = make_float4(1e30f,1e30f,1e30f,0.f);\n"
+	"	triAabb.m_max = make_float4(-1e30f,-1e30f,-1e30f,0.f);\n"
+	"	\n"
+	"	float4 verticesA[3];\n"
+	"	for (int i=0;i<3;i++)\n"
+	"	{\n"
+	"		int index = indices[face.m_indexOffset+i];\n"
+	"		float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];\n"
+	"		verticesA[i] = vert;\n"
+	"		localCenter += vert;\n"
+	"        \n"
+	"		triAabb.m_min = min(triAabb.m_min,vert);\n"
+	"		triAabb.m_max = max(triAabb.m_max,vert);\n"
+	"        \n"
+	"	}\n"
+	"    \n"
+	"	overlap = true;\n"
+	"	overlap = (triAabb.m_min.x > aabbs[bodyIndexB].m_max.x || triAabb.m_max.x < aabbs[bodyIndexB].m_min.x) ? false : overlap;\n"
+	"	overlap = (triAabb.m_min.z > aabbs[bodyIndexB].m_max.z || triAabb.m_max.z < aabbs[bodyIndexB].m_min.z) ? false : overlap;\n"
+	"	overlap = (triAabb.m_min.y > aabbs[bodyIndexB].m_max.y || triAabb.m_max.y < aabbs[bodyIndexB].m_min.y) ? false : overlap;\n"
+	"    \n"
+	"	if (overlap)\n"
+	"	{\n"
+	"		float dmin = FLT_MAX;\n"
+	"		int hasSeparatingAxis=5;\n"
+	"		float4 sepAxis=make_float4(1,2,3,4);\n"
+	"        \n"
+	"		int localCC=0;\n"
+	"		numActualConcaveConvexTests++;\n"
+	"        \n"
+	"		//a triangle has 3 unique edges\n"
+	"		convexPolyhedronA.m_numUniqueEdges = 3;\n"
+	"		convexPolyhedronA.m_uniqueEdgesOffset = 0;\n"
+	"		float4 uniqueEdgesA[3];\n"
+	"		\n"
+	"		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);\n"
+	"		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);\n"
+	"		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);\n"
+	"        \n"
+	"        \n"
+	"		convexPolyhedronA.m_faceOffset = 0;\n"
+	"        \n"
+	"		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);\n"
+	"        \n"
+	"		btGpuFace facesA[TRIANGLE_NUM_CONVEX_FACES];\n"
+	"		int indicesA[3+3+2+2+2];\n"
+	"		int curUsedIndices=0;\n"
+	"		int fidx=0;\n"
+	"        \n"
+	"		//front size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[0] = 0;\n"
+	"			indicesA[1] = 1;\n"
+	"			indicesA[2] = 2;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = normal.x;\n"
+	"			facesA[fidx].m_plane.y = normal.y;\n"
+	"			facesA[fidx].m_plane.z = normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"		//back size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[3]=2;\n"
+	"			indicesA[4]=1;\n"
+	"			indicesA[5]=0;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = dot(normal,verticesA[0]);\n"
+	"			float c1 = -face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = -normal.x;\n"
+	"			facesA[fidx].m_plane.y = -normal.y;\n"
+	"			facesA[fidx].m_plane.z = -normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"        \n"
+	"		bool addEdgePlanes = true;\n"
+	"		if (addEdgePlanes)\n"
+	"		{\n"
+	"			int numVertices=3;\n"
+	"			int prevVertex = numVertices-1;\n"
+	"			for (int i=0;i<numVertices;i++)\n"
+	"			{\n"
+	"				float4 v0 = verticesA[i];\n"
+	"				float4 v1 = verticesA[prevVertex];\n"
+	"                \n"
+	"				float4 edgeNormal = normalize(cross(normal,v1-v0));\n"
+	"				float c = -dot(edgeNormal,v0);\n"
+	"                \n"
+	"				facesA[fidx].m_numIndices = 2;\n"
+	"				facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"				indicesA[curUsedIndices++]=i;\n"
+	"				indicesA[curUsedIndices++]=prevVertex;\n"
+	"                \n"
+	"				facesA[fidx].m_plane.x = edgeNormal.x;\n"
+	"				facesA[fidx].m_plane.y = edgeNormal.y;\n"
+	"				facesA[fidx].m_plane.z = edgeNormal.z;\n"
+	"				facesA[fidx].m_plane.w = c;\n"
+	"				fidx++;\n"
+	"				prevVertex = i;\n"
+	"			}\n"
+	"		}\n"
+	"		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;\n"
+	"		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);\n"
+	"        \n"
+	"        \n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		posA.w = 0.f;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"		posB.w = 0.f;\n"
+	"        \n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"        \n"
+	"		\n"
+	"        \n"
+	"        \n"
+	"		///////////////////\n"
+	"		///compound shape support\n"
+	"        \n"
+	"		if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"		{\n"
+	"			int compoundChild = concavePairs[pairIdx].w;\n"
+	"			int childShapeIndexB = compoundChild;//collidables[collidableIndexB].m_shapeIndex+compoundChild;\n"
+	"			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"			float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"			float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"			posB = newPosB;\n"
+	"			ornB = newOrnB;\n"
+	"			shapeIndexB = collidables[childColIndexB].m_shapeIndex;\n"
+	"		}\n"
+	"		//////////////////\n"
+	"        \n"
+	"		float4 c0local = convexPolyhedronA.m_localCenter;\n"
+	"		float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"		float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"		float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"		const float4 DeltaC2 = c0 - c1;\n"
+	"        \n"
+	"        \n"
+	"		bool sepA = findSeparatingAxisLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],\n"
+	"                                             posA,ornA,\n"
+	"                                             posB,ornB,\n"
+	"                                             DeltaC2,\n"
+	"                                             verticesA,uniqueEdgesA,facesA,indicesA,\n"
+	"                                             vertices,uniqueEdges,faces,indices,\n"
+	"                                             &sepAxis,&dmin);\n"
+	"		hasSeparatingAxis = 4;\n"
+	"		if (!sepA)\n"
+	"		{\n"
+	"			hasSeparatingAxis = 0;\n"
+	"		} else\n"
+	"		{\n"
+	"			bool sepB = findSeparatingAxisLocalB(	&convexShapes[shapeIndexB],&convexPolyhedronA,\n"
+	"                                                 posB,ornB,\n"
+	"                                                 posA,ornA,\n"
+	"                                                 DeltaC2,\n"
+	"                                                 vertices,uniqueEdges,faces,indices,\n"
+	"                                                 verticesA,uniqueEdgesA,facesA,indicesA,\n"
+	"                                                 &sepAxis,&dmin);\n"
+	"            \n"
+	"			if (!sepB)\n"
+	"			{\n"
+	"				hasSeparatingAxis = 0;\n"
+	"			} else\n"
+	"			{\n"
+	"				hasSeparatingAxis = 1;\n"
+	"			}\n"
+	"		}	\n"
+	"		\n"
+	"		if (hasSeparatingAxis)\n"
+	"		{\n"
+	"            dmins[i] = dmin;\n"
+	"			concaveSeparatingNormalsOut[pairIdx]=sepAxis;\n"
+	"			concaveHasSeparatingNormals[i]=1;\n"
+	"            \n"
+	"		} else\n"
+	"		{	\n"
+	"			//mark this pair as in-active\n"
+	"			concavePairs[pairIdx].w = -1;\n"
+	"		}\n"
+	"	}\n"
+	"	else\n"
+	"	{	\n"
+	"		//mark this pair as in-active\n"
+	"		concavePairs[pairIdx].w = -1;\n"
+	"	}\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   findConcaveSeparatingAxisEdgeEdgeKernel( __global int4* concavePairs,\n"
+	"                                                          __global const BodyData* rigidBodies,\n"
+	"                                                          __global const btCollidableGpu* collidables,\n"
+	"                                                          __global const ConvexPolyhedronCL* convexShapes,\n"
+	"                                                          __global const float4* vertices,\n"
+	"                                                          __global const float4* uniqueEdges,\n"
+	"                                                          __global const btGpuFace* faces,\n"
+	"                                                          __global const int* indices,\n"
+	"                                                          __global const btGpuChildShape* gpuChildShapes,\n"
+	"                                                          __global btAabbCL* aabbs,\n"
+	"                                                          __global float4* concaveSeparatingNormalsOut,\n"
+	"                                                          __global int* concaveHasSeparatingNormals,\n"
+	"                                                          __global int4* clippingFacesOut,\n"
+	"                                                          __global float4* worldVertsA1GPU,\n"
+	"                                                          __global float4*  worldNormalsAGPU,\n"
+	"                                                          __global float4* worldVertsB1GPU,\n"
+	"                                                          __global float* dmins,\n"
+	"                                                          int vertexFaceCapacity,\n"
+	"                                                          int numConcavePairs\n"
+	"                                                          )\n"
+	"{\n"
+	"    \n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numConcavePairs)\n"
+	"		return;\n"
+	"    \n"
+	"	if (!concaveHasSeparatingNormals[i])\n"
+	"        return;\n"
+	"    \n"
+	"	int pairIdx = i;\n"
+	"    \n"
+	"	int bodyIndexA = concavePairs[i].x;\n"
+	"	int bodyIndexB = concavePairs[i].y;\n"
+	"    \n"
+	"	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"    \n"
+	"	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"    \n"
+	"    \n"
+	"	int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"	int numActualConcaveConvexTests = 0;\n"
+	"	\n"
+	"	int f = concavePairs[i].z;\n"
+	"	\n"
+	"	bool overlap = false;\n"
+	"	\n"
+	"	ConvexPolyhedronCL convexPolyhedronA;\n"
+	"    \n"
+	"	//add 3 vertices of the triangle\n"
+	"	convexPolyhedronA.m_numVertices = 3;\n"
+	"	convexPolyhedronA.m_vertexOffset = 0;\n"
+	"	float4	localCenter = make_float4(0.f,0.f,0.f,0.f);\n"
+	"    \n"
+	"	btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];\n"
+	"	float4 triMinAabb, triMaxAabb;\n"
+	"	btAabbCL triAabb;\n"
+	"	triAabb.m_min = make_float4(1e30f,1e30f,1e30f,0.f);\n"
+	"	triAabb.m_max = make_float4(-1e30f,-1e30f,-1e30f,0.f);\n"
+	"	\n"
+	"	float4 verticesA[3];\n"
+	"	for (int i=0;i<3;i++)\n"
+	"	{\n"
+	"		int index = indices[face.m_indexOffset+i];\n"
+	"		float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];\n"
+	"		verticesA[i] = vert;\n"
+	"		localCenter += vert;\n"
+	"        \n"
+	"		triAabb.m_min = min(triAabb.m_min,vert);\n"
+	"		triAabb.m_max = max(triAabb.m_max,vert);\n"
+	"        \n"
+	"	}\n"
+	"    \n"
+	"	overlap = true;\n"
+	"	overlap = (triAabb.m_min.x > aabbs[bodyIndexB].m_max.x || triAabb.m_max.x < aabbs[bodyIndexB].m_min.x) ? false : overlap;\n"
+	"	overlap = (triAabb.m_min.z > aabbs[bodyIndexB].m_max.z || triAabb.m_max.z < aabbs[bodyIndexB].m_min.z) ? false : overlap;\n"
+	"	overlap = (triAabb.m_min.y > aabbs[bodyIndexB].m_max.y || triAabb.m_max.y < aabbs[bodyIndexB].m_min.y) ? false : overlap;\n"
+	"    \n"
+	"	if (overlap)\n"
+	"	{\n"
+	"		float dmin = dmins[i];\n"
+	"		int hasSeparatingAxis=5;\n"
+	"		float4 sepAxis=make_float4(1,2,3,4);\n"
+	"        sepAxis = concaveSeparatingNormalsOut[pairIdx];\n"
+	"        \n"
+	"		int localCC=0;\n"
+	"		numActualConcaveConvexTests++;\n"
+	"        \n"
+	"		//a triangle has 3 unique edges\n"
+	"		convexPolyhedronA.m_numUniqueEdges = 3;\n"
+	"		convexPolyhedronA.m_uniqueEdgesOffset = 0;\n"
+	"		float4 uniqueEdgesA[3];\n"
+	"		\n"
+	"		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);\n"
+	"		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);\n"
+	"		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);\n"
+	"        \n"
+	"        \n"
+	"		convexPolyhedronA.m_faceOffset = 0;\n"
+	"        \n"
+	"		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);\n"
+	"        \n"
+	"		btGpuFace facesA[TRIANGLE_NUM_CONVEX_FACES];\n"
+	"		int indicesA[3+3+2+2+2];\n"
+	"		int curUsedIndices=0;\n"
+	"		int fidx=0;\n"
+	"        \n"
+	"		//front size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[0] = 0;\n"
+	"			indicesA[1] = 1;\n"
+	"			indicesA[2] = 2;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = normal.x;\n"
+	"			facesA[fidx].m_plane.y = normal.y;\n"
+	"			facesA[fidx].m_plane.z = normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"		//back size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[3]=2;\n"
+	"			indicesA[4]=1;\n"
+	"			indicesA[5]=0;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = dot(normal,verticesA[0]);\n"
+	"			float c1 = -face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = -normal.x;\n"
+	"			facesA[fidx].m_plane.y = -normal.y;\n"
+	"			facesA[fidx].m_plane.z = -normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"        \n"
+	"		bool addEdgePlanes = true;\n"
+	"		if (addEdgePlanes)\n"
+	"		{\n"
+	"			int numVertices=3;\n"
+	"			int prevVertex = numVertices-1;\n"
+	"			for (int i=0;i<numVertices;i++)\n"
+	"			{\n"
+	"				float4 v0 = verticesA[i];\n"
+	"				float4 v1 = verticesA[prevVertex];\n"
+	"                \n"
+	"				float4 edgeNormal = normalize(cross(normal,v1-v0));\n"
+	"				float c = -dot(edgeNormal,v0);\n"
+	"                \n"
+	"				facesA[fidx].m_numIndices = 2;\n"
+	"				facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"				indicesA[curUsedIndices++]=i;\n"
+	"				indicesA[curUsedIndices++]=prevVertex;\n"
+	"                \n"
+	"				facesA[fidx].m_plane.x = edgeNormal.x;\n"
+	"				facesA[fidx].m_plane.y = edgeNormal.y;\n"
+	"				facesA[fidx].m_plane.z = edgeNormal.z;\n"
+	"				facesA[fidx].m_plane.w = c;\n"
+	"				fidx++;\n"
+	"				prevVertex = i;\n"
+	"			}\n"
+	"		}\n"
+	"		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;\n"
+	"		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);\n"
+	"        \n"
+	"        \n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		posA.w = 0.f;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"		posB.w = 0.f;\n"
+	"        \n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"        \n"
+	"		\n"
+	"        \n"
+	"        \n"
+	"		///////////////////\n"
+	"		///compound shape support\n"
+	"        \n"
+	"		if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"		{\n"
+	"			int compoundChild = concavePairs[pairIdx].w;\n"
+	"			int childShapeIndexB = compoundChild;//collidables[collidableIndexB].m_shapeIndex+compoundChild;\n"
+	"			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"			float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"			float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"			posB = newPosB;\n"
+	"			ornB = newOrnB;\n"
+	"			shapeIndexB = collidables[childColIndexB].m_shapeIndex;\n"
+	"		}\n"
+	"		//////////////////\n"
+	"        \n"
+	"		float4 c0local = convexPolyhedronA.m_localCenter;\n"
+	"		float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"		float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"		float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"		const float4 DeltaC2 = c0 - c1;\n"
+	"        \n"
+	"        \n"
+	"		{\n"
+	"			bool sepEE = findSeparatingAxisEdgeEdgeLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],\n"
+	"                                                              posA,ornA,\n"
+	"                                                              posB,ornB,\n"
+	"                                                              DeltaC2,\n"
+	"                                                              verticesA,uniqueEdgesA,facesA,indicesA,\n"
+	"                                                              vertices,uniqueEdges,faces,indices,\n"
+	"                                                              &sepAxis,&dmin);\n"
+	"                \n"
+	"			if (!sepEE)\n"
+	"			{\n"
+	"				hasSeparatingAxis = 0;\n"
+	"			} else\n"
+	"			{\n"
+	"				hasSeparatingAxis = 1;\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"		\n"
+	"		if (hasSeparatingAxis)\n"
+	"		{\n"
+	"			sepAxis.w = dmin;\n"
+	"            dmins[i] = dmin;\n"
+	"			concaveSeparatingNormalsOut[pairIdx]=sepAxis;\n"
+	"			concaveHasSeparatingNormals[i]=1;\n"
+	"           \n"
+	" 	float minDist = -1e30f;\n"
+	"			float maxDist = 0.02f;\n"
+	"            \n"
+	"            findClippingFaces(sepAxis,\n"
+	"                              &convexPolyhedronA,\n"
+	"                              &convexShapes[shapeIndexB],\n"
+	"                              posA,ornA,\n"
+	"                              posB,ornB,\n"
+	"                              worldVertsA1GPU,\n"
+	"                              worldNormalsAGPU,\n"
+	"                              worldVertsB1GPU,\n"
+	"                              vertexFaceCapacity,\n"
+	"                              minDist, maxDist,\n"
+	"                              verticesA,\n"
+	"                              facesA,\n"
+	"                              indicesA,\n"
+	"                              vertices,\n"
+	"                              faces,\n"
+	"                              indices,\n"
+	"                              clippingFacesOut, pairIdx);\n"
+	"	           \n"
+	"            \n"
+	"		} else\n"
+	"		{	\n"
+	"			//mark this pair as in-active\n"
+	"			concavePairs[pairIdx].w = -1;\n"
+	"		}\n"
+	"	}\n"
+	"	else\n"
+	"	{	\n"
+	"		//mark this pair as in-active\n"
+	"		concavePairs[pairIdx].w = -1;\n"
+	"	}\n"
+	"	\n"
+	"	concavePairs[i].z = -1;//for the next stage, z is used to determine existing contact points\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h
new file mode 100644
index 0000000..e627af2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h
@@ -0,0 +1,2103 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* satKernelsCL =
+	"//keep this enum in sync with the CPU version (in btCollidable.h)\n"
+	"//written by Erwin Coumans\n"
+	"#define SHAPE_CONVEX_HULL 3\n"
+	"#define SHAPE_CONCAVE_TRIMESH 5\n"
+	"#define TRIANGLE_NUM_CONVEX_FACES 5\n"
+	"#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6\n"
+	"#define B3_MAX_STACK_DEPTH 256\n"
+	"typedef unsigned int u32;\n"
+	"///keep this in sync with btCollidable.h\n"
+	"typedef struct\n"
+	"{\n"
+	"	union {\n"
+	"		int m_numChildShapes;\n"
+	"		int m_bvhIndex;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float m_radius;\n"
+	"		int	m_compoundBvhIndex;\n"
+	"	};\n"
+	"	\n"
+	"	int m_shapeType;\n"
+	"	int m_shapeIndex;\n"
+	"	\n"
+	"} btCollidableGpu;\n"
+	"#define MAX_NUM_PARTS_IN_BITS 10\n"
+	"///b3QuantizedBvhNode is a compressed aabb node, 16 bytes.\n"
+	"///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).\n"
+	"typedef struct\n"
+	"{\n"
+	"	//12 bytes\n"
+	"	unsigned short int	m_quantizedAabbMin[3];\n"
+	"	unsigned short int	m_quantizedAabbMax[3];\n"
+	"	//4 bytes\n"
+	"	int	m_escapeIndexOrTriangleIndex;\n"
+	"} b3QuantizedBvhNode;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4		m_aabbMin;\n"
+	"	float4		m_aabbMax;\n"
+	"	float4		m_quantization;\n"
+	"	int			m_numNodes;\n"
+	"	int			m_numSubTrees;\n"
+	"	int			m_nodeOffset;\n"
+	"	int			m_subTreeOffset;\n"
+	"} b3BvhInfo;\n"
+	"int	getTriangleIndex(const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	unsigned int x=0;\n"
+	"	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);\n"
+	"	// Get only the lower bits where the triangle index is stored\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));\n"
+	"}\n"
+	"int	getTriangleIndexGlobal(__global const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	unsigned int x=0;\n"
+	"	unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);\n"
+	"	// Get only the lower bits where the triangle index is stored\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex&~(y));\n"
+	"}\n"
+	"int isLeafNode(const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	//skipindex is negative (internal node), triangleindex >=0 (leafnode)\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;\n"
+	"}\n"
+	"int isLeafNodeGlobal(__global const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	//skipindex is negative (internal node), triangleindex >=0 (leafnode)\n"
+	"	return (rootNode->m_escapeIndexOrTriangleIndex >= 0)? 1 : 0;\n"
+	"}\n"
+	"	\n"
+	"int getEscapeIndex(const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	return -rootNode->m_escapeIndexOrTriangleIndex;\n"
+	"}\n"
+	"int getEscapeIndexGlobal(__global const b3QuantizedBvhNode* rootNode)\n"
+	"{\n"
+	"	return -rootNode->m_escapeIndexOrTriangleIndex;\n"
+	"}\n"
+	"typedef struct\n"
+	"{\n"
+	"	//12 bytes\n"
+	"	unsigned short int	m_quantizedAabbMin[3];\n"
+	"	unsigned short int	m_quantizedAabbMax[3];\n"
+	"	//4 bytes, points to the root of the subtree\n"
+	"	int			m_rootNodeIndex;\n"
+	"	//4 bytes\n"
+	"	int			m_subtreeSize;\n"
+	"	int			m_padding[3];\n"
+	"} b3BvhSubtreeInfo;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4	m_childPosition;\n"
+	"	float4	m_childOrientation;\n"
+	"	int m_shapeIndex;\n"
+	"	int m_unused0;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"} btGpuChildShape;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	float4 m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_collidableIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} BodyData;\n"
+	"typedef struct  \n"
+	"{\n"
+	"	float4		m_localCenter;\n"
+	"	float4		m_extents;\n"
+	"	float4		mC;\n"
+	"	float4		mE;\n"
+	"	\n"
+	"	float			m_radius;\n"
+	"	int	m_faceOffset;\n"
+	"	int m_numFaces;\n"
+	"	int	m_numVertices;\n"
+	"	int m_vertexOffset;\n"
+	"	int	m_uniqueEdgesOffset;\n"
+	"	int	m_numUniqueEdges;\n"
+	"	int m_unused;\n"
+	"} ConvexPolyhedronCL;\n"
+	"typedef struct \n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_min;\n"
+	"		float   m_minElems[4];\n"
+	"		int			m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float4	m_max;\n"
+	"		float   m_maxElems[4];\n"
+	"		int			m_maxIndices[4];\n"
+	"	};\n"
+	"} btAabbCL;\n"
+	"#ifndef B3_AABB_H\n"
+	"#define B3_AABB_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#define B3_MAT3x3_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#define B3_QUAT_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Quat;\n"
+	"	#define b3QuatConstArg const b3Quat\n"
+	"	\n"
+	"	\n"
+	"inline float4 b3FastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = (float4)(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"	\n"
+	"inline b3Quat b3QuatMul(b3Quat a, b3Quat b);\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in);\n"
+	"inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)\n"
+	"{\n"
+	"	b3Quat ans;\n"
+	"	ans = b3Cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - b3Dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in)\n"
+	"{\n"
+	"	b3Quat q;\n"
+	"	q=in;\n"
+	"	//return b3FastNormalize4(in);\n"
+	"	float len = native_sqrt(dot(q, q));\n"
+	"	if(len > 0.f)\n"
+	"	{\n"
+	"		q *= 1.f / len;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		q.x = q.y = q.z = 0.f;\n"
+	"		q.w = 1.f;\n"
+	"	}\n"
+	"	return q;\n"
+	"}\n"
+	"inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	b3Quat qInv = b3QuatInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = b3QuatMul(b3QuatMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	return b3QuatRotate( b3QuatInvert( q ), vec );\n"
+	"}\n"
+	"inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg  orientation)\n"
+	"{\n"
+	"	return b3QuatRotate( orientation, point ) + (translation);\n"
+	"}\n"
+	"	\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"typedef struct\n"
+	"{\n"
+	"	b3Float4 m_row[3];\n"
+	"}b3Mat3x3;\n"
+	"#define b3Mat3x3ConstArg const b3Mat3x3\n"
+	"#define b3GetRow(m,row) (m.m_row[row])\n"
+	"inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)\n"
+	"{\n"
+	"	b3Float4 quat2 = (b3Float4)(quat.x*quat.x, quat.y*quat.y, quat.z*quat.z, 0.f);\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0].x=1-2*quat2.y-2*quat2.z;\n"
+	"	out.m_row[0].y=2*quat.x*quat.y-2*quat.w*quat.z;\n"
+	"	out.m_row[0].z=2*quat.x*quat.z+2*quat.w*quat.y;\n"
+	"	out.m_row[0].w = 0.f;\n"
+	"	out.m_row[1].x=2*quat.x*quat.y+2*quat.w*quat.z;\n"
+	"	out.m_row[1].y=1-2*quat2.x-2*quat2.z;\n"
+	"	out.m_row[1].z=2*quat.y*quat.z-2*quat.w*quat.x;\n"
+	"	out.m_row[1].w = 0.f;\n"
+	"	out.m_row[2].x=2*quat.x*quat.z-2*quat.w*quat.y;\n"
+	"	out.m_row[2].y=2*quat.y*quat.z+2*quat.w*quat.x;\n"
+	"	out.m_row[2].z=1-2*quat2.x-2*quat2.y;\n"
+	"	out.m_row[2].w = 0.f;\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = fabs(matIn.m_row[0]);\n"
+	"	out.m_row[1] = fabs(matIn.m_row[1]);\n"
+	"	out.m_row[2] = fabs(matIn.m_row[2]);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero();\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity();\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m);\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(0.f);\n"
+	"	m.m_row[1] = (b3Float4)(0.f);\n"
+	"	m.m_row[2] = (b3Float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (b3Float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (b3Float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Mat3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	b3Mat3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = b3Dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = b3Dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = b3Dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)\n"
+	"{\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a.m_row[0], b );\n"
+	"	ans.y = b3Dot3F4( a.m_row[1], b );\n"
+	"	ans.z = b3Dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a, colx );\n"
+	"	ans.y = b3Dot3F4( a, coly );\n"
+	"	ans.z = b3Dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3Aabb b3Aabb_t;\n"
+	"struct b3Aabb\n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float m_min[4];\n"
+	"		b3Float4 m_minVec;\n"
+	"		int m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float	m_max[4];\n"
+	"		b3Float4 m_maxVec;\n"
+	"		int m_signedMaxIndices[4];\n"
+	"	};\n"
+	"};\n"
+	"inline void b3TransformAabb2(b3Float4ConstArg localAabbMin,b3Float4ConstArg localAabbMax, float margin,\n"
+	"						b3Float4ConstArg pos,\n"
+	"						b3QuatConstArg orn,\n"
+	"						b3Float4* aabbMinOut,b3Float4* aabbMaxOut)\n"
+	"{\n"
+	"		b3Float4 localHalfExtents = 0.5f*(localAabbMax-localAabbMin);\n"
+	"		localHalfExtents+=b3MakeFloat4(margin,margin,margin,0.f);\n"
+	"		b3Float4 localCenter = 0.5f*(localAabbMax+localAabbMin);\n"
+	"		b3Mat3x3 m;\n"
+	"		m = b3QuatGetRotationMatrix(orn);\n"
+	"		b3Mat3x3 abs_b = b3AbsoluteMat3x3(m);\n"
+	"		b3Float4 center = b3TransformPoint(localCenter,pos,orn);\n"
+	"		\n"
+	"		b3Float4 extent = b3MakeFloat4(b3Dot3F4(localHalfExtents,b3GetRow(abs_b,0)),\n"
+	"										 b3Dot3F4(localHalfExtents,b3GetRow(abs_b,1)),\n"
+	"										 b3Dot3F4(localHalfExtents,b3GetRow(abs_b,2)),\n"
+	"										 0.f);\n"
+	"		*aabbMinOut = center-extent;\n"
+	"		*aabbMaxOut = center+extent;\n"
+	"}\n"
+	"/// conservative test for overlap between two aabbs\n"
+	"inline bool b3TestAabbAgainstAabb(b3Float4ConstArg aabbMin1,b3Float4ConstArg aabbMax1,\n"
+	"								b3Float4ConstArg aabbMin2, b3Float4ConstArg aabbMax2)\n"
+	"{\n"
+	"	bool overlap = true;\n"
+	"	overlap = (aabbMin1.x > aabbMax2.x || aabbMax1.x < aabbMin2.x) ? false : overlap;\n"
+	"	overlap = (aabbMin1.z > aabbMax2.z || aabbMax1.z < aabbMin2.z) ? false : overlap;\n"
+	"	overlap = (aabbMin1.y > aabbMax2.y || aabbMax1.y < aabbMin2.y) ? false : overlap;\n"
+	"	return overlap;\n"
+	"}\n"
+	"#endif //B3_AABB_H\n"
+	"/*\n"
+	"Bullet Continuous Collision Detection and Physics Library\n"
+	"Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org\n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose,\n"
+	"including commercial applications, and to alter it and redistribute it freely,\n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"#ifndef B3_INT2_H\n"
+	"#define B3_INT2_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#define b3UnsignedInt2 uint2\n"
+	"#define b3Int2 int2\n"
+	"#define b3MakeInt2 (int2)\n"
+	"#endif //__cplusplus\n"
+	"#endif\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_plane;\n"
+	"	int m_indexOffset;\n"
+	"	int m_numIndices;\n"
+	"} btGpuFace;\n"
+	"#define make_float4 (float4)\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"	\n"
+	"//	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"//	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"//	return cross(a1,b1);\n"
+	"//float4 c = make_float4(a.y*b.z - a.z*b.y,a.z*b.x - a.x*b.z,a.x*b.y - a.y*b.x,0.f);\n"
+	"	\n"
+	"	//	float4 c = make_float4(a.y*b.z - a.z*b.y,1.f,a.x*b.y - a.y*b.x,0.f);\n"
+	"	\n"
+	"	//return c;\n"
+	"}\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = make_float4(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec);\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fastNormalize4(in);\n"
+	"//	in /= length( in );\n"
+	"//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"__inline\n"
+	"float4 transform(const float4* p, const float4* translation, const Quaternion* orientation)\n"
+	"{\n"
+	"	return qtRotate( *orientation, *p ) + (*translation);\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = make_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"}\n"
+	"inline void projectLocal(const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, \n"
+	"const float4* dir, const float4* vertices, float* min, float* max)\n"
+	"{\n"
+	"	min[0] = FLT_MAX;\n"
+	"	max[0] = -FLT_MAX;\n"
+	"	int numVerts = hull->m_numVertices;\n"
+	"	const float4 localDir = qtInvRotate(orn,*dir);\n"
+	"	float offset = dot(pos,*dir);\n"
+	"	for(int i=0;i<numVerts;i++)\n"
+	"	{\n"
+	"		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);\n"
+	"		if(dp < min[0])	\n"
+	"			min[0] = dp;\n"
+	"		if(dp > max[0])	\n"
+	"			max[0] = dp;\n"
+	"	}\n"
+	"	if(min[0]>max[0])\n"
+	"	{\n"
+	"		float tmp = min[0];\n"
+	"		min[0] = max[0];\n"
+	"		max[0] = tmp;\n"
+	"	}\n"
+	"	min[0] += offset;\n"
+	"	max[0] += offset;\n"
+	"}\n"
+	"inline void project(__global const ConvexPolyhedronCL* hull,  const float4 pos, const float4 orn, \n"
+	"const float4* dir, __global const float4* vertices, float* min, float* max)\n"
+	"{\n"
+	"	min[0] = FLT_MAX;\n"
+	"	max[0] = -FLT_MAX;\n"
+	"	int numVerts = hull->m_numVertices;\n"
+	"	const float4 localDir = qtInvRotate(orn,*dir);\n"
+	"	float offset = dot(pos,*dir);\n"
+	"	for(int i=0;i<numVerts;i++)\n"
+	"	{\n"
+	"		float dp = dot(vertices[hull->m_vertexOffset+i],localDir);\n"
+	"		if(dp < min[0])	\n"
+	"			min[0] = dp;\n"
+	"		if(dp > max[0])	\n"
+	"			max[0] = dp;\n"
+	"	}\n"
+	"	if(min[0]>max[0])\n"
+	"	{\n"
+	"		float tmp = min[0];\n"
+	"		min[0] = max[0];\n"
+	"		max[0] = tmp;\n"
+	"	}\n"
+	"	min[0] += offset;\n"
+	"	max[0] += offset;\n"
+	"}\n"
+	"inline bool TestSepAxisLocalA(const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA,const float4 ornA,\n"
+	"	const float4 posB,const float4 ornB,\n"
+	"	float4* sep_axis, const float4* verticesA, __global const float4* verticesB,float* depth)\n"
+	"{\n"
+	"	float Min0,Max0;\n"
+	"	float Min1,Max1;\n"
+	"	projectLocal(hullA,posA,ornA,sep_axis,verticesA, &Min0, &Max0);\n"
+	"	project(hullB,posB,ornB, sep_axis,verticesB, &Min1, &Max1);\n"
+	"	if(Max0<Min1 || Max1<Min0)\n"
+	"		return false;\n"
+	"	float d0 = Max0 - Min1;\n"
+	"	float d1 = Max1 - Min0;\n"
+	"	*depth = d0<d1 ? d0:d1;\n"
+	"	return true;\n"
+	"}\n"
+	"inline bool IsAlmostZero(const float4 v)\n"
+	"{\n"
+	"	if(fabs(v.x)>1e-6f || fabs(v.y)>1e-6f || fabs(v.z)>1e-6f)\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	\n"
+	"	const float4* verticesA, \n"
+	"	const float4* uniqueEdgesA, \n"
+	"	const btGpuFace* facesA,\n"
+	"	const int*  indicesA,\n"
+	"	__global const float4* verticesB, \n"
+	"	__global const float4* uniqueEdgesB, \n"
+	"	__global const btGpuFace* facesB,\n"
+	"	__global const int*  indicesB,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	{\n"
+	"		int numFacesA = hullA->m_numFaces;\n"
+	"		// Test normals from hullA\n"
+	"		for(int i=0;i<numFacesA;i++)\n"
+	"		{\n"
+	"			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;\n"
+	"			float4 faceANormalWS = qtRotate(ornA,normal);\n"
+	"			if (dot3F4(DeltaC2,faceANormalWS)<0)\n"
+	"				faceANormalWS*=-1.f;\n"
+	"			curPlaneTests++;\n"
+	"			float d;\n"
+	"			if(!TestSepAxisLocalA( hullA, hullB, posA,ornA,posB,ornB,&faceANormalWS, verticesA, verticesB,&d))\n"
+	"				return false;\n"
+	"			if(d<*dmin)\n"
+	"			{\n"
+	"				*dmin = d;\n"
+	"				*sep = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisLocalB(	__global const ConvexPolyhedronCL* hullA,  const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	__global const float4* verticesA, \n"
+	"	__global const float4* uniqueEdgesA, \n"
+	"	__global const btGpuFace* facesA,\n"
+	"	__global const int*  indicesA,\n"
+	"	const float4* verticesB,\n"
+	"	const float4* uniqueEdgesB, \n"
+	"	const btGpuFace* facesB,\n"
+	"	const int*  indicesB,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	{\n"
+	"		int numFacesA = hullA->m_numFaces;\n"
+	"		// Test normals from hullA\n"
+	"		for(int i=0;i<numFacesA;i++)\n"
+	"		{\n"
+	"			const float4 normal = facesA[hullA->m_faceOffset+i].m_plane;\n"
+	"			float4 faceANormalWS = qtRotate(ornA,normal);\n"
+	"			if (dot3F4(DeltaC2,faceANormalWS)<0)\n"
+	"				faceANormalWS *= -1.f;\n"
+	"			curPlaneTests++;\n"
+	"			float d;\n"
+	"			if(!TestSepAxisLocalA( hullB, hullA, posB,ornB,posA,ornA, &faceANormalWS, verticesB,verticesA, &d))\n"
+	"				return false;\n"
+	"			if(d<*dmin)\n"
+	"			{\n"
+	"				*dmin = d;\n"
+	"				*sep = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisEdgeEdgeLocalA(	const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	const float4* verticesA, \n"
+	"	const float4* uniqueEdgesA, \n"
+	"	const btGpuFace* facesA,\n"
+	"	const int*  indicesA,\n"
+	"	__global const float4* verticesB, \n"
+	"	__global const float4* uniqueEdgesB, \n"
+	"	__global const btGpuFace* facesB,\n"
+	"	__global const int*  indicesB,\n"
+	"		float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	int curEdgeEdge = 0;\n"
+	"	// Test edges\n"
+	"	for(int e0=0;e0<hullA->m_numUniqueEdges;e0++)\n"
+	"	{\n"
+	"		const float4 edge0 = uniqueEdgesA[hullA->m_uniqueEdgesOffset+e0];\n"
+	"		float4 edge0World = qtRotate(ornA,edge0);\n"
+	"		for(int e1=0;e1<hullB->m_numUniqueEdges;e1++)\n"
+	"		{\n"
+	"			const float4 edge1 = uniqueEdgesB[hullB->m_uniqueEdgesOffset+e1];\n"
+	"			float4 edge1World = qtRotate(ornB,edge1);\n"
+	"			float4 crossje = cross3(edge0World,edge1World);\n"
+	"			curEdgeEdge++;\n"
+	"			if(!IsAlmostZero(crossje))\n"
+	"			{\n"
+	"				crossje = normalize3(crossje);\n"
+	"				if (dot3F4(DeltaC2,crossje)<0)\n"
+	"					crossje *= -1.f;\n"
+	"				float dist;\n"
+	"				bool result = true;\n"
+	"				{\n"
+	"					float Min0,Max0;\n"
+	"					float Min1,Max1;\n"
+	"					projectLocal(hullA,posA,ornA,&crossje,verticesA, &Min0, &Max0);\n"
+	"					project(hullB,posB,ornB,&crossje,verticesB, &Min1, &Max1);\n"
+	"				\n"
+	"					if(Max0<Min1 || Max1<Min0)\n"
+	"						result = false;\n"
+	"				\n"
+	"					float d0 = Max0 - Min1;\n"
+	"					float d1 = Max1 - Min0;\n"
+	"					dist = d0<d1 ? d0:d1;\n"
+	"					result = true;\n"
+	"				}\n"
+	"				\n"
+	"				if(dist<*dmin)\n"
+	"				{\n"
+	"					*dmin = dist;\n"
+	"					*sep = crossje;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"inline bool TestSepAxis(__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA,const float4 ornA,\n"
+	"	const float4 posB,const float4 ornB,\n"
+	"	float4* sep_axis, __global const float4* vertices,float* depth)\n"
+	"{\n"
+	"	float Min0,Max0;\n"
+	"	float Min1,Max1;\n"
+	"	project(hullA,posA,ornA,sep_axis,vertices, &Min0, &Max0);\n"
+	"	project(hullB,posB,ornB, sep_axis,vertices, &Min1, &Max1);\n"
+	"	if(Max0<Min1 || Max1<Min0)\n"
+	"		return false;\n"
+	"	float d0 = Max0 - Min1;\n"
+	"	float d1 = Max1 - Min0;\n"
+	"	*depth = d0<d1 ? d0:d1;\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxis(	__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	__global const float4* vertices, \n"
+	"	__global const float4* uniqueEdges, \n"
+	"	__global const btGpuFace* faces,\n"
+	"	__global const int*  indices,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	\n"
+	"	int curPlaneTests=0;\n"
+	"	{\n"
+	"		int numFacesA = hullA->m_numFaces;\n"
+	"		// Test normals from hullA\n"
+	"		for(int i=0;i<numFacesA;i++)\n"
+	"		{\n"
+	"			const float4 normal = faces[hullA->m_faceOffset+i].m_plane;\n"
+	"			float4 faceANormalWS = qtRotate(ornA,normal);\n"
+	"	\n"
+	"			if (dot3F4(DeltaC2,faceANormalWS)<0)\n"
+	"				faceANormalWS*=-1.f;\n"
+	"				\n"
+	"			curPlaneTests++;\n"
+	"	\n"
+	"			float d;\n"
+	"			if(!TestSepAxis( hullA, hullB, posA,ornA,posB,ornB,&faceANormalWS, vertices,&d))\n"
+	"				return false;\n"
+	"	\n"
+	"			if(d<*dmin)\n"
+	"			{\n"
+	"				*dmin = d;\n"
+	"				*sep = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"		if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"		{\n"
+	"			*sep = -(*sep);\n"
+	"		}\n"
+	"	\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisUnitSphere(	__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	__global const float4* vertices,\n"
+	"	__global const float4* unitSphereDirections,\n"
+	"	int numUnitSphereDirections,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	int curEdgeEdge = 0;\n"
+	"	// Test unit sphere directions\n"
+	"	for (int i=0;i<numUnitSphereDirections;i++)\n"
+	"	{\n"
+	"		float4 crossje;\n"
+	"		crossje = unitSphereDirections[i];	\n"
+	"		if (dot3F4(DeltaC2,crossje)>0)\n"
+	"			crossje *= -1.f;\n"
+	"		{\n"
+	"			float dist;\n"
+	"			bool result = true;\n"
+	"			float Min0,Max0;\n"
+	"			float Min1,Max1;\n"
+	"			project(hullA,posA,ornA,&crossje,vertices, &Min0, &Max0);\n"
+	"			project(hullB,posB,ornB,&crossje,vertices, &Min1, &Max1);\n"
+	"		\n"
+	"			if(Max0<Min1 || Max1<Min0)\n"
+	"				return false;\n"
+	"		\n"
+	"			float d0 = Max0 - Min1;\n"
+	"			float d1 = Max1 - Min0;\n"
+	"			dist = d0<d1 ? d0:d1;\n"
+	"			result = true;\n"
+	"	\n"
+	"			if(dist<*dmin)\n"
+	"			{\n"
+	"				*dmin = dist;\n"
+	"				*sep = crossje;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"bool findSeparatingAxisEdgeEdge(	__global const ConvexPolyhedronCL* hullA, __global const ConvexPolyhedronCL* hullB, \n"
+	"	const float4 posA1,\n"
+	"	const float4 ornA,\n"
+	"	const float4 posB1,\n"
+	"	const float4 ornB,\n"
+	"	const float4 DeltaC2,\n"
+	"	__global const float4* vertices, \n"
+	"	__global const float4* uniqueEdges, \n"
+	"	__global const btGpuFace* faces,\n"
+	"	__global const int*  indices,\n"
+	"	float4* sep,\n"
+	"	float* dmin)\n"
+	"{\n"
+	"	\n"
+	"	float4 posA = posA1;\n"
+	"	posA.w = 0.f;\n"
+	"	float4 posB = posB1;\n"
+	"	posB.w = 0.f;\n"
+	"	int curPlaneTests=0;\n"
+	"	int curEdgeEdge = 0;\n"
+	"	// Test edges\n"
+	"	for(int e0=0;e0<hullA->m_numUniqueEdges;e0++)\n"
+	"	{\n"
+	"		const float4 edge0 = uniqueEdges[hullA->m_uniqueEdgesOffset+e0];\n"
+	"		float4 edge0World = qtRotate(ornA,edge0);\n"
+	"		for(int e1=0;e1<hullB->m_numUniqueEdges;e1++)\n"
+	"		{\n"
+	"			const float4 edge1 = uniqueEdges[hullB->m_uniqueEdgesOffset+e1];\n"
+	"			float4 edge1World = qtRotate(ornB,edge1);\n"
+	"			float4 crossje = cross3(edge0World,edge1World);\n"
+	"			curEdgeEdge++;\n"
+	"			if(!IsAlmostZero(crossje))\n"
+	"			{\n"
+	"				crossje = normalize3(crossje);\n"
+	"				if (dot3F4(DeltaC2,crossje)<0)\n"
+	"					crossje*=-1.f;\n"
+	"					\n"
+	"				float dist;\n"
+	"				bool result = true;\n"
+	"				{\n"
+	"					float Min0,Max0;\n"
+	"					float Min1,Max1;\n"
+	"					project(hullA,posA,ornA,&crossje,vertices, &Min0, &Max0);\n"
+	"					project(hullB,posB,ornB,&crossje,vertices, &Min1, &Max1);\n"
+	"				\n"
+	"					if(Max0<Min1 || Max1<Min0)\n"
+	"						return false;\n"
+	"				\n"
+	"					float d0 = Max0 - Min1;\n"
+	"					float d1 = Max1 - Min0;\n"
+	"					dist = d0<d1 ? d0:d1;\n"
+	"					result = true;\n"
+	"				}\n"
+	"				\n"
+	"				if(dist<*dmin)\n"
+	"				{\n"
+	"					*dmin = dist;\n"
+	"					*sep = crossje;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	if((dot3F4(-DeltaC2,*sep))>0.0f)\n"
+	"	{\n"
+	"		*sep = -(*sep);\n"
+	"	}\n"
+	"	return true;\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   processCompoundPairsKernel( __global const int4* gpuCompoundPairs,\n"
+	"																					__global const BodyData* rigidBodies, \n"
+	"																					__global const btCollidableGpu* collidables,\n"
+	"																					__global const ConvexPolyhedronCL* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const btGpuFace* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global btAabbCL* aabbs,\n"
+	"																					__global const btGpuChildShape* gpuChildShapes,\n"
+	"																					__global volatile float4* gpuCompoundSepNormalsOut,\n"
+	"																					__global volatile int* gpuHasCompoundSepNormalsOut,\n"
+	"																					int numCompoundPairs\n"
+	"																					)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i<numCompoundPairs)\n"
+	"	{\n"
+	"		int bodyIndexA = gpuCompoundPairs[i].x;\n"
+	"		int bodyIndexB = gpuCompoundPairs[i].y;\n"
+	"		int childShapeIndexA = gpuCompoundPairs[i].z;\n"
+	"		int childShapeIndexB = gpuCompoundPairs[i].w;\n"
+	"		\n"
+	"		int collidableIndexA = -1;\n"
+	"		int collidableIndexB = -1;\n"
+	"		\n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		\n"
+	"		float4 ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"							\n"
+	"		if (childShapeIndexA >= 0)\n"
+	"		{\n"
+	"			collidableIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;\n"
+	"			float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;\n"
+	"			float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;\n"
+	"			float4 newPosA = qtRotate(ornA,childPosA)+posA;\n"
+	"			float4 newOrnA = qtMul(ornA,childOrnA);\n"
+	"			posA = newPosA;\n"
+	"			ornA = newOrnA;\n"
+	"		} else\n"
+	"		{\n"
+	"			collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		}\n"
+	"		\n"
+	"		if (childShapeIndexB>=0)\n"
+	"		{\n"
+	"			collidableIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"			float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"			float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"			posB = newPosB;\n"
+	"			ornB = newOrnB;\n"
+	"		} else\n"
+	"		{\n"
+	"			collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;	\n"
+	"		}\n"
+	"	\n"
+	"		gpuHasCompoundSepNormalsOut[i] = 0;\n"
+	"	\n"
+	"		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"	\n"
+	"		int shapeTypeA = collidables[collidableIndexA].m_shapeType;\n"
+	"		int shapeTypeB = collidables[collidableIndexB].m_shapeType;\n"
+	"	\n"
+	"		if ((shapeTypeA != SHAPE_CONVEX_HULL) || (shapeTypeB != SHAPE_CONVEX_HULL))\n"
+	"		{\n"
+	"			return;\n"
+	"		}\n"
+	"		int hasSeparatingAxis = 5;\n"
+	"							\n"
+	"		int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"		float dmin = FLT_MAX;\n"
+	"		posA.w = 0.f;\n"
+	"		posB.w = 0.f;\n"
+	"		float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"		float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"		float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"		float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"		const float4 DeltaC2 = c0 - c1;\n"
+	"		float4 sepNormal = make_float4(1,0,0,0);\n"
+	"		bool sepA = findSeparatingAxis(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,posB,ornB,DeltaC2,vertices,uniqueEdges,faces,indices,&sepNormal,&dmin);\n"
+	"		hasSeparatingAxis = 4;\n"
+	"		if (!sepA)\n"
+	"		{\n"
+	"			hasSeparatingAxis = 0;\n"
+	"		} else\n"
+	"		{\n"
+	"			bool sepB = findSeparatingAxis(	&convexShapes[shapeIndexB],&convexShapes[shapeIndexA],posB,ornB,posA,ornA,DeltaC2,vertices,uniqueEdges,faces,indices,&sepNormal,&dmin);\n"
+	"			if (!sepB)\n"
+	"			{\n"
+	"				hasSeparatingAxis = 0;\n"
+	"			} else//(!sepB)\n"
+	"			{\n"
+	"				bool sepEE = findSeparatingAxisEdgeEdge(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,posB,ornB,DeltaC2,vertices,uniqueEdges,faces,indices,&sepNormal,&dmin);\n"
+	"				if (sepEE)\n"
+	"				{\n"
+	"						gpuCompoundSepNormalsOut[i] = sepNormal;//fastNormalize4(sepNormal);\n"
+	"						gpuHasCompoundSepNormalsOut[i] = 1;\n"
+	"				}//sepEE\n"
+	"			}//(!sepB)\n"
+	"		}//(!sepA)\n"
+	"		\n"
+	"		\n"
+	"	}\n"
+	"		\n"
+	"}\n"
+	"inline b3Float4 MyUnQuantize(const unsigned short* vecIn, b3Float4 quantization, b3Float4 bvhAabbMin)\n"
+	"{\n"
+	"		b3Float4 vecOut;\n"
+	"		vecOut = b3MakeFloat4(\n"
+	"			(float)(vecIn[0]) / (quantization.x),\n"
+	"			(float)(vecIn[1]) / (quantization.y),\n"
+	"			(float)(vecIn[2]) / (quantization.z),\n"
+	"			0.f);\n"
+	"		vecOut += bvhAabbMin;\n"
+	"		return vecOut;\n"
+	"}\n"
+	"inline b3Float4 MyUnQuantizeGlobal(__global const unsigned short* vecIn, b3Float4 quantization, b3Float4 bvhAabbMin)\n"
+	"{\n"
+	"		b3Float4 vecOut;\n"
+	"		vecOut = b3MakeFloat4(\n"
+	"			(float)(vecIn[0]) / (quantization.x),\n"
+	"			(float)(vecIn[1]) / (quantization.y),\n"
+	"			(float)(vecIn[2]) / (quantization.z),\n"
+	"			0.f);\n"
+	"		vecOut += bvhAabbMin;\n"
+	"		return vecOut;\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   findCompoundPairsKernel( __global const int4* pairs, \n"
+	"	__global const BodyData* rigidBodies, \n"
+	"	__global const btCollidableGpu* collidables,\n"
+	"	__global const ConvexPolyhedronCL* convexShapes, \n"
+	"	__global const float4* vertices,\n"
+	"	__global const float4* uniqueEdges,\n"
+	"	__global const btGpuFace* faces,\n"
+	"	__global const int* indices,\n"
+	"	__global b3Aabb_t* aabbLocalSpace,\n"
+	"	__global const btGpuChildShape* gpuChildShapes,\n"
+	"	__global volatile int4* gpuCompoundPairsOut,\n"
+	"	__global volatile int* numCompoundPairsOut,\n"
+	"	__global const b3BvhSubtreeInfo* subtrees,\n"
+	"	__global const b3QuantizedBvhNode* quantizedNodes,\n"
+	"	__global const b3BvhInfo* bvhInfos,\n"
+	"	int numPairs,\n"
+	"	int maxNumCompoundPairsCapacity\n"
+	"	)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"		int bodyIndexA = pairs[i].x;\n"
+	"		int bodyIndexB = pairs[i].y;\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"		//once the broadphase avoids static-static pairs, we can remove this test\n"
+	"		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))\n"
+	"		{\n"
+	"			return;\n"
+	"		}\n"
+	"		if ((collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) &&(collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))\n"
+	"		{\n"
+	"			int bvhA = collidables[collidableIndexA].m_compoundBvhIndex;\n"
+	"			int bvhB = collidables[collidableIndexB].m_compoundBvhIndex;\n"
+	"			int numSubTreesA = bvhInfos[bvhA].m_numSubTrees;\n"
+	"			int subTreesOffsetA = bvhInfos[bvhA].m_subTreeOffset;\n"
+	"			int subTreesOffsetB = bvhInfos[bvhB].m_subTreeOffset;\n"
+	"			int numSubTreesB = bvhInfos[bvhB].m_numSubTrees;\n"
+	"			\n"
+	"			float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"			b3Quat ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"			b3Quat ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"			float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"			\n"
+	"			for (int p=0;p<numSubTreesA;p++)\n"
+	"			{\n"
+	"				b3BvhSubtreeInfo subtreeA = subtrees[subTreesOffsetA+p];\n"
+	"				//bvhInfos[bvhA].m_quantization\n"
+	"				b3Float4 treeAminLocal = MyUnQuantize(subtreeA.m_quantizedAabbMin,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);\n"
+	"				b3Float4 treeAmaxLocal = MyUnQuantize(subtreeA.m_quantizedAabbMax,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);\n"
+	"				b3Float4 aabbAMinOut,aabbAMaxOut;\n"
+	"				float margin=0.f;\n"
+	"				b3TransformAabb2(treeAminLocal,treeAmaxLocal, margin,posA,ornA,&aabbAMinOut,&aabbAMaxOut);\n"
+	"				\n"
+	"				for (int q=0;q<numSubTreesB;q++)\n"
+	"				{\n"
+	"					b3BvhSubtreeInfo subtreeB = subtrees[subTreesOffsetB+q];\n"
+	"					b3Float4 treeBminLocal = MyUnQuantize(subtreeB.m_quantizedAabbMin,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);\n"
+	"					b3Float4 treeBmaxLocal = MyUnQuantize(subtreeB.m_quantizedAabbMax,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);\n"
+	"					b3Float4 aabbBMinOut,aabbBMaxOut;\n"
+	"					float margin=0.f;\n"
+	"					b3TransformAabb2(treeBminLocal,treeBmaxLocal, margin,posB,ornB,&aabbBMinOut,&aabbBMaxOut);\n"
+	"					\n"
+	"					\n"
+	"					bool aabbOverlap = b3TestAabbAgainstAabb(aabbAMinOut,aabbAMaxOut,aabbBMinOut,aabbBMaxOut);\n"
+	"					if (aabbOverlap)\n"
+	"					{\n"
+	"						\n"
+	"						int startNodeIndexA = subtreeA.m_rootNodeIndex+bvhInfos[bvhA].m_nodeOffset;\n"
+	"						int endNodeIndexA = startNodeIndexA+subtreeA.m_subtreeSize;\n"
+	"						int startNodeIndexB = subtreeB.m_rootNodeIndex+bvhInfos[bvhB].m_nodeOffset;\n"
+	"						int endNodeIndexB = startNodeIndexB+subtreeB.m_subtreeSize;\n"
+	"						b3Int2 nodeStack[B3_MAX_STACK_DEPTH];\n"
+	"						b3Int2 node0;\n"
+	"						node0.x = startNodeIndexA;\n"
+	"						node0.y = startNodeIndexB;\n"
+	"						int maxStackDepth = B3_MAX_STACK_DEPTH;\n"
+	"						int depth=0;\n"
+	"						nodeStack[depth++]=node0;\n"
+	"						do\n"
+	"						{\n"
+	"							b3Int2 node = nodeStack[--depth];\n"
+	"							b3Float4 aMinLocal = MyUnQuantizeGlobal(quantizedNodes[node.x].m_quantizedAabbMin,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);\n"
+	"							b3Float4 aMaxLocal = MyUnQuantizeGlobal(quantizedNodes[node.x].m_quantizedAabbMax,bvhInfos[bvhA].m_quantization,bvhInfos[bvhA].m_aabbMin);\n"
+	"							b3Float4 bMinLocal = MyUnQuantizeGlobal(quantizedNodes[node.y].m_quantizedAabbMin,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);\n"
+	"							b3Float4 bMaxLocal = MyUnQuantizeGlobal(quantizedNodes[node.y].m_quantizedAabbMax,bvhInfos[bvhB].m_quantization,bvhInfos[bvhB].m_aabbMin);\n"
+	"							float margin=0.f;\n"
+	"							b3Float4 aabbAMinOut,aabbAMaxOut;\n"
+	"							b3TransformAabb2(aMinLocal,aMaxLocal, margin,posA,ornA,&aabbAMinOut,&aabbAMaxOut);\n"
+	"							b3Float4 aabbBMinOut,aabbBMaxOut;\n"
+	"							b3TransformAabb2(bMinLocal,bMaxLocal, margin,posB,ornB,&aabbBMinOut,&aabbBMaxOut);\n"
+	"							\n"
+	"							bool nodeOverlap = b3TestAabbAgainstAabb(aabbAMinOut,aabbAMaxOut,aabbBMinOut,aabbBMaxOut);\n"
+	"							if (nodeOverlap)\n"
+	"							{\n"
+	"								bool isLeafA = isLeafNodeGlobal(&quantizedNodes[node.x]);\n"
+	"								bool isLeafB = isLeafNodeGlobal(&quantizedNodes[node.y]);\n"
+	"								bool isInternalA = !isLeafA;\n"
+	"								bool isInternalB = !isLeafB;\n"
+	"								//fail, even though it might hit two leaf nodes\n"
+	"								if (depth+4>maxStackDepth && !(isLeafA && isLeafB))\n"
+	"								{\n"
+	"									//printf(\"Error: traversal exceeded maxStackDepth\");\n"
+	"									continue;\n"
+	"								}\n"
+	"								if(isInternalA)\n"
+	"								{\n"
+	"									int nodeAleftChild = node.x+1;\n"
+	"									bool isNodeALeftChildLeaf = isLeafNodeGlobal(&quantizedNodes[node.x+1]);\n"
+	"									int nodeArightChild = isNodeALeftChildLeaf? node.x+2 : node.x+1 + getEscapeIndexGlobal(&quantizedNodes[node.x+1]);\n"
+	"									if(isInternalB)\n"
+	"									{					\n"
+	"										int nodeBleftChild = node.y+1;\n"
+	"										bool isNodeBLeftChildLeaf = isLeafNodeGlobal(&quantizedNodes[node.y+1]);\n"
+	"										int nodeBrightChild = isNodeBLeftChildLeaf? node.y+2 : node.y+1 + getEscapeIndexGlobal(&quantizedNodes[node.y+1]);\n"
+	"										nodeStack[depth++] = b3MakeInt2(nodeAleftChild, nodeBleftChild);\n"
+	"										nodeStack[depth++] = b3MakeInt2(nodeArightChild, nodeBleftChild);\n"
+	"										nodeStack[depth++] = b3MakeInt2(nodeAleftChild, nodeBrightChild);\n"
+	"										nodeStack[depth++] = b3MakeInt2(nodeArightChild, nodeBrightChild);\n"
+	"									}\n"
+	"									else\n"
+	"									{\n"
+	"										nodeStack[depth++] = b3MakeInt2(nodeAleftChild,node.y);\n"
+	"										nodeStack[depth++] = b3MakeInt2(nodeArightChild,node.y);\n"
+	"									}\n"
+	"								}\n"
+	"								else\n"
+	"								{\n"
+	"									if(isInternalB)\n"
+	"									{\n"
+	"										int nodeBleftChild = node.y+1;\n"
+	"										bool isNodeBLeftChildLeaf = isLeafNodeGlobal(&quantizedNodes[node.y+1]);\n"
+	"										int nodeBrightChild = isNodeBLeftChildLeaf? node.y+2 : node.y+1 + getEscapeIndexGlobal(&quantizedNodes[node.y+1]);\n"
+	"										nodeStack[depth++] = b3MakeInt2(node.x,nodeBleftChild);\n"
+	"										nodeStack[depth++] = b3MakeInt2(node.x,nodeBrightChild);\n"
+	"									}\n"
+	"									else\n"
+	"									{\n"
+	"										int compoundPairIdx = atomic_inc(numCompoundPairsOut);\n"
+	"										if (compoundPairIdx<maxNumCompoundPairsCapacity)\n"
+	"										{\n"
+	"											int childShapeIndexA = getTriangleIndexGlobal(&quantizedNodes[node.x]);\n"
+	"											int childShapeIndexB = getTriangleIndexGlobal(&quantizedNodes[node.y]);\n"
+	"											gpuCompoundPairsOut[compoundPairIdx]  = (int4)(bodyIndexA,bodyIndexB,childShapeIndexA,childShapeIndexB);\n"
+	"										}\n"
+	"									}\n"
+	"								}\n"
+	"							}\n"
+	"						} while (depth);\n"
+	"					}\n"
+	"				}\n"
+	"			}\n"
+	"			\n"
+	"			return;\n"
+	"		}\n"
+	"		if ((collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) ||(collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))\n"
+	"		{\n"
+	"			if (collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) \n"
+	"			{\n"
+	"				int numChildrenA = collidables[collidableIndexA].m_numChildShapes;\n"
+	"				for (int c=0;c<numChildrenA;c++)\n"
+	"				{\n"
+	"					int childShapeIndexA = collidables[collidableIndexA].m_shapeIndex+c;\n"
+	"					int childColIndexA = gpuChildShapes[childShapeIndexA].m_shapeIndex;\n"
+	"					float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"					float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"					float4 childPosA = gpuChildShapes[childShapeIndexA].m_childPosition;\n"
+	"					float4 childOrnA = gpuChildShapes[childShapeIndexA].m_childOrientation;\n"
+	"					float4 newPosA = qtRotate(ornA,childPosA)+posA;\n"
+	"					float4 newOrnA = qtMul(ornA,childOrnA);\n"
+	"					int shapeIndexA = collidables[childColIndexA].m_shapeIndex;\n"
+	"					b3Aabb_t aabbAlocal = aabbLocalSpace[shapeIndexA];\n"
+	"					float margin = 0.f;\n"
+	"					\n"
+	"					b3Float4 aabbAMinWS;\n"
+	"					b3Float4 aabbAMaxWS;\n"
+	"					\n"
+	"					b3TransformAabb2(aabbAlocal.m_minVec,aabbAlocal.m_maxVec,margin,\n"
+	"						newPosA,\n"
+	"						newOrnA,\n"
+	"						&aabbAMinWS,&aabbAMaxWS);\n"
+	"						\n"
+	"					\n"
+	"					if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"					{\n"
+	"						int numChildrenB = collidables[collidableIndexB].m_numChildShapes;\n"
+	"						for (int b=0;b<numChildrenB;b++)\n"
+	"						{\n"
+	"							int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex+b;\n"
+	"							int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"							float4 ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"							float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"							float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"							float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"							float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"							float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"							int shapeIndexB = collidables[childColIndexB].m_shapeIndex;\n"
+	"							b3Aabb_t aabbBlocal = aabbLocalSpace[shapeIndexB];\n"
+	"							\n"
+	"							b3Float4 aabbBMinWS;\n"
+	"							b3Float4 aabbBMaxWS;\n"
+	"							\n"
+	"							b3TransformAabb2(aabbBlocal.m_minVec,aabbBlocal.m_maxVec,margin,\n"
+	"								newPosB,\n"
+	"								newOrnB,\n"
+	"								&aabbBMinWS,&aabbBMaxWS);\n"
+	"								\n"
+	"								\n"
+	"							\n"
+	"							bool aabbOverlap = b3TestAabbAgainstAabb(aabbAMinWS,aabbAMaxWS,aabbBMinWS,aabbBMaxWS);\n"
+	"							if (aabbOverlap)\n"
+	"							{\n"
+	"								int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"								float dmin = FLT_MAX;\n"
+	"								float4 posA = newPosA;\n"
+	"								posA.w = 0.f;\n"
+	"								float4 posB = newPosB;\n"
+	"								posB.w = 0.f;\n"
+	"								float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"								float4 ornA = newOrnA;\n"
+	"								float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"								float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"								float4 ornB =newOrnB;\n"
+	"								float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"								const float4 DeltaC2 = c0 - c1;\n"
+	"								{//\n"
+	"									int compoundPairIdx = atomic_inc(numCompoundPairsOut);\n"
+	"									if (compoundPairIdx<maxNumCompoundPairsCapacity)\n"
+	"									{\n"
+	"										gpuCompoundPairsOut[compoundPairIdx]  = (int4)(bodyIndexA,bodyIndexB,childShapeIndexA,childShapeIndexB);\n"
+	"									}\n"
+	"								}//\n"
+	"							}//fi(1)\n"
+	"						} //for (int b=0\n"
+	"					}//if (collidables[collidableIndexB].\n"
+	"					else//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"					{\n"
+	"						if (1)\n"
+	"						{\n"
+	"							int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"							float dmin = FLT_MAX;\n"
+	"							float4 posA = newPosA;\n"
+	"							posA.w = 0.f;\n"
+	"							float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"							posB.w = 0.f;\n"
+	"							float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"							float4 ornA = newOrnA;\n"
+	"							float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"							float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"							float4 ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"							float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"							const float4 DeltaC2 = c0 - c1;\n"
+	"							{\n"
+	"								int compoundPairIdx = atomic_inc(numCompoundPairsOut);\n"
+	"								if (compoundPairIdx<maxNumCompoundPairsCapacity)\n"
+	"								{\n"
+	"									gpuCompoundPairsOut[compoundPairIdx] = (int4)(bodyIndexA,bodyIndexB,childShapeIndexA,-1);\n"
+	"								}//if (compoundPairIdx<maxNumCompoundPairsCapacity)\n"
+	"							}//\n"
+	"						}//fi (1)\n"
+	"					}//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"				}//for (int b=0;b<numChildrenB;b++)	\n"
+	"				return;\n"
+	"			}//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"			if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONCAVE_TRIMESH) \n"
+	"				&& (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))\n"
+	"			{\n"
+	"				int numChildrenB = collidables[collidableIndexB].m_numChildShapes;\n"
+	"				for (int b=0;b<numChildrenB;b++)\n"
+	"				{\n"
+	"					int childShapeIndexB = collidables[collidableIndexB].m_shapeIndex+b;\n"
+	"					int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"					float4 ornB = rigidBodies[bodyIndexB].m_quat;\n"
+	"					float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"					float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"					float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"					float4 newPosB = qtRotate(ornB,childPosB)+posB;\n"
+	"					float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"					int shapeIndexB = collidables[childColIndexB].m_shapeIndex;\n"
+	"					//////////////////////////////////////\n"
+	"					if (1)\n"
+	"					{\n"
+	"						int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"						float dmin = FLT_MAX;\n"
+	"						float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"						posA.w = 0.f;\n"
+	"						float4 posB = newPosB;\n"
+	"						posB.w = 0.f;\n"
+	"						float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"						float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"						float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"						float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"						float4 ornB =newOrnB;\n"
+	"						float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"						const float4 DeltaC2 = c0 - c1;\n"
+	"						{//\n"
+	"							int compoundPairIdx = atomic_inc(numCompoundPairsOut);\n"
+	"							if (compoundPairIdx<maxNumCompoundPairsCapacity)\n"
+	"							{\n"
+	"								gpuCompoundPairsOut[compoundPairIdx] = (int4)(bodyIndexA,bodyIndexB,-1,childShapeIndexB);\n"
+	"							}//fi (compoundPairIdx<maxNumCompoundPairsCapacity)\n"
+	"						}//\n"
+	"					}//fi (1)	\n"
+	"				}//for (int b=0;b<numChildrenB;b++)\n"
+	"				return;\n"
+	"			}//if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"			return;\n"
+	"		}//fi ((collidables[collidableIndexA].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS) ||(collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS))\n"
+	"	}//i<numPairs\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   findSeparatingAxisKernel( __global const int4* pairs, \n"
+	"																					__global const BodyData* rigidBodies, \n"
+	"																					__global const btCollidableGpu* collidables,\n"
+	"																					__global const ConvexPolyhedronCL* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const btGpuFace* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global btAabbCL* aabbs,\n"
+	"																					__global volatile float4* separatingNormals,\n"
+	"																					__global volatile int* hasSeparatingAxis,\n"
+	"																					int numPairs\n"
+	"																					)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"	\n"
+	"		int bodyIndexA = pairs[i].x;\n"
+	"		int bodyIndexB = pairs[i].y;\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"	\n"
+	"		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"		\n"
+	"		\n"
+	"		//once the broadphase avoids static-static pairs, we can remove this test\n"
+	"		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))\n"
+	"		{\n"
+	"			hasSeparatingAxis[i] = 0;\n"
+	"			return;\n"
+	"		}\n"
+	"		\n"
+	"		if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONVEX_HULL) ||(collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL))\n"
+	"		{\n"
+	"			hasSeparatingAxis[i] = 0;\n"
+	"			return;\n"
+	"		}\n"
+	"			\n"
+	"		if ((collidables[collidableIndexA].m_shapeType==SHAPE_CONCAVE_TRIMESH))\n"
+	"		{\n"
+	"			hasSeparatingAxis[i] = 0;\n"
+	"			return;\n"
+	"		}\n"
+	"		int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"		float dmin = FLT_MAX;\n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		posA.w = 0.f;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"		posB.w = 0.f;\n"
+	"		float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"		float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"		float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"		float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"		const float4 DeltaC2 = c0 - c1;\n"
+	"		float4 sepNormal;\n"
+	"		\n"
+	"		bool sepA = findSeparatingAxis(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,\n"
+	"																								posB,ornB,\n"
+	"																								DeltaC2,\n"
+	"																								vertices,uniqueEdges,faces,\n"
+	"																								indices,&sepNormal,&dmin);\n"
+	"		hasSeparatingAxis[i] = 4;\n"
+	"		if (!sepA)\n"
+	"		{\n"
+	"			hasSeparatingAxis[i] = 0;\n"
+	"		} else\n"
+	"		{\n"
+	"			bool sepB = findSeparatingAxis(	&convexShapes[shapeIndexB],&convexShapes[shapeIndexA],posB,ornB,\n"
+	"																									posA,ornA,\n"
+	"																									DeltaC2,\n"
+	"																									vertices,uniqueEdges,faces,\n"
+	"																									indices,&sepNormal,&dmin);\n"
+	"			if (!sepB)\n"
+	"			{\n"
+	"				hasSeparatingAxis[i] = 0;\n"
+	"			} else\n"
+	"			{\n"
+	"				bool sepEE = findSeparatingAxisEdgeEdge(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,\n"
+	"																									posB,ornB,\n"
+	"																									DeltaC2,\n"
+	"																									vertices,uniqueEdges,faces,\n"
+	"																									indices,&sepNormal,&dmin);\n"
+	"				if (!sepEE)\n"
+	"				{\n"
+	"					hasSeparatingAxis[i] = 0;\n"
+	"				} else\n"
+	"				{\n"
+	"					hasSeparatingAxis[i] = 1;\n"
+	"					separatingNormals[i] = sepNormal;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"	}\n"
+	"}\n"
+	"__kernel void   findSeparatingAxisVertexFaceKernel( __global const int4* pairs, \n"
+	"																					__global const BodyData* rigidBodies, \n"
+	"																					__global const btCollidableGpu* collidables,\n"
+	"																					__global const ConvexPolyhedronCL* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const btGpuFace* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global btAabbCL* aabbs,\n"
+	"																					__global volatile float4* separatingNormals,\n"
+	"																					__global volatile int* hasSeparatingAxis,\n"
+	"																					__global  float* dmins,\n"
+	"																					int numPairs\n"
+	"																					)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"	\n"
+	"		int bodyIndexA = pairs[i].x;\n"
+	"		int bodyIndexB = pairs[i].y;\n"
+	"		int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"		int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"	\n"
+	"		int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"		int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"	\n"
+	"		hasSeparatingAxis[i] = 0;	\n"
+	"		\n"
+	"		//once the broadphase avoids static-static pairs, we can remove this test\n"
+	"		if ((rigidBodies[bodyIndexA].m_invMass==0) &&(rigidBodies[bodyIndexB].m_invMass==0))\n"
+	"		{\n"
+	"			return;\n"
+	"		}\n"
+	"		\n"
+	"		if ((collidables[collidableIndexA].m_shapeType!=SHAPE_CONVEX_HULL) ||(collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL))\n"
+	"		{\n"
+	"			return;\n"
+	"		}\n"
+	"			\n"
+	"		int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"		float dmin = FLT_MAX;\n"
+	"		dmins[i] = dmin;\n"
+	"		\n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		posA.w = 0.f;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"		posB.w = 0.f;\n"
+	"		float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"		float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"		float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"		float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"		const float4 DeltaC2 = c0 - c1;\n"
+	"		float4 sepNormal;\n"
+	"		\n"
+	"		bool sepA = findSeparatingAxis(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,\n"
+	"																								posB,ornB,\n"
+	"																								DeltaC2,\n"
+	"																								vertices,uniqueEdges,faces,\n"
+	"																								indices,&sepNormal,&dmin);\n"
+	"		hasSeparatingAxis[i] = 4;\n"
+	"		if (!sepA)\n"
+	"		{\n"
+	"			hasSeparatingAxis[i] = 0;\n"
+	"		} else\n"
+	"		{\n"
+	"			bool sepB = findSeparatingAxis(	&convexShapes[shapeIndexB],&convexShapes[shapeIndexA],posB,ornB,\n"
+	"																									posA,ornA,\n"
+	"																									DeltaC2,\n"
+	"																									vertices,uniqueEdges,faces,\n"
+	"																									indices,&sepNormal,&dmin);\n"
+	"			if (sepB)\n"
+	"			{\n"
+	"				dmins[i] = dmin;\n"
+	"				hasSeparatingAxis[i] = 1;\n"
+	"				separatingNormals[i] = sepNormal;\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"	}\n"
+	"}\n"
+	"__kernel void   findSeparatingAxisEdgeEdgeKernel( __global const int4* pairs, \n"
+	"																					__global const BodyData* rigidBodies, \n"
+	"																					__global const btCollidableGpu* collidables,\n"
+	"																					__global const ConvexPolyhedronCL* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const btGpuFace* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global btAabbCL* aabbs,\n"
+	"																					__global  float4* separatingNormals,\n"
+	"																					__global  int* hasSeparatingAxis,\n"
+	"																					__global  float* dmins,\n"
+	"																					__global const float4* unitSphereDirections,\n"
+	"																					int numUnitSphereDirections,\n"
+	"																					int numPairs\n"
+	"																					)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	\n"
+	"	if (i<numPairs)\n"
+	"	{\n"
+	"		if (hasSeparatingAxis[i])\n"
+	"		{\n"
+	"	\n"
+	"			int bodyIndexA = pairs[i].x;\n"
+	"			int bodyIndexB = pairs[i].y;\n"
+	"	\n"
+	"			int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"			int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"		\n"
+	"			int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"			int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"			\n"
+	"			\n"
+	"			int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"	\n"
+	"			float dmin = dmins[i];\n"
+	"	\n"
+	"			float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"			posA.w = 0.f;\n"
+	"			float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"			posB.w = 0.f;\n"
+	"			float4 c0local = convexShapes[shapeIndexA].m_localCenter;\n"
+	"			float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"			float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"			float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"			float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"			float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"			const float4 DeltaC2 = c0 - c1;\n"
+	"			float4 sepNormal = separatingNormals[i];\n"
+	"			\n"
+	"			\n"
+	"			\n"
+	"			bool sepEE = false;\n"
+	"			int numEdgeEdgeDirections = convexShapes[shapeIndexA].m_numUniqueEdges*convexShapes[shapeIndexB].m_numUniqueEdges;\n"
+	"			if (numEdgeEdgeDirections<=numUnitSphereDirections)\n"
+	"			{\n"
+	"				sepEE = findSeparatingAxisEdgeEdge(	&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,\n"
+	"																									posB,ornB,\n"
+	"																									DeltaC2,\n"
+	"																									vertices,uniqueEdges,faces,\n"
+	"																									indices,&sepNormal,&dmin);\n"
+	"																									\n"
+	"					if (!sepEE)\n"
+	"					{\n"
+	"						hasSeparatingAxis[i] = 0;\n"
+	"					} else\n"
+	"					{\n"
+	"						hasSeparatingAxis[i] = 1;\n"
+	"						separatingNormals[i] = sepNormal;\n"
+	"					}\n"
+	"			}\n"
+	"			/*\n"
+	"			///else case is a separate kernel, to make Mac OSX OpenCL compiler happy\n"
+	"			else\n"
+	"			{\n"
+	"				sepEE = findSeparatingAxisUnitSphere(&convexShapes[shapeIndexA], &convexShapes[shapeIndexB],posA,ornA,\n"
+	"																									posB,ornB,\n"
+	"																									DeltaC2,\n"
+	"																									vertices,unitSphereDirections,numUnitSphereDirections,\n"
+	"																									&sepNormal,&dmin);\n"
+	"					if (!sepEE)\n"
+	"					{\n"
+	"						hasSeparatingAxis[i] = 0;\n"
+	"					} else\n"
+	"					{\n"
+	"						hasSeparatingAxis[i] = 1;\n"
+	"						separatingNormals[i] = sepNormal;\n"
+	"					}\n"
+	"			}\n"
+	"			*/\n"
+	"		}		//if (hasSeparatingAxis[i])\n"
+	"	}//(i<numPairs)\n"
+	"}\n"
+	"inline int	findClippingFaces(const float4 separatingNormal,\n"
+	"                      const ConvexPolyhedronCL* hullA, \n"
+	"					  __global const ConvexPolyhedronCL* hullB,\n"
+	"                      const float4 posA, const Quaternion ornA,const float4 posB, const Quaternion ornB,\n"
+	"                       __global float4* worldVertsA1,\n"
+	"                      __global float4* worldNormalsA1,\n"
+	"                      __global float4* worldVertsB1,\n"
+	"                      int capacityWorldVerts,\n"
+	"                      const float minDist, float maxDist,\n"
+	"					  const float4* verticesA,\n"
+	"                      const btGpuFace* facesA,\n"
+	"                      const int* indicesA,\n"
+	"					  __global const float4* verticesB,\n"
+	"                      __global const btGpuFace* facesB,\n"
+	"                      __global const int* indicesB,\n"
+	"                      __global int4* clippingFaces, int pairIndex)\n"
+	"{\n"
+	"	int numContactsOut = 0;\n"
+	"	int numWorldVertsB1= 0;\n"
+	"    \n"
+	"    \n"
+	"	int closestFaceB=0;\n"
+	"	float dmax = -FLT_MAX;\n"
+	"    \n"
+	"	{\n"
+	"		for(int face=0;face<hullB->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(facesB[hullB->m_faceOffset+face].m_plane.x,\n"
+	"                                              facesB[hullB->m_faceOffset+face].m_plane.y, facesB[hullB->m_faceOffset+face].m_plane.z,0.f);\n"
+	"			const float4 WorldNormal = qtRotate(ornB, Normal);\n"
+	"			float d = dot3F4(WorldNormal,separatingNormal);\n"
+	"			if (d > dmax)\n"
+	"			{\n"
+	"				dmax = d;\n"
+	"				closestFaceB = face;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"	{\n"
+	"		const btGpuFace polyB = facesB[hullB->m_faceOffset+closestFaceB];\n"
+	"		int numVertices = polyB.m_numIndices;\n"
+	"        if (numVertices>capacityWorldVerts)\n"
+	"            numVertices = capacityWorldVerts;\n"
+	"        \n"
+	"		for(int e0=0;e0<numVertices;e0++)\n"
+	"		{\n"
+	"            if (e0<capacityWorldVerts)\n"
+	"            {\n"
+	"                const float4 b = verticesB[hullB->m_vertexOffset+indicesB[polyB.m_indexOffset+e0]];\n"
+	"                worldVertsB1[pairIndex*capacityWorldVerts+numWorldVertsB1++] = transform(&b,&posB,&ornB);\n"
+	"            }\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"    int closestFaceA=0;\n"
+	"	{\n"
+	"		float dmin = FLT_MAX;\n"
+	"		for(int face=0;face<hullA->m_numFaces;face++)\n"
+	"		{\n"
+	"			const float4 Normal = make_float4(\n"
+	"                                              facesA[hullA->m_faceOffset+face].m_plane.x,\n"
+	"                                              facesA[hullA->m_faceOffset+face].m_plane.y,\n"
+	"                                              facesA[hullA->m_faceOffset+face].m_plane.z,\n"
+	"                                              0.f);\n"
+	"			const float4 faceANormalWS = qtRotate(ornA,Normal);\n"
+	"            \n"
+	"			float d = dot3F4(faceANormalWS,separatingNormal);\n"
+	"			if (d < dmin)\n"
+	"			{\n"
+	"				dmin = d;\n"
+	"				closestFaceA = face;\n"
+	"                worldNormalsA1[pairIndex] = faceANormalWS;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"    \n"
+	"    int numVerticesA = facesA[hullA->m_faceOffset+closestFaceA].m_numIndices;\n"
+	"    if (numVerticesA>capacityWorldVerts)\n"
+	"       numVerticesA = capacityWorldVerts;\n"
+	"    \n"
+	"	for(int e0=0;e0<numVerticesA;e0++)\n"
+	"	{\n"
+	"        if (e0<capacityWorldVerts)\n"
+	"        {\n"
+	"            const float4 a = verticesA[hullA->m_vertexOffset+indicesA[facesA[hullA->m_faceOffset+closestFaceA].m_indexOffset+e0]];\n"
+	"            worldVertsA1[pairIndex*capacityWorldVerts+e0] = transform(&a, &posA,&ornA);\n"
+	"        }\n"
+	"    }\n"
+	"    \n"
+	"    clippingFaces[pairIndex].x = closestFaceA;\n"
+	"    clippingFaces[pairIndex].y = closestFaceB;\n"
+	"    clippingFaces[pairIndex].z = numVerticesA;\n"
+	"    clippingFaces[pairIndex].w = numWorldVertsB1;\n"
+	"    \n"
+	"    \n"
+	"	return numContactsOut;\n"
+	"}\n"
+	"// work-in-progress\n"
+	"__kernel void   findConcaveSeparatingAxisKernel( __global int4* concavePairs,\n"
+	"																					__global const BodyData* rigidBodies,\n"
+	"																					__global const btCollidableGpu* collidables,\n"
+	"																					__global const ConvexPolyhedronCL* convexShapes, \n"
+	"																					__global const float4* vertices,\n"
+	"																					__global const float4* uniqueEdges,\n"
+	"																					__global const btGpuFace* faces,\n"
+	"																					__global const int* indices,\n"
+	"																					__global const btGpuChildShape* gpuChildShapes,\n"
+	"																					__global btAabbCL* aabbs,\n"
+	"																					__global float4* concaveSeparatingNormalsOut,\n"
+	"																					__global int* concaveHasSeparatingNormals,\n"
+	"																					__global int4* clippingFacesOut,\n"
+	"																					__global float4* worldVertsA1GPU,\n"
+	"																					__global float4*  worldNormalsAGPU,\n"
+	"																					__global float4* worldVertsB1GPU,\n"
+	"																					int vertexFaceCapacity,\n"
+	"																					int numConcavePairs\n"
+	"																					)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numConcavePairs)\n"
+	"		return;\n"
+	"	concaveHasSeparatingNormals[i] = 0;\n"
+	"	int pairIdx = i;\n"
+	"	int bodyIndexA = concavePairs[i].x;\n"
+	"	int bodyIndexB = concavePairs[i].y;\n"
+	"	int collidableIndexA = rigidBodies[bodyIndexA].m_collidableIdx;\n"
+	"	int collidableIndexB = rigidBodies[bodyIndexB].m_collidableIdx;\n"
+	"	int shapeIndexA = collidables[collidableIndexA].m_shapeIndex;\n"
+	"	int shapeIndexB = collidables[collidableIndexB].m_shapeIndex;\n"
+	"	if (collidables[collidableIndexB].m_shapeType!=SHAPE_CONVEX_HULL&&\n"
+	"		collidables[collidableIndexB].m_shapeType!=SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"	{\n"
+	"		concavePairs[pairIdx].w = -1;\n"
+	"		return;\n"
+	"	}\n"
+	"	int numFacesA = convexShapes[shapeIndexA].m_numFaces;\n"
+	"	int numActualConcaveConvexTests = 0;\n"
+	"	\n"
+	"	int f = concavePairs[i].z;\n"
+	"	\n"
+	"	bool overlap = false;\n"
+	"	\n"
+	"	ConvexPolyhedronCL convexPolyhedronA;\n"
+	"	//add 3 vertices of the triangle\n"
+	"	convexPolyhedronA.m_numVertices = 3;\n"
+	"	convexPolyhedronA.m_vertexOffset = 0;\n"
+	"	float4	localCenter = make_float4(0.f,0.f,0.f,0.f);\n"
+	"	btGpuFace face = faces[convexShapes[shapeIndexA].m_faceOffset+f];\n"
+	"	float4 triMinAabb, triMaxAabb;\n"
+	"	btAabbCL triAabb;\n"
+	"	triAabb.m_min = make_float4(1e30f,1e30f,1e30f,0.f);\n"
+	"	triAabb.m_max = make_float4(-1e30f,-1e30f,-1e30f,0.f);\n"
+	"	\n"
+	"	float4 verticesA[3];\n"
+	"	for (int i=0;i<3;i++)\n"
+	"	{\n"
+	"		int index = indices[face.m_indexOffset+i];\n"
+	"		float4 vert = vertices[convexShapes[shapeIndexA].m_vertexOffset+index];\n"
+	"		verticesA[i] = vert;\n"
+	"		localCenter += vert;\n"
+	"			\n"
+	"		triAabb.m_min = min(triAabb.m_min,vert);		\n"
+	"		triAabb.m_max = max(triAabb.m_max,vert);		\n"
+	"	}\n"
+	"	overlap = true;\n"
+	"	overlap = (triAabb.m_min.x > aabbs[bodyIndexB].m_max.x || triAabb.m_max.x < aabbs[bodyIndexB].m_min.x) ? false : overlap;\n"
+	"	overlap = (triAabb.m_min.z > aabbs[bodyIndexB].m_max.z || triAabb.m_max.z < aabbs[bodyIndexB].m_min.z) ? false : overlap;\n"
+	"	overlap = (triAabb.m_min.y > aabbs[bodyIndexB].m_max.y || triAabb.m_max.y < aabbs[bodyIndexB].m_min.y) ? false : overlap;\n"
+	"		\n"
+	"	if (overlap)\n"
+	"	{\n"
+	"		float dmin = FLT_MAX;\n"
+	"		int hasSeparatingAxis=5;\n"
+	"		float4 sepAxis=make_float4(1,2,3,4);\n"
+	"		int localCC=0;\n"
+	"		numActualConcaveConvexTests++;\n"
+	"		//a triangle has 3 unique edges\n"
+	"		convexPolyhedronA.m_numUniqueEdges = 3;\n"
+	"		convexPolyhedronA.m_uniqueEdgesOffset = 0;\n"
+	"		float4 uniqueEdgesA[3];\n"
+	"		\n"
+	"		uniqueEdgesA[0] = (verticesA[1]-verticesA[0]);\n"
+	"		uniqueEdgesA[1] = (verticesA[2]-verticesA[1]);\n"
+	"		uniqueEdgesA[2] = (verticesA[0]-verticesA[2]);\n"
+	"		convexPolyhedronA.m_faceOffset = 0;\n"
+	"                                  \n"
+	"		float4 normal = make_float4(face.m_plane.x,face.m_plane.y,face.m_plane.z,0.f);\n"
+	"                             \n"
+	"		btGpuFace facesA[TRIANGLE_NUM_CONVEX_FACES];\n"
+	"		int indicesA[3+3+2+2+2];\n"
+	"		int curUsedIndices=0;\n"
+	"		int fidx=0;\n"
+	"		//front size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[0] = 0;\n"
+	"			indicesA[1] = 1;\n"
+	"			indicesA[2] = 2;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = normal.x;\n"
+	"			facesA[fidx].m_plane.y = normal.y;\n"
+	"			facesA[fidx].m_plane.z = normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"		//back size of triangle\n"
+	"		{\n"
+	"			facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"			indicesA[3]=2;\n"
+	"			indicesA[4]=1;\n"
+	"			indicesA[5]=0;\n"
+	"			curUsedIndices+=3;\n"
+	"			float c = dot(normal,verticesA[0]);\n"
+	"			float c1 = -face.m_plane.w;\n"
+	"			facesA[fidx].m_plane.x = -normal.x;\n"
+	"			facesA[fidx].m_plane.y = -normal.y;\n"
+	"			facesA[fidx].m_plane.z = -normal.z;\n"
+	"			facesA[fidx].m_plane.w = c;\n"
+	"			facesA[fidx].m_numIndices=3;\n"
+	"		}\n"
+	"		fidx++;\n"
+	"		bool addEdgePlanes = true;\n"
+	"		if (addEdgePlanes)\n"
+	"		{\n"
+	"			int numVertices=3;\n"
+	"			int prevVertex = numVertices-1;\n"
+	"			for (int i=0;i<numVertices;i++)\n"
+	"			{\n"
+	"				float4 v0 = verticesA[i];\n"
+	"				float4 v1 = verticesA[prevVertex];\n"
+	"                                            \n"
+	"				float4 edgeNormal = normalize(cross(normal,v1-v0));\n"
+	"				float c = -dot(edgeNormal,v0);\n"
+	"				facesA[fidx].m_numIndices = 2;\n"
+	"				facesA[fidx].m_indexOffset=curUsedIndices;\n"
+	"				indicesA[curUsedIndices++]=i;\n"
+	"				indicesA[curUsedIndices++]=prevVertex;\n"
+	"                                            \n"
+	"				facesA[fidx].m_plane.x = edgeNormal.x;\n"
+	"				facesA[fidx].m_plane.y = edgeNormal.y;\n"
+	"				facesA[fidx].m_plane.z = edgeNormal.z;\n"
+	"				facesA[fidx].m_plane.w = c;\n"
+	"				fidx++;\n"
+	"				prevVertex = i;\n"
+	"			}\n"
+	"		}\n"
+	"		convexPolyhedronA.m_numFaces = TRIANGLE_NUM_CONVEX_FACES;\n"
+	"		convexPolyhedronA.m_localCenter = localCenter*(1.f/3.f);\n"
+	"		float4 posA = rigidBodies[bodyIndexA].m_pos;\n"
+	"		posA.w = 0.f;\n"
+	"		float4 posB = rigidBodies[bodyIndexB].m_pos;\n"
+	"		posB.w = 0.f;\n"
+	"		float4 ornA = rigidBodies[bodyIndexA].m_quat;\n"
+	"		float4 ornB =rigidBodies[bodyIndexB].m_quat;\n"
+	"		\n"
+	"		///////////////////\n"
+	"		///compound shape support\n"
+	"		if (collidables[collidableIndexB].m_shapeType==SHAPE_COMPOUND_OF_CONVEX_HULLS)\n"
+	"		{\n"
+	"			int compoundChild = concavePairs[pairIdx].w;\n"
+	"			int childShapeIndexB = compoundChild;//collidables[collidableIndexB].m_shapeIndex+compoundChild;\n"
+	"			int childColIndexB = gpuChildShapes[childShapeIndexB].m_shapeIndex;\n"
+	"			float4 childPosB = gpuChildShapes[childShapeIndexB].m_childPosition;\n"
+	"			float4 childOrnB = gpuChildShapes[childShapeIndexB].m_childOrientation;\n"
+	"			float4 newPosB = transform(&childPosB,&posB,&ornB);\n"
+	"			float4 newOrnB = qtMul(ornB,childOrnB);\n"
+	"			posB = newPosB;\n"
+	"			ornB = newOrnB;\n"
+	"			shapeIndexB = collidables[childColIndexB].m_shapeIndex;\n"
+	"		}\n"
+	"		//////////////////\n"
+	"		float4 c0local = convexPolyhedronA.m_localCenter;\n"
+	"		float4 c0 = transform(&c0local, &posA, &ornA);\n"
+	"		float4 c1local = convexShapes[shapeIndexB].m_localCenter;\n"
+	"		float4 c1 = transform(&c1local,&posB,&ornB);\n"
+	"		const float4 DeltaC2 = c0 - c1;\n"
+	"		bool sepA = findSeparatingAxisLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],\n"
+	"												posA,ornA,\n"
+	"												posB,ornB,\n"
+	"												DeltaC2,\n"
+	"												verticesA,uniqueEdgesA,facesA,indicesA,\n"
+	"												vertices,uniqueEdges,faces,indices,\n"
+	"												&sepAxis,&dmin);\n"
+	"		hasSeparatingAxis = 4;\n"
+	"		if (!sepA)\n"
+	"		{\n"
+	"			hasSeparatingAxis = 0;\n"
+	"		} else\n"
+	"		{\n"
+	"			bool sepB = findSeparatingAxisLocalB(	&convexShapes[shapeIndexB],&convexPolyhedronA,\n"
+	"												posB,ornB,\n"
+	"												posA,ornA,\n"
+	"												DeltaC2,\n"
+	"												vertices,uniqueEdges,faces,indices,\n"
+	"												verticesA,uniqueEdgesA,facesA,indicesA,\n"
+	"												&sepAxis,&dmin);\n"
+	"			if (!sepB)\n"
+	"			{\n"
+	"				hasSeparatingAxis = 0;\n"
+	"			} else\n"
+	"			{\n"
+	"				bool sepEE = findSeparatingAxisEdgeEdgeLocalA(	&convexPolyhedronA, &convexShapes[shapeIndexB],\n"
+	"															posA,ornA,\n"
+	"															posB,ornB,\n"
+	"															DeltaC2,\n"
+	"															verticesA,uniqueEdgesA,facesA,indicesA,\n"
+	"															vertices,uniqueEdges,faces,indices,\n"
+	"															&sepAxis,&dmin);\n"
+	"	\n"
+	"				if (!sepEE)\n"
+	"				{\n"
+	"					hasSeparatingAxis = 0;\n"
+	"				} else\n"
+	"				{\n"
+	"					hasSeparatingAxis = 1;\n"
+	"				}\n"
+	"			}\n"
+	"		}	\n"
+	"		\n"
+	"		if (hasSeparatingAxis)\n"
+	"		{\n"
+	"			sepAxis.w = dmin;\n"
+	"			concaveSeparatingNormalsOut[pairIdx]=sepAxis;\n"
+	"			concaveHasSeparatingNormals[i]=1;\n"
+	"			float minDist = -1e30f;\n"
+	"			float maxDist = 0.02f;\n"
+	"		\n"
+	"			findClippingFaces(sepAxis,\n"
+	"                     &convexPolyhedronA,\n"
+	"					 &convexShapes[shapeIndexB],\n"
+	"					 posA,ornA,\n"
+	"					 posB,ornB,\n"
+	"                      worldVertsA1GPU,\n"
+	"                      worldNormalsAGPU,\n"
+	"                      worldVertsB1GPU,\n"
+	"					  vertexFaceCapacity,\n"
+	"                      minDist, maxDist,\n"
+	"                      verticesA,\n"
+	"                      facesA,\n"
+	"                      indicesA,\n"
+	" 					  vertices,\n"
+	"                      faces,\n"
+	"                      indices,\n"
+	"                      clippingFacesOut, pairIdx);\n"
+	"		} else\n"
+	"		{	\n"
+	"			//mark this pair as in-active\n"
+	"			concavePairs[pairIdx].w = -1;\n"
+	"		}\n"
+	"	}\n"
+	"	else\n"
+	"	{	\n"
+	"		//mark this pair as in-active\n"
+	"		concavePairs[pairIdx].w = -1;\n"
+	"	}\n"
+	"	\n"
+	"	concavePairs[pairIdx].z = -1;//now z is used for existing/persistent contacts\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.cpp
new file mode 100644
index 0000000..c0e11bf
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.cpp
@@ -0,0 +1,203 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+//Host-code rewritten by Erwin Coumans
+
+#define BOUNDSEARCH_PATH "src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl"
+#define KERNEL0 "SearchSortDataLowerKernel"
+#define KERNEL1 "SearchSortDataUpperKernel"
+#define KERNEL2 "SubtractKernel"
+
+#include "b3BoundSearchCL.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "b3LauncherCL.h"
+#include "kernels/BoundSearchKernelsCL.h"
+
+b3BoundSearchCL::b3BoundSearchCL(cl_context ctx, cl_device_id device, cl_command_queue queue, int maxSize)
+	: m_context(ctx),
+	  m_device(device),
+	  m_queue(queue)
+{
+	const char* additionalMacros = "";
+	//const char* srcFileNameForCaching="";
+
+	cl_int pErrNum;
+	const char* kernelSource = boundSearchKernelsCL;
+
+	cl_program boundSearchProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, kernelSource, &pErrNum, additionalMacros, BOUNDSEARCH_PATH);
+	b3Assert(boundSearchProg);
+
+	m_lowerSortDataKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "SearchSortDataLowerKernel", &pErrNum, boundSearchProg, additionalMacros);
+	b3Assert(m_lowerSortDataKernel);
+
+	m_upperSortDataKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "SearchSortDataUpperKernel", &pErrNum, boundSearchProg, additionalMacros);
+	b3Assert(m_upperSortDataKernel);
+
+	m_subtractKernel = 0;
+
+	if (maxSize)
+	{
+		m_subtractKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "SubtractKernel", &pErrNum, boundSearchProg, additionalMacros);
+		b3Assert(m_subtractKernel);
+	}
+
+	//m_constBuffer = new b3OpenCLArray<b3Int4>( device, 1, BufferBase::BUFFER_CONST );
+
+	m_lower = (maxSize == 0) ? 0 : new b3OpenCLArray<unsigned int>(ctx, queue, maxSize);
+	m_upper = (maxSize == 0) ? 0 : new b3OpenCLArray<unsigned int>(ctx, queue, maxSize);
+
+	m_filler = new b3FillCL(ctx, device, queue);
+}
+
+b3BoundSearchCL::~b3BoundSearchCL()
+{
+	delete m_lower;
+	delete m_upper;
+	delete m_filler;
+
+	clReleaseKernel(m_lowerSortDataKernel);
+	clReleaseKernel(m_upperSortDataKernel);
+	clReleaseKernel(m_subtractKernel);
+}
+
+void b3BoundSearchCL::execute(b3OpenCLArray<b3SortData>& src, int nSrc, b3OpenCLArray<unsigned int>& dst, int nDst, Option option)
+{
+	b3Int4 constBuffer;
+	constBuffer.x = nSrc;
+	constBuffer.y = nDst;
+
+	if (option == BOUND_LOWER)
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src.getBufferCL(), true), b3BufferInfoCL(dst.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_lowerSortDataKernel, "m_lowerSortDataKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(nSrc);
+		launcher.setConst(nDst);
+
+		launcher.launch1D(nSrc, 64);
+	}
+	else if (option == BOUND_UPPER)
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src.getBufferCL(), true), b3BufferInfoCL(dst.getBufferCL())};
+
+		b3LauncherCL launcher(m_queue, m_upperSortDataKernel, "m_upperSortDataKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(nSrc);
+		launcher.setConst(nDst);
+
+		launcher.launch1D(nSrc, 64);
+	}
+	else if (option == COUNT)
+	{
+		b3Assert(m_lower);
+		b3Assert(m_upper);
+		b3Assert(m_lower->capacity() <= (int)nDst);
+		b3Assert(m_upper->capacity() <= (int)nDst);
+
+		int zero = 0;
+		m_filler->execute(*m_lower, zero, nDst);
+		m_filler->execute(*m_upper, zero, nDst);
+
+		execute(src, nSrc, *m_lower, nDst, BOUND_LOWER);
+		execute(src, nSrc, *m_upper, nDst, BOUND_UPPER);
+
+		{
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(m_upper->getBufferCL(), true), b3BufferInfoCL(m_lower->getBufferCL(), true), b3BufferInfoCL(dst.getBufferCL())};
+
+			b3LauncherCL launcher(m_queue, m_subtractKernel, "m_subtractKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(nSrc);
+			launcher.setConst(nDst);
+
+			launcher.launch1D(nDst, 64);
+		}
+	}
+	else
+	{
+		b3Assert(0);
+	}
+}
+
+void b3BoundSearchCL::executeHost(b3AlignedObjectArray<b3SortData>& src, int nSrc,
+								  b3AlignedObjectArray<unsigned int>& dst, int nDst, Option option)
+{
+	for (int i = 0; i < nSrc - 1; i++)
+		b3Assert(src[i].m_key <= src[i + 1].m_key);
+
+	b3SortData minData, zeroData, maxData;
+	minData.m_key = -1;
+	minData.m_value = -1;
+	zeroData.m_key = 0;
+	zeroData.m_value = 0;
+	maxData.m_key = nDst;
+	maxData.m_value = nDst;
+
+	if (option == BOUND_LOWER)
+	{
+		for (int i = 0; i < nSrc; i++)
+		{
+			b3SortData& iData = (i == 0) ? minData : src[i - 1];
+			b3SortData& jData = (i == nSrc) ? maxData : src[i];
+
+			if (iData.m_key != jData.m_key)
+			{
+				int k = jData.m_key;
+				{
+					dst[k] = i;
+				}
+			}
+		}
+	}
+	else if (option == BOUND_UPPER)
+	{
+		for (int i = 1; i < nSrc + 1; i++)
+		{
+			b3SortData& iData = src[i - 1];
+			b3SortData& jData = (i == nSrc) ? maxData : src[i];
+
+			if (iData.m_key != jData.m_key)
+			{
+				int k = iData.m_key;
+				{
+					dst[k] = i;
+				}
+			}
+		}
+	}
+	else if (option == COUNT)
+	{
+		b3AlignedObjectArray<unsigned int> lower;
+		lower.resize(nDst);
+		b3AlignedObjectArray<unsigned int> upper;
+		upper.resize(nDst);
+
+		for (int i = 0; i < nDst; i++)
+		{
+			lower[i] = upper[i] = 0;
+		}
+
+		executeHost(src, nSrc, lower, nDst, BOUND_LOWER);
+		executeHost(src, nSrc, upper, nDst, BOUND_UPPER);
+
+		for (int i = 0; i < nDst; i++)
+		{
+			dst[i] = upper[i] - lower[i];
+		}
+	}
+	else
+	{
+		b3Assert(0);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h
new file mode 100644
index 0000000..0d633e3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h
@@ -0,0 +1,64 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+#ifndef B3_BOUNDSEARCH_H
+#define B3_BOUNDSEARCH_H
+
+#pragma once
+
+/*#include <Adl/Adl.h>
+#include <AdlPrimitives/Math/Math.h>
+#include <AdlPrimitives/Sort/SortData.h>
+#include <AdlPrimitives/Fill/Fill.h>
+*/
+
+#include "b3OpenCLArray.h"
+#include "b3FillCL.h"
+#include "b3RadixSort32CL.h"  //for b3SortData (perhaps move it?)
+class b3BoundSearchCL
+{
+public:
+	enum Option
+	{
+		BOUND_LOWER,
+		BOUND_UPPER,
+		COUNT,
+	};
+
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+
+	cl_kernel m_lowerSortDataKernel;
+	cl_kernel m_upperSortDataKernel;
+	cl_kernel m_subtractKernel;
+
+	b3OpenCLArray<b3Int4>* m_constbtOpenCLArray;
+	b3OpenCLArray<unsigned int>* m_lower;
+	b3OpenCLArray<unsigned int>* m_upper;
+
+	b3FillCL* m_filler;
+
+	b3BoundSearchCL(cl_context context, cl_device_id device, cl_command_queue queue, int size);
+
+	virtual ~b3BoundSearchCL();
+
+	//	src has to be src[i].m_key <= src[i+1].m_key
+	void execute(b3OpenCLArray<b3SortData>& src, int nSrc, b3OpenCLArray<unsigned int>& dst, int nDst, Option option = BOUND_LOWER);
+
+	void executeHost(b3AlignedObjectArray<b3SortData>& src, int nSrc, b3AlignedObjectArray<unsigned int>& dst, int nDst, Option option = BOUND_LOWER);
+};
+
+#endif  //B3_BOUNDSEARCH_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BufferInfoCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BufferInfoCL.h
new file mode 100644
index 0000000..35fc467
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3BufferInfoCL.h
@@ -0,0 +1,18 @@
+
+#ifndef B3_BUFFER_INFO_CL_H
+#define B3_BUFFER_INFO_CL_H
+
+#include "b3OpenCLArray.h"
+
+struct b3BufferInfoCL
+{
+	//b3BufferInfoCL(){}
+
+	//	template<typename T>
+	b3BufferInfoCL(cl_mem buff, bool isReadOnly = false) : m_clBuffer(buff), m_isReadOnly(isReadOnly) {}
+
+	cl_mem m_clBuffer;
+	bool m_isReadOnly;
+};
+
+#endif  //B3_BUFFER_INFO_CL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.cpp
new file mode 100644
index 0000000..bd25bb2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.cpp
@@ -0,0 +1,119 @@
+#include "b3FillCL.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "b3BufferInfoCL.h"
+#include "b3LauncherCL.h"
+
+#define FILL_CL_PROGRAM_PATH "src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl"
+
+#include "kernels/FillKernelsCL.h"
+
+b3FillCL::b3FillCL(cl_context ctx, cl_device_id device, cl_command_queue queue)
+	: m_commandQueue(queue)
+{
+	const char* kernelSource = fillKernelsCL;
+	cl_int pErrNum;
+	const char* additionalMacros = "";
+
+	cl_program fillProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, kernelSource, &pErrNum, additionalMacros, FILL_CL_PROGRAM_PATH);
+	b3Assert(fillProg);
+
+	m_fillIntKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "FillIntKernel", &pErrNum, fillProg, additionalMacros);
+	b3Assert(m_fillIntKernel);
+
+	m_fillUnsignedIntKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "FillUnsignedIntKernel", &pErrNum, fillProg, additionalMacros);
+	b3Assert(m_fillIntKernel);
+
+	m_fillFloatKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "FillFloatKernel", &pErrNum, fillProg, additionalMacros);
+	b3Assert(m_fillFloatKernel);
+
+	m_fillKernelInt2 = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "FillInt2Kernel", &pErrNum, fillProg, additionalMacros);
+	b3Assert(m_fillKernelInt2);
+}
+
+b3FillCL::~b3FillCL()
+{
+	clReleaseKernel(m_fillKernelInt2);
+	clReleaseKernel(m_fillIntKernel);
+	clReleaseKernel(m_fillUnsignedIntKernel);
+	clReleaseKernel(m_fillFloatKernel);
+}
+
+void b3FillCL::execute(b3OpenCLArray<float>& src, const float value, int n, int offset)
+{
+	b3Assert(n > 0);
+
+	{
+		b3LauncherCL launcher(m_commandQueue, m_fillFloatKernel, "m_fillFloatKernel");
+		launcher.setBuffer(src.getBufferCL());
+		launcher.setConst(n);
+		launcher.setConst(value);
+		launcher.setConst(offset);
+
+		launcher.launch1D(n);
+	}
+}
+
+void b3FillCL::execute(b3OpenCLArray<int>& src, const int value, int n, int offset)
+{
+	b3Assert(n > 0);
+
+	{
+		b3LauncherCL launcher(m_commandQueue, m_fillIntKernel, "m_fillIntKernel");
+		launcher.setBuffer(src.getBufferCL());
+		launcher.setConst(n);
+		launcher.setConst(value);
+		launcher.setConst(offset);
+		launcher.launch1D(n);
+	}
+}
+
+void b3FillCL::execute(b3OpenCLArray<unsigned int>& src, const unsigned int value, int n, int offset)
+{
+	b3Assert(n > 0);
+
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src.getBufferCL())};
+
+		b3LauncherCL launcher(m_commandQueue, m_fillUnsignedIntKernel, "m_fillUnsignedIntKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(n);
+		launcher.setConst(value);
+		launcher.setConst(offset);
+
+		launcher.launch1D(n);
+	}
+}
+
+void b3FillCL::executeHost(b3AlignedObjectArray<b3Int2>& src, const b3Int2& value, int n, int offset)
+{
+	for (int i = 0; i < n; i++)
+	{
+		src[i + offset] = value;
+	}
+}
+
+void b3FillCL::executeHost(b3AlignedObjectArray<int>& src, const int value, int n, int offset)
+{
+	for (int i = 0; i < n; i++)
+	{
+		src[i + offset] = value;
+	}
+}
+
+void b3FillCL::execute(b3OpenCLArray<b3Int2>& src, const b3Int2& value, int n, int offset)
+{
+	b3Assert(n > 0);
+
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src.getBufferCL())};
+
+		b3LauncherCL launcher(m_commandQueue, m_fillKernelInt2, "m_fillKernelInt2");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(n);
+		launcher.setConst(value);
+		launcher.setConst(offset);
+
+		//( constBuffer );
+		launcher.launch1D(n);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.h
new file mode 100644
index 0000000..c92c3e5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3FillCL.h
@@ -0,0 +1,52 @@
+#ifndef B3_FILL_CL_H
+#define B3_FILL_CL_H
+
+#include "b3OpenCLArray.h"
+#include "Bullet3Common/b3Scalar.h"
+
+#include "Bullet3Common/shared/b3Int2.h"
+#include "Bullet3Common/shared/b3Int4.h"
+
+class b3FillCL
+{
+	cl_command_queue m_commandQueue;
+
+	cl_kernel m_fillKernelInt2;
+	cl_kernel m_fillIntKernel;
+	cl_kernel m_fillUnsignedIntKernel;
+	cl_kernel m_fillFloatKernel;
+
+public:
+	struct b3ConstData
+	{
+		union {
+			b3Int4 m_data;
+			b3UnsignedInt4 m_UnsignedData;
+		};
+		int m_offset;
+		int m_n;
+		int m_padding[2];
+	};
+
+protected:
+public:
+	b3FillCL(cl_context ctx, cl_device_id device, cl_command_queue queue);
+
+	virtual ~b3FillCL();
+
+	void execute(b3OpenCLArray<unsigned int>& src, const unsigned int value, int n, int offset = 0);
+
+	void execute(b3OpenCLArray<int>& src, const int value, int n, int offset = 0);
+
+	void execute(b3OpenCLArray<float>& src, const float value, int n, int offset = 0);
+
+	void execute(b3OpenCLArray<b3Int2>& src, const b3Int2& value, int n, int offset = 0);
+
+	void executeHost(b3AlignedObjectArray<b3Int2>& src, const b3Int2& value, int n, int offset);
+
+	void executeHost(b3AlignedObjectArray<int>& src, const int value, int n, int offset);
+
+	//	void execute(b3OpenCLArray<b3Int4>& src, const b3Int4& value, int n, int offset = 0);
+};
+
+#endif  //B3_FILL_CL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.cpp
new file mode 100644
index 0000000..c97d02e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.cpp
@@ -0,0 +1,296 @@
+#include "b3LauncherCL.h"
+
+bool gDebugLauncherCL = false;
+
+b3LauncherCL::b3LauncherCL(cl_command_queue queue, cl_kernel kernel, const char* name)
+	: m_commandQueue(queue),
+	  m_kernel(kernel),
+	  m_idx(0),
+	  m_enableSerialization(false),
+	  m_name(name)
+{
+	if (gDebugLauncherCL)
+	{
+		static int counter = 0;
+		printf("[%d] Prepare to launch OpenCL kernel %s\n", counter++, name);
+	}
+
+	m_serializationSizeInBytes = sizeof(int);
+}
+
+b3LauncherCL::~b3LauncherCL()
+{
+	for (int i = 0; i < m_arrays.size(); i++)
+	{
+		delete (m_arrays[i]);
+	}
+
+	m_arrays.clear();
+	if (gDebugLauncherCL)
+	{
+		static int counter = 0;
+		printf("[%d] Finished launching OpenCL kernel %s\n", counter++, m_name);
+	}
+}
+
+void b3LauncherCL::setBuffer(cl_mem clBuffer)
+{
+	if (m_enableSerialization)
+	{
+		b3KernelArgData kernelArg;
+		kernelArg.m_argIndex = m_idx;
+		kernelArg.m_isBuffer = 1;
+		kernelArg.m_clBuffer = clBuffer;
+
+		cl_mem_info param_name = CL_MEM_SIZE;
+		size_t param_value;
+		size_t sizeInBytes = sizeof(size_t);
+		size_t actualSizeInBytes;
+		cl_int err;
+		err = clGetMemObjectInfo(kernelArg.m_clBuffer,
+								 param_name,
+								 sizeInBytes,
+								 &param_value,
+								 &actualSizeInBytes);
+
+		b3Assert(err == CL_SUCCESS);
+		kernelArg.m_argSizeInBytes = param_value;
+
+		m_kernelArguments.push_back(kernelArg);
+		m_serializationSizeInBytes += sizeof(b3KernelArgData);
+		m_serializationSizeInBytes += param_value;
+	}
+	cl_int status = clSetKernelArg(m_kernel, m_idx++, sizeof(cl_mem), &clBuffer);
+	b3Assert(status == CL_SUCCESS);
+}
+
+void b3LauncherCL::setBuffers(b3BufferInfoCL* buffInfo, int n)
+{
+	for (int i = 0; i < n; i++)
+	{
+		if (m_enableSerialization)
+		{
+			b3KernelArgData kernelArg;
+			kernelArg.m_argIndex = m_idx;
+			kernelArg.m_isBuffer = 1;
+			kernelArg.m_clBuffer = buffInfo[i].m_clBuffer;
+
+			cl_mem_info param_name = CL_MEM_SIZE;
+			size_t param_value;
+			size_t sizeInBytes = sizeof(size_t);
+			size_t actualSizeInBytes;
+			cl_int err;
+			err = clGetMemObjectInfo(kernelArg.m_clBuffer,
+									 param_name,
+									 sizeInBytes,
+									 &param_value,
+									 &actualSizeInBytes);
+
+			b3Assert(err == CL_SUCCESS);
+			kernelArg.m_argSizeInBytes = param_value;
+
+			m_kernelArguments.push_back(kernelArg);
+			m_serializationSizeInBytes += sizeof(b3KernelArgData);
+			m_serializationSizeInBytes += param_value;
+		}
+		cl_int status = clSetKernelArg(m_kernel, m_idx++, sizeof(cl_mem), &buffInfo[i].m_clBuffer);
+		b3Assert(status == CL_SUCCESS);
+	}
+}
+
+struct b3KernelArgDataUnaligned
+{
+	int m_isBuffer;
+	int m_argIndex;
+	int m_argSizeInBytes;
+	int m_unusedPadding;
+	union {
+		cl_mem m_clBuffer;
+		unsigned char m_argData[B3_CL_MAX_ARG_SIZE];
+	};
+};
+#include <string.h>
+
+int b3LauncherCL::deserializeArgs(unsigned char* buf, int bufSize, cl_context ctx)
+{
+	int index = 0;
+
+	int numArguments = *(int*)&buf[index];
+	index += sizeof(int);
+
+	for (int i = 0; i < numArguments; i++)
+	{
+		b3KernelArgDataUnaligned* arg = (b3KernelArgDataUnaligned*)&buf[index];
+
+		index += sizeof(b3KernelArgData);
+		if (arg->m_isBuffer)
+		{
+			b3OpenCLArray<unsigned char>* clData = new b3OpenCLArray<unsigned char>(ctx, m_commandQueue, arg->m_argSizeInBytes);
+			clData->resize(arg->m_argSizeInBytes);
+
+			clData->copyFromHostPointer(&buf[index], arg->m_argSizeInBytes);
+
+			arg->m_clBuffer = clData->getBufferCL();
+
+			m_arrays.push_back(clData);
+
+			cl_int status = clSetKernelArg(m_kernel, m_idx++, sizeof(cl_mem), &arg->m_clBuffer);
+			b3Assert(status == CL_SUCCESS);
+			index += arg->m_argSizeInBytes;
+		}
+		else
+		{
+			cl_int status = clSetKernelArg(m_kernel, m_idx++, arg->m_argSizeInBytes, &arg->m_argData);
+			b3Assert(status == CL_SUCCESS);
+		}
+		b3KernelArgData b;
+		memcpy(&b, arg, sizeof(b3KernelArgDataUnaligned));
+		m_kernelArguments.push_back(b);
+	}
+	m_serializationSizeInBytes = index;
+	return index;
+}
+
+int b3LauncherCL::validateResults(unsigned char* goldBuffer, int goldBufferCapacity, cl_context ctx)
+{
+	int index = 0;
+
+	int numArguments = *(int*)&goldBuffer[index];
+	index += sizeof(int);
+
+	if (numArguments != m_kernelArguments.size())
+	{
+		printf("failed validation: expected %d arguments, found %d\n", numArguments, m_kernelArguments.size());
+		return -1;
+	}
+
+	for (int ii = 0; ii < numArguments; ii++)
+	{
+		b3KernelArgData* argGold = (b3KernelArgData*)&goldBuffer[index];
+
+		if (m_kernelArguments[ii].m_argSizeInBytes != argGold->m_argSizeInBytes)
+		{
+			printf("failed validation: argument %d sizeInBytes expected: %d, found %d\n", ii, argGold->m_argSizeInBytes, m_kernelArguments[ii].m_argSizeInBytes);
+			return -2;
+		}
+
+		{
+			int expected = argGold->m_isBuffer;
+			int found = m_kernelArguments[ii].m_isBuffer;
+
+			if (expected != found)
+			{
+				printf("failed validation: argument %d isBuffer expected: %d, found %d\n", ii, expected, found);
+				return -3;
+			}
+		}
+		index += sizeof(b3KernelArgData);
+
+		if (argGold->m_isBuffer)
+		{
+			unsigned char* memBuf = (unsigned char*)malloc(m_kernelArguments[ii].m_argSizeInBytes);
+			unsigned char* goldBuf = &goldBuffer[index];
+			for (int j = 0; j < m_kernelArguments[j].m_argSizeInBytes; j++)
+			{
+				memBuf[j] = 0xaa;
+			}
+
+			cl_int status = 0;
+			status = clEnqueueReadBuffer(m_commandQueue, m_kernelArguments[ii].m_clBuffer, CL_TRUE, 0, m_kernelArguments[ii].m_argSizeInBytes,
+										 memBuf, 0, 0, 0);
+			b3Assert(status == CL_SUCCESS);
+			clFinish(m_commandQueue);
+
+			for (int b = 0; b < m_kernelArguments[ii].m_argSizeInBytes; b++)
+			{
+				int expected = goldBuf[b];
+				int found = memBuf[b];
+				if (expected != found)
+				{
+					printf("failed validation: argument %d OpenCL data at byte position %d expected: %d, found %d\n",
+						   ii, b, expected, found);
+					return -4;
+				}
+			}
+
+			index += argGold->m_argSizeInBytes;
+		}
+		else
+		{
+			//compare content
+			for (int b = 0; b < m_kernelArguments[ii].m_argSizeInBytes; b++)
+			{
+				int expected = argGold->m_argData[b];
+				int found = m_kernelArguments[ii].m_argData[b];
+				if (expected != found)
+				{
+					printf("failed validation: argument %d const data at byte position %d expected: %d, found %d\n",
+						   ii, b, expected, found);
+					return -5;
+				}
+			}
+		}
+	}
+	return index;
+}
+
+int b3LauncherCL::serializeArguments(unsigned char* destBuffer, int destBufferCapacity)
+{
+	//initialize to known values
+	for (int i = 0; i < destBufferCapacity; i++)
+		destBuffer[i] = 0xec;
+
+	assert(destBufferCapacity >= m_serializationSizeInBytes);
+
+	//todo: use the b3Serializer for this to allow for 32/64bit, endianness etc
+	int numArguments = m_kernelArguments.size();
+	int curBufferSize = 0;
+	int* dest = (int*)&destBuffer[curBufferSize];
+	*dest = numArguments;
+	curBufferSize += sizeof(int);
+
+	for (int i = 0; i < this->m_kernelArguments.size(); i++)
+	{
+		b3KernelArgData* arg = (b3KernelArgData*)&destBuffer[curBufferSize];
+		*arg = m_kernelArguments[i];
+		curBufferSize += sizeof(b3KernelArgData);
+		if (arg->m_isBuffer == 1)
+		{
+			//copy the OpenCL buffer content
+			cl_int status = 0;
+			status = clEnqueueReadBuffer(m_commandQueue, arg->m_clBuffer, 0, 0, arg->m_argSizeInBytes,
+										 &destBuffer[curBufferSize], 0, 0, 0);
+			b3Assert(status == CL_SUCCESS);
+			clFinish(m_commandQueue);
+			curBufferSize += arg->m_argSizeInBytes;
+		}
+	}
+	return curBufferSize;
+}
+
+void b3LauncherCL::serializeToFile(const char* fileName, int numWorkItems)
+{
+	int num = numWorkItems;
+	int buffSize = getSerializationBufferSize();
+	unsigned char* buf = new unsigned char[buffSize + sizeof(int)];
+	for (int i = 0; i < buffSize + 1; i++)
+	{
+		unsigned char* ptr = (unsigned char*)&buf[i];
+		*ptr = 0xff;
+	}
+	//	int actualWrite = serializeArguments(buf,buffSize);
+
+	//	unsigned char* cptr = (unsigned char*)&buf[buffSize];
+	//            printf("buf[buffSize] = %d\n",*cptr);
+
+	assert(buf[buffSize] == 0xff);  //check for buffer overrun
+	int* ptr = (int*)&buf[buffSize];
+
+	*ptr = num;
+
+	FILE* f = fopen(fileName, "wb");
+	fwrite(buf, buffSize + sizeof(int), 1, f);
+	fclose(f);
+
+	delete[] buf;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h
new file mode 100644
index 0000000..18e9c1d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h
@@ -0,0 +1,128 @@
+
+#ifndef B3_LAUNCHER_CL_H
+#define B3_LAUNCHER_CL_H
+
+#include "b3BufferInfoCL.h"
+#include "Bullet3Common/b3MinMax.h"
+#include "b3OpenCLArray.h"
+#include <stdio.h>
+
+#define B3_DEBUG_SERIALIZE_CL
+
+#ifdef _WIN32
+#pragma warning(disable : 4996)
+#endif
+#define B3_CL_MAX_ARG_SIZE 16
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3KernelArgData
+{
+	int m_isBuffer;
+	int m_argIndex;
+	int m_argSizeInBytes;
+	int m_unusedPadding;
+	union {
+		cl_mem m_clBuffer;
+		unsigned char m_argData[B3_CL_MAX_ARG_SIZE];
+	};
+};
+
+class b3LauncherCL
+{
+	cl_command_queue m_commandQueue;
+	cl_kernel m_kernel;
+	int m_idx;
+
+	b3AlignedObjectArray<b3KernelArgData> m_kernelArguments;
+	int m_serializationSizeInBytes;
+	bool m_enableSerialization;
+
+	const char* m_name;
+
+public:
+	b3AlignedObjectArray<b3OpenCLArray<unsigned char>*> m_arrays;
+
+	b3LauncherCL(cl_command_queue queue, cl_kernel kernel, const char* name);
+
+	virtual ~b3LauncherCL();
+
+	void setBuffer(cl_mem clBuffer);
+
+	void setBuffers(b3BufferInfoCL* buffInfo, int n);
+
+	int getSerializationBufferSize() const
+	{
+		return m_serializationSizeInBytes;
+	}
+
+	int deserializeArgs(unsigned char* buf, int bufSize, cl_context ctx);
+
+	inline int validateResults(unsigned char* goldBuffer, int goldBufferCapacity, cl_context ctx);
+
+	int serializeArguments(unsigned char* destBuffer, int destBufferCapacity);
+
+	int getNumArguments() const
+	{
+		return m_kernelArguments.size();
+	}
+
+	b3KernelArgData getArgument(int index)
+	{
+		return m_kernelArguments[index];
+	}
+
+	void serializeToFile(const char* fileName, int numWorkItems);
+
+	template <typename T>
+	inline void setConst(const T& consts)
+	{
+		int sz = sizeof(T);
+		b3Assert(sz <= B3_CL_MAX_ARG_SIZE);
+
+		if (m_enableSerialization)
+		{
+			b3KernelArgData kernelArg;
+			kernelArg.m_argIndex = m_idx;
+			kernelArg.m_isBuffer = 0;
+			T* destArg = (T*)kernelArg.m_argData;
+			*destArg = consts;
+			kernelArg.m_argSizeInBytes = sizeof(T);
+			m_kernelArguments.push_back(kernelArg);
+			m_serializationSizeInBytes += sizeof(b3KernelArgData);
+		}
+
+		cl_int status = clSetKernelArg(m_kernel, m_idx++, sz, &consts);
+		b3Assert(status == CL_SUCCESS);
+	}
+
+	inline void launch1D(int numThreads, int localSize = 64)
+	{
+		launch2D(numThreads, 1, localSize, 1);
+	}
+
+	inline void launch2D(int numThreadsX, int numThreadsY, int localSizeX, int localSizeY)
+	{
+		size_t gRange[3] = {1, 1, 1};
+		size_t lRange[3] = {1, 1, 1};
+		lRange[0] = localSizeX;
+		lRange[1] = localSizeY;
+		gRange[0] = b3Max((size_t)1, (numThreadsX / lRange[0]) + (!(numThreadsX % lRange[0]) ? 0 : 1));
+		gRange[0] *= lRange[0];
+		gRange[1] = b3Max((size_t)1, (numThreadsY / lRange[1]) + (!(numThreadsY % lRange[1]) ? 0 : 1));
+		gRange[1] *= lRange[1];
+
+		cl_int status = clEnqueueNDRangeKernel(m_commandQueue,
+											   m_kernel, 2, NULL, gRange, lRange, 0, 0, 0);
+		if (status != CL_SUCCESS)
+		{
+			printf("Error: OpenCL status = %d\n", status);
+		}
+		b3Assert(status == CL_SUCCESS);
+	}
+
+	void enableSerialization(bool serialize)
+	{
+		m_enableSerialization = serialize;
+	}
+};
+
+#endif  //B3_LAUNCHER_CL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h
new file mode 100644
index 0000000..e837cce
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h
@@ -0,0 +1,300 @@
+#ifndef B3_OPENCL_ARRAY_H
+#define B3_OPENCL_ARRAY_H
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+
+template <typename T>
+class b3OpenCLArray
+{
+	size_t m_size;
+	size_t m_capacity;
+	cl_mem m_clBuffer;
+
+	cl_context m_clContext;
+	cl_command_queue m_commandQueue;
+
+	bool m_ownsMemory;
+
+	bool m_allowGrowingCapacity;
+
+	void deallocate()
+	{
+		if (m_clBuffer && m_ownsMemory)
+		{
+			clReleaseMemObject(m_clBuffer);
+		}
+		m_clBuffer = 0;
+		m_capacity = 0;
+	}
+
+	b3OpenCLArray<T>& operator=(const b3OpenCLArray<T>& src);
+
+	B3_FORCE_INLINE size_t allocSize(size_t size)
+	{
+		return (size ? size * 2 : 1);
+	}
+
+public:
+	b3OpenCLArray(cl_context ctx, cl_command_queue queue, size_t initialCapacity = 0, bool allowGrowingCapacity = true)
+		: m_size(0), m_capacity(0), m_clBuffer(0), m_clContext(ctx), m_commandQueue(queue), m_ownsMemory(true), m_allowGrowingCapacity(true)
+	{
+		if (initialCapacity)
+		{
+			reserve(initialCapacity);
+		}
+		m_allowGrowingCapacity = allowGrowingCapacity;
+	}
+
+	///this is an error-prone method with no error checking, be careful!
+	void setFromOpenCLBuffer(cl_mem buffer, size_t sizeInElements)
+	{
+		deallocate();
+		m_ownsMemory = false;
+		m_allowGrowingCapacity = false;
+		m_clBuffer = buffer;
+		m_size = sizeInElements;
+		m_capacity = sizeInElements;
+	}
+
+	// we could enable this assignment, but need to make sure to avoid accidental deep copies
+	//	b3OpenCLArray<T>& operator=(const b3AlignedObjectArray<T>& src)
+	//	{
+	//		copyFromArray(src);
+	//		return *this;
+	//	}
+
+	cl_mem getBufferCL() const
+	{
+		return m_clBuffer;
+	}
+
+	virtual ~b3OpenCLArray()
+	{
+		deallocate();
+		m_size = 0;
+		m_capacity = 0;
+	}
+
+	B3_FORCE_INLINE bool push_back(const T& _Val, bool waitForCompletion = true)
+	{
+		bool result = true;
+		size_t sz = size();
+		if (sz == capacity())
+		{
+			result = reserve(allocSize(size()));
+		}
+		copyFromHostPointer(&_Val, 1, sz, waitForCompletion);
+		m_size++;
+		return result;
+	}
+
+	B3_FORCE_INLINE T forcedAt(size_t n) const
+	{
+		b3Assert(n >= 0);
+		b3Assert(n < capacity());
+		T elem;
+		copyToHostPointer(&elem, 1, n, true);
+		return elem;
+	}
+
+	B3_FORCE_INLINE T at(size_t n) const
+	{
+		b3Assert(n >= 0);
+		b3Assert(n < size());
+		T elem;
+		copyToHostPointer(&elem, 1, n, true);
+		return elem;
+	}
+
+	B3_FORCE_INLINE bool resize(size_t newsize, bool copyOldContents = true)
+	{
+		bool result = true;
+		size_t curSize = size();
+
+		if (newsize < curSize)
+		{
+			//leave the OpenCL memory for now
+		}
+		else
+		{
+			if (newsize > size())
+			{
+				result = reserve(newsize, copyOldContents);
+			}
+
+			//leave new data uninitialized (init in debug mode?)
+			//for (size_t i=curSize;i<newsize;i++) ...
+		}
+
+		if (result)
+		{
+			m_size = newsize;
+		}
+		else
+		{
+			m_size = 0;
+		}
+		return result;
+	}
+
+	B3_FORCE_INLINE size_t size() const
+	{
+		return m_size;
+	}
+
+	B3_FORCE_INLINE size_t capacity() const
+	{
+		return m_capacity;
+	}
+
+	B3_FORCE_INLINE bool reserve(size_t _Count, bool copyOldContents = true)
+	{
+		bool result = true;
+		// determine new minimum length of allocated storage
+		if (capacity() < _Count)
+		{  // not enough room, reallocate
+
+			if (m_allowGrowingCapacity)
+			{
+				cl_int ciErrNum;
+				//create a new OpenCL buffer
+				size_t memSizeInBytes = sizeof(T) * _Count;
+				cl_mem buf = clCreateBuffer(m_clContext, CL_MEM_READ_WRITE, memSizeInBytes, NULL, &ciErrNum);
+				if (ciErrNum != CL_SUCCESS)
+				{
+					b3Error("OpenCL out-of-memory\n");
+					_Count = 0;
+					result = false;
+				}
+//#define B3_ALWAYS_INITIALIZE_OPENCL_BUFFERS
+#ifdef B3_ALWAYS_INITIALIZE_OPENCL_BUFFERS
+				unsigned char* src = (unsigned char*)malloc(memSizeInBytes);
+				for (size_t i = 0; i < memSizeInBytes; i++)
+					src[i] = 0xbb;
+				ciErrNum = clEnqueueWriteBuffer(m_commandQueue, buf, CL_TRUE, 0, memSizeInBytes, src, 0, 0, 0);
+				b3Assert(ciErrNum == CL_SUCCESS);
+				clFinish(m_commandQueue);
+				free(src);
+#endif  //B3_ALWAYS_INITIALIZE_OPENCL_BUFFERS
+
+				if (result)
+				{
+					if (copyOldContents)
+						copyToCL(buf, size());
+				}
+
+				//deallocate the old buffer
+				deallocate();
+
+				m_clBuffer = buf;
+
+				m_capacity = _Count;
+			}
+			else
+			{
+				//fail: assert and
+				b3Assert(0);
+				deallocate();
+				result = false;
+			}
+		}
+		return result;
+	}
+
+	void copyToCL(cl_mem destination, size_t numElements, size_t firstElem = 0, size_t dstOffsetInElems = 0) const
+	{
+		if (numElements <= 0)
+			return;
+
+		b3Assert(m_clBuffer);
+		b3Assert(destination);
+
+		//likely some error, destination is same as source
+		b3Assert(m_clBuffer != destination);
+
+		b3Assert((firstElem + numElements) <= m_size);
+
+		cl_int status = 0;
+
+		b3Assert(numElements > 0);
+		b3Assert(numElements <= m_size);
+
+		size_t srcOffsetBytes = sizeof(T) * firstElem;
+		size_t dstOffsetInBytes = sizeof(T) * dstOffsetInElems;
+
+		status = clEnqueueCopyBuffer(m_commandQueue, m_clBuffer, destination,
+									 srcOffsetBytes, dstOffsetInBytes, sizeof(T) * numElements, 0, 0, 0);
+
+		b3Assert(status == CL_SUCCESS);
+	}
+
+	void copyFromHost(const b3AlignedObjectArray<T>& srcArray, bool waitForCompletion = true)
+	{
+		size_t newSize = srcArray.size();
+
+		bool copyOldContents = false;
+		resize(newSize, copyOldContents);
+		if (newSize)
+			copyFromHostPointer(&srcArray[0], newSize, 0, waitForCompletion);
+	}
+
+	void copyFromHostPointer(const T* src, size_t numElems, size_t destFirstElem = 0, bool waitForCompletion = true)
+	{
+		b3Assert(numElems + destFirstElem <= capacity());
+
+		if (numElems + destFirstElem)
+		{
+			cl_int status = 0;
+			size_t sizeInBytes = sizeof(T) * numElems;
+			status = clEnqueueWriteBuffer(m_commandQueue, m_clBuffer, 0, sizeof(T) * destFirstElem, sizeInBytes,
+										  src, 0, 0, 0);
+			b3Assert(status == CL_SUCCESS);
+			if (waitForCompletion)
+				clFinish(m_commandQueue);
+		}
+		else
+		{
+			b3Error("copyFromHostPointer invalid range\n");
+		}
+	}
+
+	void copyToHost(b3AlignedObjectArray<T>& destArray, bool waitForCompletion = true) const
+	{
+		destArray.resize(this->size());
+		if (size())
+			copyToHostPointer(&destArray[0], size(), 0, waitForCompletion);
+	}
+
+	void copyToHostPointer(T* destPtr, size_t numElem, size_t srcFirstElem = 0, bool waitForCompletion = true) const
+	{
+		b3Assert(numElem + srcFirstElem <= capacity());
+
+		if (numElem + srcFirstElem <= capacity())
+		{
+			cl_int status = 0;
+			status = clEnqueueReadBuffer(m_commandQueue, m_clBuffer, 0, sizeof(T) * srcFirstElem, sizeof(T) * numElem,
+										 destPtr, 0, 0, 0);
+			b3Assert(status == CL_SUCCESS);
+
+			if (waitForCompletion)
+				clFinish(m_commandQueue);
+		}
+		else
+		{
+			b3Error("copyToHostPointer invalid range\n");
+		}
+	}
+
+	void copyFromOpenCLArray(const b3OpenCLArray& src)
+	{
+		size_t newSize = src.size();
+		resize(newSize);
+		if (size())
+		{
+			src.copyToCL(m_clBuffer, size());
+		}
+	}
+};
+
+#endif  //B3_OPENCL_ARRAY_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.cpp
new file mode 100644
index 0000000..822b511
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.cpp
@@ -0,0 +1,120 @@
+#include "b3PrefixScanCL.h"
+#include "b3FillCL.h"
+#define B3_PREFIXSCAN_PROG_PATH "src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl"
+
+#include "b3LauncherCL.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "kernels/PrefixScanKernelsCL.h"
+
+b3PrefixScanCL::b3PrefixScanCL(cl_context ctx, cl_device_id device, cl_command_queue queue, int size)
+	: m_commandQueue(queue)
+{
+	const char* scanKernelSource = prefixScanKernelsCL;
+	cl_int pErrNum;
+	char* additionalMacros = 0;
+
+	m_workBuffer = new b3OpenCLArray<unsigned int>(ctx, queue, size);
+	cl_program scanProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, scanKernelSource, &pErrNum, additionalMacros, B3_PREFIXSCAN_PROG_PATH);
+	b3Assert(scanProg);
+
+	m_localScanKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, scanKernelSource, "LocalScanKernel", &pErrNum, scanProg, additionalMacros);
+	b3Assert(m_localScanKernel);
+	m_blockSumKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, scanKernelSource, "TopLevelScanKernel", &pErrNum, scanProg, additionalMacros);
+	b3Assert(m_blockSumKernel);
+	m_propagationKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, scanKernelSource, "AddOffsetKernel", &pErrNum, scanProg, additionalMacros);
+	b3Assert(m_propagationKernel);
+}
+
+b3PrefixScanCL::~b3PrefixScanCL()
+{
+	delete m_workBuffer;
+	clReleaseKernel(m_localScanKernel);
+	clReleaseKernel(m_blockSumKernel);
+	clReleaseKernel(m_propagationKernel);
+}
+
+template <class T>
+T b3NextPowerOf2(T n)
+{
+	n -= 1;
+	for (int i = 0; i < sizeof(T) * 8; i++)
+		n = n | (n >> i);
+	return n + 1;
+}
+
+void b3PrefixScanCL::execute(b3OpenCLArray<unsigned int>& src, b3OpenCLArray<unsigned int>& dst, int n, unsigned int* sum)
+{
+	//	b3Assert( data->m_option == EXCLUSIVE );
+	const unsigned int numBlocks = (const unsigned int)((n + BLOCK_SIZE * 2 - 1) / (BLOCK_SIZE * 2));
+
+	dst.resize(src.size());
+	m_workBuffer->resize(src.size());
+
+	b3Int4 constBuffer;
+	constBuffer.x = n;
+	constBuffer.y = numBlocks;
+	constBuffer.z = (int)b3NextPowerOf2(numBlocks);
+
+	b3OpenCLArray<unsigned int>* srcNative = &src;
+	b3OpenCLArray<unsigned int>* dstNative = &dst;
+
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(dstNative->getBufferCL()), b3BufferInfoCL(srcNative->getBufferCL()), b3BufferInfoCL(m_workBuffer->getBufferCL())};
+
+		b3LauncherCL launcher(m_commandQueue, m_localScanKernel, "m_localScanKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(constBuffer);
+		launcher.launch1D(numBlocks * BLOCK_SIZE, BLOCK_SIZE);
+	}
+
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(m_workBuffer->getBufferCL())};
+
+		b3LauncherCL launcher(m_commandQueue, m_blockSumKernel, "m_blockSumKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(constBuffer);
+		launcher.launch1D(BLOCK_SIZE, BLOCK_SIZE);
+	}
+
+	if (numBlocks > 1)
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(dstNative->getBufferCL()), b3BufferInfoCL(m_workBuffer->getBufferCL())};
+		b3LauncherCL launcher(m_commandQueue, m_propagationKernel, "m_propagationKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(constBuffer);
+		launcher.launch1D((numBlocks - 1) * BLOCK_SIZE, BLOCK_SIZE);
+	}
+
+	if (sum)
+	{
+		clFinish(m_commandQueue);
+		dstNative->copyToHostPointer(sum, 1, n - 1, true);
+	}
+}
+
+void b3PrefixScanCL::executeHost(b3AlignedObjectArray<unsigned int>& src, b3AlignedObjectArray<unsigned int>& dst, int n, unsigned int* sum)
+{
+	unsigned int s = 0;
+	//if( data->m_option == EXCLUSIVE )
+	{
+		for (int i = 0; i < n; i++)
+		{
+			dst[i] = s;
+			s += src[i];
+		}
+	}
+	/*else
+	{
+		for(int i=0; i<n; i++)
+		{
+			s += hSrc[i];
+			hDst[i] = s;
+		}
+	}
+	*/
+
+	if (sum)
+	{
+		*sum = dst[n - 1];
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h
new file mode 100644
index 0000000..346efa0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h
@@ -0,0 +1,35 @@
+
+#ifndef B3_PREFIX_SCAN_CL_H
+#define B3_PREFIX_SCAN_CL_H
+
+#include "b3OpenCLArray.h"
+#include "b3BufferInfoCL.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+class b3PrefixScanCL
+{
+	enum
+	{
+		BLOCK_SIZE = 128
+	};
+
+	//	Option m_option;
+
+	cl_command_queue m_commandQueue;
+
+	cl_kernel m_localScanKernel;
+	cl_kernel m_blockSumKernel;
+	cl_kernel m_propagationKernel;
+
+	b3OpenCLArray<unsigned int>* m_workBuffer;
+
+public:
+	b3PrefixScanCL(cl_context ctx, cl_device_id device, cl_command_queue queue, int size = 0);
+
+	virtual ~b3PrefixScanCL();
+
+	void execute(b3OpenCLArray<unsigned int>& src, b3OpenCLArray<unsigned int>& dst, int n, unsigned int* sum = 0);
+	void executeHost(b3AlignedObjectArray<unsigned int>& src, b3AlignedObjectArray<unsigned int>& dst, int n, unsigned int* sum = 0);
+};
+
+#endif  //B3_PREFIX_SCAN_CL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.cpp
new file mode 100644
index 0000000..1cac97c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.cpp
@@ -0,0 +1,120 @@
+#include "b3PrefixScanFloat4CL.h"
+#include "b3FillCL.h"
+#define B3_PREFIXSCAN_FLOAT4_PROG_PATH "src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl"
+
+#include "b3LauncherCL.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "kernels/PrefixScanKernelsFloat4CL.h"
+
+b3PrefixScanFloat4CL::b3PrefixScanFloat4CL(cl_context ctx, cl_device_id device, cl_command_queue queue, int size)
+	: m_commandQueue(queue)
+{
+	const char* scanKernelSource = prefixScanKernelsFloat4CL;
+	cl_int pErrNum;
+	char* additionalMacros = 0;
+
+	m_workBuffer = new b3OpenCLArray<b3Vector3>(ctx, queue, size);
+	cl_program scanProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, scanKernelSource, &pErrNum, additionalMacros, B3_PREFIXSCAN_FLOAT4_PROG_PATH);
+	b3Assert(scanProg);
+
+	m_localScanKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, scanKernelSource, "LocalScanKernel", &pErrNum, scanProg, additionalMacros);
+	b3Assert(m_localScanKernel);
+	m_blockSumKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, scanKernelSource, "TopLevelScanKernel", &pErrNum, scanProg, additionalMacros);
+	b3Assert(m_blockSumKernel);
+	m_propagationKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, scanKernelSource, "AddOffsetKernel", &pErrNum, scanProg, additionalMacros);
+	b3Assert(m_propagationKernel);
+}
+
+b3PrefixScanFloat4CL::~b3PrefixScanFloat4CL()
+{
+	delete m_workBuffer;
+	clReleaseKernel(m_localScanKernel);
+	clReleaseKernel(m_blockSumKernel);
+	clReleaseKernel(m_propagationKernel);
+}
+
+template <class T>
+T b3NextPowerOf2(T n)
+{
+	n -= 1;
+	for (int i = 0; i < sizeof(T) * 8; i++)
+		n = n | (n >> i);
+	return n + 1;
+}
+
+void b3PrefixScanFloat4CL::execute(b3OpenCLArray<b3Vector3>& src, b3OpenCLArray<b3Vector3>& dst, int n, b3Vector3* sum)
+{
+	//	b3Assert( data->m_option == EXCLUSIVE );
+	const unsigned int numBlocks = (const unsigned int)((n + BLOCK_SIZE * 2 - 1) / (BLOCK_SIZE * 2));
+
+	dst.resize(src.size());
+	m_workBuffer->resize(src.size());
+
+	b3Int4 constBuffer;
+	constBuffer.x = n;
+	constBuffer.y = numBlocks;
+	constBuffer.z = (int)b3NextPowerOf2(numBlocks);
+
+	b3OpenCLArray<b3Vector3>* srcNative = &src;
+	b3OpenCLArray<b3Vector3>* dstNative = &dst;
+
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(dstNative->getBufferCL()), b3BufferInfoCL(srcNative->getBufferCL()), b3BufferInfoCL(m_workBuffer->getBufferCL())};
+
+		b3LauncherCL launcher(m_commandQueue, m_localScanKernel, "m_localScanKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(constBuffer);
+		launcher.launch1D(numBlocks * BLOCK_SIZE, BLOCK_SIZE);
+	}
+
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(m_workBuffer->getBufferCL())};
+
+		b3LauncherCL launcher(m_commandQueue, m_blockSumKernel, "m_blockSumKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(constBuffer);
+		launcher.launch1D(BLOCK_SIZE, BLOCK_SIZE);
+	}
+
+	if (numBlocks > 1)
+	{
+		b3BufferInfoCL bInfo[] = {b3BufferInfoCL(dstNative->getBufferCL()), b3BufferInfoCL(m_workBuffer->getBufferCL())};
+		b3LauncherCL launcher(m_commandQueue, m_propagationKernel, "m_propagationKernel");
+		launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+		launcher.setConst(constBuffer);
+		launcher.launch1D((numBlocks - 1) * BLOCK_SIZE, BLOCK_SIZE);
+	}
+
+	if (sum)
+	{
+		clFinish(m_commandQueue);
+		dstNative->copyToHostPointer(sum, 1, n - 1, true);
+	}
+}
+
+void b3PrefixScanFloat4CL::executeHost(b3AlignedObjectArray<b3Vector3>& src, b3AlignedObjectArray<b3Vector3>& dst, int n, b3Vector3* sum)
+{
+	b3Vector3 s = b3MakeVector3(0, 0, 0);
+	//if( data->m_option == EXCLUSIVE )
+	{
+		for (int i = 0; i < n; i++)
+		{
+			dst[i] = s;
+			s += src[i];
+		}
+	}
+	/*else
+	{
+		for(int i=0; i<n; i++)
+		{
+			s += hSrc[i];
+			hDst[i] = s;
+		}
+	}
+	*/
+
+	if (sum)
+	{
+		*sum = dst[n - 1];
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.h
new file mode 100644
index 0000000..122b0bf
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.h
@@ -0,0 +1,36 @@
+
+#ifndef B3_PREFIX_SCAN_CL_H
+#define B3_PREFIX_SCAN_CL_H
+
+#include "b3OpenCLArray.h"
+#include "b3BufferInfoCL.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Vector3.h"
+
+class b3PrefixScanFloat4CL
+{
+	enum
+	{
+		BLOCK_SIZE = 128
+	};
+
+	//	Option m_option;
+
+	cl_command_queue m_commandQueue;
+
+	cl_kernel m_localScanKernel;
+	cl_kernel m_blockSumKernel;
+	cl_kernel m_propagationKernel;
+
+	b3OpenCLArray<b3Vector3>* m_workBuffer;
+
+public:
+	b3PrefixScanFloat4CL(cl_context ctx, cl_device_id device, cl_command_queue queue, int size = 0);
+
+	virtual ~b3PrefixScanFloat4CL();
+
+	void execute(b3OpenCLArray<b3Vector3>& src, b3OpenCLArray<b3Vector3>& dst, int n, b3Vector3* sum = 0);
+	void executeHost(b3AlignedObjectArray<b3Vector3>& src, b3AlignedObjectArray<b3Vector3>& dst, int n, b3Vector3* sum);
+};
+
+#endif  //B3_PREFIX_SCAN_CL_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.cpp
new file mode 100644
index 0000000..e86af65
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.cpp
@@ -0,0 +1,646 @@
+
+#include "b3RadixSort32CL.h"
+#include "b3LauncherCL.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "b3PrefixScanCL.h"
+#include "b3FillCL.h"
+
+#define RADIXSORT32_PATH "src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl"
+
+#include "kernels/RadixSort32KernelsCL.h"
+
+b3RadixSort32CL::b3RadixSort32CL(cl_context ctx, cl_device_id device, cl_command_queue queue, int initialCapacity)
+	: m_commandQueue(queue)
+{
+	b3OpenCLDeviceInfo info;
+	b3OpenCLUtils::getDeviceInfo(device, &info);
+	m_deviceCPU = (info.m_deviceType & CL_DEVICE_TYPE_CPU) != 0;
+
+	m_workBuffer1 = new b3OpenCLArray<unsigned int>(ctx, queue);
+	m_workBuffer2 = new b3OpenCLArray<unsigned int>(ctx, queue);
+	m_workBuffer3 = new b3OpenCLArray<b3SortData>(ctx, queue);
+	m_workBuffer3a = new b3OpenCLArray<unsigned int>(ctx, queue);
+	m_workBuffer4 = new b3OpenCLArray<b3SortData>(ctx, queue);
+	m_workBuffer4a = new b3OpenCLArray<unsigned int>(ctx, queue);
+
+	if (initialCapacity > 0)
+	{
+		m_workBuffer1->resize(initialCapacity);
+		m_workBuffer3->resize(initialCapacity);
+		m_workBuffer3a->resize(initialCapacity);
+		m_workBuffer4->resize(initialCapacity);
+		m_workBuffer4a->resize(initialCapacity);
+	}
+
+	m_scan = new b3PrefixScanCL(ctx, device, queue);
+	m_fill = new b3FillCL(ctx, device, queue);
+
+	const char* additionalMacros = "";
+
+	cl_int pErrNum;
+	const char* kernelSource = radixSort32KernelsCL;
+
+	cl_program sortProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, kernelSource, &pErrNum, additionalMacros, RADIXSORT32_PATH);
+	b3Assert(sortProg);
+
+	m_streamCountSortDataKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "StreamCountSortDataKernel", &pErrNum, sortProg, additionalMacros);
+	b3Assert(m_streamCountSortDataKernel);
+
+	m_streamCountKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "StreamCountKernel", &pErrNum, sortProg, additionalMacros);
+	b3Assert(m_streamCountKernel);
+
+	if (m_deviceCPU)
+	{
+		m_sortAndScatterSortDataKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "SortAndScatterSortDataKernelSerial", &pErrNum, sortProg, additionalMacros);
+		b3Assert(m_sortAndScatterSortDataKernel);
+		m_sortAndScatterKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "SortAndScatterKernelSerial", &pErrNum, sortProg, additionalMacros);
+		b3Assert(m_sortAndScatterKernel);
+	}
+	else
+	{
+		m_sortAndScatterSortDataKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "SortAndScatterSortDataKernel", &pErrNum, sortProg, additionalMacros);
+		b3Assert(m_sortAndScatterSortDataKernel);
+		m_sortAndScatterKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "SortAndScatterKernel", &pErrNum, sortProg, additionalMacros);
+		b3Assert(m_sortAndScatterKernel);
+	}
+
+	m_prefixScanKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, kernelSource, "PrefixScanKernel", &pErrNum, sortProg, additionalMacros);
+	b3Assert(m_prefixScanKernel);
+}
+
+b3RadixSort32CL::~b3RadixSort32CL()
+{
+	delete m_scan;
+	delete m_fill;
+	delete m_workBuffer1;
+	delete m_workBuffer2;
+	delete m_workBuffer3;
+	delete m_workBuffer3a;
+	delete m_workBuffer4;
+	delete m_workBuffer4a;
+
+	clReleaseKernel(m_streamCountSortDataKernel);
+	clReleaseKernel(m_streamCountKernel);
+	clReleaseKernel(m_sortAndScatterSortDataKernel);
+	clReleaseKernel(m_sortAndScatterKernel);
+	clReleaseKernel(m_prefixScanKernel);
+}
+
+void b3RadixSort32CL::executeHost(b3AlignedObjectArray<b3SortData>& inout, int sortBits /* = 32 */)
+{
+	int n = inout.size();
+	const int BITS_PER_PASS = 8;
+	const int NUM_TABLES = (1 << BITS_PER_PASS);
+
+	int tables[NUM_TABLES];
+	int counter[NUM_TABLES];
+
+	b3SortData* src = &inout[0];
+	b3AlignedObjectArray<b3SortData> workbuffer;
+	workbuffer.resize(inout.size());
+	b3SortData* dst = &workbuffer[0];
+
+	int count = 0;
+	for (int startBit = 0; startBit < sortBits; startBit += BITS_PER_PASS)
+	{
+		for (int i = 0; i < NUM_TABLES; i++)
+		{
+			tables[i] = 0;
+		}
+
+		for (int i = 0; i < n; i++)
+		{
+			int tableIdx = (src[i].m_key >> startBit) & (NUM_TABLES - 1);
+			tables[tableIdx]++;
+		}
+//#define TEST
+#ifdef TEST
+		printf("histogram size=%d\n", NUM_TABLES);
+		for (int i = 0; i < NUM_TABLES; i++)
+		{
+			if (tables[i] != 0)
+			{
+				printf("tables[%d]=%d]\n", i, tables[i]);
+			}
+		}
+#endif  //TEST \
+	//	prefix scan
+		int sum = 0;
+		for (int i = 0; i < NUM_TABLES; i++)
+		{
+			int iData = tables[i];
+			tables[i] = sum;
+			sum += iData;
+			counter[i] = 0;
+		}
+
+		//	distribute
+		for (int i = 0; i < n; i++)
+		{
+			int tableIdx = (src[i].m_key >> startBit) & (NUM_TABLES - 1);
+
+			dst[tables[tableIdx] + counter[tableIdx]] = src[i];
+			counter[tableIdx]++;
+		}
+
+		b3Swap(src, dst);
+		count++;
+	}
+
+	if (count & 1)
+	{
+		b3Assert(0);  //need to copy
+	}
+}
+
+void b3RadixSort32CL::executeHost(b3OpenCLArray<b3SortData>& keyValuesInOut, int sortBits /* = 32 */)
+{
+	b3AlignedObjectArray<b3SortData> inout;
+	keyValuesInOut.copyToHost(inout);
+
+	executeHost(inout, sortBits);
+
+	keyValuesInOut.copyFromHost(inout);
+}
+
+void b3RadixSort32CL::execute(b3OpenCLArray<unsigned int>& keysIn, b3OpenCLArray<unsigned int>& keysOut, b3OpenCLArray<unsigned int>& valuesIn,
+							  b3OpenCLArray<unsigned int>& valuesOut, int n, int sortBits)
+{
+}
+
+//#define DEBUG_RADIXSORT
+//#define DEBUG_RADIXSORT2
+
+void b3RadixSort32CL::execute(b3OpenCLArray<b3SortData>& keyValuesInOut, int sortBits /* = 32 */)
+{
+	int originalSize = keyValuesInOut.size();
+	int workingSize = originalSize;
+
+	int dataAlignment = DATA_ALIGNMENT;
+
+#ifdef DEBUG_RADIXSORT2
+	b3AlignedObjectArray<b3SortData> test2;
+	keyValuesInOut.copyToHost(test2);
+	printf("numElem = %d\n", test2.size());
+	for (int i = 0; i < test2.size(); i++)
+	{
+		printf("test2[%d].m_key=%d\n", i, test2[i].m_key);
+		printf("test2[%d].m_value=%d\n", i, test2[i].m_value);
+	}
+#endif  //DEBUG_RADIXSORT2
+
+	b3OpenCLArray<b3SortData>* src = 0;
+
+	if (workingSize % dataAlignment)
+	{
+		workingSize += dataAlignment - (workingSize % dataAlignment);
+		m_workBuffer4->copyFromOpenCLArray(keyValuesInOut);
+		m_workBuffer4->resize(workingSize);
+		b3SortData fillValue;
+		fillValue.m_key = 0xffffffff;
+		fillValue.m_value = 0xffffffff;
+
+#define USE_BTFILL
+#ifdef USE_BTFILL
+		m_fill->execute((b3OpenCLArray<b3Int2>&)*m_workBuffer4, (b3Int2&)fillValue, workingSize - originalSize, originalSize);
+#else
+		//fill the remaining bits (very slow way, todo: fill on GPU/OpenCL side)
+
+		for (int i = originalSize; i < workingSize; i++)
+		{
+			m_workBuffer4->copyFromHostPointer(&fillValue, 1, i);
+		}
+#endif  //USE_BTFILL
+
+		src = m_workBuffer4;
+	}
+	else
+	{
+		src = &keyValuesInOut;
+		m_workBuffer4->resize(0);
+	}
+
+	b3Assert(workingSize % DATA_ALIGNMENT == 0);
+	int minCap = NUM_BUCKET * NUM_WGS;
+
+	int n = workingSize;
+
+	m_workBuffer1->resize(minCap);
+	m_workBuffer3->resize(workingSize);
+
+	//	ADLASSERT( ELEMENTS_PER_WORK_ITEM == 4 );
+	b3Assert(BITS_PER_PASS == 4);
+	b3Assert(WG_SIZE == 64);
+	b3Assert((sortBits & 0x3) == 0);
+
+	b3OpenCLArray<b3SortData>* dst = m_workBuffer3;
+
+	b3OpenCLArray<unsigned int>* srcHisto = m_workBuffer1;
+	b3OpenCLArray<unsigned int>* destHisto = m_workBuffer2;
+
+	int nWGs = NUM_WGS;
+	b3ConstData cdata;
+
+	{
+		int blockSize = ELEMENTS_PER_WORK_ITEM * WG_SIZE;  //set at 256
+		int nBlocks = (n + blockSize - 1) / (blockSize);
+		cdata.m_n = n;
+		cdata.m_nWGs = NUM_WGS;
+		cdata.m_startBit = 0;
+		cdata.m_nBlocksPerWG = (nBlocks + cdata.m_nWGs - 1) / cdata.m_nWGs;
+		if (nBlocks < NUM_WGS)
+		{
+			cdata.m_nBlocksPerWG = 1;
+			nWGs = nBlocks;
+		}
+	}
+
+	int count = 0;
+	for (int ib = 0; ib < sortBits; ib += 4)
+	{
+#ifdef DEBUG_RADIXSORT2
+		keyValuesInOut.copyToHost(test2);
+		printf("numElem = %d\n", test2.size());
+		for (int i = 0; i < test2.size(); i++)
+		{
+			if (test2[i].m_key != test2[i].m_value)
+			{
+				printf("test2[%d].m_key=%d\n", i, test2[i].m_key);
+				printf("test2[%d].m_value=%d\n", i, test2[i].m_value);
+			}
+		}
+#endif  //DEBUG_RADIXSORT2
+
+		cdata.m_startBit = ib;
+
+		if (src->size())
+		{
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src->getBufferCL(), true), b3BufferInfoCL(srcHisto->getBufferCL())};
+			b3LauncherCL launcher(m_commandQueue, m_streamCountSortDataKernel, "m_streamCountSortDataKernel");
+
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(cdata);
+
+			int num = NUM_WGS * WG_SIZE;
+			launcher.launch1D(num, WG_SIZE);
+		}
+
+#ifdef DEBUG_RADIXSORT
+		b3AlignedObjectArray<unsigned int> testHist;
+		srcHisto->copyToHost(testHist);
+		printf("ib = %d, testHist size = %d, non zero elements:\n", ib, testHist.size());
+		for (int i = 0; i < testHist.size(); i++)
+		{
+			if (testHist[i] != 0)
+				printf("testHist[%d]=%d\n", i, testHist[i]);
+		}
+#endif  //DEBUG_RADIXSORT
+
+//fast prefix scan is not working properly on Mac OSX yet
+#ifdef __APPLE__
+		bool fastScan = false;
+#else
+		bool fastScan = !m_deviceCPU;  //only use fast scan on GPU
+#endif
+
+		if (fastScan)
+		{  //	prefix scan group histogram
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(srcHisto->getBufferCL())};
+			b3LauncherCL launcher(m_commandQueue, m_prefixScanKernel, "m_prefixScanKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(cdata);
+			launcher.launch1D(128, 128);
+			destHisto = srcHisto;
+		}
+		else
+		{
+			//unsigned int sum; //for debugging
+			m_scan->execute(*srcHisto, *destHisto, 1920, 0);  //,&sum);
+		}
+
+#ifdef DEBUG_RADIXSORT
+		destHisto->copyToHost(testHist);
+		printf("ib = %d, testHist size = %d, non zero elements:\n", ib, testHist.size());
+		for (int i = 0; i < testHist.size(); i++)
+		{
+			if (testHist[i] != 0)
+				printf("testHist[%d]=%d\n", i, testHist[i]);
+		}
+
+		for (int i = 0; i < testHist.size(); i += NUM_WGS)
+		{
+			printf("testHist[%d]=%d\n", i / NUM_WGS, testHist[i]);
+		}
+
+#endif  //DEBUG_RADIXSORT
+
+#define USE_GPU
+#ifdef USE_GPU
+
+		if (src->size())
+		{  //	local sort and distribute
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src->getBufferCL(), true), b3BufferInfoCL(destHisto->getBufferCL(), true), b3BufferInfoCL(dst->getBufferCL())};
+			b3LauncherCL launcher(m_commandQueue, m_sortAndScatterSortDataKernel, "m_sortAndScatterSortDataKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(cdata);
+			launcher.launch1D(nWGs * WG_SIZE, WG_SIZE);
+		}
+#else
+		{
+#define NUM_TABLES 16
+//#define SEQUENTIAL
+#ifdef SEQUENTIAL
+			int counter2[NUM_TABLES] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+			int tables[NUM_TABLES];
+			int startBit = ib;
+
+			destHisto->copyToHost(testHist);
+			b3AlignedObjectArray<b3SortData> srcHost;
+			b3AlignedObjectArray<b3SortData> dstHost;
+			dstHost.resize(src->size());
+
+			src->copyToHost(srcHost);
+
+			for (int i = 0; i < NUM_TABLES; i++)
+			{
+				tables[i] = testHist[i * NUM_WGS];
+			}
+
+			//	distribute
+			for (int i = 0; i < n; i++)
+			{
+				int tableIdx = (srcHost[i].m_key >> startBit) & (NUM_TABLES - 1);
+
+				dstHost[tables[tableIdx] + counter2[tableIdx]] = srcHost[i];
+				counter2[tableIdx]++;
+			}
+
+#else
+
+			int counter2[NUM_TABLES] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+			int tables[NUM_TABLES];
+			b3AlignedObjectArray<b3SortData> dstHostOK;
+			dstHostOK.resize(src->size());
+
+			destHisto->copyToHost(testHist);
+			b3AlignedObjectArray<b3SortData> srcHost;
+			src->copyToHost(srcHost);
+
+			int blockSize = 256;
+			int nBlocksPerWG = cdata.m_nBlocksPerWG;
+			int startBit = ib;
+
+			{
+				for (int i = 0; i < NUM_TABLES; i++)
+				{
+					tables[i] = testHist[i * NUM_WGS];
+				}
+
+				//	distribute
+				for (int i = 0; i < n; i++)
+				{
+					int tableIdx = (srcHost[i].m_key >> startBit) & (NUM_TABLES - 1);
+
+					dstHostOK[tables[tableIdx] + counter2[tableIdx]] = srcHost[i];
+					counter2[tableIdx]++;
+				}
+			}
+
+			b3AlignedObjectArray<b3SortData> dstHost;
+			dstHost.resize(src->size());
+
+			int counter[NUM_TABLES] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+			for (int wgIdx = 0; wgIdx < NUM_WGS; wgIdx++)
+			{
+				int counter[NUM_TABLES] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+				int nBlocks = (n) / blockSize - nBlocksPerWG * wgIdx;
+
+				for (int iblock = 0; iblock < b3Min(cdata.m_nBlocksPerWG, nBlocks); iblock++)
+				{
+					for (int lIdx = 0; lIdx < 64; lIdx++)
+					{
+						int addr = iblock * blockSize + blockSize * cdata.m_nBlocksPerWG * wgIdx + ELEMENTS_PER_WORK_ITEM * lIdx;
+
+						//	MY_HISTOGRAM( localKeys.x ) ++ is much expensive than atomic add as it requires read and write while atomics can just add on AMD
+						//	Using registers didn't perform well. It seems like use localKeys to address requires a lot of alu ops
+						//	AMD: AtomInc performs better while NV prefers ++
+						for (int j = 0; j < ELEMENTS_PER_WORK_ITEM; j++)
+						{
+							if (addr + j < n)
+							{
+								//  printf ("addr+j=%d\n", addr+j);
+
+								int i = addr + j;
+
+								int tableIdx = (srcHost[i].m_key >> startBit) & (NUM_TABLES - 1);
+
+								int destIndex = testHist[tableIdx * NUM_WGS + wgIdx] + counter[tableIdx];
+
+								b3SortData ok = dstHostOK[destIndex];
+
+								if (ok.m_key != srcHost[i].m_key)
+								{
+									printf("ok.m_key = %d, srcHost[i].m_key = %d\n", ok.m_key, srcHost[i].m_key);
+									printf("(ok.m_value = %d, srcHost[i].m_value = %d)\n", ok.m_value, srcHost[i].m_value);
+								}
+								if (ok.m_value != srcHost[i].m_value)
+								{
+									printf("ok.m_value = %d, srcHost[i].m_value = %d\n", ok.m_value, srcHost[i].m_value);
+									printf("(ok.m_key = %d, srcHost[i].m_key = %d)\n", ok.m_key, srcHost[i].m_key);
+								}
+
+								dstHost[destIndex] = srcHost[i];
+								counter[tableIdx]++;
+							}
+						}
+					}
+				}
+			}
+
+#endif  //SEQUENTIAL
+
+			dst->copyFromHost(dstHost);
+		}
+#endif  //USE_GPU
+
+#ifdef DEBUG_RADIXSORT
+		destHisto->copyToHost(testHist);
+		printf("ib = %d, testHist size = %d, non zero elements:\n", ib, testHist.size());
+		for (int i = 0; i < testHist.size(); i++)
+		{
+			if (testHist[i] != 0)
+				printf("testHist[%d]=%d\n", i, testHist[i]);
+		}
+#endif  //DEBUG_RADIXSORT
+		b3Swap(src, dst);
+		b3Swap(srcHisto, destHisto);
+
+#ifdef DEBUG_RADIXSORT2
+		keyValuesInOut.copyToHost(test2);
+		printf("numElem = %d\n", test2.size());
+		for (int i = 0; i < test2.size(); i++)
+		{
+			if (test2[i].m_key != test2[i].m_value)
+			{
+				printf("test2[%d].m_key=%d\n", i, test2[i].m_key);
+				printf("test2[%d].m_value=%d\n", i, test2[i].m_value);
+			}
+		}
+#endif  //DEBUG_RADIXSORT2
+
+		count++;
+	}
+
+	if (count & 1)
+	{
+		b3Assert(0);  //need to copy from workbuffer to keyValuesInOut
+	}
+
+	if (m_workBuffer4->size())
+	{
+		m_workBuffer4->resize(originalSize);
+		keyValuesInOut.copyFromOpenCLArray(*m_workBuffer4);
+	}
+
+#ifdef DEBUG_RADIXSORT
+	keyValuesInOut.copyToHost(test2);
+
+	printf("numElem = %d\n", test2.size());
+	for (int i = 0; i < test2.size(); i++)
+	{
+		printf("test2[%d].m_key=%d\n", i, test2[i].m_key);
+		printf("test2[%d].m_value=%d\n", i, test2[i].m_value);
+	}
+#endif
+}
+
+void b3RadixSort32CL::execute(b3OpenCLArray<unsigned int>& keysInOut, int sortBits /* = 32 */)
+{
+	int originalSize = keysInOut.size();
+	int workingSize = originalSize;
+
+	int dataAlignment = DATA_ALIGNMENT;
+
+	b3OpenCLArray<unsigned int>* src = 0;
+
+	if (workingSize % dataAlignment)
+	{
+		workingSize += dataAlignment - (workingSize % dataAlignment);
+		m_workBuffer4a->copyFromOpenCLArray(keysInOut);
+		m_workBuffer4a->resize(workingSize);
+		unsigned int fillValue = 0xffffffff;
+
+		m_fill->execute(*m_workBuffer4a, fillValue, workingSize - originalSize, originalSize);
+
+		src = m_workBuffer4a;
+	}
+	else
+	{
+		src = &keysInOut;
+		m_workBuffer4a->resize(0);
+	}
+
+	b3Assert(workingSize % DATA_ALIGNMENT == 0);
+	int minCap = NUM_BUCKET * NUM_WGS;
+
+	int n = workingSize;
+
+	m_workBuffer1->resize(minCap);
+	m_workBuffer3->resize(workingSize);
+	m_workBuffer3a->resize(workingSize);
+
+	//	ADLASSERT( ELEMENTS_PER_WORK_ITEM == 4 );
+	b3Assert(BITS_PER_PASS == 4);
+	b3Assert(WG_SIZE == 64);
+	b3Assert((sortBits & 0x3) == 0);
+
+	b3OpenCLArray<unsigned int>* dst = m_workBuffer3a;
+
+	b3OpenCLArray<unsigned int>* srcHisto = m_workBuffer1;
+	b3OpenCLArray<unsigned int>* destHisto = m_workBuffer2;
+
+	int nWGs = NUM_WGS;
+	b3ConstData cdata;
+
+	{
+		int blockSize = ELEMENTS_PER_WORK_ITEM * WG_SIZE;  //set at 256
+		int nBlocks = (n + blockSize - 1) / (blockSize);
+		cdata.m_n = n;
+		cdata.m_nWGs = NUM_WGS;
+		cdata.m_startBit = 0;
+		cdata.m_nBlocksPerWG = (nBlocks + cdata.m_nWGs - 1) / cdata.m_nWGs;
+		if (nBlocks < NUM_WGS)
+		{
+			cdata.m_nBlocksPerWG = 1;
+			nWGs = nBlocks;
+		}
+	}
+
+	int count = 0;
+	for (int ib = 0; ib < sortBits; ib += 4)
+	{
+		cdata.m_startBit = ib;
+
+		if (src->size())
+		{
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src->getBufferCL(), true), b3BufferInfoCL(srcHisto->getBufferCL())};
+			b3LauncherCL launcher(m_commandQueue, m_streamCountKernel, "m_streamCountKernel");
+
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(cdata);
+
+			int num = NUM_WGS * WG_SIZE;
+			launcher.launch1D(num, WG_SIZE);
+		}
+
+//fast prefix scan is not working properly on Mac OSX yet
+#ifdef __APPLE__
+		bool fastScan = false;
+#else
+		bool fastScan = !m_deviceCPU;
+#endif
+
+		if (fastScan)
+		{  //	prefix scan group histogram
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(srcHisto->getBufferCL())};
+			b3LauncherCL launcher(m_commandQueue, m_prefixScanKernel, "m_prefixScanKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(cdata);
+			launcher.launch1D(128, 128);
+			destHisto = srcHisto;
+		}
+		else
+		{
+			//unsigned int sum; //for debugging
+			m_scan->execute(*srcHisto, *destHisto, 1920, 0);  //,&sum);
+		}
+
+		if (src->size())
+		{  //	local sort and distribute
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(src->getBufferCL(), true), b3BufferInfoCL(destHisto->getBufferCL(), true), b3BufferInfoCL(dst->getBufferCL())};
+			b3LauncherCL launcher(m_commandQueue, m_sortAndScatterKernel, "m_sortAndScatterKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(cdata);
+			launcher.launch1D(nWGs * WG_SIZE, WG_SIZE);
+		}
+
+		b3Swap(src, dst);
+		b3Swap(srcHisto, destHisto);
+
+		count++;
+	}
+
+	if (count & 1)
+	{
+		b3Assert(0);  //need to copy from workbuffer to keyValuesInOut
+	}
+
+	if (m_workBuffer4a->size())
+	{
+		m_workBuffer4a->resize(originalSize);
+		keysInOut.copyFromOpenCLArray(*m_workBuffer4a);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h
new file mode 100644
index 0000000..69caf18
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h
@@ -0,0 +1,84 @@
+
+#ifndef B3_RADIXSORT32_H
+#define B3_RADIXSORT32_H
+
+#include "b3OpenCLArray.h"
+
+struct b3SortData
+{
+	union {
+		unsigned int m_key;
+		unsigned int x;
+	};
+
+	union {
+		unsigned int m_value;
+		unsigned int y;
+	};
+};
+#include "b3BufferInfoCL.h"
+
+class b3RadixSort32CL
+{
+	b3OpenCLArray<unsigned int>* m_workBuffer1;
+	b3OpenCLArray<unsigned int>* m_workBuffer2;
+
+	b3OpenCLArray<b3SortData>* m_workBuffer3;
+	b3OpenCLArray<b3SortData>* m_workBuffer4;
+
+	b3OpenCLArray<unsigned int>* m_workBuffer3a;
+	b3OpenCLArray<unsigned int>* m_workBuffer4a;
+
+	cl_command_queue m_commandQueue;
+
+	cl_kernel m_streamCountSortDataKernel;
+	cl_kernel m_streamCountKernel;
+
+	cl_kernel m_prefixScanKernel;
+	cl_kernel m_sortAndScatterSortDataKernel;
+	cl_kernel m_sortAndScatterKernel;
+
+	bool m_deviceCPU;
+
+	class b3PrefixScanCL* m_scan;
+	class b3FillCL* m_fill;
+
+public:
+	struct b3ConstData
+	{
+		int m_n;
+		int m_nWGs;
+		int m_startBit;
+		int m_nBlocksPerWG;
+	};
+	enum
+	{
+		DATA_ALIGNMENT = 256,
+		WG_SIZE = 64,
+		BLOCK_SIZE = 256,
+		ELEMENTS_PER_WORK_ITEM = (BLOCK_SIZE / WG_SIZE),
+		BITS_PER_PASS = 4,
+		NUM_BUCKET = (1 << BITS_PER_PASS),
+		//	if you change this, change nPerWI in kernel as well
+		NUM_WGS = 20 * 6,  //	cypress
+						   //			NUM_WGS = 24*6,	//	cayman
+						   //			NUM_WGS = 32*4,	//	nv
+	};
+
+private:
+public:
+	b3RadixSort32CL(cl_context ctx, cl_device_id device, cl_command_queue queue, int initialCapacity = 0);
+
+	virtual ~b3RadixSort32CL();
+
+	void execute(b3OpenCLArray<unsigned int>& keysIn, b3OpenCLArray<unsigned int>& keysOut, b3OpenCLArray<unsigned int>& valuesIn,
+				 b3OpenCLArray<unsigned int>& valuesOut, int n, int sortBits = 32);
+
+	///keys only
+	void execute(b3OpenCLArray<unsigned int>& keysInOut, int sortBits = 32);
+
+	void execute(b3OpenCLArray<b3SortData>& keyValuesInOut, int sortBits = 32);
+	void executeHost(b3OpenCLArray<b3SortData>& keyValuesInOut, int sortBits = 32);
+	void executeHost(b3AlignedObjectArray<b3SortData>& keyValuesInOut, int sortBits = 32);
+};
+#endif  //B3_RADIXSORT32_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl
new file mode 100644
index 0000000..f3b4a1e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl
@@ -0,0 +1,106 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+
+typedef unsigned int u32;
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+
+typedef struct
+{
+	u32 m_key; 
+	u32 m_value;
+}SortData;
+
+
+
+typedef struct
+{
+	u32 m_nSrc;
+	u32 m_nDst;
+	u32 m_padding[2];
+} ConstBuffer;
+
+
+
+__attribute__((reqd_work_group_size(64,1,1)))
+__kernel
+void SearchSortDataLowerKernel(__global SortData* src, __global u32 *dst, 
+					unsigned int nSrc, unsigned int nDst)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < nSrc )
+	{
+		SortData first; first.m_key = (u32)(-1); first.m_value = (u32)(-1);
+		SortData end; end.m_key = nDst; end.m_value = nDst;
+
+		SortData iData = (gIdx==0)? first: src[gIdx-1];
+		SortData jData = (gIdx==nSrc)? end: src[gIdx];
+
+		if( iData.m_key != jData.m_key )
+		{
+//			for(u32 k=iData.m_key+1; k<=min(jData.m_key, nDst-1); k++)
+			u32 k = jData.m_key;
+			{
+				dst[k] = gIdx;
+			}
+		}
+	}
+}
+
+
+__attribute__((reqd_work_group_size(64,1,1)))
+__kernel
+void SearchSortDataUpperKernel(__global SortData* src, __global u32 *dst, 
+					unsigned int nSrc, unsigned int nDst)
+{
+	int gIdx = GET_GLOBAL_IDX+1;
+
+	if( gIdx < nSrc+1 )
+	{
+		SortData first; first.m_key = 0; first.m_value = 0;
+		SortData end; end.m_key = nDst; end.m_value = nDst;
+
+		SortData iData = src[gIdx-1];
+		SortData jData = (gIdx==nSrc)? end: src[gIdx];
+
+		if( iData.m_key != jData.m_key )
+		{
+			u32 k = iData.m_key;
+			{
+				dst[k] = gIdx;
+			}
+		}
+	}
+}
+
+__attribute__((reqd_work_group_size(64,1,1)))
+__kernel
+void SubtractKernel(__global u32* A, __global u32 *B, __global u32 *C, 
+					unsigned int nSrc, unsigned int nDst)
+{
+	int gIdx = GET_GLOBAL_IDX;
+	
+
+	if( gIdx < nDst )
+	{
+		C[gIdx] = A[gIdx] - B[gIdx];
+	}
+}
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h
new file mode 100644
index 0000000..1758dd4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h
@@ -0,0 +1,86 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* boundSearchKernelsCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"typedef unsigned int u32;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"typedef struct\n"
+	"{\n"
+	"	u32 m_key; \n"
+	"	u32 m_value;\n"
+	"}SortData;\n"
+	"typedef struct\n"
+	"{\n"
+	"	u32 m_nSrc;\n"
+	"	u32 m_nDst;\n"
+	"	u32 m_padding[2];\n"
+	"} ConstBuffer;\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"__kernel\n"
+	"void SearchSortDataLowerKernel(__global SortData* src, __global u32 *dst, \n"
+	"					unsigned int nSrc, unsigned int nDst)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < nSrc )\n"
+	"	{\n"
+	"		SortData first; first.m_key = (u32)(-1); first.m_value = (u32)(-1);\n"
+	"		SortData end; end.m_key = nDst; end.m_value = nDst;\n"
+	"		SortData iData = (gIdx==0)? first: src[gIdx-1];\n"
+	"		SortData jData = (gIdx==nSrc)? end: src[gIdx];\n"
+	"		if( iData.m_key != jData.m_key )\n"
+	"		{\n"
+	"//			for(u32 k=iData.m_key+1; k<=min(jData.m_key, nDst-1); k++)\n"
+	"			u32 k = jData.m_key;\n"
+	"			{\n"
+	"				dst[k] = gIdx;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"__kernel\n"
+	"void SearchSortDataUpperKernel(__global SortData* src, __global u32 *dst, \n"
+	"					unsigned int nSrc, unsigned int nDst)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX+1;\n"
+	"	if( gIdx < nSrc+1 )\n"
+	"	{\n"
+	"		SortData first; first.m_key = 0; first.m_value = 0;\n"
+	"		SortData end; end.m_key = nDst; end.m_value = nDst;\n"
+	"		SortData iData = src[gIdx-1];\n"
+	"		SortData jData = (gIdx==nSrc)? end: src[gIdx];\n"
+	"		if( iData.m_key != jData.m_key )\n"
+	"		{\n"
+	"			u32 k = iData.m_key;\n"
+	"			{\n"
+	"				dst[k] = gIdx;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"__kernel\n"
+	"void SubtractKernel(__global u32* A, __global u32 *B, __global u32 *C, \n"
+	"					unsigned int nSrc, unsigned int nDst)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	\n"
+	"	if( gIdx < nDst )\n"
+	"	{\n"
+	"		C[gIdx] = A[gIdx] - B[gIdx];\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernels.cl
new file mode 100644
index 0000000..2eee575
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernels.cl
@@ -0,0 +1,128 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+
+typedef unsigned int u32;
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+
+#define make_uint4 (uint4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+typedef struct
+{
+	int m_n;
+	int m_padding[3];
+} ConstBuffer;
+
+
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void Copy1F4Kernel(__global float4* dst, __global float4* src, 
+					ConstBuffer cb)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < cb.m_n )
+	{
+		float4 a0 = src[gIdx];
+
+		dst[ gIdx ] = a0;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void Copy2F4Kernel(__global float4* dst, __global float4* src, 
+					ConstBuffer cb)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( 2*gIdx <= cb.m_n )
+	{
+		float4 a0 = src[gIdx*2+0];
+		float4 a1 = src[gIdx*2+1];
+
+		dst[ gIdx*2+0 ] = a0;
+		dst[ gIdx*2+1 ] = a1;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void Copy4F4Kernel(__global float4* dst, __global float4* src, 
+					ConstBuffer cb)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( 4*gIdx <= cb.m_n )
+	{
+		int idx0 = gIdx*4+0;
+		int idx1 = gIdx*4+1;
+		int idx2 = gIdx*4+2;
+		int idx3 = gIdx*4+3;
+
+		float4 a0 = src[idx0];
+		float4 a1 = src[idx1];
+		float4 a2 = src[idx2];
+		float4 a3 = src[idx3];
+
+		dst[ idx0 ] = a0;
+		dst[ idx1 ] = a1;
+		dst[ idx2 ] = a2;
+		dst[ idx3 ] = a3;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void CopyF1Kernel(__global float* dstF1, __global float* srcF1, 
+					ConstBuffer cb)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < cb.m_n )
+	{
+		float a0 = srcF1[gIdx];
+
+		dstF1[ gIdx ] = a0;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void CopyF2Kernel(__global float2* dstF2, __global float2* srcF2, 
+					ConstBuffer cb)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < cb.m_n )
+	{
+		float2 a0 = srcF2[gIdx];
+
+		dstF2[ gIdx ] = a0;
+	}
+}
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernelsCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernelsCL.h
new file mode 100644
index 0000000..33c9279
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernelsCL.h
@@ -0,0 +1,131 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* copyKernelsCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"\n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"\n"
+	"typedef unsigned int u32;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_n;\n"
+	"	int m_padding[3];\n"
+	"} ConstBuffer;\n"
+	"\n"
+	"\n"
+	"\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void Copy1F4Kernel(__global float4* dst, __global float4* src, \n"
+	"					ConstBuffer cb)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"\n"
+	"	if( gIdx < cb.m_n )\n"
+	"	{\n"
+	"		float4 a0 = src[gIdx];\n"
+	"\n"
+	"		dst[ gIdx ] = a0;\n"
+	"	}\n"
+	"}\n"
+	"\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void Copy2F4Kernel(__global float4* dst, __global float4* src, \n"
+	"					ConstBuffer cb)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"\n"
+	"	if( 2*gIdx <= cb.m_n )\n"
+	"	{\n"
+	"		float4 a0 = src[gIdx*2+0];\n"
+	"		float4 a1 = src[gIdx*2+1];\n"
+	"\n"
+	"		dst[ gIdx*2+0 ] = a0;\n"
+	"		dst[ gIdx*2+1 ] = a1;\n"
+	"	}\n"
+	"}\n"
+	"\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void Copy4F4Kernel(__global float4* dst, __global float4* src, \n"
+	"					ConstBuffer cb)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"\n"
+	"	if( 4*gIdx <= cb.m_n )\n"
+	"	{\n"
+	"		int idx0 = gIdx*4+0;\n"
+	"		int idx1 = gIdx*4+1;\n"
+	"		int idx2 = gIdx*4+2;\n"
+	"		int idx3 = gIdx*4+3;\n"
+	"\n"
+	"		float4 a0 = src[idx0];\n"
+	"		float4 a1 = src[idx1];\n"
+	"		float4 a2 = src[idx2];\n"
+	"		float4 a3 = src[idx3];\n"
+	"\n"
+	"		dst[ idx0 ] = a0;\n"
+	"		dst[ idx1 ] = a1;\n"
+	"		dst[ idx2 ] = a2;\n"
+	"		dst[ idx3 ] = a3;\n"
+	"	}\n"
+	"}\n"
+	"\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void CopyF1Kernel(__global float* dstF1, __global float* srcF1, \n"
+	"					ConstBuffer cb)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"\n"
+	"	if( gIdx < cb.m_n )\n"
+	"	{\n"
+	"		float a0 = srcF1[gIdx];\n"
+	"\n"
+	"		dstF1[ gIdx ] = a0;\n"
+	"	}\n"
+	"}\n"
+	"\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void CopyF2Kernel(__global float2* dstF2, __global float2* srcF2, \n"
+	"					ConstBuffer cb)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"\n"
+	"	if( gIdx < cb.m_n )\n"
+	"	{\n"
+	"		float2 a0 = srcF2[gIdx];\n"
+	"\n"
+	"		dstF2[ gIdx ] = a0;\n"
+	"	}\n"
+	"}\n"
+	"\n"
+	"\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl
new file mode 100644
index 0000000..71c3107
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+
+typedef unsigned int u32;
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+
+#define make_uint4 (uint4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+typedef struct
+{
+	union
+	{
+		int4 m_data;
+		uint4 m_unsignedData;
+		float	m_floatData;
+	};
+	int m_offset;
+	int m_n;
+	int m_padding[2];
+} ConstBuffer;
+
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void FillIntKernel(__global int* dstInt, 			int num_elements, int value, const int offset)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < num_elements )
+	{
+		dstInt[ offset+gIdx ] = value;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void FillFloatKernel(__global float* dstFloat, 	int num_elements, float value, const int offset)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < num_elements )
+	{
+		dstFloat[ offset+gIdx ] = value;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void FillUnsignedIntKernel(__global unsigned int* dstInt, const int num, const unsigned int value, const int offset)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < num )
+	{
+		dstInt[ offset+gIdx ] = value;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void FillInt2Kernel(__global int2* dstInt2, 	const int num, const int2 value, const int offset)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < num )
+	{
+		dstInt2[ gIdx + offset] = make_int2( value.x, value.y );
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(64,1,1)))
+void FillInt4Kernel(__global int4* dstInt4, 		const int num, const int4 value, const int offset)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < num )
+	{
+		dstInt4[ offset+gIdx ] = value;
+	}
+}
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h
new file mode 100644
index 0000000..983e652
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h
@@ -0,0 +1,90 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* fillKernelsCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"typedef unsigned int u32;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"typedef struct\n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		int4 m_data;\n"
+	"		uint4 m_unsignedData;\n"
+	"		float	m_floatData;\n"
+	"	};\n"
+	"	int m_offset;\n"
+	"	int m_n;\n"
+	"	int m_padding[2];\n"
+	"} ConstBuffer;\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void FillIntKernel(__global int* dstInt, 			int num_elements, int value, const int offset)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < num_elements )\n"
+	"	{\n"
+	"		dstInt[ offset+gIdx ] = value;\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void FillFloatKernel(__global float* dstFloat, 	int num_elements, float value, const int offset)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < num_elements )\n"
+	"	{\n"
+	"		dstFloat[ offset+gIdx ] = value;\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void FillUnsignedIntKernel(__global unsigned int* dstInt, const int num, const unsigned int value, const int offset)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < num )\n"
+	"	{\n"
+	"		dstInt[ offset+gIdx ] = value;\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void FillInt2Kernel(__global int2* dstInt2, 	const int num, const int2 value, const int offset)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < num )\n"
+	"	{\n"
+	"		dstInt2[ gIdx + offset] = make_int2( value.x, value.y );\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"void FillInt4Kernel(__global int4* dstInt4, 		const int num, const int4 value, const int offset)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < num )\n"
+	"	{\n"
+	"		dstInt4[ offset+gIdx ] = value;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl
new file mode 100644
index 0000000..c9da798
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl
@@ -0,0 +1,154 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+
+typedef unsigned int u32;
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+
+// takahiro end
+#define WG_SIZE 128 
+#define m_numElems x
+#define m_numBlocks y
+#define m_numScanBlocks z
+
+/*typedef struct
+{
+	uint m_numElems;
+	uint m_numBlocks;
+	uint m_numScanBlocks;
+	uint m_padding[1];
+} ConstBuffer;
+*/
+
+float4 ScanExclusiveFloat4(__local float4* data, u32 n, int lIdx, int lSize)
+{
+	float4 blocksum;
+    int offset = 1;
+    for(int nActive=n>>1; nActive>0; nActive>>=1, offset<<=1)
+    {
+        GROUP_LDS_BARRIER;
+        for(int iIdx=lIdx; iIdx<nActive; iIdx+=lSize)
+        {
+            int ai = offset*(2*iIdx+1)-1;
+            int bi = offset*(2*iIdx+2)-1;
+            data[bi] += data[ai];
+        }
+	}
+
+    GROUP_LDS_BARRIER;
+
+    if( lIdx == 0 )
+	{
+		blocksum = data[ n-1 ];
+    data[ n-1 ] = 0;
+	}
+
+	GROUP_LDS_BARRIER;
+
+	offset >>= 1;
+    for(int nActive=1; nActive<n; nActive<<=1, offset>>=1 )
+    {
+        GROUP_LDS_BARRIER;
+        for( int iIdx = lIdx; iIdx<nActive; iIdx += lSize )
+        {
+            int ai = offset*(2*iIdx+1)-1;
+            int bi = offset*(2*iIdx+2)-1;
+            float4 temp = data[ai];
+            data[ai] = data[bi];
+            data[bi] += temp;
+        }
+	}
+	GROUP_LDS_BARRIER;
+
+	return blocksum;
+}
+
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+__kernel
+void LocalScanKernel(__global float4* dst, __global float4* src, __global float4* sumBuffer,	uint4 cb)
+{
+	__local float4 ldsData[WG_SIZE*2];
+
+	int gIdx = GET_GLOBAL_IDX;
+	int lIdx = GET_LOCAL_IDX;
+
+	ldsData[2*lIdx]     = ( 2*gIdx < cb.m_numElems )? src[2*gIdx]: 0;
+	ldsData[2*lIdx + 1] = ( 2*gIdx+1 < cb.m_numElems )? src[2*gIdx + 1]: 0;
+
+	float4 sum = ScanExclusiveFloat4(ldsData, WG_SIZE*2, GET_LOCAL_IDX, GET_GROUP_SIZE);
+
+	if( lIdx == 0 ) 
+		sumBuffer[GET_GROUP_IDX] = sum;
+
+	if( (2*gIdx) < cb.m_numElems )
+    {
+        dst[2*gIdx]     = ldsData[2*lIdx];
+	}
+	if( (2*gIdx + 1) < cb.m_numElems )
+	{
+        dst[2*gIdx + 1] = ldsData[2*lIdx + 1];
+    }
+}
+
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+__kernel
+void AddOffsetKernel(__global float4* dst, __global float4* blockSum, uint4 cb)
+{
+	const u32 blockSize = WG_SIZE*2;
+
+	int myIdx = GET_GROUP_IDX+1;
+	int lIdx = GET_LOCAL_IDX;
+
+	float4 iBlockSum = blockSum[myIdx];
+
+	int endValue = min((myIdx+1)*(blockSize), cb.m_numElems);
+	for(int i=myIdx*blockSize+lIdx; i<endValue; i+=GET_GROUP_SIZE)
+	{
+		dst[i] += iBlockSum;
+	}
+}
+
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+__kernel
+void TopLevelScanKernel(__global float4* dst, uint4 cb)
+{
+	__local float4 ldsData[2048];
+	int gIdx = GET_GLOBAL_IDX;
+	int lIdx = GET_LOCAL_IDX;
+	int lSize = GET_GROUP_SIZE;
+
+	for(int i=lIdx; i<cb.m_numScanBlocks; i+=lSize )
+	{
+		ldsData[i] = (i<cb.m_numBlocks)? dst[i]:0;
+	}
+
+	GROUP_LDS_BARRIER;
+
+	float4 sum = ScanExclusiveFloat4(ldsData, cb.m_numScanBlocks, GET_LOCAL_IDX, GET_GROUP_SIZE);
+
+	for(int i=lIdx; i<cb.m_numBlocks; i+=lSize )
+	{
+		dst[i] = ldsData[i];
+	}
+
+	if( gIdx == 0 )
+	{
+		dst[cb.m_numBlocks] = sum;
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl
new file mode 100644
index 0000000..963cc1e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl
@@ -0,0 +1,154 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+
+typedef unsigned int u32;
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+
+// takahiro end
+#define WG_SIZE 128 
+#define m_numElems x
+#define m_numBlocks y
+#define m_numScanBlocks z
+
+/*typedef struct
+{
+	uint m_numElems;
+	uint m_numBlocks;
+	uint m_numScanBlocks;
+	uint m_padding[1];
+} ConstBuffer;
+*/
+
+u32 ScanExclusive(__local u32* data, u32 n, int lIdx, int lSize)
+{
+	u32 blocksum;
+    int offset = 1;
+    for(int nActive=n>>1; nActive>0; nActive>>=1, offset<<=1)
+    {
+        GROUP_LDS_BARRIER;
+        for(int iIdx=lIdx; iIdx<nActive; iIdx+=lSize)
+        {
+            int ai = offset*(2*iIdx+1)-1;
+            int bi = offset*(2*iIdx+2)-1;
+            data[bi] += data[ai];
+        }
+	}
+
+    GROUP_LDS_BARRIER;
+
+    if( lIdx == 0 )
+	{
+		blocksum = data[ n-1 ];
+        data[ n-1 ] = 0;
+	}
+
+	GROUP_LDS_BARRIER;
+
+	offset >>= 1;
+    for(int nActive=1; nActive<n; nActive<<=1, offset>>=1 )
+    {
+        GROUP_LDS_BARRIER;
+        for( int iIdx = lIdx; iIdx<nActive; iIdx += lSize )
+        {
+            int ai = offset*(2*iIdx+1)-1;
+            int bi = offset*(2*iIdx+2)-1;
+            u32 temp = data[ai];
+            data[ai] = data[bi];
+            data[bi] += temp;
+        }
+	}
+	GROUP_LDS_BARRIER;
+
+	return blocksum;
+}
+
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+__kernel
+void LocalScanKernel(__global u32* dst, __global u32 *src, __global u32 *sumBuffer,
+		uint4 cb)
+{
+	__local u32 ldsData[WG_SIZE*2];
+
+	int gIdx = GET_GLOBAL_IDX;
+	int lIdx = GET_LOCAL_IDX;
+
+	ldsData[2*lIdx]     = ( 2*gIdx < cb.m_numElems )? src[2*gIdx]: 0;
+	ldsData[2*lIdx + 1] = ( 2*gIdx+1 < cb.m_numElems )? src[2*gIdx + 1]: 0;
+
+	u32 sum = ScanExclusive(ldsData, WG_SIZE*2, GET_LOCAL_IDX, GET_GROUP_SIZE);
+
+	if( lIdx == 0 ) sumBuffer[GET_GROUP_IDX] = sum;
+
+	if( (2*gIdx) < cb.m_numElems )
+    {
+        dst[2*gIdx]     = ldsData[2*lIdx];
+	}
+	if( (2*gIdx + 1) < cb.m_numElems )
+	{
+        dst[2*gIdx + 1] = ldsData[2*lIdx + 1];
+    }
+}
+
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+__kernel
+void AddOffsetKernel(__global u32 *dst, __global u32 *blockSum, uint4 cb)
+{
+	const u32 blockSize = WG_SIZE*2;
+
+	int myIdx = GET_GROUP_IDX+1;
+	int lIdx = GET_LOCAL_IDX;
+
+	u32 iBlockSum = blockSum[myIdx];
+
+	int endValue = min((myIdx+1)*(blockSize), cb.m_numElems);
+	for(int i=myIdx*blockSize+lIdx; i<endValue; i+=GET_GROUP_SIZE)
+	{
+		dst[i] += iBlockSum;
+	}
+}
+
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+__kernel
+void TopLevelScanKernel(__global u32* dst, uint4 cb)
+{
+	__local u32 ldsData[2048];
+	int gIdx = GET_GLOBAL_IDX;
+	int lIdx = GET_LOCAL_IDX;
+	int lSize = GET_GROUP_SIZE;
+
+	for(int i=lIdx; i<cb.m_numScanBlocks; i+=lSize )
+	{
+		ldsData[i] = (i<cb.m_numBlocks)? dst[i]:0;
+	}
+
+	GROUP_LDS_BARRIER;
+
+	u32 sum = ScanExclusive(ldsData, cb.m_numScanBlocks, GET_LOCAL_IDX, GET_GROUP_SIZE);
+
+	for(int i=lIdx; i<cb.m_numBlocks; i+=lSize )
+	{
+		dst[i] = ldsData[i];
+	}
+
+	if( gIdx == 0 )
+	{
+		dst[cb.m_numBlocks] = sum;
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h
new file mode 100644
index 0000000..fc5e7b8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h
@@ -0,0 +1,128 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* prefixScanKernelsCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"typedef unsigned int u32;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"// takahiro end\n"
+	"#define WG_SIZE 128 \n"
+	"#define m_numElems x\n"
+	"#define m_numBlocks y\n"
+	"#define m_numScanBlocks z\n"
+	"/*typedef struct\n"
+	"{\n"
+	"	uint m_numElems;\n"
+	"	uint m_numBlocks;\n"
+	"	uint m_numScanBlocks;\n"
+	"	uint m_padding[1];\n"
+	"} ConstBuffer;\n"
+	"*/\n"
+	"u32 ScanExclusive(__local u32* data, u32 n, int lIdx, int lSize)\n"
+	"{\n"
+	"	u32 blocksum;\n"
+	"    int offset = 1;\n"
+	"    for(int nActive=n>>1; nActive>0; nActive>>=1, offset<<=1)\n"
+	"    {\n"
+	"        GROUP_LDS_BARRIER;\n"
+	"        for(int iIdx=lIdx; iIdx<nActive; iIdx+=lSize)\n"
+	"        {\n"
+	"            int ai = offset*(2*iIdx+1)-1;\n"
+	"            int bi = offset*(2*iIdx+2)-1;\n"
+	"            data[bi] += data[ai];\n"
+	"        }\n"
+	"	}\n"
+	"    GROUP_LDS_BARRIER;\n"
+	"    if( lIdx == 0 )\n"
+	"	{\n"
+	"		blocksum = data[ n-1 ];\n"
+	"        data[ n-1 ] = 0;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	offset >>= 1;\n"
+	"    for(int nActive=1; nActive<n; nActive<<=1, offset>>=1 )\n"
+	"    {\n"
+	"        GROUP_LDS_BARRIER;\n"
+	"        for( int iIdx = lIdx; iIdx<nActive; iIdx += lSize )\n"
+	"        {\n"
+	"            int ai = offset*(2*iIdx+1)-1;\n"
+	"            int bi = offset*(2*iIdx+2)-1;\n"
+	"            u32 temp = data[ai];\n"
+	"            data[ai] = data[bi];\n"
+	"            data[bi] += temp;\n"
+	"        }\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	return blocksum;\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"__kernel\n"
+	"void LocalScanKernel(__global u32* dst, __global u32 *src, __global u32 *sumBuffer,\n"
+	"		uint4 cb)\n"
+	"{\n"
+	"	__local u32 ldsData[WG_SIZE*2];\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	ldsData[2*lIdx]     = ( 2*gIdx < cb.m_numElems )? src[2*gIdx]: 0;\n"
+	"	ldsData[2*lIdx + 1] = ( 2*gIdx+1 < cb.m_numElems )? src[2*gIdx + 1]: 0;\n"
+	"	u32 sum = ScanExclusive(ldsData, WG_SIZE*2, GET_LOCAL_IDX, GET_GROUP_SIZE);\n"
+	"	if( lIdx == 0 ) sumBuffer[GET_GROUP_IDX] = sum;\n"
+	"	if( (2*gIdx) < cb.m_numElems )\n"
+	"    {\n"
+	"        dst[2*gIdx]     = ldsData[2*lIdx];\n"
+	"	}\n"
+	"	if( (2*gIdx + 1) < cb.m_numElems )\n"
+	"	{\n"
+	"        dst[2*gIdx + 1] = ldsData[2*lIdx + 1];\n"
+	"    }\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"__kernel\n"
+	"void AddOffsetKernel(__global u32 *dst, __global u32 *blockSum, uint4 cb)\n"
+	"{\n"
+	"	const u32 blockSize = WG_SIZE*2;\n"
+	"	int myIdx = GET_GROUP_IDX+1;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	u32 iBlockSum = blockSum[myIdx];\n"
+	"	int endValue = min((myIdx+1)*(blockSize), cb.m_numElems);\n"
+	"	for(int i=myIdx*blockSize+lIdx; i<endValue; i+=GET_GROUP_SIZE)\n"
+	"	{\n"
+	"		dst[i] += iBlockSum;\n"
+	"	}\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"__kernel\n"
+	"void TopLevelScanKernel(__global u32* dst, uint4 cb)\n"
+	"{\n"
+	"	__local u32 ldsData[2048];\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	int lSize = GET_GROUP_SIZE;\n"
+	"	for(int i=lIdx; i<cb.m_numScanBlocks; i+=lSize )\n"
+	"	{\n"
+	"		ldsData[i] = (i<cb.m_numBlocks)? dst[i]:0;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	u32 sum = ScanExclusive(ldsData, cb.m_numScanBlocks, GET_LOCAL_IDX, GET_GROUP_SIZE);\n"
+	"	for(int i=lIdx; i<cb.m_numBlocks; i+=lSize )\n"
+	"	{\n"
+	"		dst[i] = ldsData[i];\n"
+	"	}\n"
+	"	if( gIdx == 0 )\n"
+	"	{\n"
+	"		dst[cb.m_numBlocks] = sum;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsFloat4CL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsFloat4CL.h
new file mode 100644
index 0000000..15d1bc5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsFloat4CL.h
@@ -0,0 +1,128 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* prefixScanKernelsFloat4CL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"typedef unsigned int u32;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"// takahiro end\n"
+	"#define WG_SIZE 128 \n"
+	"#define m_numElems x\n"
+	"#define m_numBlocks y\n"
+	"#define m_numScanBlocks z\n"
+	"/*typedef struct\n"
+	"{\n"
+	"	uint m_numElems;\n"
+	"	uint m_numBlocks;\n"
+	"	uint m_numScanBlocks;\n"
+	"	uint m_padding[1];\n"
+	"} ConstBuffer;\n"
+	"*/\n"
+	"float4 ScanExclusiveFloat4(__local float4* data, u32 n, int lIdx, int lSize)\n"
+	"{\n"
+	"	float4 blocksum;\n"
+	"    int offset = 1;\n"
+	"    for(int nActive=n>>1; nActive>0; nActive>>=1, offset<<=1)\n"
+	"    {\n"
+	"        GROUP_LDS_BARRIER;\n"
+	"        for(int iIdx=lIdx; iIdx<nActive; iIdx+=lSize)\n"
+	"        {\n"
+	"            int ai = offset*(2*iIdx+1)-1;\n"
+	"            int bi = offset*(2*iIdx+2)-1;\n"
+	"            data[bi] += data[ai];\n"
+	"        }\n"
+	"	}\n"
+	"    GROUP_LDS_BARRIER;\n"
+	"    if( lIdx == 0 )\n"
+	"	{\n"
+	"		blocksum = data[ n-1 ];\n"
+	"    data[ n-1 ] = 0;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	offset >>= 1;\n"
+	"    for(int nActive=1; nActive<n; nActive<<=1, offset>>=1 )\n"
+	"    {\n"
+	"        GROUP_LDS_BARRIER;\n"
+	"        for( int iIdx = lIdx; iIdx<nActive; iIdx += lSize )\n"
+	"        {\n"
+	"            int ai = offset*(2*iIdx+1)-1;\n"
+	"            int bi = offset*(2*iIdx+2)-1;\n"
+	"            float4 temp = data[ai];\n"
+	"            data[ai] = data[bi];\n"
+	"            data[bi] += temp;\n"
+	"        }\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	return blocksum;\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"__kernel\n"
+	"void LocalScanKernel(__global float4* dst, __global float4* src, __global float4* sumBuffer,	uint4 cb)\n"
+	"{\n"
+	"	__local float4 ldsData[WG_SIZE*2];\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	ldsData[2*lIdx]     = ( 2*gIdx < cb.m_numElems )? src[2*gIdx]: 0;\n"
+	"	ldsData[2*lIdx + 1] = ( 2*gIdx+1 < cb.m_numElems )? src[2*gIdx + 1]: 0;\n"
+	"	float4 sum = ScanExclusiveFloat4(ldsData, WG_SIZE*2, GET_LOCAL_IDX, GET_GROUP_SIZE);\n"
+	"	if( lIdx == 0 ) \n"
+	"		sumBuffer[GET_GROUP_IDX] = sum;\n"
+	"	if( (2*gIdx) < cb.m_numElems )\n"
+	"    {\n"
+	"        dst[2*gIdx]     = ldsData[2*lIdx];\n"
+	"	}\n"
+	"	if( (2*gIdx + 1) < cb.m_numElems )\n"
+	"	{\n"
+	"        dst[2*gIdx + 1] = ldsData[2*lIdx + 1];\n"
+	"    }\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"__kernel\n"
+	"void AddOffsetKernel(__global float4* dst, __global float4* blockSum, uint4 cb)\n"
+	"{\n"
+	"	const u32 blockSize = WG_SIZE*2;\n"
+	"	int myIdx = GET_GROUP_IDX+1;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	float4 iBlockSum = blockSum[myIdx];\n"
+	"	int endValue = min((myIdx+1)*(blockSize), cb.m_numElems);\n"
+	"	for(int i=myIdx*blockSize+lIdx; i<endValue; i+=GET_GROUP_SIZE)\n"
+	"	{\n"
+	"		dst[i] += iBlockSum;\n"
+	"	}\n"
+	"}\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"__kernel\n"
+	"void TopLevelScanKernel(__global float4* dst, uint4 cb)\n"
+	"{\n"
+	"	__local float4 ldsData[2048];\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	int lSize = GET_GROUP_SIZE;\n"
+	"	for(int i=lIdx; i<cb.m_numScanBlocks; i+=lSize )\n"
+	"	{\n"
+	"		ldsData[i] = (i<cb.m_numBlocks)? dst[i]:0;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	float4 sum = ScanExclusiveFloat4(ldsData, cb.m_numScanBlocks, GET_LOCAL_IDX, GET_GROUP_SIZE);\n"
+	"	for(int i=lIdx; i<cb.m_numBlocks; i+=lSize )\n"
+	"	{\n"
+	"		dst[i] = ldsData[i];\n"
+	"	}\n"
+	"	if( gIdx == 0 )\n"
+	"	{\n"
+	"		dst[cb.m_numBlocks] = sum;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl
new file mode 100644
index 0000000..7402e2f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl
@@ -0,0 +1,1071 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Author Takahiro Harada
+
+
+//#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+
+typedef unsigned int u32;
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AtomAdd(x, value) atom_add(&(x), value)
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+
+#define make_uint4 (uint4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+#define WG_SIZE 64
+#define ELEMENTS_PER_WORK_ITEM (256/WG_SIZE)
+#define BITS_PER_PASS 4
+#define NUM_BUCKET (1<<BITS_PER_PASS)
+typedef uchar u8;
+
+//	this isn't optimization for VLIW. But just reducing writes. 
+#define USE_2LEVEL_REDUCE 1
+
+//#define CHECK_BOUNDARY 1
+
+//#define NV_GPU 1
+
+
+//	Cypress
+#define nPerWI 16
+//	Cayman
+//#define nPerWI 20
+
+#define m_n x
+#define m_nWGs y
+#define m_startBit z
+#define m_nBlocksPerWG w
+
+/*
+typedef struct
+{
+	int m_n;
+	int m_nWGs;
+	int m_startBit;
+	int m_nBlocksPerWG;
+} ConstBuffer;
+*/
+
+typedef struct
+{
+	unsigned int m_key;
+	unsigned int m_value;
+} SortDataCL;
+
+
+uint prefixScanVectorEx( uint4* data )
+{
+	u32 sum = 0;
+	u32 tmp = data[0].x;
+	data[0].x = sum;
+	sum += tmp;
+	tmp = data[0].y;
+	data[0].y = sum;
+	sum += tmp;
+	tmp = data[0].z;
+	data[0].z = sum;
+	sum += tmp;
+	tmp = data[0].w;
+	data[0].w = sum;
+	sum += tmp;
+	return sum;
+}
+
+u32 localPrefixSum( u32 pData, uint lIdx, uint* totalSum, __local u32* sorterSharedMemory, int wgSize /*64 or 128*/ )
+{
+	{	//	Set data
+		sorterSharedMemory[lIdx] = 0;
+		sorterSharedMemory[lIdx+wgSize] = pData;
+	}
+
+	GROUP_LDS_BARRIER;
+
+	{	//	Prefix sum
+		int idx = 2*lIdx + (wgSize+1);
+#if defined(USE_2LEVEL_REDUCE)
+		if( lIdx < 64 )
+		{
+			u32 u0, u1, u2;
+			u0 = sorterSharedMemory[idx-3];
+			u1 = sorterSharedMemory[idx-2];
+			u2 = sorterSharedMemory[idx-1];
+			AtomAdd( sorterSharedMemory[idx], u0+u1+u2 );			
+			GROUP_MEM_FENCE;
+
+			u0 = sorterSharedMemory[idx-12];
+			u1 = sorterSharedMemory[idx-8];
+			u2 = sorterSharedMemory[idx-4];
+			AtomAdd( sorterSharedMemory[idx], u0+u1+u2 );			
+			GROUP_MEM_FENCE;
+
+			u0 = sorterSharedMemory[idx-48];
+			u1 = sorterSharedMemory[idx-32];
+			u2 = sorterSharedMemory[idx-16];
+			AtomAdd( sorterSharedMemory[idx], u0+u1+u2 );			
+			GROUP_MEM_FENCE;
+			if( wgSize > 64 )
+			{
+				sorterSharedMemory[idx] += sorterSharedMemory[idx-64];
+				GROUP_MEM_FENCE;
+			}
+
+			sorterSharedMemory[idx-1] += sorterSharedMemory[idx-2];
+			GROUP_MEM_FENCE;
+		}
+#else
+		if( lIdx < 64 )
+		{
+			sorterSharedMemory[idx] += sorterSharedMemory[idx-1];
+			GROUP_MEM_FENCE;
+			sorterSharedMemory[idx] += sorterSharedMemory[idx-2];			
+			GROUP_MEM_FENCE;
+			sorterSharedMemory[idx] += sorterSharedMemory[idx-4];
+			GROUP_MEM_FENCE;
+			sorterSharedMemory[idx] += sorterSharedMemory[idx-8];
+			GROUP_MEM_FENCE;
+			sorterSharedMemory[idx] += sorterSharedMemory[idx-16];
+			GROUP_MEM_FENCE;
+			sorterSharedMemory[idx] += sorterSharedMemory[idx-32];
+			GROUP_MEM_FENCE;
+			if( wgSize > 64 )
+			{
+				sorterSharedMemory[idx] += sorterSharedMemory[idx-64];
+				GROUP_MEM_FENCE;
+			}
+
+			sorterSharedMemory[idx-1] += sorterSharedMemory[idx-2];
+			GROUP_MEM_FENCE;
+		}
+#endif
+	}
+
+	GROUP_LDS_BARRIER;
+
+	*totalSum = sorterSharedMemory[wgSize*2-1];
+	u32 addValue = sorterSharedMemory[lIdx+wgSize-1];
+	return addValue;
+}
+
+//__attribute__((reqd_work_group_size(128,1,1)))
+uint4 localPrefixSum128V( uint4 pData, uint lIdx, uint* totalSum, __local u32* sorterSharedMemory )
+{
+	u32 s4 = prefixScanVectorEx( &pData );
+	u32 rank = localPrefixSum( s4, lIdx, totalSum, sorterSharedMemory, 128 );
+	return pData + make_uint4( rank, rank, rank, rank );
+}
+
+
+//__attribute__((reqd_work_group_size(64,1,1)))
+uint4 localPrefixSum64V( uint4 pData, uint lIdx, uint* totalSum, __local u32* sorterSharedMemory )
+{
+	u32 s4 = prefixScanVectorEx( &pData );
+	u32 rank = localPrefixSum( s4, lIdx, totalSum, sorterSharedMemory, 64 );
+	return pData + make_uint4( rank, rank, rank, rank );
+}
+
+u32 unpack4Key( u32 key, int keyIdx ){ return (key>>(keyIdx*8)) & 0xff;}
+
+u32 bit8Scan(u32 v)
+{
+	return (v<<8) + (v<<16) + (v<<24);
+}
+
+//===
+
+
+
+
+#define MY_HISTOGRAM(idx) localHistogramMat[(idx)*WG_SIZE+lIdx]
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void StreamCountKernel( __global u32* gSrc, __global u32* histogramOut, int4 cb )
+{
+	__local u32 localHistogramMat[NUM_BUCKET*WG_SIZE];
+
+	u32 gIdx = GET_GLOBAL_IDX;
+	u32 lIdx = GET_LOCAL_IDX;
+	u32 wgIdx = GET_GROUP_IDX;
+	u32 wgSize = GET_GROUP_SIZE;
+	const int startBit = cb.m_startBit;
+	const int n = cb.m_n;
+	const int nWGs = cb.m_nWGs;
+	const int nBlocksPerWG = cb.m_nBlocksPerWG;
+
+	for(int i=0; i<NUM_BUCKET; i++)
+	{
+		MY_HISTOGRAM(i) = 0;
+	}
+
+	GROUP_LDS_BARRIER;
+
+	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;
+	u32 localKey;
+
+	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;
+
+	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;
+
+	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)
+	{
+		//	MY_HISTOGRAM( localKeys.x ) ++ is much expensive than atomic add as it requires read and write while atomics can just add on AMD
+		//	Using registers didn't perform well. It seems like use localKeys to address requires a lot of alu ops
+		//	AMD: AtomInc performs better while NV prefers ++
+		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+		{
+#if defined(CHECK_BOUNDARY)
+			if( addr+i < n )
+#endif
+			{
+				localKey = (gSrc[addr+i]>>startBit) & 0xf;
+#if defined(NV_GPU)
+				MY_HISTOGRAM( localKey )++;
+#else
+				AtomInc( MY_HISTOGRAM( localKey ) );
+#endif
+			}
+		}
+	}
+
+	GROUP_LDS_BARRIER;
+	
+	if( lIdx < NUM_BUCKET )
+	{
+		u32 sum = 0;
+		for(int i=0; i<GET_GROUP_SIZE; i++)
+		{
+			sum += localHistogramMat[lIdx*WG_SIZE+(i+lIdx)%GET_GROUP_SIZE];
+		}
+		histogramOut[lIdx*nWGs+wgIdx] = sum;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void StreamCountSortDataKernel( __global SortDataCL* gSrc, __global u32* histogramOut, int4  cb )
+{
+	__local u32 localHistogramMat[NUM_BUCKET*WG_SIZE];
+
+	u32 gIdx = GET_GLOBAL_IDX;
+	u32 lIdx = GET_LOCAL_IDX;
+	u32 wgIdx = GET_GROUP_IDX;
+	u32 wgSize = GET_GROUP_SIZE;
+	const int startBit = cb.m_startBit;
+	const int n = cb.m_n;
+	const int nWGs = cb.m_nWGs;
+	const int nBlocksPerWG = cb.m_nBlocksPerWG;
+
+	for(int i=0; i<NUM_BUCKET; i++)
+	{
+		MY_HISTOGRAM(i) = 0;
+	}
+
+	GROUP_LDS_BARRIER;
+
+	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;
+	u32 localKey;
+
+	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;
+
+	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;
+
+	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)
+	{
+		//	MY_HISTOGRAM( localKeys.x ) ++ is much expensive than atomic add as it requires read and write while atomics can just add on AMD
+		//	Using registers didn't perform well. It seems like use localKeys to address requires a lot of alu ops
+		//	AMD: AtomInc performs better while NV prefers ++
+		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+		{
+#if defined(CHECK_BOUNDARY)
+			if( addr+i < n )
+#endif
+			{
+				localKey = (gSrc[addr+i].m_key>>startBit) & 0xf;
+#if defined(NV_GPU)
+				MY_HISTOGRAM( localKey )++;
+#else
+				AtomInc( MY_HISTOGRAM( localKey ) );
+#endif
+			}
+		}
+	}
+
+	GROUP_LDS_BARRIER;
+	
+	if( lIdx < NUM_BUCKET )
+	{
+		u32 sum = 0;
+		for(int i=0; i<GET_GROUP_SIZE; i++)
+		{
+			sum += localHistogramMat[lIdx*WG_SIZE+(i+lIdx)%GET_GROUP_SIZE];
+		}
+		histogramOut[lIdx*nWGs+wgIdx] = sum;
+	}
+}
+
+#define nPerLane (nPerWI/4)
+
+//	NUM_BUCKET*nWGs < 128*nPerWI
+__kernel
+__attribute__((reqd_work_group_size(128,1,1)))
+void PrefixScanKernel( __global u32* wHistogram1, int4  cb )
+{
+	__local u32 ldsTopScanData[128*2];
+
+	u32 lIdx = GET_LOCAL_IDX;
+	u32 wgIdx = GET_GROUP_IDX;
+	const int nWGs = cb.m_nWGs;
+
+	u32 data[nPerWI];
+	for(int i=0; i<nPerWI; i++)
+	{
+		data[i] = 0;
+		if( (nPerWI*lIdx+i) < NUM_BUCKET*nWGs )
+			data[i] = wHistogram1[nPerWI*lIdx+i];
+	}
+
+	uint4 myData = make_uint4(0,0,0,0);
+
+	for(int i=0; i<nPerLane; i++)
+	{
+		myData.x += data[nPerLane*0+i];
+		myData.y += data[nPerLane*1+i];
+		myData.z += data[nPerLane*2+i];
+		myData.w += data[nPerLane*3+i];
+	}
+
+	uint totalSum;
+	uint4 scanned = localPrefixSum128V( myData, lIdx, &totalSum, ldsTopScanData );
+
+//	for(int j=0; j<4; j++) //	somehow it introduces a lot of branches
+	{	int j = 0;
+		u32 sum = 0;
+		for(int i=0; i<nPerLane; i++)
+		{
+			u32 tmp = data[nPerLane*j+i];
+			data[nPerLane*j+i] = sum;
+			sum += tmp;
+		}
+	}
+	{	int j = 1;
+		u32 sum = 0;
+		for(int i=0; i<nPerLane; i++)
+		{
+			u32 tmp = data[nPerLane*j+i];
+			data[nPerLane*j+i] = sum;
+			sum += tmp;
+		}
+	}
+	{	int j = 2;
+		u32 sum = 0;
+		for(int i=0; i<nPerLane; i++)
+		{
+			u32 tmp = data[nPerLane*j+i];
+			data[nPerLane*j+i] = sum;
+			sum += tmp;
+		}
+	}
+	{	int j = 3;
+		u32 sum = 0;
+		for(int i=0; i<nPerLane; i++)
+		{
+			u32 tmp = data[nPerLane*j+i];
+			data[nPerLane*j+i] = sum;
+			sum += tmp;
+		}
+	}
+
+	for(int i=0; i<nPerLane; i++)
+	{
+		data[nPerLane*0+i] += scanned.x;
+		data[nPerLane*1+i] += scanned.y;
+		data[nPerLane*2+i] += scanned.z;
+		data[nPerLane*3+i] += scanned.w;
+	}
+
+	for(int i=0; i<nPerWI; i++)
+	{
+		int index = nPerWI*lIdx+i;
+		if (index < NUM_BUCKET*nWGs)
+			wHistogram1[nPerWI*lIdx+i] = data[i];
+	}
+}
+
+//	4 scan, 4 exchange
+void sort4Bits(u32 sortData[4], int startBit, int lIdx, __local u32* ldsSortData)
+{
+	for(int bitIdx=0; bitIdx<BITS_PER_PASS; bitIdx++)
+	{
+		u32 mask = (1<<bitIdx);
+		uint4 cmpResult = make_uint4( (sortData[0]>>startBit) & mask, (sortData[1]>>startBit) & mask, (sortData[2]>>startBit) & mask, (sortData[3]>>startBit) & mask );
+		uint4 prefixSum = SELECT_UINT4( make_uint4(1,1,1,1), make_uint4(0,0,0,0), cmpResult != make_uint4(0,0,0,0) );
+		u32 total;
+		prefixSum = localPrefixSum64V( prefixSum, lIdx, &total, ldsSortData );
+		{
+			uint4 localAddr = make_uint4(lIdx*4+0,lIdx*4+1,lIdx*4+2,lIdx*4+3);
+			uint4 dstAddr = localAddr - prefixSum + make_uint4( total, total, total, total );
+			dstAddr = SELECT_UINT4( prefixSum, dstAddr, cmpResult != make_uint4(0, 0, 0, 0) );
+
+			GROUP_LDS_BARRIER;
+
+			ldsSortData[dstAddr.x] = sortData[0];
+			ldsSortData[dstAddr.y] = sortData[1];
+			ldsSortData[dstAddr.z] = sortData[2];
+			ldsSortData[dstAddr.w] = sortData[3];
+
+			GROUP_LDS_BARRIER;
+
+			sortData[0] = ldsSortData[localAddr.x];
+			sortData[1] = ldsSortData[localAddr.y];
+			sortData[2] = ldsSortData[localAddr.z];
+			sortData[3] = ldsSortData[localAddr.w];
+
+			GROUP_LDS_BARRIER;
+		}
+	}
+}
+
+//	2 scan, 2 exchange
+void sort4Bits1(u32 sortData[4], int startBit, int lIdx, __local u32* ldsSortData)
+{
+	for(uint ibit=0; ibit<BITS_PER_PASS; ibit+=2)
+	{
+		uint4 b = make_uint4((sortData[0]>>(startBit+ibit)) & 0x3, 
+			(sortData[1]>>(startBit+ibit)) & 0x3, 
+			(sortData[2]>>(startBit+ibit)) & 0x3, 
+			(sortData[3]>>(startBit+ibit)) & 0x3);
+
+		u32 key4;
+		u32 sKeyPacked[4] = { 0, 0, 0, 0 };
+		{
+			sKeyPacked[0] |= 1<<(8*b.x);
+			sKeyPacked[1] |= 1<<(8*b.y);
+			sKeyPacked[2] |= 1<<(8*b.z);
+			sKeyPacked[3] |= 1<<(8*b.w);
+
+			key4 = sKeyPacked[0] + sKeyPacked[1] + sKeyPacked[2] + sKeyPacked[3];
+		}
+
+		u32 rankPacked;
+		u32 sumPacked;
+		{
+			rankPacked = localPrefixSum( key4, lIdx, &sumPacked, ldsSortData, WG_SIZE );
+		}
+
+		GROUP_LDS_BARRIER;
+
+		u32 newOffset[4] = { 0,0,0,0 };
+		{
+			u32 sumScanned = bit8Scan( sumPacked );
+
+			u32 scannedKeys[4];
+			scannedKeys[0] = 1<<(8*b.x);
+			scannedKeys[1] = 1<<(8*b.y);
+			scannedKeys[2] = 1<<(8*b.z);
+			scannedKeys[3] = 1<<(8*b.w);
+			{	//	4 scans at once
+				u32 sum4 = 0;
+				for(int ie=0; ie<4; ie++)
+				{
+					u32 tmp = scannedKeys[ie];
+					scannedKeys[ie] = sum4;
+					sum4 += tmp;
+				}
+			}
+
+			{
+				u32 sumPlusRank = sumScanned + rankPacked;
+				{	u32 ie = b.x;
+					scannedKeys[0] += sumPlusRank;
+					newOffset[0] = unpack4Key( scannedKeys[0], ie );
+				}
+				{	u32 ie = b.y;
+					scannedKeys[1] += sumPlusRank;
+					newOffset[1] = unpack4Key( scannedKeys[1], ie );
+				}
+				{	u32 ie = b.z;
+					scannedKeys[2] += sumPlusRank;
+					newOffset[2] = unpack4Key( scannedKeys[2], ie );
+				}
+				{	u32 ie = b.w;
+					scannedKeys[3] += sumPlusRank;
+					newOffset[3] = unpack4Key( scannedKeys[3], ie );
+				}
+			}
+		}
+
+
+		GROUP_LDS_BARRIER;
+
+		{
+			ldsSortData[newOffset[0]] = sortData[0];
+			ldsSortData[newOffset[1]] = sortData[1];
+			ldsSortData[newOffset[2]] = sortData[2];
+			ldsSortData[newOffset[3]] = sortData[3];
+
+			GROUP_LDS_BARRIER;
+
+			u32 dstAddr = 4*lIdx;
+			sortData[0] = ldsSortData[dstAddr+0];
+			sortData[1] = ldsSortData[dstAddr+1];
+			sortData[2] = ldsSortData[dstAddr+2];
+			sortData[3] = ldsSortData[dstAddr+3];
+
+			GROUP_LDS_BARRIER;
+		}
+	}
+}
+
+#define SET_HISTOGRAM(setIdx, key) ldsSortData[(setIdx)*NUM_BUCKET+key]
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SortAndScatterKernel( __global const u32* restrict gSrc, __global const u32* rHistogram, __global u32* restrict gDst, int4  cb )
+{
+	__local u32 ldsSortData[WG_SIZE*ELEMENTS_PER_WORK_ITEM+16];
+	__local u32 localHistogramToCarry[NUM_BUCKET];
+	__local u32 localHistogram[NUM_BUCKET*2];
+
+	u32 gIdx = GET_GLOBAL_IDX;
+	u32 lIdx = GET_LOCAL_IDX;
+	u32 wgIdx = GET_GROUP_IDX;
+	u32 wgSize = GET_GROUP_SIZE;
+
+	const int n = cb.m_n;
+	const int nWGs = cb.m_nWGs;
+	const int startBit = cb.m_startBit;
+	const int nBlocksPerWG = cb.m_nBlocksPerWG;
+
+	if( lIdx < (NUM_BUCKET) )
+	{
+		localHistogramToCarry[lIdx] = rHistogram[lIdx*nWGs + wgIdx];
+	}
+
+	GROUP_LDS_BARRIER;
+
+	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;
+
+	int nBlocks = n/blockSize - nBlocksPerWG*wgIdx;
+
+	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;
+
+	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)
+	{
+		u32 myHistogram = 0;
+
+		u32 sortData[ELEMENTS_PER_WORK_ITEM];
+		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+#if defined(CHECK_BOUNDARY)
+			sortData[i] = ( addr+i < n )? gSrc[ addr+i ] : 0xffffffff;
+#else
+			sortData[i] = gSrc[ addr+i ];
+#endif
+
+		sort4Bits(sortData, startBit, lIdx, ldsSortData);
+
+		u32 keys[ELEMENTS_PER_WORK_ITEM];
+		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+			keys[i] = (sortData[i]>>startBit) & 0xf;
+
+		{	//	create histogram
+			u32 setIdx = lIdx/16;
+			if( lIdx < NUM_BUCKET )
+			{
+				localHistogram[lIdx] = 0;
+			}
+			ldsSortData[lIdx] = 0;
+			GROUP_LDS_BARRIER;
+
+			for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+#if defined(CHECK_BOUNDARY)
+				if( addr+i < n )
+#endif
+
+#if defined(NV_GPU)
+				SET_HISTOGRAM( setIdx, keys[i] )++;
+#else
+				AtomInc( SET_HISTOGRAM( setIdx, keys[i] ) );
+#endif
+			
+			GROUP_LDS_BARRIER;
+			
+			uint hIdx = NUM_BUCKET+lIdx;
+			if( lIdx < NUM_BUCKET )
+			{
+				u32 sum = 0;
+				for(int i=0; i<WG_SIZE/16; i++)
+				{
+					sum += SET_HISTOGRAM( i, lIdx );
+				}
+				myHistogram = sum;
+				localHistogram[hIdx] = sum;
+			}
+			GROUP_LDS_BARRIER;
+
+#if defined(USE_2LEVEL_REDUCE)
+			if( lIdx < NUM_BUCKET )
+			{
+				localHistogram[hIdx] = localHistogram[hIdx-1];
+				GROUP_MEM_FENCE;
+
+				u32 u0, u1, u2;
+				u0 = localHistogram[hIdx-3];
+				u1 = localHistogram[hIdx-2];
+				u2 = localHistogram[hIdx-1];
+				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );
+				GROUP_MEM_FENCE;
+				u0 = localHistogram[hIdx-12];
+				u1 = localHistogram[hIdx-8];
+				u2 = localHistogram[hIdx-4];
+				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );
+				GROUP_MEM_FENCE;
+			}
+#else
+			if( lIdx < NUM_BUCKET )
+			{
+				localHistogram[hIdx] = localHistogram[hIdx-1];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-1];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-2];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-4];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-8];
+				GROUP_MEM_FENCE;
+			}
+#endif
+			GROUP_LDS_BARRIER;
+		}
+
+		{
+			for(int ie=0; ie<ELEMENTS_PER_WORK_ITEM; ie++)
+			{
+				int dataIdx = ELEMENTS_PER_WORK_ITEM*lIdx+ie;
+				int binIdx = keys[ie];
+				int groupOffset = localHistogramToCarry[binIdx];
+				int myIdx = dataIdx - localHistogram[NUM_BUCKET+binIdx];
+#if defined(CHECK_BOUNDARY)
+				if( addr+ie < n )
+#endif
+				gDst[ groupOffset + myIdx ] = sortData[ie];
+			}
+		}
+
+		GROUP_LDS_BARRIER;
+
+		if( lIdx < NUM_BUCKET )
+		{
+			localHistogramToCarry[lIdx] += myHistogram;
+		}
+		GROUP_LDS_BARRIER;
+	}
+}
+
+//	2 scan, 2 exchange
+void sort4Bits1KeyValue(u32 sortData[4], int sortVal[4], int startBit, int lIdx, __local u32* ldsSortData, __local int *ldsSortVal)
+{
+	for(uint ibit=0; ibit<BITS_PER_PASS; ibit+=2)
+	{
+		uint4 b = make_uint4((sortData[0]>>(startBit+ibit)) & 0x3, 
+			(sortData[1]>>(startBit+ibit)) & 0x3, 
+			(sortData[2]>>(startBit+ibit)) & 0x3, 
+			(sortData[3]>>(startBit+ibit)) & 0x3);
+
+		u32 key4;
+		u32 sKeyPacked[4] = { 0, 0, 0, 0 };
+		{
+			sKeyPacked[0] |= 1<<(8*b.x);
+			sKeyPacked[1] |= 1<<(8*b.y);
+			sKeyPacked[2] |= 1<<(8*b.z);
+			sKeyPacked[3] |= 1<<(8*b.w);
+
+			key4 = sKeyPacked[0] + sKeyPacked[1] + sKeyPacked[2] + sKeyPacked[3];
+		}
+
+		u32 rankPacked;
+		u32 sumPacked;
+		{
+			rankPacked = localPrefixSum( key4, lIdx, &sumPacked, ldsSortData, WG_SIZE );
+		}
+
+		GROUP_LDS_BARRIER;
+
+		u32 newOffset[4] = { 0,0,0,0 };
+		{
+			u32 sumScanned = bit8Scan( sumPacked );
+
+			u32 scannedKeys[4];
+			scannedKeys[0] = 1<<(8*b.x);
+			scannedKeys[1] = 1<<(8*b.y);
+			scannedKeys[2] = 1<<(8*b.z);
+			scannedKeys[3] = 1<<(8*b.w);
+			{	//	4 scans at once
+				u32 sum4 = 0;
+				for(int ie=0; ie<4; ie++)
+				{
+					u32 tmp = scannedKeys[ie];
+					scannedKeys[ie] = sum4;
+					sum4 += tmp;
+				}
+			}
+
+			{
+				u32 sumPlusRank = sumScanned + rankPacked;
+				{	u32 ie = b.x;
+					scannedKeys[0] += sumPlusRank;
+					newOffset[0] = unpack4Key( scannedKeys[0], ie );
+				}
+				{	u32 ie = b.y;
+					scannedKeys[1] += sumPlusRank;
+					newOffset[1] = unpack4Key( scannedKeys[1], ie );
+				}
+				{	u32 ie = b.z;
+					scannedKeys[2] += sumPlusRank;
+					newOffset[2] = unpack4Key( scannedKeys[2], ie );
+				}
+				{	u32 ie = b.w;
+					scannedKeys[3] += sumPlusRank;
+					newOffset[3] = unpack4Key( scannedKeys[3], ie );
+				}
+			}
+		}
+
+
+		GROUP_LDS_BARRIER;
+
+		{
+			ldsSortData[newOffset[0]] = sortData[0];
+			ldsSortData[newOffset[1]] = sortData[1];
+			ldsSortData[newOffset[2]] = sortData[2];
+			ldsSortData[newOffset[3]] = sortData[3];
+
+			ldsSortVal[newOffset[0]] = sortVal[0];
+			ldsSortVal[newOffset[1]] = sortVal[1];
+			ldsSortVal[newOffset[2]] = sortVal[2];
+			ldsSortVal[newOffset[3]] = sortVal[3];
+
+			GROUP_LDS_BARRIER;
+
+			u32 dstAddr = 4*lIdx;
+			sortData[0] = ldsSortData[dstAddr+0];
+			sortData[1] = ldsSortData[dstAddr+1];
+			sortData[2] = ldsSortData[dstAddr+2];
+			sortData[3] = ldsSortData[dstAddr+3];
+
+			sortVal[0] = ldsSortVal[dstAddr+0];
+			sortVal[1] = ldsSortVal[dstAddr+1];
+			sortVal[2] = ldsSortVal[dstAddr+2];
+			sortVal[3] = ldsSortVal[dstAddr+3];
+
+			GROUP_LDS_BARRIER;
+		}
+	}
+}
+
+
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SortAndScatterSortDataKernel( __global const SortDataCL* restrict gSrc, __global const u32* rHistogram, __global SortDataCL* restrict gDst, int4 cb)
+{
+	__local int ldsSortData[WG_SIZE*ELEMENTS_PER_WORK_ITEM+16];
+	__local int ldsSortVal[WG_SIZE*ELEMENTS_PER_WORK_ITEM+16];
+	__local u32 localHistogramToCarry[NUM_BUCKET];
+	__local u32 localHistogram[NUM_BUCKET*2];
+
+	u32 gIdx = GET_GLOBAL_IDX;
+	u32 lIdx = GET_LOCAL_IDX;
+	u32 wgIdx = GET_GROUP_IDX;
+	u32 wgSize = GET_GROUP_SIZE;
+
+	const int n = cb.m_n;
+	const int nWGs = cb.m_nWGs;
+	const int startBit = cb.m_startBit;
+	const int nBlocksPerWG = cb.m_nBlocksPerWG;
+
+	if( lIdx < (NUM_BUCKET) )
+	{
+		localHistogramToCarry[lIdx] = rHistogram[lIdx*nWGs + wgIdx];
+	}
+
+	GROUP_LDS_BARRIER;
+    
+
+	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;
+
+	int nBlocks = n/blockSize - nBlocksPerWG*wgIdx;
+
+	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;
+
+	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)
+	{
+
+		u32 myHistogram = 0;
+
+		int sortData[ELEMENTS_PER_WORK_ITEM];
+		int sortVal[ELEMENTS_PER_WORK_ITEM];
+
+		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+#if defined(CHECK_BOUNDARY)
+		{
+			sortData[i] = ( addr+i < n )? gSrc[ addr+i ].m_key : 0xffffffff;
+			sortVal[i] = ( addr+i < n )? gSrc[ addr+i ].m_value : 0xffffffff;
+		}
+#else
+		{
+			sortData[i] = gSrc[ addr+i ].m_key;
+			sortVal[i] = gSrc[ addr+i ].m_value;
+		}
+#endif
+
+		sort4Bits1KeyValue(sortData, sortVal, startBit, lIdx, ldsSortData, ldsSortVal);
+
+		u32 keys[ELEMENTS_PER_WORK_ITEM];
+		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+			keys[i] = (sortData[i]>>startBit) & 0xf;
+
+		{	//	create histogram
+			u32 setIdx = lIdx/16;
+			if( lIdx < NUM_BUCKET )
+			{
+				localHistogram[lIdx] = 0;
+			}
+			ldsSortData[lIdx] = 0;
+			GROUP_LDS_BARRIER;
+
+			for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)
+#if defined(CHECK_BOUNDARY)
+				if( addr+i < n )
+#endif
+
+#if defined(NV_GPU)
+				SET_HISTOGRAM( setIdx, keys[i] )++;
+#else
+				AtomInc( SET_HISTOGRAM( setIdx, keys[i] ) );
+#endif
+			
+			GROUP_LDS_BARRIER;
+			
+			uint hIdx = NUM_BUCKET+lIdx;
+			if( lIdx < NUM_BUCKET )
+			{
+				u32 sum = 0;
+				for(int i=0; i<WG_SIZE/16; i++)
+				{
+					sum += SET_HISTOGRAM( i, lIdx );
+				}
+				myHistogram = sum;
+				localHistogram[hIdx] = sum;
+			}
+			GROUP_LDS_BARRIER;
+
+#if defined(USE_2LEVEL_REDUCE)
+			if( lIdx < NUM_BUCKET )
+			{
+				localHistogram[hIdx] = localHistogram[hIdx-1];
+				GROUP_MEM_FENCE;
+
+				u32 u0, u1, u2;
+				u0 = localHistogram[hIdx-3];
+				u1 = localHistogram[hIdx-2];
+				u2 = localHistogram[hIdx-1];
+				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );
+				GROUP_MEM_FENCE;
+				u0 = localHistogram[hIdx-12];
+				u1 = localHistogram[hIdx-8];
+				u2 = localHistogram[hIdx-4];
+				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );
+				GROUP_MEM_FENCE;
+			}
+#else
+			if( lIdx < NUM_BUCKET )
+			{
+				localHistogram[hIdx] = localHistogram[hIdx-1];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-1];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-2];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-4];
+				GROUP_MEM_FENCE;
+				localHistogram[hIdx] += localHistogram[hIdx-8];
+				GROUP_MEM_FENCE;
+			}
+#endif
+			GROUP_LDS_BARRIER;
+		}
+
+    	{
+			for(int ie=0; ie<ELEMENTS_PER_WORK_ITEM; ie++)
+			{
+				int dataIdx = ELEMENTS_PER_WORK_ITEM*lIdx+ie;
+				int binIdx = keys[ie];
+				int groupOffset = localHistogramToCarry[binIdx];
+				int myIdx = dataIdx - localHistogram[NUM_BUCKET+binIdx];
+#if defined(CHECK_BOUNDARY)
+				if( addr+ie < n )
+				{
+                    if ((groupOffset + myIdx)<n)
+                    {
+                        if (sortData[ie]==sortVal[ie])
+                        {
+                            
+                            SortDataCL tmp;
+                            tmp.m_key = sortData[ie];
+                            tmp.m_value = sortVal[ie];
+                            if (tmp.m_key == tmp.m_value)
+                                gDst[groupOffset + myIdx ] = tmp;
+                        }
+                        
+                    }
+				}
+#else
+                if ((groupOffset + myIdx)<n)
+                {
+                    gDst[ groupOffset + myIdx ].m_key = sortData[ie];
+                    gDst[ groupOffset + myIdx ].m_value = sortVal[ie];
+                }
+#endif
+			}
+		}
+
+		GROUP_LDS_BARRIER;
+
+		if( lIdx < NUM_BUCKET )
+		{
+			localHistogramToCarry[lIdx] += myHistogram;
+		}
+		GROUP_LDS_BARRIER;
+	}
+}
+
+
+
+
+
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SortAndScatterSortDataKernelSerial( __global const SortDataCL* restrict gSrc, __global const u32* rHistogram, __global SortDataCL* restrict gDst, int4 cb)
+{
+    
+	u32 gIdx = GET_GLOBAL_IDX;
+	u32 realLocalIdx = GET_LOCAL_IDX;
+	u32 wgIdx = GET_GROUP_IDX;
+	u32 wgSize = GET_GROUP_SIZE;
+	const int startBit = cb.m_startBit;
+	const int n = cb.m_n;
+	const int nWGs = cb.m_nWGs;
+	const int nBlocksPerWG = cb.m_nBlocksPerWG;
+
+    int counter[NUM_BUCKET];
+    
+    if (realLocalIdx>0)
+        return;
+    
+    for (int c=0;c<NUM_BUCKET;c++)
+        counter[c]=0;
+
+    const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;
+	
+	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;
+
+   for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++)
+  {
+     for (int lIdx=0;lIdx<WG_SIZE;lIdx++)
+ 	{
+        int addr2 = iblock*blockSize + blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;
+        
+		for(int j=0; j<ELEMENTS_PER_WORK_ITEM; j++)
+		{
+            int i = addr2+j;
+			if( i < n )
+			{
+                int tableIdx;
+				tableIdx = (gSrc[i].m_key>>startBit) & 0xf;//0xf = NUM_TABLES-1
+                gDst[rHistogram[tableIdx*nWGs+wgIdx] + counter[tableIdx]] = gSrc[i];
+                counter[tableIdx] ++;
+			}
+		}
+	}
+  }
+    
+}
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SortAndScatterKernelSerial( __global const u32* restrict gSrc, __global const u32* rHistogram, __global u32* restrict gDst, int4  cb )
+{
+    
+	u32 gIdx = GET_GLOBAL_IDX;
+	u32 realLocalIdx = GET_LOCAL_IDX;
+	u32 wgIdx = GET_GROUP_IDX;
+	u32 wgSize = GET_GROUP_SIZE;
+	const int startBit = cb.m_startBit;
+	const int n = cb.m_n;
+	const int nWGs = cb.m_nWGs;
+	const int nBlocksPerWG = cb.m_nBlocksPerWG;
+
+    int counter[NUM_BUCKET];
+    
+    if (realLocalIdx>0)
+        return;
+    
+    for (int c=0;c<NUM_BUCKET;c++)
+        counter[c]=0;
+
+    const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;
+	
+	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;
+
+   for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++)
+  {
+     for (int lIdx=0;lIdx<WG_SIZE;lIdx++)
+ 	{
+        int addr2 = iblock*blockSize + blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;
+        
+		for(int j=0; j<ELEMENTS_PER_WORK_ITEM; j++)
+		{
+            int i = addr2+j;
+			if( i < n )
+			{
+                int tableIdx;
+				tableIdx = (gSrc[i]>>startBit) & 0xf;//0xf = NUM_TABLES-1
+                gDst[rHistogram[tableIdx*nWGs+wgIdx] + counter[tableIdx]] = gSrc[i];
+                counter[tableIdx] ++;
+			}
+		}
+	}
+  }
+    
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h
new file mode 100644
index 0000000..fb4bdda
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h
@@ -0,0 +1,909 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* radixSort32KernelsCL =
+	"/*\n"
+	"Bullet Continuous Collision Detection and Physics Library\n"
+	"Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org\n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Author Takahiro Harada\n"
+	"//#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"typedef unsigned int u32;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"#define WG_SIZE 64\n"
+	"#define ELEMENTS_PER_WORK_ITEM (256/WG_SIZE)\n"
+	"#define BITS_PER_PASS 4\n"
+	"#define NUM_BUCKET (1<<BITS_PER_PASS)\n"
+	"typedef uchar u8;\n"
+	"//	this isn't optimization for VLIW. But just reducing writes. \n"
+	"#define USE_2LEVEL_REDUCE 1\n"
+	"//#define CHECK_BOUNDARY 1\n"
+	"//#define NV_GPU 1\n"
+	"//	Cypress\n"
+	"#define nPerWI 16\n"
+	"//	Cayman\n"
+	"//#define nPerWI 20\n"
+	"#define m_n x\n"
+	"#define m_nWGs y\n"
+	"#define m_startBit z\n"
+	"#define m_nBlocksPerWG w\n"
+	"/*\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_n;\n"
+	"	int m_nWGs;\n"
+	"	int m_startBit;\n"
+	"	int m_nBlocksPerWG;\n"
+	"} ConstBuffer;\n"
+	"*/\n"
+	"typedef struct\n"
+	"{\n"
+	"	unsigned int m_key;\n"
+	"	unsigned int m_value;\n"
+	"} SortDataCL;\n"
+	"uint prefixScanVectorEx( uint4* data )\n"
+	"{\n"
+	"	u32 sum = 0;\n"
+	"	u32 tmp = data[0].x;\n"
+	"	data[0].x = sum;\n"
+	"	sum += tmp;\n"
+	"	tmp = data[0].y;\n"
+	"	data[0].y = sum;\n"
+	"	sum += tmp;\n"
+	"	tmp = data[0].z;\n"
+	"	data[0].z = sum;\n"
+	"	sum += tmp;\n"
+	"	tmp = data[0].w;\n"
+	"	data[0].w = sum;\n"
+	"	sum += tmp;\n"
+	"	return sum;\n"
+	"}\n"
+	"u32 localPrefixSum( u32 pData, uint lIdx, uint* totalSum, __local u32* sorterSharedMemory, int wgSize /*64 or 128*/ )\n"
+	"{\n"
+	"	{	//	Set data\n"
+	"		sorterSharedMemory[lIdx] = 0;\n"
+	"		sorterSharedMemory[lIdx+wgSize] = pData;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	{	//	Prefix sum\n"
+	"		int idx = 2*lIdx + (wgSize+1);\n"
+	"#if defined(USE_2LEVEL_REDUCE)\n"
+	"		if( lIdx < 64 )\n"
+	"		{\n"
+	"			u32 u0, u1, u2;\n"
+	"			u0 = sorterSharedMemory[idx-3];\n"
+	"			u1 = sorterSharedMemory[idx-2];\n"
+	"			u2 = sorterSharedMemory[idx-1];\n"
+	"			AtomAdd( sorterSharedMemory[idx], u0+u1+u2 );			\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			u0 = sorterSharedMemory[idx-12];\n"
+	"			u1 = sorterSharedMemory[idx-8];\n"
+	"			u2 = sorterSharedMemory[idx-4];\n"
+	"			AtomAdd( sorterSharedMemory[idx], u0+u1+u2 );			\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			u0 = sorterSharedMemory[idx-48];\n"
+	"			u1 = sorterSharedMemory[idx-32];\n"
+	"			u2 = sorterSharedMemory[idx-16];\n"
+	"			AtomAdd( sorterSharedMemory[idx], u0+u1+u2 );			\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			if( wgSize > 64 )\n"
+	"			{\n"
+	"				sorterSharedMemory[idx] += sorterSharedMemory[idx-64];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"			}\n"
+	"			sorterSharedMemory[idx-1] += sorterSharedMemory[idx-2];\n"
+	"			GROUP_MEM_FENCE;\n"
+	"		}\n"
+	"#else\n"
+	"		if( lIdx < 64 )\n"
+	"		{\n"
+	"			sorterSharedMemory[idx] += sorterSharedMemory[idx-1];\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			sorterSharedMemory[idx] += sorterSharedMemory[idx-2];			\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			sorterSharedMemory[idx] += sorterSharedMemory[idx-4];\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			sorterSharedMemory[idx] += sorterSharedMemory[idx-8];\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			sorterSharedMemory[idx] += sorterSharedMemory[idx-16];\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			sorterSharedMemory[idx] += sorterSharedMemory[idx-32];\n"
+	"			GROUP_MEM_FENCE;\n"
+	"			if( wgSize > 64 )\n"
+	"			{\n"
+	"				sorterSharedMemory[idx] += sorterSharedMemory[idx-64];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"			}\n"
+	"			sorterSharedMemory[idx-1] += sorterSharedMemory[idx-2];\n"
+	"			GROUP_MEM_FENCE;\n"
+	"		}\n"
+	"#endif\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	*totalSum = sorterSharedMemory[wgSize*2-1];\n"
+	"	u32 addValue = sorterSharedMemory[lIdx+wgSize-1];\n"
+	"	return addValue;\n"
+	"}\n"
+	"//__attribute__((reqd_work_group_size(128,1,1)))\n"
+	"uint4 localPrefixSum128V( uint4 pData, uint lIdx, uint* totalSum, __local u32* sorterSharedMemory )\n"
+	"{\n"
+	"	u32 s4 = prefixScanVectorEx( &pData );\n"
+	"	u32 rank = localPrefixSum( s4, lIdx, totalSum, sorterSharedMemory, 128 );\n"
+	"	return pData + make_uint4( rank, rank, rank, rank );\n"
+	"}\n"
+	"//__attribute__((reqd_work_group_size(64,1,1)))\n"
+	"uint4 localPrefixSum64V( uint4 pData, uint lIdx, uint* totalSum, __local u32* sorterSharedMemory )\n"
+	"{\n"
+	"	u32 s4 = prefixScanVectorEx( &pData );\n"
+	"	u32 rank = localPrefixSum( s4, lIdx, totalSum, sorterSharedMemory, 64 );\n"
+	"	return pData + make_uint4( rank, rank, rank, rank );\n"
+	"}\n"
+	"u32 unpack4Key( u32 key, int keyIdx ){ return (key>>(keyIdx*8)) & 0xff;}\n"
+	"u32 bit8Scan(u32 v)\n"
+	"{\n"
+	"	return (v<<8) + (v<<16) + (v<<24);\n"
+	"}\n"
+	"//===\n"
+	"#define MY_HISTOGRAM(idx) localHistogramMat[(idx)*WG_SIZE+lIdx]\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void StreamCountKernel( __global u32* gSrc, __global u32* histogramOut, int4 cb )\n"
+	"{\n"
+	"	__local u32 localHistogramMat[NUM_BUCKET*WG_SIZE];\n"
+	"	u32 gIdx = GET_GLOBAL_IDX;\n"
+	"	u32 lIdx = GET_LOCAL_IDX;\n"
+	"	u32 wgIdx = GET_GROUP_IDX;\n"
+	"	u32 wgSize = GET_GROUP_SIZE;\n"
+	"	const int startBit = cb.m_startBit;\n"
+	"	const int n = cb.m_n;\n"
+	"	const int nWGs = cb.m_nWGs;\n"
+	"	const int nBlocksPerWG = cb.m_nBlocksPerWG;\n"
+	"	for(int i=0; i<NUM_BUCKET; i++)\n"
+	"	{\n"
+	"		MY_HISTOGRAM(i) = 0;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;\n"
+	"	u32 localKey;\n"
+	"	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;\n"
+	"	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;\n"
+	"	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)\n"
+	"	{\n"
+	"		//	MY_HISTOGRAM( localKeys.x ) ++ is much expensive than atomic add as it requires read and write while atomics can just add on AMD\n"
+	"		//	Using registers didn't perform well. It seems like use localKeys to address requires a lot of alu ops\n"
+	"		//	AMD: AtomInc performs better while NV prefers ++\n"
+	"		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"		{\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"			if( addr+i < n )\n"
+	"#endif\n"
+	"			{\n"
+	"				localKey = (gSrc[addr+i]>>startBit) & 0xf;\n"
+	"#if defined(NV_GPU)\n"
+	"				MY_HISTOGRAM( localKey )++;\n"
+	"#else\n"
+	"				AtomInc( MY_HISTOGRAM( localKey ) );\n"
+	"#endif\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	\n"
+	"	if( lIdx < NUM_BUCKET )\n"
+	"	{\n"
+	"		u32 sum = 0;\n"
+	"		for(int i=0; i<GET_GROUP_SIZE; i++)\n"
+	"		{\n"
+	"			sum += localHistogramMat[lIdx*WG_SIZE+(i+lIdx)%GET_GROUP_SIZE];\n"
+	"		}\n"
+	"		histogramOut[lIdx*nWGs+wgIdx] = sum;\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void StreamCountSortDataKernel( __global SortDataCL* gSrc, __global u32* histogramOut, int4  cb )\n"
+	"{\n"
+	"	__local u32 localHistogramMat[NUM_BUCKET*WG_SIZE];\n"
+	"	u32 gIdx = GET_GLOBAL_IDX;\n"
+	"	u32 lIdx = GET_LOCAL_IDX;\n"
+	"	u32 wgIdx = GET_GROUP_IDX;\n"
+	"	u32 wgSize = GET_GROUP_SIZE;\n"
+	"	const int startBit = cb.m_startBit;\n"
+	"	const int n = cb.m_n;\n"
+	"	const int nWGs = cb.m_nWGs;\n"
+	"	const int nBlocksPerWG = cb.m_nBlocksPerWG;\n"
+	"	for(int i=0; i<NUM_BUCKET; i++)\n"
+	"	{\n"
+	"		MY_HISTOGRAM(i) = 0;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;\n"
+	"	u32 localKey;\n"
+	"	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;\n"
+	"	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;\n"
+	"	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)\n"
+	"	{\n"
+	"		//	MY_HISTOGRAM( localKeys.x ) ++ is much expensive than atomic add as it requires read and write while atomics can just add on AMD\n"
+	"		//	Using registers didn't perform well. It seems like use localKeys to address requires a lot of alu ops\n"
+	"		//	AMD: AtomInc performs better while NV prefers ++\n"
+	"		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"		{\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"			if( addr+i < n )\n"
+	"#endif\n"
+	"			{\n"
+	"				localKey = (gSrc[addr+i].m_key>>startBit) & 0xf;\n"
+	"#if defined(NV_GPU)\n"
+	"				MY_HISTOGRAM( localKey )++;\n"
+	"#else\n"
+	"				AtomInc( MY_HISTOGRAM( localKey ) );\n"
+	"#endif\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	\n"
+	"	if( lIdx < NUM_BUCKET )\n"
+	"	{\n"
+	"		u32 sum = 0;\n"
+	"		for(int i=0; i<GET_GROUP_SIZE; i++)\n"
+	"		{\n"
+	"			sum += localHistogramMat[lIdx*WG_SIZE+(i+lIdx)%GET_GROUP_SIZE];\n"
+	"		}\n"
+	"		histogramOut[lIdx*nWGs+wgIdx] = sum;\n"
+	"	}\n"
+	"}\n"
+	"#define nPerLane (nPerWI/4)\n"
+	"//	NUM_BUCKET*nWGs < 128*nPerWI\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(128,1,1)))\n"
+	"void PrefixScanKernel( __global u32* wHistogram1, int4  cb )\n"
+	"{\n"
+	"	__local u32 ldsTopScanData[128*2];\n"
+	"	u32 lIdx = GET_LOCAL_IDX;\n"
+	"	u32 wgIdx = GET_GROUP_IDX;\n"
+	"	const int nWGs = cb.m_nWGs;\n"
+	"	u32 data[nPerWI];\n"
+	"	for(int i=0; i<nPerWI; i++)\n"
+	"	{\n"
+	"		data[i] = 0;\n"
+	"		if( (nPerWI*lIdx+i) < NUM_BUCKET*nWGs )\n"
+	"			data[i] = wHistogram1[nPerWI*lIdx+i];\n"
+	"	}\n"
+	"	uint4 myData = make_uint4(0,0,0,0);\n"
+	"	for(int i=0; i<nPerLane; i++)\n"
+	"	{\n"
+	"		myData.x += data[nPerLane*0+i];\n"
+	"		myData.y += data[nPerLane*1+i];\n"
+	"		myData.z += data[nPerLane*2+i];\n"
+	"		myData.w += data[nPerLane*3+i];\n"
+	"	}\n"
+	"	uint totalSum;\n"
+	"	uint4 scanned = localPrefixSum128V( myData, lIdx, &totalSum, ldsTopScanData );\n"
+	"//	for(int j=0; j<4; j++) //	somehow it introduces a lot of branches\n"
+	"	{	int j = 0;\n"
+	"		u32 sum = 0;\n"
+	"		for(int i=0; i<nPerLane; i++)\n"
+	"		{\n"
+	"			u32 tmp = data[nPerLane*j+i];\n"
+	"			data[nPerLane*j+i] = sum;\n"
+	"			sum += tmp;\n"
+	"		}\n"
+	"	}\n"
+	"	{	int j = 1;\n"
+	"		u32 sum = 0;\n"
+	"		for(int i=0; i<nPerLane; i++)\n"
+	"		{\n"
+	"			u32 tmp = data[nPerLane*j+i];\n"
+	"			data[nPerLane*j+i] = sum;\n"
+	"			sum += tmp;\n"
+	"		}\n"
+	"	}\n"
+	"	{	int j = 2;\n"
+	"		u32 sum = 0;\n"
+	"		for(int i=0; i<nPerLane; i++)\n"
+	"		{\n"
+	"			u32 tmp = data[nPerLane*j+i];\n"
+	"			data[nPerLane*j+i] = sum;\n"
+	"			sum += tmp;\n"
+	"		}\n"
+	"	}\n"
+	"	{	int j = 3;\n"
+	"		u32 sum = 0;\n"
+	"		for(int i=0; i<nPerLane; i++)\n"
+	"		{\n"
+	"			u32 tmp = data[nPerLane*j+i];\n"
+	"			data[nPerLane*j+i] = sum;\n"
+	"			sum += tmp;\n"
+	"		}\n"
+	"	}\n"
+	"	for(int i=0; i<nPerLane; i++)\n"
+	"	{\n"
+	"		data[nPerLane*0+i] += scanned.x;\n"
+	"		data[nPerLane*1+i] += scanned.y;\n"
+	"		data[nPerLane*2+i] += scanned.z;\n"
+	"		data[nPerLane*3+i] += scanned.w;\n"
+	"	}\n"
+	"	for(int i=0; i<nPerWI; i++)\n"
+	"	{\n"
+	"		int index = nPerWI*lIdx+i;\n"
+	"		if (index < NUM_BUCKET*nWGs)\n"
+	"			wHistogram1[nPerWI*lIdx+i] = data[i];\n"
+	"	}\n"
+	"}\n"
+	"//	4 scan, 4 exchange\n"
+	"void sort4Bits(u32 sortData[4], int startBit, int lIdx, __local u32* ldsSortData)\n"
+	"{\n"
+	"	for(int bitIdx=0; bitIdx<BITS_PER_PASS; bitIdx++)\n"
+	"	{\n"
+	"		u32 mask = (1<<bitIdx);\n"
+	"		uint4 cmpResult = make_uint4( (sortData[0]>>startBit) & mask, (sortData[1]>>startBit) & mask, (sortData[2]>>startBit) & mask, (sortData[3]>>startBit) & mask );\n"
+	"		uint4 prefixSum = SELECT_UINT4( make_uint4(1,1,1,1), make_uint4(0,0,0,0), cmpResult != make_uint4(0,0,0,0) );\n"
+	"		u32 total;\n"
+	"		prefixSum = localPrefixSum64V( prefixSum, lIdx, &total, ldsSortData );\n"
+	"		{\n"
+	"			uint4 localAddr = make_uint4(lIdx*4+0,lIdx*4+1,lIdx*4+2,lIdx*4+3);\n"
+	"			uint4 dstAddr = localAddr - prefixSum + make_uint4( total, total, total, total );\n"
+	"			dstAddr = SELECT_UINT4( prefixSum, dstAddr, cmpResult != make_uint4(0, 0, 0, 0) );\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			ldsSortData[dstAddr.x] = sortData[0];\n"
+	"			ldsSortData[dstAddr.y] = sortData[1];\n"
+	"			ldsSortData[dstAddr.z] = sortData[2];\n"
+	"			ldsSortData[dstAddr.w] = sortData[3];\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			sortData[0] = ldsSortData[localAddr.x];\n"
+	"			sortData[1] = ldsSortData[localAddr.y];\n"
+	"			sortData[2] = ldsSortData[localAddr.z];\n"
+	"			sortData[3] = ldsSortData[localAddr.w];\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"//	2 scan, 2 exchange\n"
+	"void sort4Bits1(u32 sortData[4], int startBit, int lIdx, __local u32* ldsSortData)\n"
+	"{\n"
+	"	for(uint ibit=0; ibit<BITS_PER_PASS; ibit+=2)\n"
+	"	{\n"
+	"		uint4 b = make_uint4((sortData[0]>>(startBit+ibit)) & 0x3, \n"
+	"			(sortData[1]>>(startBit+ibit)) & 0x3, \n"
+	"			(sortData[2]>>(startBit+ibit)) & 0x3, \n"
+	"			(sortData[3]>>(startBit+ibit)) & 0x3);\n"
+	"		u32 key4;\n"
+	"		u32 sKeyPacked[4] = { 0, 0, 0, 0 };\n"
+	"		{\n"
+	"			sKeyPacked[0] |= 1<<(8*b.x);\n"
+	"			sKeyPacked[1] |= 1<<(8*b.y);\n"
+	"			sKeyPacked[2] |= 1<<(8*b.z);\n"
+	"			sKeyPacked[3] |= 1<<(8*b.w);\n"
+	"			key4 = sKeyPacked[0] + sKeyPacked[1] + sKeyPacked[2] + sKeyPacked[3];\n"
+	"		}\n"
+	"		u32 rankPacked;\n"
+	"		u32 sumPacked;\n"
+	"		{\n"
+	"			rankPacked = localPrefixSum( key4, lIdx, &sumPacked, ldsSortData, WG_SIZE );\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		u32 newOffset[4] = { 0,0,0,0 };\n"
+	"		{\n"
+	"			u32 sumScanned = bit8Scan( sumPacked );\n"
+	"			u32 scannedKeys[4];\n"
+	"			scannedKeys[0] = 1<<(8*b.x);\n"
+	"			scannedKeys[1] = 1<<(8*b.y);\n"
+	"			scannedKeys[2] = 1<<(8*b.z);\n"
+	"			scannedKeys[3] = 1<<(8*b.w);\n"
+	"			{	//	4 scans at once\n"
+	"				u32 sum4 = 0;\n"
+	"				for(int ie=0; ie<4; ie++)\n"
+	"				{\n"
+	"					u32 tmp = scannedKeys[ie];\n"
+	"					scannedKeys[ie] = sum4;\n"
+	"					sum4 += tmp;\n"
+	"				}\n"
+	"			}\n"
+	"			{\n"
+	"				u32 sumPlusRank = sumScanned + rankPacked;\n"
+	"				{	u32 ie = b.x;\n"
+	"					scannedKeys[0] += sumPlusRank;\n"
+	"					newOffset[0] = unpack4Key( scannedKeys[0], ie );\n"
+	"				}\n"
+	"				{	u32 ie = b.y;\n"
+	"					scannedKeys[1] += sumPlusRank;\n"
+	"					newOffset[1] = unpack4Key( scannedKeys[1], ie );\n"
+	"				}\n"
+	"				{	u32 ie = b.z;\n"
+	"					scannedKeys[2] += sumPlusRank;\n"
+	"					newOffset[2] = unpack4Key( scannedKeys[2], ie );\n"
+	"				}\n"
+	"				{	u32 ie = b.w;\n"
+	"					scannedKeys[3] += sumPlusRank;\n"
+	"					newOffset[3] = unpack4Key( scannedKeys[3], ie );\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		{\n"
+	"			ldsSortData[newOffset[0]] = sortData[0];\n"
+	"			ldsSortData[newOffset[1]] = sortData[1];\n"
+	"			ldsSortData[newOffset[2]] = sortData[2];\n"
+	"			ldsSortData[newOffset[3]] = sortData[3];\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			u32 dstAddr = 4*lIdx;\n"
+	"			sortData[0] = ldsSortData[dstAddr+0];\n"
+	"			sortData[1] = ldsSortData[dstAddr+1];\n"
+	"			sortData[2] = ldsSortData[dstAddr+2];\n"
+	"			sortData[3] = ldsSortData[dstAddr+3];\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"#define SET_HISTOGRAM(setIdx, key) ldsSortData[(setIdx)*NUM_BUCKET+key]\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SortAndScatterKernel( __global const u32* restrict gSrc, __global const u32* rHistogram, __global u32* restrict gDst, int4  cb )\n"
+	"{\n"
+	"	__local u32 ldsSortData[WG_SIZE*ELEMENTS_PER_WORK_ITEM+16];\n"
+	"	__local u32 localHistogramToCarry[NUM_BUCKET];\n"
+	"	__local u32 localHistogram[NUM_BUCKET*2];\n"
+	"	u32 gIdx = GET_GLOBAL_IDX;\n"
+	"	u32 lIdx = GET_LOCAL_IDX;\n"
+	"	u32 wgIdx = GET_GROUP_IDX;\n"
+	"	u32 wgSize = GET_GROUP_SIZE;\n"
+	"	const int n = cb.m_n;\n"
+	"	const int nWGs = cb.m_nWGs;\n"
+	"	const int startBit = cb.m_startBit;\n"
+	"	const int nBlocksPerWG = cb.m_nBlocksPerWG;\n"
+	"	if( lIdx < (NUM_BUCKET) )\n"
+	"	{\n"
+	"		localHistogramToCarry[lIdx] = rHistogram[lIdx*nWGs + wgIdx];\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;\n"
+	"	int nBlocks = n/blockSize - nBlocksPerWG*wgIdx;\n"
+	"	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;\n"
+	"	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)\n"
+	"	{\n"
+	"		u32 myHistogram = 0;\n"
+	"		u32 sortData[ELEMENTS_PER_WORK_ITEM];\n"
+	"		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"			sortData[i] = ( addr+i < n )? gSrc[ addr+i ] : 0xffffffff;\n"
+	"#else\n"
+	"			sortData[i] = gSrc[ addr+i ];\n"
+	"#endif\n"
+	"		sort4Bits(sortData, startBit, lIdx, ldsSortData);\n"
+	"		u32 keys[ELEMENTS_PER_WORK_ITEM];\n"
+	"		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"			keys[i] = (sortData[i]>>startBit) & 0xf;\n"
+	"		{	//	create histogram\n"
+	"			u32 setIdx = lIdx/16;\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				localHistogram[lIdx] = 0;\n"
+	"			}\n"
+	"			ldsSortData[lIdx] = 0;\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"				if( addr+i < n )\n"
+	"#endif\n"
+	"#if defined(NV_GPU)\n"
+	"				SET_HISTOGRAM( setIdx, keys[i] )++;\n"
+	"#else\n"
+	"				AtomInc( SET_HISTOGRAM( setIdx, keys[i] ) );\n"
+	"#endif\n"
+	"			\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			\n"
+	"			uint hIdx = NUM_BUCKET+lIdx;\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				u32 sum = 0;\n"
+	"				for(int i=0; i<WG_SIZE/16; i++)\n"
+	"				{\n"
+	"					sum += SET_HISTOGRAM( i, lIdx );\n"
+	"				}\n"
+	"				myHistogram = sum;\n"
+	"				localHistogram[hIdx] = sum;\n"
+	"			}\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"#if defined(USE_2LEVEL_REDUCE)\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				localHistogram[hIdx] = localHistogram[hIdx-1];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				u32 u0, u1, u2;\n"
+	"				u0 = localHistogram[hIdx-3];\n"
+	"				u1 = localHistogram[hIdx-2];\n"
+	"				u2 = localHistogram[hIdx-1];\n"
+	"				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				u0 = localHistogram[hIdx-12];\n"
+	"				u1 = localHistogram[hIdx-8];\n"
+	"				u2 = localHistogram[hIdx-4];\n"
+	"				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );\n"
+	"				GROUP_MEM_FENCE;\n"
+	"			}\n"
+	"#else\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				localHistogram[hIdx] = localHistogram[hIdx-1];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-1];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-2];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-4];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-8];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"			}\n"
+	"#endif\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"		}\n"
+	"		{\n"
+	"			for(int ie=0; ie<ELEMENTS_PER_WORK_ITEM; ie++)\n"
+	"			{\n"
+	"				int dataIdx = ELEMENTS_PER_WORK_ITEM*lIdx+ie;\n"
+	"				int binIdx = keys[ie];\n"
+	"				int groupOffset = localHistogramToCarry[binIdx];\n"
+	"				int myIdx = dataIdx - localHistogram[NUM_BUCKET+binIdx];\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"				if( addr+ie < n )\n"
+	"#endif\n"
+	"				gDst[ groupOffset + myIdx ] = sortData[ie];\n"
+	"			}\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		if( lIdx < NUM_BUCKET )\n"
+	"		{\n"
+	"			localHistogramToCarry[lIdx] += myHistogram;\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"	}\n"
+	"}\n"
+	"//	2 scan, 2 exchange\n"
+	"void sort4Bits1KeyValue(u32 sortData[4], int sortVal[4], int startBit, int lIdx, __local u32* ldsSortData, __local int *ldsSortVal)\n"
+	"{\n"
+	"	for(uint ibit=0; ibit<BITS_PER_PASS; ibit+=2)\n"
+	"	{\n"
+	"		uint4 b = make_uint4((sortData[0]>>(startBit+ibit)) & 0x3, \n"
+	"			(sortData[1]>>(startBit+ibit)) & 0x3, \n"
+	"			(sortData[2]>>(startBit+ibit)) & 0x3, \n"
+	"			(sortData[3]>>(startBit+ibit)) & 0x3);\n"
+	"		u32 key4;\n"
+	"		u32 sKeyPacked[4] = { 0, 0, 0, 0 };\n"
+	"		{\n"
+	"			sKeyPacked[0] |= 1<<(8*b.x);\n"
+	"			sKeyPacked[1] |= 1<<(8*b.y);\n"
+	"			sKeyPacked[2] |= 1<<(8*b.z);\n"
+	"			sKeyPacked[3] |= 1<<(8*b.w);\n"
+	"			key4 = sKeyPacked[0] + sKeyPacked[1] + sKeyPacked[2] + sKeyPacked[3];\n"
+	"		}\n"
+	"		u32 rankPacked;\n"
+	"		u32 sumPacked;\n"
+	"		{\n"
+	"			rankPacked = localPrefixSum( key4, lIdx, &sumPacked, ldsSortData, WG_SIZE );\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		u32 newOffset[4] = { 0,0,0,0 };\n"
+	"		{\n"
+	"			u32 sumScanned = bit8Scan( sumPacked );\n"
+	"			u32 scannedKeys[4];\n"
+	"			scannedKeys[0] = 1<<(8*b.x);\n"
+	"			scannedKeys[1] = 1<<(8*b.y);\n"
+	"			scannedKeys[2] = 1<<(8*b.z);\n"
+	"			scannedKeys[3] = 1<<(8*b.w);\n"
+	"			{	//	4 scans at once\n"
+	"				u32 sum4 = 0;\n"
+	"				for(int ie=0; ie<4; ie++)\n"
+	"				{\n"
+	"					u32 tmp = scannedKeys[ie];\n"
+	"					scannedKeys[ie] = sum4;\n"
+	"					sum4 += tmp;\n"
+	"				}\n"
+	"			}\n"
+	"			{\n"
+	"				u32 sumPlusRank = sumScanned + rankPacked;\n"
+	"				{	u32 ie = b.x;\n"
+	"					scannedKeys[0] += sumPlusRank;\n"
+	"					newOffset[0] = unpack4Key( scannedKeys[0], ie );\n"
+	"				}\n"
+	"				{	u32 ie = b.y;\n"
+	"					scannedKeys[1] += sumPlusRank;\n"
+	"					newOffset[1] = unpack4Key( scannedKeys[1], ie );\n"
+	"				}\n"
+	"				{	u32 ie = b.z;\n"
+	"					scannedKeys[2] += sumPlusRank;\n"
+	"					newOffset[2] = unpack4Key( scannedKeys[2], ie );\n"
+	"				}\n"
+	"				{	u32 ie = b.w;\n"
+	"					scannedKeys[3] += sumPlusRank;\n"
+	"					newOffset[3] = unpack4Key( scannedKeys[3], ie );\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		{\n"
+	"			ldsSortData[newOffset[0]] = sortData[0];\n"
+	"			ldsSortData[newOffset[1]] = sortData[1];\n"
+	"			ldsSortData[newOffset[2]] = sortData[2];\n"
+	"			ldsSortData[newOffset[3]] = sortData[3];\n"
+	"			ldsSortVal[newOffset[0]] = sortVal[0];\n"
+	"			ldsSortVal[newOffset[1]] = sortVal[1];\n"
+	"			ldsSortVal[newOffset[2]] = sortVal[2];\n"
+	"			ldsSortVal[newOffset[3]] = sortVal[3];\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			u32 dstAddr = 4*lIdx;\n"
+	"			sortData[0] = ldsSortData[dstAddr+0];\n"
+	"			sortData[1] = ldsSortData[dstAddr+1];\n"
+	"			sortData[2] = ldsSortData[dstAddr+2];\n"
+	"			sortData[3] = ldsSortData[dstAddr+3];\n"
+	"			sortVal[0] = ldsSortVal[dstAddr+0];\n"
+	"			sortVal[1] = ldsSortVal[dstAddr+1];\n"
+	"			sortVal[2] = ldsSortVal[dstAddr+2];\n"
+	"			sortVal[3] = ldsSortVal[dstAddr+3];\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SortAndScatterSortDataKernel( __global const SortDataCL* restrict gSrc, __global const u32* rHistogram, __global SortDataCL* restrict gDst, int4 cb)\n"
+	"{\n"
+	"	__local int ldsSortData[WG_SIZE*ELEMENTS_PER_WORK_ITEM+16];\n"
+	"	__local int ldsSortVal[WG_SIZE*ELEMENTS_PER_WORK_ITEM+16];\n"
+	"	__local u32 localHistogramToCarry[NUM_BUCKET];\n"
+	"	__local u32 localHistogram[NUM_BUCKET*2];\n"
+	"	u32 gIdx = GET_GLOBAL_IDX;\n"
+	"	u32 lIdx = GET_LOCAL_IDX;\n"
+	"	u32 wgIdx = GET_GROUP_IDX;\n"
+	"	u32 wgSize = GET_GROUP_SIZE;\n"
+	"	const int n = cb.m_n;\n"
+	"	const int nWGs = cb.m_nWGs;\n"
+	"	const int startBit = cb.m_startBit;\n"
+	"	const int nBlocksPerWG = cb.m_nBlocksPerWG;\n"
+	"	if( lIdx < (NUM_BUCKET) )\n"
+	"	{\n"
+	"		localHistogramToCarry[lIdx] = rHistogram[lIdx*nWGs + wgIdx];\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"    \n"
+	"	const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;\n"
+	"	int nBlocks = n/blockSize - nBlocksPerWG*wgIdx;\n"
+	"	int addr = blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;\n"
+	"	for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++, addr+=blockSize)\n"
+	"	{\n"
+	"		u32 myHistogram = 0;\n"
+	"		int sortData[ELEMENTS_PER_WORK_ITEM];\n"
+	"		int sortVal[ELEMENTS_PER_WORK_ITEM];\n"
+	"		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"		{\n"
+	"			sortData[i] = ( addr+i < n )? gSrc[ addr+i ].m_key : 0xffffffff;\n"
+	"			sortVal[i] = ( addr+i < n )? gSrc[ addr+i ].m_value : 0xffffffff;\n"
+	"		}\n"
+	"#else\n"
+	"		{\n"
+	"			sortData[i] = gSrc[ addr+i ].m_key;\n"
+	"			sortVal[i] = gSrc[ addr+i ].m_value;\n"
+	"		}\n"
+	"#endif\n"
+	"		sort4Bits1KeyValue(sortData, sortVal, startBit, lIdx, ldsSortData, ldsSortVal);\n"
+	"		u32 keys[ELEMENTS_PER_WORK_ITEM];\n"
+	"		for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"			keys[i] = (sortData[i]>>startBit) & 0xf;\n"
+	"		{	//	create histogram\n"
+	"			u32 setIdx = lIdx/16;\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				localHistogram[lIdx] = 0;\n"
+	"			}\n"
+	"			ldsSortData[lIdx] = 0;\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			for(int i=0; i<ELEMENTS_PER_WORK_ITEM; i++)\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"				if( addr+i < n )\n"
+	"#endif\n"
+	"#if defined(NV_GPU)\n"
+	"				SET_HISTOGRAM( setIdx, keys[i] )++;\n"
+	"#else\n"
+	"				AtomInc( SET_HISTOGRAM( setIdx, keys[i] ) );\n"
+	"#endif\n"
+	"			\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			\n"
+	"			uint hIdx = NUM_BUCKET+lIdx;\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				u32 sum = 0;\n"
+	"				for(int i=0; i<WG_SIZE/16; i++)\n"
+	"				{\n"
+	"					sum += SET_HISTOGRAM( i, lIdx );\n"
+	"				}\n"
+	"				myHistogram = sum;\n"
+	"				localHistogram[hIdx] = sum;\n"
+	"			}\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"#if defined(USE_2LEVEL_REDUCE)\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				localHistogram[hIdx] = localHistogram[hIdx-1];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				u32 u0, u1, u2;\n"
+	"				u0 = localHistogram[hIdx-3];\n"
+	"				u1 = localHistogram[hIdx-2];\n"
+	"				u2 = localHistogram[hIdx-1];\n"
+	"				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				u0 = localHistogram[hIdx-12];\n"
+	"				u1 = localHistogram[hIdx-8];\n"
+	"				u2 = localHistogram[hIdx-4];\n"
+	"				AtomAdd( localHistogram[hIdx], u0 + u1 + u2 );\n"
+	"				GROUP_MEM_FENCE;\n"
+	"			}\n"
+	"#else\n"
+	"			if( lIdx < NUM_BUCKET )\n"
+	"			{\n"
+	"				localHistogram[hIdx] = localHistogram[hIdx-1];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-1];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-2];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-4];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"				localHistogram[hIdx] += localHistogram[hIdx-8];\n"
+	"				GROUP_MEM_FENCE;\n"
+	"			}\n"
+	"#endif\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"		}\n"
+	"    	{\n"
+	"			for(int ie=0; ie<ELEMENTS_PER_WORK_ITEM; ie++)\n"
+	"			{\n"
+	"				int dataIdx = ELEMENTS_PER_WORK_ITEM*lIdx+ie;\n"
+	"				int binIdx = keys[ie];\n"
+	"				int groupOffset = localHistogramToCarry[binIdx];\n"
+	"				int myIdx = dataIdx - localHistogram[NUM_BUCKET+binIdx];\n"
+	"#if defined(CHECK_BOUNDARY)\n"
+	"				if( addr+ie < n )\n"
+	"				{\n"
+	"                    if ((groupOffset + myIdx)<n)\n"
+	"                    {\n"
+	"                        if (sortData[ie]==sortVal[ie])\n"
+	"                        {\n"
+	"                            \n"
+	"                            SortDataCL tmp;\n"
+	"                            tmp.m_key = sortData[ie];\n"
+	"                            tmp.m_value = sortVal[ie];\n"
+	"                            if (tmp.m_key == tmp.m_value)\n"
+	"                                gDst[groupOffset + myIdx ] = tmp;\n"
+	"                        }\n"
+	"                        \n"
+	"                    }\n"
+	"				}\n"
+	"#else\n"
+	"                if ((groupOffset + myIdx)<n)\n"
+	"                {\n"
+	"                    gDst[ groupOffset + myIdx ].m_key = sortData[ie];\n"
+	"                    gDst[ groupOffset + myIdx ].m_value = sortVal[ie];\n"
+	"                }\n"
+	"#endif\n"
+	"			}\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		if( lIdx < NUM_BUCKET )\n"
+	"		{\n"
+	"			localHistogramToCarry[lIdx] += myHistogram;\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SortAndScatterSortDataKernelSerial( __global const SortDataCL* restrict gSrc, __global const u32* rHistogram, __global SortDataCL* restrict gDst, int4 cb)\n"
+	"{\n"
+	"    \n"
+	"	u32 gIdx = GET_GLOBAL_IDX;\n"
+	"	u32 realLocalIdx = GET_LOCAL_IDX;\n"
+	"	u32 wgIdx = GET_GROUP_IDX;\n"
+	"	u32 wgSize = GET_GROUP_SIZE;\n"
+	"	const int startBit = cb.m_startBit;\n"
+	"	const int n = cb.m_n;\n"
+	"	const int nWGs = cb.m_nWGs;\n"
+	"	const int nBlocksPerWG = cb.m_nBlocksPerWG;\n"
+	"    int counter[NUM_BUCKET];\n"
+	"    \n"
+	"    if (realLocalIdx>0)\n"
+	"        return;\n"
+	"    \n"
+	"    for (int c=0;c<NUM_BUCKET;c++)\n"
+	"        counter[c]=0;\n"
+	"    const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;\n"
+	"	\n"
+	"	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;\n"
+	"   for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++)\n"
+	"  {\n"
+	"     for (int lIdx=0;lIdx<WG_SIZE;lIdx++)\n"
+	" 	{\n"
+	"        int addr2 = iblock*blockSize + blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;\n"
+	"        \n"
+	"		for(int j=0; j<ELEMENTS_PER_WORK_ITEM; j++)\n"
+	"		{\n"
+	"            int i = addr2+j;\n"
+	"			if( i < n )\n"
+	"			{\n"
+	"                int tableIdx;\n"
+	"				tableIdx = (gSrc[i].m_key>>startBit) & 0xf;//0xf = NUM_TABLES-1\n"
+	"                gDst[rHistogram[tableIdx*nWGs+wgIdx] + counter[tableIdx]] = gSrc[i];\n"
+	"                counter[tableIdx] ++;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"  }\n"
+	"    \n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SortAndScatterKernelSerial( __global const u32* restrict gSrc, __global const u32* rHistogram, __global u32* restrict gDst, int4  cb )\n"
+	"{\n"
+	"    \n"
+	"	u32 gIdx = GET_GLOBAL_IDX;\n"
+	"	u32 realLocalIdx = GET_LOCAL_IDX;\n"
+	"	u32 wgIdx = GET_GROUP_IDX;\n"
+	"	u32 wgSize = GET_GROUP_SIZE;\n"
+	"	const int startBit = cb.m_startBit;\n"
+	"	const int n = cb.m_n;\n"
+	"	const int nWGs = cb.m_nWGs;\n"
+	"	const int nBlocksPerWG = cb.m_nBlocksPerWG;\n"
+	"    int counter[NUM_BUCKET];\n"
+	"    \n"
+	"    if (realLocalIdx>0)\n"
+	"        return;\n"
+	"    \n"
+	"    for (int c=0;c<NUM_BUCKET;c++)\n"
+	"        counter[c]=0;\n"
+	"    const int blockSize = ELEMENTS_PER_WORK_ITEM*WG_SIZE;\n"
+	"	\n"
+	"	int nBlocks = (n)/blockSize - nBlocksPerWG*wgIdx;\n"
+	"   for(int iblock=0; iblock<min(nBlocksPerWG, nBlocks); iblock++)\n"
+	"  {\n"
+	"     for (int lIdx=0;lIdx<WG_SIZE;lIdx++)\n"
+	" 	{\n"
+	"        int addr2 = iblock*blockSize + blockSize*nBlocksPerWG*wgIdx + ELEMENTS_PER_WORK_ITEM*lIdx;\n"
+	"        \n"
+	"		for(int j=0; j<ELEMENTS_PER_WORK_ITEM; j++)\n"
+	"		{\n"
+	"            int i = addr2+j;\n"
+	"			if( i < n )\n"
+	"			{\n"
+	"                int tableIdx;\n"
+	"				tableIdx = (gSrc[i]>>startBit) & 0xf;//0xf = NUM_TABLES-1\n"
+	"                gDst[rHistogram[tableIdx*nWGs+wgIdx] + counter[tableIdx]] = gSrc[i];\n"
+	"                counter[tableIdx] ++;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"  }\n"
+	"    \n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.cpp
new file mode 100644
index 0000000..6571f30
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.cpp
@@ -0,0 +1,374 @@
+
+#include "b3GpuRaycast.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3OpenCL/RigidBody/b3GpuNarrowPhaseInternalData.h"
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3FillCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h"
+#include "Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h"
+#include "Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h"
+
+#include "Bullet3OpenCL/Raycast/kernels/rayCastKernels.h"
+
+#define B3_RAYCAST_PATH "src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl"
+
+struct b3GpuRaycastInternalData
+{
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_q;
+	cl_kernel m_raytraceKernel;
+	cl_kernel m_raytracePairsKernel;
+	cl_kernel m_findRayRigidPairIndexRanges;
+
+	b3GpuParallelLinearBvh* m_plbvh;
+	b3RadixSort32CL* m_radixSorter;
+	b3FillCL* m_fill;
+
+	//1 element per ray
+	b3OpenCLArray<b3RayInfo>* m_gpuRays;
+	b3OpenCLArray<b3RayHit>* m_gpuHitResults;
+	b3OpenCLArray<int>* m_firstRayRigidPairIndexPerRay;
+	b3OpenCLArray<int>* m_numRayRigidPairsPerRay;
+
+	//1 element per (ray index, rigid index) pair, where the ray intersects with the rigid's AABB
+	b3OpenCLArray<int>* m_gpuNumRayRigidPairs;
+	b3OpenCLArray<b3Int2>* m_gpuRayRigidPairs;  //x == ray index, y == rigid index
+
+	int m_test;
+};
+
+b3GpuRaycast::b3GpuRaycast(cl_context ctx, cl_device_id device, cl_command_queue q)
+{
+	m_data = new b3GpuRaycastInternalData;
+	m_data->m_context = ctx;
+	m_data->m_device = device;
+	m_data->m_q = q;
+	m_data->m_raytraceKernel = 0;
+	m_data->m_raytracePairsKernel = 0;
+	m_data->m_findRayRigidPairIndexRanges = 0;
+
+	m_data->m_plbvh = new b3GpuParallelLinearBvh(ctx, device, q);
+	m_data->m_radixSorter = new b3RadixSort32CL(ctx, device, q);
+	m_data->m_fill = new b3FillCL(ctx, device, q);
+
+	m_data->m_gpuRays = new b3OpenCLArray<b3RayInfo>(ctx, q);
+	m_data->m_gpuHitResults = new b3OpenCLArray<b3RayHit>(ctx, q);
+	m_data->m_firstRayRigidPairIndexPerRay = new b3OpenCLArray<int>(ctx, q);
+	m_data->m_numRayRigidPairsPerRay = new b3OpenCLArray<int>(ctx, q);
+	m_data->m_gpuNumRayRigidPairs = new b3OpenCLArray<int>(ctx, q);
+	m_data->m_gpuRayRigidPairs = new b3OpenCLArray<b3Int2>(ctx, q);
+
+	{
+		cl_int errNum = 0;
+		cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_data->m_context, m_data->m_device, rayCastKernelCL, &errNum, "", B3_RAYCAST_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+		m_data->m_raytraceKernel = b3OpenCLUtils::compileCLKernelFromString(m_data->m_context, m_data->m_device, rayCastKernelCL, "rayCastKernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_data->m_raytracePairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_data->m_context, m_data->m_device, rayCastKernelCL, "rayCastPairsKernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_data->m_findRayRigidPairIndexRanges = b3OpenCLUtils::compileCLKernelFromString(m_data->m_context, m_data->m_device, rayCastKernelCL, "findRayRigidPairIndexRanges", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		clReleaseProgram(prog);
+	}
+}
+
+b3GpuRaycast::~b3GpuRaycast()
+{
+	clReleaseKernel(m_data->m_raytraceKernel);
+	clReleaseKernel(m_data->m_raytracePairsKernel);
+	clReleaseKernel(m_data->m_findRayRigidPairIndexRanges);
+
+	delete m_data->m_plbvh;
+	delete m_data->m_radixSorter;
+	delete m_data->m_fill;
+
+	delete m_data->m_gpuRays;
+	delete m_data->m_gpuHitResults;
+	delete m_data->m_firstRayRigidPairIndexPerRay;
+	delete m_data->m_numRayRigidPairsPerRay;
+	delete m_data->m_gpuNumRayRigidPairs;
+	delete m_data->m_gpuRayRigidPairs;
+
+	delete m_data;
+}
+
+bool sphere_intersect(const b3Vector3& spherePos, b3Scalar radius, const b3Vector3& rayFrom, const b3Vector3& rayTo, float& hitFraction)
+{
+	b3Vector3 rs = rayFrom - spherePos;
+	b3Vector3 rayDir = rayTo - rayFrom;
+
+	float A = b3Dot(rayDir, rayDir);
+	float B = b3Dot(rs, rayDir);
+	float C = b3Dot(rs, rs) - (radius * radius);
+
+	float D = B * B - A * C;
+
+	if (D > 0.0)
+	{
+		float t = (-B - sqrt(D)) / A;
+
+		if ((t >= 0.0f) && (t < hitFraction))
+		{
+			hitFraction = t;
+			return true;
+		}
+	}
+	return false;
+}
+
+bool rayConvex(const b3Vector3& rayFromLocal, const b3Vector3& rayToLocal, const b3ConvexPolyhedronData& poly,
+			   const b3AlignedObjectArray<b3GpuFace>& faces, float& hitFraction, b3Vector3& hitNormal)
+{
+	float exitFraction = hitFraction;
+	float enterFraction = -0.1f;
+	b3Vector3 curHitNormal = b3MakeVector3(0, 0, 0);
+	for (int i = 0; i < poly.m_numFaces; i++)
+	{
+		const b3GpuFace& face = faces[poly.m_faceOffset + i];
+		float fromPlaneDist = b3Dot(rayFromLocal, face.m_plane) + face.m_plane.w;
+		float toPlaneDist = b3Dot(rayToLocal, face.m_plane) + face.m_plane.w;
+		if (fromPlaneDist < 0.f)
+		{
+			if (toPlaneDist >= 0.f)
+			{
+				float fraction = fromPlaneDist / (fromPlaneDist - toPlaneDist);
+				if (exitFraction > fraction)
+				{
+					exitFraction = fraction;
+				}
+			}
+		}
+		else
+		{
+			if (toPlaneDist < 0.f)
+			{
+				float fraction = fromPlaneDist / (fromPlaneDist - toPlaneDist);
+				if (enterFraction <= fraction)
+				{
+					enterFraction = fraction;
+					curHitNormal = face.m_plane;
+					curHitNormal.w = 0.f;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+		if (exitFraction <= enterFraction)
+			return false;
+	}
+
+	if (enterFraction < 0.f)
+		return false;
+
+	hitFraction = enterFraction;
+	hitNormal = curHitNormal;
+	return true;
+}
+
+void b3GpuRaycast::castRaysHost(const b3AlignedObjectArray<b3RayInfo>& rays, b3AlignedObjectArray<b3RayHit>& hitResults,
+								int numBodies, const struct b3RigidBodyData* bodies, int numCollidables, const struct b3Collidable* collidables, const struct b3GpuNarrowPhaseInternalData* narrowphaseData)
+{
+	//	return castRays(rays,hitResults,numBodies,bodies,numCollidables,collidables);
+
+	B3_PROFILE("castRaysHost");
+	for (int r = 0; r < rays.size(); r++)
+	{
+		b3Vector3 rayFrom = rays[r].m_from;
+		b3Vector3 rayTo = rays[r].m_to;
+		float hitFraction = hitResults[r].m_hitFraction;
+
+		int hitBodyIndex = -1;
+		b3Vector3 hitNormal;
+
+		for (int b = 0; b < numBodies; b++)
+		{
+			const b3Vector3& pos = bodies[b].m_pos;
+			//const b3Quaternion& orn = bodies[b].m_quat;
+
+			switch (collidables[bodies[b].m_collidableIdx].m_shapeType)
+			{
+				case SHAPE_SPHERE:
+				{
+					b3Scalar radius = collidables[bodies[b].m_collidableIdx].m_radius;
+					if (sphere_intersect(pos, radius, rayFrom, rayTo, hitFraction))
+					{
+						hitBodyIndex = b;
+						b3Vector3 hitPoint;
+						hitPoint.setInterpolate3(rays[r].m_from, rays[r].m_to, hitFraction);
+						hitNormal = (hitPoint - bodies[b].m_pos).normalize();
+					}
+				}
+				case SHAPE_CONVEX_HULL:
+				{
+					b3Transform convexWorldTransform;
+					convexWorldTransform.setIdentity();
+					convexWorldTransform.setOrigin(bodies[b].m_pos);
+					convexWorldTransform.setRotation(bodies[b].m_quat);
+					b3Transform convexWorld2Local = convexWorldTransform.inverse();
+
+					b3Vector3 rayFromLocal = convexWorld2Local(rayFrom);
+					b3Vector3 rayToLocal = convexWorld2Local(rayTo);
+
+					int shapeIndex = collidables[bodies[b].m_collidableIdx].m_shapeIndex;
+					const b3ConvexPolyhedronData& poly = narrowphaseData->m_convexPolyhedra[shapeIndex];
+					if (rayConvex(rayFromLocal, rayToLocal, poly, narrowphaseData->m_convexFaces, hitFraction, hitNormal))
+					{
+						hitBodyIndex = b;
+					}
+
+					break;
+				}
+				default:
+				{
+					static bool once = true;
+					if (once)
+					{
+						once = false;
+						b3Warning("Raytest: unsupported shape type\n");
+					}
+				}
+			}
+		}
+		if (hitBodyIndex >= 0)
+		{
+			hitResults[r].m_hitFraction = hitFraction;
+			hitResults[r].m_hitPoint.setInterpolate3(rays[r].m_from, rays[r].m_to, hitFraction);
+			hitResults[r].m_hitNormal = hitNormal;
+			hitResults[r].m_hitBody = hitBodyIndex;
+		}
+	}
+}
+///todo: add some acceleration structure (AABBs, tree etc)
+void b3GpuRaycast::castRays(const b3AlignedObjectArray<b3RayInfo>& rays, b3AlignedObjectArray<b3RayHit>& hitResults,
+							int numBodies, const struct b3RigidBodyData* bodies, int numCollidables, const struct b3Collidable* collidables,
+							const struct b3GpuNarrowPhaseInternalData* narrowphaseData, class b3GpuBroadphaseInterface* broadphase)
+{
+	//castRaysHost(rays,hitResults,numBodies,bodies,numCollidables,collidables,narrowphaseData);
+
+	B3_PROFILE("castRaysGPU");
+
+	{
+		B3_PROFILE("raycast copyFromHost");
+		m_data->m_gpuRays->copyFromHost(rays);
+		m_data->m_gpuHitResults->copyFromHost(hitResults);
+	}
+
+	int numRays = hitResults.size();
+	{
+		m_data->m_firstRayRigidPairIndexPerRay->resize(numRays);
+		m_data->m_numRayRigidPairsPerRay->resize(numRays);
+
+		m_data->m_gpuNumRayRigidPairs->resize(1);
+		m_data->m_gpuRayRigidPairs->resize(numRays * 16);
+	}
+
+	//run kernel
+	const bool USE_BRUTE_FORCE_RAYCAST = false;
+	if (USE_BRUTE_FORCE_RAYCAST)
+	{
+		B3_PROFILE("raycast launch1D");
+
+		b3LauncherCL launcher(m_data->m_q, m_data->m_raytraceKernel, "m_raytraceKernel");
+		int numRays = rays.size();
+		launcher.setConst(numRays);
+
+		launcher.setBuffer(m_data->m_gpuRays->getBufferCL());
+		launcher.setBuffer(m_data->m_gpuHitResults->getBufferCL());
+
+		launcher.setConst(numBodies);
+		launcher.setBuffer(narrowphaseData->m_bodyBufferGPU->getBufferCL());
+		launcher.setBuffer(narrowphaseData->m_collidablesGPU->getBufferCL());
+		launcher.setBuffer(narrowphaseData->m_convexFacesGPU->getBufferCL());
+		launcher.setBuffer(narrowphaseData->m_convexPolyhedraGPU->getBufferCL());
+
+		launcher.launch1D(numRays);
+		clFinish(m_data->m_q);
+	}
+	else
+	{
+		m_data->m_plbvh->build(broadphase->getAllAabbsGPU(), broadphase->getSmallAabbIndicesGPU(), broadphase->getLargeAabbIndicesGPU());
+
+		m_data->m_plbvh->testRaysAgainstBvhAabbs(*m_data->m_gpuRays, *m_data->m_gpuNumRayRigidPairs, *m_data->m_gpuRayRigidPairs);
+
+		int numRayRigidPairs = -1;
+		m_data->m_gpuNumRayRigidPairs->copyToHostPointer(&numRayRigidPairs, 1);
+		if (numRayRigidPairs > m_data->m_gpuRayRigidPairs->size())
+		{
+			numRayRigidPairs = m_data->m_gpuRayRigidPairs->size();
+			m_data->m_gpuNumRayRigidPairs->copyFromHostPointer(&numRayRigidPairs, 1);
+		}
+
+		m_data->m_gpuRayRigidPairs->resize(numRayRigidPairs);  //Radix sort needs b3OpenCLArray::size() to be correct
+
+		//Sort ray-rigid pairs by ray index
+		{
+			B3_PROFILE("sort ray-rigid pairs");
+			m_data->m_radixSorter->execute(*reinterpret_cast<b3OpenCLArray<b3SortData>*>(m_data->m_gpuRayRigidPairs));
+		}
+
+		//detect start,count of each ray pair
+		{
+			B3_PROFILE("detect ray-rigid pair index ranges");
+
+			{
+				B3_PROFILE("reset ray-rigid pair index ranges");
+
+				m_data->m_fill->execute(*m_data->m_firstRayRigidPairIndexPerRay, numRayRigidPairs, numRays);  //atomic_min used to find first index
+				m_data->m_fill->execute(*m_data->m_numRayRigidPairsPerRay, 0, numRays);
+				clFinish(m_data->m_q);
+			}
+
+			b3BufferInfoCL bufferInfo[] =
+				{
+					b3BufferInfoCL(m_data->m_gpuRayRigidPairs->getBufferCL()),
+
+					b3BufferInfoCL(m_data->m_firstRayRigidPairIndexPerRay->getBufferCL()),
+					b3BufferInfoCL(m_data->m_numRayRigidPairsPerRay->getBufferCL())};
+
+			b3LauncherCL launcher(m_data->m_q, m_data->m_findRayRigidPairIndexRanges, "m_findRayRigidPairIndexRanges");
+			launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numRayRigidPairs);
+
+			launcher.launch1D(numRayRigidPairs);
+			clFinish(m_data->m_q);
+		}
+
+		{
+			B3_PROFILE("ray-rigid intersection");
+
+			b3BufferInfoCL bufferInfo[] =
+				{
+					b3BufferInfoCL(m_data->m_gpuRays->getBufferCL()),
+					b3BufferInfoCL(m_data->m_gpuHitResults->getBufferCL()),
+					b3BufferInfoCL(m_data->m_firstRayRigidPairIndexPerRay->getBufferCL()),
+					b3BufferInfoCL(m_data->m_numRayRigidPairsPerRay->getBufferCL()),
+
+					b3BufferInfoCL(narrowphaseData->m_bodyBufferGPU->getBufferCL()),
+					b3BufferInfoCL(narrowphaseData->m_collidablesGPU->getBufferCL()),
+					b3BufferInfoCL(narrowphaseData->m_convexFacesGPU->getBufferCL()),
+					b3BufferInfoCL(narrowphaseData->m_convexPolyhedraGPU->getBufferCL()),
+
+					b3BufferInfoCL(m_data->m_gpuRayRigidPairs->getBufferCL())};
+
+			b3LauncherCL launcher(m_data->m_q, m_data->m_raytracePairsKernel, "m_raytracePairsKernel");
+			launcher.setBuffers(bufferInfo, sizeof(bufferInfo) / sizeof(b3BufferInfoCL));
+			launcher.setConst(numRays);
+
+			launcher.launch1D(numRays);
+			clFinish(m_data->m_q);
+		}
+	}
+
+	//copy results
+	{
+		B3_PROFILE("raycast copyToHost");
+		m_data->m_gpuHitResults->copyToHost(hitResults);
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.h
new file mode 100644
index 0000000..f1f6ffd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/b3GpuRaycast.h
@@ -0,0 +1,28 @@
+#ifndef B3_GPU_RAYCAST_H
+#define B3_GPU_RAYCAST_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"
+
+class b3GpuRaycast
+{
+protected:
+	struct b3GpuRaycastInternalData* m_data;
+
+public:
+	b3GpuRaycast(cl_context ctx, cl_device_id device, cl_command_queue q);
+	virtual ~b3GpuRaycast();
+
+	void castRaysHost(const b3AlignedObjectArray<b3RayInfo>& raysIn, b3AlignedObjectArray<b3RayHit>& hitResults,
+					  int numBodies, const struct b3RigidBodyData* bodies, int numCollidables, const struct b3Collidable* collidables,
+					  const struct b3GpuNarrowPhaseInternalData* narrowphaseData);
+
+	void castRays(const b3AlignedObjectArray<b3RayInfo>& rays, b3AlignedObjectArray<b3RayHit>& hitResults,
+				  int numBodies, const struct b3RigidBodyData* bodies, int numCollidables, const struct b3Collidable* collidables,
+				  const struct b3GpuNarrowPhaseInternalData* narrowphaseData, class b3GpuBroadphaseInterface* broadphase);
+};
+
+#endif  //B3_GPU_RAYCAST_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl
new file mode 100644
index 0000000..e72d968
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl
@@ -0,0 +1,439 @@
+
+#define SHAPE_CONVEX_HULL 3
+#define SHAPE_PLANE 4
+#define SHAPE_CONCAVE_TRIMESH 5
+#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6
+#define SHAPE_SPHERE 7
+
+
+typedef struct
+{
+	float4 m_from;
+	float4 m_to;
+} b3RayInfo;
+
+typedef struct
+{
+	float m_hitFraction;
+	int	m_hitResult0;
+	int	m_hitResult1;
+	int	m_hitResult2;
+	float4	m_hitPoint;
+	float4	m_hitNormal;
+} b3RayHit;
+
+typedef struct
+{
+	float4 m_pos;
+	float4 m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	unsigned int m_collidableIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} Body;
+
+typedef struct Collidable
+{
+	union {
+		int m_numChildShapes;
+		int m_bvhIndex;
+	};
+	float m_radius;
+	int m_shapeType;
+	int m_shapeIndex;
+} Collidable;
+
+
+typedef struct  
+{
+	float4		m_localCenter;
+	float4		m_extents;
+	float4		mC;
+	float4		mE;
+
+	float			m_radius;
+	int	m_faceOffset;
+	int m_numFaces;
+	int	m_numVertices;
+
+	int m_vertexOffset;
+	int	m_uniqueEdgesOffset;
+	int	m_numUniqueEdges;
+	int m_unused;
+
+} ConvexPolyhedronCL;
+
+typedef struct
+{
+	float4 m_plane;
+	int m_indexOffset;
+	int m_numIndices;
+} b3GpuFace;
+
+
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+__inline
+	Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+	Quaternion qtNormalize(Quaternion in);
+
+
+__inline
+	Quaternion qtInvert(Quaternion q);
+
+
+__inline
+	float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = (float4)(a.xyz,0.f);
+	float4 b1 = (float4)(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+
+__inline
+	Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross( a, b );
+	ans += a.w*b+b.w*a;
+	//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+	Quaternion qtNormalize(Quaternion in)
+{
+	return fast_normalize(in);
+	//	in /= length( in );
+	//	return in;
+}
+__inline
+	float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(q,vcpy);
+	out = qtMul(out,qInv);
+	return out;
+}
+
+__inline
+	Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+	float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+
+
+void	trInverse(float4 translationIn, Quaternion orientationIn,
+	float4* translationOut, Quaternion* orientationOut)
+{
+	*orientationOut = qtInvert(orientationIn);
+	*translationOut = qtRotate(*orientationOut, -translationIn);
+}
+
+
+
+
+
+bool rayConvex(float4 rayFromLocal, float4 rayToLocal, int numFaces, int faceOffset,
+	__global const b3GpuFace* faces, float* hitFraction, float4* hitNormal)
+{
+	rayFromLocal.w = 0.f;
+	rayToLocal.w = 0.f;
+	bool result = true;
+
+	float exitFraction = hitFraction[0];
+	float enterFraction = -0.3f;
+	float4 curHitNormal = (float4)(0,0,0,0);
+	for (int i=0;i<numFaces && result;i++)
+	{
+		b3GpuFace face = faces[faceOffset+i];
+		float fromPlaneDist = dot(rayFromLocal,face.m_plane)+face.m_plane.w;
+		float toPlaneDist = dot(rayToLocal,face.m_plane)+face.m_plane.w;
+		if (fromPlaneDist<0.f)
+		{
+			if (toPlaneDist >= 0.f)
+			{
+				float fraction = fromPlaneDist / (fromPlaneDist-toPlaneDist);
+				if (exitFraction>fraction)
+				{
+					exitFraction = fraction;
+				}
+			} 			
+		} else
+		{
+			if (toPlaneDist<0.f)
+			{
+				float fraction = fromPlaneDist / (fromPlaneDist-toPlaneDist);
+				if (enterFraction <= fraction)
+				{
+					enterFraction = fraction;
+					curHitNormal = face.m_plane;
+					curHitNormal.w = 0.f;
+				}
+			} else
+			{
+				result = false;
+			}
+		}
+		if (exitFraction <= enterFraction)
+			result = false;
+	}
+
+	if (enterFraction < 0.f)
+	{
+		result = false;
+	}
+
+	if (result)
+	{	
+		hitFraction[0] = enterFraction;
+		hitNormal[0] = curHitNormal;
+	}
+	return result;
+}
+
+
+
+
+
+
+bool sphere_intersect(float4 spherePos,  float radius, float4 rayFrom, float4 rayTo, float* hitFraction)
+{
+	float4 rs = rayFrom - spherePos;
+	rs.w = 0.f;
+	float4 rayDir = rayTo-rayFrom;
+	rayDir.w = 0.f;
+	float A = dot(rayDir,rayDir);
+	float B = dot(rs, rayDir);
+	float C = dot(rs, rs) - (radius * radius);
+
+	float D = B * B - A*C;
+
+	if (D > 0.0f)
+	{
+		float t = (-B - sqrt(D))/A;
+
+		if ( (t >= 0.0f) && (t < (*hitFraction)) )
+		{
+			*hitFraction = t;
+			return true;
+		}
+	}
+	return false;
+}
+
+float4 setInterpolate3(float4 from, float4 to, float t)
+{
+	float s = 1.0f - t;
+	float4 result;
+	result = s * from + t * to;
+	result.w = 0.f;	
+	return result;	
+}
+
+__kernel void rayCastKernel(  
+	int numRays, 
+	const __global b3RayInfo* rays, 
+	__global b3RayHit* hitResults, 
+	const int numBodies, 
+	__global Body* bodies,
+	__global Collidable* collidables,
+	__global const b3GpuFace* faces,
+	__global const ConvexPolyhedronCL* convexShapes	)
+{
+
+	int i = get_global_id(0);
+	if (i>=numRays)
+		return;
+
+	hitResults[i].m_hitFraction = 1.f;
+
+	float4 rayFrom = rays[i].m_from;
+	float4 rayTo = rays[i].m_to;
+	float hitFraction = 1.f;
+	float4 hitPoint;
+	float4 hitNormal;
+	int hitBodyIndex= -1;
+
+	int cachedCollidableIndex = -1;
+	Collidable cachedCollidable;
+
+	for (int b=0;b<numBodies;b++)
+	{
+		if (hitResults[i].m_hitResult2==b)
+			continue;
+		Body body = bodies[b];
+		float4 pos = body.m_pos;
+		float4 orn = body.m_quat;
+		if (cachedCollidableIndex != body.m_collidableIdx)
+		{
+			cachedCollidableIndex = body.m_collidableIdx;
+			cachedCollidable = collidables[cachedCollidableIndex];
+		}
+		if (cachedCollidable.m_shapeType == SHAPE_CONVEX_HULL)
+		{
+
+			float4 invPos = (float4)(0,0,0,0);
+			float4 invOrn = (float4)(0,0,0,0);
+			float4 rayFromLocal = (float4)(0,0,0,0);
+			float4 rayToLocal = (float4)(0,0,0,0);
+			invOrn = qtInvert(orn);
+			invPos = qtRotate(invOrn, -pos);
+			rayFromLocal = qtRotate( invOrn, rayFrom ) + invPos;
+			rayToLocal = qtRotate( invOrn, rayTo) + invPos;
+			rayFromLocal.w = 0.f;
+			rayToLocal.w = 0.f;
+			int numFaces = convexShapes[cachedCollidable.m_shapeIndex].m_numFaces;
+			int faceOffset = convexShapes[cachedCollidable.m_shapeIndex].m_faceOffset;
+			if (numFaces)
+			{
+				if (rayConvex(rayFromLocal, rayToLocal, numFaces, faceOffset,faces, &hitFraction, &hitNormal))
+				{
+					hitBodyIndex = b;
+					
+				}
+			}
+		}
+		if (cachedCollidable.m_shapeType == SHAPE_SPHERE)
+		{
+			float radius = cachedCollidable.m_radius;
+		
+			if (sphere_intersect(pos,  radius, rayFrom, rayTo, &hitFraction))
+			{
+				hitBodyIndex = b;
+				hitNormal = (float4) (hitPoint-bodies[b].m_pos);
+			}
+		}
+	}
+
+	if (hitBodyIndex>=0)
+	{
+		hitPoint = setInterpolate3(rayFrom, rayTo,hitFraction);
+		hitResults[i].m_hitFraction = hitFraction;
+		hitResults[i].m_hitPoint = hitPoint;
+		hitResults[i].m_hitNormal = normalize(hitNormal);
+		hitResults[i].m_hitResult0 = hitBodyIndex;
+	}
+
+}
+
+
+__kernel void findRayRigidPairIndexRanges(__global int2* rayRigidPairs, 
+											__global int* out_firstRayRigidPairIndexPerRay,
+											__global int* out_numRayRigidPairsPerRay,
+											int numRayRigidPairs)
+{
+	int rayRigidPairIndex = get_global_id(0);
+	if (rayRigidPairIndex >= numRayRigidPairs) return;
+	
+	int rayIndex = rayRigidPairs[rayRigidPairIndex].x;
+	
+	atomic_min(&out_firstRayRigidPairIndexPerRay[rayIndex], rayRigidPairIndex);
+	atomic_inc(&out_numRayRigidPairsPerRay[rayIndex]);
+}
+
+__kernel void rayCastPairsKernel(const __global b3RayInfo* rays, 
+								__global b3RayHit* hitResults, 
+								__global int* firstRayRigidPairIndexPerRay,
+								__global int* numRayRigidPairsPerRay,
+									
+								__global Body* bodies,
+								__global Collidable* collidables,
+								__global const b3GpuFace* faces,
+								__global const ConvexPolyhedronCL* convexShapes,
+								
+								__global int2* rayRigidPairs,
+								int numRays)
+{
+	int i = get_global_id(0);
+	if (i >= numRays) return;
+	
+	float4 rayFrom = rays[i].m_from;
+	float4 rayTo = rays[i].m_to;
+		
+	hitResults[i].m_hitFraction = 1.f;
+		
+	float hitFraction = 1.f;
+	float4 hitPoint;
+	float4 hitNormal;
+	int hitBodyIndex = -1;
+		
+	//
+	for(int pair = 0; pair < numRayRigidPairsPerRay[i]; ++pair)
+	{
+		int rayRigidPairIndex = pair + firstRayRigidPairIndexPerRay[i];
+		int b = rayRigidPairs[rayRigidPairIndex].y;
+		
+		if (hitResults[i].m_hitResult2 == b) continue;
+		
+		Body body = bodies[b];
+		Collidable rigidCollidable = collidables[body.m_collidableIdx];
+		
+		float4 pos = body.m_pos;
+		float4 orn = body.m_quat;
+		
+		if (rigidCollidable.m_shapeType == SHAPE_CONVEX_HULL)
+		{
+			float4 invPos = (float4)(0,0,0,0);
+			float4 invOrn = (float4)(0,0,0,0);
+			float4 rayFromLocal = (float4)(0,0,0,0);
+			float4 rayToLocal = (float4)(0,0,0,0);
+			invOrn = qtInvert(orn);
+			invPos = qtRotate(invOrn, -pos);
+			rayFromLocal = qtRotate( invOrn, rayFrom ) + invPos;
+			rayToLocal = qtRotate( invOrn, rayTo) + invPos;
+			rayFromLocal.w = 0.f;
+			rayToLocal.w = 0.f;
+			int numFaces = convexShapes[rigidCollidable.m_shapeIndex].m_numFaces;
+			int faceOffset = convexShapes[rigidCollidable.m_shapeIndex].m_faceOffset;
+			
+			if (numFaces && rayConvex(rayFromLocal, rayToLocal, numFaces, faceOffset,faces, &hitFraction, &hitNormal))
+			{
+				hitBodyIndex = b;
+				hitPoint = setInterpolate3(rayFrom, rayTo, hitFraction);
+			}
+		}
+		
+		if (rigidCollidable.m_shapeType == SHAPE_SPHERE)
+		{
+			float radius = rigidCollidable.m_radius;
+		
+			if (sphere_intersect(pos, radius, rayFrom, rayTo, &hitFraction))
+			{
+				hitBodyIndex = b;
+				hitPoint = setInterpolate3(rayFrom, rayTo, hitFraction);
+				hitNormal = (float4) (hitPoint - bodies[b].m_pos);
+			}
+		}
+	}
+	
+	if (hitBodyIndex >= 0)
+	{
+		hitResults[i].m_hitFraction = hitFraction;
+		hitResults[i].m_hitPoint = hitPoint;
+		hitResults[i].m_hitNormal = normalize(hitNormal);
+		hitResults[i].m_hitResult0 = hitBodyIndex;
+	}
+	
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.h
new file mode 100644
index 0000000..94f6a8e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/Raycast/kernels/rayCastKernels.h
@@ -0,0 +1,380 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* rayCastKernelCL =
+	"#define SHAPE_CONVEX_HULL 3\n"
+	"#define SHAPE_PLANE 4\n"
+	"#define SHAPE_CONCAVE_TRIMESH 5\n"
+	"#define SHAPE_COMPOUND_OF_CONVEX_HULLS 6\n"
+	"#define SHAPE_SPHERE 7\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_from;\n"
+	"	float4 m_to;\n"
+	"} b3RayInfo;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float m_hitFraction;\n"
+	"	int	m_hitResult0;\n"
+	"	int	m_hitResult1;\n"
+	"	int	m_hitResult2;\n"
+	"	float4	m_hitPoint;\n"
+	"	float4	m_hitNormal;\n"
+	"} b3RayHit;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	float4 m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	unsigned int m_collidableIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} Body;\n"
+	"typedef struct Collidable\n"
+	"{\n"
+	"	union {\n"
+	"		int m_numChildShapes;\n"
+	"		int m_bvhIndex;\n"
+	"	};\n"
+	"	float m_radius;\n"
+	"	int m_shapeType;\n"
+	"	int m_shapeIndex;\n"
+	"} Collidable;\n"
+	"typedef struct  \n"
+	"{\n"
+	"	float4		m_localCenter;\n"
+	"	float4		m_extents;\n"
+	"	float4		mC;\n"
+	"	float4		mE;\n"
+	"	float			m_radius;\n"
+	"	int	m_faceOffset;\n"
+	"	int m_numFaces;\n"
+	"	int	m_numVertices;\n"
+	"	int m_vertexOffset;\n"
+	"	int	m_uniqueEdgesOffset;\n"
+	"	int	m_numUniqueEdges;\n"
+	"	int m_unused;\n"
+	"} ConvexPolyhedronCL;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_plane;\n"
+	"	int m_indexOffset;\n"
+	"	int m_numIndices;\n"
+	"} b3GpuFace;\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"__inline\n"
+	"	Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"	Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"	Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"	float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = (float4)(a.xyz,0.f);\n"
+	"	float4 b1 = (float4)(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"	Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"	//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"	Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fast_normalize(in);\n"
+	"	//	in /= length( in );\n"
+	"	//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"	float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(q,vcpy);\n"
+	"	out = qtMul(out,qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"	Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"	float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"void	trInverse(float4 translationIn, Quaternion orientationIn,\n"
+	"	float4* translationOut, Quaternion* orientationOut)\n"
+	"{\n"
+	"	*orientationOut = qtInvert(orientationIn);\n"
+	"	*translationOut = qtRotate(*orientationOut, -translationIn);\n"
+	"}\n"
+	"bool rayConvex(float4 rayFromLocal, float4 rayToLocal, int numFaces, int faceOffset,\n"
+	"	__global const b3GpuFace* faces, float* hitFraction, float4* hitNormal)\n"
+	"{\n"
+	"	rayFromLocal.w = 0.f;\n"
+	"	rayToLocal.w = 0.f;\n"
+	"	bool result = true;\n"
+	"	float exitFraction = hitFraction[0];\n"
+	"	float enterFraction = -0.3f;\n"
+	"	float4 curHitNormal = (float4)(0,0,0,0);\n"
+	"	for (int i=0;i<numFaces && result;i++)\n"
+	"	{\n"
+	"		b3GpuFace face = faces[faceOffset+i];\n"
+	"		float fromPlaneDist = dot(rayFromLocal,face.m_plane)+face.m_plane.w;\n"
+	"		float toPlaneDist = dot(rayToLocal,face.m_plane)+face.m_plane.w;\n"
+	"		if (fromPlaneDist<0.f)\n"
+	"		{\n"
+	"			if (toPlaneDist >= 0.f)\n"
+	"			{\n"
+	"				float fraction = fromPlaneDist / (fromPlaneDist-toPlaneDist);\n"
+	"				if (exitFraction>fraction)\n"
+	"				{\n"
+	"					exitFraction = fraction;\n"
+	"				}\n"
+	"			} 			\n"
+	"		} else\n"
+	"		{\n"
+	"			if (toPlaneDist<0.f)\n"
+	"			{\n"
+	"				float fraction = fromPlaneDist / (fromPlaneDist-toPlaneDist);\n"
+	"				if (enterFraction <= fraction)\n"
+	"				{\n"
+	"					enterFraction = fraction;\n"
+	"					curHitNormal = face.m_plane;\n"
+	"					curHitNormal.w = 0.f;\n"
+	"				}\n"
+	"			} else\n"
+	"			{\n"
+	"				result = false;\n"
+	"			}\n"
+	"		}\n"
+	"		if (exitFraction <= enterFraction)\n"
+	"			result = false;\n"
+	"	}\n"
+	"	if (enterFraction < 0.f)\n"
+	"	{\n"
+	"		result = false;\n"
+	"	}\n"
+	"	if (result)\n"
+	"	{	\n"
+	"		hitFraction[0] = enterFraction;\n"
+	"		hitNormal[0] = curHitNormal;\n"
+	"	}\n"
+	"	return result;\n"
+	"}\n"
+	"bool sphere_intersect(float4 spherePos,  float radius, float4 rayFrom, float4 rayTo, float* hitFraction)\n"
+	"{\n"
+	"	float4 rs = rayFrom - spherePos;\n"
+	"	rs.w = 0.f;\n"
+	"	float4 rayDir = rayTo-rayFrom;\n"
+	"	rayDir.w = 0.f;\n"
+	"	float A = dot(rayDir,rayDir);\n"
+	"	float B = dot(rs, rayDir);\n"
+	"	float C = dot(rs, rs) - (radius * radius);\n"
+	"	float D = B * B - A*C;\n"
+	"	if (D > 0.0f)\n"
+	"	{\n"
+	"		float t = (-B - sqrt(D))/A;\n"
+	"		if ( (t >= 0.0f) && (t < (*hitFraction)) )\n"
+	"		{\n"
+	"			*hitFraction = t;\n"
+	"			return true;\n"
+	"		}\n"
+	"	}\n"
+	"	return false;\n"
+	"}\n"
+	"float4 setInterpolate3(float4 from, float4 to, float t)\n"
+	"{\n"
+	"	float s = 1.0f - t;\n"
+	"	float4 result;\n"
+	"	result = s * from + t * to;\n"
+	"	result.w = 0.f;	\n"
+	"	return result;	\n"
+	"}\n"
+	"__kernel void rayCastKernel(  \n"
+	"	int numRays, \n"
+	"	const __global b3RayInfo* rays, \n"
+	"	__global b3RayHit* hitResults, \n"
+	"	const int numBodies, \n"
+	"	__global Body* bodies,\n"
+	"	__global Collidable* collidables,\n"
+	"	__global const b3GpuFace* faces,\n"
+	"	__global const ConvexPolyhedronCL* convexShapes	)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numRays)\n"
+	"		return;\n"
+	"	hitResults[i].m_hitFraction = 1.f;\n"
+	"	float4 rayFrom = rays[i].m_from;\n"
+	"	float4 rayTo = rays[i].m_to;\n"
+	"	float hitFraction = 1.f;\n"
+	"	float4 hitPoint;\n"
+	"	float4 hitNormal;\n"
+	"	int hitBodyIndex= -1;\n"
+	"	int cachedCollidableIndex = -1;\n"
+	"	Collidable cachedCollidable;\n"
+	"	for (int b=0;b<numBodies;b++)\n"
+	"	{\n"
+	"		if (hitResults[i].m_hitResult2==b)\n"
+	"			continue;\n"
+	"		Body body = bodies[b];\n"
+	"		float4 pos = body.m_pos;\n"
+	"		float4 orn = body.m_quat;\n"
+	"		if (cachedCollidableIndex != body.m_collidableIdx)\n"
+	"		{\n"
+	"			cachedCollidableIndex = body.m_collidableIdx;\n"
+	"			cachedCollidable = collidables[cachedCollidableIndex];\n"
+	"		}\n"
+	"		if (cachedCollidable.m_shapeType == SHAPE_CONVEX_HULL)\n"
+	"		{\n"
+	"			float4 invPos = (float4)(0,0,0,0);\n"
+	"			float4 invOrn = (float4)(0,0,0,0);\n"
+	"			float4 rayFromLocal = (float4)(0,0,0,0);\n"
+	"			float4 rayToLocal = (float4)(0,0,0,0);\n"
+	"			invOrn = qtInvert(orn);\n"
+	"			invPos = qtRotate(invOrn, -pos);\n"
+	"			rayFromLocal = qtRotate( invOrn, rayFrom ) + invPos;\n"
+	"			rayToLocal = qtRotate( invOrn, rayTo) + invPos;\n"
+	"			rayFromLocal.w = 0.f;\n"
+	"			rayToLocal.w = 0.f;\n"
+	"			int numFaces = convexShapes[cachedCollidable.m_shapeIndex].m_numFaces;\n"
+	"			int faceOffset = convexShapes[cachedCollidable.m_shapeIndex].m_faceOffset;\n"
+	"			if (numFaces)\n"
+	"			{\n"
+	"				if (rayConvex(rayFromLocal, rayToLocal, numFaces, faceOffset,faces, &hitFraction, &hitNormal))\n"
+	"				{\n"
+	"					hitBodyIndex = b;\n"
+	"					\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		if (cachedCollidable.m_shapeType == SHAPE_SPHERE)\n"
+	"		{\n"
+	"			float radius = cachedCollidable.m_radius;\n"
+	"		\n"
+	"			if (sphere_intersect(pos,  radius, rayFrom, rayTo, &hitFraction))\n"
+	"			{\n"
+	"				hitBodyIndex = b;\n"
+	"				hitNormal = (float4) (hitPoint-bodies[b].m_pos);\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	if (hitBodyIndex>=0)\n"
+	"	{\n"
+	"		hitPoint = setInterpolate3(rayFrom, rayTo,hitFraction);\n"
+	"		hitResults[i].m_hitFraction = hitFraction;\n"
+	"		hitResults[i].m_hitPoint = hitPoint;\n"
+	"		hitResults[i].m_hitNormal = normalize(hitNormal);\n"
+	"		hitResults[i].m_hitResult0 = hitBodyIndex;\n"
+	"	}\n"
+	"}\n"
+	"__kernel void findRayRigidPairIndexRanges(__global int2* rayRigidPairs, \n"
+	"											__global int* out_firstRayRigidPairIndexPerRay,\n"
+	"											__global int* out_numRayRigidPairsPerRay,\n"
+	"											int numRayRigidPairs)\n"
+	"{\n"
+	"	int rayRigidPairIndex = get_global_id(0);\n"
+	"	if (rayRigidPairIndex >= numRayRigidPairs) return;\n"
+	"	\n"
+	"	int rayIndex = rayRigidPairs[rayRigidPairIndex].x;\n"
+	"	\n"
+	"	atomic_min(&out_firstRayRigidPairIndexPerRay[rayIndex], rayRigidPairIndex);\n"
+	"	atomic_inc(&out_numRayRigidPairsPerRay[rayIndex]);\n"
+	"}\n"
+	"__kernel void rayCastPairsKernel(const __global b3RayInfo* rays, \n"
+	"								__global b3RayHit* hitResults, \n"
+	"								__global int* firstRayRigidPairIndexPerRay,\n"
+	"								__global int* numRayRigidPairsPerRay,\n"
+	"									\n"
+	"								__global Body* bodies,\n"
+	"								__global Collidable* collidables,\n"
+	"								__global const b3GpuFace* faces,\n"
+	"								__global const ConvexPolyhedronCL* convexShapes,\n"
+	"								\n"
+	"								__global int2* rayRigidPairs,\n"
+	"								int numRays)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i >= numRays) return;\n"
+	"	\n"
+	"	float4 rayFrom = rays[i].m_from;\n"
+	"	float4 rayTo = rays[i].m_to;\n"
+	"		\n"
+	"	hitResults[i].m_hitFraction = 1.f;\n"
+	"		\n"
+	"	float hitFraction = 1.f;\n"
+	"	float4 hitPoint;\n"
+	"	float4 hitNormal;\n"
+	"	int hitBodyIndex = -1;\n"
+	"		\n"
+	"	//\n"
+	"	for(int pair = 0; pair < numRayRigidPairsPerRay[i]; ++pair)\n"
+	"	{\n"
+	"		int rayRigidPairIndex = pair + firstRayRigidPairIndexPerRay[i];\n"
+	"		int b = rayRigidPairs[rayRigidPairIndex].y;\n"
+	"		\n"
+	"		if (hitResults[i].m_hitResult2 == b) continue;\n"
+	"		\n"
+	"		Body body = bodies[b];\n"
+	"		Collidable rigidCollidable = collidables[body.m_collidableIdx];\n"
+	"		\n"
+	"		float4 pos = body.m_pos;\n"
+	"		float4 orn = body.m_quat;\n"
+	"		\n"
+	"		if (rigidCollidable.m_shapeType == SHAPE_CONVEX_HULL)\n"
+	"		{\n"
+	"			float4 invPos = (float4)(0,0,0,0);\n"
+	"			float4 invOrn = (float4)(0,0,0,0);\n"
+	"			float4 rayFromLocal = (float4)(0,0,0,0);\n"
+	"			float4 rayToLocal = (float4)(0,0,0,0);\n"
+	"			invOrn = qtInvert(orn);\n"
+	"			invPos = qtRotate(invOrn, -pos);\n"
+	"			rayFromLocal = qtRotate( invOrn, rayFrom ) + invPos;\n"
+	"			rayToLocal = qtRotate( invOrn, rayTo) + invPos;\n"
+	"			rayFromLocal.w = 0.f;\n"
+	"			rayToLocal.w = 0.f;\n"
+	"			int numFaces = convexShapes[rigidCollidable.m_shapeIndex].m_numFaces;\n"
+	"			int faceOffset = convexShapes[rigidCollidable.m_shapeIndex].m_faceOffset;\n"
+	"			\n"
+	"			if (numFaces && rayConvex(rayFromLocal, rayToLocal, numFaces, faceOffset,faces, &hitFraction, &hitNormal))\n"
+	"			{\n"
+	"				hitBodyIndex = b;\n"
+	"				hitPoint = setInterpolate3(rayFrom, rayTo, hitFraction);\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"		if (rigidCollidable.m_shapeType == SHAPE_SPHERE)\n"
+	"		{\n"
+	"			float radius = rigidCollidable.m_radius;\n"
+	"		\n"
+	"			if (sphere_intersect(pos, radius, rayFrom, rayTo, &hitFraction))\n"
+	"			{\n"
+	"				hitBodyIndex = b;\n"
+	"				hitPoint = setInterpolate3(rayFrom, rayTo, hitFraction);\n"
+	"				hitNormal = (float4) (hitPoint - bodies[b].m_pos);\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"	\n"
+	"	if (hitBodyIndex >= 0)\n"
+	"	{\n"
+	"		hitResults[i].m_hitFraction = hitFraction;\n"
+	"		hitResults[i].m_hitPoint = hitPoint;\n"
+	"		hitResults[i].m_hitNormal = normalize(hitNormal);\n"
+	"		hitResults[i].m_hitResult0 = hitBodyIndex;\n"
+	"	}\n"
+	"	\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuConstraint4.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuConstraint4.h
new file mode 100644
index 0000000..89c0142
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuConstraint4.h
@@ -0,0 +1,17 @@
+
+#ifndef B3_CONSTRAINT4_h
+#define B3_CONSTRAINT4_h
+#include "Bullet3Common/b3Vector3.h"
+
+#include "Bullet3Dynamics/shared/b3ContactConstraint4.h"
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3GpuConstraint4 : public b3ContactConstraint4
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	inline void setFrictionCoeff(float value) { m_linear[3] = value; }
+	inline float getFrictionCoeff() const { return m_linear[3]; }
+};
+
+#endif  //B3_CONSTRAINT4_h
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.cpp
new file mode 100644
index 0000000..a271090
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.cpp
@@ -0,0 +1,134 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#include "b3GpuGenericConstraint.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+#include <new>
+#include "Bullet3Common/b3Transform.h"
+
+void b3GpuGenericConstraint::getInfo1(unsigned int* info, const b3RigidBodyData* bodies)
+{
+	switch (m_constraintType)
+	{
+		case B3_GPU_POINT2POINT_CONSTRAINT_TYPE:
+		{
+			*info = 3;
+			break;
+		};
+		default:
+		{
+			b3Assert(0);
+		}
+	};
+}
+
+void getInfo2Point2Point(b3GpuGenericConstraint* constraint, b3GpuConstraintInfo2* info, const b3RigidBodyData* bodies)
+{
+	b3Transform trA;
+	trA.setIdentity();
+	trA.setOrigin(bodies[constraint->m_rbA].m_pos);
+	trA.setRotation(bodies[constraint->m_rbA].m_quat);
+
+	b3Transform trB;
+	trB.setIdentity();
+	trB.setOrigin(bodies[constraint->m_rbB].m_pos);
+	trB.setRotation(bodies[constraint->m_rbB].m_quat);
+
+	// anchor points in global coordinates with respect to body PORs.
+
+	// set jacobian
+	info->m_J1linearAxis[0] = 1;
+	info->m_J1linearAxis[info->rowskip + 1] = 1;
+	info->m_J1linearAxis[2 * info->rowskip + 2] = 1;
+
+	b3Vector3 a1 = trA.getBasis() * constraint->getPivotInA();
+	//b3Vector3 a1a = b3QuatRotate(trA.getRotation(),constraint->getPivotInA());
+
+	{
+		b3Vector3* angular0 = (b3Vector3*)(info->m_J1angularAxis);
+		b3Vector3* angular1 = (b3Vector3*)(info->m_J1angularAxis + info->rowskip);
+		b3Vector3* angular2 = (b3Vector3*)(info->m_J1angularAxis + 2 * info->rowskip);
+		b3Vector3 a1neg = -a1;
+		a1neg.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	if (info->m_J2linearAxis)
+	{
+		info->m_J2linearAxis[0] = -1;
+		info->m_J2linearAxis[info->rowskip + 1] = -1;
+		info->m_J2linearAxis[2 * info->rowskip + 2] = -1;
+	}
+
+	b3Vector3 a2 = trB.getBasis() * constraint->getPivotInB();
+
+	{
+		//	b3Vector3 a2n = -a2;
+		b3Vector3* angular0 = (b3Vector3*)(info->m_J2angularAxis);
+		b3Vector3* angular1 = (b3Vector3*)(info->m_J2angularAxis + info->rowskip);
+		b3Vector3* angular2 = (b3Vector3*)(info->m_J2angularAxis + 2 * info->rowskip);
+		a2.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	// set right hand side
+	//	b3Scalar currERP = (m_flags & B3_P2P_FLAGS_ERP) ? m_erp : info->erp;
+	b3Scalar currERP = info->erp;
+
+	b3Scalar k = info->fps * currERP;
+	int j;
+	for (j = 0; j < 3; j++)
+	{
+		info->m_constraintError[j * info->rowskip] = k * (a2[j] + trB.getOrigin()[j] - a1[j] - trA.getOrigin()[j]);
+		//printf("info->m_constraintError[%d]=%f\n",j,info->m_constraintError[j]);
+	}
+#if 0
+	if(m_flags & B3_P2P_FLAGS_CFM)
+	{
+		for (j=0; j<3; j++)
+		{
+			info->cfm[j*info->rowskip] = m_cfm;
+		}
+	}
+#endif
+
+#if 0
+	b3Scalar impulseClamp = m_setting.m_impulseClamp;//
+	for (j=0; j<3; j++)
+    {
+		if (m_setting.m_impulseClamp > 0)
+		{
+			info->m_lowerLimit[j*info->rowskip] = -impulseClamp;
+			info->m_upperLimit[j*info->rowskip] = impulseClamp;
+		}
+	}
+	info->m_damping = m_setting.m_damping;
+#endif
+}
+
+void b3GpuGenericConstraint::getInfo2(b3GpuConstraintInfo2* info, const b3RigidBodyData* bodies)
+{
+	switch (m_constraintType)
+	{
+		case B3_GPU_POINT2POINT_CONSTRAINT_TYPE:
+		{
+			getInfo2Point2Point(this, info, bodies);
+			break;
+		};
+		default:
+		{
+			b3Assert(0);
+		}
+	};
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h
new file mode 100644
index 0000000..1f163ba
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h
@@ -0,0 +1,128 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#ifndef B3_GPU_GENERIC_CONSTRAINT_H
+#define B3_GPU_GENERIC_CONSTRAINT_H
+
+#include "Bullet3Common/b3Quaternion.h"
+struct b3RigidBodyData;
+enum B3_CONSTRAINT_FLAGS
+{
+	B3_CONSTRAINT_FLAG_ENABLED = 1,
+};
+
+enum b3GpuGenericConstraintType
+{
+	B3_GPU_POINT2POINT_CONSTRAINT_TYPE = 3,
+	B3_GPU_FIXED_CONSTRAINT_TYPE = 4,
+	//	B3_HINGE_CONSTRAINT_TYPE,
+	//	B3_CONETWIST_CONSTRAINT_TYPE,
+	//	B3_D6_CONSTRAINT_TYPE,
+	//	B3_SLIDER_CONSTRAINT_TYPE,
+	//	B3_CONTACT_CONSTRAINT_TYPE,
+	//	B3_D6_SPRING_CONSTRAINT_TYPE,
+	//	B3_GEAR_CONSTRAINT_TYPE,
+
+	B3_GPU_MAX_CONSTRAINT_TYPE
+};
+
+struct b3GpuConstraintInfo2
+{
+	// integrator parameters: frames per second (1/stepsize), default error
+	// reduction parameter (0..1).
+	b3Scalar fps, erp;
+
+	// for the first and second body, pointers to two (linear and angular)
+	// n*3 jacobian sub matrices, stored by rows. these matrices will have
+	// been initialized to 0 on entry. if the second body is zero then the
+	// J2xx pointers may be 0.
+	b3Scalar *m_J1linearAxis, *m_J1angularAxis, *m_J2linearAxis, *m_J2angularAxis;
+
+	// elements to jump from one row to the next in J's
+	int rowskip;
+
+	// right hand sides of the equation J*v = c + cfm * lambda. cfm is the
+	// "constraint force mixing" vector. c is set to zero on entry, cfm is
+	// set to a constant value (typically very small or zero) value on entry.
+	b3Scalar *m_constraintError, *cfm;
+
+	// lo and hi limits for variables (set to -/+ infinity on entry).
+	b3Scalar *m_lowerLimit, *m_upperLimit;
+
+	// findex vector for variables. see the LCP solver interface for a
+	// description of what this does. this is set to -1 on entry.
+	// note that the returned indexes are relative to the first index of
+	// the constraint.
+	int* findex;
+	// number of solver iterations
+	int m_numIterations;
+
+	//damping of the velocity
+	b3Scalar m_damping;
+};
+
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3GpuGenericConstraint
+{
+	int m_constraintType;
+	int m_rbA;
+	int m_rbB;
+	float m_breakingImpulseThreshold;
+
+	b3Vector3 m_pivotInA;
+	b3Vector3 m_pivotInB;
+	b3Quaternion m_relTargetAB;
+
+	int m_flags;
+	int m_uid;
+	int m_padding[2];
+
+	int getRigidBodyA() const
+	{
+		return m_rbA;
+	}
+	int getRigidBodyB() const
+	{
+		return m_rbB;
+	}
+
+	const b3Vector3& getPivotInA() const
+	{
+		return m_pivotInA;
+	}
+
+	const b3Vector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
+
+	int isEnabled() const
+	{
+		return m_flags & B3_CONSTRAINT_FLAG_ENABLED;
+	}
+
+	float getBreakingImpulseThreshold() const
+	{
+		return m_breakingImpulseThreshold;
+	}
+
+	///internal method used by the constraint solver, don't use them directly
+	void getInfo1(unsigned int* info, const b3RigidBodyData* bodies);
+
+	///internal method used by the constraint solver, don't use them directly
+	void getInfo2(b3GpuConstraintInfo2 * info, const b3RigidBodyData* bodies);
+};
+
+#endif  //B3_GPU_GENERIC_CONSTRAINT_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.cpp
new file mode 100644
index 0000000..089fb1f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.cpp
@@ -0,0 +1,1305 @@
+
+#include "b3GpuJacobiContactSolver.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3FillCL.h"  //b3Int2
+class b3Vector3;
+#include "Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "Bullet3OpenCL/RigidBody/kernels/solverUtils.h"
+#include "Bullet3Common/b3Logging.h"
+#include "b3GpuConstraint4.h"
+#include "Bullet3Common/shared/b3Int2.h"
+#include "Bullet3Common/shared/b3Int4.h"
+#define SOLVER_UTILS_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solverUtils.cl"
+
+struct b3GpuJacobiSolverInternalData
+{
+	//btRadixSort32CL*	m_sort32;
+	//btBoundSearchCL*	m_search;
+	b3PrefixScanCL* m_scan;
+
+	b3OpenCLArray<unsigned int>* m_bodyCount;
+	b3OpenCLArray<b3Int2>* m_contactConstraintOffsets;
+	b3OpenCLArray<unsigned int>* m_offsetSplitBodies;
+
+	b3OpenCLArray<b3Vector3>* m_deltaLinearVelocities;
+	b3OpenCLArray<b3Vector3>* m_deltaAngularVelocities;
+
+	b3AlignedObjectArray<b3Vector3> m_deltaLinearVelocitiesCPU;
+	b3AlignedObjectArray<b3Vector3> m_deltaAngularVelocitiesCPU;
+
+	b3OpenCLArray<b3GpuConstraint4>* m_contactConstraints;
+
+	b3FillCL* m_filler;
+
+	cl_kernel m_countBodiesKernel;
+	cl_kernel m_contactToConstraintSplitKernel;
+	cl_kernel m_clearVelocitiesKernel;
+	cl_kernel m_averageVelocitiesKernel;
+	cl_kernel m_updateBodyVelocitiesKernel;
+	cl_kernel m_solveContactKernel;
+	cl_kernel m_solveFrictionKernel;
+};
+
+b3GpuJacobiContactSolver::b3GpuJacobiContactSolver(cl_context ctx, cl_device_id device, cl_command_queue queue, int pairCapacity)
+	: m_context(ctx),
+	  m_device(device),
+	  m_queue(queue)
+{
+	m_data = new b3GpuJacobiSolverInternalData;
+	m_data->m_scan = new b3PrefixScanCL(m_context, m_device, m_queue);
+	m_data->m_bodyCount = new b3OpenCLArray<unsigned int>(m_context, m_queue);
+	m_data->m_filler = new b3FillCL(m_context, m_device, m_queue);
+	m_data->m_contactConstraintOffsets = new b3OpenCLArray<b3Int2>(m_context, m_queue);
+	m_data->m_offsetSplitBodies = new b3OpenCLArray<unsigned int>(m_context, m_queue);
+	m_data->m_contactConstraints = new b3OpenCLArray<b3GpuConstraint4>(m_context, m_queue);
+	m_data->m_deltaLinearVelocities = new b3OpenCLArray<b3Vector3>(m_context, m_queue);
+	m_data->m_deltaAngularVelocities = new b3OpenCLArray<b3Vector3>(m_context, m_queue);
+
+	cl_int pErrNum;
+	const char* additionalMacros = "";
+	const char* solverUtilsSource = solverUtilsCL;
+	{
+		cl_program solverUtilsProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solverUtilsSource, &pErrNum, additionalMacros, SOLVER_UTILS_KERNEL_PATH);
+		b3Assert(solverUtilsProg);
+		m_data->m_countBodiesKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverUtilsSource, "CountBodiesKernel", &pErrNum, solverUtilsProg, additionalMacros);
+		b3Assert(m_data->m_countBodiesKernel);
+
+		m_data->m_contactToConstraintSplitKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverUtilsSource, "ContactToConstraintSplitKernel", &pErrNum, solverUtilsProg, additionalMacros);
+		b3Assert(m_data->m_contactToConstraintSplitKernel);
+		m_data->m_clearVelocitiesKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverUtilsSource, "ClearVelocitiesKernel", &pErrNum, solverUtilsProg, additionalMacros);
+		b3Assert(m_data->m_clearVelocitiesKernel);
+
+		m_data->m_averageVelocitiesKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverUtilsSource, "AverageVelocitiesKernel", &pErrNum, solverUtilsProg, additionalMacros);
+		b3Assert(m_data->m_averageVelocitiesKernel);
+
+		m_data->m_updateBodyVelocitiesKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverUtilsSource, "UpdateBodyVelocitiesKernel", &pErrNum, solverUtilsProg, additionalMacros);
+		b3Assert(m_data->m_updateBodyVelocitiesKernel);
+
+		m_data->m_solveContactKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverUtilsSource, "SolveContactJacobiKernel", &pErrNum, solverUtilsProg, additionalMacros);
+		b3Assert(m_data->m_solveContactKernel);
+
+		m_data->m_solveFrictionKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverUtilsSource, "SolveFrictionJacobiKernel", &pErrNum, solverUtilsProg, additionalMacros);
+		b3Assert(m_data->m_solveFrictionKernel);
+	}
+}
+
+b3GpuJacobiContactSolver::~b3GpuJacobiContactSolver()
+{
+	clReleaseKernel(m_data->m_solveContactKernel);
+	clReleaseKernel(m_data->m_solveFrictionKernel);
+	clReleaseKernel(m_data->m_countBodiesKernel);
+	clReleaseKernel(m_data->m_contactToConstraintSplitKernel);
+	clReleaseKernel(m_data->m_averageVelocitiesKernel);
+	clReleaseKernel(m_data->m_updateBodyVelocitiesKernel);
+	clReleaseKernel(m_data->m_clearVelocitiesKernel);
+
+	delete m_data->m_deltaLinearVelocities;
+	delete m_data->m_deltaAngularVelocities;
+	delete m_data->m_contactConstraints;
+	delete m_data->m_offsetSplitBodies;
+	delete m_data->m_contactConstraintOffsets;
+	delete m_data->m_bodyCount;
+	delete m_data->m_filler;
+	delete m_data->m_scan;
+	delete m_data;
+}
+
+b3Vector3 make_float4(float v)
+{
+	return b3MakeVector3(v, v, v);
+}
+
+b3Vector4 make_float4(float x, float y, float z, float w)
+{
+	return b3MakeVector4(x, y, z, w);
+}
+
+static inline float calcRelVel(const b3Vector3& l0, const b3Vector3& l1, const b3Vector3& a0, const b3Vector3& a1,
+							   const b3Vector3& linVel0, const b3Vector3& angVel0, const b3Vector3& linVel1, const b3Vector3& angVel1)
+{
+	return b3Dot(l0, linVel0) + b3Dot(a0, angVel0) + b3Dot(l1, linVel1) + b3Dot(a1, angVel1);
+}
+
+static inline void setLinearAndAngular(const b3Vector3& n, const b3Vector3& r0, const b3Vector3& r1,
+									   b3Vector3& linear, b3Vector3& angular0, b3Vector3& angular1)
+{
+	linear = n;
+	angular0 = b3Cross(r0, n);
+	angular1 = -b3Cross(r1, n);
+}
+
+static __inline void solveContact(b3GpuConstraint4& cs,
+								  const b3Vector3& posA, const b3Vector3& linVelARO, const b3Vector3& angVelARO, float invMassA, const b3Matrix3x3& invInertiaA,
+								  const b3Vector3& posB, const b3Vector3& linVelBRO, const b3Vector3& angVelBRO, float invMassB, const b3Matrix3x3& invInertiaB,
+								  float maxRambdaDt[4], float minRambdaDt[4], b3Vector3& dLinVelA, b3Vector3& dAngVelA, b3Vector3& dLinVelB, b3Vector3& dAngVelB)
+{
+	for (int ic = 0; ic < 4; ic++)
+	{
+		//	dont necessary because this makes change to 0
+		if (cs.m_jacCoeffInv[ic] == 0.f) continue;
+
+		{
+			b3Vector3 angular0, angular1, linear;
+			b3Vector3 r0 = cs.m_worldPos[ic] - (b3Vector3&)posA;
+			b3Vector3 r1 = cs.m_worldPos[ic] - (b3Vector3&)posB;
+			setLinearAndAngular((const b3Vector3&)cs.m_linear, (const b3Vector3&)r0, (const b3Vector3&)r1, linear, angular0, angular1);
+
+			float rambdaDt = calcRelVel((const b3Vector3&)cs.m_linear, (const b3Vector3&)-cs.m_linear, angular0, angular1,
+										linVelARO + dLinVelA, angVelARO + dAngVelA, linVelBRO + dLinVelB, angVelBRO + dAngVelB) +
+							 cs.m_b[ic];
+			rambdaDt *= cs.m_jacCoeffInv[ic];
+
+			{
+				float prevSum = cs.m_appliedRambdaDt[ic];
+				float updated = prevSum;
+				updated += rambdaDt;
+				updated = b3Max(updated, minRambdaDt[ic]);
+				updated = b3Min(updated, maxRambdaDt[ic]);
+				rambdaDt = updated - prevSum;
+				cs.m_appliedRambdaDt[ic] = updated;
+			}
+
+			b3Vector3 linImp0 = invMassA * linear * rambdaDt;
+			b3Vector3 linImp1 = invMassB * (-linear) * rambdaDt;
+			b3Vector3 angImp0 = (invInertiaA * angular0) * rambdaDt;
+			b3Vector3 angImp1 = (invInertiaB * angular1) * rambdaDt;
+#ifdef _WIN32
+			b3Assert(_finite(linImp0.getX()));
+			b3Assert(_finite(linImp1.getX()));
+#endif
+
+			if (invMassA)
+			{
+				dLinVelA += linImp0;
+				dAngVelA += angImp0;
+			}
+			if (invMassB)
+			{
+				dLinVelB += linImp1;
+				dAngVelB += angImp1;
+			}
+		}
+	}
+}
+
+void solveContact3(b3GpuConstraint4* cs,
+				   b3Vector3* posAPtr, b3Vector3* linVelA, b3Vector3* angVelA, float invMassA, const b3Matrix3x3& invInertiaA,
+				   b3Vector3* posBPtr, b3Vector3* linVelB, b3Vector3* angVelB, float invMassB, const b3Matrix3x3& invInertiaB,
+				   b3Vector3* dLinVelA, b3Vector3* dAngVelA, b3Vector3* dLinVelB, b3Vector3* dAngVelB)
+{
+	float minRambdaDt = 0;
+	float maxRambdaDt = FLT_MAX;
+
+	for (int ic = 0; ic < 4; ic++)
+	{
+		if (cs->m_jacCoeffInv[ic] == 0.f) continue;
+
+		b3Vector3 angular0, angular1, linear;
+		b3Vector3 r0 = cs->m_worldPos[ic] - *posAPtr;
+		b3Vector3 r1 = cs->m_worldPos[ic] - *posBPtr;
+		setLinearAndAngular(cs->m_linear, r0, r1, linear, angular0, angular1);
+
+		float rambdaDt = calcRelVel(cs->m_linear, -cs->m_linear, angular0, angular1,
+									*linVelA + *dLinVelA, *angVelA + *dAngVelA, *linVelB + *dLinVelB, *angVelB + *dAngVelB) +
+						 cs->m_b[ic];
+		rambdaDt *= cs->m_jacCoeffInv[ic];
+
+		{
+			float prevSum = cs->m_appliedRambdaDt[ic];
+			float updated = prevSum;
+			updated += rambdaDt;
+			updated = b3Max(updated, minRambdaDt);
+			updated = b3Min(updated, maxRambdaDt);
+			rambdaDt = updated - prevSum;
+			cs->m_appliedRambdaDt[ic] = updated;
+		}
+
+		b3Vector3 linImp0 = invMassA * linear * rambdaDt;
+		b3Vector3 linImp1 = invMassB * (-linear) * rambdaDt;
+		b3Vector3 angImp0 = (invInertiaA * angular0) * rambdaDt;
+		b3Vector3 angImp1 = (invInertiaB * angular1) * rambdaDt;
+
+		if (invMassA)
+		{
+			*dLinVelA += linImp0;
+			*dAngVelA += angImp0;
+		}
+		if (invMassB)
+		{
+			*dLinVelB += linImp1;
+			*dAngVelB += angImp1;
+		}
+	}
+}
+
+static inline void solveFriction(b3GpuConstraint4& cs,
+								 const b3Vector3& posA, const b3Vector3& linVelARO, const b3Vector3& angVelARO, float invMassA, const b3Matrix3x3& invInertiaA,
+								 const b3Vector3& posB, const b3Vector3& linVelBRO, const b3Vector3& angVelBRO, float invMassB, const b3Matrix3x3& invInertiaB,
+								 float maxRambdaDt[4], float minRambdaDt[4], b3Vector3& dLinVelA, b3Vector3& dAngVelA, b3Vector3& dLinVelB, b3Vector3& dAngVelB)
+{
+	b3Vector3 linVelA = linVelARO + dLinVelA;
+	b3Vector3 linVelB = linVelBRO + dLinVelB;
+	b3Vector3 angVelA = angVelARO + dAngVelA;
+	b3Vector3 angVelB = angVelBRO + dAngVelB;
+
+	if (cs.m_fJacCoeffInv[0] == 0 && cs.m_fJacCoeffInv[0] == 0) return;
+	const b3Vector3& center = (const b3Vector3&)cs.m_center;
+
+	b3Vector3 n = -(const b3Vector3&)cs.m_linear;
+
+	b3Vector3 tangent[2];
+#if 1
+	b3PlaneSpace1(n, tangent[0], tangent[1]);
+#else
+	b3Vector3 r = cs.m_worldPos[0] - center;
+	tangent[0] = cross3(n, r);
+	tangent[1] = cross3(tangent[0], n);
+	tangent[0] = normalize3(tangent[0]);
+	tangent[1] = normalize3(tangent[1]);
+#endif
+
+	b3Vector3 angular0, angular1, linear;
+	b3Vector3 r0 = center - posA;
+	b3Vector3 r1 = center - posB;
+	for (int i = 0; i < 2; i++)
+	{
+		setLinearAndAngular(tangent[i], r0, r1, linear, angular0, angular1);
+		float rambdaDt = calcRelVel(linear, -linear, angular0, angular1,
+									linVelA, angVelA, linVelB, angVelB);
+		rambdaDt *= cs.m_fJacCoeffInv[i];
+
+		{
+			float prevSum = cs.m_fAppliedRambdaDt[i];
+			float updated = prevSum;
+			updated += rambdaDt;
+			updated = b3Max(updated, minRambdaDt[i]);
+			updated = b3Min(updated, maxRambdaDt[i]);
+			rambdaDt = updated - prevSum;
+			cs.m_fAppliedRambdaDt[i] = updated;
+		}
+
+		b3Vector3 linImp0 = invMassA * linear * rambdaDt;
+		b3Vector3 linImp1 = invMassB * (-linear) * rambdaDt;
+		b3Vector3 angImp0 = (invInertiaA * angular0) * rambdaDt;
+		b3Vector3 angImp1 = (invInertiaB * angular1) * rambdaDt;
+#ifdef _WIN32
+		b3Assert(_finite(linImp0.getX()));
+		b3Assert(_finite(linImp1.getX()));
+#endif
+		if (invMassA)
+		{
+			dLinVelA += linImp0;
+			dAngVelA += angImp0;
+		}
+		if (invMassB)
+		{
+			dLinVelB += linImp1;
+			dAngVelB += angImp1;
+		}
+	}
+
+	{  //	angular damping for point constraint
+		b3Vector3 ab = (posB - posA).normalized();
+		b3Vector3 ac = (center - posA).normalized();
+		if (b3Dot(ab, ac) > 0.95f || (invMassA == 0.f || invMassB == 0.f))
+		{
+			float angNA = b3Dot(n, angVelA);
+			float angNB = b3Dot(n, angVelB);
+
+			if (invMassA)
+				dAngVelA -= (angNA * 0.1f) * n;
+			if (invMassB)
+				dAngVelB -= (angNB * 0.1f) * n;
+		}
+	}
+}
+
+float calcJacCoeff(const b3Vector3& linear0, const b3Vector3& linear1, const b3Vector3& angular0, const b3Vector3& angular1,
+				   float invMass0, const b3Matrix3x3* invInertia0, float invMass1, const b3Matrix3x3* invInertia1, float countA, float countB)
+{
+	//	linear0,1 are normlized
+	float jmj0 = invMass0;  //dot3F4(linear0, linear0)*invMass0;
+
+	float jmj1 = b3Dot(mtMul3(angular0, *invInertia0), angular0);
+	float jmj2 = invMass1;  //dot3F4(linear1, linear1)*invMass1;
+	float jmj3 = b3Dot(mtMul3(angular1, *invInertia1), angular1);
+	return -1.f / ((jmj0 + jmj1) * countA + (jmj2 + jmj3) * countB);
+	//	return -1.f/((jmj0+jmj1)+(jmj2+jmj3));
+}
+
+void setConstraint4(const b3Vector3& posA, const b3Vector3& linVelA, const b3Vector3& angVelA, float invMassA, const b3Matrix3x3& invInertiaA,
+					const b3Vector3& posB, const b3Vector3& linVelB, const b3Vector3& angVelB, float invMassB, const b3Matrix3x3& invInertiaB,
+					b3Contact4* src, float dt, float positionDrift, float positionConstraintCoeff, float countA, float countB,
+					b3GpuConstraint4* dstC)
+{
+	dstC->m_bodyA = abs(src->m_bodyAPtrAndSignBit);
+	dstC->m_bodyB = abs(src->m_bodyBPtrAndSignBit);
+
+	float dtInv = 1.f / dt;
+	for (int ic = 0; ic < 4; ic++)
+	{
+		dstC->m_appliedRambdaDt[ic] = 0.f;
+	}
+	dstC->m_fJacCoeffInv[0] = dstC->m_fJacCoeffInv[1] = 0.f;
+
+	dstC->m_linear = src->m_worldNormalOnB;
+	dstC->m_linear[3] = 0.7f;  //src->getFrictionCoeff() );
+	for (int ic = 0; ic < 4; ic++)
+	{
+		b3Vector3 r0 = src->m_worldPosB[ic] - posA;
+		b3Vector3 r1 = src->m_worldPosB[ic] - posB;
+
+		if (ic >= src->m_worldNormalOnB[3])  //npoints
+		{
+			dstC->m_jacCoeffInv[ic] = 0.f;
+			continue;
+		}
+
+		float relVelN;
+		{
+			b3Vector3 linear, angular0, angular1;
+			setLinearAndAngular(src->m_worldNormalOnB, r0, r1, linear, angular0, angular1);
+
+			dstC->m_jacCoeffInv[ic] = calcJacCoeff(linear, -linear, angular0, angular1,
+												   invMassA, &invInertiaA, invMassB, &invInertiaB, countA, countB);
+
+			relVelN = calcRelVel(linear, -linear, angular0, angular1,
+								 linVelA, angVelA, linVelB, angVelB);
+
+			float e = 0.f;  //src->getRestituitionCoeff();
+			if (relVelN * relVelN < 0.004f)
+			{
+				e = 0.f;
+			}
+
+			dstC->m_b[ic] = e * relVelN;
+			//float penetration = src->m_worldPos[ic].w;
+			dstC->m_b[ic] += (src->m_worldPosB[ic][3] + positionDrift) * positionConstraintCoeff * dtInv;
+			dstC->m_appliedRambdaDt[ic] = 0.f;
+		}
+	}
+
+	if (src->m_worldNormalOnB[3] > 0)  //npoints
+	{                                  //	prepare friction
+		b3Vector3 center = make_float4(0.f);
+		for (int i = 0; i < src->m_worldNormalOnB[3]; i++)
+			center += src->m_worldPosB[i];
+		center /= (float)src->m_worldNormalOnB[3];
+
+		b3Vector3 tangent[2];
+		b3PlaneSpace1(src->m_worldNormalOnB, tangent[0], tangent[1]);
+
+		b3Vector3 r[2];
+		r[0] = center - posA;
+		r[1] = center - posB;
+
+		for (int i = 0; i < 2; i++)
+		{
+			b3Vector3 linear, angular0, angular1;
+			setLinearAndAngular(tangent[i], r[0], r[1], linear, angular0, angular1);
+
+			dstC->m_fJacCoeffInv[i] = calcJacCoeff(linear, -linear, angular0, angular1,
+												   invMassA, &invInertiaA, invMassB, &invInertiaB, countA, countB);
+			dstC->m_fAppliedRambdaDt[i] = 0.f;
+		}
+		dstC->m_center = center;
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		if (i < src->m_worldNormalOnB[3])
+		{
+			dstC->m_worldPos[i] = src->m_worldPosB[i];
+		}
+		else
+		{
+			dstC->m_worldPos[i] = make_float4(0.f);
+		}
+	}
+}
+
+void ContactToConstraintKernel(b3Contact4* gContact, b3RigidBodyData* gBodies, b3InertiaData* gShapes, b3GpuConstraint4* gConstraintOut, int nContacts,
+							   float dt,
+							   float positionDrift,
+							   float positionConstraintCoeff, int gIdx, b3AlignedObjectArray<unsigned int>& bodyCount)
+{
+	//int gIdx = 0;//GET_GLOBAL_IDX;
+
+	if (gIdx < nContacts)
+	{
+		int aIdx = abs(gContact[gIdx].m_bodyAPtrAndSignBit);
+		int bIdx = abs(gContact[gIdx].m_bodyBPtrAndSignBit);
+
+		b3Vector3 posA = gBodies[aIdx].m_pos;
+		b3Vector3 linVelA = gBodies[aIdx].m_linVel;
+		b3Vector3 angVelA = gBodies[aIdx].m_angVel;
+		float invMassA = gBodies[aIdx].m_invMass;
+		b3Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertiaWorld;  //.m_invInertia;
+
+		b3Vector3 posB = gBodies[bIdx].m_pos;
+		b3Vector3 linVelB = gBodies[bIdx].m_linVel;
+		b3Vector3 angVelB = gBodies[bIdx].m_angVel;
+		float invMassB = gBodies[bIdx].m_invMass;
+		b3Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertiaWorld;  //m_invInertia;
+
+		b3GpuConstraint4 cs;
+		float countA = invMassA ? (float)(bodyCount[aIdx]) : 1;
+		float countB = invMassB ? (float)(bodyCount[bIdx]) : 1;
+		setConstraint4(posA, linVelA, angVelA, invMassA, invInertiaA, posB, linVelB, angVelB, invMassB, invInertiaB,
+					   &gContact[gIdx], dt, positionDrift, positionConstraintCoeff, countA, countB,
+					   &cs);
+
+		cs.m_batchIdx = gContact[gIdx].m_batchIdx;
+
+		gConstraintOut[gIdx] = cs;
+	}
+}
+
+void b3GpuJacobiContactSolver::solveGroupHost(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, b3Contact4* manifoldPtr, int numManifolds, const b3JacobiSolverInfo& solverInfo)
+{
+	B3_PROFILE("b3GpuJacobiContactSolver::solveGroup");
+
+	b3AlignedObjectArray<unsigned int> bodyCount;
+	bodyCount.resize(numBodies);
+	for (int i = 0; i < numBodies; i++)
+		bodyCount[i] = 0;
+
+	b3AlignedObjectArray<b3Int2> contactConstraintOffsets;
+	contactConstraintOffsets.resize(numManifolds);
+
+	for (int i = 0; i < numManifolds; i++)
+	{
+		int pa = manifoldPtr[i].m_bodyAPtrAndSignBit;
+		int pb = manifoldPtr[i].m_bodyBPtrAndSignBit;
+
+		bool isFixedA = (pa < 0) || (pa == solverInfo.m_fixedBodyIndex);
+		bool isFixedB = (pb < 0) || (pb == solverInfo.m_fixedBodyIndex);
+
+		int bodyIndexA = manifoldPtr[i].getBodyA();
+		int bodyIndexB = manifoldPtr[i].getBodyB();
+
+		if (!isFixedA)
+		{
+			contactConstraintOffsets[i].x = bodyCount[bodyIndexA];
+			bodyCount[bodyIndexA]++;
+		}
+		if (!isFixedB)
+		{
+			contactConstraintOffsets[i].y = bodyCount[bodyIndexB];
+			bodyCount[bodyIndexB]++;
+		}
+	}
+
+	b3AlignedObjectArray<unsigned int> offsetSplitBodies;
+	offsetSplitBodies.resize(numBodies);
+	unsigned int totalNumSplitBodies;
+	m_data->m_scan->executeHost(bodyCount, offsetSplitBodies, numBodies, &totalNumSplitBodies);
+	int numlastBody = bodyCount[numBodies - 1];
+	totalNumSplitBodies += numlastBody;
+	printf("totalNumSplitBodies = %d\n", totalNumSplitBodies);
+
+	b3AlignedObjectArray<b3GpuConstraint4> contactConstraints;
+	contactConstraints.resize(numManifolds);
+
+	for (int i = 0; i < numManifolds; i++)
+	{
+		ContactToConstraintKernel(&manifoldPtr[0], bodies, inertias, &contactConstraints[0], numManifolds,
+								  solverInfo.m_deltaTime,
+								  solverInfo.m_positionDrift,
+								  solverInfo.m_positionConstraintCoeff,
+								  i, bodyCount);
+	}
+	int maxIter = solverInfo.m_numIterations;
+
+	b3AlignedObjectArray<b3Vector3> deltaLinearVelocities;
+	b3AlignedObjectArray<b3Vector3> deltaAngularVelocities;
+	deltaLinearVelocities.resize(totalNumSplitBodies);
+	deltaAngularVelocities.resize(totalNumSplitBodies);
+	for (unsigned int i = 0; i < totalNumSplitBodies; i++)
+	{
+		deltaLinearVelocities[i].setZero();
+		deltaAngularVelocities[i].setZero();
+	}
+
+	for (int iter = 0; iter < maxIter; iter++)
+	{
+		int i = 0;
+		for (i = 0; i < numManifolds; i++)
+		{
+			//float frictionCoeff = contactConstraints[i].getFrictionCoeff();
+			int aIdx = (int)contactConstraints[i].m_bodyA;
+			int bIdx = (int)contactConstraints[i].m_bodyB;
+			b3RigidBodyData& bodyA = bodies[aIdx];
+			b3RigidBodyData& bodyB = bodies[bIdx];
+
+			b3Vector3 zero = b3MakeVector3(0, 0, 0);
+
+			b3Vector3* dlvAPtr = &zero;
+			b3Vector3* davAPtr = &zero;
+			b3Vector3* dlvBPtr = &zero;
+			b3Vector3* davBPtr = &zero;
+
+			if (bodyA.m_invMass)
+			{
+				int bodyOffsetA = offsetSplitBodies[aIdx];
+				int constraintOffsetA = contactConstraintOffsets[i].x;
+				int splitIndexA = bodyOffsetA + constraintOffsetA;
+				dlvAPtr = &deltaLinearVelocities[splitIndexA];
+				davAPtr = &deltaAngularVelocities[splitIndexA];
+			}
+
+			if (bodyB.m_invMass)
+			{
+				int bodyOffsetB = offsetSplitBodies[bIdx];
+				int constraintOffsetB = contactConstraintOffsets[i].y;
+				int splitIndexB = bodyOffsetB + constraintOffsetB;
+				dlvBPtr = &deltaLinearVelocities[splitIndexB];
+				davBPtr = &deltaAngularVelocities[splitIndexB];
+			}
+
+			{
+				float maxRambdaDt[4] = {FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX};
+				float minRambdaDt[4] = {0.f, 0.f, 0.f, 0.f};
+
+				solveContact(contactConstraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, inertias[aIdx].m_invInertiaWorld,
+							 (b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, inertias[bIdx].m_invInertiaWorld,
+							 maxRambdaDt, minRambdaDt, *dlvAPtr, *davAPtr, *dlvBPtr, *davBPtr);
+			}
+		}
+
+		//easy
+		for (int i = 0; i < numBodies; i++)
+		{
+			if (bodies[i].m_invMass)
+			{
+				int bodyOffset = offsetSplitBodies[i];
+				int count = bodyCount[i];
+				float factor = 1.f / float(count);
+				b3Vector3 averageLinVel;
+				averageLinVel.setZero();
+				b3Vector3 averageAngVel;
+				averageAngVel.setZero();
+				for (int j = 0; j < count; j++)
+				{
+					averageLinVel += deltaLinearVelocities[bodyOffset + j] * factor;
+					averageAngVel += deltaAngularVelocities[bodyOffset + j] * factor;
+				}
+				for (int j = 0; j < count; j++)
+				{
+					deltaLinearVelocities[bodyOffset + j] = averageLinVel;
+					deltaAngularVelocities[bodyOffset + j] = averageAngVel;
+				}
+			}
+		}
+	}
+	for (int iter = 0; iter < maxIter; iter++)
+	{
+		//int i=0;
+
+		//solve friction
+
+		for (int i = 0; i < numManifolds; i++)
+		{
+			float maxRambdaDt[4] = {FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX};
+			float minRambdaDt[4] = {0.f, 0.f, 0.f, 0.f};
+
+			float sum = 0;
+			for (int j = 0; j < 4; j++)
+			{
+				sum += contactConstraints[i].m_appliedRambdaDt[j];
+			}
+			float frictionCoeff = contactConstraints[i].getFrictionCoeff();
+			int aIdx = (int)contactConstraints[i].m_bodyA;
+			int bIdx = (int)contactConstraints[i].m_bodyB;
+			b3RigidBodyData& bodyA = bodies[aIdx];
+			b3RigidBodyData& bodyB = bodies[bIdx];
+
+			b3Vector3 zero = b3MakeVector3(0, 0, 0);
+
+			b3Vector3* dlvAPtr = &zero;
+			b3Vector3* davAPtr = &zero;
+			b3Vector3* dlvBPtr = &zero;
+			b3Vector3* davBPtr = &zero;
+
+			if (bodyA.m_invMass)
+			{
+				int bodyOffsetA = offsetSplitBodies[aIdx];
+				int constraintOffsetA = contactConstraintOffsets[i].x;
+				int splitIndexA = bodyOffsetA + constraintOffsetA;
+				dlvAPtr = &deltaLinearVelocities[splitIndexA];
+				davAPtr = &deltaAngularVelocities[splitIndexA];
+			}
+
+			if (bodyB.m_invMass)
+			{
+				int bodyOffsetB = offsetSplitBodies[bIdx];
+				int constraintOffsetB = contactConstraintOffsets[i].y;
+				int splitIndexB = bodyOffsetB + constraintOffsetB;
+				dlvBPtr = &deltaLinearVelocities[splitIndexB];
+				davBPtr = &deltaAngularVelocities[splitIndexB];
+			}
+
+			for (int j = 0; j < 4; j++)
+			{
+				maxRambdaDt[j] = frictionCoeff * sum;
+				minRambdaDt[j] = -maxRambdaDt[j];
+			}
+
+			solveFriction(contactConstraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, inertias[aIdx].m_invInertiaWorld,
+						  (b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, inertias[bIdx].m_invInertiaWorld,
+						  maxRambdaDt, minRambdaDt, *dlvAPtr, *davAPtr, *dlvBPtr, *davBPtr);
+		}
+
+		//easy
+		for (int i = 0; i < numBodies; i++)
+		{
+			if (bodies[i].m_invMass)
+			{
+				int bodyOffset = offsetSplitBodies[i];
+				int count = bodyCount[i];
+				float factor = 1.f / float(count);
+				b3Vector3 averageLinVel;
+				averageLinVel.setZero();
+				b3Vector3 averageAngVel;
+				averageAngVel.setZero();
+				for (int j = 0; j < count; j++)
+				{
+					averageLinVel += deltaLinearVelocities[bodyOffset + j] * factor;
+					averageAngVel += deltaAngularVelocities[bodyOffset + j] * factor;
+				}
+				for (int j = 0; j < count; j++)
+				{
+					deltaLinearVelocities[bodyOffset + j] = averageLinVel;
+					deltaAngularVelocities[bodyOffset + j] = averageAngVel;
+				}
+			}
+		}
+	}
+
+	//easy
+	for (int i = 0; i < numBodies; i++)
+	{
+		if (bodies[i].m_invMass)
+		{
+			int bodyOffset = offsetSplitBodies[i];
+			int count = bodyCount[i];
+			if (count)
+			{
+				bodies[i].m_linVel += deltaLinearVelocities[bodyOffset];
+				bodies[i].m_angVel += deltaAngularVelocities[bodyOffset];
+			}
+		}
+	}
+}
+
+void b3GpuJacobiContactSolver::solveContacts(int numBodies, cl_mem bodyBuf, cl_mem inertiaBuf, int numContacts, cl_mem contactBuf, const struct b3Config& config, int static0Index)
+//
+//
+//void  b3GpuJacobiContactSolver::solveGroup(b3OpenCLArray<b3RigidBodyData>* bodies,b3OpenCLArray<b3InertiaData>* inertias,b3OpenCLArray<b3Contact4>* manifoldPtr,const btJacobiSolverInfo& solverInfo)
+{
+	b3JacobiSolverInfo solverInfo;
+	solverInfo.m_fixedBodyIndex = static0Index;
+
+	B3_PROFILE("b3GpuJacobiContactSolver::solveGroup");
+
+	//int numBodies = bodies->size();
+	int numManifolds = numContacts;  //manifoldPtr->size();
+
+	{
+		B3_PROFILE("resize");
+		m_data->m_bodyCount->resize(numBodies);
+	}
+
+	unsigned int val = 0;
+	b3Int2 val2;
+	val2.x = 0;
+	val2.y = 0;
+
+	{
+		B3_PROFILE("m_filler");
+		m_data->m_contactConstraintOffsets->resize(numManifolds);
+		m_data->m_filler->execute(*m_data->m_bodyCount, val, numBodies);
+
+		m_data->m_filler->execute(*m_data->m_contactConstraintOffsets, val2, numManifolds);
+	}
+
+	{
+		B3_PROFILE("m_countBodiesKernel");
+		b3LauncherCL launcher(this->m_queue, m_data->m_countBodiesKernel, "m_countBodiesKernel");
+		launcher.setBuffer(contactBuf);  //manifoldPtr->getBufferCL());
+		launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+		launcher.setBuffer(m_data->m_contactConstraintOffsets->getBufferCL());
+		launcher.setConst(numManifolds);
+		launcher.setConst(solverInfo.m_fixedBodyIndex);
+		launcher.launch1D(numManifolds);
+	}
+	unsigned int totalNumSplitBodies = 0;
+	{
+		B3_PROFILE("m_scan->execute");
+
+		m_data->m_offsetSplitBodies->resize(numBodies);
+		m_data->m_scan->execute(*m_data->m_bodyCount, *m_data->m_offsetSplitBodies, numBodies, &totalNumSplitBodies);
+		totalNumSplitBodies += m_data->m_bodyCount->at(numBodies - 1);
+	}
+
+	{
+		B3_PROFILE("m_data->m_contactConstraints->resize");
+		//int numContacts = manifoldPtr->size();
+		m_data->m_contactConstraints->resize(numContacts);
+	}
+
+	{
+		B3_PROFILE("contactToConstraintSplitKernel");
+		b3LauncherCL launcher(m_queue, m_data->m_contactToConstraintSplitKernel, "m_contactToConstraintSplitKernel");
+		launcher.setBuffer(contactBuf);
+		launcher.setBuffer(bodyBuf);
+		launcher.setBuffer(inertiaBuf);
+		launcher.setBuffer(m_data->m_contactConstraints->getBufferCL());
+		launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+		launcher.setConst(numContacts);
+		launcher.setConst(solverInfo.m_deltaTime);
+		launcher.setConst(solverInfo.m_positionDrift);
+		launcher.setConst(solverInfo.m_positionConstraintCoeff);
+		launcher.launch1D(numContacts, 64);
+	}
+
+	{
+		B3_PROFILE("m_data->m_deltaLinearVelocities->resize");
+		m_data->m_deltaLinearVelocities->resize(totalNumSplitBodies);
+		m_data->m_deltaAngularVelocities->resize(totalNumSplitBodies);
+	}
+
+	{
+		B3_PROFILE("m_clearVelocitiesKernel");
+		b3LauncherCL launch(m_queue, m_data->m_clearVelocitiesKernel, "m_clearVelocitiesKernel");
+		launch.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+		launch.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+		launch.setConst(totalNumSplitBodies);
+		launch.launch1D(totalNumSplitBodies);
+		clFinish(m_queue);
+	}
+
+	int maxIter = solverInfo.m_numIterations;
+
+	for (int iter = 0; iter < maxIter; iter++)
+	{
+		{
+			B3_PROFILE("m_solveContactKernel");
+			b3LauncherCL launcher(m_queue, m_data->m_solveContactKernel, "m_solveContactKernel");
+			launcher.setBuffer(m_data->m_contactConstraints->getBufferCL());
+			launcher.setBuffer(bodyBuf);
+			launcher.setBuffer(inertiaBuf);
+			launcher.setBuffer(m_data->m_contactConstraintOffsets->getBufferCL());
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(solverInfo.m_deltaTime);
+			launcher.setConst(solverInfo.m_positionDrift);
+			launcher.setConst(solverInfo.m_positionConstraintCoeff);
+			launcher.setConst(solverInfo.m_fixedBodyIndex);
+			launcher.setConst(numManifolds);
+
+			launcher.launch1D(numManifolds);
+			clFinish(m_queue);
+		}
+
+		{
+			B3_PROFILE("average velocities");
+			b3LauncherCL launcher(m_queue, m_data->m_averageVelocitiesKernel, "m_averageVelocitiesKernel");
+			launcher.setBuffer(bodyBuf);
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(numBodies);
+			launcher.launch1D(numBodies);
+			clFinish(m_queue);
+		}
+
+		{
+			B3_PROFILE("m_solveFrictionKernel");
+			b3LauncherCL launcher(m_queue, m_data->m_solveFrictionKernel, "m_solveFrictionKernel");
+			launcher.setBuffer(m_data->m_contactConstraints->getBufferCL());
+			launcher.setBuffer(bodyBuf);
+			launcher.setBuffer(inertiaBuf);
+			launcher.setBuffer(m_data->m_contactConstraintOffsets->getBufferCL());
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(solverInfo.m_deltaTime);
+			launcher.setConst(solverInfo.m_positionDrift);
+			launcher.setConst(solverInfo.m_positionConstraintCoeff);
+			launcher.setConst(solverInfo.m_fixedBodyIndex);
+			launcher.setConst(numManifolds);
+
+			launcher.launch1D(numManifolds);
+			clFinish(m_queue);
+		}
+
+		{
+			B3_PROFILE("average velocities");
+			b3LauncherCL launcher(m_queue, m_data->m_averageVelocitiesKernel, "m_averageVelocitiesKernel");
+			launcher.setBuffer(bodyBuf);
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(numBodies);
+			launcher.launch1D(numBodies);
+			clFinish(m_queue);
+		}
+	}
+
+	{
+		B3_PROFILE("update body velocities");
+		b3LauncherCL launcher(m_queue, m_data->m_updateBodyVelocitiesKernel, "m_updateBodyVelocitiesKernel");
+		launcher.setBuffer(bodyBuf);
+		launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+		launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+		launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+		launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+		launcher.setConst(numBodies);
+		launcher.launch1D(numBodies);
+		clFinish(m_queue);
+	}
+}
+
+#if 0
+
+void  b3GpuJacobiContactSolver::solveGroupMixed(b3OpenCLArray<b3RigidBodyData>* bodiesGPU,b3OpenCLArray<b3InertiaData>* inertiasGPU,b3OpenCLArray<b3Contact4>* manifoldPtrGPU,const btJacobiSolverInfo& solverInfo)
+{
+
+	b3AlignedObjectArray<b3RigidBodyData> bodiesCPU;
+	bodiesGPU->copyToHost(bodiesCPU);
+	b3AlignedObjectArray<b3InertiaData> inertiasCPU;
+	inertiasGPU->copyToHost(inertiasCPU);
+	b3AlignedObjectArray<b3Contact4> manifoldPtrCPU;
+	manifoldPtrGPU->copyToHost(manifoldPtrCPU);
+	
+	int numBodiesCPU = bodiesGPU->size();
+	int numManifoldsCPU = manifoldPtrGPU->size();
+	B3_PROFILE("b3GpuJacobiContactSolver::solveGroupMixed");
+
+	b3AlignedObjectArray<unsigned int> bodyCount;
+	bodyCount.resize(numBodiesCPU);
+	for (int i=0;i<numBodiesCPU;i++)
+		bodyCount[i] = 0;
+
+	b3AlignedObjectArray<b3Int2> contactConstraintOffsets;
+	contactConstraintOffsets.resize(numManifoldsCPU);
+
+
+	for (int i=0;i<numManifoldsCPU;i++)
+	{
+		int pa = manifoldPtrCPU[i].m_bodyAPtrAndSignBit;
+		int pb = manifoldPtrCPU[i].m_bodyBPtrAndSignBit;
+
+		bool isFixedA = (pa <0) || (pa == solverInfo.m_fixedBodyIndex);
+		bool isFixedB = (pb <0) || (pb == solverInfo.m_fixedBodyIndex);
+
+		int bodyIndexA = manifoldPtrCPU[i].getBodyA();
+		int bodyIndexB = manifoldPtrCPU[i].getBodyB();
+
+		if (!isFixedA)
+		{
+			contactConstraintOffsets[i].x = bodyCount[bodyIndexA];
+			bodyCount[bodyIndexA]++;
+		}
+		if (!isFixedB)
+		{
+			contactConstraintOffsets[i].y = bodyCount[bodyIndexB];
+			bodyCount[bodyIndexB]++;
+		} 
+	}
+
+	b3AlignedObjectArray<unsigned int> offsetSplitBodies;
+	offsetSplitBodies.resize(numBodiesCPU);
+	unsigned int totalNumSplitBodiesCPU;
+	m_data->m_scan->executeHost(bodyCount,offsetSplitBodies,numBodiesCPU,&totalNumSplitBodiesCPU);
+	int numlastBody = bodyCount[numBodiesCPU-1];
+	totalNumSplitBodiesCPU += numlastBody;
+
+		int numBodies = bodiesGPU->size();
+	int numManifolds = manifoldPtrGPU->size();
+
+	m_data->m_bodyCount->resize(numBodies);
+	
+	unsigned int val=0;
+	b3Int2 val2;
+	val2.x=0;
+	val2.y=0;
+
+	 {
+		B3_PROFILE("m_filler");
+		m_data->m_contactConstraintOffsets->resize(numManifolds);
+		m_data->m_filler->execute(*m_data->m_bodyCount,val,numBodies);
+		
+	
+		m_data->m_filler->execute(*m_data->m_contactConstraintOffsets,val2,numManifolds);
+	}
+
+	{
+		B3_PROFILE("m_countBodiesKernel");
+		b3LauncherCL launcher(this->m_queue,m_data->m_countBodiesKernel);
+		launcher.setBuffer(manifoldPtrGPU->getBufferCL());
+		launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+		launcher.setBuffer(m_data->m_contactConstraintOffsets->getBufferCL());
+		launcher.setConst(numManifolds);
+		launcher.setConst(solverInfo.m_fixedBodyIndex);
+		launcher.launch1D(numManifolds);
+	}
+
+	unsigned int totalNumSplitBodies=0;
+	m_data->m_offsetSplitBodies->resize(numBodies);
+	m_data->m_scan->execute(*m_data->m_bodyCount,*m_data->m_offsetSplitBodies,numBodies,&totalNumSplitBodies);
+	totalNumSplitBodies+=m_data->m_bodyCount->at(numBodies-1);
+
+	if (totalNumSplitBodies != totalNumSplitBodiesCPU)
+	{
+		printf("error in totalNumSplitBodies!\n");
+	}
+
+	int numContacts = manifoldPtrGPU->size();
+	m_data->m_contactConstraints->resize(numContacts);
+
+	
+	{
+		B3_PROFILE("contactToConstraintSplitKernel");
+		b3LauncherCL launcher( m_queue, m_data->m_contactToConstraintSplitKernel);
+		launcher.setBuffer(manifoldPtrGPU->getBufferCL());
+		launcher.setBuffer(bodiesGPU->getBufferCL());
+		launcher.setBuffer(inertiasGPU->getBufferCL());
+		launcher.setBuffer(m_data->m_contactConstraints->getBufferCL());
+		launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+        launcher.setConst(numContacts);
+		launcher.setConst(solverInfo.m_deltaTime);
+		launcher.setConst(solverInfo.m_positionDrift);
+		launcher.setConst(solverInfo.m_positionConstraintCoeff);
+		launcher.launch1D( numContacts, 64 );
+		clFinish(m_queue);
+	}
+
+
+
+	b3AlignedObjectArray<b3GpuConstraint4> contactConstraints;
+	contactConstraints.resize(numManifoldsCPU);
+
+	for (int i=0;i<numManifoldsCPU;i++)
+	{
+		ContactToConstraintKernel(&manifoldPtrCPU[0],&bodiesCPU[0],&inertiasCPU[0],&contactConstraints[0],numManifoldsCPU,
+			solverInfo.m_deltaTime,
+			solverInfo.m_positionDrift,
+			solverInfo.m_positionConstraintCoeff,
+			i, bodyCount);
+	}
+	int maxIter = solverInfo.m_numIterations;
+
+
+	b3AlignedObjectArray<b3Vector3> deltaLinearVelocities;
+	b3AlignedObjectArray<b3Vector3> deltaAngularVelocities;
+	deltaLinearVelocities.resize(totalNumSplitBodiesCPU);
+	deltaAngularVelocities.resize(totalNumSplitBodiesCPU);
+	for (int i=0;i<totalNumSplitBodiesCPU;i++)
+	{
+		deltaLinearVelocities[i].setZero();
+		deltaAngularVelocities[i].setZero();
+	}
+
+	m_data->m_deltaLinearVelocities->resize(totalNumSplitBodies);
+	m_data->m_deltaAngularVelocities->resize(totalNumSplitBodies);
+
+
+	
+	{
+		B3_PROFILE("m_clearVelocitiesKernel");
+		b3LauncherCL launch(m_queue,m_data->m_clearVelocitiesKernel);
+		launch.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+		launch.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+		launch.setConst(totalNumSplitBodies);
+		launch.launch1D(totalNumSplitBodies);
+	}
+	
+
+		///!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+
+	m_data->m_contactConstraints->copyToHost(contactConstraints);
+	m_data->m_offsetSplitBodies->copyToHost(offsetSplitBodies);
+	m_data->m_contactConstraintOffsets->copyToHost(contactConstraintOffsets);
+	m_data->m_deltaLinearVelocities->copyToHost(deltaLinearVelocities);
+	m_data->m_deltaAngularVelocities->copyToHost(deltaAngularVelocities);
+
+	for (int iter = 0;iter<maxIter;iter++)
+	{
+
+				{
+			B3_PROFILE("m_solveContactKernel");
+			b3LauncherCL launcher( m_queue, m_data->m_solveContactKernel );
+			launcher.setBuffer(m_data->m_contactConstraints->getBufferCL());
+			launcher.setBuffer(bodiesGPU->getBufferCL());
+			launcher.setBuffer(inertiasGPU->getBufferCL());
+			launcher.setBuffer(m_data->m_contactConstraintOffsets->getBufferCL());
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(solverInfo.m_deltaTime);
+			launcher.setConst(solverInfo.m_positionDrift);
+			launcher.setConst(solverInfo.m_positionConstraintCoeff);
+			launcher.setConst(solverInfo.m_fixedBodyIndex);
+			launcher.setConst(numManifolds);
+
+			launcher.launch1D(numManifolds);
+			clFinish(m_queue);
+		}
+
+
+		int i=0;
+		for( i=0; i<numManifoldsCPU; i++)
+		{
+
+			float frictionCoeff = contactConstraints[i].getFrictionCoeff();
+			int aIdx = (int)contactConstraints[i].m_bodyA;
+			int bIdx = (int)contactConstraints[i].m_bodyB;
+			b3RigidBodyData& bodyA = bodiesCPU[aIdx];
+			b3RigidBodyData& bodyB = bodiesCPU[bIdx];
+
+			b3Vector3 zero(0,0,0);
+			
+			b3Vector3* dlvAPtr=&zero;
+			b3Vector3* davAPtr=&zero;
+			b3Vector3* dlvBPtr=&zero;
+			b3Vector3* davBPtr=&zero;
+			
+			if (bodyA.m_invMass)
+			{
+				int bodyOffsetA = offsetSplitBodies[aIdx];
+				int constraintOffsetA = contactConstraintOffsets[i].x;
+				int splitIndexA = bodyOffsetA+constraintOffsetA;
+				dlvAPtr = &deltaLinearVelocities[splitIndexA];
+				davAPtr = &deltaAngularVelocities[splitIndexA];
+			}
+
+			if (bodyB.m_invMass)
+			{
+				int bodyOffsetB = offsetSplitBodies[bIdx];
+				int constraintOffsetB = contactConstraintOffsets[i].y;
+				int splitIndexB= bodyOffsetB+constraintOffsetB;
+				dlvBPtr =&deltaLinearVelocities[splitIndexB];
+				davBPtr = &deltaAngularVelocities[splitIndexB];
+			}
+
+
+
+			{
+				float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};
+				float minRambdaDt[4] = {0.f,0.f,0.f,0.f};
+
+				solveContact( contactConstraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, inertiasCPU[aIdx].m_invInertiaWorld, 
+					(b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, inertiasCPU[bIdx].m_invInertiaWorld,
+					maxRambdaDt, minRambdaDt , *dlvAPtr,*davAPtr,*dlvBPtr,*davBPtr		);
+
+
+			}
+		}
+
+		
+		{
+			B3_PROFILE("average velocities");
+			b3LauncherCL launcher( m_queue, m_data->m_averageVelocitiesKernel);
+			launcher.setBuffer(bodiesGPU->getBufferCL());
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(numBodies);
+			launcher.launch1D(numBodies);
+			clFinish(m_queue);
+		}
+
+		//easy
+		for (int i=0;i<numBodiesCPU;i++)
+		{
+			if (bodiesCPU[i].m_invMass)
+			{
+				int bodyOffset = offsetSplitBodies[i];
+				int count = bodyCount[i];
+				float factor = 1.f/float(count);
+				b3Vector3 averageLinVel;
+				averageLinVel.setZero();
+				b3Vector3 averageAngVel;
+				averageAngVel.setZero();
+				for (int j=0;j<count;j++)
+				{
+					averageLinVel += deltaLinearVelocities[bodyOffset+j]*factor;
+					averageAngVel += deltaAngularVelocities[bodyOffset+j]*factor;
+				}
+				for (int j=0;j<count;j++)
+				{
+					deltaLinearVelocities[bodyOffset+j] = averageLinVel;
+					deltaAngularVelocities[bodyOffset+j] = averageAngVel;
+				}
+			}
+		}
+//	m_data->m_deltaAngularVelocities->copyFromHost(deltaAngularVelocities);
+	//m_data->m_deltaLinearVelocities->copyFromHost(deltaLinearVelocities);
+	m_data->m_deltaAngularVelocities->copyToHost(deltaAngularVelocities);
+	m_data->m_deltaLinearVelocities->copyToHost(deltaLinearVelocities);
+
+#if 0
+
+		{
+			B3_PROFILE("m_solveFrictionKernel");
+			b3LauncherCL launcher( m_queue, m_data->m_solveFrictionKernel);
+			launcher.setBuffer(m_data->m_contactConstraints->getBufferCL());
+			launcher.setBuffer(bodiesGPU->getBufferCL());
+			launcher.setBuffer(inertiasGPU->getBufferCL());
+			launcher.setBuffer(m_data->m_contactConstraintOffsets->getBufferCL());
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(solverInfo.m_deltaTime);
+			launcher.setConst(solverInfo.m_positionDrift);
+			launcher.setConst(solverInfo.m_positionConstraintCoeff);
+			launcher.setConst(solverInfo.m_fixedBodyIndex);
+			launcher.setConst(numManifolds);
+
+			launcher.launch1D(numManifolds);
+			clFinish(m_queue);
+		}
+
+		//solve friction
+
+		for(int i=0; i<numManifoldsCPU; i++)
+		{
+			float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};
+			float minRambdaDt[4] = {0.f,0.f,0.f,0.f};
+
+			float sum = 0;
+			for(int j=0; j<4; j++)
+			{
+				sum +=contactConstraints[i].m_appliedRambdaDt[j];
+			}
+			float frictionCoeff = contactConstraints[i].getFrictionCoeff();
+			int aIdx = (int)contactConstraints[i].m_bodyA;
+			int bIdx = (int)contactConstraints[i].m_bodyB;
+			b3RigidBodyData& bodyA = bodiesCPU[aIdx];
+			b3RigidBodyData& bodyB = bodiesCPU[bIdx];
+
+			b3Vector3 zero(0,0,0);
+			
+			b3Vector3* dlvAPtr=&zero;
+			b3Vector3* davAPtr=&zero;
+			b3Vector3* dlvBPtr=&zero;
+			b3Vector3* davBPtr=&zero;
+			
+			if (bodyA.m_invMass)
+			{
+				int bodyOffsetA = offsetSplitBodies[aIdx];
+				int constraintOffsetA = contactConstraintOffsets[i].x;
+				int splitIndexA = bodyOffsetA+constraintOffsetA;
+				dlvAPtr = &deltaLinearVelocities[splitIndexA];
+				davAPtr = &deltaAngularVelocities[splitIndexA];
+			}
+
+			if (bodyB.m_invMass)
+			{
+				int bodyOffsetB = offsetSplitBodies[bIdx];
+				int constraintOffsetB = contactConstraintOffsets[i].y;
+				int splitIndexB= bodyOffsetB+constraintOffsetB;
+				dlvBPtr =&deltaLinearVelocities[splitIndexB];
+				davBPtr = &deltaAngularVelocities[splitIndexB];
+			}
+
+			for(int j=0; j<4; j++)
+			{
+				maxRambdaDt[j] = frictionCoeff*sum;
+				minRambdaDt[j] = -maxRambdaDt[j];
+			}
+
+			solveFriction( contactConstraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass,inertiasCPU[aIdx].m_invInertiaWorld, 
+				(b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, inertiasCPU[bIdx].m_invInertiaWorld,
+				maxRambdaDt, minRambdaDt , *dlvAPtr,*davAPtr,*dlvBPtr,*davBPtr);
+
+		}
+
+		{
+			B3_PROFILE("average velocities");
+			b3LauncherCL launcher( m_queue, m_data->m_averageVelocitiesKernel);
+			launcher.setBuffer(bodiesGPU->getBufferCL());
+			launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+			launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+			launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+			launcher.setConst(numBodies);
+			launcher.launch1D(numBodies);
+			clFinish(m_queue);
+		}
+
+		//easy
+		for (int i=0;i<numBodiesCPU;i++)
+		{
+			if (bodiesCPU[i].m_invMass)
+			{
+				int bodyOffset = offsetSplitBodies[i];
+				int count = bodyCount[i];
+				float factor = 1.f/float(count);
+				b3Vector3 averageLinVel;
+				averageLinVel.setZero();
+				b3Vector3 averageAngVel;
+				averageAngVel.setZero();
+				for (int j=0;j<count;j++)
+				{
+					averageLinVel += deltaLinearVelocities[bodyOffset+j]*factor;
+					averageAngVel += deltaAngularVelocities[bodyOffset+j]*factor;
+				}
+				for (int j=0;j<count;j++)
+				{
+					deltaLinearVelocities[bodyOffset+j] = averageLinVel;
+					deltaAngularVelocities[bodyOffset+j] = averageAngVel;
+				}
+			}
+		}
+
+#endif
+
+	}
+
+	{
+		B3_PROFILE("update body velocities");
+		b3LauncherCL launcher( m_queue, m_data->m_updateBodyVelocitiesKernel);
+		launcher.setBuffer(bodiesGPU->getBufferCL());
+		launcher.setBuffer(m_data->m_offsetSplitBodies->getBufferCL());
+		launcher.setBuffer(m_data->m_bodyCount->getBufferCL());
+		launcher.setBuffer(m_data->m_deltaLinearVelocities->getBufferCL());
+		launcher.setBuffer(m_data->m_deltaAngularVelocities->getBufferCL());
+		launcher.setConst(numBodies);
+		launcher.launch1D(numBodies);
+		clFinish(m_queue);
+	}
+
+
+	//easy
+	for (int i=0;i<numBodiesCPU;i++)
+	{
+		if (bodiesCPU[i].m_invMass)
+		{
+			int bodyOffset = offsetSplitBodies[i];
+			int count = bodyCount[i];
+			if (count)
+			{
+				bodiesCPU[i].m_linVel += deltaLinearVelocities[bodyOffset];
+				bodiesCPU[i].m_angVel += deltaAngularVelocities[bodyOffset];
+			}
+		}
+	}
+
+
+//	bodiesGPU->copyFromHost(bodiesCPU);
+
+
+}
+#endif
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h
new file mode 100644
index 0000000..8281aee
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h
@@ -0,0 +1,56 @@
+
+#ifndef B3_GPU_JACOBI_CONTACT_SOLVER_H
+#define B3_GPU_JACOBI_CONTACT_SOLVER_H
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+//#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+
+//struct b3InertiaData;
+//b3InertiaData
+
+class b3TypedConstraint;
+
+struct b3JacobiSolverInfo
+{
+	int m_fixedBodyIndex;
+
+	float m_deltaTime;
+	float m_positionDrift;
+	float m_positionConstraintCoeff;
+	int m_numIterations;
+
+	b3JacobiSolverInfo()
+		: m_fixedBodyIndex(0),
+		  m_deltaTime(1. / 60.f),
+		  m_positionDrift(0.005f),
+		  m_positionConstraintCoeff(0.99f),
+		  m_numIterations(7)
+	{
+	}
+};
+class b3GpuJacobiContactSolver
+{
+protected:
+	struct b3GpuJacobiSolverInternalData* m_data;
+
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+
+public:
+	b3GpuJacobiContactSolver(cl_context ctx, cl_device_id device, cl_command_queue queue, int pairCapacity);
+	virtual ~b3GpuJacobiContactSolver();
+
+	void solveContacts(int numBodies, cl_mem bodyBuf, cl_mem inertiaBuf, int numContacts, cl_mem contactBuf, const struct b3Config& config, int static0Index);
+	void solveGroupHost(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, struct b3Contact4* manifoldPtr, int numManifolds, const b3JacobiSolverInfo& solverInfo);
+	//void  solveGroupHost(btRigidBodyCL* bodies,b3InertiaData* inertias,int numBodies,btContact4* manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btJacobiSolverInfo& solverInfo);
+
+	//b3Scalar solveGroup(b3OpenCLArray<b3RigidBodyData>* gpuBodies,b3OpenCLArray<b3InertiaData>* gpuInertias, int numBodies,b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints,int numConstraints,const b3ContactSolverInfo& infoGlobal);
+
+	//void  solveGroup(btOpenCLArray<btRigidBodyCL>* bodies,btOpenCLArray<btInertiaCL>* inertias,btOpenCLArray<btContact4>* manifoldPtr,const btJacobiSolverInfo& solverInfo);
+	//void  solveGroupMixed(btOpenCLArray<btRigidBodyCL>* bodies,btOpenCLArray<btInertiaCL>* inertias,btOpenCLArray<btContact4>* manifoldPtr,const btJacobiSolverInfo& solverInfo);
+};
+#endif  //B3_GPU_JACOBI_CONTACT_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.cpp
new file mode 100644
index 0000000..2e4f6c1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.cpp
@@ -0,0 +1,1013 @@
+#include "b3GpuNarrowPhase.h"
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.h"
+#include "Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h"
+#include <string.h>
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+#include "Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h"
+#include "Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
+#include "Bullet3OpenCL/NarrowphaseCollision/b3BvhInfo.h"
+
+#include "b3GpuNarrowPhaseInternalData.h"
+#include "Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3ConvexUtility.h"
+
+b3GpuNarrowPhase::b3GpuNarrowPhase(cl_context ctx, cl_device_id device, cl_command_queue queue, const b3Config& config)
+	: m_data(0), m_planeBodyIndex(-1), m_static0Index(-1), m_context(ctx), m_device(device), m_queue(queue)
+{
+	m_data = new b3GpuNarrowPhaseInternalData();
+	m_data->m_currentContactBuffer = 0;
+
+	memset(m_data, 0, sizeof(b3GpuNarrowPhaseInternalData));
+
+	m_data->m_config = config;
+
+	m_data->m_gpuSatCollision = new GpuSatCollision(ctx, device, queue);
+
+	m_data->m_triangleConvexPairs = new b3OpenCLArray<b3Int4>(m_context, m_queue, config.m_maxTriConvexPairCapacity);
+
+	//m_data->m_convexPairsOutGPU = new b3OpenCLArray<b3Int2>(ctx,queue,config.m_maxBroadphasePairs,false);
+	//m_data->m_planePairs = new b3OpenCLArray<b3Int2>(ctx,queue,config.m_maxBroadphasePairs,false);
+
+	m_data->m_pBufContactOutCPU = new b3AlignedObjectArray<b3Contact4>();
+	m_data->m_pBufContactOutCPU->resize(config.m_maxBroadphasePairs);
+	m_data->m_bodyBufferCPU = new b3AlignedObjectArray<b3RigidBodyData>();
+	m_data->m_bodyBufferCPU->resize(config.m_maxConvexBodies);
+
+	m_data->m_inertiaBufferCPU = new b3AlignedObjectArray<b3InertiaData>();
+	m_data->m_inertiaBufferCPU->resize(config.m_maxConvexBodies);
+
+	m_data->m_pBufContactBuffersGPU[0] = new b3OpenCLArray<b3Contact4>(ctx, queue, config.m_maxContactCapacity, true);
+	m_data->m_pBufContactBuffersGPU[1] = new b3OpenCLArray<b3Contact4>(ctx, queue, config.m_maxContactCapacity, true);
+
+	m_data->m_inertiaBufferGPU = new b3OpenCLArray<b3InertiaData>(ctx, queue, config.m_maxConvexBodies, false);
+	m_data->m_collidablesGPU = new b3OpenCLArray<b3Collidable>(ctx, queue, config.m_maxConvexShapes);
+	m_data->m_collidablesCPU.reserve(config.m_maxConvexShapes);
+
+	m_data->m_localShapeAABBCPU = new b3AlignedObjectArray<b3SapAabb>;
+	m_data->m_localShapeAABBGPU = new b3OpenCLArray<b3SapAabb>(ctx, queue, config.m_maxConvexShapes);
+
+	//m_data->m_solverDataGPU = adl::Solver<adl::TYPE_CL>::allocate(ctx,queue, config.m_maxBroadphasePairs,false);
+	m_data->m_bodyBufferGPU = new b3OpenCLArray<b3RigidBodyData>(ctx, queue, config.m_maxConvexBodies, false);
+
+	m_data->m_convexFacesGPU = new b3OpenCLArray<b3GpuFace>(ctx, queue, config.m_maxConvexShapes * config.m_maxFacesPerShape, false);
+	m_data->m_convexFaces.reserve(config.m_maxConvexShapes * config.m_maxFacesPerShape);
+
+	m_data->m_gpuChildShapes = new b3OpenCLArray<b3GpuChildShape>(ctx, queue, config.m_maxCompoundChildShapes, false);
+
+	m_data->m_convexPolyhedraGPU = new b3OpenCLArray<b3ConvexPolyhedronData>(ctx, queue, config.m_maxConvexShapes, false);
+	m_data->m_convexPolyhedra.reserve(config.m_maxConvexShapes);
+
+	m_data->m_uniqueEdgesGPU = new b3OpenCLArray<b3Vector3>(ctx, queue, config.m_maxConvexUniqueEdges, true);
+	m_data->m_uniqueEdges.reserve(config.m_maxConvexUniqueEdges);
+
+	m_data->m_convexVerticesGPU = new b3OpenCLArray<b3Vector3>(ctx, queue, config.m_maxConvexVertices, true);
+	m_data->m_convexVertices.reserve(config.m_maxConvexVertices);
+
+	m_data->m_convexIndicesGPU = new b3OpenCLArray<int>(ctx, queue, config.m_maxConvexIndices, true);
+	m_data->m_convexIndices.reserve(config.m_maxConvexIndices);
+
+	m_data->m_worldVertsB1GPU = new b3OpenCLArray<b3Vector3>(ctx, queue, config.m_maxConvexBodies * config.m_maxVerticesPerFace);
+	m_data->m_clippingFacesOutGPU = new b3OpenCLArray<b3Int4>(ctx, queue, config.m_maxConvexBodies);
+	m_data->m_worldNormalsAGPU = new b3OpenCLArray<b3Vector3>(ctx, queue, config.m_maxConvexBodies);
+	m_data->m_worldVertsA1GPU = new b3OpenCLArray<b3Vector3>(ctx, queue, config.m_maxConvexBodies * config.m_maxVerticesPerFace);
+	m_data->m_worldVertsB2GPU = new b3OpenCLArray<b3Vector3>(ctx, queue, config.m_maxConvexBodies * config.m_maxVerticesPerFace);
+
+	m_data->m_convexData = new b3AlignedObjectArray<b3ConvexUtility*>();
+
+	m_data->m_convexData->resize(config.m_maxConvexShapes);
+	m_data->m_convexPolyhedra.resize(config.m_maxConvexShapes);
+
+	m_data->m_numAcceleratedShapes = 0;
+	m_data->m_numAcceleratedRigidBodies = 0;
+
+	m_data->m_subTreesGPU = new b3OpenCLArray<b3BvhSubtreeInfo>(this->m_context, this->m_queue);
+	m_data->m_treeNodesGPU = new b3OpenCLArray<b3QuantizedBvhNode>(this->m_context, this->m_queue);
+	m_data->m_bvhInfoGPU = new b3OpenCLArray<b3BvhInfo>(this->m_context, this->m_queue);
+
+	//m_data->m_contactCGPU = new b3OpenCLArray<Constraint4>(ctx,queue,config.m_maxBroadphasePairs,false);
+	//m_data->m_frictionCGPU = new b3OpenCLArray<adl::Solver<adl::TYPE_CL>::allocateFrictionConstraint( m_data->m_deviceCL, config.m_maxBroadphasePairs);
+}
+
+b3GpuNarrowPhase::~b3GpuNarrowPhase()
+{
+	delete m_data->m_gpuSatCollision;
+
+	delete m_data->m_triangleConvexPairs;
+	//delete m_data->m_convexPairsOutGPU;
+	//delete m_data->m_planePairs;
+	delete m_data->m_pBufContactOutCPU;
+	delete m_data->m_bodyBufferCPU;
+	delete m_data->m_inertiaBufferCPU;
+	delete m_data->m_pBufContactBuffersGPU[0];
+	delete m_data->m_pBufContactBuffersGPU[1];
+
+	delete m_data->m_inertiaBufferGPU;
+	delete m_data->m_collidablesGPU;
+	delete m_data->m_localShapeAABBCPU;
+	delete m_data->m_localShapeAABBGPU;
+	delete m_data->m_bodyBufferGPU;
+	delete m_data->m_convexFacesGPU;
+	delete m_data->m_gpuChildShapes;
+	delete m_data->m_convexPolyhedraGPU;
+	delete m_data->m_uniqueEdgesGPU;
+	delete m_data->m_convexVerticesGPU;
+	delete m_data->m_convexIndicesGPU;
+	delete m_data->m_worldVertsB1GPU;
+	delete m_data->m_clippingFacesOutGPU;
+	delete m_data->m_worldNormalsAGPU;
+	delete m_data->m_worldVertsA1GPU;
+	delete m_data->m_worldVertsB2GPU;
+
+	delete m_data->m_bvhInfoGPU;
+
+	for (int i = 0; i < m_data->m_bvhData.size(); i++)
+	{
+		delete m_data->m_bvhData[i];
+	}
+	for (int i = 0; i < m_data->m_meshInterfaces.size(); i++)
+	{
+		delete m_data->m_meshInterfaces[i];
+	}
+	m_data->m_meshInterfaces.clear();
+	m_data->m_bvhData.clear();
+	delete m_data->m_treeNodesGPU;
+	delete m_data->m_subTreesGPU;
+
+	delete m_data->m_convexData;
+	delete m_data;
+}
+
+int b3GpuNarrowPhase::allocateCollidable()
+{
+	int curSize = m_data->m_collidablesCPU.size();
+	if (curSize < m_data->m_config.m_maxConvexShapes)
+	{
+		m_data->m_collidablesCPU.expand();
+		return curSize;
+	}
+	else
+	{
+		b3Error("allocateCollidable out-of-range %d\n", m_data->m_config.m_maxConvexShapes);
+	}
+	return -1;
+}
+
+int b3GpuNarrowPhase::registerSphereShape(float radius)
+{
+	int collidableIndex = allocateCollidable();
+	if (collidableIndex < 0)
+		return collidableIndex;
+
+	b3Collidable& col = getCollidableCpu(collidableIndex);
+	col.m_shapeType = SHAPE_SPHERE;
+	col.m_shapeIndex = 0;
+	col.m_radius = radius;
+
+	if (col.m_shapeIndex >= 0)
+	{
+		b3SapAabb aabb;
+		b3Vector3 myAabbMin = b3MakeVector3(-radius, -radius, -radius);
+		b3Vector3 myAabbMax = b3MakeVector3(radius, radius, radius);
+
+		aabb.m_min[0] = myAabbMin[0];  //s_convexHeightField->m_aabb.m_min.x;
+		aabb.m_min[1] = myAabbMin[1];  //s_convexHeightField->m_aabb.m_min.y;
+		aabb.m_min[2] = myAabbMin[2];  //s_convexHeightField->m_aabb.m_min.z;
+		aabb.m_minIndices[3] = 0;
+
+		aabb.m_max[0] = myAabbMax[0];  //s_convexHeightField->m_aabb.m_max.x;
+		aabb.m_max[1] = myAabbMax[1];  //s_convexHeightField->m_aabb.m_max.y;
+		aabb.m_max[2] = myAabbMax[2];  //s_convexHeightField->m_aabb.m_max.z;
+		aabb.m_signedMaxIndices[3] = 0;
+
+		m_data->m_localShapeAABBCPU->push_back(aabb);
+		//		m_data->m_localShapeAABBGPU->push_back(aabb);
+		clFinish(m_queue);
+	}
+
+	return collidableIndex;
+}
+
+int b3GpuNarrowPhase::registerFace(const b3Vector3& faceNormal, float faceConstant)
+{
+	int faceOffset = m_data->m_convexFaces.size();
+	b3GpuFace& face = m_data->m_convexFaces.expand();
+	face.m_plane = b3MakeVector3(faceNormal.x, faceNormal.y, faceNormal.z, faceConstant);
+	return faceOffset;
+}
+
+int b3GpuNarrowPhase::registerPlaneShape(const b3Vector3& planeNormal, float planeConstant)
+{
+	int collidableIndex = allocateCollidable();
+	if (collidableIndex < 0)
+		return collidableIndex;
+
+	b3Collidable& col = getCollidableCpu(collidableIndex);
+	col.m_shapeType = SHAPE_PLANE;
+	col.m_shapeIndex = registerFace(planeNormal, planeConstant);
+	col.m_radius = planeConstant;
+
+	if (col.m_shapeIndex >= 0)
+	{
+		b3SapAabb aabb;
+		aabb.m_min[0] = -1e30f;
+		aabb.m_min[1] = -1e30f;
+		aabb.m_min[2] = -1e30f;
+		aabb.m_minIndices[3] = 0;
+
+		aabb.m_max[0] = 1e30f;
+		aabb.m_max[1] = 1e30f;
+		aabb.m_max[2] = 1e30f;
+		aabb.m_signedMaxIndices[3] = 0;
+
+		m_data->m_localShapeAABBCPU->push_back(aabb);
+		//		m_data->m_localShapeAABBGPU->push_back(aabb);
+		clFinish(m_queue);
+	}
+
+	return collidableIndex;
+}
+
+int b3GpuNarrowPhase::registerConvexHullShapeInternal(b3ConvexUtility* convexPtr, b3Collidable& col)
+{
+	m_data->m_convexData->resize(m_data->m_numAcceleratedShapes + 1);
+	m_data->m_convexPolyhedra.resize(m_data->m_numAcceleratedShapes + 1);
+
+	b3ConvexPolyhedronData& convex = m_data->m_convexPolyhedra.at(m_data->m_convexPolyhedra.size() - 1);
+	convex.mC = convexPtr->mC;
+	convex.mE = convexPtr->mE;
+	convex.m_extents = convexPtr->m_extents;
+	convex.m_localCenter = convexPtr->m_localCenter;
+	convex.m_radius = convexPtr->m_radius;
+
+	convex.m_numUniqueEdges = convexPtr->m_uniqueEdges.size();
+	int edgeOffset = m_data->m_uniqueEdges.size();
+	convex.m_uniqueEdgesOffset = edgeOffset;
+
+	m_data->m_uniqueEdges.resize(edgeOffset + convex.m_numUniqueEdges);
+
+	//convex data here
+	int i;
+	for (i = 0; i < convexPtr->m_uniqueEdges.size(); i++)
+	{
+		m_data->m_uniqueEdges[edgeOffset + i] = convexPtr->m_uniqueEdges[i];
+	}
+
+	int faceOffset = m_data->m_convexFaces.size();
+	convex.m_faceOffset = faceOffset;
+	convex.m_numFaces = convexPtr->m_faces.size();
+
+	m_data->m_convexFaces.resize(faceOffset + convex.m_numFaces);
+
+	for (i = 0; i < convexPtr->m_faces.size(); i++)
+	{
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_plane = b3MakeVector3(convexPtr->m_faces[i].m_plane[0],
+																			   convexPtr->m_faces[i].m_plane[1],
+																			   convexPtr->m_faces[i].m_plane[2],
+																			   convexPtr->m_faces[i].m_plane[3]);
+
+		int indexOffset = m_data->m_convexIndices.size();
+		int numIndices = convexPtr->m_faces[i].m_indices.size();
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_numIndices = numIndices;
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_indexOffset = indexOffset;
+		m_data->m_convexIndices.resize(indexOffset + numIndices);
+		for (int p = 0; p < numIndices; p++)
+		{
+			m_data->m_convexIndices[indexOffset + p] = convexPtr->m_faces[i].m_indices[p];
+		}
+	}
+
+	convex.m_numVertices = convexPtr->m_vertices.size();
+	int vertexOffset = m_data->m_convexVertices.size();
+	convex.m_vertexOffset = vertexOffset;
+
+	m_data->m_convexVertices.resize(vertexOffset + convex.m_numVertices);
+	for (int i = 0; i < convexPtr->m_vertices.size(); i++)
+	{
+		m_data->m_convexVertices[vertexOffset + i] = convexPtr->m_vertices[i];
+	}
+
+	(*m_data->m_convexData)[m_data->m_numAcceleratedShapes] = convexPtr;
+
+	return m_data->m_numAcceleratedShapes++;
+}
+
+int b3GpuNarrowPhase::registerConvexHullShape(const float* vertices, int strideInBytes, int numVertices, const float* scaling)
+{
+	b3AlignedObjectArray<b3Vector3> verts;
+
+	unsigned char* vts = (unsigned char*)vertices;
+	for (int i = 0; i < numVertices; i++)
+	{
+		float* vertex = (float*)&vts[i * strideInBytes];
+		verts.push_back(b3MakeVector3(vertex[0] * scaling[0], vertex[1] * scaling[1], vertex[2] * scaling[2]));
+	}
+
+	b3ConvexUtility* utilPtr = new b3ConvexUtility();
+	bool merge = true;
+	if (numVertices)
+	{
+		utilPtr->initializePolyhedralFeatures(&verts[0], verts.size(), merge);
+	}
+
+	int collidableIndex = registerConvexHullShape(utilPtr);
+	delete utilPtr;
+	return collidableIndex;
+}
+
+int b3GpuNarrowPhase::registerConvexHullShape(b3ConvexUtility* utilPtr)
+{
+	int collidableIndex = allocateCollidable();
+	if (collidableIndex < 0)
+		return collidableIndex;
+
+	b3Collidable& col = getCollidableCpu(collidableIndex);
+	col.m_shapeType = SHAPE_CONVEX_HULL;
+	col.m_shapeIndex = -1;
+
+	{
+		b3Vector3 localCenter = b3MakeVector3(0, 0, 0);
+		for (int i = 0; i < utilPtr->m_vertices.size(); i++)
+			localCenter += utilPtr->m_vertices[i];
+		localCenter *= (1.f / utilPtr->m_vertices.size());
+		utilPtr->m_localCenter = localCenter;
+
+		col.m_shapeIndex = registerConvexHullShapeInternal(utilPtr, col);
+	}
+
+	if (col.m_shapeIndex >= 0)
+	{
+		b3SapAabb aabb;
+
+		b3Vector3 myAabbMin = b3MakeVector3(1e30f, 1e30f, 1e30f);
+		b3Vector3 myAabbMax = b3MakeVector3(-1e30f, -1e30f, -1e30f);
+
+		for (int i = 0; i < utilPtr->m_vertices.size(); i++)
+		{
+			myAabbMin.setMin(utilPtr->m_vertices[i]);
+			myAabbMax.setMax(utilPtr->m_vertices[i]);
+		}
+		aabb.m_min[0] = myAabbMin[0];
+		aabb.m_min[1] = myAabbMin[1];
+		aabb.m_min[2] = myAabbMin[2];
+		aabb.m_minIndices[3] = 0;
+
+		aabb.m_max[0] = myAabbMax[0];
+		aabb.m_max[1] = myAabbMax[1];
+		aabb.m_max[2] = myAabbMax[2];
+		aabb.m_signedMaxIndices[3] = 0;
+
+		m_data->m_localShapeAABBCPU->push_back(aabb);
+		//		m_data->m_localShapeAABBGPU->push_back(aabb);
+	}
+
+	return collidableIndex;
+}
+
+int b3GpuNarrowPhase::registerCompoundShape(b3AlignedObjectArray<b3GpuChildShape>* childShapes)
+{
+	int collidableIndex = allocateCollidable();
+	if (collidableIndex < 0)
+		return collidableIndex;
+
+	b3Collidable& col = getCollidableCpu(collidableIndex);
+	col.m_shapeType = SHAPE_COMPOUND_OF_CONVEX_HULLS;
+	col.m_shapeIndex = m_data->m_cpuChildShapes.size();
+	col.m_compoundBvhIndex = m_data->m_bvhInfoCPU.size();
+
+	{
+		b3Assert(col.m_shapeIndex + childShapes->size() < m_data->m_config.m_maxCompoundChildShapes);
+		for (int i = 0; i < childShapes->size(); i++)
+		{
+			m_data->m_cpuChildShapes.push_back(childShapes->at(i));
+		}
+	}
+
+	col.m_numChildShapes = childShapes->size();
+
+	b3SapAabb aabbLocalSpace;
+	b3Vector3 myAabbMin = b3MakeVector3(1e30f, 1e30f, 1e30f);
+	b3Vector3 myAabbMax = b3MakeVector3(-1e30f, -1e30f, -1e30f);
+
+	b3AlignedObjectArray<b3Aabb> childLocalAabbs;
+	childLocalAabbs.resize(childShapes->size());
+
+	//compute local AABB of the compound of all children
+	for (int i = 0; i < childShapes->size(); i++)
+	{
+		int childColIndex = childShapes->at(i).m_shapeIndex;
+		//b3Collidable& childCol = getCollidableCpu(childColIndex);
+		b3SapAabb aabbLoc = m_data->m_localShapeAABBCPU->at(childColIndex);
+
+		b3Vector3 childLocalAabbMin = b3MakeVector3(aabbLoc.m_min[0], aabbLoc.m_min[1], aabbLoc.m_min[2]);
+		b3Vector3 childLocalAabbMax = b3MakeVector3(aabbLoc.m_max[0], aabbLoc.m_max[1], aabbLoc.m_max[2]);
+		b3Vector3 aMin, aMax;
+		b3Scalar margin(0.f);
+		b3Transform childTr;
+		childTr.setIdentity();
+
+		childTr.setOrigin(childShapes->at(i).m_childPosition);
+		childTr.setRotation(b3Quaternion(childShapes->at(i).m_childOrientation));
+		b3TransformAabb(childLocalAabbMin, childLocalAabbMax, margin, childTr, aMin, aMax);
+		myAabbMin.setMin(aMin);
+		myAabbMax.setMax(aMax);
+		childLocalAabbs[i].m_min[0] = aMin[0];
+		childLocalAabbs[i].m_min[1] = aMin[1];
+		childLocalAabbs[i].m_min[2] = aMin[2];
+		childLocalAabbs[i].m_min[3] = 0;
+		childLocalAabbs[i].m_max[0] = aMax[0];
+		childLocalAabbs[i].m_max[1] = aMax[1];
+		childLocalAabbs[i].m_max[2] = aMax[2];
+		childLocalAabbs[i].m_max[3] = 0;
+	}
+
+	aabbLocalSpace.m_min[0] = myAabbMin[0];  //s_convexHeightField->m_aabb.m_min.x;
+	aabbLocalSpace.m_min[1] = myAabbMin[1];  //s_convexHeightField->m_aabb.m_min.y;
+	aabbLocalSpace.m_min[2] = myAabbMin[2];  //s_convexHeightField->m_aabb.m_min.z;
+	aabbLocalSpace.m_minIndices[3] = 0;
+
+	aabbLocalSpace.m_max[0] = myAabbMax[0];  //s_convexHeightField->m_aabb.m_max.x;
+	aabbLocalSpace.m_max[1] = myAabbMax[1];  //s_convexHeightField->m_aabb.m_max.y;
+	aabbLocalSpace.m_max[2] = myAabbMax[2];  //s_convexHeightField->m_aabb.m_max.z;
+	aabbLocalSpace.m_signedMaxIndices[3] = 0;
+
+	m_data->m_localShapeAABBCPU->push_back(aabbLocalSpace);
+
+	b3QuantizedBvh* bvh = new b3QuantizedBvh;
+	bvh->setQuantizationValues(myAabbMin, myAabbMax);
+	QuantizedNodeArray& nodes = bvh->getLeafNodeArray();
+	int numNodes = childShapes->size();
+
+	for (int i = 0; i < numNodes; i++)
+	{
+		b3QuantizedBvhNode node;
+		b3Vector3 aabbMin, aabbMax;
+		aabbMin = (b3Vector3&)childLocalAabbs[i].m_min;
+		aabbMax = (b3Vector3&)childLocalAabbs[i].m_max;
+
+		bvh->quantize(&node.m_quantizedAabbMin[0], aabbMin, 0);
+		bvh->quantize(&node.m_quantizedAabbMax[0], aabbMax, 1);
+		int partId = 0;
+		node.m_escapeIndexOrTriangleIndex = (partId << (31 - MAX_NUM_PARTS_IN_BITS)) | i;
+		nodes.push_back(node);
+	}
+	bvh->buildInternal();
+
+	int numSubTrees = bvh->getSubtreeInfoArray().size();
+
+	//void	setQuantizationValues(const b3Vector3& bvhAabbMin,const b3Vector3& bvhAabbMax,b3Scalar quantizationMargin=b3Scalar(1.0));
+	//QuantizedNodeArray&	getLeafNodeArray() {			return	m_quantizedLeafNodes;	}
+	///buildInternal is expert use only: assumes that setQuantizationValues and LeafNodeArray are initialized
+	//void	buildInternal();
+
+	b3BvhInfo bvhInfo;
+
+	bvhInfo.m_aabbMin = bvh->m_bvhAabbMin;
+	bvhInfo.m_aabbMax = bvh->m_bvhAabbMax;
+	bvhInfo.m_quantization = bvh->m_bvhQuantization;
+	bvhInfo.m_numNodes = numNodes;
+	bvhInfo.m_numSubTrees = numSubTrees;
+	bvhInfo.m_nodeOffset = m_data->m_treeNodesCPU.size();
+	bvhInfo.m_subTreeOffset = m_data->m_subTreesCPU.size();
+
+	int numNewNodes = bvh->getQuantizedNodeArray().size();
+
+	for (int i = 0; i < numNewNodes - 1; i++)
+	{
+		if (bvh->getQuantizedNodeArray()[i].isLeafNode())
+		{
+			int orgIndex = bvh->getQuantizedNodeArray()[i].getTriangleIndex();
+
+			b3Vector3 nodeMinVec = bvh->unQuantize(bvh->getQuantizedNodeArray()[i].m_quantizedAabbMin);
+			b3Vector3 nodeMaxVec = bvh->unQuantize(bvh->getQuantizedNodeArray()[i].m_quantizedAabbMax);
+
+			for (int c = 0; c < 3; c++)
+			{
+				if (childLocalAabbs[orgIndex].m_min[c] < nodeMinVec[c])
+				{
+					printf("min org (%f) and new (%f) ? at i:%d,c:%d\n", childLocalAabbs[i].m_min[c], nodeMinVec[c], i, c);
+				}
+				if (childLocalAabbs[orgIndex].m_max[c] > nodeMaxVec[c])
+				{
+					printf("max org (%f) and new (%f) ? at i:%d,c:%d\n", childLocalAabbs[i].m_max[c], nodeMaxVec[c], i, c);
+				}
+			}
+		}
+	}
+
+	m_data->m_bvhInfoCPU.push_back(bvhInfo);
+
+	int numNewSubtrees = bvh->getSubtreeInfoArray().size();
+	m_data->m_subTreesCPU.reserve(m_data->m_subTreesCPU.size() + numNewSubtrees);
+	for (int i = 0; i < numNewSubtrees; i++)
+	{
+		m_data->m_subTreesCPU.push_back(bvh->getSubtreeInfoArray()[i]);
+	}
+	int numNewTreeNodes = bvh->getQuantizedNodeArray().size();
+
+	for (int i = 0; i < numNewTreeNodes; i++)
+	{
+		m_data->m_treeNodesCPU.push_back(bvh->getQuantizedNodeArray()[i]);
+	}
+
+	//	m_data->m_localShapeAABBGPU->push_back(aabbWS);
+	clFinish(m_queue);
+	return collidableIndex;
+}
+
+int b3GpuNarrowPhase::registerConcaveMesh(b3AlignedObjectArray<b3Vector3>* vertices, b3AlignedObjectArray<int>* indices, const float* scaling1)
+{
+	b3Vector3 scaling = b3MakeVector3(scaling1[0], scaling1[1], scaling1[2]);
+
+	int collidableIndex = allocateCollidable();
+	if (collidableIndex < 0)
+		return collidableIndex;
+
+	b3Collidable& col = getCollidableCpu(collidableIndex);
+
+	col.m_shapeType = SHAPE_CONCAVE_TRIMESH;
+	col.m_shapeIndex = registerConcaveMeshShape(vertices, indices, col, scaling);
+	col.m_bvhIndex = m_data->m_bvhInfoCPU.size();
+
+	b3SapAabb aabb;
+	b3Vector3 myAabbMin = b3MakeVector3(1e30f, 1e30f, 1e30f);
+	b3Vector3 myAabbMax = b3MakeVector3(-1e30f, -1e30f, -1e30f);
+
+	for (int i = 0; i < vertices->size(); i++)
+	{
+		b3Vector3 vtx(vertices->at(i) * scaling);
+		myAabbMin.setMin(vtx);
+		myAabbMax.setMax(vtx);
+	}
+	aabb.m_min[0] = myAabbMin[0];
+	aabb.m_min[1] = myAabbMin[1];
+	aabb.m_min[2] = myAabbMin[2];
+	aabb.m_minIndices[3] = 0;
+
+	aabb.m_max[0] = myAabbMax[0];
+	aabb.m_max[1] = myAabbMax[1];
+	aabb.m_max[2] = myAabbMax[2];
+	aabb.m_signedMaxIndices[3] = 0;
+
+	m_data->m_localShapeAABBCPU->push_back(aabb);
+	//	m_data->m_localShapeAABBGPU->push_back(aabb);
+
+	b3OptimizedBvh* bvh = new b3OptimizedBvh();
+	//void b3OptimizedBvh::build(b3StridingMeshInterface* triangles, bool useQuantizedAabbCompression, const b3Vector3& bvhAabbMin, const b3Vector3& bvhAabbMax)
+
+	bool useQuantizedAabbCompression = true;
+	b3TriangleIndexVertexArray* meshInterface = new b3TriangleIndexVertexArray();
+	m_data->m_meshInterfaces.push_back(meshInterface);
+	b3IndexedMesh mesh;
+	mesh.m_numTriangles = indices->size() / 3;
+	mesh.m_numVertices = vertices->size();
+	mesh.m_vertexBase = (const unsigned char*)&vertices->at(0).x;
+	mesh.m_vertexStride = sizeof(b3Vector3);
+	mesh.m_triangleIndexStride = 3 * sizeof(int);  // or sizeof(int)
+	mesh.m_triangleIndexBase = (const unsigned char*)&indices->at(0);
+
+	meshInterface->addIndexedMesh(mesh);
+	bvh->build(meshInterface, useQuantizedAabbCompression, (b3Vector3&)aabb.m_min, (b3Vector3&)aabb.m_max);
+	m_data->m_bvhData.push_back(bvh);
+	int numNodes = bvh->getQuantizedNodeArray().size();
+	//b3OpenCLArray<b3QuantizedBvhNode>*	treeNodesGPU = new b3OpenCLArray<b3QuantizedBvhNode>(this->m_context,this->m_queue,numNodes);
+	int numSubTrees = bvh->getSubtreeInfoArray().size();
+
+	b3BvhInfo bvhInfo;
+
+	bvhInfo.m_aabbMin = bvh->m_bvhAabbMin;
+	bvhInfo.m_aabbMax = bvh->m_bvhAabbMax;
+	bvhInfo.m_quantization = bvh->m_bvhQuantization;
+	bvhInfo.m_numNodes = numNodes;
+	bvhInfo.m_numSubTrees = numSubTrees;
+	bvhInfo.m_nodeOffset = m_data->m_treeNodesCPU.size();
+	bvhInfo.m_subTreeOffset = m_data->m_subTreesCPU.size();
+
+	m_data->m_bvhInfoCPU.push_back(bvhInfo);
+
+	int numNewSubtrees = bvh->getSubtreeInfoArray().size();
+	m_data->m_subTreesCPU.reserve(m_data->m_subTreesCPU.size() + numNewSubtrees);
+	for (int i = 0; i < numNewSubtrees; i++)
+	{
+		m_data->m_subTreesCPU.push_back(bvh->getSubtreeInfoArray()[i]);
+	}
+	int numNewTreeNodes = bvh->getQuantizedNodeArray().size();
+
+	for (int i = 0; i < numNewTreeNodes; i++)
+	{
+		m_data->m_treeNodesCPU.push_back(bvh->getQuantizedNodeArray()[i]);
+	}
+
+	return collidableIndex;
+}
+
+int b3GpuNarrowPhase::registerConcaveMeshShape(b3AlignedObjectArray<b3Vector3>* vertices, b3AlignedObjectArray<int>* indices, b3Collidable& col, const float* scaling1)
+{
+	b3Vector3 scaling = b3MakeVector3(scaling1[0], scaling1[1], scaling1[2]);
+
+	m_data->m_convexData->resize(m_data->m_numAcceleratedShapes + 1);
+	m_data->m_convexPolyhedra.resize(m_data->m_numAcceleratedShapes + 1);
+
+	b3ConvexPolyhedronData& convex = m_data->m_convexPolyhedra.at(m_data->m_convexPolyhedra.size() - 1);
+	convex.mC = b3MakeVector3(0, 0, 0);
+	convex.mE = b3MakeVector3(0, 0, 0);
+	convex.m_extents = b3MakeVector3(0, 0, 0);
+	convex.m_localCenter = b3MakeVector3(0, 0, 0);
+	convex.m_radius = 0.f;
+
+	convex.m_numUniqueEdges = 0;
+	int edgeOffset = m_data->m_uniqueEdges.size();
+	convex.m_uniqueEdgesOffset = edgeOffset;
+
+	int faceOffset = m_data->m_convexFaces.size();
+	convex.m_faceOffset = faceOffset;
+
+	convex.m_numFaces = indices->size() / 3;
+	m_data->m_convexFaces.resize(faceOffset + convex.m_numFaces);
+	m_data->m_convexIndices.reserve(convex.m_numFaces * 3);
+	for (int i = 0; i < convex.m_numFaces; i++)
+	{
+		if (i % 256 == 0)
+		{
+			//printf("i=%d out of %d", i,convex.m_numFaces);
+		}
+		b3Vector3 vert0(vertices->at(indices->at(i * 3)) * scaling);
+		b3Vector3 vert1(vertices->at(indices->at(i * 3 + 1)) * scaling);
+		b3Vector3 vert2(vertices->at(indices->at(i * 3 + 2)) * scaling);
+
+		b3Vector3 normal = ((vert1 - vert0).cross(vert2 - vert0)).normalize();
+		b3Scalar c = -(normal.dot(vert0));
+
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_plane = b3MakeVector4(normal.x, normal.y, normal.z, c);
+		int indexOffset = m_data->m_convexIndices.size();
+		int numIndices = 3;
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_numIndices = numIndices;
+		m_data->m_convexFaces[convex.m_faceOffset + i].m_indexOffset = indexOffset;
+		m_data->m_convexIndices.resize(indexOffset + numIndices);
+		for (int p = 0; p < numIndices; p++)
+		{
+			int vi = indices->at(i * 3 + p);
+			m_data->m_convexIndices[indexOffset + p] = vi;  //convexPtr->m_faces[i].m_indices[p];
+		}
+	}
+
+	convex.m_numVertices = vertices->size();
+	int vertexOffset = m_data->m_convexVertices.size();
+	convex.m_vertexOffset = vertexOffset;
+	m_data->m_convexVertices.resize(vertexOffset + convex.m_numVertices);
+	for (int i = 0; i < vertices->size(); i++)
+	{
+		m_data->m_convexVertices[vertexOffset + i] = vertices->at(i) * scaling;
+	}
+
+	(*m_data->m_convexData)[m_data->m_numAcceleratedShapes] = 0;
+
+	return m_data->m_numAcceleratedShapes++;
+}
+
+cl_mem b3GpuNarrowPhase::getBodiesGpu()
+{
+	return (cl_mem)m_data->m_bodyBufferGPU->getBufferCL();
+}
+
+const struct b3RigidBodyData* b3GpuNarrowPhase::getBodiesCpu() const
+{
+	return &m_data->m_bodyBufferCPU->at(0);
+};
+
+int b3GpuNarrowPhase::getNumBodiesGpu() const
+{
+	return m_data->m_bodyBufferGPU->size();
+}
+
+cl_mem b3GpuNarrowPhase::getBodyInertiasGpu()
+{
+	return (cl_mem)m_data->m_inertiaBufferGPU->getBufferCL();
+}
+
+int b3GpuNarrowPhase::getNumBodyInertiasGpu() const
+{
+	return m_data->m_inertiaBufferGPU->size();
+}
+
+b3Collidable& b3GpuNarrowPhase::getCollidableCpu(int collidableIndex)
+{
+	return m_data->m_collidablesCPU[collidableIndex];
+}
+
+const b3Collidable& b3GpuNarrowPhase::getCollidableCpu(int collidableIndex) const
+{
+	return m_data->m_collidablesCPU[collidableIndex];
+}
+
+cl_mem b3GpuNarrowPhase::getCollidablesGpu()
+{
+	return m_data->m_collidablesGPU->getBufferCL();
+}
+
+const struct b3Collidable* b3GpuNarrowPhase::getCollidablesCpu() const
+{
+	if (m_data->m_collidablesCPU.size())
+		return &m_data->m_collidablesCPU[0];
+	return 0;
+}
+
+const struct b3SapAabb* b3GpuNarrowPhase::getLocalSpaceAabbsCpu() const
+{
+	if (m_data->m_localShapeAABBCPU->size())
+	{
+		return &m_data->m_localShapeAABBCPU->at(0);
+	}
+	return 0;
+}
+
+cl_mem b3GpuNarrowPhase::getAabbLocalSpaceBufferGpu()
+{
+	return m_data->m_localShapeAABBGPU->getBufferCL();
+}
+int b3GpuNarrowPhase::getNumCollidablesGpu() const
+{
+	return m_data->m_collidablesGPU->size();
+}
+
+int b3GpuNarrowPhase::getNumContactsGpu() const
+{
+	return m_data->m_pBufContactBuffersGPU[m_data->m_currentContactBuffer]->size();
+}
+cl_mem b3GpuNarrowPhase::getContactsGpu()
+{
+	return m_data->m_pBufContactBuffersGPU[m_data->m_currentContactBuffer]->getBufferCL();
+}
+
+const b3Contact4* b3GpuNarrowPhase::getContactsCPU() const
+{
+	m_data->m_pBufContactBuffersGPU[m_data->m_currentContactBuffer]->copyToHost(*m_data->m_pBufContactOutCPU);
+	return &m_data->m_pBufContactOutCPU->at(0);
+}
+
+void b3GpuNarrowPhase::computeContacts(cl_mem broadphasePairs, int numBroadphasePairs, cl_mem aabbsWorldSpace, int numObjects)
+{
+	cl_mem aabbsLocalSpace = m_data->m_localShapeAABBGPU->getBufferCL();
+
+	int nContactOut = 0;
+
+	//swap buffer
+	m_data->m_currentContactBuffer = 1 - m_data->m_currentContactBuffer;
+
+	//int curSize = m_data->m_pBufContactBuffersGPU[m_data->m_currentContactBuffer]->size();
+
+	int maxTriConvexPairCapacity = m_data->m_config.m_maxTriConvexPairCapacity;
+	int numTriConvexPairsOut = 0;
+
+	b3OpenCLArray<b3Int4> broadphasePairsGPU(m_context, m_queue);
+	broadphasePairsGPU.setFromOpenCLBuffer(broadphasePairs, numBroadphasePairs);
+
+	b3OpenCLArray<b3Aabb> clAabbArrayWorldSpace(this->m_context, this->m_queue);
+	clAabbArrayWorldSpace.setFromOpenCLBuffer(aabbsWorldSpace, numObjects);
+
+	b3OpenCLArray<b3Aabb> clAabbArrayLocalSpace(this->m_context, this->m_queue);
+	clAabbArrayLocalSpace.setFromOpenCLBuffer(aabbsLocalSpace, numObjects);
+
+	m_data->m_gpuSatCollision->computeConvexConvexContactsGPUSAT(
+		&broadphasePairsGPU, numBroadphasePairs,
+		m_data->m_bodyBufferGPU,
+		m_data->m_pBufContactBuffersGPU[m_data->m_currentContactBuffer],
+		nContactOut,
+		m_data->m_pBufContactBuffersGPU[1 - m_data->m_currentContactBuffer],
+		m_data->m_config.m_maxContactCapacity,
+		m_data->m_config.m_compoundPairCapacity,
+		*m_data->m_convexPolyhedraGPU,
+		*m_data->m_convexVerticesGPU,
+		*m_data->m_uniqueEdgesGPU,
+		*m_data->m_convexFacesGPU,
+		*m_data->m_convexIndicesGPU,
+		*m_data->m_collidablesGPU,
+		*m_data->m_gpuChildShapes,
+		clAabbArrayWorldSpace,
+		clAabbArrayLocalSpace,
+		*m_data->m_worldVertsB1GPU,
+		*m_data->m_clippingFacesOutGPU,
+		*m_data->m_worldNormalsAGPU,
+		*m_data->m_worldVertsA1GPU,
+		*m_data->m_worldVertsB2GPU,
+		m_data->m_bvhData,
+		m_data->m_treeNodesGPU,
+		m_data->m_subTreesGPU,
+		m_data->m_bvhInfoGPU,
+		numObjects,
+		maxTriConvexPairCapacity,
+		*m_data->m_triangleConvexPairs,
+		numTriConvexPairsOut);
+
+	/*b3AlignedObjectArray<b3Int4> broadphasePairsCPU;
+	broadphasePairsGPU.copyToHost(broadphasePairsCPU);
+	printf("checking pairs\n");
+	*/
+}
+
+const b3SapAabb& b3GpuNarrowPhase::getLocalSpaceAabb(int collidableIndex) const
+{
+	return m_data->m_localShapeAABBCPU->at(collidableIndex);
+}
+
+int b3GpuNarrowPhase::registerRigidBody(int collidableIndex, float mass, const float* position, const float* orientation, const float* aabbMinPtr, const float* aabbMaxPtr, bool writeToGpu)
+{
+	b3Vector3 aabbMin = b3MakeVector3(aabbMinPtr[0], aabbMinPtr[1], aabbMinPtr[2]);
+	b3Vector3 aabbMax = b3MakeVector3(aabbMaxPtr[0], aabbMaxPtr[1], aabbMaxPtr[2]);
+
+	if (m_data->m_numAcceleratedRigidBodies >= (m_data->m_config.m_maxConvexBodies))
+	{
+		b3Error("registerRigidBody: exceeding the number of rigid bodies, %d > %d \n", m_data->m_numAcceleratedRigidBodies, m_data->m_config.m_maxConvexBodies);
+		return -1;
+	}
+
+	m_data->m_bodyBufferCPU->resize(m_data->m_numAcceleratedRigidBodies + 1);
+
+	b3RigidBodyData& body = m_data->m_bodyBufferCPU->at(m_data->m_numAcceleratedRigidBodies);
+
+	float friction = 1.f;
+	float restitution = 0.f;
+
+	body.m_frictionCoeff = friction;
+	body.m_restituitionCoeff = restitution;
+	body.m_angVel = b3MakeVector3(0, 0, 0);
+	body.m_linVel = b3MakeVector3(0, 0, 0);  //.setZero();
+	body.m_pos = b3MakeVector3(position[0], position[1], position[2]);
+	body.m_quat.setValue(orientation[0], orientation[1], orientation[2], orientation[3]);
+	body.m_collidableIdx = collidableIndex;
+	if (collidableIndex >= 0)
+	{
+		//		body.m_shapeType = m_data->m_collidablesCPU.at(collidableIndex).m_shapeType;
+	}
+	else
+	{
+		//	body.m_shapeType = CollisionShape::SHAPE_PLANE;
+		m_planeBodyIndex = m_data->m_numAcceleratedRigidBodies;
+	}
+	//body.m_shapeType = shapeType;
+
+	body.m_invMass = mass ? 1.f / mass : 0.f;
+
+	if (writeToGpu)
+	{
+		m_data->m_bodyBufferGPU->copyFromHostPointer(&body, 1, m_data->m_numAcceleratedRigidBodies);
+	}
+
+	b3InertiaData& shapeInfo = m_data->m_inertiaBufferCPU->at(m_data->m_numAcceleratedRigidBodies);
+
+	if (mass == 0.f)
+	{
+		if (m_data->m_numAcceleratedRigidBodies == 0)
+			m_static0Index = 0;
+
+		shapeInfo.m_initInvInertia.setValue(0, 0, 0, 0, 0, 0, 0, 0, 0);
+		shapeInfo.m_invInertiaWorld.setValue(0, 0, 0, 0, 0, 0, 0, 0, 0);
+	}
+	else
+	{
+		b3Assert(body.m_collidableIdx >= 0);
+
+		//approximate using the aabb of the shape
+
+		//Aabb aabb = (*m_data->m_shapePointers)[shapeIndex]->m_aabb;
+		b3Vector3 halfExtents = (aabbMax - aabbMin);  //*0.5f;//fake larger inertia makes demos more stable ;-)
+
+		b3Vector3 localInertia;
+
+		float lx = 2.f * halfExtents[0];
+		float ly = 2.f * halfExtents[1];
+		float lz = 2.f * halfExtents[2];
+
+		localInertia.setValue((mass / 12.0f) * (ly * ly + lz * lz),
+							  (mass / 12.0f) * (lx * lx + lz * lz),
+							  (mass / 12.0f) * (lx * lx + ly * ly));
+
+		b3Vector3 invLocalInertia;
+		invLocalInertia[0] = 1.f / localInertia[0];
+		invLocalInertia[1] = 1.f / localInertia[1];
+		invLocalInertia[2] = 1.f / localInertia[2];
+		invLocalInertia[3] = 0.f;
+
+		shapeInfo.m_initInvInertia.setValue(
+			invLocalInertia[0], 0, 0,
+			0, invLocalInertia[1], 0,
+			0, 0, invLocalInertia[2]);
+
+		b3Matrix3x3 m(body.m_quat);
+
+		shapeInfo.m_invInertiaWorld = m.scaled(invLocalInertia) * m.transpose();
+	}
+
+	if (writeToGpu)
+		m_data->m_inertiaBufferGPU->copyFromHostPointer(&shapeInfo, 1, m_data->m_numAcceleratedRigidBodies);
+
+	return m_data->m_numAcceleratedRigidBodies++;
+}
+
+int b3GpuNarrowPhase::getNumRigidBodies() const
+{
+	return m_data->m_numAcceleratedRigidBodies;
+}
+
+void b3GpuNarrowPhase::writeAllBodiesToGpu()
+{
+	if (m_data->m_localShapeAABBCPU->size())
+	{
+		m_data->m_localShapeAABBGPU->copyFromHost(*m_data->m_localShapeAABBCPU);
+	}
+
+	m_data->m_gpuChildShapes->copyFromHost(m_data->m_cpuChildShapes);
+	m_data->m_convexFacesGPU->copyFromHost(m_data->m_convexFaces);
+	m_data->m_convexPolyhedraGPU->copyFromHost(m_data->m_convexPolyhedra);
+	m_data->m_uniqueEdgesGPU->copyFromHost(m_data->m_uniqueEdges);
+	m_data->m_convexVerticesGPU->copyFromHost(m_data->m_convexVertices);
+	m_data->m_convexIndicesGPU->copyFromHost(m_data->m_convexIndices);
+	m_data->m_bvhInfoGPU->copyFromHost(m_data->m_bvhInfoCPU);
+	m_data->m_treeNodesGPU->copyFromHost(m_data->m_treeNodesCPU);
+	m_data->m_subTreesGPU->copyFromHost(m_data->m_subTreesCPU);
+
+	m_data->m_bodyBufferGPU->resize(m_data->m_numAcceleratedRigidBodies);
+	m_data->m_inertiaBufferGPU->resize(m_data->m_numAcceleratedRigidBodies);
+
+	if (m_data->m_numAcceleratedRigidBodies)
+	{
+		m_data->m_bodyBufferGPU->copyFromHostPointer(&m_data->m_bodyBufferCPU->at(0), m_data->m_numAcceleratedRigidBodies);
+		m_data->m_inertiaBufferGPU->copyFromHostPointer(&m_data->m_inertiaBufferCPU->at(0), m_data->m_numAcceleratedRigidBodies);
+	}
+	if (m_data->m_collidablesCPU.size())
+	{
+		m_data->m_collidablesGPU->copyFromHost(m_data->m_collidablesCPU);
+	}
+}
+
+void b3GpuNarrowPhase::reset()
+{
+	m_data->m_numAcceleratedShapes = 0;
+	m_data->m_numAcceleratedRigidBodies = 0;
+	this->m_static0Index = -1;
+	m_data->m_uniqueEdges.resize(0);
+	m_data->m_convexVertices.resize(0);
+	m_data->m_convexPolyhedra.resize(0);
+	m_data->m_convexIndices.resize(0);
+	m_data->m_cpuChildShapes.resize(0);
+	m_data->m_convexFaces.resize(0);
+	m_data->m_collidablesCPU.resize(0);
+	m_data->m_localShapeAABBCPU->resize(0);
+	m_data->m_bvhData.resize(0);
+	m_data->m_treeNodesCPU.resize(0);
+	m_data->m_subTreesCPU.resize(0);
+	m_data->m_bvhInfoCPU.resize(0);
+}
+
+void b3GpuNarrowPhase::readbackAllBodiesToCpu()
+{
+	m_data->m_bodyBufferGPU->copyToHostPointer(&m_data->m_bodyBufferCPU->at(0), m_data->m_numAcceleratedRigidBodies);
+}
+
+void b3GpuNarrowPhase::setObjectTransformCpu(float* position, float* orientation, int bodyIndex)
+{
+	if (bodyIndex >= 0 && bodyIndex < m_data->m_bodyBufferCPU->size())
+	{
+		m_data->m_bodyBufferCPU->at(bodyIndex).m_pos = b3MakeVector3(position[0], position[1], position[2]);
+		m_data->m_bodyBufferCPU->at(bodyIndex).m_quat.setValue(orientation[0], orientation[1], orientation[2], orientation[3]);
+	}
+	else
+	{
+		b3Warning("setObjectVelocityCpu out of range.\n");
+	}
+}
+void b3GpuNarrowPhase::setObjectVelocityCpu(float* linVel, float* angVel, int bodyIndex)
+{
+	if (bodyIndex >= 0 && bodyIndex < m_data->m_bodyBufferCPU->size())
+	{
+		m_data->m_bodyBufferCPU->at(bodyIndex).m_linVel = b3MakeVector3(linVel[0], linVel[1], linVel[2]);
+		m_data->m_bodyBufferCPU->at(bodyIndex).m_angVel = b3MakeVector3(angVel[0], angVel[1], angVel[2]);
+	}
+	else
+	{
+		b3Warning("setObjectVelocityCpu out of range.\n");
+	}
+}
+
+bool b3GpuNarrowPhase::getObjectTransformFromCpu(float* position, float* orientation, int bodyIndex) const
+{
+	if (bodyIndex >= 0 && bodyIndex < m_data->m_bodyBufferCPU->size())
+	{
+		position[0] = m_data->m_bodyBufferCPU->at(bodyIndex).m_pos.x;
+		position[1] = m_data->m_bodyBufferCPU->at(bodyIndex).m_pos.y;
+		position[2] = m_data->m_bodyBufferCPU->at(bodyIndex).m_pos.z;
+		position[3] = 1.f;  //or 1
+
+		orientation[0] = m_data->m_bodyBufferCPU->at(bodyIndex).m_quat.x;
+		orientation[1] = m_data->m_bodyBufferCPU->at(bodyIndex).m_quat.y;
+		orientation[2] = m_data->m_bodyBufferCPU->at(bodyIndex).m_quat.z;
+		orientation[3] = m_data->m_bodyBufferCPU->at(bodyIndex).m_quat.w;
+		return true;
+	}
+
+	b3Warning("getObjectTransformFromCpu out of range.\n");
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.h
new file mode 100644
index 0000000..21a68de
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.h
@@ -0,0 +1,101 @@
+#ifndef B3_GPU_NARROWPHASE_H
+#define B3_GPU_NARROWPHASE_H
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Vector3.h"
+
+class b3GpuNarrowPhase
+{
+protected:
+	struct b3GpuNarrowPhaseInternalData* m_data;
+	int m_acceleratedCompanionShapeIndex;
+	int m_planeBodyIndex;
+	int m_static0Index;
+
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+
+	int registerConvexHullShapeInternal(class b3ConvexUtility* convexPtr, b3Collidable& col);
+	int registerConcaveMeshShape(b3AlignedObjectArray<b3Vector3>* vertices, b3AlignedObjectArray<int>* indices, b3Collidable& col, const float* scaling);
+
+public:
+	b3GpuNarrowPhase(cl_context vtx, cl_device_id dev, cl_command_queue q, const struct b3Config& config);
+
+	virtual ~b3GpuNarrowPhase(void);
+
+	int registerSphereShape(float radius);
+	int registerPlaneShape(const b3Vector3& planeNormal, float planeConstant);
+
+	int registerCompoundShape(b3AlignedObjectArray<b3GpuChildShape>* childShapes);
+	int registerFace(const b3Vector3& faceNormal, float faceConstant);
+
+	int registerConcaveMesh(b3AlignedObjectArray<b3Vector3>* vertices, b3AlignedObjectArray<int>* indices, const float* scaling);
+
+	//do they need to be merged?
+
+	int registerConvexHullShape(b3ConvexUtility* utilPtr);
+	int registerConvexHullShape(const float* vertices, int strideInBytes, int numVertices, const float* scaling);
+
+	int registerRigidBody(int collidableIndex, float mass, const float* position, const float* orientation, const float* aabbMin, const float* aabbMax, bool writeToGpu);
+	void setObjectTransform(const float* position, const float* orientation, int bodyIndex);
+
+	void writeAllBodiesToGpu();
+	void reset();
+	void readbackAllBodiesToCpu();
+	bool getObjectTransformFromCpu(float* position, float* orientation, int bodyIndex) const;
+
+	void setObjectTransformCpu(float* position, float* orientation, int bodyIndex);
+	void setObjectVelocityCpu(float* linVel, float* angVel, int bodyIndex);
+
+	virtual void computeContacts(cl_mem broadphasePairs, int numBroadphasePairs, cl_mem aabbsWorldSpace, int numObjects);
+
+	cl_mem getBodiesGpu();
+	const struct b3RigidBodyData* getBodiesCpu() const;
+	//struct b3RigidBodyData* getBodiesCpu();
+
+	int getNumBodiesGpu() const;
+
+	cl_mem getBodyInertiasGpu();
+	int getNumBodyInertiasGpu() const;
+
+	cl_mem getCollidablesGpu();
+	const struct b3Collidable* getCollidablesCpu() const;
+	int getNumCollidablesGpu() const;
+
+	const struct b3SapAabb* getLocalSpaceAabbsCpu() const;
+
+	const struct b3Contact4* getContactsCPU() const;
+
+	cl_mem getContactsGpu();
+	int getNumContactsGpu() const;
+
+	cl_mem getAabbLocalSpaceBufferGpu();
+
+	int getNumRigidBodies() const;
+
+	int allocateCollidable();
+
+	int getStatic0Index() const
+	{
+		return m_static0Index;
+	}
+	b3Collidable& getCollidableCpu(int collidableIndex);
+	const b3Collidable& getCollidableCpu(int collidableIndex) const;
+
+	const b3GpuNarrowPhaseInternalData* getInternalData() const
+	{
+		return m_data;
+	}
+
+	b3GpuNarrowPhaseInternalData* getInternalData()
+	{
+		return m_data;
+	}
+
+	const struct b3SapAabb& getLocalSpaceAabb(int collidableIndex) const;
+};
+
+#endif  //B3_GPU_NARROWPHASE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhaseInternalData.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhaseInternalData.h
new file mode 100644
index 0000000..716a5ea
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhaseInternalData.h
@@ -0,0 +1,89 @@
+
+#ifndef B3_GPU_NARROWPHASE_INTERNAL_DATA_H
+#define B3_GPU_NARROWPHASE_INTERNAL_DATA_H
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3ConvexPolyhedronData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Vector3.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+#include "Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h"
+
+#include "Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h"
+#include "Bullet3OpenCL/NarrowphaseCollision/b3BvhInfo.h"
+#include "Bullet3Common/shared/b3Int4.h"
+#include "Bullet3Common/shared/b3Int2.h"
+
+class b3ConvexUtility;
+
+struct b3GpuNarrowPhaseInternalData
+{
+	b3AlignedObjectArray<b3ConvexUtility*>* m_convexData;
+
+	b3AlignedObjectArray<b3ConvexPolyhedronData> m_convexPolyhedra;
+	b3AlignedObjectArray<b3Vector3> m_uniqueEdges;
+	b3AlignedObjectArray<b3Vector3> m_convexVertices;
+	b3AlignedObjectArray<int> m_convexIndices;
+
+	b3OpenCLArray<b3ConvexPolyhedronData>* m_convexPolyhedraGPU;
+	b3OpenCLArray<b3Vector3>* m_uniqueEdgesGPU;
+	b3OpenCLArray<b3Vector3>* m_convexVerticesGPU;
+	b3OpenCLArray<int>* m_convexIndicesGPU;
+
+	b3OpenCLArray<b3Vector3>* m_worldVertsB1GPU;
+	b3OpenCLArray<b3Int4>* m_clippingFacesOutGPU;
+	b3OpenCLArray<b3Vector3>* m_worldNormalsAGPU;
+	b3OpenCLArray<b3Vector3>* m_worldVertsA1GPU;
+	b3OpenCLArray<b3Vector3>* m_worldVertsB2GPU;
+
+	b3AlignedObjectArray<b3GpuChildShape> m_cpuChildShapes;
+	b3OpenCLArray<b3GpuChildShape>* m_gpuChildShapes;
+
+	b3AlignedObjectArray<b3GpuFace> m_convexFaces;
+	b3OpenCLArray<b3GpuFace>* m_convexFacesGPU;
+
+	struct GpuSatCollision* m_gpuSatCollision;
+
+	b3OpenCLArray<b3Int4>* m_triangleConvexPairs;
+
+	b3OpenCLArray<b3Contact4>* m_pBufContactBuffersGPU[2];
+	int m_currentContactBuffer;
+	b3AlignedObjectArray<b3Contact4>* m_pBufContactOutCPU;
+
+	b3AlignedObjectArray<b3RigidBodyData>* m_bodyBufferCPU;
+	b3OpenCLArray<b3RigidBodyData>* m_bodyBufferGPU;
+
+	b3AlignedObjectArray<b3InertiaData>* m_inertiaBufferCPU;
+	b3OpenCLArray<b3InertiaData>* m_inertiaBufferGPU;
+
+	int m_numAcceleratedShapes;
+	int m_numAcceleratedRigidBodies;
+
+	b3AlignedObjectArray<b3Collidable> m_collidablesCPU;
+	b3OpenCLArray<b3Collidable>* m_collidablesGPU;
+
+	b3OpenCLArray<b3SapAabb>* m_localShapeAABBGPU;
+	b3AlignedObjectArray<b3SapAabb>* m_localShapeAABBCPU;
+
+	b3AlignedObjectArray<class b3OptimizedBvh*> m_bvhData;
+	b3AlignedObjectArray<class b3TriangleIndexVertexArray*> m_meshInterfaces;
+
+	b3AlignedObjectArray<b3QuantizedBvhNode> m_treeNodesCPU;
+	b3AlignedObjectArray<b3BvhSubtreeInfo> m_subTreesCPU;
+
+	b3AlignedObjectArray<b3BvhInfo> m_bvhInfoCPU;
+	b3OpenCLArray<b3BvhInfo>* m_bvhInfoGPU;
+
+	b3OpenCLArray<b3QuantizedBvhNode>* m_treeNodesGPU;
+	b3OpenCLArray<b3BvhSubtreeInfo>* m_subTreesGPU;
+
+	b3Config m_config;
+};
+
+#endif  //B3_GPU_NARROWPHASE_INTERNAL_DATA_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.cpp
new file mode 100644
index 0000000..bd9d6bb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.cpp
@@ -0,0 +1,1068 @@
+
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+bool useGpuInitSolverBodies = true;
+bool useGpuInfo1 = true;
+bool useGpuInfo2 = true;
+bool useGpuSolveJointConstraintRows = true;
+bool useGpuWriteBackVelocities = true;
+bool gpuBreakConstraints = true;
+
+#include "b3GpuPgsConstraintSolver.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+#include "Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h"
+#include <new>
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include <string.h>  //for memset
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h"
+
+#include "Bullet3OpenCL/RigidBody/kernels/jointSolver.h"  //solveConstraintRowsCL
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+
+#define B3_JOINT_SOLVER_PATH "src/Bullet3OpenCL/RigidBody/kernels/jointSolver.cl"
+
+struct b3GpuPgsJacobiSolverInternalData
+{
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+
+	b3PrefixScanCL* m_prefixScan;
+
+	cl_kernel m_solveJointConstraintRowsKernels;
+	cl_kernel m_initSolverBodiesKernel;
+	cl_kernel m_getInfo1Kernel;
+	cl_kernel m_initBatchConstraintsKernel;
+	cl_kernel m_getInfo2Kernel;
+	cl_kernel m_writeBackVelocitiesKernel;
+	cl_kernel m_breakViolatedConstraintsKernel;
+
+	b3OpenCLArray<unsigned int>* m_gpuConstraintRowOffsets;
+
+	b3OpenCLArray<b3GpuSolverBody>* m_gpuSolverBodies;
+	b3OpenCLArray<b3BatchConstraint>* m_gpuBatchConstraints;
+	b3OpenCLArray<b3GpuSolverConstraint>* m_gpuConstraintRows;
+	b3OpenCLArray<unsigned int>* m_gpuConstraintInfo1;
+
+	//	b3AlignedObjectArray<b3GpuSolverBody>		m_cpuSolverBodies;
+	b3AlignedObjectArray<b3BatchConstraint> m_cpuBatchConstraints;
+	b3AlignedObjectArray<b3GpuSolverConstraint> m_cpuConstraintRows;
+	b3AlignedObjectArray<unsigned int> m_cpuConstraintInfo1;
+	b3AlignedObjectArray<unsigned int> m_cpuConstraintRowOffsets;
+
+	b3AlignedObjectArray<b3RigidBodyData> m_cpuBodies;
+	b3AlignedObjectArray<b3InertiaData> m_cpuInertias;
+
+	b3AlignedObjectArray<b3GpuGenericConstraint> m_cpuConstraints;
+
+	b3AlignedObjectArray<int> m_batchSizes;
+};
+
+/*
+static b3Transform	getWorldTransform(b3RigidBodyData* rb)
+{
+	b3Transform newTrans;
+	newTrans.setOrigin(rb->m_pos);
+	newTrans.setRotation(rb->m_quat);
+	return newTrans;
+}
+
+static const b3Matrix3x3&	getInvInertiaTensorWorld(b3InertiaData* inertia)
+{
+	return inertia->m_invInertiaWorld;
+}
+
+*/
+
+static const b3Vector3& getLinearVelocity(b3RigidBodyData* rb)
+{
+	return rb->m_linVel;
+}
+
+static const b3Vector3& getAngularVelocity(b3RigidBodyData* rb)
+{
+	return rb->m_angVel;
+}
+
+b3Vector3 getVelocityInLocalPoint(b3RigidBodyData* rb, const b3Vector3& rel_pos)
+{
+	//we also calculate lin/ang velocity for kinematic objects
+	return getLinearVelocity(rb) + getAngularVelocity(rb).cross(rel_pos);
+}
+
+b3GpuPgsConstraintSolver::b3GpuPgsConstraintSolver(cl_context ctx, cl_device_id device, cl_command_queue queue, bool usePgs)
+{
+	m_usePgs = usePgs;
+	m_gpuData = new b3GpuPgsJacobiSolverInternalData();
+	m_gpuData->m_context = ctx;
+	m_gpuData->m_device = device;
+	m_gpuData->m_queue = queue;
+
+	m_gpuData->m_prefixScan = new b3PrefixScanCL(ctx, device, queue);
+
+	m_gpuData->m_gpuConstraintRowOffsets = new b3OpenCLArray<unsigned int>(m_gpuData->m_context, m_gpuData->m_queue);
+
+	m_gpuData->m_gpuSolverBodies = new b3OpenCLArray<b3GpuSolverBody>(m_gpuData->m_context, m_gpuData->m_queue);
+	m_gpuData->m_gpuBatchConstraints = new b3OpenCLArray<b3BatchConstraint>(m_gpuData->m_context, m_gpuData->m_queue);
+	m_gpuData->m_gpuConstraintRows = new b3OpenCLArray<b3GpuSolverConstraint>(m_gpuData->m_context, m_gpuData->m_queue);
+	m_gpuData->m_gpuConstraintInfo1 = new b3OpenCLArray<unsigned int>(m_gpuData->m_context, m_gpuData->m_queue);
+	cl_int errNum = 0;
+
+	{
+		cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, &errNum, "", B3_JOINT_SOLVER_PATH);
+		//cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_gpuData->m_context,m_gpuData->m_device,0,&errNum,"",B3_JOINT_SOLVER_PATH,true);
+		b3Assert(errNum == CL_SUCCESS);
+		m_gpuData->m_solveJointConstraintRowsKernels = b3OpenCLUtils::compileCLKernelFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, "solveJointConstraintRows", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_gpuData->m_initSolverBodiesKernel = b3OpenCLUtils::compileCLKernelFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, "initSolverBodies", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_gpuData->m_getInfo1Kernel = b3OpenCLUtils::compileCLKernelFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, "getInfo1Kernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_gpuData->m_initBatchConstraintsKernel = b3OpenCLUtils::compileCLKernelFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, "initBatchConstraintsKernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_gpuData->m_getInfo2Kernel = b3OpenCLUtils::compileCLKernelFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, "getInfo2Kernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_gpuData->m_writeBackVelocitiesKernel = b3OpenCLUtils::compileCLKernelFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, "writeBackVelocitiesKernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		m_gpuData->m_breakViolatedConstraintsKernel = b3OpenCLUtils::compileCLKernelFromString(m_gpuData->m_context, m_gpuData->m_device, solveConstraintRowsCL, "breakViolatedConstraintsKernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+
+		clReleaseProgram(prog);
+	}
+}
+
+b3GpuPgsConstraintSolver::~b3GpuPgsConstraintSolver()
+{
+	clReleaseKernel(m_gpuData->m_solveJointConstraintRowsKernels);
+	clReleaseKernel(m_gpuData->m_initSolverBodiesKernel);
+	clReleaseKernel(m_gpuData->m_getInfo1Kernel);
+	clReleaseKernel(m_gpuData->m_initBatchConstraintsKernel);
+	clReleaseKernel(m_gpuData->m_getInfo2Kernel);
+	clReleaseKernel(m_gpuData->m_writeBackVelocitiesKernel);
+	clReleaseKernel(m_gpuData->m_breakViolatedConstraintsKernel);
+
+	delete m_gpuData->m_prefixScan;
+	delete m_gpuData->m_gpuConstraintRowOffsets;
+	delete m_gpuData->m_gpuSolverBodies;
+	delete m_gpuData->m_gpuBatchConstraints;
+	delete m_gpuData->m_gpuConstraintRows;
+	delete m_gpuData->m_gpuConstraintInfo1;
+
+	delete m_gpuData;
+}
+
+struct b3BatchConstraint
+{
+	int m_bodyAPtrAndSignBit;
+	int m_bodyBPtrAndSignBit;
+	int m_originalConstraintIndex;
+	int m_batchId;
+};
+
+static b3AlignedObjectArray<b3BatchConstraint> batchConstraints;
+
+void b3GpuPgsConstraintSolver::recomputeBatches()
+{
+	m_gpuData->m_batchSizes.clear();
+}
+
+b3Scalar b3GpuPgsConstraintSolver::solveGroupCacheFriendlySetup(b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias, int numBodies, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	B3_PROFILE("GPU solveGroupCacheFriendlySetup");
+	batchConstraints.resize(numConstraints);
+	m_gpuData->m_gpuBatchConstraints->resize(numConstraints);
+	m_staticIdx = -1;
+	m_maxOverrideNumSolverIterations = 0;
+
+	/*	m_gpuData->m_gpuBodies->resize(numBodies);
+	m_gpuData->m_gpuBodies->copyFromHostPointer(bodies,numBodies);
+
+	b3OpenCLArray<b3InertiaData> gpuInertias(m_gpuData->m_context,m_gpuData->m_queue);
+	gpuInertias.resize(numBodies);
+	gpuInertias.copyFromHostPointer(inertias,numBodies);
+	*/
+
+	m_gpuData->m_gpuSolverBodies->resize(numBodies);
+
+	m_tmpSolverBodyPool.resize(numBodies);
+	{
+		if (useGpuInitSolverBodies)
+		{
+			B3_PROFILE("m_initSolverBodiesKernel");
+
+			b3LauncherCL launcher(m_gpuData->m_queue, m_gpuData->m_initSolverBodiesKernel, "m_initSolverBodiesKernel");
+			launcher.setBuffer(m_gpuData->m_gpuSolverBodies->getBufferCL());
+			launcher.setBuffer(gpuBodies->getBufferCL());
+			launcher.setConst(numBodies);
+			launcher.launch1D(numBodies);
+			clFinish(m_gpuData->m_queue);
+
+			//			m_gpuData->m_gpuSolverBodies->copyToHost(m_tmpSolverBodyPool);
+		}
+		else
+		{
+			gpuBodies->copyToHost(m_gpuData->m_cpuBodies);
+			for (int i = 0; i < numBodies; i++)
+			{
+				b3RigidBodyData& body = m_gpuData->m_cpuBodies[i];
+				b3GpuSolverBody& solverBody = m_tmpSolverBodyPool[i];
+				initSolverBody(i, &solverBody, &body);
+				solverBody.m_originalBodyIndex = i;
+			}
+			m_gpuData->m_gpuSolverBodies->copyFromHost(m_tmpSolverBodyPool);
+		}
+	}
+
+	//	int totalBodies = 0;
+	int totalNumRows = 0;
+	//b3RigidBody* rb0=0,*rb1=0;
+	//if (1)
+	{
+		{
+			//			int i;
+
+			m_tmpConstraintSizesPool.resizeNoInitialize(numConstraints);
+
+			//			b3OpenCLArray<b3GpuGenericConstraint> gpuConstraints(m_gpuData->m_context,m_gpuData->m_queue);
+
+			if (useGpuInfo1)
+			{
+				B3_PROFILE("info1 and init batchConstraint");
+
+				m_gpuData->m_gpuConstraintInfo1->resize(numConstraints);
+
+				if (1)
+				{
+					B3_PROFILE("getInfo1Kernel");
+
+					b3LauncherCL launcher(m_gpuData->m_queue, m_gpuData->m_getInfo1Kernel, "m_getInfo1Kernel");
+					launcher.setBuffer(m_gpuData->m_gpuConstraintInfo1->getBufferCL());
+					launcher.setBuffer(gpuConstraints->getBufferCL());
+					launcher.setConst(numConstraints);
+					launcher.launch1D(numConstraints);
+					clFinish(m_gpuData->m_queue);
+				}
+
+				if (m_gpuData->m_batchSizes.size() == 0)
+				{
+					B3_PROFILE("initBatchConstraintsKernel");
+
+					m_gpuData->m_gpuConstraintRowOffsets->resize(numConstraints);
+					unsigned int total = 0;
+					m_gpuData->m_prefixScan->execute(*m_gpuData->m_gpuConstraintInfo1, *m_gpuData->m_gpuConstraintRowOffsets, numConstraints, &total);
+					unsigned int lastElem = m_gpuData->m_gpuConstraintInfo1->at(numConstraints - 1);
+					totalNumRows = total + lastElem;
+
+					{
+						B3_PROFILE("init batch constraints");
+						b3LauncherCL launcher(m_gpuData->m_queue, m_gpuData->m_initBatchConstraintsKernel, "m_initBatchConstraintsKernel");
+						launcher.setBuffer(m_gpuData->m_gpuConstraintInfo1->getBufferCL());
+						launcher.setBuffer(m_gpuData->m_gpuConstraintRowOffsets->getBufferCL());
+						launcher.setBuffer(m_gpuData->m_gpuBatchConstraints->getBufferCL());
+						launcher.setBuffer(gpuConstraints->getBufferCL());
+						launcher.setBuffer(gpuBodies->getBufferCL());
+						launcher.setConst(numConstraints);
+						launcher.launch1D(numConstraints);
+						clFinish(m_gpuData->m_queue);
+					}
+					//assume the batching happens on CPU, so copy the data
+					m_gpuData->m_gpuBatchConstraints->copyToHost(batchConstraints);
+				}
+			}
+			else
+			{
+				totalNumRows = 0;
+				gpuConstraints->copyToHost(m_gpuData->m_cpuConstraints);
+				//calculate the total number of contraint rows
+				for (int i = 0; i < numConstraints; i++)
+				{
+					unsigned int& info1 = m_tmpConstraintSizesPool[i];
+					//					unsigned int info1;
+					if (m_gpuData->m_cpuConstraints[i].isEnabled())
+					{
+						m_gpuData->m_cpuConstraints[i].getInfo1(&info1, &m_gpuData->m_cpuBodies[0]);
+					}
+					else
+					{
+						info1 = 0;
+					}
+
+					totalNumRows += info1;
+				}
+
+				m_gpuData->m_gpuBatchConstraints->copyFromHost(batchConstraints);
+				m_gpuData->m_gpuConstraintInfo1->copyFromHost(m_tmpConstraintSizesPool);
+			}
+			m_tmpSolverNonContactConstraintPool.resizeNoInitialize(totalNumRows);
+			m_gpuData->m_gpuConstraintRows->resize(totalNumRows);
+
+			//			b3GpuConstraintArray		verify;
+
+			if (useGpuInfo2)
+			{
+				{
+					B3_PROFILE("getInfo2Kernel");
+					b3LauncherCL launcher(m_gpuData->m_queue, m_gpuData->m_getInfo2Kernel, "m_getInfo2Kernel");
+					launcher.setBuffer(m_gpuData->m_gpuConstraintRows->getBufferCL());
+					launcher.setBuffer(m_gpuData->m_gpuConstraintInfo1->getBufferCL());
+					launcher.setBuffer(m_gpuData->m_gpuConstraintRowOffsets->getBufferCL());
+					launcher.setBuffer(gpuConstraints->getBufferCL());
+					launcher.setBuffer(m_gpuData->m_gpuBatchConstraints->getBufferCL());
+					launcher.setBuffer(gpuBodies->getBufferCL());
+					launcher.setBuffer(gpuInertias->getBufferCL());
+					launcher.setBuffer(m_gpuData->m_gpuSolverBodies->getBufferCL());
+					launcher.setConst(infoGlobal.m_timeStep);
+					launcher.setConst(infoGlobal.m_erp);
+					launcher.setConst(infoGlobal.m_globalCfm);
+					launcher.setConst(infoGlobal.m_damping);
+					launcher.setConst(infoGlobal.m_numIterations);
+					launcher.setConst(numConstraints);
+					launcher.launch1D(numConstraints);
+					clFinish(m_gpuData->m_queue);
+
+					if (m_gpuData->m_batchSizes.size() == 0)
+						m_gpuData->m_gpuBatchConstraints->copyToHost(batchConstraints);
+					//m_gpuData->m_gpuConstraintRows->copyToHost(verify);
+					//m_gpuData->m_gpuConstraintRows->copyToHost(m_tmpSolverNonContactConstraintPool);
+				}
+			}
+			else
+			{
+				gpuInertias->copyToHost(m_gpuData->m_cpuInertias);
+
+				///setup the b3SolverConstraints
+
+				for (int i = 0; i < numConstraints; i++)
+				{
+					const int& info1 = m_tmpConstraintSizesPool[i];
+
+					if (info1)
+					{
+						int constraintIndex = batchConstraints[i].m_originalConstraintIndex;
+						int constraintRowOffset = m_gpuData->m_cpuConstraintRowOffsets[constraintIndex];
+
+						b3GpuSolverConstraint* currentConstraintRow = &m_tmpSolverNonContactConstraintPool[constraintRowOffset];
+						b3GpuGenericConstraint& constraint = m_gpuData->m_cpuConstraints[i];
+
+						b3RigidBodyData& rbA = m_gpuData->m_cpuBodies[constraint.getRigidBodyA()];
+						//b3RigidBody& rbA = constraint.getRigidBodyA();
+						//				b3RigidBody& rbB = constraint.getRigidBodyB();
+						b3RigidBodyData& rbB = m_gpuData->m_cpuBodies[constraint.getRigidBodyB()];
+
+						int solverBodyIdA = constraint.getRigidBodyA();  //getOrInitSolverBody(constraint.getRigidBodyA(),bodies,inertias);
+						int solverBodyIdB = constraint.getRigidBodyB();  //getOrInitSolverBody(constraint.getRigidBodyB(),bodies,inertias);
+
+						b3GpuSolverBody* bodyAPtr = &m_tmpSolverBodyPool[solverBodyIdA];
+						b3GpuSolverBody* bodyBPtr = &m_tmpSolverBodyPool[solverBodyIdB];
+
+						if (rbA.m_invMass)
+						{
+							batchConstraints[i].m_bodyAPtrAndSignBit = solverBodyIdA;
+						}
+						else
+						{
+							if (!solverBodyIdA)
+								m_staticIdx = 0;
+							batchConstraints[i].m_bodyAPtrAndSignBit = -solverBodyIdA;
+						}
+
+						if (rbB.m_invMass)
+						{
+							batchConstraints[i].m_bodyBPtrAndSignBit = solverBodyIdB;
+						}
+						else
+						{
+							if (!solverBodyIdB)
+								m_staticIdx = 0;
+							batchConstraints[i].m_bodyBPtrAndSignBit = -solverBodyIdB;
+						}
+
+						int overrideNumSolverIterations = 0;  //constraint->getOverrideNumSolverIterations() > 0 ? constraint->getOverrideNumSolverIterations() : infoGlobal.m_numIterations;
+						if (overrideNumSolverIterations > m_maxOverrideNumSolverIterations)
+							m_maxOverrideNumSolverIterations = overrideNumSolverIterations;
+
+						int j;
+						for (j = 0; j < info1; j++)
+						{
+							memset(&currentConstraintRow[j], 0, sizeof(b3GpuSolverConstraint));
+							currentConstraintRow[j].m_angularComponentA.setValue(0, 0, 0);
+							currentConstraintRow[j].m_angularComponentB.setValue(0, 0, 0);
+							currentConstraintRow[j].m_appliedImpulse = 0.f;
+							currentConstraintRow[j].m_appliedPushImpulse = 0.f;
+							currentConstraintRow[j].m_cfm = 0.f;
+							currentConstraintRow[j].m_contactNormal.setValue(0, 0, 0);
+							currentConstraintRow[j].m_friction = 0.f;
+							currentConstraintRow[j].m_frictionIndex = 0;
+							currentConstraintRow[j].m_jacDiagABInv = 0.f;
+							currentConstraintRow[j].m_lowerLimit = 0.f;
+							currentConstraintRow[j].m_upperLimit = 0.f;
+
+							currentConstraintRow[j].m_originalContactPoint = 0;
+							currentConstraintRow[j].m_overrideNumSolverIterations = 0;
+							currentConstraintRow[j].m_relpos1CrossNormal.setValue(0, 0, 0);
+							currentConstraintRow[j].m_relpos2CrossNormal.setValue(0, 0, 0);
+							currentConstraintRow[j].m_rhs = 0.f;
+							currentConstraintRow[j].m_rhsPenetration = 0.f;
+							currentConstraintRow[j].m_solverBodyIdA = 0;
+							currentConstraintRow[j].m_solverBodyIdB = 0;
+
+							currentConstraintRow[j].m_lowerLimit = -B3_INFINITY;
+							currentConstraintRow[j].m_upperLimit = B3_INFINITY;
+							currentConstraintRow[j].m_appliedImpulse = 0.f;
+							currentConstraintRow[j].m_appliedPushImpulse = 0.f;
+							currentConstraintRow[j].m_solverBodyIdA = solverBodyIdA;
+							currentConstraintRow[j].m_solverBodyIdB = solverBodyIdB;
+							currentConstraintRow[j].m_overrideNumSolverIterations = overrideNumSolverIterations;
+						}
+
+						bodyAPtr->internalGetDeltaLinearVelocity().setValue(0.f, 0.f, 0.f);
+						bodyAPtr->internalGetDeltaAngularVelocity().setValue(0.f, 0.f, 0.f);
+						bodyAPtr->internalGetPushVelocity().setValue(0.f, 0.f, 0.f);
+						bodyAPtr->internalGetTurnVelocity().setValue(0.f, 0.f, 0.f);
+						bodyBPtr->internalGetDeltaLinearVelocity().setValue(0.f, 0.f, 0.f);
+						bodyBPtr->internalGetDeltaAngularVelocity().setValue(0.f, 0.f, 0.f);
+						bodyBPtr->internalGetPushVelocity().setValue(0.f, 0.f, 0.f);
+						bodyBPtr->internalGetTurnVelocity().setValue(0.f, 0.f, 0.f);
+
+						b3GpuConstraintInfo2 info2;
+						info2.fps = 1.f / infoGlobal.m_timeStep;
+						info2.erp = infoGlobal.m_erp;
+						info2.m_J1linearAxis = currentConstraintRow->m_contactNormal;
+						info2.m_J1angularAxis = currentConstraintRow->m_relpos1CrossNormal;
+						info2.m_J2linearAxis = 0;
+						info2.m_J2angularAxis = currentConstraintRow->m_relpos2CrossNormal;
+						info2.rowskip = sizeof(b3GpuSolverConstraint) / sizeof(b3Scalar);  //check this
+						///the size of b3GpuSolverConstraint needs be a multiple of b3Scalar
+						b3Assert(info2.rowskip * sizeof(b3Scalar) == sizeof(b3GpuSolverConstraint));
+						info2.m_constraintError = &currentConstraintRow->m_rhs;
+						currentConstraintRow->m_cfm = infoGlobal.m_globalCfm;
+						info2.m_damping = infoGlobal.m_damping;
+						info2.cfm = &currentConstraintRow->m_cfm;
+						info2.m_lowerLimit = &currentConstraintRow->m_lowerLimit;
+						info2.m_upperLimit = &currentConstraintRow->m_upperLimit;
+						info2.m_numIterations = infoGlobal.m_numIterations;
+						m_gpuData->m_cpuConstraints[i].getInfo2(&info2, &m_gpuData->m_cpuBodies[0]);
+
+						///finalize the constraint setup
+						for (j = 0; j < info1; j++)
+						{
+							b3GpuSolverConstraint& solverConstraint = currentConstraintRow[j];
+
+							if (solverConstraint.m_upperLimit >= m_gpuData->m_cpuConstraints[i].getBreakingImpulseThreshold())
+							{
+								solverConstraint.m_upperLimit = m_gpuData->m_cpuConstraints[i].getBreakingImpulseThreshold();
+							}
+
+							if (solverConstraint.m_lowerLimit <= -m_gpuData->m_cpuConstraints[i].getBreakingImpulseThreshold())
+							{
+								solverConstraint.m_lowerLimit = -m_gpuData->m_cpuConstraints[i].getBreakingImpulseThreshold();
+							}
+
+							//						solverConstraint.m_originalContactPoint = constraint;
+
+							b3Matrix3x3& invInertiaWorldA = m_gpuData->m_cpuInertias[constraint.getRigidBodyA()].m_invInertiaWorld;
+							{
+								//b3Vector3 angularFactorA(1,1,1);
+								const b3Vector3& ftorqueAxis1 = solverConstraint.m_relpos1CrossNormal;
+								solverConstraint.m_angularComponentA = invInertiaWorldA * ftorqueAxis1;  //*angularFactorA;
+							}
+
+							b3Matrix3x3& invInertiaWorldB = m_gpuData->m_cpuInertias[constraint.getRigidBodyB()].m_invInertiaWorld;
+							{
+								const b3Vector3& ftorqueAxis2 = solverConstraint.m_relpos2CrossNormal;
+								solverConstraint.m_angularComponentB = invInertiaWorldB * ftorqueAxis2;  //*constraint.getRigidBodyB().getAngularFactor();
+							}
+
+							{
+								//it is ok to use solverConstraint.m_contactNormal instead of -solverConstraint.m_contactNormal
+								//because it gets multiplied iMJlB
+								b3Vector3 iMJlA = solverConstraint.m_contactNormal * rbA.m_invMass;
+								b3Vector3 iMJaA = invInertiaWorldA * solverConstraint.m_relpos1CrossNormal;
+								b3Vector3 iMJlB = solverConstraint.m_contactNormal * rbB.m_invMass;  //sign of normal?
+								b3Vector3 iMJaB = invInertiaWorldB * solverConstraint.m_relpos2CrossNormal;
+
+								b3Scalar sum = iMJlA.dot(solverConstraint.m_contactNormal);
+								sum += iMJaA.dot(solverConstraint.m_relpos1CrossNormal);
+								sum += iMJlB.dot(solverConstraint.m_contactNormal);
+								sum += iMJaB.dot(solverConstraint.m_relpos2CrossNormal);
+								b3Scalar fsum = b3Fabs(sum);
+								b3Assert(fsum > B3_EPSILON);
+								solverConstraint.m_jacDiagABInv = fsum > B3_EPSILON ? b3Scalar(1.) / sum : 0.f;
+							}
+
+							///fix rhs
+							///todo: add force/torque accelerators
+							{
+								b3Scalar rel_vel;
+								b3Scalar vel1Dotn = solverConstraint.m_contactNormal.dot(rbA.m_linVel) + solverConstraint.m_relpos1CrossNormal.dot(rbA.m_angVel);
+								b3Scalar vel2Dotn = -solverConstraint.m_contactNormal.dot(rbB.m_linVel) + solverConstraint.m_relpos2CrossNormal.dot(rbB.m_angVel);
+
+								rel_vel = vel1Dotn + vel2Dotn;
+
+								b3Scalar restitution = 0.f;
+								b3Scalar positionalError = solverConstraint.m_rhs;  //already filled in by getConstraintInfo2
+								b3Scalar velocityError = restitution - rel_vel * info2.m_damping;
+								b3Scalar penetrationImpulse = positionalError * solverConstraint.m_jacDiagABInv;
+								b3Scalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+								solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+								solverConstraint.m_appliedImpulse = 0.f;
+							}
+						}
+					}
+				}
+
+				m_gpuData->m_gpuConstraintRows->copyFromHost(m_tmpSolverNonContactConstraintPool);
+				m_gpuData->m_gpuConstraintInfo1->copyFromHost(m_tmpConstraintSizesPool);
+
+				if (m_gpuData->m_batchSizes.size() == 0)
+					m_gpuData->m_gpuBatchConstraints->copyFromHost(batchConstraints);
+				else
+					m_gpuData->m_gpuBatchConstraints->copyToHost(batchConstraints);
+
+				m_gpuData->m_gpuSolverBodies->copyFromHost(m_tmpSolverBodyPool);
+
+			}  //end useGpuInfo2
+		}
+
+#ifdef B3_SUPPORT_CONTACT_CONSTRAINTS
+		{
+			int i;
+
+			for (i = 0; i < numManifolds; i++)
+			{
+				b3Contact4& manifold = manifoldPtr[i];
+				convertContact(bodies, inertias, &manifold, infoGlobal);
+			}
+		}
+#endif  //B3_SUPPORT_CONTACT_CONSTRAINTS
+	}
+
+	//	b3ContactSolverInfo info = infoGlobal;
+
+	//	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
+	//	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
+	//	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
+
+	return 0.f;
+}
+
+///a straight copy from GPU/OpenCL kernel, for debugging
+__inline void internalApplyImpulse(b3GpuSolverBody* body, const b3Vector3& linearComponent, const b3Vector3& angularComponent, float impulseMagnitude)
+{
+	body->m_deltaLinearVelocity += linearComponent * impulseMagnitude * body->m_linearFactor;
+	body->m_deltaAngularVelocity += angularComponent * (impulseMagnitude * body->m_angularFactor);
+}
+
+void resolveSingleConstraintRowGeneric2(b3GpuSolverBody* body1, b3GpuSolverBody* body2, b3GpuSolverConstraint* c)
+{
+	float deltaImpulse = c->m_rhs - b3Scalar(c->m_appliedImpulse) * c->m_cfm;
+	float deltaVel1Dotn = b3Dot(c->m_contactNormal, body1->m_deltaLinearVelocity) + b3Dot(c->m_relpos1CrossNormal, body1->m_deltaAngularVelocity);
+	float deltaVel2Dotn = -b3Dot(c->m_contactNormal, body2->m_deltaLinearVelocity) + b3Dot(c->m_relpos2CrossNormal, body2->m_deltaAngularVelocity);
+
+	deltaImpulse -= deltaVel1Dotn * c->m_jacDiagABInv;
+	deltaImpulse -= deltaVel2Dotn * c->m_jacDiagABInv;
+
+	float sum = b3Scalar(c->m_appliedImpulse) + deltaImpulse;
+	if (sum < c->m_lowerLimit)
+	{
+		deltaImpulse = c->m_lowerLimit - b3Scalar(c->m_appliedImpulse);
+		c->m_appliedImpulse = c->m_lowerLimit;
+	}
+	else if (sum > c->m_upperLimit)
+	{
+		deltaImpulse = c->m_upperLimit - b3Scalar(c->m_appliedImpulse);
+		c->m_appliedImpulse = c->m_upperLimit;
+	}
+	else
+	{
+		c->m_appliedImpulse = sum;
+	}
+
+	internalApplyImpulse(body1, c->m_contactNormal * body1->m_invMass, c->m_angularComponentA, deltaImpulse);
+	internalApplyImpulse(body2, -c->m_contactNormal * body2->m_invMass, c->m_angularComponentB, deltaImpulse);
+}
+
+void b3GpuPgsConstraintSolver::initSolverBody(int bodyIndex, b3GpuSolverBody* solverBody, b3RigidBodyData* rb)
+{
+	solverBody->m_deltaLinearVelocity.setValue(0.f, 0.f, 0.f);
+	solverBody->m_deltaAngularVelocity.setValue(0.f, 0.f, 0.f);
+	solverBody->internalGetPushVelocity().setValue(0.f, 0.f, 0.f);
+	solverBody->internalGetTurnVelocity().setValue(0.f, 0.f, 0.f);
+
+	b3Assert(rb);
+	//	solverBody->m_worldTransform = getWorldTransform(rb);
+	solverBody->internalSetInvMass(b3MakeVector3(rb->m_invMass, rb->m_invMass, rb->m_invMass));
+	solverBody->m_originalBodyIndex = bodyIndex;
+	solverBody->m_angularFactor = b3MakeVector3(1, 1, 1);
+	solverBody->m_linearFactor = b3MakeVector3(1, 1, 1);
+	solverBody->m_linearVelocity = getLinearVelocity(rb);
+	solverBody->m_angularVelocity = getAngularVelocity(rb);
+}
+
+void b3GpuPgsConstraintSolver::averageVelocities()
+{
+}
+
+b3Scalar b3GpuPgsConstraintSolver::solveGroupCacheFriendlyIterations(b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints1, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	//only create the batches once.
+	//@todo: incrementally update batches when constraints are added/activated and/or removed/deactivated
+	B3_PROFILE("GpuSolveGroupCacheFriendlyIterations");
+
+	bool createBatches = m_gpuData->m_batchSizes.size() == 0;
+	{
+		if (createBatches)
+		{
+			m_gpuData->m_batchSizes.resize(0);
+
+			{
+				m_gpuData->m_gpuBatchConstraints->copyToHost(batchConstraints);
+
+				B3_PROFILE("batch joints");
+				b3Assert(batchConstraints.size() == numConstraints);
+				int simdWidth = numConstraints + 1;
+				int numBodies = m_tmpSolverBodyPool.size();
+				sortConstraintByBatch3(&batchConstraints[0], numConstraints, simdWidth, m_staticIdx, numBodies);
+
+				m_gpuData->m_gpuBatchConstraints->copyFromHost(batchConstraints);
+			}
+		}
+		else
+		{
+			/*b3AlignedObjectArray<b3BatchConstraint> cpuCheckBatches;
+			m_gpuData->m_gpuBatchConstraints->copyToHost(cpuCheckBatches);
+			b3Assert(cpuCheckBatches.size()==batchConstraints.size());
+			printf(".\n");
+			*/
+			//>copyFromHost(batchConstraints);
+		}
+		int maxIterations = infoGlobal.m_numIterations;
+
+		bool useBatching = true;
+
+		if (useBatching)
+		{
+			if (!useGpuSolveJointConstraintRows)
+			{
+				B3_PROFILE("copy to host");
+				m_gpuData->m_gpuSolverBodies->copyToHost(m_tmpSolverBodyPool);
+				m_gpuData->m_gpuBatchConstraints->copyToHost(batchConstraints);
+				m_gpuData->m_gpuConstraintRows->copyToHost(m_tmpSolverNonContactConstraintPool);
+				m_gpuData->m_gpuConstraintInfo1->copyToHost(m_gpuData->m_cpuConstraintInfo1);
+				m_gpuData->m_gpuConstraintRowOffsets->copyToHost(m_gpuData->m_cpuConstraintRowOffsets);
+				gpuConstraints1->copyToHost(m_gpuData->m_cpuConstraints);
+			}
+
+			for (int iteration = 0; iteration < maxIterations; iteration++)
+			{
+				int batchOffset = 0;
+				int constraintOffset = 0;
+				int numBatches = m_gpuData->m_batchSizes.size();
+				for (int bb = 0; bb < numBatches; bb++)
+				{
+					int numConstraintsInBatch = m_gpuData->m_batchSizes[bb];
+
+					if (useGpuSolveJointConstraintRows)
+					{
+						B3_PROFILE("solveJointConstraintRowsKernels");
+
+						/*
+						__kernel void solveJointConstraintRows(__global b3GpuSolverBody* solverBodies,
+					  __global b3BatchConstraint* batchConstraints,
+					  	__global b3SolverConstraint* rows,
+						__global unsigned int* numConstraintRowsInfo1, 
+						__global unsigned int* rowOffsets,
+						__global b3GpuGenericConstraint* constraints,
+						int batchOffset,
+						int numConstraintsInBatch*/
+
+						b3LauncherCL launcher(m_gpuData->m_queue, m_gpuData->m_solveJointConstraintRowsKernels, "m_solveJointConstraintRowsKernels");
+						launcher.setBuffer(m_gpuData->m_gpuSolverBodies->getBufferCL());
+						launcher.setBuffer(m_gpuData->m_gpuBatchConstraints->getBufferCL());
+						launcher.setBuffer(m_gpuData->m_gpuConstraintRows->getBufferCL());
+						launcher.setBuffer(m_gpuData->m_gpuConstraintInfo1->getBufferCL());
+						launcher.setBuffer(m_gpuData->m_gpuConstraintRowOffsets->getBufferCL());
+						launcher.setBuffer(gpuConstraints1->getBufferCL());  //to detect disabled constraints
+						launcher.setConst(batchOffset);
+						launcher.setConst(numConstraintsInBatch);
+
+						launcher.launch1D(numConstraintsInBatch);
+					}
+					else  //useGpu
+					{
+						for (int b = 0; b < numConstraintsInBatch; b++)
+						{
+							const b3BatchConstraint& c = batchConstraints[batchOffset + b];
+							/*printf("-----------\n");
+							printf("bb=%d\n",bb);
+							printf("c.batchId = %d\n", c.m_batchId);
+							*/
+							b3Assert(c.m_batchId == bb);
+							b3GpuGenericConstraint* constraint = &m_gpuData->m_cpuConstraints[c.m_originalConstraintIndex];
+							if (constraint->m_flags & B3_CONSTRAINT_FLAG_ENABLED)
+							{
+								int numConstraintRows = m_gpuData->m_cpuConstraintInfo1[c.m_originalConstraintIndex];
+								int constraintOffset = m_gpuData->m_cpuConstraintRowOffsets[c.m_originalConstraintIndex];
+
+								for (int jj = 0; jj < numConstraintRows; jj++)
+								{
+									//
+									b3GpuSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[constraintOffset + jj];
+									//resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[constraint.m_solverBodyIdA],m_tmpSolverBodyPool[constraint.m_solverBodyIdB],constraint);
+									resolveSingleConstraintRowGeneric2(&m_tmpSolverBodyPool[constraint.m_solverBodyIdA], &m_tmpSolverBodyPool[constraint.m_solverBodyIdB], &constraint);
+								}
+							}
+						}
+					}  //useGpu
+					batchOffset += numConstraintsInBatch;
+					constraintOffset += numConstraintsInBatch;
+				}
+			}  //for (int iteration...
+
+			if (!useGpuSolveJointConstraintRows)
+			{
+				{
+					B3_PROFILE("copy from host");
+					m_gpuData->m_gpuSolverBodies->copyFromHost(m_tmpSolverBodyPool);
+					m_gpuData->m_gpuBatchConstraints->copyFromHost(batchConstraints);
+					m_gpuData->m_gpuConstraintRows->copyFromHost(m_tmpSolverNonContactConstraintPool);
+				}
+
+				//B3_PROFILE("copy to host");
+				//m_gpuData->m_gpuSolverBodies->copyToHost(m_tmpSolverBodyPool);
+			}
+			//int sz = sizeof(b3GpuSolverBody);
+			//printf("cpu sizeof(b3GpuSolverBody)=%d\n",sz);
+		}
+		else
+		{
+			for (int iteration = 0; iteration < maxIterations; iteration++)
+			{
+				int numJoints = m_tmpSolverNonContactConstraintPool.size();
+				for (int j = 0; j < numJoints; j++)
+				{
+					b3GpuSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[j];
+					resolveSingleConstraintRowGeneric2(&m_tmpSolverBodyPool[constraint.m_solverBodyIdA], &m_tmpSolverBodyPool[constraint.m_solverBodyIdB], &constraint);
+				}
+
+				if (!m_usePgs)
+				{
+					averageVelocities();
+				}
+			}
+		}
+	}
+	clFinish(m_gpuData->m_queue);
+	return 0.f;
+}
+
+static b3AlignedObjectArray<int> bodyUsed;
+static b3AlignedObjectArray<int> curUsed;
+
+inline int b3GpuPgsConstraintSolver::sortConstraintByBatch3(b3BatchConstraint* cs, int numConstraints, int simdWidth, int staticIdx, int numBodies)
+{
+	//int sz = sizeof(b3BatchConstraint);
+
+	B3_PROFILE("sortConstraintByBatch3");
+
+	static int maxSwaps = 0;
+	int numSwaps = 0;
+
+	curUsed.resize(2 * simdWidth);
+
+	static int maxNumConstraints = 0;
+	if (maxNumConstraints < numConstraints)
+	{
+		maxNumConstraints = numConstraints;
+		//printf("maxNumConstraints  = %d\n",maxNumConstraints );
+	}
+
+	int numUsedArray = numBodies / 32 + 1;
+	bodyUsed.resize(numUsedArray);
+
+	for (int q = 0; q < numUsedArray; q++)
+		bodyUsed[q] = 0;
+
+	int curBodyUsed = 0;
+
+	int numIter = 0;
+
+#if defined(_DEBUG)
+	for (int i = 0; i < numConstraints; i++)
+		cs[i].m_batchId = -1;
+#endif
+
+	int numValidConstraints = 0;
+	//	int unprocessedConstraintIndex = 0;
+
+	int batchIdx = 0;
+
+	{
+		B3_PROFILE("cpu batch innerloop");
+
+		while (numValidConstraints < numConstraints)
+		{
+			numIter++;
+			int nCurrentBatch = 0;
+			//	clear flag
+			for (int i = 0; i < curBodyUsed; i++)
+				bodyUsed[curUsed[i] / 32] = 0;
+
+			curBodyUsed = 0;
+
+			for (int i = numValidConstraints; i < numConstraints; i++)
+			{
+				int idx = i;
+				b3Assert(idx < numConstraints);
+				//	check if it can go
+				int bodyAS = cs[idx].m_bodyAPtrAndSignBit;
+				int bodyBS = cs[idx].m_bodyBPtrAndSignBit;
+				int bodyA = abs(bodyAS);
+				int bodyB = abs(bodyBS);
+				bool aIsStatic = (bodyAS < 0) || bodyAS == staticIdx;
+				bool bIsStatic = (bodyBS < 0) || bodyBS == staticIdx;
+				int aUnavailable = 0;
+				int bUnavailable = 0;
+				if (!aIsStatic)
+				{
+					aUnavailable = bodyUsed[bodyA / 32] & (1 << (bodyA & 31));
+				}
+				if (!aUnavailable)
+					if (!bIsStatic)
+					{
+						bUnavailable = bodyUsed[bodyB / 32] & (1 << (bodyB & 31));
+					}
+
+				if (aUnavailable == 0 && bUnavailable == 0)  // ok
+				{
+					if (!aIsStatic)
+					{
+						bodyUsed[bodyA / 32] |= (1 << (bodyA & 31));
+						curUsed[curBodyUsed++] = bodyA;
+					}
+					if (!bIsStatic)
+					{
+						bodyUsed[bodyB / 32] |= (1 << (bodyB & 31));
+						curUsed[curBodyUsed++] = bodyB;
+					}
+
+					cs[idx].m_batchId = batchIdx;
+
+					if (i != numValidConstraints)
+					{
+						b3Swap(cs[i], cs[numValidConstraints]);
+						numSwaps++;
+					}
+
+					numValidConstraints++;
+					{
+						nCurrentBatch++;
+						if (nCurrentBatch == simdWidth)
+						{
+							nCurrentBatch = 0;
+							for (int i = 0; i < curBodyUsed; i++)
+								bodyUsed[curUsed[i] / 32] = 0;
+							curBodyUsed = 0;
+						}
+					}
+				}
+			}
+			m_gpuData->m_batchSizes.push_back(nCurrentBatch);
+			batchIdx++;
+		}
+	}
+
+#if defined(_DEBUG)
+	//		debugPrintf( "nBatches: %d\n", batchIdx );
+	for (int i = 0; i < numConstraints; i++)
+	{
+		b3Assert(cs[i].m_batchId != -1);
+	}
+#endif
+
+	if (maxSwaps < numSwaps)
+	{
+		maxSwaps = numSwaps;
+		//printf("maxSwaps = %d\n", maxSwaps);
+	}
+
+	return batchIdx;
+}
+
+/// b3PgsJacobiSolver Sequentially applies impulses
+b3Scalar b3GpuPgsConstraintSolver::solveGroup(b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias,
+											  int numBodies, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	B3_PROFILE("solveJoints");
+	//you need to provide at least some bodies
+
+	solveGroupCacheFriendlySetup(gpuBodies, gpuInertias, numBodies, gpuConstraints, numConstraints, infoGlobal);
+
+	solveGroupCacheFriendlyIterations(gpuConstraints, numConstraints, infoGlobal);
+
+	solveGroupCacheFriendlyFinish(gpuBodies, gpuInertias, numBodies, gpuConstraints, numConstraints, infoGlobal);
+
+	return 0.f;
+}
+
+void b3GpuPgsConstraintSolver::solveJoints(int numBodies, b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias,
+										   int numConstraints, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints)
+{
+	b3ContactSolverInfo infoGlobal;
+	infoGlobal.m_splitImpulse = false;
+	infoGlobal.m_timeStep = 1.f / 60.f;
+	infoGlobal.m_numIterations = 4;  //4;
+									 //	infoGlobal.m_solverMode|=B3_SOLVER_USE_2_FRICTION_DIRECTIONS|B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS|B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION;
+	//infoGlobal.m_solverMode|=B3_SOLVER_USE_2_FRICTION_DIRECTIONS|B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS;
+	infoGlobal.m_solverMode |= B3_SOLVER_USE_2_FRICTION_DIRECTIONS;
+
+	//if (infoGlobal.m_solverMode & B3_SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS)
+	//if ((infoGlobal.m_solverMode & B3_SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & B3_SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION))
+
+	solveGroup(gpuBodies, gpuInertias, numBodies, gpuConstraints, numConstraints, infoGlobal);
+}
+
+//b3AlignedObjectArray<b3RigidBodyData> testBodies;
+
+b3Scalar b3GpuPgsConstraintSolver::solveGroupCacheFriendlyFinish(b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias, int numBodies, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints, int numConstraints, const b3ContactSolverInfo& infoGlobal)
+{
+	B3_PROFILE("solveGroupCacheFriendlyFinish");
+	//	int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+	//	int i,j;
+
+	{
+		if (gpuBreakConstraints)
+		{
+			B3_PROFILE("breakViolatedConstraintsKernel");
+			b3LauncherCL launcher(m_gpuData->m_queue, m_gpuData->m_breakViolatedConstraintsKernel, "m_breakViolatedConstraintsKernel");
+			launcher.setBuffer(gpuConstraints->getBufferCL());
+			launcher.setBuffer(m_gpuData->m_gpuConstraintInfo1->getBufferCL());
+			launcher.setBuffer(m_gpuData->m_gpuConstraintRowOffsets->getBufferCL());
+			launcher.setBuffer(m_gpuData->m_gpuConstraintRows->getBufferCL());
+			launcher.setConst(numConstraints);
+			launcher.launch1D(numConstraints);
+		}
+		else
+		{
+			gpuConstraints->copyToHost(m_gpuData->m_cpuConstraints);
+			m_gpuData->m_gpuBatchConstraints->copyToHost(m_gpuData->m_cpuBatchConstraints);
+			m_gpuData->m_gpuConstraintRows->copyToHost(m_gpuData->m_cpuConstraintRows);
+			gpuConstraints->copyToHost(m_gpuData->m_cpuConstraints);
+			m_gpuData->m_gpuConstraintInfo1->copyToHost(m_gpuData->m_cpuConstraintInfo1);
+			m_gpuData->m_gpuConstraintRowOffsets->copyToHost(m_gpuData->m_cpuConstraintRowOffsets);
+
+			for (int cid = 0; cid < numConstraints; cid++)
+			{
+				int originalConstraintIndex = batchConstraints[cid].m_originalConstraintIndex;
+				int constraintRowOffset = m_gpuData->m_cpuConstraintRowOffsets[originalConstraintIndex];
+				int numRows = m_gpuData->m_cpuConstraintInfo1[originalConstraintIndex];
+				if (numRows)
+				{
+					//	printf("cid=%d, breakingThreshold =%f\n",cid,breakingThreshold);
+					for (int i = 0; i < numRows; i++)
+					{
+						int rowIndex = constraintRowOffset + i;
+						int orgConstraintIndex = m_gpuData->m_cpuConstraintRows[rowIndex].m_originalConstraintIndex;
+						float breakingThreshold = m_gpuData->m_cpuConstraints[orgConstraintIndex].m_breakingImpulseThreshold;
+						//	printf("rows[%d].m_appliedImpulse=%f\n",rowIndex,rows[rowIndex].m_appliedImpulse);
+						if (b3Fabs(m_gpuData->m_cpuConstraintRows[rowIndex].m_appliedImpulse) >= breakingThreshold)
+						{
+							m_gpuData->m_cpuConstraints[orgConstraintIndex].m_flags = 0;  //&= ~B3_CONSTRAINT_FLAG_ENABLED;
+						}
+					}
+				}
+			}
+
+			gpuConstraints->copyFromHost(m_gpuData->m_cpuConstraints);
+		}
+	}
+
+	{
+		if (useGpuWriteBackVelocities)
+		{
+			B3_PROFILE("GPU write back velocities and transforms");
+
+			b3LauncherCL launcher(m_gpuData->m_queue, m_gpuData->m_writeBackVelocitiesKernel, "m_writeBackVelocitiesKernel");
+			launcher.setBuffer(gpuBodies->getBufferCL());
+			launcher.setBuffer(m_gpuData->m_gpuSolverBodies->getBufferCL());
+			launcher.setConst(numBodies);
+			launcher.launch1D(numBodies);
+			clFinish(m_gpuData->m_queue);
+			//			m_gpuData->m_gpuSolverBodies->copyToHost(m_tmpSolverBodyPool);
+			//			m_gpuData->m_gpuBodies->copyToHostPointer(bodies,numBodies);
+			//m_gpuData->m_gpuBodies->copyToHost(testBodies);
+		}
+		else
+		{
+			B3_PROFILE("CPU write back velocities and transforms");
+
+			m_gpuData->m_gpuSolverBodies->copyToHost(m_tmpSolverBodyPool);
+			gpuBodies->copyToHost(m_gpuData->m_cpuBodies);
+			for (int i = 0; i < m_tmpSolverBodyPool.size(); i++)
+			{
+				int bodyIndex = m_tmpSolverBodyPool[i].m_originalBodyIndex;
+				//printf("bodyIndex=%d\n",bodyIndex);
+				b3Assert(i == bodyIndex);
+
+				b3RigidBodyData* body = &m_gpuData->m_cpuBodies[bodyIndex];
+				if (body->m_invMass)
+				{
+					if (infoGlobal.m_splitImpulse)
+						m_tmpSolverBodyPool[i].writebackVelocityAndTransform(infoGlobal.m_timeStep, infoGlobal.m_splitImpulseTurnErp);
+					else
+						m_tmpSolverBodyPool[i].writebackVelocity();
+
+					if (m_usePgs)
+					{
+						body->m_linVel = m_tmpSolverBodyPool[i].m_linearVelocity;
+						body->m_angVel = m_tmpSolverBodyPool[i].m_angularVelocity;
+					}
+					else
+					{
+						b3Assert(0);
+					}
+					/*			
+					if (infoGlobal.m_splitImpulse)
+					{
+						body->m_pos = m_tmpSolverBodyPool[i].m_worldTransform.getOrigin();
+						b3Quaternion orn;
+						orn = m_tmpSolverBodyPool[i].m_worldTransform.getRotation();
+						body->m_quat = orn;
+					}
+					*/
+				}
+			}  //for
+
+			gpuBodies->copyFromHost(m_gpuData->m_cpuBodies);
+		}
+	}
+
+	clFinish(m_gpuData->m_queue);
+
+	m_tmpSolverContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverNonContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactFrictionConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactRollingFrictionConstraintPool.resizeNoInitialize(0);
+
+	m_tmpSolverBodyPool.resizeNoInitialize(0);
+	return 0.f;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h
new file mode 100644
index 0000000..00bc544
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h
@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#ifndef B3_GPU_PGS_CONSTRAINT_SOLVER_H
+#define B3_GPU_PGS_CONSTRAINT_SOLVER_H
+
+struct b3Contact4;
+struct b3ContactPoint;
+
+class b3Dispatcher;
+
+#include "Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h"
+#include "Bullet3Dynamics/ConstraintSolver/b3ContactSolverInfo.h"
+#include "b3GpuSolverBody.h"
+#include "b3GpuSolverConstraint.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+struct b3RigidBodyData;
+struct b3InertiaData;
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+#include "b3GpuGenericConstraint.h"
+
+class b3GpuPgsConstraintSolver
+{
+protected:
+	int m_staticIdx;
+	struct b3GpuPgsJacobiSolverInternalData* m_gpuData;
+
+protected:
+	b3AlignedObjectArray<b3GpuSolverBody> m_tmpSolverBodyPool;
+	b3GpuConstraintArray m_tmpSolverContactConstraintPool;
+	b3GpuConstraintArray m_tmpSolverNonContactConstraintPool;
+	b3GpuConstraintArray m_tmpSolverContactFrictionConstraintPool;
+	b3GpuConstraintArray m_tmpSolverContactRollingFrictionConstraintPool;
+
+	b3AlignedObjectArray<unsigned int> m_tmpConstraintSizesPool;
+
+	bool m_usePgs;
+	void averageVelocities();
+
+	int m_maxOverrideNumSolverIterations;
+
+	int m_numSplitImpulseRecoveries;
+
+	//	int	getOrInitSolverBody(int bodyIndex, b3RigidBodyData* bodies,b3InertiaData* inertias);
+	void initSolverBody(int bodyIndex, b3GpuSolverBody* solverBody, b3RigidBodyData* rb);
+
+public:
+	b3GpuPgsConstraintSolver(cl_context ctx, cl_device_id device, cl_command_queue queue, bool usePgs);
+	virtual ~b3GpuPgsConstraintSolver();
+
+	virtual b3Scalar solveGroupCacheFriendlyIterations(b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints1, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+	virtual b3Scalar solveGroupCacheFriendlySetup(b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias, int numBodies, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+	b3Scalar solveGroupCacheFriendlyFinish(b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias, int numBodies, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+
+	b3Scalar solveGroup(b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias, int numBodies, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints, int numConstraints, const b3ContactSolverInfo& infoGlobal);
+	void solveJoints(int numBodies, b3OpenCLArray<b3RigidBodyData>* gpuBodies, b3OpenCLArray<b3InertiaData>* gpuInertias,
+					 int numConstraints, b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints);
+
+	int sortConstraintByBatch3(struct b3BatchConstraint* cs, int numConstraints, int simdWidth, int staticIdx, int numBodies);
+	void recomputeBatches();
+};
+
+#endif  //B3_GPU_PGS_CONSTRAINT_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.cpp
new file mode 100644
index 0000000..e3d235a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.cpp
@@ -0,0 +1,1529 @@
+
+bool gUseLargeBatches = false;
+bool gCpuBatchContacts = false;
+bool gCpuSolveConstraint = false;
+bool gCpuRadixSort = false;
+bool gCpuSetSortData = false;
+bool gCpuSortContactsDeterminism = false;
+bool gUseCpuCopyConstraints = false;
+bool gUseScanHost = false;
+bool gReorderContactsOnCpu = false;
+
+bool optionalSortContactsDeterminism = true;
+
+#include "b3GpuPgsContactSolver.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h"
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h"
+#include <string.h>
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+#include "b3Solver.h"
+
+#define B3_SOLVER_SETUP_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl"
+#define B3_SOLVER_SETUP2_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl"
+#define B3_SOLVER_CONTACT_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl"
+#define B3_SOLVER_FRICTION_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl"
+#define B3_BATCHING_PATH "src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl"
+#define B3_BATCHING_NEW_PATH "src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl"
+
+#include "kernels/solverSetup.h"
+#include "kernels/solverSetup2.h"
+#include "kernels/solveContact.h"
+#include "kernels/solveFriction.h"
+#include "kernels/batchingKernels.h"
+#include "kernels/batchingKernelsNew.h"
+
+struct b3GpuBatchingPgsSolverInternalData
+{
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+	int m_pairCapacity;
+	int m_nIterations;
+
+	b3OpenCLArray<b3GpuConstraint4>* m_contactCGPU;
+	b3OpenCLArray<unsigned int>* m_numConstraints;
+	b3OpenCLArray<unsigned int>* m_offsets;
+
+	b3Solver* m_solverGPU;
+
+	cl_kernel m_batchingKernel;
+	cl_kernel m_batchingKernelNew;
+	cl_kernel m_solveContactKernel;
+	cl_kernel m_solveSingleContactKernel;
+	cl_kernel m_solveSingleFrictionKernel;
+	cl_kernel m_solveFrictionKernel;
+	cl_kernel m_contactToConstraintKernel;
+	cl_kernel m_setSortDataKernel;
+	cl_kernel m_reorderContactKernel;
+	cl_kernel m_copyConstraintKernel;
+
+	cl_kernel m_setDeterminismSortDataBodyAKernel;
+	cl_kernel m_setDeterminismSortDataBodyBKernel;
+	cl_kernel m_setDeterminismSortDataChildShapeAKernel;
+	cl_kernel m_setDeterminismSortDataChildShapeBKernel;
+
+	class b3RadixSort32CL* m_sort32;
+	class b3BoundSearchCL* m_search;
+	class b3PrefixScanCL* m_scan;
+
+	b3OpenCLArray<b3SortData>* m_sortDataBuffer;
+	b3OpenCLArray<b3Contact4>* m_contactBuffer;
+
+	b3OpenCLArray<b3RigidBodyData>* m_bodyBufferGPU;
+	b3OpenCLArray<b3InertiaData>* m_inertiaBufferGPU;
+	b3OpenCLArray<b3Contact4>* m_pBufContactOutGPU;
+
+	b3OpenCLArray<b3Contact4>* m_pBufContactOutGPUCopy;
+	b3OpenCLArray<b3SortData>* m_contactKeyValues;
+
+	b3AlignedObjectArray<unsigned int> m_idxBuffer;
+	b3AlignedObjectArray<b3SortData> m_sortData;
+	b3AlignedObjectArray<b3Contact4> m_old;
+
+	b3AlignedObjectArray<int> m_batchSizes;
+	b3OpenCLArray<int>* m_batchSizesGpu;
+};
+
+b3GpuPgsContactSolver::b3GpuPgsContactSolver(cl_context ctx, cl_device_id device, cl_command_queue q, int pairCapacity)
+{
+	m_debugOutput = 0;
+	m_data = new b3GpuBatchingPgsSolverInternalData;
+	m_data->m_context = ctx;
+	m_data->m_device = device;
+	m_data->m_queue = q;
+	m_data->m_pairCapacity = pairCapacity;
+	m_data->m_nIterations = 4;
+	m_data->m_batchSizesGpu = new b3OpenCLArray<int>(ctx, q);
+	m_data->m_bodyBufferGPU = new b3OpenCLArray<b3RigidBodyData>(ctx, q);
+	m_data->m_inertiaBufferGPU = new b3OpenCLArray<b3InertiaData>(ctx, q);
+	m_data->m_pBufContactOutGPU = new b3OpenCLArray<b3Contact4>(ctx, q);
+
+	m_data->m_pBufContactOutGPUCopy = new b3OpenCLArray<b3Contact4>(ctx, q);
+	m_data->m_contactKeyValues = new b3OpenCLArray<b3SortData>(ctx, q);
+
+	m_data->m_solverGPU = new b3Solver(ctx, device, q, 512 * 1024);
+
+	m_data->m_sort32 = new b3RadixSort32CL(ctx, device, m_data->m_queue);
+	m_data->m_scan = new b3PrefixScanCL(ctx, device, m_data->m_queue, B3_SOLVER_N_CELLS);
+	m_data->m_search = new b3BoundSearchCL(ctx, device, m_data->m_queue, B3_SOLVER_N_CELLS);
+
+	const int sortSize = B3NEXTMULTIPLEOF(pairCapacity, 512);
+
+	m_data->m_sortDataBuffer = new b3OpenCLArray<b3SortData>(ctx, m_data->m_queue, sortSize);
+	m_data->m_contactBuffer = new b3OpenCLArray<b3Contact4>(ctx, m_data->m_queue);
+
+	m_data->m_numConstraints = new b3OpenCLArray<unsigned int>(ctx, m_data->m_queue, B3_SOLVER_N_CELLS);
+	m_data->m_numConstraints->resize(B3_SOLVER_N_CELLS);
+
+	m_data->m_contactCGPU = new b3OpenCLArray<b3GpuConstraint4>(ctx, q, pairCapacity);
+
+	m_data->m_offsets = new b3OpenCLArray<unsigned int>(ctx, m_data->m_queue, B3_SOLVER_N_CELLS);
+	m_data->m_offsets->resize(B3_SOLVER_N_CELLS);
+	const char* additionalMacros = "";
+	//const char* srcFileNameForCaching="";
+
+	cl_int pErrNum;
+	const char* batchKernelSource = batchingKernelsCL;
+	const char* batchKernelNewSource = batchingKernelsNewCL;
+	const char* solverSetupSource = solverSetupCL;
+	const char* solverSetup2Source = solverSetup2CL;
+	const char* solveContactSource = solveContactCL;
+	const char* solveFrictionSource = solveFrictionCL;
+
+	{
+		cl_program solveContactProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solveContactSource, &pErrNum, additionalMacros, B3_SOLVER_CONTACT_KERNEL_PATH);
+		b3Assert(solveContactProg);
+
+		cl_program solveFrictionProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solveFrictionSource, &pErrNum, additionalMacros, B3_SOLVER_FRICTION_KERNEL_PATH);
+		b3Assert(solveFrictionProg);
+
+		cl_program solverSetup2Prog = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solverSetup2Source, &pErrNum, additionalMacros, B3_SOLVER_SETUP2_KERNEL_PATH);
+
+		b3Assert(solverSetup2Prog);
+
+		cl_program solverSetupProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solverSetupSource, &pErrNum, additionalMacros, B3_SOLVER_SETUP_KERNEL_PATH);
+		b3Assert(solverSetupProg);
+
+		m_data->m_solveFrictionKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solveFrictionSource, "BatchSolveKernelFriction", &pErrNum, solveFrictionProg, additionalMacros);
+		b3Assert(m_data->m_solveFrictionKernel);
+
+		m_data->m_solveContactKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solveContactSource, "BatchSolveKernelContact", &pErrNum, solveContactProg, additionalMacros);
+		b3Assert(m_data->m_solveContactKernel);
+
+		m_data->m_solveSingleContactKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solveContactSource, "solveSingleContactKernel", &pErrNum, solveContactProg, additionalMacros);
+		b3Assert(m_data->m_solveSingleContactKernel);
+
+		m_data->m_solveSingleFrictionKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solveFrictionSource, "solveSingleFrictionKernel", &pErrNum, solveFrictionProg, additionalMacros);
+		b3Assert(m_data->m_solveSingleFrictionKernel);
+
+		m_data->m_contactToConstraintKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetupSource, "ContactToConstraintKernel", &pErrNum, solverSetupProg, additionalMacros);
+		b3Assert(m_data->m_contactToConstraintKernel);
+
+		m_data->m_setSortDataKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "SetSortDataKernel", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_data->m_setSortDataKernel);
+
+		m_data->m_setDeterminismSortDataBodyAKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "SetDeterminismSortDataBodyA", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_data->m_setDeterminismSortDataBodyAKernel);
+
+		m_data->m_setDeterminismSortDataBodyBKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "SetDeterminismSortDataBodyB", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_data->m_setDeterminismSortDataBodyBKernel);
+
+		m_data->m_setDeterminismSortDataChildShapeAKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "SetDeterminismSortDataChildShapeA", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_data->m_setDeterminismSortDataChildShapeAKernel);
+
+		m_data->m_setDeterminismSortDataChildShapeBKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "SetDeterminismSortDataChildShapeB", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_data->m_setDeterminismSortDataChildShapeBKernel);
+
+		m_data->m_reorderContactKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "ReorderContactKernel", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_data->m_reorderContactKernel);
+
+		m_data->m_copyConstraintKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "CopyConstraintKernel", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_data->m_copyConstraintKernel);
+	}
+
+	{
+		cl_program batchingProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, batchKernelSource, &pErrNum, additionalMacros, B3_BATCHING_PATH);
+		b3Assert(batchingProg);
+
+		m_data->m_batchingKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, batchKernelSource, "CreateBatches", &pErrNum, batchingProg, additionalMacros);
+		b3Assert(m_data->m_batchingKernel);
+	}
+
+	{
+		cl_program batchingNewProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, batchKernelNewSource, &pErrNum, additionalMacros, B3_BATCHING_NEW_PATH);
+		b3Assert(batchingNewProg);
+
+		m_data->m_batchingKernelNew = b3OpenCLUtils::compileCLKernelFromString(ctx, device, batchKernelNewSource, "CreateBatchesNew", &pErrNum, batchingNewProg, additionalMacros);
+		b3Assert(m_data->m_batchingKernelNew);
+	}
+}
+
+b3GpuPgsContactSolver::~b3GpuPgsContactSolver()
+{
+	delete m_data->m_batchSizesGpu;
+	delete m_data->m_bodyBufferGPU;
+	delete m_data->m_inertiaBufferGPU;
+	delete m_data->m_pBufContactOutGPU;
+	delete m_data->m_pBufContactOutGPUCopy;
+	delete m_data->m_contactKeyValues;
+
+	delete m_data->m_contactCGPU;
+	delete m_data->m_numConstraints;
+	delete m_data->m_offsets;
+	delete m_data->m_sortDataBuffer;
+	delete m_data->m_contactBuffer;
+
+	delete m_data->m_sort32;
+	delete m_data->m_scan;
+	delete m_data->m_search;
+	delete m_data->m_solverGPU;
+
+	clReleaseKernel(m_data->m_batchingKernel);
+	clReleaseKernel(m_data->m_batchingKernelNew);
+	clReleaseKernel(m_data->m_solveSingleContactKernel);
+	clReleaseKernel(m_data->m_solveSingleFrictionKernel);
+	clReleaseKernel(m_data->m_solveContactKernel);
+	clReleaseKernel(m_data->m_solveFrictionKernel);
+
+	clReleaseKernel(m_data->m_contactToConstraintKernel);
+	clReleaseKernel(m_data->m_setSortDataKernel);
+	clReleaseKernel(m_data->m_reorderContactKernel);
+	clReleaseKernel(m_data->m_copyConstraintKernel);
+
+	clReleaseKernel(m_data->m_setDeterminismSortDataBodyAKernel);
+	clReleaseKernel(m_data->m_setDeterminismSortDataBodyBKernel);
+	clReleaseKernel(m_data->m_setDeterminismSortDataChildShapeAKernel);
+	clReleaseKernel(m_data->m_setDeterminismSortDataChildShapeBKernel);
+
+	delete m_data;
+}
+
+struct b3ConstraintCfg
+{
+	b3ConstraintCfg(float dt = 0.f) : m_positionDrift(0.005f), m_positionConstraintCoeff(0.2f), m_dt(dt), m_staticIdx(0) {}
+
+	float m_positionDrift;
+	float m_positionConstraintCoeff;
+	float m_dt;
+	bool m_enableParallelSolve;
+	float m_batchCellSize;
+	int m_staticIdx;
+};
+
+void b3GpuPgsContactSolver::solveContactConstraintBatchSizes(const b3OpenCLArray<b3RigidBodyData>* bodyBuf, const b3OpenCLArray<b3InertiaData>* shapeBuf,
+															 b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches, int numIterations, const b3AlignedObjectArray<int>* batchSizes)  //const b3OpenCLArray<int>* gpuBatchSizes)
+{
+	B3_PROFILE("solveContactConstraintBatchSizes");
+	int numBatches = batchSizes->size() / B3_MAX_NUM_BATCHES;
+	for (int iter = 0; iter < numIterations; iter++)
+	{
+		for (int cellId = 0; cellId < numBatches; cellId++)
+		{
+			int offset = 0;
+			for (int ii = 0; ii < B3_MAX_NUM_BATCHES; ii++)
+			{
+				int numInBatch = batchSizes->at(cellId * B3_MAX_NUM_BATCHES + ii);
+				if (!numInBatch)
+					break;
+
+				{
+					b3LauncherCL launcher(m_data->m_queue, m_data->m_solveSingleContactKernel, "m_solveSingleContactKernel");
+					launcher.setBuffer(bodyBuf->getBufferCL());
+					launcher.setBuffer(shapeBuf->getBufferCL());
+					launcher.setBuffer(constraint->getBufferCL());
+					launcher.setConst(cellId);
+					launcher.setConst(offset);
+					launcher.setConst(numInBatch);
+					launcher.launch1D(numInBatch);
+					offset += numInBatch;
+				}
+			}
+		}
+	}
+
+	for (int iter = 0; iter < numIterations; iter++)
+	{
+		for (int cellId = 0; cellId < numBatches; cellId++)
+		{
+			int offset = 0;
+			for (int ii = 0; ii < B3_MAX_NUM_BATCHES; ii++)
+			{
+				int numInBatch = batchSizes->at(cellId * B3_MAX_NUM_BATCHES + ii);
+				if (!numInBatch)
+					break;
+
+				{
+					b3LauncherCL launcher(m_data->m_queue, m_data->m_solveSingleFrictionKernel, "m_solveSingleFrictionKernel");
+					launcher.setBuffer(bodyBuf->getBufferCL());
+					launcher.setBuffer(shapeBuf->getBufferCL());
+					launcher.setBuffer(constraint->getBufferCL());
+					launcher.setConst(cellId);
+					launcher.setConst(offset);
+					launcher.setConst(numInBatch);
+					launcher.launch1D(numInBatch);
+					offset += numInBatch;
+				}
+			}
+		}
+	}
+}
+
+void b3GpuPgsContactSolver::solveContactConstraint(const b3OpenCLArray<b3RigidBodyData>* bodyBuf, const b3OpenCLArray<b3InertiaData>* shapeBuf,
+												   b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches, int numIterations, const b3AlignedObjectArray<int>* batchSizes)  //,const b3OpenCLArray<int>* gpuBatchSizes)
+{
+	//sort the contacts
+
+	b3Int4 cdata = b3MakeInt4(n, 0, 0, 0);
+	{
+		const int nn = B3_SOLVER_N_CELLS;
+
+		cdata.x = 0;
+		cdata.y = maxNumBatches;  //250;
+
+		int numWorkItems = 64 * nn / B3_SOLVER_N_BATCHES;
+#ifdef DEBUG_ME
+		SolverDebugInfo* debugInfo = new SolverDebugInfo[numWorkItems];
+		adl::b3OpenCLArray<SolverDebugInfo> gpuDebugInfo(data->m_device, numWorkItems);
+#endif
+
+		{
+			B3_PROFILE("m_batchSolveKernel iterations");
+			for (int iter = 0; iter < numIterations; iter++)
+			{
+				for (int ib = 0; ib < B3_SOLVER_N_BATCHES; ib++)
+				{
+#ifdef DEBUG_ME
+					memset(debugInfo, 0, sizeof(SolverDebugInfo) * numWorkItems);
+					gpuDebugInfo.write(debugInfo, numWorkItems);
+#endif
+
+					cdata.z = ib;
+
+					b3LauncherCL launcher(m_data->m_queue, m_data->m_solveContactKernel, "m_solveContactKernel");
+#if 1
+
+					b3BufferInfoCL bInfo[] = {
+
+						b3BufferInfoCL(bodyBuf->getBufferCL()),
+						b3BufferInfoCL(shapeBuf->getBufferCL()),
+						b3BufferInfoCL(constraint->getBufferCL()),
+						b3BufferInfoCL(m_data->m_solverGPU->m_numConstraints->getBufferCL()),
+						b3BufferInfoCL(m_data->m_solverGPU->m_offsets->getBufferCL())
+#ifdef DEBUG_ME
+							,
+						b3BufferInfoCL(&gpuDebugInfo)
+#endif
+					};
+
+					launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+					launcher.setBuffer(m_data->m_solverGPU->m_batchSizes.getBufferCL());
+					//launcher.setConst(  cdata.x );
+					launcher.setConst(cdata.y);
+					launcher.setConst(cdata.z);
+					b3Int4 nSplit;
+					nSplit.x = B3_SOLVER_N_SPLIT_X;
+					nSplit.y = B3_SOLVER_N_SPLIT_Y;
+					nSplit.z = B3_SOLVER_N_SPLIT_Z;
+
+					launcher.setConst(nSplit);
+					launcher.launch1D(numWorkItems, 64);
+
+#else
+					const char* fileName = "m_batchSolveKernel.bin";
+					FILE* f = fopen(fileName, "rb");
+					if (f)
+					{
+						int sizeInBytes = 0;
+						if (fseek(f, 0, SEEK_END) || (sizeInBytes = ftell(f)) == EOF || fseek(f, 0, SEEK_SET))
+						{
+							printf("error, cannot get file size\n");
+							exit(0);
+						}
+
+						unsigned char* buf = (unsigned char*)malloc(sizeInBytes);
+						fread(buf, sizeInBytes, 1, f);
+						int serializedBytes = launcher.deserializeArgs(buf, sizeInBytes, m_context);
+						int num = *(int*)&buf[serializedBytes];
+
+						launcher.launch1D(num);
+
+						//this clFinish is for testing on errors
+						clFinish(m_queue);
+					}
+
+#endif
+
+#ifdef DEBUG_ME
+					clFinish(m_queue);
+					gpuDebugInfo.read(debugInfo, numWorkItems);
+					clFinish(m_queue);
+					for (int i = 0; i < numWorkItems; i++)
+					{
+						if (debugInfo[i].m_valInt2 > 0)
+						{
+							printf("debugInfo[i].m_valInt2 = %d\n", i, debugInfo[i].m_valInt2);
+						}
+
+						if (debugInfo[i].m_valInt3 > 0)
+						{
+							printf("debugInfo[i].m_valInt3 = %d\n", i, debugInfo[i].m_valInt3);
+						}
+					}
+#endif  //DEBUG_ME
+				}
+			}
+
+			clFinish(m_data->m_queue);
+		}
+
+		cdata.x = 1;
+		bool applyFriction = true;
+		if (applyFriction)
+		{
+			B3_PROFILE("m_batchSolveKernel iterations2");
+			for (int iter = 0; iter < numIterations; iter++)
+			{
+				for (int ib = 0; ib < B3_SOLVER_N_BATCHES; ib++)
+				{
+					cdata.z = ib;
+
+					b3BufferInfoCL bInfo[] = {
+						b3BufferInfoCL(bodyBuf->getBufferCL()),
+						b3BufferInfoCL(shapeBuf->getBufferCL()),
+						b3BufferInfoCL(constraint->getBufferCL()),
+						b3BufferInfoCL(m_data->m_solverGPU->m_numConstraints->getBufferCL()),
+						b3BufferInfoCL(m_data->m_solverGPU->m_offsets->getBufferCL())
+#ifdef DEBUG_ME
+							,
+						b3BufferInfoCL(&gpuDebugInfo)
+#endif  //DEBUG_ME
+					};
+					b3LauncherCL launcher(m_data->m_queue, m_data->m_solveFrictionKernel, "m_solveFrictionKernel");
+					launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+					launcher.setBuffer(m_data->m_solverGPU->m_batchSizes.getBufferCL());
+					//launcher.setConst(  cdata.x );
+					launcher.setConst(cdata.y);
+					launcher.setConst(cdata.z);
+
+					b3Int4 nSplit;
+					nSplit.x = B3_SOLVER_N_SPLIT_X;
+					nSplit.y = B3_SOLVER_N_SPLIT_Y;
+					nSplit.z = B3_SOLVER_N_SPLIT_Z;
+
+					launcher.setConst(nSplit);
+
+					launcher.launch1D(64 * nn / B3_SOLVER_N_BATCHES, 64);
+				}
+			}
+			clFinish(m_data->m_queue);
+		}
+#ifdef DEBUG_ME
+		delete[] debugInfo;
+#endif  //DEBUG_ME
+	}
+}
+
+static bool sortfnc(const b3SortData& a, const b3SortData& b)
+{
+	return (a.m_key < b.m_key);
+}
+
+static bool b3ContactCmp(const b3Contact4& p, const b3Contact4& q)
+{
+	return ((p.m_bodyAPtrAndSignBit < q.m_bodyAPtrAndSignBit) ||
+			((p.m_bodyAPtrAndSignBit == q.m_bodyAPtrAndSignBit) && (p.m_bodyBPtrAndSignBit < q.m_bodyBPtrAndSignBit)) ||
+			((p.m_bodyAPtrAndSignBit == q.m_bodyAPtrAndSignBit) && (p.m_bodyBPtrAndSignBit == q.m_bodyBPtrAndSignBit) && p.m_childIndexA < q.m_childIndexA) ||
+			((p.m_bodyAPtrAndSignBit == q.m_bodyAPtrAndSignBit) && (p.m_bodyBPtrAndSignBit == q.m_bodyBPtrAndSignBit) && p.m_childIndexA < q.m_childIndexA) ||
+			((p.m_bodyAPtrAndSignBit == q.m_bodyAPtrAndSignBit) && (p.m_bodyBPtrAndSignBit == q.m_bodyBPtrAndSignBit) && p.m_childIndexA == q.m_childIndexA && p.m_childIndexB < q.m_childIndexB));
+}
+
+#define USE_SPATIAL_BATCHING 1
+#define USE_4x4_GRID 1
+
+#ifndef USE_SPATIAL_BATCHING
+static const int gridTable4x4[] =
+	{
+		0, 1, 17, 16,
+		1, 2, 18, 19,
+		17, 18, 32, 3,
+		16, 19, 3, 34};
+static const int gridTable8x8[] =
+	{
+		0, 2, 3, 16, 17, 18, 19, 1,
+		66, 64, 80, 67, 82, 81, 65, 83,
+		131, 144, 128, 130, 147, 129, 145, 146,
+		208, 195, 194, 192, 193, 211, 210, 209,
+		21, 22, 23, 5, 4, 6, 7, 20,
+		86, 85, 69, 87, 70, 68, 84, 71,
+		151, 133, 149, 150, 135, 148, 132, 134,
+		197, 27, 214, 213, 212, 199, 198, 196
+
+};
+
+#endif
+
+void SetSortDataCPU(b3Contact4* gContact, b3RigidBodyData* gBodies, b3SortData* gSortDataOut, int nContacts, float scale, const b3Int4& nSplit, int staticIdx)
+{
+	for (int gIdx = 0; gIdx < nContacts; gIdx++)
+	{
+		if (gIdx < nContacts)
+		{
+			int aPtrAndSignBit = gContact[gIdx].m_bodyAPtrAndSignBit;
+			int bPtrAndSignBit = gContact[gIdx].m_bodyBPtrAndSignBit;
+
+			int aIdx = abs(aPtrAndSignBit);
+			int bIdx = abs(bPtrAndSignBit);
+
+			bool aStatic = (aPtrAndSignBit < 0) || (aPtrAndSignBit == staticIdx);
+
+#if USE_SPATIAL_BATCHING
+			int idx = (aStatic) ? bIdx : aIdx;
+			b3Vector3 p = gBodies[idx].m_pos;
+			int xIdx = (int)((p.x - ((p.x < 0.f) ? 1.f : 0.f)) * scale) & (nSplit.x - 1);
+			int yIdx = (int)((p.y - ((p.y < 0.f) ? 1.f : 0.f)) * scale) & (nSplit.y - 1);
+			int zIdx = (int)((p.z - ((p.z < 0.f) ? 1.f : 0.f)) * scale) & (nSplit.z - 1);
+
+			int newIndex = (xIdx + yIdx * nSplit.x + zIdx * nSplit.x * nSplit.y);
+
+#else  //USE_SPATIAL_BATCHING
+			bool bStatic = (bPtrAndSignBit < 0) || (bPtrAndSignBit == staticIdx);
+
+#if USE_4x4_GRID
+			int aa = aIdx & 3;
+			int bb = bIdx & 3;
+			if (aStatic)
+				aa = bb;
+			if (bStatic)
+				bb = aa;
+
+			int gridIndex = aa + bb * 4;
+			int newIndex = gridTable4x4[gridIndex];
+#else   //USE_4x4_GRID
+			int aa = aIdx & 7;
+			int bb = bIdx & 7;
+			if (aStatic)
+				aa = bb;
+			if (bStatic)
+				bb = aa;
+
+			int gridIndex = aa + bb * 8;
+			int newIndex = gridTable8x8[gridIndex];
+#endif  //USE_4x4_GRID
+#endif  //USE_SPATIAL_BATCHING
+
+			gSortDataOut[gIdx].x = newIndex;
+			gSortDataOut[gIdx].y = gIdx;
+		}
+		else
+		{
+			gSortDataOut[gIdx].x = 0xffffffff;
+		}
+	}
+}
+
+void b3GpuPgsContactSolver::solveContacts(int numBodies, cl_mem bodyBuf, cl_mem inertiaBuf, int numContacts, cl_mem contactBuf, const b3Config& config, int static0Index)
+{
+	B3_PROFILE("solveContacts");
+	m_data->m_bodyBufferGPU->setFromOpenCLBuffer(bodyBuf, numBodies);
+	m_data->m_inertiaBufferGPU->setFromOpenCLBuffer(inertiaBuf, numBodies);
+	m_data->m_pBufContactOutGPU->setFromOpenCLBuffer(contactBuf, numContacts);
+
+	if (optionalSortContactsDeterminism)
+	{
+		if (!gCpuSortContactsDeterminism)
+		{
+			B3_PROFILE("GPU Sort contact constraints (determinism)");
+
+			m_data->m_pBufContactOutGPUCopy->resize(numContacts);
+			m_data->m_contactKeyValues->resize(numContacts);
+
+			m_data->m_pBufContactOutGPU->copyToCL(m_data->m_pBufContactOutGPUCopy->getBufferCL(), numContacts, 0, 0);
+
+			{
+				b3LauncherCL launcher(m_data->m_queue, m_data->m_setDeterminismSortDataChildShapeBKernel, "m_setDeterminismSortDataChildShapeBKernel");
+				launcher.setBuffer(m_data->m_pBufContactOutGPUCopy->getBufferCL());
+				launcher.setBuffer(m_data->m_contactKeyValues->getBufferCL());
+				launcher.setConst(numContacts);
+				launcher.launch1D(numContacts, 64);
+			}
+			m_data->m_solverGPU->m_sort32->execute(*m_data->m_contactKeyValues);
+			{
+				b3LauncherCL launcher(m_data->m_queue, m_data->m_setDeterminismSortDataChildShapeAKernel, "m_setDeterminismSortDataChildShapeAKernel");
+				launcher.setBuffer(m_data->m_pBufContactOutGPUCopy->getBufferCL());
+				launcher.setBuffer(m_data->m_contactKeyValues->getBufferCL());
+				launcher.setConst(numContacts);
+				launcher.launch1D(numContacts, 64);
+			}
+			m_data->m_solverGPU->m_sort32->execute(*m_data->m_contactKeyValues);
+			{
+				b3LauncherCL launcher(m_data->m_queue, m_data->m_setDeterminismSortDataBodyBKernel, "m_setDeterminismSortDataBodyBKernel");
+				launcher.setBuffer(m_data->m_pBufContactOutGPUCopy->getBufferCL());
+				launcher.setBuffer(m_data->m_contactKeyValues->getBufferCL());
+				launcher.setConst(numContacts);
+				launcher.launch1D(numContacts, 64);
+			}
+
+			m_data->m_solverGPU->m_sort32->execute(*m_data->m_contactKeyValues);
+
+			{
+				b3LauncherCL launcher(m_data->m_queue, m_data->m_setDeterminismSortDataBodyAKernel, "m_setDeterminismSortDataBodyAKernel");
+				launcher.setBuffer(m_data->m_pBufContactOutGPUCopy->getBufferCL());
+				launcher.setBuffer(m_data->m_contactKeyValues->getBufferCL());
+				launcher.setConst(numContacts);
+				launcher.launch1D(numContacts, 64);
+			}
+
+			m_data->m_solverGPU->m_sort32->execute(*m_data->m_contactKeyValues);
+
+			{
+				B3_PROFILE("gpu reorderContactKernel (determinism)");
+
+				b3Int4 cdata;
+				cdata.x = numContacts;
+
+				//b3BufferInfoCL bInfo[] = { b3BufferInfoCL( m_data->m_pBufContactOutGPU->getBufferCL() ), b3BufferInfoCL( m_data->m_solverGPU->m_contactBuffer2->getBufferCL())
+				//	, b3BufferInfoCL( m_data->m_solverGPU->m_sortDataBuffer->getBufferCL()) };
+				b3LauncherCL launcher(m_data->m_queue, m_data->m_solverGPU->m_reorderContactKernel, "m_reorderContactKernel");
+				launcher.setBuffer(m_data->m_pBufContactOutGPUCopy->getBufferCL());
+				launcher.setBuffer(m_data->m_pBufContactOutGPU->getBufferCL());
+				launcher.setBuffer(m_data->m_contactKeyValues->getBufferCL());
+				launcher.setConst(cdata);
+				launcher.launch1D(numContacts, 64);
+			}
+		}
+		else
+		{
+			B3_PROFILE("CPU Sort contact constraints (determinism)");
+			b3AlignedObjectArray<b3Contact4> cpuConstraints;
+			m_data->m_pBufContactOutGPU->copyToHost(cpuConstraints);
+			bool sort = true;
+			if (sort)
+			{
+				cpuConstraints.quickSort(b3ContactCmp);
+
+				for (int i = 0; i < cpuConstraints.size(); i++)
+				{
+					cpuConstraints[i].m_batchIdx = i;
+				}
+			}
+			m_data->m_pBufContactOutGPU->copyFromHost(cpuConstraints);
+			if (m_debugOutput == 100)
+			{
+				for (int i = 0; i < cpuConstraints.size(); i++)
+				{
+					printf("c[%d].m_bodyA = %d, m_bodyB = %d, batchId = %d\n", i, cpuConstraints[i].m_bodyAPtrAndSignBit, cpuConstraints[i].m_bodyBPtrAndSignBit, cpuConstraints[i].m_batchIdx);
+				}
+			}
+
+			m_debugOutput++;
+		}
+	}
+
+	int nContactOut = m_data->m_pBufContactOutGPU->size();
+
+	bool useSolver = true;
+
+	if (useSolver)
+	{
+		float dt = 1. / 60.;
+		b3ConstraintCfg csCfg(dt);
+		csCfg.m_enableParallelSolve = true;
+		csCfg.m_batchCellSize = 6;
+		csCfg.m_staticIdx = static0Index;
+
+		b3OpenCLArray<b3RigidBodyData>* bodyBuf = m_data->m_bodyBufferGPU;
+
+		void* additionalData = 0;  //m_data->m_frictionCGPU;
+		const b3OpenCLArray<b3InertiaData>* shapeBuf = m_data->m_inertiaBufferGPU;
+		b3OpenCLArray<b3GpuConstraint4>* contactConstraintOut = m_data->m_contactCGPU;
+		int nContacts = nContactOut;
+
+		int maxNumBatches = 0;
+
+		if (!gUseLargeBatches)
+		{
+			if (m_data->m_solverGPU->m_contactBuffer2)
+			{
+				m_data->m_solverGPU->m_contactBuffer2->resize(nContacts);
+			}
+
+			if (m_data->m_solverGPU->m_contactBuffer2 == 0)
+			{
+				m_data->m_solverGPU->m_contactBuffer2 = new b3OpenCLArray<b3Contact4>(m_data->m_context, m_data->m_queue, nContacts);
+				m_data->m_solverGPU->m_contactBuffer2->resize(nContacts);
+			}
+
+			//clFinish(m_data->m_queue);
+
+			{
+				B3_PROFILE("batching");
+				//@todo: just reserve it, without copy of original contact (unless we use warmstarting)
+
+				//const b3OpenCLArray<b3RigidBodyData>* bodyNative = bodyBuf;
+
+				{
+					//b3OpenCLArray<b3RigidBodyData>* bodyNative = b3OpenCLArrayUtils::map<adl::TYPE_CL, true>( data->m_device, bodyBuf );
+					//b3OpenCLArray<b3Contact4>* contactNative = b3OpenCLArrayUtils::map<adl::TYPE_CL, true>( data->m_device, contactsIn );
+
+					const int sortAlignment = 512;  // todo. get this out of sort
+					if (csCfg.m_enableParallelSolve)
+					{
+						int sortSize = B3NEXTMULTIPLEOF(nContacts, sortAlignment);
+
+						b3OpenCLArray<unsigned int>* countsNative = m_data->m_solverGPU->m_numConstraints;
+						b3OpenCLArray<unsigned int>* offsetsNative = m_data->m_solverGPU->m_offsets;
+
+						if (!gCpuSetSortData)
+						{  //	2. set cell idx
+							B3_PROFILE("GPU set cell idx");
+							struct CB
+							{
+								int m_nContacts;
+								int m_staticIdx;
+								float m_scale;
+								b3Int4 m_nSplit;
+							};
+
+							b3Assert(sortSize % 64 == 0);
+							CB cdata;
+							cdata.m_nContacts = nContacts;
+							cdata.m_staticIdx = csCfg.m_staticIdx;
+							cdata.m_scale = 1.f / csCfg.m_batchCellSize;
+							cdata.m_nSplit.x = B3_SOLVER_N_SPLIT_X;
+							cdata.m_nSplit.y = B3_SOLVER_N_SPLIT_Y;
+							cdata.m_nSplit.z = B3_SOLVER_N_SPLIT_Z;
+
+							m_data->m_solverGPU->m_sortDataBuffer->resize(nContacts);
+
+							b3BufferInfoCL bInfo[] = {b3BufferInfoCL(m_data->m_pBufContactOutGPU->getBufferCL()), b3BufferInfoCL(bodyBuf->getBufferCL()), b3BufferInfoCL(m_data->m_solverGPU->m_sortDataBuffer->getBufferCL())};
+							b3LauncherCL launcher(m_data->m_queue, m_data->m_solverGPU->m_setSortDataKernel, "m_setSortDataKernel");
+							launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+							launcher.setConst(cdata.m_nContacts);
+							launcher.setConst(cdata.m_scale);
+							launcher.setConst(cdata.m_nSplit);
+							launcher.setConst(cdata.m_staticIdx);
+
+							launcher.launch1D(sortSize, 64);
+						}
+						else
+						{
+							m_data->m_solverGPU->m_sortDataBuffer->resize(nContacts);
+							b3AlignedObjectArray<b3SortData> sortDataCPU;
+							m_data->m_solverGPU->m_sortDataBuffer->copyToHost(sortDataCPU);
+
+							b3AlignedObjectArray<b3Contact4> contactCPU;
+							m_data->m_pBufContactOutGPU->copyToHost(contactCPU);
+							b3AlignedObjectArray<b3RigidBodyData> bodiesCPU;
+							bodyBuf->copyToHost(bodiesCPU);
+							float scale = 1.f / csCfg.m_batchCellSize;
+							b3Int4 nSplit;
+							nSplit.x = B3_SOLVER_N_SPLIT_X;
+							nSplit.y = B3_SOLVER_N_SPLIT_Y;
+							nSplit.z = B3_SOLVER_N_SPLIT_Z;
+
+							SetSortDataCPU(&contactCPU[0], &bodiesCPU[0], &sortDataCPU[0], nContacts, scale, nSplit, csCfg.m_staticIdx);
+
+							m_data->m_solverGPU->m_sortDataBuffer->copyFromHost(sortDataCPU);
+						}
+
+						if (!gCpuRadixSort)
+						{  //	3. sort by cell idx
+							B3_PROFILE("gpuRadixSort");
+							//int n = B3_SOLVER_N_SPLIT*B3_SOLVER_N_SPLIT;
+							//int sortBit = 32;
+							//if( n <= 0xffff ) sortBit = 16;
+							//if( n <= 0xff ) sortBit = 8;
+							//adl::RadixSort<adl::TYPE_CL>::execute( data->m_sort, *data->m_sortDataBuffer, sortSize );
+							//adl::RadixSort32<adl::TYPE_CL>::execute( data->m_sort32, *data->m_sortDataBuffer, sortSize );
+							b3OpenCLArray<b3SortData>& keyValuesInOut = *(m_data->m_solverGPU->m_sortDataBuffer);
+							this->m_data->m_solverGPU->m_sort32->execute(keyValuesInOut);
+						}
+						else
+						{
+							b3OpenCLArray<b3SortData>& keyValuesInOut = *(m_data->m_solverGPU->m_sortDataBuffer);
+							b3AlignedObjectArray<b3SortData> hostValues;
+							keyValuesInOut.copyToHost(hostValues);
+							hostValues.quickSort(sortfnc);
+							keyValuesInOut.copyFromHost(hostValues);
+						}
+
+						if (gUseScanHost)
+						{
+							//	4. find entries
+							B3_PROFILE("cpuBoundSearch");
+							b3AlignedObjectArray<unsigned int> countsHost;
+							countsNative->copyToHost(countsHost);
+
+							b3AlignedObjectArray<b3SortData> sortDataHost;
+							m_data->m_solverGPU->m_sortDataBuffer->copyToHost(sortDataHost);
+
+							//m_data->m_solverGPU->m_search->executeHost(*m_data->m_solverGPU->m_sortDataBuffer,nContacts,*countsNative,B3_SOLVER_N_CELLS,b3BoundSearchCL::COUNT);
+							m_data->m_solverGPU->m_search->executeHost(sortDataHost, nContacts, countsHost, B3_SOLVER_N_CELLS, b3BoundSearchCL::COUNT);
+
+							countsNative->copyFromHost(countsHost);
+
+							//adl::BoundSearch<adl::TYPE_CL>::execute( data->m_search, *data->m_sortDataBuffer, nContacts, *countsNative,
+							//	B3_SOLVER_N_SPLIT*B3_SOLVER_N_SPLIT, adl::BoundSearchBase::COUNT );
+
+							//unsigned int sum;
+							//m_data->m_solverGPU->m_scan->execute(*countsNative,*offsetsNative, B3_SOLVER_N_CELLS);//,&sum );
+							b3AlignedObjectArray<unsigned int> offsetsHost;
+							offsetsHost.resize(offsetsNative->size());
+
+							m_data->m_solverGPU->m_scan->executeHost(countsHost, offsetsHost, B3_SOLVER_N_CELLS);  //,&sum );
+							offsetsNative->copyFromHost(offsetsHost);
+
+							//printf("sum = %d\n",sum);
+						}
+						else
+						{
+							//	4. find entries
+							B3_PROFILE("gpuBoundSearch");
+							m_data->m_solverGPU->m_search->execute(*m_data->m_solverGPU->m_sortDataBuffer, nContacts, *countsNative, B3_SOLVER_N_CELLS, b3BoundSearchCL::COUNT);
+							m_data->m_solverGPU->m_scan->execute(*countsNative, *offsetsNative, B3_SOLVER_N_CELLS);  //,&sum );
+						}
+
+						if (nContacts)
+						{  //	5. sort constraints by cellIdx
+							if (gReorderContactsOnCpu)
+							{
+								B3_PROFILE("cpu m_reorderContactKernel");
+								b3AlignedObjectArray<b3SortData> sortDataHost;
+								m_data->m_solverGPU->m_sortDataBuffer->copyToHost(sortDataHost);
+								b3AlignedObjectArray<b3Contact4> inContacts;
+								b3AlignedObjectArray<b3Contact4> outContacts;
+								m_data->m_pBufContactOutGPU->copyToHost(inContacts);
+								outContacts.resize(inContacts.size());
+								for (int i = 0; i < nContacts; i++)
+								{
+									int srcIdx = sortDataHost[i].y;
+									outContacts[i] = inContacts[srcIdx];
+								}
+								m_data->m_solverGPU->m_contactBuffer2->copyFromHost(outContacts);
+
+								/*								"void ReorderContactKernel(__global struct b3Contact4Data* in, __global struct b3Contact4Data* out, __global int2* sortData, int4 cb )\n"
+								"{\n"
+								"	int nContacts = cb.x;\n"
+								"	int gIdx = GET_GLOBAL_IDX;\n"
+								"	if( gIdx < nContacts )\n"
+								"	{\n"
+								"		int srcIdx = sortData[gIdx].y;\n"
+								"		out[gIdx] = in[srcIdx];\n"
+								"	}\n"
+								"}\n"
+								*/
+							}
+							else
+							{
+								B3_PROFILE("gpu m_reorderContactKernel");
+
+								b3Int4 cdata;
+								cdata.x = nContacts;
+
+								b3BufferInfoCL bInfo[] = {
+									b3BufferInfoCL(m_data->m_pBufContactOutGPU->getBufferCL()),
+									b3BufferInfoCL(m_data->m_solverGPU->m_contactBuffer2->getBufferCL()), b3BufferInfoCL(m_data->m_solverGPU->m_sortDataBuffer->getBufferCL())};
+
+								b3LauncherCL launcher(m_data->m_queue, m_data->m_solverGPU->m_reorderContactKernel, "m_reorderContactKernel");
+								launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+								launcher.setConst(cdata);
+								launcher.launch1D(nContacts, 64);
+							}
+						}
+					}
+				}
+
+				//clFinish(m_data->m_queue);
+
+				//				{
+				//				b3AlignedObjectArray<unsigned int> histogram;
+				//				m_data->m_solverGPU->m_numConstraints->copyToHost(histogram);
+				//				printf(",,,\n");
+				//				}
+
+				if (nContacts)
+				{
+					if (gUseCpuCopyConstraints)
+					{
+						for (int i = 0; i < nContacts; i++)
+						{
+							m_data->m_pBufContactOutGPU->copyFromOpenCLArray(*m_data->m_solverGPU->m_contactBuffer2);
+							//							m_data->m_solverGPU->m_contactBuffer2->getBufferCL();
+							//						m_data->m_pBufContactOutGPU->getBufferCL()
+						}
+					}
+					else
+					{
+						B3_PROFILE("gpu m_copyConstraintKernel");
+						b3Int4 cdata;
+						cdata.x = nContacts;
+						b3BufferInfoCL bInfo[] = {
+							b3BufferInfoCL(m_data->m_solverGPU->m_contactBuffer2->getBufferCL()),
+							b3BufferInfoCL(m_data->m_pBufContactOutGPU->getBufferCL())};
+
+						b3LauncherCL launcher(m_data->m_queue, m_data->m_solverGPU->m_copyConstraintKernel, "m_copyConstraintKernel");
+						launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+						launcher.setConst(cdata);
+						launcher.launch1D(nContacts, 64);
+						//we use the clFinish for proper benchmark/profile
+						clFinish(m_data->m_queue);
+					}
+				}
+
+				//				bool compareGPU = false;
+				if (nContacts)
+				{
+					if (!gCpuBatchContacts)
+					{
+						B3_PROFILE("gpu batchContacts");
+						maxNumBatches = 250;  //250;
+						m_data->m_solverGPU->batchContacts(m_data->m_pBufContactOutGPU, nContacts, m_data->m_solverGPU->m_numConstraints, m_data->m_solverGPU->m_offsets, csCfg.m_staticIdx);
+						clFinish(m_data->m_queue);
+					}
+					else
+					{
+						B3_PROFILE("cpu batchContacts");
+						static b3AlignedObjectArray<b3Contact4> cpuContacts;
+						b3OpenCLArray<b3Contact4>* contactsIn = m_data->m_solverGPU->m_contactBuffer2;
+						{
+							B3_PROFILE("copyToHost");
+							contactsIn->copyToHost(cpuContacts);
+						}
+						b3OpenCLArray<unsigned int>* countsNative = m_data->m_solverGPU->m_numConstraints;
+						b3OpenCLArray<unsigned int>* offsetsNative = m_data->m_solverGPU->m_offsets;
+
+						b3AlignedObjectArray<unsigned int> nNativeHost;
+						b3AlignedObjectArray<unsigned int> offsetsNativeHost;
+
+						{
+							B3_PROFILE("countsNative/offsetsNative copyToHost");
+							countsNative->copyToHost(nNativeHost);
+							offsetsNative->copyToHost(offsetsNativeHost);
+						}
+
+						int numNonzeroGrid = 0;
+
+						if (gUseLargeBatches)
+						{
+							m_data->m_batchSizes.resize(B3_MAX_NUM_BATCHES);
+							int totalNumConstraints = cpuContacts.size();
+							//int simdWidth =numBodies+1;//-1;//64;//-1;//32;
+							int numBatches = sortConstraintByBatch3(&cpuContacts[0], totalNumConstraints, totalNumConstraints + 1, csCfg.m_staticIdx, numBodies, &m_data->m_batchSizes[0]);  //	on GPU
+							maxNumBatches = b3Max(numBatches, maxNumBatches);
+							static int globalMaxBatch = 0;
+							if (maxNumBatches > globalMaxBatch)
+							{
+								globalMaxBatch = maxNumBatches;
+								b3Printf("maxNumBatches = %d\n", maxNumBatches);
+							}
+						}
+						else
+						{
+							m_data->m_batchSizes.resize(B3_SOLVER_N_CELLS * B3_MAX_NUM_BATCHES);
+							B3_PROFILE("cpu batch grid");
+							for (int i = 0; i < B3_SOLVER_N_CELLS; i++)
+							{
+								int n = (nNativeHost)[i];
+								int offset = (offsetsNativeHost)[i];
+								if (n)
+								{
+									numNonzeroGrid++;
+									int simdWidth = numBodies + 1;                                                                                                                                 //-1;//64;//-1;//32;
+									int numBatches = sortConstraintByBatch3(&cpuContacts[0] + offset, n, simdWidth, csCfg.m_staticIdx, numBodies, &m_data->m_batchSizes[i * B3_MAX_NUM_BATCHES]);  //	on GPU
+									maxNumBatches = b3Max(numBatches, maxNumBatches);
+									static int globalMaxBatch = 0;
+									if (maxNumBatches > globalMaxBatch)
+									{
+										globalMaxBatch = maxNumBatches;
+										b3Printf("maxNumBatches = %d\n", maxNumBatches);
+									}
+									//we use the clFinish for proper benchmark/profile
+								}
+							}
+							//clFinish(m_data->m_queue);
+						}
+						{
+							B3_PROFILE("m_contactBuffer->copyFromHost");
+							m_data->m_solverGPU->m_contactBuffer2->copyFromHost((b3AlignedObjectArray<b3Contact4>&)cpuContacts);
+						}
+					}
+				}
+			}
+		}
+
+		//printf("maxNumBatches = %d\n", maxNumBatches);
+
+		if (gUseLargeBatches)
+		{
+			if (nContacts)
+			{
+				B3_PROFILE("cpu batchContacts");
+				static b3AlignedObjectArray<b3Contact4> cpuContacts;
+				//				b3OpenCLArray<b3Contact4>* contactsIn = m_data->m_solverGPU->m_contactBuffer2;
+				{
+					B3_PROFILE("copyToHost");
+					m_data->m_pBufContactOutGPU->copyToHost(cpuContacts);
+				}
+				//				b3OpenCLArray<unsigned int>* countsNative = m_data->m_solverGPU->m_numConstraints;
+				//				b3OpenCLArray<unsigned int>* offsetsNative = m_data->m_solverGPU->m_offsets;
+
+				//				int numNonzeroGrid=0;
+
+				{
+					m_data->m_batchSizes.resize(B3_MAX_NUM_BATCHES);
+					int totalNumConstraints = cpuContacts.size();
+					//				int simdWidth =numBodies+1;//-1;//64;//-1;//32;
+					int numBatches = sortConstraintByBatch3(&cpuContacts[0], totalNumConstraints, totalNumConstraints + 1, csCfg.m_staticIdx, numBodies, &m_data->m_batchSizes[0]);  //	on GPU
+					maxNumBatches = b3Max(numBatches, maxNumBatches);
+					static int globalMaxBatch = 0;
+					if (maxNumBatches > globalMaxBatch)
+					{
+						globalMaxBatch = maxNumBatches;
+						b3Printf("maxNumBatches = %d\n", maxNumBatches);
+					}
+				}
+				{
+					B3_PROFILE("m_contactBuffer->copyFromHost");
+					m_data->m_solverGPU->m_contactBuffer2->copyFromHost((b3AlignedObjectArray<b3Contact4>&)cpuContacts);
+				}
+			}
+		}
+
+		if (nContacts)
+		{
+			B3_PROFILE("gpu convertToConstraints");
+			m_data->m_solverGPU->convertToConstraints(bodyBuf,
+													  shapeBuf, m_data->m_solverGPU->m_contactBuffer2,
+													  contactConstraintOut,
+													  additionalData, nContacts,
+													  (b3SolverBase::ConstraintCfg&)csCfg);
+			clFinish(m_data->m_queue);
+		}
+
+		if (1)
+		{
+			int numIter = 4;
+
+			m_data->m_solverGPU->m_nIterations = numIter;  //10
+			if (!gCpuSolveConstraint)
+			{
+				B3_PROFILE("GPU solveContactConstraint");
+
+				/*m_data->m_solverGPU->solveContactConstraint(
+				m_data->m_bodyBufferGPU, 
+				m_data->m_inertiaBufferGPU,
+				m_data->m_contactCGPU,0,
+				nContactOut ,
+				maxNumBatches);
+				*/
+
+				//m_data->m_batchSizesGpu->copyFromHost(m_data->m_batchSizes);
+
+				if (gUseLargeBatches)
+				{
+					solveContactConstraintBatchSizes(m_data->m_bodyBufferGPU,
+													 m_data->m_inertiaBufferGPU,
+													 m_data->m_contactCGPU, 0,
+													 nContactOut,
+													 maxNumBatches, numIter, &m_data->m_batchSizes);
+				}
+				else
+				{
+					solveContactConstraint(
+						m_data->m_bodyBufferGPU,
+						m_data->m_inertiaBufferGPU,
+						m_data->m_contactCGPU, 0,
+						nContactOut,
+						maxNumBatches, numIter, &m_data->m_batchSizes);  //m_data->m_batchSizesGpu);
+				}
+			}
+			else
+			{
+				B3_PROFILE("Host solveContactConstraint");
+
+				m_data->m_solverGPU->solveContactConstraintHost(m_data->m_bodyBufferGPU, m_data->m_inertiaBufferGPU, m_data->m_contactCGPU, 0, nContactOut, maxNumBatches, &m_data->m_batchSizes);
+			}
+		}
+
+#if 0
+        if (0)
+        {
+            B3_PROFILE("read body velocities back to CPU");
+            //read body updated linear/angular velocities back to CPU
+            m_data->m_bodyBufferGPU->read(
+                                                  m_data->m_bodyBufferCPU->m_ptr,numOfConvexRBodies);
+            adl::DeviceUtils::waitForCompletion( m_data->m_deviceCL );
+        }
+#endif
+	}
+}
+
+void b3GpuPgsContactSolver::batchContacts(b3OpenCLArray<b3Contact4>* contacts, int nContacts, b3OpenCLArray<unsigned int>* n, b3OpenCLArray<unsigned int>* offsets, int staticIdx)
+{
+}
+
+b3AlignedObjectArray<unsigned int> idxBuffer;
+b3AlignedObjectArray<b3SortData> sortData;
+b3AlignedObjectArray<b3Contact4> old;
+
+inline int b3GpuPgsContactSolver::sortConstraintByBatch(b3Contact4* cs, int n, int simdWidth, int staticIdx, int numBodies)
+{
+	B3_PROFILE("sortConstraintByBatch");
+	int numIter = 0;
+
+	sortData.resize(n);
+	idxBuffer.resize(n);
+	old.resize(n);
+
+	unsigned int* idxSrc = &idxBuffer[0];
+	unsigned int* idxDst = &idxBuffer[0];
+	int nIdxSrc, nIdxDst;
+
+	const int N_FLG = 256;
+	const int FLG_MASK = N_FLG - 1;
+	unsigned int flg[N_FLG / 32];
+#if defined(_DEBUG)
+	for (int i = 0; i < n; i++)
+		cs[i].getBatchIdx() = -1;
+#endif
+	for (int i = 0; i < n; i++)
+		idxSrc[i] = i;
+	nIdxSrc = n;
+
+	int batchIdx = 0;
+
+	{
+		B3_PROFILE("cpu batch innerloop");
+		while (nIdxSrc)
+		{
+			numIter++;
+			nIdxDst = 0;
+			int nCurrentBatch = 0;
+
+			//	clear flag
+			for (int i = 0; i < N_FLG / 32; i++) flg[i] = 0;
+
+			for (int i = 0; i < nIdxSrc; i++)
+			{
+				int idx = idxSrc[i];
+
+				b3Assert(idx < n);
+				//	check if it can go
+				int bodyAS = cs[idx].m_bodyAPtrAndSignBit;
+				int bodyBS = cs[idx].m_bodyBPtrAndSignBit;
+
+				int bodyA = abs(bodyAS);
+				int bodyB = abs(bodyBS);
+
+				int aIdx = bodyA & FLG_MASK;
+				int bIdx = bodyB & FLG_MASK;
+
+				unsigned int aUnavailable = flg[aIdx / 32] & (1 << (aIdx & 31));
+				unsigned int bUnavailable = flg[bIdx / 32] & (1 << (bIdx & 31));
+
+				bool aIsStatic = (bodyAS < 0) || bodyAS == staticIdx;
+				bool bIsStatic = (bodyBS < 0) || bodyBS == staticIdx;
+
+				//use inv_mass!
+				aUnavailable = !aIsStatic ? aUnavailable : 0;  //
+				bUnavailable = !bIsStatic ? bUnavailable : 0;
+
+				if (aUnavailable == 0 && bUnavailable == 0)  // ok
+				{
+					if (!aIsStatic)
+						flg[aIdx / 32] |= (1 << (aIdx & 31));
+					if (!bIsStatic)
+						flg[bIdx / 32] |= (1 << (bIdx & 31));
+
+					cs[idx].getBatchIdx() = batchIdx;
+					sortData[idx].m_key = batchIdx;
+					sortData[idx].m_value = idx;
+
+					{
+						nCurrentBatch++;
+						if (nCurrentBatch == simdWidth)
+						{
+							nCurrentBatch = 0;
+							for (int i = 0; i < N_FLG / 32; i++) flg[i] = 0;
+						}
+					}
+				}
+				else
+				{
+					idxDst[nIdxDst++] = idx;
+				}
+			}
+			b3Swap(idxSrc, idxDst);
+			b3Swap(nIdxSrc, nIdxDst);
+			batchIdx++;
+		}
+	}
+	{
+		B3_PROFILE("quickSort");
+		sortData.quickSort(sortfnc);
+	}
+
+	{
+		B3_PROFILE("reorder");
+		//	reorder
+
+		memcpy(&old[0], cs, sizeof(b3Contact4) * n);
+		for (int i = 0; i < n; i++)
+		{
+			int idx = sortData[i].m_value;
+			cs[i] = old[idx];
+		}
+	}
+
+#if defined(_DEBUG)
+	//		debugPrintf( "nBatches: %d\n", batchIdx );
+	for (int i = 0; i < n; i++)
+	{
+		b3Assert(cs[i].getBatchIdx() != -1);
+	}
+#endif
+	return batchIdx;
+}
+
+b3AlignedObjectArray<int> bodyUsed2;
+
+inline int b3GpuPgsContactSolver::sortConstraintByBatch2(b3Contact4* cs, int numConstraints, int simdWidth, int staticIdx, int numBodies)
+{
+	B3_PROFILE("sortConstraintByBatch2");
+
+	bodyUsed2.resize(2 * simdWidth);
+
+	for (int q = 0; q < 2 * simdWidth; q++)
+		bodyUsed2[q] = 0;
+
+	int curBodyUsed = 0;
+
+	int numIter = 0;
+
+	m_data->m_sortData.resize(numConstraints);
+	m_data->m_idxBuffer.resize(numConstraints);
+	m_data->m_old.resize(numConstraints);
+
+	unsigned int* idxSrc = &m_data->m_idxBuffer[0];
+
+#if defined(_DEBUG)
+	for (int i = 0; i < numConstraints; i++)
+		cs[i].getBatchIdx() = -1;
+#endif
+	for (int i = 0; i < numConstraints; i++)
+		idxSrc[i] = i;
+
+	int numValidConstraints = 0;
+	//	int unprocessedConstraintIndex = 0;
+
+	int batchIdx = 0;
+
+	{
+		B3_PROFILE("cpu batch innerloop");
+
+		while (numValidConstraints < numConstraints)
+		{
+			numIter++;
+			int nCurrentBatch = 0;
+			//	clear flag
+			for (int i = 0; i < curBodyUsed; i++)
+				bodyUsed2[i] = 0;
+			curBodyUsed = 0;
+
+			for (int i = numValidConstraints; i < numConstraints; i++)
+			{
+				int idx = idxSrc[i];
+				b3Assert(idx < numConstraints);
+				//	check if it can go
+				int bodyAS = cs[idx].m_bodyAPtrAndSignBit;
+				int bodyBS = cs[idx].m_bodyBPtrAndSignBit;
+				int bodyA = abs(bodyAS);
+				int bodyB = abs(bodyBS);
+				bool aIsStatic = (bodyAS < 0) || bodyAS == staticIdx;
+				bool bIsStatic = (bodyBS < 0) || bodyBS == staticIdx;
+				int aUnavailable = 0;
+				int bUnavailable = 0;
+				if (!aIsStatic)
+				{
+					for (int j = 0; j < curBodyUsed; j++)
+					{
+						if (bodyA == bodyUsed2[j])
+						{
+							aUnavailable = 1;
+							break;
+						}
+					}
+				}
+				if (!aUnavailable)
+					if (!bIsStatic)
+					{
+						for (int j = 0; j < curBodyUsed; j++)
+						{
+							if (bodyB == bodyUsed2[j])
+							{
+								bUnavailable = 1;
+								break;
+							}
+						}
+					}
+
+				if (aUnavailable == 0 && bUnavailable == 0)  // ok
+				{
+					if (!aIsStatic)
+					{
+						bodyUsed2[curBodyUsed++] = bodyA;
+					}
+					if (!bIsStatic)
+					{
+						bodyUsed2[curBodyUsed++] = bodyB;
+					}
+
+					cs[idx].getBatchIdx() = batchIdx;
+					m_data->m_sortData[idx].m_key = batchIdx;
+					m_data->m_sortData[idx].m_value = idx;
+
+					if (i != numValidConstraints)
+					{
+						b3Swap(idxSrc[i], idxSrc[numValidConstraints]);
+					}
+
+					numValidConstraints++;
+					{
+						nCurrentBatch++;
+						if (nCurrentBatch == simdWidth)
+						{
+							nCurrentBatch = 0;
+							for (int i = 0; i < curBodyUsed; i++)
+								bodyUsed2[i] = 0;
+
+							curBodyUsed = 0;
+						}
+					}
+				}
+			}
+
+			batchIdx++;
+		}
+	}
+	{
+		B3_PROFILE("quickSort");
+		//m_data->m_sortData.quickSort(sortfnc);
+	}
+
+	{
+		B3_PROFILE("reorder");
+		//	reorder
+
+		memcpy(&m_data->m_old[0], cs, sizeof(b3Contact4) * numConstraints);
+
+		for (int i = 0; i < numConstraints; i++)
+		{
+			b3Assert(m_data->m_sortData[idxSrc[i]].m_value == idxSrc[i]);
+			int idx = m_data->m_sortData[idxSrc[i]].m_value;
+			cs[i] = m_data->m_old[idx];
+		}
+	}
+
+#if defined(_DEBUG)
+	//		debugPrintf( "nBatches: %d\n", batchIdx );
+	for (int i = 0; i < numConstraints; i++)
+	{
+		b3Assert(cs[i].getBatchIdx() != -1);
+	}
+#endif
+
+	return batchIdx;
+}
+
+b3AlignedObjectArray<int> bodyUsed;
+b3AlignedObjectArray<int> curUsed;
+
+inline int b3GpuPgsContactSolver::sortConstraintByBatch3(b3Contact4* cs, int numConstraints, int simdWidth, int staticIdx, int numBodies, int* batchSizes)
+{
+	B3_PROFILE("sortConstraintByBatch3");
+
+	static int maxSwaps = 0;
+	int numSwaps = 0;
+
+	curUsed.resize(2 * simdWidth);
+
+	static int maxNumConstraints = 0;
+	if (maxNumConstraints < numConstraints)
+	{
+		maxNumConstraints = numConstraints;
+		//printf("maxNumConstraints  = %d\n",maxNumConstraints );
+	}
+
+	int numUsedArray = numBodies / 32 + 1;
+	bodyUsed.resize(numUsedArray);
+
+	for (int q = 0; q < numUsedArray; q++)
+		bodyUsed[q] = 0;
+
+	int curBodyUsed = 0;
+
+	int numIter = 0;
+
+	m_data->m_sortData.resize(0);
+	m_data->m_idxBuffer.resize(0);
+	m_data->m_old.resize(0);
+
+#if defined(_DEBUG)
+	for (int i = 0; i < numConstraints; i++)
+		cs[i].getBatchIdx() = -1;
+#endif
+
+	int numValidConstraints = 0;
+	//	int unprocessedConstraintIndex = 0;
+
+	int batchIdx = 0;
+
+	{
+		B3_PROFILE("cpu batch innerloop");
+
+		while (numValidConstraints < numConstraints)
+		{
+			numIter++;
+			int nCurrentBatch = 0;
+			batchSizes[batchIdx] = 0;
+
+			//	clear flag
+			for (int i = 0; i < curBodyUsed; i++)
+				bodyUsed[curUsed[i] / 32] = 0;
+
+			curBodyUsed = 0;
+
+			for (int i = numValidConstraints; i < numConstraints; i++)
+			{
+				int idx = i;
+				b3Assert(idx < numConstraints);
+				//	check if it can go
+				int bodyAS = cs[idx].m_bodyAPtrAndSignBit;
+				int bodyBS = cs[idx].m_bodyBPtrAndSignBit;
+				int bodyA = abs(bodyAS);
+				int bodyB = abs(bodyBS);
+				bool aIsStatic = (bodyAS < 0) || bodyAS == staticIdx;
+				bool bIsStatic = (bodyBS < 0) || bodyBS == staticIdx;
+				int aUnavailable = 0;
+				int bUnavailable = 0;
+				if (!aIsStatic)
+				{
+					aUnavailable = bodyUsed[bodyA / 32] & (1 << (bodyA & 31));
+				}
+				if (!aUnavailable)
+					if (!bIsStatic)
+					{
+						bUnavailable = bodyUsed[bodyB / 32] & (1 << (bodyB & 31));
+					}
+
+				if (aUnavailable == 0 && bUnavailable == 0)  // ok
+				{
+					if (!aIsStatic)
+					{
+						bodyUsed[bodyA / 32] |= (1 << (bodyA & 31));
+						curUsed[curBodyUsed++] = bodyA;
+					}
+					if (!bIsStatic)
+					{
+						bodyUsed[bodyB / 32] |= (1 << (bodyB & 31));
+						curUsed[curBodyUsed++] = bodyB;
+					}
+
+					cs[idx].getBatchIdx() = batchIdx;
+
+					if (i != numValidConstraints)
+					{
+						b3Swap(cs[i], cs[numValidConstraints]);
+						numSwaps++;
+					}
+
+					numValidConstraints++;
+					{
+						nCurrentBatch++;
+						if (nCurrentBatch == simdWidth)
+						{
+							batchSizes[batchIdx] += simdWidth;
+							nCurrentBatch = 0;
+							for (int i = 0; i < curBodyUsed; i++)
+								bodyUsed[curUsed[i] / 32] = 0;
+							curBodyUsed = 0;
+						}
+					}
+				}
+			}
+
+			if (batchIdx >= B3_MAX_NUM_BATCHES)
+			{
+				b3Error("batchIdx>=B3_MAX_NUM_BATCHES");
+				b3Assert(0);
+				break;
+			}
+
+			batchSizes[batchIdx] += nCurrentBatch;
+
+			batchIdx++;
+		}
+	}
+
+#if defined(_DEBUG)
+	//		debugPrintf( "nBatches: %d\n", batchIdx );
+	for (int i = 0; i < numConstraints; i++)
+	{
+		b3Assert(cs[i].getBatchIdx() != -1);
+	}
+#endif
+
+	batchSizes[batchIdx] = 0;
+
+	if (maxSwaps < numSwaps)
+	{
+		maxSwaps = numSwaps;
+		//printf("maxSwaps = %d\n", maxSwaps);
+	}
+
+	return batchIdx;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.h
new file mode 100644
index 0000000..6ab7502
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.h
@@ -0,0 +1,37 @@
+
+#ifndef B3_GPU_BATCHING_PGS_SOLVER_H
+#define B3_GPU_BATCHING_PGS_SOLVER_H
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+#include "b3GpuConstraint4.h"
+
+class b3GpuPgsContactSolver
+{
+protected:
+	int m_debugOutput;
+
+	struct b3GpuBatchingPgsSolverInternalData* m_data;
+
+	void batchContacts(b3OpenCLArray<b3Contact4>* contacts, int nContacts, b3OpenCLArray<unsigned int>* n, b3OpenCLArray<unsigned int>* offsets, int staticIdx);
+
+	inline int sortConstraintByBatch(b3Contact4* cs, int n, int simdWidth, int staticIdx, int numBodies);
+	inline int sortConstraintByBatch2(b3Contact4* cs, int n, int simdWidth, int staticIdx, int numBodies);
+	inline int sortConstraintByBatch3(b3Contact4* cs, int n, int simdWidth, int staticIdx, int numBodies, int* batchSizes);
+
+	void solveContactConstraintBatchSizes(const b3OpenCLArray<b3RigidBodyData>* bodyBuf, const b3OpenCLArray<b3InertiaData>* shapeBuf,
+										  b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches, int numIterations, const b3AlignedObjectArray<int>* batchSizes);  //const b3OpenCLArray<int>* gpuBatchSizes);
+
+	void solveContactConstraint(const b3OpenCLArray<b3RigidBodyData>* bodyBuf, const b3OpenCLArray<b3InertiaData>* shapeBuf,
+								b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches, int numIterations, const b3AlignedObjectArray<int>* batchSizes);  //const b3OpenCLArray<int>* gpuBatchSizes);
+
+public:
+	b3GpuPgsContactSolver(cl_context ctx, cl_device_id device, cl_command_queue q, int pairCapacity);
+	virtual ~b3GpuPgsContactSolver();
+
+	void solveContacts(int numBodies, cl_mem bodyBuf, cl_mem inertiaBuf, int numContacts, cl_mem contactBuf, const struct b3Config& config, int static0Index);
+};
+
+#endif  //B3_GPU_BATCHING_PGS_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.cpp
new file mode 100644
index 0000000..fef33ad
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.cpp
@@ -0,0 +1,677 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#include "b3GpuRigidBodyPipeline.h"
+#include "b3GpuRigidBodyPipelineInternalData.h"
+#include "kernels/integrateKernel.h"
+#include "kernels/updateAabbsKernel.h"
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+#include "b3GpuNarrowPhase.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
+#include "Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h"
+#include "Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+#include "Bullet3Dynamics/ConstraintSolver/b3PgsJacobiSolver.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h"
+#include "Bullet3Collision/BroadPhaseCollision/b3DynamicBvhBroadphase.h"
+
+//#define TEST_OTHER_GPU_SOLVER
+
+#define B3_RIGIDBODY_INTEGRATE_PATH "src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl"
+#define B3_RIGIDBODY_UPDATEAABB_PATH "src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl"
+
+bool useBullet2CpuSolver = true;
+
+//choice of contact solver
+bool gUseJacobi = false;
+bool gUseDbvt = false;
+bool gDumpContactStats = false;
+bool gCalcWorldSpaceAabbOnCpu = false;
+bool gUseCalculateOverlappingPairsHost = false;
+bool gIntegrateOnCpu = false;
+bool gClearPairsOnGpu = true;
+
+#define TEST_OTHER_GPU_SOLVER 1
+#ifdef TEST_OTHER_GPU_SOLVER
+#include "b3GpuJacobiContactSolver.h"
+#endif  //TEST_OTHER_GPU_SOLVER
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+#include "Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h"
+
+#include "b3GpuPgsContactSolver.h"
+#include "b3Solver.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+#include "Bullet3OpenCL/Raycast/b3GpuRaycast.h"
+
+#include "Bullet3Dynamics/shared/b3IntegrateTransforms.h"
+#include "Bullet3OpenCL/RigidBody/b3GpuNarrowPhaseInternalData.h"
+
+b3GpuRigidBodyPipeline::b3GpuRigidBodyPipeline(cl_context ctx, cl_device_id device, cl_command_queue q, class b3GpuNarrowPhase* narrowphase, class b3GpuBroadphaseInterface* broadphaseSap, struct b3DynamicBvhBroadphase* broadphaseDbvt, const b3Config& config)
+{
+	m_data = new b3GpuRigidBodyPipelineInternalData;
+	m_data->m_constraintUid = 0;
+	m_data->m_config = config;
+	m_data->m_context = ctx;
+	m_data->m_device = device;
+	m_data->m_queue = q;
+
+	m_data->m_solver = new b3PgsJacobiSolver(true);                            //new b3PgsJacobiSolver(true);
+	m_data->m_gpuSolver = new b3GpuPgsConstraintSolver(ctx, device, q, true);  //new b3PgsJacobiSolver(true);
+
+	m_data->m_allAabbsGPU = new b3OpenCLArray<b3SapAabb>(ctx, q, config.m_maxConvexBodies);
+	m_data->m_overlappingPairsGPU = new b3OpenCLArray<b3BroadphasePair>(ctx, q, config.m_maxBroadphasePairs);
+
+	m_data->m_gpuConstraints = new b3OpenCLArray<b3GpuGenericConstraint>(ctx, q);
+#ifdef TEST_OTHER_GPU_SOLVER
+	m_data->m_solver3 = new b3GpuJacobiContactSolver(ctx, device, q, config.m_maxBroadphasePairs);
+#endif  //	TEST_OTHER_GPU_SOLVER
+
+	m_data->m_solver2 = new b3GpuPgsContactSolver(ctx, device, q, config.m_maxBroadphasePairs);
+
+	m_data->m_raycaster = new b3GpuRaycast(ctx, device, q);
+
+	m_data->m_broadphaseDbvt = broadphaseDbvt;
+	m_data->m_broadphaseSap = broadphaseSap;
+	m_data->m_narrowphase = narrowphase;
+	m_data->m_gravity.setValue(0.f, -9.8f, 0.f);
+
+	cl_int errNum = 0;
+
+	{
+		cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_data->m_context, m_data->m_device, integrateKernelCL, &errNum, "", B3_RIGIDBODY_INTEGRATE_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+		m_data->m_integrateTransformsKernel = b3OpenCLUtils::compileCLKernelFromString(m_data->m_context, m_data->m_device, integrateKernelCL, "integrateTransformsKernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+		clReleaseProgram(prog);
+	}
+	{
+		cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_data->m_context, m_data->m_device, updateAabbsKernelCL, &errNum, "", B3_RIGIDBODY_UPDATEAABB_PATH);
+		b3Assert(errNum == CL_SUCCESS);
+		m_data->m_updateAabbsKernel = b3OpenCLUtils::compileCLKernelFromString(m_data->m_context, m_data->m_device, updateAabbsKernelCL, "initializeGpuAabbsFull", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+
+		m_data->m_clearOverlappingPairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_data->m_context, m_data->m_device, updateAabbsKernelCL, "clearOverlappingPairsKernel", &errNum, prog);
+		b3Assert(errNum == CL_SUCCESS);
+
+		clReleaseProgram(prog);
+	}
+}
+
+b3GpuRigidBodyPipeline::~b3GpuRigidBodyPipeline()
+{
+	if (m_data->m_integrateTransformsKernel)
+		clReleaseKernel(m_data->m_integrateTransformsKernel);
+
+	if (m_data->m_updateAabbsKernel)
+		clReleaseKernel(m_data->m_updateAabbsKernel);
+
+	if (m_data->m_clearOverlappingPairsKernel)
+		clReleaseKernel(m_data->m_clearOverlappingPairsKernel);
+	delete m_data->m_raycaster;
+	delete m_data->m_solver;
+	delete m_data->m_allAabbsGPU;
+	delete m_data->m_gpuConstraints;
+	delete m_data->m_overlappingPairsGPU;
+
+#ifdef TEST_OTHER_GPU_SOLVER
+	delete m_data->m_solver3;
+#endif  //TEST_OTHER_GPU_SOLVER
+
+	delete m_data->m_solver2;
+
+	delete m_data;
+}
+
+void b3GpuRigidBodyPipeline::reset()
+{
+	m_data->m_gpuConstraints->resize(0);
+	m_data->m_cpuConstraints.resize(0);
+	m_data->m_allAabbsGPU->resize(0);
+	m_data->m_allAabbsCPU.resize(0);
+}
+
+void b3GpuRigidBodyPipeline::addConstraint(b3TypedConstraint* constraint)
+{
+	m_data->m_joints.push_back(constraint);
+}
+
+void b3GpuRigidBodyPipeline::removeConstraint(b3TypedConstraint* constraint)
+{
+	m_data->m_joints.remove(constraint);
+}
+
+void b3GpuRigidBodyPipeline::removeConstraintByUid(int uid)
+{
+	m_data->m_gpuSolver->recomputeBatches();
+	//slow linear search
+	m_data->m_gpuConstraints->copyToHost(m_data->m_cpuConstraints);
+	//remove
+	for (int i = 0; i < m_data->m_cpuConstraints.size(); i++)
+	{
+		if (m_data->m_cpuConstraints[i].m_uid == uid)
+		{
+			//m_data->m_cpuConstraints.remove(m_data->m_cpuConstraints[i]);
+			m_data->m_cpuConstraints.swap(i, m_data->m_cpuConstraints.size() - 1);
+			m_data->m_cpuConstraints.pop_back();
+
+			break;
+		}
+	}
+
+	if (m_data->m_cpuConstraints.size())
+	{
+		m_data->m_gpuConstraints->copyFromHost(m_data->m_cpuConstraints);
+	}
+	else
+	{
+		m_data->m_gpuConstraints->resize(0);
+	}
+}
+int b3GpuRigidBodyPipeline::createPoint2PointConstraint(int bodyA, int bodyB, const float* pivotInA, const float* pivotInB, float breakingThreshold)
+{
+	m_data->m_gpuSolver->recomputeBatches();
+	b3GpuGenericConstraint c;
+	c.m_uid = m_data->m_constraintUid;
+	m_data->m_constraintUid++;
+	c.m_flags = B3_CONSTRAINT_FLAG_ENABLED;
+	c.m_rbA = bodyA;
+	c.m_rbB = bodyB;
+	c.m_pivotInA.setValue(pivotInA[0], pivotInA[1], pivotInA[2]);
+	c.m_pivotInB.setValue(pivotInB[0], pivotInB[1], pivotInB[2]);
+	c.m_breakingImpulseThreshold = breakingThreshold;
+	c.m_constraintType = B3_GPU_POINT2POINT_CONSTRAINT_TYPE;
+	m_data->m_cpuConstraints.push_back(c);
+	return c.m_uid;
+}
+int b3GpuRigidBodyPipeline::createFixedConstraint(int bodyA, int bodyB, const float* pivotInA, const float* pivotInB, const float* relTargetAB, float breakingThreshold)
+{
+	m_data->m_gpuSolver->recomputeBatches();
+	b3GpuGenericConstraint c;
+	c.m_uid = m_data->m_constraintUid;
+	m_data->m_constraintUid++;
+	c.m_flags = B3_CONSTRAINT_FLAG_ENABLED;
+	c.m_rbA = bodyA;
+	c.m_rbB = bodyB;
+	c.m_pivotInA.setValue(pivotInA[0], pivotInA[1], pivotInA[2]);
+	c.m_pivotInB.setValue(pivotInB[0], pivotInB[1], pivotInB[2]);
+	c.m_relTargetAB.setValue(relTargetAB[0], relTargetAB[1], relTargetAB[2], relTargetAB[3]);
+	c.m_breakingImpulseThreshold = breakingThreshold;
+	c.m_constraintType = B3_GPU_FIXED_CONSTRAINT_TYPE;
+
+	m_data->m_cpuConstraints.push_back(c);
+	return c.m_uid;
+}
+
+void b3GpuRigidBodyPipeline::stepSimulation(float deltaTime)
+{
+	//update worldspace AABBs from local AABB/worldtransform
+	{
+		B3_PROFILE("setupGpuAabbs");
+		setupGpuAabbsFull();
+	}
+
+	int numPairs = 0;
+
+	//compute overlapping pairs
+	{
+		if (gUseDbvt)
+		{
+			{
+				B3_PROFILE("setAabb");
+				m_data->m_allAabbsGPU->copyToHost(m_data->m_allAabbsCPU);
+				for (int i = 0; i < m_data->m_allAabbsCPU.size(); i++)
+				{
+					b3Vector3 aabbMin = b3MakeVector3(m_data->m_allAabbsCPU[i].m_min[0], m_data->m_allAabbsCPU[i].m_min[1], m_data->m_allAabbsCPU[i].m_min[2]);
+					b3Vector3 aabbMax = b3MakeVector3(m_data->m_allAabbsCPU[i].m_max[0], m_data->m_allAabbsCPU[i].m_max[1], m_data->m_allAabbsCPU[i].m_max[2]);
+					m_data->m_broadphaseDbvt->setAabb(i, aabbMin, aabbMax, 0);
+				}
+			}
+
+			{
+				B3_PROFILE("calculateOverlappingPairs");
+				m_data->m_broadphaseDbvt->calculateOverlappingPairs();
+			}
+			numPairs = m_data->m_broadphaseDbvt->getOverlappingPairCache()->getNumOverlappingPairs();
+		}
+		else
+		{
+			if (gUseCalculateOverlappingPairsHost)
+			{
+				m_data->m_broadphaseSap->calculateOverlappingPairsHost(m_data->m_config.m_maxBroadphasePairs);
+			}
+			else
+			{
+				m_data->m_broadphaseSap->calculateOverlappingPairs(m_data->m_config.m_maxBroadphasePairs);
+			}
+			numPairs = m_data->m_broadphaseSap->getNumOverlap();
+		}
+	}
+
+	//compute contact points
+	//	printf("numPairs=%d\n",numPairs);
+
+	int numContacts = 0;
+
+	int numBodies = m_data->m_narrowphase->getNumRigidBodies();
+
+	if (numPairs)
+	{
+		cl_mem pairs = 0;
+		cl_mem aabbsWS = 0;
+		if (gUseDbvt)
+		{
+			B3_PROFILE("m_overlappingPairsGPU->copyFromHost");
+			m_data->m_overlappingPairsGPU->copyFromHost(m_data->m_broadphaseDbvt->getOverlappingPairCache()->getOverlappingPairArray());
+			pairs = m_data->m_overlappingPairsGPU->getBufferCL();
+			aabbsWS = m_data->m_allAabbsGPU->getBufferCL();
+		}
+		else
+		{
+			pairs = m_data->m_broadphaseSap->getOverlappingPairBuffer();
+			aabbsWS = m_data->m_broadphaseSap->getAabbBufferWS();
+		}
+
+		m_data->m_overlappingPairsGPU->resize(numPairs);
+
+		//mark the contacts for each pair as 'unused'
+		if (numPairs)
+		{
+			b3OpenCLArray<b3BroadphasePair> gpuPairs(this->m_data->m_context, m_data->m_queue);
+			gpuPairs.setFromOpenCLBuffer(pairs, numPairs);
+
+			if (gClearPairsOnGpu)
+			{
+				//b3AlignedObjectArray<b3BroadphasePair> hostPairs;//just for debugging
+				//gpuPairs.copyToHost(hostPairs);
+
+				b3LauncherCL launcher(m_data->m_queue, m_data->m_clearOverlappingPairsKernel, "clearOverlappingPairsKernel");
+				launcher.setBuffer(pairs);
+				launcher.setConst(numPairs);
+				launcher.launch1D(numPairs);
+
+				//gpuPairs.copyToHost(hostPairs);
+			}
+			else
+			{
+				b3AlignedObjectArray<b3BroadphasePair> hostPairs;
+				gpuPairs.copyToHost(hostPairs);
+
+				for (int i = 0; i < hostPairs.size(); i++)
+				{
+					hostPairs[i].z = 0xffffffff;
+				}
+
+				gpuPairs.copyFromHost(hostPairs);
+			}
+		}
+
+		m_data->m_narrowphase->computeContacts(pairs, numPairs, aabbsWS, numBodies);
+		numContacts = m_data->m_narrowphase->getNumContactsGpu();
+
+		if (gUseDbvt)
+		{
+			///store the cached information (contact locations in the 'z' component)
+			B3_PROFILE("m_overlappingPairsGPU->copyToHost");
+			m_data->m_overlappingPairsGPU->copyToHost(m_data->m_broadphaseDbvt->getOverlappingPairCache()->getOverlappingPairArray());
+		}
+		if (gDumpContactStats && numContacts)
+		{
+			m_data->m_narrowphase->getContactsGpu();
+
+			printf("numContacts = %d\n", numContacts);
+
+			int totalPoints = 0;
+			const b3Contact4* contacts = m_data->m_narrowphase->getContactsCPU();
+
+			for (int i = 0; i < numContacts; i++)
+			{
+				totalPoints += contacts->getNPoints();
+			}
+			printf("totalPoints=%d\n", totalPoints);
+		}
+	}
+
+	//convert contact points to contact constraints
+
+	//solve constraints
+
+	b3OpenCLArray<b3RigidBodyData> gpuBodies(m_data->m_context, m_data->m_queue, 0, true);
+	gpuBodies.setFromOpenCLBuffer(m_data->m_narrowphase->getBodiesGpu(), m_data->m_narrowphase->getNumRigidBodies());
+	b3OpenCLArray<b3InertiaData> gpuInertias(m_data->m_context, m_data->m_queue, 0, true);
+	gpuInertias.setFromOpenCLBuffer(m_data->m_narrowphase->getBodyInertiasGpu(), m_data->m_narrowphase->getNumRigidBodies());
+	b3OpenCLArray<b3Contact4> gpuContacts(m_data->m_context, m_data->m_queue, 0, true);
+	gpuContacts.setFromOpenCLBuffer(m_data->m_narrowphase->getContactsGpu(), m_data->m_narrowphase->getNumContactsGpu());
+
+	int numJoints = m_data->m_joints.size() ? m_data->m_joints.size() : m_data->m_cpuConstraints.size();
+	if (useBullet2CpuSolver && numJoints)
+	{
+		//	b3AlignedObjectArray<b3Contact4> hostContacts;
+		//gpuContacts.copyToHost(hostContacts);
+		{
+			bool useGpu = m_data->m_joints.size() == 0;
+
+			//			b3Contact4* contacts = numContacts? &hostContacts[0]: 0;
+			//m_data->m_solver->solveContacts(m_data->m_narrowphase->getNumBodiesGpu(),&hostBodies[0],&hostInertias[0],numContacts,contacts,numJoints, joints);
+			if (useGpu)
+			{
+				m_data->m_gpuSolver->solveJoints(m_data->m_narrowphase->getNumRigidBodies(), &gpuBodies, &gpuInertias, numJoints, m_data->m_gpuConstraints);
+			}
+			else
+			{
+				b3AlignedObjectArray<b3RigidBodyData> hostBodies;
+				gpuBodies.copyToHost(hostBodies);
+				b3AlignedObjectArray<b3InertiaData> hostInertias;
+				gpuInertias.copyToHost(hostInertias);
+
+				b3TypedConstraint** joints = numJoints ? &m_data->m_joints[0] : 0;
+				m_data->m_solver->solveContacts(m_data->m_narrowphase->getNumRigidBodies(), &hostBodies[0], &hostInertias[0], 0, 0, numJoints, joints);
+				gpuBodies.copyFromHost(hostBodies);
+			}
+		}
+	}
+
+	if (numContacts)
+	{
+#ifdef TEST_OTHER_GPU_SOLVER
+
+		if (gUseJacobi)
+		{
+			bool useGpu = true;
+			if (useGpu)
+			{
+				bool forceHost = false;
+				if (forceHost)
+				{
+					b3AlignedObjectArray<b3RigidBodyData> hostBodies;
+					b3AlignedObjectArray<b3InertiaData> hostInertias;
+					b3AlignedObjectArray<b3Contact4> hostContacts;
+
+					{
+						B3_PROFILE("copyToHost");
+						gpuBodies.copyToHost(hostBodies);
+						gpuInertias.copyToHost(hostInertias);
+						gpuContacts.copyToHost(hostContacts);
+					}
+
+					{
+						b3JacobiSolverInfo solverInfo;
+						m_data->m_solver3->solveGroupHost(&hostBodies[0], &hostInertias[0], hostBodies.size(), &hostContacts[0], hostContacts.size(), solverInfo);
+					}
+					{
+						B3_PROFILE("copyFromHost");
+						gpuBodies.copyFromHost(hostBodies);
+					}
+				}
+				else
+
+				{
+					int static0Index = m_data->m_narrowphase->getStatic0Index();
+					b3JacobiSolverInfo solverInfo;
+					//m_data->m_solver3->solveContacts(    >solveGroup(&gpuBodies, &gpuInertias, &gpuContacts,solverInfo);
+					//m_data->m_solver3->solveContacts(m_data->m_narrowphase->getNumBodiesGpu(),&hostBodies[0],&hostInertias[0],numContacts,&hostContacts[0]);
+					m_data->m_solver3->solveContacts(numBodies, gpuBodies.getBufferCL(), gpuInertias.getBufferCL(), numContacts, gpuContacts.getBufferCL(), m_data->m_config, static0Index);
+				}
+			}
+			else
+			{
+				b3AlignedObjectArray<b3RigidBodyData> hostBodies;
+				gpuBodies.copyToHost(hostBodies);
+				b3AlignedObjectArray<b3InertiaData> hostInertias;
+				gpuInertias.copyToHost(hostInertias);
+				b3AlignedObjectArray<b3Contact4> hostContacts;
+				gpuContacts.copyToHost(hostContacts);
+				{
+					//m_data->m_solver->solveContacts(m_data->m_narrowphase->getNumBodiesGpu(),&hostBodies[0],&hostInertias[0],numContacts,&hostContacts[0]);
+				}
+				gpuBodies.copyFromHost(hostBodies);
+			}
+		}
+		else
+#endif  //TEST_OTHER_GPU_SOLVER
+		{
+			int static0Index = m_data->m_narrowphase->getStatic0Index();
+			m_data->m_solver2->solveContacts(numBodies, gpuBodies.getBufferCL(), gpuInertias.getBufferCL(), numContacts, gpuContacts.getBufferCL(), m_data->m_config, static0Index);
+
+			//m_data->m_solver4->solveContacts(m_data->m_narrowphase->getNumBodiesGpu(), gpuBodies.getBufferCL(), gpuInertias.getBufferCL(), numContacts, gpuContacts.getBufferCL());
+
+			/*m_data->m_solver3->solveContactConstraintHost(
+			(b3OpenCLArray<RigidBodyBase::Body>*)&gpuBodies,
+			(b3OpenCLArray<RigidBodyBase::Inertia>*)&gpuInertias,
+			(b3OpenCLArray<Constraint4>*) &gpuContacts,
+			0,numContacts,256);
+			*/
+		}
+	}
+
+	integrate(deltaTime);
+}
+
+void b3GpuRigidBodyPipeline::integrate(float timeStep)
+{
+	//integrate
+	int numBodies = m_data->m_narrowphase->getNumRigidBodies();
+	float angularDamp = 0.99f;
+
+	if (gIntegrateOnCpu)
+	{
+		if (numBodies)
+		{
+			b3GpuNarrowPhaseInternalData* npData = m_data->m_narrowphase->getInternalData();
+			npData->m_bodyBufferGPU->copyToHost(*npData->m_bodyBufferCPU);
+
+			b3RigidBodyData_t* bodies = &npData->m_bodyBufferCPU->at(0);
+
+			for (int nodeID = 0; nodeID < numBodies; nodeID++)
+			{
+				integrateSingleTransform(bodies, nodeID, timeStep, angularDamp, m_data->m_gravity);
+			}
+			npData->m_bodyBufferGPU->copyFromHost(*npData->m_bodyBufferCPU);
+		}
+	}
+	else
+	{
+		b3LauncherCL launcher(m_data->m_queue, m_data->m_integrateTransformsKernel, "m_integrateTransformsKernel");
+		launcher.setBuffer(m_data->m_narrowphase->getBodiesGpu());
+
+		launcher.setConst(numBodies);
+		launcher.setConst(timeStep);
+		launcher.setConst(angularDamp);
+		launcher.setConst(m_data->m_gravity);
+		launcher.launch1D(numBodies);
+	}
+}
+
+void b3GpuRigidBodyPipeline::setupGpuAabbsFull()
+{
+	cl_int ciErrNum = 0;
+
+	int numBodies = m_data->m_narrowphase->getNumRigidBodies();
+	if (!numBodies)
+		return;
+
+	if (gCalcWorldSpaceAabbOnCpu)
+	{
+		if (numBodies)
+		{
+			if (gUseDbvt)
+			{
+				m_data->m_allAabbsCPU.resize(numBodies);
+				m_data->m_narrowphase->readbackAllBodiesToCpu();
+				for (int i = 0; i < numBodies; i++)
+				{
+					b3ComputeWorldAabb(i, m_data->m_narrowphase->getBodiesCpu(), m_data->m_narrowphase->getCollidablesCpu(), m_data->m_narrowphase->getLocalSpaceAabbsCpu(), &m_data->m_allAabbsCPU[0]);
+				}
+				m_data->m_allAabbsGPU->copyFromHost(m_data->m_allAabbsCPU);
+			}
+			else
+			{
+				m_data->m_broadphaseSap->getAllAabbsCPU().resize(numBodies);
+				m_data->m_narrowphase->readbackAllBodiesToCpu();
+				for (int i = 0; i < numBodies; i++)
+				{
+					b3ComputeWorldAabb(i, m_data->m_narrowphase->getBodiesCpu(), m_data->m_narrowphase->getCollidablesCpu(), m_data->m_narrowphase->getLocalSpaceAabbsCpu(), &m_data->m_broadphaseSap->getAllAabbsCPU()[0]);
+				}
+				m_data->m_broadphaseSap->getAllAabbsGPU().copyFromHost(m_data->m_broadphaseSap->getAllAabbsCPU());
+				//m_data->m_broadphaseSap->writeAabbsToGpu();
+			}
+		}
+	}
+	else
+	{
+		//__kernel void initializeGpuAabbsFull(  const int numNodes, __global Body* gBodies,__global Collidable* collidables, __global b3AABBCL* plocalShapeAABB, __global b3AABBCL* pAABB)
+		b3LauncherCL launcher(m_data->m_queue, m_data->m_updateAabbsKernel, "m_updateAabbsKernel");
+		launcher.setConst(numBodies);
+		cl_mem bodies = m_data->m_narrowphase->getBodiesGpu();
+		launcher.setBuffer(bodies);
+		cl_mem collidables = m_data->m_narrowphase->getCollidablesGpu();
+		launcher.setBuffer(collidables);
+		cl_mem localAabbs = m_data->m_narrowphase->getAabbLocalSpaceBufferGpu();
+		launcher.setBuffer(localAabbs);
+
+		cl_mem worldAabbs = 0;
+		if (gUseDbvt)
+		{
+			worldAabbs = m_data->m_allAabbsGPU->getBufferCL();
+		}
+		else
+		{
+			worldAabbs = m_data->m_broadphaseSap->getAabbBufferWS();
+		}
+		launcher.setBuffer(worldAabbs);
+		launcher.launch1D(numBodies);
+
+		oclCHECKERROR(ciErrNum, CL_SUCCESS);
+	}
+
+	/*
+	b3AlignedObjectArray<b3SapAabb> aabbs;
+	m_data->m_broadphaseSap->m_allAabbsGPU.copyToHost(aabbs);
+
+	printf("numAabbs = %d\n",  aabbs.size());
+
+	for (int i=0;i<aabbs.size();i++)
+	{
+		printf("aabb[%d].m_min=%f,%f,%f,%d\n",i,aabbs[i].m_minVec[0],aabbs[i].m_minVec[1],aabbs[i].m_minVec[2],aabbs[i].m_minIndices[3]);
+		printf("aabb[%d].m_max=%f,%f,%f,%d\n",i,aabbs[i].m_maxVec[0],aabbs[i].m_maxVec[1],aabbs[i].m_maxVec[2],aabbs[i].m_signedMaxIndices[3]);
+
+	};
+	*/
+}
+
+cl_mem b3GpuRigidBodyPipeline::getBodyBuffer()
+{
+	return m_data->m_narrowphase->getBodiesGpu();
+}
+
+int b3GpuRigidBodyPipeline::getNumBodies() const
+{
+	return m_data->m_narrowphase->getNumRigidBodies();
+}
+
+void b3GpuRigidBodyPipeline::setGravity(const float* grav)
+{
+	m_data->m_gravity.setValue(grav[0], grav[1], grav[2]);
+}
+
+void b3GpuRigidBodyPipeline::copyConstraintsToHost()
+{
+	m_data->m_gpuConstraints->copyToHost(m_data->m_cpuConstraints);
+}
+
+void b3GpuRigidBodyPipeline::writeAllInstancesToGpu()
+{
+	m_data->m_allAabbsGPU->copyFromHost(m_data->m_allAabbsCPU);
+	m_data->m_gpuConstraints->copyFromHost(m_data->m_cpuConstraints);
+}
+
+int b3GpuRigidBodyPipeline::registerPhysicsInstance(float mass, const float* position, const float* orientation, int collidableIndex, int userIndex, bool writeInstanceToGpu)
+{
+	b3Vector3 aabbMin = b3MakeVector3(0, 0, 0), aabbMax = b3MakeVector3(0, 0, 0);
+
+	if (collidableIndex >= 0)
+	{
+		b3SapAabb localAabb = m_data->m_narrowphase->getLocalSpaceAabb(collidableIndex);
+		b3Vector3 localAabbMin = b3MakeVector3(localAabb.m_min[0], localAabb.m_min[1], localAabb.m_min[2]);
+		b3Vector3 localAabbMax = b3MakeVector3(localAabb.m_max[0], localAabb.m_max[1], localAabb.m_max[2]);
+
+		b3Scalar margin = 0.01f;
+		b3Transform t;
+		t.setIdentity();
+		t.setOrigin(b3MakeVector3(position[0], position[1], position[2]));
+		t.setRotation(b3Quaternion(orientation[0], orientation[1], orientation[2], orientation[3]));
+		b3TransformAabb(localAabbMin, localAabbMax, margin, t, aabbMin, aabbMax);
+	}
+	else
+	{
+		b3Error("registerPhysicsInstance using invalid collidableIndex\n");
+		return -1;
+	}
+
+	bool writeToGpu = false;
+	int bodyIndex = m_data->m_narrowphase->getNumRigidBodies();
+	bodyIndex = m_data->m_narrowphase->registerRigidBody(collidableIndex, mass, position, orientation, &aabbMin.getX(), &aabbMax.getX(), writeToGpu);
+
+	if (bodyIndex >= 0)
+	{
+		if (gUseDbvt)
+		{
+			m_data->m_broadphaseDbvt->createProxy(aabbMin, aabbMax, bodyIndex, 0, 1, 1);
+			b3SapAabb aabb;
+			for (int i = 0; i < 3; i++)
+			{
+				aabb.m_min[i] = aabbMin[i];
+				aabb.m_max[i] = aabbMax[i];
+				aabb.m_minIndices[3] = bodyIndex;
+			}
+			m_data->m_allAabbsCPU.push_back(aabb);
+			if (writeInstanceToGpu)
+			{
+				m_data->m_allAabbsGPU->copyFromHost(m_data->m_allAabbsCPU);
+			}
+		}
+		else
+		{
+			if (mass)
+			{
+				m_data->m_broadphaseSap->createProxy(aabbMin, aabbMax, bodyIndex, 1, 1);  //m_dispatcher);
+			}
+			else
+			{
+				m_data->m_broadphaseSap->createLargeProxy(aabbMin, aabbMax, bodyIndex, 1, 1);  //m_dispatcher);
+			}
+		}
+	}
+
+	/*
+	if (mass>0.f)
+		m_numDynamicPhysicsInstances++;
+
+	m_numPhysicsInstances++;
+	*/
+
+	return bodyIndex;
+}
+
+void b3GpuRigidBodyPipeline::castRays(const b3AlignedObjectArray<b3RayInfo>& rays, b3AlignedObjectArray<b3RayHit>& hitResults)
+{
+	this->m_data->m_raycaster->castRays(rays, hitResults,
+										getNumBodies(), this->m_data->m_narrowphase->getBodiesCpu(),
+										m_data->m_narrowphase->getNumCollidablesGpu(), m_data->m_narrowphase->getCollidablesCpu(),
+										m_data->m_narrowphase->getInternalData(), m_data->m_broadphaseSap);
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h
new file mode 100644
index 0000000..0e5c6fe
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h
@@ -0,0 +1,70 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#ifndef B3_GPU_RIGIDBODY_PIPELINE_H
+#define B3_GPU_RIGIDBODY_PIPELINE_H
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"
+
+class b3GpuRigidBodyPipeline
+{
+protected:
+	struct b3GpuRigidBodyPipelineInternalData* m_data;
+
+	int allocateCollidable();
+
+public:
+	b3GpuRigidBodyPipeline(cl_context ctx, cl_device_id device, cl_command_queue q, class b3GpuNarrowPhase* narrowphase, class b3GpuBroadphaseInterface* broadphaseSap, struct b3DynamicBvhBroadphase* broadphaseDbvt, const b3Config& config);
+	virtual ~b3GpuRigidBodyPipeline();
+
+	void stepSimulation(float deltaTime);
+	void integrate(float timeStep);
+	void setupGpuAabbsFull();
+
+	int registerConvexPolyhedron(class b3ConvexUtility* convex);
+
+	//int		registerConvexPolyhedron(const float* vertices, int strideInBytes, int numVertices, const float* scaling);
+	//int		registerSphereShape(float radius);
+	//int		registerPlaneShape(const b3Vector3& planeNormal, float planeConstant);
+
+	//int		registerConcaveMesh(b3AlignedObjectArray<b3Vector3>* vertices, b3AlignedObjectArray<int>* indices, const float* scaling);
+	//int		registerCompoundShape(b3AlignedObjectArray<b3GpuChildShape>* childShapes);
+
+	int registerPhysicsInstance(float mass, const float* position, const float* orientation, int collisionShapeIndex, int userData, bool writeInstanceToGpu);
+	//if you passed "writeInstanceToGpu" false in the registerPhysicsInstance method (for performance) you need to call writeAllInstancesToGpu after all instances are registered
+	void writeAllInstancesToGpu();
+	void copyConstraintsToHost();
+	void setGravity(const float* grav);
+	void reset();
+
+	int createPoint2PointConstraint(int bodyA, int bodyB, const float* pivotInA, const float* pivotInB, float breakingThreshold);
+	int createFixedConstraint(int bodyA, int bodyB, const float* pivotInA, const float* pivotInB, const float* relTargetAB, float breakingThreshold);
+	void removeConstraintByUid(int uid);
+
+	void addConstraint(class b3TypedConstraint* constraint);
+	void removeConstraint(b3TypedConstraint* constraint);
+
+	void castRays(const b3AlignedObjectArray<b3RayInfo>& rays, b3AlignedObjectArray<b3RayHit>& hitResults);
+
+	cl_mem getBodyBuffer();
+
+	int getNumBodies() const;
+};
+
+#endif  //B3_GPU_RIGIDBODY_PIPELINE_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h
new file mode 100644
index 0000000..e0a26fd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h
@@ -0,0 +1,68 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#ifndef B3_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H
+#define B3_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLInclude.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h"
+
+#include "Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h"
+#include "Bullet3Dynamics/ConstraintSolver/b3TypedConstraint.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Config.h"
+
+#include "Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h"
+#include "Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h"
+
+struct b3GpuRigidBodyPipelineInternalData
+{
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+
+	cl_kernel m_integrateTransformsKernel;
+	cl_kernel m_updateAabbsKernel;
+	cl_kernel m_clearOverlappingPairsKernel;
+
+	class b3PgsJacobiSolver* m_solver;
+
+	class b3GpuPgsConstraintSolver* m_gpuSolver;
+
+	class b3GpuPgsContactSolver* m_solver2;
+	class b3GpuJacobiContactSolver* m_solver3;
+	class b3GpuRaycast* m_raycaster;
+
+	class b3GpuBroadphaseInterface* m_broadphaseSap;
+
+	struct b3DynamicBvhBroadphase* m_broadphaseDbvt;
+	b3OpenCLArray<b3SapAabb>* m_allAabbsGPU;
+	b3AlignedObjectArray<b3SapAabb> m_allAabbsCPU;
+	b3OpenCLArray<b3BroadphasePair>* m_overlappingPairsGPU;
+
+	b3OpenCLArray<b3GpuGenericConstraint>* m_gpuConstraints;
+	b3AlignedObjectArray<b3GpuGenericConstraint> m_cpuConstraints;
+
+	b3AlignedObjectArray<b3TypedConstraint*> m_joints;
+	int m_constraintUid;
+	class b3GpuNarrowPhase* m_narrowphase;
+	b3Vector3 m_gravity;
+
+	b3Config m_config;
+};
+
+#endif  //B3_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h
new file mode 100644
index 0000000..db815d9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverBody.h
@@ -0,0 +1,210 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#ifndef B3_GPU_SOLVER_BODY_H
+#define B3_GPU_SOLVER_BODY_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3Matrix3x3.h"
+
+#include "Bullet3Common/b3AlignedAllocator.h"
+#include "Bullet3Common/b3TransformUtil.h"
+
+///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision
+#ifdef B3_USE_SSE
+#define USE_SIMD 1
+#endif  //
+
+///The b3SolverBody is an internal datastructure for the constraint solver. Only necessary data is packed to increase cache coherence/performance.
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3GpuSolverBody
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+	//	b3Transform		m_worldTransformUnused;
+	b3Vector3 m_deltaLinearVelocity;
+	b3Vector3 m_deltaAngularVelocity;
+	b3Vector3 m_angularFactor;
+	b3Vector3 m_linearFactor;
+	b3Vector3 m_invMass;
+	b3Vector3 m_pushVelocity;
+	b3Vector3 m_turnVelocity;
+	b3Vector3 m_linearVelocity;
+	b3Vector3 m_angularVelocity;
+
+	union {
+		void* m_originalBody;
+		int m_originalBodyIndex;
+	};
+
+	int padding[3];
+
+	/*
+	void	setWorldTransform(const b3Transform& worldTransform)
+	{
+		m_worldTransform = worldTransform;
+	}
+
+	const b3Transform& getWorldTransform() const
+	{
+		return m_worldTransform;
+	}
+	*/
+	B3_FORCE_INLINE void getVelocityInLocalPointObsolete(const b3Vector3& rel_pos, b3Vector3& velocity) const
+	{
+		if (m_originalBody)
+			velocity = m_linearVelocity + m_deltaLinearVelocity + (m_angularVelocity + m_deltaAngularVelocity).cross(rel_pos);
+		else
+			velocity.setValue(0, 0, 0);
+	}
+
+	B3_FORCE_INLINE void getAngularVelocity(b3Vector3 & angVel) const
+	{
+		if (m_originalBody)
+			angVel = m_angularVelocity + m_deltaAngularVelocity;
+		else
+			angVel.setValue(0, 0, 0);
+	}
+
+	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
+	B3_FORCE_INLINE void applyImpulse(const b3Vector3& linearComponent, const b3Vector3& angularComponent, const b3Scalar impulseMagnitude)
+	{
+		if (m_originalBody)
+		{
+			m_deltaLinearVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_deltaAngularVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	B3_FORCE_INLINE void internalApplyPushImpulse(const b3Vector3& linearComponent, const b3Vector3& angularComponent, b3Scalar impulseMagnitude)
+	{
+		if (m_originalBody)
+		{
+			m_pushVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_turnVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	const b3Vector3& getDeltaLinearVelocity() const
+	{
+		return m_deltaLinearVelocity;
+	}
+
+	const b3Vector3& getDeltaAngularVelocity() const
+	{
+		return m_deltaAngularVelocity;
+	}
+
+	const b3Vector3& getPushVelocity() const
+	{
+		return m_pushVelocity;
+	}
+
+	const b3Vector3& getTurnVelocity() const
+	{
+		return m_turnVelocity;
+	}
+
+	////////////////////////////////////////////////
+	///some internal methods, don't use them
+
+	b3Vector3& internalGetDeltaLinearVelocity()
+	{
+		return m_deltaLinearVelocity;
+	}
+
+	b3Vector3& internalGetDeltaAngularVelocity()
+	{
+		return m_deltaAngularVelocity;
+	}
+
+	const b3Vector3& internalGetAngularFactor() const
+	{
+		return m_angularFactor;
+	}
+
+	const b3Vector3& internalGetInvMass() const
+	{
+		return m_invMass;
+	}
+
+	void internalSetInvMass(const b3Vector3& invMass)
+	{
+		m_invMass = invMass;
+	}
+
+	b3Vector3& internalGetPushVelocity()
+	{
+		return m_pushVelocity;
+	}
+
+	b3Vector3& internalGetTurnVelocity()
+	{
+		return m_turnVelocity;
+	}
+
+	B3_FORCE_INLINE void internalGetVelocityInLocalPointObsolete(const b3Vector3& rel_pos, b3Vector3& velocity) const
+	{
+		velocity = m_linearVelocity + m_deltaLinearVelocity + (m_angularVelocity + m_deltaAngularVelocity).cross(rel_pos);
+	}
+
+	B3_FORCE_INLINE void internalGetAngularVelocity(b3Vector3 & angVel) const
+	{
+		angVel = m_angularVelocity + m_deltaAngularVelocity;
+	}
+
+	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
+	B3_FORCE_INLINE void internalApplyImpulse(const b3Vector3& linearComponent, const b3Vector3& angularComponent, const b3Scalar impulseMagnitude)
+	{
+		//if (m_originalBody)
+		{
+			m_deltaLinearVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_deltaAngularVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	void writebackVelocity()
+	{
+		//if (m_originalBody>=0)
+		{
+			m_linearVelocity += m_deltaLinearVelocity;
+			m_angularVelocity += m_deltaAngularVelocity;
+
+			//m_originalBody->setCompanionId(-1);
+		}
+	}
+
+	void writebackVelocityAndTransform(b3Scalar timeStep, b3Scalar splitImpulseTurnErp)
+	{
+		(void)timeStep;
+		if (m_originalBody)
+		{
+			m_linearVelocity += m_deltaLinearVelocity;
+			m_angularVelocity += m_deltaAngularVelocity;
+
+			//correct the position/orientation based on push/turn recovery
+			b3Transform newTransform;
+			if (m_pushVelocity[0] != 0.f || m_pushVelocity[1] != 0 || m_pushVelocity[2] != 0 || m_turnVelocity[0] != 0.f || m_turnVelocity[1] != 0 || m_turnVelocity[2] != 0)
+			{
+				//	b3Quaternion orn = m_worldTransform.getRotation();
+				//				b3TransformUtil::integrateTransform(m_worldTransform,m_pushVelocity,m_turnVelocity*splitImpulseTurnErp,timeStep,newTransform);
+				//				m_worldTransform = newTransform;
+			}
+			//m_worldTransform.setRotation(orn);
+			//m_originalBody->setCompanionId(-1);
+		}
+	}
+};
+
+#endif  //B3_SOLVER_BODY_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h
new file mode 100644
index 0000000..7d9eea2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h
@@ -0,0 +1,73 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans http://github.com/erwincoumans/bullet3
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_GPU_SOLVER_CONSTRAINT_H
+#define B3_GPU_SOLVER_CONSTRAINT_H
+
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3Matrix3x3.h"
+//#include "b3JacobianEntry.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+
+//#define NO_FRICTION_TANGENTIALS 1
+
+///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints.
+B3_ATTRIBUTE_ALIGNED16(struct)
+b3GpuSolverConstraint
+{
+	B3_DECLARE_ALIGNED_ALLOCATOR();
+
+	b3Vector3 m_relpos1CrossNormal;
+	b3Vector3 m_contactNormal;
+
+	b3Vector3 m_relpos2CrossNormal;
+	//b3Vector3		m_contactNormal2;//usually m_contactNormal2 == -m_contactNormal
+
+	b3Vector3 m_angularComponentA;
+	b3Vector3 m_angularComponentB;
+
+	mutable b3Scalar m_appliedPushImpulse;
+	mutable b3Scalar m_appliedImpulse;
+	int m_padding1;
+	int m_padding2;
+	b3Scalar m_friction;
+	b3Scalar m_jacDiagABInv;
+	b3Scalar m_rhs;
+	b3Scalar m_cfm;
+
+	b3Scalar m_lowerLimit;
+	b3Scalar m_upperLimit;
+	b3Scalar m_rhsPenetration;
+	union {
+		void* m_originalContactPoint;
+		int m_originalConstraintIndex;
+		b3Scalar m_unusedPadding4;
+	};
+
+	int m_overrideNumSolverIterations;
+	int m_frictionIndex;
+	int m_solverBodyIdA;
+	int m_solverBodyIdB;
+
+	enum b3SolverConstraintType
+	{
+		B3_SOLVER_CONTACT_1D = 0,
+		B3_SOLVER_FRICTION_1D
+	};
+};
+
+typedef b3AlignedObjectArray<b3GpuSolverConstraint> b3GpuConstraintArray;
+
+#endif  //B3_GPU_SOLVER_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.cpp b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.cpp
new file mode 100644
index 0000000..ccf67da
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.cpp
@@ -0,0 +1,1128 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+#include "b3Solver.h"
+
+///useNewBatchingKernel  is a rewritten kernel using just a single thread of the warp, for experiments
+bool useNewBatchingKernel = true;
+bool gConvertConstraintOnCpu = false;
+
+#define B3_SOLVER_SETUP_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl"
+#define B3_SOLVER_SETUP2_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl"
+#define B3_SOLVER_CONTACT_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl"
+#define B3_SOLVER_FRICTION_KERNEL_PATH "src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl"
+#define B3_BATCHING_PATH "src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl"
+#define B3_BATCHING_NEW_PATH "src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl"
+
+#include "Bullet3Dynamics/shared/b3ConvertConstraint4.h"
+
+#include "kernels/solverSetup.h"
+#include "kernels/solverSetup2.h"
+
+#include "kernels/solveContact.h"
+#include "kernels/solveFriction.h"
+
+#include "kernels/batchingKernels.h"
+#include "kernels/batchingKernelsNew.h"
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
+#include "Bullet3Common/b3Vector3.h"
+
+struct SolverDebugInfo
+{
+	int m_valInt0;
+	int m_valInt1;
+	int m_valInt2;
+	int m_valInt3;
+
+	int m_valInt4;
+	int m_valInt5;
+	int m_valInt6;
+	int m_valInt7;
+
+	int m_valInt8;
+	int m_valInt9;
+	int m_valInt10;
+	int m_valInt11;
+
+	int m_valInt12;
+	int m_valInt13;
+	int m_valInt14;
+	int m_valInt15;
+
+	float m_val0;
+	float m_val1;
+	float m_val2;
+	float m_val3;
+};
+
+class SolverDeviceInl
+{
+public:
+	struct ParallelSolveData
+	{
+		b3OpenCLArray<unsigned int>* m_numConstraints;
+		b3OpenCLArray<unsigned int>* m_offsets;
+	};
+};
+
+b3Solver::b3Solver(cl_context ctx, cl_device_id device, cl_command_queue queue, int pairCapacity)
+	: m_context(ctx),
+	  m_device(device),
+	  m_queue(queue),
+	  m_batchSizes(ctx, queue),
+	  m_nIterations(4)
+{
+	m_sort32 = new b3RadixSort32CL(ctx, device, queue);
+	m_scan = new b3PrefixScanCL(ctx, device, queue, B3_SOLVER_N_CELLS);
+	m_search = new b3BoundSearchCL(ctx, device, queue, B3_SOLVER_N_CELLS);
+
+	const int sortSize = B3NEXTMULTIPLEOF(pairCapacity, 512);
+
+	m_sortDataBuffer = new b3OpenCLArray<b3SortData>(ctx, queue, sortSize);
+	m_contactBuffer2 = new b3OpenCLArray<b3Contact4>(ctx, queue);
+
+	m_numConstraints = new b3OpenCLArray<unsigned int>(ctx, queue, B3_SOLVER_N_CELLS);
+	m_numConstraints->resize(B3_SOLVER_N_CELLS);
+
+	m_offsets = new b3OpenCLArray<unsigned int>(ctx, queue, B3_SOLVER_N_CELLS);
+	m_offsets->resize(B3_SOLVER_N_CELLS);
+	const char* additionalMacros = "";
+	//	const char* srcFileNameForCaching="";
+
+	cl_int pErrNum;
+	const char* batchKernelSource = batchingKernelsCL;
+	const char* batchKernelNewSource = batchingKernelsNewCL;
+
+	const char* solverSetupSource = solverSetupCL;
+	const char* solverSetup2Source = solverSetup2CL;
+	const char* solveContactSource = solveContactCL;
+	const char* solveFrictionSource = solveFrictionCL;
+
+	{
+		cl_program solveContactProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solveContactSource, &pErrNum, additionalMacros, B3_SOLVER_CONTACT_KERNEL_PATH);
+		b3Assert(solveContactProg);
+
+		cl_program solveFrictionProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solveFrictionSource, &pErrNum, additionalMacros, B3_SOLVER_FRICTION_KERNEL_PATH);
+		b3Assert(solveFrictionProg);
+
+		cl_program solverSetup2Prog = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solverSetup2Source, &pErrNum, additionalMacros, B3_SOLVER_SETUP2_KERNEL_PATH);
+		b3Assert(solverSetup2Prog);
+
+		cl_program solverSetupProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, solverSetupSource, &pErrNum, additionalMacros, B3_SOLVER_SETUP_KERNEL_PATH);
+		b3Assert(solverSetupProg);
+
+		m_solveFrictionKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solveFrictionSource, "BatchSolveKernelFriction", &pErrNum, solveFrictionProg, additionalMacros);
+		b3Assert(m_solveFrictionKernel);
+
+		m_solveContactKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solveContactSource, "BatchSolveKernelContact", &pErrNum, solveContactProg, additionalMacros);
+		b3Assert(m_solveContactKernel);
+
+		m_contactToConstraintKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetupSource, "ContactToConstraintKernel", &pErrNum, solverSetupProg, additionalMacros);
+		b3Assert(m_contactToConstraintKernel);
+
+		m_setSortDataKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "SetSortDataKernel", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_setSortDataKernel);
+
+		m_reorderContactKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "ReorderContactKernel", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_reorderContactKernel);
+
+		m_copyConstraintKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, solverSetup2Source, "CopyConstraintKernel", &pErrNum, solverSetup2Prog, additionalMacros);
+		b3Assert(m_copyConstraintKernel);
+	}
+
+	{
+		cl_program batchingProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, batchKernelSource, &pErrNum, additionalMacros, B3_BATCHING_PATH);
+		//cl_program batchingProg = b3OpenCLUtils::compileCLProgramFromString( ctx, device, 0, &pErrNum,additionalMacros, B3_BATCHING_PATH,true);
+		b3Assert(batchingProg);
+
+		m_batchingKernel = b3OpenCLUtils::compileCLKernelFromString(ctx, device, batchKernelSource, "CreateBatches", &pErrNum, batchingProg, additionalMacros);
+		b3Assert(m_batchingKernel);
+	}
+	{
+		cl_program batchingNewProg = b3OpenCLUtils::compileCLProgramFromString(ctx, device, batchKernelNewSource, &pErrNum, additionalMacros, B3_BATCHING_NEW_PATH);
+		b3Assert(batchingNewProg);
+
+		m_batchingKernelNew = b3OpenCLUtils::compileCLKernelFromString(ctx, device, batchKernelNewSource, "CreateBatchesNew", &pErrNum, batchingNewProg, additionalMacros);
+		//m_batchingKernelNew = b3OpenCLUtils::compileCLKernelFromString( ctx, device, batchKernelNewSource, "CreateBatchesBruteForce", &pErrNum, batchingNewProg,additionalMacros );
+		b3Assert(m_batchingKernelNew);
+	}
+}
+
+b3Solver::~b3Solver()
+{
+	delete m_offsets;
+	delete m_numConstraints;
+	delete m_sortDataBuffer;
+	delete m_contactBuffer2;
+
+	delete m_sort32;
+	delete m_scan;
+	delete m_search;
+
+	clReleaseKernel(m_batchingKernel);
+	clReleaseKernel(m_batchingKernelNew);
+
+	clReleaseKernel(m_solveContactKernel);
+	clReleaseKernel(m_solveFrictionKernel);
+
+	clReleaseKernel(m_contactToConstraintKernel);
+	clReleaseKernel(m_setSortDataKernel);
+	clReleaseKernel(m_reorderContactKernel);
+	clReleaseKernel(m_copyConstraintKernel);
+}
+
+template <bool JACOBI>
+static __inline void solveContact(b3GpuConstraint4& cs,
+								  const b3Vector3& posA, b3Vector3& linVelA, b3Vector3& angVelA, float invMassA, const b3Matrix3x3& invInertiaA,
+								  const b3Vector3& posB, b3Vector3& linVelB, b3Vector3& angVelB, float invMassB, const b3Matrix3x3& invInertiaB,
+								  float maxRambdaDt[4], float minRambdaDt[4])
+{
+	b3Vector3 dLinVelA;
+	dLinVelA.setZero();
+	b3Vector3 dAngVelA;
+	dAngVelA.setZero();
+	b3Vector3 dLinVelB;
+	dLinVelB.setZero();
+	b3Vector3 dAngVelB;
+	dAngVelB.setZero();
+
+	for (int ic = 0; ic < 4; ic++)
+	{
+		//	dont necessary because this makes change to 0
+		if (cs.m_jacCoeffInv[ic] == 0.f) continue;
+
+		{
+			b3Vector3 angular0, angular1, linear;
+			b3Vector3 r0 = cs.m_worldPos[ic] - (b3Vector3&)posA;
+			b3Vector3 r1 = cs.m_worldPos[ic] - (b3Vector3&)posB;
+			setLinearAndAngular((const b3Vector3&)cs.m_linear, (const b3Vector3&)r0, (const b3Vector3&)r1, &linear, &angular0, &angular1);
+
+			float rambdaDt = calcRelVel((const b3Vector3&)cs.m_linear, (const b3Vector3&)-cs.m_linear, angular0, angular1,
+										linVelA, angVelA, linVelB, angVelB) +
+							 cs.m_b[ic];
+			rambdaDt *= cs.m_jacCoeffInv[ic];
+
+			{
+				float prevSum = cs.m_appliedRambdaDt[ic];
+				float updated = prevSum;
+				updated += rambdaDt;
+				updated = b3Max(updated, minRambdaDt[ic]);
+				updated = b3Min(updated, maxRambdaDt[ic]);
+				rambdaDt = updated - prevSum;
+				cs.m_appliedRambdaDt[ic] = updated;
+			}
+
+			b3Vector3 linImp0 = invMassA * linear * rambdaDt;
+			b3Vector3 linImp1 = invMassB * (-linear) * rambdaDt;
+			b3Vector3 angImp0 = (invInertiaA * angular0) * rambdaDt;
+			b3Vector3 angImp1 = (invInertiaB * angular1) * rambdaDt;
+#ifdef _WIN32
+			b3Assert(_finite(linImp0.getX()));
+			b3Assert(_finite(linImp1.getX()));
+#endif
+			if (JACOBI)
+			{
+				dLinVelA += linImp0;
+				dAngVelA += angImp0;
+				dLinVelB += linImp1;
+				dAngVelB += angImp1;
+			}
+			else
+			{
+				linVelA += linImp0;
+				angVelA += angImp0;
+				linVelB += linImp1;
+				angVelB += angImp1;
+			}
+		}
+	}
+
+	if (JACOBI)
+	{
+		linVelA += dLinVelA;
+		angVelA += dAngVelA;
+		linVelB += dLinVelB;
+		angVelB += dAngVelB;
+	}
+}
+
+static __inline void solveFriction(b3GpuConstraint4& cs,
+								   const b3Vector3& posA, b3Vector3& linVelA, b3Vector3& angVelA, float invMassA, const b3Matrix3x3& invInertiaA,
+								   const b3Vector3& posB, b3Vector3& linVelB, b3Vector3& angVelB, float invMassB, const b3Matrix3x3& invInertiaB,
+								   float maxRambdaDt[4], float minRambdaDt[4])
+{
+	if (cs.m_fJacCoeffInv[0] == 0 && cs.m_fJacCoeffInv[0] == 0) return;
+	const b3Vector3& center = (const b3Vector3&)cs.m_center;
+
+	b3Vector3 n = -(const b3Vector3&)cs.m_linear;
+
+	b3Vector3 tangent[2];
+#if 1
+	b3PlaneSpace1(n, tangent[0], tangent[1]);
+#else
+	b3Vector3 r = cs.m_worldPos[0] - center;
+	tangent[0] = cross3(n, r);
+	tangent[1] = cross3(tangent[0], n);
+	tangent[0] = normalize3(tangent[0]);
+	tangent[1] = normalize3(tangent[1]);
+#endif
+
+	b3Vector3 angular0, angular1, linear;
+	b3Vector3 r0 = center - posA;
+	b3Vector3 r1 = center - posB;
+	for (int i = 0; i < 2; i++)
+	{
+		setLinearAndAngular(tangent[i], r0, r1, &linear, &angular0, &angular1);
+		float rambdaDt = calcRelVel(linear, -linear, angular0, angular1,
+									linVelA, angVelA, linVelB, angVelB);
+		rambdaDt *= cs.m_fJacCoeffInv[i];
+
+		{
+			float prevSum = cs.m_fAppliedRambdaDt[i];
+			float updated = prevSum;
+			updated += rambdaDt;
+			updated = b3Max(updated, minRambdaDt[i]);
+			updated = b3Min(updated, maxRambdaDt[i]);
+			rambdaDt = updated - prevSum;
+			cs.m_fAppliedRambdaDt[i] = updated;
+		}
+
+		b3Vector3 linImp0 = invMassA * linear * rambdaDt;
+		b3Vector3 linImp1 = invMassB * (-linear) * rambdaDt;
+		b3Vector3 angImp0 = (invInertiaA * angular0) * rambdaDt;
+		b3Vector3 angImp1 = (invInertiaB * angular1) * rambdaDt;
+#ifdef _WIN32
+		b3Assert(_finite(linImp0.getX()));
+		b3Assert(_finite(linImp1.getX()));
+#endif
+		linVelA += linImp0;
+		angVelA += angImp0;
+		linVelB += linImp1;
+		angVelB += angImp1;
+	}
+
+	{  //	angular damping for point constraint
+		b3Vector3 ab = (posB - posA).normalized();
+		b3Vector3 ac = (center - posA).normalized();
+		if (b3Dot(ab, ac) > 0.95f || (invMassA == 0.f || invMassB == 0.f))
+		{
+			float angNA = b3Dot(n, angVelA);
+			float angNB = b3Dot(n, angVelB);
+
+			angVelA -= (angNA * 0.1f) * n;
+			angVelB -= (angNB * 0.1f) * n;
+		}
+	}
+}
+/*
+ b3AlignedObjectArray<b3RigidBodyData>& m_bodies;
+	b3AlignedObjectArray<b3InertiaData>& m_shapes;
+	b3AlignedObjectArray<b3GpuConstraint4>& m_constraints;
+	b3AlignedObjectArray<int>* m_batchSizes;
+	int m_cellIndex;
+	int m_curWgidx;
+	int m_start;
+	int m_nConstraints;
+	bool m_solveFriction;
+	int m_maxNumBatches;
+ */
+
+struct SolveTask  // : public ThreadPool::Task
+{
+	SolveTask(b3AlignedObjectArray<b3RigidBodyData>& bodies, b3AlignedObjectArray<b3InertiaData>& shapes, b3AlignedObjectArray<b3GpuConstraint4>& constraints,
+			  int start, int nConstraints, int maxNumBatches, b3AlignedObjectArray<int>* wgUsedBodies, int curWgidx, b3AlignedObjectArray<int>* batchSizes, int cellIndex)
+		: m_bodies(bodies), m_shapes(shapes), m_constraints(constraints), m_batchSizes(batchSizes), m_cellIndex(cellIndex), m_curWgidx(curWgidx), m_start(start), m_nConstraints(nConstraints), m_solveFriction(true), m_maxNumBatches(maxNumBatches)
+	{
+	}
+
+	unsigned short int getType() { return 0; }
+
+	void run(int tIdx)
+	{
+		int offset = 0;
+		for (int ii = 0; ii < B3_MAX_NUM_BATCHES; ii++)
+		{
+			int numInBatch = m_batchSizes->at(m_cellIndex * B3_MAX_NUM_BATCHES + ii);
+			if (!numInBatch)
+				break;
+
+			for (int jj = 0; jj < numInBatch; jj++)
+			{
+				int i = m_start + offset + jj;
+				int batchId = m_constraints[i].m_batchIdx;
+				b3Assert(batchId == ii);
+				float frictionCoeff = m_constraints[i].getFrictionCoeff();
+				int aIdx = (int)m_constraints[i].m_bodyA;
+				int bIdx = (int)m_constraints[i].m_bodyB;
+				//				int localBatch = m_constraints[i].m_batchIdx;
+				b3RigidBodyData& bodyA = m_bodies[aIdx];
+				b3RigidBodyData& bodyB = m_bodies[bIdx];
+
+				if (!m_solveFriction)
+				{
+					float maxRambdaDt[4] = {FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX};
+					float minRambdaDt[4] = {0.f, 0.f, 0.f, 0.f};
+
+					solveContact<false>(m_constraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, (const b3Matrix3x3&)m_shapes[aIdx].m_invInertiaWorld,
+										(b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, (const b3Matrix3x3&)m_shapes[bIdx].m_invInertiaWorld,
+										maxRambdaDt, minRambdaDt);
+				}
+				else
+				{
+					float maxRambdaDt[4] = {FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX};
+					float minRambdaDt[4] = {0.f, 0.f, 0.f, 0.f};
+					float sum = 0;
+					for (int j = 0; j < 4; j++)
+					{
+						sum += m_constraints[i].m_appliedRambdaDt[j];
+					}
+					frictionCoeff = 0.7f;
+					for (int j = 0; j < 4; j++)
+					{
+						maxRambdaDt[j] = frictionCoeff * sum;
+						minRambdaDt[j] = -maxRambdaDt[j];
+					}
+					solveFriction(m_constraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, (const b3Matrix3x3&)m_shapes[aIdx].m_invInertiaWorld,
+								  (b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, (const b3Matrix3x3&)m_shapes[bIdx].m_invInertiaWorld,
+								  maxRambdaDt, minRambdaDt);
+				}
+			}
+			offset += numInBatch;
+		}
+		/*		for (int bb=0;bb<m_maxNumBatches;bb++)
+		{
+			//for(int ic=m_nConstraints-1; ic>=0; ic--)
+			for(int ic=0; ic<m_nConstraints; ic++)
+			{
+				
+				int i = m_start + ic;
+				if (m_constraints[i].m_batchIdx != bb)
+					continue;
+
+				float frictionCoeff = m_constraints[i].getFrictionCoeff();
+				int aIdx = (int)m_constraints[i].m_bodyA;
+				int bIdx = (int)m_constraints[i].m_bodyB;
+				int localBatch = m_constraints[i].m_batchIdx;
+				b3RigidBodyData& bodyA = m_bodies[aIdx];
+				b3RigidBodyData& bodyB = m_bodies[bIdx];
+
+				if( !m_solveFriction )
+				{
+					float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};
+					float minRambdaDt[4] = {0.f,0.f,0.f,0.f};
+
+					solveContact<false>( m_constraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass, (const b3Matrix3x3 &)m_shapes[aIdx].m_invInertiaWorld, 
+							(b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass, (const b3Matrix3x3 &)m_shapes[bIdx].m_invInertiaWorld,
+						maxRambdaDt, minRambdaDt );
+				}
+				else
+				{
+					float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};
+					float minRambdaDt[4] = {0.f,0.f,0.f,0.f};
+					float sum = 0;
+					for(int j=0; j<4; j++)
+					{
+						sum +=m_constraints[i].m_appliedRambdaDt[j];
+					}
+					frictionCoeff = 0.7f;
+					for(int j=0; j<4; j++)
+					{
+						maxRambdaDt[j] = frictionCoeff*sum;
+						minRambdaDt[j] = -maxRambdaDt[j];
+					}
+					solveFriction( m_constraints[i], (b3Vector3&)bodyA.m_pos, (b3Vector3&)bodyA.m_linVel, (b3Vector3&)bodyA.m_angVel, bodyA.m_invMass,(const b3Matrix3x3 &) m_shapes[aIdx].m_invInertiaWorld, 
+						(b3Vector3&)bodyB.m_pos, (b3Vector3&)bodyB.m_linVel, (b3Vector3&)bodyB.m_angVel, bodyB.m_invMass,(const b3Matrix3x3 &) m_shapes[bIdx].m_invInertiaWorld,
+						maxRambdaDt, minRambdaDt );
+			
+				}
+			}
+		}
+		*/
+	}
+
+	b3AlignedObjectArray<b3RigidBodyData>& m_bodies;
+	b3AlignedObjectArray<b3InertiaData>& m_shapes;
+	b3AlignedObjectArray<b3GpuConstraint4>& m_constraints;
+	b3AlignedObjectArray<int>* m_batchSizes;
+	int m_cellIndex;
+	int m_curWgidx;
+	int m_start;
+	int m_nConstraints;
+	bool m_solveFriction;
+	int m_maxNumBatches;
+};
+
+void b3Solver::solveContactConstraintHost(b3OpenCLArray<b3RigidBodyData>* bodyBuf, b3OpenCLArray<b3InertiaData>* shapeBuf,
+										  b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches, b3AlignedObjectArray<int>* batchSizes)
+{
+#if 0
+	{	
+		int nSplitX = B3_SOLVER_N_SPLIT_X;
+		int nSplitY = B3_SOLVER_N_SPLIT_Y;
+		int numWorkgroups = B3_SOLVER_N_CELLS/B3_SOLVER_N_BATCHES;
+		for (int z=0;z<4;z++)
+		{
+			for (int y=0;y<4;y++)
+			{
+				for (int x=0;x<4;x++)
+				{
+					int newIndex = (x+y*nSplitX+z*nSplitX*nSplitY);
+				//	printf("newIndex=%d\n",newIndex);
+
+					int zIdx = newIndex/(nSplitX*nSplitY);
+					int remain = newIndex%(nSplitX*nSplitY);
+					int yIdx = remain/nSplitX;
+					int xIdx = remain%nSplitX;
+				//	printf("newIndex=%d\n",newIndex);
+				}
+			}
+		}
+
+		//for (int wgIdx=numWorkgroups-1;wgIdx>=0;wgIdx--)
+		for (int cellBatch=0;cellBatch<B3_SOLVER_N_BATCHES;cellBatch++)
+		{
+			for (int wgIdx=0;wgIdx<numWorkgroups;wgIdx++)
+			{
+				int zIdx = (wgIdx/((nSplitX*nSplitY)/4))*2+((cellBatch&4)>>2);
+				int remain= (wgIdx%((nSplitX*nSplitY)/4));
+				int yIdx = (remain/(nSplitX/2))*2 + ((cellBatch&2)>>1);
+				int xIdx = (remain%(nSplitX/2))*2 + (cellBatch&1);
+				
+				/*int zIdx = newIndex/(nSplitX*nSplitY);
+				int remain = newIndex%(nSplitX*nSplitY);
+				int yIdx = remain/nSplitX;
+				int xIdx = remain%nSplitX;
+				*/
+				int cellIdx = xIdx+yIdx*nSplitX+zIdx*(nSplitX*nSplitY);
+			//	printf("wgIdx %d: xIdx=%d, yIdx=%d, zIdx=%d, cellIdx=%d, cell Batch %d\n",wgIdx,xIdx,yIdx,zIdx,cellIdx,cellBatch);
+			}
+		}
+	}
+#endif
+
+	b3AlignedObjectArray<b3RigidBodyData> bodyNative;
+	bodyBuf->copyToHost(bodyNative);
+	b3AlignedObjectArray<b3InertiaData> shapeNative;
+	shapeBuf->copyToHost(shapeNative);
+	b3AlignedObjectArray<b3GpuConstraint4> constraintNative;
+	constraint->copyToHost(constraintNative);
+
+	b3AlignedObjectArray<unsigned int> numConstraintsHost;
+	m_numConstraints->copyToHost(numConstraintsHost);
+
+	//printf("------------------------\n");
+	b3AlignedObjectArray<unsigned int> offsetsHost;
+	m_offsets->copyToHost(offsetsHost);
+	static int frame = 0;
+	bool useBatches = true;
+	if (useBatches)
+	{
+		for (int iter = 0; iter < m_nIterations; iter++)
+		{
+			for (int cellBatch = 0; cellBatch < B3_SOLVER_N_BATCHES; cellBatch++)
+			{
+				int nSplitX = B3_SOLVER_N_SPLIT_X;
+				int nSplitY = B3_SOLVER_N_SPLIT_Y;
+				int numWorkgroups = B3_SOLVER_N_CELLS / B3_SOLVER_N_BATCHES;
+				//printf("cell Batch %d\n",cellBatch);
+				b3AlignedObjectArray<int> usedBodies[B3_SOLVER_N_CELLS];
+				for (int i = 0; i < B3_SOLVER_N_CELLS; i++)
+				{
+					usedBodies[i].resize(0);
+				}
+
+				//for (int wgIdx=numWorkgroups-1;wgIdx>=0;wgIdx--)
+				for (int wgIdx = 0; wgIdx < numWorkgroups; wgIdx++)
+				{
+					int zIdx = (wgIdx / ((nSplitX * nSplitY) / 4)) * 2 + ((cellBatch & 4) >> 2);
+					int remain = (wgIdx % ((nSplitX * nSplitY) / 4));
+					int yIdx = (remain / (nSplitX / 2)) * 2 + ((cellBatch & 2) >> 1);
+					int xIdx = (remain % (nSplitX / 2)) * 2 + (cellBatch & 1);
+					int cellIdx = xIdx + yIdx * nSplitX + zIdx * (nSplitX * nSplitY);
+
+					if (numConstraintsHost[cellIdx] == 0)
+						continue;
+
+					//printf("wgIdx %d: xIdx=%d, yIdx=%d, zIdx=%d, cellIdx=%d, cell Batch %d\n",wgIdx,xIdx,yIdx,zIdx,cellIdx,cellBatch);
+					//printf("cell %d has %d constraints\n", cellIdx,numConstraintsHost[cellIdx]);
+					if (zIdx)
+					{
+						//printf("?\n");
+					}
+
+					if (iter == 0)
+					{
+						//printf("frame=%d, Cell xIdx=%x, yIdx=%d ",frame, xIdx,yIdx);
+						//printf("cellBatch=%d, wgIdx=%d, #constraints in cell=%d\n",cellBatch,wgIdx,numConstraintsHost[cellIdx]);
+					}
+					const int start = offsetsHost[cellIdx];
+					int numConstraintsInCell = numConstraintsHost[cellIdx];
+					//				const int end = start + numConstraintsInCell;
+
+					SolveTask task(bodyNative, shapeNative, constraintNative, start, numConstraintsInCell, maxNumBatches, usedBodies, wgIdx, batchSizes, cellIdx);
+					task.m_solveFriction = false;
+					task.run(0);
+				}
+			}
+		}
+
+		for (int iter = 0; iter < m_nIterations; iter++)
+		{
+			for (int cellBatch = 0; cellBatch < B3_SOLVER_N_BATCHES; cellBatch++)
+			{
+				int nSplitX = B3_SOLVER_N_SPLIT_X;
+				int nSplitY = B3_SOLVER_N_SPLIT_Y;
+
+				int numWorkgroups = B3_SOLVER_N_CELLS / B3_SOLVER_N_BATCHES;
+
+				for (int wgIdx = 0; wgIdx < numWorkgroups; wgIdx++)
+				{
+					int zIdx = (wgIdx / ((nSplitX * nSplitY) / 4)) * 2 + ((cellBatch & 4) >> 2);
+					int remain = (wgIdx % ((nSplitX * nSplitY) / 4));
+					int yIdx = (remain / (nSplitX / 2)) * 2 + ((cellBatch & 2) >> 1);
+					int xIdx = (remain % (nSplitX / 2)) * 2 + (cellBatch & 1);
+
+					int cellIdx = xIdx + yIdx * nSplitX + zIdx * (nSplitX * nSplitY);
+
+					if (numConstraintsHost[cellIdx] == 0)
+						continue;
+
+					//printf("yIdx=%d\n",yIdx);
+
+					const int start = offsetsHost[cellIdx];
+					int numConstraintsInCell = numConstraintsHost[cellIdx];
+					//				const int end = start + numConstraintsInCell;
+
+					SolveTask task(bodyNative, shapeNative, constraintNative, start, numConstraintsInCell, maxNumBatches, 0, 0, batchSizes, cellIdx);
+					task.m_solveFriction = true;
+					task.run(0);
+				}
+			}
+		}
+	}
+	else
+	{
+		for (int iter = 0; iter < m_nIterations; iter++)
+		{
+			SolveTask task(bodyNative, shapeNative, constraintNative, 0, n, maxNumBatches, 0, 0, 0, 0);
+			task.m_solveFriction = false;
+			task.run(0);
+		}
+
+		for (int iter = 0; iter < m_nIterations; iter++)
+		{
+			SolveTask task(bodyNative, shapeNative, constraintNative, 0, n, maxNumBatches, 0, 0, 0, 0);
+			task.m_solveFriction = true;
+			task.run(0);
+		}
+	}
+
+	bodyBuf->copyFromHost(bodyNative);
+	shapeBuf->copyFromHost(shapeNative);
+	constraint->copyFromHost(constraintNative);
+	frame++;
+}
+
+void checkConstraintBatch(const b3OpenCLArray<b3RigidBodyData>* bodyBuf,
+						  const b3OpenCLArray<b3InertiaData>* shapeBuf,
+						  b3OpenCLArray<b3GpuConstraint4>* constraint,
+						  b3OpenCLArray<unsigned int>* m_numConstraints,
+						  b3OpenCLArray<unsigned int>* m_offsets,
+						  int batchId)
+{
+	//						b3BufferInfoCL( m_numConstraints->getBufferCL() ),
+	//						b3BufferInfoCL( m_offsets->getBufferCL() )
+
+	int cellBatch = batchId;
+	const int nn = B3_SOLVER_N_CELLS;
+	//	int numWorkItems = 64*nn/B3_SOLVER_N_BATCHES;
+
+	b3AlignedObjectArray<unsigned int> gN;
+	m_numConstraints->copyToHost(gN);
+	b3AlignedObjectArray<unsigned int> gOffsets;
+	m_offsets->copyToHost(gOffsets);
+	int nSplitX = B3_SOLVER_N_SPLIT_X;
+	int nSplitY = B3_SOLVER_N_SPLIT_Y;
+
+	//	int bIdx = batchId;
+
+	b3AlignedObjectArray<b3GpuConstraint4> cpuConstraints;
+	constraint->copyToHost(cpuConstraints);
+
+	printf("batch = %d\n", batchId);
+
+	int numWorkgroups = nn / B3_SOLVER_N_BATCHES;
+	b3AlignedObjectArray<int> usedBodies;
+
+	for (int wgIdx = 0; wgIdx < numWorkgroups; wgIdx++)
+	{
+		printf("wgIdx = %d           ", wgIdx);
+
+		int zIdx = (wgIdx / ((nSplitX * nSplitY)) / 2) * 2 + ((cellBatch & 4) >> 2);
+		int remain = wgIdx % ((nSplitX * nSplitY));
+		int yIdx = (remain % (nSplitX / 2)) * 2 + ((cellBatch & 2) >> 1);
+		int xIdx = (remain / (nSplitX / 2)) * 2 + (cellBatch & 1);
+
+		int cellIdx = xIdx + yIdx * nSplitX + zIdx * (nSplitX * nSplitY);
+		printf("cellIdx=%d\n", cellIdx);
+		if (gN[cellIdx] == 0)
+			continue;
+
+		const int start = gOffsets[cellIdx];
+		const int end = start + gN[cellIdx];
+
+		for (int c = start; c < end; c++)
+		{
+			b3GpuConstraint4& constraint = cpuConstraints[c];
+			//printf("constraint (%d,%d)\n", constraint.m_bodyA,constraint.m_bodyB);
+			if (usedBodies.findLinearSearch(constraint.m_bodyA) < usedBodies.size())
+			{
+				printf("error?\n");
+			}
+			if (usedBodies.findLinearSearch(constraint.m_bodyB) < usedBodies.size())
+			{
+				printf("error?\n");
+			}
+		}
+
+		for (int c = start; c < end; c++)
+		{
+			b3GpuConstraint4& constraint = cpuConstraints[c];
+			usedBodies.push_back(constraint.m_bodyA);
+			usedBodies.push_back(constraint.m_bodyB);
+		}
+	}
+}
+
+static bool verify = false;
+
+void b3Solver::solveContactConstraint(const b3OpenCLArray<b3RigidBodyData>* bodyBuf, const b3OpenCLArray<b3InertiaData>* shapeBuf,
+									  b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches)
+{
+	b3Int4 cdata = b3MakeInt4(n, 0, 0, 0);
+	{
+		const int nn = B3_SOLVER_N_CELLS;
+
+		cdata.x = 0;
+		cdata.y = maxNumBatches;  //250;
+
+		int numWorkItems = 64 * nn / B3_SOLVER_N_BATCHES;
+#ifdef DEBUG_ME
+		SolverDebugInfo* debugInfo = new SolverDebugInfo[numWorkItems];
+		adl::b3OpenCLArray<SolverDebugInfo> gpuDebugInfo(data->m_device, numWorkItems);
+#endif
+
+		{
+			B3_PROFILE("m_batchSolveKernel iterations");
+			for (int iter = 0; iter < m_nIterations; iter++)
+			{
+				for (int ib = 0; ib < B3_SOLVER_N_BATCHES; ib++)
+				{
+					if (verify)
+					{
+						checkConstraintBatch(bodyBuf, shapeBuf, constraint, m_numConstraints, m_offsets, ib);
+					}
+
+#ifdef DEBUG_ME
+					memset(debugInfo, 0, sizeof(SolverDebugInfo) * numWorkItems);
+					gpuDebugInfo.write(debugInfo, numWorkItems);
+#endif
+
+					cdata.z = ib;
+
+					b3LauncherCL launcher(m_queue, m_solveContactKernel, "m_solveContactKernel");
+#if 1
+
+					b3BufferInfoCL bInfo[] = {
+
+						b3BufferInfoCL(bodyBuf->getBufferCL()),
+						b3BufferInfoCL(shapeBuf->getBufferCL()),
+						b3BufferInfoCL(constraint->getBufferCL()),
+						b3BufferInfoCL(m_numConstraints->getBufferCL()),
+						b3BufferInfoCL(m_offsets->getBufferCL())
+#ifdef DEBUG_ME
+							,
+						b3BufferInfoCL(&gpuDebugInfo)
+#endif
+					};
+
+					launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+					//launcher.setConst(  cdata.x );
+					launcher.setConst(cdata.y);
+					launcher.setConst(cdata.z);
+					b3Int4 nSplit;
+					nSplit.x = B3_SOLVER_N_SPLIT_X;
+					nSplit.y = B3_SOLVER_N_SPLIT_Y;
+					nSplit.z = B3_SOLVER_N_SPLIT_Z;
+
+					launcher.setConst(nSplit);
+					launcher.launch1D(numWorkItems, 64);
+
+#else
+					const char* fileName = "m_batchSolveKernel.bin";
+					FILE* f = fopen(fileName, "rb");
+					if (f)
+					{
+						int sizeInBytes = 0;
+						if (fseek(f, 0, SEEK_END) || (sizeInBytes = ftell(f)) == EOF || fseek(f, 0, SEEK_SET))
+						{
+							printf("error, cannot get file size\n");
+							exit(0);
+						}
+
+						unsigned char* buf = (unsigned char*)malloc(sizeInBytes);
+						fread(buf, sizeInBytes, 1, f);
+						int serializedBytes = launcher.deserializeArgs(buf, sizeInBytes, m_context);
+						int num = *(int*)&buf[serializedBytes];
+
+						launcher.launch1D(num);
+
+						//this clFinish is for testing on errors
+						clFinish(m_queue);
+					}
+
+#endif
+
+#ifdef DEBUG_ME
+					clFinish(m_queue);
+					gpuDebugInfo.read(debugInfo, numWorkItems);
+					clFinish(m_queue);
+					for (int i = 0; i < numWorkItems; i++)
+					{
+						if (debugInfo[i].m_valInt2 > 0)
+						{
+							printf("debugInfo[i].m_valInt2 = %d\n", i, debugInfo[i].m_valInt2);
+						}
+
+						if (debugInfo[i].m_valInt3 > 0)
+						{
+							printf("debugInfo[i].m_valInt3 = %d\n", i, debugInfo[i].m_valInt3);
+						}
+					}
+#endif  //DEBUG_ME
+				}
+			}
+
+			clFinish(m_queue);
+		}
+
+		cdata.x = 1;
+		bool applyFriction = true;
+		if (applyFriction)
+		{
+			B3_PROFILE("m_batchSolveKernel iterations2");
+			for (int iter = 0; iter < m_nIterations; iter++)
+			{
+				for (int ib = 0; ib < B3_SOLVER_N_BATCHES; ib++)
+				{
+					cdata.z = ib;
+
+					b3BufferInfoCL bInfo[] = {
+						b3BufferInfoCL(bodyBuf->getBufferCL()),
+						b3BufferInfoCL(shapeBuf->getBufferCL()),
+						b3BufferInfoCL(constraint->getBufferCL()),
+						b3BufferInfoCL(m_numConstraints->getBufferCL()),
+						b3BufferInfoCL(m_offsets->getBufferCL())
+#ifdef DEBUG_ME
+							,
+						b3BufferInfoCL(&gpuDebugInfo)
+#endif  //DEBUG_ME
+					};
+					b3LauncherCL launcher(m_queue, m_solveFrictionKernel, "m_solveFrictionKernel");
+					launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+					//launcher.setConst(  cdata.x );
+					launcher.setConst(cdata.y);
+					launcher.setConst(cdata.z);
+					b3Int4 nSplit;
+					nSplit.x = B3_SOLVER_N_SPLIT_X;
+					nSplit.y = B3_SOLVER_N_SPLIT_Y;
+					nSplit.z = B3_SOLVER_N_SPLIT_Z;
+
+					launcher.setConst(nSplit);
+
+					launcher.launch1D(64 * nn / B3_SOLVER_N_BATCHES, 64);
+				}
+			}
+			clFinish(m_queue);
+		}
+#ifdef DEBUG_ME
+		delete[] debugInfo;
+#endif  //DEBUG_ME
+	}
+}
+
+void b3Solver::convertToConstraints(const b3OpenCLArray<b3RigidBodyData>* bodyBuf,
+									const b3OpenCLArray<b3InertiaData>* shapeBuf,
+									b3OpenCLArray<b3Contact4>* contactsIn, b3OpenCLArray<b3GpuConstraint4>* contactCOut, void* additionalData,
+									int nContacts, const ConstraintCfg& cfg)
+{
+	//	b3OpenCLArray<b3GpuConstraint4>* constraintNative =0;
+	contactCOut->resize(nContacts);
+	struct CB
+	{
+		int m_nContacts;
+		float m_dt;
+		float m_positionDrift;
+		float m_positionConstraintCoeff;
+	};
+
+	{
+		CB cdata;
+		cdata.m_nContacts = nContacts;
+		cdata.m_dt = cfg.m_dt;
+		cdata.m_positionDrift = cfg.m_positionDrift;
+		cdata.m_positionConstraintCoeff = cfg.m_positionConstraintCoeff;
+
+		if (gConvertConstraintOnCpu)
+		{
+			b3AlignedObjectArray<b3RigidBodyData> gBodies;
+			bodyBuf->copyToHost(gBodies);
+
+			b3AlignedObjectArray<b3Contact4> gContact;
+			contactsIn->copyToHost(gContact);
+
+			b3AlignedObjectArray<b3InertiaData> gShapes;
+			shapeBuf->copyToHost(gShapes);
+
+			b3AlignedObjectArray<b3GpuConstraint4> gConstraintOut;
+			gConstraintOut.resize(nContacts);
+
+			B3_PROFILE("cpu contactToConstraintKernel");
+			for (int gIdx = 0; gIdx < nContacts; gIdx++)
+			{
+				int aIdx = abs(gContact[gIdx].m_bodyAPtrAndSignBit);
+				int bIdx = abs(gContact[gIdx].m_bodyBPtrAndSignBit);
+
+				b3Float4 posA = gBodies[aIdx].m_pos;
+				b3Float4 linVelA = gBodies[aIdx].m_linVel;
+				b3Float4 angVelA = gBodies[aIdx].m_angVel;
+				float invMassA = gBodies[aIdx].m_invMass;
+				b3Mat3x3 invInertiaA = gShapes[aIdx].m_initInvInertia;
+
+				b3Float4 posB = gBodies[bIdx].m_pos;
+				b3Float4 linVelB = gBodies[bIdx].m_linVel;
+				b3Float4 angVelB = gBodies[bIdx].m_angVel;
+				float invMassB = gBodies[bIdx].m_invMass;
+				b3Mat3x3 invInertiaB = gShapes[bIdx].m_initInvInertia;
+
+				b3ContactConstraint4_t cs;
+
+				setConstraint4(posA, linVelA, angVelA, invMassA, invInertiaA, posB, linVelB, angVelB, invMassB, invInertiaB,
+							   &gContact[gIdx], cdata.m_dt, cdata.m_positionDrift, cdata.m_positionConstraintCoeff,
+							   &cs);
+
+				cs.m_batchIdx = gContact[gIdx].m_batchIdx;
+
+				gConstraintOut[gIdx] = (b3GpuConstraint4&)cs;
+			}
+
+			contactCOut->copyFromHost(gConstraintOut);
+		}
+		else
+		{
+			B3_PROFILE("gpu m_contactToConstraintKernel");
+
+			b3BufferInfoCL bInfo[] = {b3BufferInfoCL(contactsIn->getBufferCL()), b3BufferInfoCL(bodyBuf->getBufferCL()), b3BufferInfoCL(shapeBuf->getBufferCL()),
+									  b3BufferInfoCL(contactCOut->getBufferCL())};
+			b3LauncherCL launcher(m_queue, m_contactToConstraintKernel, "m_contactToConstraintKernel");
+			launcher.setBuffers(bInfo, sizeof(bInfo) / sizeof(b3BufferInfoCL));
+			//launcher.setConst(  cdata );
+
+			launcher.setConst(cdata.m_nContacts);
+			launcher.setConst(cdata.m_dt);
+			launcher.setConst(cdata.m_positionDrift);
+			launcher.setConst(cdata.m_positionConstraintCoeff);
+
+			launcher.launch1D(nContacts, 64);
+			clFinish(m_queue);
+		}
+	}
+}
+
+/*
+void b3Solver::sortContacts(  const b3OpenCLArray<b3RigidBodyData>* bodyBuf, 
+			b3OpenCLArray<b3Contact4>* contactsIn, void* additionalData, 
+			int nContacts, const b3Solver::ConstraintCfg& cfg )
+{
+	
+	
+
+	const int sortAlignment = 512; // todo. get this out of sort
+	if( cfg.m_enableParallelSolve )
+	{
+		
+
+		int sortSize = NEXTMULTIPLEOF( nContacts, sortAlignment );
+
+		b3OpenCLArray<unsigned int>* countsNative = m_numConstraints;//BufferUtils::map<TYPE_CL, false>( data->m_device, &countsHost );
+		b3OpenCLArray<unsigned int>* offsetsNative = m_offsets;//BufferUtils::map<TYPE_CL, false>( data->m_device, &offsetsHost );
+
+		{	//	2. set cell idx
+			struct CB
+			{
+				int m_nContacts;
+				int m_staticIdx;
+				float m_scale;
+				int m_nSplit;
+			};
+
+			b3Assert( sortSize%64 == 0 );
+			CB cdata;
+			cdata.m_nContacts = nContacts;
+			cdata.m_staticIdx = cfg.m_staticIdx;
+			cdata.m_scale = 1.f/(N_OBJ_PER_SPLIT*cfg.m_averageExtent);
+			cdata.m_nSplit = B3_SOLVER_N_SPLIT;
+
+			
+			b3BufferInfoCL bInfo[] = { b3BufferInfoCL( contactsIn->getBufferCL() ), b3BufferInfoCL( bodyBuf->getBufferCL() ), b3BufferInfoCL( m_sortDataBuffer->getBufferCL() ) };
+			b3LauncherCL launcher( m_queue, m_setSortDataKernel );
+			launcher.setBuffers( bInfo, sizeof(bInfo)/sizeof(b3BufferInfoCL) );
+			launcher.setConst(  cdata );
+			launcher.launch1D( sortSize, 64 );
+		}
+
+		{	//	3. sort by cell idx
+			int n = B3_SOLVER_N_SPLIT*B3_SOLVER_N_SPLIT;
+			int sortBit = 32;
+			//if( n <= 0xffff ) sortBit = 16;
+			//if( n <= 0xff ) sortBit = 8;
+			m_sort32->execute(*m_sortDataBuffer,sortSize);
+		}
+		{	//	4. find entries
+			m_search->execute( *m_sortDataBuffer, nContacts, *countsNative, B3_SOLVER_N_SPLIT*B3_SOLVER_N_SPLIT, b3BoundSearchCL::COUNT);
+
+			m_scan->execute( *countsNative, *offsetsNative, B3_SOLVER_N_SPLIT*B3_SOLVER_N_SPLIT );
+		}
+
+		{	//	5. sort constraints by cellIdx
+			//	todo. preallocate this
+//			b3Assert( contactsIn->getType() == TYPE_HOST );
+//			b3OpenCLArray<b3Contact4>* out = BufferUtils::map<TYPE_CL, false>( data->m_device, contactsIn );	//	copying contacts to this buffer
+
+			{
+				
+
+				b3Int4 cdata; cdata.x = nContacts;
+				b3BufferInfoCL bInfo[] = { b3BufferInfoCL( contactsIn->getBufferCL() ), b3BufferInfoCL( m_contactBuffer->getBufferCL() ), b3BufferInfoCL( m_sortDataBuffer->getBufferCL() ) };
+				b3LauncherCL launcher( m_queue, m_reorderContactKernel );
+				launcher.setBuffers( bInfo, sizeof(bInfo)/sizeof(b3BufferInfoCL) );
+				launcher.setConst(  cdata );
+				launcher.launch1D( nContacts, 64 );
+			}
+//			BufferUtils::unmap<true>( out, contactsIn, nContacts );
+		}
+	}
+
+	
+}
+
+*/
+void b3Solver::batchContacts(b3OpenCLArray<b3Contact4>* contacts, int nContacts, b3OpenCLArray<unsigned int>* nNative, b3OpenCLArray<unsigned int>* offsetsNative, int staticIdx)
+{
+	int numWorkItems = 64 * B3_SOLVER_N_CELLS;
+	{
+		B3_PROFILE("batch generation");
+
+		b3Int4 cdata;
+		cdata.x = nContacts;
+		cdata.y = 0;
+		cdata.z = staticIdx;
+
+#ifdef BATCH_DEBUG
+		SolverDebugInfo* debugInfo = new SolverDebugInfo[numWorkItems];
+		adl::b3OpenCLArray<SolverDebugInfo> gpuDebugInfo(data->m_device, numWorkItems);
+		memset(debugInfo, 0, sizeof(SolverDebugInfo) * numWorkItems);
+		gpuDebugInfo.write(debugInfo, numWorkItems);
+#endif
+
+#if 0
+		b3BufferInfoCL bInfo[] = { 
+			b3BufferInfoCL( contacts->getBufferCL() ), 
+			b3BufferInfoCL(  m_contactBuffer2->getBufferCL()),
+			b3BufferInfoCL( nNative->getBufferCL() ), 
+			b3BufferInfoCL( offsetsNative->getBufferCL() ),
+#ifdef BATCH_DEBUG
+			,	b3BufferInfoCL(&gpuDebugInfo)
+#endif
+		};
+#endif
+
+		{
+			m_batchSizes.resize(nNative->size());
+			B3_PROFILE("batchingKernel");
+			//b3LauncherCL launcher( m_queue, m_batchingKernel);
+			cl_kernel k = useNewBatchingKernel ? m_batchingKernelNew : m_batchingKernel;
+
+			b3LauncherCL launcher(m_queue, k, "*batchingKernel");
+			if (!useNewBatchingKernel)
+			{
+				launcher.setBuffer(contacts->getBufferCL());
+			}
+			launcher.setBuffer(m_contactBuffer2->getBufferCL());
+			launcher.setBuffer(nNative->getBufferCL());
+			launcher.setBuffer(offsetsNative->getBufferCL());
+
+			launcher.setBuffer(m_batchSizes.getBufferCL());
+
+			//launcher.setConst(  cdata );
+			launcher.setConst(staticIdx);
+
+			launcher.launch1D(numWorkItems, 64);
+			//clFinish(m_queue);
+			//b3AlignedObjectArray<int> batchSizesCPU;
+			//m_batchSizes.copyToHost(batchSizesCPU);
+			//printf(".\n");
+		}
+
+#ifdef BATCH_DEBUG
+		aaaa
+			b3Contact4* hostContacts = new b3Contact4[nContacts];
+		m_contactBuffer->read(hostContacts, nContacts);
+		clFinish(m_queue);
+
+		gpuDebugInfo.read(debugInfo, numWorkItems);
+		clFinish(m_queue);
+
+		for (int i = 0; i < numWorkItems; i++)
+		{
+			if (debugInfo[i].m_valInt1 > 0)
+			{
+				printf("catch\n");
+			}
+			if (debugInfo[i].m_valInt2 > 0)
+			{
+				printf("catch22\n");
+			}
+
+			if (debugInfo[i].m_valInt3 > 0)
+			{
+				printf("catch666\n");
+			}
+
+			if (debugInfo[i].m_valInt4 > 0)
+			{
+				printf("catch777\n");
+			}
+		}
+		delete[] debugInfo;
+#endif  //BATCH_DEBUG
+	}
+
+	//	copy buffer to buffer
+	//b3Assert(m_contactBuffer->size()==nContacts);
+	//contacts->copyFromOpenCLArray( *m_contactBuffer);
+	//clFinish(m_queue);//needed?
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.h
new file mode 100644
index 0000000..ee63531
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/b3Solver.h
@@ -0,0 +1,110 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+#ifndef __ADL_SOLVER_H
+#define __ADL_SOLVER_H
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
+#include "b3GpuConstraint4.h"
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/b3Contact4.h"
+
+#include "Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h"
+#include "Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h"
+
+#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
+
+#define B3NEXTMULTIPLEOF(num, alignment) (((num) / (alignment) + (((num) % (alignment) == 0) ? 0 : 1)) * (alignment))
+
+enum
+{
+	B3_SOLVER_N_SPLIT_X = 8,  //16,//4,
+	B3_SOLVER_N_SPLIT_Y = 4,  //16,//4,
+	B3_SOLVER_N_SPLIT_Z = 8,  //,
+	B3_SOLVER_N_CELLS = B3_SOLVER_N_SPLIT_X * B3_SOLVER_N_SPLIT_Y * B3_SOLVER_N_SPLIT_Z,
+	B3_SOLVER_N_BATCHES = 8,  //4,//8,//4,
+	B3_MAX_NUM_BATCHES = 128,
+};
+
+class b3SolverBase
+{
+public:
+	struct ConstraintCfg
+	{
+		ConstraintCfg(float dt = 0.f) : m_positionDrift(0.005f), m_positionConstraintCoeff(0.2f), m_dt(dt), m_staticIdx(-1) {}
+
+		float m_positionDrift;
+		float m_positionConstraintCoeff;
+		float m_dt;
+		bool m_enableParallelSolve;
+		float m_batchCellSize;
+		int m_staticIdx;
+	};
+};
+
+class b3Solver : public b3SolverBase
+{
+public:
+	cl_context m_context;
+	cl_device_id m_device;
+	cl_command_queue m_queue;
+
+	b3OpenCLArray<unsigned int>* m_numConstraints;
+	b3OpenCLArray<unsigned int>* m_offsets;
+	b3OpenCLArray<int> m_batchSizes;
+
+	int m_nIterations;
+	cl_kernel m_batchingKernel;
+	cl_kernel m_batchingKernelNew;
+	cl_kernel m_solveContactKernel;
+	cl_kernel m_solveFrictionKernel;
+	cl_kernel m_contactToConstraintKernel;
+	cl_kernel m_setSortDataKernel;
+	cl_kernel m_reorderContactKernel;
+	cl_kernel m_copyConstraintKernel;
+
+	class b3RadixSort32CL* m_sort32;
+	class b3BoundSearchCL* m_search;
+	class b3PrefixScanCL* m_scan;
+
+	b3OpenCLArray<b3SortData>* m_sortDataBuffer;
+	b3OpenCLArray<b3Contact4>* m_contactBuffer2;
+
+	enum
+	{
+		DYNAMIC_CONTACT_ALLOCATION_THRESHOLD = 2000000,
+	};
+
+	b3Solver(cl_context ctx, cl_device_id device, cl_command_queue queue, int pairCapacity);
+
+	virtual ~b3Solver();
+
+	void solveContactConstraint(const b3OpenCLArray<b3RigidBodyData>* bodyBuf, const b3OpenCLArray<b3InertiaData>* inertiaBuf,
+								b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches);
+
+	void solveContactConstraintHost(b3OpenCLArray<b3RigidBodyData>* bodyBuf, b3OpenCLArray<b3InertiaData>* shapeBuf,
+									b3OpenCLArray<b3GpuConstraint4>* constraint, void* additionalData, int n, int maxNumBatches, b3AlignedObjectArray<int>* batchSizes);
+
+	void convertToConstraints(const b3OpenCLArray<b3RigidBodyData>* bodyBuf,
+							  const b3OpenCLArray<b3InertiaData>* shapeBuf,
+							  b3OpenCLArray<b3Contact4>* contactsIn, b3OpenCLArray<b3GpuConstraint4>* contactCOut, void* additionalData,
+							  int nContacts, const ConstraintCfg& cfg);
+
+	void batchContacts(b3OpenCLArray<b3Contact4>* contacts, int nContacts, b3OpenCLArray<unsigned int>* n, b3OpenCLArray<unsigned int>* offsets, int staticIdx);
+};
+
+#endif  //__ADL_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl
new file mode 100644
index 0000000..3b891b8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl
@@ -0,0 +1,353 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile __global int*
+#endif
+
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define make_float4 (float4)
+#define make_float2 (float2)
+#define make_uint4 (uint4)
+#define make_int4 (int4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+
+#define max2 max
+#define min2 min
+
+
+#define WG_SIZE 64
+
+
+
+
+
+typedef struct 
+{
+	int m_n;
+	int m_start;
+	int m_staticIdx;
+	int m_paddings[1];
+} ConstBuffer;
+
+typedef struct 
+{
+	int m_a;
+	int m_b;
+	u32 m_idx;
+}Elem;
+
+#define STACK_SIZE (WG_SIZE*10)
+//#define STACK_SIZE (WG_SIZE)
+#define RING_SIZE 1024
+#define RING_SIZE_MASK (RING_SIZE-1)
+#define CHECK_SIZE (WG_SIZE)
+
+
+#define GET_RING_CAPACITY (RING_SIZE - ldsRingEnd)
+#define RING_END ldsTmp
+
+u32 readBuf(__local u32* buff, int idx)
+{
+	idx = idx % (32*CHECK_SIZE);
+	int bitIdx = idx%32;
+	int bufIdx = idx/32;
+	return buff[bufIdx] & (1<<bitIdx);
+}
+
+void writeBuf(__local u32* buff, int idx)
+{
+	idx = idx % (32*CHECK_SIZE);
+	int bitIdx = idx%32;
+	int bufIdx = idx/32;
+//	buff[bufIdx] |= (1<<bitIdx);
+	atom_or( &buff[bufIdx], (1<<bitIdx) );
+}
+
+u32 tryWrite(__local u32* buff, int idx)
+{
+	idx = idx % (32*CHECK_SIZE);
+	int bitIdx = idx%32;
+	int bufIdx = idx/32;
+	u32 ans = (u32)atom_or( &buff[bufIdx], (1<<bitIdx) );
+	return ((ans >> bitIdx)&1) == 0;
+}
+
+//	batching on the GPU
+__kernel void CreateBatches( __global const struct b3Contact4Data* gConstraints, __global struct b3Contact4Data* gConstraintsOut,
+		__global const u32* gN, __global const u32* gStart, __global int* batchSizes, 
+		int m_staticIdx )
+{
+	__local u32 ldsStackIdx[STACK_SIZE];
+	__local u32 ldsStackEnd;
+	__local Elem ldsRingElem[RING_SIZE];
+	__local u32 ldsRingEnd;
+	__local u32 ldsTmp;
+	__local u32 ldsCheckBuffer[CHECK_SIZE];
+	__local u32 ldsFixedBuffer[CHECK_SIZE];
+	__local u32 ldsGEnd;
+	__local u32 ldsDstEnd;
+
+	int wgIdx = GET_GROUP_IDX;
+	int lIdx = GET_LOCAL_IDX;
+	
+	const int m_n = gN[wgIdx];
+	const int m_start = gStart[wgIdx];
+		
+	if( lIdx == 0 )
+	{
+		ldsRingEnd = 0;
+		ldsGEnd = 0;
+		ldsStackEnd = 0;
+		ldsDstEnd = m_start;
+	}
+	
+	
+	
+//	while(1)
+//was 250
+	int ie=0;
+	int maxBatch = 0;
+	for(ie=0; ie<50; ie++)
+	{
+		ldsFixedBuffer[lIdx] = 0;
+
+		for(int giter=0; giter<4; giter++)
+		{
+			int ringCap = GET_RING_CAPACITY;
+		
+			//	1. fill ring
+			if( ldsGEnd < m_n )
+			{
+				while( ringCap > WG_SIZE )
+				{
+					if( ldsGEnd >= m_n ) break;
+					if( lIdx < ringCap - WG_SIZE )
+					{
+						int srcIdx;
+						AtomInc1( ldsGEnd, srcIdx );
+						if( srcIdx < m_n )
+						{
+							int dstIdx;
+							AtomInc1( ldsRingEnd, dstIdx );
+							
+							int a = gConstraints[m_start+srcIdx].m_bodyAPtrAndSignBit;
+							int b = gConstraints[m_start+srcIdx].m_bodyBPtrAndSignBit;
+							ldsRingElem[dstIdx].m_a = (a>b)? b:a;
+							ldsRingElem[dstIdx].m_b = (a>b)? a:b;
+							ldsRingElem[dstIdx].m_idx = srcIdx;
+						}
+					}
+					ringCap = GET_RING_CAPACITY;
+				}
+			}
+
+			GROUP_LDS_BARRIER;
+	
+			//	2. fill stack
+			__local Elem* dst = ldsRingElem;
+			if( lIdx == 0 ) RING_END = 0;
+
+			int srcIdx=lIdx;
+			int end = ldsRingEnd;
+
+			{
+				for(int ii=0; ii<end; ii+=WG_SIZE, srcIdx+=WG_SIZE)
+				{
+					Elem e;
+					if(srcIdx<end) e = ldsRingElem[srcIdx];
+					bool done = (srcIdx<end)?false:true;
+
+					for(int i=lIdx; i<CHECK_SIZE; i+=WG_SIZE) ldsCheckBuffer[lIdx] = 0;
+					
+					if( !done )
+					{
+						int aUsed = readBuf( ldsFixedBuffer, abs(e.m_a));
+						int bUsed = readBuf( ldsFixedBuffer, abs(e.m_b));
+
+						if( aUsed==0 && bUsed==0 )
+						{
+							int aAvailable=1;
+							int bAvailable=1;
+							int ea = abs(e.m_a);
+							int eb = abs(e.m_b);
+
+							bool aStatic = (e.m_a<0) ||(ea==m_staticIdx);
+							bool bStatic = (e.m_b<0) ||(eb==m_staticIdx);
+							
+							if (!aStatic)
+								aAvailable = tryWrite( ldsCheckBuffer, ea );
+							if (!bStatic)
+								bAvailable = tryWrite( ldsCheckBuffer, eb );
+							
+							//aAvailable = aStatic? 1: aAvailable;
+							//bAvailable = bStatic? 1: bAvailable;
+
+							bool success = (aAvailable && bAvailable);
+							if(success)
+							{
+							
+								if (!aStatic)
+									writeBuf( ldsFixedBuffer, ea );
+								if (!bStatic)
+									writeBuf( ldsFixedBuffer, eb );
+							}
+							done = success;
+						}
+					}
+
+					//	put it aside
+					if(srcIdx<end)
+					{
+						if( done )
+						{
+							int dstIdx; AtomInc1( ldsStackEnd, dstIdx );
+							if( dstIdx < STACK_SIZE )
+								ldsStackIdx[dstIdx] = e.m_idx;
+							else{
+								done = false;
+								AtomAdd( ldsStackEnd, -1 );
+							}
+						}
+						if( !done )
+						{
+							int dstIdx; AtomInc1( RING_END, dstIdx );
+							dst[dstIdx] = e;
+						}
+					}
+
+					//	if filled, flush
+					if( ldsStackEnd == STACK_SIZE )
+					{
+						for(int i=lIdx; i<STACK_SIZE; i+=WG_SIZE)
+						{
+							int idx = m_start + ldsStackIdx[i];
+							int dstIdx; AtomInc1( ldsDstEnd, dstIdx );
+							gConstraintsOut[ dstIdx ] = gConstraints[ idx ];
+							gConstraintsOut[ dstIdx ].m_batchIdx = ie;
+						}
+						if( lIdx == 0 ) ldsStackEnd = 0;
+
+						//for(int i=lIdx; i<CHECK_SIZE; i+=WG_SIZE) 
+						ldsFixedBuffer[lIdx] = 0;
+					}
+				}
+			}
+
+			if( lIdx == 0 ) ldsRingEnd = RING_END;
+		}
+
+		GROUP_LDS_BARRIER;
+
+		for(int i=lIdx; i<ldsStackEnd; i+=WG_SIZE)
+		{
+			int idx = m_start + ldsStackIdx[i];
+			int dstIdx; AtomInc1( ldsDstEnd, dstIdx );
+			gConstraintsOut[ dstIdx ] = gConstraints[ idx ];
+			gConstraintsOut[ dstIdx ].m_batchIdx = ie;
+		}
+
+		//	in case it couldn't consume any pair. Flush them
+		//	todo. Serial batch worth while?
+		if( ldsStackEnd == 0 )
+		{
+			for(int i=lIdx; i<ldsRingEnd; i+=WG_SIZE)
+			{
+				int idx = m_start + ldsRingElem[i].m_idx;
+				int dstIdx; AtomInc1( ldsDstEnd, dstIdx );
+				gConstraintsOut[ dstIdx ] = gConstraints[ idx ];
+				int curBatch = 100+i;
+				if (maxBatch < curBatch)
+					maxBatch = curBatch;
+				
+				gConstraintsOut[ dstIdx ].m_batchIdx = curBatch;
+				
+			}
+			GROUP_LDS_BARRIER;
+			if( lIdx == 0 ) ldsRingEnd = 0;
+		}
+
+		if( lIdx == 0 ) ldsStackEnd = 0;
+
+		GROUP_LDS_BARRIER;
+
+		//	termination
+		if( ldsGEnd == m_n && ldsRingEnd == 0 )
+			break;
+	}
+
+	if( lIdx == 0 )
+	{
+		if (maxBatch < ie)
+			maxBatch=ie;
+		batchSizes[wgIdx]=maxBatch;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.h
new file mode 100644
index 0000000..7c73c96
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernels.h
@@ -0,0 +1,387 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* batchingKernelsCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile __global int*\n"
+	"#endif\n"
+	"typedef unsigned int u32;\n"
+	"typedef unsigned short u16;\n"
+	"typedef unsigned char u8;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_float4 (float4)\n"
+	"#define make_float2 (float2)\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_int4 (int4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"#define WG_SIZE 64\n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_n;\n"
+	"	int m_start;\n"
+	"	int m_staticIdx;\n"
+	"	int m_paddings[1];\n"
+	"} ConstBuffer;\n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_a;\n"
+	"	int m_b;\n"
+	"	u32 m_idx;\n"
+	"}Elem;\n"
+	"#define STACK_SIZE (WG_SIZE*10)\n"
+	"//#define STACK_SIZE (WG_SIZE)\n"
+	"#define RING_SIZE 1024\n"
+	"#define RING_SIZE_MASK (RING_SIZE-1)\n"
+	"#define CHECK_SIZE (WG_SIZE)\n"
+	"#define GET_RING_CAPACITY (RING_SIZE - ldsRingEnd)\n"
+	"#define RING_END ldsTmp\n"
+	"u32 readBuf(__local u32* buff, int idx)\n"
+	"{\n"
+	"	idx = idx % (32*CHECK_SIZE);\n"
+	"	int bitIdx = idx%32;\n"
+	"	int bufIdx = idx/32;\n"
+	"	return buff[bufIdx] & (1<<bitIdx);\n"
+	"}\n"
+	"void writeBuf(__local u32* buff, int idx)\n"
+	"{\n"
+	"	idx = idx % (32*CHECK_SIZE);\n"
+	"	int bitIdx = idx%32;\n"
+	"	int bufIdx = idx/32;\n"
+	"//	buff[bufIdx] |= (1<<bitIdx);\n"
+	"	atom_or( &buff[bufIdx], (1<<bitIdx) );\n"
+	"}\n"
+	"u32 tryWrite(__local u32* buff, int idx)\n"
+	"{\n"
+	"	idx = idx % (32*CHECK_SIZE);\n"
+	"	int bitIdx = idx%32;\n"
+	"	int bufIdx = idx/32;\n"
+	"	u32 ans = (u32)atom_or( &buff[bufIdx], (1<<bitIdx) );\n"
+	"	return ((ans >> bitIdx)&1) == 0;\n"
+	"}\n"
+	"//	batching on the GPU\n"
+	"__kernel void CreateBatches( __global const struct b3Contact4Data* gConstraints, __global struct b3Contact4Data* gConstraintsOut,\n"
+	"		__global const u32* gN, __global const u32* gStart, __global int* batchSizes, \n"
+	"		int m_staticIdx )\n"
+	"{\n"
+	"	__local u32 ldsStackIdx[STACK_SIZE];\n"
+	"	__local u32 ldsStackEnd;\n"
+	"	__local Elem ldsRingElem[RING_SIZE];\n"
+	"	__local u32 ldsRingEnd;\n"
+	"	__local u32 ldsTmp;\n"
+	"	__local u32 ldsCheckBuffer[CHECK_SIZE];\n"
+	"	__local u32 ldsFixedBuffer[CHECK_SIZE];\n"
+	"	__local u32 ldsGEnd;\n"
+	"	__local u32 ldsDstEnd;\n"
+	"	int wgIdx = GET_GROUP_IDX;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	\n"
+	"	const int m_n = gN[wgIdx];\n"
+	"	const int m_start = gStart[wgIdx];\n"
+	"		\n"
+	"	if( lIdx == 0 )\n"
+	"	{\n"
+	"		ldsRingEnd = 0;\n"
+	"		ldsGEnd = 0;\n"
+	"		ldsStackEnd = 0;\n"
+	"		ldsDstEnd = m_start;\n"
+	"	}\n"
+	"	\n"
+	"	\n"
+	"	\n"
+	"//	while(1)\n"
+	"//was 250\n"
+	"	int ie=0;\n"
+	"	int maxBatch = 0;\n"
+	"	for(ie=0; ie<50; ie++)\n"
+	"	{\n"
+	"		ldsFixedBuffer[lIdx] = 0;\n"
+	"		for(int giter=0; giter<4; giter++)\n"
+	"		{\n"
+	"			int ringCap = GET_RING_CAPACITY;\n"
+	"		\n"
+	"			//	1. fill ring\n"
+	"			if( ldsGEnd < m_n )\n"
+	"			{\n"
+	"				while( ringCap > WG_SIZE )\n"
+	"				{\n"
+	"					if( ldsGEnd >= m_n ) break;\n"
+	"					if( lIdx < ringCap - WG_SIZE )\n"
+	"					{\n"
+	"						int srcIdx;\n"
+	"						AtomInc1( ldsGEnd, srcIdx );\n"
+	"						if( srcIdx < m_n )\n"
+	"						{\n"
+	"							int dstIdx;\n"
+	"							AtomInc1( ldsRingEnd, dstIdx );\n"
+	"							\n"
+	"							int a = gConstraints[m_start+srcIdx].m_bodyAPtrAndSignBit;\n"
+	"							int b = gConstraints[m_start+srcIdx].m_bodyBPtrAndSignBit;\n"
+	"							ldsRingElem[dstIdx].m_a = (a>b)? b:a;\n"
+	"							ldsRingElem[dstIdx].m_b = (a>b)? a:b;\n"
+	"							ldsRingElem[dstIdx].m_idx = srcIdx;\n"
+	"						}\n"
+	"					}\n"
+	"					ringCap = GET_RING_CAPACITY;\n"
+	"				}\n"
+	"			}\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"	\n"
+	"			//	2. fill stack\n"
+	"			__local Elem* dst = ldsRingElem;\n"
+	"			if( lIdx == 0 ) RING_END = 0;\n"
+	"			int srcIdx=lIdx;\n"
+	"			int end = ldsRingEnd;\n"
+	"			{\n"
+	"				for(int ii=0; ii<end; ii+=WG_SIZE, srcIdx+=WG_SIZE)\n"
+	"				{\n"
+	"					Elem e;\n"
+	"					if(srcIdx<end) e = ldsRingElem[srcIdx];\n"
+	"					bool done = (srcIdx<end)?false:true;\n"
+	"					for(int i=lIdx; i<CHECK_SIZE; i+=WG_SIZE) ldsCheckBuffer[lIdx] = 0;\n"
+	"					\n"
+	"					if( !done )\n"
+	"					{\n"
+	"						int aUsed = readBuf( ldsFixedBuffer, abs(e.m_a));\n"
+	"						int bUsed = readBuf( ldsFixedBuffer, abs(e.m_b));\n"
+	"						if( aUsed==0 && bUsed==0 )\n"
+	"						{\n"
+	"							int aAvailable=1;\n"
+	"							int bAvailable=1;\n"
+	"							int ea = abs(e.m_a);\n"
+	"							int eb = abs(e.m_b);\n"
+	"							bool aStatic = (e.m_a<0) ||(ea==m_staticIdx);\n"
+	"							bool bStatic = (e.m_b<0) ||(eb==m_staticIdx);\n"
+	"							\n"
+	"							if (!aStatic)\n"
+	"								aAvailable = tryWrite( ldsCheckBuffer, ea );\n"
+	"							if (!bStatic)\n"
+	"								bAvailable = tryWrite( ldsCheckBuffer, eb );\n"
+	"							\n"
+	"							//aAvailable = aStatic? 1: aAvailable;\n"
+	"							//bAvailable = bStatic? 1: bAvailable;\n"
+	"							bool success = (aAvailable && bAvailable);\n"
+	"							if(success)\n"
+	"							{\n"
+	"							\n"
+	"								if (!aStatic)\n"
+	"									writeBuf( ldsFixedBuffer, ea );\n"
+	"								if (!bStatic)\n"
+	"									writeBuf( ldsFixedBuffer, eb );\n"
+	"							}\n"
+	"							done = success;\n"
+	"						}\n"
+	"					}\n"
+	"					//	put it aside\n"
+	"					if(srcIdx<end)\n"
+	"					{\n"
+	"						if( done )\n"
+	"						{\n"
+	"							int dstIdx; AtomInc1( ldsStackEnd, dstIdx );\n"
+	"							if( dstIdx < STACK_SIZE )\n"
+	"								ldsStackIdx[dstIdx] = e.m_idx;\n"
+	"							else{\n"
+	"								done = false;\n"
+	"								AtomAdd( ldsStackEnd, -1 );\n"
+	"							}\n"
+	"						}\n"
+	"						if( !done )\n"
+	"						{\n"
+	"							int dstIdx; AtomInc1( RING_END, dstIdx );\n"
+	"							dst[dstIdx] = e;\n"
+	"						}\n"
+	"					}\n"
+	"					//	if filled, flush\n"
+	"					if( ldsStackEnd == STACK_SIZE )\n"
+	"					{\n"
+	"						for(int i=lIdx; i<STACK_SIZE; i+=WG_SIZE)\n"
+	"						{\n"
+	"							int idx = m_start + ldsStackIdx[i];\n"
+	"							int dstIdx; AtomInc1( ldsDstEnd, dstIdx );\n"
+	"							gConstraintsOut[ dstIdx ] = gConstraints[ idx ];\n"
+	"							gConstraintsOut[ dstIdx ].m_batchIdx = ie;\n"
+	"						}\n"
+	"						if( lIdx == 0 ) ldsStackEnd = 0;\n"
+	"						//for(int i=lIdx; i<CHECK_SIZE; i+=WG_SIZE) \n"
+	"						ldsFixedBuffer[lIdx] = 0;\n"
+	"					}\n"
+	"				}\n"
+	"			}\n"
+	"			if( lIdx == 0 ) ldsRingEnd = RING_END;\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		for(int i=lIdx; i<ldsStackEnd; i+=WG_SIZE)\n"
+	"		{\n"
+	"			int idx = m_start + ldsStackIdx[i];\n"
+	"			int dstIdx; AtomInc1( ldsDstEnd, dstIdx );\n"
+	"			gConstraintsOut[ dstIdx ] = gConstraints[ idx ];\n"
+	"			gConstraintsOut[ dstIdx ].m_batchIdx = ie;\n"
+	"		}\n"
+	"		//	in case it couldn't consume any pair. Flush them\n"
+	"		//	todo. Serial batch worth while?\n"
+	"		if( ldsStackEnd == 0 )\n"
+	"		{\n"
+	"			for(int i=lIdx; i<ldsRingEnd; i+=WG_SIZE)\n"
+	"			{\n"
+	"				int idx = m_start + ldsRingElem[i].m_idx;\n"
+	"				int dstIdx; AtomInc1( ldsDstEnd, dstIdx );\n"
+	"				gConstraintsOut[ dstIdx ] = gConstraints[ idx ];\n"
+	"				int curBatch = 100+i;\n"
+	"				if (maxBatch < curBatch)\n"
+	"					maxBatch = curBatch;\n"
+	"				\n"
+	"				gConstraintsOut[ dstIdx ].m_batchIdx = curBatch;\n"
+	"				\n"
+	"			}\n"
+	"			GROUP_LDS_BARRIER;\n"
+	"			if( lIdx == 0 ) ldsRingEnd = 0;\n"
+	"		}\n"
+	"		if( lIdx == 0 ) ldsStackEnd = 0;\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		//	termination\n"
+	"		if( ldsGEnd == m_n && ldsRingEnd == 0 )\n"
+	"			break;\n"
+	"	}\n"
+	"	if( lIdx == 0 )\n"
+	"	{\n"
+	"		if (maxBatch < ie)\n"
+	"			maxBatch=ie;\n"
+	"		batchSizes[wgIdx]=maxBatch;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl
new file mode 100644
index 0000000..ba1b66d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl
@@ -0,0 +1,231 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile __global int*
+#endif
+
+#define SIMD_WIDTH 64
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define make_float4 (float4)
+#define make_float2 (float2)
+#define make_uint4 (uint4)
+#define make_int4 (int4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+
+#define max2 max
+#define min2 min
+
+
+#define WG_SIZE 64
+
+
+
+
+
+typedef struct 
+{
+	int m_n;
+	int m_start;
+	int m_staticIdx;
+	int m_paddings[1];
+} ConstBuffer;
+
+typedef struct 
+{
+	int m_a;
+	int m_b;
+	u32 m_idx;
+}Elem;
+
+
+
+
+
+//	batching on the GPU
+__kernel void CreateBatchesBruteForce( __global struct b3Contact4Data* gConstraints, 	__global const u32* gN, __global const u32* gStart, int m_staticIdx )
+{
+	int wgIdx = GET_GROUP_IDX;
+	int lIdx = GET_LOCAL_IDX;
+	
+	const int m_n = gN[wgIdx];
+	const int m_start = gStart[wgIdx];
+		
+	if( lIdx == 0 )
+	{
+		for (int i=0;i<m_n;i++)
+		{
+			int srcIdx = i+m_start;
+			int batchIndex = i;
+			gConstraints[ srcIdx ].m_batchIdx = batchIndex;	
+		}
+	}
+}
+
+
+#define CHECK_SIZE (WG_SIZE)
+
+
+
+
+u32 readBuf(__local u32* buff, int idx)
+{
+	idx = idx % (32*CHECK_SIZE);
+	int bitIdx = idx%32;
+	int bufIdx = idx/32;
+	return buff[bufIdx] & (1<<bitIdx);
+}
+
+void writeBuf(__local u32* buff, int idx)
+{
+	idx = idx % (32*CHECK_SIZE);
+	int bitIdx = idx%32;
+	int bufIdx = idx/32;
+	buff[bufIdx] |= (1<<bitIdx);
+	//atom_or( &buff[bufIdx], (1<<bitIdx) );
+}
+
+u32 tryWrite(__local u32* buff, int idx)
+{
+	idx = idx % (32*CHECK_SIZE);
+	int bitIdx = idx%32;
+	int bufIdx = idx/32;
+	u32 ans = (u32)atom_or( &buff[bufIdx], (1<<bitIdx) );
+	return ((ans >> bitIdx)&1) == 0;
+}
+
+
+//	batching on the GPU
+__kernel void CreateBatchesNew( __global struct b3Contact4Data* gConstraints, __global const u32* gN, __global const u32* gStart, __global int* batchSizes, int staticIdx )
+{
+	int wgIdx = GET_GROUP_IDX;
+	int lIdx = GET_LOCAL_IDX;
+	const int numConstraints = gN[wgIdx];
+	const int m_start = gStart[wgIdx];
+	b3Contact4Data_t tmp;
+	
+	__local u32 ldsFixedBuffer[CHECK_SIZE];
+		
+	
+	
+	
+	
+	if( lIdx == 0 )
+	{
+	
+		
+		__global struct b3Contact4Data* cs = &gConstraints[m_start];	
+	
+		
+		int numValidConstraints = 0;
+		int batchIdx = 0;
+
+		while( numValidConstraints < numConstraints)
+		{
+			int nCurrentBatch = 0;
+			//	clear flag
+	
+			for(int i=0; i<CHECK_SIZE; i++) 
+				ldsFixedBuffer[i] = 0;		
+
+			for(int i=numValidConstraints; i<numConstraints; i++)
+			{
+
+				int bodyAS = cs[i].m_bodyAPtrAndSignBit;
+				int bodyBS = cs[i].m_bodyBPtrAndSignBit;
+				int bodyA = abs(bodyAS);
+				int bodyB = abs(bodyBS);
+				bool aIsStatic = (bodyAS<0) || bodyAS==staticIdx;
+				bool bIsStatic = (bodyBS<0) || bodyBS==staticIdx;
+				int aUnavailable = aIsStatic ? 0 : readBuf( ldsFixedBuffer, bodyA);
+				int bUnavailable = bIsStatic ? 0 : readBuf( ldsFixedBuffer, bodyB);
+				
+				if( aUnavailable==0 && bUnavailable==0 ) // ok
+				{
+					if (!aIsStatic)
+					{
+						writeBuf( ldsFixedBuffer, bodyA );
+					}
+					if (!bIsStatic)
+					{
+						writeBuf( ldsFixedBuffer, bodyB );
+					}
+
+					cs[i].m_batchIdx = batchIdx;
+
+					if (i!=numValidConstraints)
+					{
+
+						tmp = cs[i];
+						cs[i] = cs[numValidConstraints];
+						cs[numValidConstraints]  = tmp;
+
+
+					}
+
+					numValidConstraints++;
+					
+					nCurrentBatch++;
+					if( nCurrentBatch == SIMD_WIDTH)
+					{
+						nCurrentBatch = 0;
+						for(int i=0; i<CHECK_SIZE; i++) 
+							ldsFixedBuffer[i] = 0;
+						
+					}
+				}
+			}//for
+			batchIdx ++;
+		}//while
+		
+		batchSizes[wgIdx] = batchIdx;
+
+	}//if( lIdx == 0 )
+	
+	//return batchIdx;
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.h
new file mode 100644
index 0000000..0580065
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.h
@@ -0,0 +1,290 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* batchingKernelsNewCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Erwin Coumans\n"
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile __global int*\n"
+	"#endif\n"
+	"#define SIMD_WIDTH 64\n"
+	"typedef unsigned int u32;\n"
+	"typedef unsigned short u16;\n"
+	"typedef unsigned char u8;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_float4 (float4)\n"
+	"#define make_float2 (float2)\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_int4 (int4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"#define WG_SIZE 64\n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_n;\n"
+	"	int m_start;\n"
+	"	int m_staticIdx;\n"
+	"	int m_paddings[1];\n"
+	"} ConstBuffer;\n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_a;\n"
+	"	int m_b;\n"
+	"	u32 m_idx;\n"
+	"}Elem;\n"
+	"//	batching on the GPU\n"
+	"__kernel void CreateBatchesBruteForce( __global struct b3Contact4Data* gConstraints, 	__global const u32* gN, __global const u32* gStart, int m_staticIdx )\n"
+	"{\n"
+	"	int wgIdx = GET_GROUP_IDX;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	\n"
+	"	const int m_n = gN[wgIdx];\n"
+	"	const int m_start = gStart[wgIdx];\n"
+	"		\n"
+	"	if( lIdx == 0 )\n"
+	"	{\n"
+	"		for (int i=0;i<m_n;i++)\n"
+	"		{\n"
+	"			int srcIdx = i+m_start;\n"
+	"			int batchIndex = i;\n"
+	"			gConstraints[ srcIdx ].m_batchIdx = batchIndex;	\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"#define CHECK_SIZE (WG_SIZE)\n"
+	"u32 readBuf(__local u32* buff, int idx)\n"
+	"{\n"
+	"	idx = idx % (32*CHECK_SIZE);\n"
+	"	int bitIdx = idx%32;\n"
+	"	int bufIdx = idx/32;\n"
+	"	return buff[bufIdx] & (1<<bitIdx);\n"
+	"}\n"
+	"void writeBuf(__local u32* buff, int idx)\n"
+	"{\n"
+	"	idx = idx % (32*CHECK_SIZE);\n"
+	"	int bitIdx = idx%32;\n"
+	"	int bufIdx = idx/32;\n"
+	"	buff[bufIdx] |= (1<<bitIdx);\n"
+	"	//atom_or( &buff[bufIdx], (1<<bitIdx) );\n"
+	"}\n"
+	"u32 tryWrite(__local u32* buff, int idx)\n"
+	"{\n"
+	"	idx = idx % (32*CHECK_SIZE);\n"
+	"	int bitIdx = idx%32;\n"
+	"	int bufIdx = idx/32;\n"
+	"	u32 ans = (u32)atom_or( &buff[bufIdx], (1<<bitIdx) );\n"
+	"	return ((ans >> bitIdx)&1) == 0;\n"
+	"}\n"
+	"//	batching on the GPU\n"
+	"__kernel void CreateBatchesNew( __global struct b3Contact4Data* gConstraints, __global const u32* gN, __global const u32* gStart, __global int* batchSizes, int staticIdx )\n"
+	"{\n"
+	"	int wgIdx = GET_GROUP_IDX;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	const int numConstraints = gN[wgIdx];\n"
+	"	const int m_start = gStart[wgIdx];\n"
+	"	b3Contact4Data_t tmp;\n"
+	"	\n"
+	"	__local u32 ldsFixedBuffer[CHECK_SIZE];\n"
+	"		\n"
+	"	\n"
+	"	\n"
+	"	\n"
+	"	\n"
+	"	if( lIdx == 0 )\n"
+	"	{\n"
+	"	\n"
+	"		\n"
+	"		__global struct b3Contact4Data* cs = &gConstraints[m_start];	\n"
+	"	\n"
+	"		\n"
+	"		int numValidConstraints = 0;\n"
+	"		int batchIdx = 0;\n"
+	"		while( numValidConstraints < numConstraints)\n"
+	"		{\n"
+	"			int nCurrentBatch = 0;\n"
+	"			//	clear flag\n"
+	"	\n"
+	"			for(int i=0; i<CHECK_SIZE; i++) \n"
+	"				ldsFixedBuffer[i] = 0;		\n"
+	"			for(int i=numValidConstraints; i<numConstraints; i++)\n"
+	"			{\n"
+	"				int bodyAS = cs[i].m_bodyAPtrAndSignBit;\n"
+	"				int bodyBS = cs[i].m_bodyBPtrAndSignBit;\n"
+	"				int bodyA = abs(bodyAS);\n"
+	"				int bodyB = abs(bodyBS);\n"
+	"				bool aIsStatic = (bodyAS<0) || bodyAS==staticIdx;\n"
+	"				bool bIsStatic = (bodyBS<0) || bodyBS==staticIdx;\n"
+	"				int aUnavailable = aIsStatic ? 0 : readBuf( ldsFixedBuffer, bodyA);\n"
+	"				int bUnavailable = bIsStatic ? 0 : readBuf( ldsFixedBuffer, bodyB);\n"
+	"				\n"
+	"				if( aUnavailable==0 && bUnavailable==0 ) // ok\n"
+	"				{\n"
+	"					if (!aIsStatic)\n"
+	"					{\n"
+	"						writeBuf( ldsFixedBuffer, bodyA );\n"
+	"					}\n"
+	"					if (!bIsStatic)\n"
+	"					{\n"
+	"						writeBuf( ldsFixedBuffer, bodyB );\n"
+	"					}\n"
+	"					cs[i].m_batchIdx = batchIdx;\n"
+	"					if (i!=numValidConstraints)\n"
+	"					{\n"
+	"						tmp = cs[i];\n"
+	"						cs[i] = cs[numValidConstraints];\n"
+	"						cs[numValidConstraints]  = tmp;\n"
+	"					}\n"
+	"					numValidConstraints++;\n"
+	"					\n"
+	"					nCurrentBatch++;\n"
+	"					if( nCurrentBatch == SIMD_WIDTH)\n"
+	"					{\n"
+	"						nCurrentBatch = 0;\n"
+	"						for(int i=0; i<CHECK_SIZE; i++) \n"
+	"							ldsFixedBuffer[i] = 0;\n"
+	"						\n"
+	"					}\n"
+	"				}\n"
+	"			}//for\n"
+	"			batchIdx ++;\n"
+	"		}//while\n"
+	"		\n"
+	"		batchSizes[wgIdx] = batchIdx;\n"
+	"	}//if( lIdx == 0 )\n"
+	"	\n"
+	"	//return batchIdx;\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl
new file mode 100644
index 0000000..e22bc9b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl
@@ -0,0 +1,32 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
+
+#include "Bullet3Dynamics/shared/b3IntegrateTransforms.h"
+
+
+
+__kernel void 
+  integrateTransformsKernel( __global b3RigidBodyData_t* bodies,const int numNodes, float timeStep, float angularDamping, float4 gravityAcceleration)
+{
+	int nodeID = get_global_id(0);
+	
+	if( nodeID < numNodes)
+	{
+		integrateSingleTransform(bodies,nodeID, timeStep, angularDamping,gravityAcceleration);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.h
new file mode 100644
index 0000000..6e9c53e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/integrateKernel.h
@@ -0,0 +1,432 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* integrateKernelCL =
+	"/*\n"
+	"Copyright (c) 2013 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Erwin Coumans\n"
+	"#ifndef B3_RIGIDBODY_DATA_H\n"
+	"#define B3_RIGIDBODY_DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#define B3_QUAT_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Quat;\n"
+	"	#define b3QuatConstArg const b3Quat\n"
+	"	\n"
+	"	\n"
+	"inline float4 b3FastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = (float4)(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"	\n"
+	"inline b3Quat b3QuatMul(b3Quat a, b3Quat b);\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in);\n"
+	"inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)\n"
+	"{\n"
+	"	b3Quat ans;\n"
+	"	ans = b3Cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - b3Dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in)\n"
+	"{\n"
+	"	b3Quat q;\n"
+	"	q=in;\n"
+	"	//return b3FastNormalize4(in);\n"
+	"	float len = native_sqrt(dot(q, q));\n"
+	"	if(len > 0.f)\n"
+	"	{\n"
+	"		q *= 1.f / len;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		q.x = q.y = q.z = 0.f;\n"
+	"		q.w = 1.f;\n"
+	"	}\n"
+	"	return q;\n"
+	"}\n"
+	"inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	b3Quat qInv = b3QuatInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = b3QuatMul(b3QuatMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	return b3QuatRotate( b3QuatInvert( q ), vec );\n"
+	"}\n"
+	"inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg  orientation)\n"
+	"{\n"
+	"	return b3QuatRotate( orientation, point ) + (translation);\n"
+	"}\n"
+	"	\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#define B3_MAT3x3_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"typedef struct\n"
+	"{\n"
+	"	b3Float4 m_row[3];\n"
+	"}b3Mat3x3;\n"
+	"#define b3Mat3x3ConstArg const b3Mat3x3\n"
+	"#define b3GetRow(m,row) (m.m_row[row])\n"
+	"inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)\n"
+	"{\n"
+	"	b3Float4 quat2 = (b3Float4)(quat.x*quat.x, quat.y*quat.y, quat.z*quat.z, 0.f);\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0].x=1-2*quat2.y-2*quat2.z;\n"
+	"	out.m_row[0].y=2*quat.x*quat.y-2*quat.w*quat.z;\n"
+	"	out.m_row[0].z=2*quat.x*quat.z+2*quat.w*quat.y;\n"
+	"	out.m_row[0].w = 0.f;\n"
+	"	out.m_row[1].x=2*quat.x*quat.y+2*quat.w*quat.z;\n"
+	"	out.m_row[1].y=1-2*quat2.x-2*quat2.z;\n"
+	"	out.m_row[1].z=2*quat.y*quat.z-2*quat.w*quat.x;\n"
+	"	out.m_row[1].w = 0.f;\n"
+	"	out.m_row[2].x=2*quat.x*quat.z-2*quat.w*quat.y;\n"
+	"	out.m_row[2].y=2*quat.y*quat.z+2*quat.w*quat.x;\n"
+	"	out.m_row[2].z=1-2*quat2.x-2*quat2.y;\n"
+	"	out.m_row[2].w = 0.f;\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = fabs(matIn.m_row[0]);\n"
+	"	out.m_row[1] = fabs(matIn.m_row[1]);\n"
+	"	out.m_row[2] = fabs(matIn.m_row[2]);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero();\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity();\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m);\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(0.f);\n"
+	"	m.m_row[1] = (b3Float4)(0.f);\n"
+	"	m.m_row[2] = (b3Float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (b3Float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (b3Float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Mat3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	b3Mat3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = b3Dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = b3Dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = b3Dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)\n"
+	"{\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a.m_row[0], b );\n"
+	"	ans.y = b3Dot3F4( a.m_row[1], b );\n"
+	"	ans.z = b3Dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a, colx );\n"
+	"	ans.y = b3Dot3F4( a, coly );\n"
+	"	ans.z = b3Dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3RigidBodyData b3RigidBodyData_t;\n"
+	"struct b3RigidBodyData\n"
+	"{\n"
+	"	b3Float4				m_pos;\n"
+	"	b3Quat					m_quat;\n"
+	"	b3Float4				m_linVel;\n"
+	"	b3Float4				m_angVel;\n"
+	"	int 					m_collidableIdx;\n"
+	"	float 				m_invMass;\n"
+	"	float 				m_restituitionCoeff;\n"
+	"	float 				m_frictionCoeff;\n"
+	"};\n"
+	"typedef struct b3InertiaData b3InertiaData_t;\n"
+	"struct b3InertiaData\n"
+	"{\n"
+	"	b3Mat3x3 m_invInertiaWorld;\n"
+	"	b3Mat3x3 m_initInvInertia;\n"
+	"};\n"
+	"#endif //B3_RIGIDBODY_DATA_H\n"
+	"	\n"
+	"#ifndef B3_RIGIDBODY_DATA_H\n"
+	"#endif //B3_RIGIDBODY_DATA_H\n"
+	"	\n"
+	"inline void integrateSingleTransform( __global b3RigidBodyData_t* bodies,int nodeID, float timeStep, float angularDamping, b3Float4ConstArg gravityAcceleration)\n"
+	"{\n"
+	"	\n"
+	"	if (bodies[nodeID].m_invMass != 0.f)\n"
+	"	{\n"
+	"		float BT_GPU_ANGULAR_MOTION_THRESHOLD = (0.25f * 3.14159254f);\n"
+	"		//angular velocity\n"
+	"		{\n"
+	"			b3Float4 axis;\n"
+	"			//add some hardcoded angular damping\n"
+	"			bodies[nodeID].m_angVel.x *= angularDamping;\n"
+	"			bodies[nodeID].m_angVel.y *= angularDamping;\n"
+	"			bodies[nodeID].m_angVel.z *= angularDamping;\n"
+	"			\n"
+	"			b3Float4 angvel = bodies[nodeID].m_angVel;\n"
+	"			float fAngle = b3Sqrt(b3Dot3F4(angvel, angvel));\n"
+	"			\n"
+	"			//limit the angular motion\n"
+	"			if(fAngle*timeStep > BT_GPU_ANGULAR_MOTION_THRESHOLD)\n"
+	"			{\n"
+	"				fAngle = BT_GPU_ANGULAR_MOTION_THRESHOLD / timeStep;\n"
+	"			}\n"
+	"			if(fAngle < 0.001f)\n"
+	"			{\n"
+	"				// use Taylor's expansions of sync function\n"
+	"				axis = angvel * (0.5f*timeStep-(timeStep*timeStep*timeStep)*0.020833333333f * fAngle * fAngle);\n"
+	"			}\n"
+	"			else\n"
+	"			{\n"
+	"				// sync(fAngle) = sin(c*fAngle)/t\n"
+	"				axis = angvel * ( b3Sin(0.5f * fAngle * timeStep) / fAngle);\n"
+	"			}\n"
+	"			\n"
+	"			b3Quat dorn;\n"
+	"			dorn.x = axis.x;\n"
+	"			dorn.y = axis.y;\n"
+	"			dorn.z = axis.z;\n"
+	"			dorn.w = b3Cos(fAngle * timeStep * 0.5f);\n"
+	"			b3Quat orn0 = bodies[nodeID].m_quat;\n"
+	"			b3Quat predictedOrn = b3QuatMul(dorn, orn0);\n"
+	"			predictedOrn = b3QuatNormalized(predictedOrn);\n"
+	"			bodies[nodeID].m_quat=predictedOrn;\n"
+	"		}\n"
+	"		//linear velocity		\n"
+	"		bodies[nodeID].m_pos +=  bodies[nodeID].m_linVel * timeStep;\n"
+	"		\n"
+	"		//apply gravity\n"
+	"		bodies[nodeID].m_linVel += gravityAcceleration * timeStep;\n"
+	"		\n"
+	"	}\n"
+	"	\n"
+	"}\n"
+	"inline void b3IntegrateTransform( __global b3RigidBodyData_t* body, float timeStep, float angularDamping, b3Float4ConstArg gravityAcceleration)\n"
+	"{\n"
+	"	float BT_GPU_ANGULAR_MOTION_THRESHOLD = (0.25f * 3.14159254f);\n"
+	"	\n"
+	"	if( (body->m_invMass != 0.f))\n"
+	"	{\n"
+	"		//angular velocity\n"
+	"		{\n"
+	"			b3Float4 axis;\n"
+	"			//add some hardcoded angular damping\n"
+	"			body->m_angVel.x *= angularDamping;\n"
+	"			body->m_angVel.y *= angularDamping;\n"
+	"			body->m_angVel.z *= angularDamping;\n"
+	"			\n"
+	"			b3Float4 angvel = body->m_angVel;\n"
+	"			float fAngle = b3Sqrt(b3Dot3F4(angvel, angvel));\n"
+	"			//limit the angular motion\n"
+	"			if(fAngle*timeStep > BT_GPU_ANGULAR_MOTION_THRESHOLD)\n"
+	"			{\n"
+	"				fAngle = BT_GPU_ANGULAR_MOTION_THRESHOLD / timeStep;\n"
+	"			}\n"
+	"			if(fAngle < 0.001f)\n"
+	"			{\n"
+	"				// use Taylor's expansions of sync function\n"
+	"				axis = angvel * (0.5f*timeStep-(timeStep*timeStep*timeStep)*0.020833333333f * fAngle * fAngle);\n"
+	"			}\n"
+	"			else\n"
+	"			{\n"
+	"				// sync(fAngle) = sin(c*fAngle)/t\n"
+	"				axis = angvel * ( b3Sin(0.5f * fAngle * timeStep) / fAngle);\n"
+	"			}\n"
+	"			b3Quat dorn;\n"
+	"			dorn.x = axis.x;\n"
+	"			dorn.y = axis.y;\n"
+	"			dorn.z = axis.z;\n"
+	"			dorn.w = b3Cos(fAngle * timeStep * 0.5f);\n"
+	"			b3Quat orn0 = body->m_quat;\n"
+	"			b3Quat predictedOrn = b3QuatMul(dorn, orn0);\n"
+	"			predictedOrn = b3QuatNormalized(predictedOrn);\n"
+	"			body->m_quat=predictedOrn;\n"
+	"		}\n"
+	"		//apply gravity\n"
+	"		body->m_linVel += gravityAcceleration * timeStep;\n"
+	"		//linear velocity		\n"
+	"		body->m_pos +=  body->m_linVel * timeStep;\n"
+	"		\n"
+	"	}\n"
+	"	\n"
+	"}\n"
+	"__kernel void \n"
+	"  integrateTransformsKernel( __global b3RigidBodyData_t* bodies,const int numNodes, float timeStep, float angularDamping, float4 gravityAcceleration)\n"
+	"{\n"
+	"	int nodeID = get_global_id(0);\n"
+	"	\n"
+	"	if( nodeID < numNodes)\n"
+	"	{\n"
+	"		integrateSingleTransform(bodies,nodeID, timeStep, angularDamping,gravityAcceleration);\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.cl
new file mode 100644
index 0000000..7f5dabe
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.cl
@@ -0,0 +1,877 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#define B3_CONSTRAINT_FLAG_ENABLED 1
+
+#define B3_GPU_POINT2POINT_CONSTRAINT_TYPE 3
+#define B3_GPU_FIXED_CONSTRAINT_TYPE 4
+
+#define MOTIONCLAMP 100000 //unused, for debugging/safety in case constraint solver fails
+#define B3_INFINITY 1e30f
+
+#define mymake_float4 (float4)
+
+
+__inline float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = mymake_float4(a.xyz,0.f);
+	float4 b1 = mymake_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+
+typedef float4 Quaternion;
+
+
+typedef struct
+{
+	float4 m_row[3];
+}Matrix3x3;
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b);
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b);
+
+
+
+
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b)
+{
+	float4 ans;
+	ans.x = dot3F4( a.m_row[0], b );
+	ans.y = dot3F4( a.m_row[1], b );
+	ans.z = dot3F4( a.m_row[2], b );
+	ans.w = 0.f;
+	return ans;
+}
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b)
+{
+	float4 colx = mymake_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);
+	float4 coly = mymake_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);
+	float4 colz = mymake_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);
+
+	float4 ans;
+	ans.x = dot3F4( a, colx );
+	ans.y = dot3F4( a, coly );
+	ans.z = dot3F4( a, colz );
+	return ans;
+}
+
+
+
+typedef struct
+{
+	Matrix3x3 m_invInertiaWorld;
+	Matrix3x3 m_initInvInertia;
+} BodyInertia;
+
+
+typedef struct
+{
+	Matrix3x3 m_basis;//orientation
+	float4	m_origin;//transform
+}b3Transform;
+
+typedef struct
+{
+//	b3Transform		m_worldTransformUnused;
+	float4		m_deltaLinearVelocity;
+	float4		m_deltaAngularVelocity;
+	float4		m_angularFactor;
+	float4		m_linearFactor;
+	float4		m_invMass;
+	float4		m_pushVelocity;
+	float4		m_turnVelocity;
+	float4		m_linearVelocity;
+	float4		m_angularVelocity;
+
+	union 
+	{
+		void*	m_originalBody;
+		int		m_originalBodyIndex;
+	};
+	int padding[3];
+
+} b3GpuSolverBody;
+
+typedef struct
+{
+	float4 m_pos;
+	Quaternion m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	unsigned int m_shapeIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} b3RigidBodyCL;
+
+typedef struct
+{
+
+	float4		m_relpos1CrossNormal;
+	float4		m_contactNormal;
+
+	float4		m_relpos2CrossNormal;
+	//float4		m_contactNormal2;//usually m_contactNormal2 == -m_contactNormal
+
+	float4		m_angularComponentA;
+	float4		m_angularComponentB;
+	
+	float	m_appliedPushImpulse;
+	float	m_appliedImpulse;
+	int	m_padding1;
+	int	m_padding2;
+	float	m_friction;
+	float	m_jacDiagABInv;
+	float		m_rhs;
+	float		m_cfm;
+	
+    float		m_lowerLimit;
+	float		m_upperLimit;
+	float		m_rhsPenetration;
+	int			m_originalConstraint;
+
+
+	int	m_overrideNumSolverIterations;
+    int			m_frictionIndex;
+	int m_solverBodyIdA;
+	int m_solverBodyIdB;
+
+} b3SolverConstraint;
+
+typedef struct 
+{
+	int m_bodyAPtrAndSignBit;
+	int m_bodyBPtrAndSignBit;
+	int m_originalConstraintIndex;
+	int m_batchId;
+} b3BatchConstraint;
+
+
+
+
+
+
+typedef struct 
+{
+	int				m_constraintType;
+	int				m_rbA;
+	int				m_rbB;
+	float			m_breakingImpulseThreshold;
+
+	float4 m_pivotInA;
+	float4 m_pivotInB;
+	Quaternion m_relTargetAB;
+
+	int	m_flags;
+	int m_padding[3];
+} b3GpuGenericConstraint;
+
+
+/*b3Transform	getWorldTransform(b3RigidBodyCL* rb)
+{
+	b3Transform newTrans;
+	newTrans.setOrigin(rb->m_pos);
+	newTrans.setRotation(rb->m_quat);
+	return newTrans;
+}*/
+
+
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	v = mymake_float4(v.xyz,0.f);
+	return fast_normalize(v);
+}
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+Quaternion qtNormalize(Quaternion in);
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec);
+
+__inline
+Quaternion qtInvert(Quaternion q);
+
+
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtNormalize(Quaternion in)
+{
+	return fastNormalize4(in);
+//	in /= length( in );
+//	return in;
+}
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+
+__inline void internalApplyImpulse(__global b3GpuSolverBody* body,  float4 linearComponent, float4 angularComponent,float impulseMagnitude)
+{
+	body->m_deltaLinearVelocity += linearComponent*impulseMagnitude*body->m_linearFactor;
+	body->m_deltaAngularVelocity += angularComponent*(impulseMagnitude*body->m_angularFactor);
+}
+
+
+void resolveSingleConstraintRowGeneric(__global b3GpuSolverBody* body1, __global b3GpuSolverBody* body2, __global b3SolverConstraint* c)
+{
+	float deltaImpulse = c->m_rhs-c->m_appliedImpulse*c->m_cfm;
+	float deltaVel1Dotn	=	dot3F4(c->m_contactNormal,body1->m_deltaLinearVelocity) 	+ dot3F4(c->m_relpos1CrossNormal,body1->m_deltaAngularVelocity);
+	float deltaVel2Dotn	=	-dot3F4(c->m_contactNormal,body2->m_deltaLinearVelocity) + dot3F4(c->m_relpos2CrossNormal,body2->m_deltaAngularVelocity);
+
+	deltaImpulse	-=	deltaVel1Dotn*c->m_jacDiagABInv;
+	deltaImpulse	-=	deltaVel2Dotn*c->m_jacDiagABInv;
+
+	float sum = c->m_appliedImpulse + deltaImpulse;
+	if (sum < c->m_lowerLimit)
+	{
+		deltaImpulse = c->m_lowerLimit-c->m_appliedImpulse;
+		c->m_appliedImpulse = c->m_lowerLimit;
+	}
+	else if (sum > c->m_upperLimit) 
+	{
+		deltaImpulse = c->m_upperLimit-c->m_appliedImpulse;
+		c->m_appliedImpulse = c->m_upperLimit;
+	}
+	else
+	{
+		c->m_appliedImpulse = sum;
+	}
+
+	internalApplyImpulse(body1,c->m_contactNormal*body1->m_invMass,c->m_angularComponentA,deltaImpulse);
+	internalApplyImpulse(body2,-c->m_contactNormal*body2->m_invMass,c->m_angularComponentB,deltaImpulse);
+
+}
+
+__kernel void solveJointConstraintRows(__global b3GpuSolverBody* solverBodies,
+					  __global b3BatchConstraint* batchConstraints,
+					  	__global b3SolverConstraint* rows,
+						__global unsigned int* numConstraintRowsInfo1, 
+						__global unsigned int* rowOffsets,
+						__global b3GpuGenericConstraint* constraints,
+						int batchOffset,
+						int numConstraintsInBatch
+                      )
+{
+	int b = get_global_id(0);
+	if (b>=numConstraintsInBatch)
+		return;
+
+	__global b3BatchConstraint* c = &batchConstraints[b+batchOffset];
+	int originalConstraintIndex = c->m_originalConstraintIndex;
+	if (constraints[originalConstraintIndex].m_flags&B3_CONSTRAINT_FLAG_ENABLED)
+	{
+		int numConstraintRows = numConstraintRowsInfo1[originalConstraintIndex];
+		int rowOffset = rowOffsets[originalConstraintIndex];
+		for (int jj=0;jj<numConstraintRows;jj++)
+		{
+			__global b3SolverConstraint* constraint = &rows[rowOffset+jj];
+			resolveSingleConstraintRowGeneric(&solverBodies[constraint->m_solverBodyIdA],&solverBodies[constraint->m_solverBodyIdB],constraint);
+		}
+	}
+};
+
+__kernel void initSolverBodies(__global b3GpuSolverBody* solverBodies,__global b3RigidBodyCL* bodiesCL, int numBodies)
+{
+	int i = get_global_id(0);
+	if (i>=numBodies)
+		return;
+
+	__global b3GpuSolverBody* solverBody = &solverBodies[i];
+	__global b3RigidBodyCL* bodyCL = &bodiesCL[i];
+
+	solverBody->m_deltaLinearVelocity = (float4)(0.f,0.f,0.f,0.f);
+	solverBody->m_deltaAngularVelocity  = (float4)(0.f,0.f,0.f,0.f);
+	solverBody->m_pushVelocity = (float4)(0.f,0.f,0.f,0.f);
+	solverBody->m_pushVelocity = (float4)(0.f,0.f,0.f,0.f);
+	solverBody->m_invMass = (float4)(bodyCL->m_invMass,bodyCL->m_invMass,bodyCL->m_invMass,0.f);
+	solverBody->m_originalBodyIndex = i;
+	solverBody->m_angularFactor = (float4)(1,1,1,0);
+	solverBody->m_linearFactor = (float4) (1,1,1,0);
+	solverBody->m_linearVelocity = bodyCL->m_linVel;
+	solverBody->m_angularVelocity = bodyCL->m_angVel;
+}
+
+__kernel void breakViolatedConstraintsKernel(__global b3GpuGenericConstraint* constraints, __global unsigned int* numConstraintRows, __global unsigned int* rowOffsets, __global b3SolverConstraint* rows, int numConstraints)
+{
+	int cid = get_global_id(0);
+	if (cid>=numConstraints)
+		return;
+	int numRows = numConstraintRows[cid];
+	if (numRows)
+	{
+		for (int i=0;i<numRows;i++)
+		{
+			int rowIndex = rowOffsets[cid]+i;
+			float breakingThreshold = constraints[cid].m_breakingImpulseThreshold;
+			if (fabs(rows[rowIndex].m_appliedImpulse) >= breakingThreshold)
+			{
+				constraints[cid].m_flags =0;//&= ~B3_CONSTRAINT_FLAG_ENABLED;
+			}
+		}
+	}
+}
+
+
+
+__kernel void getInfo1Kernel(__global unsigned int* infos, __global b3GpuGenericConstraint* constraints, int numConstraints)
+{
+	int i = get_global_id(0);
+	if (i>=numConstraints)
+		return;
+
+	__global b3GpuGenericConstraint* constraint = &constraints[i];
+
+	switch (constraint->m_constraintType)
+	{
+		case B3_GPU_POINT2POINT_CONSTRAINT_TYPE:
+		{
+			infos[i] = 3;
+			break;
+		}
+		case B3_GPU_FIXED_CONSTRAINT_TYPE:
+		{
+			infos[i] = 6;
+			break;
+		}
+		default:
+		{
+		}
+	}
+}
+
+__kernel void initBatchConstraintsKernel(__global unsigned int* numConstraintRows, __global unsigned int* rowOffsets, 
+										__global b3BatchConstraint* batchConstraints, 
+										__global b3GpuGenericConstraint* constraints,
+										__global b3RigidBodyCL* bodies,
+										int numConstraints)
+{
+	int i = get_global_id(0);
+	if (i>=numConstraints)
+		return;
+
+	int rbA = constraints[i].m_rbA;
+	int rbB = constraints[i].m_rbB;
+
+	batchConstraints[i].m_bodyAPtrAndSignBit = bodies[rbA].m_invMass != 0.f ? rbA : -rbA;
+	batchConstraints[i].m_bodyBPtrAndSignBit = bodies[rbB].m_invMass != 0.f ? rbB : -rbB;
+	batchConstraints[i].m_batchId = -1;
+	batchConstraints[i].m_originalConstraintIndex = i;
+
+}
+
+
+
+
+typedef struct
+{
+	// integrator parameters: frames per second (1/stepsize), default error
+	// reduction parameter (0..1).
+	float fps,erp;
+
+	// for the first and second body, pointers to two (linear and angular)
+	// n*3 jacobian sub matrices, stored by rows. these matrices will have
+	// been initialized to 0 on entry. if the second body is zero then the
+	// J2xx pointers may be 0.
+	union 
+	{
+		__global float4* m_J1linearAxisFloat4;
+		__global float* m_J1linearAxis;
+	};
+	union
+	{
+		__global float4* m_J1angularAxisFloat4;
+		__global float* m_J1angularAxis;
+
+	};
+	union
+	{
+	__global float4* m_J2linearAxisFloat4;
+	__global float* m_J2linearAxis;
+	};
+	union
+	{
+		__global float4* m_J2angularAxisFloat4;
+		__global float* m_J2angularAxis;
+	};
+	// elements to jump from one row to the next in J's
+	int rowskip;
+
+	// right hand sides of the equation J*v = c + cfm * lambda. cfm is the
+	// "constraint force mixing" vector. c is set to zero on entry, cfm is
+	// set to a constant value (typically very small or zero) value on entry.
+	__global float* m_constraintError;
+	__global float* cfm;
+
+	// lo and hi limits for variables (set to -/+ infinity on entry).
+	__global float* m_lowerLimit;
+	__global float* m_upperLimit;
+
+	// findex vector for variables. see the LCP solver interface for a
+	// description of what this does. this is set to -1 on entry.
+	// note that the returned indexes are relative to the first index of
+	// the constraint.
+	__global int *findex;
+	// number of solver iterations
+	int m_numIterations;
+
+	//damping of the velocity
+	float	m_damping;
+} b3GpuConstraintInfo2;
+
+
+void	getSkewSymmetricMatrix(float4 vecIn, __global float4* v0,__global float4* v1,__global float4* v2)
+{
+	*v0 = (float4)(0.		,-vecIn.z		,vecIn.y,0.f);
+	*v1 = (float4)(vecIn.z	,0.			,-vecIn.x,0.f);
+	*v2 = (float4)(-vecIn.y	,vecIn.x	,0.f,0.f);
+}
+
+
+void getInfo2Point2Point(__global b3GpuGenericConstraint* constraint,b3GpuConstraintInfo2* info,__global b3RigidBodyCL* bodies)
+{
+	float4 posA = bodies[constraint->m_rbA].m_pos;
+	Quaternion rotA = bodies[constraint->m_rbA].m_quat;
+
+	float4 posB = bodies[constraint->m_rbB].m_pos;
+	Quaternion rotB = bodies[constraint->m_rbB].m_quat;
+
+
+
+		// anchor points in global coordinates with respect to body PORs.
+   
+    // set jacobian
+    info->m_J1linearAxis[0] = 1;
+	info->m_J1linearAxis[info->rowskip+1] = 1;
+	info->m_J1linearAxis[2*info->rowskip+2] = 1;
+
+	float4 a1 = qtRotate(rotA,constraint->m_pivotInA);
+
+	{
+		__global float4* angular0 = (__global float4*)(info->m_J1angularAxis);
+		__global float4* angular1 = (__global float4*)(info->m_J1angularAxis+info->rowskip);
+		__global float4* angular2 = (__global float4*)(info->m_J1angularAxis+2*info->rowskip);
+		float4 a1neg = -a1;
+		getSkewSymmetricMatrix(a1neg,angular0,angular1,angular2);
+	}
+	if (info->m_J2linearAxis)
+	{
+		info->m_J2linearAxis[0] = -1;
+		info->m_J2linearAxis[info->rowskip+1] = -1;
+		info->m_J2linearAxis[2*info->rowskip+2] = -1;
+	}
+	
+	float4 a2 = qtRotate(rotB,constraint->m_pivotInB);
+   
+	{
+	//	float4 a2n = -a2;
+		__global float4* angular0 = (__global float4*)(info->m_J2angularAxis);
+		__global float4* angular1 = (__global float4*)(info->m_J2angularAxis+info->rowskip);
+		__global float4* angular2 = (__global float4*)(info->m_J2angularAxis+2*info->rowskip);
+		getSkewSymmetricMatrix(a2,angular0,angular1,angular2);
+	}
+    
+    // set right hand side
+//	float currERP = (m_flags & B3_P2P_FLAGS_ERP) ? m_erp : info->erp;
+	float currERP = info->erp;
+
+	float k = info->fps * currERP;
+    int j;
+	float4 result = a2 + posB - a1 - posA;
+	float* resultPtr = &result;
+
+	for (j=0; j<3; j++)
+    {
+        info->m_constraintError[j*info->rowskip] = k * (resultPtr[j]);
+    }
+}
+
+Quaternion nearest( Quaternion first, Quaternion qd)
+{
+	Quaternion diff,sum;
+	diff = first- qd;
+	sum = first + qd;
+	
+	if( dot(diff,diff) < dot(sum,sum) )
+		return qd;
+	return (-qd);
+}
+
+float b3Acos(float x) 
+{ 
+	if (x<-1)	
+		x=-1; 
+	if (x>1)	
+		x=1;
+	return acos(x); 
+}
+
+float getAngle(Quaternion orn)
+{
+	if (orn.w>=1.f)
+		orn.w=1.f;
+	float s = 2.f * b3Acos(orn.w);
+	return s;
+}
+
+void calculateDiffAxisAngleQuaternion( Quaternion orn0,Quaternion orn1a,float4* axis,float* angle)
+{
+	Quaternion orn1 = nearest(orn0,orn1a);
+	
+	Quaternion dorn = qtMul(orn1,qtInvert(orn0));
+	*angle = getAngle(dorn);
+	*axis = (float4)(dorn.x,dorn.y,dorn.z,0.f);
+	
+	//check for axis length
+	float len = dot3F4(*axis,*axis);
+	if (len < FLT_EPSILON*FLT_EPSILON)
+		*axis = (float4)(1,0,0,0);
+	else
+		*axis /= sqrt(len);
+}
+
+
+
+void getInfo2FixedOrientation(__global b3GpuGenericConstraint* constraint,b3GpuConstraintInfo2* info,__global b3RigidBodyCL* bodies, int start_row)
+{
+	Quaternion worldOrnA = bodies[constraint->m_rbA].m_quat;
+	Quaternion worldOrnB = bodies[constraint->m_rbB].m_quat;
+
+	int s = info->rowskip;
+	int start_index = start_row * s;
+
+	// 3 rows to make body rotations equal
+	info->m_J1angularAxis[start_index] = 1;
+	info->m_J1angularAxis[start_index + s + 1] = 1;
+	info->m_J1angularAxis[start_index + s*2+2] = 1;
+	if ( info->m_J2angularAxis)
+	{
+		info->m_J2angularAxis[start_index] = -1;
+		info->m_J2angularAxis[start_index + s+1] = -1;
+		info->m_J2angularAxis[start_index + s*2+2] = -1;
+	}
+	
+	float currERP = info->erp;
+	float k = info->fps * currERP;
+	float4 diff;
+	float angle;
+	float4 qrelCur = qtMul(worldOrnA,qtInvert(worldOrnB));
+	
+	calculateDiffAxisAngleQuaternion(constraint->m_relTargetAB,qrelCur,&diff,&angle);
+	diff*=-angle;
+		
+	float* resultPtr = &diff;
+	
+	for (int j=0; j<3; j++)
+    {
+        info->m_constraintError[(3+j)*info->rowskip] = k * resultPtr[j];
+    }
+	
+
+}
+
+
+__kernel void writeBackVelocitiesKernel(__global b3RigidBodyCL* bodies,__global b3GpuSolverBody* solverBodies,int numBodies)
+{
+	int i = get_global_id(0);
+	if (i>=numBodies)
+		return;
+
+	if (bodies[i].m_invMass)
+	{
+//		if (length(solverBodies[i].m_deltaLinearVelocity)<MOTIONCLAMP)
+		{
+			bodies[i].m_linVel += solverBodies[i].m_deltaLinearVelocity;
+		}
+//		if (length(solverBodies[i].m_deltaAngularVelocity)<MOTIONCLAMP)
+		{
+			bodies[i].m_angVel += solverBodies[i].m_deltaAngularVelocity;
+		} 
+	}
+}
+
+
+__kernel void getInfo2Kernel(__global b3SolverConstraint* solverConstraintRows, 
+							__global unsigned int* infos, 
+							__global unsigned int* constraintRowOffsets, 
+							__global b3GpuGenericConstraint* constraints, 
+							__global b3BatchConstraint* batchConstraints, 
+							__global b3RigidBodyCL* bodies,
+							__global BodyInertia* inertias,
+							__global b3GpuSolverBody* solverBodies,
+							float timeStep,
+							float globalErp,
+							float globalCfm,
+							float globalDamping,
+							int globalNumIterations,
+							int numConstraints)
+{
+
+	int i = get_global_id(0);
+	if (i>=numConstraints)
+		return;
+		
+	//for now, always initialize the batch info
+	int info1 = infos[i];
+			
+	__global b3SolverConstraint* currentConstraintRow = &solverConstraintRows[constraintRowOffsets[i]];
+	__global b3GpuGenericConstraint* constraint = &constraints[i];
+
+	__global b3RigidBodyCL* rbA = &bodies[ constraint->m_rbA];
+	__global b3RigidBodyCL* rbB = &bodies[ constraint->m_rbB];
+
+	int solverBodyIdA = constraint->m_rbA;
+	int solverBodyIdB = constraint->m_rbB;
+
+	__global b3GpuSolverBody* bodyAPtr = &solverBodies[solverBodyIdA];
+	__global b3GpuSolverBody* bodyBPtr = &solverBodies[solverBodyIdB];
+
+
+	if (rbA->m_invMass)
+	{
+		batchConstraints[i].m_bodyAPtrAndSignBit = solverBodyIdA;
+	} else
+	{
+//			if (!solverBodyIdA)
+//				m_staticIdx = 0;
+		batchConstraints[i].m_bodyAPtrAndSignBit = -solverBodyIdA;
+	}
+
+	if (rbB->m_invMass)
+	{
+		batchConstraints[i].m_bodyBPtrAndSignBit = solverBodyIdB;
+	} else
+	{
+//			if (!solverBodyIdB)
+//				m_staticIdx = 0;
+		batchConstraints[i].m_bodyBPtrAndSignBit = -solverBodyIdB;
+	}
+
+	if (info1)
+	{
+		int overrideNumSolverIterations = 0;//constraint->getOverrideNumSolverIterations() > 0 ? constraint->getOverrideNumSolverIterations() : infoGlobal.m_numIterations;
+//		if (overrideNumSolverIterations>m_maxOverrideNumSolverIterations)
+	//		m_maxOverrideNumSolverIterations = overrideNumSolverIterations;
+
+
+		int j;
+		for ( j=0;j<info1;j++)
+		{
+//			memset(&currentConstraintRow[j],0,sizeof(b3SolverConstraint));
+			currentConstraintRow[j].m_angularComponentA = (float4)(0,0,0,0);
+			currentConstraintRow[j].m_angularComponentB = (float4)(0,0,0,0);
+			currentConstraintRow[j].m_appliedImpulse = 0.f;
+			currentConstraintRow[j].m_appliedPushImpulse = 0.f;
+			currentConstraintRow[j].m_cfm = 0.f;
+			currentConstraintRow[j].m_contactNormal = (float4)(0,0,0,0);
+			currentConstraintRow[j].m_friction = 0.f;
+			currentConstraintRow[j].m_frictionIndex = 0;
+			currentConstraintRow[j].m_jacDiagABInv = 0.f;
+			currentConstraintRow[j].m_lowerLimit = 0.f;
+			currentConstraintRow[j].m_upperLimit = 0.f;
+
+			currentConstraintRow[j].m_originalConstraint = i;
+			currentConstraintRow[j].m_overrideNumSolverIterations = 0;
+			currentConstraintRow[j].m_relpos1CrossNormal = (float4)(0,0,0,0);
+			currentConstraintRow[j].m_relpos2CrossNormal = (float4)(0,0,0,0);
+			currentConstraintRow[j].m_rhs = 0.f;
+			currentConstraintRow[j].m_rhsPenetration = 0.f;
+			currentConstraintRow[j].m_solverBodyIdA = 0;
+			currentConstraintRow[j].m_solverBodyIdB = 0;
+							
+			currentConstraintRow[j].m_lowerLimit = -B3_INFINITY;
+			currentConstraintRow[j].m_upperLimit = B3_INFINITY;
+			currentConstraintRow[j].m_appliedImpulse = 0.f;
+			currentConstraintRow[j].m_appliedPushImpulse = 0.f;
+			currentConstraintRow[j].m_solverBodyIdA = solverBodyIdA;
+			currentConstraintRow[j].m_solverBodyIdB = solverBodyIdB;
+			currentConstraintRow[j].m_overrideNumSolverIterations = overrideNumSolverIterations;		
+		}
+
+		bodyAPtr->m_deltaLinearVelocity = (float4)(0,0,0,0);
+		bodyAPtr->m_deltaAngularVelocity = (float4)(0,0,0,0);
+		bodyAPtr->m_pushVelocity = (float4)(0,0,0,0);
+		bodyAPtr->m_turnVelocity = (float4)(0,0,0,0);
+		bodyBPtr->m_deltaLinearVelocity = (float4)(0,0,0,0);
+		bodyBPtr->m_deltaAngularVelocity = (float4)(0,0,0,0);
+		bodyBPtr->m_pushVelocity = (float4)(0,0,0,0);
+		bodyBPtr->m_turnVelocity  = (float4)(0,0,0,0);
+
+		int rowskip = sizeof(b3SolverConstraint)/sizeof(float);//check this
+
+		
+
+
+		b3GpuConstraintInfo2 info2;
+		info2.fps = 1.f/timeStep;
+		info2.erp = globalErp;
+		info2.m_J1linearAxisFloat4 = &currentConstraintRow->m_contactNormal;
+		info2.m_J1angularAxisFloat4 = &currentConstraintRow->m_relpos1CrossNormal;
+		info2.m_J2linearAxisFloat4 = 0;
+		info2.m_J2angularAxisFloat4 = &currentConstraintRow->m_relpos2CrossNormal;
+		info2.rowskip = sizeof(b3SolverConstraint)/sizeof(float);//check this
+
+		///the size of b3SolverConstraint needs be a multiple of float
+//		b3Assert(info2.rowskip*sizeof(float)== sizeof(b3SolverConstraint));
+		info2.m_constraintError = &currentConstraintRow->m_rhs;
+		currentConstraintRow->m_cfm = globalCfm;
+		info2.m_damping = globalDamping;
+		info2.cfm = &currentConstraintRow->m_cfm;
+		info2.m_lowerLimit = &currentConstraintRow->m_lowerLimit;
+		info2.m_upperLimit = &currentConstraintRow->m_upperLimit;
+		info2.m_numIterations = globalNumIterations;
+
+		switch (constraint->m_constraintType)
+		{
+			case B3_GPU_POINT2POINT_CONSTRAINT_TYPE:
+			{
+				getInfo2Point2Point(constraint,&info2,bodies);
+				break;
+			}
+			case B3_GPU_FIXED_CONSTRAINT_TYPE:
+			{
+				getInfo2Point2Point(constraint,&info2,bodies);
+
+				getInfo2FixedOrientation(constraint,&info2,bodies,3);
+
+				break;
+			}
+
+			default:
+			{
+			}
+		}
+
+		///finalize the constraint setup
+		for ( j=0;j<info1;j++)
+		{
+			__global b3SolverConstraint* solverConstraint = &currentConstraintRow[j];
+
+			if (solverConstraint->m_upperLimit>=constraint->m_breakingImpulseThreshold)
+			{
+				solverConstraint->m_upperLimit = constraint->m_breakingImpulseThreshold;
+			}
+
+			if (solverConstraint->m_lowerLimit<=-constraint->m_breakingImpulseThreshold)
+			{
+				solverConstraint->m_lowerLimit = -constraint->m_breakingImpulseThreshold;
+			}
+
+//						solverConstraint->m_originalContactPoint = constraint;
+							
+			Matrix3x3 invInertiaWorldA= inertias[constraint->m_rbA].m_invInertiaWorld;
+			{
+
+				//float4 angularFactorA(1,1,1);
+				float4 ftorqueAxis1 = solverConstraint->m_relpos1CrossNormal;
+				solverConstraint->m_angularComponentA = mtMul1(invInertiaWorldA,ftorqueAxis1);//*angularFactorA;
+			}
+						
+			Matrix3x3 invInertiaWorldB= inertias[constraint->m_rbB].m_invInertiaWorld;
+			{
+
+				float4 ftorqueAxis2 = solverConstraint->m_relpos2CrossNormal;
+				solverConstraint->m_angularComponentB = mtMul1(invInertiaWorldB,ftorqueAxis2);//*constraint->m_rbB.getAngularFactor();
+			}
+
+			{
+				//it is ok to use solverConstraint->m_contactNormal instead of -solverConstraint->m_contactNormal
+				//because it gets multiplied iMJlB
+				float4 iMJlA = solverConstraint->m_contactNormal*rbA->m_invMass;
+				float4 iMJaA = mtMul3(solverConstraint->m_relpos1CrossNormal,invInertiaWorldA);
+				float4 iMJlB = solverConstraint->m_contactNormal*rbB->m_invMass;//sign of normal?
+				float4 iMJaB = mtMul3(solverConstraint->m_relpos2CrossNormal,invInertiaWorldB);
+
+				float sum = dot3F4(iMJlA,solverConstraint->m_contactNormal);
+				sum += dot3F4(iMJaA,solverConstraint->m_relpos1CrossNormal);
+				sum += dot3F4(iMJlB,solverConstraint->m_contactNormal);
+				sum += dot3F4(iMJaB,solverConstraint->m_relpos2CrossNormal);
+				float fsum = fabs(sum);
+				if (fsum>FLT_EPSILON)
+				{
+					solverConstraint->m_jacDiagABInv = 1.f/sum;
+				} else
+				{
+					solverConstraint->m_jacDiagABInv = 0.f;
+				}
+			}
+
+
+			///fix rhs
+			///todo: add force/torque accelerators
+			{
+				float rel_vel;
+				float vel1Dotn = dot3F4(solverConstraint->m_contactNormal,rbA->m_linVel) + dot3F4(solverConstraint->m_relpos1CrossNormal,rbA->m_angVel);
+				float vel2Dotn = -dot3F4(solverConstraint->m_contactNormal,rbB->m_linVel) + dot3F4(solverConstraint->m_relpos2CrossNormal,rbB->m_angVel);
+
+				rel_vel = vel1Dotn+vel2Dotn;
+
+				float restitution = 0.f;
+				float positionalError = solverConstraint->m_rhs;//already filled in by getConstraintInfo2
+				float	velocityError = restitution - rel_vel * info2.m_damping;
+				float	penetrationImpulse = positionalError*solverConstraint->m_jacDiagABInv;
+				float	velocityImpulse = velocityError *solverConstraint->m_jacDiagABInv;
+				solverConstraint->m_rhs = penetrationImpulse+velocityImpulse;
+				solverConstraint->m_appliedImpulse = 0.f;
+
+			}
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.h
new file mode 100644
index 0000000..c94b558
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/jointSolver.h
@@ -0,0 +1,720 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* solveConstraintRowsCL =
+	"/*\n"
+	"Copyright (c) 2013 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Erwin Coumans\n"
+	"#define B3_CONSTRAINT_FLAG_ENABLED 1\n"
+	"#define B3_GPU_POINT2POINT_CONSTRAINT_TYPE 3\n"
+	"#define B3_GPU_FIXED_CONSTRAINT_TYPE 4\n"
+	"#define MOTIONCLAMP 100000 //unused, for debugging/safety in case constraint solver fails\n"
+	"#define B3_INFINITY 1e30f\n"
+	"#define mymake_float4 (float4)\n"
+	"__inline float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = mymake_float4(a.xyz,0.f);\n"
+	"	float4 b1 = mymake_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"typedef float4 Quaternion;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_row[3];\n"
+	"}Matrix3x3;\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b);\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b);\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b)\n"
+	"{\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a.m_row[0], b );\n"
+	"	ans.y = dot3F4( a.m_row[1], b );\n"
+	"	ans.z = dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b)\n"
+	"{\n"
+	"	float4 colx = mymake_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	float4 coly = mymake_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	float4 colz = mymake_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a, colx );\n"
+	"	ans.y = dot3F4( a, coly );\n"
+	"	ans.z = dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"typedef struct\n"
+	"{\n"
+	"	Matrix3x3 m_invInertiaWorld;\n"
+	"	Matrix3x3 m_initInvInertia;\n"
+	"} BodyInertia;\n"
+	"typedef struct\n"
+	"{\n"
+	"	Matrix3x3 m_basis;//orientation\n"
+	"	float4	m_origin;//transform\n"
+	"}b3Transform;\n"
+	"typedef struct\n"
+	"{\n"
+	"//	b3Transform		m_worldTransformUnused;\n"
+	"	float4		m_deltaLinearVelocity;\n"
+	"	float4		m_deltaAngularVelocity;\n"
+	"	float4		m_angularFactor;\n"
+	"	float4		m_linearFactor;\n"
+	"	float4		m_invMass;\n"
+	"	float4		m_pushVelocity;\n"
+	"	float4		m_turnVelocity;\n"
+	"	float4		m_linearVelocity;\n"
+	"	float4		m_angularVelocity;\n"
+	"	union \n"
+	"	{\n"
+	"		void*	m_originalBody;\n"
+	"		int		m_originalBodyIndex;\n"
+	"	};\n"
+	"	int padding[3];\n"
+	"} b3GpuSolverBody;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	Quaternion m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	unsigned int m_shapeIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} b3RigidBodyCL;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4		m_relpos1CrossNormal;\n"
+	"	float4		m_contactNormal;\n"
+	"	float4		m_relpos2CrossNormal;\n"
+	"	//float4		m_contactNormal2;//usually m_contactNormal2 == -m_contactNormal\n"
+	"	float4		m_angularComponentA;\n"
+	"	float4		m_angularComponentB;\n"
+	"	\n"
+	"	float	m_appliedPushImpulse;\n"
+	"	float	m_appliedImpulse;\n"
+	"	int	m_padding1;\n"
+	"	int	m_padding2;\n"
+	"	float	m_friction;\n"
+	"	float	m_jacDiagABInv;\n"
+	"	float		m_rhs;\n"
+	"	float		m_cfm;\n"
+	"	\n"
+	"    float		m_lowerLimit;\n"
+	"	float		m_upperLimit;\n"
+	"	float		m_rhsPenetration;\n"
+	"	int			m_originalConstraint;\n"
+	"	int	m_overrideNumSolverIterations;\n"
+	"    int			m_frictionIndex;\n"
+	"	int m_solverBodyIdA;\n"
+	"	int m_solverBodyIdB;\n"
+	"} b3SolverConstraint;\n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_bodyAPtrAndSignBit;\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int m_originalConstraintIndex;\n"
+	"	int m_batchId;\n"
+	"} b3BatchConstraint;\n"
+	"typedef struct \n"
+	"{\n"
+	"	int				m_constraintType;\n"
+	"	int				m_rbA;\n"
+	"	int				m_rbB;\n"
+	"	float			m_breakingImpulseThreshold;\n"
+	"	float4 m_pivotInA;\n"
+	"	float4 m_pivotInB;\n"
+	"	Quaternion m_relTargetAB;\n"
+	"	int	m_flags;\n"
+	"	int m_padding[3];\n"
+	"} b3GpuGenericConstraint;\n"
+	"/*b3Transform	getWorldTransform(b3RigidBodyCL* rb)\n"
+	"{\n"
+	"	b3Transform newTrans;\n"
+	"	newTrans.setOrigin(rb->m_pos);\n"
+	"	newTrans.setRotation(rb->m_quat);\n"
+	"	return newTrans;\n"
+	"}*/\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = mymake_float4(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec);\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fastNormalize4(in);\n"
+	"//	in /= length( in );\n"
+	"//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline void internalApplyImpulse(__global b3GpuSolverBody* body,  float4 linearComponent, float4 angularComponent,float impulseMagnitude)\n"
+	"{\n"
+	"	body->m_deltaLinearVelocity += linearComponent*impulseMagnitude*body->m_linearFactor;\n"
+	"	body->m_deltaAngularVelocity += angularComponent*(impulseMagnitude*body->m_angularFactor);\n"
+	"}\n"
+	"void resolveSingleConstraintRowGeneric(__global b3GpuSolverBody* body1, __global b3GpuSolverBody* body2, __global b3SolverConstraint* c)\n"
+	"{\n"
+	"	float deltaImpulse = c->m_rhs-c->m_appliedImpulse*c->m_cfm;\n"
+	"	float deltaVel1Dotn	=	dot3F4(c->m_contactNormal,body1->m_deltaLinearVelocity) 	+ dot3F4(c->m_relpos1CrossNormal,body1->m_deltaAngularVelocity);\n"
+	"	float deltaVel2Dotn	=	-dot3F4(c->m_contactNormal,body2->m_deltaLinearVelocity) + dot3F4(c->m_relpos2CrossNormal,body2->m_deltaAngularVelocity);\n"
+	"	deltaImpulse	-=	deltaVel1Dotn*c->m_jacDiagABInv;\n"
+	"	deltaImpulse	-=	deltaVel2Dotn*c->m_jacDiagABInv;\n"
+	"	float sum = c->m_appliedImpulse + deltaImpulse;\n"
+	"	if (sum < c->m_lowerLimit)\n"
+	"	{\n"
+	"		deltaImpulse = c->m_lowerLimit-c->m_appliedImpulse;\n"
+	"		c->m_appliedImpulse = c->m_lowerLimit;\n"
+	"	}\n"
+	"	else if (sum > c->m_upperLimit) \n"
+	"	{\n"
+	"		deltaImpulse = c->m_upperLimit-c->m_appliedImpulse;\n"
+	"		c->m_appliedImpulse = c->m_upperLimit;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		c->m_appliedImpulse = sum;\n"
+	"	}\n"
+	"	internalApplyImpulse(body1,c->m_contactNormal*body1->m_invMass,c->m_angularComponentA,deltaImpulse);\n"
+	"	internalApplyImpulse(body2,-c->m_contactNormal*body2->m_invMass,c->m_angularComponentB,deltaImpulse);\n"
+	"}\n"
+	"__kernel void solveJointConstraintRows(__global b3GpuSolverBody* solverBodies,\n"
+	"					  __global b3BatchConstraint* batchConstraints,\n"
+	"					  	__global b3SolverConstraint* rows,\n"
+	"						__global unsigned int* numConstraintRowsInfo1, \n"
+	"						__global unsigned int* rowOffsets,\n"
+	"						__global b3GpuGenericConstraint* constraints,\n"
+	"						int batchOffset,\n"
+	"						int numConstraintsInBatch\n"
+	"                      )\n"
+	"{\n"
+	"	int b = get_global_id(0);\n"
+	"	if (b>=numConstraintsInBatch)\n"
+	"		return;\n"
+	"	__global b3BatchConstraint* c = &batchConstraints[b+batchOffset];\n"
+	"	int originalConstraintIndex = c->m_originalConstraintIndex;\n"
+	"	if (constraints[originalConstraintIndex].m_flags&B3_CONSTRAINT_FLAG_ENABLED)\n"
+	"	{\n"
+	"		int numConstraintRows = numConstraintRowsInfo1[originalConstraintIndex];\n"
+	"		int rowOffset = rowOffsets[originalConstraintIndex];\n"
+	"		for (int jj=0;jj<numConstraintRows;jj++)\n"
+	"		{\n"
+	"			__global b3SolverConstraint* constraint = &rows[rowOffset+jj];\n"
+	"			resolveSingleConstraintRowGeneric(&solverBodies[constraint->m_solverBodyIdA],&solverBodies[constraint->m_solverBodyIdB],constraint);\n"
+	"		}\n"
+	"	}\n"
+	"};\n"
+	"__kernel void initSolverBodies(__global b3GpuSolverBody* solverBodies,__global b3RigidBodyCL* bodiesCL, int numBodies)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numBodies)\n"
+	"		return;\n"
+	"	__global b3GpuSolverBody* solverBody = &solverBodies[i];\n"
+	"	__global b3RigidBodyCL* bodyCL = &bodiesCL[i];\n"
+	"	solverBody->m_deltaLinearVelocity = (float4)(0.f,0.f,0.f,0.f);\n"
+	"	solverBody->m_deltaAngularVelocity  = (float4)(0.f,0.f,0.f,0.f);\n"
+	"	solverBody->m_pushVelocity = (float4)(0.f,0.f,0.f,0.f);\n"
+	"	solverBody->m_pushVelocity = (float4)(0.f,0.f,0.f,0.f);\n"
+	"	solverBody->m_invMass = (float4)(bodyCL->m_invMass,bodyCL->m_invMass,bodyCL->m_invMass,0.f);\n"
+	"	solverBody->m_originalBodyIndex = i;\n"
+	"	solverBody->m_angularFactor = (float4)(1,1,1,0);\n"
+	"	solverBody->m_linearFactor = (float4) (1,1,1,0);\n"
+	"	solverBody->m_linearVelocity = bodyCL->m_linVel;\n"
+	"	solverBody->m_angularVelocity = bodyCL->m_angVel;\n"
+	"}\n"
+	"__kernel void breakViolatedConstraintsKernel(__global b3GpuGenericConstraint* constraints, __global unsigned int* numConstraintRows, __global unsigned int* rowOffsets, __global b3SolverConstraint* rows, int numConstraints)\n"
+	"{\n"
+	"	int cid = get_global_id(0);\n"
+	"	if (cid>=numConstraints)\n"
+	"		return;\n"
+	"	int numRows = numConstraintRows[cid];\n"
+	"	if (numRows)\n"
+	"	{\n"
+	"		for (int i=0;i<numRows;i++)\n"
+	"		{\n"
+	"			int rowIndex = rowOffsets[cid]+i;\n"
+	"			float breakingThreshold = constraints[cid].m_breakingImpulseThreshold;\n"
+	"			if (fabs(rows[rowIndex].m_appliedImpulse) >= breakingThreshold)\n"
+	"			{\n"
+	"				constraints[cid].m_flags =0;//&= ~B3_CONSTRAINT_FLAG_ENABLED;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void getInfo1Kernel(__global unsigned int* infos, __global b3GpuGenericConstraint* constraints, int numConstraints)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numConstraints)\n"
+	"		return;\n"
+	"	__global b3GpuGenericConstraint* constraint = &constraints[i];\n"
+	"	switch (constraint->m_constraintType)\n"
+	"	{\n"
+	"		case B3_GPU_POINT2POINT_CONSTRAINT_TYPE:\n"
+	"		{\n"
+	"			infos[i] = 3;\n"
+	"			break;\n"
+	"		}\n"
+	"		case B3_GPU_FIXED_CONSTRAINT_TYPE:\n"
+	"		{\n"
+	"			infos[i] = 6;\n"
+	"			break;\n"
+	"		}\n"
+	"		default:\n"
+	"		{\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel void initBatchConstraintsKernel(__global unsigned int* numConstraintRows, __global unsigned int* rowOffsets, \n"
+	"										__global b3BatchConstraint* batchConstraints, \n"
+	"										__global b3GpuGenericConstraint* constraints,\n"
+	"										__global b3RigidBodyCL* bodies,\n"
+	"										int numConstraints)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numConstraints)\n"
+	"		return;\n"
+	"	int rbA = constraints[i].m_rbA;\n"
+	"	int rbB = constraints[i].m_rbB;\n"
+	"	batchConstraints[i].m_bodyAPtrAndSignBit = bodies[rbA].m_invMass != 0.f ? rbA : -rbA;\n"
+	"	batchConstraints[i].m_bodyBPtrAndSignBit = bodies[rbB].m_invMass != 0.f ? rbB : -rbB;\n"
+	"	batchConstraints[i].m_batchId = -1;\n"
+	"	batchConstraints[i].m_originalConstraintIndex = i;\n"
+	"}\n"
+	"typedef struct\n"
+	"{\n"
+	"	// integrator parameters: frames per second (1/stepsize), default error\n"
+	"	// reduction parameter (0..1).\n"
+	"	float fps,erp;\n"
+	"	// for the first and second body, pointers to two (linear and angular)\n"
+	"	// n*3 jacobian sub matrices, stored by rows. these matrices will have\n"
+	"	// been initialized to 0 on entry. if the second body is zero then the\n"
+	"	// J2xx pointers may be 0.\n"
+	"	union \n"
+	"	{\n"
+	"		__global float4* m_J1linearAxisFloat4;\n"
+	"		__global float* m_J1linearAxis;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		__global float4* m_J1angularAxisFloat4;\n"
+	"		__global float* m_J1angularAxis;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"	__global float4* m_J2linearAxisFloat4;\n"
+	"	__global float* m_J2linearAxis;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		__global float4* m_J2angularAxisFloat4;\n"
+	"		__global float* m_J2angularAxis;\n"
+	"	};\n"
+	"	// elements to jump from one row to the next in J's\n"
+	"	int rowskip;\n"
+	"	// right hand sides of the equation J*v = c + cfm * lambda. cfm is the\n"
+	"	// \"constraint force mixing\" vector. c is set to zero on entry, cfm is\n"
+	"	// set to a constant value (typically very small or zero) value on entry.\n"
+	"	__global float* m_constraintError;\n"
+	"	__global float* cfm;\n"
+	"	// lo and hi limits for variables (set to -/+ infinity on entry).\n"
+	"	__global float* m_lowerLimit;\n"
+	"	__global float* m_upperLimit;\n"
+	"	// findex vector for variables. see the LCP solver interface for a\n"
+	"	// description of what this does. this is set to -1 on entry.\n"
+	"	// note that the returned indexes are relative to the first index of\n"
+	"	// the constraint.\n"
+	"	__global int *findex;\n"
+	"	// number of solver iterations\n"
+	"	int m_numIterations;\n"
+	"	//damping of the velocity\n"
+	"	float	m_damping;\n"
+	"} b3GpuConstraintInfo2;\n"
+	"void	getSkewSymmetricMatrix(float4 vecIn, __global float4* v0,__global float4* v1,__global float4* v2)\n"
+	"{\n"
+	"	*v0 = (float4)(0.		,-vecIn.z		,vecIn.y,0.f);\n"
+	"	*v1 = (float4)(vecIn.z	,0.			,-vecIn.x,0.f);\n"
+	"	*v2 = (float4)(-vecIn.y	,vecIn.x	,0.f,0.f);\n"
+	"}\n"
+	"void getInfo2Point2Point(__global b3GpuGenericConstraint* constraint,b3GpuConstraintInfo2* info,__global b3RigidBodyCL* bodies)\n"
+	"{\n"
+	"	float4 posA = bodies[constraint->m_rbA].m_pos;\n"
+	"	Quaternion rotA = bodies[constraint->m_rbA].m_quat;\n"
+	"	float4 posB = bodies[constraint->m_rbB].m_pos;\n"
+	"	Quaternion rotB = bodies[constraint->m_rbB].m_quat;\n"
+	"		// anchor points in global coordinates with respect to body PORs.\n"
+	"   \n"
+	"    // set jacobian\n"
+	"    info->m_J1linearAxis[0] = 1;\n"
+	"	info->m_J1linearAxis[info->rowskip+1] = 1;\n"
+	"	info->m_J1linearAxis[2*info->rowskip+2] = 1;\n"
+	"	float4 a1 = qtRotate(rotA,constraint->m_pivotInA);\n"
+	"	{\n"
+	"		__global float4* angular0 = (__global float4*)(info->m_J1angularAxis);\n"
+	"		__global float4* angular1 = (__global float4*)(info->m_J1angularAxis+info->rowskip);\n"
+	"		__global float4* angular2 = (__global float4*)(info->m_J1angularAxis+2*info->rowskip);\n"
+	"		float4 a1neg = -a1;\n"
+	"		getSkewSymmetricMatrix(a1neg,angular0,angular1,angular2);\n"
+	"	}\n"
+	"	if (info->m_J2linearAxis)\n"
+	"	{\n"
+	"		info->m_J2linearAxis[0] = -1;\n"
+	"		info->m_J2linearAxis[info->rowskip+1] = -1;\n"
+	"		info->m_J2linearAxis[2*info->rowskip+2] = -1;\n"
+	"	}\n"
+	"	\n"
+	"	float4 a2 = qtRotate(rotB,constraint->m_pivotInB);\n"
+	"   \n"
+	"	{\n"
+	"	//	float4 a2n = -a2;\n"
+	"		__global float4* angular0 = (__global float4*)(info->m_J2angularAxis);\n"
+	"		__global float4* angular1 = (__global float4*)(info->m_J2angularAxis+info->rowskip);\n"
+	"		__global float4* angular2 = (__global float4*)(info->m_J2angularAxis+2*info->rowskip);\n"
+	"		getSkewSymmetricMatrix(a2,angular0,angular1,angular2);\n"
+	"	}\n"
+	"    \n"
+	"    // set right hand side\n"
+	"//	float currERP = (m_flags & B3_P2P_FLAGS_ERP) ? m_erp : info->erp;\n"
+	"	float currERP = info->erp;\n"
+	"	float k = info->fps * currERP;\n"
+	"    int j;\n"
+	"	float4 result = a2 + posB - a1 - posA;\n"
+	"	float* resultPtr = &result;\n"
+	"	for (j=0; j<3; j++)\n"
+	"    {\n"
+	"        info->m_constraintError[j*info->rowskip] = k * (resultPtr[j]);\n"
+	"    }\n"
+	"}\n"
+	"Quaternion nearest( Quaternion first, Quaternion qd)\n"
+	"{\n"
+	"	Quaternion diff,sum;\n"
+	"	diff = first- qd;\n"
+	"	sum = first + qd;\n"
+	"	\n"
+	"	if( dot(diff,diff) < dot(sum,sum) )\n"
+	"		return qd;\n"
+	"	return (-qd);\n"
+	"}\n"
+	"float b3Acos(float x) \n"
+	"{ \n"
+	"	if (x<-1)	\n"
+	"		x=-1; \n"
+	"	if (x>1)	\n"
+	"		x=1;\n"
+	"	return acos(x); \n"
+	"}\n"
+	"float getAngle(Quaternion orn)\n"
+	"{\n"
+	"	if (orn.w>=1.f)\n"
+	"		orn.w=1.f;\n"
+	"	float s = 2.f * b3Acos(orn.w);\n"
+	"	return s;\n"
+	"}\n"
+	"void calculateDiffAxisAngleQuaternion( Quaternion orn0,Quaternion orn1a,float4* axis,float* angle)\n"
+	"{\n"
+	"	Quaternion orn1 = nearest(orn0,orn1a);\n"
+	"	\n"
+	"	Quaternion dorn = qtMul(orn1,qtInvert(orn0));\n"
+	"	*angle = getAngle(dorn);\n"
+	"	*axis = (float4)(dorn.x,dorn.y,dorn.z,0.f);\n"
+	"	\n"
+	"	//check for axis length\n"
+	"	float len = dot3F4(*axis,*axis);\n"
+	"	if (len < FLT_EPSILON*FLT_EPSILON)\n"
+	"		*axis = (float4)(1,0,0,0);\n"
+	"	else\n"
+	"		*axis /= sqrt(len);\n"
+	"}\n"
+	"void getInfo2FixedOrientation(__global b3GpuGenericConstraint* constraint,b3GpuConstraintInfo2* info,__global b3RigidBodyCL* bodies, int start_row)\n"
+	"{\n"
+	"	Quaternion worldOrnA = bodies[constraint->m_rbA].m_quat;\n"
+	"	Quaternion worldOrnB = bodies[constraint->m_rbB].m_quat;\n"
+	"	int s = info->rowskip;\n"
+	"	int start_index = start_row * s;\n"
+	"	// 3 rows to make body rotations equal\n"
+	"	info->m_J1angularAxis[start_index] = 1;\n"
+	"	info->m_J1angularAxis[start_index + s + 1] = 1;\n"
+	"	info->m_J1angularAxis[start_index + s*2+2] = 1;\n"
+	"	if ( info->m_J2angularAxis)\n"
+	"	{\n"
+	"		info->m_J2angularAxis[start_index] = -1;\n"
+	"		info->m_J2angularAxis[start_index + s+1] = -1;\n"
+	"		info->m_J2angularAxis[start_index + s*2+2] = -1;\n"
+	"	}\n"
+	"	\n"
+	"	float currERP = info->erp;\n"
+	"	float k = info->fps * currERP;\n"
+	"	float4 diff;\n"
+	"	float angle;\n"
+	"	float4 qrelCur = qtMul(worldOrnA,qtInvert(worldOrnB));\n"
+	"	\n"
+	"	calculateDiffAxisAngleQuaternion(constraint->m_relTargetAB,qrelCur,&diff,&angle);\n"
+	"	diff*=-angle;\n"
+	"		\n"
+	"	float* resultPtr = &diff;\n"
+	"	\n"
+	"	for (int j=0; j<3; j++)\n"
+	"    {\n"
+	"        info->m_constraintError[(3+j)*info->rowskip] = k * resultPtr[j];\n"
+	"    }\n"
+	"	\n"
+	"}\n"
+	"__kernel void writeBackVelocitiesKernel(__global b3RigidBodyCL* bodies,__global b3GpuSolverBody* solverBodies,int numBodies)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numBodies)\n"
+	"		return;\n"
+	"	if (bodies[i].m_invMass)\n"
+	"	{\n"
+	"//		if (length(solverBodies[i].m_deltaLinearVelocity)<MOTIONCLAMP)\n"
+	"		{\n"
+	"			bodies[i].m_linVel += solverBodies[i].m_deltaLinearVelocity;\n"
+	"		}\n"
+	"//		if (length(solverBodies[i].m_deltaAngularVelocity)<MOTIONCLAMP)\n"
+	"		{\n"
+	"			bodies[i].m_angVel += solverBodies[i].m_deltaAngularVelocity;\n"
+	"		} \n"
+	"	}\n"
+	"}\n"
+	"__kernel void getInfo2Kernel(__global b3SolverConstraint* solverConstraintRows, \n"
+	"							__global unsigned int* infos, \n"
+	"							__global unsigned int* constraintRowOffsets, \n"
+	"							__global b3GpuGenericConstraint* constraints, \n"
+	"							__global b3BatchConstraint* batchConstraints, \n"
+	"							__global b3RigidBodyCL* bodies,\n"
+	"							__global BodyInertia* inertias,\n"
+	"							__global b3GpuSolverBody* solverBodies,\n"
+	"							float timeStep,\n"
+	"							float globalErp,\n"
+	"							float globalCfm,\n"
+	"							float globalDamping,\n"
+	"							int globalNumIterations,\n"
+	"							int numConstraints)\n"
+	"{\n"
+	"	int i = get_global_id(0);\n"
+	"	if (i>=numConstraints)\n"
+	"		return;\n"
+	"		\n"
+	"	//for now, always initialize the batch info\n"
+	"	int info1 = infos[i];\n"
+	"			\n"
+	"	__global b3SolverConstraint* currentConstraintRow = &solverConstraintRows[constraintRowOffsets[i]];\n"
+	"	__global b3GpuGenericConstraint* constraint = &constraints[i];\n"
+	"	__global b3RigidBodyCL* rbA = &bodies[ constraint->m_rbA];\n"
+	"	__global b3RigidBodyCL* rbB = &bodies[ constraint->m_rbB];\n"
+	"	int solverBodyIdA = constraint->m_rbA;\n"
+	"	int solverBodyIdB = constraint->m_rbB;\n"
+	"	__global b3GpuSolverBody* bodyAPtr = &solverBodies[solverBodyIdA];\n"
+	"	__global b3GpuSolverBody* bodyBPtr = &solverBodies[solverBodyIdB];\n"
+	"	if (rbA->m_invMass)\n"
+	"	{\n"
+	"		batchConstraints[i].m_bodyAPtrAndSignBit = solverBodyIdA;\n"
+	"	} else\n"
+	"	{\n"
+	"//			if (!solverBodyIdA)\n"
+	"//				m_staticIdx = 0;\n"
+	"		batchConstraints[i].m_bodyAPtrAndSignBit = -solverBodyIdA;\n"
+	"	}\n"
+	"	if (rbB->m_invMass)\n"
+	"	{\n"
+	"		batchConstraints[i].m_bodyBPtrAndSignBit = solverBodyIdB;\n"
+	"	} else\n"
+	"	{\n"
+	"//			if (!solverBodyIdB)\n"
+	"//				m_staticIdx = 0;\n"
+	"		batchConstraints[i].m_bodyBPtrAndSignBit = -solverBodyIdB;\n"
+	"	}\n"
+	"	if (info1)\n"
+	"	{\n"
+	"		int overrideNumSolverIterations = 0;//constraint->getOverrideNumSolverIterations() > 0 ? constraint->getOverrideNumSolverIterations() : infoGlobal.m_numIterations;\n"
+	"//		if (overrideNumSolverIterations>m_maxOverrideNumSolverIterations)\n"
+	"	//		m_maxOverrideNumSolverIterations = overrideNumSolverIterations;\n"
+	"		int j;\n"
+	"		for ( j=0;j<info1;j++)\n"
+	"		{\n"
+	"//			memset(&currentConstraintRow[j],0,sizeof(b3SolverConstraint));\n"
+	"			currentConstraintRow[j].m_angularComponentA = (float4)(0,0,0,0);\n"
+	"			currentConstraintRow[j].m_angularComponentB = (float4)(0,0,0,0);\n"
+	"			currentConstraintRow[j].m_appliedImpulse = 0.f;\n"
+	"			currentConstraintRow[j].m_appliedPushImpulse = 0.f;\n"
+	"			currentConstraintRow[j].m_cfm = 0.f;\n"
+	"			currentConstraintRow[j].m_contactNormal = (float4)(0,0,0,0);\n"
+	"			currentConstraintRow[j].m_friction = 0.f;\n"
+	"			currentConstraintRow[j].m_frictionIndex = 0;\n"
+	"			currentConstraintRow[j].m_jacDiagABInv = 0.f;\n"
+	"			currentConstraintRow[j].m_lowerLimit = 0.f;\n"
+	"			currentConstraintRow[j].m_upperLimit = 0.f;\n"
+	"			currentConstraintRow[j].m_originalConstraint = i;\n"
+	"			currentConstraintRow[j].m_overrideNumSolverIterations = 0;\n"
+	"			currentConstraintRow[j].m_relpos1CrossNormal = (float4)(0,0,0,0);\n"
+	"			currentConstraintRow[j].m_relpos2CrossNormal = (float4)(0,0,0,0);\n"
+	"			currentConstraintRow[j].m_rhs = 0.f;\n"
+	"			currentConstraintRow[j].m_rhsPenetration = 0.f;\n"
+	"			currentConstraintRow[j].m_solverBodyIdA = 0;\n"
+	"			currentConstraintRow[j].m_solverBodyIdB = 0;\n"
+	"							\n"
+	"			currentConstraintRow[j].m_lowerLimit = -B3_INFINITY;\n"
+	"			currentConstraintRow[j].m_upperLimit = B3_INFINITY;\n"
+	"			currentConstraintRow[j].m_appliedImpulse = 0.f;\n"
+	"			currentConstraintRow[j].m_appliedPushImpulse = 0.f;\n"
+	"			currentConstraintRow[j].m_solverBodyIdA = solverBodyIdA;\n"
+	"			currentConstraintRow[j].m_solverBodyIdB = solverBodyIdB;\n"
+	"			currentConstraintRow[j].m_overrideNumSolverIterations = overrideNumSolverIterations;		\n"
+	"		}\n"
+	"		bodyAPtr->m_deltaLinearVelocity = (float4)(0,0,0,0);\n"
+	"		bodyAPtr->m_deltaAngularVelocity = (float4)(0,0,0,0);\n"
+	"		bodyAPtr->m_pushVelocity = (float4)(0,0,0,0);\n"
+	"		bodyAPtr->m_turnVelocity = (float4)(0,0,0,0);\n"
+	"		bodyBPtr->m_deltaLinearVelocity = (float4)(0,0,0,0);\n"
+	"		bodyBPtr->m_deltaAngularVelocity = (float4)(0,0,0,0);\n"
+	"		bodyBPtr->m_pushVelocity = (float4)(0,0,0,0);\n"
+	"		bodyBPtr->m_turnVelocity  = (float4)(0,0,0,0);\n"
+	"		int rowskip = sizeof(b3SolverConstraint)/sizeof(float);//check this\n"
+	"		\n"
+	"		b3GpuConstraintInfo2 info2;\n"
+	"		info2.fps = 1.f/timeStep;\n"
+	"		info2.erp = globalErp;\n"
+	"		info2.m_J1linearAxisFloat4 = &currentConstraintRow->m_contactNormal;\n"
+	"		info2.m_J1angularAxisFloat4 = &currentConstraintRow->m_relpos1CrossNormal;\n"
+	"		info2.m_J2linearAxisFloat4 = 0;\n"
+	"		info2.m_J2angularAxisFloat4 = &currentConstraintRow->m_relpos2CrossNormal;\n"
+	"		info2.rowskip = sizeof(b3SolverConstraint)/sizeof(float);//check this\n"
+	"		///the size of b3SolverConstraint needs be a multiple of float\n"
+	"//		b3Assert(info2.rowskip*sizeof(float)== sizeof(b3SolverConstraint));\n"
+	"		info2.m_constraintError = &currentConstraintRow->m_rhs;\n"
+	"		currentConstraintRow->m_cfm = globalCfm;\n"
+	"		info2.m_damping = globalDamping;\n"
+	"		info2.cfm = &currentConstraintRow->m_cfm;\n"
+	"		info2.m_lowerLimit = &currentConstraintRow->m_lowerLimit;\n"
+	"		info2.m_upperLimit = &currentConstraintRow->m_upperLimit;\n"
+	"		info2.m_numIterations = globalNumIterations;\n"
+	"		switch (constraint->m_constraintType)\n"
+	"		{\n"
+	"			case B3_GPU_POINT2POINT_CONSTRAINT_TYPE:\n"
+	"			{\n"
+	"				getInfo2Point2Point(constraint,&info2,bodies);\n"
+	"				break;\n"
+	"			}\n"
+	"			case B3_GPU_FIXED_CONSTRAINT_TYPE:\n"
+	"			{\n"
+	"				getInfo2Point2Point(constraint,&info2,bodies);\n"
+	"				getInfo2FixedOrientation(constraint,&info2,bodies,3);\n"
+	"				break;\n"
+	"			}\n"
+	"			default:\n"
+	"			{\n"
+	"			}\n"
+	"		}\n"
+	"		///finalize the constraint setup\n"
+	"		for ( j=0;j<info1;j++)\n"
+	"		{\n"
+	"			__global b3SolverConstraint* solverConstraint = &currentConstraintRow[j];\n"
+	"			if (solverConstraint->m_upperLimit>=constraint->m_breakingImpulseThreshold)\n"
+	"			{\n"
+	"				solverConstraint->m_upperLimit = constraint->m_breakingImpulseThreshold;\n"
+	"			}\n"
+	"			if (solverConstraint->m_lowerLimit<=-constraint->m_breakingImpulseThreshold)\n"
+	"			{\n"
+	"				solverConstraint->m_lowerLimit = -constraint->m_breakingImpulseThreshold;\n"
+	"			}\n"
+	"//						solverConstraint->m_originalContactPoint = constraint;\n"
+	"							\n"
+	"			Matrix3x3 invInertiaWorldA= inertias[constraint->m_rbA].m_invInertiaWorld;\n"
+	"			{\n"
+	"				//float4 angularFactorA(1,1,1);\n"
+	"				float4 ftorqueAxis1 = solverConstraint->m_relpos1CrossNormal;\n"
+	"				solverConstraint->m_angularComponentA = mtMul1(invInertiaWorldA,ftorqueAxis1);//*angularFactorA;\n"
+	"			}\n"
+	"						\n"
+	"			Matrix3x3 invInertiaWorldB= inertias[constraint->m_rbB].m_invInertiaWorld;\n"
+	"			{\n"
+	"				float4 ftorqueAxis2 = solverConstraint->m_relpos2CrossNormal;\n"
+	"				solverConstraint->m_angularComponentB = mtMul1(invInertiaWorldB,ftorqueAxis2);//*constraint->m_rbB.getAngularFactor();\n"
+	"			}\n"
+	"			{\n"
+	"				//it is ok to use solverConstraint->m_contactNormal instead of -solverConstraint->m_contactNormal\n"
+	"				//because it gets multiplied iMJlB\n"
+	"				float4 iMJlA = solverConstraint->m_contactNormal*rbA->m_invMass;\n"
+	"				float4 iMJaA = mtMul3(solverConstraint->m_relpos1CrossNormal,invInertiaWorldA);\n"
+	"				float4 iMJlB = solverConstraint->m_contactNormal*rbB->m_invMass;//sign of normal?\n"
+	"				float4 iMJaB = mtMul3(solverConstraint->m_relpos2CrossNormal,invInertiaWorldB);\n"
+	"				float sum = dot3F4(iMJlA,solverConstraint->m_contactNormal);\n"
+	"				sum += dot3F4(iMJaA,solverConstraint->m_relpos1CrossNormal);\n"
+	"				sum += dot3F4(iMJlB,solverConstraint->m_contactNormal);\n"
+	"				sum += dot3F4(iMJaB,solverConstraint->m_relpos2CrossNormal);\n"
+	"				float fsum = fabs(sum);\n"
+	"				if (fsum>FLT_EPSILON)\n"
+	"				{\n"
+	"					solverConstraint->m_jacDiagABInv = 1.f/sum;\n"
+	"				} else\n"
+	"				{\n"
+	"					solverConstraint->m_jacDiagABInv = 0.f;\n"
+	"				}\n"
+	"			}\n"
+	"			///fix rhs\n"
+	"			///todo: add force/torque accelerators\n"
+	"			{\n"
+	"				float rel_vel;\n"
+	"				float vel1Dotn = dot3F4(solverConstraint->m_contactNormal,rbA->m_linVel) + dot3F4(solverConstraint->m_relpos1CrossNormal,rbA->m_angVel);\n"
+	"				float vel2Dotn = -dot3F4(solverConstraint->m_contactNormal,rbB->m_linVel) + dot3F4(solverConstraint->m_relpos2CrossNormal,rbB->m_angVel);\n"
+	"				rel_vel = vel1Dotn+vel2Dotn;\n"
+	"				float restitution = 0.f;\n"
+	"				float positionalError = solverConstraint->m_rhs;//already filled in by getConstraintInfo2\n"
+	"				float	velocityError = restitution - rel_vel * info2.m_damping;\n"
+	"				float	penetrationImpulse = positionalError*solverConstraint->m_jacDiagABInv;\n"
+	"				float	velocityImpulse = velocityError *solverConstraint->m_jacDiagABInv;\n"
+	"				solverConstraint->m_rhs = penetrationImpulse+velocityImpulse;\n"
+	"				solverConstraint->m_appliedImpulse = 0.f;\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl
new file mode 100644
index 0000000..5c4d62e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl
@@ -0,0 +1,501 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+
+//#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile global int*
+#endif
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define mymake_float4 (float4)
+//#define make_float2 (float2)
+//#define make_uint4 (uint4)
+//#define make_int4 (int4)
+//#define make_uint2 (uint2)
+//#define make_int2 (int2)
+
+
+#define max2 max
+#define min2 min
+
+
+///////////////////////////////////////
+//	Vector
+///////////////////////////////////////
+
+
+
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	return fast_normalize(v);
+}
+
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = mymake_float4(a.xyz,0.f);
+	float4 b1 = mymake_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+
+
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = mymake_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+//	float length = sqrtf(dot3F4(a, a));
+//	return 1.f/length * a;
+}
+
+
+
+
+///////////////////////////////////////
+//	Matrix3x3
+///////////////////////////////////////
+
+typedef struct
+{
+	float4 m_row[3];
+}Matrix3x3;
+
+
+
+
+
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b);
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b);
+
+
+
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b)
+{
+	float4 ans;
+	ans.x = dot3F4( a.m_row[0], b );
+	ans.y = dot3F4( a.m_row[1], b );
+	ans.z = dot3F4( a.m_row[2], b );
+	ans.w = 0.f;
+	return ans;
+}
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b)
+{
+	float4 colx = mymake_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);
+	float4 coly = mymake_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);
+	float4 colz = mymake_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);
+
+	float4 ans;
+	ans.x = dot3F4( a, colx );
+	ans.y = dot3F4( a, coly );
+	ans.z = dot3F4( a, colz );
+	return ans;
+}
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+
+
+
+
+
+
+#define WG_SIZE 64
+
+typedef struct
+{
+	float4 m_pos;
+	Quaternion m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_shapeIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} Body;
+
+typedef struct
+{
+	Matrix3x3 m_invInertia;
+	Matrix3x3 m_initInvInertia;
+} Shape;
+
+typedef struct
+{
+	float4 m_linear;
+	float4 m_worldPos[4];
+	float4 m_center;	
+	float m_jacCoeffInv[4];
+	float m_b[4];
+	float m_appliedRambdaDt[4];
+
+	float m_fJacCoeffInv[2];	
+	float m_fAppliedRambdaDt[2];	
+
+	u32 m_bodyA;
+	u32 m_bodyB;
+
+	int m_batchIdx;
+	u32 m_paddings[1];
+} Constraint4;
+
+
+
+typedef struct
+{
+	int m_nConstraints;
+	int m_start;
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBuffer;
+
+typedef struct
+{
+	int m_solveFriction;
+	int m_maxBatch;	//	long batch really kills the performance
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBufferBatchSolve;
+
+void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1);
+
+void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1)
+{
+	*linear = mymake_float4(-n.xyz,0.f);
+	*angular0 = -cross3(r0, n);
+	*angular1 = cross3(r1, n);
+}
+
+float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 );
+
+float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 )
+{
+	return dot3F4(l0, linVel0) + dot3F4(a0, angVel0) + dot3F4(l1, linVel1) + dot3F4(a1, angVel1);
+}
+
+
+float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,
+				   float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1);
+
+float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,
+					float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1)
+{
+	//	linear0,1 are normlized
+	float jmj0 = invMass0;//dot3F4(linear0, linear0)*invMass0;
+	float jmj1 = dot3F4(mtMul3(angular0,*invInertia0), angular0);
+	float jmj2 = invMass1;//dot3F4(linear1, linear1)*invMass1;
+	float jmj3 = dot3F4(mtMul3(angular1,*invInertia1), angular1);
+	return -1.f/(jmj0+jmj1+jmj2+jmj3);
+}
+
+
+void solveContact(__global Constraint4* cs,
+				  float4 posA, float4* linVelA, float4* angVelA, float invMassA, Matrix3x3 invInertiaA,
+				  float4 posB, float4* linVelB, float4* angVelB, float invMassB, Matrix3x3 invInertiaB);
+
+void solveContact(__global Constraint4* cs,
+			float4 posA, float4* linVelA, float4* angVelA, float invMassA, Matrix3x3 invInertiaA,
+			float4 posB, float4* linVelB, float4* angVelB, float invMassB, Matrix3x3 invInertiaB)
+{
+	float minRambdaDt = 0;
+	float maxRambdaDt = FLT_MAX;
+
+	for(int ic=0; ic<4; ic++)
+	{
+		if( cs->m_jacCoeffInv[ic] == 0.f ) continue;
+
+		float4 angular0, angular1, linear;
+		float4 r0 = cs->m_worldPos[ic] - posA;
+		float4 r1 = cs->m_worldPos[ic] - posB;
+		setLinearAndAngular( -cs->m_linear, r0, r1, &linear, &angular0, &angular1 );
+
+		float rambdaDt = calcRelVel( cs->m_linear, -cs->m_linear, angular0, angular1, 
+			*linVelA, *angVelA, *linVelB, *angVelB ) + cs->m_b[ic];
+		rambdaDt *= cs->m_jacCoeffInv[ic];
+
+		{
+			float prevSum = cs->m_appliedRambdaDt[ic];
+			float updated = prevSum;
+			updated += rambdaDt;
+			updated = max2( updated, minRambdaDt );
+			updated = min2( updated, maxRambdaDt );
+			rambdaDt = updated - prevSum;
+			cs->m_appliedRambdaDt[ic] = updated;
+		}
+
+		float4 linImp0 = invMassA*linear*rambdaDt;
+		float4 linImp1 = invMassB*(-linear)*rambdaDt;
+		float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;
+		float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;
+
+		*linVelA += linImp0;
+		*angVelA += angImp0;
+		*linVelB += linImp1;
+		*angVelB += angImp1;
+	}
+}
+
+void btPlaneSpace1 (const float4* n, float4* p, float4* q);
+ void btPlaneSpace1 (const float4* n, float4* p, float4* q)
+{
+  if (fabs(n[0].z) > 0.70710678f) {
+    // choose p in y-z plane
+    float a = n[0].y*n[0].y + n[0].z*n[0].z;
+    float k = 1.f/sqrt(a);
+    p[0].x = 0;
+	p[0].y = -n[0].z*k;
+	p[0].z = n[0].y*k;
+    // set q = n x p
+    q[0].x = a*k;
+	q[0].y = -n[0].x*p[0].z;
+	q[0].z = n[0].x*p[0].y;
+  }
+  else {
+    // choose p in x-y plane
+    float a = n[0].x*n[0].x + n[0].y*n[0].y;
+    float k = 1.f/sqrt(a);
+    p[0].x = -n[0].y*k;
+	p[0].y = n[0].x*k;
+	p[0].z = 0;
+    // set q = n x p
+    q[0].x = -n[0].z*p[0].y;
+	q[0].y = n[0].z*p[0].x;
+	q[0].z = a*k;
+  }
+}
+
+void solveContactConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs);
+void solveContactConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs)
+{
+	//float frictionCoeff = ldsCs[0].m_linear.w;
+	int aIdx = ldsCs[0].m_bodyA;
+	int bIdx = ldsCs[0].m_bodyB;
+
+	float4 posA = gBodies[aIdx].m_pos;
+	float4 linVelA = gBodies[aIdx].m_linVel;
+	float4 angVelA = gBodies[aIdx].m_angVel;
+	float invMassA = gBodies[aIdx].m_invMass;
+	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;
+
+	float4 posB = gBodies[bIdx].m_pos;
+	float4 linVelB = gBodies[bIdx].m_linVel;
+	float4 angVelB = gBodies[bIdx].m_angVel;
+	float invMassB = gBodies[bIdx].m_invMass;
+	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;
+
+	solveContact( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,
+			posB, &linVelB, &angVelB, invMassB, invInertiaB );
+
+  if (gBodies[aIdx].m_invMass)
+  {
+		gBodies[aIdx].m_linVel = linVelA;
+		gBodies[aIdx].m_angVel = angVelA;
+	} else
+	{
+		gBodies[aIdx].m_linVel = mymake_float4(0,0,0,0);
+		gBodies[aIdx].m_angVel = mymake_float4(0,0,0,0);
+	
+	}
+	if (gBodies[bIdx].m_invMass)
+  {
+		gBodies[bIdx].m_linVel = linVelB;
+		gBodies[bIdx].m_angVel = angVelB;
+	} else
+	{
+		gBodies[bIdx].m_linVel = mymake_float4(0,0,0,0);
+		gBodies[bIdx].m_angVel = mymake_float4(0,0,0,0);
+	
+	}
+
+}
+
+
+
+typedef struct 
+{
+	int m_valInt0;
+	int m_valInt1;
+	int m_valInt2;
+	int m_valInt3;
+
+	float m_val0;
+	float m_val1;
+	float m_val2;
+	float m_val3;
+} SolverDebugInfo;
+
+
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void BatchSolveKernelContact(__global Body* gBodies,
+                      __global Shape* gShapes,
+                      __global Constraint4* gConstraints,
+                      __global int* gN,
+                      __global int* gOffsets,
+                      __global	int* batchSizes,
+                       int maxBatch1,
+                       int cellBatch,
+                       int4 nSplit
+                      )
+{
+	//__local int ldsBatchIdx[WG_SIZE+1];
+	__local int ldsCurBatch;
+	__local int ldsNextBatch;
+	__local int ldsStart;
+
+	int lIdx = GET_LOCAL_IDX;
+	int wgIdx = GET_GROUP_IDX;
+
+//	int gIdx = GET_GLOBAL_IDX;
+//	debugInfo[gIdx].m_valInt0 = gIdx;
+	//debugInfo[gIdx].m_valInt1 = GET_GROUP_SIZE;
+
+	
+	
+
+	int zIdx = (wgIdx/((nSplit.x*nSplit.y)/4))*2+((cellBatch&4)>>2);
+	int remain= (wgIdx%((nSplit.x*nSplit.y)/4));
+	int yIdx = (remain/(nSplit.x/2))*2 + ((cellBatch&2)>>1);
+	int xIdx = (remain%(nSplit.x/2))*2 + (cellBatch&1);
+	int cellIdx = xIdx+yIdx*nSplit.x+zIdx*(nSplit.x*nSplit.y);
+
+	//int xIdx = (wgIdx/(nSplit/2))*2 + (bIdx&1);
+	//int yIdx = (wgIdx%(nSplit/2))*2 + (bIdx>>1);
+	//int cellIdx = xIdx+yIdx*nSplit;
+	
+	if( gN[cellIdx] == 0 ) 
+		return;
+
+	int maxBatch = batchSizes[cellIdx];
+	
+	
+	const int start = gOffsets[cellIdx];
+	const int end = start + gN[cellIdx];
+
+	
+	
+	
+	if( lIdx == 0 )
+	{
+		ldsCurBatch = 0;
+		ldsNextBatch = 0;
+		ldsStart = start;
+	}
+
+
+	GROUP_LDS_BARRIER;
+
+	int idx=ldsStart+lIdx;
+	while (ldsCurBatch < maxBatch)
+	{
+		for(; idx<end; )
+		{
+			if (gConstraints[idx].m_batchIdx == ldsCurBatch)
+			{
+					solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );
+
+				 idx+=64;
+			} else
+			{
+				break;
+			}
+		}
+		GROUP_LDS_BARRIER;
+	
+		if( lIdx == 0 )
+		{
+			ldsCurBatch++;
+		}
+		GROUP_LDS_BARRIER;
+	}
+	
+    
+}
+
+
+
+__kernel void solveSingleContactKernel(__global Body* gBodies,
+                      __global Shape* gShapes,
+                      __global Constraint4* gConstraints,
+                       int cellIdx,
+                       int batchOffset,
+                       int numConstraintsInBatch
+                      )
+{
+
+	int index = get_global_id(0);
+	if (index < numConstraintsInBatch)
+	{
+		int idx=batchOffset+index;
+		solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );
+	}    
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h
new file mode 100644
index 0000000..6e14ad5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h
@@ -0,0 +1,392 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* solveContactCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"//#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile global int*\n"
+	"#endif\n"
+	"typedef unsigned int u32;\n"
+	"typedef unsigned short u16;\n"
+	"typedef unsigned char u8;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define mymake_float4 (float4)\n"
+	"//#define make_float2 (float2)\n"
+	"//#define make_uint4 (uint4)\n"
+	"//#define make_int4 (int4)\n"
+	"//#define make_uint2 (uint2)\n"
+	"//#define make_int2 (int2)\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"///////////////////////////////////////\n"
+	"//	Vector\n"
+	"///////////////////////////////////////\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = mymake_float4(a.xyz,0.f);\n"
+	"	float4 b1 = mymake_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = mymake_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"//	float length = sqrtf(dot3F4(a, a));\n"
+	"//	return 1.f/length * a;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Matrix3x3\n"
+	"///////////////////////////////////////\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_row[3];\n"
+	"}Matrix3x3;\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b);\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b);\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b)\n"
+	"{\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a.m_row[0], b );\n"
+	"	ans.y = dot3F4( a.m_row[1], b );\n"
+	"	ans.z = dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b)\n"
+	"{\n"
+	"	float4 colx = mymake_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	float4 coly = mymake_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	float4 colz = mymake_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a, colx );\n"
+	"	ans.y = dot3F4( a, coly );\n"
+	"	ans.z = dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"#define WG_SIZE 64\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	Quaternion m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_shapeIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} Body;\n"
+	"typedef struct\n"
+	"{\n"
+	"	Matrix3x3 m_invInertia;\n"
+	"	Matrix3x3 m_initInvInertia;\n"
+	"} Shape;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_linear;\n"
+	"	float4 m_worldPos[4];\n"
+	"	float4 m_center;	\n"
+	"	float m_jacCoeffInv[4];\n"
+	"	float m_b[4];\n"
+	"	float m_appliedRambdaDt[4];\n"
+	"	float m_fJacCoeffInv[2];	\n"
+	"	float m_fAppliedRambdaDt[2];	\n"
+	"	u32 m_bodyA;\n"
+	"	u32 m_bodyB;\n"
+	"	int m_batchIdx;\n"
+	"	u32 m_paddings[1];\n"
+	"} Constraint4;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_nConstraints;\n"
+	"	int m_start;\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBuffer;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_solveFriction;\n"
+	"	int m_maxBatch;	//	long batch really kills the performance\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBufferBatchSolve;\n"
+	"void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1);\n"
+	"void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1)\n"
+	"{\n"
+	"	*linear = mymake_float4(-n.xyz,0.f);\n"
+	"	*angular0 = -cross3(r0, n);\n"
+	"	*angular1 = cross3(r1, n);\n"
+	"}\n"
+	"float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 );\n"
+	"float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 )\n"
+	"{\n"
+	"	return dot3F4(l0, linVel0) + dot3F4(a0, angVel0) + dot3F4(l1, linVel1) + dot3F4(a1, angVel1);\n"
+	"}\n"
+	"float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,\n"
+	"				   float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1);\n"
+	"float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,\n"
+	"					float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1)\n"
+	"{\n"
+	"	//	linear0,1 are normlized\n"
+	"	float jmj0 = invMass0;//dot3F4(linear0, linear0)*invMass0;\n"
+	"	float jmj1 = dot3F4(mtMul3(angular0,*invInertia0), angular0);\n"
+	"	float jmj2 = invMass1;//dot3F4(linear1, linear1)*invMass1;\n"
+	"	float jmj3 = dot3F4(mtMul3(angular1,*invInertia1), angular1);\n"
+	"	return -1.f/(jmj0+jmj1+jmj2+jmj3);\n"
+	"}\n"
+	"void solveContact(__global Constraint4* cs,\n"
+	"				  float4 posA, float4* linVelA, float4* angVelA, float invMassA, Matrix3x3 invInertiaA,\n"
+	"				  float4 posB, float4* linVelB, float4* angVelB, float invMassB, Matrix3x3 invInertiaB);\n"
+	"void solveContact(__global Constraint4* cs,\n"
+	"			float4 posA, float4* linVelA, float4* angVelA, float invMassA, Matrix3x3 invInertiaA,\n"
+	"			float4 posB, float4* linVelB, float4* angVelB, float invMassB, Matrix3x3 invInertiaB)\n"
+	"{\n"
+	"	float minRambdaDt = 0;\n"
+	"	float maxRambdaDt = FLT_MAX;\n"
+	"	for(int ic=0; ic<4; ic++)\n"
+	"	{\n"
+	"		if( cs->m_jacCoeffInv[ic] == 0.f ) continue;\n"
+	"		float4 angular0, angular1, linear;\n"
+	"		float4 r0 = cs->m_worldPos[ic] - posA;\n"
+	"		float4 r1 = cs->m_worldPos[ic] - posB;\n"
+	"		setLinearAndAngular( -cs->m_linear, r0, r1, &linear, &angular0, &angular1 );\n"
+	"		float rambdaDt = calcRelVel( cs->m_linear, -cs->m_linear, angular0, angular1, \n"
+	"			*linVelA, *angVelA, *linVelB, *angVelB ) + cs->m_b[ic];\n"
+	"		rambdaDt *= cs->m_jacCoeffInv[ic];\n"
+	"		{\n"
+	"			float prevSum = cs->m_appliedRambdaDt[ic];\n"
+	"			float updated = prevSum;\n"
+	"			updated += rambdaDt;\n"
+	"			updated = max2( updated, minRambdaDt );\n"
+	"			updated = min2( updated, maxRambdaDt );\n"
+	"			rambdaDt = updated - prevSum;\n"
+	"			cs->m_appliedRambdaDt[ic] = updated;\n"
+	"		}\n"
+	"		float4 linImp0 = invMassA*linear*rambdaDt;\n"
+	"		float4 linImp1 = invMassB*(-linear)*rambdaDt;\n"
+	"		float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;\n"
+	"		float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;\n"
+	"		*linVelA += linImp0;\n"
+	"		*angVelA += angImp0;\n"
+	"		*linVelB += linImp1;\n"
+	"		*angVelB += angImp1;\n"
+	"	}\n"
+	"}\n"
+	"void btPlaneSpace1 (const float4* n, float4* p, float4* q);\n"
+	" void btPlaneSpace1 (const float4* n, float4* p, float4* q)\n"
+	"{\n"
+	"  if (fabs(n[0].z) > 0.70710678f) {\n"
+	"    // choose p in y-z plane\n"
+	"    float a = n[0].y*n[0].y + n[0].z*n[0].z;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = 0;\n"
+	"	p[0].y = -n[0].z*k;\n"
+	"	p[0].z = n[0].y*k;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = a*k;\n"
+	"	q[0].y = -n[0].x*p[0].z;\n"
+	"	q[0].z = n[0].x*p[0].y;\n"
+	"  }\n"
+	"  else {\n"
+	"    // choose p in x-y plane\n"
+	"    float a = n[0].x*n[0].x + n[0].y*n[0].y;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = -n[0].y*k;\n"
+	"	p[0].y = n[0].x*k;\n"
+	"	p[0].z = 0;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = -n[0].z*p[0].y;\n"
+	"	q[0].y = n[0].z*p[0].x;\n"
+	"	q[0].z = a*k;\n"
+	"  }\n"
+	"}\n"
+	"void solveContactConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs);\n"
+	"void solveContactConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs)\n"
+	"{\n"
+	"	//float frictionCoeff = ldsCs[0].m_linear.w;\n"
+	"	int aIdx = ldsCs[0].m_bodyA;\n"
+	"	int bIdx = ldsCs[0].m_bodyB;\n"
+	"	float4 posA = gBodies[aIdx].m_pos;\n"
+	"	float4 linVelA = gBodies[aIdx].m_linVel;\n"
+	"	float4 angVelA = gBodies[aIdx].m_angVel;\n"
+	"	float invMassA = gBodies[aIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;\n"
+	"	float4 posB = gBodies[bIdx].m_pos;\n"
+	"	float4 linVelB = gBodies[bIdx].m_linVel;\n"
+	"	float4 angVelB = gBodies[bIdx].m_angVel;\n"
+	"	float invMassB = gBodies[bIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;\n"
+	"	solveContact( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,\n"
+	"			posB, &linVelB, &angVelB, invMassB, invInertiaB );\n"
+	"  if (gBodies[aIdx].m_invMass)\n"
+	"  {\n"
+	"		gBodies[aIdx].m_linVel = linVelA;\n"
+	"		gBodies[aIdx].m_angVel = angVelA;\n"
+	"	} else\n"
+	"	{\n"
+	"		gBodies[aIdx].m_linVel = mymake_float4(0,0,0,0);\n"
+	"		gBodies[aIdx].m_angVel = mymake_float4(0,0,0,0);\n"
+	"	\n"
+	"	}\n"
+	"	if (gBodies[bIdx].m_invMass)\n"
+	"  {\n"
+	"		gBodies[bIdx].m_linVel = linVelB;\n"
+	"		gBodies[bIdx].m_angVel = angVelB;\n"
+	"	} else\n"
+	"	{\n"
+	"		gBodies[bIdx].m_linVel = mymake_float4(0,0,0,0);\n"
+	"		gBodies[bIdx].m_angVel = mymake_float4(0,0,0,0);\n"
+	"	\n"
+	"	}\n"
+	"}\n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_valInt0;\n"
+	"	int m_valInt1;\n"
+	"	int m_valInt2;\n"
+	"	int m_valInt3;\n"
+	"	float m_val0;\n"
+	"	float m_val1;\n"
+	"	float m_val2;\n"
+	"	float m_val3;\n"
+	"} SolverDebugInfo;\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void BatchSolveKernelContact(__global Body* gBodies,\n"
+	"                      __global Shape* gShapes,\n"
+	"                      __global Constraint4* gConstraints,\n"
+	"                      __global int* gN,\n"
+	"                      __global int* gOffsets,\n"
+	"                      __global	int* batchSizes,\n"
+	"                       int maxBatch1,\n"
+	"                       int cellBatch,\n"
+	"                       int4 nSplit\n"
+	"                      )\n"
+	"{\n"
+	"	//__local int ldsBatchIdx[WG_SIZE+1];\n"
+	"	__local int ldsCurBatch;\n"
+	"	__local int ldsNextBatch;\n"
+	"	__local int ldsStart;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	int wgIdx = GET_GROUP_IDX;\n"
+	"//	int gIdx = GET_GLOBAL_IDX;\n"
+	"//	debugInfo[gIdx].m_valInt0 = gIdx;\n"
+	"	//debugInfo[gIdx].m_valInt1 = GET_GROUP_SIZE;\n"
+	"	\n"
+	"	\n"
+	"	int zIdx = (wgIdx/((nSplit.x*nSplit.y)/4))*2+((cellBatch&4)>>2);\n"
+	"	int remain= (wgIdx%((nSplit.x*nSplit.y)/4));\n"
+	"	int yIdx = (remain/(nSplit.x/2))*2 + ((cellBatch&2)>>1);\n"
+	"	int xIdx = (remain%(nSplit.x/2))*2 + (cellBatch&1);\n"
+	"	int cellIdx = xIdx+yIdx*nSplit.x+zIdx*(nSplit.x*nSplit.y);\n"
+	"	//int xIdx = (wgIdx/(nSplit/2))*2 + (bIdx&1);\n"
+	"	//int yIdx = (wgIdx%(nSplit/2))*2 + (bIdx>>1);\n"
+	"	//int cellIdx = xIdx+yIdx*nSplit;\n"
+	"	\n"
+	"	if( gN[cellIdx] == 0 ) \n"
+	"		return;\n"
+	"	int maxBatch = batchSizes[cellIdx];\n"
+	"	\n"
+	"	\n"
+	"	const int start = gOffsets[cellIdx];\n"
+	"	const int end = start + gN[cellIdx];\n"
+	"	\n"
+	"	\n"
+	"	\n"
+	"	if( lIdx == 0 )\n"
+	"	{\n"
+	"		ldsCurBatch = 0;\n"
+	"		ldsNextBatch = 0;\n"
+	"		ldsStart = start;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	int idx=ldsStart+lIdx;\n"
+	"	while (ldsCurBatch < maxBatch)\n"
+	"	{\n"
+	"		for(; idx<end; )\n"
+	"		{\n"
+	"			if (gConstraints[idx].m_batchIdx == ldsCurBatch)\n"
+	"			{\n"
+	"					solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );\n"
+	"				 idx+=64;\n"
+	"			} else\n"
+	"			{\n"
+	"				break;\n"
+	"			}\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"	\n"
+	"		if( lIdx == 0 )\n"
+	"		{\n"
+	"			ldsCurBatch++;\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"	}\n"
+	"	\n"
+	"    \n"
+	"}\n"
+	"__kernel void solveSingleContactKernel(__global Body* gBodies,\n"
+	"                      __global Shape* gShapes,\n"
+	"                      __global Constraint4* gConstraints,\n"
+	"                       int cellIdx,\n"
+	"                       int batchOffset,\n"
+	"                       int numConstraintsInBatch\n"
+	"                      )\n"
+	"{\n"
+	"	int index = get_global_id(0);\n"
+	"	if (index < numConstraintsInBatch)\n"
+	"	{\n"
+	"		int idx=batchOffset+index;\n"
+	"		solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );\n"
+	"	}    \n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl
new file mode 100644
index 0000000..1d70fbb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.cl
@@ -0,0 +1,527 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+
+//#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile global int*
+#endif
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define mymake_float4 (float4)
+//#define make_float2 (float2)
+//#define make_uint4 (uint4)
+//#define make_int4 (int4)
+//#define make_uint2 (uint2)
+//#define make_int2 (int2)
+
+
+#define max2 max
+#define min2 min
+
+
+///////////////////////////////////////
+//	Vector
+///////////////////////////////////////
+
+
+
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	return fast_normalize(v);
+}
+
+
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = mymake_float4(a.xyz,0.f);
+	float4 b1 = mymake_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+
+
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = mymake_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+//	float length = sqrtf(dot3F4(a, a));
+//	return 1.f/length * a;
+}
+
+
+
+
+///////////////////////////////////////
+//	Matrix3x3
+///////////////////////////////////////
+
+typedef struct
+{
+	float4 m_row[3];
+}Matrix3x3;
+
+
+
+
+
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b);
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b);
+
+
+
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b)
+{
+	float4 ans;
+	ans.x = dot3F4( a.m_row[0], b );
+	ans.y = dot3F4( a.m_row[1], b );
+	ans.z = dot3F4( a.m_row[2], b );
+	ans.w = 0.f;
+	return ans;
+}
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b)
+{
+	float4 colx = mymake_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);
+	float4 coly = mymake_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);
+	float4 colz = mymake_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);
+
+	float4 ans;
+	ans.x = dot3F4( a, colx );
+	ans.y = dot3F4( a, coly );
+	ans.z = dot3F4( a, colz );
+	return ans;
+}
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+
+
+
+
+
+
+#define WG_SIZE 64
+
+typedef struct
+{
+	float4 m_pos;
+	Quaternion m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_shapeIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} Body;
+
+typedef struct
+{
+	Matrix3x3 m_invInertia;
+	Matrix3x3 m_initInvInertia;
+} Shape;
+
+typedef struct
+{
+	float4 m_linear;
+	float4 m_worldPos[4];
+	float4 m_center;	
+	float m_jacCoeffInv[4];
+	float m_b[4];
+	float m_appliedRambdaDt[4];
+
+	float m_fJacCoeffInv[2];	
+	float m_fAppliedRambdaDt[2];	
+
+	u32 m_bodyA;
+	u32 m_bodyB;
+
+	int m_batchIdx;
+	u32 m_paddings[1];
+} Constraint4;
+
+
+
+typedef struct
+{
+	int m_nConstraints;
+	int m_start;
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBuffer;
+
+typedef struct
+{
+	int m_solveFriction;
+	int m_maxBatch;	//	long batch really kills the performance
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBufferBatchSolve;
+
+void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1);
+
+void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1)
+{
+	*linear = mymake_float4(-n.xyz,0.f);
+	*angular0 = -cross3(r0, n);
+	*angular1 = cross3(r1, n);
+}
+
+float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 );
+
+float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 )
+{
+	return dot3F4(l0, linVel0) + dot3F4(a0, angVel0) + dot3F4(l1, linVel1) + dot3F4(a1, angVel1);
+}
+
+
+float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,
+				   float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1);
+
+float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,
+					float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1)
+{
+	//	linear0,1 are normlized
+	float jmj0 = invMass0;//dot3F4(linear0, linear0)*invMass0;
+	float jmj1 = dot3F4(mtMul3(angular0,*invInertia0), angular0);
+	float jmj2 = invMass1;//dot3F4(linear1, linear1)*invMass1;
+	float jmj3 = dot3F4(mtMul3(angular1,*invInertia1), angular1);
+	return -1.f/(jmj0+jmj1+jmj2+jmj3);
+}
+void btPlaneSpace1 (const float4* n, float4* p, float4* q);
+ void btPlaneSpace1 (const float4* n, float4* p, float4* q)
+{
+  if (fabs(n[0].z) > 0.70710678f) {
+    // choose p in y-z plane
+    float a = n[0].y*n[0].y + n[0].z*n[0].z;
+    float k = 1.f/sqrt(a);
+    p[0].x = 0;
+	p[0].y = -n[0].z*k;
+	p[0].z = n[0].y*k;
+    // set q = n x p
+    q[0].x = a*k;
+	q[0].y = -n[0].x*p[0].z;
+	q[0].z = n[0].x*p[0].y;
+  }
+  else {
+    // choose p in x-y plane
+    float a = n[0].x*n[0].x + n[0].y*n[0].y;
+    float k = 1.f/sqrt(a);
+    p[0].x = -n[0].y*k;
+	p[0].y = n[0].x*k;
+	p[0].z = 0;
+    // set q = n x p
+    q[0].x = -n[0].z*p[0].y;
+	q[0].y = n[0].z*p[0].x;
+	q[0].z = a*k;
+  }
+}
+
+
+void solveFrictionConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs);
+void solveFrictionConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs)
+{
+	float frictionCoeff = ldsCs[0].m_linear.w;
+	int aIdx = ldsCs[0].m_bodyA;
+	int bIdx = ldsCs[0].m_bodyB;
+
+
+	float4 posA = gBodies[aIdx].m_pos;
+	float4 linVelA = gBodies[aIdx].m_linVel;
+	float4 angVelA = gBodies[aIdx].m_angVel;
+	float invMassA = gBodies[aIdx].m_invMass;
+	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;
+
+	float4 posB = gBodies[bIdx].m_pos;
+	float4 linVelB = gBodies[bIdx].m_linVel;
+	float4 angVelB = gBodies[bIdx].m_angVel;
+	float invMassB = gBodies[bIdx].m_invMass;
+	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;
+	
+
+	{
+		float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};
+		float minRambdaDt[4] = {0.f,0.f,0.f,0.f};
+
+		float sum = 0;
+		for(int j=0; j<4; j++)
+		{
+			sum +=ldsCs[0].m_appliedRambdaDt[j];
+		}
+		frictionCoeff = 0.7f;
+		for(int j=0; j<4; j++)
+		{
+			maxRambdaDt[j] = frictionCoeff*sum;
+			minRambdaDt[j] = -maxRambdaDt[j];
+		}
+
+		
+//		solveFriction( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,
+//			posB, &linVelB, &angVelB, invMassB, invInertiaB, maxRambdaDt, minRambdaDt );
+		
+		
+		{
+			
+			__global Constraint4* cs = ldsCs;
+			
+			if( cs->m_fJacCoeffInv[0] == 0 && cs->m_fJacCoeffInv[0] == 0 ) return;
+			const float4 center = cs->m_center;
+			
+			float4 n = -cs->m_linear;
+			
+			float4 tangent[2];
+			btPlaneSpace1(&n,&tangent[0],&tangent[1]);
+			float4 angular0, angular1, linear;
+			float4 r0 = center - posA;
+			float4 r1 = center - posB;
+			for(int i=0; i<2; i++)
+			{
+				setLinearAndAngular( tangent[i], r0, r1, &linear, &angular0, &angular1 );
+				float rambdaDt = calcRelVel(linear, -linear, angular0, angular1,
+											linVelA, angVelA, linVelB, angVelB );
+				rambdaDt *= cs->m_fJacCoeffInv[i];
+				
+				{
+					float prevSum = cs->m_fAppliedRambdaDt[i];
+					float updated = prevSum;
+					updated += rambdaDt;
+					updated = max2( updated, minRambdaDt[i] );
+					updated = min2( updated, maxRambdaDt[i] );
+					rambdaDt = updated - prevSum;
+					cs->m_fAppliedRambdaDt[i] = updated;
+				}
+				
+				float4 linImp0 = invMassA*linear*rambdaDt;
+				float4 linImp1 = invMassB*(-linear)*rambdaDt;
+				float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;
+				float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;
+				
+				linVelA += linImp0;
+				angVelA += angImp0;
+				linVelB += linImp1;
+				angVelB += angImp1;
+			}
+			{	//	angular damping for point constraint
+				float4 ab = normalize3( posB - posA );
+				float4 ac = normalize3( center - posA );
+				if( dot3F4( ab, ac ) > 0.95f  || (invMassA == 0.f || invMassB == 0.f))
+				{
+					float angNA = dot3F4( n, angVelA );
+					float angNB = dot3F4( n, angVelB );
+					
+					angVelA -= (angNA*0.1f)*n;
+					angVelB -= (angNB*0.1f)*n;
+				}
+			}
+		}
+
+		
+		
+	}
+
+	if (gBodies[aIdx].m_invMass)
+	{
+		gBodies[aIdx].m_linVel = linVelA;
+		gBodies[aIdx].m_angVel = angVelA;
+	} else
+	{
+		gBodies[aIdx].m_linVel = mymake_float4(0,0,0,0);
+		gBodies[aIdx].m_angVel = mymake_float4(0,0,0,0);
+	}
+	if (gBodies[bIdx].m_invMass)
+	{
+		gBodies[bIdx].m_linVel = linVelB;
+		gBodies[bIdx].m_angVel = angVelB;
+	} else
+	{
+		gBodies[bIdx].m_linVel = mymake_float4(0,0,0,0);
+		gBodies[bIdx].m_angVel = mymake_float4(0,0,0,0);
+	}
+ 
+
+}
+
+typedef struct 
+{
+	int m_valInt0;
+	int m_valInt1;
+	int m_valInt2;
+	int m_valInt3;
+
+	float m_val0;
+	float m_val1;
+	float m_val2;
+	float m_val3;
+} SolverDebugInfo;
+
+
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void BatchSolveKernelFriction(__global Body* gBodies,
+                      __global Shape* gShapes,
+                      __global Constraint4* gConstraints,
+                      __global int* gN,
+                      __global int* gOffsets,
+                      __global int* batchSizes,
+                       int maxBatch1,
+                       int cellBatch,
+                       int4 nSplit
+                      )
+{
+	//__local int ldsBatchIdx[WG_SIZE+1];
+	__local int ldsCurBatch;
+	__local int ldsNextBatch;
+	__local int ldsStart;
+
+	int lIdx = GET_LOCAL_IDX;
+	int wgIdx = GET_GROUP_IDX;
+
+//	int gIdx = GET_GLOBAL_IDX;
+//	debugInfo[gIdx].m_valInt0 = gIdx;
+	//debugInfo[gIdx].m_valInt1 = GET_GROUP_SIZE;
+
+
+	int zIdx = (wgIdx/((nSplit.x*nSplit.y)/4))*2+((cellBatch&4)>>2);
+	int remain= (wgIdx%((nSplit.x*nSplit.y)/4));
+	int yIdx = (remain/(nSplit.x/2))*2 + ((cellBatch&2)>>1);
+	int xIdx = (remain%(nSplit.x/2))*2 + (cellBatch&1);
+	int cellIdx = xIdx+yIdx*nSplit.x+zIdx*(nSplit.x*nSplit.y);
+
+	
+	if( gN[cellIdx] == 0 ) 
+		return;
+
+	int maxBatch = batchSizes[cellIdx];
+
+	const int start = gOffsets[cellIdx];
+	const int end = start + gN[cellIdx];
+
+	
+	if( lIdx == 0 )
+	{
+		ldsCurBatch = 0;
+		ldsNextBatch = 0;
+		ldsStart = start;
+	}
+
+
+	GROUP_LDS_BARRIER;
+
+	int idx=ldsStart+lIdx;
+	while (ldsCurBatch < maxBatch)
+	{
+		for(; idx<end; )
+		{
+			if (gConstraints[idx].m_batchIdx == ldsCurBatch)
+			{
+
+					solveFrictionConstraint( gBodies, gShapes, &gConstraints[idx] );
+
+				 idx+=64;
+			} else
+			{
+				break;
+			}
+		}
+		GROUP_LDS_BARRIER;
+		if( lIdx == 0 )
+		{
+			ldsCurBatch++;
+		}
+		GROUP_LDS_BARRIER;
+	}
+	
+    
+}
+
+
+
+
+
+
+__kernel void solveSingleFrictionKernel(__global Body* gBodies,
+                      __global Shape* gShapes,
+                      __global Constraint4* gConstraints,
+                       int cellIdx,
+                       int batchOffset,
+                       int numConstraintsInBatch
+                      )
+{
+
+	int index = get_global_id(0);
+	if (index < numConstraintsInBatch)
+	{
+		
+		int idx=batchOffset+index;
+	
+		solveFrictionConstraint( gBodies, gShapes, &gConstraints[idx] );
+	}    
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.h
new file mode 100644
index 0000000..9707cdb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solveFriction.h
@@ -0,0 +1,420 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* solveFrictionCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"//#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile global int*\n"
+	"#endif\n"
+	"typedef unsigned int u32;\n"
+	"typedef unsigned short u16;\n"
+	"typedef unsigned char u8;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define mymake_float4 (float4)\n"
+	"//#define make_float2 (float2)\n"
+	"//#define make_uint4 (uint4)\n"
+	"//#define make_int4 (int4)\n"
+	"//#define make_uint2 (uint2)\n"
+	"//#define make_int2 (int2)\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"///////////////////////////////////////\n"
+	"//	Vector\n"
+	"///////////////////////////////////////\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = mymake_float4(a.xyz,0.f);\n"
+	"	float4 b1 = mymake_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = mymake_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"//	float length = sqrtf(dot3F4(a, a));\n"
+	"//	return 1.f/length * a;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Matrix3x3\n"
+	"///////////////////////////////////////\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_row[3];\n"
+	"}Matrix3x3;\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b);\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b);\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b)\n"
+	"{\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a.m_row[0], b );\n"
+	"	ans.y = dot3F4( a.m_row[1], b );\n"
+	"	ans.z = dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b)\n"
+	"{\n"
+	"	float4 colx = mymake_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	float4 coly = mymake_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	float4 colz = mymake_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a, colx );\n"
+	"	ans.y = dot3F4( a, coly );\n"
+	"	ans.z = dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"#define WG_SIZE 64\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	Quaternion m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_shapeIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} Body;\n"
+	"typedef struct\n"
+	"{\n"
+	"	Matrix3x3 m_invInertia;\n"
+	"	Matrix3x3 m_initInvInertia;\n"
+	"} Shape;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_linear;\n"
+	"	float4 m_worldPos[4];\n"
+	"	float4 m_center;	\n"
+	"	float m_jacCoeffInv[4];\n"
+	"	float m_b[4];\n"
+	"	float m_appliedRambdaDt[4];\n"
+	"	float m_fJacCoeffInv[2];	\n"
+	"	float m_fAppliedRambdaDt[2];	\n"
+	"	u32 m_bodyA;\n"
+	"	u32 m_bodyB;\n"
+	"	int m_batchIdx;\n"
+	"	u32 m_paddings[1];\n"
+	"} Constraint4;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_nConstraints;\n"
+	"	int m_start;\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBuffer;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_solveFriction;\n"
+	"	int m_maxBatch;	//	long batch really kills the performance\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBufferBatchSolve;\n"
+	"void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1);\n"
+	"void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1)\n"
+	"{\n"
+	"	*linear = mymake_float4(-n.xyz,0.f);\n"
+	"	*angular0 = -cross3(r0, n);\n"
+	"	*angular1 = cross3(r1, n);\n"
+	"}\n"
+	"float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 );\n"
+	"float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 )\n"
+	"{\n"
+	"	return dot3F4(l0, linVel0) + dot3F4(a0, angVel0) + dot3F4(l1, linVel1) + dot3F4(a1, angVel1);\n"
+	"}\n"
+	"float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,\n"
+	"				   float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1);\n"
+	"float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,\n"
+	"					float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1)\n"
+	"{\n"
+	"	//	linear0,1 are normlized\n"
+	"	float jmj0 = invMass0;//dot3F4(linear0, linear0)*invMass0;\n"
+	"	float jmj1 = dot3F4(mtMul3(angular0,*invInertia0), angular0);\n"
+	"	float jmj2 = invMass1;//dot3F4(linear1, linear1)*invMass1;\n"
+	"	float jmj3 = dot3F4(mtMul3(angular1,*invInertia1), angular1);\n"
+	"	return -1.f/(jmj0+jmj1+jmj2+jmj3);\n"
+	"}\n"
+	"void btPlaneSpace1 (const float4* n, float4* p, float4* q);\n"
+	" void btPlaneSpace1 (const float4* n, float4* p, float4* q)\n"
+	"{\n"
+	"  if (fabs(n[0].z) > 0.70710678f) {\n"
+	"    // choose p in y-z plane\n"
+	"    float a = n[0].y*n[0].y + n[0].z*n[0].z;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = 0;\n"
+	"	p[0].y = -n[0].z*k;\n"
+	"	p[0].z = n[0].y*k;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = a*k;\n"
+	"	q[0].y = -n[0].x*p[0].z;\n"
+	"	q[0].z = n[0].x*p[0].y;\n"
+	"  }\n"
+	"  else {\n"
+	"    // choose p in x-y plane\n"
+	"    float a = n[0].x*n[0].x + n[0].y*n[0].y;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = -n[0].y*k;\n"
+	"	p[0].y = n[0].x*k;\n"
+	"	p[0].z = 0;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = -n[0].z*p[0].y;\n"
+	"	q[0].y = n[0].z*p[0].x;\n"
+	"	q[0].z = a*k;\n"
+	"  }\n"
+	"}\n"
+	"void solveFrictionConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs);\n"
+	"void solveFrictionConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs)\n"
+	"{\n"
+	"	float frictionCoeff = ldsCs[0].m_linear.w;\n"
+	"	int aIdx = ldsCs[0].m_bodyA;\n"
+	"	int bIdx = ldsCs[0].m_bodyB;\n"
+	"	float4 posA = gBodies[aIdx].m_pos;\n"
+	"	float4 linVelA = gBodies[aIdx].m_linVel;\n"
+	"	float4 angVelA = gBodies[aIdx].m_angVel;\n"
+	"	float invMassA = gBodies[aIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;\n"
+	"	float4 posB = gBodies[bIdx].m_pos;\n"
+	"	float4 linVelB = gBodies[bIdx].m_linVel;\n"
+	"	float4 angVelB = gBodies[bIdx].m_angVel;\n"
+	"	float invMassB = gBodies[bIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;\n"
+	"	\n"
+	"	{\n"
+	"		float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};\n"
+	"		float minRambdaDt[4] = {0.f,0.f,0.f,0.f};\n"
+	"		float sum = 0;\n"
+	"		for(int j=0; j<4; j++)\n"
+	"		{\n"
+	"			sum +=ldsCs[0].m_appliedRambdaDt[j];\n"
+	"		}\n"
+	"		frictionCoeff = 0.7f;\n"
+	"		for(int j=0; j<4; j++)\n"
+	"		{\n"
+	"			maxRambdaDt[j] = frictionCoeff*sum;\n"
+	"			minRambdaDt[j] = -maxRambdaDt[j];\n"
+	"		}\n"
+	"		\n"
+	"//		solveFriction( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,\n"
+	"//			posB, &linVelB, &angVelB, invMassB, invInertiaB, maxRambdaDt, minRambdaDt );\n"
+	"		\n"
+	"		\n"
+	"		{\n"
+	"			\n"
+	"			__global Constraint4* cs = ldsCs;\n"
+	"			\n"
+	"			if( cs->m_fJacCoeffInv[0] == 0 && cs->m_fJacCoeffInv[0] == 0 ) return;\n"
+	"			const float4 center = cs->m_center;\n"
+	"			\n"
+	"			float4 n = -cs->m_linear;\n"
+	"			\n"
+	"			float4 tangent[2];\n"
+	"			btPlaneSpace1(&n,&tangent[0],&tangent[1]);\n"
+	"			float4 angular0, angular1, linear;\n"
+	"			float4 r0 = center - posA;\n"
+	"			float4 r1 = center - posB;\n"
+	"			for(int i=0; i<2; i++)\n"
+	"			{\n"
+	"				setLinearAndAngular( tangent[i], r0, r1, &linear, &angular0, &angular1 );\n"
+	"				float rambdaDt = calcRelVel(linear, -linear, angular0, angular1,\n"
+	"											linVelA, angVelA, linVelB, angVelB );\n"
+	"				rambdaDt *= cs->m_fJacCoeffInv[i];\n"
+	"				\n"
+	"				{\n"
+	"					float prevSum = cs->m_fAppliedRambdaDt[i];\n"
+	"					float updated = prevSum;\n"
+	"					updated += rambdaDt;\n"
+	"					updated = max2( updated, minRambdaDt[i] );\n"
+	"					updated = min2( updated, maxRambdaDt[i] );\n"
+	"					rambdaDt = updated - prevSum;\n"
+	"					cs->m_fAppliedRambdaDt[i] = updated;\n"
+	"				}\n"
+	"				\n"
+	"				float4 linImp0 = invMassA*linear*rambdaDt;\n"
+	"				float4 linImp1 = invMassB*(-linear)*rambdaDt;\n"
+	"				float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;\n"
+	"				float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;\n"
+	"				\n"
+	"				linVelA += linImp0;\n"
+	"				angVelA += angImp0;\n"
+	"				linVelB += linImp1;\n"
+	"				angVelB += angImp1;\n"
+	"			}\n"
+	"			{	//	angular damping for point constraint\n"
+	"				float4 ab = normalize3( posB - posA );\n"
+	"				float4 ac = normalize3( center - posA );\n"
+	"				if( dot3F4( ab, ac ) > 0.95f  || (invMassA == 0.f || invMassB == 0.f))\n"
+	"				{\n"
+	"					float angNA = dot3F4( n, angVelA );\n"
+	"					float angNB = dot3F4( n, angVelB );\n"
+	"					\n"
+	"					angVelA -= (angNA*0.1f)*n;\n"
+	"					angVelB -= (angNB*0.1f)*n;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"		\n"
+	"	}\n"
+	"	if (gBodies[aIdx].m_invMass)\n"
+	"	{\n"
+	"		gBodies[aIdx].m_linVel = linVelA;\n"
+	"		gBodies[aIdx].m_angVel = angVelA;\n"
+	"	} else\n"
+	"	{\n"
+	"		gBodies[aIdx].m_linVel = mymake_float4(0,0,0,0);\n"
+	"		gBodies[aIdx].m_angVel = mymake_float4(0,0,0,0);\n"
+	"	}\n"
+	"	if (gBodies[bIdx].m_invMass)\n"
+	"	{\n"
+	"		gBodies[bIdx].m_linVel = linVelB;\n"
+	"		gBodies[bIdx].m_angVel = angVelB;\n"
+	"	} else\n"
+	"	{\n"
+	"		gBodies[bIdx].m_linVel = mymake_float4(0,0,0,0);\n"
+	"		gBodies[bIdx].m_angVel = mymake_float4(0,0,0,0);\n"
+	"	}\n"
+	" \n"
+	"}\n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_valInt0;\n"
+	"	int m_valInt1;\n"
+	"	int m_valInt2;\n"
+	"	int m_valInt3;\n"
+	"	float m_val0;\n"
+	"	float m_val1;\n"
+	"	float m_val2;\n"
+	"	float m_val3;\n"
+	"} SolverDebugInfo;\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void BatchSolveKernelFriction(__global Body* gBodies,\n"
+	"                      __global Shape* gShapes,\n"
+	"                      __global Constraint4* gConstraints,\n"
+	"                      __global int* gN,\n"
+	"                      __global int* gOffsets,\n"
+	"                      __global int* batchSizes,\n"
+	"                       int maxBatch1,\n"
+	"                       int cellBatch,\n"
+	"                       int4 nSplit\n"
+	"                      )\n"
+	"{\n"
+	"	//__local int ldsBatchIdx[WG_SIZE+1];\n"
+	"	__local int ldsCurBatch;\n"
+	"	__local int ldsNextBatch;\n"
+	"	__local int ldsStart;\n"
+	"	int lIdx = GET_LOCAL_IDX;\n"
+	"	int wgIdx = GET_GROUP_IDX;\n"
+	"//	int gIdx = GET_GLOBAL_IDX;\n"
+	"//	debugInfo[gIdx].m_valInt0 = gIdx;\n"
+	"	//debugInfo[gIdx].m_valInt1 = GET_GROUP_SIZE;\n"
+	"	int zIdx = (wgIdx/((nSplit.x*nSplit.y)/4))*2+((cellBatch&4)>>2);\n"
+	"	int remain= (wgIdx%((nSplit.x*nSplit.y)/4));\n"
+	"	int yIdx = (remain/(nSplit.x/2))*2 + ((cellBatch&2)>>1);\n"
+	"	int xIdx = (remain%(nSplit.x/2))*2 + (cellBatch&1);\n"
+	"	int cellIdx = xIdx+yIdx*nSplit.x+zIdx*(nSplit.x*nSplit.y);\n"
+	"	\n"
+	"	if( gN[cellIdx] == 0 ) \n"
+	"		return;\n"
+	"	int maxBatch = batchSizes[cellIdx];\n"
+	"	const int start = gOffsets[cellIdx];\n"
+	"	const int end = start + gN[cellIdx];\n"
+	"	\n"
+	"	if( lIdx == 0 )\n"
+	"	{\n"
+	"		ldsCurBatch = 0;\n"
+	"		ldsNextBatch = 0;\n"
+	"		ldsStart = start;\n"
+	"	}\n"
+	"	GROUP_LDS_BARRIER;\n"
+	"	int idx=ldsStart+lIdx;\n"
+	"	while (ldsCurBatch < maxBatch)\n"
+	"	{\n"
+	"		for(; idx<end; )\n"
+	"		{\n"
+	"			if (gConstraints[idx].m_batchIdx == ldsCurBatch)\n"
+	"			{\n"
+	"					solveFrictionConstraint( gBodies, gShapes, &gConstraints[idx] );\n"
+	"				 idx+=64;\n"
+	"			} else\n"
+	"			{\n"
+	"				break;\n"
+	"			}\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"		if( lIdx == 0 )\n"
+	"		{\n"
+	"			ldsCurBatch++;\n"
+	"		}\n"
+	"		GROUP_LDS_BARRIER;\n"
+	"	}\n"
+	"	\n"
+	"    \n"
+	"}\n"
+	"__kernel void solveSingleFrictionKernel(__global Body* gBodies,\n"
+	"                      __global Shape* gShapes,\n"
+	"                      __global Constraint4* gConstraints,\n"
+	"                       int cellIdx,\n"
+	"                       int batchOffset,\n"
+	"                       int numConstraintsInBatch\n"
+	"                      )\n"
+	"{\n"
+	"	int index = get_global_id(0);\n"
+	"	if (index < numConstraintsInBatch)\n"
+	"	{\n"
+	"		\n"
+	"		int idx=batchOffset+index;\n"
+	"	\n"
+	"		solveFrictionConstraint( gBodies, gShapes, &gConstraints[idx] );\n"
+	"	}    \n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl
new file mode 100644
index 0000000..8e2de7b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.cl
@@ -0,0 +1,277 @@
+
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+#include "Bullet3Dynamics/shared/b3ConvertConstraint4.h"
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile global int*
+#endif
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define make_float4 (float4)
+#define make_float2 (float2)
+#define make_uint4 (uint4)
+#define make_int4 (int4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+
+#define max2 max
+#define min2 min
+
+
+///////////////////////////////////////
+//	Vector
+///////////////////////////////////////
+__inline
+float fastDiv(float numerator, float denominator)
+{
+	return native_divide(numerator, denominator);	
+//	return numerator/denominator;	
+}
+
+__inline
+float4 fastDiv4(float4 numerator, float4 denominator)
+{
+	return native_divide(numerator, denominator);	
+}
+
+__inline
+float fastSqrtf(float f2)
+{
+	return native_sqrt(f2);
+//	return sqrt(f2);
+}
+
+__inline
+float fastRSqrt(float f2)
+{
+	return native_rsqrt(f2);
+}
+
+__inline
+float fastLength4(float4 v)
+{
+	return fast_length(v);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	return fast_normalize(v);
+}
+
+
+__inline
+float sqrtf(float a)
+{
+//	return sqrt(a);
+	return native_sqrt(a);
+}
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+__inline
+float length3(const float4 a)
+{
+	return sqrtf(dot3F4(a,a));
+}
+
+__inline
+float dot4(const float4 a, const float4 b)
+{
+	return dot( a, b );
+}
+
+//	for height
+__inline
+float dot3w1(const float4 point, const float4 eqn)
+{
+	return dot3F4(point,eqn) + eqn.w;
+}
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = make_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+//	float length = sqrtf(dot3F4(a, a));
+//	return 1.f/length * a;
+}
+
+__inline
+float4 normalize4(const float4 a)
+{
+	float length = sqrtf(dot4(a, a));
+	return 1.f/length * a;
+}
+
+__inline
+float4 createEquation(const float4 a, const float4 b, const float4 c)
+{
+	float4 eqn;
+	float4 ab = b-a;
+	float4 ac = c-a;
+	eqn = normalize3( cross3(ab, ac) );
+	eqn.w = -dot3F4(eqn,a);
+	return eqn;
+}
+
+
+
+#define WG_SIZE 64
+
+
+
+
+
+
+
+typedef struct
+{
+	int m_nConstraints;
+	int m_start;
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBuffer;
+
+typedef struct
+{
+	int m_solveFriction;
+	int m_maxBatch;	//	long batch really kills the performance
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBufferBatchSolve;
+
+
+
+
+ 
+
+
+typedef struct 
+{
+	int m_valInt0;
+	int m_valInt1;
+	int m_valInt2;
+	int m_valInt3;
+
+	float m_val0;
+	float m_val1;
+	float m_val2;
+	float m_val3;
+} SolverDebugInfo;
+
+
+
+
+
+
+typedef struct
+{
+	int m_nContacts;
+	float m_dt;
+	float m_positionDrift;
+	float m_positionConstraintCoeff;
+} ConstBufferCTC;
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void ContactToConstraintKernel(__global struct b3Contact4Data* gContact, __global b3RigidBodyData_t* gBodies, __global b3InertiaData_t* gShapes, __global b3ContactConstraint4_t* gConstraintOut, 
+int nContacts,
+float dt,
+float positionDrift,
+float positionConstraintCoeff
+)
+{
+	int gIdx = GET_GLOBAL_IDX;
+	
+	if( gIdx < nContacts )
+	{
+		int aIdx = abs(gContact[gIdx].m_bodyAPtrAndSignBit);
+		int bIdx = abs(gContact[gIdx].m_bodyBPtrAndSignBit);
+
+		float4 posA = gBodies[aIdx].m_pos;
+		float4 linVelA = gBodies[aIdx].m_linVel;
+		float4 angVelA = gBodies[aIdx].m_angVel;
+		float invMassA = gBodies[aIdx].m_invMass;
+		b3Mat3x3 invInertiaA = gShapes[aIdx].m_initInvInertia;
+
+		float4 posB = gBodies[bIdx].m_pos;
+		float4 linVelB = gBodies[bIdx].m_linVel;
+		float4 angVelB = gBodies[bIdx].m_angVel;
+		float invMassB = gBodies[bIdx].m_invMass;
+		b3Mat3x3 invInertiaB = gShapes[bIdx].m_initInvInertia;
+
+		b3ContactConstraint4_t cs;
+
+    	setConstraint4( posA, linVelA, angVelA, invMassA, invInertiaA, posB, linVelB, angVelB, invMassB, invInertiaB,
+			&gContact[gIdx], dt, positionDrift, positionConstraintCoeff,
+			&cs );
+		
+		cs.m_batchIdx = gContact[gIdx].m_batchIdx;
+
+		gConstraintOut[gIdx] = cs;
+	}
+}
+
+
+
+
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.h
new file mode 100644
index 0000000..d53db03
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup.h
@@ -0,0 +1,702 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* solverSetupCL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#ifndef B3_CONTACT_CONSTRAINT5_H\n"
+	"#define B3_CONTACT_CONSTRAINT5_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef struct b3ContactConstraint4 b3ContactConstraint4_t;\n"
+	"struct b3ContactConstraint4\n"
+	"{\n"
+	"	b3Float4 m_linear;//normal?\n"
+	"	b3Float4 m_worldPos[4];\n"
+	"	b3Float4 m_center;	//	friction\n"
+	"	float m_jacCoeffInv[4];\n"
+	"	float m_b[4];\n"
+	"	float m_appliedRambdaDt[4];\n"
+	"	float m_fJacCoeffInv[2];	//	friction\n"
+	"	float m_fAppliedRambdaDt[2];	//	friction\n"
+	"	unsigned int m_bodyA;\n"
+	"	unsigned int m_bodyB;\n"
+	"	int			m_batchIdx;\n"
+	"	unsigned int m_paddings;\n"
+	"};\n"
+	"//inline	void setFrictionCoeff(float value) { m_linear[3] = value; }\n"
+	"inline	float b3GetFrictionCoeff(b3ContactConstraint4_t* constraint) \n"
+	"{\n"
+	"	return constraint->m_linear.w; \n"
+	"}\n"
+	"#endif //B3_CONTACT_CONSTRAINT5_H\n"
+	"#ifndef B3_RIGIDBODY_DATA_H\n"
+	"#define B3_RIGIDBODY_DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#define B3_QUAT_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Quat;\n"
+	"	#define b3QuatConstArg const b3Quat\n"
+	"	\n"
+	"	\n"
+	"inline float4 b3FastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = (float4)(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"	\n"
+	"inline b3Quat b3QuatMul(b3Quat a, b3Quat b);\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in);\n"
+	"inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)\n"
+	"{\n"
+	"	b3Quat ans;\n"
+	"	ans = b3Cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - b3Dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in)\n"
+	"{\n"
+	"	b3Quat q;\n"
+	"	q=in;\n"
+	"	//return b3FastNormalize4(in);\n"
+	"	float len = native_sqrt(dot(q, q));\n"
+	"	if(len > 0.f)\n"
+	"	{\n"
+	"		q *= 1.f / len;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		q.x = q.y = q.z = 0.f;\n"
+	"		q.w = 1.f;\n"
+	"	}\n"
+	"	return q;\n"
+	"}\n"
+	"inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	b3Quat qInv = b3QuatInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = b3QuatMul(b3QuatMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	return b3QuatRotate( b3QuatInvert( q ), vec );\n"
+	"}\n"
+	"inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg  orientation)\n"
+	"{\n"
+	"	return b3QuatRotate( orientation, point ) + (translation);\n"
+	"}\n"
+	"	\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#define B3_MAT3x3_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"typedef struct\n"
+	"{\n"
+	"	b3Float4 m_row[3];\n"
+	"}b3Mat3x3;\n"
+	"#define b3Mat3x3ConstArg const b3Mat3x3\n"
+	"#define b3GetRow(m,row) (m.m_row[row])\n"
+	"inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)\n"
+	"{\n"
+	"	b3Float4 quat2 = (b3Float4)(quat.x*quat.x, quat.y*quat.y, quat.z*quat.z, 0.f);\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0].x=1-2*quat2.y-2*quat2.z;\n"
+	"	out.m_row[0].y=2*quat.x*quat.y-2*quat.w*quat.z;\n"
+	"	out.m_row[0].z=2*quat.x*quat.z+2*quat.w*quat.y;\n"
+	"	out.m_row[0].w = 0.f;\n"
+	"	out.m_row[1].x=2*quat.x*quat.y+2*quat.w*quat.z;\n"
+	"	out.m_row[1].y=1-2*quat2.x-2*quat2.z;\n"
+	"	out.m_row[1].z=2*quat.y*quat.z-2*quat.w*quat.x;\n"
+	"	out.m_row[1].w = 0.f;\n"
+	"	out.m_row[2].x=2*quat.x*quat.z-2*quat.w*quat.y;\n"
+	"	out.m_row[2].y=2*quat.y*quat.z+2*quat.w*quat.x;\n"
+	"	out.m_row[2].z=1-2*quat2.x-2*quat2.y;\n"
+	"	out.m_row[2].w = 0.f;\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = fabs(matIn.m_row[0]);\n"
+	"	out.m_row[1] = fabs(matIn.m_row[1]);\n"
+	"	out.m_row[2] = fabs(matIn.m_row[2]);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero();\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity();\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m);\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(0.f);\n"
+	"	m.m_row[1] = (b3Float4)(0.f);\n"
+	"	m.m_row[2] = (b3Float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (b3Float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (b3Float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Mat3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	b3Mat3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = b3Dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = b3Dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = b3Dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)\n"
+	"{\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a.m_row[0], b );\n"
+	"	ans.y = b3Dot3F4( a.m_row[1], b );\n"
+	"	ans.z = b3Dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a, colx );\n"
+	"	ans.y = b3Dot3F4( a, coly );\n"
+	"	ans.z = b3Dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3RigidBodyData b3RigidBodyData_t;\n"
+	"struct b3RigidBodyData\n"
+	"{\n"
+	"	b3Float4				m_pos;\n"
+	"	b3Quat					m_quat;\n"
+	"	b3Float4				m_linVel;\n"
+	"	b3Float4				m_angVel;\n"
+	"	int 					m_collidableIdx;\n"
+	"	float 				m_invMass;\n"
+	"	float 				m_restituitionCoeff;\n"
+	"	float 				m_frictionCoeff;\n"
+	"};\n"
+	"typedef struct b3InertiaData b3InertiaData_t;\n"
+	"struct b3InertiaData\n"
+	"{\n"
+	"	b3Mat3x3 m_invInertiaWorld;\n"
+	"	b3Mat3x3 m_initInvInertia;\n"
+	"};\n"
+	"#endif //B3_RIGIDBODY_DATA_H\n"
+	"	\n"
+	"void b3PlaneSpace1 (b3Float4ConstArg n, b3Float4* p, b3Float4* q);\n"
+	" void b3PlaneSpace1 (b3Float4ConstArg n, b3Float4* p, b3Float4* q)\n"
+	"{\n"
+	"  if (b3Fabs(n.z) > 0.70710678f) {\n"
+	"    // choose p in y-z plane\n"
+	"    float a = n.y*n.y + n.z*n.z;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = 0;\n"
+	"	p[0].y = -n.z*k;\n"
+	"	p[0].z = n.y*k;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = a*k;\n"
+	"	q[0].y = -n.x*p[0].z;\n"
+	"	q[0].z = n.x*p[0].y;\n"
+	"  }\n"
+	"  else {\n"
+	"    // choose p in x-y plane\n"
+	"    float a = n.x*n.x + n.y*n.y;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = -n.y*k;\n"
+	"	p[0].y = n.x*k;\n"
+	"	p[0].z = 0;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = -n.z*p[0].y;\n"
+	"	q[0].y = n.z*p[0].x;\n"
+	"	q[0].z = a*k;\n"
+	"  }\n"
+	"}\n"
+	" \n"
+	"void setLinearAndAngular( b3Float4ConstArg n, b3Float4ConstArg r0, b3Float4ConstArg r1, b3Float4* linear, b3Float4* angular0, b3Float4* angular1)\n"
+	"{\n"
+	"	*linear = b3MakeFloat4(n.x,n.y,n.z,0.f);\n"
+	"	*angular0 = b3Cross3(r0, n);\n"
+	"	*angular1 = -b3Cross3(r1, n);\n"
+	"}\n"
+	"float calcRelVel( b3Float4ConstArg l0, b3Float4ConstArg l1, b3Float4ConstArg a0, b3Float4ConstArg a1, b3Float4ConstArg linVel0,\n"
+	"	b3Float4ConstArg angVel0, b3Float4ConstArg linVel1, b3Float4ConstArg angVel1 )\n"
+	"{\n"
+	"	return b3Dot3F4(l0, linVel0) + b3Dot3F4(a0, angVel0) + b3Dot3F4(l1, linVel1) + b3Dot3F4(a1, angVel1);\n"
+	"}\n"
+	"float calcJacCoeff(b3Float4ConstArg linear0, b3Float4ConstArg linear1, b3Float4ConstArg angular0, b3Float4ConstArg angular1,\n"
+	"					float invMass0, const b3Mat3x3* invInertia0, float invMass1, const b3Mat3x3* invInertia1)\n"
+	"{\n"
+	"	//	linear0,1 are normlized\n"
+	"	float jmj0 = invMass0;//b3Dot3F4(linear0, linear0)*invMass0;\n"
+	"	float jmj1 = b3Dot3F4(mtMul3(angular0,*invInertia0), angular0);\n"
+	"	float jmj2 = invMass1;//b3Dot3F4(linear1, linear1)*invMass1;\n"
+	"	float jmj3 = b3Dot3F4(mtMul3(angular1,*invInertia1), angular1);\n"
+	"	return -1.f/(jmj0+jmj1+jmj2+jmj3);\n"
+	"}\n"
+	"void setConstraint4( b3Float4ConstArg posA, b3Float4ConstArg linVelA, b3Float4ConstArg angVelA, float invMassA, b3Mat3x3ConstArg invInertiaA,\n"
+	"	b3Float4ConstArg posB, b3Float4ConstArg linVelB, b3Float4ConstArg angVelB, float invMassB, b3Mat3x3ConstArg invInertiaB, \n"
+	"	__global struct b3Contact4Data* src, float dt, float positionDrift, float positionConstraintCoeff,\n"
+	"	b3ContactConstraint4_t* dstC )\n"
+	"{\n"
+	"	dstC->m_bodyA = abs(src->m_bodyAPtrAndSignBit);\n"
+	"	dstC->m_bodyB = abs(src->m_bodyBPtrAndSignBit);\n"
+	"	float dtInv = 1.f/dt;\n"
+	"	for(int ic=0; ic<4; ic++)\n"
+	"	{\n"
+	"		dstC->m_appliedRambdaDt[ic] = 0.f;\n"
+	"	}\n"
+	"	dstC->m_fJacCoeffInv[0] = dstC->m_fJacCoeffInv[1] = 0.f;\n"
+	"	dstC->m_linear = src->m_worldNormalOnB;\n"
+	"	dstC->m_linear.w = 0.7f ;//src->getFrictionCoeff() );\n"
+	"	for(int ic=0; ic<4; ic++)\n"
+	"	{\n"
+	"		b3Float4 r0 = src->m_worldPosB[ic] - posA;\n"
+	"		b3Float4 r1 = src->m_worldPosB[ic] - posB;\n"
+	"		if( ic >= src->m_worldNormalOnB.w )//npoints\n"
+	"		{\n"
+	"			dstC->m_jacCoeffInv[ic] = 0.f;\n"
+	"			continue;\n"
+	"		}\n"
+	"		float relVelN;\n"
+	"		{\n"
+	"			b3Float4 linear, angular0, angular1;\n"
+	"			setLinearAndAngular(src->m_worldNormalOnB, r0, r1, &linear, &angular0, &angular1);\n"
+	"			dstC->m_jacCoeffInv[ic] = calcJacCoeff(linear, -linear, angular0, angular1,\n"
+	"				invMassA, &invInertiaA, invMassB, &invInertiaB );\n"
+	"			relVelN = calcRelVel(linear, -linear, angular0, angular1,\n"
+	"				linVelA, angVelA, linVelB, angVelB);\n"
+	"			float e = 0.f;//src->getRestituitionCoeff();\n"
+	"			if( relVelN*relVelN < 0.004f ) e = 0.f;\n"
+	"			dstC->m_b[ic] = e*relVelN;\n"
+	"			//float penetration = src->m_worldPosB[ic].w;\n"
+	"			dstC->m_b[ic] += (src->m_worldPosB[ic].w + positionDrift)*positionConstraintCoeff*dtInv;\n"
+	"			dstC->m_appliedRambdaDt[ic] = 0.f;\n"
+	"		}\n"
+	"	}\n"
+	"	if( src->m_worldNormalOnB.w > 0 )//npoints\n"
+	"	{	//	prepare friction\n"
+	"		b3Float4 center = b3MakeFloat4(0.f,0.f,0.f,0.f);\n"
+	"		for(int i=0; i<src->m_worldNormalOnB.w; i++) \n"
+	"			center += src->m_worldPosB[i];\n"
+	"		center /= (float)src->m_worldNormalOnB.w;\n"
+	"		b3Float4 tangent[2];\n"
+	"		b3PlaneSpace1(src->m_worldNormalOnB,&tangent[0],&tangent[1]);\n"
+	"		\n"
+	"		b3Float4 r[2];\n"
+	"		r[0] = center - posA;\n"
+	"		r[1] = center - posB;\n"
+	"		for(int i=0; i<2; i++)\n"
+	"		{\n"
+	"			b3Float4 linear, angular0, angular1;\n"
+	"			setLinearAndAngular(tangent[i], r[0], r[1], &linear, &angular0, &angular1);\n"
+	"			dstC->m_fJacCoeffInv[i] = calcJacCoeff(linear, -linear, angular0, angular1,\n"
+	"				invMassA, &invInertiaA, invMassB, &invInertiaB );\n"
+	"			dstC->m_fAppliedRambdaDt[i] = 0.f;\n"
+	"		}\n"
+	"		dstC->m_center = center;\n"
+	"	}\n"
+	"	for(int i=0; i<4; i++)\n"
+	"	{\n"
+	"		if( i<src->m_worldNormalOnB.w )\n"
+	"		{\n"
+	"			dstC->m_worldPos[i] = src->m_worldPosB[i];\n"
+	"		}\n"
+	"		else\n"
+	"		{\n"
+	"			dstC->m_worldPos[i] = b3MakeFloat4(0.f,0.f,0.f,0.f);\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile global int*\n"
+	"#endif\n"
+	"typedef unsigned int u32;\n"
+	"typedef unsigned short u16;\n"
+	"typedef unsigned char u8;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_float4 (float4)\n"
+	"#define make_float2 (float2)\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_int4 (int4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"///////////////////////////////////////\n"
+	"//	Vector\n"
+	"///////////////////////////////////////\n"
+	"__inline\n"
+	"float fastDiv(float numerator, float denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"//	return numerator/denominator;	\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastDiv4(float4 numerator, float4 denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"}\n"
+	"__inline\n"
+	"float fastSqrtf(float f2)\n"
+	"{\n"
+	"	return native_sqrt(f2);\n"
+	"//	return sqrt(f2);\n"
+	"}\n"
+	"__inline\n"
+	"float fastRSqrt(float f2)\n"
+	"{\n"
+	"	return native_rsqrt(f2);\n"
+	"}\n"
+	"__inline\n"
+	"float fastLength4(float4 v)\n"
+	"{\n"
+	"	return fast_length(v);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"__inline\n"
+	"float sqrtf(float a)\n"
+	"{\n"
+	"//	return sqrt(a);\n"
+	"	return native_sqrt(a);\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float length3(const float4 a)\n"
+	"{\n"
+	"	return sqrtf(dot3F4(a,a));\n"
+	"}\n"
+	"__inline\n"
+	"float dot4(const float4 a, const float4 b)\n"
+	"{\n"
+	"	return dot( a, b );\n"
+	"}\n"
+	"//	for height\n"
+	"__inline\n"
+	"float dot3w1(const float4 point, const float4 eqn)\n"
+	"{\n"
+	"	return dot3F4(point,eqn) + eqn.w;\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = make_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"//	float length = sqrtf(dot3F4(a, a));\n"
+	"//	return 1.f/length * a;\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize4(const float4 a)\n"
+	"{\n"
+	"	float length = sqrtf(dot4(a, a));\n"
+	"	return 1.f/length * a;\n"
+	"}\n"
+	"__inline\n"
+	"float4 createEquation(const float4 a, const float4 b, const float4 c)\n"
+	"{\n"
+	"	float4 eqn;\n"
+	"	float4 ab = b-a;\n"
+	"	float4 ac = c-a;\n"
+	"	eqn = normalize3( cross3(ab, ac) );\n"
+	"	eqn.w = -dot3F4(eqn,a);\n"
+	"	return eqn;\n"
+	"}\n"
+	"#define WG_SIZE 64\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_nConstraints;\n"
+	"	int m_start;\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBuffer;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_solveFriction;\n"
+	"	int m_maxBatch;	//	long batch really kills the performance\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBufferBatchSolve;\n"
+	" \n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_valInt0;\n"
+	"	int m_valInt1;\n"
+	"	int m_valInt2;\n"
+	"	int m_valInt3;\n"
+	"	float m_val0;\n"
+	"	float m_val1;\n"
+	"	float m_val2;\n"
+	"	float m_val3;\n"
+	"} SolverDebugInfo;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_nContacts;\n"
+	"	float m_dt;\n"
+	"	float m_positionDrift;\n"
+	"	float m_positionConstraintCoeff;\n"
+	"} ConstBufferCTC;\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void ContactToConstraintKernel(__global struct b3Contact4Data* gContact, __global b3RigidBodyData_t* gBodies, __global b3InertiaData_t* gShapes, __global b3ContactConstraint4_t* gConstraintOut, \n"
+	"int nContacts,\n"
+	"float dt,\n"
+	"float positionDrift,\n"
+	"float positionConstraintCoeff\n"
+	")\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int aIdx = abs(gContact[gIdx].m_bodyAPtrAndSignBit);\n"
+	"		int bIdx = abs(gContact[gIdx].m_bodyBPtrAndSignBit);\n"
+	"		float4 posA = gBodies[aIdx].m_pos;\n"
+	"		float4 linVelA = gBodies[aIdx].m_linVel;\n"
+	"		float4 angVelA = gBodies[aIdx].m_angVel;\n"
+	"		float invMassA = gBodies[aIdx].m_invMass;\n"
+	"		b3Mat3x3 invInertiaA = gShapes[aIdx].m_initInvInertia;\n"
+	"		float4 posB = gBodies[bIdx].m_pos;\n"
+	"		float4 linVelB = gBodies[bIdx].m_linVel;\n"
+	"		float4 angVelB = gBodies[bIdx].m_angVel;\n"
+	"		float invMassB = gBodies[bIdx].m_invMass;\n"
+	"		b3Mat3x3 invInertiaB = gShapes[bIdx].m_initInvInertia;\n"
+	"		b3ContactConstraint4_t cs;\n"
+	"    	setConstraint4( posA, linVelA, angVelA, invMassA, invInertiaA, posB, linVelB, angVelB, invMassB, invInertiaB,\n"
+	"			&gContact[gIdx], dt, positionDrift, positionConstraintCoeff,\n"
+	"			&cs );\n"
+	"		\n"
+	"		cs.m_batchIdx = gContact[gIdx].m_batchIdx;\n"
+	"		gConstraintOut[gIdx] = cs;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl
new file mode 100644
index 0000000..3dc48d4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl
@@ -0,0 +1,613 @@
+/*
+Copyright (c) 2012 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Takahiro Harada
+
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile global int*
+#endif
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define make_float4 (float4)
+#define make_float2 (float2)
+#define make_uint4 (uint4)
+#define make_int4 (int4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+
+#define max2 max
+#define min2 min
+
+
+///////////////////////////////////////
+//	Vector
+///////////////////////////////////////
+__inline
+float fastDiv(float numerator, float denominator)
+{
+	return native_divide(numerator, denominator);	
+//	return numerator/denominator;	
+}
+
+__inline
+float4 fastDiv4(float4 numerator, float4 denominator)
+{
+	return native_divide(numerator, denominator);	
+}
+
+__inline
+float fastSqrtf(float f2)
+{
+	return native_sqrt(f2);
+//	return sqrt(f2);
+}
+
+__inline
+float fastRSqrt(float f2)
+{
+	return native_rsqrt(f2);
+}
+
+__inline
+float fastLength4(float4 v)
+{
+	return fast_length(v);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	return fast_normalize(v);
+}
+
+
+__inline
+float sqrtf(float a)
+{
+//	return sqrt(a);
+	return native_sqrt(a);
+}
+
+__inline
+float4 cross3(float4 a, float4 b)
+{
+	return cross(a,b);
+}
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+__inline
+float length3(const float4 a)
+{
+	return sqrtf(dot3F4(a,a));
+}
+
+__inline
+float dot4(const float4 a, const float4 b)
+{
+	return dot( a, b );
+}
+
+//	for height
+__inline
+float dot3w1(const float4 point, const float4 eqn)
+{
+	return dot3F4(point,eqn) + eqn.w;
+}
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = make_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+//	float length = sqrtf(dot3F4(a, a));
+//	return 1.f/length * a;
+}
+
+__inline
+float4 normalize4(const float4 a)
+{
+	float length = sqrtf(dot4(a, a));
+	return 1.f/length * a;
+}
+
+__inline
+float4 createEquation(const float4 a, const float4 b, const float4 c)
+{
+	float4 eqn;
+	float4 ab = b-a;
+	float4 ac = c-a;
+	eqn = normalize3( cross3(ab, ac) );
+	eqn.w = -dot3F4(eqn,a);
+	return eqn;
+}
+
+///////////////////////////////////////
+//	Matrix3x3
+///////////////////////////////////////
+
+typedef struct
+{
+	float4 m_row[3];
+}Matrix3x3;
+
+__inline
+Matrix3x3 mtZero();
+
+__inline
+Matrix3x3 mtIdentity();
+
+__inline
+Matrix3x3 mtTranspose(Matrix3x3 m);
+
+__inline
+Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b);
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b);
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b);
+
+__inline
+Matrix3x3 mtZero()
+{
+	Matrix3x3 m;
+	m.m_row[0] = (float4)(0.f);
+	m.m_row[1] = (float4)(0.f);
+	m.m_row[2] = (float4)(0.f);
+	return m;
+}
+
+__inline
+Matrix3x3 mtIdentity()
+{
+	Matrix3x3 m;
+	m.m_row[0] = (float4)(1,0,0,0);
+	m.m_row[1] = (float4)(0,1,0,0);
+	m.m_row[2] = (float4)(0,0,1,0);
+	return m;
+}
+
+__inline
+Matrix3x3 mtTranspose(Matrix3x3 m)
+{
+	Matrix3x3 out;
+	out.m_row[0] = (float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);
+	out.m_row[1] = (float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);
+	out.m_row[2] = (float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);
+	return out;
+}
+
+__inline
+Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b)
+{
+	Matrix3x3 transB;
+	transB = mtTranspose( b );
+	Matrix3x3 ans;
+	//	why this doesn't run when 0ing in the for{}
+	a.m_row[0].w = 0.f;
+	a.m_row[1].w = 0.f;
+	a.m_row[2].w = 0.f;
+	for(int i=0; i<3; i++)
+	{
+//	a.m_row[i].w = 0.f;
+		ans.m_row[i].x = dot3F4(a.m_row[i],transB.m_row[0]);
+		ans.m_row[i].y = dot3F4(a.m_row[i],transB.m_row[1]);
+		ans.m_row[i].z = dot3F4(a.m_row[i],transB.m_row[2]);
+		ans.m_row[i].w = 0.f;
+	}
+	return ans;
+}
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b)
+{
+	float4 ans;
+	ans.x = dot3F4( a.m_row[0], b );
+	ans.y = dot3F4( a.m_row[1], b );
+	ans.z = dot3F4( a.m_row[2], b );
+	ans.w = 0.f;
+	return ans;
+}
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b)
+{
+	float4 colx = make_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);
+	float4 coly = make_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);
+	float4 colz = make_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);
+
+	float4 ans;
+	ans.x = dot3F4( a, colx );
+	ans.y = dot3F4( a, coly );
+	ans.z = dot3F4( a, colz );
+	return ans;
+}
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+Quaternion qtNormalize(Quaternion in);
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec);
+
+__inline
+Quaternion qtInvert(Quaternion q);
+
+
+
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtNormalize(Quaternion in)
+{
+	return fastNormalize4(in);
+//	in /= length( in );
+//	return in;
+}
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+
+
+
+#define WG_SIZE 64
+
+typedef struct
+{
+	float4 m_pos;
+	Quaternion m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_shapeIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} Body;
+
+typedef struct
+{
+	Matrix3x3 m_invInertia;
+	Matrix3x3 m_initInvInertia;
+} Shape;
+
+typedef struct
+{
+	float4 m_linear;
+	float4 m_worldPos[4];
+	float4 m_center;	
+	float m_jacCoeffInv[4];
+	float m_b[4];
+	float m_appliedRambdaDt[4];
+
+	float m_fJacCoeffInv[2];	
+	float m_fAppliedRambdaDt[2];	
+
+	u32 m_bodyA;
+	u32 m_bodyB;
+
+	int m_batchIdx;
+	u32 m_paddings[1];
+} Constraint4;
+
+
+
+typedef struct
+{
+	int m_nConstraints;
+	int m_start;
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBuffer;
+
+typedef struct
+{
+	int m_solveFriction;
+	int m_maxBatch;	//	long batch really kills the performance
+	int m_batchIdx;
+	int m_nSplit;
+//	int m_paddings[1];
+} ConstBufferBatchSolve;
+
+
+ 
+
+
+typedef struct 
+{
+	int m_valInt0;
+	int m_valInt1;
+	int m_valInt2;
+	int m_valInt3;
+
+	float m_val0;
+	float m_val1;
+	float m_val2;
+	float m_val3;
+} SolverDebugInfo;
+
+
+
+
+//	others
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void ReorderContactKernel(__global struct b3Contact4Data* in, __global struct b3Contact4Data* out, __global int2* sortData, int4 cb )
+{
+	int nContacts = cb.x;
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < nContacts )
+	{
+		int srcIdx = sortData[gIdx].y;
+		out[gIdx] = in[srcIdx];
+	}
+}
+
+__kernel __attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SetDeterminismSortDataChildShapeB(__global struct b3Contact4Data* contactsIn, __global int2* sortDataOut, int nContacts)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < nContacts )
+	{
+		int2 sd;
+		sd.x = contactsIn[gIdx].m_childIndexB;
+		sd.y = gIdx;
+		sortDataOut[gIdx] = sd;
+	}
+}
+
+__kernel __attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SetDeterminismSortDataChildShapeA(__global struct b3Contact4Data* contactsIn, __global int2* sortDataInOut, int nContacts)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < nContacts )
+	{
+		int2 sdIn;
+		sdIn = sortDataInOut[gIdx];
+		int2 sdOut;
+		sdOut.x = contactsIn[sdIn.y].m_childIndexA;
+		sdOut.y = sdIn.y;
+		sortDataInOut[gIdx] = sdOut;
+	}
+}
+
+__kernel __attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SetDeterminismSortDataBodyA(__global struct b3Contact4Data* contactsIn, __global int2* sortDataInOut, int nContacts)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < nContacts )
+	{
+		int2 sdIn;
+		sdIn = sortDataInOut[gIdx];
+		int2 sdOut;
+		sdOut.x = contactsIn[sdIn.y].m_bodyAPtrAndSignBit;
+		sdOut.y = sdIn.y;
+		sortDataInOut[gIdx] = sdOut;
+	}
+}
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SetDeterminismSortDataBodyB(__global struct b3Contact4Data* contactsIn, __global int2* sortDataInOut, int nContacts)
+{
+	int gIdx = GET_GLOBAL_IDX;
+
+	if( gIdx < nContacts )
+	{
+		int2 sdIn;
+		sdIn = sortDataInOut[gIdx];
+		int2 sdOut;
+		sdOut.x = contactsIn[sdIn.y].m_bodyBPtrAndSignBit;
+		sdOut.y = sdIn.y;
+		sortDataInOut[gIdx] = sdOut;
+	}
+}
+
+
+
+
+typedef struct
+{
+	int m_nContacts;
+	int m_staticIdx;
+	float m_scale;
+	int m_nSplit;
+} ConstBufferSSD;
+
+
+__constant const int gridTable4x4[] = 
+{
+    0,1,17,16,
+	1,2,18,19,
+	17,18,32,3,
+	16,19,3,34
+};
+
+__constant const int gridTable8x8[] = 
+{
+	  0,  2,  3, 16, 17, 18, 19,  1,
+	 66, 64, 80, 67, 82, 81, 65, 83,
+	131,144,128,130,147,129,145,146,
+	208,195,194,192,193,211,210,209,
+	 21, 22, 23,  5,  4,  6,  7, 20,
+	 86, 85, 69, 87, 70, 68, 84, 71,
+	151,133,149,150,135,148,132,134,
+	197,27,214,213,212,199,198,196
+	
+};
+
+
+
+
+#define USE_SPATIAL_BATCHING 1
+#define USE_4x4_GRID 1
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void SetSortDataKernel(__global struct b3Contact4Data* gContact, __global Body* gBodies, __global int2* gSortDataOut, 
+int nContacts,float scale,int4 nSplit,int staticIdx)
+
+{
+	int gIdx = GET_GLOBAL_IDX;
+	
+	if( gIdx < nContacts )
+	{
+		int aPtrAndSignBit  = gContact[gIdx].m_bodyAPtrAndSignBit;
+		int bPtrAndSignBit  = gContact[gIdx].m_bodyBPtrAndSignBit;
+
+		int aIdx = abs(aPtrAndSignBit );
+		int bIdx = abs(bPtrAndSignBit);
+
+		bool aStatic = (aPtrAndSignBit<0) ||(aPtrAndSignBit==staticIdx);
+		bool bStatic = (bPtrAndSignBit<0) ||(bPtrAndSignBit==staticIdx);
+
+#if USE_SPATIAL_BATCHING		
+		int idx = (aStatic)? bIdx: aIdx;
+		float4 p = gBodies[idx].m_pos;
+		int xIdx = (int)((p.x-((p.x<0.f)?1.f:0.f))*scale) & (nSplit.x-1);
+		int yIdx = (int)((p.y-((p.y<0.f)?1.f:0.f))*scale) & (nSplit.y-1);
+		int zIdx = (int)((p.z-((p.z<0.f)?1.f:0.f))*scale) & (nSplit.z-1);
+		int newIndex = (xIdx+yIdx*nSplit.x+zIdx*nSplit.x*nSplit.y);
+		
+#else//USE_SPATIAL_BATCHING
+	#if USE_4x4_GRID
+		int aa = aIdx&3;
+		int bb = bIdx&3;
+		if (aStatic)
+			aa = bb;
+		if (bStatic)
+			bb = aa;
+
+		int gridIndex = aa + bb*4;
+		int newIndex = gridTable4x4[gridIndex];
+	#else//USE_4x4_GRID
+		int aa = aIdx&7;
+		int bb = bIdx&7;
+		if (aStatic)
+			aa = bb;
+		if (bStatic)
+			bb = aa;
+
+		int gridIndex = aa + bb*8;
+		int newIndex = gridTable8x8[gridIndex];
+	#endif//USE_4x4_GRID
+#endif//USE_SPATIAL_BATCHING
+
+
+		gSortDataOut[gIdx].x = newIndex;
+		gSortDataOut[gIdx].y = gIdx;
+	}
+	else
+	{
+		gSortDataOut[gIdx].x = 0xffffffff;
+	}
+}
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void CopyConstraintKernel(__global struct b3Contact4Data* gIn, __global struct b3Contact4Data* gOut, int4 cb )
+{
+	int gIdx = GET_GLOBAL_IDX;
+	if( gIdx < cb.x )
+	{
+		gOut[gIdx] = gIn[gIdx];
+	}
+}
+
+
+
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.h
new file mode 100644
index 0000000..1e6e357
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverSetup2.h
@@ -0,0 +1,600 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* solverSetup2CL =
+	"/*\n"
+	"Copyright (c) 2012 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Takahiro Harada\n"
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile global int*\n"
+	"#endif\n"
+	"typedef unsigned int u32;\n"
+	"typedef unsigned short u16;\n"
+	"typedef unsigned char u8;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_float4 (float4)\n"
+	"#define make_float2 (float2)\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_int4 (int4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"///////////////////////////////////////\n"
+	"//	Vector\n"
+	"///////////////////////////////////////\n"
+	"__inline\n"
+	"float fastDiv(float numerator, float denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"//	return numerator/denominator;	\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastDiv4(float4 numerator, float4 denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"}\n"
+	"__inline\n"
+	"float fastSqrtf(float f2)\n"
+	"{\n"
+	"	return native_sqrt(f2);\n"
+	"//	return sqrt(f2);\n"
+	"}\n"
+	"__inline\n"
+	"float fastRSqrt(float f2)\n"
+	"{\n"
+	"	return native_rsqrt(f2);\n"
+	"}\n"
+	"__inline\n"
+	"float fastLength4(float4 v)\n"
+	"{\n"
+	"	return fast_length(v);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"__inline\n"
+	"float sqrtf(float a)\n"
+	"{\n"
+	"//	return sqrt(a);\n"
+	"	return native_sqrt(a);\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a, float4 b)\n"
+	"{\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float length3(const float4 a)\n"
+	"{\n"
+	"	return sqrtf(dot3F4(a,a));\n"
+	"}\n"
+	"__inline\n"
+	"float dot4(const float4 a, const float4 b)\n"
+	"{\n"
+	"	return dot( a, b );\n"
+	"}\n"
+	"//	for height\n"
+	"__inline\n"
+	"float dot3w1(const float4 point, const float4 eqn)\n"
+	"{\n"
+	"	return dot3F4(point,eqn) + eqn.w;\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = make_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"//	float length = sqrtf(dot3F4(a, a));\n"
+	"//	return 1.f/length * a;\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize4(const float4 a)\n"
+	"{\n"
+	"	float length = sqrtf(dot4(a, a));\n"
+	"	return 1.f/length * a;\n"
+	"}\n"
+	"__inline\n"
+	"float4 createEquation(const float4 a, const float4 b, const float4 c)\n"
+	"{\n"
+	"	float4 eqn;\n"
+	"	float4 ab = b-a;\n"
+	"	float4 ac = c-a;\n"
+	"	eqn = normalize3( cross3(ab, ac) );\n"
+	"	eqn.w = -dot3F4(eqn,a);\n"
+	"	return eqn;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Matrix3x3\n"
+	"///////////////////////////////////////\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_row[3];\n"
+	"}Matrix3x3;\n"
+	"__inline\n"
+	"Matrix3x3 mtZero();\n"
+	"__inline\n"
+	"Matrix3x3 mtIdentity();\n"
+	"__inline\n"
+	"Matrix3x3 mtTranspose(Matrix3x3 m);\n"
+	"__inline\n"
+	"Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b);\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b);\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b);\n"
+	"__inline\n"
+	"Matrix3x3 mtZero()\n"
+	"{\n"
+	"	Matrix3x3 m;\n"
+	"	m.m_row[0] = (float4)(0.f);\n"
+	"	m.m_row[1] = (float4)(0.f);\n"
+	"	m.m_row[2] = (float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"Matrix3x3 mtIdentity()\n"
+	"{\n"
+	"	Matrix3x3 m;\n"
+	"	m.m_row[0] = (float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"Matrix3x3 mtTranspose(Matrix3x3 m)\n"
+	"{\n"
+	"	Matrix3x3 out;\n"
+	"	out.m_row[0] = (float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b)\n"
+	"{\n"
+	"	Matrix3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	Matrix3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b)\n"
+	"{\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a.m_row[0], b );\n"
+	"	ans.y = dot3F4( a.m_row[1], b );\n"
+	"	ans.z = dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b)\n"
+	"{\n"
+	"	float4 colx = make_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	float4 coly = make_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	float4 colz = make_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a, colx );\n"
+	"	ans.y = dot3F4( a, coly );\n"
+	"	ans.z = dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec);\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fastNormalize4(in);\n"
+	"//	in /= length( in );\n"
+	"//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"#define WG_SIZE 64\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	Quaternion m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_shapeIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} Body;\n"
+	"typedef struct\n"
+	"{\n"
+	"	Matrix3x3 m_invInertia;\n"
+	"	Matrix3x3 m_initInvInertia;\n"
+	"} Shape;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_linear;\n"
+	"	float4 m_worldPos[4];\n"
+	"	float4 m_center;	\n"
+	"	float m_jacCoeffInv[4];\n"
+	"	float m_b[4];\n"
+	"	float m_appliedRambdaDt[4];\n"
+	"	float m_fJacCoeffInv[2];	\n"
+	"	float m_fAppliedRambdaDt[2];	\n"
+	"	u32 m_bodyA;\n"
+	"	u32 m_bodyB;\n"
+	"	int m_batchIdx;\n"
+	"	u32 m_paddings[1];\n"
+	"} Constraint4;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_nConstraints;\n"
+	"	int m_start;\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBuffer;\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_solveFriction;\n"
+	"	int m_maxBatch;	//	long batch really kills the performance\n"
+	"	int m_batchIdx;\n"
+	"	int m_nSplit;\n"
+	"//	int m_paddings[1];\n"
+	"} ConstBufferBatchSolve;\n"
+	" \n"
+	"typedef struct \n"
+	"{\n"
+	"	int m_valInt0;\n"
+	"	int m_valInt1;\n"
+	"	int m_valInt2;\n"
+	"	int m_valInt3;\n"
+	"	float m_val0;\n"
+	"	float m_val1;\n"
+	"	float m_val2;\n"
+	"	float m_val3;\n"
+	"} SolverDebugInfo;\n"
+	"//	others\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void ReorderContactKernel(__global struct b3Contact4Data* in, __global struct b3Contact4Data* out, __global int2* sortData, int4 cb )\n"
+	"{\n"
+	"	int nContacts = cb.x;\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int srcIdx = sortData[gIdx].y;\n"
+	"		out[gIdx] = in[srcIdx];\n"
+	"	}\n"
+	"}\n"
+	"__kernel __attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SetDeterminismSortDataChildShapeB(__global struct b3Contact4Data* contactsIn, __global int2* sortDataOut, int nContacts)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int2 sd;\n"
+	"		sd.x = contactsIn[gIdx].m_childIndexB;\n"
+	"		sd.y = gIdx;\n"
+	"		sortDataOut[gIdx] = sd;\n"
+	"	}\n"
+	"}\n"
+	"__kernel __attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SetDeterminismSortDataChildShapeA(__global struct b3Contact4Data* contactsIn, __global int2* sortDataInOut, int nContacts)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int2 sdIn;\n"
+	"		sdIn = sortDataInOut[gIdx];\n"
+	"		int2 sdOut;\n"
+	"		sdOut.x = contactsIn[sdIn.y].m_childIndexA;\n"
+	"		sdOut.y = sdIn.y;\n"
+	"		sortDataInOut[gIdx] = sdOut;\n"
+	"	}\n"
+	"}\n"
+	"__kernel __attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SetDeterminismSortDataBodyA(__global struct b3Contact4Data* contactsIn, __global int2* sortDataInOut, int nContacts)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int2 sdIn;\n"
+	"		sdIn = sortDataInOut[gIdx];\n"
+	"		int2 sdOut;\n"
+	"		sdOut.x = contactsIn[sdIn.y].m_bodyAPtrAndSignBit;\n"
+	"		sdOut.y = sdIn.y;\n"
+	"		sortDataInOut[gIdx] = sdOut;\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SetDeterminismSortDataBodyB(__global struct b3Contact4Data* contactsIn, __global int2* sortDataInOut, int nContacts)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int2 sdIn;\n"
+	"		sdIn = sortDataInOut[gIdx];\n"
+	"		int2 sdOut;\n"
+	"		sdOut.x = contactsIn[sdIn.y].m_bodyBPtrAndSignBit;\n"
+	"		sdOut.y = sdIn.y;\n"
+	"		sortDataInOut[gIdx] = sdOut;\n"
+	"	}\n"
+	"}\n"
+	"typedef struct\n"
+	"{\n"
+	"	int m_nContacts;\n"
+	"	int m_staticIdx;\n"
+	"	float m_scale;\n"
+	"	int m_nSplit;\n"
+	"} ConstBufferSSD;\n"
+	"__constant const int gridTable4x4[] = \n"
+	"{\n"
+	"    0,1,17,16,\n"
+	"	1,2,18,19,\n"
+	"	17,18,32,3,\n"
+	"	16,19,3,34\n"
+	"};\n"
+	"__constant const int gridTable8x8[] = \n"
+	"{\n"
+	"	  0,  2,  3, 16, 17, 18, 19,  1,\n"
+	"	 66, 64, 80, 67, 82, 81, 65, 83,\n"
+	"	131,144,128,130,147,129,145,146,\n"
+	"	208,195,194,192,193,211,210,209,\n"
+	"	 21, 22, 23,  5,  4,  6,  7, 20,\n"
+	"	 86, 85, 69, 87, 70, 68, 84, 71,\n"
+	"	151,133,149,150,135,148,132,134,\n"
+	"	197,27,214,213,212,199,198,196\n"
+	"	\n"
+	"};\n"
+	"#define USE_SPATIAL_BATCHING 1\n"
+	"#define USE_4x4_GRID 1\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void SetSortDataKernel(__global struct b3Contact4Data* gContact, __global Body* gBodies, __global int2* gSortDataOut, \n"
+	"int nContacts,float scale,int4 nSplit,int staticIdx)\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int aPtrAndSignBit  = gContact[gIdx].m_bodyAPtrAndSignBit;\n"
+	"		int bPtrAndSignBit  = gContact[gIdx].m_bodyBPtrAndSignBit;\n"
+	"		int aIdx = abs(aPtrAndSignBit );\n"
+	"		int bIdx = abs(bPtrAndSignBit);\n"
+	"		bool aStatic = (aPtrAndSignBit<0) ||(aPtrAndSignBit==staticIdx);\n"
+	"		bool bStatic = (bPtrAndSignBit<0) ||(bPtrAndSignBit==staticIdx);\n"
+	"#if USE_SPATIAL_BATCHING		\n"
+	"		int idx = (aStatic)? bIdx: aIdx;\n"
+	"		float4 p = gBodies[idx].m_pos;\n"
+	"		int xIdx = (int)((p.x-((p.x<0.f)?1.f:0.f))*scale) & (nSplit.x-1);\n"
+	"		int yIdx = (int)((p.y-((p.y<0.f)?1.f:0.f))*scale) & (nSplit.y-1);\n"
+	"		int zIdx = (int)((p.z-((p.z<0.f)?1.f:0.f))*scale) & (nSplit.z-1);\n"
+	"		int newIndex = (xIdx+yIdx*nSplit.x+zIdx*nSplit.x*nSplit.y);\n"
+	"		\n"
+	"#else//USE_SPATIAL_BATCHING\n"
+	"	#if USE_4x4_GRID\n"
+	"		int aa = aIdx&3;\n"
+	"		int bb = bIdx&3;\n"
+	"		if (aStatic)\n"
+	"			aa = bb;\n"
+	"		if (bStatic)\n"
+	"			bb = aa;\n"
+	"		int gridIndex = aa + bb*4;\n"
+	"		int newIndex = gridTable4x4[gridIndex];\n"
+	"	#else//USE_4x4_GRID\n"
+	"		int aa = aIdx&7;\n"
+	"		int bb = bIdx&7;\n"
+	"		if (aStatic)\n"
+	"			aa = bb;\n"
+	"		if (bStatic)\n"
+	"			bb = aa;\n"
+	"		int gridIndex = aa + bb*8;\n"
+	"		int newIndex = gridTable8x8[gridIndex];\n"
+	"	#endif//USE_4x4_GRID\n"
+	"#endif//USE_SPATIAL_BATCHING\n"
+	"		gSortDataOut[gIdx].x = newIndex;\n"
+	"		gSortDataOut[gIdx].y = gIdx;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		gSortDataOut[gIdx].x = 0xffffffff;\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void CopyConstraintKernel(__global struct b3Contact4Data* gIn, __global struct b3Contact4Data* gOut, int4 cb )\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	if( gIdx < cb.x )\n"
+	"	{\n"
+	"		gOut[gIdx] = gIn[gIdx];\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.cl
new file mode 100644
index 0000000..a21a08c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.cl
@@ -0,0 +1,968 @@
+/*
+Copyright (c) 2013 Advanced Micro Devices, Inc.  
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+//Originally written by Erwin Coumans
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
+
+#pragma OPENCL EXTENSION cl_amd_printf : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
+
+
+#ifdef cl_ext_atomic_counters_32
+#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable
+#else
+#define counter32_t volatile global int*
+#endif
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#define GET_GROUP_IDX get_group_id(0)
+#define GET_LOCAL_IDX get_local_id(0)
+#define GET_GLOBAL_IDX get_global_id(0)
+#define GET_GROUP_SIZE get_local_size(0)
+#define GET_NUM_GROUPS get_num_groups(0)
+#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)
+#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)
+#define AtomInc(x) atom_inc(&(x))
+#define AtomInc1(x, out) out = atom_inc(&(x))
+#define AppendInc(x, out) out = atomic_inc(x)
+#define AtomAdd(x, value) atom_add(&(x), value)
+#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )
+#define AtomXhg(x, value) atom_xchg ( &(x), value )
+
+
+#define SELECT_UINT4( b, a, condition ) select( b,a,condition )
+
+#define make_float4 (float4)
+#define make_float2 (float2)
+#define make_uint4 (uint4)
+#define make_int4 (int4)
+#define make_uint2 (uint2)
+#define make_int2 (int2)
+
+
+#define max2 max
+#define min2 min
+
+
+///////////////////////////////////////
+//	Vector
+///////////////////////////////////////
+__inline
+float fastDiv(float numerator, float denominator)
+{
+	return native_divide(numerator, denominator);	
+//	return numerator/denominator;	
+}
+
+__inline
+float4 fastDiv4(float4 numerator, float4 denominator)
+{
+	return native_divide(numerator, denominator);	
+}
+
+__inline
+float fastSqrtf(float f2)
+{
+	return native_sqrt(f2);
+//	return sqrt(f2);
+}
+
+__inline
+float fastRSqrt(float f2)
+{
+	return native_rsqrt(f2);
+}
+
+__inline
+float fastLength4(float4 v)
+{
+	return fast_length(v);
+}
+
+__inline
+float4 fastNormalize4(float4 v)
+{
+	return fast_normalize(v);
+}
+
+
+__inline
+float sqrtf(float a)
+{
+//	return sqrt(a);
+	return native_sqrt(a);
+}
+
+__inline
+float4 cross3(float4 a1, float4 b1)
+{
+
+	float4 	a=make_float4(a1.xyz,0.f);
+	float4 	b=make_float4(b1.xyz,0.f);
+	//float4 	a=a1;
+	//float4 	b=b1;
+	return cross(a,b);
+}
+
+__inline
+float dot3F4(float4 a, float4 b)
+{
+	float4 a1 = make_float4(a.xyz,0.f);
+	float4 b1 = make_float4(b.xyz,0.f);
+	return dot(a1, b1);
+}
+
+__inline
+float length3(const float4 a)
+{
+	return sqrtf(dot3F4(a,a));
+}
+
+__inline
+float dot4(const float4 a, const float4 b)
+{
+	return dot( a, b );
+}
+
+//	for height
+__inline
+float dot3w1(const float4 point, const float4 eqn)
+{
+	return dot3F4(point,eqn) + eqn.w;
+}
+
+__inline
+float4 normalize3(const float4 a)
+{
+	float4 n = make_float4(a.x, a.y, a.z, 0.f);
+	return fastNormalize4( n );
+//	float length = sqrtf(dot3F4(a, a));
+//	return 1.f/length * a;
+}
+
+__inline
+float4 normalize4(const float4 a)
+{
+	float length = sqrtf(dot4(a, a));
+	return 1.f/length * a;
+}
+
+__inline
+float4 createEquation(const float4 a, const float4 b, const float4 c)
+{
+	float4 eqn;
+	float4 ab = b-a;
+	float4 ac = c-a;
+	eqn = normalize3( cross3(ab, ac) );
+	eqn.w = -dot3F4(eqn,a);
+	return eqn;
+}
+
+///////////////////////////////////////
+//	Matrix3x3
+///////////////////////////////////////
+
+typedef struct
+{
+	float4 m_row[3];
+}Matrix3x3;
+
+__inline
+Matrix3x3 mtZero();
+
+__inline
+Matrix3x3 mtIdentity();
+
+__inline
+Matrix3x3 mtTranspose(Matrix3x3 m);
+
+__inline
+Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b);
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b);
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b);
+
+__inline
+Matrix3x3 mtZero()
+{
+	Matrix3x3 m;
+	m.m_row[0] = (float4)(0.f);
+	m.m_row[1] = (float4)(0.f);
+	m.m_row[2] = (float4)(0.f);
+	return m;
+}
+
+__inline
+Matrix3x3 mtIdentity()
+{
+	Matrix3x3 m;
+	m.m_row[0] = (float4)(1,0,0,0);
+	m.m_row[1] = (float4)(0,1,0,0);
+	m.m_row[2] = (float4)(0,0,1,0);
+	return m;
+}
+
+__inline
+Matrix3x3 mtTranspose(Matrix3x3 m)
+{
+	Matrix3x3 out;
+	out.m_row[0] = (float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);
+	out.m_row[1] = (float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);
+	out.m_row[2] = (float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);
+	return out;
+}
+
+__inline
+Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b)
+{
+	Matrix3x3 transB;
+	transB = mtTranspose( b );
+	Matrix3x3 ans;
+	//	why this doesn't run when 0ing in the for{}
+	a.m_row[0].w = 0.f;
+	a.m_row[1].w = 0.f;
+	a.m_row[2].w = 0.f;
+	for(int i=0; i<3; i++)
+	{
+//	a.m_row[i].w = 0.f;
+		ans.m_row[i].x = dot3F4(a.m_row[i],transB.m_row[0]);
+		ans.m_row[i].y = dot3F4(a.m_row[i],transB.m_row[1]);
+		ans.m_row[i].z = dot3F4(a.m_row[i],transB.m_row[2]);
+		ans.m_row[i].w = 0.f;
+	}
+	return ans;
+}
+
+__inline
+float4 mtMul1(Matrix3x3 a, float4 b)
+{
+	float4 ans;
+	ans.x = dot3F4( a.m_row[0], b );
+	ans.y = dot3F4( a.m_row[1], b );
+	ans.z = dot3F4( a.m_row[2], b );
+	ans.w = 0.f;
+	return ans;
+}
+
+__inline
+float4 mtMul3(float4 a, Matrix3x3 b)
+{
+	float4 colx = make_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);
+	float4 coly = make_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);
+	float4 colz = make_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);
+
+	float4 ans;
+	ans.x = dot3F4( a, colx );
+	ans.y = dot3F4( a, coly );
+	ans.z = dot3F4( a, colz );
+	return ans;
+}
+
+///////////////////////////////////////
+//	Quaternion
+///////////////////////////////////////
+
+typedef float4 Quaternion;
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b);
+
+__inline
+Quaternion qtNormalize(Quaternion in);
+
+__inline
+float4 qtRotate(Quaternion q, float4 vec);
+
+__inline
+Quaternion qtInvert(Quaternion q);
+
+
+
+
+
+__inline
+Quaternion qtMul(Quaternion a, Quaternion b)
+{
+	Quaternion ans;
+	ans = cross3( a, b );
+	ans += a.w*b+b.w*a;
+//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);
+	ans.w = a.w*b.w - dot3F4(a, b);
+	return ans;
+}
+
+__inline
+Quaternion qtNormalize(Quaternion in)
+{
+	return fastNormalize4(in);
+//	in /= length( in );
+//	return in;
+}
+__inline
+float4 qtRotate(Quaternion q, float4 vec)
+{
+	Quaternion qInv = qtInvert( q );
+	float4 vcpy = vec;
+	vcpy.w = 0.f;
+	float4 out = qtMul(qtMul(q,vcpy),qInv);
+	return out;
+}
+
+__inline
+Quaternion qtInvert(Quaternion q)
+{
+	return (Quaternion)(-q.xyz, q.w);
+}
+
+__inline
+float4 qtInvRotate(const Quaternion q, float4 vec)
+{
+	return qtRotate( qtInvert( q ), vec );
+}
+
+
+
+
+#define WG_SIZE 64
+
+typedef struct
+{
+	float4 m_pos;
+	Quaternion m_quat;
+	float4 m_linVel;
+	float4 m_angVel;
+
+	u32 m_shapeIdx;
+	float m_invMass;
+	float m_restituitionCoeff;
+	float m_frictionCoeff;
+} Body;
+
+
+
+typedef struct
+{
+	Matrix3x3 m_invInertia;
+	Matrix3x3 m_initInvInertia;
+} Shape;
+
+typedef struct
+{
+	float4 m_linear;
+	float4 m_worldPos[4];
+	float4 m_center;	
+	float m_jacCoeffInv[4];
+	float m_b[4];
+	float m_appliedRambdaDt[4];
+
+	float m_fJacCoeffInv[2];	
+	float m_fAppliedRambdaDt[2];	
+
+	u32 m_bodyA;
+	u32 m_bodyB;
+	int m_batchIdx;
+	u32 m_paddings;
+} Constraint4;
+
+
+
+
+
+
+__kernel void CountBodiesKernel(__global struct b3Contact4Data* manifoldPtr, __global unsigned int* bodyCount, __global int2* contactConstraintOffsets, int numContactManifolds, int fixedBodyIndex)
+{
+	int i = GET_GLOBAL_IDX;
+	
+	if( i < numContactManifolds)
+	{
+		int pa = manifoldPtr[i].m_bodyAPtrAndSignBit;
+		bool isFixedA = (pa <0) || (pa == fixedBodyIndex);
+		int bodyIndexA = abs(pa);
+		if (!isFixedA)
+		{
+			 AtomInc1(bodyCount[bodyIndexA],contactConstraintOffsets[i].x);
+		}
+		barrier(CLK_GLOBAL_MEM_FENCE);
+		int pb = manifoldPtr[i].m_bodyBPtrAndSignBit;
+		bool isFixedB = (pb <0) || (pb == fixedBodyIndex);
+		int bodyIndexB = abs(pb);
+		if (!isFixedB)
+		{
+			AtomInc1(bodyCount[bodyIndexB],contactConstraintOffsets[i].y);
+		} 
+	}
+}
+
+__kernel void ClearVelocitiesKernel(__global float4* linearVelocities,__global float4* angularVelocities, int numSplitBodies)
+{
+	int i = GET_GLOBAL_IDX;
+	
+	if( i < numSplitBodies)
+	{
+		linearVelocities[i] = make_float4(0);
+		angularVelocities[i] = make_float4(0);
+	}
+}
+
+
+__kernel void AverageVelocitiesKernel(__global Body* gBodies,__global int* offsetSplitBodies,__global const unsigned int* bodyCount,
+__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities, int numBodies)
+{
+	int i = GET_GLOBAL_IDX;
+	if (i<numBodies)
+	{
+		if (gBodies[i].m_invMass)
+		{
+			int bodyOffset = offsetSplitBodies[i];
+			int count = bodyCount[i];
+			float factor = 1.f/((float)count);
+			float4 averageLinVel = make_float4(0.f);
+			float4 averageAngVel = make_float4(0.f);
+			
+			for (int j=0;j<count;j++)
+			{
+				averageLinVel += deltaLinearVelocities[bodyOffset+j]*factor;
+				averageAngVel += deltaAngularVelocities[bodyOffset+j]*factor;
+			}
+			
+			for (int j=0;j<count;j++)
+			{
+				deltaLinearVelocities[bodyOffset+j] = averageLinVel;
+				deltaAngularVelocities[bodyOffset+j] = averageAngVel;
+			}
+			
+		}//bodies[i].m_invMass
+	}//i<numBodies
+}
+
+
+
+void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1)
+{
+	*linear = make_float4(n.xyz,0.f);
+	*angular0 = cross3(r0, n);
+	*angular1 = -cross3(r1, n);
+}
+
+
+float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 )
+{
+	return dot3F4(l0, linVel0) + dot3F4(a0, angVel0) + dot3F4(l1, linVel1) + dot3F4(a1, angVel1);
+}
+
+
+float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,
+					float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1, float countA, float countB)
+{
+	//	linear0,1 are normlized
+	float jmj0 = invMass0;//dot3F4(linear0, linear0)*invMass0;
+	float jmj1 = dot3F4(mtMul3(angular0,*invInertia0), angular0);
+	float jmj2 = invMass1;//dot3F4(linear1, linear1)*invMass1;
+	float jmj3 = dot3F4(mtMul3(angular1,*invInertia1), angular1);
+	return -1.f/((jmj0+jmj1)*countA+(jmj2+jmj3)*countB);
+}
+
+
+void btPlaneSpace1 (float4 n, float4* p, float4* q);
+ void btPlaneSpace1 (float4 n, float4* p, float4* q)
+{
+  if (fabs(n.z) > 0.70710678f) {
+    // choose p in y-z plane
+    float a = n.y*n.y + n.z*n.z;
+    float k = 1.f/sqrt(a);
+    p[0].x = 0;
+	p[0].y = -n.z*k;
+	p[0].z = n.y*k;
+    // set q = n x p
+    q[0].x = a*k;
+	q[0].y = -n.x*p[0].z;
+	q[0].z = n.x*p[0].y;
+  }
+  else {
+    // choose p in x-y plane
+    float a = n.x*n.x + n.y*n.y;
+    float k = 1.f/sqrt(a);
+    p[0].x = -n.y*k;
+	p[0].y = n.x*k;
+	p[0].z = 0;
+    // set q = n x p
+    q[0].x = -n.z*p[0].y;
+	q[0].y = n.z*p[0].x;
+	q[0].z = a*k;
+  }
+}
+
+
+
+
+
+void solveContact(__global Constraint4* cs,
+			float4 posA, float4* linVelA, float4* angVelA, float invMassA, Matrix3x3 invInertiaA,
+			float4 posB, float4* linVelB, float4* angVelB, float invMassB, Matrix3x3 invInertiaB,
+			float4* dLinVelA, float4* dAngVelA, float4* dLinVelB, float4* dAngVelB)
+{
+	float minRambdaDt = 0;
+	float maxRambdaDt = FLT_MAX;
+
+	for(int ic=0; ic<4; ic++)
+	{
+		if( cs->m_jacCoeffInv[ic] == 0.f ) continue;
+
+		float4 angular0, angular1, linear;
+		float4 r0 = cs->m_worldPos[ic] - posA;
+		float4 r1 = cs->m_worldPos[ic] - posB;
+		setLinearAndAngular( cs->m_linear, r0, r1, &linear, &angular0, &angular1 );
+	
+
+
+		float rambdaDt = calcRelVel( cs->m_linear, -cs->m_linear, angular0, angular1, 
+			*linVelA+*dLinVelA, *angVelA+*dAngVelA, *linVelB+*dLinVelB, *angVelB+*dAngVelB ) + cs->m_b[ic];
+		rambdaDt *= cs->m_jacCoeffInv[ic];
+
+		
+		{
+			float prevSum = cs->m_appliedRambdaDt[ic];
+			float updated = prevSum;
+			updated += rambdaDt;
+			updated = max2( updated, minRambdaDt );
+			updated = min2( updated, maxRambdaDt );
+			rambdaDt = updated - prevSum;
+			cs->m_appliedRambdaDt[ic] = updated;
+		}
+
+			
+		float4 linImp0 = invMassA*linear*rambdaDt;
+		float4 linImp1 = invMassB*(-linear)*rambdaDt;
+		float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;
+		float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;
+
+		
+		if (invMassA)
+		{
+			*dLinVelA += linImp0;
+			*dAngVelA += angImp0;
+		}
+		if (invMassB)
+		{
+			*dLinVelB += linImp1;
+			*dAngVelB += angImp1;
+		}
+	}
+}
+
+
+//	solveContactConstraint( gBodies, gShapes, &gConstraints[i] ,contactConstraintOffsets,offsetSplitBodies, deltaLinearVelocities, deltaAngularVelocities);
+
+
+void solveContactConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs, 
+__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,
+__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities)
+{
+
+	//float frictionCoeff = ldsCs[0].m_linear.w;
+	int aIdx = ldsCs[0].m_bodyA;
+	int bIdx = ldsCs[0].m_bodyB;
+
+	float4 posA = gBodies[aIdx].m_pos;
+	float4 linVelA = gBodies[aIdx].m_linVel;
+	float4 angVelA = gBodies[aIdx].m_angVel;
+	float invMassA = gBodies[aIdx].m_invMass;
+	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;
+
+	float4 posB = gBodies[bIdx].m_pos;
+	float4 linVelB = gBodies[bIdx].m_linVel;
+	float4 angVelB = gBodies[bIdx].m_angVel;
+	float invMassB = gBodies[bIdx].m_invMass;
+	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;
+
+			
+	float4 dLinVelA = make_float4(0,0,0,0);
+	float4 dAngVelA = make_float4(0,0,0,0);
+	float4 dLinVelB = make_float4(0,0,0,0);
+	float4 dAngVelB = make_float4(0,0,0,0);
+			
+	int bodyOffsetA = offsetSplitBodies[aIdx];
+	int constraintOffsetA = contactConstraintOffsets[0].x;
+	int splitIndexA = bodyOffsetA+constraintOffsetA;
+	
+	if (invMassA)
+	{
+		dLinVelA = deltaLinearVelocities[splitIndexA];
+		dAngVelA = deltaAngularVelocities[splitIndexA];
+	}
+
+	int bodyOffsetB = offsetSplitBodies[bIdx];
+	int constraintOffsetB = contactConstraintOffsets[0].y;
+	int splitIndexB= bodyOffsetB+constraintOffsetB;
+
+	if (invMassB)
+	{
+		dLinVelB = deltaLinearVelocities[splitIndexB];
+		dAngVelB = deltaAngularVelocities[splitIndexB];
+	}
+
+	solveContact( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,
+			posB, &linVelB, &angVelB, invMassB, invInertiaB ,&dLinVelA, &dAngVelA, &dLinVelB, &dAngVelB);
+
+	if (invMassA)
+	{
+		deltaLinearVelocities[splitIndexA] = dLinVelA;
+		deltaAngularVelocities[splitIndexA] = dAngVelA;
+	} 
+	if (invMassB)
+	{
+		deltaLinearVelocities[splitIndexB] = dLinVelB;
+		deltaAngularVelocities[splitIndexB] = dAngVelB;
+	}
+
+}
+
+
+__kernel void SolveContactJacobiKernel(__global Constraint4* gConstraints, __global Body* gBodies, __global Shape* gShapes ,
+__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities,
+float deltaTime, float positionDrift, float positionConstraintCoeff, int fixedBodyIndex, int numManifolds
+)
+{
+	int i = GET_GLOBAL_IDX;
+	if (i<numManifolds)
+	{
+		solveContactConstraint( gBodies, gShapes, &gConstraints[i] ,&contactConstraintOffsets[i],offsetSplitBodies, deltaLinearVelocities, deltaAngularVelocities);
+	}
+}
+
+
+
+
+void solveFrictionConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs,
+							__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,
+							__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities)
+{
+	float frictionCoeff = 0.7f;//ldsCs[0].m_linear.w;
+	int aIdx = ldsCs[0].m_bodyA;
+	int bIdx = ldsCs[0].m_bodyB;
+
+
+	float4 posA = gBodies[aIdx].m_pos;
+	float4 linVelA = gBodies[aIdx].m_linVel;
+	float4 angVelA = gBodies[aIdx].m_angVel;
+	float invMassA = gBodies[aIdx].m_invMass;
+	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;
+
+	float4 posB = gBodies[bIdx].m_pos;
+	float4 linVelB = gBodies[bIdx].m_linVel;
+	float4 angVelB = gBodies[bIdx].m_angVel;
+	float invMassB = gBodies[bIdx].m_invMass;
+	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;
+	
+
+	float4 dLinVelA = make_float4(0,0,0,0);
+	float4 dAngVelA = make_float4(0,0,0,0);
+	float4 dLinVelB = make_float4(0,0,0,0);
+	float4 dAngVelB = make_float4(0,0,0,0);
+			
+	int bodyOffsetA = offsetSplitBodies[aIdx];
+	int constraintOffsetA = contactConstraintOffsets[0].x;
+	int splitIndexA = bodyOffsetA+constraintOffsetA;
+	
+	if (invMassA)
+	{
+		dLinVelA = deltaLinearVelocities[splitIndexA];
+		dAngVelA = deltaAngularVelocities[splitIndexA];
+	}
+
+	int bodyOffsetB = offsetSplitBodies[bIdx];
+	int constraintOffsetB = contactConstraintOffsets[0].y;
+	int splitIndexB= bodyOffsetB+constraintOffsetB;
+
+	if (invMassB)
+	{
+		dLinVelB = deltaLinearVelocities[splitIndexB];
+		dAngVelB = deltaAngularVelocities[splitIndexB];
+	}
+
+
+
+
+	{
+		float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};
+		float minRambdaDt[4] = {0.f,0.f,0.f,0.f};
+
+		float sum = 0;
+		for(int j=0; j<4; j++)
+		{
+			sum +=ldsCs[0].m_appliedRambdaDt[j];
+		}
+		frictionCoeff = 0.7f;
+		for(int j=0; j<4; j++)
+		{
+			maxRambdaDt[j] = frictionCoeff*sum;
+			minRambdaDt[j] = -maxRambdaDt[j];
+		}
+
+		
+//		solveFriction( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,
+//			posB, &linVelB, &angVelB, invMassB, invInertiaB, maxRambdaDt, minRambdaDt );
+		
+		
+		{
+			
+			__global Constraint4* cs = ldsCs;
+			
+			if( cs->m_fJacCoeffInv[0] == 0 && cs->m_fJacCoeffInv[0] == 0 ) return;
+			const float4 center = cs->m_center;
+			
+			float4 n = -cs->m_linear;
+			
+			float4 tangent[2];
+			btPlaneSpace1(n,&tangent[0],&tangent[1]);
+			float4 angular0, angular1, linear;
+			float4 r0 = center - posA;
+			float4 r1 = center - posB;
+			for(int i=0; i<2; i++)
+			{
+				setLinearAndAngular( tangent[i], r0, r1, &linear, &angular0, &angular1 );
+				float rambdaDt = calcRelVel(linear, -linear, angular0, angular1,
+											linVelA+dLinVelA, angVelA+dAngVelA, linVelB+dLinVelB, angVelB+dAngVelB );
+				rambdaDt *= cs->m_fJacCoeffInv[i];
+				
+				{
+					float prevSum = cs->m_fAppliedRambdaDt[i];
+					float updated = prevSum;
+					updated += rambdaDt;
+					updated = max2( updated, minRambdaDt[i] );
+					updated = min2( updated, maxRambdaDt[i] );
+					rambdaDt = updated - prevSum;
+					cs->m_fAppliedRambdaDt[i] = updated;
+				}
+				
+				float4 linImp0 = invMassA*linear*rambdaDt;
+				float4 linImp1 = invMassB*(-linear)*rambdaDt;
+				float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;
+				float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;
+				
+				dLinVelA += linImp0;
+				dAngVelA += angImp0;
+				dLinVelB += linImp1;
+				dAngVelB += angImp1;
+			}
+			{	//	angular damping for point constraint
+				float4 ab = normalize3( posB - posA );
+				float4 ac = normalize3( center - posA );
+				if( dot3F4( ab, ac ) > 0.95f  || (invMassA == 0.f || invMassB == 0.f))
+				{
+					float angNA = dot3F4( n, angVelA );
+					float angNB = dot3F4( n, angVelB );
+					
+					dAngVelA -= (angNA*0.1f)*n;
+					dAngVelB -= (angNB*0.1f)*n;
+				}
+			}
+		}
+
+		
+		
+	}
+
+	if (invMassA)
+	{
+		deltaLinearVelocities[splitIndexA] = dLinVelA;
+		deltaAngularVelocities[splitIndexA] = dAngVelA;
+	} 
+	if (invMassB)
+	{
+		deltaLinearVelocities[splitIndexB] = dLinVelB;
+		deltaAngularVelocities[splitIndexB] = dAngVelB;
+	}
+ 
+
+}
+
+
+__kernel void SolveFrictionJacobiKernel(__global Constraint4* gConstraints, __global Body* gBodies, __global Shape* gShapes ,
+										__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,
+										__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities,
+										float deltaTime, float positionDrift, float positionConstraintCoeff, int fixedBodyIndex, int numManifolds
+)
+{
+	int i = GET_GLOBAL_IDX;
+	if (i<numManifolds)
+	{
+		solveFrictionConstraint( gBodies, gShapes, &gConstraints[i] ,&contactConstraintOffsets[i],offsetSplitBodies, deltaLinearVelocities, deltaAngularVelocities);
+	}
+}
+
+
+__kernel void UpdateBodyVelocitiesKernel(__global Body* gBodies,__global int* offsetSplitBodies,__global const unsigned int* bodyCount,
+									__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities, int numBodies)
+{
+	int i = GET_GLOBAL_IDX;
+	if (i<numBodies)
+	{
+		if (gBodies[i].m_invMass)
+		{
+			int bodyOffset = offsetSplitBodies[i];
+			int count = bodyCount[i];
+			if (count)
+			{
+				gBodies[i].m_linVel += deltaLinearVelocities[bodyOffset];
+				gBodies[i].m_angVel += deltaAngularVelocities[bodyOffset];
+			}
+		}
+	}
+}
+
+
+
+void setConstraint4( const float4 posA, const float4 linVelA, const float4 angVelA, float invMassA, const Matrix3x3 invInertiaA,
+	const float4 posB, const float4 linVelB, const float4 angVelB, float invMassB, const Matrix3x3 invInertiaB, 
+	__global struct b3Contact4Data* src, float dt, float positionDrift, float positionConstraintCoeff,float countA, float countB,
+	Constraint4* dstC )
+{
+	dstC->m_bodyA = abs(src->m_bodyAPtrAndSignBit);
+	dstC->m_bodyB = abs(src->m_bodyBPtrAndSignBit);
+
+	float dtInv = 1.f/dt;
+	for(int ic=0; ic<4; ic++)
+	{
+		dstC->m_appliedRambdaDt[ic] = 0.f;
+	}
+	dstC->m_fJacCoeffInv[0] = dstC->m_fJacCoeffInv[1] = 0.f;
+
+
+	dstC->m_linear = src->m_worldNormalOnB;
+	dstC->m_linear.w = 0.7f ;//src->getFrictionCoeff() );
+	for(int ic=0; ic<4; ic++)
+	{
+		float4 r0 = src->m_worldPosB[ic] - posA;
+		float4 r1 = src->m_worldPosB[ic] - posB;
+
+		if( ic >= src->m_worldNormalOnB.w )//npoints
+		{
+			dstC->m_jacCoeffInv[ic] = 0.f;
+			continue;
+		}
+
+		float relVelN;
+		{
+			float4 linear, angular0, angular1;
+			setLinearAndAngular(src->m_worldNormalOnB, r0, r1, &linear, &angular0, &angular1);
+
+			dstC->m_jacCoeffInv[ic] = calcJacCoeff(linear, -linear, angular0, angular1,
+				invMassA, &invInertiaA, invMassB, &invInertiaB , countA, countB);
+
+			relVelN = calcRelVel(linear, -linear, angular0, angular1,
+				linVelA, angVelA, linVelB, angVelB);
+
+			float e = 0.f;//src->getRestituitionCoeff();
+			if( relVelN*relVelN < 0.004f ) e = 0.f;
+
+			dstC->m_b[ic] = e*relVelN;
+			//float penetration = src->m_worldPosB[ic].w;
+			dstC->m_b[ic] += (src->m_worldPosB[ic].w + positionDrift)*positionConstraintCoeff*dtInv;
+			dstC->m_appliedRambdaDt[ic] = 0.f;
+		}
+	}
+
+	if( src->m_worldNormalOnB.w > 0 )//npoints
+	{	//	prepare friction
+		float4 center = make_float4(0.f);
+		for(int i=0; i<src->m_worldNormalOnB.w; i++) 
+			center += src->m_worldPosB[i];
+		center /= (float)src->m_worldNormalOnB.w;
+
+		float4 tangent[2];
+		btPlaneSpace1(-src->m_worldNormalOnB,&tangent[0],&tangent[1]);
+		
+		float4 r[2];
+		r[0] = center - posA;
+		r[1] = center - posB;
+
+		for(int i=0; i<2; i++)
+		{
+			float4 linear, angular0, angular1;
+			setLinearAndAngular(tangent[i], r[0], r[1], &linear, &angular0, &angular1);
+
+			dstC->m_fJacCoeffInv[i] = calcJacCoeff(linear, -linear, angular0, angular1,
+				invMassA, &invInertiaA, invMassB, &invInertiaB ,countA, countB);
+			dstC->m_fAppliedRambdaDt[i] = 0.f;
+		}
+		dstC->m_center = center;
+	}
+
+	for(int i=0; i<4; i++)
+	{
+		if( i<src->m_worldNormalOnB.w )
+		{
+			dstC->m_worldPos[i] = src->m_worldPosB[i];
+		}
+		else
+		{
+			dstC->m_worldPos[i] = make_float4(0.f);
+		}
+	}
+}
+
+
+__kernel
+__attribute__((reqd_work_group_size(WG_SIZE,1,1)))
+void ContactToConstraintSplitKernel(__global const struct b3Contact4Data* gContact, __global const Body* gBodies, __global const Shape* gShapes, __global Constraint4* gConstraintOut, 
+__global const unsigned int* bodyCount,
+int nContacts,
+float dt,
+float positionDrift,
+float positionConstraintCoeff
+)
+{
+	int gIdx = GET_GLOBAL_IDX;
+	
+	if( gIdx < nContacts )
+	{
+		int aIdx = abs(gContact[gIdx].m_bodyAPtrAndSignBit);
+		int bIdx = abs(gContact[gIdx].m_bodyBPtrAndSignBit);
+
+		float4 posA = gBodies[aIdx].m_pos;
+		float4 linVelA = gBodies[aIdx].m_linVel;
+		float4 angVelA = gBodies[aIdx].m_angVel;
+		float invMassA = gBodies[aIdx].m_invMass;
+		Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;
+
+		float4 posB = gBodies[bIdx].m_pos;
+		float4 linVelB = gBodies[bIdx].m_linVel;
+		float4 angVelB = gBodies[bIdx].m_angVel;
+		float invMassB = gBodies[bIdx].m_invMass;
+		Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;
+
+		Constraint4 cs;
+
+		float countA = invMassA != 0.f ? (float)bodyCount[aIdx] : 1;
+		float countB = invMassB != 0.f ? (float)bodyCount[bIdx] : 1;
+
+    	setConstraint4( posA, linVelA, angVelA, invMassA, invInertiaA, posB, linVelB, angVelB, invMassB, invInertiaB,
+			&gContact[gIdx], dt, positionDrift, positionConstraintCoeff,countA,countB,
+			&cs  );
+		
+		cs.m_batchIdx = gContact[gIdx].m_batchIdx;
+
+		gConstraintOut[gIdx] = cs;
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.h
new file mode 100644
index 0000000..f4d98d9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/solverUtils.h
@@ -0,0 +1,908 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* solverUtilsCL =
+	"/*\n"
+	"Copyright (c) 2013 Advanced Micro Devices, Inc.  \n"
+	"This software is provided 'as-is', without any express or implied warranty.\n"
+	"In no event will the authors be held liable for any damages arising from the use of this software.\n"
+	"Permission is granted to anyone to use this software for any purpose, \n"
+	"including commercial applications, and to alter it and redistribute it freely, \n"
+	"subject to the following restrictions:\n"
+	"1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n"
+	"2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n"
+	"3. This notice may not be removed or altered from any source distribution.\n"
+	"*/\n"
+	"//Originally written by Erwin Coumans\n"
+	"#ifndef B3_CONTACT4DATA_H\n"
+	"#define B3_CONTACT4DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"typedef  struct b3Contact4Data b3Contact4Data_t;\n"
+	"struct b3Contact4Data\n"
+	"{\n"
+	"	b3Float4	m_worldPosB[4];\n"
+	"//	b3Float4	m_localPosA[4];\n"
+	"//	b3Float4	m_localPosB[4];\n"
+	"	b3Float4	m_worldNormalOnB;	//	w: m_nPoints\n"
+	"	unsigned short  m_restituitionCoeffCmp;\n"
+	"	unsigned short  m_frictionCoeffCmp;\n"
+	"	int m_batchIdx;\n"
+	"	int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr\n"
+	"	int m_bodyBPtrAndSignBit;\n"
+	"	int	m_childIndexA;\n"
+	"	int	m_childIndexB;\n"
+	"	int m_unused1;\n"
+	"	int m_unused2;\n"
+	"};\n"
+	"inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact)\n"
+	"{\n"
+	"	return (int)contact->m_worldNormalOnB.w;\n"
+	"};\n"
+	"inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numPoints)\n"
+	"{\n"
+	"	contact->m_worldNormalOnB.w = (float)numPoints;\n"
+	"};\n"
+	"#endif //B3_CONTACT4DATA_H\n"
+	"#pragma OPENCL EXTENSION cl_amd_printf : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n"
+	"#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n"
+	"#ifdef cl_ext_atomic_counters_32\n"
+	"#pragma OPENCL EXTENSION cl_ext_atomic_counters_32 : enable\n"
+	"#else\n"
+	"#define counter32_t volatile global int*\n"
+	"#endif\n"
+	"typedef unsigned int u32;\n"
+	"typedef unsigned short u16;\n"
+	"typedef unsigned char u8;\n"
+	"#define GET_GROUP_IDX get_group_id(0)\n"
+	"#define GET_LOCAL_IDX get_local_id(0)\n"
+	"#define GET_GLOBAL_IDX get_global_id(0)\n"
+	"#define GET_GROUP_SIZE get_local_size(0)\n"
+	"#define GET_NUM_GROUPS get_num_groups(0)\n"
+	"#define GROUP_LDS_BARRIER barrier(CLK_LOCAL_MEM_FENCE)\n"
+	"#define GROUP_MEM_FENCE mem_fence(CLK_LOCAL_MEM_FENCE)\n"
+	"#define AtomInc(x) atom_inc(&(x))\n"
+	"#define AtomInc1(x, out) out = atom_inc(&(x))\n"
+	"#define AppendInc(x, out) out = atomic_inc(x)\n"
+	"#define AtomAdd(x, value) atom_add(&(x), value)\n"
+	"#define AtomCmpxhg(x, cmp, value) atom_cmpxchg( &(x), cmp, value )\n"
+	"#define AtomXhg(x, value) atom_xchg ( &(x), value )\n"
+	"#define SELECT_UINT4( b, a, condition ) select( b,a,condition )\n"
+	"#define make_float4 (float4)\n"
+	"#define make_float2 (float2)\n"
+	"#define make_uint4 (uint4)\n"
+	"#define make_int4 (int4)\n"
+	"#define make_uint2 (uint2)\n"
+	"#define make_int2 (int2)\n"
+	"#define max2 max\n"
+	"#define min2 min\n"
+	"///////////////////////////////////////\n"
+	"//	Vector\n"
+	"///////////////////////////////////////\n"
+	"__inline\n"
+	"float fastDiv(float numerator, float denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"//	return numerator/denominator;	\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastDiv4(float4 numerator, float4 denominator)\n"
+	"{\n"
+	"	return native_divide(numerator, denominator);	\n"
+	"}\n"
+	"__inline\n"
+	"float fastSqrtf(float f2)\n"
+	"{\n"
+	"	return native_sqrt(f2);\n"
+	"//	return sqrt(f2);\n"
+	"}\n"
+	"__inline\n"
+	"float fastRSqrt(float f2)\n"
+	"{\n"
+	"	return native_rsqrt(f2);\n"
+	"}\n"
+	"__inline\n"
+	"float fastLength4(float4 v)\n"
+	"{\n"
+	"	return fast_length(v);\n"
+	"}\n"
+	"__inline\n"
+	"float4 fastNormalize4(float4 v)\n"
+	"{\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"__inline\n"
+	"float sqrtf(float a)\n"
+	"{\n"
+	"//	return sqrt(a);\n"
+	"	return native_sqrt(a);\n"
+	"}\n"
+	"__inline\n"
+	"float4 cross3(float4 a1, float4 b1)\n"
+	"{\n"
+	"	float4 	a=make_float4(a1.xyz,0.f);\n"
+	"	float4 	b=make_float4(b1.xyz,0.f);\n"
+	"	//float4 	a=a1;\n"
+	"	//float4 	b=b1;\n"
+	"	return cross(a,b);\n"
+	"}\n"
+	"__inline\n"
+	"float dot3F4(float4 a, float4 b)\n"
+	"{\n"
+	"	float4 a1 = make_float4(a.xyz,0.f);\n"
+	"	float4 b1 = make_float4(b.xyz,0.f);\n"
+	"	return dot(a1, b1);\n"
+	"}\n"
+	"__inline\n"
+	"float length3(const float4 a)\n"
+	"{\n"
+	"	return sqrtf(dot3F4(a,a));\n"
+	"}\n"
+	"__inline\n"
+	"float dot4(const float4 a, const float4 b)\n"
+	"{\n"
+	"	return dot( a, b );\n"
+	"}\n"
+	"//	for height\n"
+	"__inline\n"
+	"float dot3w1(const float4 point, const float4 eqn)\n"
+	"{\n"
+	"	return dot3F4(point,eqn) + eqn.w;\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize3(const float4 a)\n"
+	"{\n"
+	"	float4 n = make_float4(a.x, a.y, a.z, 0.f);\n"
+	"	return fastNormalize4( n );\n"
+	"//	float length = sqrtf(dot3F4(a, a));\n"
+	"//	return 1.f/length * a;\n"
+	"}\n"
+	"__inline\n"
+	"float4 normalize4(const float4 a)\n"
+	"{\n"
+	"	float length = sqrtf(dot4(a, a));\n"
+	"	return 1.f/length * a;\n"
+	"}\n"
+	"__inline\n"
+	"float4 createEquation(const float4 a, const float4 b, const float4 c)\n"
+	"{\n"
+	"	float4 eqn;\n"
+	"	float4 ab = b-a;\n"
+	"	float4 ac = c-a;\n"
+	"	eqn = normalize3( cross3(ab, ac) );\n"
+	"	eqn.w = -dot3F4(eqn,a);\n"
+	"	return eqn;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Matrix3x3\n"
+	"///////////////////////////////////////\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_row[3];\n"
+	"}Matrix3x3;\n"
+	"__inline\n"
+	"Matrix3x3 mtZero();\n"
+	"__inline\n"
+	"Matrix3x3 mtIdentity();\n"
+	"__inline\n"
+	"Matrix3x3 mtTranspose(Matrix3x3 m);\n"
+	"__inline\n"
+	"Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b);\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b);\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b);\n"
+	"__inline\n"
+	"Matrix3x3 mtZero()\n"
+	"{\n"
+	"	Matrix3x3 m;\n"
+	"	m.m_row[0] = (float4)(0.f);\n"
+	"	m.m_row[1] = (float4)(0.f);\n"
+	"	m.m_row[2] = (float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"Matrix3x3 mtIdentity()\n"
+	"{\n"
+	"	Matrix3x3 m;\n"
+	"	m.m_row[0] = (float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"Matrix3x3 mtTranspose(Matrix3x3 m)\n"
+	"{\n"
+	"	Matrix3x3 out;\n"
+	"	out.m_row[0] = (float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Matrix3x3 mtMul(Matrix3x3 a, Matrix3x3 b)\n"
+	"{\n"
+	"	Matrix3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	Matrix3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"float4 mtMul1(Matrix3x3 a, float4 b)\n"
+	"{\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a.m_row[0], b );\n"
+	"	ans.y = dot3F4( a.m_row[1], b );\n"
+	"	ans.z = dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"float4 mtMul3(float4 a, Matrix3x3 b)\n"
+	"{\n"
+	"	float4 colx = make_float4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	float4 coly = make_float4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	float4 colz = make_float4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	float4 ans;\n"
+	"	ans.x = dot3F4( a, colx );\n"
+	"	ans.y = dot3F4( a, coly );\n"
+	"	ans.z = dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"///////////////////////////////////////\n"
+	"//	Quaternion\n"
+	"///////////////////////////////////////\n"
+	"typedef float4 Quaternion;\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b);\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in);\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec);\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q);\n"
+	"__inline\n"
+	"Quaternion qtMul(Quaternion a, Quaternion b)\n"
+	"{\n"
+	"	Quaternion ans;\n"
+	"	ans = cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtNormalize(Quaternion in)\n"
+	"{\n"
+	"	return fastNormalize4(in);\n"
+	"//	in /= length( in );\n"
+	"//	return in;\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtRotate(Quaternion q, float4 vec)\n"
+	"{\n"
+	"	Quaternion qInv = qtInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = qtMul(qtMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"Quaternion qtInvert(Quaternion q)\n"
+	"{\n"
+	"	return (Quaternion)(-q.xyz, q.w);\n"
+	"}\n"
+	"__inline\n"
+	"float4 qtInvRotate(const Quaternion q, float4 vec)\n"
+	"{\n"
+	"	return qtRotate( qtInvert( q ), vec );\n"
+	"}\n"
+	"#define WG_SIZE 64\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_pos;\n"
+	"	Quaternion m_quat;\n"
+	"	float4 m_linVel;\n"
+	"	float4 m_angVel;\n"
+	"	u32 m_shapeIdx;\n"
+	"	float m_invMass;\n"
+	"	float m_restituitionCoeff;\n"
+	"	float m_frictionCoeff;\n"
+	"} Body;\n"
+	"typedef struct\n"
+	"{\n"
+	"	Matrix3x3 m_invInertia;\n"
+	"	Matrix3x3 m_initInvInertia;\n"
+	"} Shape;\n"
+	"typedef struct\n"
+	"{\n"
+	"	float4 m_linear;\n"
+	"	float4 m_worldPos[4];\n"
+	"	float4 m_center;	\n"
+	"	float m_jacCoeffInv[4];\n"
+	"	float m_b[4];\n"
+	"	float m_appliedRambdaDt[4];\n"
+	"	float m_fJacCoeffInv[2];	\n"
+	"	float m_fAppliedRambdaDt[2];	\n"
+	"	u32 m_bodyA;\n"
+	"	u32 m_bodyB;\n"
+	"	int m_batchIdx;\n"
+	"	u32 m_paddings;\n"
+	"} Constraint4;\n"
+	"__kernel void CountBodiesKernel(__global struct b3Contact4Data* manifoldPtr, __global unsigned int* bodyCount, __global int2* contactConstraintOffsets, int numContactManifolds, int fixedBodyIndex)\n"
+	"{\n"
+	"	int i = GET_GLOBAL_IDX;\n"
+	"	\n"
+	"	if( i < numContactManifolds)\n"
+	"	{\n"
+	"		int pa = manifoldPtr[i].m_bodyAPtrAndSignBit;\n"
+	"		bool isFixedA = (pa <0) || (pa == fixedBodyIndex);\n"
+	"		int bodyIndexA = abs(pa);\n"
+	"		if (!isFixedA)\n"
+	"		{\n"
+	"			 AtomInc1(bodyCount[bodyIndexA],contactConstraintOffsets[i].x);\n"
+	"		}\n"
+	"		barrier(CLK_GLOBAL_MEM_FENCE);\n"
+	"		int pb = manifoldPtr[i].m_bodyBPtrAndSignBit;\n"
+	"		bool isFixedB = (pb <0) || (pb == fixedBodyIndex);\n"
+	"		int bodyIndexB = abs(pb);\n"
+	"		if (!isFixedB)\n"
+	"		{\n"
+	"			AtomInc1(bodyCount[bodyIndexB],contactConstraintOffsets[i].y);\n"
+	"		} \n"
+	"	}\n"
+	"}\n"
+	"__kernel void ClearVelocitiesKernel(__global float4* linearVelocities,__global float4* angularVelocities, int numSplitBodies)\n"
+	"{\n"
+	"	int i = GET_GLOBAL_IDX;\n"
+	"	\n"
+	"	if( i < numSplitBodies)\n"
+	"	{\n"
+	"		linearVelocities[i] = make_float4(0);\n"
+	"		angularVelocities[i] = make_float4(0);\n"
+	"	}\n"
+	"}\n"
+	"__kernel void AverageVelocitiesKernel(__global Body* gBodies,__global int* offsetSplitBodies,__global const unsigned int* bodyCount,\n"
+	"__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities, int numBodies)\n"
+	"{\n"
+	"	int i = GET_GLOBAL_IDX;\n"
+	"	if (i<numBodies)\n"
+	"	{\n"
+	"		if (gBodies[i].m_invMass)\n"
+	"		{\n"
+	"			int bodyOffset = offsetSplitBodies[i];\n"
+	"			int count = bodyCount[i];\n"
+	"			float factor = 1.f/((float)count);\n"
+	"			float4 averageLinVel = make_float4(0.f);\n"
+	"			float4 averageAngVel = make_float4(0.f);\n"
+	"			\n"
+	"			for (int j=0;j<count;j++)\n"
+	"			{\n"
+	"				averageLinVel += deltaLinearVelocities[bodyOffset+j]*factor;\n"
+	"				averageAngVel += deltaAngularVelocities[bodyOffset+j]*factor;\n"
+	"			}\n"
+	"			\n"
+	"			for (int j=0;j<count;j++)\n"
+	"			{\n"
+	"				deltaLinearVelocities[bodyOffset+j] = averageLinVel;\n"
+	"				deltaAngularVelocities[bodyOffset+j] = averageAngVel;\n"
+	"			}\n"
+	"			\n"
+	"		}//bodies[i].m_invMass\n"
+	"	}//i<numBodies\n"
+	"}\n"
+	"void setLinearAndAngular( float4 n, float4 r0, float4 r1, float4* linear, float4* angular0, float4* angular1)\n"
+	"{\n"
+	"	*linear = make_float4(n.xyz,0.f);\n"
+	"	*angular0 = cross3(r0, n);\n"
+	"	*angular1 = -cross3(r1, n);\n"
+	"}\n"
+	"float calcRelVel( float4 l0, float4 l1, float4 a0, float4 a1, float4 linVel0, float4 angVel0, float4 linVel1, float4 angVel1 )\n"
+	"{\n"
+	"	return dot3F4(l0, linVel0) + dot3F4(a0, angVel0) + dot3F4(l1, linVel1) + dot3F4(a1, angVel1);\n"
+	"}\n"
+	"float calcJacCoeff(const float4 linear0, const float4 linear1, const float4 angular0, const float4 angular1,\n"
+	"					float invMass0, const Matrix3x3* invInertia0, float invMass1, const Matrix3x3* invInertia1, float countA, float countB)\n"
+	"{\n"
+	"	//	linear0,1 are normlized\n"
+	"	float jmj0 = invMass0;//dot3F4(linear0, linear0)*invMass0;\n"
+	"	float jmj1 = dot3F4(mtMul3(angular0,*invInertia0), angular0);\n"
+	"	float jmj2 = invMass1;//dot3F4(linear1, linear1)*invMass1;\n"
+	"	float jmj3 = dot3F4(mtMul3(angular1,*invInertia1), angular1);\n"
+	"	return -1.f/((jmj0+jmj1)*countA+(jmj2+jmj3)*countB);\n"
+	"}\n"
+	"void btPlaneSpace1 (float4 n, float4* p, float4* q);\n"
+	" void btPlaneSpace1 (float4 n, float4* p, float4* q)\n"
+	"{\n"
+	"  if (fabs(n.z) > 0.70710678f) {\n"
+	"    // choose p in y-z plane\n"
+	"    float a = n.y*n.y + n.z*n.z;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = 0;\n"
+	"	p[0].y = -n.z*k;\n"
+	"	p[0].z = n.y*k;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = a*k;\n"
+	"	q[0].y = -n.x*p[0].z;\n"
+	"	q[0].z = n.x*p[0].y;\n"
+	"  }\n"
+	"  else {\n"
+	"    // choose p in x-y plane\n"
+	"    float a = n.x*n.x + n.y*n.y;\n"
+	"    float k = 1.f/sqrt(a);\n"
+	"    p[0].x = -n.y*k;\n"
+	"	p[0].y = n.x*k;\n"
+	"	p[0].z = 0;\n"
+	"    // set q = n x p\n"
+	"    q[0].x = -n.z*p[0].y;\n"
+	"	q[0].y = n.z*p[0].x;\n"
+	"	q[0].z = a*k;\n"
+	"  }\n"
+	"}\n"
+	"void solveContact(__global Constraint4* cs,\n"
+	"			float4 posA, float4* linVelA, float4* angVelA, float invMassA, Matrix3x3 invInertiaA,\n"
+	"			float4 posB, float4* linVelB, float4* angVelB, float invMassB, Matrix3x3 invInertiaB,\n"
+	"			float4* dLinVelA, float4* dAngVelA, float4* dLinVelB, float4* dAngVelB)\n"
+	"{\n"
+	"	float minRambdaDt = 0;\n"
+	"	float maxRambdaDt = FLT_MAX;\n"
+	"	for(int ic=0; ic<4; ic++)\n"
+	"	{\n"
+	"		if( cs->m_jacCoeffInv[ic] == 0.f ) continue;\n"
+	"		float4 angular0, angular1, linear;\n"
+	"		float4 r0 = cs->m_worldPos[ic] - posA;\n"
+	"		float4 r1 = cs->m_worldPos[ic] - posB;\n"
+	"		setLinearAndAngular( cs->m_linear, r0, r1, &linear, &angular0, &angular1 );\n"
+	"	\n"
+	"		float rambdaDt = calcRelVel( cs->m_linear, -cs->m_linear, angular0, angular1, \n"
+	"			*linVelA+*dLinVelA, *angVelA+*dAngVelA, *linVelB+*dLinVelB, *angVelB+*dAngVelB ) + cs->m_b[ic];\n"
+	"		rambdaDt *= cs->m_jacCoeffInv[ic];\n"
+	"		\n"
+	"		{\n"
+	"			float prevSum = cs->m_appliedRambdaDt[ic];\n"
+	"			float updated = prevSum;\n"
+	"			updated += rambdaDt;\n"
+	"			updated = max2( updated, minRambdaDt );\n"
+	"			updated = min2( updated, maxRambdaDt );\n"
+	"			rambdaDt = updated - prevSum;\n"
+	"			cs->m_appliedRambdaDt[ic] = updated;\n"
+	"		}\n"
+	"			\n"
+	"		float4 linImp0 = invMassA*linear*rambdaDt;\n"
+	"		float4 linImp1 = invMassB*(-linear)*rambdaDt;\n"
+	"		float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;\n"
+	"		float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;\n"
+	"		\n"
+	"		if (invMassA)\n"
+	"		{\n"
+	"			*dLinVelA += linImp0;\n"
+	"			*dAngVelA += angImp0;\n"
+	"		}\n"
+	"		if (invMassB)\n"
+	"		{\n"
+	"			*dLinVelB += linImp1;\n"
+	"			*dAngVelB += angImp1;\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"//	solveContactConstraint( gBodies, gShapes, &gConstraints[i] ,contactConstraintOffsets,offsetSplitBodies, deltaLinearVelocities, deltaAngularVelocities);\n"
+	"void solveContactConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs, \n"
+	"__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,\n"
+	"__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities)\n"
+	"{\n"
+	"	//float frictionCoeff = ldsCs[0].m_linear.w;\n"
+	"	int aIdx = ldsCs[0].m_bodyA;\n"
+	"	int bIdx = ldsCs[0].m_bodyB;\n"
+	"	float4 posA = gBodies[aIdx].m_pos;\n"
+	"	float4 linVelA = gBodies[aIdx].m_linVel;\n"
+	"	float4 angVelA = gBodies[aIdx].m_angVel;\n"
+	"	float invMassA = gBodies[aIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;\n"
+	"	float4 posB = gBodies[bIdx].m_pos;\n"
+	"	float4 linVelB = gBodies[bIdx].m_linVel;\n"
+	"	float4 angVelB = gBodies[bIdx].m_angVel;\n"
+	"	float invMassB = gBodies[bIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;\n"
+	"			\n"
+	"	float4 dLinVelA = make_float4(0,0,0,0);\n"
+	"	float4 dAngVelA = make_float4(0,0,0,0);\n"
+	"	float4 dLinVelB = make_float4(0,0,0,0);\n"
+	"	float4 dAngVelB = make_float4(0,0,0,0);\n"
+	"			\n"
+	"	int bodyOffsetA = offsetSplitBodies[aIdx];\n"
+	"	int constraintOffsetA = contactConstraintOffsets[0].x;\n"
+	"	int splitIndexA = bodyOffsetA+constraintOffsetA;\n"
+	"	\n"
+	"	if (invMassA)\n"
+	"	{\n"
+	"		dLinVelA = deltaLinearVelocities[splitIndexA];\n"
+	"		dAngVelA = deltaAngularVelocities[splitIndexA];\n"
+	"	}\n"
+	"	int bodyOffsetB = offsetSplitBodies[bIdx];\n"
+	"	int constraintOffsetB = contactConstraintOffsets[0].y;\n"
+	"	int splitIndexB= bodyOffsetB+constraintOffsetB;\n"
+	"	if (invMassB)\n"
+	"	{\n"
+	"		dLinVelB = deltaLinearVelocities[splitIndexB];\n"
+	"		dAngVelB = deltaAngularVelocities[splitIndexB];\n"
+	"	}\n"
+	"	solveContact( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,\n"
+	"			posB, &linVelB, &angVelB, invMassB, invInertiaB ,&dLinVelA, &dAngVelA, &dLinVelB, &dAngVelB);\n"
+	"	if (invMassA)\n"
+	"	{\n"
+	"		deltaLinearVelocities[splitIndexA] = dLinVelA;\n"
+	"		deltaAngularVelocities[splitIndexA] = dAngVelA;\n"
+	"	} \n"
+	"	if (invMassB)\n"
+	"	{\n"
+	"		deltaLinearVelocities[splitIndexB] = dLinVelB;\n"
+	"		deltaAngularVelocities[splitIndexB] = dAngVelB;\n"
+	"	}\n"
+	"}\n"
+	"__kernel void SolveContactJacobiKernel(__global Constraint4* gConstraints, __global Body* gBodies, __global Shape* gShapes ,\n"
+	"__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities,\n"
+	"float deltaTime, float positionDrift, float positionConstraintCoeff, int fixedBodyIndex, int numManifolds\n"
+	")\n"
+	"{\n"
+	"	int i = GET_GLOBAL_IDX;\n"
+	"	if (i<numManifolds)\n"
+	"	{\n"
+	"		solveContactConstraint( gBodies, gShapes, &gConstraints[i] ,&contactConstraintOffsets[i],offsetSplitBodies, deltaLinearVelocities, deltaAngularVelocities);\n"
+	"	}\n"
+	"}\n"
+	"void solveFrictionConstraint(__global Body* gBodies, __global Shape* gShapes, __global Constraint4* ldsCs,\n"
+	"							__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,\n"
+	"							__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities)\n"
+	"{\n"
+	"	float frictionCoeff = 0.7f;//ldsCs[0].m_linear.w;\n"
+	"	int aIdx = ldsCs[0].m_bodyA;\n"
+	"	int bIdx = ldsCs[0].m_bodyB;\n"
+	"	float4 posA = gBodies[aIdx].m_pos;\n"
+	"	float4 linVelA = gBodies[aIdx].m_linVel;\n"
+	"	float4 angVelA = gBodies[aIdx].m_angVel;\n"
+	"	float invMassA = gBodies[aIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;\n"
+	"	float4 posB = gBodies[bIdx].m_pos;\n"
+	"	float4 linVelB = gBodies[bIdx].m_linVel;\n"
+	"	float4 angVelB = gBodies[bIdx].m_angVel;\n"
+	"	float invMassB = gBodies[bIdx].m_invMass;\n"
+	"	Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;\n"
+	"	\n"
+	"	float4 dLinVelA = make_float4(0,0,0,0);\n"
+	"	float4 dAngVelA = make_float4(0,0,0,0);\n"
+	"	float4 dLinVelB = make_float4(0,0,0,0);\n"
+	"	float4 dAngVelB = make_float4(0,0,0,0);\n"
+	"			\n"
+	"	int bodyOffsetA = offsetSplitBodies[aIdx];\n"
+	"	int constraintOffsetA = contactConstraintOffsets[0].x;\n"
+	"	int splitIndexA = bodyOffsetA+constraintOffsetA;\n"
+	"	\n"
+	"	if (invMassA)\n"
+	"	{\n"
+	"		dLinVelA = deltaLinearVelocities[splitIndexA];\n"
+	"		dAngVelA = deltaAngularVelocities[splitIndexA];\n"
+	"	}\n"
+	"	int bodyOffsetB = offsetSplitBodies[bIdx];\n"
+	"	int constraintOffsetB = contactConstraintOffsets[0].y;\n"
+	"	int splitIndexB= bodyOffsetB+constraintOffsetB;\n"
+	"	if (invMassB)\n"
+	"	{\n"
+	"		dLinVelB = deltaLinearVelocities[splitIndexB];\n"
+	"		dAngVelB = deltaAngularVelocities[splitIndexB];\n"
+	"	}\n"
+	"	{\n"
+	"		float maxRambdaDt[4] = {FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX};\n"
+	"		float minRambdaDt[4] = {0.f,0.f,0.f,0.f};\n"
+	"		float sum = 0;\n"
+	"		for(int j=0; j<4; j++)\n"
+	"		{\n"
+	"			sum +=ldsCs[0].m_appliedRambdaDt[j];\n"
+	"		}\n"
+	"		frictionCoeff = 0.7f;\n"
+	"		for(int j=0; j<4; j++)\n"
+	"		{\n"
+	"			maxRambdaDt[j] = frictionCoeff*sum;\n"
+	"			minRambdaDt[j] = -maxRambdaDt[j];\n"
+	"		}\n"
+	"		\n"
+	"//		solveFriction( ldsCs, posA, &linVelA, &angVelA, invMassA, invInertiaA,\n"
+	"//			posB, &linVelB, &angVelB, invMassB, invInertiaB, maxRambdaDt, minRambdaDt );\n"
+	"		\n"
+	"		\n"
+	"		{\n"
+	"			\n"
+	"			__global Constraint4* cs = ldsCs;\n"
+	"			\n"
+	"			if( cs->m_fJacCoeffInv[0] == 0 && cs->m_fJacCoeffInv[0] == 0 ) return;\n"
+	"			const float4 center = cs->m_center;\n"
+	"			\n"
+	"			float4 n = -cs->m_linear;\n"
+	"			\n"
+	"			float4 tangent[2];\n"
+	"			btPlaneSpace1(n,&tangent[0],&tangent[1]);\n"
+	"			float4 angular0, angular1, linear;\n"
+	"			float4 r0 = center - posA;\n"
+	"			float4 r1 = center - posB;\n"
+	"			for(int i=0; i<2; i++)\n"
+	"			{\n"
+	"				setLinearAndAngular( tangent[i], r0, r1, &linear, &angular0, &angular1 );\n"
+	"				float rambdaDt = calcRelVel(linear, -linear, angular0, angular1,\n"
+	"											linVelA+dLinVelA, angVelA+dAngVelA, linVelB+dLinVelB, angVelB+dAngVelB );\n"
+	"				rambdaDt *= cs->m_fJacCoeffInv[i];\n"
+	"				\n"
+	"				{\n"
+	"					float prevSum = cs->m_fAppliedRambdaDt[i];\n"
+	"					float updated = prevSum;\n"
+	"					updated += rambdaDt;\n"
+	"					updated = max2( updated, minRambdaDt[i] );\n"
+	"					updated = min2( updated, maxRambdaDt[i] );\n"
+	"					rambdaDt = updated - prevSum;\n"
+	"					cs->m_fAppliedRambdaDt[i] = updated;\n"
+	"				}\n"
+	"				\n"
+	"				float4 linImp0 = invMassA*linear*rambdaDt;\n"
+	"				float4 linImp1 = invMassB*(-linear)*rambdaDt;\n"
+	"				float4 angImp0 = mtMul1(invInertiaA, angular0)*rambdaDt;\n"
+	"				float4 angImp1 = mtMul1(invInertiaB, angular1)*rambdaDt;\n"
+	"				\n"
+	"				dLinVelA += linImp0;\n"
+	"				dAngVelA += angImp0;\n"
+	"				dLinVelB += linImp1;\n"
+	"				dAngVelB += angImp1;\n"
+	"			}\n"
+	"			{	//	angular damping for point constraint\n"
+	"				float4 ab = normalize3( posB - posA );\n"
+	"				float4 ac = normalize3( center - posA );\n"
+	"				if( dot3F4( ab, ac ) > 0.95f  || (invMassA == 0.f || invMassB == 0.f))\n"
+	"				{\n"
+	"					float angNA = dot3F4( n, angVelA );\n"
+	"					float angNB = dot3F4( n, angVelB );\n"
+	"					\n"
+	"					dAngVelA -= (angNA*0.1f)*n;\n"
+	"					dAngVelB -= (angNB*0.1f)*n;\n"
+	"				}\n"
+	"			}\n"
+	"		}\n"
+	"		\n"
+	"		\n"
+	"	}\n"
+	"	if (invMassA)\n"
+	"	{\n"
+	"		deltaLinearVelocities[splitIndexA] = dLinVelA;\n"
+	"		deltaAngularVelocities[splitIndexA] = dAngVelA;\n"
+	"	} \n"
+	"	if (invMassB)\n"
+	"	{\n"
+	"		deltaLinearVelocities[splitIndexB] = dLinVelB;\n"
+	"		deltaAngularVelocities[splitIndexB] = dAngVelB;\n"
+	"	}\n"
+	" \n"
+	"}\n"
+	"__kernel void SolveFrictionJacobiKernel(__global Constraint4* gConstraints, __global Body* gBodies, __global Shape* gShapes ,\n"
+	"										__global int2* contactConstraintOffsets,__global unsigned int* offsetSplitBodies,\n"
+	"										__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities,\n"
+	"										float deltaTime, float positionDrift, float positionConstraintCoeff, int fixedBodyIndex, int numManifolds\n"
+	")\n"
+	"{\n"
+	"	int i = GET_GLOBAL_IDX;\n"
+	"	if (i<numManifolds)\n"
+	"	{\n"
+	"		solveFrictionConstraint( gBodies, gShapes, &gConstraints[i] ,&contactConstraintOffsets[i],offsetSplitBodies, deltaLinearVelocities, deltaAngularVelocities);\n"
+	"	}\n"
+	"}\n"
+	"__kernel void UpdateBodyVelocitiesKernel(__global Body* gBodies,__global int* offsetSplitBodies,__global const unsigned int* bodyCount,\n"
+	"									__global float4* deltaLinearVelocities, __global float4* deltaAngularVelocities, int numBodies)\n"
+	"{\n"
+	"	int i = GET_GLOBAL_IDX;\n"
+	"	if (i<numBodies)\n"
+	"	{\n"
+	"		if (gBodies[i].m_invMass)\n"
+	"		{\n"
+	"			int bodyOffset = offsetSplitBodies[i];\n"
+	"			int count = bodyCount[i];\n"
+	"			if (count)\n"
+	"			{\n"
+	"				gBodies[i].m_linVel += deltaLinearVelocities[bodyOffset];\n"
+	"				gBodies[i].m_angVel += deltaAngularVelocities[bodyOffset];\n"
+	"			}\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"void setConstraint4( const float4 posA, const float4 linVelA, const float4 angVelA, float invMassA, const Matrix3x3 invInertiaA,\n"
+	"	const float4 posB, const float4 linVelB, const float4 angVelB, float invMassB, const Matrix3x3 invInertiaB, \n"
+	"	__global struct b3Contact4Data* src, float dt, float positionDrift, float positionConstraintCoeff,float countA, float countB,\n"
+	"	Constraint4* dstC )\n"
+	"{\n"
+	"	dstC->m_bodyA = abs(src->m_bodyAPtrAndSignBit);\n"
+	"	dstC->m_bodyB = abs(src->m_bodyBPtrAndSignBit);\n"
+	"	float dtInv = 1.f/dt;\n"
+	"	for(int ic=0; ic<4; ic++)\n"
+	"	{\n"
+	"		dstC->m_appliedRambdaDt[ic] = 0.f;\n"
+	"	}\n"
+	"	dstC->m_fJacCoeffInv[0] = dstC->m_fJacCoeffInv[1] = 0.f;\n"
+	"	dstC->m_linear = src->m_worldNormalOnB;\n"
+	"	dstC->m_linear.w = 0.7f ;//src->getFrictionCoeff() );\n"
+	"	for(int ic=0; ic<4; ic++)\n"
+	"	{\n"
+	"		float4 r0 = src->m_worldPosB[ic] - posA;\n"
+	"		float4 r1 = src->m_worldPosB[ic] - posB;\n"
+	"		if( ic >= src->m_worldNormalOnB.w )//npoints\n"
+	"		{\n"
+	"			dstC->m_jacCoeffInv[ic] = 0.f;\n"
+	"			continue;\n"
+	"		}\n"
+	"		float relVelN;\n"
+	"		{\n"
+	"			float4 linear, angular0, angular1;\n"
+	"			setLinearAndAngular(src->m_worldNormalOnB, r0, r1, &linear, &angular0, &angular1);\n"
+	"			dstC->m_jacCoeffInv[ic] = calcJacCoeff(linear, -linear, angular0, angular1,\n"
+	"				invMassA, &invInertiaA, invMassB, &invInertiaB , countA, countB);\n"
+	"			relVelN = calcRelVel(linear, -linear, angular0, angular1,\n"
+	"				linVelA, angVelA, linVelB, angVelB);\n"
+	"			float e = 0.f;//src->getRestituitionCoeff();\n"
+	"			if( relVelN*relVelN < 0.004f ) e = 0.f;\n"
+	"			dstC->m_b[ic] = e*relVelN;\n"
+	"			//float penetration = src->m_worldPosB[ic].w;\n"
+	"			dstC->m_b[ic] += (src->m_worldPosB[ic].w + positionDrift)*positionConstraintCoeff*dtInv;\n"
+	"			dstC->m_appliedRambdaDt[ic] = 0.f;\n"
+	"		}\n"
+	"	}\n"
+	"	if( src->m_worldNormalOnB.w > 0 )//npoints\n"
+	"	{	//	prepare friction\n"
+	"		float4 center = make_float4(0.f);\n"
+	"		for(int i=0; i<src->m_worldNormalOnB.w; i++) \n"
+	"			center += src->m_worldPosB[i];\n"
+	"		center /= (float)src->m_worldNormalOnB.w;\n"
+	"		float4 tangent[2];\n"
+	"		btPlaneSpace1(-src->m_worldNormalOnB,&tangent[0],&tangent[1]);\n"
+	"		\n"
+	"		float4 r[2];\n"
+	"		r[0] = center - posA;\n"
+	"		r[1] = center - posB;\n"
+	"		for(int i=0; i<2; i++)\n"
+	"		{\n"
+	"			float4 linear, angular0, angular1;\n"
+	"			setLinearAndAngular(tangent[i], r[0], r[1], &linear, &angular0, &angular1);\n"
+	"			dstC->m_fJacCoeffInv[i] = calcJacCoeff(linear, -linear, angular0, angular1,\n"
+	"				invMassA, &invInertiaA, invMassB, &invInertiaB ,countA, countB);\n"
+	"			dstC->m_fAppliedRambdaDt[i] = 0.f;\n"
+	"		}\n"
+	"		dstC->m_center = center;\n"
+	"	}\n"
+	"	for(int i=0; i<4; i++)\n"
+	"	{\n"
+	"		if( i<src->m_worldNormalOnB.w )\n"
+	"		{\n"
+	"			dstC->m_worldPos[i] = src->m_worldPosB[i];\n"
+	"		}\n"
+	"		else\n"
+	"		{\n"
+	"			dstC->m_worldPos[i] = make_float4(0.f);\n"
+	"		}\n"
+	"	}\n"
+	"}\n"
+	"__kernel\n"
+	"__attribute__((reqd_work_group_size(WG_SIZE,1,1)))\n"
+	"void ContactToConstraintSplitKernel(__global const struct b3Contact4Data* gContact, __global const Body* gBodies, __global const Shape* gShapes, __global Constraint4* gConstraintOut, \n"
+	"__global const unsigned int* bodyCount,\n"
+	"int nContacts,\n"
+	"float dt,\n"
+	"float positionDrift,\n"
+	"float positionConstraintCoeff\n"
+	")\n"
+	"{\n"
+	"	int gIdx = GET_GLOBAL_IDX;\n"
+	"	\n"
+	"	if( gIdx < nContacts )\n"
+	"	{\n"
+	"		int aIdx = abs(gContact[gIdx].m_bodyAPtrAndSignBit);\n"
+	"		int bIdx = abs(gContact[gIdx].m_bodyBPtrAndSignBit);\n"
+	"		float4 posA = gBodies[aIdx].m_pos;\n"
+	"		float4 linVelA = gBodies[aIdx].m_linVel;\n"
+	"		float4 angVelA = gBodies[aIdx].m_angVel;\n"
+	"		float invMassA = gBodies[aIdx].m_invMass;\n"
+	"		Matrix3x3 invInertiaA = gShapes[aIdx].m_invInertia;\n"
+	"		float4 posB = gBodies[bIdx].m_pos;\n"
+	"		float4 linVelB = gBodies[bIdx].m_linVel;\n"
+	"		float4 angVelB = gBodies[bIdx].m_angVel;\n"
+	"		float invMassB = gBodies[bIdx].m_invMass;\n"
+	"		Matrix3x3 invInertiaB = gShapes[bIdx].m_invInertia;\n"
+	"		Constraint4 cs;\n"
+	"		float countA = invMassA != 0.f ? (float)bodyCount[aIdx] : 1;\n"
+	"		float countB = invMassB != 0.f ? (float)bodyCount[bIdx] : 1;\n"
+	"    	setConstraint4( posA, linVelA, angVelA, invMassA, invInertiaA, posB, linVelB, angVelB, invMassB, invInertiaB,\n"
+	"			&gContact[gIdx], dt, positionDrift, positionConstraintCoeff,countA,countB,\n"
+	"			&cs  );\n"
+	"		\n"
+	"		cs.m_batchIdx = gContact[gIdx].m_batchIdx;\n"
+	"		gConstraintOut[gIdx] = cs;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl
new file mode 100644
index 0000000..ba8ba73
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl
@@ -0,0 +1,22 @@
+
+
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3UpdateAabbs.h"
+
+
+__kernel void initializeGpuAabbsFull(  const int numNodes, __global b3RigidBodyData_t* gBodies,__global b3Collidable_t* collidables, __global b3Aabb_t* plocalShapeAABB, __global b3Aabb_t* pAABB)
+{
+	int nodeID = get_global_id(0);
+	if( nodeID < numNodes )
+	{
+		b3ComputeWorldAabb(nodeID, gBodies, collidables, plocalShapeAABB,pAABB);
+	}
+}
+
+__kernel void clearOverlappingPairsKernel(  __global int4* pairs, int numPairs)
+{
+	int pairId = get_global_id(0);
+	if( pairId< numPairs )
+	{
+		pairs[pairId].z = 0xffffffff;
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.h b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.h
new file mode 100644
index 0000000..bb949b2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.h
@@ -0,0 +1,482 @@
+//this file is autogenerated using stringify.bat (premake --stringify) in the build folder of this project
+static const char* updateAabbsKernelCL =
+	"#ifndef B3_UPDATE_AABBS_H\n"
+	"#define B3_UPDATE_AABBS_H\n"
+	"#ifndef B3_AABB_H\n"
+	"#define B3_AABB_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#define B3_FLOAT4_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#define B3_PLATFORM_DEFINITIONS_H\n"
+	"struct MyTest\n"
+	"{\n"
+	"	int bla;\n"
+	"};\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"//keep B3_LARGE_FLOAT*B3_LARGE_FLOAT < FLT_MAX\n"
+	"#define B3_LARGE_FLOAT 1e18f\n"
+	"#define B3_INFINITY 1e18f\n"
+	"#define b3Assert(a)\n"
+	"#define b3ConstArray(a) __global const a*\n"
+	"#define b3AtomicInc atomic_inc\n"
+	"#define b3AtomicAdd atomic_add\n"
+	"#define b3Fabs fabs\n"
+	"#define b3Sqrt native_sqrt\n"
+	"#define b3Sin native_sin\n"
+	"#define b3Cos native_cos\n"
+	"#define B3_STATIC\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Float4;\n"
+	"	#define b3Float4ConstArg const b3Float4\n"
+	"	#define b3MakeFloat4 (float4)\n"
+	"	float b3Dot3F4(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return dot(a1, b1);\n"
+	"	}\n"
+	"	b3Float4 b3Cross3(b3Float4ConstArg v0,b3Float4ConstArg v1)\n"
+	"	{\n"
+	"		float4 a1 = b3MakeFloat4(v0.xyz,0.f);\n"
+	"		float4 b1 = b3MakeFloat4(v1.xyz,0.f);\n"
+	"		return cross(a1, b1);\n"
+	"	}\n"
+	"	#define b3MinFloat4 min\n"
+	"	#define b3MaxFloat4 max\n"
+	"	#define b3Normalized(a) normalize(a)\n"
+	"#endif \n"
+	"		\n"
+	"inline bool b3IsAlmostZero(b3Float4ConstArg v)\n"
+	"{\n"
+	"	if(b3Fabs(v.x)>1e-6 || b3Fabs(v.y)>1e-6 || b3Fabs(v.z)>1e-6)	\n"
+	"		return false;\n"
+	"	return true;\n"
+	"}\n"
+	"inline int    b3MaxDot( b3Float4ConstArg vec, __global const b3Float4* vecArray, int vecLen, float* dotOut )\n"
+	"{\n"
+	"    float maxDot = -B3_INFINITY;\n"
+	"    int i = 0;\n"
+	"    int ptIndex = -1;\n"
+	"    for( i = 0; i < vecLen; i++ )\n"
+	"    {\n"
+	"        float dot = b3Dot3F4(vecArray[i],vec);\n"
+	"            \n"
+	"        if( dot > maxDot )\n"
+	"        {\n"
+	"            maxDot = dot;\n"
+	"            ptIndex = i;\n"
+	"        }\n"
+	"    }\n"
+	"	b3Assert(ptIndex>=0);\n"
+	"    if (ptIndex<0)\n"
+	"	{\n"
+	"		ptIndex = 0;\n"
+	"	}\n"
+	"    *dotOut = maxDot;\n"
+	"    return ptIndex;\n"
+	"}\n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#define B3_MAT3x3_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#define B3_QUAT_H\n"
+	"#ifndef B3_PLATFORM_DEFINITIONS_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"	typedef float4	b3Quat;\n"
+	"	#define b3QuatConstArg const b3Quat\n"
+	"	\n"
+	"	\n"
+	"inline float4 b3FastNormalize4(float4 v)\n"
+	"{\n"
+	"	v = (float4)(v.xyz,0.f);\n"
+	"	return fast_normalize(v);\n"
+	"}\n"
+	"	\n"
+	"inline b3Quat b3QuatMul(b3Quat a, b3Quat b);\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in);\n"
+	"inline b3Quat b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec);\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q);\n"
+	"inline b3Quat b3QuatMul(b3QuatConstArg a, b3QuatConstArg b)\n"
+	"{\n"
+	"	b3Quat ans;\n"
+	"	ans = b3Cross3( a, b );\n"
+	"	ans += a.w*b+b.w*a;\n"
+	"//	ans.w = a.w*b.w - (a.x*b.x+a.y*b.y+a.z*b.z);\n"
+	"	ans.w = a.w*b.w - b3Dot3F4(a, b);\n"
+	"	return ans;\n"
+	"}\n"
+	"inline b3Quat b3QuatNormalized(b3QuatConstArg in)\n"
+	"{\n"
+	"	b3Quat q;\n"
+	"	q=in;\n"
+	"	//return b3FastNormalize4(in);\n"
+	"	float len = native_sqrt(dot(q, q));\n"
+	"	if(len > 0.f)\n"
+	"	{\n"
+	"		q *= 1.f / len;\n"
+	"	}\n"
+	"	else\n"
+	"	{\n"
+	"		q.x = q.y = q.z = 0.f;\n"
+	"		q.w = 1.f;\n"
+	"	}\n"
+	"	return q;\n"
+	"}\n"
+	"inline float4 b3QuatRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	b3Quat qInv = b3QuatInvert( q );\n"
+	"	float4 vcpy = vec;\n"
+	"	vcpy.w = 0.f;\n"
+	"	float4 out = b3QuatMul(b3QuatMul(q,vcpy),qInv);\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Quat b3QuatInverse(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline b3Quat b3QuatInvert(b3QuatConstArg q)\n"
+	"{\n"
+	"	return (b3Quat)(-q.xyz, q.w);\n"
+	"}\n"
+	"inline float4 b3QuatInvRotate(b3QuatConstArg q, b3QuatConstArg vec)\n"
+	"{\n"
+	"	return b3QuatRotate( b3QuatInvert( q ), vec );\n"
+	"}\n"
+	"inline b3Float4 b3TransformPoint(b3Float4ConstArg point, b3Float4ConstArg translation, b3QuatConstArg  orientation)\n"
+	"{\n"
+	"	return b3QuatRotate( orientation, point ) + (translation);\n"
+	"}\n"
+	"	\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"typedef struct\n"
+	"{\n"
+	"	b3Float4 m_row[3];\n"
+	"}b3Mat3x3;\n"
+	"#define b3Mat3x3ConstArg const b3Mat3x3\n"
+	"#define b3GetRow(m,row) (m.m_row[row])\n"
+	"inline b3Mat3x3 b3QuatGetRotationMatrix(b3Quat quat)\n"
+	"{\n"
+	"	b3Float4 quat2 = (b3Float4)(quat.x*quat.x, quat.y*quat.y, quat.z*quat.z, 0.f);\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0].x=1-2*quat2.y-2*quat2.z;\n"
+	"	out.m_row[0].y=2*quat.x*quat.y-2*quat.w*quat.z;\n"
+	"	out.m_row[0].z=2*quat.x*quat.z+2*quat.w*quat.y;\n"
+	"	out.m_row[0].w = 0.f;\n"
+	"	out.m_row[1].x=2*quat.x*quat.y+2*quat.w*quat.z;\n"
+	"	out.m_row[1].y=1-2*quat2.x-2*quat2.z;\n"
+	"	out.m_row[1].z=2*quat.y*quat.z-2*quat.w*quat.x;\n"
+	"	out.m_row[1].w = 0.f;\n"
+	"	out.m_row[2].x=2*quat.x*quat.z-2*quat.w*quat.y;\n"
+	"	out.m_row[2].y=2*quat.y*quat.z+2*quat.w*quat.x;\n"
+	"	out.m_row[2].z=1-2*quat2.x-2*quat2.y;\n"
+	"	out.m_row[2].w = 0.f;\n"
+	"	return out;\n"
+	"}\n"
+	"inline b3Mat3x3 b3AbsoluteMat3x3(b3Mat3x3ConstArg matIn)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = fabs(matIn.m_row[0]);\n"
+	"	out.m_row[1] = fabs(matIn.m_row[1]);\n"
+	"	out.m_row[2] = fabs(matIn.m_row[2]);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero();\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity();\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m);\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b);\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b);\n"
+	"__inline\n"
+	"b3Mat3x3 mtZero()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(0.f);\n"
+	"	m.m_row[1] = (b3Float4)(0.f);\n"
+	"	m.m_row[2] = (b3Float4)(0.f);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtIdentity()\n"
+	"{\n"
+	"	b3Mat3x3 m;\n"
+	"	m.m_row[0] = (b3Float4)(1,0,0,0);\n"
+	"	m.m_row[1] = (b3Float4)(0,1,0,0);\n"
+	"	m.m_row[2] = (b3Float4)(0,0,1,0);\n"
+	"	return m;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtTranspose(b3Mat3x3 m)\n"
+	"{\n"
+	"	b3Mat3x3 out;\n"
+	"	out.m_row[0] = (b3Float4)(m.m_row[0].x, m.m_row[1].x, m.m_row[2].x, 0.f);\n"
+	"	out.m_row[1] = (b3Float4)(m.m_row[0].y, m.m_row[1].y, m.m_row[2].y, 0.f);\n"
+	"	out.m_row[2] = (b3Float4)(m.m_row[0].z, m.m_row[1].z, m.m_row[2].z, 0.f);\n"
+	"	return out;\n"
+	"}\n"
+	"__inline\n"
+	"b3Mat3x3 mtMul(b3Mat3x3 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Mat3x3 transB;\n"
+	"	transB = mtTranspose( b );\n"
+	"	b3Mat3x3 ans;\n"
+	"	//	why this doesn't run when 0ing in the for{}\n"
+	"	a.m_row[0].w = 0.f;\n"
+	"	a.m_row[1].w = 0.f;\n"
+	"	a.m_row[2].w = 0.f;\n"
+	"	for(int i=0; i<3; i++)\n"
+	"	{\n"
+	"//	a.m_row[i].w = 0.f;\n"
+	"		ans.m_row[i].x = b3Dot3F4(a.m_row[i],transB.m_row[0]);\n"
+	"		ans.m_row[i].y = b3Dot3F4(a.m_row[i],transB.m_row[1]);\n"
+	"		ans.m_row[i].z = b3Dot3F4(a.m_row[i],transB.m_row[2]);\n"
+	"		ans.m_row[i].w = 0.f;\n"
+	"	}\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul1(b3Mat3x3 a, b3Float4 b)\n"
+	"{\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a.m_row[0], b );\n"
+	"	ans.y = b3Dot3F4( a.m_row[1], b );\n"
+	"	ans.z = b3Dot3F4( a.m_row[2], b );\n"
+	"	ans.w = 0.f;\n"
+	"	return ans;\n"
+	"}\n"
+	"__inline\n"
+	"b3Float4 mtMul3(b3Float4 a, b3Mat3x3 b)\n"
+	"{\n"
+	"	b3Float4 colx = b3MakeFloat4(b.m_row[0].x, b.m_row[1].x, b.m_row[2].x, 0);\n"
+	"	b3Float4 coly = b3MakeFloat4(b.m_row[0].y, b.m_row[1].y, b.m_row[2].y, 0);\n"
+	"	b3Float4 colz = b3MakeFloat4(b.m_row[0].z, b.m_row[1].z, b.m_row[2].z, 0);\n"
+	"	b3Float4 ans;\n"
+	"	ans.x = b3Dot3F4( a, colx );\n"
+	"	ans.y = b3Dot3F4( a, coly );\n"
+	"	ans.z = b3Dot3F4( a, colz );\n"
+	"	return ans;\n"
+	"}\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3Aabb b3Aabb_t;\n"
+	"struct b3Aabb\n"
+	"{\n"
+	"	union\n"
+	"	{\n"
+	"		float m_min[4];\n"
+	"		b3Float4 m_minVec;\n"
+	"		int m_minIndices[4];\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float	m_max[4];\n"
+	"		b3Float4 m_maxVec;\n"
+	"		int m_signedMaxIndices[4];\n"
+	"	};\n"
+	"};\n"
+	"inline void b3TransformAabb2(b3Float4ConstArg localAabbMin,b3Float4ConstArg localAabbMax, float margin,\n"
+	"						b3Float4ConstArg pos,\n"
+	"						b3QuatConstArg orn,\n"
+	"						b3Float4* aabbMinOut,b3Float4* aabbMaxOut)\n"
+	"{\n"
+	"		b3Float4 localHalfExtents = 0.5f*(localAabbMax-localAabbMin);\n"
+	"		localHalfExtents+=b3MakeFloat4(margin,margin,margin,0.f);\n"
+	"		b3Float4 localCenter = 0.5f*(localAabbMax+localAabbMin);\n"
+	"		b3Mat3x3 m;\n"
+	"		m = b3QuatGetRotationMatrix(orn);\n"
+	"		b3Mat3x3 abs_b = b3AbsoluteMat3x3(m);\n"
+	"		b3Float4 center = b3TransformPoint(localCenter,pos,orn);\n"
+	"		\n"
+	"		b3Float4 extent = b3MakeFloat4(b3Dot3F4(localHalfExtents,b3GetRow(abs_b,0)),\n"
+	"										 b3Dot3F4(localHalfExtents,b3GetRow(abs_b,1)),\n"
+	"										 b3Dot3F4(localHalfExtents,b3GetRow(abs_b,2)),\n"
+	"										 0.f);\n"
+	"		*aabbMinOut = center-extent;\n"
+	"		*aabbMaxOut = center+extent;\n"
+	"}\n"
+	"/// conservative test for overlap between two aabbs\n"
+	"inline bool b3TestAabbAgainstAabb(b3Float4ConstArg aabbMin1,b3Float4ConstArg aabbMax1,\n"
+	"								b3Float4ConstArg aabbMin2, b3Float4ConstArg aabbMax2)\n"
+	"{\n"
+	"	bool overlap = true;\n"
+	"	overlap = (aabbMin1.x > aabbMax2.x || aabbMax1.x < aabbMin2.x) ? false : overlap;\n"
+	"	overlap = (aabbMin1.z > aabbMax2.z || aabbMax1.z < aabbMin2.z) ? false : overlap;\n"
+	"	overlap = (aabbMin1.y > aabbMax2.y || aabbMax1.y < aabbMin2.y) ? false : overlap;\n"
+	"	return overlap;\n"
+	"}\n"
+	"#endif //B3_AABB_H\n"
+	"#ifndef B3_COLLIDABLE_H\n"
+	"#define B3_COLLIDABLE_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"enum b3ShapeTypes\n"
+	"{\n"
+	"	SHAPE_HEIGHT_FIELD=1,\n"
+	"	SHAPE_CONVEX_HULL=3,\n"
+	"	SHAPE_PLANE=4,\n"
+	"	SHAPE_CONCAVE_TRIMESH=5,\n"
+	"	SHAPE_COMPOUND_OF_CONVEX_HULLS=6,\n"
+	"	SHAPE_SPHERE=7,\n"
+	"	MAX_NUM_SHAPE_TYPES,\n"
+	"};\n"
+	"typedef struct b3Collidable b3Collidable_t;\n"
+	"struct b3Collidable\n"
+	"{\n"
+	"	union {\n"
+	"		int m_numChildShapes;\n"
+	"		int m_bvhIndex;\n"
+	"	};\n"
+	"	union\n"
+	"	{\n"
+	"		float m_radius;\n"
+	"		int	m_compoundBvhIndex;\n"
+	"	};\n"
+	"	int m_shapeType;\n"
+	"	union\n"
+	"	{\n"
+	"		int m_shapeIndex;\n"
+	"		float m_height;\n"
+	"	};\n"
+	"};\n"
+	"typedef struct b3GpuChildShape b3GpuChildShape_t;\n"
+	"struct b3GpuChildShape\n"
+	"{\n"
+	"	b3Float4	m_childPosition;\n"
+	"	b3Quat		m_childOrientation;\n"
+	"	union\n"
+	"	{\n"
+	"		int			m_shapeIndex;//used for SHAPE_COMPOUND_OF_CONVEX_HULLS\n"
+	"		int			m_capsuleAxis;\n"
+	"	};\n"
+	"	union \n"
+	"	{\n"
+	"		float		m_radius;//used for childshape of SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES\n"
+	"		int			m_numChildShapes;//used for compound shape\n"
+	"	};\n"
+	"	union \n"
+	"	{\n"
+	"		float		m_height;//used for childshape of SHAPE_COMPOUND_OF_CAPSULES\n"
+	"		int	m_collidableShapeIndex;\n"
+	"	};\n"
+	"	int			m_shapeType;\n"
+	"};\n"
+	"struct b3CompoundOverlappingPair\n"
+	"{\n"
+	"	int m_bodyIndexA;\n"
+	"	int m_bodyIndexB;\n"
+	"//	int	m_pairType;\n"
+	"	int m_childShapeIndexA;\n"
+	"	int m_childShapeIndexB;\n"
+	"};\n"
+	"#endif //B3_COLLIDABLE_H\n"
+	"#ifndef B3_RIGIDBODY_DATA_H\n"
+	"#define B3_RIGIDBODY_DATA_H\n"
+	"#ifndef B3_FLOAT4_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_FLOAT4_H\n"
+	"#ifndef B3_QUAT_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif \n"
+	"#endif //B3_QUAT_H\n"
+	"#ifndef B3_MAT3x3_H\n"
+	"#ifdef __cplusplus\n"
+	"#else\n"
+	"#endif\n"
+	"#endif //B3_MAT3x3_H\n"
+	"typedef struct b3RigidBodyData b3RigidBodyData_t;\n"
+	"struct b3RigidBodyData\n"
+	"{\n"
+	"	b3Float4				m_pos;\n"
+	"	b3Quat					m_quat;\n"
+	"	b3Float4				m_linVel;\n"
+	"	b3Float4				m_angVel;\n"
+	"	int 					m_collidableIdx;\n"
+	"	float 				m_invMass;\n"
+	"	float 				m_restituitionCoeff;\n"
+	"	float 				m_frictionCoeff;\n"
+	"};\n"
+	"typedef struct b3InertiaData b3InertiaData_t;\n"
+	"struct b3InertiaData\n"
+	"{\n"
+	"	b3Mat3x3 m_invInertiaWorld;\n"
+	"	b3Mat3x3 m_initInvInertia;\n"
+	"};\n"
+	"#endif //B3_RIGIDBODY_DATA_H\n"
+	"	\n"
+	"void b3ComputeWorldAabb(  int bodyId, __global const b3RigidBodyData_t* bodies, __global const  b3Collidable_t* collidables, __global const  b3Aabb_t* localShapeAABB, __global b3Aabb_t* worldAabbs)\n"
+	"{\n"
+	"	__global const b3RigidBodyData_t* body = &bodies[bodyId];\n"
+	"	b3Float4 position = body->m_pos;\n"
+	"	b3Quat	orientation = body->m_quat;\n"
+	"	\n"
+	"	int collidableIndex = body->m_collidableIdx;\n"
+	"	int shapeIndex = collidables[collidableIndex].m_shapeIndex;\n"
+	"		\n"
+	"	if (shapeIndex>=0)\n"
+	"	{\n"
+	"				\n"
+	"		b3Aabb_t localAabb = localShapeAABB[collidableIndex];\n"
+	"		b3Aabb_t worldAabb;\n"
+	"		\n"
+	"		b3Float4 aabbAMinOut,aabbAMaxOut;	\n"
+	"		float margin = 0.f;\n"
+	"		b3TransformAabb2(localAabb.m_minVec,localAabb.m_maxVec,margin,position,orientation,&aabbAMinOut,&aabbAMaxOut);\n"
+	"		\n"
+	"		worldAabb.m_minVec =aabbAMinOut;\n"
+	"		worldAabb.m_minIndices[3] = bodyId;\n"
+	"		worldAabb.m_maxVec = aabbAMaxOut;\n"
+	"		worldAabb.m_signedMaxIndices[3] = body[bodyId].m_invMass==0.f? 0 : 1;\n"
+	"		worldAabbs[bodyId] = worldAabb;\n"
+	"	}\n"
+	"}\n"
+	"#endif //B3_UPDATE_AABBS_H\n"
+	"__kernel void initializeGpuAabbsFull(  const int numNodes, __global b3RigidBodyData_t* gBodies,__global b3Collidable_t* collidables, __global b3Aabb_t* plocalShapeAABB, __global b3Aabb_t* pAABB)\n"
+	"{\n"
+	"	int nodeID = get_global_id(0);\n"
+	"	if( nodeID < numNodes )\n"
+	"	{\n"
+	"		b3ComputeWorldAabb(nodeID, gBodies, collidables, plocalShapeAABB,pAABB);\n"
+	"	}\n"
+	"}\n"
+	"__kernel void clearOverlappingPairsKernel(  __global int4* pairs, int numPairs)\n"
+	"{\n"
+	"	int pairId = get_global_id(0);\n"
+	"	if( pairId< numPairs )\n"
+	"	{\n"
+	"		pairs[pairId].z = 0xffffffff;\n"
+	"	}\n"
+	"}\n";
diff --git a/dali-physics/third-party/bullet3/src/Bullet3OpenCL/premake4.lua b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/premake4.lua
new file mode 100644
index 0000000..ee35fdb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3OpenCL/premake4.lua
@@ -0,0 +1,32 @@
+function createProject(vendor)
+	hasCL = findOpenCL(vendor)
+	
+	if (hasCL) then
+		
+		project ("Bullet3OpenCL_" .. vendor)
+	
+		initOpenCL(vendor)
+			
+		kind "StaticLib"
+		
+        if os.is("Linux") then
+            buildoptions{"-fPIC"}
+        end
+		
+		includedirs {
+			".",".."
+		}
+		
+		files {
+			"**.cpp",
+			"**.h"
+		}
+		
+	end
+end
+
+createProject("clew")
+createProject("AMD")
+createProject("Intel")
+createProject("NVIDIA")
+createProject("Apple")
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
new file mode 100644
index 0000000..1255766
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
@@ -0,0 +1,55 @@
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+)
+
+SET(Bullet2FileLoader_SRCS
+	b3BulletFile.cpp
+	b3Chunk.cpp
+	b3DNA.cpp
+	b3File.cpp
+	b3Serializer.cpp
+)
+
+
+SET(Bullet2FileLoader_HDRS
+	b3BulletFile.h
+	b3Chunk.h
+	b3Common.h
+	b3Defines.h
+	b3DNA.h
+	b3File.h
+	b3Serializer.h
+	autogenerated/bullet2.h
+)
+
+ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS})
+if (BUILD_SHARED_LIBS)
+  target_link_libraries(Bullet2FileLoader Bullet3Common)
+endif ()
+SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES SOVERSION ${BULLET_VERSION})
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#FILES_MATCHING requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet2FileLoader DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS Bullet2FileLoader
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES PUBLIC_HEADER "${Bullet2FileLoader_HDRS}")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h
new file mode 100644
index 0000000..eaa27df
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/autogenerated/bullet2.h
@@ -0,0 +1,987 @@
+/* Copyright (C) 2011 Erwin Coumans & Charlie C
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+*/
+// Auto generated from Bullet/Extras/HeaderGenerator/bulletGenerate.py
+#ifndef __BULLET2_H__
+#define __BULLET2_H__
+namespace Bullet3SerializeBullet2
+{
+// put an empty struct in the case
+typedef struct bInvalidHandle
+{
+	int unused;
+} bInvalidHandle;
+
+class PointerArray;
+class b3PhysicsSystem;
+class ListBase;
+class b3Vector3FloatData;
+class b3Vector3DoubleData;
+class b3Matrix3x3FloatData;
+class b3Matrix3x3DoubleData;
+class b3TransformFloatData;
+class b3TransformDoubleData;
+class b3BvhSubtreeInfoData;
+class b3OptimizedBvhNodeFloatData;
+class b3OptimizedBvhNodeDoubleData;
+class b3QuantizedBvhNodeData;
+class b3QuantizedBvhFloatData;
+class b3QuantizedBvhDoubleData;
+class b3CollisionShapeData;
+class b3StaticPlaneShapeData;
+class b3ConvexInternalShapeData;
+class b3PositionAndRadius;
+class b3MultiSphereShapeData;
+class b3IntIndexData;
+class b3ShortIntIndexData;
+class b3ShortIntIndexTripletData;
+class b3CharIndexTripletData;
+class b3MeshPartData;
+class b3StridingMeshInterfaceData;
+class b3TriangleMeshShapeData;
+class b3ScaledTriangleMeshShapeData;
+class b3CompoundShapeChildData;
+class b3CompoundShapeData;
+class b3CylinderShapeData;
+class b3CapsuleShapeData;
+class b3TriangleInfoData;
+class b3TriangleInfoMapData;
+class b3GImpactMeshShapeData;
+class b3ConvexHullShapeData;
+class b3CollisionObjectDoubleData;
+class b3CollisionObjectFloatData;
+class b3DynamicsWorldDoubleData;
+class b3DynamicsWorldFloatData;
+class b3RigidBodyFloatData;
+class b3RigidBodyDoubleData;
+class b3ConstraintInfo1;
+class b3TypedConstraintData;
+class b3Point2PointConstraintFloatData;
+class b3Point2PointConstraintDoubleData;
+class b3HingeConstraintDoubleData;
+class b3HingeConstraintFloatData;
+class b3ConeTwistConstraintData;
+class b3Generic6DofConstraintData;
+class b3Generic6DofSpringConstraintData;
+class b3SliderConstraintData;
+class b3ContactSolverInfoDoubleData;
+class b3ContactSolverInfoFloatData;
+class SoftBodyMaterialData;
+class SoftBodyNodeData;
+class SoftBodyLinkData;
+class SoftBodyFaceData;
+class SoftBodyTetraData;
+class SoftRigidAnchorData;
+class SoftBodyConfigData;
+class SoftBodyPoseData;
+class SoftBodyClusterData;
+class b3SoftBodyJointData;
+class b3SoftBodyFloatData;
+// -------------------------------------------------- //
+class PointerArray
+{
+public:
+	int m_size;
+	int m_capacity;
+	void *m_data;
+};
+
+// -------------------------------------------------- //
+class b3PhysicsSystem
+{
+public:
+	PointerArray m_collisionShapes;
+	PointerArray m_collisionObjects;
+	PointerArray m_constraints;
+};
+
+// -------------------------------------------------- //
+class ListBase
+{
+public:
+	void *first;
+	void *last;
+};
+
+// -------------------------------------------------- //
+class b3Vector3FloatData
+{
+public:
+	float m_floats[4];
+};
+
+// -------------------------------------------------- //
+class b3Vector3DoubleData
+{
+public:
+	double m_floats[4];
+};
+
+// -------------------------------------------------- //
+class b3Matrix3x3FloatData
+{
+public:
+	b3Vector3FloatData m_el[3];
+};
+
+// -------------------------------------------------- //
+class b3Matrix3x3DoubleData
+{
+public:
+	b3Vector3DoubleData m_el[3];
+};
+
+// -------------------------------------------------- //
+class b3TransformFloatData
+{
+public:
+	b3Matrix3x3FloatData m_basis;
+	b3Vector3FloatData m_origin;
+};
+
+// -------------------------------------------------- //
+class b3TransformDoubleData
+{
+public:
+	b3Matrix3x3DoubleData m_basis;
+	b3Vector3DoubleData m_origin;
+};
+
+// -------------------------------------------------- //
+class b3BvhSubtreeInfoData
+{
+public:
+	int m_rootNodeIndex;
+	int m_subtreeSize;
+	short m_quantizedAabbMin[3];
+	short m_quantizedAabbMax[3];
+};
+
+// -------------------------------------------------- //
+class b3OptimizedBvhNodeFloatData
+{
+public:
+	b3Vector3FloatData m_aabbMinOrg;
+	b3Vector3FloatData m_aabbMaxOrg;
+	int m_escapeIndex;
+	int m_subPart;
+	int m_triangleIndex;
+	char m_pad[4];
+};
+
+// -------------------------------------------------- //
+class b3OptimizedBvhNodeDoubleData
+{
+public:
+	b3Vector3DoubleData m_aabbMinOrg;
+	b3Vector3DoubleData m_aabbMaxOrg;
+	int m_escapeIndex;
+	int m_subPart;
+	int m_triangleIndex;
+	char m_pad[4];
+};
+
+// -------------------------------------------------- //
+class b3QuantizedBvhNodeData
+{
+public:
+	short m_quantizedAabbMin[3];
+	short m_quantizedAabbMax[3];
+	int m_escapeIndexOrTriangleIndex;
+};
+
+// -------------------------------------------------- //
+class b3QuantizedBvhFloatData
+{
+public:
+	b3Vector3FloatData m_bvhAabbMin;
+	b3Vector3FloatData m_bvhAabbMax;
+	b3Vector3FloatData m_bvhQuantization;
+	int m_curNodeIndex;
+	int m_useQuantization;
+	int m_numContiguousLeafNodes;
+	int m_numQuantizedContiguousNodes;
+	b3OptimizedBvhNodeFloatData *m_contiguousNodesPtr;
+	b3QuantizedBvhNodeData *m_quantizedContiguousNodesPtr;
+	b3BvhSubtreeInfoData *m_subTreeInfoPtr;
+	int m_traversalMode;
+	int m_numSubtreeHeaders;
+};
+
+// -------------------------------------------------- //
+class b3QuantizedBvhDoubleData
+{
+public:
+	b3Vector3DoubleData m_bvhAabbMin;
+	b3Vector3DoubleData m_bvhAabbMax;
+	b3Vector3DoubleData m_bvhQuantization;
+	int m_curNodeIndex;
+	int m_useQuantization;
+	int m_numContiguousLeafNodes;
+	int m_numQuantizedContiguousNodes;
+	b3OptimizedBvhNodeDoubleData *m_contiguousNodesPtr;
+	b3QuantizedBvhNodeData *m_quantizedContiguousNodesPtr;
+	int m_traversalMode;
+	int m_numSubtreeHeaders;
+	b3BvhSubtreeInfoData *m_subTreeInfoPtr;
+};
+
+// -------------------------------------------------- //
+class b3CollisionShapeData
+{
+public:
+	char *m_name;
+	int m_shapeType;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3StaticPlaneShapeData
+{
+public:
+	b3CollisionShapeData m_collisionShapeData;
+	b3Vector3FloatData m_localScaling;
+	b3Vector3FloatData m_planeNormal;
+	float m_planeConstant;
+	char m_pad[4];
+};
+
+// -------------------------------------------------- //
+class b3ConvexInternalShapeData
+{
+public:
+	b3CollisionShapeData m_collisionShapeData;
+	b3Vector3FloatData m_localScaling;
+	b3Vector3FloatData m_implicitShapeDimensions;
+	float m_collisionMargin;
+	int m_padding;
+};
+
+// -------------------------------------------------- //
+class b3PositionAndRadius
+{
+public:
+	b3Vector3FloatData m_pos;
+	float m_radius;
+};
+
+// -------------------------------------------------- //
+class b3MultiSphereShapeData
+{
+public:
+	b3ConvexInternalShapeData m_convexInternalShapeData;
+	b3PositionAndRadius *m_localPositionArrayPtr;
+	int m_localPositionArraySize;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3IntIndexData
+{
+public:
+	int m_value;
+};
+
+// -------------------------------------------------- //
+class b3ShortIntIndexData
+{
+public:
+	short m_value;
+	char m_pad[2];
+};
+
+// -------------------------------------------------- //
+class b3ShortIntIndexTripletData
+{
+public:
+	short m_values[3];
+	char m_pad[2];
+};
+
+// -------------------------------------------------- //
+class b3CharIndexTripletData
+{
+public:
+	char m_values[3];
+	char m_pad;
+};
+
+// -------------------------------------------------- //
+class b3MeshPartData
+{
+public:
+	b3Vector3FloatData *m_vertices3f;
+	b3Vector3DoubleData *m_vertices3d;
+	b3IntIndexData *m_indices32;
+	b3ShortIntIndexTripletData *m_3indices16;
+	b3CharIndexTripletData *m_3indices8;
+	b3ShortIntIndexData *m_indices16;
+	int m_numTriangles;
+	int m_numVertices;
+};
+
+// -------------------------------------------------- //
+class b3StridingMeshInterfaceData
+{
+public:
+	b3MeshPartData *m_meshPartsPtr;
+	b3Vector3FloatData m_scaling;
+	int m_numMeshParts;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3TriangleMeshShapeData
+{
+public:
+	b3CollisionShapeData m_collisionShapeData;
+	b3StridingMeshInterfaceData m_meshInterface;
+	b3QuantizedBvhFloatData *m_quantizedFloatBvh;
+	b3QuantizedBvhDoubleData *m_quantizedDoubleBvh;
+	b3TriangleInfoMapData *m_triangleInfoMap;
+	float m_collisionMargin;
+	char m_pad3[4];
+};
+
+// -------------------------------------------------- //
+class b3ScaledTriangleMeshShapeData
+{
+public:
+	b3TriangleMeshShapeData m_trimeshShapeData;
+	b3Vector3FloatData m_localScaling;
+};
+
+// -------------------------------------------------- //
+class b3CompoundShapeChildData
+{
+public:
+	b3TransformFloatData m_transform;
+	b3CollisionShapeData *m_childShape;
+	int m_childShapeType;
+	float m_childMargin;
+};
+
+// -------------------------------------------------- //
+class b3CompoundShapeData
+{
+public:
+	b3CollisionShapeData m_collisionShapeData;
+	b3CompoundShapeChildData *m_childShapePtr;
+	int m_numChildShapes;
+	float m_collisionMargin;
+};
+
+// -------------------------------------------------- //
+class b3CylinderShapeData
+{
+public:
+	b3ConvexInternalShapeData m_convexInternalShapeData;
+	int m_upAxis;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3CapsuleShapeData
+{
+public:
+	b3ConvexInternalShapeData m_convexInternalShapeData;
+	int m_upAxis;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3TriangleInfoData
+{
+public:
+	int m_flags;
+	float m_edgeV0V1Angle;
+	float m_edgeV1V2Angle;
+	float m_edgeV2V0Angle;
+};
+
+// -------------------------------------------------- //
+class b3TriangleInfoMapData
+{
+public:
+	int *m_hashTablePtr;
+	int *m_nextPtr;
+	b3TriangleInfoData *m_valueArrayPtr;
+	int *m_keyArrayPtr;
+	float m_convexEpsilon;
+	float m_planarEpsilon;
+	float m_equalVertexThreshold;
+	float m_edgeDistanceThreshold;
+	float m_zeroAreaThreshold;
+	int m_nextSize;
+	int m_hashTableSize;
+	int m_numValues;
+	int m_numKeys;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3GImpactMeshShapeData
+{
+public:
+	b3CollisionShapeData m_collisionShapeData;
+	b3StridingMeshInterfaceData m_meshInterface;
+	b3Vector3FloatData m_localScaling;
+	float m_collisionMargin;
+	int m_gimpactSubType;
+};
+
+// -------------------------------------------------- //
+class b3ConvexHullShapeData
+{
+public:
+	b3ConvexInternalShapeData m_convexInternalShapeData;
+	b3Vector3FloatData *m_unscaledPointsFloatPtr;
+	b3Vector3DoubleData *m_unscaledPointsDoublePtr;
+	int m_numUnscaledPoints;
+	char m_padding3[4];
+};
+
+// -------------------------------------------------- //
+class b3CollisionObjectDoubleData
+{
+public:
+	void *m_broadphaseHandle;
+	void *m_collisionShape;
+	b3CollisionShapeData *m_rootCollisionShape;
+	char *m_name;
+	b3TransformDoubleData m_worldTransform;
+	b3TransformDoubleData m_interpolationWorldTransform;
+	b3Vector3DoubleData m_interpolationLinearVelocity;
+	b3Vector3DoubleData m_interpolationAngularVelocity;
+	b3Vector3DoubleData m_anisotropicFriction;
+	double m_contactProcessingThreshold;
+	double m_deactivationTime;
+	double m_friction;
+	double m_rollingFriction;
+	double m_restitution;
+	double m_hitFraction;
+	double m_ccdSweptSphereRadius;
+	double m_ccdMotionThreshold;
+	int m_hasAnisotropicFriction;
+	int m_collisionFlags;
+	int m_islandTag1;
+	int m_companionId;
+	int m_activationState1;
+	int m_internalType;
+	int m_checkCollideWith;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3CollisionObjectFloatData
+{
+public:
+	void *m_broadphaseHandle;
+	void *m_collisionShape;
+	b3CollisionShapeData *m_rootCollisionShape;
+	char *m_name;
+	b3TransformFloatData m_worldTransform;
+	b3TransformFloatData m_interpolationWorldTransform;
+	b3Vector3FloatData m_interpolationLinearVelocity;
+	b3Vector3FloatData m_interpolationAngularVelocity;
+	b3Vector3FloatData m_anisotropicFriction;
+	float m_contactProcessingThreshold;
+	float m_deactivationTime;
+	float m_friction;
+	float m_rollingFriction;
+	float m_restitution;
+	float m_hitFraction;
+	float m_ccdSweptSphereRadius;
+	float m_ccdMotionThreshold;
+	int m_hasAnisotropicFriction;
+	int m_collisionFlags;
+	int m_islandTag1;
+	int m_companionId;
+	int m_activationState1;
+	int m_internalType;
+	int m_checkCollideWith;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3RigidBodyFloatData
+{
+public:
+	b3CollisionObjectFloatData m_collisionObjectData;
+	b3Matrix3x3FloatData m_invInertiaTensorWorld;
+	b3Vector3FloatData m_linearVelocity;
+	b3Vector3FloatData m_angularVelocity;
+	b3Vector3FloatData m_angularFactor;
+	b3Vector3FloatData m_linearFactor;
+	b3Vector3FloatData m_gravity;
+	b3Vector3FloatData m_gravity_acceleration;
+	b3Vector3FloatData m_invInertiaLocal;
+	b3Vector3FloatData m_totalForce;
+	b3Vector3FloatData m_totalTorque;
+	float m_inverseMass;
+	float m_linearDamping;
+	float m_angularDamping;
+	float m_additionalDampingFactor;
+	float m_additionalLinearDampingThresholdSqr;
+	float m_additionalAngularDampingThresholdSqr;
+	float m_additionalAngularDampingFactor;
+	float m_linearSleepingThreshold;
+	float m_angularSleepingThreshold;
+	int m_additionalDamping;
+};
+
+// -------------------------------------------------- //
+class b3RigidBodyDoubleData
+{
+public:
+	b3CollisionObjectDoubleData m_collisionObjectData;
+	b3Matrix3x3DoubleData m_invInertiaTensorWorld;
+	b3Vector3DoubleData m_linearVelocity;
+	b3Vector3DoubleData m_angularVelocity;
+	b3Vector3DoubleData m_angularFactor;
+	b3Vector3DoubleData m_linearFactor;
+	b3Vector3DoubleData m_gravity;
+	b3Vector3DoubleData m_gravity_acceleration;
+	b3Vector3DoubleData m_invInertiaLocal;
+	b3Vector3DoubleData m_totalForce;
+	b3Vector3DoubleData m_totalTorque;
+	double m_inverseMass;
+	double m_linearDamping;
+	double m_angularDamping;
+	double m_additionalDampingFactor;
+	double m_additionalLinearDampingThresholdSqr;
+	double m_additionalAngularDampingThresholdSqr;
+	double m_additionalAngularDampingFactor;
+	double m_linearSleepingThreshold;
+	double m_angularSleepingThreshold;
+	int m_additionalDamping;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3ConstraintInfo1
+{
+public:
+	int m_numConstraintRows;
+	int nub;
+};
+
+// -------------------------------------------------- //
+class b3TypedConstraintData
+{
+public:
+	bInvalidHandle *m_rbA;
+	bInvalidHandle *m_rbB;
+	char *m_name;
+	int m_objectType;
+	int m_userConstraintType;
+	int m_userConstraintId;
+	int m_needsFeedback;
+	float m_appliedImpulse;
+	float m_dbgDrawSize;
+	int m_disableCollisionsBetweenLinkedBodies;
+	int m_overrideNumSolverIterations;
+	float m_breakingImpulseThreshold;
+	int m_isEnabled;
+};
+
+// -------------------------------------------------- //
+class b3Point2PointConstraintFloatData
+{
+public:
+	b3TypedConstraintData m_typeConstraintData;
+	b3Vector3FloatData m_pivotInA;
+	b3Vector3FloatData m_pivotInB;
+};
+
+// -------------------------------------------------- //
+class b3Point2PointConstraintDoubleData
+{
+public:
+	b3TypedConstraintData m_typeConstraintData;
+	b3Vector3DoubleData m_pivotInA;
+	b3Vector3DoubleData m_pivotInB;
+};
+
+// -------------------------------------------------- //
+class b3HingeConstraintDoubleData
+{
+public:
+	b3TypedConstraintData m_typeConstraintData;
+	b3TransformDoubleData m_rbAFrame;
+	b3TransformDoubleData m_rbBFrame;
+	int m_useReferenceFrameA;
+	int m_angularOnly;
+	int m_enableAngularMotor;
+	float m_motorTargetVelocity;
+	float m_maxMotorImpulse;
+	float m_lowerLimit;
+	float m_upperLimit;
+	float m_limitSoftness;
+	float m_biasFactor;
+	float m_relaxationFactor;
+};
+
+// -------------------------------------------------- //
+class b3HingeConstraintFloatData
+{
+public:
+	b3TypedConstraintData m_typeConstraintData;
+	b3TransformFloatData m_rbAFrame;
+	b3TransformFloatData m_rbBFrame;
+	int m_useReferenceFrameA;
+	int m_angularOnly;
+	int m_enableAngularMotor;
+	float m_motorTargetVelocity;
+	float m_maxMotorImpulse;
+	float m_lowerLimit;
+	float m_upperLimit;
+	float m_limitSoftness;
+	float m_biasFactor;
+	float m_relaxationFactor;
+};
+
+// -------------------------------------------------- //
+class b3ConeTwistConstraintData
+{
+public:
+	b3TypedConstraintData m_typeConstraintData;
+	b3TransformFloatData m_rbAFrame;
+	b3TransformFloatData m_rbBFrame;
+	float m_swingSpan1;
+	float m_swingSpan2;
+	float m_twistSpan;
+	float m_limitSoftness;
+	float m_biasFactor;
+	float m_relaxationFactor;
+	float m_damping;
+	char m_pad[4];
+};
+
+// -------------------------------------------------- //
+class b3Generic6DofConstraintData
+{
+public:
+	b3TypedConstraintData m_typeConstraintData;
+	b3TransformFloatData m_rbAFrame;
+	b3TransformFloatData m_rbBFrame;
+	b3Vector3FloatData m_linearUpperLimit;
+	b3Vector3FloatData m_linearLowerLimit;
+	b3Vector3FloatData m_angularUpperLimit;
+	b3Vector3FloatData m_angularLowerLimit;
+	int m_useLinearReferenceFrameA;
+	int m_useOffsetForConstraintFrame;
+};
+
+// -------------------------------------------------- //
+class b3Generic6DofSpringConstraintData
+{
+public:
+	b3Generic6DofConstraintData m_6dofData;
+	int m_springEnabled[6];
+	float m_equilibriumPoint[6];
+	float m_springStiffness[6];
+	float m_springDamping[6];
+};
+
+// -------------------------------------------------- //
+class b3SliderConstraintData
+{
+public:
+	b3TypedConstraintData m_typeConstraintData;
+	b3TransformFloatData m_rbAFrame;
+	b3TransformFloatData m_rbBFrame;
+	float m_linearUpperLimit;
+	float m_linearLowerLimit;
+	float m_angularUpperLimit;
+	float m_angularLowerLimit;
+	int m_useLinearReferenceFrameA;
+	int m_useOffsetForConstraintFrame;
+};
+
+// -------------------------------------------------- //
+class b3ContactSolverInfoDoubleData
+{
+public:
+	double m_tau;
+	double m_damping;
+	double m_friction;
+	double m_timeStep;
+	double m_restitution;
+	double m_maxErrorReduction;
+	double m_sor;
+	double m_erp;
+	double m_erp2;
+	double m_globalCfm;
+	double m_splitImpulsePenetrationThreshold;
+	double m_splitImpulseTurnErp;
+	double m_linearSlop;
+	double m_warmstartingFactor;
+	double m_maxGyroscopicForce;
+	double m_singleAxisRollingFrictionThreshold;
+	int m_numIterations;
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+	int m_minimumSolverBatchSize;
+	int m_splitImpulse;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3ContactSolverInfoFloatData
+{
+public:
+	float m_tau;
+	float m_damping;
+	float m_friction;
+	float m_timeStep;
+	float m_restitution;
+	float m_maxErrorReduction;
+	float m_sor;
+	float m_erp;
+	float m_erp2;
+	float m_globalCfm;
+	float m_splitImpulsePenetrationThreshold;
+	float m_splitImpulseTurnErp;
+	float m_linearSlop;
+	float m_warmstartingFactor;
+	float m_maxGyroscopicForce;
+	float m_singleAxisRollingFrictionThreshold;
+	int m_numIterations;
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+	int m_minimumSolverBatchSize;
+	int m_splitImpulse;
+	char m_padding[4];
+};
+
+// -------------------------------------------------- //
+class b3DynamicsWorldDoubleData
+{
+public:
+	b3ContactSolverInfoDoubleData m_solverInfo;
+	b3Vector3DoubleData m_gravity;
+};
+
+// -------------------------------------------------- //
+class b3DynamicsWorldFloatData
+{
+public:
+	b3ContactSolverInfoFloatData m_solverInfo;
+	b3Vector3FloatData m_gravity;
+};
+
+// -------------------------------------------------- //
+class SoftBodyMaterialData
+{
+public:
+	float m_linearStiffness;
+	float m_angularStiffness;
+	float m_volumeStiffness;
+	int m_flags;
+};
+
+// -------------------------------------------------- //
+class SoftBodyNodeData
+{
+public:
+	SoftBodyMaterialData *m_material;
+	b3Vector3FloatData m_position;
+	b3Vector3FloatData m_previousPosition;
+	b3Vector3FloatData m_velocity;
+	b3Vector3FloatData m_accumulatedForce;
+	b3Vector3FloatData m_normal;
+	float m_inverseMass;
+	float m_area;
+	int m_attach;
+	int m_pad;
+};
+
+// -------------------------------------------------- //
+class SoftBodyLinkData
+{
+public:
+	SoftBodyMaterialData *m_material;
+	int m_nodeIndices[2];
+	float m_restLength;
+	int m_bbending;
+};
+
+// -------------------------------------------------- //
+class SoftBodyFaceData
+{
+public:
+	b3Vector3FloatData m_normal;
+	SoftBodyMaterialData *m_material;
+	int m_nodeIndices[3];
+	float m_restArea;
+};
+
+// -------------------------------------------------- //
+class SoftBodyTetraData
+{
+public:
+	b3Vector3FloatData m_c0[4];
+	SoftBodyMaterialData *m_material;
+	int m_nodeIndices[4];
+	float m_restVolume;
+	float m_c1;
+	float m_c2;
+	int m_pad;
+};
+
+// -------------------------------------------------- //
+class SoftRigidAnchorData
+{
+public:
+	b3Matrix3x3FloatData m_c0;
+	b3Vector3FloatData m_c1;
+	b3Vector3FloatData m_localFrame;
+	bInvalidHandle *m_rigidBody;
+	int m_nodeIndex;
+	float m_c2;
+};
+
+// -------------------------------------------------- //
+class SoftBodyConfigData
+{
+public:
+	int m_aeroModel;
+	float m_baumgarte;
+	float m_damping;
+	float m_drag;
+	float m_lift;
+	float m_pressure;
+	float m_volume;
+	float m_dynamicFriction;
+	float m_poseMatch;
+	float m_rigidContactHardness;
+	float m_kineticContactHardness;
+	float m_softContactHardness;
+	float m_anchorHardness;
+	float m_softRigidClusterHardness;
+	float m_softKineticClusterHardness;
+	float m_softSoftClusterHardness;
+	float m_softRigidClusterImpulseSplit;
+	float m_softKineticClusterImpulseSplit;
+	float m_softSoftClusterImpulseSplit;
+	float m_maxVolume;
+	float m_timeScale;
+	int m_velocityIterations;
+	int m_positionIterations;
+	int m_driftIterations;
+	int m_clusterIterations;
+	int m_collisionFlags;
+};
+
+// -------------------------------------------------- //
+class SoftBodyPoseData
+{
+public:
+	b3Matrix3x3FloatData m_rot;
+	b3Matrix3x3FloatData m_scale;
+	b3Matrix3x3FloatData m_aqq;
+	b3Vector3FloatData m_com;
+	b3Vector3FloatData *m_positions;
+	float *m_weights;
+	int m_numPositions;
+	int m_numWeigts;
+	int m_bvolume;
+	int m_bframe;
+	float m_restVolume;
+	int m_pad;
+};
+
+// -------------------------------------------------- //
+class SoftBodyClusterData
+{
+public:
+	b3TransformFloatData m_framexform;
+	b3Matrix3x3FloatData m_locii;
+	b3Matrix3x3FloatData m_invwi;
+	b3Vector3FloatData m_com;
+	b3Vector3FloatData m_vimpulses[2];
+	b3Vector3FloatData m_dimpulses[2];
+	b3Vector3FloatData m_lv;
+	b3Vector3FloatData m_av;
+	b3Vector3FloatData *m_framerefs;
+	int *m_nodeIndices;
+	float *m_masses;
+	int m_numFrameRefs;
+	int m_numNodes;
+	int m_numMasses;
+	float m_idmass;
+	float m_imass;
+	int m_nvimpulses;
+	int m_ndimpulses;
+	float m_ndamping;
+	float m_ldamping;
+	float m_adamping;
+	float m_matching;
+	float m_maxSelfCollisionImpulse;
+	float m_selfCollisionImpulseFactor;
+	int m_containsAnchor;
+	int m_collide;
+	int m_clusterIndex;
+};
+
+// -------------------------------------------------- //
+class b3SoftBodyJointData
+{
+public:
+	void *m_bodyA;
+	void *m_bodyB;
+	b3Vector3FloatData m_refs[2];
+	float m_cfm;
+	float m_erp;
+	float m_split;
+	int m_delete;
+	b3Vector3FloatData m_relPosition[2];
+	int m_bodyAtype;
+	int m_bodyBtype;
+	int m_jointType;
+	int m_pad;
+};
+
+// -------------------------------------------------- //
+class b3SoftBodyFloatData
+{
+public:
+	b3CollisionObjectFloatData m_collisionObjectData;
+	SoftBodyPoseData *m_pose;
+	SoftBodyMaterialData **m_materials;
+	SoftBodyNodeData *m_nodes;
+	SoftBodyLinkData *m_links;
+	SoftBodyFaceData *m_faces;
+	SoftBodyTetraData *m_tetrahedra;
+	SoftRigidAnchorData *m_anchors;
+	SoftBodyClusterData *m_clusters;
+	b3SoftBodyJointData *m_joints;
+	int m_numMaterials;
+	int m_numNodes;
+	int m_numLinks;
+	int m_numFaces;
+	int m_numTetrahedra;
+	int m_numAnchors;
+	int m_numClusters;
+	int m_numJoints;
+	SoftBodyConfigData m_config;
+};
+
+}  // namespace Bullet3SerializeBullet2
+#endif  //__BULLET2_H__
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.cpp b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.cpp
new file mode 100644
index 0000000..d2a7163
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.cpp
@@ -0,0 +1,400 @@
+/*
+bParse
+Copyright (c) 2006-2010 Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3BulletFile.h"
+#include "b3Defines.h"
+#include "b3DNA.h"
+
+#if !defined(__CELLOS_LV2__) && !defined(__MWERKS__)
+#include <memory.h>
+#endif
+#include <string.h>
+
+// 32 && 64 bit versions
+#ifdef B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+#ifdef _WIN64
+extern char b3s_bulletDNAstr64[];
+extern int b3s_bulletDNAlen64;
+#else
+extern char b3s_bulletDNAstr[];
+extern int b3s_bulletDNAlen;
+#endif  //_WIN64
+#else   //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+
+extern char b3s_bulletDNAstr64[];
+extern int b3s_bulletDNAlen64;
+extern char b3s_bulletDNAstr[];
+extern int b3s_bulletDNAlen;
+
+#endif  //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+
+using namespace bParse;
+
+b3BulletFile::b3BulletFile()
+	: bFile("", "BULLET ")
+{
+	mMemoryDNA = new bDNA();  //this memory gets released in the bFile::~bFile destructor,@todo not consistent with the rule 'who allocates it, has to deallocate it"
+
+	m_DnaCopy = 0;
+
+#ifdef B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+#ifdef _WIN64
+	m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen64, 16);
+	memcpy(m_DnaCopy, b3s_bulletDNAstr64, b3s_bulletDNAlen64);
+	mMemoryDNA->init(m_DnaCopy, b3s_bulletDNAlen64);
+#else   //_WIN64
+	m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen, 16);
+	memcpy(m_DnaCopy, b3s_bulletDNAstr, b3s_bulletDNAlen);
+	mMemoryDNA->init(m_DnaCopy, b3s_bulletDNAlen);
+#endif  //_WIN64
+#else   //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+	if (VOID_IS_8)
+	{
+		m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen64, 16);
+		memcpy(m_DnaCopy, b3s_bulletDNAstr64, b3s_bulletDNAlen64);
+		mMemoryDNA->init(m_DnaCopy, b3s_bulletDNAlen64);
+	}
+	else
+	{
+		m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen, 16);
+		memcpy(m_DnaCopy, b3s_bulletDNAstr, b3s_bulletDNAlen);
+		mMemoryDNA->init(m_DnaCopy, b3s_bulletDNAlen);
+	}
+#endif  //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+}
+
+b3BulletFile::b3BulletFile(const char* fileName)
+	: bFile(fileName, "BULLET ")
+{
+	m_DnaCopy = 0;
+}
+
+b3BulletFile::b3BulletFile(char* memoryBuffer, int len)
+	: bFile(memoryBuffer, len, "BULLET ")
+{
+	m_DnaCopy = 0;
+}
+
+b3BulletFile::~b3BulletFile()
+{
+	if (m_DnaCopy)
+		b3AlignedFree(m_DnaCopy);
+
+	while (m_dataBlocks.size())
+	{
+		char* dataBlock = m_dataBlocks[m_dataBlocks.size() - 1];
+		delete[] dataBlock;
+		m_dataBlocks.pop_back();
+	}
+}
+
+// ----------------------------------------------------- //
+void b3BulletFile::parseData()
+{
+	//	printf ("Building datablocks");
+	//	printf ("Chunk size = %d",CHUNK_HEADER_LEN);
+	//	printf ("File chunk size = %d",ChunkUtils::getOffset(mFlags));
+
+	const bool brokenDNA = (mFlags & FD_BROKEN_DNA) != 0;
+
+	//const bool swap = (mFlags&FD_ENDIAN_SWAP)!=0;
+
+	mDataStart = 12;
+
+	char* dataPtr = mFileBuffer + mDataStart;
+
+	bChunkInd dataChunk;
+	dataChunk.code = 0;
+
+	//dataPtr += ChunkUtils::getNextBlock(&dataChunk, dataPtr, mFlags);
+	int seek = getNextBlock(&dataChunk, dataPtr, mFlags);
+
+	if (mFlags & FD_ENDIAN_SWAP)
+		swapLen(dataPtr);
+
+	//dataPtr += ChunkUtils::getOffset(mFlags);
+	char* dataPtrHead = 0;
+
+	while (dataChunk.code != B3_DNA1)
+	{
+		if (!brokenDNA || (dataChunk.code != B3_QUANTIZED_BVH_CODE))
+		{
+			// one behind
+			if (dataChunk.code == B3_SDNA) break;
+			//if (dataChunk.code == DNA1) break;
+
+			// same as (BHEAD+DATA dependency)
+			dataPtrHead = dataPtr + ChunkUtils::getOffset(mFlags);
+			if (dataChunk.dna_nr >= 0)
+			{
+				char* id = readStruct(dataPtrHead, dataChunk);
+
+				// lookup maps
+				if (id)
+				{
+					m_chunkPtrPtrMap.insert(dataChunk.oldPtr, dataChunk);
+					mLibPointers.insert(dataChunk.oldPtr, (bStructHandle*)id);
+
+					m_chunks.push_back(dataChunk);
+					// block it
+					//bListBasePtr *listID = mMain->getListBasePtr(dataChunk.code);
+					//if (listID)
+					//	listID->push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_SOFTBODY_CODE)
+				{
+					m_softBodies.push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_RIGIDBODY_CODE)
+				{
+					m_rigidBodies.push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_DYNAMICSWORLD_CODE)
+				{
+					m_dynamicsWorldInfo.push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_CONSTRAINT_CODE)
+				{
+					m_constraints.push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_QUANTIZED_BVH_CODE)
+				{
+					m_bvhs.push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_TRIANLGE_INFO_MAP)
+				{
+					m_triangleInfoMaps.push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_COLLISIONOBJECT_CODE)
+				{
+					m_collisionObjects.push_back((bStructHandle*)id);
+				}
+
+				if (dataChunk.code == B3_SHAPE_CODE)
+				{
+					m_collisionShapes.push_back((bStructHandle*)id);
+				}
+
+				//		if (dataChunk.code == GLOB)
+				//		{
+				//			m_glob = (bStructHandle*) id;
+				//		}
+			}
+			else
+			{
+				//printf("unknown chunk\n");
+
+				mLibPointers.insert(dataChunk.oldPtr, (bStructHandle*)dataPtrHead);
+			}
+		}
+		else
+		{
+			printf("skipping B3_QUANTIZED_BVH_CODE due to broken DNA\n");
+		}
+
+		dataPtr += seek;
+
+		seek = getNextBlock(&dataChunk, dataPtr, mFlags);
+		if (mFlags & FD_ENDIAN_SWAP)
+			swapLen(dataPtr);
+
+		if (seek < 0)
+			break;
+	}
+}
+
+void b3BulletFile::addDataBlock(char* dataBlock)
+{
+	m_dataBlocks.push_back(dataBlock);
+}
+
+void b3BulletFile::writeDNA(FILE* fp)
+{
+	bChunkInd dataChunk;
+	dataChunk.code = B3_DNA1;
+	dataChunk.dna_nr = 0;
+	dataChunk.nr = 1;
+#ifdef B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+	if (VOID_IS_8)
+	{
+#ifdef _WIN64
+		dataChunk.len = b3s_bulletDNAlen64;
+		dataChunk.oldPtr = b3s_bulletDNAstr64;
+		fwrite(&dataChunk, sizeof(bChunkInd), 1, fp);
+		fwrite(b3s_bulletDNAstr64, b3s_bulletDNAlen64, 1, fp);
+#else
+		b3Assert(0);
+#endif
+	}
+	else
+	{
+#ifndef _WIN64
+		dataChunk.len = b3s_bulletDNAlen;
+		dataChunk.oldPtr = b3s_bulletDNAstr;
+		fwrite(&dataChunk, sizeof(bChunkInd), 1, fp);
+		fwrite(b3s_bulletDNAstr, b3s_bulletDNAlen, 1, fp);
+#else   //_WIN64
+		b3Assert(0);
+#endif  //_WIN64
+	}
+#else   //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+	if (VOID_IS_8)
+	{
+		dataChunk.len = b3s_bulletDNAlen64;
+		dataChunk.oldPtr = b3s_bulletDNAstr64;
+		fwrite(&dataChunk, sizeof(bChunkInd), 1, fp);
+		fwrite(b3s_bulletDNAstr64, b3s_bulletDNAlen64, 1, fp);
+	}
+	else
+	{
+		dataChunk.len = b3s_bulletDNAlen;
+		dataChunk.oldPtr = b3s_bulletDNAstr;
+		fwrite(&dataChunk, sizeof(bChunkInd), 1, fp);
+		fwrite(b3s_bulletDNAstr, b3s_bulletDNAlen, 1, fp);
+	}
+#endif  //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+}
+
+void b3BulletFile::parse(int verboseMode)
+{
+#ifdef B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+	if (VOID_IS_8)
+	{
+#ifdef _WIN64
+
+		if (m_DnaCopy)
+			delete m_DnaCopy;
+		m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen64, 16);
+		memcpy(m_DnaCopy, b3s_bulletDNAstr64, b3s_bulletDNAlen64);
+		parseInternal(verboseMode, (char*)b3s_bulletDNAstr64, b3s_bulletDNAlen64);
+#else
+		b3Assert(0);
+#endif
+	}
+	else
+	{
+#ifndef _WIN64
+
+		if (m_DnaCopy)
+			delete m_DnaCopy;
+		m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen, 16);
+		memcpy(m_DnaCopy, b3s_bulletDNAstr, b3s_bulletDNAlen);
+		parseInternal(verboseMode, m_DnaCopy, b3s_bulletDNAlen);
+#else
+		b3Assert(0);
+#endif
+	}
+#else   //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+	if (VOID_IS_8)
+	{
+		if (m_DnaCopy)
+			delete m_DnaCopy;
+		m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen64, 16);
+		memcpy(m_DnaCopy, b3s_bulletDNAstr64, b3s_bulletDNAlen64);
+		parseInternal(verboseMode, m_DnaCopy, b3s_bulletDNAlen64);
+	}
+	else
+	{
+		if (m_DnaCopy)
+			delete m_DnaCopy;
+		m_DnaCopy = (char*)b3AlignedAlloc(b3s_bulletDNAlen, 16);
+		memcpy(m_DnaCopy, b3s_bulletDNAstr, b3s_bulletDNAlen);
+		parseInternal(verboseMode, m_DnaCopy, b3s_bulletDNAlen);
+	}
+#endif  //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+
+	//the parsing will convert to cpu endian
+	mFlags &= ~FD_ENDIAN_SWAP;
+
+	int littleEndian = 1;
+	littleEndian = ((char*)&littleEndian)[0];
+
+	mFileBuffer[8] = littleEndian ? 'v' : 'V';
+}
+
+// experimental
+int b3BulletFile::write(const char* fileName, bool fixupPointers)
+{
+	FILE* fp = fopen(fileName, "wb");
+	if (fp)
+	{
+		char header[B3_SIZEOFBLENDERHEADER];
+		memcpy(header, m_headerString, 7);
+		int endian = 1;
+		endian = ((char*)&endian)[0];
+
+		if (endian)
+		{
+			header[7] = '_';
+		}
+		else
+		{
+			header[7] = '-';
+		}
+		if (VOID_IS_8)
+		{
+			header[8] = 'V';
+		}
+		else
+		{
+			header[8] = 'v';
+		}
+
+		header[9] = '2';
+		header[10] = '7';
+		header[11] = '5';
+
+		fwrite(header, B3_SIZEOFBLENDERHEADER, 1, fp);
+
+		writeChunks(fp, fixupPointers);
+
+		writeDNA(fp);
+
+		fclose(fp);
+	}
+	else
+	{
+		printf("Error: cannot open file %s for writing\n", fileName);
+		return 0;
+	}
+	return 1;
+}
+
+void b3BulletFile::addStruct(const char* structType, void* data, int len, void* oldPtr, int code)
+{
+	bParse::bChunkInd dataChunk;
+	dataChunk.code = code;
+	dataChunk.nr = 1;
+	dataChunk.len = len;
+	dataChunk.dna_nr = mMemoryDNA->getReverseType(structType);
+	dataChunk.oldPtr = oldPtr;
+
+	///Perform structure size validation
+	short* structInfo = mMemoryDNA->getStruct(dataChunk.dna_nr);
+	int elemBytes;
+	elemBytes = mMemoryDNA->getLength(structInfo[0]);
+	//	int elemBytes = mMemoryDNA->getElementSize(structInfo[0],structInfo[1]);
+	assert(len == elemBytes);
+
+	mLibPointers.insert(dataChunk.oldPtr, (bStructHandle*)data);
+	m_chunks.push_back(dataChunk);
+}
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h
new file mode 100644
index 0000000..ede1d37
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3BulletFile.h
@@ -0,0 +1,74 @@
+/*
+bParse
+Copyright (c) 2006-2010 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_BULLET_FILE_H
+#define B3_BULLET_FILE_H
+
+#include "b3File.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "b3Defines.h"
+
+#include "Bullet3Serialize/Bullet2FileLoader/b3Serializer.h"
+
+namespace bParse
+{
+// ----------------------------------------------------- //
+class b3BulletFile : public bFile
+{
+protected:
+	char* m_DnaCopy;
+
+public:
+	b3AlignedObjectArray<bStructHandle*> m_softBodies;
+
+	b3AlignedObjectArray<bStructHandle*> m_rigidBodies;
+
+	b3AlignedObjectArray<bStructHandle*> m_collisionObjects;
+
+	b3AlignedObjectArray<bStructHandle*> m_collisionShapes;
+
+	b3AlignedObjectArray<bStructHandle*> m_constraints;
+
+	b3AlignedObjectArray<bStructHandle*> m_bvhs;
+
+	b3AlignedObjectArray<bStructHandle*> m_triangleInfoMaps;
+
+	b3AlignedObjectArray<bStructHandle*> m_dynamicsWorldInfo;
+
+	b3AlignedObjectArray<char*> m_dataBlocks;
+	b3BulletFile();
+
+	b3BulletFile(const char* fileName);
+
+	b3BulletFile(char* memoryBuffer, int len);
+
+	virtual ~b3BulletFile();
+
+	virtual void addDataBlock(char* dataBlock);
+
+	// experimental
+	virtual int write(const char* fileName, bool fixupPointers = false);
+
+	virtual void parse(int verboseMode);
+
+	virtual void parseData();
+
+	virtual void writeDNA(FILE* fp);
+
+	void addStruct(const char* structType, void* data, int len, void* oldPtr, int code);
+};
+};  // namespace bParse
+
+#endif  //B3_BULLET_FILE_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.cpp b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.cpp
new file mode 100644
index 0000000..ff75ff8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.cpp
@@ -0,0 +1,69 @@
+/*
+bParse
+Copyright (c) 2006-2009 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "b3Chunk.h"
+#include "b3Defines.h"
+#include "b3File.h"
+
+#if !defined(__CELLOS_LV2__) && !defined(__MWERKS__)
+#include <memory.h>
+#endif
+#include <string.h>
+
+using namespace bParse;
+
+// ----------------------------------------------------- //
+short ChunkUtils::swapShort(short sht)
+{
+	B3_SWITCH_SHORT(sht);
+	return sht;
+}
+
+// ----------------------------------------------------- //
+int ChunkUtils::swapInt(int inte)
+{
+	B3_SWITCH_INT(inte);
+	return inte;
+}
+
+// ----------------------------------------------------- //
+b3Long64 ChunkUtils::swapLong64(b3Long64 lng)
+{
+	B3_SWITCH_LONGINT(lng);
+	return lng;
+}
+
+// ----------------------------------------------------- //
+int ChunkUtils::getOffset(int flags)
+{
+	// if the file is saved in a
+	// different format, get the
+	// file's chunk size
+	int res = CHUNK_HEADER_LEN;
+
+	if (VOID_IS_8)
+	{
+		if (flags & FD_BITS_VARIES)
+			res = sizeof(bChunkPtr4);
+	}
+	else
+	{
+		if (flags & FD_BITS_VARIES)
+			res = sizeof(bChunkPtr8);
+	}
+	return res;
+}
+
+//eof
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h
new file mode 100644
index 0000000..c9d0f37
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Chunk.h
@@ -0,0 +1,84 @@
+/*
+bParse
+Copyright (c) 2006-2009 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __BCHUNK_H__
+#define __BCHUNK_H__
+
+#if defined(_WIN32) && !defined(__MINGW32__)
+#define b3Long64 __int64
+#elif defined(__MINGW32__)
+#include <stdint.h>
+#define b3Long64 int64_t
+#else
+#define b3Long64 long long
+#endif
+
+namespace bParse
+{
+// ----------------------------------------------------- //
+class bChunkPtr4
+{
+public:
+	bChunkPtr4() {}
+	int code;
+	int len;
+	union {
+		int m_uniqueInt;
+	};
+	int dna_nr;
+	int nr;
+};
+
+// ----------------------------------------------------- //
+class bChunkPtr8
+{
+public:
+	bChunkPtr8() {}
+	int code, len;
+	union {
+		b3Long64 oldPrev;
+		int m_uniqueInts[2];
+	};
+	int dna_nr, nr;
+};
+
+// ----------------------------------------------------- //
+class bChunkInd
+{
+public:
+	bChunkInd() {}
+	int code, len;
+	void *oldPtr;
+	int dna_nr, nr;
+};
+
+// ----------------------------------------------------- //
+class ChunkUtils
+{
+public:
+	// file chunk offset
+	static int getOffset(int flags);
+
+	// endian utils
+	static short swapShort(short sht);
+	static int swapInt(int inte);
+	static b3Long64 swapLong64(b3Long64 lng);
+};
+
+const int CHUNK_HEADER_LEN = ((sizeof(bChunkInd)));
+const bool VOID_IS_8 = ((sizeof(void *) == 8));
+}  // namespace bParse
+
+#endif  //__BCHUNK_H__
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Common.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Common.h
new file mode 100644
index 0000000..5884fad
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Common.h
@@ -0,0 +1,40 @@
+/*
+bParse
+Copyright (c) 2006-2009 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __BCOMMON_H__
+#define __BCOMMON_H__
+
+#include <assert.h>
+//#include "bLog.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3HashMap.h"
+
+namespace bParse
+{
+class bMain;
+class bFileData;
+class bFile;
+class bDNA;
+
+// delete void* undefined
+typedef struct bStructHandle
+{
+	int unused;
+} bStructHandle;
+typedef b3AlignedObjectArray<bStructHandle*> bListBasePtr;
+typedef b3HashMap<b3HashPtr, bStructHandle*> bPtrMap;
+}  // namespace bParse
+
+#endif  //__BCOMMON_H__
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp
new file mode 100644
index 0000000..09c8f23
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.cpp
@@ -0,0 +1,616 @@
+/*
+bParse
+Copyright (c) 2006-2009 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#include <assert.h>
+
+#include "b3DNA.h"
+#include "b3Chunk.h"
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+//this define will force traversal of structures, to check backward (and forward) compatibility
+//#define TEST_BACKWARD_FORWARD_COMPATIBILITY
+
+using namespace bParse;
+
+// ----------------------------------------------------- //
+bDNA::bDNA()
+	: mPtrLen(0)
+{
+	// --
+}
+
+// ----------------------------------------------------- //
+bDNA::~bDNA()
+{
+	// --
+}
+
+// ----------------------------------------------------- //
+bool bDNA::lessThan(bDNA *file)
+{
+	return (m_Names.size() < file->m_Names.size());
+}
+
+// ----------------------------------------------------- //
+char *bDNA::getName(int ind)
+{
+	assert(ind <= (int)m_Names.size());
+	return m_Names[ind].m_name;
+}
+
+// ----------------------------------------------------- //
+char *bDNA::getType(int ind)
+{
+	assert(ind <= (int)mTypes.size());
+	return mTypes[ind];
+}
+
+// ----------------------------------------------------- //
+short *bDNA::getStruct(int ind)
+{
+	assert(ind <= (int)mStructs.size());
+	return mStructs[ind];
+}
+
+// ----------------------------------------------------- //
+short bDNA::getLength(int ind)
+{
+	assert(ind <= (int)mTlens.size());
+	return mTlens[ind];
+}
+
+// ----------------------------------------------------- //
+int bDNA::getReverseType(short type)
+{
+	int *intPtr = mStructReverse.find(type);
+	if (intPtr)
+		return *intPtr;
+
+	return -1;
+}
+
+// ----------------------------------------------------- //
+int bDNA::getReverseType(const char *type)
+{
+	b3HashString key(type);
+	int *valuePtr = mTypeLookup.find(key);
+	if (valuePtr)
+		return *valuePtr;
+
+	return -1;
+}
+
+// ----------------------------------------------------- //
+int bDNA::getNumStructs()
+{
+	return (int)mStructs.size();
+}
+
+// ----------------------------------------------------- //
+bool bDNA::flagNotEqual(int dna_nr)
+{
+	assert(dna_nr <= (int)mCMPFlags.size());
+	return mCMPFlags[dna_nr] == FDF_STRUCT_NEQU;
+}
+
+// ----------------------------------------------------- //
+bool bDNA::flagEqual(int dna_nr)
+{
+	assert(dna_nr <= (int)mCMPFlags.size());
+	int flag = mCMPFlags[dna_nr];
+	return flag == FDF_STRUCT_EQU;
+}
+
+// ----------------------------------------------------- //
+bool bDNA::flagNone(int dna_nr)
+{
+	assert(dna_nr <= (int)mCMPFlags.size());
+	return mCMPFlags[dna_nr] == FDF_NONE;
+}
+
+// ----------------------------------------------------- //
+int bDNA::getPointerSize()
+{
+	return mPtrLen;
+}
+
+// ----------------------------------------------------- //
+void bDNA::initRecurseCmpFlags(int iter)
+{
+	// iter is FDF_STRUCT_NEQU
+
+	short *oldStrc = mStructs[iter];
+	short type = oldStrc[0];
+
+	for (int i = 0; i < (int)mStructs.size(); i++)
+	{
+		if (i != iter && mCMPFlags[i] == FDF_STRUCT_EQU)
+		{
+			short *curStruct = mStructs[i];
+			int eleLen = curStruct[1];
+			curStruct += 2;
+
+			for (int j = 0; j < eleLen; j++, curStruct += 2)
+			{
+				if (curStruct[0] == type)
+				{
+					//char *name = m_Names[curStruct[1]].m_name;
+					//if (name[0] != '*')
+					if (m_Names[curStruct[1]].m_isPointer)
+					{
+						mCMPFlags[i] = FDF_STRUCT_NEQU;
+						initRecurseCmpFlags(i);
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------- //
+void bDNA::initCmpFlags(bDNA *memDNA)
+{
+	// compare the file to memory
+	// this ptr should be the file data
+
+	assert(!(m_Names.size() == 0));  // && "SDNA empty!");
+	mCMPFlags.resize(mStructs.size(), FDF_NONE);
+
+	int i;
+	for (i = 0; i < (int)mStructs.size(); i++)
+	{
+		short *oldStruct = mStructs[i];
+
+		int oldLookup = getReverseType(oldStruct[0]);
+		if (oldLookup == -1)
+		{
+			mCMPFlags[i] = FDF_NONE;
+			continue;
+		}
+		//char* typeName = mTypes[oldStruct[0]];
+
+//#define SLOW_FORWARD_COMPATIBLE 1
+#ifdef SLOW_FORWARD_COMPATIBLE
+		char *typeName = mTypes[oldLookup];
+		int newLookup = memDNA->getReverseType(typeName);
+		if (newLookup == -1)
+		{
+			mCMPFlags[i] = FDF_NONE;
+			continue;
+		}
+		short *curStruct = memDNA->mStructs[newLookup];
+#else
+		// memory for file
+
+		if (oldLookup < memDNA->mStructs.size())
+		{
+			short *curStruct = memDNA->mStructs[oldLookup];
+#endif
+
+		// rebuild...
+		mCMPFlags[i] = FDF_STRUCT_NEQU;
+
+#ifndef TEST_BACKWARD_FORWARD_COMPATIBILITY
+
+		if (curStruct[1] == oldStruct[1])
+		{
+			// type len same ...
+			if (mTlens[oldStruct[0]] == memDNA->mTlens[curStruct[0]])
+			{
+				bool isSame = true;
+				int elementLength = oldStruct[1];
+
+				curStruct += 2;
+				oldStruct += 2;
+
+				for (int j = 0; j < elementLength; j++, curStruct += 2, oldStruct += 2)
+				{
+					// type the same
+					//const char* typeFileDNA = mTypes[oldStruct[0]];
+					//const char* typeMemDNA = mTypes[curStruct[0]];
+					if (strcmp(mTypes[oldStruct[0]], memDNA->mTypes[curStruct[0]]) != 0)
+					{
+						isSame = false;
+						break;
+					}
+
+					// name the same
+					if (strcmp(m_Names[oldStruct[1]].m_name, memDNA->m_Names[curStruct[1]].m_name) != 0)
+					{
+						isSame = false;
+						break;
+					}
+				}
+				// flag valid ==
+				if (isSame)
+					mCMPFlags[i] = FDF_STRUCT_EQU;
+			}
+		}
+#endif
+	}
+}
+
+// recurse in
+for (i = 0; i < (int)mStructs.size(); i++)
+{
+	if (mCMPFlags[i] == FDF_STRUCT_NEQU)
+		initRecurseCmpFlags(i);
+}
+}
+
+static int name_is_array(char *name, int *dim1, int *dim2)
+{
+	int len = strlen(name);
+	/*fprintf(stderr,"[%s]",name);*/
+	/*if (len >= 1) {
+	if (name[len-1] != ']')
+	return 1;
+	}
+	return 0;*/
+	char *bp;
+	int num;
+	if (dim1)
+	{
+		*dim1 = 1;
+	}
+	if (dim2)
+	{
+		*dim2 = 1;
+	}
+	bp = strchr(name, '[');
+	if (!bp)
+	{
+		return 0;
+	}
+	num = 0;
+	while (++bp < name + len - 1)
+	{
+		const char c = *bp;
+		if (c == ']')
+		{
+			break;
+		}
+		if (c <= '9' && c >= '0')
+		{
+			num *= 10;
+			num += (c - '0');
+		}
+		else
+		{
+			printf("array parse error.\n");
+			return 0;
+		}
+	}
+	if (dim2)
+	{
+		*dim2 = num;
+	}
+
+	/* find second dim, if any. */
+	bp = strchr(bp, '[');
+	if (!bp)
+	{
+		return 1; /* at least we got the first dim. */
+	}
+	num = 0;
+	while (++bp < name + len - 1)
+	{
+		const char c = *bp;
+		if (c == ']')
+		{
+			break;
+		}
+		if (c <= '9' && c >= '0')
+		{
+			num *= 10;
+			num += (c - '0');
+		}
+		else
+		{
+			printf("array2 parse error.\n");
+			return 1;
+		}
+	}
+	if (dim1)
+	{
+		if (dim2)
+		{
+			*dim1 = *dim2;
+			*dim2 = num;
+		}
+		else
+		{
+			*dim1 = num;
+		}
+	}
+
+	return 1;
+}
+
+// ----------------------------------------------------- //
+void bDNA::init(char *data, int len, bool swap)
+{
+	int *intPtr = 0;
+	short *shtPtr = 0;
+	char *cp = 0;
+	int dataLen = 0;
+	//long nr=0;
+	intPtr = (int *)data;
+
+	/*
+		SDNA (4 bytes) (magic number)
+		NAME (4 bytes)
+		<nr> (4 bytes) amount of names (int)
+		<string>
+		<string>
+	*/
+
+	if (strncmp(data, "SDNA", 4) == 0)
+	{
+		// skip ++ NAME
+		intPtr++;
+		intPtr++;
+	}
+
+	// Parse names
+	if (swap)
+	{
+		*intPtr = ChunkUtils::swapInt(*intPtr);
+	}
+	dataLen = *intPtr;
+	intPtr++;
+
+	cp = (char *)intPtr;
+	int i;
+	for (i = 0; i < dataLen; i++)
+	{
+		bNameInfo info;
+		info.m_name = cp;
+		info.m_isPointer = (info.m_name[0] == '*') || (info.m_name[1] == '*');
+		name_is_array(info.m_name, &info.m_dim0, &info.m_dim1);
+		m_Names.push_back(info);
+		while (*cp) cp++;
+		cp++;
+	}
+
+	cp = b3AlignPointer(cp, 4);
+
+	/*
+		TYPE (4 bytes)
+		<nr> amount of types (int)
+		<string>
+		<string>
+	*/
+
+	intPtr = (int *)cp;
+	assert(strncmp(cp, "TYPE", 4) == 0);
+	intPtr++;
+
+	if (swap)
+	{
+		*intPtr = ChunkUtils::swapInt(*intPtr);
+	}
+	dataLen = *intPtr;
+	intPtr++;
+
+	cp = (char *)intPtr;
+	for (i = 0; i < dataLen; i++)
+	{
+		mTypes.push_back(cp);
+		while (*cp) cp++;
+		cp++;
+	}
+
+	cp = b3AlignPointer(cp, 4);
+
+	/*
+		TLEN (4 bytes)
+		<len> (short) the lengths of types
+		<len>
+	*/
+
+	// Parse type lens
+	intPtr = (int *)cp;
+	assert(strncmp(cp, "TLEN", 4) == 0);
+	intPtr++;
+
+	dataLen = (int)mTypes.size();
+
+	shtPtr = (short *)intPtr;
+	for (i = 0; i < dataLen; i++, shtPtr++)
+	{
+		if (swap)
+			shtPtr[0] = ChunkUtils::swapShort(shtPtr[0]);
+		mTlens.push_back(shtPtr[0]);
+	}
+
+	if (dataLen & 1) shtPtr++;
+
+	/*
+		STRC (4 bytes)
+		<nr> amount of structs (int)
+		<typenr>
+		<nr_of_elems>
+		<typenr>
+		<namenr>
+		<typenr>
+		<namenr>
+	*/
+
+	intPtr = (int *)shtPtr;
+	cp = (char *)intPtr;
+	assert(strncmp(cp, "STRC", 4) == 0);
+	intPtr++;
+
+	if (swap)
+	{
+		*intPtr = ChunkUtils::swapInt(*intPtr);
+	}
+	dataLen = *intPtr;
+	intPtr++;
+
+	shtPtr = (short *)intPtr;
+	for (i = 0; i < dataLen; i++)
+	{
+		mStructs.push_back(shtPtr);
+		if (swap)
+		{
+			shtPtr[0] = ChunkUtils::swapShort(shtPtr[0]);
+			shtPtr[1] = ChunkUtils::swapShort(shtPtr[1]);
+
+			int len = shtPtr[1];
+			shtPtr += 2;
+
+			for (int a = 0; a < len; a++, shtPtr += 2)
+			{
+				shtPtr[0] = ChunkUtils::swapShort(shtPtr[0]);
+				shtPtr[1] = ChunkUtils::swapShort(shtPtr[1]);
+			}
+		}
+		else
+			shtPtr += (2 * shtPtr[1]) + 2;
+	}
+
+	// build reverse lookups
+	for (i = 0; i < (int)mStructs.size(); i++)
+	{
+		short *strc = mStructs.at(i);
+		if (!mPtrLen && strcmp(mTypes[strc[0]], "ListBase") == 0)
+		{
+			mPtrLen = mTlens[strc[0]] / 2;
+		}
+
+		mStructReverse.insert(strc[0], i);
+		mTypeLookup.insert(b3HashString(mTypes[strc[0]]), i);
+	}
+}
+
+// ----------------------------------------------------- //
+int bDNA::getArraySize(char *string)
+{
+	int ret = 1;
+	int len = strlen(string);
+
+	char *next = 0;
+	for (int i = 0; i < len; i++)
+	{
+		char c = string[i];
+
+		if (c == '[')
+			next = &string[i + 1];
+		else if (c == ']')
+			if (next)
+				ret *= atoi(next);
+	}
+
+	//	print (string << ' ' << ret);
+	return ret;
+}
+
+void bDNA::dumpTypeDefinitions()
+{
+	int i;
+
+	int numTypes = mTypes.size();
+
+	for (i = 0; i < numTypes; i++)
+	{
+	}
+
+	for (i = 0; i < (int)mStructs.size(); i++)
+	{
+		int totalBytes = 0;
+		short *oldStruct = mStructs[i];
+
+		int oldLookup = getReverseType(oldStruct[0]);
+		if (oldLookup == -1)
+		{
+			mCMPFlags[i] = FDF_NONE;
+			continue;
+		}
+
+		short *newStruct = mStructs[oldLookup];
+		char *typeName = mTypes[newStruct[0]];
+		printf("%3d: %s ", i, typeName);
+
+		//char *name = mNames[oldStruct[1]];
+		int len = oldStruct[1];
+		printf(" (%d fields) ", len);
+		oldStruct += 2;
+
+		printf("{");
+		int j;
+		for (j = 0; j < len; ++j, oldStruct += 2)
+		{
+			const char *name = m_Names[oldStruct[1]].m_name;
+			printf("%s %s", mTypes[oldStruct[0]], name);
+			int elemNumBytes = 0;
+			int arrayDimensions = getArraySizeNew(oldStruct[1]);
+
+			if (m_Names[oldStruct[1]].m_isPointer)
+			{
+				elemNumBytes = VOID_IS_8 ? 8 : 4;
+			}
+			else
+			{
+				elemNumBytes = getLength(oldStruct[0]);
+			}
+			printf(" /* %d bytes */", elemNumBytes * arrayDimensions);
+
+			if (j == len - 1)
+			{
+				printf(";}");
+			}
+			else
+			{
+				printf("; ");
+			}
+			totalBytes += elemNumBytes * arrayDimensions;
+		}
+		printf("\ntotalBytes=%d\n\n", totalBytes);
+	}
+
+#if 0
+	/* dump out display of types and their sizes */
+	for (i=0; i<bf->types_count; ++i) {
+		/* if (!bf->types[i].is_struct)*/
+		{
+			printf("%3d: sizeof(%s%s)=%d",
+				i,
+				bf->types[i].is_struct ? "struct " : "atomic ",
+				bf->types[i].name, bf->types[i].size);
+			if (bf->types[i].is_struct) {
+				int j;
+				printf(", %d fields: { ", bf->types[i].fieldtypes_count);
+				for (j=0; j<bf->types[i].fieldtypes_count; ++j) {
+					printf("%s %s",
+						bf->types[bf->types[i].fieldtypes[j]].name,
+						bf->names[bf->types[i].fieldnames[j]]);
+					if (j == bf->types[i].fieldtypes_count-1) {
+						printf(";}");
+					} else {
+						printf("; ");
+					}
+				}
+			}
+			printf("\n\n");
+
+		}
+	}
+#endif
+}
+
+//eof
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.h
new file mode 100644
index 0000000..ca6004d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3DNA.h
@@ -0,0 +1,101 @@
+/*
+bParse
+Copyright (c) 2006-2009 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __BDNA_H__
+#define __BDNA_H__
+
+#include "b3Common.h"
+
+namespace bParse
+{
+struct bNameInfo
+{
+	char *m_name;
+	bool m_isPointer;
+	int m_dim0;
+	int m_dim1;
+};
+
+class bDNA
+{
+public:
+	bDNA();
+	~bDNA();
+
+	void init(char *data, int len, bool swap = false);
+
+	int getArraySize(char *str);
+	int getArraySizeNew(short name)
+	{
+		const bNameInfo &nameInfo = m_Names[name];
+		return nameInfo.m_dim0 * nameInfo.m_dim1;
+	}
+	int getElementSize(short type, short name)
+	{
+		const bNameInfo &nameInfo = m_Names[name];
+		int size = nameInfo.m_isPointer ? mPtrLen * nameInfo.m_dim0 * nameInfo.m_dim1 : mTlens[type] * nameInfo.m_dim0 * nameInfo.m_dim1;
+		return size;
+	}
+
+	int getNumNames() const
+	{
+		return m_Names.size();
+	}
+
+	char *getName(int ind);
+	char *getType(int ind);
+	short *getStruct(int ind);
+	short getLength(int ind);
+	int getReverseType(short type);
+	int getReverseType(const char *type);
+
+	int getNumStructs();
+
+	//
+	bool lessThan(bDNA *other);
+
+	void initCmpFlags(bDNA *memDNA);
+	bool flagNotEqual(int dna_nr);
+	bool flagEqual(int dna_nr);
+	bool flagNone(int dna_nr);
+
+	int getPointerSize();
+
+	void dumpTypeDefinitions();
+
+private:
+	enum FileDNAFlags
+	{
+		FDF_NONE = 0,
+		FDF_STRUCT_NEQU,
+		FDF_STRUCT_EQU
+	};
+
+	void initRecurseCmpFlags(int i);
+
+	b3AlignedObjectArray<int> mCMPFlags;
+
+	b3AlignedObjectArray<bNameInfo> m_Names;
+	b3AlignedObjectArray<char *> mTypes;
+	b3AlignedObjectArray<short *> mStructs;
+	b3AlignedObjectArray<short> mTlens;
+	b3HashMap<b3HashInt, int> mStructReverse;
+	b3HashMap<b3HashString, int> mTypeLookup;
+
+	int mPtrLen;
+};
+}  // namespace bParse
+
+#endif  //__BDNA_H__
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Defines.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Defines.h
new file mode 100644
index 0000000..0524c94
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Defines.h
@@ -0,0 +1,149 @@
+/* Copyright (C) 2006-2009 Charlie C & Erwin Coumans http://gamekit.googlecode.com
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef __B_DEFINES_H__
+#define __B_DEFINES_H__
+
+// MISC defines, see BKE_global.h, BKE_utildefines.h
+#define B3_SIZEOFBLENDERHEADER 12
+
+// ------------------------------------------------------------
+#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined(__PPC__) || defined(__ppc__) || defined(__BIG_ENDIAN__)
+#define B3_MAKE_ID(a, b, c, d) ((int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d))
+#else
+#define B3_MAKE_ID(a, b, c, d) ((int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a))
+#endif
+
+// ------------------------------------------------------------
+#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined(__PPC__) || defined(__ppc__) || defined(__BIG_ENDIAN__)
+#define B3_MAKE_ID2(c, d) ((c) << 8 | (d))
+#else
+#define B3_MAKE_ID2(c, d) ((d) << 8 | (c))
+#endif
+
+// ------------------------------------------------------------
+#define B3_ID_SCE B3_MAKE_ID2('S', 'C')
+#define B3_ID_LI B3_MAKE_ID2('L', 'I')
+#define B3_ID_OB B3_MAKE_ID2('O', 'B')
+#define B3_ID_ME B3_MAKE_ID2('M', 'E')
+#define B3_ID_CU B3_MAKE_ID2('C', 'U')
+#define B3_ID_MB B3_MAKE_ID2('M', 'B')
+#define B3_ID_MA B3_MAKE_ID2('M', 'A')
+#define B3_ID_TE B3_MAKE_ID2('T', 'E')
+#define B3_ID_IM B3_MAKE_ID2('I', 'M')
+#define B3_ID_IK B3_MAKE_ID2('I', 'K')
+#define B3_ID_WV B3_MAKE_ID2('W', 'V')
+#define B3_ID_LT B3_MAKE_ID2('L', 'T')
+#define B3_ID_SE B3_MAKE_ID2('S', 'E')
+#define B3_ID_LF B3_MAKE_ID2('L', 'F')
+#define B3_ID_LA B3_MAKE_ID2('L', 'A')
+#define B3_ID_CA B3_MAKE_ID2('C', 'A')
+#define B3_ID_IP B3_MAKE_ID2('I', 'P')
+#define B3_ID_KE B3_MAKE_ID2('K', 'E')
+#define B3_ID_WO B3_MAKE_ID2('W', 'O')
+#define B3_ID_SCR B3_MAKE_ID2('S', 'R')
+#define B3_ID_VF B3_MAKE_ID2('V', 'F')
+#define B3_ID_TXT B3_MAKE_ID2('T', 'X')
+#define B3_ID_SO B3_MAKE_ID2('S', 'O')
+#define B3_ID_SAMPLE B3_MAKE_ID2('S', 'A')
+#define B3_ID_GR B3_MAKE_ID2('G', 'R')
+#define B3_ID_ID B3_MAKE_ID2('I', 'D')
+#define B3_ID_AR B3_MAKE_ID2('A', 'R')
+#define B3_ID_AC B3_MAKE_ID2('A', 'C')
+#define B3_ID_SCRIPT B3_MAKE_ID2('P', 'Y')
+#define B3_ID_FLUIDSIM B3_MAKE_ID2('F', 'S')
+#define B3_ID_NT B3_MAKE_ID2('N', 'T')
+#define B3_ID_BR B3_MAKE_ID2('B', 'R')
+
+#define B3_ID_SEQ B3_MAKE_ID2('S', 'Q')
+#define B3_ID_CO B3_MAKE_ID2('C', 'O')
+#define B3_ID_PO B3_MAKE_ID2('A', 'C')
+#define B3_ID_NLA B3_MAKE_ID2('N', 'L')
+
+#define B3_ID_VS B3_MAKE_ID2('V', 'S')
+#define B3_ID_VN B3_MAKE_ID2('V', 'N')
+
+// ------------------------------------------------------------
+#define B3_FORM B3_MAKE_ID('F', 'O', 'R', 'M')
+#define B3_DDG1 B3_MAKE_ID('3', 'D', 'G', '1')
+#define B3_DDG2 B3_MAKE_ID('3', 'D', 'G', '2')
+#define B3_DDG3 B3_MAKE_ID('3', 'D', 'G', '3')
+#define B3_DDG4 B3_MAKE_ID('3', 'D', 'G', '4')
+#define B3_GOUR B3_MAKE_ID('G', 'O', 'U', 'R')
+#define B3_BLEN B3_MAKE_ID('B', 'L', 'E', 'N')
+#define B3_DER_ B3_MAKE_ID('D', 'E', 'R', '_')
+#define B3_V100 B3_MAKE_ID('V', '1', '0', '0')
+#define B3_DATA B3_MAKE_ID('D', 'A', 'T', 'A')
+#define B3_GLOB B3_MAKE_ID('G', 'L', 'O', 'B')
+#define B3_IMAG B3_MAKE_ID('I', 'M', 'A', 'G')
+#define B3_TEST B3_MAKE_ID('T', 'E', 'S', 'T')
+#define B3_USER B3_MAKE_ID('U', 'S', 'E', 'R')
+
+// ------------------------------------------------------------
+#define B3_DNA1 B3_MAKE_ID('D', 'N', 'A', '1')
+#define B3_REND B3_MAKE_ID('R', 'E', 'N', 'D')
+#define B3_ENDB B3_MAKE_ID('E', 'N', 'D', 'B')
+#define B3_NAME B3_MAKE_ID('N', 'A', 'M', 'E')
+#define B3_SDNA B3_MAKE_ID('S', 'D', 'N', 'A')
+#define B3_TYPE B3_MAKE_ID('T', 'Y', 'P', 'E')
+#define B3_TLEN B3_MAKE_ID('T', 'L', 'E', 'N')
+#define B3_STRC B3_MAKE_ID('S', 'T', 'R', 'C')
+
+// ------------------------------------------------------------
+#define B3_SWITCH_INT(a)    \
+	{                       \
+		char s_i, *p_i;     \
+		p_i = (char *)&(a); \
+		s_i = p_i[0];       \
+		p_i[0] = p_i[3];    \
+		p_i[3] = s_i;       \
+		s_i = p_i[1];       \
+		p_i[1] = p_i[2];    \
+		p_i[2] = s_i;       \
+	}
+
+// ------------------------------------------------------------
+#define B3_SWITCH_SHORT(a)  \
+	{                       \
+		char s_i, *p_i;     \
+		p_i = (char *)&(a); \
+		s_i = p_i[0];       \
+		p_i[0] = p_i[1];    \
+		p_i[1] = s_i;       \
+	}
+
+// ------------------------------------------------------------
+#define B3_SWITCH_LONGINT(a) \
+	{                        \
+		char s_i, *p_i;      \
+		p_i = (char *)&(a);  \
+		s_i = p_i[0];        \
+		p_i[0] = p_i[7];     \
+		p_i[7] = s_i;        \
+		s_i = p_i[1];        \
+		p_i[1] = p_i[6];     \
+		p_i[6] = s_i;        \
+		s_i = p_i[2];        \
+		p_i[2] = p_i[5];     \
+		p_i[5] = s_i;        \
+		s_i = p_i[3];        \
+		p_i[3] = p_i[4];     \
+		p_i[4] = s_i;        \
+	}
+
+#endif  //__B_DEFINES_H__
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp
new file mode 100644
index 0000000..f6c779a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp
@@ -0,0 +1,1653 @@
+/*
+bParse
+Copyright (c) 2006-2009 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#include "b3File.h"
+#include "b3Common.h"
+#include "b3Chunk.h"
+#include "b3DNA.h"
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include "b3Defines.h"
+#include "Bullet3Serialize/Bullet2FileLoader/b3Serializer.h"
+#include "Bullet3Common/b3AlignedAllocator.h"
+#include "Bullet3Common/b3MinMax.h"
+
+#define B3_SIZEOFBLENDERHEADER 12
+#define MAX_ARRAY_LENGTH 512
+using namespace bParse;
+#define MAX_STRLEN 1024
+
+const char *getCleanName(const char *memName, char *buffer)
+{
+	int slen = strlen(memName);
+	assert(slen < MAX_STRLEN);
+	slen = b3Min(slen, MAX_STRLEN);
+	for (int i = 0; i < slen; i++)
+	{
+		if (memName[i] == ']' || memName[i] == '[')
+		{
+			buffer[i] = 0;  //'_';
+		}
+		else
+		{
+			buffer[i] = memName[i];
+		}
+	}
+	buffer[slen] = 0;
+	return buffer;
+}
+
+// ----------------------------------------------------- //
+bFile::bFile(const char *filename, const char headerString[7])
+	: mOwnsBuffer(true),
+	  mFileBuffer(0),
+	  mFileLen(0),
+	  mVersion(0),
+	  mDataStart(0),
+	  mFileDNA(0),
+	  mMemoryDNA(0),
+	  mFlags(FD_INVALID)
+{
+	for (int i = 0; i < 7; i++)
+	{
+		m_headerString[i] = headerString[i];
+	}
+
+	FILE *fp = fopen(filename, "rb");
+	if (fp)
+	{
+		fseek(fp, 0L, SEEK_END);
+		mFileLen = ftell(fp);
+		fseek(fp, 0L, SEEK_SET);
+
+		mFileBuffer = (char *)malloc(mFileLen + 1);
+		int bytesRead;
+		bytesRead = fread(mFileBuffer, mFileLen, 1, fp);
+
+		fclose(fp);
+
+		//
+		parseHeader();
+	}
+}
+
+// ----------------------------------------------------- //
+bFile::bFile(char *memoryBuffer, int len, const char headerString[7])
+	: mOwnsBuffer(false),
+	  mFileBuffer(0),
+	  mFileLen(0),
+	  mVersion(0),
+	  mDataStart(0),
+	  mFileDNA(0),
+	  mMemoryDNA(0),
+	  mFlags(FD_INVALID)
+{
+	for (int i = 0; i < 7; i++)
+	{
+		m_headerString[i] = headerString[i];
+	}
+	mFileBuffer = memoryBuffer;
+	mFileLen = len;
+
+	parseHeader();
+}
+
+// ----------------------------------------------------- //
+bFile::~bFile()
+{
+	if (mOwnsBuffer && mFileBuffer)
+	{
+		free(mFileBuffer);
+		mFileBuffer = 0;
+	}
+
+	delete mMemoryDNA;
+	delete mFileDNA;
+}
+
+// ----------------------------------------------------- //
+void bFile::parseHeader()
+{
+	if (!mFileLen || !mFileBuffer)
+		return;
+
+	char *blenderBuf = mFileBuffer;
+	char header[B3_SIZEOFBLENDERHEADER + 1];
+	memcpy(header, blenderBuf, B3_SIZEOFBLENDERHEADER);
+	header[B3_SIZEOFBLENDERHEADER] = '\0';
+
+	if (strncmp(header, m_headerString, 6) != 0)
+	{
+		memcpy(header, m_headerString, B3_SIZEOFBLENDERHEADER);
+		return;
+	}
+
+	if (header[6] == 'd')
+	{
+		mFlags |= FD_DOUBLE_PRECISION;
+	}
+
+	char *ver = header + 9;
+	mVersion = atoi(ver);
+	if (mVersion <= 241)
+	{
+		//printf("Warning, %d not fully tested : <= 242\n", mVersion);
+	}
+
+	int littleEndian = 1;
+	littleEndian = ((char *)&littleEndian)[0];
+
+	// swap ptr sizes...
+	if (header[7] == '-')
+	{
+		mFlags |= FD_FILE_64;
+		if (!VOID_IS_8)
+			mFlags |= FD_BITS_VARIES;
+	}
+	else if (VOID_IS_8)
+		mFlags |= FD_BITS_VARIES;
+
+	// swap endian...
+	if (header[8] == 'V')
+	{
+		if (littleEndian == 1)
+			mFlags |= FD_ENDIAN_SWAP;
+	}
+	else if (littleEndian == 0)
+		mFlags |= FD_ENDIAN_SWAP;
+
+	mFlags |= FD_OK;
+}
+
+// ----------------------------------------------------- //
+bool bFile::ok()
+{
+	return (mFlags & FD_OK) != 0;
+}
+
+// ----------------------------------------------------- //
+void bFile::parseInternal(int verboseMode, char *memDna, int memDnaLength)
+{
+	if ((mFlags & FD_OK) == 0)
+		return;
+
+	char *blenderData = mFileBuffer;
+	bChunkInd dna;
+	dna.oldPtr = 0;
+
+	char *tempBuffer = blenderData;
+	for (int i = 0; i < mFileLen; i++)
+	{
+		// looking for the data's starting position
+		// and the start of SDNA decls
+
+		if (!mDataStart && strncmp(tempBuffer, "REND", 4) == 0)
+			mDataStart = i;
+
+		if (strncmp(tempBuffer, "DNA1", 4) == 0)
+		{
+			// read the DNA1 block and extract SDNA
+			if (getNextBlock(&dna, tempBuffer, mFlags) > 0)
+			{
+				if (strncmp((tempBuffer + ChunkUtils::getOffset(mFlags)), "SDNANAME", 8) == 0)
+					dna.oldPtr = (tempBuffer + ChunkUtils::getOffset(mFlags));
+				else
+					dna.oldPtr = 0;
+			}
+			else
+				dna.oldPtr = 0;
+		}
+		// Some Bullet files are missing the DNA1 block
+		// In Blender it's DNA1 + ChunkUtils::getOffset() + SDNA + NAME
+		// In Bullet tests its SDNA + NAME
+		else if (strncmp(tempBuffer, "SDNANAME", 8) == 0)
+		{
+			dna.oldPtr = blenderData + i;
+			dna.len = mFileLen - i;
+
+			// Also no REND block, so exit now.
+			if (mVersion == 276) break;
+		}
+
+		if (mDataStart && dna.oldPtr) break;
+		tempBuffer++;
+	}
+	if (!dna.oldPtr || !dna.len)
+	{
+		//printf("Failed to find DNA1+SDNA pair\n");
+		mFlags &= ~FD_OK;
+		return;
+	}
+
+	mFileDNA = new bDNA();
+
+	///mFileDNA->init will convert part of DNA file endianness to current CPU endianness if necessary
+	mFileDNA->init((char *)dna.oldPtr, dna.len, (mFlags & FD_ENDIAN_SWAP) != 0);
+
+	if (mVersion == 276)
+	{
+		int i;
+		for (i = 0; i < mFileDNA->getNumNames(); i++)
+		{
+			if (strcmp(mFileDNA->getName(i), "int") == 0)
+			{
+				mFlags |= FD_BROKEN_DNA;
+			}
+		}
+		if ((mFlags & FD_BROKEN_DNA) != 0)
+		{
+			//printf("warning: fixing some broken DNA version\n");
+		}
+	}
+
+	if (verboseMode & FD_VERBOSE_DUMP_DNA_TYPE_DEFINITIONS)
+		mFileDNA->dumpTypeDefinitions();
+
+	mMemoryDNA = new bDNA();
+	int littleEndian = 1;
+	littleEndian = ((char *)&littleEndian)[0];
+
+	mMemoryDNA->init(memDna, memDnaLength, littleEndian == 0);
+
+	///@todo we need a better version check, add version/sub version info from FileGlobal into memory DNA/header files
+	if (mMemoryDNA->getNumNames() != mFileDNA->getNumNames())
+	{
+		mFlags |= FD_VERSION_VARIES;
+		//printf ("Warning, file DNA is different than built in, performance is reduced. Best to re-export file with a matching version/platform");
+	}
+
+	// as long as it kept up to date it will be ok!!
+	if (mMemoryDNA->lessThan(mFileDNA))
+	{
+		//printf ("Warning, file DNA is newer than built in.");
+	}
+
+	mFileDNA->initCmpFlags(mMemoryDNA);
+
+	parseData();
+
+	resolvePointers(verboseMode);
+
+	updateOldPointers();
+}
+
+// ----------------------------------------------------- //
+void bFile::swap(char *head, bChunkInd &dataChunk, bool ignoreEndianFlag)
+{
+	char *data = head;
+	short *strc = mFileDNA->getStruct(dataChunk.dna_nr);
+
+	const char s[] = "SoftBodyMaterialData";
+	int szs = sizeof(s);
+	if (strncmp((char *)&dataChunk.code, "ARAY", 4) == 0)
+	{
+		short *oldStruct = mFileDNA->getStruct(dataChunk.dna_nr);
+		char *oldType = mFileDNA->getType(oldStruct[0]);
+		if (strncmp(oldType, s, szs) == 0)
+		{
+			return;
+		}
+	}
+
+	int len = mFileDNA->getLength(strc[0]);
+
+	for (int i = 0; i < dataChunk.nr; i++)
+	{
+		swapStruct(dataChunk.dna_nr, data, ignoreEndianFlag);
+		data += len;
+	}
+}
+
+void bFile::swapLen(char *dataPtr)
+{
+	const bool VOID_IS_8 = ((sizeof(void *) == 8));
+	if (VOID_IS_8)
+	{
+		if (mFlags & FD_BITS_VARIES)
+		{
+			bChunkPtr4 *c = (bChunkPtr4 *)dataPtr;
+			if ((c->code & 0xFFFF) == 0)
+				c->code >>= 16;
+			B3_SWITCH_INT(c->len);
+			B3_SWITCH_INT(c->dna_nr);
+			B3_SWITCH_INT(c->nr);
+		}
+		else
+		{
+			bChunkPtr8 *c = (bChunkPtr8 *)dataPtr;
+			if ((c->code & 0xFFFF) == 0)
+				c->code >>= 16;
+			B3_SWITCH_INT(c->len);
+			B3_SWITCH_INT(c->dna_nr);
+			B3_SWITCH_INT(c->nr);
+		}
+	}
+	else
+	{
+		if (mFlags & FD_BITS_VARIES)
+		{
+			bChunkPtr8 *c = (bChunkPtr8 *)dataPtr;
+			if ((c->code & 0xFFFF) == 0)
+				c->code >>= 16;
+			B3_SWITCH_INT(c->len);
+			B3_SWITCH_INT(c->dna_nr);
+			B3_SWITCH_INT(c->nr);
+		}
+		else
+		{
+			bChunkPtr4 *c = (bChunkPtr4 *)dataPtr;
+			if ((c->code & 0xFFFF) == 0)
+				c->code >>= 16;
+			B3_SWITCH_INT(c->len);
+
+			B3_SWITCH_INT(c->dna_nr);
+			B3_SWITCH_INT(c->nr);
+		}
+	}
+}
+
+void bFile::swapDNA(char *ptr)
+{
+	bool swap = ((mFlags & FD_ENDIAN_SWAP) != 0);
+
+	char *data = &ptr[20];
+	//	void bDNA::init(char *data, int len, bool swap)
+	int *intPtr = 0;
+	short *shtPtr = 0;
+	char *cp = 0;
+	int dataLen = 0;
+	//long nr=0;
+	intPtr = (int *)data;
+
+	/*
+		SDNA (4 bytes) (magic number)
+		NAME (4 bytes)
+		<nr> (4 bytes) amount of names (int)
+		<string>
+		<string>
+	*/
+
+	if (strncmp(data, "SDNA", 4) == 0)
+	{
+		// skip ++ NAME
+		intPtr++;
+		intPtr++;
+	}
+
+	// Parse names
+	if (swap)
+		dataLen = ChunkUtils::swapInt(*intPtr);
+	else
+		dataLen = *intPtr;
+
+	*intPtr = ChunkUtils::swapInt(*intPtr);
+	intPtr++;
+
+	cp = (char *)intPtr;
+	int i;
+	for (i = 0; i < dataLen; i++)
+	{
+		while (*cp) cp++;
+		cp++;
+	}
+
+	cp = b3AlignPointer(cp, 4);
+
+	/*
+		TYPE (4 bytes)
+		<nr> amount of types (int)
+		<string>
+		<string>
+	*/
+
+	intPtr = (int *)cp;
+	assert(strncmp(cp, "TYPE", 4) == 0);
+	intPtr++;
+
+	if (swap)
+		dataLen = ChunkUtils::swapInt(*intPtr);
+	else
+		dataLen = *intPtr;
+
+	*intPtr = ChunkUtils::swapInt(*intPtr);
+
+	intPtr++;
+
+	cp = (char *)intPtr;
+	for (i = 0; i < dataLen; i++)
+	{
+		while (*cp) cp++;
+		cp++;
+	}
+
+	cp = b3AlignPointer(cp, 4);
+
+	/*
+		TLEN (4 bytes)
+		<len> (short) the lengths of types
+		<len>
+	*/
+
+	// Parse type lens
+	intPtr = (int *)cp;
+	assert(strncmp(cp, "TLEN", 4) == 0);
+	intPtr++;
+
+	shtPtr = (short *)intPtr;
+	for (i = 0; i < dataLen; i++, shtPtr++)
+	{
+		//??????if (swap)
+		shtPtr[0] = ChunkUtils::swapShort(shtPtr[0]);
+	}
+
+	if (dataLen & 1)
+		shtPtr++;
+
+	/*
+		STRC (4 bytes)
+		<nr> amount of structs (int)
+		<typenr>
+		<nr_of_elems>
+		<typenr>
+		<namenr>
+		<typenr>
+		<namenr>
+	*/
+
+	intPtr = (int *)shtPtr;
+	cp = (char *)intPtr;
+	assert(strncmp(cp, "STRC", 4) == 0);
+	intPtr++;
+
+	if (swap)
+		dataLen = ChunkUtils::swapInt(*intPtr);
+	else
+		dataLen = *intPtr;
+
+	*intPtr = ChunkUtils::swapInt(*intPtr);
+
+	intPtr++;
+
+	shtPtr = (short *)intPtr;
+	for (i = 0; i < dataLen; i++)
+	{
+		//if (swap)
+		{
+			int len = shtPtr[1];
+
+			shtPtr[0] = ChunkUtils::swapShort(shtPtr[0]);
+			shtPtr[1] = ChunkUtils::swapShort(shtPtr[1]);
+
+			shtPtr += 2;
+
+			for (int a = 0; a < len; a++, shtPtr += 2)
+			{
+				shtPtr[0] = ChunkUtils::swapShort(shtPtr[0]);
+				shtPtr[1] = ChunkUtils::swapShort(shtPtr[1]);
+			}
+		}
+		//		else
+		//			shtPtr+= (2*shtPtr[1])+2;
+	}
+}
+
+void bFile::writeFile(const char *fileName)
+{
+	FILE *f = fopen(fileName, "wb");
+	fwrite(mFileBuffer, 1, mFileLen, f);
+	fclose(f);
+}
+
+void bFile::preSwap()
+{
+	//const bool brokenDNA = (mFlags&FD_BROKEN_DNA)!=0;
+	//FD_ENDIAN_SWAP
+	//byte 8 determines the endianness of the file, little (v) versus big (V)
+	int littleEndian = 1;
+	littleEndian = ((char *)&littleEndian)[0];
+
+	if (mFileBuffer[8] == 'V')
+	{
+		mFileBuffer[8] = 'v';
+	}
+	else
+	{
+		mFileBuffer[8] = 'V';
+	}
+
+	mDataStart = 12;
+
+	char *dataPtr = mFileBuffer + mDataStart;
+
+	bChunkInd dataChunk;
+	dataChunk.code = 0;
+	bool ignoreEndianFlag = true;
+
+	//we always want to swap here
+
+	int seek = getNextBlock(&dataChunk, dataPtr, mFlags);
+	//dataPtr += ChunkUtils::getOffset(mFlags);
+	char *dataPtrHead = 0;
+
+	while (1)
+	{
+		// one behind
+		if (dataChunk.code == B3_SDNA || dataChunk.code == B3_DNA1 || dataChunk.code == B3_TYPE || dataChunk.code == B3_TLEN || dataChunk.code == B3_STRC)
+		{
+			swapDNA(dataPtr);
+			break;
+		}
+		else
+		{
+			//if (dataChunk.code == DNA1) break;
+			dataPtrHead = dataPtr + ChunkUtils::getOffset(mFlags);
+
+			swapLen(dataPtr);
+			if (dataChunk.dna_nr >= 0)
+			{
+				swap(dataPtrHead, dataChunk, ignoreEndianFlag);
+			}
+			else
+			{
+				//printf("unknown chunk\n");
+			}
+		}
+
+		// next please!
+		dataPtr += seek;
+
+		seek = getNextBlock(&dataChunk, dataPtr, mFlags);
+		if (seek < 0)
+			break;
+	}
+
+	if (mFlags & FD_ENDIAN_SWAP)
+	{
+		mFlags &= ~FD_ENDIAN_SWAP;
+	}
+	else
+	{
+		mFlags |= FD_ENDIAN_SWAP;
+	}
+}
+
+// ----------------------------------------------------- //
+char *bFile::readStruct(char *head, bChunkInd &dataChunk)
+{
+	bool ignoreEndianFlag = false;
+
+	if (mFlags & FD_ENDIAN_SWAP)
+		swap(head, dataChunk, ignoreEndianFlag);
+
+	if (!mFileDNA->flagEqual(dataChunk.dna_nr))
+	{
+		// Ouch! need to rebuild the struct
+		short *oldStruct, *curStruct;
+		char *oldType, *newType;
+		int oldLen, curLen, reverseOld;
+
+		oldStruct = mFileDNA->getStruct(dataChunk.dna_nr);
+		oldType = mFileDNA->getType(oldStruct[0]);
+
+		oldLen = mFileDNA->getLength(oldStruct[0]);
+
+		if ((mFlags & FD_BROKEN_DNA) != 0)
+		{
+			if ((strcmp(oldType, "b3QuantizedBvhNodeData") == 0) && oldLen == 20)
+			{
+				return 0;
+			}
+			if ((strcmp(oldType, "b3ShortIntIndexData") == 0))
+			{
+				int allocLen = 2;
+				char *dataAlloc = new char[(dataChunk.nr * allocLen) + 1];
+				memset(dataAlloc, 0, (dataChunk.nr * allocLen) + 1);
+				short *dest = (short *)dataAlloc;
+				const short *src = (short *)head;
+				for (int i = 0; i < dataChunk.nr; i++)
+				{
+					dest[i] = src[i];
+					if (mFlags & FD_ENDIAN_SWAP)
+					{
+						B3_SWITCH_SHORT(dest[i]);
+					}
+				}
+				addDataBlock(dataAlloc);
+				return dataAlloc;
+			}
+		}
+
+		///don't try to convert Link block data, just memcpy it. Other data can be converted.
+		if (strcmp("Link", oldType) != 0)
+		{
+			reverseOld = mMemoryDNA->getReverseType(oldType);
+
+			if ((reverseOld != -1))
+			{
+				// make sure it's here
+				//assert(reverseOld!= -1 && "getReverseType() returned -1, struct required!");
+
+				//
+				curStruct = mMemoryDNA->getStruct(reverseOld);
+				newType = mMemoryDNA->getType(curStruct[0]);
+				curLen = mMemoryDNA->getLength(curStruct[0]);
+
+				// make sure it's the same
+				assert((strcmp(oldType, newType) == 0) && "internal error, struct mismatch!");
+
+				// numBlocks * length
+
+				int allocLen = (curLen);
+				char *dataAlloc = new char[(dataChunk.nr * allocLen) + 1];
+				memset(dataAlloc, 0, (dataChunk.nr * allocLen));
+
+				// track allocated
+				addDataBlock(dataAlloc);
+
+				char *cur = dataAlloc;
+				char *old = head;
+				for (int block = 0; block < dataChunk.nr; block++)
+				{
+					bool fixupPointers = true;
+					parseStruct(cur, old, dataChunk.dna_nr, reverseOld, fixupPointers);
+					mLibPointers.insert(old, (bStructHandle *)cur);
+
+					cur += curLen;
+					old += oldLen;
+				}
+				return dataAlloc;
+			}
+		}
+		else
+		{
+			//printf("Link found\n");
+		}
+	}
+	else
+	{
+//#define DEBUG_EQUAL_STRUCTS
+#ifdef DEBUG_EQUAL_STRUCTS
+		short *oldStruct;
+		char *oldType;
+		oldStruct = mFileDNA->getStruct(dataChunk.dna_nr);
+		oldType = mFileDNA->getType(oldStruct[0]);
+		printf("%s equal structure, just memcpy\n", oldType);
+#endif  //
+	}
+
+	char *dataAlloc = new char[(dataChunk.len) + 1];
+	memset(dataAlloc, 0, dataChunk.len + 1);
+
+	// track allocated
+	addDataBlock(dataAlloc);
+
+	memcpy(dataAlloc, head, dataChunk.len);
+	return dataAlloc;
+}
+
+// ----------------------------------------------------- //
+void bFile::parseStruct(char *strcPtr, char *dtPtr, int old_dna, int new_dna, bool fixupPointers)
+{
+	if (old_dna == -1) return;
+	if (new_dna == -1) return;
+
+	//disable this, because we need to fixup pointers/ListBase
+	if (0)  //mFileDNA->flagEqual(old_dna))
+	{
+		short *strc = mFileDNA->getStruct(old_dna);
+		int len = mFileDNA->getLength(strc[0]);
+
+		memcpy(strcPtr, dtPtr, len);
+		return;
+	}
+
+	// Ok, now build the struct
+	char *memType, *memName, *cpc, *cpo;
+	short *fileStruct, *filePtrOld, *memoryStruct, *firstStruct;
+	int elementLength, size, revType, old_nr, new_nr, fpLen;
+	short firstStructType;
+
+	// File to memory lookup
+	memoryStruct = mMemoryDNA->getStruct(new_dna);
+	fileStruct = mFileDNA->getStruct(old_dna);
+	firstStruct = fileStruct;
+
+	filePtrOld = fileStruct;
+	firstStructType = mMemoryDNA->getStruct(0)[0];
+
+	// Get number of elements
+	elementLength = memoryStruct[1];
+	memoryStruct += 2;
+
+	cpc = strcPtr;
+	cpo = 0;
+	for (int ele = 0; ele < elementLength; ele++, memoryStruct += 2)
+	{
+		memType = mMemoryDNA->getType(memoryStruct[0]);
+		memName = mMemoryDNA->getName(memoryStruct[1]);
+
+		size = mMemoryDNA->getElementSize(memoryStruct[0], memoryStruct[1]);
+		revType = mMemoryDNA->getReverseType(memoryStruct[0]);
+
+		if (revType != -1 && memoryStruct[0] >= firstStructType && memName[0] != '*')
+		{
+			cpo = getFileElement(firstStruct, memName, memType, dtPtr, &filePtrOld);
+			if (cpo)
+			{
+				int arrayLen = mFileDNA->getArraySizeNew(filePtrOld[1]);
+				old_nr = mFileDNA->getReverseType(memType);
+				new_nr = revType;
+				fpLen = mFileDNA->getElementSize(filePtrOld[0], filePtrOld[1]);
+				if (arrayLen == 1)
+				{
+					parseStruct(cpc, cpo, old_nr, new_nr, fixupPointers);
+				}
+				else
+				{
+					char *tmpCpc = cpc;
+					char *tmpCpo = cpo;
+
+					for (int i = 0; i < arrayLen; i++)
+					{
+						parseStruct(tmpCpc, tmpCpo, old_nr, new_nr, fixupPointers);
+						tmpCpc += size / arrayLen;
+						tmpCpo += fpLen / arrayLen;
+					}
+				}
+				cpc += size;
+				cpo += fpLen;
+			}
+			else
+				cpc += size;
+		}
+		else
+		{
+			getMatchingFileDNA(fileStruct, memName, memType, cpc, dtPtr, fixupPointers);
+			cpc += size;
+		}
+	}
+}
+
+// ----------------------------------------------------- //
+static void getElement(int arrayLen, const char *cur, const char *old, char *oldPtr, char *curData)
+{
+#define b3GetEle(value, current, type, cast, size, ptr) \
+	if (strcmp(current, type) == 0)                     \
+	{                                                   \
+		value = (*(cast *)ptr);                         \
+		ptr += size;                                    \
+	}
+
+#define b3SetEle(value, current, type, cast, size, ptr) \
+	if (strcmp(current, type) == 0)                     \
+	{                                                   \
+		(*(cast *)ptr) = (cast)value;                   \
+		ptr += size;                                    \
+	}
+	double value = 0.0;
+
+	for (int i = 0; i < arrayLen; i++)
+	{
+		b3GetEle(value, old, "char", char, sizeof(char), oldPtr);
+		b3SetEle(value, cur, "char", char, sizeof(char), curData);
+		b3GetEle(value, old, "short", short, sizeof(short), oldPtr);
+		b3SetEle(value, cur, "short", short, sizeof(short), curData);
+		b3GetEle(value, old, "ushort", unsigned short, sizeof(unsigned short), oldPtr);
+		b3SetEle(value, cur, "ushort", unsigned short, sizeof(unsigned short), curData);
+		b3GetEle(value, old, "int", int, sizeof(int), oldPtr);
+		b3SetEle(value, cur, "int", int, sizeof(int), curData);
+		b3GetEle(value, old, "long", int, sizeof(int), oldPtr);
+		b3SetEle(value, cur, "long", int, sizeof(int), curData);
+		b3GetEle(value, old, "float", float, sizeof(float), oldPtr);
+		b3SetEle(value, cur, "float", float, sizeof(float), curData);
+		b3GetEle(value, old, "double", double, sizeof(double), oldPtr);
+		b3SetEle(value, cur, "double", double, sizeof(double), curData);
+	}
+}
+
+// ----------------------------------------------------- //
+void bFile::swapData(char *data, short type, int arraySize, bool ignoreEndianFlag)
+{
+	if (ignoreEndianFlag || (mFlags & FD_ENDIAN_SWAP))
+	{
+		if (type == 2 || type == 3)
+		{
+			short *sp = (short *)data;
+			for (int i = 0; i < arraySize; i++)
+			{
+				sp[0] = ChunkUtils::swapShort(sp[0]);
+				sp++;
+			}
+		}
+		if (type > 3 && type < 8)
+		{
+			char c;
+			char *cp = data;
+			for (int i = 0; i < arraySize; i++)
+			{
+				c = cp[0];
+				cp[0] = cp[3];
+				cp[3] = c;
+				c = cp[1];
+				cp[1] = cp[2];
+				cp[2] = c;
+				cp += 4;
+			}
+		}
+	}
+}
+
+void bFile::safeSwapPtr(char *dst, const char *src)
+{
+	if (!src || !dst)
+		return;
+
+	int ptrFile = mFileDNA->getPointerSize();
+	int ptrMem = mMemoryDNA->getPointerSize();
+
+	if (ptrFile == ptrMem)
+	{
+		memcpy(dst, src, ptrMem);
+	}
+	else if (ptrMem == 4 && ptrFile == 8)
+	{
+		b3PointerUid *oldPtr = (b3PointerUid *)src;
+		b3PointerUid *newPtr = (b3PointerUid *)dst;
+
+		if (oldPtr->m_uniqueIds[0] == oldPtr->m_uniqueIds[1])
+		{
+			//Bullet stores the 32bit unique ID in both upper and lower part of 64bit pointers
+			//so it can be used to distinguish between .blend and .bullet
+			newPtr->m_uniqueIds[0] = oldPtr->m_uniqueIds[0];
+		}
+		else
+		{
+			//deal with pointers the Blender .blend style way, see
+			//readfile.c in the Blender source tree
+			b3Long64 longValue = *((b3Long64 *)src);
+			//endian swap for 64bit pointer otherwise truncation will fail due to trailing zeros
+			if (mFlags & FD_ENDIAN_SWAP)
+				B3_SWITCH_LONGINT(longValue);
+			*((int *)dst) = (int)(longValue >> 3);
+		}
+	}
+	else if (ptrMem == 8 && ptrFile == 4)
+	{
+		b3PointerUid *oldPtr = (b3PointerUid *)src;
+		b3PointerUid *newPtr = (b3PointerUid *)dst;
+		if (oldPtr->m_uniqueIds[0] == oldPtr->m_uniqueIds[1])
+		{
+			newPtr->m_uniqueIds[0] = oldPtr->m_uniqueIds[0];
+			newPtr->m_uniqueIds[1] = 0;
+		}
+		else
+		{
+			*((b3Long64 *)dst) = *((int *)src);
+		}
+	}
+	else
+	{
+		printf("%d %d\n", ptrFile, ptrMem);
+		assert(0 && "Invalid pointer len");
+	}
+}
+
+// ----------------------------------------------------- //
+void bFile::getMatchingFileDNA(short *dna_addr, const char *lookupName, const char *lookupType, char *strcData, char *data, bool fixupPointers)
+{
+	// find the matching memory dna data
+	// to the file being loaded. Fill the
+	// memory with the file data...
+
+	int len = dna_addr[1];
+	dna_addr += 2;
+
+	for (int i = 0; i < len; i++, dna_addr += 2)
+	{
+		const char *type = mFileDNA->getType(dna_addr[0]);
+		const char *name = mFileDNA->getName(dna_addr[1]);
+
+		int eleLen = mFileDNA->getElementSize(dna_addr[0], dna_addr[1]);
+
+		if ((mFlags & FD_BROKEN_DNA) != 0)
+		{
+			if ((strcmp(type, "short") == 0) && (strcmp(name, "int") == 0))
+			{
+				eleLen = 0;
+			}
+		}
+
+		if (strcmp(lookupName, name) == 0)
+		{
+			//int arrayLenold = mFileDNA->getArraySize((char*)name.c_str());
+			int arrayLen = mFileDNA->getArraySizeNew(dna_addr[1]);
+			//assert(arrayLenold == arrayLen);
+
+			if (name[0] == '*')
+			{
+				// cast pointers
+				int ptrFile = mFileDNA->getPointerSize();
+				int ptrMem = mMemoryDNA->getPointerSize();
+				safeSwapPtr(strcData, data);
+
+				if (fixupPointers)
+				{
+					if (arrayLen > 1)
+					{
+						//void **sarray = (void**)strcData;
+						//void **darray = (void**)data;
+
+						char *cpc, *cpo;
+						cpc = (char *)strcData;
+						cpo = (char *)data;
+
+						for (int a = 0; a < arrayLen; a++)
+						{
+							safeSwapPtr(cpc, cpo);
+							m_pointerFixupArray.push_back(cpc);
+							cpc += ptrMem;
+							cpo += ptrFile;
+						}
+					}
+					else
+					{
+						if (name[1] == '*')
+							m_pointerPtrFixupArray.push_back(strcData);
+						else
+							m_pointerFixupArray.push_back(strcData);
+					}
+				}
+				else
+				{
+					//					printf("skipped %s %s : %x\n",type.c_str(),name.c_str(),strcData);
+				}
+			}
+
+			else if (strcmp(type, lookupType) == 0)
+				memcpy(strcData, data, eleLen);
+			else
+				getElement(arrayLen, lookupType, type, data, strcData);
+
+			// --
+			return;
+		}
+		data += eleLen;
+	}
+}
+
+// ----------------------------------------------------- //
+char *bFile::getFileElement(short *firstStruct, char *lookupName, char *lookupType, char *data, short **foundPos)
+{
+	short *old = firstStruct;  //mFileDNA->getStruct(old_nr);
+	int elementLength = old[1];
+	old += 2;
+
+	for (int i = 0; i < elementLength; i++, old += 2)
+	{
+		char *type = mFileDNA->getType(old[0]);
+		char *name = mFileDNA->getName(old[1]);
+		int len = mFileDNA->getElementSize(old[0], old[1]);
+
+		if (strcmp(lookupName, name) == 0)
+		{
+			if (strcmp(type, lookupType) == 0)
+			{
+				if (foundPos)
+					*foundPos = old;
+				return data;
+			}
+			return 0;
+		}
+		data += len;
+	}
+	return 0;
+}
+
+// ----------------------------------------------------- //
+void bFile::swapStruct(int dna_nr, char *data, bool ignoreEndianFlag)
+{
+	if (dna_nr == -1) return;
+
+	short *strc = mFileDNA->getStruct(dna_nr);
+	//short *firstStrc = strc;
+
+	int elementLen = strc[1];
+	strc += 2;
+
+	short first = mFileDNA->getStruct(0)[0];
+
+	char *buf = data;
+	for (int i = 0; i < elementLen; i++, strc += 2)
+	{
+		char *type = mFileDNA->getType(strc[0]);
+		char *name = mFileDNA->getName(strc[1]);
+
+		int size = mFileDNA->getElementSize(strc[0], strc[1]);
+		if (strc[0] >= first && name[0] != '*')
+		{
+			int old_nr = mFileDNA->getReverseType(type);
+			int arrayLen = mFileDNA->getArraySizeNew(strc[1]);
+			if (arrayLen == 1)
+			{
+				swapStruct(old_nr, buf, ignoreEndianFlag);
+			}
+			else
+			{
+				char *tmpBuf = buf;
+				for (int i = 0; i < arrayLen; i++)
+				{
+					swapStruct(old_nr, tmpBuf, ignoreEndianFlag);
+					tmpBuf += size / arrayLen;
+				}
+			}
+		}
+		else
+		{
+			//int arrayLenOld = mFileDNA->getArraySize(name);
+			int arrayLen = mFileDNA->getArraySizeNew(strc[1]);
+			//assert(arrayLenOld == arrayLen);
+			swapData(buf, strc[0], arrayLen, ignoreEndianFlag);
+		}
+		buf += size;
+	}
+}
+
+void bFile::resolvePointersMismatch()
+{
+	//	printf("resolvePointersStructMismatch\n");
+
+	int i;
+
+	for (i = 0; i < m_pointerFixupArray.size(); i++)
+	{
+		char *cur = m_pointerFixupArray.at(i);
+		void **ptrptr = (void **)cur;
+		void *ptr = *ptrptr;
+		ptr = findLibPointer(ptr);
+		if (ptr)
+		{
+			//printf("Fixup pointer!\n");
+			*(ptrptr) = ptr;
+		}
+		else
+		{
+			//			printf("pointer not found: %x\n",cur);
+		}
+	}
+
+	for (i = 0; i < m_pointerPtrFixupArray.size(); i++)
+	{
+		char *cur = m_pointerPtrFixupArray.at(i);
+		void **ptrptr = (void **)cur;
+
+		bChunkInd *block = m_chunkPtrPtrMap.find(*ptrptr);
+		if (block)
+		{
+			int ptrMem = mMemoryDNA->getPointerSize();
+			int ptrFile = mFileDNA->getPointerSize();
+
+			int blockLen = block->len / ptrFile;
+
+			void *onptr = findLibPointer(*ptrptr);
+			if (onptr)
+			{
+				char *newPtr = new char[blockLen * ptrMem];
+				addDataBlock(newPtr);
+				memset(newPtr, 0, blockLen * ptrMem);
+
+				void **onarray = (void **)onptr;
+				char *oldPtr = (char *)onarray;
+
+				int p = 0;
+				while (blockLen-- > 0)
+				{
+					b3PointerUid dp = {{0}};
+					safeSwapPtr((char *)dp.m_uniqueIds, oldPtr);
+
+					void **tptr = (void **)(newPtr + p * ptrMem);
+					*tptr = findLibPointer(dp.m_ptr);
+
+					oldPtr += ptrFile;
+					++p;
+				}
+
+				*ptrptr = newPtr;
+			}
+		}
+	}
+}
+
+///this loop only works fine if the Blender DNA structure of the file matches the headerfiles
+void bFile::resolvePointersChunk(const bChunkInd &dataChunk, int verboseMode)
+{
+	bParse::bDNA *fileDna = mFileDNA ? mFileDNA : mMemoryDNA;
+
+	short int *oldStruct = fileDna->getStruct(dataChunk.dna_nr);
+	short oldLen = fileDna->getLength(oldStruct[0]);
+	//char* structType = fileDna->getType(oldStruct[0]);
+
+	char *cur = (char *)findLibPointer(dataChunk.oldPtr);
+	for (int block = 0; block < dataChunk.nr; block++)
+	{
+		resolvePointersStructRecursive(cur, dataChunk.dna_nr, verboseMode, 1);
+		cur += oldLen;
+	}
+}
+
+int bFile::resolvePointersStructRecursive(char *strcPtr, int dna_nr, int verboseMode, int recursion)
+{
+	bParse::bDNA *fileDna = mFileDNA ? mFileDNA : mMemoryDNA;
+
+	char *memType;
+	char *memName;
+	short firstStructType = fileDna->getStruct(0)[0];
+
+	char *elemPtr = strcPtr;
+
+	short int *oldStruct = fileDna->getStruct(dna_nr);
+
+	int elementLength = oldStruct[1];
+	oldStruct += 2;
+
+	int totalSize = 0;
+
+	for (int ele = 0; ele < elementLength; ele++, oldStruct += 2)
+	{
+		memType = fileDna->getType(oldStruct[0]);
+		memName = fileDna->getName(oldStruct[1]);
+
+		int arrayLen = fileDna->getArraySizeNew(oldStruct[1]);
+		if (memName[0] == '*')
+		{
+			if (arrayLen > 1)
+			{
+				void **array = (void **)elemPtr;
+				for (int a = 0; a < arrayLen; a++)
+				{
+					if (verboseMode & FD_VERBOSE_EXPORT_XML)
+					{
+						for (int i = 0; i < recursion; i++)
+						{
+							printf("  ");
+						}
+						//skip the *
+						printf("<%s type=\"pointer\"> ", &memName[1]);
+						printf("%p ", array[a]);
+						printf("</%s>\n", &memName[1]);
+					}
+
+					array[a] = findLibPointer(array[a]);
+				}
+			}
+			else
+			{
+				void **ptrptr = (void **)elemPtr;
+				void *ptr = *ptrptr;
+				if (verboseMode & FD_VERBOSE_EXPORT_XML)
+				{
+					for (int i = 0; i < recursion; i++)
+					{
+						printf("  ");
+					}
+					printf("<%s type=\"pointer\"> ", &memName[1]);
+					printf("%p ", ptr);
+					printf("</%s>\n", &memName[1]);
+				}
+				ptr = findLibPointer(ptr);
+
+				if (ptr)
+				{
+					//				printf("Fixup pointer at 0x%x from 0x%x to 0x%x!\n",ptrptr,*ptrptr,ptr);
+					*(ptrptr) = ptr;
+					if (memName[1] == '*' && ptrptr && *ptrptr)
+					{
+						// This	will only work if the given	**array	is continuous
+						void **array = (void **)*(ptrptr);
+						void *np = array[0];
+						int n = 0;
+						while (np)
+						{
+							np = findLibPointer(array[n]);
+							if (np) array[n] = np;
+							n++;
+						}
+					}
+				}
+				else
+				{
+					//				printf("Cannot fixup pointer at 0x%x from 0x%x to 0x%x!\n",ptrptr,*ptrptr,ptr);
+				}
+			}
+		}
+		else
+		{
+			int revType = fileDna->getReverseType(oldStruct[0]);
+			if (oldStruct[0] >= firstStructType)  //revType != -1 &&
+			{
+				char cleanName[MAX_STRLEN];
+				getCleanName(memName, cleanName);
+
+				int arrayLen = fileDna->getArraySizeNew(oldStruct[1]);
+				int byteOffset = 0;
+
+				if (verboseMode & FD_VERBOSE_EXPORT_XML)
+				{
+					for (int i = 0; i < recursion; i++)
+					{
+						printf("  ");
+					}
+
+					if (arrayLen > 1)
+					{
+						printf("<%s type=\"%s\" count=%d>\n", cleanName, memType, arrayLen);
+					}
+					else
+					{
+						printf("<%s type=\"%s\">\n", cleanName, memType);
+					}
+				}
+
+				for (int i = 0; i < arrayLen; i++)
+				{
+					byteOffset += resolvePointersStructRecursive(elemPtr + byteOffset, revType, verboseMode, recursion + 1);
+				}
+				if (verboseMode & FD_VERBOSE_EXPORT_XML)
+				{
+					for (int i = 0; i < recursion; i++)
+					{
+						printf("  ");
+					}
+					printf("</%s>\n", cleanName);
+				}
+			}
+			else
+			{
+				//export a simple type
+				if (verboseMode & FD_VERBOSE_EXPORT_XML)
+				{
+					if (arrayLen > MAX_ARRAY_LENGTH)
+					{
+						printf("too long\n");
+					}
+					else
+					{
+						//printf("%s %s\n",memType,memName);
+
+						bool isIntegerType = (strcmp(memType, "char") == 0) || (strcmp(memType, "int") == 0) || (strcmp(memType, "short") == 0);
+
+						if (isIntegerType)
+						{
+							const char *newtype = "int";
+							int dbarray[MAX_ARRAY_LENGTH];
+							int *dbPtr = 0;
+							char *tmp = elemPtr;
+							dbPtr = &dbarray[0];
+							if (dbPtr)
+							{
+								char cleanName[MAX_STRLEN];
+								getCleanName(memName, cleanName);
+
+								int i;
+								getElement(arrayLen, newtype, memType, tmp, (char *)dbPtr);
+								for (i = 0; i < recursion; i++)
+									printf("  ");
+								if (arrayLen == 1)
+									printf("<%s type=\"%s\">", cleanName, memType);
+								else
+									printf("<%s type=\"%s\" count=%d>", cleanName, memType, arrayLen);
+								for (i = 0; i < arrayLen; i++)
+									printf(" %d ", dbPtr[i]);
+								printf("</%s>\n", cleanName);
+							}
+						}
+						else
+						{
+							const char *newtype = "double";
+							double dbarray[MAX_ARRAY_LENGTH];
+							double *dbPtr = 0;
+							char *tmp = elemPtr;
+							dbPtr = &dbarray[0];
+							if (dbPtr)
+							{
+								int i;
+								getElement(arrayLen, newtype, memType, tmp, (char *)dbPtr);
+								for (i = 0; i < recursion; i++)
+									printf("  ");
+								char cleanName[MAX_STRLEN];
+								getCleanName(memName, cleanName);
+
+								if (arrayLen == 1)
+								{
+									printf("<%s type=\"%s\">", memName, memType);
+								}
+								else
+								{
+									printf("<%s type=\"%s\" count=%d>", cleanName, memType, arrayLen);
+								}
+								for (i = 0; i < arrayLen; i++)
+									printf(" %f ", dbPtr[i]);
+								printf("</%s>\n", cleanName);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		int size = fileDna->getElementSize(oldStruct[0], oldStruct[1]);
+		totalSize += size;
+		elemPtr += size;
+	}
+
+	return totalSize;
+}
+
+///Resolve pointers replaces the original pointers in structures, and linked lists by the new in-memory structures
+void bFile::resolvePointers(int verboseMode)
+{
+	bParse::bDNA *fileDna = mFileDNA ? mFileDNA : mMemoryDNA;
+
+	//char *dataPtr = mFileBuffer+mDataStart;
+
+	if (1)  //mFlags & (FD_BITS_VARIES | FD_VERSION_VARIES))
+	{
+		resolvePointersMismatch();
+	}
+
+	{
+		if (verboseMode & FD_VERBOSE_EXPORT_XML)
+		{
+			printf("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
+			int numitems = m_chunks.size();
+			printf("<bullet_physics version=%d itemcount = %d>\n", b3GetVersion(), numitems);
+		}
+		for (int i = 0; i < m_chunks.size(); i++)
+		{
+			const bChunkInd &dataChunk = m_chunks.at(i);
+
+			if (!mFileDNA || fileDna->flagEqual(dataChunk.dna_nr))
+			{
+				//dataChunk.len
+				short int *oldStruct = fileDna->getStruct(dataChunk.dna_nr);
+				char *oldType = fileDna->getType(oldStruct[0]);
+
+				if (verboseMode & FD_VERBOSE_EXPORT_XML)
+					printf(" <%s pointer=%p>\n", oldType, dataChunk.oldPtr);
+
+				resolvePointersChunk(dataChunk, verboseMode);
+
+				if (verboseMode & FD_VERBOSE_EXPORT_XML)
+					printf(" </%s>\n", oldType);
+			}
+			else
+			{
+				//printf("skipping mStruct\n");
+			}
+		}
+		if (verboseMode & FD_VERBOSE_EXPORT_XML)
+		{
+			printf("</bullet_physics>\n");
+		}
+	}
+}
+
+// ----------------------------------------------------- //
+void *bFile::findLibPointer(void *ptr)
+{
+	bStructHandle **ptrptr = getLibPointers().find(ptr);
+	if (ptrptr)
+		return *ptrptr;
+	return 0;
+}
+
+void bFile::updateOldPointers()
+{
+	int i;
+
+	for (i = 0; i < m_chunks.size(); i++)
+	{
+		bChunkInd &dataChunk = m_chunks[i];
+		dataChunk.oldPtr = findLibPointer(dataChunk.oldPtr);
+	}
+}
+void bFile::dumpChunks(bParse::bDNA *dna)
+{
+	int i;
+
+	for (i = 0; i < m_chunks.size(); i++)
+	{
+		bChunkInd &dataChunk = m_chunks[i];
+		char *codeptr = (char *)&dataChunk.code;
+		char codestr[5] = {codeptr[0], codeptr[1], codeptr[2], codeptr[3], 0};
+
+		short *newStruct = dna->getStruct(dataChunk.dna_nr);
+		char *typeName = dna->getType(newStruct[0]);
+		printf("%3d: %s  ", i, typeName);
+
+		printf("code=%s  ", codestr);
+
+		printf("ptr=%p  ", dataChunk.oldPtr);
+		printf("len=%d  ", dataChunk.len);
+		printf("nr=%d  ", dataChunk.nr);
+		if (dataChunk.nr != 1)
+		{
+			printf("not 1\n");
+		}
+		printf("\n");
+	}
+
+#if 0
+	IDFinderData ifd;
+	ifd.success = 0;
+	ifd.IDname = NULL;
+	ifd.just_print_it = 1;
+	for (i=0; i<bf->m_blocks.size(); ++i)
+	{
+		BlendBlock* bb = bf->m_blocks[i];
+		printf("tag='%s'\tptr=%p\ttype=%s\t[%4d]",		bb->tag, bb,bf->types[bb->type_index].name,bb->m_array_entries_.size());
+		block_ID_finder(bb, bf, &ifd);
+		printf("\n");
+	}
+#endif
+}
+
+void bFile::writeChunks(FILE *fp, bool fixupPointers)
+{
+	bParse::bDNA *fileDna = mFileDNA ? mFileDNA : mMemoryDNA;
+
+	for (int i = 0; i < m_chunks.size(); i++)
+	{
+		bChunkInd &dataChunk = m_chunks.at(i);
+
+		// Ouch! need to rebuild the struct
+		short *oldStruct, *curStruct;
+		char *oldType, *newType;
+		int oldLen, curLen, reverseOld;
+
+		oldStruct = fileDna->getStruct(dataChunk.dna_nr);
+		oldType = fileDna->getType(oldStruct[0]);
+		oldLen = fileDna->getLength(oldStruct[0]);
+		///don't try to convert Link block data, just memcpy it. Other data can be converted.
+		reverseOld = mMemoryDNA->getReverseType(oldType);
+
+		if ((reverseOld != -1))
+		{
+			// make sure it's here
+			//assert(reverseOld!= -1 && "getReverseType() returned -1, struct required!");
+			//
+			curStruct = mMemoryDNA->getStruct(reverseOld);
+			newType = mMemoryDNA->getType(curStruct[0]);
+			// make sure it's the same
+			assert((strcmp(oldType, newType) == 0) && "internal error, struct mismatch!");
+
+			curLen = mMemoryDNA->getLength(curStruct[0]);
+			dataChunk.dna_nr = reverseOld;
+			if (strcmp("Link", oldType) != 0)
+			{
+				dataChunk.len = curLen * dataChunk.nr;
+			}
+			else
+			{
+				//				printf("keep length of link = %d\n",dataChunk.len);
+			}
+
+			//write the structure header
+			fwrite(&dataChunk, sizeof(bChunkInd), 1, fp);
+
+			short int *curStruct1;
+			curStruct1 = mMemoryDNA->getStruct(dataChunk.dna_nr);
+			assert(curStruct1 == curStruct);
+
+			char *cur = fixupPointers ? (char *)findLibPointer(dataChunk.oldPtr) : (char *)dataChunk.oldPtr;
+
+			//write the actual contents of the structure(s)
+			fwrite(cur, dataChunk.len, 1, fp);
+		}
+		else
+		{
+			printf("serious error, struct mismatch: don't write\n");
+		}
+	}
+}
+
+// ----------------------------------------------------- //
+int bFile::getNextBlock(bChunkInd *dataChunk, const char *dataPtr, const int flags)
+{
+	bool swap = false;
+	bool varies = false;
+
+	if (flags & FD_ENDIAN_SWAP)
+		swap = true;
+	if (flags & FD_BITS_VARIES)
+		varies = true;
+
+	if (VOID_IS_8)
+	{
+		if (varies)
+		{
+			bChunkPtr4 head;
+			memcpy(&head, dataPtr, sizeof(bChunkPtr4));
+
+			bChunkPtr8 chunk;
+
+			chunk.code = head.code;
+			chunk.len = head.len;
+			chunk.m_uniqueInts[0] = head.m_uniqueInt;
+			chunk.m_uniqueInts[1] = 0;
+			chunk.dna_nr = head.dna_nr;
+			chunk.nr = head.nr;
+
+			if (swap)
+			{
+				if ((chunk.code & 0xFFFF) == 0)
+					chunk.code >>= 16;
+
+				B3_SWITCH_INT(chunk.len);
+				B3_SWITCH_INT(chunk.dna_nr);
+				B3_SWITCH_INT(chunk.nr);
+			}
+
+			memcpy(dataChunk, &chunk, sizeof(bChunkInd));
+		}
+		else
+		{
+			bChunkPtr8 c;
+			memcpy(&c, dataPtr, sizeof(bChunkPtr8));
+
+			if (swap)
+			{
+				if ((c.code & 0xFFFF) == 0)
+					c.code >>= 16;
+
+				B3_SWITCH_INT(c.len);
+				B3_SWITCH_INT(c.dna_nr);
+				B3_SWITCH_INT(c.nr);
+			}
+
+			memcpy(dataChunk, &c, sizeof(bChunkInd));
+		}
+	}
+	else
+	{
+		if (varies)
+		{
+			bChunkPtr8 head;
+			memcpy(&head, dataPtr, sizeof(bChunkPtr8));
+
+			bChunkPtr4 chunk;
+			chunk.code = head.code;
+			chunk.len = head.len;
+
+			if (head.m_uniqueInts[0] == head.m_uniqueInts[1])
+			{
+				chunk.m_uniqueInt = head.m_uniqueInts[0];
+			}
+			else
+			{
+				b3Long64 oldPtr = 0;
+				memcpy(&oldPtr, &head.m_uniqueInts[0], 8);
+				if (swap)
+					B3_SWITCH_LONGINT(oldPtr);
+				chunk.m_uniqueInt = (int)(oldPtr >> 3);
+			}
+
+			chunk.dna_nr = head.dna_nr;
+			chunk.nr = head.nr;
+
+			if (swap)
+			{
+				if ((chunk.code & 0xFFFF) == 0)
+					chunk.code >>= 16;
+
+				B3_SWITCH_INT(chunk.len);
+				B3_SWITCH_INT(chunk.dna_nr);
+				B3_SWITCH_INT(chunk.nr);
+			}
+
+			memcpy(dataChunk, &chunk, sizeof(bChunkInd));
+		}
+		else
+		{
+			bChunkPtr4 c;
+			memcpy(&c, dataPtr, sizeof(bChunkPtr4));
+
+			if (swap)
+			{
+				if ((c.code & 0xFFFF) == 0)
+					c.code >>= 16;
+
+				B3_SWITCH_INT(c.len);
+				B3_SWITCH_INT(c.dna_nr);
+				B3_SWITCH_INT(c.nr);
+			}
+			memcpy(dataChunk, &c, sizeof(bChunkInd));
+		}
+	}
+
+	if (dataChunk->len < 0)
+		return -1;
+
+#if 0
+	print ("----------");
+	print (dataChunk->code);
+	print (dataChunk->len);
+	print (dataChunk->old);
+	print (dataChunk->dna_nr);
+	print (dataChunk->nr);
+#endif
+	return (dataChunk->len + ChunkUtils::getOffset(flags));
+}
+
+//eof
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.h
new file mode 100644
index 0000000..bda229c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3File.h
@@ -0,0 +1,158 @@
+/*
+bParse
+Copyright (c) 2006-2009 Charlie C & Erwin Coumans  http://gamekit.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __BFILE_H__
+#define __BFILE_H__
+
+#include "b3Common.h"
+#include "b3Chunk.h"
+#include <stdio.h>
+
+namespace bParse
+{
+// ----------------------------------------------------- //
+enum bFileFlags
+{
+	FD_INVALID = 0,
+	FD_OK = 1,
+	FD_VOID_IS_8 = 2,
+	FD_ENDIAN_SWAP = 4,
+	FD_FILE_64 = 8,
+	FD_BITS_VARIES = 16,
+	FD_VERSION_VARIES = 32,
+	FD_DOUBLE_PRECISION = 64,
+	FD_BROKEN_DNA = 128
+};
+
+enum bFileVerboseMode
+{
+	FD_VERBOSE_EXPORT_XML = 1,
+	FD_VERBOSE_DUMP_DNA_TYPE_DEFINITIONS = 2,
+	FD_VERBOSE_DUMP_CHUNKS = 4,
+	FD_VERBOSE_DUMP_FILE_INFO = 8,
+};
+// ----------------------------------------------------- //
+class bFile
+{
+protected:
+	char m_headerString[7];
+
+	bool mOwnsBuffer;
+	char *mFileBuffer;
+	int mFileLen;
+	int mVersion;
+
+	bPtrMap mLibPointers;
+
+	int mDataStart;
+	bDNA *mFileDNA;
+	bDNA *mMemoryDNA;
+
+	b3AlignedObjectArray<char *> m_pointerFixupArray;
+	b3AlignedObjectArray<char *> m_pointerPtrFixupArray;
+
+	b3AlignedObjectArray<bChunkInd> m_chunks;
+	b3HashMap<b3HashPtr, bChunkInd> m_chunkPtrPtrMap;
+
+	//
+
+	bPtrMap mDataPointers;
+
+	int mFlags;
+
+	// ////////////////////////////////////////////////////////////////////////////
+
+	// buffer offset util
+	int getNextBlock(bChunkInd *dataChunk, const char *dataPtr, const int flags);
+	void safeSwapPtr(char *dst, const char *src);
+
+	virtual void parseHeader();
+
+	virtual void parseData() = 0;
+
+	void resolvePointersMismatch();
+	void resolvePointersChunk(const bChunkInd &dataChunk, int verboseMode);
+
+	int resolvePointersStructRecursive(char *strcPtr, int old_dna, int verboseMode, int recursion);
+	//void swapPtr(char *dst, char *src);
+
+	void parseStruct(char *strcPtr, char *dtPtr, int old_dna, int new_dna, bool fixupPointers);
+	void getMatchingFileDNA(short *old, const char *lookupName, const char *lookupType, char *strcData, char *data, bool fixupPointers);
+	char *getFileElement(short *firstStruct, char *lookupName, char *lookupType, char *data, short **foundPos);
+
+	void swap(char *head, class bChunkInd &ch, bool ignoreEndianFlag);
+	void swapData(char *data, short type, int arraySize, bool ignoreEndianFlag);
+	void swapStruct(int dna_nr, char *data, bool ignoreEndianFlag);
+	void swapLen(char *dataPtr);
+	void swapDNA(char *ptr);
+
+	char *readStruct(char *head, class bChunkInd &chunk);
+	char *getAsString(int code);
+
+	void parseInternal(int verboseMode, char *memDna, int memDnaLength);
+
+public:
+	bFile(const char *filename, const char headerString[7]);
+
+	//todo: make memoryBuffer const char
+	//bFile( const char *memoryBuffer, int len);
+	bFile(char *memoryBuffer, int len, const char headerString[7]);
+	virtual ~bFile();
+
+	bDNA *getFileDNA()
+	{
+		return mFileDNA;
+	}
+
+	virtual void addDataBlock(char *dataBlock) = 0;
+
+	int getFlags() const
+	{
+		return mFlags;
+	}
+
+	bPtrMap &getLibPointers()
+	{
+		return mLibPointers;
+	}
+
+	void *findLibPointer(void *ptr);
+
+	bool ok();
+
+	virtual void parse(int verboseMode) = 0;
+
+	virtual int write(const char *fileName, bool fixupPointers = false) = 0;
+
+	virtual void writeChunks(FILE *fp, bool fixupPointers);
+
+	virtual void writeDNA(FILE *fp) = 0;
+
+	void updateOldPointers();
+	void resolvePointers(int verboseMode);
+
+	void dumpChunks(bDNA *dna);
+
+	int getVersion() const
+	{
+		return mVersion;
+	}
+	//pre-swap the endianness, so that data loaded on a target with different endianness doesn't need to be swapped
+	void preSwap();
+	void writeFile(const char *fileName);
+};
+}  // namespace bParse
+
+#endif  //__BFILE_H__
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.cpp b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.cpp
new file mode 100644
index 0000000..ea4a8e2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.cpp
@@ -0,0 +1,18062 @@
+char b3s_bulletDNAstr[] = {
+	char(83),
+	char(68),
+	char(78),
+	char(65),
+	char(78),
+	char(65),
+	char(77),
+	char(69),
+	char(63),
+	char(1),
+	char(0),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(97),
+	char(112),
+	char(97),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(100),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(42),
+	char(102),
+	char(105),
+	char(114),
+	char(115),
+	char(116),
+	char(0),
+	char(42),
+	char(108),
+	char(97),
+	char(115),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(115),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(108),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(97),
+	char(115),
+	char(105),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(111),
+	char(114),
+	char(105),
+	char(103),
+	char(105),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(111),
+	char(116),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(117),
+	char(98),
+	char(116),
+	char(114),
+	char(101),
+	char(101),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(105),
+	char(110),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(97),
+	char(120),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(105),
+	char(110),
+	char(79),
+	char(114),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(97),
+	char(120),
+	char(79),
+	char(114),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(115),
+	char(99),
+	char(97),
+	char(112),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(117),
+	char(98),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(115),
+	char(99),
+	char(97),
+	char(112),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(79),
+	char(114),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(104),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(105),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(104),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(97),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(104),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(117),
+	char(114),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(76),
+	char(101),
+	char(97),
+	char(102),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(115),
+	char(117),
+	char(98),
+	char(84),
+	char(114),
+	char(101),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(97),
+	char(118),
+	char(101),
+	char(114),
+	char(115),
+	char(97),
+	char(108),
+	char(77),
+	char(111),
+	char(100),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(83),
+	char(117),
+	char(98),
+	char(116),
+	char(114),
+	char(101),
+	char(101),
+	char(72),
+	char(101),
+	char(97),
+	char(100),
+	char(101),
+	char(114),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(83),
+	char(99),
+	char(97),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(108),
+	char(97),
+	char(110),
+	char(101),
+	char(78),
+	char(111),
+	char(114),
+	char(109),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(108),
+	char(97),
+	char(110),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(97),
+	char(110),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(109),
+	char(112),
+	char(108),
+	char(105),
+	char(99),
+	char(105),
+	char(116),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(105),
+	char(109),
+	char(101),
+	char(110),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(77),
+	char(97),
+	char(114),
+	char(103),
+	char(105),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(97),
+	char(100),
+	char(105),
+	char(117),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(110),
+	char(97),
+	char(108),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(115),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(51),
+	char(102),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(51),
+	char(100),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(51),
+	char(50),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(51),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(49),
+	char(54),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(51),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(56),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(49),
+	char(54),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(86),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(101),
+	char(115),
+	char(104),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(115),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(101),
+	char(115),
+	char(104),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(102),
+	char(97),
+	char(99),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(66),
+	char(118),
+	char(104),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(66),
+	char(118),
+	char(104),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(77),
+	char(97),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(51),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(105),
+	char(109),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(77),
+	char(97),
+	char(114),
+	char(103),
+	char(105),
+	char(110),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(112),
+	char(65),
+	char(120),
+	char(105),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(108),
+	char(97),
+	char(103),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(86),
+	char(48),
+	char(86),
+	char(49),
+	char(65),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(86),
+	char(49),
+	char(86),
+	char(50),
+	char(65),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(86),
+	char(50),
+	char(86),
+	char(48),
+	char(65),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(104),
+	char(97),
+	char(115),
+	char(104),
+	char(84),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(101),
+	char(120),
+	char(116),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(118),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(107),
+	char(101),
+	char(121),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(69),
+	char(112),
+	char(115),
+	char(105),
+	char(108),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(108),
+	char(97),
+	char(110),
+	char(97),
+	char(114),
+	char(69),
+	char(112),
+	char(115),
+	char(105),
+	char(108),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(113),
+	char(117),
+	char(97),
+	char(108),
+	char(86),
+	char(101),
+	char(114),
+	char(116),
+	char(101),
+	char(120),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(68),
+	char(105),
+	char(115),
+	char(116),
+	char(97),
+	char(110),
+	char(99),
+	char(101),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(122),
+	char(101),
+	char(114),
+	char(111),
+	char(65),
+	char(114),
+	char(101),
+	char(97),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(101),
+	char(120),
+	char(116),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(104),
+	char(97),
+	char(115),
+	char(104),
+	char(84),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(86),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(75),
+	char(101),
+	char(121),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(105),
+	char(109),
+	char(112),
+	char(97),
+	char(99),
+	char(116),
+	char(83),
+	char(117),
+	char(98),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(117),
+	char(110),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(117),
+	char(110),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(85),
+	char(110),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(51),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(98),
+	char(114),
+	char(111),
+	char(97),
+	char(100),
+	char(112),
+	char(104),
+	char(97),
+	char(115),
+	char(101),
+	char(72),
+	char(97),
+	char(110),
+	char(100),
+	char(108),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(111),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(119),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(112),
+	char(111),
+	char(108),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(112),
+	char(111),
+	char(108),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(76),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(112),
+	char(111),
+	char(108),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(105),
+	char(115),
+	char(111),
+	char(116),
+	char(114),
+	char(111),
+	char(112),
+	char(105),
+	char(99),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(80),
+	char(114),
+	char(111),
+	char(99),
+	char(101),
+	char(115),
+	char(115),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(101),
+	char(97),
+	char(99),
+	char(116),
+	char(105),
+	char(118),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(105),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(105),
+	char(116),
+	char(117),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(104),
+	char(105),
+	char(116),
+	char(70),
+	char(114),
+	char(97),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(99),
+	char(100),
+	char(83),
+	char(119),
+	char(101),
+	char(112),
+	char(116),
+	char(83),
+	char(112),
+	char(104),
+	char(101),
+	char(114),
+	char(101),
+	char(82),
+	char(97),
+	char(100),
+	char(105),
+	char(117),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(99),
+	char(100),
+	char(77),
+	char(111),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(104),
+	char(97),
+	char(115),
+	char(65),
+	char(110),
+	char(105),
+	char(115),
+	char(111),
+	char(116),
+	char(114),
+	char(111),
+	char(112),
+	char(105),
+	char(99),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(70),
+	char(108),
+	char(97),
+	char(103),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(115),
+	char(108),
+	char(97),
+	char(110),
+	char(100),
+	char(84),
+	char(97),
+	char(103),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(109),
+	char(112),
+	char(97),
+	char(110),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(99),
+	char(116),
+	char(105),
+	char(118),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(116),
+	char(97),
+	char(116),
+	char(101),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(110),
+	char(97),
+	char(108),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(101),
+	char(99),
+	char(107),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(100),
+	char(101),
+	char(87),
+	char(105),
+	char(116),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(114),
+	char(97),
+	char(118),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(73),
+	char(110),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(97),
+	char(84),
+	char(101),
+	char(110),
+	char(115),
+	char(111),
+	char(114),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(114),
+	char(97),
+	char(118),
+	char(105),
+	char(116),
+	char(121),
+	char(95),
+	char(97),
+	char(99),
+	char(99),
+	char(101),
+	char(108),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(73),
+	char(110),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(97),
+	char(76),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(111),
+	char(116),
+	char(97),
+	char(108),
+	char(70),
+	char(111),
+	char(114),
+	char(99),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(111),
+	char(116),
+	char(97),
+	char(108),
+	char(84),
+	char(111),
+	char(114),
+	char(113),
+	char(117),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(101),
+	char(114),
+	char(115),
+	char(101),
+	char(77),
+	char(97),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(76),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(83),
+	char(113),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(83),
+	char(113),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(83),
+	char(108),
+	char(101),
+	char(101),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(83),
+	char(108),
+	char(101),
+	char(101),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(82),
+	char(111),
+	char(119),
+	char(115),
+	char(0),
+	char(110),
+	char(117),
+	char(98),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(65),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(66),
+	char(0),
+	char(109),
+	char(95),
+	char(111),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(73),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(101),
+	char(101),
+	char(100),
+	char(115),
+	char(70),
+	char(101),
+	char(101),
+	char(100),
+	char(98),
+	char(97),
+	char(99),
+	char(107),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(112),
+	char(112),
+	char(108),
+	char(105),
+	char(101),
+	char(100),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(98),
+	char(103),
+	char(68),
+	char(114),
+	char(97),
+	char(119),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(105),
+	char(115),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(66),
+	char(101),
+	char(116),
+	char(119),
+	char(101),
+	char(101),
+	char(110),
+	char(76),
+	char(105),
+	char(110),
+	char(107),
+	char(101),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(105),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(111),
+	char(118),
+	char(101),
+	char(114),
+	char(114),
+	char(105),
+	char(100),
+	char(101),
+	char(78),
+	char(117),
+	char(109),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(114),
+	char(101),
+	char(97),
+	char(107),
+	char(105),
+	char(110),
+	char(103),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(115),
+	char(69),
+	char(110),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(121),
+	char(112),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(105),
+	char(118),
+	char(111),
+	char(116),
+	char(73),
+	char(110),
+	char(65),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(105),
+	char(118),
+	char(111),
+	char(116),
+	char(73),
+	char(110),
+	char(66),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(65),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(66),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(82),
+	char(101),
+	char(102),
+	char(101),
+	char(114),
+	char(101),
+	char(110),
+	char(99),
+	char(101),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(65),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(79),
+	char(110),
+	char(108),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(110),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(77),
+	char(111),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(111),
+	char(116),
+	char(111),
+	char(114),
+	char(84),
+	char(97),
+	char(114),
+	char(103),
+	char(101),
+	char(116),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(77),
+	char(111),
+	char(116),
+	char(111),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(119),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(112),
+	char(112),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(105),
+	char(97),
+	char(115),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(108),
+	char(97),
+	char(120),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(119),
+	char(105),
+	char(110),
+	char(103),
+	char(83),
+	char(112),
+	char(97),
+	char(110),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(119),
+	char(105),
+	char(110),
+	char(103),
+	char(83),
+	char(112),
+	char(97),
+	char(110),
+	char(50),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(119),
+	char(105),
+	char(115),
+	char(116),
+	char(83),
+	char(112),
+	char(97),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(85),
+	char(112),
+	char(112),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(76),
+	char(111),
+	char(119),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(85),
+	char(112),
+	char(112),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(76),
+	char(111),
+	char(119),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(76),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(82),
+	char(101),
+	char(102),
+	char(101),
+	char(114),
+	char(101),
+	char(110),
+	char(99),
+	char(101),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(65),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(79),
+	char(102),
+	char(102),
+	char(115),
+	char(101),
+	char(116),
+	char(70),
+	char(111),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(54),
+	char(100),
+	char(111),
+	char(102),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(69),
+	char(110),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(100),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(113),
+	char(117),
+	char(105),
+	char(108),
+	char(105),
+	char(98),
+	char(114),
+	char(105),
+	char(117),
+	char(109),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(97),
+	char(117),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(105),
+	char(109),
+	char(101),
+	char(83),
+	char(116),
+	char(101),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(69),
+	char(114),
+	char(114),
+	char(111),
+	char(114),
+	char(82),
+	char(101),
+	char(100),
+	char(117),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(114),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(114),
+	char(112),
+	char(50),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(108),
+	char(111),
+	char(98),
+	char(97),
+	char(108),
+	char(67),
+	char(102),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(80),
+	char(101),
+	char(110),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(84),
+	char(117),
+	char(114),
+	char(110),
+	char(69),
+	char(114),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(83),
+	char(108),
+	char(111),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(119),
+	char(97),
+	char(114),
+	char(109),
+	char(115),
+	char(116),
+	char(97),
+	char(114),
+	char(116),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(71),
+	char(121),
+	char(114),
+	char(111),
+	char(115),
+	char(99),
+	char(111),
+	char(112),
+	char(105),
+	char(99),
+	char(70),
+	char(111),
+	char(114),
+	char(99),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(105),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(65),
+	char(120),
+	char(105),
+	char(115),
+	char(82),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(77),
+	char(111),
+	char(100),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(105),
+	char(110),
+	char(103),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(82),
+	char(101),
+	char(115),
+	char(116),
+	char(105),
+	char(116),
+	char(117),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(105),
+	char(110),
+	char(105),
+	char(109),
+	char(117),
+	char(109),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(66),
+	char(97),
+	char(116),
+	char(99),
+	char(104),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(114),
+	char(101),
+	char(118),
+	char(105),
+	char(111),
+	char(117),
+	char(115),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(99),
+	char(99),
+	char(117),
+	char(109),
+	char(117),
+	char(108),
+	char(97),
+	char(116),
+	char(101),
+	char(100),
+	char(70),
+	char(111),
+	char(114),
+	char(99),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(114),
+	char(109),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(114),
+	char(101),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(116),
+	char(116),
+	char(97),
+	char(99),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(76),
+	char(101),
+	char(110),
+	char(103),
+	char(116),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(98),
+	char(101),
+	char(110),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(65),
+	char(114),
+	char(101),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(48),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(86),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(50),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(48),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(101),
+	char(114),
+	char(111),
+	char(77),
+	char(111),
+	char(100),
+	char(101),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(97),
+	char(117),
+	char(109),
+	char(103),
+	char(97),
+	char(114),
+	char(116),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(114),
+	char(97),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(102),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(114),
+	char(101),
+	char(115),
+	char(115),
+	char(117),
+	char(114),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(121),
+	char(110),
+	char(97),
+	char(109),
+	char(105),
+	char(99),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(101),
+	char(77),
+	char(97),
+	char(116),
+	char(99),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(107),
+	char(105),
+	char(110),
+	char(101),
+	char(116),
+	char(105),
+	char(99),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(75),
+	char(105),
+	char(110),
+	char(101),
+	char(116),
+	char(105),
+	char(99),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(83),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(75),
+	char(105),
+	char(110),
+	char(101),
+	char(116),
+	char(105),
+	char(99),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(83),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(83),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(86),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(105),
+	char(109),
+	char(101),
+	char(83),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(114),
+	char(105),
+	char(102),
+	char(116),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(113),
+	char(113),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(109),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(119),
+	char(101),
+	char(105),
+	char(103),
+	char(104),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(87),
+	char(101),
+	char(105),
+	char(103),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(102),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(120),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(105),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(119),
+	char(105),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(118),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(118),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(102),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(114),
+	char(101),
+	char(102),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(115),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(82),
+	char(101),
+	char(102),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(77),
+	char(97),
+	char(115),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(100),
+	char(109),
+	char(97),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(109),
+	char(97),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(118),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(100),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(116),
+	char(99),
+	char(104),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(83),
+	char(101),
+	char(108),
+	char(102),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(101),
+	char(108),
+	char(102),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(105),
+	char(110),
+	char(115),
+	char(65),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(100),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(65),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(66),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(102),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(102),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(101),
+	char(108),
+	char(101),
+	char(116),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(108),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(65),
+	char(116),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(66),
+	char(116),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(106),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(101),
+	char(0),
+	char(42),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(107),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(102),
+	char(97),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(116),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(104),
+	char(101),
+	char(100),
+	char(114),
+	char(97),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(106),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(77),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(76),
+	char(105),
+	char(110),
+	char(107),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(70),
+	char(97),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(84),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(104),
+	char(101),
+	char(100),
+	char(114),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(65),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(74),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(102),
+	char(105),
+	char(103),
+	char(0),
+	char(84),
+	char(89),
+	char(80),
+	char(69),
+	char(76),
+	char(0),
+	char(0),
+	char(0),
+	char(99),
+	char(104),
+	char(97),
+	char(114),
+	char(0),
+	char(117),
+	char(99),
+	char(104),
+	char(97),
+	char(114),
+	char(0),
+	char(115),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(0),
+	char(117),
+	char(115),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(0),
+	char(105),
+	char(110),
+	char(116),
+	char(0),
+	char(108),
+	char(111),
+	char(110),
+	char(103),
+	char(0),
+	char(117),
+	char(108),
+	char(111),
+	char(110),
+	char(103),
+	char(0),
+	char(102),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(0),
+	char(100),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(0),
+	char(118),
+	char(111),
+	char(105),
+	char(100),
+	char(0),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(104),
+	char(121),
+	char(115),
+	char(105),
+	char(99),
+	char(115),
+	char(83),
+	char(121),
+	char(115),
+	char(116),
+	char(101),
+	char(109),
+	char(0),
+	char(76),
+	char(105),
+	char(115),
+	char(116),
+	char(66),
+	char(97),
+	char(115),
+	char(101),
+	char(0),
+	char(98),
+	char(116),
+	char(86),
+	char(101),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(51),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(86),
+	char(101),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(51),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(97),
+	char(116),
+	char(114),
+	char(105),
+	char(120),
+	char(51),
+	char(120),
+	char(51),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(97),
+	char(116),
+	char(114),
+	char(105),
+	char(120),
+	char(51),
+	char(120),
+	char(51),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(66),
+	char(118),
+	char(104),
+	char(83),
+	char(117),
+	char(98),
+	char(116),
+	char(114),
+	char(101),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(79),
+	char(112),
+	char(116),
+	char(105),
+	char(109),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(79),
+	char(112),
+	char(116),
+	char(105),
+	char(109),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(116),
+	char(97),
+	char(116),
+	char(105),
+	char(99),
+	char(80),
+	char(108),
+	char(97),
+	char(110),
+	char(101),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(110),
+	char(97),
+	char(108),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(110),
+	char(100),
+	char(82),
+	char(97),
+	char(100),
+	char(105),
+	char(117),
+	char(115),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(117),
+	char(108),
+	char(116),
+	char(105),
+	char(83),
+	char(112),
+	char(104),
+	char(101),
+	char(114),
+	char(101),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(73),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(73),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(73),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(84),
+	char(114),
+	char(105),
+	char(112),
+	char(108),
+	char(101),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(104),
+	char(97),
+	char(114),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(84),
+	char(114),
+	char(105),
+	char(112),
+	char(108),
+	char(101),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(116),
+	char(114),
+	char(105),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(102),
+	char(97),
+	char(99),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(77),
+	char(97),
+	char(112),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(109),
+	char(112),
+	char(111),
+	char(117),
+	char(110),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(67),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(109),
+	char(112),
+	char(111),
+	char(117),
+	char(110),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(121),
+	char(108),
+	char(105),
+	char(110),
+	char(100),
+	char(101),
+	char(114),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(97),
+	char(112),
+	char(115),
+	char(117),
+	char(108),
+	char(101),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(71),
+	char(73),
+	char(109),
+	char(112),
+	char(97),
+	char(99),
+	char(116),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(72),
+	char(117),
+	char(108),
+	char(108),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(68),
+	char(121),
+	char(110),
+	char(97),
+	char(109),
+	char(105),
+	char(99),
+	char(115),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(68),
+	char(121),
+	char(110),
+	char(97),
+	char(109),
+	char(105),
+	char(99),
+	char(115),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(49),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(50),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(50),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(72),
+	char(105),
+	char(110),
+	char(103),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(72),
+	char(105),
+	char(110),
+	char(103),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(101),
+	char(84),
+	char(119),
+	char(105),
+	char(115),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(71),
+	char(101),
+	char(110),
+	char(101),
+	char(114),
+	char(105),
+	char(99),
+	char(54),
+	char(68),
+	char(111),
+	char(102),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(71),
+	char(101),
+	char(110),
+	char(101),
+	char(114),
+	char(105),
+	char(99),
+	char(54),
+	char(68),
+	char(111),
+	char(102),
+	char(83),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(108),
+	char(105),
+	char(100),
+	char(101),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(77),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(76),
+	char(105),
+	char(110),
+	char(107),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(70),
+	char(97),
+	char(99),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(84),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(65),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(67),
+	char(111),
+	char(110),
+	char(102),
+	char(105),
+	char(103),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(80),
+	char(111),
+	char(115),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(74),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(0),
+	char(0),
+	char(84),
+	char(76),
+	char(69),
+	char(78),
+	char(1),
+	char(0),
+	char(1),
+	char(0),
+	char(2),
+	char(0),
+	char(2),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(8),
+	char(0),
+	char(0),
+	char(0),
+	char(12),
+	char(0),
+	char(36),
+	char(0),
+	char(8),
+	char(0),
+	char(16),
+	char(0),
+	char(32),
+	char(0),
+	char(48),
+	char(0),
+	char(96),
+	char(0),
+	char(64),
+	char(0),
+	char(-128),
+	char(0),
+	char(20),
+	char(0),
+	char(48),
+	char(0),
+	char(80),
+	char(0),
+	char(16),
+	char(0),
+	char(84),
+	char(0),
+	char(-124),
+	char(0),
+	char(12),
+	char(0),
+	char(52),
+	char(0),
+	char(52),
+	char(0),
+	char(20),
+	char(0),
+	char(64),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(8),
+	char(0),
+	char(4),
+	char(0),
+	char(32),
+	char(0),
+	char(28),
+	char(0),
+	char(60),
+	char(0),
+	char(56),
+	char(0),
+	char(76),
+	char(0),
+	char(76),
+	char(0),
+	char(24),
+	char(0),
+	char(60),
+	char(0),
+	char(60),
+	char(0),
+	char(16),
+	char(0),
+	char(64),
+	char(0),
+	char(68),
+	char(0),
+	char(-48),
+	char(1),
+	char(0),
+	char(1),
+	char(-72),
+	char(0),
+	char(-104),
+	char(0),
+	char(104),
+	char(0),
+	char(88),
+	char(0),
+	char(-24),
+	char(1),
+	char(-96),
+	char(3),
+	char(8),
+	char(0),
+	char(52),
+	char(0),
+	char(0),
+	char(0),
+	char(84),
+	char(0),
+	char(116),
+	char(0),
+	char(92),
+	char(1),
+	char(-36),
+	char(0),
+	char(-44),
+	char(0),
+	char(-4),
+	char(0),
+	char(92),
+	char(1),
+	char(-52),
+	char(0),
+	char(16),
+	char(0),
+	char(100),
+	char(0),
+	char(20),
+	char(0),
+	char(36),
+	char(0),
+	char(100),
+	char(0),
+	char(92),
+	char(0),
+	char(104),
+	char(0),
+	char(-64),
+	char(0),
+	char(92),
+	char(1),
+	char(104),
+	char(0),
+	char(-84),
+	char(1),
+	char(83),
+	char(84),
+	char(82),
+	char(67),
+	char(65),
+	char(0),
+	char(0),
+	char(0),
+	char(10),
+	char(0),
+	char(3),
+	char(0),
+	char(4),
+	char(0),
+	char(0),
+	char(0),
+	char(4),
+	char(0),
+	char(1),
+	char(0),
+	char(9),
+	char(0),
+	char(2),
+	char(0),
+	char(11),
+	char(0),
+	char(3),
+	char(0),
+	char(10),
+	char(0),
+	char(3),
+	char(0),
+	char(10),
+	char(0),
+	char(4),
+	char(0),
+	char(10),
+	char(0),
+	char(5),
+	char(0),
+	char(12),
+	char(0),
+	char(2),
+	char(0),
+	char(9),
+	char(0),
+	char(6),
+	char(0),
+	char(9),
+	char(0),
+	char(7),
+	char(0),
+	char(13),
+	char(0),
+	char(1),
+	char(0),
+	char(7),
+	char(0),
+	char(8),
+	char(0),
+	char(14),
+	char(0),
+	char(1),
+	char(0),
+	char(8),
+	char(0),
+	char(8),
+	char(0),
+	char(15),
+	char(0),
+	char(1),
+	char(0),
+	char(13),
+	char(0),
+	char(9),
+	char(0),
+	char(16),
+	char(0),
+	char(1),
+	char(0),
+	char(14),
+	char(0),
+	char(9),
+	char(0),
+	char(17),
+	char(0),
+	char(2),
+	char(0),
+	char(15),
+	char(0),
+	char(10),
+	char(0),
+	char(13),
+	char(0),
+	char(11),
+	char(0),
+	char(18),
+	char(0),
+	char(2),
+	char(0),
+	char(16),
+	char(0),
+	char(10),
+	char(0),
+	char(14),
+	char(0),
+	char(11),
+	char(0),
+	char(19),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(12),
+	char(0),
+	char(4),
+	char(0),
+	char(13),
+	char(0),
+	char(2),
+	char(0),
+	char(14),
+	char(0),
+	char(2),
+	char(0),
+	char(15),
+	char(0),
+	char(20),
+	char(0),
+	char(6),
+	char(0),
+	char(13),
+	char(0),
+	char(16),
+	char(0),
+	char(13),
+	char(0),
+	char(17),
+	char(0),
+	char(4),
+	char(0),
+	char(18),
+	char(0),
+	char(4),
+	char(0),
+	char(19),
+	char(0),
+	char(4),
+	char(0),
+	char(20),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(21),
+	char(0),
+	char(6),
+	char(0),
+	char(14),
+	char(0),
+	char(16),
+	char(0),
+	char(14),
+	char(0),
+	char(17),
+	char(0),
+	char(4),
+	char(0),
+	char(18),
+	char(0),
+	char(4),
+	char(0),
+	char(19),
+	char(0),
+	char(4),
+	char(0),
+	char(20),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(22),
+	char(0),
+	char(3),
+	char(0),
+	char(2),
+	char(0),
+	char(14),
+	char(0),
+	char(2),
+	char(0),
+	char(15),
+	char(0),
+	char(4),
+	char(0),
+	char(22),
+	char(0),
+	char(23),
+	char(0),
+	char(12),
+	char(0),
+	char(13),
+	char(0),
+	char(23),
+	char(0),
+	char(13),
+	char(0),
+	char(24),
+	char(0),
+	char(13),
+	char(0),
+	char(25),
+	char(0),
+	char(4),
+	char(0),
+	char(26),
+	char(0),
+	char(4),
+	char(0),
+	char(27),
+	char(0),
+	char(4),
+	char(0),
+	char(28),
+	char(0),
+	char(4),
+	char(0),
+	char(29),
+	char(0),
+	char(20),
+	char(0),
+	char(30),
+	char(0),
+	char(22),
+	char(0),
+	char(31),
+	char(0),
+	char(19),
+	char(0),
+	char(32),
+	char(0),
+	char(4),
+	char(0),
+	char(33),
+	char(0),
+	char(4),
+	char(0),
+	char(34),
+	char(0),
+	char(24),
+	char(0),
+	char(12),
+	char(0),
+	char(14),
+	char(0),
+	char(23),
+	char(0),
+	char(14),
+	char(0),
+	char(24),
+	char(0),
+	char(14),
+	char(0),
+	char(25),
+	char(0),
+	char(4),
+	char(0),
+	char(26),
+	char(0),
+	char(4),
+	char(0),
+	char(27),
+	char(0),
+	char(4),
+	char(0),
+	char(28),
+	char(0),
+	char(4),
+	char(0),
+	char(29),
+	char(0),
+	char(21),
+	char(0),
+	char(30),
+	char(0),
+	char(22),
+	char(0),
+	char(31),
+	char(0),
+	char(4),
+	char(0),
+	char(33),
+	char(0),
+	char(4),
+	char(0),
+	char(34),
+	char(0),
+	char(19),
+	char(0),
+	char(32),
+	char(0),
+	char(25),
+	char(0),
+	char(3),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(4),
+	char(0),
+	char(36),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(26),
+	char(0),
+	char(5),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(13),
+	char(0),
+	char(40),
+	char(0),
+	char(7),
+	char(0),
+	char(41),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(27),
+	char(0),
+	char(5),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(13),
+	char(0),
+	char(42),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(4),
+	char(0),
+	char(44),
+	char(0),
+	char(28),
+	char(0),
+	char(2),
+	char(0),
+	char(13),
+	char(0),
+	char(45),
+	char(0),
+	char(7),
+	char(0),
+	char(46),
+	char(0),
+	char(29),
+	char(0),
+	char(4),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(28),
+	char(0),
+	char(48),
+	char(0),
+	char(4),
+	char(0),
+	char(49),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(30),
+	char(0),
+	char(1),
+	char(0),
+	char(4),
+	char(0),
+	char(50),
+	char(0),
+	char(31),
+	char(0),
+	char(2),
+	char(0),
+	char(2),
+	char(0),
+	char(50),
+	char(0),
+	char(0),
+	char(0),
+	char(51),
+	char(0),
+	char(32),
+	char(0),
+	char(2),
+	char(0),
+	char(2),
+	char(0),
+	char(52),
+	char(0),
+	char(0),
+	char(0),
+	char(51),
+	char(0),
+	char(33),
+	char(0),
+	char(2),
+	char(0),
+	char(0),
+	char(0),
+	char(52),
+	char(0),
+	char(0),
+	char(0),
+	char(53),
+	char(0),
+	char(34),
+	char(0),
+	char(8),
+	char(0),
+	char(13),
+	char(0),
+	char(54),
+	char(0),
+	char(14),
+	char(0),
+	char(55),
+	char(0),
+	char(30),
+	char(0),
+	char(56),
+	char(0),
+	char(32),
+	char(0),
+	char(57),
+	char(0),
+	char(33),
+	char(0),
+	char(58),
+	char(0),
+	char(31),
+	char(0),
+	char(59),
+	char(0),
+	char(4),
+	char(0),
+	char(60),
+	char(0),
+	char(4),
+	char(0),
+	char(61),
+	char(0),
+	char(35),
+	char(0),
+	char(4),
+	char(0),
+	char(34),
+	char(0),
+	char(62),
+	char(0),
+	char(13),
+	char(0),
+	char(63),
+	char(0),
+	char(4),
+	char(0),
+	char(64),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(36),
+	char(0),
+	char(7),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(35),
+	char(0),
+	char(65),
+	char(0),
+	char(23),
+	char(0),
+	char(66),
+	char(0),
+	char(24),
+	char(0),
+	char(67),
+	char(0),
+	char(37),
+	char(0),
+	char(68),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(0),
+	char(0),
+	char(69),
+	char(0),
+	char(38),
+	char(0),
+	char(2),
+	char(0),
+	char(36),
+	char(0),
+	char(70),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(39),
+	char(0),
+	char(4),
+	char(0),
+	char(17),
+	char(0),
+	char(71),
+	char(0),
+	char(25),
+	char(0),
+	char(72),
+	char(0),
+	char(4),
+	char(0),
+	char(73),
+	char(0),
+	char(7),
+	char(0),
+	char(74),
+	char(0),
+	char(40),
+	char(0),
+	char(4),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(39),
+	char(0),
+	char(75),
+	char(0),
+	char(4),
+	char(0),
+	char(76),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(41),
+	char(0),
+	char(3),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(4),
+	char(0),
+	char(77),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(42),
+	char(0),
+	char(3),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(4),
+	char(0),
+	char(77),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(43),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(78),
+	char(0),
+	char(7),
+	char(0),
+	char(79),
+	char(0),
+	char(7),
+	char(0),
+	char(80),
+	char(0),
+	char(7),
+	char(0),
+	char(81),
+	char(0),
+	char(37),
+	char(0),
+	char(14),
+	char(0),
+	char(4),
+	char(0),
+	char(82),
+	char(0),
+	char(4),
+	char(0),
+	char(83),
+	char(0),
+	char(43),
+	char(0),
+	char(84),
+	char(0),
+	char(4),
+	char(0),
+	char(85),
+	char(0),
+	char(7),
+	char(0),
+	char(86),
+	char(0),
+	char(7),
+	char(0),
+	char(87),
+	char(0),
+	char(7),
+	char(0),
+	char(88),
+	char(0),
+	char(7),
+	char(0),
+	char(89),
+	char(0),
+	char(7),
+	char(0),
+	char(90),
+	char(0),
+	char(4),
+	char(0),
+	char(91),
+	char(0),
+	char(4),
+	char(0),
+	char(92),
+	char(0),
+	char(4),
+	char(0),
+	char(93),
+	char(0),
+	char(4),
+	char(0),
+	char(94),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(44),
+	char(0),
+	char(5),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(35),
+	char(0),
+	char(65),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(4),
+	char(0),
+	char(95),
+	char(0),
+	char(45),
+	char(0),
+	char(5),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(13),
+	char(0),
+	char(96),
+	char(0),
+	char(14),
+	char(0),
+	char(97),
+	char(0),
+	char(4),
+	char(0),
+	char(98),
+	char(0),
+	char(0),
+	char(0),
+	char(99),
+	char(0),
+	char(46),
+	char(0),
+	char(25),
+	char(0),
+	char(9),
+	char(0),
+	char(100),
+	char(0),
+	char(9),
+	char(0),
+	char(101),
+	char(0),
+	char(25),
+	char(0),
+	char(102),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(18),
+	char(0),
+	char(103),
+	char(0),
+	char(18),
+	char(0),
+	char(104),
+	char(0),
+	char(14),
+	char(0),
+	char(105),
+	char(0),
+	char(14),
+	char(0),
+	char(106),
+	char(0),
+	char(14),
+	char(0),
+	char(107),
+	char(0),
+	char(8),
+	char(0),
+	char(108),
+	char(0),
+	char(8),
+	char(0),
+	char(109),
+	char(0),
+	char(8),
+	char(0),
+	char(110),
+	char(0),
+	char(8),
+	char(0),
+	char(111),
+	char(0),
+	char(8),
+	char(0),
+	char(112),
+	char(0),
+	char(8),
+	char(0),
+	char(113),
+	char(0),
+	char(8),
+	char(0),
+	char(114),
+	char(0),
+	char(8),
+	char(0),
+	char(115),
+	char(0),
+	char(4),
+	char(0),
+	char(116),
+	char(0),
+	char(4),
+	char(0),
+	char(117),
+	char(0),
+	char(4),
+	char(0),
+	char(118),
+	char(0),
+	char(4),
+	char(0),
+	char(119),
+	char(0),
+	char(4),
+	char(0),
+	char(120),
+	char(0),
+	char(4),
+	char(0),
+	char(121),
+	char(0),
+	char(4),
+	char(0),
+	char(122),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(47),
+	char(0),
+	char(25),
+	char(0),
+	char(9),
+	char(0),
+	char(100),
+	char(0),
+	char(9),
+	char(0),
+	char(101),
+	char(0),
+	char(25),
+	char(0),
+	char(102),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(17),
+	char(0),
+	char(103),
+	char(0),
+	char(17),
+	char(0),
+	char(104),
+	char(0),
+	char(13),
+	char(0),
+	char(105),
+	char(0),
+	char(13),
+	char(0),
+	char(106),
+	char(0),
+	char(13),
+	char(0),
+	char(107),
+	char(0),
+	char(7),
+	char(0),
+	char(108),
+	char(0),
+	char(7),
+	char(0),
+	char(109),
+	char(0),
+	char(7),
+	char(0),
+	char(110),
+	char(0),
+	char(7),
+	char(0),
+	char(111),
+	char(0),
+	char(7),
+	char(0),
+	char(112),
+	char(0),
+	char(7),
+	char(0),
+	char(113),
+	char(0),
+	char(7),
+	char(0),
+	char(114),
+	char(0),
+	char(7),
+	char(0),
+	char(115),
+	char(0),
+	char(4),
+	char(0),
+	char(116),
+	char(0),
+	char(4),
+	char(0),
+	char(117),
+	char(0),
+	char(4),
+	char(0),
+	char(118),
+	char(0),
+	char(4),
+	char(0),
+	char(119),
+	char(0),
+	char(4),
+	char(0),
+	char(120),
+	char(0),
+	char(4),
+	char(0),
+	char(121),
+	char(0),
+	char(4),
+	char(0),
+	char(122),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(48),
+	char(0),
+	char(2),
+	char(0),
+	char(49),
+	char(0),
+	char(123),
+	char(0),
+	char(14),
+	char(0),
+	char(124),
+	char(0),
+	char(50),
+	char(0),
+	char(2),
+	char(0),
+	char(51),
+	char(0),
+	char(123),
+	char(0),
+	char(13),
+	char(0),
+	char(124),
+	char(0),
+	char(52),
+	char(0),
+	char(21),
+	char(0),
+	char(47),
+	char(0),
+	char(125),
+	char(0),
+	char(15),
+	char(0),
+	char(126),
+	char(0),
+	char(13),
+	char(0),
+	char(127),
+	char(0),
+	char(13),
+	char(0),
+	char(-128),
+	char(0),
+	char(13),
+	char(0),
+	char(-127),
+	char(0),
+	char(13),
+	char(0),
+	char(-126),
+	char(0),
+	char(13),
+	char(0),
+	char(124),
+	char(0),
+	char(13),
+	char(0),
+	char(-125),
+	char(0),
+	char(13),
+	char(0),
+	char(-124),
+	char(0),
+	char(13),
+	char(0),
+	char(-123),
+	char(0),
+	char(13),
+	char(0),
+	char(-122),
+	char(0),
+	char(7),
+	char(0),
+	char(-121),
+	char(0),
+	char(7),
+	char(0),
+	char(-120),
+	char(0),
+	char(7),
+	char(0),
+	char(-119),
+	char(0),
+	char(7),
+	char(0),
+	char(-118),
+	char(0),
+	char(7),
+	char(0),
+	char(-117),
+	char(0),
+	char(7),
+	char(0),
+	char(-116),
+	char(0),
+	char(7),
+	char(0),
+	char(-115),
+	char(0),
+	char(7),
+	char(0),
+	char(-114),
+	char(0),
+	char(7),
+	char(0),
+	char(-113),
+	char(0),
+	char(4),
+	char(0),
+	char(-112),
+	char(0),
+	char(53),
+	char(0),
+	char(22),
+	char(0),
+	char(46),
+	char(0),
+	char(125),
+	char(0),
+	char(16),
+	char(0),
+	char(126),
+	char(0),
+	char(14),
+	char(0),
+	char(127),
+	char(0),
+	char(14),
+	char(0),
+	char(-128),
+	char(0),
+	char(14),
+	char(0),
+	char(-127),
+	char(0),
+	char(14),
+	char(0),
+	char(-126),
+	char(0),
+	char(14),
+	char(0),
+	char(124),
+	char(0),
+	char(14),
+	char(0),
+	char(-125),
+	char(0),
+	char(14),
+	char(0),
+	char(-124),
+	char(0),
+	char(14),
+	char(0),
+	char(-123),
+	char(0),
+	char(14),
+	char(0),
+	char(-122),
+	char(0),
+	char(8),
+	char(0),
+	char(-121),
+	char(0),
+	char(8),
+	char(0),
+	char(-120),
+	char(0),
+	char(8),
+	char(0),
+	char(-119),
+	char(0),
+	char(8),
+	char(0),
+	char(-118),
+	char(0),
+	char(8),
+	char(0),
+	char(-117),
+	char(0),
+	char(8),
+	char(0),
+	char(-116),
+	char(0),
+	char(8),
+	char(0),
+	char(-115),
+	char(0),
+	char(8),
+	char(0),
+	char(-114),
+	char(0),
+	char(8),
+	char(0),
+	char(-113),
+	char(0),
+	char(4),
+	char(0),
+	char(-112),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(54),
+	char(0),
+	char(2),
+	char(0),
+	char(4),
+	char(0),
+	char(-111),
+	char(0),
+	char(4),
+	char(0),
+	char(-110),
+	char(0),
+	char(55),
+	char(0),
+	char(13),
+	char(0),
+	char(56),
+	char(0),
+	char(-109),
+	char(0),
+	char(56),
+	char(0),
+	char(-108),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(4),
+	char(0),
+	char(-107),
+	char(0),
+	char(4),
+	char(0),
+	char(-106),
+	char(0),
+	char(4),
+	char(0),
+	char(-105),
+	char(0),
+	char(4),
+	char(0),
+	char(-104),
+	char(0),
+	char(7),
+	char(0),
+	char(-103),
+	char(0),
+	char(7),
+	char(0),
+	char(-102),
+	char(0),
+	char(4),
+	char(0),
+	char(-101),
+	char(0),
+	char(4),
+	char(0),
+	char(-100),
+	char(0),
+	char(7),
+	char(0),
+	char(-99),
+	char(0),
+	char(4),
+	char(0),
+	char(-98),
+	char(0),
+	char(57),
+	char(0),
+	char(3),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(13),
+	char(0),
+	char(-96),
+	char(0),
+	char(13),
+	char(0),
+	char(-95),
+	char(0),
+	char(58),
+	char(0),
+	char(3),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(14),
+	char(0),
+	char(-96),
+	char(0),
+	char(14),
+	char(0),
+	char(-95),
+	char(0),
+	char(59),
+	char(0),
+	char(13),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(18),
+	char(0),
+	char(-94),
+	char(0),
+	char(18),
+	char(0),
+	char(-93),
+	char(0),
+	char(4),
+	char(0),
+	char(-92),
+	char(0),
+	char(4),
+	char(0),
+	char(-91),
+	char(0),
+	char(4),
+	char(0),
+	char(-90),
+	char(0),
+	char(7),
+	char(0),
+	char(-89),
+	char(0),
+	char(7),
+	char(0),
+	char(-88),
+	char(0),
+	char(7),
+	char(0),
+	char(-87),
+	char(0),
+	char(7),
+	char(0),
+	char(-86),
+	char(0),
+	char(7),
+	char(0),
+	char(-85),
+	char(0),
+	char(7),
+	char(0),
+	char(-84),
+	char(0),
+	char(7),
+	char(0),
+	char(-83),
+	char(0),
+	char(60),
+	char(0),
+	char(13),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(4),
+	char(0),
+	char(-92),
+	char(0),
+	char(4),
+	char(0),
+	char(-91),
+	char(0),
+	char(4),
+	char(0),
+	char(-90),
+	char(0),
+	char(7),
+	char(0),
+	char(-89),
+	char(0),
+	char(7),
+	char(0),
+	char(-88),
+	char(0),
+	char(7),
+	char(0),
+	char(-87),
+	char(0),
+	char(7),
+	char(0),
+	char(-86),
+	char(0),
+	char(7),
+	char(0),
+	char(-85),
+	char(0),
+	char(7),
+	char(0),
+	char(-84),
+	char(0),
+	char(7),
+	char(0),
+	char(-83),
+	char(0),
+	char(61),
+	char(0),
+	char(11),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(7),
+	char(0),
+	char(-82),
+	char(0),
+	char(7),
+	char(0),
+	char(-81),
+	char(0),
+	char(7),
+	char(0),
+	char(-80),
+	char(0),
+	char(7),
+	char(0),
+	char(-85),
+	char(0),
+	char(7),
+	char(0),
+	char(-84),
+	char(0),
+	char(7),
+	char(0),
+	char(-83),
+	char(0),
+	char(7),
+	char(0),
+	char(-79),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(62),
+	char(0),
+	char(9),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(13),
+	char(0),
+	char(-78),
+	char(0),
+	char(13),
+	char(0),
+	char(-77),
+	char(0),
+	char(13),
+	char(0),
+	char(-76),
+	char(0),
+	char(13),
+	char(0),
+	char(-75),
+	char(0),
+	char(4),
+	char(0),
+	char(-74),
+	char(0),
+	char(4),
+	char(0),
+	char(-73),
+	char(0),
+	char(63),
+	char(0),
+	char(5),
+	char(0),
+	char(62),
+	char(0),
+	char(-72),
+	char(0),
+	char(4),
+	char(0),
+	char(-71),
+	char(0),
+	char(7),
+	char(0),
+	char(-70),
+	char(0),
+	char(7),
+	char(0),
+	char(-69),
+	char(0),
+	char(7),
+	char(0),
+	char(-68),
+	char(0),
+	char(64),
+	char(0),
+	char(9),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(7),
+	char(0),
+	char(-78),
+	char(0),
+	char(7),
+	char(0),
+	char(-77),
+	char(0),
+	char(7),
+	char(0),
+	char(-76),
+	char(0),
+	char(7),
+	char(0),
+	char(-75),
+	char(0),
+	char(4),
+	char(0),
+	char(-74),
+	char(0),
+	char(4),
+	char(0),
+	char(-73),
+	char(0),
+	char(49),
+	char(0),
+	char(22),
+	char(0),
+	char(8),
+	char(0),
+	char(-67),
+	char(0),
+	char(8),
+	char(0),
+	char(-79),
+	char(0),
+	char(8),
+	char(0),
+	char(110),
+	char(0),
+	char(8),
+	char(0),
+	char(-66),
+	char(0),
+	char(8),
+	char(0),
+	char(112),
+	char(0),
+	char(8),
+	char(0),
+	char(-65),
+	char(0),
+	char(8),
+	char(0),
+	char(-64),
+	char(0),
+	char(8),
+	char(0),
+	char(-63),
+	char(0),
+	char(8),
+	char(0),
+	char(-62),
+	char(0),
+	char(8),
+	char(0),
+	char(-61),
+	char(0),
+	char(8),
+	char(0),
+	char(-60),
+	char(0),
+	char(8),
+	char(0),
+	char(-59),
+	char(0),
+	char(8),
+	char(0),
+	char(-58),
+	char(0),
+	char(8),
+	char(0),
+	char(-57),
+	char(0),
+	char(8),
+	char(0),
+	char(-56),
+	char(0),
+	char(8),
+	char(0),
+	char(-55),
+	char(0),
+	char(4),
+	char(0),
+	char(-54),
+	char(0),
+	char(4),
+	char(0),
+	char(-53),
+	char(0),
+	char(4),
+	char(0),
+	char(-52),
+	char(0),
+	char(4),
+	char(0),
+	char(-51),
+	char(0),
+	char(4),
+	char(0),
+	char(-50),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(51),
+	char(0),
+	char(22),
+	char(0),
+	char(7),
+	char(0),
+	char(-67),
+	char(0),
+	char(7),
+	char(0),
+	char(-79),
+	char(0),
+	char(7),
+	char(0),
+	char(110),
+	char(0),
+	char(7),
+	char(0),
+	char(-66),
+	char(0),
+	char(7),
+	char(0),
+	char(112),
+	char(0),
+	char(7),
+	char(0),
+	char(-65),
+	char(0),
+	char(7),
+	char(0),
+	char(-64),
+	char(0),
+	char(7),
+	char(0),
+	char(-63),
+	char(0),
+	char(7),
+	char(0),
+	char(-62),
+	char(0),
+	char(7),
+	char(0),
+	char(-61),
+	char(0),
+	char(7),
+	char(0),
+	char(-60),
+	char(0),
+	char(7),
+	char(0),
+	char(-59),
+	char(0),
+	char(7),
+	char(0),
+	char(-58),
+	char(0),
+	char(7),
+	char(0),
+	char(-57),
+	char(0),
+	char(7),
+	char(0),
+	char(-56),
+	char(0),
+	char(7),
+	char(0),
+	char(-55),
+	char(0),
+	char(4),
+	char(0),
+	char(-54),
+	char(0),
+	char(4),
+	char(0),
+	char(-53),
+	char(0),
+	char(4),
+	char(0),
+	char(-52),
+	char(0),
+	char(4),
+	char(0),
+	char(-51),
+	char(0),
+	char(4),
+	char(0),
+	char(-50),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(65),
+	char(0),
+	char(4),
+	char(0),
+	char(7),
+	char(0),
+	char(-49),
+	char(0),
+	char(7),
+	char(0),
+	char(-48),
+	char(0),
+	char(7),
+	char(0),
+	char(-47),
+	char(0),
+	char(4),
+	char(0),
+	char(78),
+	char(0),
+	char(66),
+	char(0),
+	char(10),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(13),
+	char(0),
+	char(-45),
+	char(0),
+	char(13),
+	char(0),
+	char(-44),
+	char(0),
+	char(13),
+	char(0),
+	char(-43),
+	char(0),
+	char(13),
+	char(0),
+	char(-42),
+	char(0),
+	char(13),
+	char(0),
+	char(-41),
+	char(0),
+	char(7),
+	char(0),
+	char(-121),
+	char(0),
+	char(7),
+	char(0),
+	char(-40),
+	char(0),
+	char(4),
+	char(0),
+	char(-39),
+	char(0),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(67),
+	char(0),
+	char(4),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(4),
+	char(0),
+	char(-38),
+	char(0),
+	char(7),
+	char(0),
+	char(-37),
+	char(0),
+	char(4),
+	char(0),
+	char(-36),
+	char(0),
+	char(68),
+	char(0),
+	char(4),
+	char(0),
+	char(13),
+	char(0),
+	char(-41),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(4),
+	char(0),
+	char(-35),
+	char(0),
+	char(7),
+	char(0),
+	char(-34),
+	char(0),
+	char(69),
+	char(0),
+	char(7),
+	char(0),
+	char(13),
+	char(0),
+	char(-33),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(4),
+	char(0),
+	char(-32),
+	char(0),
+	char(7),
+	char(0),
+	char(-31),
+	char(0),
+	char(7),
+	char(0),
+	char(-30),
+	char(0),
+	char(7),
+	char(0),
+	char(-29),
+	char(0),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(70),
+	char(0),
+	char(6),
+	char(0),
+	char(15),
+	char(0),
+	char(-28),
+	char(0),
+	char(13),
+	char(0),
+	char(-30),
+	char(0),
+	char(13),
+	char(0),
+	char(-27),
+	char(0),
+	char(56),
+	char(0),
+	char(-26),
+	char(0),
+	char(4),
+	char(0),
+	char(-25),
+	char(0),
+	char(7),
+	char(0),
+	char(-29),
+	char(0),
+	char(71),
+	char(0),
+	char(26),
+	char(0),
+	char(4),
+	char(0),
+	char(-24),
+	char(0),
+	char(7),
+	char(0),
+	char(-23),
+	char(0),
+	char(7),
+	char(0),
+	char(-79),
+	char(0),
+	char(7),
+	char(0),
+	char(-22),
+	char(0),
+	char(7),
+	char(0),
+	char(-21),
+	char(0),
+	char(7),
+	char(0),
+	char(-20),
+	char(0),
+	char(7),
+	char(0),
+	char(-19),
+	char(0),
+	char(7),
+	char(0),
+	char(-18),
+	char(0),
+	char(7),
+	char(0),
+	char(-17),
+	char(0),
+	char(7),
+	char(0),
+	char(-16),
+	char(0),
+	char(7),
+	char(0),
+	char(-15),
+	char(0),
+	char(7),
+	char(0),
+	char(-14),
+	char(0),
+	char(7),
+	char(0),
+	char(-13),
+	char(0),
+	char(7),
+	char(0),
+	char(-12),
+	char(0),
+	char(7),
+	char(0),
+	char(-11),
+	char(0),
+	char(7),
+	char(0),
+	char(-10),
+	char(0),
+	char(7),
+	char(0),
+	char(-9),
+	char(0),
+	char(7),
+	char(0),
+	char(-8),
+	char(0),
+	char(7),
+	char(0),
+	char(-7),
+	char(0),
+	char(7),
+	char(0),
+	char(-6),
+	char(0),
+	char(7),
+	char(0),
+	char(-5),
+	char(0),
+	char(4),
+	char(0),
+	char(-4),
+	char(0),
+	char(4),
+	char(0),
+	char(-3),
+	char(0),
+	char(4),
+	char(0),
+	char(-2),
+	char(0),
+	char(4),
+	char(0),
+	char(-1),
+	char(0),
+	char(4),
+	char(0),
+	char(117),
+	char(0),
+	char(72),
+	char(0),
+	char(12),
+	char(0),
+	char(15),
+	char(0),
+	char(0),
+	char(1),
+	char(15),
+	char(0),
+	char(1),
+	char(1),
+	char(15),
+	char(0),
+	char(2),
+	char(1),
+	char(13),
+	char(0),
+	char(3),
+	char(1),
+	char(13),
+	char(0),
+	char(4),
+	char(1),
+	char(7),
+	char(0),
+	char(5),
+	char(1),
+	char(4),
+	char(0),
+	char(6),
+	char(1),
+	char(4),
+	char(0),
+	char(7),
+	char(1),
+	char(4),
+	char(0),
+	char(8),
+	char(1),
+	char(4),
+	char(0),
+	char(9),
+	char(1),
+	char(7),
+	char(0),
+	char(-31),
+	char(0),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(73),
+	char(0),
+	char(27),
+	char(0),
+	char(17),
+	char(0),
+	char(10),
+	char(1),
+	char(15),
+	char(0),
+	char(11),
+	char(1),
+	char(15),
+	char(0),
+	char(12),
+	char(1),
+	char(13),
+	char(0),
+	char(3),
+	char(1),
+	char(13),
+	char(0),
+	char(13),
+	char(1),
+	char(13),
+	char(0),
+	char(14),
+	char(1),
+	char(13),
+	char(0),
+	char(15),
+	char(1),
+	char(13),
+	char(0),
+	char(16),
+	char(1),
+	char(13),
+	char(0),
+	char(17),
+	char(1),
+	char(4),
+	char(0),
+	char(18),
+	char(1),
+	char(7),
+	char(0),
+	char(19),
+	char(1),
+	char(4),
+	char(0),
+	char(20),
+	char(1),
+	char(4),
+	char(0),
+	char(21),
+	char(1),
+	char(4),
+	char(0),
+	char(22),
+	char(1),
+	char(7),
+	char(0),
+	char(23),
+	char(1),
+	char(7),
+	char(0),
+	char(24),
+	char(1),
+	char(4),
+	char(0),
+	char(25),
+	char(1),
+	char(4),
+	char(0),
+	char(26),
+	char(1),
+	char(7),
+	char(0),
+	char(27),
+	char(1),
+	char(7),
+	char(0),
+	char(28),
+	char(1),
+	char(7),
+	char(0),
+	char(29),
+	char(1),
+	char(7),
+	char(0),
+	char(30),
+	char(1),
+	char(7),
+	char(0),
+	char(31),
+	char(1),
+	char(7),
+	char(0),
+	char(32),
+	char(1),
+	char(4),
+	char(0),
+	char(33),
+	char(1),
+	char(4),
+	char(0),
+	char(34),
+	char(1),
+	char(4),
+	char(0),
+	char(35),
+	char(1),
+	char(74),
+	char(0),
+	char(12),
+	char(0),
+	char(9),
+	char(0),
+	char(36),
+	char(1),
+	char(9),
+	char(0),
+	char(37),
+	char(1),
+	char(13),
+	char(0),
+	char(38),
+	char(1),
+	char(7),
+	char(0),
+	char(39),
+	char(1),
+	char(7),
+	char(0),
+	char(-63),
+	char(0),
+	char(7),
+	char(0),
+	char(40),
+	char(1),
+	char(4),
+	char(0),
+	char(41),
+	char(1),
+	char(13),
+	char(0),
+	char(42),
+	char(1),
+	char(4),
+	char(0),
+	char(43),
+	char(1),
+	char(4),
+	char(0),
+	char(44),
+	char(1),
+	char(4),
+	char(0),
+	char(45),
+	char(1),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(75),
+	char(0),
+	char(19),
+	char(0),
+	char(47),
+	char(0),
+	char(125),
+	char(0),
+	char(72),
+	char(0),
+	char(46),
+	char(1),
+	char(65),
+	char(0),
+	char(47),
+	char(1),
+	char(66),
+	char(0),
+	char(48),
+	char(1),
+	char(67),
+	char(0),
+	char(49),
+	char(1),
+	char(68),
+	char(0),
+	char(50),
+	char(1),
+	char(69),
+	char(0),
+	char(51),
+	char(1),
+	char(70),
+	char(0),
+	char(52),
+	char(1),
+	char(73),
+	char(0),
+	char(53),
+	char(1),
+	char(74),
+	char(0),
+	char(54),
+	char(1),
+	char(4),
+	char(0),
+	char(55),
+	char(1),
+	char(4),
+	char(0),
+	char(21),
+	char(1),
+	char(4),
+	char(0),
+	char(56),
+	char(1),
+	char(4),
+	char(0),
+	char(57),
+	char(1),
+	char(4),
+	char(0),
+	char(58),
+	char(1),
+	char(4),
+	char(0),
+	char(59),
+	char(1),
+	char(4),
+	char(0),
+	char(60),
+	char(1),
+	char(4),
+	char(0),
+	char(61),
+	char(1),
+	char(71),
+	char(0),
+	char(62),
+	char(1),
+};
+int b3s_bulletDNAlen = sizeof(b3s_bulletDNAstr);
+char b3s_bulletDNAstr64[] = {
+	char(83),
+	char(68),
+	char(78),
+	char(65),
+	char(78),
+	char(65),
+	char(77),
+	char(69),
+	char(63),
+	char(1),
+	char(0),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(97),
+	char(112),
+	char(97),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(100),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(42),
+	char(102),
+	char(105),
+	char(114),
+	char(115),
+	char(116),
+	char(0),
+	char(42),
+	char(108),
+	char(97),
+	char(115),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(115),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(108),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(97),
+	char(115),
+	char(105),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(111),
+	char(114),
+	char(105),
+	char(103),
+	char(105),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(111),
+	char(116),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(117),
+	char(98),
+	char(116),
+	char(114),
+	char(101),
+	char(101),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(105),
+	char(110),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(97),
+	char(120),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(105),
+	char(110),
+	char(79),
+	char(114),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(97),
+	char(120),
+	char(79),
+	char(114),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(115),
+	char(99),
+	char(97),
+	char(112),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(117),
+	char(98),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(115),
+	char(99),
+	char(97),
+	char(112),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(79),
+	char(114),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(104),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(105),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(104),
+	char(65),
+	char(97),
+	char(98),
+	char(98),
+	char(77),
+	char(97),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(104),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(117),
+	char(114),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(76),
+	char(101),
+	char(97),
+	char(102),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(105),
+	char(103),
+	char(117),
+	char(111),
+	char(117),
+	char(115),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(115),
+	char(117),
+	char(98),
+	char(84),
+	char(114),
+	char(101),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(97),
+	char(118),
+	char(101),
+	char(114),
+	char(115),
+	char(97),
+	char(108),
+	char(77),
+	char(111),
+	char(100),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(83),
+	char(117),
+	char(98),
+	char(116),
+	char(114),
+	char(101),
+	char(101),
+	char(72),
+	char(101),
+	char(97),
+	char(100),
+	char(101),
+	char(114),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(83),
+	char(99),
+	char(97),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(108),
+	char(97),
+	char(110),
+	char(101),
+	char(78),
+	char(111),
+	char(114),
+	char(109),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(108),
+	char(97),
+	char(110),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(97),
+	char(110),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(109),
+	char(112),
+	char(108),
+	char(105),
+	char(99),
+	char(105),
+	char(116),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(105),
+	char(109),
+	char(101),
+	char(110),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(77),
+	char(97),
+	char(114),
+	char(103),
+	char(105),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(97),
+	char(100),
+	char(105),
+	char(117),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(110),
+	char(97),
+	char(108),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(115),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(51),
+	char(102),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(51),
+	char(100),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(51),
+	char(50),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(51),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(49),
+	char(54),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(51),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(56),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(49),
+	char(54),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(86),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(101),
+	char(115),
+	char(104),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(115),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(101),
+	char(115),
+	char(104),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(102),
+	char(97),
+	char(99),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(66),
+	char(118),
+	char(104),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(113),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(66),
+	char(118),
+	char(104),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(77),
+	char(97),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(51),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(105),
+	char(109),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(77),
+	char(97),
+	char(114),
+	char(103),
+	char(105),
+	char(110),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(112),
+	char(65),
+	char(120),
+	char(105),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(108),
+	char(97),
+	char(103),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(86),
+	char(48),
+	char(86),
+	char(49),
+	char(65),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(86),
+	char(49),
+	char(86),
+	char(50),
+	char(65),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(86),
+	char(50),
+	char(86),
+	char(48),
+	char(65),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(104),
+	char(97),
+	char(115),
+	char(104),
+	char(84),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(101),
+	char(120),
+	char(116),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(118),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(107),
+	char(101),
+	char(121),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(69),
+	char(112),
+	char(115),
+	char(105),
+	char(108),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(108),
+	char(97),
+	char(110),
+	char(97),
+	char(114),
+	char(69),
+	char(112),
+	char(115),
+	char(105),
+	char(108),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(113),
+	char(117),
+	char(97),
+	char(108),
+	char(86),
+	char(101),
+	char(114),
+	char(116),
+	char(101),
+	char(120),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(100),
+	char(103),
+	char(101),
+	char(68),
+	char(105),
+	char(115),
+	char(116),
+	char(97),
+	char(110),
+	char(99),
+	char(101),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(122),
+	char(101),
+	char(114),
+	char(111),
+	char(65),
+	char(114),
+	char(101),
+	char(97),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(101),
+	char(120),
+	char(116),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(104),
+	char(97),
+	char(115),
+	char(104),
+	char(84),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(86),
+	char(97),
+	char(108),
+	char(117),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(75),
+	char(101),
+	char(121),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(105),
+	char(109),
+	char(112),
+	char(97),
+	char(99),
+	char(116),
+	char(83),
+	char(117),
+	char(98),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(117),
+	char(110),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(117),
+	char(110),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(80),
+	char(116),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(85),
+	char(110),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(51),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(98),
+	char(114),
+	char(111),
+	char(97),
+	char(100),
+	char(112),
+	char(104),
+	char(97),
+	char(115),
+	char(101),
+	char(72),
+	char(97),
+	char(110),
+	char(100),
+	char(108),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(111),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(119),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(112),
+	char(111),
+	char(108),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(112),
+	char(111),
+	char(108),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(76),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(112),
+	char(111),
+	char(108),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(105),
+	char(115),
+	char(111),
+	char(116),
+	char(114),
+	char(111),
+	char(112),
+	char(105),
+	char(99),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(80),
+	char(114),
+	char(111),
+	char(99),
+	char(101),
+	char(115),
+	char(115),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(101),
+	char(97),
+	char(99),
+	char(116),
+	char(105),
+	char(118),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(105),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(105),
+	char(116),
+	char(117),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(104),
+	char(105),
+	char(116),
+	char(70),
+	char(114),
+	char(97),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(99),
+	char(100),
+	char(83),
+	char(119),
+	char(101),
+	char(112),
+	char(116),
+	char(83),
+	char(112),
+	char(104),
+	char(101),
+	char(114),
+	char(101),
+	char(82),
+	char(97),
+	char(100),
+	char(105),
+	char(117),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(99),
+	char(100),
+	char(77),
+	char(111),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(104),
+	char(97),
+	char(115),
+	char(65),
+	char(110),
+	char(105),
+	char(115),
+	char(111),
+	char(116),
+	char(114),
+	char(111),
+	char(112),
+	char(105),
+	char(99),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(70),
+	char(108),
+	char(97),
+	char(103),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(115),
+	char(108),
+	char(97),
+	char(110),
+	char(100),
+	char(84),
+	char(97),
+	char(103),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(109),
+	char(112),
+	char(97),
+	char(110),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(99),
+	char(116),
+	char(105),
+	char(118),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(116),
+	char(97),
+	char(116),
+	char(101),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(110),
+	char(97),
+	char(108),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(104),
+	char(101),
+	char(99),
+	char(107),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(100),
+	char(101),
+	char(87),
+	char(105),
+	char(116),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(114),
+	char(97),
+	char(118),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(73),
+	char(110),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(97),
+	char(84),
+	char(101),
+	char(110),
+	char(115),
+	char(111),
+	char(114),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(114),
+	char(97),
+	char(118),
+	char(105),
+	char(116),
+	char(121),
+	char(95),
+	char(97),
+	char(99),
+	char(99),
+	char(101),
+	char(108),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(73),
+	char(110),
+	char(101),
+	char(114),
+	char(116),
+	char(105),
+	char(97),
+	char(76),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(111),
+	char(116),
+	char(97),
+	char(108),
+	char(70),
+	char(111),
+	char(114),
+	char(99),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(111),
+	char(116),
+	char(97),
+	char(108),
+	char(84),
+	char(111),
+	char(114),
+	char(113),
+	char(117),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(101),
+	char(114),
+	char(115),
+	char(101),
+	char(77),
+	char(97),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(76),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(83),
+	char(113),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(83),
+	char(113),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(83),
+	char(108),
+	char(101),
+	char(101),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(83),
+	char(108),
+	char(101),
+	char(101),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(100),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(97),
+	char(108),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(82),
+	char(111),
+	char(119),
+	char(115),
+	char(0),
+	char(110),
+	char(117),
+	char(98),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(65),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(66),
+	char(0),
+	char(109),
+	char(95),
+	char(111),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(73),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(101),
+	char(101),
+	char(100),
+	char(115),
+	char(70),
+	char(101),
+	char(101),
+	char(100),
+	char(98),
+	char(97),
+	char(99),
+	char(107),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(112),
+	char(112),
+	char(108),
+	char(105),
+	char(101),
+	char(100),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(98),
+	char(103),
+	char(68),
+	char(114),
+	char(97),
+	char(119),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(105),
+	char(115),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(66),
+	char(101),
+	char(116),
+	char(119),
+	char(101),
+	char(101),
+	char(110),
+	char(76),
+	char(105),
+	char(110),
+	char(107),
+	char(101),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(105),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(111),
+	char(118),
+	char(101),
+	char(114),
+	char(114),
+	char(105),
+	char(100),
+	char(101),
+	char(78),
+	char(117),
+	char(109),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(114),
+	char(101),
+	char(97),
+	char(107),
+	char(105),
+	char(110),
+	char(103),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(115),
+	char(69),
+	char(110),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(121),
+	char(112),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(105),
+	char(118),
+	char(111),
+	char(116),
+	char(73),
+	char(110),
+	char(65),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(105),
+	char(118),
+	char(111),
+	char(116),
+	char(73),
+	char(110),
+	char(66),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(65),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(98),
+	char(66),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(82),
+	char(101),
+	char(102),
+	char(101),
+	char(114),
+	char(101),
+	char(110),
+	char(99),
+	char(101),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(65),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(79),
+	char(110),
+	char(108),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(110),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(65),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(77),
+	char(111),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(111),
+	char(116),
+	char(111),
+	char(114),
+	char(84),
+	char(97),
+	char(114),
+	char(103),
+	char(101),
+	char(116),
+	char(86),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(77),
+	char(111),
+	char(116),
+	char(111),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(119),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(112),
+	char(112),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(105),
+	char(97),
+	char(115),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(108),
+	char(97),
+	char(120),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(119),
+	char(105),
+	char(110),
+	char(103),
+	char(83),
+	char(112),
+	char(97),
+	char(110),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(119),
+	char(105),
+	char(110),
+	char(103),
+	char(83),
+	char(112),
+	char(97),
+	char(110),
+	char(50),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(119),
+	char(105),
+	char(115),
+	char(116),
+	char(83),
+	char(112),
+	char(97),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(85),
+	char(112),
+	char(112),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(76),
+	char(111),
+	char(119),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(85),
+	char(112),
+	char(112),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(76),
+	char(111),
+	char(119),
+	char(101),
+	char(114),
+	char(76),
+	char(105),
+	char(109),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(76),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(82),
+	char(101),
+	char(102),
+	char(101),
+	char(114),
+	char(101),
+	char(110),
+	char(99),
+	char(101),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(65),
+	char(0),
+	char(109),
+	char(95),
+	char(117),
+	char(115),
+	char(101),
+	char(79),
+	char(102),
+	char(102),
+	char(115),
+	char(101),
+	char(116),
+	char(70),
+	char(111),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(54),
+	char(100),
+	char(111),
+	char(102),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(69),
+	char(110),
+	char(97),
+	char(98),
+	char(108),
+	char(101),
+	char(100),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(113),
+	char(117),
+	char(105),
+	char(108),
+	char(105),
+	char(98),
+	char(114),
+	char(105),
+	char(117),
+	char(109),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(68),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(91),
+	char(54),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(97),
+	char(117),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(105),
+	char(109),
+	char(101),
+	char(83),
+	char(116),
+	char(101),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(69),
+	char(114),
+	char(114),
+	char(111),
+	char(114),
+	char(82),
+	char(101),
+	char(100),
+	char(117),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(114),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(101),
+	char(114),
+	char(112),
+	char(50),
+	char(0),
+	char(109),
+	char(95),
+	char(103),
+	char(108),
+	char(111),
+	char(98),
+	char(97),
+	char(108),
+	char(67),
+	char(102),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(80),
+	char(101),
+	char(110),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(84),
+	char(117),
+	char(114),
+	char(110),
+	char(69),
+	char(114),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(83),
+	char(108),
+	char(111),
+	char(112),
+	char(0),
+	char(109),
+	char(95),
+	char(119),
+	char(97),
+	char(114),
+	char(109),
+	char(115),
+	char(116),
+	char(97),
+	char(114),
+	char(116),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(71),
+	char(121),
+	char(114),
+	char(111),
+	char(115),
+	char(99),
+	char(111),
+	char(112),
+	char(105),
+	char(99),
+	char(70),
+	char(111),
+	char(114),
+	char(99),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(105),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(65),
+	char(120),
+	char(105),
+	char(115),
+	char(82),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(110),
+	char(103),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(77),
+	char(111),
+	char(100),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(105),
+	char(110),
+	char(103),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(82),
+	char(101),
+	char(115),
+	char(116),
+	char(105),
+	char(116),
+	char(117),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(84),
+	char(104),
+	char(114),
+	char(101),
+	char(115),
+	char(104),
+	char(111),
+	char(108),
+	char(100),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(105),
+	char(110),
+	char(105),
+	char(109),
+	char(117),
+	char(109),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(66),
+	char(97),
+	char(116),
+	char(99),
+	char(104),
+	char(83),
+	char(105),
+	char(122),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(101),
+	char(97),
+	char(114),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(103),
+	char(117),
+	char(108),
+	char(97),
+	char(114),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(83),
+	char(116),
+	char(105),
+	char(102),
+	char(102),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(114),
+	char(101),
+	char(118),
+	char(105),
+	char(111),
+	char(117),
+	char(115),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(99),
+	char(99),
+	char(117),
+	char(109),
+	char(117),
+	char(108),
+	char(97),
+	char(116),
+	char(101),
+	char(100),
+	char(70),
+	char(111),
+	char(114),
+	char(99),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(114),
+	char(109),
+	char(97),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(114),
+	char(101),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(116),
+	char(116),
+	char(97),
+	char(99),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(76),
+	char(101),
+	char(110),
+	char(103),
+	char(116),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(98),
+	char(101),
+	char(110),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(91),
+	char(51),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(65),
+	char(114),
+	char(101),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(48),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(91),
+	char(52),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(115),
+	char(116),
+	char(86),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(49),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(50),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(48),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(97),
+	char(108),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(114),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(101),
+	char(114),
+	char(111),
+	char(77),
+	char(111),
+	char(100),
+	char(101),
+	char(108),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(97),
+	char(117),
+	char(109),
+	char(103),
+	char(97),
+	char(114),
+	char(116),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(114),
+	char(97),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(102),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(114),
+	char(101),
+	char(115),
+	char(115),
+	char(117),
+	char(114),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(121),
+	char(110),
+	char(97),
+	char(109),
+	char(105),
+	char(99),
+	char(70),
+	char(114),
+	char(105),
+	char(99),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(101),
+	char(77),
+	char(97),
+	char(116),
+	char(99),
+	char(104),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(107),
+	char(105),
+	char(110),
+	char(101),
+	char(116),
+	char(105),
+	char(99),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(75),
+	char(105),
+	char(110),
+	char(101),
+	char(116),
+	char(105),
+	char(99),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(72),
+	char(97),
+	char(114),
+	char(100),
+	char(110),
+	char(101),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(83),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(75),
+	char(105),
+	char(110),
+	char(101),
+	char(116),
+	char(105),
+	char(99),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(83),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(111),
+	char(102),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(83),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(86),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(116),
+	char(105),
+	char(109),
+	char(101),
+	char(83),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(101),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(116),
+	char(121),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(114),
+	char(105),
+	char(102),
+	char(116),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(116),
+	char(101),
+	char(114),
+	char(97),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(111),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(113),
+	char(113),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(109),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(119),
+	char(101),
+	char(105),
+	char(103),
+	char(104),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(87),
+	char(101),
+	char(105),
+	char(103),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(118),
+	char(111),
+	char(108),
+	char(117),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(102),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(102),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(120),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(111),
+	char(99),
+	char(105),
+	char(105),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(110),
+	char(118),
+	char(119),
+	char(105),
+	char(0),
+	char(109),
+	char(95),
+	char(118),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(118),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(118),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(102),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(114),
+	char(101),
+	char(102),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(73),
+	char(110),
+	char(100),
+	char(105),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(115),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(70),
+	char(114),
+	char(97),
+	char(109),
+	char(101),
+	char(82),
+	char(101),
+	char(102),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(77),
+	char(97),
+	char(115),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(100),
+	char(109),
+	char(97),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(105),
+	char(109),
+	char(97),
+	char(115),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(118),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(100),
+	char(105),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(108),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(97),
+	char(100),
+	char(97),
+	char(109),
+	char(112),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(116),
+	char(99),
+	char(104),
+	char(105),
+	char(110),
+	char(103),
+	char(0),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(120),
+	char(83),
+	char(101),
+	char(108),
+	char(102),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(101),
+	char(108),
+	char(102),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(73),
+	char(109),
+	char(112),
+	char(117),
+	char(108),
+	char(115),
+	char(101),
+	char(70),
+	char(97),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(105),
+	char(110),
+	char(115),
+	char(65),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(100),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(65),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(66),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(102),
+	char(115),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(102),
+	char(109),
+	char(0),
+	char(109),
+	char(95),
+	char(115),
+	char(112),
+	char(108),
+	char(105),
+	char(116),
+	char(0),
+	char(109),
+	char(95),
+	char(100),
+	char(101),
+	char(108),
+	char(101),
+	char(116),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(114),
+	char(101),
+	char(108),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(91),
+	char(50),
+	char(93),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(65),
+	char(116),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(98),
+	char(111),
+	char(100),
+	char(121),
+	char(66),
+	char(116),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(109),
+	char(95),
+	char(106),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(112),
+	char(111),
+	char(115),
+	char(101),
+	char(0),
+	char(42),
+	char(42),
+	char(109),
+	char(95),
+	char(109),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(110),
+	char(111),
+	char(100),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(108),
+	char(105),
+	char(110),
+	char(107),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(102),
+	char(97),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(116),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(104),
+	char(101),
+	char(100),
+	char(114),
+	char(97),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(97),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(99),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(115),
+	char(0),
+	char(42),
+	char(109),
+	char(95),
+	char(106),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(77),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(76),
+	char(105),
+	char(110),
+	char(107),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(70),
+	char(97),
+	char(99),
+	char(101),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(84),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(104),
+	char(101),
+	char(100),
+	char(114),
+	char(97),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(65),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(110),
+	char(117),
+	char(109),
+	char(74),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(115),
+	char(0),
+	char(109),
+	char(95),
+	char(99),
+	char(111),
+	char(110),
+	char(102),
+	char(105),
+	char(103),
+	char(0),
+	char(84),
+	char(89),
+	char(80),
+	char(69),
+	char(76),
+	char(0),
+	char(0),
+	char(0),
+	char(99),
+	char(104),
+	char(97),
+	char(114),
+	char(0),
+	char(117),
+	char(99),
+	char(104),
+	char(97),
+	char(114),
+	char(0),
+	char(115),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(0),
+	char(117),
+	char(115),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(0),
+	char(105),
+	char(110),
+	char(116),
+	char(0),
+	char(108),
+	char(111),
+	char(110),
+	char(103),
+	char(0),
+	char(117),
+	char(108),
+	char(111),
+	char(110),
+	char(103),
+	char(0),
+	char(102),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(0),
+	char(100),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(0),
+	char(118),
+	char(111),
+	char(105),
+	char(100),
+	char(0),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(65),
+	char(114),
+	char(114),
+	char(97),
+	char(121),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(104),
+	char(121),
+	char(115),
+	char(105),
+	char(99),
+	char(115),
+	char(83),
+	char(121),
+	char(115),
+	char(116),
+	char(101),
+	char(109),
+	char(0),
+	char(76),
+	char(105),
+	char(115),
+	char(116),
+	char(66),
+	char(97),
+	char(115),
+	char(101),
+	char(0),
+	char(98),
+	char(116),
+	char(86),
+	char(101),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(51),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(86),
+	char(101),
+	char(99),
+	char(116),
+	char(111),
+	char(114),
+	char(51),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(97),
+	char(116),
+	char(114),
+	char(105),
+	char(120),
+	char(51),
+	char(120),
+	char(51),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(97),
+	char(116),
+	char(114),
+	char(105),
+	char(120),
+	char(51),
+	char(120),
+	char(51),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(97),
+	char(110),
+	char(115),
+	char(102),
+	char(111),
+	char(114),
+	char(109),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(66),
+	char(118),
+	char(104),
+	char(83),
+	char(117),
+	char(98),
+	char(116),
+	char(114),
+	char(101),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(79),
+	char(112),
+	char(116),
+	char(105),
+	char(109),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(79),
+	char(112),
+	char(116),
+	char(105),
+	char(109),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(81),
+	char(117),
+	char(97),
+	char(110),
+	char(116),
+	char(105),
+	char(122),
+	char(101),
+	char(100),
+	char(66),
+	char(118),
+	char(104),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(116),
+	char(97),
+	char(116),
+	char(105),
+	char(99),
+	char(80),
+	char(108),
+	char(97),
+	char(110),
+	char(101),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(110),
+	char(97),
+	char(108),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(111),
+	char(115),
+	char(105),
+	char(116),
+	char(105),
+	char(111),
+	char(110),
+	char(65),
+	char(110),
+	char(100),
+	char(82),
+	char(97),
+	char(100),
+	char(105),
+	char(117),
+	char(115),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(117),
+	char(108),
+	char(116),
+	char(105),
+	char(83),
+	char(112),
+	char(104),
+	char(101),
+	char(114),
+	char(101),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(73),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(73),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(104),
+	char(111),
+	char(114),
+	char(116),
+	char(73),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(84),
+	char(114),
+	char(105),
+	char(112),
+	char(108),
+	char(101),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(104),
+	char(97),
+	char(114),
+	char(73),
+	char(110),
+	char(100),
+	char(101),
+	char(120),
+	char(84),
+	char(114),
+	char(105),
+	char(112),
+	char(108),
+	char(101),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(80),
+	char(97),
+	char(114),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(116),
+	char(114),
+	char(105),
+	char(100),
+	char(105),
+	char(110),
+	char(103),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(73),
+	char(110),
+	char(116),
+	char(101),
+	char(114),
+	char(102),
+	char(97),
+	char(99),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(77),
+	char(97),
+	char(112),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(99),
+	char(97),
+	char(108),
+	char(101),
+	char(100),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(109),
+	char(112),
+	char(111),
+	char(117),
+	char(110),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(67),
+	char(104),
+	char(105),
+	char(108),
+	char(100),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(109),
+	char(112),
+	char(111),
+	char(117),
+	char(110),
+	char(100),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(121),
+	char(108),
+	char(105),
+	char(110),
+	char(100),
+	char(101),
+	char(114),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(97),
+	char(112),
+	char(115),
+	char(117),
+	char(108),
+	char(101),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(114),
+	char(105),
+	char(97),
+	char(110),
+	char(103),
+	char(108),
+	char(101),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(71),
+	char(73),
+	char(109),
+	char(112),
+	char(97),
+	char(99),
+	char(116),
+	char(77),
+	char(101),
+	char(115),
+	char(104),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(118),
+	char(101),
+	char(120),
+	char(72),
+	char(117),
+	char(108),
+	char(108),
+	char(83),
+	char(104),
+	char(97),
+	char(112),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(108),
+	char(108),
+	char(105),
+	char(115),
+	char(105),
+	char(111),
+	char(110),
+	char(79),
+	char(98),
+	char(106),
+	char(101),
+	char(99),
+	char(116),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(68),
+	char(121),
+	char(110),
+	char(97),
+	char(109),
+	char(105),
+	char(99),
+	char(115),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(68),
+	char(121),
+	char(110),
+	char(97),
+	char(109),
+	char(105),
+	char(99),
+	char(115),
+	char(87),
+	char(111),
+	char(114),
+	char(108),
+	char(100),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(116),
+	char(97),
+	char(99),
+	char(116),
+	char(83),
+	char(111),
+	char(108),
+	char(118),
+	char(101),
+	char(114),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(73),
+	char(110),
+	char(102),
+	char(111),
+	char(49),
+	char(0),
+	char(98),
+	char(116),
+	char(84),
+	char(121),
+	char(112),
+	char(101),
+	char(100),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(50),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(50),
+	char(80),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(72),
+	char(105),
+	char(110),
+	char(103),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(111),
+	char(117),
+	char(98),
+	char(108),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(72),
+	char(105),
+	char(110),
+	char(103),
+	char(101),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(101),
+	char(84),
+	char(119),
+	char(105),
+	char(115),
+	char(116),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(71),
+	char(101),
+	char(110),
+	char(101),
+	char(114),
+	char(105),
+	char(99),
+	char(54),
+	char(68),
+	char(111),
+	char(102),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(71),
+	char(101),
+	char(110),
+	char(101),
+	char(114),
+	char(105),
+	char(99),
+	char(54),
+	char(68),
+	char(111),
+	char(102),
+	char(83),
+	char(112),
+	char(114),
+	char(105),
+	char(110),
+	char(103),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(108),
+	char(105),
+	char(100),
+	char(101),
+	char(114),
+	char(67),
+	char(111),
+	char(110),
+	char(115),
+	char(116),
+	char(114),
+	char(97),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(77),
+	char(97),
+	char(116),
+	char(101),
+	char(114),
+	char(105),
+	char(97),
+	char(108),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(78),
+	char(111),
+	char(100),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(76),
+	char(105),
+	char(110),
+	char(107),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(70),
+	char(97),
+	char(99),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(84),
+	char(101),
+	char(116),
+	char(114),
+	char(97),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(82),
+	char(105),
+	char(103),
+	char(105),
+	char(100),
+	char(65),
+	char(110),
+	char(99),
+	char(104),
+	char(111),
+	char(114),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(67),
+	char(111),
+	char(110),
+	char(102),
+	char(105),
+	char(103),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(80),
+	char(111),
+	char(115),
+	char(101),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(67),
+	char(108),
+	char(117),
+	char(115),
+	char(116),
+	char(101),
+	char(114),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(74),
+	char(111),
+	char(105),
+	char(110),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(98),
+	char(116),
+	char(83),
+	char(111),
+	char(102),
+	char(116),
+	char(66),
+	char(111),
+	char(100),
+	char(121),
+	char(70),
+	char(108),
+	char(111),
+	char(97),
+	char(116),
+	char(68),
+	char(97),
+	char(116),
+	char(97),
+	char(0),
+	char(0),
+	char(0),
+	char(84),
+	char(76),
+	char(69),
+	char(78),
+	char(1),
+	char(0),
+	char(1),
+	char(0),
+	char(2),
+	char(0),
+	char(2),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(8),
+	char(0),
+	char(0),
+	char(0),
+	char(16),
+	char(0),
+	char(48),
+	char(0),
+	char(16),
+	char(0),
+	char(16),
+	char(0),
+	char(32),
+	char(0),
+	char(48),
+	char(0),
+	char(96),
+	char(0),
+	char(64),
+	char(0),
+	char(-128),
+	char(0),
+	char(20),
+	char(0),
+	char(48),
+	char(0),
+	char(80),
+	char(0),
+	char(16),
+	char(0),
+	char(96),
+	char(0),
+	char(-112),
+	char(0),
+	char(16),
+	char(0),
+	char(56),
+	char(0),
+	char(56),
+	char(0),
+	char(20),
+	char(0),
+	char(72),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(8),
+	char(0),
+	char(4),
+	char(0),
+	char(56),
+	char(0),
+	char(32),
+	char(0),
+	char(80),
+	char(0),
+	char(72),
+	char(0),
+	char(96),
+	char(0),
+	char(80),
+	char(0),
+	char(32),
+	char(0),
+	char(64),
+	char(0),
+	char(64),
+	char(0),
+	char(16),
+	char(0),
+	char(72),
+	char(0),
+	char(80),
+	char(0),
+	char(-32),
+	char(1),
+	char(16),
+	char(1),
+	char(-72),
+	char(0),
+	char(-104),
+	char(0),
+	char(104),
+	char(0),
+	char(88),
+	char(0),
+	char(-8),
+	char(1),
+	char(-80),
+	char(3),
+	char(8),
+	char(0),
+	char(64),
+	char(0),
+	char(0),
+	char(0),
+	char(96),
+	char(0),
+	char(-128),
+	char(0),
+	char(104),
+	char(1),
+	char(-24),
+	char(0),
+	char(-32),
+	char(0),
+	char(8),
+	char(1),
+	char(104),
+	char(1),
+	char(-40),
+	char(0),
+	char(16),
+	char(0),
+	char(104),
+	char(0),
+	char(24),
+	char(0),
+	char(40),
+	char(0),
+	char(104),
+	char(0),
+	char(96),
+	char(0),
+	char(104),
+	char(0),
+	char(-56),
+	char(0),
+	char(104),
+	char(1),
+	char(112),
+	char(0),
+	char(-32),
+	char(1),
+	char(83),
+	char(84),
+	char(82),
+	char(67),
+	char(65),
+	char(0),
+	char(0),
+	char(0),
+	char(10),
+	char(0),
+	char(3),
+	char(0),
+	char(4),
+	char(0),
+	char(0),
+	char(0),
+	char(4),
+	char(0),
+	char(1),
+	char(0),
+	char(9),
+	char(0),
+	char(2),
+	char(0),
+	char(11),
+	char(0),
+	char(3),
+	char(0),
+	char(10),
+	char(0),
+	char(3),
+	char(0),
+	char(10),
+	char(0),
+	char(4),
+	char(0),
+	char(10),
+	char(0),
+	char(5),
+	char(0),
+	char(12),
+	char(0),
+	char(2),
+	char(0),
+	char(9),
+	char(0),
+	char(6),
+	char(0),
+	char(9),
+	char(0),
+	char(7),
+	char(0),
+	char(13),
+	char(0),
+	char(1),
+	char(0),
+	char(7),
+	char(0),
+	char(8),
+	char(0),
+	char(14),
+	char(0),
+	char(1),
+	char(0),
+	char(8),
+	char(0),
+	char(8),
+	char(0),
+	char(15),
+	char(0),
+	char(1),
+	char(0),
+	char(13),
+	char(0),
+	char(9),
+	char(0),
+	char(16),
+	char(0),
+	char(1),
+	char(0),
+	char(14),
+	char(0),
+	char(9),
+	char(0),
+	char(17),
+	char(0),
+	char(2),
+	char(0),
+	char(15),
+	char(0),
+	char(10),
+	char(0),
+	char(13),
+	char(0),
+	char(11),
+	char(0),
+	char(18),
+	char(0),
+	char(2),
+	char(0),
+	char(16),
+	char(0),
+	char(10),
+	char(0),
+	char(14),
+	char(0),
+	char(11),
+	char(0),
+	char(19),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(12),
+	char(0),
+	char(4),
+	char(0),
+	char(13),
+	char(0),
+	char(2),
+	char(0),
+	char(14),
+	char(0),
+	char(2),
+	char(0),
+	char(15),
+	char(0),
+	char(20),
+	char(0),
+	char(6),
+	char(0),
+	char(13),
+	char(0),
+	char(16),
+	char(0),
+	char(13),
+	char(0),
+	char(17),
+	char(0),
+	char(4),
+	char(0),
+	char(18),
+	char(0),
+	char(4),
+	char(0),
+	char(19),
+	char(0),
+	char(4),
+	char(0),
+	char(20),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(21),
+	char(0),
+	char(6),
+	char(0),
+	char(14),
+	char(0),
+	char(16),
+	char(0),
+	char(14),
+	char(0),
+	char(17),
+	char(0),
+	char(4),
+	char(0),
+	char(18),
+	char(0),
+	char(4),
+	char(0),
+	char(19),
+	char(0),
+	char(4),
+	char(0),
+	char(20),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(22),
+	char(0),
+	char(3),
+	char(0),
+	char(2),
+	char(0),
+	char(14),
+	char(0),
+	char(2),
+	char(0),
+	char(15),
+	char(0),
+	char(4),
+	char(0),
+	char(22),
+	char(0),
+	char(23),
+	char(0),
+	char(12),
+	char(0),
+	char(13),
+	char(0),
+	char(23),
+	char(0),
+	char(13),
+	char(0),
+	char(24),
+	char(0),
+	char(13),
+	char(0),
+	char(25),
+	char(0),
+	char(4),
+	char(0),
+	char(26),
+	char(0),
+	char(4),
+	char(0),
+	char(27),
+	char(0),
+	char(4),
+	char(0),
+	char(28),
+	char(0),
+	char(4),
+	char(0),
+	char(29),
+	char(0),
+	char(20),
+	char(0),
+	char(30),
+	char(0),
+	char(22),
+	char(0),
+	char(31),
+	char(0),
+	char(19),
+	char(0),
+	char(32),
+	char(0),
+	char(4),
+	char(0),
+	char(33),
+	char(0),
+	char(4),
+	char(0),
+	char(34),
+	char(0),
+	char(24),
+	char(0),
+	char(12),
+	char(0),
+	char(14),
+	char(0),
+	char(23),
+	char(0),
+	char(14),
+	char(0),
+	char(24),
+	char(0),
+	char(14),
+	char(0),
+	char(25),
+	char(0),
+	char(4),
+	char(0),
+	char(26),
+	char(0),
+	char(4),
+	char(0),
+	char(27),
+	char(0),
+	char(4),
+	char(0),
+	char(28),
+	char(0),
+	char(4),
+	char(0),
+	char(29),
+	char(0),
+	char(21),
+	char(0),
+	char(30),
+	char(0),
+	char(22),
+	char(0),
+	char(31),
+	char(0),
+	char(4),
+	char(0),
+	char(33),
+	char(0),
+	char(4),
+	char(0),
+	char(34),
+	char(0),
+	char(19),
+	char(0),
+	char(32),
+	char(0),
+	char(25),
+	char(0),
+	char(3),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(4),
+	char(0),
+	char(36),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(26),
+	char(0),
+	char(5),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(13),
+	char(0),
+	char(40),
+	char(0),
+	char(7),
+	char(0),
+	char(41),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(27),
+	char(0),
+	char(5),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(13),
+	char(0),
+	char(42),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(4),
+	char(0),
+	char(44),
+	char(0),
+	char(28),
+	char(0),
+	char(2),
+	char(0),
+	char(13),
+	char(0),
+	char(45),
+	char(0),
+	char(7),
+	char(0),
+	char(46),
+	char(0),
+	char(29),
+	char(0),
+	char(4),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(28),
+	char(0),
+	char(48),
+	char(0),
+	char(4),
+	char(0),
+	char(49),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(30),
+	char(0),
+	char(1),
+	char(0),
+	char(4),
+	char(0),
+	char(50),
+	char(0),
+	char(31),
+	char(0),
+	char(2),
+	char(0),
+	char(2),
+	char(0),
+	char(50),
+	char(0),
+	char(0),
+	char(0),
+	char(51),
+	char(0),
+	char(32),
+	char(0),
+	char(2),
+	char(0),
+	char(2),
+	char(0),
+	char(52),
+	char(0),
+	char(0),
+	char(0),
+	char(51),
+	char(0),
+	char(33),
+	char(0),
+	char(2),
+	char(0),
+	char(0),
+	char(0),
+	char(52),
+	char(0),
+	char(0),
+	char(0),
+	char(53),
+	char(0),
+	char(34),
+	char(0),
+	char(8),
+	char(0),
+	char(13),
+	char(0),
+	char(54),
+	char(0),
+	char(14),
+	char(0),
+	char(55),
+	char(0),
+	char(30),
+	char(0),
+	char(56),
+	char(0),
+	char(32),
+	char(0),
+	char(57),
+	char(0),
+	char(33),
+	char(0),
+	char(58),
+	char(0),
+	char(31),
+	char(0),
+	char(59),
+	char(0),
+	char(4),
+	char(0),
+	char(60),
+	char(0),
+	char(4),
+	char(0),
+	char(61),
+	char(0),
+	char(35),
+	char(0),
+	char(4),
+	char(0),
+	char(34),
+	char(0),
+	char(62),
+	char(0),
+	char(13),
+	char(0),
+	char(63),
+	char(0),
+	char(4),
+	char(0),
+	char(64),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(36),
+	char(0),
+	char(7),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(35),
+	char(0),
+	char(65),
+	char(0),
+	char(23),
+	char(0),
+	char(66),
+	char(0),
+	char(24),
+	char(0),
+	char(67),
+	char(0),
+	char(37),
+	char(0),
+	char(68),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(0),
+	char(0),
+	char(69),
+	char(0),
+	char(38),
+	char(0),
+	char(2),
+	char(0),
+	char(36),
+	char(0),
+	char(70),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(39),
+	char(0),
+	char(4),
+	char(0),
+	char(17),
+	char(0),
+	char(71),
+	char(0),
+	char(25),
+	char(0),
+	char(72),
+	char(0),
+	char(4),
+	char(0),
+	char(73),
+	char(0),
+	char(7),
+	char(0),
+	char(74),
+	char(0),
+	char(40),
+	char(0),
+	char(4),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(39),
+	char(0),
+	char(75),
+	char(0),
+	char(4),
+	char(0),
+	char(76),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(41),
+	char(0),
+	char(3),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(4),
+	char(0),
+	char(77),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(42),
+	char(0),
+	char(3),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(4),
+	char(0),
+	char(77),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(43),
+	char(0),
+	char(4),
+	char(0),
+	char(4),
+	char(0),
+	char(78),
+	char(0),
+	char(7),
+	char(0),
+	char(79),
+	char(0),
+	char(7),
+	char(0),
+	char(80),
+	char(0),
+	char(7),
+	char(0),
+	char(81),
+	char(0),
+	char(37),
+	char(0),
+	char(14),
+	char(0),
+	char(4),
+	char(0),
+	char(82),
+	char(0),
+	char(4),
+	char(0),
+	char(83),
+	char(0),
+	char(43),
+	char(0),
+	char(84),
+	char(0),
+	char(4),
+	char(0),
+	char(85),
+	char(0),
+	char(7),
+	char(0),
+	char(86),
+	char(0),
+	char(7),
+	char(0),
+	char(87),
+	char(0),
+	char(7),
+	char(0),
+	char(88),
+	char(0),
+	char(7),
+	char(0),
+	char(89),
+	char(0),
+	char(7),
+	char(0),
+	char(90),
+	char(0),
+	char(4),
+	char(0),
+	char(91),
+	char(0),
+	char(4),
+	char(0),
+	char(92),
+	char(0),
+	char(4),
+	char(0),
+	char(93),
+	char(0),
+	char(4),
+	char(0),
+	char(94),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(44),
+	char(0),
+	char(5),
+	char(0),
+	char(25),
+	char(0),
+	char(38),
+	char(0),
+	char(35),
+	char(0),
+	char(65),
+	char(0),
+	char(13),
+	char(0),
+	char(39),
+	char(0),
+	char(7),
+	char(0),
+	char(43),
+	char(0),
+	char(4),
+	char(0),
+	char(95),
+	char(0),
+	char(45),
+	char(0),
+	char(5),
+	char(0),
+	char(27),
+	char(0),
+	char(47),
+	char(0),
+	char(13),
+	char(0),
+	char(96),
+	char(0),
+	char(14),
+	char(0),
+	char(97),
+	char(0),
+	char(4),
+	char(0),
+	char(98),
+	char(0),
+	char(0),
+	char(0),
+	char(99),
+	char(0),
+	char(46),
+	char(0),
+	char(25),
+	char(0),
+	char(9),
+	char(0),
+	char(100),
+	char(0),
+	char(9),
+	char(0),
+	char(101),
+	char(0),
+	char(25),
+	char(0),
+	char(102),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(18),
+	char(0),
+	char(103),
+	char(0),
+	char(18),
+	char(0),
+	char(104),
+	char(0),
+	char(14),
+	char(0),
+	char(105),
+	char(0),
+	char(14),
+	char(0),
+	char(106),
+	char(0),
+	char(14),
+	char(0),
+	char(107),
+	char(0),
+	char(8),
+	char(0),
+	char(108),
+	char(0),
+	char(8),
+	char(0),
+	char(109),
+	char(0),
+	char(8),
+	char(0),
+	char(110),
+	char(0),
+	char(8),
+	char(0),
+	char(111),
+	char(0),
+	char(8),
+	char(0),
+	char(112),
+	char(0),
+	char(8),
+	char(0),
+	char(113),
+	char(0),
+	char(8),
+	char(0),
+	char(114),
+	char(0),
+	char(8),
+	char(0),
+	char(115),
+	char(0),
+	char(4),
+	char(0),
+	char(116),
+	char(0),
+	char(4),
+	char(0),
+	char(117),
+	char(0),
+	char(4),
+	char(0),
+	char(118),
+	char(0),
+	char(4),
+	char(0),
+	char(119),
+	char(0),
+	char(4),
+	char(0),
+	char(120),
+	char(0),
+	char(4),
+	char(0),
+	char(121),
+	char(0),
+	char(4),
+	char(0),
+	char(122),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(47),
+	char(0),
+	char(25),
+	char(0),
+	char(9),
+	char(0),
+	char(100),
+	char(0),
+	char(9),
+	char(0),
+	char(101),
+	char(0),
+	char(25),
+	char(0),
+	char(102),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(17),
+	char(0),
+	char(103),
+	char(0),
+	char(17),
+	char(0),
+	char(104),
+	char(0),
+	char(13),
+	char(0),
+	char(105),
+	char(0),
+	char(13),
+	char(0),
+	char(106),
+	char(0),
+	char(13),
+	char(0),
+	char(107),
+	char(0),
+	char(7),
+	char(0),
+	char(108),
+	char(0),
+	char(7),
+	char(0),
+	char(109),
+	char(0),
+	char(7),
+	char(0),
+	char(110),
+	char(0),
+	char(7),
+	char(0),
+	char(111),
+	char(0),
+	char(7),
+	char(0),
+	char(112),
+	char(0),
+	char(7),
+	char(0),
+	char(113),
+	char(0),
+	char(7),
+	char(0),
+	char(114),
+	char(0),
+	char(7),
+	char(0),
+	char(115),
+	char(0),
+	char(4),
+	char(0),
+	char(116),
+	char(0),
+	char(4),
+	char(0),
+	char(117),
+	char(0),
+	char(4),
+	char(0),
+	char(118),
+	char(0),
+	char(4),
+	char(0),
+	char(119),
+	char(0),
+	char(4),
+	char(0),
+	char(120),
+	char(0),
+	char(4),
+	char(0),
+	char(121),
+	char(0),
+	char(4),
+	char(0),
+	char(122),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(48),
+	char(0),
+	char(2),
+	char(0),
+	char(49),
+	char(0),
+	char(123),
+	char(0),
+	char(14),
+	char(0),
+	char(124),
+	char(0),
+	char(50),
+	char(0),
+	char(2),
+	char(0),
+	char(51),
+	char(0),
+	char(123),
+	char(0),
+	char(13),
+	char(0),
+	char(124),
+	char(0),
+	char(52),
+	char(0),
+	char(21),
+	char(0),
+	char(47),
+	char(0),
+	char(125),
+	char(0),
+	char(15),
+	char(0),
+	char(126),
+	char(0),
+	char(13),
+	char(0),
+	char(127),
+	char(0),
+	char(13),
+	char(0),
+	char(-128),
+	char(0),
+	char(13),
+	char(0),
+	char(-127),
+	char(0),
+	char(13),
+	char(0),
+	char(-126),
+	char(0),
+	char(13),
+	char(0),
+	char(124),
+	char(0),
+	char(13),
+	char(0),
+	char(-125),
+	char(0),
+	char(13),
+	char(0),
+	char(-124),
+	char(0),
+	char(13),
+	char(0),
+	char(-123),
+	char(0),
+	char(13),
+	char(0),
+	char(-122),
+	char(0),
+	char(7),
+	char(0),
+	char(-121),
+	char(0),
+	char(7),
+	char(0),
+	char(-120),
+	char(0),
+	char(7),
+	char(0),
+	char(-119),
+	char(0),
+	char(7),
+	char(0),
+	char(-118),
+	char(0),
+	char(7),
+	char(0),
+	char(-117),
+	char(0),
+	char(7),
+	char(0),
+	char(-116),
+	char(0),
+	char(7),
+	char(0),
+	char(-115),
+	char(0),
+	char(7),
+	char(0),
+	char(-114),
+	char(0),
+	char(7),
+	char(0),
+	char(-113),
+	char(0),
+	char(4),
+	char(0),
+	char(-112),
+	char(0),
+	char(53),
+	char(0),
+	char(22),
+	char(0),
+	char(46),
+	char(0),
+	char(125),
+	char(0),
+	char(16),
+	char(0),
+	char(126),
+	char(0),
+	char(14),
+	char(0),
+	char(127),
+	char(0),
+	char(14),
+	char(0),
+	char(-128),
+	char(0),
+	char(14),
+	char(0),
+	char(-127),
+	char(0),
+	char(14),
+	char(0),
+	char(-126),
+	char(0),
+	char(14),
+	char(0),
+	char(124),
+	char(0),
+	char(14),
+	char(0),
+	char(-125),
+	char(0),
+	char(14),
+	char(0),
+	char(-124),
+	char(0),
+	char(14),
+	char(0),
+	char(-123),
+	char(0),
+	char(14),
+	char(0),
+	char(-122),
+	char(0),
+	char(8),
+	char(0),
+	char(-121),
+	char(0),
+	char(8),
+	char(0),
+	char(-120),
+	char(0),
+	char(8),
+	char(0),
+	char(-119),
+	char(0),
+	char(8),
+	char(0),
+	char(-118),
+	char(0),
+	char(8),
+	char(0),
+	char(-117),
+	char(0),
+	char(8),
+	char(0),
+	char(-116),
+	char(0),
+	char(8),
+	char(0),
+	char(-115),
+	char(0),
+	char(8),
+	char(0),
+	char(-114),
+	char(0),
+	char(8),
+	char(0),
+	char(-113),
+	char(0),
+	char(4),
+	char(0),
+	char(-112),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(54),
+	char(0),
+	char(2),
+	char(0),
+	char(4),
+	char(0),
+	char(-111),
+	char(0),
+	char(4),
+	char(0),
+	char(-110),
+	char(0),
+	char(55),
+	char(0),
+	char(13),
+	char(0),
+	char(56),
+	char(0),
+	char(-109),
+	char(0),
+	char(56),
+	char(0),
+	char(-108),
+	char(0),
+	char(0),
+	char(0),
+	char(35),
+	char(0),
+	char(4),
+	char(0),
+	char(-107),
+	char(0),
+	char(4),
+	char(0),
+	char(-106),
+	char(0),
+	char(4),
+	char(0),
+	char(-105),
+	char(0),
+	char(4),
+	char(0),
+	char(-104),
+	char(0),
+	char(7),
+	char(0),
+	char(-103),
+	char(0),
+	char(7),
+	char(0),
+	char(-102),
+	char(0),
+	char(4),
+	char(0),
+	char(-101),
+	char(0),
+	char(4),
+	char(0),
+	char(-100),
+	char(0),
+	char(7),
+	char(0),
+	char(-99),
+	char(0),
+	char(4),
+	char(0),
+	char(-98),
+	char(0),
+	char(57),
+	char(0),
+	char(3),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(13),
+	char(0),
+	char(-96),
+	char(0),
+	char(13),
+	char(0),
+	char(-95),
+	char(0),
+	char(58),
+	char(0),
+	char(3),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(14),
+	char(0),
+	char(-96),
+	char(0),
+	char(14),
+	char(0),
+	char(-95),
+	char(0),
+	char(59),
+	char(0),
+	char(13),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(18),
+	char(0),
+	char(-94),
+	char(0),
+	char(18),
+	char(0),
+	char(-93),
+	char(0),
+	char(4),
+	char(0),
+	char(-92),
+	char(0),
+	char(4),
+	char(0),
+	char(-91),
+	char(0),
+	char(4),
+	char(0),
+	char(-90),
+	char(0),
+	char(7),
+	char(0),
+	char(-89),
+	char(0),
+	char(7),
+	char(0),
+	char(-88),
+	char(0),
+	char(7),
+	char(0),
+	char(-87),
+	char(0),
+	char(7),
+	char(0),
+	char(-86),
+	char(0),
+	char(7),
+	char(0),
+	char(-85),
+	char(0),
+	char(7),
+	char(0),
+	char(-84),
+	char(0),
+	char(7),
+	char(0),
+	char(-83),
+	char(0),
+	char(60),
+	char(0),
+	char(13),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(4),
+	char(0),
+	char(-92),
+	char(0),
+	char(4),
+	char(0),
+	char(-91),
+	char(0),
+	char(4),
+	char(0),
+	char(-90),
+	char(0),
+	char(7),
+	char(0),
+	char(-89),
+	char(0),
+	char(7),
+	char(0),
+	char(-88),
+	char(0),
+	char(7),
+	char(0),
+	char(-87),
+	char(0),
+	char(7),
+	char(0),
+	char(-86),
+	char(0),
+	char(7),
+	char(0),
+	char(-85),
+	char(0),
+	char(7),
+	char(0),
+	char(-84),
+	char(0),
+	char(7),
+	char(0),
+	char(-83),
+	char(0),
+	char(61),
+	char(0),
+	char(11),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(7),
+	char(0),
+	char(-82),
+	char(0),
+	char(7),
+	char(0),
+	char(-81),
+	char(0),
+	char(7),
+	char(0),
+	char(-80),
+	char(0),
+	char(7),
+	char(0),
+	char(-85),
+	char(0),
+	char(7),
+	char(0),
+	char(-84),
+	char(0),
+	char(7),
+	char(0),
+	char(-83),
+	char(0),
+	char(7),
+	char(0),
+	char(-79),
+	char(0),
+	char(0),
+	char(0),
+	char(21),
+	char(0),
+	char(62),
+	char(0),
+	char(9),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(13),
+	char(0),
+	char(-78),
+	char(0),
+	char(13),
+	char(0),
+	char(-77),
+	char(0),
+	char(13),
+	char(0),
+	char(-76),
+	char(0),
+	char(13),
+	char(0),
+	char(-75),
+	char(0),
+	char(4),
+	char(0),
+	char(-74),
+	char(0),
+	char(4),
+	char(0),
+	char(-73),
+	char(0),
+	char(63),
+	char(0),
+	char(5),
+	char(0),
+	char(62),
+	char(0),
+	char(-72),
+	char(0),
+	char(4),
+	char(0),
+	char(-71),
+	char(0),
+	char(7),
+	char(0),
+	char(-70),
+	char(0),
+	char(7),
+	char(0),
+	char(-69),
+	char(0),
+	char(7),
+	char(0),
+	char(-68),
+	char(0),
+	char(64),
+	char(0),
+	char(9),
+	char(0),
+	char(55),
+	char(0),
+	char(-97),
+	char(0),
+	char(17),
+	char(0),
+	char(-94),
+	char(0),
+	char(17),
+	char(0),
+	char(-93),
+	char(0),
+	char(7),
+	char(0),
+	char(-78),
+	char(0),
+	char(7),
+	char(0),
+	char(-77),
+	char(0),
+	char(7),
+	char(0),
+	char(-76),
+	char(0),
+	char(7),
+	char(0),
+	char(-75),
+	char(0),
+	char(4),
+	char(0),
+	char(-74),
+	char(0),
+	char(4),
+	char(0),
+	char(-73),
+	char(0),
+	char(49),
+	char(0),
+	char(22),
+	char(0),
+	char(8),
+	char(0),
+	char(-67),
+	char(0),
+	char(8),
+	char(0),
+	char(-79),
+	char(0),
+	char(8),
+	char(0),
+	char(110),
+	char(0),
+	char(8),
+	char(0),
+	char(-66),
+	char(0),
+	char(8),
+	char(0),
+	char(112),
+	char(0),
+	char(8),
+	char(0),
+	char(-65),
+	char(0),
+	char(8),
+	char(0),
+	char(-64),
+	char(0),
+	char(8),
+	char(0),
+	char(-63),
+	char(0),
+	char(8),
+	char(0),
+	char(-62),
+	char(0),
+	char(8),
+	char(0),
+	char(-61),
+	char(0),
+	char(8),
+	char(0),
+	char(-60),
+	char(0),
+	char(8),
+	char(0),
+	char(-59),
+	char(0),
+	char(8),
+	char(0),
+	char(-58),
+	char(0),
+	char(8),
+	char(0),
+	char(-57),
+	char(0),
+	char(8),
+	char(0),
+	char(-56),
+	char(0),
+	char(8),
+	char(0),
+	char(-55),
+	char(0),
+	char(4),
+	char(0),
+	char(-54),
+	char(0),
+	char(4),
+	char(0),
+	char(-53),
+	char(0),
+	char(4),
+	char(0),
+	char(-52),
+	char(0),
+	char(4),
+	char(0),
+	char(-51),
+	char(0),
+	char(4),
+	char(0),
+	char(-50),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(51),
+	char(0),
+	char(22),
+	char(0),
+	char(7),
+	char(0),
+	char(-67),
+	char(0),
+	char(7),
+	char(0),
+	char(-79),
+	char(0),
+	char(7),
+	char(0),
+	char(110),
+	char(0),
+	char(7),
+	char(0),
+	char(-66),
+	char(0),
+	char(7),
+	char(0),
+	char(112),
+	char(0),
+	char(7),
+	char(0),
+	char(-65),
+	char(0),
+	char(7),
+	char(0),
+	char(-64),
+	char(0),
+	char(7),
+	char(0),
+	char(-63),
+	char(0),
+	char(7),
+	char(0),
+	char(-62),
+	char(0),
+	char(7),
+	char(0),
+	char(-61),
+	char(0),
+	char(7),
+	char(0),
+	char(-60),
+	char(0),
+	char(7),
+	char(0),
+	char(-59),
+	char(0),
+	char(7),
+	char(0),
+	char(-58),
+	char(0),
+	char(7),
+	char(0),
+	char(-57),
+	char(0),
+	char(7),
+	char(0),
+	char(-56),
+	char(0),
+	char(7),
+	char(0),
+	char(-55),
+	char(0),
+	char(4),
+	char(0),
+	char(-54),
+	char(0),
+	char(4),
+	char(0),
+	char(-53),
+	char(0),
+	char(4),
+	char(0),
+	char(-52),
+	char(0),
+	char(4),
+	char(0),
+	char(-51),
+	char(0),
+	char(4),
+	char(0),
+	char(-50),
+	char(0),
+	char(0),
+	char(0),
+	char(37),
+	char(0),
+	char(65),
+	char(0),
+	char(4),
+	char(0),
+	char(7),
+	char(0),
+	char(-49),
+	char(0),
+	char(7),
+	char(0),
+	char(-48),
+	char(0),
+	char(7),
+	char(0),
+	char(-47),
+	char(0),
+	char(4),
+	char(0),
+	char(78),
+	char(0),
+	char(66),
+	char(0),
+	char(10),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(13),
+	char(0),
+	char(-45),
+	char(0),
+	char(13),
+	char(0),
+	char(-44),
+	char(0),
+	char(13),
+	char(0),
+	char(-43),
+	char(0),
+	char(13),
+	char(0),
+	char(-42),
+	char(0),
+	char(13),
+	char(0),
+	char(-41),
+	char(0),
+	char(7),
+	char(0),
+	char(-121),
+	char(0),
+	char(7),
+	char(0),
+	char(-40),
+	char(0),
+	char(4),
+	char(0),
+	char(-39),
+	char(0),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(67),
+	char(0),
+	char(4),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(4),
+	char(0),
+	char(-38),
+	char(0),
+	char(7),
+	char(0),
+	char(-37),
+	char(0),
+	char(4),
+	char(0),
+	char(-36),
+	char(0),
+	char(68),
+	char(0),
+	char(4),
+	char(0),
+	char(13),
+	char(0),
+	char(-41),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(4),
+	char(0),
+	char(-35),
+	char(0),
+	char(7),
+	char(0),
+	char(-34),
+	char(0),
+	char(69),
+	char(0),
+	char(7),
+	char(0),
+	char(13),
+	char(0),
+	char(-33),
+	char(0),
+	char(65),
+	char(0),
+	char(-46),
+	char(0),
+	char(4),
+	char(0),
+	char(-32),
+	char(0),
+	char(7),
+	char(0),
+	char(-31),
+	char(0),
+	char(7),
+	char(0),
+	char(-30),
+	char(0),
+	char(7),
+	char(0),
+	char(-29),
+	char(0),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(70),
+	char(0),
+	char(6),
+	char(0),
+	char(15),
+	char(0),
+	char(-28),
+	char(0),
+	char(13),
+	char(0),
+	char(-30),
+	char(0),
+	char(13),
+	char(0),
+	char(-27),
+	char(0),
+	char(56),
+	char(0),
+	char(-26),
+	char(0),
+	char(4),
+	char(0),
+	char(-25),
+	char(0),
+	char(7),
+	char(0),
+	char(-29),
+	char(0),
+	char(71),
+	char(0),
+	char(26),
+	char(0),
+	char(4),
+	char(0),
+	char(-24),
+	char(0),
+	char(7),
+	char(0),
+	char(-23),
+	char(0),
+	char(7),
+	char(0),
+	char(-79),
+	char(0),
+	char(7),
+	char(0),
+	char(-22),
+	char(0),
+	char(7),
+	char(0),
+	char(-21),
+	char(0),
+	char(7),
+	char(0),
+	char(-20),
+	char(0),
+	char(7),
+	char(0),
+	char(-19),
+	char(0),
+	char(7),
+	char(0),
+	char(-18),
+	char(0),
+	char(7),
+	char(0),
+	char(-17),
+	char(0),
+	char(7),
+	char(0),
+	char(-16),
+	char(0),
+	char(7),
+	char(0),
+	char(-15),
+	char(0),
+	char(7),
+	char(0),
+	char(-14),
+	char(0),
+	char(7),
+	char(0),
+	char(-13),
+	char(0),
+	char(7),
+	char(0),
+	char(-12),
+	char(0),
+	char(7),
+	char(0),
+	char(-11),
+	char(0),
+	char(7),
+	char(0),
+	char(-10),
+	char(0),
+	char(7),
+	char(0),
+	char(-9),
+	char(0),
+	char(7),
+	char(0),
+	char(-8),
+	char(0),
+	char(7),
+	char(0),
+	char(-7),
+	char(0),
+	char(7),
+	char(0),
+	char(-6),
+	char(0),
+	char(7),
+	char(0),
+	char(-5),
+	char(0),
+	char(4),
+	char(0),
+	char(-4),
+	char(0),
+	char(4),
+	char(0),
+	char(-3),
+	char(0),
+	char(4),
+	char(0),
+	char(-2),
+	char(0),
+	char(4),
+	char(0),
+	char(-1),
+	char(0),
+	char(4),
+	char(0),
+	char(117),
+	char(0),
+	char(72),
+	char(0),
+	char(12),
+	char(0),
+	char(15),
+	char(0),
+	char(0),
+	char(1),
+	char(15),
+	char(0),
+	char(1),
+	char(1),
+	char(15),
+	char(0),
+	char(2),
+	char(1),
+	char(13),
+	char(0),
+	char(3),
+	char(1),
+	char(13),
+	char(0),
+	char(4),
+	char(1),
+	char(7),
+	char(0),
+	char(5),
+	char(1),
+	char(4),
+	char(0),
+	char(6),
+	char(1),
+	char(4),
+	char(0),
+	char(7),
+	char(1),
+	char(4),
+	char(0),
+	char(8),
+	char(1),
+	char(4),
+	char(0),
+	char(9),
+	char(1),
+	char(7),
+	char(0),
+	char(-31),
+	char(0),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(73),
+	char(0),
+	char(27),
+	char(0),
+	char(17),
+	char(0),
+	char(10),
+	char(1),
+	char(15),
+	char(0),
+	char(11),
+	char(1),
+	char(15),
+	char(0),
+	char(12),
+	char(1),
+	char(13),
+	char(0),
+	char(3),
+	char(1),
+	char(13),
+	char(0),
+	char(13),
+	char(1),
+	char(13),
+	char(0),
+	char(14),
+	char(1),
+	char(13),
+	char(0),
+	char(15),
+	char(1),
+	char(13),
+	char(0),
+	char(16),
+	char(1),
+	char(13),
+	char(0),
+	char(17),
+	char(1),
+	char(4),
+	char(0),
+	char(18),
+	char(1),
+	char(7),
+	char(0),
+	char(19),
+	char(1),
+	char(4),
+	char(0),
+	char(20),
+	char(1),
+	char(4),
+	char(0),
+	char(21),
+	char(1),
+	char(4),
+	char(0),
+	char(22),
+	char(1),
+	char(7),
+	char(0),
+	char(23),
+	char(1),
+	char(7),
+	char(0),
+	char(24),
+	char(1),
+	char(4),
+	char(0),
+	char(25),
+	char(1),
+	char(4),
+	char(0),
+	char(26),
+	char(1),
+	char(7),
+	char(0),
+	char(27),
+	char(1),
+	char(7),
+	char(0),
+	char(28),
+	char(1),
+	char(7),
+	char(0),
+	char(29),
+	char(1),
+	char(7),
+	char(0),
+	char(30),
+	char(1),
+	char(7),
+	char(0),
+	char(31),
+	char(1),
+	char(7),
+	char(0),
+	char(32),
+	char(1),
+	char(4),
+	char(0),
+	char(33),
+	char(1),
+	char(4),
+	char(0),
+	char(34),
+	char(1),
+	char(4),
+	char(0),
+	char(35),
+	char(1),
+	char(74),
+	char(0),
+	char(12),
+	char(0),
+	char(9),
+	char(0),
+	char(36),
+	char(1),
+	char(9),
+	char(0),
+	char(37),
+	char(1),
+	char(13),
+	char(0),
+	char(38),
+	char(1),
+	char(7),
+	char(0),
+	char(39),
+	char(1),
+	char(7),
+	char(0),
+	char(-63),
+	char(0),
+	char(7),
+	char(0),
+	char(40),
+	char(1),
+	char(4),
+	char(0),
+	char(41),
+	char(1),
+	char(13),
+	char(0),
+	char(42),
+	char(1),
+	char(4),
+	char(0),
+	char(43),
+	char(1),
+	char(4),
+	char(0),
+	char(44),
+	char(1),
+	char(4),
+	char(0),
+	char(45),
+	char(1),
+	char(4),
+	char(0),
+	char(53),
+	char(0),
+	char(75),
+	char(0),
+	char(19),
+	char(0),
+	char(47),
+	char(0),
+	char(125),
+	char(0),
+	char(72),
+	char(0),
+	char(46),
+	char(1),
+	char(65),
+	char(0),
+	char(47),
+	char(1),
+	char(66),
+	char(0),
+	char(48),
+	char(1),
+	char(67),
+	char(0),
+	char(49),
+	char(1),
+	char(68),
+	char(0),
+	char(50),
+	char(1),
+	char(69),
+	char(0),
+	char(51),
+	char(1),
+	char(70),
+	char(0),
+	char(52),
+	char(1),
+	char(73),
+	char(0),
+	char(53),
+	char(1),
+	char(74),
+	char(0),
+	char(54),
+	char(1),
+	char(4),
+	char(0),
+	char(55),
+	char(1),
+	char(4),
+	char(0),
+	char(21),
+	char(1),
+	char(4),
+	char(0),
+	char(56),
+	char(1),
+	char(4),
+	char(0),
+	char(57),
+	char(1),
+	char(4),
+	char(0),
+	char(58),
+	char(1),
+	char(4),
+	char(0),
+	char(59),
+	char(1),
+	char(4),
+	char(0),
+	char(60),
+	char(1),
+	char(4),
+	char(0),
+	char(61),
+	char(1),
+	char(71),
+	char(0),
+	char(62),
+	char(1),
+};
+int b3s_bulletDNAlen64 = sizeof(b3s_bulletDNAstr64);
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h
new file mode 100644
index 0000000..d9e153e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/b3Serializer.h
@@ -0,0 +1,601 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_SERIALIZER_H
+#define B3_SERIALIZER_H
+
+#include "Bullet3Common/b3Scalar.h"  // has definitions like B3_FORCE_INLINE
+#include "Bullet3Common/b3StackAlloc.h"
+#include "Bullet3Common/b3HashMap.h"
+
+#if !defined(__CELLOS_LV2__) && !defined(__MWERKS__)
+#include <memory.h>
+#endif
+#include <string.h>
+
+extern char b3s_bulletDNAstr[];
+extern int b3s_bulletDNAlen;
+extern char b3s_bulletDNAstr64[];
+extern int b3s_bulletDNAlen64;
+
+B3_FORCE_INLINE int b3StrLen(const char* str)
+{
+	if (!str)
+		return (0);
+	int len = 0;
+
+	while (*str != 0)
+	{
+		str++;
+		len++;
+	}
+
+	return len;
+}
+
+class b3Chunk
+{
+public:
+	int m_chunkCode;
+	int m_length;
+	void* m_oldPtr;
+	int m_dna_nr;
+	int m_number;
+};
+
+enum b3SerializationFlags
+{
+	B3_SERIALIZE_NO_BVH = 1,
+	B3_SERIALIZE_NO_TRIANGLEINFOMAP = 2,
+	B3_SERIALIZE_NO_DUPLICATE_ASSERT = 4
+};
+
+class b3Serializer
+{
+public:
+	virtual ~b3Serializer() {}
+
+	virtual const unsigned char* getBufferPointer() const = 0;
+
+	virtual int getCurrentBufferSize() const = 0;
+
+	virtual b3Chunk* allocate(size_t size, int numElements) = 0;
+
+	virtual void finalizeChunk(b3Chunk* chunk, const char* structType, int chunkCode, void* oldPtr) = 0;
+
+	virtual void* findPointer(void* oldPtr) = 0;
+
+	virtual void* getUniquePointer(void* oldPtr) = 0;
+
+	virtual void startSerialization() = 0;
+
+	virtual void finishSerialization() = 0;
+
+	virtual const char* findNameForPointer(const void* ptr) const = 0;
+
+	virtual void registerNameForPointer(const void* ptr, const char* name) = 0;
+
+	virtual void serializeName(const char* ptr) = 0;
+
+	virtual int getSerializationFlags() const = 0;
+
+	virtual void setSerializationFlags(int flags) = 0;
+};
+
+#define B3_HEADER_LENGTH 12
+#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined(__PPC__) || defined(__ppc__) || defined(__BIG_ENDIAN__)
+#define B3_MAKE_ID(a, b, c, d) ((int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d))
+#else
+#define B3_MAKE_ID(a, b, c, d) ((int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a))
+#endif
+
+#define B3_SOFTBODY_CODE B3_MAKE_ID('S', 'B', 'D', 'Y')
+#define B3_COLLISIONOBJECT_CODE B3_MAKE_ID('C', 'O', 'B', 'J')
+#define B3_RIGIDBODY_CODE B3_MAKE_ID('R', 'B', 'D', 'Y')
+#define B3_CONSTRAINT_CODE B3_MAKE_ID('C', 'O', 'N', 'S')
+#define B3_BOXSHAPE_CODE B3_MAKE_ID('B', 'O', 'X', 'S')
+#define B3_QUANTIZED_BVH_CODE B3_MAKE_ID('Q', 'B', 'V', 'H')
+#define B3_TRIANLGE_INFO_MAP B3_MAKE_ID('T', 'M', 'A', 'P')
+#define B3_SHAPE_CODE B3_MAKE_ID('S', 'H', 'A', 'P')
+#define B3_ARRAY_CODE B3_MAKE_ID('A', 'R', 'A', 'Y')
+#define B3_SBMATERIAL_CODE B3_MAKE_ID('S', 'B', 'M', 'T')
+#define B3_SBNODE_CODE B3_MAKE_ID('S', 'B', 'N', 'D')
+#define B3_DYNAMICSWORLD_CODE B3_MAKE_ID('D', 'W', 'L', 'D')
+#define B3_DNA_CODE B3_MAKE_ID('D', 'N', 'A', '1')
+
+struct b3PointerUid
+{
+	union {
+		void* m_ptr;
+		int m_uniqueIds[2];
+	};
+};
+
+///The b3DefaultSerializer is the main Bullet serialization class.
+///The constructor takes an optional argument for backwards compatibility, it is recommended to leave this empty/zero.
+class b3DefaultSerializer : public b3Serializer
+{
+	b3AlignedObjectArray<char*> mTypes;
+	b3AlignedObjectArray<short*> mStructs;
+	b3AlignedObjectArray<short> mTlens;
+	b3HashMap<b3HashInt, int> mStructReverse;
+	b3HashMap<b3HashString, int> mTypeLookup;
+
+	b3HashMap<b3HashPtr, void*> m_chunkP;
+
+	b3HashMap<b3HashPtr, const char*> m_nameMap;
+
+	b3HashMap<b3HashPtr, b3PointerUid> m_uniquePointers;
+	int m_uniqueIdGenerator;
+
+	int m_totalSize;
+	unsigned char* m_buffer;
+	int m_currentSize;
+	void* m_dna;
+	int m_dnaLength;
+
+	int m_serializationFlags;
+
+	b3AlignedObjectArray<b3Chunk*> m_chunkPtrs;
+
+protected:
+	virtual void* findPointer(void* oldPtr)
+	{
+		void** ptr = m_chunkP.find(oldPtr);
+		if (ptr && *ptr)
+			return *ptr;
+		return 0;
+	}
+
+	void writeDNA()
+	{
+		b3Chunk* dnaChunk = allocate(m_dnaLength, 1);
+		memcpy(dnaChunk->m_oldPtr, m_dna, m_dnaLength);
+		finalizeChunk(dnaChunk, "DNA1", B3_DNA_CODE, m_dna);
+	}
+
+	int getReverseType(const char* type) const
+	{
+		b3HashString key(type);
+		const int* valuePtr = mTypeLookup.find(key);
+		if (valuePtr)
+			return *valuePtr;
+
+		return -1;
+	}
+
+	void initDNA(const char* bdnaOrg, int dnalen)
+	{
+		///was already initialized
+		if (m_dna)
+			return;
+
+		int littleEndian = 1;
+		littleEndian = ((char*)&littleEndian)[0];
+
+		m_dna = b3AlignedAlloc(dnalen, 16);
+		memcpy(m_dna, bdnaOrg, dnalen);
+		m_dnaLength = dnalen;
+
+		int* intPtr = 0;
+		short* shtPtr = 0;
+		char* cp = 0;
+		int dataLen = 0;
+		intPtr = (int*)m_dna;
+
+		/*
+				SDNA (4 bytes) (magic number)
+				NAME (4 bytes)
+				<nr> (4 bytes) amount of names (int)
+				<string>
+				<string>
+			*/
+
+		if (strncmp((const char*)m_dna, "SDNA", 4) == 0)
+		{
+			// skip ++ NAME
+			intPtr++;
+			intPtr++;
+		}
+
+		// Parse names
+		if (!littleEndian)
+			*intPtr = b3SwapEndian(*intPtr);
+
+		dataLen = *intPtr;
+
+		intPtr++;
+
+		cp = (char*)intPtr;
+		int i;
+		for (i = 0; i < dataLen; i++)
+		{
+			while (*cp) cp++;
+			cp++;
+		}
+		cp = b3AlignPointer(cp, 4);
+
+		/*
+				TYPE (4 bytes)
+				<nr> amount of types (int)
+				<string>
+				<string>
+			*/
+
+		intPtr = (int*)cp;
+		b3Assert(strncmp(cp, "TYPE", 4) == 0);
+		intPtr++;
+
+		if (!littleEndian)
+			*intPtr = b3SwapEndian(*intPtr);
+
+		dataLen = *intPtr;
+		intPtr++;
+
+		cp = (char*)intPtr;
+		for (i = 0; i < dataLen; i++)
+		{
+			mTypes.push_back(cp);
+			while (*cp) cp++;
+			cp++;
+		}
+
+		cp = b3AlignPointer(cp, 4);
+
+		/*
+				TLEN (4 bytes)
+				<len> (short) the lengths of types
+				<len>
+			*/
+
+		// Parse type lens
+		intPtr = (int*)cp;
+		b3Assert(strncmp(cp, "TLEN", 4) == 0);
+		intPtr++;
+
+		dataLen = (int)mTypes.size();
+
+		shtPtr = (short*)intPtr;
+		for (i = 0; i < dataLen; i++, shtPtr++)
+		{
+			if (!littleEndian)
+				shtPtr[0] = b3SwapEndian(shtPtr[0]);
+			mTlens.push_back(shtPtr[0]);
+		}
+
+		if (dataLen & 1) shtPtr++;
+
+		/*
+				STRC (4 bytes)
+				<nr> amount of structs (int)
+				<typenr>
+				<nr_of_elems>
+				<typenr>
+				<namenr>
+				<typenr>
+				<namenr>
+			*/
+
+		intPtr = (int*)shtPtr;
+		cp = (char*)intPtr;
+		b3Assert(strncmp(cp, "STRC", 4) == 0);
+		intPtr++;
+
+		if (!littleEndian)
+			*intPtr = b3SwapEndian(*intPtr);
+		dataLen = *intPtr;
+		intPtr++;
+
+		shtPtr = (short*)intPtr;
+		for (i = 0; i < dataLen; i++)
+		{
+			mStructs.push_back(shtPtr);
+
+			if (!littleEndian)
+			{
+				shtPtr[0] = b3SwapEndian(shtPtr[0]);
+				shtPtr[1] = b3SwapEndian(shtPtr[1]);
+
+				int len = shtPtr[1];
+				shtPtr += 2;
+
+				for (int a = 0; a < len; a++, shtPtr += 2)
+				{
+					shtPtr[0] = b3SwapEndian(shtPtr[0]);
+					shtPtr[1] = b3SwapEndian(shtPtr[1]);
+				}
+			}
+			else
+			{
+				shtPtr += (2 * shtPtr[1]) + 2;
+			}
+		}
+
+		// build reverse lookups
+		for (i = 0; i < (int)mStructs.size(); i++)
+		{
+			short* strc = mStructs.at(i);
+			mStructReverse.insert(strc[0], i);
+			mTypeLookup.insert(b3HashString(mTypes[strc[0]]), i);
+		}
+	}
+
+public:
+	b3DefaultSerializer(int totalSize = 0)
+		: m_totalSize(totalSize),
+		  m_currentSize(0),
+		  m_dna(0),
+		  m_dnaLength(0),
+		  m_serializationFlags(0)
+	{
+		m_buffer = m_totalSize ? (unsigned char*)b3AlignedAlloc(totalSize, 16) : 0;
+
+		const bool VOID_IS_8 = ((sizeof(void*) == 8));
+
+#ifdef B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+		if (VOID_IS_8)
+		{
+#if _WIN64
+			initDNA((const char*)b3s_bulletDNAstr64, b3s_bulletDNAlen64);
+#else
+			b3Assert(0);
+#endif
+		}
+		else
+		{
+#ifndef _WIN64
+			initDNA((const char*)b3s_bulletDNAstr, b3s_bulletDNAlen);
+#else
+			b3Assert(0);
+#endif
+		}
+
+#else   //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+		if (VOID_IS_8)
+		{
+			initDNA((const char*)b3s_bulletDNAstr64, b3s_bulletDNAlen64);
+		}
+		else
+		{
+			initDNA((const char*)b3s_bulletDNAstr, b3s_bulletDNAlen);
+		}
+#endif  //B3_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+	}
+
+	virtual ~b3DefaultSerializer()
+	{
+		if (m_buffer)
+			b3AlignedFree(m_buffer);
+		if (m_dna)
+			b3AlignedFree(m_dna);
+	}
+
+	void writeHeader(unsigned char* buffer) const
+	{
+#ifdef B3_USE_DOUBLE_PRECISION
+		memcpy(buffer, "BULLETd", 7);
+#else
+		memcpy(buffer, "BULLETf", 7);
+#endif  //B3_USE_DOUBLE_PRECISION
+
+		int littleEndian = 1;
+		littleEndian = ((char*)&littleEndian)[0];
+
+		if (sizeof(void*) == 8)
+		{
+			buffer[7] = '-';
+		}
+		else
+		{
+			buffer[7] = '_';
+		}
+
+		if (littleEndian)
+		{
+			buffer[8] = 'v';
+		}
+		else
+		{
+			buffer[8] = 'V';
+		}
+
+		buffer[9] = '2';
+		buffer[10] = '8';
+		buffer[11] = '1';
+	}
+
+	virtual void startSerialization()
+	{
+		m_uniqueIdGenerator = 1;
+		if (m_totalSize)
+		{
+			unsigned char* buffer = internalAlloc(B3_HEADER_LENGTH);
+			writeHeader(buffer);
+		}
+	}
+
+	virtual void finishSerialization()
+	{
+		writeDNA();
+
+		//if we didn't pre-allocate a buffer, we need to create a contiguous buffer now
+		int mysize = 0;
+		if (!m_totalSize)
+		{
+			if (m_buffer)
+				b3AlignedFree(m_buffer);
+
+			m_currentSize += B3_HEADER_LENGTH;
+			m_buffer = (unsigned char*)b3AlignedAlloc(m_currentSize, 16);
+
+			unsigned char* currentPtr = m_buffer;
+			writeHeader(m_buffer);
+			currentPtr += B3_HEADER_LENGTH;
+			mysize += B3_HEADER_LENGTH;
+			for (int i = 0; i < m_chunkPtrs.size(); i++)
+			{
+				int curLength = sizeof(b3Chunk) + m_chunkPtrs[i]->m_length;
+				memcpy(currentPtr, m_chunkPtrs[i], curLength);
+				b3AlignedFree(m_chunkPtrs[i]);
+				currentPtr += curLength;
+				mysize += curLength;
+			}
+		}
+
+		mTypes.clear();
+		mStructs.clear();
+		mTlens.clear();
+		mStructReverse.clear();
+		mTypeLookup.clear();
+		m_chunkP.clear();
+		m_nameMap.clear();
+		m_uniquePointers.clear();
+		m_chunkPtrs.clear();
+	}
+
+	virtual void* getUniquePointer(void* oldPtr)
+	{
+		if (!oldPtr)
+			return 0;
+
+		b3PointerUid* uptr = (b3PointerUid*)m_uniquePointers.find(oldPtr);
+		if (uptr)
+		{
+			return uptr->m_ptr;
+		}
+		m_uniqueIdGenerator++;
+
+		b3PointerUid uid;
+		uid.m_uniqueIds[0] = m_uniqueIdGenerator;
+		uid.m_uniqueIds[1] = m_uniqueIdGenerator;
+		m_uniquePointers.insert(oldPtr, uid);
+		return uid.m_ptr;
+	}
+
+	virtual const unsigned char* getBufferPointer() const
+	{
+		return m_buffer;
+	}
+
+	virtual int getCurrentBufferSize() const
+	{
+		return m_currentSize;
+	}
+
+	virtual void finalizeChunk(b3Chunk* chunk, const char* structType, int chunkCode, void* oldPtr)
+	{
+		if (!(m_serializationFlags & B3_SERIALIZE_NO_DUPLICATE_ASSERT))
+		{
+			b3Assert(!findPointer(oldPtr));
+		}
+
+		chunk->m_dna_nr = getReverseType(structType);
+
+		chunk->m_chunkCode = chunkCode;
+
+		void* uniquePtr = getUniquePointer(oldPtr);
+
+		m_chunkP.insert(oldPtr, uniquePtr);  //chunk->m_oldPtr);
+		chunk->m_oldPtr = uniquePtr;         //oldPtr;
+	}
+
+	virtual unsigned char* internalAlloc(size_t size)
+	{
+		unsigned char* ptr = 0;
+
+		if (m_totalSize)
+		{
+			ptr = m_buffer + m_currentSize;
+			m_currentSize += int(size);
+			b3Assert(m_currentSize < m_totalSize);
+		}
+		else
+		{
+			ptr = (unsigned char*)b3AlignedAlloc(size, 16);
+			m_currentSize += int(size);
+		}
+		return ptr;
+	}
+
+	virtual b3Chunk* allocate(size_t size, int numElements)
+	{
+		unsigned char* ptr = internalAlloc(int(size) * numElements + sizeof(b3Chunk));
+
+		unsigned char* data = ptr + sizeof(b3Chunk);
+
+		b3Chunk* chunk = (b3Chunk*)ptr;
+		chunk->m_chunkCode = 0;
+		chunk->m_oldPtr = data;
+		chunk->m_length = int(size) * numElements;
+		chunk->m_number = numElements;
+
+		m_chunkPtrs.push_back(chunk);
+
+		return chunk;
+	}
+
+	virtual const char* findNameForPointer(const void* ptr) const
+	{
+		const char* const* namePtr = m_nameMap.find(ptr);
+		if (namePtr && *namePtr)
+			return *namePtr;
+		return 0;
+	}
+
+	virtual void registerNameForPointer(const void* ptr, const char* name)
+	{
+		m_nameMap.insert(ptr, name);
+	}
+
+	virtual void serializeName(const char* name)
+	{
+		if (name)
+		{
+			//don't serialize name twice
+			if (findPointer((void*)name))
+				return;
+
+			int len = b3StrLen(name);
+			if (len)
+			{
+				int newLen = len + 1;
+				int padding = ((newLen + 3) & ~3) - newLen;
+				newLen += padding;
+
+				//serialize name string now
+				b3Chunk* chunk = allocate(sizeof(char), newLen);
+				char* destinationName = (char*)chunk->m_oldPtr;
+				for (int i = 0; i < len; i++)
+				{
+					destinationName[i] = name[i];
+				}
+				destinationName[len] = 0;
+				finalizeChunk(chunk, "char", B3_ARRAY_CODE, (void*)name);
+			}
+		}
+	}
+
+	virtual int getSerializationFlags() const
+	{
+		return m_serializationFlags;
+	}
+
+	virtual void setSerializationFlags(int flags)
+	{
+		m_serializationFlags = flags;
+	}
+};
+
+#endif  //B3_SERIALIZER_H
diff --git a/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/premake4.lua b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/premake4.lua
new file mode 100644
index 0000000..b9ee301
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/Bullet3Serialize/Bullet2FileLoader/premake4.lua
@@ -0,0 +1,16 @@
+	project "Bullet2FileLoader"
+		
+	kind "StaticLib"
+	
+	includedirs {
+		"../../../src"
+	}
+	
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+	 
+	files {
+		"**.cpp",
+		"**.h"
+	}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
new file mode 100644
index 0000000..29310ec
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
@@ -0,0 +1,33 @@
+
+//Bullet Continuous Collision Detection and Physics Library
+//Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+//
+// btAxisSweep3
+//
+// Copyright (c) 2006 Simon Hobbs
+//
+// This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+#include "btAxisSweep3.h"
+
+btAxisSweep3::btAxisSweep3(const btVector3& worldAabbMin, const btVector3& worldAabbMax, unsigned short int maxHandles, btOverlappingPairCache* pairCache, bool disableRaycastAccelerator)
+	: btAxisSweep3Internal<unsigned short int>(worldAabbMin, worldAabbMax, 0xfffe, 0xffff, maxHandles, pairCache, disableRaycastAccelerator)
+{
+	// 1 handle is reserved as sentinel
+	btAssert(maxHandles > 1 && maxHandles < 32767);
+}
+
+bt32BitAxisSweep3::bt32BitAxisSweep3(const btVector3& worldAabbMin, const btVector3& worldAabbMax, unsigned int maxHandles, btOverlappingPairCache* pairCache, bool disableRaycastAccelerator)
+	: btAxisSweep3Internal<unsigned int>(worldAabbMin, worldAabbMax, 0xfffffffe, 0x7fffffff, maxHandles, pairCache, disableRaycastAccelerator)
+{
+	// 1 handle is reserved as sentinel
+	btAssert(maxHandles > 1 && maxHandles < 2147483647);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
new file mode 100644
index 0000000..4f5f614
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -0,0 +1,48 @@
+//Bullet Continuous Collision Detection and Physics Library
+//Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+//
+// btAxisSweep3.h
+//
+// Copyright (c) 2006 Simon Hobbs
+//
+// This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+
+#ifndef BT_AXIS_SWEEP_3_H
+#define BT_AXIS_SWEEP_3_H
+
+#include "LinearMath/btVector3.h"
+#include "btOverlappingPairCache.h"
+#include "btBroadphaseInterface.h"
+#include "btBroadphaseProxy.h"
+#include "btOverlappingPairCallback.h"
+#include "btDbvtBroadphase.h"
+#include "btAxisSweep3Internal.h"
+
+/// The btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
+/// It uses arrays rather then lists for storage of the 3 axis. Also it operates using 16 bit integer coordinates instead of floats.
+/// For large worlds and many objects, use bt32BitAxisSweep3 or btDbvtBroadphase instead. bt32BitAxisSweep3 has higher precision and allows more then 16384 objects at the cost of more memory and bit of performance.
+class btAxisSweep3 : public btAxisSweep3Internal<unsigned short int>
+{
+public:
+	btAxisSweep3(const btVector3& worldAabbMin, const btVector3& worldAabbMax, unsigned short int maxHandles = 16384, btOverlappingPairCache* pairCache = 0, bool disableRaycastAccelerator = false);
+};
+
+/// The bt32BitAxisSweep3 allows higher precision quantization and more objects compared to the btAxisSweep3 sweep and prune.
+/// This comes at the cost of more memory per handle, and a bit slower performance.
+/// It uses arrays rather then lists for storage of the 3 axis.
+class bt32BitAxisSweep3 : public btAxisSweep3Internal<unsigned int>
+{
+public:
+	bt32BitAxisSweep3(const btVector3& worldAabbMin, const btVector3& worldAabbMax, unsigned int maxHandles = 1500000, btOverlappingPairCache* pairCache = 0, bool disableRaycastAccelerator = false);
+};
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h
new file mode 100644
index 0000000..e481fdc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h
@@ -0,0 +1,954 @@
+//Bullet Continuous Collision Detection and Physics Library
+//Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+//
+// btAxisSweep3.h
+//
+// Copyright (c) 2006 Simon Hobbs
+//
+// This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+
+#ifndef BT_AXIS_SWEEP_3_INTERNAL_H
+#define BT_AXIS_SWEEP_3_INTERNAL_H
+
+#include "LinearMath/btVector3.h"
+#include "btOverlappingPairCache.h"
+#include "btBroadphaseInterface.h"
+#include "btBroadphaseProxy.h"
+#include "btOverlappingPairCallback.h"
+#include "btDbvtBroadphase.h"
+
+//#define DEBUG_BROADPHASE 1
+#define USE_OVERLAP_TEST_ON_REMOVES 1
+
+/// The internal templace class btAxisSweep3Internal implements the sweep and prune broadphase.
+/// It uses quantized integers to represent the begin and end points for each of the 3 axis.
+/// Dont use this class directly, use btAxisSweep3 or bt32BitAxisSweep3 instead.
+template <typename BP_FP_INT_TYPE>
+class btAxisSweep3Internal : public btBroadphaseInterface
+{
+protected:
+	BP_FP_INT_TYPE m_bpHandleMask;
+	BP_FP_INT_TYPE m_handleSentinel;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	class Edge
+	{
+	public:
+		BP_FP_INT_TYPE m_pos;  // low bit is min/max
+		BP_FP_INT_TYPE m_handle;
+
+		BP_FP_INT_TYPE IsMax() const { return static_cast<BP_FP_INT_TYPE>(m_pos & 1); }
+	};
+
+public:
+	class Handle : public btBroadphaseProxy
+	{
+	public:
+		BT_DECLARE_ALIGNED_ALLOCATOR();
+
+		// indexes into the edge arrays
+		BP_FP_INT_TYPE m_minEdges[3], m_maxEdges[3];  // 6 * 2 = 12
+													  //		BP_FP_INT_TYPE m_uniqueId;
+		btBroadphaseProxy* m_dbvtProxy;               //for faster raycast
+		//void* m_pOwner; this is now in btBroadphaseProxy.m_clientObject
+
+		SIMD_FORCE_INLINE void SetNextFree(BP_FP_INT_TYPE next) { m_minEdges[0] = next; }
+		SIMD_FORCE_INLINE BP_FP_INT_TYPE GetNextFree() const { return m_minEdges[0]; }
+	};  // 24 bytes + 24 for Edge structures = 44 bytes total per entry
+
+protected:
+	btVector3 m_worldAabbMin;  // overall system bounds
+	btVector3 m_worldAabbMax;  // overall system bounds
+
+	btVector3 m_quantize;  // scaling factor for quantization
+
+	BP_FP_INT_TYPE m_numHandles;  // number of active handles
+	BP_FP_INT_TYPE m_maxHandles;  // max number of handles
+	Handle* m_pHandles;           // handles pool
+
+	BP_FP_INT_TYPE m_firstFreeHandle;  // free handles list
+
+	Edge* m_pEdges[3];  // edge arrays for the 3 axes (each array has m_maxHandles * 2 + 2 sentinel entries)
+	void* m_pEdgesRawPtr[3];
+
+	btOverlappingPairCache* m_pairCache;
+
+	///btOverlappingPairCallback is an additional optional user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
+	btOverlappingPairCallback* m_userPairCallback;
+
+	bool m_ownsPairCache;
+
+	int m_invalidPair;
+
+	///additional dynamic aabb structure, used to accelerate ray cast queries.
+	///can be disabled using a optional argument in the constructor
+	btDbvtBroadphase* m_raycastAccelerator;
+	btOverlappingPairCache* m_nullPairCache;
+
+	// allocation/deallocation
+	BP_FP_INT_TYPE allocHandle();
+	void freeHandle(BP_FP_INT_TYPE handle);
+
+	bool testOverlap2D(const Handle* pHandleA, const Handle* pHandleB, int axis0, int axis1);
+
+#ifdef DEBUG_BROADPHASE
+	void debugPrintAxis(int axis, bool checkCardinality = true);
+#endif  //DEBUG_BROADPHASE
+
+	//Overlap* AddOverlap(BP_FP_INT_TYPE handleA, BP_FP_INT_TYPE handleB);
+	//void RemoveOverlap(BP_FP_INT_TYPE handleA, BP_FP_INT_TYPE handleB);
+
+	void sortMinDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps);
+	void sortMinUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps);
+	void sortMaxDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps);
+	void sortMaxUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps);
+
+public:
+	btAxisSweep3Internal(const btVector3& worldAabbMin, const btVector3& worldAabbMax, BP_FP_INT_TYPE handleMask, BP_FP_INT_TYPE handleSentinel, BP_FP_INT_TYPE maxHandles = 16384, btOverlappingPairCache* pairCache = 0, bool disableRaycastAccelerator = false);
+
+	virtual ~btAxisSweep3Internal();
+
+	BP_FP_INT_TYPE getNumHandles() const
+	{
+		return m_numHandles;
+	}
+
+	virtual void calculateOverlappingPairs(btDispatcher* dispatcher);
+
+	BP_FP_INT_TYPE addHandle(const btVector3& aabbMin, const btVector3& aabbMax, void* pOwner, int collisionFilterGroup, int collisionFilterMask, btDispatcher* dispatcher);
+	void removeHandle(BP_FP_INT_TYPE handle, btDispatcher* dispatcher);
+	void updateHandle(BP_FP_INT_TYPE handle, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* dispatcher);
+	SIMD_FORCE_INLINE Handle* getHandle(BP_FP_INT_TYPE index) const { return m_pHandles + index; }
+
+	virtual void resetPool(btDispatcher* dispatcher);
+
+	void processAllOverlappingPairs(btOverlapCallback* callback);
+
+	//Broadphase Interface
+	virtual btBroadphaseProxy* createProxy(const btVector3& aabbMin, const btVector3& aabbMax, int shapeType, void* userPtr, int collisionFilterGroup, int collisionFilterMask, btDispatcher* dispatcher);
+	virtual void destroyProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher);
+	virtual void setAabb(btBroadphaseProxy* proxy, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* dispatcher);
+	virtual void getAabb(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin = btVector3(0, 0, 0), const btVector3& aabbMax = btVector3(0, 0, 0));
+	virtual void aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback);
+
+	void quantize(BP_FP_INT_TYPE* out, const btVector3& point, int isMax) const;
+	///unQuantize should be conservative: aabbMin/aabbMax should be larger then 'getAabb' result
+	void unQuantize(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	bool testAabbOverlap(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1);
+
+	btOverlappingPairCache* getOverlappingPairCache()
+	{
+		return m_pairCache;
+	}
+	const btOverlappingPairCache* getOverlappingPairCache() const
+	{
+		return m_pairCache;
+	}
+
+	void setOverlappingPairUserCallback(btOverlappingPairCallback* pairCallback)
+	{
+		m_userPairCallback = pairCallback;
+	}
+	const btOverlappingPairCallback* getOverlappingPairUserCallback() const
+	{
+		return m_userPairCallback;
+	}
+
+	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
+	///will add some transform later
+	virtual void getBroadphaseAabb(btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		aabbMin = m_worldAabbMin;
+		aabbMax = m_worldAabbMax;
+	}
+
+	virtual void printStats()
+	{
+		/*		printf("btAxisSweep3.h\n");
+		printf("numHandles = %d, maxHandles = %d\n",m_numHandles,m_maxHandles);
+		printf("aabbMin=%f,%f,%f,aabbMax=%f,%f,%f\n",m_worldAabbMin.getX(),m_worldAabbMin.getY(),m_worldAabbMin.getZ(),
+			m_worldAabbMax.getX(),m_worldAabbMax.getY(),m_worldAabbMax.getZ());
+			*/
+	}
+};
+
+////////////////////////////////////////////////////////////////////
+
+#ifdef DEBUG_BROADPHASE
+#include <stdio.h>
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3<BP_FP_INT_TYPE>::debugPrintAxis(int axis, bool checkCardinality)
+{
+	int numEdges = m_pHandles[0].m_maxEdges[axis];
+	printf("SAP Axis %d, numEdges=%d\n", axis, numEdges);
+
+	int i;
+	for (i = 0; i < numEdges + 1; i++)
+	{
+		Edge* pEdge = m_pEdges[axis] + i;
+		Handle* pHandlePrev = getHandle(pEdge->m_handle);
+		int handleIndex = pEdge->IsMax() ? pHandlePrev->m_maxEdges[axis] : pHandlePrev->m_minEdges[axis];
+		char beginOrEnd;
+		beginOrEnd = pEdge->IsMax() ? 'E' : 'B';
+		printf("	[%c,h=%d,p=%x,i=%d]\n", beginOrEnd, pEdge->m_handle, pEdge->m_pos, handleIndex);
+	}
+
+	if (checkCardinality)
+		btAssert(numEdges == m_numHandles * 2 + 1);
+}
+#endif  //DEBUG_BROADPHASE
+
+template <typename BP_FP_INT_TYPE>
+btBroadphaseProxy* btAxisSweep3Internal<BP_FP_INT_TYPE>::createProxy(const btVector3& aabbMin, const btVector3& aabbMax, int shapeType, void* userPtr, int collisionFilterGroup, int collisionFilterMask, btDispatcher* dispatcher)
+{
+	(void)shapeType;
+	BP_FP_INT_TYPE handleId = addHandle(aabbMin, aabbMax, userPtr, collisionFilterGroup, collisionFilterMask, dispatcher);
+
+	Handle* handle = getHandle(handleId);
+
+	if (m_raycastAccelerator)
+	{
+		btBroadphaseProxy* rayProxy = m_raycastAccelerator->createProxy(aabbMin, aabbMax, shapeType, userPtr, collisionFilterGroup, collisionFilterMask, dispatcher);
+		handle->m_dbvtProxy = rayProxy;
+	}
+	return handle;
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::destroyProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher)
+{
+	Handle* handle = static_cast<Handle*>(proxy);
+	if (m_raycastAccelerator)
+		m_raycastAccelerator->destroyProxy(handle->m_dbvtProxy, dispatcher);
+	removeHandle(static_cast<BP_FP_INT_TYPE>(handle->m_uniqueId), dispatcher);
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::setAabb(btBroadphaseProxy* proxy, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* dispatcher)
+{
+	Handle* handle = static_cast<Handle*>(proxy);
+	handle->m_aabbMin = aabbMin;
+	handle->m_aabbMax = aabbMax;
+	updateHandle(static_cast<BP_FP_INT_TYPE>(handle->m_uniqueId), aabbMin, aabbMax, dispatcher);
+	if (m_raycastAccelerator)
+		m_raycastAccelerator->setAabb(handle->m_dbvtProxy, aabbMin, aabbMax, dispatcher);
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::rayTest(const btVector3& rayFrom, const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	if (m_raycastAccelerator)
+	{
+		m_raycastAccelerator->rayTest(rayFrom, rayTo, rayCallback, aabbMin, aabbMax);
+	}
+	else
+	{
+		//choose axis?
+		BP_FP_INT_TYPE axis = 0;
+		//for each proxy
+		for (BP_FP_INT_TYPE i = 1; i < m_numHandles * 2 + 1; i++)
+		{
+			if (m_pEdges[axis][i].IsMax())
+			{
+				rayCallback.process(getHandle(m_pEdges[axis][i].m_handle));
+			}
+		}
+	}
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback)
+{
+	if (m_raycastAccelerator)
+	{
+		m_raycastAccelerator->aabbTest(aabbMin, aabbMax, callback);
+	}
+	else
+	{
+		//choose axis?
+		BP_FP_INT_TYPE axis = 0;
+		//for each proxy
+		for (BP_FP_INT_TYPE i = 1; i < m_numHandles * 2 + 1; i++)
+		{
+			if (m_pEdges[axis][i].IsMax())
+			{
+				Handle* handle = getHandle(m_pEdges[axis][i].m_handle);
+				if (TestAabbAgainstAabb2(aabbMin, aabbMax, handle->m_aabbMin, handle->m_aabbMax))
+				{
+					callback.process(handle);
+				}
+			}
+		}
+	}
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::getAabb(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	Handle* pHandle = static_cast<Handle*>(proxy);
+	aabbMin = pHandle->m_aabbMin;
+	aabbMax = pHandle->m_aabbMax;
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::unQuantize(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	Handle* pHandle = static_cast<Handle*>(proxy);
+
+	unsigned short vecInMin[3];
+	unsigned short vecInMax[3];
+
+	vecInMin[0] = m_pEdges[0][pHandle->m_minEdges[0]].m_pos;
+	vecInMax[0] = m_pEdges[0][pHandle->m_maxEdges[0]].m_pos + 1;
+	vecInMin[1] = m_pEdges[1][pHandle->m_minEdges[1]].m_pos;
+	vecInMax[1] = m_pEdges[1][pHandle->m_maxEdges[1]].m_pos + 1;
+	vecInMin[2] = m_pEdges[2][pHandle->m_minEdges[2]].m_pos;
+	vecInMax[2] = m_pEdges[2][pHandle->m_maxEdges[2]].m_pos + 1;
+
+	aabbMin.setValue((btScalar)(vecInMin[0]) / (m_quantize.getX()), (btScalar)(vecInMin[1]) / (m_quantize.getY()), (btScalar)(vecInMin[2]) / (m_quantize.getZ()));
+	aabbMin += m_worldAabbMin;
+
+	aabbMax.setValue((btScalar)(vecInMax[0]) / (m_quantize.getX()), (btScalar)(vecInMax[1]) / (m_quantize.getY()), (btScalar)(vecInMax[2]) / (m_quantize.getZ()));
+	aabbMax += m_worldAabbMin;
+}
+
+template <typename BP_FP_INT_TYPE>
+btAxisSweep3Internal<BP_FP_INT_TYPE>::btAxisSweep3Internal(const btVector3& worldAabbMin, const btVector3& worldAabbMax, BP_FP_INT_TYPE handleMask, BP_FP_INT_TYPE handleSentinel, BP_FP_INT_TYPE userMaxHandles, btOverlappingPairCache* pairCache, bool disableRaycastAccelerator)
+	: m_bpHandleMask(handleMask),
+	  m_handleSentinel(handleSentinel),
+	  m_pairCache(pairCache),
+	  m_userPairCallback(0),
+	  m_ownsPairCache(false),
+	  m_invalidPair(0),
+	  m_raycastAccelerator(0)
+{
+	BP_FP_INT_TYPE maxHandles = static_cast<BP_FP_INT_TYPE>(userMaxHandles + 1);  //need to add one sentinel handle
+
+	if (!m_pairCache)
+	{
+		void* ptr = btAlignedAlloc(sizeof(btHashedOverlappingPairCache), 16);
+		m_pairCache = new (ptr) btHashedOverlappingPairCache();
+		m_ownsPairCache = true;
+	}
+
+	if (!disableRaycastAccelerator)
+	{
+		m_nullPairCache = new (btAlignedAlloc(sizeof(btNullPairCache), 16)) btNullPairCache();
+		m_raycastAccelerator = new (btAlignedAlloc(sizeof(btDbvtBroadphase), 16)) btDbvtBroadphase(m_nullPairCache);  //m_pairCache);
+		m_raycastAccelerator->m_deferedcollide = true;                                                                //don't add/remove pairs
+	}
+
+	//btAssert(bounds.HasVolume());
+
+	// init bounds
+	m_worldAabbMin = worldAabbMin;
+	m_worldAabbMax = worldAabbMax;
+
+	btVector3 aabbSize = m_worldAabbMax - m_worldAabbMin;
+
+	BP_FP_INT_TYPE maxInt = m_handleSentinel;
+
+	m_quantize = btVector3(btScalar(maxInt), btScalar(maxInt), btScalar(maxInt)) / aabbSize;
+
+	// allocate handles buffer, using btAlignedAlloc, and put all handles on free list
+	m_pHandles = new Handle[maxHandles];
+
+	m_maxHandles = maxHandles;
+	m_numHandles = 0;
+
+	// handle 0 is reserved as the null index, and is also used as the sentinel
+	m_firstFreeHandle = 1;
+	{
+		for (BP_FP_INT_TYPE i = m_firstFreeHandle; i < maxHandles; i++)
+			m_pHandles[i].SetNextFree(static_cast<BP_FP_INT_TYPE>(i + 1));
+		m_pHandles[maxHandles - 1].SetNextFree(0);
+	}
+
+	{
+		// allocate edge buffers
+		for (int i = 0; i < 3; i++)
+		{
+			m_pEdgesRawPtr[i] = btAlignedAlloc(sizeof(Edge) * maxHandles * 2, 16);
+			m_pEdges[i] = new (m_pEdgesRawPtr[i]) Edge[maxHandles * 2];
+		}
+	}
+	//removed overlap management
+
+	// make boundary sentinels
+
+	m_pHandles[0].m_clientObject = 0;
+
+	for (int axis = 0; axis < 3; axis++)
+	{
+		m_pHandles[0].m_minEdges[axis] = 0;
+		m_pHandles[0].m_maxEdges[axis] = 1;
+
+		m_pEdges[axis][0].m_pos = 0;
+		m_pEdges[axis][0].m_handle = 0;
+		m_pEdges[axis][1].m_pos = m_handleSentinel;
+		m_pEdges[axis][1].m_handle = 0;
+#ifdef DEBUG_BROADPHASE
+		debugPrintAxis(axis);
+#endif  //DEBUG_BROADPHASE
+	}
+}
+
+template <typename BP_FP_INT_TYPE>
+btAxisSweep3Internal<BP_FP_INT_TYPE>::~btAxisSweep3Internal()
+{
+	if (m_raycastAccelerator)
+	{
+		m_nullPairCache->~btOverlappingPairCache();
+		btAlignedFree(m_nullPairCache);
+		m_raycastAccelerator->~btDbvtBroadphase();
+		btAlignedFree(m_raycastAccelerator);
+	}
+
+	for (int i = 2; i >= 0; i--)
+	{
+		btAlignedFree(m_pEdgesRawPtr[i]);
+	}
+	delete[] m_pHandles;
+
+	if (m_ownsPairCache)
+	{
+		m_pairCache->~btOverlappingPairCache();
+		btAlignedFree(m_pairCache);
+	}
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::quantize(BP_FP_INT_TYPE* out, const btVector3& point, int isMax) const
+{
+#ifdef OLD_CLAMPING_METHOD
+	///problem with this clamping method is that the floating point during quantization might still go outside the range [(0|isMax) .. (m_handleSentinel&m_bpHandleMask]|isMax]
+	///see http://code.google.com/p/bullet/issues/detail?id=87
+	btVector3 clampedPoint(point);
+	clampedPoint.setMax(m_worldAabbMin);
+	clampedPoint.setMin(m_worldAabbMax);
+	btVector3 v = (clampedPoint - m_worldAabbMin) * m_quantize;
+	out[0] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getX() & m_bpHandleMask) | isMax);
+	out[1] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getY() & m_bpHandleMask) | isMax);
+	out[2] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getZ() & m_bpHandleMask) | isMax);
+#else
+	btVector3 v = (point - m_worldAabbMin) * m_quantize;
+	out[0] = (v[0] <= 0) ? (BP_FP_INT_TYPE)isMax : (v[0] >= m_handleSentinel) ? (BP_FP_INT_TYPE)((m_handleSentinel & m_bpHandleMask) | isMax) : (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v[0] & m_bpHandleMask) | isMax);
+	out[1] = (v[1] <= 0) ? (BP_FP_INT_TYPE)isMax : (v[1] >= m_handleSentinel) ? (BP_FP_INT_TYPE)((m_handleSentinel & m_bpHandleMask) | isMax) : (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v[1] & m_bpHandleMask) | isMax);
+	out[2] = (v[2] <= 0) ? (BP_FP_INT_TYPE)isMax : (v[2] >= m_handleSentinel) ? (BP_FP_INT_TYPE)((m_handleSentinel & m_bpHandleMask) | isMax) : (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v[2] & m_bpHandleMask) | isMax);
+#endif  //OLD_CLAMPING_METHOD
+}
+
+template <typename BP_FP_INT_TYPE>
+BP_FP_INT_TYPE btAxisSweep3Internal<BP_FP_INT_TYPE>::allocHandle()
+{
+	btAssert(m_firstFreeHandle);
+
+	BP_FP_INT_TYPE handle = m_firstFreeHandle;
+	m_firstFreeHandle = getHandle(handle)->GetNextFree();
+	m_numHandles++;
+
+	return handle;
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::freeHandle(BP_FP_INT_TYPE handle)
+{
+	btAssert(handle > 0 && handle < m_maxHandles);
+
+	getHandle(handle)->SetNextFree(m_firstFreeHandle);
+	m_firstFreeHandle = handle;
+
+	m_numHandles--;
+}
+
+template <typename BP_FP_INT_TYPE>
+BP_FP_INT_TYPE btAxisSweep3Internal<BP_FP_INT_TYPE>::addHandle(const btVector3& aabbMin, const btVector3& aabbMax, void* pOwner, int collisionFilterGroup, int collisionFilterMask, btDispatcher* dispatcher)
+{
+	// quantize the bounds
+	BP_FP_INT_TYPE min[3], max[3];
+	quantize(min, aabbMin, 0);
+	quantize(max, aabbMax, 1);
+
+	// allocate a handle
+	BP_FP_INT_TYPE handle = allocHandle();
+
+	Handle* pHandle = getHandle(handle);
+
+	pHandle->m_uniqueId = static_cast<int>(handle);
+	//pHandle->m_pOverlaps = 0;
+	pHandle->m_clientObject = pOwner;
+	pHandle->m_collisionFilterGroup = collisionFilterGroup;
+	pHandle->m_collisionFilterMask = collisionFilterMask;
+
+	// compute current limit of edge arrays
+	BP_FP_INT_TYPE limit = static_cast<BP_FP_INT_TYPE>(m_numHandles * 2);
+
+	// insert new edges just inside the max boundary edge
+	for (BP_FP_INT_TYPE axis = 0; axis < 3; axis++)
+	{
+		m_pHandles[0].m_maxEdges[axis] += 2;
+
+		m_pEdges[axis][limit + 1] = m_pEdges[axis][limit - 1];
+
+		m_pEdges[axis][limit - 1].m_pos = min[axis];
+		m_pEdges[axis][limit - 1].m_handle = handle;
+
+		m_pEdges[axis][limit].m_pos = max[axis];
+		m_pEdges[axis][limit].m_handle = handle;
+
+		pHandle->m_minEdges[axis] = static_cast<BP_FP_INT_TYPE>(limit - 1);
+		pHandle->m_maxEdges[axis] = limit;
+	}
+
+	// now sort the new edges to their correct position
+	sortMinDown(0, pHandle->m_minEdges[0], dispatcher, false);
+	sortMaxDown(0, pHandle->m_maxEdges[0], dispatcher, false);
+	sortMinDown(1, pHandle->m_minEdges[1], dispatcher, false);
+	sortMaxDown(1, pHandle->m_maxEdges[1], dispatcher, false);
+	sortMinDown(2, pHandle->m_minEdges[2], dispatcher, true);
+	sortMaxDown(2, pHandle->m_maxEdges[2], dispatcher, true);
+
+	return handle;
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::removeHandle(BP_FP_INT_TYPE handle, btDispatcher* dispatcher)
+{
+	Handle* pHandle = getHandle(handle);
+
+	//explicitly remove the pairs containing the proxy
+	//we could do it also in the sortMinUp (passing true)
+	///@todo: compare performance
+	if (!m_pairCache->hasDeferredRemoval())
+	{
+		m_pairCache->removeOverlappingPairsContainingProxy(pHandle, dispatcher);
+	}
+
+	// compute current limit of edge arrays
+	int limit = static_cast<int>(m_numHandles * 2);
+
+	int axis;
+
+	for (axis = 0; axis < 3; axis++)
+	{
+		m_pHandles[0].m_maxEdges[axis] -= 2;
+	}
+
+	// remove the edges by sorting them up to the end of the list
+	for (axis = 0; axis < 3; axis++)
+	{
+		Edge* pEdges = m_pEdges[axis];
+		BP_FP_INT_TYPE max = pHandle->m_maxEdges[axis];
+		pEdges[max].m_pos = m_handleSentinel;
+
+		sortMaxUp(axis, max, dispatcher, false);
+
+		BP_FP_INT_TYPE i = pHandle->m_minEdges[axis];
+		pEdges[i].m_pos = m_handleSentinel;
+
+		sortMinUp(axis, i, dispatcher, false);
+
+		pEdges[limit - 1].m_handle = 0;
+		pEdges[limit - 1].m_pos = m_handleSentinel;
+
+#ifdef DEBUG_BROADPHASE
+		debugPrintAxis(axis, false);
+#endif  //DEBUG_BROADPHASE
+	}
+
+	// free the handle
+	freeHandle(handle);
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool(btDispatcher* /*dispatcher*/)
+{
+	if (m_numHandles == 0)
+	{
+		m_firstFreeHandle = 1;
+		{
+			for (BP_FP_INT_TYPE i = m_firstFreeHandle; i < m_maxHandles; i++)
+				m_pHandles[i].SetNextFree(static_cast<BP_FP_INT_TYPE>(i + 1));
+			m_pHandles[m_maxHandles - 1].SetNextFree(0);
+		}
+	}
+}
+
+//#include <stdio.h>
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::calculateOverlappingPairs(btDispatcher* dispatcher)
+{
+	if (m_pairCache->hasDeferredRemoval())
+	{
+		btBroadphasePairArray& overlappingPairArray = m_pairCache->getOverlappingPairArray();
+
+		//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+		m_invalidPair = 0;
+
+		int i;
+
+		btBroadphasePair previousPair;
+		previousPair.m_pProxy0 = 0;
+		previousPair.m_pProxy1 = 0;
+		previousPair.m_algorithm = 0;
+
+		for (i = 0; i < overlappingPairArray.size(); i++)
+		{
+			btBroadphasePair& pair = overlappingPairArray[i];
+
+			bool isDuplicate = (pair == previousPair);
+
+			previousPair = pair;
+
+			bool needsRemoval = false;
+
+			if (!isDuplicate)
+			{
+				///important to use an AABB test that is consistent with the broadphase
+				bool hasOverlap = testAabbOverlap(pair.m_pProxy0, pair.m_pProxy1);
+
+				if (hasOverlap)
+				{
+					needsRemoval = false;  //callback->processOverlap(pair);
+				}
+				else
+				{
+					needsRemoval = true;
+				}
+			}
+			else
+			{
+				//remove duplicate
+				needsRemoval = true;
+				//should have no algorithm
+				btAssert(!pair.m_algorithm);
+			}
+
+			if (needsRemoval)
+			{
+				m_pairCache->cleanOverlappingPair(pair, dispatcher);
+
+				//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+				//		m_overlappingPairArray.pop_back();
+				pair.m_pProxy0 = 0;
+				pair.m_pProxy1 = 0;
+				m_invalidPair++;
+			}
+		}
+
+///if you don't like to skip the invalid pairs in the array, execute following code:
+#define CLEAN_INVALID_PAIRS 1
+#ifdef CLEAN_INVALID_PAIRS
+
+		//perform a sort, to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+		m_invalidPair = 0;
+#endif  //CLEAN_INVALID_PAIRS
+
+		//printf("overlappingPairArray.size()=%d\n",overlappingPairArray.size());
+	}
+}
+
+template <typename BP_FP_INT_TYPE>
+bool btAxisSweep3Internal<BP_FP_INT_TYPE>::testAabbOverlap(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	const Handle* pHandleA = static_cast<Handle*>(proxy0);
+	const Handle* pHandleB = static_cast<Handle*>(proxy1);
+
+	//optimization 1: check the array index (memory address), instead of the m_pos
+
+	for (int axis = 0; axis < 3; axis++)
+	{
+		if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] ||
+			pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis])
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+template <typename BP_FP_INT_TYPE>
+bool btAxisSweep3Internal<BP_FP_INT_TYPE>::testOverlap2D(const Handle* pHandleA, const Handle* pHandleB, int axis0, int axis1)
+{
+	//optimization 1: check the array index (memory address), instead of the m_pos
+
+	if (pHandleA->m_maxEdges[axis0] < pHandleB->m_minEdges[axis0] ||
+		pHandleB->m_maxEdges[axis0] < pHandleA->m_minEdges[axis0] ||
+		pHandleA->m_maxEdges[axis1] < pHandleB->m_minEdges[axis1] ||
+		pHandleB->m_maxEdges[axis1] < pHandleA->m_minEdges[axis1])
+	{
+		return false;
+	}
+	return true;
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::updateHandle(BP_FP_INT_TYPE handle, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* dispatcher)
+{
+	//	btAssert(bounds.IsFinite());
+	//btAssert(bounds.HasVolume());
+
+	Handle* pHandle = getHandle(handle);
+
+	// quantize the new bounds
+	BP_FP_INT_TYPE min[3], max[3];
+	quantize(min, aabbMin, 0);
+	quantize(max, aabbMax, 1);
+
+	// update changed edges
+	for (int axis = 0; axis < 3; axis++)
+	{
+		BP_FP_INT_TYPE emin = pHandle->m_minEdges[axis];
+		BP_FP_INT_TYPE emax = pHandle->m_maxEdges[axis];
+
+		int dmin = (int)min[axis] - (int)m_pEdges[axis][emin].m_pos;
+		int dmax = (int)max[axis] - (int)m_pEdges[axis][emax].m_pos;
+
+		m_pEdges[axis][emin].m_pos = min[axis];
+		m_pEdges[axis][emax].m_pos = max[axis];
+
+		// expand (only adds overlaps)
+		if (dmin < 0)
+			sortMinDown(axis, emin, dispatcher, true);
+
+		if (dmax > 0)
+			sortMaxUp(axis, emax, dispatcher, true);
+
+		// shrink (only removes overlaps)
+		if (dmin > 0)
+			sortMinUp(axis, emin, dispatcher, true);
+
+		if (dmax < 0)
+			sortMaxDown(axis, emax, dispatcher, true);
+
+#ifdef DEBUG_BROADPHASE
+		debugPrintAxis(axis);
+#endif  //DEBUG_BROADPHASE
+	}
+}
+
+// sorting a min edge downwards can only ever *add* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMinDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* /* dispatcher */, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pPrev = pEdge - 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pEdge->m_pos < pPrev->m_pos)
+	{
+		Handle* pHandlePrev = getHandle(pPrev->m_handle);
+
+		if (pPrev->IsMax())
+		{
+			// if previous edge is a maximum check the bounds and add an overlap if necessary
+			const int axis1 = (1 << axis) & 3;
+			const int axis2 = (1 << axis1) & 3;
+			if (updateOverlaps && testOverlap2D(pHandleEdge, pHandlePrev, axis1, axis2))
+			{
+				m_pairCache->addOverlappingPair(pHandleEdge, pHandlePrev);
+				if (m_userPairCallback)
+					m_userPairCallback->addOverlappingPair(pHandleEdge, pHandlePrev);
+
+				//AddOverlap(pEdge->m_handle, pPrev->m_handle);
+			}
+
+			// update edge reference in other handle
+			pHandlePrev->m_maxEdges[axis]++;
+		}
+		else
+			pHandlePrev->m_minEdges[axis]++;
+
+		pHandleEdge->m_minEdges[axis]--;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pPrev;
+		*pPrev = swap;
+
+		// decrement
+		pEdge--;
+		pPrev--;
+	}
+
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif  //DEBUG_BROADPHASE
+}
+
+// sorting a min edge upwards can only ever *remove* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMinUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pNext = pEdge + 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
+	{
+		Handle* pHandleNext = getHandle(pNext->m_handle);
+
+		if (pNext->IsMax())
+		{
+			Handle* handle0 = getHandle(pEdge->m_handle);
+			Handle* handle1 = getHandle(pNext->m_handle);
+			const int axis1 = (1 << axis) & 3;
+			const int axis2 = (1 << axis1) & 3;
+
+			// if next edge is maximum remove any overlap between the two handles
+			if (updateOverlaps
+#ifdef USE_OVERLAP_TEST_ON_REMOVES
+				&& testOverlap2D(handle0, handle1, axis1, axis2)
+#endif  //USE_OVERLAP_TEST_ON_REMOVES
+			)
+			{
+				m_pairCache->removeOverlappingPair(handle0, handle1, dispatcher);
+				if (m_userPairCallback)
+					m_userPairCallback->removeOverlappingPair(handle0, handle1, dispatcher);
+			}
+
+			// update edge reference in other handle
+			pHandleNext->m_maxEdges[axis]--;
+		}
+		else
+			pHandleNext->m_minEdges[axis]--;
+
+		pHandleEdge->m_minEdges[axis]++;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pNext;
+		*pNext = swap;
+
+		// increment
+		pEdge++;
+		pNext++;
+	}
+}
+
+// sorting a max edge downwards can only ever *remove* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMaxDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pPrev = pEdge - 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pEdge->m_pos < pPrev->m_pos)
+	{
+		Handle* pHandlePrev = getHandle(pPrev->m_handle);
+
+		if (!pPrev->IsMax())
+		{
+			// if previous edge was a minimum remove any overlap between the two handles
+			Handle* handle0 = getHandle(pEdge->m_handle);
+			Handle* handle1 = getHandle(pPrev->m_handle);
+			const int axis1 = (1 << axis) & 3;
+			const int axis2 = (1 << axis1) & 3;
+
+			if (updateOverlaps
+#ifdef USE_OVERLAP_TEST_ON_REMOVES
+				&& testOverlap2D(handle0, handle1, axis1, axis2)
+#endif  //USE_OVERLAP_TEST_ON_REMOVES
+			)
+			{
+				//this is done during the overlappingpairarray iteration/narrowphase collision
+
+				m_pairCache->removeOverlappingPair(handle0, handle1, dispatcher);
+				if (m_userPairCallback)
+					m_userPairCallback->removeOverlappingPair(handle0, handle1, dispatcher);
+			}
+
+			// update edge reference in other handle
+			pHandlePrev->m_minEdges[axis]++;
+			;
+		}
+		else
+			pHandlePrev->m_maxEdges[axis]++;
+
+		pHandleEdge->m_maxEdges[axis]--;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pPrev;
+		*pPrev = swap;
+
+		// decrement
+		pEdge--;
+		pPrev--;
+	}
+
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif  //DEBUG_BROADPHASE
+}
+
+// sorting a max edge upwards can only ever *add* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMaxUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* /* dispatcher */, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pNext = pEdge + 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
+	{
+		Handle* pHandleNext = getHandle(pNext->m_handle);
+
+		const int axis1 = (1 << axis) & 3;
+		const int axis2 = (1 << axis1) & 3;
+
+		if (!pNext->IsMax())
+		{
+			// if next edge is a minimum check the bounds and add an overlap if necessary
+			if (updateOverlaps && testOverlap2D(pHandleEdge, pHandleNext, axis1, axis2))
+			{
+				Handle* handle0 = getHandle(pEdge->m_handle);
+				Handle* handle1 = getHandle(pNext->m_handle);
+				m_pairCache->addOverlappingPair(handle0, handle1);
+				if (m_userPairCallback)
+					m_userPairCallback->addOverlappingPair(handle0, handle1);
+			}
+
+			// update edge reference in other handle
+			pHandleNext->m_minEdges[axis]--;
+		}
+		else
+			pHandleNext->m_maxEdges[axis]--;
+
+		pHandleEdge->m_maxEdges[axis]++;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pNext;
+		*pNext = swap;
+
+		// increment
+		pEdge++;
+		pNext++;
+	}
+}
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
new file mode 100644
index 0000000..4176256
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
@@ -0,0 +1,79 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_BROADPHASE_INTERFACE_H
+#define BT_BROADPHASE_INTERFACE_H
+
+struct btDispatcherInfo;
+class btDispatcher;
+#include "btBroadphaseProxy.h"
+
+class btOverlappingPairCache;
+
+struct btBroadphaseAabbCallback
+{
+	virtual ~btBroadphaseAabbCallback() {}
+	virtual bool process(const btBroadphaseProxy* proxy) = 0;
+};
+
+struct btBroadphaseRayCallback : public btBroadphaseAabbCallback
+{
+	///added some cached data to accelerate ray-AABB tests
+	btVector3 m_rayDirectionInverse;
+	unsigned int m_signs[3];
+	btScalar m_lambda_max;
+
+	virtual ~btBroadphaseRayCallback() {}
+
+protected:
+	btBroadphaseRayCallback() {}
+};
+
+#include "LinearMath/btVector3.h"
+
+///The btBroadphaseInterface class provides an interface to detect aabb-overlapping object pairs.
+///Some implementations for this broadphase interface include btAxisSweep3, bt32BitAxisSweep3 and btDbvtBroadphase.
+///The actual overlapping pair management, storage, adding and removing of pairs is dealt by the btOverlappingPairCache class.
+class btBroadphaseInterface
+{
+public:
+	virtual ~btBroadphaseInterface() {}
+
+	virtual btBroadphaseProxy* createProxy(const btVector3& aabbMin, const btVector3& aabbMax, int shapeType, void* userPtr, int collisionFilterGroup, int collisionFilterMask, btDispatcher* dispatcher) = 0;
+	virtual void destroyProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher) = 0;
+	virtual void setAabb(btBroadphaseProxy* proxy, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* dispatcher) = 0;
+	virtual void getAabb(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const = 0;
+
+	virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin = btVector3(0, 0, 0), const btVector3& aabbMax = btVector3(0, 0, 0)) = 0;
+
+	virtual void aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback) = 0;
+
+	///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
+	virtual void calculateOverlappingPairs(btDispatcher* dispatcher) = 0;
+
+	virtual btOverlappingPairCache* getOverlappingPairCache() = 0;
+	virtual const btOverlappingPairCache* getOverlappingPairCache() const = 0;
+
+	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
+	///will add some transform later
+	virtual void getBroadphaseAabb(btVector3& aabbMin, btVector3& aabbMax) const = 0;
+
+	///reset broadphase internal structures, to ensure determinism/reproducability
+	virtual void resetPool(btDispatcher* dispatcher) { (void)dispatcher; };
+
+	virtual void printStats() = 0;
+};
+
+#endif  //BT_BROADPHASE_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
new file mode 100644
index 0000000..317c3f6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
@@ -0,0 +1,18 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btBroadphaseProxy.h"
+
+BT_NOT_EMPTY_FILE  // fix warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
new file mode 100644
index 0000000..fb23281
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
@@ -0,0 +1,248 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_BROADPHASE_PROXY_H
+#define BT_BROADPHASE_PROXY_H
+
+#include "LinearMath/btScalar.h"  //for SIMD_FORCE_INLINE
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAlignedAllocator.h"
+
+/// btDispatcher uses these types
+/// IMPORTANT NOTE:The types are ordered polyhedral, implicit convex and concave
+/// to facilitate type checking
+/// CUSTOM_POLYHEDRAL_SHAPE_TYPE,CUSTOM_CONVEX_SHAPE_TYPE and CUSTOM_CONCAVE_SHAPE_TYPE can be used to extend Bullet without modifying source code
+enum BroadphaseNativeTypes
+{
+	// polyhedral convex shapes
+	BOX_SHAPE_PROXYTYPE,
+	TRIANGLE_SHAPE_PROXYTYPE,
+	TETRAHEDRAL_SHAPE_PROXYTYPE,
+	CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE,
+	CONVEX_HULL_SHAPE_PROXYTYPE,
+	CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE,
+	CUSTOM_POLYHEDRAL_SHAPE_TYPE,
+	//implicit convex shapes
+	IMPLICIT_CONVEX_SHAPES_START_HERE,
+	SPHERE_SHAPE_PROXYTYPE,
+	MULTI_SPHERE_SHAPE_PROXYTYPE,
+	CAPSULE_SHAPE_PROXYTYPE,
+	CONE_SHAPE_PROXYTYPE,
+	CONVEX_SHAPE_PROXYTYPE,
+	CYLINDER_SHAPE_PROXYTYPE,
+	UNIFORM_SCALING_SHAPE_PROXYTYPE,
+	MINKOWSKI_SUM_SHAPE_PROXYTYPE,
+	MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE,
+	BOX_2D_SHAPE_PROXYTYPE,
+	CONVEX_2D_SHAPE_PROXYTYPE,
+	CUSTOM_CONVEX_SHAPE_TYPE,
+	//concave shapes
+	CONCAVE_SHAPES_START_HERE,
+	//keep all the convex shapetype below here, for the check IsConvexShape in broadphase proxy!
+	TRIANGLE_MESH_SHAPE_PROXYTYPE,
+	SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE,
+	///used for demo integration FAST/Swift collision library and Bullet
+	FAST_CONCAVE_MESH_PROXYTYPE,
+	//terrain
+	TERRAIN_SHAPE_PROXYTYPE,
+	///Used for GIMPACT Trimesh integration
+	GIMPACT_SHAPE_PROXYTYPE,
+	///Multimaterial mesh
+	MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE,
+
+	EMPTY_SHAPE_PROXYTYPE,
+	STATIC_PLANE_PROXYTYPE,
+	CUSTOM_CONCAVE_SHAPE_TYPE,
+	SDF_SHAPE_PROXYTYPE = CUSTOM_CONCAVE_SHAPE_TYPE,
+	CONCAVE_SHAPES_END_HERE,
+
+	COMPOUND_SHAPE_PROXYTYPE,
+
+	SOFTBODY_SHAPE_PROXYTYPE,
+	HFFLUID_SHAPE_PROXYTYPE,
+	HFFLUID_BUOYANT_CONVEX_SHAPE_PROXYTYPE,
+	INVALID_SHAPE_PROXYTYPE,
+
+	MAX_BROADPHASE_COLLISION_TYPES
+
+};
+
+///The btBroadphaseProxy is the main class that can be used with the Bullet broadphases.
+///It stores collision shape type information, collision filter information and a client object, typically a btCollisionObject or btRigidBody.
+ATTRIBUTE_ALIGNED16(struct)
+btBroadphaseProxy
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	///optional filtering to cull potential collisions
+	enum CollisionFilterGroups
+	{
+		DefaultFilter = 1,
+		StaticFilter = 2,
+		KinematicFilter = 4,
+		DebrisFilter = 8,
+		SensorTrigger = 16,
+		CharacterFilter = 32,
+		AllFilter = -1  //all bits sets: DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger
+	};
+
+	//Usually the client btCollisionObject or Rigidbody class
+	void* m_clientObject;
+	int m_collisionFilterGroup;
+	int m_collisionFilterMask;
+
+	int m_uniqueId;  //m_uniqueId is introduced for paircache. could get rid of this, by calculating the address offset etc.
+
+	btVector3 m_aabbMin;
+	btVector3 m_aabbMax;
+
+	SIMD_FORCE_INLINE int getUid() const
+	{
+		return m_uniqueId;
+	}
+
+	//used for memory pools
+	btBroadphaseProxy() : m_clientObject(0)
+	{
+	}
+
+	btBroadphaseProxy(const btVector3& aabbMin, const btVector3& aabbMax, void* userPtr, int collisionFilterGroup, int collisionFilterMask)
+		: m_clientObject(userPtr),
+		  m_collisionFilterGroup(collisionFilterGroup),
+		  m_collisionFilterMask(collisionFilterMask),
+		  m_aabbMin(aabbMin),
+		  m_aabbMax(aabbMax)
+	{
+	}
+
+	static SIMD_FORCE_INLINE bool isPolyhedral(int proxyType)
+	{
+		return (proxyType < IMPLICIT_CONVEX_SHAPES_START_HERE);
+	}
+
+	static SIMD_FORCE_INLINE bool isConvex(int proxyType)
+	{
+		return (proxyType < CONCAVE_SHAPES_START_HERE);
+	}
+
+	static SIMD_FORCE_INLINE bool isNonMoving(int proxyType)
+	{
+		return (isConcave(proxyType) && !(proxyType == GIMPACT_SHAPE_PROXYTYPE));
+	}
+
+	static SIMD_FORCE_INLINE bool isConcave(int proxyType)
+	{
+		return ((proxyType > CONCAVE_SHAPES_START_HERE) &&
+				(proxyType < CONCAVE_SHAPES_END_HERE));
+	}
+	static SIMD_FORCE_INLINE bool isCompound(int proxyType)
+	{
+		return (proxyType == COMPOUND_SHAPE_PROXYTYPE);
+	}
+
+	static SIMD_FORCE_INLINE bool isSoftBody(int proxyType)
+	{
+		return (proxyType == SOFTBODY_SHAPE_PROXYTYPE);
+	}
+
+	static SIMD_FORCE_INLINE bool isInfinite(int proxyType)
+	{
+		return (proxyType == STATIC_PLANE_PROXYTYPE);
+	}
+
+	static SIMD_FORCE_INLINE bool isConvex2d(int proxyType)
+	{
+		return (proxyType == BOX_2D_SHAPE_PROXYTYPE) || (proxyType == CONVEX_2D_SHAPE_PROXYTYPE);
+	}
+};
+
+class btCollisionAlgorithm;
+
+struct btBroadphaseProxy;
+
+///The btBroadphasePair class contains a pair of aabb-overlapping objects.
+///A btDispatcher can search a btCollisionAlgorithm that performs exact/narrowphase collision detection on the actual collision shapes.
+ATTRIBUTE_ALIGNED16(struct)
+btBroadphasePair
+{
+	btBroadphasePair()
+		: m_pProxy0(0),
+		  m_pProxy1(0),
+		  m_algorithm(0),
+		  m_internalInfo1(0)
+	{
+	}
+
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btBroadphasePair(btBroadphaseProxy & proxy0, btBroadphaseProxy & proxy1)
+	{
+		//keep them sorted, so the std::set operations work
+		if (proxy0.m_uniqueId < proxy1.m_uniqueId)
+		{
+			m_pProxy0 = &proxy0;
+			m_pProxy1 = &proxy1;
+		}
+		else
+		{
+			m_pProxy0 = &proxy1;
+			m_pProxy1 = &proxy0;
+		}
+
+		m_algorithm = 0;
+		m_internalInfo1 = 0;
+	}
+
+	btBroadphaseProxy* m_pProxy0;
+	btBroadphaseProxy* m_pProxy1;
+
+	mutable btCollisionAlgorithm* m_algorithm;
+	union {
+		void* m_internalInfo1;
+		int m_internalTmpValue;
+	};  //don't use this data, it will be removed in future version.
+};
+
+/*
+//comparison for set operation, see Solid DT_Encounter
+SIMD_FORCE_INLINE bool operator<(const btBroadphasePair& a, const btBroadphasePair& b) 
+{ 
+    return a.m_pProxy0 < b.m_pProxy0 || 
+        (a.m_pProxy0 == b.m_pProxy0 && a.m_pProxy1 < b.m_pProxy1); 
+}
+*/
+
+class btBroadphasePairSortPredicate
+{
+public:
+	bool operator()(const btBroadphasePair& a, const btBroadphasePair& b) const
+	{
+		const int uidA0 = a.m_pProxy0 ? a.m_pProxy0->m_uniqueId : -1;
+		const int uidB0 = b.m_pProxy0 ? b.m_pProxy0->m_uniqueId : -1;
+		const int uidA1 = a.m_pProxy1 ? a.m_pProxy1->m_uniqueId : -1;
+		const int uidB1 = b.m_pProxy1 ? b.m_pProxy1->m_uniqueId : -1;
+
+		return uidA0 > uidB0 ||
+			   (a.m_pProxy0 == b.m_pProxy0 && uidA1 > uidB1) ||
+			   (a.m_pProxy0 == b.m_pProxy0 && a.m_pProxy1 == b.m_pProxy1 && a.m_algorithm > b.m_algorithm);
+	}
+};
+
+SIMD_FORCE_INLINE bool operator==(const btBroadphasePair& a, const btBroadphasePair& b)
+{
+	return (a.m_pProxy0 == b.m_pProxy0) && (a.m_pProxy1 == b.m_pProxy1);
+}
+
+#endif  //BT_BROADPHASE_PROXY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
new file mode 100644
index 0000000..9cb6225
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -0,0 +1,22 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCollisionAlgorithm.h"
+#include "btDispatcher.h"
+
+btCollisionAlgorithm::btCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+{
+	m_dispatcher = ci.m_dispatcher1;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
new file mode 100644
index 0000000..25a347e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
@@ -0,0 +1,75 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_ALGORITHM_H
+#define BT_COLLISION_ALGORITHM_H
+
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+struct btBroadphaseProxy;
+class btDispatcher;
+class btManifoldResult;
+class btCollisionObject;
+struct btCollisionObjectWrapper;
+struct btDispatcherInfo;
+class btPersistentManifold;
+
+typedef btAlignedObjectArray<btPersistentManifold*> btManifoldArray;
+
+struct btCollisionAlgorithmConstructionInfo
+{
+	btCollisionAlgorithmConstructionInfo()
+		: m_dispatcher1(0),
+		  m_manifold(0)
+	{
+	}
+	btCollisionAlgorithmConstructionInfo(btDispatcher* dispatcher, int temp)
+		: m_dispatcher1(dispatcher)
+	{
+		(void)temp;
+	}
+
+	btDispatcher* m_dispatcher1;
+	btPersistentManifold* m_manifold;
+
+	//	int	getDispatcherId();
+};
+
+///btCollisionAlgorithm is an collision interface that is compatible with the Broadphase and btDispatcher.
+///It is persistent over frames
+class btCollisionAlgorithm
+{
+protected:
+	btDispatcher* m_dispatcher;
+
+protected:
+	//	int	getDispatcherId();
+
+public:
+	btCollisionAlgorithm(){};
+
+	btCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci);
+
+	virtual ~btCollisionAlgorithm(){};
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut) = 0;
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut) = 0;
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray) = 0;
+};
+
+#endif  //BT_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
new file mode 100644
index 0000000..ae087c8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
@@ -0,0 +1,1357 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btDbvt implementation by Nathanael Presson
+
+#include "btDbvt.h"
+
+//
+typedef btAlignedObjectArray<btDbvtNode*> tNodeArray;
+typedef btAlignedObjectArray<const btDbvtNode*> tConstNodeArray;
+
+//
+struct btDbvtNodeEnumerator : btDbvt::ICollide
+{
+	tConstNodeArray nodes;
+	void Process(const btDbvtNode* n) { nodes.push_back(n); }
+};
+
+//
+static DBVT_INLINE int indexof(const btDbvtNode* node)
+{
+	return (node->parent->childs[1] == node);
+}
+
+//
+static DBVT_INLINE btDbvtVolume merge(const btDbvtVolume& a,
+									  const btDbvtVolume& b)
+{
+#ifdef BT_USE_SSE
+	ATTRIBUTE_ALIGNED16(char locals[sizeof(btDbvtAabbMm)]);
+	btDbvtVolume* ptr = (btDbvtVolume*)locals;
+	btDbvtVolume& res = *ptr;
+#else
+	btDbvtVolume res;
+#endif
+	Merge(a, b, res);
+	return (res);
+}
+
+// volume+edge lengths
+static DBVT_INLINE btScalar size(const btDbvtVolume& a)
+{
+	const btVector3 edges = a.Lengths();
+	return (edges.x() * edges.y() * edges.z() +
+			edges.x() + edges.y() + edges.z());
+}
+
+//
+static void getmaxdepth(const btDbvtNode* node, int depth, int& maxdepth)
+{
+	if (node->isinternal())
+	{
+		getmaxdepth(node->childs[0], depth + 1, maxdepth);
+		getmaxdepth(node->childs[1], depth + 1, maxdepth);
+	}
+	else
+		maxdepth = btMax(maxdepth, depth);
+}
+
+//
+static DBVT_INLINE void deletenode(btDbvt* pdbvt,
+								   btDbvtNode* node)
+{
+	btAlignedFree(pdbvt->m_free);
+	pdbvt->m_free = node;
+}
+
+//
+static void recursedeletenode(btDbvt* pdbvt,
+							  btDbvtNode* node)
+{
+	if (node == 0) return;
+	if (!node->isleaf())
+	{
+		recursedeletenode(pdbvt, node->childs[0]);
+		recursedeletenode(pdbvt, node->childs[1]);
+	}
+	if (node == pdbvt->m_root) pdbvt->m_root = 0;
+	deletenode(pdbvt, node);
+}
+
+//
+static DBVT_INLINE btDbvtNode* createnode(btDbvt* pdbvt,
+										  btDbvtNode* parent,
+										  void* data)
+{
+	btDbvtNode* node;
+	if (pdbvt->m_free)
+	{
+		node = pdbvt->m_free;
+		pdbvt->m_free = 0;
+	}
+	else
+	{
+		node = new (btAlignedAlloc(sizeof(btDbvtNode), 16)) btDbvtNode();
+	}
+	node->parent = parent;
+	node->data = data;
+	node->childs[1] = 0;
+	return (node);
+}
+
+//
+static DBVT_INLINE btDbvtNode* createnode(btDbvt* pdbvt,
+										  btDbvtNode* parent,
+										  const btDbvtVolume& volume,
+										  void* data)
+{
+	btDbvtNode* node = createnode(pdbvt, parent, data);
+	node->volume = volume;
+	return (node);
+}
+
+//
+static DBVT_INLINE btDbvtNode* createnode(btDbvt* pdbvt,
+										  btDbvtNode* parent,
+										  const btDbvtVolume& volume0,
+										  const btDbvtVolume& volume1,
+										  void* data)
+{
+	btDbvtNode* node = createnode(pdbvt, parent, data);
+	Merge(volume0, volume1, node->volume);
+	return (node);
+}
+
+//
+static void insertleaf(btDbvt* pdbvt,
+					   btDbvtNode* root,
+					   btDbvtNode* leaf)
+{
+	if (!pdbvt->m_root)
+	{
+		pdbvt->m_root = leaf;
+		leaf->parent = 0;
+	}
+	else
+	{
+		if (!root->isleaf())
+		{
+			do
+			{
+				root = root->childs[Select(leaf->volume,
+										   root->childs[0]->volume,
+										   root->childs[1]->volume)];
+			} while (!root->isleaf());
+		}
+		btDbvtNode* prev = root->parent;
+		btDbvtNode* node = createnode(pdbvt, prev, leaf->volume, root->volume, 0);
+		if (prev)
+		{
+			prev->childs[indexof(root)] = node;
+			node->childs[0] = root;
+			root->parent = node;
+			node->childs[1] = leaf;
+			leaf->parent = node;
+			do
+			{
+				if (!prev->volume.Contain(node->volume))
+					Merge(prev->childs[0]->volume, prev->childs[1]->volume, prev->volume);
+				else
+					break;
+				node = prev;
+			} while (0 != (prev = node->parent));
+		}
+		else
+		{
+			node->childs[0] = root;
+			root->parent = node;
+			node->childs[1] = leaf;
+			leaf->parent = node;
+			pdbvt->m_root = node;
+		}
+	}
+}
+
+//
+static btDbvtNode* removeleaf(btDbvt* pdbvt,
+							  btDbvtNode* leaf)
+{
+	if (leaf == pdbvt->m_root)
+	{
+		pdbvt->m_root = 0;
+		return (0);
+	}
+	else
+	{
+		btDbvtNode* parent = leaf->parent;
+		btDbvtNode* prev = parent->parent;
+		btDbvtNode* sibling = parent->childs[1 - indexof(leaf)];
+		if (prev)
+		{
+			prev->childs[indexof(parent)] = sibling;
+			sibling->parent = prev;
+			deletenode(pdbvt, parent);
+			while (prev)
+			{
+				const btDbvtVolume pb = prev->volume;
+				Merge(prev->childs[0]->volume, prev->childs[1]->volume, prev->volume);
+				if (NotEqual(pb, prev->volume))
+				{
+					prev = prev->parent;
+				}
+				else
+					break;
+			}
+			return (prev ? prev : pdbvt->m_root);
+		}
+		else
+		{
+			pdbvt->m_root = sibling;
+			sibling->parent = 0;
+			deletenode(pdbvt, parent);
+			return (pdbvt->m_root);
+		}
+	}
+}
+
+//
+static void fetchleaves(btDbvt* pdbvt,
+						btDbvtNode* root,
+						tNodeArray& leaves,
+						int depth = -1)
+{
+	if (root->isinternal() && depth)
+	{
+		fetchleaves(pdbvt, root->childs[0], leaves, depth - 1);
+		fetchleaves(pdbvt, root->childs[1], leaves, depth - 1);
+		deletenode(pdbvt, root);
+	}
+	else
+	{
+		leaves.push_back(root);
+	}
+}
+
+//
+static bool leftOfAxis(const btDbvtNode* node,
+					   const btVector3& org,
+					   const btVector3& axis)
+{
+	return btDot(axis, node->volume.Center() - org) <= 0;
+}
+
+// Partitions leaves such that leaves[0, n) are on the
+// left of axis, and leaves[n, count) are on the right
+// of axis. returns N.
+static int split(btDbvtNode** leaves,
+				 int count,
+				 const btVector3& org,
+				 const btVector3& axis)
+{
+	int begin = 0;
+	int end = count;
+	for (;;)
+	{
+		while (begin != end && leftOfAxis(leaves[begin], org, axis))
+		{
+			++begin;
+		}
+
+		if (begin == end)
+		{
+			break;
+		}
+
+		while (begin != end && !leftOfAxis(leaves[end - 1], org, axis))
+		{
+			--end;
+		}
+
+		if (begin == end)
+		{
+			break;
+		}
+
+		// swap out of place nodes
+		--end;
+		btDbvtNode* temp = leaves[begin];
+		leaves[begin] = leaves[end];
+		leaves[end] = temp;
+		++begin;
+	}
+
+	return begin;
+}
+
+//
+static btDbvtVolume bounds(btDbvtNode** leaves,
+						   int count)
+{
+#ifdef BT_USE_SSE
+	ATTRIBUTE_ALIGNED16(char locals[sizeof(btDbvtVolume)]);
+	btDbvtVolume* ptr = (btDbvtVolume*)locals;
+	btDbvtVolume& volume = *ptr;
+	volume = leaves[0]->volume;
+#else
+	btDbvtVolume volume = leaves[0]->volume;
+#endif
+	for (int i = 1, ni = count; i < ni; ++i)
+	{
+		Merge(volume, leaves[i]->volume, volume);
+	}
+	return (volume);
+}
+
+//
+static void bottomup(btDbvt* pdbvt,
+					 btDbvtNode** leaves,
+					 int count)
+{
+	while (count > 1)
+	{
+		btScalar minsize = SIMD_INFINITY;
+		int minidx[2] = {-1, -1};
+		for (int i = 0; i < count; ++i)
+		{
+			for (int j = i + 1; j < count; ++j)
+			{
+				const btScalar sz = size(merge(leaves[i]->volume, leaves[j]->volume));
+				if (sz < minsize)
+				{
+					minsize = sz;
+					minidx[0] = i;
+					minidx[1] = j;
+				}
+			}
+		}
+		btDbvtNode* n[] = {leaves[minidx[0]], leaves[minidx[1]]};
+		btDbvtNode* p = createnode(pdbvt, 0, n[0]->volume, n[1]->volume, 0);
+		p->childs[0] = n[0];
+		p->childs[1] = n[1];
+		n[0]->parent = p;
+		n[1]->parent = p;
+		leaves[minidx[0]] = p;
+		leaves[minidx[1]] = leaves[count - 1];
+		--count;
+	}
+}
+
+//
+static btDbvtNode* topdown(btDbvt* pdbvt,
+						   btDbvtNode** leaves,
+						   int count,
+						   int bu_treshold)
+{
+	static const btVector3 axis[] = {btVector3(1, 0, 0),
+									 btVector3(0, 1, 0),
+									 btVector3(0, 0, 1)};
+	btAssert(bu_treshold > 2);
+	if (count > 1)
+	{
+		if (count > bu_treshold)
+		{
+			const btDbvtVolume vol = bounds(leaves, count);
+			const btVector3 org = vol.Center();
+			int partition;
+			int bestaxis = -1;
+			int bestmidp = count;
+			int splitcount[3][2] = {{0, 0}, {0, 0}, {0, 0}};
+			int i;
+			for (i = 0; i < count; ++i)
+			{
+				const btVector3 x = leaves[i]->volume.Center() - org;
+				for (int j = 0; j < 3; ++j)
+				{
+					++splitcount[j][btDot(x, axis[j]) > 0 ? 1 : 0];
+				}
+			}
+			for (i = 0; i < 3; ++i)
+			{
+				if ((splitcount[i][0] > 0) && (splitcount[i][1] > 0))
+				{
+					const int midp = (int)btFabs(btScalar(splitcount[i][0] - splitcount[i][1]));
+					if (midp < bestmidp)
+					{
+						bestaxis = i;
+						bestmidp = midp;
+					}
+				}
+			}
+			if (bestaxis >= 0)
+			{
+				partition = split(leaves, count, org, axis[bestaxis]);
+				btAssert(partition != 0 && partition != count);
+			}
+			else
+			{
+				partition = count / 2 + 1;
+			}
+			btDbvtNode* node = createnode(pdbvt, 0, vol, 0);
+			node->childs[0] = topdown(pdbvt, &leaves[0], partition, bu_treshold);
+			node->childs[1] = topdown(pdbvt, &leaves[partition], count - partition, bu_treshold);
+			node->childs[0]->parent = node;
+			node->childs[1]->parent = node;
+			return (node);
+		}
+		else
+		{
+			bottomup(pdbvt, leaves, count);
+			return (leaves[0]);
+		}
+	}
+	return (leaves[0]);
+}
+
+//
+static DBVT_INLINE btDbvtNode* sort(btDbvtNode* n, btDbvtNode*& r)
+{
+	btDbvtNode* p = n->parent;
+	btAssert(n->isinternal());
+	if (p > n)
+	{
+		const int i = indexof(n);
+		const int j = 1 - i;
+		btDbvtNode* s = p->childs[j];
+		btDbvtNode* q = p->parent;
+		btAssert(n == p->childs[i]);
+		if (q)
+			q->childs[indexof(p)] = n;
+		else
+			r = n;
+		s->parent = n;
+		p->parent = n;
+		n->parent = q;
+		p->childs[0] = n->childs[0];
+		p->childs[1] = n->childs[1];
+		n->childs[0]->parent = p;
+		n->childs[1]->parent = p;
+		n->childs[i] = p;
+		n->childs[j] = s;
+		btSwap(p->volume, n->volume);
+		return (p);
+	}
+	return (n);
+}
+
+#if 0
+static DBVT_INLINE btDbvtNode*	walkup(btDbvtNode* n,int count)
+{
+	while(n&&(count--)) n=n->parent;
+	return(n);
+}
+#endif
+
+//
+// Api
+//
+
+//
+btDbvt::btDbvt()
+{
+	m_root = 0;
+	m_free = 0;
+	m_lkhd = -1;
+	m_leaves = 0;
+	m_opath = 0;
+}
+
+//
+btDbvt::~btDbvt()
+{
+	clear();
+}
+
+//
+void btDbvt::clear()
+{
+	if (m_root)
+		recursedeletenode(this, m_root);
+	btAlignedFree(m_free);
+	m_free = 0;
+	m_lkhd = -1;
+	m_stkStack.clear();
+	m_opath = 0;
+}
+
+//
+void btDbvt::optimizeBottomUp()
+{
+	if (m_root)
+	{
+		tNodeArray leaves;
+		leaves.reserve(m_leaves);
+		fetchleaves(this, m_root, leaves);
+		bottomup(this, &leaves[0], leaves.size());
+		m_root = leaves[0];
+	}
+}
+
+//
+void btDbvt::optimizeTopDown(int bu_treshold)
+{
+	if (m_root)
+	{
+		tNodeArray leaves;
+		leaves.reserve(m_leaves);
+		fetchleaves(this, m_root, leaves);
+		m_root = topdown(this, &leaves[0], leaves.size(), bu_treshold);
+	}
+}
+
+//
+void btDbvt::optimizeIncremental(int passes)
+{
+	if (passes < 0) passes = m_leaves;
+	if (m_root && (passes > 0))
+	{
+		do
+		{
+			btDbvtNode* node = m_root;
+			unsigned bit = 0;
+			while (node->isinternal())
+			{
+				node = sort(node, m_root)->childs[(m_opath >> bit) & 1];
+				bit = (bit + 1) & (sizeof(unsigned) * 8 - 1);
+			}
+			update(node);
+			++m_opath;
+		} while (--passes);
+	}
+}
+
+//
+btDbvtNode* btDbvt::insert(const btDbvtVolume& volume, void* data)
+{
+	btDbvtNode* leaf = createnode(this, 0, volume, data);
+	insertleaf(this, m_root, leaf);
+	++m_leaves;
+	return (leaf);
+}
+
+//
+void btDbvt::update(btDbvtNode* leaf, int lookahead)
+{
+	btDbvtNode* root = removeleaf(this, leaf);
+	if (root)
+	{
+		if (lookahead >= 0)
+		{
+			for (int i = 0; (i < lookahead) && root->parent; ++i)
+			{
+				root = root->parent;
+			}
+		}
+		else
+			root = m_root;
+	}
+	insertleaf(this, root, leaf);
+}
+
+//
+void btDbvt::update(btDbvtNode* leaf, btDbvtVolume& volume)
+{
+	btDbvtNode* root = removeleaf(this, leaf);
+	if (root)
+	{
+		if (m_lkhd >= 0)
+		{
+			for (int i = 0; (i < m_lkhd) && root->parent; ++i)
+			{
+				root = root->parent;
+			}
+		}
+		else
+			root = m_root;
+	}
+	leaf->volume = volume;
+	insertleaf(this, root, leaf);
+}
+
+//
+bool btDbvt::update(btDbvtNode* leaf, btDbvtVolume& volume, const btVector3& velocity, btScalar margin)
+{
+	if (leaf->volume.Contain(volume)) return (false);
+	volume.Expand(btVector3(margin, margin, margin));
+	volume.SignedExpand(velocity);
+	update(leaf, volume);
+	return (true);
+}
+
+//
+bool btDbvt::update(btDbvtNode* leaf, btDbvtVolume& volume, const btVector3& velocity)
+{
+	if (leaf->volume.Contain(volume)) return (false);
+	volume.SignedExpand(velocity);
+	update(leaf, volume);
+	return (true);
+}
+
+//
+bool btDbvt::update(btDbvtNode* leaf, btDbvtVolume& volume, btScalar margin)
+{
+	if (leaf->volume.Contain(volume)) return (false);
+	volume.Expand(btVector3(margin, margin, margin));
+	update(leaf, volume);
+	return (true);
+}
+
+//
+void btDbvt::remove(btDbvtNode* leaf)
+{
+	removeleaf(this, leaf);
+	deletenode(this, leaf);
+	--m_leaves;
+}
+
+//
+void btDbvt::write(IWriter* iwriter) const
+{
+	btDbvtNodeEnumerator nodes;
+	nodes.nodes.reserve(m_leaves * 2);
+	enumNodes(m_root, nodes);
+	iwriter->Prepare(m_root, nodes.nodes.size());
+	for (int i = 0; i < nodes.nodes.size(); ++i)
+	{
+		const btDbvtNode* n = nodes.nodes[i];
+		int p = -1;
+		if (n->parent) p = nodes.nodes.findLinearSearch(n->parent);
+		if (n->isinternal())
+		{
+			const int c0 = nodes.nodes.findLinearSearch(n->childs[0]);
+			const int c1 = nodes.nodes.findLinearSearch(n->childs[1]);
+			iwriter->WriteNode(n, i, p, c0, c1);
+		}
+		else
+		{
+			iwriter->WriteLeaf(n, i, p);
+		}
+	}
+}
+
+//
+void btDbvt::clone(btDbvt& dest, IClone* iclone) const
+{
+	dest.clear();
+	if (m_root != 0)
+	{
+		btAlignedObjectArray<sStkCLN> stack;
+		stack.reserve(m_leaves);
+		stack.push_back(sStkCLN(m_root, 0));
+		do
+		{
+			const int i = stack.size() - 1;
+			const sStkCLN e = stack[i];
+			btDbvtNode* n = createnode(&dest, e.parent, e.node->volume, e.node->data);
+			stack.pop_back();
+			if (e.parent != 0)
+				e.parent->childs[i & 1] = n;
+			else
+				dest.m_root = n;
+			if (e.node->isinternal())
+			{
+				stack.push_back(sStkCLN(e.node->childs[0], n));
+				stack.push_back(sStkCLN(e.node->childs[1], n));
+			}
+			else
+			{
+				iclone->CloneLeaf(n);
+			}
+		} while (stack.size() > 0);
+	}
+}
+
+//
+int btDbvt::maxdepth(const btDbvtNode* node)
+{
+	int depth = 0;
+	if (node) getmaxdepth(node, 1, depth);
+	return (depth);
+}
+
+//
+int btDbvt::countLeaves(const btDbvtNode* node)
+{
+	if (node->isinternal())
+		return (countLeaves(node->childs[0]) + countLeaves(node->childs[1]));
+	else
+		return (1);
+}
+
+//
+void btDbvt::extractLeaves(const btDbvtNode* node, btAlignedObjectArray<const btDbvtNode*>& leaves)
+{
+	if (node->isinternal())
+	{
+		extractLeaves(node->childs[0], leaves);
+		extractLeaves(node->childs[1], leaves);
+	}
+	else
+	{
+		leaves.push_back(node);
+	}
+}
+
+//
+#if DBVT_ENABLE_BENCHMARK
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "LinearMath/btQuickProf.h"
+
+/*
+q6600,2.4ghz
+
+/Ox /Ob2 /Oi /Ot /I "." /I "..\.." /I "..\..\src" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"
+/GF /FD /MT /GS- /Gy /arch:SSE2 /Zc:wchar_t- /Fp"..\..\out\release8\build\libbulletcollision\libbulletcollision.pch"
+/Fo"..\..\out\release8\build\libbulletcollision\\"
+/Fd"..\..\out\release8\build\libbulletcollision\bulletcollision.pdb"
+/W3 /nologo /c /Wp64 /Zi /errorReport:prompt
+
+Benchmarking dbvt...
+World scale: 100.000000
+Extents base: 1.000000
+Extents range: 4.000000
+Leaves: 8192
+sizeof(btDbvtVolume): 32 bytes
+sizeof(btDbvtNode):   44 bytes
+[1] btDbvtVolume intersections: 3499 ms (-1%)
+[2] btDbvtVolume merges: 1934 ms (0%)
+[3] btDbvt::collideTT: 5485 ms (-21%)
+[4] btDbvt::collideTT self: 2814 ms (-20%)
+[5] btDbvt::collideTT xform: 7379 ms (-1%)
+[6] btDbvt::collideTT xform,self: 7270 ms (-2%)
+[7] btDbvt::rayTest: 6314 ms (0%),(332143 r/s)
+[8] insert/remove: 2093 ms (0%),(1001983 ir/s)
+[9] updates (teleport): 1879 ms (-3%),(1116100 u/s)
+[10] updates (jitter): 1244 ms (-4%),(1685813 u/s)
+[11] optimize (incremental): 2514 ms (0%),(1668000 o/s)
+[12] btDbvtVolume notequal: 3659 ms (0%)
+[13] culling(OCL+fullsort): 2218 ms (0%),(461 t/s)
+[14] culling(OCL+qsort): 3688 ms (5%),(2221 t/s)
+[15] culling(KDOP+qsort): 1139 ms (-1%),(7192 t/s)
+[16] insert/remove batch(256): 5092 ms (0%),(823704 bir/s)
+[17] btDbvtVolume select: 3419 ms (0%)
+*/
+
+struct btDbvtBenchmark
+{
+	struct NilPolicy : btDbvt::ICollide
+	{
+		NilPolicy() : m_pcount(0), m_depth(-SIMD_INFINITY), m_checksort(true) {}
+		void Process(const btDbvtNode*, const btDbvtNode*) { ++m_pcount; }
+		void Process(const btDbvtNode*) { ++m_pcount; }
+		void Process(const btDbvtNode*, btScalar depth)
+		{
+			++m_pcount;
+			if (m_checksort)
+			{
+				if (depth >= m_depth)
+					m_depth = depth;
+				else
+					printf("wrong depth: %f (should be >= %f)\r\n", depth, m_depth);
+			}
+		}
+		int m_pcount;
+		btScalar m_depth;
+		bool m_checksort;
+	};
+	struct P14 : btDbvt::ICollide
+	{
+		struct Node
+		{
+			const btDbvtNode* leaf;
+			btScalar depth;
+		};
+		void Process(const btDbvtNode* leaf, btScalar depth)
+		{
+			Node n;
+			n.leaf = leaf;
+			n.depth = depth;
+		}
+		static int sortfnc(const Node& a, const Node& b)
+		{
+			if (a.depth < b.depth) return (+1);
+			if (a.depth > b.depth) return (-1);
+			return (0);
+		}
+		btAlignedObjectArray<Node> m_nodes;
+	};
+	struct P15 : btDbvt::ICollide
+	{
+		struct Node
+		{
+			const btDbvtNode* leaf;
+			btScalar depth;
+		};
+		void Process(const btDbvtNode* leaf)
+		{
+			Node n;
+			n.leaf = leaf;
+			n.depth = dot(leaf->volume.Center(), m_axis);
+		}
+		static int sortfnc(const Node& a, const Node& b)
+		{
+			if (a.depth < b.depth) return (+1);
+			if (a.depth > b.depth) return (-1);
+			return (0);
+		}
+		btAlignedObjectArray<Node> m_nodes;
+		btVector3 m_axis;
+	};
+	static btScalar RandUnit()
+	{
+		return (rand() / (btScalar)RAND_MAX);
+	}
+	static btVector3 RandVector3()
+	{
+		return (btVector3(RandUnit(), RandUnit(), RandUnit()));
+	}
+	static btVector3 RandVector3(btScalar cs)
+	{
+		return (RandVector3() * cs - btVector3(cs, cs, cs) / 2);
+	}
+	static btDbvtVolume RandVolume(btScalar cs, btScalar eb, btScalar es)
+	{
+		return (btDbvtVolume::FromCE(RandVector3(cs), btVector3(eb, eb, eb) + RandVector3() * es));
+	}
+	static btTransform RandTransform(btScalar cs)
+	{
+		btTransform t;
+		t.setOrigin(RandVector3(cs));
+		t.setRotation(btQuaternion(RandUnit() * SIMD_PI * 2, RandUnit() * SIMD_PI * 2, RandUnit() * SIMD_PI * 2).normalized());
+		return (t);
+	}
+	static void RandTree(btScalar cs, btScalar eb, btScalar es, int leaves, btDbvt& dbvt)
+	{
+		dbvt.clear();
+		for (int i = 0; i < leaves; ++i)
+		{
+			dbvt.insert(RandVolume(cs, eb, es), 0);
+		}
+	}
+};
+
+void btDbvt::benchmark()
+{
+	static const btScalar cfgVolumeCenterScale = 100;
+	static const btScalar cfgVolumeExentsBase = 1;
+	static const btScalar cfgVolumeExentsScale = 4;
+	static const int cfgLeaves = 8192;
+	static const bool cfgEnable = true;
+
+	//[1] btDbvtVolume intersections
+	bool cfgBenchmark1_Enable = cfgEnable;
+	static const int cfgBenchmark1_Iterations = 8;
+	static const int cfgBenchmark1_Reference = 3499;
+	//[2] btDbvtVolume merges
+	bool cfgBenchmark2_Enable = cfgEnable;
+	static const int cfgBenchmark2_Iterations = 4;
+	static const int cfgBenchmark2_Reference = 1945;
+	//[3] btDbvt::collideTT
+	bool cfgBenchmark3_Enable = cfgEnable;
+	static const int cfgBenchmark3_Iterations = 512;
+	static const int cfgBenchmark3_Reference = 5485;
+	//[4] btDbvt::collideTT self
+	bool cfgBenchmark4_Enable = cfgEnable;
+	static const int cfgBenchmark4_Iterations = 512;
+	static const int cfgBenchmark4_Reference = 2814;
+	//[5] btDbvt::collideTT xform
+	bool cfgBenchmark5_Enable = cfgEnable;
+	static const int cfgBenchmark5_Iterations = 512;
+	static const btScalar cfgBenchmark5_OffsetScale = 2;
+	static const int cfgBenchmark5_Reference = 7379;
+	//[6] btDbvt::collideTT xform,self
+	bool cfgBenchmark6_Enable = cfgEnable;
+	static const int cfgBenchmark6_Iterations = 512;
+	static const btScalar cfgBenchmark6_OffsetScale = 2;
+	static const int cfgBenchmark6_Reference = 7270;
+	//[7] btDbvt::rayTest
+	bool cfgBenchmark7_Enable = cfgEnable;
+	static const int cfgBenchmark7_Passes = 32;
+	static const int cfgBenchmark7_Iterations = 65536;
+	static const int cfgBenchmark7_Reference = 6307;
+	//[8] insert/remove
+	bool cfgBenchmark8_Enable = cfgEnable;
+	static const int cfgBenchmark8_Passes = 32;
+	static const int cfgBenchmark8_Iterations = 65536;
+	static const int cfgBenchmark8_Reference = 2105;
+	//[9] updates (teleport)
+	bool cfgBenchmark9_Enable = cfgEnable;
+	static const int cfgBenchmark9_Passes = 32;
+	static const int cfgBenchmark9_Iterations = 65536;
+	static const int cfgBenchmark9_Reference = 1879;
+	//[10] updates (jitter)
+	bool cfgBenchmark10_Enable = cfgEnable;
+	static const btScalar cfgBenchmark10_Scale = cfgVolumeCenterScale / 10000;
+	static const int cfgBenchmark10_Passes = 32;
+	static const int cfgBenchmark10_Iterations = 65536;
+	static const int cfgBenchmark10_Reference = 1244;
+	//[11] optimize (incremental)
+	bool cfgBenchmark11_Enable = cfgEnable;
+	static const int cfgBenchmark11_Passes = 64;
+	static const int cfgBenchmark11_Iterations = 65536;
+	static const int cfgBenchmark11_Reference = 2510;
+	//[12] btDbvtVolume notequal
+	bool cfgBenchmark12_Enable = cfgEnable;
+	static const int cfgBenchmark12_Iterations = 32;
+	static const int cfgBenchmark12_Reference = 3677;
+	//[13] culling(OCL+fullsort)
+	bool cfgBenchmark13_Enable = cfgEnable;
+	static const int cfgBenchmark13_Iterations = 1024;
+	static const int cfgBenchmark13_Reference = 2231;
+	//[14] culling(OCL+qsort)
+	bool cfgBenchmark14_Enable = cfgEnable;
+	static const int cfgBenchmark14_Iterations = 8192;
+	static const int cfgBenchmark14_Reference = 3500;
+	//[15] culling(KDOP+qsort)
+	bool cfgBenchmark15_Enable = cfgEnable;
+	static const int cfgBenchmark15_Iterations = 8192;
+	static const int cfgBenchmark15_Reference = 1151;
+	//[16] insert/remove batch
+	bool cfgBenchmark16_Enable = cfgEnable;
+	static const int cfgBenchmark16_BatchCount = 256;
+	static const int cfgBenchmark16_Passes = 16384;
+	static const int cfgBenchmark16_Reference = 5138;
+	//[17] select
+	bool cfgBenchmark17_Enable = cfgEnable;
+	static const int cfgBenchmark17_Iterations = 4;
+	static const int cfgBenchmark17_Reference = 3390;
+
+	btClock wallclock;
+	printf("Benchmarking dbvt...\r\n");
+	printf("\tWorld scale: %f\r\n", cfgVolumeCenterScale);
+	printf("\tExtents base: %f\r\n", cfgVolumeExentsBase);
+	printf("\tExtents range: %f\r\n", cfgVolumeExentsScale);
+	printf("\tLeaves: %u\r\n", cfgLeaves);
+	printf("\tsizeof(btDbvtVolume): %u bytes\r\n", sizeof(btDbvtVolume));
+	printf("\tsizeof(btDbvtNode):   %u bytes\r\n", sizeof(btDbvtNode));
+	if (cfgBenchmark1_Enable)
+	{  // Benchmark 1
+		srand(380843);
+		btAlignedObjectArray<btDbvtVolume> volumes;
+		btAlignedObjectArray<bool> results;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			volumes[i] = btDbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		printf("[1] btDbvtVolume intersections: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark1_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					results[k] = Intersect(volumes[j], volumes[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark1_Reference) * 100 / time);
+	}
+	if (cfgBenchmark2_Enable)
+	{  // Benchmark 2
+		srand(380843);
+		btAlignedObjectArray<btDbvtVolume> volumes;
+		btAlignedObjectArray<btDbvtVolume> results;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			volumes[i] = btDbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		printf("[2] btDbvtVolume merges: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark2_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					Merge(volumes[j], volumes[k], results[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark2_Reference) * 100 / time);
+	}
+	if (cfgBenchmark3_Enable)
+	{  // Benchmark 3
+		srand(380843);
+		btDbvt dbvt[2];
+		btDbvtBenchmark::NilPolicy policy;
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[0]);
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[1]);
+		dbvt[0].optimizeTopDown();
+		dbvt[1].optimizeTopDown();
+		printf("[3] btDbvt::collideTT: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark3_Iterations; ++i)
+		{
+			btDbvt::collideTT(dbvt[0].m_root, dbvt[1].m_root, policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark3_Reference) * 100 / time);
+	}
+	if (cfgBenchmark4_Enable)
+	{  // Benchmark 4
+		srand(380843);
+		btDbvt dbvt;
+		btDbvtBenchmark::NilPolicy policy;
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[4] btDbvt::collideTT self: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark4_Iterations; ++i)
+		{
+			btDbvt::collideTT(dbvt.m_root, dbvt.m_root, policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark4_Reference) * 100 / time);
+	}
+	if (cfgBenchmark5_Enable)
+	{  // Benchmark 5
+		srand(380843);
+		btDbvt dbvt[2];
+		btAlignedObjectArray<btTransform> transforms;
+		btDbvtBenchmark::NilPolicy policy;
+		transforms.resize(cfgBenchmark5_Iterations);
+		for (int i = 0; i < transforms.size(); ++i)
+		{
+			transforms[i] = btDbvtBenchmark::RandTransform(cfgVolumeCenterScale * cfgBenchmark5_OffsetScale);
+		}
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[0]);
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt[1]);
+		dbvt[0].optimizeTopDown();
+		dbvt[1].optimizeTopDown();
+		printf("[5] btDbvt::collideTT xform: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark5_Iterations; ++i)
+		{
+			btDbvt::collideTT(dbvt[0].m_root, dbvt[1].m_root, transforms[i], policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark5_Reference) * 100 / time);
+	}
+	if (cfgBenchmark6_Enable)
+	{  // Benchmark 6
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<btTransform> transforms;
+		btDbvtBenchmark::NilPolicy policy;
+		transforms.resize(cfgBenchmark6_Iterations);
+		for (int i = 0; i < transforms.size(); ++i)
+		{
+			transforms[i] = btDbvtBenchmark::RandTransform(cfgVolumeCenterScale * cfgBenchmark6_OffsetScale);
+		}
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[6] btDbvt::collideTT xform,self: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark6_Iterations; ++i)
+		{
+			btDbvt::collideTT(dbvt.m_root, dbvt.m_root, transforms[i], policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark6_Reference) * 100 / time);
+	}
+	if (cfgBenchmark7_Enable)
+	{  // Benchmark 7
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<btVector3> rayorg;
+		btAlignedObjectArray<btVector3> raydir;
+		btDbvtBenchmark::NilPolicy policy;
+		rayorg.resize(cfgBenchmark7_Iterations);
+		raydir.resize(cfgBenchmark7_Iterations);
+		for (int i = 0; i < rayorg.size(); ++i)
+		{
+			rayorg[i] = btDbvtBenchmark::RandVector3(cfgVolumeCenterScale * 2);
+			raydir[i] = btDbvtBenchmark::RandVector3(cfgVolumeCenterScale * 2);
+		}
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[7] btDbvt::rayTest: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark7_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark7_Iterations; ++j)
+			{
+				btDbvt::rayTest(dbvt.m_root, rayorg[j], rayorg[j] + raydir[j], policy);
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		unsigned rays = cfgBenchmark7_Passes * cfgBenchmark7_Iterations;
+		printf("%u ms (%i%%),(%u r/s)\r\n", time, (time - cfgBenchmark7_Reference) * 100 / time, (rays * 1000) / time);
+	}
+	if (cfgBenchmark8_Enable)
+	{  // Benchmark 8
+		srand(380843);
+		btDbvt dbvt;
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[8] insert/remove: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark8_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark8_Iterations; ++j)
+			{
+				dbvt.remove(dbvt.insert(btDbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale), 0));
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int ir = cfgBenchmark8_Passes * cfgBenchmark8_Iterations;
+		printf("%u ms (%i%%),(%u ir/s)\r\n", time, (time - cfgBenchmark8_Reference) * 100 / time, ir * 1000 / time);
+	}
+	if (cfgBenchmark9_Enable)
+	{  // Benchmark 9
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<const btDbvtNode*> leaves;
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		dbvt.extractLeaves(dbvt.m_root, leaves);
+		printf("[9] updates (teleport): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark9_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark9_Iterations; ++j)
+			{
+				dbvt.update(const_cast<btDbvtNode*>(leaves[rand() % cfgLeaves]),
+							btDbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale));
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int up = cfgBenchmark9_Passes * cfgBenchmark9_Iterations;
+		printf("%u ms (%i%%),(%u u/s)\r\n", time, (time - cfgBenchmark9_Reference) * 100 / time, up * 1000 / time);
+	}
+	if (cfgBenchmark10_Enable)
+	{  // Benchmark 10
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<const btDbvtNode*> leaves;
+		btAlignedObjectArray<btVector3> vectors;
+		vectors.resize(cfgBenchmark10_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (btDbvtBenchmark::RandVector3() * 2 - btVector3(1, 1, 1)) * cfgBenchmark10_Scale;
+		}
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		dbvt.extractLeaves(dbvt.m_root, leaves);
+		printf("[10] updates (jitter): ");
+		wallclock.reset();
+
+		for (int i = 0; i < cfgBenchmark10_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark10_Iterations; ++j)
+			{
+				const btVector3& d = vectors[j];
+				btDbvtNode* l = const_cast<btDbvtNode*>(leaves[rand() % cfgLeaves]);
+				btDbvtVolume v = btDbvtVolume::FromMM(l->volume.Mins() + d, l->volume.Maxs() + d);
+				dbvt.update(l, v);
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int up = cfgBenchmark10_Passes * cfgBenchmark10_Iterations;
+		printf("%u ms (%i%%),(%u u/s)\r\n", time, (time - cfgBenchmark10_Reference) * 100 / time, up * 1000 / time);
+	}
+	if (cfgBenchmark11_Enable)
+	{  // Benchmark 11
+		srand(380843);
+		btDbvt dbvt;
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[11] optimize (incremental): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark11_Passes; ++i)
+		{
+			dbvt.optimizeIncremental(cfgBenchmark11_Iterations);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int op = cfgBenchmark11_Passes * cfgBenchmark11_Iterations;
+		printf("%u ms (%i%%),(%u o/s)\r\n", time, (time - cfgBenchmark11_Reference) * 100 / time, op / time * 1000);
+	}
+	if (cfgBenchmark12_Enable)
+	{  // Benchmark 12
+		srand(380843);
+		btAlignedObjectArray<btDbvtVolume> volumes;
+		btAlignedObjectArray<bool> results;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			volumes[i] = btDbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		printf("[12] btDbvtVolume notequal: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark12_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					results[k] = NotEqual(volumes[j], volumes[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark12_Reference) * 100 / time);
+	}
+	if (cfgBenchmark13_Enable)
+	{  // Benchmark 13
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<btVector3> vectors;
+		btDbvtBenchmark::NilPolicy policy;
+		vectors.resize(cfgBenchmark13_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (btDbvtBenchmark::RandVector3() * 2 - btVector3(1, 1, 1)).normalized();
+		}
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		printf("[13] culling(OCL+fullsort): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark13_Iterations; ++i)
+		{
+			static const btScalar offset = 0;
+			policy.m_depth = -SIMD_INFINITY;
+			dbvt.collideOCL(dbvt.m_root, &vectors[i], &offset, vectors[i], 1, policy);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int t = cfgBenchmark13_Iterations;
+		printf("%u ms (%i%%),(%u t/s)\r\n", time, (time - cfgBenchmark13_Reference) * 100 / time, (t * 1000) / time);
+	}
+	if (cfgBenchmark14_Enable)
+	{  // Benchmark 14
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<btVector3> vectors;
+		btDbvtBenchmark::P14 policy;
+		vectors.resize(cfgBenchmark14_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (btDbvtBenchmark::RandVector3() * 2 - btVector3(1, 1, 1)).normalized();
+		}
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		policy.m_nodes.reserve(cfgLeaves);
+		printf("[14] culling(OCL+qsort): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark14_Iterations; ++i)
+		{
+			static const btScalar offset = 0;
+			policy.m_nodes.resize(0);
+			dbvt.collideOCL(dbvt.m_root, &vectors[i], &offset, vectors[i], 1, policy, false);
+			policy.m_nodes.quickSort(btDbvtBenchmark::P14::sortfnc);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int t = cfgBenchmark14_Iterations;
+		printf("%u ms (%i%%),(%u t/s)\r\n", time, (time - cfgBenchmark14_Reference) * 100 / time, (t * 1000) / time);
+	}
+	if (cfgBenchmark15_Enable)
+	{  // Benchmark 15
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<btVector3> vectors;
+		btDbvtBenchmark::P15 policy;
+		vectors.resize(cfgBenchmark15_Iterations);
+		for (int i = 0; i < vectors.size(); ++i)
+		{
+			vectors[i] = (btDbvtBenchmark::RandVector3() * 2 - btVector3(1, 1, 1)).normalized();
+		}
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		policy.m_nodes.reserve(cfgLeaves);
+		printf("[15] culling(KDOP+qsort): ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark15_Iterations; ++i)
+		{
+			static const btScalar offset = 0;
+			policy.m_nodes.resize(0);
+			policy.m_axis = vectors[i];
+			dbvt.collideKDOP(dbvt.m_root, &vectors[i], &offset, 1, policy);
+			policy.m_nodes.quickSort(btDbvtBenchmark::P15::sortfnc);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int t = cfgBenchmark15_Iterations;
+		printf("%u ms (%i%%),(%u t/s)\r\n", time, (time - cfgBenchmark15_Reference) * 100 / time, (t * 1000) / time);
+	}
+	if (cfgBenchmark16_Enable)
+	{  // Benchmark 16
+		srand(380843);
+		btDbvt dbvt;
+		btAlignedObjectArray<btDbvtNode*> batch;
+		btDbvtBenchmark::RandTree(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale, cfgLeaves, dbvt);
+		dbvt.optimizeTopDown();
+		batch.reserve(cfgBenchmark16_BatchCount);
+		printf("[16] insert/remove batch(%u): ", cfgBenchmark16_BatchCount);
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark16_Passes; ++i)
+		{
+			for (int j = 0; j < cfgBenchmark16_BatchCount; ++j)
+			{
+				batch.push_back(dbvt.insert(btDbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale), 0));
+			}
+			for (int j = 0; j < cfgBenchmark16_BatchCount; ++j)
+			{
+				dbvt.remove(batch[j]);
+			}
+			batch.resize(0);
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		const int ir = cfgBenchmark16_Passes * cfgBenchmark16_BatchCount;
+		printf("%u ms (%i%%),(%u bir/s)\r\n", time, (time - cfgBenchmark16_Reference) * 100 / time, int(ir * 1000.0 / time));
+	}
+	if (cfgBenchmark17_Enable)
+	{  // Benchmark 17
+		srand(380843);
+		btAlignedObjectArray<btDbvtVolume> volumes;
+		btAlignedObjectArray<int> results;
+		btAlignedObjectArray<int> indices;
+		volumes.resize(cfgLeaves);
+		results.resize(cfgLeaves);
+		indices.resize(cfgLeaves);
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			indices[i] = i;
+			volumes[i] = btDbvtBenchmark::RandVolume(cfgVolumeCenterScale, cfgVolumeExentsBase, cfgVolumeExentsScale);
+		}
+		for (int i = 0; i < cfgLeaves; ++i)
+		{
+			btSwap(indices[i], indices[rand() % cfgLeaves]);
+		}
+		printf("[17] btDbvtVolume select: ");
+		wallclock.reset();
+		for (int i = 0; i < cfgBenchmark17_Iterations; ++i)
+		{
+			for (int j = 0; j < cfgLeaves; ++j)
+			{
+				for (int k = 0; k < cfgLeaves; ++k)
+				{
+					const int idx = indices[k];
+					results[idx] = Select(volumes[idx], volumes[j], volumes[k]);
+				}
+			}
+		}
+		const int time = (int)wallclock.getTimeMilliseconds();
+		printf("%u ms (%i%%)\r\n", time, (time - cfgBenchmark17_Reference) * 100 / time);
+	}
+	printf("\r\n\r\n");
+}
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.h
new file mode 100644
index 0000000..430f577
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvt.h
@@ -0,0 +1,1578 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btDbvt implementation by Nathanael Presson
+
+#ifndef BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
+#define BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btAabbUtil2.h"
+//
+// Compile time configuration
+//
+
+// Implementation profiles
+#define DBVT_IMPL_GENERIC 0  // Generic implementation
+#define DBVT_IMPL_SSE 1      // SSE
+
+// Template implementation of ICollide
+#ifdef _WIN32
+#if (defined(_MSC_VER) && _MSC_VER >= 1400)
+#define DBVT_USE_TEMPLATE 1
+#else
+#define DBVT_USE_TEMPLATE 0
+#endif
+#else
+#define DBVT_USE_TEMPLATE 0
+#endif
+
+// Use only intrinsics instead of inline asm
+#define DBVT_USE_INTRINSIC_SSE 1
+
+// Using memmov for collideOCL
+#define DBVT_USE_MEMMOVE 1
+
+// Enable benchmarking code
+#define DBVT_ENABLE_BENCHMARK 0
+
+// Inlining
+#define DBVT_INLINE SIMD_FORCE_INLINE
+
+// Specific methods implementation
+
+//SSE gives errors on a MSVC 7.1
+#if defined(BT_USE_SSE)  //&& defined (_WIN32)
+#define DBVT_SELECT_IMPL DBVT_IMPL_SSE
+#define DBVT_MERGE_IMPL DBVT_IMPL_SSE
+#define DBVT_INT0_IMPL DBVT_IMPL_SSE
+#else
+#define DBVT_SELECT_IMPL DBVT_IMPL_GENERIC
+#define DBVT_MERGE_IMPL DBVT_IMPL_GENERIC
+#define DBVT_INT0_IMPL DBVT_IMPL_GENERIC
+#endif
+
+#if (DBVT_SELECT_IMPL == DBVT_IMPL_SSE) || \
+	(DBVT_MERGE_IMPL == DBVT_IMPL_SSE) ||  \
+	(DBVT_INT0_IMPL == DBVT_IMPL_SSE)
+#include <emmintrin.h>
+#endif
+
+//
+// Auto config and checks
+//
+
+#if DBVT_USE_TEMPLATE
+#define DBVT_VIRTUAL
+#define DBVT_VIRTUAL_DTOR(a)
+#define DBVT_PREFIX template <typename T>
+#define DBVT_IPOLICY T& policy
+#define DBVT_CHECKTYPE                           \
+	static const ICollide& typechecker = *(T*)1; \
+	(void)typechecker;
+#else
+#define DBVT_VIRTUAL_DTOR(a) \
+	virtual ~a() {}
+#define DBVT_VIRTUAL virtual
+#define DBVT_PREFIX
+#define DBVT_IPOLICY ICollide& policy
+#define DBVT_CHECKTYPE
+#endif
+
+#if DBVT_USE_MEMMOVE
+#if !defined(__CELLOS_LV2__) && !defined(__MWERKS__)
+#include <memory.h>
+#endif
+#include <string.h>
+#endif
+
+#ifndef DBVT_USE_TEMPLATE
+#error "DBVT_USE_TEMPLATE undefined"
+#endif
+
+#ifndef DBVT_USE_MEMMOVE
+#error "DBVT_USE_MEMMOVE undefined"
+#endif
+
+#ifndef DBVT_ENABLE_BENCHMARK
+#error "DBVT_ENABLE_BENCHMARK undefined"
+#endif
+
+#ifndef DBVT_SELECT_IMPL
+#error "DBVT_SELECT_IMPL undefined"
+#endif
+
+#ifndef DBVT_MERGE_IMPL
+#error "DBVT_MERGE_IMPL undefined"
+#endif
+
+#ifndef DBVT_INT0_IMPL
+#error "DBVT_INT0_IMPL undefined"
+#endif
+
+//
+// Defaults volumes
+//
+
+/* btDbvtAabbMm			*/
+struct btDbvtAabbMm
+{
+    DBVT_INLINE btDbvtAabbMm(){}
+	DBVT_INLINE btVector3 Center() const { return ((mi + mx) / 2); }
+	DBVT_INLINE btVector3 Lengths() const { return (mx - mi); }
+	DBVT_INLINE btVector3 Extents() const { return ((mx - mi) / 2); }
+	DBVT_INLINE const btVector3& Mins() const { return (mi); }
+	DBVT_INLINE const btVector3& Maxs() const { return (mx); }
+	static inline btDbvtAabbMm FromCE(const btVector3& c, const btVector3& e);
+	static inline btDbvtAabbMm FromCR(const btVector3& c, btScalar r);
+	static inline btDbvtAabbMm FromMM(const btVector3& mi, const btVector3& mx);
+	static inline btDbvtAabbMm FromPoints(const btVector3* pts, int n);
+	static inline btDbvtAabbMm FromPoints(const btVector3** ppts, int n);
+	DBVT_INLINE void Expand(const btVector3& e);
+	DBVT_INLINE void SignedExpand(const btVector3& e);
+	DBVT_INLINE bool Contain(const btDbvtAabbMm& a) const;
+	DBVT_INLINE int Classify(const btVector3& n, btScalar o, int s) const;
+	DBVT_INLINE btScalar ProjectMinimum(const btVector3& v, unsigned signs) const;
+	DBVT_INLINE friend bool Intersect(const btDbvtAabbMm& a,
+									  const btDbvtAabbMm& b);
+
+	DBVT_INLINE friend bool Intersect(const btDbvtAabbMm& a,
+									  const btVector3& b);
+
+	DBVT_INLINE friend btScalar Proximity(const btDbvtAabbMm& a,
+										  const btDbvtAabbMm& b);
+	DBVT_INLINE friend int Select(const btDbvtAabbMm& o,
+								  const btDbvtAabbMm& a,
+								  const btDbvtAabbMm& b);
+	DBVT_INLINE friend void Merge(const btDbvtAabbMm& a,
+								  const btDbvtAabbMm& b,
+								  btDbvtAabbMm& r);
+	DBVT_INLINE friend bool NotEqual(const btDbvtAabbMm& a,
+									 const btDbvtAabbMm& b);
+
+	DBVT_INLINE btVector3& tMins() { return (mi); }
+	DBVT_INLINE btVector3& tMaxs() { return (mx); }
+
+private:
+	DBVT_INLINE void AddSpan(const btVector3& d, btScalar& smi, btScalar& smx) const;
+
+private:
+	btVector3 mi, mx;
+};
+
+// Types
+typedef btDbvtAabbMm btDbvtVolume;
+
+/* btDbvtNode				*/
+struct btDbvtNode
+{
+	btDbvtVolume volume;
+	btDbvtNode* parent;
+	DBVT_INLINE bool isleaf() const { return (childs[1] == 0); }
+	DBVT_INLINE bool isinternal() const { return (!isleaf()); }
+	union {
+		btDbvtNode* childs[2];
+		void* data;
+		int dataAsInt;
+	};
+};
+
+/* btDbv(normal)tNode                */
+struct btDbvntNode
+{
+    btDbvtVolume volume;
+    btVector3 normal;
+    btScalar angle;
+    DBVT_INLINE bool isleaf() const { return (childs[1] == 0); }
+    DBVT_INLINE bool isinternal() const { return (!isleaf()); }
+    btDbvntNode* childs[2];
+    void* data;
+
+    btDbvntNode(const btDbvtNode* n)
+    : volume(n->volume)
+    , normal(0,0,0)
+    , angle(0)
+    , data(n->data)
+    {
+        childs[0] = 0;
+        childs[1] = 0;
+    }
+    
+    ~btDbvntNode()
+    {
+        if (childs[0])
+            delete childs[0];
+        if (childs[1])
+            delete childs[1];
+    }
+};
+
+typedef btAlignedObjectArray<const btDbvtNode*> btNodeStack;
+
+///The btDbvt class implements a fast dynamic bounding volume tree based on axis aligned bounding boxes (aabb tree).
+///This btDbvt is used for soft body collision detection and for the btDbvtBroadphase. It has a fast insert, remove and update of nodes.
+///Unlike the btQuantizedBvh, nodes can be dynamically moved around, which allows for change in topology of the underlying data structure.
+struct btDbvt
+{
+	/* Stack element	*/
+	struct sStkNN
+	{
+		const btDbvtNode* a;
+		const btDbvtNode* b;
+		sStkNN() {}
+		sStkNN(const btDbvtNode* na, const btDbvtNode* nb) : a(na), b(nb) {}
+	};
+	struct sStkNP
+	{
+		const btDbvtNode* node;
+		int mask;
+		sStkNP(const btDbvtNode* n, unsigned m) : node(n), mask(m) {}
+	};
+	struct sStkNPS
+	{
+		const btDbvtNode* node;
+		int mask;
+		btScalar value;
+		sStkNPS() {}
+		sStkNPS(const btDbvtNode* n, unsigned m, btScalar v) : node(n), mask(m), value(v) {}
+	};
+	struct sStkCLN
+	{
+		const btDbvtNode* node;
+		btDbvtNode* parent;
+		sStkCLN(const btDbvtNode* n, btDbvtNode* p) : node(n), parent(p) {}
+	};
+    
+    struct sStknNN
+    {
+        const btDbvntNode* a;
+        const btDbvntNode* b;
+        sStknNN() {}
+        sStknNN(const btDbvntNode* na, const btDbvntNode* nb) : a(na), b(nb) {}
+    };
+	// Policies/Interfaces
+
+	/* ICollide	*/
+	struct ICollide
+	{
+		DBVT_VIRTUAL_DTOR(ICollide)
+		DBVT_VIRTUAL void Process(const btDbvtNode*, const btDbvtNode*) {}
+		DBVT_VIRTUAL void Process(const btDbvtNode*) {}
+		DBVT_VIRTUAL void Process(const btDbvtNode* n, btScalar) { Process(n); }
+        DBVT_VIRTUAL void Process(const btDbvntNode*, const btDbvntNode*) {}
+		DBVT_VIRTUAL bool Descent(const btDbvtNode*) { return (true); }
+		DBVT_VIRTUAL bool AllLeaves(const btDbvtNode*) { return (true); }
+	};
+	/* IWriter	*/
+	struct IWriter
+	{
+		virtual ~IWriter() {}
+		virtual void Prepare(const btDbvtNode* root, int numnodes) = 0;
+		virtual void WriteNode(const btDbvtNode*, int index, int parent, int child0, int child1) = 0;
+		virtual void WriteLeaf(const btDbvtNode*, int index, int parent) = 0;
+	};
+	/* IClone	*/
+	struct IClone
+	{
+		virtual ~IClone() {}
+		virtual void CloneLeaf(btDbvtNode*) {}
+	};
+
+	// Constants
+	enum
+	{
+		SIMPLE_STACKSIZE = 64,
+		DOUBLE_STACKSIZE = SIMPLE_STACKSIZE * 2
+	};
+
+	// Fields
+	btDbvtNode* m_root;
+	btDbvtNode* m_free;
+	int m_lkhd;
+	int m_leaves;
+	unsigned m_opath;
+
+	btAlignedObjectArray<sStkNN> m_stkStack;
+
+	// Methods
+	btDbvt();
+	~btDbvt();
+	void clear();
+	bool empty() const { return (0 == m_root); }
+	void optimizeBottomUp();
+	void optimizeTopDown(int bu_treshold = 128);
+	void optimizeIncremental(int passes);
+	btDbvtNode* insert(const btDbvtVolume& box, void* data);
+	void update(btDbvtNode* leaf, int lookahead = -1);
+	void update(btDbvtNode* leaf, btDbvtVolume& volume);
+	bool update(btDbvtNode* leaf, btDbvtVolume& volume, const btVector3& velocity, btScalar margin);
+	bool update(btDbvtNode* leaf, btDbvtVolume& volume, const btVector3& velocity);
+	bool update(btDbvtNode* leaf, btDbvtVolume& volume, btScalar margin);
+	void remove(btDbvtNode* leaf);
+	void write(IWriter* iwriter) const;
+	void clone(btDbvt& dest, IClone* iclone = 0) const;
+	static int maxdepth(const btDbvtNode* node);
+	static int countLeaves(const btDbvtNode* node);
+	static void extractLeaves(const btDbvtNode* node, btAlignedObjectArray<const btDbvtNode*>& leaves);
+#if DBVT_ENABLE_BENCHMARK
+	static void benchmark();
+#else
+	static void benchmark()
+	{
+	}
+#endif
+	// DBVT_IPOLICY must support ICollide policy/interface
+	DBVT_PREFIX
+	static void enumNodes(const btDbvtNode* root,
+						  DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void enumLeaves(const btDbvtNode* root,
+						   DBVT_IPOLICY);
+	DBVT_PREFIX
+	void collideTT(const btDbvtNode* root0,
+				   const btDbvtNode* root1,
+				   DBVT_IPOLICY);
+    DBVT_PREFIX
+    void selfCollideT(const btDbvntNode* root,
+                   DBVT_IPOLICY);
+    DBVT_PREFIX
+    void selfCollideTT(const btDbvtNode* root,
+                      DBVT_IPOLICY);
+
+	DBVT_PREFIX
+	void collideTTpersistentStack(const btDbvtNode* root0,
+								  const btDbvtNode* root1,
+								  DBVT_IPOLICY);
+#if 0
+	DBVT_PREFIX
+		void		collideTT(	const btDbvtNode* root0,
+		const btDbvtNode* root1,
+		const btTransform& xform,
+		DBVT_IPOLICY);
+	DBVT_PREFIX
+		void		collideTT(	const btDbvtNode* root0,
+		const btTransform& xform0,
+		const btDbvtNode* root1,
+		const btTransform& xform1,
+		DBVT_IPOLICY);
+#endif
+
+	DBVT_PREFIX
+	void collideTV(const btDbvtNode* root,
+				   const btDbvtVolume& volume,
+				   DBVT_IPOLICY) const;
+
+	DBVT_PREFIX
+	void collideTVNoStackAlloc(const btDbvtNode* root,
+							   const btDbvtVolume& volume,
+							   btNodeStack& stack,
+							   DBVT_IPOLICY) const;
+
+	///rayTest is a re-entrant ray test, and can be called in parallel as long as the btAlignedAlloc is thread-safe (uses locking etc)
+	///rayTest is slower than rayTestInternal, because it builds a local stack, using memory allocations, and it recomputes signs/rayDirectionInverses each time
+	DBVT_PREFIX
+	static void rayTest(const btDbvtNode* root,
+						const btVector3& rayFrom,
+						const btVector3& rayTo,
+						DBVT_IPOLICY);
+	///rayTestInternal is faster than rayTest, because it uses a persistent stack (to reduce dynamic memory allocations to a minimum) and it uses precomputed signs/rayInverseDirections
+	///rayTestInternal is used by btDbvtBroadphase to accelerate world ray casts
+	DBVT_PREFIX
+	void rayTestInternal(const btDbvtNode* root,
+						 const btVector3& rayFrom,
+						 const btVector3& rayTo,
+						 const btVector3& rayDirectionInverse,
+						 unsigned int signs[3],
+						 btScalar lambda_max,
+						 const btVector3& aabbMin,
+						 const btVector3& aabbMax,
+						 btAlignedObjectArray<const btDbvtNode*>& stack,
+						 DBVT_IPOLICY) const;
+
+	DBVT_PREFIX
+	static void collideKDOP(const btDbvtNode* root,
+							const btVector3* normals,
+							const btScalar* offsets,
+							int count,
+							DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void collideOCL(const btDbvtNode* root,
+						   const btVector3* normals,
+						   const btScalar* offsets,
+						   const btVector3& sortaxis,
+						   int count,
+						   DBVT_IPOLICY,
+						   bool fullsort = true);
+	DBVT_PREFIX
+	static void collideTU(const btDbvtNode* root,
+						  DBVT_IPOLICY);
+	// Helpers
+	static DBVT_INLINE int nearest(const int* i, const btDbvt::sStkNPS* a, btScalar v, int l, int h)
+	{
+		int m = 0;
+		while (l < h)
+		{
+			m = (l + h) >> 1;
+			if (a[i[m]].value >= v)
+				l = m + 1;
+			else
+				h = m;
+		}
+		return (h);
+	}
+	static DBVT_INLINE int allocate(btAlignedObjectArray<int>& ifree,
+									btAlignedObjectArray<sStkNPS>& stock,
+									const sStkNPS& value)
+	{
+		int i;
+		if (ifree.size() > 0)
+		{
+			i = ifree[ifree.size() - 1];
+			ifree.pop_back();
+			stock[i] = value;
+		}
+		else
+		{
+			i = stock.size();
+			stock.push_back(value);
+		}
+		return (i);
+	}
+	//
+private:
+	btDbvt(const btDbvt&) {}
+};
+
+//
+// Inline's
+//
+
+//
+inline btDbvtAabbMm btDbvtAabbMm::FromCE(const btVector3& c, const btVector3& e)
+{
+	btDbvtAabbMm box;
+	box.mi = c - e;
+	box.mx = c + e;
+	return (box);
+}
+
+//
+inline btDbvtAabbMm btDbvtAabbMm::FromCR(const btVector3& c, btScalar r)
+{
+	return (FromCE(c, btVector3(r, r, r)));
+}
+
+//
+inline btDbvtAabbMm btDbvtAabbMm::FromMM(const btVector3& mi, const btVector3& mx)
+{
+	btDbvtAabbMm box;
+	box.mi = mi;
+	box.mx = mx;
+	return (box);
+}
+
+//
+inline btDbvtAabbMm btDbvtAabbMm::FromPoints(const btVector3* pts, int n)
+{
+	btDbvtAabbMm box;
+	box.mi = box.mx = pts[0];
+	for (int i = 1; i < n; ++i)
+	{
+		box.mi.setMin(pts[i]);
+		box.mx.setMax(pts[i]);
+	}
+	return (box);
+}
+
+//
+inline btDbvtAabbMm btDbvtAabbMm::FromPoints(const btVector3** ppts, int n)
+{
+	btDbvtAabbMm box;
+	box.mi = box.mx = *ppts[0];
+	for (int i = 1; i < n; ++i)
+	{
+		box.mi.setMin(*ppts[i]);
+		box.mx.setMax(*ppts[i]);
+	}
+	return (box);
+}
+
+//
+DBVT_INLINE void btDbvtAabbMm::Expand(const btVector3& e)
+{
+	mi -= e;
+	mx += e;
+}
+
+//
+DBVT_INLINE void btDbvtAabbMm::SignedExpand(const btVector3& e)
+{
+	if (e.x() > 0)
+		mx.setX(mx.x() + e[0]);
+	else
+		mi.setX(mi.x() + e[0]);
+	if (e.y() > 0)
+		mx.setY(mx.y() + e[1]);
+	else
+		mi.setY(mi.y() + e[1]);
+	if (e.z() > 0)
+		mx.setZ(mx.z() + e[2]);
+	else
+		mi.setZ(mi.z() + e[2]);
+}
+
+//
+DBVT_INLINE bool btDbvtAabbMm::Contain(const btDbvtAabbMm& a) const
+{
+	return ((mi.x() <= a.mi.x()) &&
+			(mi.y() <= a.mi.y()) &&
+			(mi.z() <= a.mi.z()) &&
+			(mx.x() >= a.mx.x()) &&
+			(mx.y() >= a.mx.y()) &&
+			(mx.z() >= a.mx.z()));
+}
+
+//
+DBVT_INLINE int btDbvtAabbMm::Classify(const btVector3& n, btScalar o, int s) const
+{
+	btVector3 pi, px;
+	switch (s)
+	{
+		case (0 + 0 + 0):
+			px = btVector3(mi.x(), mi.y(), mi.z());
+			pi = btVector3(mx.x(), mx.y(), mx.z());
+			break;
+		case (1 + 0 + 0):
+			px = btVector3(mx.x(), mi.y(), mi.z());
+			pi = btVector3(mi.x(), mx.y(), mx.z());
+			break;
+		case (0 + 2 + 0):
+			px = btVector3(mi.x(), mx.y(), mi.z());
+			pi = btVector3(mx.x(), mi.y(), mx.z());
+			break;
+		case (1 + 2 + 0):
+			px = btVector3(mx.x(), mx.y(), mi.z());
+			pi = btVector3(mi.x(), mi.y(), mx.z());
+			break;
+		case (0 + 0 + 4):
+			px = btVector3(mi.x(), mi.y(), mx.z());
+			pi = btVector3(mx.x(), mx.y(), mi.z());
+			break;
+		case (1 + 0 + 4):
+			px = btVector3(mx.x(), mi.y(), mx.z());
+			pi = btVector3(mi.x(), mx.y(), mi.z());
+			break;
+		case (0 + 2 + 4):
+			px = btVector3(mi.x(), mx.y(), mx.z());
+			pi = btVector3(mx.x(), mi.y(), mi.z());
+			break;
+		case (1 + 2 + 4):
+			px = btVector3(mx.x(), mx.y(), mx.z());
+			pi = btVector3(mi.x(), mi.y(), mi.z());
+			break;
+	}
+	if ((btDot(n, px) + o) < 0) return (-1);
+	if ((btDot(n, pi) + o) >= 0) return (+1);
+	return (0);
+}
+
+//
+DBVT_INLINE btScalar btDbvtAabbMm::ProjectMinimum(const btVector3& v, unsigned signs) const
+{
+	const btVector3* b[] = {&mx, &mi};
+	const btVector3 p(b[(signs >> 0) & 1]->x(),
+					  b[(signs >> 1) & 1]->y(),
+					  b[(signs >> 2) & 1]->z());
+	return (btDot(p, v));
+}
+
+//
+DBVT_INLINE void btDbvtAabbMm::AddSpan(const btVector3& d, btScalar& smi, btScalar& smx) const
+{
+	for (int i = 0; i < 3; ++i)
+	{
+		if (d[i] < 0)
+		{
+			smi += mx[i] * d[i];
+			smx += mi[i] * d[i];
+		}
+		else
+		{
+			smi += mi[i] * d[i];
+			smx += mx[i] * d[i];
+		}
+	}
+}
+
+//
+DBVT_INLINE bool Intersect(const btDbvtAabbMm& a,
+						   const btDbvtAabbMm& b)
+{
+#if DBVT_INT0_IMPL == DBVT_IMPL_SSE
+	const __m128 rt(_mm_or_ps(_mm_cmplt_ps(_mm_load_ps(b.mx), _mm_load_ps(a.mi)),
+							  _mm_cmplt_ps(_mm_load_ps(a.mx), _mm_load_ps(b.mi))));
+#if defined(_WIN32)
+	const __int32* pu((const __int32*)&rt);
+#else
+	const int* pu((const int*)&rt);
+#endif
+	return ((pu[0] | pu[1] | pu[2]) == 0);
+#else
+	return ((a.mi.x() <= b.mx.x()) &&
+			(a.mx.x() >= b.mi.x()) &&
+			(a.mi.y() <= b.mx.y()) &&
+			(a.mx.y() >= b.mi.y()) &&
+			(a.mi.z() <= b.mx.z()) &&
+			(a.mx.z() >= b.mi.z()));
+#endif
+}
+
+//
+DBVT_INLINE bool Intersect(const btDbvtAabbMm& a,
+						   const btVector3& b)
+{
+	return ((b.x() >= a.mi.x()) &&
+			(b.y() >= a.mi.y()) &&
+			(b.z() >= a.mi.z()) &&
+			(b.x() <= a.mx.x()) &&
+			(b.y() <= a.mx.y()) &&
+			(b.z() <= a.mx.z()));
+}
+
+//////////////////////////////////////
+
+//
+DBVT_INLINE btScalar Proximity(const btDbvtAabbMm& a,
+							   const btDbvtAabbMm& b)
+{
+	const btVector3 d = (a.mi + a.mx) - (b.mi + b.mx);
+	return (btFabs(d.x()) + btFabs(d.y()) + btFabs(d.z()));
+}
+
+//
+DBVT_INLINE int Select(const btDbvtAabbMm& o,
+					   const btDbvtAabbMm& a,
+					   const btDbvtAabbMm& b)
+{
+#if DBVT_SELECT_IMPL == DBVT_IMPL_SSE
+
+#if defined(_WIN32)
+	static ATTRIBUTE_ALIGNED16(const unsigned __int32) mask[] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff};
+#else
+	static ATTRIBUTE_ALIGNED16(const unsigned int) mask[] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x00000000 /*0x7fffffff*/};
+#endif
+	///@todo: the intrinsic version is 11% slower
+#if DBVT_USE_INTRINSIC_SSE
+
+	union btSSEUnion  ///NOTE: if we use more intrinsics, move btSSEUnion into the LinearMath directory
+	{
+		__m128 ssereg;
+		float floats[4];
+		int ints[4];
+	};
+
+	__m128 omi(_mm_load_ps(o.mi));
+	omi = _mm_add_ps(omi, _mm_load_ps(o.mx));
+	__m128 ami(_mm_load_ps(a.mi));
+	ami = _mm_add_ps(ami, _mm_load_ps(a.mx));
+	ami = _mm_sub_ps(ami, omi);
+	ami = _mm_and_ps(ami, _mm_load_ps((const float*)mask));
+	__m128 bmi(_mm_load_ps(b.mi));
+	bmi = _mm_add_ps(bmi, _mm_load_ps(b.mx));
+	bmi = _mm_sub_ps(bmi, omi);
+	bmi = _mm_and_ps(bmi, _mm_load_ps((const float*)mask));
+	__m128 t0(_mm_movehl_ps(ami, ami));
+	ami = _mm_add_ps(ami, t0);
+	ami = _mm_add_ss(ami, _mm_shuffle_ps(ami, ami, 1));
+	__m128 t1(_mm_movehl_ps(bmi, bmi));
+	bmi = _mm_add_ps(bmi, t1);
+	bmi = _mm_add_ss(bmi, _mm_shuffle_ps(bmi, bmi, 1));
+
+	btSSEUnion tmp;
+	tmp.ssereg = _mm_cmple_ss(bmi, ami);
+	return tmp.ints[0] & 1;
+
+#else
+	ATTRIBUTE_ALIGNED16(__int32 r[1]);
+	__asm
+	{
+		mov		eax,o
+			mov		ecx,a
+			mov		edx,b
+			movaps	xmm0,[eax]
+		movaps	xmm5,mask
+			addps	xmm0,[eax+16]	
+		movaps	xmm1,[ecx]
+		movaps	xmm2,[edx]
+		addps	xmm1,[ecx+16]
+		addps	xmm2,[edx+16]
+		subps	xmm1,xmm0
+			subps	xmm2,xmm0
+			andps	xmm1,xmm5
+			andps	xmm2,xmm5
+			movhlps	xmm3,xmm1
+			movhlps	xmm4,xmm2
+			addps	xmm1,xmm3
+			addps	xmm2,xmm4
+			pshufd	xmm3,xmm1,1
+			pshufd	xmm4,xmm2,1
+			addss	xmm1,xmm3
+			addss	xmm2,xmm4
+			cmpless	xmm2,xmm1
+			movss	r,xmm2
+	}
+	return (r[0] & 1);
+#endif
+#else
+	return (Proximity(o, a) < Proximity(o, b) ? 0 : 1);
+#endif
+}
+
+//
+DBVT_INLINE void Merge(const btDbvtAabbMm& a,
+					   const btDbvtAabbMm& b,
+					   btDbvtAabbMm& r)
+{
+#if DBVT_MERGE_IMPL == DBVT_IMPL_SSE
+	__m128 ami(_mm_load_ps(a.mi));
+	__m128 amx(_mm_load_ps(a.mx));
+	__m128 bmi(_mm_load_ps(b.mi));
+	__m128 bmx(_mm_load_ps(b.mx));
+	ami = _mm_min_ps(ami, bmi);
+	amx = _mm_max_ps(amx, bmx);
+	_mm_store_ps(r.mi, ami);
+	_mm_store_ps(r.mx, amx);
+#else
+	for (int i = 0; i < 3; ++i)
+	{
+		if (a.mi[i] < b.mi[i])
+			r.mi[i] = a.mi[i];
+		else
+			r.mi[i] = b.mi[i];
+		if (a.mx[i] > b.mx[i])
+			r.mx[i] = a.mx[i];
+		else
+			r.mx[i] = b.mx[i];
+	}
+#endif
+}
+
+//
+DBVT_INLINE bool NotEqual(const btDbvtAabbMm& a,
+						  const btDbvtAabbMm& b)
+{
+	return ((a.mi.x() != b.mi.x()) ||
+			(a.mi.y() != b.mi.y()) ||
+			(a.mi.z() != b.mi.z()) ||
+			(a.mx.x() != b.mx.x()) ||
+			(a.mx.y() != b.mx.y()) ||
+			(a.mx.z() != b.mx.z()));
+}
+
+//
+// Inline's
+//
+
+//
+DBVT_PREFIX
+inline void btDbvt::enumNodes(const btDbvtNode* root,
+							  DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+	policy.Process(root);
+	if (root->isinternal())
+	{
+		enumNodes(root->childs[0], policy);
+		enumNodes(root->childs[1], policy);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::enumLeaves(const btDbvtNode* root,
+							   DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+	if (root->isinternal())
+	{
+		enumLeaves(root->childs[0], policy);
+		enumLeaves(root->childs[1], policy);
+	}
+	else
+	{
+		policy.Process(root);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::collideTT(const btDbvtNode* root0,
+							  const btDbvtNode* root1,
+							  DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+	if (root0 && root1)
+	{
+		int depth = 1;
+		int treshold = DOUBLE_STACKSIZE - 4;
+		btAlignedObjectArray<sStkNN> stkStack;
+		stkStack.resize(DOUBLE_STACKSIZE);
+		stkStack[0] = sStkNN(root0, root1);
+		do
+		{
+			sStkNN p = stkStack[--depth];
+			if (depth > treshold)
+			{
+				stkStack.resize(stkStack.size() * 2);
+				treshold = stkStack.size() - 4;
+			}
+			if (p.a == p.b)
+			{
+				if (p.a->isinternal())
+				{
+					stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[0]);
+					stkStack[depth++] = sStkNN(p.a->childs[1], p.a->childs[1]);
+					stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[1]);
+				}
+			}
+			else if (Intersect(p.a->volume, p.b->volume))
+			{
+				if (p.a->isinternal())
+				{
+					if (p.b->isinternal())
+					{
+						stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[0]);
+						stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[0]);
+						stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[1]);
+						stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[1]);
+					}
+					else
+					{
+						stkStack[depth++] = sStkNN(p.a->childs[0], p.b);
+						stkStack[depth++] = sStkNN(p.a->childs[1], p.b);
+					}
+				}
+				else
+				{
+					if (p.b->isinternal())
+					{
+						stkStack[depth++] = sStkNN(p.a, p.b->childs[0]);
+						stkStack[depth++] = sStkNN(p.a, p.b->childs[1]);
+					}
+					else
+					{
+						policy.Process(p.a, p.b);
+					}
+				}
+			}
+		} while (depth);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::selfCollideT(const btDbvntNode* root,
+                              DBVT_IPOLICY)
+{
+    DBVT_CHECKTYPE
+    if (root)
+    {
+        int depth = 1;
+        int treshold = DOUBLE_STACKSIZE - 4;
+        btAlignedObjectArray<sStknNN> stkStack;
+        stkStack.resize(DOUBLE_STACKSIZE);
+        stkStack[0] = sStknNN(root, root);
+        do
+        {
+            sStknNN p = stkStack[--depth];
+            if (depth > treshold)
+            {
+                stkStack.resize(stkStack.size() * 2);
+                treshold = stkStack.size() - 4;
+            }
+            if (p.a == p.b)
+            {
+                if (p.a->isinternal() && p.a->angle > SIMD_PI)
+                {
+                    stkStack[depth++] = sStknNN(p.a->childs[0], p.a->childs[0]);
+                    stkStack[depth++] = sStknNN(p.a->childs[1], p.a->childs[1]);
+                    stkStack[depth++] = sStknNN(p.a->childs[0], p.a->childs[1]);
+                }
+            }
+            else if (Intersect(p.a->volume, p.b->volume))
+            {
+                if (p.a->isinternal())
+                {
+                    if (p.b->isinternal())
+                    {
+                        stkStack[depth++] = sStknNN(p.a->childs[0], p.b->childs[0]);
+                        stkStack[depth++] = sStknNN(p.a->childs[1], p.b->childs[0]);
+                        stkStack[depth++] = sStknNN(p.a->childs[0], p.b->childs[1]);
+                        stkStack[depth++] = sStknNN(p.a->childs[1], p.b->childs[1]);
+                    }
+                    else
+                    {
+                        stkStack[depth++] = sStknNN(p.a->childs[0], p.b);
+                        stkStack[depth++] = sStknNN(p.a->childs[1], p.b);
+                    }
+                }
+                else
+                {
+                    if (p.b->isinternal())
+                    {
+                        stkStack[depth++] = sStknNN(p.a, p.b->childs[0]);
+                        stkStack[depth++] = sStknNN(p.a, p.b->childs[1]);
+                    }
+                    else
+                    {
+                        policy.Process(p.a, p.b);
+                    }
+                }
+            }
+        } while (depth);
+    }
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::selfCollideTT(const btDbvtNode* root,
+                                 DBVT_IPOLICY)
+{
+    DBVT_CHECKTYPE
+    if (root)
+    {
+        int depth = 1;
+        int treshold = DOUBLE_STACKSIZE - 4;
+        btAlignedObjectArray<sStkNN> stkStack;
+        stkStack.resize(DOUBLE_STACKSIZE);
+        stkStack[0] = sStkNN(root, root);
+        do
+        {
+            sStkNN p = stkStack[--depth];
+            if (depth > treshold)
+            {
+                stkStack.resize(stkStack.size() * 2);
+                treshold = stkStack.size() - 4;
+            }
+            if (p.a == p.b)
+            {
+                if (p.a->isinternal())
+                {
+                    stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[0]);
+                    stkStack[depth++] = sStkNN(p.a->childs[1], p.a->childs[1]);
+                    stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[1]);
+                }
+            }
+            else if (Intersect(p.a->volume, p.b->volume))
+            {
+                if (p.a->isinternal())
+                {
+                    if (p.b->isinternal())
+                    {
+                        stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[0]);
+                        stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[0]);
+                        stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[1]);
+                        stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[1]);
+                    }
+                    else
+                    {
+                        stkStack[depth++] = sStkNN(p.a->childs[0], p.b);
+                        stkStack[depth++] = sStkNN(p.a->childs[1], p.b);
+                    }
+                }
+                else
+                {
+                    if (p.b->isinternal())
+                    {
+                        stkStack[depth++] = sStkNN(p.a, p.b->childs[0]);
+                        stkStack[depth++] = sStkNN(p.a, p.b->childs[1]);
+                    }
+                    else
+                    {
+                        policy.Process(p.a, p.b);
+                    }
+                }
+            }
+        } while (depth);
+    }
+}
+
+
+DBVT_PREFIX
+inline void btDbvt::collideTTpersistentStack(const btDbvtNode* root0,
+											 const btDbvtNode* root1,
+											 DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+	if (root0 && root1)
+	{
+		int depth = 1;
+		int treshold = DOUBLE_STACKSIZE - 4;
+
+		m_stkStack.resize(DOUBLE_STACKSIZE);
+		m_stkStack[0] = sStkNN(root0, root1);
+		do
+		{
+			sStkNN p = m_stkStack[--depth];
+			if (depth > treshold)
+			{
+				m_stkStack.resize(m_stkStack.size() * 2);
+				treshold = m_stkStack.size() - 4;
+			}
+			if (p.a == p.b)
+			{
+				if (p.a->isinternal())
+				{
+					m_stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[0]);
+					m_stkStack[depth++] = sStkNN(p.a->childs[1], p.a->childs[1]);
+					m_stkStack[depth++] = sStkNN(p.a->childs[0], p.a->childs[1]);
+				}
+			}
+			else if (Intersect(p.a->volume, p.b->volume))
+			{
+				if (p.a->isinternal())
+				{
+					if (p.b->isinternal())
+					{
+						m_stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[0]);
+						m_stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[0]);
+						m_stkStack[depth++] = sStkNN(p.a->childs[0], p.b->childs[1]);
+						m_stkStack[depth++] = sStkNN(p.a->childs[1], p.b->childs[1]);
+					}
+					else
+					{
+						m_stkStack[depth++] = sStkNN(p.a->childs[0], p.b);
+						m_stkStack[depth++] = sStkNN(p.a->childs[1], p.b);
+					}
+				}
+				else
+				{
+					if (p.b->isinternal())
+					{
+						m_stkStack[depth++] = sStkNN(p.a, p.b->childs[0]);
+						m_stkStack[depth++] = sStkNN(p.a, p.b->childs[1]);
+					}
+					else
+					{
+						policy.Process(p.a, p.b);
+					}
+				}
+			}
+		} while (depth);
+	}
+}
+
+#if 0
+//
+DBVT_PREFIX
+inline void		btDbvt::collideTT(	const btDbvtNode* root0,
+								  const btDbvtNode* root1,
+								  const btTransform& xform,
+								  DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+		if(root0&&root1)
+		{
+			int								depth=1;
+			int								treshold=DOUBLE_STACKSIZE-4;
+			btAlignedObjectArray<sStkNN>	stkStack;
+			stkStack.resize(DOUBLE_STACKSIZE);
+			stkStack[0]=sStkNN(root0,root1);
+			do	{
+				sStkNN	p=stkStack[--depth];
+				if(Intersect(p.a->volume,p.b->volume,xform))
+				{
+					if(depth>treshold)
+					{
+						stkStack.resize(stkStack.size()*2);
+						treshold=stkStack.size()-4;
+					}
+					if(p.a->isinternal())
+					{
+						if(p.b->isinternal())
+						{					
+							stkStack[depth++]=sStkNN(p.a->childs[0],p.b->childs[0]);
+							stkStack[depth++]=sStkNN(p.a->childs[1],p.b->childs[0]);
+							stkStack[depth++]=sStkNN(p.a->childs[0],p.b->childs[1]);
+							stkStack[depth++]=sStkNN(p.a->childs[1],p.b->childs[1]);
+						}
+						else
+						{
+							stkStack[depth++]=sStkNN(p.a->childs[0],p.b);
+							stkStack[depth++]=sStkNN(p.a->childs[1],p.b);
+						}
+					}
+					else
+					{
+						if(p.b->isinternal())
+						{
+							stkStack[depth++]=sStkNN(p.a,p.b->childs[0]);
+							stkStack[depth++]=sStkNN(p.a,p.b->childs[1]);
+						}
+						else
+						{
+							policy.Process(p.a,p.b);
+						}
+					}
+				}
+			} while(depth);
+		}
+}
+//
+DBVT_PREFIX
+inline void		btDbvt::collideTT(	const btDbvtNode* root0,
+								  const btTransform& xform0,
+								  const btDbvtNode* root1,
+								  const btTransform& xform1,
+								  DBVT_IPOLICY)
+{
+	const btTransform	xform=xform0.inverse()*xform1;
+	collideTT(root0,root1,xform,policy);
+}
+#endif
+
+DBVT_PREFIX
+inline void btDbvt::collideTV(const btDbvtNode* root,
+							  const btDbvtVolume& vol,
+							  DBVT_IPOLICY) const
+{
+	DBVT_CHECKTYPE
+	if (root)
+	{
+		ATTRIBUTE_ALIGNED16(btDbvtVolume)
+		volume(vol);
+		btAlignedObjectArray<const btDbvtNode*> stack;
+		stack.resize(0);
+#ifndef BT_DISABLE_STACK_TEMP_MEMORY
+		char tempmemory[SIMPLE_STACKSIZE * sizeof(const btDbvtNode*)];
+		stack.initializeFromBuffer(tempmemory, 0, SIMPLE_STACKSIZE);
+#else
+		stack.reserve(SIMPLE_STACKSIZE);
+#endif  //BT_DISABLE_STACK_TEMP_MEMORY
+
+		stack.push_back(root);
+		do
+		{
+			const btDbvtNode* n = stack[stack.size() - 1];
+			stack.pop_back();
+			if (Intersect(n->volume, volume))
+			{
+				if (n->isinternal())
+				{
+					stack.push_back(n->childs[0]);
+					stack.push_back(n->childs[1]);
+				}
+				else
+				{
+					policy.Process(n);
+				}
+			}
+		} while (stack.size() > 0);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::collideTVNoStackAlloc(const btDbvtNode* root,
+										  const btDbvtVolume& vol,
+										  btNodeStack& stack,
+										  DBVT_IPOLICY) const
+{
+	DBVT_CHECKTYPE
+	if (root)
+	{
+		ATTRIBUTE_ALIGNED16(btDbvtVolume)
+		volume(vol);
+		stack.resize(0);
+		stack.reserve(SIMPLE_STACKSIZE);
+		stack.push_back(root);
+		do
+		{
+			const btDbvtNode* n = stack[stack.size() - 1];
+			stack.pop_back();
+			if (Intersect(n->volume, volume))
+			{
+				if (n->isinternal())
+				{
+					stack.push_back(n->childs[0]);
+					stack.push_back(n->childs[1]);
+				}
+				else
+				{
+					policy.Process(n);
+				}
+			}
+		} while (stack.size() > 0);
+	}
+}
+
+DBVT_PREFIX
+inline void btDbvt::rayTestInternal(const btDbvtNode* root,
+									const btVector3& rayFrom,
+									const btVector3& rayTo,
+									const btVector3& rayDirectionInverse,
+									unsigned int signs[3],
+									btScalar lambda_max,
+									const btVector3& aabbMin,
+									const btVector3& aabbMax,
+									btAlignedObjectArray<const btDbvtNode*>& stack,
+									DBVT_IPOLICY) const
+{
+	(void)rayTo;
+	DBVT_CHECKTYPE
+	if (root)
+	{
+		btVector3 resultNormal;
+
+		int depth = 1;
+		int treshold = DOUBLE_STACKSIZE - 2;
+		stack.resize(DOUBLE_STACKSIZE);
+		stack[0] = root;
+		btVector3 bounds[2];
+		do
+		{
+			const btDbvtNode* node = stack[--depth];
+			bounds[0] = node->volume.Mins() - aabbMax;
+			bounds[1] = node->volume.Maxs() - aabbMin;
+			btScalar tmin = 1.f, lambda_min = 0.f;
+			unsigned int result1 = false;
+			result1 = btRayAabb2(rayFrom, rayDirectionInverse, signs, bounds, tmin, lambda_min, lambda_max);
+			if (result1)
+			{
+				if (node->isinternal())
+				{
+					if (depth > treshold)
+					{
+						stack.resize(stack.size() * 2);
+						treshold = stack.size() - 2;
+					}
+					stack[depth++] = node->childs[0];
+					stack[depth++] = node->childs[1];
+				}
+				else
+				{
+					policy.Process(node);
+				}
+			}
+		} while (depth);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::rayTest(const btDbvtNode* root,
+							const btVector3& rayFrom,
+							const btVector3& rayTo,
+							DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+	if (root)
+	{
+		btVector3 rayDir = (rayTo - rayFrom);
+		rayDir.normalize();
+
+		///what about division by zero? --> just set rayDirection[i] to INF/BT_LARGE_FLOAT
+		btVector3 rayDirectionInverse;
+		rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[0];
+		rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[1];
+		rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[2];
+		unsigned int signs[3] = {rayDirectionInverse[0] < 0.0, rayDirectionInverse[1] < 0.0, rayDirectionInverse[2] < 0.0};
+
+		btScalar lambda_max = rayDir.dot(rayTo - rayFrom);
+
+		btVector3 resultNormal;
+
+		btAlignedObjectArray<const btDbvtNode*> stack;
+
+		int depth = 1;
+		int treshold = DOUBLE_STACKSIZE - 2;
+
+		char tempmemory[DOUBLE_STACKSIZE * sizeof(const btDbvtNode*)];
+#ifndef BT_DISABLE_STACK_TEMP_MEMORY
+		stack.initializeFromBuffer(tempmemory, DOUBLE_STACKSIZE, DOUBLE_STACKSIZE);
+#else   //BT_DISABLE_STACK_TEMP_MEMORY
+		stack.resize(DOUBLE_STACKSIZE);
+#endif  //BT_DISABLE_STACK_TEMP_MEMORY
+		stack[0] = root;
+		btVector3 bounds[2];
+		do
+		{
+			const btDbvtNode* node = stack[--depth];
+
+			bounds[0] = node->volume.Mins();
+			bounds[1] = node->volume.Maxs();
+
+			btScalar tmin = 1.f, lambda_min = 0.f;
+			unsigned int result1 = btRayAabb2(rayFrom, rayDirectionInverse, signs, bounds, tmin, lambda_min, lambda_max);
+
+#ifdef COMPARE_BTRAY_AABB2
+			btScalar param = 1.f;
+			bool result2 = btRayAabb(rayFrom, rayTo, node->volume.Mins(), node->volume.Maxs(), param, resultNormal);
+			btAssert(result1 == result2);
+#endif  //TEST_BTRAY_AABB2
+
+			if (result1)
+			{
+				if (node->isinternal())
+				{
+					if (depth > treshold)
+					{
+						stack.resize(stack.size() * 2);
+						treshold = stack.size() - 2;
+					}
+					stack[depth++] = node->childs[0];
+					stack[depth++] = node->childs[1];
+				}
+				else
+				{
+					policy.Process(node);
+				}
+			}
+		} while (depth);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::collideKDOP(const btDbvtNode* root,
+								const btVector3* normals,
+								const btScalar* offsets,
+								int count,
+								DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+	if (root)
+	{
+		const int inside = (1 << count) - 1;
+		btAlignedObjectArray<sStkNP> stack;
+		int signs[sizeof(unsigned) * 8];
+		btAssert(count < int(sizeof(signs) / sizeof(signs[0])));
+		for (int i = 0; i < count; ++i)
+		{
+			signs[i] = ((normals[i].x() >= 0) ? 1 : 0) +
+					   ((normals[i].y() >= 0) ? 2 : 0) +
+					   ((normals[i].z() >= 0) ? 4 : 0);
+		}
+		stack.reserve(SIMPLE_STACKSIZE);
+		stack.push_back(sStkNP(root, 0));
+		do
+		{
+			sStkNP se = stack[stack.size() - 1];
+			bool out = false;
+			stack.pop_back();
+			for (int i = 0, j = 1; (!out) && (i < count); ++i, j <<= 1)
+			{
+				if (0 == (se.mask & j))
+				{
+					const int side = se.node->volume.Classify(normals[i], offsets[i], signs[i]);
+					switch (side)
+					{
+						case -1:
+							out = true;
+							break;
+						case +1:
+							se.mask |= j;
+							break;
+					}
+				}
+			}
+			if (!out)
+			{
+				if ((se.mask != inside) && (se.node->isinternal()))
+				{
+					stack.push_back(sStkNP(se.node->childs[0], se.mask));
+					stack.push_back(sStkNP(se.node->childs[1], se.mask));
+				}
+				else
+				{
+					if (policy.AllLeaves(se.node)) enumLeaves(se.node, policy);
+				}
+			}
+		} while (stack.size());
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::collideOCL(const btDbvtNode* root,
+							   const btVector3* normals,
+							   const btScalar* offsets,
+							   const btVector3& sortaxis,
+							   int count,
+							   DBVT_IPOLICY,
+							   bool fsort)
+{
+	DBVT_CHECKTYPE
+	if (root)
+	{
+		const unsigned srtsgns = (sortaxis[0] >= 0 ? 1 : 0) +
+								 (sortaxis[1] >= 0 ? 2 : 0) +
+								 (sortaxis[2] >= 0 ? 4 : 0);
+		const int inside = (1 << count) - 1;
+		btAlignedObjectArray<sStkNPS> stock;
+		btAlignedObjectArray<int> ifree;
+		btAlignedObjectArray<int> stack;
+		int signs[sizeof(unsigned) * 8];
+		btAssert(count < int(sizeof(signs) / sizeof(signs[0])));
+		for (int i = 0; i < count; ++i)
+		{
+			signs[i] = ((normals[i].x() >= 0) ? 1 : 0) +
+					   ((normals[i].y() >= 0) ? 2 : 0) +
+					   ((normals[i].z() >= 0) ? 4 : 0);
+		}
+		stock.reserve(SIMPLE_STACKSIZE);
+		stack.reserve(SIMPLE_STACKSIZE);
+		ifree.reserve(SIMPLE_STACKSIZE);
+		stack.push_back(allocate(ifree, stock, sStkNPS(root, 0, root->volume.ProjectMinimum(sortaxis, srtsgns))));
+		do
+		{
+			const int id = stack[stack.size() - 1];
+			sStkNPS se = stock[id];
+			stack.pop_back();
+			ifree.push_back(id);
+			if (se.mask != inside)
+			{
+				bool out = false;
+				for (int i = 0, j = 1; (!out) && (i < count); ++i, j <<= 1)
+				{
+					if (0 == (se.mask & j))
+					{
+						const int side = se.node->volume.Classify(normals[i], offsets[i], signs[i]);
+						switch (side)
+						{
+							case -1:
+								out = true;
+								break;
+							case +1:
+								se.mask |= j;
+								break;
+						}
+					}
+				}
+				if (out) continue;
+			}
+			if (policy.Descent(se.node))
+			{
+				if (se.node->isinternal())
+				{
+					const btDbvtNode* pns[] = {se.node->childs[0], se.node->childs[1]};
+					sStkNPS nes[] = {sStkNPS(pns[0], se.mask, pns[0]->volume.ProjectMinimum(sortaxis, srtsgns)),
+									 sStkNPS(pns[1], se.mask, pns[1]->volume.ProjectMinimum(sortaxis, srtsgns))};
+					const int q = nes[0].value < nes[1].value ? 1 : 0;
+					int j = stack.size();
+					if (fsort && (j > 0))
+					{
+						/* Insert 0	*/
+						j = nearest(&stack[0], &stock[0], nes[q].value, 0, stack.size());
+						stack.push_back(0);
+
+						//void * memmove ( void * destination, const void * source, size_t num );
+
+#if DBVT_USE_MEMMOVE
+						{
+							int num_items_to_move = stack.size() - 1 - j;
+							if (num_items_to_move > 0)
+								memmove(&stack[j + 1], &stack[j], sizeof(int) * num_items_to_move);
+						}
+#else
+						for (int k = stack.size() - 1; k > j; --k)
+						{
+							stack[k] = stack[k - 1];
+						}
+#endif
+						stack[j] = allocate(ifree, stock, nes[q]);
+						/* Insert 1	*/
+						j = nearest(&stack[0], &stock[0], nes[1 - q].value, j, stack.size());
+						stack.push_back(0);
+#if DBVT_USE_MEMMOVE
+						{
+							int num_items_to_move = stack.size() - 1 - j;
+							if (num_items_to_move > 0)
+								memmove(&stack[j + 1], &stack[j], sizeof(int) * num_items_to_move);
+						}
+#else
+						for (int k = stack.size() - 1; k > j; --k)
+						{
+							stack[k] = stack[k - 1];
+						}
+#endif
+						stack[j] = allocate(ifree, stock, nes[1 - q]);
+					}
+					else
+					{
+						stack.push_back(allocate(ifree, stock, nes[q]));
+						stack.push_back(allocate(ifree, stock, nes[1 - q]));
+					}
+				}
+				else
+				{
+					policy.Process(se.node, se.value);
+				}
+			}
+		} while (stack.size());
+	}
+}
+
+//
+DBVT_PREFIX
+inline void btDbvt::collideTU(const btDbvtNode* root,
+							  DBVT_IPOLICY)
+{
+	DBVT_CHECKTYPE
+	if (root)
+	{
+		btAlignedObjectArray<const btDbvtNode*> stack;
+		stack.reserve(SIMPLE_STACKSIZE);
+		stack.push_back(root);
+		do
+		{
+			const btDbvtNode* n = stack[stack.size() - 1];
+			stack.pop_back();
+			if (policy.Descent(n))
+			{
+				if (n->isinternal())
+				{
+					stack.push_back(n->childs[0]);
+					stack.push_back(n->childs[1]);
+				}
+				else
+				{
+					policy.Process(n);
+				}
+			}
+		} while (stack.size() > 0);
+	}
+}
+
+//
+// PP Cleanup
+//
+
+#undef DBVT_USE_MEMMOVE
+#undef DBVT_USE_TEMPLATE
+#undef DBVT_VIRTUAL_DTOR
+#undef DBVT_VIRTUAL
+#undef DBVT_PREFIX
+#undef DBVT_IPOLICY
+#undef DBVT_CHECKTYPE
+#undef DBVT_IMPL_GENERIC
+#undef DBVT_IMPL_SSE
+#undef DBVT_USE_INTRINSIC_SSE
+#undef DBVT_SELECT_IMPL
+#undef DBVT_MERGE_IMPL
+#undef DBVT_INT0_IMPL
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
new file mode 100644
index 0000000..7b39dbd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
@@ -0,0 +1,828 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///btDbvtBroadphase implementation by Nathanael Presson
+
+#include "btDbvtBroadphase.h"
+#include "LinearMath/btThreads.h"
+btScalar gDbvtMargin = btScalar(0.05);
+//
+// Profiling
+//
+
+#if DBVT_BP_PROFILE || DBVT_BP_ENABLE_BENCHMARK
+#include <stdio.h>
+#endif
+
+#if DBVT_BP_PROFILE
+struct ProfileScope
+{
+	__forceinline ProfileScope(btClock& clock, unsigned long& value) : m_clock(&clock), m_value(&value), m_base(clock.getTimeMicroseconds())
+	{
+	}
+	__forceinline ~ProfileScope()
+	{
+		(*m_value) += m_clock->getTimeMicroseconds() - m_base;
+	}
+	btClock* m_clock;
+	unsigned long* m_value;
+	unsigned long m_base;
+};
+#define SPC(_value_) ProfileScope spc_scope(m_clock, _value_)
+#else
+#define SPC(_value_)
+#endif
+
+//
+// Helpers
+//
+
+//
+template <typename T>
+static inline void listappend(T* item, T*& list)
+{
+	item->links[0] = 0;
+	item->links[1] = list;
+	if (list) list->links[0] = item;
+	list = item;
+}
+
+//
+template <typename T>
+static inline void listremove(T* item, T*& list)
+{
+	if (item->links[0])
+		item->links[0]->links[1] = item->links[1];
+	else
+		list = item->links[1];
+	if (item->links[1]) item->links[1]->links[0] = item->links[0];
+}
+
+//
+template <typename T>
+static inline int listcount(T* root)
+{
+	int n = 0;
+	while (root)
+	{
+		++n;
+		root = root->links[1];
+	}
+	return (n);
+}
+
+//
+template <typename T>
+static inline void clear(T& value)
+{
+	static const struct ZeroDummy : T
+	{
+	} zerodummy;
+	value = zerodummy;
+}
+
+//
+// Colliders
+//
+
+/* Tree collider	*/
+struct btDbvtTreeCollider : btDbvt::ICollide
+{
+	btDbvtBroadphase* pbp;
+	btDbvtProxy* proxy;
+	btDbvtTreeCollider(btDbvtBroadphase* p) : pbp(p) {}
+	void Process(const btDbvtNode* na, const btDbvtNode* nb)
+	{
+		if (na != nb)
+		{
+			btDbvtProxy* pa = (btDbvtProxy*)na->data;
+			btDbvtProxy* pb = (btDbvtProxy*)nb->data;
+#if DBVT_BP_SORTPAIRS
+			if (pa->m_uniqueId > pb->m_uniqueId)
+				btSwap(pa, pb);
+#endif
+			pbp->m_paircache->addOverlappingPair(pa, pb);
+			++pbp->m_newpairs;
+		}
+	}
+	void Process(const btDbvtNode* n)
+	{
+		Process(n, proxy->leaf);
+	}
+};
+
+//
+// btDbvtBroadphase
+//
+
+//
+btDbvtBroadphase::btDbvtBroadphase(btOverlappingPairCache* paircache)
+{
+	m_deferedcollide = false;
+	m_needcleanup = true;
+	m_releasepaircache = (paircache != 0) ? false : true;
+	m_prediction = 0;
+	m_stageCurrent = 0;
+	m_fixedleft = 0;
+	m_fupdates = 1;
+	m_dupdates = 0;
+	m_cupdates = 10;
+	m_newpairs = 1;
+	m_updates_call = 0;
+	m_updates_done = 0;
+	m_updates_ratio = 0;
+	m_paircache = paircache ? paircache : new (btAlignedAlloc(sizeof(btHashedOverlappingPairCache), 16)) btHashedOverlappingPairCache();
+	m_gid = 0;
+	m_pid = 0;
+	m_cid = 0;
+	for (int i = 0; i <= STAGECOUNT; ++i)
+	{
+		m_stageRoots[i] = 0;
+	}
+#if BT_THREADSAFE
+	m_rayTestStacks.resize(BT_MAX_THREAD_COUNT);
+#else
+	m_rayTestStacks.resize(1);
+#endif
+#if DBVT_BP_PROFILE
+	clear(m_profiling);
+#endif
+}
+
+//
+btDbvtBroadphase::~btDbvtBroadphase()
+{
+	if (m_releasepaircache)
+	{
+		m_paircache->~btOverlappingPairCache();
+		btAlignedFree(m_paircache);
+	}
+}
+
+//
+btBroadphaseProxy* btDbvtBroadphase::createProxy(const btVector3& aabbMin,
+												 const btVector3& aabbMax,
+												 int /*shapeType*/,
+												 void* userPtr,
+												 int collisionFilterGroup,
+												 int collisionFilterMask,
+												 btDispatcher* /*dispatcher*/)
+{
+	btDbvtProxy* proxy = new (btAlignedAlloc(sizeof(btDbvtProxy), 16)) btDbvtProxy(aabbMin, aabbMax, userPtr,
+																				   collisionFilterGroup,
+																				   collisionFilterMask);
+
+	btDbvtAabbMm aabb = btDbvtVolume::FromMM(aabbMin, aabbMax);
+
+	//bproxy->aabb			=	btDbvtVolume::FromMM(aabbMin,aabbMax);
+	proxy->stage = m_stageCurrent;
+	proxy->m_uniqueId = ++m_gid;
+	proxy->leaf = m_sets[0].insert(aabb, proxy);
+	listappend(proxy, m_stageRoots[m_stageCurrent]);
+	if (!m_deferedcollide)
+	{
+		btDbvtTreeCollider collider(this);
+		collider.proxy = proxy;
+		m_sets[0].collideTV(m_sets[0].m_root, aabb, collider);
+		m_sets[1].collideTV(m_sets[1].m_root, aabb, collider);
+	}
+	return (proxy);
+}
+
+//
+void btDbvtBroadphase::destroyProxy(btBroadphaseProxy* absproxy,
+									btDispatcher* dispatcher)
+{
+	btDbvtProxy* proxy = (btDbvtProxy*)absproxy;
+	if (proxy->stage == STAGECOUNT)
+		m_sets[1].remove(proxy->leaf);
+	else
+		m_sets[0].remove(proxy->leaf);
+	listremove(proxy, m_stageRoots[proxy->stage]);
+	m_paircache->removeOverlappingPairsContainingProxy(proxy, dispatcher);
+	btAlignedFree(proxy);
+	m_needcleanup = true;
+}
+
+void btDbvtBroadphase::getAabb(btBroadphaseProxy* absproxy, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btDbvtProxy* proxy = (btDbvtProxy*)absproxy;
+	aabbMin = proxy->m_aabbMin;
+	aabbMax = proxy->m_aabbMax;
+}
+
+struct BroadphaseRayTester : btDbvt::ICollide
+{
+	btBroadphaseRayCallback& m_rayCallback;
+	BroadphaseRayTester(btBroadphaseRayCallback& orgCallback)
+		: m_rayCallback(orgCallback)
+	{
+	}
+	void Process(const btDbvtNode* leaf)
+	{
+		btDbvtProxy* proxy = (btDbvtProxy*)leaf->data;
+		m_rayCallback.process(proxy);
+	}
+};
+
+void btDbvtBroadphase::rayTest(const btVector3& rayFrom, const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	BroadphaseRayTester callback(rayCallback);
+	btAlignedObjectArray<const btDbvtNode*>* stack = &m_rayTestStacks[0];
+#if BT_THREADSAFE
+	// for this function to be threadsafe, each thread must have a separate copy
+	// of this stack.  This could be thread-local static to avoid dynamic allocations,
+	// instead of just a local.
+	int threadIndex = btGetCurrentThreadIndex();
+	btAlignedObjectArray<const btDbvtNode*> localStack;
+	//todo(erwincoumans, "why do we get tsan issue here?")
+	if (0)//threadIndex < m_rayTestStacks.size())
+	//if (threadIndex < m_rayTestStacks.size())
+	{
+		// use per-thread preallocated stack if possible to avoid dynamic allocations
+		stack = &m_rayTestStacks[threadIndex];
+	}
+	else
+	{
+		stack = &localStack;
+	}
+#endif
+
+	m_sets[0].rayTestInternal(m_sets[0].m_root,
+							  rayFrom,
+							  rayTo,
+							  rayCallback.m_rayDirectionInverse,
+							  rayCallback.m_signs,
+							  rayCallback.m_lambda_max,
+							  aabbMin,
+							  aabbMax,
+							  *stack,
+							  callback);
+
+	m_sets[1].rayTestInternal(m_sets[1].m_root,
+							  rayFrom,
+							  rayTo,
+							  rayCallback.m_rayDirectionInverse,
+							  rayCallback.m_signs,
+							  rayCallback.m_lambda_max,
+							  aabbMin,
+							  aabbMax,
+							  *stack,
+							  callback);
+}
+
+struct BroadphaseAabbTester : btDbvt::ICollide
+{
+	btBroadphaseAabbCallback& m_aabbCallback;
+	BroadphaseAabbTester(btBroadphaseAabbCallback& orgCallback)
+		: m_aabbCallback(orgCallback)
+	{
+	}
+	void Process(const btDbvtNode* leaf)
+	{
+		btDbvtProxy* proxy = (btDbvtProxy*)leaf->data;
+		m_aabbCallback.process(proxy);
+	}
+};
+
+void btDbvtBroadphase::aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& aabbCallback)
+{
+	BroadphaseAabbTester callback(aabbCallback);
+
+	const ATTRIBUTE_ALIGNED16(btDbvtVolume) bounds = btDbvtVolume::FromMM(aabbMin, aabbMax);
+	//process all children, that overlap with  the given AABB bounds
+	m_sets[0].collideTV(m_sets[0].m_root, bounds, callback);
+	m_sets[1].collideTV(m_sets[1].m_root, bounds, callback);
+}
+
+//
+void btDbvtBroadphase::setAabb(btBroadphaseProxy* absproxy,
+							   const btVector3& aabbMin,
+							   const btVector3& aabbMax,
+							   btDispatcher* /*dispatcher*/)
+{
+	btDbvtProxy* proxy = (btDbvtProxy*)absproxy;
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)
+	aabb = btDbvtVolume::FromMM(aabbMin, aabbMax);
+#if DBVT_BP_PREVENTFALSEUPDATE
+	if (NotEqual(aabb, proxy->leaf->volume))
+#endif
+	{
+		bool docollide = false;
+		if (proxy->stage == STAGECOUNT)
+		{ /* fixed -> dynamic set	*/
+			m_sets[1].remove(proxy->leaf);
+			proxy->leaf = m_sets[0].insert(aabb, proxy);
+			docollide = true;
+		}
+		else
+		{ /* dynamic set				*/
+			++m_updates_call;
+			if (Intersect(proxy->leaf->volume, aabb))
+			{ /* Moving				*/
+
+				const btVector3 delta = aabbMin - proxy->m_aabbMin;
+				btVector3 velocity(((proxy->m_aabbMax - proxy->m_aabbMin) / 2) * m_prediction);
+				if (delta[0] < 0) velocity[0] = -velocity[0];
+				if (delta[1] < 0) velocity[1] = -velocity[1];
+				if (delta[2] < 0) velocity[2] = -velocity[2];
+				if (
+					m_sets[0].update(proxy->leaf, aabb, velocity, gDbvtMargin)
+
+				)
+				{
+					++m_updates_done;
+					docollide = true;
+				}
+			}
+			else
+			{ /* Teleporting			*/
+				m_sets[0].update(proxy->leaf, aabb);
+				++m_updates_done;
+				docollide = true;
+			}
+		}
+		listremove(proxy, m_stageRoots[proxy->stage]);
+		proxy->m_aabbMin = aabbMin;
+		proxy->m_aabbMax = aabbMax;
+		proxy->stage = m_stageCurrent;
+		listappend(proxy, m_stageRoots[m_stageCurrent]);
+		if (docollide)
+		{
+			m_needcleanup = true;
+			if (!m_deferedcollide)
+			{
+				btDbvtTreeCollider collider(this);
+				m_sets[1].collideTTpersistentStack(m_sets[1].m_root, proxy->leaf, collider);
+				m_sets[0].collideTTpersistentStack(m_sets[0].m_root, proxy->leaf, collider);
+			}
+		}
+	}
+}
+
+//
+void btDbvtBroadphase::setAabbForceUpdate(btBroadphaseProxy* absproxy,
+										  const btVector3& aabbMin,
+										  const btVector3& aabbMax,
+										  btDispatcher* /*dispatcher*/)
+{
+	btDbvtProxy* proxy = (btDbvtProxy*)absproxy;
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)
+	aabb = btDbvtVolume::FromMM(aabbMin, aabbMax);
+	bool docollide = false;
+	if (proxy->stage == STAGECOUNT)
+	{ /* fixed -> dynamic set	*/
+		m_sets[1].remove(proxy->leaf);
+		proxy->leaf = m_sets[0].insert(aabb, proxy);
+		docollide = true;
+	}
+	else
+	{ /* dynamic set				*/
+		++m_updates_call;
+		/* Teleporting			*/
+		m_sets[0].update(proxy->leaf, aabb);
+		++m_updates_done;
+		docollide = true;
+	}
+	listremove(proxy, m_stageRoots[proxy->stage]);
+	proxy->m_aabbMin = aabbMin;
+	proxy->m_aabbMax = aabbMax;
+	proxy->stage = m_stageCurrent;
+	listappend(proxy, m_stageRoots[m_stageCurrent]);
+	if (docollide)
+	{
+		m_needcleanup = true;
+		if (!m_deferedcollide)
+		{
+			btDbvtTreeCollider collider(this);
+			m_sets[1].collideTTpersistentStack(m_sets[1].m_root, proxy->leaf, collider);
+			m_sets[0].collideTTpersistentStack(m_sets[0].m_root, proxy->leaf, collider);
+		}
+	}
+}
+
+//
+void btDbvtBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
+{
+	collide(dispatcher);
+#if DBVT_BP_PROFILE
+	if (0 == (m_pid % DBVT_BP_PROFILING_RATE))
+	{
+		printf("fixed(%u) dynamics(%u) pairs(%u)\r\n", m_sets[1].m_leaves, m_sets[0].m_leaves, m_paircache->getNumOverlappingPairs());
+		unsigned int total = m_profiling.m_total;
+		if (total <= 0) total = 1;
+		printf("ddcollide: %u%% (%uus)\r\n", (50 + m_profiling.m_ddcollide * 100) / total, m_profiling.m_ddcollide / DBVT_BP_PROFILING_RATE);
+		printf("fdcollide: %u%% (%uus)\r\n", (50 + m_profiling.m_fdcollide * 100) / total, m_profiling.m_fdcollide / DBVT_BP_PROFILING_RATE);
+		printf("cleanup:   %u%% (%uus)\r\n", (50 + m_profiling.m_cleanup * 100) / total, m_profiling.m_cleanup / DBVT_BP_PROFILING_RATE);
+		printf("total:     %uus\r\n", total / DBVT_BP_PROFILING_RATE);
+		const unsigned long sum = m_profiling.m_ddcollide +
+								  m_profiling.m_fdcollide +
+								  m_profiling.m_cleanup;
+		printf("leaked: %u%% (%uus)\r\n", 100 - ((50 + sum * 100) / total), (total - sum) / DBVT_BP_PROFILING_RATE);
+		printf("job counts: %u%%\r\n", (m_profiling.m_jobcount * 100) / ((m_sets[0].m_leaves + m_sets[1].m_leaves) * DBVT_BP_PROFILING_RATE));
+		clear(m_profiling);
+		m_clock.reset();
+	}
+#endif
+
+	performDeferredRemoval(dispatcher);
+}
+
+void btDbvtBroadphase::performDeferredRemoval(btDispatcher* dispatcher)
+{
+	if (m_paircache->hasDeferredRemoval())
+	{
+		btBroadphasePairArray& overlappingPairArray = m_paircache->getOverlappingPairArray();
+
+		//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+		int invalidPair = 0;
+
+		int i;
+
+		btBroadphasePair previousPair;
+		previousPair.m_pProxy0 = 0;
+		previousPair.m_pProxy1 = 0;
+		previousPair.m_algorithm = 0;
+
+		for (i = 0; i < overlappingPairArray.size(); i++)
+		{
+			btBroadphasePair& pair = overlappingPairArray[i];
+
+			bool isDuplicate = (pair == previousPair);
+
+			previousPair = pair;
+
+			bool needsRemoval = false;
+
+			if (!isDuplicate)
+			{
+				//important to perform AABB check that is consistent with the broadphase
+				btDbvtProxy* pa = (btDbvtProxy*)pair.m_pProxy0;
+				btDbvtProxy* pb = (btDbvtProxy*)pair.m_pProxy1;
+				bool hasOverlap = Intersect(pa->leaf->volume, pb->leaf->volume);
+
+				if (hasOverlap)
+				{
+					needsRemoval = false;
+				}
+				else
+				{
+					needsRemoval = true;
+				}
+			}
+			else
+			{
+				//remove duplicate
+				needsRemoval = true;
+				//should have no algorithm
+				btAssert(!pair.m_algorithm);
+			}
+
+			if (needsRemoval)
+			{
+				m_paircache->cleanOverlappingPair(pair, dispatcher);
+
+				pair.m_pProxy0 = 0;
+				pair.m_pProxy1 = 0;
+				invalidPair++;
+			}
+		}
+
+		//perform a sort, to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+		overlappingPairArray.resize(overlappingPairArray.size() - invalidPair);
+	}
+}
+
+//
+void btDbvtBroadphase::collide(btDispatcher* dispatcher)
+{
+	/*printf("---------------------------------------------------------\n");
+	printf("m_sets[0].m_leaves=%d\n",m_sets[0].m_leaves);
+	printf("m_sets[1].m_leaves=%d\n",m_sets[1].m_leaves);
+	printf("numPairs = %d\n",getOverlappingPairCache()->getNumOverlappingPairs());
+	{
+		int i;
+		for (i=0;i<getOverlappingPairCache()->getNumOverlappingPairs();i++)
+		{
+			printf("pair[%d]=(%d,%d),",i,getOverlappingPairCache()->getOverlappingPairArray()[i].m_pProxy0->getUid(),
+				getOverlappingPairCache()->getOverlappingPairArray()[i].m_pProxy1->getUid());
+		}
+		printf("\n");
+	}
+*/
+
+	SPC(m_profiling.m_total);
+	/* optimize				*/
+	m_sets[0].optimizeIncremental(1 + (m_sets[0].m_leaves * m_dupdates) / 100);
+	if (m_fixedleft)
+	{
+		const int count = 1 + (m_sets[1].m_leaves * m_fupdates) / 100;
+		m_sets[1].optimizeIncremental(1 + (m_sets[1].m_leaves * m_fupdates) / 100);
+		m_fixedleft = btMax<int>(0, m_fixedleft - count);
+	}
+	/* dynamic -> fixed set	*/
+	m_stageCurrent = (m_stageCurrent + 1) % STAGECOUNT;
+	btDbvtProxy* current = m_stageRoots[m_stageCurrent];
+	if (current)
+	{
+#if DBVT_BP_ACCURATESLEEPING
+		btDbvtTreeCollider collider(this);
+#endif
+		do
+		{
+			btDbvtProxy* next = current->links[1];
+			listremove(current, m_stageRoots[current->stage]);
+			listappend(current, m_stageRoots[STAGECOUNT]);
+#if DBVT_BP_ACCURATESLEEPING
+			m_paircache->removeOverlappingPairsContainingProxy(current, dispatcher);
+			collider.proxy = current;
+			btDbvt::collideTV(m_sets[0].m_root, current->aabb, collider);
+			btDbvt::collideTV(m_sets[1].m_root, current->aabb, collider);
+#endif
+			m_sets[0].remove(current->leaf);
+			ATTRIBUTE_ALIGNED16(btDbvtVolume)
+			curAabb = btDbvtVolume::FromMM(current->m_aabbMin, current->m_aabbMax);
+			current->leaf = m_sets[1].insert(curAabb, current);
+			current->stage = STAGECOUNT;
+			current = next;
+		} while (current);
+		m_fixedleft = m_sets[1].m_leaves;
+		m_needcleanup = true;
+	}
+	/* collide dynamics		*/
+	{
+		btDbvtTreeCollider collider(this);
+		if (m_deferedcollide)
+		{
+			SPC(m_profiling.m_fdcollide);
+			m_sets[0].collideTTpersistentStack(m_sets[0].m_root, m_sets[1].m_root, collider);
+		}
+		if (m_deferedcollide)
+		{
+			SPC(m_profiling.m_ddcollide);
+			m_sets[0].collideTTpersistentStack(m_sets[0].m_root, m_sets[0].m_root, collider);
+		}
+	}
+	/* clean up				*/
+	if (m_needcleanup)
+	{
+		SPC(m_profiling.m_cleanup);
+		btBroadphasePairArray& pairs = m_paircache->getOverlappingPairArray();
+		if (pairs.size() > 0)
+		{
+			int ni = btMin(pairs.size(), btMax<int>(m_newpairs, (pairs.size() * m_cupdates) / 100));
+			for (int i = 0; i < ni; ++i)
+			{
+				btBroadphasePair& p = pairs[(m_cid + i) % pairs.size()];
+				btDbvtProxy* pa = (btDbvtProxy*)p.m_pProxy0;
+				btDbvtProxy* pb = (btDbvtProxy*)p.m_pProxy1;
+				if (!Intersect(pa->leaf->volume, pb->leaf->volume))
+				{
+#if DBVT_BP_SORTPAIRS
+					if (pa->m_uniqueId > pb->m_uniqueId)
+						btSwap(pa, pb);
+#endif
+					m_paircache->removeOverlappingPair(pa, pb, dispatcher);
+					--ni;
+					--i;
+				}
+			}
+			if (pairs.size() > 0)
+				m_cid = (m_cid + ni) % pairs.size();
+			else
+				m_cid = 0;
+		}
+	}
+	++m_pid;
+	m_newpairs = 1;
+	m_needcleanup = false;
+	if (m_updates_call > 0)
+	{
+		m_updates_ratio = m_updates_done / (btScalar)m_updates_call;
+	}
+	else
+	{
+		m_updates_ratio = 0;
+	}
+	m_updates_done /= 2;
+	m_updates_call /= 2;
+}
+
+//
+void btDbvtBroadphase::optimize()
+{
+	m_sets[0].optimizeTopDown();
+	m_sets[1].optimizeTopDown();
+}
+
+//
+btOverlappingPairCache* btDbvtBroadphase::getOverlappingPairCache()
+{
+	return (m_paircache);
+}
+
+//
+const btOverlappingPairCache* btDbvtBroadphase::getOverlappingPairCache() const
+{
+	return (m_paircache);
+}
+
+//
+void btDbvtBroadphase::getBroadphaseAabb(btVector3& aabbMin, btVector3& aabbMax) const
+{
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)
+	bounds;
+
+	if (!m_sets[0].empty())
+		if (!m_sets[1].empty())
+			Merge(m_sets[0].m_root->volume,
+				  m_sets[1].m_root->volume, bounds);
+		else
+			bounds = m_sets[0].m_root->volume;
+	else if (!m_sets[1].empty())
+		bounds = m_sets[1].m_root->volume;
+	else
+		bounds = btDbvtVolume::FromCR(btVector3(0, 0, 0), 0);
+	aabbMin = bounds.Mins();
+	aabbMax = bounds.Maxs();
+}
+
+void btDbvtBroadphase::resetPool(btDispatcher* dispatcher)
+{
+	int totalObjects = m_sets[0].m_leaves + m_sets[1].m_leaves;
+	if (!totalObjects)
+	{
+		//reset internal dynamic tree data structures
+		m_sets[0].clear();
+		m_sets[1].clear();
+
+		m_deferedcollide = false;
+		m_needcleanup = true;
+		m_stageCurrent = 0;
+		m_fixedleft = 0;
+		m_fupdates = 1;
+		m_dupdates = 0;
+		m_cupdates = 10;
+		m_newpairs = 1;
+		m_updates_call = 0;
+		m_updates_done = 0;
+		m_updates_ratio = 0;
+
+		m_gid = 0;
+		m_pid = 0;
+		m_cid = 0;
+		for (int i = 0; i <= STAGECOUNT; ++i)
+		{
+			m_stageRoots[i] = 0;
+		}
+	}
+}
+
+//
+void btDbvtBroadphase::printStats()
+{
+}
+
+//
+#if DBVT_BP_ENABLE_BENCHMARK
+
+struct btBroadphaseBenchmark
+{
+	struct Experiment
+	{
+		const char* name;
+		int object_count;
+		int update_count;
+		int spawn_count;
+		int iterations;
+		btScalar speed;
+		btScalar amplitude;
+	};
+	struct Object
+	{
+		btVector3 center;
+		btVector3 extents;
+		btBroadphaseProxy* proxy;
+		btScalar time;
+		void update(btScalar speed, btScalar amplitude, btBroadphaseInterface* pbi)
+		{
+			time += speed;
+			center[0] = btCos(time * (btScalar)2.17) * amplitude +
+						btSin(time) * amplitude / 2;
+			center[1] = btCos(time * (btScalar)1.38) * amplitude +
+						btSin(time) * amplitude;
+			center[2] = btSin(time * (btScalar)0.777) * amplitude;
+			pbi->setAabb(proxy, center - extents, center + extents, 0);
+		}
+	};
+	static int UnsignedRand(int range = RAND_MAX - 1) { return (rand() % (range + 1)); }
+	static btScalar UnitRand() { return (UnsignedRand(16384) / (btScalar)16384); }
+	static void OutputTime(const char* name, btClock& c, unsigned count = 0)
+	{
+		const unsigned long us = c.getTimeMicroseconds();
+		const unsigned long ms = (us + 500) / 1000;
+		const btScalar sec = us / (btScalar)(1000 * 1000);
+		if (count > 0)
+			printf("%s : %u us (%u ms), %.2f/s\r\n", name, us, ms, count / sec);
+		else
+			printf("%s : %u us (%u ms)\r\n", name, us, ms);
+	}
+};
+
+void btDbvtBroadphase::benchmark(btBroadphaseInterface* pbi)
+{
+	static const btBroadphaseBenchmark::Experiment experiments[] =
+		{
+			{"1024o.10%", 1024, 10, 0, 8192, (btScalar)0.005, (btScalar)100},
+			/*{"4096o.10%",4096,10,0,8192,(btScalar)0.005,(btScalar)100},
+		{"8192o.10%",8192,10,0,8192,(btScalar)0.005,(btScalar)100},*/
+		};
+	static const int nexperiments = sizeof(experiments) / sizeof(experiments[0]);
+	btAlignedObjectArray<btBroadphaseBenchmark::Object*> objects;
+	btClock wallclock;
+	/* Begin			*/
+	for (int iexp = 0; iexp < nexperiments; ++iexp)
+	{
+		const btBroadphaseBenchmark::Experiment& experiment = experiments[iexp];
+		const int object_count = experiment.object_count;
+		const int update_count = (object_count * experiment.update_count) / 100;
+		const int spawn_count = (object_count * experiment.spawn_count) / 100;
+		const btScalar speed = experiment.speed;
+		const btScalar amplitude = experiment.amplitude;
+		printf("Experiment #%u '%s':\r\n", iexp, experiment.name);
+		printf("\tObjects: %u\r\n", object_count);
+		printf("\tUpdate: %u\r\n", update_count);
+		printf("\tSpawn: %u\r\n", spawn_count);
+		printf("\tSpeed: %f\r\n", speed);
+		printf("\tAmplitude: %f\r\n", amplitude);
+		srand(180673);
+		/* Create objects	*/
+		wallclock.reset();
+		objects.reserve(object_count);
+		for (int i = 0; i < object_count; ++i)
+		{
+			btBroadphaseBenchmark::Object* po = new btBroadphaseBenchmark::Object();
+			po->center[0] = btBroadphaseBenchmark::UnitRand() * 50;
+			po->center[1] = btBroadphaseBenchmark::UnitRand() * 50;
+			po->center[2] = btBroadphaseBenchmark::UnitRand() * 50;
+			po->extents[0] = btBroadphaseBenchmark::UnitRand() * 2 + 2;
+			po->extents[1] = btBroadphaseBenchmark::UnitRand() * 2 + 2;
+			po->extents[2] = btBroadphaseBenchmark::UnitRand() * 2 + 2;
+			po->time = btBroadphaseBenchmark::UnitRand() * 2000;
+			po->proxy = pbi->createProxy(po->center - po->extents, po->center + po->extents, 0, po, 1, 1, 0, 0);
+			objects.push_back(po);
+		}
+		btBroadphaseBenchmark::OutputTime("\tInitialization", wallclock);
+		/* First update		*/
+		wallclock.reset();
+		for (int i = 0; i < objects.size(); ++i)
+		{
+			objects[i]->update(speed, amplitude, pbi);
+		}
+		btBroadphaseBenchmark::OutputTime("\tFirst update", wallclock);
+		/* Updates			*/
+		wallclock.reset();
+		for (int i = 0; i < experiment.iterations; ++i)
+		{
+			for (int j = 0; j < update_count; ++j)
+			{
+				objects[j]->update(speed, amplitude, pbi);
+			}
+			pbi->calculateOverlappingPairs(0);
+		}
+		btBroadphaseBenchmark::OutputTime("\tUpdate", wallclock, experiment.iterations);
+		/* Clean up			*/
+		wallclock.reset();
+		for (int i = 0; i < objects.size(); ++i)
+		{
+			pbi->destroyProxy(objects[i]->proxy, 0);
+			delete objects[i];
+		}
+		objects.resize(0);
+		btBroadphaseBenchmark::OutputTime("\tRelease", wallclock);
+	}
+}
+#else
+void btDbvtBroadphase::benchmark(btBroadphaseInterface*)
+{
+}
+#endif
+
+#if DBVT_BP_PROFILE
+#undef SPC
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
new file mode 100644
index 0000000..a71feef
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
@@ -0,0 +1,146 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///btDbvtBroadphase implementation by Nathanael Presson
+#ifndef BT_DBVT_BROADPHASE_H
+#define BT_DBVT_BROADPHASE_H
+
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+
+//
+// Compile time config
+//
+
+#define DBVT_BP_PROFILE 0
+//#define DBVT_BP_SORTPAIRS				1
+#define DBVT_BP_PREVENTFALSEUPDATE 0
+#define DBVT_BP_ACCURATESLEEPING 0
+#define DBVT_BP_ENABLE_BENCHMARK 0
+//#define DBVT_BP_MARGIN					(btScalar)0.05
+extern btScalar gDbvtMargin;
+
+#if DBVT_BP_PROFILE
+#define DBVT_BP_PROFILING_RATE 256
+#include "LinearMath/btQuickprof.h"
+#endif
+
+//
+// btDbvtProxy
+//
+struct btDbvtProxy : btBroadphaseProxy
+{
+	/* Fields		*/
+	//btDbvtAabbMm	aabb;
+	btDbvtNode* leaf;
+	btDbvtProxy* links[2];
+	int stage;
+	/* ctor			*/
+	btDbvtProxy(const btVector3& aabbMin, const btVector3& aabbMax, void* userPtr, int collisionFilterGroup, int collisionFilterMask) : btBroadphaseProxy(aabbMin, aabbMax, userPtr, collisionFilterGroup, collisionFilterMask)
+	{
+		links[0] = links[1] = 0;
+	}
+};
+
+typedef btAlignedObjectArray<btDbvtProxy*> btDbvtProxyArray;
+
+///The btDbvtBroadphase implements a broadphase using two dynamic AABB bounding volume hierarchies/trees (see btDbvt).
+///One tree is used for static/non-moving objects, and another tree is used for dynamic objects. Objects can move from one tree to the other.
+///This is a very fast broadphase, especially for very dynamic worlds where many objects are moving. Its insert/add and remove of objects is generally faster than the sweep and prune broadphases btAxisSweep3 and bt32BitAxisSweep3.
+struct btDbvtBroadphase : btBroadphaseInterface
+{
+	/* Config		*/
+	enum
+	{
+		DYNAMIC_SET = 0, /* Dynamic set index	*/
+		FIXED_SET = 1,   /* Fixed set index		*/
+		STAGECOUNT = 2   /* Number of stages		*/
+	};
+	/* Fields		*/
+	btDbvt m_sets[2];                           // Dbvt sets
+	btDbvtProxy* m_stageRoots[STAGECOUNT + 1];  // Stages list
+	btOverlappingPairCache* m_paircache;        // Pair cache
+	btScalar m_prediction;                      // Velocity prediction
+	int m_stageCurrent;                         // Current stage
+	int m_fupdates;                             // % of fixed updates per frame
+	int m_dupdates;                             // % of dynamic updates per frame
+	int m_cupdates;                             // % of cleanup updates per frame
+	int m_newpairs;                             // Number of pairs created
+	int m_fixedleft;                            // Fixed optimization left
+	unsigned m_updates_call;                    // Number of updates call
+	unsigned m_updates_done;                    // Number of updates done
+	btScalar m_updates_ratio;                   // m_updates_done/m_updates_call
+	int m_pid;                                  // Parse id
+	int m_cid;                                  // Cleanup index
+	int m_gid;                                  // Gen id
+	bool m_releasepaircache;                    // Release pair cache on delete
+	bool m_deferedcollide;                      // Defere dynamic/static collision to collide call
+	bool m_needcleanup;                         // Need to run cleanup?
+	btAlignedObjectArray<btAlignedObjectArray<const btDbvtNode*> > m_rayTestStacks;
+#if DBVT_BP_PROFILE
+	btClock m_clock;
+	struct
+	{
+		unsigned long m_total;
+		unsigned long m_ddcollide;
+		unsigned long m_fdcollide;
+		unsigned long m_cleanup;
+		unsigned long m_jobcount;
+	} m_profiling;
+#endif
+	/* Methods		*/
+	btDbvtBroadphase(btOverlappingPairCache* paircache = 0);
+	~btDbvtBroadphase();
+	void collide(btDispatcher* dispatcher);
+	void optimize();
+
+	/* btBroadphaseInterface Implementation	*/
+	btBroadphaseProxy* createProxy(const btVector3& aabbMin, const btVector3& aabbMax, int shapeType, void* userPtr, int collisionFilterGroup, int collisionFilterMask, btDispatcher* dispatcher);
+	virtual void destroyProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher);
+	virtual void setAabb(btBroadphaseProxy* proxy, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* dispatcher);
+	virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin = btVector3(0, 0, 0), const btVector3& aabbMax = btVector3(0, 0, 0));
+	virtual void aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback);
+
+	virtual void getAabb(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const;
+	virtual void calculateOverlappingPairs(btDispatcher* dispatcher);
+	virtual btOverlappingPairCache* getOverlappingPairCache();
+	virtual const btOverlappingPairCache* getOverlappingPairCache() const;
+	virtual void getBroadphaseAabb(btVector3& aabbMin, btVector3& aabbMax) const;
+	virtual void printStats();
+
+	///reset broadphase internal structures, to ensure determinism/reproducability
+	virtual void resetPool(btDispatcher* dispatcher);
+
+	void performDeferredRemoval(btDispatcher* dispatcher);
+
+	void setVelocityPrediction(btScalar prediction)
+	{
+		m_prediction = prediction;
+	}
+	btScalar getVelocityPrediction() const
+	{
+		return m_prediction;
+	}
+
+	///this setAabbForceUpdate is similar to setAabb but always forces the aabb update.
+	///it is not part of the btBroadphaseInterface but specific to btDbvtBroadphase.
+	///it bypasses certain optimizations that prevent aabb updates (when the aabb shrinks), see
+	///http://code.google.com/p/bullet/issues/detail?id=223
+	void setAabbForceUpdate(btBroadphaseProxy* absproxy, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* /*dispatcher*/);
+
+	static void benchmark(btBroadphaseInterface*);
+};
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp
new file mode 100644
index 0000000..e71cb7d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp
@@ -0,0 +1,20 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btDispatcher.h"
+
+btDispatcher::~btDispatcher()
+{
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.h
new file mode 100644
index 0000000..d59441c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btDispatcher.h
@@ -0,0 +1,110 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_DISPATCHER_H
+#define BT_DISPATCHER_H
+#include "LinearMath/btScalar.h"
+
+class btCollisionAlgorithm;
+struct btBroadphaseProxy;
+class btRigidBody;
+class btCollisionObject;
+class btOverlappingPairCache;
+struct btCollisionObjectWrapper;
+
+class btPersistentManifold;
+class btPoolAllocator;
+
+struct btDispatcherInfo
+{
+	enum DispatchFunc
+	{
+		DISPATCH_DISCRETE = 1,
+		DISPATCH_CONTINUOUS
+	};
+	btDispatcherInfo()
+		: m_timeStep(btScalar(0.)),
+		  m_stepCount(0),
+		  m_dispatchFunc(DISPATCH_DISCRETE),
+		  m_timeOfImpact(btScalar(1.)),
+		  m_useContinuous(true),
+		  m_debugDraw(0),
+		  m_enableSatConvex(false),
+		  m_enableSPU(true),
+		  m_useEpa(true),
+		  m_allowedCcdPenetration(btScalar(0.04)),
+		  m_useConvexConservativeDistanceUtil(false),
+		  m_convexConservativeDistanceThreshold(0.0f),
+		  m_deterministicOverlappingPairs(false)
+	{
+	}
+	btScalar m_timeStep;
+	int m_stepCount;
+	int m_dispatchFunc;
+	mutable btScalar m_timeOfImpact;
+	bool m_useContinuous;
+	class btIDebugDraw* m_debugDraw;
+	bool m_enableSatConvex;
+	bool m_enableSPU;
+	bool m_useEpa;
+	btScalar m_allowedCcdPenetration;
+	bool m_useConvexConservativeDistanceUtil;
+	btScalar m_convexConservativeDistanceThreshold;
+	bool m_deterministicOverlappingPairs;
+};
+
+enum ebtDispatcherQueryType
+{
+	BT_CONTACT_POINT_ALGORITHMS = 1,
+	BT_CLOSEST_POINT_ALGORITHMS = 2
+};
+
+///The btDispatcher interface class can be used in combination with broadphase to dispatch calculations for overlapping pairs.
+///For example for pairwise collision detection, calculating contact points stored in btPersistentManifold or user callbacks (game logic).
+class btDispatcher
+{
+public:
+	virtual ~btDispatcher();
+
+	virtual btCollisionAlgorithm* findAlgorithm(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, btPersistentManifold* sharedManifold, ebtDispatcherQueryType queryType) = 0;
+
+	virtual btPersistentManifold* getNewManifold(const btCollisionObject* b0, const btCollisionObject* b1) = 0;
+
+	virtual void releaseManifold(btPersistentManifold* manifold) = 0;
+
+	virtual void clearManifold(btPersistentManifold* manifold) = 0;
+
+	virtual bool needsCollision(const btCollisionObject* body0, const btCollisionObject* body1) = 0;
+
+	virtual bool needsResponse(const btCollisionObject* body0, const btCollisionObject* body1) = 0;
+
+	virtual void dispatchAllCollisionPairs(btOverlappingPairCache* pairCache, const btDispatcherInfo& dispatchInfo, btDispatcher* dispatcher) = 0;
+
+	virtual int getNumManifolds() const = 0;
+
+	virtual btPersistentManifold* getManifoldByIndexInternal(int index) = 0;
+
+	virtual btPersistentManifold** getInternalManifoldPointer() = 0;
+
+	virtual btPoolAllocator* getInternalManifoldPool() = 0;
+
+	virtual const btPoolAllocator* getInternalManifoldPool() const = 0;
+
+	virtual void* allocateCollisionAlgorithm(int size) = 0;
+
+	virtual void freeCollisionAlgorithm(void* ptr) = 0;
+};
+
+#endif  //BT_DISPATCHER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
new file mode 100644
index 0000000..fb36acd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
@@ -0,0 +1,611 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btOverlappingPairCache.h"
+
+#include "btDispatcher.h"
+#include "btCollisionAlgorithm.h"
+#include "LinearMath/btAabbUtil2.h"
+
+#include <stdio.h>
+
+btHashedOverlappingPairCache::btHashedOverlappingPairCache() : m_overlapFilterCallback(0),
+															   m_ghostPairCallback(0)
+{
+	int initialAllocatedSize = 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+	growTables();
+}
+
+btHashedOverlappingPairCache::~btHashedOverlappingPairCache()
+{
+}
+
+void btHashedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair, btDispatcher* dispatcher)
+{
+	if (pair.m_algorithm && dispatcher)
+	{
+		{
+			pair.m_algorithm->~btCollisionAlgorithm();
+			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
+			pair.m_algorithm = 0;
+		}
+	}
+}
+
+void btHashedOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy, btDispatcher* dispatcher)
+{
+	class CleanPairCallback : public btOverlapCallback
+	{
+		btBroadphaseProxy* m_cleanProxy;
+		btOverlappingPairCache* m_pairCache;
+		btDispatcher* m_dispatcher;
+
+	public:
+		CleanPairCallback(btBroadphaseProxy* cleanProxy, btOverlappingPairCache* pairCache, btDispatcher* dispatcher)
+			: m_cleanProxy(cleanProxy),
+			  m_pairCache(pairCache),
+			  m_dispatcher(dispatcher)
+		{
+		}
+		virtual bool processOverlap(btBroadphasePair& pair)
+		{
+			if ((pair.m_pProxy0 == m_cleanProxy) ||
+				(pair.m_pProxy1 == m_cleanProxy))
+			{
+				m_pairCache->cleanOverlappingPair(pair, m_dispatcher);
+			}
+			return false;
+		}
+	};
+
+	CleanPairCallback cleanPairs(proxy, this, dispatcher);
+
+	processAllOverlappingPairs(&cleanPairs, dispatcher);
+}
+
+void btHashedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher)
+{
+	class RemovePairCallback : public btOverlapCallback
+	{
+		btBroadphaseProxy* m_obsoleteProxy;
+
+	public:
+		RemovePairCallback(btBroadphaseProxy* obsoleteProxy)
+			: m_obsoleteProxy(obsoleteProxy)
+		{
+		}
+		virtual bool processOverlap(btBroadphasePair& pair)
+		{
+			return ((pair.m_pProxy0 == m_obsoleteProxy) ||
+					(pair.m_pProxy1 == m_obsoleteProxy));
+		}
+	};
+
+	RemovePairCallback removeCallback(proxy);
+
+	processAllOverlappingPairs(&removeCallback, dispatcher);
+}
+
+btBroadphasePair* btHashedOverlappingPairCache::findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	if (proxy0->m_uniqueId > proxy1->m_uniqueId)
+		btSwap(proxy0, proxy1);
+	int proxyId1 = proxy0->getUid();
+	int proxyId2 = proxy1->getUid();
+
+	/*if (proxyId1 > proxyId2)
+		btSwap(proxyId1, proxyId2);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));
+
+	if (hash >= m_hashTable.size())
+	{
+		return NULL;
+	}
+
+	int index = m_hashTable[hash];
+	while (index != BT_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
+	{
+		index = m_next[index];
+	}
+
+	if (index == BT_NULL_PAIR)
+	{
+		return NULL;
+	}
+
+	btAssert(index < m_overlappingPairArray.size());
+
+	return &m_overlappingPairArray[index];
+}
+
+//#include <stdio.h>
+
+void btHashedOverlappingPairCache::growTables()
+{
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (m_hashTable.size() < newCapacity)
+	{
+		//grow hashtable and next table
+		int curHashtableSize = m_hashTable.size();
+
+		m_hashTable.resize(newCapacity);
+		m_next.resize(newCapacity);
+
+		int i;
+
+		for (i = 0; i < newCapacity; ++i)
+		{
+			m_hashTable[i] = BT_NULL_PAIR;
+		}
+		for (i = 0; i < newCapacity; ++i)
+		{
+			m_next[i] = BT_NULL_PAIR;
+		}
+
+		for (i = 0; i < curHashtableSize; i++)
+		{
+			const btBroadphasePair& pair = m_overlappingPairArray[i];
+			int proxyId1 = pair.m_pProxy0->getUid();
+			int proxyId2 = pair.m_pProxy1->getUid();
+			/*if (proxyId1 > proxyId2) 
+				btSwap(proxyId1, proxyId2);*/
+			int hashValue = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));  // New hash value with new mask
+			m_next[i] = m_hashTable[hashValue];
+			m_hashTable[hashValue] = i;
+		}
+	}
+}
+
+btBroadphasePair* btHashedOverlappingPairCache::internalAddPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	if (proxy0->m_uniqueId > proxy1->m_uniqueId)
+		btSwap(proxy0, proxy1);
+	int proxyId1 = proxy0->getUid();
+	int proxyId2 = proxy1->getUid();
+
+	/*if (proxyId1 > proxyId2) 
+		btSwap(proxyId1, proxyId2);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));  // New hash value with new mask
+
+	btBroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
+	if (pair != NULL)
+	{
+		return pair;
+	}
+	/*for(int i=0;i<m_overlappingPairArray.size();++i)
+		{
+		if(	(m_overlappingPairArray[i].m_pProxy0==proxy0)&&
+			(m_overlappingPairArray[i].m_pProxy1==proxy1))
+			{
+			printf("Adding duplicated %u<>%u\r\n",proxyId1,proxyId2);
+			internalFindPair(proxy0, proxy1, hash);
+			}
+		}*/
+	int count = m_overlappingPairArray.size();
+	int oldCapacity = m_overlappingPairArray.capacity();
+	void* mem = &m_overlappingPairArray.expandNonInitializing();
+
+	//this is where we add an actual pair, so also call the 'ghost'
+	if (m_ghostPairCallback)
+		m_ghostPairCallback->addOverlappingPair(proxy0, proxy1);
+
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (oldCapacity < newCapacity)
+	{
+		growTables();
+		//hash with new capacity
+		hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));
+	}
+
+	pair = new (mem) btBroadphasePair(*proxy0, *proxy1);
+	//	pair->m_pProxy0 = proxy0;
+	//	pair->m_pProxy1 = proxy1;
+	pair->m_algorithm = 0;
+	pair->m_internalTmpValue = 0;
+
+	m_next[count] = m_hashTable[hash];
+	m_hashTable[hash] = count;
+
+	return pair;
+}
+
+void* btHashedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1, btDispatcher* dispatcher)
+{
+	if (proxy0->m_uniqueId > proxy1->m_uniqueId)
+		btSwap(proxy0, proxy1);
+	int proxyId1 = proxy0->getUid();
+	int proxyId2 = proxy1->getUid();
+
+	/*if (proxyId1 > proxyId2)
+		btSwap(proxyId1, proxyId2);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity() - 1));
+
+	btBroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
+	if (pair == NULL)
+	{
+		return 0;
+	}
+
+	cleanOverlappingPair(*pair, dispatcher);
+
+	void* userData = pair->m_internalInfo1;
+
+	btAssert(pair->m_pProxy0->getUid() == proxyId1);
+	btAssert(pair->m_pProxy1->getUid() == proxyId2);
+
+	int pairIndex = int(pair - &m_overlappingPairArray[0]);
+	btAssert(pairIndex < m_overlappingPairArray.size());
+
+	// Remove the pair from the hash table.
+	int index = m_hashTable[hash];
+	btAssert(index != BT_NULL_PAIR);
+
+	int previous = BT_NULL_PAIR;
+	while (index != pairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != BT_NULL_PAIR)
+	{
+		btAssert(m_next[previous] == pairIndex);
+		m_next[previous] = m_next[pairIndex];
+	}
+	else
+	{
+		m_hashTable[hash] = m_next[pairIndex];
+	}
+
+	// We now move the last pair into spot of the
+	// pair being removed. We need to fix the hash
+	// table indices to support the move.
+
+	int lastPairIndex = m_overlappingPairArray.size() - 1;
+
+	if (m_ghostPairCallback)
+		m_ghostPairCallback->removeOverlappingPair(proxy0, proxy1, dispatcher);
+
+	// If the removed pair is the last pair, we are done.
+	if (lastPairIndex == pairIndex)
+	{
+		m_overlappingPairArray.pop_back();
+		return userData;
+	}
+
+	// Remove the last pair from the hash table.
+	const btBroadphasePair* last = &m_overlappingPairArray[lastPairIndex];
+	/* missing swap here too, Nat. */
+	int lastHash = static_cast<int>(getHash(static_cast<unsigned int>(last->m_pProxy0->getUid()), static_cast<unsigned int>(last->m_pProxy1->getUid())) & (m_overlappingPairArray.capacity() - 1));
+
+	index = m_hashTable[lastHash];
+	btAssert(index != BT_NULL_PAIR);
+
+	previous = BT_NULL_PAIR;
+	while (index != lastPairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != BT_NULL_PAIR)
+	{
+		btAssert(m_next[previous] == lastPairIndex);
+		m_next[previous] = m_next[lastPairIndex];
+	}
+	else
+	{
+		m_hashTable[lastHash] = m_next[lastPairIndex];
+	}
+
+	// Copy the last pair into the remove pair's spot.
+	m_overlappingPairArray[pairIndex] = m_overlappingPairArray[lastPairIndex];
+
+	// Insert the last pair into the hash table
+	m_next[pairIndex] = m_hashTable[lastHash];
+	m_hashTable[lastHash] = pairIndex;
+
+	m_overlappingPairArray.pop_back();
+
+	return userData;
+}
+//#include <stdio.h>
+#include "LinearMath/btQuickprof.h"
+void btHashedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback, btDispatcher* dispatcher)
+{
+	BT_PROFILE("btHashedOverlappingPairCache::processAllOverlappingPairs");
+	int i;
+
+	//	printf("m_overlappingPairArray.size()=%d\n",m_overlappingPairArray.size());
+	for (i = 0; i < m_overlappingPairArray.size();)
+	{
+		btBroadphasePair* pair = &m_overlappingPairArray[i];
+		if (callback->processOverlap(*pair))
+		{
+			removeOverlappingPair(pair->m_pProxy0, pair->m_pProxy1, dispatcher);
+		}
+		else
+		{
+			i++;
+		}
+	}
+}
+
+struct MyPairIndex
+{
+	int m_orgIndex;
+	int m_uidA0;
+	int m_uidA1;
+};
+
+class MyPairIndeSortPredicate
+{
+public:
+	bool operator()(const MyPairIndex& a, const MyPairIndex& b) const
+	{
+		const int uidA0 = a.m_uidA0;
+		const int uidB0 = b.m_uidA0;
+		const int uidA1 = a.m_uidA1;
+		const int uidB1 = b.m_uidA1;
+		return uidA0 > uidB0 || (uidA0 == uidB0 && uidA1 > uidB1);
+	}
+};
+
+void btHashedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback, btDispatcher* dispatcher, const struct btDispatcherInfo& dispatchInfo)
+{
+	if (dispatchInfo.m_deterministicOverlappingPairs)
+	{
+		btBroadphasePairArray& pa = getOverlappingPairArray();
+		btAlignedObjectArray<MyPairIndex> indices;
+		{
+			BT_PROFILE("sortOverlappingPairs");
+			indices.resize(pa.size());
+			for (int i = 0; i < indices.size(); i++)
+			{
+				const btBroadphasePair& p = pa[i];
+				const int uidA0 = p.m_pProxy0 ? p.m_pProxy0->m_uniqueId : -1;
+				const int uidA1 = p.m_pProxy1 ? p.m_pProxy1->m_uniqueId : -1;
+
+				indices[i].m_uidA0 = uidA0;
+				indices[i].m_uidA1 = uidA1;
+				indices[i].m_orgIndex = i;
+			}
+			indices.quickSort(MyPairIndeSortPredicate());
+		}
+		{
+			BT_PROFILE("btHashedOverlappingPairCache::processAllOverlappingPairs");
+			int i;
+			for (i = 0; i < indices.size();)
+			{
+				btBroadphasePair* pair = &pa[indices[i].m_orgIndex];
+				if (callback->processOverlap(*pair))
+				{
+					removeOverlappingPair(pair->m_pProxy0, pair->m_pProxy1, dispatcher);
+				}
+				else
+				{
+					i++;
+				}
+			}
+		}
+	}
+	else
+	{
+		processAllOverlappingPairs(callback, dispatcher);
+	}
+}
+
+void btHashedOverlappingPairCache::sortOverlappingPairs(btDispatcher* dispatcher)
+{
+	///need to keep hashmap in sync with pair address, so rebuild all
+	btBroadphasePairArray tmpPairs;
+	int i;
+	for (i = 0; i < m_overlappingPairArray.size(); i++)
+	{
+		tmpPairs.push_back(m_overlappingPairArray[i]);
+	}
+
+	for (i = 0; i < tmpPairs.size(); i++)
+	{
+		removeOverlappingPair(tmpPairs[i].m_pProxy0, tmpPairs[i].m_pProxy1, dispatcher);
+	}
+
+	for (i = 0; i < m_next.size(); i++)
+	{
+		m_next[i] = BT_NULL_PAIR;
+	}
+
+	tmpPairs.quickSort(btBroadphasePairSortPredicate());
+
+	for (i = 0; i < tmpPairs.size(); i++)
+	{
+		addOverlappingPair(tmpPairs[i].m_pProxy0, tmpPairs[i].m_pProxy1);
+	}
+}
+
+void* btSortedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1, btDispatcher* dispatcher)
+{
+	if (!hasDeferredRemoval())
+	{
+		btBroadphasePair findPair(*proxy0, *proxy1);
+
+		int findIndex = m_overlappingPairArray.findLinearSearch(findPair);
+		if (findIndex < m_overlappingPairArray.size())
+		{
+			btBroadphasePair& pair = m_overlappingPairArray[findIndex];
+			void* userData = pair.m_internalInfo1;
+			cleanOverlappingPair(pair, dispatcher);
+			if (m_ghostPairCallback)
+				m_ghostPairCallback->removeOverlappingPair(proxy0, proxy1, dispatcher);
+
+			m_overlappingPairArray.swap(findIndex, m_overlappingPairArray.capacity() - 1);
+			m_overlappingPairArray.pop_back();
+			return userData;
+		}
+	}
+
+	return 0;
+}
+
+btBroadphasePair* btSortedOverlappingPairCache::addOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	//don't add overlap with own
+	btAssert(proxy0 != proxy1);
+
+	if (!needsBroadphaseCollision(proxy0, proxy1))
+		return 0;
+
+	void* mem = &m_overlappingPairArray.expandNonInitializing();
+	btBroadphasePair* pair = new (mem) btBroadphasePair(*proxy0, *proxy1);
+
+	if (m_ghostPairCallback)
+		m_ghostPairCallback->addOverlappingPair(proxy0, proxy1);
+	return pair;
+}
+
+///this findPair becomes really slow. Either sort the list to speedup the query, or
+///use a different solution. It is mainly used for Removing overlapping pairs. Removal could be delayed.
+///we could keep a linked list in each proxy, and store pair in one of the proxies (with lowest memory address)
+///Also we can use a 2D bitmap, which can be useful for a future GPU implementation
+btBroadphasePair* btSortedOverlappingPairCache::findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	if (!needsBroadphaseCollision(proxy0, proxy1))
+		return 0;
+
+	btBroadphasePair tmpPair(*proxy0, *proxy1);
+	int findIndex = m_overlappingPairArray.findLinearSearch(tmpPair);
+
+	if (findIndex < m_overlappingPairArray.size())
+	{
+		//btAssert(it != m_overlappingPairSet.end());
+		btBroadphasePair* pair = &m_overlappingPairArray[findIndex];
+		return pair;
+	}
+	return 0;
+}
+
+//#include <stdio.h>
+
+void btSortedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback, btDispatcher* dispatcher)
+{
+	int i;
+
+	for (i = 0; i < m_overlappingPairArray.size();)
+	{
+		btBroadphasePair* pair = &m_overlappingPairArray[i];
+		if (callback->processOverlap(*pair))
+		{
+			cleanOverlappingPair(*pair, dispatcher);
+			pair->m_pProxy0 = 0;
+			pair->m_pProxy1 = 0;
+			m_overlappingPairArray.swap(i, m_overlappingPairArray.size() - 1);
+			m_overlappingPairArray.pop_back();
+		}
+		else
+		{
+			i++;
+		}
+	}
+}
+
+btSortedOverlappingPairCache::btSortedOverlappingPairCache() : m_blockedForChanges(false),
+															   m_hasDeferredRemoval(true),
+															   m_overlapFilterCallback(0),
+															   m_ghostPairCallback(0)
+{
+	int initialAllocatedSize = 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+}
+
+btSortedOverlappingPairCache::~btSortedOverlappingPairCache()
+{
+}
+
+void btSortedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair, btDispatcher* dispatcher)
+{
+	if (pair.m_algorithm)
+	{
+		{
+			pair.m_algorithm->~btCollisionAlgorithm();
+			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
+			pair.m_algorithm = 0;
+		}
+	}
+}
+
+void btSortedOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy, btDispatcher* dispatcher)
+{
+	class CleanPairCallback : public btOverlapCallback
+	{
+		btBroadphaseProxy* m_cleanProxy;
+		btOverlappingPairCache* m_pairCache;
+		btDispatcher* m_dispatcher;
+
+	public:
+		CleanPairCallback(btBroadphaseProxy* cleanProxy, btOverlappingPairCache* pairCache, btDispatcher* dispatcher)
+			: m_cleanProxy(cleanProxy),
+			  m_pairCache(pairCache),
+			  m_dispatcher(dispatcher)
+		{
+		}
+		virtual bool processOverlap(btBroadphasePair& pair)
+		{
+			if ((pair.m_pProxy0 == m_cleanProxy) ||
+				(pair.m_pProxy1 == m_cleanProxy))
+			{
+				m_pairCache->cleanOverlappingPair(pair, m_dispatcher);
+			}
+			return false;
+		}
+	};
+
+	CleanPairCallback cleanPairs(proxy, this, dispatcher);
+
+	processAllOverlappingPairs(&cleanPairs, dispatcher);
+}
+
+void btSortedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher)
+{
+	class RemovePairCallback : public btOverlapCallback
+	{
+		btBroadphaseProxy* m_obsoleteProxy;
+
+	public:
+		RemovePairCallback(btBroadphaseProxy* obsoleteProxy)
+			: m_obsoleteProxy(obsoleteProxy)
+		{
+		}
+		virtual bool processOverlap(btBroadphasePair& pair)
+		{
+			return ((pair.m_pProxy0 == m_obsoleteProxy) ||
+					(pair.m_pProxy1 == m_obsoleteProxy));
+		}
+	};
+
+	RemovePairCallback removeCallback(proxy);
+
+	processAllOverlappingPairs(&removeCallback, dispatcher);
+}
+
+void btSortedOverlappingPairCache::sortOverlappingPairs(btDispatcher* dispatcher)
+{
+	//should already be sorted
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
new file mode 100644
index 0000000..1d82726
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
@@ -0,0 +1,434 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_OVERLAPPING_PAIR_CACHE_H
+#define BT_OVERLAPPING_PAIR_CACHE_H
+
+#include "btBroadphaseInterface.h"
+#include "btBroadphaseProxy.h"
+#include "btOverlappingPairCallback.h"
+
+#include "LinearMath/btAlignedObjectArray.h"
+class btDispatcher;
+
+typedef btAlignedObjectArray<btBroadphasePair> btBroadphasePairArray;
+
+struct btOverlapCallback
+{
+	virtual ~btOverlapCallback()
+	{
+	}
+	//return true for deletion of the pair
+	virtual bool processOverlap(btBroadphasePair& pair) = 0;
+};
+
+struct btOverlapFilterCallback
+{
+	virtual ~btOverlapFilterCallback()
+	{
+	}
+	// return true when pairs need collision
+	virtual bool needBroadphaseCollision(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1) const = 0;
+};
+
+const int BT_NULL_PAIR = 0xffffffff;
+
+///The btOverlappingPairCache provides an interface for overlapping pair management (add, remove, storage), used by the btBroadphaseInterface broadphases.
+///The btHashedOverlappingPairCache and btSortedOverlappingPairCache classes are two implementations.
+class btOverlappingPairCache : public btOverlappingPairCallback
+{
+public:
+	virtual ~btOverlappingPairCache() {}  // this is needed so we can get to the derived class destructor
+
+	virtual btBroadphasePair* getOverlappingPairArrayPtr() = 0;
+
+	virtual const btBroadphasePair* getOverlappingPairArrayPtr() const = 0;
+
+	virtual btBroadphasePairArray& getOverlappingPairArray() = 0;
+
+	virtual void cleanOverlappingPair(btBroadphasePair& pair, btDispatcher* dispatcher) = 0;
+
+	virtual int getNumOverlappingPairs() const = 0;
+	virtual bool needsBroadphaseCollision(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1) const = 0;
+	virtual btOverlapFilterCallback* getOverlapFilterCallback() = 0;
+	virtual void cleanProxyFromPairs(btBroadphaseProxy* proxy, btDispatcher* dispatcher) = 0;
+
+	virtual void setOverlapFilterCallback(btOverlapFilterCallback* callback) = 0;
+
+	virtual void processAllOverlappingPairs(btOverlapCallback*, btDispatcher* dispatcher) = 0;
+
+	virtual void processAllOverlappingPairs(btOverlapCallback* callback, btDispatcher* dispatcher, const struct btDispatcherInfo& /*dispatchInfo*/)
+	{
+		processAllOverlappingPairs(callback, dispatcher);
+	}
+	virtual btBroadphasePair* findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1) = 0;
+
+	virtual bool hasDeferredRemoval() = 0;
+
+	virtual void setInternalGhostPairCallback(btOverlappingPairCallback* ghostPairCallback) = 0;
+
+	virtual void sortOverlappingPairs(btDispatcher* dispatcher) = 0;
+};
+
+/// Hash-space based Pair Cache, thanks to Erin Catto, Box2D, http://www.box2d.org, and Pierre Terdiman, Codercorner, http://codercorner.com
+
+ATTRIBUTE_ALIGNED16(class)
+btHashedOverlappingPairCache : public btOverlappingPairCache
+{
+	btBroadphasePairArray m_overlappingPairArray;
+	btOverlapFilterCallback* m_overlapFilterCallback;
+
+protected:
+	btAlignedObjectArray<int> m_hashTable;
+	btAlignedObjectArray<int> m_next;
+	btOverlappingPairCallback* m_ghostPairCallback;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btHashedOverlappingPairCache();
+	virtual ~btHashedOverlappingPairCache();
+
+	void removeOverlappingPairsContainingProxy(btBroadphaseProxy * proxy, btDispatcher * dispatcher);
+
+	virtual void* removeOverlappingPair(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1, btDispatcher * dispatcher);
+
+	SIMD_FORCE_INLINE bool needsBroadphaseCollision(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1) const
+	{
+		if (m_overlapFilterCallback)
+			return m_overlapFilterCallback->needBroadphaseCollision(proxy0, proxy1);
+
+		bool collides = (proxy0->m_collisionFilterGroup & proxy1->m_collisionFilterMask) != 0;
+		collides = collides && (proxy1->m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+
+		return collides;
+	}
+
+	// Add a pair and return the new pair. If the pair already exists,
+	// no new pair is created and the old one is returned.
+	virtual btBroadphasePair* addOverlappingPair(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1)
+	{
+		if (!needsBroadphaseCollision(proxy0, proxy1))
+			return 0;
+
+		return internalAddPair(proxy0, proxy1);
+	}
+
+	void cleanProxyFromPairs(btBroadphaseProxy * proxy, btDispatcher * dispatcher);
+
+	virtual void processAllOverlappingPairs(btOverlapCallback*, btDispatcher * dispatcher);
+
+	virtual void processAllOverlappingPairs(btOverlapCallback * callback, btDispatcher * dispatcher, const struct btDispatcherInfo& dispatchInfo);
+
+	virtual btBroadphasePair* getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	const btBroadphasePair* getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	btBroadphasePairArray& getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	const btBroadphasePairArray& getOverlappingPairArray() const
+	{
+		return m_overlappingPairArray;
+	}
+
+	void cleanOverlappingPair(btBroadphasePair & pair, btDispatcher * dispatcher);
+
+	btBroadphasePair* findPair(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1);
+
+	int GetCount() const { return m_overlappingPairArray.size(); }
+	//	btBroadphasePair* GetPairs() { return m_pairs; }
+
+	btOverlapFilterCallback* getOverlapFilterCallback()
+	{
+		return m_overlapFilterCallback;
+	}
+
+	void setOverlapFilterCallback(btOverlapFilterCallback * callback)
+	{
+		m_overlapFilterCallback = callback;
+	}
+
+	int getNumOverlappingPairs() const
+	{
+		return m_overlappingPairArray.size();
+	}
+
+private:
+	btBroadphasePair* internalAddPair(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1);
+
+	void growTables();
+
+	SIMD_FORCE_INLINE bool equalsPair(const btBroadphasePair& pair, int proxyId1, int proxyId2)
+	{
+		return pair.m_pProxy0->getUid() == proxyId1 && pair.m_pProxy1->getUid() == proxyId2;
+	}
+
+	/*
+	// Thomas Wang's hash, see: http://www.concentric.net/~Ttwang/tech/inthash.htm
+	// This assumes proxyId1 and proxyId2 are 16-bit.
+	SIMD_FORCE_INLINE int getHash(int proxyId1, int proxyId2)
+	{
+		int key = (proxyId2 << 16) | proxyId1;
+		key = ~key + (key << 15);
+		key = key ^ (key >> 12);
+		key = key + (key << 2);
+		key = key ^ (key >> 4);
+		key = key * 2057;
+		key = key ^ (key >> 16);
+		return key;
+	}
+	*/
+
+	SIMD_FORCE_INLINE unsigned int getHash(unsigned int proxyId1, unsigned int proxyId2)
+	{
+		unsigned int key = proxyId1 | (proxyId2 << 16);
+		// Thomas Wang's hash
+
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+
+	SIMD_FORCE_INLINE btBroadphasePair* internalFindPair(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1, int hash)
+	{
+		int proxyId1 = proxy0->getUid();
+		int proxyId2 = proxy1->getUid();
+#if 0  // wrong, 'equalsPair' use unsorted uids, copy-past devil striked again. Nat.
+		if (proxyId1 > proxyId2) 
+			btSwap(proxyId1, proxyId2);
+#endif
+
+		int index = m_hashTable[hash];
+
+		while (index != BT_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
+		{
+			index = m_next[index];
+		}
+
+		if (index == BT_NULL_PAIR)
+		{
+			return NULL;
+		}
+
+		btAssert(index < m_overlappingPairArray.size());
+
+		return &m_overlappingPairArray[index];
+	}
+
+	virtual bool hasDeferredRemoval()
+	{
+		return false;
+	}
+
+	virtual void setInternalGhostPairCallback(btOverlappingPairCallback * ghostPairCallback)
+	{
+		m_ghostPairCallback = ghostPairCallback;
+	}
+
+	virtual void sortOverlappingPairs(btDispatcher * dispatcher);
+};
+
+///btSortedOverlappingPairCache maintains the objects with overlapping AABB
+///Typically managed by the Broadphase, Axis3Sweep or btSimpleBroadphase
+class btSortedOverlappingPairCache : public btOverlappingPairCache
+{
+protected:
+	//avoid brute-force finding all the time
+	btBroadphasePairArray m_overlappingPairArray;
+
+	//during the dispatch, check that user doesn't destroy/create proxy
+	bool m_blockedForChanges;
+
+	///by default, do the removal during the pair traversal
+	bool m_hasDeferredRemoval;
+
+	//if set, use the callback instead of the built in filter in needBroadphaseCollision
+	btOverlapFilterCallback* m_overlapFilterCallback;
+
+	btOverlappingPairCallback* m_ghostPairCallback;
+
+public:
+	btSortedOverlappingPairCache();
+	virtual ~btSortedOverlappingPairCache();
+
+	virtual void processAllOverlappingPairs(btOverlapCallback*, btDispatcher* dispatcher);
+
+	void* removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1, btDispatcher* dispatcher);
+
+	void cleanOverlappingPair(btBroadphasePair& pair, btDispatcher* dispatcher);
+
+	btBroadphasePair* addOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1);
+
+	btBroadphasePair* findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1);
+
+	void cleanProxyFromPairs(btBroadphaseProxy* proxy, btDispatcher* dispatcher);
+
+	void removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher);
+
+	inline bool needsBroadphaseCollision(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1) const
+	{
+		if (m_overlapFilterCallback)
+			return m_overlapFilterCallback->needBroadphaseCollision(proxy0, proxy1);
+
+		bool collides = (proxy0->m_collisionFilterGroup & proxy1->m_collisionFilterMask) != 0;
+		collides = collides && (proxy1->m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+
+		return collides;
+	}
+
+	btBroadphasePairArray& getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	const btBroadphasePairArray& getOverlappingPairArray() const
+	{
+		return m_overlappingPairArray;
+	}
+
+	btBroadphasePair* getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	const btBroadphasePair* getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	int getNumOverlappingPairs() const
+	{
+		return m_overlappingPairArray.size();
+	}
+
+	btOverlapFilterCallback* getOverlapFilterCallback()
+	{
+		return m_overlapFilterCallback;
+	}
+
+	void setOverlapFilterCallback(btOverlapFilterCallback* callback)
+	{
+		m_overlapFilterCallback = callback;
+	}
+
+	virtual bool hasDeferredRemoval()
+	{
+		return m_hasDeferredRemoval;
+	}
+
+	virtual void setInternalGhostPairCallback(btOverlappingPairCallback* ghostPairCallback)
+	{
+		m_ghostPairCallback = ghostPairCallback;
+	}
+
+	virtual void sortOverlappingPairs(btDispatcher* dispatcher);
+};
+
+///btNullPairCache skips add/removal of overlapping pairs. Userful for benchmarking and unit testing.
+class btNullPairCache : public btOverlappingPairCache
+{
+	btBroadphasePairArray m_overlappingPairArray;
+
+public:
+	virtual btBroadphasePair* getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+	const btBroadphasePair* getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+	btBroadphasePairArray& getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	virtual void cleanOverlappingPair(btBroadphasePair& /*pair*/, btDispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual int getNumOverlappingPairs() const
+	{
+		return 0;
+	}
+
+	virtual void cleanProxyFromPairs(btBroadphaseProxy* /*proxy*/, btDispatcher* /*dispatcher*/)
+	{
+	}
+
+	bool needsBroadphaseCollision(btBroadphaseProxy*, btBroadphaseProxy*) const
+	{
+		return true;
+	}
+	btOverlapFilterCallback* getOverlapFilterCallback()
+	{
+		return 0;
+	}
+	virtual void setOverlapFilterCallback(btOverlapFilterCallback* /*callback*/)
+	{
+	}
+
+	virtual void processAllOverlappingPairs(btOverlapCallback*, btDispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual btBroadphasePair* findPair(btBroadphaseProxy* /*proxy0*/, btBroadphaseProxy* /*proxy1*/)
+	{
+		return 0;
+	}
+
+	virtual bool hasDeferredRemoval()
+	{
+		return true;
+	}
+
+	virtual void setInternalGhostPairCallback(btOverlappingPairCallback* /* ghostPairCallback */)
+	{
+	}
+
+	virtual btBroadphasePair* addOverlappingPair(btBroadphaseProxy* /*proxy0*/, btBroadphaseProxy* /*proxy1*/)
+	{
+		return 0;
+	}
+
+	virtual void* removeOverlappingPair(btBroadphaseProxy* /*proxy0*/, btBroadphaseProxy* /*proxy1*/, btDispatcher* /*dispatcher*/)
+	{
+		return 0;
+	}
+
+	virtual void removeOverlappingPairsContainingProxy(btBroadphaseProxy* /*proxy0*/, btDispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual void sortOverlappingPairs(btDispatcher* dispatcher)
+	{
+		(void)dispatcher;
+	}
+};
+
+#endif  //BT_OVERLAPPING_PAIR_CACHE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
new file mode 100644
index 0000000..36e5068
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
@@ -0,0 +1,41 @@
+
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef OVERLAPPING_PAIR_CALLBACK_H
+#define OVERLAPPING_PAIR_CALLBACK_H
+
+class btDispatcher;
+struct btBroadphasePair;
+
+///The btOverlappingPairCallback class is an additional optional broadphase user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
+class btOverlappingPairCallback
+{
+protected:
+	btOverlappingPairCallback() {}
+
+public:
+	virtual ~btOverlappingPairCallback()
+	{
+	}
+
+	virtual btBroadphasePair* addOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1) = 0;
+
+	virtual void* removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1, btDispatcher* dispatcher) = 0;
+
+	virtual void removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy0, btDispatcher* dispatcher) = 0;
+};
+
+#endif  //OVERLAPPING_PAIR_CALLBACK_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
new file mode 100644
index 0000000..e23610e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
@@ -0,0 +1,1341 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btQuantizedBvh.h"
+
+#include "LinearMath/btAabbUtil2.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btSerializer.h"
+
+#define RAYAABB2
+
+btQuantizedBvh::btQuantizedBvh() : m_bulletVersion(BT_BULLET_VERSION),
+								   m_useQuantization(false),
+								   //m_traversalMode(TRAVERSAL_STACKLESS_CACHE_FRIENDLY)
+								   m_traversalMode(TRAVERSAL_STACKLESS)
+								   //m_traversalMode(TRAVERSAL_RECURSIVE)
+								   ,
+								   m_subtreeHeaderCount(0)  //PCK: add this line
+{
+	m_bvhAabbMin.setValue(-SIMD_INFINITY, -SIMD_INFINITY, -SIMD_INFINITY);
+	m_bvhAabbMax.setValue(SIMD_INFINITY, SIMD_INFINITY, SIMD_INFINITY);
+}
+
+void btQuantizedBvh::buildInternal()
+{
+	///assumes that caller filled in the m_quantizedLeafNodes
+	m_useQuantization = true;
+	int numLeafNodes = 0;
+
+	if (m_useQuantization)
+	{
+		//now we have an array of leafnodes in m_leafNodes
+		numLeafNodes = m_quantizedLeafNodes.size();
+
+		m_quantizedContiguousNodes.resize(2 * numLeafNodes);
+	}
+
+	m_curNodeIndex = 0;
+
+	buildTree(0, numLeafNodes);
+
+	///if the entire tree is small then subtree size, we need to create a header info for the tree
+	if (m_useQuantization && !m_SubtreeHeaders.size())
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[0]);
+		subtree.m_rootNodeIndex = 0;
+		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
+	m_quantizedLeafNodes.clear();
+	m_leafNodes.clear();
+}
+
+///just for debugging, to visualize the individual patches/subtrees
+#ifdef DEBUG_PATCH_COLORS
+btVector3 color[4] =
+	{
+		btVector3(1, 0, 0),
+		btVector3(0, 1, 0),
+		btVector3(0, 0, 1),
+		btVector3(0, 1, 1)};
+#endif  //DEBUG_PATCH_COLORS
+
+void btQuantizedBvh::setQuantizationValues(const btVector3& bvhAabbMin, const btVector3& bvhAabbMax, btScalar quantizationMargin)
+{
+	//enlarge the AABB to avoid division by zero when initializing the quantization values
+	btVector3 clampValue(quantizationMargin, quantizationMargin, quantizationMargin);
+	m_bvhAabbMin = bvhAabbMin - clampValue;
+	m_bvhAabbMax = bvhAabbMax + clampValue;
+	btVector3 aabbSize = m_bvhAabbMax - m_bvhAabbMin;
+	m_bvhQuantization = btVector3(btScalar(65533.0), btScalar(65533.0), btScalar(65533.0)) / aabbSize;
+
+	m_useQuantization = true;
+
+	{
+		unsigned short vecIn[3];
+		btVector3 v;
+		{
+			quantize(vecIn, m_bvhAabbMin, false);
+			v = unQuantize(vecIn);
+			m_bvhAabbMin.setMin(v - clampValue);
+		}
+		aabbSize = m_bvhAabbMax - m_bvhAabbMin;
+		m_bvhQuantization = btVector3(btScalar(65533.0), btScalar(65533.0), btScalar(65533.0)) / aabbSize;
+		{
+			quantize(vecIn, m_bvhAabbMax, true);
+			v = unQuantize(vecIn);
+			m_bvhAabbMax.setMax(v + clampValue);
+		}
+		aabbSize = m_bvhAabbMax - m_bvhAabbMin;
+		m_bvhQuantization = btVector3(btScalar(65533.0), btScalar(65533.0), btScalar(65533.0)) / aabbSize;
+	}
+}
+
+btQuantizedBvh::~btQuantizedBvh()
+{
+}
+
+#ifdef DEBUG_TREE_BUILDING
+int gStackDepth = 0;
+int gMaxStackDepth = 0;
+#endif  //DEBUG_TREE_BUILDING
+
+void btQuantizedBvh::buildTree(int startIndex, int endIndex)
+{
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth++;
+	if (gStackDepth > gMaxStackDepth)
+		gMaxStackDepth = gStackDepth;
+#endif  //DEBUG_TREE_BUILDING
+
+	int splitAxis, splitIndex, i;
+	int numIndices = endIndex - startIndex;
+	int curIndex = m_curNodeIndex;
+
+	btAssert(numIndices > 0);
+
+	if (numIndices == 1)
+	{
+#ifdef DEBUG_TREE_BUILDING
+		gStackDepth--;
+#endif  //DEBUG_TREE_BUILDING
+
+		assignInternalNodeFromLeafNode(m_curNodeIndex, startIndex);
+
+		m_curNodeIndex++;
+		return;
+	}
+	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+
+	splitAxis = calcSplittingAxis(startIndex, endIndex);
+
+	splitIndex = sortAndCalcSplittingIndex(startIndex, endIndex, splitAxis);
+
+	int internalNodeIndex = m_curNodeIndex;
+
+	//set the min aabb to 'inf' or a max value, and set the max aabb to a -inf/minimum value.
+	//the aabb will be expanded during buildTree/mergeInternalNodeAabb with actual node values
+	setInternalNodeAabbMin(m_curNodeIndex, m_bvhAabbMax);  //can't use btVector3(SIMD_INFINITY,SIMD_INFINITY,SIMD_INFINITY)) because of quantization
+	setInternalNodeAabbMax(m_curNodeIndex, m_bvhAabbMin);  //can't use btVector3(-SIMD_INFINITY,-SIMD_INFINITY,-SIMD_INFINITY)) because of quantization
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		mergeInternalNodeAabb(m_curNodeIndex, getAabbMin(i), getAabbMax(i));
+	}
+
+	m_curNodeIndex++;
+
+	//internalNode->m_escapeIndex;
+
+	int leftChildNodexIndex = m_curNodeIndex;
+
+	//build left child tree
+	buildTree(startIndex, splitIndex);
+
+	int rightChildNodexIndex = m_curNodeIndex;
+	//build right child tree
+	buildTree(splitIndex, endIndex);
+
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth--;
+#endif  //DEBUG_TREE_BUILDING
+
+	int escapeIndex = m_curNodeIndex - curIndex;
+
+	if (m_useQuantization)
+	{
+		//escapeIndex is the number of nodes of this subtree
+		const int sizeQuantizedNode = sizeof(btQuantizedBvhNode);
+		const int treeSizeInBytes = escapeIndex * sizeQuantizedNode;
+		if (treeSizeInBytes > MAX_SUBTREE_SIZE_IN_BYTES)
+		{
+			updateSubtreeHeaders(leftChildNodexIndex, rightChildNodexIndex);
+		}
+	}
+	else
+	{
+	}
+
+	setInternalNodeEscapeIndex(internalNodeIndex, escapeIndex);
+}
+
+void btQuantizedBvh::updateSubtreeHeaders(int leftChildNodexIndex, int rightChildNodexIndex)
+{
+	btAssert(m_useQuantization);
+
+	btQuantizedBvhNode& leftChildNode = m_quantizedContiguousNodes[leftChildNodexIndex];
+	int leftSubTreeSize = leftChildNode.isLeafNode() ? 1 : leftChildNode.getEscapeIndex();
+	int leftSubTreeSizeInBytes = leftSubTreeSize * static_cast<int>(sizeof(btQuantizedBvhNode));
+
+	btQuantizedBvhNode& rightChildNode = m_quantizedContiguousNodes[rightChildNodexIndex];
+	int rightSubTreeSize = rightChildNode.isLeafNode() ? 1 : rightChildNode.getEscapeIndex();
+	int rightSubTreeSizeInBytes = rightSubTreeSize * static_cast<int>(sizeof(btQuantizedBvhNode));
+
+	if (leftSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(leftChildNode);
+		subtree.m_rootNodeIndex = leftChildNodexIndex;
+		subtree.m_subtreeSize = leftSubTreeSize;
+	}
+
+	if (rightSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(rightChildNode);
+		subtree.m_rootNodeIndex = rightChildNodexIndex;
+		subtree.m_subtreeSize = rightSubTreeSize;
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+}
+
+int btQuantizedBvh::sortAndCalcSplittingIndex(int startIndex, int endIndex, int splitAxis)
+{
+	int i;
+	int splitIndex = startIndex;
+	int numIndices = endIndex - startIndex;
+	btScalar splitValue;
+
+	btVector3 means(btScalar(0.), btScalar(0.), btScalar(0.));
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		means += center;
+	}
+	means *= (btScalar(1.) / (btScalar)numIndices);
+
+	splitValue = means[splitAxis];
+
+	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		if (center[splitAxis] > splitValue)
+		{
+			//swap
+			swapLeafNodes(i, splitIndex);
+			splitIndex++;
+		}
+	}
+
+	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
+	//otherwise the tree-building might fail due to stack-overflows in certain cases.
+	//unbalanced1 is unsafe: it can cause stack overflows
+	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
+
+	//unbalanced2 should work too: always use center (perfect balanced trees)
+	//bool unbalanced2 = true;
+
+	//this should be safe too:
+	int rangeBalancedIndices = numIndices / 3;
+	bool unbalanced = ((splitIndex <= (startIndex + rangeBalancedIndices)) || (splitIndex >= (endIndex - 1 - rangeBalancedIndices)));
+
+	if (unbalanced)
+	{
+		splitIndex = startIndex + (numIndices >> 1);
+	}
+
+	bool unbal = (splitIndex == startIndex) || (splitIndex == (endIndex));
+	(void)unbal;
+	btAssert(!unbal);
+
+	return splitIndex;
+}
+
+int btQuantizedBvh::calcSplittingAxis(int startIndex, int endIndex)
+{
+	int i;
+
+	btVector3 means(btScalar(0.), btScalar(0.), btScalar(0.));
+	btVector3 variance(btScalar(0.), btScalar(0.), btScalar(0.));
+	int numIndices = endIndex - startIndex;
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		means += center;
+	}
+	means *= (btScalar(1.) / (btScalar)numIndices);
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (getAabbMax(i) + getAabbMin(i));
+		btVector3 diff2 = center - means;
+		diff2 = diff2 * diff2;
+		variance += diff2;
+	}
+	variance *= (btScalar(1.) / ((btScalar)numIndices - 1));
+
+	return variance.maxAxis();
+}
+
+void btQuantizedBvh::reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	//either choose recursive traversal (walkTree) or stackless (walkStacklessTree)
+
+	if (m_useQuantization)
+	{
+		///quantize query AABB
+		unsigned short int quantizedQueryAabbMin[3];
+		unsigned short int quantizedQueryAabbMax[3];
+		quantizeWithClamp(quantizedQueryAabbMin, aabbMin, 0);
+		quantizeWithClamp(quantizedQueryAabbMax, aabbMax, 1);
+
+		switch (m_traversalMode)
+		{
+			case TRAVERSAL_STACKLESS:
+				walkStacklessQuantizedTree(nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax, 0, m_curNodeIndex);
+				break;
+			case TRAVERSAL_STACKLESS_CACHE_FRIENDLY:
+				walkStacklessQuantizedTreeCacheFriendly(nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+				break;
+			case TRAVERSAL_RECURSIVE:
+			{
+				const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[0];
+				walkRecursiveQuantizedTreeAgainstQueryAabb(rootNode, nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+			}
+			break;
+			default:
+				//unsupported
+				btAssert(0);
+		}
+	}
+	else
+	{
+		walkStacklessTree(nodeCallback, aabbMin, aabbMax);
+	}
+}
+
+void btQuantizedBvh::walkStacklessTree(btNodeOverlapCallback* nodeCallback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	btAssert(!m_useQuantization);
+
+	const btOptimizedBvhNode* rootNode = &m_contiguousNodes[0];
+	int escapeIndex, curIndex = 0;
+	int walkIterations = 0;
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	while (curIndex < m_curNodeIndex)
+	{
+		//catch bugs in tree data
+		btAssert(walkIterations < m_curNodeIndex);
+
+		walkIterations++;
+		aabbOverlap = TestAabbAgainstAabb2(aabbMin, aabbMax, rootNode->m_aabbMinOrg, rootNode->m_aabbMaxOrg);
+		isLeafNode = rootNode->m_escapeIndex == -1;
+
+		//PCK: unsigned instead of bool
+		if (isLeafNode && (aabbOverlap != 0))
+		{
+			nodeCallback->processNode(rootNode->m_subPart, rootNode->m_triangleIndex);
+		}
+
+		//PCK: unsigned instead of bool
+		if ((aabbOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->m_escapeIndex;
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+}
+
+/*
+///this was the original recursive traversal, before we optimized towards stackless traversal
+void	btQuantizedBvh::walkTree(btOptimizedBvhNode* rootNode,btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	bool isLeafNode, aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMin,rootNode->m_aabbMax);
+	if (aabbOverlap)
+	{
+		isLeafNode = (!rootNode->m_leftChild && !rootNode->m_rightChild);
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(rootNode);
+		} else
+		{
+			walkTree(rootNode->m_leftChild,nodeCallback,aabbMin,aabbMax);
+			walkTree(rootNode->m_rightChild,nodeCallback,aabbMin,aabbMax);
+		}
+	}
+
+}
+*/
+
+void btQuantizedBvh::walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode, btNodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const
+{
+	btAssert(m_useQuantization);
+
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	//PCK: unsigned instead of bool
+	aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, currentNode->m_quantizedAabbMin, currentNode->m_quantizedAabbMax);
+	isLeafNode = currentNode->isLeafNode();
+
+	//PCK: unsigned instead of bool
+	if (aabbOverlap != 0)
+	{
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(currentNode->getPartId(), currentNode->getTriangleIndex());
+		}
+		else
+		{
+			//process left and right children
+			const btQuantizedBvhNode* leftChildNode = currentNode + 1;
+			walkRecursiveQuantizedTreeAgainstQueryAabb(leftChildNode, nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+
+			const btQuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? leftChildNode + 1 : leftChildNode + leftChildNode->getEscapeIndex();
+			walkRecursiveQuantizedTreeAgainstQueryAabb(rightChildNode, nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax);
+		}
+	}
+}
+
+void btQuantizedBvh::walkStacklessTreeAgainstRay(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex, int endNodeIndex) const
+{
+	btAssert(!m_useQuantization);
+
+	const btOptimizedBvhNode* rootNode = &m_contiguousNodes[0];
+	int escapeIndex, curIndex = 0;
+	int walkIterations = 0;
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap = 0;
+	unsigned rayBoxOverlap = 0;
+	btScalar lambda_max = 1.0;
+
+	/* Quick pruning by quantized box */
+	btVector3 rayAabbMin = raySource;
+	btVector3 rayAabbMax = raySource;
+	rayAabbMin.setMin(rayTarget);
+	rayAabbMax.setMax(rayTarget);
+
+	/* Add box cast extents to bounding box */
+	rayAabbMin += aabbMin;
+	rayAabbMax += aabbMax;
+
+#ifdef RAYAABB2
+	btVector3 rayDir = (rayTarget - raySource);
+	rayDir.safeNormalize();// stephengold changed normalize to safeNormalize 2020-02-17
+	lambda_max = rayDir.dot(rayTarget - raySource);
+	///what about division by zero? --> just set rayDirection[i] to 1.0
+	btVector3 rayDirectionInverse;
+	rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[0];
+	rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[1];
+	rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[2];
+	unsigned int sign[3] = {rayDirectionInverse[0] < 0.0, rayDirectionInverse[1] < 0.0, rayDirectionInverse[2] < 0.0};
+#endif
+
+	btVector3 bounds[2];
+
+	while (curIndex < m_curNodeIndex)
+	{
+		btScalar param = 1.0;
+		//catch bugs in tree data
+		btAssert(walkIterations < m_curNodeIndex);
+
+		walkIterations++;
+
+		bounds[0] = rootNode->m_aabbMinOrg;
+		bounds[1] = rootNode->m_aabbMaxOrg;
+		/* Add box cast extents */
+		bounds[0] -= aabbMax;
+		bounds[1] -= aabbMin;
+
+		aabbOverlap = TestAabbAgainstAabb2(rayAabbMin, rayAabbMax, rootNode->m_aabbMinOrg, rootNode->m_aabbMaxOrg);
+		//perhaps profile if it is worth doing the aabbOverlap test first
+
+#ifdef RAYAABB2
+		///careful with this check: need to check division by zero (above) and fix the unQuantize method
+		///thanks Joerg/hiker for the reproduction case!
+		///http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1858
+		rayBoxOverlap = aabbOverlap ? btRayAabb2(raySource, rayDirectionInverse, sign, bounds, param, 0.0f, lambda_max) : false;
+
+#else
+		btVector3 normal;
+		rayBoxOverlap = btRayAabb(raySource, rayTarget, bounds[0], bounds[1], param, normal);
+#endif
+
+		isLeafNode = rootNode->m_escapeIndex == -1;
+
+		//PCK: unsigned instead of bool
+		if (isLeafNode && (rayBoxOverlap != 0))
+		{
+			nodeCallback->processNode(rootNode->m_subPart, rootNode->m_triangleIndex);
+		}
+
+		//PCK: unsigned instead of bool
+		if ((rayBoxOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->m_escapeIndex;
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+}
+
+void btQuantizedBvh::walkStacklessQuantizedTreeAgainstRay(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex, int endNodeIndex) const
+{
+	btAssert(m_useQuantization);
+
+	int curIndex = startNodeIndex;
+	int walkIterations = 0;
+	int subTreeSize = endNodeIndex - startNodeIndex;
+	(void)subTreeSize;
+
+	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
+	int escapeIndex;
+
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned boxBoxOverlap = 0;
+	unsigned rayBoxOverlap = 0;
+
+	btScalar lambda_max = 1.0;
+
+#ifdef RAYAABB2
+	btVector3 rayDirection = (rayTarget - raySource);
+	rayDirection.safeNormalize();// stephengold changed normalize to safeNormalize 2020-02-17
+	lambda_max = rayDirection.dot(rayTarget - raySource);
+	///what about division by zero? --> just set rayDirection[i] to 1.0
+	rayDirection[0] = rayDirection[0] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDirection[0];
+	rayDirection[1] = rayDirection[1] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDirection[1];
+	rayDirection[2] = rayDirection[2] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDirection[2];
+	unsigned int sign[3] = {rayDirection[0] < 0.0, rayDirection[1] < 0.0, rayDirection[2] < 0.0};
+#endif
+
+	/* Quick pruning by quantized box */
+	btVector3 rayAabbMin = raySource;
+	btVector3 rayAabbMax = raySource;
+	rayAabbMin.setMin(rayTarget);
+	rayAabbMax.setMax(rayTarget);
+
+	/* Add box cast extents to bounding box */
+	rayAabbMin += aabbMin;
+	rayAabbMax += aabbMax;
+
+	unsigned short int quantizedQueryAabbMin[3];
+	unsigned short int quantizedQueryAabbMax[3];
+	quantizeWithClamp(quantizedQueryAabbMin, rayAabbMin, 0);
+	quantizeWithClamp(quantizedQueryAabbMax, rayAabbMax, 1);
+
+	while (curIndex < endNodeIndex)
+	{
+//#define VISUALLY_ANALYZE_BVH 1
+#ifdef VISUALLY_ANALYZE_BVH
+		//some code snippet to debugDraw aabb, to visually analyze bvh structure
+		static int drawPatch = 0;
+		//need some global access to a debugDrawer
+		extern btIDebugDraw* debugDrawerPtr;
+		if (curIndex == drawPatch)
+		{
+			btVector3 aabbMin, aabbMax;
+			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
+			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
+			btVector3 color(1, 0, 0);
+			debugDrawerPtr->drawAabb(aabbMin, aabbMax, color);
+		}
+#endif  //VISUALLY_ANALYZE_BVH
+
+		//catch bugs in tree data
+		btAssert(walkIterations < subTreeSize);
+
+		walkIterations++;
+		//PCK: unsigned instead of bool
+		// only interested if this is closer than any previous hit
+		btScalar param = 1.0;
+		rayBoxOverlap = 0;
+		boxBoxOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, rootNode->m_quantizedAabbMin, rootNode->m_quantizedAabbMax);
+		isLeafNode = rootNode->isLeafNode();
+		if (boxBoxOverlap)
+		{
+			btVector3 bounds[2];
+			bounds[0] = unQuantize(rootNode->m_quantizedAabbMin);
+			bounds[1] = unQuantize(rootNode->m_quantizedAabbMax);
+			/* Add box cast extents */
+			bounds[0] -= aabbMax;
+			bounds[1] -= aabbMin;
+			btVector3 normal;
+#if 0
+			bool ra2 = btRayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0, lambda_max);
+			bool ra = btRayAabb (raySource, rayTarget, bounds[0], bounds[1], param, normal);
+			if (ra2 != ra)
+			{
+				printf("functions don't match\n");
+			}
+#endif
+#ifdef RAYAABB2
+			///careful with this check: need to check division by zero (above) and fix the unQuantize method
+			///thanks Joerg/hiker for the reproduction case!
+			///http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1858
+
+			//BT_PROFILE("btRayAabb2");
+			rayBoxOverlap = btRayAabb2(raySource, rayDirection, sign, bounds, param, 0.0f, lambda_max);
+
+#else
+			rayBoxOverlap = true;  //btRayAabb(raySource, rayTarget, bounds[0], bounds[1], param, normal);
+#endif
+		}
+
+		if (isLeafNode && rayBoxOverlap)
+		{
+			nodeCallback->processNode(rootNode->getPartId(), rootNode->getTriangleIndex());
+		}
+
+		//PCK: unsigned instead of bool
+		if ((rayBoxOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->getEscapeIndex();
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+}
+
+void btQuantizedBvh::walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax, int startNodeIndex, int endNodeIndex) const
+{
+	btAssert(m_useQuantization);
+
+	int curIndex = startNodeIndex;
+	int walkIterations = 0;
+	int subTreeSize = endNodeIndex - startNodeIndex;
+	(void)subTreeSize;
+
+	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
+	int escapeIndex;
+
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	while (curIndex < endNodeIndex)
+	{
+//#define VISUALLY_ANALYZE_BVH 1
+#ifdef VISUALLY_ANALYZE_BVH
+		//some code snippet to debugDraw aabb, to visually analyze bvh structure
+		static int drawPatch = 0;
+		//need some global access to a debugDrawer
+		extern btIDebugDraw* debugDrawerPtr;
+		if (curIndex == drawPatch)
+		{
+			btVector3 aabbMin, aabbMax;
+			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
+			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
+			btVector3 color(1, 0, 0);
+			debugDrawerPtr->drawAabb(aabbMin, aabbMax, color);
+		}
+#endif  //VISUALLY_ANALYZE_BVH
+
+		//catch bugs in tree data
+		btAssert(walkIterations < subTreeSize);
+
+		walkIterations++;
+		//PCK: unsigned instead of bool
+		aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, rootNode->m_quantizedAabbMin, rootNode->m_quantizedAabbMax);
+		isLeafNode = rootNode->isLeafNode();
+
+		if (isLeafNode && aabbOverlap)
+		{
+			nodeCallback->processNode(rootNode->getPartId(), rootNode->getTriangleIndex());
+		}
+
+		//PCK: unsigned instead of bool
+		if ((aabbOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		}
+		else
+		{
+			escapeIndex = rootNode->getEscapeIndex();
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+}
+
+//This traversal can be called from Playstation 3 SPU
+void btQuantizedBvh::walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const
+{
+	btAssert(m_useQuantization);
+
+	int i;
+
+	for (i = 0; i < this->m_SubtreeHeaders.size(); i++)
+	{
+		const btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+
+		//PCK: unsigned instead of bool
+		unsigned overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, subtree.m_quantizedAabbMin, subtree.m_quantizedAabbMax);
+		if (overlap != 0)
+		{
+			walkStacklessQuantizedTree(nodeCallback, quantizedQueryAabbMin, quantizedQueryAabbMax,
+									   subtree.m_rootNodeIndex,
+									   subtree.m_rootNodeIndex + subtree.m_subtreeSize);
+		}
+	}
+}
+
+void btQuantizedBvh::reportRayOverlappingNodex(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget) const
+{
+	reportBoxCastOverlappingNodex(nodeCallback, raySource, rayTarget, btVector3(0, 0, 0), btVector3(0, 0, 0));
+}
+
+void btQuantizedBvh::reportBoxCastOverlappingNodex(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	//always use stackless
+
+	if (m_useQuantization)
+	{
+		walkStacklessQuantizedTreeAgainstRay(nodeCallback, raySource, rayTarget, aabbMin, aabbMax, 0, m_curNodeIndex);
+	}
+	else
+	{
+		walkStacklessTreeAgainstRay(nodeCallback, raySource, rayTarget, aabbMin, aabbMax, 0, m_curNodeIndex);
+	}
+	/*
+	{
+		//recursive traversal
+		btVector3 qaabbMin = raySource;
+		btVector3 qaabbMax = raySource;
+		qaabbMin.setMin(rayTarget);
+		qaabbMax.setMax(rayTarget);
+		qaabbMin += aabbMin;
+		qaabbMax += aabbMax;
+		reportAabbOverlappingNodex(nodeCallback,qaabbMin,qaabbMax);
+	}
+	*/
+}
+
+void btQuantizedBvh::swapLeafNodes(int i, int splitIndex)
+{
+	if (m_useQuantization)
+	{
+		btQuantizedBvhNode tmp = m_quantizedLeafNodes[i];
+		m_quantizedLeafNodes[i] = m_quantizedLeafNodes[splitIndex];
+		m_quantizedLeafNodes[splitIndex] = tmp;
+	}
+	else
+	{
+		btOptimizedBvhNode tmp = m_leafNodes[i];
+		m_leafNodes[i] = m_leafNodes[splitIndex];
+		m_leafNodes[splitIndex] = tmp;
+	}
+}
+
+void btQuantizedBvh::assignInternalNodeFromLeafNode(int internalNode, int leafNodeIndex)
+{
+	if (m_useQuantization)
+	{
+		m_quantizedContiguousNodes[internalNode] = m_quantizedLeafNodes[leafNodeIndex];
+	}
+	else
+	{
+		m_contiguousNodes[internalNode] = m_leafNodes[leafNodeIndex];
+	}
+}
+
+//PCK: include
+#include <new>
+
+#if 0
+//PCK: consts
+static const unsigned BVH_ALIGNMENT = 16;
+static const unsigned BVH_ALIGNMENT_MASK = BVH_ALIGNMENT-1;
+
+static const unsigned BVH_ALIGNMENT_BLOCKS = 2;
+#endif
+
+unsigned int btQuantizedBvh::getAlignmentSerializationPadding()
+{
+	// I changed this to 0 since the extra padding is not needed or used.
+	return 0;  //BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT;
+}
+
+unsigned btQuantizedBvh::calculateSerializeBufferSize() const
+{
+	unsigned baseSize = sizeof(btQuantizedBvh) + getAlignmentSerializationPadding();
+	baseSize += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
+	if (m_useQuantization)
+	{
+		return baseSize + m_curNodeIndex * sizeof(btQuantizedBvhNode);
+	}
+	return baseSize + m_curNodeIndex * sizeof(btOptimizedBvhNode);
+}
+
+bool btQuantizedBvh::serialize(void* o_alignedDataBuffer, unsigned /*i_dataBufferSize */, bool i_swapEndian) const
+{
+	btAssert(m_subtreeHeaderCount == m_SubtreeHeaders.size());
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	/*	if (i_dataBufferSize < calculateSerializeBufferSize() || o_alignedDataBuffer == NULL || (((unsigned)o_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
+	{
+		///check alignedment for buffer?
+		btAssert(0);
+		return false;
+	}
+*/
+
+	btQuantizedBvh* targetBvh = (btQuantizedBvh*)o_alignedDataBuffer;
+
+	// construct the class so the virtual function table, etc will be set up
+	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
+	new (targetBvh) btQuantizedBvh;
+
+	if (i_swapEndian)
+	{
+		targetBvh->m_curNodeIndex = static_cast<int>(btSwapEndian(m_curNodeIndex));
+
+		btSwapVector3Endian(m_bvhAabbMin, targetBvh->m_bvhAabbMin);
+		btSwapVector3Endian(m_bvhAabbMax, targetBvh->m_bvhAabbMax);
+		btSwapVector3Endian(m_bvhQuantization, targetBvh->m_bvhQuantization);
+
+		targetBvh->m_traversalMode = (btTraversalMode)btSwapEndian(m_traversalMode);
+		targetBvh->m_subtreeHeaderCount = static_cast<int>(btSwapEndian(m_subtreeHeaderCount));
+	}
+	else
+	{
+		targetBvh->m_curNodeIndex = m_curNodeIndex;
+		targetBvh->m_bvhAabbMin = m_bvhAabbMin;
+		targetBvh->m_bvhAabbMax = m_bvhAabbMax;
+		targetBvh->m_bvhQuantization = m_bvhQuantization;
+		targetBvh->m_traversalMode = m_traversalMode;
+		targetBvh->m_subtreeHeaderCount = m_subtreeHeaderCount;
+	}
+
+	targetBvh->m_useQuantization = m_useQuantization;
+
+	unsigned char* nodeData = (unsigned char*)targetBvh;
+	nodeData += sizeof(btQuantizedBvh);
+
+	unsigned sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	int nodeCount = m_curNodeIndex;
+
+	if (m_useQuantization)
+	{
+		targetBvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
+			}
+		}
+		else
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2];
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2];
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex;
+			}
+		}
+		nodeData += sizeof(btQuantizedBvhNode) * nodeCount;
+
+		// this clears the pointer in the member variable it doesn't really do anything to the data
+		// it does call the destructor on the contained objects, but they are all classes with no destructor defined
+		// so the memory (which is not freed) is left alone
+		targetBvh->m_quantizedContiguousNodes.initializeFromBuffer(NULL, 0, 0);
+	}
+	else
+	{
+		targetBvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				btSwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMinOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
+				btSwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMaxOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
+
+				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_escapeIndex));
+				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_subPart));
+				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_triangleIndex));
+			}
+		}
+		else
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg = m_contiguousNodes[nodeIndex].m_aabbMinOrg;
+				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg = m_contiguousNodes[nodeIndex].m_aabbMaxOrg;
+
+				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = m_contiguousNodes[nodeIndex].m_escapeIndex;
+				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = m_contiguousNodes[nodeIndex].m_subPart;
+				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = m_contiguousNodes[nodeIndex].m_triangleIndex;
+			}
+		}
+		nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
+
+		// this clears the pointer in the member variable it doesn't really do anything to the data
+		// it does call the destructor on the contained objects, but they are all classes with no destructor defined
+		// so the memory (which is not freed) is left alone
+		targetBvh->m_contiguousNodes.initializeFromBuffer(NULL, 0, 0);
+	}
+
+	sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	// Now serialize the subtree headers
+	targetBvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, m_subtreeHeaderCount, m_subtreeHeaderCount);
+	if (i_swapEndian)
+	{
+		for (int i = 0; i < m_subtreeHeaderCount; i++)
+		{
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(btSwapEndian(m_SubtreeHeaders[i].m_rootNodeIndex));
+			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(btSwapEndian(m_SubtreeHeaders[i].m_subtreeSize));
+		}
+	}
+	else
+	{
+		for (int i = 0; i < m_subtreeHeaderCount; i++)
+		{
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = (m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = (m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = (m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = (m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = (m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = (m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = (m_SubtreeHeaders[i].m_rootNodeIndex);
+			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = (m_SubtreeHeaders[i].m_subtreeSize);
+
+			// need to clear padding in destination buffer
+			targetBvh->m_SubtreeHeaders[i].m_padding[0] = 0;
+			targetBvh->m_SubtreeHeaders[i].m_padding[1] = 0;
+			targetBvh->m_SubtreeHeaders[i].m_padding[2] = 0;
+		}
+	}
+	nodeData += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
+
+	// this clears the pointer in the member variable it doesn't really do anything to the data
+	// it does call the destructor on the contained objects, but they are all classes with no destructor defined
+	// so the memory (which is not freed) is left alone
+	targetBvh->m_SubtreeHeaders.initializeFromBuffer(NULL, 0, 0);
+
+	// this wipes the virtual function table pointer at the start of the buffer for the class
+	*((void**)o_alignedDataBuffer) = NULL;
+
+	return true;
+}
+
+btQuantizedBvh* btQuantizedBvh::deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
+{
+	if (i_alignedDataBuffer == NULL)  // || (((unsigned)i_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
+	{
+		return NULL;
+	}
+	btQuantizedBvh* bvh = (btQuantizedBvh*)i_alignedDataBuffer;
+
+	if (i_swapEndian)
+	{
+		bvh->m_curNodeIndex = static_cast<int>(btSwapEndian(bvh->m_curNodeIndex));
+
+		btUnSwapVector3Endian(bvh->m_bvhAabbMin);
+		btUnSwapVector3Endian(bvh->m_bvhAabbMax);
+		btUnSwapVector3Endian(bvh->m_bvhQuantization);
+
+		bvh->m_traversalMode = (btTraversalMode)btSwapEndian(bvh->m_traversalMode);
+		bvh->m_subtreeHeaderCount = static_cast<int>(btSwapEndian(bvh->m_subtreeHeaderCount));
+	}
+
+	unsigned int calculatedBufSize = bvh->calculateSerializeBufferSize();
+	btAssert(calculatedBufSize <= i_dataBufferSize);
+
+	if (calculatedBufSize > i_dataBufferSize)
+	{
+		return NULL;
+	}
+
+	unsigned char* nodeData = (unsigned char*)bvh;
+	nodeData += sizeof(btQuantizedBvh);
+
+	unsigned sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	int nodeCount = bvh->m_curNodeIndex;
+
+	// Must call placement new to fill in virtual function table, etc, but we don't want to overwrite most data, so call a special version of the constructor
+	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
+	new (bvh) btQuantizedBvh(*bvh, false);
+
+	if (bvh->m_useQuantization)
+	{
+		bvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
+
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
+
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
+			}
+		}
+		nodeData += sizeof(btQuantizedBvhNode) * nodeCount;
+	}
+	else
+	{
+		bvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				btUnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
+				btUnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
+
+				bvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_escapeIndex));
+				bvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_subPart));
+				bvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_triangleIndex));
+			}
+		}
+		nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
+	}
+
+	sizeToAdd = 0;  //(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	// Now serialize the subtree headers
+	bvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, bvh->m_subtreeHeaderCount, bvh->m_subtreeHeaderCount);
+	if (i_swapEndian)
+	{
+		for (int i = 0; i < bvh->m_subtreeHeaderCount; i++)
+		{
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			bvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(btSwapEndian(bvh->m_SubtreeHeaders[i].m_rootNodeIndex));
+			bvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(btSwapEndian(bvh->m_SubtreeHeaders[i].m_subtreeSize));
+		}
+	}
+
+	return bvh;
+}
+
+// Constructor that prevents btVector3's default constructor from being called
+btQuantizedBvh::btQuantizedBvh(btQuantizedBvh& self, bool /* ownsMemory */) : m_bvhAabbMin(self.m_bvhAabbMin),
+																			  m_bvhAabbMax(self.m_bvhAabbMax),
+																			  m_bvhQuantization(self.m_bvhQuantization),
+																			  m_bulletVersion(BT_BULLET_VERSION)
+{
+}
+
+void btQuantizedBvh::deSerializeFloat(struct btQuantizedBvhFloatData& quantizedBvhFloatData)
+{
+	m_bvhAabbMax.deSerializeFloat(quantizedBvhFloatData.m_bvhAabbMax);
+	m_bvhAabbMin.deSerializeFloat(quantizedBvhFloatData.m_bvhAabbMin);
+	m_bvhQuantization.deSerializeFloat(quantizedBvhFloatData.m_bvhQuantization);
+
+	m_curNodeIndex = quantizedBvhFloatData.m_curNodeIndex;
+	m_useQuantization = quantizedBvhFloatData.m_useQuantization != 0;
+
+	{
+		int numElem = quantizedBvhFloatData.m_numContiguousLeafNodes;
+		m_contiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			btOptimizedBvhNodeFloatData* memPtr = quantizedBvhFloatData.m_contiguousNodesPtr;
+
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_contiguousNodes[i].m_aabbMaxOrg.deSerializeFloat(memPtr->m_aabbMaxOrg);
+				m_contiguousNodes[i].m_aabbMinOrg.deSerializeFloat(memPtr->m_aabbMinOrg);
+				m_contiguousNodes[i].m_escapeIndex = memPtr->m_escapeIndex;
+				m_contiguousNodes[i].m_subPart = memPtr->m_subPart;
+				m_contiguousNodes[i].m_triangleIndex = memPtr->m_triangleIndex;
+			}
+		}
+	}
+
+	{
+		int numElem = quantizedBvhFloatData.m_numQuantizedContiguousNodes;
+		m_quantizedContiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			btQuantizedBvhNodeData* memPtr = quantizedBvhFloatData.m_quantizedContiguousNodesPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_quantizedContiguousNodes[i].m_escapeIndexOrTriangleIndex = memPtr->m_escapeIndexOrTriangleIndex;
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+			}
+		}
+	}
+
+	m_traversalMode = btTraversalMode(quantizedBvhFloatData.m_traversalMode);
+
+	{
+		int numElem = quantizedBvhFloatData.m_numSubtreeHeaders;
+		m_SubtreeHeaders.resize(numElem);
+		if (numElem)
+		{
+			btBvhSubtreeInfoData* memPtr = quantizedBvhFloatData.m_subTreeInfoPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_SubtreeHeaders[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+				m_SubtreeHeaders[i].m_rootNodeIndex = memPtr->m_rootNodeIndex;
+				m_SubtreeHeaders[i].m_subtreeSize = memPtr->m_subtreeSize;
+			}
+		}
+	}
+}
+
+void btQuantizedBvh::deSerializeDouble(struct btQuantizedBvhDoubleData& quantizedBvhDoubleData)
+{
+	m_bvhAabbMax.deSerializeDouble(quantizedBvhDoubleData.m_bvhAabbMax);
+	m_bvhAabbMin.deSerializeDouble(quantizedBvhDoubleData.m_bvhAabbMin);
+	m_bvhQuantization.deSerializeDouble(quantizedBvhDoubleData.m_bvhQuantization);
+
+	m_curNodeIndex = quantizedBvhDoubleData.m_curNodeIndex;
+	m_useQuantization = quantizedBvhDoubleData.m_useQuantization != 0;
+
+	{
+		int numElem = quantizedBvhDoubleData.m_numContiguousLeafNodes;
+		m_contiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			btOptimizedBvhNodeDoubleData* memPtr = quantizedBvhDoubleData.m_contiguousNodesPtr;
+
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_contiguousNodes[i].m_aabbMaxOrg.deSerializeDouble(memPtr->m_aabbMaxOrg);
+				m_contiguousNodes[i].m_aabbMinOrg.deSerializeDouble(memPtr->m_aabbMinOrg);
+				m_contiguousNodes[i].m_escapeIndex = memPtr->m_escapeIndex;
+				m_contiguousNodes[i].m_subPart = memPtr->m_subPart;
+				m_contiguousNodes[i].m_triangleIndex = memPtr->m_triangleIndex;
+			}
+		}
+	}
+
+	{
+		int numElem = quantizedBvhDoubleData.m_numQuantizedContiguousNodes;
+		m_quantizedContiguousNodes.resize(numElem);
+
+		if (numElem)
+		{
+			btQuantizedBvhNodeData* memPtr = quantizedBvhDoubleData.m_quantizedContiguousNodesPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_quantizedContiguousNodes[i].m_escapeIndexOrTriangleIndex = memPtr->m_escapeIndexOrTriangleIndex;
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_quantizedContiguousNodes[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+			}
+		}
+	}
+
+	m_traversalMode = btTraversalMode(quantizedBvhDoubleData.m_traversalMode);
+
+	{
+		int numElem = quantizedBvhDoubleData.m_numSubtreeHeaders;
+		m_SubtreeHeaders.resize(numElem);
+		if (numElem)
+		{
+			btBvhSubtreeInfoData* memPtr = quantizedBvhDoubleData.m_subTreeInfoPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_SubtreeHeaders[i].m_quantizedAabbMax[0] = memPtr->m_quantizedAabbMax[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[1] = memPtr->m_quantizedAabbMax[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMax[2] = memPtr->m_quantizedAabbMax[2];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[0] = memPtr->m_quantizedAabbMin[0];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[1] = memPtr->m_quantizedAabbMin[1];
+				m_SubtreeHeaders[i].m_quantizedAabbMin[2] = memPtr->m_quantizedAabbMin[2];
+				m_SubtreeHeaders[i].m_rootNodeIndex = memPtr->m_rootNodeIndex;
+				m_SubtreeHeaders[i].m_subtreeSize = memPtr->m_subtreeSize;
+			}
+		}
+	}
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btQuantizedBvh::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btQuantizedBvhData* quantizedData = (btQuantizedBvhData*)dataBuffer;
+
+	m_bvhAabbMax.serialize(quantizedData->m_bvhAabbMax);
+	m_bvhAabbMin.serialize(quantizedData->m_bvhAabbMin);
+	m_bvhQuantization.serialize(quantizedData->m_bvhQuantization);
+
+	quantizedData->m_curNodeIndex = m_curNodeIndex;
+	quantizedData->m_useQuantization = m_useQuantization;
+
+	quantizedData->m_numContiguousLeafNodes = m_contiguousNodes.size();
+	quantizedData->m_contiguousNodesPtr = (btOptimizedBvhNodeData*)(m_contiguousNodes.size() ? serializer->getUniquePointer((void*)&m_contiguousNodes[0]) : 0);
+	if (quantizedData->m_contiguousNodesPtr)
+	{
+		int sz = sizeof(btOptimizedBvhNodeData);
+		int numElem = m_contiguousNodes.size();
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		btOptimizedBvhNodeData* memPtr = (btOptimizedBvhNodeData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			m_contiguousNodes[i].m_aabbMaxOrg.serialize(memPtr->m_aabbMaxOrg);
+			m_contiguousNodes[i].m_aabbMinOrg.serialize(memPtr->m_aabbMinOrg);
+			memPtr->m_escapeIndex = m_contiguousNodes[i].m_escapeIndex;
+			memPtr->m_subPart = m_contiguousNodes[i].m_subPart;
+			memPtr->m_triangleIndex = m_contiguousNodes[i].m_triangleIndex;
+			// Fill padding with zeros to appease msan.
+			memset(memPtr->m_pad, 0, sizeof(memPtr->m_pad));
+		}
+		serializer->finalizeChunk(chunk, "btOptimizedBvhNodeData", BT_ARRAY_CODE, (void*)&m_contiguousNodes[0]);
+	}
+
+	quantizedData->m_numQuantizedContiguousNodes = m_quantizedContiguousNodes.size();
+	//	printf("quantizedData->m_numQuantizedContiguousNodes=%d\n",quantizedData->m_numQuantizedContiguousNodes);
+	quantizedData->m_quantizedContiguousNodesPtr = (btQuantizedBvhNodeData*)(m_quantizedContiguousNodes.size() ? serializer->getUniquePointer((void*)&m_quantizedContiguousNodes[0]) : 0);
+	if (quantizedData->m_quantizedContiguousNodesPtr)
+	{
+		int sz = sizeof(btQuantizedBvhNodeData);
+		int numElem = m_quantizedContiguousNodes.size();
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		btQuantizedBvhNodeData* memPtr = (btQuantizedBvhNodeData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_escapeIndexOrTriangleIndex = m_quantizedContiguousNodes[i].m_escapeIndexOrTriangleIndex;
+			memPtr->m_quantizedAabbMax[0] = m_quantizedContiguousNodes[i].m_quantizedAabbMax[0];
+			memPtr->m_quantizedAabbMax[1] = m_quantizedContiguousNodes[i].m_quantizedAabbMax[1];
+			memPtr->m_quantizedAabbMax[2] = m_quantizedContiguousNodes[i].m_quantizedAabbMax[2];
+			memPtr->m_quantizedAabbMin[0] = m_quantizedContiguousNodes[i].m_quantizedAabbMin[0];
+			memPtr->m_quantizedAabbMin[1] = m_quantizedContiguousNodes[i].m_quantizedAabbMin[1];
+			memPtr->m_quantizedAabbMin[2] = m_quantizedContiguousNodes[i].m_quantizedAabbMin[2];
+		}
+		serializer->finalizeChunk(chunk, "btQuantizedBvhNodeData", BT_ARRAY_CODE, (void*)&m_quantizedContiguousNodes[0]);
+	}
+
+	quantizedData->m_traversalMode = int(m_traversalMode);
+	quantizedData->m_numSubtreeHeaders = m_SubtreeHeaders.size();
+
+	quantizedData->m_subTreeInfoPtr = (btBvhSubtreeInfoData*)(m_SubtreeHeaders.size() ? serializer->getUniquePointer((void*)&m_SubtreeHeaders[0]) : 0);
+	if (quantizedData->m_subTreeInfoPtr)
+	{
+		int sz = sizeof(btBvhSubtreeInfoData);
+		int numElem = m_SubtreeHeaders.size();
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		btBvhSubtreeInfoData* memPtr = (btBvhSubtreeInfoData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_quantizedAabbMax[0] = m_SubtreeHeaders[i].m_quantizedAabbMax[0];
+			memPtr->m_quantizedAabbMax[1] = m_SubtreeHeaders[i].m_quantizedAabbMax[1];
+			memPtr->m_quantizedAabbMax[2] = m_SubtreeHeaders[i].m_quantizedAabbMax[2];
+			memPtr->m_quantizedAabbMin[0] = m_SubtreeHeaders[i].m_quantizedAabbMin[0];
+			memPtr->m_quantizedAabbMin[1] = m_SubtreeHeaders[i].m_quantizedAabbMin[1];
+			memPtr->m_quantizedAabbMin[2] = m_SubtreeHeaders[i].m_quantizedAabbMin[2];
+
+			memPtr->m_rootNodeIndex = m_SubtreeHeaders[i].m_rootNodeIndex;
+			memPtr->m_subtreeSize = m_SubtreeHeaders[i].m_subtreeSize;
+		}
+		serializer->finalizeChunk(chunk, "btBvhSubtreeInfoData", BT_ARRAY_CODE, (void*)&m_SubtreeHeaders[0]);
+	}
+	return btQuantizedBvhDataName;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
new file mode 100644
index 0000000..1a01992
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
@@ -0,0 +1,543 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_QUANTIZED_BVH_H
+#define BT_QUANTIZED_BVH_H
+
+class btSerializer;
+
+//#define DEBUG_CHECK_DEQUANTIZATION 1
+#ifdef DEBUG_CHECK_DEQUANTIZATION
+#ifdef __SPU__
+#define printf spu_printf
+#endif  //__SPU__
+
+#include <stdio.h>
+#include <stdlib.h>
+#endif  //DEBUG_CHECK_DEQUANTIZATION
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAlignedAllocator.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btQuantizedBvhData btQuantizedBvhDoubleData
+#define btOptimizedBvhNodeData btOptimizedBvhNodeDoubleData
+#define btQuantizedBvhDataName "btQuantizedBvhDoubleData"
+#else
+#define btQuantizedBvhData btQuantizedBvhFloatData
+#define btOptimizedBvhNodeData btOptimizedBvhNodeFloatData
+#define btQuantizedBvhDataName "btQuantizedBvhFloatData"
+#endif
+
+//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclang/html/vclrf__m128.asp
+
+//Note: currently we have 16 bytes per quantized node
+#define MAX_SUBTREE_SIZE_IN_BYTES 2048
+
+// 10 gives the potential for 1024 parts, with at most 2^21 (2097152) (minus one
+// actually) triangles each (since the sign bit is reserved
+#define MAX_NUM_PARTS_IN_BITS 10
+
+///btQuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+ATTRIBUTE_ALIGNED16(struct)
+btQuantizedBvhNode
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	//12 bytes
+	unsigned short int m_quantizedAabbMin[3];
+	unsigned short int m_quantizedAabbMax[3];
+	//4 bytes
+	int m_escapeIndexOrTriangleIndex;
+
+	bool isLeafNode() const
+	{
+		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+		return (m_escapeIndexOrTriangleIndex >= 0);
+	}
+	int getEscapeIndex() const
+	{
+		btAssert(!isLeafNode());
+		return -m_escapeIndexOrTriangleIndex;
+	}
+	int getTriangleIndex() const
+	{
+		btAssert(isLeafNode());
+		unsigned int x = 0;
+		unsigned int y = (~(x & 0)) << (31 - MAX_NUM_PARTS_IN_BITS);
+		// Get only the lower bits where the triangle index is stored
+		return (m_escapeIndexOrTriangleIndex & ~(y));
+	}
+	int getPartId() const
+	{
+		btAssert(isLeafNode());
+		// Get only the highest bits where the part index is stored
+		return (m_escapeIndexOrTriangleIndex >> (31 - MAX_NUM_PARTS_IN_BITS));
+	}
+};
+
+/// btOptimizedBvhNode contains both internal and leaf node information.
+/// Total node size is 44 bytes / node. You can use the compressed version of 16 bytes.
+ATTRIBUTE_ALIGNED16(struct)
+btOptimizedBvhNode
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	//32 bytes
+	btVector3 m_aabbMinOrg;
+	btVector3 m_aabbMaxOrg;
+
+	//4
+	int m_escapeIndex;
+
+	//8
+	//for child nodes
+	int m_subPart;
+	int m_triangleIndex;
+
+	//pad the size to 64 bytes
+	char m_padding[20];
+};
+
+///btBvhSubtreeInfo provides info to gather a subtree of limited size
+ATTRIBUTE_ALIGNED16(class)
+btBvhSubtreeInfo
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	//12 bytes
+	unsigned short int m_quantizedAabbMin[3];
+	unsigned short int m_quantizedAabbMax[3];
+	//4 bytes, points to the root of the subtree
+	int m_rootNodeIndex;
+	//4 bytes
+	int m_subtreeSize;
+	int m_padding[3];
+
+	btBvhSubtreeInfo()
+	{
+		//memset(&m_padding[0], 0, sizeof(m_padding));
+	}
+
+	void setAabbFromQuantizeNode(const btQuantizedBvhNode& quantizedNode)
+	{
+		m_quantizedAabbMin[0] = quantizedNode.m_quantizedAabbMin[0];
+		m_quantizedAabbMin[1] = quantizedNode.m_quantizedAabbMin[1];
+		m_quantizedAabbMin[2] = quantizedNode.m_quantizedAabbMin[2];
+		m_quantizedAabbMax[0] = quantizedNode.m_quantizedAabbMax[0];
+		m_quantizedAabbMax[1] = quantizedNode.m_quantizedAabbMax[1];
+		m_quantizedAabbMax[2] = quantizedNode.m_quantizedAabbMax[2];
+	}
+};
+
+class btNodeOverlapCallback
+{
+public:
+	virtual ~btNodeOverlapCallback(){};
+
+	virtual void processNode(int subPart, int triangleIndex) = 0;
+};
+
+#include "LinearMath/btAlignedAllocator.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+///for code readability:
+typedef btAlignedObjectArray<btOptimizedBvhNode> NodeArray;
+typedef btAlignedObjectArray<btQuantizedBvhNode> QuantizedNodeArray;
+typedef btAlignedObjectArray<btBvhSubtreeInfo> BvhSubtreeInfoArray;
+
+///The btQuantizedBvh class stores an AABB tree that can be quickly traversed on CPU and Cell SPU.
+///It is used by the btBvhTriangleMeshShape as midphase.
+///It is recommended to use quantization for better performance and lower memory requirements.
+ATTRIBUTE_ALIGNED16(class)
+btQuantizedBvh
+{
+public:
+	enum btTraversalMode
+	{
+		TRAVERSAL_STACKLESS = 0,
+		TRAVERSAL_STACKLESS_CACHE_FRIENDLY,
+		TRAVERSAL_RECURSIVE
+	};
+
+protected:
+	btVector3 m_bvhAabbMin;
+	btVector3 m_bvhAabbMax;
+	btVector3 m_bvhQuantization;
+
+	int m_bulletVersion;  //for serialization versioning. It could also be used to detect endianess.
+
+	int m_curNodeIndex;
+	//quantization data
+	bool m_useQuantization;
+
+	NodeArray m_leafNodes;
+	NodeArray m_contiguousNodes;
+	QuantizedNodeArray m_quantizedLeafNodes;
+	QuantizedNodeArray m_quantizedContiguousNodes;
+
+	btTraversalMode m_traversalMode;
+	BvhSubtreeInfoArray m_SubtreeHeaders;
+
+	//This is only used for serialization so we don't have to add serialization directly to btAlignedObjectArray
+	mutable int m_subtreeHeaderCount;
+
+	///two versions, one for quantized and normal nodes. This allows code-reuse while maintaining readability (no template/macro!)
+	///this might be refactored into a virtual, it is usually not calculated at run-time
+	void setInternalNodeAabbMin(int nodeIndex, const btVector3& aabbMin)
+	{
+		if (m_useQuantization)
+		{
+			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0], aabbMin, 0);
+		}
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg = aabbMin;
+		}
+	}
+	void setInternalNodeAabbMax(int nodeIndex, const btVector3& aabbMax)
+	{
+		if (m_useQuantization)
+		{
+			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0], aabbMax, 1);
+		}
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg = aabbMax;
+		}
+	}
+
+	btVector3 getAabbMin(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMin[0]);
+		}
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMinOrg;
+	}
+	btVector3 getAabbMax(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMax[0]);
+		}
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMaxOrg;
+	}
+
+	void setInternalNodeEscapeIndex(int nodeIndex, int escapeIndex)
+	{
+		if (m_useQuantization)
+		{
+			m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = -escapeIndex;
+		}
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_escapeIndex = escapeIndex;
+		}
+	}
+
+	void mergeInternalNodeAabb(int nodeIndex, const btVector3& newAabbMin, const btVector3& newAabbMax)
+	{
+		if (m_useQuantization)
+		{
+			unsigned short int quantizedAabbMin[3];
+			unsigned short int quantizedAabbMax[3];
+			quantize(quantizedAabbMin, newAabbMin, 0);
+			quantize(quantizedAabbMax, newAabbMax, 1);
+			for (int i = 0; i < 3; i++)
+			{
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] > quantizedAabbMin[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] = quantizedAabbMin[i];
+
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] < quantizedAabbMax[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] = quantizedAabbMax[i];
+			}
+		}
+		else
+		{
+			//non-quantized
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg.setMin(newAabbMin);
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg.setMax(newAabbMax);
+		}
+	}
+
+	void swapLeafNodes(int firstIndex, int secondIndex);
+
+	void assignInternalNodeFromLeafNode(int internalNode, int leafNodeIndex);
+
+protected:
+	void buildTree(int startIndex, int endIndex);
+
+	int calcSplittingAxis(int startIndex, int endIndex);
+
+	int sortAndCalcSplittingIndex(int startIndex, int endIndex, int splitAxis);
+
+	void walkStacklessTree(btNodeOverlapCallback * nodeCallback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	void walkStacklessQuantizedTreeAgainstRay(btNodeOverlapCallback * nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex, int endNodeIndex) const;
+	void walkStacklessQuantizedTree(btNodeOverlapCallback * nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax, int startNodeIndex, int endNodeIndex) const;
+	void walkStacklessTreeAgainstRay(btNodeOverlapCallback * nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex, int endNodeIndex) const;
+
+	///tree traversal designed for small-memory processors like PS3 SPU
+	void walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback * nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode, btNodeOverlapCallback* nodeCallback, unsigned short int* quantizedQueryAabbMin, unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void walkRecursiveQuantizedTreeAgainstQuantizedTree(const btQuantizedBvhNode* treeNodeA, const btQuantizedBvhNode* treeNodeB, btNodeOverlapCallback* nodeCallback) const;
+
+	void updateSubtreeHeaders(int leftChildNodexIndex, int rightChildNodexIndex);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btQuantizedBvh();
+
+	virtual ~btQuantizedBvh();
+
+	///***************************************** expert/internal use only *************************
+	void setQuantizationValues(const btVector3& bvhAabbMin, const btVector3& bvhAabbMax, btScalar quantizationMargin = btScalar(1.0));
+	QuantizedNodeArray& getLeafNodeArray() { return m_quantizedLeafNodes; }
+	///buildInternal is expert use only: assumes that setQuantizationValues and LeafNodeArray are initialized
+	void buildInternal();
+	///***************************************** expert/internal use only *************************
+
+	void reportAabbOverlappingNodex(btNodeOverlapCallback * nodeCallback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+	void reportRayOverlappingNodex(btNodeOverlapCallback * nodeCallback, const btVector3& raySource, const btVector3& rayTarget) const;
+	void reportBoxCastOverlappingNodex(btNodeOverlapCallback * nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	SIMD_FORCE_INLINE void quantize(unsigned short* out, const btVector3& point, int isMax) const
+	{
+		btAssert(m_useQuantization);
+
+		btAssert(point.getX() <= m_bvhAabbMax.getX());
+		btAssert(point.getY() <= m_bvhAabbMax.getY());
+		btAssert(point.getZ() <= m_bvhAabbMax.getZ());
+
+		btAssert(point.getX() >= m_bvhAabbMin.getX());
+		btAssert(point.getY() >= m_bvhAabbMin.getY());
+		btAssert(point.getZ() >= m_bvhAabbMin.getZ());
+
+		btVector3 v = (point - m_bvhAabbMin) * m_bvhQuantization;
+		///Make sure rounding is done in a way that unQuantize(quantizeWithClamp(...)) is conservative
+		///end-points always set the first bit, so that they are sorted properly (so that neighbouring AABBs overlap properly)
+		///@todo: double-check this
+		if (isMax)
+		{
+			out[0] = (unsigned short)(((unsigned short)(v.getX() + btScalar(1.)) | 1));
+			out[1] = (unsigned short)(((unsigned short)(v.getY() + btScalar(1.)) | 1));
+			out[2] = (unsigned short)(((unsigned short)(v.getZ() + btScalar(1.)) | 1));
+		}
+		else
+		{
+			out[0] = (unsigned short)(((unsigned short)(v.getX()) & 0xfffe));
+			out[1] = (unsigned short)(((unsigned short)(v.getY()) & 0xfffe));
+			out[2] = (unsigned short)(((unsigned short)(v.getZ()) & 0xfffe));
+		}
+
+#ifdef DEBUG_CHECK_DEQUANTIZATION
+		btVector3 newPoint = unQuantize(out);
+		if (isMax)
+		{
+			if (newPoint.getX() < point.getX())
+			{
+				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n", newPoint.getX() - point.getX(), newPoint.getX(), point.getX());
+			}
+			if (newPoint.getY() < point.getY())
+			{
+				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n", newPoint.getY() - point.getY(), newPoint.getY(), point.getY());
+			}
+			if (newPoint.getZ() < point.getZ())
+			{
+				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n", newPoint.getZ() - point.getZ(), newPoint.getZ(), point.getZ());
+			}
+		}
+		else
+		{
+			if (newPoint.getX() > point.getX())
+			{
+				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n", newPoint.getX() - point.getX(), newPoint.getX(), point.getX());
+			}
+			if (newPoint.getY() > point.getY())
+			{
+				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n", newPoint.getY() - point.getY(), newPoint.getY(), point.getY());
+			}
+			if (newPoint.getZ() > point.getZ())
+			{
+				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n", newPoint.getZ() - point.getZ(), newPoint.getZ(), point.getZ());
+			}
+		}
+#endif  //DEBUG_CHECK_DEQUANTIZATION
+	}
+
+	SIMD_FORCE_INLINE void quantizeWithClamp(unsigned short* out, const btVector3& point2, int isMax) const
+	{
+		btAssert(m_useQuantization);
+
+		btVector3 clampedPoint(point2);
+		clampedPoint.setMax(m_bvhAabbMin);
+		clampedPoint.setMin(m_bvhAabbMax);
+
+		quantize(out, clampedPoint, isMax);
+	}
+
+	SIMD_FORCE_INLINE btVector3 unQuantize(const unsigned short* vecIn) const
+	{
+		btVector3 vecOut;
+		vecOut.setValue(
+			(btScalar)(vecIn[0]) / (m_bvhQuantization.getX()),
+			(btScalar)(vecIn[1]) / (m_bvhQuantization.getY()),
+			(btScalar)(vecIn[2]) / (m_bvhQuantization.getZ()));
+		vecOut += m_bvhAabbMin;
+		return vecOut;
+	}
+
+	///setTraversalMode let's you choose between stackless, recursive or stackless cache friendly tree traversal. Note this is only implemented for quantized trees.
+	void setTraversalMode(btTraversalMode traversalMode)
+	{
+		m_traversalMode = traversalMode;
+	}
+
+	SIMD_FORCE_INLINE QuantizedNodeArray& getQuantizedNodeArray()
+	{
+		return m_quantizedContiguousNodes;
+	}
+
+	SIMD_FORCE_INLINE BvhSubtreeInfoArray& getSubtreeInfoArray()
+	{
+		return m_SubtreeHeaders;
+	}
+
+	////////////////////////////////////////////////////////////////////
+
+	/////Calculate space needed to store BVH for serialization
+	unsigned calculateSerializeBufferSize() const;
+
+	/// Data buffer MUST be 16 byte aligned
+	virtual bool serialize(void* o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian) const;
+
+	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+	static btQuantizedBvh* deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
+
+	static unsigned int getAlignmentSerializationPadding();
+	//////////////////////////////////////////////////////////////////////
+
+	virtual int calculateSerializeBufferSizeNew() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+
+	virtual void deSerializeFloat(struct btQuantizedBvhFloatData & quantizedBvhFloatData);
+
+	virtual void deSerializeDouble(struct btQuantizedBvhDoubleData & quantizedBvhDoubleData);
+
+	////////////////////////////////////////////////////////////////////
+
+	SIMD_FORCE_INLINE bool isQuantized()
+	{
+		return m_useQuantization;
+	}
+
+private:
+	// Special "copy" constructor that allows for in-place deserialization
+	// Prevents btVector3's default constructor from being called, but doesn't inialize much else
+	// ownsMemory should most likely be false if deserializing, and if you are not, don't call this (it also changes the function signature, which we need)
+	btQuantizedBvh(btQuantizedBvh & other, bool ownsMemory);
+};
+
+// clang-format off
+// parser needs * with the name
+struct btBvhSubtreeInfoData
+{
+	int m_rootNodeIndex;
+	int m_subtreeSize;
+	unsigned short m_quantizedAabbMin[3];
+	unsigned short m_quantizedAabbMax[3];
+};
+
+struct btOptimizedBvhNodeFloatData
+{
+	btVector3FloatData m_aabbMinOrg;
+	btVector3FloatData m_aabbMaxOrg;
+	int m_escapeIndex;
+	int m_subPart;
+	int m_triangleIndex;
+	char m_pad[4];
+};
+
+struct btOptimizedBvhNodeDoubleData
+{
+	btVector3DoubleData m_aabbMinOrg;
+	btVector3DoubleData m_aabbMaxOrg;
+	int m_escapeIndex;
+	int m_subPart;
+	int m_triangleIndex;
+	char m_pad[4];
+};
+
+
+struct btQuantizedBvhNodeData
+{
+	unsigned short m_quantizedAabbMin[3];
+	unsigned short m_quantizedAabbMax[3];
+	int	m_escapeIndexOrTriangleIndex;
+};
+
+struct	btQuantizedBvhFloatData
+{
+	btVector3FloatData			m_bvhAabbMin;
+	btVector3FloatData			m_bvhAabbMax;
+	btVector3FloatData			m_bvhQuantization;
+	int					m_curNodeIndex;
+	int					m_useQuantization;
+	int					m_numContiguousLeafNodes;
+	int					m_numQuantizedContiguousNodes;
+	btOptimizedBvhNodeFloatData	*m_contiguousNodesPtr;
+	btQuantizedBvhNodeData		*m_quantizedContiguousNodesPtr;
+	btBvhSubtreeInfoData	*m_subTreeInfoPtr;
+	int					m_traversalMode;
+	int					m_numSubtreeHeaders;
+	
+};
+
+struct	btQuantizedBvhDoubleData
+{
+	btVector3DoubleData			m_bvhAabbMin;
+	btVector3DoubleData			m_bvhAabbMax;
+	btVector3DoubleData			m_bvhQuantization;
+	int							m_curNodeIndex;
+	int							m_useQuantization;
+	int							m_numContiguousLeafNodes;
+	int							m_numQuantizedContiguousNodes;
+	btOptimizedBvhNodeDoubleData	*m_contiguousNodesPtr;
+	btQuantizedBvhNodeData			*m_quantizedContiguousNodesPtr;
+
+	int							m_traversalMode;
+	int							m_numSubtreeHeaders;
+	btBvhSubtreeInfoData		*m_subTreeInfoPtr;
+};
+// clang-format on
+
+SIMD_FORCE_INLINE int btQuantizedBvh::calculateSerializeBufferSizeNew() const
+{
+	return sizeof(btQuantizedBvhData);
+}
+
+#endif  //BT_QUANTIZED_BVH_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
new file mode 100644
index 0000000..bb02df8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
@@ -0,0 +1,325 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSimpleBroadphase.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btAabbUtil2.h"
+
+#include <new>
+
+void btSimpleBroadphase::validate()
+{
+	for (int i = 0; i < m_numHandles; i++)
+	{
+		for (int j = i + 1; j < m_numHandles; j++)
+		{
+			btAssert(&m_pHandles[i] != &m_pHandles[j]);
+		}
+	}
+}
+
+btSimpleBroadphase::btSimpleBroadphase(int maxProxies, btOverlappingPairCache* overlappingPairCache)
+	: m_pairCache(overlappingPairCache),
+	  m_ownsPairCache(false),
+	  m_invalidPair(0)
+{
+	if (!overlappingPairCache)
+	{
+		void* mem = btAlignedAlloc(sizeof(btHashedOverlappingPairCache), 16);
+		m_pairCache = new (mem) btHashedOverlappingPairCache();
+		m_ownsPairCache = true;
+	}
+
+	// allocate handles buffer and put all handles on free list
+	m_pHandlesRawPtr = btAlignedAlloc(sizeof(btSimpleBroadphaseProxy) * maxProxies, 16);
+	m_pHandles = new (m_pHandlesRawPtr) btSimpleBroadphaseProxy[maxProxies];
+	m_maxHandles = maxProxies;
+	m_numHandles = 0;
+	m_firstFreeHandle = 0;
+	m_LastHandleIndex = -1;
+
+	{
+		for (int i = m_firstFreeHandle; i < maxProxies; i++)
+		{
+			m_pHandles[i].SetNextFree(i + 1);
+			m_pHandles[i].m_uniqueId = i + 2;  //any UID will do, we just avoid too trivial values (0,1) for debugging purposes
+		}
+		m_pHandles[maxProxies - 1].SetNextFree(0);
+	}
+}
+
+btSimpleBroadphase::~btSimpleBroadphase()
+{
+	btAlignedFree(m_pHandlesRawPtr);
+
+	if (m_ownsPairCache)
+	{
+		m_pairCache->~btOverlappingPairCache();
+		btAlignedFree(m_pairCache);
+	}
+}
+
+btBroadphaseProxy* btSimpleBroadphase::createProxy(const btVector3& aabbMin, const btVector3& aabbMax, int shapeType, void* userPtr, int collisionFilterGroup, int collisionFilterMask, btDispatcher* /*dispatcher*/)
+{
+	if (m_numHandles >= m_maxHandles)
+	{
+		btAssert(0);
+		return 0;  //should never happen, but don't let the game crash ;-)
+	}
+	btAssert(aabbMin[0] <= aabbMax[0] && aabbMin[1] <= aabbMax[1] && aabbMin[2] <= aabbMax[2]);
+
+	int newHandleIndex = allocHandle();
+	btSimpleBroadphaseProxy* proxy = new (&m_pHandles[newHandleIndex]) btSimpleBroadphaseProxy(aabbMin, aabbMax, shapeType, userPtr, collisionFilterGroup, collisionFilterMask);
+
+	return proxy;
+}
+
+class RemovingOverlapCallback : public btOverlapCallback
+{
+protected:
+	virtual bool processOverlap(btBroadphasePair& pair)
+	{
+		(void)pair;
+		btAssert(0);
+		return false;
+	}
+};
+
+class RemovePairContainingProxy
+{
+	btBroadphaseProxy* m_targetProxy;
+
+public:
+	virtual ~RemovePairContainingProxy()
+	{
+	}
+
+protected:
+	virtual bool processOverlap(btBroadphasePair& pair)
+	{
+		btSimpleBroadphaseProxy* proxy0 = static_cast<btSimpleBroadphaseProxy*>(pair.m_pProxy0);
+		btSimpleBroadphaseProxy* proxy1 = static_cast<btSimpleBroadphaseProxy*>(pair.m_pProxy1);
+
+		return ((m_targetProxy == proxy0 || m_targetProxy == proxy1));
+	};
+};
+
+void btSimpleBroadphase::destroyProxy(btBroadphaseProxy* proxyOrg, btDispatcher* dispatcher)
+{
+	m_pairCache->removeOverlappingPairsContainingProxy(proxyOrg, dispatcher);
+
+	btSimpleBroadphaseProxy* proxy0 = static_cast<btSimpleBroadphaseProxy*>(proxyOrg);
+	freeHandle(proxy0);
+
+	//validate();
+}
+
+void btSimpleBroadphase::getAabb(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	const btSimpleBroadphaseProxy* sbp = getSimpleProxyFromProxy(proxy);
+	aabbMin = sbp->m_aabbMin;
+	aabbMax = sbp->m_aabbMax;
+}
+
+void btSimpleBroadphase::setAabb(btBroadphaseProxy* proxy, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* /*dispatcher*/)
+{
+	btSimpleBroadphaseProxy* sbp = getSimpleProxyFromProxy(proxy);
+	sbp->m_aabbMin = aabbMin;
+	sbp->m_aabbMax = aabbMax;
+}
+
+void btSimpleBroadphase::rayTest(const btVector3& rayFrom, const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	for (int i = 0; i <= m_LastHandleIndex; i++)
+	{
+		btSimpleBroadphaseProxy* proxy = &m_pHandles[i];
+		if (!proxy->m_clientObject)
+		{
+			continue;
+		}
+		rayCallback.process(proxy);
+	}
+}
+
+void btSimpleBroadphase::aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback)
+{
+	for (int i = 0; i <= m_LastHandleIndex; i++)
+	{
+		btSimpleBroadphaseProxy* proxy = &m_pHandles[i];
+		if (!proxy->m_clientObject)
+		{
+			continue;
+		}
+		if (TestAabbAgainstAabb2(aabbMin, aabbMax, proxy->m_aabbMin, proxy->m_aabbMax))
+		{
+			callback.process(proxy);
+		}
+	}
+}
+
+bool btSimpleBroadphase::aabbOverlap(btSimpleBroadphaseProxy* proxy0, btSimpleBroadphaseProxy* proxy1)
+{
+	return proxy0->m_aabbMin[0] <= proxy1->m_aabbMax[0] && proxy1->m_aabbMin[0] <= proxy0->m_aabbMax[0] &&
+		   proxy0->m_aabbMin[1] <= proxy1->m_aabbMax[1] && proxy1->m_aabbMin[1] <= proxy0->m_aabbMax[1] &&
+		   proxy0->m_aabbMin[2] <= proxy1->m_aabbMax[2] && proxy1->m_aabbMin[2] <= proxy0->m_aabbMax[2];
+}
+
+//then remove non-overlapping ones
+class CheckOverlapCallback : public btOverlapCallback
+{
+public:
+	virtual bool processOverlap(btBroadphasePair& pair)
+	{
+		return (!btSimpleBroadphase::aabbOverlap(static_cast<btSimpleBroadphaseProxy*>(pair.m_pProxy0), static_cast<btSimpleBroadphaseProxy*>(pair.m_pProxy1)));
+	}
+};
+
+void btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
+{
+	//first check for new overlapping pairs
+	int i, j;
+	if (m_numHandles >= 0)
+	{
+		int new_largest_index = -1;
+		for (i = 0; i <= m_LastHandleIndex; i++)
+		{
+			btSimpleBroadphaseProxy* proxy0 = &m_pHandles[i];
+			if (!proxy0->m_clientObject)
+			{
+				continue;
+			}
+			new_largest_index = i;
+			for (j = i + 1; j <= m_LastHandleIndex; j++)
+			{
+				btSimpleBroadphaseProxy* proxy1 = &m_pHandles[j];
+				btAssert(proxy0 != proxy1);
+				if (!proxy1->m_clientObject)
+				{
+					continue;
+				}
+
+				btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
+				btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
+
+				if (aabbOverlap(p0, p1))
+				{
+					if (!m_pairCache->findPair(proxy0, proxy1))
+					{
+						m_pairCache->addOverlappingPair(proxy0, proxy1);
+					}
+				}
+				else
+				{
+					if (!m_pairCache->hasDeferredRemoval())
+					{
+						if (m_pairCache->findPair(proxy0, proxy1))
+						{
+							m_pairCache->removeOverlappingPair(proxy0, proxy1, dispatcher);
+						}
+					}
+				}
+			}
+		}
+
+		m_LastHandleIndex = new_largest_index;
+
+		if (m_ownsPairCache && m_pairCache->hasDeferredRemoval())
+		{
+			btBroadphasePairArray& overlappingPairArray = m_pairCache->getOverlappingPairArray();
+
+			//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+			overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+			overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+			m_invalidPair = 0;
+
+			btBroadphasePair previousPair;
+			previousPair.m_pProxy0 = 0;
+			previousPair.m_pProxy1 = 0;
+			previousPair.m_algorithm = 0;
+
+			for (i = 0; i < overlappingPairArray.size(); i++)
+			{
+				btBroadphasePair& pair = overlappingPairArray[i];
+
+				bool isDuplicate = (pair == previousPair);
+
+				previousPair = pair;
+
+				bool needsRemoval = false;
+
+				if (!isDuplicate)
+				{
+					bool hasOverlap = testAabbOverlap(pair.m_pProxy0, pair.m_pProxy1);
+
+					if (hasOverlap)
+					{
+						needsRemoval = false;  //callback->processOverlap(pair);
+					}
+					else
+					{
+						needsRemoval = true;
+					}
+				}
+				else
+				{
+					//remove duplicate
+					needsRemoval = true;
+					//should have no algorithm
+					btAssert(!pair.m_algorithm);
+				}
+
+				if (needsRemoval)
+				{
+					m_pairCache->cleanOverlappingPair(pair, dispatcher);
+
+					//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+					//		m_overlappingPairArray.pop_back();
+					pair.m_pProxy0 = 0;
+					pair.m_pProxy1 = 0;
+					m_invalidPair++;
+				}
+			}
+
+			///if you don't like to skip the invalid pairs in the array, execute following code:
+#define CLEAN_INVALID_PAIRS 1
+#ifdef CLEAN_INVALID_PAIRS
+
+			//perform a sort, to sort 'invalid' pairs to the end
+			overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+			overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+			m_invalidPair = 0;
+#endif  //CLEAN_INVALID_PAIRS
+		}
+	}
+}
+
+bool btSimpleBroadphase::testAabbOverlap(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
+	btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
+	return aabbOverlap(p0, p1);
+}
+
+void btSimpleBroadphase::resetPool(btDispatcher* dispatcher)
+{
+	//not yet
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
new file mode 100644
index 0000000..f97073c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
@@ -0,0 +1,148 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMPLE_BROADPHASE_H
+#define BT_SIMPLE_BROADPHASE_H
+
+#include "btOverlappingPairCache.h"
+
+struct btSimpleBroadphaseProxy : public btBroadphaseProxy
+{
+	int m_nextFree;
+
+	//	int			m_handleId;
+
+	btSimpleBroadphaseProxy(){};
+
+	btSimpleBroadphaseProxy(const btVector3& minpt, const btVector3& maxpt, int shapeType, void* userPtr, int collisionFilterGroup, int collisionFilterMask)
+		: btBroadphaseProxy(minpt, maxpt, userPtr, collisionFilterGroup, collisionFilterMask)
+	{
+		(void)shapeType;
+	}
+
+	SIMD_FORCE_INLINE void SetNextFree(int next) { m_nextFree = next; }
+	SIMD_FORCE_INLINE int GetNextFree() const { return m_nextFree; }
+};
+
+///The SimpleBroadphase is just a unit-test for btAxisSweep3, bt32BitAxisSweep3, or btDbvtBroadphase, so use those classes instead.
+///It is a brute force aabb culling broadphase based on O(n^2) aabb checks
+class btSimpleBroadphase : public btBroadphaseInterface
+{
+protected:
+	int m_numHandles;  // number of active handles
+	int m_maxHandles;  // max number of handles
+	int m_LastHandleIndex;
+
+	btSimpleBroadphaseProxy* m_pHandles;  // handles pool
+
+	void* m_pHandlesRawPtr;
+	int m_firstFreeHandle;  // free handles list
+
+	int allocHandle()
+	{
+		btAssert(m_numHandles < m_maxHandles);
+		int freeHandle = m_firstFreeHandle;
+		m_firstFreeHandle = m_pHandles[freeHandle].GetNextFree();
+		m_numHandles++;
+		if (freeHandle > m_LastHandleIndex)
+		{
+			m_LastHandleIndex = freeHandle;
+		}
+		return freeHandle;
+	}
+
+	void freeHandle(btSimpleBroadphaseProxy* proxy)
+	{
+		int handle = int(proxy - m_pHandles);
+		btAssert(handle >= 0 && handle < m_maxHandles);
+		if (handle == m_LastHandleIndex)
+		{
+			m_LastHandleIndex--;
+		}
+		proxy->SetNextFree(m_firstFreeHandle);
+		m_firstFreeHandle = handle;
+
+		proxy->m_clientObject = 0;
+
+		m_numHandles--;
+	}
+
+	btOverlappingPairCache* m_pairCache;
+	bool m_ownsPairCache;
+
+	int m_invalidPair;
+
+	inline btSimpleBroadphaseProxy* getSimpleProxyFromProxy(btBroadphaseProxy* proxy)
+	{
+		btSimpleBroadphaseProxy* proxy0 = static_cast<btSimpleBroadphaseProxy*>(proxy);
+		return proxy0;
+	}
+
+	inline const btSimpleBroadphaseProxy* getSimpleProxyFromProxy(btBroadphaseProxy* proxy) const
+	{
+		const btSimpleBroadphaseProxy* proxy0 = static_cast<const btSimpleBroadphaseProxy*>(proxy);
+		return proxy0;
+	}
+
+	///reset broadphase internal structures, to ensure determinism/reproducability
+	virtual void resetPool(btDispatcher* dispatcher);
+
+	void validate();
+
+protected:
+public:
+	btSimpleBroadphase(int maxProxies = 16384, btOverlappingPairCache* overlappingPairCache = 0);
+	virtual ~btSimpleBroadphase();
+
+	static bool aabbOverlap(btSimpleBroadphaseProxy* proxy0, btSimpleBroadphaseProxy* proxy1);
+
+	virtual btBroadphaseProxy* createProxy(const btVector3& aabbMin, const btVector3& aabbMax, int shapeType, void* userPtr, int collisionFilterGroup, int collisionFilterMask, btDispatcher* dispatcher);
+
+	virtual void calculateOverlappingPairs(btDispatcher* dispatcher);
+
+	virtual void destroyProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher);
+	virtual void setAabb(btBroadphaseProxy* proxy, const btVector3& aabbMin, const btVector3& aabbMax, btDispatcher* dispatcher);
+	virtual void getAabb(btBroadphaseProxy* proxy, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin = btVector3(0, 0, 0), const btVector3& aabbMax = btVector3(0, 0, 0));
+	virtual void aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback);
+
+	btOverlappingPairCache* getOverlappingPairCache()
+	{
+		return m_pairCache;
+	}
+	const btOverlappingPairCache* getOverlappingPairCache() const
+	{
+		return m_pairCache;
+	}
+
+	bool testAabbOverlap(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1);
+
+	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
+	///will add some transform later
+	virtual void getBroadphaseAabb(btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		aabbMin.setValue(-BT_LARGE_FLOAT, -BT_LARGE_FLOAT, -BT_LARGE_FLOAT);
+		aabbMax.setValue(BT_LARGE_FLOAT, BT_LARGE_FLOAT, BT_LARGE_FLOAT);
+	}
+
+	virtual void printStats()
+	{
+		//		printf("btSimpleBroadphase.h\n");
+		//		printf("numHandles = %d, maxHandles = %d\n",m_numHandles,m_maxHandles);
+	}
+};
+
+#endif  //BT_SIMPLE_BROADPHASE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CMakeLists.txt b/dali-physics/third-party/bullet3/src/BulletCollision/CMakeLists.txt
new file mode 100644
index 0000000..f5d7255
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CMakeLists.txt
@@ -0,0 +1,294 @@
+INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src  )
+
+SET(BulletCollision_SRCS
+	BroadphaseCollision/btAxisSweep3.cpp
+	BroadphaseCollision/btBroadphaseProxy.cpp
+	BroadphaseCollision/btCollisionAlgorithm.cpp
+	BroadphaseCollision/btDbvt.cpp
+	BroadphaseCollision/btDbvtBroadphase.cpp
+	BroadphaseCollision/btDispatcher.cpp
+	BroadphaseCollision/btOverlappingPairCache.cpp
+	BroadphaseCollision/btQuantizedBvh.cpp
+	BroadphaseCollision/btSimpleBroadphase.cpp
+	CollisionDispatch/btActivatingCollisionAlgorithm.cpp
+	CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
+	CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
+	CollisionDispatch/btBoxBoxDetector.cpp
+	CollisionDispatch/btCollisionDispatcher.cpp
+	CollisionDispatch/btCollisionDispatcherMt.cpp
+	CollisionDispatch/btCollisionObject.cpp
+	CollisionDispatch/btCollisionWorld.cpp
+	CollisionDispatch/btCollisionWorldImporter.cpp
+	CollisionDispatch/btCompoundCollisionAlgorithm.cpp
+	CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
+	CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
+	CollisionDispatch/btConvexConvexAlgorithm.cpp
+	CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+	CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
+	CollisionDispatch/btDefaultCollisionConfiguration.cpp
+	CollisionDispatch/btEmptyCollisionAlgorithm.cpp
+	CollisionDispatch/btGhostObject.cpp
+	CollisionDispatch/btHashedSimplePairCache.cpp
+	CollisionDispatch/btInternalEdgeUtility.cpp
+	CollisionDispatch/btInternalEdgeUtility.h
+	CollisionDispatch/btManifoldResult.cpp
+	CollisionDispatch/btSimulationIslandManager.cpp
+	CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
+	CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
+	CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
+	CollisionDispatch/btUnionFind.cpp
+	CollisionDispatch/SphereTriangleDetector.cpp
+	CollisionShapes/btBoxShape.cpp
+	CollisionShapes/btBox2dShape.cpp
+	CollisionShapes/btBvhTriangleMeshShape.cpp
+	CollisionShapes/btCapsuleShape.cpp
+	CollisionShapes/btCollisionShape.cpp
+	CollisionShapes/btCompoundShape.cpp
+	CollisionShapes/btConcaveShape.cpp
+	CollisionShapes/btConeShape.cpp
+	CollisionShapes/btConvexHullShape.cpp
+	CollisionShapes/btConvexInternalShape.cpp
+	CollisionShapes/btConvexPointCloudShape.cpp
+	CollisionShapes/btConvexPolyhedron.cpp
+	CollisionShapes/btConvexShape.cpp
+	CollisionShapes/btConvex2dShape.cpp
+	CollisionShapes/btConvexTriangleMeshShape.cpp
+	CollisionShapes/btCylinderShape.cpp
+	CollisionShapes/btEmptyShape.cpp
+	CollisionShapes/btHeightfieldTerrainShape.cpp
+	CollisionShapes/btMiniSDF.cpp
+	CollisionShapes/btMinkowskiSumShape.cpp
+	CollisionShapes/btMultimaterialTriangleMeshShape.cpp
+	CollisionShapes/btMultiSphereShape.cpp
+	CollisionShapes/btOptimizedBvh.cpp
+	CollisionShapes/btPolyhedralConvexShape.cpp
+	CollisionShapes/btScaledBvhTriangleMeshShape.cpp
+	CollisionShapes/btSdfCollisionShape.cpp
+	CollisionShapes/btShapeHull.cpp
+	CollisionShapes/btSphereShape.cpp
+	CollisionShapes/btStaticPlaneShape.cpp
+	CollisionShapes/btStridingMeshInterface.cpp
+	CollisionShapes/btTetrahedronShape.cpp
+	CollisionShapes/btTriangleBuffer.cpp
+	CollisionShapes/btTriangleCallback.cpp
+	CollisionShapes/btTriangleIndexVertexArray.cpp
+	CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
+	CollisionShapes/btTriangleMesh.cpp
+	CollisionShapes/btTriangleMeshShape.cpp
+	CollisionShapes/btUniformScalingShape.cpp
+	Gimpact/btContactProcessing.cpp
+	Gimpact/btGenericPoolAllocator.cpp
+	Gimpact/btGImpactBvh.cpp
+	Gimpact/btGImpactCollisionAlgorithm.cpp
+	Gimpact/btGImpactQuantizedBvh.cpp
+	Gimpact/btGImpactShape.cpp
+	Gimpact/btTriangleShapeEx.cpp
+	Gimpact/gim_box_set.cpp
+	Gimpact/gim_contact.cpp
+	Gimpact/gim_memory.cpp
+	Gimpact/gim_tri_collision.cpp
+	NarrowPhaseCollision/btContinuousConvexCollision.cpp
+	NarrowPhaseCollision/btConvexCast.cpp
+	NarrowPhaseCollision/btGjkConvexCast.cpp
+	NarrowPhaseCollision/btGjkEpa2.cpp
+	NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
+	NarrowPhaseCollision/btGjkPairDetector.cpp
+	NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
+	NarrowPhaseCollision/btPersistentManifold.cpp
+	NarrowPhaseCollision/btRaycastCallback.cpp
+	NarrowPhaseCollision/btSubSimplexConvexCast.cpp
+	NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+	NarrowPhaseCollision/btPolyhedralContactClipping.cpp
+)
+
+SET(Root_HDRS
+	../btBulletCollisionCommon.h
+)
+SET(BroadphaseCollision_HDRS
+    BroadphaseCollision/btAxisSweep3Internal.h
+	BroadphaseCollision/btAxisSweep3.h
+	BroadphaseCollision/btBroadphaseInterface.h
+	BroadphaseCollision/btBroadphaseProxy.h
+	BroadphaseCollision/btCollisionAlgorithm.h
+	BroadphaseCollision/btDbvt.h
+	BroadphaseCollision/btDbvtBroadphase.h
+	BroadphaseCollision/btDispatcher.h
+	BroadphaseCollision/btOverlappingPairCache.h
+	BroadphaseCollision/btOverlappingPairCallback.h
+	BroadphaseCollision/btQuantizedBvh.h
+	BroadphaseCollision/btSimpleBroadphase.h
+)
+SET(CollisionDispatch_HDRS
+	CollisionDispatch/btActivatingCollisionAlgorithm.h
+	CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+	CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
+	CollisionDispatch/btBoxBoxDetector.h
+	CollisionDispatch/btCollisionConfiguration.h
+	CollisionDispatch/btCollisionCreateFunc.h
+	CollisionDispatch/btCollisionDispatcher.h
+	CollisionDispatch/btCollisionDispatcherMt.h
+	CollisionDispatch/btCollisionObject.h
+	CollisionDispatch/btCollisionObjectWrapper.h
+	CollisionDispatch/btCollisionWorld.h
+	CollisionDispatch/btCollisionWorldImporter.h
+	CollisionDispatch/btCompoundCollisionAlgorithm.h
+	CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
+	CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
+	CollisionDispatch/btConvexConvexAlgorithm.h
+	CollisionDispatch/btConvex2dConvex2dAlgorithm.h
+	CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
+	CollisionDispatch/btDefaultCollisionConfiguration.h
+	CollisionDispatch/btEmptyCollisionAlgorithm.h
+	CollisionDispatch/btGhostObject.h
+	CollisionDispatch/btHashedSimplePairCache.h
+	CollisionDispatch/btManifoldResult.h
+	CollisionDispatch/btSimulationIslandManager.h
+	CollisionDispatch/btSphereBoxCollisionAlgorithm.h
+	CollisionDispatch/btSphereSphereCollisionAlgorithm.h
+	CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
+	CollisionDispatch/btUnionFind.h
+	CollisionDispatch/SphereTriangleDetector.h
+)
+SET(CollisionShapes_HDRS
+	CollisionShapes/btBoxShape.h
+	CollisionShapes/btBox2dShape.h
+	CollisionShapes/btBvhTriangleMeshShape.h
+	CollisionShapes/btCapsuleShape.h
+	CollisionShapes/btCollisionMargin.h
+	CollisionShapes/btCollisionShape.h
+	CollisionShapes/btCompoundShape.h
+	CollisionShapes/btConcaveShape.h
+	CollisionShapes/btConeShape.h
+	CollisionShapes/btConvexHullShape.h
+	CollisionShapes/btConvexInternalShape.h
+	CollisionShapes/btConvexPointCloudShape.h
+	CollisionShapes/btConvexPolyhedron.h
+	CollisionShapes/btConvexShape.h
+	CollisionShapes/btConvex2dShape.h
+	CollisionShapes/btConvexTriangleMeshShape.h
+	CollisionShapes/btCylinderShape.h
+	CollisionShapes/btEmptyShape.h
+	CollisionShapes/btHeightfieldTerrainShape.h
+	CollisionShapes/btMaterial.h
+	CollisionShapes/btMinkowskiSumShape.h
+	CollisionShapes/btMultimaterialTriangleMeshShape.h
+	CollisionShapes/btMultiSphereShape.h
+	CollisionShapes/btOptimizedBvh.h
+	CollisionShapes/btPolyhedralConvexShape.h
+	CollisionShapes/btScaledBvhTriangleMeshShape.h
+	CollisionShapes/btShapeHull.h
+	CollisionShapes/btSphereShape.h
+	CollisionShapes/btStaticPlaneShape.h
+	CollisionShapes/btStridingMeshInterface.h
+	CollisionShapes/btTetrahedronShape.h
+	CollisionShapes/btTriangleBuffer.h
+	CollisionShapes/btTriangleCallback.h
+	CollisionShapes/btTriangleIndexVertexArray.h
+	CollisionShapes/btTriangleIndexVertexMaterialArray.h
+	CollisionShapes/btTriangleInfoMap.h
+	CollisionShapes/btTriangleMesh.h
+	CollisionShapes/btTriangleMeshShape.h
+	CollisionShapes/btTriangleShape.h
+	CollisionShapes/btUniformScalingShape.h
+)
+SET(Gimpact_HDRS
+	Gimpact/btBoxCollision.h
+	Gimpact/btClipPolygon.h
+	Gimpact/btContactProcessingStructs.h
+	Gimpact/btContactProcessing.h
+	Gimpact/btGenericPoolAllocator.h
+	Gimpact/btGeometryOperations.h
+	Gimpact/btGImpactBvhStructs.h
+	Gimpact/btGImpactBvh.h
+	Gimpact/btGImpactCollisionAlgorithm.h
+	Gimpact/btGImpactMassUtil.h
+	Gimpact/btGImpactQuantizedBvhStructs.h
+	Gimpact/btGImpactQuantizedBvh.h
+	Gimpact/btGImpactShape.h
+	Gimpact/btQuantization.h
+	Gimpact/btTriangleShapeEx.h
+	Gimpact/gim_array.h
+	Gimpact/gim_basic_geometry_operations.h
+	Gimpact/gim_bitset.h
+	Gimpact/gim_box_collision.h
+	Gimpact/gim_box_set.h
+	Gimpact/gim_clip_polygon.h
+	Gimpact/gim_contact.h
+	Gimpact/gim_geom_types.h
+	Gimpact/gim_geometry.h
+	Gimpact/gim_hash_table.h
+	Gimpact/gim_linear_math.h
+	Gimpact/gim_math.h
+	Gimpact/gim_memory.h
+	Gimpact/gim_radixsort.h
+	Gimpact/gim_tri_collision.h
+)
+SET(NarrowPhaseCollision_HDRS
+	NarrowPhaseCollision/btContinuousConvexCollision.h
+	NarrowPhaseCollision/btConvexCast.h
+	NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
+	NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+	NarrowPhaseCollision/btGjkConvexCast.h
+	NarrowPhaseCollision/btGjkEpa2.h
+	NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
+	NarrowPhaseCollision/btGjkPairDetector.h
+	NarrowPhaseCollision/btManifoldPoint.h
+	NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
+	NarrowPhaseCollision/btPersistentManifold.h
+	NarrowPhaseCollision/btPointCollector.h
+	NarrowPhaseCollision/btRaycastCallback.h
+	NarrowPhaseCollision/btSimplexSolverInterface.h
+	NarrowPhaseCollision/btSubSimplexConvexCast.h
+	NarrowPhaseCollision/btVoronoiSimplexSolver.h
+	NarrowPhaseCollision/btPolyhedralContactClipping.h
+)
+
+SET(BulletCollision_HDRS
+	${Root_HDRS}
+	${BroadphaseCollision_HDRS}
+	${CollisionDispatch_HDRS}
+	${CollisionShapes_HDRS}
+	${Gimpact_HDRS}
+	${NarrowPhaseCollision_HDRS}
+)
+
+
+ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
+SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION})
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
+ENDIF (BUILD_SHARED_LIBS)
+
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#INSTALL of other files requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS BulletCollision DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS BulletCollision RUNTIME DESTINATION bin
+								LIBRARY DESTINATION lib${LIB_SUFFIX}
+								ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+				INSTALL(FILES ../btBulletCollisionCommon.h
+DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true)
+
+			SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
+			# Have to list out sub-directories manually:
+			SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
+			SET_PROPERTY(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch)
+			SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes)
+			SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact)
+			SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
+
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
new file mode 100644
index 0000000..5715210
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
@@ -0,0 +1,215 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btScalar.h"
+#include "SphereTriangleDetector.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+
+SphereTriangleDetector::SphereTriangleDetector(btSphereShape* sphere, btTriangleShape* triangle, btScalar contactBreakingThreshold)
+	: m_sphere(sphere),
+	  m_triangle(triangle),
+	  m_contactBreakingThreshold(contactBreakingThreshold)
+{
+}
+
+void SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw, bool swapResults)
+{
+	(void)debugDraw;
+	const btTransform& transformA = input.m_transformA;
+	const btTransform& transformB = input.m_transformB;
+
+	btVector3 point, normal;
+	btScalar timeOfImpact = btScalar(1.);
+	btScalar depth = btScalar(0.);
+	//	output.m_distance = btScalar(BT_LARGE_FLOAT);
+	//move sphere into triangle space
+	btTransform sphereInTr = transformB.inverseTimes(transformA);
+
+	if (collide(sphereInTr.getOrigin(), point, normal, depth, timeOfImpact, m_contactBreakingThreshold))
+	{
+		if (swapResults)
+		{
+			btVector3 normalOnB = transformB.getBasis() * normal;
+			btVector3 normalOnA = -normalOnB;
+			btVector3 pointOnA = transformB * point + normalOnB * depth;
+			output.addContactPoint(normalOnA, pointOnA, depth);
+		}
+		else
+		{
+			output.addContactPoint(transformB.getBasis() * normal, transformB * point, depth);
+		}
+	}
+}
+
+// See also geometrictools.com
+// Basic idea: D = |p - (lo + t0*lv)| where t0 = lv . (p - lo) / lv . lv
+btScalar SegmentSqrDistance(const btVector3& from, const btVector3& to, const btVector3& p, btVector3& nearest);
+
+btScalar SegmentSqrDistance(const btVector3& from, const btVector3& to, const btVector3& p, btVector3& nearest)
+{
+	btVector3 diff = p - from;
+	btVector3 v = to - from;
+	btScalar t = v.dot(diff);
+
+	if (t > 0)
+	{
+		btScalar dotVV = v.dot(v);
+		if (t < dotVV)
+		{
+			t /= dotVV;
+			diff -= t * v;
+		}
+		else
+		{
+			t = 1;
+			diff -= v;
+		}
+	}
+	else
+		t = 0;
+
+	nearest = from + t * v;
+	return diff.dot(diff);
+}
+
+bool SphereTriangleDetector::facecontains(const btVector3& p, const btVector3* vertices, btVector3& normal)
+{
+	btVector3 lp(p);
+	btVector3 lnormal(normal);
+
+	return pointInTriangle(vertices, lnormal, &lp);
+}
+
+bool SphereTriangleDetector::collide(const btVector3& sphereCenter, btVector3& point, btVector3& resultNormal, btScalar& depth, btScalar& timeOfImpact, btScalar contactBreakingThreshold)
+{
+	const btVector3* vertices = &m_triangle->getVertexPtr(0);
+
+	btScalar radius = m_sphere->getRadius();
+	btScalar radiusWithThreshold = radius + contactBreakingThreshold;
+
+	btVector3 normal = (vertices[1] - vertices[0]).cross(vertices[2] - vertices[0]);
+
+	btScalar l2 = normal.length2();
+	bool hasContact = false;
+	btVector3 contactPoint;
+
+	if (l2 >= SIMD_EPSILON * SIMD_EPSILON)
+	{
+		normal /= btSqrt(l2);
+
+		btVector3 p1ToCentre = sphereCenter - vertices[0];
+		btScalar distanceFromPlane = p1ToCentre.dot(normal);
+
+		if (distanceFromPlane < btScalar(0.))
+		{
+			//triangle facing the other way
+			distanceFromPlane *= btScalar(-1.);
+			normal *= btScalar(-1.);
+		}
+
+		bool isInsideContactPlane = distanceFromPlane < radiusWithThreshold;
+
+		// Check for contact / intersection
+
+		if (isInsideContactPlane)
+		{
+			if (facecontains(sphereCenter, vertices, normal))
+			{
+				// Inside the contact wedge - touches a point on the shell plane
+				hasContact = true;
+				contactPoint = sphereCenter - normal * distanceFromPlane;
+			}
+			else
+			{
+				// Could be inside one of the contact capsules
+				btScalar contactCapsuleRadiusSqr = radiusWithThreshold * radiusWithThreshold;
+				btScalar minDistSqr = contactCapsuleRadiusSqr;
+				btVector3 nearestOnEdge;
+				for (int i = 0; i < m_triangle->getNumEdges(); i++)
+				{
+					btVector3 pa;
+					btVector3 pb;
+
+					m_triangle->getEdge(i, pa, pb);
+
+					btScalar distanceSqr = SegmentSqrDistance(pa, pb, sphereCenter, nearestOnEdge);
+					if (distanceSqr < minDistSqr)
+					{
+						// Yep, we're inside a capsule, and record the capsule with smallest distance
+						minDistSqr = distanceSqr;
+						hasContact = true;
+						contactPoint = nearestOnEdge;
+					}
+				}
+			}
+		}
+	}
+
+	if (hasContact)
+	{
+		btVector3 contactToCentre = sphereCenter - contactPoint;
+		btScalar distanceSqr = contactToCentre.length2();
+
+		if (distanceSqr < radiusWithThreshold * radiusWithThreshold)
+		{
+			if (distanceSqr > SIMD_EPSILON)
+			{
+				btScalar distance = btSqrt(distanceSqr);
+				resultNormal = contactToCentre;
+				resultNormal.normalize();
+				point = contactPoint;
+				depth = -(radius - distance);
+			}
+			else
+			{
+				resultNormal = normal;
+				point = contactPoint;
+				depth = -radius;
+			}
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool SphereTriangleDetector::pointInTriangle(const btVector3 vertices[], const btVector3& normal, btVector3* p)
+{
+	const btVector3* p1 = &vertices[0];
+	const btVector3* p2 = &vertices[1];
+	const btVector3* p3 = &vertices[2];
+
+	btVector3 edge1(*p2 - *p1);
+	btVector3 edge2(*p3 - *p2);
+	btVector3 edge3(*p1 - *p3);
+
+	btVector3 p1_to_p(*p - *p1);
+	btVector3 p2_to_p(*p - *p2);
+	btVector3 p3_to_p(*p - *p3);
+
+	btVector3 edge1_normal(edge1.cross(normal));
+	btVector3 edge2_normal(edge2.cross(normal));
+	btVector3 edge3_normal(edge3.cross(normal));
+
+	btScalar r1, r2, r3;
+	r1 = edge1_normal.dot(p1_to_p);
+	r2 = edge2_normal.dot(p2_to_p);
+	r3 = edge3_normal.dot(p3_to_p);
+	if ((r1 > 0 && r2 > 0 && r3 > 0) ||
+		(r1 <= 0 && r2 <= 0 && r3 <= 0))
+		return true;
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
new file mode 100644
index 0000000..01ebfe4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
@@ -0,0 +1,43 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SPHERE_TRIANGLE_DETECTOR_H
+#define BT_SPHERE_TRIANGLE_DETECTOR_H
+
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+
+class btSphereShape;
+class btTriangleShape;
+
+/// sphere-triangle to match the btDiscreteCollisionDetectorInterface
+struct SphereTriangleDetector : public btDiscreteCollisionDetectorInterface
+{
+	virtual void getClosestPoints(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw, bool swapResults = false);
+
+	SphereTriangleDetector(btSphereShape* sphere, btTriangleShape* triangle, btScalar contactBreakingThreshold);
+
+	virtual ~SphereTriangleDetector(){};
+
+	bool collide(const btVector3& sphereCenter, btVector3& point, btVector3& resultNormal, btScalar& depth, btScalar& timeOfImpact, btScalar contactBreakingThreshold);
+
+private:
+	bool pointInTriangle(const btVector3 vertices[], const btVector3& normal, btVector3* p);
+	bool facecontains(const btVector3& p, const btVector3* vertices, btVector3& normal);
+
+	btSphereShape* m_sphere;
+	btTriangleShape* m_triangle;
+	btScalar m_contactBreakingThreshold;
+};
+#endif  //BT_SPHERE_TRIANGLE_DETECTOR_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
new file mode 100644
index 0000000..ac5de45
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
@@ -0,0 +1,47 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "btCollisionDispatcher.h"
+#include "btCollisionObject.h"
+
+btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+	: btCollisionAlgorithm(ci)
+//,
+//m_colObj0(0),
+//m_colObj1(0)
+{
+}
+btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper*, const btCollisionObjectWrapper*)
+	: btCollisionAlgorithm(ci)
+//,
+//m_colObj0(0),
+//m_colObj1(0)
+{
+	//	if (ci.m_dispatcher1->needsCollision(colObj0,colObj1))
+	//	{
+	//		m_colObj0 = colObj0;
+	//		m_colObj1 = colObj1;
+	//
+	//		m_colObj0->activate();
+	//		m_colObj1->activate();
+	//	}
+}
+
+btActivatingCollisionAlgorithm::~btActivatingCollisionAlgorithm()
+{
+	//		m_colObj0->activate();
+	//		m_colObj1->activate();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
new file mode 100644
index 0000000..8620605
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
@@ -0,0 +1,35 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __BT_ACTIVATING_COLLISION_ALGORITHM_H
+#define __BT_ACTIVATING_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+
+///This class is not enabled yet (work-in-progress) to more aggressively activate objects.
+class btActivatingCollisionAlgorithm : public btCollisionAlgorithm
+{
+	//	btCollisionObject* m_colObj0;
+	//	btCollisionObject* m_colObj1;
+
+protected:
+	btActivatingCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci);
+
+	btActivatingCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap);
+
+public:
+	virtual ~btActivatingCollisionAlgorithm();
+};
+#endif  //__BT_ACTIVATING_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
new file mode 100644
index 0000000..6873a95
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
@@ -0,0 +1,411 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+* The b2CollidePolygons routines are Copyright (c) 2006-2007 Erin Catto http://www.gphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///btBox2dBox2dCollisionAlgorithm, with modified b2CollidePolygons routines from the Box2D library.
+///The modifications include: switching from b2Vec to btVector3, redefinition of b2Dot, b2Cross
+
+#include "btBox2dBox2dCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionDispatch/btBoxBoxDetector.h"
+#include "BulletCollision/CollisionShapes/btBox2dShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+#define USE_PERSISTENT_CONTACTS 1
+
+btBox2dBox2dCollisionAlgorithm::btBox2dBox2dCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* obj0Wrap, const btCollisionObjectWrapper* obj1Wrap)
+	: btActivatingCollisionAlgorithm(ci, obj0Wrap, obj1Wrap),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf)
+{
+	if (!m_manifoldPtr && m_dispatcher->needsCollision(obj0Wrap->getCollisionObject(), obj1Wrap->getCollisionObject()))
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(obj0Wrap->getCollisionObject(), obj1Wrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+}
+
+btBox2dBox2dCollisionAlgorithm::~btBox2dBox2dCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void b2CollidePolygons(btManifoldResult* manifold, const btBox2dShape* polyA, const btTransform& xfA, const btBox2dShape* polyB, const btTransform& xfB);
+
+//#include <stdio.h>
+void btBox2dBox2dCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	if (!m_manifoldPtr)
+		return;
+
+	const btBox2dShape* box0 = (const btBox2dShape*)body0Wrap->getCollisionShape();
+	const btBox2dShape* box1 = (const btBox2dShape*)body1Wrap->getCollisionShape();
+
+	resultOut->setPersistentManifold(m_manifoldPtr);
+
+	b2CollidePolygons(resultOut, box0, body0Wrap->getWorldTransform(), box1, body1Wrap->getWorldTransform());
+
+	//  refreshContactPoints is only necessary when using persistent contact points. otherwise all points are newly added
+	if (m_ownManifold)
+	{
+		resultOut->refreshContactPoints();
+	}
+}
+
+btScalar btBox2dBox2dCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* /*body0*/, btCollisionObject* /*body1*/, const btDispatcherInfo& /*dispatchInfo*/, btManifoldResult* /*resultOut*/)
+{
+	//not yet
+	return 1.f;
+}
+
+struct ClipVertex
+{
+	btVector3 v;
+	int id;
+	//b2ContactID id;
+	//b2ContactID id;
+};
+
+#define b2Dot(a, b) (a).dot(b)
+#define b2Mul(a, b) (a) * (b)
+#define b2MulT(a, b) (a).transpose() * (b)
+#define b2Cross(a, b) (a).cross(b)
+#define btCrossS(a, s) btVector3(s* a.getY(), -s* a.getX(), 0.f)
+
+int b2_maxManifoldPoints = 2;
+
+static int ClipSegmentToLine(ClipVertex vOut[2], ClipVertex vIn[2],
+							 const btVector3& normal, btScalar offset)
+{
+	// Start with no output points
+	int numOut = 0;
+
+	// Calculate the distance of end points to the line
+	btScalar distance0 = b2Dot(normal, vIn[0].v) - offset;
+	btScalar distance1 = b2Dot(normal, vIn[1].v) - offset;
+
+	// If the points are behind the plane
+	if (distance0 <= 0.0f) vOut[numOut++] = vIn[0];
+	if (distance1 <= 0.0f) vOut[numOut++] = vIn[1];
+
+	// If the points are on different sides of the plane
+	if (distance0 * distance1 < 0.0f)
+	{
+		// Find intersection point of edge and plane
+		btScalar interp = distance0 / (distance0 - distance1);
+		vOut[numOut].v = vIn[0].v + interp * (vIn[1].v - vIn[0].v);
+		if (distance0 > 0.0f)
+		{
+			vOut[numOut].id = vIn[0].id;
+		}
+		else
+		{
+			vOut[numOut].id = vIn[1].id;
+		}
+		++numOut;
+	}
+
+	return numOut;
+}
+
+// Find the separation between poly1 and poly2 for a give edge normal on poly1.
+static btScalar EdgeSeparation(const btBox2dShape* poly1, const btTransform& xf1, int edge1,
+							   const btBox2dShape* poly2, const btTransform& xf2)
+{
+	const btVector3* vertices1 = poly1->getVertices();
+	const btVector3* normals1 = poly1->getNormals();
+
+	int count2 = poly2->getVertexCount();
+	const btVector3* vertices2 = poly2->getVertices();
+
+	btAssert(0 <= edge1 && edge1 < poly1->getVertexCount());
+
+	// Convert normal from poly1's frame into poly2's frame.
+	btVector3 normal1World = b2Mul(xf1.getBasis(), normals1[edge1]);
+	btVector3 normal1 = b2MulT(xf2.getBasis(), normal1World);
+
+	// Find support vertex on poly2 for -normal.
+	int index = 0;
+	btScalar minDot = BT_LARGE_FLOAT;
+
+	if (count2 > 0)
+		index = (int)normal1.minDot(vertices2, count2, minDot);
+
+	btVector3 v1 = b2Mul(xf1, vertices1[edge1]);
+	btVector3 v2 = b2Mul(xf2, vertices2[index]);
+	btScalar separation = b2Dot(v2 - v1, normal1World);
+	return separation;
+}
+
+// Find the max separation between poly1 and poly2 using edge normals from poly1.
+static btScalar FindMaxSeparation(int* edgeIndex,
+								  const btBox2dShape* poly1, const btTransform& xf1,
+								  const btBox2dShape* poly2, const btTransform& xf2)
+{
+	int count1 = poly1->getVertexCount();
+	const btVector3* normals1 = poly1->getNormals();
+
+	// Vector pointing from the centroid of poly1 to the centroid of poly2.
+	btVector3 d = b2Mul(xf2, poly2->getCentroid()) - b2Mul(xf1, poly1->getCentroid());
+	btVector3 dLocal1 = b2MulT(xf1.getBasis(), d);
+
+	// Find edge normal on poly1 that has the largest projection onto d.
+	int edge = 0;
+	btScalar maxDot;
+	if (count1 > 0)
+		edge = (int)dLocal1.maxDot(normals1, count1, maxDot);
+
+	// Get the separation for the edge normal.
+	btScalar s = EdgeSeparation(poly1, xf1, edge, poly2, xf2);
+	if (s > 0.0f)
+	{
+		return s;
+	}
+
+	// Check the separation for the previous edge normal.
+	int prevEdge = edge - 1 >= 0 ? edge - 1 : count1 - 1;
+	btScalar sPrev = EdgeSeparation(poly1, xf1, prevEdge, poly2, xf2);
+	if (sPrev > 0.0f)
+	{
+		return sPrev;
+	}
+
+	// Check the separation for the next edge normal.
+	int nextEdge = edge + 1 < count1 ? edge + 1 : 0;
+	btScalar sNext = EdgeSeparation(poly1, xf1, nextEdge, poly2, xf2);
+	if (sNext > 0.0f)
+	{
+		return sNext;
+	}
+
+	// Find the best edge and the search direction.
+	int bestEdge;
+	btScalar bestSeparation;
+	int increment;
+	if (sPrev > s && sPrev > sNext)
+	{
+		increment = -1;
+		bestEdge = prevEdge;
+		bestSeparation = sPrev;
+	}
+	else if (sNext > s)
+	{
+		increment = 1;
+		bestEdge = nextEdge;
+		bestSeparation = sNext;
+	}
+	else
+	{
+		*edgeIndex = edge;
+		return s;
+	}
+
+	// Perform a local search for the best edge normal.
+	for (;;)
+	{
+		if (increment == -1)
+			edge = bestEdge - 1 >= 0 ? bestEdge - 1 : count1 - 1;
+		else
+			edge = bestEdge + 1 < count1 ? bestEdge + 1 : 0;
+
+		s = EdgeSeparation(poly1, xf1, edge, poly2, xf2);
+		if (s > 0.0f)
+		{
+			return s;
+		}
+
+		if (s > bestSeparation)
+		{
+			bestEdge = edge;
+			bestSeparation = s;
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	*edgeIndex = bestEdge;
+	return bestSeparation;
+}
+
+static void FindIncidentEdge(ClipVertex c[2],
+							 const btBox2dShape* poly1, const btTransform& xf1, int edge1,
+							 const btBox2dShape* poly2, const btTransform& xf2)
+{
+	const btVector3* normals1 = poly1->getNormals();
+
+	int count2 = poly2->getVertexCount();
+	const btVector3* vertices2 = poly2->getVertices();
+	const btVector3* normals2 = poly2->getNormals();
+
+	btAssert(0 <= edge1 && edge1 < poly1->getVertexCount());
+
+	// Get the normal of the reference edge in poly2's frame.
+	btVector3 normal1 = b2MulT(xf2.getBasis(), b2Mul(xf1.getBasis(), normals1[edge1]));
+
+	// Find the incident edge on poly2.
+	int index = 0;
+	btScalar minDot = BT_LARGE_FLOAT;
+	for (int i = 0; i < count2; ++i)
+	{
+		btScalar dot = b2Dot(normal1, normals2[i]);
+		if (dot < minDot)
+		{
+			minDot = dot;
+			index = i;
+		}
+	}
+
+	// Build the clip vertices for the incident edge.
+	int i1 = index;
+	int i2 = i1 + 1 < count2 ? i1 + 1 : 0;
+
+	c[0].v = b2Mul(xf2, vertices2[i1]);
+	//	c[0].id.features.referenceEdge = (unsigned char)edge1;
+	//	c[0].id.features.incidentEdge = (unsigned char)i1;
+	//	c[0].id.features.incidentVertex = 0;
+
+	c[1].v = b2Mul(xf2, vertices2[i2]);
+	//	c[1].id.features.referenceEdge = (unsigned char)edge1;
+	//	c[1].id.features.incidentEdge = (unsigned char)i2;
+	//	c[1].id.features.incidentVertex = 1;
+}
+
+// Find edge normal of max separation on A - return if separating axis is found
+// Find edge normal of max separation on B - return if separation axis is found
+// Choose reference edge as min(minA, minB)
+// Find incident edge
+// Clip
+
+// The normal points from 1 to 2
+void b2CollidePolygons(btManifoldResult* manifold,
+					   const btBox2dShape* polyA, const btTransform& xfA,
+					   const btBox2dShape* polyB, const btTransform& xfB)
+{
+	int edgeA = 0;
+	btScalar separationA = FindMaxSeparation(&edgeA, polyA, xfA, polyB, xfB);
+	if (separationA > 0.0f)
+		return;
+
+	int edgeB = 0;
+	btScalar separationB = FindMaxSeparation(&edgeB, polyB, xfB, polyA, xfA);
+	if (separationB > 0.0f)
+		return;
+
+	const btBox2dShape* poly1;  // reference poly
+	const btBox2dShape* poly2;  // incident poly
+	btTransform xf1, xf2;
+	int edge1;  // reference edge
+	unsigned char flip;
+	const btScalar k_relativeTol = 0.98f;
+	const btScalar k_absoluteTol = 0.001f;
+
+	// TODO_ERIN use "radius" of poly for absolute tolerance.
+	if (separationB > k_relativeTol * separationA + k_absoluteTol)
+	{
+		poly1 = polyB;
+		poly2 = polyA;
+		xf1 = xfB;
+		xf2 = xfA;
+		edge1 = edgeB;
+		flip = 1;
+	}
+	else
+	{
+		poly1 = polyA;
+		poly2 = polyB;
+		xf1 = xfA;
+		xf2 = xfB;
+		edge1 = edgeA;
+		flip = 0;
+	}
+
+	ClipVertex incidentEdge[2];
+	FindIncidentEdge(incidentEdge, poly1, xf1, edge1, poly2, xf2);
+
+	int count1 = poly1->getVertexCount();
+	const btVector3* vertices1 = poly1->getVertices();
+
+	btVector3 v11 = vertices1[edge1];
+	btVector3 v12 = edge1 + 1 < count1 ? vertices1[edge1 + 1] : vertices1[0];
+
+	//btVector3 dv = v12 - v11;
+	btVector3 sideNormal = b2Mul(xf1.getBasis(), v12 - v11);
+	sideNormal.normalize();
+	btVector3 frontNormal = btCrossS(sideNormal, 1.0f);
+
+	v11 = b2Mul(xf1, v11);
+	v12 = b2Mul(xf1, v12);
+
+	btScalar frontOffset = b2Dot(frontNormal, v11);
+	btScalar sideOffset1 = -b2Dot(sideNormal, v11);
+	btScalar sideOffset2 = b2Dot(sideNormal, v12);
+
+	// Clip incident edge against extruded edge1 side edges.
+	ClipVertex clipPoints1[2];
+	clipPoints1[0].v.setValue(0, 0, 0);
+	clipPoints1[1].v.setValue(0, 0, 0);
+
+	ClipVertex clipPoints2[2];
+	clipPoints2[0].v.setValue(0, 0, 0);
+	clipPoints2[1].v.setValue(0, 0, 0);
+
+	int np;
+
+	// Clip to box side 1
+	np = ClipSegmentToLine(clipPoints1, incidentEdge, -sideNormal, sideOffset1);
+
+	if (np < 2)
+		return;
+
+	// Clip to negative box side 1
+	np = ClipSegmentToLine(clipPoints2, clipPoints1, sideNormal, sideOffset2);
+
+	if (np < 2)
+	{
+		return;
+	}
+
+	// Now clipPoints2 contains the clipped points.
+	btVector3 manifoldNormal = flip ? -frontNormal : frontNormal;
+
+	int pointCount = 0;
+	for (int i = 0; i < b2_maxManifoldPoints; ++i)
+	{
+		btScalar separation = b2Dot(frontNormal, clipPoints2[i].v) - frontOffset;
+
+		if (separation <= 0.0f)
+		{
+			//b2ManifoldPoint* cp = manifold->points + pointCount;
+			//btScalar separation = separation;
+			//cp->localPoint1 = b2MulT(xfA, clipPoints2[i].v);
+			//cp->localPoint2 = b2MulT(xfB, clipPoints2[i].v);
+
+			manifold->addContactPoint(-manifoldNormal, clipPoints2[i].v, separation);
+
+			//			cp->id = clipPoints2[i].id;
+			//			cp->id.features.flip = flip;
+			++pointCount;
+		}
+	}
+
+	//	manifold->pointCount = pointCount;}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
new file mode 100644
index 0000000..f14fdc0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
@@ -0,0 +1,63 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
+#define BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
+
+#include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+
+class btPersistentManifold;
+
+///box-box collision detection
+class btBox2dBox2dCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+
+public:
+	btBox2dBox2dCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+		: btActivatingCollisionAlgorithm(ci) {}
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	btBox2dBox2dCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap);
+
+	virtual ~btBox2dBox2dCollisionAlgorithm();
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			int bbsize = sizeof(btBox2dBox2dCollisionAlgorithm);
+			void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize);
+			return new (ptr) btBox2dBox2dCollisionAlgorithm(0, ci, body0Wrap, body1Wrap);
+		}
+	};
+};
+
+#endif  //BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
new file mode 100644
index 0000000..39807fc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
@@ -0,0 +1,80 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btBoxBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "btBoxBoxDetector.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+#define USE_PERSISTENT_CONTACTS 1
+
+btBoxBoxCollisionAlgorithm::btBoxBoxCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+	: btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf)
+{
+	if (!m_manifoldPtr && m_dispatcher->needsCollision(body0Wrap->getCollisionObject(), body1Wrap->getCollisionObject()))
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(body0Wrap->getCollisionObject(), body1Wrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+}
+
+btBoxBoxCollisionAlgorithm::~btBoxBoxCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btBoxBoxCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	if (!m_manifoldPtr)
+		return;
+
+	const btBoxShape* box0 = (btBoxShape*)body0Wrap->getCollisionShape();
+	const btBoxShape* box1 = (btBoxShape*)body1Wrap->getCollisionShape();
+
+	/// report a contact. internally this will be kept persistent, and contact reduction is done
+	resultOut->setPersistentManifold(m_manifoldPtr);
+#ifndef USE_PERSISTENT_CONTACTS
+	m_manifoldPtr->clearManifold();
+#endif  //USE_PERSISTENT_CONTACTS
+
+	btDiscreteCollisionDetectorInterface::ClosestPointInput input;
+	input.m_maximumDistanceSquared = BT_LARGE_FLOAT;
+	input.m_transformA = body0Wrap->getWorldTransform();
+	input.m_transformB = body1Wrap->getWorldTransform();
+
+	btBoxBoxDetector detector(box0, box1);
+	detector.getClosestPoints(input, *resultOut, dispatchInfo.m_debugDraw);
+
+#ifdef USE_PERSISTENT_CONTACTS
+	//  refreshContactPoints is only necessary when using persistent contact points. otherwise all points are newly added
+	if (m_ownManifold)
+	{
+		resultOut->refreshContactPoints();
+	}
+#endif  //USE_PERSISTENT_CONTACTS
+}
+
+btScalar btBoxBoxCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* /*body0*/, btCollisionObject* /*body1*/, const btDispatcherInfo& /*dispatchInfo*/, btManifoldResult* /*resultOut*/)
+{
+	//not yet
+	return 1.f;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
new file mode 100644
index 0000000..d657242
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
@@ -0,0 +1,63 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_BOX_BOX__COLLISION_ALGORITHM_H
+#define BT_BOX_BOX__COLLISION_ALGORITHM_H
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+
+class btPersistentManifold;
+
+///box-box collision detection
+class btBoxBoxCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+
+public:
+	btBoxBoxCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+		: btActivatingCollisionAlgorithm(ci) {}
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	btBoxBoxCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap);
+
+	virtual ~btBoxBoxCollisionAlgorithm();
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			int bbsize = sizeof(btBoxBoxCollisionAlgorithm);
+			void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize);
+			return new (ptr) btBoxBoxCollisionAlgorithm(0, ci, body0Wrap, body1Wrap);
+		}
+	};
+};
+
+#endif  //BT_BOX_BOX__COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
new file mode 100644
index 0000000..4b51646
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
@@ -0,0 +1,767 @@
+/*
+ * Box-Box collision detection re-distributed under the ZLib license with permission from Russell L. Smith
+ * Original version is from Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.
+ * All rights reserved.  Email: russ@q12.org   Web: www.q12.org
+ Bullet Continuous Collision Detection and Physics Library
+ Bullet is Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///ODE box-box collision detection is adapted to work with Bullet
+
+#include "btBoxBoxDetector.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+
+#include <float.h>
+#include <string.h>
+
+btBoxBoxDetector::btBoxBoxDetector(const btBoxShape* box1, const btBoxShape* box2)
+	: m_box1(box1),
+	  m_box2(box2)
+{
+}
+
+// given two boxes (p1,R1,side1) and (p2,R2,side2), collide them together and
+// generate contact points. this returns 0 if there is no contact otherwise
+// it returns the number of contacts generated.
+// `normal' returns the contact normal.
+// `depth' returns the maximum penetration depth along that normal.
+// `return_code' returns a number indicating the type of contact that was
+// detected:
+//        1,2,3 = box 2 intersects with a face of box 1
+//        4,5,6 = box 1 intersects with a face of box 2
+//        7..15 = edge-edge contact
+// `maxc' is the maximum number of contacts allowed to be generated, i.e.
+// the size of the `contact' array.
+// `contact' and `skip' are the contact array information provided to the
+// collision functions. this function only fills in the position and depth
+// fields.
+struct dContactGeom;
+#define dDOTpq(a, b, p, q) ((a)[0] * (b)[0] + (a)[p] * (b)[q] + (a)[2 * (p)] * (b)[2 * (q)])
+#define dInfinity FLT_MAX
+
+/*PURE_INLINE btScalar dDOT   (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,1); }
+PURE_INLINE btScalar dDOT13 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,3); }
+PURE_INLINE btScalar dDOT31 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,3,1); }
+PURE_INLINE btScalar dDOT33 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,3,3); }
+*/
+static btScalar dDOT(const btScalar* a, const btScalar* b) { return dDOTpq(a, b, 1, 1); }
+static btScalar dDOT44(const btScalar* a, const btScalar* b) { return dDOTpq(a, b, 4, 4); }
+static btScalar dDOT41(const btScalar* a, const btScalar* b) { return dDOTpq(a, b, 4, 1); }
+static btScalar dDOT14(const btScalar* a, const btScalar* b) { return dDOTpq(a, b, 1, 4); }
+#define dMULTIPLYOP1_331(A, op, B, C)   \
+	{                                   \
+		(A)[0] op dDOT41((B), (C));     \
+		(A)[1] op dDOT41((B + 1), (C)); \
+		(A)[2] op dDOT41((B + 2), (C)); \
+	}
+
+#define dMULTIPLYOP0_331(A, op, B, C) \
+	{                                 \
+		(A)[0] op dDOT((B), (C));     \
+		(A)[1] op dDOT((B + 4), (C)); \
+		(A)[2] op dDOT((B + 8), (C)); \
+	}
+
+#define dMULTIPLY1_331(A, B, C) dMULTIPLYOP1_331(A, =, B, C)
+#define dMULTIPLY0_331(A, B, C) dMULTIPLYOP0_331(A, =, B, C)
+
+typedef btScalar dMatrix3[4 * 3];
+
+void dLineClosestApproach(const btVector3& pa, const btVector3& ua,
+						  const btVector3& pb, const btVector3& ub,
+						  btScalar* alpha, btScalar* beta);
+void dLineClosestApproach(const btVector3& pa, const btVector3& ua,
+						  const btVector3& pb, const btVector3& ub,
+						  btScalar* alpha, btScalar* beta)
+{
+	btVector3 p;
+	p[0] = pb[0] - pa[0];
+	p[1] = pb[1] - pa[1];
+	p[2] = pb[2] - pa[2];
+	btScalar uaub = dDOT(ua, ub);
+	btScalar q1 = dDOT(ua, p);
+	btScalar q2 = -dDOT(ub, p);
+	btScalar d = 1 - uaub * uaub;
+	if (d <= btScalar(0.0001f))
+	{
+		// @@@ this needs to be made more robust
+		*alpha = 0;
+		*beta = 0;
+	}
+	else
+	{
+		d = 1.f / d;
+		*alpha = (q1 + uaub * q2) * d;
+		*beta = (uaub * q1 + q2) * d;
+	}
+}
+
+// find all the intersection points between the 2D rectangle with vertices
+// at (+/-h[0],+/-h[1]) and the 2D quadrilateral with vertices (p[0],p[1]),
+// (p[2],p[3]),(p[4],p[5]),(p[6],p[7]).
+//
+// the intersection points are returned as x,y pairs in the 'ret' array.
+// the number of intersection points is returned by the function (this will
+// be in the range 0 to 8).
+
+static int intersectRectQuad2(btScalar h[2], btScalar p[8], btScalar ret[16])
+{
+	// q (and r) contain nq (and nr) coordinate points for the current (and
+	// chopped) polygons
+	int nq = 4, nr = 0;
+	btScalar buffer[16];
+	btScalar* q = p;
+	btScalar* r = ret;
+	for (int dir = 0; dir <= 1; dir++)
+	{
+		// direction notation: xy[0] = x axis, xy[1] = y axis
+		for (int sign = -1; sign <= 1; sign += 2)
+		{
+			// chop q along the line xy[dir] = sign*h[dir]
+			btScalar* pq = q;
+			btScalar* pr = r;
+			nr = 0;
+			for (int i = nq; i > 0; i--)
+			{
+				// go through all points in q and all lines between adjacent points
+				if (sign * pq[dir] < h[dir])
+				{
+					// this point is inside the chopping line
+					pr[0] = pq[0];
+					pr[1] = pq[1];
+					pr += 2;
+					nr++;
+					if (nr & 8)
+					{
+						q = r;
+						goto done;
+					}
+				}
+				btScalar* nextq = (i > 1) ? pq + 2 : q;
+				if ((sign * pq[dir] < h[dir]) ^ (sign * nextq[dir] < h[dir]))
+				{
+					// this line crosses the chopping line
+					pr[1 - dir] = pq[1 - dir] + (nextq[1 - dir] - pq[1 - dir]) /
+													(nextq[dir] - pq[dir]) * (sign * h[dir] - pq[dir]);
+					pr[dir] = sign * h[dir];
+					pr += 2;
+					nr++;
+					if (nr & 8)
+					{
+						q = r;
+						goto done;
+					}
+				}
+				pq += 2;
+			}
+			q = r;
+			r = (q == ret) ? buffer : ret;
+			nq = nr;
+		}
+	}
+done:
+	if (q != ret) memcpy(ret, q, nr * 2 * sizeof(btScalar));
+	return nr;
+}
+
+#define M__PI 3.14159265f
+
+// given n points in the plane (array p, of size 2*n), generate m points that
+// best represent the whole set. the definition of 'best' here is not
+// predetermined - the idea is to select points that give good box-box
+// collision detection behavior. the chosen point indexes are returned in the
+// array iret (of size m). 'i0' is always the first entry in the array.
+// n must be in the range [1..8]. m must be in the range [1..n]. i0 must be
+// in the range [0..n-1].
+
+void cullPoints2(int n, btScalar p[], int m, int i0, int iret[]);
+void cullPoints2(int n, btScalar p[], int m, int i0, int iret[])
+{
+	// compute the centroid of the polygon in cx,cy
+	int i, j;
+	btScalar a, cx, cy, q;
+	if (n == 1)
+	{
+		cx = p[0];
+		cy = p[1];
+	}
+	else if (n == 2)
+	{
+		cx = btScalar(0.5) * (p[0] + p[2]);
+		cy = btScalar(0.5) * (p[1] + p[3]);
+	}
+	else
+	{
+		a = 0;
+		cx = 0;
+		cy = 0;
+		for (i = 0; i < (n - 1); i++)
+		{
+			q = p[i * 2] * p[i * 2 + 3] - p[i * 2 + 2] * p[i * 2 + 1];
+			a += q;
+			cx += q * (p[i * 2] + p[i * 2 + 2]);
+			cy += q * (p[i * 2 + 1] + p[i * 2 + 3]);
+		}
+		q = p[n * 2 - 2] * p[1] - p[0] * p[n * 2 - 1];
+		if (btFabs(a + q) > SIMD_EPSILON)
+		{
+			a = 1.f / (btScalar(3.0) * (a + q));
+		}
+		else
+		{
+			a = BT_LARGE_FLOAT;
+		}
+		cx = a * (cx + q * (p[n * 2 - 2] + p[0]));
+		cy = a * (cy + q * (p[n * 2 - 1] + p[1]));
+	}
+
+	// compute the angle of each point w.r.t. the centroid
+	btScalar A[8];
+	for (i = 0; i < n; i++) A[i] = btAtan2(p[i * 2 + 1] - cy, p[i * 2] - cx);
+
+	// search for points that have angles closest to A[i0] + i*(2*pi/m).
+	int avail[8];
+	for (i = 0; i < n; i++) avail[i] = 1;
+	avail[i0] = 0;
+	iret[0] = i0;
+	iret++;
+	for (j = 1; j < m; j++)
+	{
+		a = btScalar(j) * (2 * M__PI / m) + A[i0];
+		if (a > M__PI) a -= 2 * M__PI;
+		btScalar maxdiff = 1e9, diff;
+
+		*iret = i0;  // iret is not allowed to keep this value, but it sometimes does, when diff=#QNAN0
+
+		for (i = 0; i < n; i++)
+		{
+			if (avail[i])
+			{
+				diff = btFabs(A[i] - a);
+				if (diff > M__PI) diff = 2 * M__PI - diff;
+				if (diff < maxdiff)
+				{
+					maxdiff = diff;
+					*iret = i;
+				}
+			}
+		}
+#if defined(DEBUG) || defined(_DEBUG)
+		btAssert(*iret != i0);  // ensure iret got set
+#endif
+		avail[*iret] = 0;
+		iret++;
+	}
+}
+
+int dBoxBox2(const btVector3& p1, const dMatrix3 R1,
+			 const btVector3& side1, const btVector3& p2,
+			 const dMatrix3 R2, const btVector3& side2,
+			 btVector3& normal, btScalar* depth, int* return_code,
+			 int maxc, dContactGeom* /*contact*/, int /*skip*/, btDiscreteCollisionDetectorInterface::Result& output);
+int dBoxBox2(const btVector3& p1, const dMatrix3 R1,
+			 const btVector3& side1, const btVector3& p2,
+			 const dMatrix3 R2, const btVector3& side2,
+			 btVector3& normal, btScalar* depth, int* return_code,
+			 int maxc, dContactGeom* /*contact*/, int /*skip*/, btDiscreteCollisionDetectorInterface::Result& output)
+{
+	const btScalar fudge_factor = btScalar(1.05);
+	btVector3 p, pp, normalC(0.f, 0.f, 0.f);
+	const btScalar* normalR = 0;
+	btScalar A[3], B[3], R11, R12, R13, R21, R22, R23, R31, R32, R33,
+		Q11, Q12, Q13, Q21, Q22, Q23, Q31, Q32, Q33, s, s2, l;
+	int i, j, invert_normal, code;
+
+	// get vector from centers of box 1 to box 2, relative to box 1
+	p = p2 - p1;
+	dMULTIPLY1_331(pp, R1, p);  // get pp = p relative to body 1
+
+	// get side lengths / 2
+	A[0] = side1[0] * btScalar(0.5);
+	A[1] = side1[1] * btScalar(0.5);
+	A[2] = side1[2] * btScalar(0.5);
+	B[0] = side2[0] * btScalar(0.5);
+	B[1] = side2[1] * btScalar(0.5);
+	B[2] = side2[2] * btScalar(0.5);
+
+	// Rij is R1'*R2, i.e. the relative rotation between R1 and R2
+	R11 = dDOT44(R1 + 0, R2 + 0);
+	R12 = dDOT44(R1 + 0, R2 + 1);
+	R13 = dDOT44(R1 + 0, R2 + 2);
+	R21 = dDOT44(R1 + 1, R2 + 0);
+	R22 = dDOT44(R1 + 1, R2 + 1);
+	R23 = dDOT44(R1 + 1, R2 + 2);
+	R31 = dDOT44(R1 + 2, R2 + 0);
+	R32 = dDOT44(R1 + 2, R2 + 1);
+	R33 = dDOT44(R1 + 2, R2 + 2);
+
+	Q11 = btFabs(R11);
+	Q12 = btFabs(R12);
+	Q13 = btFabs(R13);
+	Q21 = btFabs(R21);
+	Q22 = btFabs(R22);
+	Q23 = btFabs(R23);
+	Q31 = btFabs(R31);
+	Q32 = btFabs(R32);
+	Q33 = btFabs(R33);
+
+	// for all 15 possible separating axes:
+	//   * see if the axis separates the boxes. if so, return 0.
+	//   * find the depth of the penetration along the separating axis (s2)
+	//   * if this is the largest depth so far, record it.
+	// the normal vector will be set to the separating axis with the smallest
+	// depth. note: normalR is set to point to a column of R1 or R2 if that is
+	// the smallest depth normal so far. otherwise normalR is 0 and normalC is
+	// set to a vector relative to body 1. invert_normal is 1 if the sign of
+	// the normal should be flipped.
+
+#define TST(expr1, expr2, norm, cc)    \
+	s2 = btFabs(expr1) - (expr2);      \
+	if (s2 > 0) return 0;              \
+	if (s2 > s)                        \
+	{                                  \
+		s = s2;                        \
+		normalR = norm;                \
+		invert_normal = ((expr1) < 0); \
+		code = (cc);                   \
+	}
+
+	s = -dInfinity;
+	invert_normal = 0;
+	code = 0;
+
+	// separating axis = u1,u2,u3
+	TST(pp[0], (A[0] + B[0] * Q11 + B[1] * Q12 + B[2] * Q13), R1 + 0, 1);
+	TST(pp[1], (A[1] + B[0] * Q21 + B[1] * Q22 + B[2] * Q23), R1 + 1, 2);
+	TST(pp[2], (A[2] + B[0] * Q31 + B[1] * Q32 + B[2] * Q33), R1 + 2, 3);
+
+	// separating axis = v1,v2,v3
+	TST(dDOT41(R2 + 0, p), (A[0] * Q11 + A[1] * Q21 + A[2] * Q31 + B[0]), R2 + 0, 4);
+	TST(dDOT41(R2 + 1, p), (A[0] * Q12 + A[1] * Q22 + A[2] * Q32 + B[1]), R2 + 1, 5);
+	TST(dDOT41(R2 + 2, p), (A[0] * Q13 + A[1] * Q23 + A[2] * Q33 + B[2]), R2 + 2, 6);
+
+	// note: cross product axes need to be scaled when s is computed.
+	// normal (n1,n2,n3) is relative to box 1.
+#undef TST
+#define TST(expr1, expr2, n1, n2, n3, cc)                \
+	s2 = btFabs(expr1) - (expr2);                        \
+	if (s2 > SIMD_EPSILON) return 0;                     \
+	l = btSqrt((n1) * (n1) + (n2) * (n2) + (n3) * (n3)); \
+	if (l > SIMD_EPSILON)                                \
+	{                                                    \
+		s2 /= l;                                         \
+		if (s2 * fudge_factor > s)                       \
+		{                                                \
+			s = s2;                                      \
+			normalR = 0;                                 \
+			normalC[0] = (n1) / l;                       \
+			normalC[1] = (n2) / l;                       \
+			normalC[2] = (n3) / l;                       \
+			invert_normal = ((expr1) < 0);               \
+			code = (cc);                                 \
+		}                                                \
+	}
+
+	btScalar fudge2(1.0e-5f);
+
+	Q11 += fudge2;
+	Q12 += fudge2;
+	Q13 += fudge2;
+
+	Q21 += fudge2;
+	Q22 += fudge2;
+	Q23 += fudge2;
+
+	Q31 += fudge2;
+	Q32 += fudge2;
+	Q33 += fudge2;
+
+	// separating axis = u1 x (v1,v2,v3)
+	TST(pp[2] * R21 - pp[1] * R31, (A[1] * Q31 + A[2] * Q21 + B[1] * Q13 + B[2] * Q12), 0, -R31, R21, 7);
+	TST(pp[2] * R22 - pp[1] * R32, (A[1] * Q32 + A[2] * Q22 + B[0] * Q13 + B[2] * Q11), 0, -R32, R22, 8);
+	TST(pp[2] * R23 - pp[1] * R33, (A[1] * Q33 + A[2] * Q23 + B[0] * Q12 + B[1] * Q11), 0, -R33, R23, 9);
+
+	// separating axis = u2 x (v1,v2,v3)
+	TST(pp[0] * R31 - pp[2] * R11, (A[0] * Q31 + A[2] * Q11 + B[1] * Q23 + B[2] * Q22), R31, 0, -R11, 10);
+	TST(pp[0] * R32 - pp[2] * R12, (A[0] * Q32 + A[2] * Q12 + B[0] * Q23 + B[2] * Q21), R32, 0, -R12, 11);
+	TST(pp[0] * R33 - pp[2] * R13, (A[0] * Q33 + A[2] * Q13 + B[0] * Q22 + B[1] * Q21), R33, 0, -R13, 12);
+
+	// separating axis = u3 x (v1,v2,v3)
+	TST(pp[1] * R11 - pp[0] * R21, (A[0] * Q21 + A[1] * Q11 + B[1] * Q33 + B[2] * Q32), -R21, R11, 0, 13);
+	TST(pp[1] * R12 - pp[0] * R22, (A[0] * Q22 + A[1] * Q12 + B[0] * Q33 + B[2] * Q31), -R22, R12, 0, 14);
+	TST(pp[1] * R13 - pp[0] * R23, (A[0] * Q23 + A[1] * Q13 + B[0] * Q32 + B[1] * Q31), -R23, R13, 0, 15);
+
+#undef TST
+
+	if (!code) return 0;
+
+	// if we get to this point, the boxes interpenetrate. compute the normal
+	// in global coordinates.
+	if (normalR)
+	{
+		normal[0] = normalR[0];
+		normal[1] = normalR[4];
+		normal[2] = normalR[8];
+	}
+	else
+	{
+		dMULTIPLY0_331(normal, R1, normalC);
+	}
+	if (invert_normal)
+	{
+		normal[0] = -normal[0];
+		normal[1] = -normal[1];
+		normal[2] = -normal[2];
+	}
+	*depth = -s;
+
+	// compute contact point(s)
+
+	if (code > 6)
+	{
+		// an edge from box 1 touches an edge from box 2.
+		// find a point pa on the intersecting edge of box 1
+		btVector3 pa;
+		btScalar sign;
+		for (i = 0; i < 3; i++) pa[i] = p1[i];
+		for (j = 0; j < 3; j++)
+		{
+			sign = (dDOT14(normal, R1 + j) > 0) ? btScalar(1.0) : btScalar(-1.0);
+			for (i = 0; i < 3; i++) pa[i] += sign * A[j] * R1[i * 4 + j];
+		}
+
+		// find a point pb on the intersecting edge of box 2
+		btVector3 pb;
+		for (i = 0; i < 3; i++) pb[i] = p2[i];
+		for (j = 0; j < 3; j++)
+		{
+			sign = (dDOT14(normal, R2 + j) > 0) ? btScalar(-1.0) : btScalar(1.0);
+			for (i = 0; i < 3; i++) pb[i] += sign * B[j] * R2[i * 4 + j];
+		}
+
+		btScalar alpha, beta;
+		btVector3 ua, ub;
+		for (i = 0; i < 3; i++) ua[i] = R1[((code)-7) / 3 + i * 4];
+		for (i = 0; i < 3; i++) ub[i] = R2[((code)-7) % 3 + i * 4];
+
+		dLineClosestApproach(pa, ua, pb, ub, &alpha, &beta);
+		for (i = 0; i < 3; i++) pa[i] += ua[i] * alpha;
+		for (i = 0; i < 3; i++) pb[i] += ub[i] * beta;
+
+		{
+			//contact[0].pos[i] = btScalar(0.5)*(pa[i]+pb[i]);
+			//contact[0].depth = *depth;
+			btVector3 pointInWorld;
+
+#ifdef USE_CENTER_POINT
+			for (i = 0; i < 3; i++)
+				pointInWorld[i] = (pa[i] + pb[i]) * btScalar(0.5);
+			output.addContactPoint(-normal, pointInWorld, -*depth);
+#else
+			output.addContactPoint(-normal, pb, -*depth);
+
+#endif  //
+			*return_code = code;
+		}
+		return 1;
+	}
+
+	// okay, we have a face-something intersection (because the separating
+	// axis is perpendicular to a face). define face 'a' to be the reference
+	// face (i.e. the normal vector is perpendicular to this) and face 'b' to be
+	// the incident face (the closest face of the other box).
+
+	const btScalar *Ra, *Rb, *pa, *pb, *Sa, *Sb;
+	if (code <= 3)
+	{
+		Ra = R1;
+		Rb = R2;
+		pa = p1;
+		pb = p2;
+		Sa = A;
+		Sb = B;
+	}
+	else
+	{
+		Ra = R2;
+		Rb = R1;
+		pa = p2;
+		pb = p1;
+		Sa = B;
+		Sb = A;
+	}
+
+	// nr = normal vector of reference face dotted with axes of incident box.
+	// anr = absolute values of nr.
+	btVector3 normal2, nr, anr;
+	if (code <= 3)
+	{
+		normal2[0] = normal[0];
+		normal2[1] = normal[1];
+		normal2[2] = normal[2];
+	}
+	else
+	{
+		normal2[0] = -normal[0];
+		normal2[1] = -normal[1];
+		normal2[2] = -normal[2];
+	}
+	dMULTIPLY1_331(nr, Rb, normal2);
+	anr[0] = btFabs(nr[0]);
+	anr[1] = btFabs(nr[1]);
+	anr[2] = btFabs(nr[2]);
+
+	// find the largest compontent of anr: this corresponds to the normal
+	// for the indident face. the other axis numbers of the indicent face
+	// are stored in a1,a2.
+	int lanr, a1, a2;
+	if (anr[1] > anr[0])
+	{
+		if (anr[1] > anr[2])
+		{
+			a1 = 0;
+			lanr = 1;
+			a2 = 2;
+		}
+		else
+		{
+			a1 = 0;
+			a2 = 1;
+			lanr = 2;
+		}
+	}
+	else
+	{
+		if (anr[0] > anr[2])
+		{
+			lanr = 0;
+			a1 = 1;
+			a2 = 2;
+		}
+		else
+		{
+			a1 = 0;
+			a2 = 1;
+			lanr = 2;
+		}
+	}
+
+	// compute center point of incident face, in reference-face coordinates
+	btVector3 center;
+	if (nr[lanr] < 0)
+	{
+		for (i = 0; i < 3; i++) center[i] = pb[i] - pa[i] + Sb[lanr] * Rb[i * 4 + lanr];
+	}
+	else
+	{
+		for (i = 0; i < 3; i++) center[i] = pb[i] - pa[i] - Sb[lanr] * Rb[i * 4 + lanr];
+	}
+
+	// find the normal and non-normal axis numbers of the reference box
+	int codeN, code1, code2;
+	if (code <= 3)
+		codeN = code - 1;
+	else
+		codeN = code - 4;
+	if (codeN == 0)
+	{
+		code1 = 1;
+		code2 = 2;
+	}
+	else if (codeN == 1)
+	{
+		code1 = 0;
+		code2 = 2;
+	}
+	else
+	{
+		code1 = 0;
+		code2 = 1;
+	}
+
+	// find the four corners of the incident face, in reference-face coordinates
+	btScalar quad[8];  // 2D coordinate of incident face (x,y pairs)
+	btScalar c1, c2, m11, m12, m21, m22;
+	c1 = dDOT14(center, Ra + code1);
+	c2 = dDOT14(center, Ra + code2);
+	// optimize this? - we have already computed this data above, but it is not
+	// stored in an easy-to-index format. for now it's quicker just to recompute
+	// the four dot products.
+	m11 = dDOT44(Ra + code1, Rb + a1);
+	m12 = dDOT44(Ra + code1, Rb + a2);
+	m21 = dDOT44(Ra + code2, Rb + a1);
+	m22 = dDOT44(Ra + code2, Rb + a2);
+	{
+		btScalar k1 = m11 * Sb[a1];
+		btScalar k2 = m21 * Sb[a1];
+		btScalar k3 = m12 * Sb[a2];
+		btScalar k4 = m22 * Sb[a2];
+		quad[0] = c1 - k1 - k3;
+		quad[1] = c2 - k2 - k4;
+		quad[2] = c1 - k1 + k3;
+		quad[3] = c2 - k2 + k4;
+		quad[4] = c1 + k1 + k3;
+		quad[5] = c2 + k2 + k4;
+		quad[6] = c1 + k1 - k3;
+		quad[7] = c2 + k2 - k4;
+	}
+
+	// find the size of the reference face
+	btScalar rect[2];
+	rect[0] = Sa[code1];
+	rect[1] = Sa[code2];
+
+	// intersect the incident and reference faces
+	btScalar ret[16];
+	int n = intersectRectQuad2(rect, quad, ret);
+	if (n < 1) return 0;  // this should never happen
+
+	// convert the intersection points into reference-face coordinates,
+	// and compute the contact position and depth for each point. only keep
+	// those points that have a positive (penetrating) depth. delete points in
+	// the 'ret' array as necessary so that 'point' and 'ret' correspond.
+	btScalar point[3 * 8];  // penetrating contact points
+	btScalar dep[8];        // depths for those points
+	btScalar det1 = 1.f / (m11 * m22 - m12 * m21);
+	m11 *= det1;
+	m12 *= det1;
+	m21 *= det1;
+	m22 *= det1;
+	int cnum = 0;  // number of penetrating contact points found
+	for (j = 0; j < n; j++)
+	{
+		btScalar k1 = m22 * (ret[j * 2] - c1) - m12 * (ret[j * 2 + 1] - c2);
+		btScalar k2 = -m21 * (ret[j * 2] - c1) + m11 * (ret[j * 2 + 1] - c2);
+		for (i = 0; i < 3; i++) point[cnum * 3 + i] =
+									center[i] + k1 * Rb[i * 4 + a1] + k2 * Rb[i * 4 + a2];
+		dep[cnum] = Sa[codeN] - dDOT(normal2, point + cnum * 3);
+		if (dep[cnum] >= 0)
+		{
+			ret[cnum * 2] = ret[j * 2];
+			ret[cnum * 2 + 1] = ret[j * 2 + 1];
+			cnum++;
+		}
+	}
+	if (cnum < 1) return 0;  // this should never happen
+
+	// we can't generate more contacts than we actually have
+	if (maxc > cnum) maxc = cnum;
+	if (maxc < 1) maxc = 1;
+
+	if (cnum <= maxc)
+	{
+		if (code < 4)
+		{
+			// we have less contacts than we need, so we use them all
+			for (j = 0; j < cnum; j++)
+			{
+				btVector3 pointInWorld;
+				for (i = 0; i < 3; i++)
+					pointInWorld[i] = point[j * 3 + i] + pa[i];
+				output.addContactPoint(-normal, pointInWorld, -dep[j]);
+			}
+		}
+		else
+		{
+			// we have less contacts than we need, so we use them all
+			for (j = 0; j < cnum; j++)
+			{
+				btVector3 pointInWorld;
+				for (i = 0; i < 3; i++)
+					pointInWorld[i] = point[j * 3 + i] + pa[i] - normal[i] * dep[j];
+				//pointInWorld[i] = point[j*3+i] + pa[i];
+				output.addContactPoint(-normal, pointInWorld, -dep[j]);
+			}
+		}
+	}
+	else
+	{
+		// we have more contacts than are wanted, some of them must be culled.
+		// find the deepest point, it is always the first contact.
+		int i1 = 0;
+		btScalar maxdepth = dep[0];
+		for (i = 1; i < cnum; i++)
+		{
+			if (dep[i] > maxdepth)
+			{
+				maxdepth = dep[i];
+				i1 = i;
+			}
+		}
+
+		int iret[8];
+		cullPoints2(cnum, ret, maxc, i1, iret);
+
+		for (j = 0; j < maxc; j++)
+		{
+			//      dContactGeom *con = CONTACT(contact,skip*j);
+			//    for (i=0; i<3; i++) con->pos[i] = point[iret[j]*3+i] + pa[i];
+			//  con->depth = dep[iret[j]];
+
+			btVector3 posInWorld;
+			for (i = 0; i < 3; i++)
+				posInWorld[i] = point[iret[j] * 3 + i] + pa[i];
+			if (code < 4)
+			{
+				output.addContactPoint(-normal, posInWorld, -dep[iret[j]]);
+			}
+			else
+			{
+				output.addContactPoint(-normal, posInWorld - normal * dep[iret[j]], -dep[iret[j]]);
+			}
+		}
+		cnum = maxc;
+	}
+
+	*return_code = code;
+	return cnum;
+}
+
+void btBoxBoxDetector::getClosestPoints(const ClosestPointInput& input, Result& output, class btIDebugDraw* /*debugDraw*/, bool /*swapResults*/)
+{
+	const btTransform& transformA = input.m_transformA;
+	const btTransform& transformB = input.m_transformB;
+
+	int skip = 0;
+	dContactGeom* contact = 0;
+
+	dMatrix3 R1;
+	dMatrix3 R2;
+
+	for (int j = 0; j < 3; j++)
+	{
+		R1[0 + 4 * j] = transformA.getBasis()[j].x();
+		R2[0 + 4 * j] = transformB.getBasis()[j].x();
+
+		R1[1 + 4 * j] = transformA.getBasis()[j].y();
+		R2[1 + 4 * j] = transformB.getBasis()[j].y();
+
+		R1[2 + 4 * j] = transformA.getBasis()[j].z();
+		R2[2 + 4 * j] = transformB.getBasis()[j].z();
+	}
+
+	btVector3 normal;
+	btScalar depth;
+	int return_code;
+	int maxc = 4;
+
+	dBoxBox2(transformA.getOrigin(),
+			 R1,
+			 2.f * m_box1->getHalfExtentsWithMargin(),
+			 transformB.getOrigin(),
+			 R2,
+			 2.f * m_box2->getHalfExtentsWithMargin(),
+			 normal, &depth, &return_code,
+			 maxc, contact, skip,
+			 output);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
new file mode 100644
index 0000000..9b1b36b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
@@ -0,0 +1,40 @@
+/*
+ * Box-Box collision detection re-distributed under the ZLib license with permission from Russell L. Smith
+ * Original version is from Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.
+ * All rights reserved.  Email: russ@q12.org   Web: www.q12.org
+
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef BT_BOX_BOX_DETECTOR_H
+#define BT_BOX_BOX_DETECTOR_H
+
+class btBoxShape;
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+
+/// btBoxBoxDetector wraps the ODE box-box collision detector
+/// re-distributed under the Zlib license with permission from Russell L. Smith
+struct btBoxBoxDetector : public btDiscreteCollisionDetectorInterface
+{
+	const btBoxShape* m_box1;
+	const btBoxShape* m_box2;
+
+public:
+	btBoxBoxDetector(const btBoxShape* box1, const btBoxShape* box2);
+
+	virtual ~btBoxBoxDetector(){};
+
+	virtual void getClosestPoints(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw, bool swapResults = false);
+};
+
+#endif  //BT_BOX_BOX_DETECTOR_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
new file mode 100644
index 0000000..3f578d6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
@@ -0,0 +1,43 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_CONFIGURATION
+#define BT_COLLISION_CONFIGURATION
+
+struct btCollisionAlgorithmCreateFunc;
+
+class btPoolAllocator;
+
+///btCollisionConfiguration allows to configure Bullet collision detection
+///stack allocator size, default collision algorithms and persistent manifold pool size
+///@todo: describe the meaning
+class btCollisionConfiguration
+{
+public:
+	virtual ~btCollisionConfiguration()
+	{
+	}
+
+	///memory pools
+	virtual btPoolAllocator* getPersistentManifoldPool() = 0;
+
+	virtual btPoolAllocator* getCollisionAlgorithmPool() = 0;
+
+	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1) = 0;
+
+	virtual btCollisionAlgorithmCreateFunc* getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1) = 0;
+};
+
+#endif  //BT_COLLISION_CONFIGURATION
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
new file mode 100644
index 0000000..597f260
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
@@ -0,0 +1,43 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_CREATE_FUNC
+#define BT_COLLISION_CREATE_FUNC
+
+#include "LinearMath/btAlignedObjectArray.h"
+class btCollisionAlgorithm;
+class btCollisionObject;
+struct btCollisionObjectWrapper;
+struct btCollisionAlgorithmConstructionInfo;
+
+///Used by the btCollisionDispatcher to register and create instances for btCollisionAlgorithm
+struct btCollisionAlgorithmCreateFunc
+{
+	bool m_swapped;
+
+	btCollisionAlgorithmCreateFunc()
+		: m_swapped(false)
+	{
+	}
+	virtual ~btCollisionAlgorithmCreateFunc(){};
+
+	virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo&, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+	{
+		(void)body0Wrap;
+		(void)body1Wrap;
+		return 0;
+	}
+};
+#endif  //BT_COLLISION_CREATE_FUNC
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
new file mode 100644
index 0000000..e24757c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
@@ -0,0 +1,289 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCollisionDispatcher.h"
+#include "LinearMath/btQuickprof.h"
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "LinearMath/btPoolAllocator.h"
+#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+#ifdef BT_DEBUG
+#include <stdio.h>
+#endif
+
+btCollisionDispatcher::btCollisionDispatcher(btCollisionConfiguration* collisionConfiguration) : m_dispatcherFlags(btCollisionDispatcher::CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD),
+																								 m_collisionConfiguration(collisionConfiguration)
+{
+	int i;
+
+	setNearCallback(defaultNearCallback);
+
+	m_collisionAlgorithmPoolAllocator = collisionConfiguration->getCollisionAlgorithmPool();
+
+	m_persistentManifoldPoolAllocator = collisionConfiguration->getPersistentManifoldPool();
+
+	for (i = 0; i < MAX_BROADPHASE_COLLISION_TYPES; i++)
+	{
+		for (int j = 0; j < MAX_BROADPHASE_COLLISION_TYPES; j++)
+		{
+			m_doubleDispatchContactPoints[i][j] = m_collisionConfiguration->getCollisionAlgorithmCreateFunc(i, j);
+			btAssert(m_doubleDispatchContactPoints[i][j]);
+			m_doubleDispatchClosestPoints[i][j] = m_collisionConfiguration->getClosestPointsAlgorithmCreateFunc(i, j);
+		}
+	}
+}
+
+void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc* createFunc)
+{
+	m_doubleDispatchContactPoints[proxyType0][proxyType1] = createFunc;
+}
+
+void btCollisionDispatcher::registerClosestPointsCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc* createFunc)
+{
+	m_doubleDispatchClosestPoints[proxyType0][proxyType1] = createFunc;
+}
+
+btCollisionDispatcher::~btCollisionDispatcher()
+{
+}
+
+btPersistentManifold* btCollisionDispatcher::getNewManifold(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	//btAssert(gNumManifold < 65535);
+
+	//optional relative contact breaking threshold, turned on by default (use setDispatcherFlags to switch off feature for improved performance)
+
+	btScalar contactBreakingThreshold = (m_dispatcherFlags & btCollisionDispatcher::CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD) ? btMin(body0->getCollisionShape()->getContactBreakingThreshold(gContactBreakingThreshold), body1->getCollisionShape()->getContactBreakingThreshold(gContactBreakingThreshold))
+																																: gContactBreakingThreshold;
+
+	btScalar contactProcessingThreshold = btMin(body0->getContactProcessingThreshold(), body1->getContactProcessingThreshold());
+
+	void* mem = m_persistentManifoldPoolAllocator->allocate(sizeof(btPersistentManifold));
+	if (NULL == mem)
+	{
+		//we got a pool memory overflow, by default we fallback to dynamically allocate memory. If we require a contiguous contact pool then assert.
+		if ((m_dispatcherFlags & CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION) == 0)
+		{
+			mem = btAlignedAlloc(sizeof(btPersistentManifold), 16);
+		}
+		else
+		{
+			btAssert(0);
+			//make sure to increase the m_defaultMaxPersistentManifoldPoolSize in the btDefaultCollisionConstructionInfo/btDefaultCollisionConfiguration
+			return 0;
+		}
+	}
+	btPersistentManifold* manifold = new (mem) btPersistentManifold(body0, body1, 0, contactBreakingThreshold, contactProcessingThreshold);
+	manifold->m_index1a = m_manifoldsPtr.size();
+	m_manifoldsPtr.push_back(manifold);
+
+	return manifold;
+}
+
+void btCollisionDispatcher::clearManifold(btPersistentManifold* manifold)
+{
+	manifold->clearManifold();
+}
+
+void btCollisionDispatcher::releaseManifold(btPersistentManifold* manifold)
+{
+	//printf("releaseManifold: gNumManifold %d\n",gNumManifold);
+	clearManifold(manifold);
+
+	int findIndex = manifold->m_index1a;
+	btAssert(findIndex < m_manifoldsPtr.size());
+	m_manifoldsPtr.swap(findIndex, m_manifoldsPtr.size() - 1);
+	m_manifoldsPtr[findIndex]->m_index1a = findIndex;
+	m_manifoldsPtr.pop_back();
+
+	manifold->~btPersistentManifold();
+	if (m_persistentManifoldPoolAllocator->validPtr(manifold))
+	{
+		m_persistentManifoldPoolAllocator->freeMemory(manifold);
+	}
+	else
+	{
+		btAlignedFree(manifold);
+	}
+}
+
+btCollisionAlgorithm* btCollisionDispatcher::findAlgorithm(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, btPersistentManifold* sharedManifold, ebtDispatcherQueryType algoType)
+{
+	btCollisionAlgorithmConstructionInfo ci;
+
+	ci.m_dispatcher1 = this;
+	ci.m_manifold = sharedManifold;
+	btCollisionAlgorithm* algo = 0;
+	if (algoType == BT_CONTACT_POINT_ALGORITHMS)
+	{
+		algo = m_doubleDispatchContactPoints[body0Wrap->getCollisionShape()->getShapeType()][body1Wrap->getCollisionShape()->getShapeType()]->CreateCollisionAlgorithm(ci, body0Wrap, body1Wrap);
+	}
+	else
+	{
+		algo = m_doubleDispatchClosestPoints[body0Wrap->getCollisionShape()->getShapeType()][body1Wrap->getCollisionShape()->getShapeType()]->CreateCollisionAlgorithm(ci, body0Wrap, body1Wrap);
+	}
+
+	return algo;
+}
+
+bool btCollisionDispatcher::needsResponse(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	//here you can do filtering
+	bool hasResponse =
+		(body0->hasContactResponse() && body1->hasContactResponse());
+	//no response between two static/kinematic bodies:
+	hasResponse = hasResponse &&
+				  ((!body0->isStaticOrKinematicObject()) || (!body1->isStaticOrKinematicObject()));
+	return hasResponse;
+}
+
+bool btCollisionDispatcher::needsCollision(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	btAssert(body0);
+	btAssert(body1);
+
+	bool needsCollision = true;
+
+#ifdef BT_DEBUG
+	if (!(m_dispatcherFlags & btCollisionDispatcher::CD_STATIC_STATIC_REPORTED))
+	{
+		//broadphase filtering already deals with this
+		if (body0->isStaticOrKinematicObject() && body1->isStaticOrKinematicObject())
+		{
+			m_dispatcherFlags |= btCollisionDispatcher::CD_STATIC_STATIC_REPORTED;
+			printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n");
+		}
+	}
+#endif  //BT_DEBUG
+
+	if ((!body0->isActive()) && (!body1->isActive()))
+		needsCollision = false;
+	else if ((!body0->checkCollideWith(body1)) || (!body1->checkCollideWith(body0)))
+		needsCollision = false;
+
+	return needsCollision;
+}
+
+///interface for iterating all overlapping collision pairs, no matter how those pairs are stored (array, set, map etc)
+///this is useful for the collision dispatcher.
+class btCollisionPairCallback : public btOverlapCallback
+{
+	const btDispatcherInfo& m_dispatchInfo;
+	btCollisionDispatcher* m_dispatcher;
+
+public:
+	btCollisionPairCallback(const btDispatcherInfo& dispatchInfo, btCollisionDispatcher* dispatcher)
+		: m_dispatchInfo(dispatchInfo),
+		  m_dispatcher(dispatcher)
+	{
+	}
+
+	/*btCollisionPairCallback& operator=(btCollisionPairCallback& other)
+	{
+		m_dispatchInfo = other.m_dispatchInfo;
+		m_dispatcher = other.m_dispatcher;
+		return *this;
+	}
+	*/
+
+	virtual ~btCollisionPairCallback() {}
+
+	virtual bool processOverlap(btBroadphasePair& pair)
+	{
+		(*m_dispatcher->getNearCallback())(pair, *m_dispatcher, m_dispatchInfo);
+		return false;
+	}
+};
+
+void btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pairCache, const btDispatcherInfo& dispatchInfo, btDispatcher* dispatcher)
+{
+	//m_blockedForChanges = true;
+
+	btCollisionPairCallback collisionCallback(dispatchInfo, this);
+
+	{
+		BT_PROFILE("processAllOverlappingPairs");
+		pairCache->processAllOverlappingPairs(&collisionCallback, dispatcher, dispatchInfo);
+	}
+
+	//m_blockedForChanges = false;
+}
+
+//by default, Bullet will use this near callback
+void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo)
+{
+	btCollisionObject* colObj0 = (btCollisionObject*)collisionPair.m_pProxy0->m_clientObject;
+	btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject;
+
+	if (dispatcher.needsCollision(colObj0, colObj1))
+	{
+		btCollisionObjectWrapper obj0Wrap(0, colObj0->getCollisionShape(), colObj0, colObj0->getWorldTransform(), -1, -1);
+		btCollisionObjectWrapper obj1Wrap(0, colObj1->getCollisionShape(), colObj1, colObj1->getWorldTransform(), -1, -1);
+
+		//dispatcher will keep algorithms persistent in the collision pair
+		if (!collisionPair.m_algorithm)
+		{
+			collisionPair.m_algorithm = dispatcher.findAlgorithm(&obj0Wrap, &obj1Wrap, 0, BT_CONTACT_POINT_ALGORITHMS);
+		}
+
+		if (collisionPair.m_algorithm)
+		{
+			btManifoldResult contactPointResult(&obj0Wrap, &obj1Wrap);
+
+			if (dispatchInfo.m_dispatchFunc == btDispatcherInfo::DISPATCH_DISCRETE)
+			{
+				//discrete collision detection query
+
+				collisionPair.m_algorithm->processCollision(&obj0Wrap, &obj1Wrap, dispatchInfo, &contactPointResult);
+			}
+			else
+			{
+				//continuous collision detection query, time of impact (toi)
+				btScalar toi = collisionPair.m_algorithm->calculateTimeOfImpact(colObj0, colObj1, dispatchInfo, &contactPointResult);
+				if (dispatchInfo.m_timeOfImpact > toi)
+					dispatchInfo.m_timeOfImpact = toi;
+			}
+		}
+	}
+}
+
+void* btCollisionDispatcher::allocateCollisionAlgorithm(int size)
+{
+	void* mem = m_collisionAlgorithmPoolAllocator->allocate(size);
+	if (NULL == mem)
+	{
+		//warn user for overflow?
+		return btAlignedAlloc(static_cast<size_t>(size), 16);
+	}
+	return mem;
+}
+
+void btCollisionDispatcher::freeCollisionAlgorithm(void* ptr)
+{
+	if (m_collisionAlgorithmPoolAllocator->validPtr(ptr))
+	{
+		m_collisionAlgorithmPoolAllocator->freeMemory(ptr);
+	}
+	else
+	{
+		btAlignedFree(ptr);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
new file mode 100644
index 0000000..1399148
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
@@ -0,0 +1,169 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION__DISPATCHER_H
+#define BT_COLLISION__DISPATCHER_H
+
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+class btIDebugDraw;
+class btOverlappingPairCache;
+class btPoolAllocator;
+class btCollisionConfiguration;
+
+#include "btCollisionCreateFunc.h"
+
+#define USE_DISPATCH_REGISTRY_ARRAY 1
+
+class btCollisionDispatcher;
+///user can override this nearcallback for collision filtering and more finegrained control over collision detection
+typedef void (*btNearCallback)(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo);
+
+///btCollisionDispatcher supports algorithms that handle ConvexConvex and ConvexConcave collision pairs.
+///Time of Impact, Closest Points and Penetration Depth.
+class btCollisionDispatcher : public btDispatcher
+{
+protected:
+	int m_dispatcherFlags;
+
+	btAlignedObjectArray<btPersistentManifold*> m_manifoldsPtr;
+
+	btNearCallback m_nearCallback;
+
+	btPoolAllocator* m_collisionAlgorithmPoolAllocator;
+
+	btPoolAllocator* m_persistentManifoldPoolAllocator;
+
+	btCollisionAlgorithmCreateFunc* m_doubleDispatchContactPoints[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES];
+
+	btCollisionAlgorithmCreateFunc* m_doubleDispatchClosestPoints[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES];
+
+	btCollisionConfiguration* m_collisionConfiguration;
+
+public:
+	enum DispatcherFlags
+	{
+		CD_STATIC_STATIC_REPORTED = 1,
+		CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2,
+		CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION = 4
+	};
+
+	int getDispatcherFlags() const
+	{
+		return m_dispatcherFlags;
+	}
+
+	void setDispatcherFlags(int flags)
+	{
+		m_dispatcherFlags = flags;
+	}
+
+	///registerCollisionCreateFunc allows registration of custom/alternative collision create functions
+	void registerCollisionCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc* createFunc);
+
+	void registerClosestPointsCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc* createFunc);
+
+	int getNumManifolds() const
+	{
+		return int(m_manifoldsPtr.size());
+	}
+
+	btPersistentManifold** getInternalManifoldPointer()
+	{
+		return m_manifoldsPtr.size() ? &m_manifoldsPtr[0] : 0;
+	}
+
+	btPersistentManifold* getManifoldByIndexInternal(int index)
+	{
+		btAssert(index>=0);
+		btAssert(index<m_manifoldsPtr.size());
+		return m_manifoldsPtr[index];
+	}
+
+	const btPersistentManifold* getManifoldByIndexInternal(int index) const
+	{
+		btAssert(index>=0);
+		btAssert(index<m_manifoldsPtr.size());
+		return m_manifoldsPtr[index];
+	}
+
+	btCollisionDispatcher(btCollisionConfiguration* collisionConfiguration);
+
+	virtual ~btCollisionDispatcher();
+
+	virtual btPersistentManifold* getNewManifold(const btCollisionObject* b0, const btCollisionObject* b1);
+
+	virtual void releaseManifold(btPersistentManifold* manifold);
+
+	virtual void clearManifold(btPersistentManifold* manifold);
+
+	btCollisionAlgorithm* findAlgorithm(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, btPersistentManifold* sharedManifold, ebtDispatcherQueryType queryType);
+
+	virtual bool needsCollision(const btCollisionObject* body0, const btCollisionObject* body1);
+
+	virtual bool needsResponse(const btCollisionObject* body0, const btCollisionObject* body1);
+
+	virtual void dispatchAllCollisionPairs(btOverlappingPairCache* pairCache, const btDispatcherInfo& dispatchInfo, btDispatcher* dispatcher);
+
+	void setNearCallback(btNearCallback nearCallback)
+	{
+		m_nearCallback = nearCallback;
+	}
+
+	btNearCallback getNearCallback() const
+	{
+		return m_nearCallback;
+	}
+
+	//by default, Bullet will use this near callback
+	static void defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo);
+
+	virtual void* allocateCollisionAlgorithm(int size);
+
+	virtual void freeCollisionAlgorithm(void* ptr);
+
+	btCollisionConfiguration* getCollisionConfiguration()
+	{
+		return m_collisionConfiguration;
+	}
+
+	const btCollisionConfiguration* getCollisionConfiguration() const
+	{
+		return m_collisionConfiguration;
+	}
+
+	void setCollisionConfiguration(btCollisionConfiguration* config)
+	{
+		m_collisionConfiguration = config;
+	}
+
+	virtual btPoolAllocator* getInternalManifoldPool()
+	{
+		return m_persistentManifoldPoolAllocator;
+	}
+
+	virtual const btPoolAllocator* getInternalManifoldPool() const
+	{
+		return m_persistentManifoldPoolAllocator;
+	}
+};
+
+#endif  //BT_COLLISION__DISPATCHER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp
new file mode 100644
index 0000000..9b38f5c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp
@@ -0,0 +1,179 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCollisionDispatcherMt.h"
+#include "LinearMath/btQuickprof.h"
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "LinearMath/btPoolAllocator.h"
+#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+btCollisionDispatcherMt::btCollisionDispatcherMt(btCollisionConfiguration* config, int grainSize)
+	: btCollisionDispatcher(config)
+{
+	m_batchManifoldsPtr.resize(btGetTaskScheduler()->getNumThreads());
+	m_batchReleasePtr.resize(btGetTaskScheduler()->getNumThreads());
+
+	m_batchUpdating = false;
+	m_grainSize = grainSize;  // iterations per task
+}
+
+btPersistentManifold* btCollisionDispatcherMt::getNewManifold(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	//optional relative contact breaking threshold, turned on by default (use setDispatcherFlags to switch off feature for improved performance)
+
+	btScalar contactBreakingThreshold = (m_dispatcherFlags & btCollisionDispatcher::CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD) ? btMin(body0->getCollisionShape()->getContactBreakingThreshold(gContactBreakingThreshold), body1->getCollisionShape()->getContactBreakingThreshold(gContactBreakingThreshold))
+																																: gContactBreakingThreshold;
+
+	btScalar contactProcessingThreshold = btMin(body0->getContactProcessingThreshold(), body1->getContactProcessingThreshold());
+
+	void* mem = m_persistentManifoldPoolAllocator->allocate(sizeof(btPersistentManifold));
+	if (NULL == mem)
+	{
+		//we got a pool memory overflow, by default we fallback to dynamically allocate memory. If we require a contiguous contact pool then assert.
+		if ((m_dispatcherFlags & CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION) == 0)
+		{
+			mem = btAlignedAlloc(sizeof(btPersistentManifold), 16);
+		}
+		else
+		{
+			btAssert(0);
+			//make sure to increase the m_defaultMaxPersistentManifoldPoolSize in the btDefaultCollisionConstructionInfo/btDefaultCollisionConfiguration
+			return 0;
+		}
+	}
+	btPersistentManifold* manifold = new (mem) btPersistentManifold(body0, body1, 0, contactBreakingThreshold, contactProcessingThreshold);
+	if (!m_batchUpdating)
+	{
+		// batch updater will update manifold pointers array after finishing, so
+		// only need to update array when not batch-updating
+		//btAssert( !btThreadsAreRunning() );
+		manifold->m_index1a = m_manifoldsPtr.size();
+		m_manifoldsPtr.push_back(manifold);
+	}
+	else
+	{
+		m_batchManifoldsPtr[btGetCurrentThreadIndex()].push_back(manifold);
+	}
+
+	return manifold;
+}
+
+void btCollisionDispatcherMt::releaseManifold(btPersistentManifold* manifold)
+{
+	//btAssert( !btThreadsAreRunning() );
+	
+	if (!m_batchUpdating)
+	{
+		clearManifold(manifold);
+		// batch updater will update manifold pointers array after finishing, so
+		// only need to update array when not batch-updating
+		int findIndex = manifold->m_index1a;
+		btAssert(findIndex < m_manifoldsPtr.size());
+		m_manifoldsPtr.swap(findIndex, m_manifoldsPtr.size() - 1);
+		m_manifoldsPtr[findIndex]->m_index1a = findIndex;
+		m_manifoldsPtr.pop_back();
+	} else {
+		m_batchReleasePtr[btGetCurrentThreadIndex()].push_back(manifold);
+		return;
+	}
+
+	manifold->~btPersistentManifold();
+	if (m_persistentManifoldPoolAllocator->validPtr(manifold))
+	{
+		m_persistentManifoldPoolAllocator->freeMemory(manifold);
+	}
+	else
+	{
+		btAlignedFree(manifold);
+	}
+}
+
+struct CollisionDispatcherUpdater : public btIParallelForBody
+{
+	btBroadphasePair* mPairArray;
+	btNearCallback mCallback;
+	btCollisionDispatcher* mDispatcher;
+	const btDispatcherInfo* mInfo;
+
+	CollisionDispatcherUpdater()
+	{
+		mPairArray = NULL;
+		mCallback = NULL;
+		mDispatcher = NULL;
+		mInfo = NULL;
+	}
+	void forLoop(int iBegin, int iEnd) const
+	{
+		for (int i = iBegin; i < iEnd; ++i)
+		{
+			btBroadphasePair* pair = &mPairArray[i];
+			mCallback(*pair, *mDispatcher, *mInfo);
+		}
+	}
+};
+
+void btCollisionDispatcherMt::dispatchAllCollisionPairs(btOverlappingPairCache* pairCache, const btDispatcherInfo& info, btDispatcher* dispatcher)
+{
+	const int pairCount = pairCache->getNumOverlappingPairs();
+	if (pairCount == 0)
+	{
+		return;
+	}
+	CollisionDispatcherUpdater updater;
+	updater.mCallback = getNearCallback();
+	updater.mPairArray = pairCache->getOverlappingPairArrayPtr();
+	updater.mDispatcher = this;
+	updater.mInfo = &info;
+
+	m_batchUpdating = true;
+	btParallelFor(0, pairCount, m_grainSize, updater);
+	m_batchUpdating = false;
+
+	// merge new manifolds, if any
+	for (int i = 0; i < m_batchManifoldsPtr.size(); ++i)
+	{
+		btAlignedObjectArray<btPersistentManifold*>& batchManifoldsPtr = m_batchManifoldsPtr[i];
+
+		for (int j = 0; j < batchManifoldsPtr.size(); ++j)
+		{
+			m_manifoldsPtr.push_back(batchManifoldsPtr[j]);
+		}
+
+		batchManifoldsPtr.resizeNoInitialize(0);
+	}
+
+	// remove batched remove manifolds.
+	for (int i = 0; i < m_batchReleasePtr.size(); ++i)
+	{
+		btAlignedObjectArray<btPersistentManifold*>& batchManifoldsPtr = m_batchReleasePtr[i];
+		for (int j = 0; j < batchManifoldsPtr.size(); ++j)
+		{
+			releaseManifold(batchManifoldsPtr[j]);
+		}
+		batchManifoldsPtr.resizeNoInitialize(0);
+	}
+
+	// update the indices (used when releasing manifolds)
+	for (int i = 0; i < m_manifoldsPtr.size(); ++i)
+	{
+		m_manifoldsPtr[i]->m_index1a = i;
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h
new file mode 100644
index 0000000..094e928
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h
@@ -0,0 +1,39 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_DISPATCHER_MT_H
+#define BT_COLLISION_DISPATCHER_MT_H
+
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "LinearMath/btThreads.h"
+
+class btCollisionDispatcherMt : public btCollisionDispatcher
+{
+public:
+	btCollisionDispatcherMt(btCollisionConfiguration* config, int grainSize = 40);
+
+	virtual btPersistentManifold* getNewManifold(const btCollisionObject* body0, const btCollisionObject* body1) BT_OVERRIDE;
+	virtual void releaseManifold(btPersistentManifold* manifold) BT_OVERRIDE;
+
+	virtual void dispatchAllCollisionPairs(btOverlappingPairCache* pairCache, const btDispatcherInfo& info, btDispatcher* dispatcher) BT_OVERRIDE;
+
+protected:
+	btAlignedObjectArray<btAlignedObjectArray<btPersistentManifold*> > m_batchManifoldsPtr;
+	btAlignedObjectArray<btAlignedObjectArray<btPersistentManifold*> > m_batchReleasePtr;
+	bool m_batchUpdating;
+	int m_grainSize;
+};
+
+#endif  //BT_COLLISION_DISPATCHER_MT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
new file mode 100644
index 0000000..04dbbf2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
@@ -0,0 +1,138 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCollisionObject.h"
+#include "LinearMath/btSerializer.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+
+btCollisionObject::btCollisionObject()
+	: m_interpolationLinearVelocity(0.f, 0.f, 0.f),
+	  m_interpolationAngularVelocity(0.f, 0.f, 0.f),
+	  m_anisotropicFriction(1.f, 1.f, 1.f),
+	  m_hasAnisotropicFriction(false),
+	  m_contactProcessingThreshold(BT_LARGE_FLOAT),
+	  m_broadphaseHandle(0),
+	  m_collisionShape(0),
+	  m_extensionPointer(0),
+	  m_rootCollisionShape(0),
+	  m_collisionFlags(btCollisionObject::CF_STATIC_OBJECT),
+	  m_islandTag1(-1),
+	  m_companionId(-1),
+	  m_worldArrayIndex(-1),
+	  m_activationState1(1),
+	  m_deactivationTime(btScalar(0.)),
+	  m_friction(btScalar(0.5)),
+	  m_restitution(btScalar(0.)),
+	  m_rollingFriction(0.0f),
+	  m_spinningFriction(0.f),
+	  m_contactDamping(.1),
+	  m_contactStiffness(BT_LARGE_FLOAT),
+	  m_internalType(CO_COLLISION_OBJECT),
+	  m_userObjectPointer(0),
+	  m_userIndex2(-1),
+	  m_userIndex(-1),
+	  m_userIndex3(-1),
+	  m_hitFraction(btScalar(1.)),
+	  m_ccdSweptSphereRadius(btScalar(0.)),
+	  m_ccdMotionThreshold(btScalar(0.)),
+	  m_checkCollideWith(false),
+	  m_updateRevision(0)
+{
+	m_worldTransform.setIdentity();
+	m_interpolationWorldTransform.setIdentity();
+}
+
+btCollisionObject::~btCollisionObject()
+{
+}
+
+void btCollisionObject::setActivationState(int newState) const
+{
+	if ((m_activationState1 != DISABLE_DEACTIVATION) && (m_activationState1 != DISABLE_SIMULATION))
+		m_activationState1 = newState;
+}
+
+void btCollisionObject::forceActivationState(int newState) const
+{
+	m_activationState1 = newState;
+}
+
+void btCollisionObject::activate(bool forceActivation) const
+{
+	if (forceActivation || !(m_collisionFlags & (CF_STATIC_OBJECT | CF_KINEMATIC_OBJECT)))
+	{
+		setActivationState(ACTIVE_TAG);
+		m_deactivationTime = btScalar(0.);
+	}
+}
+
+const char* btCollisionObject::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btCollisionObjectData* dataOut = (btCollisionObjectData*)dataBuffer;
+
+	m_worldTransform.serialize(dataOut->m_worldTransform);
+	m_interpolationWorldTransform.serialize(dataOut->m_interpolationWorldTransform);
+	m_interpolationLinearVelocity.serialize(dataOut->m_interpolationLinearVelocity);
+	m_interpolationAngularVelocity.serialize(dataOut->m_interpolationAngularVelocity);
+	m_anisotropicFriction.serialize(dataOut->m_anisotropicFriction);
+	dataOut->m_hasAnisotropicFriction = m_hasAnisotropicFriction;
+	dataOut->m_contactProcessingThreshold = m_contactProcessingThreshold;
+	dataOut->m_broadphaseHandle = 0;
+	dataOut->m_collisionShape = serializer->getUniquePointer(m_collisionShape);
+	dataOut->m_rootCollisionShape = 0;  //@todo
+	dataOut->m_collisionFlags = m_collisionFlags;
+	dataOut->m_islandTag1 = m_islandTag1;
+	dataOut->m_companionId = m_companionId;
+	dataOut->m_activationState1 = m_activationState1;
+	dataOut->m_deactivationTime = m_deactivationTime;
+	dataOut->m_friction = m_friction;
+	dataOut->m_rollingFriction = m_rollingFriction;
+	dataOut->m_contactDamping = m_contactDamping;
+	dataOut->m_contactStiffness = m_contactStiffness;
+	dataOut->m_restitution = m_restitution;
+	dataOut->m_internalType = m_internalType;
+
+	char* name = (char*)serializer->findNameForPointer(this);
+	dataOut->m_name = (char*)serializer->getUniquePointer(name);
+	if (dataOut->m_name)
+	{
+		serializer->serializeName(name);
+	}
+	dataOut->m_hitFraction = m_hitFraction;
+	dataOut->m_ccdSweptSphereRadius = m_ccdSweptSphereRadius;
+	dataOut->m_ccdMotionThreshold = m_ccdMotionThreshold;
+	dataOut->m_checkCollideWith = m_checkCollideWith;
+	if (m_broadphaseHandle)
+	{
+		dataOut->m_collisionFilterGroup = m_broadphaseHandle->m_collisionFilterGroup;
+		dataOut->m_collisionFilterMask = m_broadphaseHandle->m_collisionFilterMask;
+		dataOut->m_uniqueId = m_broadphaseHandle->m_uniqueId;
+	}
+	else
+	{
+		dataOut->m_collisionFilterGroup = 0;
+		dataOut->m_collisionFilterMask = 0;
+		dataOut->m_uniqueId = -1;
+	}
+	return btCollisionObjectDataName;
+}
+
+void btCollisionObject::serializeSingleObject(class btSerializer* serializer) const
+{
+	int len = calculateSerializeBufferSize();
+	btChunk* chunk = serializer->allocate(len, 1);
+	const char* structType = serialize(chunk->m_oldPtr, serializer);
+	serializer->finalizeChunk(chunk, structType, BT_COLLISIONOBJECT_CODE, (void*)this);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.h
new file mode 100644
index 0000000..d1456a9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.h
@@ -0,0 +1,690 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_OBJECT_H
+#define BT_COLLISION_OBJECT_H
+
+#include "LinearMath/btTransform.h"
+
+//island management, m_activationState1
+#define ACTIVE_TAG 1
+#define ISLAND_SLEEPING 2
+#define WANTS_DEACTIVATION 3
+#define DISABLE_DEACTIVATION 4
+#define DISABLE_SIMULATION 5
+#define FIXED_BASE_MULTI_BODY 6
+
+struct btBroadphaseProxy;
+class btCollisionShape;
+struct btCollisionShapeData;
+#include "LinearMath/btMotionState.h"
+#include "LinearMath/btAlignedAllocator.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+typedef btAlignedObjectArray<class btCollisionObject*> btCollisionObjectArray;
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btCollisionObjectData btCollisionObjectDoubleData
+#define btCollisionObjectDataName "btCollisionObjectDoubleData"
+#else
+#define btCollisionObjectData btCollisionObjectFloatData
+#define btCollisionObjectDataName "btCollisionObjectFloatData"
+#endif
+
+/// btCollisionObject can be used to manage collision detection objects.
+/// btCollisionObject maintains all information that is needed for a collision detection: Shape, Transform and AABB proxy.
+/// They can be added to the btCollisionWorld.
+ATTRIBUTE_ALIGNED16(class)
+btCollisionObject
+{
+protected:
+	btTransform m_worldTransform;
+
+	///m_interpolationWorldTransform is used for CCD and interpolation
+	///it can be either previous or future (predicted) transform
+	btTransform m_interpolationWorldTransform;
+	//those two are experimental: just added for bullet time effect, so you can still apply impulses (directly modifying velocities)
+	//without destroying the continuous interpolated motion (which uses this interpolation velocities)
+	btVector3 m_interpolationLinearVelocity;
+	btVector3 m_interpolationAngularVelocity;
+
+	btVector3 m_anisotropicFriction;
+	int m_hasAnisotropicFriction;
+	btScalar m_contactProcessingThreshold;
+
+	btBroadphaseProxy* m_broadphaseHandle;
+	btCollisionShape* m_collisionShape;
+	///m_extensionPointer is used by some internal low-level Bullet extensions.
+	void* m_extensionPointer;
+
+	///m_rootCollisionShape is temporarily used to store the original collision shape
+	///The m_collisionShape might be temporarily replaced by a child collision shape during collision detection purposes
+	///If it is NULL, the m_collisionShape is not temporarily replaced.
+	btCollisionShape* m_rootCollisionShape;
+
+	int m_collisionFlags;
+
+	int m_islandTag1;
+	int m_companionId;
+	int m_worldArrayIndex;  // index of object in world's collisionObjects array
+
+	mutable int m_activationState1;
+	mutable btScalar m_deactivationTime;
+
+	btScalar m_friction;
+	btScalar m_restitution;
+	btScalar m_rollingFriction;   //torsional friction orthogonal to contact normal (useful to stop spheres rolling forever)
+	btScalar m_spinningFriction;  // torsional friction around the contact normal (useful for grasping)
+	btScalar m_contactDamping;
+	btScalar m_contactStiffness;
+
+	///m_internalType is reserved to distinguish Bullet's btCollisionObject, btRigidBody, btSoftBody, btGhostObject etc.
+	///do not assign your own m_internalType unless you write a new dynamics object class.
+	int m_internalType;
+
+	///users can point to their objects, m_userPointer is not used by Bullet, see setUserPointer/getUserPointer
+
+	void* m_userObjectPointer;
+
+	int m_userIndex2;
+
+	int m_userIndex;
+
+	int m_userIndex3;
+
+	///time of impact calculation
+	btScalar m_hitFraction;
+
+	///Swept sphere radius (0.0 by default), see btConvexConvexAlgorithm::
+	btScalar m_ccdSweptSphereRadius;
+
+	/// Don't do continuous collision detection if the motion (in one step) is less then m_ccdMotionThreshold
+	btScalar m_ccdMotionThreshold;
+
+	/// If some object should have elaborate collision filtering by sub-classes
+	int m_checkCollideWith;
+
+	btAlignedObjectArray<const btCollisionObject*> m_objectsWithoutCollisionCheck;
+
+	///internal update revision number. It will be increased when the object changes. This allows some subsystems to perform lazy evaluation.
+	int m_updateRevision;
+
+	btVector3 m_customDebugColorRGB;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	enum CollisionFlags
+	{
+		CF_DYNAMIC_OBJECT = 0,
+		CF_STATIC_OBJECT = 1,
+		CF_KINEMATIC_OBJECT = 2,
+		CF_NO_CONTACT_RESPONSE = 4,
+		CF_CUSTOM_MATERIAL_CALLBACK = 8,  //this allows per-triangle material (friction/restitution)
+		CF_CHARACTER_OBJECT = 16,
+		CF_DISABLE_VISUALIZE_OBJECT = 32,          //disable debug drawing
+		CF_DISABLE_SPU_COLLISION_PROCESSING = 64,  //disable parallel/SPU processing
+		CF_HAS_CONTACT_STIFFNESS_DAMPING = 128,
+		CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR = 256,
+		CF_HAS_FRICTION_ANCHOR = 512,
+		CF_HAS_COLLISION_SOUND_TRIGGER = 1024
+	};
+
+	enum CollisionObjectTypes
+	{
+		CO_COLLISION_OBJECT = 1,
+		CO_RIGID_BODY = 2,
+		///CO_GHOST_OBJECT keeps track of all objects overlapping its AABB and that pass its collision filter
+		///It is useful for collision sensors, explosion objects, character controller etc.
+		CO_GHOST_OBJECT = 4,
+		CO_SOFT_BODY = 8,
+		CO_HF_FLUID = 16,
+		CO_USER_TYPE = 32,
+		CO_FEATHERSTONE_LINK = 64
+	};
+
+	enum AnisotropicFrictionFlags
+	{
+		CF_ANISOTROPIC_FRICTION_DISABLED = 0,
+		CF_ANISOTROPIC_FRICTION = 1,
+		CF_ANISOTROPIC_ROLLING_FRICTION = 2
+	};
+
+	SIMD_FORCE_INLINE bool mergesSimulationIslands() const
+	{
+		///static objects, kinematic and object without contact response don't merge islands
+		return ((m_collisionFlags & (CF_STATIC_OBJECT | CF_KINEMATIC_OBJECT | CF_NO_CONTACT_RESPONSE)) == 0);
+	}
+
+	const btVector3& getAnisotropicFriction() const
+	{
+		return m_anisotropicFriction;
+	}
+	void setAnisotropicFriction(const btVector3& anisotropicFriction, int frictionMode = CF_ANISOTROPIC_FRICTION)
+	{
+		m_anisotropicFriction = anisotropicFriction;
+		bool isUnity = (anisotropicFriction[0] != 1.f) || (anisotropicFriction[1] != 1.f) || (anisotropicFriction[2] != 1.f);
+		m_hasAnisotropicFriction = isUnity ? frictionMode : 0;
+	}
+	bool hasAnisotropicFriction(int frictionMode = CF_ANISOTROPIC_FRICTION) const
+	{
+		return (m_hasAnisotropicFriction & frictionMode) != 0;
+	}
+
+	///the constraint solver can discard solving contacts, if the distance is above this threshold. 0 by default.
+	///Note that using contacts with positive distance can improve stability. It increases, however, the chance of colliding with degerate contacts, such as 'interior' triangle edges
+	void setContactProcessingThreshold(btScalar contactProcessingThreshold)
+	{
+		m_contactProcessingThreshold = contactProcessingThreshold;
+	}
+	btScalar getContactProcessingThreshold() const
+	{
+		return m_contactProcessingThreshold;
+	}
+
+	SIMD_FORCE_INLINE bool isStaticObject() const
+	{
+		return (m_collisionFlags & CF_STATIC_OBJECT) != 0;
+	}
+
+	SIMD_FORCE_INLINE bool isKinematicObject() const
+	{
+		return (m_collisionFlags & CF_KINEMATIC_OBJECT) != 0;
+	}
+
+	SIMD_FORCE_INLINE bool isStaticOrKinematicObject() const
+	{
+		return (m_collisionFlags & (CF_KINEMATIC_OBJECT | CF_STATIC_OBJECT)) != 0;
+	}
+
+	SIMD_FORCE_INLINE bool hasContactResponse() const
+	{
+		return (m_collisionFlags & CF_NO_CONTACT_RESPONSE) == 0;
+	}
+
+	btCollisionObject();
+
+	virtual ~btCollisionObject();
+
+	virtual void setCollisionShape(btCollisionShape * collisionShape)
+	{
+		m_updateRevision++;
+		m_collisionShape = collisionShape;
+		m_rootCollisionShape = collisionShape;
+	}
+
+	SIMD_FORCE_INLINE const btCollisionShape* getCollisionShape() const
+	{
+		return m_collisionShape;
+	}
+
+	SIMD_FORCE_INLINE btCollisionShape* getCollisionShape()
+	{
+		return m_collisionShape;
+	}
+
+	void setIgnoreCollisionCheck(const btCollisionObject* co, bool ignoreCollisionCheck)
+	{
+		if (ignoreCollisionCheck)
+		{
+			//We don't check for duplicates. Is it ok to leave that up to the user of this API?
+			//int index = m_objectsWithoutCollisionCheck.findLinearSearch(co);
+			//if (index == m_objectsWithoutCollisionCheck.size())
+			//{
+			m_objectsWithoutCollisionCheck.push_back(co);
+			//}
+		}
+		else
+		{
+			m_objectsWithoutCollisionCheck.remove(co);
+		}
+		m_checkCollideWith = m_objectsWithoutCollisionCheck.size() > 0;
+	}
+
+        int getNumObjectsWithoutCollision() const
+	{
+		return m_objectsWithoutCollisionCheck.size();
+	}
+
+	const btCollisionObject* getObjectWithoutCollision(int index)
+	{
+		return m_objectsWithoutCollisionCheck[index];
+	}
+
+	virtual bool checkCollideWithOverride(const btCollisionObject* co) const
+	{
+		int index = m_objectsWithoutCollisionCheck.findLinearSearch(co);
+		if (index < m_objectsWithoutCollisionCheck.size())
+		{
+			return false;
+		}
+		return true;
+	}
+
+	///Avoid using this internal API call, the extension pointer is used by some Bullet extensions.
+	///If you need to store your own user pointer, use 'setUserPointer/getUserPointer' instead.
+	void* internalGetExtensionPointer() const
+	{
+		return m_extensionPointer;
+	}
+	///Avoid using this internal API call, the extension pointer is used by some Bullet extensions
+	///If you need to store your own user pointer, use 'setUserPointer/getUserPointer' instead.
+	void internalSetExtensionPointer(void* pointer)
+	{
+		m_extensionPointer = pointer;
+	}
+
+	SIMD_FORCE_INLINE int getActivationState() const { return m_activationState1; }
+
+	void setActivationState(int newState) const;
+
+	void setDeactivationTime(btScalar time)
+	{
+		m_deactivationTime = time;
+	}
+	btScalar getDeactivationTime() const
+	{
+		return m_deactivationTime;
+	}
+
+	void forceActivationState(int newState) const;
+
+	void activate(bool forceActivation = false) const;
+
+	SIMD_FORCE_INLINE bool isActive() const
+	{
+		return ((getActivationState() != FIXED_BASE_MULTI_BODY) && (getActivationState() != ISLAND_SLEEPING) && (getActivationState() != DISABLE_SIMULATION));
+	}
+
+	void setRestitution(btScalar rest)
+	{
+		m_updateRevision++;
+		m_restitution = rest;
+	}
+	btScalar getRestitution() const
+	{
+		return m_restitution;
+	}
+	void setFriction(btScalar frict)
+	{
+		m_updateRevision++;
+		m_friction = frict;
+	}
+	btScalar getFriction() const
+	{
+		return m_friction;
+	}
+
+	void setRollingFriction(btScalar frict)
+	{
+		m_updateRevision++;
+		m_rollingFriction = frict;
+	}
+	btScalar getRollingFriction() const
+	{
+		return m_rollingFriction;
+	}
+	void setSpinningFriction(btScalar frict)
+	{
+		m_updateRevision++;
+		m_spinningFriction = frict;
+	}
+	btScalar getSpinningFriction() const
+	{
+		return m_spinningFriction;
+	}
+	void setContactStiffnessAndDamping(btScalar stiffness, btScalar damping)
+	{
+		m_updateRevision++;
+		m_contactStiffness = stiffness;
+		m_contactDamping = damping;
+
+		m_collisionFlags |= CF_HAS_CONTACT_STIFFNESS_DAMPING;
+
+		//avoid divisions by zero...
+		if (m_contactStiffness < SIMD_EPSILON)
+		{
+			m_contactStiffness = SIMD_EPSILON;
+		}
+	}
+
+	btScalar getContactStiffness() const
+	{
+		return m_contactStiffness;
+	}
+
+	btScalar getContactDamping() const
+	{
+		return m_contactDamping;
+	}
+
+	///reserved for Bullet internal usage
+	int getInternalType() const
+	{
+		return m_internalType;
+	}
+
+	btTransform& getWorldTransform()
+	{
+		return m_worldTransform;
+	}
+
+	const btTransform& getWorldTransform() const
+	{
+		return m_worldTransform;
+	}
+
+	void setWorldTransform(const btTransform& worldTrans)
+	{
+		m_updateRevision++;
+		m_worldTransform = worldTrans;
+	}
+
+	SIMD_FORCE_INLINE btBroadphaseProxy* getBroadphaseHandle()
+	{
+		return m_broadphaseHandle;
+	}
+
+	SIMD_FORCE_INLINE const btBroadphaseProxy* getBroadphaseHandle() const
+	{
+		return m_broadphaseHandle;
+	}
+
+	void setBroadphaseHandle(btBroadphaseProxy * handle)
+	{
+		m_broadphaseHandle = handle;
+	}
+
+	const btTransform& getInterpolationWorldTransform() const
+	{
+		return m_interpolationWorldTransform;
+	}
+
+	btTransform& getInterpolationWorldTransform()
+	{
+		return m_interpolationWorldTransform;
+	}
+
+	void setInterpolationWorldTransform(const btTransform& trans)
+	{
+		m_updateRevision++;
+		m_interpolationWorldTransform = trans;
+	}
+
+	void setInterpolationLinearVelocity(const btVector3& linvel)
+	{
+		m_updateRevision++;
+		m_interpolationLinearVelocity = linvel;
+	}
+
+	void setInterpolationAngularVelocity(const btVector3& angvel)
+	{
+		m_updateRevision++;
+		m_interpolationAngularVelocity = angvel;
+	}
+
+	const btVector3& getInterpolationLinearVelocity() const
+	{
+		return m_interpolationLinearVelocity;
+	}
+
+	const btVector3& getInterpolationAngularVelocity() const
+	{
+		return m_interpolationAngularVelocity;
+	}
+
+	SIMD_FORCE_INLINE int getIslandTag() const
+	{
+		return m_islandTag1;
+	}
+
+	void setIslandTag(int tag)
+	{
+		m_islandTag1 = tag;
+	}
+
+	SIMD_FORCE_INLINE int getCompanionId() const
+	{
+		return m_companionId;
+	}
+
+	void setCompanionId(int id)
+	{
+		m_companionId = id;
+	}
+
+	SIMD_FORCE_INLINE int getWorldArrayIndex() const
+	{
+		return m_worldArrayIndex;
+	}
+
+	// only should be called by CollisionWorld
+	void setWorldArrayIndex(int ix)
+	{
+		m_worldArrayIndex = ix;
+	}
+
+	SIMD_FORCE_INLINE btScalar getHitFraction() const
+	{
+		return m_hitFraction;
+	}
+
+	void setHitFraction(btScalar hitFraction)
+	{
+		m_hitFraction = hitFraction;
+	}
+
+	SIMD_FORCE_INLINE int getCollisionFlags() const
+	{
+		return m_collisionFlags;
+	}
+
+	void setCollisionFlags(int flags)
+	{
+		m_collisionFlags = flags;
+	}
+
+	///Swept sphere radius (0.0 by default), see btConvexConvexAlgorithm::
+	btScalar getCcdSweptSphereRadius() const
+	{
+		return m_ccdSweptSphereRadius;
+	}
+
+	///Swept sphere radius (0.0 by default), see btConvexConvexAlgorithm::
+	void setCcdSweptSphereRadius(btScalar radius)
+	{
+		m_ccdSweptSphereRadius = radius;
+	}
+
+	btScalar getCcdMotionThreshold() const
+	{
+		return m_ccdMotionThreshold;
+	}
+
+	btScalar getCcdSquareMotionThreshold() const
+	{
+		return m_ccdMotionThreshold * m_ccdMotionThreshold;
+	}
+
+	/// Don't do continuous collision detection if the motion (in one step) is less then m_ccdMotionThreshold
+	void setCcdMotionThreshold(btScalar ccdMotionThreshold)
+	{
+		m_ccdMotionThreshold = ccdMotionThreshold;
+	}
+
+	///users can point to their objects, userPointer is not used by Bullet
+	void* getUserPointer() const
+	{
+		return m_userObjectPointer;
+	}
+
+	int getUserIndex() const
+	{
+		return m_userIndex;
+	}
+
+	int getUserIndex2() const
+	{
+		return m_userIndex2;
+	}
+
+	int getUserIndex3() const
+	{
+		return m_userIndex3;
+	}
+
+	///users can point to their objects, userPointer is not used by Bullet
+	void setUserPointer(void* userPointer)
+	{
+		m_userObjectPointer = userPointer;
+	}
+
+	///users can point to their objects, userPointer is not used by Bullet
+	void setUserIndex(int index)
+	{
+		m_userIndex = index;
+	}
+
+	void setUserIndex2(int index)
+	{
+		m_userIndex2 = index;
+	}
+
+	void setUserIndex3(int index)
+	{
+		m_userIndex3 = index;
+	}
+
+	int getUpdateRevisionInternal() const
+	{
+		return m_updateRevision;
+	}
+
+	void setCustomDebugColor(const btVector3& colorRGB)
+	{
+		m_customDebugColorRGB = colorRGB;
+		m_collisionFlags |= CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR;
+	}
+
+	void removeCustomDebugColor()
+	{
+		m_collisionFlags &= ~CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR;
+	}
+
+	bool getCustomDebugColor(btVector3 & colorRGB) const
+	{
+		bool hasCustomColor = (0 != (m_collisionFlags & CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR));
+		if (hasCustomColor)
+		{
+			colorRGB = m_customDebugColorRGB;
+		}
+		return hasCustomColor;
+	}
+
+	inline bool checkCollideWith(const btCollisionObject* co) const
+	{
+		if (m_checkCollideWith)
+			return checkCollideWithOverride(co);
+
+		return true;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, class btSerializer* serializer) const;
+
+	virtual void serializeSingleObject(class btSerializer * serializer) const;
+};
+
+// clang-format off
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btCollisionObjectDoubleData
+{
+	void					*m_broadphaseHandle;
+	void					*m_collisionShape;
+	btCollisionShapeData	*m_rootCollisionShape;
+	char					*m_name;
+
+	btTransformDoubleData	m_worldTransform;
+	btTransformDoubleData	m_interpolationWorldTransform;
+	btVector3DoubleData		m_interpolationLinearVelocity;
+	btVector3DoubleData		m_interpolationAngularVelocity;
+	btVector3DoubleData		m_anisotropicFriction;
+	double					m_contactProcessingThreshold;	
+	double					m_deactivationTime;
+	double					m_friction;
+	double					m_rollingFriction;
+	double                  m_contactDamping;
+	double                  m_contactStiffness;
+	double					m_restitution;
+	double					m_hitFraction; 
+	double					m_ccdSweptSphereRadius;
+	double					m_ccdMotionThreshold;
+	int						m_hasAnisotropicFriction;
+	int						m_collisionFlags;
+	int						m_islandTag1;
+	int						m_companionId;
+	int						m_activationState1;
+	int						m_internalType;
+	int						m_checkCollideWith;
+	int						m_collisionFilterGroup;
+	int						m_collisionFilterMask;
+	int						m_uniqueId;//m_uniqueId is introduced for paircache. could get rid of this, by calculating the address offset etc.
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btCollisionObjectFloatData
+{
+	void					*m_broadphaseHandle;
+	void					*m_collisionShape;
+	btCollisionShapeData	*m_rootCollisionShape;
+	char					*m_name;
+
+	btTransformFloatData	m_worldTransform;
+	btTransformFloatData	m_interpolationWorldTransform;
+	btVector3FloatData		m_interpolationLinearVelocity;
+	btVector3FloatData		m_interpolationAngularVelocity;
+	btVector3FloatData		m_anisotropicFriction;
+	float					m_contactProcessingThreshold;	
+	float					m_deactivationTime;
+	float					m_friction;
+	float					m_rollingFriction;
+	float                   m_contactDamping;
+    float                   m_contactStiffness;
+	float					m_restitution;
+	float					m_hitFraction; 
+	float					m_ccdSweptSphereRadius;
+	float					m_ccdMotionThreshold;
+	int						m_hasAnisotropicFriction;
+	int						m_collisionFlags;
+	int						m_islandTag1;
+	int						m_companionId;
+	int						m_activationState1;
+	int						m_internalType;
+	int						m_checkCollideWith;
+	int						m_collisionFilterGroup;
+	int						m_collisionFilterMask;
+	int						m_uniqueId;
+};
+// clang-format on
+
+SIMD_FORCE_INLINE int btCollisionObject::calculateSerializeBufferSize() const
+{
+	return sizeof(btCollisionObjectData);
+}
+
+#endif  //BT_COLLISION_OBJECT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
new file mode 100644
index 0000000..56341b7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
@@ -0,0 +1,49 @@
+#ifndef BT_COLLISION_OBJECT_WRAPPER_H
+#define BT_COLLISION_OBJECT_WRAPPER_H
+
+///btCollisionObjectWrapperis an internal data structure.
+///Most users can ignore this and use btCollisionObject and btCollisionShape instead
+class btCollisionShape;
+class btCollisionObject;
+class btTransform;
+#include "LinearMath/btScalar.h"  // for SIMD_FORCE_INLINE definition
+
+#define BT_DECLARE_STACK_ONLY_OBJECT \
+private:                             \
+	void* operator new(size_t size); \
+	void operator delete(void*);
+
+struct btCollisionObjectWrapper;
+struct btCollisionObjectWrapper
+{
+	BT_DECLARE_STACK_ONLY_OBJECT
+
+private:
+	btCollisionObjectWrapper(const btCollisionObjectWrapper&);  // not implemented. Not allowed.
+	btCollisionObjectWrapper* operator=(const btCollisionObjectWrapper&);
+
+public:
+	const btCollisionObjectWrapper* m_parent;
+	const btCollisionShape* m_shape;
+	const btCollisionObject* m_collisionObject;
+	const btTransform& m_worldTransform;
+    const btTransform* m_preTransform;
+	int m_partId;
+	int m_index;
+
+	btCollisionObjectWrapper(const btCollisionObjectWrapper* parent, const btCollisionShape* shape, const btCollisionObject* collisionObject, const btTransform& worldTransform, int partId, int index)
+		: m_parent(parent), m_shape(shape), m_collisionObject(collisionObject), m_worldTransform(worldTransform), m_preTransform(NULL), m_partId(partId), m_index(index)
+	{
+	}
+    
+    btCollisionObjectWrapper(const btCollisionObjectWrapper* parent, const btCollisionShape* shape, const btCollisionObject* collisionObject, const btTransform& worldTransform, const btTransform& preTransform, int partId, int index)
+    : m_parent(parent), m_shape(shape), m_collisionObject(collisionObject), m_worldTransform(worldTransform), m_preTransform(&preTransform), m_partId(partId), m_index(index)
+    {
+    }
+
+	SIMD_FORCE_INLINE const btTransform& getWorldTransform() const { return m_worldTransform; }
+	SIMD_FORCE_INLINE const btCollisionObject* getCollisionObject() const { return m_collisionObject; }
+	SIMD_FORCE_INLINE const btCollisionShape* getCollisionShape() const { return m_shape; }
+};
+
+#endif  //BT_COLLISION_OBJECT_WRAPPER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
new file mode 100644
index 0000000..15940f5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
@@ -0,0 +1,1624 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCollisionWorld.h"
+#include "btCollisionDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"                 //for raycasting
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"        //for raycasting
+#include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h"  //for raycasting
+#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"     //for raycasting
+#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
+#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "LinearMath/btAabbUtil2.h"
+#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btSerializer.h"
+#include "BulletCollision/CollisionShapes/btConvexPolyhedron.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+//#define DISABLE_DBVT_COMPOUNDSHAPE_RAYCAST_ACCELERATION
+
+//#define USE_BRUTEFORCE_RAYBROADPHASE 1
+//RECALCULATE_AABB is slower, but benefit is that you don't need to call 'stepSimulation'  or 'updateAabbs' before using a rayTest
+//#define RECALCULATE_AABB_RAYCAST 1
+
+//When the user doesn't provide dispatcher or broadphase, create basic versions (and delete them in destructor)
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
+#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
+
+///for debug drawing
+
+//for debug rendering
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionShapes/btCapsuleShape.h"
+#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include "BulletCollision/CollisionShapes/btConeShape.h"
+#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btCylinderShape.h"
+#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
+#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
+#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+
+btCollisionWorld::btCollisionWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btCollisionConfiguration* collisionConfiguration)
+	: m_dispatcher1(dispatcher),
+	  m_broadphasePairCache(pairCache),
+	  m_debugDrawer(0),
+	  m_forceUpdateAllAabbs(true)
+{
+}
+
+btCollisionWorld::~btCollisionWorld()
+{
+	//clean up remaining objects
+	int i;
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* collisionObject = m_collisionObjects[i];
+
+		btBroadphaseProxy* bp = collisionObject->getBroadphaseHandle();
+		if (bp)
+		{
+			//
+			// only clear the cached algorithms
+			//
+			getBroadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bp, m_dispatcher1);
+			getBroadphase()->destroyProxy(bp, m_dispatcher1);
+			collisionObject->setBroadphaseHandle(0);
+		}
+	}
+}
+
+void btCollisionWorld::refreshBroadphaseProxy(btCollisionObject* collisionObject)
+{
+	if (collisionObject->getBroadphaseHandle())
+	{
+		int collisionFilterGroup = collisionObject->getBroadphaseHandle()->m_collisionFilterGroup;
+		int collisionFilterMask = collisionObject->getBroadphaseHandle()->m_collisionFilterMask;
+
+		getBroadphase()->destroyProxy(collisionObject->getBroadphaseHandle(), getDispatcher());
+
+		//calculate new AABB
+		btTransform trans = collisionObject->getWorldTransform();
+
+		btVector3 minAabb;
+		btVector3 maxAabb;
+		collisionObject->getCollisionShape()->getAabb(trans, minAabb, maxAabb);
+
+		int type = collisionObject->getCollisionShape()->getShapeType();
+		collisionObject->setBroadphaseHandle(getBroadphase()->createProxy(
+			minAabb,
+			maxAabb,
+			type,
+			collisionObject,
+			collisionFilterGroup,
+			collisionFilterMask,
+			m_dispatcher1));
+	}
+}
+
+void btCollisionWorld::addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask)
+{
+	btAssert(collisionObject);
+
+	//check that the object isn't already added
+	btAssert(m_collisionObjects.findLinearSearch(collisionObject) == m_collisionObjects.size());
+	btAssert(collisionObject->getWorldArrayIndex() == -1);  // do not add the same object to more than one collision world
+
+	collisionObject->setWorldArrayIndex(m_collisionObjects.size());
+	m_collisionObjects.push_back(collisionObject);
+
+	//calculate new AABB
+	btTransform trans = collisionObject->getWorldTransform();
+
+	btVector3 minAabb;
+	btVector3 maxAabb;
+	collisionObject->getCollisionShape()->getAabb(trans, minAabb, maxAabb);
+
+	int type = collisionObject->getCollisionShape()->getShapeType();
+	collisionObject->setBroadphaseHandle(getBroadphase()->createProxy(
+		minAabb,
+		maxAabb,
+		type,
+		collisionObject,
+		collisionFilterGroup,
+		collisionFilterMask,
+		m_dispatcher1));
+}
+
+void btCollisionWorld::updateSingleAabb(btCollisionObject* colObj)
+{
+	btVector3 minAabb, maxAabb;
+	colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb, maxAabb);
+	//need to increase the aabb for contact thresholds
+	btVector3 contactThreshold(gContactBreakingThreshold, gContactBreakingThreshold, gContactBreakingThreshold);
+	minAabb -= contactThreshold;
+	maxAabb += contactThreshold;
+
+	if (getDispatchInfo().m_useContinuous && colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY && !colObj->isStaticOrKinematicObject())
+	{
+		btVector3 minAabb2, maxAabb2;
+		colObj->getCollisionShape()->getAabb(colObj->getInterpolationWorldTransform(), minAabb2, maxAabb2);
+		minAabb2 -= contactThreshold;
+		maxAabb2 += contactThreshold;
+		minAabb.setMin(minAabb2);
+		maxAabb.setMax(maxAabb2);
+	}
+
+	btBroadphaseInterface* bp = (btBroadphaseInterface*)m_broadphasePairCache;
+
+	//moving objects should be moderately sized, probably something wrong if not
+	if (colObj->isStaticObject() || ((maxAabb - minAabb).length2() < btScalar(1e12)))
+	{
+		bp->setAabb(colObj->getBroadphaseHandle(), minAabb, maxAabb, m_dispatcher1);
+	}
+	else
+	{
+		//something went wrong, investigate
+		//this assert is unwanted in 3D modelers (danger of loosing work)
+		colObj->setActivationState(DISABLE_SIMULATION);
+
+		static bool reportMe = true;
+		if (reportMe && m_debugDrawer)
+		{
+			reportMe = false;
+			m_debugDrawer->reportErrorWarning("Overflow in AABB, object removed from simulation");
+			m_debugDrawer->reportErrorWarning("If you can reproduce this, please email bugs@continuousphysics.com\n");
+			m_debugDrawer->reportErrorWarning("Please include above information, your Platform, version of OS.\n");
+			m_debugDrawer->reportErrorWarning("Thanks.\n");
+		}
+	}
+}
+
+void btCollisionWorld::updateAabbs()
+{
+	BT_PROFILE("updateAabbs");
+
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btAssert(colObj->getWorldArrayIndex() == i);
+
+		//only update aabb of active objects
+		if (m_forceUpdateAllAabbs || colObj->isActive())
+		{
+			updateSingleAabb(colObj);
+		}
+	}
+}
+
+void btCollisionWorld::computeOverlappingPairs()
+{
+	BT_PROFILE("calculateOverlappingPairs");
+	m_broadphasePairCache->calculateOverlappingPairs(m_dispatcher1);
+}
+
+void btCollisionWorld::performDiscreteCollisionDetection()
+{
+	BT_PROFILE("performDiscreteCollisionDetection");
+
+	btDispatcherInfo& dispatchInfo = getDispatchInfo();
+
+	updateAabbs();
+
+	computeOverlappingPairs();
+
+	btDispatcher* dispatcher = getDispatcher();
+	{
+		BT_PROFILE("dispatchAllCollisionPairs");
+		if (dispatcher)
+			dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache->getOverlappingPairCache(), dispatchInfo, m_dispatcher1);
+	}
+}
+
+void btCollisionWorld::removeCollisionObject(btCollisionObject* collisionObject)
+{
+	//bool removeFromBroadphase = false;
+
+	{
+		btBroadphaseProxy* bp = collisionObject->getBroadphaseHandle();
+		if (bp)
+		{
+			//
+			// only clear the cached algorithms
+			//
+			getBroadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bp, m_dispatcher1);
+			getBroadphase()->destroyProxy(bp, m_dispatcher1);
+			collisionObject->setBroadphaseHandle(0);
+		}
+	}
+
+	int iObj = collisionObject->getWorldArrayIndex();
+	//    btAssert(iObj >= 0 && iObj < m_collisionObjects.size()); // trying to remove an object that was never added or already removed previously?
+	if (iObj >= 0 && iObj < m_collisionObjects.size())
+	{
+		btAssert(collisionObject == m_collisionObjects[iObj]);
+		m_collisionObjects.swap(iObj, m_collisionObjects.size() - 1);
+		m_collisionObjects.pop_back();
+		if (iObj < m_collisionObjects.size())
+		{
+			m_collisionObjects[iObj]->setWorldArrayIndex(iObj);
+		}
+	}
+	else
+	{
+		// slow linear search
+		//swapremove
+		m_collisionObjects.remove(collisionObject);
+	}
+	collisionObject->setWorldArrayIndex(-1);
+}
+
+void btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+									 btCollisionObject* collisionObject,
+									 const btCollisionShape* collisionShape,
+									 const btTransform& colObjWorldTransform,
+									 RayResultCallback& resultCallback)
+{
+	btCollisionObjectWrapper colObWrap(0, collisionShape, collisionObject, colObjWorldTransform, -1, -1);
+	btCollisionWorld::rayTestSingleInternal(rayFromTrans, rayToTrans, &colObWrap, resultCallback);
+}
+
+void btCollisionWorld::rayTestSingleInternal(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+											 const btCollisionObjectWrapper* collisionObjectWrap,
+											 RayResultCallback& resultCallback)
+{
+	btSphereShape pointShape(btScalar(0.0));
+	pointShape.setMargin(0.f);
+	const btConvexShape* castShape = &pointShape;
+	const btCollisionShape* collisionShape = collisionObjectWrap->getCollisionShape();
+	const btTransform& colObjWorldTransform = collisionObjectWrap->getWorldTransform();
+
+	if (collisionShape->isConvex())
+	{
+		//		BT_PROFILE("rayTestConvex");
+		btConvexCast::CastResult castResult;
+		castResult.m_fraction = resultCallback.m_closestHitFraction;
+
+		btConvexShape* convexShape = (btConvexShape*)collisionShape;
+		btVoronoiSimplexSolver simplexSolver;
+		btSubsimplexConvexCast subSimplexConvexCaster(castShape, convexShape, &simplexSolver);
+
+		btGjkConvexCast gjkConvexCaster(castShape, convexShape, &simplexSolver);
+
+		//btContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0);
+
+		btConvexCast* convexCasterPtr = 0;
+		//use kF_UseSubSimplexConvexCastRaytest by default
+		if (resultCallback.m_flags & btTriangleRaycastCallback::kF_UseGjkConvexCastRaytest)
+			convexCasterPtr = &gjkConvexCaster;
+		else
+			convexCasterPtr = &subSimplexConvexCaster;
+
+		btConvexCast& convexCaster = *convexCasterPtr;
+
+		if (convexCaster.calcTimeOfImpact(rayFromTrans, rayToTrans, colObjWorldTransform, colObjWorldTransform, castResult))
+		{
+			//add hit
+			if (castResult.m_normal.length2() > btScalar(0.0001))
+			{
+				if (castResult.m_fraction < resultCallback.m_closestHitFraction)
+				{
+					//todo: figure out what this is about. When is rayFromTest.getBasis() not identity?
+#ifdef USE_SUBSIMPLEX_CONVEX_CAST
+					//rotate normal into worldspace
+					castResult.m_normal = rayFromTrans.getBasis() * castResult.m_normal;
+#endif  //USE_SUBSIMPLEX_CONVEX_CAST
+
+					castResult.m_normal.normalize();
+					btCollisionWorld::LocalRayResult localRayResult(
+						collisionObjectWrap->getCollisionObject(),
+						0,
+						castResult.m_normal,
+						castResult.m_fraction);
+
+					bool normalInWorldSpace = true;
+					resultCallback.addSingleResult(localRayResult, normalInWorldSpace);
+				}
+			}
+		}
+	}
+	else
+	{
+		if (collisionShape->isConcave())
+		{
+			//ConvexCast::CastResult
+			struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback
+			{
+				btCollisionWorld::RayResultCallback* m_resultCallback;
+				const btCollisionObject* m_collisionObject;
+				const btConcaveShape* m_triangleMesh;
+
+				btTransform m_colObjWorldTransform;
+
+				BridgeTriangleRaycastCallback(const btVector3& from, const btVector3& to,
+											  btCollisionWorld::RayResultCallback* resultCallback, const btCollisionObject* collisionObject, const btConcaveShape* triangleMesh, const btTransform& colObjWorldTransform) :  //@BP Mod
+																																																							btTriangleRaycastCallback(from, to, resultCallback->m_flags),
+																																																							m_resultCallback(resultCallback),
+																																																							m_collisionObject(collisionObject),
+																																																							m_triangleMesh(triangleMesh),
+																																																							m_colObjWorldTransform(colObjWorldTransform)
+				{
+				}
+
+				virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex)
+				{
+					btCollisionWorld::LocalShapeInfo shapeInfo;
+					shapeInfo.m_shapePart = partId;
+					shapeInfo.m_triangleIndex = triangleIndex;
+
+					btVector3 hitNormalWorld = m_colObjWorldTransform.getBasis() * hitNormalLocal;
+
+					btCollisionWorld::LocalRayResult rayResult(m_collisionObject,
+															   &shapeInfo,
+															   hitNormalWorld,
+															   hitFraction);
+
+					bool normalInWorldSpace = true;
+					return m_resultCallback->addSingleResult(rayResult, normalInWorldSpace);
+				}
+			};
+
+			btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+			btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
+			btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
+
+			//			BT_PROFILE("rayTestConcave");
+			if (collisionShape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+			{
+				///optimized version for btBvhTriangleMeshShape
+				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
+
+				BridgeTriangleRaycastCallback rcb(rayFromLocal, rayToLocal, &resultCallback, collisionObjectWrap->getCollisionObject(), triangleMesh, colObjWorldTransform);
+				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
+				triangleMesh->performRaycast(&rcb, rayFromLocal, rayToLocal);
+			}
+			else if (collisionShape->getShapeType() == SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE)
+			{
+				///optimized version for btScaledBvhTriangleMeshShape
+				btScaledBvhTriangleMeshShape* scaledTriangleMesh = (btScaledBvhTriangleMeshShape*)collisionShape;
+				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)scaledTriangleMesh->getChildShape();
+
+				//scale the ray positions
+				btVector3 scale = scaledTriangleMesh->getLocalScaling();
+				btVector3 rayFromLocalScaled = rayFromLocal / scale;
+				btVector3 rayToLocalScaled = rayToLocal / scale;
+
+				//perform raycast in the underlying btBvhTriangleMeshShape
+				BridgeTriangleRaycastCallback rcb(rayFromLocalScaled, rayToLocalScaled, &resultCallback, collisionObjectWrap->getCollisionObject(), triangleMesh, colObjWorldTransform);
+				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
+				triangleMesh->performRaycast(&rcb, rayFromLocalScaled, rayToLocalScaled);
+			}
+			else if (((resultCallback.m_flags&btTriangleRaycastCallback::kF_DisableHeightfieldAccelerator)==0) 
+				&& collisionShape->getShapeType() == TERRAIN_SHAPE_PROXYTYPE 
+				)
+			{
+				///optimized version for btHeightfieldTerrainShape
+				btHeightfieldTerrainShape* heightField = (btHeightfieldTerrainShape*)collisionShape;
+				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+				btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
+				btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
+
+				BridgeTriangleRaycastCallback rcb(rayFromLocal, rayToLocal, &resultCallback, collisionObjectWrap->getCollisionObject(), heightField, colObjWorldTransform);
+				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
+				heightField->performRaycast(&rcb, rayFromLocal, rayToLocal);
+			}
+			else
+			{
+				//generic (slower) case
+				btConcaveShape* concaveShape = (btConcaveShape*)collisionShape;
+
+				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+
+				btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
+				btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
+
+				//ConvexCast::CastResult
+
+				struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback
+				{
+					btCollisionWorld::RayResultCallback* m_resultCallback;
+					const btCollisionObject* m_collisionObject;
+					btConcaveShape* m_triangleMesh;
+
+					btTransform m_colObjWorldTransform;
+
+					BridgeTriangleRaycastCallback(const btVector3& from, const btVector3& to,
+												  btCollisionWorld::RayResultCallback* resultCallback, const btCollisionObject* collisionObject, btConcaveShape* triangleMesh, const btTransform& colObjWorldTransform) :  //@BP Mod
+																																																						  btTriangleRaycastCallback(from, to, resultCallback->m_flags),
+																																																						  m_resultCallback(resultCallback),
+																																																						  m_collisionObject(collisionObject),
+																																																						  m_triangleMesh(triangleMesh),
+																																																						  m_colObjWorldTransform(colObjWorldTransform)
+					{
+					}
+
+					virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex)
+					{
+						btCollisionWorld::LocalShapeInfo shapeInfo;
+						shapeInfo.m_shapePart = partId;
+						shapeInfo.m_triangleIndex = triangleIndex;
+
+						btVector3 hitNormalWorld = m_colObjWorldTransform.getBasis() * hitNormalLocal;
+
+						btCollisionWorld::LocalRayResult rayResult(m_collisionObject,
+																   &shapeInfo,
+																   hitNormalWorld,
+																   hitFraction);
+
+						bool normalInWorldSpace = true;
+						return m_resultCallback->addSingleResult(rayResult, normalInWorldSpace);
+					}
+				};
+
+				BridgeTriangleRaycastCallback rcb(rayFromLocal, rayToLocal, &resultCallback, collisionObjectWrap->getCollisionObject(), concaveShape, colObjWorldTransform);
+				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
+
+				btVector3 rayAabbMinLocal = rayFromLocal;
+				rayAabbMinLocal.setMin(rayToLocal);
+				btVector3 rayAabbMaxLocal = rayFromLocal;
+				rayAabbMaxLocal.setMax(rayToLocal);
+
+				concaveShape->processAllTriangles(&rcb, rayAabbMinLocal, rayAabbMaxLocal);
+			}
+		}
+		else
+		{
+			//			BT_PROFILE("rayTestCompound");
+			if (collisionShape->isCompound())
+			{
+				struct LocalInfoAdder2 : public RayResultCallback
+				{
+					RayResultCallback* m_userCallback;
+					int m_i;
+
+					LocalInfoAdder2(int i, RayResultCallback* user)
+						: m_userCallback(user), m_i(i)
+					{
+						m_closestHitFraction = m_userCallback->m_closestHitFraction;
+						m_flags = m_userCallback->m_flags;
+					}
+					virtual bool needsCollision(btBroadphaseProxy* p) const
+					{
+						return m_userCallback->needsCollision(p);
+					}
+
+					virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& r, bool b)
+					{
+						btCollisionWorld::LocalShapeInfo shapeInfo;
+						shapeInfo.m_shapePart = -1;
+						shapeInfo.m_triangleIndex = m_i;
+						if (r.m_localShapeInfo == NULL)
+							r.m_localShapeInfo = &shapeInfo;
+
+						const btScalar result = m_userCallback->addSingleResult(r, b);
+						m_closestHitFraction = m_userCallback->m_closestHitFraction;
+						return result;
+					}
+				};
+
+				struct RayTester : btDbvt::ICollide
+				{
+					const btCollisionObject* m_collisionObject;
+					const btCompoundShape* m_compoundShape;
+					const btTransform& m_colObjWorldTransform;
+					const btTransform& m_rayFromTrans;
+					const btTransform& m_rayToTrans;
+					RayResultCallback& m_resultCallback;
+
+					RayTester(const btCollisionObject* collisionObject,
+							  const btCompoundShape* compoundShape,
+							  const btTransform& colObjWorldTransform,
+							  const btTransform& rayFromTrans,
+							  const btTransform& rayToTrans,
+							  RayResultCallback& resultCallback) : m_collisionObject(collisionObject),
+																   m_compoundShape(compoundShape),
+																   m_colObjWorldTransform(colObjWorldTransform),
+																   m_rayFromTrans(rayFromTrans),
+																   m_rayToTrans(rayToTrans),
+																   m_resultCallback(resultCallback)
+					{
+					}
+
+					void ProcessLeaf(int i)
+					{
+						const btCollisionShape* childCollisionShape = m_compoundShape->getChildShape(i);
+						const btTransform& childTrans = m_compoundShape->getChildTransform(i);
+						btTransform childWorldTrans = m_colObjWorldTransform * childTrans;
+
+						btCollisionObjectWrapper tmpOb(0, childCollisionShape, m_collisionObject, childWorldTrans, -1, i);
+						// replace collision shape so that callback can determine the triangle
+
+						LocalInfoAdder2 my_cb(i, &m_resultCallback);
+
+						rayTestSingleInternal(
+							m_rayFromTrans,
+							m_rayToTrans,
+							&tmpOb,
+							my_cb);
+					}
+
+					void Process(const btDbvtNode* leaf)
+					{
+						ProcessLeaf(leaf->dataAsInt);
+					}
+				};
+
+				const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
+				const btDbvt* dbvt = compoundShape->getDynamicAabbTree();
+
+				RayTester rayCB(
+					collisionObjectWrap->getCollisionObject(),
+					compoundShape,
+					colObjWorldTransform,
+					rayFromTrans,
+					rayToTrans,
+					resultCallback);
+#ifndef DISABLE_DBVT_COMPOUNDSHAPE_RAYCAST_ACCELERATION
+				if (dbvt)
+				{
+					btVector3 localRayFrom = colObjWorldTransform.inverseTimes(rayFromTrans).getOrigin();
+					btVector3 localRayTo = colObjWorldTransform.inverseTimes(rayToTrans).getOrigin();
+					btDbvt::rayTest(dbvt->m_root, localRayFrom, localRayTo, rayCB);
+				}
+				else
+#endif  //DISABLE_DBVT_COMPOUNDSHAPE_RAYCAST_ACCELERATION
+				{
+					for (int i = 0, n = compoundShape->getNumChildShapes(); i < n; ++i)
+					{
+						rayCB.ProcessLeaf(i);
+					}
+				}
+			}
+		}
+	}
+}
+
+void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape, const btTransform& convexFromTrans, const btTransform& convexToTrans,
+										 btCollisionObject* collisionObject,
+										 const btCollisionShape* collisionShape,
+										 const btTransform& colObjWorldTransform,
+										 ConvexResultCallback& resultCallback, btScalar allowedPenetration)
+{
+	btCollisionObjectWrapper tmpOb(0, collisionShape, collisionObject, colObjWorldTransform, -1, -1);
+	btCollisionWorld::objectQuerySingleInternal(castShape, convexFromTrans, convexToTrans, &tmpOb, resultCallback, allowedPenetration);
+}
+
+void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape, const btTransform& convexFromTrans, const btTransform& convexToTrans,
+												 const btCollisionObjectWrapper* colObjWrap,
+												 ConvexResultCallback& resultCallback, btScalar allowedPenetration)
+{
+	const btCollisionShape* collisionShape = colObjWrap->getCollisionShape();
+	const btTransform& colObjWorldTransform = colObjWrap->getWorldTransform();
+
+	if (collisionShape->isConvex())
+	{
+		//BT_PROFILE("convexSweepConvex");
+		btConvexCast::CastResult castResult;
+		castResult.m_allowedPenetration = allowedPenetration;
+		castResult.m_fraction = resultCallback.m_closestHitFraction;  //btScalar(1.);//??
+
+		btConvexShape* convexShape = (btConvexShape*)collisionShape;
+		btVoronoiSimplexSolver simplexSolver;
+		btGjkEpaPenetrationDepthSolver gjkEpaPenetrationSolver;
+
+		btContinuousConvexCollision convexCaster1(castShape, convexShape, &simplexSolver, &gjkEpaPenetrationSolver);
+		//btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver);
+		//btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver);
+
+		btConvexCast* castPtr = &convexCaster1;
+
+		if (castPtr->calcTimeOfImpact(convexFromTrans, convexToTrans, colObjWorldTransform, colObjWorldTransform, castResult))
+		{
+			//add hit
+			if (castResult.m_normal.length2() > btScalar(0.0001))
+			{
+				if (castResult.m_fraction < resultCallback.m_closestHitFraction)
+				{
+					castResult.m_normal.normalize();
+					btCollisionWorld::LocalConvexResult localConvexResult(
+						colObjWrap->getCollisionObject(),
+						0,
+						castResult.m_normal,
+						castResult.m_hitPoint,
+						castResult.m_fraction);
+
+					bool normalInWorldSpace = true;
+					resultCallback.addSingleResult(localConvexResult, normalInWorldSpace);
+				}
+			}
+		}
+	}
+	else
+	{
+		if (collisionShape->isConcave())
+		{
+			if (collisionShape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+			{
+				//BT_PROFILE("convexSweepbtBvhTriangleMesh");
+				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
+				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+				btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
+				btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
+				// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
+				btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
+
+				//ConvexCast::CastResult
+				struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
+				{
+					btCollisionWorld::ConvexResultCallback* m_resultCallback;
+					const btCollisionObject* m_collisionObject;
+					btTriangleMeshShape* m_triangleMesh;
+
+					BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from, const btTransform& to,
+													 btCollisionWorld::ConvexResultCallback* resultCallback, const btCollisionObject* collisionObject, btTriangleMeshShape* triangleMesh, const btTransform& triangleToWorld) : btTriangleConvexcastCallback(castShape, from, to, triangleToWorld, triangleMesh->getMargin()),
+																																																								m_resultCallback(resultCallback),
+																																																								m_collisionObject(collisionObject),
+																																																								m_triangleMesh(triangleMesh)
+					{
+					}
+
+					virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex)
+					{
+						btCollisionWorld::LocalShapeInfo shapeInfo;
+						shapeInfo.m_shapePart = partId;
+						shapeInfo.m_triangleIndex = triangleIndex;
+						if (hitFraction <= m_resultCallback->m_closestHitFraction)
+						{
+							btCollisionWorld::LocalConvexResult convexResult(m_collisionObject,
+																			 &shapeInfo,
+																			 hitNormalLocal,
+																			 hitPointLocal,
+																			 hitFraction);
+
+							bool normalInWorldSpace = true;
+
+							return m_resultCallback->addSingleResult(convexResult, normalInWorldSpace);
+						}
+						return hitFraction;
+					}
+				};
+
+				BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans, convexToTrans, &resultCallback, colObjWrap->getCollisionObject(), triangleMesh, colObjWorldTransform);
+				tccb.m_hitFraction = resultCallback.m_closestHitFraction;
+				tccb.m_allowedPenetration = allowedPenetration;
+				btVector3 boxMinLocal, boxMaxLocal;
+				castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
+				triangleMesh->performConvexcast(&tccb, convexFromLocal, convexToLocal, boxMinLocal, boxMaxLocal);
+			}
+			else
+			{
+				if (collisionShape->getShapeType() == STATIC_PLANE_PROXYTYPE)
+				{
+					btConvexCast::CastResult castResult;
+					castResult.m_allowedPenetration = allowedPenetration;
+					castResult.m_fraction = resultCallback.m_closestHitFraction;
+					btStaticPlaneShape* planeShape = (btStaticPlaneShape*)collisionShape;
+					btContinuousConvexCollision convexCaster1(castShape, planeShape);
+					btConvexCast* castPtr = &convexCaster1;
+
+					if (castPtr->calcTimeOfImpact(convexFromTrans, convexToTrans, colObjWorldTransform, colObjWorldTransform, castResult))
+					{
+						//add hit
+						if (castResult.m_normal.length2() > btScalar(0.0001))
+						{
+							if (castResult.m_fraction < resultCallback.m_closestHitFraction)
+							{
+								castResult.m_normal.normalize();
+								btCollisionWorld::LocalConvexResult localConvexResult(
+									colObjWrap->getCollisionObject(),
+									0,
+									castResult.m_normal,
+									castResult.m_hitPoint,
+									castResult.m_fraction);
+
+								bool normalInWorldSpace = true;
+								resultCallback.addSingleResult(localConvexResult, normalInWorldSpace);
+							}
+						}
+					}
+				}
+				else
+				{
+					//BT_PROFILE("convexSweepConcave");
+					btConcaveShape* concaveShape = (btConcaveShape*)collisionShape;
+					btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+					btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
+					btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
+					// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
+					btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
+
+					//ConvexCast::CastResult
+					struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
+					{
+						btCollisionWorld::ConvexResultCallback* m_resultCallback;
+						const btCollisionObject* m_collisionObject;
+						btConcaveShape* m_triangleMesh;
+
+						BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from, const btTransform& to,
+														 btCollisionWorld::ConvexResultCallback* resultCallback, const btCollisionObject* collisionObject, btConcaveShape* triangleMesh, const btTransform& triangleToWorld) : btTriangleConvexcastCallback(castShape, from, to, triangleToWorld, triangleMesh->getMargin()),
+																																																							   m_resultCallback(resultCallback),
+																																																							   m_collisionObject(collisionObject),
+																																																							   m_triangleMesh(triangleMesh)
+						{
+						}
+
+						virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex)
+						{
+							btCollisionWorld::LocalShapeInfo shapeInfo;
+							shapeInfo.m_shapePart = partId;
+							shapeInfo.m_triangleIndex = triangleIndex;
+							if (hitFraction <= m_resultCallback->m_closestHitFraction)
+							{
+								btCollisionWorld::LocalConvexResult convexResult(m_collisionObject,
+																				 &shapeInfo,
+																				 hitNormalLocal,
+																				 hitPointLocal,
+																				 hitFraction);
+
+								bool normalInWorldSpace = true;
+
+								return m_resultCallback->addSingleResult(convexResult, normalInWorldSpace);
+							}
+							return hitFraction;
+						}
+					};
+
+					BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans, convexToTrans, &resultCallback, colObjWrap->getCollisionObject(), concaveShape, colObjWorldTransform);
+					tccb.m_hitFraction = resultCallback.m_closestHitFraction;
+					tccb.m_allowedPenetration = allowedPenetration;
+					btVector3 boxMinLocal, boxMaxLocal;
+					castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
+
+					btVector3 rayAabbMinLocal = convexFromLocal;
+					rayAabbMinLocal.setMin(convexToLocal);
+					btVector3 rayAabbMaxLocal = convexFromLocal;
+					rayAabbMaxLocal.setMax(convexToLocal);
+					rayAabbMinLocal += boxMinLocal;
+					rayAabbMaxLocal += boxMaxLocal;
+					concaveShape->processAllTriangles(&tccb, rayAabbMinLocal, rayAabbMaxLocal);
+				}
+			}
+		}
+		else
+		{
+			if (collisionShape->isCompound())
+			{
+				struct btCompoundLeafCallback : btDbvt::ICollide
+				{
+					btCompoundLeafCallback(
+						const btCollisionObjectWrapper* colObjWrap,
+						const btConvexShape* castShape,
+						const btTransform& convexFromTrans,
+						const btTransform& convexToTrans,
+						btScalar allowedPenetration,
+						const btCompoundShape* compoundShape,
+						const btTransform& colObjWorldTransform,
+						ConvexResultCallback& resultCallback)
+						: m_colObjWrap(colObjWrap),
+						  m_castShape(castShape),
+						  m_convexFromTrans(convexFromTrans),
+						  m_convexToTrans(convexToTrans),
+						  m_allowedPenetration(allowedPenetration),
+						  m_compoundShape(compoundShape),
+						  m_colObjWorldTransform(colObjWorldTransform),
+						  m_resultCallback(resultCallback)
+					{
+					}
+
+					const btCollisionObjectWrapper* m_colObjWrap;
+					const btConvexShape* m_castShape;
+					const btTransform& m_convexFromTrans;
+					const btTransform& m_convexToTrans;
+					btScalar m_allowedPenetration;
+					const btCompoundShape* m_compoundShape;
+					const btTransform& m_colObjWorldTransform;
+					ConvexResultCallback& m_resultCallback;
+
+				public:
+					void ProcessChild(int index, const btTransform& childTrans, const btCollisionShape* childCollisionShape)
+					{
+						btTransform childWorldTrans = m_colObjWorldTransform * childTrans;
+
+						struct LocalInfoAdder : public ConvexResultCallback
+						{
+							ConvexResultCallback* m_userCallback;
+							int m_i;
+
+							LocalInfoAdder(int i, ConvexResultCallback* user)
+								: m_userCallback(user), m_i(i)
+							{
+								m_closestHitFraction = m_userCallback->m_closestHitFraction;
+							}
+							virtual bool needsCollision(btBroadphaseProxy* p) const
+							{
+								return m_userCallback->needsCollision(p);
+							}
+							virtual btScalar addSingleResult(btCollisionWorld::LocalConvexResult& r, bool b)
+							{
+								btCollisionWorld::LocalShapeInfo shapeInfo;
+								shapeInfo.m_shapePart = -1;
+								shapeInfo.m_triangleIndex = m_i;
+								if (r.m_localShapeInfo == NULL)
+									r.m_localShapeInfo = &shapeInfo;
+								const btScalar result = m_userCallback->addSingleResult(r, b);
+								m_closestHitFraction = m_userCallback->m_closestHitFraction;
+								return result;
+							}
+						};
+
+						LocalInfoAdder my_cb(index, &m_resultCallback);
+
+						btCollisionObjectWrapper tmpObj(m_colObjWrap, childCollisionShape, m_colObjWrap->getCollisionObject(), childWorldTrans, -1, index);
+
+						objectQuerySingleInternal(m_castShape, m_convexFromTrans, m_convexToTrans, &tmpObj, my_cb, m_allowedPenetration);
+					}
+
+					void Process(const btDbvtNode* leaf)
+					{
+						// Processing leaf node
+						int index = leaf->dataAsInt;
+
+						btTransform childTrans = m_compoundShape->getChildTransform(index);
+						const btCollisionShape* childCollisionShape = m_compoundShape->getChildShape(index);
+
+						ProcessChild(index, childTrans, childCollisionShape);
+					}
+				};
+
+				BT_PROFILE("convexSweepCompound");
+				const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
+
+				btVector3 fromLocalAabbMin, fromLocalAabbMax;
+				btVector3 toLocalAabbMin, toLocalAabbMax;
+
+				castShape->getAabb(colObjWorldTransform.inverse() * convexFromTrans, fromLocalAabbMin, fromLocalAabbMax);
+				castShape->getAabb(colObjWorldTransform.inverse() * convexToTrans, toLocalAabbMin, toLocalAabbMax);
+
+				fromLocalAabbMin.setMin(toLocalAabbMin);
+				fromLocalAabbMax.setMax(toLocalAabbMax);
+
+				btCompoundLeafCallback callback(colObjWrap, castShape, convexFromTrans, convexToTrans,
+												allowedPenetration, compoundShape, colObjWorldTransform, resultCallback);
+
+				const btDbvt* tree = compoundShape->getDynamicAabbTree();
+				if (tree)
+				{
+					const ATTRIBUTE_ALIGNED16(btDbvtVolume) bounds = btDbvtVolume::FromMM(fromLocalAabbMin, fromLocalAabbMax);
+					tree->collideTV(tree->m_root, bounds, callback);
+				}
+				else
+				{
+					int i;
+					for (i = 0; i < compoundShape->getNumChildShapes(); i++)
+					{
+						const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
+						btTransform childTrans = compoundShape->getChildTransform(i);
+						callback.ProcessChild(i, childTrans, childCollisionShape);
+					}
+				}
+			}
+		}
+	}
+}
+
+struct btSingleRayCallback : public btBroadphaseRayCallback
+{
+	btVector3 m_rayFromWorld;
+	btVector3 m_rayToWorld;
+	btTransform m_rayFromTrans;
+	btTransform m_rayToTrans;
+	btVector3 m_hitNormal;
+
+	const btCollisionWorld* m_world;
+	btCollisionWorld::RayResultCallback& m_resultCallback;
+
+	btSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btCollisionWorld* world, btCollisionWorld::RayResultCallback& resultCallback)
+		: m_rayFromWorld(rayFromWorld),
+		  m_rayToWorld(rayToWorld),
+		  m_world(world),
+		  m_resultCallback(resultCallback)
+	{
+		m_rayFromTrans.setIdentity();
+		m_rayFromTrans.setOrigin(m_rayFromWorld);
+		m_rayToTrans.setIdentity();
+		m_rayToTrans.setOrigin(m_rayToWorld);
+
+		btVector3 rayDir = (rayToWorld - rayFromWorld);
+
+		rayDir.normalize();
+		///what about division by zero? --> just set rayDirection[i] to INF/BT_LARGE_FLOAT
+		m_rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[0];
+		m_rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[1];
+		m_rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[2];
+		m_signs[0] = m_rayDirectionInverse[0] < 0.0;
+		m_signs[1] = m_rayDirectionInverse[1] < 0.0;
+		m_signs[2] = m_rayDirectionInverse[2] < 0.0;
+
+		m_lambda_max = rayDir.dot(m_rayToWorld - m_rayFromWorld);
+	}
+
+	virtual bool process(const btBroadphaseProxy* proxy)
+	{
+		///terminate further ray tests, once the closestHitFraction reached zero
+		if (m_resultCallback.m_closestHitFraction == btScalar(0.f))
+			return false;
+
+		btCollisionObject* collisionObject = (btCollisionObject*)proxy->m_clientObject;
+
+		//only perform raycast if filterMask matches
+		if (m_resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+			//btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+#if 0
+#ifdef RECALCULATE_AABB
+			btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
+#else
+			//getBroadphase()->getAabb(collisionObject->getBroadphaseHandle(),collisionObjectAabbMin,collisionObjectAabbMax);
+			const btVector3& collisionObjectAabbMin = collisionObject->getBroadphaseHandle()->m_aabbMin;
+			const btVector3& collisionObjectAabbMax = collisionObject->getBroadphaseHandle()->m_aabbMax;
+#endif
+#endif
+			//btScalar hitLambda = m_resultCallback.m_closestHitFraction;
+			//culling already done by broadphase
+			//if (btRayAabb(m_rayFromWorld,m_rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,m_hitNormal))
+			{
+				m_world->rayTestSingle(m_rayFromTrans, m_rayToTrans,
+									   collisionObject,
+									   collisionObject->getCollisionShape(),
+									   collisionObject->getWorldTransform(),
+									   m_resultCallback);
+			}
+		}
+		return true;
+	}
+};
+
+void btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
+{
+	//BT_PROFILE("rayTest");
+	/// use the broadphase to accelerate the search for objects, based on their aabb
+	/// and for each object with ray-aabb overlap, perform an exact ray test
+	btSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback);
+
+#ifndef USE_BRUTEFORCE_RAYBROADPHASE
+	m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB);
+#else
+	for (int i = 0; i < this->getNumCollisionObjects(); i++)
+	{
+		rayCB.process(m_collisionObjects[i]->getBroadphaseHandle());
+	}
+#endif  //USE_BRUTEFORCE_RAYBROADPHASE
+}
+
+struct btSingleSweepCallback : public btBroadphaseRayCallback
+{
+	btTransform m_convexFromTrans;
+	btTransform m_convexToTrans;
+	btVector3 m_hitNormal;
+	const btCollisionWorld* m_world;
+	btCollisionWorld::ConvexResultCallback& m_resultCallback;
+	btScalar m_allowedCcdPenetration;
+	const btConvexShape* m_castShape;
+
+	btSingleSweepCallback(const btConvexShape* castShape, const btTransform& convexFromTrans, const btTransform& convexToTrans, const btCollisionWorld* world, btCollisionWorld::ConvexResultCallback& resultCallback, btScalar allowedPenetration)
+		: m_convexFromTrans(convexFromTrans),
+		  m_convexToTrans(convexToTrans),
+		  m_world(world),
+		  m_resultCallback(resultCallback),
+		  m_allowedCcdPenetration(allowedPenetration),
+		  m_castShape(castShape)
+	{
+		btVector3 unnormalizedRayDir = (m_convexToTrans.getOrigin() - m_convexFromTrans.getOrigin());
+		btVector3 rayDir = unnormalizedRayDir.fuzzyZero() ? btVector3(btScalar(0.0), btScalar(0.0), btScalar(0.0)) : unnormalizedRayDir.normalized();
+		///what about division by zero? --> just set rayDirection[i] to INF/BT_LARGE_FLOAT
+		m_rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[0];
+		m_rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[1];
+		m_rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(BT_LARGE_FLOAT) : btScalar(1.0) / rayDir[2];
+		m_signs[0] = m_rayDirectionInverse[0] < 0.0;
+		m_signs[1] = m_rayDirectionInverse[1] < 0.0;
+		m_signs[2] = m_rayDirectionInverse[2] < 0.0;
+
+		m_lambda_max = rayDir.dot(unnormalizedRayDir);
+	}
+
+	virtual bool process(const btBroadphaseProxy* proxy)
+	{
+		///terminate further convex sweep tests, once the closestHitFraction reached zero
+		if (m_resultCallback.m_closestHitFraction == btScalar(0.f))
+			return false;
+
+		btCollisionObject* collisionObject = (btCollisionObject*)proxy->m_clientObject;
+
+		//only perform raycast if filterMask matches
+		if (m_resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+			m_world->objectQuerySingle(m_castShape, m_convexFromTrans, m_convexToTrans,
+									   collisionObject,
+									   collisionObject->getCollisionShape(),
+									   collisionObject->getWorldTransform(),
+									   m_resultCallback,
+									   m_allowedCcdPenetration);
+		}
+
+		return true;
+	}
+};
+
+void btCollisionWorld::convexSweepTest(const btConvexShape* castShape, const btTransform& convexFromWorld, const btTransform& convexToWorld, ConvexResultCallback& resultCallback, btScalar allowedCcdPenetration) const
+{
+	BT_PROFILE("convexSweepTest");
+	/// use the broadphase to accelerate the search for objects, based on their aabb
+	/// and for each object with ray-aabb overlap, perform an exact ray test
+	/// unfortunately the implementation for rayTest and convexSweepTest duplicated, albeit practically identical
+
+	btTransform convexFromTrans, convexToTrans;
+	convexFromTrans = convexFromWorld;
+	convexToTrans = convexToWorld;
+	btVector3 castShapeAabbMin, castShapeAabbMax;
+	/* Compute AABB that encompasses angular movement */
+	{
+		btVector3 linVel, angVel;
+		btTransformUtil::calculateVelocity(convexFromTrans, convexToTrans, 1.0f, linVel, angVel);
+		btVector3 zeroLinVel;
+		zeroLinVel.setValue(0, 0, 0);
+		btTransform R;
+		R.setIdentity();
+		R.setRotation(convexFromTrans.getRotation());
+		castShape->calculateTemporalAabb(R, zeroLinVel, angVel, 1.0f, castShapeAabbMin, castShapeAabbMax);
+	}
+
+#ifndef USE_BRUTEFORCE_RAYBROADPHASE
+
+	btSingleSweepCallback convexCB(castShape, convexFromWorld, convexToWorld, this, resultCallback, allowedCcdPenetration);
+
+	m_broadphasePairCache->rayTest(convexFromTrans.getOrigin(), convexToTrans.getOrigin(), convexCB, castShapeAabbMin, castShapeAabbMax);
+
+#else
+	/// go over all objects, and if the ray intersects their aabb + cast shape aabb,
+	// do a ray-shape query using convexCaster (CCD)
+	int i;
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* collisionObject = m_collisionObjects[i];
+		//only perform raycast if filterMask matches
+		if (resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+			btVector3 collisionObjectAabbMin, collisionObjectAabbMax;
+			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(), collisionObjectAabbMin, collisionObjectAabbMax);
+			AabbExpand(collisionObjectAabbMin, collisionObjectAabbMax, castShapeAabbMin, castShapeAabbMax);
+			btScalar hitLambda = btScalar(1.);  //could use resultCallback.m_closestHitFraction, but needs testing
+			btVector3 hitNormal;
+			if (btRayAabb(convexFromWorld.getOrigin(), convexToWorld.getOrigin(), collisionObjectAabbMin, collisionObjectAabbMax, hitLambda, hitNormal))
+			{
+				objectQuerySingle(castShape, convexFromTrans, convexToTrans,
+								  collisionObject,
+								  collisionObject->getCollisionShape(),
+								  collisionObject->getWorldTransform(),
+								  resultCallback,
+								  allowedCcdPenetration);
+			}
+		}
+	}
+#endif  //USE_BRUTEFORCE_RAYBROADPHASE
+}
+
+struct btBridgedManifoldResult : public btManifoldResult
+{
+	btCollisionWorld::ContactResultCallback& m_resultCallback;
+
+	btBridgedManifoldResult(const btCollisionObjectWrapper* obj0Wrap, const btCollisionObjectWrapper* obj1Wrap, btCollisionWorld::ContactResultCallback& resultCallback)
+		: btManifoldResult(obj0Wrap, obj1Wrap),
+		  m_resultCallback(resultCallback)
+	{
+	}
+
+	virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth)
+	{
+		bool isSwapped = m_manifoldPtr->getBody0() != m_body0Wrap->getCollisionObject();
+		btVector3 pointA = pointInWorld + normalOnBInWorld * depth;
+		btVector3 localA;
+		btVector3 localB;
+		if (isSwapped)
+		{
+			localA = m_body1Wrap->getCollisionObject()->getWorldTransform().invXform(pointA);
+			localB = m_body0Wrap->getCollisionObject()->getWorldTransform().invXform(pointInWorld);
+		}
+		else
+		{
+			localA = m_body0Wrap->getCollisionObject()->getWorldTransform().invXform(pointA);
+			localB = m_body1Wrap->getCollisionObject()->getWorldTransform().invXform(pointInWorld);
+		}
+
+		btManifoldPoint newPt(localA, localB, normalOnBInWorld, depth);
+		newPt.m_positionWorldOnA = pointA;
+		newPt.m_positionWorldOnB = pointInWorld;
+
+		//BP mod, store contact triangles.
+		if (isSwapped)
+		{
+			newPt.m_partId0 = m_partId1;
+			newPt.m_partId1 = m_partId0;
+			newPt.m_index0 = m_index1;
+			newPt.m_index1 = m_index0;
+		}
+		else
+		{
+			newPt.m_partId0 = m_partId0;
+			newPt.m_partId1 = m_partId1;
+			newPt.m_index0 = m_index0;
+			newPt.m_index1 = m_index1;
+		}
+
+		//experimental feature info, for per-triangle material etc.
+		const btCollisionObjectWrapper* obj0Wrap = isSwapped ? m_body1Wrap : m_body0Wrap;
+		const btCollisionObjectWrapper* obj1Wrap = isSwapped ? m_body0Wrap : m_body1Wrap;
+		m_resultCallback.addSingleResult(newPt, obj0Wrap, newPt.m_partId0, newPt.m_index0, obj1Wrap, newPt.m_partId1, newPt.m_index1);
+	}
+};
+
+struct btSingleContactCallback : public btBroadphaseAabbCallback
+{
+	btCollisionObject* m_collisionObject;
+	btCollisionWorld* m_world;
+	btCollisionWorld::ContactResultCallback& m_resultCallback;
+
+	btSingleContactCallback(btCollisionObject* collisionObject, btCollisionWorld* world, btCollisionWorld::ContactResultCallback& resultCallback)
+		: m_collisionObject(collisionObject),
+		  m_world(world),
+		  m_resultCallback(resultCallback)
+	{
+	}
+
+	virtual bool process(const btBroadphaseProxy* proxy)
+	{
+		btCollisionObject* collisionObject = (btCollisionObject*)proxy->m_clientObject;
+		if (collisionObject == m_collisionObject)
+			return true;
+
+		//only perform raycast if filterMask matches
+		if (m_resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			btCollisionObjectWrapper ob0(0, m_collisionObject->getCollisionShape(), m_collisionObject, m_collisionObject->getWorldTransform(), -1, -1);
+			btCollisionObjectWrapper ob1(0, collisionObject->getCollisionShape(), collisionObject, collisionObject->getWorldTransform(), -1, -1);
+
+			btCollisionAlgorithm* algorithm = m_world->getDispatcher()->findAlgorithm(&ob0, &ob1, 0, BT_CLOSEST_POINT_ALGORITHMS);
+			if (algorithm)
+			{
+				btBridgedManifoldResult contactPointResult(&ob0, &ob1, m_resultCallback);
+				//discrete collision detection query
+
+				algorithm->processCollision(&ob0, &ob1, m_world->getDispatchInfo(), &contactPointResult);
+
+				algorithm->~btCollisionAlgorithm();
+				m_world->getDispatcher()->freeCollisionAlgorithm(algorithm);
+			}
+		}
+		return true;
+	}
+};
+
+///contactTest performs a discrete collision test against all objects in the btCollisionWorld, and calls the resultCallback.
+///it reports one or more contact points for every overlapping object (including the one with deepest penetration)
+void btCollisionWorld::contactTest(btCollisionObject* colObj, ContactResultCallback& resultCallback)
+{
+	btVector3 aabbMin, aabbMax;
+	colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), aabbMin, aabbMax);
+	btSingleContactCallback contactCB(colObj, this, resultCallback);
+
+	m_broadphasePairCache->aabbTest(aabbMin, aabbMax, contactCB);
+}
+
+///contactTest performs a discrete collision test between two collision objects and calls the resultCallback if overlap if detected.
+///it reports one or more contact points (including the one with deepest penetration)
+void btCollisionWorld::contactPairTest(btCollisionObject* colObjA, btCollisionObject* colObjB, ContactResultCallback& resultCallback)
+{
+	btCollisionObjectWrapper obA(0, colObjA->getCollisionShape(), colObjA, colObjA->getWorldTransform(), -1, -1);
+	btCollisionObjectWrapper obB(0, colObjB->getCollisionShape(), colObjB, colObjB->getWorldTransform(), -1, -1);
+
+	btCollisionAlgorithm* algorithm = getDispatcher()->findAlgorithm(&obA, &obB, 0, BT_CLOSEST_POINT_ALGORITHMS);
+	if (algorithm)
+	{
+		btBridgedManifoldResult contactPointResult(&obA, &obB, resultCallback);
+		contactPointResult.m_closestPointDistanceThreshold = resultCallback.m_closestDistanceThreshold;
+		//discrete collision detection query
+		algorithm->processCollision(&obA, &obB, getDispatchInfo(), &contactPointResult);
+
+		algorithm->~btCollisionAlgorithm();
+		getDispatcher()->freeCollisionAlgorithm(algorithm);
+	}
+}
+
+class DebugDrawcallback : public btTriangleCallback, public btInternalTriangleIndexCallback
+{
+	btIDebugDraw* m_debugDrawer;
+	btVector3 m_color;
+	btTransform m_worldTrans;
+
+public:
+	DebugDrawcallback(btIDebugDraw* debugDrawer, const btTransform& worldTrans, const btVector3& color) : m_debugDrawer(debugDrawer),
+																										  m_color(color),
+																										  m_worldTrans(worldTrans)
+	{
+	}
+
+	virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+	{
+		processTriangle(triangle, partId, triangleIndex);
+	}
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+	{
+		(void)partId;
+		(void)triangleIndex;
+
+		btVector3 wv0, wv1, wv2;
+		wv0 = m_worldTrans * triangle[0];
+		wv1 = m_worldTrans * triangle[1];
+		wv2 = m_worldTrans * triangle[2];
+		btVector3 center = (wv0 + wv1 + wv2) * btScalar(1. / 3.);
+
+		if (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawNormals)
+		{
+			btVector3 normal = (wv1 - wv0).cross(wv2 - wv0);
+			normal.normalize();
+			btVector3 normalColor(1, 1, 0);
+			m_debugDrawer->drawLine(center, center + normal, normalColor);
+		}
+		m_debugDrawer->drawTriangle(wv0, wv1, wv2, m_color, 1.0);
+	}
+};
+
+void btCollisionWorld::debugDrawObject(const btTransform& worldTransform, const btCollisionShape* shape, const btVector3& color)
+{
+	// Draw a small simplex at the center of the object
+	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawFrames)
+	{
+		getDebugDrawer()->drawTransform(worldTransform, .1);
+	}
+
+	if (shape->getShapeType() == COMPOUND_SHAPE_PROXYTYPE)
+	{
+		const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(shape);
+		for (int i = compoundShape->getNumChildShapes() - 1; i >= 0; i--)
+		{
+			btTransform childTrans = compoundShape->getChildTransform(i);
+			const btCollisionShape* colShape = compoundShape->getChildShape(i);
+			debugDrawObject(worldTransform * childTrans, colShape, color);
+		}
+	}
+	else
+	{
+		switch (shape->getShapeType())
+		{
+			case BOX_SHAPE_PROXYTYPE:
+			{
+				const btBoxShape* boxShape = static_cast<const btBoxShape*>(shape);
+				btVector3 halfExtents = boxShape->getHalfExtentsWithMargin();
+				getDebugDrawer()->drawBox(-halfExtents, halfExtents, worldTransform, color);
+				break;
+			}
+
+			case SPHERE_SHAPE_PROXYTYPE:
+			{
+				const btSphereShape* sphereShape = static_cast<const btSphereShape*>(shape);
+				btScalar radius = sphereShape->getMargin();  //radius doesn't include the margin, so draw with margin
+
+				getDebugDrawer()->drawSphere(radius, worldTransform, color);
+				break;
+			}
+			case MULTI_SPHERE_SHAPE_PROXYTYPE:
+			{
+				const btMultiSphereShape* multiSphereShape = static_cast<const btMultiSphereShape*>(shape);
+
+				btTransform childTransform;
+				childTransform.setIdentity();
+
+				for (int i = multiSphereShape->getSphereCount() - 1; i >= 0; i--)
+				{
+					childTransform.setOrigin(multiSphereShape->getSpherePosition(i));
+					getDebugDrawer()->drawSphere(multiSphereShape->getSphereRadius(i), worldTransform * childTransform, color);
+				}
+
+				break;
+			}
+			case CAPSULE_SHAPE_PROXYTYPE:
+			{
+				const btCapsuleShape* capsuleShape = static_cast<const btCapsuleShape*>(shape);
+
+				btScalar radius = capsuleShape->getRadius();
+				btScalar halfHeight = capsuleShape->getHalfHeight();
+
+				int upAxis = capsuleShape->getUpAxis();
+				getDebugDrawer()->drawCapsule(radius, halfHeight, upAxis, worldTransform, color);
+				break;
+			}
+			case CONE_SHAPE_PROXYTYPE:
+			{
+				const btConeShape* coneShape = static_cast<const btConeShape*>(shape);
+				btScalar radius = coneShape->getRadius();  //+coneShape->getMargin();
+				btScalar height = coneShape->getHeight();  //+coneShape->getMargin();
+
+				int upAxis = coneShape->getConeUpIndex();
+				getDebugDrawer()->drawCone(radius, height, upAxis, worldTransform, color);
+				break;
+			}
+			case CYLINDER_SHAPE_PROXYTYPE:
+			{
+				const btCylinderShape* cylinder = static_cast<const btCylinderShape*>(shape);
+				int upAxis = cylinder->getUpAxis();
+				btScalar radius = cylinder->getRadius();
+				btScalar halfHeight = cylinder->getHalfExtentsWithMargin()[upAxis];
+				getDebugDrawer()->drawCylinder(radius, halfHeight, upAxis, worldTransform, color);
+				break;
+			}
+
+			case STATIC_PLANE_PROXYTYPE:
+			{
+				const btStaticPlaneShape* staticPlaneShape = static_cast<const btStaticPlaneShape*>(shape);
+				btScalar planeConst = staticPlaneShape->getPlaneConstant();
+				const btVector3& planeNormal = staticPlaneShape->getPlaneNormal();
+				getDebugDrawer()->drawPlane(planeNormal, planeConst, worldTransform, color);
+				break;
+			}
+			default:
+			{
+				/// for polyhedral shapes
+				if (shape->isPolyhedral())
+				{
+					btPolyhedralConvexShape* polyshape = (btPolyhedralConvexShape*)shape;
+
+					int i;
+					if (polyshape->getConvexPolyhedron())
+					{
+						const btConvexPolyhedron* poly = polyshape->getConvexPolyhedron();
+						for (i = 0; i < poly->m_faces.size(); i++)
+						{
+							btVector3 centroid(0, 0, 0);
+							int numVerts = poly->m_faces[i].m_indices.size();
+							if (numVerts)
+							{
+								int lastV = poly->m_faces[i].m_indices[numVerts - 1];
+								for (int v = 0; v < poly->m_faces[i].m_indices.size(); v++)
+								{
+									int curVert = poly->m_faces[i].m_indices[v];
+									centroid += poly->m_vertices[curVert];
+									getDebugDrawer()->drawLine(worldTransform * poly->m_vertices[lastV], worldTransform * poly->m_vertices[curVert], color);
+									lastV = curVert;
+								}
+							}
+							centroid *= btScalar(1.f) / btScalar(numVerts);
+							if (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawNormals)
+							{
+								btVector3 normalColor(1, 1, 0);
+								btVector3 faceNormal(poly->m_faces[i].m_plane[0], poly->m_faces[i].m_plane[1], poly->m_faces[i].m_plane[2]);
+								getDebugDrawer()->drawLine(worldTransform * centroid, worldTransform * (centroid + faceNormal), normalColor);
+							}
+						}
+					}
+					else
+					{
+						for (i = 0; i < polyshape->getNumEdges(); i++)
+						{
+							btVector3 a, b;
+							polyshape->getEdge(i, a, b);
+							btVector3 wa = worldTransform * a;
+							btVector3 wb = worldTransform * b;
+							getDebugDrawer()->drawLine(wa, wb, color);
+						}
+					}
+				}
+
+				if (shape->isConcave())
+				{
+					btConcaveShape* concaveMesh = (btConcaveShape*)shape;
+
+					///@todo pass camera, for some culling? no -> we are not a graphics lib
+					btVector3 aabbMax(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+					btVector3 aabbMin(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+
+					DebugDrawcallback drawCallback(getDebugDrawer(), worldTransform, color);
+					concaveMesh->processAllTriangles(&drawCallback, aabbMin, aabbMax);
+				}
+
+				if (shape->getShapeType() == CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE)
+				{
+					btConvexTriangleMeshShape* convexMesh = (btConvexTriangleMeshShape*)shape;
+					//todo: pass camera for some culling
+					btVector3 aabbMax(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+					btVector3 aabbMin(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+					//DebugDrawcallback drawCallback;
+					DebugDrawcallback drawCallback(getDebugDrawer(), worldTransform, color);
+					convexMesh->getMeshInterface()->InternalProcessAllTriangles(&drawCallback, aabbMin, aabbMax);
+				}
+			}
+		}
+	}
+}
+
+void btCollisionWorld::debugDrawWorld()
+{
+	if (getDebugDrawer())
+	{
+		getDebugDrawer()->clearLines();
+
+		btIDebugDraw::DefaultColors defaultColors = getDebugDrawer()->getDefaultColors();
+
+		if (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints)
+		{
+			if (getDispatcher())
+			{
+				int numManifolds = getDispatcher()->getNumManifolds();
+
+				for (int i = 0; i < numManifolds; i++)
+				{
+					btPersistentManifold* contactManifold = getDispatcher()->getManifoldByIndexInternal(i);
+					//btCollisionObject* obA = static_cast<btCollisionObject*>(contactManifold->getBody0());
+					//btCollisionObject* obB = static_cast<btCollisionObject*>(contactManifold->getBody1());
+
+					int numContacts = contactManifold->getNumContacts();
+					for (int j = 0; j < numContacts; j++)
+					{
+						btManifoldPoint& cp = contactManifold->getContactPoint(j);
+						getDebugDrawer()->drawContactPoint(cp.m_positionWorldOnB, cp.m_normalWorldOnB, cp.getDistance(), cp.getLifeTime(), defaultColors.m_contactPoint);
+					}
+				}
+			}
+		}
+
+		if ((getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb)))
+		{
+			int i;
+
+			for (i = 0; i < m_collisionObjects.size(); i++)
+			{
+				btCollisionObject* colObj = m_collisionObjects[i];
+				if ((colObj->getCollisionFlags() & btCollisionObject::CF_DISABLE_VISUALIZE_OBJECT) == 0)
+				{
+					if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawWireframe))
+					{
+						btVector3 color(btScalar(0.4), btScalar(0.4), btScalar(0.4));
+
+						switch (colObj->getActivationState())
+						{
+							case ACTIVE_TAG:
+								color = defaultColors.m_activeObject;
+								break;
+							case ISLAND_SLEEPING:
+								color = defaultColors.m_deactivatedObject;
+								break;
+							case WANTS_DEACTIVATION:
+								color = defaultColors.m_wantsDeactivationObject;
+								break;
+							case DISABLE_DEACTIVATION:
+								color = defaultColors.m_disabledDeactivationObject;
+								break;
+							case DISABLE_SIMULATION:
+								color = defaultColors.m_disabledSimulationObject;
+								break;
+							default:
+							{
+								color = btVector3(btScalar(.3), btScalar(0.3), btScalar(0.3));
+							}
+						};
+
+						colObj->getCustomDebugColor(color);
+
+						debugDrawObject(colObj->getWorldTransform(), colObj->getCollisionShape(), color);
+					}
+					if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+					{
+						btVector3 minAabb, maxAabb;
+						btVector3 colorvec = defaultColors.m_aabb;
+						colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb, maxAabb);
+						btVector3 contactThreshold(gContactBreakingThreshold, gContactBreakingThreshold, gContactBreakingThreshold);
+						minAabb -= contactThreshold;
+						maxAabb += contactThreshold;
+
+						btVector3 minAabb2, maxAabb2;
+
+						if (getDispatchInfo().m_useContinuous && colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY && !colObj->isStaticOrKinematicObject())
+						{
+							colObj->getCollisionShape()->getAabb(colObj->getInterpolationWorldTransform(), minAabb2, maxAabb2);
+							minAabb2 -= contactThreshold;
+							maxAabb2 += contactThreshold;
+							minAabb.setMin(minAabb2);
+							maxAabb.setMax(maxAabb2);
+						}
+
+						m_debugDrawer->drawAabb(minAabb, maxAabb, colorvec);
+					}
+				}
+			}
+		}
+	}
+}
+
+void btCollisionWorld::serializeCollisionObjects(btSerializer* serializer)
+{
+	int i;
+
+	///keep track of shapes already serialized
+	btHashMap<btHashPtr, btCollisionShape*> serializedShapes;
+
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btCollisionShape* shape = colObj->getCollisionShape();
+
+		if (!serializedShapes.find(shape))
+		{
+			serializedShapes.insert(shape, shape);
+			shape->serializeSingleShape(serializer);
+		}
+	}
+
+	//serialize all collision objects
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		if (colObj->getInternalType() == btCollisionObject::CO_COLLISION_OBJECT)
+		{
+			colObj->serializeSingleObject(serializer);
+		}
+	}
+}
+
+void btCollisionWorld::serializeContactManifolds(btSerializer* serializer)
+{
+	if (serializer->getSerializationFlags() & BT_SERIALIZE_CONTACT_MANIFOLDS)
+	{
+		int numManifolds = getDispatcher()->getNumManifolds();
+		for (int i = 0; i < numManifolds; i++)
+		{
+			const btPersistentManifold* manifold = getDispatcher()->getInternalManifoldPointer()[i];
+			//don't serialize empty manifolds, they just take space
+			//(may have to do it anyway if it destroys determinism)
+			if (manifold->getNumContacts() == 0)
+				continue;
+
+			btChunk* chunk = serializer->allocate(manifold->calculateSerializeBufferSize(), 1);
+			const char* structType = manifold->serialize(manifold, chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_CONTACTMANIFOLD_CODE, (void*)manifold);
+		}
+	}
+}
+
+void btCollisionWorld::serialize(btSerializer* serializer)
+{
+	serializer->startSerialization();
+
+	serializeCollisionObjects(serializer);
+
+	serializeContactManifolds(serializer);
+
+	serializer->finishSerialization();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
new file mode 100644
index 0000000..fd0e5b9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
@@ -0,0 +1,513 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * @mainpage Bullet Documentation
+ *
+ * @section intro_sec Introduction
+ * Bullet is a Collision Detection and Rigid Body Dynamics Library. The Library is Open Source and free for commercial use, under the ZLib license ( http://opensource.org/licenses/zlib-license.php ).
+ *
+ * The main documentation is Bullet_User_Manual.pdf, included in the source code distribution.
+ * There is the Physics Forum for feedback and general Collision Detection and Physics discussions.
+ * Please visit http://www.bulletphysics.org
+ *
+ * @section install_sec Installation
+ *
+ * @subsection step1 Step 1: Download
+ * You can download the Bullet Physics Library from the github repository: https://github.com/bulletphysics/bullet3/releases 
+ *
+ * @subsection step2 Step 2: Building
+ * Bullet has multiple build systems, including premake, cmake and autotools. Premake and cmake support all platforms.
+ * Premake is included in the Bullet/build folder for Windows, Mac OSX and Linux. 
+ * Under Windows you can click on Bullet/build/vs2010.bat to create Microsoft Visual Studio projects. 
+ * On Mac OSX and Linux you can open a terminal and generate Makefile, codeblocks or Xcode4 projects:
+ * cd Bullet/build
+ * ./premake4_osx gmake or ./premake4_linux gmake or ./premake4_linux64 gmake or (for Mac) ./premake4_osx xcode4
+ * cd Bullet/build/gmake
+ * make
+ * 
+ * An alternative to premake is cmake. You can download cmake from http://www.cmake.org
+ * cmake can autogenerate projectfiles for Microsoft Visual Studio, Apple Xcode, KDevelop and Unix Makefiles.
+ * The easiest is to run the CMake cmake-gui graphical user interface and choose the options and generate projectfiles.
+ * You can also use cmake in the command-line. Here are some examples for various platforms:
+ * cmake . -G "Visual Studio 9 2008"
+ * cmake . -G Xcode
+ * cmake . -G "Unix Makefiles"
+ * Although cmake is recommended, you can also use autotools for UNIX: ./autogen.sh ./configure to create a Makefile and then run make.
+ * 
+ * @subsection step3 Step 3: Testing demos
+ * Try to run and experiment with BasicDemo executable as a starting point.
+ * Bullet can be used in several ways, as Full Rigid Body simulation, as Collision Detector Library or Low Level / Snippets like the GJK Closest Point calculation.
+ * The Dependencies can be seen in this documentation under Directories
+ * 
+ * @subsection step4 Step 4: Integrating in your application, full Rigid Body and Soft Body simulation
+ * Check out BasicDemo how to create a btDynamicsWorld, btRigidBody and btCollisionShape, Stepping the simulation and synchronizing your graphics object transform.
+ * Check out SoftDemo how to use soft body dynamics, using btSoftRigidDynamicsWorld.
+ * @subsection step5 Step 5 : Integrate the Collision Detection Library (without Dynamics and other Extras)
+ * Bullet Collision Detection can also be used without the Dynamics/Extras.
+ * Check out btCollisionWorld and btCollisionObject, and the CollisionInterfaceDemo.
+ * @subsection step6 Step 6 : Use Snippets like the GJK Closest Point calculation.
+ * Bullet has been designed in a modular way keeping dependencies to a minimum. The ConvexHullDistance demo demonstrates direct use of btGjkPairDetector.
+ *
+ * @section copyright Copyright
+ * For up-to-data information and copyright and contributors list check out the Bullet_User_Manual.pdf
+ * 
+ */
+
+#ifndef BT_COLLISION_WORLD_H
+#define BT_COLLISION_WORLD_H
+
+class btCollisionShape;
+class btConvexShape;
+class btBroadphaseInterface;
+class btSerializer;
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "btCollisionObject.h"
+#include "btCollisionDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+///CollisionWorld is interface and container for the collision detection
+class btCollisionWorld
+{
+protected:
+	btAlignedObjectArray<btCollisionObject*> m_collisionObjects;
+
+	btDispatcher* m_dispatcher1;
+
+	btDispatcherInfo m_dispatchInfo;
+
+	btBroadphaseInterface* m_broadphasePairCache;
+
+	btIDebugDraw* m_debugDrawer;
+
+	///m_forceUpdateAllAabbs can be set to false as an optimization to only update active object AABBs
+	///it is true by default, because it is error-prone (setting the position of static objects wouldn't update their AABB)
+	bool m_forceUpdateAllAabbs;
+
+	void serializeCollisionObjects(btSerializer* serializer);
+
+	void serializeContactManifolds(btSerializer* serializer);
+
+public:
+	//this constructor doesn't own the dispatcher and paircache/broadphase
+	btCollisionWorld(btDispatcher* dispatcher, btBroadphaseInterface* broadphasePairCache, btCollisionConfiguration* collisionConfiguration);
+
+	virtual ~btCollisionWorld();
+
+	void setBroadphase(btBroadphaseInterface* pairCache)
+	{
+		m_broadphasePairCache = pairCache;
+	}
+
+	const btBroadphaseInterface* getBroadphase() const
+	{
+		return m_broadphasePairCache;
+	}
+
+	btBroadphaseInterface* getBroadphase()
+	{
+		return m_broadphasePairCache;
+	}
+
+	btOverlappingPairCache* getPairCache()
+	{
+		return m_broadphasePairCache->getOverlappingPairCache();
+	}
+
+	btDispatcher* getDispatcher()
+	{
+		return m_dispatcher1;
+	}
+
+	const btDispatcher* getDispatcher() const
+	{
+		return m_dispatcher1;
+	}
+
+	void updateSingleAabb(btCollisionObject* colObj);
+
+	virtual void updateAabbs();
+
+	///the computeOverlappingPairs is usually already called by performDiscreteCollisionDetection (or stepSimulation)
+	///it can be useful to use if you perform ray tests without collision detection/simulation
+	virtual void computeOverlappingPairs();
+
+	virtual void setDebugDrawer(btIDebugDraw* debugDrawer)
+	{
+		m_debugDrawer = debugDrawer;
+	}
+
+	virtual btIDebugDraw* getDebugDrawer()
+	{
+		return m_debugDrawer;
+	}
+
+	virtual void debugDrawWorld();
+
+	virtual void debugDrawObject(const btTransform& worldTransform, const btCollisionShape* shape, const btVector3& color);
+
+	///LocalShapeInfo gives extra information for complex shapes
+	///Currently, only btTriangleMeshShape is available, so it just contains triangleIndex and subpart
+	struct LocalShapeInfo
+	{
+		int m_shapePart;
+		int m_triangleIndex;
+
+		//const btCollisionShape*	m_shapeTemp;
+		//const btTransform*	m_shapeLocalTransform;
+	};
+
+	struct LocalRayResult
+	{
+		LocalRayResult(const btCollisionObject* collisionObject,
+					   LocalShapeInfo* localShapeInfo,
+					   const btVector3& hitNormalLocal,
+					   btScalar hitFraction)
+			: m_collisionObject(collisionObject),
+			  m_localShapeInfo(localShapeInfo),
+			  m_hitNormalLocal(hitNormalLocal),
+			  m_hitFraction(hitFraction)
+		{
+		}
+
+		const btCollisionObject* m_collisionObject;
+		LocalShapeInfo* m_localShapeInfo;
+		btVector3 m_hitNormalLocal;
+		btScalar m_hitFraction;
+	};
+
+	///RayResultCallback is used to report new raycast results
+	struct RayResultCallback
+	{
+		btScalar m_closestHitFraction;
+		const btCollisionObject* m_collisionObject;
+		int m_collisionFilterGroup;
+		int m_collisionFilterMask;
+		//@BP Mod - Custom flags, currently used to enable backface culling on tri-meshes, see btRaycastCallback.h. Apply any of the EFlags defined there on m_flags here to invoke.
+		unsigned int m_flags;
+
+		virtual ~RayResultCallback()
+		{
+		}
+		bool hasHit() const
+		{
+			return (m_collisionObject != 0);
+		}
+
+		RayResultCallback()
+			: m_closestHitFraction(btScalar(1.)),
+			  m_collisionObject(0),
+			  m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
+			  m_collisionFilterMask(btBroadphaseProxy::AllFilter),
+			  //@BP Mod
+			  m_flags(0)
+		{
+		}
+
+		virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+		{
+			bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
+			collides = collides && (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+			return collides;
+		}
+
+		virtual btScalar addSingleResult(LocalRayResult& rayResult, bool normalInWorldSpace) = 0;
+	};
+
+	struct ClosestRayResultCallback : public RayResultCallback
+	{
+		ClosestRayResultCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld)
+			: m_rayFromWorld(rayFromWorld),
+			  m_rayToWorld(rayToWorld)
+		{
+		}
+
+		btVector3 m_rayFromWorld;  //used to calculate hitPointWorld from hitFraction
+		btVector3 m_rayToWorld;
+
+		btVector3 m_hitNormalWorld;
+		btVector3 m_hitPointWorld;
+
+		virtual btScalar addSingleResult(LocalRayResult& rayResult, bool normalInWorldSpace)
+		{
+			//caller already does the filter on the m_closestHitFraction
+			btAssert(rayResult.m_hitFraction <= m_closestHitFraction);
+
+			m_closestHitFraction = rayResult.m_hitFraction;
+			m_collisionObject = rayResult.m_collisionObject;
+			if (normalInWorldSpace)
+			{
+				m_hitNormalWorld = rayResult.m_hitNormalLocal;
+			}
+			else
+			{
+				///need to transform normal into worldspace
+				m_hitNormalWorld = m_collisionObject->getWorldTransform().getBasis() * rayResult.m_hitNormalLocal;
+			}
+			m_hitPointWorld.setInterpolate3(m_rayFromWorld, m_rayToWorld, rayResult.m_hitFraction);
+			return rayResult.m_hitFraction;
+		}
+	};
+
+	struct AllHitsRayResultCallback : public RayResultCallback
+	{
+		AllHitsRayResultCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld)
+			: m_rayFromWorld(rayFromWorld),
+			  m_rayToWorld(rayToWorld)
+		{
+		}
+
+		btAlignedObjectArray<const btCollisionObject*> m_collisionObjects;
+
+		btVector3 m_rayFromWorld;  //used to calculate hitPointWorld from hitFraction
+		btVector3 m_rayToWorld;
+
+		btAlignedObjectArray<btVector3> m_hitNormalWorld;
+		btAlignedObjectArray<btVector3> m_hitPointWorld;
+		btAlignedObjectArray<btScalar> m_hitFractions;
+
+		virtual btScalar addSingleResult(LocalRayResult& rayResult, bool normalInWorldSpace)
+		{
+			m_collisionObject = rayResult.m_collisionObject;
+			m_collisionObjects.push_back(rayResult.m_collisionObject);
+			btVector3 hitNormalWorld;
+			if (normalInWorldSpace)
+			{
+				hitNormalWorld = rayResult.m_hitNormalLocal;
+			}
+			else
+			{
+				///need to transform normal into worldspace
+				hitNormalWorld = m_collisionObject->getWorldTransform().getBasis() * rayResult.m_hitNormalLocal;
+			}
+			m_hitNormalWorld.push_back(hitNormalWorld);
+			btVector3 hitPointWorld;
+			hitPointWorld.setInterpolate3(m_rayFromWorld, m_rayToWorld, rayResult.m_hitFraction);
+			m_hitPointWorld.push_back(hitPointWorld);
+			m_hitFractions.push_back(rayResult.m_hitFraction);
+			return m_closestHitFraction;
+		}
+	};
+
+	struct LocalConvexResult
+	{
+		LocalConvexResult(const btCollisionObject* hitCollisionObject,
+						  LocalShapeInfo* localShapeInfo,
+						  const btVector3& hitNormalLocal,
+						  const btVector3& hitPointLocal,
+						  btScalar hitFraction)
+			: m_hitCollisionObject(hitCollisionObject),
+			  m_localShapeInfo(localShapeInfo),
+			  m_hitNormalLocal(hitNormalLocal),
+			  m_hitPointLocal(hitPointLocal),
+			  m_hitFraction(hitFraction)
+		{
+		}
+
+		const btCollisionObject* m_hitCollisionObject;
+		LocalShapeInfo* m_localShapeInfo;
+		btVector3 m_hitNormalLocal;
+		btVector3 m_hitPointLocal;
+		btScalar m_hitFraction;
+	};
+
+	///RayResultCallback is used to report new raycast results
+	struct ConvexResultCallback
+	{
+		btScalar m_closestHitFraction;
+		int m_collisionFilterGroup;
+		int m_collisionFilterMask;
+
+		ConvexResultCallback()
+			: m_closestHitFraction(btScalar(1.)),
+			  m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
+			  m_collisionFilterMask(btBroadphaseProxy::AllFilter)
+		{
+		}
+
+		virtual ~ConvexResultCallback()
+		{
+		}
+
+		bool hasHit() const
+		{
+			return (m_closestHitFraction < btScalar(1.));
+		}
+
+		virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+		{
+			bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
+			collides = collides && (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+			return collides;
+		}
+
+		virtual btScalar addSingleResult(LocalConvexResult& convexResult, bool normalInWorldSpace) = 0;
+	};
+
+	struct ClosestConvexResultCallback : public ConvexResultCallback
+	{
+		ClosestConvexResultCallback(const btVector3& convexFromWorld, const btVector3& convexToWorld)
+			: m_convexFromWorld(convexFromWorld),
+			  m_convexToWorld(convexToWorld),
+			  m_hitCollisionObject(0)
+		{
+		}
+
+		btVector3 m_convexFromWorld;  //used to calculate hitPointWorld from hitFraction
+		btVector3 m_convexToWorld;
+
+		btVector3 m_hitNormalWorld;
+		btVector3 m_hitPointWorld;
+		const btCollisionObject* m_hitCollisionObject;
+
+		virtual btScalar addSingleResult(LocalConvexResult& convexResult, bool normalInWorldSpace)
+		{
+			//caller already does the filter on the m_closestHitFraction
+			btAssert(convexResult.m_hitFraction <= m_closestHitFraction);
+
+			m_closestHitFraction = convexResult.m_hitFraction;
+			m_hitCollisionObject = convexResult.m_hitCollisionObject;
+			if (normalInWorldSpace)
+			{
+				m_hitNormalWorld = convexResult.m_hitNormalLocal;
+			}
+			else
+			{
+				///need to transform normal into worldspace
+				m_hitNormalWorld = m_hitCollisionObject->getWorldTransform().getBasis() * convexResult.m_hitNormalLocal;
+			}
+			m_hitPointWorld = convexResult.m_hitPointLocal;
+			return convexResult.m_hitFraction;
+		}
+	};
+
+	///ContactResultCallback is used to report contact points
+	struct ContactResultCallback
+	{
+		int m_collisionFilterGroup;
+		int m_collisionFilterMask;
+		btScalar m_closestDistanceThreshold;
+
+		ContactResultCallback()
+			: m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
+			  m_collisionFilterMask(btBroadphaseProxy::AllFilter),
+			  m_closestDistanceThreshold(0)
+		{
+		}
+
+		virtual ~ContactResultCallback()
+		{
+		}
+
+		virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+		{
+			bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
+			collides = collides && (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+			return collides;
+		}
+
+		virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper* colObj1Wrap, int partId1, int index1) = 0;
+	};
+
+	int getNumCollisionObjects() const
+	{
+		return int(m_collisionObjects.size());
+	}
+
+	/// rayTest performs a raycast on all objects in the btCollisionWorld, and calls the resultCallback
+	/// This allows for several queries: first hit, all hits, any hit, dependent on the value returned by the callback.
+	virtual void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const;
+
+	/// convexTest performs a swept convex cast on all objects in the btCollisionWorld, and calls the resultCallback
+	/// This allows for several queries: first hit, all hits, any hit, dependent on the value return by the callback.
+	void convexSweepTest(const btConvexShape* castShape, const btTransform& from, const btTransform& to, ConvexResultCallback& resultCallback, btScalar allowedCcdPenetration = btScalar(0.)) const;
+
+	///contactTest performs a discrete collision test between colObj against all objects in the btCollisionWorld, and calls the resultCallback.
+	///it reports one or more contact points for every overlapping object (including the one with deepest penetration)
+	void contactTest(btCollisionObject* colObj, ContactResultCallback& resultCallback);
+
+	///contactTest performs a discrete collision test between two collision objects and calls the resultCallback if overlap if detected.
+	///it reports one or more contact points (including the one with deepest penetration)
+	void contactPairTest(btCollisionObject* colObjA, btCollisionObject* colObjB, ContactResultCallback& resultCallback);
+
+	/// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest.
+	/// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape.
+	/// This allows more customization.
+	static void rayTestSingle(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+							  btCollisionObject* collisionObject,
+							  const btCollisionShape* collisionShape,
+							  const btTransform& colObjWorldTransform,
+							  RayResultCallback& resultCallback);
+
+	static void rayTestSingleInternal(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+									  const btCollisionObjectWrapper* collisionObjectWrap,
+									  RayResultCallback& resultCallback);
+
+	/// objectQuerySingle performs a collision detection query and calls the resultCallback. It is used internally by rayTest.
+	static void objectQuerySingle(const btConvexShape* castShape, const btTransform& rayFromTrans, const btTransform& rayToTrans,
+								  btCollisionObject* collisionObject,
+								  const btCollisionShape* collisionShape,
+								  const btTransform& colObjWorldTransform,
+								  ConvexResultCallback& resultCallback, btScalar allowedPenetration);
+
+	static void objectQuerySingleInternal(const btConvexShape* castShape, const btTransform& convexFromTrans, const btTransform& convexToTrans,
+										  const btCollisionObjectWrapper* colObjWrap,
+										  ConvexResultCallback& resultCallback, btScalar allowedPenetration);
+
+	virtual void addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup = btBroadphaseProxy::DefaultFilter, int collisionFilterMask = btBroadphaseProxy::AllFilter);
+
+	virtual void refreshBroadphaseProxy(btCollisionObject* collisionObject);
+
+	btCollisionObjectArray& getCollisionObjectArray()
+	{
+		return m_collisionObjects;
+	}
+
+	const btCollisionObjectArray& getCollisionObjectArray() const
+	{
+		return m_collisionObjects;
+	}
+
+	virtual void removeCollisionObject(btCollisionObject* collisionObject);
+
+	virtual void performDiscreteCollisionDetection();
+
+	btDispatcherInfo& getDispatchInfo()
+	{
+		return m_dispatchInfo;
+	}
+
+	const btDispatcherInfo& getDispatchInfo() const
+	{
+		return m_dispatchInfo;
+	}
+
+	bool getForceUpdateAllAabbs() const
+	{
+		return m_forceUpdateAllAabbs;
+	}
+	void setForceUpdateAllAabbs(bool forceUpdateAllAabbs)
+	{
+		m_forceUpdateAllAabbs = forceUpdateAllAabbs;
+	}
+
+	///Preliminary serialization test for Bullet 2.76. Loading those files requires a separate parser (Bullet/Demos/SerializeDemo)
+	virtual void serialize(btSerializer* serializer);
+};
+
+#endif  //BT_COLLISION_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp
new file mode 100644
index 0000000..e56e73d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp
@@ -0,0 +1,1087 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2014 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCollisionWorldImporter.h"
+#include "btBulletCollisionCommon.h"
+#include "LinearMath/btSerializer.h"  //for btBulletSerializedArrays definition
+
+#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT
+#include "BulletCollision/Gimpact/btGImpactShape.h"
+#endif  //SUPPORT_GIMPACT_SHAPE_IMPORT
+
+btCollisionWorldImporter::btCollisionWorldImporter(btCollisionWorld* world)
+	: m_collisionWorld(world),
+	  m_verboseMode(0)
+{
+}
+
+btCollisionWorldImporter::~btCollisionWorldImporter()
+{
+}
+
+bool btCollisionWorldImporter::convertAllObjects(btBulletSerializedArrays* arrays)
+{
+	m_shapeMap.clear();
+	m_bodyMap.clear();
+
+	int i;
+
+	for (i = 0; i < arrays->m_bvhsDouble.size(); i++)
+	{
+		btOptimizedBvh* bvh = createOptimizedBvh();
+		btQuantizedBvhDoubleData* bvhData = arrays->m_bvhsDouble[i];
+		bvh->deSerializeDouble(*bvhData);
+		m_bvhMap.insert(arrays->m_bvhsDouble[i], bvh);
+	}
+	for (i = 0; i < arrays->m_bvhsFloat.size(); i++)
+	{
+		btOptimizedBvh* bvh = createOptimizedBvh();
+		btQuantizedBvhFloatData* bvhData = arrays->m_bvhsFloat[i];
+		bvh->deSerializeFloat(*bvhData);
+		m_bvhMap.insert(arrays->m_bvhsFloat[i], bvh);
+	}
+
+	for (i = 0; i < arrays->m_colShapeData.size(); i++)
+	{
+		btCollisionShapeData* shapeData = arrays->m_colShapeData[i];
+		btCollisionShape* shape = convertCollisionShape(shapeData);
+		if (shape)
+		{
+			//		printf("shapeMap.insert(%x,%x)\n",shapeData,shape);
+			m_shapeMap.insert(shapeData, shape);
+		}
+
+		if (shape && shapeData->m_name)
+		{
+			char* newname = duplicateName(shapeData->m_name);
+			m_objectNameMap.insert(shape, newname);
+			m_nameShapeMap.insert(newname, shape);
+		}
+	}
+
+	for (i = 0; i < arrays->m_collisionObjectDataDouble.size(); i++)
+	{
+		btCollisionObjectDoubleData* colObjData = arrays->m_collisionObjectDataDouble[i];
+		btCollisionShape** shapePtr = m_shapeMap.find(colObjData->m_collisionShape);
+		if (shapePtr && *shapePtr)
+		{
+			btTransform startTransform;
+			colObjData->m_worldTransform.m_origin.m_floats[3] = 0.f;
+			startTransform.deSerializeDouble(colObjData->m_worldTransform);
+
+			btCollisionShape* shape = (btCollisionShape*)*shapePtr;
+			btCollisionObject* body = createCollisionObject(startTransform, shape, colObjData->m_name);
+			body->setFriction(btScalar(colObjData->m_friction));
+			body->setRestitution(btScalar(colObjData->m_restitution));
+
+#ifdef USE_INTERNAL_EDGE_UTILITY
+			if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+			{
+				btBvhTriangleMeshShape* trimesh = (btBvhTriangleMeshShape*)shape;
+				if (trimesh->getTriangleInfoMap())
+				{
+					body->setCollisionFlags(body->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
+				}
+			}
+#endif  //USE_INTERNAL_EDGE_UTILITY
+			m_bodyMap.insert(colObjData, body);
+		}
+		else
+		{
+			printf("error: no shape found\n");
+		}
+	}
+	for (i = 0; i < arrays->m_collisionObjectDataFloat.size(); i++)
+	{
+		btCollisionObjectFloatData* colObjData = arrays->m_collisionObjectDataFloat[i];
+		btCollisionShape** shapePtr = m_shapeMap.find(colObjData->m_collisionShape);
+		if (shapePtr && *shapePtr)
+		{
+			btTransform startTransform;
+			colObjData->m_worldTransform.m_origin.m_floats[3] = 0.f;
+			startTransform.deSerializeFloat(colObjData->m_worldTransform);
+
+			btCollisionShape* shape = (btCollisionShape*)*shapePtr;
+			btCollisionObject* body = createCollisionObject(startTransform, shape, colObjData->m_name);
+
+#ifdef USE_INTERNAL_EDGE_UTILITY
+			if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+			{
+				btBvhTriangleMeshShape* trimesh = (btBvhTriangleMeshShape*)shape;
+				if (trimesh->getTriangleInfoMap())
+				{
+					body->setCollisionFlags(body->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
+				}
+			}
+#endif  //USE_INTERNAL_EDGE_UTILITY
+			m_bodyMap.insert(colObjData, body);
+		}
+		else
+		{
+			printf("error: no shape found\n");
+		}
+	}
+
+	return true;
+}
+
+void btCollisionWorldImporter::deleteAllData()
+{
+	int i;
+
+	for (i = 0; i < m_allocatedCollisionObjects.size(); i++)
+	{
+		if (m_collisionWorld)
+			m_collisionWorld->removeCollisionObject(m_allocatedCollisionObjects[i]);
+		delete m_allocatedCollisionObjects[i];
+	}
+
+	m_allocatedCollisionObjects.clear();
+
+	for (i = 0; i < m_allocatedCollisionShapes.size(); i++)
+	{
+		delete m_allocatedCollisionShapes[i];
+	}
+	m_allocatedCollisionShapes.clear();
+
+	for (i = 0; i < m_allocatedBvhs.size(); i++)
+	{
+		delete m_allocatedBvhs[i];
+	}
+	m_allocatedBvhs.clear();
+
+	for (i = 0; i < m_allocatedTriangleInfoMaps.size(); i++)
+	{
+		delete m_allocatedTriangleInfoMaps[i];
+	}
+	m_allocatedTriangleInfoMaps.clear();
+	for (i = 0; i < m_allocatedTriangleIndexArrays.size(); i++)
+	{
+		delete m_allocatedTriangleIndexArrays[i];
+	}
+	m_allocatedTriangleIndexArrays.clear();
+	for (i = 0; i < m_allocatedNames.size(); i++)
+	{
+		delete[] m_allocatedNames[i];
+	}
+	m_allocatedNames.clear();
+
+	for (i = 0; i < m_allocatedbtStridingMeshInterfaceDatas.size(); i++)
+	{
+		btStridingMeshInterfaceData* curData = m_allocatedbtStridingMeshInterfaceDatas[i];
+
+		for (int a = 0; a < curData->m_numMeshParts; a++)
+		{
+			btMeshPartData* curPart = &curData->m_meshPartsPtr[a];
+			if (curPart->m_vertices3f)
+				delete[] curPart->m_vertices3f;
+
+			if (curPart->m_vertices3d)
+				delete[] curPart->m_vertices3d;
+
+			if (curPart->m_indices32)
+				delete[] curPart->m_indices32;
+
+			if (curPart->m_3indices16)
+				delete[] curPart->m_3indices16;
+
+			if (curPart->m_indices16)
+				delete[] curPart->m_indices16;
+
+			if (curPart->m_3indices8)
+				delete[] curPart->m_3indices8;
+		}
+		delete[] curData->m_meshPartsPtr;
+		delete curData;
+	}
+	m_allocatedbtStridingMeshInterfaceDatas.clear();
+
+	for (i = 0; i < m_indexArrays.size(); i++)
+	{
+		btAlignedFree(m_indexArrays[i]);
+	}
+	m_indexArrays.clear();
+
+	for (i = 0; i < m_shortIndexArrays.size(); i++)
+	{
+		btAlignedFree(m_shortIndexArrays[i]);
+	}
+	m_shortIndexArrays.clear();
+
+	for (i = 0; i < m_charIndexArrays.size(); i++)
+	{
+		btAlignedFree(m_charIndexArrays[i]);
+	}
+	m_charIndexArrays.clear();
+
+	for (i = 0; i < m_floatVertexArrays.size(); i++)
+	{
+		btAlignedFree(m_floatVertexArrays[i]);
+	}
+	m_floatVertexArrays.clear();
+
+	for (i = 0; i < m_doubleVertexArrays.size(); i++)
+	{
+		btAlignedFree(m_doubleVertexArrays[i]);
+	}
+	m_doubleVertexArrays.clear();
+}
+
+btCollisionShape* btCollisionWorldImporter::convertCollisionShape(btCollisionShapeData* shapeData)
+{
+	btCollisionShape* shape = 0;
+
+	switch (shapeData->m_shapeType)
+	{
+		case STATIC_PLANE_PROXYTYPE:
+		{
+			btStaticPlaneShapeData* planeData = (btStaticPlaneShapeData*)shapeData;
+			btVector3 planeNormal, localScaling;
+			planeNormal.deSerializeFloat(planeData->m_planeNormal);
+			localScaling.deSerializeFloat(planeData->m_localScaling);
+			shape = createPlaneShape(planeNormal, planeData->m_planeConstant);
+			shape->setLocalScaling(localScaling);
+
+			break;
+		}
+		case SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE:
+		{
+			btScaledTriangleMeshShapeData* scaledMesh = (btScaledTriangleMeshShapeData*)shapeData;
+			btCollisionShapeData* colShapeData = (btCollisionShapeData*)&scaledMesh->m_trimeshShapeData;
+			colShapeData->m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE;
+			btCollisionShape* childShape = convertCollisionShape(colShapeData);
+			btBvhTriangleMeshShape* meshShape = (btBvhTriangleMeshShape*)childShape;
+			btVector3 localScaling;
+			localScaling.deSerializeFloat(scaledMesh->m_localScaling);
+
+			shape = createScaledTrangleMeshShape(meshShape, localScaling);
+			break;
+		}
+#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT
+		case GIMPACT_SHAPE_PROXYTYPE:
+		{
+			btGImpactMeshShapeData* gimpactData = (btGImpactMeshShapeData*)shapeData;
+			if (gimpactData->m_gimpactSubType == CONST_GIMPACT_TRIMESH_SHAPE)
+			{
+				btStridingMeshInterfaceData* interfaceData = createStridingMeshInterfaceData(&gimpactData->m_meshInterface);
+				btTriangleIndexVertexArray* meshInterface = createMeshInterface(*interfaceData);
+
+				btGImpactMeshShape* gimpactShape = createGimpactShape(meshInterface);
+				btVector3 localScaling;
+				localScaling.deSerializeFloat(gimpactData->m_localScaling);
+				gimpactShape->setLocalScaling(localScaling);
+				gimpactShape->setMargin(btScalar(gimpactData->m_collisionMargin));
+				gimpactShape->updateBound();
+				shape = gimpactShape;
+			}
+			else
+			{
+				printf("unsupported gimpact sub type\n");
+			}
+			break;
+		}
+#endif  //SUPPORT_GIMPACT_SHAPE_IMPORT
+		//The btCapsuleShape* API has issue passing the margin/scaling/halfextents unmodified through the API
+		//so deal with this
+		case CAPSULE_SHAPE_PROXYTYPE:
+		{
+			btCapsuleShapeData* capData = (btCapsuleShapeData*)shapeData;
+
+			switch (capData->m_upAxis)
+			{
+				case 0:
+				{
+					shape = createCapsuleShapeX(1, 1);
+					break;
+				}
+				case 1:
+				{
+					shape = createCapsuleShapeY(1, 1);
+					break;
+				}
+				case 2:
+				{
+					shape = createCapsuleShapeZ(1, 1);
+					break;
+				}
+				default:
+				{
+					printf("error: wrong up axis for btCapsuleShape\n");
+				}
+			};
+			if (shape)
+			{
+				btCapsuleShape* cap = (btCapsuleShape*)shape;
+				cap->deSerializeFloat(capData);
+			}
+			break;
+		}
+		case CYLINDER_SHAPE_PROXYTYPE:
+		case CONE_SHAPE_PROXYTYPE:
+		case BOX_SHAPE_PROXYTYPE:
+		case SPHERE_SHAPE_PROXYTYPE:
+		case MULTI_SPHERE_SHAPE_PROXYTYPE:
+		case CONVEX_HULL_SHAPE_PROXYTYPE:
+		{
+			btConvexInternalShapeData* bsd = (btConvexInternalShapeData*)shapeData;
+			btVector3 implicitShapeDimensions;
+			implicitShapeDimensions.deSerializeFloat(bsd->m_implicitShapeDimensions);
+			btVector3 localScaling;
+			localScaling.deSerializeFloat(bsd->m_localScaling);
+			btVector3 margin(bsd->m_collisionMargin, bsd->m_collisionMargin, bsd->m_collisionMargin);
+			switch (shapeData->m_shapeType)
+			{
+				case BOX_SHAPE_PROXYTYPE:
+				{
+					btBoxShape* box = (btBoxShape*)createBoxShape(implicitShapeDimensions / localScaling + margin);
+					//box->initializePolyhedralFeatures();
+					shape = box;
+
+					break;
+				}
+				case SPHERE_SHAPE_PROXYTYPE:
+				{
+					shape = createSphereShape(implicitShapeDimensions.getX());
+					break;
+				}
+
+				case CYLINDER_SHAPE_PROXYTYPE:
+				{
+					btCylinderShapeData* cylData = (btCylinderShapeData*)shapeData;
+					btVector3 halfExtents = implicitShapeDimensions + margin;
+					switch (cylData->m_upAxis)
+					{
+						case 0:
+						{
+							shape = createCylinderShapeX(halfExtents.getY(), halfExtents.getX());
+							break;
+						}
+						case 1:
+						{
+							shape = createCylinderShapeY(halfExtents.getX(), halfExtents.getY());
+							break;
+						}
+						case 2:
+						{
+							shape = createCylinderShapeZ(halfExtents.getX(), halfExtents.getZ());
+							break;
+						}
+						default:
+						{
+							printf("unknown Cylinder up axis\n");
+						}
+					};
+
+					break;
+				}
+				case CONE_SHAPE_PROXYTYPE:
+				{
+					btConeShapeData* conData = (btConeShapeData*)shapeData;
+					btVector3 halfExtents = implicitShapeDimensions;  //+margin;
+					switch (conData->m_upIndex)
+					{
+						case 0:
+						{
+							shape = createConeShapeX(halfExtents.getY(), halfExtents.getX());
+							break;
+						}
+						case 1:
+						{
+							shape = createConeShapeY(halfExtents.getX(), halfExtents.getY());
+							break;
+						}
+						case 2:
+						{
+							shape = createConeShapeZ(halfExtents.getX(), halfExtents.getZ());
+							break;
+						}
+						default:
+						{
+							printf("unknown Cone up axis\n");
+						}
+					};
+
+					break;
+				}
+				case MULTI_SPHERE_SHAPE_PROXYTYPE:
+				{
+					btMultiSphereShapeData* mss = (btMultiSphereShapeData*)bsd;
+					int numSpheres = mss->m_localPositionArraySize;
+
+					btAlignedObjectArray<btVector3> tmpPos;
+					btAlignedObjectArray<btScalar> radii;
+					radii.resize(numSpheres);
+					tmpPos.resize(numSpheres);
+					int i;
+					for (i = 0; i < numSpheres; i++)
+					{
+						tmpPos[i].deSerializeFloat(mss->m_localPositionArrayPtr[i].m_pos);
+						radii[i] = mss->m_localPositionArrayPtr[i].m_radius;
+					}
+					shape = createMultiSphereShape(&tmpPos[0], &radii[0], numSpheres);
+					break;
+				}
+				case CONVEX_HULL_SHAPE_PROXYTYPE:
+				{
+					//	int sz = sizeof(btConvexHullShapeData);
+					//	int sz2 = sizeof(btConvexInternalShapeData);
+					//	int sz3 = sizeof(btCollisionShapeData);
+					btConvexHullShapeData* convexData = (btConvexHullShapeData*)bsd;
+					int numPoints = convexData->m_numUnscaledPoints;
+
+					btAlignedObjectArray<btVector3> tmpPoints;
+					tmpPoints.resize(numPoints);
+					int i;
+					for (i = 0; i < numPoints; i++)
+					{
+#ifdef BT_USE_DOUBLE_PRECISION
+						if (convexData->m_unscaledPointsDoublePtr)
+							tmpPoints[i].deSerialize(convexData->m_unscaledPointsDoublePtr[i]);
+						if (convexData->m_unscaledPointsFloatPtr)
+							tmpPoints[i].deSerializeFloat(convexData->m_unscaledPointsFloatPtr[i]);
+#else
+						if (convexData->m_unscaledPointsFloatPtr)
+							tmpPoints[i].deSerialize(convexData->m_unscaledPointsFloatPtr[i]);
+						if (convexData->m_unscaledPointsDoublePtr)
+							tmpPoints[i].deSerializeDouble(convexData->m_unscaledPointsDoublePtr[i]);
+#endif  //BT_USE_DOUBLE_PRECISION
+					}
+					btConvexHullShape* hullShape = createConvexHullShape();
+					for (i = 0; i < numPoints; i++)
+					{
+						hullShape->addPoint(tmpPoints[i]);
+					}
+					hullShape->setMargin(bsd->m_collisionMargin);
+					//hullShape->initializePolyhedralFeatures();
+					shape = hullShape;
+					break;
+				}
+				default:
+				{
+					printf("error: cannot create shape type (%d)\n", shapeData->m_shapeType);
+				}
+			}
+
+			if (shape)
+			{
+				shape->setMargin(bsd->m_collisionMargin);
+
+				btVector3 localScaling;
+				localScaling.deSerializeFloat(bsd->m_localScaling);
+				shape->setLocalScaling(localScaling);
+			}
+			break;
+		}
+		case TRIANGLE_MESH_SHAPE_PROXYTYPE:
+		{
+			btTriangleMeshShapeData* trimesh = (btTriangleMeshShapeData*)shapeData;
+			btStridingMeshInterfaceData* interfaceData = createStridingMeshInterfaceData(&trimesh->m_meshInterface);
+			btTriangleIndexVertexArray* meshInterface = createMeshInterface(*interfaceData);
+			if (!meshInterface->getNumSubParts())
+			{
+				return 0;
+			}
+
+			btVector3 scaling;
+			scaling.deSerializeFloat(trimesh->m_meshInterface.m_scaling);
+			meshInterface->setScaling(scaling);
+
+			btOptimizedBvh* bvh = 0;
+#if 1
+			if (trimesh->m_quantizedFloatBvh)
+			{
+				btOptimizedBvh** bvhPtr = m_bvhMap.find(trimesh->m_quantizedFloatBvh);
+				if (bvhPtr && *bvhPtr)
+				{
+					bvh = *bvhPtr;
+				}
+				else
+				{
+					bvh = createOptimizedBvh();
+					bvh->deSerializeFloat(*trimesh->m_quantizedFloatBvh);
+				}
+			}
+			if (trimesh->m_quantizedDoubleBvh)
+			{
+				btOptimizedBvh** bvhPtr = m_bvhMap.find(trimesh->m_quantizedDoubleBvh);
+				if (bvhPtr && *bvhPtr)
+				{
+					bvh = *bvhPtr;
+				}
+				else
+				{
+					bvh = createOptimizedBvh();
+					bvh->deSerializeDouble(*trimesh->m_quantizedDoubleBvh);
+				}
+			}
+#endif
+
+			btBvhTriangleMeshShape* trimeshShape = createBvhTriangleMeshShape(meshInterface, bvh);
+			trimeshShape->setMargin(trimesh->m_collisionMargin);
+			shape = trimeshShape;
+
+			if (trimesh->m_triangleInfoMap)
+			{
+				btTriangleInfoMap* map = createTriangleInfoMap();
+				map->deSerialize(*trimesh->m_triangleInfoMap);
+				trimeshShape->setTriangleInfoMap(map);
+
+#ifdef USE_INTERNAL_EDGE_UTILITY
+				gContactAddedCallback = btAdjustInternalEdgeContactsCallback;
+#endif  //USE_INTERNAL_EDGE_UTILITY
+			}
+
+			//printf("trimesh->m_collisionMargin=%f\n",trimesh->m_collisionMargin);
+			break;
+		}
+		case COMPOUND_SHAPE_PROXYTYPE:
+		{
+			btCompoundShapeData* compoundData = (btCompoundShapeData*)shapeData;
+			btCompoundShape* compoundShape = createCompoundShape();
+
+			//btCompoundShapeChildData* childShapeDataArray = &compoundData->m_childShapePtr[0];
+
+			btAlignedObjectArray<btCollisionShape*> childShapes;
+			for (int i = 0; i < compoundData->m_numChildShapes; i++)
+			{
+				//btCompoundShapeChildData* ptr = &compoundData->m_childShapePtr[i];
+
+				btCollisionShapeData* cd = compoundData->m_childShapePtr[i].m_childShape;
+
+				btCollisionShape* childShape = convertCollisionShape(cd);
+				if (childShape)
+				{
+					btTransform localTransform;
+					localTransform.deSerializeFloat(compoundData->m_childShapePtr[i].m_transform);
+					compoundShape->addChildShape(localTransform, childShape);
+				}
+				else
+				{
+#ifdef _DEBUG
+					printf("error: couldn't create childShape for compoundShape\n");
+#endif
+				}
+			}
+			shape = compoundShape;
+
+			break;
+		}
+		case SOFTBODY_SHAPE_PROXYTYPE:
+		{
+			return 0;
+		}
+		default:
+		{
+#ifdef _DEBUG
+			printf("unsupported shape type (%d)\n", shapeData->m_shapeType);
+#endif
+		}
+	}
+
+	return shape;
+}
+
+char* btCollisionWorldImporter::duplicateName(const char* name)
+{
+	if (name)
+	{
+		int l = (int)strlen(name);
+		char* newName = new char[l + 1];
+		memcpy(newName, name, l);
+		newName[l] = 0;
+		m_allocatedNames.push_back(newName);
+		return newName;
+	}
+	return 0;
+}
+
+btTriangleIndexVertexArray* btCollisionWorldImporter::createMeshInterface(btStridingMeshInterfaceData& meshData)
+{
+	btTriangleIndexVertexArray* meshInterface = createTriangleMeshContainer();
+
+	for (int i = 0; i < meshData.m_numMeshParts; i++)
+	{
+		btIndexedMesh meshPart;
+		meshPart.m_numTriangles = meshData.m_meshPartsPtr[i].m_numTriangles;
+		meshPart.m_numVertices = meshData.m_meshPartsPtr[i].m_numVertices;
+
+		if (meshData.m_meshPartsPtr[i].m_indices32)
+		{
+			meshPart.m_indexType = PHY_INTEGER;
+			meshPart.m_triangleIndexStride = 3 * sizeof(int);
+			int* indexArray = (int*)btAlignedAlloc(sizeof(int) * 3 * meshPart.m_numTriangles, 16);
+			m_indexArrays.push_back(indexArray);
+			for (int j = 0; j < 3 * meshPart.m_numTriangles; j++)
+			{
+				indexArray[j] = meshData.m_meshPartsPtr[i].m_indices32[j].m_value;
+			}
+			meshPart.m_triangleIndexBase = (const unsigned char*)indexArray;
+		}
+		else
+		{
+			if (meshData.m_meshPartsPtr[i].m_3indices16)
+			{
+				meshPart.m_indexType = PHY_SHORT;
+				meshPart.m_triangleIndexStride = sizeof(short int) * 3;  //sizeof(btShortIntIndexTripletData);
+
+				short int* indexArray = (short int*)btAlignedAlloc(sizeof(short int) * 3 * meshPart.m_numTriangles, 16);
+				m_shortIndexArrays.push_back(indexArray);
+
+				for (int j = 0; j < meshPart.m_numTriangles; j++)
+				{
+					indexArray[3 * j] = meshData.m_meshPartsPtr[i].m_3indices16[j].m_values[0];
+					indexArray[3 * j + 1] = meshData.m_meshPartsPtr[i].m_3indices16[j].m_values[1];
+					indexArray[3 * j + 2] = meshData.m_meshPartsPtr[i].m_3indices16[j].m_values[2];
+				}
+
+				meshPart.m_triangleIndexBase = (const unsigned char*)indexArray;
+			}
+			if (meshData.m_meshPartsPtr[i].m_indices16)
+			{
+				meshPart.m_indexType = PHY_SHORT;
+				meshPart.m_triangleIndexStride = 3 * sizeof(short int);
+				short int* indexArray = (short int*)btAlignedAlloc(sizeof(short int) * 3 * meshPart.m_numTriangles, 16);
+				m_shortIndexArrays.push_back(indexArray);
+				for (int j = 0; j < 3 * meshPart.m_numTriangles; j++)
+				{
+					indexArray[j] = meshData.m_meshPartsPtr[i].m_indices16[j].m_value;
+				}
+
+				meshPart.m_triangleIndexBase = (const unsigned char*)indexArray;
+			}
+
+			if (meshData.m_meshPartsPtr[i].m_3indices8)
+			{
+				meshPart.m_indexType = PHY_UCHAR;
+				meshPart.m_triangleIndexStride = sizeof(unsigned char) * 3;
+
+				unsigned char* indexArray = (unsigned char*)btAlignedAlloc(sizeof(unsigned char) * 3 * meshPart.m_numTriangles, 16);
+				m_charIndexArrays.push_back(indexArray);
+
+				for (int j = 0; j < meshPart.m_numTriangles; j++)
+				{
+					indexArray[3 * j] = meshData.m_meshPartsPtr[i].m_3indices8[j].m_values[0];
+					indexArray[3 * j + 1] = meshData.m_meshPartsPtr[i].m_3indices8[j].m_values[1];
+					indexArray[3 * j + 2] = meshData.m_meshPartsPtr[i].m_3indices8[j].m_values[2];
+				}
+
+				meshPart.m_triangleIndexBase = (const unsigned char*)indexArray;
+			}
+		}
+
+		if (meshData.m_meshPartsPtr[i].m_vertices3f)
+		{
+			meshPart.m_vertexType = PHY_FLOAT;
+			meshPart.m_vertexStride = sizeof(btVector3FloatData);
+			btVector3FloatData* vertices = (btVector3FloatData*)btAlignedAlloc(sizeof(btVector3FloatData) * meshPart.m_numVertices, 16);
+			m_floatVertexArrays.push_back(vertices);
+
+			for (int j = 0; j < meshPart.m_numVertices; j++)
+			{
+				vertices[j].m_floats[0] = meshData.m_meshPartsPtr[i].m_vertices3f[j].m_floats[0];
+				vertices[j].m_floats[1] = meshData.m_meshPartsPtr[i].m_vertices3f[j].m_floats[1];
+				vertices[j].m_floats[2] = meshData.m_meshPartsPtr[i].m_vertices3f[j].m_floats[2];
+				vertices[j].m_floats[3] = meshData.m_meshPartsPtr[i].m_vertices3f[j].m_floats[3];
+			}
+			meshPart.m_vertexBase = (const unsigned char*)vertices;
+		}
+		else
+		{
+			meshPart.m_vertexType = PHY_DOUBLE;
+			meshPart.m_vertexStride = sizeof(btVector3DoubleData);
+
+			btVector3DoubleData* vertices = (btVector3DoubleData*)btAlignedAlloc(sizeof(btVector3DoubleData) * meshPart.m_numVertices, 16);
+			m_doubleVertexArrays.push_back(vertices);
+
+			for (int j = 0; j < meshPart.m_numVertices; j++)
+			{
+				vertices[j].m_floats[0] = meshData.m_meshPartsPtr[i].m_vertices3d[j].m_floats[0];
+				vertices[j].m_floats[1] = meshData.m_meshPartsPtr[i].m_vertices3d[j].m_floats[1];
+				vertices[j].m_floats[2] = meshData.m_meshPartsPtr[i].m_vertices3d[j].m_floats[2];
+				vertices[j].m_floats[3] = meshData.m_meshPartsPtr[i].m_vertices3d[j].m_floats[3];
+			}
+			meshPart.m_vertexBase = (const unsigned char*)vertices;
+		}
+
+		if (meshPart.m_triangleIndexBase && meshPart.m_vertexBase)
+		{
+			meshInterface->addIndexedMesh(meshPart, meshPart.m_indexType);
+		}
+	}
+
+	return meshInterface;
+}
+
+btStridingMeshInterfaceData* btCollisionWorldImporter::createStridingMeshInterfaceData(btStridingMeshInterfaceData* interfaceData)
+{
+	//create a new btStridingMeshInterfaceData that is an exact copy of shapedata and store it in the WorldImporter
+	btStridingMeshInterfaceData* newData = new btStridingMeshInterfaceData;
+
+	newData->m_scaling = interfaceData->m_scaling;
+	newData->m_numMeshParts = interfaceData->m_numMeshParts;
+	newData->m_meshPartsPtr = new btMeshPartData[newData->m_numMeshParts];
+
+	for (int i = 0; i < newData->m_numMeshParts; i++)
+	{
+		btMeshPartData* curPart = &interfaceData->m_meshPartsPtr[i];
+		btMeshPartData* curNewPart = &newData->m_meshPartsPtr[i];
+
+		curNewPart->m_numTriangles = curPart->m_numTriangles;
+		curNewPart->m_numVertices = curPart->m_numVertices;
+
+		if (curPart->m_vertices3f)
+		{
+			curNewPart->m_vertices3f = new btVector3FloatData[curNewPart->m_numVertices];
+			memcpy(curNewPart->m_vertices3f, curPart->m_vertices3f, sizeof(btVector3FloatData) * curNewPart->m_numVertices);
+		}
+		else
+			curNewPart->m_vertices3f = NULL;
+
+		if (curPart->m_vertices3d)
+		{
+			curNewPart->m_vertices3d = new btVector3DoubleData[curNewPart->m_numVertices];
+			memcpy(curNewPart->m_vertices3d, curPart->m_vertices3d, sizeof(btVector3DoubleData) * curNewPart->m_numVertices);
+		}
+		else
+			curNewPart->m_vertices3d = NULL;
+
+		int numIndices = curNewPart->m_numTriangles * 3;
+		///the m_3indices8 was not initialized in some Bullet versions, this can cause crashes at loading time
+		///we catch it by only dealing with m_3indices8 if none of the other indices are initialized
+		bool uninitialized3indices8Workaround = false;
+
+		if (curPart->m_indices32)
+		{
+			uninitialized3indices8Workaround = true;
+			curNewPart->m_indices32 = new btIntIndexData[numIndices];
+			memcpy(curNewPart->m_indices32, curPart->m_indices32, sizeof(btIntIndexData) * numIndices);
+		}
+		else
+			curNewPart->m_indices32 = NULL;
+
+		if (curPart->m_3indices16)
+		{
+			uninitialized3indices8Workaround = true;
+			curNewPart->m_3indices16 = new btShortIntIndexTripletData[curNewPart->m_numTriangles];
+			memcpy(curNewPart->m_3indices16, curPart->m_3indices16, sizeof(btShortIntIndexTripletData) * curNewPart->m_numTriangles);
+		}
+		else
+			curNewPart->m_3indices16 = NULL;
+
+		if (curPart->m_indices16)
+		{
+			uninitialized3indices8Workaround = true;
+			curNewPart->m_indices16 = new btShortIntIndexData[numIndices];
+			memcpy(curNewPart->m_indices16, curPart->m_indices16, sizeof(btShortIntIndexData) * numIndices);
+		}
+		else
+			curNewPart->m_indices16 = NULL;
+
+		if (!uninitialized3indices8Workaround && curPart->m_3indices8)
+		{
+			curNewPart->m_3indices8 = new btCharIndexTripletData[curNewPart->m_numTriangles];
+			memcpy(curNewPart->m_3indices8, curPart->m_3indices8, sizeof(btCharIndexTripletData) * curNewPart->m_numTriangles);
+		}
+		else
+			curNewPart->m_3indices8 = NULL;
+	}
+
+	m_allocatedbtStridingMeshInterfaceDatas.push_back(newData);
+
+	return (newData);
+}
+
+#ifdef USE_INTERNAL_EDGE_UTILITY
+extern ContactAddedCallback gContactAddedCallback;
+
+static bool btAdjustInternalEdgeContactsCallback(btManifoldPoint& cp, const btCollisionObject* colObj0, int partId0, int index0, const btCollisionObject* colObj1, int partId1, int index1)
+{
+	btAdjustInternalEdgeContacts(cp, colObj1, colObj0, partId1, index1);
+	//btAdjustInternalEdgeContacts(cp,colObj1,colObj0, partId1,index1, BT_TRIANGLE_CONVEX_BACKFACE_MODE);
+	//btAdjustInternalEdgeContacts(cp,colObj1,colObj0, partId1,index1, BT_TRIANGLE_CONVEX_DOUBLE_SIDED+BT_TRIANGLE_CONCAVE_DOUBLE_SIDED);
+	return true;
+}
+#endif  //USE_INTERNAL_EDGE_UTILITY
+
+/*
+btRigidBody*  btWorldImporter::createRigidBody(bool isDynamic, btScalar mass, const btTransform& startTransform,btCollisionShape* shape,const char* bodyName)
+{
+	btVector3 localInertia;
+	localInertia.setZero();
+
+	if (mass)
+		shape->calculateLocalInertia(mass,localInertia);
+
+	btRigidBody* body = new btRigidBody(mass,0,shape,localInertia);
+	body->setWorldTransform(startTransform);
+
+	if (m_dynamicsWorld)
+		m_dynamicsWorld->addRigidBody(body);
+
+	if (bodyName)
+	{
+		char* newname = duplicateName(bodyName);
+		m_objectNameMap.insert(body,newname);
+		m_nameBodyMap.insert(newname,body);
+	}
+	m_allocatedRigidBodies.push_back(body);
+	return body;
+
+}
+*/
+
+btCollisionObject* btCollisionWorldImporter::getCollisionObjectByName(const char* name)
+{
+	btCollisionObject** bodyPtr = m_nameColObjMap.find(name);
+	if (bodyPtr && *bodyPtr)
+	{
+		return *bodyPtr;
+	}
+	return 0;
+}
+
+btCollisionObject* btCollisionWorldImporter::createCollisionObject(const btTransform& startTransform, btCollisionShape* shape, const char* bodyName)
+{
+	btCollisionObject* colObj = new btCollisionObject();
+	colObj->setWorldTransform(startTransform);
+	colObj->setCollisionShape(shape);
+	m_collisionWorld->addCollisionObject(colObj);  //todo: flags etc
+
+	if (bodyName)
+	{
+		char* newname = duplicateName(bodyName);
+		m_objectNameMap.insert(colObj, newname);
+		m_nameColObjMap.insert(newname, colObj);
+	}
+	m_allocatedCollisionObjects.push_back(colObj);
+
+	return colObj;
+}
+
+btCollisionShape* btCollisionWorldImporter::createPlaneShape(const btVector3& planeNormal, btScalar planeConstant)
+{
+	btStaticPlaneShape* shape = new btStaticPlaneShape(planeNormal, planeConstant);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+btCollisionShape* btCollisionWorldImporter::createBoxShape(const btVector3& halfExtents)
+{
+	btBoxShape* shape = new btBoxShape(halfExtents);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+btCollisionShape* btCollisionWorldImporter::createSphereShape(btScalar radius)
+{
+	btSphereShape* shape = new btSphereShape(radius);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createCapsuleShapeX(btScalar radius, btScalar height)
+{
+	btCapsuleShapeX* shape = new btCapsuleShapeX(radius, height);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createCapsuleShapeY(btScalar radius, btScalar height)
+{
+	btCapsuleShape* shape = new btCapsuleShape(radius, height);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createCapsuleShapeZ(btScalar radius, btScalar height)
+{
+	btCapsuleShapeZ* shape = new btCapsuleShapeZ(radius, height);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createCylinderShapeX(btScalar radius, btScalar height)
+{
+	btCylinderShapeX* shape = new btCylinderShapeX(btVector3(height, radius, radius));
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createCylinderShapeY(btScalar radius, btScalar height)
+{
+	btCylinderShape* shape = new btCylinderShape(btVector3(radius, height, radius));
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createCylinderShapeZ(btScalar radius, btScalar height)
+{
+	btCylinderShapeZ* shape = new btCylinderShapeZ(btVector3(radius, radius, height));
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createConeShapeX(btScalar radius, btScalar height)
+{
+	btConeShapeX* shape = new btConeShapeX(radius, height);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createConeShapeY(btScalar radius, btScalar height)
+{
+	btConeShape* shape = new btConeShape(radius, height);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCollisionShape* btCollisionWorldImporter::createConeShapeZ(btScalar radius, btScalar height)
+{
+	btConeShapeZ* shape = new btConeShapeZ(radius, height);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btTriangleIndexVertexArray* btCollisionWorldImporter::createTriangleMeshContainer()
+{
+	btTriangleIndexVertexArray* in = new btTriangleIndexVertexArray();
+	m_allocatedTriangleIndexArrays.push_back(in);
+	return in;
+}
+
+btOptimizedBvh* btCollisionWorldImporter::createOptimizedBvh()
+{
+	btOptimizedBvh* bvh = new btOptimizedBvh();
+	m_allocatedBvhs.push_back(bvh);
+	return bvh;
+}
+
+btTriangleInfoMap* btCollisionWorldImporter::createTriangleInfoMap()
+{
+	btTriangleInfoMap* tim = new btTriangleInfoMap();
+	m_allocatedTriangleInfoMaps.push_back(tim);
+	return tim;
+}
+
+btBvhTriangleMeshShape* btCollisionWorldImporter::createBvhTriangleMeshShape(btStridingMeshInterface* trimesh, btOptimizedBvh* bvh)
+{
+	if (bvh)
+	{
+		btBvhTriangleMeshShape* bvhTriMesh = new btBvhTriangleMeshShape(trimesh, bvh->isQuantized(), false);
+		bvhTriMesh->setOptimizedBvh(bvh);
+		m_allocatedCollisionShapes.push_back(bvhTriMesh);
+		return bvhTriMesh;
+	}
+
+	btBvhTriangleMeshShape* ts = new btBvhTriangleMeshShape(trimesh, true);
+	m_allocatedCollisionShapes.push_back(ts);
+	return ts;
+}
+btCollisionShape* btCollisionWorldImporter::createConvexTriangleMeshShape(btStridingMeshInterface* trimesh)
+{
+	return 0;
+}
+#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT
+btGImpactMeshShape* btCollisionWorldImporter::createGimpactShape(btStridingMeshInterface* trimesh)
+{
+	btGImpactMeshShape* shape = new btGImpactMeshShape(trimesh);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+#endif  //SUPPORT_GIMPACT_SHAPE_IMPORT
+
+btConvexHullShape* btCollisionWorldImporter::createConvexHullShape()
+{
+	btConvexHullShape* shape = new btConvexHullShape();
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btCompoundShape* btCollisionWorldImporter::createCompoundShape()
+{
+	btCompoundShape* shape = new btCompoundShape();
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btScaledBvhTriangleMeshShape* btCollisionWorldImporter::createScaledTrangleMeshShape(btBvhTriangleMeshShape* meshShape, const btVector3& localScaling)
+{
+	btScaledBvhTriangleMeshShape* shape = new btScaledBvhTriangleMeshShape(meshShape, localScaling);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+btMultiSphereShape* btCollisionWorldImporter::createMultiSphereShape(const btVector3* positions, const btScalar* radi, int numSpheres)
+{
+	btMultiSphereShape* shape = new btMultiSphereShape(positions, radi, numSpheres);
+	m_allocatedCollisionShapes.push_back(shape);
+	return shape;
+}
+
+// query for data
+int btCollisionWorldImporter::getNumCollisionShapes() const
+{
+	return m_allocatedCollisionShapes.size();
+}
+
+btCollisionShape* btCollisionWorldImporter::getCollisionShapeByIndex(int index)
+{
+	return m_allocatedCollisionShapes[index];
+}
+
+btCollisionShape* btCollisionWorldImporter::getCollisionShapeByName(const char* name)
+{
+	btCollisionShape** shapePtr = m_nameShapeMap.find(name);
+	if (shapePtr && *shapePtr)
+	{
+		return *shapePtr;
+	}
+	return 0;
+}
+
+const char* btCollisionWorldImporter::getNameForPointer(const void* ptr) const
+{
+	const char* const* namePtr = m_objectNameMap.find(ptr);
+	if (namePtr && *namePtr)
+		return *namePtr;
+	return 0;
+}
+
+int btCollisionWorldImporter::getNumRigidBodies() const
+{
+	return m_allocatedRigidBodies.size();
+}
+
+btCollisionObject* btCollisionWorldImporter::getRigidBodyByIndex(int index) const
+{
+	return m_allocatedRigidBodies[index];
+}
+
+int btCollisionWorldImporter::getNumBvhs() const
+{
+	return m_allocatedBvhs.size();
+}
+btOptimizedBvh* btCollisionWorldImporter::getBvhByIndex(int index) const
+{
+	return m_allocatedBvhs[index];
+}
+
+int btCollisionWorldImporter::getNumTriangleInfoMaps() const
+{
+	return m_allocatedTriangleInfoMaps.size();
+}
+
+btTriangleInfoMap* btCollisionWorldImporter::getTriangleInfoMapByIndex(int index) const
+{
+	return m_allocatedTriangleInfoMaps[index];
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h
new file mode 100644
index 0000000..5e8bc95
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h
@@ -0,0 +1,169 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2014 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_WORLD_IMPORTER_H
+#define BT_COLLISION_WORLD_IMPORTER_H
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btHashMap.h"
+
+class btCollisionShape;
+class btCollisionObject;
+struct btBulletSerializedArrays;
+
+struct ConstraintInput;
+class btCollisionWorld;
+struct btCollisionShapeData;
+class btTriangleIndexVertexArray;
+class btStridingMeshInterface;
+struct btStridingMeshInterfaceData;
+class btGImpactMeshShape;
+class btOptimizedBvh;
+struct btTriangleInfoMap;
+class btBvhTriangleMeshShape;
+class btPoint2PointConstraint;
+class btHingeConstraint;
+class btConeTwistConstraint;
+class btGeneric6DofConstraint;
+class btGeneric6DofSpringConstraint;
+class btSliderConstraint;
+class btGearConstraint;
+struct btContactSolverInfo;
+
+class btCollisionWorldImporter
+{
+protected:
+	btCollisionWorld* m_collisionWorld;
+
+	int m_verboseMode;
+
+	btAlignedObjectArray<btCollisionShape*> m_allocatedCollisionShapes;
+	btAlignedObjectArray<btCollisionObject*> m_allocatedRigidBodies;
+
+	btAlignedObjectArray<btOptimizedBvh*> m_allocatedBvhs;
+	btAlignedObjectArray<btTriangleInfoMap*> m_allocatedTriangleInfoMaps;
+	btAlignedObjectArray<btTriangleIndexVertexArray*> m_allocatedTriangleIndexArrays;
+	btAlignedObjectArray<btStridingMeshInterfaceData*> m_allocatedbtStridingMeshInterfaceDatas;
+	btAlignedObjectArray<btCollisionObject*> m_allocatedCollisionObjects;
+
+	btAlignedObjectArray<char*> m_allocatedNames;
+
+	btAlignedObjectArray<int*> m_indexArrays;
+	btAlignedObjectArray<short int*> m_shortIndexArrays;
+	btAlignedObjectArray<unsigned char*> m_charIndexArrays;
+
+	btAlignedObjectArray<btVector3FloatData*> m_floatVertexArrays;
+	btAlignedObjectArray<btVector3DoubleData*> m_doubleVertexArrays;
+
+	btHashMap<btHashPtr, btOptimizedBvh*> m_bvhMap;
+	btHashMap<btHashPtr, btTriangleInfoMap*> m_timMap;
+
+	btHashMap<btHashString, btCollisionShape*> m_nameShapeMap;
+	btHashMap<btHashString, btCollisionObject*> m_nameColObjMap;
+
+	btHashMap<btHashPtr, const char*> m_objectNameMap;
+
+	btHashMap<btHashPtr, btCollisionShape*> m_shapeMap;
+	btHashMap<btHashPtr, btCollisionObject*> m_bodyMap;
+
+	//methods
+
+	char* duplicateName(const char* name);
+
+	btCollisionShape* convertCollisionShape(btCollisionShapeData* shapeData);
+
+public:
+	btCollisionWorldImporter(btCollisionWorld* world);
+
+	virtual ~btCollisionWorldImporter();
+
+	bool convertAllObjects(btBulletSerializedArrays* arrays);
+
+	///delete all memory collision shapes, rigid bodies, constraints etc. allocated during the load.
+	///make sure you don't use the dynamics world containing objects after you call this method
+	virtual void deleteAllData();
+
+	void setVerboseMode(int verboseMode)
+	{
+		m_verboseMode = verboseMode;
+	}
+
+	int getVerboseMode() const
+	{
+		return m_verboseMode;
+	}
+
+	// query for data
+	int getNumCollisionShapes() const;
+	btCollisionShape* getCollisionShapeByIndex(int index);
+	int getNumRigidBodies() const;
+	btCollisionObject* getRigidBodyByIndex(int index) const;
+
+	int getNumBvhs() const;
+	btOptimizedBvh* getBvhByIndex(int index) const;
+	int getNumTriangleInfoMaps() const;
+	btTriangleInfoMap* getTriangleInfoMapByIndex(int index) const;
+
+	// queris involving named objects
+	btCollisionShape* getCollisionShapeByName(const char* name);
+	btCollisionObject* getCollisionObjectByName(const char* name);
+
+	const char* getNameForPointer(const void* ptr) const;
+
+	///those virtuals are called by load and can be overridden by the user
+
+	//bodies
+
+	virtual btCollisionObject* createCollisionObject(const btTransform& startTransform, btCollisionShape* shape, const char* bodyName);
+
+	///shapes
+
+	virtual btCollisionShape* createPlaneShape(const btVector3& planeNormal, btScalar planeConstant);
+	virtual btCollisionShape* createBoxShape(const btVector3& halfExtents);
+	virtual btCollisionShape* createSphereShape(btScalar radius);
+	virtual btCollisionShape* createCapsuleShapeX(btScalar radius, btScalar height);
+	virtual btCollisionShape* createCapsuleShapeY(btScalar radius, btScalar height);
+	virtual btCollisionShape* createCapsuleShapeZ(btScalar radius, btScalar height);
+
+	virtual btCollisionShape* createCylinderShapeX(btScalar radius, btScalar height);
+	virtual btCollisionShape* createCylinderShapeY(btScalar radius, btScalar height);
+	virtual btCollisionShape* createCylinderShapeZ(btScalar radius, btScalar height);
+	virtual btCollisionShape* createConeShapeX(btScalar radius, btScalar height);
+	virtual btCollisionShape* createConeShapeY(btScalar radius, btScalar height);
+	virtual btCollisionShape* createConeShapeZ(btScalar radius, btScalar height);
+	virtual class btTriangleIndexVertexArray* createTriangleMeshContainer();
+	virtual btBvhTriangleMeshShape* createBvhTriangleMeshShape(btStridingMeshInterface* trimesh, btOptimizedBvh* bvh);
+	virtual btCollisionShape* createConvexTriangleMeshShape(btStridingMeshInterface* trimesh);
+#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT
+	virtual btGImpactMeshShape* createGimpactShape(btStridingMeshInterface* trimesh);
+#endif  //SUPPORT_GIMPACT_SHAPE_IMPORT
+	virtual btStridingMeshInterfaceData* createStridingMeshInterfaceData(btStridingMeshInterfaceData* interfaceData);
+
+	virtual class btConvexHullShape* createConvexHullShape();
+	virtual class btCompoundShape* createCompoundShape();
+	virtual class btScaledBvhTriangleMeshShape* createScaledTrangleMeshShape(btBvhTriangleMeshShape* meshShape, const btVector3& localScalingbtBvhTriangleMeshShape);
+
+	virtual class btMultiSphereShape* createMultiSphereShape(const btVector3* positions, const btScalar* radi, int numSpheres);
+
+	virtual btTriangleIndexVertexArray* createMeshInterface(btStridingMeshInterfaceData& meshData);
+
+	///acceleration and connectivity structures
+	virtual btOptimizedBvh* createOptimizedBvh();
+	virtual btTriangleInfoMap* createTriangleInfoMap();
+};
+
+#endif  //BT_WORLD_IMPORTER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
new file mode 100644
index 0000000..6f7ea01
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
@@ -0,0 +1,390 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btAabbUtil2.h"
+#include "btManifoldResult.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+btShapePairCallback gCompoundChildShapePairCallback = 0;
+
+btCompoundCollisionAlgorithm::btCompoundCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped)
+	: btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
+	  m_isSwapped(isSwapped),
+	  m_sharedManifold(ci.m_manifold)
+{
+	m_ownsManifold = false;
+
+	const btCollisionObjectWrapper* colObjWrap = m_isSwapped ? body1Wrap : body0Wrap;
+	btAssert(colObjWrap->getCollisionShape()->isCompound());
+
+	const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(colObjWrap->getCollisionShape());
+	m_compoundShapeRevision = compoundShape->getUpdateRevision();
+
+	preallocateChildAlgorithms(body0Wrap, body1Wrap);
+}
+
+void btCompoundCollisionAlgorithm::preallocateChildAlgorithms(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+{
+	const btCollisionObjectWrapper* colObjWrap = m_isSwapped ? body1Wrap : body0Wrap;
+	const btCollisionObjectWrapper* otherObjWrap = m_isSwapped ? body0Wrap : body1Wrap;
+	btAssert(colObjWrap->getCollisionShape()->isCompound());
+
+	const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(colObjWrap->getCollisionShape());
+
+	int numChildren = compoundShape->getNumChildShapes();
+	int i;
+
+	m_childCollisionAlgorithms.resize(numChildren);
+	for (i = 0; i < numChildren; i++)
+	{
+		if (compoundShape->getDynamicAabbTree())
+		{
+			m_childCollisionAlgorithms[i] = 0;
+		}
+		else
+		{
+			const btCollisionShape* childShape = compoundShape->getChildShape(i);
+
+			btCollisionObjectWrapper childWrap(colObjWrap, childShape, colObjWrap->getCollisionObject(), colObjWrap->getWorldTransform(), -1, i);  //wrong child trans, but unused (hopefully)
+			m_childCollisionAlgorithms[i] = m_dispatcher->findAlgorithm(&childWrap, otherObjWrap, m_sharedManifold, BT_CONTACT_POINT_ALGORITHMS);
+
+			btAlignedObjectArray<btCollisionAlgorithm*> m_childCollisionAlgorithmsContact;
+			btAlignedObjectArray<btCollisionAlgorithm*> m_childCollisionAlgorithmsClosestPoints;
+		}
+	}
+}
+
+void btCompoundCollisionAlgorithm::removeChildAlgorithms()
+{
+	int numChildren = m_childCollisionAlgorithms.size();
+	int i;
+	for (i = 0; i < numChildren; i++)
+	{
+		if (m_childCollisionAlgorithms[i])
+		{
+			m_childCollisionAlgorithms[i]->~btCollisionAlgorithm();
+			m_dispatcher->freeCollisionAlgorithm(m_childCollisionAlgorithms[i]);
+		}
+	}
+}
+
+btCompoundCollisionAlgorithm::~btCompoundCollisionAlgorithm()
+{
+	removeChildAlgorithms();
+}
+
+struct btCompoundLeafCallback : btDbvt::ICollide
+{
+public:
+	const btCollisionObjectWrapper* m_compoundColObjWrap;
+	const btCollisionObjectWrapper* m_otherObjWrap;
+	btDispatcher* m_dispatcher;
+	const btDispatcherInfo& m_dispatchInfo;
+	btManifoldResult* m_resultOut;
+	btCollisionAlgorithm** m_childCollisionAlgorithms;
+	btPersistentManifold* m_sharedManifold;
+
+	btCompoundLeafCallback(const btCollisionObjectWrapper* compoundObjWrap, const btCollisionObjectWrapper* otherObjWrap, btDispatcher* dispatcher, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut, btCollisionAlgorithm** childCollisionAlgorithms, btPersistentManifold* sharedManifold)
+		: m_compoundColObjWrap(compoundObjWrap), m_otherObjWrap(otherObjWrap), m_dispatcher(dispatcher), m_dispatchInfo(dispatchInfo), m_resultOut(resultOut), m_childCollisionAlgorithms(childCollisionAlgorithms), m_sharedManifold(sharedManifold)
+	{
+	}
+
+	void ProcessChildShape(const btCollisionShape* childShape, int index)
+	{
+		btAssert(index >= 0);
+		const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(m_compoundColObjWrap->getCollisionShape());
+		btAssert(index < compoundShape->getNumChildShapes());
+
+		if (gCompoundChildShapePairCallback)
+		{
+			if (!gCompoundChildShapePairCallback(m_otherObjWrap->getCollisionShape(), childShape))
+				return;
+		}
+
+		//backup
+		btTransform orgTrans = m_compoundColObjWrap->getWorldTransform();
+
+		const btTransform& childTrans = compoundShape->getChildTransform(index);
+		btTransform newChildWorldTrans = orgTrans * childTrans;
+
+		//perform an AABB check first
+		btVector3 aabbMin0, aabbMax0;
+		childShape->getAabb(newChildWorldTrans, aabbMin0, aabbMax0);
+
+		btVector3 extendAabb(m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold);
+		aabbMin0 -= extendAabb;
+		aabbMax0 += extendAabb;
+
+		btVector3 aabbMin1, aabbMax1;
+		m_otherObjWrap->getCollisionShape()->getAabb(m_otherObjWrap->getWorldTransform(), aabbMin1, aabbMax1);
+
+
+		if (TestAabbAgainstAabb2(aabbMin0, aabbMax0, aabbMin1, aabbMax1))
+		{
+			btTransform preTransform = childTrans;
+			if (this->m_compoundColObjWrap->m_preTransform)
+			{
+				preTransform = preTransform *(*(this->m_compoundColObjWrap->m_preTransform));
+			}
+			btCollisionObjectWrapper compoundWrap(this->m_compoundColObjWrap, childShape, m_compoundColObjWrap->getCollisionObject(), newChildWorldTrans, preTransform, -1, index);
+
+			btCollisionAlgorithm* algo = 0;
+			bool allocatedAlgorithm = false;
+
+			if (m_resultOut->m_closestPointDistanceThreshold > 0)
+			{
+				algo = m_dispatcher->findAlgorithm(&compoundWrap, m_otherObjWrap, 0, BT_CLOSEST_POINT_ALGORITHMS);
+				allocatedAlgorithm = true;
+			}
+			else
+			{
+				//the contactpoint is still projected back using the original inverted worldtrans
+				if (!m_childCollisionAlgorithms[index])
+				{
+					m_childCollisionAlgorithms[index] = m_dispatcher->findAlgorithm(&compoundWrap, m_otherObjWrap, m_sharedManifold, BT_CONTACT_POINT_ALGORITHMS);
+				}
+				algo = m_childCollisionAlgorithms[index];
+			}
+
+			const btCollisionObjectWrapper* tmpWrap = 0;
+
+			///detect swapping case
+			if (m_resultOut->getBody0Internal() == m_compoundColObjWrap->getCollisionObject())
+			{
+				tmpWrap = m_resultOut->getBody0Wrap();
+				m_resultOut->setBody0Wrap(&compoundWrap);
+				m_resultOut->setShapeIdentifiersA(-1, index);
+			}
+			else
+			{
+				tmpWrap = m_resultOut->getBody1Wrap();
+				m_resultOut->setBody1Wrap(&compoundWrap);
+				m_resultOut->setShapeIdentifiersB(-1, index);
+			}
+
+			algo->processCollision(&compoundWrap, m_otherObjWrap, m_dispatchInfo, m_resultOut);
+
+#if 0
+			if (m_dispatchInfo.m_debugDraw && (m_dispatchInfo.m_debugDraw->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+			{
+				btVector3 worldAabbMin,worldAabbMax;
+				m_dispatchInfo.m_debugDraw->drawAabb(aabbMin0,aabbMax0,btVector3(1,1,1));
+				m_dispatchInfo.m_debugDraw->drawAabb(aabbMin1,aabbMax1,btVector3(1,1,1));
+			}
+#endif
+
+			if (m_resultOut->getBody0Internal() == m_compoundColObjWrap->getCollisionObject())
+			{
+				m_resultOut->setBody0Wrap(tmpWrap);
+			}
+			else
+			{
+				m_resultOut->setBody1Wrap(tmpWrap);
+			}
+			if (allocatedAlgorithm)
+			{
+				algo->~btCollisionAlgorithm();
+				m_dispatcher->freeCollisionAlgorithm(algo);
+			}
+		}
+	}
+	void Process(const btDbvtNode* leaf)
+	{
+		int index = leaf->dataAsInt;
+
+		const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(m_compoundColObjWrap->getCollisionShape());
+		const btCollisionShape* childShape = compoundShape->getChildShape(index);
+
+#if 0
+		if (m_dispatchInfo.m_debugDraw && (m_dispatchInfo.m_debugDraw->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+		{
+			btVector3 worldAabbMin,worldAabbMax;
+			btTransform	orgTrans = m_compoundColObjWrap->getWorldTransform();
+			btTransformAabb(leaf->volume.Mins(),leaf->volume.Maxs(),0.,orgTrans,worldAabbMin,worldAabbMax);
+			m_dispatchInfo.m_debugDraw->drawAabb(worldAabbMin,worldAabbMax,btVector3(1,0,0));
+		}
+#endif
+
+		ProcessChildShape(childShape, index);
+	}
+};
+
+void btCompoundCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	const btCollisionObjectWrapper* colObjWrap = m_isSwapped ? body1Wrap : body0Wrap;
+	const btCollisionObjectWrapper* otherObjWrap = m_isSwapped ? body0Wrap : body1Wrap;
+
+	btAssert(colObjWrap->getCollisionShape()->isCompound());
+	const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(colObjWrap->getCollisionShape());
+
+	///btCompoundShape might have changed:
+	////make sure the internal child collision algorithm caches are still valid
+	if (compoundShape->getUpdateRevision() != m_compoundShapeRevision)
+	{
+		///clear and update all
+		removeChildAlgorithms();
+
+		preallocateChildAlgorithms(body0Wrap, body1Wrap);
+		m_compoundShapeRevision = compoundShape->getUpdateRevision();
+	}
+
+	if (m_childCollisionAlgorithms.size() == 0)
+		return;
+
+	const btDbvt* tree = compoundShape->getDynamicAabbTree();
+	//use a dynamic aabb tree to cull potential child-overlaps
+	btCompoundLeafCallback callback(colObjWrap, otherObjWrap, m_dispatcher, dispatchInfo, resultOut, &m_childCollisionAlgorithms[0], m_sharedManifold);
+
+	///we need to refresh all contact manifolds
+	///note that we should actually recursively traverse all children, btCompoundShape can nested more then 1 level deep
+	///so we should add a 'refreshManifolds' in the btCollisionAlgorithm
+	{
+		int i;
+		manifoldArray.resize(0);
+		for (i = 0; i < m_childCollisionAlgorithms.size(); i++)
+		{
+			if (m_childCollisionAlgorithms[i])
+			{
+				m_childCollisionAlgorithms[i]->getAllContactManifolds(manifoldArray);
+				for (int m = 0; m < manifoldArray.size(); m++)
+				{
+					if (manifoldArray[m]->getNumContacts())
+					{
+						resultOut->setPersistentManifold(manifoldArray[m]);
+						resultOut->refreshContactPoints();
+						resultOut->setPersistentManifold(0);  //??necessary?
+					}
+				}
+				manifoldArray.resize(0);
+			}
+		}
+	}
+
+	if (tree)
+	{
+		btVector3 localAabbMin, localAabbMax;
+		btTransform otherInCompoundSpace;
+		otherInCompoundSpace = colObjWrap->getWorldTransform().inverse() * otherObjWrap->getWorldTransform();
+		otherObjWrap->getCollisionShape()->getAabb(otherInCompoundSpace, localAabbMin, localAabbMax);
+		btVector3 extraExtends(resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold);
+		localAabbMin -= extraExtends;
+		localAabbMax += extraExtends;
+
+		const ATTRIBUTE_ALIGNED16(btDbvtVolume) bounds = btDbvtVolume::FromMM(localAabbMin, localAabbMax);
+		//process all children, that overlap with  the given AABB bounds
+		tree->collideTVNoStackAlloc(tree->m_root, bounds, stack2, callback);
+	}
+	else
+	{
+		//iterate over all children, perform an AABB check inside ProcessChildShape
+		int numChildren = m_childCollisionAlgorithms.size();
+		int i;
+		for (i = 0; i < numChildren; i++)
+		{
+			callback.ProcessChildShape(compoundShape->getChildShape(i), i);
+		}
+	}
+
+	{
+		//iterate over all children, perform an AABB check inside ProcessChildShape
+		int numChildren = m_childCollisionAlgorithms.size();
+		int i;
+		manifoldArray.resize(0);
+		const btCollisionShape* childShape = 0;
+		btTransform orgTrans;
+
+		btTransform newChildWorldTrans;
+		btVector3 aabbMin0, aabbMax0, aabbMin1, aabbMax1;
+
+		for (i = 0; i < numChildren; i++)
+		{
+			if (m_childCollisionAlgorithms[i])
+			{
+				childShape = compoundShape->getChildShape(i);
+				//if not longer overlapping, remove the algorithm
+				orgTrans = colObjWrap->getWorldTransform();
+
+				const btTransform& childTrans = compoundShape->getChildTransform(i);
+				newChildWorldTrans = orgTrans * childTrans;
+
+				//perform an AABB check first
+				childShape->getAabb(newChildWorldTrans, aabbMin0, aabbMax0);
+				otherObjWrap->getCollisionShape()->getAabb(otherObjWrap->getWorldTransform(), aabbMin1, aabbMax1);
+
+				if (!TestAabbAgainstAabb2(aabbMin0, aabbMax0, aabbMin1, aabbMax1))
+				{
+					m_childCollisionAlgorithms[i]->~btCollisionAlgorithm();
+					m_dispatcher->freeCollisionAlgorithm(m_childCollisionAlgorithms[i]);
+					m_childCollisionAlgorithms[i] = 0;
+				}
+			}
+		}
+	}
+}
+
+btScalar btCompoundCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	btAssert(0);
+	//needs to be fixed, using btCollisionObjectWrapper and NOT modifying internal data structures
+	btCollisionObject* colObj = m_isSwapped ? body1 : body0;
+	btCollisionObject* otherObj = m_isSwapped ? body0 : body1;
+
+	btAssert(colObj->getCollisionShape()->isCompound());
+
+	btCompoundShape* compoundShape = static_cast<btCompoundShape*>(colObj->getCollisionShape());
+
+	//We will use the OptimizedBVH, AABB tree to cull potential child-overlaps
+	//If both proxies are Compound, we will deal with that directly, by performing sequential/parallel tree traversals
+	//given Proxy0 and Proxy1, if both have a tree, Tree0 and Tree1, this means:
+	//determine overlapping nodes of Proxy1 using Proxy0 AABB against Tree1
+	//then use each overlapping node AABB against Tree0
+	//and vise versa.
+
+	btScalar hitFraction = btScalar(1.);
+
+	int numChildren = m_childCollisionAlgorithms.size();
+	int i;
+	btTransform orgTrans;
+	btScalar frac;
+	for (i = 0; i < numChildren; i++)
+	{
+		//btCollisionShape* childShape = compoundShape->getChildShape(i);
+
+		//backup
+		orgTrans = colObj->getWorldTransform();
+
+		const btTransform& childTrans = compoundShape->getChildTransform(i);
+		//btTransform	newChildWorldTrans = orgTrans*childTrans ;
+		colObj->setWorldTransform(orgTrans * childTrans);
+
+		//btCollisionShape* tmpShape = colObj->getCollisionShape();
+		//colObj->internalSetTemporaryCollisionShape( childShape );
+		frac = m_childCollisionAlgorithms[i]->calculateTimeOfImpact(colObj, otherObj, dispatchInfo, resultOut);
+		if (frac < hitFraction)
+		{
+			hitFraction = frac;
+		}
+		//revert back
+		//colObj->internalSetTemporaryCollisionShape( tmpShape);
+		colObj->setWorldTransform(orgTrans);
+	}
+	return hitFraction;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
new file mode 100644
index 0000000..1193bd4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
@@ -0,0 +1,99 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifndef BT_COMPOUND_COLLISION_ALGORITHM_H
+#define BT_COMPOUND_COLLISION_ALGORITHM_H
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btDispatcher;
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "btCollisionCreateFunc.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+class btDispatcher;
+class btCollisionObject;
+
+class btCollisionShape;
+typedef bool (*btShapePairCallback)(const btCollisionShape* pShape0, const btCollisionShape* pShape1);
+extern btShapePairCallback gCompoundChildShapePairCallback;
+
+/// btCompoundCollisionAlgorithm  supports collision between CompoundCollisionShapes and other collision shapes
+class btCompoundCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+	btNodeStack stack2;
+	btManifoldArray manifoldArray;
+
+protected:
+	btAlignedObjectArray<btCollisionAlgorithm*> m_childCollisionAlgorithms;
+	bool m_isSwapped;
+
+	class btPersistentManifold* m_sharedManifold;
+	bool m_ownsManifold;
+
+	int m_compoundShapeRevision;  //to keep track of changes, so that childAlgorithm array can be updated
+
+	void removeChildAlgorithms();
+
+	void preallocateChildAlgorithms(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap);
+
+public:
+	btCompoundCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped);
+
+	virtual ~btCompoundCollisionAlgorithm();
+
+	btCollisionAlgorithm* getChildAlgorithm(int n) const
+	{
+		return m_childCollisionAlgorithms[n];
+	}
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		int i;
+		for (i = 0; i < m_childCollisionAlgorithms.size(); i++)
+		{
+			if (m_childCollisionAlgorithms[i])
+				m_childCollisionAlgorithms[i]->getAllContactManifolds(manifoldArray);
+		}
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCollisionAlgorithm));
+			return new (mem) btCompoundCollisionAlgorithm(ci, body0Wrap, body1Wrap, false);
+		}
+	};
+
+	struct SwappedCreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCollisionAlgorithm));
+			return new (mem) btCompoundCollisionAlgorithm(ci, body0Wrap, body1Wrap, true);
+		}
+	};
+};
+
+#endif  //BT_COMPOUND_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
new file mode 100644
index 0000000..044b60d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
@@ -0,0 +1,413 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#include "btCompoundCompoundCollisionAlgorithm.h"
+#include "LinearMath/btQuickprof.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btAabbUtil2.h"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+//USE_LOCAL_STACK will avoid most (often all) dynamic memory allocations due to resizing in processCollision and MycollideTT
+#define USE_LOCAL_STACK 1
+
+btShapePairCallback gCompoundCompoundChildShapePairCallback = 0;
+
+btCompoundCompoundCollisionAlgorithm::btCompoundCompoundCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped)
+	: btCompoundCollisionAlgorithm(ci, body0Wrap, body1Wrap, isSwapped)
+{
+	void* ptr = btAlignedAlloc(sizeof(btHashedSimplePairCache), 16);
+	m_childCollisionAlgorithmCache = new (ptr) btHashedSimplePairCache();
+
+	const btCollisionObjectWrapper* col0ObjWrap = body0Wrap;
+	btAssert(col0ObjWrap->getCollisionShape()->isCompound());
+
+	const btCollisionObjectWrapper* col1ObjWrap = body1Wrap;
+	btAssert(col1ObjWrap->getCollisionShape()->isCompound());
+
+	const btCompoundShape* compoundShape0 = static_cast<const btCompoundShape*>(col0ObjWrap->getCollisionShape());
+	m_compoundShapeRevision0 = compoundShape0->getUpdateRevision();
+
+	const btCompoundShape* compoundShape1 = static_cast<const btCompoundShape*>(col1ObjWrap->getCollisionShape());
+	m_compoundShapeRevision1 = compoundShape1->getUpdateRevision();
+}
+
+btCompoundCompoundCollisionAlgorithm::~btCompoundCompoundCollisionAlgorithm()
+{
+	removeChildAlgorithms();
+	m_childCollisionAlgorithmCache->~btHashedSimplePairCache();
+	btAlignedFree(m_childCollisionAlgorithmCache);
+}
+
+void btCompoundCompoundCollisionAlgorithm::getAllContactManifolds(btManifoldArray& manifoldArray)
+{
+	int i;
+	btSimplePairArray& pairs = m_childCollisionAlgorithmCache->getOverlappingPairArray();
+	for (i = 0; i < pairs.size(); i++)
+	{
+		if (pairs[i].m_userPointer)
+		{
+			((btCollisionAlgorithm*)pairs[i].m_userPointer)->getAllContactManifolds(manifoldArray);
+		}
+	}
+}
+
+void btCompoundCompoundCollisionAlgorithm::removeChildAlgorithms()
+{
+	btSimplePairArray& pairs = m_childCollisionAlgorithmCache->getOverlappingPairArray();
+
+	int numChildren = pairs.size();
+	int i;
+	for (i = 0; i < numChildren; i++)
+	{
+		if (pairs[i].m_userPointer)
+		{
+			btCollisionAlgorithm* algo = (btCollisionAlgorithm*)pairs[i].m_userPointer;
+			algo->~btCollisionAlgorithm();
+			m_dispatcher->freeCollisionAlgorithm(algo);
+		}
+	}
+	m_childCollisionAlgorithmCache->removeAllPairs();
+}
+
+struct btCompoundCompoundLeafCallback : btDbvt::ICollide
+{
+	int m_numOverlapPairs;
+
+	const btCollisionObjectWrapper* m_compound0ColObjWrap;
+	const btCollisionObjectWrapper* m_compound1ColObjWrap;
+	btDispatcher* m_dispatcher;
+	const btDispatcherInfo& m_dispatchInfo;
+	btManifoldResult* m_resultOut;
+
+	class btHashedSimplePairCache* m_childCollisionAlgorithmCache;
+
+	btPersistentManifold* m_sharedManifold;
+
+	btCompoundCompoundLeafCallback(const btCollisionObjectWrapper* compound1ObjWrap,
+								   const btCollisionObjectWrapper* compound0ObjWrap,
+								   btDispatcher* dispatcher,
+								   const btDispatcherInfo& dispatchInfo,
+								   btManifoldResult* resultOut,
+								   btHashedSimplePairCache* childAlgorithmsCache,
+								   btPersistentManifold* sharedManifold)
+		: m_numOverlapPairs(0), m_compound0ColObjWrap(compound1ObjWrap), m_compound1ColObjWrap(compound0ObjWrap), m_dispatcher(dispatcher), m_dispatchInfo(dispatchInfo), m_resultOut(resultOut), m_childCollisionAlgorithmCache(childAlgorithmsCache), m_sharedManifold(sharedManifold)
+	{
+	}
+
+	void Process(const btDbvtNode* leaf0, const btDbvtNode* leaf1)
+	{
+		BT_PROFILE("btCompoundCompoundLeafCallback::Process");
+		m_numOverlapPairs++;
+
+		int childIndex0 = leaf0->dataAsInt;
+		int childIndex1 = leaf1->dataAsInt;
+
+		btAssert(childIndex0 >= 0);
+		btAssert(childIndex1 >= 0);
+
+		const btCompoundShape* compoundShape0 = static_cast<const btCompoundShape*>(m_compound0ColObjWrap->getCollisionShape());
+		btAssert(childIndex0 < compoundShape0->getNumChildShapes());
+
+		const btCompoundShape* compoundShape1 = static_cast<const btCompoundShape*>(m_compound1ColObjWrap->getCollisionShape());
+		btAssert(childIndex1 < compoundShape1->getNumChildShapes());
+
+		const btCollisionShape* childShape0 = compoundShape0->getChildShape(childIndex0);
+		const btCollisionShape* childShape1 = compoundShape1->getChildShape(childIndex1);
+
+		//backup
+		btTransform orgTrans0 = m_compound0ColObjWrap->getWorldTransform();
+		const btTransform& childTrans0 = compoundShape0->getChildTransform(childIndex0);
+		btTransform newChildWorldTrans0 = orgTrans0 * childTrans0;
+
+		btTransform orgTrans1 = m_compound1ColObjWrap->getWorldTransform();
+		const btTransform& childTrans1 = compoundShape1->getChildTransform(childIndex1);
+		btTransform newChildWorldTrans1 = orgTrans1 * childTrans1;
+
+		//perform an AABB check first
+		btVector3 aabbMin0, aabbMax0, aabbMin1, aabbMax1;
+		childShape0->getAabb(newChildWorldTrans0, aabbMin0, aabbMax0);
+		childShape1->getAabb(newChildWorldTrans1, aabbMin1, aabbMax1);
+
+		btVector3 thresholdVec(m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold);
+
+		aabbMin0 -= thresholdVec;
+		aabbMax0 += thresholdVec;
+
+		if (gCompoundCompoundChildShapePairCallback)
+		{
+			if (!gCompoundCompoundChildShapePairCallback(childShape0, childShape1))
+				return;
+		}
+
+		if (TestAabbAgainstAabb2(aabbMin0, aabbMax0, aabbMin1, aabbMax1))
+		{
+			btCollisionObjectWrapper compoundWrap0(this->m_compound0ColObjWrap, childShape0, m_compound0ColObjWrap->getCollisionObject(), newChildWorldTrans0, -1, childIndex0);
+			btCollisionObjectWrapper compoundWrap1(this->m_compound1ColObjWrap, childShape1, m_compound1ColObjWrap->getCollisionObject(), newChildWorldTrans1, -1, childIndex1);
+
+			btSimplePair* pair = m_childCollisionAlgorithmCache->findPair(childIndex0, childIndex1);
+			bool removePair = false;
+			btCollisionAlgorithm* colAlgo = 0;
+			if (m_resultOut->m_closestPointDistanceThreshold > 0)
+			{
+				colAlgo = m_dispatcher->findAlgorithm(&compoundWrap0, &compoundWrap1, 0, BT_CLOSEST_POINT_ALGORITHMS);
+				removePair = true;
+			}
+			else
+			{
+				if (pair)
+				{
+					colAlgo = (btCollisionAlgorithm*)pair->m_userPointer;
+				}
+				else
+				{
+					colAlgo = m_dispatcher->findAlgorithm(&compoundWrap0, &compoundWrap1, m_sharedManifold, BT_CONTACT_POINT_ALGORITHMS);
+					pair = m_childCollisionAlgorithmCache->addOverlappingPair(childIndex0, childIndex1);
+					btAssert(pair);
+					pair->m_userPointer = colAlgo;
+				}
+			}
+
+			btAssert(colAlgo);
+
+			const btCollisionObjectWrapper* tmpWrap0 = 0;
+			const btCollisionObjectWrapper* tmpWrap1 = 0;
+
+			tmpWrap0 = m_resultOut->getBody0Wrap();
+			tmpWrap1 = m_resultOut->getBody1Wrap();
+
+			m_resultOut->setBody0Wrap(&compoundWrap0);
+			m_resultOut->setBody1Wrap(&compoundWrap1);
+
+			m_resultOut->setShapeIdentifiersA(-1, childIndex0);
+			m_resultOut->setShapeIdentifiersB(-1, childIndex1);
+
+			colAlgo->processCollision(&compoundWrap0, &compoundWrap1, m_dispatchInfo, m_resultOut);
+
+			m_resultOut->setBody0Wrap(tmpWrap0);
+			m_resultOut->setBody1Wrap(tmpWrap1);
+
+			if (removePair)
+			{
+				colAlgo->~btCollisionAlgorithm();
+				m_dispatcher->freeCollisionAlgorithm(colAlgo);
+			}
+		}
+	}
+};
+
+static DBVT_INLINE bool MyIntersect(const btDbvtAabbMm& a,
+									const btDbvtAabbMm& b, const btTransform& xform, btScalar distanceThreshold)
+{
+	btVector3 newmin, newmax;
+	btTransformAabb(b.Mins(), b.Maxs(), 0.f, xform, newmin, newmax);
+	newmin -= btVector3(distanceThreshold, distanceThreshold, distanceThreshold);
+	newmax += btVector3(distanceThreshold, distanceThreshold, distanceThreshold);
+	btDbvtAabbMm newb = btDbvtAabbMm::FromMM(newmin, newmax);
+	return Intersect(a, newb);
+}
+
+static inline void MycollideTT(const btDbvtNode* root0,
+							   const btDbvtNode* root1,
+							   const btTransform& xform,
+							   btCompoundCompoundLeafCallback* callback, btScalar distanceThreshold)
+{
+	if (root0 && root1)
+	{
+		int depth = 1;
+		int treshold = btDbvt::DOUBLE_STACKSIZE - 4;
+		btAlignedObjectArray<btDbvt::sStkNN> stkStack;
+#ifdef USE_LOCAL_STACK
+		ATTRIBUTE_ALIGNED16(btDbvt::sStkNN localStack[btDbvt::DOUBLE_STACKSIZE]);
+		stkStack.initializeFromBuffer(&localStack, btDbvt::DOUBLE_STACKSIZE, btDbvt::DOUBLE_STACKSIZE);
+#else
+		stkStack.resize(btDbvt::DOUBLE_STACKSIZE);
+#endif
+		stkStack[0] = btDbvt::sStkNN(root0, root1);
+		do
+		{
+			btDbvt::sStkNN p = stkStack[--depth];
+			if (MyIntersect(p.a->volume, p.b->volume, xform, distanceThreshold))
+			{
+				if (depth > treshold)
+				{
+					stkStack.resize(stkStack.size() * 2);
+					treshold = stkStack.size() - 4;
+				}
+				if (p.a->isinternal())
+				{
+					if (p.b->isinternal())
+					{
+						stkStack[depth++] = btDbvt::sStkNN(p.a->childs[0], p.b->childs[0]);
+						stkStack[depth++] = btDbvt::sStkNN(p.a->childs[1], p.b->childs[0]);
+						stkStack[depth++] = btDbvt::sStkNN(p.a->childs[0], p.b->childs[1]);
+						stkStack[depth++] = btDbvt::sStkNN(p.a->childs[1], p.b->childs[1]);
+					}
+					else
+					{
+						stkStack[depth++] = btDbvt::sStkNN(p.a->childs[0], p.b);
+						stkStack[depth++] = btDbvt::sStkNN(p.a->childs[1], p.b);
+					}
+				}
+				else
+				{
+					if (p.b->isinternal())
+					{
+						stkStack[depth++] = btDbvt::sStkNN(p.a, p.b->childs[0]);
+						stkStack[depth++] = btDbvt::sStkNN(p.a, p.b->childs[1]);
+					}
+					else
+					{
+						callback->Process(p.a, p.b);
+					}
+				}
+			}
+		} while (depth);
+	}
+}
+
+void btCompoundCompoundCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	const btCollisionObjectWrapper* col0ObjWrap = body0Wrap;
+	const btCollisionObjectWrapper* col1ObjWrap = body1Wrap;
+
+	btAssert(col0ObjWrap->getCollisionShape()->isCompound());
+	btAssert(col1ObjWrap->getCollisionShape()->isCompound());
+	const btCompoundShape* compoundShape0 = static_cast<const btCompoundShape*>(col0ObjWrap->getCollisionShape());
+	const btCompoundShape* compoundShape1 = static_cast<const btCompoundShape*>(col1ObjWrap->getCollisionShape());
+
+	const btDbvt* tree0 = compoundShape0->getDynamicAabbTree();
+	const btDbvt* tree1 = compoundShape1->getDynamicAabbTree();
+	if (!tree0 || !tree1)
+	{
+		return btCompoundCollisionAlgorithm::processCollision(body0Wrap, body1Wrap, dispatchInfo, resultOut);
+	}
+	///btCompoundShape might have changed:
+	////make sure the internal child collision algorithm caches are still valid
+	if ((compoundShape0->getUpdateRevision() != m_compoundShapeRevision0) || (compoundShape1->getUpdateRevision() != m_compoundShapeRevision1))
+	{
+		///clear all
+		removeChildAlgorithms();
+		m_compoundShapeRevision0 = compoundShape0->getUpdateRevision();
+		m_compoundShapeRevision1 = compoundShape1->getUpdateRevision();
+	}
+
+	///we need to refresh all contact manifolds
+	///note that we should actually recursively traverse all children, btCompoundShape can nested more then 1 level deep
+	///so we should add a 'refreshManifolds' in the btCollisionAlgorithm
+	{
+		int i;
+		btManifoldArray manifoldArray;
+#ifdef USE_LOCAL_STACK
+		btPersistentManifold localManifolds[4];
+		manifoldArray.initializeFromBuffer(&localManifolds, 0, 4);
+#endif
+		btSimplePairArray& pairs = m_childCollisionAlgorithmCache->getOverlappingPairArray();
+		for (i = 0; i < pairs.size(); i++)
+		{
+			if (pairs[i].m_userPointer)
+			{
+				btCollisionAlgorithm* algo = (btCollisionAlgorithm*)pairs[i].m_userPointer;
+				algo->getAllContactManifolds(manifoldArray);
+				for (int m = 0; m < manifoldArray.size(); m++)
+				{
+					if (manifoldArray[m]->getNumContacts())
+					{
+						resultOut->setPersistentManifold(manifoldArray[m]);
+						resultOut->refreshContactPoints();
+						resultOut->setPersistentManifold(0);
+					}
+				}
+				manifoldArray.resize(0);
+			}
+		}
+	}
+
+	btCompoundCompoundLeafCallback callback(col0ObjWrap, col1ObjWrap, this->m_dispatcher, dispatchInfo, resultOut, this->m_childCollisionAlgorithmCache, m_sharedManifold);
+
+	const btTransform xform = col0ObjWrap->getWorldTransform().inverse() * col1ObjWrap->getWorldTransform();
+	MycollideTT(tree0->m_root, tree1->m_root, xform, &callback, resultOut->m_closestPointDistanceThreshold);
+
+	//printf("#compound-compound child/leaf overlap =%d                      \r",callback.m_numOverlapPairs);
+
+	//remove non-overlapping child pairs
+
+	{
+		btAssert(m_removePairs.size() == 0);
+
+		//iterate over all children, perform an AABB check inside ProcessChildShape
+		btSimplePairArray& pairs = m_childCollisionAlgorithmCache->getOverlappingPairArray();
+
+		int i;
+		btManifoldArray manifoldArray;
+
+		btVector3 aabbMin0, aabbMax0, aabbMin1, aabbMax1;
+
+		for (i = 0; i < pairs.size(); i++)
+		{
+			if (pairs[i].m_userPointer)
+			{
+				btCollisionAlgorithm* algo = (btCollisionAlgorithm*)pairs[i].m_userPointer;
+
+				{
+					const btCollisionShape* childShape0 = 0;
+
+					btTransform newChildWorldTrans0;
+					childShape0 = compoundShape0->getChildShape(pairs[i].m_indexA);
+					const btTransform& childTrans0 = compoundShape0->getChildTransform(pairs[i].m_indexA);
+					newChildWorldTrans0 = col0ObjWrap->getWorldTransform() * childTrans0;
+					childShape0->getAabb(newChildWorldTrans0, aabbMin0, aabbMax0);
+				}
+				btVector3 thresholdVec(resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold);
+				aabbMin0 -= thresholdVec;
+				aabbMax0 += thresholdVec;
+				{
+					const btCollisionShape* childShape1 = 0;
+					btTransform newChildWorldTrans1;
+
+					childShape1 = compoundShape1->getChildShape(pairs[i].m_indexB);
+					const btTransform& childTrans1 = compoundShape1->getChildTransform(pairs[i].m_indexB);
+					newChildWorldTrans1 = col1ObjWrap->getWorldTransform() * childTrans1;
+					childShape1->getAabb(newChildWorldTrans1, aabbMin1, aabbMax1);
+				}
+
+				aabbMin1 -= thresholdVec;
+				aabbMax1 += thresholdVec;
+
+				if (!TestAabbAgainstAabb2(aabbMin0, aabbMax0, aabbMin1, aabbMax1))
+				{
+					algo->~btCollisionAlgorithm();
+					m_dispatcher->freeCollisionAlgorithm(algo);
+					m_removePairs.push_back(btSimplePair(pairs[i].m_indexA, pairs[i].m_indexB));
+				}
+			}
+		}
+		for (int i = 0; i < m_removePairs.size(); i++)
+		{
+			m_childCollisionAlgorithmCache->removeOverlappingPair(m_removePairs[i].m_indexA, m_removePairs[i].m_indexB);
+		}
+		m_removePairs.clear();
+	}
+}
+
+btScalar btCompoundCompoundCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	btAssert(0);
+	return 0.f;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
new file mode 100644
index 0000000..a940d84
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
@@ -0,0 +1,82 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#ifndef BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H
+#define BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H
+
+#include "btCompoundCollisionAlgorithm.h"
+
+#include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btDispatcher;
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "BulletCollision/CollisionDispatch/btHashedSimplePairCache.h"
+class btDispatcher;
+class btCollisionObject;
+
+class btCollisionShape;
+
+extern btShapePairCallback gCompoundCompoundChildShapePairCallback;
+
+/// btCompoundCompoundCollisionAlgorithm  supports collision between two btCompoundCollisionShape shapes
+class btCompoundCompoundCollisionAlgorithm : public btCompoundCollisionAlgorithm
+{
+	class btHashedSimplePairCache* m_childCollisionAlgorithmCache;
+	btSimplePairArray m_removePairs;
+
+	int m_compoundShapeRevision0;  //to keep track of changes, so that childAlgorithm array can be updated
+	int m_compoundShapeRevision1;
+
+	void removeChildAlgorithms();
+
+	//	void	preallocateChildAlgorithms(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap);
+
+public:
+	btCompoundCompoundCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped);
+
+	virtual ~btCompoundCompoundCollisionAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray);
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCompoundCollisionAlgorithm));
+			return new (mem) btCompoundCompoundCollisionAlgorithm(ci, body0Wrap, body1Wrap, false);
+		}
+	};
+
+	struct SwappedCreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCompoundCollisionAlgorithm));
+			return new (mem) btCompoundCompoundCollisionAlgorithm(ci, body0Wrap, body1Wrap, true);
+		}
+	};
+};
+
+#endif  //BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
new file mode 100644
index 0000000..f9dfc0a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
@@ -0,0 +1,211 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvex2dConvex2dAlgorithm.h"
+
+//#include <stdio.h>
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btCapsuleShape.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+btConvex2dConvex2dAlgorithm::CreateFunc::CreateFunc(btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver)
+{
+	m_simplexSolver = simplexSolver;
+	m_pdSolver = pdSolver;
+}
+
+btConvex2dConvex2dAlgorithm::CreateFunc::~CreateFunc()
+{
+}
+
+btConvex2dConvex2dAlgorithm::btConvex2dConvex2dAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver, int /* numPerturbationIterations */, int /* minimumPointsPerturbationThreshold */)
+	: btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
+	  m_simplexSolver(simplexSolver),
+	  m_pdSolver(pdSolver),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf),
+	  m_lowLevelOfDetail(false)
+{
+	(void)body0Wrap;
+	(void)body1Wrap;
+}
+
+btConvex2dConvex2dAlgorithm::~btConvex2dConvex2dAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btConvex2dConvex2dAlgorithm ::setLowLevelOfDetail(bool useLowLevel)
+{
+	m_lowLevelOfDetail = useLowLevel;
+}
+
+extern btScalar gContactBreakingThreshold;
+
+//
+// Convex-Convex collision algorithm
+//
+void btConvex2dConvex2dAlgorithm ::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	if (!m_manifoldPtr)
+	{
+		//swapped?
+		m_manifoldPtr = m_dispatcher->getNewManifold(body0Wrap->getCollisionObject(), body1Wrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+	resultOut->setPersistentManifold(m_manifoldPtr);
+
+	//comment-out next line to test multi-contact generation
+	//resultOut->getPersistentManifold()->clearManifold();
+
+	const btConvexShape* min0 = static_cast<const btConvexShape*>(body0Wrap->getCollisionShape());
+	const btConvexShape* min1 = static_cast<const btConvexShape*>(body1Wrap->getCollisionShape());
+
+	btVector3 normalOnB;
+	btVector3 pointOnBWorld;
+
+	{
+		btGjkPairDetector::ClosestPointInput input;
+
+		btGjkPairDetector gjkPairDetector(min0, min1, m_simplexSolver, m_pdSolver);
+		//TODO: if (dispatchInfo.m_useContinuous)
+		gjkPairDetector.setMinkowskiA(min0);
+		gjkPairDetector.setMinkowskiB(min1);
+
+		{
+			input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactBreakingThreshold();
+			input.m_maximumDistanceSquared *= input.m_maximumDistanceSquared;
+		}
+
+		input.m_transformA = body0Wrap->getWorldTransform();
+		input.m_transformB = body1Wrap->getWorldTransform();
+
+		gjkPairDetector.getClosestPoints(input, *resultOut, dispatchInfo.m_debugDraw);
+
+		btVector3 v0, v1;
+		btVector3 sepNormalWorldSpace;
+	}
+
+	if (m_ownManifold)
+	{
+		resultOut->refreshContactPoints();
+	}
+}
+
+btScalar btConvex2dConvex2dAlgorithm::calculateTimeOfImpact(btCollisionObject* col0, btCollisionObject* col1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	///Rather then checking ALL pairs, only calculate TOI when motion exceeds threshold
+
+	///Linear motion for one of objects needs to exceed m_ccdSquareMotionThreshold
+	///col0->m_worldTransform,
+	btScalar resultFraction = btScalar(1.);
+
+	btScalar squareMot0 = (col0->getInterpolationWorldTransform().getOrigin() - col0->getWorldTransform().getOrigin()).length2();
+	btScalar squareMot1 = (col1->getInterpolationWorldTransform().getOrigin() - col1->getWorldTransform().getOrigin()).length2();
+
+	if (squareMot0 < col0->getCcdSquareMotionThreshold() &&
+		squareMot1 < col1->getCcdSquareMotionThreshold())
+		return resultFraction;
+
+	//An adhoc way of testing the Continuous Collision Detection algorithms
+	//One object is approximated as a sphere, to simplify things
+	//Starting in penetration should report no time of impact
+	//For proper CCD, better accuracy and handling of 'allowed' penetration should be added
+	//also the mainloop of the physics should have a kind of toi queue (something like Brian Mirtich's application of Timewarp for Rigidbodies)
+
+	/// Convex0 against sphere for Convex1
+	{
+		btConvexShape* convex0 = static_cast<btConvexShape*>(col0->getCollisionShape());
+
+		btSphereShape sphere1(col1->getCcdSweptSphereRadius());  //todo: allow non-zero sphere sizes, for better approximation
+		btConvexCast::CastResult result;
+		btVoronoiSimplexSolver voronoiSimplex;
+		//SubsimplexConvexCast ccd0(&sphere,min0,&voronoiSimplex);
+		///Simplification, one object is simplified as a sphere
+		btGjkConvexCast ccd1(convex0, &sphere1, &voronoiSimplex);
+		//ContinuousConvexCollision ccd(min0,min1,&voronoiSimplex,0);
+		if (ccd1.calcTimeOfImpact(col0->getWorldTransform(), col0->getInterpolationWorldTransform(),
+								  col1->getWorldTransform(), col1->getInterpolationWorldTransform(), result))
+		{
+			//store result.m_fraction in both bodies
+
+			if (col0->getHitFraction() > result.m_fraction)
+				col0->setHitFraction(result.m_fraction);
+
+			if (col1->getHitFraction() > result.m_fraction)
+				col1->setHitFraction(result.m_fraction);
+
+			if (resultFraction > result.m_fraction)
+				resultFraction = result.m_fraction;
+		}
+	}
+
+	/// Sphere (for convex0) against Convex1
+	{
+		btConvexShape* convex1 = static_cast<btConvexShape*>(col1->getCollisionShape());
+
+		btSphereShape sphere0(col0->getCcdSweptSphereRadius());  //todo: allow non-zero sphere sizes, for better approximation
+		btConvexCast::CastResult result;
+		btVoronoiSimplexSolver voronoiSimplex;
+		//SubsimplexConvexCast ccd0(&sphere,min0,&voronoiSimplex);
+		///Simplification, one object is simplified as a sphere
+		btGjkConvexCast ccd1(&sphere0, convex1, &voronoiSimplex);
+		//ContinuousConvexCollision ccd(min0,min1,&voronoiSimplex,0);
+		if (ccd1.calcTimeOfImpact(col0->getWorldTransform(), col0->getInterpolationWorldTransform(),
+								  col1->getWorldTransform(), col1->getInterpolationWorldTransform(), result))
+		{
+			//store result.m_fraction in both bodies
+
+			if (col0->getHitFraction() > result.m_fraction)
+				col0->setHitFraction(result.m_fraction);
+
+			if (col1->getHitFraction() > result.m_fraction)
+				col1->setHitFraction(result.m_fraction);
+
+			if (resultFraction > result.m_fraction)
+				resultFraction = result.m_fraction;
+		}
+	}
+
+	return resultFraction;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
new file mode 100644
index 0000000..e6a2504
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
@@ -0,0 +1,83 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H
+#define BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H
+
+#include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "LinearMath/btTransformUtil.h"  //for btConvexSeparatingDistanceUtil
+
+class btConvexPenetrationDepthSolver;
+
+///The convex2dConvex2dAlgorithm collision algorithm support 2d collision detection for btConvex2dShape
+///Currently it requires the btMinkowskiPenetrationDepthSolver, it has support for 2d penetration depth computation
+class btConvex2dConvex2dAlgorithm : public btActivatingCollisionAlgorithm
+{
+	btSimplexSolverInterface* m_simplexSolver;
+	btConvexPenetrationDepthSolver* m_pdSolver;
+
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+	bool m_lowLevelOfDetail;
+
+public:
+	btConvex2dConvex2dAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver, int numPerturbationIterations, int minimumPointsPerturbationThreshold);
+
+	virtual ~btConvex2dConvex2dAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		///should we use m_ownManifold to avoid adding duplicates?
+		if (m_manifoldPtr && m_ownManifold)
+			manifoldArray.push_back(m_manifoldPtr);
+	}
+
+	void setLowLevelOfDetail(bool useLowLevel);
+
+	const btPersistentManifold* getManifold()
+	{
+		return m_manifoldPtr;
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		btConvexPenetrationDepthSolver* m_pdSolver;
+		btSimplexSolverInterface* m_simplexSolver;
+		int m_numPerturbationIterations;
+		int m_minimumPointsPerturbationThreshold;
+
+		CreateFunc(btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver);
+
+		virtual ~CreateFunc();
+
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvex2dConvex2dAlgorithm));
+			return new (mem) btConvex2dConvex2dAlgorithm(ci.m_manifold, ci, body0Wrap, body1Wrap, m_simplexSolver, m_pdSolver, m_numPerturbationIterations, m_minimumPointsPerturbationThreshold);
+		}
+	};
+};
+
+#endif  //BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
new file mode 100644
index 0000000..95bce9e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
@@ -0,0 +1,416 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvexConcaveCollisionAlgorithm.h"
+#include "LinearMath/btQuickprof.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionShapes/btConcaveShape.h"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+#include "BulletCollision/CollisionShapes/btSdfCollisionShape.h"
+
+btConvexConcaveCollisionAlgorithm::btConvexConcaveCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped)
+	: btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
+	  m_btConvexTriangleCallback(ci.m_dispatcher1, body0Wrap, body1Wrap, isSwapped),
+	  m_isSwapped(isSwapped)
+{
+}
+
+btConvexConcaveCollisionAlgorithm::~btConvexConcaveCollisionAlgorithm()
+{
+}
+
+void btConvexConcaveCollisionAlgorithm::getAllContactManifolds(btManifoldArray& manifoldArray)
+{
+	if (m_btConvexTriangleCallback.m_manifoldPtr)
+	{
+		manifoldArray.push_back(m_btConvexTriangleCallback.m_manifoldPtr);
+	}
+}
+
+btConvexTriangleCallback::btConvexTriangleCallback(btDispatcher* dispatcher, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped) : m_dispatcher(dispatcher),
+																																													 m_dispatchInfoPtr(0)
+{
+	m_convexBodyWrap = isSwapped ? body1Wrap : body0Wrap;
+	m_triBodyWrap = isSwapped ? body0Wrap : body1Wrap;
+
+	//
+	// create the manifold from the dispatcher 'manifold pool'
+	//
+	m_manifoldPtr = m_dispatcher->getNewManifold(m_convexBodyWrap->getCollisionObject(), m_triBodyWrap->getCollisionObject());
+
+	clearCache();
+}
+
+btConvexTriangleCallback::~btConvexTriangleCallback()
+{
+	clearCache();
+	m_dispatcher->releaseManifold(m_manifoldPtr);
+}
+
+void btConvexTriangleCallback::clearCache()
+{
+	m_dispatcher->clearManifold(m_manifoldPtr);
+}
+
+void btConvexTriangleCallback::processTriangle(btVector3* triangle, int partId, int triangleIndex)
+{
+	BT_PROFILE("btConvexTriangleCallback::processTriangle");
+
+	if (!TestTriangleAgainstAabb2(triangle, m_aabbMin, m_aabbMax))
+	{
+		return;
+	}
+
+	//just for debugging purposes
+	//printf("triangle %d",m_triangleCount++);
+
+	btCollisionAlgorithmConstructionInfo ci;
+	ci.m_dispatcher1 = m_dispatcher;
+
+#if 0	
+	
+	///debug drawing of the overlapping triangles
+	if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && (m_dispatchInfoPtr->m_debugDraw->getDebugMode() &btIDebugDraw::DBG_DrawWireframe ))
+	{
+		const btCollisionObject* ob = const_cast<btCollisionObject*>(m_triBodyWrap->getCollisionObject());
+		btVector3 color(1,1,0);
+		btTransform& tr = ob->getWorldTransform();
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(triangle[1]),color);
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(triangle[2]),color);
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]),tr(triangle[0]),color);
+	}
+#endif
+
+	if (m_convexBodyWrap->getCollisionShape()->isConvex())
+	{
+#ifdef BT_ENABLE_CONVEX_CONCAVE_EARLY_OUT
+    //todo: check this issue https://github.com/bulletphysics/bullet3/issues/4263
+		//an early out optimisation if the object is separated from the triangle
+		//projected on the triangle normal)
+		{
+			const btVector3 v0 = m_triBodyWrap->getWorldTransform()*triangle[0];
+			const btVector3 v1 = m_triBodyWrap->getWorldTransform()*triangle[1];
+			const btVector3 v2 = m_triBodyWrap->getWorldTransform()*triangle[2];
+
+			btVector3 triangle_normal_world = ( v1 - v0).cross(v2 - v0);
+			triangle_normal_world.normalize();
+
+		    btConvexShape* convex = (btConvexShape*)m_convexBodyWrap->getCollisionShape();
+			
+			btVector3 localPt = convex->localGetSupportingVertex(m_convexBodyWrap->getWorldTransform().getBasis().inverse()*triangle_normal_world);
+			btVector3 worldPt = m_convexBodyWrap->getWorldTransform()*localPt;
+			//now check if this is fully on one side of the triangle
+			btScalar proj_distPt = triangle_normal_world.dot(worldPt);
+			btScalar proj_distTr = triangle_normal_world.dot(v0);
+			btScalar contact_threshold = m_manifoldPtr->getContactBreakingThreshold()+ m_resultOut->m_closestPointDistanceThreshold;
+			btScalar dist = proj_distTr - proj_distPt;
+			if (dist > contact_threshold)
+				return;
+
+			//also check the other side of the triangle
+			triangle_normal_world*=-1;
+
+			localPt = convex->localGetSupportingVertex(m_convexBodyWrap->getWorldTransform().getBasis().inverse()*triangle_normal_world);
+			worldPt = m_convexBodyWrap->getWorldTransform()*localPt;
+			//now check if this is fully on one side of the triangle
+			proj_distPt = triangle_normal_world.dot(worldPt);
+			proj_distTr = triangle_normal_world.dot(v0);
+			
+			dist = proj_distTr - proj_distPt;
+			if (dist > contact_threshold)
+				return;
+        }
+#endif //BT_ENABLE_CONVEX_CONCAVE_EARLY_OUT
+
+		btTriangleShape tm(triangle[0], triangle[1], triangle[2]);
+		tm.setMargin(m_collisionMarginTriangle);
+
+		btCollisionObjectWrapper triObWrap(m_triBodyWrap, &tm, m_triBodyWrap->getCollisionObject(), m_triBodyWrap->getWorldTransform(), partId, triangleIndex);  //correct transform?
+		btCollisionAlgorithm* colAlgo = 0;
+
+		if (m_resultOut->m_closestPointDistanceThreshold > 0)
+		{
+			colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBodyWrap, &triObWrap, 0, BT_CLOSEST_POINT_ALGORITHMS);
+		}
+		else
+		{
+			colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBodyWrap, &triObWrap, m_manifoldPtr, BT_CONTACT_POINT_ALGORITHMS);
+		}
+		const btCollisionObjectWrapper* tmpWrap = 0;
+
+		if (m_resultOut->getBody0Internal() == m_triBodyWrap->getCollisionObject())
+		{
+			tmpWrap = m_resultOut->getBody0Wrap();
+			m_resultOut->setBody0Wrap(&triObWrap);
+			m_resultOut->setShapeIdentifiersA(partId, triangleIndex);
+		}
+		else
+		{
+			tmpWrap = m_resultOut->getBody1Wrap();
+			m_resultOut->setBody1Wrap(&triObWrap);
+			m_resultOut->setShapeIdentifiersB(partId, triangleIndex);
+		}
+
+		{
+			BT_PROFILE("processCollision (GJK?)");
+			colAlgo->processCollision(m_convexBodyWrap, &triObWrap, *m_dispatchInfoPtr, m_resultOut);
+		}
+
+		if (m_resultOut->getBody0Internal() == m_triBodyWrap->getCollisionObject())
+		{
+			m_resultOut->setBody0Wrap(tmpWrap);
+		}
+		else
+		{
+			m_resultOut->setBody1Wrap(tmpWrap);
+		}
+
+		colAlgo->~btCollisionAlgorithm();
+		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
+	}
+}
+
+void btConvexTriangleCallback::setTimeStepAndCounters(btScalar collisionMarginTriangle, const btDispatcherInfo& dispatchInfo, const btCollisionObjectWrapper* convexBodyWrap, const btCollisionObjectWrapper* triBodyWrap, btManifoldResult* resultOut)
+{
+	m_convexBodyWrap = convexBodyWrap;
+	m_triBodyWrap = triBodyWrap;
+
+	m_dispatchInfoPtr = &dispatchInfo;
+	m_collisionMarginTriangle = collisionMarginTriangle;
+	m_resultOut = resultOut;
+
+	//recalc aabbs
+	btTransform convexInTriangleSpace;
+	convexInTriangleSpace = m_triBodyWrap->getWorldTransform().inverse() * m_convexBodyWrap->getWorldTransform();
+	const btCollisionShape* convexShape = static_cast<const btCollisionShape*>(m_convexBodyWrap->getCollisionShape());
+	//CollisionShape* triangleShape = static_cast<btCollisionShape*>(triBody->m_collisionShape);
+	convexShape->getAabb(convexInTriangleSpace, m_aabbMin, m_aabbMax);
+	btScalar extraMargin = collisionMarginTriangle + resultOut->m_closestPointDistanceThreshold;
+
+	btVector3 extra(extraMargin, extraMargin, extraMargin);
+
+	m_aabbMax += extra;
+	m_aabbMin -= extra;
+}
+
+void btConvexConcaveCollisionAlgorithm::clearCache()
+{
+	m_btConvexTriangleCallback.clearCache();
+}
+
+void btConvexConcaveCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	BT_PROFILE("btConvexConcaveCollisionAlgorithm::processCollision");
+
+	const btCollisionObjectWrapper* convexBodyWrap = m_isSwapped ? body1Wrap : body0Wrap;
+	const btCollisionObjectWrapper* triBodyWrap = m_isSwapped ? body0Wrap : body1Wrap;
+
+	if (triBodyWrap->getCollisionShape()->isConcave())
+	{
+		if (triBodyWrap->getCollisionShape()->getShapeType() == SDF_SHAPE_PROXYTYPE)
+		{
+			btSdfCollisionShape* sdfShape = (btSdfCollisionShape*)triBodyWrap->getCollisionShape();
+			if (convexBodyWrap->getCollisionShape()->isConvex())
+			{
+				btConvexShape* convex = (btConvexShape*)convexBodyWrap->getCollisionShape();
+				btAlignedObjectArray<btVector3> queryVertices;
+
+				if (convex->isPolyhedral())
+				{
+					btPolyhedralConvexShape* poly = (btPolyhedralConvexShape*)convex;
+					for (int v = 0; v < poly->getNumVertices(); v++)
+					{
+						btVector3 vtx;
+						poly->getVertex(v, vtx);
+						queryVertices.push_back(vtx);
+					}
+				}
+				btScalar maxDist = SIMD_EPSILON;
+
+				if (convex->getShapeType() == SPHERE_SHAPE_PROXYTYPE)
+				{
+					queryVertices.push_back(btVector3(0, 0, 0));
+					btSphereShape* sphere = (btSphereShape*)convex;
+					maxDist = sphere->getRadius() + SIMD_EPSILON;
+				}
+				if (queryVertices.size())
+				{
+					resultOut->setPersistentManifold(m_btConvexTriangleCallback.m_manifoldPtr);
+					//m_btConvexTriangleCallback.m_manifoldPtr->clearManifold();
+
+					btPolyhedralConvexShape* poly = (btPolyhedralConvexShape*)convex;
+					for (int v = 0; v < queryVertices.size(); v++)
+					{
+						const btVector3& vtx = queryVertices[v];
+						btVector3 vtxWorldSpace = convexBodyWrap->getWorldTransform() * vtx;
+						btVector3 vtxInSdf = triBodyWrap->getWorldTransform().invXform(vtxWorldSpace);
+
+						btVector3 normalLocal;
+						btScalar dist;
+						if (sdfShape->queryPoint(vtxInSdf, dist, normalLocal))
+						{
+							if (dist <= maxDist)
+							{
+								normalLocal.safeNormalize();
+								btVector3 normal = triBodyWrap->getWorldTransform().getBasis() * normalLocal;
+
+								if (convex->getShapeType() == SPHERE_SHAPE_PROXYTYPE)
+								{
+									btSphereShape* sphere = (btSphereShape*)convex;
+									dist -= sphere->getRadius();
+									vtxWorldSpace -= sphere->getRadius() * normal;
+								}
+								resultOut->addContactPoint(normal, vtxWorldSpace - normal * dist, dist);
+							}
+						}
+					}
+					resultOut->refreshContactPoints();
+				}
+			}
+		}
+		else
+		{
+			const btConcaveShape* concaveShape = static_cast<const btConcaveShape*>(triBodyWrap->getCollisionShape());
+
+			if (convexBodyWrap->getCollisionShape()->isConvex())
+			{
+				btScalar collisionMarginTriangle = concaveShape->getMargin();
+
+				resultOut->setPersistentManifold(m_btConvexTriangleCallback.m_manifoldPtr);
+				m_btConvexTriangleCallback.setTimeStepAndCounters(collisionMarginTriangle, dispatchInfo, convexBodyWrap, triBodyWrap, resultOut);
+
+				m_btConvexTriangleCallback.m_manifoldPtr->setBodies(convexBodyWrap->getCollisionObject(), triBodyWrap->getCollisionObject());
+
+				concaveShape->processAllTriangles(&m_btConvexTriangleCallback, m_btConvexTriangleCallback.getAabbMin(), m_btConvexTriangleCallback.getAabbMax());
+
+				resultOut->refreshContactPoints();
+
+				m_btConvexTriangleCallback.clearWrapperData();
+			}
+		}
+	}
+}
+
+btScalar btConvexConcaveCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	btCollisionObject* convexbody = m_isSwapped ? body1 : body0;
+	btCollisionObject* triBody = m_isSwapped ? body0 : body1;
+
+	//quick approximation using raycast, todo: hook up to the continuous collision detection (one of the btConvexCast)
+
+	//only perform CCD above a certain threshold, this prevents blocking on the long run
+	//because object in a blocked ccd state (hitfraction<1) get their linear velocity halved each frame...
+	btScalar squareMot0 = (convexbody->getInterpolationWorldTransform().getOrigin() - convexbody->getWorldTransform().getOrigin()).length2();
+	if (squareMot0 < convexbody->getCcdSquareMotionThreshold())
+	{
+		return btScalar(1.);
+	}
+
+	//const btVector3& from = convexbody->m_worldTransform.getOrigin();
+	//btVector3 to = convexbody->m_interpolationWorldTransform.getOrigin();
+	//todo: only do if the motion exceeds the 'radius'
+
+	btTransform triInv = triBody->getWorldTransform().inverse();
+	btTransform convexFromLocal = triInv * convexbody->getWorldTransform();
+	btTransform convexToLocal = triInv * convexbody->getInterpolationWorldTransform();
+
+	struct LocalTriangleSphereCastCallback : public btTriangleCallback
+	{
+		btTransform m_ccdSphereFromTrans;
+		btTransform m_ccdSphereToTrans;
+		btTransform m_meshTransform;
+
+		btScalar m_ccdSphereRadius;
+		btScalar m_hitFraction;
+
+		LocalTriangleSphereCastCallback(const btTransform& from, const btTransform& to, btScalar ccdSphereRadius, btScalar hitFraction)
+			: m_ccdSphereFromTrans(from),
+			  m_ccdSphereToTrans(to),
+			  m_ccdSphereRadius(ccdSphereRadius),
+			  m_hitFraction(hitFraction)
+		{
+		}
+
+		virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+		{
+			BT_PROFILE("processTriangle");
+			(void)partId;
+			(void)triangleIndex;
+			//do a swept sphere for now
+			btTransform ident;
+			ident.setIdentity();
+			btConvexCast::CastResult castResult;
+			castResult.m_fraction = m_hitFraction;
+			btSphereShape pointShape(m_ccdSphereRadius);
+			btTriangleShape triShape(triangle[0], triangle[1], triangle[2]);
+			btVoronoiSimplexSolver simplexSolver;
+			btSubsimplexConvexCast convexCaster(&pointShape, &triShape, &simplexSolver);
+			//GjkConvexCast	convexCaster(&pointShape,convexShape,&simplexSolver);
+			//ContinuousConvexCollision convexCaster(&pointShape,convexShape,&simplexSolver,0);
+			//local space?
+
+			if (convexCaster.calcTimeOfImpact(m_ccdSphereFromTrans, m_ccdSphereToTrans,
+											  ident, ident, castResult))
+			{
+				if (m_hitFraction > castResult.m_fraction)
+					m_hitFraction = castResult.m_fraction;
+			}
+		}
+	};
+
+	if (triBody->getCollisionShape()->isConcave())
+	{
+		btVector3 rayAabbMin = convexFromLocal.getOrigin();
+		rayAabbMin.setMin(convexToLocal.getOrigin());
+		btVector3 rayAabbMax = convexFromLocal.getOrigin();
+		rayAabbMax.setMax(convexToLocal.getOrigin());
+		btScalar ccdRadius0 = convexbody->getCcdSweptSphereRadius();
+		rayAabbMin -= btVector3(ccdRadius0, ccdRadius0, ccdRadius0);
+		rayAabbMax += btVector3(ccdRadius0, ccdRadius0, ccdRadius0);
+
+		btScalar curHitFraction = btScalar(1.);  //is this available?
+		LocalTriangleSphereCastCallback raycastCallback(convexFromLocal, convexToLocal,
+														convexbody->getCcdSweptSphereRadius(), curHitFraction);
+
+		raycastCallback.m_hitFraction = convexbody->getHitFraction();
+
+		btCollisionObject* concavebody = triBody;
+
+		btConcaveShape* triangleMesh = (btConcaveShape*)concavebody->getCollisionShape();
+
+		if (triangleMesh)
+		{
+			triangleMesh->processAllTriangles(&raycastCallback, rayAabbMin, rayAabbMax);
+		}
+
+		if (raycastCallback.m_hitFraction < convexbody->getHitFraction())
+		{
+			convexbody->setHitFraction(raycastCallback.m_hitFraction);
+			return raycastCallback.m_hitFraction;
+		}
+	}
+
+	return btScalar(1.);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
new file mode 100644
index 0000000..8d86daf
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
@@ -0,0 +1,117 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H
+#define BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btDispatcher;
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "btCollisionCreateFunc.h"
+
+///For each triangle in the concave mesh that overlaps with the AABB of a convex (m_convexProxy), processTriangle is called.
+ATTRIBUTE_ALIGNED16(class)
+btConvexTriangleCallback : public btTriangleCallback
+{
+	btVector3 m_aabbMin;
+	btVector3 m_aabbMax;
+
+	const btCollisionObjectWrapper* m_convexBodyWrap;
+	const btCollisionObjectWrapper* m_triBodyWrap;
+
+	btManifoldResult* m_resultOut;
+	btDispatcher* m_dispatcher;
+	const btDispatcherInfo* m_dispatchInfoPtr;
+	btScalar m_collisionMarginTriangle;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_triangleCount;
+
+	btPersistentManifold* m_manifoldPtr;
+
+	btConvexTriangleCallback(btDispatcher * dispatcher, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped);
+
+	void setTimeStepAndCounters(btScalar collisionMarginTriangle, const btDispatcherInfo& dispatchInfo, const btCollisionObjectWrapper* convexBodyWrap, const btCollisionObjectWrapper* triBodyWrap, btManifoldResult* resultOut);
+
+	void clearWrapperData()
+	{
+		m_convexBodyWrap = 0;
+		m_triBodyWrap = 0;
+	}
+	virtual ~btConvexTriangleCallback();
+
+	virtual void processTriangle(btVector3 * triangle, int partId, int triangleIndex);
+
+	void clearCache();
+
+	SIMD_FORCE_INLINE const btVector3& getAabbMin() const
+	{
+		return m_aabbMin;
+	}
+	SIMD_FORCE_INLINE const btVector3& getAabbMax() const
+	{
+		return m_aabbMax;
+	}
+};
+
+/// btConvexConcaveCollisionAlgorithm  supports collision between convex shapes and (concave) trianges meshes.
+ATTRIBUTE_ALIGNED16(class)
+btConvexConcaveCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+	btConvexTriangleCallback m_btConvexTriangleCallback;
+
+	bool m_isSwapped;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConvexConcaveCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped);
+
+	virtual ~btConvexConcaveCollisionAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	btScalar calculateTimeOfImpact(btCollisionObject * body0, btCollisionObject * body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray & manifoldArray);
+
+	void clearCache();
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
+			return new (mem) btConvexConcaveCollisionAlgorithm(ci, body0Wrap, body1Wrap, false);
+		}
+	};
+
+	struct SwappedCreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
+			return new (mem) btConvexConcaveCollisionAlgorithm(ci, body0Wrap, body1Wrap, true);
+		}
+	};
+};
+
+#endif  //BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
new file mode 100644
index 0000000..8031c95
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
@@ -0,0 +1,873 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///Specialized capsule-capsule collision algorithm has been added for Bullet 2.75 release to increase ragdoll performance
+///If you experience problems with capsule-capsule collision, try to define BT_DISABLE_CAPSULE_CAPSULE_COLLIDER and report it in the Bullet forums
+///with reproduction case
+//#define BT_DISABLE_CAPSULE_CAPSULE_COLLIDER 1
+//#define ZERO_MARGIN
+
+#include "btConvexConvexAlgorithm.h"
+
+//#include <stdio.h>
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btCapsuleShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/CollisionShapes/btConvexPolyhedron.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+///////////
+
+static SIMD_FORCE_INLINE void segmentsClosestPoints(
+	btVector3& ptsVector,
+	btVector3& offsetA,
+	btVector3& offsetB,
+	btScalar& tA, btScalar& tB,
+	const btVector3& translation,
+	const btVector3& dirA, btScalar hlenA,
+	const btVector3& dirB, btScalar hlenB)
+{
+	// compute the parameters of the closest points on each line segment
+
+	btScalar dirA_dot_dirB = btDot(dirA, dirB);
+	btScalar dirA_dot_trans = btDot(dirA, translation);
+	btScalar dirB_dot_trans = btDot(dirB, translation);
+
+	btScalar denom = 1.0f - dirA_dot_dirB * dirA_dot_dirB;
+
+	if (denom == 0.0f)
+	{
+		tA = 0.0f;
+	}
+	else
+	{
+		tA = (dirA_dot_trans - dirB_dot_trans * dirA_dot_dirB) / denom;
+		if (tA < -hlenA)
+			tA = -hlenA;
+		else if (tA > hlenA)
+			tA = hlenA;
+	}
+
+	tB = tA * dirA_dot_dirB - dirB_dot_trans;
+
+	if (tB < -hlenB)
+	{
+		tB = -hlenB;
+		tA = tB * dirA_dot_dirB + dirA_dot_trans;
+
+		if (tA < -hlenA)
+			tA = -hlenA;
+		else if (tA > hlenA)
+			tA = hlenA;
+	}
+	else if (tB > hlenB)
+	{
+		tB = hlenB;
+		tA = tB * dirA_dot_dirB + dirA_dot_trans;
+
+		if (tA < -hlenA)
+			tA = -hlenA;
+		else if (tA > hlenA)
+			tA = hlenA;
+	}
+
+	// compute the closest points relative to segment centers.
+
+	offsetA = dirA * tA;
+	offsetB = dirB * tB;
+
+	ptsVector = translation - offsetA + offsetB;
+}
+
+static SIMD_FORCE_INLINE btScalar capsuleCapsuleDistance(
+	btVector3& normalOnB,
+	btVector3& pointOnB,
+	btScalar capsuleLengthA,
+	btScalar capsuleRadiusA,
+	btScalar capsuleLengthB,
+	btScalar capsuleRadiusB,
+	int capsuleAxisA,
+	int capsuleAxisB,
+	const btTransform& transformA,
+	const btTransform& transformB,
+	btScalar distanceThreshold)
+{
+	btVector3 directionA = transformA.getBasis().getColumn(capsuleAxisA);
+	btVector3 translationA = transformA.getOrigin();
+	btVector3 directionB = transformB.getBasis().getColumn(capsuleAxisB);
+	btVector3 translationB = transformB.getOrigin();
+
+	// translation between centers
+
+	btVector3 translation = translationB - translationA;
+
+	// compute the closest points of the capsule line segments
+
+	btVector3 ptsVector;  // the vector between the closest points
+
+	btVector3 offsetA, offsetB;  // offsets from segment centers to their closest points
+	btScalar tA, tB;             // parameters on line segment
+
+	segmentsClosestPoints(ptsVector, offsetA, offsetB, tA, tB, translation,
+						  directionA, capsuleLengthA, directionB, capsuleLengthB);
+
+	btScalar distance = ptsVector.length() - capsuleRadiusA - capsuleRadiusB;
+
+	if (distance > distanceThreshold)
+		return distance;
+
+	btScalar lenSqr = ptsVector.length2();
+	if (lenSqr <= (SIMD_EPSILON * SIMD_EPSILON))
+	{
+		//degenerate case where 2 capsules are likely at the same location: take a vector tangential to 'directionA'
+		btVector3 q;
+		btPlaneSpace1(directionA, normalOnB, q);
+	}
+	else
+	{
+		// compute the contact normal
+		normalOnB = ptsVector * -btRecipSqrt(lenSqr);
+	}
+	pointOnB = transformB.getOrigin() + offsetB + normalOnB * capsuleRadiusB;
+
+	return distance;
+}
+
+//////////
+
+btConvexConvexAlgorithm::CreateFunc::CreateFunc(btConvexPenetrationDepthSolver* pdSolver)
+{
+	m_numPerturbationIterations = 0;
+	m_minimumPointsPerturbationThreshold = 3;
+	m_pdSolver = pdSolver;
+}
+
+btConvexConvexAlgorithm::CreateFunc::~CreateFunc()
+{
+}
+
+btConvexConvexAlgorithm::btConvexConvexAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, btConvexPenetrationDepthSolver* pdSolver, int numPerturbationIterations, int minimumPointsPerturbationThreshold)
+	: btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
+	  m_pdSolver(pdSolver),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf),
+	  m_lowLevelOfDetail(false),
+#ifdef USE_SEPDISTANCE_UTIL2
+	  m_sepDistance((static_cast<btConvexShape*>(body0->getCollisionShape()))->getAngularMotionDisc(),
+					(static_cast<btConvexShape*>(body1->getCollisionShape()))->getAngularMotionDisc()),
+#endif
+	  m_numPerturbationIterations(numPerturbationIterations),
+	  m_minimumPointsPerturbationThreshold(minimumPointsPerturbationThreshold)
+{
+	(void)body0Wrap;
+	(void)body1Wrap;
+}
+
+btConvexConvexAlgorithm::~btConvexConvexAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btConvexConvexAlgorithm ::setLowLevelOfDetail(bool useLowLevel)
+{
+	m_lowLevelOfDetail = useLowLevel;
+}
+
+struct btPerturbedContactResult : public btManifoldResult
+{
+	btManifoldResult* m_originalManifoldResult;
+	btTransform m_transformA;
+	btTransform m_transformB;
+	btTransform m_unPerturbedTransform;
+	bool m_perturbA;
+	btIDebugDraw* m_debugDrawer;
+
+	btPerturbedContactResult(btManifoldResult* originalResult, const btTransform& transformA, const btTransform& transformB, const btTransform& unPerturbedTransform, bool perturbA, btIDebugDraw* debugDrawer)
+		: m_originalManifoldResult(originalResult),
+		  m_transformA(transformA),
+		  m_transformB(transformB),
+		  m_unPerturbedTransform(unPerturbedTransform),
+		  m_perturbA(perturbA),
+		  m_debugDrawer(debugDrawer)
+	{
+	}
+	virtual ~btPerturbedContactResult()
+	{
+	}
+
+	virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar orgDepth)
+	{
+		btVector3 endPt, startPt;
+		btScalar newDepth;
+		btVector3 newNormal;
+
+		if (m_perturbA)
+		{
+			btVector3 endPtOrg = pointInWorld + normalOnBInWorld * orgDepth;
+			endPt = (m_unPerturbedTransform * m_transformA.inverse())(endPtOrg);
+			newDepth = (endPt - pointInWorld).dot(normalOnBInWorld);
+			startPt = endPt - normalOnBInWorld * newDepth;
+		}
+		else
+		{
+			endPt = pointInWorld + normalOnBInWorld * orgDepth;
+			startPt = (m_unPerturbedTransform * m_transformB.inverse())(pointInWorld);
+			newDepth = (endPt - startPt).dot(normalOnBInWorld);
+		}
+
+//#define DEBUG_CONTACTS 1
+#ifdef DEBUG_CONTACTS
+		m_debugDrawer->drawLine(startPt, endPt, btVector3(1, 0, 0));
+		m_debugDrawer->drawSphere(startPt, 0.05, btVector3(0, 1, 0));
+		m_debugDrawer->drawSphere(endPt, 0.05, btVector3(0, 0, 1));
+#endif  //DEBUG_CONTACTS
+
+		m_originalManifoldResult->addContactPoint(normalOnBInWorld, startPt, newDepth);
+	}
+};
+
+extern btScalar gContactBreakingThreshold;
+
+//
+// Convex-Convex collision algorithm
+//
+void btConvexConvexAlgorithm ::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	if (!m_manifoldPtr)
+	{
+		//swapped?
+		m_manifoldPtr = m_dispatcher->getNewManifold(body0Wrap->getCollisionObject(), body1Wrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+	resultOut->setPersistentManifold(m_manifoldPtr);
+
+	//comment-out next line to test multi-contact generation
+	//resultOut->getPersistentManifold()->clearManifold();
+
+	const btConvexShape* min0 = static_cast<const btConvexShape*>(body0Wrap->getCollisionShape());
+	const btConvexShape* min1 = static_cast<const btConvexShape*>(body1Wrap->getCollisionShape());
+
+	btVector3 normalOnB;
+	btVector3 pointOnBWorld;
+#ifndef BT_DISABLE_CAPSULE_CAPSULE_COLLIDER
+	if ((min0->getShapeType() == CAPSULE_SHAPE_PROXYTYPE) && (min1->getShapeType() == CAPSULE_SHAPE_PROXYTYPE))
+	{
+		//m_manifoldPtr->clearManifold();
+
+		btCapsuleShape* capsuleA = (btCapsuleShape*)min0;
+		btCapsuleShape* capsuleB = (btCapsuleShape*)min1;
+
+		btScalar threshold = m_manifoldPtr->getContactBreakingThreshold()+ resultOut->m_closestPointDistanceThreshold;
+
+		btScalar dist = capsuleCapsuleDistance(normalOnB, pointOnBWorld, capsuleA->getHalfHeight(), capsuleA->getRadius(),
+											   capsuleB->getHalfHeight(), capsuleB->getRadius(), capsuleA->getUpAxis(), capsuleB->getUpAxis(),
+											   body0Wrap->getWorldTransform(), body1Wrap->getWorldTransform(), threshold);
+
+		if (dist < threshold)
+		{
+			btAssert(normalOnB.length2() >= (SIMD_EPSILON * SIMD_EPSILON));
+			resultOut->addContactPoint(normalOnB, pointOnBWorld, dist);
+		}
+		resultOut->refreshContactPoints();
+		return;
+	}
+
+	if ((min0->getShapeType() == CAPSULE_SHAPE_PROXYTYPE) && (min1->getShapeType() == SPHERE_SHAPE_PROXYTYPE))
+	{
+		//m_manifoldPtr->clearManifold();
+
+		btCapsuleShape* capsuleA = (btCapsuleShape*)min0;
+		btSphereShape* capsuleB = (btSphereShape*)min1;
+
+		btScalar threshold = m_manifoldPtr->getContactBreakingThreshold()+ resultOut->m_closestPointDistanceThreshold;
+
+		btScalar dist = capsuleCapsuleDistance(normalOnB, pointOnBWorld, capsuleA->getHalfHeight(), capsuleA->getRadius(),
+											   0., capsuleB->getRadius(), capsuleA->getUpAxis(), 1,
+											   body0Wrap->getWorldTransform(), body1Wrap->getWorldTransform(), threshold);
+
+		if (dist < threshold)
+		{
+			btAssert(normalOnB.length2() >= (SIMD_EPSILON * SIMD_EPSILON));
+			resultOut->addContactPoint(normalOnB, pointOnBWorld, dist);
+		}
+		resultOut->refreshContactPoints();
+		return;
+	}
+
+	if ((min0->getShapeType() == SPHERE_SHAPE_PROXYTYPE) && (min1->getShapeType() == CAPSULE_SHAPE_PROXYTYPE))
+	{
+		//m_manifoldPtr->clearManifold();
+
+		btSphereShape* capsuleA = (btSphereShape*)min0;
+		btCapsuleShape* capsuleB = (btCapsuleShape*)min1;
+
+		btScalar threshold = m_manifoldPtr->getContactBreakingThreshold()+ resultOut->m_closestPointDistanceThreshold;
+
+		btScalar dist = capsuleCapsuleDistance(normalOnB, pointOnBWorld, 0., capsuleA->getRadius(),
+											   capsuleB->getHalfHeight(), capsuleB->getRadius(), 1, capsuleB->getUpAxis(),
+											   body0Wrap->getWorldTransform(), body1Wrap->getWorldTransform(), threshold);
+
+		if (dist < threshold)
+		{
+			btAssert(normalOnB.length2() >= (SIMD_EPSILON * SIMD_EPSILON));
+			resultOut->addContactPoint(normalOnB, pointOnBWorld, dist);
+		}
+		resultOut->refreshContactPoints();
+		return;
+	}
+#endif  //BT_DISABLE_CAPSULE_CAPSULE_COLLIDER
+
+#ifdef USE_SEPDISTANCE_UTIL2
+	if (dispatchInfo.m_useConvexConservativeDistanceUtil)
+	{
+		m_sepDistance.updateSeparatingDistance(body0->getWorldTransform(), body1->getWorldTransform());
+	}
+
+	if (!dispatchInfo.m_useConvexConservativeDistanceUtil || m_sepDistance.getConservativeSeparatingDistance() <= 0.f)
+#endif  //USE_SEPDISTANCE_UTIL2
+
+	{
+		btGjkPairDetector::ClosestPointInput input;
+		btVoronoiSimplexSolver simplexSolver;
+		btGjkPairDetector gjkPairDetector(min0, min1, &simplexSolver, m_pdSolver);
+		//TODO: if (dispatchInfo.m_useContinuous)
+		gjkPairDetector.setMinkowskiA(min0);
+		gjkPairDetector.setMinkowskiB(min1);
+
+#ifdef USE_SEPDISTANCE_UTIL2
+		if (dispatchInfo.m_useConvexConservativeDistanceUtil)
+		{
+			input.m_maximumDistanceSquared = BT_LARGE_FLOAT;
+		}
+		else
+#endif  //USE_SEPDISTANCE_UTIL2
+		{
+			//if (dispatchInfo.m_convexMaxDistanceUseCPT)
+			//{
+			//	input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactProcessingThreshold();
+			//} else
+			//{
+			input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactBreakingThreshold() + resultOut->m_closestPointDistanceThreshold;
+			//		}
+
+			input.m_maximumDistanceSquared *= input.m_maximumDistanceSquared;
+		}
+
+		input.m_transformA = body0Wrap->getWorldTransform();
+		input.m_transformB = body1Wrap->getWorldTransform();
+
+#ifdef USE_SEPDISTANCE_UTIL2
+		btScalar sepDist = 0.f;
+		if (dispatchInfo.m_useConvexConservativeDistanceUtil)
+		{
+			sepDist = gjkPairDetector.getCachedSeparatingDistance();
+			if (sepDist > SIMD_EPSILON)
+			{
+				sepDist += dispatchInfo.m_convexConservativeDistanceThreshold;
+				//now perturbe directions to get multiple contact points
+			}
+		}
+#endif  //USE_SEPDISTANCE_UTIL2
+
+		if (min0->isPolyhedral() && min1->isPolyhedral())
+		{
+			struct btDummyResult : public btDiscreteCollisionDetectorInterface::Result
+			{
+				btVector3 m_normalOnBInWorld;
+				btVector3 m_pointInWorld;
+				btScalar m_depth;
+				bool m_hasContact;
+
+				btDummyResult()
+					: m_hasContact(false)
+				{
+				}
+
+				virtual void setShapeIdentifiersA(int partId0, int index0) {}
+				virtual void setShapeIdentifiersB(int partId1, int index1) {}
+				virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth)
+				{
+					m_hasContact = true;
+					m_normalOnBInWorld = normalOnBInWorld;
+					m_pointInWorld = pointInWorld;
+					m_depth = depth;
+				}
+			};
+
+			struct btWithoutMarginResult : public btDiscreteCollisionDetectorInterface::Result
+			{
+				btDiscreteCollisionDetectorInterface::Result* m_originalResult;
+				btVector3 m_reportedNormalOnWorld;
+				btScalar m_marginOnA;
+				btScalar m_marginOnB;
+				btScalar m_reportedDistance;
+
+				bool m_foundResult;
+				btWithoutMarginResult(btDiscreteCollisionDetectorInterface::Result* result, btScalar marginOnA, btScalar marginOnB)
+					: m_originalResult(result),
+					  m_marginOnA(marginOnA),
+					  m_marginOnB(marginOnB),
+					  m_foundResult(false)
+				{
+				}
+
+				virtual void setShapeIdentifiersA(int partId0, int index0) {}
+				virtual void setShapeIdentifiersB(int partId1, int index1) {}
+				virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorldOrg, btScalar depthOrg)
+				{
+					m_reportedDistance = depthOrg;
+					m_reportedNormalOnWorld = normalOnBInWorld;
+
+					btVector3 adjustedPointB = pointInWorldOrg - normalOnBInWorld * m_marginOnB;
+					m_reportedDistance = depthOrg + (m_marginOnA + m_marginOnB);
+					if (m_reportedDistance < 0.f)
+					{
+						m_foundResult = true;
+					}
+					m_originalResult->addContactPoint(normalOnBInWorld, adjustedPointB, m_reportedDistance);
+				}
+			};
+
+			btDummyResult dummy;
+
+			///btBoxShape is an exception: its vertices are created WITH margin so don't subtract it
+
+			btScalar min0Margin = min0->getShapeType() == BOX_SHAPE_PROXYTYPE ? 0.f : min0->getMargin();
+			btScalar min1Margin = min1->getShapeType() == BOX_SHAPE_PROXYTYPE ? 0.f : min1->getMargin();
+
+			btWithoutMarginResult withoutMargin(resultOut, min0Margin, min1Margin);
+
+			btPolyhedralConvexShape* polyhedronA = (btPolyhedralConvexShape*)min0;
+			btPolyhedralConvexShape* polyhedronB = (btPolyhedralConvexShape*)min1;
+			if (polyhedronA->getConvexPolyhedron() && polyhedronB->getConvexPolyhedron())
+			{
+				btScalar threshold = m_manifoldPtr->getContactBreakingThreshold()+ resultOut->m_closestPointDistanceThreshold;
+
+				btScalar minDist = -1e30f;
+				btVector3 sepNormalWorldSpace;
+				bool foundSepAxis = true;
+
+				if (dispatchInfo.m_enableSatConvex)
+				{
+					foundSepAxis = btPolyhedralContactClipping::findSeparatingAxis(
+						*polyhedronA->getConvexPolyhedron(), *polyhedronB->getConvexPolyhedron(),
+						body0Wrap->getWorldTransform(),
+						body1Wrap->getWorldTransform(),
+						sepNormalWorldSpace, *resultOut);
+				}
+				else
+				{
+#ifdef ZERO_MARGIN
+					gjkPairDetector.setIgnoreMargin(true);
+					gjkPairDetector.getClosestPoints(input, *resultOut, dispatchInfo.m_debugDraw);
+#else
+
+					gjkPairDetector.getClosestPoints(input, withoutMargin, dispatchInfo.m_debugDraw);
+					//gjkPairDetector.getClosestPoints(input,dummy,dispatchInfo.m_debugDraw);
+#endif  //ZERO_MARGIN
+					//btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2();
+					//if (l2>SIMD_EPSILON)
+					{
+						sepNormalWorldSpace = withoutMargin.m_reportedNormalOnWorld;  //gjkPairDetector.getCachedSeparatingAxis()*(1.f/l2);
+						//minDist = -1e30f;//gjkPairDetector.getCachedSeparatingDistance();
+						minDist = withoutMargin.m_reportedDistance;  //gjkPairDetector.getCachedSeparatingDistance()+min0->getMargin()+min1->getMargin();
+
+#ifdef ZERO_MARGIN
+						foundSepAxis = true;  //gjkPairDetector.getCachedSeparatingDistance()<0.f;
+#else
+						foundSepAxis = withoutMargin.m_foundResult && minDist < 0;  //-(min0->getMargin()+min1->getMargin());
+#endif
+					}
+				}
+				if (foundSepAxis)
+				{
+					//				printf("sepNormalWorldSpace=%f,%f,%f\n",sepNormalWorldSpace.getX(),sepNormalWorldSpace.getY(),sepNormalWorldSpace.getZ());
+
+					worldVertsB1.resize(0);
+					btPolyhedralContactClipping::clipHullAgainstHull(sepNormalWorldSpace, *polyhedronA->getConvexPolyhedron(), *polyhedronB->getConvexPolyhedron(),
+																	 body0Wrap->getWorldTransform(),
+																	 body1Wrap->getWorldTransform(), minDist - threshold, threshold, worldVertsB1, worldVertsB2,
+																	 *resultOut);
+				}
+				if (m_ownManifold)
+				{
+					resultOut->refreshContactPoints();
+				}
+				return;
+			}
+			else
+			{
+				//we can also deal with convex versus triangle (without connectivity data)
+				if (dispatchInfo.m_enableSatConvex && polyhedronA->getConvexPolyhedron() && polyhedronB->getShapeType() == TRIANGLE_SHAPE_PROXYTYPE)
+				{
+					btVertexArray worldSpaceVertices;
+					btTriangleShape* tri = (btTriangleShape*)polyhedronB;
+					worldSpaceVertices.push_back(body1Wrap->getWorldTransform() * tri->m_vertices1[0]);
+					worldSpaceVertices.push_back(body1Wrap->getWorldTransform() * tri->m_vertices1[1]);
+					worldSpaceVertices.push_back(body1Wrap->getWorldTransform() * tri->m_vertices1[2]);
+
+					//tri->initializePolyhedralFeatures();
+
+					btScalar threshold = m_manifoldPtr->getContactBreakingThreshold()+ resultOut->m_closestPointDistanceThreshold;
+
+					btVector3 sepNormalWorldSpace;
+					btScalar minDist = -1e30f;
+					btScalar maxDist = threshold;
+
+					bool foundSepAxis = false;
+					bool useSatSepNormal = true;
+
+					if (useSatSepNormal)
+					{
+#if 0
+					if (0)
+					{
+						//initializePolyhedralFeatures performs a convex hull computation, not needed for a single triangle
+						polyhedronB->initializePolyhedralFeatures();
+					} else
+#endif
+						{
+							btVector3 uniqueEdges[3] = {tri->m_vertices1[1] - tri->m_vertices1[0],
+														tri->m_vertices1[2] - tri->m_vertices1[1],
+														tri->m_vertices1[0] - tri->m_vertices1[2]};
+
+							uniqueEdges[0].normalize();
+							uniqueEdges[1].normalize();
+							uniqueEdges[2].normalize();
+
+							btConvexPolyhedron polyhedron;
+							polyhedron.m_vertices.push_back(tri->m_vertices1[2]);
+							polyhedron.m_vertices.push_back(tri->m_vertices1[0]);
+							polyhedron.m_vertices.push_back(tri->m_vertices1[1]);
+
+							{
+								btFace combinedFaceA;
+								combinedFaceA.m_indices.push_back(0);
+								combinedFaceA.m_indices.push_back(1);
+								combinedFaceA.m_indices.push_back(2);
+								btVector3 faceNormal = uniqueEdges[0].cross(uniqueEdges[1]);
+								faceNormal.normalize();
+								btScalar planeEq = 1e30f;
+								for (int v = 0; v < combinedFaceA.m_indices.size(); v++)
+								{
+									btScalar eq = tri->m_vertices1[combinedFaceA.m_indices[v]].dot(faceNormal);
+									if (planeEq > eq)
+									{
+										planeEq = eq;
+									}
+								}
+								combinedFaceA.m_plane[0] = faceNormal[0];
+								combinedFaceA.m_plane[1] = faceNormal[1];
+								combinedFaceA.m_plane[2] = faceNormal[2];
+								combinedFaceA.m_plane[3] = -planeEq;
+								polyhedron.m_faces.push_back(combinedFaceA);
+							}
+							{
+								btFace combinedFaceB;
+								combinedFaceB.m_indices.push_back(0);
+								combinedFaceB.m_indices.push_back(2);
+								combinedFaceB.m_indices.push_back(1);
+								btVector3 faceNormal = -uniqueEdges[0].cross(uniqueEdges[1]);
+								faceNormal.normalize();
+								btScalar planeEq = 1e30f;
+								for (int v = 0; v < combinedFaceB.m_indices.size(); v++)
+								{
+									btScalar eq = tri->m_vertices1[combinedFaceB.m_indices[v]].dot(faceNormal);
+									if (planeEq > eq)
+									{
+										planeEq = eq;
+									}
+								}
+
+								combinedFaceB.m_plane[0] = faceNormal[0];
+								combinedFaceB.m_plane[1] = faceNormal[1];
+								combinedFaceB.m_plane[2] = faceNormal[2];
+								combinedFaceB.m_plane[3] = -planeEq;
+								polyhedron.m_faces.push_back(combinedFaceB);
+							}
+
+							polyhedron.m_uniqueEdges.push_back(uniqueEdges[0]);
+							polyhedron.m_uniqueEdges.push_back(uniqueEdges[1]);
+							polyhedron.m_uniqueEdges.push_back(uniqueEdges[2]);
+							polyhedron.initialize2();
+
+							polyhedronB->setPolyhedralFeatures(polyhedron);
+						}
+
+						foundSepAxis = btPolyhedralContactClipping::findSeparatingAxis(
+							*polyhedronA->getConvexPolyhedron(), *polyhedronB->getConvexPolyhedron(),
+							body0Wrap->getWorldTransform(),
+							body1Wrap->getWorldTransform(),
+							sepNormalWorldSpace, *resultOut);
+						//	 printf("sepNormalWorldSpace=%f,%f,%f\n",sepNormalWorldSpace.getX(),sepNormalWorldSpace.getY(),sepNormalWorldSpace.getZ());
+					}
+					else
+					{
+#ifdef ZERO_MARGIN
+						gjkPairDetector.setIgnoreMargin(true);
+						gjkPairDetector.getClosestPoints(input, *resultOut, dispatchInfo.m_debugDraw);
+#else
+						gjkPairDetector.getClosestPoints(input, dummy, dispatchInfo.m_debugDraw);
+#endif  //ZERO_MARGIN
+
+						if (dummy.m_hasContact && dummy.m_depth < 0)
+						{
+							if (foundSepAxis)
+							{
+								if (dummy.m_normalOnBInWorld.dot(sepNormalWorldSpace) < 0.99)
+								{
+									printf("?\n");
+								}
+							}
+							else
+							{
+								printf("!\n");
+							}
+							sepNormalWorldSpace.setValue(0, 0, 1);  // = dummy.m_normalOnBInWorld;
+							//minDist = dummy.m_depth;
+							foundSepAxis = true;
+						}
+#if 0
+					btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2();
+					if (l2>SIMD_EPSILON)
+					{
+						sepNormalWorldSpace = gjkPairDetector.getCachedSeparatingAxis()*(1.f/l2);
+						//minDist = gjkPairDetector.getCachedSeparatingDistance();
+						//maxDist = threshold;
+						minDist = gjkPairDetector.getCachedSeparatingDistance()-min0->getMargin()-min1->getMargin();
+						foundSepAxis = true;
+					}
+#endif
+					}
+
+					if (foundSepAxis)
+					{
+						worldVertsB2.resize(0);
+						btPolyhedralContactClipping::clipFaceAgainstHull(sepNormalWorldSpace, *polyhedronA->getConvexPolyhedron(),
+																		 body0Wrap->getWorldTransform(), worldSpaceVertices, worldVertsB2, minDist - threshold, maxDist, *resultOut);
+					}
+
+					if (m_ownManifold)
+					{
+						resultOut->refreshContactPoints();
+					}
+
+					return;
+				}
+			}
+		}
+
+		gjkPairDetector.getClosestPoints(input, *resultOut, dispatchInfo.m_debugDraw);
+
+		//now perform 'm_numPerturbationIterations' collision queries with the perturbated collision objects
+
+		//perform perturbation when more then 'm_minimumPointsPerturbationThreshold' points
+		if (m_numPerturbationIterations && resultOut->getPersistentManifold()->getNumContacts() < m_minimumPointsPerturbationThreshold)
+		{
+			int i;
+			btVector3 v0, v1;
+			btVector3 sepNormalWorldSpace;
+			btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2();
+
+			if (l2 > SIMD_EPSILON)
+			{
+				sepNormalWorldSpace = gjkPairDetector.getCachedSeparatingAxis() * (1.f / l2);
+
+				btPlaneSpace1(sepNormalWorldSpace, v0, v1);
+
+				bool perturbeA = true;
+				const btScalar angleLimit = 0.125f * SIMD_PI;
+				btScalar perturbeAngle;
+				btScalar radiusA = min0->getAngularMotionDisc();
+				btScalar radiusB = min1->getAngularMotionDisc();
+				if (radiusA < radiusB)
+				{
+					perturbeAngle = gContactBreakingThreshold / radiusA;
+					perturbeA = true;
+				}
+				else
+				{
+					perturbeAngle = gContactBreakingThreshold / radiusB;
+					perturbeA = false;
+				}
+				if (perturbeAngle > angleLimit)
+					perturbeAngle = angleLimit;
+
+				btTransform unPerturbedTransform;
+				if (perturbeA)
+				{
+					unPerturbedTransform = input.m_transformA;
+				}
+				else
+				{
+					unPerturbedTransform = input.m_transformB;
+				}
+
+				for (i = 0; i < m_numPerturbationIterations; i++)
+				{
+					if (v0.length2() > SIMD_EPSILON)
+					{
+						btQuaternion perturbeRot(v0, perturbeAngle);
+						btScalar iterationAngle = i * (SIMD_2_PI / btScalar(m_numPerturbationIterations));
+						btQuaternion rotq(sepNormalWorldSpace, iterationAngle);
+
+						if (perturbeA)
+						{
+							input.m_transformA.setBasis(btMatrix3x3(rotq.inverse() * perturbeRot * rotq) * body0Wrap->getWorldTransform().getBasis());
+							input.m_transformB = body1Wrap->getWorldTransform();
+#ifdef DEBUG_CONTACTS
+							dispatchInfo.m_debugDraw->drawTransform(input.m_transformA, 10.0);
+#endif  //DEBUG_CONTACTS
+						}
+						else
+						{
+							input.m_transformA = body0Wrap->getWorldTransform();
+							input.m_transformB.setBasis(btMatrix3x3(rotq.inverse() * perturbeRot * rotq) * body1Wrap->getWorldTransform().getBasis());
+#ifdef DEBUG_CONTACTS
+							dispatchInfo.m_debugDraw->drawTransform(input.m_transformB, 10.0);
+#endif
+						}
+
+						btPerturbedContactResult perturbedResultOut(resultOut, input.m_transformA, input.m_transformB, unPerturbedTransform, perturbeA, dispatchInfo.m_debugDraw);
+						gjkPairDetector.getClosestPoints(input, perturbedResultOut, dispatchInfo.m_debugDraw);
+					}
+				}
+			}
+		}
+
+#ifdef USE_SEPDISTANCE_UTIL2
+		if (dispatchInfo.m_useConvexConservativeDistanceUtil && (sepDist > SIMD_EPSILON))
+		{
+			m_sepDistance.initSeparatingDistance(gjkPairDetector.getCachedSeparatingAxis(), sepDist, body0->getWorldTransform(), body1->getWorldTransform());
+		}
+#endif  //USE_SEPDISTANCE_UTIL2
+	}
+
+	if (m_ownManifold)
+	{
+		resultOut->refreshContactPoints();
+	}
+}
+
+bool disableCcd = false;
+btScalar btConvexConvexAlgorithm::calculateTimeOfImpact(btCollisionObject* col0, btCollisionObject* col1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	///Rather then checking ALL pairs, only calculate TOI when motion exceeds threshold
+
+	///Linear motion for one of objects needs to exceed m_ccdSquareMotionThreshold
+	///col0->m_worldTransform,
+	btScalar resultFraction = btScalar(1.);
+
+	btScalar squareMot0 = (col0->getInterpolationWorldTransform().getOrigin() - col0->getWorldTransform().getOrigin()).length2();
+	btScalar squareMot1 = (col1->getInterpolationWorldTransform().getOrigin() - col1->getWorldTransform().getOrigin()).length2();
+
+	if (squareMot0 < col0->getCcdSquareMotionThreshold() &&
+		squareMot1 < col1->getCcdSquareMotionThreshold())
+		return resultFraction;
+
+	if (disableCcd)
+		return btScalar(1.);
+
+	//An adhoc way of testing the Continuous Collision Detection algorithms
+	//One object is approximated as a sphere, to simplify things
+	//Starting in penetration should report no time of impact
+	//For proper CCD, better accuracy and handling of 'allowed' penetration should be added
+	//also the mainloop of the physics should have a kind of toi queue (something like Brian Mirtich's application of Timewarp for Rigidbodies)
+
+	/// Convex0 against sphere for Convex1
+	{
+		btConvexShape* convex0 = static_cast<btConvexShape*>(col0->getCollisionShape());
+
+		btSphereShape sphere1(col1->getCcdSweptSphereRadius());  //todo: allow non-zero sphere sizes, for better approximation
+		btConvexCast::CastResult result;
+		btVoronoiSimplexSolver voronoiSimplex;
+		//SubsimplexConvexCast ccd0(&sphere,min0,&voronoiSimplex);
+		///Simplification, one object is simplified as a sphere
+		btGjkConvexCast ccd1(convex0, &sphere1, &voronoiSimplex);
+		//ContinuousConvexCollision ccd(min0,min1,&voronoiSimplex,0);
+		if (ccd1.calcTimeOfImpact(col0->getWorldTransform(), col0->getInterpolationWorldTransform(),
+								  col1->getWorldTransform(), col1->getInterpolationWorldTransform(), result))
+		{
+			//store result.m_fraction in both bodies
+
+			if (col0->getHitFraction() > result.m_fraction)
+				col0->setHitFraction(result.m_fraction);
+
+			if (col1->getHitFraction() > result.m_fraction)
+				col1->setHitFraction(result.m_fraction);
+
+			if (resultFraction > result.m_fraction)
+				resultFraction = result.m_fraction;
+		}
+	}
+
+	/// Sphere (for convex0) against Convex1
+	{
+		btConvexShape* convex1 = static_cast<btConvexShape*>(col1->getCollisionShape());
+
+		btSphereShape sphere0(col0->getCcdSweptSphereRadius());  //todo: allow non-zero sphere sizes, for better approximation
+		btConvexCast::CastResult result;
+		btVoronoiSimplexSolver voronoiSimplex;
+		//SubsimplexConvexCast ccd0(&sphere,min0,&voronoiSimplex);
+		///Simplification, one object is simplified as a sphere
+		btGjkConvexCast ccd1(&sphere0, convex1, &voronoiSimplex);
+		//ContinuousConvexCollision ccd(min0,min1,&voronoiSimplex,0);
+		if (ccd1.calcTimeOfImpact(col0->getWorldTransform(), col0->getInterpolationWorldTransform(),
+								  col1->getWorldTransform(), col1->getInterpolationWorldTransform(), result))
+		{
+			//store result.m_fraction in both bodies
+
+			if (col0->getHitFraction() > result.m_fraction)
+				col0->setHitFraction(result.m_fraction);
+
+			if (col1->getHitFraction() > result.m_fraction)
+				col1->setHitFraction(result.m_fraction);
+
+			if (resultFraction > result.m_fraction)
+				resultFraction = result.m_fraction;
+		}
+	}
+
+	return resultFraction;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
new file mode 100644
index 0000000..9b76162
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
@@ -0,0 +1,101 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_CONVEX_ALGORITHM_H
+#define BT_CONVEX_CONVEX_ALGORITHM_H
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "btCollisionCreateFunc.h"
+#include "btCollisionDispatcher.h"
+#include "LinearMath/btTransformUtil.h"  //for btConvexSeparatingDistanceUtil
+#include "BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h"
+
+class btConvexPenetrationDepthSolver;
+
+///Enabling USE_SEPDISTANCE_UTIL2 requires 100% reliable distance computation. However, when using large size ratios GJK can be imprecise
+///so the distance is not conservative. In that case, enabling this USE_SEPDISTANCE_UTIL2 would result in failing/missing collisions.
+///Either improve GJK for large size ratios (testing a 100 units versus a 0.1 unit object) or only enable the util
+///for certain pairs that have a small size ratio
+
+//#define USE_SEPDISTANCE_UTIL2 1
+
+///The convexConvexAlgorithm collision algorithm implements time of impact, convex closest points and penetration depth calculations between two convex objects.
+///Multiple contact points are calculated by perturbing the orientation of the smallest object orthogonal to the separating normal.
+///This idea was described by Gino van den Bergen in this forum topic http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=4&t=288&p=888#p888
+class btConvexConvexAlgorithm : public btActivatingCollisionAlgorithm
+{
+#ifdef USE_SEPDISTANCE_UTIL2
+	btConvexSeparatingDistanceUtil m_sepDistance;
+#endif
+	btConvexPenetrationDepthSolver* m_pdSolver;
+
+	btVertexArray worldVertsB1;
+	btVertexArray worldVertsB2;
+
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+	bool m_lowLevelOfDetail;
+
+	int m_numPerturbationIterations;
+	int m_minimumPointsPerturbationThreshold;
+
+	///cache separating vector to speedup collision detection
+
+public:
+	btConvexConvexAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, btConvexPenetrationDepthSolver* pdSolver, int numPerturbationIterations, int minimumPointsPerturbationThreshold);
+
+	virtual ~btConvexConvexAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		///should we use m_ownManifold to avoid adding duplicates?
+		if (m_manifoldPtr && m_ownManifold)
+			manifoldArray.push_back(m_manifoldPtr);
+	}
+
+	void setLowLevelOfDetail(bool useLowLevel);
+
+	const btPersistentManifold* getManifold()
+	{
+		return m_manifoldPtr;
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		btConvexPenetrationDepthSolver* m_pdSolver;
+		int m_numPerturbationIterations;
+		int m_minimumPointsPerturbationThreshold;
+
+		CreateFunc(btConvexPenetrationDepthSolver* pdSolver);
+
+		virtual ~CreateFunc();
+
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConvexAlgorithm));
+			return new (mem) btConvexConvexAlgorithm(ci.m_manifold, ci, body0Wrap, body1Wrap, m_pdSolver, m_numPerturbationIterations, m_minimumPointsPerturbationThreshold);
+		}
+	};
+};
+
+#endif  //BT_CONVEX_CONVEX_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
new file mode 100644
index 0000000..d91d9c9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
@@ -0,0 +1,172 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvexPlaneCollisionAlgorithm.h"
+
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+//#include <stdio.h>
+
+btConvexPlaneCollisionAlgorithm::btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* col0Wrap, const btCollisionObjectWrapper* col1Wrap, bool isSwapped, int numPerturbationIterations, int minimumPointsPerturbationThreshold)
+	: btCollisionAlgorithm(ci),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf),
+	  m_isSwapped(isSwapped),
+	  m_numPerturbationIterations(numPerturbationIterations),
+	  m_minimumPointsPerturbationThreshold(minimumPointsPerturbationThreshold)
+{
+	const btCollisionObjectWrapper* convexObjWrap = m_isSwapped ? col1Wrap : col0Wrap;
+	const btCollisionObjectWrapper* planeObjWrap = m_isSwapped ? col0Wrap : col1Wrap;
+
+	if (!m_manifoldPtr && m_dispatcher->needsCollision(convexObjWrap->getCollisionObject(), planeObjWrap->getCollisionObject()))
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(convexObjWrap->getCollisionObject(), planeObjWrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+}
+
+btConvexPlaneCollisionAlgorithm::~btConvexPlaneCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btConvexPlaneCollisionAlgorithm::collideSingleContact(const btQuaternion& perturbeRot, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	const btCollisionObjectWrapper* convexObjWrap = m_isSwapped ? body1Wrap : body0Wrap;
+	const btCollisionObjectWrapper* planeObjWrap = m_isSwapped ? body0Wrap : body1Wrap;
+
+	btConvexShape* convexShape = (btConvexShape*)convexObjWrap->getCollisionShape();
+	btStaticPlaneShape* planeShape = (btStaticPlaneShape*)planeObjWrap->getCollisionShape();
+
+	bool hasCollision = false;
+	const btVector3& planeNormal = planeShape->getPlaneNormal();
+	const btScalar& planeConstant = planeShape->getPlaneConstant();
+
+	btTransform convexWorldTransform = convexObjWrap->getWorldTransform();
+	btTransform convexInPlaneTrans;
+	convexInPlaneTrans = planeObjWrap->getWorldTransform().inverse() * convexWorldTransform;
+	//now perturbe the convex-world transform
+	convexWorldTransform.getBasis() *= btMatrix3x3(perturbeRot);
+	btTransform planeInConvex;
+	planeInConvex = convexWorldTransform.inverse() * planeObjWrap->getWorldTransform();
+
+	btVector3 vtx = convexShape->localGetSupportingVertex(planeInConvex.getBasis() * -planeNormal);
+
+	btVector3 vtxInPlane = convexInPlaneTrans(vtx);
+	btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant);
+
+	btVector3 vtxInPlaneProjected = vtxInPlane - distance * planeNormal;
+	btVector3 vtxInPlaneWorld = planeObjWrap->getWorldTransform() * vtxInPlaneProjected;
+
+	hasCollision = distance < m_manifoldPtr->getContactBreakingThreshold();
+	resultOut->setPersistentManifold(m_manifoldPtr);
+	if (hasCollision)
+	{
+		/// report a contact. internally this will be kept persistent, and contact reduction is done
+		btVector3 normalOnSurfaceB = planeObjWrap->getWorldTransform().getBasis() * planeNormal;
+		btVector3 pOnB = vtxInPlaneWorld;
+		resultOut->addContactPoint(normalOnSurfaceB, pOnB, distance);
+	}
+}
+
+void btConvexPlaneCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)dispatchInfo;
+	if (!m_manifoldPtr)
+		return;
+
+	const btCollisionObjectWrapper* convexObjWrap = m_isSwapped ? body1Wrap : body0Wrap;
+	const btCollisionObjectWrapper* planeObjWrap = m_isSwapped ? body0Wrap : body1Wrap;
+
+	btConvexShape* convexShape = (btConvexShape*)convexObjWrap->getCollisionShape();
+	btStaticPlaneShape* planeShape = (btStaticPlaneShape*)planeObjWrap->getCollisionShape();
+
+	bool hasCollision = false;
+	const btVector3& planeNormal = planeShape->getPlaneNormal();
+	const btScalar& planeConstant = planeShape->getPlaneConstant();
+	btTransform planeInConvex;
+	planeInConvex = convexObjWrap->getWorldTransform().inverse() * planeObjWrap->getWorldTransform();
+	btTransform convexInPlaneTrans;
+	convexInPlaneTrans = planeObjWrap->getWorldTransform().inverse() * convexObjWrap->getWorldTransform();
+
+	btVector3 vtx = convexShape->localGetSupportingVertex(planeInConvex.getBasis() * -planeNormal);
+	btVector3 vtxInPlane = convexInPlaneTrans(vtx);
+	btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant);
+
+	btVector3 vtxInPlaneProjected = vtxInPlane - distance * planeNormal;
+	btVector3 vtxInPlaneWorld = planeObjWrap->getWorldTransform() * vtxInPlaneProjected;
+
+	hasCollision = distance < m_manifoldPtr->getContactBreakingThreshold()+ resultOut->m_closestPointDistanceThreshold;
+	resultOut->setPersistentManifold(m_manifoldPtr);
+	if (hasCollision)
+	{
+		/// report a contact. internally this will be kept persistent, and contact reduction is done
+		btVector3 normalOnSurfaceB = planeObjWrap->getWorldTransform().getBasis() * planeNormal;
+		btVector3 pOnB = vtxInPlaneWorld;
+		resultOut->addContactPoint(normalOnSurfaceB, pOnB, distance);
+	}
+
+	//the perturbation algorithm doesn't work well with implicit surfaces such as spheres, cylinder and cones:
+	//they keep on rolling forever because of the additional off-center contact points
+	//so only enable the feature for polyhedral shapes (btBoxShape, btConvexHullShape etc)
+	if (convexShape->isPolyhedral() && resultOut->getPersistentManifold()->getNumContacts() < m_minimumPointsPerturbationThreshold)
+	{
+		btVector3 v0, v1;
+		btPlaneSpace1(planeNormal, v0, v1);
+		//now perform 'm_numPerturbationIterations' collision queries with the perturbated collision objects
+
+		const btScalar angleLimit = 0.125f * SIMD_PI;
+		btScalar perturbeAngle;
+		btScalar radius = convexShape->getAngularMotionDisc();
+		perturbeAngle = gContactBreakingThreshold / radius;
+		if (perturbeAngle > angleLimit)
+			perturbeAngle = angleLimit;
+
+		btQuaternion perturbeRot(v0, perturbeAngle);
+		for (int i = 0; i < m_numPerturbationIterations; i++)
+		{
+			btScalar iterationAngle = i * (SIMD_2_PI / btScalar(m_numPerturbationIterations));
+			btQuaternion rotq(planeNormal, iterationAngle);
+			collideSingleContact(rotq.inverse() * perturbeRot * rotq, body0Wrap, body1Wrap, dispatchInfo, resultOut);
+		}
+	}
+
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr->getNumContacts())
+		{
+			resultOut->refreshContactPoints();
+		}
+	}
+}
+
+btScalar btConvexPlaneCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0, btCollisionObject* col1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	(void)col0;
+	(void)col1;
+
+	//not yet
+	return btScalar(1.);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
new file mode 100644
index 0000000..63402d9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
@@ -0,0 +1,82 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_PLANE_COLLISION_ALGORITHM_H
+#define BT_CONVEX_PLANE_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btPersistentManifold;
+#include "btCollisionDispatcher.h"
+
+#include "LinearMath/btVector3.h"
+
+/// btSphereBoxCollisionAlgorithm  provides sphere-box collision detection.
+/// Other features are frame-coherency (persistent data) and collision response.
+class btConvexPlaneCollisionAlgorithm : public btCollisionAlgorithm
+{
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+	bool m_isSwapped;
+	int m_numPerturbationIterations;
+	int m_minimumPointsPerturbationThreshold;
+
+public:
+	btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped, int numPerturbationIterations, int minimumPointsPerturbationThreshold);
+
+	virtual ~btConvexPlaneCollisionAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	void collideSingleContact(const btQuaternion& perturbeRot, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		int m_numPerturbationIterations;
+		int m_minimumPointsPerturbationThreshold;
+
+		CreateFunc()
+			: m_numPerturbationIterations(1),
+			  m_minimumPointsPerturbationThreshold(0)
+		{
+		}
+
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexPlaneCollisionAlgorithm));
+			if (!m_swapped)
+			{
+				return new (mem) btConvexPlaneCollisionAlgorithm(0, ci, body0Wrap, body1Wrap, false, m_numPerturbationIterations, m_minimumPointsPerturbationThreshold);
+			}
+			else
+			{
+				return new (mem) btConvexPlaneCollisionAlgorithm(0, ci, body0Wrap, body1Wrap, true, m_numPerturbationIterations, m_minimumPointsPerturbationThreshold);
+			}
+		}
+	};
+};
+
+#endif  //BT_CONVEX_PLANE_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
new file mode 100644
index 0000000..f6e6343
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
@@ -0,0 +1,362 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btDefaultCollisionConfiguration.h"
+
+#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h"
+
+#include "BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
+#ifdef USE_BUGGY_SPHERE_BOX_ALGORITHM
+#include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h"
+#endif  //USE_BUGGY_SPHERE_BOX_ALGORITHM
+#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+
+#include "LinearMath/btPoolAllocator.h"
+
+btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
+//btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(btStackAlloc*	stackAlloc,btPoolAllocator*	persistentManifoldPool,btPoolAllocator*	collisionAlgorithmPool)
+{
+	void* mem = NULL;
+	if (constructionInfo.m_useEpaPenetrationAlgorithm)
+	{
+		mem = btAlignedAlloc(sizeof(btGjkEpaPenetrationDepthSolver), 16);
+		m_pdSolver = new (mem) btGjkEpaPenetrationDepthSolver;
+	}
+	else
+	{
+		mem = btAlignedAlloc(sizeof(btMinkowskiPenetrationDepthSolver), 16);
+		m_pdSolver = new (mem) btMinkowskiPenetrationDepthSolver;
+	}
+
+	//default CreationFunctions, filling the m_doubleDispatch table
+	mem = btAlignedAlloc(sizeof(btConvexConvexAlgorithm::CreateFunc), 16);
+	m_convexConvexCreateFunc = new (mem) btConvexConvexAlgorithm::CreateFunc(m_pdSolver);
+	mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc), 16);
+	m_convexConcaveCreateFunc = new (mem) btConvexConcaveCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc), 16);
+	m_swappedConvexConcaveCreateFunc = new (mem) btConvexConcaveCollisionAlgorithm::SwappedCreateFunc;
+	mem = btAlignedAlloc(sizeof(btCompoundCollisionAlgorithm::CreateFunc), 16);
+	m_compoundCreateFunc = new (mem) btCompoundCollisionAlgorithm::CreateFunc;
+
+	mem = btAlignedAlloc(sizeof(btCompoundCompoundCollisionAlgorithm::CreateFunc), 16);
+	m_compoundCompoundCreateFunc = new (mem) btCompoundCompoundCollisionAlgorithm::CreateFunc;
+
+	mem = btAlignedAlloc(sizeof(btCompoundCollisionAlgorithm::SwappedCreateFunc), 16);
+	m_swappedCompoundCreateFunc = new (mem) btCompoundCollisionAlgorithm::SwappedCreateFunc;
+	mem = btAlignedAlloc(sizeof(btEmptyAlgorithm::CreateFunc), 16);
+	m_emptyCreateFunc = new (mem) btEmptyAlgorithm::CreateFunc;
+
+	mem = btAlignedAlloc(sizeof(btSphereSphereCollisionAlgorithm::CreateFunc), 16);
+	m_sphereSphereCF = new (mem) btSphereSphereCollisionAlgorithm::CreateFunc;
+#ifdef USE_BUGGY_SPHERE_BOX_ALGORITHM
+	mem = btAlignedAlloc(sizeof(btSphereBoxCollisionAlgorithm::CreateFunc), 16);
+	m_sphereBoxCF = new (mem) btSphereBoxCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btSphereBoxCollisionAlgorithm::CreateFunc), 16);
+	m_boxSphereCF = new (mem) btSphereBoxCollisionAlgorithm::CreateFunc;
+	m_boxSphereCF->m_swapped = true;
+#endif  //USE_BUGGY_SPHERE_BOX_ALGORITHM
+
+	mem = btAlignedAlloc(sizeof(btSphereTriangleCollisionAlgorithm::CreateFunc), 16);
+	m_sphereTriangleCF = new (mem) btSphereTriangleCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btSphereTriangleCollisionAlgorithm::CreateFunc), 16);
+	m_triangleSphereCF = new (mem) btSphereTriangleCollisionAlgorithm::CreateFunc;
+	m_triangleSphereCF->m_swapped = true;
+
+	mem = btAlignedAlloc(sizeof(btBoxBoxCollisionAlgorithm::CreateFunc), 16);
+	m_boxBoxCF = new (mem) btBoxBoxCollisionAlgorithm::CreateFunc;
+
+	//convex versus plane
+	mem = btAlignedAlloc(sizeof(btConvexPlaneCollisionAlgorithm::CreateFunc), 16);
+	m_convexPlaneCF = new (mem) btConvexPlaneCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btConvexPlaneCollisionAlgorithm::CreateFunc), 16);
+	m_planeConvexCF = new (mem) btConvexPlaneCollisionAlgorithm::CreateFunc;
+	m_planeConvexCF->m_swapped = true;
+
+	///calculate maximum element size, big enough to fit any collision algorithm in the memory pool
+	int maxSize = sizeof(btConvexConvexAlgorithm);
+	int maxSize2 = sizeof(btConvexConcaveCollisionAlgorithm);
+	int maxSize3 = sizeof(btCompoundCollisionAlgorithm);
+	int maxSize4 = sizeof(btCompoundCompoundCollisionAlgorithm);
+
+	int collisionAlgorithmMaxElementSize = btMax(maxSize, constructionInfo.m_customCollisionAlgorithmMaxElementSize);
+	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize, maxSize2);
+	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize, maxSize3);
+	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize, maxSize4);
+
+	if (constructionInfo.m_persistentManifoldPool)
+	{
+		m_ownsPersistentManifoldPool = false;
+		m_persistentManifoldPool = constructionInfo.m_persistentManifoldPool;
+	}
+	else
+	{
+		m_ownsPersistentManifoldPool = true;
+		void* mem = btAlignedAlloc(sizeof(btPoolAllocator), 16);
+		m_persistentManifoldPool = new (mem) btPoolAllocator(sizeof(btPersistentManifold), constructionInfo.m_defaultMaxPersistentManifoldPoolSize);
+	}
+
+	collisionAlgorithmMaxElementSize = (collisionAlgorithmMaxElementSize + 16) & 0xffffffffffff0;
+	if (constructionInfo.m_collisionAlgorithmPool)
+	{
+		m_ownsCollisionAlgorithmPool = false;
+		m_collisionAlgorithmPool = constructionInfo.m_collisionAlgorithmPool;
+	}
+	else
+	{
+		m_ownsCollisionAlgorithmPool = true;
+		void* mem = btAlignedAlloc(sizeof(btPoolAllocator), 16);
+		m_collisionAlgorithmPool = new (mem) btPoolAllocator(collisionAlgorithmMaxElementSize, constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize);
+	}
+}
+
+btDefaultCollisionConfiguration::~btDefaultCollisionConfiguration()
+{
+	if (m_ownsCollisionAlgorithmPool)
+	{
+		m_collisionAlgorithmPool->~btPoolAllocator();
+		btAlignedFree(m_collisionAlgorithmPool);
+	}
+	if (m_ownsPersistentManifoldPool)
+	{
+		m_persistentManifoldPool->~btPoolAllocator();
+		btAlignedFree(m_persistentManifoldPool);
+	}
+
+	m_convexConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_convexConvexCreateFunc);
+
+	m_convexConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_convexConcaveCreateFunc);
+	m_swappedConvexConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_swappedConvexConcaveCreateFunc);
+
+	m_compoundCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_compoundCreateFunc);
+
+	m_compoundCompoundCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_compoundCompoundCreateFunc);
+
+	m_swappedCompoundCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_swappedCompoundCreateFunc);
+
+	m_emptyCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_emptyCreateFunc);
+
+	m_sphereSphereCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_sphereSphereCF);
+
+#ifdef USE_BUGGY_SPHERE_BOX_ALGORITHM
+	m_sphereBoxCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_sphereBoxCF);
+	m_boxSphereCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_boxSphereCF);
+#endif  //USE_BUGGY_SPHERE_BOX_ALGORITHM
+
+	m_sphereTriangleCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_sphereTriangleCF);
+	m_triangleSphereCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_triangleSphereCF);
+	m_boxBoxCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_boxBoxCF);
+
+	m_convexPlaneCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_convexPlaneCF);
+	m_planeConvexCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_planeConvexCF);
+
+	m_pdSolver->~btConvexPenetrationDepthSolver();
+
+	btAlignedFree(m_pdSolver);
+}
+
+btCollisionAlgorithmCreateFunc* btDefaultCollisionConfiguration::getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1)
+{
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE))
+	{
+		return m_sphereSphereCF;
+	}
+#ifdef USE_BUGGY_SPHERE_BOX_ALGORITHM
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == BOX_SHAPE_PROXYTYPE))
+	{
+		return m_sphereBoxCF;
+	}
+
+	if ((proxyType0 == BOX_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE))
+	{
+		return m_boxSphereCF;
+	}
+#endif  //USE_BUGGY_SPHERE_BOX_ALGORITHM
+
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == TRIANGLE_SHAPE_PROXYTYPE))
+	{
+		return m_sphereTriangleCF;
+	}
+
+	if ((proxyType0 == TRIANGLE_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE))
+	{
+		return m_triangleSphereCF;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && (proxyType1 == STATIC_PLANE_PROXYTYPE))
+	{
+		return m_convexPlaneCF;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType1) && (proxyType0 == STATIC_PLANE_PROXYTYPE))
+	{
+		return m_planeConvexCF;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1))
+	{
+		return m_convexConvexCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConcave(proxyType1))
+	{
+		return m_convexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType1) && btBroadphaseProxy::isConcave(proxyType0))
+	{
+		return m_swappedConvexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isCompound(proxyType0) && btBroadphaseProxy::isCompound(proxyType1))
+	{
+		return m_compoundCompoundCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isCompound(proxyType0))
+	{
+		return m_compoundCreateFunc;
+	}
+	else
+	{
+		if (btBroadphaseProxy::isCompound(proxyType1))
+		{
+			return m_swappedCompoundCreateFunc;
+		}
+	}
+
+	//failed to find an algorithm
+	return m_emptyCreateFunc;
+}
+
+btCollisionAlgorithmCreateFunc* btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1)
+{
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE))
+	{
+		return m_sphereSphereCF;
+	}
+#ifdef USE_BUGGY_SPHERE_BOX_ALGORITHM
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == BOX_SHAPE_PROXYTYPE))
+	{
+		return m_sphereBoxCF;
+	}
+
+	if ((proxyType0 == BOX_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE))
+	{
+		return m_boxSphereCF;
+	}
+#endif  //USE_BUGGY_SPHERE_BOX_ALGORITHM
+
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == TRIANGLE_SHAPE_PROXYTYPE))
+	{
+		return m_sphereTriangleCF;
+	}
+
+	if ((proxyType0 == TRIANGLE_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE))
+	{
+		return m_triangleSphereCF;
+	}
+
+	if ((proxyType0 == BOX_SHAPE_PROXYTYPE) && (proxyType1 == BOX_SHAPE_PROXYTYPE))
+	{
+		return m_boxBoxCF;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && (proxyType1 == STATIC_PLANE_PROXYTYPE))
+	{
+		return m_convexPlaneCF;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType1) && (proxyType0 == STATIC_PLANE_PROXYTYPE))
+	{
+		return m_planeConvexCF;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1))
+	{
+		return m_convexConvexCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConcave(proxyType1))
+	{
+		return m_convexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType1) && btBroadphaseProxy::isConcave(proxyType0))
+	{
+		return m_swappedConvexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isCompound(proxyType0) && btBroadphaseProxy::isCompound(proxyType1))
+	{
+		return m_compoundCompoundCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isCompound(proxyType0))
+	{
+		return m_compoundCreateFunc;
+	}
+	else
+	{
+		if (btBroadphaseProxy::isCompound(proxyType1))
+		{
+			return m_swappedCompoundCreateFunc;
+		}
+	}
+
+	//failed to find an algorithm
+	return m_emptyCreateFunc;
+}
+
+void btDefaultCollisionConfiguration::setConvexConvexMultipointIterations(int numPerturbationIterations, int minimumPointsPerturbationThreshold)
+{
+	btConvexConvexAlgorithm::CreateFunc* convexConvex = (btConvexConvexAlgorithm::CreateFunc*)m_convexConvexCreateFunc;
+	convexConvex->m_numPerturbationIterations = numPerturbationIterations;
+	convexConvex->m_minimumPointsPerturbationThreshold = minimumPointsPerturbationThreshold;
+}
+
+void btDefaultCollisionConfiguration::setPlaneConvexMultipointIterations(int numPerturbationIterations, int minimumPointsPerturbationThreshold)
+{
+	btConvexPlaneCollisionAlgorithm::CreateFunc* cpCF = (btConvexPlaneCollisionAlgorithm::CreateFunc*)m_convexPlaneCF;
+	cpCF->m_numPerturbationIterations = numPerturbationIterations;
+	cpCF->m_minimumPointsPerturbationThreshold = minimumPointsPerturbationThreshold;
+
+	btConvexPlaneCollisionAlgorithm::CreateFunc* pcCF = (btConvexPlaneCollisionAlgorithm::CreateFunc*)m_planeConvexCF;
+	pcCF->m_numPerturbationIterations = numPerturbationIterations;
+	pcCF->m_minimumPointsPerturbationThreshold = minimumPointsPerturbationThreshold;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
new file mode 100644
index 0000000..adab540
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
@@ -0,0 +1,111 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_DEFAULT_COLLISION_CONFIGURATION
+#define BT_DEFAULT_COLLISION_CONFIGURATION
+
+#include "btCollisionConfiguration.h"
+class btVoronoiSimplexSolver;
+class btConvexPenetrationDepthSolver;
+
+struct btDefaultCollisionConstructionInfo
+{
+	btPoolAllocator* m_persistentManifoldPool;
+	btPoolAllocator* m_collisionAlgorithmPool;
+	int m_defaultMaxPersistentManifoldPoolSize;
+	int m_defaultMaxCollisionAlgorithmPoolSize;
+	int m_customCollisionAlgorithmMaxElementSize;
+	int m_useEpaPenetrationAlgorithm;
+
+	btDefaultCollisionConstructionInfo()
+		: m_persistentManifoldPool(0),
+		  m_collisionAlgorithmPool(0),
+		  m_defaultMaxPersistentManifoldPoolSize(4096),
+		  m_defaultMaxCollisionAlgorithmPoolSize(4096),
+		  m_customCollisionAlgorithmMaxElementSize(0),
+		  m_useEpaPenetrationAlgorithm(true)
+	{
+	}
+};
+
+///btCollisionConfiguration allows to configure Bullet collision detection
+///stack allocator, pool memory allocators
+///@todo: describe the meaning
+class btDefaultCollisionConfiguration : public btCollisionConfiguration
+{
+protected:
+	int m_persistentManifoldPoolSize;
+
+	btPoolAllocator* m_persistentManifoldPool;
+	bool m_ownsPersistentManifoldPool;
+
+	btPoolAllocator* m_collisionAlgorithmPool;
+	bool m_ownsCollisionAlgorithmPool;
+
+	//default penetration depth solver
+	btConvexPenetrationDepthSolver* m_pdSolver;
+
+	//default CreationFunctions, filling the m_doubleDispatch table
+	btCollisionAlgorithmCreateFunc* m_convexConvexCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_convexConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_swappedConvexConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_compoundCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_compoundCompoundCreateFunc;
+
+	btCollisionAlgorithmCreateFunc* m_swappedCompoundCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_emptyCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_sphereSphereCF;
+	btCollisionAlgorithmCreateFunc* m_sphereBoxCF;
+	btCollisionAlgorithmCreateFunc* m_boxSphereCF;
+
+	btCollisionAlgorithmCreateFunc* m_boxBoxCF;
+	btCollisionAlgorithmCreateFunc* m_sphereTriangleCF;
+	btCollisionAlgorithmCreateFunc* m_triangleSphereCF;
+	btCollisionAlgorithmCreateFunc* m_planeConvexCF;
+	btCollisionAlgorithmCreateFunc* m_convexPlaneCF;
+
+public:
+	btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
+
+	virtual ~btDefaultCollisionConfiguration();
+
+	///memory pools
+	virtual btPoolAllocator* getPersistentManifoldPool()
+	{
+		return m_persistentManifoldPool;
+	}
+
+	virtual btPoolAllocator* getCollisionAlgorithmPool()
+	{
+		return m_collisionAlgorithmPool;
+	}
+
+	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1);
+
+	virtual btCollisionAlgorithmCreateFunc* getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1);
+
+	///Use this method to allow to generate multiple contact points between at once, between two objects using the generic convex-convex algorithm.
+	///By default, this feature is disabled for best performance.
+	///@param numPerturbationIterations controls the number of collision queries. Set it to zero to disable the feature.
+	///@param minimumPointsPerturbationThreshold is the minimum number of points in the contact cache, above which the feature is disabled
+	///3 is a good value for both params, if you want to enable the feature. This is because the default contact cache contains a maximum of 4 points, and one collision query at the unperturbed orientation is performed first.
+	///See Bullet/Demos/CollisionDemo for an example how this feature gathers multiple points.
+	///@todo we could add a per-object setting of those parameters, for level-of-detail collision detection.
+	void setConvexConvexMultipointIterations(int numPerturbationIterations = 3, int minimumPointsPerturbationThreshold = 3);
+
+	void setPlaneConvexMultipointIterations(int numPerturbationIterations = 3, int minimumPointsPerturbationThreshold = 3);
+};
+
+#endif  //BT_DEFAULT_COLLISION_CONFIGURATION
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
new file mode 100644
index 0000000..6c71dc5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
@@ -0,0 +1,30 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btEmptyCollisionAlgorithm.h"
+
+btEmptyAlgorithm::btEmptyAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+	: btCollisionAlgorithm(ci)
+{
+}
+
+void btEmptyAlgorithm::processCollision(const btCollisionObjectWrapper*, const btCollisionObjectWrapper*, const btDispatcherInfo&, btManifoldResult*)
+{
+}
+
+btScalar btEmptyAlgorithm::calculateTimeOfImpact(btCollisionObject*, btCollisionObject*, const btDispatcherInfo&, btManifoldResult*)
+{
+	return btScalar(1.);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
new file mode 100644
index 0000000..fef2f27
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
@@ -0,0 +1,52 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_EMPTY_ALGORITH
+#define BT_EMPTY_ALGORITH
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "btCollisionCreateFunc.h"
+#include "btCollisionDispatcher.h"
+
+#define ATTRIBUTE_ALIGNED(a)
+
+///EmptyAlgorithm is a stub for unsupported collision pairs.
+///The dispatcher can dispatch a persistent btEmptyAlgorithm to avoid a search every frame.
+class btEmptyAlgorithm : public btCollisionAlgorithm
+{
+public:
+	btEmptyAlgorithm(const btCollisionAlgorithmConstructionInfo& ci);
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			(void)body0Wrap;
+			(void)body1Wrap;
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btEmptyAlgorithm));
+			return new (mem) btEmptyAlgorithm(ci);
+		}
+	};
+
+} ATTRIBUTE_ALIGNED(16);
+
+#endif  //BT_EMPTY_ALGORITH
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.cpp
new file mode 100644
index 0000000..00f16fd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.cpp
@@ -0,0 +1,166 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGhostObject.h"
+#include "btCollisionWorld.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "LinearMath/btAabbUtil2.h"
+
+btGhostObject::btGhostObject()
+{
+	m_internalType = CO_GHOST_OBJECT;
+}
+
+btGhostObject::~btGhostObject()
+{
+	///btGhostObject should have been removed from the world, so no overlapping objects
+	btAssert(!m_overlappingObjects.size());
+}
+
+void btGhostObject::addOverlappingObjectInternal(btBroadphaseProxy* otherProxy, btBroadphaseProxy* thisProxy)
+{
+	btCollisionObject* otherObject = (btCollisionObject*)otherProxy->m_clientObject;
+	btAssert(otherObject);
+	///if this linearSearch becomes too slow (too many overlapping objects) we should add a more appropriate data structure
+	int index = m_overlappingObjects.findLinearSearch(otherObject);
+	if (index == m_overlappingObjects.size())
+	{
+		//not found
+		m_overlappingObjects.push_back(otherObject);
+	}
+}
+
+void btGhostObject::removeOverlappingObjectInternal(btBroadphaseProxy* otherProxy, btDispatcher* dispatcher, btBroadphaseProxy* thisProxy)
+{
+	btCollisionObject* otherObject = (btCollisionObject*)otherProxy->m_clientObject;
+	btAssert(otherObject);
+	int index = m_overlappingObjects.findLinearSearch(otherObject);
+	if (index < m_overlappingObjects.size())
+	{
+		m_overlappingObjects[index] = m_overlappingObjects[m_overlappingObjects.size() - 1];
+		m_overlappingObjects.pop_back();
+	}
+}
+
+btPairCachingGhostObject::btPairCachingGhostObject()
+{
+	m_hashPairCache = new (btAlignedAlloc(sizeof(btHashedOverlappingPairCache), 16)) btHashedOverlappingPairCache();
+}
+
+btPairCachingGhostObject::~btPairCachingGhostObject()
+{
+	m_hashPairCache->~btHashedOverlappingPairCache();
+	btAlignedFree(m_hashPairCache);
+}
+
+void btPairCachingGhostObject::addOverlappingObjectInternal(btBroadphaseProxy* otherProxy, btBroadphaseProxy* thisProxy)
+{
+	btBroadphaseProxy* actualThisProxy = thisProxy ? thisProxy : getBroadphaseHandle();
+	btAssert(actualThisProxy);
+
+	btCollisionObject* otherObject = (btCollisionObject*)otherProxy->m_clientObject;
+	btAssert(otherObject);
+	int index = m_overlappingObjects.findLinearSearch(otherObject);
+	if (index == m_overlappingObjects.size())
+	{
+		m_overlappingObjects.push_back(otherObject);
+		m_hashPairCache->addOverlappingPair(actualThisProxy, otherProxy);
+	}
+}
+
+void btPairCachingGhostObject::removeOverlappingObjectInternal(btBroadphaseProxy* otherProxy, btDispatcher* dispatcher, btBroadphaseProxy* thisProxy1)
+{
+	btCollisionObject* otherObject = (btCollisionObject*)otherProxy->m_clientObject;
+	btBroadphaseProxy* actualThisProxy = thisProxy1 ? thisProxy1 : getBroadphaseHandle();
+	btAssert(actualThisProxy);
+
+	btAssert(otherObject);
+	int index = m_overlappingObjects.findLinearSearch(otherObject);
+	if (index < m_overlappingObjects.size())
+	{
+		m_overlappingObjects[index] = m_overlappingObjects[m_overlappingObjects.size() - 1];
+		m_overlappingObjects.pop_back();
+		m_hashPairCache->removeOverlappingPair(actualThisProxy, otherProxy, dispatcher);
+	}
+}
+
+void btGhostObject::convexSweepTest(const btConvexShape* castShape, const btTransform& convexFromWorld, const btTransform& convexToWorld, btCollisionWorld::ConvexResultCallback& resultCallback, btScalar allowedCcdPenetration) const
+{
+	btTransform convexFromTrans, convexToTrans;
+	convexFromTrans = convexFromWorld;
+	convexToTrans = convexToWorld;
+	btVector3 castShapeAabbMin, castShapeAabbMax;
+	/* Compute AABB that encompasses angular movement */
+	{
+		btVector3 linVel, angVel;
+		btTransformUtil::calculateVelocity(convexFromTrans, convexToTrans, 1.0, linVel, angVel);
+		btTransform R;
+		R.setIdentity();
+		R.setRotation(convexFromTrans.getRotation());
+		castShape->calculateTemporalAabb(R, linVel, angVel, 1.0, castShapeAabbMin, castShapeAabbMax);
+	}
+
+	/// go over all objects, and if the ray intersects their aabb + cast shape aabb,
+	// do a ray-shape query using convexCaster (CCD)
+	int i;
+	for (i = 0; i < m_overlappingObjects.size(); i++)
+	{
+		btCollisionObject* collisionObject = m_overlappingObjects[i];
+		//only perform raycast if filterMask matches
+		if (resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+			btVector3 collisionObjectAabbMin, collisionObjectAabbMax;
+			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(), collisionObjectAabbMin, collisionObjectAabbMax);
+			AabbExpand(collisionObjectAabbMin, collisionObjectAabbMax, castShapeAabbMin, castShapeAabbMax);
+			btScalar hitLambda = btScalar(1.);  //could use resultCallback.m_closestHitFraction, but needs testing
+			btVector3 hitNormal;
+			if (btRayAabb(convexFromWorld.getOrigin(), convexToWorld.getOrigin(), collisionObjectAabbMin, collisionObjectAabbMax, hitLambda, hitNormal))
+			{
+				btCollisionWorld::objectQuerySingle(castShape, convexFromTrans, convexToTrans,
+													collisionObject,
+													collisionObject->getCollisionShape(),
+													collisionObject->getWorldTransform(),
+													resultCallback,
+													allowedCcdPenetration);
+			}
+		}
+	}
+}
+
+void btGhostObject::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const
+{
+	btTransform rayFromTrans;
+	rayFromTrans.setIdentity();
+	rayFromTrans.setOrigin(rayFromWorld);
+	btTransform rayToTrans;
+	rayToTrans.setIdentity();
+	rayToTrans.setOrigin(rayToWorld);
+
+	int i;
+	for (i = 0; i < m_overlappingObjects.size(); i++)
+	{
+		btCollisionObject* collisionObject = m_overlappingObjects[i];
+		//only perform raycast if filterMask matches
+		if (resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			btCollisionWorld::rayTestSingle(rayFromTrans, rayToTrans,
+											collisionObject,
+											collisionObject->getCollisionShape(),
+											collisionObject->getWorldTransform(),
+											resultCallback);
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.h
new file mode 100644
index 0000000..aa7f48d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btGhostObject.h
@@ -0,0 +1,162 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GHOST_OBJECT_H
+#define BT_GHOST_OBJECT_H
+
+#include "btCollisionObject.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h"
+#include "LinearMath/btAlignedAllocator.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "btCollisionWorld.h"
+
+class btConvexShape;
+
+class btDispatcher;
+
+///The btGhostObject can keep track of all objects that are overlapping
+///By default, this overlap is based on the AABB
+///This is useful for creating a character controller, collision sensors/triggers, explosions etc.
+///We plan on adding rayTest and other queries for the btGhostObject
+ATTRIBUTE_ALIGNED16(class)
+btGhostObject : public btCollisionObject
+{
+protected:
+	btAlignedObjectArray<btCollisionObject*> m_overlappingObjects;
+
+public:
+	btGhostObject();
+
+	virtual ~btGhostObject();
+
+	void convexSweepTest(const class btConvexShape* castShape, const btTransform& convexFromWorld, const btTransform& convexToWorld, btCollisionWorld::ConvexResultCallback& resultCallback, btScalar allowedCcdPenetration = 0.f) const;
+
+	void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, btCollisionWorld::RayResultCallback& resultCallback) const;
+
+	///this method is mainly for expert/internal use only.
+	virtual void addOverlappingObjectInternal(btBroadphaseProxy * otherProxy, btBroadphaseProxy* thisProxy = 0);
+	///this method is mainly for expert/internal use only.
+	virtual void removeOverlappingObjectInternal(btBroadphaseProxy * otherProxy, btDispatcher * dispatcher, btBroadphaseProxy* thisProxy = 0);
+
+	int getNumOverlappingObjects() const
+	{
+		return m_overlappingObjects.size();
+	}
+
+	btCollisionObject* getOverlappingObject(int index)
+	{
+		return m_overlappingObjects[index];
+	}
+
+	const btCollisionObject* getOverlappingObject(int index) const
+	{
+		return m_overlappingObjects[index];
+	}
+
+	btAlignedObjectArray<btCollisionObject*>& getOverlappingPairs()
+	{
+		return m_overlappingObjects;
+	}
+
+	const btAlignedObjectArray<btCollisionObject*> getOverlappingPairs() const
+	{
+		return m_overlappingObjects;
+	}
+
+	//
+	// internal cast
+	//
+
+	static const btGhostObject* upcast(const btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType() == CO_GHOST_OBJECT)
+			return (const btGhostObject*)colObj;
+		return 0;
+	}
+	static btGhostObject* upcast(btCollisionObject * colObj)
+	{
+		if (colObj->getInternalType() == CO_GHOST_OBJECT)
+			return (btGhostObject*)colObj;
+		return 0;
+	}
+};
+
+class btPairCachingGhostObject : public btGhostObject
+{
+	btHashedOverlappingPairCache* m_hashPairCache;
+
+public:
+	btPairCachingGhostObject();
+
+	virtual ~btPairCachingGhostObject();
+
+	///this method is mainly for expert/internal use only.
+	virtual void addOverlappingObjectInternal(btBroadphaseProxy* otherProxy, btBroadphaseProxy* thisProxy = 0);
+
+	virtual void removeOverlappingObjectInternal(btBroadphaseProxy* otherProxy, btDispatcher* dispatcher, btBroadphaseProxy* thisProxy = 0);
+
+	btHashedOverlappingPairCache* getOverlappingPairCache()
+	{
+		return m_hashPairCache;
+	}
+};
+
+///The btGhostPairCallback interfaces and forwards adding and removal of overlapping pairs from the btBroadphaseInterface to btGhostObject.
+class btGhostPairCallback : public btOverlappingPairCallback
+{
+public:
+	btGhostPairCallback()
+	{
+	}
+
+	virtual ~btGhostPairCallback()
+	{
+	}
+
+	virtual btBroadphasePair* addOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+	{
+		btCollisionObject* colObj0 = (btCollisionObject*)proxy0->m_clientObject;
+		btCollisionObject* colObj1 = (btCollisionObject*)proxy1->m_clientObject;
+		btGhostObject* ghost0 = btGhostObject::upcast(colObj0);
+		btGhostObject* ghost1 = btGhostObject::upcast(colObj1);
+		if (ghost0)
+			ghost0->addOverlappingObjectInternal(proxy1, proxy0);
+		if (ghost1)
+			ghost1->addOverlappingObjectInternal(proxy0, proxy1);
+		return 0;
+	}
+
+	virtual void* removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1, btDispatcher* dispatcher)
+	{
+		btCollisionObject* colObj0 = (btCollisionObject*)proxy0->m_clientObject;
+		btCollisionObject* colObj1 = (btCollisionObject*)proxy1->m_clientObject;
+		btGhostObject* ghost0 = btGhostObject::upcast(colObj0);
+		btGhostObject* ghost1 = btGhostObject::upcast(colObj1);
+		if (ghost0)
+			ghost0->removeOverlappingObjectInternal(proxy1, dispatcher, proxy0);
+		if (ghost1)
+			ghost1->removeOverlappingObjectInternal(proxy0, dispatcher, proxy1);
+		return 0;
+	}
+
+	virtual void removeOverlappingPairsContainingProxy(btBroadphaseProxy* /*proxy0*/, btDispatcher* /*dispatcher*/)
+	{
+		btAssert(0);
+		//need to keep track of all ghost objects and call them here
+		//m_hashPairCache->removeOverlappingPairsContainingProxy(proxy0,dispatcher);
+	}
+};
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp
new file mode 100644
index 0000000..18d7dfd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp
@@ -0,0 +1,244 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btHashedSimplePairCache.h"
+
+#include <stdio.h>
+
+#ifdef BT_DEBUG_COLLISION_PAIRS
+int gOverlappingSimplePairs = 0;
+int gRemoveSimplePairs = 0;
+int gAddedSimplePairs = 0;
+int gFindSimplePairs = 0;
+#endif  //BT_DEBUG_COLLISION_PAIRS
+
+btHashedSimplePairCache::btHashedSimplePairCache()
+{
+	int initialAllocatedSize = 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+	growTables();
+}
+
+btHashedSimplePairCache::~btHashedSimplePairCache()
+{
+}
+
+void btHashedSimplePairCache::removeAllPairs()
+{
+	m_overlappingPairArray.clear();
+	m_hashTable.clear();
+	m_next.clear();
+
+	int initialAllocatedSize = 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+	growTables();
+}
+
+btSimplePair* btHashedSimplePairCache::findPair(int indexA, int indexB)
+{
+#ifdef BT_DEBUG_COLLISION_PAIRS
+	gFindSimplePairs++;
+#endif
+
+	/*if (indexA > indexB) 
+		btSwap(indexA, indexB);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(indexA), static_cast<unsigned int>(indexB)) & (m_overlappingPairArray.capacity() - 1));
+
+	if (hash >= m_hashTable.size())
+	{
+		return NULL;
+	}
+
+	int index = m_hashTable[hash];
+	while (index != BT_SIMPLE_NULL_PAIR && equalsPair(m_overlappingPairArray[index], indexA, indexB) == false)
+	{
+		index = m_next[index];
+	}
+
+	if (index == BT_SIMPLE_NULL_PAIR)
+	{
+		return NULL;
+	}
+
+	btAssert(index < m_overlappingPairArray.size());
+
+	return &m_overlappingPairArray[index];
+}
+
+//#include <stdio.h>
+
+void btHashedSimplePairCache::growTables()
+{
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (m_hashTable.size() < newCapacity)
+	{
+		//grow hashtable and next table
+		int curHashtableSize = m_hashTable.size();
+
+		m_hashTable.resize(newCapacity);
+		m_next.resize(newCapacity);
+
+		int i;
+
+		for (i = 0; i < newCapacity; ++i)
+		{
+			m_hashTable[i] = BT_SIMPLE_NULL_PAIR;
+		}
+		for (i = 0; i < newCapacity; ++i)
+		{
+			m_next[i] = BT_SIMPLE_NULL_PAIR;
+		}
+
+		for (i = 0; i < curHashtableSize; i++)
+		{
+			const btSimplePair& pair = m_overlappingPairArray[i];
+			int indexA = pair.m_indexA;
+			int indexB = pair.m_indexB;
+
+			int hashValue = static_cast<int>(getHash(static_cast<unsigned int>(indexA), static_cast<unsigned int>(indexB)) & (m_overlappingPairArray.capacity() - 1));  // New hash value with new mask
+			m_next[i] = m_hashTable[hashValue];
+			m_hashTable[hashValue] = i;
+		}
+	}
+}
+
+btSimplePair* btHashedSimplePairCache::internalAddPair(int indexA, int indexB)
+{
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(indexA), static_cast<unsigned int>(indexB)) & (m_overlappingPairArray.capacity() - 1));  // New hash value with new mask
+
+	btSimplePair* pair = internalFindPair(indexA, indexB, hash);
+	if (pair != NULL)
+	{
+		return pair;
+	}
+
+	int count = m_overlappingPairArray.size();
+	int oldCapacity = m_overlappingPairArray.capacity();
+	void* mem = &m_overlappingPairArray.expandNonInitializing();
+
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (oldCapacity < newCapacity)
+	{
+		growTables();
+		//hash with new capacity
+		hash = static_cast<int>(getHash(static_cast<unsigned int>(indexA), static_cast<unsigned int>(indexB)) & (m_overlappingPairArray.capacity() - 1));
+	}
+
+	pair = new (mem) btSimplePair(indexA, indexB);
+
+	pair->m_userPointer = 0;
+
+	m_next[count] = m_hashTable[hash];
+	m_hashTable[hash] = count;
+
+	return pair;
+}
+
+void* btHashedSimplePairCache::removeOverlappingPair(int indexA, int indexB)
+{
+#ifdef BT_DEBUG_COLLISION_PAIRS
+	gRemoveSimplePairs++;
+#endif
+
+	/*if (indexA > indexB) 
+		btSwap(indexA, indexB);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(indexA), static_cast<unsigned int>(indexB)) & (m_overlappingPairArray.capacity() - 1));
+
+	btSimplePair* pair = internalFindPair(indexA, indexB, hash);
+	if (pair == NULL)
+	{
+		return 0;
+	}
+
+	void* userData = pair->m_userPointer;
+
+	int pairIndex = int(pair - &m_overlappingPairArray[0]);
+	btAssert(pairIndex < m_overlappingPairArray.size());
+
+	// Remove the pair from the hash table.
+	int index = m_hashTable[hash];
+	btAssert(index != BT_SIMPLE_NULL_PAIR);
+
+	int previous = BT_SIMPLE_NULL_PAIR;
+	while (index != pairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != BT_SIMPLE_NULL_PAIR)
+	{
+		btAssert(m_next[previous] == pairIndex);
+		m_next[previous] = m_next[pairIndex];
+	}
+	else
+	{
+		m_hashTable[hash] = m_next[pairIndex];
+	}
+
+	// We now move the last pair into spot of the
+	// pair being removed. We need to fix the hash
+	// table indices to support the move.
+
+	int lastPairIndex = m_overlappingPairArray.size() - 1;
+
+	// If the removed pair is the last pair, we are done.
+	if (lastPairIndex == pairIndex)
+	{
+		m_overlappingPairArray.pop_back();
+		return userData;
+	}
+
+	// Remove the last pair from the hash table.
+	const btSimplePair* last = &m_overlappingPairArray[lastPairIndex];
+	/* missing swap here too, Nat. */
+	int lastHash = static_cast<int>(getHash(static_cast<unsigned int>(last->m_indexA), static_cast<unsigned int>(last->m_indexB)) & (m_overlappingPairArray.capacity() - 1));
+
+	index = m_hashTable[lastHash];
+	btAssert(index != BT_SIMPLE_NULL_PAIR);
+
+	previous = BT_SIMPLE_NULL_PAIR;
+	while (index != lastPairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != BT_SIMPLE_NULL_PAIR)
+	{
+		btAssert(m_next[previous] == lastPairIndex);
+		m_next[previous] = m_next[lastPairIndex];
+	}
+	else
+	{
+		m_hashTable[lastHash] = m_next[lastPairIndex];
+	}
+
+	// Copy the last pair into the remove pair's spot.
+	m_overlappingPairArray[pairIndex] = m_overlappingPairArray[lastPairIndex];
+
+	// Insert the last pair into the hash table
+	m_next[pairIndex] = m_hashTable[lastHash];
+	m_hashTable[lastHash] = pairIndex;
+
+	m_overlappingPairArray.pop_back();
+
+	return userData;
+}
+//#include <stdio.h>
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h
new file mode 100644
index 0000000..e6acbb8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h
@@ -0,0 +1,149 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_HASHED_SIMPLE_PAIR_CACHE_H
+#define BT_HASHED_SIMPLE_PAIR_CACHE_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+
+const int BT_SIMPLE_NULL_PAIR = 0xffffffff;
+
+struct btSimplePair
+{
+	btSimplePair(int indexA, int indexB)
+		: m_indexA(indexA),
+		  m_indexB(indexB),
+		  m_userPointer(0)
+	{
+	}
+
+	int m_indexA;
+	int m_indexB;
+	union {
+		void* m_userPointer;
+		int m_userValue;
+	};
+};
+
+typedef btAlignedObjectArray<btSimplePair> btSimplePairArray;
+
+#ifdef BT_DEBUG_COLLISION_PAIRS
+extern int gOverlappingSimplePairs;
+extern int gRemoveSimplePairs;
+extern int gAddedSimplePairs;
+extern int gFindSimplePairs;
+#endif  //BT_DEBUG_COLLISION_PAIRS
+
+class btHashedSimplePairCache
+{
+	btSimplePairArray m_overlappingPairArray;
+
+protected:
+	btAlignedObjectArray<int> m_hashTable;
+	btAlignedObjectArray<int> m_next;
+
+public:
+	btHashedSimplePairCache();
+	virtual ~btHashedSimplePairCache();
+
+	void removeAllPairs();
+
+	virtual void* removeOverlappingPair(int indexA, int indexB);
+
+	// Add a pair and return the new pair. If the pair already exists,
+	// no new pair is created and the old one is returned.
+	virtual btSimplePair* addOverlappingPair(int indexA, int indexB)
+	{
+#ifdef BT_DEBUG_COLLISION_PAIRS
+		gAddedSimplePairs++;
+#endif
+
+		return internalAddPair(indexA, indexB);
+	}
+
+	virtual btSimplePair* getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	const btSimplePair* getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	btSimplePairArray& getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	const btSimplePairArray& getOverlappingPairArray() const
+	{
+		return m_overlappingPairArray;
+	}
+
+	btSimplePair* findPair(int indexA, int indexB);
+
+	int GetCount() const { return m_overlappingPairArray.size(); }
+
+	int getNumOverlappingPairs() const
+	{
+		return m_overlappingPairArray.size();
+	}
+
+private:
+	btSimplePair* internalAddPair(int indexA, int indexB);
+
+	void growTables();
+
+	SIMD_FORCE_INLINE bool equalsPair(const btSimplePair& pair, int indexA, int indexB)
+	{
+		return pair.m_indexA == indexA && pair.m_indexB == indexB;
+	}
+
+	SIMD_FORCE_INLINE unsigned int getHash(unsigned int indexA, unsigned int indexB)
+	{
+		unsigned int key = indexA | (indexB << 16);
+		// Thomas Wang's hash
+
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+
+	SIMD_FORCE_INLINE btSimplePair* internalFindPair(int proxyIdA, int proxyIdB, int hash)
+	{
+		int index = m_hashTable[hash];
+
+		while (index != BT_SIMPLE_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyIdA, proxyIdB) == false)
+		{
+			index = m_next[index];
+		}
+
+		if (index == BT_SIMPLE_NULL_PAIR)
+		{
+			return NULL;
+		}
+
+		btAssert(index < m_overlappingPairArray.size());
+
+		return &m_overlappingPairArray[index];
+	}
+};
+
+#endif  //BT_HASHED_SIMPLE_PAIR_CACHE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
new file mode 100644
index 0000000..a71700f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
@@ -0,0 +1,900 @@
+#include "btInternalEdgeUtility.h"
+
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"
+
+#include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+//#define DEBUG_INTERNAL_EDGE
+
+#ifdef DEBUG_INTERNAL_EDGE
+#include <stdio.h>
+#endif  //DEBUG_INTERNAL_EDGE
+
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+static btIDebugDraw* gDebugDrawer = 0;
+
+void btSetDebugDrawer(btIDebugDraw* debugDrawer)
+{
+	gDebugDrawer = debugDrawer;
+}
+
+static void btDebugDrawLine(const btVector3& from, const btVector3& to, const btVector3& color)
+{
+	if (gDebugDrawer)
+		gDebugDrawer->drawLine(from, to, color);
+}
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+static int btGetHash(int partId, int triangleIndex)
+{
+	int hash = (partId << (31 - MAX_NUM_PARTS_IN_BITS)) | triangleIndex;
+	return hash;
+}
+
+static btScalar btGetAngle(const btVector3& edgeA, const btVector3& normalA, const btVector3& normalB)
+{
+	const btVector3 refAxis0 = edgeA;
+	const btVector3 refAxis1 = normalA;
+	const btVector3 swingAxis = normalB;
+	btScalar angle = btAtan2(swingAxis.dot(refAxis0), swingAxis.dot(refAxis1));
+	return angle;
+}
+
+struct btConnectivityProcessor : public btTriangleCallback
+{
+	int m_partIdA;
+	int m_triangleIndexA;
+	btVector3* m_triangleVerticesA;
+	btTriangleInfoMap* m_triangleInfoMap;
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+	{
+		//skip self-collisions
+		if ((m_partIdA == partId) && (m_triangleIndexA == triangleIndex))
+			return;
+
+		//skip duplicates (disabled for now)
+		//if ((m_partIdA <= partId) && (m_triangleIndexA <= triangleIndex))
+		//	return;
+
+		//search for shared vertices and edges
+		int numshared = 0;
+		int sharedVertsA[3] = {-1, -1, -1};
+		int sharedVertsB[3] = {-1, -1, -1};
+
+		///skip degenerate triangles
+		btScalar crossBSqr = ((triangle[1] - triangle[0]).cross(triangle[2] - triangle[0])).length2();
+		if (crossBSqr < m_triangleInfoMap->m_equalVertexThreshold)
+			return;
+
+		btScalar crossASqr = ((m_triangleVerticesA[1] - m_triangleVerticesA[0]).cross(m_triangleVerticesA[2] - m_triangleVerticesA[0])).length2();
+		///skip degenerate triangles
+		if (crossASqr < m_triangleInfoMap->m_equalVertexThreshold)
+			return;
+
+#if 0
+		printf("triangle A[0]	=	(%f,%f,%f)\ntriangle A[1]	=	(%f,%f,%f)\ntriangle A[2]	=	(%f,%f,%f)\n",
+			m_triangleVerticesA[0].getX(),m_triangleVerticesA[0].getY(),m_triangleVerticesA[0].getZ(),
+			m_triangleVerticesA[1].getX(),m_triangleVerticesA[1].getY(),m_triangleVerticesA[1].getZ(),
+			m_triangleVerticesA[2].getX(),m_triangleVerticesA[2].getY(),m_triangleVerticesA[2].getZ());
+
+		printf("partId=%d, triangleIndex=%d\n",partId,triangleIndex);
+		printf("triangle B[0]	=	(%f,%f,%f)\ntriangle B[1]	=	(%f,%f,%f)\ntriangle B[2]	=	(%f,%f,%f)\n",
+			triangle[0].getX(),triangle[0].getY(),triangle[0].getZ(),
+			triangle[1].getX(),triangle[1].getY(),triangle[1].getZ(),
+			triangle[2].getX(),triangle[2].getY(),triangle[2].getZ());
+#endif
+
+		for (int i = 0; i < 3; i++)
+		{
+			for (int j = 0; j < 3; j++)
+			{
+				if ((m_triangleVerticesA[i] - triangle[j]).length2() < m_triangleInfoMap->m_equalVertexThreshold)
+				{
+					sharedVertsA[numshared] = i;
+					sharedVertsB[numshared] = j;
+					numshared++;
+					///degenerate case
+					if (numshared >= 3)
+						return;
+				}
+			}
+			///degenerate case
+			if (numshared >= 3)
+				return;
+		}
+		switch (numshared)
+		{
+			case 0:
+			{
+				break;
+			}
+			case 1:
+			{
+				//shared vertex
+				break;
+			}
+			case 2:
+			{
+				//shared edge
+				//we need to make sure the edge is in the order V2V0 and not V0V2 so that the signs are correct
+				if (sharedVertsA[0] == 0 && sharedVertsA[1] == 2)
+				{
+					sharedVertsA[0] = 2;
+					sharedVertsA[1] = 0;
+					int tmp = sharedVertsB[1];
+					sharedVertsB[1] = sharedVertsB[0];
+					sharedVertsB[0] = tmp;
+				}
+
+				int hash = btGetHash(m_partIdA, m_triangleIndexA);
+
+				btTriangleInfo* info = m_triangleInfoMap->find(hash);
+				if (!info)
+				{
+					btTriangleInfo tmp;
+					m_triangleInfoMap->insert(hash, tmp);
+					info = m_triangleInfoMap->find(hash);
+				}
+
+				int sumvertsA = sharedVertsA[0] + sharedVertsA[1];
+				int otherIndexA = 3 - sumvertsA;
+
+				btVector3 edge(m_triangleVerticesA[sharedVertsA[1]] - m_triangleVerticesA[sharedVertsA[0]]);
+
+				btTriangleShape tA(m_triangleVerticesA[0], m_triangleVerticesA[1], m_triangleVerticesA[2]);
+				int otherIndexB = 3 - (sharedVertsB[0] + sharedVertsB[1]);
+
+				btTriangleShape tB(triangle[sharedVertsB[1]], triangle[sharedVertsB[0]], triangle[otherIndexB]);
+				//btTriangleShape tB(triangle[0],triangle[1],triangle[2]);
+
+				btVector3 normalA;
+				btVector3 normalB;
+				tA.calcNormal(normalA);
+				tB.calcNormal(normalB);
+				edge.normalize();
+				btVector3 edgeCrossA = edge.cross(normalA).normalize();
+
+				{
+					btVector3 tmp = m_triangleVerticesA[otherIndexA] - m_triangleVerticesA[sharedVertsA[0]];
+					if (edgeCrossA.dot(tmp) < 0)
+					{
+						edgeCrossA *= -1;
+					}
+				}
+
+				btVector3 edgeCrossB = edge.cross(normalB).normalize();
+
+				{
+					btVector3 tmp = triangle[otherIndexB] - triangle[sharedVertsB[0]];
+					if (edgeCrossB.dot(tmp) < 0)
+					{
+						edgeCrossB *= -1;
+					}
+				}
+
+				btScalar angle2 = 0;
+				btScalar ang4 = 0.f;
+
+				btVector3 calculatedEdge = edgeCrossA.cross(edgeCrossB);
+				btScalar len2 = calculatedEdge.length2();
+
+				btScalar correctedAngle(0);
+				//btVector3 calculatedNormalB = normalA;
+				bool isConvex = false;
+
+				if (len2 < m_triangleInfoMap->m_planarEpsilon)
+				{
+					angle2 = 0.f;
+					ang4 = 0.f;
+				}
+				else
+				{
+					calculatedEdge.normalize();
+					btVector3 calculatedNormalA = calculatedEdge.cross(edgeCrossA);
+					calculatedNormalA.normalize();
+					angle2 = btGetAngle(calculatedNormalA, edgeCrossA, edgeCrossB);
+					ang4 = SIMD_PI - angle2;
+					btScalar dotA = normalA.dot(edgeCrossB);
+					///@todo: check if we need some epsilon, due to floating point imprecision
+					isConvex = (dotA < 0.);
+
+					correctedAngle = isConvex ? ang4 : -ang4;
+				}
+
+				//alternatively use
+				//btVector3 calculatedNormalB2 = quatRotate(orn,normalA);
+
+				switch (sumvertsA)
+				{
+					case 1:
+					{
+						btVector3 edge = m_triangleVerticesA[0] - m_triangleVerticesA[1];
+						btQuaternion orn(edge, -correctedAngle);
+						btVector3 computedNormalB = quatRotate(orn, normalA);
+						btScalar bla = computedNormalB.dot(normalB);
+						if (bla < 0)
+						{
+							computedNormalB *= -1;
+							info->m_flags |= TRI_INFO_V0V1_SWAP_NORMALB;
+						}
+#ifdef DEBUG_INTERNAL_EDGE
+						if ((computedNormalB - normalB).length() > 0.0001)
+						{
+							printf("warning: normals not identical\n");
+						}
+#endif  //DEBUG_INTERNAL_EDGE
+
+						info->m_edgeV0V1Angle = -correctedAngle;
+
+						if (isConvex)
+							info->m_flags |= TRI_INFO_V0V1_CONVEX;
+						break;
+					}
+					case 2:
+					{
+						btVector3 edge = m_triangleVerticesA[2] - m_triangleVerticesA[0];
+						btQuaternion orn(edge, -correctedAngle);
+						btVector3 computedNormalB = quatRotate(orn, normalA);
+						if (computedNormalB.dot(normalB) < 0)
+						{
+							computedNormalB *= -1;
+							info->m_flags |= TRI_INFO_V2V0_SWAP_NORMALB;
+						}
+
+#ifdef DEBUG_INTERNAL_EDGE
+						if ((computedNormalB - normalB).length() > 0.0001)
+						{
+							printf("warning: normals not identical\n");
+						}
+#endif  //DEBUG_INTERNAL_EDGE
+						info->m_edgeV2V0Angle = -correctedAngle;
+						if (isConvex)
+							info->m_flags |= TRI_INFO_V2V0_CONVEX;
+						break;
+					}
+					case 3:
+					{
+						btVector3 edge = m_triangleVerticesA[1] - m_triangleVerticesA[2];
+						btQuaternion orn(edge, -correctedAngle);
+						btVector3 computedNormalB = quatRotate(orn, normalA);
+						if (computedNormalB.dot(normalB) < 0)
+						{
+							info->m_flags |= TRI_INFO_V1V2_SWAP_NORMALB;
+							computedNormalB *= -1;
+						}
+#ifdef DEBUG_INTERNAL_EDGE
+						if ((computedNormalB - normalB).length() > 0.0001)
+						{
+							printf("warning: normals not identical\n");
+						}
+#endif  //DEBUG_INTERNAL_EDGE
+						info->m_edgeV1V2Angle = -correctedAngle;
+
+						if (isConvex)
+							info->m_flags |= TRI_INFO_V1V2_CONVEX;
+						break;
+					}
+				}
+
+				break;
+			}
+			default:
+			{
+				//				printf("warning: duplicate triangle\n");
+			}
+		}
+	}
+};
+
+
+struct b3ProcessAllTrianglesHeightfield: public btTriangleCallback
+{
+	btHeightfieldTerrainShape* m_heightfieldShape;
+	btTriangleInfoMap* m_triangleInfoMap;
+	
+
+	b3ProcessAllTrianglesHeightfield(btHeightfieldTerrainShape* heightFieldShape, btTriangleInfoMap* triangleInfoMap)
+		:m_heightfieldShape(heightFieldShape),
+		m_triangleInfoMap(triangleInfoMap)
+	{
+	}
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+	{
+		btConnectivityProcessor connectivityProcessor;
+		connectivityProcessor.m_partIdA = partId;
+		connectivityProcessor.m_triangleIndexA = triangleIndex;
+		connectivityProcessor.m_triangleVerticesA = triangle;
+		connectivityProcessor.m_triangleInfoMap = m_triangleInfoMap;
+		btVector3 aabbMin, aabbMax;
+		aabbMin.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+		aabbMax.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+		aabbMin.setMin(triangle[0]);
+		aabbMax.setMax(triangle[0]);
+		aabbMin.setMin(triangle[1]);
+		aabbMax.setMax(triangle[1]);
+		aabbMin.setMin(triangle[2]);
+		aabbMax.setMax(triangle[2]);
+
+		m_heightfieldShape->processAllTriangles(&connectivityProcessor, aabbMin, aabbMax);
+	}
+};
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+
+void btGenerateInternalEdgeInfo(btBvhTriangleMeshShape* trimeshShape, btTriangleInfoMap* triangleInfoMap)
+{
+	//the user pointer shouldn't already be used for other purposes, we intend to store connectivity info there!
+	if (trimeshShape->getTriangleInfoMap())
+		return;
+
+	trimeshShape->setTriangleInfoMap(triangleInfoMap);
+
+	btStridingMeshInterface* meshInterface = trimeshShape->getMeshInterface();
+	const btVector3& meshScaling = meshInterface->getScaling();
+
+	for (int partId = 0; partId < meshInterface->getNumSubParts(); partId++)
+	{
+		const unsigned char* vertexbase = 0;
+		int numverts = 0;
+		PHY_ScalarType type = PHY_INTEGER;
+		int stride = 0;
+		const unsigned char* indexbase = 0;
+		int indexstride = 0;
+		int numfaces = 0;
+		PHY_ScalarType indicestype = PHY_INTEGER;
+		//PHY_ScalarType indexType=0;
+
+		btVector3 triangleVerts[3];
+		meshInterface->getLockedReadOnlyVertexIndexBase(&vertexbase, numverts, type, stride, &indexbase, indexstride, numfaces, indicestype, partId);
+		btVector3 aabbMin, aabbMax;
+
+		for (int triangleIndex = 0; triangleIndex < numfaces; triangleIndex++)
+		{
+			unsigned int* gfxbase = (unsigned int*)(indexbase + triangleIndex * indexstride);
+
+			for (int j = 2; j >= 0; j--)
+			{
+				int graphicsindex;
+                                switch (indicestype) {
+                                        case PHY_INTEGER: graphicsindex = gfxbase[j]; break;
+                                        case PHY_SHORT: graphicsindex = ((unsigned short*)gfxbase)[j]; break;
+                                        case PHY_UCHAR: graphicsindex = ((unsigned char*)gfxbase)[j]; break;
+                                        default: btAssert(0);
+                                }
+				if (type == PHY_FLOAT)
+				{
+					float* graphicsbase = (float*)(vertexbase + graphicsindex * stride);
+					triangleVerts[j] = btVector3(
+						graphicsbase[0] * meshScaling.getX(),
+						graphicsbase[1] * meshScaling.getY(),
+						graphicsbase[2] * meshScaling.getZ());
+				}
+				else
+				{
+					double* graphicsbase = (double*)(vertexbase + graphicsindex * stride);
+					triangleVerts[j] = btVector3(btScalar(graphicsbase[0] * meshScaling.getX()), btScalar(graphicsbase[1] * meshScaling.getY()), btScalar(graphicsbase[2] * meshScaling.getZ()));
+				}
+			}
+			aabbMin.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+			aabbMax.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+			aabbMin.setMin(triangleVerts[0]);
+			aabbMax.setMax(triangleVerts[0]);
+			aabbMin.setMin(triangleVerts[1]);
+			aabbMax.setMax(triangleVerts[1]);
+			aabbMin.setMin(triangleVerts[2]);
+			aabbMax.setMax(triangleVerts[2]);
+
+			btConnectivityProcessor connectivityProcessor;
+			connectivityProcessor.m_partIdA = partId;
+			connectivityProcessor.m_triangleIndexA = triangleIndex;
+			connectivityProcessor.m_triangleVerticesA = &triangleVerts[0];
+			connectivityProcessor.m_triangleInfoMap = triangleInfoMap;
+
+			trimeshShape->processAllTriangles(&connectivityProcessor, aabbMin, aabbMax);
+		}
+	}
+}
+
+
+void btGenerateInternalEdgeInfo(btHeightfieldTerrainShape* heightfieldShape, btTriangleInfoMap* triangleInfoMap)
+{
+
+	//the user pointer shouldn't already be used for other purposes, we intend to store connectivity info there!
+	if (heightfieldShape->getTriangleInfoMap())
+		return;
+
+	heightfieldShape->setTriangleInfoMap(triangleInfoMap);
+
+	//get all the triangles of the heightfield
+
+	btVector3 aabbMin, aabbMax;
+
+	aabbMax.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+	aabbMin.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+
+	b3ProcessAllTrianglesHeightfield processHeightfield(heightfieldShape, triangleInfoMap);
+	heightfieldShape->processAllTriangles(&processHeightfield, aabbMin, aabbMax);
+
+}
+
+// Given a point and a line segment (defined by two points), compute the closest point
+// in the line.  Cap the point at the endpoints of the line segment.
+void btNearestPointInLineSegment(const btVector3& point, const btVector3& line0, const btVector3& line1, btVector3& nearestPoint)
+{
+	btVector3 lineDelta = line1 - line0;
+
+	// Handle degenerate lines
+	if (lineDelta.fuzzyZero())
+	{
+		nearestPoint = line0;
+	}
+	else
+	{
+		btScalar delta = (point - line0).dot(lineDelta) / (lineDelta).dot(lineDelta);
+
+		// Clamp the point to conform to the segment's endpoints
+		if (delta < 0)
+			delta = 0;
+		else if (delta > 1)
+			delta = 1;
+
+		nearestPoint = line0 + lineDelta * delta;
+	}
+}
+
+bool btClampNormal(const btVector3& edge, const btVector3& tri_normal_org, const btVector3& localContactNormalOnB, btScalar correctedEdgeAngle, btVector3& clampedLocalNormal)
+{
+	btVector3 tri_normal = tri_normal_org;
+	//we only have a local triangle normal, not a local contact normal -> only normal in world space...
+	//either compute the current angle all in local space, or all in world space
+
+	btVector3 edgeCross = edge.cross(tri_normal).normalize();
+	btScalar curAngle = btGetAngle(edgeCross, tri_normal, localContactNormalOnB);
+
+	if (correctedEdgeAngle < 0)
+	{
+		if (curAngle < correctedEdgeAngle)
+		{
+			btScalar diffAngle = correctedEdgeAngle - curAngle;
+			btQuaternion rotation(edge, diffAngle);
+			clampedLocalNormal = btMatrix3x3(rotation) * localContactNormalOnB;
+			return true;
+		}
+	}
+
+	if (correctedEdgeAngle >= 0)
+	{
+		if (curAngle > correctedEdgeAngle)
+		{
+			btScalar diffAngle = correctedEdgeAngle - curAngle;
+			btQuaternion rotation(edge, diffAngle);
+			clampedLocalNormal = btMatrix3x3(rotation) * localContactNormalOnB;
+			return true;
+		}
+	}
+	return false;
+}
+
+/// Changes a btManifoldPoint collision normal to the normal from the mesh.
+void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap, const btCollisionObjectWrapper* colObj1Wrap, int partId0, int index0, int normalAdjustFlags)
+{
+	//btAssert(colObj0->getCollisionShape()->getShapeType() == TRIANGLE_SHAPE_PROXYTYPE);
+	if (colObj0Wrap->getCollisionShape()->getShapeType() != TRIANGLE_SHAPE_PROXYTYPE)
+		return;
+
+	
+	btTriangleInfoMap* triangleInfoMapPtr = 0;
+
+	if (colObj0Wrap->getCollisionObject()->getCollisionShape()->getShapeType() == TERRAIN_SHAPE_PROXYTYPE)
+	{
+		btHeightfieldTerrainShape* heightfield = (btHeightfieldTerrainShape*)colObj0Wrap->getCollisionObject()->getCollisionShape();
+		triangleInfoMapPtr = heightfield->getTriangleInfoMap();
+
+//#define USE_HEIGHTFIELD_TRIANGLES
+#ifdef USE_HEIGHTFIELD_TRIANGLES
+		btVector3 newNormal = btVector3(0, 0, 1);
+
+		const btTriangleShape* tri_shape = static_cast<const btTriangleShape*>(colObj0Wrap->getCollisionShape());
+		btVector3 tri_normal;
+		tri_shape->calcNormal(tri_normal);
+		newNormal = tri_normal;
+		//					cp.m_distance1 = cp.m_distance1 * newNormal.dot(cp.m_normalWorldOnB);
+		cp.m_normalWorldOnB = newNormal;
+		// Reproject collision point along normal. (what about cp.m_distance1?)
+		cp.m_positionWorldOnB = cp.m_positionWorldOnA - cp.m_normalWorldOnB * cp.m_distance1;
+		cp.m_localPointB = colObj0Wrap->getWorldTransform().invXform(cp.m_positionWorldOnB);
+		return;
+#endif
+	}
+
+
+	btBvhTriangleMeshShape* trimesh = 0;
+
+	if (colObj0Wrap->getCollisionObject()->getCollisionShape()->getShapeType() == SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE)
+	{
+		trimesh = ((btScaledBvhTriangleMeshShape*)colObj0Wrap->getCollisionObject()->getCollisionShape())->getChildShape();
+	}
+	else
+	{
+		if (colObj0Wrap->getCollisionObject()->getCollisionShape()->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+		{
+			trimesh = (btBvhTriangleMeshShape*)colObj0Wrap->getCollisionObject()->getCollisionShape();
+		}
+	}
+	if (trimesh)
+	{
+		triangleInfoMapPtr = (btTriangleInfoMap*)trimesh->getTriangleInfoMap();
+	}
+	
+	
+	if (!triangleInfoMapPtr)
+		return;
+
+	int hash = btGetHash(partId0, index0);
+
+	btTriangleInfo* info = triangleInfoMapPtr->find(hash);
+	if (!info)
+		return;
+
+	btScalar frontFacing = (normalAdjustFlags & BT_TRIANGLE_CONVEX_BACKFACE_MODE) == 0 ? 1.f : -1.f;
+
+	const btTriangleShape* tri_shape = static_cast<const btTriangleShape*>(colObj0Wrap->getCollisionShape());
+	btVector3 v0, v1, v2;
+	tri_shape->getVertex(0, v0);
+	tri_shape->getVertex(1, v1);
+	tri_shape->getVertex(2, v2);
+
+	//btVector3 center = (v0+v1+v2)*btScalar(1./3.);
+
+	btVector3 red(1, 0, 0), green(0, 1, 0), blue(0, 0, 1), white(1, 1, 1), black(0, 0, 0);
+	btVector3 tri_normal;
+	tri_shape->calcNormal(tri_normal);
+
+	//btScalar dot = tri_normal.dot(cp.m_normalWorldOnB);
+	btVector3 nearest;
+	btNearestPointInLineSegment(cp.m_localPointB, v0, v1, nearest);
+
+	btVector3 contact = cp.m_localPointB;
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+	const btTransform& tr = colObj0->getWorldTransform();
+	btDebugDrawLine(tr * nearest, tr * cp.m_localPointB, red);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+	bool isNearEdge = false;
+
+	int numConcaveEdgeHits = 0;
+	int numConvexEdgeHits = 0;
+
+	btVector3 localContactNormalOnB = colObj0Wrap->getWorldTransform().getBasis().transpose() * cp.m_normalWorldOnB;
+	localContactNormalOnB.normalize();  //is this necessary?
+
+	// Get closest edge
+	int bestedge = -1;
+	btScalar disttobestedge = BT_LARGE_FLOAT;
+	//
+	// Edge 0 -> 1
+	if (btFabs(info->m_edgeV0V1Angle) < triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{
+		btVector3 nearest;
+		btNearestPointInLineSegment(cp.m_localPointB, v0, v1, nearest);
+		btScalar len = (contact - nearest).length();
+		//
+		if (len < disttobestedge)
+		{
+			bestedge = 0;
+			disttobestedge = len;
+		}
+	}
+	// Edge 1 -> 2
+	if (btFabs(info->m_edgeV1V2Angle) < triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{
+		btVector3 nearest;
+		btNearestPointInLineSegment(cp.m_localPointB, v1, v2, nearest);
+		btScalar len = (contact - nearest).length();
+		//
+		if (len < disttobestedge)
+		{
+			bestedge = 1;
+			disttobestedge = len;
+		}
+	}
+	// Edge 2 -> 0
+	if (btFabs(info->m_edgeV2V0Angle) < triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{
+		btVector3 nearest;
+		btNearestPointInLineSegment(cp.m_localPointB, v2, v0, nearest);
+		btScalar len = (contact - nearest).length();
+		//
+		if (len < disttobestedge)
+		{
+			bestedge = 2;
+			disttobestedge = len;
+		}
+	}
+
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+	btVector3 upfix = tri_normal * btVector3(0.1f, 0.1f, 0.1f);
+	btDebugDrawLine(tr * v0 + upfix, tr * v1 + upfix, red);
+#endif
+	if (btFabs(info->m_edgeV0V1Angle) < triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+		btDebugDrawLine(tr * contact, tr * (contact + cp.m_normalWorldOnB * 10), black);
+#endif
+		btScalar len = (contact - nearest).length();
+		if (len < triangleInfoMapPtr->m_edgeDistanceThreshold)
+			if (bestedge == 0)
+			{
+				btVector3 edge(v0 - v1);
+				isNearEdge = true;
+
+				if (info->m_edgeV0V1Angle == btScalar(0))
+				{
+					numConcaveEdgeHits++;
+				}
+				else
+				{
+					bool isEdgeConvex = (info->m_flags & TRI_INFO_V0V1_CONVEX);
+					btScalar swapFactor = isEdgeConvex ? btScalar(1) : btScalar(-1);
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+					btDebugDrawLine(tr * nearest, tr * (nearest + swapFactor * tri_normal * 10), white);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+					btVector3 nA = swapFactor * tri_normal;
+
+					btQuaternion orn(edge, info->m_edgeV0V1Angle);
+					btVector3 computedNormalB = quatRotate(orn, tri_normal);
+					if (info->m_flags & TRI_INFO_V0V1_SWAP_NORMALB)
+						computedNormalB *= -1;
+					btVector3 nB = swapFactor * computedNormalB;
+
+					btScalar NdotA = localContactNormalOnB.dot(nA);
+					btScalar NdotB = localContactNormalOnB.dot(nB);
+					bool backFacingNormal = (NdotA < triangleInfoMapPtr->m_convexEpsilon) && (NdotB < triangleInfoMapPtr->m_convexEpsilon);
+
+#ifdef DEBUG_INTERNAL_EDGE
+					{
+						btDebugDrawLine(cp.getPositionWorldOnB(), cp.getPositionWorldOnB() + tr.getBasis() * (nB * 20), red);
+					}
+#endif  //DEBUG_INTERNAL_EDGE
+
+					if (backFacingNormal)
+					{
+						numConcaveEdgeHits++;
+					}
+					else
+					{
+						numConvexEdgeHits++;
+						btVector3 clampedLocalNormal;
+						bool isClamped = btClampNormal(edge, swapFactor * tri_normal, localContactNormalOnB, info->m_edgeV0V1Angle, clampedLocalNormal);
+						if (isClamped)
+						{
+							if (((normalAdjustFlags & BT_TRIANGLE_CONVEX_DOUBLE_SIDED) != 0) || (clampedLocalNormal.dot(frontFacing * tri_normal) > 0))
+							{
+								btVector3 newNormal = colObj0Wrap->getWorldTransform().getBasis() * clampedLocalNormal;
+								//					cp.m_distance1 = cp.m_distance1 * newNormal.dot(cp.m_normalWorldOnB);
+								cp.m_normalWorldOnB = newNormal;
+								// Reproject collision point along normal. (what about cp.m_distance1?)
+								cp.m_positionWorldOnB = cp.m_positionWorldOnA - cp.m_normalWorldOnB * cp.m_distance1;
+								cp.m_localPointB = colObj0Wrap->getWorldTransform().invXform(cp.m_positionWorldOnB);
+							}
+						}
+					}
+				}
+			}
+	}
+
+	btNearestPointInLineSegment(contact, v1, v2, nearest);
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+	btDebugDrawLine(tr * nearest, tr * cp.m_localPointB, green);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+	btDebugDrawLine(tr * v1 + upfix, tr * v2 + upfix, green);
+#endif
+
+	if (btFabs(info->m_edgeV1V2Angle) < triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+		btDebugDrawLine(tr * contact, tr * (contact + cp.m_normalWorldOnB * 10), black);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+		btScalar len = (contact - nearest).length();
+		if (len < triangleInfoMapPtr->m_edgeDistanceThreshold)
+			if (bestedge == 1)
+			{
+				isNearEdge = true;
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+				btDebugDrawLine(tr * nearest, tr * (nearest + tri_normal * 10), white);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+				btVector3 edge(v1 - v2);
+
+				isNearEdge = true;
+
+				if (info->m_edgeV1V2Angle == btScalar(0))
+				{
+					numConcaveEdgeHits++;
+				}
+				else
+				{
+					bool isEdgeConvex = (info->m_flags & TRI_INFO_V1V2_CONVEX) != 0;
+					btScalar swapFactor = isEdgeConvex ? btScalar(1) : btScalar(-1);
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+					btDebugDrawLine(tr * nearest, tr * (nearest + swapFactor * tri_normal * 10), white);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+					btVector3 nA = swapFactor * tri_normal;
+
+					btQuaternion orn(edge, info->m_edgeV1V2Angle);
+					btVector3 computedNormalB = quatRotate(orn, tri_normal);
+					if (info->m_flags & TRI_INFO_V1V2_SWAP_NORMALB)
+						computedNormalB *= -1;
+					btVector3 nB = swapFactor * computedNormalB;
+
+#ifdef DEBUG_INTERNAL_EDGE
+					{
+						btDebugDrawLine(cp.getPositionWorldOnB(), cp.getPositionWorldOnB() + tr.getBasis() * (nB * 20), red);
+					}
+#endif  //DEBUG_INTERNAL_EDGE
+
+					btScalar NdotA = localContactNormalOnB.dot(nA);
+					btScalar NdotB = localContactNormalOnB.dot(nB);
+					bool backFacingNormal = (NdotA < triangleInfoMapPtr->m_convexEpsilon) && (NdotB < triangleInfoMapPtr->m_convexEpsilon);
+
+					if (backFacingNormal)
+					{
+						numConcaveEdgeHits++;
+					}
+					else
+					{
+						numConvexEdgeHits++;
+						btVector3 localContactNormalOnB = colObj0Wrap->getWorldTransform().getBasis().transpose() * cp.m_normalWorldOnB;
+						btVector3 clampedLocalNormal;
+						bool isClamped = btClampNormal(edge, swapFactor * tri_normal, localContactNormalOnB, info->m_edgeV1V2Angle, clampedLocalNormal);
+						if (isClamped)
+						{
+							if (((normalAdjustFlags & BT_TRIANGLE_CONVEX_DOUBLE_SIDED) != 0) || (clampedLocalNormal.dot(frontFacing * tri_normal) > 0))
+							{
+								btVector3 newNormal = colObj0Wrap->getWorldTransform().getBasis() * clampedLocalNormal;
+								//					cp.m_distance1 = cp.m_distance1 * newNormal.dot(cp.m_normalWorldOnB);
+								cp.m_normalWorldOnB = newNormal;
+								// Reproject collision point along normal.
+								cp.m_positionWorldOnB = cp.m_positionWorldOnA - cp.m_normalWorldOnB * cp.m_distance1;
+								cp.m_localPointB = colObj0Wrap->getWorldTransform().invXform(cp.m_positionWorldOnB);
+							}
+						}
+					}
+				}
+			}
+	}
+
+	btNearestPointInLineSegment(contact, v2, v0, nearest);
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+	btDebugDrawLine(tr * nearest, tr * cp.m_localPointB, blue);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+	btDebugDrawLine(tr * v2 + upfix, tr * v0 + upfix, blue);
+#endif
+
+	if (btFabs(info->m_edgeV2V0Angle) < triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+		btDebugDrawLine(tr * contact, tr * (contact + cp.m_normalWorldOnB * 10), black);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+		btScalar len = (contact - nearest).length();
+		if (len < triangleInfoMapPtr->m_edgeDistanceThreshold)
+			if (bestedge == 2)
+			{
+				isNearEdge = true;
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+				btDebugDrawLine(tr * nearest, tr * (nearest + tri_normal * 10), white);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+				btVector3 edge(v2 - v0);
+
+				if (info->m_edgeV2V0Angle == btScalar(0))
+				{
+					numConcaveEdgeHits++;
+				}
+				else
+				{
+					bool isEdgeConvex = (info->m_flags & TRI_INFO_V2V0_CONVEX) != 0;
+					btScalar swapFactor = isEdgeConvex ? btScalar(1) : btScalar(-1);
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+					btDebugDrawLine(tr * nearest, tr * (nearest + swapFactor * tri_normal * 10), white);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+					btVector3 nA = swapFactor * tri_normal;
+					btQuaternion orn(edge, info->m_edgeV2V0Angle);
+					btVector3 computedNormalB = quatRotate(orn, tri_normal);
+					if (info->m_flags & TRI_INFO_V2V0_SWAP_NORMALB)
+						computedNormalB *= -1;
+					btVector3 nB = swapFactor * computedNormalB;
+
+#ifdef DEBUG_INTERNAL_EDGE
+					{
+						btDebugDrawLine(cp.getPositionWorldOnB(), cp.getPositionWorldOnB() + tr.getBasis() * (nB * 20), red);
+					}
+#endif  //DEBUG_INTERNAL_EDGE
+
+					btScalar NdotA = localContactNormalOnB.dot(nA);
+					btScalar NdotB = localContactNormalOnB.dot(nB);
+					bool backFacingNormal = (NdotA < triangleInfoMapPtr->m_convexEpsilon) && (NdotB < triangleInfoMapPtr->m_convexEpsilon);
+
+					if (backFacingNormal)
+					{
+						numConcaveEdgeHits++;
+					}
+					else
+					{
+						numConvexEdgeHits++;
+						//				printf("hitting convex edge\n");
+
+						btVector3 localContactNormalOnB = colObj0Wrap->getWorldTransform().getBasis().transpose() * cp.m_normalWorldOnB;
+						btVector3 clampedLocalNormal;
+						bool isClamped = btClampNormal(edge, swapFactor * tri_normal, localContactNormalOnB, info->m_edgeV2V0Angle, clampedLocalNormal);
+						if (isClamped)
+						{
+							if (((normalAdjustFlags & BT_TRIANGLE_CONVEX_DOUBLE_SIDED) != 0) || (clampedLocalNormal.dot(frontFacing * tri_normal) > 0))
+							{
+								btVector3 newNormal = colObj0Wrap->getWorldTransform().getBasis() * clampedLocalNormal;
+								//					cp.m_distance1 = cp.m_distance1 * newNormal.dot(cp.m_normalWorldOnB);
+								cp.m_normalWorldOnB = newNormal;
+								// Reproject collision point along normal.
+								cp.m_positionWorldOnB = cp.m_positionWorldOnA - cp.m_normalWorldOnB * cp.m_distance1;
+								cp.m_localPointB = colObj0Wrap->getWorldTransform().invXform(cp.m_positionWorldOnB);
+							}
+						}
+					}
+				}
+			}
+	}
+
+#ifdef DEBUG_INTERNAL_EDGE
+	{
+		btVector3 color(0, 1, 1);
+		btDebugDrawLine(cp.getPositionWorldOnB(), cp.getPositionWorldOnB() + cp.m_normalWorldOnB * 10, color);
+	}
+#endif  //DEBUG_INTERNAL_EDGE
+
+	if (isNearEdge)
+	{
+		if (numConcaveEdgeHits > 0)
+		{
+			if ((normalAdjustFlags & BT_TRIANGLE_CONCAVE_DOUBLE_SIDED) != 0)
+			{
+				//fix tri_normal so it pointing the same direction as the current local contact normal
+				if (tri_normal.dot(localContactNormalOnB) < 0)
+				{
+					tri_normal *= -1;
+				}
+				cp.m_normalWorldOnB = colObj0Wrap->getWorldTransform().getBasis() * tri_normal;
+			}
+			else
+			{
+				btVector3 newNormal = tri_normal * frontFacing;
+				//if the tri_normal is pointing opposite direction as the current local contact normal, skip it
+				btScalar d = newNormal.dot(localContactNormalOnB);
+				if (d < 0)
+				{
+					return;
+				}
+				//modify the normal to be the triangle normal (or backfacing normal)
+				cp.m_normalWorldOnB = colObj0Wrap->getWorldTransform().getBasis() * newNormal;
+			}
+
+			// Reproject collision point along normal.
+			cp.m_positionWorldOnB = cp.m_positionWorldOnA - cp.m_normalWorldOnB * cp.m_distance1;
+			cp.m_localPointB = colObj0Wrap->getWorldTransform().invXform(cp.m_positionWorldOnB);
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
new file mode 100644
index 0000000..cc6d11c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
@@ -0,0 +1,44 @@
+
+#ifndef BT_INTERNAL_EDGE_UTILITY_H
+#define BT_INTERNAL_EDGE_UTILITY_H
+
+#include "LinearMath/btHashMap.h"
+#include "LinearMath/btVector3.h"
+
+#include "BulletCollision/CollisionShapes/btTriangleInfoMap.h"
+
+///The btInternalEdgeUtility helps to avoid or reduce artifacts due to wrong collision normals caused by internal edges.
+///See also http://code.google.com/p/bullet/issues/detail?id=27
+
+class btBvhTriangleMeshShape;
+class btCollisionObject;
+struct btCollisionObjectWrapper;
+class btManifoldPoint;
+class btIDebugDraw;
+class btHeightfieldTerrainShape;
+
+enum btInternalEdgeAdjustFlags
+{
+	BT_TRIANGLE_CONVEX_BACKFACE_MODE = 1,
+	BT_TRIANGLE_CONCAVE_DOUBLE_SIDED = 2,  //double sided options are experimental, single sided is recommended
+	BT_TRIANGLE_CONVEX_DOUBLE_SIDED = 4
+};
+
+///Call btGenerateInternalEdgeInfo to create triangle info, store in the shape 'userInfo'
+void btGenerateInternalEdgeInfo(btBvhTriangleMeshShape* trimeshShape, btTriangleInfoMap* triangleInfoMap);
+
+void btGenerateInternalEdgeInfo(btHeightfieldTerrainShape* trimeshShape, btTriangleInfoMap* triangleInfoMap);
+
+///Call the btFixMeshNormal to adjust the collision normal, using the triangle info map (generated using btGenerateInternalEdgeInfo)
+///If this info map is missing, or the triangle is not store in this map, nothing will be done
+void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObjectWrapper* trimeshColObj0Wrap, const btCollisionObjectWrapper* otherColObj1Wrap, int partId0, int index0, int normalAdjustFlags = 0);
+
+///Enable the BT_INTERNAL_EDGE_DEBUG_DRAW define and call btSetDebugDrawer, to get visual info to see if the internal edge utility works properly.
+///If the utility doesn't work properly, you might have to adjust the threshold values in btTriangleInfoMap
+//#define BT_INTERNAL_EDGE_DEBUG_DRAW
+
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+void btSetDebugDrawer(btIDebugDraw* debugDrawer);
+#endif  //BT_INTERNAL_EDGE_DEBUG_DRAW
+
+#endif  //BT_INTERNAL_EDGE_UTILITY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
new file mode 100644
index 0000000..64a0f84
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
@@ -0,0 +1,201 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btManifoldResult.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+///This is to allow MaterialCombiner/Custom Friction/Restitution values
+ContactAddedCallback gContactAddedCallback = 0;
+
+CalculateCombinedCallback gCalculateCombinedRestitutionCallback = &btManifoldResult::calculateCombinedRestitution;
+CalculateCombinedCallback gCalculateCombinedFrictionCallback = &btManifoldResult::calculateCombinedFriction;
+CalculateCombinedCallback gCalculateCombinedRollingFrictionCallback = &btManifoldResult::calculateCombinedRollingFriction;
+CalculateCombinedCallback gCalculateCombinedSpinningFrictionCallback = &btManifoldResult::calculateCombinedSpinningFriction;
+CalculateCombinedCallback gCalculateCombinedContactDampingCallback = &btManifoldResult::calculateCombinedContactDamping;
+CalculateCombinedCallback gCalculateCombinedContactStiffnessCallback = &btManifoldResult::calculateCombinedContactStiffness;
+
+btScalar btManifoldResult::calculateCombinedRollingFriction(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	btScalar friction = body0->getRollingFriction() * body1->getFriction() + body1->getRollingFriction() * body0->getFriction();
+
+	const btScalar MAX_FRICTION = btScalar(10.);
+	if (friction < -MAX_FRICTION)
+		friction = -MAX_FRICTION;
+	if (friction > MAX_FRICTION)
+		friction = MAX_FRICTION;
+	return friction;
+}
+
+btScalar btManifoldResult::calculateCombinedSpinningFriction(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	btScalar friction = body0->getSpinningFriction() * body1->getFriction() + body1->getSpinningFriction() * body0->getFriction();
+
+	const btScalar MAX_FRICTION = btScalar(10.);
+	if (friction < -MAX_FRICTION)
+		friction = -MAX_FRICTION;
+	if (friction > MAX_FRICTION)
+		friction = MAX_FRICTION;
+	return friction;
+}
+
+///User can override this material combiner by implementing gContactAddedCallback and setting body0->m_collisionFlags |= btCollisionObject::customMaterialCallback;
+btScalar btManifoldResult::calculateCombinedFriction(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	btScalar friction = body0->getFriction() * body1->getFriction();
+
+	const btScalar MAX_FRICTION = btScalar(10.);
+	if (friction < -MAX_FRICTION)
+		friction = -MAX_FRICTION;
+	if (friction > MAX_FRICTION)
+		friction = MAX_FRICTION;
+	return friction;
+}
+
+btScalar btManifoldResult::calculateCombinedRestitution(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	return body0->getRestitution() * body1->getRestitution();
+}
+
+btScalar btManifoldResult::calculateCombinedContactDamping(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	return body0->getContactDamping() + body1->getContactDamping();
+}
+
+btScalar btManifoldResult::calculateCombinedContactStiffness(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	btScalar s0 = body0->getContactStiffness();
+	btScalar s1 = body1->getContactStiffness();
+
+	btScalar tmp0 = btScalar(1) / s0;
+	btScalar tmp1 = btScalar(1) / s1;
+	btScalar combinedStiffness = btScalar(1) / (tmp0 + tmp1);
+	return combinedStiffness;
+}
+
+btManifoldResult::btManifoldResult(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+	: m_manifoldPtr(0),
+	  m_body0Wrap(body0Wrap),
+	  m_body1Wrap(body1Wrap)
+	  ,
+	  m_partId0(-1),
+	  m_partId1(-1),
+	  m_index0(-1),
+	  m_index1(-1)
+	  ,
+	  m_closestPointDistanceThreshold(0)
+{
+}
+
+void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth)
+{
+	btAssert(m_manifoldPtr);
+	//order in manifold needs to match
+
+	if (depth > m_manifoldPtr->getContactBreakingThreshold())
+		//	if (depth > m_manifoldPtr->getContactProcessingThreshold())
+		return;
+
+	bool isSwapped = m_manifoldPtr->getBody0() != m_body0Wrap->getCollisionObject();
+	bool isNewCollision = m_manifoldPtr->getNumContacts() == 0;
+
+	btVector3 pointA = pointInWorld + normalOnBInWorld * depth;
+
+	btVector3 localA;
+	btVector3 localB;
+
+	if (isSwapped)
+	{
+		localA = m_body1Wrap->getCollisionObject()->getWorldTransform().invXform(pointA);
+		localB = m_body0Wrap->getCollisionObject()->getWorldTransform().invXform(pointInWorld);
+	}
+	else
+	{
+		localA = m_body0Wrap->getCollisionObject()->getWorldTransform().invXform(pointA);
+		localB = m_body1Wrap->getCollisionObject()->getWorldTransform().invXform(pointInWorld);
+	}
+
+	btManifoldPoint newPt(localA, localB, normalOnBInWorld, depth);
+	newPt.m_positionWorldOnA = pointA;
+	newPt.m_positionWorldOnB = pointInWorld;
+
+	int insertIndex = m_manifoldPtr->getCacheEntry(newPt);
+
+	newPt.m_combinedFriction = gCalculateCombinedFrictionCallback(m_body0Wrap->getCollisionObject(), m_body1Wrap->getCollisionObject());
+	newPt.m_combinedRestitution = gCalculateCombinedRestitutionCallback(m_body0Wrap->getCollisionObject(), m_body1Wrap->getCollisionObject());
+	newPt.m_combinedRollingFriction = gCalculateCombinedRollingFrictionCallback(m_body0Wrap->getCollisionObject(), m_body1Wrap->getCollisionObject());
+	newPt.m_combinedSpinningFriction = gCalculateCombinedSpinningFrictionCallback(m_body0Wrap->getCollisionObject(), m_body1Wrap->getCollisionObject());
+
+	if ((m_body0Wrap->getCollisionObject()->getCollisionFlags() & btCollisionObject::CF_HAS_CONTACT_STIFFNESS_DAMPING) ||
+		(m_body1Wrap->getCollisionObject()->getCollisionFlags() & btCollisionObject::CF_HAS_CONTACT_STIFFNESS_DAMPING))
+	{
+		newPt.m_combinedContactDamping1 = gCalculateCombinedContactDampingCallback(m_body0Wrap->getCollisionObject(), m_body1Wrap->getCollisionObject());
+		newPt.m_combinedContactStiffness1 = gCalculateCombinedContactStiffnessCallback(m_body0Wrap->getCollisionObject(), m_body1Wrap->getCollisionObject());
+		newPt.m_contactPointFlags |= BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING;
+	}
+
+	if ((m_body0Wrap->getCollisionObject()->getCollisionFlags() & btCollisionObject::CF_HAS_FRICTION_ANCHOR) ||
+		(m_body1Wrap->getCollisionObject()->getCollisionFlags() & btCollisionObject::CF_HAS_FRICTION_ANCHOR))
+	{
+		newPt.m_contactPointFlags |= BT_CONTACT_FLAG_FRICTION_ANCHOR;
+	}
+
+	btPlaneSpace1(newPt.m_normalWorldOnB, newPt.m_lateralFrictionDir1, newPt.m_lateralFrictionDir2);
+
+	//BP mod, store contact triangles.
+	if (isSwapped)
+	{
+		newPt.m_partId0 = m_partId1;
+		newPt.m_partId1 = m_partId0;
+		newPt.m_index0 = m_index1;
+		newPt.m_index1 = m_index0;
+	}
+	else
+	{
+		newPt.m_partId0 = m_partId0;
+		newPt.m_partId1 = m_partId1;
+		newPt.m_index0 = m_index0;
+		newPt.m_index1 = m_index1;
+	}
+	//printf("depth=%f\n",depth);
+	///@todo, check this for any side effects
+	if (insertIndex >= 0)
+	{
+		//const btManifoldPoint& oldPoint = m_manifoldPtr->getContactPoint(insertIndex);
+		m_manifoldPtr->replaceContactPoint(newPt, insertIndex);
+	}
+	else
+	{
+		insertIndex = m_manifoldPtr->addManifoldPoint(newPt);
+	}
+
+	//User can override friction and/or restitution
+	if (gContactAddedCallback &&
+		//and if either of the two bodies requires custom material
+		((m_body0Wrap->getCollisionObject()->getCollisionFlags() & btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK) ||
+		 (m_body1Wrap->getCollisionObject()->getCollisionFlags() & btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK)))
+	{
+		//experimental feature info, for per-triangle material etc.
+		const btCollisionObjectWrapper* obj0Wrap = isSwapped ? m_body1Wrap : m_body0Wrap;
+		const btCollisionObjectWrapper* obj1Wrap = isSwapped ? m_body0Wrap : m_body1Wrap;
+		(*gContactAddedCallback)(m_manifoldPtr->getContactPoint(insertIndex), obj0Wrap, newPt.m_partId0, newPt.m_index0, obj1Wrap, newPt.m_partId1, newPt.m_index1);
+	}
+
+	if (gContactStartedCallback && isNewCollision)
+	{
+		gContactStartedCallback(m_manifoldPtr);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.h
new file mode 100644
index 0000000..1a8f46f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btManifoldResult.h
@@ -0,0 +1,163 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MANIFOLD_RESULT_H
+#define BT_MANIFOLD_RESULT_H
+
+class btCollisionObject;
+struct btCollisionObjectWrapper;
+
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btManifoldPoint;
+
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+
+#include "LinearMath/btTransform.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+typedef bool (*ContactAddedCallback)(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper* colObj1Wrap, int partId1, int index1);
+extern ContactAddedCallback gContactAddedCallback;
+
+//#define DEBUG_PART_INDEX 1
+
+/// These callbacks are used to customize the algorith that combine restitution, friction, damping, Stiffness
+typedef btScalar (*CalculateCombinedCallback)(const btCollisionObject* body0, const btCollisionObject* body1);
+
+extern CalculateCombinedCallback gCalculateCombinedRestitutionCallback;
+extern CalculateCombinedCallback gCalculateCombinedFrictionCallback;
+extern CalculateCombinedCallback gCalculateCombinedRollingFrictionCallback;
+extern CalculateCombinedCallback gCalculateCombinedSpinningFrictionCallback;
+extern CalculateCombinedCallback gCalculateCombinedContactDampingCallback;
+extern CalculateCombinedCallback gCalculateCombinedContactStiffnessCallback;
+
+///btManifoldResult is a helper class to manage  contact results.
+class btManifoldResult : public btDiscreteCollisionDetectorInterface::Result
+{
+protected:
+	btPersistentManifold* m_manifoldPtr;
+
+	const btCollisionObjectWrapper* m_body0Wrap;
+	const btCollisionObjectWrapper* m_body1Wrap;
+	int m_partId0;
+	int m_partId1;
+	int m_index0;
+	int m_index1;
+
+public:
+	btManifoldResult()
+		:
+#ifdef DEBUG_PART_INDEX
+
+		  m_partId0(-1),
+		  m_partId1(-1),
+		  m_index0(-1),
+		  m_index1(-1)
+#endif  //DEBUG_PART_INDEX
+			  m_closestPointDistanceThreshold(0)
+	{
+	}
+
+	btManifoldResult(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap);
+
+	virtual ~btManifoldResult(){};
+
+	void setPersistentManifold(btPersistentManifold* manifoldPtr)
+	{
+		m_manifoldPtr = manifoldPtr;
+	}
+
+	const btPersistentManifold* getPersistentManifold() const
+	{
+		return m_manifoldPtr;
+	}
+	btPersistentManifold* getPersistentManifold()
+	{
+		return m_manifoldPtr;
+	}
+
+	virtual void setShapeIdentifiersA(int partId0, int index0)
+	{
+		m_partId0 = partId0;
+		m_index0 = index0;
+	}
+
+	virtual void setShapeIdentifiersB(int partId1, int index1)
+	{
+		m_partId1 = partId1;
+		m_index1 = index1;
+	}
+
+	virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth);
+
+	SIMD_FORCE_INLINE void refreshContactPoints()
+	{
+		btAssert(m_manifoldPtr);
+		if (!m_manifoldPtr->getNumContacts())
+			return;
+
+		bool isSwapped = m_manifoldPtr->getBody0() != m_body0Wrap->getCollisionObject();
+
+		if (isSwapped)
+		{
+			m_manifoldPtr->refreshContactPoints(m_body1Wrap->getCollisionObject()->getWorldTransform(), m_body0Wrap->getCollisionObject()->getWorldTransform());
+		}
+		else
+		{
+			m_manifoldPtr->refreshContactPoints(m_body0Wrap->getCollisionObject()->getWorldTransform(), m_body1Wrap->getCollisionObject()->getWorldTransform());
+		}
+	}
+
+	const btCollisionObjectWrapper* getBody0Wrap() const
+	{
+		return m_body0Wrap;
+	}
+	const btCollisionObjectWrapper* getBody1Wrap() const
+	{
+		return m_body1Wrap;
+	}
+
+	void setBody0Wrap(const btCollisionObjectWrapper* obj0Wrap)
+	{
+		m_body0Wrap = obj0Wrap;
+	}
+
+	void setBody1Wrap(const btCollisionObjectWrapper* obj1Wrap)
+	{
+		m_body1Wrap = obj1Wrap;
+	}
+
+	const btCollisionObject* getBody0Internal() const
+	{
+		return m_body0Wrap->getCollisionObject();
+	}
+
+	const btCollisionObject* getBody1Internal() const
+	{
+		return m_body1Wrap->getCollisionObject();
+	}
+
+	btScalar m_closestPointDistanceThreshold;
+
+	/// in the future we can let the user override the methods to combine restitution and friction
+	static btScalar calculateCombinedRestitution(const btCollisionObject* body0, const btCollisionObject* body1);
+	static btScalar calculateCombinedFriction(const btCollisionObject* body0, const btCollisionObject* body1);
+	static btScalar calculateCombinedRollingFriction(const btCollisionObject* body0, const btCollisionObject* body1);
+	static btScalar calculateCombinedSpinningFriction(const btCollisionObject* body0, const btCollisionObject* body1);
+	static btScalar calculateCombinedContactDamping(const btCollisionObject* body0, const btCollisionObject* body1);
+	static btScalar calculateCombinedContactStiffness(const btCollisionObject* body0, const btCollisionObject* body1);
+};
+
+#endif  //BT_MANIFOLD_RESULT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
new file mode 100644
index 0000000..6a99e73
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
@@ -0,0 +1,445 @@
+
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btScalar.h"
+#include "btSimulationIslandManager.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+
+//#include <stdio.h>
+#include "LinearMath/btQuickprof.h"
+
+btSimulationIslandManager::btSimulationIslandManager() : m_splitIslands(true)
+{
+}
+
+btSimulationIslandManager::~btSimulationIslandManager()
+{
+}
+
+void btSimulationIslandManager::initUnionFind(int n)
+{
+	m_unionFind.reset(n);
+}
+
+void btSimulationIslandManager::findUnions(btDispatcher* /* dispatcher */, btCollisionWorld* colWorld)
+{
+	{
+		btOverlappingPairCache* pairCachePtr = colWorld->getPairCache();
+		const int numOverlappingPairs = pairCachePtr->getNumOverlappingPairs();
+		if (numOverlappingPairs)
+		{
+			btBroadphasePair* pairPtr = pairCachePtr->getOverlappingPairArrayPtr();
+
+			for (int i = 0; i < numOverlappingPairs; i++)
+			{
+				const btBroadphasePair& collisionPair = pairPtr[i];
+				btCollisionObject* colObj0 = (btCollisionObject*)collisionPair.m_pProxy0->m_clientObject;
+				btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject;
+
+				if (((colObj0) && ((colObj0)->mergesSimulationIslands())) &&
+					((colObj1) && ((colObj1)->mergesSimulationIslands())))
+				{
+					m_unionFind.unite((colObj0)->getIslandTag(),
+									  (colObj1)->getIslandTag());
+				}
+			}
+		}
+	}
+}
+
+#ifdef STATIC_SIMULATION_ISLAND_OPTIMIZATION
+void btSimulationIslandManager::updateActivationState(btCollisionWorld* colWorld, btDispatcher* dispatcher)
+{
+	// put the index into m_controllers into m_tag
+	int index = 0;
+	{
+		int i;
+		for (i = 0; i < colWorld->getCollisionObjectArray().size(); i++)
+		{
+			btCollisionObject* collisionObject = colWorld->getCollisionObjectArray()[i];
+			//Adding filtering here
+			if (!collisionObject->isStaticOrKinematicObject())
+			{
+				collisionObject->setIslandTag(index++);
+			}
+			collisionObject->setCompanionId(-1);
+			collisionObject->setHitFraction(btScalar(1.));
+		}
+	}
+	// do the union find
+
+	initUnionFind(index);
+
+	findUnions(dispatcher, colWorld);
+}
+
+void btSimulationIslandManager::storeIslandActivationState(btCollisionWorld* colWorld)
+{
+	// put the islandId ('find' value) into m_tag
+	{
+		int index = 0;
+		int i;
+		for (i = 0; i < colWorld->getCollisionObjectArray().size(); i++)
+		{
+			btCollisionObject* collisionObject = colWorld->getCollisionObjectArray()[i];
+			if (!collisionObject->isStaticOrKinematicObject())
+			{
+				collisionObject->setIslandTag(m_unionFind.find(index));
+				//Set the correct object offset in Collision Object Array
+				m_unionFind.getElement(index).m_sz = i;
+				collisionObject->setCompanionId(-1);
+				index++;
+			}
+			else
+			{
+				collisionObject->setIslandTag(-1);
+				collisionObject->setCompanionId(-2);
+			}
+		}
+	}
+}
+
+#else  //STATIC_SIMULATION_ISLAND_OPTIMIZATION
+void btSimulationIslandManager::updateActivationState(btCollisionWorld* colWorld, btDispatcher* dispatcher)
+{
+	initUnionFind(int(colWorld->getCollisionObjectArray().size()));
+
+	// put the index into m_controllers into m_tag
+	{
+		int index = 0;
+		int i;
+		for (i = 0; i < colWorld->getCollisionObjectArray().size(); i++)
+		{
+			btCollisionObject* collisionObject = colWorld->getCollisionObjectArray()[i];
+			collisionObject->setIslandTag(index);
+			collisionObject->setCompanionId(-1);
+			collisionObject->setHitFraction(btScalar(1.));
+			index++;
+		}
+	}
+	// do the union find
+
+	findUnions(dispatcher, colWorld);
+}
+
+void btSimulationIslandManager::storeIslandActivationState(btCollisionWorld* colWorld)
+{
+	// put the islandId ('find' value) into m_tag
+	{
+		int index = 0;
+		int i;
+		for (i = 0; i < colWorld->getCollisionObjectArray().size(); i++)
+		{
+			btCollisionObject* collisionObject = colWorld->getCollisionObjectArray()[i];
+			if (!collisionObject->isStaticOrKinematicObject())
+			{
+				collisionObject->setIslandTag(m_unionFind.find(index));
+				collisionObject->setCompanionId(-1);
+			}
+			else
+			{
+				collisionObject->setIslandTag(-1);
+				collisionObject->setCompanionId(-2);
+			}
+			index++;
+		}
+	}
+}
+
+#endif  //STATIC_SIMULATION_ISLAND_OPTIMIZATION
+
+inline int getIslandId(const btPersistentManifold* lhs)
+{
+	int islandId;
+	const btCollisionObject* rcolObj0 = static_cast<const btCollisionObject*>(lhs->getBody0());
+	const btCollisionObject* rcolObj1 = static_cast<const btCollisionObject*>(lhs->getBody1());
+	islandId = rcolObj0->getIslandTag() >= 0 ? rcolObj0->getIslandTag() : rcolObj1->getIslandTag();
+	return islandId;
+}
+
+/// function object that routes calls to operator<
+class btPersistentManifoldSortPredicate
+{
+public:
+	SIMD_FORCE_INLINE bool operator()(const btPersistentManifold* lhs, const btPersistentManifold* rhs) const
+	{
+		return getIslandId(lhs) < getIslandId(rhs);
+	}
+};
+
+class btPersistentManifoldSortPredicateDeterministic
+{
+public:
+	SIMD_FORCE_INLINE bool operator()(const btPersistentManifold* lhs, const btPersistentManifold* rhs) const
+	{
+		return (
+			(getIslandId(lhs) < getIslandId(rhs)) || ((getIslandId(lhs) == getIslandId(rhs)) && lhs->getBody0()->getBroadphaseHandle()->m_uniqueId < rhs->getBody0()->getBroadphaseHandle()->m_uniqueId) || ((getIslandId(lhs) == getIslandId(rhs)) && (lhs->getBody0()->getBroadphaseHandle()->m_uniqueId == rhs->getBody0()->getBroadphaseHandle()->m_uniqueId) && (lhs->getBody1()->getBroadphaseHandle()->m_uniqueId < rhs->getBody1()->getBroadphaseHandle()->m_uniqueId)));
+	}
+};
+
+void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher, btCollisionWorld* collisionWorld)
+{
+	BT_PROFILE("islandUnionFindAndQuickSort");
+
+	btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray();
+
+	m_islandmanifold.resize(0);
+
+	//we are going to sort the unionfind array, and store the element id in the size
+	//afterwards, we clean unionfind, to make sure no-one uses it anymore
+
+	getUnionFind().sortIslands();
+	int numElem = getUnionFind().getNumElements();
+
+	int endIslandIndex = 1;
+	int startIslandIndex;
+
+	//update the sleeping state for bodies, if all are sleeping
+	for (startIslandIndex = 0; startIslandIndex < numElem; startIslandIndex = endIslandIndex)
+	{
+		int islandId = getUnionFind().getElement(startIslandIndex).m_id;
+		for (endIslandIndex = startIslandIndex + 1; (endIslandIndex < numElem) && (getUnionFind().getElement(endIslandIndex).m_id == islandId); endIslandIndex++)
+		{
+		}
+
+		//int numSleeping = 0;
+
+		bool allSleeping = true;
+
+		int idx;
+		for (idx = startIslandIndex; idx < endIslandIndex; idx++)
+		{
+			int i = getUnionFind().getElement(idx).m_sz;
+
+			btCollisionObject* colObj0 = collisionObjects[i];
+			if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
+			{
+				//				printf("error in island management\n");
+			}
+
+            btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
+			if (colObj0->getIslandTag() == islandId)
+			{
+				if (colObj0->getActivationState() == ACTIVE_TAG ||
+					colObj0->getActivationState() == DISABLE_DEACTIVATION)
+				{
+					allSleeping = false;
+					break;
+				}
+			}
+		}
+
+		if (allSleeping)
+		{
+			int idx;
+			for (idx = startIslandIndex; idx < endIslandIndex; idx++)
+			{
+				int i = getUnionFind().getElement(idx).m_sz;
+				btCollisionObject* colObj0 = collisionObjects[i];
+				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
+				{
+					//					printf("error in island management\n");
+				}
+
+                btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
+
+				if (colObj0->getIslandTag() == islandId)
+				{
+					colObj0->setActivationState(ISLAND_SLEEPING);
+				}
+			}
+		}
+		else
+		{
+			int idx;
+			for (idx = startIslandIndex; idx < endIslandIndex; idx++)
+			{
+				int i = getUnionFind().getElement(idx).m_sz;
+
+				btCollisionObject* colObj0 = collisionObjects[i];
+				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
+				{
+					//					printf("error in island management\n");
+				}
+
+                 btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
+
+
+				if (colObj0->getIslandTag() == islandId)
+				{
+					if (colObj0->getActivationState() == ISLAND_SLEEPING)
+					{
+						colObj0->setActivationState(WANTS_DEACTIVATION);
+						colObj0->setDeactivationTime(0.f);
+					}
+				}
+			}
+		}
+	}
+
+	int i;
+	int maxNumManifolds = dispatcher->getNumManifolds();
+
+	//#define SPLIT_ISLANDS 1
+	//#ifdef SPLIT_ISLANDS
+
+	//#endif //SPLIT_ISLANDS
+
+	for (i = 0; i < maxNumManifolds; i++)
+	{
+		btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal(i);
+		if (collisionWorld->getDispatchInfo().m_deterministicOverlappingPairs)
+		{
+			if (manifold->getNumContacts() == 0)
+				continue;
+		}
+
+		const btCollisionObject* colObj0 = static_cast<const btCollisionObject*>(manifold->getBody0());
+		const btCollisionObject* colObj1 = static_cast<const btCollisionObject*>(manifold->getBody1());
+
+		///@todo: check sleeping conditions!
+		if (((colObj0) && colObj0->getActivationState() != ISLAND_SLEEPING) ||
+			((colObj1) && colObj1->getActivationState() != ISLAND_SLEEPING))
+		{
+			//kinematic objects don't merge islands, but wake up all connected objects
+			if (colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
+			{
+				if (colObj0->hasContactResponse())
+					colObj1->activate();
+			}
+			if (colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
+			{
+				if (colObj1->hasContactResponse())
+					colObj0->activate();
+			}
+			if (m_splitIslands)
+			{
+				//filtering for response
+				if (dispatcher->needsResponse(colObj0, colObj1))
+					m_islandmanifold.push_back(manifold);
+			}
+		}
+	}
+}
+
+
+///@todo: this is random access, it can be walked 'cache friendly'!
+void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher, btCollisionWorld* collisionWorld, IslandCallback* callback)
+{
+	buildIslands(dispatcher, collisionWorld);
+    processIslands(dispatcher, collisionWorld, callback);
+}
+
+void btSimulationIslandManager::processIslands(btDispatcher* dispatcher, btCollisionWorld* collisionWorld, IslandCallback* callback)
+{
+    btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray();
+	int endIslandIndex = 1;
+	int startIslandIndex;
+	int numElem = getUnionFind().getNumElements();
+
+	BT_PROFILE("processIslands");
+
+	if (!m_splitIslands)
+	{
+		btPersistentManifold** manifold = dispatcher->getInternalManifoldPointer();
+		int maxNumManifolds = dispatcher->getNumManifolds();
+		callback->processIsland(&collisionObjects[0], collisionObjects.size(), manifold, maxNumManifolds, -1);
+	}
+	else
+	{
+		// Sort manifolds, based on islands
+		// Sort the vector using predicate and std::sort
+		//std::sort(islandmanifold.begin(), islandmanifold.end(), btPersistentManifoldSortPredicate);
+
+		int numManifolds = int(m_islandmanifold.size());
+
+		//tried a radix sort, but quicksort/heapsort seems still faster
+		//@todo rewrite island management
+		//btPersistentManifoldSortPredicateDeterministic sorts contact manifolds based on islandid,
+		//but also based on object0 unique id and object1 unique id
+		if (collisionWorld->getDispatchInfo().m_deterministicOverlappingPairs)
+		{
+			m_islandmanifold.quickSort(btPersistentManifoldSortPredicateDeterministic());
+		}
+		else
+		{
+			m_islandmanifold.quickSort(btPersistentManifoldSortPredicate());
+		}
+
+		//m_islandmanifold.heapSort(btPersistentManifoldSortPredicate());
+
+		//now process all active islands (sets of manifolds for now)
+
+		int startManifoldIndex = 0;
+		int endManifoldIndex = 1;
+
+		//int islandId;
+
+		//	printf("Start Islands\n");
+
+		//traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated
+		for (startIslandIndex = 0; startIslandIndex < numElem; startIslandIndex = endIslandIndex)
+		{
+			int islandId = getUnionFind().getElement(startIslandIndex).m_id;
+
+			bool islandSleeping = true;
+
+			for (endIslandIndex = startIslandIndex; (endIslandIndex < numElem) && (getUnionFind().getElement(endIslandIndex).m_id == islandId); endIslandIndex++)
+			{
+				int i = getUnionFind().getElement(endIslandIndex).m_sz;
+				btCollisionObject* colObj0 = collisionObjects[i];
+				m_islandBodies.push_back(colObj0);
+				if (colObj0->isActive())
+					islandSleeping = false;
+			}
+
+			//find the accompanying contact manifold for this islandId
+			int numIslandManifolds = 0;
+			btPersistentManifold** startManifold = 0;
+
+			if (startManifoldIndex < numManifolds)
+			{
+				int curIslandId = getIslandId(m_islandmanifold[startManifoldIndex]);
+				if (curIslandId == islandId)
+				{
+					startManifold = &m_islandmanifold[startManifoldIndex];
+
+					for (endManifoldIndex = startManifoldIndex + 1; (endManifoldIndex < numManifolds) && (islandId == getIslandId(m_islandmanifold[endManifoldIndex])); endManifoldIndex++)
+					{
+					}
+					/// Process the actual simulation, only if not sleeping/deactivated
+					numIslandManifolds = endManifoldIndex - startManifoldIndex;
+				}
+			}
+
+			if (!islandSleeping)
+			{
+				callback->processIsland(&m_islandBodies[0], m_islandBodies.size(), startManifold, numIslandManifolds, islandId);
+				//			printf("Island callback of size:%d bodies, %d manifolds\n",islandBodies.size(),numIslandManifolds);
+			}
+
+			if (numIslandManifolds)
+			{
+				startManifoldIndex = endManifoldIndex;
+			}
+
+			m_islandBodies.resize(0);
+		}
+	}  // else if(!splitIslands)
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
new file mode 100644
index 0000000..bd222a1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
@@ -0,0 +1,75 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMULATION_ISLAND_MANAGER_H
+#define BT_SIMULATION_ISLAND_MANAGER_H
+
+#include "BulletCollision/CollisionDispatch/btUnionFind.h"
+#include "btCollisionCreateFunc.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "btCollisionObject.h"
+
+class btCollisionObject;
+class btCollisionWorld;
+class btDispatcher;
+class btPersistentManifold;
+
+///SimulationIslandManager creates and handles simulation islands, using btUnionFind
+class btSimulationIslandManager
+{
+	btUnionFind m_unionFind;
+
+	btAlignedObjectArray<btPersistentManifold*> m_islandmanifold;
+	btAlignedObjectArray<btCollisionObject*> m_islandBodies;
+
+	bool m_splitIslands;
+
+public:
+	btSimulationIslandManager();
+	virtual ~btSimulationIslandManager();
+
+	void initUnionFind(int n);
+
+	btUnionFind& getUnionFind() { return m_unionFind; }
+
+	virtual void updateActivationState(btCollisionWorld* colWorld, btDispatcher* dispatcher);
+	virtual void storeIslandActivationState(btCollisionWorld* world);
+
+	void findUnions(btDispatcher* dispatcher, btCollisionWorld* colWorld);
+
+	struct IslandCallback
+	{
+		virtual ~IslandCallback(){};
+
+		virtual void processIsland(btCollisionObject** bodies, int numBodies, class btPersistentManifold** manifolds, int numManifolds, int islandId) = 0;
+	};
+
+	void buildAndProcessIslands(btDispatcher* dispatcher, btCollisionWorld* collisionWorld, IslandCallback* callback);
+    
+	void buildIslands(btDispatcher* dispatcher, btCollisionWorld* colWorld);
+
+    void processIslands(btDispatcher* dispatcher, btCollisionWorld* collisionWorld, IslandCallback* callback);
+    
+	bool getSplitIslands()
+	{
+		return m_splitIslands;
+	}
+	void setSplitIslands(bool doSplitIslands)
+	{
+		m_splitIslands = doSplitIslands;
+	}
+};
+
+#endif  //BT_SIMULATION_ISLAND_MANAGER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
new file mode 100644
index 0000000..5ab26f5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
@@ -0,0 +1,209 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSphereBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+//#include <stdio.h>
+
+btSphereBoxCollisionAlgorithm::btSphereBoxCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* col0Wrap, const btCollisionObjectWrapper* col1Wrap, bool isSwapped)
+	: btActivatingCollisionAlgorithm(ci, col0Wrap, col1Wrap),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf),
+	  m_isSwapped(isSwapped)
+{
+	const btCollisionObjectWrapper* sphereObjWrap = m_isSwapped ? col1Wrap : col0Wrap;
+	const btCollisionObjectWrapper* boxObjWrap = m_isSwapped ? col0Wrap : col1Wrap;
+
+	if (!m_manifoldPtr && m_dispatcher->needsCollision(sphereObjWrap->getCollisionObject(), boxObjWrap->getCollisionObject()))
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(sphereObjWrap->getCollisionObject(), boxObjWrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+}
+
+btSphereBoxCollisionAlgorithm::~btSphereBoxCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btSphereBoxCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)dispatchInfo;
+	(void)resultOut;
+	if (!m_manifoldPtr)
+		return;
+
+	const btCollisionObjectWrapper* sphereObjWrap = m_isSwapped ? body1Wrap : body0Wrap;
+	const btCollisionObjectWrapper* boxObjWrap = m_isSwapped ? body0Wrap : body1Wrap;
+
+	btVector3 pOnBox;
+
+	btVector3 normalOnSurfaceB;
+	btScalar penetrationDepth;
+	btVector3 sphereCenter = sphereObjWrap->getWorldTransform().getOrigin();
+	const btSphereShape* sphere0 = (const btSphereShape*)sphereObjWrap->getCollisionShape();
+	btScalar radius = sphere0->getRadius();
+	btScalar maxContactDistance = m_manifoldPtr->getContactBreakingThreshold();
+
+	resultOut->setPersistentManifold(m_manifoldPtr);
+
+	if (getSphereDistance(boxObjWrap, pOnBox, normalOnSurfaceB, penetrationDepth, sphereCenter, radius, maxContactDistance))
+	{
+		/// report a contact. internally this will be kept persistent, and contact reduction is done
+		resultOut->addContactPoint(normalOnSurfaceB, pOnBox, penetrationDepth);
+	}
+
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr->getNumContacts())
+		{
+			resultOut->refreshContactPoints();
+		}
+	}
+}
+
+btScalar btSphereBoxCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0, btCollisionObject* col1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	(void)col0;
+	(void)col1;
+
+	//not yet
+	return btScalar(1.);
+}
+
+bool btSphereBoxCollisionAlgorithm::getSphereDistance(const btCollisionObjectWrapper* boxObjWrap, btVector3& pointOnBox, btVector3& normal, btScalar& penetrationDepth, const btVector3& sphereCenter, btScalar fRadius, btScalar maxContactDistance)
+{
+	const btBoxShape* boxShape = (const btBoxShape*)boxObjWrap->getCollisionShape();
+	btVector3 const& boxHalfExtent = boxShape->getHalfExtentsWithoutMargin();
+	btScalar boxMargin = boxShape->getMargin();
+	penetrationDepth = 1.0f;
+
+	// convert the sphere position to the box's local space
+	btTransform const& m44T = boxObjWrap->getWorldTransform();
+	btVector3 sphereRelPos = m44T.invXform(sphereCenter);
+
+	// Determine the closest point to the sphere center in the box
+	btVector3 closestPoint = sphereRelPos;
+	closestPoint.setX(btMin(boxHalfExtent.getX(), closestPoint.getX()));
+	closestPoint.setX(btMax(-boxHalfExtent.getX(), closestPoint.getX()));
+	closestPoint.setY(btMin(boxHalfExtent.getY(), closestPoint.getY()));
+	closestPoint.setY(btMax(-boxHalfExtent.getY(), closestPoint.getY()));
+	closestPoint.setZ(btMin(boxHalfExtent.getZ(), closestPoint.getZ()));
+	closestPoint.setZ(btMax(-boxHalfExtent.getZ(), closestPoint.getZ()));
+
+	btScalar intersectionDist = fRadius + boxMargin;
+	btScalar contactDist = intersectionDist + maxContactDistance;
+	normal = sphereRelPos - closestPoint;
+
+	//if there is no penetration, we are done
+	btScalar dist2 = normal.length2();
+	if (dist2 > contactDist * contactDist)
+	{
+		return false;
+	}
+
+	btScalar distance;
+
+	//special case if the sphere center is inside the box
+	if (dist2 <= SIMD_EPSILON)
+	{
+		distance = -getSpherePenetration(boxHalfExtent, sphereRelPos, closestPoint, normal);
+	}
+	else  //compute the penetration details
+	{
+		distance = normal.length();
+		normal /= distance;
+	}
+
+	pointOnBox = closestPoint + normal * boxMargin;
+	//	v3PointOnSphere = sphereRelPos - (normal * fRadius);
+	penetrationDepth = distance - intersectionDist;
+
+	// transform back in world space
+	btVector3 tmp = m44T(pointOnBox);
+	pointOnBox = tmp;
+	//	tmp = m44T(v3PointOnSphere);
+	//	v3PointOnSphere = tmp;
+	tmp = m44T.getBasis() * normal;
+	normal = tmp;
+
+	return true;
+}
+
+btScalar btSphereBoxCollisionAlgorithm::getSpherePenetration(btVector3 const& boxHalfExtent, btVector3 const& sphereRelPos, btVector3& closestPoint, btVector3& normal)
+{
+	//project the center of the sphere on the closest face of the box
+	btScalar faceDist = boxHalfExtent.getX() - sphereRelPos.getX();
+	btScalar minDist = faceDist;
+	closestPoint.setX(boxHalfExtent.getX());
+	normal.setValue(btScalar(1.0f), btScalar(0.0f), btScalar(0.0f));
+
+	faceDist = boxHalfExtent.getX() + sphereRelPos.getX();
+	if (faceDist < minDist)
+	{
+		minDist = faceDist;
+		closestPoint = sphereRelPos;
+		closestPoint.setX(-boxHalfExtent.getX());
+		normal.setValue(btScalar(-1.0f), btScalar(0.0f), btScalar(0.0f));
+	}
+
+	faceDist = boxHalfExtent.getY() - sphereRelPos.getY();
+	if (faceDist < minDist)
+	{
+		minDist = faceDist;
+		closestPoint = sphereRelPos;
+		closestPoint.setY(boxHalfExtent.getY());
+		normal.setValue(btScalar(0.0f), btScalar(1.0f), btScalar(0.0f));
+	}
+
+	faceDist = boxHalfExtent.getY() + sphereRelPos.getY();
+	if (faceDist < minDist)
+	{
+		minDist = faceDist;
+		closestPoint = sphereRelPos;
+		closestPoint.setY(-boxHalfExtent.getY());
+		normal.setValue(btScalar(0.0f), btScalar(-1.0f), btScalar(0.0f));
+	}
+
+	faceDist = boxHalfExtent.getZ() - sphereRelPos.getZ();
+	if (faceDist < minDist)
+	{
+		minDist = faceDist;
+		closestPoint = sphereRelPos;
+		closestPoint.setZ(boxHalfExtent.getZ());
+		normal.setValue(btScalar(0.0f), btScalar(0.0f), btScalar(1.0f));
+	}
+
+	faceDist = boxHalfExtent.getZ() + sphereRelPos.getZ();
+	if (faceDist < minDist)
+	{
+		minDist = faceDist;
+		closestPoint = sphereRelPos;
+		closestPoint.setZ(-boxHalfExtent.getZ());
+		normal.setValue(btScalar(0.0f), btScalar(0.0f), btScalar(-1.0f));
+	}
+
+	return minDist;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
new file mode 100644
index 0000000..33060e8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
@@ -0,0 +1,73 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SPHERE_BOX_COLLISION_ALGORITHM_H
+#define BT_SPHERE_BOX_COLLISION_ALGORITHM_H
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btPersistentManifold;
+#include "btCollisionDispatcher.h"
+
+#include "LinearMath/btVector3.h"
+
+/// btSphereBoxCollisionAlgorithm  provides sphere-box collision detection.
+/// Other features are frame-coherency (persistent data) and collision response.
+class btSphereBoxCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+	bool m_isSwapped;
+
+public:
+	btSphereBoxCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped);
+
+	virtual ~btSphereBoxCollisionAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+	bool getSphereDistance(const btCollisionObjectWrapper* boxObjWrap, btVector3& v3PointOnBox, btVector3& normal, btScalar& penetrationDepth, const btVector3& v3SphereCenter, btScalar fRadius, btScalar maxContactDistance);
+
+	btScalar getSpherePenetration(btVector3 const& boxHalfExtent, btVector3 const& sphereRelPos, btVector3& closestPoint, btVector3& normal);
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereBoxCollisionAlgorithm));
+			if (!m_swapped)
+			{
+				return new (mem) btSphereBoxCollisionAlgorithm(0, ci, body0Wrap, body1Wrap, false);
+			}
+			else
+			{
+				return new (mem) btSphereBoxCollisionAlgorithm(0, ci, body0Wrap, body1Wrap, true);
+			}
+		}
+	};
+};
+
+#endif  //BT_SPHERE_BOX_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
new file mode 100644
index 0000000..9c35565
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
@@ -0,0 +1,105 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#define CLEAR_MANIFOLD 1
+
+#include "btSphereSphereCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+btSphereSphereCollisionAlgorithm::btSphereSphereCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* col0Wrap, const btCollisionObjectWrapper* col1Wrap)
+	: btActivatingCollisionAlgorithm(ci, col0Wrap, col1Wrap),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf)
+{
+	if (!m_manifoldPtr)
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(col0Wrap->getCollisionObject(), col1Wrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+}
+
+btSphereSphereCollisionAlgorithm::~btSphereSphereCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btSphereSphereCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* col0Wrap, const btCollisionObjectWrapper* col1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)dispatchInfo;
+
+	if (!m_manifoldPtr)
+		return;
+
+	resultOut->setPersistentManifold(m_manifoldPtr);
+
+	btSphereShape* sphere0 = (btSphereShape*)col0Wrap->getCollisionShape();
+	btSphereShape* sphere1 = (btSphereShape*)col1Wrap->getCollisionShape();
+
+	btVector3 diff = col0Wrap->getWorldTransform().getOrigin() - col1Wrap->getWorldTransform().getOrigin();
+	btScalar len = diff.length();
+	btScalar radius0 = sphere0->getRadius();
+	btScalar radius1 = sphere1->getRadius();
+
+#ifdef CLEAR_MANIFOLD
+	m_manifoldPtr->clearManifold();  //don't do this, it disables warmstarting
+#endif
+
+	///iff distance positive, don't generate a new contact
+	if (len > (radius0 + radius1 + resultOut->m_closestPointDistanceThreshold))
+	{
+#ifndef CLEAR_MANIFOLD
+		resultOut->refreshContactPoints();
+#endif  //CLEAR_MANIFOLD
+		return;
+	}
+	///distance (negative means penetration)
+	btScalar dist = len - (radius0 + radius1);
+
+	btVector3 normalOnSurfaceB(1, 0, 0);
+	if (len > SIMD_EPSILON)
+	{
+		normalOnSurfaceB = diff / len;
+	}
+
+	///point on A (worldspace)
+	///btVector3 pos0 = col0->getWorldTransform().getOrigin() - radius0 * normalOnSurfaceB;
+	///point on B (worldspace)
+	btVector3 pos1 = col1Wrap->getWorldTransform().getOrigin() + radius1 * normalOnSurfaceB;
+
+	/// report a contact. internally this will be kept persistent, and contact reduction is done
+
+	resultOut->addContactPoint(normalOnSurfaceB, pos1, dist);
+
+#ifndef CLEAR_MANIFOLD
+	resultOut->refreshContactPoints();
+#endif  //CLEAR_MANIFOLD
+}
+
+btScalar btSphereSphereCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0, btCollisionObject* col1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)col0;
+	(void)col1;
+	(void)dispatchInfo;
+	(void)resultOut;
+
+	//not yet
+	return btScalar(1.);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
new file mode 100644
index 0000000..399c927
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
@@ -0,0 +1,64 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H
+#define BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "btCollisionDispatcher.h"
+
+class btPersistentManifold;
+
+/// btSphereSphereCollisionAlgorithm  provides sphere-sphere collision detection.
+/// Other features are frame-coherency (persistent data) and collision response.
+/// Also provides the most basic sample for custom/user btCollisionAlgorithm
+class btSphereSphereCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+
+public:
+	btSphereSphereCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* col0Wrap, const btCollisionObjectWrapper* col1Wrap);
+
+	btSphereSphereCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+		: btActivatingCollisionAlgorithm(ci) {}
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+	virtual ~btSphereSphereCollisionAlgorithm();
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* col0Wrap, const btCollisionObjectWrapper* col1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereSphereCollisionAlgorithm));
+			return new (mem) btSphereSphereCollisionAlgorithm(0, ci, col0Wrap, col1Wrap);
+		}
+	};
+};
+
+#endif  //BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
new file mode 100644
index 0000000..21e0d94
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
@@ -0,0 +1,82 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSphereTriangleCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "SphereTriangleDetector.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+btSphereTriangleCollisionAlgorithm::btSphereTriangleCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool swapped)
+	: btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
+	  m_ownManifold(false),
+	  m_manifoldPtr(mf),
+	  m_swapped(swapped)
+{
+	if (!m_manifoldPtr)
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(body0Wrap->getCollisionObject(), body1Wrap->getCollisionObject());
+		m_ownManifold = true;
+	}
+}
+
+btSphereTriangleCollisionAlgorithm::~btSphereTriangleCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btSphereTriangleCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* col0Wrap, const btCollisionObjectWrapper* col1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	if (!m_manifoldPtr)
+		return;
+
+	const btCollisionObjectWrapper* sphereObjWrap = m_swapped ? col1Wrap : col0Wrap;
+	const btCollisionObjectWrapper* triObjWrap = m_swapped ? col0Wrap : col1Wrap;
+
+	btSphereShape* sphere = (btSphereShape*)sphereObjWrap->getCollisionShape();
+	btTriangleShape* triangle = (btTriangleShape*)triObjWrap->getCollisionShape();
+
+	/// report a contact. internally this will be kept persistent, and contact reduction is done
+	resultOut->setPersistentManifold(m_manifoldPtr);
+	SphereTriangleDetector detector(sphere, triangle, m_manifoldPtr->getContactBreakingThreshold() + resultOut->m_closestPointDistanceThreshold);
+
+	btDiscreteCollisionDetectorInterface::ClosestPointInput input;
+	input.m_maximumDistanceSquared = btScalar(BT_LARGE_FLOAT);  ///@todo: tighter bounds
+	input.m_transformA = sphereObjWrap->getWorldTransform();
+	input.m_transformB = triObjWrap->getWorldTransform();
+
+	bool swapResults = m_swapped;
+
+	detector.getClosestPoints(input, *resultOut, dispatchInfo.m_debugDraw, swapResults);
+
+	if (m_ownManifold)
+		resultOut->refreshContactPoints();
+}
+
+btScalar btSphereTriangleCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0, btCollisionObject* col1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	(void)col0;
+	(void)col1;
+
+	//not yet
+	return btScalar(1.);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
new file mode 100644
index 0000000..73c6fd1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
@@ -0,0 +1,65 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
+#define BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
+
+#include "btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btPersistentManifold;
+#include "btCollisionDispatcher.h"
+
+/// btSphereSphereCollisionAlgorithm  provides sphere-sphere collision detection.
+/// Other features are frame-coherency (persistent data) and collision response.
+/// Also provides the most basic sample for custom/user btCollisionAlgorithm
+class btSphereTriangleCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+	bool m_swapped;
+
+public:
+	btSphereTriangleCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool swapped);
+
+	btSphereTriangleCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+		: btActivatingCollisionAlgorithm(ci) {}
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+	virtual ~btSphereTriangleCollisionAlgorithm();
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereTriangleCollisionAlgorithm));
+
+			return new (mem) btSphereTriangleCollisionAlgorithm(ci.m_manifold, ci, body0Wrap, body1Wrap, m_swapped);
+		}
+	};
+};
+
+#endif  //BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
new file mode 100644
index 0000000..906c331
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
@@ -0,0 +1,74 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btUnionFind.h"
+
+btUnionFind::~btUnionFind()
+{
+	Free();
+}
+
+btUnionFind::btUnionFind()
+{
+}
+
+void btUnionFind::allocate(int N)
+{
+	m_elements.resize(N);
+}
+void btUnionFind::Free()
+{
+	m_elements.clear();
+}
+
+void btUnionFind::reset(int N)
+{
+	allocate(N);
+
+	for (int i = 0; i < N; i++)
+	{
+		m_elements[i].m_id = i;
+		m_elements[i].m_sz = 1;
+	}
+}
+
+class btUnionFindElementSortPredicate
+{
+public:
+	bool operator()(const btElement& lhs, const btElement& rhs) const
+	{
+		return lhs.m_id < rhs.m_id;
+	}
+};
+
+///this is a special operation, destroying the content of btUnionFind.
+///it sorts the elements, based on island id, in order to make it easy to iterate over islands
+void btUnionFind::sortIslands()
+{
+	//first store the original body index, and islandId
+	int numElements = m_elements.size();
+
+	for (int i = 0; i < numElements; i++)
+	{
+		m_elements[i].m_id = find(i);
+#ifndef STATIC_SIMULATION_ISLAND_OPTIMIZATION
+		m_elements[i].m_sz = i;
+#endif  //STATIC_SIMULATION_ISLAND_OPTIMIZATION
+	}
+
+	// Sort the vector using predicate and std::sort
+	//std::sort(m_elements.begin(), m_elements.end(), btUnionFindElementSortPredicate);
+	m_elements.quickSort(btUnionFindElementSortPredicate());
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.h
new file mode 100644
index 0000000..59a30b1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionDispatch/btUnionFind.h
@@ -0,0 +1,123 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_UNION_FIND_H
+#define BT_UNION_FIND_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+
+#define USE_PATH_COMPRESSION 1
+
+///see for discussion of static island optimizations by Vroonsh here: http://code.google.com/p/bullet/issues/detail?id=406
+#define STATIC_SIMULATION_ISLAND_OPTIMIZATION 1
+
+struct btElement
+{
+	int m_id;
+	int m_sz;
+};
+
+///UnionFind calculates connected subsets
+// Implements weighted Quick Union with path compression
+// optimization: could use short ints instead of ints (halving memory, would limit the number of rigid bodies to 64k, sounds reasonable)
+class btUnionFind
+{
+private:
+	btAlignedObjectArray<btElement> m_elements;
+
+public:
+	btUnionFind();
+	~btUnionFind();
+
+	//this is a special operation, destroying the content of btUnionFind.
+	//it sorts the elements, based on island id, in order to make it easy to iterate over islands
+	void sortIslands();
+
+	void reset(int N);
+
+	SIMD_FORCE_INLINE int getNumElements() const
+	{
+		return int(m_elements.size());
+	}
+	SIMD_FORCE_INLINE bool isRoot(int x) const
+	{
+		return (x == m_elements[x].m_id);
+	}
+
+	btElement& getElement(int index)
+	{
+		return m_elements[index];
+	}
+	const btElement& getElement(int index) const
+	{
+		return m_elements[index];
+	}
+
+	void allocate(int N);
+	void Free();
+
+	int find(int p, int q)
+	{
+		return (find(p) == find(q));
+	}
+
+	void unite(int p, int q)
+	{
+		int i = find(p), j = find(q);
+		if (i == j)
+			return;
+
+#ifndef USE_PATH_COMPRESSION
+		//weighted quick union, this keeps the 'trees' balanced, and keeps performance of unite O( log(n) )
+		if (m_elements[i].m_sz < m_elements[j].m_sz)
+		{
+			m_elements[i].m_id = j;
+			m_elements[j].m_sz += m_elements[i].m_sz;
+		}
+		else
+		{
+			m_elements[j].m_id = i;
+			m_elements[i].m_sz += m_elements[j].m_sz;
+		}
+#else
+		m_elements[i].m_id = j;
+		m_elements[j].m_sz += m_elements[i].m_sz;
+#endif  //USE_PATH_COMPRESSION
+	}
+
+	int find(int x)
+	{
+		//btAssert(x < m_N);
+		//btAssert(x >= 0);
+
+		while (x != m_elements[x].m_id)
+		{
+			//not really a reason not to use path compression, and it flattens the trees/improves find performance dramatically
+
+#ifdef USE_PATH_COMPRESSION
+			const btElement* elementPtr = &m_elements[m_elements[x].m_id];
+			m_elements[x].m_id = elementPtr->m_id;
+			x = elementPtr->m_id;
+#else  //
+			x = m_elements[x].m_id;
+#endif
+			//btAssert(x < m_N);
+			//btAssert(x >= 0);
+		}
+		return x;
+	}
+};
+
+#endif  //BT_UNION_FIND_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.cpp
new file mode 100644
index 0000000..501890c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.cpp
@@ -0,0 +1,37 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btBox2dShape.h"
+
+//{
+
+void btBox2dShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btTransformAabb(getHalfExtentsWithoutMargin(), getMargin(), t, aabbMin, aabbMax);
+}
+
+void btBox2dShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	//btScalar margin = btScalar(0.);
+	btVector3 halfExtents = getHalfExtentsWithMargin();
+
+	btScalar lx = btScalar(2.) * (halfExtents.x());
+	btScalar ly = btScalar(2.) * (halfExtents.y());
+	btScalar lz = btScalar(2.) * (halfExtents.z());
+
+	inertia.setValue(mass / (btScalar(12.0)) * (ly * ly + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + ly * ly));
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.h
new file mode 100644
index 0000000..6c6e729
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBox2dShape.h
@@ -0,0 +1,339 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_OBB_BOX_2D_SHAPE_H
+#define BT_OBB_BOX_2D_SHAPE_H
+
+#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMinMax.h"
+
+///The btBox2dShape is a box primitive around the origin, its sides axis aligned with length specified by half extents, in local shape coordinates. When used as part of a btCollisionObject or btRigidBody it will be an oriented box in world space.
+ATTRIBUTE_ALIGNED16(class)
+btBox2dShape : public btPolyhedralConvexShape
+{
+	//btVector3	m_boxHalfExtents1; //use m_implicitShapeDimensions instead
+
+	btVector3 m_centroid;
+	btVector3 m_vertices[4];
+	btVector3 m_normals[4];
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btVector3 getHalfExtentsWithMargin() const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 margin(getMargin(), getMargin(), getMargin());
+		halfExtents += margin;
+		return halfExtents;
+	}
+
+	const btVector3& getHalfExtentsWithoutMargin() const
+	{
+		return m_implicitShapeDimensions;  //changed in Bullet 2.63: assume the scaling and margin are included
+	}
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 margin(getMargin(), getMargin(), getMargin());
+		halfExtents += margin;
+
+		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+						 btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+						 btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+	}
+
+	SIMD_FORCE_INLINE btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+	{
+		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
+
+		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+						 btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+						 btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+	}
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+	{
+		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
+
+		for (int i = 0; i < numVectors; i++)
+		{
+			const btVector3& vec = vectors[i];
+			supportVerticesOut[i].setValue(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+										   btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+										   btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+		}
+	}
+
+	///a btBox2dShape is a flat 2D box in the X-Y plane (Z extents are zero)
+	btBox2dShape(const btVector3& boxHalfExtents)
+		: btPolyhedralConvexShape(),
+		  m_centroid(0, 0, 0)
+	{
+		m_vertices[0].setValue(-boxHalfExtents.getX(), -boxHalfExtents.getY(), 0);
+		m_vertices[1].setValue(boxHalfExtents.getX(), -boxHalfExtents.getY(), 0);
+		m_vertices[2].setValue(boxHalfExtents.getX(), boxHalfExtents.getY(), 0);
+		m_vertices[3].setValue(-boxHalfExtents.getX(), boxHalfExtents.getY(), 0);
+
+		m_normals[0].setValue(0, -1, 0);
+		m_normals[1].setValue(1, 0, 0);
+		m_normals[2].setValue(0, 1, 0);
+		m_normals[3].setValue(-1, 0, 0);
+
+		btScalar minDimension = boxHalfExtents.getX();
+		if (minDimension > boxHalfExtents.getY())
+			minDimension = boxHalfExtents.getY();
+
+		m_shapeType = BOX_2D_SHAPE_PROXYTYPE;
+		btVector3 margin(getMargin(), getMargin(), getMargin());
+		m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
+
+		setSafeMargin(minDimension);
+	};
+
+	virtual void setMargin(btScalar collisionMargin)
+	{
+		//correct the m_implicitShapeDimensions for the margin
+		btVector3 oldMargin(getMargin(), getMargin(), getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions + oldMargin;
+
+		btConvexInternalShape::setMargin(collisionMargin);
+		btVector3 newMargin(getMargin(), getMargin(), getMargin());
+		m_implicitShapeDimensions = implicitShapeDimensionsWithMargin - newMargin;
+	}
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		btVector3 oldMargin(getMargin(), getMargin(), getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions + oldMargin;
+		btVector3 unScaledImplicitShapeDimensionsWithMargin = implicitShapeDimensionsWithMargin / m_localScaling;
+
+		btConvexInternalShape::setLocalScaling(scaling);
+
+		m_implicitShapeDimensions = (unScaledImplicitShapeDimensionsWithMargin * m_localScaling) - oldMargin;
+	}
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	int getVertexCount() const
+	{
+		return 4;
+	}
+
+	virtual int getNumVertices() const
+	{
+		return 4;
+	}
+
+	const btVector3* getVertices() const
+	{
+		return &m_vertices[0];
+	}
+
+	const btVector3* getNormals() const
+	{
+		return &m_normals[0];
+	}
+
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const
+	{
+		//this plane might not be aligned...
+		btVector4 plane;
+		getPlaneEquation(plane, i);
+		planeNormal = btVector3(plane.getX(), plane.getY(), plane.getZ());
+		planeSupport = localGetSupportingVertex(-planeNormal);
+	}
+
+	const btVector3& getCentroid() const
+	{
+		return m_centroid;
+	}
+
+	virtual int getNumPlanes() const
+	{
+		return 6;
+	}
+
+	virtual int getNumEdges() const
+	{
+		return 12;
+	}
+
+	virtual void getVertex(int i, btVector3& vtx) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+
+		vtx = btVector3(
+			halfExtents.x() * (1 - (i & 1)) - halfExtents.x() * (i & 1),
+			halfExtents.y() * (1 - ((i & 2) >> 1)) - halfExtents.y() * ((i & 2) >> 1),
+			halfExtents.z() * (1 - ((i & 4) >> 2)) - halfExtents.z() * ((i & 4) >> 2));
+	}
+
+	virtual void getPlaneEquation(btVector4 & plane, int i) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+
+		switch (i)
+		{
+			case 0:
+				plane.setValue(btScalar(1.), btScalar(0.), btScalar(0.), -halfExtents.x());
+				break;
+			case 1:
+				plane.setValue(btScalar(-1.), btScalar(0.), btScalar(0.), -halfExtents.x());
+				break;
+			case 2:
+				plane.setValue(btScalar(0.), btScalar(1.), btScalar(0.), -halfExtents.y());
+				break;
+			case 3:
+				plane.setValue(btScalar(0.), btScalar(-1.), btScalar(0.), -halfExtents.y());
+				break;
+			case 4:
+				plane.setValue(btScalar(0.), btScalar(0.), btScalar(1.), -halfExtents.z());
+				break;
+			case 5:
+				plane.setValue(btScalar(0.), btScalar(0.), btScalar(-1.), -halfExtents.z());
+				break;
+			default:
+				btAssert(0);
+		}
+	}
+
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const
+	//virtual void getEdge(int i,Edge& edge) const
+	{
+		int edgeVert0 = 0;
+		int edgeVert1 = 0;
+
+		switch (i)
+		{
+			case 0:
+				edgeVert0 = 0;
+				edgeVert1 = 1;
+				break;
+			case 1:
+				edgeVert0 = 0;
+				edgeVert1 = 2;
+				break;
+			case 2:
+				edgeVert0 = 1;
+				edgeVert1 = 3;
+
+				break;
+			case 3:
+				edgeVert0 = 2;
+				edgeVert1 = 3;
+				break;
+			case 4:
+				edgeVert0 = 0;
+				edgeVert1 = 4;
+				break;
+			case 5:
+				edgeVert0 = 1;
+				edgeVert1 = 5;
+
+				break;
+			case 6:
+				edgeVert0 = 2;
+				edgeVert1 = 6;
+				break;
+			case 7:
+				edgeVert0 = 3;
+				edgeVert1 = 7;
+				break;
+			case 8:
+				edgeVert0 = 4;
+				edgeVert1 = 5;
+				break;
+			case 9:
+				edgeVert0 = 4;
+				edgeVert1 = 6;
+				break;
+			case 10:
+				edgeVert0 = 5;
+				edgeVert1 = 7;
+				break;
+			case 11:
+				edgeVert0 = 6;
+				edgeVert1 = 7;
+				break;
+			default:
+				btAssert(0);
+		}
+
+		getVertex(edgeVert0, pa);
+		getVertex(edgeVert1, pb);
+	}
+
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+
+		//btScalar minDist = 2*tolerance;
+
+		bool result = (pt.x() <= (halfExtents.x() + tolerance)) &&
+					  (pt.x() >= (-halfExtents.x() - tolerance)) &&
+					  (pt.y() <= (halfExtents.y() + tolerance)) &&
+					  (pt.y() >= (-halfExtents.y() - tolerance)) &&
+					  (pt.z() <= (halfExtents.z() + tolerance)) &&
+					  (pt.z() >= (-halfExtents.z() - tolerance));
+
+		return result;
+	}
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "Box2d";
+	}
+
+	virtual int getNumPreferredPenetrationDirections() const
+	{
+		return 6;
+	}
+
+	virtual void getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+	{
+		switch (index)
+		{
+			case 0:
+				penetrationVector.setValue(btScalar(1.), btScalar(0.), btScalar(0.));
+				break;
+			case 1:
+				penetrationVector.setValue(btScalar(-1.), btScalar(0.), btScalar(0.));
+				break;
+			case 2:
+				penetrationVector.setValue(btScalar(0.), btScalar(1.), btScalar(0.));
+				break;
+			case 3:
+				penetrationVector.setValue(btScalar(0.), btScalar(-1.), btScalar(0.));
+				break;
+			case 4:
+				penetrationVector.setValue(btScalar(0.), btScalar(0.), btScalar(1.));
+				break;
+			case 5:
+				penetrationVector.setValue(btScalar(0.), btScalar(0.), btScalar(-1.));
+				break;
+			default:
+				btAssert(0);
+		}
+	}
+};
+
+#endif  //BT_OBB_BOX_2D_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.cpp
new file mode 100644
index 0000000..cb91d02
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.cpp
@@ -0,0 +1,45 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#include "btBoxShape.h"
+
+btBoxShape::btBoxShape(const btVector3& boxHalfExtents)
+	: btPolyhedralConvexShape()
+{
+	m_shapeType = BOX_SHAPE_PROXYTYPE;
+
+	btVector3 margin(getMargin(), getMargin(), getMargin());
+	m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
+
+	setSafeMargin(boxHalfExtents);
+};
+
+void btBoxShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btTransformAabb(getHalfExtentsWithoutMargin(), getMargin(), t, aabbMin, aabbMax);
+}
+
+void btBoxShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	//btScalar margin = btScalar(0.);
+	btVector3 halfExtents = getHalfExtentsWithMargin();
+
+	btScalar lx = btScalar(2.) * (halfExtents.x());
+	btScalar ly = btScalar(2.) * (halfExtents.y());
+	btScalar lz = btScalar(2.) * (halfExtents.z());
+
+	inertia.setValue(mass / (btScalar(12.0)) * (ly * ly + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + ly * ly));
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.h
new file mode 100644
index 0000000..3c65505
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBoxShape.h
@@ -0,0 +1,291 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_OBB_BOX_MINKOWSKI_H
+#define BT_OBB_BOX_MINKOWSKI_H
+
+#include "btPolyhedralConvexShape.h"
+#include "btCollisionMargin.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMinMax.h"
+
+///The btBoxShape is a box primitive around the origin, its sides axis aligned with length specified by half extents, in local shape coordinates. When used as part of a btCollisionObject or btRigidBody it will be an oriented box in world space.
+ATTRIBUTE_ALIGNED16(class)
+btBoxShape : public btPolyhedralConvexShape
+{
+	//btVector3	m_boxHalfExtents1; //use m_implicitShapeDimensions instead
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btVector3 getHalfExtentsWithMargin() const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 margin(getMargin(), getMargin(), getMargin());
+		halfExtents += margin;
+		return halfExtents;
+	}
+
+	const btVector3& getHalfExtentsWithoutMargin() const
+	{
+		return m_implicitShapeDimensions;  //scaling is included, margin is not
+	}
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 margin(getMargin(), getMargin(), getMargin());
+		halfExtents += margin;
+
+		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+						 btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+						 btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+	}
+
+	SIMD_FORCE_INLINE btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+	{
+		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
+
+		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+						 btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+						 btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+	}
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+	{
+		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
+
+		for (int i = 0; i < numVectors; i++)
+		{
+			const btVector3& vec = vectors[i];
+			supportVerticesOut[i].setValue(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+										   btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+										   btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+		}
+	}
+
+	btBoxShape(const btVector3& boxHalfExtents);
+
+	virtual void setMargin(btScalar collisionMargin)
+	{
+		//correct the m_implicitShapeDimensions for the margin
+		btVector3 oldMargin(getMargin(), getMargin(), getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions + oldMargin;
+
+		btConvexInternalShape::setMargin(collisionMargin);
+		btVector3 newMargin(getMargin(), getMargin(), getMargin());
+		m_implicitShapeDimensions = implicitShapeDimensionsWithMargin - newMargin;
+	}
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		btVector3 oldMargin(getMargin(), getMargin(), getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions + oldMargin;
+		btVector3 unScaledImplicitShapeDimensionsWithMargin = implicitShapeDimensionsWithMargin / m_localScaling;
+
+		btConvexInternalShape::setLocalScaling(scaling);
+
+		m_implicitShapeDimensions = (unScaledImplicitShapeDimensionsWithMargin * m_localScaling) - oldMargin;
+	}
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const
+	{
+		//this plane might not be aligned...
+		btVector4 plane;
+		getPlaneEquation(plane, i);
+		planeNormal = btVector3(plane.getX(), plane.getY(), plane.getZ());
+		planeSupport = localGetSupportingVertex(-planeNormal);
+	}
+
+	virtual int getNumPlanes() const
+	{
+		return 6;
+	}
+
+	virtual int getNumVertices() const
+	{
+		return 8;
+	}
+
+	virtual int getNumEdges() const
+	{
+		return 12;
+	}
+
+	virtual void getVertex(int i, btVector3& vtx) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithMargin();
+
+		vtx = btVector3(
+			halfExtents.x() * (1 - (i & 1)) - halfExtents.x() * (i & 1),
+			halfExtents.y() * (1 - ((i & 2) >> 1)) - halfExtents.y() * ((i & 2) >> 1),
+			halfExtents.z() * (1 - ((i & 4) >> 2)) - halfExtents.z() * ((i & 4) >> 2));
+	}
+
+	virtual void getPlaneEquation(btVector4 & plane, int i) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+
+		switch (i)
+		{
+			case 0:
+				plane.setValue(btScalar(1.), btScalar(0.), btScalar(0.), -halfExtents.x());
+				break;
+			case 1:
+				plane.setValue(btScalar(-1.), btScalar(0.), btScalar(0.), -halfExtents.x());
+				break;
+			case 2:
+				plane.setValue(btScalar(0.), btScalar(1.), btScalar(0.), -halfExtents.y());
+				break;
+			case 3:
+				plane.setValue(btScalar(0.), btScalar(-1.), btScalar(0.), -halfExtents.y());
+				break;
+			case 4:
+				plane.setValue(btScalar(0.), btScalar(0.), btScalar(1.), -halfExtents.z());
+				break;
+			case 5:
+				plane.setValue(btScalar(0.), btScalar(0.), btScalar(-1.), -halfExtents.z());
+				break;
+			default:
+				btAssert(0);
+		}
+	}
+
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const
+	//virtual void getEdge(int i,Edge& edge) const
+	{
+		int edgeVert0 = 0;
+		int edgeVert1 = 0;
+
+		switch (i)
+		{
+			case 0:
+				edgeVert0 = 0;
+				edgeVert1 = 1;
+				break;
+			case 1:
+				edgeVert0 = 0;
+				edgeVert1 = 2;
+				break;
+			case 2:
+				edgeVert0 = 1;
+				edgeVert1 = 3;
+
+				break;
+			case 3:
+				edgeVert0 = 2;
+				edgeVert1 = 3;
+				break;
+			case 4:
+				edgeVert0 = 0;
+				edgeVert1 = 4;
+				break;
+			case 5:
+				edgeVert0 = 1;
+				edgeVert1 = 5;
+
+				break;
+			case 6:
+				edgeVert0 = 2;
+				edgeVert1 = 6;
+				break;
+			case 7:
+				edgeVert0 = 3;
+				edgeVert1 = 7;
+				break;
+			case 8:
+				edgeVert0 = 4;
+				edgeVert1 = 5;
+				break;
+			case 9:
+				edgeVert0 = 4;
+				edgeVert1 = 6;
+				break;
+			case 10:
+				edgeVert0 = 5;
+				edgeVert1 = 7;
+				break;
+			case 11:
+				edgeVert0 = 6;
+				edgeVert1 = 7;
+				break;
+			default:
+				btAssert(0);
+		}
+
+		getVertex(edgeVert0, pa);
+		getVertex(edgeVert1, pb);
+	}
+
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+
+		//btScalar minDist = 2*tolerance;
+
+		bool result = (pt.x() <= (halfExtents.x() + tolerance)) &&
+					  (pt.x() >= (-halfExtents.x() - tolerance)) &&
+					  (pt.y() <= (halfExtents.y() + tolerance)) &&
+					  (pt.y() >= (-halfExtents.y() - tolerance)) &&
+					  (pt.z() <= (halfExtents.z() + tolerance)) &&
+					  (pt.z() >= (-halfExtents.z() - tolerance));
+
+		return result;
+	}
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "Box";
+	}
+
+	virtual int getNumPreferredPenetrationDirections() const
+	{
+		return 6;
+	}
+
+	virtual void getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+	{
+		switch (index)
+		{
+			case 0:
+				penetrationVector.setValue(btScalar(1.), btScalar(0.), btScalar(0.));
+				break;
+			case 1:
+				penetrationVector.setValue(btScalar(-1.), btScalar(0.), btScalar(0.));
+				break;
+			case 2:
+				penetrationVector.setValue(btScalar(0.), btScalar(1.), btScalar(0.));
+				break;
+			case 3:
+				penetrationVector.setValue(btScalar(0.), btScalar(-1.), btScalar(0.));
+				break;
+			case 4:
+				penetrationVector.setValue(btScalar(0.), btScalar(0.), btScalar(1.));
+				break;
+			case 5:
+				penetrationVector.setValue(btScalar(0.), btScalar(0.), btScalar(-1.));
+				break;
+			default:
+				btAssert(0);
+		}
+	}
+};
+
+#endif  //BT_OBB_BOX_MINKOWSKI_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
new file mode 100644
index 0000000..c66ce58
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
@@ -0,0 +1,462 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//#define DISABLE_BVH
+
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btOptimizedBvh.h"
+#include "LinearMath/btSerializer.h"
+
+///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization.
+///Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
+btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh)
+	: btTriangleMeshShape(meshInterface),
+	  m_bvh(0),
+	  m_triangleInfoMap(0),
+	  m_useQuantizedAabbCompression(useQuantizedAabbCompression),
+	  m_ownsBvh(false)
+{
+	m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE;
+	//construct bvh from meshInterface
+#ifndef DISABLE_BVH
+
+	if (buildBvh)
+	{
+		buildOptimizedBvh();
+	}
+
+#endif  //DISABLE_BVH
+}
+
+btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, const btVector3& bvhAabbMin, const btVector3& bvhAabbMax, bool buildBvh)
+	: btTriangleMeshShape(meshInterface),
+	  m_bvh(0),
+	  m_triangleInfoMap(0),
+	  m_useQuantizedAabbCompression(useQuantizedAabbCompression),
+	  m_ownsBvh(false)
+{
+	m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE;
+	//construct bvh from meshInterface
+#ifndef DISABLE_BVH
+
+	if (buildBvh)
+	{
+		void* mem = btAlignedAlloc(sizeof(btOptimizedBvh), 16);
+		m_bvh = new (mem) btOptimizedBvh();
+
+		m_bvh->build(meshInterface, m_useQuantizedAabbCompression, bvhAabbMin, bvhAabbMax);
+		m_ownsBvh = true;
+	}
+
+#endif  //DISABLE_BVH
+}
+
+void btBvhTriangleMeshShape::partialRefitTree(const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	m_bvh->refitPartial(m_meshInterface, aabbMin, aabbMax);
+
+	m_localAabbMin.setMin(aabbMin);
+	m_localAabbMax.setMax(aabbMax);
+}
+
+void btBvhTriangleMeshShape::refitTree(const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	m_bvh->refit(m_meshInterface, aabbMin, aabbMax);
+
+	recalcLocalAabb();
+}
+
+btBvhTriangleMeshShape::~btBvhTriangleMeshShape()
+{
+	if (m_ownsBvh)
+	{
+		m_bvh->~btOptimizedBvh();
+		btAlignedFree(m_bvh);
+	}
+}
+
+void btBvhTriangleMeshShape::performRaycast(btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget)
+{
+	struct MyNodeOverlapCallback : public btNodeOverlapCallback
+	{
+		btStridingMeshInterface* m_meshInterface;
+		btTriangleCallback* m_callback;
+
+		MyNodeOverlapCallback(btTriangleCallback* callback, btStridingMeshInterface* meshInterface)
+			: m_meshInterface(meshInterface),
+			  m_callback(callback)
+		{
+		}
+
+		virtual void processNode(int nodeSubPart, int nodeTriangleIndex)
+		{
+			btVector3 m_triangle[3];
+			const unsigned char* vertexbase;
+			int numverts;
+			PHY_ScalarType type;
+			int stride;
+			const unsigned char* indexbase;
+			int indexstride;
+			int numfaces;
+			PHY_ScalarType indicestype;
+
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase,
+				numverts,
+				type,
+				stride,
+				&indexbase,
+				indexstride,
+				numfaces,
+				indicestype,
+				nodeSubPart);
+
+			unsigned int* gfxbase = (unsigned int*)(indexbase + nodeTriangleIndex * indexstride);
+
+			const btVector3& meshScaling = m_meshInterface->getScaling();
+			for (int j = 2; j >= 0; j--)
+			{
+				int graphicsindex;
+                                switch (indicestype) {
+                                        case PHY_INTEGER: graphicsindex = gfxbase[j]; break;
+                                        case PHY_SHORT: graphicsindex = ((unsigned short*)gfxbase)[j]; break;
+                                        case PHY_UCHAR: graphicsindex = ((unsigned char*)gfxbase)[j]; break;
+                                        default: btAssert(0);
+                                }
+
+				if (type == PHY_FLOAT)
+				{
+					float* graphicsbase = (float*)(vertexbase + graphicsindex * stride);
+
+					m_triangle[j] = btVector3(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+				}
+				else
+				{
+					double* graphicsbase = (double*)(vertexbase + graphicsindex * stride);
+
+					m_triangle[j] = btVector3(btScalar(graphicsbase[0]) * meshScaling.getX(), btScalar(graphicsbase[1]) * meshScaling.getY(), btScalar(graphicsbase[2]) * meshScaling.getZ());
+				}
+			}
+
+			/* Perform ray vs. triangle collision here */
+			m_callback->processTriangle(m_triangle, nodeSubPart, nodeTriangleIndex);
+			m_meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
+		}
+	};
+
+	MyNodeOverlapCallback myNodeCallback(callback, m_meshInterface);
+
+	m_bvh->reportRayOverlappingNodex(&myNodeCallback, raySource, rayTarget);
+}
+
+void btBvhTriangleMeshShape::performConvexcast(btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	struct MyNodeOverlapCallback : public btNodeOverlapCallback
+	{
+		btStridingMeshInterface* m_meshInterface;
+		btTriangleCallback* m_callback;
+
+		MyNodeOverlapCallback(btTriangleCallback* callback, btStridingMeshInterface* meshInterface)
+			: m_meshInterface(meshInterface),
+			  m_callback(callback)
+		{
+		}
+
+		virtual void processNode(int nodeSubPart, int nodeTriangleIndex)
+		{
+			btVector3 m_triangle[3];
+			const unsigned char* vertexbase;
+			int numverts;
+			PHY_ScalarType type;
+			int stride;
+			const unsigned char* indexbase;
+			int indexstride;
+			int numfaces;
+			PHY_ScalarType indicestype;
+
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase,
+				numverts,
+				type,
+				stride,
+				&indexbase,
+				indexstride,
+				numfaces,
+				indicestype,
+				nodeSubPart);
+
+			unsigned int* gfxbase = (unsigned int*)(indexbase + nodeTriangleIndex * indexstride);
+
+			const btVector3& meshScaling = m_meshInterface->getScaling();
+			for (int j = 2; j >= 0; j--)
+			{
+				int graphicsindex;
+                                switch (indicestype) {
+                                        case PHY_INTEGER: graphicsindex = gfxbase[j]; break;
+                                        case PHY_SHORT: graphicsindex = ((unsigned short*)gfxbase)[j]; break;
+                                        case PHY_UCHAR: graphicsindex = ((unsigned char*)gfxbase)[j]; break;
+                                        default: btAssert(0);
+                                }
+
+				if (type == PHY_FLOAT)
+				{
+					float* graphicsbase = (float*)(vertexbase + graphicsindex * stride);
+
+					m_triangle[j] = btVector3(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+				}
+				else
+				{
+					double* graphicsbase = (double*)(vertexbase + graphicsindex * stride);
+
+					m_triangle[j] = btVector3(btScalar(graphicsbase[0]) * meshScaling.getX(), btScalar(graphicsbase[1]) * meshScaling.getY(), btScalar(graphicsbase[2]) * meshScaling.getZ());
+				}
+			}
+
+			/* Perform ray vs. triangle collision here */
+			m_callback->processTriangle(m_triangle, nodeSubPart, nodeTriangleIndex);
+			m_meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
+		}
+	};
+
+	MyNodeOverlapCallback myNodeCallback(callback, m_meshInterface);
+
+	m_bvh->reportBoxCastOverlappingNodex(&myNodeCallback, raySource, rayTarget, aabbMin, aabbMax);
+}
+
+//perform bvh tree traversal and report overlapping triangles to 'callback'
+void btBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+#ifdef DISABLE_BVH
+	//brute force traverse all triangles
+	btTriangleMeshShape::processAllTriangles(callback, aabbMin, aabbMax);
+#else
+
+	//first get all the nodes
+
+	struct MyNodeOverlapCallback : public btNodeOverlapCallback
+	{
+		btStridingMeshInterface* m_meshInterface;
+		btTriangleCallback* m_callback;
+		btVector3 m_triangle[3];
+		int m_numOverlap;
+
+		MyNodeOverlapCallback(btTriangleCallback* callback, btStridingMeshInterface* meshInterface)
+			: m_meshInterface(meshInterface),
+			  m_callback(callback),
+			  m_numOverlap(0)
+		{
+		}
+
+		virtual void processNode(int nodeSubPart, int nodeTriangleIndex)
+		{
+			m_numOverlap++;
+			const unsigned char* vertexbase;
+			int numverts;
+			PHY_ScalarType type;
+			int stride;
+			const unsigned char* indexbase;
+			int indexstride;
+			int numfaces;
+			PHY_ScalarType indicestype;
+
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase,
+				numverts,
+				type,
+				stride,
+				&indexbase,
+				indexstride,
+				numfaces,
+				indicestype,
+				nodeSubPart);
+
+			unsigned int* gfxbase = (unsigned int*)(indexbase + nodeTriangleIndex * indexstride);
+			btAssert(indicestype == PHY_INTEGER || indicestype == PHY_SHORT || indicestype == PHY_UCHAR);
+
+			const btVector3& meshScaling = m_meshInterface->getScaling();
+			for (int j = 2; j >= 0; j--)
+			{
+				int graphicsindex = indicestype == PHY_SHORT ? ((unsigned short*)gfxbase)[j] : indicestype == PHY_INTEGER ? gfxbase[j] : ((unsigned char*)gfxbase)[j];
+
+#ifdef DEBUG_TRIANGLE_MESH
+				printf("%d ,", graphicsindex);
+#endif  //DEBUG_TRIANGLE_MESH
+				if (type == PHY_FLOAT)
+				{
+					float* graphicsbase = (float*)(vertexbase + graphicsindex * stride);
+
+					m_triangle[j] = btVector3(
+						graphicsbase[0] * meshScaling.getX(),
+						graphicsbase[1] * meshScaling.getY(),
+						graphicsbase[2] * meshScaling.getZ());
+				}
+				else
+				{
+					double* graphicsbase = (double*)(vertexbase + graphicsindex * stride);
+
+					m_triangle[j] = btVector3(
+						btScalar(graphicsbase[0]) * meshScaling.getX(),
+						btScalar(graphicsbase[1]) * meshScaling.getY(),
+						btScalar(graphicsbase[2]) * meshScaling.getZ());
+				}
+#ifdef DEBUG_TRIANGLE_MESH
+				printf("triangle vertices:%f,%f,%f\n", triangle[j].x(), triangle[j].y(), triangle[j].z());
+#endif  //DEBUG_TRIANGLE_MESH
+			}
+
+			m_callback->processTriangle(m_triangle, nodeSubPart, nodeTriangleIndex);
+			m_meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
+		}
+	};
+
+	MyNodeOverlapCallback myNodeCallback(callback, m_meshInterface);
+
+	m_bvh->reportAabbOverlappingNodex(&myNodeCallback, aabbMin, aabbMax);
+
+#endif  //DISABLE_BVH
+}
+
+void btBvhTriangleMeshShape::setLocalScaling(const btVector3& scaling)
+{
+	if ((getLocalScaling() - scaling).length2() > SIMD_EPSILON)
+	{
+		btTriangleMeshShape::setLocalScaling(scaling);
+		buildOptimizedBvh();
+	}
+}
+
+void btBvhTriangleMeshShape::buildOptimizedBvh()
+{
+	if (m_ownsBvh)
+	{
+		m_bvh->~btOptimizedBvh();
+		btAlignedFree(m_bvh);
+	}
+	///m_localAabbMin/m_localAabbMax is already re-calculated in btTriangleMeshShape. We could just scale aabb, but this needs some more work
+	void* mem = btAlignedAlloc(sizeof(btOptimizedBvh), 16);
+	m_bvh = new (mem) btOptimizedBvh();
+	//rebuild the bvh...
+	m_bvh->build(m_meshInterface, m_useQuantizedAabbCompression, m_localAabbMin, m_localAabbMax);
+	m_ownsBvh = true;
+}
+
+void btBvhTriangleMeshShape::setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& scaling)
+{
+	btAssert(!m_bvh);
+	btAssert(!m_ownsBvh);
+
+	m_bvh = bvh;
+	m_ownsBvh = false;
+	// update the scaling without rebuilding the bvh
+	if ((getLocalScaling() - scaling).length2() > SIMD_EPSILON)
+	{
+		btTriangleMeshShape::setLocalScaling(scaling);
+	}
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btBvhTriangleMeshShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btTriangleMeshShapeData* trimeshData = (btTriangleMeshShapeData*)dataBuffer;
+
+	btCollisionShape::serialize(&trimeshData->m_collisionShapeData, serializer);
+
+	m_meshInterface->serialize(&trimeshData->m_meshInterface, serializer);
+
+	trimeshData->m_collisionMargin = float(m_collisionMargin);
+
+	if (m_bvh && !(serializer->getSerializationFlags() & BT_SERIALIZE_NO_BVH))
+	{
+		void* chunk = serializer->findPointer(m_bvh);
+		if (chunk)
+		{
+#ifdef BT_USE_DOUBLE_PRECISION
+			trimeshData->m_quantizedDoubleBvh = (btQuantizedBvhData*)chunk;
+			trimeshData->m_quantizedFloatBvh = 0;
+#else
+			trimeshData->m_quantizedFloatBvh = (btQuantizedBvhData*)chunk;
+			trimeshData->m_quantizedDoubleBvh = 0;
+#endif  //BT_USE_DOUBLE_PRECISION
+		}
+		else
+		{
+#ifdef BT_USE_DOUBLE_PRECISION
+			trimeshData->m_quantizedDoubleBvh = (btQuantizedBvhData*)serializer->getUniquePointer(m_bvh);
+			trimeshData->m_quantizedFloatBvh = 0;
+#else
+			trimeshData->m_quantizedFloatBvh = (btQuantizedBvhData*)serializer->getUniquePointer(m_bvh);
+			trimeshData->m_quantizedDoubleBvh = 0;
+#endif  //BT_USE_DOUBLE_PRECISION
+
+			int sz = m_bvh->calculateSerializeBufferSizeNew();
+			btChunk* chunk = serializer->allocate(sz, 1);
+			const char* structType = m_bvh->serialize(chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_QUANTIZED_BVH_CODE, m_bvh);
+		}
+	}
+	else
+	{
+		trimeshData->m_quantizedFloatBvh = 0;
+		trimeshData->m_quantizedDoubleBvh = 0;
+	}
+
+	if (m_triangleInfoMap && !(serializer->getSerializationFlags() & BT_SERIALIZE_NO_TRIANGLEINFOMAP))
+	{
+		void* chunk = serializer->findPointer(m_triangleInfoMap);
+		if (chunk)
+		{
+			trimeshData->m_triangleInfoMap = (btTriangleInfoMapData*)chunk;
+		}
+		else
+		{
+			trimeshData->m_triangleInfoMap = (btTriangleInfoMapData*)serializer->getUniquePointer(m_triangleInfoMap);
+			int sz = m_triangleInfoMap->calculateSerializeBufferSize();
+			btChunk* chunk = serializer->allocate(sz, 1);
+			const char* structType = m_triangleInfoMap->serialize(chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_TRIANLGE_INFO_MAP, m_triangleInfoMap);
+		}
+	}
+	else
+	{
+		trimeshData->m_triangleInfoMap = 0;
+	}
+
+	// Fill padding with zeros to appease msan.
+	memset(trimeshData->m_pad3, 0, sizeof(trimeshData->m_pad3));
+
+	return "btTriangleMeshShapeData";
+}
+
+void btBvhTriangleMeshShape::serializeSingleBvh(btSerializer* serializer) const
+{
+	if (m_bvh)
+	{
+		int len = m_bvh->calculateSerializeBufferSizeNew();  //make sure not to use calculateSerializeBufferSize because it is used for in-place
+		btChunk* chunk = serializer->allocate(len, 1);
+		const char* structType = m_bvh->serialize(chunk->m_oldPtr, serializer);
+		serializer->finalizeChunk(chunk, structType, BT_QUANTIZED_BVH_CODE, (void*)m_bvh);
+	}
+}
+
+void btBvhTriangleMeshShape::serializeSingleTriangleInfoMap(btSerializer* serializer) const
+{
+	if (m_triangleInfoMap)
+	{
+		int len = m_triangleInfoMap->calculateSerializeBufferSize();
+		btChunk* chunk = serializer->allocate(len, 1);
+		const char* structType = m_triangleInfoMap->serialize(chunk->m_oldPtr, serializer);
+		serializer->finalizeChunk(chunk, structType, BT_TRIANLGE_INFO_MAP, (void*)m_triangleInfoMap);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
new file mode 100644
index 0000000..8b2f2ee
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
@@ -0,0 +1,144 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_BVH_TRIANGLE_MESH_SHAPE_H
+#define BT_BVH_TRIANGLE_MESH_SHAPE_H
+
+#include "btTriangleMeshShape.h"
+#include "btOptimizedBvh.h"
+#include "LinearMath/btAlignedAllocator.h"
+#include "btTriangleInfoMap.h"
+
+///The btBvhTriangleMeshShape is a static-triangle mesh shape, it can only be used for fixed/non-moving objects.
+///If you required moving concave triangle meshes, it is recommended to perform convex decomposition
+///using HACD, see Bullet/Demos/ConvexDecompositionDemo.
+///Alternatively, you can use btGimpactMeshShape for moving concave triangle meshes.
+///btBvhTriangleMeshShape has several optimizations, such as bounding volume hierarchy and
+///cache friendly traversal for PlayStation 3 Cell SPU.
+///It is recommended to enable useQuantizedAabbCompression for better memory usage.
+///It takes a triangle mesh as input, for example a btTriangleMesh or btTriangleIndexVertexArray. The btBvhTriangleMeshShape class allows for triangle mesh deformations by a refit or partialRefit method.
+///Instead of building the bounding volume hierarchy acceleration structure, it is also possible to serialize (save) and deserialize (load) the structure from disk.
+///See Demos\ConcaveDemo\ConcavePhysicsDemo.cpp for an example.
+ATTRIBUTE_ALIGNED16(class)
+btBvhTriangleMeshShape : public btTriangleMeshShape
+{
+	btOptimizedBvh* m_bvh;
+	btTriangleInfoMap* m_triangleInfoMap;
+
+	bool m_useQuantizedAabbCompression;
+	bool m_ownsBvh;
+#ifdef __clang__
+	bool m_pad[11] __attribute__((unused));  ////need padding due to alignment
+#else
+	bool m_pad[11];  ////need padding due to alignment
+#endif
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btBvhTriangleMeshShape(btStridingMeshInterface * meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true);
+
+	///optionally pass in a larger bvh aabb, used for quantization. This allows for deformations within this aabb
+	btBvhTriangleMeshShape(btStridingMeshInterface * meshInterface, bool useQuantizedAabbCompression, const btVector3& bvhAabbMin, const btVector3& bvhAabbMax, bool buildBvh = true);
+
+	virtual ~btBvhTriangleMeshShape();
+
+	bool getOwnsBvh() const
+	{
+		return m_ownsBvh;
+	}
+
+	void performRaycast(btTriangleCallback * callback, const btVector3& raySource, const btVector3& rayTarget);
+	void performConvexcast(btTriangleCallback * callback, const btVector3& boxSource, const btVector3& boxTarget, const btVector3& boxMin, const btVector3& boxMax);
+
+	virtual void processAllTriangles(btTriangleCallback * callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	void refitTree(const btVector3& aabbMin, const btVector3& aabbMax);
+
+	///for a fast incremental refit of parts of the tree. Note: the entire AABB of the tree will become more conservative, it never shrinks
+	void partialRefitTree(const btVector3& aabbMin, const btVector3& aabbMax);
+
+	//debugging
+	virtual const char* getName() const { return "BVHTRIANGLEMESH"; }
+
+	virtual void setLocalScaling(const btVector3& scaling);
+
+	btOptimizedBvh* getOptimizedBvh()
+	{
+		return m_bvh;
+	}
+
+	void setOptimizedBvh(btOptimizedBvh * bvh, const btVector3& localScaling = btVector3(1, 1, 1));
+
+	void buildOptimizedBvh();
+
+	bool usesQuantizedAabbCompression() const
+	{
+		return m_useQuantizedAabbCompression;
+	}
+
+	void setTriangleInfoMap(btTriangleInfoMap * triangleInfoMap)
+	{
+		m_triangleInfoMap = triangleInfoMap;
+	}
+
+	const btTriangleInfoMap* getTriangleInfoMap() const
+	{
+		return m_triangleInfoMap;
+	}
+
+	btTriangleInfoMap* getTriangleInfoMap()
+	{
+		return m_triangleInfoMap;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+
+	virtual void serializeSingleBvh(btSerializer * serializer) const;
+
+	virtual void serializeSingleTriangleInfoMap(btSerializer * serializer) const;
+};
+
+// clang-format off
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btTriangleMeshShapeData
+{
+	btCollisionShapeData	m_collisionShapeData;
+
+	btStridingMeshInterfaceData m_meshInterface;
+
+	btQuantizedBvhFloatData		*m_quantizedFloatBvh;
+	btQuantizedBvhDoubleData	*m_quantizedDoubleBvh;
+
+	btTriangleInfoMapData	*m_triangleInfoMap;
+	
+	float	m_collisionMargin;
+
+	char m_pad3[4];
+	
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btBvhTriangleMeshShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btTriangleMeshShapeData);
+}
+
+#endif  //BT_BVH_TRIANGLE_MESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
new file mode 100644
index 0000000..7c33774
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
@@ -0,0 +1,148 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCapsuleShape.h"
+
+#include "LinearMath/btQuaternion.h"
+
+btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInternalShape()
+{
+	m_collisionMargin = radius;
+	m_shapeType = CAPSULE_SHAPE_PROXYTYPE;
+	m_upAxis = 1;
+	m_implicitShapeDimensions.setValue(radius, 0.5f * height, radius);
+}
+
+btVector3 btCapsuleShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0) const
+{
+	btVector3 supVec(0, 0, 0);
+
+	btScalar maxDot(btScalar(-BT_LARGE_FLOAT));
+
+	btVector3 vec = vec0;
+	btScalar lenSqr = vec.length2();
+	if (lenSqr < btScalar(0.0001))
+	{
+		vec.setValue(1, 0, 0);
+	}
+	else
+	{
+		btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+		vec *= rlen;
+	}
+
+	btVector3 vtx;
+	btScalar newDot;
+
+	{
+		btVector3 pos(0, 0, 0);
+		pos[getUpAxis()] = getHalfHeight();
+
+		vtx = pos;
+		newDot = vec.dot(vtx);
+		if (newDot > maxDot)
+		{
+			maxDot = newDot;
+			supVec = vtx;
+		}
+	}
+	{
+		btVector3 pos(0, 0, 0);
+		pos[getUpAxis()] = -getHalfHeight();
+
+		vtx = pos;
+		newDot = vec.dot(vtx);
+		if (newDot > maxDot)
+		{
+			maxDot = newDot;
+			supVec = vtx;
+		}
+	}
+
+	return supVec;
+}
+
+void btCapsuleShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	for (int j = 0; j < numVectors; j++)
+	{
+		btScalar maxDot(btScalar(-BT_LARGE_FLOAT));
+		const btVector3& vec = vectors[j];
+
+		btVector3 vtx;
+		btScalar newDot;
+		{
+			btVector3 pos(0, 0, 0);
+			pos[getUpAxis()] = getHalfHeight();
+			vtx = pos;
+			newDot = vec.dot(vtx);
+			if (newDot > maxDot)
+			{
+				maxDot = newDot;
+				supportVerticesOut[j] = vtx;
+			}
+		}
+		{
+			btVector3 pos(0, 0, 0);
+			pos[getUpAxis()] = -getHalfHeight();
+			vtx = pos;
+			newDot = vec.dot(vtx);
+			if (newDot > maxDot)
+			{
+				maxDot = newDot;
+				supportVerticesOut[j] = vtx;
+			}
+		}
+	}
+}
+
+void btCapsuleShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	//as an approximation, take the inertia of the box that bounds the spheres
+
+	btTransform ident;
+	ident.setIdentity();
+
+	btScalar radius = getRadius();
+
+	btVector3 halfExtents(radius, radius, radius);
+	halfExtents[getUpAxis()] += getHalfHeight();
+
+	btScalar lx = btScalar(2.) * (halfExtents[0]);
+	btScalar ly = btScalar(2.) * (halfExtents[1]);
+	btScalar lz = btScalar(2.) * (halfExtents[2]);
+	const btScalar x2 = lx * lx;
+	const btScalar y2 = ly * ly;
+	const btScalar z2 = lz * lz;
+	const btScalar scaledmass = mass * btScalar(.08333333);
+
+	inertia[0] = scaledmass * (y2 + z2);
+	inertia[1] = scaledmass * (x2 + z2);
+	inertia[2] = scaledmass * (x2 + y2);
+}
+
+btCapsuleShapeX::btCapsuleShapeX(btScalar radius, btScalar height)
+{
+	m_collisionMargin = radius;
+	m_upAxis = 0;
+	m_implicitShapeDimensions.setValue(0.5f * height, radius, radius);
+}
+
+btCapsuleShapeZ::btCapsuleShapeZ(btScalar radius, btScalar height)
+{
+	m_collisionMargin = radius;
+	m_upAxis = 2;
+	m_implicitShapeDimensions.setValue(radius, radius, 0.5f * height);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.h
new file mode 100644
index 0000000..138d0c0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCapsuleShape.h
@@ -0,0 +1,182 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CAPSULE_SHAPE_H
+#define BT_CAPSULE_SHAPE_H
+
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+
+///The btCapsuleShape represents a capsule around the Y axis, there is also the btCapsuleShapeX aligned around the X axis and btCapsuleShapeZ around the Z axis.
+///The total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
+///The btCapsuleShape is a convex hull of two spheres. The btMultiSphereShape is a more general collision shape that takes the convex hull of multiple sphere, so it can also represent a capsule when just using two spheres.
+ATTRIBUTE_ALIGNED16(class)
+btCapsuleShape : public btConvexInternalShape
+{
+protected:
+	int m_upAxis;
+
+protected:
+	///only used for btCapsuleShapeZ and btCapsuleShapeX subclasses.
+	btCapsuleShape() : btConvexInternalShape() { m_shapeType = CAPSULE_SHAPE_PROXYTYPE; };
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btCapsuleShape(btScalar radius, btScalar height);
+
+	///CollisionShape Interface
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	/// btConvexShape Interface
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void setMargin(btScalar collisionMargin)
+	{
+		//don't override the margin for capsules, their entire radius == margin
+		(void)collisionMargin;
+	}
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		btVector3 halfExtents(getRadius(), getRadius(), getRadius());
+		halfExtents[m_upAxis] = getRadius() + getHalfHeight();
+		btMatrix3x3 abs_b = t.getBasis().absolute();
+		btVector3 center = t.getOrigin();
+		btVector3 extent = halfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+
+		aabbMin = center - extent;
+		aabbMax = center + extent;
+	}
+
+	virtual const char* getName() const
+	{
+		return "CapsuleShape";
+	}
+
+	int getUpAxis() const
+	{
+		return m_upAxis;
+	}
+
+	btScalar getRadius() const
+	{
+		int radiusAxis = (m_upAxis + 2) % 3;
+		return m_implicitShapeDimensions[radiusAxis];
+	}
+
+	btScalar getHalfHeight() const
+	{
+		return m_implicitShapeDimensions[m_upAxis];
+	}
+
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		btVector3 unScaledImplicitShapeDimensions = m_implicitShapeDimensions / m_localScaling;
+		btConvexInternalShape::setLocalScaling(scaling);
+		m_implicitShapeDimensions = (unScaledImplicitShapeDimensions * scaling);
+		//update m_collisionMargin, since entire radius==margin
+		int radiusAxis = (m_upAxis + 2) % 3;
+		m_collisionMargin = m_implicitShapeDimensions[radiusAxis];
+	}
+
+	virtual btVector3 getAnisotropicRollingFrictionDirection() const
+	{
+		btVector3 aniDir(0, 0, 0);
+		aniDir[getUpAxis()] = 1;
+		return aniDir;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+
+	SIMD_FORCE_INLINE void deSerializeFloat(struct btCapsuleShapeData * dataBuffer);
+};
+
+///btCapsuleShapeX represents a capsule around the Z axis
+///the total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
+class btCapsuleShapeX : public btCapsuleShape
+{
+public:
+	btCapsuleShapeX(btScalar radius, btScalar height);
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "CapsuleX";
+	}
+};
+
+///btCapsuleShapeZ represents a capsule around the Z axis
+///the total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
+class btCapsuleShapeZ : public btCapsuleShape
+{
+public:
+	btCapsuleShapeZ(btScalar radius, btScalar height);
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "CapsuleZ";
+	}
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btCapsuleShapeData
+{
+	btConvexInternalShapeData m_convexInternalShapeData;
+
+	int m_upAxis;
+
+	char m_padding[4];
+};
+
+SIMD_FORCE_INLINE int btCapsuleShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btCapsuleShapeData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btCapsuleShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btCapsuleShapeData* shapeData = (btCapsuleShapeData*)dataBuffer;
+
+	btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData, serializer);
+
+	shapeData->m_upAxis = m_upAxis;
+
+	// Fill padding with zeros to appease msan.
+	shapeData->m_padding[0] = 0;
+	shapeData->m_padding[1] = 0;
+	shapeData->m_padding[2] = 0;
+	shapeData->m_padding[3] = 0;
+
+	return "btCapsuleShapeData";
+}
+
+SIMD_FORCE_INLINE void btCapsuleShape::deSerializeFloat(btCapsuleShapeData* dataBuffer)
+{
+	m_implicitShapeDimensions.deSerializeFloat(dataBuffer->m_convexInternalShapeData.m_implicitShapeDimensions);
+	m_collisionMargin = dataBuffer->m_convexInternalShapeData.m_collisionMargin;
+	m_localScaling.deSerializeFloat(dataBuffer->m_convexInternalShapeData.m_localScaling);
+	//it is best to already pre-allocate the matching btCapsuleShape*(X/Z) version to match m_upAxis
+	m_upAxis = dataBuffer->m_upAxis;
+}
+
+#endif  //BT_CAPSULE_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionMargin.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionMargin.h
new file mode 100644
index 0000000..abd8ab3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionMargin.h
@@ -0,0 +1,24 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_MARGIN_H
+#define BT_COLLISION_MARGIN_H
+
+///The CONVEX_DISTANCE_MARGIN is a default collision margin for convex collision shapes derived from btConvexInternalShape.
+///This collision margin is used by Gjk and some other algorithms
+///Note that when creating small objects, you need to make sure to set a smaller collision margin, using the 'setMargin' API
+#define CONVEX_DISTANCE_MARGIN btScalar(0.04)  // btScalar(0.1)//;//btScalar(0.01)
+
+#endif  //BT_COLLISION_MARGIN_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
new file mode 100644
index 0000000..0b3640a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
@@ -0,0 +1,119 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "LinearMath/btSerializer.h"
+
+/*
+  Make sure this dummy function never changes so that it
+  can be used by probes that are checking whether the
+  library is actually installed.
+*/
+extern "C"
+{
+	void btBulletCollisionProbe();
+
+	void btBulletCollisionProbe() {}
+}
+
+void btCollisionShape::getBoundingSphere(btVector3& center, btScalar& radius) const
+{
+	btTransform tr;
+	tr.setIdentity();
+	btVector3 aabbMin, aabbMax;
+
+	getAabb(tr, aabbMin, aabbMax);
+
+	radius = (aabbMax - aabbMin).length() * btScalar(0.5);
+	center = (aabbMin + aabbMax) * btScalar(0.5);
+}
+
+btScalar btCollisionShape::getContactBreakingThreshold(btScalar defaultContactThreshold) const
+{
+	return getAngularMotionDisc() * defaultContactThreshold;
+}
+
+btScalar btCollisionShape::getAngularMotionDisc() const
+{
+	///@todo cache this value, to improve performance
+	btVector3 center;
+	btScalar disc;
+	getBoundingSphere(center, disc);
+	disc += (center).length();
+	return disc;
+}
+
+void btCollisionShape::calculateTemporalAabb(const btTransform& curTrans, const btVector3& linvel, const btVector3& angvel, btScalar timeStep, btVector3& temporalAabbMin, btVector3& temporalAabbMax) const
+{
+	//start with static aabb
+	getAabb(curTrans, temporalAabbMin, temporalAabbMax);
+
+	btScalar temporalAabbMaxx = temporalAabbMax.getX();
+	btScalar temporalAabbMaxy = temporalAabbMax.getY();
+	btScalar temporalAabbMaxz = temporalAabbMax.getZ();
+	btScalar temporalAabbMinx = temporalAabbMin.getX();
+	btScalar temporalAabbMiny = temporalAabbMin.getY();
+	btScalar temporalAabbMinz = temporalAabbMin.getZ();
+
+	// add linear motion
+	btVector3 linMotion = linvel * timeStep;
+	///@todo: simd would have a vector max/min operation, instead of per-element access
+	if (linMotion.x() > btScalar(0.))
+		temporalAabbMaxx += linMotion.x();
+	else
+		temporalAabbMinx += linMotion.x();
+	if (linMotion.y() > btScalar(0.))
+		temporalAabbMaxy += linMotion.y();
+	else
+		temporalAabbMiny += linMotion.y();
+	if (linMotion.z() > btScalar(0.))
+		temporalAabbMaxz += linMotion.z();
+	else
+		temporalAabbMinz += linMotion.z();
+
+	//add conservative angular motion
+	btScalar angularMotion = angvel.length() * getAngularMotionDisc() * timeStep;
+	btVector3 angularMotion3d(angularMotion, angularMotion, angularMotion);
+	temporalAabbMin = btVector3(temporalAabbMinx, temporalAabbMiny, temporalAabbMinz);
+	temporalAabbMax = btVector3(temporalAabbMaxx, temporalAabbMaxy, temporalAabbMaxz);
+
+	temporalAabbMin -= angularMotion3d;
+	temporalAabbMax += angularMotion3d;
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btCollisionShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btCollisionShapeData* shapeData = (btCollisionShapeData*)dataBuffer;
+	char* name = (char*)serializer->findNameForPointer(this);
+	shapeData->m_name = (char*)serializer->getUniquePointer(name);
+	if (shapeData->m_name)
+	{
+		serializer->serializeName(name);
+	}
+	shapeData->m_shapeType = m_shapeType;
+
+	// Fill padding with zeros to appease msan.
+	memset(shapeData->m_padding, 0, sizeof(shapeData->m_padding));
+
+	return "btCollisionShapeData";
+}
+
+void btCollisionShape::serializeSingleShape(btSerializer* serializer) const
+{
+	int len = calculateSerializeBufferSize();
+	btChunk* chunk = serializer->allocate(len, 1);
+	const char* structType = serialize(chunk->m_oldPtr, serializer);
+	serializer->finalizeChunk(chunk, structType, BT_SHAPE_CODE, (void*)this);
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.h
new file mode 100644
index 0000000..16f9e0c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCollisionShape.h
@@ -0,0 +1,174 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_SHAPE_H
+#define BT_COLLISION_SHAPE_H
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  //for the shape types
+class btSerializer;
+
+///The btCollisionShape class provides an interface for collision shapes that can be shared among btCollisionObjects.
+ATTRIBUTE_ALIGNED16(class)
+btCollisionShape
+{
+protected:
+	int m_shapeType;
+	void* m_userPointer;
+	int m_userIndex;
+	int m_userIndex2;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btCollisionShape() : m_shapeType(INVALID_SHAPE_PROXYTYPE), m_userPointer(0), m_userIndex(-1), m_userIndex2(-1)
+	{
+	}
+
+	virtual ~btCollisionShape()
+	{
+	}
+
+	///getAabb returns the axis aligned bounding box in the coordinate frame of the given transform t.
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const = 0;
+
+	virtual void getBoundingSphere(btVector3 & center, btScalar & radius) const;
+
+	///getAngularMotionDisc returns the maximum radius needed for Conservative Advancement to handle time-of-impact with rotations.
+	virtual btScalar getAngularMotionDisc() const;
+
+	virtual btScalar getContactBreakingThreshold(btScalar defaultContactThresholdFactor) const;
+
+	///calculateTemporalAabb calculates the enclosing aabb for the moving object over interval [0..timeStep)
+	///result is conservative
+	void calculateTemporalAabb(const btTransform& curTrans, const btVector3& linvel, const btVector3& angvel, btScalar timeStep, btVector3& temporalAabbMin, btVector3& temporalAabbMax) const;
+
+	SIMD_FORCE_INLINE bool isPolyhedral() const
+	{
+		return btBroadphaseProxy::isPolyhedral(getShapeType());
+	}
+
+	SIMD_FORCE_INLINE bool isConvex2d() const
+	{
+		return btBroadphaseProxy::isConvex2d(getShapeType());
+	}
+
+	SIMD_FORCE_INLINE bool isConvex() const
+	{
+		return btBroadphaseProxy::isConvex(getShapeType());
+	}
+	SIMD_FORCE_INLINE bool isNonMoving() const
+	{
+		return btBroadphaseProxy::isNonMoving(getShapeType());
+	}
+	SIMD_FORCE_INLINE bool isConcave() const
+	{
+		return btBroadphaseProxy::isConcave(getShapeType());
+	}
+	SIMD_FORCE_INLINE bool isCompound() const
+	{
+		return btBroadphaseProxy::isCompound(getShapeType());
+	}
+
+	SIMD_FORCE_INLINE bool isSoftBody() const
+	{
+		return btBroadphaseProxy::isSoftBody(getShapeType());
+	}
+
+	///isInfinite is used to catch simulation error (aabb check)
+	SIMD_FORCE_INLINE bool isInfinite() const
+	{
+		return btBroadphaseProxy::isInfinite(getShapeType());
+	}
+
+#ifndef __SPU__
+	virtual void setLocalScaling(const btVector3& scaling) = 0;
+	virtual const btVector3& getLocalScaling() const = 0;
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const = 0;
+
+	//debugging support
+	virtual const char* getName() const = 0;
+#endif  //__SPU__
+
+	int getShapeType() const
+	{
+		return m_shapeType;
+	}
+
+	///the getAnisotropicRollingFrictionDirection can be used in combination with setAnisotropicFriction
+	///See Bullet/Demos/RollingFrictionDemo for an example
+	virtual btVector3 getAnisotropicRollingFrictionDirection() const
+	{
+		return btVector3(1, 1, 1);
+	}
+	virtual void setMargin(btScalar margin) = 0;
+	virtual btScalar getMargin() const = 0;
+
+	///optional user data pointer
+	void setUserPointer(void* userPtr)
+	{
+		m_userPointer = userPtr;
+	}
+
+	void* getUserPointer() const
+	{
+		return m_userPointer;
+	}
+	void setUserIndex(int index)
+	{
+		m_userIndex = index;
+	}
+
+	int getUserIndex() const
+	{
+		return m_userIndex;
+	}
+
+	void setUserIndex2(int index)
+	{
+		m_userIndex2 = index;
+	}
+
+	int getUserIndex2() const
+	{
+		return m_userIndex2;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+
+	virtual void serializeSingleShape(btSerializer * serializer) const;
+};
+
+// clang-format off
+// parser needs * with the name
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btCollisionShapeData
+{
+	char	*m_name;
+	int		m_shapeType;
+	char	m_padding[4];
+};
+// clang-format on
+SIMD_FORCE_INLINE int btCollisionShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btCollisionShapeData);
+}
+
+#endif  //BT_COLLISION_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
new file mode 100644
index 0000000..fd7828b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
@@ -0,0 +1,335 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCompoundShape.h"
+#include "btCollisionShape.h"
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "LinearMath/btSerializer.h"
+
+btCompoundShape::btCompoundShape(bool enableDynamicAabbTree, const int initialChildCapacity)
+	: m_localAabbMin(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT)),
+	  m_localAabbMax(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT)),
+	  m_dynamicAabbTree(0),
+	  m_updateRevision(1),
+	  m_collisionMargin(btScalar(0.)),
+	  m_localScaling(btScalar(1.), btScalar(1.), btScalar(1.))
+{
+	m_shapeType = COMPOUND_SHAPE_PROXYTYPE;
+
+	if (enableDynamicAabbTree)
+	{
+		void* mem = btAlignedAlloc(sizeof(btDbvt), 16);
+		m_dynamicAabbTree = new (mem) btDbvt();
+		btAssert(mem == m_dynamicAabbTree);
+	}
+
+	m_children.reserve(initialChildCapacity);
+}
+
+btCompoundShape::~btCompoundShape()
+{
+	if (m_dynamicAabbTree)
+	{
+		m_dynamicAabbTree->~btDbvt();
+		btAlignedFree(m_dynamicAabbTree);
+	}
+}
+
+void btCompoundShape::addChildShape(const btTransform& localTransform, btCollisionShape* shape)
+{
+	m_updateRevision++;
+	//m_childTransforms.push_back(localTransform);
+	//m_childShapes.push_back(shape);
+	btCompoundShapeChild child;
+	child.m_node = 0;
+	child.m_transform = localTransform;
+	child.m_childShape = shape;
+	child.m_childShapeType = shape->getShapeType();
+	child.m_childMargin = shape->getMargin();
+
+	//extend the local aabbMin/aabbMax
+	btVector3 localAabbMin, localAabbMax;
+	shape->getAabb(localTransform, localAabbMin, localAabbMax);
+	for (int i = 0; i < 3; i++)
+	{
+		if (m_localAabbMin[i] > localAabbMin[i])
+		{
+			m_localAabbMin[i] = localAabbMin[i];
+		}
+		if (m_localAabbMax[i] < localAabbMax[i])
+		{
+			m_localAabbMax[i] = localAabbMax[i];
+		}
+	}
+	if (m_dynamicAabbTree)
+	{
+		const btDbvtVolume bounds = btDbvtVolume::FromMM(localAabbMin, localAabbMax);
+		size_t index = m_children.size();
+		child.m_node = m_dynamicAabbTree->insert(bounds, reinterpret_cast<void*>(index));
+	}
+
+	m_children.push_back(child);
+}
+
+void btCompoundShape::updateChildTransform(int childIndex, const btTransform& newChildTransform, bool shouldRecalculateLocalAabb)
+{
+	m_children[childIndex].m_transform = newChildTransform;
+
+	if (m_dynamicAabbTree)
+	{
+		///update the dynamic aabb tree
+		btVector3 localAabbMin, localAabbMax;
+		m_children[childIndex].m_childShape->getAabb(newChildTransform, localAabbMin, localAabbMax);
+		ATTRIBUTE_ALIGNED16(btDbvtVolume)
+		bounds = btDbvtVolume::FromMM(localAabbMin, localAabbMax);
+		//int index = m_children.size()-1;
+		m_dynamicAabbTree->update(m_children[childIndex].m_node, bounds);
+	}
+
+	if (shouldRecalculateLocalAabb)
+	{
+		recalculateLocalAabb();
+	}
+}
+
+void btCompoundShape::removeChildShapeByIndex(int childShapeIndex)
+{
+	m_updateRevision++;
+	btAssert(childShapeIndex >= 0 && childShapeIndex < m_children.size());
+	if (m_dynamicAabbTree)
+	{
+		m_dynamicAabbTree->remove(m_children[childShapeIndex].m_node);
+	}
+	m_children.swap(childShapeIndex, m_children.size() - 1);
+	if (m_dynamicAabbTree)
+		m_children[childShapeIndex].m_node->dataAsInt = childShapeIndex;
+	m_children.pop_back();
+}
+
+void btCompoundShape::removeChildShape(btCollisionShape* shape)
+{
+	m_updateRevision++;
+	// Find the children containing the shape specified, and remove those children.
+	//note: there might be multiple children using the same shape!
+	for (int i = m_children.size() - 1; i >= 0; i--)
+	{
+		if (m_children[i].m_childShape == shape)
+		{
+			removeChildShapeByIndex(i);
+		}
+	}
+
+	recalculateLocalAabb();
+}
+
+void btCompoundShape::recalculateLocalAabb()
+{
+	// Recalculate the local aabb
+	// Brute force, it iterates over all the shapes left.
+
+	m_localAabbMin = btVector3(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+	m_localAabbMax = btVector3(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+
+	//extend the local aabbMin/aabbMax
+	for (int j = 0; j < m_children.size(); j++)
+	{
+		btVector3 localAabbMin, localAabbMax;
+		m_children[j].m_childShape->getAabb(m_children[j].m_transform, localAabbMin, localAabbMax);
+		for (int i = 0; i < 3; i++)
+		{
+			if (m_localAabbMin[i] > localAabbMin[i])
+				m_localAabbMin[i] = localAabbMin[i];
+			if (m_localAabbMax[i] < localAabbMax[i])
+				m_localAabbMax[i] = localAabbMax[i];
+		}
+	}
+}
+
+///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+void btCompoundShape::getAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btVector3 localHalfExtents = btScalar(0.5) * (m_localAabbMax - m_localAabbMin);
+	btVector3 localCenter = btScalar(0.5) * (m_localAabbMax + m_localAabbMin);
+
+	//avoid an illegal AABB when there are no children
+	if (!m_children.size())
+	{
+		localHalfExtents.setValue(0, 0, 0);
+		localCenter.setValue(0, 0, 0);
+	}
+	localHalfExtents += btVector3(getMargin(), getMargin(), getMargin());
+
+	btMatrix3x3 abs_b = trans.getBasis().absolute();
+
+	btVector3 center = trans(localCenter);
+
+	btVector3 extent = localHalfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	aabbMin = center - extent;
+	aabbMax = center + extent;
+}
+
+void btCompoundShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	//approximation: take the inertia from the aabb for now
+	btTransform ident;
+	ident.setIdentity();
+	btVector3 aabbMin, aabbMax;
+	getAabb(ident, aabbMin, aabbMax);
+
+	btVector3 halfExtents = (aabbMax - aabbMin) * btScalar(0.5);
+
+	btScalar lx = btScalar(2.) * (halfExtents.x());
+	btScalar ly = btScalar(2.) * (halfExtents.y());
+	btScalar lz = btScalar(2.) * (halfExtents.z());
+
+	inertia[0] = mass / (btScalar(12.0)) * (ly * ly + lz * lz);
+	inertia[1] = mass / (btScalar(12.0)) * (lx * lx + lz * lz);
+	inertia[2] = mass / (btScalar(12.0)) * (lx * lx + ly * ly);
+}
+
+void btCompoundShape::calculatePrincipalAxisTransform(const btScalar* masses, btTransform& principal, btVector3& inertia) const
+{
+	int n = m_children.size();
+
+	btScalar totalMass = 0;
+	btVector3 center(0, 0, 0);
+	int k;
+
+	for (k = 0; k < n; k++)
+	{
+		btAssert(masses[k] > 0);
+		center += m_children[k].m_transform.getOrigin() * masses[k];
+		totalMass += masses[k];
+	}
+
+	btAssert(totalMass > 0);
+
+	center /= totalMass;
+	principal.setOrigin(center);
+
+	btMatrix3x3 tensor(0, 0, 0, 0, 0, 0, 0, 0, 0);
+	for (k = 0; k < n; k++)
+	{
+		btVector3 i;
+		m_children[k].m_childShape->calculateLocalInertia(masses[k], i);
+
+		const btTransform& t = m_children[k].m_transform;
+		btVector3 o = t.getOrigin() - center;
+
+		//compute inertia tensor in coordinate system of compound shape
+		btMatrix3x3 j = t.getBasis().transpose();
+		j[0] *= i[0];
+		j[1] *= i[1];
+		j[2] *= i[2];
+		j = t.getBasis() * j;
+
+		//add inertia tensor
+		tensor[0] += j[0];
+		tensor[1] += j[1];
+		tensor[2] += j[2];
+
+		//compute inertia tensor of pointmass at o
+		btScalar o2 = o.length2();
+		j[0].setValue(o2, 0, 0);
+		j[1].setValue(0, o2, 0);
+		j[2].setValue(0, 0, o2);
+		j[0] += o * -o.x();
+		j[1] += o * -o.y();
+		j[2] += o * -o.z();
+
+		//add inertia tensor of pointmass
+		tensor[0] += masses[k] * j[0];
+		tensor[1] += masses[k] * j[1];
+		tensor[2] += masses[k] * j[2];
+	}
+
+	tensor.diagonalize(principal.getBasis(), btScalar(0.00001), 20);
+	inertia.setValue(tensor[0][0], tensor[1][1], tensor[2][2]);
+}
+
+void btCompoundShape::setLocalScaling(const btVector3& scaling)
+{
+	for (int i = 0; i < m_children.size(); i++)
+	{
+		btTransform childTrans = getChildTransform(i);
+		btVector3 childScale = m_children[i].m_childShape->getLocalScaling();
+		//		childScale = childScale * (childTrans.getBasis() * scaling);
+		childScale = childScale * scaling / m_localScaling;
+		m_children[i].m_childShape->setLocalScaling(childScale);
+		childTrans.setOrigin((childTrans.getOrigin()) * scaling / m_localScaling);
+		updateChildTransform(i, childTrans, false);
+	}
+
+	m_localScaling = scaling;
+	recalculateLocalAabb();
+}
+
+void btCompoundShape::createAabbTreeFromChildren()
+{
+	if (!m_dynamicAabbTree)
+	{
+		void* mem = btAlignedAlloc(sizeof(btDbvt), 16);
+		m_dynamicAabbTree = new (mem) btDbvt();
+		btAssert(mem == m_dynamicAabbTree);
+
+		for (int index = 0; index < m_children.size(); index++)
+		{
+			btCompoundShapeChild& child = m_children[index];
+
+			//extend the local aabbMin/aabbMax
+			btVector3 localAabbMin, localAabbMax;
+			child.m_childShape->getAabb(child.m_transform, localAabbMin, localAabbMax);
+
+			const btDbvtVolume bounds = btDbvtVolume::FromMM(localAabbMin, localAabbMax);
+			size_t index2 = index;
+			child.m_node = m_dynamicAabbTree->insert(bounds, reinterpret_cast<void*>(index2));
+		}
+	}
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btCompoundShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btCompoundShapeData* shapeData = (btCompoundShapeData*)dataBuffer;
+	btCollisionShape::serialize(&shapeData->m_collisionShapeData, serializer);
+
+	shapeData->m_collisionMargin = float(m_collisionMargin);
+	shapeData->m_numChildShapes = m_children.size();
+	shapeData->m_childShapePtr = 0;
+	if (shapeData->m_numChildShapes)
+	{
+		btChunk* chunk = serializer->allocate(sizeof(btCompoundShapeChildData), shapeData->m_numChildShapes);
+		btCompoundShapeChildData* memPtr = (btCompoundShapeChildData*)chunk->m_oldPtr;
+		shapeData->m_childShapePtr = (btCompoundShapeChildData*)serializer->getUniquePointer(memPtr);
+
+		for (int i = 0; i < shapeData->m_numChildShapes; i++, memPtr++)
+		{
+			memPtr->m_childMargin = float(m_children[i].m_childMargin);
+			memPtr->m_childShape = (btCollisionShapeData*)serializer->getUniquePointer(m_children[i].m_childShape);
+			//don't serialize shapes that already have been serialized
+			if (!serializer->findPointer(m_children[i].m_childShape))
+			{
+				btChunk* chunk = serializer->allocate(m_children[i].m_childShape->calculateSerializeBufferSize(), 1);
+				const char* structType = m_children[i].m_childShape->serialize(chunk->m_oldPtr, serializer);
+				serializer->finalizeChunk(chunk, structType, BT_SHAPE_CODE, m_children[i].m_childShape);
+			}
+
+			memPtr->m_childShapeType = m_children[i].m_childShapeType;
+			m_children[i].m_transform.serializeFloat(memPtr->m_transform);
+		}
+		serializer->finalizeChunk(chunk, "btCompoundShapeChildData", BT_ARRAY_CODE, chunk->m_oldPtr);
+	}
+	return "btCompoundShapeData";
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.h
new file mode 100644
index 0000000..7e2d0eb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCompoundShape.h
@@ -0,0 +1,207 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COMPOUND_SHAPE_H
+#define BT_COMPOUND_SHAPE_H
+
+#include "btCollisionShape.h"
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "btCollisionMargin.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+//class btOptimizedBvh;
+struct btDbvt;
+
+ATTRIBUTE_ALIGNED16(struct)
+btCompoundShapeChild
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btTransform m_transform;
+	btCollisionShape* m_childShape;
+	int m_childShapeType;
+	btScalar m_childMargin;
+	struct btDbvtNode* m_node;
+};
+
+SIMD_FORCE_INLINE bool operator==(const btCompoundShapeChild& c1, const btCompoundShapeChild& c2)
+{
+	return (c1.m_transform == c2.m_transform &&
+			c1.m_childShape == c2.m_childShape &&
+			c1.m_childShapeType == c2.m_childShapeType &&
+			c1.m_childMargin == c2.m_childMargin);
+}
+
+/// The btCompoundShape allows to store multiple other btCollisionShapes
+/// This allows for moving concave collision objects. This is more general then the static concave btBvhTriangleMeshShape.
+/// It has an (optional) dynamic aabb tree to accelerate early rejection tests.
+/// @todo: This aabb tree can also be use to speed up ray tests on btCompoundShape, see http://code.google.com/p/bullet/issues/detail?id=25
+/// Currently, removal of child shapes is only supported when disabling the aabb tree (pass 'false' in the constructor of btCompoundShape)
+ATTRIBUTE_ALIGNED16(class)
+btCompoundShape : public btCollisionShape
+{
+protected:
+	btAlignedObjectArray<btCompoundShapeChild> m_children;
+	btVector3 m_localAabbMin;
+	btVector3 m_localAabbMax;
+
+	btDbvt* m_dynamicAabbTree;
+
+	///increment m_updateRevision when adding/removing/replacing child shapes, so that some caches can be updated
+	int m_updateRevision;
+
+	btScalar m_collisionMargin;
+
+	btVector3 m_localScaling;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	explicit btCompoundShape(bool enableDynamicAabbTree = true, const int initialChildCapacity = 0);
+
+	virtual ~btCompoundShape();
+
+	void addChildShape(const btTransform& localTransform, btCollisionShape* shape);
+
+	/// Remove all children shapes that contain the specified shape
+	virtual void removeChildShape(btCollisionShape * shape);
+
+	void removeChildShapeByIndex(int childShapeindex);
+
+	int getNumChildShapes() const
+	{
+		return int(m_children.size());
+	}
+
+	btCollisionShape* getChildShape(int index)
+	{
+		return m_children[index].m_childShape;
+	}
+	const btCollisionShape* getChildShape(int index) const
+	{
+		return m_children[index].m_childShape;
+	}
+
+	btTransform& getChildTransform(int index)
+	{
+		return m_children[index].m_transform;
+	}
+	const btTransform& getChildTransform(int index) const
+	{
+		return m_children[index].m_transform;
+	}
+
+	///set a new transform for a child, and update internal data structures (local aabb and dynamic tree)
+	void updateChildTransform(int childIndex, const btTransform& newChildTransform, bool shouldRecalculateLocalAabb = true);
+
+	btCompoundShapeChild* getChildList()
+	{
+		return &m_children[0];
+	}
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	/** Re-calculate the local Aabb. Is called at the end of removeChildShapes. 
+	Use this yourself if you modify the children or their transforms. */
+	virtual void recalculateLocalAabb();
+
+	virtual void setLocalScaling(const btVector3& scaling);
+
+	virtual const btVector3& getLocalScaling() const
+	{
+		return m_localScaling;
+	}
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual void setMargin(btScalar margin)
+	{
+		m_collisionMargin = margin;
+	}
+	virtual btScalar getMargin() const
+	{
+		return m_collisionMargin;
+	}
+	virtual const char* getName() const
+	{
+		return "Compound";
+	}
+
+	const btDbvt* getDynamicAabbTree() const
+	{
+		return m_dynamicAabbTree;
+	}
+
+	btDbvt* getDynamicAabbTree()
+	{
+		return m_dynamicAabbTree;
+	}
+
+	void createAabbTreeFromChildren();
+
+	///computes the exact moment of inertia and the transform from the coordinate system defined by the principal axes of the moment of inertia
+	///and the center of mass to the current coordinate system. "masses" points to an array of masses of the children. The resulting transform
+	///"principal" has to be applied inversely to all children transforms in order for the local coordinate system of the compound
+	///shape to be centered at the center of mass and to coincide with the principal axes. This also necessitates a correction of the world transform
+	///of the collision object by the principal transform.
+	void calculatePrincipalAxisTransform(const btScalar* masses, btTransform& principal, btVector3& inertia) const;
+
+	int getUpdateRevision() const
+	{
+		return m_updateRevision;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+// clang-format off
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btCompoundShapeChildData
+{
+	btTransformFloatData	m_transform;
+	btCollisionShapeData	*m_childShape;
+	int						m_childShapeType;
+	float					m_childMargin;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btCompoundShapeData
+{
+	btCollisionShapeData		m_collisionShapeData;
+
+	btCompoundShapeChildData	*m_childShapePtr;
+
+	int							m_numChildShapes;
+
+	float	m_collisionMargin;
+
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btCompoundShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btCompoundShapeData);
+}
+
+#endif  //BT_COMPOUND_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
new file mode 100644
index 0000000..5d39684
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
@@ -0,0 +1,24 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConcaveShape.h"
+
+btConcaveShape::btConcaveShape() : m_collisionMargin(btScalar(0.))
+{
+}
+
+btConcaveShape::~btConcaveShape()
+{
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.h
new file mode 100644
index 0000000..716624e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConcaveShape.h
@@ -0,0 +1,62 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONCAVE_SHAPE_H
+#define BT_CONCAVE_SHAPE_H
+
+#include "btCollisionShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+#include "btTriangleCallback.h"
+
+/// PHY_ScalarType enumerates possible scalar types.
+/// See the btStridingMeshInterface or btHeightfieldTerrainShape for its use
+typedef enum PHY_ScalarType
+{
+	PHY_FLOAT,
+	PHY_DOUBLE,
+	PHY_INTEGER,
+	PHY_SHORT,
+	PHY_FIXEDPOINT88,
+	PHY_UCHAR
+} PHY_ScalarType;
+
+///The btConcaveShape class provides an interface for non-moving (static) concave shapes.
+///It has been implemented by the btStaticPlaneShape, btBvhTriangleMeshShape and btHeightfieldTerrainShape.
+ATTRIBUTE_ALIGNED16(class)
+btConcaveShape : public btCollisionShape
+{
+protected:
+	btScalar m_collisionMargin;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConcaveShape();
+
+	virtual ~btConcaveShape();
+
+	virtual void processAllTriangles(btTriangleCallback * callback, const btVector3& aabbMin, const btVector3& aabbMax) const = 0;
+
+	virtual btScalar getMargin() const
+	{
+		return m_collisionMargin;
+	}
+	virtual void setMargin(btScalar collisionMargin)
+	{
+		m_collisionMargin = collisionMargin;
+	}
+};
+
+#endif  //BT_CONCAVE_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConeShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConeShape.cpp
new file mode 100644
index 0000000..64a6f27
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConeShape.cpp
@@ -0,0 +1,142 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConeShape.h"
+
+btConeShape::btConeShape(btScalar radius, btScalar height) : btConvexInternalShape(),
+															 m_radius(radius),
+															 m_height(height)
+{
+	m_shapeType = CONE_SHAPE_PROXYTYPE;
+	setConeUpIndex(1);
+	btVector3 halfExtents;
+	m_sinAngle = (m_radius / btSqrt(m_radius * m_radius + m_height * m_height));
+}
+
+btConeShapeZ::btConeShapeZ(btScalar radius, btScalar height) : btConeShape(radius, height)
+{
+	setConeUpIndex(2);
+}
+
+btConeShapeX::btConeShapeX(btScalar radius, btScalar height) : btConeShape(radius, height)
+{
+	setConeUpIndex(0);
+}
+
+///choose upAxis index
+void btConeShape::setConeUpIndex(int upIndex)
+{
+	switch (upIndex)
+	{
+		case 0:
+			m_coneIndices[0] = 1;
+			m_coneIndices[1] = 0;
+			m_coneIndices[2] = 2;
+			break;
+		case 1:
+			m_coneIndices[0] = 0;
+			m_coneIndices[1] = 1;
+			m_coneIndices[2] = 2;
+			break;
+		case 2:
+			m_coneIndices[0] = 0;
+			m_coneIndices[1] = 2;
+			m_coneIndices[2] = 1;
+			break;
+		default:
+			btAssert(0);
+	};
+
+	m_implicitShapeDimensions[m_coneIndices[0]] = m_radius;
+	m_implicitShapeDimensions[m_coneIndices[1]] = m_height;
+	m_implicitShapeDimensions[m_coneIndices[2]] = m_radius;
+}
+
+btVector3 btConeShape::coneLocalSupport(const btVector3& v) const
+{
+	btScalar halfHeight = m_height * btScalar(0.5);
+
+	if (v[m_coneIndices[1]] > v.length() * m_sinAngle)
+	{
+		btVector3 tmp;
+
+		tmp[m_coneIndices[0]] = btScalar(0.);
+		tmp[m_coneIndices[1]] = halfHeight;
+		tmp[m_coneIndices[2]] = btScalar(0.);
+		return tmp;
+	}
+	else
+	{
+		btScalar s = btSqrt(v[m_coneIndices[0]] * v[m_coneIndices[0]] + v[m_coneIndices[2]] * v[m_coneIndices[2]]);
+		if (s > SIMD_EPSILON)
+		{
+			btScalar d = m_radius / s;
+			btVector3 tmp;
+			tmp[m_coneIndices[0]] = v[m_coneIndices[0]] * d;
+			tmp[m_coneIndices[1]] = -halfHeight;
+			tmp[m_coneIndices[2]] = v[m_coneIndices[2]] * d;
+			return tmp;
+		}
+		else
+		{
+			btVector3 tmp;
+			tmp[m_coneIndices[0]] = btScalar(0.);
+			tmp[m_coneIndices[1]] = -halfHeight;
+			tmp[m_coneIndices[2]] = btScalar(0.);
+			return tmp;
+		}
+	}
+}
+
+btVector3 btConeShape::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	return coneLocalSupport(vec);
+}
+
+void btConeShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	for (int i = 0; i < numVectors; i++)
+	{
+		const btVector3& vec = vectors[i];
+		supportVerticesOut[i] = coneLocalSupport(vec);
+	}
+}
+
+btVector3 btConeShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	btVector3 supVertex = coneLocalSupport(vec);
+	if (getMargin() != btScalar(0.))
+	{
+		btVector3 vecnorm = vec;
+		if (vecnorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+		{
+			vecnorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+		}
+		vecnorm.normalize();
+		supVertex += getMargin() * vecnorm;
+	}
+	return supVertex;
+}
+
+void btConeShape::setLocalScaling(const btVector3& scaling)
+{
+	int axis = m_coneIndices[1];
+	int r1 = m_coneIndices[0];
+	int r2 = m_coneIndices[2];
+	m_height *= scaling[axis] / m_localScaling[axis];
+	m_radius *= (scaling[r1] / m_localScaling[r1] + scaling[r2] / m_localScaling[r2]) / 2;
+	m_sinAngle = (m_radius / btSqrt(m_radius * m_radius + m_height * m_height));
+	btConvexInternalShape::setLocalScaling(scaling);
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConeShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConeShape.h
new file mode 100644
index 0000000..49f26bc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConeShape.h
@@ -0,0 +1,175 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONE_MINKOWSKI_H
+#define BT_CONE_MINKOWSKI_H
+
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+
+///The btConeShape implements a cone shape primitive, centered around the origin and aligned with the Y axis. The btConeShapeX is aligned around the X axis and btConeShapeZ around the Z axis.
+ATTRIBUTE_ALIGNED16(class)
+btConeShape : public btConvexInternalShape
+
+{
+	btScalar m_sinAngle;
+	btScalar m_radius;
+	btScalar m_height;
+	int m_coneIndices[3];
+	btVector3 coneLocalSupport(const btVector3& v) const;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConeShape(btScalar radius, btScalar height);
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	btScalar getRadius() const { return m_radius; }
+	btScalar getHeight() const { return m_height; }
+
+	void setRadius(const btScalar radius)
+	{
+		m_radius = radius;
+	}
+	void setHeight(const btScalar height)
+	{
+		m_height = height;
+	}
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const
+	{
+		btTransform identity;
+		identity.setIdentity();
+		btVector3 aabbMin, aabbMax;
+		getAabb(identity, aabbMin, aabbMax);
+
+		btVector3 halfExtents = (aabbMax - aabbMin) * btScalar(0.5);
+
+		btScalar margin = getMargin();
+
+		btScalar lx = btScalar(2.) * (halfExtents.x() + margin);
+		btScalar ly = btScalar(2.) * (halfExtents.y() + margin);
+		btScalar lz = btScalar(2.) * (halfExtents.z() + margin);
+		const btScalar x2 = lx * lx;
+		const btScalar y2 = ly * ly;
+		const btScalar z2 = lz * lz;
+		const btScalar scaledmass = mass * btScalar(0.08333333);
+
+		inertia = scaledmass * (btVector3(y2 + z2, x2 + z2, x2 + y2));
+
+		//		inertia.x() = scaledmass * (y2+z2);
+		//		inertia.y() = scaledmass * (x2+z2);
+		//		inertia.z() = scaledmass * (x2+y2);
+	}
+
+	virtual const char* getName() const
+	{
+		return "Cone";
+	}
+
+	///choose upAxis index
+	void setConeUpIndex(int upIndex);
+
+	int getConeUpIndex() const
+	{
+		return m_coneIndices[1];
+	}
+
+	virtual btVector3 getAnisotropicRollingFrictionDirection() const
+	{
+		return btVector3(0, 1, 0);
+	}
+
+	virtual void setLocalScaling(const btVector3& scaling);
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///btConeShape implements a Cone shape, around the X axis
+class btConeShapeX : public btConeShape
+{
+public:
+	btConeShapeX(btScalar radius, btScalar height);
+
+	virtual btVector3 getAnisotropicRollingFrictionDirection() const
+	{
+		return btVector3(1, 0, 0);
+	}
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "ConeX";
+	}
+};
+
+///btConeShapeZ implements a Cone shape, around the Z axis
+class btConeShapeZ : public btConeShape
+{
+public:
+	btConeShapeZ(btScalar radius, btScalar height);
+
+	virtual btVector3 getAnisotropicRollingFrictionDirection() const
+	{
+		return btVector3(0, 0, 1);
+	}
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "ConeZ";
+	}
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btConeShapeData
+{
+	btConvexInternalShapeData m_convexInternalShapeData;
+
+	int m_upIndex;
+
+	char m_padding[4];
+};
+
+SIMD_FORCE_INLINE int btConeShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btConeShapeData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btConeShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btConeShapeData* shapeData = (btConeShapeData*)dataBuffer;
+
+	btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData, serializer);
+
+	shapeData->m_upIndex = m_coneIndices[1];
+
+	// Fill padding with zeros to appease msan.
+	shapeData->m_padding[0] = 0;
+	shapeData->m_padding[1] = 0;
+	shapeData->m_padding[2] = 0;
+	shapeData->m_padding[3] = 0;
+
+	return "btConeShapeData";
+}
+
+#endif  //BT_CONE_MINKOWSKI_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
new file mode 100644
index 0000000..7d3d1d3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
@@ -0,0 +1,86 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvex2dShape.h"
+
+btConvex2dShape::btConvex2dShape(btConvexShape* convexChildShape) : btConvexShape(), m_childConvexShape(convexChildShape)
+{
+	m_shapeType = CONVEX_2D_SHAPE_PROXYTYPE;
+}
+
+btConvex2dShape::~btConvex2dShape()
+{
+}
+
+btVector3 btConvex2dShape::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	return m_childConvexShape->localGetSupportingVertexWithoutMargin(vec);
+}
+
+void btConvex2dShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	m_childConvexShape->batchedUnitVectorGetSupportingVertexWithoutMargin(vectors, supportVerticesOut, numVectors);
+}
+
+btVector3 btConvex2dShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	return m_childConvexShape->localGetSupportingVertex(vec);
+}
+
+void btConvex2dShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	///this linear upscaling is not realistic, but we don't deal with large mass ratios...
+	m_childConvexShape->calculateLocalInertia(mass, inertia);
+}
+
+///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+void btConvex2dShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	m_childConvexShape->getAabb(t, aabbMin, aabbMax);
+}
+
+void btConvex2dShape::getAabbSlow(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	m_childConvexShape->getAabbSlow(t, aabbMin, aabbMax);
+}
+
+void btConvex2dShape::setLocalScaling(const btVector3& scaling)
+{
+	m_childConvexShape->setLocalScaling(scaling);
+}
+
+const btVector3& btConvex2dShape::getLocalScaling() const
+{
+	return m_childConvexShape->getLocalScaling();
+}
+
+void btConvex2dShape::setMargin(btScalar margin)
+{
+	m_childConvexShape->setMargin(margin);
+}
+btScalar btConvex2dShape::getMargin() const
+{
+	return m_childConvexShape->getMargin();
+}
+
+int btConvex2dShape::getNumPreferredPenetrationDirections() const
+{
+	return m_childConvexShape->getNumPreferredPenetrationDirections();
+}
+
+void btConvex2dShape::getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+{
+	m_childConvexShape->getPreferredPenetrationDirection(index, penetrationVector);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.h
new file mode 100644
index 0000000..cd4f1ef
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvex2dShape.h
@@ -0,0 +1,77 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_2D_SHAPE_H
+#define BT_CONVEX_2D_SHAPE_H
+
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+
+///The btConvex2dShape allows to use arbitrary convex shapes as 2d convex shapes, with the Z component assumed to be 0.
+///For 2d boxes, the btBox2dShape is recommended.
+ATTRIBUTE_ALIGNED16(class)
+btConvex2dShape : public btConvexShape
+{
+	btConvexShape* m_childConvexShape;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConvex2dShape(btConvexShape * convexChildShape);
+
+	virtual ~btConvex2dShape();
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	btConvexShape* getChildShape()
+	{
+		return m_childConvexShape;
+	}
+
+	const btConvexShape* getChildShape() const
+	{
+		return m_childConvexShape;
+	}
+
+	virtual const char* getName() const
+	{
+		return "Convex2dShape";
+	}
+
+	///////////////////////////
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void getAabbSlow(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const;
+
+	virtual void setMargin(btScalar margin);
+	virtual btScalar getMargin() const;
+
+	virtual int getNumPreferredPenetrationDirections() const;
+
+	virtual void getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const;
+};
+
+#endif  //BT_CONVEX_2D_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
new file mode 100644
index 0000000..703de45
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
@@ -0,0 +1,244 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#if defined(_WIN32) || defined(__i386__)
+#define BT_USE_SSE_IN_API
+#endif
+
+#include "btConvexHullShape.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+
+#include "LinearMath/btQuaternion.h"
+#include "LinearMath/btSerializer.h"
+#include "btConvexPolyhedron.h"
+#include "LinearMath/btConvexHullComputer.h"
+
+btConvexHullShape ::btConvexHullShape(const btScalar* points, int numPoints, int stride) : btPolyhedralConvexAabbCachingShape()
+{
+	m_shapeType = CONVEX_HULL_SHAPE_PROXYTYPE;
+	m_unscaledPoints.resize(numPoints);
+
+	unsigned char* pointsAddress = (unsigned char*)points;
+
+	for (int i = 0; i < numPoints; i++)
+	{
+		btScalar* point = (btScalar*)pointsAddress;
+		m_unscaledPoints[i] = btVector3(point[0], point[1], point[2]);
+		pointsAddress += stride;
+	}
+
+	recalcLocalAabb();
+}
+
+void btConvexHullShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling;
+	recalcLocalAabb();
+}
+
+void btConvexHullShape::addPoint(const btVector3& point, bool recalculateLocalAabb)
+{
+	m_unscaledPoints.push_back(point);
+	if (recalculateLocalAabb)
+		recalcLocalAabb();
+}
+
+btVector3 btConvexHullShape::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	btVector3 supVec(btScalar(0.), btScalar(0.), btScalar(0.));
+	btScalar maxDot = btScalar(-BT_LARGE_FLOAT);
+
+	// Here we take advantage of dot(a, b*c) = dot(a*b, c).  Note: This is true mathematically, but not numerically.
+	if (0 < m_unscaledPoints.size())
+	{
+		btVector3 scaled = vec * m_localScaling;
+		int index = (int)scaled.maxDot(&m_unscaledPoints[0], m_unscaledPoints.size(), maxDot);  // FIXME: may violate encapsulation of m_unscaledPoints
+		return m_unscaledPoints[index] * m_localScaling;
+	}
+
+	return supVec;
+}
+
+void btConvexHullShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	btScalar newDot;
+	//use 'w' component of supportVerticesOut?
+	{
+		for (int i = 0; i < numVectors; i++)
+		{
+			supportVerticesOut[i][3] = btScalar(-BT_LARGE_FLOAT);
+		}
+	}
+
+	for (int j = 0; j < numVectors; j++)
+	{
+		btVector3 vec = vectors[j] * m_localScaling;  // dot(a*b,c) = dot(a,b*c)
+		if (0 < m_unscaledPoints.size())
+		{
+			int i = (int)vec.maxDot(&m_unscaledPoints[0], m_unscaledPoints.size(), newDot);
+			supportVerticesOut[j] = getScaledPoint(i);
+			supportVerticesOut[j][3] = newDot;
+		}
+		else
+			supportVerticesOut[j][3] = -BT_LARGE_FLOAT;
+	}
+}
+
+btVector3 btConvexHullShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	btVector3 supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+	if (getMargin() != btScalar(0.))
+	{
+		btVector3 vecnorm = vec;
+		if (vecnorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+		{
+			vecnorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+		}
+		vecnorm.normalize();
+		supVertex += getMargin() * vecnorm;
+	}
+	return supVertex;
+}
+
+void btConvexHullShape::optimizeConvexHull()
+{
+	btConvexHullComputer conv;
+	conv.compute(&m_unscaledPoints[0].getX(), sizeof(btVector3), m_unscaledPoints.size(), 0.f, 0.f);
+	int numVerts = conv.vertices.size();
+	m_unscaledPoints.resize(0);
+	for (int i = 0; i < numVerts; i++)
+	{
+		m_unscaledPoints.push_back(conv.vertices[i]);
+	}
+}
+
+//currently just for debugging (drawing), perhaps future support for algebraic continuous collision detection
+//Please note that you can debug-draw btConvexHullShape with the Raytracer Demo
+int btConvexHullShape::getNumVertices() const
+{
+	return m_unscaledPoints.size();
+}
+
+int btConvexHullShape::getNumEdges() const
+{
+	return m_unscaledPoints.size();
+}
+
+void btConvexHullShape::getEdge(int i, btVector3& pa, btVector3& pb) const
+{
+	int index0 = i % m_unscaledPoints.size();
+	int index1 = (i + 1) % m_unscaledPoints.size();
+	pa = getScaledPoint(index0);
+	pb = getScaledPoint(index1);
+}
+
+void btConvexHullShape::getVertex(int i, btVector3& vtx) const
+{
+	vtx = getScaledPoint(i);
+}
+
+int btConvexHullShape::getNumPlanes() const
+{
+	return 0;
+}
+
+void btConvexHullShape::getPlane(btVector3&, btVector3&, int) const
+{
+	btAssert(0);
+}
+
+//not yet
+bool btConvexHullShape::isInside(const btVector3&, btScalar) const
+{
+	btAssert(0);
+	return false;
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btConvexHullShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	//int szc = sizeof(btConvexHullShapeData);
+	btConvexHullShapeData* shapeData = (btConvexHullShapeData*)dataBuffer;
+	btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData, serializer);
+
+	int numElem = m_unscaledPoints.size();
+	shapeData->m_numUnscaledPoints = numElem;
+#ifdef BT_USE_DOUBLE_PRECISION
+	shapeData->m_unscaledPointsFloatPtr = 0;
+	shapeData->m_unscaledPointsDoublePtr = numElem ? (btVector3Data*)serializer->getUniquePointer((void*)&m_unscaledPoints[0]) : 0;
+#else
+	shapeData->m_unscaledPointsFloatPtr = numElem ? (btVector3Data*)serializer->getUniquePointer((void*)&m_unscaledPoints[0]) : 0;
+	shapeData->m_unscaledPointsDoublePtr = 0;
+#endif
+
+	if (numElem)
+	{
+		int sz = sizeof(btVector3Data);
+		//	int sz2 = sizeof(btVector3DoubleData);
+		//	int sz3 = sizeof(btVector3FloatData);
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		btVector3Data* memPtr = (btVector3Data*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			m_unscaledPoints[i].serialize(*memPtr);
+		}
+		serializer->finalizeChunk(chunk, btVector3DataName, BT_ARRAY_CODE, (void*)&m_unscaledPoints[0]);
+	}
+
+	// Fill padding with zeros to appease msan.
+	memset(shapeData->m_padding3, 0, sizeof(shapeData->m_padding3));
+
+	return "btConvexHullShapeData";
+}
+
+void btConvexHullShape::project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin, btVector3& witnesPtMax) const
+{
+#if 1
+	minProj = FLT_MAX;
+	maxProj = -FLT_MAX;
+
+	int numVerts = m_unscaledPoints.size();
+	for (int i = 0; i < numVerts; i++)
+	{
+		btVector3 vtx = m_unscaledPoints[i] * m_localScaling;
+		btVector3 pt = trans * vtx;
+		btScalar dp = pt.dot(dir);
+		if (dp < minProj)
+		{
+			minProj = dp;
+			witnesPtMin = pt;
+		}
+		if (dp > maxProj)
+		{
+			maxProj = dp;
+			witnesPtMax = pt;
+		}
+	}
+#else
+	btVector3 localAxis = dir * trans.getBasis();
+	witnesPtMin = trans(localGetSupportingVertex(localAxis));
+	witnesPtMax = trans(localGetSupportingVertex(-localAxis));
+
+	minProj = witnesPtMin.dot(dir);
+	maxProj = witnesPtMax.dot(dir);
+#endif
+
+	if (minProj > maxProj)
+	{
+		btSwap(minProj, maxProj);
+		btSwap(witnesPtMin, witnesPtMax);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.h
new file mode 100644
index 0000000..01058a6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexHullShape.h
@@ -0,0 +1,117 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_HULL_SHAPE_H
+#define BT_CONVEX_HULL_SHAPE_H
+
+#include "btPolyhedralConvexShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+#include "LinearMath/btAlignedObjectArray.h"
+
+///The btConvexHullShape implements an implicit convex hull of an array of vertices.
+///Bullet provides a general and fast collision detector for convex shapes based on GJK and EPA using localGetSupportingVertex.
+ATTRIBUTE_ALIGNED16(class)
+btConvexHullShape : public btPolyhedralConvexAabbCachingShape
+{
+protected:
+	btAlignedObjectArray<btVector3> m_unscaledPoints;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	///this constructor optionally takes in a pointer to points. Each point is assumed to be 3 consecutive btScalar (x,y,z), the striding defines the number of bytes between each point, in memory.
+	///It is easier to not pass any points in the constructor, and just add one point at a time, using addPoint.
+	///btConvexHullShape make an internal copy of the points.
+	btConvexHullShape(const btScalar* points = 0, int numPoints = 0, int stride = sizeof(btVector3));
+
+	void addPoint(const btVector3& point, bool recalculateLocalAabb = true);
+
+	btVector3* getUnscaledPoints()
+	{
+		return &m_unscaledPoints[0];
+	}
+
+	const btVector3* getUnscaledPoints() const
+	{
+		return &m_unscaledPoints[0];
+	}
+
+	///getPoints is obsolete, please use getUnscaledPoints
+	const btVector3* getPoints() const
+	{
+		return getUnscaledPoints();
+	}
+
+	void optimizeConvexHull();
+
+	SIMD_FORCE_INLINE btVector3 getScaledPoint(int i) const
+	{
+		return m_unscaledPoints[i] * m_localScaling;
+	}
+
+	SIMD_FORCE_INLINE int getNumPoints() const
+	{
+		return m_unscaledPoints.size();
+	}
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin, btVector3& witnesPtMax) const;
+
+	//debugging
+	virtual const char* getName() const { return "Convex"; }
+
+	virtual int getNumVertices() const;
+	virtual int getNumEdges() const;
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const;
+	virtual void getVertex(int i, btVector3& vtx) const;
+	virtual int getNumPlanes() const;
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const;
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const;
+
+	///in case we receive negative scaling
+	virtual void setLocalScaling(const btVector3& scaling);
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+// clang-format off
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btConvexHullShapeData
+{
+	btConvexInternalShapeData	m_convexInternalShapeData;
+
+	btVector3FloatData	*m_unscaledPointsFloatPtr;
+	btVector3DoubleData	*m_unscaledPointsDoublePtr;
+
+	int		m_numUnscaledPoints;
+	char m_padding3[4];
+
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btConvexHullShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btConvexHullShapeData);
+}
+
+#endif  //BT_CONVEX_HULL_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
new file mode 100644
index 0000000..4d598b1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
@@ -0,0 +1,137 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvexInternalShape.h"
+
+btConvexInternalShape::btConvexInternalShape()
+	: m_localScaling(btScalar(1.), btScalar(1.), btScalar(1.)),
+	  m_collisionMargin(CONVEX_DISTANCE_MARGIN)
+{
+}
+
+void btConvexInternalShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling.absolute();
+}
+
+void btConvexInternalShape::getAabbSlow(const btTransform& trans, btVector3& minAabb, btVector3& maxAabb) const
+{
+#ifndef __SPU__
+	//use localGetSupportingVertexWithoutMargin?
+	btScalar margin = getMargin();
+	for (int i = 0; i < 3; i++)
+	{
+		btVector3 vec(btScalar(0.), btScalar(0.), btScalar(0.));
+		vec[i] = btScalar(1.);
+
+		btVector3 sv = localGetSupportingVertex(vec * trans.getBasis());
+
+		btVector3 tmp = trans(sv);
+		maxAabb[i] = tmp[i] + margin;
+		vec[i] = btScalar(-1.);
+		tmp = trans(localGetSupportingVertex(vec * trans.getBasis()));
+		minAabb[i] = tmp[i] - margin;
+	}
+#endif
+}
+
+btVector3 btConvexInternalShape::localGetSupportingVertex(const btVector3& vec) const
+{
+#ifndef __SPU__
+
+	btVector3 supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+	if (getMargin() != btScalar(0.))
+	{
+		btVector3 vecnorm = vec;
+		if (vecnorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+		{
+			vecnorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+		}
+		vecnorm.normalize();
+		supVertex += getMargin() * vecnorm;
+	}
+	return supVertex;
+
+#else
+	btAssert(0);
+	return btVector3(0, 0, 0);
+#endif  //__SPU__
+}
+
+btConvexInternalAabbCachingShape::btConvexInternalAabbCachingShape()
+	: btConvexInternalShape(),
+	  m_localAabbMin(1, 1, 1),
+	  m_localAabbMax(-1, -1, -1),
+	  m_isLocalAabbValid(false)
+{
+}
+
+void btConvexInternalAabbCachingShape::getAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	getNonvirtualAabb(trans, aabbMin, aabbMax, getMargin());
+}
+
+void btConvexInternalAabbCachingShape::setLocalScaling(const btVector3& scaling)
+{
+	btConvexInternalShape::setLocalScaling(scaling);
+	recalcLocalAabb();
+}
+
+void btConvexInternalAabbCachingShape::recalcLocalAabb()
+{
+	m_isLocalAabbValid = true;
+
+#if 1
+	static const btVector3 _directions[] =
+		{
+			btVector3(1., 0., 0.),
+			btVector3(0., 1., 0.),
+			btVector3(0., 0., 1.),
+			btVector3(-1., 0., 0.),
+			btVector3(0., -1., 0.),
+			btVector3(0., 0., -1.)};
+
+	btVector3 _supporting[] =
+		{
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.)};
+
+	batchedUnitVectorGetSupportingVertexWithoutMargin(_directions, _supporting, 6);
+
+	for (int i = 0; i < 3; ++i)
+	{
+		m_localAabbMax[i] = _supporting[i][i] + m_collisionMargin;
+		m_localAabbMin[i] = _supporting[i + 3][i] - m_collisionMargin;
+	}
+
+#else
+
+	for (int i = 0; i < 3; i++)
+	{
+		btVector3 vec(btScalar(0.), btScalar(0.), btScalar(0.));
+		vec[i] = btScalar(1.);
+		btVector3 tmp = localGetSupportingVertex(vec);
+		m_localAabbMax[i] = tmp[i] + m_collisionMargin;
+		vec[i] = btScalar(-1.);
+		tmp = localGetSupportingVertex(vec);
+		m_localAabbMin[i] = tmp[i] - m_collisionMargin;
+	}
+#endif
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
new file mode 100644
index 0000000..a28c57d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
@@ -0,0 +1,208 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_INTERNAL_SHAPE_H
+#define BT_CONVEX_INTERNAL_SHAPE_H
+
+#include "btConvexShape.h"
+#include "LinearMath/btAabbUtil2.h"
+
+///The btConvexInternalShape is an internal base class, shared by most convex shape implementations.
+///The btConvexInternalShape uses a default collision margin set to CONVEX_DISTANCE_MARGIN.
+///This collision margin used by Gjk and some other algorithms, see also btCollisionMargin.h
+///Note that when creating small shapes (derived from btConvexInternalShape),
+///you need to make sure to set a smaller collision margin, using the 'setMargin' API
+///There is a automatic mechanism 'setSafeMargin' used by btBoxShape and btCylinderShape
+ATTRIBUTE_ALIGNED16(class)
+btConvexInternalShape : public btConvexShape
+{
+protected:
+	//local scaling. collisionMargin is not scaled !
+	btVector3 m_localScaling;
+
+	btVector3 m_implicitShapeDimensions;
+
+	btScalar m_collisionMargin;
+
+	btScalar m_padding;
+
+	btConvexInternalShape();
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	virtual ~btConvexInternalShape()
+	{
+	}
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+
+	const btVector3& getImplicitShapeDimensions() const
+	{
+		return m_implicitShapeDimensions;
+	}
+
+	///warning: use setImplicitShapeDimensions with care
+	///changing a collision shape while the body is in the world is not recommended,
+	///it is best to remove the body from the world, then make the change, and re-add it
+	///alternatively flush the contact points, see documentation for 'cleanProxyFromPairs'
+	void setImplicitShapeDimensions(const btVector3& dimensions)
+	{
+		m_implicitShapeDimensions = dimensions;
+	}
+
+	void setSafeMargin(btScalar minDimension, btScalar defaultMarginMultiplier = 0.1f)
+	{
+		btScalar safeMargin = defaultMarginMultiplier * minDimension;
+		if (safeMargin < getMargin())
+		{
+			setMargin(safeMargin);
+		}
+	}
+	void setSafeMargin(const btVector3& halfExtents, btScalar defaultMarginMultiplier = 0.1f)
+	{
+		//see http://code.google.com/p/bullet/issues/detail?id=349
+		//this margin check could could be added to other collision shapes too,
+		//or add some assert/warning somewhere
+		btScalar minDimension = halfExtents[halfExtents.minAxis()];
+		setSafeMargin(minDimension, defaultMarginMultiplier);
+	}
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		getAabbSlow(t, aabbMin, aabbMax);
+	}
+
+	virtual void getAabbSlow(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const
+	{
+		return m_localScaling;
+	}
+
+	const btVector3& getLocalScalingNV() const
+	{
+		return m_localScaling;
+	}
+
+	virtual void setMargin(btScalar margin)
+	{
+		m_collisionMargin = margin;
+	}
+	virtual btScalar getMargin() const
+	{
+		return m_collisionMargin;
+	}
+
+	btScalar getMarginNV() const
+	{
+		return m_collisionMargin;
+	}
+
+	virtual int getNumPreferredPenetrationDirections() const
+	{
+		return 0;
+	}
+
+	virtual void getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+	{
+		(void)penetrationVector;
+		(void)index;
+		btAssert(0);
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btConvexInternalShapeData
+{
+	btCollisionShapeData m_collisionShapeData;
+
+	btVector3FloatData m_localScaling;
+
+	btVector3FloatData m_implicitShapeDimensions;
+
+	float m_collisionMargin;
+
+	int m_padding;
+};
+
+SIMD_FORCE_INLINE int btConvexInternalShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btConvexInternalShapeData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btConvexInternalShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btConvexInternalShapeData* shapeData = (btConvexInternalShapeData*)dataBuffer;
+	btCollisionShape::serialize(&shapeData->m_collisionShapeData, serializer);
+
+	m_implicitShapeDimensions.serializeFloat(shapeData->m_implicitShapeDimensions);
+	m_localScaling.serializeFloat(shapeData->m_localScaling);
+	shapeData->m_collisionMargin = float(m_collisionMargin);
+
+	// Fill padding with zeros to appease msan.
+	shapeData->m_padding = 0;
+
+	return "btConvexInternalShapeData";
+}
+
+///btConvexInternalAabbCachingShape adds local aabb caching for convex shapes, to avoid expensive bounding box calculations
+class btConvexInternalAabbCachingShape : public btConvexInternalShape
+{
+	btVector3 m_localAabbMin;
+	btVector3 m_localAabbMax;
+	bool m_isLocalAabbValid;
+
+protected:
+	btConvexInternalAabbCachingShape();
+
+	void setCachedLocalAabb(const btVector3& aabbMin, const btVector3& aabbMax)
+	{
+		m_isLocalAabbValid = true;
+		m_localAabbMin = aabbMin;
+		m_localAabbMax = aabbMax;
+	}
+
+	inline void getCachedLocalAabb(btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		btAssert(m_isLocalAabbValid);
+		aabbMin = m_localAabbMin;
+		aabbMax = m_localAabbMax;
+	}
+
+	inline void getNonvirtualAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax, btScalar margin) const
+	{
+		//lazy evaluation of local aabb
+		btAssert(m_isLocalAabbValid);
+		btTransformAabb(m_localAabbMin, m_localAabbMax, margin, trans, aabbMin, aabbMax);
+	}
+
+public:
+	virtual void setLocalScaling(const btVector3& scaling);
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	void recalcLocalAabb();
+};
+
+#endif  //BT_CONVEX_INTERNAL_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
new file mode 100644
index 0000000..f00a440
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
@@ -0,0 +1,129 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvexPointCloudShape.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+
+#include "LinearMath/btQuaternion.h"
+
+void btConvexPointCloudShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling;
+	recalcLocalAabb();
+}
+
+#ifndef __SPU__
+btVector3 btConvexPointCloudShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0) const
+{
+	btVector3 supVec(btScalar(0.), btScalar(0.), btScalar(0.));
+	btScalar maxDot = btScalar(-BT_LARGE_FLOAT);
+
+	btVector3 vec = vec0;
+	btScalar lenSqr = vec.length2();
+	if (lenSqr < btScalar(0.0001))
+	{
+		vec.setValue(1, 0, 0);
+	}
+	else
+	{
+		btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+		vec *= rlen;
+	}
+
+	if (m_numPoints > 0)
+	{
+		// Here we take advantage of dot(a*b, c) = dot( a, b*c) to do less work. Note this transformation is true mathematically, not numerically.
+		//    btVector3 scaled = vec * m_localScaling;
+		int index = (int)vec.maxDot(&m_unscaledPoints[0], m_numPoints, maxDot);  //FIXME: may violate encapsulation of m_unscaledPoints
+		return getScaledPoint(index);
+	}
+
+	return supVec;
+}
+
+void btConvexPointCloudShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	for (int j = 0; j < numVectors; j++)
+	{
+		const btVector3& vec = vectors[j] * m_localScaling;  // dot( a*c, b) = dot(a, b*c)
+		btScalar maxDot;
+		int index = (int)vec.maxDot(&m_unscaledPoints[0], m_numPoints, maxDot);
+		supportVerticesOut[j][3] = btScalar(-BT_LARGE_FLOAT);
+		if (0 <= index)
+		{
+			//WARNING: don't swap next lines, the w component would get overwritten!
+			supportVerticesOut[j] = getScaledPoint(index);
+			supportVerticesOut[j][3] = maxDot;
+		}
+	}
+}
+
+btVector3 btConvexPointCloudShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	btVector3 supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+	if (getMargin() != btScalar(0.))
+	{
+		btVector3 vecnorm = vec;
+		if (vecnorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+		{
+			vecnorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+		}
+		vecnorm.normalize();
+		supVertex += getMargin() * vecnorm;
+	}
+	return supVertex;
+}
+
+#endif
+
+//currently just for debugging (drawing), perhaps future support for algebraic continuous collision detection
+//Please note that you can debug-draw btConvexHullShape with the Raytracer Demo
+int btConvexPointCloudShape::getNumVertices() const
+{
+	return m_numPoints;
+}
+
+int btConvexPointCloudShape::getNumEdges() const
+{
+	return 0;
+}
+
+void btConvexPointCloudShape::getEdge(int i, btVector3& pa, btVector3& pb) const
+{
+	btAssert(0);
+}
+
+void btConvexPointCloudShape::getVertex(int i, btVector3& vtx) const
+{
+	vtx = m_unscaledPoints[i] * m_localScaling;
+}
+
+int btConvexPointCloudShape::getNumPlanes() const
+{
+	return 0;
+}
+
+void btConvexPointCloudShape::getPlane(btVector3&, btVector3&, int) const
+{
+	btAssert(0);
+}
+
+//not yet
+bool btConvexPointCloudShape::isInside(const btVector3&, btScalar) const
+{
+	btAssert(0);
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
new file mode 100644
index 0000000..c7d554a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
@@ -0,0 +1,103 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_POINT_CLOUD_SHAPE_H
+#define BT_CONVEX_POINT_CLOUD_SHAPE_H
+
+#include "btPolyhedralConvexShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+#include "LinearMath/btAlignedObjectArray.h"
+
+///The btConvexPointCloudShape implements an implicit convex hull of an array of vertices.
+ATTRIBUTE_ALIGNED16(class)
+btConvexPointCloudShape : public btPolyhedralConvexAabbCachingShape
+{
+	btVector3* m_unscaledPoints;
+	int m_numPoints;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConvexPointCloudShape()
+	{
+		m_localScaling.setValue(1.f, 1.f, 1.f);
+		m_shapeType = CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE;
+		m_unscaledPoints = 0;
+		m_numPoints = 0;
+	}
+
+	btConvexPointCloudShape(btVector3 * points, int numPoints, const btVector3& localScaling, bool computeAabb = true)
+	{
+		m_localScaling = localScaling;
+		m_shapeType = CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE;
+		m_unscaledPoints = points;
+		m_numPoints = numPoints;
+
+		if (computeAabb)
+			recalcLocalAabb();
+	}
+
+	void setPoints(btVector3 * points, int numPoints, bool computeAabb = true, const btVector3& localScaling = btVector3(1.f, 1.f, 1.f))
+	{
+		m_unscaledPoints = points;
+		m_numPoints = numPoints;
+		m_localScaling = localScaling;
+
+		if (computeAabb)
+			recalcLocalAabb();
+	}
+
+	SIMD_FORCE_INLINE btVector3* getUnscaledPoints()
+	{
+		return m_unscaledPoints;
+	}
+
+	SIMD_FORCE_INLINE const btVector3* getUnscaledPoints() const
+	{
+		return m_unscaledPoints;
+	}
+
+	SIMD_FORCE_INLINE int getNumPoints() const
+	{
+		return m_numPoints;
+	}
+
+	SIMD_FORCE_INLINE btVector3 getScaledPoint(int index) const
+	{
+		return m_unscaledPoints[index] * m_localScaling;
+	}
+
+#ifndef __SPU__
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+#endif
+
+	//debugging
+	virtual const char* getName() const { return "ConvexPointCloud"; }
+
+	virtual int getNumVertices() const;
+	virtual int getNumEdges() const;
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const;
+	virtual void getVertex(int i, btVector3& vtx) const;
+	virtual int getNumPlanes() const;
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const;
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const;
+
+	///in case we receive negative scaling
+	virtual void setLocalScaling(const btVector3& scaling);
+};
+
+#endif  //BT_CONVEX_POINT_CLOUD_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
new file mode 100644
index 0000000..9694f4d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
@@ -0,0 +1,302 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+///Separating axis rest based on work from Pierre Terdiman, see
+///And contact clipping based on work from Simon Hobbs
+
+#include "btConvexPolyhedron.h"
+#include "LinearMath/btHashMap.h"
+
+btConvexPolyhedron::btConvexPolyhedron()
+{
+}
+btConvexPolyhedron::~btConvexPolyhedron()
+{
+}
+
+inline bool IsAlmostZero1(const btVector3& v)
+{
+	if (btFabs(v.x()) > 1e-6 || btFabs(v.y()) > 1e-6 || btFabs(v.z()) > 1e-6) return false;
+	return true;
+}
+
+struct btInternalVertexPair
+{
+	btInternalVertexPair(short int v0, short int v1)
+		: m_v0(v0),
+		  m_v1(v1)
+	{
+		if (m_v1 > m_v0)
+			btSwap(m_v0, m_v1);
+	}
+	short int m_v0;
+	short int m_v1;
+	int getHash() const
+	{
+		return m_v0 + (m_v1 << 16);
+	}
+	bool equals(const btInternalVertexPair& other) const
+	{
+		return m_v0 == other.m_v0 && m_v1 == other.m_v1;
+	}
+};
+
+struct btInternalEdge
+{
+	btInternalEdge()
+		: m_face0(-1),
+		  m_face1(-1)
+	{
+	}
+	short int m_face0;
+	short int m_face1;
+};
+
+//
+
+#ifdef TEST_INTERNAL_OBJECTS
+bool btConvexPolyhedron::testContainment() const
+{
+	for (int p = 0; p < 8; p++)
+	{
+		btVector3 LocalPt;
+		if (p == 0)
+			LocalPt = m_localCenter + btVector3(m_extents[0], m_extents[1], m_extents[2]);
+		else if (p == 1)
+			LocalPt = m_localCenter + btVector3(m_extents[0], m_extents[1], -m_extents[2]);
+		else if (p == 2)
+			LocalPt = m_localCenter + btVector3(m_extents[0], -m_extents[1], m_extents[2]);
+		else if (p == 3)
+			LocalPt = m_localCenter + btVector3(m_extents[0], -m_extents[1], -m_extents[2]);
+		else if (p == 4)
+			LocalPt = m_localCenter + btVector3(-m_extents[0], m_extents[1], m_extents[2]);
+		else if (p == 5)
+			LocalPt = m_localCenter + btVector3(-m_extents[0], m_extents[1], -m_extents[2]);
+		else if (p == 6)
+			LocalPt = m_localCenter + btVector3(-m_extents[0], -m_extents[1], m_extents[2]);
+		else if (p == 7)
+			LocalPt = m_localCenter + btVector3(-m_extents[0], -m_extents[1], -m_extents[2]);
+
+		for (int i = 0; i < m_faces.size(); i++)
+		{
+			const btVector3 Normal(m_faces[i].m_plane[0], m_faces[i].m_plane[1], m_faces[i].m_plane[2]);
+			const btScalar d = LocalPt.dot(Normal) + m_faces[i].m_plane[3];
+			if (d > 0.0f)
+				return false;
+		}
+	}
+	return true;
+}
+#endif
+
+void btConvexPolyhedron::initialize()
+{
+	btHashMap<btInternalVertexPair, btInternalEdge> edges;
+
+	for (int i = 0; i < m_faces.size(); i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		int NbTris = numVertices;
+		for (int j = 0; j < NbTris; j++)
+		{
+			int k = (j + 1) % numVertices;
+			btInternalVertexPair vp(m_faces[i].m_indices[j], m_faces[i].m_indices[k]);
+			btInternalEdge* edptr = edges.find(vp);
+			btVector3 edge = m_vertices[vp.m_v1] - m_vertices[vp.m_v0];
+			edge.normalize();
+
+			bool found = false;
+
+			for (int p = 0; p < m_uniqueEdges.size(); p++)
+			{
+				if (IsAlmostZero1(m_uniqueEdges[p] - edge) ||
+					IsAlmostZero1(m_uniqueEdges[p] + edge))
+				{
+					found = true;
+					break;
+				}
+			}
+
+			if (!found)
+			{
+				m_uniqueEdges.push_back(edge);
+			}
+
+			if (edptr)
+			{
+				btAssert(edptr->m_face0 >= 0);
+				btAssert(edptr->m_face1 < 0);
+				edptr->m_face1 = i;
+			}
+			else
+			{
+				btInternalEdge ed;
+				ed.m_face0 = i;
+				edges.insert(vp, ed);
+			}
+		}
+	}
+
+#ifdef USE_CONNECTED_FACES
+	for (int i = 0; i < m_faces.size(); i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		m_faces[i].m_connectedFaces.resize(numVertices);
+
+		for (int j = 0; j < numVertices; j++)
+		{
+			int k = (j + 1) % numVertices;
+			btInternalVertexPair vp(m_faces[i].m_indices[j], m_faces[i].m_indices[k]);
+			btInternalEdge* edptr = edges.find(vp);
+			btAssert(edptr);
+			btAssert(edptr->m_face0 >= 0);
+			btAssert(edptr->m_face1 >= 0);
+
+			int connectedFace = (edptr->m_face0 == i) ? edptr->m_face1 : edptr->m_face0;
+			m_faces[i].m_connectedFaces[j] = connectedFace;
+		}
+	}
+#endif  //USE_CONNECTED_FACES
+
+	initialize2();
+}
+
+void btConvexPolyhedron::initialize2()
+{
+	m_localCenter.setValue(0, 0, 0);
+	btScalar TotalArea = 0.0f;
+	for (int i = 0; i < m_faces.size(); i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		int NbTris = numVertices - 2;
+
+		const btVector3& p0 = m_vertices[m_faces[i].m_indices[0]];
+		for (int j = 1; j <= NbTris; j++)
+		{
+			int k = (j + 1) % numVertices;
+			const btVector3& p1 = m_vertices[m_faces[i].m_indices[j]];
+			const btVector3& p2 = m_vertices[m_faces[i].m_indices[k]];
+			btScalar Area = ((p0 - p1).cross(p0 - p2)).length() * 0.5f;
+			btVector3 Center = (p0 + p1 + p2) / 3.0f;
+			m_localCenter += Area * Center;
+			TotalArea += Area;
+		}
+	}
+	m_localCenter /= TotalArea;
+
+#ifdef TEST_INTERNAL_OBJECTS
+	if (1)
+	{
+		m_radius = FLT_MAX;
+		for (int i = 0; i < m_faces.size(); i++)
+		{
+			const btVector3 Normal(m_faces[i].m_plane[0], m_faces[i].m_plane[1], m_faces[i].m_plane[2]);
+			const btScalar dist = btFabs(m_localCenter.dot(Normal) + m_faces[i].m_plane[3]);
+			if (dist < m_radius)
+				m_radius = dist;
+		}
+
+		btScalar MinX = FLT_MAX;
+		btScalar MinY = FLT_MAX;
+		btScalar MinZ = FLT_MAX;
+		btScalar MaxX = -FLT_MAX;
+		btScalar MaxY = -FLT_MAX;
+		btScalar MaxZ = -FLT_MAX;
+		for (int i = 0; i < m_vertices.size(); i++)
+		{
+			const btVector3& pt = m_vertices[i];
+			if (pt.x() < MinX) MinX = pt.x();
+			if (pt.x() > MaxX) MaxX = pt.x();
+			if (pt.y() < MinY) MinY = pt.y();
+			if (pt.y() > MaxY) MaxY = pt.y();
+			if (pt.z() < MinZ) MinZ = pt.z();
+			if (pt.z() > MaxZ) MaxZ = pt.z();
+		}
+		mC.setValue(MaxX + MinX, MaxY + MinY, MaxZ + MinZ);
+		mE.setValue(MaxX - MinX, MaxY - MinY, MaxZ - MinZ);
+
+		//		const btScalar r = m_radius / sqrtf(2.0f);
+		const btScalar r = m_radius / sqrtf(3.0f);
+		const int LargestExtent = mE.maxAxis();
+		const btScalar Step = (mE[LargestExtent] * 0.5f - r) / 1024.0f;
+		m_extents[0] = m_extents[1] = m_extents[2] = r;
+		m_extents[LargestExtent] = mE[LargestExtent] * 0.5f;
+		bool FoundBox = false;
+		for (int j = 0; j < 1024; j++)
+		{
+			if (testContainment())
+			{
+				FoundBox = true;
+				break;
+			}
+
+			m_extents[LargestExtent] -= Step;
+		}
+		if (!FoundBox)
+		{
+			m_extents[0] = m_extents[1] = m_extents[2] = r;
+		}
+		else
+		{
+			// Refine the box
+			const btScalar Step = (m_radius - r) / 1024.0f;
+			const int e0 = (1 << LargestExtent) & 3;
+			const int e1 = (1 << e0) & 3;
+
+			for (int j = 0; j < 1024; j++)
+			{
+				const btScalar Saved0 = m_extents[e0];
+				const btScalar Saved1 = m_extents[e1];
+				m_extents[e0] += Step;
+				m_extents[e1] += Step;
+
+				if (!testContainment())
+				{
+					m_extents[e0] = Saved0;
+					m_extents[e1] = Saved1;
+					break;
+				}
+			}
+		}
+	}
+#endif
+}
+void btConvexPolyhedron::project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin, btVector3& witnesPtMax) const
+{
+	minProj = FLT_MAX;
+	maxProj = -FLT_MAX;
+	int numVerts = m_vertices.size();
+	for (int i = 0; i < numVerts; i++)
+	{
+		btVector3 pt = trans * m_vertices[i];
+		btScalar dp = pt.dot(dir);
+		if (dp < minProj)
+		{
+			minProj = dp;
+			witnesPtMin = pt;
+		}
+		if (dp > maxProj)
+		{
+			maxProj = dp;
+			witnesPtMax = pt;
+		}
+	}
+	if (minProj > maxProj)
+	{
+		btSwap(minProj, maxProj);
+		btSwap(witnesPtMin, witnesPtMax);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
new file mode 100644
index 0000000..638aa9b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
@@ -0,0 +1,59 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef _BT_POLYHEDRAL_FEATURES_H
+#define _BT_POLYHEDRAL_FEATURES_H
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+#define TEST_INTERNAL_OBJECTS 1
+
+struct btFace
+{
+	btAlignedObjectArray<int> m_indices;
+	//	btAlignedObjectArray<int>	m_connectedFaces;
+	btScalar m_plane[4];
+};
+
+ATTRIBUTE_ALIGNED16(class)
+btConvexPolyhedron
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConvexPolyhedron();
+	virtual ~btConvexPolyhedron();
+
+	btAlignedObjectArray<btVector3> m_vertices;
+	btAlignedObjectArray<btFace> m_faces;
+	btAlignedObjectArray<btVector3> m_uniqueEdges;
+
+	btVector3 m_localCenter;
+	btVector3 m_extents;
+	btScalar m_radius;
+	btVector3 mC;
+	btVector3 mE;
+
+	void initialize();
+	void initialize2();
+	bool testContainment() const;
+
+	void project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin, btVector3& witnesPtMax) const;
+};
+
+#endif  //_BT_POLYHEDRAL_FEATURES_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexShape.cpp
new file mode 100644
index 0000000..f8fb0aa
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexShape.cpp
@@ -0,0 +1,458 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#if defined(_WIN32) || defined(__i386__)
+#define BT_USE_SSE_IN_API
+#endif
+
+#include "btConvexShape.h"
+#include "btTriangleShape.h"
+#include "btSphereShape.h"
+#include "btCylinderShape.h"
+#include "btConeShape.h"
+#include "btCapsuleShape.h"
+#include "btConvexHullShape.h"
+#include "btConvexPointCloudShape.h"
+
+///not supported on IBM SDK, until we fix the alignment of btVector3
+#if defined(__CELLOS_LV2__) && defined(__SPU__)
+#include <spu_intrinsics.h>
+static inline vec_float4 vec_dot3(vec_float4 vec0, vec_float4 vec1)
+{
+	vec_float4 result;
+	result = spu_mul(vec0, vec1);
+	result = spu_madd(spu_rlqwbyte(vec0, 4), spu_rlqwbyte(vec1, 4), result);
+	return spu_madd(spu_rlqwbyte(vec0, 8), spu_rlqwbyte(vec1, 8), result);
+}
+#endif  //__SPU__
+
+btConvexShape::btConvexShape()
+{
+}
+
+btConvexShape::~btConvexShape()
+{
+}
+
+void btConvexShape::project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max, btVector3& witnesPtMin, btVector3& witnesPtMax) const
+{
+	btVector3 localAxis = dir * trans.getBasis();
+	btVector3 vtx1 = trans(localGetSupportingVertex(localAxis));
+	btVector3 vtx2 = trans(localGetSupportingVertex(-localAxis));
+
+	min = vtx1.dot(dir);
+	max = vtx2.dot(dir);
+	witnesPtMax = vtx2;
+	witnesPtMin = vtx1;
+
+	if (min > max)
+	{
+		btScalar tmp = min;
+		min = max;
+		max = tmp;
+		witnesPtMax = vtx1;
+		witnesPtMin = vtx2;
+	}
+}
+
+static btVector3 convexHullSupport(const btVector3& localDirOrg, const btVector3* points, int numPoints, const btVector3& localScaling)
+{
+	btVector3 vec = localDirOrg * localScaling;
+
+#if defined(__CELLOS_LV2__) && defined(__SPU__)
+
+	btVector3 localDir = vec;
+
+	vec_float4 v_distMax = {-FLT_MAX, 0, 0, 0};
+	vec_int4 v_idxMax = {-999, 0, 0, 0};
+	int v = 0;
+	int numverts = numPoints;
+
+	for (; v < (int)numverts - 4; v += 4)
+	{
+		vec_float4 p0 = vec_dot3(points[v].get128(), localDir.get128());
+		vec_float4 p1 = vec_dot3(points[v + 1].get128(), localDir.get128());
+		vec_float4 p2 = vec_dot3(points[v + 2].get128(), localDir.get128());
+		vec_float4 p3 = vec_dot3(points[v + 3].get128(), localDir.get128());
+		const vec_int4 i0 = {v, 0, 0, 0};
+		const vec_int4 i1 = {v + 1, 0, 0, 0};
+		const vec_int4 i2 = {v + 2, 0, 0, 0};
+		const vec_int4 i3 = {v + 3, 0, 0, 0};
+		vec_uint4 retGt01 = spu_cmpgt(p0, p1);
+		vec_float4 pmax01 = spu_sel(p1, p0, retGt01);
+		vec_int4 imax01 = spu_sel(i1, i0, retGt01);
+		vec_uint4 retGt23 = spu_cmpgt(p2, p3);
+		vec_float4 pmax23 = spu_sel(p3, p2, retGt23);
+		vec_int4 imax23 = spu_sel(i3, i2, retGt23);
+		vec_uint4 retGt0123 = spu_cmpgt(pmax01, pmax23);
+		vec_float4 pmax0123 = spu_sel(pmax23, pmax01, retGt0123);
+		vec_int4 imax0123 = spu_sel(imax23, imax01, retGt0123);
+		vec_uint4 retGtMax = spu_cmpgt(v_distMax, pmax0123);
+		v_distMax = spu_sel(pmax0123, v_distMax, retGtMax);
+		v_idxMax = spu_sel(imax0123, v_idxMax, retGtMax);
+	}
+	for (; v < (int)numverts; v++)
+	{
+		vec_float4 p = vec_dot3(points[v].get128(), localDir.get128());
+		const vec_int4 i = {v, 0, 0, 0};
+		vec_uint4 retGtMax = spu_cmpgt(v_distMax, p);
+		v_distMax = spu_sel(p, v_distMax, retGtMax);
+		v_idxMax = spu_sel(i, v_idxMax, retGtMax);
+	}
+	int ptIndex = spu_extract(v_idxMax, 0);
+	const btVector3& supVec = points[ptIndex] * localScaling;
+	return supVec;
+#else
+
+	btScalar maxDot;
+	long ptIndex = vec.maxDot(points, numPoints, maxDot);
+	btAssert(ptIndex >= 0);
+	if (ptIndex < 0)
+	{
+		ptIndex = 0;
+	}
+	btVector3 supVec = points[ptIndex] * localScaling;
+	return supVec;
+#endif  //__SPU__
+}
+
+btVector3 btConvexShape::localGetSupportVertexWithoutMarginNonVirtual(const btVector3& localDir) const
+{
+	switch (m_shapeType)
+	{
+		case SPHERE_SHAPE_PROXYTYPE:
+		{
+			return btVector3(0, 0, 0);
+		}
+		case BOX_SHAPE_PROXYTYPE:
+		{
+			btBoxShape* convexShape = (btBoxShape*)this;
+			const btVector3& halfExtents = convexShape->getImplicitShapeDimensions();
+
+#if defined(__APPLE__) && (defined(BT_USE_SSE) || defined(BT_USE_NEON))
+#if defined(BT_USE_SSE)
+			return btVector3(_mm_xor_ps(_mm_and_ps(localDir.mVec128, (__m128){-0.0f, -0.0f, -0.0f, -0.0f}), halfExtents.mVec128));
+#elif defined(BT_USE_NEON)
+			return btVector3((float32x4_t)(((uint32x4_t)localDir.mVec128 & (uint32x4_t){0x80000000, 0x80000000, 0x80000000, 0x80000000}) ^ (uint32x4_t)halfExtents.mVec128));
+#else
+#error unknown vector arch
+#endif
+#else
+			return btVector3(btFsels(localDir.x(), halfExtents.x(), -halfExtents.x()),
+							 btFsels(localDir.y(), halfExtents.y(), -halfExtents.y()),
+							 btFsels(localDir.z(), halfExtents.z(), -halfExtents.z()));
+#endif
+		}
+		case TRIANGLE_SHAPE_PROXYTYPE:
+		{
+			btTriangleShape* triangleShape = (btTriangleShape*)this;
+			btVector3 dir(localDir.getX(), localDir.getY(), localDir.getZ());
+			btVector3* vertices = &triangleShape->m_vertices1[0];
+			btVector3 dots = dir.dot3(vertices[0], vertices[1], vertices[2]);
+			btVector3 sup = vertices[dots.maxAxis()];
+			return btVector3(sup.getX(), sup.getY(), sup.getZ());
+		}
+		case CYLINDER_SHAPE_PROXYTYPE:
+		{
+			btCylinderShape* cylShape = (btCylinderShape*)this;
+			//mapping of halfextents/dimension onto radius/height depends on how cylinder local orientation is (upAxis)
+
+			btVector3 halfExtents = cylShape->getImplicitShapeDimensions();
+			btVector3 v(localDir.getX(), localDir.getY(), localDir.getZ());
+			int cylinderUpAxis = cylShape->getUpAxis();
+			int XX(1), YY(0), ZZ(2);
+
+			switch (cylinderUpAxis)
+			{
+				case 0:
+				{
+					XX = 1;
+					YY = 0;
+					ZZ = 2;
+				}
+				break;
+				case 1:
+				{
+					XX = 0;
+					YY = 1;
+					ZZ = 2;
+				}
+				break;
+				case 2:
+				{
+					XX = 0;
+					YY = 2;
+					ZZ = 1;
+				}
+				break;
+				default:
+					btAssert(0);
+					break;
+			};
+
+			btScalar radius = halfExtents[XX];
+			btScalar halfHeight = halfExtents[cylinderUpAxis];
+
+			btVector3 tmp;
+			btScalar d;
+
+			btScalar s = btSqrt(v[XX] * v[XX] + v[ZZ] * v[ZZ]);
+			if (s != btScalar(0.0))
+			{
+				d = radius / s;
+				tmp[XX] = v[XX] * d;
+				tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+				tmp[ZZ] = v[ZZ] * d;
+				return btVector3(tmp.getX(), tmp.getY(), tmp.getZ());
+			}
+			else
+			{
+				tmp[XX] = radius;
+				tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+				tmp[ZZ] = btScalar(0.0);
+				return btVector3(tmp.getX(), tmp.getY(), tmp.getZ());
+			}
+		}
+		case CAPSULE_SHAPE_PROXYTYPE:
+		{
+			btVector3 vec0(localDir.getX(), localDir.getY(), localDir.getZ());
+
+			btCapsuleShape* capsuleShape = (btCapsuleShape*)this;
+			btScalar halfHeight = capsuleShape->getHalfHeight();
+			int capsuleUpAxis = capsuleShape->getUpAxis();
+
+			btVector3 supVec(0, 0, 0);
+
+			btScalar maxDot(btScalar(-BT_LARGE_FLOAT));
+
+			btVector3 vec = vec0;
+			btScalar lenSqr = vec.length2();
+			if (lenSqr < SIMD_EPSILON * SIMD_EPSILON)
+			{
+				vec.setValue(1, 0, 0);
+			}
+			else
+			{
+				btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+				vec *= rlen;
+			}
+			btVector3 vtx;
+			btScalar newDot;
+			{
+				btVector3 pos(0, 0, 0);
+				pos[capsuleUpAxis] = halfHeight;
+
+				vtx = pos;
+				newDot = vec.dot(vtx);
+
+				if (newDot > maxDot)
+				{
+					maxDot = newDot;
+					supVec = vtx;
+				}
+			}
+			{
+				btVector3 pos(0, 0, 0);
+				pos[capsuleUpAxis] = -halfHeight;
+
+				vtx = pos;
+				newDot = vec.dot(vtx);
+				if (newDot > maxDot)
+				{
+					maxDot = newDot;
+					supVec = vtx;
+				}
+			}
+			return btVector3(supVec.getX(), supVec.getY(), supVec.getZ());
+		}
+		case CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE:
+		{
+			btConvexPointCloudShape* convexPointCloudShape = (btConvexPointCloudShape*)this;
+			btVector3* points = convexPointCloudShape->getUnscaledPoints();
+			int numPoints = convexPointCloudShape->getNumPoints();
+			return convexHullSupport(localDir, points, numPoints, convexPointCloudShape->getLocalScalingNV());
+		}
+		case CONVEX_HULL_SHAPE_PROXYTYPE:
+		{
+			btConvexHullShape* convexHullShape = (btConvexHullShape*)this;
+			btVector3* points = convexHullShape->getUnscaledPoints();
+			int numPoints = convexHullShape->getNumPoints();
+			return convexHullSupport(localDir, points, numPoints, convexHullShape->getLocalScalingNV());
+		}
+		default:
+#ifndef __SPU__
+			return this->localGetSupportingVertexWithoutMargin(localDir);
+#else
+			btAssert(0);
+#endif
+	}
+
+	// should never reach here
+	btAssert(0);
+	return btVector3(btScalar(0.0f), btScalar(0.0f), btScalar(0.0f));
+}
+
+btVector3 btConvexShape::localGetSupportVertexNonVirtual(const btVector3& localDir) const
+{
+	btVector3 localDirNorm = localDir;
+	if (localDirNorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+	{
+		localDirNorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+	}
+	localDirNorm.normalize();
+
+	return localGetSupportVertexWithoutMarginNonVirtual(localDirNorm) + getMarginNonVirtual() * localDirNorm;
+}
+
+/* TODO: This should be bumped up to btCollisionShape () */
+btScalar btConvexShape::getMarginNonVirtual() const
+{
+	switch (m_shapeType)
+	{
+		case SPHERE_SHAPE_PROXYTYPE:
+		{
+			btSphereShape* sphereShape = (btSphereShape*)this;
+			return sphereShape->getRadius();
+		}
+		case BOX_SHAPE_PROXYTYPE:
+		{
+			btBoxShape* convexShape = (btBoxShape*)this;
+			return convexShape->getMarginNV();
+		}
+		case TRIANGLE_SHAPE_PROXYTYPE:
+		{
+			btTriangleShape* triangleShape = (btTriangleShape*)this;
+			return triangleShape->getMarginNV();
+		}
+		case CYLINDER_SHAPE_PROXYTYPE:
+		{
+			btCylinderShape* cylShape = (btCylinderShape*)this;
+			return cylShape->getMarginNV();
+		}
+		case CONE_SHAPE_PROXYTYPE:
+		{
+			btConeShape* conShape = (btConeShape*)this;
+			return conShape->getMarginNV();
+		}
+		case CAPSULE_SHAPE_PROXYTYPE:
+		{
+			btCapsuleShape* capsuleShape = (btCapsuleShape*)this;
+			return capsuleShape->getMarginNV();
+		}
+		case CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE:
+		/* fall through */
+		case CONVEX_HULL_SHAPE_PROXYTYPE:
+		{
+			btPolyhedralConvexShape* convexHullShape = (btPolyhedralConvexShape*)this;
+			return convexHullShape->getMarginNV();
+		}
+		default:
+#ifndef __SPU__
+			return this->getMargin();
+#else
+			btAssert(0);
+#endif
+	}
+
+	// should never reach here
+	btAssert(0);
+	return btScalar(0.0f);
+}
+#ifndef __SPU__
+void btConvexShape::getAabbNonVirtual(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	switch (m_shapeType)
+	{
+		case SPHERE_SHAPE_PROXYTYPE:
+		{
+			btSphereShape* sphereShape = (btSphereShape*)this;
+			btScalar radius = sphereShape->getImplicitShapeDimensions().getX();  // * convexShape->getLocalScaling().getX();
+			btScalar margin = radius + sphereShape->getMarginNonVirtual();
+			const btVector3& center = t.getOrigin();
+			btVector3 extent(margin, margin, margin);
+			aabbMin = center - extent;
+			aabbMax = center + extent;
+		}
+		break;
+		case CYLINDER_SHAPE_PROXYTYPE:
+		/* fall through */
+		case BOX_SHAPE_PROXYTYPE:
+		{
+			btBoxShape* convexShape = (btBoxShape*)this;
+			btScalar margin = convexShape->getMarginNonVirtual();
+			btVector3 halfExtents = convexShape->getImplicitShapeDimensions();
+			halfExtents += btVector3(margin, margin, margin);
+			btMatrix3x3 abs_b = t.getBasis().absolute();
+			btVector3 center = t.getOrigin();
+			btVector3 extent = halfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+
+			aabbMin = center - extent;
+			aabbMax = center + extent;
+			break;
+		}
+		case TRIANGLE_SHAPE_PROXYTYPE:
+		{
+			btTriangleShape* triangleShape = (btTriangleShape*)this;
+			btScalar margin = triangleShape->getMarginNonVirtual();
+			for (int i = 0; i < 3; i++)
+			{
+				btVector3 vec(btScalar(0.), btScalar(0.), btScalar(0.));
+				vec[i] = btScalar(1.);
+
+				btVector3 sv = localGetSupportVertexWithoutMarginNonVirtual(vec * t.getBasis());
+
+				btVector3 tmp = t(sv);
+				aabbMax[i] = tmp[i] + margin;
+				vec[i] = btScalar(-1.);
+				tmp = t(localGetSupportVertexWithoutMarginNonVirtual(vec * t.getBasis()));
+				aabbMin[i] = tmp[i] - margin;
+			}
+		}
+		break;
+		case CAPSULE_SHAPE_PROXYTYPE:
+		{
+			btCapsuleShape* capsuleShape = (btCapsuleShape*)this;
+			btVector3 halfExtents(capsuleShape->getRadius(), capsuleShape->getRadius(), capsuleShape->getRadius());
+			int m_upAxis = capsuleShape->getUpAxis();
+			halfExtents[m_upAxis] = capsuleShape->getRadius() + capsuleShape->getHalfHeight();
+			btMatrix3x3 abs_b = t.getBasis().absolute();
+			btVector3 center = t.getOrigin();
+			btVector3 extent = halfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+			aabbMin = center - extent;
+			aabbMax = center + extent;
+		}
+		break;
+		case CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE:
+		case CONVEX_HULL_SHAPE_PROXYTYPE:
+		{
+			btPolyhedralConvexAabbCachingShape* convexHullShape = (btPolyhedralConvexAabbCachingShape*)this;
+			btScalar margin = convexHullShape->getMarginNonVirtual();
+			convexHullShape->getNonvirtualAabb(t, aabbMin, aabbMax, margin);
+		}
+		break;
+		default:
+#ifndef __SPU__
+			this->getAabb(t, aabbMin, aabbMax);
+#else
+			btAssert(0);
+#endif
+			break;
+	}
+
+	// should never reach here
+	btAssert(0);
+}
+
+#endif  //__SPU__
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexShape.h
new file mode 100644
index 0000000..d3b3ed8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexShape.h
@@ -0,0 +1,75 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_SHAPE_INTERFACE1
+#define BT_CONVEX_SHAPE_INTERFACE1
+
+#include "btCollisionShape.h"
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "btCollisionMargin.h"
+#include "LinearMath/btAlignedAllocator.h"
+
+#define MAX_PREFERRED_PENETRATION_DIRECTIONS 10
+
+/// The btConvexShape is an abstract shape interface, implemented by all convex shapes such as btBoxShape, btConvexHullShape etc.
+/// It describes general convex shapes using the localGetSupportingVertex interface, used by collision detectors such as btGjkPairDetector.
+ATTRIBUTE_ALIGNED16(class)
+btConvexShape : public btCollisionShape
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConvexShape();
+
+	virtual ~btConvexShape();
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const = 0;
+
+////////
+#ifndef __SPU__
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const = 0;
+#endif  //#ifndef __SPU__
+
+	btVector3 localGetSupportVertexWithoutMarginNonVirtual(const btVector3& vec) const;
+	btVector3 localGetSupportVertexNonVirtual(const btVector3& vec) const;
+	btScalar getMarginNonVirtual() const;
+	void getAabbNonVirtual(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin, btVector3& witnesPtMax) const;
+
+	//notice that the vectors should be unit length
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const = 0;
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const = 0;
+
+	virtual void getAabbSlow(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const = 0;
+
+	virtual void setLocalScaling(const btVector3& scaling) = 0;
+	virtual const btVector3& getLocalScaling() const = 0;
+
+	virtual void setMargin(btScalar margin) = 0;
+
+	virtual btScalar getMargin() const = 0;
+
+	virtual int getNumPreferredPenetrationDirections() const = 0;
+
+	virtual void getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const = 0;
+};
+
+#endif  //BT_CONVEX_SHAPE_INTERFACE1
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
new file mode 100644
index 0000000..f6987cc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
@@ -0,0 +1,283 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvexTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+
+#include "LinearMath/btQuaternion.h"
+#include "BulletCollision/CollisionShapes/btStridingMeshInterface.h"
+
+btConvexTriangleMeshShape ::btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface, bool calcAabb)
+	: btPolyhedralConvexAabbCachingShape(), m_stridingMesh(meshInterface)
+{
+	m_shapeType = CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE;
+	if (calcAabb)
+		recalcLocalAabb();
+}
+
+///It's not nice to have all this virtual function overhead, so perhaps we can also gather the points once
+///but then we are duplicating
+class LocalSupportVertexCallback : public btInternalTriangleIndexCallback
+{
+	btVector3 m_supportVertexLocal;
+
+public:
+	btScalar m_maxDot;
+	btVector3 m_supportVecLocal;
+
+	LocalSupportVertexCallback(const btVector3& supportVecLocal)
+		: m_supportVertexLocal(btScalar(0.), btScalar(0.), btScalar(0.)),
+		  m_maxDot(btScalar(-BT_LARGE_FLOAT)),
+		  m_supportVecLocal(supportVecLocal)
+	{
+	}
+
+	virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+	{
+		(void)triangleIndex;
+		(void)partId;
+
+		for (int i = 0; i < 3; i++)
+		{
+			btScalar dot = m_supportVecLocal.dot(triangle[i]);
+			if (dot > m_maxDot)
+			{
+				m_maxDot = dot;
+				m_supportVertexLocal = triangle[i];
+			}
+		}
+	}
+
+	btVector3 GetSupportVertexLocal()
+	{
+		return m_supportVertexLocal;
+	}
+};
+
+btVector3 btConvexTriangleMeshShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0) const
+{
+	btVector3 supVec(btScalar(0.), btScalar(0.), btScalar(0.));
+
+	btVector3 vec = vec0;
+	btScalar lenSqr = vec.length2();
+	if (lenSqr < btScalar(0.0001))
+	{
+		vec.setValue(1, 0, 0);
+	}
+	else
+	{
+		btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+		vec *= rlen;
+	}
+
+	LocalSupportVertexCallback supportCallback(vec);
+	btVector3 aabbMax(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+	m_stridingMesh->InternalProcessAllTriangles(&supportCallback, -aabbMax, aabbMax);
+	supVec = supportCallback.GetSupportVertexLocal();
+
+	return supVec;
+}
+
+void btConvexTriangleMeshShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	//use 'w' component of supportVerticesOut?
+	{
+		for (int i = 0; i < numVectors; i++)
+		{
+			supportVerticesOut[i][3] = btScalar(-BT_LARGE_FLOAT);
+		}
+	}
+
+	///@todo: could do the batch inside the callback!
+
+	for (int j = 0; j < numVectors; j++)
+	{
+		const btVector3& vec = vectors[j];
+		LocalSupportVertexCallback supportCallback(vec);
+		btVector3 aabbMax(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+		m_stridingMesh->InternalProcessAllTriangles(&supportCallback, -aabbMax, aabbMax);
+		supportVerticesOut[j] = supportCallback.GetSupportVertexLocal();
+	}
+}
+
+btVector3 btConvexTriangleMeshShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	btVector3 supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+	if (getMargin() != btScalar(0.))
+	{
+		btVector3 vecnorm = vec;
+		if (vecnorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+		{
+			vecnorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+		}
+		vecnorm.normalize();
+		supVertex += getMargin() * vecnorm;
+	}
+	return supVertex;
+}
+
+//currently just for debugging (drawing), perhaps future support for algebraic continuous collision detection
+//Please note that you can debug-draw btConvexTriangleMeshShape with the Raytracer Demo
+int btConvexTriangleMeshShape::getNumVertices() const
+{
+	//cache this?
+	return 0;
+}
+
+int btConvexTriangleMeshShape::getNumEdges() const
+{
+	return 0;
+}
+
+void btConvexTriangleMeshShape::getEdge(int, btVector3&, btVector3&) const
+{
+	btAssert(0);
+}
+
+void btConvexTriangleMeshShape::getVertex(int, btVector3&) const
+{
+	btAssert(0);
+}
+
+int btConvexTriangleMeshShape::getNumPlanes() const
+{
+	return 0;
+}
+
+void btConvexTriangleMeshShape::getPlane(btVector3&, btVector3&, int) const
+{
+	btAssert(0);
+}
+
+//not yet
+bool btConvexTriangleMeshShape::isInside(const btVector3&, btScalar) const
+{
+	btAssert(0);
+	return false;
+}
+
+void btConvexTriangleMeshShape::setLocalScaling(const btVector3& scaling)
+{
+	m_stridingMesh->setScaling(scaling);
+
+	recalcLocalAabb();
+}
+
+const btVector3& btConvexTriangleMeshShape::getLocalScaling() const
+{
+	return m_stridingMesh->getScaling();
+}
+
+void btConvexTriangleMeshShape::calculatePrincipalAxisTransform(btTransform& principal, btVector3& inertia, btScalar& volume) const
+{
+	class CenterCallback : public btInternalTriangleIndexCallback
+	{
+		bool first;
+		btVector3 ref;
+		btVector3 sum;
+		btScalar volume;
+
+	public:
+		CenterCallback() : first(true), ref(0, 0, 0), sum(0, 0, 0), volume(0)
+		{
+		}
+
+		virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+		{
+			(void)triangleIndex;
+			(void)partId;
+			if (first)
+			{
+				ref = triangle[0];
+				first = false;
+			}
+			else
+			{
+				btScalar vol = btFabs((triangle[0] - ref).triple(triangle[1] - ref, triangle[2] - ref));
+				sum += (btScalar(0.25) * vol) * ((triangle[0] + triangle[1] + triangle[2] + ref));
+				volume += vol;
+			}
+		}
+
+		btVector3 getCenter()
+		{
+			return (volume > 0) ? sum / volume : ref;
+		}
+
+		btScalar getVolume()
+		{
+			return volume * btScalar(1. / 6);
+		}
+	};
+
+	class InertiaCallback : public btInternalTriangleIndexCallback
+	{
+		btMatrix3x3 sum;
+		btVector3 center;
+
+	public:
+		InertiaCallback(btVector3& center) : sum(0, 0, 0, 0, 0, 0, 0, 0, 0), center(center)
+		{
+		}
+
+		virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+		{
+			(void)triangleIndex;
+			(void)partId;
+			btMatrix3x3 i;
+			btVector3 a = triangle[0] - center;
+			btVector3 b = triangle[1] - center;
+			btVector3 c = triangle[2] - center;
+			btScalar volNeg = -btFabs(a.triple(b, c)) * btScalar(1. / 6);
+			for (int j = 0; j < 3; j++)
+			{
+				for (int k = 0; k <= j; k++)
+				{
+					i[j][k] = i[k][j] = volNeg * (btScalar(0.1) * (a[j] * a[k] + b[j] * b[k] + c[j] * c[k]) + btScalar(0.05) * (a[j] * b[k] + a[k] * b[j] + a[j] * c[k] + a[k] * c[j] + b[j] * c[k] + b[k] * c[j]));
+				}
+			}
+			btScalar i00 = -i[0][0];
+			btScalar i11 = -i[1][1];
+			btScalar i22 = -i[2][2];
+			i[0][0] = i11 + i22;
+			i[1][1] = i22 + i00;
+			i[2][2] = i00 + i11;
+			sum[0] += i[0];
+			sum[1] += i[1];
+			sum[2] += i[2];
+		}
+
+		btMatrix3x3& getInertia()
+		{
+			return sum;
+		}
+	};
+
+	CenterCallback centerCallback;
+	btVector3 aabbMax(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+	m_stridingMesh->InternalProcessAllTriangles(&centerCallback, -aabbMax, aabbMax);
+	btVector3 center = centerCallback.getCenter();
+	principal.setOrigin(center);
+	volume = centerCallback.getVolume();
+
+	InertiaCallback inertiaCallback(center);
+	m_stridingMesh->InternalProcessAllTriangles(&inertiaCallback, -aabbMax, aabbMax);
+
+	btMatrix3x3& i = inertiaCallback.getInertia();
+	i.diagonalize(principal.getBasis(), btScalar(0.00001), 20);
+	inertia.setValue(i[0][0], i[1][1], i[2][2]);
+	inertia /= volume;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
new file mode 100644
index 0000000..6dac9ff
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
@@ -0,0 +1,68 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef BT_CONVEX_TRIANGLEMESH_SHAPE_H
+#define BT_CONVEX_TRIANGLEMESH_SHAPE_H
+
+#include "btPolyhedralConvexShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+
+/// The btConvexTriangleMeshShape is a convex hull of a triangle mesh, but the performance is not as good as btConvexHullShape.
+/// A small benefit of this class is that it uses the btStridingMeshInterface, so you can avoid the duplication of the triangle mesh data. Nevertheless, most users should use the much better performing btConvexHullShape instead.
+ATTRIBUTE_ALIGNED16(class)
+btConvexTriangleMeshShape : public btPolyhedralConvexAabbCachingShape
+{
+	class btStridingMeshInterface* m_stridingMesh;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConvexTriangleMeshShape(btStridingMeshInterface * meshInterface, bool calcAabb = true);
+
+	class btStridingMeshInterface* getMeshInterface()
+	{
+		return m_stridingMesh;
+	}
+	const class btStridingMeshInterface* getMeshInterface() const
+	{
+		return m_stridingMesh;
+	}
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	//debugging
+	virtual const char* getName() const { return "ConvexTrimesh"; }
+
+	virtual int getNumVertices() const;
+	virtual int getNumEdges() const;
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const;
+	virtual void getVertex(int i, btVector3& vtx) const;
+	virtual int getNumPlanes() const;
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const;
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const;
+
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const;
+
+	///computes the exact moment of inertia and the transform from the coordinate system defined by the principal axes of the moment of inertia
+	///and the center of mass to the current coordinate system. A mass of 1 is assumed, for other masses just multiply the computed "inertia"
+	///by the mass. The resulting transform "principal" has to be applied inversely to the mesh in order for the local coordinate system of the
+	///shape to be centered at the center of mass and to coincide with the principal axes. This also necessitates a correction of the world transform
+	///of the collision object by the principal transform. This method also computes the volume of the convex mesh.
+	void calculatePrincipalAxisTransform(btTransform & principal, btVector3 & inertia, btScalar & volume) const;
+};
+
+#endif  //BT_CONVEX_TRIANGLEMESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
new file mode 100644
index 0000000..66dbb8e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
@@ -0,0 +1,253 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btCylinderShape.h"
+
+btCylinderShape::btCylinderShape(const btVector3& halfExtents)
+	: btConvexInternalShape(),
+	  m_upAxis(1)
+{
+	btVector3 margin(getMargin(), getMargin(), getMargin());
+	m_implicitShapeDimensions = (halfExtents * m_localScaling) - margin;
+
+	setSafeMargin(halfExtents);
+
+	m_shapeType = CYLINDER_SHAPE_PROXYTYPE;
+}
+
+btCylinderShapeX::btCylinderShapeX(const btVector3& halfExtents)
+	: btCylinderShape(halfExtents)
+{
+	m_upAxis = 0;
+}
+
+btCylinderShapeZ::btCylinderShapeZ(const btVector3& halfExtents)
+	: btCylinderShape(halfExtents)
+{
+	m_upAxis = 2;
+}
+
+void btCylinderShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btTransformAabb(getHalfExtentsWithoutMargin(), getMargin(), t, aabbMin, aabbMax);
+}
+
+void btCylinderShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+//Until Bullet 2.77 a box approximation was used, so uncomment this if you need backwards compatibility
+//#define USE_BOX_INERTIA_APPROXIMATION 1
+#ifndef USE_BOX_INERTIA_APPROXIMATION
+
+	/*
+	cylinder is defined as following:
+	*
+	* - principle axis aligned along y by default, radius in x, z-value not used
+	* - for btCylinderShapeX: principle axis aligned along x, radius in y direction, z-value not used
+	* - for btCylinderShapeZ: principle axis aligned along z, radius in x direction, y-value not used
+	*
+	*/
+
+	btScalar radius2;                                    // square of cylinder radius
+	btScalar height2;                                    // square of cylinder height
+	btVector3 halfExtents = getHalfExtentsWithMargin();  // get cylinder dimension
+	btScalar div12 = mass / 12.f;
+	btScalar div4 = mass / 4.f;
+	btScalar div2 = mass / 2.f;
+	int idxRadius, idxHeight;
+
+	switch (m_upAxis)  // get indices of radius and height of cylinder
+	{
+		case 0:  // cylinder is aligned along x
+			idxRadius = 1;
+			idxHeight = 0;
+			break;
+		case 2:  // cylinder is aligned along z
+			idxRadius = 0;
+			idxHeight = 2;
+			break;
+		default:  // cylinder is aligned along y
+			idxRadius = 0;
+			idxHeight = 1;
+	}
+
+	// calculate squares
+	radius2 = halfExtents[idxRadius] * halfExtents[idxRadius];
+	height2 = btScalar(4.) * halfExtents[idxHeight] * halfExtents[idxHeight];
+
+	// calculate tensor terms
+	btScalar t1 = div12 * height2 + div4 * radius2;
+	btScalar t2 = div2 * radius2;
+
+	switch (m_upAxis)  // set diagonal elements of inertia tensor
+	{
+		case 0:  // cylinder is aligned along x
+			inertia.setValue(t2, t1, t1);
+			break;
+		case 2:  // cylinder is aligned along z
+			inertia.setValue(t1, t1, t2);
+			break;
+		default:  // cylinder is aligned along y
+			inertia.setValue(t1, t2, t1);
+	}
+#else   //USE_BOX_INERTIA_APPROXIMATION
+	//approximation of box shape
+	btVector3 halfExtents = getHalfExtentsWithMargin();
+
+	btScalar lx = btScalar(2.) * (halfExtents.x());
+	btScalar ly = btScalar(2.) * (halfExtents.y());
+	btScalar lz = btScalar(2.) * (halfExtents.z());
+
+	inertia.setValue(mass / (btScalar(12.0)) * (ly * ly + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + ly * ly));
+#endif  //USE_BOX_INERTIA_APPROXIMATION
+}
+
+SIMD_FORCE_INLINE btVector3 CylinderLocalSupportX(const btVector3& halfExtents, const btVector3& v)
+{
+	const int cylinderUpAxis = 0;
+	const int XX = 1;
+	const int YY = 0;
+	const int ZZ = 2;
+
+	//mapping depends on how cylinder local orientation is
+	// extents of the cylinder is: X,Y is for radius, and Z for height
+
+	btScalar radius = halfExtents[XX];
+	btScalar halfHeight = halfExtents[cylinderUpAxis];
+
+	btVector3 tmp;
+	btScalar d;
+
+	btScalar s = btSqrt(v[XX] * v[XX] + v[ZZ] * v[ZZ]);
+	if (s != btScalar(0.0))
+	{
+		d = radius / s;
+		tmp[XX] = v[XX] * d;
+		tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+		tmp[ZZ] = v[ZZ] * d;
+		return tmp;
+	}
+	else
+	{
+		tmp[XX] = radius;
+		tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+		tmp[ZZ] = btScalar(0.0);
+		return tmp;
+	}
+}
+
+inline btVector3 CylinderLocalSupportY(const btVector3& halfExtents, const btVector3& v)
+{
+	const int cylinderUpAxis = 1;
+	const int XX = 0;
+	const int YY = 1;
+	const int ZZ = 2;
+
+	btScalar radius = halfExtents[XX];
+	btScalar halfHeight = halfExtents[cylinderUpAxis];
+
+	btVector3 tmp;
+	btScalar d;
+
+	btScalar s = btSqrt(v[XX] * v[XX] + v[ZZ] * v[ZZ]);
+	if (s != btScalar(0.0))
+	{
+		d = radius / s;
+		tmp[XX] = v[XX] * d;
+		tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+		tmp[ZZ] = v[ZZ] * d;
+		return tmp;
+	}
+	else
+	{
+		tmp[XX] = radius;
+		tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+		tmp[ZZ] = btScalar(0.0);
+		return tmp;
+	}
+}
+
+inline btVector3 CylinderLocalSupportZ(const btVector3& halfExtents, const btVector3& v)
+{
+	const int cylinderUpAxis = 2;
+	const int XX = 0;
+	const int YY = 2;
+	const int ZZ = 1;
+
+	//mapping depends on how cylinder local orientation is
+	// extents of the cylinder is: X,Y is for radius, and Z for height
+
+	btScalar radius = halfExtents[XX];
+	btScalar halfHeight = halfExtents[cylinderUpAxis];
+
+	btVector3 tmp;
+	btScalar d;
+
+	btScalar s = btSqrt(v[XX] * v[XX] + v[ZZ] * v[ZZ]);
+	if (s != btScalar(0.0))
+	{
+		d = radius / s;
+		tmp[XX] = v[XX] * d;
+		tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+		tmp[ZZ] = v[ZZ] * d;
+		return tmp;
+	}
+	else
+	{
+		tmp[XX] = radius;
+		tmp[YY] = v[YY] < 0.0 ? -halfHeight : halfHeight;
+		tmp[ZZ] = btScalar(0.0);
+		return tmp;
+	}
+}
+
+btVector3 btCylinderShapeX::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	return CylinderLocalSupportX(getHalfExtentsWithoutMargin(), vec);
+}
+
+btVector3 btCylinderShapeZ::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	return CylinderLocalSupportZ(getHalfExtentsWithoutMargin(), vec);
+}
+btVector3 btCylinderShape::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	return CylinderLocalSupportY(getHalfExtentsWithoutMargin(), vec);
+}
+
+void btCylinderShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	for (int i = 0; i < numVectors; i++)
+	{
+		supportVerticesOut[i] = CylinderLocalSupportY(getHalfExtentsWithoutMargin(), vectors[i]);
+	}
+}
+
+void btCylinderShapeZ::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	for (int i = 0; i < numVectors; i++)
+	{
+		supportVerticesOut[i] = CylinderLocalSupportZ(getHalfExtentsWithoutMargin(), vectors[i]);
+	}
+}
+
+void btCylinderShapeX::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	for (int i = 0; i < numVectors; i++)
+	{
+		supportVerticesOut[i] = CylinderLocalSupportX(getHalfExtentsWithoutMargin(), vectors[i]);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.h
new file mode 100644
index 0000000..d3f6450
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btCylinderShape.h
@@ -0,0 +1,206 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CYLINDER_MINKOWSKI_H
+#define BT_CYLINDER_MINKOWSKI_H
+
+#include "btBoxShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+#include "LinearMath/btVector3.h"
+
+/// The btCylinderShape class implements a cylinder shape primitive, centered around the origin. Its central axis aligned with the Y axis. btCylinderShapeX is aligned with the X axis and btCylinderShapeZ around the Z axis.
+ATTRIBUTE_ALIGNED16(class)
+btCylinderShape : public btConvexInternalShape
+
+{
+protected:
+	int m_upAxis;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btVector3 getHalfExtentsWithMargin() const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 margin(getMargin(), getMargin(), getMargin());
+		halfExtents += margin;
+		return halfExtents;
+	}
+
+	const btVector3& getHalfExtentsWithoutMargin() const
+	{
+		return m_implicitShapeDimensions;  //changed in Bullet 2.63: assume the scaling and margin are included
+	}
+
+	btCylinderShape(const btVector3& halfExtents);
+
+	void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void setMargin(btScalar collisionMargin)
+	{
+		//correct the m_implicitShapeDimensions for the margin
+		btVector3 oldMargin(getMargin(), getMargin(), getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions + oldMargin;
+
+		btConvexInternalShape::setMargin(collisionMargin);
+		btVector3 newMargin(getMargin(), getMargin(), getMargin());
+		m_implicitShapeDimensions = implicitShapeDimensionsWithMargin - newMargin;
+	}
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const
+	{
+		btVector3 supVertex;
+		supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+		if (getMargin() != btScalar(0.))
+		{
+			btVector3 vecnorm = vec;
+			if (vecnorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+			{
+				vecnorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+			}
+			vecnorm.normalize();
+			supVertex += getMargin() * vecnorm;
+		}
+		return supVertex;
+	}
+
+	//use box inertia
+	//	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+
+	int getUpAxis() const
+	{
+		return m_upAxis;
+	}
+
+	virtual btVector3 getAnisotropicRollingFrictionDirection() const
+	{
+		btVector3 aniDir(0, 0, 0);
+		aniDir[getUpAxis()] = 1;
+		return aniDir;
+	}
+
+	virtual btScalar getRadius() const
+	{
+		return getHalfExtentsWithMargin().getX();
+	}
+
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		btVector3 oldMargin(getMargin(), getMargin(), getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions + oldMargin;
+		btVector3 unScaledImplicitShapeDimensionsWithMargin = implicitShapeDimensionsWithMargin / m_localScaling;
+
+		btConvexInternalShape::setLocalScaling(scaling);
+
+		m_implicitShapeDimensions = (unScaledImplicitShapeDimensionsWithMargin * m_localScaling) - oldMargin;
+	}
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "CylinderY";
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+class btCylinderShapeX : public btCylinderShape
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btCylinderShapeX(const btVector3& halfExtents);
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "CylinderX";
+	}
+
+	virtual btScalar getRadius() const
+	{
+		return getHalfExtentsWithMargin().getY();
+	}
+};
+
+class btCylinderShapeZ : public btCylinderShape
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btCylinderShapeZ(const btVector3& halfExtents);
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	//debugging
+	virtual const char* getName() const
+	{
+		return "CylinderZ";
+	}
+
+	virtual btScalar getRadius() const
+	{
+		return getHalfExtentsWithMargin().getX();
+	}
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btCylinderShapeData
+{
+	btConvexInternalShapeData m_convexInternalShapeData;
+
+	int m_upAxis;
+
+	char m_padding[4];
+};
+
+SIMD_FORCE_INLINE int btCylinderShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btCylinderShapeData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btCylinderShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btCylinderShapeData* shapeData = (btCylinderShapeData*)dataBuffer;
+
+	btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData, serializer);
+
+	shapeData->m_upAxis = m_upAxis;
+
+	// Fill padding with zeros to appease msan.
+	shapeData->m_padding[0] = 0;
+	shapeData->m_padding[1] = 0;
+	shapeData->m_padding[2] = 0;
+	shapeData->m_padding[3] = 0;
+
+	return "btCylinderShapeData";
+}
+
+#endif  //BT_CYLINDER_MINKOWSKI_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
new file mode 100644
index 0000000..4699555
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
@@ -0,0 +1,42 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btEmptyShape.h"
+
+#include "btCollisionShape.h"
+
+btEmptyShape::btEmptyShape() : btConcaveShape()
+{
+	m_shapeType = EMPTY_SHAPE_PROXYTYPE;
+}
+
+btEmptyShape::~btEmptyShape()
+{
+}
+
+///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+void btEmptyShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btVector3 margin(getMargin(), getMargin(), getMargin());
+
+	aabbMin = t.getOrigin() - margin;
+
+	aabbMax = t.getOrigin() + margin;
+}
+
+void btEmptyShape::calculateLocalInertia(btScalar, btVector3&) const
+{
+	btAssert(0);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.h
new file mode 100644
index 0000000..d2e2117
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btEmptyShape.h
@@ -0,0 +1,65 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_EMPTY_SHAPE_H
+#define BT_EMPTY_SHAPE_H
+
+#include "btConcaveShape.h"
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "btCollisionMargin.h"
+
+/// The btEmptyShape is a collision shape without actual collision detection shape, so most users should ignore this class.
+/// It can be replaced by another shape during runtime, but the inertia tensor should be recomputed.
+ATTRIBUTE_ALIGNED16(class)
+btEmptyShape : public btConcaveShape
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btEmptyShape();
+
+	virtual ~btEmptyShape();
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		m_localScaling = scaling;
+	}
+	virtual const btVector3& getLocalScaling() const
+	{
+		return m_localScaling;
+	}
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual const char* getName() const
+	{
+		return "Empty";
+	}
+
+	virtual void processAllTriangles(btTriangleCallback*, const btVector3&, const btVector3&) const
+	{
+	}
+
+protected:
+	btVector3 m_localScaling;
+};
+
+#endif  //BT_EMPTY_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
new file mode 100644
index 0000000..5b1c23d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
@@ -0,0 +1,951 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btHeightfieldTerrainShape.h"
+
+#include "LinearMath/btTransformUtil.h"
+
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(
+	int heightStickWidth, int heightStickLength,
+	const float* heightfieldData, btScalar minHeight, btScalar maxHeight,
+	int upAxis, bool flipQuadEdges)
+	: m_userValue3(0), m_triangleInfoMap(0)
+{
+	initialize(heightStickWidth, heightStickLength, heightfieldData,
+			   /*heightScale=*/1, minHeight, maxHeight, upAxis, PHY_FLOAT,
+			   flipQuadEdges);
+}
+
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(
+	int heightStickWidth, int heightStickLength, const double* heightfieldData,
+	btScalar minHeight, btScalar maxHeight, int upAxis, bool flipQuadEdges)
+	: m_userValue3(0), m_triangleInfoMap(0)
+{
+	initialize(heightStickWidth, heightStickLength, heightfieldData,
+			   /*heightScale=*/1, minHeight, maxHeight, upAxis, PHY_DOUBLE,
+			   flipQuadEdges);
+}
+
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(
+	int heightStickWidth, int heightStickLength, const short* heightfieldData, btScalar heightScale,
+	btScalar minHeight, btScalar maxHeight, int upAxis, bool flipQuadEdges)
+	: m_userValue3(0), m_triangleInfoMap(0)
+{
+	initialize(heightStickWidth, heightStickLength, heightfieldData,
+			   heightScale, minHeight, maxHeight, upAxis, PHY_SHORT,
+			   flipQuadEdges);
+}
+
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(
+	int heightStickWidth, int heightStickLength, const unsigned char* heightfieldData, btScalar heightScale,
+	btScalar minHeight, btScalar maxHeight, int upAxis, bool flipQuadEdges)
+	: m_userValue3(0), m_triangleInfoMap(0)
+{
+	initialize(heightStickWidth, heightStickLength, heightfieldData,
+			   heightScale, minHeight, maxHeight, upAxis, PHY_UCHAR,
+			   flipQuadEdges);
+}
+
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(
+	int heightStickWidth, int heightStickLength, const void* heightfieldData,
+	btScalar heightScale, btScalar minHeight, btScalar maxHeight, int upAxis,
+	PHY_ScalarType hdt, bool flipQuadEdges)
+	:m_userValue3(0),
+	m_triangleInfoMap(0)
+{
+	// legacy constructor: Assumes PHY_FLOAT means btScalar.
+#ifdef BT_USE_DOUBLE_PRECISION
+	if (hdt == PHY_FLOAT) hdt = PHY_DOUBLE;
+#endif
+	initialize(heightStickWidth, heightStickLength, heightfieldData,
+			   heightScale, minHeight, maxHeight, upAxis, hdt,
+			   flipQuadEdges);
+}
+
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength, const void* heightfieldData, btScalar maxHeight, int upAxis, bool useFloatData, bool flipQuadEdges)
+	:	m_userValue3(0),
+	m_triangleInfoMap(0)
+{
+	// legacy constructor: support only btScalar or unsigned char data,
+	// and min height is zero.
+	PHY_ScalarType hdt = (useFloatData) ? PHY_FLOAT : PHY_UCHAR;
+#ifdef BT_USE_DOUBLE_PRECISION
+	if (hdt == PHY_FLOAT) hdt = PHY_DOUBLE;
+#endif
+	btScalar minHeight = 0.0f;
+
+	// previously, height = uchar * maxHeight / 65535.
+	// So to preserve legacy behavior, heightScale = maxHeight / 65535
+	btScalar heightScale = maxHeight / 65535;
+
+	initialize(heightStickWidth, heightStickLength, heightfieldData,
+			   heightScale, minHeight, maxHeight, upAxis, hdt,
+			   flipQuadEdges);
+}
+
+void btHeightfieldTerrainShape::initialize(
+	int heightStickWidth, int heightStickLength, const void* heightfieldData,
+	btScalar heightScale, btScalar minHeight, btScalar maxHeight, int upAxis,
+	PHY_ScalarType hdt, bool flipQuadEdges)
+{
+	// validation
+	btAssert(heightStickWidth > 1);   // && "bad width");
+	btAssert(heightStickLength > 1);  // && "bad length");
+	btAssert(heightfieldData);        // && "null heightfield data");
+	// btAssert(heightScale) -- do we care?  Trust caller here
+	btAssert(minHeight <= maxHeight);                                    // && "bad min/max height");
+	btAssert(upAxis >= 0 && upAxis < 3);                                 // && "bad upAxis--should be in range [0,2]");
+	btAssert(hdt != PHY_UCHAR || hdt != PHY_FLOAT || hdt != PHY_DOUBLE || hdt != PHY_SHORT);  // && "Bad height data type enum");
+
+	// initialize member variables
+	m_shapeType = TERRAIN_SHAPE_PROXYTYPE;
+	m_heightStickWidth = heightStickWidth;
+	m_heightStickLength = heightStickLength;
+	m_minHeight = minHeight;
+	m_maxHeight = maxHeight;
+	m_width = (btScalar)(heightStickWidth - 1);
+	m_length = (btScalar)(heightStickLength - 1);
+	m_heightScale = heightScale;
+	m_heightfieldDataUnknown = heightfieldData;
+	m_heightDataType = hdt;
+	m_flipQuadEdges = flipQuadEdges;
+	m_useDiamondSubdivision = false;
+	m_useZigzagSubdivision = false;
+	m_flipTriangleWinding = false;
+	m_upAxis = upAxis;
+	m_localScaling.setValue(btScalar(1.), btScalar(1.), btScalar(1.));
+	
+	m_vboundsChunkSize = 0;
+	m_vboundsGridWidth = 0;
+	m_vboundsGridLength = 0;
+
+	// determine min/max axis-aligned bounding box (aabb) values
+	switch (m_upAxis)
+	{
+		case 0:
+		{
+			m_localAabbMin.setValue(m_minHeight, 0, 0);
+			m_localAabbMax.setValue(m_maxHeight, m_width, m_length);
+			break;
+		}
+		case 1:
+		{
+			m_localAabbMin.setValue(0, m_minHeight, 0);
+			m_localAabbMax.setValue(m_width, m_maxHeight, m_length);
+			break;
+		};
+		case 2:
+		{
+			m_localAabbMin.setValue(0, 0, m_minHeight);
+			m_localAabbMax.setValue(m_width, m_length, m_maxHeight);
+			break;
+		}
+		default:
+		{
+			//need to get valid m_upAxis
+			btAssert(0);  // && "Bad m_upAxis");
+		}
+	}
+
+	// remember origin (defined as exact middle of aabb)
+	m_localOrigin = btScalar(0.5) * (m_localAabbMin + m_localAabbMax);
+}
+
+btHeightfieldTerrainShape::~btHeightfieldTerrainShape()
+{
+	clearAccelerator();
+}
+
+void btHeightfieldTerrainShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btVector3 halfExtents = (m_localAabbMax - m_localAabbMin) * m_localScaling * btScalar(0.5);
+
+	btVector3 localOrigin(0, 0, 0);
+	localOrigin[m_upAxis] = (m_minHeight + m_maxHeight) * btScalar(0.5);
+	localOrigin *= m_localScaling;
+
+	btMatrix3x3 abs_b = t.getBasis().absolute();
+	btVector3 center = t.getOrigin();
+	btVector3 extent = halfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	extent += btVector3(getMargin(), getMargin(), getMargin());
+
+	aabbMin = center - extent;
+	aabbMax = center + extent;
+}
+
+/// This returns the "raw" (user's initial) height, not the actual height.
+/// The actual height needs to be adjusted to be relative to the center
+///   of the heightfield's AABB.
+btScalar
+btHeightfieldTerrainShape::getRawHeightFieldValue(int x, int y) const
+{
+	btScalar val = 0.f;
+	switch (m_heightDataType)
+	{
+		case PHY_FLOAT:
+		{
+			val = m_heightfieldDataFloat[(y * m_heightStickWidth) + x];
+			break;
+		}
+
+		case PHY_DOUBLE:
+		{
+			val = m_heightfieldDataDouble[(y * m_heightStickWidth) + x];
+			break;
+		}
+
+		case PHY_UCHAR:
+		{
+			unsigned char heightFieldValue = m_heightfieldDataUnsignedChar[(y * m_heightStickWidth) + x];
+			val = heightFieldValue * m_heightScale;
+			break;
+		}
+
+		case PHY_SHORT:
+		{
+			short hfValue = m_heightfieldDataShort[(y * m_heightStickWidth) + x];
+			val = hfValue * m_heightScale;
+			break;
+		}
+
+		default:
+		{
+			btAssert(!"Bad m_heightDataType");
+		}
+	}
+
+	return val;
+}
+
+/// this returns the vertex in bullet-local coordinates
+void btHeightfieldTerrainShape::getVertex(int x, int y, btVector3& vertex) const
+{
+	btAssert(x >= 0);
+	btAssert(y >= 0);
+	btAssert(x < m_heightStickWidth);
+	btAssert(y < m_heightStickLength);
+
+	btScalar height = getRawHeightFieldValue(x, y);
+
+	switch (m_upAxis)
+	{
+		case 0:
+		{
+			vertex.setValue(
+				height - m_localOrigin.getX(),
+				(-m_width / btScalar(2.0)) + x,
+				(-m_length / btScalar(2.0)) + y);
+			break;
+		}
+		case 1:
+		{
+			vertex.setValue(
+				(-m_width / btScalar(2.0)) + x,
+				height - m_localOrigin.getY(),
+				(-m_length / btScalar(2.0)) + y);
+			break;
+		};
+		case 2:
+		{
+			vertex.setValue(
+				(-m_width / btScalar(2.0)) + x,
+				(-m_length / btScalar(2.0)) + y,
+				height - m_localOrigin.getZ());
+			break;
+		}
+		default:
+		{
+			//need to get valid m_upAxis
+			btAssert(0);
+		}
+	}
+
+	vertex *= m_localScaling;
+}
+
+static inline int
+getQuantized(
+	btScalar x)
+{
+	if (x < 0.0)
+	{
+		return (int)(x - 0.5);
+	}
+	return (int)(x + 0.5);
+}
+
+// Equivalent to std::minmax({a, b, c}).
+// Performs at most 3 comparisons.
+static btHeightfieldTerrainShape::Range minmaxRange(btScalar a, btScalar b, btScalar c)
+{
+	if (a > b)
+	{
+		if (b > c)
+			return btHeightfieldTerrainShape::Range(c, a);
+		else if (a > c)
+			return btHeightfieldTerrainShape::Range(b, a);
+		else
+			return btHeightfieldTerrainShape::Range(b, c);
+	}
+	else
+	{
+		if (a > c)
+			return btHeightfieldTerrainShape::Range(c, b);
+		else if (b > c)
+			return btHeightfieldTerrainShape::Range(a, b);
+		else
+			return btHeightfieldTerrainShape::Range(a, c);
+	}
+}
+
+/// given input vector, return quantized version
+/**
+  This routine is basically determining the gridpoint indices for a given
+  input vector, answering the question: "which gridpoint is closest to the
+  provided point?".
+
+  "with clamp" means that we restrict the point to be in the heightfield's
+  axis-aligned bounding box.
+ */
+void btHeightfieldTerrainShape::quantizeWithClamp(int* out, const btVector3& point, int /*isMax*/) const
+{
+	btVector3 clampedPoint(point);
+	clampedPoint.setMax(m_localAabbMin);
+	clampedPoint.setMin(m_localAabbMax);
+
+	out[0] = getQuantized(clampedPoint.getX());
+	out[1] = getQuantized(clampedPoint.getY());
+	out[2] = getQuantized(clampedPoint.getZ());
+}
+
+/// process all triangles within the provided axis-aligned bounding box
+/**
+  basic algorithm:
+    - convert input aabb to local coordinates (scale down and shift for local origin)
+    - convert input aabb to a range of heightfield grid points (quantize)
+    - iterate over all triangles in that subset of the grid
+ */
+void btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	// scale down the input aabb's so they are in local (non-scaled) coordinates
+	btVector3 localAabbMin = aabbMin * btVector3(1.f / m_localScaling[0], 1.f / m_localScaling[1], 1.f / m_localScaling[2]);
+	btVector3 localAabbMax = aabbMax * btVector3(1.f / m_localScaling[0], 1.f / m_localScaling[1], 1.f / m_localScaling[2]);
+
+	// account for local origin
+	localAabbMin += m_localOrigin;
+	localAabbMax += m_localOrigin;
+
+	//quantize the aabbMin and aabbMax, and adjust the start/end ranges
+	int quantizedAabbMin[3];
+	int quantizedAabbMax[3];
+	quantizeWithClamp(quantizedAabbMin, localAabbMin, 0);
+	quantizeWithClamp(quantizedAabbMax, localAabbMax, 1);
+
+	// expand the min/max quantized values
+	// this is to catch the case where the input aabb falls between grid points!
+	for (int i = 0; i < 3; ++i)
+	{
+		quantizedAabbMin[i]--;
+		quantizedAabbMax[i]++;
+	}
+
+	int startX = 0;
+	int endX = m_heightStickWidth - 1;
+	int startJ = 0;
+	int endJ = m_heightStickLength - 1;
+
+	switch (m_upAxis)
+	{
+		case 0:
+		{
+			if (quantizedAabbMin[1] > startX)
+				startX = quantizedAabbMin[1];
+			if (quantizedAabbMax[1] < endX)
+				endX = quantizedAabbMax[1];
+			if (quantizedAabbMin[2] > startJ)
+				startJ = quantizedAabbMin[2];
+			if (quantizedAabbMax[2] < endJ)
+				endJ = quantizedAabbMax[2];
+			break;
+		}
+		case 1:
+		{
+			if (quantizedAabbMin[0] > startX)
+				startX = quantizedAabbMin[0];
+			if (quantizedAabbMax[0] < endX)
+				endX = quantizedAabbMax[0];
+			if (quantizedAabbMin[2] > startJ)
+				startJ = quantizedAabbMin[2];
+			if (quantizedAabbMax[2] < endJ)
+				endJ = quantizedAabbMax[2];
+			break;
+		};
+		case 2:
+		{
+			if (quantizedAabbMin[0] > startX)
+				startX = quantizedAabbMin[0];
+			if (quantizedAabbMax[0] < endX)
+				endX = quantizedAabbMax[0];
+			if (quantizedAabbMin[1] > startJ)
+				startJ = quantizedAabbMin[1];
+			if (quantizedAabbMax[1] < endJ)
+				endJ = quantizedAabbMax[1];
+			break;
+		}
+		default:
+		{
+			//need to get valid m_upAxis
+			btAssert(0);
+		}
+	}
+
+	// TODO If m_vboundsGrid is available, use it to determine if we really need to process this area
+	
+	const Range aabbUpRange(aabbMin[m_upAxis], aabbMax[m_upAxis]);
+	for (int j = startJ; j < endJ; j++)
+	{
+		for (int x = startX; x < endX; x++)
+		{
+			btVector3 vertices[3];
+			int indices[3] = { 0, 1, 2 };
+			if (m_flipTriangleWinding)
+			{
+				indices[0] = 2;
+				indices[2] = 0;
+			}
+
+			if (m_flipQuadEdges || (m_useDiamondSubdivision && !((j + x) & 1)) || (m_useZigzagSubdivision && !(j & 1)))
+			{
+				getVertex(x, j, vertices[indices[0]]);
+				getVertex(x, j + 1, vertices[indices[1]]);
+				getVertex(x + 1, j + 1, vertices[indices[2]]);
+
+				// Skip triangle processing if the triangle is out-of-AABB.
+				Range upRange = minmaxRange(vertices[0][m_upAxis], vertices[1][m_upAxis], vertices[2][m_upAxis]);
+
+				if (upRange.overlaps(aabbUpRange))
+					callback->processTriangle(vertices, 2 * x, j);
+			
+				// already set: getVertex(x, j, vertices[indices[0]])
+
+				// equivalent to: getVertex(x + 1, j + 1, vertices[indices[1]]);
+				vertices[indices[1]] = vertices[indices[2]];
+
+				getVertex(x + 1, j, vertices[indices[2]]);
+				upRange.min = btMin(upRange.min, vertices[indices[2]][m_upAxis]);
+				upRange.max = btMax(upRange.max, vertices[indices[2]][m_upAxis]);
+
+				if (upRange.overlaps(aabbUpRange))
+					callback->processTriangle(vertices, 2 * x + 1, j);
+			}
+			else
+			{
+				getVertex(x, j, vertices[indices[0]]);
+				getVertex(x, j + 1, vertices[indices[1]]);
+				getVertex(x + 1, j, vertices[indices[2]]);
+
+				// Skip triangle processing if the triangle is out-of-AABB.
+				Range upRange = minmaxRange(vertices[0][m_upAxis], vertices[1][m_upAxis], vertices[2][m_upAxis]);
+
+				if (upRange.overlaps(aabbUpRange))
+					callback->processTriangle(vertices, 2 * x, j);
+
+				// already set: getVertex(x, j + 1, vertices[indices[1]]);
+
+				// equivalent to: getVertex(x + 1, j, vertices[indices[0]]);
+				vertices[indices[0]] = vertices[indices[2]];
+
+				getVertex(x + 1, j + 1, vertices[indices[2]]);
+				upRange.min = btMin(upRange.min, vertices[indices[2]][m_upAxis]);
+				upRange.max = btMax(upRange.max, vertices[indices[2]][m_upAxis]);
+
+				if (upRange.overlaps(aabbUpRange))
+					callback->processTriangle(vertices, 2 * x + 1, j);
+			}
+		}
+	}
+}
+
+void btHeightfieldTerrainShape::calculateLocalInertia(btScalar, btVector3& inertia) const
+{
+	//moving concave objects not supported
+
+	inertia.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+}
+
+void btHeightfieldTerrainShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling;
+}
+const btVector3& btHeightfieldTerrainShape::getLocalScaling() const
+{
+	return m_localScaling;
+}
+
+namespace
+{
+	struct GridRaycastState
+	{
+		int x;  // Next quad coords
+		int z;
+		int prev_x;  // Previous quad coords
+		int prev_z;
+		btScalar param;      // Exit param for previous quad
+		btScalar prevParam;  // Enter param for previous quad
+		btScalar maxDistanceFlat;
+		btScalar maxDistance3d;
+	};
+}
+
+// TODO Does it really need to take 3D vectors?
+/// Iterates through a virtual 2D grid of unit-sized square cells,
+/// and executes an action on each cell intersecting the given segment, ordered from begin to end.
+/// Initially inspired by http://www.cse.yorku.ca/~amana/research/grid.pdf
+template <typename Action_T>
+void gridRaycast(Action_T& quadAction, const btVector3& beginPos, const btVector3& endPos, int indices[3])
+{
+	GridRaycastState rs;
+	rs.maxDistance3d = beginPos.distance(endPos);
+	if (rs.maxDistance3d < 0.0001)
+	{
+		// Consider the ray is too small to hit anything
+		return;
+	}
+	
+
+	btScalar rayDirectionFlatX = endPos[indices[0]] - beginPos[indices[0]];
+	btScalar rayDirectionFlatZ = endPos[indices[2]] - beginPos[indices[2]];
+	rs.maxDistanceFlat = btSqrt(rayDirectionFlatX * rayDirectionFlatX + rayDirectionFlatZ * rayDirectionFlatZ);
+
+	if (rs.maxDistanceFlat < 0.0001)
+	{
+		// Consider the ray vertical
+		rayDirectionFlatX = 0;
+		rayDirectionFlatZ = 0;
+	}
+	else
+	{
+		rayDirectionFlatX /= rs.maxDistanceFlat;
+		rayDirectionFlatZ /= rs.maxDistanceFlat;
+	}
+
+	const int xiStep = rayDirectionFlatX > 0 ? 1 : rayDirectionFlatX < 0 ? -1 : 0;
+	const int ziStep = rayDirectionFlatZ > 0 ? 1 : rayDirectionFlatZ < 0 ? -1 : 0;
+
+	const float infinite = 9999999;
+	const btScalar paramDeltaX = xiStep != 0 ? 1.f / btFabs(rayDirectionFlatX) : infinite;
+	const btScalar paramDeltaZ = ziStep != 0 ? 1.f / btFabs(rayDirectionFlatZ) : infinite;
+
+	// pos = param * dir
+	btScalar paramCrossX;  // At which value of `param` we will cross a x-axis lane?
+	btScalar paramCrossZ;  // At which value of `param` we will cross a z-axis lane?
+
+	// paramCrossX and paramCrossZ are initialized as being the first cross
+	// X initialization
+	if (xiStep != 0)
+	{
+		if (xiStep == 1)
+		{
+			paramCrossX = (ceil(beginPos[indices[0]]) - beginPos[indices[0]]) * paramDeltaX;
+		}
+		else
+		{
+			paramCrossX = (beginPos[indices[0]] - floor(beginPos[indices[0]])) * paramDeltaX;
+		}
+	}
+	else
+	{
+		paramCrossX = infinite;  // Will never cross on X
+	}
+
+	// Z initialization
+	if (ziStep != 0)
+	{
+		if (ziStep == 1)
+		{
+			paramCrossZ = (ceil(beginPos[indices[2]]) - beginPos[indices[2]]) * paramDeltaZ;
+		}
+		else
+		{
+			paramCrossZ = (beginPos[indices[2]] - floor(beginPos[indices[2]])) * paramDeltaZ;
+		}
+	}
+	else
+	{
+		paramCrossZ = infinite;  // Will never cross on Z
+	}
+
+	rs.x = static_cast<int>(floor(beginPos[indices[0]]));
+	rs.z = static_cast<int>(floor(beginPos[indices[2]]));
+
+	// Workaround cases where the ray starts at an integer position
+	if (paramCrossX == 0.0)
+	{
+		paramCrossX += paramDeltaX;
+		// If going backwards, we should ignore the position we would get by the above flooring,
+		// because the ray is not heading in that direction
+		if (xiStep == -1)
+		{
+			rs.x -= 1;
+		}
+	}
+
+	if (paramCrossZ == 0.0)
+	{
+		paramCrossZ += paramDeltaZ;
+		if (ziStep == -1)
+			rs.z -= 1;
+	}
+
+	rs.prev_x = rs.x;
+	rs.prev_z = rs.z;
+	rs.param = 0;
+
+	while (true)
+	{
+		rs.prev_x = rs.x;
+		rs.prev_z = rs.z;
+		rs.prevParam = rs.param;
+
+		if (paramCrossX < paramCrossZ)
+		{
+			// X lane
+			rs.x += xiStep;
+			// Assign before advancing the param,
+			// to be in sync with the initialization step
+			rs.param = paramCrossX;
+			paramCrossX += paramDeltaX;
+		}
+		else
+		{
+			// Z lane
+			rs.z += ziStep;
+			rs.param = paramCrossZ;
+			paramCrossZ += paramDeltaZ;
+		}
+
+		if (rs.param > rs.maxDistanceFlat)
+		{
+			rs.param = rs.maxDistanceFlat;
+			quadAction(rs);
+			break;
+		}
+		else
+		{
+			quadAction(rs);
+		}
+	}
+}
+
+struct ProcessTrianglesAction
+{
+	const btHeightfieldTerrainShape* shape;
+	bool flipQuadEdges;
+	bool useDiamondSubdivision;
+	int width;
+	int length;
+	btTriangleCallback* callback;
+
+	void exec(int x, int z) const
+	{
+		if (x < 0 || z < 0 || x >= width || z >= length)
+		{
+			return;
+		}
+
+		btVector3 vertices[3];
+
+		// TODO Since this is for raycasts, we could greatly benefit from an early exit on the first hit
+
+		// Check quad
+		if (flipQuadEdges || (useDiamondSubdivision && (((z + x) & 1) > 0)))
+		{
+			// First triangle
+			shape->getVertex(x, z, vertices[0]);
+			shape->getVertex(x + 1, z, vertices[1]);
+			shape->getVertex(x + 1, z + 1, vertices[2]);
+			callback->processTriangle(vertices, x, z);
+
+			// Second triangle
+			shape->getVertex(x, z, vertices[0]);
+			shape->getVertex(x + 1, z + 1, vertices[1]);
+			shape->getVertex(x, z + 1, vertices[2]);
+			callback->processTriangle(vertices, x, z);
+		}
+		else
+		{
+			// First triangle
+			shape->getVertex(x, z, vertices[0]);
+			shape->getVertex(x, z + 1, vertices[1]);
+			shape->getVertex(x + 1, z, vertices[2]);
+			callback->processTriangle(vertices, x, z);
+
+			// Second triangle
+			shape->getVertex(x + 1, z, vertices[0]);
+			shape->getVertex(x, z + 1, vertices[1]);
+			shape->getVertex(x + 1, z + 1, vertices[2]);
+			callback->processTriangle(vertices, x, z);
+		}
+	}
+
+	void operator()(const GridRaycastState& bs) const
+	{
+		exec(bs.prev_x, bs.prev_z);
+	}
+};
+
+struct ProcessVBoundsAction
+{
+	const btAlignedObjectArray<btHeightfieldTerrainShape::Range>& vbounds;
+	int width;
+	int length;
+	int chunkSize;
+
+	btVector3 rayBegin;
+	btVector3 rayEnd;
+	btVector3 rayDir;
+
+	int* m_indices;
+	ProcessTrianglesAction processTriangles;
+
+	ProcessVBoundsAction(const btAlignedObjectArray<btHeightfieldTerrainShape::Range>& bnd, int* indices)
+		: vbounds(bnd),
+		m_indices(indices)
+	{
+	}
+	void operator()(const GridRaycastState& rs) const
+	{
+		int x = rs.prev_x;
+		int z = rs.prev_z;
+
+		if (x < 0 || z < 0 || x >= width || z >= length)
+		{
+			return;
+		}
+
+		const btHeightfieldTerrainShape::Range chunk = vbounds[x + z * width];
+
+		btVector3 enterPos;
+		btVector3 exitPos;
+
+		if (rs.maxDistanceFlat > 0.0001)
+		{
+			btScalar flatTo3d = chunkSize * rs.maxDistance3d / rs.maxDistanceFlat;
+			btScalar enterParam3d = rs.prevParam * flatTo3d;
+			btScalar exitParam3d = rs.param * flatTo3d;
+			enterPos = rayBegin + rayDir * enterParam3d;
+			exitPos = rayBegin + rayDir * exitParam3d;
+
+			// We did enter the flat projection of the AABB,
+			// but we have to check if we intersect it on the vertical axis
+			if (enterPos[1] > chunk.max && exitPos[m_indices[1]] > chunk.max)
+			{
+				return;
+			}
+			if (enterPos[1] < chunk.min && exitPos[m_indices[1]] < chunk.min)
+			{
+				return;
+			}
+		}
+		else
+		{
+			// Consider the ray vertical
+			// (though we shouldn't reach this often because there is an early check up-front)
+			enterPos = rayBegin;
+			exitPos = rayEnd;
+		}
+
+		gridRaycast(processTriangles, enterPos, exitPos, m_indices);
+		// Note: it could be possible to have more than one grid at different levels,
+		// to do this there would be a branch using a pointer to another ProcessVBoundsAction
+	}
+};
+
+// TODO How do I interrupt the ray when there is a hit? `callback` does not return any result
+/// Performs a raycast using a hierarchical Bresenham algorithm.
+/// Does not allocate any memory by itself.
+void btHeightfieldTerrainShape::performRaycast(btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget) const
+{
+	// Transform to cell-local
+	btVector3 beginPos = raySource / m_localScaling;
+	btVector3 endPos = rayTarget / m_localScaling;
+	beginPos += m_localOrigin;
+	endPos += m_localOrigin;
+
+	ProcessTrianglesAction processTriangles;
+	processTriangles.shape = this;
+	processTriangles.flipQuadEdges = m_flipQuadEdges;
+	processTriangles.useDiamondSubdivision = m_useDiamondSubdivision;
+	processTriangles.callback = callback;
+	processTriangles.width = m_heightStickWidth - 1;
+	processTriangles.length = m_heightStickLength - 1;
+
+	// TODO Transform vectors to account for m_upAxis
+	int indices[3] = { 0, 1, 2 };
+	if (m_upAxis == 2)
+	{
+		indices[1] = 2;
+		indices[2] = 1;
+	}
+	int iBeginX = static_cast<int>(floor(beginPos[indices[0]]));
+	int iBeginZ = static_cast<int>(floor(beginPos[indices[2]]));
+	int iEndX = static_cast<int>(floor(endPos[indices[0]]));
+	int iEndZ = static_cast<int>(floor(endPos[indices[2]]));
+
+	if (iBeginX == iEndX && iBeginZ == iEndZ)
+	{
+		// The ray will never cross quads within the plane,
+		// so directly process triangles within one quad
+		// (typically, vertical rays should end up here)
+		processTriangles.exec(iBeginX, iEndZ);
+		return;
+	}
+
+	
+
+	if (m_vboundsGrid.size()==0)
+	{
+		// Process all quads intersecting the flat projection of the ray
+		gridRaycast(processTriangles, beginPos, endPos, &indices[0]);
+	}
+	else
+	{
+		btVector3 rayDiff = endPos - beginPos;
+		btScalar flatDistance2 = rayDiff[indices[0]] * rayDiff[indices[0]] + rayDiff[indices[2]] * rayDiff[indices[2]];
+		if (flatDistance2 < m_vboundsChunkSize * m_vboundsChunkSize)
+		{
+			// Don't use chunks, the ray is too short in the plane
+			gridRaycast(processTriangles, beginPos, endPos, &indices[0]);
+			return;
+		}
+
+		ProcessVBoundsAction processVBounds(m_vboundsGrid, &indices[0]);
+		processVBounds.width = m_vboundsGridWidth;
+		processVBounds.length = m_vboundsGridLength;
+		processVBounds.rayBegin = beginPos;
+		processVBounds.rayEnd = endPos;
+		processVBounds.rayDir = rayDiff.normalized();
+		processVBounds.processTriangles = processTriangles;
+		processVBounds.chunkSize = m_vboundsChunkSize;
+		// The ray is long, run raycast on a higher-level grid
+		gridRaycast(processVBounds, beginPos / m_vboundsChunkSize, endPos / m_vboundsChunkSize, indices);
+	}
+}
+
+/// Builds a grid data structure storing the min and max heights of the terrain in chunks.
+/// if chunkSize is zero, that accelerator is removed.
+/// If you modify the heights, you need to rebuild this accelerator.
+void btHeightfieldTerrainShape::buildAccelerator(int chunkSize)
+{
+	if (chunkSize <= 0)
+	{
+		clearAccelerator();
+		return;
+	}
+
+	m_vboundsChunkSize = chunkSize;
+	int nChunksX = m_heightStickWidth / chunkSize;
+	int nChunksZ = m_heightStickLength / chunkSize;
+
+	if (m_heightStickWidth % chunkSize > 0)
+	{
+		++nChunksX;  // In case terrain size isn't dividable by chunk size
+	}
+	if (m_heightStickLength % chunkSize > 0)
+	{
+		++nChunksZ;
+	}
+
+	if (m_vboundsGridWidth != nChunksX || m_vboundsGridLength != nChunksZ)
+	{
+		clearAccelerator();
+		m_vboundsGridWidth = nChunksX;
+		m_vboundsGridLength = nChunksZ;
+	}
+
+	if (nChunksX == 0 || nChunksZ == 0)
+	{
+		return;
+	}
+
+	// This data structure is only reallocated if the required size changed
+	m_vboundsGrid.resize(nChunksX * nChunksZ);
+	
+	// Compute min and max height for all chunks
+	for (int cz = 0; cz < nChunksZ; ++cz)
+	{
+		int z0 = cz * chunkSize;
+
+		for (int cx = 0; cx < nChunksX; ++cx)
+		{
+			int x0 = cx * chunkSize;
+
+			Range r;
+
+			r.min = getRawHeightFieldValue(x0, z0);
+			r.max = r.min;
+
+			// Compute min and max height for this chunk.
+			// We have to include one extra cell to account for neighbors.
+			// Here is why:
+			// Say we have a flat terrain, and a plateau that fits a chunk perfectly.
+			//
+			//   Left        Right
+			// 0---0---0---1---1---1
+			// |   |   |   |   |   |
+			// 0---0---0---1---1---1
+			// |   |   |   |   |   |
+			// 0---0---0---1---1---1
+			//           x
+			//
+			// If the AABB for the Left chunk did not share vertices with the Right,
+			// then we would fail collision tests at x due to a gap.
+			//
+			for (int z = z0; z < z0 + chunkSize + 1; ++z)
+			{
+				if (z >= m_heightStickLength)
+				{
+					continue;
+				}
+
+				for (int x = x0; x < x0 + chunkSize + 1; ++x)
+				{
+					if (x >= m_heightStickWidth)
+					{
+						continue;
+					}
+
+					btScalar height = getRawHeightFieldValue(x, z);
+
+					if (height < r.min)
+					{
+						r.min = height;
+					}
+					else if (height > r.max)
+					{
+						r.max = height;
+					}
+				}
+			}
+
+			m_vboundsGrid[cx + cz * nChunksX] = r;
+		}
+	}
+}
+
+void btHeightfieldTerrainShape::clearAccelerator()
+{
+	m_vboundsGrid.clear();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
new file mode 100644
index 0000000..7e251fa
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
@@ -0,0 +1,250 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_HEIGHTFIELD_TERRAIN_SHAPE_H
+#define BT_HEIGHTFIELD_TERRAIN_SHAPE_H
+
+#include "btConcaveShape.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+///btHeightfieldTerrainShape simulates a 2D heightfield terrain
+/**
+  The caller is responsible for maintaining the heightfield array; this
+  class does not make a copy.
+
+  The heightfield can be dynamic so long as the min/max height values
+  capture the extremes (heights must always be in that range).
+
+  The local origin of the heightfield is assumed to be the exact
+  center (as determined by width and length and height, with each
+  axis multiplied by the localScaling).
+
+  \b NOTE: be careful with coordinates.  If you have a heightfield with a local
+  min height of -100m, and a max height of +500m, you may be tempted to place it
+  at the origin (0,0) and expect the heights in world coordinates to be
+  -100 to +500 meters.
+  Actually, the heights will be -300 to +300m, because bullet will re-center
+  the heightfield based on its AABB (which is determined by the min/max
+  heights).  So keep in mind that once you create a btHeightfieldTerrainShape
+  object, the heights will be adjusted relative to the center of the AABB.  This
+  is different to the behavior of many rendering engines, but is useful for
+  physics engines.
+
+  Most (but not all) rendering and heightfield libraries assume upAxis = 1
+  (that is, the y-axis is "up").  This class allows any of the 3 coordinates
+  to be "up".  Make sure your choice of axis is consistent with your rendering
+  system.
+
+  The heightfield heights are determined from the data type used for the
+  heightfieldData array.  
+
+   - unsigned char: height at a point is the uchar value at the
+       grid point, multipled by heightScale.  uchar isn't recommended
+       because of its inability to deal with negative values, and
+       low resolution (8-bit).
+
+   - short: height at a point is the short int value at that grid
+       point, multipled by heightScale.
+
+   - float or dobule: height at a point is the value at that grid point.
+
+  Whatever the caller specifies as minHeight and maxHeight will be honored.
+  The class will not inspect the heightfield to discover the actual minimum
+  or maximum heights.  These values are used to determine the heightfield's
+  axis-aligned bounding box, multiplied by localScaling.
+
+  For usage and testing see the TerrainDemo.
+ */
+ATTRIBUTE_ALIGNED16(class)
+btHeightfieldTerrainShape : public btConcaveShape
+{
+public:
+	struct Range
+	{
+		Range() {}
+		Range(btScalar min, btScalar max) : min(min), max(max) {}
+
+		bool overlaps(const Range& other) const
+		{
+			return !(min > other.max || max < other.min);
+		}
+
+		btScalar min;
+		btScalar max;
+	};
+
+protected:
+	btVector3 m_localAabbMin;
+	btVector3 m_localAabbMax;
+	btVector3 m_localOrigin;
+
+	///terrain data
+	int m_heightStickWidth;
+	int m_heightStickLength;
+	btScalar m_minHeight;
+	btScalar m_maxHeight;
+	btScalar m_width;
+	btScalar m_length;
+	btScalar m_heightScale;
+	union {
+		const unsigned char* m_heightfieldDataUnsignedChar;
+		const short* m_heightfieldDataShort;
+		const float* m_heightfieldDataFloat;
+		const double* m_heightfieldDataDouble;
+		const void* m_heightfieldDataUnknown;
+	};
+
+	PHY_ScalarType m_heightDataType;
+	bool m_flipQuadEdges;
+	bool m_useDiamondSubdivision;
+	bool m_useZigzagSubdivision;
+	bool m_flipTriangleWinding;
+	int m_upAxis;
+
+	btVector3 m_localScaling;
+
+	// Accelerator
+	btAlignedObjectArray<Range> m_vboundsGrid;
+	int m_vboundsGridWidth;
+	int m_vboundsGridLength;
+	int m_vboundsChunkSize;
+
+	
+	btScalar m_userValue3;
+
+	struct btTriangleInfoMap* m_triangleInfoMap;
+
+	virtual btScalar getRawHeightFieldValue(int x, int y) const;
+	void quantizeWithClamp(int* out, const btVector3& point, int isMax) const;
+
+	/// protected initialization
+	/**
+	  Handles the work of constructors so that public constructors can be
+	  backwards-compatible without a lot of copy/paste.
+	 */
+	void initialize(int heightStickWidth, int heightStickLength,
+					const void* heightfieldData, btScalar heightScale,
+					btScalar minHeight, btScalar maxHeight, int upAxis,
+					PHY_ScalarType heightDataType, bool flipQuadEdges);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	/// preferred constructors
+	btHeightfieldTerrainShape(
+		int heightStickWidth, int heightStickLength,
+		const float* heightfieldData, btScalar minHeight, btScalar maxHeight,
+		int upAxis, bool flipQuadEdges);
+	btHeightfieldTerrainShape(
+		int heightStickWidth, int heightStickLength,
+		const double* heightfieldData, btScalar minHeight, btScalar maxHeight,
+		int upAxis, bool flipQuadEdges);
+	btHeightfieldTerrainShape(
+		int heightStickWidth, int heightStickLength,
+		const short* heightfieldData, btScalar heightScale, btScalar minHeight, btScalar maxHeight,
+		int upAxis, bool flipQuadEdges);
+	btHeightfieldTerrainShape(
+		int heightStickWidth, int heightStickLength,
+		const unsigned char* heightfieldData, btScalar heightScale, btScalar minHeight, btScalar maxHeight,
+		int upAxis, bool flipQuadEdges);
+
+	/// legacy constructor
+	/**
+	  This constructor supports a range of heightfield
+	  data types, and allows for a non-zero minimum height value.
+	  heightScale is needed for any integer-based heightfield data types.
+
+	  This legacy constructor considers `PHY_FLOAT` to mean `btScalar`.
+	  With `BT_USE_DOUBLE_PRECISION`, it will expect `heightfieldData`
+	  to be double-precision.
+	 */
+	btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,
+							  const void* heightfieldData, btScalar heightScale,
+							  btScalar minHeight, btScalar maxHeight,
+							  int upAxis, PHY_ScalarType heightDataType,
+							  bool flipQuadEdges);
+
+	/// legacy constructor
+	/**
+	  The legacy constructor assumes the heightfield has a minimum height
+	  of zero.  Only unsigned char or btScalar data are supported.  For legacy
+	  compatibility reasons, heightScale is calculated as maxHeight / 65535 
+	  (and is only used when useFloatData = false).
+ 	 */
+	btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength, const void* heightfieldData, btScalar maxHeight, int upAxis, bool useFloatData, bool flipQuadEdges);
+
+	virtual ~btHeightfieldTerrainShape();
+
+	void setUseDiamondSubdivision(bool useDiamondSubdivision = true) { m_useDiamondSubdivision = useDiamondSubdivision; }
+
+	///could help compatibility with Ogre heightfields. See https://code.google.com/p/bullet/issues/detail?id=625
+	void setUseZigzagSubdivision(bool useZigzagSubdivision = true) { m_useZigzagSubdivision = useZigzagSubdivision; }
+
+	void setFlipTriangleWinding(bool flipTriangleWinding)
+	{
+		m_flipTriangleWinding = flipTriangleWinding;
+	}
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void processAllTriangles(btTriangleCallback * callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual void setLocalScaling(const btVector3& scaling);
+
+	virtual const btVector3& getLocalScaling() const;
+
+	void getVertex(int x, int y, btVector3& vertex) const;
+
+	void performRaycast(btTriangleCallback * callback, const btVector3& raySource, const btVector3& rayTarget) const;
+
+	void buildAccelerator(int chunkSize = 16);
+	void clearAccelerator();
+
+	int getUpAxis() const
+	{
+		return m_upAxis;
+	}
+	//debugging
+	virtual const char* getName() const { return "HEIGHTFIELD"; }
+
+	
+	void setUserValue3(btScalar value)
+	{
+		m_userValue3 = value;
+	}
+	btScalar getUserValue3() const
+	{
+		return m_userValue3;
+	}
+	const struct btTriangleInfoMap* getTriangleInfoMap() const
+	{
+		return m_triangleInfoMap;
+	}
+	struct btTriangleInfoMap* getTriangleInfoMap()
+	{
+		return m_triangleInfoMap;
+	}
+	void setTriangleInfoMap(btTriangleInfoMap* map)
+	{
+		m_triangleInfoMap = map;
+	}
+	const unsigned char* getHeightfieldRawData() const
+	{
+		return m_heightfieldDataUnsignedChar;
+	}
+};
+
+#endif  //BT_HEIGHTFIELD_TERRAIN_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMaterial.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMaterial.h
new file mode 100644
index 0000000..c9a436b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMaterial.h
@@ -0,0 +1,38 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// This file was created by Alex Silverman
+
+#ifndef BT_MATERIAL_H
+#define BT_MATERIAL_H
+
+// Material class to be used by btMultimaterialTriangleMeshShape to store triangle properties
+class btMaterial
+{
+	// public members so that materials can change due to world events
+public:
+	btScalar m_friction;
+	btScalar m_restitution;
+	int pad[2];
+
+	btMaterial() {}
+	btMaterial(btScalar fric, btScalar rest)
+	{
+		m_friction = fric;
+		m_restitution = rest;
+	}
+};
+
+#endif  // BT_MATERIAL_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.cpp
new file mode 100644
index 0000000..13c0a34
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.cpp
@@ -0,0 +1,522 @@
+#include "btMiniSDF.h"
+
+//
+//Based on code from DiscreGrid, https://github.com/InteractiveComputerGraphics/Discregrid
+//example:
+//GenerateSDF.exe -r "32 32 32" -d "-1.6 -1.6 -.6 1.6 1.6 .6" concave_box.obj
+//The MIT License (MIT)
+//
+//Copyright (c) 2017 Dan Koschier
+//
+
+#include <limits.h>
+#include <string.h>  //memcpy
+
+struct btSdfDataStream
+{
+	const char* m_data;
+	int m_size;
+
+	int m_currentOffset;
+
+	btSdfDataStream(const char* data, int size)
+		: m_data(data),
+		  m_size(size),
+		  m_currentOffset(0)
+	{
+	}
+
+	template <class T>
+	bool read(T& val)
+	{
+		int bytes = sizeof(T);
+		if (m_currentOffset + bytes <= m_size)
+		{
+			char* dest = (char*)&val;
+			memcpy(dest, &m_data[m_currentOffset], bytes);
+			m_currentOffset += bytes;
+			return true;
+		}
+		btAssert(0);
+		return false;
+	}
+};
+
+bool btMiniSDF::load(const char* data, int size)
+{
+	int fileSize = -1;
+
+	btSdfDataStream ds(data, size);
+	{
+		double buf[6];
+		ds.read(buf);
+		m_domain.m_min[0] = buf[0];
+		m_domain.m_min[1] = buf[1];
+		m_domain.m_min[2] = buf[2];
+		m_domain.m_min[3] = 0;
+		m_domain.m_max[0] = buf[3];
+		m_domain.m_max[1] = buf[4];
+		m_domain.m_max[2] = buf[5];
+		m_domain.m_max[3] = 0;
+	}
+	{
+		unsigned int buf2[3];
+		ds.read(buf2);
+		m_resolution[0] = buf2[0];
+		m_resolution[1] = buf2[1];
+		m_resolution[2] = buf2[2];
+	}
+	{
+		double buf[3];
+		ds.read(buf);
+		m_cell_size[0] = buf[0];
+		m_cell_size[1] = buf[1];
+		m_cell_size[2] = buf[2];
+	}
+	{
+		double buf[3];
+		ds.read(buf);
+		m_inv_cell_size[0] = buf[0];
+		m_inv_cell_size[1] = buf[1];
+		m_inv_cell_size[2] = buf[2];
+	}
+	{
+		unsigned long long int cells;
+		ds.read(cells);
+		m_n_cells = cells;
+	}
+	{
+		unsigned long long int fields;
+		ds.read(fields);
+		m_n_fields = fields;
+	}
+
+	unsigned long long int nodes0;
+	std::size_t n_nodes0;
+	ds.read(nodes0);
+	n_nodes0 = nodes0;
+	if (n_nodes0 > 1024 * 1024 * 1024)
+	{
+		return m_isValid;
+	}
+	m_nodes.resize(n_nodes0);
+	for (unsigned int i = 0; i < n_nodes0; i++)
+	{
+		unsigned long long int n_nodes1;
+		ds.read(n_nodes1);
+		btAlignedObjectArray<double>& nodes = m_nodes[i];
+		nodes.resize(n_nodes1);
+		for (int j = 0; j < nodes.size(); j++)
+		{
+			double& node = nodes[j];
+			ds.read(node);
+		}
+	}
+
+	unsigned long long int n_cells0;
+	ds.read(n_cells0);
+	m_cells.resize(n_cells0);
+	for (int i = 0; i < n_cells0; i++)
+	{
+		unsigned long long int n_cells1;
+		btAlignedObjectArray<btCell32>& cells = m_cells[i];
+		ds.read(n_cells1);
+		cells.resize(n_cells1);
+		for (int j = 0; j < n_cells1; j++)
+		{
+			btCell32& cell = cells[j];
+			ds.read(cell);
+		}
+	}
+
+	{
+		unsigned long long int n_cell_maps0;
+		ds.read(n_cell_maps0);
+
+		m_cell_map.resize(n_cell_maps0);
+		for (int i = 0; i < n_cell_maps0; i++)
+		{
+			unsigned long long int n_cell_maps1;
+			btAlignedObjectArray<unsigned int>& cell_maps = m_cell_map[i];
+			ds.read(n_cell_maps1);
+			cell_maps.resize(n_cell_maps1);
+			for (int j = 0; j < n_cell_maps1; j++)
+			{
+				unsigned int& cell_map = cell_maps[j];
+				ds.read(cell_map);
+			}
+		}
+	}
+
+	m_isValid = (ds.m_currentOffset == ds.m_size);
+	return m_isValid;
+}
+
+unsigned int btMiniSDF::multiToSingleIndex(btMultiIndex const& ijk) const
+{
+	return m_resolution[1] * m_resolution[0] * ijk.ijk[2] + m_resolution[0] * ijk.ijk[1] + ijk.ijk[0];
+}
+
+btAlignedBox3d
+btMiniSDF::subdomain(btMultiIndex const& ijk) const
+{
+	btAssert(m_isValid);
+	btVector3 tmp;
+	tmp.m_floats[0] = m_cell_size[0] * (double)ijk.ijk[0];
+	tmp.m_floats[1] = m_cell_size[1] * (double)ijk.ijk[1];
+	tmp.m_floats[2] = m_cell_size[2] * (double)ijk.ijk[2];
+
+	btVector3 origin = m_domain.min() + tmp;
+
+	btAlignedBox3d box = btAlignedBox3d(origin, origin + m_cell_size);
+	return box;
+}
+
+btMultiIndex
+btMiniSDF::singleToMultiIndex(unsigned int l) const
+{
+	btAssert(m_isValid);
+	unsigned int n01 = m_resolution[0] * m_resolution[1];
+	unsigned int k = l / n01;
+	unsigned int temp = l % n01;
+	unsigned int j = temp / m_resolution[0];
+	unsigned int i = temp % m_resolution[0];
+	btMultiIndex mi;
+	mi.ijk[0] = i;
+	mi.ijk[1] = j;
+	mi.ijk[2] = k;
+	return mi;
+}
+
+btAlignedBox3d
+btMiniSDF::subdomain(unsigned int l) const
+{
+	btAssert(m_isValid);
+	return subdomain(singleToMultiIndex(l));
+}
+
+btShapeMatrix
+btMiniSDF::shape_function_(btVector3 const& xi, btShapeGradients* gradient) const
+{
+	btAssert(m_isValid);
+	btShapeMatrix res;
+
+	btScalar x = xi[0];
+	btScalar y = xi[1];
+	btScalar z = xi[2];
+
+	btScalar x2 = x * x;
+	btScalar y2 = y * y;
+	btScalar z2 = z * z;
+
+	btScalar _1mx = 1.0 - x;
+	btScalar _1my = 1.0 - y;
+	btScalar _1mz = 1.0 - z;
+
+	btScalar _1px = 1.0 + x;
+	btScalar _1py = 1.0 + y;
+	btScalar _1pz = 1.0 + z;
+
+	btScalar _1m3x = 1.0 - 3.0 * x;
+	btScalar _1m3y = 1.0 - 3.0 * y;
+	btScalar _1m3z = 1.0 - 3.0 * z;
+
+	btScalar _1p3x = 1.0 + 3.0 * x;
+	btScalar _1p3y = 1.0 + 3.0 * y;
+	btScalar _1p3z = 1.0 + 3.0 * z;
+
+	btScalar _1mxt1my = _1mx * _1my;
+	btScalar _1mxt1py = _1mx * _1py;
+	btScalar _1pxt1my = _1px * _1my;
+	btScalar _1pxt1py = _1px * _1py;
+
+	btScalar _1mxt1mz = _1mx * _1mz;
+	btScalar _1mxt1pz = _1mx * _1pz;
+	btScalar _1pxt1mz = _1px * _1mz;
+	btScalar _1pxt1pz = _1px * _1pz;
+
+	btScalar _1myt1mz = _1my * _1mz;
+	btScalar _1myt1pz = _1my * _1pz;
+	btScalar _1pyt1mz = _1py * _1mz;
+	btScalar _1pyt1pz = _1py * _1pz;
+
+	btScalar _1mx2 = 1.0 - x2;
+	btScalar _1my2 = 1.0 - y2;
+	btScalar _1mz2 = 1.0 - z2;
+
+	// Corner nodes.
+	btScalar fac = 1.0 / 64.0 * (9.0 * (x2 + y2 + z2) - 19.0);
+	res[0] = fac * _1mxt1my * _1mz;
+	res[1] = fac * _1pxt1my * _1mz;
+	res[2] = fac * _1mxt1py * _1mz;
+	res[3] = fac * _1pxt1py * _1mz;
+	res[4] = fac * _1mxt1my * _1pz;
+	res[5] = fac * _1pxt1my * _1pz;
+	res[6] = fac * _1mxt1py * _1pz;
+	res[7] = fac * _1pxt1py * _1pz;
+
+	// Edge nodes.
+
+	fac = 9.0 / 64.0 * _1mx2;
+	btScalar fact1m3x = fac * _1m3x;
+	btScalar fact1p3x = fac * _1p3x;
+	res[8] = fact1m3x * _1myt1mz;
+	res[9] = fact1p3x * _1myt1mz;
+	res[10] = fact1m3x * _1myt1pz;
+	res[11] = fact1p3x * _1myt1pz;
+	res[12] = fact1m3x * _1pyt1mz;
+	res[13] = fact1p3x * _1pyt1mz;
+	res[14] = fact1m3x * _1pyt1pz;
+	res[15] = fact1p3x * _1pyt1pz;
+
+	fac = 9.0 / 64.0 * _1my2;
+	btScalar fact1m3y = fac * _1m3y;
+	btScalar fact1p3y = fac * _1p3y;
+	res[16] = fact1m3y * _1mxt1mz;
+	res[17] = fact1p3y * _1mxt1mz;
+	res[18] = fact1m3y * _1pxt1mz;
+	res[19] = fact1p3y * _1pxt1mz;
+	res[20] = fact1m3y * _1mxt1pz;
+	res[21] = fact1p3y * _1mxt1pz;
+	res[22] = fact1m3y * _1pxt1pz;
+	res[23] = fact1p3y * _1pxt1pz;
+
+	fac = 9.0 / 64.0 * _1mz2;
+	btScalar fact1m3z = fac * _1m3z;
+	btScalar fact1p3z = fac * _1p3z;
+	res[24] = fact1m3z * _1mxt1my;
+	res[25] = fact1p3z * _1mxt1my;
+	res[26] = fact1m3z * _1mxt1py;
+	res[27] = fact1p3z * _1mxt1py;
+	res[28] = fact1m3z * _1pxt1my;
+	res[29] = fact1p3z * _1pxt1my;
+	res[30] = fact1m3z * _1pxt1py;
+	res[31] = fact1p3z * _1pxt1py;
+
+	if (gradient)
+	{
+		btShapeGradients& dN = *gradient;
+
+		btScalar _9t3x2py2pz2m19 = 9.0 * (3.0 * x2 + y2 + z2) - 19.0;
+		btScalar _9tx2p3y2pz2m19 = 9.0 * (x2 + 3.0 * y2 + z2) - 19.0;
+		btScalar _9tx2py2p3z2m19 = 9.0 * (x2 + y2 + 3.0 * z2) - 19.0;
+		btScalar _18x = 18.0 * x;
+		btScalar _18y = 18.0 * y;
+		btScalar _18z = 18.0 * z;
+
+		btScalar _3m9x2 = 3.0 - 9.0 * x2;
+		btScalar _3m9y2 = 3.0 - 9.0 * y2;
+		btScalar _3m9z2 = 3.0 - 9.0 * z2;
+
+		btScalar _2x = 2.0 * x;
+		btScalar _2y = 2.0 * y;
+		btScalar _2z = 2.0 * z;
+
+		btScalar _18xm9t3x2py2pz2m19 = _18x - _9t3x2py2pz2m19;
+		btScalar _18xp9t3x2py2pz2m19 = _18x + _9t3x2py2pz2m19;
+		btScalar _18ym9tx2p3y2pz2m19 = _18y - _9tx2p3y2pz2m19;
+		btScalar _18yp9tx2p3y2pz2m19 = _18y + _9tx2p3y2pz2m19;
+		btScalar _18zm9tx2py2p3z2m19 = _18z - _9tx2py2p3z2m19;
+		btScalar _18zp9tx2py2p3z2m19 = _18z + _9tx2py2p3z2m19;
+
+		dN(0, 0) = _18xm9t3x2py2pz2m19 * _1myt1mz;
+		dN(0, 1) = _1mxt1mz * _18ym9tx2p3y2pz2m19;
+		dN(0, 2) = _1mxt1my * _18zm9tx2py2p3z2m19;
+		dN(1, 0) = _18xp9t3x2py2pz2m19 * _1myt1mz;
+		dN(1, 1) = _1pxt1mz * _18ym9tx2p3y2pz2m19;
+		dN(1, 2) = _1pxt1my * _18zm9tx2py2p3z2m19;
+		dN(2, 0) = _18xm9t3x2py2pz2m19 * _1pyt1mz;
+		dN(2, 1) = _1mxt1mz * _18yp9tx2p3y2pz2m19;
+		dN(2, 2) = _1mxt1py * _18zm9tx2py2p3z2m19;
+		dN(3, 0) = _18xp9t3x2py2pz2m19 * _1pyt1mz;
+		dN(3, 1) = _1pxt1mz * _18yp9tx2p3y2pz2m19;
+		dN(3, 2) = _1pxt1py * _18zm9tx2py2p3z2m19;
+		dN(4, 0) = _18xm9t3x2py2pz2m19 * _1myt1pz;
+		dN(4, 1) = _1mxt1pz * _18ym9tx2p3y2pz2m19;
+		dN(4, 2) = _1mxt1my * _18zp9tx2py2p3z2m19;
+		dN(5, 0) = _18xp9t3x2py2pz2m19 * _1myt1pz;
+		dN(5, 1) = _1pxt1pz * _18ym9tx2p3y2pz2m19;
+		dN(5, 2) = _1pxt1my * _18zp9tx2py2p3z2m19;
+		dN(6, 0) = _18xm9t3x2py2pz2m19 * _1pyt1pz;
+		dN(6, 1) = _1mxt1pz * _18yp9tx2p3y2pz2m19;
+		dN(6, 2) = _1mxt1py * _18zp9tx2py2p3z2m19;
+		dN(7, 0) = _18xp9t3x2py2pz2m19 * _1pyt1pz;
+		dN(7, 1) = _1pxt1pz * _18yp9tx2p3y2pz2m19;
+		dN(7, 2) = _1pxt1py * _18zp9tx2py2p3z2m19;
+
+		dN.topRowsDivide(8, 64.0);
+
+		btScalar _m3m9x2m2x = -_3m9x2 - _2x;
+		btScalar _p3m9x2m2x = _3m9x2 - _2x;
+		btScalar _1mx2t1m3x = _1mx2 * _1m3x;
+		btScalar _1mx2t1p3x = _1mx2 * _1p3x;
+		dN(8, 0) = _m3m9x2m2x * _1myt1mz,
+			  dN(8, 1) = -_1mx2t1m3x * _1mz,
+			  dN(8, 2) = -_1mx2t1m3x * _1my;
+		dN(9, 0) = _p3m9x2m2x * _1myt1mz,
+			  dN(9, 1) = -_1mx2t1p3x * _1mz,
+			  dN(9, 2) = -_1mx2t1p3x * _1my;
+		dN(10, 0) = _m3m9x2m2x * _1myt1pz,
+			   dN(10, 1) = -_1mx2t1m3x * _1pz,
+			   dN(10, 2) = _1mx2t1m3x * _1my;
+		dN(11, 0) = _p3m9x2m2x * _1myt1pz,
+			   dN(11, 1) = -_1mx2t1p3x * _1pz,
+			   dN(11, 2) = _1mx2t1p3x * _1my;
+		dN(12, 0) = _m3m9x2m2x * _1pyt1mz,
+			   dN(12, 1) = _1mx2t1m3x * _1mz,
+			   dN(12, 2) = -_1mx2t1m3x * _1py;
+		dN(13, 0) = _p3m9x2m2x * _1pyt1mz,
+			   dN(13, 1) = _1mx2t1p3x * _1mz,
+			   dN(13, 2) = -_1mx2t1p3x * _1py;
+		dN(14, 0) = _m3m9x2m2x * _1pyt1pz,
+			   dN(14, 1) = _1mx2t1m3x * _1pz,
+			   dN(14, 2) = _1mx2t1m3x * _1py;
+		dN(15, 0) = _p3m9x2m2x * _1pyt1pz,
+			   dN(15, 1) = _1mx2t1p3x * _1pz,
+			   dN(15, 2) = _1mx2t1p3x * _1py;
+
+		btScalar _m3m9y2m2y = -_3m9y2 - _2y;
+		btScalar _p3m9y2m2y = _3m9y2 - _2y;
+		btScalar _1my2t1m3y = _1my2 * _1m3y;
+		btScalar _1my2t1p3y = _1my2 * _1p3y;
+		dN(16, 0) = -_1my2t1m3y * _1mz,
+			   dN(16, 1) = _m3m9y2m2y * _1mxt1mz,
+			   dN(16, 2) = -_1my2t1m3y * _1mx;
+		dN(17, 0) = -_1my2t1p3y * _1mz,
+			   dN(17, 1) = _p3m9y2m2y * _1mxt1mz,
+			   dN(17, 2) = -_1my2t1p3y * _1mx;
+		dN(18, 0) = _1my2t1m3y * _1mz,
+			   dN(18, 1) = _m3m9y2m2y * _1pxt1mz,
+			   dN(18, 2) = -_1my2t1m3y * _1px;
+		dN(19, 0) = _1my2t1p3y * _1mz,
+			   dN(19, 1) = _p3m9y2m2y * _1pxt1mz,
+			   dN(19, 2) = -_1my2t1p3y * _1px;
+		dN(20, 0) = -_1my2t1m3y * _1pz,
+			   dN(20, 1) = _m3m9y2m2y * _1mxt1pz,
+			   dN(20, 2) = _1my2t1m3y * _1mx;
+		dN(21, 0) = -_1my2t1p3y * _1pz,
+			   dN(21, 1) = _p3m9y2m2y * _1mxt1pz,
+			   dN(21, 2) = _1my2t1p3y * _1mx;
+		dN(22, 0) = _1my2t1m3y * _1pz,
+			   dN(22, 1) = _m3m9y2m2y * _1pxt1pz,
+			   dN(22, 2) = _1my2t1m3y * _1px;
+		dN(23, 0) = _1my2t1p3y * _1pz,
+			   dN(23, 1) = _p3m9y2m2y * _1pxt1pz,
+			   dN(23, 2) = _1my2t1p3y * _1px;
+
+		btScalar _m3m9z2m2z = -_3m9z2 - _2z;
+		btScalar _p3m9z2m2z = _3m9z2 - _2z;
+		btScalar _1mz2t1m3z = _1mz2 * _1m3z;
+		btScalar _1mz2t1p3z = _1mz2 * _1p3z;
+		dN(24, 0) = -_1mz2t1m3z * _1my,
+			   dN(24, 1) = -_1mz2t1m3z * _1mx,
+			   dN(24, 2) = _m3m9z2m2z * _1mxt1my;
+		dN(25, 0) = -_1mz2t1p3z * _1my,
+			   dN(25, 1) = -_1mz2t1p3z * _1mx,
+			   dN(25, 2) = _p3m9z2m2z * _1mxt1my;
+		dN(26, 0) = -_1mz2t1m3z * _1py,
+			   dN(26, 1) = _1mz2t1m3z * _1mx,
+			   dN(26, 2) = _m3m9z2m2z * _1mxt1py;
+		dN(27, 0) = -_1mz2t1p3z * _1py,
+			   dN(27, 1) = _1mz2t1p3z * _1mx,
+			   dN(27, 2) = _p3m9z2m2z * _1mxt1py;
+		dN(28, 0) = _1mz2t1m3z * _1my,
+			   dN(28, 1) = -_1mz2t1m3z * _1px,
+			   dN(28, 2) = _m3m9z2m2z * _1pxt1my;
+		dN(29, 0) = _1mz2t1p3z * _1my,
+			   dN(29, 1) = -_1mz2t1p3z * _1px,
+			   dN(29, 2) = _p3m9z2m2z * _1pxt1my;
+		dN(30, 0) = _1mz2t1m3z * _1py,
+			   dN(30, 1) = _1mz2t1m3z * _1px,
+			   dN(30, 2) = _m3m9z2m2z * _1pxt1py;
+		dN(31, 0) = _1mz2t1p3z * _1py,
+			   dN(31, 1) = _1mz2t1p3z * _1px,
+			   dN(31, 2) = _p3m9z2m2z * _1pxt1py;
+
+		dN.bottomRowsMul(32u - 8u, 9.0 / 64.0);
+	}
+
+	return res;
+}
+
+bool btMiniSDF::interpolate(unsigned int field_id, double& dist, btVector3 const& x,
+							btVector3* gradient) const
+{
+	btAssert(m_isValid);
+	if (!m_isValid)
+		return false;
+
+	if (!m_domain.contains(x))
+		return false;
+
+	btVector3 tmpmi = ((x - m_domain.min()) * (m_inv_cell_size));  //.cast<unsigned int>().eval();
+	unsigned int mi[3] = {(unsigned int)tmpmi[0], (unsigned int)tmpmi[1], (unsigned int)tmpmi[2]};
+	if (mi[0] >= m_resolution[0])
+		mi[0] = m_resolution[0] - 1;
+	if (mi[1] >= m_resolution[1])
+		mi[1] = m_resolution[1] - 1;
+	if (mi[2] >= m_resolution[2])
+		mi[2] = m_resolution[2] - 1;
+	btMultiIndex mui;
+	mui.ijk[0] = mi[0];
+	mui.ijk[1] = mi[1];
+	mui.ijk[2] = mi[2];
+	int i = multiToSingleIndex(mui);
+	unsigned int i_ = m_cell_map[field_id][i];
+	if (i_ == UINT_MAX)
+		return false;
+
+	btAlignedBox3d sd = subdomain(i);
+	i = i_;
+	btVector3 d = sd.m_max - sd.m_min;  //.diagonal().eval();
+
+	btVector3 denom = (sd.max() - sd.min());
+	btVector3 c0 = btVector3(2.0, 2.0, 2.0) / denom;
+	btVector3 c1 = (sd.max() + sd.min()) / denom;
+	btVector3 xi = (c0 * x - c1);
+
+	btCell32 const& cell = m_cells[field_id][i];
+	if (!gradient)
+	{
+		//auto phi = m_coefficients[field_id][i].dot(shape_function_(xi, 0));
+		double phi = 0.0;
+		btShapeMatrix N = shape_function_(xi, 0);
+		for (unsigned int j = 0u; j < 32u; ++j)
+		{
+			unsigned int v = cell.m_cells[j];
+			double c = m_nodes[field_id][v];
+			if (c == DBL_MAX)
+			{
+				return false;
+				;
+			}
+			phi += c * N[j];
+		}
+
+		dist = phi;
+		return true;
+	}
+
+	btShapeGradients dN;
+	btShapeMatrix N = shape_function_(xi, &dN);
+
+	double phi = 0.0;
+	gradient->setZero();
+	for (unsigned int j = 0u; j < 32u; ++j)
+	{
+		unsigned int v = cell.m_cells[j];
+		double c = m_nodes[field_id][v];
+		if (c == DBL_MAX)
+		{
+			gradient->setZero();
+			return false;
+		}
+		phi += c * N[j];
+		(*gradient)[0] += c * dN(j, 0);
+		(*gradient)[1] += c * dN(j, 1);
+		(*gradient)[2] += c * dN(j, 2);
+	}
+	(*gradient) *= c0;
+	dist = phi;
+	return true;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.h
new file mode 100644
index 0000000..b60fd10
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMiniSDF.h
@@ -0,0 +1,127 @@
+#ifndef MINISDF_H
+#define MINISDF_H
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAabbUtil2.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+struct btMultiIndex
+{
+	unsigned int ijk[3];
+};
+
+struct btAlignedBox3d
+{
+	btVector3 m_min;
+	btVector3 m_max;
+
+	const btVector3& min() const
+	{
+		return m_min;
+	}
+
+	const btVector3& max() const
+	{
+		return m_max;
+	}
+
+	bool contains(const btVector3& x) const
+	{
+		return TestPointAgainstAabb2(m_min, m_max, x);
+	}
+
+	btAlignedBox3d(const btVector3& mn, const btVector3& mx)
+		: m_min(mn),
+		  m_max(mx)
+	{
+	}
+
+	btAlignedBox3d()
+	{
+	}
+};
+
+struct btShapeMatrix
+{
+	double m_vec[32];
+
+	inline double& operator[](int i)
+	{
+		return m_vec[i];
+	}
+
+	inline const double& operator[](int i) const
+	{
+		return m_vec[i];
+	}
+};
+
+struct btShapeGradients
+{
+	btVector3 m_vec[32];
+
+	void topRowsDivide(int row, double denom)
+	{
+		for (int i = 0; i < row; i++)
+		{
+			m_vec[i] /= denom;
+		}
+	}
+
+	void bottomRowsMul(int row, double val)
+	{
+		for (int i = 32 - row; i < 32; i++)
+		{
+			m_vec[i] *= val;
+		}
+	}
+
+	inline btScalar& operator()(int i, int j)
+	{
+		return m_vec[i][j];
+	}
+};
+
+struct btCell32
+{
+	unsigned int m_cells[32];
+};
+
+struct btMiniSDF
+{
+	btAlignedBox3d m_domain;
+	unsigned int m_resolution[3];
+	btVector3 m_cell_size;
+	btVector3 m_inv_cell_size;
+	std::size_t m_n_cells;
+	std::size_t m_n_fields;
+	bool m_isValid;
+
+	btAlignedObjectArray<btAlignedObjectArray<double> > m_nodes;
+	btAlignedObjectArray<btAlignedObjectArray<btCell32> > m_cells;
+	btAlignedObjectArray<btAlignedObjectArray<unsigned int> > m_cell_map;
+
+	btMiniSDF()
+		: m_isValid(false)
+	{
+	}
+	bool load(const char* data, int size);
+	bool isValid() const
+	{
+		return m_isValid;
+	}
+	unsigned int multiToSingleIndex(btMultiIndex const& ijk) const;
+
+	btAlignedBox3d subdomain(btMultiIndex const& ijk) const;
+
+	btMultiIndex singleToMultiIndex(unsigned int l) const;
+
+	btAlignedBox3d subdomain(unsigned int l) const;
+
+	btShapeMatrix
+	shape_function_(btVector3 const& xi, btShapeGradients* gradient = 0) const;
+
+	bool interpolate(unsigned int field_id, double& dist, btVector3 const& x, btVector3* gradient) const;
+};
+
+#endif  //MINISDF_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
new file mode 100644
index 0000000..d4b6a65
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
@@ -0,0 +1,71 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btMinkowskiSumShape.h"
+
+btMinkowskiSumShape::btMinkowskiSumShape(const btConvexShape* shapeA, const btConvexShape* shapeB)
+	: btConvexInternalShape(),
+	  m_shapeA(shapeA),
+	  m_shapeB(shapeB)
+{
+	m_shapeType = MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE;
+	m_transA.setIdentity();
+	m_transB.setIdentity();
+}
+
+btVector3 btMinkowskiSumShape::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	btVector3 supVertexA = m_transA(m_shapeA->localGetSupportingVertexWithoutMargin(vec * m_transA.getBasis()));
+	btVector3 supVertexB = m_transB(m_shapeB->localGetSupportingVertexWithoutMargin(-vec * m_transB.getBasis()));
+	return supVertexA - supVertexB;
+}
+
+void btMinkowskiSumShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	///@todo: could make recursive use of batching. probably this shape is not used frequently.
+	for (int i = 0; i < numVectors; i++)
+	{
+		supportVerticesOut[i] = localGetSupportingVertexWithoutMargin(vectors[i]);
+	}
+}
+
+btScalar btMinkowskiSumShape::getMargin() const
+{
+	return m_shapeA->getMargin() + m_shapeB->getMargin();
+}
+
+void btMinkowskiSumShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	(void)mass;
+	//inertia of the AABB of the Minkowski sum
+	btTransform identity;
+	identity.setIdentity();
+	btVector3 aabbMin, aabbMax;
+	getAabb(identity, aabbMin, aabbMax);
+
+	btVector3 halfExtents = (aabbMax - aabbMin) * btScalar(0.5);
+
+	btScalar margin = getMargin();
+
+	btScalar lx = btScalar(2.) * (halfExtents.x() + margin);
+	btScalar ly = btScalar(2.) * (halfExtents.y() + margin);
+	btScalar lz = btScalar(2.) * (halfExtents.z() + margin);
+	const btScalar x2 = lx * lx;
+	const btScalar y2 = ly * ly;
+	const btScalar z2 = lz * lz;
+	const btScalar scaledmass = mass * btScalar(0.08333333);
+
+	inertia = scaledmass * (btVector3(y2 + z2, x2 + z2, x2 + y2));
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
new file mode 100644
index 0000000..f5763f6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
@@ -0,0 +1,62 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MINKOWSKI_SUM_SHAPE_H
+#define BT_MINKOWSKI_SUM_SHAPE_H
+
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+
+/// The btMinkowskiSumShape is only for advanced users. This shape represents implicit based minkowski sum of two convex implicit shapes.
+ATTRIBUTE_ALIGNED16(class)
+btMinkowskiSumShape : public btConvexInternalShape
+{
+	btTransform m_transA;
+	btTransform m_transB;
+	const btConvexShape* m_shapeA;
+	const btConvexShape* m_shapeB;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btMinkowskiSumShape(const btConvexShape* shapeA, const btConvexShape* shapeB);
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	void setTransformA(const btTransform& transA) { m_transA = transA; }
+	void setTransformB(const btTransform& transB) { m_transB = transB; }
+
+	const btTransform& getTransformA() const { return m_transA; }
+	const btTransform& getTransformB() const { return m_transB; }
+
+	// keep this for backward compatibility
+	const btTransform& GetTransformB() const { return m_transB; }
+
+	virtual btScalar getMargin() const;
+
+	const btConvexShape* getShapeA() const { return m_shapeA; }
+	const btConvexShape* getShapeB() const { return m_shapeB; }
+
+	virtual const char* getName() const
+	{
+		return "MinkowskiSum";
+	}
+};
+
+#endif  //BT_MINKOWSKI_SUM_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
new file mode 100644
index 0000000..c0cc55d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
@@ -0,0 +1,169 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#if defined(_WIN32) || defined(__i386__)
+#define BT_USE_SSE_IN_API
+#endif
+
+#include "btMultiSphereShape.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+#include "LinearMath/btQuaternion.h"
+#include "LinearMath/btSerializer.h"
+
+btMultiSphereShape::btMultiSphereShape(const btVector3* positions, const btScalar* radi, int numSpheres)
+	: btConvexInternalAabbCachingShape()
+{
+	m_shapeType = MULTI_SPHERE_SHAPE_PROXYTYPE;
+	//btScalar startMargin = btScalar(BT_LARGE_FLOAT);
+
+	m_localPositionArray.resize(numSpheres);
+	m_radiArray.resize(numSpheres);
+	for (int i = 0; i < numSpheres; i++)
+	{
+		m_localPositionArray[i] = positions[i];
+		m_radiArray[i] = radi[i];
+	}
+
+	recalcLocalAabb();
+}
+
+#ifndef MIN
+#define MIN(_a, _b) ((_a) < (_b) ? (_a) : (_b))
+#endif
+btVector3 btMultiSphereShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0) const
+{
+	btVector3 supVec(0, 0, 0);
+
+	btScalar maxDot(btScalar(-BT_LARGE_FLOAT));
+
+	btVector3 vec = vec0;
+	btScalar lenSqr = vec.length2();
+	if (lenSqr < (SIMD_EPSILON * SIMD_EPSILON))
+	{
+		vec.setValue(1, 0, 0);
+	}
+	else
+	{
+		btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+		vec *= rlen;
+	}
+
+	btVector3 vtx;
+	btScalar newDot;
+
+	const btVector3* pos = &m_localPositionArray[0];
+	const btScalar* rad = &m_radiArray[0];
+	int numSpheres = m_localPositionArray.size();
+
+	for (int k = 0; k < numSpheres; k += 128)
+	{
+		btVector3 temp[128];
+		int inner_count = MIN(numSpheres - k, 128);
+		for (long i = 0; i < inner_count; i++)
+		{
+			temp[i] = (*pos) * m_localScaling + vec * m_localScaling * (*rad) - vec * getMargin();
+			pos++;
+			rad++;
+		}
+		long i = vec.maxDot(temp, inner_count, newDot);
+		if (newDot > maxDot)
+		{
+			maxDot = newDot;
+			supVec = temp[i];
+		}
+	}
+
+	return supVec;
+}
+
+void btMultiSphereShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	for (int j = 0; j < numVectors; j++)
+	{
+		btScalar maxDot(btScalar(-BT_LARGE_FLOAT));
+
+		const btVector3& vec = vectors[j];
+
+		btVector3 vtx;
+		btScalar newDot;
+
+		const btVector3* pos = &m_localPositionArray[0];
+		const btScalar* rad = &m_radiArray[0];
+		int numSpheres = m_localPositionArray.size();
+
+		for (int k = 0; k < numSpheres; k += 128)
+		{
+			btVector3 temp[128];
+			int inner_count = MIN(numSpheres - k, 128);
+			for (long i = 0; i < inner_count; i++)
+			{
+				temp[i] = (*pos) * m_localScaling + vec * m_localScaling * (*rad) - vec * getMargin();
+				pos++;
+				rad++;
+			}
+			long i = vec.maxDot(temp, inner_count, newDot);
+			if (newDot > maxDot)
+			{
+				maxDot = newDot;
+				supportVerticesOut[j] = temp[i];
+			}
+		}
+	}
+}
+
+void btMultiSphereShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	//as an approximation, take the inertia of the box that bounds the spheres
+
+	btVector3 localAabbMin, localAabbMax;
+	getCachedLocalAabb(localAabbMin, localAabbMax);
+	btVector3 halfExtents = (localAabbMax - localAabbMin) * btScalar(0.5);
+
+	btScalar lx = btScalar(2.) * (halfExtents.x());
+	btScalar ly = btScalar(2.) * (halfExtents.y());
+	btScalar lz = btScalar(2.) * (halfExtents.z());
+
+	inertia.setValue(mass / (btScalar(12.0)) * (ly * ly + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + lz * lz),
+					 mass / (btScalar(12.0)) * (lx * lx + ly * ly));
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btMultiSphereShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btMultiSphereShapeData* shapeData = (btMultiSphereShapeData*)dataBuffer;
+	btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData, serializer);
+
+	int numElem = m_localPositionArray.size();
+	shapeData->m_localPositionArrayPtr = numElem ? (btPositionAndRadius*)serializer->getUniquePointer((void*)&m_localPositionArray[0]) : 0;
+
+	shapeData->m_localPositionArraySize = numElem;
+	if (numElem)
+	{
+		btChunk* chunk = serializer->allocate(sizeof(btPositionAndRadius), numElem);
+		btPositionAndRadius* memPtr = (btPositionAndRadius*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			m_localPositionArray[i].serializeFloat(memPtr->m_pos);
+			memPtr->m_radius = float(m_radiArray[i]);
+		}
+		serializer->finalizeChunk(chunk, "btPositionAndRadius", BT_ARRAY_CODE, (void*)&m_localPositionArray[0]);
+	}
+
+	// Fill padding with zeros to appease msan.
+	memset(shapeData->m_padding, 0, sizeof(shapeData->m_padding));
+
+	return "btMultiSphereShapeData";
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
new file mode 100644
index 0000000..2d79c07
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
@@ -0,0 +1,95 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTI_SPHERE_MINKOWSKI_H
+#define BT_MULTI_SPHERE_MINKOWSKI_H
+
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAabbUtil2.h"
+
+///The btMultiSphereShape represents the convex hull of a collection of spheres. You can create special capsules or other smooth volumes.
+///It is possible to animate the spheres for deformation, but call 'recalcLocalAabb' after changing any sphere position/radius
+ATTRIBUTE_ALIGNED16(class)
+btMultiSphereShape : public btConvexInternalAabbCachingShape
+{
+	btAlignedObjectArray<btVector3> m_localPositionArray;
+	btAlignedObjectArray<btScalar> m_radiArray;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btMultiSphereShape(const btVector3* positions, const btScalar* radi, int numSpheres);
+
+	///CollisionShape Interface
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	/// btConvexShape Interface
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	int getSphereCount() const
+	{
+		return m_localPositionArray.size();
+	}
+
+	const btVector3& getSpherePosition(int index) const
+	{
+		return m_localPositionArray[index];
+	}
+
+	btScalar getSphereRadius(int index) const
+	{
+		return m_radiArray[index];
+	}
+
+	virtual const char* getName() const
+	{
+		return "MultiSphere";
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+struct btPositionAndRadius
+{
+	btVector3FloatData m_pos;
+	float m_radius;
+};
+
+// clang-format off
+
+struct	btMultiSphereShapeData
+{
+	btConvexInternalShapeData	m_convexInternalShapeData;
+
+	btPositionAndRadius	*m_localPositionArrayPtr;
+	int				m_localPositionArraySize;
+	char	m_padding[4];
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btMultiSphereShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btMultiSphereShapeData);
+}
+
+#endif  //BT_MULTI_SPHERE_MINKOWSKI_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
new file mode 100644
index 0000000..30108c9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
@@ -0,0 +1,43 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// This file was created by Alex Silverman
+
+#include "BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h"
+//#include "BulletCollision/CollisionShapes/btOptimizedBvh.h"
+
+///Obtains the material for a specific triangle
+const btMaterial *btMultimaterialTriangleMeshShape::getMaterialProperties(int partID, int triIndex)
+{
+	const unsigned char *materialBase = 0;
+	int numMaterials;
+	PHY_ScalarType materialType;
+	int materialStride;
+	const unsigned char *triangleMaterialBase = 0;
+	int numTriangles;
+	int triangleMaterialStride;
+	PHY_ScalarType triangleType;
+
+	((btTriangleIndexVertexMaterialArray *)m_meshInterface)->getLockedReadOnlyMaterialBase(&materialBase, numMaterials, materialType, materialStride, &triangleMaterialBase, numTriangles, triangleMaterialStride, triangleType, partID);
+
+	// return the pointer to the place with the friction for the triangle
+	// TODO: This depends on whether it's a moving mesh or not
+	// BUG IN GIMPACT
+	//return (btScalar*)(&materialBase[triangleMaterialBase[(triIndex-1) * triangleMaterialStride] * materialStride]);
+	int *matInd = (int *)(&(triangleMaterialBase[(triIndex * triangleMaterialStride)]));
+	btMaterial *matVal = (btMaterial *)(&(materialBase[*matInd * materialStride]));
+	return (matVal);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
new file mode 100644
index 0000000..d1d42f8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
@@ -0,0 +1,115 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// This file was created by Alex Silverman
+
+#ifndef BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
+#define BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
+
+#include "btBvhTriangleMeshShape.h"
+#include "btMaterial.h"
+
+///The BvhTriangleMaterialMeshShape extends the btBvhTriangleMeshShape. Its main contribution is the interface into a material array, which allows per-triangle friction and restitution.
+ATTRIBUTE_ALIGNED16(class)
+btMultimaterialTriangleMeshShape : public btBvhTriangleMeshShape
+{
+	btAlignedObjectArray<btMaterial *> m_materialList;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btMultimaterialTriangleMeshShape(btStridingMeshInterface * meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true) : btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, buildBvh)
+	{
+		m_shapeType = MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;
+
+		const unsigned char *vertexbase;
+		int numverts;
+		PHY_ScalarType type;
+		int stride;
+		const unsigned char *indexbase;
+		int indexstride;
+		int numfaces;
+		PHY_ScalarType indicestype;
+
+		//m_materialLookup = (int**)(btAlignedAlloc(sizeof(int*) * meshInterface->getNumSubParts(), 16));
+
+		for (int i = 0; i < meshInterface->getNumSubParts(); i++)
+		{
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase,
+				numverts,
+				type,
+				stride,
+				&indexbase,
+				indexstride,
+				numfaces,
+				indicestype,
+				i);
+			//m_materialLookup[i] = (int*)(btAlignedAlloc(sizeof(int) * numfaces, 16));
+		}
+	}
+
+	///optionally pass in a larger bvh aabb, used for quantization. This allows for deformations within this aabb
+	btMultimaterialTriangleMeshShape(btStridingMeshInterface * meshInterface, bool useQuantizedAabbCompression, const btVector3 &bvhAabbMin, const btVector3 &bvhAabbMax, bool buildBvh = true) : btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, bvhAabbMin, bvhAabbMax, buildBvh)
+	{
+		m_shapeType = MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;
+
+		const unsigned char *vertexbase;
+		int numverts;
+		PHY_ScalarType type;
+		int stride;
+		const unsigned char *indexbase;
+		int indexstride;
+		int numfaces;
+		PHY_ScalarType indicestype;
+
+		//m_materialLookup = (int**)(btAlignedAlloc(sizeof(int*) * meshInterface->getNumSubParts(), 16));
+
+		for (int i = 0; i < meshInterface->getNumSubParts(); i++)
+		{
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase,
+				numverts,
+				type,
+				stride,
+				&indexbase,
+				indexstride,
+				numfaces,
+				indicestype,
+				i);
+			//m_materialLookup[i] = (int*)(btAlignedAlloc(sizeof(int) * numfaces * 2, 16));
+		}
+	}
+
+	virtual ~btMultimaterialTriangleMeshShape()
+	{
+		/*
+        for(int i = 0; i < m_meshInterface->getNumSubParts(); i++)
+        {
+            btAlignedFree(m_materialValues[i]);
+            m_materialLookup[i] = NULL;
+        }
+        btAlignedFree(m_materialValues);
+        m_materialLookup = NULL;
+*/
+	}
+	//debugging
+	virtual const char *getName() const { return "MULTIMATERIALTRIANGLEMESH"; }
+
+	///Obtains the material for a specific triangle
+	const btMaterial *getMaterialProperties(int partID, int triIndex);
+};
+
+#endif  //BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
new file mode 100644
index 0000000..863ea6d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
@@ -0,0 +1,364 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btOptimizedBvh.h"
+#include "btStridingMeshInterface.h"
+#include "LinearMath/btAabbUtil2.h"
+#include "LinearMath/btIDebugDraw.h"
+
+btOptimizedBvh::btOptimizedBvh()
+{
+}
+
+btOptimizedBvh::~btOptimizedBvh()
+{
+}
+
+void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantizedAabbCompression, const btVector3& bvhAabbMin, const btVector3& bvhAabbMax)
+{
+	m_useQuantization = useQuantizedAabbCompression;
+
+	// NodeArray	triangleNodes;
+
+	struct NodeTriangleCallback : public btInternalTriangleIndexCallback
+	{
+		NodeArray& m_triangleNodes;
+
+		NodeTriangleCallback& operator=(NodeTriangleCallback& other)
+		{
+			m_triangleNodes.copyFromArray(other.m_triangleNodes);
+			return *this;
+		}
+
+		NodeTriangleCallback(NodeArray& triangleNodes)
+			: m_triangleNodes(triangleNodes)
+		{
+		}
+
+		virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+		{
+			btOptimizedBvhNode node;
+			btVector3 aabbMin, aabbMax;
+			aabbMin.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+			aabbMax.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+			aabbMin.setMin(triangle[0]);
+			aabbMax.setMax(triangle[0]);
+			aabbMin.setMin(triangle[1]);
+			aabbMax.setMax(triangle[1]);
+			aabbMin.setMin(triangle[2]);
+			aabbMax.setMax(triangle[2]);
+
+			//with quantization?
+			node.m_aabbMinOrg = aabbMin;
+			node.m_aabbMaxOrg = aabbMax;
+
+			node.m_escapeIndex = -1;
+
+			//for child nodes
+			node.m_subPart = partId;
+			node.m_triangleIndex = triangleIndex;
+			m_triangleNodes.push_back(node);
+		}
+	};
+	struct QuantizedNodeTriangleCallback : public btInternalTriangleIndexCallback
+	{
+		QuantizedNodeArray& m_triangleNodes;
+		const btQuantizedBvh* m_optimizedTree;  // for quantization
+
+		QuantizedNodeTriangleCallback& operator=(QuantizedNodeTriangleCallback& other)
+		{
+			m_triangleNodes.copyFromArray(other.m_triangleNodes);
+			m_optimizedTree = other.m_optimizedTree;
+			return *this;
+		}
+
+		QuantizedNodeTriangleCallback(QuantizedNodeArray& triangleNodes, const btQuantizedBvh* tree)
+			: m_triangleNodes(triangleNodes), m_optimizedTree(tree)
+		{
+		}
+
+		virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+		{
+			// The partId and triangle index must fit in the same (positive) integer
+			btAssert(partId < (1 << MAX_NUM_PARTS_IN_BITS));
+			btAssert(triangleIndex < (1 << (31 - MAX_NUM_PARTS_IN_BITS)));
+			//negative indices are reserved for escapeIndex
+			btAssert(triangleIndex >= 0);
+
+			btQuantizedBvhNode node;
+			btVector3 aabbMin, aabbMax;
+			aabbMin.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+			aabbMax.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+			aabbMin.setMin(triangle[0]);
+			aabbMax.setMax(triangle[0]);
+			aabbMin.setMin(triangle[1]);
+			aabbMax.setMax(triangle[1]);
+			aabbMin.setMin(triangle[2]);
+			aabbMax.setMax(triangle[2]);
+
+			//PCK: add these checks for zero dimensions of aabb
+			const btScalar MIN_AABB_DIMENSION = btScalar(0.002);
+			const btScalar MIN_AABB_HALF_DIMENSION = btScalar(0.001);
+			if (aabbMax.x() - aabbMin.x() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setX(aabbMax.x() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setX(aabbMin.x() - MIN_AABB_HALF_DIMENSION);
+			}
+			if (aabbMax.y() - aabbMin.y() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setY(aabbMax.y() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setY(aabbMin.y() - MIN_AABB_HALF_DIMENSION);
+			}
+			if (aabbMax.z() - aabbMin.z() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setZ(aabbMax.z() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setZ(aabbMin.z() - MIN_AABB_HALF_DIMENSION);
+			}
+
+			m_optimizedTree->quantize(&node.m_quantizedAabbMin[0], aabbMin, 0);
+			m_optimizedTree->quantize(&node.m_quantizedAabbMax[0], aabbMax, 1);
+
+			node.m_escapeIndexOrTriangleIndex = (partId << (31 - MAX_NUM_PARTS_IN_BITS)) | triangleIndex;
+
+			m_triangleNodes.push_back(node);
+		}
+	};
+
+	int numLeafNodes = 0;
+
+	if (m_useQuantization)
+	{
+		//initialize quantization values
+		setQuantizationValues(bvhAabbMin, bvhAabbMax);
+
+		QuantizedNodeTriangleCallback callback(m_quantizedLeafNodes, this);
+
+		triangles->InternalProcessAllTriangles(&callback, m_bvhAabbMin, m_bvhAabbMax);
+
+		//now we have an array of leafnodes in m_leafNodes
+		numLeafNodes = m_quantizedLeafNodes.size();
+
+		m_quantizedContiguousNodes.resize(2 * numLeafNodes);
+	}
+	else
+	{
+		NodeTriangleCallback callback(m_leafNodes);
+
+		btVector3 aabbMin(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+		btVector3 aabbMax(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+
+		triangles->InternalProcessAllTriangles(&callback, aabbMin, aabbMax);
+
+		//now we have an array of leafnodes in m_leafNodes
+		numLeafNodes = m_leafNodes.size();
+
+		m_contiguousNodes.resize(2 * numLeafNodes);
+	}
+
+	m_curNodeIndex = 0;
+
+	buildTree(0, numLeafNodes);
+
+	///if the entire tree is small then subtree size, we need to create a header info for the tree
+	if (m_useQuantization && !m_SubtreeHeaders.size())
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[0]);
+		subtree.m_rootNodeIndex = 0;
+		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
+	m_quantizedLeafNodes.clear();
+	m_leafNodes.clear();
+}
+
+void btOptimizedBvh::refit(btStridingMeshInterface* meshInterface, const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	if (m_useQuantization)
+	{
+		setQuantizationValues(aabbMin, aabbMax);
+
+		updateBvhNodes(meshInterface, 0, m_curNodeIndex, 0);
+
+		///now update all subtree headers
+
+		int i;
+		for (i = 0; i < m_SubtreeHeaders.size(); i++)
+		{
+			btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
+		}
+	}
+	else
+	{
+	}
+}
+
+void btOptimizedBvh::refitPartial(btStridingMeshInterface* meshInterface, const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	//incrementally initialize quantization values
+	btAssert(m_useQuantization);
+
+	btAssert(aabbMin.getX() > m_bvhAabbMin.getX());
+	btAssert(aabbMin.getY() > m_bvhAabbMin.getY());
+	btAssert(aabbMin.getZ() > m_bvhAabbMin.getZ());
+
+	btAssert(aabbMax.getX() < m_bvhAabbMax.getX());
+	btAssert(aabbMax.getY() < m_bvhAabbMax.getY());
+	btAssert(aabbMax.getZ() < m_bvhAabbMax.getZ());
+
+	///we should update all quantization values, using updateBvhNodes(meshInterface);
+	///but we only update chunks that overlap the given aabb
+
+	unsigned short quantizedQueryAabbMin[3];
+	unsigned short quantizedQueryAabbMax[3];
+
+	quantize(&quantizedQueryAabbMin[0], aabbMin, 0);
+	quantize(&quantizedQueryAabbMax[0], aabbMax, 1);
+
+	int i;
+	for (i = 0; i < this->m_SubtreeHeaders.size(); i++)
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+
+		//PCK: unsigned instead of bool
+		unsigned overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin, quantizedQueryAabbMax, subtree.m_quantizedAabbMin, subtree.m_quantizedAabbMax);
+		if (overlap != 0)
+		{
+			updateBvhNodes(meshInterface, subtree.m_rootNodeIndex, subtree.m_rootNodeIndex + subtree.m_subtreeSize, i);
+
+			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
+		}
+	}
+}
+
+void btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface, int firstNode, int endNode, int index)
+{
+	(void)index;
+
+	btAssert(m_useQuantization);
+
+	int curNodeSubPart = -1;
+
+	//get access info to trianglemesh data
+	const unsigned char* vertexbase = 0;
+	int numverts = 0;
+	PHY_ScalarType type = PHY_INTEGER;
+	int stride = 0;
+	const unsigned char* indexbase = 0;
+	int indexstride = 0;
+	int numfaces = 0;
+	PHY_ScalarType indicestype = PHY_INTEGER;
+
+	btVector3 triangleVerts[3];
+	btVector3 aabbMin, aabbMax;
+	const btVector3& meshScaling = meshInterface->getScaling();
+
+	int i;
+	for (i = endNode - 1; i >= firstNode; i--)
+	{
+		btQuantizedBvhNode& curNode = m_quantizedContiguousNodes[i];
+		if (curNode.isLeafNode())
+		{
+			//recalc aabb from triangle data
+			int nodeSubPart = curNode.getPartId();
+			int nodeTriangleIndex = curNode.getTriangleIndex();
+			if (nodeSubPart != curNodeSubPart)
+			{
+				if (curNodeSubPart >= 0)
+					meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
+				meshInterface->getLockedReadOnlyVertexIndexBase(&vertexbase, numverts, type, stride, &indexbase, indexstride, numfaces, indicestype, nodeSubPart);
+
+				curNodeSubPart = nodeSubPart;
+			}
+			//triangles->getLockedReadOnlyVertexIndexBase(vertexBase,numVerts,
+
+			unsigned int* gfxbase = (unsigned int*)(indexbase + nodeTriangleIndex * indexstride);
+
+			for (int j = 2; j >= 0; j--)
+			{
+				int graphicsindex;
+                                switch (indicestype) {
+                                        case PHY_INTEGER: graphicsindex = gfxbase[j]; break;
+                                        case PHY_SHORT: graphicsindex = ((unsigned short*)gfxbase)[j]; break;
+                                        case PHY_UCHAR: graphicsindex = ((unsigned char*)gfxbase)[j]; break;
+                                        default: btAssert(0);
+                                }
+				if (type == PHY_FLOAT)
+				{
+					float* graphicsbase = (float*)(vertexbase + graphicsindex * stride);
+					triangleVerts[j] = btVector3(
+						graphicsbase[0] * meshScaling.getX(),
+						graphicsbase[1] * meshScaling.getY(),
+						graphicsbase[2] * meshScaling.getZ());
+				}
+				else
+				{
+					double* graphicsbase = (double*)(vertexbase + graphicsindex * stride);
+					triangleVerts[j] = btVector3(btScalar(graphicsbase[0] * meshScaling.getX()), btScalar(graphicsbase[1] * meshScaling.getY()), btScalar(graphicsbase[2] * meshScaling.getZ()));
+				}
+			}
+
+			aabbMin.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+			aabbMax.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+			aabbMin.setMin(triangleVerts[0]);
+			aabbMax.setMax(triangleVerts[0]);
+			aabbMin.setMin(triangleVerts[1]);
+			aabbMax.setMax(triangleVerts[1]);
+			aabbMin.setMin(triangleVerts[2]);
+			aabbMax.setMax(triangleVerts[2]);
+
+			quantize(&curNode.m_quantizedAabbMin[0], aabbMin, 0);
+			quantize(&curNode.m_quantizedAabbMax[0], aabbMax, 1);
+		}
+		else
+		{
+			//combine aabb from both children
+
+			btQuantizedBvhNode* leftChildNode = &m_quantizedContiguousNodes[i + 1];
+
+			btQuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? &m_quantizedContiguousNodes[i + 2] : &m_quantizedContiguousNodes[i + 1 + leftChildNode->getEscapeIndex()];
+
+			{
+				for (int i = 0; i < 3; i++)
+				{
+					curNode.m_quantizedAabbMin[i] = leftChildNode->m_quantizedAabbMin[i];
+					if (curNode.m_quantizedAabbMin[i] > rightChildNode->m_quantizedAabbMin[i])
+						curNode.m_quantizedAabbMin[i] = rightChildNode->m_quantizedAabbMin[i];
+
+					curNode.m_quantizedAabbMax[i] = leftChildNode->m_quantizedAabbMax[i];
+					if (curNode.m_quantizedAabbMax[i] < rightChildNode->m_quantizedAabbMax[i])
+						curNode.m_quantizedAabbMax[i] = rightChildNode->m_quantizedAabbMax[i];
+				}
+			}
+		}
+	}
+
+	if (curNodeSubPart >= 0)
+		meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
+}
+
+///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+btOptimizedBvh* btOptimizedBvh::deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
+{
+	btQuantizedBvh* bvh = btQuantizedBvh::deSerializeInPlace(i_alignedDataBuffer, i_dataBufferSize, i_swapEndian);
+
+	//we don't add additional data so just do a static upcast
+	return static_cast<btOptimizedBvh*>(bvh);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
new file mode 100644
index 0000000..22f131c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
@@ -0,0 +1,56 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///Contains contributions from Disney Studio's
+
+#ifndef BT_OPTIMIZED_BVH_H
+#define BT_OPTIMIZED_BVH_H
+
+#include "BulletCollision/BroadphaseCollision/btQuantizedBvh.h"
+
+class btStridingMeshInterface;
+
+///The btOptimizedBvh extends the btQuantizedBvh to create AABB tree for triangle meshes, through the btStridingMeshInterface.
+ATTRIBUTE_ALIGNED16(class)
+btOptimizedBvh : public btQuantizedBvh
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+protected:
+public:
+	btOptimizedBvh();
+
+	virtual ~btOptimizedBvh();
+
+	void build(btStridingMeshInterface * triangles, bool useQuantizedAabbCompression, const btVector3& bvhAabbMin, const btVector3& bvhAabbMax);
+
+	void refit(btStridingMeshInterface * triangles, const btVector3& aabbMin, const btVector3& aabbMax);
+
+	void refitPartial(btStridingMeshInterface * triangles, const btVector3& aabbMin, const btVector3& aabbMax);
+
+	void updateBvhNodes(btStridingMeshInterface * meshInterface, int firstNode, int endNode, int index);
+
+	/// Data buffer MUST be 16 byte aligned
+	virtual bool serializeInPlace(void* o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian) const
+	{
+		return btQuantizedBvh::serialize(o_alignedDataBuffer, i_dataBufferSize, i_swapEndian);
+	}
+
+	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+	static btOptimizedBvh* deSerializeInPlace(void* i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
+};
+
+#endif  //BT_OPTIMIZED_BVH_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
new file mode 100644
index 0000000..521ecfc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
@@ -0,0 +1,549 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#if defined(_WIN32) || defined(__i386__)
+#define BT_USE_SSE_IN_API
+#endif
+
+#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
+#include "btConvexPolyhedron.h"
+#include "LinearMath/btConvexHullComputer.h"
+#include <new>
+#include "LinearMath/btGeometryUtil.h"
+#include "LinearMath/btGrahamScan2dConvexHull.h"
+
+btPolyhedralConvexShape::btPolyhedralConvexShape() : btConvexInternalShape(),
+													 m_polyhedron(0)
+{
+}
+
+btPolyhedralConvexShape::~btPolyhedralConvexShape()
+{
+	if (m_polyhedron)
+	{
+		m_polyhedron->~btConvexPolyhedron();
+		btAlignedFree(m_polyhedron);
+	}
+}
+
+void btPolyhedralConvexShape::setPolyhedralFeatures(btConvexPolyhedron& polyhedron)
+{
+	if (m_polyhedron)
+	{
+		*m_polyhedron = polyhedron;
+	}
+	else
+	{
+		void* mem = btAlignedAlloc(sizeof(btConvexPolyhedron), 16);
+		m_polyhedron = new (mem) btConvexPolyhedron(polyhedron);
+	}
+}
+
+bool btPolyhedralConvexShape::initializePolyhedralFeatures(int shiftVerticesByMargin)
+{
+	if (m_polyhedron)
+	{
+		m_polyhedron->~btConvexPolyhedron();
+		btAlignedFree(m_polyhedron);
+	}
+
+	void* mem = btAlignedAlloc(sizeof(btConvexPolyhedron), 16);
+	m_polyhedron = new (mem) btConvexPolyhedron;
+
+	btAlignedObjectArray<btVector3> orgVertices;
+
+	for (int i = 0; i < getNumVertices(); i++)
+	{
+		btVector3& newVertex = orgVertices.expand();
+		getVertex(i, newVertex);
+	}
+
+	btConvexHullComputer conv;
+
+	if (shiftVerticesByMargin)
+	{
+		btAlignedObjectArray<btVector3> planeEquations;
+		btGeometryUtil::getPlaneEquationsFromVertices(orgVertices, planeEquations);
+
+		btAlignedObjectArray<btVector3> shiftedPlaneEquations;
+		for (int p = 0; p < planeEquations.size(); p++)
+		{
+			btVector3 plane = planeEquations[p];
+			//	   btScalar margin = getMargin();
+			plane[3] -= getMargin();
+			shiftedPlaneEquations.push_back(plane);
+		}
+
+		btAlignedObjectArray<btVector3> tmpVertices;
+
+		btGeometryUtil::getVerticesFromPlaneEquations(shiftedPlaneEquations, tmpVertices);
+
+		conv.compute(&tmpVertices[0].getX(), sizeof(btVector3), tmpVertices.size(), 0.f, 0.f);
+	}
+	else
+	{
+		conv.compute(&orgVertices[0].getX(), sizeof(btVector3), orgVertices.size(), 0.f, 0.f);
+	}
+
+#ifndef BT_RECONSTRUCT_FACES
+
+	int numVertices = conv.vertices.size();
+	m_polyhedron->m_vertices.resize(numVertices);
+	for (int p = 0; p < numVertices; p++)
+	{
+		m_polyhedron->m_vertices[p] = conv.vertices[p];
+	}
+
+	int v0, v1;
+	for (int j = 0; j < conv.faces.size(); j++)
+	{
+		btVector3 edges[3];
+		int numEdges = 0;
+		btFace combinedFace;
+		const btConvexHullComputer::Edge* edge = &conv.edges[conv.faces[j]];
+		v0 = edge->getSourceVertex();
+		int prevVertex = v0;
+		combinedFace.m_indices.push_back(v0);
+		v1 = edge->getTargetVertex();
+		while (v1 != v0)
+		{
+			btVector3 wa = conv.vertices[prevVertex];
+			btVector3 wb = conv.vertices[v1];
+			btVector3 newEdge = wb - wa;
+			newEdge.normalize();
+			if (numEdges < 2)
+				edges[numEdges++] = newEdge;
+
+			//face->addIndex(v1);
+			combinedFace.m_indices.push_back(v1);
+			edge = edge->getNextEdgeOfFace();
+			prevVertex = v1;
+			int v01 = edge->getSourceVertex();
+			v1 = edge->getTargetVertex();
+		}
+
+		btAssert(combinedFace.m_indices.size() > 2);
+
+		btVector3 faceNormal = edges[0].cross(edges[1]);
+		faceNormal.normalize();
+
+		btScalar planeEq = 1e30f;
+
+		for (int v = 0; v < combinedFace.m_indices.size(); v++)
+		{
+			btScalar eq = m_polyhedron->m_vertices[combinedFace.m_indices[v]].dot(faceNormal);
+			if (planeEq > eq)
+			{
+				planeEq = eq;
+			}
+		}
+		combinedFace.m_plane[0] = faceNormal.getX();
+		combinedFace.m_plane[1] = faceNormal.getY();
+		combinedFace.m_plane[2] = faceNormal.getZ();
+		combinedFace.m_plane[3] = -planeEq;
+
+		m_polyhedron->m_faces.push_back(combinedFace);
+	}
+
+#else  //BT_RECONSTRUCT_FACES
+
+	btAlignedObjectArray<btVector3> faceNormals;
+	int numFaces = conv.faces.size();
+	faceNormals.resize(numFaces);
+	btConvexHullComputer* convexUtil = &conv;
+
+	btAlignedObjectArray<btFace> tmpFaces;
+	tmpFaces.resize(numFaces);
+
+	int numVertices = convexUtil->vertices.size();
+	m_polyhedron->m_vertices.resize(numVertices);
+	for (int p = 0; p < numVertices; p++)
+	{
+		m_polyhedron->m_vertices[p] = convexUtil->vertices[p];
+	}
+
+	for (int i = 0; i < numFaces; i++)
+	{
+		int face = convexUtil->faces[i];
+		//printf("face=%d\n",face);
+		const btConvexHullComputer::Edge* firstEdge = &convexUtil->edges[face];
+		const btConvexHullComputer::Edge* edge = firstEdge;
+
+		btVector3 edges[3];
+		int numEdges = 0;
+		//compute face normals
+
+		do
+		{
+			int src = edge->getSourceVertex();
+			tmpFaces[i].m_indices.push_back(src);
+			int targ = edge->getTargetVertex();
+			btVector3 wa = convexUtil->vertices[src];
+
+			btVector3 wb = convexUtil->vertices[targ];
+			btVector3 newEdge = wb - wa;
+			newEdge.normalize();
+			if (numEdges < 2)
+				edges[numEdges++] = newEdge;
+
+			edge = edge->getNextEdgeOfFace();
+		} while (edge != firstEdge);
+
+		btScalar planeEq = 1e30f;
+
+		if (numEdges == 2)
+		{
+			faceNormals[i] = edges[0].cross(edges[1]);
+			faceNormals[i].normalize();
+			tmpFaces[i].m_plane[0] = faceNormals[i].getX();
+			tmpFaces[i].m_plane[1] = faceNormals[i].getY();
+			tmpFaces[i].m_plane[2] = faceNormals[i].getZ();
+			tmpFaces[i].m_plane[3] = planeEq;
+		}
+		else
+		{
+			btAssert(0);  //degenerate?
+			faceNormals[i].setZero();
+		}
+
+		for (int v = 0; v < tmpFaces[i].m_indices.size(); v++)
+		{
+			btScalar eq = m_polyhedron->m_vertices[tmpFaces[i].m_indices[v]].dot(faceNormals[i]);
+			if (planeEq > eq)
+			{
+				planeEq = eq;
+			}
+		}
+		tmpFaces[i].m_plane[3] = -planeEq;
+	}
+
+	//merge coplanar faces and copy them to m_polyhedron
+
+	btScalar faceWeldThreshold = 0.999f;
+	btAlignedObjectArray<int> todoFaces;
+	for (int i = 0; i < tmpFaces.size(); i++)
+		todoFaces.push_back(i);
+
+	while (todoFaces.size())
+	{
+		btAlignedObjectArray<int> coplanarFaceGroup;
+		int refFace = todoFaces[todoFaces.size() - 1];
+
+		coplanarFaceGroup.push_back(refFace);
+		btFace& faceA = tmpFaces[refFace];
+		todoFaces.pop_back();
+
+		btVector3 faceNormalA(faceA.m_plane[0], faceA.m_plane[1], faceA.m_plane[2]);
+		for (int j = todoFaces.size() - 1; j >= 0; j--)
+		{
+			int i = todoFaces[j];
+			btFace& faceB = tmpFaces[i];
+			btVector3 faceNormalB(faceB.m_plane[0], faceB.m_plane[1], faceB.m_plane[2]);
+			if (faceNormalA.dot(faceNormalB) > faceWeldThreshold)
+			{
+				coplanarFaceGroup.push_back(i);
+				todoFaces.remove(i);
+			}
+		}
+
+		bool did_merge = false;
+		if (coplanarFaceGroup.size() > 1)
+		{
+			//do the merge: use Graham Scan 2d convex hull
+
+			btAlignedObjectArray<GrahamVector3> orgpoints;
+			btVector3 averageFaceNormal(0, 0, 0);
+
+			for (int i = 0; i < coplanarFaceGroup.size(); i++)
+			{
+				//				m_polyhedron->m_faces.push_back(tmpFaces[coplanarFaceGroup[i]]);
+
+				btFace& face = tmpFaces[coplanarFaceGroup[i]];
+				btVector3 faceNormal(face.m_plane[0], face.m_plane[1], face.m_plane[2]);
+				averageFaceNormal += faceNormal;
+				for (int f = 0; f < face.m_indices.size(); f++)
+				{
+					int orgIndex = face.m_indices[f];
+					btVector3 pt = m_polyhedron->m_vertices[orgIndex];
+
+					bool found = false;
+
+					for (int i = 0; i < orgpoints.size(); i++)
+					{
+						//if ((orgpoints[i].m_orgIndex == orgIndex) || ((rotatedPt-orgpoints[i]).length2()<0.0001))
+						if (orgpoints[i].m_orgIndex == orgIndex)
+						{
+							found = true;
+							break;
+						}
+					}
+					if (!found)
+						orgpoints.push_back(GrahamVector3(pt, orgIndex));
+				}
+			}
+
+			btFace combinedFace;
+			for (int i = 0; i < 4; i++)
+				combinedFace.m_plane[i] = tmpFaces[coplanarFaceGroup[0]].m_plane[i];
+
+			btAlignedObjectArray<GrahamVector3> hull;
+
+			averageFaceNormal.normalize();
+			GrahamScanConvexHull2D(orgpoints, hull, averageFaceNormal);
+
+			for (int i = 0; i < hull.size(); i++)
+			{
+				combinedFace.m_indices.push_back(hull[i].m_orgIndex);
+				for (int k = 0; k < orgpoints.size(); k++)
+				{
+					if (orgpoints[k].m_orgIndex == hull[i].m_orgIndex)
+					{
+						orgpoints[k].m_orgIndex = -1;  // invalidate...
+						break;
+					}
+				}
+			}
+
+			// are there rejected vertices?
+			bool reject_merge = false;
+
+			for (int i = 0; i < orgpoints.size(); i++)
+			{
+				if (orgpoints[i].m_orgIndex == -1)
+					continue;  // this is in the hull...
+				// this vertex is rejected -- is anybody else using this vertex?
+				for (int j = 0; j < tmpFaces.size(); j++)
+				{
+					btFace& face = tmpFaces[j];
+					// is this a face of the current coplanar group?
+					bool is_in_current_group = false;
+					for (int k = 0; k < coplanarFaceGroup.size(); k++)
+					{
+						if (coplanarFaceGroup[k] == j)
+						{
+							is_in_current_group = true;
+							break;
+						}
+					}
+					if (is_in_current_group)  // ignore this face...
+						continue;
+					// does this face use this rejected vertex?
+					for (int v = 0; v < face.m_indices.size(); v++)
+					{
+						if (face.m_indices[v] == orgpoints[i].m_orgIndex)
+						{
+							// this rejected vertex is used in another face -- reject merge
+							reject_merge = true;
+							break;
+						}
+					}
+					if (reject_merge)
+						break;
+				}
+				if (reject_merge)
+					break;
+			}
+
+			if (!reject_merge)
+			{
+				// do this merge!
+				did_merge = true;
+				m_polyhedron->m_faces.push_back(combinedFace);
+			}
+		}
+		if (!did_merge)
+		{
+			for (int i = 0; i < coplanarFaceGroup.size(); i++)
+			{
+				btFace face = tmpFaces[coplanarFaceGroup[i]];
+				m_polyhedron->m_faces.push_back(face);
+			}
+		}
+	}
+
+#endif  //BT_RECONSTRUCT_FACES
+
+	m_polyhedron->initialize();
+
+	return true;
+}
+
+#ifndef MIN
+#define MIN(_a, _b) ((_a) < (_b) ? (_a) : (_b))
+#endif
+
+btVector3 btPolyhedralConvexShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0) const
+{
+	btVector3 supVec(0, 0, 0);
+#ifndef __SPU__
+	int i;
+	btScalar maxDot(btScalar(-BT_LARGE_FLOAT));
+
+	btVector3 vec = vec0;
+	btScalar lenSqr = vec.length2();
+	if (lenSqr < btScalar(0.0001))
+	{
+		vec.setValue(1, 0, 0);
+	}
+	else
+	{
+		btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+		vec *= rlen;
+	}
+
+	btVector3 vtx;
+	btScalar newDot;
+
+	for (int k = 0; k < getNumVertices(); k += 128)
+	{
+		btVector3 temp[128];
+		int inner_count = MIN(getNumVertices() - k, 128);
+		for (i = 0; i < inner_count; i++)
+			getVertex(i, temp[i]);
+		i = (int)vec.maxDot(temp, inner_count, newDot);
+		if (newDot > maxDot)
+		{
+			maxDot = newDot;
+			supVec = temp[i];
+		}
+	}
+
+#endif  //__SPU__
+	return supVec;
+}
+
+void btPolyhedralConvexShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+#ifndef __SPU__
+	int i;
+
+	btVector3 vtx;
+	btScalar newDot;
+
+	for (i = 0; i < numVectors; i++)
+	{
+		supportVerticesOut[i][3] = btScalar(-BT_LARGE_FLOAT);
+	}
+
+	for (int j = 0; j < numVectors; j++)
+	{
+		const btVector3& vec = vectors[j];
+
+		for (int k = 0; k < getNumVertices(); k += 128)
+		{
+			btVector3 temp[128];
+			int inner_count = MIN(getNumVertices() - k, 128);
+			for (i = 0; i < inner_count; i++)
+				getVertex(i, temp[i]);
+			i = (int)vec.maxDot(temp, inner_count, newDot);
+			if (newDot > supportVerticesOut[j][3])
+			{
+				supportVerticesOut[j] = temp[i];
+				supportVerticesOut[j][3] = newDot;
+			}
+		}
+	}
+
+#endif  //__SPU__
+}
+
+void btPolyhedralConvexShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+#ifndef __SPU__
+	//not yet, return box inertia
+
+	btScalar margin = getMargin();
+
+	btTransform ident;
+	ident.setIdentity();
+	btVector3 aabbMin, aabbMax;
+	getAabb(ident, aabbMin, aabbMax);
+	btVector3 halfExtents = (aabbMax - aabbMin) * btScalar(0.5);
+
+	btScalar lx = btScalar(2.) * (halfExtents.x() + margin);
+	btScalar ly = btScalar(2.) * (halfExtents.y() + margin);
+	btScalar lz = btScalar(2.) * (halfExtents.z() + margin);
+	const btScalar x2 = lx * lx;
+	const btScalar y2 = ly * ly;
+	const btScalar z2 = lz * lz;
+	const btScalar scaledmass = mass * btScalar(0.08333333);
+
+	inertia = scaledmass * (btVector3(y2 + z2, x2 + z2, x2 + y2));
+#endif  //__SPU__
+}
+
+void btPolyhedralConvexAabbCachingShape::setLocalScaling(const btVector3& scaling)
+{
+	btConvexInternalShape::setLocalScaling(scaling);
+	recalcLocalAabb();
+}
+
+btPolyhedralConvexAabbCachingShape::btPolyhedralConvexAabbCachingShape()
+	: btPolyhedralConvexShape(),
+	  m_localAabbMin(1, 1, 1),
+	  m_localAabbMax(-1, -1, -1),
+	  m_isLocalAabbValid(false)
+{
+}
+
+void btPolyhedralConvexAabbCachingShape::getAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	getNonvirtualAabb(trans, aabbMin, aabbMax, getMargin());
+}
+
+void btPolyhedralConvexAabbCachingShape::recalcLocalAabb()
+{
+	m_isLocalAabbValid = true;
+
+#if 1
+	static const btVector3 _directions[] =
+		{
+			btVector3(1., 0., 0.),
+			btVector3(0., 1., 0.),
+			btVector3(0., 0., 1.),
+			btVector3(-1., 0., 0.),
+			btVector3(0., -1., 0.),
+			btVector3(0., 0., -1.)};
+
+	btVector3 _supporting[] =
+		{
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.)};
+
+	batchedUnitVectorGetSupportingVertexWithoutMargin(_directions, _supporting, 6);
+
+	for (int i = 0; i < 3; ++i)
+	{
+		m_localAabbMax[i] = _supporting[i][i] + m_collisionMargin;
+		m_localAabbMin[i] = _supporting[i + 3][i] - m_collisionMargin;
+	}
+
+#else
+
+	for (int i = 0; i < 3; i++)
+	{
+		btVector3 vec(btScalar(0.), btScalar(0.), btScalar(0.));
+		vec[i] = btScalar(1.);
+		btVector3 tmp = localGetSupportingVertex(vec);
+		m_localAabbMax[i] = tmp[i];
+		vec[i] = btScalar(-1.);
+		tmp = localGetSupportingVertex(vec);
+		m_localAabbMin[i] = tmp[i];
+	}
+#endif
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
new file mode 100644
index 0000000..b3ffab7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
@@ -0,0 +1,106 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_POLYHEDRAL_CONVEX_SHAPE_H
+#define BT_POLYHEDRAL_CONVEX_SHAPE_H
+
+#include "LinearMath/btMatrix3x3.h"
+#include "btConvexInternalShape.h"
+class btConvexPolyhedron;
+
+///The btPolyhedralConvexShape is an internal interface class for polyhedral convex shapes.
+ATTRIBUTE_ALIGNED16(class)
+btPolyhedralConvexShape : public btConvexInternalShape
+{
+protected:
+	btConvexPolyhedron* m_polyhedron;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btPolyhedralConvexShape();
+
+	virtual ~btPolyhedralConvexShape();
+
+	///optional method mainly used to generate multiple contact points by clipping polyhedral features (faces/edges)
+	///experimental/work-in-progress
+	virtual bool initializePolyhedralFeatures(int shiftVerticesByMargin = 0);
+
+	virtual void setPolyhedralFeatures(btConvexPolyhedron & polyhedron);
+
+	const btConvexPolyhedron* getConvexPolyhedron() const
+	{
+		return m_polyhedron;
+	}
+
+	//brute force implementations
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual int getNumVertices() const = 0;
+	virtual int getNumEdges() const = 0;
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const = 0;
+	virtual void getVertex(int i, btVector3& vtx) const = 0;
+	virtual int getNumPlanes() const = 0;
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const = 0;
+	//	virtual int getIndex(int i) const = 0 ;
+
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const = 0;
+};
+
+///The btPolyhedralConvexAabbCachingShape adds aabb caching to the btPolyhedralConvexShape
+class btPolyhedralConvexAabbCachingShape : public btPolyhedralConvexShape
+{
+	btVector3 m_localAabbMin;
+	btVector3 m_localAabbMax;
+	bool m_isLocalAabbValid;
+
+protected:
+	void setCachedLocalAabb(const btVector3& aabbMin, const btVector3& aabbMax)
+	{
+		m_isLocalAabbValid = true;
+		m_localAabbMin = aabbMin;
+		m_localAabbMax = aabbMax;
+	}
+
+	inline void getCachedLocalAabb(btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		btAssert(m_isLocalAabbValid);
+		aabbMin = m_localAabbMin;
+		aabbMax = m_localAabbMax;
+	}
+
+protected:
+	btPolyhedralConvexAabbCachingShape();
+
+public:
+	inline void getNonvirtualAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax, btScalar margin) const
+	{
+		//lazy evaluation of local aabb
+		btAssert(m_isLocalAabbValid);
+		btTransformAabb(m_localAabbMin, m_localAabbMax, margin, trans, aabbMin, aabbMax);
+	}
+
+	virtual void setLocalScaling(const btVector3& scaling);
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	void recalcLocalAabb();
+};
+
+#endif  //BT_POLYHEDRAL_CONVEX_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
new file mode 100644
index 0000000..f427319
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
@@ -0,0 +1,115 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btScaledBvhTriangleMeshShape.h"
+
+btScaledBvhTriangleMeshShape::btScaledBvhTriangleMeshShape(btBvhTriangleMeshShape* childShape, const btVector3& localScaling)
+	: m_localScaling(localScaling), m_bvhTriMeshShape(childShape)
+{
+	m_shapeType = SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE;
+}
+
+btScaledBvhTriangleMeshShape::~btScaledBvhTriangleMeshShape()
+{
+}
+
+class btScaledTriangleCallback : public btTriangleCallback
+{
+	btTriangleCallback* m_originalCallback;
+
+	btVector3 m_localScaling;
+
+public:
+	btScaledTriangleCallback(btTriangleCallback* originalCallback, const btVector3& localScaling)
+		: m_originalCallback(originalCallback),
+		  m_localScaling(localScaling)
+	{
+	}
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+	{
+		btVector3 newTriangle[3];
+		newTriangle[0] = triangle[0] * m_localScaling;
+		newTriangle[1] = triangle[1] * m_localScaling;
+		newTriangle[2] = triangle[2] * m_localScaling;
+		m_originalCallback->processTriangle(&newTriangle[0], partId, triangleIndex);
+	}
+};
+
+void btScaledBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	btScaledTriangleCallback scaledCallback(callback, m_localScaling);
+
+	btVector3 invLocalScaling(1.f / m_localScaling.getX(), 1.f / m_localScaling.getY(), 1.f / m_localScaling.getZ());
+	btVector3 scaledAabbMin, scaledAabbMax;
+
+	///support negative scaling
+	scaledAabbMin[0] = m_localScaling.getX() >= 0. ? aabbMin[0] * invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
+	scaledAabbMin[1] = m_localScaling.getY() >= 0. ? aabbMin[1] * invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
+	scaledAabbMin[2] = m_localScaling.getZ() >= 0. ? aabbMin[2] * invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
+	scaledAabbMin[3] = 0.f;
+
+	scaledAabbMax[0] = m_localScaling.getX() <= 0. ? aabbMin[0] * invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
+	scaledAabbMax[1] = m_localScaling.getY() <= 0. ? aabbMin[1] * invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
+	scaledAabbMax[2] = m_localScaling.getZ() <= 0. ? aabbMin[2] * invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
+	scaledAabbMax[3] = 0.f;
+
+	m_bvhTriMeshShape->processAllTriangles(&scaledCallback, scaledAabbMin, scaledAabbMax);
+}
+
+void btScaledBvhTriangleMeshShape::getAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btVector3 localAabbMin = m_bvhTriMeshShape->getLocalAabbMin();
+	btVector3 localAabbMax = m_bvhTriMeshShape->getLocalAabbMax();
+
+	btVector3 tmpLocalAabbMin = localAabbMin * m_localScaling;
+	btVector3 tmpLocalAabbMax = localAabbMax * m_localScaling;
+
+	localAabbMin[0] = (m_localScaling.getX() >= 0.) ? tmpLocalAabbMin[0] : tmpLocalAabbMax[0];
+	localAabbMin[1] = (m_localScaling.getY() >= 0.) ? tmpLocalAabbMin[1] : tmpLocalAabbMax[1];
+	localAabbMin[2] = (m_localScaling.getZ() >= 0.) ? tmpLocalAabbMin[2] : tmpLocalAabbMax[2];
+	localAabbMax[0] = (m_localScaling.getX() <= 0.) ? tmpLocalAabbMin[0] : tmpLocalAabbMax[0];
+	localAabbMax[1] = (m_localScaling.getY() <= 0.) ? tmpLocalAabbMin[1] : tmpLocalAabbMax[1];
+	localAabbMax[2] = (m_localScaling.getZ() <= 0.) ? tmpLocalAabbMin[2] : tmpLocalAabbMax[2];
+
+	btVector3 localHalfExtents = btScalar(0.5) * (localAabbMax - localAabbMin);
+	btScalar margin = m_bvhTriMeshShape->getMargin();
+	localHalfExtents += btVector3(margin, margin, margin);
+	btVector3 localCenter = btScalar(0.5) * (localAabbMax + localAabbMin);
+
+	btMatrix3x3 abs_b = trans.getBasis().absolute();
+
+	btVector3 center = trans(localCenter);
+
+	btVector3 extent = localHalfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	aabbMin = center - extent;
+	aabbMax = center + extent;
+}
+
+void btScaledBvhTriangleMeshShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling;
+}
+
+const btVector3& btScaledBvhTriangleMeshShape::getLocalScaling() const
+{
+	return m_localScaling;
+}
+
+void btScaledBvhTriangleMeshShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	///don't make this a movable object!
+	//	btAssert(0);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
new file mode 100644
index 0000000..4d6feb6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
@@ -0,0 +1,86 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
+#define BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
+
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
+
+///The btScaledBvhTriangleMeshShape allows to instance a scaled version of an existing btBvhTriangleMeshShape.
+///Note that each btBvhTriangleMeshShape still can have its own local scaling, independent from this btScaledBvhTriangleMeshShape 'localScaling'
+ATTRIBUTE_ALIGNED16(class)
+btScaledBvhTriangleMeshShape : public btConcaveShape
+{
+	btVector3 m_localScaling;
+
+	btBvhTriangleMeshShape* m_bvhTriMeshShape;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btScaledBvhTriangleMeshShape(btBvhTriangleMeshShape * childShape, const btVector3& localScaling);
+
+	virtual ~btScaledBvhTriangleMeshShape();
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const;
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual void processAllTriangles(btTriangleCallback * callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	btBvhTriangleMeshShape* getChildShape()
+	{
+		return m_bvhTriMeshShape;
+	}
+
+	const btBvhTriangleMeshShape* getChildShape() const
+	{
+		return m_bvhTriMeshShape;
+	}
+
+	//debugging
+	virtual const char* getName() const { return "SCALEDBVHTRIANGLEMESH"; }
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btScaledTriangleMeshShapeData
+{
+	btTriangleMeshShapeData m_trimeshShapeData;
+
+	btVector3FloatData m_localScaling;
+};
+
+SIMD_FORCE_INLINE int btScaledBvhTriangleMeshShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btScaledTriangleMeshShapeData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btScaledBvhTriangleMeshShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btScaledTriangleMeshShapeData* scaledMeshData = (btScaledTriangleMeshShapeData*)dataBuffer;
+	m_bvhTriMeshShape->serialize(&scaledMeshData->m_trimeshShapeData, serializer);
+	scaledMeshData->m_trimeshShapeData.m_collisionShapeData.m_shapeType = SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE;
+	m_localScaling.serializeFloat(scaledMeshData->m_localScaling);
+	return "btScaledTriangleMeshShapeData";
+}
+
+#endif  //BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp
new file mode 100644
index 0000000..23c95ad
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp
@@ -0,0 +1,95 @@
+#include "btSdfCollisionShape.h"
+#include "btMiniSDF.h"
+#include "LinearMath/btAabbUtil2.h"
+
+ATTRIBUTE_ALIGNED16(struct)
+btSdfCollisionShapeInternalData
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btVector3 m_localScaling;
+	btScalar m_margin;
+	btMiniSDF m_sdf;
+
+	btSdfCollisionShapeInternalData()
+		: m_localScaling(1, 1, 1),
+		  m_margin(0)
+	{
+	}
+};
+
+bool btSdfCollisionShape::initializeSDF(const char* sdfData, int sizeInBytes)
+{
+	bool valid = m_data->m_sdf.load(sdfData, sizeInBytes);
+	return valid;
+}
+btSdfCollisionShape::btSdfCollisionShape()
+{
+	m_shapeType = SDF_SHAPE_PROXYTYPE;
+	m_data = new btSdfCollisionShapeInternalData();
+
+	//"E:/develop/bullet3/data/toys/ground_hole64_64_8.cdf");//ground_cube.cdf");
+	/*unsigned int field_id=0;
+	Eigen::Vector3d x (1,10,1);
+	Eigen::Vector3d gradient;
+	double dist = m_data->m_sdf.interpolate(field_id, x, &gradient);
+	printf("dist=%g\n", dist);
+	*/
+}
+btSdfCollisionShape::~btSdfCollisionShape()
+{
+	delete m_data;
+}
+
+void btSdfCollisionShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btAssert(m_data->m_sdf.isValid());
+	btVector3 localAabbMin = m_data->m_sdf.m_domain.m_min;
+	btVector3 localAabbMax = m_data->m_sdf.m_domain.m_max;
+	btScalar margin(0);
+	btTransformAabb(localAabbMin, localAabbMax, margin, t, aabbMin, aabbMax);
+}
+
+void btSdfCollisionShape::setLocalScaling(const btVector3& scaling)
+{
+	m_data->m_localScaling = scaling;
+}
+const btVector3& btSdfCollisionShape::getLocalScaling() const
+{
+	return m_data->m_localScaling;
+}
+void btSdfCollisionShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	inertia.setValue(0, 0, 0);
+}
+const char* btSdfCollisionShape::getName() const
+{
+	return "btSdfCollisionShape";
+}
+void btSdfCollisionShape::setMargin(btScalar margin)
+{
+	m_data->m_margin = margin;
+}
+btScalar btSdfCollisionShape::getMargin() const
+{
+	return m_data->m_margin;
+}
+
+void btSdfCollisionShape::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	//not yet
+}
+
+bool btSdfCollisionShape::queryPoint(const btVector3& ptInSDF, btScalar& distOut, btVector3& normal)
+{
+	int field = 0;
+	btVector3 grad;
+	double dist;
+	bool hasResult = m_data->m_sdf.interpolate(field, dist, ptInSDF, &grad);
+	if (hasResult)
+	{
+		normal.setValue(grad[0], grad[1], grad[2]);
+		distOut = dist;
+	}
+	return hasResult;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.h
new file mode 100644
index 0000000..3989d62
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSdfCollisionShape.h
@@ -0,0 +1,29 @@
+#ifndef BT_SDF_COLLISION_SHAPE_H
+#define BT_SDF_COLLISION_SHAPE_H
+
+#include "btConcaveShape.h"
+
+class btSdfCollisionShape : public btConcaveShape
+{
+	struct btSdfCollisionShapeInternalData* m_data;
+
+public:
+	btSdfCollisionShape();
+	virtual ~btSdfCollisionShape();
+
+	bool initializeSDF(const char* sdfData, int sizeInBytes);
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const;
+	virtual void calculateLocalInertia(btScalar mass, btVector3& inertia) const;
+	virtual const char* getName() const;
+	virtual void setMargin(btScalar margin);
+	virtual btScalar getMargin() const;
+
+	virtual void processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	bool queryPoint(const btVector3& ptInSDF, btScalar& distOut, btVector3& normal);
+};
+
+#endif  //BT_SDF_COLLISION_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btShapeHull.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btShapeHull.cpp
new file mode 100644
index 0000000..a2c490f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btShapeHull.cpp
@@ -0,0 +1,421 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//btShapeHull was implemented by John McCutchan.
+
+#include "btShapeHull.h"
+#include "LinearMath/btConvexHull.h"
+
+#define NUM_UNITSPHERE_POINTS 42
+#define NUM_UNITSPHERE_POINTS_HIGHRES 256
+
+btShapeHull::btShapeHull(const btConvexShape* shape)
+{
+	m_shape = shape;
+	m_vertices.clear();
+	m_indices.clear();
+	m_numIndices = 0;
+}
+
+btShapeHull::~btShapeHull()
+{
+	m_indices.clear();
+	m_vertices.clear();
+}
+
+bool btShapeHull::buildHull(btScalar /*margin*/, int highres)
+{
+	
+	int numSampleDirections = highres ? NUM_UNITSPHERE_POINTS_HIGHRES : NUM_UNITSPHERE_POINTS;
+	btVector3 supportPoints[NUM_UNITSPHERE_POINTS_HIGHRES + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2];
+	int i;
+	for (i = 0; i < numSampleDirections; i++)
+	{
+		supportPoints[i] = m_shape->localGetSupportingVertex(getUnitSpherePoints(highres)[i]);
+	}
+
+	int numPDA = m_shape->getNumPreferredPenetrationDirections();
+	if (numPDA)
+	{
+		for (int s = 0; s < numPDA; s++)
+		{
+			btVector3 norm;
+			m_shape->getPreferredPenetrationDirection(s, norm);
+			supportPoints[i++] = m_shape->localGetSupportingVertex(norm);
+			numSampleDirections++;
+		}
+	}
+	HullDesc hd;
+	hd.mFlags = QF_TRIANGLES;
+	hd.mVcount = static_cast<unsigned int>(numSampleDirections);
+
+#ifdef BT_USE_DOUBLE_PRECISION
+	hd.mVertices = &supportPoints[0];
+	hd.mVertexStride = sizeof(btVector3);
+#else
+	hd.mVertices = &supportPoints[0];
+	hd.mVertexStride = sizeof(btVector3);
+#endif
+
+	HullLibrary hl;
+	HullResult hr;
+	if (hl.CreateConvexHull(hd, hr) == QE_FAIL)
+	{
+		return false;
+	}
+
+	m_vertices.resize(static_cast<int>(hr.mNumOutputVertices));
+
+	for (i = 0; i < static_cast<int>(hr.mNumOutputVertices); i++)
+	{
+		m_vertices[i] = hr.m_OutputVertices[i];
+	}
+	m_numIndices = hr.mNumIndices;
+	m_indices.resize(static_cast<int>(m_numIndices));
+	for (i = 0; i < static_cast<int>(m_numIndices); i++)
+	{
+		m_indices[i] = hr.m_Indices[i];
+	}
+
+	// free temporary hull result that we just copied
+	hl.ReleaseResult(hr);
+
+	return true;
+}
+
+int btShapeHull::numTriangles() const
+{
+	return static_cast<int>(m_numIndices / 3);
+}
+
+int btShapeHull::numVertices() const
+{
+	return m_vertices.size();
+}
+
+int btShapeHull::numIndices() const
+{
+	return static_cast<int>(m_numIndices);
+}
+
+btVector3* btShapeHull::getUnitSpherePoints(int highres)
+{
+	static btVector3 sUnitSpherePointsHighres[NUM_UNITSPHERE_POINTS_HIGHRES + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2] =
+		{
+			btVector3(btScalar(0.997604), btScalar(0.067004), btScalar(0.017144)),
+			btVector3(btScalar(0.984139), btScalar(-0.086784), btScalar(-0.154427)),
+			btVector3(btScalar(0.971065), btScalar(0.124164), btScalar(-0.203224)),
+			btVector3(btScalar(0.955844), btScalar(0.291173), btScalar(-0.037704)),
+			btVector3(btScalar(0.957405), btScalar(0.212238), btScalar(0.195157)),
+			btVector3(btScalar(0.971650), btScalar(-0.012709), btScalar(0.235561)),
+			btVector3(btScalar(0.984920), btScalar(-0.161831), btScalar(0.059695)),
+			btVector3(btScalar(0.946673), btScalar(-0.299288), btScalar(-0.117536)),
+			btVector3(btScalar(0.922670), btScalar(-0.219186), btScalar(-0.317019)),
+			btVector3(btScalar(0.928134), btScalar(-0.007265), btScalar(-0.371867)),
+			btVector3(btScalar(0.875642), btScalar(0.198434), btScalar(-0.439988)),
+			btVector3(btScalar(0.908035), btScalar(0.325975), btScalar(-0.262562)),
+			btVector3(btScalar(0.864519), btScalar(0.488706), btScalar(-0.116755)),
+			btVector3(btScalar(0.893009), btScalar(0.428046), btScalar(0.137185)),
+			btVector3(btScalar(0.857494), btScalar(0.362137), btScalar(0.364776)),
+			btVector3(btScalar(0.900815), btScalar(0.132524), btScalar(0.412987)),
+			btVector3(btScalar(0.934964), btScalar(-0.241739), btScalar(0.259179)),
+			btVector3(btScalar(0.894570), btScalar(-0.103504), btScalar(0.434263)),
+			btVector3(btScalar(0.922085), btScalar(-0.376668), btScalar(0.086241)),
+			btVector3(btScalar(0.862177), btScalar(-0.499154), btScalar(-0.085330)),
+			btVector3(btScalar(0.861982), btScalar(-0.420218), btScalar(-0.282861)),
+			btVector3(btScalar(0.818076), btScalar(-0.328256), btScalar(-0.471804)),
+			btVector3(btScalar(0.762657), btScalar(-0.179329), btScalar(-0.621124)),
+			btVector3(btScalar(0.826857), btScalar(0.019760), btScalar(-0.561786)),
+			btVector3(btScalar(0.731434), btScalar(0.206599), btScalar(-0.649817)),
+			btVector3(btScalar(0.769486), btScalar(0.379052), btScalar(-0.513770)),
+			btVector3(btScalar(0.796806), btScalar(0.507176), btScalar(-0.328145)),
+			btVector3(btScalar(0.679722), btScalar(0.684101), btScalar(-0.264123)),
+			btVector3(btScalar(0.786854), btScalar(0.614886), btScalar(0.050912)),
+			btVector3(btScalar(0.769486), btScalar(0.571141), btScalar(0.285139)),
+			btVector3(btScalar(0.707432), btScalar(0.492789), btScalar(0.506288)),
+			btVector3(btScalar(0.774560), btScalar(0.268037), btScalar(0.572652)),
+			btVector3(btScalar(0.796220), btScalar(0.031230), btScalar(0.604077)),
+			btVector3(btScalar(0.837395), btScalar(-0.320285), btScalar(0.442461)),
+			btVector3(btScalar(0.848127), btScalar(-0.450548), btScalar(0.278307)),
+			btVector3(btScalar(0.775536), btScalar(-0.206354), btScalar(0.596465)),
+			btVector3(btScalar(0.816320), btScalar(-0.567007), btScalar(0.109469)),
+			btVector3(btScalar(0.741191), btScalar(-0.668690), btScalar(-0.056832)),
+			btVector3(btScalar(0.755632), btScalar(-0.602975), btScalar(-0.254949)),
+			btVector3(btScalar(0.720311), btScalar(-0.521318), btScalar(-0.457165)),
+			btVector3(btScalar(0.670746), btScalar(-0.386583), btScalar(-0.632835)),
+			btVector3(btScalar(0.587031), btScalar(-0.219769), btScalar(-0.778836)),
+			btVector3(btScalar(0.676015), btScalar(-0.003182), btScalar(-0.736676)),
+			btVector3(btScalar(0.566932), btScalar(0.186963), btScalar(-0.802064)),
+			btVector3(btScalar(0.618254), btScalar(0.398105), btScalar(-0.677533)),
+			btVector3(btScalar(0.653964), btScalar(0.575224), btScalar(-0.490933)),
+			btVector3(btScalar(0.525367), btScalar(0.743205), btScalar(-0.414028)),
+			btVector3(btScalar(0.506439), btScalar(0.836528), btScalar(-0.208885)),
+			btVector3(btScalar(0.651427), btScalar(0.756426), btScalar(-0.056247)),
+			btVector3(btScalar(0.641670), btScalar(0.745149), btScalar(0.180908)),
+			btVector3(btScalar(0.602643), btScalar(0.687211), btScalar(0.405180)),
+			btVector3(btScalar(0.516586), btScalar(0.596999), btScalar(0.613447)),
+			btVector3(btScalar(0.602252), btScalar(0.387801), btScalar(0.697573)),
+			btVector3(btScalar(0.646549), btScalar(0.153911), btScalar(0.746956)),
+			btVector3(btScalar(0.650842), btScalar(-0.087756), btScalar(0.753983)),
+			btVector3(btScalar(0.740411), btScalar(-0.497404), btScalar(0.451830)),
+			btVector3(btScalar(0.726946), btScalar(-0.619890), btScalar(0.295093)),
+			btVector3(btScalar(0.637768), btScalar(-0.313092), btScalar(0.703624)),
+			btVector3(btScalar(0.678942), btScalar(-0.722934), btScalar(0.126645)),
+			btVector3(btScalar(0.489072), btScalar(-0.867195), btScalar(-0.092942)),
+			btVector3(btScalar(0.622742), btScalar(-0.757541), btScalar(-0.194636)),
+			btVector3(btScalar(0.596788), btScalar(-0.693576), btScalar(-0.403098)),
+			btVector3(btScalar(0.550150), btScalar(-0.582172), btScalar(-0.598287)),
+			btVector3(btScalar(0.474436), btScalar(-0.429745), btScalar(-0.768101)),
+			btVector3(btScalar(0.372574), btScalar(-0.246016), btScalar(-0.894583)),
+			btVector3(btScalar(0.480095), btScalar(-0.026513), btScalar(-0.876626)),
+			btVector3(btScalar(0.352474), btScalar(0.177242), btScalar(-0.918787)),
+			btVector3(btScalar(0.441848), btScalar(0.374386), btScalar(-0.814946)),
+			btVector3(btScalar(0.492389), btScalar(0.582223), btScalar(-0.646693)),
+			btVector3(btScalar(0.343498), btScalar(0.866080), btScalar(-0.362693)),
+			btVector3(btScalar(0.362036), btScalar(0.745149), btScalar(-0.559639)),
+			btVector3(btScalar(0.334131), btScalar(0.937044), btScalar(-0.099774)),
+			btVector3(btScalar(0.486925), btScalar(0.871718), btScalar(0.052473)),
+			btVector3(btScalar(0.452776), btScalar(0.845665), btScalar(0.281820)),
+			btVector3(btScalar(0.399503), btScalar(0.771785), btScalar(0.494576)),
+			btVector3(btScalar(0.296469), btScalar(0.673018), btScalar(0.677469)),
+			btVector3(btScalar(0.392088), btScalar(0.479179), btScalar(0.785213)),
+			btVector3(btScalar(0.452190), btScalar(0.252094), btScalar(0.855286)),
+			btVector3(btScalar(0.478339), btScalar(0.013149), btScalar(0.877928)),
+			btVector3(btScalar(0.481656), btScalar(-0.219380), btScalar(0.848259)),
+			btVector3(btScalar(0.615327), btScalar(-0.494293), btScalar(0.613837)),
+			btVector3(btScalar(0.594642), btScalar(-0.650414), btScalar(0.472325)),
+			btVector3(btScalar(0.562249), btScalar(-0.771345), btScalar(0.297631)),
+			btVector3(btScalar(0.467411), btScalar(-0.437133), btScalar(0.768231)),
+			btVector3(btScalar(0.519513), btScalar(-0.847947), btScalar(0.103808)),
+			btVector3(btScalar(0.297640), btScalar(-0.938159), btScalar(-0.176288)),
+			btVector3(btScalar(0.446727), btScalar(-0.838615), btScalar(-0.311359)),
+			btVector3(btScalar(0.331790), btScalar(-0.942437), btScalar(0.040762)),
+			btVector3(btScalar(0.413358), btScalar(-0.748403), btScalar(-0.518259)),
+			btVector3(btScalar(0.347596), btScalar(-0.621640), btScalar(-0.701737)),
+			btVector3(btScalar(0.249831), btScalar(-0.456186), btScalar(-0.853984)),
+			btVector3(btScalar(0.131772), btScalar(-0.262931), btScalar(-0.955678)),
+			btVector3(btScalar(0.247099), btScalar(-0.042261), btScalar(-0.967975)),
+			btVector3(btScalar(0.113624), btScalar(0.165965), btScalar(-0.979491)),
+			btVector3(btScalar(0.217438), btScalar(0.374580), btScalar(-0.901220)),
+			btVector3(btScalar(0.307983), btScalar(0.554615), btScalar(-0.772786)),
+			btVector3(btScalar(0.166702), btScalar(0.953181), btScalar(-0.252021)),
+			btVector3(btScalar(0.172751), btScalar(0.844499), btScalar(-0.506743)),
+			btVector3(btScalar(0.177630), btScalar(0.711125), btScalar(-0.679876)),
+			btVector3(btScalar(0.120064), btScalar(0.992260), btScalar(-0.030482)),
+			btVector3(btScalar(0.289640), btScalar(0.949098), btScalar(0.122546)),
+			btVector3(btScalar(0.239879), btScalar(0.909047), btScalar(0.340377)),
+			btVector3(btScalar(0.181142), btScalar(0.821363), btScalar(0.540641)),
+			btVector3(btScalar(0.066986), btScalar(0.719097), btScalar(0.691327)),
+			btVector3(btScalar(0.156750), btScalar(0.545478), btScalar(0.823079)),
+			btVector3(btScalar(0.236172), btScalar(0.342306), btScalar(0.909353)),
+			btVector3(btScalar(0.277541), btScalar(0.112693), btScalar(0.953856)),
+			btVector3(btScalar(0.295299), btScalar(-0.121974), btScalar(0.947415)),
+			btVector3(btScalar(0.287883), btScalar(-0.349254), btScalar(0.891591)),
+			btVector3(btScalar(0.437165), btScalar(-0.634666), btScalar(0.636869)),
+			btVector3(btScalar(0.407113), btScalar(-0.784954), btScalar(0.466664)),
+			btVector3(btScalar(0.375111), btScalar(-0.888193), btScalar(0.264839)),
+			btVector3(btScalar(0.275394), btScalar(-0.560591), btScalar(0.780723)),
+			btVector3(btScalar(0.122015), btScalar(-0.992209), btScalar(-0.024821)),
+			btVector3(btScalar(0.087866), btScalar(-0.966156), btScalar(-0.241676)),
+			btVector3(btScalar(0.239489), btScalar(-0.885665), btScalar(-0.397437)),
+			btVector3(btScalar(0.167287), btScalar(-0.965184), btScalar(0.200817)),
+			btVector3(btScalar(0.201632), btScalar(-0.776789), btScalar(-0.596335)),
+			btVector3(btScalar(0.122015), btScalar(-0.637971), btScalar(-0.760098)),
+			btVector3(btScalar(0.008054), btScalar(-0.464741), btScalar(-0.885214)),
+			btVector3(btScalar(-0.116054), btScalar(-0.271096), btScalar(-0.955482)),
+			btVector3(btScalar(-0.000727), btScalar(-0.056065), btScalar(-0.998424)),
+			btVector3(btScalar(-0.134007), btScalar(0.152939), btScalar(-0.978905)),
+			btVector3(btScalar(-0.025900), btScalar(0.366026), btScalar(-0.930108)),
+			btVector3(btScalar(0.081231), btScalar(0.557337), btScalar(-0.826072)),
+			btVector3(btScalar(-0.002874), btScalar(0.917213), btScalar(-0.398023)),
+			btVector3(btScalar(-0.050683), btScalar(0.981761), btScalar(-0.182534)),
+			btVector3(btScalar(-0.040536), btScalar(0.710153), btScalar(-0.702713)),
+			btVector3(btScalar(-0.139081), btScalar(0.827973), btScalar(-0.543048)),
+			btVector3(btScalar(-0.101029), btScalar(0.994010), btScalar(0.041152)),
+			btVector3(btScalar(0.069328), btScalar(0.978067), btScalar(0.196133)),
+			btVector3(btScalar(0.023860), btScalar(0.911380), btScalar(0.410645)),
+			btVector3(btScalar(-0.153521), btScalar(0.736789), btScalar(0.658145)),
+			btVector3(btScalar(-0.070002), btScalar(0.591750), btScalar(0.802780)),
+			btVector3(btScalar(0.002590), btScalar(0.312948), btScalar(0.949562)),
+			btVector3(btScalar(0.090988), btScalar(-0.020680), btScalar(0.995627)),
+			btVector3(btScalar(0.088842), btScalar(-0.250099), btScalar(0.964006)),
+			btVector3(btScalar(0.083378), btScalar(-0.470185), btScalar(0.878318)),
+			btVector3(btScalar(0.240074), btScalar(-0.749764), btScalar(0.616374)),
+			btVector3(btScalar(0.210803), btScalar(-0.885860), btScalar(0.412987)),
+			btVector3(btScalar(0.077524), btScalar(-0.660524), btScalar(0.746565)),
+			btVector3(btScalar(-0.096736), btScalar(-0.990070), btScalar(-0.100945)),
+			btVector3(btScalar(-0.052634), btScalar(-0.990264), btScalar(0.127426)),
+			btVector3(btScalar(-0.106102), btScalar(-0.938354), btScalar(-0.328340)),
+			btVector3(btScalar(0.013323), btScalar(-0.863112), btScalar(-0.504596)),
+			btVector3(btScalar(-0.002093), btScalar(-0.936993), btScalar(0.349161)),
+			btVector3(btScalar(-0.106297), btScalar(-0.636610), btScalar(-0.763612)),
+			btVector3(btScalar(-0.229430), btScalar(-0.463769), btScalar(-0.855546)),
+			btVector3(btScalar(-0.245236), btScalar(-0.066175), btScalar(-0.966999)),
+			btVector3(btScalar(-0.351587), btScalar(-0.270513), btScalar(-0.896145)),
+			btVector3(btScalar(-0.370906), btScalar(0.133108), btScalar(-0.918982)),
+			btVector3(btScalar(-0.264360), btScalar(0.346000), btScalar(-0.900049)),
+			btVector3(btScalar(-0.151375), btScalar(0.543728), btScalar(-0.825291)),
+			btVector3(btScalar(-0.218697), btScalar(0.912741), btScalar(-0.344346)),
+			btVector3(btScalar(-0.274507), btScalar(0.953764), btScalar(-0.121635)),
+			btVector3(btScalar(-0.259677), btScalar(0.692266), btScalar(-0.673044)),
+			btVector3(btScalar(-0.350416), btScalar(0.798810), btScalar(-0.488786)),
+			btVector3(btScalar(-0.320170), btScalar(0.941127), btScalar(0.108297)),
+			btVector3(btScalar(-0.147667), btScalar(0.952792), btScalar(0.265034)),
+			btVector3(btScalar(-0.188061), btScalar(0.860636), btScalar(0.472910)),
+			btVector3(btScalar(-0.370906), btScalar(0.739900), btScalar(0.560941)),
+			btVector3(btScalar(-0.297143), btScalar(0.585334), btScalar(0.754178)),
+			btVector3(btScalar(-0.189622), btScalar(0.428241), btScalar(0.883393)),
+			btVector3(btScalar(-0.091272), btScalar(0.098695), btScalar(0.990747)),
+			btVector3(btScalar(-0.256945), btScalar(0.228375), btScalar(0.938827)),
+			btVector3(btScalar(-0.111761), btScalar(-0.133251), btScalar(0.984696)),
+			btVector3(btScalar(-0.118006), btScalar(-0.356253), btScalar(0.926725)),
+			btVector3(btScalar(-0.119372), btScalar(-0.563896), btScalar(0.817029)),
+			btVector3(btScalar(0.041228), btScalar(-0.833949), btScalar(0.550010)),
+			btVector3(btScalar(-0.121909), btScalar(-0.736543), btScalar(0.665172)),
+			btVector3(btScalar(-0.307681), btScalar(-0.931160), btScalar(-0.195026)),
+			btVector3(btScalar(-0.283679), btScalar(-0.957990), btScalar(0.041348)),
+			btVector3(btScalar(-0.227284), btScalar(-0.935243), btScalar(0.270890)),
+			btVector3(btScalar(-0.293436), btScalar(-0.858252), btScalar(-0.420860)),
+			btVector3(btScalar(-0.175767), btScalar(-0.780677), btScalar(-0.599262)),
+			btVector3(btScalar(-0.170108), btScalar(-0.858835), btScalar(0.482865)),
+			btVector3(btScalar(-0.332854), btScalar(-0.635055), btScalar(-0.696857)),
+			btVector3(btScalar(-0.447791), btScalar(-0.445299), btScalar(-0.775128)),
+			btVector3(btScalar(-0.470622), btScalar(-0.074146), btScalar(-0.879164)),
+			btVector3(btScalar(-0.639417), btScalar(-0.340505), btScalar(-0.689049)),
+			btVector3(btScalar(-0.598438), btScalar(0.104722), btScalar(-0.794256)),
+			btVector3(btScalar(-0.488575), btScalar(0.307699), btScalar(-0.816313)),
+			btVector3(btScalar(-0.379882), btScalar(0.513592), btScalar(-0.769077)),
+			btVector3(btScalar(-0.425740), btScalar(0.862775), btScalar(-0.272516)),
+			btVector3(btScalar(-0.480769), btScalar(0.875412), btScalar(-0.048439)),
+			btVector3(btScalar(-0.467890), btScalar(0.648716), btScalar(-0.600043)),
+			btVector3(btScalar(-0.543799), btScalar(0.730956), btScalar(-0.411881)),
+			btVector3(btScalar(-0.516284), btScalar(0.838277), btScalar(0.174076)),
+			btVector3(btScalar(-0.353343), btScalar(0.876384), btScalar(0.326519)),
+			btVector3(btScalar(-0.572875), btScalar(0.614497), btScalar(0.542007)),
+			btVector3(btScalar(-0.503600), btScalar(0.497261), btScalar(0.706161)),
+			btVector3(btScalar(-0.530920), btScalar(0.754870), btScalar(0.384685)),
+			btVector3(btScalar(-0.395884), btScalar(0.366414), btScalar(0.841818)),
+			btVector3(btScalar(-0.300656), btScalar(0.001678), btScalar(0.953661)),
+			btVector3(btScalar(-0.461060), btScalar(0.146912), btScalar(0.875000)),
+			btVector3(btScalar(-0.315486), btScalar(-0.232212), btScalar(0.919893)),
+			btVector3(btScalar(-0.323682), btScalar(-0.449187), btScalar(0.832644)),
+			btVector3(btScalar(-0.318999), btScalar(-0.639527), btScalar(0.699134)),
+			btVector3(btScalar(-0.496771), btScalar(-0.866029), btScalar(-0.055271)),
+			btVector3(btScalar(-0.496771), btScalar(-0.816257), btScalar(-0.294377)),
+			btVector3(btScalar(-0.456377), btScalar(-0.869528), btScalar(0.188130)),
+			btVector3(btScalar(-0.380858), btScalar(-0.827144), btScalar(0.412792)),
+			btVector3(btScalar(-0.449352), btScalar(-0.727405), btScalar(-0.518259)),
+			btVector3(btScalar(-0.570533), btScalar(-0.551064), btScalar(-0.608632)),
+			btVector3(btScalar(-0.656394), btScalar(-0.118280), btScalar(-0.744874)),
+			btVector3(btScalar(-0.756696), btScalar(-0.438105), btScalar(-0.484882)),
+			btVector3(btScalar(-0.801773), btScalar(-0.204798), btScalar(-0.561005)),
+			btVector3(btScalar(-0.785186), btScalar(0.038618), btScalar(-0.617805)),
+			btVector3(btScalar(-0.709082), btScalar(0.262399), btScalar(-0.654306)),
+			btVector3(btScalar(-0.583412), btScalar(0.462265), btScalar(-0.667383)),
+			btVector3(btScalar(-0.616001), btScalar(0.761286), btScalar(-0.201272)),
+			btVector3(btScalar(-0.660687), btScalar(0.750204), btScalar(0.020072)),
+			btVector3(btScalar(-0.744987), btScalar(0.435823), btScalar(-0.504791)),
+			btVector3(btScalar(-0.713765), btScalar(0.605554), btScalar(-0.351373)),
+			btVector3(btScalar(-0.686251), btScalar(0.687600), btScalar(0.236927)),
+			btVector3(btScalar(-0.680201), btScalar(0.429407), btScalar(0.593732)),
+			btVector3(btScalar(-0.733474), btScalar(0.546450), btScalar(0.403814)),
+			btVector3(btScalar(-0.591023), btScalar(0.292923), btScalar(0.751445)),
+			btVector3(btScalar(-0.500283), btScalar(-0.080757), btScalar(0.861922)),
+			btVector3(btScalar(-0.643710), btScalar(0.070115), btScalar(0.761985)),
+			btVector3(btScalar(-0.506332), btScalar(-0.308425), btScalar(0.805122)),
+			btVector3(btScalar(-0.503015), btScalar(-0.509847), btScalar(0.697573)),
+			btVector3(btScalar(-0.482525), btScalar(-0.682105), btScalar(0.549229)),
+			btVector3(btScalar(-0.680396), btScalar(-0.716323), btScalar(-0.153451)),
+			btVector3(btScalar(-0.658346), btScalar(-0.746264), btScalar(0.097562)),
+			btVector3(btScalar(-0.653272), btScalar(-0.646915), btScalar(-0.392948)),
+			btVector3(btScalar(-0.590828), btScalar(-0.732655), btScalar(0.337645)),
+			btVector3(btScalar(-0.819140), btScalar(-0.518013), btScalar(-0.246166)),
+			btVector3(btScalar(-0.900513), btScalar(-0.282178), btScalar(-0.330487)),
+			btVector3(btScalar(-0.914953), btScalar(-0.028652), btScalar(-0.402122)),
+			btVector3(btScalar(-0.859924), btScalar(0.220209), btScalar(-0.459898)),
+			btVector3(btScalar(-0.777185), btScalar(0.613720), btScalar(-0.137836)),
+			btVector3(btScalar(-0.805285), btScalar(0.586889), btScalar(0.082728)),
+			btVector3(btScalar(-0.872413), btScalar(0.406077), btScalar(-0.271735)),
+			btVector3(btScalar(-0.859339), btScalar(0.448072), btScalar(0.246101)),
+			btVector3(btScalar(-0.757671), btScalar(0.216320), btScalar(0.615594)),
+			btVector3(btScalar(-0.826165), btScalar(0.348139), btScalar(0.442851)),
+			btVector3(btScalar(-0.671810), btScalar(-0.162803), btScalar(0.722557)),
+			btVector3(btScalar(-0.796504), btScalar(-0.004543), btScalar(0.604468)),
+			btVector3(btScalar(-0.676298), btScalar(-0.378223), btScalar(0.631794)),
+			btVector3(btScalar(-0.668883), btScalar(-0.558258), btScalar(0.490673)),
+			btVector3(btScalar(-0.821287), btScalar(-0.570118), btScalar(0.006994)),
+			btVector3(btScalar(-0.767428), btScalar(-0.587810), btScalar(0.255470)),
+			btVector3(btScalar(-0.933296), btScalar(-0.349837), btScalar(-0.079865)),
+			btVector3(btScalar(-0.982667), btScalar(-0.100393), btScalar(-0.155208)),
+			btVector3(btScalar(-0.961396), btScalar(0.160910), btScalar(-0.222938)),
+			btVector3(btScalar(-0.934858), btScalar(0.354555), btScalar(-0.006864)),
+			btVector3(btScalar(-0.941687), btScalar(0.229736), btScalar(0.245711)),
+			btVector3(btScalar(-0.884317), btScalar(0.131552), btScalar(0.447536)),
+			btVector3(btScalar(-0.810359), btScalar(-0.219769), btScalar(0.542788)),
+			btVector3(btScalar(-0.915929), btScalar(-0.210048), btScalar(0.341743)),
+			btVector3(btScalar(-0.816799), btScalar(-0.407192), btScalar(0.408303)),
+			btVector3(btScalar(-0.903050), btScalar(-0.392416), btScalar(0.174076)),
+			btVector3(btScalar(-0.980325), btScalar(-0.170969), btScalar(0.096586)),
+			btVector3(btScalar(-0.995936), btScalar(0.084891), btScalar(0.029441)),
+			btVector3(btScalar(-0.960031), btScalar(0.002650), btScalar(0.279283)),
+		};
+	static btVector3 sUnitSpherePoints[NUM_UNITSPHERE_POINTS + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2] =
+		{
+			btVector3(btScalar(0.000000), btScalar(-0.000000), btScalar(-1.000000)),
+			btVector3(btScalar(0.723608), btScalar(-0.525725), btScalar(-0.447219)),
+			btVector3(btScalar(-0.276388), btScalar(-0.850649), btScalar(-0.447219)),
+			btVector3(btScalar(-0.894426), btScalar(-0.000000), btScalar(-0.447216)),
+			btVector3(btScalar(-0.276388), btScalar(0.850649), btScalar(-0.447220)),
+			btVector3(btScalar(0.723608), btScalar(0.525725), btScalar(-0.447219)),
+			btVector3(btScalar(0.276388), btScalar(-0.850649), btScalar(0.447220)),
+			btVector3(btScalar(-0.723608), btScalar(-0.525725), btScalar(0.447219)),
+			btVector3(btScalar(-0.723608), btScalar(0.525725), btScalar(0.447219)),
+			btVector3(btScalar(0.276388), btScalar(0.850649), btScalar(0.447219)),
+			btVector3(btScalar(0.894426), btScalar(0.000000), btScalar(0.447216)),
+			btVector3(btScalar(-0.000000), btScalar(0.000000), btScalar(1.000000)),
+			btVector3(btScalar(0.425323), btScalar(-0.309011), btScalar(-0.850654)),
+			btVector3(btScalar(-0.162456), btScalar(-0.499995), btScalar(-0.850654)),
+			btVector3(btScalar(0.262869), btScalar(-0.809012), btScalar(-0.525738)),
+			btVector3(btScalar(0.425323), btScalar(0.309011), btScalar(-0.850654)),
+			btVector3(btScalar(0.850648), btScalar(-0.000000), btScalar(-0.525736)),
+			btVector3(btScalar(-0.525730), btScalar(-0.000000), btScalar(-0.850652)),
+			btVector3(btScalar(-0.688190), btScalar(-0.499997), btScalar(-0.525736)),
+			btVector3(btScalar(-0.162456), btScalar(0.499995), btScalar(-0.850654)),
+			btVector3(btScalar(-0.688190), btScalar(0.499997), btScalar(-0.525736)),
+			btVector3(btScalar(0.262869), btScalar(0.809012), btScalar(-0.525738)),
+			btVector3(btScalar(0.951058), btScalar(0.309013), btScalar(0.000000)),
+			btVector3(btScalar(0.951058), btScalar(-0.309013), btScalar(0.000000)),
+			btVector3(btScalar(0.587786), btScalar(-0.809017), btScalar(0.000000)),
+			btVector3(btScalar(0.000000), btScalar(-1.000000), btScalar(0.000000)),
+			btVector3(btScalar(-0.587786), btScalar(-0.809017), btScalar(0.000000)),
+			btVector3(btScalar(-0.951058), btScalar(-0.309013), btScalar(-0.000000)),
+			btVector3(btScalar(-0.951058), btScalar(0.309013), btScalar(-0.000000)),
+			btVector3(btScalar(-0.587786), btScalar(0.809017), btScalar(-0.000000)),
+			btVector3(btScalar(-0.000000), btScalar(1.000000), btScalar(-0.000000)),
+			btVector3(btScalar(0.587786), btScalar(0.809017), btScalar(-0.000000)),
+			btVector3(btScalar(0.688190), btScalar(-0.499997), btScalar(0.525736)),
+			btVector3(btScalar(-0.262869), btScalar(-0.809012), btScalar(0.525738)),
+			btVector3(btScalar(-0.850648), btScalar(0.000000), btScalar(0.525736)),
+			btVector3(btScalar(-0.262869), btScalar(0.809012), btScalar(0.525738)),
+			btVector3(btScalar(0.688190), btScalar(0.499997), btScalar(0.525736)),
+			btVector3(btScalar(0.525730), btScalar(0.000000), btScalar(0.850652)),
+			btVector3(btScalar(0.162456), btScalar(-0.499995), btScalar(0.850654)),
+			btVector3(btScalar(-0.425323), btScalar(-0.309011), btScalar(0.850654)),
+			btVector3(btScalar(-0.425323), btScalar(0.309011), btScalar(0.850654)),
+			btVector3(btScalar(0.162456), btScalar(0.499995), btScalar(0.850654))};
+	if (highres)
+		return sUnitSpherePointsHighres;
+	return sUnitSpherePoints;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btShapeHull.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btShapeHull.h
new file mode 100644
index 0000000..54439f9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btShapeHull.h
@@ -0,0 +1,60 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///btShapeHull implemented by John McCutchan.
+
+#ifndef BT_SHAPE_HULL_H
+#define BT_SHAPE_HULL_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+
+///The btShapeHull class takes a btConvexShape, builds a simplified convex hull using btConvexHull and provides triangle indices and vertices.
+///It can be useful for to simplify a complex convex object and for visualization of a non-polyhedral convex object.
+///It approximates the convex hull using the supporting vertex of 42 directions.
+ATTRIBUTE_ALIGNED16(class)
+btShapeHull
+{
+protected:
+	btAlignedObjectArray<btVector3> m_vertices;
+	btAlignedObjectArray<unsigned int> m_indices;
+	unsigned int m_numIndices;
+	const btConvexShape* m_shape;
+
+	static btVector3* getUnitSpherePoints(int highres = 0);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btShapeHull(const btConvexShape* shape);
+	~btShapeHull();
+
+	bool buildHull(btScalar margin, int highres = 0);
+
+	int numTriangles() const;
+	int numVertices() const;
+	int numIndices() const;
+
+	const btVector3* getVertexPointer() const
+	{
+		return &m_vertices[0];
+	}
+	const unsigned int* getIndexPointer() const
+	{
+		return &m_indices[0];
+	}
+};
+
+#endif  //BT_SHAPE_HULL_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSphereShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSphereShape.cpp
new file mode 100644
index 0000000..027db2e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSphereShape.cpp
@@ -0,0 +1,65 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+
+#include "LinearMath/btQuaternion.h"
+
+btVector3 btSphereShape::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	(void)vec;
+	return btVector3(btScalar(0.), btScalar(0.), btScalar(0.));
+}
+
+void btSphereShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	(void)vectors;
+
+	for (int i = 0; i < numVectors; i++)
+	{
+		supportVerticesOut[i].setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+	}
+}
+
+btVector3 btSphereShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	btVector3 supVertex;
+	supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+	btVector3 vecnorm = vec;
+	if (vecnorm.length2() < (SIMD_EPSILON * SIMD_EPSILON))
+	{
+		vecnorm.setValue(btScalar(-1.), btScalar(-1.), btScalar(-1.));
+	}
+	vecnorm.normalize();
+	supVertex += getMargin() * vecnorm;
+	return supVertex;
+}
+
+//broken due to scaling
+void btSphereShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	const btVector3& center = t.getOrigin();
+	btVector3 extent(getMargin(), getMargin(), getMargin());
+	aabbMin = center - extent;
+	aabbMax = center + extent;
+}
+
+void btSphereShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	btScalar elem = btScalar(0.4) * mass * getMargin() * getMargin();
+	inertia.setValue(elem, elem, elem);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSphereShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSphereShape.h
new file mode 100644
index 0000000..75e4fd8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btSphereShape.h
@@ -0,0 +1,71 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef BT_SPHERE_MINKOWSKI_H
+#define BT_SPHERE_MINKOWSKI_H
+
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+
+///The btSphereShape implements an implicit sphere, centered around a local origin with radius.
+ATTRIBUTE_ALIGNED16(class)
+btSphereShape : public btConvexInternalShape
+
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btSphereShape(btScalar radius) : btConvexInternalShape()
+	{
+		m_shapeType = SPHERE_SHAPE_PROXYTYPE;
+		m_localScaling.setValue(1.0, 1.0, 1.0);
+		m_implicitShapeDimensions.setZero();
+		m_implicitShapeDimensions.setX(radius);
+		m_collisionMargin = radius;
+		m_padding = 0;
+	}
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+	//notice that the vectors should be unit length
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	btScalar getRadius() const { return m_implicitShapeDimensions.getX() * m_localScaling.getX(); }
+
+	void setUnscaledRadius(btScalar radius)
+	{
+		m_implicitShapeDimensions.setX(radius);
+		btConvexInternalShape::setMargin(radius);
+	}
+
+	//debugging
+	virtual const char* getName() const { return "SPHERE"; }
+
+	virtual void setMargin(btScalar margin)
+	{
+		btConvexInternalShape::setMargin(margin);
+	}
+	virtual btScalar getMargin() const
+	{
+		//to improve gjk behaviour, use radius+margin as the full margin, so never get into the penetration case
+		//this means, non-uniform scaling is not supported anymore
+		return getRadius();
+	}
+};
+
+#endif  //BT_SPHERE_MINKOWSKI_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
new file mode 100644
index 0000000..9238c91
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
@@ -0,0 +1,93 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btStaticPlaneShape.h"
+
+#include "LinearMath/btTransformUtil.h"
+
+btStaticPlaneShape::btStaticPlaneShape(const btVector3& planeNormal, btScalar planeConstant)
+	: btConcaveShape(), m_planeNormal(planeNormal.normalized()), m_planeConstant(planeConstant), m_localScaling(btScalar(1.), btScalar(1.), btScalar(1.))
+{
+	m_shapeType = STATIC_PLANE_PROXYTYPE;
+	//	btAssert( btFuzzyZero(m_planeNormal.length() - btScalar(1.)) );
+}
+
+btStaticPlaneShape::~btStaticPlaneShape()
+{
+}
+
+void btStaticPlaneShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	(void)t;
+	/*
+	btVector3 infvec (btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
+
+	btVector3 center = m_planeNormal*m_planeConstant;
+	aabbMin = center + infvec*m_planeNormal;
+	aabbMax = aabbMin;
+	aabbMin.setMin(center - infvec*m_planeNormal);
+	aabbMax.setMax(center - infvec*m_planeNormal); 
+	*/
+
+	aabbMin.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+	aabbMax.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+}
+
+void btStaticPlaneShape::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	btVector3 halfExtents = (aabbMax - aabbMin) * btScalar(0.5);
+	btScalar radius = halfExtents.length();
+	btVector3 center = (aabbMax + aabbMin) * btScalar(0.5);
+
+	//this is where the triangles are generated, given AABB and plane equation (normal/constant)
+
+	btVector3 tangentDir0, tangentDir1;
+
+	//tangentDir0/tangentDir1 can be precalculated
+	btPlaneSpace1(m_planeNormal, tangentDir0, tangentDir1);
+
+	btVector3 projectedCenter = center - (m_planeNormal.dot(center) - m_planeConstant) * m_planeNormal;
+
+	btVector3 triangle[3];
+	triangle[0] = projectedCenter + tangentDir0 * radius + tangentDir1 * radius;
+	triangle[1] = projectedCenter + tangentDir0 * radius - tangentDir1 * radius;
+	triangle[2] = projectedCenter - tangentDir0 * radius - tangentDir1 * radius;
+
+	callback->processTriangle(triangle, 0, 0);
+
+	triangle[0] = projectedCenter - tangentDir0 * radius - tangentDir1 * radius;
+	triangle[1] = projectedCenter - tangentDir0 * radius + tangentDir1 * radius;
+	triangle[2] = projectedCenter + tangentDir0 * radius + tangentDir1 * radius;
+
+	callback->processTriangle(triangle, 0, 1);
+}
+
+void btStaticPlaneShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	(void)mass;
+
+	//moving concave objects not supported
+
+	inertia.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+}
+
+void btStaticPlaneShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling;
+}
+const btVector3& btStaticPlaneShape::getLocalScaling() const
+{
+	return m_localScaling;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
new file mode 100644
index 0000000..1cda8bb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
@@ -0,0 +1,103 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_STATIC_PLANE_SHAPE_H
+#define BT_STATIC_PLANE_SHAPE_H
+
+#include "btConcaveShape.h"
+
+///The btStaticPlaneShape simulates an infinite non-moving (static) collision plane.
+ATTRIBUTE_ALIGNED16(class)
+btStaticPlaneShape : public btConcaveShape
+{
+protected:
+	btVector3 m_localAabbMin;
+	btVector3 m_localAabbMax;
+
+	btVector3 m_planeNormal;
+	btScalar m_planeConstant;
+	btVector3 m_localScaling;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btStaticPlaneShape(const btVector3& planeNormal, btScalar planeConstant);
+
+	virtual ~btStaticPlaneShape();
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void processAllTriangles(btTriangleCallback * callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const;
+
+	const btVector3& getPlaneNormal() const
+	{
+		return m_planeNormal;
+	}
+
+	const btScalar& getPlaneConstant() const
+	{
+		return m_planeConstant;
+	}
+
+	//debugging
+	virtual const char* getName() const { return "STATICPLANE"; }
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btStaticPlaneShapeData
+{
+	btCollisionShapeData m_collisionShapeData;
+
+	btVector3FloatData m_localScaling;
+	btVector3FloatData m_planeNormal;
+	float m_planeConstant;
+	char m_pad[4];
+};
+
+SIMD_FORCE_INLINE int btStaticPlaneShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btStaticPlaneShapeData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btStaticPlaneShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btStaticPlaneShapeData* planeData = (btStaticPlaneShapeData*)dataBuffer;
+	btCollisionShape::serialize(&planeData->m_collisionShapeData, serializer);
+
+	m_localScaling.serializeFloat(planeData->m_localScaling);
+	m_planeNormal.serializeFloat(planeData->m_planeNormal);
+	planeData->m_planeConstant = float(m_planeConstant);
+
+	// Fill padding with zeros to appease msan.
+	planeData->m_pad[0] = 0;
+	planeData->m_pad[1] = 0;
+	planeData->m_pad[2] = 0;
+	planeData->m_pad[3] = 0;
+
+	return "btStaticPlaneShapeData";
+}
+
+#endif  //BT_STATIC_PLANE_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
new file mode 100644
index 0000000..eb288e9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
@@ -0,0 +1,380 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btStridingMeshInterface.h"
+#include "LinearMath/btSerializer.h"
+
+btStridingMeshInterface::~btStridingMeshInterface()
+{
+}
+
+void btStridingMeshInterface::InternalProcessAllTriangles(btInternalTriangleIndexCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	(void)aabbMin;
+	(void)aabbMax;
+	int numtotalphysicsverts = 0;
+	int part, graphicssubparts = getNumSubParts();
+	const unsigned char* vertexbase;
+	const unsigned char* indexbase;
+	int indexstride;
+	PHY_ScalarType type;
+	PHY_ScalarType gfxindextype;
+	int stride, numverts, numtriangles;
+	int gfxindex;
+	btVector3 triangle[3];
+
+	btVector3 meshScaling = getScaling();
+
+	///if the number of parts is big, the performance might drop due to the innerloop switch on indextype
+	for (part = 0; part < graphicssubparts; part++)
+	{
+		getLockedReadOnlyVertexIndexBase(&vertexbase, numverts, type, stride, &indexbase, indexstride, numtriangles, gfxindextype, part);
+		numtotalphysicsverts += numtriangles * 3;  //upper bound
+
+		///unlike that developers want to pass in double-precision meshes in single-precision Bullet build
+		///so disable this feature by default
+		///see patch http://code.google.com/p/bullet/issues/detail?id=213
+
+		switch (type)
+		{
+			case PHY_FLOAT:
+			{
+				float* graphicsbase;
+
+				switch (gfxindextype)
+				{
+					case PHY_INTEGER:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned int* tri_indices = (unsigned int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (float*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_SHORT:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned short int* tri_indices = (unsigned short int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (float*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_UCHAR:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned char* tri_indices = (unsigned char*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (float*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (float*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue(graphicsbase[0] * meshScaling.getX(), graphicsbase[1] * meshScaling.getY(), graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					default:
+						btAssert((gfxindextype == PHY_INTEGER) || (gfxindextype == PHY_SHORT));
+				}
+				break;
+			}
+
+			case PHY_DOUBLE:
+			{
+				double* graphicsbase;
+
+				switch (gfxindextype)
+				{
+					case PHY_INTEGER:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned int* tri_indices = (unsigned int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (double*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_SHORT:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned short int* tri_indices = (unsigned short int*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (double*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					case PHY_UCHAR:
+					{
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned char* tri_indices = (unsigned char*)(indexbase + gfxindex * indexstride);
+							graphicsbase = (double*)(vertexbase + tri_indices[0] * stride);
+							triangle[0].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[1] * stride);
+							triangle[1].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							graphicsbase = (double*)(vertexbase + tri_indices[2] * stride);
+							triangle[2].setValue((btScalar)graphicsbase[0] * meshScaling.getX(), (btScalar)graphicsbase[1] * meshScaling.getY(), (btScalar)graphicsbase[2] * meshScaling.getZ());
+							callback->internalProcessTriangleIndex(triangle, part, gfxindex);
+						}
+						break;
+					}
+					default:
+						btAssert((gfxindextype == PHY_INTEGER) || (gfxindextype == PHY_SHORT));
+				}
+				break;
+			}
+			default:
+				btAssert((type == PHY_FLOAT) || (type == PHY_DOUBLE));
+		}
+
+		unLockReadOnlyVertexBase(part);
+	}
+}
+
+void btStridingMeshInterface::calculateAabbBruteForce(btVector3& aabbMin, btVector3& aabbMax)
+{
+	struct AabbCalculationCallback : public btInternalTriangleIndexCallback
+	{
+		btVector3 m_aabbMin;
+		btVector3 m_aabbMax;
+
+		AabbCalculationCallback()
+		{
+			m_aabbMin.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+			m_aabbMax.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+		}
+
+		virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+		{
+			(void)partId;
+			(void)triangleIndex;
+
+			m_aabbMin.setMin(triangle[0]);
+			m_aabbMax.setMax(triangle[0]);
+			m_aabbMin.setMin(triangle[1]);
+			m_aabbMax.setMax(triangle[1]);
+			m_aabbMin.setMin(triangle[2]);
+			m_aabbMax.setMax(triangle[2]);
+		}
+	};
+
+	//first calculate the total aabb for all triangles
+	AabbCalculationCallback aabbCallback;
+	aabbMin.setValue(btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT), btScalar(-BT_LARGE_FLOAT));
+	aabbMax.setValue(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+	InternalProcessAllTriangles(&aabbCallback, aabbMin, aabbMax);
+
+	aabbMin = aabbCallback.m_aabbMin;
+	aabbMax = aabbCallback.m_aabbMax;
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btStridingMeshInterfaceData* trimeshData = (btStridingMeshInterfaceData*)dataBuffer;
+
+	trimeshData->m_numMeshParts = getNumSubParts();
+
+	//void* uniquePtr = 0;
+
+	trimeshData->m_meshPartsPtr = 0;
+
+	if (trimeshData->m_numMeshParts)
+	{
+		btChunk* chunk = serializer->allocate(sizeof(btMeshPartData), trimeshData->m_numMeshParts);
+		btMeshPartData* memPtr = (btMeshPartData*)chunk->m_oldPtr;
+		trimeshData->m_meshPartsPtr = (btMeshPartData*)serializer->getUniquePointer(memPtr);
+
+		//	int numtotalphysicsverts = 0;
+		int part, graphicssubparts = getNumSubParts();
+		const unsigned char* vertexbase;
+		const unsigned char* indexbase;
+		int indexstride;
+		PHY_ScalarType type;
+		PHY_ScalarType gfxindextype;
+		int stride, numverts, numtriangles;
+		int gfxindex;
+		//	btVector3 triangle[3];
+
+		//	btVector3 meshScaling = getScaling();
+
+		///if the number of parts is big, the performance might drop due to the innerloop switch on indextype
+		for (part = 0; part < graphicssubparts; part++, memPtr++)
+		{
+			getLockedReadOnlyVertexIndexBase(&vertexbase, numverts, type, stride, &indexbase, indexstride, numtriangles, gfxindextype, part);
+			memPtr->m_numTriangles = numtriangles;  //indices = 3*numtriangles
+			memPtr->m_numVertices = numverts;
+			memPtr->m_indices16 = 0;
+			memPtr->m_indices32 = 0;
+			memPtr->m_3indices16 = 0;
+			memPtr->m_3indices8 = 0;
+			memPtr->m_vertices3f = 0;
+			memPtr->m_vertices3d = 0;
+
+			switch (gfxindextype)
+			{
+				case PHY_INTEGER:
+				{
+					int numindices = numtriangles * 3;
+
+					if (numindices)
+					{
+						btChunk* chunk = serializer->allocate(sizeof(btIntIndexData), numindices);
+						btIntIndexData* tmpIndices = (btIntIndexData*)chunk->m_oldPtr;
+						memPtr->m_indices32 = (btIntIndexData*)serializer->getUniquePointer(tmpIndices);
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned int* tri_indices = (unsigned int*)(indexbase + gfxindex * indexstride);
+							tmpIndices[gfxindex * 3].m_value = tri_indices[0];
+							tmpIndices[gfxindex * 3 + 1].m_value = tri_indices[1];
+							tmpIndices[gfxindex * 3 + 2].m_value = tri_indices[2];
+						}
+						serializer->finalizeChunk(chunk, "btIntIndexData", BT_ARRAY_CODE, (void*)chunk->m_oldPtr);
+					}
+					break;
+				}
+				case PHY_SHORT:
+				{
+					if (numtriangles)
+					{
+						btChunk* chunk = serializer->allocate(sizeof(btShortIntIndexTripletData), numtriangles);
+						btShortIntIndexTripletData* tmpIndices = (btShortIntIndexTripletData*)chunk->m_oldPtr;
+						memPtr->m_3indices16 = (btShortIntIndexTripletData*)serializer->getUniquePointer(tmpIndices);
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned short int* tri_indices = (unsigned short int*)(indexbase + gfxindex * indexstride);
+							tmpIndices[gfxindex].m_values[0] = tri_indices[0];
+							tmpIndices[gfxindex].m_values[1] = tri_indices[1];
+							tmpIndices[gfxindex].m_values[2] = tri_indices[2];
+							// Fill padding with zeros to appease msan.
+							tmpIndices[gfxindex].m_pad[0] = 0;
+							tmpIndices[gfxindex].m_pad[1] = 0;
+						}
+						serializer->finalizeChunk(chunk, "btShortIntIndexTripletData", BT_ARRAY_CODE, (void*)chunk->m_oldPtr);
+					}
+					break;
+				}
+				case PHY_UCHAR:
+				{
+					if (numtriangles)
+					{
+						btChunk* chunk = serializer->allocate(sizeof(btCharIndexTripletData), numtriangles);
+						btCharIndexTripletData* tmpIndices = (btCharIndexTripletData*)chunk->m_oldPtr;
+						memPtr->m_3indices8 = (btCharIndexTripletData*)serializer->getUniquePointer(tmpIndices);
+						for (gfxindex = 0; gfxindex < numtriangles; gfxindex++)
+						{
+							unsigned char* tri_indices = (unsigned char*)(indexbase + gfxindex * indexstride);
+							tmpIndices[gfxindex].m_values[0] = tri_indices[0];
+							tmpIndices[gfxindex].m_values[1] = tri_indices[1];
+							tmpIndices[gfxindex].m_values[2] = tri_indices[2];
+							// Fill padding with zeros to appease msan.
+							tmpIndices[gfxindex].m_pad = 0;
+						}
+						serializer->finalizeChunk(chunk, "btCharIndexTripletData", BT_ARRAY_CODE, (void*)chunk->m_oldPtr);
+					}
+					break;
+				}
+				default:
+				{
+					btAssert(0);
+					//unknown index type
+				}
+			}
+
+			switch (type)
+			{
+				case PHY_FLOAT:
+				{
+					float* graphicsbase;
+
+					if (numverts)
+					{
+						btChunk* chunk = serializer->allocate(sizeof(btVector3FloatData), numverts);
+						btVector3FloatData* tmpVertices = (btVector3FloatData*)chunk->m_oldPtr;
+						memPtr->m_vertices3f = (btVector3FloatData*)serializer->getUniquePointer(tmpVertices);
+						for (int i = 0; i < numverts; i++)
+						{
+							graphicsbase = (float*)(vertexbase + i * stride);
+							tmpVertices[i].m_floats[0] = graphicsbase[0];
+							tmpVertices[i].m_floats[1] = graphicsbase[1];
+							tmpVertices[i].m_floats[2] = graphicsbase[2];
+						}
+						serializer->finalizeChunk(chunk, "btVector3FloatData", BT_ARRAY_CODE, (void*)chunk->m_oldPtr);
+					}
+					break;
+				}
+
+				case PHY_DOUBLE:
+				{
+					if (numverts)
+					{
+						btChunk* chunk = serializer->allocate(sizeof(btVector3DoubleData), numverts);
+						btVector3DoubleData* tmpVertices = (btVector3DoubleData*)chunk->m_oldPtr;
+						memPtr->m_vertices3d = (btVector3DoubleData*)serializer->getUniquePointer(tmpVertices);
+						for (int i = 0; i < numverts; i++)
+						{
+							double* graphicsbase = (double*)(vertexbase + i * stride);  //for now convert to float, might leave it at double
+							tmpVertices[i].m_floats[0] = graphicsbase[0];
+							tmpVertices[i].m_floats[1] = graphicsbase[1];
+							tmpVertices[i].m_floats[2] = graphicsbase[2];
+						}
+						serializer->finalizeChunk(chunk, "btVector3DoubleData", BT_ARRAY_CODE, (void*)chunk->m_oldPtr);
+					}
+					break;
+				}
+
+				default:
+					btAssert((type == PHY_FLOAT) || (type == PHY_DOUBLE));
+			}
+
+			unLockReadOnlyVertexBase(part);
+		}
+
+		serializer->finalizeChunk(chunk, "btMeshPartData", BT_ARRAY_CODE, chunk->m_oldPtr);
+	}
+
+	// Fill padding with zeros to appease msan.
+	memset(trimeshData->m_padding, 0, sizeof(trimeshData->m_padding));
+
+	m_scaling.serializeFloat(trimeshData->m_scaling);
+	return "btStridingMeshInterfaceData";
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
new file mode 100644
index 0000000..68a41df
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
@@ -0,0 +1,153 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_STRIDING_MESHINTERFACE_H
+#define BT_STRIDING_MESHINTERFACE_H
+
+#include "LinearMath/btVector3.h"
+#include "btTriangleCallback.h"
+#include "btConcaveShape.h"
+
+///	The btStridingMeshInterface is the interface class for high performance generic access to triangle meshes, used in combination with btBvhTriangleMeshShape and some other collision shapes.
+/// Using index striding of 3*sizeof(integer) it can use triangle arrays, using index striding of 1*sizeof(integer) it can handle triangle strips.
+/// It allows for sharing graphics and collision meshes. Also it provides locking/unlocking of graphics meshes that are in gpu memory.
+ATTRIBUTE_ALIGNED16(class)
+btStridingMeshInterface
+{
+protected:
+	btVector3 m_scaling;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btStridingMeshInterface() : m_scaling(btScalar(1.), btScalar(1.), btScalar(1.))
+	{
+	}
+
+	virtual ~btStridingMeshInterface();
+
+	virtual void InternalProcessAllTriangles(btInternalTriangleIndexCallback * callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	///brute force method to calculate aabb
+	void calculateAabbBruteForce(btVector3 & aabbMin, btVector3 & aabbMax);
+
+	/// get read and write access to a subpart of a triangle mesh
+	/// this subpart has a continuous array of vertices and indices
+	/// in this way the mesh can be handled as chunks of memory with striding
+	/// very similar to OpenGL vertexarray support
+	/// make a call to unLockVertexBase when the read and write access is finished
+	virtual void getLockedVertexIndexBase(unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& stride, unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0) = 0;
+
+	virtual void getLockedReadOnlyVertexIndexBase(const unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& stride, const unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0) const = 0;
+
+	/// unLockVertexBase finishes the access to a subpart of the triangle mesh
+	/// make a call to unLockVertexBase when the read and write access (using getLockedVertexIndexBase) is finished
+	virtual void unLockVertexBase(int subpart) = 0;
+
+	virtual void unLockReadOnlyVertexBase(int subpart) const = 0;
+
+	/// getNumSubParts returns the number of separate subparts
+	/// each subpart has a continuous array of vertices and indices
+	virtual int getNumSubParts() const = 0;
+
+	virtual void preallocateVertices(int numverts) = 0;
+	virtual void preallocateIndices(int numindices) = 0;
+
+	virtual bool hasPremadeAabb() const { return false; }
+	virtual void setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax) const
+	{
+		(void)aabbMin;
+		(void)aabbMax;
+	}
+	virtual void getPremadeAabb(btVector3 * aabbMin, btVector3 * aabbMax) const
+	{
+		(void)aabbMin;
+		(void)aabbMax;
+	}
+
+	const btVector3& getScaling() const
+	{
+		return m_scaling;
+	}
+	void setScaling(const btVector3& scaling)
+	{
+		m_scaling = scaling;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+struct btIntIndexData
+{
+	int m_value;
+};
+
+struct btShortIntIndexData
+{
+	short m_value;
+	char m_pad[2];
+};
+
+struct btShortIntIndexTripletData
+{
+	short m_values[3];
+	char m_pad[2];
+};
+
+struct btCharIndexTripletData
+{
+	unsigned char m_values[3];
+	char m_pad;
+};
+
+// clang-format off
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btMeshPartData
+{
+	btVector3FloatData			*m_vertices3f;
+	btVector3DoubleData			*m_vertices3d;
+
+	btIntIndexData				*m_indices32;
+	btShortIntIndexTripletData	*m_3indices16;
+	btCharIndexTripletData		*m_3indices8;
+
+	btShortIntIndexData			*m_indices16;//backwards compatibility
+
+	int                     m_numTriangles;//length of m_indices = m_numTriangles
+	int                     m_numVertices;
+};
+
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btStridingMeshInterfaceData
+{
+	btMeshPartData	*m_meshPartsPtr;
+	btVector3FloatData	m_scaling;
+	int	m_numMeshParts;
+	char m_padding[4];
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btStridingMeshInterface::calculateSerializeBufferSize() const
+{
+	return sizeof(btStridingMeshInterfaceData);
+}
+
+#endif  //BT_STRIDING_MESHINTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
new file mode 100644
index 0000000..c4d33c4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
@@ -0,0 +1,203 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTetrahedronShape.h"
+#include "LinearMath/btMatrix3x3.h"
+
+btBU_Simplex1to4::btBU_Simplex1to4() : btPolyhedralConvexAabbCachingShape(),
+									   m_numVertices(0)
+{
+	m_shapeType = TETRAHEDRAL_SHAPE_PROXYTYPE;
+}
+
+btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0) : btPolyhedralConvexAabbCachingShape(),
+														   m_numVertices(0)
+{
+	m_shapeType = TETRAHEDRAL_SHAPE_PROXYTYPE;
+	addVertex(pt0);
+}
+
+btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0, const btVector3& pt1) : btPolyhedralConvexAabbCachingShape(),
+																				 m_numVertices(0)
+{
+	m_shapeType = TETRAHEDRAL_SHAPE_PROXYTYPE;
+	addVertex(pt0);
+	addVertex(pt1);
+}
+
+btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0, const btVector3& pt1, const btVector3& pt2) : btPolyhedralConvexAabbCachingShape(),
+																									   m_numVertices(0)
+{
+	m_shapeType = TETRAHEDRAL_SHAPE_PROXYTYPE;
+	addVertex(pt0);
+	addVertex(pt1);
+	addVertex(pt2);
+}
+
+btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0, const btVector3& pt1, const btVector3& pt2, const btVector3& pt3) : btPolyhedralConvexAabbCachingShape(),
+																															 m_numVertices(0)
+{
+	m_shapeType = TETRAHEDRAL_SHAPE_PROXYTYPE;
+	addVertex(pt0);
+	addVertex(pt1);
+	addVertex(pt2);
+	addVertex(pt3);
+}
+
+void btBU_Simplex1to4::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+#if 1
+	btPolyhedralConvexAabbCachingShape::getAabb(t, aabbMin, aabbMax);
+#else
+	aabbMin.setValue(BT_LARGE_FLOAT, BT_LARGE_FLOAT, BT_LARGE_FLOAT);
+	aabbMax.setValue(-BT_LARGE_FLOAT, -BT_LARGE_FLOAT, -BT_LARGE_FLOAT);
+
+	//just transform the vertices in worldspace, and take their AABB
+	for (int i = 0; i < m_numVertices; i++)
+	{
+		btVector3 worldVertex = t(m_vertices[i]);
+		aabbMin.setMin(worldVertex);
+		aabbMax.setMax(worldVertex);
+	}
+#endif
+}
+
+void btBU_Simplex1to4::addVertex(const btVector3& pt)
+{
+	m_vertices[m_numVertices++] = pt;
+	recalcLocalAabb();
+}
+
+int btBU_Simplex1to4::getNumVertices() const
+{
+	return m_numVertices;
+}
+
+int btBU_Simplex1to4::getNumEdges() const
+{
+	//euler formula, F-E+V = 2, so E = F+V-2
+
+	switch (m_numVertices)
+	{
+		case 0:
+			return 0;
+		case 1:
+			return 0;
+		case 2:
+			return 1;
+		case 3:
+			return 3;
+		case 4:
+			return 6;
+	}
+
+	return 0;
+}
+
+void btBU_Simplex1to4::getEdge(int i, btVector3& pa, btVector3& pb) const
+{
+	switch (m_numVertices)
+	{
+		case 2:
+			pa = m_vertices[0];
+			pb = m_vertices[1];
+			break;
+		case 3:
+			switch (i)
+			{
+				case 0:
+					pa = m_vertices[0];
+					pb = m_vertices[1];
+					break;
+				case 1:
+					pa = m_vertices[1];
+					pb = m_vertices[2];
+					break;
+				case 2:
+					pa = m_vertices[2];
+					pb = m_vertices[0];
+					break;
+			}
+			break;
+		case 4:
+			switch (i)
+			{
+				case 0:
+					pa = m_vertices[0];
+					pb = m_vertices[1];
+					break;
+				case 1:
+					pa = m_vertices[1];
+					pb = m_vertices[2];
+					break;
+				case 2:
+					pa = m_vertices[2];
+					pb = m_vertices[0];
+					break;
+				case 3:
+					pa = m_vertices[0];
+					pb = m_vertices[3];
+					break;
+				case 4:
+					pa = m_vertices[1];
+					pb = m_vertices[3];
+					break;
+				case 5:
+					pa = m_vertices[2];
+					pb = m_vertices[3];
+					break;
+			}
+	}
+}
+
+void btBU_Simplex1to4::getVertex(int i, btVector3& vtx) const
+{
+	vtx = m_vertices[i];
+}
+
+int btBU_Simplex1to4::getNumPlanes() const
+{
+	switch (m_numVertices)
+	{
+		case 0:
+			return 0;
+		case 1:
+			return 0;
+		case 2:
+			return 0;
+		case 3:
+			return 2;
+		case 4:
+			return 4;
+		default:
+		{
+		}
+	}
+	return 0;
+}
+
+void btBU_Simplex1to4::getPlane(btVector3&, btVector3&, int) const
+{
+}
+
+int btBU_Simplex1to4::getIndex(int) const
+{
+	return 0;
+}
+
+bool btBU_Simplex1to4::isInside(const btVector3&, btScalar) const
+{
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
new file mode 100644
index 0000000..f5e2209
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
@@ -0,0 +1,71 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMPLEX_1TO4_SHAPE
+#define BT_SIMPLEX_1TO4_SHAPE
+
+#include "btPolyhedralConvexShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+
+///The btBU_Simplex1to4 implements tetrahedron, triangle, line, vertex collision shapes. In most cases it is better to use btConvexHullShape instead.
+ATTRIBUTE_ALIGNED16(class)
+btBU_Simplex1to4 : public btPolyhedralConvexAabbCachingShape
+{
+protected:
+	int m_numVertices;
+	btVector3 m_vertices[4];
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btBU_Simplex1to4();
+
+	btBU_Simplex1to4(const btVector3& pt0);
+	btBU_Simplex1to4(const btVector3& pt0, const btVector3& pt1);
+	btBU_Simplex1to4(const btVector3& pt0, const btVector3& pt1, const btVector3& pt2);
+	btBU_Simplex1to4(const btVector3& pt0, const btVector3& pt1, const btVector3& pt2, const btVector3& pt3);
+
+	void reset()
+	{
+		m_numVertices = 0;
+	}
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	void addVertex(const btVector3& pt);
+
+	//PolyhedralConvexShape interface
+
+	virtual int getNumVertices() const;
+
+	virtual int getNumEdges() const;
+
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const;
+
+	virtual void getVertex(int i, btVector3& vtx) const;
+
+	virtual int getNumPlanes() const;
+
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const;
+
+	virtual int getIndex(int i) const;
+
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const;
+
+	///getName is for debugging
+	virtual const char* getName() const { return "btBU_Simplex1to4"; }
+};
+
+#endif  //BT_SIMPLEX_1TO4_SHAPE
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
new file mode 100644
index 0000000..3b6db2b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
@@ -0,0 +1,28 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTriangleBuffer.h"
+
+void btTriangleBuffer::processTriangle(btVector3* triangle, int partId, int triangleIndex)
+{
+	btTriangle tri;
+	tri.m_vertex0 = triangle[0];
+	tri.m_vertex1 = triangle[1];
+	tri.m_vertex2 = triangle[2];
+	tri.m_partId = partId;
+	tri.m_triangleIndex = triangleIndex;
+
+	m_triangleBuffer.push_back(tri);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
new file mode 100644
index 0000000..a89b9cd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
@@ -0,0 +1,63 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TRIANGLE_BUFFER_H
+#define BT_TRIANGLE_BUFFER_H
+
+#include "btTriangleCallback.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+struct btTriangle
+{
+	btVector3 m_vertex0;
+	btVector3 m_vertex1;
+	btVector3 m_vertex2;
+	int m_partId;
+	int m_triangleIndex;
+};
+
+///The btTriangleBuffer callback can be useful to collect and store overlapping triangles between AABB and concave objects that support 'processAllTriangles'
+///Example usage of this class:
+///			btTriangleBuffer	triBuf;
+///			concaveShape->processAllTriangles(&triBuf,aabbMin, aabbMax);
+///			for (int i=0;i<triBuf.getNumTriangles();i++)
+///			{
+///				const btTriangle& tri = triBuf.getTriangle(i);
+///				//do something useful here with the triangle
+///			}
+class btTriangleBuffer : public btTriangleCallback
+{
+	btAlignedObjectArray<btTriangle> m_triangleBuffer;
+
+public:
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
+
+	int getNumTriangles() const
+	{
+		return int(m_triangleBuffer.size());
+	}
+
+	const btTriangle& getTriangle(int index) const
+	{
+		return m_triangleBuffer[index];
+	}
+
+	void clearBuffer()
+	{
+		m_triangleBuffer.clear();
+	}
+};
+
+#endif  //BT_TRIANGLE_BUFFER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
new file mode 100644
index 0000000..5bd2c59
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
@@ -0,0 +1,24 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTriangleCallback.h"
+
+btTriangleCallback::~btTriangleCallback()
+{
+}
+
+btInternalTriangleIndexCallback::~btInternalTriangleIndexCallback()
+{
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.h
new file mode 100644
index 0000000..d364489
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleCallback.h
@@ -0,0 +1,37 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TRIANGLE_CALLBACK_H
+#define BT_TRIANGLE_CALLBACK_H
+
+#include "LinearMath/btVector3.h"
+
+///The btTriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles.
+///This callback is called by processAllTriangles for all btConcaveShape derived class, such as  btBvhTriangleMeshShape, btStaticPlaneShape and btHeightfieldTerrainShape.
+class btTriangleCallback
+{
+public:
+	virtual ~btTriangleCallback();
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex) = 0;
+};
+
+class btInternalTriangleIndexCallback
+{
+public:
+	virtual ~btInternalTriangleIndexCallback();
+	virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex) = 0;
+};
+
+#endif  //BT_TRIANGLE_CALLBACK_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
new file mode 100644
index 0000000..dae4255
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
@@ -0,0 +1,90 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTriangleIndexVertexArray.h"
+
+btTriangleIndexVertexArray::btTriangleIndexVertexArray(int numTriangles, int* triangleIndexBase, int triangleIndexStride, int numVertices, btScalar* vertexBase, int vertexStride)
+	: m_hasAabb(0)
+{
+	btIndexedMesh mesh;
+
+	mesh.m_numTriangles = numTriangles;
+	mesh.m_triangleIndexBase = (const unsigned char*)triangleIndexBase;
+	mesh.m_triangleIndexStride = triangleIndexStride;
+	mesh.m_numVertices = numVertices;
+	mesh.m_vertexBase = (const unsigned char*)vertexBase;
+	mesh.m_vertexStride = vertexStride;
+
+	addIndexedMesh(mesh);
+}
+
+btTriangleIndexVertexArray::~btTriangleIndexVertexArray()
+{
+}
+
+void btTriangleIndexVertexArray::getLockedVertexIndexBase(unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart)
+{
+	btAssert(subpart < getNumSubParts());
+
+	btIndexedMesh& mesh = m_indexedMeshes[subpart];
+
+	numverts = mesh.m_numVertices;
+	(*vertexbase) = (unsigned char*)mesh.m_vertexBase;
+
+	type = mesh.m_vertexType;
+
+	vertexStride = mesh.m_vertexStride;
+
+	numfaces = mesh.m_numTriangles;
+
+	(*indexbase) = (unsigned char*)mesh.m_triangleIndexBase;
+	indexstride = mesh.m_triangleIndexStride;
+	indicestype = mesh.m_indexType;
+}
+
+void btTriangleIndexVertexArray::getLockedReadOnlyVertexIndexBase(const unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, const unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart) const
+{
+	const btIndexedMesh& mesh = m_indexedMeshes[subpart];
+
+	numverts = mesh.m_numVertices;
+	(*vertexbase) = (const unsigned char*)mesh.m_vertexBase;
+
+	type = mesh.m_vertexType;
+
+	vertexStride = mesh.m_vertexStride;
+
+	numfaces = mesh.m_numTriangles;
+	(*indexbase) = (const unsigned char*)mesh.m_triangleIndexBase;
+	indexstride = mesh.m_triangleIndexStride;
+	indicestype = mesh.m_indexType;
+}
+
+bool btTriangleIndexVertexArray::hasPremadeAabb() const
+{
+	return (m_hasAabb == 1);
+}
+
+void btTriangleIndexVertexArray::setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	m_aabbMin = aabbMin;
+	m_aabbMax = aabbMax;
+	m_hasAabb = 1;  // this is intentionally an int see notes in header
+}
+
+void btTriangleIndexVertexArray::getPremadeAabb(btVector3* aabbMin, btVector3* aabbMax) const
+{
+	*aabbMin = m_aabbMin;
+	*aabbMax = m_aabbMax;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
new file mode 100644
index 0000000..556aa3f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
@@ -0,0 +1,128 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
+#define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
+
+#include "btStridingMeshInterface.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btScalar.h"
+
+///The btIndexedMesh indexes a single vertex and index array. Multiple btIndexedMesh objects can be passed into a btTriangleIndexVertexArray using addIndexedMesh.
+///Instead of the number of indices, we pass the number of triangles.
+ATTRIBUTE_ALIGNED16(struct)
+btIndexedMesh
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_numTriangles;
+	const unsigned char* m_triangleIndexBase;
+	// Size in byte of the indices for one triangle (3*sizeof(index_type) if the indices are tightly packed)
+	int m_triangleIndexStride;
+	int m_numVertices;
+	const unsigned char* m_vertexBase;
+	// Size of a vertex, in bytes
+	int m_vertexStride;
+
+	// The index type is set when adding an indexed mesh to the
+	// btTriangleIndexVertexArray, do not set it manually
+	PHY_ScalarType m_indexType;
+
+	// The vertex type has a default type similar to Bullet's precision mode (float or double)
+	// but can be set manually if you for example run Bullet with double precision but have
+	// mesh data in single precision..
+	PHY_ScalarType m_vertexType;
+
+	btIndexedMesh()
+		: m_indexType(PHY_INTEGER),
+#ifdef BT_USE_DOUBLE_PRECISION
+		  m_vertexType(PHY_DOUBLE)
+#else   // BT_USE_DOUBLE_PRECISION
+		  m_vertexType(PHY_FLOAT)
+#endif  // BT_USE_DOUBLE_PRECISION
+	{
+	}
+};
+
+typedef btAlignedObjectArray<btIndexedMesh> IndexedMeshArray;
+
+///The btTriangleIndexVertexArray allows to access multiple triangle meshes, by indexing into existing triangle/index arrays.
+///Additional meshes can be added using addIndexedMesh
+///No duplicate is made of the vertex/index data, it only indexes into external vertex/index arrays.
+///So keep those arrays around during the lifetime of this btTriangleIndexVertexArray.
+ATTRIBUTE_ALIGNED16(class)
+btTriangleIndexVertexArray : public btStridingMeshInterface
+{
+protected:
+	IndexedMeshArray m_indexedMeshes;
+	int m_pad[2];
+	mutable int m_hasAabb;  // using int instead of bool to maintain alignment
+	mutable btVector3 m_aabbMin;
+	mutable btVector3 m_aabbMax;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btTriangleIndexVertexArray() : m_hasAabb(0)
+	{
+	}
+
+	virtual ~btTriangleIndexVertexArray();
+
+	//just to be backwards compatible
+	btTriangleIndexVertexArray(int numTriangles, int* triangleIndexBase, int triangleIndexStride, int numVertices, btScalar* vertexBase, int vertexStride);
+
+	void addIndexedMesh(const btIndexedMesh& mesh, PHY_ScalarType indexType = PHY_INTEGER)
+	{
+		m_indexedMeshes.push_back(mesh);
+		m_indexedMeshes[m_indexedMeshes.size() - 1].m_indexType = indexType;
+	}
+
+	virtual void getLockedVertexIndexBase(unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0);
+
+	virtual void getLockedReadOnlyVertexIndexBase(const unsigned char** vertexbase, int& numverts, PHY_ScalarType& type, int& vertexStride, const unsigned char** indexbase, int& indexstride, int& numfaces, PHY_ScalarType& indicestype, int subpart = 0) const;
+
+	/// unLockVertexBase finishes the access to a subpart of the triangle mesh
+	/// make a call to unLockVertexBase when the read and write access (using getLockedVertexIndexBase) is finished
+	virtual void unLockVertexBase(int subpart) { (void)subpart; }
+
+	virtual void unLockReadOnlyVertexBase(int subpart) const { (void)subpart; }
+
+	/// getNumSubParts returns the number of separate subparts
+	/// each subpart has a continuous array of vertices and indices
+	virtual int getNumSubParts() const
+	{
+		return (int)m_indexedMeshes.size();
+	}
+
+	IndexedMeshArray& getIndexedMeshArray()
+	{
+		return m_indexedMeshes;
+	}
+
+	const IndexedMeshArray& getIndexedMeshArray() const
+	{
+		return m_indexedMeshes;
+	}
+
+	virtual void preallocateVertices(int numverts) { (void)numverts; }
+	virtual void preallocateIndices(int numindices) { (void)numindices; }
+
+	virtual bool hasPremadeAabb() const;
+	virtual void setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax) const;
+	virtual void getPremadeAabb(btVector3 * aabbMin, btVector3 * aabbMax) const;
+};
+
+#endif  //BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
new file mode 100644
index 0000000..4bf133d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
@@ -0,0 +1,84 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was created by Alex Silverman
+
+#include "btTriangleIndexVertexMaterialArray.h"
+
+btTriangleIndexVertexMaterialArray::btTriangleIndexVertexMaterialArray(int numTriangles, int* triangleIndexBase, int triangleIndexStride,
+																	   int numVertices, btScalar* vertexBase, int vertexStride,
+																	   int numMaterials, unsigned char* materialBase, int materialStride,
+																	   int* triangleMaterialsBase, int materialIndexStride) : btTriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride)
+{
+	btMaterialProperties mat;
+
+	mat.m_numMaterials = numMaterials;
+	mat.m_materialBase = materialBase;
+	mat.m_materialStride = materialStride;
+#ifdef BT_USE_DOUBLE_PRECISION
+	mat.m_materialType = PHY_DOUBLE;
+#else
+	mat.m_materialType = PHY_FLOAT;
+#endif
+
+	mat.m_numTriangles = numTriangles;
+	mat.m_triangleMaterialsBase = (unsigned char*)triangleMaterialsBase;
+	mat.m_triangleMaterialStride = materialIndexStride;
+	mat.m_triangleType = PHY_INTEGER;
+
+	addMaterialProperties(mat);
+}
+
+void btTriangleIndexVertexMaterialArray::getLockedMaterialBase(unsigned char** materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+															   unsigned char** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
+{
+	btAssert(subpart < getNumSubParts());
+
+	btMaterialProperties& mats = m_materials[subpart];
+
+	numMaterials = mats.m_numMaterials;
+	(*materialBase) = (unsigned char*)mats.m_materialBase;
+#ifdef BT_USE_DOUBLE_PRECISION
+	materialType = PHY_DOUBLE;
+#else
+	materialType = PHY_FLOAT;
+#endif
+	materialStride = mats.m_materialStride;
+
+	numTriangles = mats.m_numTriangles;
+	(*triangleMaterialBase) = (unsigned char*)mats.m_triangleMaterialsBase;
+	triangleMaterialStride = mats.m_triangleMaterialStride;
+	triangleType = mats.m_triangleType;
+}
+
+void btTriangleIndexVertexMaterialArray::getLockedReadOnlyMaterialBase(const unsigned char** materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+																	   const unsigned char** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
+{
+	btMaterialProperties& mats = m_materials[subpart];
+
+	numMaterials = mats.m_numMaterials;
+	(*materialBase) = (const unsigned char*)mats.m_materialBase;
+#ifdef BT_USE_DOUBLE_PRECISION
+	materialType = PHY_DOUBLE;
+#else
+	materialType = PHY_FLOAT;
+#endif
+	materialStride = mats.m_materialStride;
+
+	numTriangles = mats.m_numTriangles;
+	(*triangleMaterialBase) = (const unsigned char*)mats.m_triangleMaterialsBase;
+	triangleMaterialStride = mats.m_triangleMaterialStride;
+	triangleType = mats.m_triangleType;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
new file mode 100644
index 0000000..315b1e2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
@@ -0,0 +1,83 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was created by Alex Silverman
+
+#ifndef BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
+#define BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
+
+#include "btTriangleIndexVertexArray.h"
+
+ATTRIBUTE_ALIGNED16(struct)
+btMaterialProperties
+{
+	///m_materialBase ==========> 2 btScalar values make up one material, friction then restitution
+	int m_numMaterials;
+	const unsigned char* m_materialBase;
+	int m_materialStride;
+	PHY_ScalarType m_materialType;
+	///m_numTriangles <=========== This exists in the btIndexedMesh object for the same subpart, but since we're
+	///                           padding the structure, it can be reproduced at no real cost
+	///m_triangleMaterials =====> 1 integer value makes up one entry
+	///                           eg: m_triangleMaterials[1] = 5; // This will set triangle 2 to use material 5
+	int m_numTriangles;
+	const unsigned char* m_triangleMaterialsBase;
+	int m_triangleMaterialStride;
+	///m_triangleType <========== Automatically set in addMaterialProperties
+	PHY_ScalarType m_triangleType;
+};
+
+typedef btAlignedObjectArray<btMaterialProperties> MaterialArray;
+
+///Teh btTriangleIndexVertexMaterialArray is built on TriangleIndexVertexArray
+///The addition of a material array allows for the utilization of the partID and
+///triangleIndex that are returned in the ContactAddedCallback.  As with
+///TriangleIndexVertexArray, no duplicate is made of the material data, so it
+///is the users responsibility to maintain the array during the lifetime of the
+///TriangleIndexVertexMaterialArray.
+ATTRIBUTE_ALIGNED16(class)
+btTriangleIndexVertexMaterialArray : public btTriangleIndexVertexArray
+{
+protected:
+	MaterialArray m_materials;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btTriangleIndexVertexMaterialArray()
+	{
+	}
+
+	btTriangleIndexVertexMaterialArray(int numTriangles, int* triangleIndexBase, int triangleIndexStride,
+									   int numVertices, btScalar* vertexBase, int vertexStride,
+									   int numMaterials, unsigned char* materialBase, int materialStride,
+									   int* triangleMaterialsBase, int materialIndexStride);
+
+	virtual ~btTriangleIndexVertexMaterialArray() {}
+
+	void addMaterialProperties(const btMaterialProperties& mat, PHY_ScalarType triangleType = PHY_INTEGER)
+	{
+		m_materials.push_back(mat);
+		m_materials[m_materials.size() - 1].m_triangleType = triangleType;
+	}
+
+	virtual void getLockedMaterialBase(unsigned char** materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+									   unsigned char** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart = 0);
+
+	virtual void getLockedReadOnlyMaterialBase(const unsigned char** materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+											   const unsigned char** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart = 0);
+};
+
+#endif  //BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
new file mode 100644
index 0000000..8ee35ef
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
@@ -0,0 +1,238 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2010 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _BT_TRIANGLE_INFO_MAP_H
+#define _BT_TRIANGLE_INFO_MAP_H
+
+#include "LinearMath/btHashMap.h"
+#include "LinearMath/btSerializer.h"
+
+///for btTriangleInfo m_flags
+#define TRI_INFO_V0V1_CONVEX 1
+#define TRI_INFO_V1V2_CONVEX 2
+#define TRI_INFO_V2V0_CONVEX 4
+
+#define TRI_INFO_V0V1_SWAP_NORMALB 8
+#define TRI_INFO_V1V2_SWAP_NORMALB 16
+#define TRI_INFO_V2V0_SWAP_NORMALB 32
+
+///The btTriangleInfo structure stores information to adjust collision normals to avoid collisions against internal edges
+///it can be generated using
+struct btTriangleInfo
+{
+	btTriangleInfo()
+	{
+		m_edgeV0V1Angle = SIMD_2_PI;
+		m_edgeV1V2Angle = SIMD_2_PI;
+		m_edgeV2V0Angle = SIMD_2_PI;
+		m_flags = 0;
+	}
+
+	int m_flags;
+
+	btScalar m_edgeV0V1Angle;
+	btScalar m_edgeV1V2Angle;
+	btScalar m_edgeV2V0Angle;
+};
+
+typedef btHashMap<btHashInt, btTriangleInfo> btInternalTriangleInfoMap;
+
+///The btTriangleInfoMap stores edge angle information for some triangles. You can compute this information yourself or using btGenerateInternalEdgeInfo.
+struct btTriangleInfoMap : public btInternalTriangleInfoMap
+{
+	btScalar m_convexEpsilon;          ///used to determine if an edge or contact normal is convex, using the dot product
+	btScalar m_planarEpsilon;          ///used to determine if a triangle edge is planar with zero angle
+	btScalar m_equalVertexThreshold;   ///used to compute connectivity: if the distance between two vertices is smaller than m_equalVertexThreshold, they are considered to be 'shared'
+	btScalar m_edgeDistanceThreshold;  ///used to determine edge contacts: if the closest distance between a contact point and an edge is smaller than this distance threshold it is considered to "hit the edge"
+	btScalar m_maxEdgeAngleThreshold;  //ignore edges that connect triangles at an angle larger than this m_maxEdgeAngleThreshold
+	btScalar m_zeroAreaThreshold;      ///used to determine if a triangle is degenerate (length squared of cross product of 2 triangle edges < threshold)
+
+	btTriangleInfoMap()
+	{
+		m_convexEpsilon = 0.00f;
+		m_planarEpsilon = 0.0001f;
+		m_equalVertexThreshold = btScalar(0.0001) * btScalar(0.0001);
+		m_edgeDistanceThreshold = btScalar(0.1);
+		m_zeroAreaThreshold = btScalar(0.0001) * btScalar(0.0001);
+		m_maxEdgeAngleThreshold = SIMD_2_PI;
+	}
+	virtual ~btTriangleInfoMap() {}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+
+	void deSerialize(struct btTriangleInfoMapData& data);
+};
+
+// clang-format off
+
+///those fields have to be float and not btScalar for the serialization to work properly
+struct	btTriangleInfoData
+{
+	int			m_flags;
+	float	m_edgeV0V1Angle;
+	float	m_edgeV1V2Angle;
+	float	m_edgeV2V0Angle;
+};
+
+struct	btTriangleInfoMapData
+{
+	int					*m_hashTablePtr;
+	int					*m_nextPtr;
+	btTriangleInfoData	*m_valueArrayPtr;
+	int					*m_keyArrayPtr;
+
+	float	m_convexEpsilon;
+	float	m_planarEpsilon;
+	float	m_equalVertexThreshold; 
+	float	m_edgeDistanceThreshold;
+	float	m_zeroAreaThreshold;
+
+	int		m_nextSize;
+	int		m_hashTableSize;
+	int		m_numValues;
+	int		m_numKeys;
+	char	m_padding[4];
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btTriangleInfoMap::calculateSerializeBufferSize() const
+{
+	return sizeof(btTriangleInfoMapData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btTriangleInfoMap::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btTriangleInfoMapData* tmapData = (btTriangleInfoMapData*)dataBuffer;
+	tmapData->m_convexEpsilon = (float)m_convexEpsilon;
+	tmapData->m_planarEpsilon = (float)m_planarEpsilon;
+	tmapData->m_equalVertexThreshold = (float)m_equalVertexThreshold;
+	tmapData->m_edgeDistanceThreshold = (float)m_edgeDistanceThreshold;
+	tmapData->m_zeroAreaThreshold = (float)m_zeroAreaThreshold;
+
+	tmapData->m_hashTableSize = m_hashTable.size();
+
+	tmapData->m_hashTablePtr = tmapData->m_hashTableSize ? (int*)serializer->getUniquePointer((void*)&m_hashTable[0]) : 0;
+	if (tmapData->m_hashTablePtr)
+	{
+		//serialize an int buffer
+		int sz = sizeof(int);
+		int numElem = tmapData->m_hashTableSize;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		int* memPtr = (int*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			*memPtr = m_hashTable[i];
+		}
+		serializer->finalizeChunk(chunk, "int", BT_ARRAY_CODE, (void*)&m_hashTable[0]);
+	}
+
+	tmapData->m_nextSize = m_next.size();
+	tmapData->m_nextPtr = tmapData->m_nextSize ? (int*)serializer->getUniquePointer((void*)&m_next[0]) : 0;
+	if (tmapData->m_nextPtr)
+	{
+		int sz = sizeof(int);
+		int numElem = tmapData->m_nextSize;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		int* memPtr = (int*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			*memPtr = m_next[i];
+		}
+		serializer->finalizeChunk(chunk, "int", BT_ARRAY_CODE, (void*)&m_next[0]);
+	}
+
+	tmapData->m_numValues = m_valueArray.size();
+	tmapData->m_valueArrayPtr = tmapData->m_numValues ? (btTriangleInfoData*)serializer->getUniquePointer((void*)&m_valueArray[0]) : 0;
+	if (tmapData->m_valueArrayPtr)
+	{
+		int sz = sizeof(btTriangleInfoData);
+		int numElem = tmapData->m_numValues;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		btTriangleInfoData* memPtr = (btTriangleInfoData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_edgeV0V1Angle = (float)m_valueArray[i].m_edgeV0V1Angle;
+			memPtr->m_edgeV1V2Angle = (float)m_valueArray[i].m_edgeV1V2Angle;
+			memPtr->m_edgeV2V0Angle = (float)m_valueArray[i].m_edgeV2V0Angle;
+			memPtr->m_flags = m_valueArray[i].m_flags;
+		}
+		serializer->finalizeChunk(chunk, "btTriangleInfoData", BT_ARRAY_CODE, (void*)&m_valueArray[0]);
+	}
+
+	tmapData->m_numKeys = m_keyArray.size();
+	tmapData->m_keyArrayPtr = tmapData->m_numKeys ? (int*)serializer->getUniquePointer((void*)&m_keyArray[0]) : 0;
+	if (tmapData->m_keyArrayPtr)
+	{
+		int sz = sizeof(int);
+		int numElem = tmapData->m_numValues;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		int* memPtr = (int*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			*memPtr = m_keyArray[i].getUid1();
+		}
+		serializer->finalizeChunk(chunk, "int", BT_ARRAY_CODE, (void*)&m_keyArray[0]);
+	}
+
+	// Fill padding with zeros to appease msan.
+	tmapData->m_padding[0] = 0;
+	tmapData->m_padding[1] = 0;
+	tmapData->m_padding[2] = 0;
+	tmapData->m_padding[3] = 0;
+
+	return "btTriangleInfoMapData";
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE void btTriangleInfoMap::deSerialize(btTriangleInfoMapData& tmapData)
+{
+	m_convexEpsilon = tmapData.m_convexEpsilon;
+	m_planarEpsilon = tmapData.m_planarEpsilon;
+	m_equalVertexThreshold = tmapData.m_equalVertexThreshold;
+	m_edgeDistanceThreshold = tmapData.m_edgeDistanceThreshold;
+	m_zeroAreaThreshold = tmapData.m_zeroAreaThreshold;
+	m_hashTable.resize(tmapData.m_hashTableSize);
+	int i = 0;
+	for (i = 0; i < tmapData.m_hashTableSize; i++)
+	{
+		m_hashTable[i] = tmapData.m_hashTablePtr[i];
+	}
+	m_next.resize(tmapData.m_nextSize);
+	for (i = 0; i < tmapData.m_nextSize; i++)
+	{
+		m_next[i] = tmapData.m_nextPtr[i];
+	}
+	m_valueArray.resize(tmapData.m_numValues);
+	for (i = 0; i < tmapData.m_numValues; i++)
+	{
+		m_valueArray[i].m_edgeV0V1Angle = tmapData.m_valueArrayPtr[i].m_edgeV0V1Angle;
+		m_valueArray[i].m_edgeV1V2Angle = tmapData.m_valueArrayPtr[i].m_edgeV1V2Angle;
+		m_valueArray[i].m_edgeV2V0Angle = tmapData.m_valueArrayPtr[i].m_edgeV2V0Angle;
+		m_valueArray[i].m_flags = tmapData.m_valueArrayPtr[i].m_flags;
+	}
+
+	m_keyArray.resize(tmapData.m_numKeys, btHashInt(0));
+	for (i = 0; i < tmapData.m_numKeys; i++)
+	{
+		m_keyArray[i].setUid1(tmapData.m_keyArrayPtr[i]);
+	}
+}
+
+#endif  //_BT_TRIANGLE_INFO_MAP_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
new file mode 100644
index 0000000..abd8c22
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
@@ -0,0 +1,167 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTriangleMesh.h"
+
+btTriangleMesh::btTriangleMesh(bool use32bitIndices, bool use4componentVertices)
+	: m_use32bitIndices(use32bitIndices),
+	  m_use4componentVertices(use4componentVertices),
+	  m_weldingThreshold(0.0)
+{
+	btIndexedMesh meshIndex;
+	meshIndex.m_numTriangles = 0;
+	meshIndex.m_numVertices = 0;
+	meshIndex.m_indexType = PHY_INTEGER;
+	meshIndex.m_triangleIndexBase = 0;
+	meshIndex.m_triangleIndexStride = 3 * sizeof(int);
+	meshIndex.m_vertexBase = 0;
+	meshIndex.m_vertexStride = sizeof(btVector3);
+	m_indexedMeshes.push_back(meshIndex);
+
+	if (m_use32bitIndices)
+	{
+		m_indexedMeshes[0].m_numTriangles = m_32bitIndices.size() / 3;
+		m_indexedMeshes[0].m_triangleIndexBase = 0;
+		m_indexedMeshes[0].m_indexType = PHY_INTEGER;
+		m_indexedMeshes[0].m_triangleIndexStride = 3 * sizeof(int);
+	}
+	else
+	{
+		m_indexedMeshes[0].m_numTriangles = m_16bitIndices.size() / 3;
+		m_indexedMeshes[0].m_triangleIndexBase = 0;
+		m_indexedMeshes[0].m_indexType = PHY_SHORT;
+		m_indexedMeshes[0].m_triangleIndexStride = 3 * sizeof(short int);
+	}
+
+	if (m_use4componentVertices)
+	{
+		m_indexedMeshes[0].m_numVertices = m_4componentVertices.size();
+		m_indexedMeshes[0].m_vertexBase = 0;
+		m_indexedMeshes[0].m_vertexStride = sizeof(btVector3);
+	}
+	else
+	{
+		m_indexedMeshes[0].m_numVertices = m_3componentVertices.size() / 3;
+		m_indexedMeshes[0].m_vertexBase = 0;
+		m_indexedMeshes[0].m_vertexStride = 3 * sizeof(btScalar);
+	}
+}
+
+void btTriangleMesh::addIndex(int index)
+{
+	if (m_use32bitIndices)
+	{
+		m_32bitIndices.push_back(index);
+		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*)&m_32bitIndices[0];
+	}
+	else
+	{
+		m_16bitIndices.push_back(index);
+		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*)&m_16bitIndices[0];
+	}
+}
+
+void btTriangleMesh::addTriangleIndices(int index1, int index2, int index3)
+{
+	m_indexedMeshes[0].m_numTriangles++;
+	addIndex(index1);
+	addIndex(index2);
+	addIndex(index3);
+}
+
+int btTriangleMesh::findOrAddVertex(const btVector3& vertex, bool removeDuplicateVertices)
+{
+	//return index of new/existing vertex
+	///@todo: could use acceleration structure for this
+	if (m_use4componentVertices)
+	{
+		if (removeDuplicateVertices)
+		{
+			for (int i = 0; i < m_4componentVertices.size(); i++)
+			{
+				if ((m_4componentVertices[i] - vertex).length2() <= m_weldingThreshold)
+				{
+					return i;
+				}
+			}
+		}
+		m_indexedMeshes[0].m_numVertices++;
+		m_4componentVertices.push_back(vertex);
+		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_4componentVertices[0];
+
+		return m_4componentVertices.size() - 1;
+	}
+	else
+	{
+		if (removeDuplicateVertices)
+		{
+			for (int i = 0; i < m_3componentVertices.size(); i += 3)
+			{
+				btVector3 vtx(m_3componentVertices[i], m_3componentVertices[i + 1], m_3componentVertices[i + 2]);
+				if ((vtx - vertex).length2() <= m_weldingThreshold)
+				{
+					return i / 3;
+				}
+			}
+		}
+		m_3componentVertices.push_back(vertex.getX());
+		m_3componentVertices.push_back(vertex.getY());
+		m_3componentVertices.push_back(vertex.getZ());
+		m_indexedMeshes[0].m_numVertices++;
+		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
+		return (m_3componentVertices.size() / 3) - 1;
+	}
+}
+
+void btTriangleMesh::addTriangle(const btVector3& vertex0, const btVector3& vertex1, const btVector3& vertex2, bool removeDuplicateVertices)
+{
+	m_indexedMeshes[0].m_numTriangles++;
+	addIndex(findOrAddVertex(vertex0, removeDuplicateVertices));
+	addIndex(findOrAddVertex(vertex1, removeDuplicateVertices));
+	addIndex(findOrAddVertex(vertex2, removeDuplicateVertices));
+}
+
+int btTriangleMesh::getNumTriangles() const
+{
+	if (m_use32bitIndices)
+	{
+		return m_32bitIndices.size() / 3;
+	}
+	return m_16bitIndices.size() / 3;
+}
+
+void btTriangleMesh::preallocateVertices(int numverts)
+{
+	if (m_use4componentVertices)
+	{
+		m_4componentVertices.reserve(numverts);
+	}
+	else
+	{
+		m_3componentVertices.reserve(numverts);
+	}
+}
+
+void btTriangleMesh::preallocateIndices(int numindices)
+{
+	if (m_use32bitIndices)
+	{
+		m_32bitIndices.reserve(numindices);
+	}
+	else
+	{
+		m_16bitIndices.reserve(numindices);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.h
new file mode 100644
index 0000000..a8a3623
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMesh.h
@@ -0,0 +1,69 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TRIANGLE_MESH_H
+#define BT_TRIANGLE_MESH_H
+
+#include "btTriangleIndexVertexArray.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+///The btTriangleMesh class is a convenience class derived from btTriangleIndexVertexArray, that provides storage for a concave triangle mesh. It can be used as data for the btBvhTriangleMeshShape.
+///It allows either 32bit or 16bit indices, and 4 (x-y-z-w) or 3 (x-y-z) component vertices.
+///If you want to share triangle/index data between graphics mesh and collision mesh (btBvhTriangleMeshShape), you can directly use btTriangleIndexVertexArray or derive your own class from btStridingMeshInterface.
+///Performance of btTriangleMesh and btTriangleIndexVertexArray used in a btBvhTriangleMeshShape is the same.
+class btTriangleMesh : public btTriangleIndexVertexArray
+{
+	btAlignedObjectArray<btVector3> m_4componentVertices;
+	btAlignedObjectArray<btScalar> m_3componentVertices;
+
+	btAlignedObjectArray<unsigned int> m_32bitIndices;
+	btAlignedObjectArray<unsigned short int> m_16bitIndices;
+	bool m_use32bitIndices;
+	bool m_use4componentVertices;
+
+public:
+	btScalar m_weldingThreshold;
+
+	btTriangleMesh(bool use32bitIndices = true, bool use4componentVertices = true);
+
+	bool getUse32bitIndices() const
+	{
+		return m_use32bitIndices;
+	}
+
+	bool getUse4componentVertices() const
+	{
+		return m_use4componentVertices;
+	}
+	///By default addTriangle won't search for duplicate vertices, because the search is very slow for large triangle meshes.
+	///In general it is better to directly use btTriangleIndexVertexArray instead.
+	void addTriangle(const btVector3& vertex0, const btVector3& vertex1, const btVector3& vertex2, bool removeDuplicateVertices = false);
+
+	///Add a triangle using its indices. Make sure the indices are pointing within the vertices array, so add the vertices first (and to be sure, avoid removal of duplicate vertices)
+	void addTriangleIndices(int index1, int index2, int index3);
+
+	int getNumTriangles() const;
+
+	virtual void preallocateVertices(int numverts);
+	virtual void preallocateIndices(int numindices);
+
+	///findOrAddVertex is an internal method, use addTriangle instead
+	int findOrAddVertex(const btVector3& vertex, bool removeDuplicateVertices);
+	///addIndex is an internal method, use addTriangle instead
+	void addIndex(int index);
+};
+
+#endif  //BT_TRIANGLE_MESH_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
new file mode 100644
index 0000000..aec2390
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
@@ -0,0 +1,179 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTriangleMeshShape.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btQuaternion.h"
+#include "btStridingMeshInterface.h"
+#include "LinearMath/btAabbUtil2.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+
+btTriangleMeshShape::btTriangleMeshShape(btStridingMeshInterface* meshInterface)
+	: btConcaveShape(), m_meshInterface(meshInterface)
+{
+	m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE;
+	if (meshInterface->hasPremadeAabb())
+	{
+		meshInterface->getPremadeAabb(&m_localAabbMin, &m_localAabbMax);
+	}
+	else
+	{
+		recalcLocalAabb();
+	}
+}
+
+btTriangleMeshShape::~btTriangleMeshShape()
+{
+}
+
+void btTriangleMeshShape::getAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	btVector3 localHalfExtents = btScalar(0.5) * (m_localAabbMax - m_localAabbMin);
+	localHalfExtents += btVector3(getMargin(), getMargin(), getMargin());
+	btVector3 localCenter = btScalar(0.5) * (m_localAabbMax + m_localAabbMin);
+
+	btMatrix3x3 abs_b = trans.getBasis().absolute();
+
+	btVector3 center = trans(localCenter);
+
+	btVector3 extent = localHalfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	aabbMin = center - extent;
+	aabbMax = center + extent;
+}
+
+void btTriangleMeshShape::recalcLocalAabb()
+{
+	for (int i = 0; i < 3; i++)
+	{
+		btVector3 vec(btScalar(0.), btScalar(0.), btScalar(0.));
+		vec[i] = btScalar(1.);
+		btVector3 tmp = localGetSupportingVertex(vec);
+		m_localAabbMax[i] = tmp[i] + m_collisionMargin;
+		vec[i] = btScalar(-1.);
+		tmp = localGetSupportingVertex(vec);
+		m_localAabbMin[i] = tmp[i] - m_collisionMargin;
+	}
+}
+
+class SupportVertexCallback : public btTriangleCallback
+{
+	btVector3 m_supportVertexLocal;
+
+public:
+	btTransform m_worldTrans;
+	btScalar m_maxDot;
+	btVector3 m_supportVecLocal;
+
+	SupportVertexCallback(const btVector3& supportVecWorld, const btTransform& trans)
+		: m_supportVertexLocal(btScalar(0.), btScalar(0.), btScalar(0.)), m_worldTrans(trans), m_maxDot(btScalar(-BT_LARGE_FLOAT))
+
+	{
+		m_supportVecLocal = supportVecWorld * m_worldTrans.getBasis();
+	}
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+	{
+		(void)partId;
+		(void)triangleIndex;
+		for (int i = 0; i < 3; i++)
+		{
+			btScalar dot = m_supportVecLocal.dot(triangle[i]);
+			if (dot > m_maxDot)
+			{
+				m_maxDot = dot;
+				m_supportVertexLocal = triangle[i];
+			}
+		}
+	}
+
+	btVector3 GetSupportVertexWorldSpace()
+	{
+		return m_worldTrans(m_supportVertexLocal);
+	}
+
+	btVector3 GetSupportVertexLocal()
+	{
+		return m_supportVertexLocal;
+	}
+};
+
+void btTriangleMeshShape::setLocalScaling(const btVector3& scaling)
+{
+	m_meshInterface->setScaling(scaling);
+	recalcLocalAabb();
+}
+
+const btVector3& btTriangleMeshShape::getLocalScaling() const
+{
+	return m_meshInterface->getScaling();
+}
+
+//#define DEBUG_TRIANGLE_MESH
+
+void btTriangleMeshShape::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	struct FilteredCallback : public btInternalTriangleIndexCallback
+	{
+		btTriangleCallback* m_callback;
+		btVector3 m_aabbMin;
+		btVector3 m_aabbMax;
+
+		FilteredCallback(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax)
+			: m_callback(callback),
+			  m_aabbMin(aabbMin),
+			  m_aabbMax(aabbMax)
+		{
+		}
+
+		virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+		{
+			if (TestTriangleAgainstAabb2(&triangle[0], m_aabbMin, m_aabbMax))
+			{
+				//check aabb in triangle-space, before doing this
+				m_callback->processTriangle(triangle, partId, triangleIndex);
+			}
+		}
+	};
+
+	FilteredCallback filterCallback(callback, aabbMin, aabbMax);
+
+	m_meshInterface->InternalProcessAllTriangles(&filterCallback, aabbMin, aabbMax);
+}
+
+void btTriangleMeshShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	(void)mass;
+	//moving concave objects not supported
+	btAssert(0);
+	inertia.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+}
+
+btVector3 btTriangleMeshShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	btVector3 supportVertex;
+
+	btTransform ident;
+	ident.setIdentity();
+
+	SupportVertexCallback supportCallback(vec, ident);
+
+	btVector3 aabbMax(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+
+	processAllTriangles(&supportCallback, -aabbMax, aabbMax);
+
+	supportVertex = supportCallback.GetSupportVertexLocal();
+
+	return supportVertex;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
new file mode 100644
index 0000000..4a70e28
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
@@ -0,0 +1,82 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TRIANGLE_MESH_SHAPE_H
+#define BT_TRIANGLE_MESH_SHAPE_H
+
+#include "btConcaveShape.h"
+#include "btStridingMeshInterface.h"
+
+///The btTriangleMeshShape is an internal concave triangle mesh interface. Don't use this class directly, use btBvhTriangleMeshShape instead.
+ATTRIBUTE_ALIGNED16(class)
+btTriangleMeshShape : public btConcaveShape
+{
+protected:
+	btVector3 m_localAabbMin;
+	btVector3 m_localAabbMax;
+	btStridingMeshInterface* m_meshInterface;
+
+	///btTriangleMeshShape constructor has been disabled/protected, so that users will not mistakenly use this class.
+	///Don't use btTriangleMeshShape but use btBvhTriangleMeshShape instead!
+	btTriangleMeshShape(btStridingMeshInterface * meshInterface);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	virtual ~btTriangleMeshShape();
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+	{
+		btAssert(0);
+		return localGetSupportingVertex(vec);
+	}
+
+	void recalcLocalAabb();
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void processAllTriangles(btTriangleCallback * callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const;
+
+	btStridingMeshInterface* getMeshInterface()
+	{
+		return m_meshInterface;
+	}
+
+	const btStridingMeshInterface* getMeshInterface() const
+	{
+		return m_meshInterface;
+	}
+
+	const btVector3& getLocalAabbMin() const
+	{
+		return m_localAabbMin;
+	}
+	const btVector3& getLocalAabbMax() const
+	{
+		return m_localAabbMax;
+	}
+
+	//debugging
+	virtual const char* getName() const { return "TRIANGLEMESH"; }
+};
+
+#endif  //BT_TRIANGLE_MESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleShape.h
new file mode 100644
index 0000000..190cbda
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btTriangleShape.h
@@ -0,0 +1,175 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_OBB_TRIANGLE_MINKOWSKI_H
+#define BT_OBB_TRIANGLE_MINKOWSKI_H
+
+#include "btConvexShape.h"
+#include "btBoxShape.h"
+
+ATTRIBUTE_ALIGNED16(class)
+btTriangleShape : public btPolyhedralConvexShape
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btVector3 m_vertices1[3];
+
+	virtual int getNumVertices() const
+	{
+		return 3;
+	}
+
+	btVector3& getVertexPtr(int index)
+	{
+		return m_vertices1[index];
+	}
+
+	const btVector3& getVertexPtr(int index) const
+	{
+		return m_vertices1[index];
+	}
+	virtual void getVertex(int index, btVector3& vert) const
+	{
+		vert = m_vertices1[index];
+	}
+
+	virtual int getNumEdges() const
+	{
+		return 3;
+	}
+
+	virtual void getEdge(int i, btVector3& pa, btVector3& pb) const
+	{
+		getVertex(i, pa);
+		getVertex((i + 1) % 3, pb);
+	}
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		//		btAssert(0);
+		getAabbSlow(t, aabbMin, aabbMax);
+	}
+
+	btVector3 localGetSupportingVertexWithoutMargin(const btVector3& dir) const
+	{
+		btVector3 dots = dir.dot3(m_vertices1[0], m_vertices1[1], m_vertices1[2]);
+		return m_vertices1[dots.maxAxis()];
+	}
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+	{
+		for (int i = 0; i < numVectors; i++)
+		{
+			const btVector3& dir = vectors[i];
+			btVector3 dots = dir.dot3(m_vertices1[0], m_vertices1[1], m_vertices1[2]);
+			supportVerticesOut[i] = m_vertices1[dots.maxAxis()];
+		}
+	}
+
+	btTriangleShape() : btPolyhedralConvexShape()
+	{
+		m_shapeType = TRIANGLE_SHAPE_PROXYTYPE;
+	}
+
+	btTriangleShape(const btVector3& p0, const btVector3& p1, const btVector3& p2) : btPolyhedralConvexShape()
+	{
+		m_shapeType = TRIANGLE_SHAPE_PROXYTYPE;
+		m_vertices1[0] = p0;
+		m_vertices1[1] = p1;
+		m_vertices1[2] = p2;
+	}
+
+	virtual void getPlane(btVector3 & planeNormal, btVector3 & planeSupport, int i) const
+	{
+		getPlaneEquation(i, planeNormal, planeSupport);
+	}
+
+	virtual int getNumPlanes() const
+	{
+		return 1;
+	}
+
+	void calcNormal(btVector3 & normal) const
+	{
+		normal = (m_vertices1[1] - m_vertices1[0]).cross(m_vertices1[2] - m_vertices1[0]);
+		normal.normalize();
+	}
+
+	virtual void getPlaneEquation(int i, btVector3& planeNormal, btVector3& planeSupport) const
+	{
+		(void)i;
+		calcNormal(planeNormal);
+		planeSupport = m_vertices1[0];
+	}
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const
+	{
+		(void)mass;
+		btAssert(0);
+		inertia.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+	}
+
+	virtual bool isInside(const btVector3& pt, btScalar tolerance) const
+	{
+		btVector3 normal;
+		calcNormal(normal);
+		//distance to plane
+		btScalar dist = pt.dot(normal);
+		btScalar planeconst = m_vertices1[0].dot(normal);
+		dist -= planeconst;
+		if (dist >= -tolerance && dist <= tolerance)
+		{
+			//inside check on edge-planes
+			int i;
+			for (i = 0; i < 3; i++)
+			{
+				btVector3 pa, pb;
+				getEdge(i, pa, pb);
+				btVector3 edge = pb - pa;
+				btVector3 edgeNormal = edge.cross(normal);
+				edgeNormal.normalize();
+				btScalar dist = pt.dot(edgeNormal);
+				btScalar edgeConst = pa.dot(edgeNormal);
+				dist -= edgeConst;
+				if (dist < -tolerance)
+					return false;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+	//debugging
+	virtual const char* getName() const
+	{
+		return "Triangle";
+	}
+
+	virtual int getNumPreferredPenetrationDirections() const
+	{
+		return 2;
+	}
+
+	virtual void getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+	{
+		calcNormal(penetrationVector);
+		if (index)
+			penetrationVector *= btScalar(-1.);
+	}
+};
+
+#endif  //BT_OBB_TRIANGLE_MINKOWSKI_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
new file mode 100644
index 0000000..ed3cd2d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
@@ -0,0 +1,150 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btUniformScalingShape.h"
+
+btUniformScalingShape::btUniformScalingShape(btConvexShape* convexChildShape, btScalar uniformScalingFactor) : btConvexShape(), m_childConvexShape(convexChildShape), m_uniformScalingFactor(uniformScalingFactor)
+{
+	m_shapeType = UNIFORM_SCALING_SHAPE_PROXYTYPE;
+}
+
+btUniformScalingShape::~btUniformScalingShape()
+{
+}
+
+btVector3 btUniformScalingShape::localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+{
+	btVector3 tmpVertex;
+	tmpVertex = m_childConvexShape->localGetSupportingVertexWithoutMargin(vec);
+	return tmpVertex * m_uniformScalingFactor;
+}
+
+void btUniformScalingShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+{
+	m_childConvexShape->batchedUnitVectorGetSupportingVertexWithoutMargin(vectors, supportVerticesOut, numVectors);
+	int i;
+	for (i = 0; i < numVectors; i++)
+	{
+		supportVerticesOut[i] = supportVerticesOut[i] * m_uniformScalingFactor;
+	}
+}
+
+btVector3 btUniformScalingShape::localGetSupportingVertex(const btVector3& vec) const
+{
+	btVector3 tmpVertex;
+	tmpVertex = m_childConvexShape->localGetSupportingVertex(vec);
+	return tmpVertex * m_uniformScalingFactor;
+}
+
+void btUniformScalingShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	///this linear upscaling is not realistic, but we don't deal with large mass ratios...
+	btVector3 tmpInertia;
+	m_childConvexShape->calculateLocalInertia(mass, tmpInertia);
+	inertia = tmpInertia * m_uniformScalingFactor;
+}
+
+///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+void btUniformScalingShape::getAabb(const btTransform& trans, btVector3& aabbMin, btVector3& aabbMax) const
+{
+	getAabbSlow(trans, aabbMin, aabbMax);
+}
+
+void btUniformScalingShape::getAabbSlow(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+{
+#if 1
+	btVector3 _directions[] =
+		{
+			btVector3(1., 0., 0.),
+			btVector3(0., 1., 0.),
+			btVector3(0., 0., 1.),
+			btVector3(-1., 0., 0.),
+			btVector3(0., -1., 0.),
+			btVector3(0., 0., -1.)};
+
+	btVector3 _supporting[] =
+		{
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.),
+			btVector3(0., 0., 0.)};
+
+	for (int i = 0; i < 6; i++)
+	{
+		_directions[i] = _directions[i] * t.getBasis();
+	}
+
+	batchedUnitVectorGetSupportingVertexWithoutMargin(_directions, _supporting, 6);
+
+	btVector3 aabbMin1(0, 0, 0), aabbMax1(0, 0, 0);
+
+	for (int i = 0; i < 3; ++i)
+	{
+		aabbMax1[i] = t(_supporting[i])[i];
+		aabbMin1[i] = t(_supporting[i + 3])[i];
+	}
+	btVector3 marginVec(getMargin(), getMargin(), getMargin());
+	aabbMin = aabbMin1 - marginVec;
+	aabbMax = aabbMax1 + marginVec;
+
+#else
+
+	btScalar margin = getMargin();
+	for (int i = 0; i < 3; i++)
+	{
+		btVector3 vec(btScalar(0.), btScalar(0.), btScalar(0.));
+		vec[i] = btScalar(1.);
+		btVector3 sv = localGetSupportingVertex(vec * t.getBasis());
+		btVector3 tmp = t(sv);
+		aabbMax[i] = tmp[i] + margin;
+		vec[i] = btScalar(-1.);
+		sv = localGetSupportingVertex(vec * t.getBasis());
+		tmp = t(sv);
+		aabbMin[i] = tmp[i] - margin;
+	}
+
+#endif
+}
+
+void btUniformScalingShape::setLocalScaling(const btVector3& scaling)
+{
+	m_childConvexShape->setLocalScaling(scaling);
+}
+
+const btVector3& btUniformScalingShape::getLocalScaling() const
+{
+	return m_childConvexShape->getLocalScaling();
+}
+
+void btUniformScalingShape::setMargin(btScalar margin)
+{
+	m_childConvexShape->setMargin(margin);
+}
+btScalar btUniformScalingShape::getMargin() const
+{
+	return m_childConvexShape->getMargin() * m_uniformScalingFactor;
+}
+
+int btUniformScalingShape::getNumPreferredPenetrationDirections() const
+{
+	return m_childConvexShape->getNumPreferredPenetrationDirections();
+}
+
+void btUniformScalingShape::getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+{
+	m_childConvexShape->getPreferredPenetrationDirection(index, penetrationVector);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
new file mode 100644
index 0000000..4dfe34e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
@@ -0,0 +1,84 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_UNIFORM_SCALING_SHAPE_H
+#define BT_UNIFORM_SCALING_SHAPE_H
+
+#include "btConvexShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"  // for the types
+
+///The btUniformScalingShape allows to re-use uniform scaled instances of btConvexShape in a memory efficient way.
+///Istead of using btUniformScalingShape, it is better to use the non-uniform setLocalScaling method on convex shapes that implement it.
+ATTRIBUTE_ALIGNED16(class)
+btUniformScalingShape : public btConvexShape
+{
+	btConvexShape* m_childConvexShape;
+
+	btScalar m_uniformScalingFactor;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btUniformScalingShape(btConvexShape * convexChildShape, btScalar uniformScalingFactor);
+
+	virtual ~btUniformScalingShape();
+
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const;
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const;
+
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const;
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3 & inertia) const;
+
+	btScalar getUniformScalingFactor() const
+	{
+		return m_uniformScalingFactor;
+	}
+
+	btConvexShape* getChildShape()
+	{
+		return m_childConvexShape;
+	}
+
+	const btConvexShape* getChildShape() const
+	{
+		return m_childConvexShape;
+	}
+
+	virtual const char* getName() const
+	{
+		return "UniformScalingShape";
+	}
+
+	///////////////////////////
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void getAabbSlow(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+	virtual void setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const;
+
+	virtual void setMargin(btScalar margin);
+	virtual btScalar getMargin() const;
+
+	virtual int getNumPreferredPenetrationDirections() const;
+
+	virtual void getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const;
+};
+
+#endif  //BT_UNIFORM_SCALING_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btBoxCollision.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btBoxCollision.h
new file mode 100644
index 0000000..941dcc6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btBoxCollision.h
@@ -0,0 +1,632 @@
+#ifndef BT_BOX_COLLISION_H_INCLUDED
+#define BT_BOX_COLLISION_H_INCLUDED
+
+/*! \file gim_box_collision.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btTransform.h"
+
+///Swap numbers
+#define BT_SWAP_NUMBERS(a, b) \
+	{                         \
+		a = a + b;            \
+		b = a - b;            \
+		a = a - b;            \
+	}
+
+#define BT_MAX(a, b) (a < b ? b : a)
+#define BT_MIN(a, b) (a > b ? b : a)
+
+#define BT_GREATER(x, y) btFabs(x) > (y)
+
+#define BT_MAX3(a, b, c) BT_MAX(a, BT_MAX(b, c))
+#define BT_MIN3(a, b, c) BT_MIN(a, BT_MIN(b, c))
+
+enum eBT_PLANE_INTERSECTION_TYPE
+{
+	BT_CONST_BACK_PLANE = 0,
+	BT_CONST_COLLIDE_PLANE,
+	BT_CONST_FRONT_PLANE
+};
+
+//SIMD_FORCE_INLINE bool test_cross_edge_box(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, const btVector3 & extend,
+//	int dir_index0,
+//	int dir_index1
+//	int component_index0,
+//	int component_index1)
+//{
+//	// dir coords are -z and y
+//
+//	const btScalar dir0 = -edge[dir_index0];
+//	const btScalar dir1 = edge[dir_index1];
+//	btScalar pmin = pointa[component_index0]*dir0 + pointa[component_index1]*dir1;
+//	btScalar pmax = pointb[component_index0]*dir0 + pointb[component_index1]*dir1;
+//	//find minmax
+//	if(pmin>pmax)
+//	{
+//		BT_SWAP_NUMBERS(pmin,pmax);
+//	}
+//	//find extends
+//	const btScalar rad = extend[component_index0] * absolute_edge[dir_index0] +
+//					extend[component_index1] * absolute_edge[dir_index1];
+//
+//	if(pmin>rad || -rad>pmax) return false;
+//	return true;
+//}
+//
+//SIMD_FORCE_INLINE bool test_cross_edge_box_X_axis(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, btVector3 & extend)
+//{
+//
+//	return test_cross_edge_box(edge,absolute_edge,pointa,pointb,extend,2,1,1,2);
+//}
+//
+//
+//SIMD_FORCE_INLINE bool test_cross_edge_box_Y_axis(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, btVector3 & extend)
+//{
+//
+//	return test_cross_edge_box(edge,absolute_edge,pointa,pointb,extend,0,2,2,0);
+//}
+//
+//SIMD_FORCE_INLINE bool test_cross_edge_box_Z_axis(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, btVector3 & extend)
+//{
+//
+//	return test_cross_edge_box(edge,absolute_edge,pointa,pointb,extend,1,0,0,1);
+//}
+
+#define TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, i_dir_0, i_dir_1, i_comp_0, i_comp_1) \
+	{                                                                                                               \
+		const btScalar dir0 = -edge[i_dir_0];                                                                       \
+		const btScalar dir1 = edge[i_dir_1];                                                                        \
+		btScalar pmin = pointa[i_comp_0] * dir0 + pointa[i_comp_1] * dir1;                                          \
+		btScalar pmax = pointb[i_comp_0] * dir0 + pointb[i_comp_1] * dir1;                                          \
+		if (pmin > pmax)                                                                                            \
+		{                                                                                                           \
+			BT_SWAP_NUMBERS(pmin, pmax);                                                                            \
+		}                                                                                                           \
+		const btScalar abs_dir0 = absolute_edge[i_dir_0];                                                           \
+		const btScalar abs_dir1 = absolute_edge[i_dir_1];                                                           \
+		const btScalar rad = _extend[i_comp_0] * abs_dir0 + _extend[i_comp_1] * abs_dir1;                           \
+		if (pmin > rad || -rad > pmax) return false;                                                                \
+	}
+
+#define TEST_CROSS_EDGE_BOX_X_AXIS_MCR(edge, absolute_edge, pointa, pointb, _extend)       \
+	{                                                                                      \
+		TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, 2, 1, 1, 2); \
+	}
+
+#define TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(edge, absolute_edge, pointa, pointb, _extend)       \
+	{                                                                                      \
+		TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, 0, 2, 2, 0); \
+	}
+
+#define TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(edge, absolute_edge, pointa, pointb, _extend)       \
+	{                                                                                      \
+		TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, 1, 0, 0, 1); \
+	}
+
+//! Returns the dot product between a vec3f and the col of a matrix
+SIMD_FORCE_INLINE btScalar bt_mat3_dot_col(
+	const btMatrix3x3 &mat, const btVector3 &vec3, int colindex)
+{
+	return vec3[0] * mat[0][colindex] + vec3[1] * mat[1][colindex] + vec3[2] * mat[2][colindex];
+}
+
+//!  Class for transforming a model1 to the space of model0
+ATTRIBUTE_ALIGNED16(class)
+BT_BOX_BOX_TRANSFORM_CACHE
+{
+public:
+	btVector3 m_T1to0;    //!< Transforms translation of model1 to model 0
+	btMatrix3x3 m_R1to0;  //!< Transforms Rotation of model1 to model 0, equal  to R0' * R1
+	btMatrix3x3 m_AR;     //!< Absolute value of m_R1to0
+
+	SIMD_FORCE_INLINE void calc_absolute_matrix()
+	{
+		//		static const btVector3 vepsi(1e-6f,1e-6f,1e-6f);
+		//		m_AR[0] = vepsi + m_R1to0[0].absolute();
+		//		m_AR[1] = vepsi + m_R1to0[1].absolute();
+		//		m_AR[2] = vepsi + m_R1to0[2].absolute();
+
+		int i, j;
+
+		for (i = 0; i < 3; i++)
+		{
+			for (j = 0; j < 3; j++)
+			{
+				m_AR[i][j] = 1e-6f + btFabs(m_R1to0[i][j]);
+			}
+		}
+	}
+
+	BT_BOX_BOX_TRANSFORM_CACHE()
+	{
+	}
+
+	//! Calc the transformation relative  1 to 0. Inverts matrics by transposing
+	SIMD_FORCE_INLINE void calc_from_homogenic(const btTransform &trans0, const btTransform &trans1)
+	{
+		btTransform temp_trans = trans0.inverse();
+		temp_trans = temp_trans * trans1;
+
+		m_T1to0 = temp_trans.getOrigin();
+		m_R1to0 = temp_trans.getBasis();
+
+		calc_absolute_matrix();
+	}
+
+	//! Calcs the full invertion of the matrices. Useful for scaling matrices
+	SIMD_FORCE_INLINE void calc_from_full_invert(const btTransform &trans0, const btTransform &trans1)
+	{
+		m_R1to0 = trans0.getBasis().inverse();
+		m_T1to0 = m_R1to0 * (-trans0.getOrigin());
+
+		m_T1to0 += m_R1to0 * trans1.getOrigin();
+		m_R1to0 *= trans1.getBasis();
+
+		calc_absolute_matrix();
+	}
+
+	SIMD_FORCE_INLINE btVector3 transform(const btVector3 &point) const
+	{
+		return point.dot3(m_R1to0[0], m_R1to0[1], m_R1to0[2]) + m_T1to0;
+	}
+};
+
+#define BOX_PLANE_EPSILON 0.000001f
+
+//! Axis aligned box
+ATTRIBUTE_ALIGNED16(class)
+btAABB
+{
+public:
+	btVector3 m_min;
+	btVector3 m_max;
+
+	btAABB()
+	{
+	}
+
+	btAABB(const btVector3 &V1,
+		   const btVector3 &V2,
+		   const btVector3 &V3)
+	{
+		m_min[0] = BT_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = BT_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = BT_MIN3(V1[2], V2[2], V3[2]);
+		m_min[3] = 0.f;
+
+		m_max[0] = BT_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = BT_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = BT_MAX3(V1[2], V2[2], V3[2]);
+		m_max[3] = 0.f;
+	}
+
+	btAABB(const btVector3 &V1,
+		   const btVector3 &V2,
+		   const btVector3 &V3,
+		   btScalar margin)
+	{
+		m_min[0] = BT_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = BT_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = BT_MIN3(V1[2], V2[2], V3[2]);
+		m_min[3] = 0.f;
+
+		m_max[0] = BT_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = BT_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = BT_MAX3(V1[2], V2[2], V3[2]);
+		m_max[3] = 0.f;
+
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	btAABB(const btAABB &other) : m_min(other.m_min), m_max(other.m_max)
+	{
+	}
+
+	btAABB(const btAABB &other, btScalar margin) : m_min(other.m_min), m_max(other.m_max)
+	{
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	SIMD_FORCE_INLINE void invalidate()
+	{
+		m_min[0] = SIMD_INFINITY;
+		m_min[1] = SIMD_INFINITY;
+		m_min[2] = SIMD_INFINITY;
+		m_min[3] = 0.f;
+		m_max[0] = -SIMD_INFINITY;
+		m_max[1] = -SIMD_INFINITY;
+		m_max[2] = -SIMD_INFINITY;
+		m_max[3] = 0.f;
+	}
+
+	SIMD_FORCE_INLINE void increment_margin(btScalar margin)
+	{
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	SIMD_FORCE_INLINE void copy_with_margin(const btAABB &other, btScalar margin)
+	{
+		m_min[0] = other.m_min[0] - margin;
+		m_min[1] = other.m_min[1] - margin;
+		m_min[2] = other.m_min[2] - margin;
+		m_min[3] = 0.f;
+
+		m_max[0] = other.m_max[0] + margin;
+		m_max[1] = other.m_max[1] + margin;
+		m_max[2] = other.m_max[2] + margin;
+		m_max[3] = 0.f;
+	}
+
+	template <typename CLASS_POINT>
+	SIMD_FORCE_INLINE void calc_from_triangle(
+		const CLASS_POINT &V1,
+		const CLASS_POINT &V2,
+		const CLASS_POINT &V3)
+	{
+		m_min[0] = BT_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = BT_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = BT_MIN3(V1[2], V2[2], V3[2]);
+		m_min[3] = 0.f;
+
+		m_max[0] = BT_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = BT_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = BT_MAX3(V1[2], V2[2], V3[2]);
+		m_max[3] = 0.f;
+	}
+
+	template <typename CLASS_POINT>
+	SIMD_FORCE_INLINE void calc_from_triangle_margin(
+		const CLASS_POINT &V1,
+		const CLASS_POINT &V2,
+		const CLASS_POINT &V3, btScalar margin)
+	{
+		m_min[0] = BT_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = BT_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = BT_MIN3(V1[2], V2[2], V3[2]);
+		m_min[3] = 0.f;
+
+		m_max[0] = BT_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = BT_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = BT_MAX3(V1[2], V2[2], V3[2]);
+		m_max[3] = 0.f;
+
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	//! Apply a transform to an AABB
+	SIMD_FORCE_INLINE void appy_transform(const btTransform &trans)
+	{
+		btVector3 center = (m_max + m_min) * 0.5f;
+		btVector3 extends = m_max - center;
+		// Compute new center
+		center = trans(center);
+
+		btVector3 textends = extends.dot3(trans.getBasis().getRow(0).absolute(),
+										  trans.getBasis().getRow(1).absolute(),
+										  trans.getBasis().getRow(2).absolute());
+
+		m_min = center - textends;
+		m_max = center + textends;
+	}
+
+	//! Apply a transform to an AABB
+	SIMD_FORCE_INLINE void appy_transform_trans_cache(const BT_BOX_BOX_TRANSFORM_CACHE &trans)
+	{
+		btVector3 center = (m_max + m_min) * 0.5f;
+		btVector3 extends = m_max - center;
+		// Compute new center
+		center = trans.transform(center);
+
+		btVector3 textends = extends.dot3(trans.m_R1to0.getRow(0).absolute(),
+										  trans.m_R1to0.getRow(1).absolute(),
+										  trans.m_R1to0.getRow(2).absolute());
+
+		m_min = center - textends;
+		m_max = center + textends;
+	}
+
+	//! Merges a Box
+	SIMD_FORCE_INLINE void merge(const btAABB &box)
+	{
+		m_min[0] = BT_MIN(m_min[0], box.m_min[0]);
+		m_min[1] = BT_MIN(m_min[1], box.m_min[1]);
+		m_min[2] = BT_MIN(m_min[2], box.m_min[2]);
+
+		m_max[0] = BT_MAX(m_max[0], box.m_max[0]);
+		m_max[1] = BT_MAX(m_max[1], box.m_max[1]);
+		m_max[2] = BT_MAX(m_max[2], box.m_max[2]);
+	}
+
+	//! Merges a point
+	template <typename CLASS_POINT>
+	SIMD_FORCE_INLINE void merge_point(const CLASS_POINT &point)
+	{
+		m_min[0] = BT_MIN(m_min[0], point[0]);
+		m_min[1] = BT_MIN(m_min[1], point[1]);
+		m_min[2] = BT_MIN(m_min[2], point[2]);
+
+		m_max[0] = BT_MAX(m_max[0], point[0]);
+		m_max[1] = BT_MAX(m_max[1], point[1]);
+		m_max[2] = BT_MAX(m_max[2], point[2]);
+	}
+
+	//! Gets the extend and center
+	SIMD_FORCE_INLINE void get_center_extend(btVector3 & center, btVector3 & extend) const
+	{
+		center = (m_max + m_min) * 0.5f;
+		extend = m_max - center;
+	}
+
+	//! Finds the intersecting box between this box and the other.
+	SIMD_FORCE_INLINE void find_intersection(const btAABB &other, btAABB &intersection) const
+	{
+		intersection.m_min[0] = BT_MAX(other.m_min[0], m_min[0]);
+		intersection.m_min[1] = BT_MAX(other.m_min[1], m_min[1]);
+		intersection.m_min[2] = BT_MAX(other.m_min[2], m_min[2]);
+
+		intersection.m_max[0] = BT_MIN(other.m_max[0], m_max[0]);
+		intersection.m_max[1] = BT_MIN(other.m_max[1], m_max[1]);
+		intersection.m_max[2] = BT_MIN(other.m_max[2], m_max[2]);
+	}
+
+	SIMD_FORCE_INLINE bool has_collision(const btAABB &other) const
+	{
+		if (m_min[0] > other.m_max[0] ||
+			m_max[0] < other.m_min[0] ||
+			m_min[1] > other.m_max[1] ||
+			m_max[1] < other.m_min[1] ||
+			m_min[2] > other.m_max[2] ||
+			m_max[2] < other.m_min[2])
+		{
+			return false;
+		}
+		return true;
+	}
+
+	/*! \brief Finds the Ray intersection parameter.
+	\param aabb Aligned box
+	\param vorigin A vec3f with the origin of the ray
+	\param vdir A vec3f with the direction of the ray
+	*/
+	SIMD_FORCE_INLINE bool collide_ray(const btVector3 &vorigin, const btVector3 &vdir) const
+	{
+		btVector3 extents, center;
+		this->get_center_extend(center, extents);
+		;
+
+		btScalar Dx = vorigin[0] - center[0];
+		if (BT_GREATER(Dx, extents[0]) && Dx * vdir[0] >= 0.0f) return false;
+		btScalar Dy = vorigin[1] - center[1];
+		if (BT_GREATER(Dy, extents[1]) && Dy * vdir[1] >= 0.0f) return false;
+		btScalar Dz = vorigin[2] - center[2];
+		if (BT_GREATER(Dz, extents[2]) && Dz * vdir[2] >= 0.0f) return false;
+
+		btScalar f = vdir[1] * Dz - vdir[2] * Dy;
+		if (btFabs(f) > extents[1] * btFabs(vdir[2]) + extents[2] * btFabs(vdir[1])) return false;
+		f = vdir[2] * Dx - vdir[0] * Dz;
+		if (btFabs(f) > extents[0] * btFabs(vdir[2]) + extents[2] * btFabs(vdir[0])) return false;
+		f = vdir[0] * Dy - vdir[1] * Dx;
+		if (btFabs(f) > extents[0] * btFabs(vdir[1]) + extents[1] * btFabs(vdir[0])) return false;
+		return true;
+	}
+
+	SIMD_FORCE_INLINE void projection_interval(const btVector3 &direction, btScalar &vmin, btScalar &vmax) const
+	{
+		btVector3 center = (m_max + m_min) * 0.5f;
+		btVector3 extend = m_max - center;
+
+		btScalar _fOrigin = direction.dot(center);
+		btScalar _fMaximumExtent = extend.dot(direction.absolute());
+		vmin = _fOrigin - _fMaximumExtent;
+		vmax = _fOrigin + _fMaximumExtent;
+	}
+
+	SIMD_FORCE_INLINE eBT_PLANE_INTERSECTION_TYPE plane_classify(const btVector4 &plane) const
+	{
+		btScalar _fmin, _fmax;
+		this->projection_interval(plane, _fmin, _fmax);
+
+		if (plane[3] > _fmax + BOX_PLANE_EPSILON)
+		{
+			return BT_CONST_BACK_PLANE;  // 0
+		}
+
+		if (plane[3] + BOX_PLANE_EPSILON >= _fmin)
+		{
+			return BT_CONST_COLLIDE_PLANE;  //1
+		}
+		return BT_CONST_FRONT_PLANE;  //2
+	}
+
+	SIMD_FORCE_INLINE bool overlapping_trans_conservative(const btAABB &box, btTransform &trans1_to_0) const
+	{
+		btAABB tbox = box;
+		tbox.appy_transform(trans1_to_0);
+		return has_collision(tbox);
+	}
+
+	SIMD_FORCE_INLINE bool overlapping_trans_conservative2(const btAABB &box,
+														   const BT_BOX_BOX_TRANSFORM_CACHE &trans1_to_0) const
+	{
+		btAABB tbox = box;
+		tbox.appy_transform_trans_cache(trans1_to_0);
+		return has_collision(tbox);
+	}
+
+	//! transcache is the transformation cache from box to this AABB
+	SIMD_FORCE_INLINE bool overlapping_trans_cache(
+		const btAABB &box, const BT_BOX_BOX_TRANSFORM_CACHE &transcache, bool fulltest) const
+	{
+		//Taken from OPCODE
+		btVector3 ea, eb;  //extends
+		btVector3 ca, cb;  //extends
+		get_center_extend(ca, ea);
+		box.get_center_extend(cb, eb);
+
+		btVector3 T;
+		btScalar t, t2;
+		int i;
+
+		// Class I : A's basis vectors
+		for (i = 0; i < 3; i++)
+		{
+			T[i] = transcache.m_R1to0[i].dot(cb) + transcache.m_T1to0[i] - ca[i];
+			t = transcache.m_AR[i].dot(eb) + ea[i];
+			if (BT_GREATER(T[i], t)) return false;
+		}
+		// Class II : B's basis vectors
+		for (i = 0; i < 3; i++)
+		{
+			t = bt_mat3_dot_col(transcache.m_R1to0, T, i);
+			t2 = bt_mat3_dot_col(transcache.m_AR, ea, i) + eb[i];
+			if (BT_GREATER(t, t2)) return false;
+		}
+		// Class III : 9 cross products
+		if (fulltest)
+		{
+			int j, m, n, o, p, q, r;
+			for (i = 0; i < 3; i++)
+			{
+				m = (i + 1) % 3;
+				n = (i + 2) % 3;
+				o = i == 0 ? 1 : 0;
+				p = i == 2 ? 1 : 2;
+				for (j = 0; j < 3; j++)
+				{
+					q = j == 2 ? 1 : 2;
+					r = j == 0 ? 1 : 0;
+					t = T[n] * transcache.m_R1to0[m][j] - T[m] * transcache.m_R1to0[n][j];
+					t2 = ea[o] * transcache.m_AR[p][j] + ea[p] * transcache.m_AR[o][j] +
+						 eb[r] * transcache.m_AR[i][q] + eb[q] * transcache.m_AR[i][r];
+					if (BT_GREATER(t, t2)) return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	//! Simple test for planes.
+	SIMD_FORCE_INLINE bool collide_plane(
+		const btVector4 &plane) const
+	{
+		eBT_PLANE_INTERSECTION_TYPE classify = plane_classify(plane);
+		return (classify == BT_CONST_COLLIDE_PLANE);
+	}
+
+	//! test for a triangle, with edges
+	SIMD_FORCE_INLINE bool collide_triangle_exact(
+		const btVector3 &p1,
+		const btVector3 &p2,
+		const btVector3 &p3,
+		const btVector4 &triangle_plane) const
+	{
+		if (!collide_plane(triangle_plane)) return false;
+
+		btVector3 center, extends;
+		this->get_center_extend(center, extends);
+
+		const btVector3 v1(p1 - center);
+		const btVector3 v2(p2 - center);
+		const btVector3 v3(p3 - center);
+
+		//First axis
+		btVector3 diff(v2 - v1);
+		btVector3 abs_diff = diff.absolute();
+		//Test With X axis
+		TEST_CROSS_EDGE_BOX_X_AXIS_MCR(diff, abs_diff, v1, v3, extends);
+		//Test With Y axis
+		TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(diff, abs_diff, v1, v3, extends);
+		//Test With Z axis
+		TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(diff, abs_diff, v1, v3, extends);
+
+		diff = v3 - v2;
+		abs_diff = diff.absolute();
+		//Test With X axis
+		TEST_CROSS_EDGE_BOX_X_AXIS_MCR(diff, abs_diff, v2, v1, extends);
+		//Test With Y axis
+		TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(diff, abs_diff, v2, v1, extends);
+		//Test With Z axis
+		TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(diff, abs_diff, v2, v1, extends);
+
+		diff = v1 - v3;
+		abs_diff = diff.absolute();
+		//Test With X axis
+		TEST_CROSS_EDGE_BOX_X_AXIS_MCR(diff, abs_diff, v3, v2, extends);
+		//Test With Y axis
+		TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(diff, abs_diff, v3, v2, extends);
+		//Test With Z axis
+		TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(diff, abs_diff, v3, v2, extends);
+
+		return true;
+	}
+};
+
+//! Compairison of transformation objects
+SIMD_FORCE_INLINE bool btCompareTransformsEqual(const btTransform &t1, const btTransform &t2)
+{
+	if (!(t1.getOrigin() == t2.getOrigin())) return false;
+
+	if (!(t1.getBasis().getRow(0) == t2.getBasis().getRow(0))) return false;
+	if (!(t1.getBasis().getRow(1) == t2.getBasis().getRow(1))) return false;
+	if (!(t1.getBasis().getRow(2) == t2.getBasis().getRow(2))) return false;
+	return true;
+}
+
+#endif  // GIM_BOX_COLLISION_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btClipPolygon.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btClipPolygon.h
new file mode 100644
index 0000000..38c23e2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btClipPolygon.h
@@ -0,0 +1,173 @@
+#ifndef BT_CLIP_POLYGON_H_INCLUDED
+#define BT_CLIP_POLYGON_H_INCLUDED
+
+/*! \file btClipPolygon.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btGeometryUtil.h"
+
+SIMD_FORCE_INLINE btScalar bt_distance_point_plane(const btVector4 &plane, const btVector3 &point)
+{
+	return point.dot(plane) - plane[3];
+}
+
+/*! Vector blending
+Takes two vectors a, b, blends them together*/
+SIMD_FORCE_INLINE void bt_vec_blend(btVector3 &vr, const btVector3 &va, const btVector3 &vb, btScalar blend_factor)
+{
+	vr = (1 - blend_factor) * va + blend_factor * vb;
+}
+
+//! This function calcs the distance from a 3D plane
+SIMD_FORCE_INLINE void bt_plane_clip_polygon_collect(
+	const btVector3 &point0,
+	const btVector3 &point1,
+	btScalar dist0,
+	btScalar dist1,
+	btVector3 *clipped,
+	int &clipped_count)
+{
+	bool _prevclassif = (dist0 > SIMD_EPSILON);
+	bool _classif = (dist1 > SIMD_EPSILON);
+	if (_classif != _prevclassif)
+	{
+		btScalar blendfactor = -dist0 / (dist1 - dist0);
+		bt_vec_blend(clipped[clipped_count], point0, point1, blendfactor);
+		clipped_count++;
+	}
+	if (!_classif)
+	{
+		clipped[clipped_count] = point1;
+		clipped_count++;
+	}
+}
+
+//! Clips a polygon by a plane
+/*!
+*\return The count of the clipped counts
+*/
+SIMD_FORCE_INLINE int bt_plane_clip_polygon(
+	const btVector4 &plane,
+	const btVector3 *polygon_points,
+	int polygon_point_count,
+	btVector3 *clipped)
+{
+	int clipped_count = 0;
+
+	//clip first point
+	btScalar firstdist = bt_distance_point_plane(plane, polygon_points[0]);
+	;
+	if (!(firstdist > SIMD_EPSILON))
+	{
+		clipped[clipped_count] = polygon_points[0];
+		clipped_count++;
+	}
+
+	btScalar olddist = firstdist;
+	for (int i = 1; i < polygon_point_count; i++)
+	{
+		btScalar dist = bt_distance_point_plane(plane, polygon_points[i]);
+
+		bt_plane_clip_polygon_collect(
+			polygon_points[i - 1], polygon_points[i],
+			olddist,
+			dist,
+			clipped,
+			clipped_count);
+
+		olddist = dist;
+	}
+
+	//RETURN TO FIRST  point
+
+	bt_plane_clip_polygon_collect(
+		polygon_points[polygon_point_count - 1], polygon_points[0],
+		olddist,
+		firstdist,
+		clipped,
+		clipped_count);
+
+	return clipped_count;
+}
+
+//! Clips a polygon by a plane
+/*!
+*\param clipped must be an array of 16 points.
+*\return The count of the clipped counts
+*/
+SIMD_FORCE_INLINE int bt_plane_clip_triangle(
+	const btVector4 &plane,
+	const btVector3 &point0,
+	const btVector3 &point1,
+	const btVector3 &point2,
+	btVector3 *clipped  // an allocated array of 16 points at least
+)
+{
+	int clipped_count = 0;
+
+	//clip first point0
+	btScalar firstdist = bt_distance_point_plane(plane, point0);
+	;
+	if (!(firstdist > SIMD_EPSILON))
+	{
+		clipped[clipped_count] = point0;
+		clipped_count++;
+	}
+
+	// point 1
+	btScalar olddist = firstdist;
+	btScalar dist = bt_distance_point_plane(plane, point1);
+
+	bt_plane_clip_polygon_collect(
+		point0, point1,
+		olddist,
+		dist,
+		clipped,
+		clipped_count);
+
+	olddist = dist;
+
+	// point 2
+	dist = bt_distance_point_plane(plane, point2);
+
+	bt_plane_clip_polygon_collect(
+		point1, point2,
+		olddist,
+		dist,
+		clipped,
+		clipped_count);
+	olddist = dist;
+
+	//RETURN TO FIRST  point0
+	bt_plane_clip_polygon_collect(
+		point2, point0,
+		olddist,
+		firstdist,
+		clipped,
+		clipped_count);
+
+	return clipped_count;
+}
+
+#endif  // GIM_TRI_COLLISION_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btCompoundFromGimpact.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
new file mode 100644
index 0000000..ede59e8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
@@ -0,0 +1,105 @@
+#ifndef BT_COMPOUND_FROM_GIMPACT
+#define BT_COMPOUND_FROM_GIMPACT
+
+#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include "btGImpactShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
+
+ATTRIBUTE_ALIGNED16(class)
+btCompoundFromGimpactShape : public btCompoundShape
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	virtual ~btCompoundFromGimpactShape()
+	{
+		/*delete all the btBU_Simplex1to4 ChildShapes*/
+		for (int i = 0; i < m_children.size(); i++)
+		{
+			delete m_children[i].m_childShape;
+		}
+	}
+};
+
+struct MyCallback : public btTriangleRaycastCallback
+{
+	int m_ignorePart;
+	int m_ignoreTriangleIndex;
+
+	MyCallback(const btVector3& from, const btVector3& to, int ignorePart, int ignoreTriangleIndex)
+		: btTriangleRaycastCallback(from, to),
+		  m_ignorePart(ignorePart),
+		  m_ignoreTriangleIndex(ignoreTriangleIndex)
+	{
+	}
+	virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex)
+	{
+		if (partId != m_ignorePart || triangleIndex != m_ignoreTriangleIndex)
+		{
+			if (hitFraction < m_hitFraction)
+				return hitFraction;
+		}
+
+		return m_hitFraction;
+	}
+};
+struct MyInternalTriangleIndexCallback : public btInternalTriangleIndexCallback
+{
+	const btGImpactMeshShape* m_gimpactShape;
+	btCompoundShape* m_colShape;
+	btScalar m_depth;
+
+	MyInternalTriangleIndexCallback(btCompoundShape* colShape, const btGImpactMeshShape* meshShape, btScalar depth)
+		: m_colShape(colShape),
+		  m_gimpactShape(meshShape),
+		  m_depth(depth)
+	{
+	}
+
+	virtual void internalProcessTriangleIndex(btVector3* triangle, int partId, int triangleIndex)
+	{
+		btVector3 scale = m_gimpactShape->getLocalScaling();
+		btVector3 v0 = triangle[0] * scale;
+		btVector3 v1 = triangle[1] * scale;
+		btVector3 v2 = triangle[2] * scale;
+
+		btVector3 centroid = (v0 + v1 + v2) / 3;
+		btVector3 normal = (v1 - v0).cross(v2 - v0);
+		normal.normalize();
+		btVector3 rayFrom = centroid;
+		btVector3 rayTo = centroid - normal * m_depth;
+
+		MyCallback cb(rayFrom, rayTo, partId, triangleIndex);
+
+		m_gimpactShape->processAllTrianglesRay(&cb, rayFrom, rayTo);
+		if (cb.m_hitFraction < 1)
+		{
+			rayTo.setInterpolate3(cb.m_from, cb.m_to, cb.m_hitFraction);
+			//rayTo = cb.m_from;
+			//rayTo = rayTo.lerp(cb.m_to,cb.m_hitFraction);
+			//gDebugDraw.drawLine(tr(centroid),tr(centroid+normal),btVector3(1,0,0));
+		}
+
+		btBU_Simplex1to4* tet = new btBU_Simplex1to4(v0, v1, v2, rayTo);
+		btTransform ident;
+		ident.setIdentity();
+		m_colShape->addChildShape(ident, tet);
+	}
+};
+
+btCompoundShape* btCreateCompoundFromGimpactShape(const btGImpactMeshShape* gimpactMesh, btScalar depth)
+{
+	btCompoundShape* colShape = new btCompoundFromGimpactShape();
+
+	btTransform tr;
+	tr.setIdentity();
+
+	MyInternalTriangleIndexCallback cb(colShape, gimpactMesh, depth);
+	btVector3 aabbMin, aabbMax;
+	gimpactMesh->getAabb(tr, aabbMin, aabbMax);
+	gimpactMesh->getMeshInterface()->InternalProcessAllTriangles(&cb, aabbMin, aabbMax);
+
+	return colShape;
+}
+
+#endif  //BT_COMPOUND_FROM_GIMPACT
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessing.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessing.cpp
new file mode 100644
index 0000000..f2e3e18
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessing.cpp
@@ -0,0 +1,175 @@
+
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#include "btContactProcessing.h"
+
+#define MAX_COINCIDENT 8
+
+struct CONTACT_KEY_TOKEN
+{
+	unsigned int m_key;
+	int m_value;
+	CONTACT_KEY_TOKEN()
+	{
+	}
+
+	CONTACT_KEY_TOKEN(unsigned int key, int token)
+	{
+		m_key = key;
+		m_value = token;
+	}
+
+	CONTACT_KEY_TOKEN(const CONTACT_KEY_TOKEN& rtoken)
+	{
+		m_key = rtoken.m_key;
+		m_value = rtoken.m_value;
+	}
+
+	inline bool operator<(const CONTACT_KEY_TOKEN& other) const
+	{
+		return (m_key < other.m_key);
+	}
+
+	inline bool operator>(const CONTACT_KEY_TOKEN& other) const
+	{
+		return (m_key > other.m_key);
+	}
+};
+
+class CONTACT_KEY_TOKEN_COMP
+{
+public:
+	bool operator()(const CONTACT_KEY_TOKEN& a, const CONTACT_KEY_TOKEN& b) const
+	{
+		return (a < b);
+	}
+};
+
+void btContactArray::merge_contacts(
+	const btContactArray& contacts, bool normal_contact_average)
+{
+	clear();
+
+	int i;
+	if (contacts.size() == 0) return;
+
+	if (contacts.size() == 1)
+	{
+		push_back(contacts[0]);
+		return;
+	}
+
+	btAlignedObjectArray<CONTACT_KEY_TOKEN> keycontacts;
+
+	keycontacts.reserve(contacts.size());
+
+	//fill key contacts
+
+	for (i = 0; i < contacts.size(); i++)
+	{
+		keycontacts.push_back(CONTACT_KEY_TOKEN(contacts[i].calc_key_contact(), i));
+	}
+
+	//sort keys
+	keycontacts.quickSort(CONTACT_KEY_TOKEN_COMP());
+
+	// Merge contacts
+	int coincident_count = 0;
+	btVector3 coincident_normals[MAX_COINCIDENT];
+
+	unsigned int last_key = keycontacts[0].m_key;
+	unsigned int key = 0;
+
+	push_back(contacts[keycontacts[0].m_value]);
+
+	GIM_CONTACT* pcontact = &(*this)[0];
+
+	for (i = 1; i < keycontacts.size(); i++)
+	{
+		key = keycontacts[i].m_key;
+		const GIM_CONTACT* scontact = &contacts[keycontacts[i].m_value];
+
+		if (last_key == key)  //same points
+		{
+			//merge contact
+			if (pcontact->m_depth - CONTACT_DIFF_EPSILON > scontact->m_depth)  //)
+			{
+				*pcontact = *scontact;
+				coincident_count = 0;
+			}
+			else if (normal_contact_average)
+			{
+				if (btFabs(pcontact->m_depth - scontact->m_depth) < CONTACT_DIFF_EPSILON)
+				{
+					if (coincident_count < MAX_COINCIDENT)
+					{
+						coincident_normals[coincident_count] = scontact->m_normal;
+						coincident_count++;
+					}
+				}
+			}
+		}
+		else
+		{  //add new contact
+
+			if (normal_contact_average && coincident_count > 0)
+			{
+				pcontact->interpolate_normals(coincident_normals, coincident_count);
+				coincident_count = 0;
+			}
+
+			push_back(*scontact);
+			pcontact = &(*this)[this->size() - 1];
+		}
+		last_key = key;
+	}
+}
+
+void btContactArray::merge_contacts_unique(const btContactArray& contacts)
+{
+	clear();
+
+	if (contacts.size() == 0) return;
+
+	if (contacts.size() == 1)
+	{
+		push_back(contacts[0]);
+		return;
+	}
+
+	GIM_CONTACT average_contact = contacts[0];
+
+	for (int i = 1; i < contacts.size(); i++)
+	{
+		average_contact.m_point += contacts[i].m_point;
+		average_contact.m_normal += contacts[i].m_normal * contacts[i].m_depth;
+	}
+
+	//divide
+	btScalar divide_average = 1.0f / ((btScalar)contacts.size());
+
+	average_contact.m_point *= divide_average;
+
+	average_contact.m_normal *= divide_average;
+
+	average_contact.m_depth = average_contact.m_normal.length();
+
+	average_contact.m_normal /= average_contact.m_depth;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessing.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessing.h
new file mode 100644
index 0000000..4ff09d7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessing.h
@@ -0,0 +1,65 @@
+#ifndef BT_CONTACT_H_INCLUDED
+#define BT_CONTACT_H_INCLUDED
+
+/*! \file gim_contact.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "btTriangleShapeEx.h"
+#include "btContactProcessingStructs.h"
+
+class btContactArray : public btAlignedObjectArray<GIM_CONTACT>
+{
+public:
+	btContactArray()
+	{
+		reserve(64);
+	}
+
+	SIMD_FORCE_INLINE void push_contact(
+		const btVector3 &point, const btVector3 &normal,
+		btScalar depth, int feature1, int feature2)
+	{
+		push_back(GIM_CONTACT(point, normal, depth, feature1, feature2));
+	}
+
+	SIMD_FORCE_INLINE void push_triangle_contacts(
+		const GIM_TRIANGLE_CONTACT &tricontact,
+		int feature1, int feature2)
+	{
+		for (int i = 0; i < tricontact.m_point_count; i++)
+		{
+			push_contact(
+				tricontact.m_points[i],
+				tricontact.m_separating_normal,
+				tricontact.m_penetration_depth, feature1, feature2);
+		}
+	}
+
+	void merge_contacts(const btContactArray &contacts, bool normal_contact_average = true);
+
+	void merge_contacts_unique(const btContactArray &contacts);
+};
+
+#endif  // GIM_CONTACT_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessingStructs.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessingStructs.h
new file mode 100644
index 0000000..bc8a709
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btContactProcessingStructs.h
@@ -0,0 +1,105 @@
+#ifndef BT_CONTACT_H_STRUCTS_INCLUDED
+#define BT_CONTACT_H_STRUCTS_INCLUDED
+
+/*! \file gim_contact.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "btTriangleShapeEx.h"
+
+/**
+Configuration var for applying interpolation of  contact normals
+*/
+#define NORMAL_CONTACT_AVERAGE 1
+
+#define CONTACT_DIFF_EPSILON 0.00001f
+
+///The GIM_CONTACT is an internal GIMPACT structure, similar to btManifoldPoint.
+///@todo: remove and replace GIM_CONTACT by btManifoldPoint.
+class GIM_CONTACT
+{
+public:
+	btVector3 m_point;
+	btVector3 m_normal;
+	btScalar m_depth;     //Positive value indicates interpenetration
+	btScalar m_distance;  //Padding not for use
+	int m_feature1;       //Face number
+	int m_feature2;       //Face number
+public:
+	GIM_CONTACT()
+	{
+	}
+
+	GIM_CONTACT(const GIM_CONTACT &contact) : m_point(contact.m_point),
+											  m_normal(contact.m_normal),
+											  m_depth(contact.m_depth),
+											  m_feature1(contact.m_feature1),
+											  m_feature2(contact.m_feature2)
+	{
+	}
+
+	GIM_CONTACT(const btVector3 &point, const btVector3 &normal,
+				btScalar depth, int feature1, int feature2) : m_point(point),
+															  m_normal(normal),
+															  m_depth(depth),
+															  m_feature1(feature1),
+															  m_feature2(feature2)
+	{
+	}
+
+	//! Calcs key for coord classification
+	SIMD_FORCE_INLINE unsigned int calc_key_contact() const
+	{
+		int _coords[] = {
+			(int)(m_point[0] * 1000.0f + 1.0f),
+			(int)(m_point[1] * 1333.0f),
+			(int)(m_point[2] * 2133.0f + 3.0f)};
+		unsigned int _hash = 0;
+		unsigned int *_uitmp = (unsigned int *)(&_coords[0]);
+		_hash = *_uitmp;
+		_uitmp++;
+		_hash += (*_uitmp) << 4;
+		_uitmp++;
+		_hash += (*_uitmp) << 8;
+		return _hash;
+	}
+
+	SIMD_FORCE_INLINE void interpolate_normals(btVector3 *normals, int normal_count)
+	{
+		btVector3 vec_sum(m_normal);
+		for (int i = 0; i < normal_count; i++)
+		{
+			vec_sum += normals[i];
+		}
+
+		btScalar vec_sum_len = vec_sum.length2();
+		if (vec_sum_len < CONTACT_DIFF_EPSILON) return;
+
+		//GIM_INV_SQRT(vec_sum_len,vec_sum_len); // 1/sqrt(vec_sum_len)
+
+		m_normal = vec_sum / btSqrt(vec_sum_len);
+	}
+};
+
+#endif  // BT_CONTACT_H_STRUCTS_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvh.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvh.cpp
new file mode 100644
index 0000000..bb520e0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvh.cpp
@@ -0,0 +1,464 @@
+/*! \file gim_box_set.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#include "btGImpactBvh.h"
+#include "LinearMath/btQuickprof.h"
+
+#ifdef TRI_COLLISION_PROFILING
+
+btClock g_tree_clock;
+
+float g_accum_tree_collision_time = 0;
+int g_count_traversing = 0;
+
+void bt_begin_gim02_tree_time()
+{
+	g_tree_clock.reset();
+}
+
+void bt_end_gim02_tree_time()
+{
+	g_accum_tree_collision_time += g_tree_clock.getTimeMicroseconds();
+	g_count_traversing++;
+}
+
+//! Gets the average time in miliseconds of tree collisions
+float btGImpactBvh::getAverageTreeCollisionTime()
+{
+	if (g_count_traversing == 0) return 0;
+
+	float avgtime = g_accum_tree_collision_time;
+	avgtime /= (float)g_count_traversing;
+
+	g_accum_tree_collision_time = 0;
+	g_count_traversing = 0;
+	return avgtime;
+
+	//	float avgtime = g_count_traversing;
+	//	g_count_traversing = 0;
+	//	return avgtime;
+}
+
+#endif  //TRI_COLLISION_PROFILING
+
+/////////////////////// btBvhTree /////////////////////////////////
+
+int btBvhTree::_calc_splitting_axis(
+	GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex)
+{
+	int i;
+
+	btVector3 means(btScalar(0.), btScalar(0.), btScalar(0.));
+	btVector3 variance(btScalar(0.), btScalar(0.), btScalar(0.));
+	int numIndices = endIndex - startIndex;
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		means += center;
+	}
+	means *= (btScalar(1.) / (btScalar)numIndices);
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		btVector3 diff2 = center - means;
+		diff2 = diff2 * diff2;
+		variance += diff2;
+	}
+	variance *= (btScalar(1.) / ((btScalar)numIndices - 1));
+
+	return variance.maxAxis();
+}
+
+int btBvhTree::_sort_and_calc_splitting_index(
+	GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex,
+	int endIndex, int splitAxis)
+{
+	int i;
+	int splitIndex = startIndex;
+	int numIndices = endIndex - startIndex;
+
+	// average of centers
+	btScalar splitValue = 0.0f;
+
+	btVector3 means(btScalar(0.), btScalar(0.), btScalar(0.));
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		means += center;
+	}
+	means *= (btScalar(1.) / (btScalar)numIndices);
+
+	splitValue = means[splitAxis];
+
+	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		if (center[splitAxis] > splitValue)
+		{
+			//swap
+			primitive_boxes.swap(i, splitIndex);
+			//swapLeafNodes(i,splitIndex);
+			splitIndex++;
+		}
+	}
+
+	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
+	//otherwise the tree-building might fail due to stack-overflows in certain cases.
+	//unbalanced1 is unsafe: it can cause stack overflows
+	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
+
+	//unbalanced2 should work too: always use center (perfect balanced trees)
+	//bool unbalanced2 = true;
+
+	//this should be safe too:
+	int rangeBalancedIndices = numIndices / 3;
+	bool unbalanced = ((splitIndex <= (startIndex + rangeBalancedIndices)) || (splitIndex >= (endIndex - 1 - rangeBalancedIndices)));
+
+	if (unbalanced)
+	{
+		splitIndex = startIndex + (numIndices >> 1);
+	}
+
+	btAssert(!((splitIndex == startIndex) || (splitIndex == (endIndex))));
+
+	return splitIndex;
+}
+
+void btBvhTree::_build_sub_tree(GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex)
+{
+	int curIndex = m_num_nodes;
+	m_num_nodes++;
+
+	btAssert((endIndex - startIndex) > 0);
+
+	if ((endIndex - startIndex) == 1)
+	{
+		//We have a leaf node
+		setNodeBound(curIndex, primitive_boxes[startIndex].m_bound);
+		m_node_array[curIndex].setDataIndex(primitive_boxes[startIndex].m_data);
+
+		return;
+	}
+	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+
+	//split axis
+	int splitIndex = _calc_splitting_axis(primitive_boxes, startIndex, endIndex);
+
+	splitIndex = _sort_and_calc_splitting_index(
+		primitive_boxes, startIndex, endIndex,
+		splitIndex  //split axis
+	);
+
+	//calc this node bounding box
+
+	btAABB node_bound;
+	node_bound.invalidate();
+
+	for (int i = startIndex; i < endIndex; i++)
+	{
+		node_bound.merge(primitive_boxes[i].m_bound);
+	}
+
+	setNodeBound(curIndex, node_bound);
+
+	//build left branch
+	_build_sub_tree(primitive_boxes, startIndex, splitIndex);
+
+	//build right branch
+	_build_sub_tree(primitive_boxes, splitIndex, endIndex);
+
+	m_node_array[curIndex].setEscapeIndex(m_num_nodes - curIndex);
+}
+
+//! stackless build tree
+void btBvhTree::build_tree(
+	GIM_BVH_DATA_ARRAY& primitive_boxes)
+{
+	// initialize node count to 0
+	m_num_nodes = 0;
+	// allocate nodes
+	m_node_array.resize(primitive_boxes.size() * 2);
+
+	_build_sub_tree(primitive_boxes, 0, primitive_boxes.size());
+}
+
+////////////////////////////////////class btGImpactBvh
+
+void btGImpactBvh::refit()
+{
+	int nodecount = getNodeCount();
+	while (nodecount--)
+	{
+		if (isLeafNode(nodecount))
+		{
+			btAABB leafbox;
+			m_primitive_manager->get_primitive_box(getNodeData(nodecount), leafbox);
+			setNodeBound(nodecount, leafbox);
+		}
+		else
+		{
+			//const GIM_BVH_TREE_NODE * nodepointer = get_node_pointer(nodecount);
+			//get left bound
+			btAABB bound;
+			bound.invalidate();
+
+			btAABB temp_box;
+
+			int child_node = getLeftNode(nodecount);
+			if (child_node)
+			{
+				getNodeBound(child_node, temp_box);
+				bound.merge(temp_box);
+			}
+
+			child_node = getRightNode(nodecount);
+			if (child_node)
+			{
+				getNodeBound(child_node, temp_box);
+				bound.merge(temp_box);
+			}
+
+			setNodeBound(nodecount, bound);
+		}
+	}
+}
+
+//! this rebuild the entire set
+void btGImpactBvh::buildSet()
+{
+	//obtain primitive boxes
+	GIM_BVH_DATA_ARRAY primitive_boxes;
+	primitive_boxes.resize(m_primitive_manager->get_primitive_count());
+
+	for (int i = 0; i < primitive_boxes.size(); i++)
+	{
+		m_primitive_manager->get_primitive_box(i, primitive_boxes[i].m_bound);
+		primitive_boxes[i].m_data = i;
+	}
+
+	m_box_tree.build_tree(primitive_boxes);
+}
+
+//! returns the indices of the primitives in the m_primitive_manager
+bool btGImpactBvh::boxQuery(const btAABB& box, btAlignedObjectArray<int>& collided_results) const
+{
+	int curIndex = 0;
+	int numNodes = getNodeCount();
+
+	while (curIndex < numNodes)
+	{
+		btAABB bound;
+		getNodeBound(curIndex, bound);
+
+		//catch bugs in tree data
+
+		bool aabbOverlap = bound.has_collision(box);
+		bool isleafnode = isLeafNode(curIndex);
+
+		if (isleafnode && aabbOverlap)
+		{
+			collided_results.push_back(getNodeData(curIndex));
+		}
+
+		if (aabbOverlap || isleafnode)
+		{
+			//next subnode
+			curIndex++;
+		}
+		else
+		{
+			//skip node
+			curIndex += getEscapeNodeIndex(curIndex);
+		}
+	}
+	if (collided_results.size() > 0) return true;
+	return false;
+}
+
+//! returns the indices of the primitives in the m_primitive_manager
+bool btGImpactBvh::rayQuery(
+	const btVector3& ray_dir, const btVector3& ray_origin,
+	btAlignedObjectArray<int>& collided_results) const
+{
+	int curIndex = 0;
+	int numNodes = getNodeCount();
+
+	while (curIndex < numNodes)
+	{
+		btAABB bound;
+		getNodeBound(curIndex, bound);
+
+		//catch bugs in tree data
+
+		bool aabbOverlap = bound.collide_ray(ray_origin, ray_dir);
+		bool isleafnode = isLeafNode(curIndex);
+
+		if (isleafnode && aabbOverlap)
+		{
+			collided_results.push_back(getNodeData(curIndex));
+		}
+
+		if (aabbOverlap || isleafnode)
+		{
+			//next subnode
+			curIndex++;
+		}
+		else
+		{
+			//skip node
+			curIndex += getEscapeNodeIndex(curIndex);
+		}
+	}
+	if (collided_results.size() > 0) return true;
+	return false;
+}
+
+SIMD_FORCE_INLINE bool _node_collision(
+	btGImpactBvh* boxset0, btGImpactBvh* boxset1,
+	const BT_BOX_BOX_TRANSFORM_CACHE& trans_cache_1to0,
+	int node0, int node1, bool complete_primitive_tests)
+{
+	btAABB box0;
+	boxset0->getNodeBound(node0, box0);
+	btAABB box1;
+	boxset1->getNodeBound(node1, box1);
+
+	return box0.overlapping_trans_cache(box1, trans_cache_1to0, complete_primitive_tests);
+	//	box1.appy_transform_trans_cache(trans_cache_1to0);
+	//	return box0.has_collision(box1);
+}
+
+//stackless recursive collision routine
+static void _find_collision_pairs_recursive(
+	btGImpactBvh* boxset0, btGImpactBvh* boxset1,
+	btPairSet* collision_pairs,
+	const BT_BOX_BOX_TRANSFORM_CACHE& trans_cache_1to0,
+	int node0, int node1, bool complete_primitive_tests)
+{
+	if (_node_collision(
+			boxset0, boxset1, trans_cache_1to0,
+			node0, node1, complete_primitive_tests) == false) return;  //avoid colliding internal nodes
+
+	if (boxset0->isLeafNode(node0))
+	{
+		if (boxset1->isLeafNode(node1))
+		{
+			// collision result
+			collision_pairs->push_pair(
+				boxset0->getNodeData(node0), boxset1->getNodeData(node1));
+			return;
+		}
+		else
+		{
+			//collide left recursive
+
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				node0, boxset1->getLeftNode(node1), false);
+
+			//collide right recursive
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				node0, boxset1->getRightNode(node1), false);
+		}
+	}
+	else
+	{
+		if (boxset1->isLeafNode(node1))
+		{
+			//collide left recursive
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getLeftNode(node0), node1, false);
+
+			//collide right recursive
+
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getRightNode(node0), node1, false);
+		}
+		else
+		{
+			//collide left0 left1
+
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getLeftNode(node0), boxset1->getLeftNode(node1), false);
+
+			//collide left0 right1
+
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getLeftNode(node0), boxset1->getRightNode(node1), false);
+
+			//collide right0 left1
+
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getRightNode(node0), boxset1->getLeftNode(node1), false);
+
+			//collide right0 right1
+
+			_find_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getRightNode(node0), boxset1->getRightNode(node1), false);
+
+		}  // else if node1 is not a leaf
+	}      // else if node0 is not a leaf
+}
+
+void btGImpactBvh::find_collision(btGImpactBvh* boxset0, const btTransform& trans0,
+								  btGImpactBvh* boxset1, const btTransform& trans1,
+								  btPairSet& collision_pairs)
+{
+	if (boxset0->getNodeCount() == 0 || boxset1->getNodeCount() == 0) return;
+
+	BT_BOX_BOX_TRANSFORM_CACHE trans_cache_1to0;
+
+	trans_cache_1to0.calc_from_homogenic(trans0, trans1);
+
+#ifdef TRI_COLLISION_PROFILING
+	bt_begin_gim02_tree_time();
+#endif  //TRI_COLLISION_PROFILING
+
+	_find_collision_pairs_recursive(
+		boxset0, boxset1,
+		&collision_pairs, trans_cache_1to0, 0, 0, true);
+#ifdef TRI_COLLISION_PROFILING
+	bt_end_gim02_tree_time();
+#endif  //TRI_COLLISION_PROFILING
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvh.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvh.h
new file mode 100644
index 0000000..3cd8fa2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvh.h
@@ -0,0 +1,309 @@
+#ifndef BT_GIMPACT_BVH_H_INCLUDED
+#define BT_GIMPACT_BVH_H_INCLUDED
+
+/*! \file gim_box_set.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btAlignedObjectArray.h"
+
+#include "btBoxCollision.h"
+#include "btTriangleShapeEx.h"
+#include "btGImpactBvhStructs.h"
+
+//! A pairset array
+class btPairSet : public btAlignedObjectArray<GIM_PAIR>
+{
+public:
+	btPairSet()
+	{
+		reserve(32);
+	}
+	inline void push_pair(int index1, int index2)
+	{
+		push_back(GIM_PAIR(index1, index2));
+	}
+
+	inline void push_pair_inv(int index1, int index2)
+	{
+		push_back(GIM_PAIR(index2, index1));
+	}
+};
+
+class GIM_BVH_DATA_ARRAY : public btAlignedObjectArray<GIM_BVH_DATA>
+{
+};
+
+class GIM_BVH_TREE_NODE_ARRAY : public btAlignedObjectArray<GIM_BVH_TREE_NODE>
+{
+};
+
+//! Basic Box tree structure
+class btBvhTree
+{
+protected:
+	int m_num_nodes;
+	GIM_BVH_TREE_NODE_ARRAY m_node_array;
+
+protected:
+	int _sort_and_calc_splitting_index(
+		GIM_BVH_DATA_ARRAY& primitive_boxes,
+		int startIndex, int endIndex, int splitAxis);
+
+	int _calc_splitting_axis(GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex);
+
+	void _build_sub_tree(GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex);
+
+public:
+	btBvhTree()
+	{
+		m_num_nodes = 0;
+	}
+
+	//! prototype functions for box tree management
+	//!@{
+	void build_tree(GIM_BVH_DATA_ARRAY& primitive_boxes);
+
+	SIMD_FORCE_INLINE void clearNodes()
+	{
+		m_node_array.clear();
+		m_num_nodes = 0;
+	}
+
+	//! node count
+	SIMD_FORCE_INLINE int getNodeCount() const
+	{
+		return m_num_nodes;
+	}
+
+	//! tells if the node is a leaf
+	SIMD_FORCE_INLINE bool isLeafNode(int nodeindex) const
+	{
+		return m_node_array[nodeindex].isLeafNode();
+	}
+
+	SIMD_FORCE_INLINE int getNodeData(int nodeindex) const
+	{
+		return m_node_array[nodeindex].getDataIndex();
+	}
+
+	SIMD_FORCE_INLINE void getNodeBound(int nodeindex, btAABB& bound) const
+	{
+		bound = m_node_array[nodeindex].m_bound;
+	}
+
+	SIMD_FORCE_INLINE void setNodeBound(int nodeindex, const btAABB& bound)
+	{
+		m_node_array[nodeindex].m_bound = bound;
+	}
+
+	SIMD_FORCE_INLINE int getLeftNode(int nodeindex) const
+	{
+		return nodeindex + 1;
+	}
+
+	SIMD_FORCE_INLINE int getRightNode(int nodeindex) const
+	{
+		if (m_node_array[nodeindex + 1].isLeafNode()) return nodeindex + 2;
+		return nodeindex + 1 + m_node_array[nodeindex + 1].getEscapeIndex();
+	}
+
+	SIMD_FORCE_INLINE int getEscapeNodeIndex(int nodeindex) const
+	{
+		return m_node_array[nodeindex].getEscapeIndex();
+	}
+
+	SIMD_FORCE_INLINE const GIM_BVH_TREE_NODE* get_node_pointer(int index = 0) const
+	{
+		return &m_node_array[index];
+	}
+
+	//!@}
+};
+
+//! Prototype Base class for primitive classification
+/*!
+This class is a wrapper for primitive collections.
+This tells relevant info for the Bounding Box set classes, which take care of space classification.
+This class can manage Compound shapes and trimeshes, and if it is managing trimesh then the  Hierarchy Bounding Box classes will take advantage of primitive Vs Box overlapping tests for getting optimal results and less Per Box compairisons.
+*/
+class btPrimitiveManagerBase
+{
+public:
+	virtual ~btPrimitiveManagerBase() {}
+
+	//! determines if this manager consist on only triangles, which special case will be optimized
+	virtual bool is_trimesh() const = 0;
+	virtual int get_primitive_count() const = 0;
+	virtual void get_primitive_box(int prim_index, btAABB& primbox) const = 0;
+	//! retrieves only the points of the triangle, and the collision margin
+	virtual void get_primitive_triangle(int prim_index, btPrimitiveTriangle& triangle) const = 0;
+};
+
+//! Structure for containing Boxes
+/*!
+This class offers an structure for managing a box tree of primitives.
+Requires a Primitive prototype (like btPrimitiveManagerBase )
+*/
+class btGImpactBvh
+{
+protected:
+	btBvhTree m_box_tree;
+	btPrimitiveManagerBase* m_primitive_manager;
+
+protected:
+	//stackless refit
+	void refit();
+
+public:
+	//! this constructor doesn't build the tree. you must call	buildSet
+	btGImpactBvh()
+	{
+		m_primitive_manager = NULL;
+	}
+
+	//! this constructor doesn't build the tree. you must call	buildSet
+	btGImpactBvh(btPrimitiveManagerBase* primitive_manager)
+	{
+		m_primitive_manager = primitive_manager;
+	}
+
+	SIMD_FORCE_INLINE btAABB getGlobalBox() const
+	{
+		btAABB totalbox;
+		getNodeBound(0, totalbox);
+		return totalbox;
+	}
+
+	SIMD_FORCE_INLINE void setPrimitiveManager(btPrimitiveManagerBase* primitive_manager)
+	{
+		m_primitive_manager = primitive_manager;
+	}
+
+	SIMD_FORCE_INLINE btPrimitiveManagerBase* getPrimitiveManager() const
+	{
+		return m_primitive_manager;
+	}
+
+	//! node manager prototype functions
+	///@{
+
+	//! this attemps to refit the box set.
+	SIMD_FORCE_INLINE void update()
+	{
+		refit();
+	}
+
+	//! this rebuild the entire set
+	void buildSet();
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	bool boxQuery(const btAABB& box, btAlignedObjectArray<int>& collided_results) const;
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	SIMD_FORCE_INLINE bool boxQueryTrans(const btAABB& box,
+										 const btTransform& transform, btAlignedObjectArray<int>& collided_results) const
+	{
+		btAABB transbox = box;
+		transbox.appy_transform(transform);
+		return boxQuery(transbox, collided_results);
+	}
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	bool rayQuery(
+		const btVector3& ray_dir, const btVector3& ray_origin,
+		btAlignedObjectArray<int>& collided_results) const;
+
+	//! tells if this set has hierarcht
+	SIMD_FORCE_INLINE bool hasHierarchy() const
+	{
+		return true;
+	}
+
+	//! tells if this set is a trimesh
+	SIMD_FORCE_INLINE bool isTrimesh() const
+	{
+		return m_primitive_manager->is_trimesh();
+	}
+
+	//! node count
+	SIMD_FORCE_INLINE int getNodeCount() const
+	{
+		return m_box_tree.getNodeCount();
+	}
+
+	//! tells if the node is a leaf
+	SIMD_FORCE_INLINE bool isLeafNode(int nodeindex) const
+	{
+		return m_box_tree.isLeafNode(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE int getNodeData(int nodeindex) const
+	{
+		return m_box_tree.getNodeData(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE void getNodeBound(int nodeindex, btAABB& bound) const
+	{
+		m_box_tree.getNodeBound(nodeindex, bound);
+	}
+
+	SIMD_FORCE_INLINE void setNodeBound(int nodeindex, const btAABB& bound)
+	{
+		m_box_tree.setNodeBound(nodeindex, bound);
+	}
+
+	SIMD_FORCE_INLINE int getLeftNode(int nodeindex) const
+	{
+		return m_box_tree.getLeftNode(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE int getRightNode(int nodeindex) const
+	{
+		return m_box_tree.getRightNode(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE int getEscapeNodeIndex(int nodeindex) const
+	{
+		return m_box_tree.getEscapeNodeIndex(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE void getNodeTriangle(int nodeindex, btPrimitiveTriangle& triangle) const
+	{
+		m_primitive_manager->get_primitive_triangle(getNodeData(nodeindex), triangle);
+	}
+
+	SIMD_FORCE_INLINE const GIM_BVH_TREE_NODE* get_node_pointer(int index = 0) const
+	{
+		return m_box_tree.get_node_pointer(index);
+	}
+
+#ifdef TRI_COLLISION_PROFILING
+	static float getAverageTreeCollisionTime();
+#endif  //TRI_COLLISION_PROFILING
+
+	static void find_collision(btGImpactBvh* boxset1, const btTransform& trans1,
+							   btGImpactBvh* boxset2, const btTransform& trans2,
+							   btPairSet& collision_pairs);
+};
+
+#endif  // BT_GIMPACT_BVH_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvhStructs.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvhStructs.h
new file mode 100644
index 0000000..8f78c23
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactBvhStructs.h
@@ -0,0 +1,85 @@
+#ifndef GIM_BOX_SET_STRUCT_H_INCLUDED
+#define GIM_BOX_SET_STRUCT_H_INCLUDED
+
+/*! \file gim_box_set.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btAlignedObjectArray.h"
+
+#include "btBoxCollision.h"
+#include "btTriangleShapeEx.h"
+#include "gim_pair.h" //for GIM_PAIR
+
+///GIM_BVH_DATA is an internal GIMPACT collision structure to contain axis aligned bounding box
+struct GIM_BVH_DATA
+{
+	btAABB m_bound;
+	int m_data;
+};
+
+//! Node Structure for trees
+class GIM_BVH_TREE_NODE
+{
+public:
+	btAABB m_bound;
+
+protected:
+	int m_escapeIndexOrDataIndex;
+
+public:
+	GIM_BVH_TREE_NODE()
+	{
+		m_escapeIndexOrDataIndex = 0;
+	}
+
+	SIMD_FORCE_INLINE bool isLeafNode() const
+	{
+		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+		return (m_escapeIndexOrDataIndex >= 0);
+	}
+
+	SIMD_FORCE_INLINE int getEscapeIndex() const
+	{
+		//btAssert(m_escapeIndexOrDataIndex < 0);
+		return -m_escapeIndexOrDataIndex;
+	}
+
+	SIMD_FORCE_INLINE void setEscapeIndex(int index)
+	{
+		m_escapeIndexOrDataIndex = -index;
+	}
+
+	SIMD_FORCE_INLINE int getDataIndex() const
+	{
+		//btAssert(m_escapeIndexOrDataIndex >= 0);
+
+		return m_escapeIndexOrDataIndex;
+	}
+
+	SIMD_FORCE_INLINE void setDataIndex(int index)
+	{
+		m_escapeIndexOrDataIndex = index;
+	}
+};
+
+#endif  // GIM_BOXPRUNING_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
new file mode 100644
index 0000000..73e3db1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
@@ -0,0 +1,866 @@
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+/*
+Author: Francisco Leon Najera
+Concave-Concave Collision
+
+*/
+
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "btGImpactCollisionAlgorithm.h"
+#include "btContactProcessing.h"
+#include "LinearMath/btQuickprof.h"
+
+//! Class for accessing the plane equation
+class btPlaneShape : public btStaticPlaneShape
+{
+public:
+	btPlaneShape(const btVector3& v, float f)
+		: btStaticPlaneShape(v, f)
+	{
+	}
+
+	void get_plane_equation(btVector4& equation)
+	{
+		equation[0] = m_planeNormal[0];
+		equation[1] = m_planeNormal[1];
+		equation[2] = m_planeNormal[2];
+		equation[3] = m_planeConstant;
+	}
+
+	void get_plane_equation_transformed(const btTransform& trans, btVector4& equation) const
+	{
+		const btVector3 normal = trans.getBasis() * m_planeNormal;
+		equation[0] = normal[0];
+		equation[1] = normal[1];
+		equation[2] = normal[2];
+		equation[3] = normal.dot(trans * (m_planeConstant * m_planeNormal));
+	}
+};
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#ifdef TRI_COLLISION_PROFILING
+
+btClock g_triangle_clock;
+
+float g_accum_triangle_collision_time = 0;
+int g_count_triangle_collision = 0;
+
+void bt_begin_gim02_tri_time()
+{
+	g_triangle_clock.reset();
+}
+
+void bt_end_gim02_tri_time()
+{
+	g_accum_triangle_collision_time += g_triangle_clock.getTimeMicroseconds();
+	g_count_triangle_collision++;
+}
+#endif  //TRI_COLLISION_PROFILING
+//! Retrieving shapes shapes
+/*!
+Declared here due of insuficent space on Pool allocators
+*/
+//!@{
+class GIM_ShapeRetriever
+{
+public:
+	const btGImpactShapeInterface* m_gim_shape;
+	btTriangleShapeEx m_trishape;
+	btTetrahedronShapeEx m_tetrashape;
+
+public:
+	class ChildShapeRetriever
+	{
+	public:
+		GIM_ShapeRetriever* m_parent;
+		virtual const btCollisionShape* getChildShape(int index)
+		{
+			return m_parent->m_gim_shape->getChildShape(index);
+		}
+		virtual ~ChildShapeRetriever() {}
+	};
+
+	class TriangleShapeRetriever : public ChildShapeRetriever
+	{
+	public:
+		virtual btCollisionShape* getChildShape(int index)
+		{
+			m_parent->m_gim_shape->getBulletTriangle(index, m_parent->m_trishape);
+			return &m_parent->m_trishape;
+		}
+		virtual ~TriangleShapeRetriever() {}
+	};
+
+	class TetraShapeRetriever : public ChildShapeRetriever
+	{
+	public:
+		virtual btCollisionShape* getChildShape(int index)
+		{
+			m_parent->m_gim_shape->getBulletTetrahedron(index, m_parent->m_tetrashape);
+			return &m_parent->m_tetrashape;
+		}
+	};
+
+public:
+	ChildShapeRetriever m_child_retriever;
+	TriangleShapeRetriever m_tri_retriever;
+	TetraShapeRetriever m_tetra_retriever;
+	ChildShapeRetriever* m_current_retriever;
+
+	GIM_ShapeRetriever(const btGImpactShapeInterface* gim_shape)
+	{
+		m_gim_shape = gim_shape;
+		//select retriever
+		if (m_gim_shape->needsRetrieveTriangles())
+		{
+			m_current_retriever = &m_tri_retriever;
+		}
+		else if (m_gim_shape->needsRetrieveTetrahedrons())
+		{
+			m_current_retriever = &m_tetra_retriever;
+		}
+		else
+		{
+			m_current_retriever = &m_child_retriever;
+		}
+
+		m_current_retriever->m_parent = this;
+	}
+
+	const btCollisionShape* getChildShape(int index)
+	{
+		return m_current_retriever->getChildShape(index);
+	}
+};
+
+//!@}
+
+#ifdef TRI_COLLISION_PROFILING
+
+//! Gets the average time in miliseconds of tree collisions
+float btGImpactCollisionAlgorithm::getAverageTreeCollisionTime()
+{
+	return btGImpactBoxSet::getAverageTreeCollisionTime();
+}
+
+//! Gets the average time in miliseconds of triangle collisions
+float btGImpactCollisionAlgorithm::getAverageTriangleCollisionTime()
+{
+	if (g_count_triangle_collision == 0) return 0;
+
+	float avgtime = g_accum_triangle_collision_time;
+	avgtime /= (float)g_count_triangle_collision;
+
+	g_accum_triangle_collision_time = 0;
+	g_count_triangle_collision = 0;
+
+	return avgtime;
+}
+
+#endif  //TRI_COLLISION_PROFILING
+
+btGImpactCollisionAlgorithm::btGImpactCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+	: btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap)
+{
+	m_manifoldPtr = NULL;
+	m_convex_algorithm = NULL;
+}
+
+btGImpactCollisionAlgorithm::~btGImpactCollisionAlgorithm()
+{
+	clearCache();
+}
+
+void btGImpactCollisionAlgorithm::addContactPoint(const btCollisionObjectWrapper* body0Wrap,
+												  const btCollisionObjectWrapper* body1Wrap,
+												  const btVector3& point,
+												  const btVector3& normal,
+												  btScalar distance)
+{
+	m_resultOut->setShapeIdentifiersA(m_part0, m_triface0);
+	m_resultOut->setShapeIdentifiersB(m_part1, m_triface1);
+	checkManifold(body0Wrap, body1Wrap);
+	m_resultOut->addContactPoint(normal, point, distance);
+}
+
+void btGImpactCollisionAlgorithm::shape_vs_shape_collision(
+	const btCollisionObjectWrapper* body0Wrap,
+	const btCollisionObjectWrapper* body1Wrap,
+	const btCollisionShape* shape0,
+	const btCollisionShape* shape1)
+{
+	{
+		btCollisionAlgorithm* algor = newAlgorithm(body0Wrap, body1Wrap);
+		// post :	checkManifold is called
+
+		m_resultOut->setShapeIdentifiersA(m_part0, m_triface0);
+		m_resultOut->setShapeIdentifiersB(m_part1, m_triface1);
+
+		algor->processCollision(body0Wrap, body1Wrap, *m_dispatchInfo, m_resultOut);
+
+		algor->~btCollisionAlgorithm();
+		m_dispatcher->freeCollisionAlgorithm(algor);
+	}
+}
+
+void btGImpactCollisionAlgorithm::convex_vs_convex_collision(
+	const btCollisionObjectWrapper* body0Wrap,
+	const btCollisionObjectWrapper* body1Wrap,
+	const btCollisionShape* shape0,
+	const btCollisionShape* shape1)
+{
+	m_resultOut->setShapeIdentifiersA(m_part0, m_triface0);
+	m_resultOut->setShapeIdentifiersB(m_part1, m_triface1);
+
+	btCollisionObjectWrapper ob0(body0Wrap, shape0, body0Wrap->getCollisionObject(), body0Wrap->getWorldTransform(), m_part0, m_triface0);
+	btCollisionObjectWrapper ob1(body1Wrap, shape1, body1Wrap->getCollisionObject(), body1Wrap->getWorldTransform(), m_part1, m_triface1);
+	checkConvexAlgorithm(&ob0, &ob1);
+	m_convex_algorithm->processCollision(&ob0, &ob1, *m_dispatchInfo, m_resultOut);
+}
+
+void btGImpactCollisionAlgorithm::gimpact_vs_gimpact_find_pairs(
+	const btTransform& trans0,
+	const btTransform& trans1,
+	const btGImpactShapeInterface* shape0,
+	const btGImpactShapeInterface* shape1, btPairSet& pairset)
+{
+	if (shape0->hasBoxSet() && shape1->hasBoxSet())
+	{
+		btGImpactBoxSet::find_collision(shape0->getBoxSet(), trans0, shape1->getBoxSet(), trans1, pairset);
+	}
+	else
+	{
+		btAABB boxshape0;
+		btAABB boxshape1;
+		int i = shape0->getNumChildShapes();
+
+		while (i--)
+		{
+			shape0->getChildAabb(i, trans0, boxshape0.m_min, boxshape0.m_max);
+
+			int j = shape1->getNumChildShapes();
+			while (j--)
+			{
+				shape1->getChildAabb(i, trans1, boxshape1.m_min, boxshape1.m_max);
+
+				if (boxshape1.has_collision(boxshape0))
+				{
+					pairset.push_pair(i, j);
+				}
+			}
+		}
+	}
+}
+
+void btGImpactCollisionAlgorithm::gimpact_vs_shape_find_pairs(
+	const btTransform& trans0,
+	const btTransform& trans1,
+	const btGImpactShapeInterface* shape0,
+	const btCollisionShape* shape1,
+	btAlignedObjectArray<int>& collided_primitives)
+{
+	btAABB boxshape;
+
+	if (shape0->hasBoxSet())
+	{
+		btTransform trans1to0 = trans0.inverse();
+		trans1to0 *= trans1;
+
+		shape1->getAabb(trans1to0, boxshape.m_min, boxshape.m_max);
+
+		shape0->getBoxSet()->boxQuery(boxshape, collided_primitives);
+	}
+	else
+	{
+		shape1->getAabb(trans1, boxshape.m_min, boxshape.m_max);
+
+		btAABB boxshape0;
+		int i = shape0->getNumChildShapes();
+
+		while (i--)
+		{
+			shape0->getChildAabb(i, trans0, boxshape0.m_min, boxshape0.m_max);
+
+			if (boxshape.has_collision(boxshape0))
+			{
+				collided_primitives.push_back(i);
+			}
+		}
+	}
+}
+
+void btGImpactCollisionAlgorithm::collide_gjk_triangles(const btCollisionObjectWrapper* body0Wrap,
+														const btCollisionObjectWrapper* body1Wrap,
+														const btGImpactMeshShapePart* shape0,
+														const btGImpactMeshShapePart* shape1,
+														const int* pairs, int pair_count)
+{
+	btTriangleShapeEx tri0;
+	btTriangleShapeEx tri1;
+
+	shape0->lockChildShapes();
+	shape1->lockChildShapes();
+
+	const int* pair_pointer = pairs;
+
+	while (pair_count--)
+	{
+		m_triface0 = *(pair_pointer);
+		m_triface1 = *(pair_pointer + 1);
+		pair_pointer += 2;
+
+		shape0->getBulletTriangle(m_triface0, tri0);
+		shape1->getBulletTriangle(m_triface1, tri1);
+
+		//collide two convex shapes
+		if (tri0.overlap_test_conservative(tri1))
+		{
+			convex_vs_convex_collision(body0Wrap, body1Wrap, &tri0, &tri1);
+		}
+	}
+
+	shape0->unlockChildShapes();
+	shape1->unlockChildShapes();
+}
+
+void btGImpactCollisionAlgorithm::collide_sat_triangles(const btCollisionObjectWrapper* body0Wrap,
+														const btCollisionObjectWrapper* body1Wrap,
+														const btGImpactMeshShapePart* shape0,
+														const btGImpactMeshShapePart* shape1,
+														const int* pairs, int pair_count)
+{
+	btTransform orgtrans0 = body0Wrap->getWorldTransform();
+	btTransform orgtrans1 = body1Wrap->getWorldTransform();
+
+	btPrimitiveTriangle ptri0;
+	btPrimitiveTriangle ptri1;
+	GIM_TRIANGLE_CONTACT contact_data;
+
+	shape0->lockChildShapes();
+	shape1->lockChildShapes();
+
+	const int* pair_pointer = pairs;
+
+	while (pair_count--)
+	{
+		m_triface0 = *(pair_pointer);
+		m_triface1 = *(pair_pointer + 1);
+		pair_pointer += 2;
+
+		shape0->getPrimitiveTriangle(m_triface0, ptri0);
+		shape1->getPrimitiveTriangle(m_triface1, ptri1);
+
+#ifdef TRI_COLLISION_PROFILING
+		bt_begin_gim02_tri_time();
+#endif
+
+		ptri0.applyTransform(orgtrans0);
+		ptri1.applyTransform(orgtrans1);
+
+		//build planes
+		ptri0.buildTriPlane();
+		ptri1.buildTriPlane();
+		// test conservative
+
+		if (ptri0.overlap_test_conservative(ptri1))
+		{
+			if (ptri0.find_triangle_collision_clip_method(ptri1, contact_data))
+			{
+				int j = contact_data.m_point_count;
+				while (j--)
+				{
+					addContactPoint(body0Wrap, body1Wrap,
+									contact_data.m_points[j],
+									contact_data.m_separating_normal,
+									-contact_data.m_penetration_depth);
+				}
+			}
+		}
+
+#ifdef TRI_COLLISION_PROFILING
+		bt_end_gim02_tri_time();
+#endif
+	}
+
+	shape0->unlockChildShapes();
+	shape1->unlockChildShapes();
+}
+
+void btGImpactCollisionAlgorithm::gimpact_vs_gimpact(
+	const btCollisionObjectWrapper* body0Wrap,
+	const btCollisionObjectWrapper* body1Wrap,
+	const btGImpactShapeInterface* shape0,
+	const btGImpactShapeInterface* shape1)
+{
+	if (shape0->getGImpactShapeType() == CONST_GIMPACT_TRIMESH_SHAPE)
+	{
+		const btGImpactMeshShape* meshshape0 = static_cast<const btGImpactMeshShape*>(shape0);
+		m_part0 = meshshape0->getMeshPartCount();
+
+		while (m_part0--)
+		{
+			gimpact_vs_gimpact(body0Wrap, body1Wrap, meshshape0->getMeshPart(m_part0), shape1);
+		}
+
+		return;
+	}
+
+	if (shape1->getGImpactShapeType() == CONST_GIMPACT_TRIMESH_SHAPE)
+	{
+		const btGImpactMeshShape* meshshape1 = static_cast<const btGImpactMeshShape*>(shape1);
+		m_part1 = meshshape1->getMeshPartCount();
+
+		while (m_part1--)
+		{
+			gimpact_vs_gimpact(body0Wrap, body1Wrap, shape0, meshshape1->getMeshPart(m_part1));
+		}
+
+		return;
+	}
+
+	btTransform orgtrans0 = body0Wrap->getWorldTransform();
+	btTransform orgtrans1 = body1Wrap->getWorldTransform();
+
+	btPairSet pairset;
+
+	gimpact_vs_gimpact_find_pairs(orgtrans0, orgtrans1, shape0, shape1, pairset);
+
+	if (pairset.size() == 0) return;
+
+	if (shape0->getGImpactShapeType() == CONST_GIMPACT_TRIMESH_SHAPE_PART &&
+		shape1->getGImpactShapeType() == CONST_GIMPACT_TRIMESH_SHAPE_PART)
+	{
+		const btGImpactMeshShapePart* shapepart0 = static_cast<const btGImpactMeshShapePart*>(shape0);
+		const btGImpactMeshShapePart* shapepart1 = static_cast<const btGImpactMeshShapePart*>(shape1);
+//specialized function
+#ifdef BULLET_TRIANGLE_COLLISION
+		collide_gjk_triangles(body0Wrap, body1Wrap, shapepart0, shapepart1, &pairset[0].m_index1, pairset.size());
+#else
+		collide_sat_triangles(body0Wrap, body1Wrap, shapepart0, shapepart1, &pairset[0].m_index1, pairset.size());
+#endif
+
+		return;
+	}
+
+	//general function
+
+	shape0->lockChildShapes();
+	shape1->lockChildShapes();
+
+	GIM_ShapeRetriever retriever0(shape0);
+	GIM_ShapeRetriever retriever1(shape1);
+
+	bool child_has_transform0 = shape0->childrenHasTransform();
+	bool child_has_transform1 = shape1->childrenHasTransform();
+
+	int i = pairset.size();
+	while (i--)
+	{
+		GIM_PAIR* pair = &pairset[i];
+		m_triface0 = pair->m_index1;
+		m_triface1 = pair->m_index2;
+		const btCollisionShape* colshape0 = retriever0.getChildShape(m_triface0);
+		const btCollisionShape* colshape1 = retriever1.getChildShape(m_triface1);
+
+		btTransform tr0 = body0Wrap->getWorldTransform();
+		btTransform tr1 = body1Wrap->getWorldTransform();
+
+		if (child_has_transform0)
+		{
+			tr0 = orgtrans0 * shape0->getChildTransform(m_triface0);
+		}
+
+		if (child_has_transform1)
+		{
+			tr1 = orgtrans1 * shape1->getChildTransform(m_triface1);
+		}
+
+		btCollisionObjectWrapper ob0(body0Wrap, colshape0, body0Wrap->getCollisionObject(), tr0, m_part0, m_triface0);
+		btCollisionObjectWrapper ob1(body1Wrap, colshape1, body1Wrap->getCollisionObject(), tr1, m_part1, m_triface1);
+
+		//collide two convex shapes
+		convex_vs_convex_collision(&ob0, &ob1, colshape0, colshape1);
+	}
+
+	shape0->unlockChildShapes();
+	shape1->unlockChildShapes();
+}
+
+void btGImpactCollisionAlgorithm::gimpact_vs_shape(const btCollisionObjectWrapper* body0Wrap,
+												   const btCollisionObjectWrapper* body1Wrap,
+												   const btGImpactShapeInterface* shape0,
+												   const btCollisionShape* shape1, bool swapped)
+{
+	if (shape0->getGImpactShapeType() == CONST_GIMPACT_TRIMESH_SHAPE)
+	{
+		const btGImpactMeshShape* meshshape0 = static_cast<const btGImpactMeshShape*>(shape0);
+		int& part = swapped ? m_part1 : m_part0;
+		part = meshshape0->getMeshPartCount();
+
+		while (part--)
+		{
+			gimpact_vs_shape(body0Wrap,
+							 body1Wrap,
+							 meshshape0->getMeshPart(part),
+							 shape1, swapped);
+		}
+
+		return;
+	}
+
+#ifdef GIMPACT_VS_PLANE_COLLISION
+	if (shape0->getGImpactShapeType() == CONST_GIMPACT_TRIMESH_SHAPE_PART &&
+		shape1->getShapeType() == STATIC_PLANE_PROXYTYPE)
+	{
+		const btGImpactMeshShapePart* shapepart = static_cast<const btGImpactMeshShapePart*>(shape0);
+		const btStaticPlaneShape* planeshape = static_cast<const btStaticPlaneShape*>(shape1);
+		gimpacttrimeshpart_vs_plane_collision(body0Wrap, body1Wrap, shapepart, planeshape, swapped);
+		return;
+	}
+
+#endif
+
+	if (shape1->isCompound())
+	{
+		const btCompoundShape* compoundshape = static_cast<const btCompoundShape*>(shape1);
+		gimpact_vs_compoundshape(body0Wrap, body1Wrap, shape0, compoundshape, swapped);
+		return;
+	}
+	else if (shape1->isConcave())
+	{
+		const btConcaveShape* concaveshape = static_cast<const btConcaveShape*>(shape1);
+		gimpact_vs_concave(body0Wrap, body1Wrap, shape0, concaveshape, swapped);
+		return;
+	}
+
+	btTransform orgtrans0 = body0Wrap->getWorldTransform();
+
+	btTransform orgtrans1 = body1Wrap->getWorldTransform();
+
+	btAlignedObjectArray<int> collided_results;
+
+	gimpact_vs_shape_find_pairs(orgtrans0, orgtrans1, shape0, shape1, collided_results);
+
+	if (collided_results.size() == 0) return;
+
+	shape0->lockChildShapes();
+
+	GIM_ShapeRetriever retriever0(shape0);
+
+	bool child_has_transform0 = shape0->childrenHasTransform();
+
+	int i = collided_results.size();
+
+	while (i--)
+	{
+		int child_index = collided_results[i];
+		if (swapped)
+			m_triface1 = child_index;
+		else
+			m_triface0 = child_index;
+
+		const btCollisionShape* colshape0 = retriever0.getChildShape(child_index);
+
+		btTransform tr0 = body0Wrap->getWorldTransform();
+
+		if (child_has_transform0)
+		{
+			tr0 = orgtrans0 * shape0->getChildTransform(child_index);
+		}
+
+		btCollisionObjectWrapper ob0(body0Wrap, colshape0, body0Wrap->getCollisionObject(), body0Wrap->getWorldTransform(), m_part0, m_triface0);
+		const btCollisionObjectWrapper* prevObj;
+
+		if (m_resultOut->getBody0Wrap()->getCollisionObject() == ob0.getCollisionObject())
+		{
+			prevObj = m_resultOut->getBody0Wrap();
+			m_resultOut->setBody0Wrap(&ob0);
+		}
+		else
+		{
+			prevObj = m_resultOut->getBody1Wrap();
+			m_resultOut->setBody1Wrap(&ob0);
+		}
+
+		//collide two shapes
+		if (swapped)
+		{
+			shape_vs_shape_collision(body1Wrap, &ob0, shape1, colshape0);
+		}
+		else
+		{
+			shape_vs_shape_collision(&ob0, body1Wrap, colshape0, shape1);
+		}
+
+		if (m_resultOut->getBody0Wrap()->getCollisionObject() == ob0.getCollisionObject())
+		{
+			m_resultOut->setBody0Wrap(prevObj);
+		}
+		else
+		{
+			m_resultOut->setBody1Wrap(prevObj);
+		}
+	}
+
+	shape0->unlockChildShapes();
+}
+
+void btGImpactCollisionAlgorithm::gimpact_vs_compoundshape(const btCollisionObjectWrapper* body0Wrap,
+														   const btCollisionObjectWrapper* body1Wrap,
+														   const btGImpactShapeInterface* shape0,
+														   const btCompoundShape* shape1, bool swapped)
+{
+	btTransform orgtrans1 = body1Wrap->getWorldTransform();
+
+	int i = shape1->getNumChildShapes();
+	while (i--)
+	{
+		const btCollisionShape* colshape1 = shape1->getChildShape(i);
+		btTransform childtrans1 = orgtrans1 * shape1->getChildTransform(i);
+
+		btCollisionObjectWrapper ob1(body1Wrap, colshape1, body1Wrap->getCollisionObject(), childtrans1, -1, i);
+
+		const btCollisionObjectWrapper* tmp = 0;
+		if (m_resultOut->getBody0Wrap()->getCollisionObject() == ob1.getCollisionObject())
+		{
+			tmp = m_resultOut->getBody0Wrap();
+			m_resultOut->setBody0Wrap(&ob1);
+		}
+		else
+		{
+			tmp = m_resultOut->getBody1Wrap();
+			m_resultOut->setBody1Wrap(&ob1);
+		}
+		//collide child shape
+		gimpact_vs_shape(body0Wrap, &ob1,
+						 shape0, colshape1, swapped);
+
+		if (m_resultOut->getBody0Wrap()->getCollisionObject() == ob1.getCollisionObject())
+		{
+			m_resultOut->setBody0Wrap(tmp);
+		}
+		else
+		{
+			m_resultOut->setBody1Wrap(tmp);
+		}
+	}
+}
+
+void btGImpactCollisionAlgorithm::gimpacttrimeshpart_vs_plane_collision(
+	const btCollisionObjectWrapper* body0Wrap,
+	const btCollisionObjectWrapper* body1Wrap,
+	const btGImpactMeshShapePart* shape0,
+	const btStaticPlaneShape* shape1, bool swapped)
+{
+	btTransform orgtrans0 = body0Wrap->getWorldTransform();
+	btTransform orgtrans1 = body1Wrap->getWorldTransform();
+
+	const btPlaneShape* planeshape = static_cast<const btPlaneShape*>(shape1);
+	btVector4 plane;
+	planeshape->get_plane_equation_transformed(orgtrans1, plane);
+
+	//test box against plane
+
+	btAABB tribox;
+	shape0->getAabb(orgtrans0, tribox.m_min, tribox.m_max);
+	tribox.increment_margin(planeshape->getMargin());
+
+	if (tribox.plane_classify(plane) != BT_CONST_COLLIDE_PLANE) return;
+
+	shape0->lockChildShapes();
+
+	btScalar margin = shape0->getMargin() + planeshape->getMargin();
+
+	btVector3 vertex;
+	int vi = shape0->getVertexCount();
+	while (vi--)
+	{
+		shape0->getVertex(vi, vertex);
+		vertex = orgtrans0(vertex);
+
+		btScalar distance = vertex.dot(plane) - plane[3] - margin;
+
+		if (distance < 0.0)  //add contact
+		{
+			if (swapped)
+			{
+				addContactPoint(body1Wrap, body0Wrap,
+								vertex,
+								-plane,
+								distance);
+			}
+			else
+			{
+				addContactPoint(body0Wrap, body1Wrap,
+								vertex,
+								plane,
+								distance);
+			}
+		}
+	}
+
+	shape0->unlockChildShapes();
+}
+
+class btGImpactTriangleCallback : public btTriangleCallback
+{
+public:
+	btGImpactCollisionAlgorithm* algorithm;
+	const btCollisionObjectWrapper* body0Wrap;
+	const btCollisionObjectWrapper* body1Wrap;
+	const btGImpactShapeInterface* gimpactshape0;
+	bool swapped;
+	btScalar margin;
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+	{
+		btTriangleShapeEx tri1(triangle[0], triangle[1], triangle[2]);
+		tri1.setMargin(margin);
+		if (swapped)
+		{
+			algorithm->setPart0(partId);
+			algorithm->setFace0(triangleIndex);
+		}
+		else
+		{
+			algorithm->setPart1(partId);
+			algorithm->setFace1(triangleIndex);
+		}
+
+		btCollisionObjectWrapper ob1Wrap(body1Wrap, &tri1, body1Wrap->getCollisionObject(), body1Wrap->getWorldTransform(), partId, triangleIndex);
+		const btCollisionObjectWrapper* tmp = 0;
+
+		if (algorithm->internalGetResultOut()->getBody0Wrap()->getCollisionObject() == ob1Wrap.getCollisionObject())
+		{
+			tmp = algorithm->internalGetResultOut()->getBody0Wrap();
+			algorithm->internalGetResultOut()->setBody0Wrap(&ob1Wrap);
+		}
+		else
+		{
+			tmp = algorithm->internalGetResultOut()->getBody1Wrap();
+			algorithm->internalGetResultOut()->setBody1Wrap(&ob1Wrap);
+		}
+
+		algorithm->gimpact_vs_shape(
+			body0Wrap, &ob1Wrap, gimpactshape0, &tri1, swapped);
+
+		if (algorithm->internalGetResultOut()->getBody0Wrap()->getCollisionObject() == ob1Wrap.getCollisionObject())
+		{
+			algorithm->internalGetResultOut()->setBody0Wrap(tmp);
+		}
+		else
+		{
+			algorithm->internalGetResultOut()->setBody1Wrap(tmp);
+		}
+	}
+};
+
+void btGImpactCollisionAlgorithm::gimpact_vs_concave(
+	const btCollisionObjectWrapper* body0Wrap,
+	const btCollisionObjectWrapper* body1Wrap,
+	const btGImpactShapeInterface* shape0,
+	const btConcaveShape* shape1, bool swapped)
+{
+	//create the callback
+	btGImpactTriangleCallback tricallback;
+	tricallback.algorithm = this;
+	tricallback.body0Wrap = body0Wrap;
+	tricallback.body1Wrap = body1Wrap;
+	tricallback.gimpactshape0 = shape0;
+	tricallback.swapped = swapped;
+	tricallback.margin = shape1->getMargin();
+
+	//getting the trimesh AABB
+	btTransform gimpactInConcaveSpace;
+
+	gimpactInConcaveSpace = body1Wrap->getWorldTransform().inverse() * body0Wrap->getWorldTransform();
+
+	btVector3 minAABB, maxAABB;
+	shape0->getAabb(gimpactInConcaveSpace, minAABB, maxAABB);
+
+	shape1->processAllTriangles(&tricallback, minAABB, maxAABB);
+}
+
+void btGImpactCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	clearCache();
+
+	m_resultOut = resultOut;
+	m_dispatchInfo = &dispatchInfo;
+	const btGImpactShapeInterface* gimpactshape0;
+	const btGImpactShapeInterface* gimpactshape1;
+
+	if (body0Wrap->getCollisionShape()->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
+	{
+		gimpactshape0 = static_cast<const btGImpactShapeInterface*>(body0Wrap->getCollisionShape());
+
+		if (body1Wrap->getCollisionShape()->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
+		{
+			gimpactshape1 = static_cast<const btGImpactShapeInterface*>(body1Wrap->getCollisionShape());
+
+			gimpact_vs_gimpact(body0Wrap, body1Wrap, gimpactshape0, gimpactshape1);
+		}
+		else
+		{
+			gimpact_vs_shape(body0Wrap, body1Wrap, gimpactshape0, body1Wrap->getCollisionShape(), false);
+		}
+	}
+	else if (body1Wrap->getCollisionShape()->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
+	{
+		gimpactshape1 = static_cast<const btGImpactShapeInterface*>(body1Wrap->getCollisionShape());
+
+		gimpact_vs_shape(body1Wrap, body0Wrap, gimpactshape1, body0Wrap->getCollisionShape(), true);
+	}
+
+	// Ensure that gContactProcessedCallback is called for concave shapes.
+	if (getLastManifold())
+	{
+		m_resultOut->refreshContactPoints();
+	}
+}
+
+btScalar btGImpactCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	return 1.f;
+}
+
+///////////////////////////////////// REGISTERING ALGORITHM //////////////////////////////////////////////
+
+//! Use this function for register the algorithm externally
+void btGImpactCollisionAlgorithm::registerAlgorithm(btCollisionDispatcher* dispatcher)
+{
+	static btGImpactCollisionAlgorithm::CreateFunc s_gimpact_cf;
+
+	int i;
+
+	for (i = 0; i < MAX_BROADPHASE_COLLISION_TYPES; i++)
+	{
+		dispatcher->registerCollisionCreateFunc(GIMPACT_SHAPE_PROXYTYPE, i, &s_gimpact_cf);
+	}
+
+	for (i = 0; i < MAX_BROADPHASE_COLLISION_TYPES; i++)
+	{
+		dispatcher->registerCollisionCreateFunc(i, GIMPACT_SHAPE_PROXYTYPE, &s_gimpact_cf);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
new file mode 100644
index 0000000..a368c8a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
@@ -0,0 +1,288 @@
+/*! \file btGImpactShape.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H
+#define BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btDispatcher;
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+
+#include "LinearMath/btAlignedObjectArray.h"
+
+#include "btGImpactShape.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+//! Collision Algorithm for GImpact Shapes
+/*!
+For register this algorithm in Bullet, proceed as following:
+ \code
+btCollisionDispatcher * dispatcher = static_cast<btCollisionDispatcher *>(m_dynamicsWorld ->getDispatcher());
+btGImpactCollisionAlgorithm::registerAlgorithm(dispatcher);
+ \endcode
+*/
+class btGImpactCollisionAlgorithm : public btActivatingCollisionAlgorithm
+{
+protected:
+	btCollisionAlgorithm* m_convex_algorithm;
+	btPersistentManifold* m_manifoldPtr;
+	btManifoldResult* m_resultOut;
+	const btDispatcherInfo* m_dispatchInfo;
+	int m_triface0;
+	int m_part0;
+	int m_triface1;
+	int m_part1;
+
+	//! Creates a new contact point
+	SIMD_FORCE_INLINE btPersistentManifold* newContactManifold(const btCollisionObject* body0, const btCollisionObject* body1)
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(body0, body1);
+		return m_manifoldPtr;
+	}
+
+	SIMD_FORCE_INLINE void destroyConvexAlgorithm()
+	{
+		if (m_convex_algorithm)
+		{
+			m_convex_algorithm->~btCollisionAlgorithm();
+			m_dispatcher->freeCollisionAlgorithm(m_convex_algorithm);
+			m_convex_algorithm = NULL;
+		}
+	}
+
+	SIMD_FORCE_INLINE void destroyContactManifolds()
+	{
+		if (m_manifoldPtr == NULL) return;
+		m_dispatcher->releaseManifold(m_manifoldPtr);
+		m_manifoldPtr = NULL;
+	}
+
+	SIMD_FORCE_INLINE void clearCache()
+	{
+		destroyContactManifolds();
+		destroyConvexAlgorithm();
+
+		m_triface0 = -1;
+		m_part0 = -1;
+		m_triface1 = -1;
+		m_part1 = -1;
+	}
+
+	SIMD_FORCE_INLINE btPersistentManifold* getLastManifold()
+	{
+		return m_manifoldPtr;
+	}
+
+	// Call before process collision
+	SIMD_FORCE_INLINE void checkManifold(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+	{
+		if (getLastManifold() == 0)
+		{
+			newContactManifold(body0Wrap->getCollisionObject(), body1Wrap->getCollisionObject());
+		}
+
+		m_resultOut->setPersistentManifold(getLastManifold());
+	}
+
+	// Call before process collision
+	SIMD_FORCE_INLINE btCollisionAlgorithm* newAlgorithm(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+	{
+		checkManifold(body0Wrap, body1Wrap);
+
+		btCollisionAlgorithm* convex_algorithm = m_dispatcher->findAlgorithm(
+			body0Wrap, body1Wrap, getLastManifold(), BT_CONTACT_POINT_ALGORITHMS);
+		return convex_algorithm;
+	}
+
+	// Call before process collision
+	SIMD_FORCE_INLINE void checkConvexAlgorithm(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+	{
+		if (m_convex_algorithm) return;
+		m_convex_algorithm = newAlgorithm(body0Wrap, body1Wrap);
+	}
+
+	void addContactPoint(const btCollisionObjectWrapper* body0Wrap,
+						 const btCollisionObjectWrapper* body1Wrap,
+						 const btVector3& point,
+						 const btVector3& normal,
+						 btScalar distance);
+
+	//! Collision routines
+	//!@{
+
+	void collide_gjk_triangles(const btCollisionObjectWrapper* body0Wrap,
+							   const btCollisionObjectWrapper* body1Wrap,
+							   const btGImpactMeshShapePart* shape0,
+							   const btGImpactMeshShapePart* shape1,
+							   const int* pairs, int pair_count);
+
+	void collide_sat_triangles(const btCollisionObjectWrapper* body0Wrap,
+							   const btCollisionObjectWrapper* body1Wrap,
+							   const btGImpactMeshShapePart* shape0,
+							   const btGImpactMeshShapePart* shape1,
+							   const int* pairs, int pair_count);
+
+	void shape_vs_shape_collision(
+		const btCollisionObjectWrapper* body0,
+		const btCollisionObjectWrapper* body1,
+		const btCollisionShape* shape0,
+		const btCollisionShape* shape1);
+
+	void convex_vs_convex_collision(const btCollisionObjectWrapper* body0Wrap,
+									const btCollisionObjectWrapper* body1Wrap,
+									const btCollisionShape* shape0,
+									const btCollisionShape* shape1);
+
+	void gimpact_vs_gimpact_find_pairs(
+		const btTransform& trans0,
+		const btTransform& trans1,
+		const btGImpactShapeInterface* shape0,
+		const btGImpactShapeInterface* shape1, btPairSet& pairset);
+
+	void gimpact_vs_shape_find_pairs(
+		const btTransform& trans0,
+		const btTransform& trans1,
+		const btGImpactShapeInterface* shape0,
+		const btCollisionShape* shape1,
+		btAlignedObjectArray<int>& collided_primitives);
+
+	void gimpacttrimeshpart_vs_plane_collision(
+		const btCollisionObjectWrapper* body0Wrap,
+		const btCollisionObjectWrapper* body1Wrap,
+		const btGImpactMeshShapePart* shape0,
+		const btStaticPlaneShape* shape1, bool swapped);
+
+public:
+	btGImpactCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap);
+
+	virtual ~btGImpactCollisionAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr)
+			manifoldArray.push_back(m_manifoldPtr);
+	}
+
+	btManifoldResult* internalGetResultOut()
+	{
+		return m_resultOut;
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btGImpactCollisionAlgorithm));
+			return new (mem) btGImpactCollisionAlgorithm(ci, body0Wrap, body1Wrap);
+		}
+	};
+
+	//! Use this function for register the algorithm externally
+	static void registerAlgorithm(btCollisionDispatcher* dispatcher);
+#ifdef TRI_COLLISION_PROFILING
+	//! Gets the average time in miliseconds of tree collisions
+	static float getAverageTreeCollisionTime();
+
+	//! Gets the average time in miliseconds of triangle collisions
+	static float getAverageTriangleCollisionTime();
+#endif  //TRI_COLLISION_PROFILING
+
+	//! Collides two gimpact shapes
+	/*!
+	\pre shape0 and shape1 couldn't be btGImpactMeshShape objects
+	*/
+
+	void gimpact_vs_gimpact(const btCollisionObjectWrapper* body0Wrap,
+							const btCollisionObjectWrapper* body1Wrap,
+							const btGImpactShapeInterface* shape0,
+							const btGImpactShapeInterface* shape1);
+
+	void gimpact_vs_shape(const btCollisionObjectWrapper* body0Wrap,
+						  const btCollisionObjectWrapper* body1Wrap,
+						  const btGImpactShapeInterface* shape0,
+						  const btCollisionShape* shape1, bool swapped);
+
+	void gimpact_vs_compoundshape(const btCollisionObjectWrapper* body0Wrap,
+								  const btCollisionObjectWrapper* body1Wrap,
+								  const btGImpactShapeInterface* shape0,
+								  const btCompoundShape* shape1, bool swapped);
+
+	void gimpact_vs_concave(
+		const btCollisionObjectWrapper* body0Wrap,
+		const btCollisionObjectWrapper* body1Wrap,
+		const btGImpactShapeInterface* shape0,
+		const btConcaveShape* shape1, bool swapped);
+
+	/// Accessor/Mutator pairs for Part and triangleID
+	void setFace0(int value)
+	{
+		m_triface0 = value;
+	}
+	int getFace0()
+	{
+		return m_triface0;
+	}
+	void setFace1(int value)
+	{
+		m_triface1 = value;
+	}
+	int getFace1()
+	{
+		return m_triface1;
+	}
+	void setPart0(int value)
+	{
+		m_part0 = value;
+	}
+	int getPart0()
+	{
+		return m_part0;
+	}
+	void setPart1(int value)
+	{
+		m_part1 = value;
+	}
+	int getPart1()
+	{
+		return m_part1;
+	}
+};
+
+//algorithm details
+//#define BULLET_TRIANGLE_COLLISION 1
+#define GIMPACT_VS_PLANE_COLLISION 1
+
+#endif  //BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactMassUtil.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactMassUtil.h
new file mode 100644
index 0000000..1cde46e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactMassUtil.h
@@ -0,0 +1,56 @@
+/*! \file btGImpactMassUtil.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef GIMPACT_MASS_UTIL_H
+#define GIMPACT_MASS_UTIL_H
+
+#include "LinearMath/btTransform.h"
+
+SIMD_FORCE_INLINE btVector3 gim_inertia_add_transformed(
+	const btVector3& source_inertia, const btVector3& added_inertia, const btTransform& transform)
+{
+	btMatrix3x3 rotatedTensor = transform.getBasis().scaled(added_inertia) * transform.getBasis().transpose();
+
+	btScalar x2 = transform.getOrigin()[0];
+	x2 *= x2;
+	btScalar y2 = transform.getOrigin()[1];
+	y2 *= y2;
+	btScalar z2 = transform.getOrigin()[2];
+	z2 *= z2;
+
+	btScalar ix = rotatedTensor[0][0] * (y2 + z2);
+	btScalar iy = rotatedTensor[1][1] * (x2 + z2);
+	btScalar iz = rotatedTensor[2][2] * (x2 + y2);
+
+	return btVector3(source_inertia[0] + ix, source_inertia[1] + iy, source_inertia[2] + iz);
+}
+
+SIMD_FORCE_INLINE btVector3 gim_get_point_inertia(const btVector3& point, btScalar mass)
+{
+	btScalar x2 = point[0] * point[0];
+	btScalar y2 = point[1] * point[1];
+	btScalar z2 = point[2] * point[2];
+	return btVector3(mass * (y2 + z2), mass * (x2 + z2), mass * (x2 + y2));
+}
+
+#endif  //GIMPACT_MESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
new file mode 100644
index 0000000..b81fc97
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
@@ -0,0 +1,486 @@
+/*! \file gim_box_set.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGImpactQuantizedBvh.h"
+#include "LinearMath/btQuickprof.h"
+
+#ifdef TRI_COLLISION_PROFILING
+btClock g_q_tree_clock;
+
+float g_q_accum_tree_collision_time = 0;
+int g_q_count_traversing = 0;
+
+void bt_begin_gim02_q_tree_time()
+{
+	g_q_tree_clock.reset();
+}
+
+void bt_end_gim02_q_tree_time()
+{
+	g_q_accum_tree_collision_time += g_q_tree_clock.getTimeMicroseconds();
+	g_q_count_traversing++;
+}
+
+//! Gets the average time in miliseconds of tree collisions
+float btGImpactQuantizedBvh::getAverageTreeCollisionTime()
+{
+	if (g_q_count_traversing == 0) return 0;
+
+	float avgtime = g_q_accum_tree_collision_time;
+	avgtime /= (float)g_q_count_traversing;
+
+	g_q_accum_tree_collision_time = 0;
+	g_q_count_traversing = 0;
+	return avgtime;
+
+	//	float avgtime = g_q_count_traversing;
+	//	g_q_count_traversing = 0;
+	//	return avgtime;
+}
+
+#endif  //TRI_COLLISION_PROFILING
+
+/////////////////////// btQuantizedBvhTree /////////////////////////////////
+
+void btQuantizedBvhTree::calc_quantization(
+	GIM_BVH_DATA_ARRAY& primitive_boxes, btScalar boundMargin)
+{
+	//calc globa box
+	btAABB global_bound;
+	global_bound.invalidate();
+
+	for (int i = 0; i < primitive_boxes.size(); i++)
+	{
+		global_bound.merge(primitive_boxes[i].m_bound);
+	}
+
+	bt_calc_quantization_parameters(
+		m_global_bound.m_min, m_global_bound.m_max, m_bvhQuantization, global_bound.m_min, global_bound.m_max, boundMargin);
+}
+
+int btQuantizedBvhTree::_calc_splitting_axis(
+	GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex)
+{
+	int i;
+
+	btVector3 means(btScalar(0.), btScalar(0.), btScalar(0.));
+	btVector3 variance(btScalar(0.), btScalar(0.), btScalar(0.));
+	int numIndices = endIndex - startIndex;
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		means += center;
+	}
+	means *= (btScalar(1.) / (btScalar)numIndices);
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		btVector3 diff2 = center - means;
+		diff2 = diff2 * diff2;
+		variance += diff2;
+	}
+	variance *= (btScalar(1.) / ((btScalar)numIndices - 1));
+
+	return variance.maxAxis();
+}
+
+int btQuantizedBvhTree::_sort_and_calc_splitting_index(
+	GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex,
+	int endIndex, int splitAxis)
+{
+	int i;
+	int splitIndex = startIndex;
+	int numIndices = endIndex - startIndex;
+
+	// average of centers
+	btScalar splitValue = 0.0f;
+
+	btVector3 means(btScalar(0.), btScalar(0.), btScalar(0.));
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		means += center;
+	}
+	means *= (btScalar(1.) / (btScalar)numIndices);
+
+	splitValue = means[splitAxis];
+
+	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		if (center[splitAxis] > splitValue)
+		{
+			//swap
+			primitive_boxes.swap(i, splitIndex);
+			//swapLeafNodes(i,splitIndex);
+			splitIndex++;
+		}
+	}
+
+	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
+	//otherwise the tree-building might fail due to stack-overflows in certain cases.
+	//unbalanced1 is unsafe: it can cause stack overflows
+	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
+
+	//unbalanced2 should work too: always use center (perfect balanced trees)
+	//bool unbalanced2 = true;
+
+	//this should be safe too:
+	int rangeBalancedIndices = numIndices / 3;
+	bool unbalanced = ((splitIndex <= (startIndex + rangeBalancedIndices)) || (splitIndex >= (endIndex - 1 - rangeBalancedIndices)));
+
+	if (unbalanced)
+	{
+		splitIndex = startIndex + (numIndices >> 1);
+	}
+
+	btAssert(!((splitIndex == startIndex) || (splitIndex == (endIndex))));
+
+	return splitIndex;
+}
+
+void btQuantizedBvhTree::_build_sub_tree(GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex)
+{
+	int curIndex = m_num_nodes;
+	m_num_nodes++;
+
+	btAssert((endIndex - startIndex) > 0);
+
+	if ((endIndex - startIndex) == 1)
+	{
+		//We have a leaf node
+		setNodeBound(curIndex, primitive_boxes[startIndex].m_bound);
+		m_node_array[curIndex].setDataIndex(primitive_boxes[startIndex].m_data);
+
+		return;
+	}
+	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+
+	//split axis
+	int splitIndex = _calc_splitting_axis(primitive_boxes, startIndex, endIndex);
+
+	splitIndex = _sort_and_calc_splitting_index(
+		primitive_boxes, startIndex, endIndex,
+		splitIndex  //split axis
+	);
+
+	//calc this node bounding box
+
+	btAABB node_bound;
+	node_bound.invalidate();
+
+	for (int i = startIndex; i < endIndex; i++)
+	{
+		node_bound.merge(primitive_boxes[i].m_bound);
+	}
+
+	setNodeBound(curIndex, node_bound);
+
+	//build left branch
+	_build_sub_tree(primitive_boxes, startIndex, splitIndex);
+
+	//build right branch
+	_build_sub_tree(primitive_boxes, splitIndex, endIndex);
+
+	m_node_array[curIndex].setEscapeIndex(m_num_nodes - curIndex);
+}
+
+//! stackless build tree
+void btQuantizedBvhTree::build_tree(
+	GIM_BVH_DATA_ARRAY& primitive_boxes)
+{
+	calc_quantization(primitive_boxes);
+	// initialize node count to 0
+	m_num_nodes = 0;
+	// allocate nodes
+	m_node_array.resize(primitive_boxes.size() * 2);
+
+	_build_sub_tree(primitive_boxes, 0, primitive_boxes.size());
+}
+
+////////////////////////////////////class btGImpactQuantizedBvh
+
+void btGImpactQuantizedBvh::refit()
+{
+	int nodecount = getNodeCount();
+	while (nodecount--)
+	{
+		if (isLeafNode(nodecount))
+		{
+			btAABB leafbox;
+			m_primitive_manager->get_primitive_box(getNodeData(nodecount), leafbox);
+			setNodeBound(nodecount, leafbox);
+		}
+		else
+		{
+			//const GIM_BVH_TREE_NODE * nodepointer = get_node_pointer(nodecount);
+			//get left bound
+			btAABB bound;
+			bound.invalidate();
+
+			btAABB temp_box;
+
+			int child_node = getLeftNode(nodecount);
+			if (child_node)
+			{
+				getNodeBound(child_node, temp_box);
+				bound.merge(temp_box);
+			}
+
+			child_node = getRightNode(nodecount);
+			if (child_node)
+			{
+				getNodeBound(child_node, temp_box);
+				bound.merge(temp_box);
+			}
+
+			setNodeBound(nodecount, bound);
+		}
+	}
+}
+
+//! this rebuild the entire set
+void btGImpactQuantizedBvh::buildSet()
+{
+	//obtain primitive boxes
+	GIM_BVH_DATA_ARRAY primitive_boxes;
+	primitive_boxes.resize(m_primitive_manager->get_primitive_count());
+
+	for (int i = 0; i < primitive_boxes.size(); i++)
+	{
+		m_primitive_manager->get_primitive_box(i, primitive_boxes[i].m_bound);
+		primitive_boxes[i].m_data = i;
+	}
+
+	m_box_tree.build_tree(primitive_boxes);
+}
+
+//! returns the indices of the primitives in the m_primitive_manager
+bool btGImpactQuantizedBvh::boxQuery(const btAABB& box, btAlignedObjectArray<int>& collided_results) const
+{
+	int curIndex = 0;
+	int numNodes = getNodeCount();
+
+	//quantize box
+
+	unsigned short quantizedMin[3];
+	unsigned short quantizedMax[3];
+
+	m_box_tree.quantizePoint(quantizedMin, box.m_min);
+	m_box_tree.quantizePoint(quantizedMax, box.m_max);
+
+	while (curIndex < numNodes)
+	{
+		//catch bugs in tree data
+
+		bool aabbOverlap = m_box_tree.testQuantizedBoxOverlapp(curIndex, quantizedMin, quantizedMax);
+		bool isleafnode = isLeafNode(curIndex);
+
+		if (isleafnode && aabbOverlap)
+		{
+			collided_results.push_back(getNodeData(curIndex));
+		}
+
+		if (aabbOverlap || isleafnode)
+		{
+			//next subnode
+			curIndex++;
+		}
+		else
+		{
+			//skip node
+			curIndex += getEscapeNodeIndex(curIndex);
+		}
+	}
+	if (collided_results.size() > 0) return true;
+	return false;
+}
+
+//! returns the indices of the primitives in the m_primitive_manager
+bool btGImpactQuantizedBvh::rayQuery(
+	const btVector3& ray_dir, const btVector3& ray_origin,
+	btAlignedObjectArray<int>& collided_results) const
+{
+	int curIndex = 0;
+	int numNodes = getNodeCount();
+
+	while (curIndex < numNodes)
+	{
+		btAABB bound;
+		getNodeBound(curIndex, bound);
+
+		//catch bugs in tree data
+
+		bool aabbOverlap = bound.collide_ray(ray_origin, ray_dir);
+		bool isleafnode = isLeafNode(curIndex);
+
+		if (isleafnode && aabbOverlap)
+		{
+			collided_results.push_back(getNodeData(curIndex));
+		}
+
+		if (aabbOverlap || isleafnode)
+		{
+			//next subnode
+			curIndex++;
+		}
+		else
+		{
+			//skip node
+			curIndex += getEscapeNodeIndex(curIndex);
+		}
+	}
+	if (collided_results.size() > 0) return true;
+	return false;
+}
+
+SIMD_FORCE_INLINE bool _quantized_node_collision(
+	const btGImpactQuantizedBvh* boxset0, const btGImpactQuantizedBvh* boxset1,
+	const BT_BOX_BOX_TRANSFORM_CACHE& trans_cache_1to0,
+	int node0, int node1, bool complete_primitive_tests)
+{
+	btAABB box0;
+	boxset0->getNodeBound(node0, box0);
+	btAABB box1;
+	boxset1->getNodeBound(node1, box1);
+
+	return box0.overlapping_trans_cache(box1, trans_cache_1to0, complete_primitive_tests);
+	//	box1.appy_transform_trans_cache(trans_cache_1to0);
+	//	return box0.has_collision(box1);
+}
+
+//stackless recursive collision routine
+static void _find_quantized_collision_pairs_recursive(
+	const btGImpactQuantizedBvh* boxset0, const btGImpactQuantizedBvh* boxset1,
+	btPairSet* collision_pairs,
+	const BT_BOX_BOX_TRANSFORM_CACHE& trans_cache_1to0,
+	int node0, int node1, bool complete_primitive_tests)
+{
+	if (_quantized_node_collision(
+			boxset0, boxset1, trans_cache_1to0,
+			node0, node1, complete_primitive_tests) == false) return;  //avoid colliding internal nodes
+
+	if (boxset0->isLeafNode(node0))
+	{
+		if (boxset1->isLeafNode(node1))
+		{
+			// collision result
+			collision_pairs->push_pair(
+				boxset0->getNodeData(node0), boxset1->getNodeData(node1));
+			return;
+		}
+		else
+		{
+			//collide left recursive
+
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				node0, boxset1->getLeftNode(node1), false);
+
+			//collide right recursive
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				node0, boxset1->getRightNode(node1), false);
+		}
+	}
+	else
+	{
+		if (boxset1->isLeafNode(node1))
+		{
+			//collide left recursive
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getLeftNode(node0), node1, false);
+
+			//collide right recursive
+
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getRightNode(node0), node1, false);
+		}
+		else
+		{
+			//collide left0 left1
+
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getLeftNode(node0), boxset1->getLeftNode(node1), false);
+
+			//collide left0 right1
+
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getLeftNode(node0), boxset1->getRightNode(node1), false);
+
+			//collide right0 left1
+
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getRightNode(node0), boxset1->getLeftNode(node1), false);
+
+			//collide right0 right1
+
+			_find_quantized_collision_pairs_recursive(
+				boxset0, boxset1,
+				collision_pairs, trans_cache_1to0,
+				boxset0->getRightNode(node0), boxset1->getRightNode(node1), false);
+
+		}  // else if node1 is not a leaf
+	}      // else if node0 is not a leaf
+}
+
+void btGImpactQuantizedBvh::find_collision(const btGImpactQuantizedBvh* boxset0, const btTransform& trans0,
+										   const btGImpactQuantizedBvh* boxset1, const btTransform& trans1,
+										   btPairSet& collision_pairs)
+{
+	if (boxset0->getNodeCount() == 0 || boxset1->getNodeCount() == 0) return;
+
+	BT_BOX_BOX_TRANSFORM_CACHE trans_cache_1to0;
+
+	trans_cache_1to0.calc_from_homogenic(trans0, trans1);
+
+#ifdef TRI_COLLISION_PROFILING
+	bt_begin_gim02_q_tree_time();
+#endif  //TRI_COLLISION_PROFILING
+
+	_find_quantized_collision_pairs_recursive(
+		boxset0, boxset1,
+		&collision_pairs, trans_cache_1to0, 0, 0, true);
+#ifdef TRI_COLLISION_PROFILING
+	bt_end_gim02_q_tree_time();
+#endif  //TRI_COLLISION_PROFILING
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
new file mode 100644
index 0000000..b231c1e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
@@ -0,0 +1,298 @@
+#ifndef GIM_QUANTIZED_SET_H_INCLUDED
+#define GIM_QUANTIZED_SET_H_INCLUDED
+
+/*! \file btGImpactQuantizedBvh.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGImpactBvh.h"
+#include "btQuantization.h"
+#include "btGImpactQuantizedBvhStructs.h"
+
+class GIM_QUANTIZED_BVH_NODE_ARRAY : public btAlignedObjectArray<BT_QUANTIZED_BVH_NODE>
+{
+};
+
+//! Basic Box tree structure
+class btQuantizedBvhTree
+{
+protected:
+	int m_num_nodes;
+	GIM_QUANTIZED_BVH_NODE_ARRAY m_node_array;
+	btAABB m_global_bound;
+	btVector3 m_bvhQuantization;
+
+protected:
+	void calc_quantization(GIM_BVH_DATA_ARRAY& primitive_boxes, btScalar boundMargin = btScalar(1.0));
+
+	int _sort_and_calc_splitting_index(
+		GIM_BVH_DATA_ARRAY& primitive_boxes,
+		int startIndex, int endIndex, int splitAxis);
+
+	int _calc_splitting_axis(GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex);
+
+	void _build_sub_tree(GIM_BVH_DATA_ARRAY& primitive_boxes, int startIndex, int endIndex);
+
+public:
+	btQuantizedBvhTree()
+	{
+		m_num_nodes = 0;
+	}
+
+	//! prototype functions for box tree management
+	//!@{
+	void build_tree(GIM_BVH_DATA_ARRAY& primitive_boxes);
+
+	SIMD_FORCE_INLINE void quantizePoint(
+		unsigned short* quantizedpoint, const btVector3& point) const
+	{
+		bt_quantize_clamp(quantizedpoint, point, m_global_bound.m_min, m_global_bound.m_max, m_bvhQuantization);
+	}
+
+	SIMD_FORCE_INLINE bool testQuantizedBoxOverlapp(
+		int node_index,
+		unsigned short* quantizedMin, unsigned short* quantizedMax) const
+	{
+		return m_node_array[node_index].testQuantizedBoxOverlapp(quantizedMin, quantizedMax);
+	}
+
+	SIMD_FORCE_INLINE void clearNodes()
+	{
+		m_node_array.clear();
+		m_num_nodes = 0;
+	}
+
+	//! node count
+	SIMD_FORCE_INLINE int getNodeCount() const
+	{
+		return m_num_nodes;
+	}
+
+	//! tells if the node is a leaf
+	SIMD_FORCE_INLINE bool isLeafNode(int nodeindex) const
+	{
+		return m_node_array[nodeindex].isLeafNode();
+	}
+
+	SIMD_FORCE_INLINE int getNodeData(int nodeindex) const
+	{
+		return m_node_array[nodeindex].getDataIndex();
+	}
+
+	SIMD_FORCE_INLINE void getNodeBound(int nodeindex, btAABB& bound) const
+	{
+		bound.m_min = bt_unquantize(
+			m_node_array[nodeindex].m_quantizedAabbMin,
+			m_global_bound.m_min, m_bvhQuantization);
+
+		bound.m_max = bt_unquantize(
+			m_node_array[nodeindex].m_quantizedAabbMax,
+			m_global_bound.m_min, m_bvhQuantization);
+	}
+
+	SIMD_FORCE_INLINE void setNodeBound(int nodeindex, const btAABB& bound)
+	{
+		bt_quantize_clamp(m_node_array[nodeindex].m_quantizedAabbMin,
+						  bound.m_min,
+						  m_global_bound.m_min,
+						  m_global_bound.m_max,
+						  m_bvhQuantization);
+
+		bt_quantize_clamp(m_node_array[nodeindex].m_quantizedAabbMax,
+						  bound.m_max,
+						  m_global_bound.m_min,
+						  m_global_bound.m_max,
+						  m_bvhQuantization);
+	}
+
+	SIMD_FORCE_INLINE int getLeftNode(int nodeindex) const
+	{
+		return nodeindex + 1;
+	}
+
+	SIMD_FORCE_INLINE int getRightNode(int nodeindex) const
+	{
+		if (m_node_array[nodeindex + 1].isLeafNode()) return nodeindex + 2;
+		return nodeindex + 1 + m_node_array[nodeindex + 1].getEscapeIndex();
+	}
+
+	SIMD_FORCE_INLINE int getEscapeNodeIndex(int nodeindex) const
+	{
+		return m_node_array[nodeindex].getEscapeIndex();
+	}
+
+	SIMD_FORCE_INLINE const BT_QUANTIZED_BVH_NODE* get_node_pointer(int index = 0) const
+	{
+		return &m_node_array[index];
+	}
+
+	//!@}
+};
+
+//! Structure for containing Boxes
+/*!
+This class offers an structure for managing a box tree of primitives.
+Requires a Primitive prototype (like btPrimitiveManagerBase )
+*/
+class btGImpactQuantizedBvh
+{
+protected:
+	btQuantizedBvhTree m_box_tree;
+	btPrimitiveManagerBase* m_primitive_manager;
+
+protected:
+	//stackless refit
+	void refit();
+
+public:
+	//! this constructor doesn't build the tree. you must call	buildSet
+	btGImpactQuantizedBvh()
+	{
+		m_primitive_manager = NULL;
+	}
+
+	//! this constructor doesn't build the tree. you must call	buildSet
+	btGImpactQuantizedBvh(btPrimitiveManagerBase* primitive_manager)
+	{
+		m_primitive_manager = primitive_manager;
+	}
+
+	SIMD_FORCE_INLINE btAABB getGlobalBox() const
+	{
+		btAABB totalbox;
+		getNodeBound(0, totalbox);
+		return totalbox;
+	}
+
+	SIMD_FORCE_INLINE void setPrimitiveManager(btPrimitiveManagerBase* primitive_manager)
+	{
+		m_primitive_manager = primitive_manager;
+	}
+
+	SIMD_FORCE_INLINE btPrimitiveManagerBase* getPrimitiveManager() const
+	{
+		return m_primitive_manager;
+	}
+
+	//! node manager prototype functions
+	///@{
+
+	//! this attemps to refit the box set.
+	SIMD_FORCE_INLINE void update()
+	{
+		refit();
+	}
+
+	//! this rebuild the entire set
+	void buildSet();
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	bool boxQuery(const btAABB& box, btAlignedObjectArray<int>& collided_results) const;
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	SIMD_FORCE_INLINE bool boxQueryTrans(const btAABB& box,
+										 const btTransform& transform, btAlignedObjectArray<int>& collided_results) const
+	{
+		btAABB transbox = box;
+		transbox.appy_transform(transform);
+		return boxQuery(transbox, collided_results);
+	}
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	bool rayQuery(
+		const btVector3& ray_dir, const btVector3& ray_origin,
+		btAlignedObjectArray<int>& collided_results) const;
+
+	//! tells if this set has hierarcht
+	SIMD_FORCE_INLINE bool hasHierarchy() const
+	{
+		return true;
+	}
+
+	//! tells if this set is a trimesh
+	SIMD_FORCE_INLINE bool isTrimesh() const
+	{
+		return m_primitive_manager->is_trimesh();
+	}
+
+	//! node count
+	SIMD_FORCE_INLINE int getNodeCount() const
+	{
+		return m_box_tree.getNodeCount();
+	}
+
+	//! tells if the node is a leaf
+	SIMD_FORCE_INLINE bool isLeafNode(int nodeindex) const
+	{
+		return m_box_tree.isLeafNode(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE int getNodeData(int nodeindex) const
+	{
+		return m_box_tree.getNodeData(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE void getNodeBound(int nodeindex, btAABB& bound) const
+	{
+		m_box_tree.getNodeBound(nodeindex, bound);
+	}
+
+	SIMD_FORCE_INLINE void setNodeBound(int nodeindex, const btAABB& bound)
+	{
+		m_box_tree.setNodeBound(nodeindex, bound);
+	}
+
+	SIMD_FORCE_INLINE int getLeftNode(int nodeindex) const
+	{
+		return m_box_tree.getLeftNode(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE int getRightNode(int nodeindex) const
+	{
+		return m_box_tree.getRightNode(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE int getEscapeNodeIndex(int nodeindex) const
+	{
+		return m_box_tree.getEscapeNodeIndex(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE void getNodeTriangle(int nodeindex, btPrimitiveTriangle& triangle) const
+	{
+		m_primitive_manager->get_primitive_triangle(getNodeData(nodeindex), triangle);
+	}
+
+	SIMD_FORCE_INLINE const BT_QUANTIZED_BVH_NODE* get_node_pointer(int index = 0) const
+	{
+		return m_box_tree.get_node_pointer(index);
+	}
+
+#ifdef TRI_COLLISION_PROFILING
+	static float getAverageTreeCollisionTime();
+#endif  //TRI_COLLISION_PROFILING
+
+	static void find_collision(const btGImpactQuantizedBvh* boxset1, const btTransform& trans1,
+							   const btGImpactQuantizedBvh* boxset2, const btTransform& trans2,
+							   btPairSet& collision_pairs);
+};
+
+#endif  // GIM_BOXPRUNING_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h
new file mode 100644
index 0000000..bd50cb5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h
@@ -0,0 +1,91 @@
+#ifndef GIM_QUANTIZED_SET_STRUCTS_H_INCLUDED
+#define GIM_QUANTIZED_SET_STRUCTS_H_INCLUDED
+
+/*! \file btGImpactQuantizedBvh.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGImpactBvh.h"
+#include "btQuantization.h"
+
+///btQuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+ATTRIBUTE_ALIGNED16(struct)
+BT_QUANTIZED_BVH_NODE
+{
+	//12 bytes
+	unsigned short int m_quantizedAabbMin[3];
+	unsigned short int m_quantizedAabbMax[3];
+	//4 bytes
+	int m_escapeIndexOrDataIndex;
+
+	BT_QUANTIZED_BVH_NODE()
+	{
+		m_escapeIndexOrDataIndex = 0;
+	}
+
+	SIMD_FORCE_INLINE bool isLeafNode() const
+	{
+		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+		return (m_escapeIndexOrDataIndex >= 0);
+	}
+
+	SIMD_FORCE_INLINE int getEscapeIndex() const
+	{
+		//btAssert(m_escapeIndexOrDataIndex < 0);
+		return -m_escapeIndexOrDataIndex;
+	}
+
+	SIMD_FORCE_INLINE void setEscapeIndex(int index)
+	{
+		m_escapeIndexOrDataIndex = -index;
+	}
+
+	SIMD_FORCE_INLINE int getDataIndex() const
+	{
+		//btAssert(m_escapeIndexOrDataIndex >= 0);
+
+		return m_escapeIndexOrDataIndex;
+	}
+
+	SIMD_FORCE_INLINE void setDataIndex(int index)
+	{
+		m_escapeIndexOrDataIndex = index;
+	}
+
+	SIMD_FORCE_INLINE bool testQuantizedBoxOverlapp(
+		unsigned short* quantizedMin, unsigned short* quantizedMax) const
+	{
+		if (m_quantizedAabbMin[0] > quantizedMax[0] ||
+			m_quantizedAabbMax[0] < quantizedMin[0] ||
+			m_quantizedAabbMin[1] > quantizedMax[1] ||
+			m_quantizedAabbMax[1] < quantizedMin[1] ||
+			m_quantizedAabbMin[2] > quantizedMax[2] ||
+			m_quantizedAabbMax[2] < quantizedMin[2])
+		{
+			return false;
+		}
+		return true;
+	}
+};
+
+#endif  // GIM_QUANTIZED_SET_STRUCTS_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactShape.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactShape.cpp
new file mode 100644
index 0000000..34c229a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactShape.cpp
@@ -0,0 +1,279 @@
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGImpactShape.h"
+#include "btGImpactMassUtil.h"
+
+btGImpactMeshShapePart::btGImpactMeshShapePart(btStridingMeshInterface* meshInterface, int part)
+{
+	// moved from .h to .cpp because of conditional compilation
+	// (The setting of BT_THREADSAFE may differ between various cpp files, so it is best to
+	// avoid using it in h files)
+	m_primitive_manager.m_meshInterface = meshInterface;
+	m_primitive_manager.m_part = part;
+	m_box_set.setPrimitiveManager(&m_primitive_manager);
+#if BT_THREADSAFE
+	// If threadsafe is requested, this object uses a different lock/unlock
+	//  model with the btStridingMeshInterface -- lock once when the object is constructed
+	//  and unlock once in the destructor.
+	// The other way of locking and unlocking for each collision check in the narrowphase
+	// is not threadsafe.  Note these are not thread-locks, they are calls to the meshInterface's
+	// getLockedReadOnlyVertexIndexBase virtual function, which by default just returns a couple of
+	// pointers.  In theory a client could override the lock function to do all sorts of
+	// things like reading data from GPU memory, or decompressing data on the fly, but such things
+	// do not seem all that likely or useful, given the performance cost.
+	m_primitive_manager.lock();
+#endif
+}
+
+btGImpactMeshShapePart::~btGImpactMeshShapePart()
+{
+	// moved from .h to .cpp because of conditional compilation
+#if BT_THREADSAFE
+	m_primitive_manager.unlock();
+#endif
+}
+
+void btGImpactMeshShapePart::lockChildShapes() const
+{
+	// moved from .h to .cpp because of conditional compilation
+#if !BT_THREADSAFE
+	// called in the narrowphase -- not threadsafe!
+	void* dummy = (void*)(m_box_set.getPrimitiveManager());
+	TrimeshPrimitiveManager* dummymanager = static_cast<TrimeshPrimitiveManager*>(dummy);
+	dummymanager->lock();
+#endif
+}
+
+void btGImpactMeshShapePart::unlockChildShapes() const
+{
+	// moved from .h to .cpp because of conditional compilation
+#if !BT_THREADSAFE
+	// called in the narrowphase -- not threadsafe!
+	void* dummy = (void*)(m_box_set.getPrimitiveManager());
+	TrimeshPrimitiveManager* dummymanager = static_cast<TrimeshPrimitiveManager*>(dummy);
+	dummymanager->unlock();
+#endif
+}
+
+#define CALC_EXACT_INERTIA 1
+
+void btGImpactCompoundShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	lockChildShapes();
+#ifdef CALC_EXACT_INERTIA
+	inertia.setValue(0.f, 0.f, 0.f);
+
+	int i = this->getNumChildShapes();
+	btScalar shapemass = mass / btScalar(i);
+
+	while (i--)
+	{
+		btVector3 temp_inertia;
+		m_childShapes[i]->calculateLocalInertia(shapemass, temp_inertia);
+		if (childrenHasTransform())
+		{
+			inertia = gim_inertia_add_transformed(inertia, temp_inertia, m_childTransforms[i]);
+		}
+		else
+		{
+			inertia = gim_inertia_add_transformed(inertia, temp_inertia, btTransform::getIdentity());
+		}
+	}
+
+#else
+
+	// Calc box inertia
+
+	btScalar lx = m_localAABB.m_max[0] - m_localAABB.m_min[0];
+	btScalar ly = m_localAABB.m_max[1] - m_localAABB.m_min[1];
+	btScalar lz = m_localAABB.m_max[2] - m_localAABB.m_min[2];
+	const btScalar x2 = lx * lx;
+	const btScalar y2 = ly * ly;
+	const btScalar z2 = lz * lz;
+	const btScalar scaledmass = mass * btScalar(0.08333333);
+
+	inertia = scaledmass * (btVector3(y2 + z2, x2 + z2, x2 + y2));
+
+#endif
+	unlockChildShapes();
+}
+
+void btGImpactMeshShapePart::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+	lockChildShapes();
+
+#ifdef CALC_EXACT_INERTIA
+	inertia.setValue(0.f, 0.f, 0.f);
+
+	int i = this->getVertexCount();
+	btScalar pointmass = mass / btScalar(i);
+
+	while (i--)
+	{
+		btVector3 pointintertia;
+		this->getVertex(i, pointintertia);
+		pointintertia = gim_get_point_inertia(pointintertia, pointmass);
+		inertia += pointintertia;
+	}
+
+#else
+
+	// Calc box inertia
+
+	btScalar lx = m_localAABB.m_max[0] - m_localAABB.m_min[0];
+	btScalar ly = m_localAABB.m_max[1] - m_localAABB.m_min[1];
+	btScalar lz = m_localAABB.m_max[2] - m_localAABB.m_min[2];
+	const btScalar x2 = lx * lx;
+	const btScalar y2 = ly * ly;
+	const btScalar z2 = lz * lz;
+	const btScalar scaledmass = mass * btScalar(0.08333333);
+
+	inertia = scaledmass * (btVector3(y2 + z2, x2 + z2, x2 + y2));
+
+#endif
+
+	unlockChildShapes();
+}
+
+void btGImpactMeshShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
+{
+#ifdef CALC_EXACT_INERTIA
+	inertia.setValue(0.f, 0.f, 0.f);
+
+	int i = this->getMeshPartCount();
+	btScalar partmass = mass / btScalar(i);
+
+	while (i--)
+	{
+		btVector3 partinertia;
+		getMeshPart(i)->calculateLocalInertia(partmass, partinertia);
+		inertia += partinertia;
+	}
+
+#else
+
+	// Calc box inertia
+
+	btScalar lx = m_localAABB.m_max[0] - m_localAABB.m_min[0];
+	btScalar ly = m_localAABB.m_max[1] - m_localAABB.m_min[1];
+	btScalar lz = m_localAABB.m_max[2] - m_localAABB.m_min[2];
+	const btScalar x2 = lx * lx;
+	const btScalar y2 = ly * ly;
+	const btScalar z2 = lz * lz;
+	const btScalar scaledmass = mass * btScalar(0.08333333);
+
+	inertia = scaledmass * (btVector3(y2 + z2, x2 + z2, x2 + y2));
+
+#endif
+}
+
+void btGImpactMeshShape::rayTest(const btVector3& rayFrom, const btVector3& rayTo, btCollisionWorld::RayResultCallback& resultCallback) const
+{
+}
+
+void btGImpactMeshShapePart::processAllTrianglesRay(btTriangleCallback* callback, const btVector3& rayFrom, const btVector3& rayTo) const
+{
+	lockChildShapes();
+
+	btAlignedObjectArray<int> collided;
+	btVector3 rayDir(rayTo - rayFrom);
+	rayDir.normalize();
+	m_box_set.rayQuery(rayDir, rayFrom, collided);
+
+	if (collided.size() == 0)
+	{
+		unlockChildShapes();
+		return;
+	}
+
+	int part = (int)getPart();
+	btPrimitiveTriangle triangle;
+	int i = collided.size();
+	while (i--)
+	{
+		getPrimitiveTriangle(collided[i], triangle);
+		callback->processTriangle(triangle.m_vertices, part, collided[i]);
+	}
+	unlockChildShapes();
+}
+
+void btGImpactMeshShapePart::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	lockChildShapes();
+	btAABB box;
+	box.m_min = aabbMin;
+	box.m_max = aabbMax;
+
+	btAlignedObjectArray<int> collided;
+	m_box_set.boxQuery(box, collided);
+
+	if (collided.size() == 0)
+	{
+		unlockChildShapes();
+		return;
+	}
+
+	int part = (int)getPart();
+	btPrimitiveTriangle triangle;
+	int i = collided.size();
+	while (i--)
+	{
+		this->getPrimitiveTriangle(collided[i], triangle);
+		callback->processTriangle(triangle.m_vertices, part, collided[i]);
+	}
+	unlockChildShapes();
+}
+
+void btGImpactMeshShape::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+{
+	int i = m_mesh_parts.size();
+	while (i--)
+	{
+		m_mesh_parts[i]->processAllTriangles(callback, aabbMin, aabbMax);
+	}
+}
+
+void btGImpactMeshShape::processAllTrianglesRay(btTriangleCallback* callback, const btVector3& rayFrom, const btVector3& rayTo) const
+{
+	int i = m_mesh_parts.size();
+	while (i--)
+	{
+		m_mesh_parts[i]->processAllTrianglesRay(callback, rayFrom, rayTo);
+	}
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btGImpactMeshShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btGImpactMeshShapeData* trimeshData = (btGImpactMeshShapeData*)dataBuffer;
+
+	btCollisionShape::serialize(&trimeshData->m_collisionShapeData, serializer);
+
+	m_meshInterface->serialize(&trimeshData->m_meshInterface, serializer);
+
+	trimeshData->m_collisionMargin = float(m_collisionMargin);
+
+	localScaling.serializeFloat(trimeshData->m_localScaling);
+
+	trimeshData->m_gimpactSubType = int(getGImpactShapeType());
+
+	return "btGImpactMeshShapeData";
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactShape.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactShape.h
new file mode 100644
index 0000000..cc91079
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGImpactShape.h
@@ -0,0 +1,1115 @@
+/*! \file btGImpactShape.h
+\author Francisco Len Nßjera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef GIMPACT_SHAPE_H
+#define GIMPACT_SHAPE_H
+
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/CollisionShapes/btStridingMeshInterface.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "BulletCollision/CollisionShapes/btConcaveShape.h"
+#include "BulletCollision/CollisionShapes/btTetrahedronShape.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+#include "btGImpactQuantizedBvh.h"  // box tree class
+
+//! declare Quantized trees, (you can change to float based trees)
+typedef btGImpactQuantizedBvh btGImpactBoxSet;
+
+enum eGIMPACT_SHAPE_TYPE
+{
+	CONST_GIMPACT_COMPOUND_SHAPE = 0,
+	CONST_GIMPACT_TRIMESH_SHAPE_PART,
+	CONST_GIMPACT_TRIMESH_SHAPE
+};
+
+//! Helper class for tetrahedrons
+class btTetrahedronShapeEx : public btBU_Simplex1to4
+{
+public:
+	btTetrahedronShapeEx()
+	{
+		m_numVertices = 4;
+	}
+
+	SIMD_FORCE_INLINE void setVertices(
+		const btVector3& v0, const btVector3& v1,
+		const btVector3& v2, const btVector3& v3)
+	{
+		m_vertices[0] = v0;
+		m_vertices[1] = v1;
+		m_vertices[2] = v2;
+		m_vertices[3] = v3;
+		recalcLocalAabb();
+	}
+};
+
+//! Base class for gimpact shapes
+class btGImpactShapeInterface : public btConcaveShape
+{
+protected:
+	btAABB m_localAABB;
+	bool m_needs_update;
+	btVector3 localScaling;
+	btGImpactBoxSet m_box_set;  // optionally boxset
+
+	//! use this function for perfofm refit in bounding boxes
+	//! use this function for perfofm refit in bounding boxes
+	virtual void calcLocalAABB()
+	{
+		lockChildShapes();
+		if (m_box_set.getNodeCount() == 0)
+		{
+			m_box_set.buildSet();
+		}
+		else
+		{
+			m_box_set.update();
+		}
+		unlockChildShapes();
+
+		m_localAABB = m_box_set.getGlobalBox();
+	}
+
+public:
+	btGImpactShapeInterface()
+	{
+		m_shapeType = GIMPACT_SHAPE_PROXYTYPE;
+		m_localAABB.invalidate();
+		m_needs_update = true;
+		localScaling.setValue(1.f, 1.f, 1.f);
+	}
+
+	//! performs refit operation
+	/*!
+	Updates the entire Box set of this shape.
+	\pre postUpdate() must be called for attemps to calculating the box set, else this function
+		will does nothing.
+	\post if m_needs_update == true, then it calls calcLocalAABB();
+	*/
+	SIMD_FORCE_INLINE void updateBound()
+	{
+		if (!m_needs_update) return;
+		calcLocalAABB();
+		m_needs_update = false;
+	}
+
+	//! If the Bounding box is not updated, then this class attemps to calculate it.
+	/*!
+    \post Calls updateBound() for update the box set.
+    */
+	void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		btAABB transformedbox = m_localAABB;
+		transformedbox.appy_transform(t);
+		aabbMin = transformedbox.m_min;
+		aabbMax = transformedbox.m_max;
+	}
+
+	//! Tells to this object that is needed to refit the box set
+	virtual void postUpdate()
+	{
+		m_needs_update = true;
+	}
+
+	//! Obtains the local box, which is the global calculated box of the total of subshapes
+	SIMD_FORCE_INLINE const btAABB& getLocalBox()
+	{
+		return m_localAABB;
+	}
+
+	virtual int getShapeType() const
+	{
+		return GIMPACT_SHAPE_PROXYTYPE;
+	}
+
+	/*!
+	\post You must call updateBound() for update the box set.
+	*/
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		localScaling = scaling;
+		postUpdate();
+	}
+
+	virtual const btVector3& getLocalScaling() const
+	{
+		return localScaling;
+	}
+
+	virtual void setMargin(btScalar margin)
+	{
+		m_collisionMargin = margin;
+		int i = getNumChildShapes();
+		while (i--)
+		{
+			btCollisionShape* child = getChildShape(i);
+			child->setMargin(margin);
+		}
+
+		m_needs_update = true;
+	}
+
+	//! Subshape member functions
+	//!@{
+
+	//! Base method for determinig which kind of GIMPACT shape we get
+	virtual eGIMPACT_SHAPE_TYPE getGImpactShapeType() const = 0;
+
+	//! gets boxset
+	SIMD_FORCE_INLINE const btGImpactBoxSet* getBoxSet() const
+	{
+		return &m_box_set;
+	}
+
+	//! Determines if this class has a hierarchy structure for sorting its primitives
+	SIMD_FORCE_INLINE bool hasBoxSet() const
+	{
+		if (m_box_set.getNodeCount() == 0) return false;
+		return true;
+	}
+
+	//! Obtains the primitive manager
+	virtual const btPrimitiveManagerBase* getPrimitiveManager() const = 0;
+
+	//! Gets the number of children
+	virtual int getNumChildShapes() const = 0;
+
+	//! if true, then its children must get transforms.
+	virtual bool childrenHasTransform() const = 0;
+
+	//! Determines if this shape has triangles
+	virtual bool needsRetrieveTriangles() const = 0;
+
+	//! Determines if this shape has tetrahedrons
+	virtual bool needsRetrieveTetrahedrons() const = 0;
+
+	virtual void getBulletTriangle(int prim_index, btTriangleShapeEx& triangle) const = 0;
+
+	virtual void getBulletTetrahedron(int prim_index, btTetrahedronShapeEx& tetrahedron) const = 0;
+
+	//! call when reading child shapes
+	virtual void lockChildShapes() const
+	{
+	}
+
+	virtual void unlockChildShapes() const
+	{
+	}
+
+	//! if this trimesh
+	SIMD_FORCE_INLINE void getPrimitiveTriangle(int index, btPrimitiveTriangle& triangle) const
+	{
+		getPrimitiveManager()->get_primitive_triangle(index, triangle);
+	}
+
+	//! Retrieves the bound from a child
+	/*!
+    */
+	virtual void getChildAabb(int child_index, const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		btAABB child_aabb;
+		getPrimitiveManager()->get_primitive_box(child_index, child_aabb);
+		child_aabb.appy_transform(t);
+		aabbMin = child_aabb.m_min;
+		aabbMax = child_aabb.m_max;
+	}
+
+	//! Gets the children
+	virtual btCollisionShape* getChildShape(int index) = 0;
+
+	//! Gets the child
+	virtual const btCollisionShape* getChildShape(int index) const = 0;
+
+	//! Gets the children transform
+	virtual btTransform getChildTransform(int index) const = 0;
+
+	//! Sets the children transform
+	/*!
+	\post You must call updateBound() for update the box set.
+	*/
+	virtual void setChildTransform(int index, const btTransform& transform) = 0;
+
+	//!@}
+
+	//! virtual method for ray collision
+	virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btCollisionWorld::RayResultCallback& resultCallback) const
+	{
+		(void)rayFrom;
+		(void)rayTo;
+		(void)resultCallback;
+	}
+
+	//! Function for retrieve triangles.
+	/*!
+	It gives the triangles in local space
+	*/
+	virtual void processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const
+	{
+		(void)callback;
+		(void)aabbMin;
+		(void)aabbMax;
+	}
+
+	//! Function for retrieve triangles.
+	/*!
+	It gives the triangles in local space
+	*/
+	virtual void processAllTrianglesRay(btTriangleCallback* /*callback*/, const btVector3& /*rayFrom*/, const btVector3& /*rayTo*/) const
+	{
+	}
+
+	//!@}
+};
+
+//! btGImpactCompoundShape allows to handle multiple btCollisionShape objects at once
+/*!
+This class only can manage Convex subshapes
+*/
+class btGImpactCompoundShape : public btGImpactShapeInterface
+{
+public:
+	//! compound primitive manager
+	class CompoundPrimitiveManager : public btPrimitiveManagerBase
+	{
+	public:
+		virtual ~CompoundPrimitiveManager() {}
+		btGImpactCompoundShape* m_compoundShape;
+
+		CompoundPrimitiveManager(const CompoundPrimitiveManager& compound)
+			: btPrimitiveManagerBase()
+		{
+			m_compoundShape = compound.m_compoundShape;
+		}
+
+		CompoundPrimitiveManager(btGImpactCompoundShape* compoundShape)
+		{
+			m_compoundShape = compoundShape;
+		}
+
+		CompoundPrimitiveManager()
+		{
+			m_compoundShape = NULL;
+		}
+
+		virtual bool is_trimesh() const
+		{
+			return false;
+		}
+
+		virtual int get_primitive_count() const
+		{
+			return (int)m_compoundShape->getNumChildShapes();
+		}
+
+		virtual void get_primitive_box(int prim_index, btAABB& primbox) const
+		{
+			btTransform prim_trans;
+			if (m_compoundShape->childrenHasTransform())
+			{
+				prim_trans = m_compoundShape->getChildTransform(prim_index);
+			}
+			else
+			{
+				prim_trans.setIdentity();
+			}
+			const btCollisionShape* shape = m_compoundShape->getChildShape(prim_index);
+			shape->getAabb(prim_trans, primbox.m_min, primbox.m_max);
+		}
+
+		virtual void get_primitive_triangle(int prim_index, btPrimitiveTriangle& triangle) const
+		{
+			btAssert(0);
+			(void)prim_index;
+			(void)triangle;
+		}
+	};
+
+protected:
+	CompoundPrimitiveManager m_primitive_manager;
+	btAlignedObjectArray<btTransform> m_childTransforms;
+	btAlignedObjectArray<btCollisionShape*> m_childShapes;
+
+public:
+	btGImpactCompoundShape(bool children_has_transform = true)
+	{
+		(void)children_has_transform;
+		m_primitive_manager.m_compoundShape = this;
+		m_box_set.setPrimitiveManager(&m_primitive_manager);
+	}
+
+	virtual ~btGImpactCompoundShape()
+	{
+	}
+
+	//! if true, then its children must get transforms.
+	virtual bool childrenHasTransform() const
+	{
+		if (m_childTransforms.size() == 0) return false;
+		return true;
+	}
+
+	//! Obtains the primitive manager
+	virtual const btPrimitiveManagerBase* getPrimitiveManager() const
+	{
+		return &m_primitive_manager;
+	}
+
+	//! Obtains the compopund primitive manager
+	SIMD_FORCE_INLINE CompoundPrimitiveManager* getCompoundPrimitiveManager()
+	{
+		return &m_primitive_manager;
+	}
+
+	//! Gets the number of children
+	virtual int getNumChildShapes() const
+	{
+		return m_childShapes.size();
+	}
+
+	//! Use this method for adding children. Only Convex shapes are allowed.
+	void addChildShape(const btTransform& localTransform, btCollisionShape* shape)
+	{
+		btAssert(shape->isConvex());
+		m_childTransforms.push_back(localTransform);
+		m_childShapes.push_back(shape);
+	}
+
+	//! Use this method for adding children. Only Convex shapes are allowed.
+	void addChildShape(btCollisionShape* shape)
+	{
+		btAssert(shape->isConvex());
+		m_childShapes.push_back(shape);
+	}
+
+	//! Gets the children
+	virtual btCollisionShape* getChildShape(int index)
+	{
+		return m_childShapes[index];
+	}
+
+	//! Gets the children
+	virtual const btCollisionShape* getChildShape(int index) const
+	{
+		return m_childShapes[index];
+	}
+
+	//! Retrieves the bound from a child
+	/*!
+    */
+	virtual void getChildAabb(int child_index, const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		if (childrenHasTransform())
+		{
+			m_childShapes[child_index]->getAabb(t * m_childTransforms[child_index], aabbMin, aabbMax);
+		}
+		else
+		{
+			m_childShapes[child_index]->getAabb(t, aabbMin, aabbMax);
+		}
+	}
+
+	//! Gets the children transform
+	virtual btTransform getChildTransform(int index) const
+	{
+		btAssert(m_childTransforms.size() == m_childShapes.size());
+		return m_childTransforms[index];
+	}
+
+	//! Sets the children transform
+	/*!
+	\post You must call updateBound() for update the box set.
+	*/
+	virtual void setChildTransform(int index, const btTransform& transform)
+	{
+		btAssert(m_childTransforms.size() == m_childShapes.size());
+		m_childTransforms[index] = transform;
+		postUpdate();
+	}
+
+	//! Determines if this shape has triangles
+	virtual bool needsRetrieveTriangles() const
+	{
+		return false;
+	}
+
+	//! Determines if this shape has tetrahedrons
+	virtual bool needsRetrieveTetrahedrons() const
+	{
+		return false;
+	}
+
+	virtual void getBulletTriangle(int prim_index, btTriangleShapeEx& triangle) const
+	{
+		(void)prim_index;
+		(void)triangle;
+		btAssert(0);
+	}
+
+	virtual void getBulletTetrahedron(int prim_index, btTetrahedronShapeEx& tetrahedron) const
+	{
+		(void)prim_index;
+		(void)tetrahedron;
+		btAssert(0);
+	}
+
+	//! Calculates the exact inertia tensor for this shape
+	virtual void calculateLocalInertia(btScalar mass, btVector3& inertia) const;
+
+	virtual const char* getName() const
+	{
+		return "GImpactCompound";
+	}
+
+	virtual eGIMPACT_SHAPE_TYPE getGImpactShapeType() const
+	{
+		return CONST_GIMPACT_COMPOUND_SHAPE;
+	}
+};
+
+//! This class manages a sub part of a mesh supplied by the btStridingMeshInterface interface.
+/*!
+- Simply create this shape by passing the btStridingMeshInterface to the constructor btGImpactMeshShapePart, then you must call updateBound() after creating the mesh
+- When making operations with this shape, you must call <b>lock</b> before accessing to the trimesh primitives, and then call <b>unlock</b>
+- You can handle deformable meshes with this shape, by calling postUpdate() every time when changing the mesh vertices.
+
+*/
+class btGImpactMeshShapePart : public btGImpactShapeInterface
+{
+public:
+	//! Trimesh primitive manager
+	/*!
+	Manages the info from btStridingMeshInterface object and controls the Lock/Unlock mechanism
+	*/
+	class TrimeshPrimitiveManager : public btPrimitiveManagerBase
+	{
+	public:
+		btScalar m_margin;
+		btStridingMeshInterface* m_meshInterface;
+		btVector3 m_scale;
+		int m_part;
+		int m_lock_count;
+		const unsigned char* vertexbase;
+		int numverts;
+		PHY_ScalarType type;
+		int stride;
+		const unsigned char* indexbase;
+		int indexstride;
+		int numfaces;
+		PHY_ScalarType indicestype;
+
+		TrimeshPrimitiveManager()
+		{
+			m_meshInterface = NULL;
+			m_part = 0;
+			m_margin = 0.01f;
+			m_scale = btVector3(1.f, 1.f, 1.f);
+			m_lock_count = 0;
+			vertexbase = 0;
+			numverts = 0;
+			stride = 0;
+			indexbase = 0;
+			indexstride = 0;
+			numfaces = 0;
+		}
+
+		TrimeshPrimitiveManager(const TrimeshPrimitiveManager& manager)
+			: btPrimitiveManagerBase()
+		{
+			m_meshInterface = manager.m_meshInterface;
+			m_part = manager.m_part;
+			m_margin = manager.m_margin;
+			m_scale = manager.m_scale;
+			m_lock_count = 0;
+			vertexbase = 0;
+			numverts = 0;
+			stride = 0;
+			indexbase = 0;
+			indexstride = 0;
+			numfaces = 0;
+		}
+
+		TrimeshPrimitiveManager(
+			btStridingMeshInterface* meshInterface, int part)
+		{
+			m_meshInterface = meshInterface;
+			m_part = part;
+			m_scale = m_meshInterface->getScaling();
+			m_margin = 0.1f;
+			m_lock_count = 0;
+			vertexbase = 0;
+			numverts = 0;
+			stride = 0;
+			indexbase = 0;
+			indexstride = 0;
+			numfaces = 0;
+		}
+
+		virtual ~TrimeshPrimitiveManager() {}
+
+		void lock()
+		{
+			if (m_lock_count > 0)
+			{
+				m_lock_count++;
+				return;
+			}
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase, numverts,
+				type, stride, &indexbase, indexstride, numfaces, indicestype, m_part);
+
+			m_lock_count = 1;
+		}
+
+		void unlock()
+		{
+			if (m_lock_count == 0) return;
+			if (m_lock_count > 1)
+			{
+				--m_lock_count;
+				return;
+			}
+			m_meshInterface->unLockReadOnlyVertexBase(m_part);
+			vertexbase = NULL;
+			m_lock_count = 0;
+		}
+
+		virtual bool is_trimesh() const
+		{
+			return true;
+		}
+
+		virtual int get_primitive_count() const
+		{
+			return (int)numfaces;
+		}
+
+		SIMD_FORCE_INLINE int get_vertex_count() const
+		{
+			return (int)numverts;
+		}
+
+		SIMD_FORCE_INLINE void get_indices(int face_index, unsigned int& i0, unsigned int& i1, unsigned int& i2) const
+		{
+			if (indicestype == PHY_SHORT)
+			{
+				unsigned short* s_indices = (unsigned short*)(indexbase + face_index * indexstride);
+				i0 = s_indices[0];
+				i1 = s_indices[1];
+				i2 = s_indices[2];
+			}
+			else if (indicestype == PHY_INTEGER)
+			{
+				unsigned int* i_indices = (unsigned int*)(indexbase + face_index * indexstride);
+				i0 = i_indices[0];
+				i1 = i_indices[1];
+				i2 = i_indices[2];
+			}
+			else
+			{
+				btAssert(indicestype == PHY_UCHAR);
+				unsigned char* i_indices = (unsigned char*)(indexbase + face_index * indexstride);
+				i0 = i_indices[0];
+				i1 = i_indices[1];
+				i2 = i_indices[2];
+			}
+		}
+
+		SIMD_FORCE_INLINE void get_vertex(unsigned int vertex_index, btVector3& vertex) const
+		{
+			if (type == PHY_DOUBLE)
+			{
+				double* dvertices = (double*)(vertexbase + vertex_index * stride);
+				vertex[0] = btScalar(dvertices[0] * m_scale[0]);
+				vertex[1] = btScalar(dvertices[1] * m_scale[1]);
+				vertex[2] = btScalar(dvertices[2] * m_scale[2]);
+			}
+			else
+			{
+				float* svertices = (float*)(vertexbase + vertex_index * stride);
+				vertex[0] = svertices[0] * m_scale[0];
+				vertex[1] = svertices[1] * m_scale[1];
+				vertex[2] = svertices[2] * m_scale[2];
+			}
+		}
+
+		virtual void get_primitive_box(int prim_index, btAABB& primbox) const
+		{
+			btPrimitiveTriangle triangle;
+			get_primitive_triangle(prim_index, triangle);
+			primbox.calc_from_triangle_margin(
+				triangle.m_vertices[0],
+				triangle.m_vertices[1], triangle.m_vertices[2], triangle.m_margin);
+		}
+
+		virtual void get_primitive_triangle(int prim_index, btPrimitiveTriangle& triangle) const
+		{
+			unsigned int indices[3];
+			get_indices(prim_index, indices[0], indices[1], indices[2]);
+			get_vertex(indices[0], triangle.m_vertices[0]);
+			get_vertex(indices[1], triangle.m_vertices[1]);
+			get_vertex(indices[2], triangle.m_vertices[2]);
+			triangle.m_margin = m_margin;
+		}
+
+		SIMD_FORCE_INLINE void get_bullet_triangle(int prim_index, btTriangleShapeEx& triangle) const
+		{
+			unsigned int indices[3];
+			get_indices(prim_index, indices[0], indices[1], indices[2]);
+			get_vertex(indices[0], triangle.m_vertices1[0]);
+			get_vertex(indices[1], triangle.m_vertices1[1]);
+			get_vertex(indices[2], triangle.m_vertices1[2]);
+			triangle.setMargin(m_margin);
+		}
+	};
+
+protected:
+	TrimeshPrimitiveManager m_primitive_manager;
+
+public:
+	btGImpactMeshShapePart()
+	{
+		m_box_set.setPrimitiveManager(&m_primitive_manager);
+	}
+
+	btGImpactMeshShapePart(btStridingMeshInterface* meshInterface, int part);
+	virtual ~btGImpactMeshShapePart();
+
+	//! if true, then its children must get transforms.
+	virtual bool childrenHasTransform() const
+	{
+		return false;
+	}
+
+	//! call when reading child shapes
+	virtual void lockChildShapes() const;
+	virtual void unlockChildShapes() const;
+
+	//! Gets the number of children
+	virtual int getNumChildShapes() const
+	{
+		return m_primitive_manager.get_primitive_count();
+	}
+
+	//! Gets the children
+	virtual btCollisionShape* getChildShape(int index)
+	{
+		(void)index;
+		btAssert(0);
+		return NULL;
+	}
+
+	//! Gets the child
+	virtual const btCollisionShape* getChildShape(int index) const
+	{
+		(void)index;
+		btAssert(0);
+		return NULL;
+	}
+
+	//! Gets the children transform
+	virtual btTransform getChildTransform(int index) const
+	{
+		(void)index;
+		btAssert(0);
+		return btTransform();
+	}
+
+	//! Sets the children transform
+	/*!
+	\post You must call updateBound() for update the box set.
+	*/
+	virtual void setChildTransform(int index, const btTransform& transform)
+	{
+		(void)index;
+		(void)transform;
+		btAssert(0);
+	}
+
+	//! Obtains the primitive manager
+	virtual const btPrimitiveManagerBase* getPrimitiveManager() const
+	{
+		return &m_primitive_manager;
+	}
+
+	SIMD_FORCE_INLINE TrimeshPrimitiveManager* getTrimeshPrimitiveManager()
+	{
+		return &m_primitive_manager;
+	}
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3& inertia) const;
+
+	virtual const char* getName() const
+	{
+		return "GImpactMeshShapePart";
+	}
+
+	virtual eGIMPACT_SHAPE_TYPE getGImpactShapeType() const
+	{
+		return CONST_GIMPACT_TRIMESH_SHAPE_PART;
+	}
+
+	//! Determines if this shape has triangles
+	virtual bool needsRetrieveTriangles() const
+	{
+		return true;
+	}
+
+	//! Determines if this shape has tetrahedrons
+	virtual bool needsRetrieveTetrahedrons() const
+	{
+		return false;
+	}
+
+	virtual void getBulletTriangle(int prim_index, btTriangleShapeEx& triangle) const
+	{
+		m_primitive_manager.get_bullet_triangle(prim_index, triangle);
+	}
+
+	virtual void getBulletTetrahedron(int prim_index, btTetrahedronShapeEx& tetrahedron) const
+	{
+		(void)prim_index;
+		(void)tetrahedron;
+		btAssert(0);
+	}
+
+	SIMD_FORCE_INLINE int getVertexCount() const
+	{
+		return m_primitive_manager.get_vertex_count();
+	}
+
+	SIMD_FORCE_INLINE void getVertex(int vertex_index, btVector3& vertex) const
+	{
+		m_primitive_manager.get_vertex(vertex_index, vertex);
+	}
+
+	SIMD_FORCE_INLINE void setMargin(btScalar margin)
+	{
+		m_primitive_manager.m_margin = margin;
+		postUpdate();
+	}
+
+	SIMD_FORCE_INLINE btScalar getMargin() const
+	{
+		return m_primitive_manager.m_margin;
+	}
+
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		m_primitive_manager.m_scale = scaling;
+		postUpdate();
+	}
+
+	virtual const btVector3& getLocalScaling() const
+	{
+		return m_primitive_manager.m_scale;
+	}
+
+	SIMD_FORCE_INLINE int getPart() const
+	{
+		return (int)m_primitive_manager.m_part;
+	}
+
+	virtual void processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+	virtual void processAllTrianglesRay(btTriangleCallback* callback, const btVector3& rayFrom, const btVector3& rayTo) const;
+};
+
+//! This class manages a mesh supplied by the btStridingMeshInterface interface.
+/*!
+Set of btGImpactMeshShapePart parts
+- Simply create this shape by passing the btStridingMeshInterface to the constructor btGImpactMeshShape, then you must call updateBound() after creating the mesh
+
+- You can handle deformable meshes with this shape, by calling postUpdate() every time when changing the mesh vertices.
+
+*/
+class btGImpactMeshShape : public btGImpactShapeInterface
+{
+	btStridingMeshInterface* m_meshInterface;
+
+protected:
+	btAlignedObjectArray<btGImpactMeshShapePart*> m_mesh_parts;
+	void buildMeshParts(btStridingMeshInterface* meshInterface)
+	{
+		for (int i = 0; i < meshInterface->getNumSubParts(); ++i)
+		{
+			btGImpactMeshShapePart* newpart = new btGImpactMeshShapePart(meshInterface, i);
+			m_mesh_parts.push_back(newpart);
+		}
+	}
+
+	//! use this function for perfofm refit in bounding boxes
+	virtual void calcLocalAABB()
+	{
+		m_localAABB.invalidate();
+		int i = m_mesh_parts.size();
+		while (i--)
+		{
+			m_mesh_parts[i]->updateBound();
+			m_localAABB.merge(m_mesh_parts[i]->getLocalBox());
+		}
+	}
+
+public:
+	btGImpactMeshShape(btStridingMeshInterface* meshInterface)
+	{
+		m_meshInterface = meshInterface;
+		buildMeshParts(meshInterface);
+	}
+
+	virtual ~btGImpactMeshShape()
+	{
+		int i = m_mesh_parts.size();
+		while (i--)
+		{
+			btGImpactMeshShapePart* part = m_mesh_parts[i];
+			delete part;
+		}
+		m_mesh_parts.clear();
+	}
+
+	btStridingMeshInterface* getMeshInterface()
+	{
+		return m_meshInterface;
+	}
+
+	const btStridingMeshInterface* getMeshInterface() const
+	{
+		return m_meshInterface;
+	}
+
+	int getMeshPartCount() const
+	{
+		return m_mesh_parts.size();
+	}
+
+	btGImpactMeshShapePart* getMeshPart(int index)
+	{
+		return m_mesh_parts[index];
+	}
+
+	const btGImpactMeshShapePart* getMeshPart(int index) const
+	{
+		return m_mesh_parts[index];
+	}
+
+	virtual void setLocalScaling(const btVector3& scaling)
+	{
+		localScaling = scaling;
+
+		int i = m_mesh_parts.size();
+		while (i--)
+		{
+			btGImpactMeshShapePart* part = m_mesh_parts[i];
+			part->setLocalScaling(scaling);
+		}
+
+		m_needs_update = true;
+	}
+
+	virtual void setMargin(btScalar margin)
+	{
+		m_collisionMargin = margin;
+
+		int i = m_mesh_parts.size();
+		while (i--)
+		{
+			btGImpactMeshShapePart* part = m_mesh_parts[i];
+			part->setMargin(margin);
+		}
+
+		m_needs_update = true;
+	}
+
+	//! Tells to this object that is needed to refit all the meshes
+	virtual void postUpdate()
+	{
+		int i = m_mesh_parts.size();
+		while (i--)
+		{
+			btGImpactMeshShapePart* part = m_mesh_parts[i];
+			part->postUpdate();
+		}
+
+		m_needs_update = true;
+	}
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3& inertia) const;
+
+	//! Obtains the primitive manager
+	virtual const btPrimitiveManagerBase* getPrimitiveManager() const
+	{
+		btAssert(0);
+		return NULL;
+	}
+
+	//! Gets the number of children
+	virtual int getNumChildShapes() const
+	{
+		btAssert(0);
+		return 0;
+	}
+
+	//! if true, then its children must get transforms.
+	virtual bool childrenHasTransform() const
+	{
+		btAssert(0);
+		return false;
+	}
+
+	//! Determines if this shape has triangles
+	virtual bool needsRetrieveTriangles() const
+	{
+		btAssert(0);
+		return false;
+	}
+
+	//! Determines if this shape has tetrahedrons
+	virtual bool needsRetrieveTetrahedrons() const
+	{
+		btAssert(0);
+		return false;
+	}
+
+	virtual void getBulletTriangle(int prim_index, btTriangleShapeEx& triangle) const
+	{
+		(void)prim_index;
+		(void)triangle;
+		btAssert(0);
+	}
+
+	virtual void getBulletTetrahedron(int prim_index, btTetrahedronShapeEx& tetrahedron) const
+	{
+		(void)prim_index;
+		(void)tetrahedron;
+		btAssert(0);
+	}
+
+	//! call when reading child shapes
+	virtual void lockChildShapes() const
+	{
+		btAssert(0);
+	}
+
+	virtual void unlockChildShapes() const
+	{
+		btAssert(0);
+	}
+
+	//! Retrieves the bound from a child
+	/*!
+    */
+	virtual void getChildAabb(int child_index, const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		(void)child_index;
+		(void)t;
+		(void)aabbMin;
+		(void)aabbMax;
+		btAssert(0);
+	}
+
+	//! Gets the children
+	virtual btCollisionShape* getChildShape(int index)
+	{
+		(void)index;
+		btAssert(0);
+		return NULL;
+	}
+
+	//! Gets the child
+	virtual const btCollisionShape* getChildShape(int index) const
+	{
+		(void)index;
+		btAssert(0);
+		return NULL;
+	}
+
+	//! Gets the children transform
+	virtual btTransform getChildTransform(int index) const
+	{
+		(void)index;
+		btAssert(0);
+		return btTransform();
+	}
+
+	//! Sets the children transform
+	/*!
+	\post You must call updateBound() for update the box set.
+	*/
+	virtual void setChildTransform(int index, const btTransform& transform)
+	{
+		(void)index;
+		(void)transform;
+		btAssert(0);
+	}
+
+	virtual eGIMPACT_SHAPE_TYPE getGImpactShapeType() const
+	{
+		return CONST_GIMPACT_TRIMESH_SHAPE;
+	}
+
+	virtual const char* getName() const
+	{
+		return "GImpactMesh";
+	}
+
+	virtual void rayTest(const btVector3& rayFrom, const btVector3& rayTo, btCollisionWorld::RayResultCallback& resultCallback) const;
+
+	//! Function for retrieve triangles.
+	/*!
+	It gives the triangles in local space
+	*/
+	virtual void processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const;
+
+	virtual void processAllTrianglesRay(btTriangleCallback* callback, const btVector3& rayFrom, const btVector3& rayTo) const;
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btGImpactMeshShapeData
+{
+	btCollisionShapeData m_collisionShapeData;
+
+	btStridingMeshInterfaceData m_meshInterface;
+
+	btVector3FloatData m_localScaling;
+
+	float m_collisionMargin;
+
+	int m_gimpactSubType;
+};
+
+SIMD_FORCE_INLINE int btGImpactMeshShape::calculateSerializeBufferSize() const
+{
+	return sizeof(btGImpactMeshShapeData);
+}
+
+#endif  //GIMPACT_MESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
new file mode 100644
index 0000000..f81f04b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
@@ -0,0 +1,266 @@
+/*! \file btGenericPoolAllocator.cpp
+\author Francisco Leon Najera. email projectileman@yahoo.com
+
+General purpose allocator class
+*/
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGenericPoolAllocator.h"
+
+/// *************** btGenericMemoryPool ******************///////////
+
+size_t btGenericMemoryPool::allocate_from_free_nodes(size_t num_elements)
+{
+	size_t ptr = BT_UINT_MAX;
+
+	if (m_free_nodes_count == 0) return BT_UINT_MAX;
+	// find an avaliable free node with the correct size
+	size_t revindex = m_free_nodes_count;
+
+	while (revindex-- && ptr == BT_UINT_MAX)
+	{
+		if (m_allocated_sizes[m_free_nodes[revindex]] >= num_elements)
+		{
+			ptr = revindex;
+		}
+	}
+	if (ptr == BT_UINT_MAX) return BT_UINT_MAX;  // not found
+
+	revindex = ptr;
+	ptr = m_free_nodes[revindex];
+	// post: ptr contains the node index, and revindex the index in m_free_nodes
+
+	size_t finalsize = m_allocated_sizes[ptr];
+	finalsize -= num_elements;
+
+	m_allocated_sizes[ptr] = num_elements;
+
+	// post: finalsize>=0, m_allocated_sizes[ptr] has the requested size
+
+	if (finalsize > 0)  // preserve free node, there are some free memory
+	{
+		m_free_nodes[revindex] = ptr + num_elements;
+		m_allocated_sizes[ptr + num_elements] = finalsize;
+	}
+	else  // delete free node
+	{
+		// swap with end
+		m_free_nodes[revindex] = m_free_nodes[m_free_nodes_count - 1];
+		m_free_nodes_count--;
+	}
+
+	return ptr;
+}
+
+size_t btGenericMemoryPool::allocate_from_pool(size_t num_elements)
+{
+	if (m_allocated_count + num_elements > m_max_element_count) return BT_UINT_MAX;
+
+	size_t ptr = m_allocated_count;
+
+	m_allocated_sizes[m_allocated_count] = num_elements;
+	m_allocated_count += num_elements;
+
+	return ptr;
+}
+
+void btGenericMemoryPool::init_pool(size_t element_size, size_t element_count)
+{
+	m_allocated_count = 0;
+	m_free_nodes_count = 0;
+
+	m_element_size = element_size;
+	m_max_element_count = element_count;
+
+	m_pool = (unsigned char *)btAlignedAlloc(m_element_size * m_max_element_count, 16);
+	m_free_nodes = (size_t *)btAlignedAlloc(sizeof(size_t) * m_max_element_count, 16);
+	m_allocated_sizes = (size_t *)btAlignedAlloc(sizeof(size_t) * m_max_element_count, 16);
+
+	for (size_t i = 0; i < m_max_element_count; i++)
+	{
+		m_allocated_sizes[i] = 0;
+	}
+}
+
+void btGenericMemoryPool::end_pool()
+{
+	btAlignedFree(m_pool);
+	btAlignedFree(m_free_nodes);
+	btAlignedFree(m_allocated_sizes);
+	m_allocated_count = 0;
+	m_free_nodes_count = 0;
+}
+
+//! Allocates memory in pool
+/*!
+\param size_bytes size in bytes of the buffer
+*/
+void *btGenericMemoryPool::allocate(size_t size_bytes)
+{
+	size_t module = size_bytes % m_element_size;
+	size_t element_count = size_bytes / m_element_size;
+	if (module > 0) element_count++;
+
+	size_t alloc_pos = allocate_from_free_nodes(element_count);
+	// a free node is found
+	if (alloc_pos != BT_UINT_MAX)
+	{
+		return get_element_data(alloc_pos);
+	}
+	// allocate directly on pool
+	alloc_pos = allocate_from_pool(element_count);
+
+	if (alloc_pos == BT_UINT_MAX) return NULL;  // not space
+	return get_element_data(alloc_pos);
+}
+
+bool btGenericMemoryPool::freeMemory(void *pointer)
+{
+	unsigned char *pointer_pos = (unsigned char *)pointer;
+	unsigned char *pool_pos = (unsigned char *)m_pool;
+	// calc offset
+	if (pointer_pos < pool_pos) return false;  //other pool
+	size_t offset = size_t(pointer_pos - pool_pos);
+	if (offset >= get_pool_capacity()) return false;  // far away
+
+	// find free position
+	m_free_nodes[m_free_nodes_count] = offset / m_element_size;
+	m_free_nodes_count++;
+	return true;
+}
+
+/// *******************! btGenericPoolAllocator *******************!///
+
+btGenericPoolAllocator::~btGenericPoolAllocator()
+{
+	// destroy pools
+	size_t i;
+	for (i = 0; i < m_pool_count; i++)
+	{
+		m_pools[i]->end_pool();
+		btAlignedFree(m_pools[i]);
+	}
+}
+
+// creates a pool
+btGenericMemoryPool *btGenericPoolAllocator::push_new_pool()
+{
+	if (m_pool_count >= BT_DEFAULT_MAX_POOLS) return NULL;
+
+	btGenericMemoryPool *newptr = (btGenericMemoryPool *)btAlignedAlloc(sizeof(btGenericMemoryPool), 16);
+
+	m_pools[m_pool_count] = newptr;
+
+	m_pools[m_pool_count]->init_pool(m_pool_element_size, m_pool_element_count);
+
+	m_pool_count++;
+	return newptr;
+}
+
+void *btGenericPoolAllocator::failback_alloc(size_t size_bytes)
+{
+	btGenericMemoryPool *pool = NULL;
+
+	if (size_bytes <= get_pool_capacity())
+	{
+		pool = push_new_pool();
+	}
+
+	if (pool == NULL)  // failback
+	{
+		return btAlignedAlloc(size_bytes, 16);
+	}
+
+	return pool->allocate(size_bytes);
+}
+
+bool btGenericPoolAllocator::failback_free(void *pointer)
+{
+	btAlignedFree(pointer);
+	return true;
+}
+
+//! Allocates memory in pool
+/*!
+\param size_bytes size in bytes of the buffer
+*/
+void *btGenericPoolAllocator::allocate(size_t size_bytes)
+{
+	void *ptr = NULL;
+
+	size_t i = 0;
+	while (i < m_pool_count && ptr == NULL)
+	{
+		ptr = m_pools[i]->allocate(size_bytes);
+		++i;
+	}
+
+	if (ptr) return ptr;
+
+	return failback_alloc(size_bytes);
+}
+
+bool btGenericPoolAllocator::freeMemory(void *pointer)
+{
+	bool result = false;
+
+	size_t i = 0;
+	while (i < m_pool_count && result == false)
+	{
+		result = m_pools[i]->freeMemory(pointer);
+		++i;
+	}
+
+	if (result) return true;
+
+	return failback_free(pointer);
+}
+
+/// ************** STANDARD ALLOCATOR ***************************///
+
+#define BT_DEFAULT_POOL_SIZE 32768
+#define BT_DEFAULT_POOL_ELEMENT_SIZE 8
+
+// main allocator
+class GIM_STANDARD_ALLOCATOR : public btGenericPoolAllocator
+{
+public:
+	GIM_STANDARD_ALLOCATOR() : btGenericPoolAllocator(BT_DEFAULT_POOL_ELEMENT_SIZE, BT_DEFAULT_POOL_SIZE)
+	{
+	}
+};
+
+// global allocator
+GIM_STANDARD_ALLOCATOR g_main_allocator;
+
+void *btPoolAlloc(size_t size)
+{
+	return g_main_allocator.allocate(size);
+}
+
+void *btPoolRealloc(void *ptr, size_t oldsize, size_t newsize)
+{
+	void *newptr = btPoolAlloc(newsize);
+	size_t copysize = oldsize < newsize ? oldsize : newsize;
+	memcpy(newptr, ptr, copysize);
+	btPoolFree(ptr);
+	return newptr;
+}
+
+void btPoolFree(void *ptr)
+{
+	g_main_allocator.freeMemory(ptr);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
new file mode 100644
index 0000000..197af4f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
@@ -0,0 +1,153 @@
+/*! \file btGenericPoolAllocator.h
+\author Francisco Leon Najera. email projectileman@yahoo.com
+
+General purpose allocator class
+*/
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GENERIC_POOL_ALLOCATOR_H
+#define BT_GENERIC_POOL_ALLOCATOR_H
+
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include "LinearMath/btAlignedAllocator.h"
+
+#define BT_UINT_MAX UINT_MAX
+#define BT_DEFAULT_MAX_POOLS 16
+
+//! Generic Pool class
+class btGenericMemoryPool
+{
+public:
+	unsigned char *m_pool;      //[m_element_size*m_max_element_count];
+	size_t *m_free_nodes;       //[m_max_element_count];//! free nodes
+	size_t *m_allocated_sizes;  //[m_max_element_count];//! Number of elements allocated per node
+	size_t m_allocated_count;
+	size_t m_free_nodes_count;
+
+protected:
+	size_t m_element_size;
+	size_t m_max_element_count;
+
+	size_t allocate_from_free_nodes(size_t num_elements);
+	size_t allocate_from_pool(size_t num_elements);
+
+public:
+	void init_pool(size_t element_size, size_t element_count);
+
+	void end_pool();
+
+	btGenericMemoryPool(size_t element_size, size_t element_count)
+	{
+		init_pool(element_size, element_count);
+	}
+
+	~btGenericMemoryPool()
+	{
+		end_pool();
+	}
+
+	inline size_t get_pool_capacity()
+	{
+		return m_element_size * m_max_element_count;
+	}
+
+	inline size_t gem_element_size()
+	{
+		return m_element_size;
+	}
+
+	inline size_t get_max_element_count()
+	{
+		return m_max_element_count;
+	}
+
+	inline size_t get_allocated_count()
+	{
+		return m_allocated_count;
+	}
+
+	inline size_t get_free_positions_count()
+	{
+		return m_free_nodes_count;
+	}
+
+	inline void *get_element_data(size_t element_index)
+	{
+		return &m_pool[element_index * m_element_size];
+	}
+
+	//! Allocates memory in pool
+	/*!
+	\param size_bytes size in bytes of the buffer
+	*/
+	void *allocate(size_t size_bytes);
+
+	bool freeMemory(void *pointer);
+};
+
+//! Generic Allocator with pools
+/*!
+General purpose Allocator which can create Memory Pools dynamiacally as needed.
+*/
+class btGenericPoolAllocator
+{
+protected:
+	size_t m_pool_element_size;
+	size_t m_pool_element_count;
+
+public:
+	btGenericMemoryPool *m_pools[BT_DEFAULT_MAX_POOLS];
+	size_t m_pool_count;
+
+	inline size_t get_pool_capacity()
+	{
+		return m_pool_element_size * m_pool_element_count;
+	}
+
+protected:
+	// creates a pool
+	btGenericMemoryPool *push_new_pool();
+
+	void *failback_alloc(size_t size_bytes);
+
+	bool failback_free(void *pointer);
+
+public:
+	btGenericPoolAllocator(size_t pool_element_size, size_t pool_element_count)
+	{
+		m_pool_count = 0;
+		m_pool_element_size = pool_element_size;
+		m_pool_element_count = pool_element_count;
+	}
+
+	virtual ~btGenericPoolAllocator();
+
+	//! Allocates memory in pool
+	/*!
+	\param size_bytes size in bytes of the buffer
+	*/
+	void *allocate(size_t size_bytes);
+
+	bool freeMemory(void *pointer);
+};
+
+void *btPoolAlloc(size_t size);
+void *btPoolRealloc(void *ptr, size_t oldsize, size_t newsize);
+void btPoolFree(void *ptr);
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGeometryOperations.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGeometryOperations.h
new file mode 100644
index 0000000..6a1ee6d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btGeometryOperations.h
@@ -0,0 +1,198 @@
+#ifndef BT_BASIC_GEOMETRY_OPERATIONS_H_INCLUDED
+#define BT_BASIC_GEOMETRY_OPERATIONS_H_INCLUDED
+
+/*! \file btGeometryOperations.h
+*\author Francisco Leon Najera
+
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btBoxCollision.h"
+
+#define PLANEDIREPSILON 0.0000001f
+#define PARALELENORMALS 0.000001f
+
+#define BT_CLAMP(number, minval, maxval) (number < minval ? minval : (number > maxval ? maxval : number))
+
+/// Calc a plane from a triangle edge an a normal. plane is a vec4f
+SIMD_FORCE_INLINE void bt_edge_plane(const btVector3 &e1, const btVector3 &e2, const btVector3 &normal, btVector4 &plane)
+{
+	btVector3 planenormal = (e2 - e1).cross(normal);
+	planenormal.normalize();
+	plane.setValue(planenormal[0], planenormal[1], planenormal[2], e2.dot(planenormal));
+}
+
+//***************** SEGMENT and LINE FUNCTIONS **********************************///
+
+/*! Finds the closest point(cp) to (v) on a segment (e1,e2)
+ */
+SIMD_FORCE_INLINE void bt_closest_point_on_segment(
+	btVector3 &cp, const btVector3 &v,
+	const btVector3 &e1, const btVector3 &e2)
+{
+	btVector3 n = e2 - e1;
+	cp = v - e1;
+	btScalar _scalar = cp.dot(n) / n.dot(n);
+	if (_scalar < 0.0f)
+	{
+		cp = e1;
+	}
+	else if (_scalar > 1.0f)
+	{
+		cp = e2;
+	}
+	else
+	{
+		cp = _scalar * n + e1;
+	}
+}
+
+//! line plane collision
+/*!
+*\return
+	-0  if the ray never intersects
+	-1 if the ray collides in front
+	-2 if the ray collides in back
+*/
+
+SIMD_FORCE_INLINE int bt_line_plane_collision(
+	const btVector4 &plane,
+	const btVector3 &vDir,
+	const btVector3 &vPoint,
+	btVector3 &pout,
+	btScalar &tparam,
+	btScalar tmin, btScalar tmax)
+{
+	btScalar _dotdir = vDir.dot(plane);
+
+	if (btFabs(_dotdir) < PLANEDIREPSILON)
+	{
+		tparam = tmax;
+		return 0;
+	}
+
+	btScalar _dis = bt_distance_point_plane(plane, vPoint);
+	char returnvalue = _dis < 0.0f ? 2 : 1;
+	tparam = -_dis / _dotdir;
+
+	if (tparam < tmin)
+	{
+		returnvalue = 0;
+		tparam = tmin;
+	}
+	else if (tparam > tmax)
+	{
+		returnvalue = 0;
+		tparam = tmax;
+	}
+	pout = tparam * vDir + vPoint;
+	return returnvalue;
+}
+
+//! Find closest points on segments
+SIMD_FORCE_INLINE void bt_segment_collision(
+	const btVector3 &vA1,
+	const btVector3 &vA2,
+	const btVector3 &vB1,
+	const btVector3 &vB2,
+	btVector3 &vPointA,
+	btVector3 &vPointB)
+{
+	btVector3 AD = vA2 - vA1;
+	btVector3 BD = vB2 - vB1;
+	btVector3 N = AD.cross(BD);
+	btScalar tp = N.length2();
+
+	btVector4 _M;  //plane
+
+	if (tp < SIMD_EPSILON)  //ARE PARALELE
+	{
+		//project B over A
+		bool invert_b_order = false;
+		_M[0] = vB1.dot(AD);
+		_M[1] = vB2.dot(AD);
+
+		if (_M[0] > _M[1])
+		{
+			invert_b_order = true;
+			BT_SWAP_NUMBERS(_M[0], _M[1]);
+		}
+		_M[2] = vA1.dot(AD);
+		_M[3] = vA2.dot(AD);
+		//mid points
+		N[0] = (_M[0] + _M[1]) * 0.5f;
+		N[1] = (_M[2] + _M[3]) * 0.5f;
+
+		if (N[0] < N[1])
+		{
+			if (_M[1] < _M[2])
+			{
+				vPointB = invert_b_order ? vB1 : vB2;
+				vPointA = vA1;
+			}
+			else if (_M[1] < _M[3])
+			{
+				vPointB = invert_b_order ? vB1 : vB2;
+				bt_closest_point_on_segment(vPointA, vPointB, vA1, vA2);
+			}
+			else
+			{
+				vPointA = vA2;
+				bt_closest_point_on_segment(vPointB, vPointA, vB1, vB2);
+			}
+		}
+		else
+		{
+			if (_M[3] < _M[0])
+			{
+				vPointB = invert_b_order ? vB2 : vB1;
+				vPointA = vA2;
+			}
+			else if (_M[3] < _M[1])
+			{
+				vPointA = vA2;
+				bt_closest_point_on_segment(vPointB, vPointA, vB1, vB2);
+			}
+			else
+			{
+				vPointB = invert_b_order ? vB1 : vB2;
+				bt_closest_point_on_segment(vPointA, vPointB, vA1, vA2);
+			}
+		}
+		return;
+	}
+
+	N = N.cross(BD);
+	_M.setValue(N[0], N[1], N[2], vB1.dot(N));
+
+	// get point A as the plane collision point
+	bt_line_plane_collision(_M, AD, vA1, vPointA, tp, btScalar(0), btScalar(1));
+
+	/*Closest point on segment*/
+	vPointB = vPointA - vB1;
+	tp = vPointB.dot(BD);
+	tp /= BD.dot(BD);
+	tp = BT_CLAMP(tp, 0.0f, 1.0f);
+
+	vPointB = tp * BD + vB1;
+}
+
+#endif  // GIM_VECTOR_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btQuantization.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btQuantization.h
new file mode 100644
index 0000000..19a02a2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btQuantization.h
@@ -0,0 +1,79 @@
+#ifndef BT_GIMPACT_QUANTIZATION_H_INCLUDED
+#define BT_GIMPACT_QUANTIZATION_H_INCLUDED
+
+/*! \file btQuantization.h
+*\author Francisco Leon Najera
+
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btTransform.h"
+
+SIMD_FORCE_INLINE void bt_calc_quantization_parameters(
+	btVector3& outMinBound,
+	btVector3& outMaxBound,
+	btVector3& bvhQuantization,
+	const btVector3& srcMinBound, const btVector3& srcMaxBound,
+	btScalar quantizationMargin)
+{
+	//enlarge the AABB to avoid division by zero when initializing the quantization values
+	btVector3 clampValue(quantizationMargin, quantizationMargin, quantizationMargin);
+	outMinBound = srcMinBound - clampValue;
+	outMaxBound = srcMaxBound + clampValue;
+	btVector3 aabbSize = outMaxBound - outMinBound;
+	bvhQuantization = btVector3(btScalar(65535.0),
+								btScalar(65535.0),
+								btScalar(65535.0)) /
+					  aabbSize;
+}
+
+SIMD_FORCE_INLINE void bt_quantize_clamp(
+	unsigned short* out,
+	const btVector3& point,
+	const btVector3& min_bound,
+	const btVector3& max_bound,
+	const btVector3& bvhQuantization)
+{
+	btVector3 clampedPoint(point);
+	clampedPoint.setMax(min_bound);
+	clampedPoint.setMin(max_bound);
+
+	btVector3 v = (clampedPoint - min_bound) * bvhQuantization;
+	out[0] = (unsigned short)(v.getX() + 0.5f);
+	out[1] = (unsigned short)(v.getY() + 0.5f);
+	out[2] = (unsigned short)(v.getZ() + 0.5f);
+}
+
+SIMD_FORCE_INLINE btVector3 bt_unquantize(
+	const unsigned short* vecIn,
+	const btVector3& offset,
+	const btVector3& bvhQuantization)
+{
+	btVector3 vecOut;
+	vecOut.setValue(
+		(btScalar)(vecIn[0]) / (bvhQuantization.getX()),
+		(btScalar)(vecIn[1]) / (bvhQuantization.getY()),
+		(btScalar)(vecIn[2]) / (bvhQuantization.getZ()));
+	vecOut += offset;
+	return vecOut;
+}
+
+#endif  // BT_GIMPACT_QUANTIZATION_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
new file mode 100644
index 0000000..292ef8c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
@@ -0,0 +1,203 @@
+/*! \file btGImpactTriangleShape.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTriangleShapeEx.h"
+
+void GIM_TRIANGLE_CONTACT::merge_points(const btVector4& plane,
+										btScalar margin, const btVector3* points, int point_count)
+{
+	m_point_count = 0;
+	m_penetration_depth = -1000.0f;
+
+	int point_indices[MAX_TRI_CLIPPING];
+
+	int _k;
+
+	for (_k = 0; _k < point_count; _k++)
+	{
+		btScalar _dist = -bt_distance_point_plane(plane, points[_k]) + margin;
+
+		if (_dist >= 0.0f)
+		{
+			if (_dist > m_penetration_depth)
+			{
+				m_penetration_depth = _dist;
+				point_indices[0] = _k;
+				m_point_count = 1;
+			}
+			else if ((_dist + SIMD_EPSILON) >= m_penetration_depth)
+			{
+				point_indices[m_point_count] = _k;
+				m_point_count++;
+			}
+		}
+	}
+
+	for (_k = 0; _k < m_point_count; _k++)
+	{
+		m_points[_k] = points[point_indices[_k]];
+	}
+}
+
+///class btPrimitiveTriangle
+bool btPrimitiveTriangle::overlap_test_conservative(const btPrimitiveTriangle& other)
+{
+	btScalar total_margin = m_margin + other.m_margin;
+	// classify points on other triangle
+	btScalar dis0 = bt_distance_point_plane(m_plane, other.m_vertices[0]) - total_margin;
+
+	btScalar dis1 = bt_distance_point_plane(m_plane, other.m_vertices[1]) - total_margin;
+
+	btScalar dis2 = bt_distance_point_plane(m_plane, other.m_vertices[2]) - total_margin;
+
+	if (dis0 > 0.0f && dis1 > 0.0f && dis2 > 0.0f) return false;
+
+	// classify points on this triangle
+	dis0 = bt_distance_point_plane(other.m_plane, m_vertices[0]) - total_margin;
+
+	dis1 = bt_distance_point_plane(other.m_plane, m_vertices[1]) - total_margin;
+
+	dis2 = bt_distance_point_plane(other.m_plane, m_vertices[2]) - total_margin;
+
+	if (dis0 > 0.0f && dis1 > 0.0f && dis2 > 0.0f) return false;
+
+	return true;
+}
+
+int btPrimitiveTriangle::clip_triangle(btPrimitiveTriangle& other, btVector3* clipped_points)
+{
+	// edge 0
+
+	btVector3 temp_points[MAX_TRI_CLIPPING];
+
+	btVector4 edgeplane;
+
+	get_edge_plane(0, edgeplane);
+
+	int clipped_count = bt_plane_clip_triangle(
+		edgeplane, other.m_vertices[0], other.m_vertices[1], other.m_vertices[2], temp_points);
+
+	if (clipped_count == 0) return 0;
+
+	btVector3 temp_points1[MAX_TRI_CLIPPING];
+
+	// edge 1
+	get_edge_plane(1, edgeplane);
+
+	clipped_count = bt_plane_clip_polygon(edgeplane, temp_points, clipped_count, temp_points1);
+
+	if (clipped_count == 0) return 0;
+
+	// edge 2
+	get_edge_plane(2, edgeplane);
+
+	clipped_count = bt_plane_clip_polygon(
+		edgeplane, temp_points1, clipped_count, clipped_points);
+
+	return clipped_count;
+}
+
+bool btPrimitiveTriangle::find_triangle_collision_clip_method(btPrimitiveTriangle& other, GIM_TRIANGLE_CONTACT& contacts)
+{
+	btScalar margin = m_margin + other.m_margin;
+
+	btVector3 clipped_points[MAX_TRI_CLIPPING];
+	int clipped_count;
+	//create planes
+	// plane v vs U points
+
+	GIM_TRIANGLE_CONTACT contacts1;
+
+	contacts1.m_separating_normal = m_plane;
+
+	clipped_count = clip_triangle(other, clipped_points);
+
+	if (clipped_count == 0)
+	{
+		return false;  //Reject
+	}
+
+	//find most deep interval face1
+	contacts1.merge_points(contacts1.m_separating_normal, margin, clipped_points, clipped_count);
+	if (contacts1.m_point_count == 0) return false;  // too far
+	//Normal pointing to this triangle
+	contacts1.m_separating_normal *= -1.f;
+
+	//Clip tri1 by tri2 edges
+	GIM_TRIANGLE_CONTACT contacts2;
+	contacts2.m_separating_normal = other.m_plane;
+
+	clipped_count = other.clip_triangle(*this, clipped_points);
+
+	if (clipped_count == 0)
+	{
+		return false;  //Reject
+	}
+
+	//find most deep interval face1
+	contacts2.merge_points(contacts2.m_separating_normal, margin, clipped_points, clipped_count);
+	if (contacts2.m_point_count == 0) return false;  // too far
+
+	////check most dir for contacts
+	if (contacts2.m_penetration_depth < contacts1.m_penetration_depth)
+	{
+		contacts.copy_from(contacts2);
+	}
+	else
+	{
+		contacts.copy_from(contacts1);
+	}
+	return true;
+}
+
+///class btTriangleShapeEx: public btTriangleShape
+
+bool btTriangleShapeEx::overlap_test_conservative(const btTriangleShapeEx& other)
+{
+	btScalar total_margin = getMargin() + other.getMargin();
+
+	btVector4 plane0;
+	buildTriPlane(plane0);
+	btVector4 plane1;
+	other.buildTriPlane(plane1);
+
+	// classify points on other triangle
+	btScalar dis0 = bt_distance_point_plane(plane0, other.m_vertices1[0]) - total_margin;
+
+	btScalar dis1 = bt_distance_point_plane(plane0, other.m_vertices1[1]) - total_margin;
+
+	btScalar dis2 = bt_distance_point_plane(plane0, other.m_vertices1[2]) - total_margin;
+
+	if (dis0 > 0.0f && dis1 > 0.0f && dis2 > 0.0f) return false;
+
+	// classify points on this triangle
+	dis0 = bt_distance_point_plane(plane1, m_vertices1[0]) - total_margin;
+
+	dis1 = bt_distance_point_plane(plane1, m_vertices1[1]) - total_margin;
+
+	dis2 = bt_distance_point_plane(plane1, m_vertices1[2]) - total_margin;
+
+	if (dis0 > 0.0f && dis1 > 0.0f && dis2 > 0.0f) return false;
+
+	return true;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.h
new file mode 100644
index 0000000..568a1ce
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/btTriangleShapeEx.h
@@ -0,0 +1,169 @@
+/*! \file btGImpactShape.h
+\author Francisco Leon Najera
+*/
+/*
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef GIMPACT_TRIANGLE_SHAPE_EX_H
+#define GIMPACT_TRIANGLE_SHAPE_EX_H
+
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "btBoxCollision.h"
+#include "btClipPolygon.h"
+#include "btGeometryOperations.h"
+
+#define MAX_TRI_CLIPPING 16
+
+//! Structure for collision
+struct GIM_TRIANGLE_CONTACT
+{
+	btScalar m_penetration_depth;
+	int m_point_count;
+	btVector4 m_separating_normal;
+	btVector3 m_points[MAX_TRI_CLIPPING];
+
+	SIMD_FORCE_INLINE void copy_from(const GIM_TRIANGLE_CONTACT& other)
+	{
+		m_penetration_depth = other.m_penetration_depth;
+		m_separating_normal = other.m_separating_normal;
+		m_point_count = other.m_point_count;
+		int i = m_point_count;
+		while (i--)
+		{
+			m_points[i] = other.m_points[i];
+		}
+	}
+
+	GIM_TRIANGLE_CONTACT()
+	{
+	}
+
+	GIM_TRIANGLE_CONTACT(const GIM_TRIANGLE_CONTACT& other)
+	{
+		copy_from(other);
+	}
+
+	//! classify points that are closer
+	void merge_points(const btVector4& plane,
+					  btScalar margin, const btVector3* points, int point_count);
+};
+
+class btPrimitiveTriangle
+{
+public:
+	btVector3 m_vertices[3];
+	btVector4 m_plane;
+	btScalar m_margin;
+	btScalar m_dummy;
+	btPrimitiveTriangle() : m_margin(0.01f)
+	{
+	}
+
+	SIMD_FORCE_INLINE void buildTriPlane()
+	{
+		btVector3 normal = (m_vertices[1] - m_vertices[0]).cross(m_vertices[2] - m_vertices[0]);
+		normal.normalize();
+		m_plane.setValue(normal[0], normal[1], normal[2], m_vertices[0].dot(normal));
+	}
+
+	//! Test if triangles could collide
+	bool overlap_test_conservative(const btPrimitiveTriangle& other);
+
+	//! Calcs the plane which is paralele to the edge and perpendicular to the triangle plane
+	/*!
+	\pre this triangle must have its plane calculated.
+	*/
+	SIMD_FORCE_INLINE void get_edge_plane(int edge_index, btVector4& plane) const
+	{
+		const btVector3& e0 = m_vertices[edge_index];
+		const btVector3& e1 = m_vertices[(edge_index + 1) % 3];
+		bt_edge_plane(e0, e1, m_plane, plane);
+	}
+
+	void applyTransform(const btTransform& t)
+	{
+		m_vertices[0] = t(m_vertices[0]);
+		m_vertices[1] = t(m_vertices[1]);
+		m_vertices[2] = t(m_vertices[2]);
+	}
+
+	//! Clips the triangle against this
+	/*!
+	\pre clipped_points must have MAX_TRI_CLIPPING size, and this triangle must have its plane calculated.
+	\return the number of clipped points
+	*/
+	int clip_triangle(btPrimitiveTriangle& other, btVector3* clipped_points);
+
+	//! Find collision using the clipping method
+	/*!
+	\pre this triangle and other must have their triangles calculated
+	*/
+	bool find_triangle_collision_clip_method(btPrimitiveTriangle& other, GIM_TRIANGLE_CONTACT& contacts);
+};
+
+//! Helper class for colliding Bullet Triangle Shapes
+/*!
+This class implements a better getAabb method than the previous btTriangleShape class
+*/
+class btTriangleShapeEx : public btTriangleShape
+{
+public:
+	btTriangleShapeEx() : btTriangleShape(btVector3(0, 0, 0), btVector3(0, 0, 0), btVector3(0, 0, 0))
+	{
+	}
+
+	btTriangleShapeEx(const btVector3& p0, const btVector3& p1, const btVector3& p2) : btTriangleShape(p0, p1, p2)
+	{
+	}
+
+	btTriangleShapeEx(const btTriangleShapeEx& other) : btTriangleShape(other.m_vertices1[0], other.m_vertices1[1], other.m_vertices1[2])
+	{
+	}
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		btVector3 tv0 = t(m_vertices1[0]);
+		btVector3 tv1 = t(m_vertices1[1]);
+		btVector3 tv2 = t(m_vertices1[2]);
+
+		btAABB trianglebox(tv0, tv1, tv2, m_collisionMargin);
+		aabbMin = trianglebox.m_min;
+		aabbMax = trianglebox.m_max;
+	}
+
+	void applyTransform(const btTransform& t)
+	{
+		m_vertices1[0] = t(m_vertices1[0]);
+		m_vertices1[1] = t(m_vertices1[1]);
+		m_vertices1[2] = t(m_vertices1[2]);
+	}
+
+	SIMD_FORCE_INLINE void buildTriPlane(btVector4& plane) const
+	{
+		btVector3 normal = (m_vertices1[1] - m_vertices1[0]).cross(m_vertices1[2] - m_vertices1[0]);
+		normal.normalize();
+		plane.setValue(normal[0], normal[1], normal[2], m_vertices1[0].dot(normal));
+	}
+
+	bool overlap_test_conservative(const btTriangleShapeEx& other);
+};
+
+#endif  //GIMPACT_TRIANGLE_MESH_SHAPE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_array.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_array.h
new file mode 100644
index 0000000..fc2dc38
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_array.h
@@ -0,0 +1,318 @@
+#ifndef GIM_ARRAY_H_INCLUDED
+#define GIM_ARRAY_H_INCLUDED
+/*! \file gim_array.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_memory.h"
+
+#define GIM_ARRAY_GROW_INCREMENT 2
+#define GIM_ARRAY_GROW_FACTOR 2
+
+//!	Very simple array container with fast access and simd memory
+template <typename T>
+class gim_array
+{
+public:
+	//! properties
+	//!@{
+	T* m_data;
+	GUINT m_size;
+	GUINT m_allocated_size;
+	//!@}
+	//! protected operations
+	//!@{
+
+	inline void destroyData()
+	{
+		m_allocated_size = 0;
+		if (m_data == NULL) return;
+		gim_free(m_data);
+		m_data = NULL;
+	}
+
+	inline bool resizeData(GUINT newsize)
+	{
+		if (newsize == 0)
+		{
+			destroyData();
+			return true;
+		}
+
+		if (m_size > 0)
+		{
+			m_data = (T*)gim_realloc(m_data, m_size * sizeof(T), newsize * sizeof(T));
+		}
+		else
+		{
+			m_data = (T*)gim_alloc(newsize * sizeof(T));
+		}
+		m_allocated_size = newsize;
+		return true;
+	}
+
+	inline bool growingCheck()
+	{
+		if (m_allocated_size <= m_size)
+		{
+			GUINT requestsize = m_size;
+			m_size = m_allocated_size;
+			if (resizeData((requestsize + GIM_ARRAY_GROW_INCREMENT) * GIM_ARRAY_GROW_FACTOR) == false) return false;
+		}
+		return true;
+	}
+
+	//!@}
+	//! public operations
+	//!@{
+	inline bool reserve(GUINT size)
+	{
+		if (m_allocated_size >= size) return false;
+		return resizeData(size);
+	}
+
+	inline void clear_range(GUINT start_range)
+	{
+		while (m_size > start_range)
+		{
+			m_data[--m_size].~T();
+		}
+	}
+
+	inline void clear()
+	{
+		if (m_size == 0) return;
+		clear_range(0);
+	}
+
+	inline void clear_memory()
+	{
+		clear();
+		destroyData();
+	}
+
+	gim_array()
+	{
+		m_data = 0;
+		m_size = 0;
+		m_allocated_size = 0;
+	}
+
+	gim_array(GUINT reservesize)
+	{
+		m_data = 0;
+		m_size = 0;
+
+		m_allocated_size = 0;
+		reserve(reservesize);
+	}
+
+	~gim_array()
+	{
+		clear_memory();
+	}
+
+	inline GUINT size() const
+	{
+		return m_size;
+	}
+
+	inline GUINT max_size() const
+	{
+		return m_allocated_size;
+	}
+
+	inline T& operator[](size_t i)
+	{
+		return m_data[i];
+	}
+	inline const T& operator[](size_t i) const
+	{
+		return m_data[i];
+	}
+
+	inline T* pointer() { return m_data; }
+	inline const T* pointer() const
+	{
+		return m_data;
+	}
+
+	inline T* get_pointer_at(GUINT i)
+	{
+		return m_data + i;
+	}
+
+	inline const T* get_pointer_at(GUINT i) const
+	{
+		return m_data + i;
+	}
+
+	inline T& at(GUINT i)
+	{
+		return m_data[i];
+	}
+
+	inline const T& at(GUINT i) const
+	{
+		return m_data[i];
+	}
+
+	inline T& front()
+	{
+		return *m_data;
+	}
+
+	inline const T& front() const
+	{
+		return *m_data;
+	}
+
+	inline T& back()
+	{
+		return m_data[m_size - 1];
+	}
+
+	inline const T& back() const
+	{
+		return m_data[m_size - 1];
+	}
+
+	inline void swap(GUINT i, GUINT j)
+	{
+		gim_swap_elements(m_data, i, j);
+	}
+
+	inline void push_back(const T& obj)
+	{
+		this->growingCheck();
+		m_data[m_size] = obj;
+		m_size++;
+	}
+
+	//!Simply increase the m_size, doesn't call the new element constructor
+	inline void push_back_mem()
+	{
+		this->growingCheck();
+		m_size++;
+	}
+
+	inline void push_back_memcpy(const T& obj)
+	{
+		this->growingCheck();
+		gim_simd_memcpy(&m_data[m_size], &obj, sizeof(T));
+		m_size++;
+	}
+
+	inline void pop_back()
+	{
+		m_size--;
+		m_data[m_size].~T();
+	}
+
+	//!Simply decrease the m_size, doesn't call the deleted element destructor
+	inline void pop_back_mem()
+	{
+		m_size--;
+	}
+
+	//! fast erase
+	inline void erase(GUINT index)
+	{
+		if (index < m_size - 1)
+		{
+			swap(index, m_size - 1);
+		}
+		pop_back();
+	}
+
+	inline void erase_sorted_mem(GUINT index)
+	{
+		m_size--;
+		for (GUINT i = index; i < m_size; i++)
+		{
+			gim_simd_memcpy(m_data + i, m_data + i + 1, sizeof(T));
+		}
+	}
+
+	inline void erase_sorted(GUINT index)
+	{
+		m_data[index].~T();
+		erase_sorted_mem(index);
+	}
+
+	inline void insert_mem(GUINT index)
+	{
+		this->growingCheck();
+		for (GUINT i = m_size; i > index; i--)
+		{
+			gim_simd_memcpy(m_data + i, m_data + i - 1, sizeof(T));
+		}
+		m_size++;
+	}
+
+	inline void insert(const T& obj, GUINT index)
+	{
+		insert_mem(index);
+		m_data[index] = obj;
+	}
+
+	inline void resize(GUINT size, bool call_constructor = true, const T& fillData = T())
+	{
+		if (size > m_size)
+		{
+			reserve(size);
+			if (call_constructor)
+			{
+				while (m_size < size)
+				{
+					m_data[m_size] = fillData;
+					m_size++;
+				}
+			}
+			else
+			{
+				m_size = size;
+			}
+		}
+		else if (size < m_size)
+		{
+			if (call_constructor) clear_range(size);
+			m_size = size;
+		}
+	}
+
+	inline void refit()
+	{
+		resizeData(m_size);
+	}
+};
+
+#endif  // GIM_CONTAINERS_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
new file mode 100644
index 0000000..7ab7836
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
@@ -0,0 +1,536 @@
+#ifndef GIM_BASIC_GEOMETRY_OPERATIONS_H_INCLUDED
+#define GIM_BASIC_GEOMETRY_OPERATIONS_H_INCLUDED
+
+/*! \file gim_basic_geometry_operations.h
+*\author Francisco Leon Najera
+type independant geometry routines
+
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_linear_math.h"
+
+#ifndef PLANEDIREPSILON
+#define PLANEDIREPSILON 0.0000001f
+#endif
+
+#ifndef PARALELENORMALS
+#define PARALELENORMALS 0.000001f
+#endif
+
+#define TRIANGLE_NORMAL(v1, v2, v3, n) \
+	{                                  \
+		vec3f _dif1, _dif2;            \
+		VEC_DIFF(_dif1, v2, v1);       \
+		VEC_DIFF(_dif2, v3, v1);       \
+		VEC_CROSS(n, _dif1, _dif2);    \
+		VEC_NORMALIZE(n);              \
+	}
+
+#define TRIANGLE_NORMAL_FAST(v1, v2, v3, n) \
+	{                                       \
+		vec3f _dif1, _dif2;                 \
+		VEC_DIFF(_dif1, v2, v1);            \
+		VEC_DIFF(_dif2, v3, v1);            \
+		VEC_CROSS(n, _dif1, _dif2);         \
+	}
+
+/// plane is a vec4f
+#define TRIANGLE_PLANE(v1, v2, v3, plane)   \
+	{                                       \
+		TRIANGLE_NORMAL(v1, v2, v3, plane); \
+		plane[3] = VEC_DOT(v1, plane);      \
+	}
+
+/// plane is a vec4f
+#define TRIANGLE_PLANE_FAST(v1, v2, v3, plane)   \
+	{                                            \
+		TRIANGLE_NORMAL_FAST(v1, v2, v3, plane); \
+		plane[3] = VEC_DOT(v1, plane);           \
+	}
+
+/// Calc a plane from an edge an a normal. plane is a vec4f
+#define EDGE_PLANE(e1, e2, n, plane)   \
+	{                                  \
+		vec3f _dif;                    \
+		VEC_DIFF(_dif, e2, e1);        \
+		VEC_CROSS(plane, _dif, n);     \
+		VEC_NORMALIZE(plane);          \
+		plane[3] = VEC_DOT(e1, plane); \
+	}
+
+#define DISTANCE_PLANE_POINT(plane, point) (VEC_DOT(plane, point) - plane[3])
+
+#define PROJECT_POINT_PLANE(point, plane, projected) \
+	{                                                \
+		GREAL _dis;                                  \
+		_dis = DISTANCE_PLANE_POINT(plane, point);   \
+		VEC_SCALE(projected, -_dis, plane);          \
+		VEC_SUM(projected, projected, point);        \
+	}
+
+//! Verifies if a point is in the plane hull
+template <typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE bool POINT_IN_HULL(
+	const CLASS_POINT &point, const CLASS_PLANE *planes, GUINT plane_count)
+{
+	GREAL _dis;
+	for (GUINT _i = 0; _i < plane_count; ++_i)
+	{
+		_dis = DISTANCE_PLANE_POINT(planes[_i], point);
+		if (_dis > 0.0f) return false;
+	}
+	return true;
+}
+
+template <typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE void PLANE_CLIP_SEGMENT(
+	const CLASS_POINT &s1,
+	const CLASS_POINT &s2, const CLASS_PLANE &plane, CLASS_POINT &clipped)
+{
+	GREAL _dis1, _dis2;
+	_dis1 = DISTANCE_PLANE_POINT(plane, s1);
+	VEC_DIFF(clipped, s2, s1);
+	_dis2 = VEC_DOT(clipped, plane);
+	VEC_SCALE(clipped, -_dis1 / _dis2, clipped);
+	VEC_SUM(clipped, clipped, s1);
+}
+
+enum ePLANE_INTERSECTION_TYPE
+{
+	G_BACK_PLANE = 0,
+	G_COLLIDE_PLANE,
+	G_FRONT_PLANE
+};
+
+enum eLINE_PLANE_INTERSECTION_TYPE
+{
+	G_FRONT_PLANE_S1 = 0,
+	G_FRONT_PLANE_S2,
+	G_BACK_PLANE_S1,
+	G_BACK_PLANE_S2,
+	G_COLLIDE_PLANE_S1,
+	G_COLLIDE_PLANE_S2
+};
+
+//! Confirms if the plane intersect the edge or nor
+/*!
+intersection type must have the following values
+<ul>
+<li> 0 : Segment in front of plane, s1 closest
+<li> 1 : Segment in front of plane, s2 closest
+<li> 2 : Segment in back of plane, s1 closest
+<li> 3 : Segment in back of plane, s2 closest
+<li> 4 : Segment collides plane, s1 in back
+<li> 5 : Segment collides plane, s2 in back
+</ul>
+*/
+
+template <typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE eLINE_PLANE_INTERSECTION_TYPE PLANE_CLIP_SEGMENT2(
+	const CLASS_POINT &s1,
+	const CLASS_POINT &s2,
+	const CLASS_PLANE &plane, CLASS_POINT &clipped)
+{
+	GREAL _dis1 = DISTANCE_PLANE_POINT(plane, s1);
+	GREAL _dis2 = DISTANCE_PLANE_POINT(plane, s2);
+	if (_dis1 > -G_EPSILON && _dis2 > -G_EPSILON)
+	{
+		if (_dis1 < _dis2) return G_FRONT_PLANE_S1;
+		return G_FRONT_PLANE_S2;
+	}
+	else if (_dis1 < G_EPSILON && _dis2 < G_EPSILON)
+	{
+		if (_dis1 > _dis2) return G_BACK_PLANE_S1;
+		return G_BACK_PLANE_S2;
+	}
+
+	VEC_DIFF(clipped, s2, s1);
+	_dis2 = VEC_DOT(clipped, plane);
+	VEC_SCALE(clipped, -_dis1 / _dis2, clipped);
+	VEC_SUM(clipped, clipped, s1);
+	if (_dis1 < _dis2) return G_COLLIDE_PLANE_S1;
+	return G_COLLIDE_PLANE_S2;
+}
+
+//! Confirms if the plane intersect the edge or not
+/*!
+clipped1 and clipped2 are the vertices behind the plane.
+clipped1 is the closest
+
+intersection_type must have the following values
+<ul>
+<li> 0 : Segment in front of plane, s1 closest
+<li> 1 : Segment in front of plane, s2 closest
+<li> 2 : Segment in back of plane, s1 closest
+<li> 3 : Segment in back of plane, s2 closest
+<li> 4 : Segment collides plane, s1 in back
+<li> 5 : Segment collides plane, s2 in back
+</ul>
+*/
+template <typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE eLINE_PLANE_INTERSECTION_TYPE PLANE_CLIP_SEGMENT_CLOSEST(
+	const CLASS_POINT &s1,
+	const CLASS_POINT &s2,
+	const CLASS_PLANE &plane,
+	CLASS_POINT &clipped1, CLASS_POINT &clipped2)
+{
+	eLINE_PLANE_INTERSECTION_TYPE intersection_type = PLANE_CLIP_SEGMENT2(s1, s2, plane, clipped1);
+	switch (intersection_type)
+	{
+		case G_FRONT_PLANE_S1:
+			VEC_COPY(clipped1, s1);
+			VEC_COPY(clipped2, s2);
+			break;
+		case G_FRONT_PLANE_S2:
+			VEC_COPY(clipped1, s2);
+			VEC_COPY(clipped2, s1);
+			break;
+		case G_BACK_PLANE_S1:
+			VEC_COPY(clipped1, s1);
+			VEC_COPY(clipped2, s2);
+			break;
+		case G_BACK_PLANE_S2:
+			VEC_COPY(clipped1, s2);
+			VEC_COPY(clipped2, s1);
+			break;
+		case G_COLLIDE_PLANE_S1:
+			VEC_COPY(clipped2, s1);
+			break;
+		case G_COLLIDE_PLANE_S2:
+			VEC_COPY(clipped2, s2);
+			break;
+	}
+	return intersection_type;
+}
+
+//! Finds the 2 smallest cartesian coordinates of a plane normal
+#define PLANE_MINOR_AXES(plane, i0, i1) VEC_MINOR_AXES(plane, i0, i1)
+
+//! Ray plane collision in one way
+/*!
+Intersects plane in one way only. The ray must face the plane (normals must be in opossite directions).<br/>
+It uses the PLANEDIREPSILON constant.
+*/
+template <typename T, typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE bool RAY_PLANE_COLLISION(
+	const CLASS_PLANE &plane,
+	const CLASS_POINT &vDir,
+	const CLASS_POINT &vPoint,
+	CLASS_POINT &pout, T &tparam)
+{
+	GREAL _dis, _dotdir;
+	_dotdir = VEC_DOT(plane, vDir);
+	if (_dotdir < PLANEDIREPSILON)
+	{
+		return false;
+	}
+	_dis = DISTANCE_PLANE_POINT(plane, vPoint);
+	tparam = -_dis / _dotdir;
+	VEC_SCALE(pout, tparam, vDir);
+	VEC_SUM(pout, vPoint, pout);
+	return true;
+}
+
+//! line collision
+/*!
+*\return
+	-0  if the ray never intersects
+	-1 if the ray collides in front
+	-2 if the ray collides in back
+*/
+template <typename T, typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE GUINT LINE_PLANE_COLLISION(
+	const CLASS_PLANE &plane,
+	const CLASS_POINT &vDir,
+	const CLASS_POINT &vPoint,
+	CLASS_POINT &pout,
+	T &tparam,
+	T tmin, T tmax)
+{
+	GREAL _dis, _dotdir;
+	_dotdir = VEC_DOT(plane, vDir);
+	if (btFabs(_dotdir) < PLANEDIREPSILON)
+	{
+		tparam = tmax;
+		return 0;
+	}
+	_dis = DISTANCE_PLANE_POINT(plane, vPoint);
+	char returnvalue = _dis < 0.0f ? 2 : 1;
+	tparam = -_dis / _dotdir;
+
+	if (tparam < tmin)
+	{
+		returnvalue = 0;
+		tparam = tmin;
+	}
+	else if (tparam > tmax)
+	{
+		returnvalue = 0;
+		tparam = tmax;
+	}
+
+	VEC_SCALE(pout, tparam, vDir);
+	VEC_SUM(pout, vPoint, pout);
+	return returnvalue;
+}
+
+/*! \brief Returns the Ray on which 2 planes intersect if they do.
+    Written by Rodrigo Hernandez on ODE convex collision
+
+  \param p1 Plane 1
+  \param p2 Plane 2
+  \param p Contains the origin of the ray upon returning if planes intersect
+  \param d Contains the direction of the ray upon returning if planes intersect
+  \return true if the planes intersect, 0 if paralell.
+
+*/
+template <typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE bool INTERSECT_PLANES(
+	const CLASS_PLANE &p1,
+	const CLASS_PLANE &p2,
+	CLASS_POINT &p,
+	CLASS_POINT &d)
+{
+	VEC_CROSS(d, p1, p2);
+	GREAL denom = VEC_DOT(d, d);
+	if (GIM_IS_ZERO(denom)) return false;
+	vec3f _n;
+	_n[0] = p1[3] * p2[0] - p2[3] * p1[0];
+	_n[1] = p1[3] * p2[1] - p2[3] * p1[1];
+	_n[2] = p1[3] * p2[2] - p2[3] * p1[2];
+	VEC_CROSS(p, _n, d);
+	p[0] /= denom;
+	p[1] /= denom;
+	p[2] /= denom;
+	return true;
+}
+
+//***************** SEGMENT and LINE FUNCTIONS **********************************///
+
+/*! Finds the closest point(cp) to (v) on a segment (e1,e2)
+ */
+template <typename CLASS_POINT>
+SIMD_FORCE_INLINE void CLOSEST_POINT_ON_SEGMENT(
+	CLASS_POINT &cp, const CLASS_POINT &v,
+	const CLASS_POINT &e1, const CLASS_POINT &e2)
+{
+	vec3f _n;
+	VEC_DIFF(_n, e2, e1);
+	VEC_DIFF(cp, v, e1);
+	GREAL _scalar = VEC_DOT(cp, _n);
+	_scalar /= VEC_DOT(_n, _n);
+	if (_scalar < 0.0f)
+	{
+		VEC_COPY(cp, e1);
+	}
+	else if (_scalar > 1.0f)
+	{
+		VEC_COPY(cp, e2);
+	}
+	else
+	{
+		VEC_SCALE(cp, _scalar, _n);
+		VEC_SUM(cp, cp, e1);
+	}
+}
+
+/*! \brief Finds the line params where these lines intersect.
+
+\param dir1 Direction of line 1
+\param point1 Point of line 1
+\param dir2 Direction of line 2
+\param point2 Point of line 2
+\param t1 Result Parameter for line 1
+\param t2 Result Parameter for line 2
+\param dointersect  0  if the lines won't intersect, else 1
+
+*/
+template <typename T, typename CLASS_POINT>
+SIMD_FORCE_INLINE bool LINE_INTERSECTION_PARAMS(
+	const CLASS_POINT &dir1,
+	CLASS_POINT &point1,
+	const CLASS_POINT &dir2,
+	CLASS_POINT &point2,
+	T &t1, T &t2)
+{
+	GREAL det;
+	GREAL e1e1 = VEC_DOT(dir1, dir1);
+	GREAL e1e2 = VEC_DOT(dir1, dir2);
+	GREAL e2e2 = VEC_DOT(dir2, dir2);
+	vec3f p1p2;
+	VEC_DIFF(p1p2, point1, point2);
+	GREAL p1p2e1 = VEC_DOT(p1p2, dir1);
+	GREAL p1p2e2 = VEC_DOT(p1p2, dir2);
+	det = e1e2 * e1e2 - e1e1 * e2e2;
+	if (GIM_IS_ZERO(det)) return false;
+	t1 = (e1e2 * p1p2e2 - e2e2 * p1p2e1) / det;
+	t2 = (e1e1 * p1p2e2 - e1e2 * p1p2e1) / det;
+	return true;
+}
+
+//! Find closest points on segments
+template <typename CLASS_POINT>
+SIMD_FORCE_INLINE void SEGMENT_COLLISION(
+	const CLASS_POINT &vA1,
+	const CLASS_POINT &vA2,
+	const CLASS_POINT &vB1,
+	const CLASS_POINT &vB2,
+	CLASS_POINT &vPointA,
+	CLASS_POINT &vPointB)
+{
+	CLASS_POINT _AD, _BD, n;
+	vec4f _M;  //plane
+	VEC_DIFF(_AD, vA2, vA1);
+	VEC_DIFF(_BD, vB2, vB1);
+	VEC_CROSS(n, _AD, _BD);
+	GREAL _tp = VEC_DOT(n, n);
+	if (_tp < G_EPSILON)  //ARE PARALELE
+	{
+		//project B over A
+		bool invert_b_order = false;
+		_M[0] = VEC_DOT(vB1, _AD);
+		_M[1] = VEC_DOT(vB2, _AD);
+		if (_M[0] > _M[1])
+		{
+			invert_b_order = true;
+			GIM_SWAP_NUMBERS(_M[0], _M[1]);
+		}
+		_M[2] = VEC_DOT(vA1, _AD);
+		_M[3] = VEC_DOT(vA2, _AD);
+		//mid points
+		n[0] = (_M[0] + _M[1]) * 0.5f;
+		n[1] = (_M[2] + _M[3]) * 0.5f;
+
+		if (n[0] < n[1])
+		{
+			if (_M[1] < _M[2])
+			{
+				vPointB = invert_b_order ? vB1 : vB2;
+				vPointA = vA1;
+			}
+			else if (_M[1] < _M[3])
+			{
+				vPointB = invert_b_order ? vB1 : vB2;
+				CLOSEST_POINT_ON_SEGMENT(vPointA, vPointB, vA1, vA2);
+			}
+			else
+			{
+				vPointA = vA2;
+				CLOSEST_POINT_ON_SEGMENT(vPointB, vPointA, vB1, vB2);
+			}
+		}
+		else
+		{
+			if (_M[3] < _M[0])
+			{
+				vPointB = invert_b_order ? vB2 : vB1;
+				vPointA = vA2;
+			}
+			else if (_M[3] < _M[1])
+			{
+				vPointA = vA2;
+				CLOSEST_POINT_ON_SEGMENT(vPointB, vPointA, vB1, vB2);
+			}
+			else
+			{
+				vPointB = invert_b_order ? vB1 : vB2;
+				CLOSEST_POINT_ON_SEGMENT(vPointA, vPointB, vA1, vA2);
+			}
+		}
+		return;
+	}
+
+	VEC_CROSS(_M, n, _BD);
+	_M[3] = VEC_DOT(_M, vB1);
+
+	LINE_PLANE_COLLISION(_M, _AD, vA1, vPointA, _tp, btScalar(0), btScalar(1));
+	/*Closest point on segment*/
+	VEC_DIFF(vPointB, vPointA, vB1);
+	_tp = VEC_DOT(vPointB, _BD);
+	_tp /= VEC_DOT(_BD, _BD);
+	_tp = GIM_CLAMP(_tp, 0.0f, 1.0f);
+	VEC_SCALE(vPointB, _tp, _BD);
+	VEC_SUM(vPointB, vPointB, vB1);
+}
+
+//! Line box intersection in one dimension
+/*!
+
+*\param pos Position of the ray
+*\param dir Projection of the Direction of the ray
+*\param bmin Minimum bound of the box
+*\param bmax Maximum bound of the box
+*\param tfirst the minimum projection. Assign to 0 at first.
+*\param tlast the maximum projection. Assign to INFINITY at first.
+*\return true if there is an intersection.
+*/
+template <typename T>
+SIMD_FORCE_INLINE bool BOX_AXIS_INTERSECT(T pos, T dir, T bmin, T bmax, T &tfirst, T &tlast)
+{
+	if (GIM_IS_ZERO(dir))
+	{
+		return !(pos < bmin || pos > bmax);
+	}
+	GREAL a0 = (bmin - pos) / dir;
+	GREAL a1 = (bmax - pos) / dir;
+	if (a0 > a1) GIM_SWAP_NUMBERS(a0, a1);
+	tfirst = GIM_MAX(a0, tfirst);
+	tlast = GIM_MIN(a1, tlast);
+	if (tlast < tfirst) return false;
+	return true;
+}
+
+//! Sorts 3 componets
+template <typename T>
+SIMD_FORCE_INLINE void SORT_3_INDICES(
+	const T *values,
+	GUINT *order_indices)
+{
+	//get minimum
+	order_indices[0] = values[0] < values[1] ? (values[0] < values[2] ? 0 : 2) : (values[1] < values[2] ? 1 : 2);
+
+	//get second and third
+	GUINT i0 = (order_indices[0] + 1) % 3;
+	GUINT i1 = (i0 + 1) % 3;
+
+	if (values[i0] < values[i1])
+	{
+		order_indices[1] = i0;
+		order_indices[2] = i1;
+	}
+	else
+	{
+		order_indices[1] = i1;
+		order_indices[2] = i0;
+	}
+}
+
+#endif  // GIM_VECTOR_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_bitset.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_bitset.h
new file mode 100644
index 0000000..c1fb41a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_bitset.h
@@ -0,0 +1,117 @@
+#ifndef GIM_BITSET_H_INCLUDED
+#define GIM_BITSET_H_INCLUDED
+/*! \file gim_bitset.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_array.h"
+
+#define GUINT_BIT_COUNT 32
+#define GUINT_EXPONENT 5
+
+class gim_bitset
+{
+public:
+	gim_array<GUINT> m_container;
+
+	gim_bitset()
+	{
+	}
+
+	gim_bitset(GUINT bits_count)
+	{
+		resize(bits_count);
+	}
+
+	~gim_bitset()
+	{
+	}
+
+	inline bool resize(GUINT newsize)
+	{
+		GUINT oldsize = m_container.size();
+		m_container.resize(newsize / GUINT_BIT_COUNT + 1, false);
+		while (oldsize < m_container.size())
+		{
+			m_container[oldsize] = 0;
+		}
+		return true;
+	}
+
+	inline GUINT size()
+	{
+		return m_container.size() * GUINT_BIT_COUNT;
+	}
+
+	inline void set_all()
+	{
+		for (GUINT i = 0; i < m_container.size(); ++i)
+		{
+			m_container[i] = 0xffffffff;
+		}
+	}
+
+	inline void clear_all()
+	{
+		for (GUINT i = 0; i < m_container.size(); ++i)
+		{
+			m_container[i] = 0;
+		}
+	}
+
+	inline void set(GUINT bit_index)
+	{
+		if (bit_index >= size())
+		{
+			resize(bit_index);
+		}
+		m_container[bit_index >> GUINT_EXPONENT] |= (1 << (bit_index & (GUINT_BIT_COUNT - 1)));
+	}
+
+	///Return 0 or 1
+	inline char get(GUINT bit_index)
+	{
+		if (bit_index >= size())
+		{
+			return 0;
+		}
+		char value = m_container[bit_index >> GUINT_EXPONENT] &
+					 (1 << (bit_index & (GUINT_BIT_COUNT - 1)));
+		return value;
+	}
+
+	inline void clear(GUINT bit_index)
+	{
+		m_container[bit_index >> GUINT_EXPONENT] &= ~(1 << (bit_index & (GUINT_BIT_COUNT - 1)));
+	}
+};
+
+#endif  // GIM_CONTAINERS_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_collision.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_collision.h
new file mode 100644
index 0000000..9f7cbe7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_collision.h
@@ -0,0 +1,578 @@
+#ifndef GIM_BOX_COLLISION_H_INCLUDED
+#define GIM_BOX_COLLISION_H_INCLUDED
+
+/*! \file gim_box_collision.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+#include "gim_basic_geometry_operations.h"
+#include "LinearMath/btTransform.h"
+
+//SIMD_FORCE_INLINE bool test_cross_edge_box(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, const btVector3 & extend,
+//	int dir_index0,
+//	int dir_index1
+//	int component_index0,
+//	int component_index1)
+//{
+//	// dir coords are -z and y
+//
+//	const btScalar dir0 = -edge[dir_index0];
+//	const btScalar dir1 = edge[dir_index1];
+//	btScalar pmin = pointa[component_index0]*dir0 + pointa[component_index1]*dir1;
+//	btScalar pmax = pointb[component_index0]*dir0 + pointb[component_index1]*dir1;
+//	//find minmax
+//	if(pmin>pmax)
+//	{
+//		GIM_SWAP_NUMBERS(pmin,pmax);
+//	}
+//	//find extends
+//	const btScalar rad = extend[component_index0] * absolute_edge[dir_index0] +
+//					extend[component_index1] * absolute_edge[dir_index1];
+//
+//	if(pmin>rad || -rad>pmax) return false;
+//	return true;
+//}
+//
+//SIMD_FORCE_INLINE bool test_cross_edge_box_X_axis(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, btVector3 & extend)
+//{
+//
+//	return test_cross_edge_box(edge,absolute_edge,pointa,pointb,extend,2,1,1,2);
+//}
+//
+//
+//SIMD_FORCE_INLINE bool test_cross_edge_box_Y_axis(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, btVector3 & extend)
+//{
+//
+//	return test_cross_edge_box(edge,absolute_edge,pointa,pointb,extend,0,2,2,0);
+//}
+//
+//SIMD_FORCE_INLINE bool test_cross_edge_box_Z_axis(
+//	const btVector3 & edge,
+//	const btVector3 & absolute_edge,
+//	const btVector3 & pointa,
+//	const btVector3 & pointb, btVector3 & extend)
+//{
+//
+//	return test_cross_edge_box(edge,absolute_edge,pointa,pointb,extend,1,0,0,1);
+//}
+
+#ifndef TEST_CROSS_EDGE_BOX_MCR
+
+#define TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, i_dir_0, i_dir_1, i_comp_0, i_comp_1) \
+	{                                                                                                               \
+		const btScalar dir0 = -edge[i_dir_0];                                                                       \
+		const btScalar dir1 = edge[i_dir_1];                                                                        \
+		btScalar pmin = pointa[i_comp_0] * dir0 + pointa[i_comp_1] * dir1;                                          \
+		btScalar pmax = pointb[i_comp_0] * dir0 + pointb[i_comp_1] * dir1;                                          \
+		if (pmin > pmax)                                                                                            \
+		{                                                                                                           \
+			GIM_SWAP_NUMBERS(pmin, pmax);                                                                           \
+		}                                                                                                           \
+		const btScalar abs_dir0 = absolute_edge[i_dir_0];                                                           \
+		const btScalar abs_dir1 = absolute_edge[i_dir_1];                                                           \
+		const btScalar rad = _extend[i_comp_0] * abs_dir0 + _extend[i_comp_1] * abs_dir1;                           \
+		if (pmin > rad || -rad > pmax) return false;                                                                \
+	}
+
+#endif
+
+#define TEST_CROSS_EDGE_BOX_X_AXIS_MCR(edge, absolute_edge, pointa, pointb, _extend)       \
+	{                                                                                      \
+		TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, 2, 1, 1, 2); \
+	}
+
+#define TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(edge, absolute_edge, pointa, pointb, _extend)       \
+	{                                                                                      \
+		TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, 0, 2, 2, 0); \
+	}
+
+#define TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(edge, absolute_edge, pointa, pointb, _extend)       \
+	{                                                                                      \
+		TEST_CROSS_EDGE_BOX_MCR(edge, absolute_edge, pointa, pointb, _extend, 1, 0, 0, 1); \
+	}
+
+//!  Class for transforming a model1 to the space of model0
+class GIM_BOX_BOX_TRANSFORM_CACHE
+{
+public:
+	btVector3 m_T1to0;    //!< Transforms translation of model1 to model 0
+	btMatrix3x3 m_R1to0;  //!< Transforms Rotation of model1 to model 0, equal  to R0' * R1
+	btMatrix3x3 m_AR;     //!< Absolute value of m_R1to0
+
+	SIMD_FORCE_INLINE void calc_absolute_matrix()
+	{
+		static const btVector3 vepsi(1e-6f, 1e-6f, 1e-6f);
+		m_AR[0] = vepsi + m_R1to0[0].absolute();
+		m_AR[1] = vepsi + m_R1to0[1].absolute();
+		m_AR[2] = vepsi + m_R1to0[2].absolute();
+	}
+
+	GIM_BOX_BOX_TRANSFORM_CACHE()
+	{
+	}
+
+	GIM_BOX_BOX_TRANSFORM_CACHE(mat4f trans1_to_0)
+	{
+		COPY_MATRIX_3X3(m_R1to0, trans1_to_0)
+		MAT_GET_TRANSLATION(trans1_to_0, m_T1to0)
+		calc_absolute_matrix();
+	}
+
+	//! Calc the transformation relative  1 to 0. Inverts matrics by transposing
+	SIMD_FORCE_INLINE void calc_from_homogenic(const btTransform &trans0, const btTransform &trans1)
+	{
+		m_R1to0 = trans0.getBasis().transpose();
+		m_T1to0 = m_R1to0 * (-trans0.getOrigin());
+
+		m_T1to0 += m_R1to0 * trans1.getOrigin();
+		m_R1to0 *= trans1.getBasis();
+
+		calc_absolute_matrix();
+	}
+
+	//! Calcs the full invertion of the matrices. Useful for scaling matrices
+	SIMD_FORCE_INLINE void calc_from_full_invert(const btTransform &trans0, const btTransform &trans1)
+	{
+		m_R1to0 = trans0.getBasis().inverse();
+		m_T1to0 = m_R1to0 * (-trans0.getOrigin());
+
+		m_T1to0 += m_R1to0 * trans1.getOrigin();
+		m_R1to0 *= trans1.getBasis();
+
+		calc_absolute_matrix();
+	}
+
+	SIMD_FORCE_INLINE btVector3 transform(const btVector3 &point)
+	{
+		return point.dot3(m_R1to0[0], m_R1to0[1], m_R1to0[2]) + m_T1to0;
+	}
+};
+
+#ifndef BOX_PLANE_EPSILON
+#define BOX_PLANE_EPSILON 0.000001f
+#endif
+
+//! Axis aligned box
+class GIM_AABB
+{
+public:
+	btVector3 m_min;
+	btVector3 m_max;
+
+	GIM_AABB()
+	{
+	}
+
+	GIM_AABB(const btVector3 &V1,
+			 const btVector3 &V2,
+			 const btVector3 &V3)
+	{
+		m_min[0] = GIM_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = GIM_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = GIM_MIN3(V1[2], V2[2], V3[2]);
+
+		m_max[0] = GIM_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = GIM_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = GIM_MAX3(V1[2], V2[2], V3[2]);
+	}
+
+	GIM_AABB(const btVector3 &V1,
+			 const btVector3 &V2,
+			 const btVector3 &V3,
+			 GREAL margin)
+	{
+		m_min[0] = GIM_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = GIM_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = GIM_MIN3(V1[2], V2[2], V3[2]);
+
+		m_max[0] = GIM_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = GIM_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = GIM_MAX3(V1[2], V2[2], V3[2]);
+
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	GIM_AABB(const GIM_AABB &other) : m_min(other.m_min), m_max(other.m_max)
+	{
+	}
+
+	GIM_AABB(const GIM_AABB &other, btScalar margin) : m_min(other.m_min), m_max(other.m_max)
+	{
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	SIMD_FORCE_INLINE void invalidate()
+	{
+		m_min[0] = G_REAL_INFINITY;
+		m_min[1] = G_REAL_INFINITY;
+		m_min[2] = G_REAL_INFINITY;
+		m_max[0] = -G_REAL_INFINITY;
+		m_max[1] = -G_REAL_INFINITY;
+		m_max[2] = -G_REAL_INFINITY;
+	}
+
+	SIMD_FORCE_INLINE void increment_margin(btScalar margin)
+	{
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	SIMD_FORCE_INLINE void copy_with_margin(const GIM_AABB &other, btScalar margin)
+	{
+		m_min[0] = other.m_min[0] - margin;
+		m_min[1] = other.m_min[1] - margin;
+		m_min[2] = other.m_min[2] - margin;
+
+		m_max[0] = other.m_max[0] + margin;
+		m_max[1] = other.m_max[1] + margin;
+		m_max[2] = other.m_max[2] + margin;
+	}
+
+	template <typename CLASS_POINT>
+	SIMD_FORCE_INLINE void calc_from_triangle(
+		const CLASS_POINT &V1,
+		const CLASS_POINT &V2,
+		const CLASS_POINT &V3)
+	{
+		m_min[0] = GIM_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = GIM_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = GIM_MIN3(V1[2], V2[2], V3[2]);
+
+		m_max[0] = GIM_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = GIM_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = GIM_MAX3(V1[2], V2[2], V3[2]);
+	}
+
+	template <typename CLASS_POINT>
+	SIMD_FORCE_INLINE void calc_from_triangle_margin(
+		const CLASS_POINT &V1,
+		const CLASS_POINT &V2,
+		const CLASS_POINT &V3, btScalar margin)
+	{
+		m_min[0] = GIM_MIN3(V1[0], V2[0], V3[0]);
+		m_min[1] = GIM_MIN3(V1[1], V2[1], V3[1]);
+		m_min[2] = GIM_MIN3(V1[2], V2[2], V3[2]);
+
+		m_max[0] = GIM_MAX3(V1[0], V2[0], V3[0]);
+		m_max[1] = GIM_MAX3(V1[1], V2[1], V3[1]);
+		m_max[2] = GIM_MAX3(V1[2], V2[2], V3[2]);
+
+		m_min[0] -= margin;
+		m_min[1] -= margin;
+		m_min[2] -= margin;
+		m_max[0] += margin;
+		m_max[1] += margin;
+		m_max[2] += margin;
+	}
+
+	//! Apply a transform to an AABB
+	SIMD_FORCE_INLINE void appy_transform(const btTransform &trans)
+	{
+		btVector3 center = (m_max + m_min) * 0.5f;
+		btVector3 extends = m_max - center;
+		// Compute new center
+		center = trans(center);
+
+		btVector3 textends = extends.dot3(trans.getBasis().getRow(0).absolute(),
+										  trans.getBasis().getRow(1).absolute(),
+										  trans.getBasis().getRow(2).absolute());
+
+		m_min = center - textends;
+		m_max = center + textends;
+	}
+
+	//! Merges a Box
+	SIMD_FORCE_INLINE void merge(const GIM_AABB &box)
+	{
+		m_min[0] = GIM_MIN(m_min[0], box.m_min[0]);
+		m_min[1] = GIM_MIN(m_min[1], box.m_min[1]);
+		m_min[2] = GIM_MIN(m_min[2], box.m_min[2]);
+
+		m_max[0] = GIM_MAX(m_max[0], box.m_max[0]);
+		m_max[1] = GIM_MAX(m_max[1], box.m_max[1]);
+		m_max[2] = GIM_MAX(m_max[2], box.m_max[2]);
+	}
+
+	//! Merges a point
+	template <typename CLASS_POINT>
+	SIMD_FORCE_INLINE void merge_point(const CLASS_POINT &point)
+	{
+		m_min[0] = GIM_MIN(m_min[0], point[0]);
+		m_min[1] = GIM_MIN(m_min[1], point[1]);
+		m_min[2] = GIM_MIN(m_min[2], point[2]);
+
+		m_max[0] = GIM_MAX(m_max[0], point[0]);
+		m_max[1] = GIM_MAX(m_max[1], point[1]);
+		m_max[2] = GIM_MAX(m_max[2], point[2]);
+	}
+
+	//! Gets the extend and center
+	SIMD_FORCE_INLINE void get_center_extend(btVector3 &center, btVector3 &extend) const
+	{
+		center = (m_max + m_min) * 0.5f;
+		extend = m_max - center;
+	}
+
+	//! Finds the intersecting box between this box and the other.
+	SIMD_FORCE_INLINE void find_intersection(const GIM_AABB &other, GIM_AABB &intersection) const
+	{
+		intersection.m_min[0] = GIM_MAX(other.m_min[0], m_min[0]);
+		intersection.m_min[1] = GIM_MAX(other.m_min[1], m_min[1]);
+		intersection.m_min[2] = GIM_MAX(other.m_min[2], m_min[2]);
+
+		intersection.m_max[0] = GIM_MIN(other.m_max[0], m_max[0]);
+		intersection.m_max[1] = GIM_MIN(other.m_max[1], m_max[1]);
+		intersection.m_max[2] = GIM_MIN(other.m_max[2], m_max[2]);
+	}
+
+	SIMD_FORCE_INLINE bool has_collision(const GIM_AABB &other) const
+	{
+		if (m_min[0] > other.m_max[0] ||
+			m_max[0] < other.m_min[0] ||
+			m_min[1] > other.m_max[1] ||
+			m_max[1] < other.m_min[1] ||
+			m_min[2] > other.m_max[2] ||
+			m_max[2] < other.m_min[2])
+		{
+			return false;
+		}
+		return true;
+	}
+
+	/*! \brief Finds the Ray intersection parameter.
+	\param aabb Aligned box
+	\param vorigin A vec3f with the origin of the ray
+	\param vdir A vec3f with the direction of the ray
+	*/
+	SIMD_FORCE_INLINE bool collide_ray(const btVector3 &vorigin, const btVector3 &vdir)
+	{
+		btVector3 extents, center;
+		this->get_center_extend(center, extents);
+		;
+
+		btScalar Dx = vorigin[0] - center[0];
+		if (GIM_GREATER(Dx, extents[0]) && Dx * vdir[0] >= 0.0f) return false;
+		btScalar Dy = vorigin[1] - center[1];
+		if (GIM_GREATER(Dy, extents[1]) && Dy * vdir[1] >= 0.0f) return false;
+		btScalar Dz = vorigin[2] - center[2];
+		if (GIM_GREATER(Dz, extents[2]) && Dz * vdir[2] >= 0.0f) return false;
+
+		btScalar f = vdir[1] * Dz - vdir[2] * Dy;
+		if (btFabs(f) > extents[1] * btFabs(vdir[2]) + extents[2] * btFabs(vdir[1])) return false;
+		f = vdir[2] * Dx - vdir[0] * Dz;
+		if (btFabs(f) > extents[0] * btFabs(vdir[2]) + extents[2] * btFabs(vdir[0])) return false;
+		f = vdir[0] * Dy - vdir[1] * Dx;
+		if (btFabs(f) > extents[0] * btFabs(vdir[1]) + extents[1] * btFabs(vdir[0])) return false;
+		return true;
+	}
+
+	SIMD_FORCE_INLINE void projection_interval(const btVector3 &direction, btScalar &vmin, btScalar &vmax) const
+	{
+		btVector3 center = (m_max + m_min) * 0.5f;
+		btVector3 extend = m_max - center;
+
+		btScalar _fOrigin = direction.dot(center);
+		btScalar _fMaximumExtent = extend.dot(direction.absolute());
+		vmin = _fOrigin - _fMaximumExtent;
+		vmax = _fOrigin + _fMaximumExtent;
+	}
+
+	SIMD_FORCE_INLINE ePLANE_INTERSECTION_TYPE plane_classify(const btVector4 &plane) const
+	{
+		btScalar _fmin, _fmax;
+		this->projection_interval(plane, _fmin, _fmax);
+
+		if (plane[3] > _fmax + BOX_PLANE_EPSILON)
+		{
+			return G_BACK_PLANE;  // 0
+		}
+
+		if (plane[3] + BOX_PLANE_EPSILON >= _fmin)
+		{
+			return G_COLLIDE_PLANE;  //1
+		}
+		return G_FRONT_PLANE;  //2
+	}
+
+	SIMD_FORCE_INLINE bool overlapping_trans_conservative(const GIM_AABB &box, btTransform &trans1_to_0)
+	{
+		GIM_AABB tbox = box;
+		tbox.appy_transform(trans1_to_0);
+		return has_collision(tbox);
+	}
+
+	//! transcache is the transformation cache from box to this AABB
+	SIMD_FORCE_INLINE bool overlapping_trans_cache(
+		const GIM_AABB &box, const GIM_BOX_BOX_TRANSFORM_CACHE &transcache, bool fulltest)
+	{
+		//Taken from OPCODE
+		btVector3 ea, eb;  //extends
+		btVector3 ca, cb;  //extends
+		get_center_extend(ca, ea);
+		box.get_center_extend(cb, eb);
+
+		btVector3 T;
+		btScalar t, t2;
+		int i;
+
+		// Class I : A's basis vectors
+		for (i = 0; i < 3; i++)
+		{
+			T[i] = transcache.m_R1to0[i].dot(cb) + transcache.m_T1to0[i] - ca[i];
+			t = transcache.m_AR[i].dot(eb) + ea[i];
+			if (GIM_GREATER(T[i], t)) return false;
+		}
+		// Class II : B's basis vectors
+		for (i = 0; i < 3; i++)
+		{
+			t = MAT_DOT_COL(transcache.m_R1to0, T, i);
+			t2 = MAT_DOT_COL(transcache.m_AR, ea, i) + eb[i];
+			if (GIM_GREATER(t, t2)) return false;
+		}
+		// Class III : 9 cross products
+		if (fulltest)
+		{
+			int j, m, n, o, p, q, r;
+			for (i = 0; i < 3; i++)
+			{
+				m = (i + 1) % 3;
+				n = (i + 2) % 3;
+				o = i == 0 ? 1 : 0;
+				p = i == 2 ? 1 : 2;
+				for (j = 0; j < 3; j++)
+				{
+					q = j == 2 ? 1 : 2;
+					r = j == 0 ? 1 : 0;
+					t = T[n] * transcache.m_R1to0[m][j] - T[m] * transcache.m_R1to0[n][j];
+					t2 = ea[o] * transcache.m_AR[p][j] + ea[p] * transcache.m_AR[o][j] +
+						 eb[r] * transcache.m_AR[i][q] + eb[q] * transcache.m_AR[i][r];
+					if (GIM_GREATER(t, t2)) return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	//! Simple test for planes.
+	SIMD_FORCE_INLINE bool collide_plane(
+		const btVector4 &plane)
+	{
+		ePLANE_INTERSECTION_TYPE classify = plane_classify(plane);
+		return (classify == G_COLLIDE_PLANE);
+	}
+
+	//! test for a triangle, with edges
+	SIMD_FORCE_INLINE bool collide_triangle_exact(
+		const btVector3 &p1,
+		const btVector3 &p2,
+		const btVector3 &p3,
+		const btVector4 &triangle_plane)
+	{
+		if (!collide_plane(triangle_plane)) return false;
+
+		btVector3 center, extends;
+		this->get_center_extend(center, extends);
+
+		const btVector3 v1(p1 - center);
+		const btVector3 v2(p2 - center);
+		const btVector3 v3(p3 - center);
+
+		//First axis
+		btVector3 diff(v2 - v1);
+		btVector3 abs_diff = diff.absolute();
+		//Test With X axis
+		TEST_CROSS_EDGE_BOX_X_AXIS_MCR(diff, abs_diff, v1, v3, extends);
+		//Test With Y axis
+		TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(diff, abs_diff, v1, v3, extends);
+		//Test With Z axis
+		TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(diff, abs_diff, v1, v3, extends);
+
+		diff = v3 - v2;
+		abs_diff = diff.absolute();
+		//Test With X axis
+		TEST_CROSS_EDGE_BOX_X_AXIS_MCR(diff, abs_diff, v2, v1, extends);
+		//Test With Y axis
+		TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(diff, abs_diff, v2, v1, extends);
+		//Test With Z axis
+		TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(diff, abs_diff, v2, v1, extends);
+
+		diff = v1 - v3;
+		abs_diff = diff.absolute();
+		//Test With X axis
+		TEST_CROSS_EDGE_BOX_X_AXIS_MCR(diff, abs_diff, v3, v2, extends);
+		//Test With Y axis
+		TEST_CROSS_EDGE_BOX_Y_AXIS_MCR(diff, abs_diff, v3, v2, extends);
+		//Test With Z axis
+		TEST_CROSS_EDGE_BOX_Z_AXIS_MCR(diff, abs_diff, v3, v2, extends);
+
+		return true;
+	}
+};
+
+#ifndef BT_BOX_COLLISION_H_INCLUDED
+//! Compairison of transformation objects
+SIMD_FORCE_INLINE bool btCompareTransformsEqual(const btTransform &t1, const btTransform &t2)
+{
+	if (!(t1.getOrigin() == t2.getOrigin())) return false;
+
+	if (!(t1.getBasis().getRow(0) == t2.getBasis().getRow(0))) return false;
+	if (!(t1.getBasis().getRow(1) == t2.getBasis().getRow(1))) return false;
+	if (!(t1.getBasis().getRow(2) == t2.getBasis().getRow(2))) return false;
+	return true;
+}
+#endif
+
+#endif  // GIM_BOX_COLLISION_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_set.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_set.cpp
new file mode 100644
index 0000000..0c7a6b7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_set.cpp
@@ -0,0 +1,176 @@
+
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_box_set.h"
+
+GUINT GIM_BOX_TREE::_calc_splitting_axis(
+	gim_array<GIM_AABB_DATA>& primitive_boxes, GUINT startIndex, GUINT endIndex)
+{
+	GUINT i;
+
+	btVector3 means(btScalar(0.), btScalar(0.), btScalar(0.));
+	btVector3 variance(btScalar(0.), btScalar(0.), btScalar(0.));
+	GUINT numIndices = endIndex - startIndex;
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		means += center;
+	}
+	means *= (btScalar(1.) / (btScalar)numIndices);
+
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btVector3 center = btScalar(0.5) * (primitive_boxes[i].m_bound.m_max +
+											primitive_boxes[i].m_bound.m_min);
+		btVector3 diff2 = center - means;
+		diff2 = diff2 * diff2;
+		variance += diff2;
+	}
+	variance *= (btScalar(1.) / ((btScalar)numIndices - 1));
+
+	return variance.maxAxis();
+}
+
+GUINT GIM_BOX_TREE::_sort_and_calc_splitting_index(
+	gim_array<GIM_AABB_DATA>& primitive_boxes, GUINT startIndex,
+	GUINT endIndex, GUINT splitAxis)
+{
+	GUINT i;
+	GUINT splitIndex = startIndex;
+	GUINT numIndices = endIndex - startIndex;
+
+	// average of centers
+	btScalar splitValue = 0.0f;
+	for (i = startIndex; i < endIndex; i++)
+	{
+		splitValue += 0.5f * (primitive_boxes[i].m_bound.m_max[splitAxis] +
+							  primitive_boxes[i].m_bound.m_min[splitAxis]);
+	}
+	splitValue /= (btScalar)numIndices;
+
+	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
+	for (i = startIndex; i < endIndex; i++)
+	{
+		btScalar center = 0.5f * (primitive_boxes[i].m_bound.m_max[splitAxis] +
+								  primitive_boxes[i].m_bound.m_min[splitAxis]);
+		if (center > splitValue)
+		{
+			//swap
+			primitive_boxes.swap(i, splitIndex);
+			splitIndex++;
+		}
+	}
+
+	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
+	//otherwise the tree-building might fail due to stack-overflows in certain cases.
+	//unbalanced1 is unsafe: it can cause stack overflows
+	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
+
+	//unbalanced2 should work too: always use center (perfect balanced trees)
+	//bool unbalanced2 = true;
+
+	//this should be safe too:
+	GUINT rangeBalancedIndices = numIndices / 3;
+	bool unbalanced = ((splitIndex <= (startIndex + rangeBalancedIndices)) || (splitIndex >= (endIndex - 1 - rangeBalancedIndices)));
+
+	if (unbalanced)
+	{
+		splitIndex = startIndex + (numIndices >> 1);
+	}
+
+	btAssert(!((splitIndex == startIndex) || (splitIndex == (endIndex))));
+
+	return splitIndex;
+}
+
+void GIM_BOX_TREE::_build_sub_tree(gim_array<GIM_AABB_DATA>& primitive_boxes, GUINT startIndex, GUINT endIndex)
+{
+	GUINT current_index = m_num_nodes++;
+
+	btAssert((endIndex - startIndex) > 0);
+
+	if ((endIndex - startIndex) == 1)  //we got a leaf
+	{
+		m_node_array[current_index].m_left = 0;
+		m_node_array[current_index].m_right = 0;
+		m_node_array[current_index].m_escapeIndex = 0;
+
+		m_node_array[current_index].m_bound = primitive_boxes[startIndex].m_bound;
+		m_node_array[current_index].m_data = primitive_boxes[startIndex].m_data;
+		return;
+	}
+
+	//configure inner node
+
+	GUINT splitIndex;
+
+	//calc this node bounding box
+	m_node_array[current_index].m_bound.invalidate();
+	for (splitIndex = startIndex; splitIndex < endIndex; splitIndex++)
+	{
+		m_node_array[current_index].m_bound.merge(primitive_boxes[splitIndex].m_bound);
+	}
+
+	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+
+	//split axis
+	splitIndex = _calc_splitting_axis(primitive_boxes, startIndex, endIndex);
+
+	splitIndex = _sort_and_calc_splitting_index(
+		primitive_boxes, startIndex, endIndex, splitIndex);
+
+	//configure this inner node : the left node index
+	m_node_array[current_index].m_left = m_num_nodes;
+	//build left child tree
+	_build_sub_tree(primitive_boxes, startIndex, splitIndex);
+
+	//configure this inner node : the right node index
+	m_node_array[current_index].m_right = m_num_nodes;
+
+	//build right child tree
+	_build_sub_tree(primitive_boxes, splitIndex, endIndex);
+
+	//configure this inner node : the escape index
+	m_node_array[current_index].m_escapeIndex = m_num_nodes - current_index;
+}
+
+//! stackless build tree
+void GIM_BOX_TREE::build_tree(
+	gim_array<GIM_AABB_DATA>& primitive_boxes)
+{
+	// initialize node count to 0
+	m_num_nodes = 0;
+	// allocate nodes
+	m_node_array.resize(primitive_boxes.size() * 2);
+
+	_build_sub_tree(primitive_boxes, 0, primitive_boxes.size());
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_set.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_set.h
new file mode 100644
index 0000000..afc591d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_box_set.h
@@ -0,0 +1,640 @@
+#ifndef GIM_BOX_SET_H_INCLUDED
+#define GIM_BOX_SET_H_INCLUDED
+
+/*! \file gim_box_set.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_array.h"
+#include "gim_radixsort.h"
+#include "gim_box_collision.h"
+#include "gim_tri_collision.h"
+#include "gim_pair.h"
+
+//! A pairset array
+class gim_pair_set : public gim_array<GIM_PAIR>
+{
+public:
+	gim_pair_set() : gim_array<GIM_PAIR>(32)
+	{
+	}
+	inline void push_pair(GUINT index1, GUINT index2)
+	{
+		push_back(GIM_PAIR(index1, index2));
+	}
+
+	inline void push_pair_inv(GUINT index1, GUINT index2)
+	{
+		push_back(GIM_PAIR(index2, index1));
+	}
+};
+
+//! Prototype Base class for primitive classification
+/*!
+This class is a wrapper for primitive collections.
+This tells relevant info for the Bounding Box set classes, which take care of space classification.
+This class can manage Compound shapes and trimeshes, and if it is managing trimesh then the  Hierarchy Bounding Box classes will take advantage of primitive Vs Box overlapping tests for getting optimal results and less Per Box compairisons.
+*/
+class GIM_PRIMITIVE_MANAGER_PROTOTYPE
+{
+public:
+	virtual ~GIM_PRIMITIVE_MANAGER_PROTOTYPE() {}
+	//! determines if this manager consist on only triangles, which special case will be optimized
+	virtual bool is_trimesh() = 0;
+	virtual GUINT get_primitive_count() = 0;
+	virtual void get_primitive_box(GUINT prim_index, GIM_AABB& primbox) = 0;
+	virtual void get_primitive_triangle(GUINT prim_index, GIM_TRIANGLE& triangle) = 0;
+};
+
+struct GIM_AABB_DATA
+{
+	GIM_AABB m_bound;
+	GUINT m_data;
+};
+
+//! Node Structure for trees
+struct GIM_BOX_TREE_NODE
+{
+	GIM_AABB m_bound;
+	GUINT m_left;         //!< Left subtree
+	GUINT m_right;        //!< Right subtree
+	GUINT m_escapeIndex;  //!< Scape index for traversing
+	GUINT m_data;         //!< primitive index if apply
+
+	GIM_BOX_TREE_NODE()
+	{
+		m_left = 0;
+		m_right = 0;
+		m_escapeIndex = 0;
+		m_data = 0;
+	}
+
+	SIMD_FORCE_INLINE bool is_leaf_node() const
+	{
+		return (!m_left && !m_right);
+	}
+};
+
+//! Basic Box tree structure
+class GIM_BOX_TREE
+{
+protected:
+	GUINT m_num_nodes;
+	gim_array<GIM_BOX_TREE_NODE> m_node_array;
+
+protected:
+	GUINT _sort_and_calc_splitting_index(
+		gim_array<GIM_AABB_DATA>& primitive_boxes,
+		GUINT startIndex, GUINT endIndex, GUINT splitAxis);
+
+	GUINT _calc_splitting_axis(gim_array<GIM_AABB_DATA>& primitive_boxes, GUINT startIndex, GUINT endIndex);
+
+	void _build_sub_tree(gim_array<GIM_AABB_DATA>& primitive_boxes, GUINT startIndex, GUINT endIndex);
+
+public:
+	GIM_BOX_TREE()
+	{
+		m_num_nodes = 0;
+	}
+
+	//! prototype functions for box tree management
+	//!@{
+	void build_tree(gim_array<GIM_AABB_DATA>& primitive_boxes);
+
+	SIMD_FORCE_INLINE void clearNodes()
+	{
+		m_node_array.clear();
+		m_num_nodes = 0;
+	}
+
+	//! node count
+	SIMD_FORCE_INLINE GUINT getNodeCount() const
+	{
+		return m_num_nodes;
+	}
+
+	//! tells if the node is a leaf
+	SIMD_FORCE_INLINE bool isLeafNode(GUINT nodeindex) const
+	{
+		return m_node_array[nodeindex].is_leaf_node();
+	}
+
+	SIMD_FORCE_INLINE GUINT getNodeData(GUINT nodeindex) const
+	{
+		return m_node_array[nodeindex].m_data;
+	}
+
+	SIMD_FORCE_INLINE void getNodeBound(GUINT nodeindex, GIM_AABB& bound) const
+	{
+		bound = m_node_array[nodeindex].m_bound;
+	}
+
+	SIMD_FORCE_INLINE void setNodeBound(GUINT nodeindex, const GIM_AABB& bound)
+	{
+		m_node_array[nodeindex].m_bound = bound;
+	}
+
+	SIMD_FORCE_INLINE GUINT getLeftNodeIndex(GUINT nodeindex) const
+	{
+		return m_node_array[nodeindex].m_left;
+	}
+
+	SIMD_FORCE_INLINE GUINT getRightNodeIndex(GUINT nodeindex) const
+	{
+		return m_node_array[nodeindex].m_right;
+	}
+
+	SIMD_FORCE_INLINE GUINT getScapeNodeIndex(GUINT nodeindex) const
+	{
+		return m_node_array[nodeindex].m_escapeIndex;
+	}
+
+	//!@}
+};
+
+//! Generic Box Tree Template
+/*!
+This class offers an structure for managing a box tree of primitives.
+Requires a Primitive prototype (like GIM_PRIMITIVE_MANAGER_PROTOTYPE ) and
+a Box tree structure ( like GIM_BOX_TREE).
+*/
+template <typename _GIM_PRIMITIVE_MANAGER_PROTOTYPE, typename _GIM_BOX_TREE_PROTOTYPE>
+class GIM_BOX_TREE_TEMPLATE_SET
+{
+protected:
+	_GIM_PRIMITIVE_MANAGER_PROTOTYPE m_primitive_manager;
+	_GIM_BOX_TREE_PROTOTYPE m_box_tree;
+
+protected:
+	//stackless refit
+	SIMD_FORCE_INLINE void refit()
+	{
+		GUINT nodecount = getNodeCount();
+		while (nodecount--)
+		{
+			if (isLeafNode(nodecount))
+			{
+				GIM_AABB leafbox;
+				m_primitive_manager.get_primitive_box(getNodeData(nodecount), leafbox);
+				setNodeBound(nodecount, leafbox);
+			}
+			else
+			{
+				//get left bound
+				GUINT childindex = getLeftNodeIndex(nodecount);
+				GIM_AABB bound;
+				getNodeBound(childindex, bound);
+				//get right bound
+				childindex = getRightNodeIndex(nodecount);
+				GIM_AABB bound2;
+				getNodeBound(childindex, bound2);
+				bound.merge(bound2);
+
+				setNodeBound(nodecount, bound);
+			}
+		}
+	}
+
+public:
+	GIM_BOX_TREE_TEMPLATE_SET()
+	{
+	}
+
+	SIMD_FORCE_INLINE GIM_AABB getGlobalBox() const
+	{
+		GIM_AABB totalbox;
+		getNodeBound(0, totalbox);
+		return totalbox;
+	}
+
+	SIMD_FORCE_INLINE void setPrimitiveManager(const _GIM_PRIMITIVE_MANAGER_PROTOTYPE& primitive_manager)
+	{
+		m_primitive_manager = primitive_manager;
+	}
+
+	const _GIM_PRIMITIVE_MANAGER_PROTOTYPE& getPrimitiveManager() const
+	{
+		return m_primitive_manager;
+	}
+
+	_GIM_PRIMITIVE_MANAGER_PROTOTYPE& getPrimitiveManager()
+	{
+		return m_primitive_manager;
+	}
+
+	//! node manager prototype functions
+	///@{
+
+	//! this attemps to refit the box set.
+	SIMD_FORCE_INLINE void update()
+	{
+		refit();
+	}
+
+	//! this rebuild the entire set
+	SIMD_FORCE_INLINE void buildSet()
+	{
+		//obtain primitive boxes
+		gim_array<GIM_AABB_DATA> primitive_boxes;
+		primitive_boxes.resize(m_primitive_manager.get_primitive_count(), false);
+
+		for (GUINT i = 0; i < primitive_boxes.size(); i++)
+		{
+			m_primitive_manager.get_primitive_box(i, primitive_boxes[i].m_bound);
+			primitive_boxes[i].m_data = i;
+		}
+
+		m_box_tree.build_tree(primitive_boxes);
+	}
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	SIMD_FORCE_INLINE bool boxQuery(const GIM_AABB& box, gim_array<GUINT>& collided_results) const
+	{
+		GUINT curIndex = 0;
+		GUINT numNodes = getNodeCount();
+
+		while (curIndex < numNodes)
+		{
+			GIM_AABB bound;
+			getNodeBound(curIndex, bound);
+
+			//catch bugs in tree data
+
+			bool aabbOverlap = bound.has_collision(box);
+			bool isleafnode = isLeafNode(curIndex);
+
+			if (isleafnode && aabbOverlap)
+			{
+				collided_results.push_back(getNodeData(curIndex));
+			}
+
+			if (aabbOverlap || isleafnode)
+			{
+				//next subnode
+				curIndex++;
+			}
+			else
+			{
+				//skip node
+				curIndex += getScapeNodeIndex(curIndex);
+			}
+		}
+		if (collided_results.size() > 0) return true;
+		return false;
+	}
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	SIMD_FORCE_INLINE bool boxQueryTrans(const GIM_AABB& box,
+										 const btTransform& transform, gim_array<GUINT>& collided_results) const
+	{
+		GIM_AABB transbox = box;
+		transbox.appy_transform(transform);
+		return boxQuery(transbox, collided_results);
+	}
+
+	//! returns the indices of the primitives in the m_primitive_manager
+	SIMD_FORCE_INLINE bool rayQuery(
+		const btVector3& ray_dir, const btVector3& ray_origin,
+		gim_array<GUINT>& collided_results) const
+	{
+		GUINT curIndex = 0;
+		GUINT numNodes = getNodeCount();
+
+		while (curIndex < numNodes)
+		{
+			GIM_AABB bound;
+			getNodeBound(curIndex, bound);
+
+			//catch bugs in tree data
+
+			bool aabbOverlap = bound.collide_ray(ray_origin, ray_dir);
+			bool isleafnode = isLeafNode(curIndex);
+
+			if (isleafnode && aabbOverlap)
+			{
+				collided_results.push_back(getNodeData(curIndex));
+			}
+
+			if (aabbOverlap || isleafnode)
+			{
+				//next subnode
+				curIndex++;
+			}
+			else
+			{
+				//skip node
+				curIndex += getScapeNodeIndex(curIndex);
+			}
+		}
+		if (collided_results.size() > 0) return true;
+		return false;
+	}
+
+	//! tells if this set has hierarcht
+	SIMD_FORCE_INLINE bool hasHierarchy() const
+	{
+		return true;
+	}
+
+	//! tells if this set is a trimesh
+	SIMD_FORCE_INLINE bool isTrimesh() const
+	{
+		return m_primitive_manager.is_trimesh();
+	}
+
+	//! node count
+	SIMD_FORCE_INLINE GUINT getNodeCount() const
+	{
+		return m_box_tree.getNodeCount();
+	}
+
+	//! tells if the node is a leaf
+	SIMD_FORCE_INLINE bool isLeafNode(GUINT nodeindex) const
+	{
+		return m_box_tree.isLeafNode(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE GUINT getNodeData(GUINT nodeindex) const
+	{
+		return m_box_tree.getNodeData(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE void getNodeBound(GUINT nodeindex, GIM_AABB& bound) const
+	{
+		m_box_tree.getNodeBound(nodeindex, bound);
+	}
+
+	SIMD_FORCE_INLINE void setNodeBound(GUINT nodeindex, const GIM_AABB& bound)
+	{
+		m_box_tree.setNodeBound(nodeindex, bound);
+	}
+
+	SIMD_FORCE_INLINE GUINT getLeftNodeIndex(GUINT nodeindex) const
+	{
+		return m_box_tree.getLeftNodeIndex(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE GUINT getRightNodeIndex(GUINT nodeindex) const
+	{
+		return m_box_tree.getRightNodeIndex(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE GUINT getScapeNodeIndex(GUINT nodeindex) const
+	{
+		return m_box_tree.getScapeNodeIndex(nodeindex);
+	}
+
+	SIMD_FORCE_INLINE void getNodeTriangle(GUINT nodeindex, GIM_TRIANGLE& triangle) const
+	{
+		m_primitive_manager.get_primitive_triangle(getNodeData(nodeindex), triangle);
+	}
+};
+
+//! Class for Box Tree Sets
+/*!
+this has the GIM_BOX_TREE implementation for bounding boxes.
+*/
+template <typename _GIM_PRIMITIVE_MANAGER_PROTOTYPE>
+class GIM_BOX_TREE_SET : public GIM_BOX_TREE_TEMPLATE_SET<_GIM_PRIMITIVE_MANAGER_PROTOTYPE, GIM_BOX_TREE>
+{
+public:
+};
+
+/// GIM_BOX_SET collision methods
+template <typename BOX_SET_CLASS0, typename BOX_SET_CLASS1>
+class GIM_TREE_TREE_COLLIDER
+{
+public:
+	gim_pair_set* m_collision_pairs;
+	BOX_SET_CLASS0* m_boxset0;
+	BOX_SET_CLASS1* m_boxset1;
+	GUINT current_node0;
+	GUINT current_node1;
+	bool node0_is_leaf;
+	bool node1_is_leaf;
+	bool t0_is_trimesh;
+	bool t1_is_trimesh;
+	bool node0_has_triangle;
+	bool node1_has_triangle;
+	GIM_AABB m_box0;
+	GIM_AABB m_box1;
+	GIM_BOX_BOX_TRANSFORM_CACHE trans_cache_1to0;
+	btTransform trans_cache_0to1;
+	GIM_TRIANGLE m_tri0;
+	btVector4 m_tri0_plane;
+	GIM_TRIANGLE m_tri1;
+	btVector4 m_tri1_plane;
+
+public:
+	GIM_TREE_TREE_COLLIDER()
+	{
+		current_node0 = G_UINT_INFINITY;
+		current_node1 = G_UINT_INFINITY;
+	}
+
+protected:
+	SIMD_FORCE_INLINE void retrieve_node0_triangle(GUINT node0)
+	{
+		if (node0_has_triangle) return;
+		m_boxset0->getNodeTriangle(node0, m_tri0);
+		//transform triangle
+		m_tri0.m_vertices[0] = trans_cache_0to1(m_tri0.m_vertices[0]);
+		m_tri0.m_vertices[1] = trans_cache_0to1(m_tri0.m_vertices[1]);
+		m_tri0.m_vertices[2] = trans_cache_0to1(m_tri0.m_vertices[2]);
+		m_tri0.get_plane(m_tri0_plane);
+
+		node0_has_triangle = true;
+	}
+
+	SIMD_FORCE_INLINE void retrieve_node1_triangle(GUINT node1)
+	{
+		if (node1_has_triangle) return;
+		m_boxset1->getNodeTriangle(node1, m_tri1);
+		//transform triangle
+		m_tri1.m_vertices[0] = trans_cache_1to0.transform(m_tri1.m_vertices[0]);
+		m_tri1.m_vertices[1] = trans_cache_1to0.transform(m_tri1.m_vertices[1]);
+		m_tri1.m_vertices[2] = trans_cache_1to0.transform(m_tri1.m_vertices[2]);
+		m_tri1.get_plane(m_tri1_plane);
+
+		node1_has_triangle = true;
+	}
+
+	SIMD_FORCE_INLINE void retrieve_node0_info(GUINT node0)
+	{
+		if (node0 == current_node0) return;
+		m_boxset0->getNodeBound(node0, m_box0);
+		node0_is_leaf = m_boxset0->isLeafNode(node0);
+		node0_has_triangle = false;
+		current_node0 = node0;
+	}
+
+	SIMD_FORCE_INLINE void retrieve_node1_info(GUINT node1)
+	{
+		if (node1 == current_node1) return;
+		m_boxset1->getNodeBound(node1, m_box1);
+		node1_is_leaf = m_boxset1->isLeafNode(node1);
+		node1_has_triangle = false;
+		current_node1 = node1;
+	}
+
+	SIMD_FORCE_INLINE bool node_collision(GUINT node0, GUINT node1)
+	{
+		retrieve_node0_info(node0);
+		retrieve_node1_info(node1);
+		bool result = m_box0.overlapping_trans_cache(m_box1, trans_cache_1to0, true);
+		if (!result) return false;
+
+		if (t0_is_trimesh && node0_is_leaf)
+		{
+			//perform primitive vs box collision
+			retrieve_node0_triangle(node0);
+			//do triangle vs box collision
+			m_box1.increment_margin(m_tri0.m_margin);
+
+			result = m_box1.collide_triangle_exact(
+				m_tri0.m_vertices[0], m_tri0.m_vertices[1], m_tri0.m_vertices[2], m_tri0_plane);
+
+			m_box1.increment_margin(-m_tri0.m_margin);
+
+			if (!result) return false;
+			return true;
+		}
+		else if (t1_is_trimesh && node1_is_leaf)
+		{
+			//perform primitive vs box collision
+			retrieve_node1_triangle(node1);
+			//do triangle vs box collision
+			m_box0.increment_margin(m_tri1.m_margin);
+
+			result = m_box0.collide_triangle_exact(
+				m_tri1.m_vertices[0], m_tri1.m_vertices[1], m_tri1.m_vertices[2], m_tri1_plane);
+
+			m_box0.increment_margin(-m_tri1.m_margin);
+
+			if (!result) return false;
+			return true;
+		}
+		return true;
+	}
+
+	//stackless collision routine
+	void find_collision_pairs()
+	{
+		gim_pair_set stack_collisions;
+		stack_collisions.reserve(32);
+
+		//add the first pair
+		stack_collisions.push_pair(0, 0);
+
+		while (stack_collisions.size())
+		{
+			//retrieve the last pair and pop
+			GUINT node0 = stack_collisions.back().m_index1;
+			GUINT node1 = stack_collisions.back().m_index2;
+			stack_collisions.pop_back();
+			if (node_collision(node0, node1))  // a collision is found
+			{
+				if (node0_is_leaf)
+				{
+					if (node1_is_leaf)
+					{
+						m_collision_pairs->push_pair(m_boxset0->getNodeData(node0), m_boxset1->getNodeData(node1));
+					}
+					else
+					{
+						//collide left
+						stack_collisions.push_pair(node0, m_boxset1->getLeftNodeIndex(node1));
+
+						//collide right
+						stack_collisions.push_pair(node0, m_boxset1->getRightNodeIndex(node1));
+					}
+				}
+				else
+				{
+					if (node1_is_leaf)
+					{
+						//collide left
+						stack_collisions.push_pair(m_boxset0->getLeftNodeIndex(node0), node1);
+						//collide right
+						stack_collisions.push_pair(m_boxset0->getRightNodeIndex(node0), node1);
+					}
+					else
+					{
+						GUINT left0 = m_boxset0->getLeftNodeIndex(node0);
+						GUINT right0 = m_boxset0->getRightNodeIndex(node0);
+						GUINT left1 = m_boxset1->getLeftNodeIndex(node1);
+						GUINT right1 = m_boxset1->getRightNodeIndex(node1);
+						//collide left
+						stack_collisions.push_pair(left0, left1);
+						//collide right
+						stack_collisions.push_pair(left0, right1);
+						//collide left
+						stack_collisions.push_pair(right0, left1);
+						//collide right
+						stack_collisions.push_pair(right0, right1);
+
+					}  // else if node1 is not a leaf
+				}      // else if node0 is not a leaf
+
+			}  // if(node_collision(node0,node1))
+		}      //while(stack_collisions.size())
+	}
+
+public:
+	void find_collision(BOX_SET_CLASS0* boxset1, const btTransform& trans1,
+						BOX_SET_CLASS1* boxset2, const btTransform& trans2,
+						gim_pair_set& collision_pairs, bool complete_primitive_tests = true)
+	{
+		m_collision_pairs = &collision_pairs;
+		m_boxset0 = boxset1;
+		m_boxset1 = boxset2;
+
+		trans_cache_1to0.calc_from_homogenic(trans1, trans2);
+
+		trans_cache_0to1 = trans2.inverse();
+		trans_cache_0to1 *= trans1;
+
+		if (complete_primitive_tests)
+		{
+			t0_is_trimesh = boxset1->getPrimitiveManager().is_trimesh();
+			t1_is_trimesh = boxset2->getPrimitiveManager().is_trimesh();
+		}
+		else
+		{
+			t0_is_trimesh = false;
+			t1_is_trimesh = false;
+		}
+
+		find_collision_pairs();
+	}
+};
+
+#endif  // GIM_BOXPRUNING_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_clip_polygon.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_clip_polygon.h
new file mode 100644
index 0000000..57b9c5c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_clip_polygon.h
@@ -0,0 +1,199 @@
+#ifndef GIM_CLIP_POLYGON_H_INCLUDED
+#define GIM_CLIP_POLYGON_H_INCLUDED
+
+/*! \file gim_tri_collision.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+//! This function calcs the distance from a 3D plane
+class DISTANCE_PLANE_3D_FUNC
+{
+public:
+	template <typename CLASS_POINT, typename CLASS_PLANE>
+	inline GREAL operator()(const CLASS_PLANE& plane, const CLASS_POINT& point)
+	{
+		return DISTANCE_PLANE_POINT(plane, point);
+	}
+};
+
+template <typename CLASS_POINT>
+SIMD_FORCE_INLINE void PLANE_CLIP_POLYGON_COLLECT(
+	const CLASS_POINT& point0,
+	const CLASS_POINT& point1,
+	GREAL dist0,
+	GREAL dist1,
+	CLASS_POINT* clipped,
+	GUINT& clipped_count)
+{
+	GUINT _prevclassif = (dist0 > G_EPSILON);
+	GUINT _classif = (dist1 > G_EPSILON);
+	if (_classif != _prevclassif)
+	{
+		GREAL blendfactor = -dist0 / (dist1 - dist0);
+		VEC_BLEND(clipped[clipped_count], point0, point1, blendfactor);
+		clipped_count++;
+	}
+	if (!_classif)
+	{
+		VEC_COPY(clipped[clipped_count], point1);
+		clipped_count++;
+	}
+}
+
+//! Clips a polygon by a plane
+/*!
+*\return The count of the clipped counts
+*/
+template <typename CLASS_POINT, typename CLASS_PLANE, typename DISTANCE_PLANE_FUNC>
+SIMD_FORCE_INLINE GUINT PLANE_CLIP_POLYGON_GENERIC(
+	const CLASS_PLANE& plane,
+	const CLASS_POINT* polygon_points,
+	GUINT polygon_point_count,
+	CLASS_POINT* clipped, DISTANCE_PLANE_FUNC distance_func)
+{
+	GUINT clipped_count = 0;
+
+	//clip first point
+	GREAL firstdist = distance_func(plane, polygon_points[0]);
+	;
+	if (!(firstdist > G_EPSILON))
+	{
+		VEC_COPY(clipped[clipped_count], polygon_points[0]);
+		clipped_count++;
+	}
+
+	GREAL olddist = firstdist;
+	for (GUINT _i = 1; _i < polygon_point_count; _i++)
+	{
+		GREAL dist = distance_func(plane, polygon_points[_i]);
+
+		PLANE_CLIP_POLYGON_COLLECT(
+			polygon_points[_i - 1], polygon_points[_i],
+			olddist,
+			dist,
+			clipped,
+			clipped_count);
+
+		olddist = dist;
+	}
+
+	//RETURN TO FIRST  point
+
+	PLANE_CLIP_POLYGON_COLLECT(
+		polygon_points[polygon_point_count - 1], polygon_points[0],
+		olddist,
+		firstdist,
+		clipped,
+		clipped_count);
+
+	return clipped_count;
+}
+
+//! Clips a polygon by a plane
+/*!
+*\return The count of the clipped counts
+*/
+template <typename CLASS_POINT, typename CLASS_PLANE, typename DISTANCE_PLANE_FUNC>
+SIMD_FORCE_INLINE GUINT PLANE_CLIP_TRIANGLE_GENERIC(
+	const CLASS_PLANE& plane,
+	const CLASS_POINT& point0,
+	const CLASS_POINT& point1,
+	const CLASS_POINT& point2,
+	CLASS_POINT* clipped, DISTANCE_PLANE_FUNC distance_func)
+{
+	GUINT clipped_count = 0;
+
+	//clip first point
+	GREAL firstdist = distance_func(plane, point0);
+	;
+	if (!(firstdist > G_EPSILON))
+	{
+		VEC_COPY(clipped[clipped_count], point0);
+		clipped_count++;
+	}
+
+	// point 1
+	GREAL olddist = firstdist;
+	GREAL dist = distance_func(plane, point1);
+
+	PLANE_CLIP_POLYGON_COLLECT(
+		point0, point1,
+		olddist,
+		dist,
+		clipped,
+		clipped_count);
+
+	olddist = dist;
+
+	// point 2
+	dist = distance_func(plane, point2);
+
+	PLANE_CLIP_POLYGON_COLLECT(
+		point1, point2,
+		olddist,
+		dist,
+		clipped,
+		clipped_count);
+	olddist = dist;
+
+	//RETURN TO FIRST  point
+	PLANE_CLIP_POLYGON_COLLECT(
+		point2, point0,
+		olddist,
+		firstdist,
+		clipped,
+		clipped_count);
+
+	return clipped_count;
+}
+
+template <typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE GUINT PLANE_CLIP_POLYGON3D(
+	const CLASS_PLANE& plane,
+	const CLASS_POINT* polygon_points,
+	GUINT polygon_point_count,
+	CLASS_POINT* clipped)
+{
+	return PLANE_CLIP_POLYGON_GENERIC<CLASS_POINT, CLASS_PLANE>(plane, polygon_points, polygon_point_count, clipped, DISTANCE_PLANE_3D_FUNC());
+}
+
+template <typename CLASS_POINT, typename CLASS_PLANE>
+SIMD_FORCE_INLINE GUINT PLANE_CLIP_TRIANGLE3D(
+	const CLASS_PLANE& plane,
+	const CLASS_POINT& point0,
+	const CLASS_POINT& point1,
+	const CLASS_POINT& point2,
+	CLASS_POINT* clipped)
+{
+	return PLANE_CLIP_TRIANGLE_GENERIC<CLASS_POINT, CLASS_PLANE>(plane, point0, point1, point2, clipped, DISTANCE_PLANE_3D_FUNC());
+}
+
+#endif  // GIM_TRI_COLLISION_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_contact.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_contact.cpp
new file mode 100644
index 0000000..3902257
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_contact.cpp
@@ -0,0 +1,142 @@
+
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_contact.h"
+
+#define MAX_COINCIDENT 8
+
+void gim_contact_array::merge_contacts(
+	const gim_contact_array& contacts, bool normal_contact_average)
+{
+	clear();
+
+	if (contacts.size() == 1)
+	{
+		push_back(contacts.back());
+		return;
+	}
+
+	gim_array<GIM_RSORT_TOKEN> keycontacts(contacts.size());
+	keycontacts.resize(contacts.size(), false);
+
+	//fill key contacts
+
+	GUINT i;
+
+	for (i = 0; i < contacts.size(); i++)
+	{
+		keycontacts[i].m_key = contacts[i].calc_key_contact();
+		keycontacts[i].m_value = i;
+	}
+
+	//sort keys
+	gim_heap_sort(keycontacts.pointer(), keycontacts.size(), GIM_RSORT_TOKEN_COMPARATOR());
+
+	// Merge contacts
+
+	GUINT coincident_count = 0;
+	btVector3 coincident_normals[MAX_COINCIDENT];
+
+	GUINT last_key = keycontacts[0].m_key;
+	GUINT key = 0;
+
+	push_back(contacts[keycontacts[0].m_value]);
+	GIM_CONTACT* pcontact = &back();
+
+	for (i = 1; i < keycontacts.size(); i++)
+	{
+		key = keycontacts[i].m_key;
+		const GIM_CONTACT* scontact = &contacts[keycontacts[i].m_value];
+
+		if (last_key == key)  //same points
+		{
+			//merge contact
+			if (pcontact->m_depth - CONTACT_DIFF_EPSILON > scontact->m_depth)  //)
+			{
+				*pcontact = *scontact;
+				coincident_count = 0;
+			}
+			else if (normal_contact_average)
+			{
+				if (btFabs(pcontact->m_depth - scontact->m_depth) < CONTACT_DIFF_EPSILON)
+				{
+					if (coincident_count < MAX_COINCIDENT)
+					{
+						coincident_normals[coincident_count] = scontact->m_normal;
+						coincident_count++;
+					}
+				}
+			}
+		}
+		else
+		{  //add new contact
+
+			if (normal_contact_average && coincident_count > 0)
+			{
+				pcontact->interpolate_normals(coincident_normals, coincident_count);
+				coincident_count = 0;
+			}
+
+			push_back(*scontact);
+			pcontact = &back();
+		}
+		last_key = key;
+	}
+}
+
+void gim_contact_array::merge_contacts_unique(const gim_contact_array& contacts)
+{
+	clear();
+
+	if (contacts.size() == 1)
+	{
+		push_back(contacts.back());
+		return;
+	}
+
+	GIM_CONTACT average_contact = contacts.back();
+
+	for (GUINT i = 1; i < contacts.size(); i++)
+	{
+		average_contact.m_point += contacts[i].m_point;
+		average_contact.m_normal += contacts[i].m_normal * contacts[i].m_depth;
+	}
+
+	//divide
+	GREAL divide_average = 1.0f / ((GREAL)contacts.size());
+
+	average_contact.m_point *= divide_average;
+
+	average_contact.m_normal *= divide_average;
+
+	average_contact.m_depth = average_contact.m_normal.length();
+
+	average_contact.m_normal /= average_contact.m_depth;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_contact.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_contact.h
new file mode 100644
index 0000000..9deb28a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_contact.h
@@ -0,0 +1,168 @@
+#ifndef GIM_CONTACT_H_INCLUDED
+#define GIM_CONTACT_H_INCLUDED
+
+/*! \file gim_contact.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+#include "gim_geometry.h"
+#include "gim_radixsort.h"
+#include "gim_array.h"
+
+/**
+Configuration var for applying interpolation of  contact normals
+*/
+#ifndef NORMAL_CONTACT_AVERAGE
+#define NORMAL_CONTACT_AVERAGE 1
+#endif
+
+#ifndef CONTACT_DIFF_EPSILON
+#define CONTACT_DIFF_EPSILON 0.00001f
+#endif
+
+#ifndef BT_CONTACT_H_STRUCTS_INCLUDED
+
+/// Structure for collision results
+///Functions for managing and sorting contacts resulting from a collision query.
+///Contact lists must be create by calling \ref GIM_CREATE_CONTACT_LIST
+///After querys, contact lists must be destroy by calling \ref GIM_DYNARRAY_DESTROY
+///Contacts can be merge for avoid duplicate results by calling \ref gim_merge_contacts
+class GIM_CONTACT
+{
+public:
+	btVector3 m_point;
+	btVector3 m_normal;
+	GREAL m_depth;     //Positive value indicates interpenetration
+	GREAL m_distance;  //Padding not for use
+	GUINT m_feature1;  //Face number
+	GUINT m_feature2;  //Face number
+public:
+	GIM_CONTACT()
+	{
+	}
+
+	GIM_CONTACT(const GIM_CONTACT &contact) : m_point(contact.m_point),
+											  m_normal(contact.m_normal),
+											  m_depth(contact.m_depth),
+											  m_feature1(contact.m_feature1),
+											  m_feature2(contact.m_feature2)
+	{
+		m_point = contact.m_point;
+		m_normal = contact.m_normal;
+		m_depth = contact.m_depth;
+		m_feature1 = contact.m_feature1;
+		m_feature2 = contact.m_feature2;
+	}
+
+	GIM_CONTACT(const btVector3 &point, const btVector3 &normal,
+				GREAL depth, GUINT feature1, GUINT feature2) : m_point(point),
+															   m_normal(normal),
+															   m_depth(depth),
+															   m_feature1(feature1),
+															   m_feature2(feature2)
+	{
+	}
+
+	//! Calcs key for coord classification
+	SIMD_FORCE_INLINE GUINT calc_key_contact() const
+	{
+		GINT _coords[] = {
+			(GINT)(m_point[0] * 1000.0f + 1.0f),
+			(GINT)(m_point[1] * 1333.0f),
+			(GINT)(m_point[2] * 2133.0f + 3.0f)};
+		GUINT _hash = 0;
+		GUINT *_uitmp = (GUINT *)(&_coords[0]);
+		_hash = *_uitmp;
+		_uitmp++;
+		_hash += (*_uitmp) << 4;
+		_uitmp++;
+		_hash += (*_uitmp) << 8;
+		return _hash;
+	}
+
+	SIMD_FORCE_INLINE void interpolate_normals(btVector3 *normals, GUINT normal_count)
+	{
+		btVector3 vec_sum(m_normal);
+		for (GUINT i = 0; i < normal_count; i++)
+		{
+			vec_sum += normals[i];
+		}
+
+		GREAL vec_sum_len = vec_sum.length2();
+		if (vec_sum_len < CONTACT_DIFF_EPSILON) return;
+
+		GIM_INV_SQRT(vec_sum_len, vec_sum_len);  // 1/sqrt(vec_sum_len)
+
+		m_normal = vec_sum * vec_sum_len;
+	}
+};
+
+#endif
+
+class gim_contact_array : public gim_array<GIM_CONTACT>
+{
+public:
+	gim_contact_array() : gim_array<GIM_CONTACT>(64)
+	{
+	}
+
+	SIMD_FORCE_INLINE void push_contact(const btVector3 &point, const btVector3 &normal,
+										GREAL depth, GUINT feature1, GUINT feature2)
+	{
+		push_back_mem();
+		GIM_CONTACT &newele = back();
+		newele.m_point = point;
+		newele.m_normal = normal;
+		newele.m_depth = depth;
+		newele.m_feature1 = feature1;
+		newele.m_feature2 = feature2;
+	}
+
+	SIMD_FORCE_INLINE void push_triangle_contacts(
+		const GIM_TRIANGLE_CONTACT_DATA &tricontact,
+		GUINT feature1, GUINT feature2)
+	{
+		for (GUINT i = 0; i < tricontact.m_point_count; i++)
+		{
+			push_back_mem();
+			GIM_CONTACT &newele = back();
+			newele.m_point = tricontact.m_points[i];
+			newele.m_normal = tricontact.m_separating_normal;
+			newele.m_depth = tricontact.m_penetration_depth;
+			newele.m_feature1 = feature1;
+			newele.m_feature2 = feature2;
+		}
+	}
+
+	void merge_contacts(const gim_contact_array &contacts, bool normal_contact_average = true);
+	void merge_contacts_unique(const gim_contact_array &contacts);
+};
+
+#endif  // GIM_CONTACT_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_geom_types.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_geom_types.h
new file mode 100644
index 0000000..9dc48f3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_geom_types.h
@@ -0,0 +1,92 @@
+#ifndef GIM_GEOM_TYPES_H_INCLUDED
+#define GIM_GEOM_TYPES_H_INCLUDED
+
+/*! \file gim_geom_types.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_math.h"
+
+//! Short Integer vector 2D
+typedef GSHORT vec2s[2];
+//! Integer vector 3D
+typedef GSHORT vec3s[3];
+//! Integer vector 4D
+typedef GSHORT vec4s[4];
+
+//! Short Integer vector 2D
+typedef GUSHORT vec2us[2];
+//! Integer vector 3D
+typedef GUSHORT vec3us[3];
+//! Integer vector 4D
+typedef GUSHORT vec4us[4];
+
+//! Integer vector 2D
+typedef GINT vec2i[2];
+//! Integer vector 3D
+typedef GINT vec3i[3];
+//! Integer vector 4D
+typedef GINT vec4i[4];
+
+//! Unsigned Integer vector 2D
+typedef GUINT vec2ui[2];
+//! Unsigned Integer vector 3D
+typedef GUINT vec3ui[3];
+//! Unsigned Integer vector 4D
+typedef GUINT vec4ui[4];
+
+//! Float vector 2D
+typedef GREAL vec2f[2];
+//! Float vector 3D
+typedef GREAL vec3f[3];
+//! Float vector 4D
+typedef GREAL vec4f[4];
+
+//! Double vector 2D
+typedef GREAL2 vec2d[2];
+//! Float vector 3D
+typedef GREAL2 vec3d[3];
+//! Float vector 4D
+typedef GREAL2 vec4d[4];
+
+//! Matrix 2D, row ordered
+typedef GREAL mat2f[2][2];
+//! Matrix 3D, row ordered
+typedef GREAL mat3f[3][3];
+//! Matrix 4D, row ordered
+typedef GREAL mat4f[4][4];
+
+//! Quaternion
+typedef GREAL quatf[4];
+
+//typedef struct _aabb3f aabb3f;
+
+#endif  // GIM_GEOM_TYPES_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_geometry.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_geometry.h
new file mode 100644
index 0000000..4a7ac3c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_geometry.h
@@ -0,0 +1,42 @@
+#ifndef GIM_GEOMETRY_H_INCLUDED
+#define GIM_GEOMETRY_H_INCLUDED
+
+/*! \file gim_geometry.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+///Additional Headers for Collision
+#include "gim_basic_geometry_operations.h"
+#include "gim_clip_polygon.h"
+#include "gim_box_collision.h"
+#include "gim_tri_collision.h"
+
+#endif  // GIM_VECTOR_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_hash_table.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_hash_table.h
new file mode 100644
index 0000000..abf88d3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_hash_table.h
@@ -0,0 +1,857 @@
+#ifndef GIM_HASH_TABLE_H_INCLUDED
+#define GIM_HASH_TABLE_H_INCLUDED
+/*! \file gim_trimesh_data.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_radixsort.h"
+
+#define GIM_INVALID_HASH 0xffffffff  //!< A very very high value
+#define GIM_DEFAULT_HASH_TABLE_SIZE 380
+#define GIM_DEFAULT_HASH_TABLE_NODE_SIZE 4
+#define GIM_HASH_TABLE_GROW_FACTOR 2
+
+#define GIM_MIN_RADIX_SORT_SIZE 860  //!< calibrated on a PIII
+
+template <typename T>
+struct GIM_HASH_TABLE_NODE
+{
+	GUINT m_key;
+	T m_data;
+	GIM_HASH_TABLE_NODE()
+	{
+	}
+
+	GIM_HASH_TABLE_NODE(const GIM_HASH_TABLE_NODE& value)
+	{
+		m_key = value.m_key;
+		m_data = value.m_data;
+	}
+
+	GIM_HASH_TABLE_NODE(GUINT key, const T& data)
+	{
+		m_key = key;
+		m_data = data;
+	}
+
+	bool operator<(const GIM_HASH_TABLE_NODE<T>& other) const
+	{
+		///inverse order, further objects are first
+		if (m_key < other.m_key) return true;
+		return false;
+	}
+
+	bool operator>(const GIM_HASH_TABLE_NODE<T>& other) const
+	{
+		///inverse order, further objects are first
+		if (m_key > other.m_key) return true;
+		return false;
+	}
+
+	bool operator==(const GIM_HASH_TABLE_NODE<T>& other) const
+	{
+		///inverse order, further objects are first
+		if (m_key == other.m_key) return true;
+		return false;
+	}
+};
+
+///Macro for getting the key
+class GIM_HASH_NODE_GET_KEY
+{
+public:
+	template <class T>
+	inline GUINT operator()(const T& a)
+	{
+		return a.m_key;
+	}
+};
+
+///Macro for comparing the key and the element
+class GIM_HASH_NODE_CMP_KEY_MACRO
+{
+public:
+	template <class T>
+	inline int operator()(const T& a, GUINT key)
+	{
+		return ((int)(a.m_key - key));
+	}
+};
+
+///Macro for comparing Hash nodes
+class GIM_HASH_NODE_CMP_MACRO
+{
+public:
+	template <class T>
+	inline int operator()(const T& a, const T& b)
+	{
+		return ((int)(a.m_key - b.m_key));
+	}
+};
+
+//! Sorting for hash table
+/*!
+switch automatically between quicksort and radixsort
+*/
+template <typename T>
+void gim_sort_hash_node_array(T* array, GUINT array_count)
+{
+	if (array_count < GIM_MIN_RADIX_SORT_SIZE)
+	{
+		gim_heap_sort(array, array_count, GIM_HASH_NODE_CMP_MACRO());
+	}
+	else
+	{
+		memcopy_elements_func cmpfunc;
+		gim_radix_sort(array, array_count, GIM_HASH_NODE_GET_KEY(), cmpfunc);
+	}
+}
+
+// Note: assumes long is at least 32 bits.
+#define GIM_NUM_PRIME 28
+
+static const GUINT gim_prime_list[GIM_NUM_PRIME] =
+	{
+		53ul, 97ul, 193ul, 389ul, 769ul,
+		1543ul, 3079ul, 6151ul, 12289ul, 24593ul,
+		49157ul, 98317ul, 196613ul, 393241ul, 786433ul,
+		1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul,
+		50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul,
+		1610612741ul, 3221225473ul, 4294967291ul};
+
+inline GUINT gim_next_prime(GUINT number)
+{
+	//Find nearest upper prime
+	GUINT result_ind = 0;
+	gim_binary_search(gim_prime_list, 0, (GIM_NUM_PRIME - 2), number, result_ind);
+
+	// inv: result_ind < 28
+	return gim_prime_list[result_ind];
+}
+
+//! A compact hash table implementation
+/*!
+A memory aligned compact hash table that coud be treated as an array.
+It could be a simple sorted array without the overhead of the hash key bucked, or could
+be a formely hash table with an array of keys.
+You can use switch_to_hashtable() and switch_to_sorted_array for saving space or increase speed.
+</br>
+
+<ul>
+<li> if node_size = 0, then this container becomes a simple sorted array allocator. reserve_size is used for reserve memory in m_nodes.
+When the array size reaches the size equivalent to 'min_hash_table_size', then it becomes a hash table by calling check_for_switching_to_hashtable.
+<li> If node_size != 0, then this container becomes a hash table for ever
+</ul>
+
+*/
+template <class T>
+class gim_hash_table
+{
+protected:
+	typedef GIM_HASH_TABLE_NODE<T> _node_type;
+
+	//!The nodes
+	//array< _node_type, SuperAllocator<_node_type> > m_nodes;
+	gim_array<_node_type> m_nodes;
+	//SuperBufferedArray< _node_type > m_nodes;
+	bool m_sorted;
+
+	///Hash table data management. The hash table has the indices to the corresponding m_nodes array
+	GUINT* m_hash_table;  //!<
+	GUINT m_table_size;   //!<
+	GUINT m_node_size;    //!<
+	GUINT m_min_hash_table_size;
+
+	//! Returns the cell index
+	inline GUINT _find_cell(GUINT hashkey)
+	{
+		_node_type* nodesptr = m_nodes.pointer();
+		GUINT start_index = (hashkey % m_table_size) * m_node_size;
+		GUINT end_index = start_index + m_node_size;
+
+		while (start_index < end_index)
+		{
+			GUINT value = m_hash_table[start_index];
+			if (value != GIM_INVALID_HASH)
+			{
+				if (nodesptr[value].m_key == hashkey) return start_index;
+			}
+			start_index++;
+		}
+		return GIM_INVALID_HASH;
+	}
+
+	//! Find the avaliable cell for the hashkey, and return an existing cell if it has the same hash key
+	inline GUINT _find_avaliable_cell(GUINT hashkey)
+	{
+		_node_type* nodesptr = m_nodes.pointer();
+		GUINT avaliable_index = GIM_INVALID_HASH;
+		GUINT start_index = (hashkey % m_table_size) * m_node_size;
+		GUINT end_index = start_index + m_node_size;
+
+		while (start_index < end_index)
+		{
+			GUINT value = m_hash_table[start_index];
+			if (value == GIM_INVALID_HASH)
+			{
+				if (avaliable_index == GIM_INVALID_HASH)
+				{
+					avaliable_index = start_index;
+				}
+			}
+			else if (nodesptr[value].m_key == hashkey)
+			{
+				return start_index;
+			}
+			start_index++;
+		}
+		return avaliable_index;
+	}
+
+	//! reserves the memory for the hash table.
+	/*!
+    \pre hash table must be empty
+    \post reserves the memory for the hash table, an initializes all elements to GIM_INVALID_HASH.
+    */
+	inline void _reserve_table_memory(GUINT newtablesize)
+	{
+		if (newtablesize == 0) return;
+		if (m_node_size == 0) return;
+
+		//Get a Prime size
+
+		m_table_size = gim_next_prime(newtablesize);
+
+		GUINT datasize = m_table_size * m_node_size;
+		//Alloc the data buffer
+		m_hash_table = (GUINT*)gim_alloc(datasize * sizeof(GUINT));
+	}
+
+	inline void _invalidate_keys()
+	{
+		GUINT datasize = m_table_size * m_node_size;
+		for (GUINT i = 0; i < datasize; i++)
+		{
+			m_hash_table[i] = GIM_INVALID_HASH;  // invalidate keys
+		}
+	}
+
+	//! Clear all memory for the hash table
+	inline void _clear_table_memory()
+	{
+		if (m_hash_table == NULL) return;
+		gim_free(m_hash_table);
+		m_hash_table = NULL;
+		m_table_size = 0;
+	}
+
+	//! Invalidates the keys (Assigning GIM_INVALID_HASH to all) Reorders the hash keys
+	inline void _rehash()
+	{
+		_invalidate_keys();
+
+		_node_type* nodesptr = m_nodes.pointer();
+		for (GUINT i = 0; i < (GUINT)m_nodes.size(); i++)
+		{
+			GUINT nodekey = nodesptr[i].m_key;
+			if (nodekey != GIM_INVALID_HASH)
+			{
+				//Search for the avaliable cell in buffer
+				GUINT index = _find_avaliable_cell(nodekey);
+
+				if (m_hash_table[index] != GIM_INVALID_HASH)
+				{  //The new index is alreade used... discard this new incomming object, repeated key
+					btAssert(m_hash_table[index] == nodekey);
+					nodesptr[i].m_key = GIM_INVALID_HASH;
+				}
+				else
+				{
+					//;
+					//Assign the value for alloc
+					m_hash_table[index] = i;
+				}
+			}
+		}
+	}
+
+	//! Resize hash table indices
+	inline void _resize_table(GUINT newsize)
+	{
+		//Clear memory
+		_clear_table_memory();
+		//Alloc the data
+		_reserve_table_memory(newsize);
+		//Invalidate keys and rehash
+		_rehash();
+	}
+
+	//! Destroy hash table memory
+	inline void _destroy()
+	{
+		if (m_hash_table == NULL) return;
+		_clear_table_memory();
+	}
+
+	//! Finds an avaliable hash table cell, and resizes the table if there isn't space
+	inline GUINT _assign_hash_table_cell(GUINT hashkey)
+	{
+		GUINT cell_index = _find_avaliable_cell(hashkey);
+
+		if (cell_index == GIM_INVALID_HASH)
+		{
+			//rehashing
+			_resize_table(m_table_size + 1);
+			GUINT cell_index = _find_avaliable_cell(hashkey);
+			btAssert(cell_index != GIM_INVALID_HASH);
+		}
+		return cell_index;
+	}
+
+	//! erase by index in hash table
+	inline bool _erase_by_index_hash_table(GUINT index)
+	{
+		if (index >= m_nodes.size()) return false;
+		if (m_nodes[index].m_key != GIM_INVALID_HASH)
+		{
+			//Search for the avaliable cell in buffer
+			GUINT cell_index = _find_cell(m_nodes[index].m_key);
+
+			btAssert(cell_index != GIM_INVALID_HASH);
+			btAssert(m_hash_table[cell_index] == index);
+
+			m_hash_table[cell_index] = GIM_INVALID_HASH;
+		}
+
+		return this->_erase_unsorted(index);
+	}
+
+	//! erase by key in hash table
+	inline bool _erase_hash_table(GUINT hashkey)
+	{
+		if (hashkey == GIM_INVALID_HASH) return false;
+
+		//Search for the avaliable cell in buffer
+		GUINT cell_index = _find_cell(hashkey);
+		if (cell_index == GIM_INVALID_HASH) return false;
+
+		GUINT index = m_hash_table[cell_index];
+		m_hash_table[cell_index] = GIM_INVALID_HASH;
+
+		return this->_erase_unsorted(index);
+	}
+
+	//! insert an element in hash table
+	/*!
+    If the element exists, this won't insert the element
+    \return the index in the array of the existing element,or GIM_INVALID_HASH if the element has been inserted
+    If so, the element has been inserted at the last position of the array.
+    */
+	inline GUINT _insert_hash_table(GUINT hashkey, const T& value)
+	{
+		if (hashkey == GIM_INVALID_HASH)
+		{
+			//Insert anyway
+			_insert_unsorted(hashkey, value);
+			return GIM_INVALID_HASH;
+		}
+
+		GUINT cell_index = _assign_hash_table_cell(hashkey);
+
+		GUINT value_key = m_hash_table[cell_index];
+
+		if (value_key != GIM_INVALID_HASH) return value_key;  // Not overrited
+
+		m_hash_table[cell_index] = m_nodes.size();
+
+		_insert_unsorted(hashkey, value);
+		return GIM_INVALID_HASH;
+	}
+
+	//! insert an element in hash table.
+	/*!
+    If the element exists, this replaces the element.
+    \return the index in the array of the existing element,or GIM_INVALID_HASH if the element has been inserted
+    If so, the element has been inserted at the last position of the array.
+    */
+	inline GUINT _insert_hash_table_replace(GUINT hashkey, const T& value)
+	{
+		if (hashkey == GIM_INVALID_HASH)
+		{
+			//Insert anyway
+			_insert_unsorted(hashkey, value);
+			return GIM_INVALID_HASH;
+		}
+
+		GUINT cell_index = _assign_hash_table_cell(hashkey);
+
+		GUINT value_key = m_hash_table[cell_index];
+
+		if (value_key != GIM_INVALID_HASH)
+		{  //replaces the existing
+			m_nodes[value_key] = _node_type(hashkey, value);
+			return value_key;  // index of the replaced element
+		}
+
+		m_hash_table[cell_index] = m_nodes.size();
+
+		_insert_unsorted(hashkey, value);
+		return GIM_INVALID_HASH;
+	}
+
+	///Sorted array data management. The hash table has the indices to the corresponding m_nodes array
+	inline bool _erase_sorted(GUINT index)
+	{
+		if (index >= (GUINT)m_nodes.size()) return false;
+		m_nodes.erase_sorted(index);
+		if (m_nodes.size() < 2) m_sorted = false;
+		return true;
+	}
+
+	//! faster, but unsorted
+	inline bool _erase_unsorted(GUINT index)
+	{
+		if (index >= m_nodes.size()) return false;
+
+		GUINT lastindex = m_nodes.size() - 1;
+		if (index < lastindex && m_hash_table != 0)
+		{
+			GUINT hashkey = m_nodes[lastindex].m_key;
+			if (hashkey != GIM_INVALID_HASH)
+			{
+				//update the new position of the last element
+				GUINT cell_index = _find_cell(hashkey);
+				btAssert(cell_index != GIM_INVALID_HASH);
+				//new position of the last element which will be swaped
+				m_hash_table[cell_index] = index;
+			}
+		}
+		m_nodes.erase(index);
+		m_sorted = false;
+		return true;
+	}
+
+	//! Insert in position ordered
+	/*!
+    Also checks if it is needed to transform this container to a hash table, by calling check_for_switching_to_hashtable
+    */
+	inline void _insert_in_pos(GUINT hashkey, const T& value, GUINT pos)
+	{
+		m_nodes.insert(_node_type(hashkey, value), pos);
+		this->check_for_switching_to_hashtable();
+	}
+
+	//! Insert an element in an ordered array
+	inline GUINT _insert_sorted(GUINT hashkey, const T& value)
+	{
+		if (hashkey == GIM_INVALID_HASH || size() == 0)
+		{
+			m_nodes.push_back(_node_type(hashkey, value));
+			return GIM_INVALID_HASH;
+		}
+		//Insert at last position
+		//Sort element
+
+		GUINT result_ind = 0;
+		GUINT last_index = m_nodes.size() - 1;
+		_node_type* ptr = m_nodes.pointer();
+
+		bool found = gim_binary_search_ex(
+			ptr, 0, last_index, result_ind, hashkey, GIM_HASH_NODE_CMP_KEY_MACRO());
+
+		//Insert before found index
+		if (found)
+		{
+			return result_ind;
+		}
+		else
+		{
+			_insert_in_pos(hashkey, value, result_ind);
+		}
+		return GIM_INVALID_HASH;
+	}
+
+	inline GUINT _insert_sorted_replace(GUINT hashkey, const T& value)
+	{
+		if (hashkey == GIM_INVALID_HASH || size() == 0)
+		{
+			m_nodes.push_back(_node_type(hashkey, value));
+			return GIM_INVALID_HASH;
+		}
+		//Insert at last position
+		//Sort element
+		GUINT result_ind;
+		GUINT last_index = m_nodes.size() - 1;
+		_node_type* ptr = m_nodes.pointer();
+
+		bool found = gim_binary_search_ex(
+			ptr, 0, last_index, result_ind, hashkey, GIM_HASH_NODE_CMP_KEY_MACRO());
+
+		//Insert before found index
+		if (found)
+		{
+			m_nodes[result_ind] = _node_type(hashkey, value);
+		}
+		else
+		{
+			_insert_in_pos(hashkey, value, result_ind);
+		}
+		return result_ind;
+	}
+
+	//! Fast insertion in m_nodes array
+	inline GUINT _insert_unsorted(GUINT hashkey, const T& value)
+	{
+		m_nodes.push_back(_node_type(hashkey, value));
+		m_sorted = false;
+		return GIM_INVALID_HASH;
+	}
+
+public:
+	/*!
+        <li> if node_size = 0, then this container becomes a simple sorted array allocator. reserve_size is used for reserve memory in m_nodes.
+        When the array size reaches the size equivalent to 'min_hash_table_size', then it becomes a hash table by calling check_for_switching_to_hashtable.
+        <li> If node_size != 0, then this container becomes a hash table for ever
+        </ul>
+    */
+	gim_hash_table(GUINT reserve_size = GIM_DEFAULT_HASH_TABLE_SIZE,
+				   GUINT node_size = GIM_DEFAULT_HASH_TABLE_NODE_SIZE,
+				   GUINT min_hash_table_size = GIM_INVALID_HASH)
+	{
+		m_hash_table = NULL;
+		m_table_size = 0;
+		m_sorted = false;
+		m_node_size = node_size;
+		m_min_hash_table_size = min_hash_table_size;
+
+		if (m_node_size != 0)
+		{
+			if (reserve_size != 0)
+			{
+				m_nodes.reserve(reserve_size);
+				_reserve_table_memory(reserve_size);
+				_invalidate_keys();
+			}
+			else
+			{
+				m_nodes.reserve(GIM_DEFAULT_HASH_TABLE_SIZE);
+				_reserve_table_memory(GIM_DEFAULT_HASH_TABLE_SIZE);
+				_invalidate_keys();
+			}
+		}
+		else if (reserve_size != 0)
+		{
+			m_nodes.reserve(reserve_size);
+		}
+	}
+
+	~gim_hash_table()
+	{
+		_destroy();
+	}
+
+	inline bool is_hash_table()
+	{
+		if (m_hash_table) return true;
+		return false;
+	}
+
+	inline bool is_sorted()
+	{
+		if (size() < 2) return true;
+		return m_sorted;
+	}
+
+	bool sort()
+	{
+		if (is_sorted()) return true;
+		if (m_nodes.size() < 2) return false;
+
+		_node_type* ptr = m_nodes.pointer();
+		GUINT siz = m_nodes.size();
+		gim_sort_hash_node_array(ptr, siz);
+		m_sorted = true;
+
+		if (m_hash_table)
+		{
+			_rehash();
+		}
+		return true;
+	}
+
+	bool switch_to_hashtable()
+	{
+		if (m_hash_table) return false;
+		if (m_node_size == 0) m_node_size = GIM_DEFAULT_HASH_TABLE_NODE_SIZE;
+		if (m_nodes.size() < GIM_DEFAULT_HASH_TABLE_SIZE)
+		{
+			_resize_table(GIM_DEFAULT_HASH_TABLE_SIZE);
+		}
+		else
+		{
+			_resize_table(m_nodes.size() + 1);
+		}
+
+		return true;
+	}
+
+	bool switch_to_sorted_array()
+	{
+		if (m_hash_table == NULL) return true;
+		_clear_table_memory();
+		return sort();
+	}
+
+	//!If the container reaches the
+	bool check_for_switching_to_hashtable()
+	{
+		if (this->m_hash_table) return true;
+
+		if (!(m_nodes.size() < m_min_hash_table_size))
+		{
+			if (m_node_size == 0)
+			{
+				m_node_size = GIM_DEFAULT_HASH_TABLE_NODE_SIZE;
+			}
+
+			_resize_table(m_nodes.size() + 1);
+			return true;
+		}
+		return false;
+	}
+
+	inline void set_sorted(bool value)
+	{
+		m_sorted = value;
+	}
+
+	//! Retrieves the amount of keys.
+	inline GUINT size() const
+	{
+		return m_nodes.size();
+	}
+
+	//! Retrieves the hash key.
+	inline GUINT get_key(GUINT index) const
+	{
+		return m_nodes[index].m_key;
+	}
+
+	//! Retrieves the value by index
+	/*!
+    */
+	inline T* get_value_by_index(GUINT index)
+	{
+		return &m_nodes[index].m_data;
+	}
+
+	inline const T& operator[](GUINT index) const
+	{
+		return m_nodes[index].m_data;
+	}
+
+	inline T& operator[](GUINT index)
+	{
+		return m_nodes[index].m_data;
+	}
+
+	//! Finds the index of the element with the key
+	/*!
+    \return the index in the array of the existing element,or GIM_INVALID_HASH if the element has been inserted
+    If so, the element has been inserted at the last position of the array.
+    */
+	inline GUINT find(GUINT hashkey)
+	{
+		if (m_hash_table)
+		{
+			GUINT cell_index = _find_cell(hashkey);
+			if (cell_index == GIM_INVALID_HASH) return GIM_INVALID_HASH;
+			return m_hash_table[cell_index];
+		}
+		GUINT last_index = m_nodes.size();
+		if (last_index < 2)
+		{
+			if (last_index == 0) return GIM_INVALID_HASH;
+			if (m_nodes[0].m_key == hashkey) return 0;
+			return GIM_INVALID_HASH;
+		}
+		else if (m_sorted)
+		{
+			//Binary search
+			GUINT result_ind = 0;
+			last_index--;
+			_node_type* ptr = m_nodes.pointer();
+
+			bool found = gim_binary_search_ex(ptr, 0, last_index, result_ind, hashkey, GIM_HASH_NODE_CMP_KEY_MACRO());
+
+			if (found) return result_ind;
+		}
+		return GIM_INVALID_HASH;
+	}
+
+	//! Retrieves the value associated with the index
+	/*!
+    \return the found element, or null
+    */
+	inline T* get_value(GUINT hashkey)
+	{
+		GUINT index = find(hashkey);
+		if (index == GIM_INVALID_HASH) return NULL;
+		return &m_nodes[index].m_data;
+	}
+
+	/*!
+    */
+	inline bool erase_by_index(GUINT index)
+	{
+		if (index > m_nodes.size()) return false;
+
+		if (m_hash_table == NULL)
+		{
+			if (is_sorted())
+			{
+				return this->_erase_sorted(index);
+			}
+			else
+			{
+				return this->_erase_unsorted(index);
+			}
+		}
+		else
+		{
+			return this->_erase_by_index_hash_table(index);
+		}
+		return false;
+	}
+
+	inline bool erase_by_index_unsorted(GUINT index)
+	{
+		if (index > m_nodes.size()) return false;
+
+		if (m_hash_table == NULL)
+		{
+			return this->_erase_unsorted(index);
+		}
+		else
+		{
+			return this->_erase_by_index_hash_table(index);
+		}
+		return false;
+	}
+
+	/*!
+
+    */
+	inline bool erase_by_key(GUINT hashkey)
+	{
+		if (size() == 0) return false;
+
+		if (m_hash_table)
+		{
+			return this->_erase_hash_table(hashkey);
+		}
+		//Binary search
+
+		if (is_sorted() == false) return false;
+
+		GUINT result_ind = find(hashkey);
+		if (result_ind != GIM_INVALID_HASH)
+		{
+			return this->_erase_sorted(result_ind);
+		}
+		return false;
+	}
+
+	void clear()
+	{
+		m_nodes.clear();
+
+		if (m_hash_table == NULL) return;
+		GUINT datasize = m_table_size * m_node_size;
+		//Initialize the hashkeys.
+		GUINT i;
+		for (i = 0; i < datasize; i++)
+		{
+			m_hash_table[i] = GIM_INVALID_HASH;  // invalidate keys
+		}
+		m_sorted = false;
+	}
+
+	//! Insert an element into the hash
+	/*!
+    \return If GIM_INVALID_HASH, the object has been inserted succesfully. Else it returns the position
+    of the existing element.
+    */
+	inline GUINT insert(GUINT hashkey, const T& element)
+	{
+		if (m_hash_table)
+		{
+			return this->_insert_hash_table(hashkey, element);
+		}
+		if (this->is_sorted())
+		{
+			return this->_insert_sorted(hashkey, element);
+		}
+		return this->_insert_unsorted(hashkey, element);
+	}
+
+	//! Insert an element into the hash, and could overrite an existing object with the same hash.
+	/*!
+    \return If GIM_INVALID_HASH, the object has been inserted succesfully. Else it returns the position
+    of the replaced element.
+    */
+	inline GUINT insert_override(GUINT hashkey, const T& element)
+	{
+		if (m_hash_table)
+		{
+			return this->_insert_hash_table_replace(hashkey, element);
+		}
+		if (this->is_sorted())
+		{
+			return this->_insert_sorted_replace(hashkey, element);
+		}
+		this->_insert_unsorted(hashkey, element);
+		return m_nodes.size();
+	}
+
+	//! Insert an element into the hash,But if this container is a sorted array, this inserts it unsorted
+	/*!
+    */
+	inline GUINT insert_unsorted(GUINT hashkey, const T& element)
+	{
+		if (m_hash_table)
+		{
+			return this->_insert_hash_table(hashkey, element);
+		}
+		return this->_insert_unsorted(hashkey, element);
+	}
+};
+
+#endif  // GIM_CONTAINERS_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_linear_math.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_linear_math.h
new file mode 100644
index 0000000..98401a4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_linear_math.h
@@ -0,0 +1,1488 @@
+#ifndef GIM_LINEAR_H_INCLUDED
+#define GIM_LINEAR_H_INCLUDED
+
+/*! \file gim_linear_math.h
+*\author Francisco Leon Najera
+Type Independant Vector and matrix operations.
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_math.h"
+#include "gim_geom_types.h"
+
+//! Zero out a 2D vector
+#define VEC_ZERO_2(a)           \
+	{                           \
+		(a)[0] = (a)[1] = 0.0f; \
+	}
+
+//! Zero out a 3D vector
+#define VEC_ZERO(a)                      \
+	{                                    \
+		(a)[0] = (a)[1] = (a)[2] = 0.0f; \
+	}
+
+/// Zero out a 4D vector
+#define VEC_ZERO_4(a)                             \
+	{                                             \
+		(a)[0] = (a)[1] = (a)[2] = (a)[3] = 0.0f; \
+	}
+
+/// Vector copy
+#define VEC_COPY_2(b, a) \
+	{                    \
+		(b)[0] = (a)[0]; \
+		(b)[1] = (a)[1]; \
+	}
+
+/// Copy 3D vector
+#define VEC_COPY(b, a)   \
+	{                    \
+		(b)[0] = (a)[0]; \
+		(b)[1] = (a)[1]; \
+		(b)[2] = (a)[2]; \
+	}
+
+/// Copy 4D vector
+#define VEC_COPY_4(b, a) \
+	{                    \
+		(b)[0] = (a)[0]; \
+		(b)[1] = (a)[1]; \
+		(b)[2] = (a)[2]; \
+		(b)[3] = (a)[3]; \
+	}
+
+/// VECTOR SWAP
+#define VEC_SWAP(b, a)                    \
+	{                                     \
+		GIM_SWAP_NUMBERS((b)[0], (a)[0]); \
+		GIM_SWAP_NUMBERS((b)[1], (a)[1]); \
+		GIM_SWAP_NUMBERS((b)[2], (a)[2]); \
+	}
+
+/// Vector difference
+#define VEC_DIFF_2(v21, v2, v1)       \
+	{                                 \
+		(v21)[0] = (v2)[0] - (v1)[0]; \
+		(v21)[1] = (v2)[1] - (v1)[1]; \
+	}
+
+/// Vector difference
+#define VEC_DIFF(v21, v2, v1)         \
+	{                                 \
+		(v21)[0] = (v2)[0] - (v1)[0]; \
+		(v21)[1] = (v2)[1] - (v1)[1]; \
+		(v21)[2] = (v2)[2] - (v1)[2]; \
+	}
+
+/// Vector difference
+#define VEC_DIFF_4(v21, v2, v1)       \
+	{                                 \
+		(v21)[0] = (v2)[0] - (v1)[0]; \
+		(v21)[1] = (v2)[1] - (v1)[1]; \
+		(v21)[2] = (v2)[2] - (v1)[2]; \
+		(v21)[3] = (v2)[3] - (v1)[3]; \
+	}
+
+/// Vector sum
+#define VEC_SUM_2(v21, v2, v1)        \
+	{                                 \
+		(v21)[0] = (v2)[0] + (v1)[0]; \
+		(v21)[1] = (v2)[1] + (v1)[1]; \
+	}
+
+/// Vector sum
+#define VEC_SUM(v21, v2, v1)          \
+	{                                 \
+		(v21)[0] = (v2)[0] + (v1)[0]; \
+		(v21)[1] = (v2)[1] + (v1)[1]; \
+		(v21)[2] = (v2)[2] + (v1)[2]; \
+	}
+
+/// Vector sum
+#define VEC_SUM_4(v21, v2, v1)        \
+	{                                 \
+		(v21)[0] = (v2)[0] + (v1)[0]; \
+		(v21)[1] = (v2)[1] + (v1)[1]; \
+		(v21)[2] = (v2)[2] + (v1)[2]; \
+		(v21)[3] = (v2)[3] + (v1)[3]; \
+	}
+
+/// scalar times vector
+#define VEC_SCALE_2(c, a, b)   \
+	{                          \
+		(c)[0] = (a) * (b)[0]; \
+		(c)[1] = (a) * (b)[1]; \
+	}
+
+/// scalar times vector
+#define VEC_SCALE(c, a, b)     \
+	{                          \
+		(c)[0] = (a) * (b)[0]; \
+		(c)[1] = (a) * (b)[1]; \
+		(c)[2] = (a) * (b)[2]; \
+	}
+
+/// scalar times vector
+#define VEC_SCALE_4(c, a, b)   \
+	{                          \
+		(c)[0] = (a) * (b)[0]; \
+		(c)[1] = (a) * (b)[1]; \
+		(c)[2] = (a) * (b)[2]; \
+		(c)[3] = (a) * (b)[3]; \
+	}
+
+/// accumulate scaled vector
+#define VEC_ACCUM_2(c, a, b)    \
+	{                           \
+		(c)[0] += (a) * (b)[0]; \
+		(c)[1] += (a) * (b)[1]; \
+	}
+
+/// accumulate scaled vector
+#define VEC_ACCUM(c, a, b)      \
+	{                           \
+		(c)[0] += (a) * (b)[0]; \
+		(c)[1] += (a) * (b)[1]; \
+		(c)[2] += (a) * (b)[2]; \
+	}
+
+/// accumulate scaled vector
+#define VEC_ACCUM_4(c, a, b)    \
+	{                           \
+		(c)[0] += (a) * (b)[0]; \
+		(c)[1] += (a) * (b)[1]; \
+		(c)[2] += (a) * (b)[2]; \
+		(c)[3] += (a) * (b)[3]; \
+	}
+
+/// Vector dot product
+#define VEC_DOT_2(a, b) ((a)[0] * (b)[0] + (a)[1] * (b)[1])
+
+/// Vector dot product
+#define VEC_DOT(a, b) ((a)[0] * (b)[0] + (a)[1] * (b)[1] + (a)[2] * (b)[2])
+
+/// Vector dot product
+#define VEC_DOT_4(a, b) ((a)[0] * (b)[0] + (a)[1] * (b)[1] + (a)[2] * (b)[2] + (a)[3] * (b)[3])
+
+/// vector impact parameter (squared)
+#define VEC_IMPACT_SQ(bsq, direction, position)              \
+	{                                                        \
+		GREAL _llel_ = VEC_DOT(direction, position);         \
+		bsq = VEC_DOT(position, position) - _llel_ * _llel_; \
+	}
+
+/// vector impact parameter
+#define VEC_IMPACT(bsq, direction, position)     \
+	{                                            \
+		VEC_IMPACT_SQ(bsq, direction, position); \
+		GIM_SQRT(bsq, bsq);                      \
+	}
+
+/// Vector length
+#define VEC_LENGTH_2(a, l)           \
+	{                                \
+		GREAL _pp = VEC_DOT_2(a, a); \
+		GIM_SQRT(_pp, l);            \
+	}
+
+/// Vector length
+#define VEC_LENGTH(a, l)           \
+	{                              \
+		GREAL _pp = VEC_DOT(a, a); \
+		GIM_SQRT(_pp, l);          \
+	}
+
+/// Vector length
+#define VEC_LENGTH_4(a, l)           \
+	{                                \
+		GREAL _pp = VEC_DOT_4(a, a); \
+		GIM_SQRT(_pp, l);            \
+	}
+
+/// Vector inv length
+#define VEC_INV_LENGTH_2(a, l)       \
+	{                                \
+		GREAL _pp = VEC_DOT_2(a, a); \
+		GIM_INV_SQRT(_pp, l);        \
+	}
+
+/// Vector inv length
+#define VEC_INV_LENGTH(a, l)       \
+	{                              \
+		GREAL _pp = VEC_DOT(a, a); \
+		GIM_INV_SQRT(_pp, l);      \
+	}
+
+/// Vector inv length
+#define VEC_INV_LENGTH_4(a, l)       \
+	{                                \
+		GREAL _pp = VEC_DOT_4(a, a); \
+		GIM_INV_SQRT(_pp, l);        \
+	}
+
+/// distance between two points
+#define VEC_DISTANCE(_len, _va, _vb) \
+	{                                \
+		vec3f _tmp_;                 \
+		VEC_DIFF(_tmp_, _vb, _va);   \
+		VEC_LENGTH(_tmp_, _len);     \
+	}
+
+/// Vector length
+#define VEC_CONJUGATE_LENGTH(a, l)                                 \
+	{                                                              \
+		GREAL _pp = 1.0 - a[0] * a[0] - a[1] * a[1] - a[2] * a[2]; \
+		GIM_SQRT(_pp, l);                                          \
+	}
+
+/// Vector length
+#define VEC_NORMALIZE(a)           \
+	{                              \
+		GREAL len;                 \
+		VEC_INV_LENGTH(a, len);    \
+		if (len < G_REAL_INFINITY) \
+		{                          \
+			a[0] *= len;           \
+			a[1] *= len;           \
+			a[2] *= len;           \
+		}                          \
+	}
+
+/// Set Vector size
+#define VEC_RENORMALIZE(a, newlen) \
+	{                              \
+		GREAL len;                 \
+		VEC_INV_LENGTH(a, len);    \
+		if (len < G_REAL_INFINITY) \
+		{                          \
+			len *= newlen;         \
+			a[0] *= len;           \
+			a[1] *= len;           \
+			a[2] *= len;           \
+		}                          \
+	}
+
+/// Vector cross
+#define VEC_CROSS(c, a, b)                        \
+	{                                             \
+		c[0] = (a)[1] * (b)[2] - (a)[2] * (b)[1]; \
+		c[1] = (a)[2] * (b)[0] - (a)[0] * (b)[2]; \
+		c[2] = (a)[0] * (b)[1] - (a)[1] * (b)[0]; \
+	}
+
+/*! Vector perp -- assumes that n is of unit length
+ * accepts vector v, subtracts out any component parallel to n */
+#define VEC_PERPENDICULAR(vp, v, n)    \
+	{                                  \
+		GREAL dot = VEC_DOT(v, n);     \
+		vp[0] = (v)[0] - dot * (n)[0]; \
+		vp[1] = (v)[1] - dot * (n)[1]; \
+		vp[2] = (v)[2] - dot * (n)[2]; \
+	}
+
+/*! Vector parallel -- assumes that n is of unit length */
+#define VEC_PARALLEL(vp, v, n)     \
+	{                              \
+		GREAL dot = VEC_DOT(v, n); \
+		vp[0] = (dot) * (n)[0];    \
+		vp[1] = (dot) * (n)[1];    \
+		vp[2] = (dot) * (n)[2];    \
+	}
+
+/*! Same as Vector parallel --  n can have any length
+ * accepts vector v, subtracts out any component perpendicular to n */
+#define VEC_PROJECT(vp, v, n)         \
+	{                                 \
+		GREAL scalar = VEC_DOT(v, n); \
+		scalar /= VEC_DOT(n, n);      \
+		vp[0] = (scalar) * (n)[0];    \
+		vp[1] = (scalar) * (n)[1];    \
+		vp[2] = (scalar) * (n)[2];    \
+	}
+
+/*! accepts vector v*/
+#define VEC_UNPROJECT(vp, v, n)          \
+	{                                    \
+		GREAL scalar = VEC_DOT(v, n);    \
+		scalar = VEC_DOT(n, n) / scalar; \
+		vp[0] = (scalar) * (n)[0];       \
+		vp[1] = (scalar) * (n)[1];       \
+		vp[2] = (scalar) * (n)[2];       \
+	}
+
+/*! Vector reflection -- assumes n is of unit length
+ Takes vector v, reflects it against reflector n, and returns vr */
+#define VEC_REFLECT(vr, v, n)                  \
+	{                                          \
+		GREAL dot = VEC_DOT(v, n);             \
+		vr[0] = (v)[0] - 2.0 * (dot) * (n)[0]; \
+		vr[1] = (v)[1] - 2.0 * (dot) * (n)[1]; \
+		vr[2] = (v)[2] - 2.0 * (dot) * (n)[2]; \
+	}
+
+/*! Vector blending
+Takes two vectors a, b, blends them together with two scalars */
+#define VEC_BLEND_AB(vr, sa, a, sb, b)         \
+	{                                          \
+		vr[0] = (sa) * (a)[0] + (sb) * (b)[0]; \
+		vr[1] = (sa) * (a)[1] + (sb) * (b)[1]; \
+		vr[2] = (sa) * (a)[2] + (sb) * (b)[2]; \
+	}
+
+/*! Vector blending
+Takes two vectors a, b, blends them together with s <=1 */
+#define VEC_BLEND(vr, a, b, s) VEC_BLEND_AB(vr, (1 - s), a, s, b)
+
+#define VEC_SET3(a, b, op, c) \
+	a[0] = b[0] op c[0];      \
+	a[1] = b[1] op c[1];      \
+	a[2] = b[2] op c[2];
+
+//! Finds the bigger cartesian coordinate from a vector
+#define VEC_MAYOR_COORD(vec, maxc)                                          \
+	{                                                                       \
+		GREAL A[] = {fabs(vec[0]), fabs(vec[1]), fabs(vec[2])};             \
+		maxc = A[0] > A[1] ? (A[0] > A[2] ? 0 : 2) : (A[1] > A[2] ? 1 : 2); \
+	}
+
+//! Finds the 2 smallest cartesian coordinates from a vector
+#define VEC_MINOR_AXES(vec, i0, i1) \
+	{                               \
+		VEC_MAYOR_COORD(vec, i0);   \
+		i0 = (i0 + 1) % 3;          \
+		i1 = (i0 + 1) % 3;          \
+	}
+
+#define VEC_EQUAL(v1, v2) (v1[0] == v2[0] && v1[1] == v2[1] && v1[2] == v2[2])
+
+#define VEC_NEAR_EQUAL(v1, v2) (GIM_NEAR_EQUAL(v1[0], v2[0]) && GIM_NEAR_EQUAL(v1[1], v2[1]) && GIM_NEAR_EQUAL(v1[2], v2[2]))
+
+/// Vector cross
+#define X_AXIS_CROSS_VEC(dst, src) \
+	{                              \
+		dst[0] = 0.0f;             \
+		dst[1] = -src[2];          \
+		dst[2] = src[1];           \
+	}
+
+#define Y_AXIS_CROSS_VEC(dst, src) \
+	{                              \
+		dst[0] = src[2];           \
+		dst[1] = 0.0f;             \
+		dst[2] = -src[0];          \
+	}
+
+#define Z_AXIS_CROSS_VEC(dst, src) \
+	{                              \
+		dst[0] = -src[1];          \
+		dst[1] = src[0];           \
+		dst[2] = 0.0f;             \
+	}
+
+/// initialize matrix
+#define IDENTIFY_MATRIX_3X3(m) \
+	{                          \
+		m[0][0] = 1.0;         \
+		m[0][1] = 0.0;         \
+		m[0][2] = 0.0;         \
+                               \
+		m[1][0] = 0.0;         \
+		m[1][1] = 1.0;         \
+		m[1][2] = 0.0;         \
+                               \
+		m[2][0] = 0.0;         \
+		m[2][1] = 0.0;         \
+		m[2][2] = 1.0;         \
+	}
+
+/*! initialize matrix */
+#define IDENTIFY_MATRIX_4X4(m) \
+	{                          \
+		m[0][0] = 1.0;         \
+		m[0][1] = 0.0;         \
+		m[0][2] = 0.0;         \
+		m[0][3] = 0.0;         \
+                               \
+		m[1][0] = 0.0;         \
+		m[1][1] = 1.0;         \
+		m[1][2] = 0.0;         \
+		m[1][3] = 0.0;         \
+                               \
+		m[2][0] = 0.0;         \
+		m[2][1] = 0.0;         \
+		m[2][2] = 1.0;         \
+		m[2][3] = 0.0;         \
+                               \
+		m[3][0] = 0.0;         \
+		m[3][1] = 0.0;         \
+		m[3][2] = 0.0;         \
+		m[3][3] = 1.0;         \
+	}
+
+/*! initialize matrix */
+#define ZERO_MATRIX_4X4(m) \
+	{                      \
+		m[0][0] = 0.0;     \
+		m[0][1] = 0.0;     \
+		m[0][2] = 0.0;     \
+		m[0][3] = 0.0;     \
+                           \
+		m[1][0] = 0.0;     \
+		m[1][1] = 0.0;     \
+		m[1][2] = 0.0;     \
+		m[1][3] = 0.0;     \
+                           \
+		m[2][0] = 0.0;     \
+		m[2][1] = 0.0;     \
+		m[2][2] = 0.0;     \
+		m[2][3] = 0.0;     \
+                           \
+		m[3][0] = 0.0;     \
+		m[3][1] = 0.0;     \
+		m[3][2] = 0.0;     \
+		m[3][3] = 0.0;     \
+	}
+
+/*! matrix rotation  X */
+#define ROTX_CS(m, cosine, sine)        \
+	{                                   \
+		/* rotation about the x-axis */ \
+                                        \
+		m[0][0] = 1.0;                  \
+		m[0][1] = 0.0;                  \
+		m[0][2] = 0.0;                  \
+		m[0][3] = 0.0;                  \
+                                        \
+		m[1][0] = 0.0;                  \
+		m[1][1] = (cosine);             \
+		m[1][2] = (sine);               \
+		m[1][3] = 0.0;                  \
+                                        \
+		m[2][0] = 0.0;                  \
+		m[2][1] = -(sine);              \
+		m[2][2] = (cosine);             \
+		m[2][3] = 0.0;                  \
+                                        \
+		m[3][0] = 0.0;                  \
+		m[3][1] = 0.0;                  \
+		m[3][2] = 0.0;                  \
+		m[3][3] = 1.0;                  \
+	}
+
+/*! matrix rotation  Y */
+#define ROTY_CS(m, cosine, sine)        \
+	{                                   \
+		/* rotation about the y-axis */ \
+                                        \
+		m[0][0] = (cosine);             \
+		m[0][1] = 0.0;                  \
+		m[0][2] = -(sine);              \
+		m[0][3] = 0.0;                  \
+                                        \
+		m[1][0] = 0.0;                  \
+		m[1][1] = 1.0;                  \
+		m[1][2] = 0.0;                  \
+		m[1][3] = 0.0;                  \
+                                        \
+		m[2][0] = (sine);               \
+		m[2][1] = 0.0;                  \
+		m[2][2] = (cosine);             \
+		m[2][3] = 0.0;                  \
+                                        \
+		m[3][0] = 0.0;                  \
+		m[3][1] = 0.0;                  \
+		m[3][2] = 0.0;                  \
+		m[3][3] = 1.0;                  \
+	}
+
+/*! matrix rotation  Z */
+#define ROTZ_CS(m, cosine, sine)        \
+	{                                   \
+		/* rotation about the z-axis */ \
+                                        \
+		m[0][0] = (cosine);             \
+		m[0][1] = (sine);               \
+		m[0][2] = 0.0;                  \
+		m[0][3] = 0.0;                  \
+                                        \
+		m[1][0] = -(sine);              \
+		m[1][1] = (cosine);             \
+		m[1][2] = 0.0;                  \
+		m[1][3] = 0.0;                  \
+                                        \
+		m[2][0] = 0.0;                  \
+		m[2][1] = 0.0;                  \
+		m[2][2] = 1.0;                  \
+		m[2][3] = 0.0;                  \
+                                        \
+		m[3][0] = 0.0;                  \
+		m[3][1] = 0.0;                  \
+		m[3][2] = 0.0;                  \
+		m[3][3] = 1.0;                  \
+	}
+
+/*! matrix copy */
+#define COPY_MATRIX_2X2(b, a) \
+	{                         \
+		b[0][0] = a[0][0];    \
+		b[0][1] = a[0][1];    \
+                              \
+		b[1][0] = a[1][0];    \
+		b[1][1] = a[1][1];    \
+	}
+
+/*! matrix copy */
+#define COPY_MATRIX_2X3(b, a) \
+	{                         \
+		b[0][0] = a[0][0];    \
+		b[0][1] = a[0][1];    \
+		b[0][2] = a[0][2];    \
+                              \
+		b[1][0] = a[1][0];    \
+		b[1][1] = a[1][1];    \
+		b[1][2] = a[1][2];    \
+	}
+
+/*! matrix copy */
+#define COPY_MATRIX_3X3(b, a) \
+	{                         \
+		b[0][0] = a[0][0];    \
+		b[0][1] = a[0][1];    \
+		b[0][2] = a[0][2];    \
+                              \
+		b[1][0] = a[1][0];    \
+		b[1][1] = a[1][1];    \
+		b[1][2] = a[1][2];    \
+                              \
+		b[2][0] = a[2][0];    \
+		b[2][1] = a[2][1];    \
+		b[2][2] = a[2][2];    \
+	}
+
+/*! matrix copy */
+#define COPY_MATRIX_4X4(b, a) \
+	{                         \
+		b[0][0] = a[0][0];    \
+		b[0][1] = a[0][1];    \
+		b[0][2] = a[0][2];    \
+		b[0][3] = a[0][3];    \
+                              \
+		b[1][0] = a[1][0];    \
+		b[1][1] = a[1][1];    \
+		b[1][2] = a[1][2];    \
+		b[1][3] = a[1][3];    \
+                              \
+		b[2][0] = a[2][0];    \
+		b[2][1] = a[2][1];    \
+		b[2][2] = a[2][2];    \
+		b[2][3] = a[2][3];    \
+                              \
+		b[3][0] = a[3][0];    \
+		b[3][1] = a[3][1];    \
+		b[3][2] = a[3][2];    \
+		b[3][3] = a[3][3];    \
+	}
+
+/*! matrix transpose */
+#define TRANSPOSE_MATRIX_2X2(b, a) \
+	{                              \
+		b[0][0] = a[0][0];         \
+		b[0][1] = a[1][0];         \
+                                   \
+		b[1][0] = a[0][1];         \
+		b[1][1] = a[1][1];         \
+	}
+
+/*! matrix transpose */
+#define TRANSPOSE_MATRIX_3X3(b, a) \
+	{                              \
+		b[0][0] = a[0][0];         \
+		b[0][1] = a[1][0];         \
+		b[0][2] = a[2][0];         \
+                                   \
+		b[1][0] = a[0][1];         \
+		b[1][1] = a[1][1];         \
+		b[1][2] = a[2][1];         \
+                                   \
+		b[2][0] = a[0][2];         \
+		b[2][1] = a[1][2];         \
+		b[2][2] = a[2][2];         \
+	}
+
+/*! matrix transpose */
+#define TRANSPOSE_MATRIX_4X4(b, a) \
+	{                              \
+		b[0][0] = a[0][0];         \
+		b[0][1] = a[1][0];         \
+		b[0][2] = a[2][0];         \
+		b[0][3] = a[3][0];         \
+                                   \
+		b[1][0] = a[0][1];         \
+		b[1][1] = a[1][1];         \
+		b[1][2] = a[2][1];         \
+		b[1][3] = a[3][1];         \
+                                   \
+		b[2][0] = a[0][2];         \
+		b[2][1] = a[1][2];         \
+		b[2][2] = a[2][2];         \
+		b[2][3] = a[3][2];         \
+                                   \
+		b[3][0] = a[0][3];         \
+		b[3][1] = a[1][3];         \
+		b[3][2] = a[2][3];         \
+		b[3][3] = a[3][3];         \
+	}
+
+/*! multiply matrix by scalar */
+#define SCALE_MATRIX_2X2(b, s, a) \
+	{                             \
+		b[0][0] = (s)*a[0][0];    \
+		b[0][1] = (s)*a[0][1];    \
+                                  \
+		b[1][0] = (s)*a[1][0];    \
+		b[1][1] = (s)*a[1][1];    \
+	}
+
+/*! multiply matrix by scalar */
+#define SCALE_MATRIX_3X3(b, s, a) \
+	{                             \
+		b[0][0] = (s)*a[0][0];    \
+		b[0][1] = (s)*a[0][1];    \
+		b[0][2] = (s)*a[0][2];    \
+                                  \
+		b[1][0] = (s)*a[1][0];    \
+		b[1][1] = (s)*a[1][1];    \
+		b[1][2] = (s)*a[1][2];    \
+                                  \
+		b[2][0] = (s)*a[2][0];    \
+		b[2][1] = (s)*a[2][1];    \
+		b[2][2] = (s)*a[2][2];    \
+	}
+
+/*! multiply matrix by scalar */
+#define SCALE_MATRIX_4X4(b, s, a) \
+	{                             \
+		b[0][0] = (s)*a[0][0];    \
+		b[0][1] = (s)*a[0][1];    \
+		b[0][2] = (s)*a[0][2];    \
+		b[0][3] = (s)*a[0][3];    \
+                                  \
+		b[1][0] = (s)*a[1][0];    \
+		b[1][1] = (s)*a[1][1];    \
+		b[1][2] = (s)*a[1][2];    \
+		b[1][3] = (s)*a[1][3];    \
+                                  \
+		b[2][0] = (s)*a[2][0];    \
+		b[2][1] = (s)*a[2][1];    \
+		b[2][2] = (s)*a[2][2];    \
+		b[2][3] = (s)*a[2][3];    \
+                                  \
+		b[3][0] = s * a[3][0];    \
+		b[3][1] = s * a[3][1];    \
+		b[3][2] = s * a[3][2];    \
+		b[3][3] = s * a[3][3];    \
+	}
+
+/*! multiply matrix by scalar */
+#define SCALE_VEC_MATRIX_2X2(b, svec, a) \
+	{                                    \
+		b[0][0] = svec[0] * a[0][0];     \
+		b[1][0] = svec[0] * a[1][0];     \
+                                         \
+		b[0][1] = svec[1] * a[0][1];     \
+		b[1][1] = svec[1] * a[1][1];     \
+	}
+
+/*! multiply matrix by scalar. Each columns is scaled by each scalar vector component */
+#define SCALE_VEC_MATRIX_3X3(b, svec, a) \
+	{                                    \
+		b[0][0] = svec[0] * a[0][0];     \
+		b[1][0] = svec[0] * a[1][0];     \
+		b[2][0] = svec[0] * a[2][0];     \
+                                         \
+		b[0][1] = svec[1] * a[0][1];     \
+		b[1][1] = svec[1] * a[1][1];     \
+		b[2][1] = svec[1] * a[2][1];     \
+                                         \
+		b[0][2] = svec[2] * a[0][2];     \
+		b[1][2] = svec[2] * a[1][2];     \
+		b[2][2] = svec[2] * a[2][2];     \
+	}
+
+/*! multiply matrix by scalar */
+#define SCALE_VEC_MATRIX_4X4(b, svec, a) \
+	{                                    \
+		b[0][0] = svec[0] * a[0][0];     \
+		b[1][0] = svec[0] * a[1][0];     \
+		b[2][0] = svec[0] * a[2][0];     \
+		b[3][0] = svec[0] * a[3][0];     \
+                                         \
+		b[0][1] = svec[1] * a[0][1];     \
+		b[1][1] = svec[1] * a[1][1];     \
+		b[2][1] = svec[1] * a[2][1];     \
+		b[3][1] = svec[1] * a[3][1];     \
+                                         \
+		b[0][2] = svec[2] * a[0][2];     \
+		b[1][2] = svec[2] * a[1][2];     \
+		b[2][2] = svec[2] * a[2][2];     \
+		b[3][2] = svec[2] * a[3][2];     \
+                                         \
+		b[0][3] = svec[3] * a[0][3];     \
+		b[1][3] = svec[3] * a[1][3];     \
+		b[2][3] = svec[3] * a[2][3];     \
+		b[3][3] = svec[3] * a[3][3];     \
+	}
+
+/*! multiply matrix by scalar */
+#define ACCUM_SCALE_MATRIX_2X2(b, s, a) \
+	{                                   \
+		b[0][0] += (s)*a[0][0];         \
+		b[0][1] += (s)*a[0][1];         \
+                                        \
+		b[1][0] += (s)*a[1][0];         \
+		b[1][1] += (s)*a[1][1];         \
+	}
+
+/*! multiply matrix by scalar */
+#define ACCUM_SCALE_MATRIX_3X3(b, s, a) \
+	{                                   \
+		b[0][0] += (s)*a[0][0];         \
+		b[0][1] += (s)*a[0][1];         \
+		b[0][2] += (s)*a[0][2];         \
+                                        \
+		b[1][0] += (s)*a[1][0];         \
+		b[1][1] += (s)*a[1][1];         \
+		b[1][2] += (s)*a[1][2];         \
+                                        \
+		b[2][0] += (s)*a[2][0];         \
+		b[2][1] += (s)*a[2][1];         \
+		b[2][2] += (s)*a[2][2];         \
+	}
+
+/*! multiply matrix by scalar */
+#define ACCUM_SCALE_MATRIX_4X4(b, s, a) \
+	{                                   \
+		b[0][0] += (s)*a[0][0];         \
+		b[0][1] += (s)*a[0][1];         \
+		b[0][2] += (s)*a[0][2];         \
+		b[0][3] += (s)*a[0][3];         \
+                                        \
+		b[1][0] += (s)*a[1][0];         \
+		b[1][1] += (s)*a[1][1];         \
+		b[1][2] += (s)*a[1][2];         \
+		b[1][3] += (s)*a[1][3];         \
+                                        \
+		b[2][0] += (s)*a[2][0];         \
+		b[2][1] += (s)*a[2][1];         \
+		b[2][2] += (s)*a[2][2];         \
+		b[2][3] += (s)*a[2][3];         \
+                                        \
+		b[3][0] += (s)*a[3][0];         \
+		b[3][1] += (s)*a[3][1];         \
+		b[3][2] += (s)*a[3][2];         \
+		b[3][3] += (s)*a[3][3];         \
+	}
+
+/*! matrix product */
+/*! c[x][y] = a[x][0]*b[0][y]+a[x][1]*b[1][y]+a[x][2]*b[2][y]+a[x][3]*b[3][y];*/
+#define MATRIX_PRODUCT_2X2(c, a, b)                      \
+	{                                                    \
+		c[0][0] = a[0][0] * b[0][0] + a[0][1] * b[1][0]; \
+		c[0][1] = a[0][0] * b[0][1] + a[0][1] * b[1][1]; \
+                                                         \
+		c[1][0] = a[1][0] * b[0][0] + a[1][1] * b[1][0]; \
+		c[1][1] = a[1][0] * b[0][1] + a[1][1] * b[1][1]; \
+	}
+
+/*! matrix product */
+/*! c[x][y] = a[x][0]*b[0][y]+a[x][1]*b[1][y]+a[x][2]*b[2][y]+a[x][3]*b[3][y];*/
+#define MATRIX_PRODUCT_3X3(c, a, b)                                          \
+	{                                                                        \
+		c[0][0] = a[0][0] * b[0][0] + a[0][1] * b[1][0] + a[0][2] * b[2][0]; \
+		c[0][1] = a[0][0] * b[0][1] + a[0][1] * b[1][1] + a[0][2] * b[2][1]; \
+		c[0][2] = a[0][0] * b[0][2] + a[0][1] * b[1][2] + a[0][2] * b[2][2]; \
+                                                                             \
+		c[1][0] = a[1][0] * b[0][0] + a[1][1] * b[1][0] + a[1][2] * b[2][0]; \
+		c[1][1] = a[1][0] * b[0][1] + a[1][1] * b[1][1] + a[1][2] * b[2][1]; \
+		c[1][2] = a[1][0] * b[0][2] + a[1][1] * b[1][2] + a[1][2] * b[2][2]; \
+                                                                             \
+		c[2][0] = a[2][0] * b[0][0] + a[2][1] * b[1][0] + a[2][2] * b[2][0]; \
+		c[2][1] = a[2][0] * b[0][1] + a[2][1] * b[1][1] + a[2][2] * b[2][1]; \
+		c[2][2] = a[2][0] * b[0][2] + a[2][1] * b[1][2] + a[2][2] * b[2][2]; \
+	}
+
+/*! matrix product */
+/*! c[x][y] = a[x][0]*b[0][y]+a[x][1]*b[1][y]+a[x][2]*b[2][y]+a[x][3]*b[3][y];*/
+#define MATRIX_PRODUCT_4X4(c, a, b)                                                              \
+	{                                                                                            \
+		c[0][0] = a[0][0] * b[0][0] + a[0][1] * b[1][0] + a[0][2] * b[2][0] + a[0][3] * b[3][0]; \
+		c[0][1] = a[0][0] * b[0][1] + a[0][1] * b[1][1] + a[0][2] * b[2][1] + a[0][3] * b[3][1]; \
+		c[0][2] = a[0][0] * b[0][2] + a[0][1] * b[1][2] + a[0][2] * b[2][2] + a[0][3] * b[3][2]; \
+		c[0][3] = a[0][0] * b[0][3] + a[0][1] * b[1][3] + a[0][2] * b[2][3] + a[0][3] * b[3][3]; \
+                                                                                                 \
+		c[1][0] = a[1][0] * b[0][0] + a[1][1] * b[1][0] + a[1][2] * b[2][0] + a[1][3] * b[3][0]; \
+		c[1][1] = a[1][0] * b[0][1] + a[1][1] * b[1][1] + a[1][2] * b[2][1] + a[1][3] * b[3][1]; \
+		c[1][2] = a[1][0] * b[0][2] + a[1][1] * b[1][2] + a[1][2] * b[2][2] + a[1][3] * b[3][2]; \
+		c[1][3] = a[1][0] * b[0][3] + a[1][1] * b[1][3] + a[1][2] * b[2][3] + a[1][3] * b[3][3]; \
+                                                                                                 \
+		c[2][0] = a[2][0] * b[0][0] + a[2][1] * b[1][0] + a[2][2] * b[2][0] + a[2][3] * b[3][0]; \
+		c[2][1] = a[2][0] * b[0][1] + a[2][1] * b[1][1] + a[2][2] * b[2][1] + a[2][3] * b[3][1]; \
+		c[2][2] = a[2][0] * b[0][2] + a[2][1] * b[1][2] + a[2][2] * b[2][2] + a[2][3] * b[3][2]; \
+		c[2][3] = a[2][0] * b[0][3] + a[2][1] * b[1][3] + a[2][2] * b[2][3] + a[2][3] * b[3][3]; \
+                                                                                                 \
+		c[3][0] = a[3][0] * b[0][0] + a[3][1] * b[1][0] + a[3][2] * b[2][0] + a[3][3] * b[3][0]; \
+		c[3][1] = a[3][0] * b[0][1] + a[3][1] * b[1][1] + a[3][2] * b[2][1] + a[3][3] * b[3][1]; \
+		c[3][2] = a[3][0] * b[0][2] + a[3][1] * b[1][2] + a[3][2] * b[2][2] + a[3][3] * b[3][2]; \
+		c[3][3] = a[3][0] * b[0][3] + a[3][1] * b[1][3] + a[3][2] * b[2][3] + a[3][3] * b[3][3]; \
+	}
+
+/*! matrix times vector */
+#define MAT_DOT_VEC_2X2(p, m, v)                \
+	{                                           \
+		p[0] = m[0][0] * v[0] + m[0][1] * v[1]; \
+		p[1] = m[1][0] * v[0] + m[1][1] * v[1]; \
+	}
+
+/*! matrix times vector */
+#define MAT_DOT_VEC_3X3(p, m, v)                                 \
+	{                                                            \
+		p[0] = m[0][0] * v[0] + m[0][1] * v[1] + m[0][2] * v[2]; \
+		p[1] = m[1][0] * v[0] + m[1][1] * v[1] + m[1][2] * v[2]; \
+		p[2] = m[2][0] * v[0] + m[2][1] * v[1] + m[2][2] * v[2]; \
+	}
+
+/*! matrix times vector
+v is a vec4f
+*/
+#define MAT_DOT_VEC_4X4(p, m, v)                                                  \
+	{                                                                             \
+		p[0] = m[0][0] * v[0] + m[0][1] * v[1] + m[0][2] * v[2] + m[0][3] * v[3]; \
+		p[1] = m[1][0] * v[0] + m[1][1] * v[1] + m[1][2] * v[2] + m[1][3] * v[3]; \
+		p[2] = m[2][0] * v[0] + m[2][1] * v[1] + m[2][2] * v[2] + m[2][3] * v[3]; \
+		p[3] = m[3][0] * v[0] + m[3][1] * v[1] + m[3][2] * v[2] + m[3][3] * v[3]; \
+	}
+
+/*! matrix times vector
+v is a vec3f
+and m is a mat4f<br>
+Last column is added as the position
+*/
+#define MAT_DOT_VEC_3X4(p, m, v)                                           \
+	{                                                                      \
+		p[0] = m[0][0] * v[0] + m[0][1] * v[1] + m[0][2] * v[2] + m[0][3]; \
+		p[1] = m[1][0] * v[0] + m[1][1] * v[1] + m[1][2] * v[2] + m[1][3]; \
+		p[2] = m[2][0] * v[0] + m[2][1] * v[1] + m[2][2] * v[2] + m[2][3]; \
+	}
+
+/*! vector transpose times matrix */
+/*! p[j] = v[0]*m[0][j] + v[1]*m[1][j] + v[2]*m[2][j]; */
+#define VEC_DOT_MAT_3X3(p, v, m)                                 \
+	{                                                            \
+		p[0] = v[0] * m[0][0] + v[1] * m[1][0] + v[2] * m[2][0]; \
+		p[1] = v[0] * m[0][1] + v[1] * m[1][1] + v[2] * m[2][1]; \
+		p[2] = v[0] * m[0][2] + v[1] * m[1][2] + v[2] * m[2][2]; \
+	}
+
+/*! affine matrix times vector */
+/** The matrix is assumed to be an affine matrix, with last two
+ * entries representing a translation */
+#define MAT_DOT_VEC_2X3(p, m, v)                          \
+	{                                                     \
+		p[0] = m[0][0] * v[0] + m[0][1] * v[1] + m[0][2]; \
+		p[1] = m[1][0] * v[0] + m[1][1] * v[1] + m[1][2]; \
+	}
+
+//! Transform a plane
+#define MAT_TRANSFORM_PLANE_4X4(pout, m, plane)                                         \
+	{                                                                                   \
+		pout[0] = m[0][0] * plane[0] + m[0][1] * plane[1] + m[0][2] * plane[2];         \
+		pout[1] = m[1][0] * plane[0] + m[1][1] * plane[1] + m[1][2] * plane[2];         \
+		pout[2] = m[2][0] * plane[0] + m[2][1] * plane[1] + m[2][2] * plane[2];         \
+		pout[3] = m[0][3] * pout[0] + m[1][3] * pout[1] + m[2][3] * pout[2] + plane[3]; \
+	}
+
+/** inverse transpose of matrix times vector
+ *
+ * This macro computes inverse transpose of matrix m,
+ * and multiplies vector v into it, to yeild vector p
+ *
+ * DANGER !!! Do Not use this on normal vectors!!!
+ * It will leave normals the wrong length !!!
+ * See macro below for use on normals.
+ */
+#define INV_TRANSP_MAT_DOT_VEC_2X2(p, m, v)                                 \
+	{                                                                       \
+		GREAL det;                                                          \
+                                                                            \
+		det = m[0][0] * m[1][1] - m[0][1] * m[1][0];                        \
+		p[0] = m[1][1] * v[0] - m[1][0] * v[1];                             \
+		p[1] = -m[0][1] * v[0] + m[0][0] * v[1];                            \
+                                                                            \
+		/* if matrix not singular, and not orthonormal, then renormalize */ \
+		if ((det != 1.0f) && (det != 0.0f))                                 \
+		{                                                                   \
+			det = 1.0f / det;                                               \
+			p[0] *= det;                                                    \
+			p[1] *= det;                                                    \
+		}                                                                   \
+	}
+
+/** transform normal vector by inverse transpose of matrix
+ * and then renormalize the vector
+ *
+ * This macro computes inverse transpose of matrix m,
+ * and multiplies vector v into it, to yeild vector p
+ * Vector p is then normalized.
+ */
+#define NORM_XFORM_2X2(p, m, v)                                           \
+	{                                                                     \
+		GREAL len;                                                        \
+                                                                          \
+		/* do nothing if off-diagonals are zero and diagonals are 	\
+    * equal */      \
+		if ((m[0][1] != 0.0) || (m[1][0] != 0.0) || (m[0][0] != m[1][1])) \
+		{                                                                 \
+			p[0] = m[1][1] * v[0] - m[1][0] * v[1];                       \
+			p[1] = -m[0][1] * v[0] + m[0][0] * v[1];                      \
+                                                                          \
+			len = p[0] * p[0] + p[1] * p[1];                              \
+			GIM_INV_SQRT(len, len);                                       \
+			p[0] *= len;                                                  \
+			p[1] *= len;                                                  \
+		}                                                                 \
+		else                                                              \
+		{                                                                 \
+			VEC_COPY_2(p, v);                                             \
+		}                                                                 \
+	}
+
+/** outer product of vector times vector transpose
+ *
+ * The outer product of vector v and vector transpose t yeilds
+ * dyadic matrix m.
+ */
+#define OUTER_PRODUCT_2X2(m, v, t) \
+	{                              \
+		m[0][0] = v[0] * t[0];     \
+		m[0][1] = v[0] * t[1];     \
+                                   \
+		m[1][0] = v[1] * t[0];     \
+		m[1][1] = v[1] * t[1];     \
+	}
+
+/** outer product of vector times vector transpose
+ *
+ * The outer product of vector v and vector transpose t yeilds
+ * dyadic matrix m.
+ */
+#define OUTER_PRODUCT_3X3(m, v, t) \
+	{                              \
+		m[0][0] = v[0] * t[0];     \
+		m[0][1] = v[0] * t[1];     \
+		m[0][2] = v[0] * t[2];     \
+                                   \
+		m[1][0] = v[1] * t[0];     \
+		m[1][1] = v[1] * t[1];     \
+		m[1][2] = v[1] * t[2];     \
+                                   \
+		m[2][0] = v[2] * t[0];     \
+		m[2][1] = v[2] * t[1];     \
+		m[2][2] = v[2] * t[2];     \
+	}
+
+/** outer product of vector times vector transpose
+ *
+ * The outer product of vector v and vector transpose t yeilds
+ * dyadic matrix m.
+ */
+#define OUTER_PRODUCT_4X4(m, v, t) \
+	{                              \
+		m[0][0] = v[0] * t[0];     \
+		m[0][1] = v[0] * t[1];     \
+		m[0][2] = v[0] * t[2];     \
+		m[0][3] = v[0] * t[3];     \
+                                   \
+		m[1][0] = v[1] * t[0];     \
+		m[1][1] = v[1] * t[1];     \
+		m[1][2] = v[1] * t[2];     \
+		m[1][3] = v[1] * t[3];     \
+                                   \
+		m[2][0] = v[2] * t[0];     \
+		m[2][1] = v[2] * t[1];     \
+		m[2][2] = v[2] * t[2];     \
+		m[2][3] = v[2] * t[3];     \
+                                   \
+		m[3][0] = v[3] * t[0];     \
+		m[3][1] = v[3] * t[1];     \
+		m[3][2] = v[3] * t[2];     \
+		m[3][3] = v[3] * t[3];     \
+	}
+
+/** outer product of vector times vector transpose
+ *
+ * The outer product of vector v and vector transpose t yeilds
+ * dyadic matrix m.
+ */
+#define ACCUM_OUTER_PRODUCT_2X2(m, v, t) \
+	{                                    \
+		m[0][0] += v[0] * t[0];          \
+		m[0][1] += v[0] * t[1];          \
+                                         \
+		m[1][0] += v[1] * t[0];          \
+		m[1][1] += v[1] * t[1];          \
+	}
+
+/** outer product of vector times vector transpose
+ *
+ * The outer product of vector v and vector transpose t yeilds
+ * dyadic matrix m.
+ */
+#define ACCUM_OUTER_PRODUCT_3X3(m, v, t) \
+	{                                    \
+		m[0][0] += v[0] * t[0];          \
+		m[0][1] += v[0] * t[1];          \
+		m[0][2] += v[0] * t[2];          \
+                                         \
+		m[1][0] += v[1] * t[0];          \
+		m[1][1] += v[1] * t[1];          \
+		m[1][2] += v[1] * t[2];          \
+                                         \
+		m[2][0] += v[2] * t[0];          \
+		m[2][1] += v[2] * t[1];          \
+		m[2][2] += v[2] * t[2];          \
+	}
+
+/** outer product of vector times vector transpose
+ *
+ * The outer product of vector v and vector transpose t yeilds
+ * dyadic matrix m.
+ */
+#define ACCUM_OUTER_PRODUCT_4X4(m, v, t) \
+	{                                    \
+		m[0][0] += v[0] * t[0];          \
+		m[0][1] += v[0] * t[1];          \
+		m[0][2] += v[0] * t[2];          \
+		m[0][3] += v[0] * t[3];          \
+                                         \
+		m[1][0] += v[1] * t[0];          \
+		m[1][1] += v[1] * t[1];          \
+		m[1][2] += v[1] * t[2];          \
+		m[1][3] += v[1] * t[3];          \
+                                         \
+		m[2][0] += v[2] * t[0];          \
+		m[2][1] += v[2] * t[1];          \
+		m[2][2] += v[2] * t[2];          \
+		m[2][3] += v[2] * t[3];          \
+                                         \
+		m[3][0] += v[3] * t[0];          \
+		m[3][1] += v[3] * t[1];          \
+		m[3][2] += v[3] * t[2];          \
+		m[3][3] += v[3] * t[3];          \
+	}
+
+/** determinant of matrix
+ *
+ * Computes determinant of matrix m, returning d
+ */
+#define DETERMINANT_2X2(d, m)                      \
+	{                                              \
+		d = m[0][0] * m[1][1] - m[0][1] * m[1][0]; \
+	}
+
+/** determinant of matrix
+ *
+ * Computes determinant of matrix m, returning d
+ */
+#define DETERMINANT_3X3(d, m)                                   \
+	{                                                           \
+		d = m[0][0] * (m[1][1] * m[2][2] - m[1][2] * m[2][1]);  \
+		d -= m[0][1] * (m[1][0] * m[2][2] - m[1][2] * m[2][0]); \
+		d += m[0][2] * (m[1][0] * m[2][1] - m[1][1] * m[2][0]); \
+	}
+
+/** i,j,th cofactor of a 4x4 matrix
+ *
+ */
+#define COFACTOR_4X4_IJ(fac, m, i, j)                                                                                           \
+	{                                                                                                                           \
+		GUINT __ii[4], __jj[4], __k;                                                                                            \
+                                                                                                                                \
+		for (__k = 0; __k < i; __k++) __ii[__k] = __k;                                                                          \
+		for (__k = i; __k < 3; __k++) __ii[__k] = __k + 1;                                                                      \
+		for (__k = 0; __k < j; __k++) __jj[__k] = __k;                                                                          \
+		for (__k = j; __k < 3; __k++) __jj[__k] = __k + 1;                                                                      \
+                                                                                                                                \
+		(fac) = m[__ii[0]][__jj[0]] * (m[__ii[1]][__jj[1]] * m[__ii[2]][__jj[2]] - m[__ii[1]][__jj[2]] * m[__ii[2]][__jj[1]]);  \
+		(fac) -= m[__ii[0]][__jj[1]] * (m[__ii[1]][__jj[0]] * m[__ii[2]][__jj[2]] - m[__ii[1]][__jj[2]] * m[__ii[2]][__jj[0]]); \
+		(fac) += m[__ii[0]][__jj[2]] * (m[__ii[1]][__jj[0]] * m[__ii[2]][__jj[1]] - m[__ii[1]][__jj[1]] * m[__ii[2]][__jj[0]]); \
+                                                                                                                                \
+		__k = i + j;                                                                                                            \
+		if (__k != (__k / 2) * 2)                                                                                               \
+		{                                                                                                                       \
+			(fac) = -(fac);                                                                                                     \
+		}                                                                                                                       \
+	}
+
+/** determinant of matrix
+ *
+ * Computes determinant of matrix m, returning d
+ */
+#define DETERMINANT_4X4(d, m)            \
+	{                                    \
+		GREAL cofac;                     \
+		COFACTOR_4X4_IJ(cofac, m, 0, 0); \
+		d = m[0][0] * cofac;             \
+		COFACTOR_4X4_IJ(cofac, m, 0, 1); \
+		d += m[0][1] * cofac;            \
+		COFACTOR_4X4_IJ(cofac, m, 0, 2); \
+		d += m[0][2] * cofac;            \
+		COFACTOR_4X4_IJ(cofac, m, 0, 3); \
+		d += m[0][3] * cofac;            \
+	}
+
+/** cofactor of matrix
+ *
+ * Computes cofactor of matrix m, returning a
+ */
+#define COFACTOR_2X2(a, m)    \
+	{                         \
+		a[0][0] = (m)[1][1];  \
+		a[0][1] = -(m)[1][0]; \
+		a[1][0] = -(m)[0][1]; \
+		a[1][1] = (m)[0][0];  \
+	}
+
+/** cofactor of matrix
+ *
+ * Computes cofactor of matrix m, returning a
+ */
+#define COFACTOR_3X3(a, m)                                  \
+	{                                                       \
+		a[0][0] = m[1][1] * m[2][2] - m[1][2] * m[2][1];    \
+		a[0][1] = -(m[1][0] * m[2][2] - m[2][0] * m[1][2]); \
+		a[0][2] = m[1][0] * m[2][1] - m[1][1] * m[2][0];    \
+		a[1][0] = -(m[0][1] * m[2][2] - m[0][2] * m[2][1]); \
+		a[1][1] = m[0][0] * m[2][2] - m[0][2] * m[2][0];    \
+		a[1][2] = -(m[0][0] * m[2][1] - m[0][1] * m[2][0]); \
+		a[2][0] = m[0][1] * m[1][2] - m[0][2] * m[1][1];    \
+		a[2][1] = -(m[0][0] * m[1][2] - m[0][2] * m[1][0]); \
+   a[2][2] = m[0][0]*m[1][1] - m[0][1]*m[1][0]);            \
+	}
+
+/** cofactor of matrix
+ *
+ * Computes cofactor of matrix m, returning a
+ */
+#define COFACTOR_4X4(a, m)                         \
+	{                                              \
+		int i, j;                                  \
+                                                   \
+		for (i = 0; i < 4; i++)                    \
+		{                                          \
+			for (j = 0; j < 4; j++)                \
+			{                                      \
+				COFACTOR_4X4_IJ(a[i][j], m, i, j); \
+			}                                      \
+		}                                          \
+	}
+
+/** adjoint of matrix
+ *
+ * Computes adjoint of matrix m, returning a
+ * (Note that adjoint is just the transpose of the cofactor matrix)
+ */
+#define ADJOINT_2X2(a, m)     \
+	{                         \
+		a[0][0] = (m)[1][1];  \
+		a[1][0] = -(m)[1][0]; \
+		a[0][1] = -(m)[0][1]; \
+		a[1][1] = (m)[0][0];  \
+	}
+
+/** adjoint of matrix
+ *
+ * Computes adjoint of matrix m, returning a
+ * (Note that adjoint is just the transpose of the cofactor matrix)
+ */
+#define ADJOINT_3X3(a, m)                                   \
+	{                                                       \
+		a[0][0] = m[1][1] * m[2][2] - m[1][2] * m[2][1];    \
+		a[1][0] = -(m[1][0] * m[2][2] - m[2][0] * m[1][2]); \
+		a[2][0] = m[1][0] * m[2][1] - m[1][1] * m[2][0];    \
+		a[0][1] = -(m[0][1] * m[2][2] - m[0][2] * m[2][1]); \
+		a[1][1] = m[0][0] * m[2][2] - m[0][2] * m[2][0];    \
+		a[2][1] = -(m[0][0] * m[2][1] - m[0][1] * m[2][0]); \
+		a[0][2] = m[0][1] * m[1][2] - m[0][2] * m[1][1];    \
+		a[1][2] = -(m[0][0] * m[1][2] - m[0][2] * m[1][0]); \
+   a[2][2] = m[0][0]*m[1][1] - m[0][1]*m[1][0]);            \
+	}
+
+/** adjoint of matrix
+ *
+ * Computes adjoint of matrix m, returning a
+ * (Note that adjoint is just the transpose of the cofactor matrix)
+ */
+#define ADJOINT_4X4(a, m)                                  \
+	{                                                      \
+		char _i_, _j_;                                     \
+                                                           \
+		for (_i_ = 0; _i_ < 4; _i_++)                      \
+		{                                                  \
+			for (_j_ = 0; _j_ < 4; _j_++)                  \
+			{                                              \
+				COFACTOR_4X4_IJ(a[_j_][_i_], m, _i_, _j_); \
+			}                                              \
+		}                                                  \
+	}
+
+/** compute adjoint of matrix and scale
+ *
+ * Computes adjoint of matrix m, scales it by s, returning a
+ */
+#define SCALE_ADJOINT_2X2(a, s, m) \
+	{                              \
+		a[0][0] = (s)*m[1][1];     \
+		a[1][0] = -(s)*m[1][0];    \
+		a[0][1] = -(s)*m[0][1];    \
+		a[1][1] = (s)*m[0][0];     \
+	}
+
+/** compute adjoint of matrix and scale
+ *
+ * Computes adjoint of matrix m, scales it by s, returning a
+ */
+#define SCALE_ADJOINT_3X3(a, s, m)                               \
+	{                                                            \
+		a[0][0] = (s) * (m[1][1] * m[2][2] - m[1][2] * m[2][1]); \
+		a[1][0] = (s) * (m[1][2] * m[2][0] - m[1][0] * m[2][2]); \
+		a[2][0] = (s) * (m[1][0] * m[2][1] - m[1][1] * m[2][0]); \
+                                                                 \
+		a[0][1] = (s) * (m[0][2] * m[2][1] - m[0][1] * m[2][2]); \
+		a[1][1] = (s) * (m[0][0] * m[2][2] - m[0][2] * m[2][0]); \
+		a[2][1] = (s) * (m[0][1] * m[2][0] - m[0][0] * m[2][1]); \
+                                                                 \
+		a[0][2] = (s) * (m[0][1] * m[1][2] - m[0][2] * m[1][1]); \
+		a[1][2] = (s) * (m[0][2] * m[1][0] - m[0][0] * m[1][2]); \
+		a[2][2] = (s) * (m[0][0] * m[1][1] - m[0][1] * m[1][0]); \
+	}
+
+/** compute adjoint of matrix and scale
+ *
+ * Computes adjoint of matrix m, scales it by s, returning a
+ */
+#define SCALE_ADJOINT_4X4(a, s, m)                         \
+	{                                                      \
+		char _i_, _j_;                                     \
+		for (_i_ = 0; _i_ < 4; _i_++)                      \
+		{                                                  \
+			for (_j_ = 0; _j_ < 4; _j_++)                  \
+			{                                              \
+				COFACTOR_4X4_IJ(a[_j_][_i_], m, _i_, _j_); \
+				a[_j_][_i_] *= s;                          \
+			}                                              \
+		}                                                  \
+	}
+
+/** inverse of matrix
+ *
+ * Compute inverse of matrix a, returning determinant m and
+ * inverse b
+ */
+#define INVERT_2X2(b, det, a)           \
+	{                                   \
+		GREAL _tmp_;                    \
+		DETERMINANT_2X2(det, a);        \
+		_tmp_ = 1.0 / (det);            \
+		SCALE_ADJOINT_2X2(b, _tmp_, a); \
+	}
+
+/** inverse of matrix
+ *
+ * Compute inverse of matrix a, returning determinant m and
+ * inverse b
+ */
+#define INVERT_3X3(b, det, a)           \
+	{                                   \
+		GREAL _tmp_;                    \
+		DETERMINANT_3X3(det, a);        \
+		_tmp_ = 1.0 / (det);            \
+		SCALE_ADJOINT_3X3(b, _tmp_, a); \
+	}
+
+/** inverse of matrix
+ *
+ * Compute inverse of matrix a, returning determinant m and
+ * inverse b
+ */
+#define INVERT_4X4(b, det, a)           \
+	{                                   \
+		GREAL _tmp_;                    \
+		DETERMINANT_4X4(det, a);        \
+		_tmp_ = 1.0 / (det);            \
+		SCALE_ADJOINT_4X4(b, _tmp_, a); \
+	}
+
+//! Get the triple(3) row of a transform matrix
+#define MAT_GET_ROW(mat, vec3, rowindex) \
+	{                                    \
+		vec3[0] = mat[rowindex][0];      \
+		vec3[1] = mat[rowindex][1];      \
+		vec3[2] = mat[rowindex][2];      \
+	}
+
+//! Get the tuple(2) row of a transform matrix
+#define MAT_GET_ROW2(mat, vec2, rowindex) \
+	{                                     \
+		vec2[0] = mat[rowindex][0];       \
+		vec2[1] = mat[rowindex][1];       \
+	}
+
+//! Get the quad (4) row of a transform matrix
+#define MAT_GET_ROW4(mat, vec4, rowindex) \
+	{                                     \
+		vec4[0] = mat[rowindex][0];       \
+		vec4[1] = mat[rowindex][1];       \
+		vec4[2] = mat[rowindex][2];       \
+		vec4[3] = mat[rowindex][3];       \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_GET_COL(mat, vec3, colindex) \
+	{                                    \
+		vec3[0] = mat[0][colindex];      \
+		vec3[1] = mat[1][colindex];      \
+		vec3[2] = mat[2][colindex];      \
+	}
+
+//! Get the tuple(2) col of a transform matrix
+#define MAT_GET_COL2(mat, vec2, colindex) \
+	{                                     \
+		vec2[0] = mat[0][colindex];       \
+		vec2[1] = mat[1][colindex];       \
+	}
+
+//! Get the quad (4) col of a transform matrix
+#define MAT_GET_COL4(mat, vec4, colindex) \
+	{                                     \
+		vec4[0] = mat[0][colindex];       \
+		vec4[1] = mat[1][colindex];       \
+		vec4[2] = mat[2][colindex];       \
+		vec4[3] = mat[3][colindex];       \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_GET_X(mat, vec3)       \
+	{                              \
+		MAT_GET_COL(mat, vec3, 0); \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_GET_Y(mat, vec3)       \
+	{                              \
+		MAT_GET_COL(mat, vec3, 1); \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_GET_Z(mat, vec3)       \
+	{                              \
+		MAT_GET_COL(mat, vec3, 2); \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_SET_X(mat, vec3) \
+	{                        \
+		mat[0][0] = vec3[0]; \
+		mat[1][0] = vec3[1]; \
+		mat[2][0] = vec3[2]; \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_SET_Y(mat, vec3) \
+	{                        \
+		mat[0][1] = vec3[0]; \
+		mat[1][1] = vec3[1]; \
+		mat[2][1] = vec3[2]; \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_SET_Z(mat, vec3) \
+	{                        \
+		mat[0][2] = vec3[0]; \
+		mat[1][2] = vec3[1]; \
+		mat[2][2] = vec3[2]; \
+	}
+
+//! Get the triple(3) col of a transform matrix
+#define MAT_GET_TRANSLATION(mat, vec3) \
+	{                                  \
+		vec3[0] = mat[0][3];           \
+		vec3[1] = mat[1][3];           \
+		vec3[2] = mat[2][3];           \
+	}
+
+//! Set the triple(3) col of a transform matrix
+#define MAT_SET_TRANSLATION(mat, vec3) \
+	{                                  \
+		mat[0][3] = vec3[0];           \
+		mat[1][3] = vec3[1];           \
+		mat[2][3] = vec3[2];           \
+	}
+
+//! Returns the dot product between a vec3f and the row of a matrix
+#define MAT_DOT_ROW(mat, vec3, rowindex) (vec3[0] * mat[rowindex][0] + vec3[1] * mat[rowindex][1] + vec3[2] * mat[rowindex][2])
+
+//! Returns the dot product between a vec2f and the row of a matrix
+#define MAT_DOT_ROW2(mat, vec2, rowindex) (vec2[0] * mat[rowindex][0] + vec2[1] * mat[rowindex][1])
+
+//! Returns the dot product between a vec4f and the row of a matrix
+#define MAT_DOT_ROW4(mat, vec4, rowindex) (vec4[0] * mat[rowindex][0] + vec4[1] * mat[rowindex][1] + vec4[2] * mat[rowindex][2] + vec4[3] * mat[rowindex][3])
+
+//! Returns the dot product between a vec3f and the col of a matrix
+#define MAT_DOT_COL(mat, vec3, colindex) (vec3[0] * mat[0][colindex] + vec3[1] * mat[1][colindex] + vec3[2] * mat[2][colindex])
+
+//! Returns the dot product between a vec2f and the col of a matrix
+#define MAT_DOT_COL2(mat, vec2, colindex) (vec2[0] * mat[0][colindex] + vec2[1] * mat[1][colindex])
+
+//! Returns the dot product between a vec4f and the col of a matrix
+#define MAT_DOT_COL4(mat, vec4, colindex) (vec4[0] * mat[0][colindex] + vec4[1] * mat[1][colindex] + vec4[2] * mat[2][colindex] + vec4[3] * mat[3][colindex])
+
+/*!Transpose matrix times vector
+v is a vec3f
+and m is a mat4f<br>
+*/
+#define INV_MAT_DOT_VEC_3X3(p, m, v) \
+	{                                \
+		p[0] = MAT_DOT_COL(m, v, 0); \
+		p[1] = MAT_DOT_COL(m, v, 1); \
+		p[2] = MAT_DOT_COL(m, v, 2); \
+	}
+
+#endif  // GIM_VECTOR_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_math.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_math.h
new file mode 100644
index 0000000..3c4f821
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_math.h
@@ -0,0 +1,148 @@
+#ifndef GIM_MATH_H_INCLUDED
+#define GIM_MATH_H_INCLUDED
+/*! \file gim_math.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "LinearMath/btScalar.h"
+
+#define GREAL btScalar
+#define GREAL2 double
+#define GINT int
+#define GUINT unsigned int
+#define GSHORT short
+#define GUSHORT unsigned short
+#define GINT64 long long
+#define GUINT64 unsigned long long
+
+#define G_PI 3.14159265358979f
+#define G_HALF_PI 1.5707963f
+//267948966
+#define G_TWO_PI 6.28318530f
+//71795864
+#define G_ROOT3 1.73205f
+#define G_ROOT2 1.41421f
+#define G_UINT_INFINITY 0xffffffff  //!< A very very high value
+#define G_REAL_INFINITY FLT_MAX
+#define G_SIGN_BITMASK 0x80000000
+#define G_EPSILON SIMD_EPSILON
+
+enum GIM_SCALAR_TYPES
+{
+	G_STYPE_REAL = 0,
+	G_STYPE_REAL2,
+	G_STYPE_SHORT,
+	G_STYPE_USHORT,
+	G_STYPE_INT,
+	G_STYPE_UINT,
+	G_STYPE_INT64,
+	G_STYPE_UINT64
+};
+
+#define G_DEGTORAD(X) ((X)*3.1415926f / 180.0f)
+#define G_RADTODEG(X) ((X)*180.0f / 3.1415926f)
+
+//! Integer representation of a floating-point value.
+#define GIM_IR(x) ((GUINT&)(x))
+
+//! Signed integer representation of a floating-point value.
+#define GIM_SIR(x) ((GINT&)(x))
+
+//! Absolute integer representation of a floating-point value
+#define GIM_AIR(x) (GIM_IR(x) & 0x7fffffff)
+
+//! Floating-point representation of an integer value.
+#define GIM_FR(x) ((GREAL&)(x))
+
+#define GIM_MAX(a, b) (a < b ? b : a)
+#define GIM_MIN(a, b) (a > b ? b : a)
+
+#define GIM_MAX3(a, b, c) GIM_MAX(a, GIM_MAX(b, c))
+#define GIM_MIN3(a, b, c) GIM_MIN(a, GIM_MIN(b, c))
+
+#define GIM_IS_ZERO(value) (value < G_EPSILON && value > -G_EPSILON)
+
+#define GIM_IS_NEGATIVE(value) (value <= -G_EPSILON)
+
+#define GIM_IS_POSISITVE(value) (value >= G_EPSILON)
+
+#define GIM_NEAR_EQUAL(v1, v2) GIM_IS_ZERO((v1 - v2))
+
+///returns a clamped number
+#define GIM_CLAMP(number, minval, maxval) (number < minval ? minval : (number > maxval ? maxval : number))
+
+#define GIM_GREATER(x, y) btFabs(x) > (y)
+
+///Swap numbers
+#define GIM_SWAP_NUMBERS(a, b) \
+	{                          \
+		a = a + b;             \
+		b = a - b;             \
+		a = a - b;             \
+	}
+
+#define GIM_INV_SQRT(va, isva)                         \
+	{                                                  \
+		if (va <= 0.0000001f)                          \
+		{                                              \
+			isva = G_REAL_INFINITY;                    \
+		}                                              \
+		else                                           \
+		{                                              \
+			GREAL _x = va * 0.5f;                      \
+			GUINT _y = 0x5f3759df - (GIM_IR(va) >> 1); \
+			isva = GIM_FR(_y);                         \
+			isva = isva * (1.5f - (_x * isva * isva)); \
+		}                                              \
+	}
+
+#define GIM_SQRT(va, sva)      \
+	{                          \
+		GIM_INV_SQRT(va, sva); \
+		sva = 1.0f / sva;      \
+	}
+
+//! Computes 1.0f / sqrtf(x). Comes from Quake3. See http://www.magic-software.com/3DGEDInvSqrt.html
+inline GREAL gim_inv_sqrt(GREAL f)
+{
+	GREAL r;
+	GIM_INV_SQRT(f, r);
+	return r;
+}
+
+inline GREAL gim_sqrt(GREAL f)
+{
+	GREAL r;
+	GIM_SQRT(f, r);
+	return r;
+}
+
+#endif  // GIM_MATH_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_memory.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_memory.cpp
new file mode 100644
index 0000000..9e29ab9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_memory.cpp
@@ -0,0 +1,132 @@
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_memory.h"
+#include "stdlib.h"
+
+#ifdef GIM_SIMD_MEMORY
+#include "LinearMath/btAlignedAllocator.h"
+#endif
+
+static gim_alloc_function *g_allocfn = 0;
+static gim_alloca_function *g_allocafn = 0;
+static gim_realloc_function *g_reallocfn = 0;
+static gim_free_function *g_freefn = 0;
+
+void gim_set_alloc_handler(gim_alloc_function *fn)
+{
+	g_allocfn = fn;
+}
+
+void gim_set_alloca_handler(gim_alloca_function *fn)
+{
+	g_allocafn = fn;
+}
+
+void gim_set_realloc_handler(gim_realloc_function *fn)
+{
+	g_reallocfn = fn;
+}
+
+void gim_set_free_handler(gim_free_function *fn)
+{
+	g_freefn = fn;
+}
+
+gim_alloc_function *gim_get_alloc_handler()
+{
+	return g_allocfn;
+}
+
+gim_alloca_function *gim_get_alloca_handler()
+{
+	return g_allocafn;
+}
+
+gim_realloc_function *gim_get_realloc_handler()
+{
+	return g_reallocfn;
+}
+
+gim_free_function *gim_get_free_handler()
+{
+	return g_freefn;
+}
+
+void *gim_alloc(size_t size)
+{
+	void *ptr;
+	if (g_allocfn)
+	{
+		ptr = g_allocfn(size);
+	}
+	else
+	{
+#ifdef GIM_SIMD_MEMORY
+		ptr = btAlignedAlloc(size, 16);
+#else
+		ptr = malloc(size);
+#endif
+	}
+	return ptr;
+}
+
+void *gim_alloca(size_t size)
+{
+	if (g_allocafn)
+		return g_allocafn(size);
+	else
+		return gim_alloc(size);
+}
+
+void *gim_realloc(void *ptr, size_t oldsize, size_t newsize)
+{
+	void *newptr = gim_alloc(newsize);
+	size_t copysize = oldsize < newsize ? oldsize : newsize;
+	gim_simd_memcpy(newptr, ptr, copysize);
+	gim_free(ptr);
+	return newptr;
+}
+
+void gim_free(void *ptr)
+{
+	if (!ptr) return;
+	if (g_freefn)
+	{
+		g_freefn(ptr);
+	}
+	else
+	{
+#ifdef GIM_SIMD_MEMORY
+		btAlignedFree(ptr);
+#else
+		free(ptr);
+#endif
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_memory.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_memory.h
new file mode 100644
index 0000000..fffbfa2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_memory.h
@@ -0,0 +1,177 @@
+#ifndef GIM_MEMORY_H_INCLUDED
+#define GIM_MEMORY_H_INCLUDED
+/*! \file gim_memory.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_math.h"
+#include <string.h>
+
+#ifdef PREFETCH
+#include <xmmintrin.h>  // for prefetch
+#define pfval 64
+#define pfval2 128
+//! Prefetch 64
+#define pf(_x, _i) _mm_prefetch((void *)(_x + _i + pfval), 0)
+//! Prefetch 128
+#define pf2(_x, _i) _mm_prefetch((void *)(_x + _i + pfval2), 0)
+#else
+//! Prefetch 64
+#define pf(_x, _i)
+//! Prefetch 128
+#define pf2(_x, _i)
+#endif
+
+///Functions for manip packed arrays of numbers
+#define GIM_COPY_ARRAYS(dest_array, source_array, element_count) \
+	{                                                            \
+		for (GUINT _i_ = 0; _i_ < element_count; ++_i_)          \
+		{                                                        \
+			dest_array[_i_] = source_array[_i_];                 \
+		}                                                        \
+	}
+
+#define GIM_COPY_ARRAYS_1(dest_array, source_array, element_count, copy_macro) \
+	{                                                                          \
+		for (GUINT _i_ = 0; _i_ < element_count; ++_i_)                        \
+		{                                                                      \
+			copy_macro(dest_array[_i_], source_array[_i_]);                    \
+		}                                                                      \
+	}
+
+#define GIM_ZERO_ARRAY(array, element_count)            \
+	{                                                   \
+		for (GUINT _i_ = 0; _i_ < element_count; ++_i_) \
+		{                                               \
+			array[_i_] = 0;                             \
+		}                                               \
+	}
+
+#define GIM_CONSTANT_ARRAY(array, element_count, constant) \
+	{                                                      \
+		for (GUINT _i_ = 0; _i_ < element_count; ++_i_)    \
+		{                                                  \
+			array[_i_] = constant;                         \
+		}                                                  \
+	}
+
+///Function prototypes to allocate and free memory.
+typedef void *gim_alloc_function(size_t size);
+typedef void *gim_alloca_function(size_t size);  //Allocs on the heap
+typedef void *gim_realloc_function(void *ptr, size_t oldsize, size_t newsize);
+typedef void gim_free_function(void *ptr);
+
+///Memory Function Handlers
+///set new memory management functions. if fn is 0, the default handlers are used.
+void gim_set_alloc_handler(gim_alloc_function *fn);
+void gim_set_alloca_handler(gim_alloca_function *fn);
+void gim_set_realloc_handler(gim_realloc_function *fn);
+void gim_set_free_handler(gim_free_function *fn);
+
+///get current memory management functions.
+gim_alloc_function *gim_get_alloc_handler(void);
+gim_alloca_function *gim_get_alloca_handler(void);
+gim_realloc_function *gim_get_realloc_handler(void);
+gim_free_function *gim_get_free_handler(void);
+
+///Standar Memory functions
+void *gim_alloc(size_t size);
+void *gim_alloca(size_t size);
+void *gim_realloc(void *ptr, size_t oldsize, size_t newsize);
+void gim_free(void *ptr);
+
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#define GIM_SIMD_MEMORY 1
+#endif
+
+//! SIMD POINTER INTEGER
+#define SIMD_T GUINT64
+//! SIMD INTEGER SIZE
+#define SIMD_T_SIZE sizeof(SIMD_T)
+
+inline void gim_simd_memcpy(void *dst, const void *src, size_t copysize)
+{
+#ifdef GIM_SIMD_MEMORY
+	/*
+//'long long int' is incompatible with visual studio 6...
+    //copy words
+    SIMD_T * ui_src_ptr = (SIMD_T *)src;
+    SIMD_T * ui_dst_ptr = (SIMD_T *)dst;
+    while(copysize>=SIMD_T_SIZE)
+    {
+        *(ui_dst_ptr++) = *(ui_src_ptr++);
+        copysize-=SIMD_T_SIZE;
+    }
+    if(copysize==0) return;
+*/
+
+	char *c_src_ptr = (char *)src;
+	char *c_dst_ptr = (char *)dst;
+	while (copysize > 0)
+	{
+		*(c_dst_ptr++) = *(c_src_ptr++);
+		copysize--;
+	}
+	return;
+#else
+	memcpy(dst, src, copysize);
+#endif
+}
+
+template <class T>
+inline void gim_swap_elements(T *_array, size_t _i, size_t _j)
+{
+	T _e_tmp_ = _array[_i];
+	_array[_i] = _array[_j];
+	_array[_j] = _e_tmp_;
+}
+
+template <class T>
+inline void gim_swap_elements_memcpy(T *_array, size_t _i, size_t _j)
+{
+	char _e_tmp_[sizeof(T)];
+	gim_simd_memcpy(_e_tmp_, &_array[_i], sizeof(T));
+	gim_simd_memcpy(&_array[_i], &_array[_j], sizeof(T));
+	gim_simd_memcpy(&_array[_j], _e_tmp_, sizeof(T));
+}
+
+template <int SIZE>
+inline void gim_swap_elements_ptr(char *_array, size_t _i, size_t _j)
+{
+	char _e_tmp_[SIZE];
+	_i *= SIZE;
+	_j *= SIZE;
+	gim_simd_memcpy(_e_tmp_, _array + _i, SIZE);
+	gim_simd_memcpy(_array + _i, _array + _j, SIZE);
+	gim_simd_memcpy(_array + _j, _e_tmp_, SIZE);
+}
+
+#endif  // GIM_MEMORY_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_pair.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_pair.h
new file mode 100644
index 0000000..56c185a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_pair.h
@@ -0,0 +1,28 @@
+#ifndef GIM_PAIR_H
+#define GIM_PAIR_H
+
+
+//! Overlapping pair
+struct GIM_PAIR
+{
+        int m_index1;
+        int m_index2;
+        GIM_PAIR()
+        {
+        }
+
+        GIM_PAIR(const GIM_PAIR& p)
+        {
+                m_index1 = p.m_index1;
+                m_index2 = p.m_index2;
+        }
+
+        GIM_PAIR(int index1, int index2)
+        {
+                m_index1 = index1;
+                m_index2 = index2;
+        }
+};
+
+#endif //GIM_PAIR_H
+
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_radixsort.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_radixsort.h
new file mode 100644
index 0000000..ff7907a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_radixsort.h
@@ -0,0 +1,386 @@
+#ifndef GIM_RADIXSORT_H_INCLUDED
+#define GIM_RADIXSORT_H_INCLUDED
+/*! \file gim_radixsort.h
+\author Francisco Leon Najera.
+Based on the work of Michael Herf : "fast floating-point radix sort"
+Avaliable on http://www.stereopsis.com/radix.html
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_memory.h"
+
+///Macros for sorting.
+//! Prototype for comparators
+class less_comparator
+{
+public:
+	template <class T, class Z>
+	inline int operator()(const T& a, const Z& b)
+	{
+		return (a < b ? -1 : (a > b ? 1 : 0));
+	}
+};
+
+//! Prototype for comparators
+class integer_comparator
+{
+public:
+	template <class T>
+	inline int operator()(const T& a, const T& b)
+	{
+		return (int)(a - b);
+	}
+};
+
+//!Prototype for getting the integer representation of an object
+class uint_key_func
+{
+public:
+	template <class T>
+	inline GUINT operator()(const T& a)
+	{
+		return (GUINT)a;
+	}
+};
+
+//!Prototype for copying elements
+class copy_elements_func
+{
+public:
+	template <class T>
+	inline void operator()(T& a, T& b)
+	{
+		a = b;
+	}
+};
+
+//!Prototype for copying elements
+class memcopy_elements_func
+{
+public:
+	template <class T>
+	inline void operator()(T& a, T& b)
+	{
+		gim_simd_memcpy(&a, &b, sizeof(T));
+	}
+};
+
+//! @{
+struct GIM_RSORT_TOKEN
+{
+	GUINT m_key;
+	GUINT m_value;
+	GIM_RSORT_TOKEN()
+	{
+	}
+	GIM_RSORT_TOKEN(const GIM_RSORT_TOKEN& rtoken)
+	{
+		m_key = rtoken.m_key;
+		m_value = rtoken.m_value;
+	}
+
+	inline bool operator<(const GIM_RSORT_TOKEN& other) const
+	{
+		return (m_key < other.m_key);
+	}
+
+	inline bool operator>(const GIM_RSORT_TOKEN& other) const
+	{
+		return (m_key > other.m_key);
+	}
+};
+
+//! Prototype for comparators
+class GIM_RSORT_TOKEN_COMPARATOR
+{
+public:
+	inline int operator()(const GIM_RSORT_TOKEN& a, const GIM_RSORT_TOKEN& b)
+	{
+		return (int)((a.m_key) - (b.m_key));
+	}
+};
+
+#define kHist 2048
+// ---- utils for accessing 11-bit quantities
+#define D11_0(x) (x & 0x7FF)
+#define D11_1(x) (x >> 11 & 0x7FF)
+#define D11_2(x) (x >> 22)
+
+///Radix sort for unsigned integer keys
+inline void gim_radix_sort_rtokens(
+	GIM_RSORT_TOKEN* array,
+	GIM_RSORT_TOKEN* sorted, GUINT element_count)
+{
+	GUINT i;
+	GUINT b0[kHist * 3];
+	GUINT* b1 = b0 + kHist;
+	GUINT* b2 = b1 + kHist;
+	for (i = 0; i < kHist * 3; ++i)
+	{
+		b0[i] = 0;
+	}
+	GUINT fi;
+	GUINT pos;
+	for (i = 0; i < element_count; ++i)
+	{
+		fi = array[i].m_key;
+		b0[D11_0(fi)]++;
+		b1[D11_1(fi)]++;
+		b2[D11_2(fi)]++;
+	}
+	{
+		GUINT sum0 = 0, sum1 = 0, sum2 = 0;
+		GUINT tsum;
+		for (i = 0; i < kHist; ++i)
+		{
+			tsum = b0[i] + sum0;
+			b0[i] = sum0 - 1;
+			sum0 = tsum;
+			tsum = b1[i] + sum1;
+			b1[i] = sum1 - 1;
+			sum1 = tsum;
+			tsum = b2[i] + sum2;
+			b2[i] = sum2 - 1;
+			sum2 = tsum;
+		}
+	}
+	for (i = 0; i < element_count; ++i)
+	{
+		fi = array[i].m_key;
+		pos = D11_0(fi);
+		pos = ++b0[pos];
+		sorted[pos].m_key = array[i].m_key;
+		sorted[pos].m_value = array[i].m_value;
+	}
+	for (i = 0; i < element_count; ++i)
+	{
+		fi = sorted[i].m_key;
+		pos = D11_1(fi);
+		pos = ++b1[pos];
+		array[pos].m_key = sorted[i].m_key;
+		array[pos].m_value = sorted[i].m_value;
+	}
+	for (i = 0; i < element_count; ++i)
+	{
+		fi = array[i].m_key;
+		pos = D11_2(fi);
+		pos = ++b2[pos];
+		sorted[pos].m_key = array[i].m_key;
+		sorted[pos].m_value = array[i].m_value;
+	}
+}
+
+/// Get the sorted tokens from an array. For generic use. Tokens are IRR_RSORT_TOKEN
+/*!
+*\param array Array of elements to sort
+*\param sorted_tokens Tokens of sorted elements
+*\param element_count element count
+*\param uintkey_macro Functor which retrieves the integer representation of an array element
+*/
+template <typename T, class GETKEY_CLASS>
+void gim_radix_sort_array_tokens(
+	T* array,
+	GIM_RSORT_TOKEN* sorted_tokens,
+	GUINT element_count, GETKEY_CLASS uintkey_macro)
+{
+	GIM_RSORT_TOKEN* _unsorted = (GIM_RSORT_TOKEN*)gim_alloc(sizeof(GIM_RSORT_TOKEN) * element_count);
+	for (GUINT _i = 0; _i < element_count; ++_i)
+	{
+		_unsorted[_i].m_key = uintkey_macro(array[_i]);
+		_unsorted[_i].m_value = _i;
+	}
+	gim_radix_sort_rtokens(_unsorted, sorted_tokens, element_count);
+	gim_free(_unsorted);
+	gim_free(_unsorted);
+}
+
+/// Sorts array in place. For generic use
+/*!
+\param type Type of the array
+\param array
+\param element_count
+\param get_uintkey_macro Macro for extract the Integer value of the element. Similar to SIMPLE_GET_UINTKEY
+\param copy_elements_macro Macro for copy elements, similar to SIMPLE_COPY_ELEMENTS
+*/
+template <typename T, class GETKEY_CLASS, class COPY_CLASS>
+void gim_radix_sort(
+	T* array, GUINT element_count,
+	GETKEY_CLASS get_uintkey_macro, COPY_CLASS copy_elements_macro)
+{
+	GIM_RSORT_TOKEN* _sorted = (GIM_RSORT_TOKEN*)gim_alloc(sizeof(GIM_RSORT_TOKEN) * element_count);
+	gim_radix_sort_array_tokens(array, _sorted, element_count, get_uintkey_macro);
+	T* _original_array = (T*)gim_alloc(sizeof(T) * element_count);
+	gim_simd_memcpy(_original_array, array, sizeof(T) * element_count);
+	for (GUINT _i = 0; _i < element_count; ++_i)
+	{
+		copy_elements_macro(array[_i], _original_array[_sorted[_i].m_value]);
+	}
+	gim_free(_original_array);
+	gim_free(_sorted);
+}
+
+//! Failsafe Iterative binary search,
+/*!
+If the element is not found, it returns the nearest upper element position, may be the further position after the last element.
+\param _array
+\param _start_i the beginning of the array
+\param _end_i the ending  index of the array
+\param _search_key Value to find
+\param _comp_macro macro for comparing elements
+\param _found If true the value has found. Boolean
+\param _result_index the index of the found element, or if not found then it will get the index of the  closest bigger value
+*/
+template <class T, typename KEYCLASS, typename COMP_CLASS>
+bool gim_binary_search_ex(
+	const T* _array, GUINT _start_i,
+	GUINT _end_i, GUINT& _result_index,
+	const KEYCLASS& _search_key,
+	COMP_CLASS _comp_macro)
+{
+	GUINT _k;
+	int _comp_result;
+	GUINT _i = _start_i;
+	GUINT _j = _end_i + 1;
+	while (_i < _j)
+	{
+		_k = (_j + _i - 1) / 2;
+		_comp_result = _comp_macro(_array[_k], _search_key);
+		if (_comp_result == 0)
+		{
+			_result_index = _k;
+			return true;
+		}
+		else if (_comp_result < 0)
+		{
+			_i = _k + 1;
+		}
+		else
+		{
+			_j = _k;
+		}
+	}
+	_result_index = _i;
+	return false;
+}
+
+//! Failsafe Iterative binary search,Template version
+/*!
+If the element is not found, it returns the nearest upper element position, may be the further position after the last element.
+\param _array
+\param _start_i the beginning of the array
+\param _end_i the ending  index of the array
+\param _search_key Value to find
+\param _result_index the index of the found element, or if not found then it will get the index of the  closest bigger value
+\return true if found, else false
+*/
+template <class T>
+bool gim_binary_search(
+	const T* _array, GUINT _start_i,
+	GUINT _end_i, const T& _search_key,
+	GUINT& _result_index)
+{
+	GUINT _i = _start_i;
+	GUINT _j = _end_i + 1;
+	GUINT _k;
+	while (_i < _j)
+	{
+		_k = (_j + _i - 1) / 2;
+		if (_array[_k] == _search_key)
+		{
+			_result_index = _k;
+			return true;
+		}
+		else if (_array[_k] < _search_key)
+		{
+			_i = _k + 1;
+		}
+		else
+		{
+			_j = _k;
+		}
+	}
+	_result_index = _i;
+	return false;
+}
+
+///heap sort from http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Sort/Heap/
+template <typename T, typename COMP_CLASS>
+void gim_down_heap(T* pArr, GUINT k, GUINT n, COMP_CLASS CompareFunc)
+{
+	/*  PRE: a[k+1..N] is a heap */
+	/* POST:  a[k..N]  is a heap */
+
+	T temp = pArr[k - 1];
+	/* k has child(s) */
+	while (k <= n / 2)
+	{
+		int child = 2 * k;
+
+		if ((child < (int)n) && CompareFunc(pArr[child - 1], pArr[child]) < 0)
+		{
+			child++;
+		}
+		/* pick larger child */
+		if (CompareFunc(temp, pArr[child - 1]) < 0)
+		{
+			/* move child up */
+			pArr[k - 1] = pArr[child - 1];
+			k = child;
+		}
+		else
+		{
+			break;
+		}
+	}
+	pArr[k - 1] = temp;
+} /*downHeap*/
+
+template <typename T, typename COMP_CLASS>
+void gim_heap_sort(T* pArr, GUINT element_count, COMP_CLASS CompareFunc)
+{
+	/* sort a[0..N-1],  N.B. 0 to N-1 */
+	GUINT k;
+	GUINT n = element_count;
+	for (k = n / 2; k > 0; k--)
+	{
+		gim_down_heap(pArr, k, n, CompareFunc);
+	}
+
+	/* a[1..N] is now a heap */
+	while (n >= 2)
+	{
+		gim_swap_elements(pArr, 0, n - 1); /* largest of a[0..n-1] */
+		--n;
+		/* restore a[1..i-1] heap */
+		gim_down_heap(pArr, 1, n, CompareFunc);
+	}
+}
+
+#endif  // GIM_RADIXSORT_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_tri_collision.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_tri_collision.cpp
new file mode 100644
index 0000000..8d83e95
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_tri_collision.cpp
@@ -0,0 +1,619 @@
+
+/*! \file gim_tri_collision.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_tri_collision.h"
+
+#define TRI_LOCAL_EPSILON 0.000001f
+#define MIN_EDGE_EDGE_DIS 0.00001f
+
+class GIM_TRIANGLE_CALCULATION_CACHE
+{
+public:
+	GREAL margin;
+	btVector3 tu_vertices[3];
+	btVector3 tv_vertices[3];
+	btVector4 tu_plane;
+	btVector4 tv_plane;
+	btVector3 closest_point_u;
+	btVector3 closest_point_v;
+	btVector3 edge_edge_dir;
+	btVector3 distances;
+	GREAL du[4];
+	GREAL du0du1;
+	GREAL du0du2;
+	GREAL dv[4];
+	GREAL dv0dv1;
+	GREAL dv0dv2;
+	btVector3 temp_points[MAX_TRI_CLIPPING];
+	btVector3 temp_points1[MAX_TRI_CLIPPING];
+	btVector3 contact_points[MAX_TRI_CLIPPING];
+
+	//! if returns false, the faces are paralele
+	SIMD_FORCE_INLINE bool compute_intervals(
+		const GREAL &D0,
+		const GREAL &D1,
+		const GREAL &D2,
+		const GREAL &D0D1,
+		const GREAL &D0D2,
+		GREAL &scale_edge0,
+		GREAL &scale_edge1,
+		GUINT &edge_index0,
+		GUINT &edge_index1)
+	{
+		if (D0D1 > 0.0f)
+		{
+			/* here we know that D0D2<=0.0 */
+			/* that is D0, D1 are on the same side, D2 on the other or on the plane */
+			scale_edge0 = -D2 / (D0 - D2);
+			scale_edge1 = -D1 / (D2 - D1);
+			edge_index0 = 2;
+			edge_index1 = 1;
+		}
+		else if (D0D2 > 0.0f)
+		{
+			/* here we know that d0d1<=0.0 */
+			scale_edge0 = -D0 / (D1 - D0);
+			scale_edge1 = -D1 / (D2 - D1);
+			edge_index0 = 0;
+			edge_index1 = 1;
+		}
+		else if (D1 * D2 > 0.0f || D0 != 0.0f)
+		{
+			/* here we know that d0d1<=0.0 or that D0!=0.0 */
+			scale_edge0 = -D0 / (D1 - D0);
+			scale_edge1 = -D2 / (D0 - D2);
+			edge_index0 = 0;
+			edge_index1 = 2;
+		}
+		else
+		{
+			return false;
+		}
+		return true;
+	}
+
+	//! clip triangle
+	/*!
+	*/
+	SIMD_FORCE_INLINE GUINT clip_triangle(
+		const btVector4 &tri_plane,
+		const btVector3 *tripoints,
+		const btVector3 *srcpoints,
+		btVector3 *clip_points)
+	{
+		// edge 0
+
+		btVector4 edgeplane;
+
+		EDGE_PLANE(tripoints[0], tripoints[1], tri_plane, edgeplane);
+
+		GUINT clipped_count = PLANE_CLIP_TRIANGLE3D(
+			edgeplane, srcpoints[0], srcpoints[1], srcpoints[2], temp_points);
+
+		if (clipped_count == 0) return 0;
+
+		// edge 1
+
+		EDGE_PLANE(tripoints[1], tripoints[2], tri_plane, edgeplane);
+
+		clipped_count = PLANE_CLIP_POLYGON3D(
+			edgeplane, temp_points, clipped_count, temp_points1);
+
+		if (clipped_count == 0) return 0;
+
+		// edge 2
+
+		EDGE_PLANE(tripoints[2], tripoints[0], tri_plane, edgeplane);
+
+		clipped_count = PLANE_CLIP_POLYGON3D(
+			edgeplane, temp_points1, clipped_count, clip_points);
+
+		return clipped_count;
+
+		/*GUINT i0 = (tri_plane.closestAxis()+1)%3;
+		GUINT i1 = (i0+1)%3;
+		// edge 0
+		btVector3 temp_points[MAX_TRI_CLIPPING];
+		btVector3 temp_points1[MAX_TRI_CLIPPING];
+
+		GUINT clipped_count= PLANE_CLIP_TRIANGLE_GENERIC(
+			0,srcpoints[0],srcpoints[1],srcpoints[2],temp_points,
+			DISTANCE_EDGE(tripoints[0],tripoints[1],i0,i1));
+		
+		
+		if(clipped_count == 0) return 0;
+
+		// edge 1
+		clipped_count = PLANE_CLIP_POLYGON_GENERIC(
+			0,temp_points,clipped_count,temp_points1,
+			DISTANCE_EDGE(tripoints[1],tripoints[2],i0,i1));
+
+		if(clipped_count == 0) return 0;
+
+		// edge 2
+		clipped_count = PLANE_CLIP_POLYGON_GENERIC(
+			0,temp_points1,clipped_count,clipped_points,
+			DISTANCE_EDGE(tripoints[2],tripoints[0],i0,i1));
+
+		return clipped_count;*/
+	}
+
+	SIMD_FORCE_INLINE void sort_isect(
+		GREAL &isect0, GREAL &isect1, GUINT &e0, GUINT &e1, btVector3 &vec0, btVector3 &vec1)
+	{
+		if (isect1 < isect0)
+		{
+			//swap
+			GIM_SWAP_NUMBERS(isect0, isect1);
+			GIM_SWAP_NUMBERS(e0, e1);
+			btVector3 tmp = vec0;
+			vec0 = vec1;
+			vec1 = tmp;
+		}
+	}
+
+	//! Test verifying interval intersection with the direction between planes
+	/*!
+	\pre tv_plane and tu_plane must be set
+	\post
+	distances[2] is set with the distance
+	closest_point_u, closest_point_v, edge_edge_dir are set too
+	\return
+	- 0: faces are paralele
+	- 1: face U casts face V
+	- 2: face V casts face U
+	- 3: nearest edges
+	*/
+	SIMD_FORCE_INLINE GUINT cross_line_intersection_test()
+	{
+		// Compute direction of intersection line
+		edge_edge_dir = tu_plane.cross(tv_plane);
+		GREAL Dlen;
+		VEC_LENGTH(edge_edge_dir, Dlen);
+
+		if (Dlen < 0.0001)
+		{
+			return 0;  //faces near paralele
+		}
+
+		edge_edge_dir *= 1 / Dlen;  //normalize
+
+		// Compute interval for triangle 1
+		GUINT tu_e0, tu_e1;              //edge indices
+		GREAL tu_scale_e0, tu_scale_e1;  //edge scale
+		if (!compute_intervals(du[0], du[1], du[2],
+							   du0du1, du0du2, tu_scale_e0, tu_scale_e1, tu_e0, tu_e1)) return 0;
+
+		// Compute interval for triangle 2
+		GUINT tv_e0, tv_e1;              //edge indices
+		GREAL tv_scale_e0, tv_scale_e1;  //edge scale
+
+		if (!compute_intervals(dv[0], dv[1], dv[2],
+							   dv0dv1, dv0dv2, tv_scale_e0, tv_scale_e1, tv_e0, tv_e1)) return 0;
+
+		//proyected vertices
+		btVector3 up_e0 = tu_vertices[tu_e0].lerp(tu_vertices[(tu_e0 + 1) % 3], tu_scale_e0);
+		btVector3 up_e1 = tu_vertices[tu_e1].lerp(tu_vertices[(tu_e1 + 1) % 3], tu_scale_e1);
+
+		btVector3 vp_e0 = tv_vertices[tv_e0].lerp(tv_vertices[(tv_e0 + 1) % 3], tv_scale_e0);
+		btVector3 vp_e1 = tv_vertices[tv_e1].lerp(tv_vertices[(tv_e1 + 1) % 3], tv_scale_e1);
+
+		//proyected intervals
+		GREAL isect_u[] = {up_e0.dot(edge_edge_dir), up_e1.dot(edge_edge_dir)};
+		GREAL isect_v[] = {vp_e0.dot(edge_edge_dir), vp_e1.dot(edge_edge_dir)};
+
+		sort_isect(isect_u[0], isect_u[1], tu_e0, tu_e1, up_e0, up_e1);
+		sort_isect(isect_v[0], isect_v[1], tv_e0, tv_e1, vp_e0, vp_e1);
+
+		const GREAL midpoint_u = 0.5f * (isect_u[0] + isect_u[1]);  // midpoint
+		const GREAL midpoint_v = 0.5f * (isect_v[0] + isect_v[1]);  // midpoint
+
+		if (midpoint_u < midpoint_v)
+		{
+			if (isect_u[1] >= isect_v[1])  // face U casts face V
+			{
+				return 1;
+			}
+			else if (isect_v[0] <= isect_u[0])  // face V casts face U
+			{
+				return 2;
+			}
+			// closest points
+			closest_point_u = up_e1;
+			closest_point_v = vp_e0;
+			// calc edges and separation
+
+			if (isect_u[1] + MIN_EDGE_EDGE_DIS < isect_v[0])  //calc distance between two lines instead
+			{
+				SEGMENT_COLLISION(
+					tu_vertices[tu_e1], tu_vertices[(tu_e1 + 1) % 3],
+					tv_vertices[tv_e0], tv_vertices[(tv_e0 + 1) % 3],
+					closest_point_u,
+					closest_point_v);
+
+				edge_edge_dir = closest_point_u - closest_point_v;
+				VEC_LENGTH(edge_edge_dir, distances[2]);
+				edge_edge_dir *= 1.0f / distances[2];  // normalize
+			}
+			else
+			{
+				distances[2] = isect_v[0] - isect_u[1];  //distance negative
+														 //edge_edge_dir *= -1.0f; //normal pointing from V to U
+			}
+		}
+		else
+		{
+			if (isect_v[1] >= isect_u[1])  // face V casts face U
+			{
+				return 2;
+			}
+			else if (isect_u[0] <= isect_v[0])  // face U casts face V
+			{
+				return 1;
+			}
+			// closest points
+			closest_point_u = up_e0;
+			closest_point_v = vp_e1;
+			// calc edges and separation
+
+			if (isect_v[1] + MIN_EDGE_EDGE_DIS < isect_u[0])  //calc distance between two lines instead
+			{
+				SEGMENT_COLLISION(
+					tu_vertices[tu_e0], tu_vertices[(tu_e0 + 1) % 3],
+					tv_vertices[tv_e1], tv_vertices[(tv_e1 + 1) % 3],
+					closest_point_u,
+					closest_point_v);
+
+				edge_edge_dir = closest_point_u - closest_point_v;
+				VEC_LENGTH(edge_edge_dir, distances[2]);
+				edge_edge_dir *= 1.0f / distances[2];  // normalize
+			}
+			else
+			{
+				distances[2] = isect_u[0] - isect_v[1];  //distance negative
+														 //edge_edge_dir *= -1.0f; //normal pointing from V to U
+			}
+		}
+		return 3;
+	}
+
+	//! collides by two sides
+	SIMD_FORCE_INLINE bool triangle_collision(
+		const btVector3 &u0,
+		const btVector3 &u1,
+		const btVector3 &u2,
+		GREAL margin_u,
+		const btVector3 &v0,
+		const btVector3 &v1,
+		const btVector3 &v2,
+		GREAL margin_v,
+		GIM_TRIANGLE_CONTACT_DATA &contacts)
+	{
+		margin = margin_u + margin_v;
+
+		tu_vertices[0] = u0;
+		tu_vertices[1] = u1;
+		tu_vertices[2] = u2;
+
+		tv_vertices[0] = v0;
+		tv_vertices[1] = v1;
+		tv_vertices[2] = v2;
+
+		//create planes
+		// plane v vs U points
+
+		TRIANGLE_PLANE(tv_vertices[0], tv_vertices[1], tv_vertices[2], tv_plane);
+
+		du[0] = DISTANCE_PLANE_POINT(tv_plane, tu_vertices[0]);
+		du[1] = DISTANCE_PLANE_POINT(tv_plane, tu_vertices[1]);
+		du[2] = DISTANCE_PLANE_POINT(tv_plane, tu_vertices[2]);
+
+		du0du1 = du[0] * du[1];
+		du0du2 = du[0] * du[2];
+
+		if (du0du1 > 0.0f && du0du2 > 0.0f)  // same sign on all of them + not equal 0 ?
+		{
+			if (du[0] < 0)  //we need test behind the triangle plane
+			{
+				distances[0] = GIM_MAX3(du[0], du[1], du[2]);
+				distances[0] = -distances[0];
+				if (distances[0] > margin) return false;  //never intersect
+
+				//reorder triangle v
+				VEC_SWAP(tv_vertices[0], tv_vertices[1]);
+				VEC_SCALE_4(tv_plane, -1.0f, tv_plane);
+			}
+			else
+			{
+				distances[0] = GIM_MIN3(du[0], du[1], du[2]);
+				if (distances[0] > margin) return false;  //never intersect
+			}
+		}
+		else
+		{
+			//Look if we need to invert the triangle
+			distances[0] = (du[0] + du[1] + du[2]) / 3.0f;  //centroid
+
+			if (distances[0] < 0.0f)
+			{
+				//reorder triangle v
+				VEC_SWAP(tv_vertices[0], tv_vertices[1]);
+				VEC_SCALE_4(tv_plane, -1.0f, tv_plane);
+
+				distances[0] = GIM_MAX3(du[0], du[1], du[2]);
+				distances[0] = -distances[0];
+			}
+			else
+			{
+				distances[0] = GIM_MIN3(du[0], du[1], du[2]);
+			}
+		}
+
+		// plane U vs V points
+
+		TRIANGLE_PLANE(tu_vertices[0], tu_vertices[1], tu_vertices[2], tu_plane);
+
+		dv[0] = DISTANCE_PLANE_POINT(tu_plane, tv_vertices[0]);
+		dv[1] = DISTANCE_PLANE_POINT(tu_plane, tv_vertices[1]);
+		dv[2] = DISTANCE_PLANE_POINT(tu_plane, tv_vertices[2]);
+
+		dv0dv1 = dv[0] * dv[1];
+		dv0dv2 = dv[0] * dv[2];
+
+		if (dv0dv1 > 0.0f && dv0dv2 > 0.0f)  // same sign on all of them + not equal 0 ?
+		{
+			if (dv[0] < 0)  //we need test behind the triangle plane
+			{
+				distances[1] = GIM_MAX3(dv[0], dv[1], dv[2]);
+				distances[1] = -distances[1];
+				if (distances[1] > margin) return false;  //never intersect
+
+				//reorder triangle u
+				VEC_SWAP(tu_vertices[0], tu_vertices[1]);
+				VEC_SCALE_4(tu_plane, -1.0f, tu_plane);
+			}
+			else
+			{
+				distances[1] = GIM_MIN3(dv[0], dv[1], dv[2]);
+				if (distances[1] > margin) return false;  //never intersect
+			}
+		}
+		else
+		{
+			//Look if we need to invert the triangle
+			distances[1] = (dv[0] + dv[1] + dv[2]) / 3.0f;  //centroid
+
+			if (distances[1] < 0.0f)
+			{
+				//reorder triangle v
+				VEC_SWAP(tu_vertices[0], tu_vertices[1]);
+				VEC_SCALE_4(tu_plane, -1.0f, tu_plane);
+
+				distances[1] = GIM_MAX3(dv[0], dv[1], dv[2]);
+				distances[1] = -distances[1];
+			}
+			else
+			{
+				distances[1] = GIM_MIN3(dv[0], dv[1], dv[2]);
+			}
+		}
+
+		GUINT bl;
+		/* bl = cross_line_intersection_test();
+		if(bl==3)
+		{
+			//take edge direction too
+			bl = distances.maxAxis();
+		}
+		else
+		{*/
+		bl = 0;
+		if (distances[0] < distances[1]) bl = 1;
+		//}
+
+		if (bl == 2)  //edge edge separation
+		{
+			if (distances[2] > margin) return false;
+
+			contacts.m_penetration_depth = -distances[2] + margin;
+			contacts.m_points[0] = closest_point_v;
+			contacts.m_point_count = 1;
+			VEC_COPY(contacts.m_separating_normal, edge_edge_dir);
+
+			return true;
+		}
+
+		//clip face against other
+
+		GUINT point_count;
+		//TODO
+		if (bl == 0)  //clip U points against V
+		{
+			point_count = clip_triangle(tv_plane, tv_vertices, tu_vertices, contact_points);
+			if (point_count == 0) return false;
+			contacts.merge_points(tv_plane, margin, contact_points, point_count);
+		}
+		else  //clip V points against U
+		{
+			point_count = clip_triangle(tu_plane, tu_vertices, tv_vertices, contact_points);
+			if (point_count == 0) return false;
+			contacts.merge_points(tu_plane, margin, contact_points, point_count);
+			contacts.m_separating_normal *= -1.f;
+		}
+		if (contacts.m_point_count == 0) return false;
+		return true;
+	}
+};
+
+/*class GIM_TRIANGLE_CALCULATION_CACHE
+{
+public:
+	GREAL margin;
+	GUINT clipped_count;
+	btVector3 tu_vertices[3];
+	btVector3 tv_vertices[3];
+	btVector3 temp_points[MAX_TRI_CLIPPING];
+	btVector3 temp_points1[MAX_TRI_CLIPPING];
+	btVector3 clipped_points[MAX_TRI_CLIPPING];
+	GIM_TRIANGLE_CONTACT_DATA contacts1;
+	GIM_TRIANGLE_CONTACT_DATA contacts2;
+
+
+	//! clip triangle
+	GUINT clip_triangle(
+		const btVector4 & tri_plane,
+		const btVector3 * tripoints,
+		const btVector3 * srcpoints,
+		btVector3 * clipped_points)
+	{
+		// edge 0
+
+		btVector4 edgeplane;
+
+		EDGE_PLANE(tripoints[0],tripoints[1],tri_plane,edgeplane);
+
+		GUINT clipped_count = PLANE_CLIP_TRIANGLE3D(
+			edgeplane,srcpoints[0],srcpoints[1],srcpoints[2],temp_points);
+
+		if(clipped_count == 0) return 0;
+
+		// edge 1
+
+		EDGE_PLANE(tripoints[1],tripoints[2],tri_plane,edgeplane);
+
+		clipped_count = PLANE_CLIP_POLYGON3D(
+			edgeplane,temp_points,clipped_count,temp_points1);
+
+		if(clipped_count == 0) return 0;
+
+		// edge 2
+
+		EDGE_PLANE(tripoints[2],tripoints[0],tri_plane,edgeplane);
+
+		clipped_count = PLANE_CLIP_POLYGON3D(
+			edgeplane,temp_points1,clipped_count,clipped_points);
+
+		return clipped_count;
+	}
+
+
+
+
+	//! collides only on one side
+	bool triangle_collision(
+					const btVector3 & u0,
+					const btVector3 & u1,
+					const btVector3 & u2,
+					GREAL margin_u,
+					const btVector3 & v0,
+					const btVector3 & v1,
+					const btVector3 & v2,
+					GREAL margin_v,
+					GIM_TRIANGLE_CONTACT_DATA & contacts)
+	{
+
+		margin = margin_u + margin_v;
+
+		
+		tu_vertices[0] = u0;
+		tu_vertices[1] = u1;
+		tu_vertices[2] = u2;
+
+		tv_vertices[0] = v0;
+		tv_vertices[1] = v1;
+		tv_vertices[2] = v2;
+
+		//create planes
+		// plane v vs U points
+
+
+		TRIANGLE_PLANE(tv_vertices[0],tv_vertices[1],tv_vertices[2],contacts1.m_separating_normal);
+
+		clipped_count = clip_triangle(
+			contacts1.m_separating_normal,tv_vertices,tu_vertices,clipped_points);
+
+		if(clipped_count == 0 )
+		{
+			 return false;//Reject
+		}
+
+		//find most deep interval face1
+		contacts1.merge_points(contacts1.m_separating_normal,margin,clipped_points,clipped_count);
+		if(contacts1.m_point_count == 0) return false; // too far
+
+		//Normal pointing to triangle1
+		//contacts1.m_separating_normal *= -1.f;
+
+		//Clip tri1 by tri2 edges
+
+		TRIANGLE_PLANE(tu_vertices[0],tu_vertices[1],tu_vertices[2],contacts2.m_separating_normal);
+
+		clipped_count = clip_triangle(
+			contacts2.m_separating_normal,tu_vertices,tv_vertices,clipped_points);
+
+		if(clipped_count == 0 )
+		{
+			 return false;//Reject
+		}
+
+		//find most deep interval face1
+		contacts2.merge_points(contacts2.m_separating_normal,margin,clipped_points,clipped_count);
+		if(contacts2.m_point_count == 0) return false; // too far
+
+		contacts2.m_separating_normal *= -1.f;
+
+		////check most dir for contacts
+		if(contacts2.m_penetration_depth<contacts1.m_penetration_depth)
+		{
+			contacts.copy_from(contacts2);
+		}
+		else
+		{
+			contacts.copy_from(contacts1);
+		}
+		return true;
+	}
+
+
+};*/
+
+bool GIM_TRIANGLE::collide_triangle_hard_test(
+	const GIM_TRIANGLE &other,
+	GIM_TRIANGLE_CONTACT_DATA &contact_data) const
+{
+	GIM_TRIANGLE_CALCULATION_CACHE calc_cache;
+	return calc_cache.triangle_collision(
+		m_vertices[0], m_vertices[1], m_vertices[2], m_margin,
+		other.m_vertices[0], other.m_vertices[1], other.m_vertices[2], other.m_margin,
+		contact_data);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_tri_collision.h b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_tri_collision.h
new file mode 100644
index 0000000..e6d4bf5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/Gimpact/gim_tri_collision.h
@@ -0,0 +1,368 @@
+#ifndef GIM_TRI_COLLISION_H_INCLUDED
+#define GIM_TRI_COLLISION_H_INCLUDED
+
+/*! \file gim_tri_collision.h
+\author Francisco Leon Najera
+*/
+/*
+-----------------------------------------------------------------------------
+This source file is part of GIMPACT Library.
+
+For the latest info, see http://gimpact.sourceforge.net/
+
+Copyright (c) 2006 Francisco Leon Najera. C.C. 80087371.
+email: projectileman@yahoo.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of EITHER:
+   (1) The GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 2.1 of the License, or (at
+       your option) any later version. The text of the GNU Lesser
+       General Public License is included with this library in the
+       file GIMPACT-LICENSE-LGPL.TXT.
+   (2) The BSD-style license that is included with this library in
+       the file GIMPACT-LICENSE-BSD.TXT.
+   (3) The zlib/libpng license that is included with this library in
+       the file GIMPACT-LICENSE-ZLIB.TXT.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
+ GIMPACT-LICENSE-LGPL.TXT, GIMPACT-LICENSE-ZLIB.TXT and GIMPACT-LICENSE-BSD.TXT for more details.
+
+-----------------------------------------------------------------------------
+*/
+
+#include "gim_box_collision.h"
+#include "gim_clip_polygon.h"
+
+#ifndef MAX_TRI_CLIPPING
+#define MAX_TRI_CLIPPING 16
+#endif
+
+//! Structure for collision
+struct GIM_TRIANGLE_CONTACT_DATA
+{
+	GREAL m_penetration_depth;
+	GUINT m_point_count;
+	btVector4 m_separating_normal;
+	btVector3 m_points[MAX_TRI_CLIPPING];
+
+	SIMD_FORCE_INLINE void copy_from(const GIM_TRIANGLE_CONTACT_DATA &other)
+	{
+		m_penetration_depth = other.m_penetration_depth;
+		m_separating_normal = other.m_separating_normal;
+		m_point_count = other.m_point_count;
+		GUINT i = m_point_count;
+		while (i--)
+		{
+			m_points[i] = other.m_points[i];
+		}
+	}
+
+	GIM_TRIANGLE_CONTACT_DATA()
+	{
+	}
+
+	GIM_TRIANGLE_CONTACT_DATA(const GIM_TRIANGLE_CONTACT_DATA &other)
+	{
+		copy_from(other);
+	}
+
+	//! classify points that are closer
+	template <typename DISTANCE_FUNC, typename CLASS_PLANE>
+	SIMD_FORCE_INLINE void mergepoints_generic(const CLASS_PLANE &plane,
+											   GREAL margin, const btVector3 *points, GUINT point_count, DISTANCE_FUNC distance_func)
+	{
+		m_point_count = 0;
+		m_penetration_depth = -1000.0f;
+
+		GUINT point_indices[MAX_TRI_CLIPPING];
+
+		GUINT _k;
+
+		for (_k = 0; _k < point_count; _k++)
+		{
+			GREAL _dist = -distance_func(plane, points[_k]) + margin;
+
+			if (_dist >= 0.0f)
+			{
+				if (_dist > m_penetration_depth)
+				{
+					m_penetration_depth = _dist;
+					point_indices[0] = _k;
+					m_point_count = 1;
+				}
+				else if ((_dist + G_EPSILON) >= m_penetration_depth)
+				{
+					point_indices[m_point_count] = _k;
+					m_point_count++;
+				}
+			}
+		}
+
+		for (_k = 0; _k < m_point_count; _k++)
+		{
+			m_points[_k] = points[point_indices[_k]];
+		}
+	}
+
+	//! classify points that are closer
+	SIMD_FORCE_INLINE void merge_points(const btVector4 &plane, GREAL margin,
+										const btVector3 *points, GUINT point_count)
+	{
+		m_separating_normal = plane;
+		mergepoints_generic(plane, margin, points, point_count, DISTANCE_PLANE_3D_FUNC());
+	}
+};
+
+//! Class for colliding triangles
+class GIM_TRIANGLE
+{
+public:
+	btScalar m_margin;
+	btVector3 m_vertices[3];
+
+	GIM_TRIANGLE() : m_margin(0.1f)
+	{
+	}
+
+	SIMD_FORCE_INLINE GIM_AABB get_box() const
+	{
+		return GIM_AABB(m_vertices[0], m_vertices[1], m_vertices[2], m_margin);
+	}
+
+	SIMD_FORCE_INLINE void get_normal(btVector3 &normal) const
+	{
+		TRIANGLE_NORMAL(m_vertices[0], m_vertices[1], m_vertices[2], normal);
+	}
+
+	SIMD_FORCE_INLINE void get_plane(btVector4 &plane) const
+	{
+		TRIANGLE_PLANE(m_vertices[0], m_vertices[1], m_vertices[2], plane);
+		;
+	}
+
+	SIMD_FORCE_INLINE void apply_transform(const btTransform &trans)
+	{
+		m_vertices[0] = trans(m_vertices[0]);
+		m_vertices[1] = trans(m_vertices[1]);
+		m_vertices[2] = trans(m_vertices[2]);
+	}
+
+	SIMD_FORCE_INLINE void get_edge_plane(GUINT edge_index, const btVector3 &triangle_normal, btVector4 &plane) const
+	{
+		const btVector3 &e0 = m_vertices[edge_index];
+		const btVector3 &e1 = m_vertices[(edge_index + 1) % 3];
+		EDGE_PLANE(e0, e1, triangle_normal, plane);
+	}
+
+	//! Gets the relative transformation of this triangle
+	/*!
+    The transformation is oriented to the triangle normal , and aligned to the 1st edge of this triangle. The position corresponds to vertice 0:
+    - triangle normal corresponds to Z axis.
+    - 1st normalized edge corresponds to X axis,
+
+    */
+	SIMD_FORCE_INLINE void get_triangle_transform(btTransform &triangle_transform) const
+	{
+		btMatrix3x3 &matrix = triangle_transform.getBasis();
+
+		btVector3 zaxis;
+		get_normal(zaxis);
+		MAT_SET_Z(matrix, zaxis);
+
+		btVector3 xaxis = m_vertices[1] - m_vertices[0];
+		VEC_NORMALIZE(xaxis);
+		MAT_SET_X(matrix, xaxis);
+
+		//y axis
+		xaxis = zaxis.cross(xaxis);
+		MAT_SET_Y(matrix, xaxis);
+
+		triangle_transform.setOrigin(m_vertices[0]);
+	}
+
+	//! Test triangles by finding separating axis
+	/*!
+	\param other Triangle for collide
+	\param contact_data Structure for holding contact points, normal and penetration depth; The normal is pointing toward this triangle from the other triangle
+	*/
+	bool collide_triangle_hard_test(
+		const GIM_TRIANGLE &other,
+		GIM_TRIANGLE_CONTACT_DATA &contact_data) const;
+
+	//! Test boxes before doing hard test
+	/*!
+	\param other Triangle for collide
+	\param contact_data Structure for holding contact points, normal and penetration depth; The normal is pointing toward this triangle from the other triangle
+	\
+	*/
+	SIMD_FORCE_INLINE bool collide_triangle(
+		const GIM_TRIANGLE &other,
+		GIM_TRIANGLE_CONTACT_DATA &contact_data) const
+	{
+		//test box collisioin
+		GIM_AABB boxu(m_vertices[0], m_vertices[1], m_vertices[2], m_margin);
+		GIM_AABB boxv(other.m_vertices[0], other.m_vertices[1], other.m_vertices[2], other.m_margin);
+		if (!boxu.has_collision(boxv)) return false;
+
+		//do hard test
+		return collide_triangle_hard_test(other, contact_data);
+	}
+
+	/*!
+
+	Solve the System for u,v parameters:
+
+	u*axe1[i1] + v*axe2[i1] = vecproj[i1]
+	u*axe1[i2] + v*axe2[i2] = vecproj[i2]
+
+	sustitute:
+	v = (vecproj[i2] - u*axe1[i2])/axe2[i2]
+
+	then the first equation in terms of 'u':
+
+	--> u*axe1[i1] + ((vecproj[i2] - u*axe1[i2])/axe2[i2])*axe2[i1] = vecproj[i1]
+
+	--> u*axe1[i1] + vecproj[i2]*axe2[i1]/axe2[i2] - u*axe1[i2]*axe2[i1]/axe2[i2] = vecproj[i1]
+
+	--> u*(axe1[i1]  - axe1[i2]*axe2[i1]/axe2[i2]) = vecproj[i1] - vecproj[i2]*axe2[i1]/axe2[i2]
+
+	--> u*((axe1[i1]*axe2[i2]  - axe1[i2]*axe2[i1])/axe2[i2]) = (vecproj[i1]*axe2[i2] - vecproj[i2]*axe2[i1])/axe2[i2]
+
+	--> u*(axe1[i1]*axe2[i2]  - axe1[i2]*axe2[i1]) = vecproj[i1]*axe2[i2] - vecproj[i2]*axe2[i1]
+
+	--> u = (vecproj[i1]*axe2[i2] - vecproj[i2]*axe2[i1]) /(axe1[i1]*axe2[i2]  - axe1[i2]*axe2[i1])
+
+if 0.0<= u+v <=1.0 then they are inside of triangle
+
+	\return false if the point is outside of triangle.This function  doesn't take the margin
+	*/
+	SIMD_FORCE_INLINE bool get_uv_parameters(
+		const btVector3 &point,
+		const btVector3 &tri_plane,
+		GREAL &u, GREAL &v) const
+	{
+		btVector3 _axe1 = m_vertices[1] - m_vertices[0];
+		btVector3 _axe2 = m_vertices[2] - m_vertices[0];
+		btVector3 _vecproj = point - m_vertices[0];
+		GUINT _i1 = (tri_plane.closestAxis() + 1) % 3;
+		GUINT _i2 = (_i1 + 1) % 3;
+		if (btFabs(_axe2[_i2]) < G_EPSILON)
+		{
+			u = (_vecproj[_i2] * _axe2[_i1] - _vecproj[_i1] * _axe2[_i2]) / (_axe1[_i2] * _axe2[_i1] - _axe1[_i1] * _axe2[_i2]);
+			v = (_vecproj[_i1] - u * _axe1[_i1]) / _axe2[_i1];
+		}
+		else
+		{
+			u = (_vecproj[_i1] * _axe2[_i2] - _vecproj[_i2] * _axe2[_i1]) / (_axe1[_i1] * _axe2[_i2] - _axe1[_i2] * _axe2[_i1]);
+			v = (_vecproj[_i2] - u * _axe1[_i2]) / _axe2[_i2];
+		}
+
+		if (u < -G_EPSILON)
+		{
+			return false;
+		}
+		else if (v < -G_EPSILON)
+		{
+			return false;
+		}
+		else
+		{
+			btScalar sumuv;
+			sumuv = u + v;
+			if (sumuv < -G_EPSILON)
+			{
+				return false;
+			}
+			else if (sumuv - 1.0f > G_EPSILON)
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	//! is point in triangle beam?
+	/*!
+	Test if point is in triangle, with m_margin tolerance
+	*/
+	SIMD_FORCE_INLINE bool is_point_inside(const btVector3 &point, const btVector3 &tri_normal) const
+	{
+		//Test with edge 0
+		btVector4 edge_plane;
+		this->get_edge_plane(0, tri_normal, edge_plane);
+		GREAL dist = DISTANCE_PLANE_POINT(edge_plane, point);
+		if (dist - m_margin > 0.0f) return false;  // outside plane
+
+		this->get_edge_plane(1, tri_normal, edge_plane);
+		dist = DISTANCE_PLANE_POINT(edge_plane, point);
+		if (dist - m_margin > 0.0f) return false;  // outside plane
+
+		this->get_edge_plane(2, tri_normal, edge_plane);
+		dist = DISTANCE_PLANE_POINT(edge_plane, point);
+		if (dist - m_margin > 0.0f) return false;  // outside plane
+		return true;
+	}
+
+	//! Bidireccional ray collision
+	SIMD_FORCE_INLINE bool ray_collision(
+		const btVector3 &vPoint,
+		const btVector3 &vDir, btVector3 &pout, btVector3 &triangle_normal,
+		GREAL &tparam, GREAL tmax = G_REAL_INFINITY)
+	{
+		btVector4 faceplane;
+		{
+			btVector3 dif1 = m_vertices[1] - m_vertices[0];
+			btVector3 dif2 = m_vertices[2] - m_vertices[0];
+			VEC_CROSS(faceplane, dif1, dif2);
+			faceplane[3] = m_vertices[0].dot(faceplane);
+		}
+
+		GUINT res = LINE_PLANE_COLLISION(faceplane, vDir, vPoint, pout, tparam, btScalar(0), tmax);
+		if (res == 0) return false;
+		if (!is_point_inside(pout, faceplane)) return false;
+
+		if (res == 2)  //invert normal
+		{
+			triangle_normal.setValue(-faceplane[0], -faceplane[1], -faceplane[2]);
+		}
+		else
+		{
+			triangle_normal.setValue(faceplane[0], faceplane[1], faceplane[2]);
+		}
+
+		VEC_NORMALIZE(triangle_normal);
+
+		return true;
+	}
+
+	//! one direccion ray collision
+	SIMD_FORCE_INLINE bool ray_collision_front_side(
+		const btVector3 &vPoint,
+		const btVector3 &vDir, btVector3 &pout, btVector3 &triangle_normal,
+		GREAL &tparam, GREAL tmax = G_REAL_INFINITY)
+	{
+		btVector4 faceplane;
+		{
+			btVector3 dif1 = m_vertices[1] - m_vertices[0];
+			btVector3 dif2 = m_vertices[2] - m_vertices[0];
+			VEC_CROSS(faceplane, dif1, dif2);
+			faceplane[3] = m_vertices[0].dot(faceplane);
+		}
+
+		GUINT res = LINE_PLANE_COLLISION(faceplane, vDir, vPoint, pout, tparam, btScalar(0), tmax);
+		if (res != 1) return false;
+
+		if (!is_point_inside(pout, faceplane)) return false;
+
+		triangle_normal.setValue(faceplane[0], faceplane[1], faceplane[2]);
+
+		VEC_NORMALIZE(triangle_normal);
+
+		return true;
+	}
+};
+
+#endif  // GIM_TRI_COLLISION_H_INCLUDED
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h
new file mode 100644
index 0000000..3c82133
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h
@@ -0,0 +1,354 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H
+#define BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H
+
+#include "LinearMath/btTransform.h"  // Note that btVector3 might be double precision...
+#include "btGjkEpa3.h"
+#include "btGjkCollisionDescription.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+
+template <typename btConvexTemplate>
+bool btGjkEpaCalcPenDepth(const btConvexTemplate& a, const btConvexTemplate& b,
+						  const btGjkCollisionDescription& colDesc,
+						  btVector3& v, btVector3& wWitnessOnA, btVector3& wWitnessOnB)
+{
+	(void)v;
+
+	//	const btScalar				radialmargin(btScalar(0.));
+
+	btVector3 guessVector(b.getWorldTransform().getOrigin() - a.getWorldTransform().getOrigin());  //?? why not use the GJK input?
+
+	btGjkEpaSolver3::sResults results;
+
+	if (btGjkEpaSolver3_Penetration(a, b, guessVector, results))
+
+	{
+		//	debugDraw->drawLine(results.witnesses[1],results.witnesses[1]+results.normal,btVector3(255,0,0));
+		//resultOut->addContactPoint(results.normal,results.witnesses[1],-results.depth);
+		wWitnessOnA = results.witnesses[0];
+		wWitnessOnB = results.witnesses[1];
+		v = results.normal;
+		return true;
+	}
+	else
+	{
+		if (btGjkEpaSolver3_Distance(a, b, guessVector, results))
+		{
+			wWitnessOnA = results.witnesses[0];
+			wWitnessOnB = results.witnesses[1];
+			v = results.normal;
+			return false;
+		}
+	}
+	return false;
+}
+
+template <typename btConvexTemplate, typename btGjkDistanceTemplate>
+int btComputeGjkEpaPenetration(const btConvexTemplate& a, const btConvexTemplate& b, const btGjkCollisionDescription& colDesc, btVoronoiSimplexSolver& simplexSolver, btGjkDistanceTemplate* distInfo)
+{
+	bool m_catchDegeneracies = true;
+	btScalar m_cachedSeparatingDistance = 0.f;
+
+	btScalar distance = btScalar(0.);
+	btVector3 normalInB(btScalar(0.), btScalar(0.), btScalar(0.));
+
+	btVector3 pointOnA, pointOnB;
+	btTransform localTransA = a.getWorldTransform();
+	btTransform localTransB = b.getWorldTransform();
+
+	btScalar marginA = a.getMargin();
+	btScalar marginB = b.getMargin();
+
+	int m_curIter = 0;
+	int gGjkMaxIter = colDesc.m_maxGjkIterations;  //this is to catch invalid input, perhaps check for #NaN?
+	btVector3 m_cachedSeparatingAxis = colDesc.m_firstDir;
+
+	bool isValid = false;
+	bool checkSimplex = false;
+	bool checkPenetration = true;
+	int m_degenerateSimplex = 0;
+
+	int m_lastUsedMethod = -1;
+
+	{
+		btScalar squaredDistance = BT_LARGE_FLOAT;
+		btScalar delta = btScalar(0.);
+
+		btScalar margin = marginA + marginB;
+
+		simplexSolver.reset();
+
+		for (;;)
+		//while (true)
+		{
+			btVector3 separatingAxisInA = (-m_cachedSeparatingAxis) * localTransA.getBasis();
+			btVector3 separatingAxisInB = m_cachedSeparatingAxis * localTransB.getBasis();
+
+			btVector3 pInA = a.getLocalSupportWithoutMargin(separatingAxisInA);
+			btVector3 qInB = b.getLocalSupportWithoutMargin(separatingAxisInB);
+
+			btVector3 pWorld = localTransA(pInA);
+			btVector3 qWorld = localTransB(qInB);
+
+			btVector3 w = pWorld - qWorld;
+			delta = m_cachedSeparatingAxis.dot(w);
+
+			// potential exit, they don't overlap
+			if ((delta > btScalar(0.0)) && (delta * delta > squaredDistance * colDesc.m_maximumDistanceSquared))
+			{
+				m_degenerateSimplex = 10;
+				checkSimplex = true;
+				//checkPenetration = false;
+				break;
+			}
+
+			//exit 0: the new point is already in the simplex, or we didn't come any closer
+			if (simplexSolver.inSimplex(w))
+			{
+				m_degenerateSimplex = 1;
+				checkSimplex = true;
+				break;
+			}
+			// are we getting any closer ?
+			btScalar f0 = squaredDistance - delta;
+			btScalar f1 = squaredDistance * colDesc.m_gjkRelError2;
+
+			if (f0 <= f1)
+			{
+				if (f0 <= btScalar(0.))
+				{
+					m_degenerateSimplex = 2;
+				}
+				else
+				{
+					m_degenerateSimplex = 11;
+				}
+				checkSimplex = true;
+				break;
+			}
+
+			//add current vertex to simplex
+			simplexSolver.addVertex(w, pWorld, qWorld);
+			btVector3 newCachedSeparatingAxis;
+
+			//calculate the closest point to the origin (update vector v)
+			if (!simplexSolver.closest(newCachedSeparatingAxis))
+			{
+				m_degenerateSimplex = 3;
+				checkSimplex = true;
+				break;
+			}
+
+			if (newCachedSeparatingAxis.length2() < colDesc.m_gjkRelError2)
+			{
+				m_cachedSeparatingAxis = newCachedSeparatingAxis;
+				m_degenerateSimplex = 6;
+				checkSimplex = true;
+				break;
+			}
+
+			btScalar previousSquaredDistance = squaredDistance;
+			squaredDistance = newCachedSeparatingAxis.length2();
+#if 0
+            ///warning: this termination condition leads to some problems in 2d test case see Bullet/Demos/Box2dDemo
+            if (squaredDistance>previousSquaredDistance)
+            {
+                m_degenerateSimplex = 7;
+                squaredDistance = previousSquaredDistance;
+                checkSimplex = false;
+                break;
+            }
+#endif  //
+
+			//redundant m_simplexSolver->compute_points(pointOnA, pointOnB);
+
+			//are we getting any closer ?
+			if (previousSquaredDistance - squaredDistance <= SIMD_EPSILON * previousSquaredDistance)
+			{
+				//				m_simplexSolver->backup_closest(m_cachedSeparatingAxis);
+				checkSimplex = true;
+				m_degenerateSimplex = 12;
+
+				break;
+			}
+
+			m_cachedSeparatingAxis = newCachedSeparatingAxis;
+
+			//degeneracy, this is typically due to invalid/uninitialized worldtransforms for a btCollisionObject
+			if (m_curIter++ > gGjkMaxIter)
+			{
+#if defined(DEBUG) || defined(_DEBUG)
+
+				printf("btGjkPairDetector maxIter exceeded:%i\n", m_curIter);
+				printf("sepAxis=(%f,%f,%f), squaredDistance = %f\n",
+					   m_cachedSeparatingAxis.getX(),
+					   m_cachedSeparatingAxis.getY(),
+					   m_cachedSeparatingAxis.getZ(),
+					   squaredDistance);
+#endif
+
+				break;
+			}
+
+			bool check = (!simplexSolver.fullSimplex());
+			//bool check = (!m_simplexSolver->fullSimplex() && squaredDistance > SIMD_EPSILON * m_simplexSolver->maxVertex());
+
+			if (!check)
+			{
+				//do we need this backup_closest here ?
+				//				m_simplexSolver->backup_closest(m_cachedSeparatingAxis);
+				m_degenerateSimplex = 13;
+				break;
+			}
+		}
+
+		if (checkSimplex)
+		{
+			simplexSolver.compute_points(pointOnA, pointOnB);
+			normalInB = m_cachedSeparatingAxis;
+
+			btScalar lenSqr = m_cachedSeparatingAxis.length2();
+
+			//valid normal
+			if (lenSqr < 0.0001)
+			{
+				m_degenerateSimplex = 5;
+			}
+			if (lenSqr > SIMD_EPSILON * SIMD_EPSILON)
+			{
+				btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+				normalInB *= rlen;  //normalize
+
+				btScalar s = btSqrt(squaredDistance);
+
+				btAssert(s > btScalar(0.0));
+				pointOnA -= m_cachedSeparatingAxis * (marginA / s);
+				pointOnB += m_cachedSeparatingAxis * (marginB / s);
+				distance = ((btScalar(1.) / rlen) - margin);
+				isValid = true;
+
+				m_lastUsedMethod = 1;
+			}
+			else
+			{
+				m_lastUsedMethod = 2;
+			}
+		}
+
+		bool catchDegeneratePenetrationCase =
+			(m_catchDegeneracies && m_degenerateSimplex && ((distance + margin) < 0.01));
+
+		//if (checkPenetration && !isValid)
+		if (checkPenetration && (!isValid || catchDegeneratePenetrationCase))
+		{
+			//penetration case
+
+			//if there is no way to handle penetrations, bail out
+
+			// Penetration depth case.
+			btVector3 tmpPointOnA, tmpPointOnB;
+
+			m_cachedSeparatingAxis.setZero();
+
+			bool isValid2 = btGjkEpaCalcPenDepth(a, b,
+												 colDesc,
+												 m_cachedSeparatingAxis, tmpPointOnA, tmpPointOnB);
+
+			if (isValid2)
+			{
+				btVector3 tmpNormalInB = tmpPointOnB - tmpPointOnA;
+				btScalar lenSqr = tmpNormalInB.length2();
+				if (lenSqr <= (SIMD_EPSILON * SIMD_EPSILON))
+				{
+					tmpNormalInB = m_cachedSeparatingAxis;
+					lenSqr = m_cachedSeparatingAxis.length2();
+				}
+
+				if (lenSqr > (SIMD_EPSILON * SIMD_EPSILON))
+				{
+					tmpNormalInB /= btSqrt(lenSqr);
+					btScalar distance2 = -(tmpPointOnA - tmpPointOnB).length();
+					//only replace valid penetrations when the result is deeper (check)
+					if (!isValid || (distance2 < distance))
+					{
+						distance = distance2;
+						pointOnA = tmpPointOnA;
+						pointOnB = tmpPointOnB;
+						normalInB = tmpNormalInB;
+
+						isValid = true;
+						m_lastUsedMethod = 3;
+					}
+					else
+					{
+						m_lastUsedMethod = 8;
+					}
+				}
+				else
+				{
+					m_lastUsedMethod = 9;
+				}
+			}
+			else
+
+			{
+				///this is another degenerate case, where the initial GJK calculation reports a degenerate case
+				///EPA reports no penetration, and the second GJK (using the supporting vector without margin)
+				///reports a valid positive distance. Use the results of the second GJK instead of failing.
+				///thanks to Jacob.Langford for the reproduction case
+				///http://code.google.com/p/bullet/issues/detail?id=250
+
+				if (m_cachedSeparatingAxis.length2() > btScalar(0.))
+				{
+					btScalar distance2 = (tmpPointOnA - tmpPointOnB).length() - margin;
+					//only replace valid distances when the distance is less
+					if (!isValid || (distance2 < distance))
+					{
+						distance = distance2;
+						pointOnA = tmpPointOnA;
+						pointOnB = tmpPointOnB;
+						pointOnA -= m_cachedSeparatingAxis * marginA;
+						pointOnB += m_cachedSeparatingAxis * marginB;
+						normalInB = m_cachedSeparatingAxis;
+						normalInB.normalize();
+
+						isValid = true;
+						m_lastUsedMethod = 6;
+					}
+					else
+					{
+						m_lastUsedMethod = 5;
+					}
+				}
+			}
+		}
+	}
+
+	if (isValid && ((distance < 0) || (distance * distance < colDesc.m_maximumDistanceSquared)))
+	{
+		m_cachedSeparatingAxis = normalInB;
+		m_cachedSeparatingDistance = distance;
+		distInfo->m_distance = distance;
+		distInfo->m_normalBtoA = normalInB;
+		distInfo->m_pointOnB = pointOnB;
+		distInfo->m_pointOnA = pointOnB + normalInB * distance;
+		return 0;
+	}
+	return -m_lastUsedMethod;
+}
+
+#endif  //BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
new file mode 100644
index 0000000..623c58f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
@@ -0,0 +1,222 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btContinuousConvexCollision.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
+#include "LinearMath/btTransformUtil.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+
+#include "btGjkPairDetector.h"
+#include "btPointCollector.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+
+btContinuousConvexCollision::btContinuousConvexCollision(const btConvexShape* convexA, const btConvexShape* convexB, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver)
+	: m_simplexSolver(simplexSolver),
+	  m_penetrationDepthSolver(penetrationDepthSolver),
+	  m_convexA(convexA),
+	  m_convexB1(convexB),
+	  m_planeShape(0)
+{
+}
+
+btContinuousConvexCollision::btContinuousConvexCollision(const btConvexShape* convexA, const btStaticPlaneShape* plane)
+	: m_simplexSolver(0),
+	  m_penetrationDepthSolver(0),
+	  m_convexA(convexA),
+	  m_convexB1(0),
+	  m_planeShape(plane)
+{
+}
+
+/// This maximum should not be necessary. It allows for untested/degenerate cases in production code.
+/// You don't want your game ever to lock-up.
+#define MAX_ITERATIONS 64
+
+void btContinuousConvexCollision::computeClosestPoints(const btTransform& transA, const btTransform& transB, btPointCollector& pointCollector)
+{
+	if (m_convexB1)
+	{
+		m_simplexSolver->reset();
+		btGjkPairDetector gjk(m_convexA, m_convexB1, m_convexA->getShapeType(), m_convexB1->getShapeType(), m_convexA->getMargin(), m_convexB1->getMargin(), m_simplexSolver, m_penetrationDepthSolver);
+		btGjkPairDetector::ClosestPointInput input;
+		input.m_transformA = transA;
+		input.m_transformB = transB;
+		gjk.getClosestPoints(input, pointCollector, 0);
+	}
+	else
+	{
+		//convex versus plane
+		const btConvexShape* convexShape = m_convexA;
+		const btStaticPlaneShape* planeShape = m_planeShape;
+
+		const btVector3& planeNormal = planeShape->getPlaneNormal();
+		const btScalar& planeConstant = planeShape->getPlaneConstant();
+
+		btTransform convexWorldTransform = transA;
+		btTransform convexInPlaneTrans;
+		convexInPlaneTrans = transB.inverse() * convexWorldTransform;
+		btTransform planeInConvex;
+		planeInConvex = convexWorldTransform.inverse() * transB;
+
+		btVector3 vtx = convexShape->localGetSupportingVertex(planeInConvex.getBasis() * -planeNormal);
+
+		btVector3 vtxInPlane = convexInPlaneTrans(vtx);
+		btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant);
+
+		btVector3 vtxInPlaneProjected = vtxInPlane - distance * planeNormal;
+		btVector3 vtxInPlaneWorld = transB * vtxInPlaneProjected;
+		btVector3 normalOnSurfaceB = transB.getBasis() * planeNormal;
+
+		pointCollector.addContactPoint(
+			normalOnSurfaceB,
+			vtxInPlaneWorld,
+			distance);
+	}
+}
+
+bool btContinuousConvexCollision::calcTimeOfImpact(
+	const btTransform& fromA,
+	const btTransform& toA,
+	const btTransform& fromB,
+	const btTransform& toB,
+	CastResult& result)
+{
+	/// compute linear and angular velocity for this interval, to interpolate
+	btVector3 linVelA, angVelA, linVelB, angVelB;
+	btTransformUtil::calculateVelocity(fromA, toA, btScalar(1.), linVelA, angVelA);
+	btTransformUtil::calculateVelocity(fromB, toB, btScalar(1.), linVelB, angVelB);
+
+	btScalar boundingRadiusA = m_convexA->getAngularMotionDisc();
+	btScalar boundingRadiusB = m_convexB1 ? m_convexB1->getAngularMotionDisc() : 0.f;
+
+	btScalar maxAngularProjectedVelocity = angVelA.length() * boundingRadiusA + angVelB.length() * boundingRadiusB;
+	btVector3 relLinVel = (linVelB - linVelA);
+
+	btScalar relLinVelocLength = (linVelB - linVelA).length();
+
+	if ((relLinVelocLength + maxAngularProjectedVelocity) == 0.f)
+		return false;
+
+	btScalar lambda = btScalar(0.);
+
+	btVector3 n;
+	n.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+	bool hasResult = false;
+	btVector3 c;
+
+	btScalar lastLambda = lambda;
+	//btScalar epsilon = btScalar(0.001);
+
+	int numIter = 0;
+	//first solution, using GJK
+
+	btScalar radius = 0.001f;
+	//	result.drawCoordSystem(sphereTr);
+
+	btPointCollector pointCollector1;
+
+	{
+		computeClosestPoints(fromA, fromB, pointCollector1);
+
+		hasResult = pointCollector1.m_hasResult;
+		c = pointCollector1.m_pointInWorld;
+	}
+
+	if (hasResult)
+	{
+		btScalar dist;
+		dist = pointCollector1.m_distance + result.m_allowedPenetration;
+		n = pointCollector1.m_normalOnBInWorld;
+		btScalar projectedLinearVelocity = relLinVel.dot(n);
+		if ((projectedLinearVelocity + maxAngularProjectedVelocity) <= SIMD_EPSILON)
+			return false;
+
+		//not close enough
+		while (dist > radius)
+		{
+			if (result.m_debugDrawer)
+			{
+				result.m_debugDrawer->drawSphere(c, 0.2f, btVector3(1, 1, 1));
+			}
+			btScalar dLambda = btScalar(0.);
+
+			projectedLinearVelocity = relLinVel.dot(n);
+
+			//don't report time of impact for motion away from the contact normal (or causes minor penetration)
+			if ((projectedLinearVelocity + maxAngularProjectedVelocity) <= SIMD_EPSILON)
+				return false;
+
+			dLambda = dist / (projectedLinearVelocity + maxAngularProjectedVelocity);
+
+			lambda += dLambda;
+
+			if (lambda > btScalar(1.) || lambda < btScalar(0.))
+				return false;
+
+			//todo: next check with relative epsilon
+			if (lambda <= lastLambda)
+			{
+				return false;
+				//n.setValue(0,0,0);
+				//break;
+			}
+			lastLambda = lambda;
+
+			//interpolate to next lambda
+			btTransform interpolatedTransA, interpolatedTransB, relativeTrans;
+
+			btTransformUtil::integrateTransform(fromA, linVelA, angVelA, lambda, interpolatedTransA);
+			btTransformUtil::integrateTransform(fromB, linVelB, angVelB, lambda, interpolatedTransB);
+			relativeTrans = interpolatedTransB.inverseTimes(interpolatedTransA);
+
+			if (result.m_debugDrawer)
+			{
+				result.m_debugDrawer->drawSphere(interpolatedTransA.getOrigin(), 0.2f, btVector3(1, 0, 0));
+			}
+
+			result.DebugDraw(lambda);
+
+			btPointCollector pointCollector;
+			computeClosestPoints(interpolatedTransA, interpolatedTransB, pointCollector);
+
+			if (pointCollector.m_hasResult)
+			{
+				dist = pointCollector.m_distance + result.m_allowedPenetration;
+				c = pointCollector.m_pointInWorld;
+				n = pointCollector.m_normalOnBInWorld;
+			}
+			else
+			{
+				result.reportFailure(-1, numIter);
+				return false;
+			}
+
+			numIter++;
+			if (numIter > MAX_ITERATIONS)
+			{
+				result.reportFailure(-2, numIter);
+				return false;
+			}
+		}
+
+		result.m_fraction = lambda;
+		result.m_normal = n;
+		result.m_hitPoint = c;
+		return true;
+	}
+
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
new file mode 100644
index 0000000..76c7731
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
@@ -0,0 +1,53 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
+#define BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
+
+#include "btConvexCast.h"
+#include "btSimplexSolverInterface.h"
+class btConvexPenetrationDepthSolver;
+class btConvexShape;
+class btStaticPlaneShape;
+
+/// btContinuousConvexCollision implements angular and linear time of impact for convex objects.
+/// Based on Brian Mirtich's Conservative Advancement idea (PhD thesis).
+/// Algorithm operates in worldspace, in order to keep in between motion globally consistent.
+/// It uses GJK at the moment. Future improvement would use minkowski sum / supporting vertex, merging innerloops
+class btContinuousConvexCollision : public btConvexCast
+{
+	btSimplexSolverInterface* m_simplexSolver;
+	btConvexPenetrationDepthSolver* m_penetrationDepthSolver;
+	const btConvexShape* m_convexA;
+	//second object is either a convex or a plane (code sharing)
+	const btConvexShape* m_convexB1;
+	const btStaticPlaneShape* m_planeShape;
+
+	void computeClosestPoints(const btTransform& transA, const btTransform& transB, struct btPointCollector& pointCollector);
+
+public:
+	btContinuousConvexCollision(const btConvexShape* shapeA, const btConvexShape* shapeB, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver);
+
+	btContinuousConvexCollision(const btConvexShape* shapeA, const btStaticPlaneShape* plane);
+
+	virtual bool calcTimeOfImpact(
+		const btTransform& fromA,
+		const btTransform& toA,
+		const btTransform& fromB,
+		const btTransform& toB,
+		CastResult& result);
+};
+
+#endif  //BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp
new file mode 100644
index 0000000..f5b9b68
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp
@@ -0,0 +1,20 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvexCast.h"
+
+btConvexCast::~btConvexCast()
+{
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
new file mode 100644
index 0000000..85476e6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
@@ -0,0 +1,90 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_CAST_H
+#define BT_CONVEX_CAST_H
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btScalar.h"
+class btMinkowskiSumShape;
+#include "LinearMath/btIDebugDraw.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define MAX_CONVEX_CAST_ITERATIONS 64
+#define MAX_CONVEX_CAST_EPSILON (SIMD_EPSILON * 10)
+#else
+#define MAX_CONVEX_CAST_ITERATIONS 32
+#define MAX_CONVEX_CAST_EPSILON btScalar(0.0001)
+#endif
+///Typically the conservative advancement reaches solution in a few iterations, clip it to 32 for degenerate cases.
+///See discussion about this here https://bulletphysics.orgphpBB2/viewtopic.php?t=565
+//will need to digg deeper to make the algorithm more robust
+//since, a large epsilon can cause an early termination with false
+//positive results (ray intersections that shouldn't be there)
+
+/// btConvexCast is an interface for Casting
+class btConvexCast
+{
+public:
+	virtual ~btConvexCast();
+
+	///RayResult stores the closest result
+	/// alternatively, add a callback method to decide about closest/all results
+	struct CastResult
+	{
+		//virtual bool	addRayResult(const btVector3& normal,btScalar	fraction) = 0;
+
+		virtual void DebugDraw(btScalar fraction) { (void)fraction; }
+		virtual void drawCoordSystem(const btTransform& trans) { (void)trans; }
+		virtual void reportFailure(int errNo, int numIterations)
+		{
+			(void)errNo;
+			(void)numIterations;
+		}
+		CastResult()
+			: m_fraction(btScalar(BT_LARGE_FLOAT)),
+			  m_debugDrawer(0),
+			  m_allowedPenetration(btScalar(0)),
+			  m_subSimplexCastMaxIterations(MAX_CONVEX_CAST_ITERATIONS),
+			  m_subSimplexCastEpsilon(MAX_CONVEX_CAST_EPSILON)
+		{
+		}
+
+		virtual ~CastResult(){};
+
+		btTransform m_hitTransformA;
+		btTransform m_hitTransformB;
+		btVector3 m_normal;
+		btVector3 m_hitPoint;
+		btScalar m_fraction;  //input and output
+		btIDebugDraw* m_debugDrawer;
+		btScalar m_allowedPenetration;
+		
+		int m_subSimplexCastMaxIterations;
+		btScalar m_subSimplexCastEpsilon;
+
+	};
+
+	/// cast a convex against another convex object
+	virtual bool calcTimeOfImpact(
+		const btTransform& fromA,
+		const btTransform& toA,
+		const btTransform& fromB,
+		const btTransform& toB,
+		CastResult& result) = 0;
+};
+
+#endif  //BT_CONVEX_CAST_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
new file mode 100644
index 0000000..7672a41
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
@@ -0,0 +1,35 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_PENETRATION_DEPTH_H
+#define BT_CONVEX_PENETRATION_DEPTH_H
+
+class btVector3;
+#include "btSimplexSolverInterface.h"
+class btConvexShape;
+class btTransform;
+
+///ConvexPenetrationDepthSolver provides an interface for penetration depth calculation.
+class btConvexPenetrationDepthSolver
+{
+public:
+	virtual ~btConvexPenetrationDepthSolver(){};
+	virtual bool calcPenDepth(btSimplexSolverInterface& simplexSolver,
+							  const btConvexShape* convexA, const btConvexShape* convexB,
+							  const btTransform& transA, const btTransform& transB,
+							  btVector3& v, btVector3& pa, btVector3& pb,
+							  class btIDebugDraw* debugDraw) = 0;
+};
+#endif  //BT_CONVEX_PENETRATION_DEPTH_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
new file mode 100644
index 0000000..973975f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
@@ -0,0 +1,85 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
+#define BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+
+/// This interface is made to be used by an iterative approach to do TimeOfImpact calculations
+/// This interface allows to query for closest points and penetration depth between two (convex) objects
+/// the closest point is on the second object (B), and the normal points from the surface on B towards A.
+/// distance is between closest points on B and closest point on A. So you can calculate closest point on A
+/// by taking closestPointInA = closestPointInB + m_distance * m_normalOnSurfaceB
+struct btDiscreteCollisionDetectorInterface
+{
+	struct Result
+	{
+		virtual ~Result() {}
+
+		///setShapeIdentifiersA/B provides experimental support for per-triangle material / custom material combiner
+		virtual void setShapeIdentifiersA(int partId0, int index0) = 0;
+		virtual void setShapeIdentifiersB(int partId1, int index1) = 0;
+		virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth) = 0;
+	};
+
+	struct ClosestPointInput
+	{
+		ClosestPointInput()
+			: m_maximumDistanceSquared(btScalar(BT_LARGE_FLOAT))
+		{
+		}
+
+		btTransform m_transformA;
+		btTransform m_transformB;
+		btScalar m_maximumDistanceSquared;
+	};
+
+	virtual ~btDiscreteCollisionDetectorInterface(){};
+
+	//
+	// give either closest points (distance > 0) or penetration (distance)
+	// the normal always points from B towards A
+	//
+	virtual void getClosestPoints(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw, bool swapResults = false) = 0;
+};
+
+struct btStorageResult : public btDiscreteCollisionDetectorInterface::Result
+{
+	btVector3 m_normalOnSurfaceB;
+	btVector3 m_closestPointInB;
+	btScalar m_distance;  //negative means penetration !
+
+protected:
+	btStorageResult() : m_distance(btScalar(BT_LARGE_FLOAT))
+	{
+	}
+
+public:
+	virtual ~btStorageResult(){};
+
+	virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth)
+	{
+		if (depth < m_distance)
+		{
+			m_normalOnSurfaceB = normalOnBInWorld;
+			m_closestPointInB = pointInWorld;
+			m_distance = depth;
+		}
+	}
+};
+
+#endif  //BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h
new file mode 100644
index 0000000..c9fd84b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h
@@ -0,0 +1,39 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef GJK_COLLISION_DESCRIPTION_H
+#define GJK_COLLISION_DESCRIPTION_H
+
+#include "LinearMath/btVector3.h"
+
+struct btGjkCollisionDescription
+{
+	btVector3 m_firstDir;
+	int m_maxGjkIterations;
+	btScalar m_maximumDistanceSquared;
+	btScalar m_gjkRelError2;
+	btGjkCollisionDescription()
+		: m_firstDir(0, 1, 0),
+		  m_maxGjkIterations(1000),
+		  m_maximumDistanceSquared(1e30f),
+		  m_gjkRelError2(1.0e-6)
+	{
+	}
+	virtual ~btGjkCollisionDescription()
+	{
+	}
+};
+
+#endif  //GJK_COLLISION_DESCRIPTION_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
new file mode 100644
index 0000000..41da699
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
@@ -0,0 +1,164 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGjkConvexCast.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "btGjkPairDetector.h"
+#include "btPointCollector.h"
+#include "LinearMath/btTransformUtil.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define MAX_ITERATIONS 64
+#else
+#define MAX_ITERATIONS 32
+#endif
+
+btGjkConvexCast::btGjkConvexCast(const btConvexShape* convexA, const btConvexShape* convexB, btSimplexSolverInterface* simplexSolver)
+	: m_simplexSolver(simplexSolver),
+	  m_convexA(convexA),
+	  m_convexB(convexB)
+{
+}
+
+bool btGjkConvexCast::calcTimeOfImpact(
+	const btTransform& fromA,
+	const btTransform& toA,
+	const btTransform& fromB,
+	const btTransform& toB,
+	CastResult& result)
+{
+	m_simplexSolver->reset();
+
+	/// compute linear velocity for this interval, to interpolate
+	//assume no rotation/angular velocity, assert here?
+	btVector3 linVelA, linVelB;
+	linVelA = toA.getOrigin() - fromA.getOrigin();
+	linVelB = toB.getOrigin() - fromB.getOrigin();
+
+	btScalar radius = btScalar(0.001);
+	btScalar lambda = btScalar(0.);
+	btVector3 v(1, 0, 0);
+
+	int maxIter = MAX_ITERATIONS;
+
+	btVector3 n;
+	n.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+	bool hasResult = false;
+	btVector3 c;
+	btVector3 r = (linVelA - linVelB);
+
+	btScalar lastLambda = lambda;
+	//btScalar epsilon = btScalar(0.001);
+
+	int numIter = 0;
+	//first solution, using GJK
+
+	btTransform identityTrans;
+	identityTrans.setIdentity();
+
+	//	result.drawCoordSystem(sphereTr);
+
+	btPointCollector pointCollector;
+
+	btGjkPairDetector gjk(m_convexA, m_convexB, m_simplexSolver, 0);  //m_penetrationDepthSolver);
+	btGjkPairDetector::ClosestPointInput input;
+
+	//we don't use margins during CCD
+	//	gjk.setIgnoreMargin(true);
+
+	input.m_transformA = fromA;
+	input.m_transformB = fromB;
+	gjk.getClosestPoints(input, pointCollector, 0);
+
+	hasResult = pointCollector.m_hasResult;
+	c = pointCollector.m_pointInWorld;
+
+	if (hasResult)
+	{
+		btScalar dist;
+		dist = pointCollector.m_distance;
+		n = pointCollector.m_normalOnBInWorld;
+
+		//not close enough
+		while (dist > radius)
+		{
+			numIter++;
+			if (numIter > maxIter)
+			{
+				return false;  //todo: report a failure
+			}
+			btScalar dLambda = btScalar(0.);
+
+			btScalar projectedLinearVelocity = r.dot(n);
+
+			dLambda = dist / (projectedLinearVelocity);
+
+			lambda = lambda - dLambda;
+
+			if (lambda > btScalar(1.))
+				return false;
+
+			if (lambda < btScalar(0.))
+				return false;
+
+			//todo: next check with relative epsilon
+			if (lambda <= lastLambda)
+			{
+				return false;
+				//n.setValue(0,0,0);
+				break;
+			}
+			lastLambda = lambda;
+
+			//interpolate to next lambda
+			result.DebugDraw(lambda);
+			input.m_transformA.getOrigin().setInterpolate3(fromA.getOrigin(), toA.getOrigin(), lambda);
+			input.m_transformB.getOrigin().setInterpolate3(fromB.getOrigin(), toB.getOrigin(), lambda);
+
+			gjk.getClosestPoints(input, pointCollector, 0);
+			if (pointCollector.m_hasResult)
+			{
+				if (pointCollector.m_distance < btScalar(0.))
+				{
+					result.m_fraction = lastLambda;
+					n = pointCollector.m_normalOnBInWorld;
+					result.m_normal = n;
+					result.m_hitPoint = pointCollector.m_pointInWorld;
+					return true;
+				}
+				c = pointCollector.m_pointInWorld;
+				n = pointCollector.m_normalOnBInWorld;
+				dist = pointCollector.m_distance;
+			}
+			else
+			{
+				//??
+				return false;
+			}
+		}
+
+		//is n normalized?
+		//don't report time of impact for motion away from the contact normal (or causes minor penetration)
+		if (n.dot(r) >= -result.m_allowedPenetration)
+			return false;
+
+		result.m_fraction = lambda;
+		result.m_normal = n;
+		result.m_hitPoint = c;
+		return true;
+	}
+
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
new file mode 100644
index 0000000..0ee46a5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
@@ -0,0 +1,46 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GJK_CONVEX_CAST_H
+#define BT_GJK_CONVEX_CAST_H
+
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+
+#include "LinearMath/btVector3.h"
+#include "btConvexCast.h"
+class btConvexShape;
+class btMinkowskiSumShape;
+#include "btSimplexSolverInterface.h"
+
+///GjkConvexCast performs a raycast on a convex object using support mapping.
+class btGjkConvexCast : public btConvexCast
+{
+	btSimplexSolverInterface* m_simplexSolver;
+	const btConvexShape* m_convexA;
+	const btConvexShape* m_convexB;
+
+public:
+	btGjkConvexCast(const btConvexShape* convexA, const btConvexShape* convexB, btSimplexSolverInterface* simplexSolver);
+
+	/// cast a convex against another convex object
+	virtual bool calcTimeOfImpact(
+		const btTransform& fromA,
+		const btTransform& toA,
+		const btTransform& fromB,
+		const btTransform& toB,
+		CastResult& result);
+};
+
+#endif  //BT_GJK_CONVEX_CAST_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
new file mode 100644
index 0000000..2288604
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
@@ -0,0 +1,1104 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+GJK-EPA collision solver by Nathanael Presson, 2008
+*/
+#include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "btGjkEpa2.h"
+
+#if defined(DEBUG) || defined(_DEBUG)
+#include <stdio.h>  //for debug printf
+#ifdef __SPU__
+#include <spu_printf.h>
+#define printf spu_printf
+#endif  //__SPU__
+#endif
+
+namespace gjkepa2_impl
+{
+// Config
+
+/* GJK	*/
+#define GJK_MAX_ITERATIONS 128
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define GJK_ACCURACY ((btScalar)1e-12)
+#define GJK_MIN_DISTANCE ((btScalar)1e-12)
+#define GJK_DUPLICATED_EPS ((btScalar)1e-12)
+#else
+#define GJK_ACCURACY ((btScalar)0.0001)
+#define GJK_MIN_DISTANCE ((btScalar)0.0001)
+#define GJK_DUPLICATED_EPS ((btScalar)0.0001)
+#endif  //BT_USE_DOUBLE_PRECISION
+
+#define GJK_SIMPLEX2_EPS ((btScalar)0.0)
+#define GJK_SIMPLEX3_EPS ((btScalar)0.0)
+#define GJK_SIMPLEX4_EPS ((btScalar)0.0)
+
+/* EPA	*/
+#define EPA_MAX_VERTICES 128
+#define EPA_MAX_ITERATIONS 255
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define EPA_ACCURACY ((btScalar)1e-12)
+#define EPA_PLANE_EPS ((btScalar)1e-14)
+#define EPA_INSIDE_EPS ((btScalar)1e-9)
+#else
+#define EPA_ACCURACY ((btScalar)0.0001)
+#define EPA_PLANE_EPS ((btScalar)0.00001)
+#define EPA_INSIDE_EPS ((btScalar)0.01)
+#endif
+
+#define EPA_FALLBACK (10 * EPA_ACCURACY)
+#define EPA_MAX_FACES (EPA_MAX_VERTICES * 2)
+
+// Shorthands
+typedef unsigned int U;
+typedef unsigned char U1;
+
+// MinkowskiDiff
+struct MinkowskiDiff
+{
+	const btConvexShape* m_shapes[2];
+	btMatrix3x3 m_toshape1;
+	btTransform m_toshape0;
+#ifdef __SPU__
+	bool m_enableMargin;
+#else
+	btVector3 (btConvexShape::*Ls)(const btVector3&) const;
+#endif  //__SPU__
+
+	MinkowskiDiff()
+	{
+	}
+#ifdef __SPU__
+	void EnableMargin(bool enable)
+	{
+		m_enableMargin = enable;
+	}
+	inline btVector3 Support0(const btVector3& d) const
+	{
+		if (m_enableMargin)
+		{
+			return m_shapes[0]->localGetSupportVertexNonVirtual(d);
+		}
+		else
+		{
+			return m_shapes[0]->localGetSupportVertexWithoutMarginNonVirtual(d);
+		}
+	}
+	inline btVector3 Support1(const btVector3& d) const
+	{
+		if (m_enableMargin)
+		{
+			return m_toshape0 * (m_shapes[1]->localGetSupportVertexNonVirtual(m_toshape1 * d));
+		}
+		else
+		{
+			return m_toshape0 * (m_shapes[1]->localGetSupportVertexWithoutMarginNonVirtual(m_toshape1 * d));
+		}
+	}
+#else
+	void EnableMargin(bool enable)
+	{
+		if (enable)
+			Ls = &btConvexShape::localGetSupportVertexNonVirtual;
+		else
+			Ls = &btConvexShape::localGetSupportVertexWithoutMarginNonVirtual;
+	}
+	inline btVector3 Support0(const btVector3& d) const
+	{
+		return (((m_shapes[0])->*(Ls))(d));
+	}
+	inline btVector3 Support1(const btVector3& d) const
+	{
+		return (m_toshape0 * ((m_shapes[1])->*(Ls))(m_toshape1 * d));
+	}
+#endif  //__SPU__
+
+	inline btVector3 Support(const btVector3& d) const
+	{
+		return (Support0(d) - Support1(-d));
+	}
+	btVector3 Support(const btVector3& d, U index) const
+	{
+		if (index)
+			return (Support1(d));
+		else
+			return (Support0(d));
+	}
+};
+
+typedef MinkowskiDiff tShape;
+
+// GJK
+struct GJK
+{
+	/* Types		*/
+	struct sSV
+	{
+		btVector3 d, w;
+	};
+	struct sSimplex
+	{
+		sSV* c[4];
+		btScalar p[4];
+		U rank;
+	};
+	struct eStatus
+	{
+		enum _
+		{
+			Valid,
+			Inside,
+			Failed
+		};
+	};
+	/* Fields		*/
+	tShape m_shape;
+	btVector3 m_ray;
+	btScalar m_distance;
+	sSimplex m_simplices[2];
+	sSV m_store[4];
+	sSV* m_free[4];
+	U m_nfree;
+	U m_current;
+	sSimplex* m_simplex;
+	eStatus::_ m_status;
+	/* Methods		*/
+	GJK()
+	{
+		Initialize();
+	}
+	void Initialize()
+	{
+		m_ray = btVector3(0, 0, 0);
+		m_nfree = 0;
+		m_status = eStatus::Failed;
+		m_current = 0;
+		m_distance = 0;
+	}
+	eStatus::_ Evaluate(const tShape& shapearg, const btVector3& guess)
+	{
+		U iterations = 0;
+		btScalar sqdist = 0;
+		btScalar alpha = 0;
+		btVector3 lastw[4];
+		U clastw = 0;
+		/* Initialize solver		*/
+		m_free[0] = &m_store[0];
+		m_free[1] = &m_store[1];
+		m_free[2] = &m_store[2];
+		m_free[3] = &m_store[3];
+		m_nfree = 4;
+		m_current = 0;
+		m_status = eStatus::Valid;
+		m_shape = shapearg;
+		m_distance = 0;
+		/* Initialize simplex		*/
+		m_simplices[0].rank = 0;
+		m_ray = guess;
+		const btScalar sqrl = m_ray.length2();
+		appendvertice(m_simplices[0], sqrl > 0 ? -m_ray : btVector3(1, 0, 0));
+		m_simplices[0].p[0] = 1;
+		m_ray = m_simplices[0].c[0]->w;
+		sqdist = sqrl;
+		lastw[0] =
+			lastw[1] =
+				lastw[2] =
+					lastw[3] = m_ray;
+		/* Loop						*/
+		do
+		{
+			const U next = 1 - m_current;
+			sSimplex& cs = m_simplices[m_current];
+			sSimplex& ns = m_simplices[next];
+			/* Check zero							*/
+			const btScalar rl = m_ray.length();
+			if (rl < GJK_MIN_DISTANCE)
+			{ /* Touching or inside				*/
+				m_status = eStatus::Inside;
+				break;
+			}
+			/* Append new vertice in -'v' direction	*/
+			appendvertice(cs, -m_ray);
+			const btVector3& w = cs.c[cs.rank - 1]->w;
+			bool found = false;
+			for (U i = 0; i < 4; ++i)
+			{
+				if ((w - lastw[i]).length2() < GJK_DUPLICATED_EPS)
+				{
+					found = true;
+					break;
+				}
+			}
+			if (found)
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			else
+			{ /* Update lastw					*/
+				lastw[clastw = (clastw + 1) & 3] = w;
+			}
+			/* Check for termination				*/
+			const btScalar omega = btDot(m_ray, w) / rl;
+			alpha = btMax(omega, alpha);
+			if (((rl - alpha) - (GJK_ACCURACY * rl)) <= 0)
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			/* Reduce simplex						*/
+			btScalar weights[4];
+			U mask = 0;
+			switch (cs.rank)
+			{
+				case 2:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   weights, mask);
+					break;
+				case 3:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   cs.c[2]->w,
+										   weights, mask);
+					break;
+				case 4:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   cs.c[2]->w,
+										   cs.c[3]->w,
+										   weights, mask);
+					break;
+			}
+			if (sqdist >= 0)
+			{ /* Valid	*/
+				ns.rank = 0;
+				m_ray = btVector3(0, 0, 0);
+				m_current = next;
+				for (U i = 0, ni = cs.rank; i < ni; ++i)
+				{
+					if (mask & (1 << i))
+					{
+						ns.c[ns.rank] = cs.c[i];
+						ns.p[ns.rank++] = weights[i];
+						m_ray += cs.c[i]->w * weights[i];
+					}
+					else
+					{
+						m_free[m_nfree++] = cs.c[i];
+					}
+				}
+				if (mask == 15) m_status = eStatus::Inside;
+			}
+			else
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			m_status = ((++iterations) < GJK_MAX_ITERATIONS) ? m_status : eStatus::Failed;
+		} while (m_status == eStatus::Valid);
+		m_simplex = &m_simplices[m_current];
+		switch (m_status)
+		{
+			case eStatus::Valid:
+				m_distance = m_ray.length();
+				break;
+			case eStatus::Inside:
+				m_distance = 0;
+				break;
+			default:
+			{
+			}
+		}
+		return (m_status);
+	}
+	bool EncloseOrigin()
+	{
+		switch (m_simplex->rank)
+		{
+			case 1:
+			{
+				for (U i = 0; i < 3; ++i)
+				{
+					btVector3 axis = btVector3(0, 0, 0);
+					axis[i] = 1;
+					appendvertice(*m_simplex, axis);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+					appendvertice(*m_simplex, -axis);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+				}
+			}
+			break;
+			case 2:
+			{
+				const btVector3 d = m_simplex->c[1]->w - m_simplex->c[0]->w;
+				for (U i = 0; i < 3; ++i)
+				{
+					btVector3 axis = btVector3(0, 0, 0);
+					axis[i] = 1;
+					const btVector3 p = btCross(d, axis);
+					if (p.length2() > 0)
+					{
+						appendvertice(*m_simplex, p);
+						if (EncloseOrigin()) return (true);
+						removevertice(*m_simplex);
+						appendvertice(*m_simplex, -p);
+						if (EncloseOrigin()) return (true);
+						removevertice(*m_simplex);
+					}
+				}
+			}
+			break;
+			case 3:
+			{
+				const btVector3 n = btCross(m_simplex->c[1]->w - m_simplex->c[0]->w,
+											m_simplex->c[2]->w - m_simplex->c[0]->w);
+				if (n.length2() > 0)
+				{
+					appendvertice(*m_simplex, n);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+					appendvertice(*m_simplex, -n);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+				}
+			}
+			break;
+			case 4:
+			{
+				if (btFabs(det(m_simplex->c[0]->w - m_simplex->c[3]->w,
+							   m_simplex->c[1]->w - m_simplex->c[3]->w,
+							   m_simplex->c[2]->w - m_simplex->c[3]->w)) > 0)
+					return (true);
+			}
+			break;
+		}
+		return (false);
+	}
+	/* Internals	*/
+	void getsupport(const btVector3& d, sSV& sv) const
+	{
+		sv.d = d / d.length();
+		sv.w = m_shape.Support(sv.d);
+	}
+	void removevertice(sSimplex& simplex)
+	{
+		m_free[m_nfree++] = simplex.c[--simplex.rank];
+	}
+	void appendvertice(sSimplex& simplex, const btVector3& v)
+	{
+		simplex.p[simplex.rank] = 0;
+		simplex.c[simplex.rank] = m_free[--m_nfree];
+		getsupport(v, *simplex.c[simplex.rank++]);
+	}
+	static btScalar det(const btVector3& a, const btVector3& b, const btVector3& c)
+	{
+		return (a.y() * b.z() * c.x() + a.z() * b.x() * c.y() -
+				a.x() * b.z() * c.y() - a.y() * b.x() * c.z() +
+				a.x() * b.y() * c.z() - a.z() * b.y() * c.x());
+	}
+	static btScalar projectorigin(const btVector3& a,
+								  const btVector3& b,
+								  btScalar* w, U& m)
+	{
+		const btVector3 d = b - a;
+		const btScalar l = d.length2();
+		if (l > GJK_SIMPLEX2_EPS)
+		{
+			const btScalar t(l > 0 ? -btDot(a, d) / l : 0);
+			if (t >= 1)
+			{
+				w[0] = 0;
+				w[1] = 1;
+				m = 2;
+				return (b.length2());
+			}
+			else if (t <= 0)
+			{
+				w[0] = 1;
+				w[1] = 0;
+				m = 1;
+				return (a.length2());
+			}
+			else
+			{
+				w[0] = 1 - (w[1] = t);
+				m = 3;
+				return ((a + d * t).length2());
+			}
+		}
+		return (-1);
+	}
+	static btScalar projectorigin(const btVector3& a,
+								  const btVector3& b,
+								  const btVector3& c,
+								  btScalar* w, U& m)
+	{
+		static const U imd3[] = {1, 2, 0};
+		const btVector3* vt[] = {&a, &b, &c};
+		const btVector3 dl[] = {a - b, b - c, c - a};
+		const btVector3 n = btCross(dl[0], dl[1]);
+		const btScalar l = n.length2();
+		if (l > GJK_SIMPLEX3_EPS)
+		{
+			btScalar mindist = -1;
+			btScalar subw[2] = {0.f, 0.f};
+			U subm(0);
+			for (U i = 0; i < 3; ++i)
+			{
+				if (btDot(*vt[i], btCross(dl[i], n)) > 0)
+				{
+					const U j = imd3[i];
+					const btScalar subd(projectorigin(*vt[i], *vt[j], subw, subm));
+					if ((mindist < 0) || (subd < mindist))
+					{
+						mindist = subd;
+						m = static_cast<U>(((subm & 1) ? 1 << i : 0) + ((subm & 2) ? 1 << j : 0));
+						w[i] = subw[0];
+						w[j] = subw[1];
+						w[imd3[j]] = 0;
+					}
+				}
+			}
+			if (mindist < 0)
+			{
+				const btScalar d = btDot(a, n);
+				const btScalar s = btSqrt(l);
+				const btVector3 p = n * (d / l);
+				mindist = p.length2();
+				m = 7;
+				w[0] = (btCross(dl[1], b - p)).length() / s;
+				w[1] = (btCross(dl[2], c - p)).length() / s;
+				w[2] = 1 - (w[0] + w[1]);
+			}
+			return (mindist);
+		}
+		return (-1);
+	}
+	static btScalar projectorigin(const btVector3& a,
+								  const btVector3& b,
+								  const btVector3& c,
+								  const btVector3& d,
+								  btScalar* w, U& m)
+	{
+		static const U imd3[] = {1, 2, 0};
+		const btVector3* vt[] = {&a, &b, &c, &d};
+		const btVector3 dl[] = {a - d, b - d, c - d};
+		const btScalar vl = det(dl[0], dl[1], dl[2]);
+		const bool ng = (vl * btDot(a, btCross(b - c, a - b))) <= 0;
+		if (ng && (btFabs(vl) > GJK_SIMPLEX4_EPS))
+		{
+			btScalar mindist = -1;
+			btScalar subw[3] = {0.f, 0.f, 0.f};
+			U subm(0);
+			for (U i = 0; i < 3; ++i)
+			{
+				const U j = imd3[i];
+				const btScalar s = vl * btDot(d, btCross(dl[i], dl[j]));
+				if (s > 0)
+				{
+					const btScalar subd = projectorigin(*vt[i], *vt[j], d, subw, subm);
+					if ((mindist < 0) || (subd < mindist))
+					{
+						mindist = subd;
+						m = static_cast<U>((subm & 1 ? 1 << i : 0) +
+										   (subm & 2 ? 1 << j : 0) +
+										   (subm & 4 ? 8 : 0));
+						w[i] = subw[0];
+						w[j] = subw[1];
+						w[imd3[j]] = 0;
+						w[3] = subw[2];
+					}
+				}
+			}
+			if (mindist < 0)
+			{
+				mindist = 0;
+				m = 15;
+				w[0] = det(c, b, d) / vl;
+				w[1] = det(a, c, d) / vl;
+				w[2] = det(b, a, d) / vl;
+				w[3] = 1 - (w[0] + w[1] + w[2]);
+			}
+			return (mindist);
+		}
+		return (-1);
+	}
+};
+
+// EPA
+struct EPA
+{
+	/* Types		*/
+	typedef GJK::sSV sSV;
+	struct sFace
+	{
+		btVector3 n;
+		btScalar d;
+		sSV* c[3];
+		sFace* f[3];
+		sFace* l[2];
+		U1 e[3];
+		U1 pass;
+	};
+	struct sList
+	{
+		sFace* root;
+		U count;
+		sList() : root(0), count(0) {}
+	};
+	struct sHorizon
+	{
+		sFace* cf;
+		sFace* ff;
+		U nf;
+		sHorizon() : cf(0), ff(0), nf(0) {}
+	};
+	struct eStatus
+	{
+		enum _
+		{
+			Valid,
+			Touching,
+			Degenerated,
+			NonConvex,
+			InvalidHull,
+			OutOfFaces,
+			OutOfVertices,
+			AccuraryReached,
+			FallBack,
+			Failed
+		};
+	};
+	/* Fields		*/
+	eStatus::_ m_status;
+	GJK::sSimplex m_result;
+	btVector3 m_normal;
+	btScalar m_depth;
+	sSV m_sv_store[EPA_MAX_VERTICES];
+	sFace m_fc_store[EPA_MAX_FACES];
+	U m_nextsv;
+	sList m_hull;
+	sList m_stock;
+	/* Methods		*/
+	EPA()
+	{
+		Initialize();
+	}
+
+	static inline void bind(sFace* fa, U ea, sFace* fb, U eb)
+	{
+		fa->e[ea] = (U1)eb;
+		fa->f[ea] = fb;
+		fb->e[eb] = (U1)ea;
+		fb->f[eb] = fa;
+	}
+	static inline void append(sList& list, sFace* face)
+	{
+		face->l[0] = 0;
+		face->l[1] = list.root;
+		if (list.root) list.root->l[0] = face;
+		list.root = face;
+		++list.count;
+	}
+	static inline void remove(sList& list, sFace* face)
+	{
+		if (face->l[1]) face->l[1]->l[0] = face->l[0];
+		if (face->l[0]) face->l[0]->l[1] = face->l[1];
+		if (face == list.root) list.root = face->l[1];
+		--list.count;
+	}
+
+	void Initialize()
+	{
+		m_status = eStatus::Failed;
+		m_normal = btVector3(0, 0, 0);
+		m_depth = 0;
+		m_nextsv = 0;
+		for (U i = 0; i < EPA_MAX_FACES; ++i)
+		{
+			append(m_stock, &m_fc_store[EPA_MAX_FACES - i - 1]);
+		}
+	}
+	eStatus::_ Evaluate(GJK& gjk, const btVector3& guess)
+	{
+		GJK::sSimplex& simplex = *gjk.m_simplex;
+		if ((simplex.rank > 1) && gjk.EncloseOrigin())
+		{
+			/* Clean up				*/
+			while (m_hull.root)
+			{
+				sFace* f = m_hull.root;
+				remove(m_hull, f);
+				append(m_stock, f);
+			}
+			m_status = eStatus::Valid;
+			m_nextsv = 0;
+			/* Orient simplex		*/
+			if (gjk.det(simplex.c[0]->w - simplex.c[3]->w,
+						simplex.c[1]->w - simplex.c[3]->w,
+						simplex.c[2]->w - simplex.c[3]->w) < 0)
+			{
+				btSwap(simplex.c[0], simplex.c[1]);
+				btSwap(simplex.p[0], simplex.p[1]);
+			}
+			/* Build initial hull	*/
+			sFace* tetra[] = {newface(simplex.c[0], simplex.c[1], simplex.c[2], true),
+							  newface(simplex.c[1], simplex.c[0], simplex.c[3], true),
+							  newface(simplex.c[2], simplex.c[1], simplex.c[3], true),
+							  newface(simplex.c[0], simplex.c[2], simplex.c[3], true)};
+			if (m_hull.count == 4)
+			{
+				sFace* best = findbest();
+				sFace outer = *best;
+				U pass = 0;
+				U iterations = 0;
+				bind(tetra[0], 0, tetra[1], 0);
+				bind(tetra[0], 1, tetra[2], 0);
+				bind(tetra[0], 2, tetra[3], 0);
+				bind(tetra[1], 1, tetra[3], 2);
+				bind(tetra[1], 2, tetra[2], 1);
+				bind(tetra[2], 2, tetra[3], 1);
+				m_status = eStatus::Valid;
+				for (; iterations < EPA_MAX_ITERATIONS; ++iterations)
+				{
+					if (m_nextsv < EPA_MAX_VERTICES)
+					{
+						sHorizon horizon;
+						sSV* w = &m_sv_store[m_nextsv++];
+						bool valid = true;
+						best->pass = (U1)(++pass);
+						gjk.getsupport(best->n, *w);
+						const btScalar wdist = btDot(best->n, w->w) - best->d;
+						if (wdist > EPA_ACCURACY)
+						{
+							for (U j = 0; (j < 3) && valid; ++j)
+							{
+								valid &= expand(pass, w,
+												best->f[j], best->e[j],
+												horizon);
+							}
+							if (valid && (horizon.nf >= 3))
+							{
+								bind(horizon.cf, 1, horizon.ff, 2);
+								remove(m_hull, best);
+								append(m_stock, best);
+								best = findbest();
+								outer = *best;
+							}
+							else
+							{
+								m_status = eStatus::InvalidHull;
+								break;
+							}
+						}
+						else
+						{
+							m_status = eStatus::AccuraryReached;
+							break;
+						}
+					}
+					else
+					{
+						m_status = eStatus::OutOfVertices;
+						break;
+					}
+				}
+				const btVector3 projection = outer.n * outer.d;
+				m_normal = outer.n;
+				m_depth = outer.d;
+				m_result.rank = 3;
+				m_result.c[0] = outer.c[0];
+				m_result.c[1] = outer.c[1];
+				m_result.c[2] = outer.c[2];
+				m_result.p[0] = btCross(outer.c[1]->w - projection,
+										outer.c[2]->w - projection)
+									.length();
+				m_result.p[1] = btCross(outer.c[2]->w - projection,
+										outer.c[0]->w - projection)
+									.length();
+				m_result.p[2] = btCross(outer.c[0]->w - projection,
+										outer.c[1]->w - projection)
+									.length();
+				const btScalar sum = m_result.p[0] + m_result.p[1] + m_result.p[2];
+				m_result.p[0] /= sum;
+				m_result.p[1] /= sum;
+				m_result.p[2] /= sum;
+				return (m_status);
+			}
+		}
+		/* Fallback		*/
+		m_status = eStatus::FallBack;
+		m_normal = -guess;
+		const btScalar nl = m_normal.length();
+		if (nl > 0)
+			m_normal = m_normal / nl;
+		else
+			m_normal = btVector3(1, 0, 0);
+		m_depth = 0;
+		m_result.rank = 1;
+		m_result.c[0] = simplex.c[0];
+		m_result.p[0] = 1;
+		return (m_status);
+	}
+	bool getedgedist(sFace* face, sSV* a, sSV* b, btScalar& dist)
+	{
+		const btVector3 ba = b->w - a->w;
+		const btVector3 n_ab = btCross(ba, face->n);   // Outward facing edge normal direction, on triangle plane
+		const btScalar a_dot_nab = btDot(a->w, n_ab);  // Only care about the sign to determine inside/outside, so not normalization required
+
+		if (a_dot_nab < 0)
+		{
+			// Outside of edge a->b
+
+			const btScalar ba_l2 = ba.length2();
+			const btScalar a_dot_ba = btDot(a->w, ba);
+			const btScalar b_dot_ba = btDot(b->w, ba);
+
+			if (a_dot_ba > 0)
+			{
+				// Pick distance vertex a
+				dist = a->w.length();
+			}
+			else if (b_dot_ba < 0)
+			{
+				// Pick distance vertex b
+				dist = b->w.length();
+			}
+			else
+			{
+				// Pick distance to edge a->b
+				const btScalar a_dot_b = btDot(a->w, b->w);
+				dist = btSqrt(btMax((a->w.length2() * b->w.length2() - a_dot_b * a_dot_b) / ba_l2, (btScalar)0));
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+	sFace* newface(sSV* a, sSV* b, sSV* c, bool forced)
+	{
+		if (m_stock.root)
+		{
+			sFace* face = m_stock.root;
+			remove(m_stock, face);
+			append(m_hull, face);
+			face->pass = 0;
+			face->c[0] = a;
+			face->c[1] = b;
+			face->c[2] = c;
+			face->n = btCross(b->w - a->w, c->w - a->w);
+			const btScalar l = face->n.length();
+			const bool v = l > EPA_ACCURACY;
+
+			if (v)
+			{
+				if (!(getedgedist(face, a, b, face->d) ||
+					  getedgedist(face, b, c, face->d) ||
+					  getedgedist(face, c, a, face->d)))
+				{
+					// Origin projects to the interior of the triangle
+					// Use distance to triangle plane
+					face->d = btDot(a->w, face->n) / l;
+				}
+
+				face->n /= l;
+				if (forced || (face->d >= -EPA_PLANE_EPS))
+				{
+					return face;
+				}
+				else
+					m_status = eStatus::NonConvex;
+			}
+			else
+				m_status = eStatus::Degenerated;
+
+			remove(m_hull, face);
+			append(m_stock, face);
+			return 0;
+		}
+		m_status = m_stock.root ? eStatus::OutOfVertices : eStatus::OutOfFaces;
+		return 0;
+	}
+	sFace* findbest()
+	{
+		sFace* minf = m_hull.root;
+		btScalar mind = minf->d * minf->d;
+		for (sFace* f = minf->l[1]; f; f = f->l[1])
+		{
+			const btScalar sqd = f->d * f->d;
+			if (sqd < mind)
+			{
+				minf = f;
+				mind = sqd;
+			}
+		}
+		return (minf);
+	}
+	bool expand(U pass, sSV* w, sFace* f, U e, sHorizon& horizon)
+	{
+		static const U i1m3[] = {1, 2, 0};
+		static const U i2m3[] = {2, 0, 1};
+		if (f->pass != pass)
+		{
+			const U e1 = i1m3[e];
+			if ((btDot(f->n, w->w) - f->d) < -EPA_PLANE_EPS)
+			{
+				sFace* nf = newface(f->c[e1], f->c[e], w, false);
+				if (nf)
+				{
+					bind(nf, 0, f, e);
+					if (horizon.cf)
+						bind(horizon.cf, 1, nf, 2);
+					else
+						horizon.ff = nf;
+					horizon.cf = nf;
+					++horizon.nf;
+					return (true);
+				}
+			}
+			else
+			{
+				const U e2 = i2m3[e];
+				f->pass = (U1)pass;
+				if (expand(pass, w, f->f[e1], f->e[e1], horizon) &&
+					expand(pass, w, f->f[e2], f->e[e2], horizon))
+				{
+					remove(m_hull, f);
+					append(m_stock, f);
+					return (true);
+				}
+			}
+		}
+		return (false);
+	}
+};
+
+//
+static void Initialize(const btConvexShape* shape0, const btTransform& wtrs0,
+					   const btConvexShape* shape1, const btTransform& wtrs1,
+					   btGjkEpaSolver2::sResults& results,
+					   tShape& shape,
+					   bool withmargins)
+{
+	/* Results		*/
+	results.witnesses[0] =
+		results.witnesses[1] = btVector3(0, 0, 0);
+	results.status = btGjkEpaSolver2::sResults::Separated;
+	/* Shape		*/
+	shape.m_shapes[0] = shape0;
+	shape.m_shapes[1] = shape1;
+	shape.m_toshape1 = wtrs1.getBasis().transposeTimes(wtrs0.getBasis());
+	shape.m_toshape0 = wtrs0.inverseTimes(wtrs1);
+	shape.EnableMargin(withmargins);
+}
+
+}  // namespace gjkepa2_impl
+
+//
+// Api
+//
+
+using namespace gjkepa2_impl;
+
+//
+int btGjkEpaSolver2::StackSizeRequirement()
+{
+	return (sizeof(GJK) + sizeof(EPA));
+}
+
+//
+bool btGjkEpaSolver2::Distance(const btConvexShape* shape0,
+							   const btTransform& wtrs0,
+							   const btConvexShape* shape1,
+							   const btTransform& wtrs1,
+							   const btVector3& guess,
+							   sResults& results)
+{
+	tShape shape;
+	Initialize(shape0, wtrs0, shape1, wtrs1, results, shape, false);
+	GJK gjk;
+	GJK::eStatus::_ gjk_status = gjk.Evaluate(shape, guess);
+	if (gjk_status == GJK::eStatus::Valid)
+	{
+		btVector3 w0 = btVector3(0, 0, 0);
+		btVector3 w1 = btVector3(0, 0, 0);
+		for (U i = 0; i < gjk.m_simplex->rank; ++i)
+		{
+			const btScalar p = gjk.m_simplex->p[i];
+			w0 += shape.Support(gjk.m_simplex->c[i]->d, 0) * p;
+			w1 += shape.Support(-gjk.m_simplex->c[i]->d, 1) * p;
+		}
+		results.witnesses[0] = wtrs0 * w0;
+		results.witnesses[1] = wtrs0 * w1;
+		results.normal = w0 - w1;
+		results.distance = results.normal.length();
+		results.normal /= results.distance > GJK_MIN_DISTANCE ? results.distance : 1;
+		return (true);
+	}
+	else
+	{
+		results.status = gjk_status == GJK::eStatus::Inside ? sResults::Penetrating : sResults::GJK_Failed;
+		return (false);
+	}
+}
+
+//
+bool btGjkEpaSolver2::Penetration(const btConvexShape* shape0,
+								  const btTransform& wtrs0,
+								  const btConvexShape* shape1,
+								  const btTransform& wtrs1,
+								  const btVector3& guess,
+								  sResults& results,
+								  bool usemargins)
+{
+	tShape shape;
+	Initialize(shape0, wtrs0, shape1, wtrs1, results, shape, usemargins);
+	GJK gjk;
+	GJK::eStatus::_ gjk_status = gjk.Evaluate(shape, -guess);
+	switch (gjk_status)
+	{
+		case GJK::eStatus::Inside:
+		{
+			EPA epa;
+			EPA::eStatus::_ epa_status = epa.Evaluate(gjk, -guess);
+			if (epa_status != EPA::eStatus::Failed)
+			{
+				btVector3 w0 = btVector3(0, 0, 0);
+				for (U i = 0; i < epa.m_result.rank; ++i)
+				{
+					w0 += shape.Support(epa.m_result.c[i]->d, 0) * epa.m_result.p[i];
+				}
+				results.status = sResults::Penetrating;
+				results.witnesses[0] = wtrs0 * w0;
+				results.witnesses[1] = wtrs0 * (w0 - epa.m_normal * epa.m_depth);
+				results.normal = -epa.m_normal;
+				results.distance = -epa.m_depth;
+				return (true);
+			}
+			else
+				results.status = sResults::EPA_Failed;
+		}
+		break;
+		case GJK::eStatus::Failed:
+			results.status = sResults::GJK_Failed;
+			break;
+		default:
+		{
+		}
+	}
+	return (false);
+}
+
+#ifndef __SPU__
+//
+btScalar btGjkEpaSolver2::SignedDistance(const btVector3& position,
+										 btScalar margin,
+										 const btConvexShape* shape0,
+										 const btTransform& wtrs0,
+										 sResults& results)
+{
+	tShape shape;
+	btSphereShape shape1(margin);
+	btTransform wtrs1(btQuaternion(0, 0, 0, 1), position);
+	Initialize(shape0, wtrs0, &shape1, wtrs1, results, shape, false);
+	GJK gjk;
+	GJK::eStatus::_ gjk_status = gjk.Evaluate(shape, btVector3(1, 1, 1));
+	if (gjk_status == GJK::eStatus::Valid)
+	{
+		btVector3 w0 = btVector3(0, 0, 0);
+		btVector3 w1 = btVector3(0, 0, 0);
+		for (U i = 0; i < gjk.m_simplex->rank; ++i)
+		{
+			const btScalar p = gjk.m_simplex->p[i];
+			w0 += shape.Support(gjk.m_simplex->c[i]->d, 0) * p;
+			w1 += shape.Support(-gjk.m_simplex->c[i]->d, 1) * p;
+		}
+		results.witnesses[0] = wtrs0 * w0;
+		results.witnesses[1] = wtrs0 * w1;
+		const btVector3 delta = results.witnesses[1] -
+								results.witnesses[0];
+		const btScalar margin = shape0->getMarginNonVirtual() +
+								shape1.getMarginNonVirtual();
+		const btScalar length = delta.length();
+		results.normal = delta / length;
+		results.witnesses[0] += results.normal * margin;
+		results.distance = length - margin;
+		return results.distance;
+	}
+	else
+	{
+		if (gjk_status == GJK::eStatus::Inside)
+		{
+			if (Penetration(shape0, wtrs0, &shape1, wtrs1, gjk.m_ray, results))
+			{
+				const btVector3 delta = results.witnesses[0] -
+										results.witnesses[1];
+				const btScalar length = delta.length();
+				if (length >= SIMD_EPSILON)
+					results.normal = delta / length;
+				return (-length);
+			}
+		}
+	}
+	return (SIMD_INFINITY);
+}
+
+//
+bool btGjkEpaSolver2::SignedDistance(const btConvexShape* shape0,
+									 const btTransform& wtrs0,
+									 const btConvexShape* shape1,
+									 const btTransform& wtrs1,
+									 const btVector3& guess,
+									 sResults& results)
+{
+	if (!Distance(shape0, wtrs0, shape1, wtrs1, guess, results))
+		return (Penetration(shape0, wtrs0, shape1, wtrs1, guess, results, false));
+	else
+		return (true);
+}
+#endif  //__SPU__
+
+/* Symbols cleanup		*/
+
+#undef GJK_MAX_ITERATIONS
+#undef GJK_ACCURACY
+#undef GJK_MIN_DISTANCE
+#undef GJK_DUPLICATED_EPS
+#undef GJK_SIMPLEX2_EPS
+#undef GJK_SIMPLEX3_EPS
+#undef GJK_SIMPLEX4_EPS
+
+#undef EPA_MAX_VERTICES
+#undef EPA_MAX_FACES
+#undef EPA_MAX_ITERATIONS
+#undef EPA_ACCURACY
+#undef EPA_FALLBACK
+#undef EPA_PLANE_EPS
+#undef EPA_INSIDE_EPS
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
new file mode 100644
index 0000000..e2cf633
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
@@ -0,0 +1,73 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+GJK-EPA collision solver by Nathanael Presson, 2008
+*/
+#ifndef BT_GJK_EPA2_H
+#define BT_GJK_EPA2_H
+
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+
+///btGjkEpaSolver contributed under zlib by Nathanael Presson
+struct btGjkEpaSolver2
+{
+	struct sResults
+	{
+		enum eStatus
+		{
+			Separated,   /* Shapes doesnt penetrate												*/
+			Penetrating, /* Shapes are penetrating												*/
+			GJK_Failed,  /* GJK phase fail, no big issue, shapes are probably just 'touching'	*/
+			EPA_Failed   /* EPA phase fail, bigger problem, need to save parameters, and debug	*/
+		} status;
+		btVector3 witnesses[2];
+		btVector3 normal;
+		btScalar distance;
+	};
+
+	static int StackSizeRequirement();
+
+	static bool Distance(const btConvexShape* shape0, const btTransform& wtrs0,
+						 const btConvexShape* shape1, const btTransform& wtrs1,
+						 const btVector3& guess,
+						 sResults& results);
+
+	static bool Penetration(const btConvexShape* shape0, const btTransform& wtrs0,
+							const btConvexShape* shape1, const btTransform& wtrs1,
+							const btVector3& guess,
+							sResults& results,
+							bool usemargins = true);
+#ifndef __SPU__
+	static btScalar SignedDistance(const btVector3& position,
+								   btScalar margin,
+								   const btConvexShape* shape,
+								   const btTransform& wtrs,
+								   sResults& results);
+
+	static bool SignedDistance(const btConvexShape* shape0, const btTransform& wtrs0,
+							   const btConvexShape* shape1, const btTransform& wtrs1,
+							   const btVector3& guess,
+							   sResults& results);
+#endif  //__SPU__
+};
+
+#endif  //BT_GJK_EPA2_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h
new file mode 100644
index 0000000..fd67c37
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h
@@ -0,0 +1,1063 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2014 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+Initial GJK-EPA collision solver by Nathanael Presson, 2008
+Improvements and refactoring by Erwin Coumans, 2008-2014
+*/
+#ifndef BT_GJK_EPA3_H
+#define BT_GJK_EPA3_H
+
+#include "LinearMath/btTransform.h"
+#include "btGjkCollisionDescription.h"
+
+struct btGjkEpaSolver3
+{
+	struct sResults
+	{
+		enum eStatus
+		{
+			Separated,   /* Shapes doesnt penetrate												*/
+			Penetrating, /* Shapes are penetrating												*/
+			GJK_Failed,  /* GJK phase fail, no big issue, shapes are probably just 'touching'	*/
+			EPA_Failed   /* EPA phase fail, bigger problem, need to save parameters, and debug	*/
+		} status;
+		btVector3 witnesses[2];
+		btVector3 normal;
+		btScalar distance;
+	};
+};
+
+#if defined(DEBUG) || defined(_DEBUG)
+#include <stdio.h>  //for debug printf
+#ifdef __SPU__
+#include <spu_printf.h>
+#define printf spu_printf
+#endif  //__SPU__
+#endif
+
+// Config
+
+/* GJK	*/
+#define GJK_MAX_ITERATIONS 128
+#define GJK_ACCURARY ((btScalar)0.0001)
+#define GJK_MIN_DISTANCE ((btScalar)0.0001)
+#define GJK_DUPLICATED_EPS ((btScalar)0.0001)
+#define GJK_SIMPLEX2_EPS ((btScalar)0.0)
+#define GJK_SIMPLEX3_EPS ((btScalar)0.0)
+#define GJK_SIMPLEX4_EPS ((btScalar)0.0)
+
+/* EPA	*/
+#define EPA_MAX_VERTICES 64
+#define EPA_MAX_FACES (EPA_MAX_VERTICES * 2)
+#define EPA_MAX_ITERATIONS 255
+#define EPA_ACCURACY ((btScalar)0.0001)
+#define EPA_FALLBACK (10 * EPA_ACCURACY)
+#define EPA_PLANE_EPS ((btScalar)0.00001)
+#define EPA_INSIDE_EPS ((btScalar)0.01)
+
+// Shorthands
+typedef unsigned int U;
+typedef unsigned char U1;
+
+// MinkowskiDiff
+template <typename btConvexTemplate>
+struct MinkowskiDiff
+{
+	const btConvexTemplate* m_convexAPtr;
+	const btConvexTemplate* m_convexBPtr;
+
+	btMatrix3x3 m_toshape1;
+	btTransform m_toshape0;
+
+	bool m_enableMargin;
+
+	MinkowskiDiff(const btConvexTemplate& a, const btConvexTemplate& b)
+		: m_convexAPtr(&a),
+		  m_convexBPtr(&b)
+	{
+	}
+
+	void EnableMargin(bool enable)
+	{
+		m_enableMargin = enable;
+	}
+	inline btVector3 Support0(const btVector3& d) const
+	{
+		return m_convexAPtr->getLocalSupportWithMargin(d);
+	}
+	inline btVector3 Support1(const btVector3& d) const
+	{
+		return m_toshape0 * m_convexBPtr->getLocalSupportWithMargin(m_toshape1 * d);
+	}
+
+	inline btVector3 Support(const btVector3& d) const
+	{
+		return (Support0(d) - Support1(-d));
+	}
+	btVector3 Support(const btVector3& d, U index) const
+	{
+		if (index)
+			return (Support1(d));
+		else
+			return (Support0(d));
+	}
+};
+
+enum eGjkStatus
+{
+	eGjkValid,
+	eGjkInside,
+	eGjkFailed
+};
+
+// GJK
+template <typename btConvexTemplate>
+struct GJK
+{
+	/* Types		*/
+	struct sSV
+	{
+		btVector3 d, w;
+	};
+	struct sSimplex
+	{
+		sSV* c[4];
+		btScalar p[4];
+		U rank;
+	};
+
+	/* Fields		*/
+
+	MinkowskiDiff<btConvexTemplate> m_shape;
+	btVector3 m_ray;
+	btScalar m_distance;
+	sSimplex m_simplices[2];
+	sSV m_store[4];
+	sSV* m_free[4];
+	U m_nfree;
+	U m_current;
+	sSimplex* m_simplex;
+	eGjkStatus m_status;
+	/* Methods		*/
+
+	GJK(const btConvexTemplate& a, const btConvexTemplate& b)
+		: m_shape(a, b)
+	{
+		Initialize();
+	}
+	void Initialize()
+	{
+		m_ray = btVector3(0, 0, 0);
+		m_nfree = 0;
+		m_status = eGjkFailed;
+		m_current = 0;
+		m_distance = 0;
+	}
+	eGjkStatus Evaluate(const MinkowskiDiff<btConvexTemplate>& shapearg, const btVector3& guess)
+	{
+		U iterations = 0;
+		btScalar sqdist = 0;
+		btScalar alpha = 0;
+		btVector3 lastw[4];
+		U clastw = 0;
+		/* Initialize solver		*/
+		m_free[0] = &m_store[0];
+		m_free[1] = &m_store[1];
+		m_free[2] = &m_store[2];
+		m_free[3] = &m_store[3];
+		m_nfree = 4;
+		m_current = 0;
+		m_status = eGjkValid;
+		m_shape = shapearg;
+		m_distance = 0;
+		/* Initialize simplex		*/
+		m_simplices[0].rank = 0;
+		m_ray = guess;
+		const btScalar sqrl = m_ray.length2();
+		appendvertice(m_simplices[0], sqrl > 0 ? -m_ray : btVector3(1, 0, 0));
+		m_simplices[0].p[0] = 1;
+		m_ray = m_simplices[0].c[0]->w;
+		sqdist = sqrl;
+		lastw[0] =
+			lastw[1] =
+				lastw[2] =
+					lastw[3] = m_ray;
+		/* Loop						*/
+		do
+		{
+			const U next = 1 - m_current;
+			sSimplex& cs = m_simplices[m_current];
+			sSimplex& ns = m_simplices[next];
+			/* Check zero							*/
+			const btScalar rl = m_ray.length();
+			if (rl < GJK_MIN_DISTANCE)
+			{ /* Touching or inside				*/
+				m_status = eGjkInside;
+				break;
+			}
+			/* Append new vertice in -'v' direction	*/
+			appendvertice(cs, -m_ray);
+			const btVector3& w = cs.c[cs.rank - 1]->w;
+			bool found = false;
+			for (U i = 0; i < 4; ++i)
+			{
+				if ((w - lastw[i]).length2() < GJK_DUPLICATED_EPS)
+				{
+					found = true;
+					break;
+				}
+			}
+			if (found)
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			else
+			{ /* Update lastw					*/
+				lastw[clastw = (clastw + 1) & 3] = w;
+			}
+			/* Check for termination				*/
+			const btScalar omega = btDot(m_ray, w) / rl;
+			alpha = btMax(omega, alpha);
+			if (((rl - alpha) - (GJK_ACCURARY * rl)) <= 0)
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			/* Reduce simplex						*/
+			btScalar weights[4];
+			U mask = 0;
+			switch (cs.rank)
+			{
+				case 2:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   weights, mask);
+					break;
+				case 3:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   cs.c[2]->w,
+										   weights, mask);
+					break;
+				case 4:
+					sqdist = projectorigin(cs.c[0]->w,
+										   cs.c[1]->w,
+										   cs.c[2]->w,
+										   cs.c[3]->w,
+										   weights, mask);
+					break;
+			}
+			if (sqdist >= 0)
+			{ /* Valid	*/
+				ns.rank = 0;
+				m_ray = btVector3(0, 0, 0);
+				m_current = next;
+				for (U i = 0, ni = cs.rank; i < ni; ++i)
+				{
+					if (mask & (1 << i))
+					{
+						ns.c[ns.rank] = cs.c[i];
+						ns.p[ns.rank++] = weights[i];
+						m_ray += cs.c[i]->w * weights[i];
+					}
+					else
+					{
+						m_free[m_nfree++] = cs.c[i];
+					}
+				}
+				if (mask == 15) m_status = eGjkInside;
+			}
+			else
+			{ /* Return old simplex				*/
+				removevertice(m_simplices[m_current]);
+				break;
+			}
+			m_status = ((++iterations) < GJK_MAX_ITERATIONS) ? m_status : eGjkFailed;
+		} while (m_status == eGjkValid);
+		m_simplex = &m_simplices[m_current];
+		switch (m_status)
+		{
+			case eGjkValid:
+				m_distance = m_ray.length();
+				break;
+			case eGjkInside:
+				m_distance = 0;
+				break;
+			default:
+			{
+			}
+		}
+		return (m_status);
+	}
+	bool EncloseOrigin()
+	{
+		switch (m_simplex->rank)
+		{
+			case 1:
+			{
+				for (U i = 0; i < 3; ++i)
+				{
+					btVector3 axis = btVector3(0, 0, 0);
+					axis[i] = 1;
+					appendvertice(*m_simplex, axis);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+					appendvertice(*m_simplex, -axis);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+				}
+			}
+			break;
+			case 2:
+			{
+				const btVector3 d = m_simplex->c[1]->w - m_simplex->c[0]->w;
+				for (U i = 0; i < 3; ++i)
+				{
+					btVector3 axis = btVector3(0, 0, 0);
+					axis[i] = 1;
+					const btVector3 p = btCross(d, axis);
+					if (p.length2() > 0)
+					{
+						appendvertice(*m_simplex, p);
+						if (EncloseOrigin()) return (true);
+						removevertice(*m_simplex);
+						appendvertice(*m_simplex, -p);
+						if (EncloseOrigin()) return (true);
+						removevertice(*m_simplex);
+					}
+				}
+			}
+			break;
+			case 3:
+			{
+				const btVector3 n = btCross(m_simplex->c[1]->w - m_simplex->c[0]->w,
+											m_simplex->c[2]->w - m_simplex->c[0]->w);
+				if (n.length2() > 0)
+				{
+					appendvertice(*m_simplex, n);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+					appendvertice(*m_simplex, -n);
+					if (EncloseOrigin()) return (true);
+					removevertice(*m_simplex);
+				}
+			}
+			break;
+			case 4:
+			{
+				if (btFabs(det(m_simplex->c[0]->w - m_simplex->c[3]->w,
+							   m_simplex->c[1]->w - m_simplex->c[3]->w,
+							   m_simplex->c[2]->w - m_simplex->c[3]->w)) > 0)
+					return (true);
+			}
+			break;
+		}
+		return (false);
+	}
+	/* Internals	*/
+	void getsupport(const btVector3& d, sSV& sv) const
+	{
+		sv.d = d / d.length();
+		sv.w = m_shape.Support(sv.d);
+	}
+	void removevertice(sSimplex& simplex)
+	{
+		m_free[m_nfree++] = simplex.c[--simplex.rank];
+	}
+	void appendvertice(sSimplex& simplex, const btVector3& v)
+	{
+		simplex.p[simplex.rank] = 0;
+		simplex.c[simplex.rank] = m_free[--m_nfree];
+		getsupport(v, *simplex.c[simplex.rank++]);
+	}
+	static btScalar det(const btVector3& a, const btVector3& b, const btVector3& c)
+	{
+		return (a.y() * b.z() * c.x() + a.z() * b.x() * c.y() -
+				a.x() * b.z() * c.y() - a.y() * b.x() * c.z() +
+				a.x() * b.y() * c.z() - a.z() * b.y() * c.x());
+	}
+	static btScalar projectorigin(const btVector3& a,
+								  const btVector3& b,
+								  btScalar* w, U& m)
+	{
+		const btVector3 d = b - a;
+		const btScalar l = d.length2();
+		if (l > GJK_SIMPLEX2_EPS)
+		{
+			const btScalar t(l > 0 ? -btDot(a, d) / l : 0);
+			if (t >= 1)
+			{
+				w[0] = 0;
+				w[1] = 1;
+				m = 2;
+				return (b.length2());
+			}
+			else if (t <= 0)
+			{
+				w[0] = 1;
+				w[1] = 0;
+				m = 1;
+				return (a.length2());
+			}
+			else
+			{
+				w[0] = 1 - (w[1] = t);
+				m = 3;
+				return ((a + d * t).length2());
+			}
+		}
+		return (-1);
+	}
+	static btScalar projectorigin(const btVector3& a,
+								  const btVector3& b,
+								  const btVector3& c,
+								  btScalar* w, U& m)
+	{
+		static const U imd3[] = {1, 2, 0};
+		const btVector3* vt[] = {&a, &b, &c};
+		const btVector3 dl[] = {a - b, b - c, c - a};
+		const btVector3 n = btCross(dl[0], dl[1]);
+		const btScalar l = n.length2();
+		if (l > GJK_SIMPLEX3_EPS)
+		{
+			btScalar mindist = -1;
+			btScalar subw[2] = {0.f, 0.f};
+			U subm(0);
+			for (U i = 0; i < 3; ++i)
+			{
+				if (btDot(*vt[i], btCross(dl[i], n)) > 0)
+				{
+					const U j = imd3[i];
+					const btScalar subd(projectorigin(*vt[i], *vt[j], subw, subm));
+					if ((mindist < 0) || (subd < mindist))
+					{
+						mindist = subd;
+						m = static_cast<U>(((subm & 1) ? 1 << i : 0) + ((subm & 2) ? 1 << j : 0));
+						w[i] = subw[0];
+						w[j] = subw[1];
+						w[imd3[j]] = 0;
+					}
+				}
+			}
+			if (mindist < 0)
+			{
+				const btScalar d = btDot(a, n);
+				const btScalar s = btSqrt(l);
+				const btVector3 p = n * (d / l);
+				mindist = p.length2();
+				m = 7;
+				w[0] = (btCross(dl[1], b - p)).length() / s;
+				w[1] = (btCross(dl[2], c - p)).length() / s;
+				w[2] = 1 - (w[0] + w[1]);
+			}
+			return (mindist);
+		}
+		return (-1);
+	}
+	static btScalar projectorigin(const btVector3& a,
+								  const btVector3& b,
+								  const btVector3& c,
+								  const btVector3& d,
+								  btScalar* w, U& m)
+	{
+		static const U imd3[] = {1, 2, 0};
+		const btVector3* vt[] = {&a, &b, &c, &d};
+		const btVector3 dl[] = {a - d, b - d, c - d};
+		const btScalar vl = det(dl[0], dl[1], dl[2]);
+		const bool ng = (vl * btDot(a, btCross(b - c, a - b))) <= 0;
+		if (ng && (btFabs(vl) > GJK_SIMPLEX4_EPS))
+		{
+			btScalar mindist = -1;
+			btScalar subw[3] = {0.f, 0.f, 0.f};
+			U subm(0);
+			for (U i = 0; i < 3; ++i)
+			{
+				const U j = imd3[i];
+				const btScalar s = vl * btDot(d, btCross(dl[i], dl[j]));
+				if (s > 0)
+				{
+					const btScalar subd = projectorigin(*vt[i], *vt[j], d, subw, subm);
+					if ((mindist < 0) || (subd < mindist))
+					{
+						mindist = subd;
+						m = static_cast<U>((subm & 1 ? 1 << i : 0) +
+										   (subm & 2 ? 1 << j : 0) +
+										   (subm & 4 ? 8 : 0));
+						w[i] = subw[0];
+						w[j] = subw[1];
+						w[imd3[j]] = 0;
+						w[3] = subw[2];
+					}
+				}
+			}
+			if (mindist < 0)
+			{
+				mindist = 0;
+				m = 15;
+				w[0] = det(c, b, d) / vl;
+				w[1] = det(a, c, d) / vl;
+				w[2] = det(b, a, d) / vl;
+				w[3] = 1 - (w[0] + w[1] + w[2]);
+			}
+			return (mindist);
+		}
+		return (-1);
+	}
+};
+
+enum eEpaStatus
+{
+	eEpaValid,
+	eEpaTouching,
+	eEpaDegenerated,
+	eEpaNonConvex,
+	eEpaInvalidHull,
+	eEpaOutOfFaces,
+	eEpaOutOfVertices,
+	eEpaAccuraryReached,
+	eEpaFallBack,
+	eEpaFailed
+};
+
+// EPA
+template <typename btConvexTemplate>
+struct EPA
+{
+	/* Types		*/
+
+	struct sFace
+	{
+		btVector3 n;
+		btScalar d;
+		typename GJK<btConvexTemplate>::sSV* c[3];
+		sFace* f[3];
+		sFace* l[2];
+		U1 e[3];
+		U1 pass;
+	};
+	struct sList
+	{
+		sFace* root;
+		U count;
+		sList() : root(0), count(0) {}
+	};
+	struct sHorizon
+	{
+		sFace* cf;
+		sFace* ff;
+		U nf;
+		sHorizon() : cf(0), ff(0), nf(0) {}
+	};
+
+	/* Fields		*/
+	eEpaStatus m_status;
+	typename GJK<btConvexTemplate>::sSimplex m_result;
+	btVector3 m_normal;
+	btScalar m_depth;
+	typename GJK<btConvexTemplate>::sSV m_sv_store[EPA_MAX_VERTICES];
+	sFace m_fc_store[EPA_MAX_FACES];
+	U m_nextsv;
+	sList m_hull;
+	sList m_stock;
+	/* Methods		*/
+	EPA()
+	{
+		Initialize();
+	}
+
+	static inline void bind(sFace* fa, U ea, sFace* fb, U eb)
+	{
+		fa->e[ea] = (U1)eb;
+		fa->f[ea] = fb;
+		fb->e[eb] = (U1)ea;
+		fb->f[eb] = fa;
+	}
+	static inline void append(sList& list, sFace* face)
+	{
+		face->l[0] = 0;
+		face->l[1] = list.root;
+		if (list.root) list.root->l[0] = face;
+		list.root = face;
+		++list.count;
+	}
+	static inline void remove(sList& list, sFace* face)
+	{
+		if (face->l[1]) face->l[1]->l[0] = face->l[0];
+		if (face->l[0]) face->l[0]->l[1] = face->l[1];
+		if (face == list.root) list.root = face->l[1];
+		--list.count;
+	}
+
+	void Initialize()
+	{
+		m_status = eEpaFailed;
+		m_normal = btVector3(0, 0, 0);
+		m_depth = 0;
+		m_nextsv = 0;
+		for (U i = 0; i < EPA_MAX_FACES; ++i)
+		{
+			append(m_stock, &m_fc_store[EPA_MAX_FACES - i - 1]);
+		}
+	}
+	eEpaStatus Evaluate(GJK<btConvexTemplate>& gjk, const btVector3& guess)
+	{
+		typename GJK<btConvexTemplate>::sSimplex& simplex = *gjk.m_simplex;
+		if ((simplex.rank > 1) && gjk.EncloseOrigin())
+		{
+			/* Clean up				*/
+			while (m_hull.root)
+			{
+				sFace* f = m_hull.root;
+				remove(m_hull, f);
+				append(m_stock, f);
+			}
+			m_status = eEpaValid;
+			m_nextsv = 0;
+			/* Orient simplex		*/
+			if (gjk.det(simplex.c[0]->w - simplex.c[3]->w,
+						simplex.c[1]->w - simplex.c[3]->w,
+						simplex.c[2]->w - simplex.c[3]->w) < 0)
+			{
+				btSwap(simplex.c[0], simplex.c[1]);
+				btSwap(simplex.p[0], simplex.p[1]);
+			}
+			/* Build initial hull	*/
+			sFace* tetra[] = {newface(simplex.c[0], simplex.c[1], simplex.c[2], true),
+							  newface(simplex.c[1], simplex.c[0], simplex.c[3], true),
+							  newface(simplex.c[2], simplex.c[1], simplex.c[3], true),
+							  newface(simplex.c[0], simplex.c[2], simplex.c[3], true)};
+			if (m_hull.count == 4)
+			{
+				sFace* best = findbest();
+				sFace outer = *best;
+				U pass = 0;
+				U iterations = 0;
+				bind(tetra[0], 0, tetra[1], 0);
+				bind(tetra[0], 1, tetra[2], 0);
+				bind(tetra[0], 2, tetra[3], 0);
+				bind(tetra[1], 1, tetra[3], 2);
+				bind(tetra[1], 2, tetra[2], 1);
+				bind(tetra[2], 2, tetra[3], 1);
+				m_status = eEpaValid;
+				for (; iterations < EPA_MAX_ITERATIONS; ++iterations)
+				{
+					if (m_nextsv < EPA_MAX_VERTICES)
+					{
+						sHorizon horizon;
+						typename GJK<btConvexTemplate>::sSV* w = &m_sv_store[m_nextsv++];
+						bool valid = true;
+						best->pass = (U1)(++pass);
+						gjk.getsupport(best->n, *w);
+						const btScalar wdist = btDot(best->n, w->w) - best->d;
+						if (wdist > EPA_ACCURACY)
+						{
+							for (U j = 0; (j < 3) && valid; ++j)
+							{
+								valid &= expand(pass, w,
+												best->f[j], best->e[j],
+												horizon);
+							}
+							if (valid && (horizon.nf >= 3))
+							{
+								bind(horizon.cf, 1, horizon.ff, 2);
+								remove(m_hull, best);
+								append(m_stock, best);
+								best = findbest();
+								outer = *best;
+							}
+							else
+							{
+								m_status = eEpaInvalidHull;
+								break;
+							}
+						}
+						else
+						{
+							m_status = eEpaAccuraryReached;
+							break;
+						}
+					}
+					else
+					{
+						m_status = eEpaOutOfVertices;
+						break;
+					}
+				}
+				const btVector3 projection = outer.n * outer.d;
+				m_normal = outer.n;
+				m_depth = outer.d;
+				m_result.rank = 3;
+				m_result.c[0] = outer.c[0];
+				m_result.c[1] = outer.c[1];
+				m_result.c[2] = outer.c[2];
+				m_result.p[0] = btCross(outer.c[1]->w - projection,
+										outer.c[2]->w - projection)
+									.length();
+				m_result.p[1] = btCross(outer.c[2]->w - projection,
+										outer.c[0]->w - projection)
+									.length();
+				m_result.p[2] = btCross(outer.c[0]->w - projection,
+										outer.c[1]->w - projection)
+									.length();
+				const btScalar sum = m_result.p[0] + m_result.p[1] + m_result.p[2];
+				m_result.p[0] /= sum;
+				m_result.p[1] /= sum;
+				m_result.p[2] /= sum;
+				return (m_status);
+			}
+		}
+		/* Fallback		*/
+		m_status = eEpaFallBack;
+		m_normal = -guess;
+		const btScalar nl = m_normal.length();
+		if (nl > 0)
+			m_normal = m_normal / nl;
+		else
+			m_normal = btVector3(1, 0, 0);
+		m_depth = 0;
+		m_result.rank = 1;
+		m_result.c[0] = simplex.c[0];
+		m_result.p[0] = 1;
+		return (m_status);
+	}
+	bool getedgedist(sFace* face, typename GJK<btConvexTemplate>::sSV* a, typename GJK<btConvexTemplate>::sSV* b, btScalar& dist)
+	{
+		const btVector3 ba = b->w - a->w;
+		const btVector3 n_ab = btCross(ba, face->n);   // Outward facing edge normal direction, on triangle plane
+		const btScalar a_dot_nab = btDot(a->w, n_ab);  // Only care about the sign to determine inside/outside, so not normalization required
+
+		if (a_dot_nab < 0)
+		{
+			// Outside of edge a->b
+
+			const btScalar ba_l2 = ba.length2();
+			const btScalar a_dot_ba = btDot(a->w, ba);
+			const btScalar b_dot_ba = btDot(b->w, ba);
+
+			if (a_dot_ba > 0)
+			{
+				// Pick distance vertex a
+				dist = a->w.length();
+			}
+			else if (b_dot_ba < 0)
+			{
+				// Pick distance vertex b
+				dist = b->w.length();
+			}
+			else
+			{
+				// Pick distance to edge a->b
+				const btScalar a_dot_b = btDot(a->w, b->w);
+				dist = btSqrt(btMax((a->w.length2() * b->w.length2() - a_dot_b * a_dot_b) / ba_l2, (btScalar)0));
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+	sFace* newface(typename GJK<btConvexTemplate>::sSV* a, typename GJK<btConvexTemplate>::sSV* b, typename GJK<btConvexTemplate>::sSV* c, bool forced)
+	{
+		if (m_stock.root)
+		{
+			sFace* face = m_stock.root;
+			remove(m_stock, face);
+			append(m_hull, face);
+			face->pass = 0;
+			face->c[0] = a;
+			face->c[1] = b;
+			face->c[2] = c;
+			face->n = btCross(b->w - a->w, c->w - a->w);
+			const btScalar l = face->n.length();
+			const bool v = l > EPA_ACCURACY;
+
+			if (v)
+			{
+				if (!(getedgedist(face, a, b, face->d) ||
+					  getedgedist(face, b, c, face->d) ||
+					  getedgedist(face, c, a, face->d)))
+				{
+					// Origin projects to the interior of the triangle
+					// Use distance to triangle plane
+					face->d = btDot(a->w, face->n) / l;
+				}
+
+				face->n /= l;
+				if (forced || (face->d >= -EPA_PLANE_EPS))
+				{
+					return face;
+				}
+				else
+					m_status = eEpaNonConvex;
+			}
+			else
+				m_status = eEpaDegenerated;
+
+			remove(m_hull, face);
+			append(m_stock, face);
+			return 0;
+		}
+		m_status = m_stock.root ? eEpaOutOfVertices : eEpaOutOfFaces;
+		return 0;
+	}
+	sFace* findbest()
+	{
+		sFace* minf = m_hull.root;
+		btScalar mind = minf->d * minf->d;
+		for (sFace* f = minf->l[1]; f; f = f->l[1])
+		{
+			const btScalar sqd = f->d * f->d;
+			if (sqd < mind)
+			{
+				minf = f;
+				mind = sqd;
+			}
+		}
+		return (minf);
+	}
+	bool expand(U pass, typename GJK<btConvexTemplate>::sSV* w, sFace* f, U e, sHorizon& horizon)
+	{
+		static const U i1m3[] = {1, 2, 0};
+		static const U i2m3[] = {2, 0, 1};
+		if (f->pass != pass)
+		{
+			const U e1 = i1m3[e];
+			if ((btDot(f->n, w->w) - f->d) < -EPA_PLANE_EPS)
+			{
+				sFace* nf = newface(f->c[e1], f->c[e], w, false);
+				if (nf)
+				{
+					bind(nf, 0, f, e);
+					if (horizon.cf)
+						bind(horizon.cf, 1, nf, 2);
+					else
+						horizon.ff = nf;
+					horizon.cf = nf;
+					++horizon.nf;
+					return (true);
+				}
+			}
+			else
+			{
+				const U e2 = i2m3[e];
+				f->pass = (U1)pass;
+				if (expand(pass, w, f->f[e1], f->e[e1], horizon) &&
+					expand(pass, w, f->f[e2], f->e[e2], horizon))
+				{
+					remove(m_hull, f);
+					append(m_stock, f);
+					return (true);
+				}
+			}
+		}
+		return (false);
+	}
+};
+
+template <typename btConvexTemplate>
+static void Initialize(const btConvexTemplate& a, const btConvexTemplate& b,
+					   btGjkEpaSolver3::sResults& results,
+					   MinkowskiDiff<btConvexTemplate>& shape)
+{
+	/* Results		*/
+	results.witnesses[0] =
+		results.witnesses[1] = btVector3(0, 0, 0);
+	results.status = btGjkEpaSolver3::sResults::Separated;
+	/* Shape		*/
+
+	shape.m_toshape1 = b.getWorldTransform().getBasis().transposeTimes(a.getWorldTransform().getBasis());
+	shape.m_toshape0 = a.getWorldTransform().inverseTimes(b.getWorldTransform());
+}
+
+//
+// Api
+//
+
+//
+template <typename btConvexTemplate>
+bool btGjkEpaSolver3_Distance(const btConvexTemplate& a, const btConvexTemplate& b,
+							  const btVector3& guess,
+							  btGjkEpaSolver3::sResults& results)
+{
+	MinkowskiDiff<btConvexTemplate> shape(a, b);
+	Initialize(a, b, results, shape);
+	GJK<btConvexTemplate> gjk(a, b);
+	eGjkStatus gjk_status = gjk.Evaluate(shape, guess);
+	if (gjk_status == eGjkValid)
+	{
+		btVector3 w0 = btVector3(0, 0, 0);
+		btVector3 w1 = btVector3(0, 0, 0);
+		for (U i = 0; i < gjk.m_simplex->rank; ++i)
+		{
+			const btScalar p = gjk.m_simplex->p[i];
+			w0 += shape.Support(gjk.m_simplex->c[i]->d, 0) * p;
+			w1 += shape.Support(-gjk.m_simplex->c[i]->d, 1) * p;
+		}
+		results.witnesses[0] = a.getWorldTransform() * w0;
+		results.witnesses[1] = a.getWorldTransform() * w1;
+		results.normal = w0 - w1;
+		results.distance = results.normal.length();
+		results.normal /= results.distance > GJK_MIN_DISTANCE ? results.distance : 1;
+		return (true);
+	}
+	else
+	{
+		results.status = gjk_status == eGjkInside ? btGjkEpaSolver3::sResults::Penetrating : btGjkEpaSolver3::sResults::GJK_Failed;
+		return (false);
+	}
+}
+
+template <typename btConvexTemplate>
+bool btGjkEpaSolver3_Penetration(const btConvexTemplate& a,
+								 const btConvexTemplate& b,
+								 const btVector3& guess,
+								 btGjkEpaSolver3::sResults& results)
+{
+	MinkowskiDiff<btConvexTemplate> shape(a, b);
+	Initialize(a, b, results, shape);
+	GJK<btConvexTemplate> gjk(a, b);
+	eGjkStatus gjk_status = gjk.Evaluate(shape, -guess);
+	switch (gjk_status)
+	{
+		case eGjkInside:
+		{
+			EPA<btConvexTemplate> epa;
+			eEpaStatus epa_status = epa.Evaluate(gjk, -guess);
+			if (epa_status != eEpaFailed)
+			{
+				btVector3 w0 = btVector3(0, 0, 0);
+				for (U i = 0; i < epa.m_result.rank; ++i)
+				{
+					w0 += shape.Support(epa.m_result.c[i]->d, 0) * epa.m_result.p[i];
+				}
+				results.status = btGjkEpaSolver3::sResults::Penetrating;
+				results.witnesses[0] = a.getWorldTransform() * w0;
+				results.witnesses[1] = a.getWorldTransform() * (w0 - epa.m_normal * epa.m_depth);
+				results.normal = -epa.m_normal;
+				results.distance = -epa.m_depth;
+				return (true);
+			}
+			else
+				results.status = btGjkEpaSolver3::sResults::EPA_Failed;
+		}
+		break;
+		case eGjkFailed:
+			results.status = btGjkEpaSolver3::sResults::GJK_Failed;
+			break;
+		default:
+		{
+		}
+	}
+	return (false);
+}
+
+#if 0
+int	btComputeGjkEpaPenetration2(const btCollisionDescription& colDesc, btDistanceInfo* distInfo)
+{
+    btGjkEpaSolver3::sResults results;
+    btVector3 guess = colDesc.m_firstDir;
+    
+    bool res = btGjkEpaSolver3::Penetration(colDesc.m_objA,colDesc.m_objB,
+                                            colDesc.m_transformA,colDesc.m_transformB,
+                                            colDesc.m_localSupportFuncA,colDesc.m_localSupportFuncB,
+                                            guess,
+                                            results);
+    if (res)
+    {
+        if ((results.status==btGjkEpaSolver3::sResults::Penetrating) || results.status==GJK::eStatus::Inside)
+        {
+            //normal could be 'swapped'
+            
+            distInfo->m_distance = results.distance;
+            distInfo->m_normalBtoA = results.normal;
+            btVector3 tmpNormalInB = results.witnesses[1]-results.witnesses[0];
+            btScalar lenSqr = tmpNormalInB.length2();
+            if (lenSqr <= (SIMD_EPSILON*SIMD_EPSILON))
+            {
+                tmpNormalInB = results.normal;
+                lenSqr = results.normal.length2();
+            }
+            
+            if (lenSqr > (SIMD_EPSILON*SIMD_EPSILON))
+            {
+                tmpNormalInB /= btSqrt(lenSqr);
+                btScalar distance2 = -(results.witnesses[0]-results.witnesses[1]).length();
+                //only replace valid penetrations when the result is deeper (check)
+                //if ((distance2 < results.distance))
+                {
+                    distInfo->m_distance = distance2;
+                    distInfo->m_pointOnA= results.witnesses[0];
+                    distInfo->m_pointOnB= results.witnesses[1];
+                    distInfo->m_normalBtoA= tmpNormalInB;
+                    return 0;
+                }
+            }
+        }
+        
+    }
+    
+    return -1;
+}
+#endif
+
+template <typename btConvexTemplate, typename btDistanceInfoTemplate>
+int btComputeGjkDistance(const btConvexTemplate& a, const btConvexTemplate& b,
+						 const btGjkCollisionDescription& colDesc, btDistanceInfoTemplate* distInfo)
+{
+	btGjkEpaSolver3::sResults results;
+	btVector3 guess = colDesc.m_firstDir;
+
+	bool isSeparated = btGjkEpaSolver3_Distance(a, b,
+												guess,
+												results);
+	if (isSeparated)
+	{
+		distInfo->m_distance = results.distance;
+		distInfo->m_pointOnA = results.witnesses[0];
+		distInfo->m_pointOnB = results.witnesses[1];
+		distInfo->m_normalBtoA = results.normal;
+		return 0;
+	}
+
+	return -1;
+}
+
+/* Symbols cleanup		*/
+
+#undef GJK_MAX_ITERATIONS
+#undef GJK_ACCURARY
+#undef GJK_MIN_DISTANCE
+#undef GJK_DUPLICATED_EPS
+#undef GJK_SIMPLEX2_EPS
+#undef GJK_SIMPLEX3_EPS
+#undef GJK_SIMPLEX4_EPS
+
+#undef EPA_MAX_VERTICES
+#undef EPA_MAX_FACES
+#undef EPA_MAX_ITERATIONS
+#undef EPA_ACCURACY
+#undef EPA_FALLBACK
+#undef EPA_PLANE_EPS
+#undef EPA_INSIDE_EPS
+
+#endif  //BT_GJK_EPA3_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
new file mode 100644
index 0000000..3b79ddf
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
@@ -0,0 +1,81 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+EPA Copyright (c) Ricardo Padrela 2006
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "btGjkEpaPenetrationDepthSolver.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+
+bool btGjkEpaPenetrationDepthSolver::calcPenDepth(btSimplexSolverInterface& simplexSolver,
+												  const btConvexShape* pConvexA, const btConvexShape* pConvexB,
+												  const btTransform& transformA, const btTransform& transformB,
+												  btVector3& v, btVector3& wWitnessOnA, btVector3& wWitnessOnB,
+												  class btIDebugDraw* debugDraw)
+{
+	(void)debugDraw;
+	(void)v;
+	(void)simplexSolver;
+
+	btVector3 guessVectors[] = {
+		btVector3(transformB.getOrigin() - transformA.getOrigin()).safeNormalize(),
+		btVector3(transformA.getOrigin() - transformB.getOrigin()).safeNormalize(),
+		btVector3(0, 0, 1),
+		btVector3(0, 1, 0),
+		btVector3(1, 0, 0),
+		btVector3(1, 1, 0),
+		btVector3(1, 1, 1),
+		btVector3(0, 1, 1),
+		btVector3(1, 0, 1),
+	};
+
+	int numVectors = sizeof(guessVectors) / sizeof(btVector3);
+
+	for (int i = 0; i < numVectors; i++)
+	{
+		simplexSolver.reset();
+		btVector3 guessVector = guessVectors[i];
+
+		btGjkEpaSolver2::sResults results;
+
+		if (btGjkEpaSolver2::Penetration(pConvexA, transformA,
+										 pConvexB, transformB,
+										 guessVector, results))
+
+		{
+			wWitnessOnA = results.witnesses[0];
+			wWitnessOnB = results.witnesses[1];
+			v = results.normal;
+			return true;
+		}
+		else
+		{
+			if (btGjkEpaSolver2::Distance(pConvexA, transformA, pConvexB, transformB, guessVector, results))
+			{
+				wWitnessOnA = results.witnesses[0];
+				wWitnessOnB = results.witnesses[1];
+				v = results.normal;
+				return false;
+			}
+		}
+	}
+
+	//failed to find a distance/penetration
+	wWitnessOnA.setValue(0, 0, 0);
+	wWitnessOnB.setValue(0, 0, 0);
+	v.setValue(0, 0, 0);
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
new file mode 100644
index 0000000..90f0c17
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
@@ -0,0 +1,40 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+EPA Copyright (c) Ricardo Padrela 2006 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef BT_GJP_EPA_PENETRATION_DEPTH_H
+#define BT_GJP_EPA_PENETRATION_DEPTH_H
+
+#include "btConvexPenetrationDepthSolver.h"
+
+///EpaPenetrationDepthSolver uses the Expanding Polytope Algorithm to
+///calculate the penetration depth between two convex shapes.
+class btGjkEpaPenetrationDepthSolver : public btConvexPenetrationDepthSolver
+{
+public:
+	btGjkEpaPenetrationDepthSolver()
+	{
+	}
+
+	bool calcPenDepth(btSimplexSolverInterface& simplexSolver,
+					  const btConvexShape* pConvexA, const btConvexShape* pConvexB,
+					  const btTransform& transformA, const btTransform& transformB,
+					  btVector3& v, btVector3& wWitnessOnA, btVector3& wWitnessOnB,
+					  class btIDebugDraw* debugDraw);
+
+private:
+};
+
+#endif  // BT_GJP_EPA_PENETRATION_DEPTH_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
new file mode 100644
index 0000000..bee8c33
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
@@ -0,0 +1,1183 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGjkPairDetector.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
+#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h"
+
+#if defined(DEBUG) || defined(_DEBUG)
+//#define TEST_NON_VIRTUAL 1
+#include <stdio.h>  //for debug printf
+#ifdef __SPU__
+#include <spu_printf.h>
+#define printf spu_printf
+#endif  //__SPU__
+#endif
+
+//must be above the machine epsilon
+#ifdef BT_USE_DOUBLE_PRECISION
+#define REL_ERROR2 btScalar(1.0e-12)
+btScalar gGjkEpaPenetrationTolerance = 1.0e-12;
+#else
+#define REL_ERROR2 btScalar(1.0e-6)
+btScalar gGjkEpaPenetrationTolerance = 0.001;
+#endif
+
+
+btGjkPairDetector::btGjkPairDetector(const btConvexShape *objectA, const btConvexShape *objectB, btSimplexSolverInterface *simplexSolver, btConvexPenetrationDepthSolver *penetrationDepthSolver)
+	: m_cachedSeparatingAxis(btScalar(0.), btScalar(1.), btScalar(0.)),
+	  m_penetrationDepthSolver(penetrationDepthSolver),
+	  m_simplexSolver(simplexSolver),
+	  m_minkowskiA(objectA),
+	  m_minkowskiB(objectB),
+	  m_shapeTypeA(objectA->getShapeType()),
+	  m_shapeTypeB(objectB->getShapeType()),
+	  m_marginA(objectA->getMargin()),
+	  m_marginB(objectB->getMargin()),
+	  m_ignoreMargin(false),
+	  m_lastUsedMethod(-1),
+	  m_catchDegeneracies(1),
+	  m_fixContactNormalDirection(1)
+{
+}
+btGjkPairDetector::btGjkPairDetector(const btConvexShape *objectA, const btConvexShape *objectB, int shapeTypeA, int shapeTypeB, btScalar marginA, btScalar marginB, btSimplexSolverInterface *simplexSolver, btConvexPenetrationDepthSolver *penetrationDepthSolver)
+	: m_cachedSeparatingAxis(btScalar(0.), btScalar(1.), btScalar(0.)),
+	  m_penetrationDepthSolver(penetrationDepthSolver),
+	  m_simplexSolver(simplexSolver),
+	  m_minkowskiA(objectA),
+	  m_minkowskiB(objectB),
+	  m_shapeTypeA(shapeTypeA),
+	  m_shapeTypeB(shapeTypeB),
+	  m_marginA(marginA),
+	  m_marginB(marginB),
+	  m_ignoreMargin(false),
+	  m_lastUsedMethod(-1),
+	  m_catchDegeneracies(1),
+	  m_fixContactNormalDirection(1)
+{
+}
+
+void btGjkPairDetector::getClosestPoints(const ClosestPointInput &input, Result &output, class btIDebugDraw *debugDraw, bool swapResults)
+{
+	(void)swapResults;
+
+	getClosestPointsNonVirtual(input, output, debugDraw);
+}
+
+static void btComputeSupport(const btConvexShape *convexA, const btTransform &localTransA, const btConvexShape *convexB, const btTransform &localTransB, const btVector3 &dir, bool check2d, btVector3 &supAworld, btVector3 &supBworld, btVector3 &aMinb)
+{
+	btVector3 separatingAxisInA = (dir)*localTransA.getBasis();
+	btVector3 separatingAxisInB = (-dir) * localTransB.getBasis();
+
+	btVector3 pInANoMargin = convexA->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInA);
+	btVector3 qInBNoMargin = convexB->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInB);
+
+	btVector3 pInA = pInANoMargin;
+	btVector3 qInB = qInBNoMargin;
+
+	supAworld = localTransA(pInA);
+	supBworld = localTransB(qInB);
+
+	if (check2d)
+	{
+		supAworld[2] = 0.f;
+		supBworld[2] = 0.f;
+	}
+
+	aMinb = supAworld - supBworld;
+}
+
+struct btSupportVector
+{
+	btVector3 v;   //!< Support point in minkowski sum
+	btVector3 v1;  //!< Support point in obj1
+	btVector3 v2;  //!< Support point in obj2
+};
+
+struct btSimplex
+{
+	btSupportVector ps[4];
+	int last;  //!< index of last added point
+};
+
+static btVector3 ccd_vec3_origin(0, 0, 0);
+
+inline void btSimplexInit(btSimplex *s)
+{
+	s->last = -1;
+}
+
+inline int btSimplexSize(const btSimplex *s)
+{
+	return s->last + 1;
+}
+
+inline const btSupportVector *btSimplexPoint(const btSimplex *s, int idx)
+{
+	// here is no check on boundaries
+	return &s->ps[idx];
+}
+inline void btSupportCopy(btSupportVector *d, const btSupportVector *s)
+{
+	*d = *s;
+}
+
+inline void btVec3Copy(btVector3 *v, const btVector3 *w)
+{
+	*v = *w;
+}
+
+inline void ccdVec3Add(btVector3 *v, const btVector3 *w)
+{
+	v->m_floats[0] += w->m_floats[0];
+	v->m_floats[1] += w->m_floats[1];
+	v->m_floats[2] += w->m_floats[2];
+}
+
+inline void ccdVec3Sub(btVector3 *v, const btVector3 *w)
+{
+	*v -= *w;
+}
+inline void btVec3Sub2(btVector3 *d, const btVector3 *v, const btVector3 *w)
+{
+	*d = (*v) - (*w);
+}
+inline btScalar btVec3Dot(const btVector3 *a, const btVector3 *b)
+{
+	btScalar dot;
+	dot = a->dot(*b);
+
+	return dot;
+}
+
+inline btScalar ccdVec3Dist2(const btVector3 *a, const btVector3 *b)
+{
+	btVector3 ab;
+	btVec3Sub2(&ab, a, b);
+	return btVec3Dot(&ab, &ab);
+}
+
+inline void btVec3Scale(btVector3 *d, btScalar k)
+{
+	d->m_floats[0] *= k;
+	d->m_floats[1] *= k;
+	d->m_floats[2] *= k;
+}
+
+inline void btVec3Cross(btVector3 *d, const btVector3 *a, const btVector3 *b)
+{
+	d->m_floats[0] = (a->m_floats[1] * b->m_floats[2]) - (a->m_floats[2] * b->m_floats[1]);
+	d->m_floats[1] = (a->m_floats[2] * b->m_floats[0]) - (a->m_floats[0] * b->m_floats[2]);
+	d->m_floats[2] = (a->m_floats[0] * b->m_floats[1]) - (a->m_floats[1] * b->m_floats[0]);
+}
+
+inline void btTripleCross(const btVector3 *a, const btVector3 *b,
+						  const btVector3 *c, btVector3 *d)
+{
+	btVector3 e;
+	btVec3Cross(&e, a, b);
+	btVec3Cross(d, &e, c);
+}
+
+inline int ccdEq(btScalar _a, btScalar _b)
+{
+	btScalar ab;
+	btScalar a, b;
+
+	ab = btFabs(_a - _b);
+	if (btFabs(ab) < SIMD_EPSILON)
+		return 1;
+
+	a = btFabs(_a);
+	b = btFabs(_b);
+	if (b > a)
+	{
+		return ab < SIMD_EPSILON * b;
+	}
+	else
+	{
+		return ab < SIMD_EPSILON * a;
+	}
+}
+
+btScalar ccdVec3X(const btVector3 *v)
+{
+	return v->x();
+}
+
+btScalar ccdVec3Y(const btVector3 *v)
+{
+	return v->y();
+}
+
+btScalar ccdVec3Z(const btVector3 *v)
+{
+	return v->z();
+}
+inline int btVec3Eq(const btVector3 *a, const btVector3 *b)
+{
+	return ccdEq(ccdVec3X(a), ccdVec3X(b)) && ccdEq(ccdVec3Y(a), ccdVec3Y(b)) && ccdEq(ccdVec3Z(a), ccdVec3Z(b));
+}
+
+inline void btSimplexAdd(btSimplex *s, const btSupportVector *v)
+{
+	// here is no check on boundaries in sake of speed
+	++s->last;
+	btSupportCopy(s->ps + s->last, v);
+}
+
+inline void btSimplexSet(btSimplex *s, size_t pos, const btSupportVector *a)
+{
+	btSupportCopy(s->ps + pos, a);
+}
+
+inline void btSimplexSetSize(btSimplex *s, int size)
+{
+	s->last = size - 1;
+}
+
+inline const btSupportVector *ccdSimplexLast(const btSimplex *s)
+{
+	return btSimplexPoint(s, s->last);
+}
+
+inline int ccdSign(btScalar val)
+{
+	if (btFuzzyZero(val))
+	{
+		return 0;
+	}
+	else if (val < btScalar(0))
+	{
+		return -1;
+	}
+	return 1;
+}
+
+inline btScalar btVec3PointSegmentDist2(const btVector3 *P,
+										const btVector3 *x0,
+										const btVector3 *b,
+										btVector3 *witness)
+{
+	// The computation comes from solving equation of segment:
+	//      S(t) = x0 + t.d
+	//          where - x0 is initial point of segment
+	//                - d is direction of segment from x0 (|d| > 0)
+	//                - t belongs to <0, 1> interval
+	//
+	// Than, distance from a segment to some point P can be expressed:
+	//      D(t) = |x0 + t.d - P|^2
+	//          which is distance from any point on segment. Minimization
+	//          of this function brings distance from P to segment.
+	// Minimization of D(t) leads to simple quadratic equation that's
+	// solving is straightforward.
+	//
+	// Bonus of this method is witness point for free.
+
+	btScalar dist, t;
+	btVector3 d, a;
+
+	// direction of segment
+	btVec3Sub2(&d, b, x0);
+
+	// precompute vector from P to x0
+	btVec3Sub2(&a, x0, P);
+
+	t = -btScalar(1.) * btVec3Dot(&a, &d);
+	t /= btVec3Dot(&d, &d);
+
+	if (t < btScalar(0) || btFuzzyZero(t))
+	{
+		dist = ccdVec3Dist2(x0, P);
+		if (witness)
+			btVec3Copy(witness, x0);
+	}
+	else if (t > btScalar(1) || ccdEq(t, btScalar(1)))
+	{
+		dist = ccdVec3Dist2(b, P);
+		if (witness)
+			btVec3Copy(witness, b);
+	}
+	else
+	{
+		if (witness)
+		{
+			btVec3Copy(witness, &d);
+			btVec3Scale(witness, t);
+			ccdVec3Add(witness, x0);
+			dist = ccdVec3Dist2(witness, P);
+		}
+		else
+		{
+			// recycling variables
+			btVec3Scale(&d, t);
+			ccdVec3Add(&d, &a);
+			dist = btVec3Dot(&d, &d);
+		}
+	}
+
+	return dist;
+}
+
+btScalar btVec3PointTriDist2(const btVector3 *P,
+							 const btVector3 *x0, const btVector3 *B,
+							 const btVector3 *C,
+							 btVector3 *witness)
+{
+	// Computation comes from analytic expression for triangle (x0, B, C)
+	//      T(s, t) = x0 + s.d1 + t.d2, where d1 = B - x0 and d2 = C - x0 and
+	// Then equation for distance is:
+	//      D(s, t) = | T(s, t) - P |^2
+	// This leads to minimization of quadratic function of two variables.
+	// The solution from is taken only if s is between 0 and 1, t is
+	// between 0 and 1 and t + s < 1, otherwise distance from segment is
+	// computed.
+
+	btVector3 d1, d2, a;
+	double u, v, w, p, q, r;
+	double s, t, dist, dist2;
+	btVector3 witness2;
+
+	btVec3Sub2(&d1, B, x0);
+	btVec3Sub2(&d2, C, x0);
+	btVec3Sub2(&a, x0, P);
+
+	u = btVec3Dot(&a, &a);
+	v = btVec3Dot(&d1, &d1);
+	w = btVec3Dot(&d2, &d2);
+	p = btVec3Dot(&a, &d1);
+	q = btVec3Dot(&a, &d2);
+	r = btVec3Dot(&d1, &d2);
+
+	s = (q * r - w * p) / (w * v - r * r);
+	t = (-s * r - q) / w;
+
+	if ((btFuzzyZero(s) || s > btScalar(0)) && (ccdEq(s, btScalar(1)) || s < btScalar(1)) && (btFuzzyZero(t) || t > btScalar(0)) && (ccdEq(t, btScalar(1)) || t < btScalar(1)) && (ccdEq(t + s, btScalar(1)) || t + s < btScalar(1)))
+	{
+		if (witness)
+		{
+			btVec3Scale(&d1, s);
+			btVec3Scale(&d2, t);
+			btVec3Copy(witness, x0);
+			ccdVec3Add(witness, &d1);
+			ccdVec3Add(witness, &d2);
+
+			dist = ccdVec3Dist2(witness, P);
+		}
+		else
+		{
+			dist = s * s * v;
+			dist += t * t * w;
+			dist += btScalar(2.) * s * t * r;
+			dist += btScalar(2.) * s * p;
+			dist += btScalar(2.) * t * q;
+			dist += u;
+		}
+	}
+	else
+	{
+		dist = btVec3PointSegmentDist2(P, x0, B, witness);
+
+		dist2 = btVec3PointSegmentDist2(P, x0, C, &witness2);
+		if (dist2 < dist)
+		{
+			dist = dist2;
+			if (witness)
+				btVec3Copy(witness, &witness2);
+		}
+
+		dist2 = btVec3PointSegmentDist2(P, B, C, &witness2);
+		if (dist2 < dist)
+		{
+			dist = dist2;
+			if (witness)
+				btVec3Copy(witness, &witness2);
+		}
+	}
+
+	return dist;
+}
+
+static int btDoSimplex2(btSimplex *simplex, btVector3 *dir)
+{
+	const btSupportVector *A, *B;
+	btVector3 AB, AO, tmp;
+	btScalar dot;
+
+	// get last added as A
+	A = ccdSimplexLast(simplex);
+	// get the other point
+	B = btSimplexPoint(simplex, 0);
+	// compute AB oriented segment
+	btVec3Sub2(&AB, &B->v, &A->v);
+	// compute AO vector
+	btVec3Copy(&AO, &A->v);
+	btVec3Scale(&AO, -btScalar(1));
+
+	// dot product AB . AO
+	dot = btVec3Dot(&AB, &AO);
+
+	// check if origin doesn't lie on AB segment
+	btVec3Cross(&tmp, &AB, &AO);
+	if (btFuzzyZero(btVec3Dot(&tmp, &tmp)) && dot > btScalar(0))
+	{
+		return 1;
+	}
+
+	// check if origin is in area where AB segment is
+	if (btFuzzyZero(dot) || dot < btScalar(0))
+	{
+		// origin is in outside are of A
+		btSimplexSet(simplex, 0, A);
+		btSimplexSetSize(simplex, 1);
+		btVec3Copy(dir, &AO);
+	}
+	else
+	{
+		// origin is in area where AB segment is
+
+		// keep simplex untouched and set direction to
+		// AB x AO x AB
+		btTripleCross(&AB, &AO, &AB, dir);
+	}
+
+	return 0;
+}
+
+static int btDoSimplex3(btSimplex *simplex, btVector3 *dir)
+{
+	const btSupportVector *A, *B, *C;
+	btVector3 AO, AB, AC, ABC, tmp;
+	btScalar dot, dist;
+
+	// get last added as A
+	A = ccdSimplexLast(simplex);
+	// get the other points
+	B = btSimplexPoint(simplex, 1);
+	C = btSimplexPoint(simplex, 0);
+
+	// check touching contact
+	dist = btVec3PointTriDist2(&ccd_vec3_origin, &A->v, &B->v, &C->v, 0);
+	if (btFuzzyZero(dist))
+	{
+		return 1;
+	}
+
+	// check if triangle is really triangle (has area > 0)
+	// if not simplex can't be expanded and thus no itersection is found
+	if (btVec3Eq(&A->v, &B->v) || btVec3Eq(&A->v, &C->v))
+	{
+		return -1;
+	}
+
+	// compute AO vector
+	btVec3Copy(&AO, &A->v);
+	btVec3Scale(&AO, -btScalar(1));
+
+	// compute AB and AC segments and ABC vector (perpendircular to triangle)
+	btVec3Sub2(&AB, &B->v, &A->v);
+	btVec3Sub2(&AC, &C->v, &A->v);
+	btVec3Cross(&ABC, &AB, &AC);
+
+	btVec3Cross(&tmp, &ABC, &AC);
+	dot = btVec3Dot(&tmp, &AO);
+	if (btFuzzyZero(dot) || dot > btScalar(0))
+	{
+		dot = btVec3Dot(&AC, &AO);
+		if (btFuzzyZero(dot) || dot > btScalar(0))
+		{
+			// C is already in place
+			btSimplexSet(simplex, 1, A);
+			btSimplexSetSize(simplex, 2);
+			btTripleCross(&AC, &AO, &AC, dir);
+		}
+		else
+		{
+			dot = btVec3Dot(&AB, &AO);
+			if (btFuzzyZero(dot) || dot > btScalar(0))
+			{
+				btSimplexSet(simplex, 0, B);
+				btSimplexSet(simplex, 1, A);
+				btSimplexSetSize(simplex, 2);
+				btTripleCross(&AB, &AO, &AB, dir);
+			}
+			else
+			{
+				btSimplexSet(simplex, 0, A);
+				btSimplexSetSize(simplex, 1);
+				btVec3Copy(dir, &AO);
+			}
+		}
+	}
+	else
+	{
+		btVec3Cross(&tmp, &AB, &ABC);
+		dot = btVec3Dot(&tmp, &AO);
+		if (btFuzzyZero(dot) || dot > btScalar(0))
+		{
+			dot = btVec3Dot(&AB, &AO);
+			if (btFuzzyZero(dot) || dot > btScalar(0))
+			{
+				btSimplexSet(simplex, 0, B);
+				btSimplexSet(simplex, 1, A);
+				btSimplexSetSize(simplex, 2);
+				btTripleCross(&AB, &AO, &AB, dir);
+			}
+			else
+			{
+				btSimplexSet(simplex, 0, A);
+				btSimplexSetSize(simplex, 1);
+				btVec3Copy(dir, &AO);
+			}
+		}
+		else
+		{
+			dot = btVec3Dot(&ABC, &AO);
+			if (btFuzzyZero(dot) || dot > btScalar(0))
+			{
+				btVec3Copy(dir, &ABC);
+			}
+			else
+			{
+				btSupportVector tmp;
+				btSupportCopy(&tmp, C);
+				btSimplexSet(simplex, 0, B);
+				btSimplexSet(simplex, 1, &tmp);
+
+				btVec3Copy(dir, &ABC);
+				btVec3Scale(dir, -btScalar(1));
+			}
+		}
+	}
+
+	return 0;
+}
+
+static int btDoSimplex4(btSimplex *simplex, btVector3 *dir)
+{
+	const btSupportVector *A, *B, *C, *D;
+	btVector3 AO, AB, AC, AD, ABC, ACD, ADB;
+	int B_on_ACD, C_on_ADB, D_on_ABC;
+	int AB_O, AC_O, AD_O;
+	btScalar dist;
+
+	// get last added as A
+	A = ccdSimplexLast(simplex);
+	// get the other points
+	B = btSimplexPoint(simplex, 2);
+	C = btSimplexPoint(simplex, 1);
+	D = btSimplexPoint(simplex, 0);
+
+	// check if tetrahedron is really tetrahedron (has volume > 0)
+	// if it is not simplex can't be expanded and thus no intersection is
+	// found
+	dist = btVec3PointTriDist2(&A->v, &B->v, &C->v, &D->v, 0);
+	if (btFuzzyZero(dist))
+	{
+		return -1;
+	}
+
+	// check if origin lies on some of tetrahedron's face - if so objects
+	// intersect
+	dist = btVec3PointTriDist2(&ccd_vec3_origin, &A->v, &B->v, &C->v, 0);
+	if (btFuzzyZero(dist))
+		return 1;
+	dist = btVec3PointTriDist2(&ccd_vec3_origin, &A->v, &C->v, &D->v, 0);
+	if (btFuzzyZero(dist))
+		return 1;
+	dist = btVec3PointTriDist2(&ccd_vec3_origin, &A->v, &B->v, &D->v, 0);
+	if (btFuzzyZero(dist))
+		return 1;
+	dist = btVec3PointTriDist2(&ccd_vec3_origin, &B->v, &C->v, &D->v, 0);
+	if (btFuzzyZero(dist))
+		return 1;
+
+	// compute AO, AB, AC, AD segments and ABC, ACD, ADB normal vectors
+	btVec3Copy(&AO, &A->v);
+	btVec3Scale(&AO, -btScalar(1));
+	btVec3Sub2(&AB, &B->v, &A->v);
+	btVec3Sub2(&AC, &C->v, &A->v);
+	btVec3Sub2(&AD, &D->v, &A->v);
+	btVec3Cross(&ABC, &AB, &AC);
+	btVec3Cross(&ACD, &AC, &AD);
+	btVec3Cross(&ADB, &AD, &AB);
+
+	// side (positive or negative) of B, C, D relative to planes ACD, ADB
+	// and ABC respectively
+	B_on_ACD = ccdSign(btVec3Dot(&ACD, &AB));
+	C_on_ADB = ccdSign(btVec3Dot(&ADB, &AC));
+	D_on_ABC = ccdSign(btVec3Dot(&ABC, &AD));
+
+	// whether origin is on same side of ACD, ADB, ABC as B, C, D
+	// respectively
+	AB_O = ccdSign(btVec3Dot(&ACD, &AO)) == B_on_ACD;
+	AC_O = ccdSign(btVec3Dot(&ADB, &AO)) == C_on_ADB;
+	AD_O = ccdSign(btVec3Dot(&ABC, &AO)) == D_on_ABC;
+
+	if (AB_O && AC_O && AD_O)
+	{
+		// origin is in tetrahedron
+		return 1;
+		// rearrange simplex to triangle and call btDoSimplex3()
+	}
+	else if (!AB_O)
+	{
+		// B is farthest from the origin among all of the tetrahedron's
+		// points, so remove it from the list and go on with the triangle
+		// case
+
+		// D and C are in place
+		btSimplexSet(simplex, 2, A);
+		btSimplexSetSize(simplex, 3);
+	}
+	else if (!AC_O)
+	{
+		// C is farthest
+		btSimplexSet(simplex, 1, D);
+		btSimplexSet(simplex, 0, B);
+		btSimplexSet(simplex, 2, A);
+		btSimplexSetSize(simplex, 3);
+	}
+	else
+	{  // (!AD_O)
+		btSimplexSet(simplex, 0, C);
+		btSimplexSet(simplex, 1, B);
+		btSimplexSet(simplex, 2, A);
+		btSimplexSetSize(simplex, 3);
+	}
+
+	return btDoSimplex3(simplex, dir);
+}
+
+static int btDoSimplex(btSimplex *simplex, btVector3 *dir)
+{
+	if (btSimplexSize(simplex) == 2)
+	{
+		// simplex contains segment only one segment
+		return btDoSimplex2(simplex, dir);
+	}
+	else if (btSimplexSize(simplex) == 3)
+	{
+		// simplex contains triangle
+		return btDoSimplex3(simplex, dir);
+	}
+	else
+	{  // btSimplexSize(simplex) == 4
+		// tetrahedron - this is the only shape which can encapsule origin
+		// so btDoSimplex4() also contains test on it
+		return btDoSimplex4(simplex, dir);
+	}
+}
+
+#ifdef __SPU__
+void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput &input, Result &output, class btIDebugDraw *debugDraw)
+#else
+void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput &input, Result &output, class btIDebugDraw *debugDraw)
+#endif
+{
+	m_cachedSeparatingDistance = 0.f;
+
+	btScalar distance = btScalar(0.);
+	btVector3 normalInB(btScalar(0.), btScalar(0.), btScalar(0.));
+
+	btVector3 pointOnA, pointOnB;
+	btTransform localTransA = input.m_transformA;
+	btTransform localTransB = input.m_transformB;
+	btVector3 positionOffset = (localTransA.getOrigin() + localTransB.getOrigin()) * btScalar(0.5);
+	localTransA.getOrigin() -= positionOffset;
+	localTransB.getOrigin() -= positionOffset;
+
+	bool check2d = m_minkowskiA->isConvex2d() && m_minkowskiB->isConvex2d();
+
+	btScalar marginA = m_marginA;
+	btScalar marginB = m_marginB;
+
+
+	//for CCD we don't use margins
+	if (m_ignoreMargin)
+	{
+		marginA = btScalar(0.);
+		marginB = btScalar(0.);
+	}
+
+	m_curIter = 0;
+	int gGjkMaxIter = 1000;  //this is to catch invalid input, perhaps check for #NaN?
+	m_cachedSeparatingAxis.setValue(0, 1, 0);
+
+	bool isValid = false;
+	bool checkSimplex = false;
+	bool checkPenetration = true;
+	m_degenerateSimplex = 0;
+
+	m_lastUsedMethod = -1;
+	int status = -2;
+	btVector3 orgNormalInB(0, 0, 0);
+	btScalar margin = marginA + marginB;
+
+	//we add a separate implementation to check if the convex shapes intersect
+	//See also "Real-time Collision Detection with Implicit Objects" by Leif Olvang
+	//Todo: integrate the simplex penetration check directly inside the Bullet btVoronoiSimplexSolver
+	//and remove this temporary code from libCCD
+	//this fixes issue https://github.com/bulletphysics/bullet3/issues/1703
+	//note, for large differences in shapes, use double precision build!
+	{
+		btScalar squaredDistance = BT_LARGE_FLOAT;
+		btScalar delta = btScalar(0.);
+
+		btSimplex simplex1;
+		btSimplex *simplex = &simplex1;
+		btSimplexInit(simplex);
+
+		btVector3 dir(1, 0, 0);
+
+		{
+			btVector3 lastSupV;
+			btVector3 supAworld;
+			btVector3 supBworld;
+			btComputeSupport(m_minkowskiA, localTransA, m_minkowskiB, localTransB, dir, check2d, supAworld, supBworld, lastSupV);
+
+			btSupportVector last;
+			last.v = lastSupV;
+			last.v1 = supAworld;
+			last.v2 = supBworld;
+
+			btSimplexAdd(simplex, &last);
+
+			dir = -lastSupV;
+
+			// start iterations
+			for (int iterations = 0; iterations < gGjkMaxIter; iterations++)
+			{
+				// obtain support point
+				btComputeSupport(m_minkowskiA, localTransA, m_minkowskiB, localTransB, dir, check2d, supAworld, supBworld, lastSupV);
+
+				// check if farthest point in Minkowski difference in direction dir
+				// isn't somewhere before origin (the test on negative dot product)
+				// - because if it is, objects are not intersecting at all.
+				btScalar delta = lastSupV.dot(dir);
+				if (delta < 0)
+				{
+					//no intersection, besides margin
+					status = -1;
+					break;
+				}
+
+				// add last support vector to simplex
+				last.v = lastSupV;
+				last.v1 = supAworld;
+				last.v2 = supBworld;
+
+				btSimplexAdd(simplex, &last);
+
+				// if btDoSimplex returns 1 if objects intersect, -1 if objects don't
+				// intersect and 0 if algorithm should continue
+
+				btVector3 newDir;
+				int do_simplex_res = btDoSimplex(simplex, &dir);
+
+				if (do_simplex_res == 1)
+				{
+					status = 0;  // intersection found
+					break;
+				}
+				else if (do_simplex_res == -1)
+				{
+					// intersection not found
+					status = -1;
+					break;
+				}
+
+				if (btFuzzyZero(btVec3Dot(&dir, &dir)))
+				{
+					// intersection not found
+					status = -1;
+				}
+
+				if (dir.length2() < SIMD_EPSILON)
+				{
+					//no intersection, besides margin
+					status = -1;
+					break;
+				}
+
+				if (dir.fuzzyZero())
+				{
+					// intersection not found
+					status = -1;
+					break;
+				}
+			}
+		}
+
+		m_simplexSolver->reset();
+		if (status == 0)
+		{
+			//status = 0;
+			//printf("Intersect!\n");
+		}
+
+		if (status == -1)
+		{
+			//printf("not intersect\n");
+		}
+		//printf("dir=%f,%f,%f\n",dir[0],dir[1],dir[2]);
+		if (1)
+		{
+			for (;;)
+			//while (true)
+			{
+				btVector3 separatingAxisInA = (-m_cachedSeparatingAxis) * localTransA.getBasis();
+				btVector3 separatingAxisInB = m_cachedSeparatingAxis * localTransB.getBasis();
+
+				btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInA);
+				btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInB);
+
+				btVector3 pWorld = localTransA(pInA);
+				btVector3 qWorld = localTransB(qInB);
+
+				if (check2d)
+				{
+					pWorld[2] = 0.f;
+					qWorld[2] = 0.f;
+				}
+
+				btVector3 w = pWorld - qWorld;
+				delta = m_cachedSeparatingAxis.dot(w);
+
+				// potential exit, they don't overlap
+				if ((delta > btScalar(0.0)) && (delta * delta > squaredDistance * input.m_maximumDistanceSquared))
+				{
+					m_degenerateSimplex = 10;
+					checkSimplex = true;
+					//checkPenetration = false;
+					break;
+				}
+
+				//exit 0: the new point is already in the simplex, or we didn't come any closer
+				if (m_simplexSolver->inSimplex(w))
+				{
+					m_degenerateSimplex = 1;
+					checkSimplex = true;
+					break;
+				}
+				// are we getting any closer ?
+				btScalar f0 = squaredDistance - delta;
+				btScalar f1 = squaredDistance * REL_ERROR2;
+
+				if (f0 <= f1)
+				{
+					if (f0 <= btScalar(0.))
+					{
+						m_degenerateSimplex = 2;
+					}
+					else
+					{
+						m_degenerateSimplex = 11;
+					}
+					checkSimplex = true;
+					break;
+				}
+
+				//add current vertex to simplex
+				m_simplexSolver->addVertex(w, pWorld, qWorld);
+				btVector3 newCachedSeparatingAxis;
+
+				//calculate the closest point to the origin (update vector v)
+				if (!m_simplexSolver->closest(newCachedSeparatingAxis))
+				{
+					m_degenerateSimplex = 3;
+					checkSimplex = true;
+					break;
+				}
+
+				if (newCachedSeparatingAxis.length2() < REL_ERROR2)
+				{
+					m_cachedSeparatingAxis = newCachedSeparatingAxis;
+					m_degenerateSimplex = 6;
+					checkSimplex = true;
+					break;
+				}
+
+				btScalar previousSquaredDistance = squaredDistance;
+				squaredDistance = newCachedSeparatingAxis.length2();
+#if 0
+				///warning: this termination condition leads to some problems in 2d test case see Bullet/Demos/Box2dDemo
+				if (squaredDistance > previousSquaredDistance)
+				{
+					m_degenerateSimplex = 7;
+					squaredDistance = previousSquaredDistance;
+					checkSimplex = false;
+					break;
+				}
+#endif  //
+
+				//redundant m_simplexSolver->compute_points(pointOnA, pointOnB);
+
+				//are we getting any closer ?
+				if (previousSquaredDistance - squaredDistance <= SIMD_EPSILON * previousSquaredDistance)
+				{
+					//				m_simplexSolver->backup_closest(m_cachedSeparatingAxis);
+					checkSimplex = true;
+					m_degenerateSimplex = 12;
+
+					break;
+				}
+
+				m_cachedSeparatingAxis = newCachedSeparatingAxis;
+
+				//degeneracy, this is typically due to invalid/uninitialized worldtransforms for a btCollisionObject
+				if (m_curIter++ > gGjkMaxIter)
+				{
+#if defined(DEBUG) || defined(_DEBUG)
+
+					printf("btGjkPairDetector maxIter exceeded:%i\n", m_curIter);
+					printf("sepAxis=(%f,%f,%f), squaredDistance = %f, shapeTypeA=%i,shapeTypeB=%i\n",
+						   m_cachedSeparatingAxis.getX(),
+						   m_cachedSeparatingAxis.getY(),
+						   m_cachedSeparatingAxis.getZ(),
+						   squaredDistance,
+						   m_minkowskiA->getShapeType(),
+						   m_minkowskiB->getShapeType());
+
+#endif
+					break;
+				}
+
+				bool check = (!m_simplexSolver->fullSimplex());
+				//bool check = (!m_simplexSolver->fullSimplex() && squaredDistance > SIMD_EPSILON * m_simplexSolver->maxVertex());
+
+				if (!check)
+				{
+					//do we need this backup_closest here ?
+					//				m_simplexSolver->backup_closest(m_cachedSeparatingAxis);
+					m_degenerateSimplex = 13;
+					break;
+				}
+			}
+
+			if (checkSimplex)
+			{
+				m_simplexSolver->compute_points(pointOnA, pointOnB);
+				normalInB = m_cachedSeparatingAxis;
+
+				btScalar lenSqr = m_cachedSeparatingAxis.length2();
+
+				//valid normal
+				if (lenSqr < REL_ERROR2)
+				{
+					m_degenerateSimplex = 5;
+				}
+				if (lenSqr > SIMD_EPSILON * SIMD_EPSILON)
+				{
+					btScalar rlen = btScalar(1.) / btSqrt(lenSqr);
+					normalInB *= rlen;  //normalize
+
+					btScalar s = btSqrt(squaredDistance);
+
+					btAssert(s > btScalar(0.0));
+					pointOnA -= m_cachedSeparatingAxis * (marginA / s);
+					pointOnB += m_cachedSeparatingAxis * (marginB / s);
+					distance = ((btScalar(1.) / rlen) - margin);
+					isValid = true;
+					orgNormalInB = normalInB;
+
+					m_lastUsedMethod = 1;
+				}
+				else
+				{
+					m_lastUsedMethod = 2;
+				}
+			}
+		}
+
+		bool catchDegeneratePenetrationCase =
+			(m_catchDegeneracies && m_penetrationDepthSolver && m_degenerateSimplex && ((distance + margin) < gGjkEpaPenetrationTolerance));
+
+		//if (checkPenetration && !isValid)
+		if ((checkPenetration && (!isValid || catchDegeneratePenetrationCase)) || (status == 0))
+		{
+			//penetration case
+
+			//if there is no way to handle penetrations, bail out
+			if (m_penetrationDepthSolver)
+			{
+				// Penetration depth case.
+				btVector3 tmpPointOnA, tmpPointOnB;
+
+				m_cachedSeparatingAxis.setZero();
+
+				bool isValid2 = m_penetrationDepthSolver->calcPenDepth(
+					*m_simplexSolver,
+					m_minkowskiA, m_minkowskiB,
+					localTransA, localTransB,
+					m_cachedSeparatingAxis, tmpPointOnA, tmpPointOnB,
+					debugDraw);
+
+				if (m_cachedSeparatingAxis.length2())
+				{
+					if (isValid2)
+					{
+						btVector3 tmpNormalInB = tmpPointOnB - tmpPointOnA;
+						btScalar lenSqr = tmpNormalInB.length2();
+						if (lenSqr <= (SIMD_EPSILON * SIMD_EPSILON))
+						{
+							tmpNormalInB = m_cachedSeparatingAxis;
+							lenSqr = m_cachedSeparatingAxis.length2();
+						}
+
+						if (lenSqr > (SIMD_EPSILON * SIMD_EPSILON))
+						{
+							tmpNormalInB /= btSqrt(lenSqr);
+							btScalar distance2 = -(tmpPointOnA - tmpPointOnB).length();
+							m_lastUsedMethod = 3;
+							//only replace valid penetrations when the result is deeper (check)
+							if (!isValid || (distance2 < distance))
+							{
+								distance = distance2;
+								pointOnA = tmpPointOnA;
+								pointOnB = tmpPointOnB;
+								normalInB = tmpNormalInB;
+								isValid = true;
+							}
+							else
+							{
+								m_lastUsedMethod = 8;
+							}
+						}
+						else
+						{
+							m_lastUsedMethod = 9;
+						}
+					}
+					else
+
+					{
+						///this is another degenerate case, where the initial GJK calculation reports a degenerate case
+						///EPA reports no penetration, and the second GJK (using the supporting vector without margin)
+						///reports a valid positive distance. Use the results of the second GJK instead of failing.
+						///thanks to Jacob.Langford for the reproduction case
+						///http://code.google.com/p/bullet/issues/detail?id=250
+
+						if (m_cachedSeparatingAxis.length2() > btScalar(0.))
+						{
+							btScalar distance2 = (tmpPointOnA - tmpPointOnB).length() - margin;
+							//only replace valid distances when the distance is less
+							if (!isValid || (distance2 < distance))
+							{
+								distance = distance2;
+								pointOnA = tmpPointOnA;
+								pointOnB = tmpPointOnB;
+								pointOnA -= m_cachedSeparatingAxis * marginA;
+								pointOnB += m_cachedSeparatingAxis * marginB;
+								normalInB = m_cachedSeparatingAxis;
+								normalInB.normalize();
+
+								isValid = true;
+								m_lastUsedMethod = 6;
+							}
+							else
+							{
+								m_lastUsedMethod = 5;
+							}
+						}
+					}
+				}
+				else
+				{
+					//printf("EPA didn't return a valid value\n");
+				}
+			}
+		}
+	}
+
+	if (isValid && ((distance < 0) || (distance * distance < input.m_maximumDistanceSquared)))
+	{
+		m_cachedSeparatingAxis = normalInB;
+		m_cachedSeparatingDistance = distance;
+		if (1)
+		{
+			///todo: need to track down this EPA penetration solver degeneracy
+			///the penetration solver reports penetration but the contact normal
+			///connecting the contact points is pointing in the opposite direction
+			///until then, detect the issue and revert the normal
+
+			btScalar d2 = 0.f;
+			{
+				btVector3 separatingAxisInA = (-orgNormalInB) * localTransA.getBasis();
+				btVector3 separatingAxisInB = orgNormalInB * localTransB.getBasis();
+
+				btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInA);
+				btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInB);
+
+				btVector3 pWorld = localTransA(pInA);
+				btVector3 qWorld = localTransB(qInB);
+				btVector3 w = pWorld - qWorld;
+				d2 = orgNormalInB.dot(w) - margin;
+			}
+
+			btScalar d1 = 0;
+			{
+				btVector3 separatingAxisInA = (normalInB)*localTransA.getBasis();
+				btVector3 separatingAxisInB = -normalInB * localTransB.getBasis();
+
+				btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInA);
+				btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInB);
+
+				btVector3 pWorld = localTransA(pInA);
+				btVector3 qWorld = localTransB(qInB);
+				btVector3 w = pWorld - qWorld;
+				d1 = (-normalInB).dot(w) - margin;
+			}
+			btScalar d0 = 0.f;
+			{
+				btVector3 separatingAxisInA = (-normalInB) * input.m_transformA.getBasis();
+				btVector3 separatingAxisInB = normalInB * input.m_transformB.getBasis();
+
+				btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInA);
+				btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInB);
+
+				btVector3 pWorld = localTransA(pInA);
+				btVector3 qWorld = localTransB(qInB);
+				btVector3 w = pWorld - qWorld;
+				d0 = normalInB.dot(w) - margin;
+			}
+
+			if (d1 > d0)
+			{
+				m_lastUsedMethod = 10;
+				normalInB *= -1;
+			}
+
+			if (orgNormalInB.length2())
+			{
+				if (d2 > d0 && d2 > d1 && d2 > distance)
+				{
+					normalInB = orgNormalInB;
+					distance = d2;
+				}
+			}
+		}
+
+		output.addContactPoint(
+			normalInB,
+			pointOnB + positionOffset,
+			distance);
+	}
+	else
+	{
+		//printf("invalid gjk query\n");
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
new file mode 100644
index 0000000..eee2f7d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
@@ -0,0 +1,93 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GJK_PAIR_DETECTOR_H
+#define BT_GJK_PAIR_DETECTOR_H
+
+#include "btDiscreteCollisionDetectorInterface.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+
+class btConvexShape;
+#include "btSimplexSolverInterface.h"
+class btConvexPenetrationDepthSolver;
+
+/// btGjkPairDetector uses GJK to implement the btDiscreteCollisionDetectorInterface
+class btGjkPairDetector : public btDiscreteCollisionDetectorInterface
+{
+	btVector3 m_cachedSeparatingAxis;
+	btConvexPenetrationDepthSolver* m_penetrationDepthSolver;
+	btSimplexSolverInterface* m_simplexSolver;
+	const btConvexShape* m_minkowskiA;
+	const btConvexShape* m_minkowskiB;
+	int m_shapeTypeA;
+	int m_shapeTypeB;
+	btScalar m_marginA;
+	btScalar m_marginB;
+
+	bool m_ignoreMargin;
+	btScalar m_cachedSeparatingDistance;
+
+public:
+	//some debugging to fix degeneracy problems
+	int m_lastUsedMethod;
+	int m_curIter;
+	int m_degenerateSimplex;
+	int m_catchDegeneracies;
+	int m_fixContactNormalDirection;
+
+	btGjkPairDetector(const btConvexShape* objectA, const btConvexShape* objectB, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver);
+	btGjkPairDetector(const btConvexShape* objectA, const btConvexShape* objectB, int shapeTypeA, int shapeTypeB, btScalar marginA, btScalar marginB, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver);
+	virtual ~btGjkPairDetector(){};
+
+	virtual void getClosestPoints(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw, bool swapResults = false);
+
+	void getClosestPointsNonVirtual(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw);
+
+	void setMinkowskiA(const btConvexShape* minkA)
+	{
+		m_minkowskiA = minkA;
+	}
+
+	void setMinkowskiB(const btConvexShape* minkB)
+	{
+		m_minkowskiB = minkB;
+	}
+	void setCachedSeparatingAxis(const btVector3& separatingAxis)
+	{
+		m_cachedSeparatingAxis = separatingAxis;
+	}
+
+	const btVector3& getCachedSeparatingAxis() const
+	{
+		return m_cachedSeparatingAxis;
+	}
+	btScalar getCachedSeparatingDistance() const
+	{
+		return m_cachedSeparatingDistance;
+	}
+
+	void setPenetrationDepthSolver(btConvexPenetrationDepthSolver* penetrationDepthSolver)
+	{
+		m_penetrationDepthSolver = penetrationDepthSolver;
+	}
+
+	///don't use setIgnoreMargin, it's for Bullet's internal use
+	void setIgnoreMargin(bool ignoreMargin)
+	{
+		m_ignoreMargin = ignoreMargin;
+	}
+};
+
+#endif  //BT_GJK_PAIR_DETECTOR_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
new file mode 100644
index 0000000..3132328
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
@@ -0,0 +1,182 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MANIFOLD_CONTACT_POINT_H
+#define BT_MANIFOLD_CONTACT_POINT_H
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransformUtil.h"
+
+#ifdef PFX_USE_FREE_VECTORMATH
+#include "physics_effects/base_level/solver/pfx_constraint_row.h"
+typedef sce::PhysicsEffects::PfxConstraintRow btConstraintRow;
+#else
+// Don't change following order of parameters
+ATTRIBUTE_ALIGNED16(struct)
+btConstraintRow
+{
+	btScalar m_normal[3];
+	btScalar m_rhs;
+	btScalar m_jacDiagInv;
+	btScalar m_lowerLimit;
+	btScalar m_upperLimit;
+	btScalar m_accumImpulse;
+};
+typedef btConstraintRow PfxConstraintRow;
+#endif  //PFX_USE_FREE_VECTORMATH
+
+enum btContactPointFlags
+{
+	BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED = 1,
+	BT_CONTACT_FLAG_HAS_CONTACT_CFM = 2,
+	BT_CONTACT_FLAG_HAS_CONTACT_ERP = 4,
+	BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING = 8,
+	BT_CONTACT_FLAG_FRICTION_ANCHOR = 16,
+};
+
+/// ManifoldContactPoint collects and maintains persistent contactpoints.
+/// used to improve stability and performance of rigidbody dynamics response.
+class btManifoldPoint
+{
+public:
+	btManifoldPoint()
+		: m_userPersistentData(0),
+		  m_contactPointFlags(0),
+		  m_appliedImpulse(0.f),
+		  m_prevRHS(0.f),
+		  m_appliedImpulseLateral1(0.f),
+		  m_appliedImpulseLateral2(0.f),
+		  m_contactMotion1(0.f),
+		  m_contactMotion2(0.f),
+		  m_contactCFM(0.f),
+		  m_contactERP(0.f),
+		  m_frictionCFM(0.f),
+		  m_lifeTime(0)
+	{
+	}
+
+	btManifoldPoint(const btVector3& pointA, const btVector3& pointB,
+					const btVector3& normal,
+					btScalar distance) : m_localPointA(pointA),
+										 m_localPointB(pointB),
+										 m_positionWorldOnB(0,0,0),
+										 m_positionWorldOnA(0,0,0),
+										 m_normalWorldOnB(normal),
+										 m_distance1(distance),
+										 m_combinedFriction(btScalar(0.)),
+										 m_combinedRollingFriction(btScalar(0.)),
+										 m_combinedSpinningFriction(btScalar(0.)),
+										 m_combinedRestitution(btScalar(0.)),
+										 m_partId0(-1),
+										 m_partId1(-1),
+										 m_index0(-1),
+										 m_index1(-1),
+										 m_userPersistentData(0),
+										 m_contactPointFlags(0),
+										 m_appliedImpulse(0.f),
+										 m_prevRHS(0.f),
+										 m_appliedImpulseLateral1(0.f),
+										 m_appliedImpulseLateral2(0.f),
+										 m_contactMotion1(0.f),
+										 m_contactMotion2(0.f),
+										 m_contactCFM(0.f),
+										 m_contactERP(0.f),
+										 m_frictionCFM(0.f),
+										 m_lifeTime(0),
+										 m_lateralFrictionDir1(0,0,0),
+										 m_lateralFrictionDir2(0,0,0)
+	{
+	}
+
+	btVector3 m_localPointA;
+	btVector3 m_localPointB;
+	btVector3 m_positionWorldOnB;
+	///m_positionWorldOnA is redundant information, see getPositionWorldOnA(), but for clarity
+	btVector3 m_positionWorldOnA;
+	btVector3 m_normalWorldOnB;
+
+	btScalar m_distance1;
+	btScalar m_combinedFriction;
+	btScalar m_combinedRollingFriction;   //torsional friction orthogonal to contact normal, useful to make spheres stop rolling forever
+	btScalar m_combinedSpinningFriction;  //torsional friction around contact normal, useful for grasping objects
+	btScalar m_combinedRestitution;
+
+	//BP mod, store contact triangles.
+	int m_partId0;
+	int m_partId1;
+	int m_index0;
+	int m_index1;
+
+	mutable void* m_userPersistentData;
+	//bool			m_lateralFrictionInitialized;
+	int m_contactPointFlags;
+
+	btScalar m_appliedImpulse;
+	btScalar m_prevRHS;
+	btScalar m_appliedImpulseLateral1;
+	btScalar m_appliedImpulseLateral2;
+	btScalar m_contactMotion1;
+	btScalar m_contactMotion2;
+
+	union {
+		btScalar m_contactCFM;
+		btScalar m_combinedContactStiffness1;
+	};
+
+	union {
+		btScalar m_contactERP;
+		btScalar m_combinedContactDamping1;
+	};
+
+	btScalar m_frictionCFM;
+
+	int m_lifeTime;  //lifetime of the contactpoint in frames
+
+	btVector3 m_lateralFrictionDir1;
+	btVector3 m_lateralFrictionDir2;
+
+	btScalar getDistance() const
+	{
+		return m_distance1;
+	}
+	int getLifeTime() const
+	{
+		return m_lifeTime;
+	}
+
+	const btVector3& getPositionWorldOnA() const
+	{
+		return m_positionWorldOnA;
+		//				return m_positionWorldOnB + m_normalWorldOnB * m_distance1;
+	}
+
+	const btVector3& getPositionWorldOnB() const
+	{
+		return m_positionWorldOnB;
+	}
+
+	void setDistance(btScalar dist)
+	{
+		m_distance1 = dist;
+	}
+
+	///this returns the most recent applied impulse, to satisfy contact constraints by the constraint solver
+	btScalar getAppliedImpulse() const
+	{
+		return m_appliedImpulse;
+	}
+};
+
+#endif  //BT_MANIFOLD_CONTACT_POINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
new file mode 100644
index 0000000..dcb2980
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
@@ -0,0 +1,336 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btMinkowskiPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+
+#define NUM_UNITSPHERE_POINTS 42
+
+bool btMinkowskiPenetrationDepthSolver::calcPenDepth(btSimplexSolverInterface& simplexSolver,
+													 const btConvexShape* convexA, const btConvexShape* convexB,
+													 const btTransform& transA, const btTransform& transB,
+													 btVector3& v, btVector3& pa, btVector3& pb,
+													 class btIDebugDraw* debugDraw)
+{
+	(void)v;
+
+	bool check2d = convexA->isConvex2d() && convexB->isConvex2d();
+
+	struct btIntermediateResult : public btDiscreteCollisionDetectorInterface::Result
+	{
+		btIntermediateResult() : m_hasResult(false)
+		{
+		}
+
+		btVector3 m_normalOnBInWorld;
+		btVector3 m_pointInWorld;
+		btScalar m_depth;
+		bool m_hasResult;
+
+		virtual void setShapeIdentifiersA(int partId0, int index0)
+		{
+			(void)partId0;
+			(void)index0;
+		}
+		virtual void setShapeIdentifiersB(int partId1, int index1)
+		{
+			(void)partId1;
+			(void)index1;
+		}
+		void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth)
+		{
+			m_normalOnBInWorld = normalOnBInWorld;
+			m_pointInWorld = pointInWorld;
+			m_depth = depth;
+			m_hasResult = true;
+		}
+	};
+
+	//just take fixed number of orientation, and sample the penetration depth in that direction
+	btScalar minProj = btScalar(BT_LARGE_FLOAT);
+	btVector3 minNorm(btScalar(0.), btScalar(0.), btScalar(0.));
+	btVector3 minA, minB;
+	btVector3 separatingAxisInA, separatingAxisInB;
+	btVector3 pInA, qInB, pWorld, qWorld, w;
+
+#ifndef __SPU__
+#define USE_BATCHED_SUPPORT 1
+#endif
+#ifdef USE_BATCHED_SUPPORT
+
+	btVector3 supportVerticesABatch[NUM_UNITSPHERE_POINTS + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2];
+	btVector3 supportVerticesBBatch[NUM_UNITSPHERE_POINTS + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2];
+	btVector3 separatingAxisInABatch[NUM_UNITSPHERE_POINTS + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2];
+	btVector3 separatingAxisInBBatch[NUM_UNITSPHERE_POINTS + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2];
+	int i;
+
+	int numSampleDirections = NUM_UNITSPHERE_POINTS;
+
+	for (i = 0; i < numSampleDirections; i++)
+	{
+		btVector3 norm = getPenetrationDirections()[i];
+		separatingAxisInABatch[i] = (-norm) * transA.getBasis();
+		separatingAxisInBBatch[i] = norm * transB.getBasis();
+	}
+
+	{
+		int numPDA = convexA->getNumPreferredPenetrationDirections();
+		if (numPDA)
+		{
+			for (int i = 0; i < numPDA; i++)
+			{
+				btVector3 norm;
+				convexA->getPreferredPenetrationDirection(i, norm);
+				norm = transA.getBasis() * norm;
+				getPenetrationDirections()[numSampleDirections] = norm;
+				separatingAxisInABatch[numSampleDirections] = (-norm) * transA.getBasis();
+				separatingAxisInBBatch[numSampleDirections] = norm * transB.getBasis();
+				numSampleDirections++;
+			}
+		}
+	}
+
+	{
+		int numPDB = convexB->getNumPreferredPenetrationDirections();
+		if (numPDB)
+		{
+			for (int i = 0; i < numPDB; i++)
+			{
+				btVector3 norm;
+				convexB->getPreferredPenetrationDirection(i, norm);
+				norm = transB.getBasis() * norm;
+				getPenetrationDirections()[numSampleDirections] = norm;
+				separatingAxisInABatch[numSampleDirections] = (-norm) * transA.getBasis();
+				separatingAxisInBBatch[numSampleDirections] = norm * transB.getBasis();
+				numSampleDirections++;
+			}
+		}
+	}
+
+	convexA->batchedUnitVectorGetSupportingVertexWithoutMargin(separatingAxisInABatch, supportVerticesABatch, numSampleDirections);
+	convexB->batchedUnitVectorGetSupportingVertexWithoutMargin(separatingAxisInBBatch, supportVerticesBBatch, numSampleDirections);
+
+	for (i = 0; i < numSampleDirections; i++)
+	{
+		btVector3 norm = getPenetrationDirections()[i];
+		if (check2d)
+		{
+			norm[2] = 0.f;
+		}
+		if (norm.length2() > 0.01)
+		{
+			separatingAxisInA = separatingAxisInABatch[i];
+			separatingAxisInB = separatingAxisInBBatch[i];
+
+			pInA = supportVerticesABatch[i];
+			qInB = supportVerticesBBatch[i];
+
+			pWorld = transA(pInA);
+			qWorld = transB(qInB);
+			if (check2d)
+			{
+				pWorld[2] = 0.f;
+				qWorld[2] = 0.f;
+			}
+
+			w = qWorld - pWorld;
+			btScalar delta = norm.dot(w);
+			//find smallest delta
+			if (delta < minProj)
+			{
+				minProj = delta;
+				minNorm = norm;
+				minA = pWorld;
+				minB = qWorld;
+			}
+		}
+	}
+#else
+
+	int numSampleDirections = NUM_UNITSPHERE_POINTS;
+
+#ifndef __SPU__
+	{
+		int numPDA = convexA->getNumPreferredPenetrationDirections();
+		if (numPDA)
+		{
+			for (int i = 0; i < numPDA; i++)
+			{
+				btVector3 norm;
+				convexA->getPreferredPenetrationDirection(i, norm);
+				norm = transA.getBasis() * norm;
+				getPenetrationDirections()[numSampleDirections] = norm;
+				numSampleDirections++;
+			}
+		}
+	}
+
+	{
+		int numPDB = convexB->getNumPreferredPenetrationDirections();
+		if (numPDB)
+		{
+			for (int i = 0; i < numPDB; i++)
+			{
+				btVector3 norm;
+				convexB->getPreferredPenetrationDirection(i, norm);
+				norm = transB.getBasis() * norm;
+				getPenetrationDirections()[numSampleDirections] = norm;
+				numSampleDirections++;
+			}
+		}
+	}
+#endif  // __SPU__
+
+	for (int i = 0; i < numSampleDirections; i++)
+	{
+		const btVector3& norm = getPenetrationDirections()[i];
+		separatingAxisInA = (-norm) * transA.getBasis();
+		separatingAxisInB = norm * transB.getBasis();
+		pInA = convexA->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInA);
+		qInB = convexB->localGetSupportVertexWithoutMarginNonVirtual(separatingAxisInB);
+		pWorld = transA(pInA);
+		qWorld = transB(qInB);
+		w = qWorld - pWorld;
+		btScalar delta = norm.dot(w);
+		//find smallest delta
+		if (delta < minProj)
+		{
+			minProj = delta;
+			minNorm = norm;
+			minA = pWorld;
+			minB = qWorld;
+		}
+	}
+#endif  //USE_BATCHED_SUPPORT
+
+	//add the margins
+
+	minA += minNorm * convexA->getMarginNonVirtual();
+	minB -= minNorm * convexB->getMarginNonVirtual();
+	//no penetration
+	if (minProj < btScalar(0.))
+		return false;
+
+	btScalar extraSeparation = 0.5f;  ///scale dependent
+	minProj += extraSeparation + (convexA->getMarginNonVirtual() + convexB->getMarginNonVirtual());
+
+//#define DEBUG_DRAW 1
+#ifdef DEBUG_DRAW
+	if (debugDraw)
+	{
+		btVector3 color(0, 1, 0);
+		debugDraw->drawLine(minA, minB, color);
+		color = btVector3(1, 1, 1);
+		btVector3 vec = minB - minA;
+		btScalar prj2 = minNorm.dot(vec);
+		debugDraw->drawLine(minA, minA + (minNorm * minProj), color);
+	}
+#endif  //DEBUG_DRAW
+
+	btGjkPairDetector gjkdet(convexA, convexB, &simplexSolver, 0);
+
+	btScalar offsetDist = minProj;
+	btVector3 offset = minNorm * offsetDist;
+
+	btGjkPairDetector::ClosestPointInput input;
+
+	btVector3 newOrg = transA.getOrigin() + offset;
+
+	btTransform displacedTrans = transA;
+	displacedTrans.setOrigin(newOrg);
+
+	input.m_transformA = displacedTrans;
+	input.m_transformB = transB;
+	input.m_maximumDistanceSquared = btScalar(BT_LARGE_FLOAT);  //minProj;
+
+	btIntermediateResult res;
+	gjkdet.setCachedSeparatingAxis(-minNorm);
+	gjkdet.getClosestPoints(input, res, debugDraw);
+
+	btScalar correctedMinNorm = minProj - res.m_depth;
+
+	//the penetration depth is over-estimated, relax it
+	btScalar penetration_relaxation = btScalar(1.);
+	minNorm *= penetration_relaxation;
+
+	if (res.m_hasResult)
+	{
+		pa = res.m_pointInWorld - minNorm * correctedMinNorm;
+		pb = res.m_pointInWorld;
+		v = minNorm;
+
+#ifdef DEBUG_DRAW
+		if (debugDraw)
+		{
+			btVector3 color(1, 0, 0);
+			debugDraw->drawLine(pa, pb, color);
+		}
+#endif  //DEBUG_DRAW
+	}
+	return res.m_hasResult;
+}
+
+btVector3* btMinkowskiPenetrationDepthSolver::getPenetrationDirections()
+{
+	static btVector3 sPenetrationDirections[NUM_UNITSPHERE_POINTS + MAX_PREFERRED_PENETRATION_DIRECTIONS * 2] =
+		{
+			btVector3(btScalar(0.000000), btScalar(-0.000000), btScalar(-1.000000)),
+			btVector3(btScalar(0.723608), btScalar(-0.525725), btScalar(-0.447219)),
+			btVector3(btScalar(-0.276388), btScalar(-0.850649), btScalar(-0.447219)),
+			btVector3(btScalar(-0.894426), btScalar(-0.000000), btScalar(-0.447216)),
+			btVector3(btScalar(-0.276388), btScalar(0.850649), btScalar(-0.447220)),
+			btVector3(btScalar(0.723608), btScalar(0.525725), btScalar(-0.447219)),
+			btVector3(btScalar(0.276388), btScalar(-0.850649), btScalar(0.447220)),
+			btVector3(btScalar(-0.723608), btScalar(-0.525725), btScalar(0.447219)),
+			btVector3(btScalar(-0.723608), btScalar(0.525725), btScalar(0.447219)),
+			btVector3(btScalar(0.276388), btScalar(0.850649), btScalar(0.447219)),
+			btVector3(btScalar(0.894426), btScalar(0.000000), btScalar(0.447216)),
+			btVector3(btScalar(-0.000000), btScalar(0.000000), btScalar(1.000000)),
+			btVector3(btScalar(0.425323), btScalar(-0.309011), btScalar(-0.850654)),
+			btVector3(btScalar(-0.162456), btScalar(-0.499995), btScalar(-0.850654)),
+			btVector3(btScalar(0.262869), btScalar(-0.809012), btScalar(-0.525738)),
+			btVector3(btScalar(0.425323), btScalar(0.309011), btScalar(-0.850654)),
+			btVector3(btScalar(0.850648), btScalar(-0.000000), btScalar(-0.525736)),
+			btVector3(btScalar(-0.525730), btScalar(-0.000000), btScalar(-0.850652)),
+			btVector3(btScalar(-0.688190), btScalar(-0.499997), btScalar(-0.525736)),
+			btVector3(btScalar(-0.162456), btScalar(0.499995), btScalar(-0.850654)),
+			btVector3(btScalar(-0.688190), btScalar(0.499997), btScalar(-0.525736)),
+			btVector3(btScalar(0.262869), btScalar(0.809012), btScalar(-0.525738)),
+			btVector3(btScalar(0.951058), btScalar(0.309013), btScalar(0.000000)),
+			btVector3(btScalar(0.951058), btScalar(-0.309013), btScalar(0.000000)),
+			btVector3(btScalar(0.587786), btScalar(-0.809017), btScalar(0.000000)),
+			btVector3(btScalar(0.000000), btScalar(-1.000000), btScalar(0.000000)),
+			btVector3(btScalar(-0.587786), btScalar(-0.809017), btScalar(0.000000)),
+			btVector3(btScalar(-0.951058), btScalar(-0.309013), btScalar(-0.000000)),
+			btVector3(btScalar(-0.951058), btScalar(0.309013), btScalar(-0.000000)),
+			btVector3(btScalar(-0.587786), btScalar(0.809017), btScalar(-0.000000)),
+			btVector3(btScalar(-0.000000), btScalar(1.000000), btScalar(-0.000000)),
+			btVector3(btScalar(0.587786), btScalar(0.809017), btScalar(-0.000000)),
+			btVector3(btScalar(0.688190), btScalar(-0.499997), btScalar(0.525736)),
+			btVector3(btScalar(-0.262869), btScalar(-0.809012), btScalar(0.525738)),
+			btVector3(btScalar(-0.850648), btScalar(0.000000), btScalar(0.525736)),
+			btVector3(btScalar(-0.262869), btScalar(0.809012), btScalar(0.525738)),
+			btVector3(btScalar(0.688190), btScalar(0.499997), btScalar(0.525736)),
+			btVector3(btScalar(0.525730), btScalar(0.000000), btScalar(0.850652)),
+			btVector3(btScalar(0.162456), btScalar(-0.499995), btScalar(0.850654)),
+			btVector3(btScalar(-0.425323), btScalar(-0.309011), btScalar(0.850654)),
+			btVector3(btScalar(-0.425323), btScalar(0.309011), btScalar(0.850654)),
+			btVector3(btScalar(0.162456), btScalar(0.499995), btScalar(0.850654))};
+
+	return sPenetrationDirections;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
new file mode 100644
index 0000000..2ad663b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
@@ -0,0 +1,36 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
+#define BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
+
+#include "btConvexPenetrationDepthSolver.h"
+
+///MinkowskiPenetrationDepthSolver implements bruteforce penetration depth estimation.
+///Implementation is based on sampling the depth using support mapping, and using GJK step to get the witness points.
+class btMinkowskiPenetrationDepthSolver : public btConvexPenetrationDepthSolver
+{
+protected:
+	static btVector3* getPenetrationDirections();
+
+public:
+	virtual bool calcPenDepth(btSimplexSolverInterface& simplexSolver,
+							  const btConvexShape* convexA, const btConvexShape* convexB,
+							  const btTransform& transA, const btTransform& transB,
+							  btVector3& v, btVector3& pa, btVector3& pb,
+							  class btIDebugDraw* debugDraw);
+};
+
+#endif  //BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h
new file mode 100644
index 0000000..534a66d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h
@@ -0,0 +1,884 @@
+
+/***
+ * ---------------------------------
+ * Copyright (c)2012 Daniel Fiser <danfis@danfis.cz>
+ *
+ *  This file was ported from mpr.c file, part of libccd.
+ *  The Minkoski Portal Refinement implementation was ported 
+ *  to OpenCL by Erwin Coumans for the Bullet 3 Physics library.
+ *  The original MPR idea and implementation is by Gary Snethen
+ *  in XenoCollide, see http://github.com/erwincoumans/xenocollide
+ *
+ *  Distributed under the OSI-approved BSD License (the "License");
+ *  see <http://www.opensource.org/licenses/bsd-license.php>.
+ *  This software is distributed WITHOUT ANY WARRANTY; without even the
+ *  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the License for more information.
+ */
+
+///2014 Oct, Erwin Coumans, Use templates to avoid void* casts
+
+#ifndef BT_MPR_PENETRATION_H
+#define BT_MPR_PENETRATION_H
+
+#define BT_DEBUG_MPR1
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+//#define MPR_AVERAGE_CONTACT_POSITIONS
+
+struct btMprCollisionDescription
+{
+	btVector3 m_firstDir;
+	int m_maxGjkIterations;
+	btScalar m_maximumDistanceSquared;
+	btScalar m_gjkRelError2;
+
+	btMprCollisionDescription()
+		: m_firstDir(0, 1, 0),
+		  m_maxGjkIterations(1000),
+		  m_maximumDistanceSquared(1e30f),
+		  m_gjkRelError2(1.0e-6)
+	{
+	}
+	virtual ~btMprCollisionDescription()
+	{
+	}
+};
+
+struct btMprDistanceInfo
+{
+	btVector3 m_pointOnA;
+	btVector3 m_pointOnB;
+	btVector3 m_normalBtoA;
+	btScalar m_distance;
+};
+
+#ifdef __cplusplus
+#define BT_MPR_SQRT sqrtf
+#else
+#define BT_MPR_SQRT sqrt
+#endif
+#define BT_MPR_FMIN(x, y) ((x) < (y) ? (x) : (y))
+#define BT_MPR_FABS fabs
+
+#define BT_MPR_TOLERANCE 1E-6f
+#define BT_MPR_MAX_ITERATIONS 1000
+
+struct _btMprSupport_t
+{
+	btVector3 v;   //!< Support point in minkowski sum
+	btVector3 v1;  //!< Support point in obj1
+	btVector3 v2;  //!< Support point in obj2
+};
+typedef struct _btMprSupport_t btMprSupport_t;
+
+struct _btMprSimplex_t
+{
+	btMprSupport_t ps[4];
+	int last;  //!< index of last added point
+};
+typedef struct _btMprSimplex_t btMprSimplex_t;
+
+inline btMprSupport_t *btMprSimplexPointW(btMprSimplex_t *s, int idx)
+{
+	return &s->ps[idx];
+}
+
+inline void btMprSimplexSetSize(btMprSimplex_t *s, int size)
+{
+	s->last = size - 1;
+}
+
+#ifdef DEBUG_MPR
+inline void btPrintPortalVertex(_btMprSimplex_t *portal, int index)
+{
+	printf("portal[%d].v = %f,%f,%f, v1=%f,%f,%f, v2=%f,%f,%f\n", index, portal->ps[index].v.x(), portal->ps[index].v.y(), portal->ps[index].v.z(),
+		   portal->ps[index].v1.x(), portal->ps[index].v1.y(), portal->ps[index].v1.z(),
+		   portal->ps[index].v2.x(), portal->ps[index].v2.y(), portal->ps[index].v2.z());
+}
+#endif  //DEBUG_MPR
+
+inline int btMprSimplexSize(const btMprSimplex_t *s)
+{
+	return s->last + 1;
+}
+
+inline const btMprSupport_t *btMprSimplexPoint(const btMprSimplex_t *s, int idx)
+{
+	// here is no check on boundaries
+	return &s->ps[idx];
+}
+
+inline void btMprSupportCopy(btMprSupport_t *d, const btMprSupport_t *s)
+{
+	*d = *s;
+}
+
+inline void btMprSimplexSet(btMprSimplex_t *s, size_t pos, const btMprSupport_t *a)
+{
+	btMprSupportCopy(s->ps + pos, a);
+}
+
+inline void btMprSimplexSwap(btMprSimplex_t *s, size_t pos1, size_t pos2)
+{
+	btMprSupport_t supp;
+
+	btMprSupportCopy(&supp, &s->ps[pos1]);
+	btMprSupportCopy(&s->ps[pos1], &s->ps[pos2]);
+	btMprSupportCopy(&s->ps[pos2], &supp);
+}
+
+inline int btMprIsZero(float val)
+{
+	return BT_MPR_FABS(val) < FLT_EPSILON;
+}
+
+inline int btMprEq(float _a, float _b)
+{
+	float ab;
+	float a, b;
+
+	ab = BT_MPR_FABS(_a - _b);
+	if (BT_MPR_FABS(ab) < FLT_EPSILON)
+		return 1;
+
+	a = BT_MPR_FABS(_a);
+	b = BT_MPR_FABS(_b);
+	if (b > a)
+	{
+		return ab < FLT_EPSILON * b;
+	}
+	else
+	{
+		return ab < FLT_EPSILON * a;
+	}
+}
+
+inline int btMprVec3Eq(const btVector3 *a, const btVector3 *b)
+{
+	return btMprEq((*a).x(), (*b).x()) && btMprEq((*a).y(), (*b).y()) && btMprEq((*a).z(), (*b).z());
+}
+
+template <typename btConvexTemplate>
+inline void btFindOrigin(const btConvexTemplate &a, const btConvexTemplate &b, const btMprCollisionDescription &colDesc, btMprSupport_t *center)
+{
+	center->v1 = a.getObjectCenterInWorld();
+	center->v2 = b.getObjectCenterInWorld();
+	center->v = center->v1 - center->v2;
+}
+
+inline void btMprVec3Set(btVector3 *v, float x, float y, float z)
+{
+	v->setValue(x, y, z);
+}
+
+inline void btMprVec3Add(btVector3 *v, const btVector3 *w)
+{
+	*v += *w;
+}
+
+inline void btMprVec3Copy(btVector3 *v, const btVector3 *w)
+{
+	*v = *w;
+}
+
+inline void btMprVec3Scale(btVector3 *d, float k)
+{
+	*d *= k;
+}
+
+inline float btMprVec3Dot(const btVector3 *a, const btVector3 *b)
+{
+	float dot;
+
+	dot = btDot(*a, *b);
+	return dot;
+}
+
+inline float btMprVec3Len2(const btVector3 *v)
+{
+	return btMprVec3Dot(v, v);
+}
+
+inline void btMprVec3Normalize(btVector3 *d)
+{
+	float k = 1.f / BT_MPR_SQRT(btMprVec3Len2(d));
+	btMprVec3Scale(d, k);
+}
+
+inline void btMprVec3Cross(btVector3 *d, const btVector3 *a, const btVector3 *b)
+{
+	*d = btCross(*a, *b);
+}
+
+inline void btMprVec3Sub2(btVector3 *d, const btVector3 *v, const btVector3 *w)
+{
+	*d = *v - *w;
+}
+
+inline void btPortalDir(const btMprSimplex_t *portal, btVector3 *dir)
+{
+	btVector3 v2v1, v3v1;
+
+	btMprVec3Sub2(&v2v1, &btMprSimplexPoint(portal, 2)->v,
+				  &btMprSimplexPoint(portal, 1)->v);
+	btMprVec3Sub2(&v3v1, &btMprSimplexPoint(portal, 3)->v,
+				  &btMprSimplexPoint(portal, 1)->v);
+	btMprVec3Cross(dir, &v2v1, &v3v1);
+	btMprVec3Normalize(dir);
+}
+
+inline int portalEncapsulesOrigin(const btMprSimplex_t *portal,
+								  const btVector3 *dir)
+{
+	float dot;
+	dot = btMprVec3Dot(dir, &btMprSimplexPoint(portal, 1)->v);
+	return btMprIsZero(dot) || dot > 0.f;
+}
+
+inline int portalReachTolerance(const btMprSimplex_t *portal,
+								const btMprSupport_t *v4,
+								const btVector3 *dir)
+{
+	float dv1, dv2, dv3, dv4;
+	float dot1, dot2, dot3;
+
+	// find the smallest dot product of dir and {v1-v4, v2-v4, v3-v4}
+
+	dv1 = btMprVec3Dot(&btMprSimplexPoint(portal, 1)->v, dir);
+	dv2 = btMprVec3Dot(&btMprSimplexPoint(portal, 2)->v, dir);
+	dv3 = btMprVec3Dot(&btMprSimplexPoint(portal, 3)->v, dir);
+	dv4 = btMprVec3Dot(&v4->v, dir);
+
+	dot1 = dv4 - dv1;
+	dot2 = dv4 - dv2;
+	dot3 = dv4 - dv3;
+
+	dot1 = BT_MPR_FMIN(dot1, dot2);
+	dot1 = BT_MPR_FMIN(dot1, dot3);
+
+	return btMprEq(dot1, BT_MPR_TOLERANCE) || dot1 < BT_MPR_TOLERANCE;
+}
+
+inline int portalCanEncapsuleOrigin(const btMprSimplex_t *portal,
+									const btMprSupport_t *v4,
+									const btVector3 *dir)
+{
+	float dot;
+	dot = btMprVec3Dot(&v4->v, dir);
+	return btMprIsZero(dot) || dot > 0.f;
+}
+
+inline void btExpandPortal(btMprSimplex_t *portal,
+						   const btMprSupport_t *v4)
+{
+	float dot;
+	btVector3 v4v0;
+
+	btMprVec3Cross(&v4v0, &v4->v, &btMprSimplexPoint(portal, 0)->v);
+	dot = btMprVec3Dot(&btMprSimplexPoint(portal, 1)->v, &v4v0);
+	if (dot > 0.f)
+	{
+		dot = btMprVec3Dot(&btMprSimplexPoint(portal, 2)->v, &v4v0);
+		if (dot > 0.f)
+		{
+			btMprSimplexSet(portal, 1, v4);
+		}
+		else
+		{
+			btMprSimplexSet(portal, 3, v4);
+		}
+	}
+	else
+	{
+		dot = btMprVec3Dot(&btMprSimplexPoint(portal, 3)->v, &v4v0);
+		if (dot > 0.f)
+		{
+			btMprSimplexSet(portal, 2, v4);
+		}
+		else
+		{
+			btMprSimplexSet(portal, 1, v4);
+		}
+	}
+}
+template <typename btConvexTemplate>
+inline void btMprSupport(const btConvexTemplate &a, const btConvexTemplate &b,
+						 const btMprCollisionDescription &colDesc,
+						 const btVector3 &dir, btMprSupport_t *supp)
+{
+	btVector3 separatingAxisInA = dir * a.getWorldTransform().getBasis();
+	btVector3 separatingAxisInB = -dir * b.getWorldTransform().getBasis();
+
+	btVector3 pInA = a.getLocalSupportWithMargin(separatingAxisInA);
+	btVector3 qInB = b.getLocalSupportWithMargin(separatingAxisInB);
+
+	supp->v1 = a.getWorldTransform()(pInA);
+	supp->v2 = b.getWorldTransform()(qInB);
+	supp->v = supp->v1 - supp->v2;
+}
+
+template <typename btConvexTemplate>
+static int btDiscoverPortal(const btConvexTemplate &a, const btConvexTemplate &b,
+							const btMprCollisionDescription &colDesc,
+							btMprSimplex_t *portal)
+{
+	btVector3 dir, va, vb;
+	float dot;
+	int cont;
+
+	// vertex 0 is center of portal
+	btFindOrigin(a, b, colDesc, btMprSimplexPointW(portal, 0));
+
+	// vertex 0 is center of portal
+	btMprSimplexSetSize(portal, 1);
+
+	btVector3 zero = btVector3(0, 0, 0);
+	btVector3 *org = &zero;
+
+	if (btMprVec3Eq(&btMprSimplexPoint(portal, 0)->v, org))
+	{
+		// Portal's center lies on origin (0,0,0) => we know that objects
+		// intersect but we would need to know penetration info.
+		// So move center little bit...
+		btMprVec3Set(&va, FLT_EPSILON * 10.f, 0.f, 0.f);
+		btMprVec3Add(&btMprSimplexPointW(portal, 0)->v, &va);
+	}
+
+	// vertex 1 = support in direction of origin
+	btMprVec3Copy(&dir, &btMprSimplexPoint(portal, 0)->v);
+	btMprVec3Scale(&dir, -1.f);
+	btMprVec3Normalize(&dir);
+
+	btMprSupport(a, b, colDesc, dir, btMprSimplexPointW(portal, 1));
+
+	btMprSimplexSetSize(portal, 2);
+
+	// test if origin isn't outside of v1
+	dot = btMprVec3Dot(&btMprSimplexPoint(portal, 1)->v, &dir);
+
+	if (btMprIsZero(dot) || dot < 0.f)
+		return -1;
+
+	// vertex 2
+	btMprVec3Cross(&dir, &btMprSimplexPoint(portal, 0)->v,
+				   &btMprSimplexPoint(portal, 1)->v);
+	if (btMprIsZero(btMprVec3Len2(&dir)))
+	{
+		if (btMprVec3Eq(&btMprSimplexPoint(portal, 1)->v, org))
+		{
+			// origin lies on v1
+			return 1;
+		}
+		else
+		{
+			// origin lies on v0-v1 segment
+			return 2;
+		}
+	}
+
+	btMprVec3Normalize(&dir);
+	btMprSupport(a, b, colDesc, dir, btMprSimplexPointW(portal, 2));
+
+	dot = btMprVec3Dot(&btMprSimplexPoint(portal, 2)->v, &dir);
+	if (btMprIsZero(dot) || dot < 0.f)
+		return -1;
+
+	btMprSimplexSetSize(portal, 3);
+
+	// vertex 3 direction
+	btMprVec3Sub2(&va, &btMprSimplexPoint(portal, 1)->v,
+				  &btMprSimplexPoint(portal, 0)->v);
+	btMprVec3Sub2(&vb, &btMprSimplexPoint(portal, 2)->v,
+				  &btMprSimplexPoint(portal, 0)->v);
+	btMprVec3Cross(&dir, &va, &vb);
+	btMprVec3Normalize(&dir);
+
+	// it is better to form portal faces to be oriented "outside" origin
+	dot = btMprVec3Dot(&dir, &btMprSimplexPoint(portal, 0)->v);
+	if (dot > 0.f)
+	{
+		btMprSimplexSwap(portal, 1, 2);
+		btMprVec3Scale(&dir, -1.f);
+	}
+
+	while (btMprSimplexSize(portal) < 4)
+	{
+		btMprSupport(a, b, colDesc, dir, btMprSimplexPointW(portal, 3));
+
+		dot = btMprVec3Dot(&btMprSimplexPoint(portal, 3)->v, &dir);
+		if (btMprIsZero(dot) || dot < 0.f)
+			return -1;
+
+		cont = 0;
+
+		// test if origin is outside (v1, v0, v3) - set v2 as v3 and
+		// continue
+		btMprVec3Cross(&va, &btMprSimplexPoint(portal, 1)->v,
+					   &btMprSimplexPoint(portal, 3)->v);
+		dot = btMprVec3Dot(&va, &btMprSimplexPoint(portal, 0)->v);
+		if (dot < 0.f && !btMprIsZero(dot))
+		{
+			btMprSimplexSet(portal, 2, btMprSimplexPoint(portal, 3));
+			cont = 1;
+		}
+
+		if (!cont)
+		{
+			// test if origin is outside (v3, v0, v2) - set v1 as v3 and
+			// continue
+			btMprVec3Cross(&va, &btMprSimplexPoint(portal, 3)->v,
+						   &btMprSimplexPoint(portal, 2)->v);
+			dot = btMprVec3Dot(&va, &btMprSimplexPoint(portal, 0)->v);
+			if (dot < 0.f && !btMprIsZero(dot))
+			{
+				btMprSimplexSet(portal, 1, btMprSimplexPoint(portal, 3));
+				cont = 1;
+			}
+		}
+
+		if (cont)
+		{
+			btMprVec3Sub2(&va, &btMprSimplexPoint(portal, 1)->v,
+						  &btMprSimplexPoint(portal, 0)->v);
+			btMprVec3Sub2(&vb, &btMprSimplexPoint(portal, 2)->v,
+						  &btMprSimplexPoint(portal, 0)->v);
+			btMprVec3Cross(&dir, &va, &vb);
+			btMprVec3Normalize(&dir);
+		}
+		else
+		{
+			btMprSimplexSetSize(portal, 4);
+		}
+	}
+
+	return 0;
+}
+
+template <typename btConvexTemplate>
+static int btRefinePortal(const btConvexTemplate &a, const btConvexTemplate &b, const btMprCollisionDescription &colDesc,
+						  btMprSimplex_t *portal)
+{
+	btVector3 dir;
+	btMprSupport_t v4;
+
+	for (int i = 0; i < BT_MPR_MAX_ITERATIONS; i++)
+	//while (1)
+	{
+		// compute direction outside the portal (from v0 through v1,v2,v3
+		// face)
+		btPortalDir(portal, &dir);
+
+		// test if origin is inside the portal
+		if (portalEncapsulesOrigin(portal, &dir))
+			return 0;
+
+		// get next support point
+
+		btMprSupport(a, b, colDesc, dir, &v4);
+
+		// test if v4 can expand portal to contain origin and if portal
+		// expanding doesn't reach given tolerance
+		if (!portalCanEncapsuleOrigin(portal, &v4, &dir) || portalReachTolerance(portal, &v4, &dir))
+		{
+			return -1;
+		}
+
+		// v1-v2-v3 triangle must be rearranged to face outside Minkowski
+		// difference (direction from v0).
+		btExpandPortal(portal, &v4);
+	}
+
+	return -1;
+}
+
+static void btFindPos(const btMprSimplex_t *portal, btVector3 *pos)
+{
+	btVector3 zero = btVector3(0, 0, 0);
+	btVector3 *origin = &zero;
+
+	btVector3 dir;
+	size_t i;
+	float b[4], sum, inv;
+	btVector3 vec, p1, p2;
+
+	btPortalDir(portal, &dir);
+
+	// use barycentric coordinates of tetrahedron to find origin
+	btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 1)->v,
+				   &btMprSimplexPoint(portal, 2)->v);
+	b[0] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 3)->v);
+
+	btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 3)->v,
+				   &btMprSimplexPoint(portal, 2)->v);
+	b[1] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 0)->v);
+
+	btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 0)->v,
+				   &btMprSimplexPoint(portal, 1)->v);
+	b[2] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 3)->v);
+
+	btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 2)->v,
+				   &btMprSimplexPoint(portal, 1)->v);
+	b[3] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 0)->v);
+
+	sum = b[0] + b[1] + b[2] + b[3];
+
+	if (btMprIsZero(sum) || sum < 0.f)
+	{
+		b[0] = 0.f;
+
+		btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 2)->v,
+					   &btMprSimplexPoint(portal, 3)->v);
+		b[1] = btMprVec3Dot(&vec, &dir);
+		btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 3)->v,
+					   &btMprSimplexPoint(portal, 1)->v);
+		b[2] = btMprVec3Dot(&vec, &dir);
+		btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 1)->v,
+					   &btMprSimplexPoint(portal, 2)->v);
+		b[3] = btMprVec3Dot(&vec, &dir);
+
+		sum = b[1] + b[2] + b[3];
+	}
+
+	inv = 1.f / sum;
+
+	btMprVec3Copy(&p1, origin);
+	btMprVec3Copy(&p2, origin);
+	for (i = 0; i < 4; i++)
+	{
+		btMprVec3Copy(&vec, &btMprSimplexPoint(portal, i)->v1);
+		btMprVec3Scale(&vec, b[i]);
+		btMprVec3Add(&p1, &vec);
+
+		btMprVec3Copy(&vec, &btMprSimplexPoint(portal, i)->v2);
+		btMprVec3Scale(&vec, b[i]);
+		btMprVec3Add(&p2, &vec);
+	}
+	btMprVec3Scale(&p1, inv);
+	btMprVec3Scale(&p2, inv);
+#ifdef MPR_AVERAGE_CONTACT_POSITIONS
+	btMprVec3Copy(pos, &p1);
+	btMprVec3Add(pos, &p2);
+	btMprVec3Scale(pos, 0.5);
+#else
+	btMprVec3Copy(pos, &p2);
+#endif  //MPR_AVERAGE_CONTACT_POSITIONS
+}
+
+inline float btMprVec3Dist2(const btVector3 *a, const btVector3 *b)
+{
+	btVector3 ab;
+	btMprVec3Sub2(&ab, a, b);
+	return btMprVec3Len2(&ab);
+}
+
+inline float _btMprVec3PointSegmentDist2(const btVector3 *P,
+										 const btVector3 *x0,
+										 const btVector3 *b,
+										 btVector3 *witness)
+{
+	// The computation comes from solving equation of segment:
+	//      S(t) = x0 + t.d
+	//          where - x0 is initial point of segment
+	//                - d is direction of segment from x0 (|d| > 0)
+	//                - t belongs to <0, 1> interval
+	//
+	// Than, distance from a segment to some point P can be expressed:
+	//      D(t) = |x0 + t.d - P|^2
+	//          which is distance from any point on segment. Minimization
+	//          of this function brings distance from P to segment.
+	// Minimization of D(t) leads to simple quadratic equation that's
+	// solving is straightforward.
+	//
+	// Bonus of this method is witness point for free.
+
+	float dist, t;
+	btVector3 d, a;
+
+	// direction of segment
+	btMprVec3Sub2(&d, b, x0);
+
+	// precompute vector from P to x0
+	btMprVec3Sub2(&a, x0, P);
+
+	t = -1.f * btMprVec3Dot(&a, &d);
+	t /= btMprVec3Len2(&d);
+
+	if (t < 0.f || btMprIsZero(t))
+	{
+		dist = btMprVec3Dist2(x0, P);
+		if (witness)
+			btMprVec3Copy(witness, x0);
+	}
+	else if (t > 1.f || btMprEq(t, 1.f))
+	{
+		dist = btMprVec3Dist2(b, P);
+		if (witness)
+			btMprVec3Copy(witness, b);
+	}
+	else
+	{
+		if (witness)
+		{
+			btMprVec3Copy(witness, &d);
+			btMprVec3Scale(witness, t);
+			btMprVec3Add(witness, x0);
+			dist = btMprVec3Dist2(witness, P);
+		}
+		else
+		{
+			// recycling variables
+			btMprVec3Scale(&d, t);
+			btMprVec3Add(&d, &a);
+			dist = btMprVec3Len2(&d);
+		}
+	}
+
+	return dist;
+}
+
+inline float btMprVec3PointTriDist2(const btVector3 *P,
+									const btVector3 *x0, const btVector3 *B,
+									const btVector3 *C,
+									btVector3 *witness)
+{
+	// Computation comes from analytic expression for triangle (x0, B, C)
+	//      T(s, t) = x0 + s.d1 + t.d2, where d1 = B - x0 and d2 = C - x0 and
+	// Then equation for distance is:
+	//      D(s, t) = | T(s, t) - P |^2
+	// This leads to minimization of quadratic function of two variables.
+	// The solution from is taken only if s is between 0 and 1, t is
+	// between 0 and 1 and t + s < 1, otherwise distance from segment is
+	// computed.
+
+	btVector3 d1, d2, a;
+	float u, v, w, p, q, r;
+	float s, t, dist, dist2;
+	btVector3 witness2;
+
+	btMprVec3Sub2(&d1, B, x0);
+	btMprVec3Sub2(&d2, C, x0);
+	btMprVec3Sub2(&a, x0, P);
+
+	u = btMprVec3Dot(&a, &a);
+	v = btMprVec3Dot(&d1, &d1);
+	w = btMprVec3Dot(&d2, &d2);
+	p = btMprVec3Dot(&a, &d1);
+	q = btMprVec3Dot(&a, &d2);
+	r = btMprVec3Dot(&d1, &d2);
+
+	btScalar div = (w * v - r * r);
+	if (btMprIsZero(div))
+	{
+		s = -1;
+	}
+	else
+	{
+		s = (q * r - w * p) / div;
+		t = (-s * r - q) / w;
+	}
+
+	if ((btMprIsZero(s) || s > 0.f) && (btMprEq(s, 1.f) || s < 1.f) && (btMprIsZero(t) || t > 0.f) && (btMprEq(t, 1.f) || t < 1.f) && (btMprEq(t + s, 1.f) || t + s < 1.f))
+	{
+		if (witness)
+		{
+			btMprVec3Scale(&d1, s);
+			btMprVec3Scale(&d2, t);
+			btMprVec3Copy(witness, x0);
+			btMprVec3Add(witness, &d1);
+			btMprVec3Add(witness, &d2);
+
+			dist = btMprVec3Dist2(witness, P);
+		}
+		else
+		{
+			dist = s * s * v;
+			dist += t * t * w;
+			dist += 2.f * s * t * r;
+			dist += 2.f * s * p;
+			dist += 2.f * t * q;
+			dist += u;
+		}
+	}
+	else
+	{
+		dist = _btMprVec3PointSegmentDist2(P, x0, B, witness);
+
+		dist2 = _btMprVec3PointSegmentDist2(P, x0, C, &witness2);
+		if (dist2 < dist)
+		{
+			dist = dist2;
+			if (witness)
+				btMprVec3Copy(witness, &witness2);
+		}
+
+		dist2 = _btMprVec3PointSegmentDist2(P, B, C, &witness2);
+		if (dist2 < dist)
+		{
+			dist = dist2;
+			if (witness)
+				btMprVec3Copy(witness, &witness2);
+		}
+	}
+
+	return dist;
+}
+
+template <typename btConvexTemplate>
+static void btFindPenetr(const btConvexTemplate &a, const btConvexTemplate &b,
+						 const btMprCollisionDescription &colDesc,
+						 btMprSimplex_t *portal,
+						 float *depth, btVector3 *pdir, btVector3 *pos)
+{
+	btVector3 dir;
+	btMprSupport_t v4;
+	unsigned long iterations;
+
+	btVector3 zero = btVector3(0, 0, 0);
+	btVector3 *origin = &zero;
+
+	iterations = 1UL;
+	for (int i = 0; i < BT_MPR_MAX_ITERATIONS; i++)
+	//while (1)
+	{
+		// compute portal direction and obtain next support point
+		btPortalDir(portal, &dir);
+
+		btMprSupport(a, b, colDesc, dir, &v4);
+
+		// reached tolerance -> find penetration info
+		if (portalReachTolerance(portal, &v4, &dir) || iterations == BT_MPR_MAX_ITERATIONS)
+		{
+			*depth = btMprVec3PointTriDist2(origin, &btMprSimplexPoint(portal, 1)->v, &btMprSimplexPoint(portal, 2)->v, &btMprSimplexPoint(portal, 3)->v, pdir);
+			*depth = BT_MPR_SQRT(*depth);
+
+			if (btMprIsZero((*pdir).x()) && btMprIsZero((*pdir).y()) && btMprIsZero((*pdir).z()))
+			{
+				*pdir = dir;
+			}
+			btMprVec3Normalize(pdir);
+
+			// barycentric coordinates:
+			btFindPos(portal, pos);
+
+			return;
+		}
+
+		btExpandPortal(portal, &v4);
+
+		iterations++;
+	}
+}
+
+static void btFindPenetrTouch(btMprSimplex_t *portal, float *depth, btVector3 *dir, btVector3 *pos)
+{
+	// Touching contact on portal's v1 - so depth is zero and direction
+	// is unimportant and pos can be guessed
+	*depth = 0.f;
+	btVector3 zero = btVector3(0, 0, 0);
+	btVector3 *origin = &zero;
+
+	btMprVec3Copy(dir, origin);
+#ifdef MPR_AVERAGE_CONTACT_POSITIONS
+	btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v1);
+	btMprVec3Add(pos, &btMprSimplexPoint(portal, 1)->v2);
+	btMprVec3Scale(pos, 0.5);
+#else
+	btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v2);
+#endif
+}
+
+static void btFindPenetrSegment(btMprSimplex_t *portal,
+								float *depth, btVector3 *dir, btVector3 *pos)
+{
+	// Origin lies on v0-v1 segment.
+	// Depth is distance to v1, direction also and position must be
+	// computed
+#ifdef MPR_AVERAGE_CONTACT_POSITIONS
+	btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v1);
+	btMprVec3Add(pos, &btMprSimplexPoint(portal, 1)->v2);
+	btMprVec3Scale(pos, 0.5f);
+#else
+	btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v2);
+#endif  //MPR_AVERAGE_CONTACT_POSITIONS
+
+	btMprVec3Copy(dir, &btMprSimplexPoint(portal, 1)->v);
+	*depth = BT_MPR_SQRT(btMprVec3Len2(dir));
+	btMprVec3Normalize(dir);
+}
+
+template <typename btConvexTemplate>
+inline int btMprPenetration(const btConvexTemplate &a, const btConvexTemplate &b,
+							const btMprCollisionDescription &colDesc,
+							float *depthOut, btVector3 *dirOut, btVector3 *posOut)
+{
+	btMprSimplex_t portal;
+
+	// Phase 1: Portal discovery
+	int result = btDiscoverPortal(a, b, colDesc, &portal);
+
+	//sepAxis[pairIndex] = *pdir;//or -dir?
+
+	switch (result)
+	{
+		case 0:
+		{
+			// Phase 2: Portal refinement
+
+			result = btRefinePortal(a, b, colDesc, &portal);
+			if (result < 0)
+				return -1;
+
+			// Phase 3. Penetration info
+			btFindPenetr(a, b, colDesc, &portal, depthOut, dirOut, posOut);
+
+			break;
+		}
+		case 1:
+		{
+			// Touching contact on portal's v1.
+			btFindPenetrTouch(&portal, depthOut, dirOut, posOut);
+			result = 0;
+			break;
+		}
+		case 2:
+		{
+			btFindPenetrSegment(&portal, depthOut, dirOut, posOut);
+			result = 0;
+			break;
+		}
+		default:
+		{
+			//if (res < 0)
+			//{
+			// Origin isn't inside portal - no collision.
+			result = -1;
+			//}
+		}
+	};
+
+	return result;
+};
+
+template <typename btConvexTemplate, typename btMprDistanceTemplate>
+inline int btComputeMprPenetration(const btConvexTemplate &a, const btConvexTemplate &b, const btMprCollisionDescription &colDesc, btMprDistanceTemplate *distInfo)
+{
+	btVector3 dir, pos;
+	float depth;
+
+	int res = btMprPenetration(a, b, colDesc, &depth, &dir, &pos);
+	if (res == 0)
+	{
+		distInfo->m_distance = -depth;
+		distInfo->m_pointOnB = pos;
+		distInfo->m_normalBtoA = -dir;
+		distInfo->m_pointOnA = pos - distInfo->m_distance * dir;
+		return 0;
+	}
+
+	return -1;
+}
+
+#endif  //BT_MPR_PENETRATION_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
new file mode 100644
index 0000000..366cf15
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
@@ -0,0 +1,450 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btPersistentManifold.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btSerializer.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btCollisionObjectData btCollisionObjectDoubleData
+#else
+#define btCollisionObjectData btCollisionObjectFloatData
+#endif
+
+btScalar gContactBreakingThreshold = btScalar(0.02);
+ContactDestroyedCallback gContactDestroyedCallback = 0;
+ContactProcessedCallback gContactProcessedCallback = 0;
+ContactStartedCallback gContactStartedCallback = 0;
+ContactEndedCallback gContactEndedCallback = 0;
+///gContactCalcArea3Points will approximate the convex hull area using 3 points
+///when setting it to false, it will use 4 points to compute the area: it is more accurate but slower
+bool gContactCalcArea3Points = true;
+
+btPersistentManifold::btPersistentManifold()
+	: btTypedObject(BT_PERSISTENT_MANIFOLD_TYPE),
+	  m_body0(0),
+	  m_body1(0),
+	  m_cachedPoints(0),
+	  m_companionIdA(0),
+	  m_companionIdB(0),
+	  m_index1a(0)
+{
+}
+
+#ifdef DEBUG_PERSISTENCY
+#include <stdio.h>
+void btPersistentManifold::DebugPersistency()
+{
+	int i;
+	printf("DebugPersistency : numPoints %d\n", m_cachedPoints);
+	for (i = 0; i < m_cachedPoints; i++)
+	{
+		printf("m_pointCache[%d].m_userPersistentData = %x\n", i, m_pointCache[i].m_userPersistentData);
+	}
+}
+#endif  //DEBUG_PERSISTENCY
+
+void btPersistentManifold::clearUserCache(btManifoldPoint& pt)
+{
+	void* oldPtr = pt.m_userPersistentData;
+	if (oldPtr)
+	{
+#ifdef DEBUG_PERSISTENCY
+		int i;
+		int occurance = 0;
+		for (i = 0; i < m_cachedPoints; i++)
+		{
+			if (m_pointCache[i].m_userPersistentData == oldPtr)
+			{
+				occurance++;
+				if (occurance > 1)
+					printf("error in clearUserCache\n");
+			}
+		}
+		btAssert(occurance <= 0);
+#endif  //DEBUG_PERSISTENCY
+
+		if (pt.m_userPersistentData && gContactDestroyedCallback)
+		{
+			(*gContactDestroyedCallback)(pt.m_userPersistentData);
+			pt.m_userPersistentData = 0;
+		}
+
+#ifdef DEBUG_PERSISTENCY
+		DebugPersistency();
+#endif
+	}
+}
+
+static inline btScalar calcArea4Points(const btVector3& p0, const btVector3& p1, const btVector3& p2, const btVector3& p3)
+{
+	// It calculates possible 3 area constructed from random 4 points and returns the biggest one.
+
+	btVector3 a[3], b[3];
+	a[0] = p0 - p1;
+	a[1] = p0 - p2;
+	a[2] = p0 - p3;
+	b[0] = p2 - p3;
+	b[1] = p1 - p3;
+	b[2] = p1 - p2;
+
+	//todo: Following 3 cross production can be easily optimized by SIMD.
+	btVector3 tmp0 = a[0].cross(b[0]);
+	btVector3 tmp1 = a[1].cross(b[1]);
+	btVector3 tmp2 = a[2].cross(b[2]);
+
+	return btMax(btMax(tmp0.length2(), tmp1.length2()), tmp2.length2());
+}
+
+int btPersistentManifold::sortCachedPoints(const btManifoldPoint& pt)
+{
+	//calculate 4 possible cases areas, and take biggest area
+	//also need to keep 'deepest'
+
+	int maxPenetrationIndex = -1;
+#define KEEP_DEEPEST_POINT 1
+#ifdef KEEP_DEEPEST_POINT
+	btScalar maxPenetration = pt.getDistance();
+	for (int i = 0; i < 4; i++)
+	{
+		if (m_pointCache[i].getDistance() < maxPenetration)
+		{
+			maxPenetrationIndex = i;
+			maxPenetration = m_pointCache[i].getDistance();
+		}
+	}
+#endif  //KEEP_DEEPEST_POINT
+
+	btScalar res0(btScalar(0.)), res1(btScalar(0.)), res2(btScalar(0.)), res3(btScalar(0.));
+
+	if (gContactCalcArea3Points)
+	{
+		if (maxPenetrationIndex != 0)
+		{
+			btVector3 a0 = pt.m_localPointA - m_pointCache[1].m_localPointA;
+			btVector3 b0 = m_pointCache[3].m_localPointA - m_pointCache[2].m_localPointA;
+			btVector3 cross = a0.cross(b0);
+			res0 = cross.length2();
+		}
+		if (maxPenetrationIndex != 1)
+		{
+			btVector3 a1 = pt.m_localPointA - m_pointCache[0].m_localPointA;
+			btVector3 b1 = m_pointCache[3].m_localPointA - m_pointCache[2].m_localPointA;
+			btVector3 cross = a1.cross(b1);
+			res1 = cross.length2();
+		}
+
+		if (maxPenetrationIndex != 2)
+		{
+			btVector3 a2 = pt.m_localPointA - m_pointCache[0].m_localPointA;
+			btVector3 b2 = m_pointCache[3].m_localPointA - m_pointCache[1].m_localPointA;
+			btVector3 cross = a2.cross(b2);
+			res2 = cross.length2();
+		}
+
+		if (maxPenetrationIndex != 3)
+		{
+			btVector3 a3 = pt.m_localPointA - m_pointCache[0].m_localPointA;
+			btVector3 b3 = m_pointCache[2].m_localPointA - m_pointCache[1].m_localPointA;
+			btVector3 cross = a3.cross(b3);
+			res3 = cross.length2();
+		}
+	}
+	else
+	{
+		if (maxPenetrationIndex != 0)
+		{
+			res0 = calcArea4Points(pt.m_localPointA, m_pointCache[1].m_localPointA, m_pointCache[2].m_localPointA, m_pointCache[3].m_localPointA);
+		}
+
+		if (maxPenetrationIndex != 1)
+		{
+			res1 = calcArea4Points(pt.m_localPointA, m_pointCache[0].m_localPointA, m_pointCache[2].m_localPointA, m_pointCache[3].m_localPointA);
+		}
+
+		if (maxPenetrationIndex != 2)
+		{
+			res2 = calcArea4Points(pt.m_localPointA, m_pointCache[0].m_localPointA, m_pointCache[1].m_localPointA, m_pointCache[3].m_localPointA);
+		}
+
+		if (maxPenetrationIndex != 3)
+		{
+			res3 = calcArea4Points(pt.m_localPointA, m_pointCache[0].m_localPointA, m_pointCache[1].m_localPointA, m_pointCache[2].m_localPointA);
+		}
+	}
+	btVector4 maxvec(res0, res1, res2, res3);
+	int biggestarea = maxvec.closestAxis4();
+	return biggestarea;
+}
+
+int btPersistentManifold::getCacheEntry(const btManifoldPoint& newPoint) const
+{
+	btScalar shortestDist = getContactBreakingThreshold() * getContactBreakingThreshold();
+	int size = getNumContacts();
+	int nearestPoint = -1;
+	for (int i = 0; i < size; i++)
+	{
+		const btManifoldPoint& mp = m_pointCache[i];
+
+		btVector3 diffA = mp.m_localPointA - newPoint.m_localPointA;
+		const btScalar distToManiPoint = diffA.dot(diffA);
+		if (distToManiPoint < shortestDist)
+		{
+			shortestDist = distToManiPoint;
+			nearestPoint = i;
+		}
+	}
+	return nearestPoint;
+}
+
+int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint, bool isPredictive)
+{
+	if (!isPredictive)
+	{
+		btAssert(validContactDistance(newPoint));
+	}
+
+	int insertIndex = getNumContacts();
+	if (insertIndex == MANIFOLD_CACHE_SIZE)
+	{
+#if MANIFOLD_CACHE_SIZE >= 4
+		//sort cache so best points come first, based on area
+		insertIndex = sortCachedPoints(newPoint);
+#else
+		insertIndex = 0;
+#endif
+		clearUserCache(m_pointCache[insertIndex]);
+	}
+	else
+	{
+		m_cachedPoints++;
+	}
+	if (insertIndex < 0)
+		insertIndex = 0;
+
+	btAssert(m_pointCache[insertIndex].m_userPersistentData == 0);
+	m_pointCache[insertIndex] = newPoint;
+	return insertIndex;
+}
+
+btScalar btPersistentManifold::getContactBreakingThreshold() const
+{
+	return m_contactBreakingThreshold;
+}
+
+void btPersistentManifold::refreshContactPoints(const btTransform& trA, const btTransform& trB)
+{
+	int i;
+#ifdef DEBUG_PERSISTENCY
+	printf("refreshContactPoints posA = (%f,%f,%f) posB = (%f,%f,%f)\n",
+		   trA.getOrigin().getX(),
+		   trA.getOrigin().getY(),
+		   trA.getOrigin().getZ(),
+		   trB.getOrigin().getX(),
+		   trB.getOrigin().getY(),
+		   trB.getOrigin().getZ());
+#endif  //DEBUG_PERSISTENCY
+	/// first refresh worldspace positions and distance
+	for (i = getNumContacts() - 1; i >= 0; i--)
+	{
+		btManifoldPoint& manifoldPoint = m_pointCache[i];
+		manifoldPoint.m_positionWorldOnA = trA(manifoldPoint.m_localPointA);
+		manifoldPoint.m_positionWorldOnB = trB(manifoldPoint.m_localPointB);
+		manifoldPoint.m_distance1 = (manifoldPoint.m_positionWorldOnA - manifoldPoint.m_positionWorldOnB).dot(manifoldPoint.m_normalWorldOnB);
+		manifoldPoint.m_lifeTime++;
+	}
+
+	/// then
+	btScalar distance2d;
+	btVector3 projectedDifference, projectedPoint;
+	for (i = getNumContacts() - 1; i >= 0; i--)
+	{
+		btManifoldPoint& manifoldPoint = m_pointCache[i];
+		//contact becomes invalid when signed distance exceeds margin (projected on contactnormal direction)
+		if (!validContactDistance(manifoldPoint))
+		{
+			removeContactPoint(i);
+		}
+		else
+		{
+			//todo: friction anchor may require the contact to be around a bit longer
+			//contact also becomes invalid when relative movement orthogonal to normal exceeds margin
+			projectedPoint = manifoldPoint.m_positionWorldOnA - manifoldPoint.m_normalWorldOnB * manifoldPoint.m_distance1;
+			projectedDifference = manifoldPoint.m_positionWorldOnB - projectedPoint;
+			distance2d = projectedDifference.dot(projectedDifference);
+			if (distance2d > getContactBreakingThreshold() * getContactBreakingThreshold())
+			{
+				removeContactPoint(i);
+			}
+			else
+			{
+				//contact point processed callback
+				if (gContactProcessedCallback)
+					(*gContactProcessedCallback)(manifoldPoint, (void*)m_body0, (void*)m_body1);
+			}
+		}
+	}
+#ifdef DEBUG_PERSISTENCY
+	DebugPersistency();
+#endif  //
+}
+
+int btPersistentManifold::calculateSerializeBufferSize() const
+{
+	return sizeof(btPersistentManifoldData);
+}
+
+const char* btPersistentManifold::serialize(const class btPersistentManifold* manifold, void* dataBuffer, class btSerializer* serializer) const
+{
+	btPersistentManifoldData* dataOut = (btPersistentManifoldData*)dataBuffer;
+	memset(dataOut, 0, sizeof(btPersistentManifoldData));
+
+	dataOut->m_body0 = (btCollisionObjectData*)serializer->getUniquePointer((void*)manifold->getBody0());
+	dataOut->m_body1 = (btCollisionObjectData*)serializer->getUniquePointer((void*)manifold->getBody1());
+	dataOut->m_contactBreakingThreshold = manifold->getContactBreakingThreshold();
+	dataOut->m_contactProcessingThreshold = manifold->getContactProcessingThreshold();
+	dataOut->m_numCachedPoints = manifold->getNumContacts();
+	dataOut->m_companionIdA = manifold->m_companionIdA;
+	dataOut->m_companionIdB = manifold->m_companionIdB;
+	dataOut->m_index1a = manifold->m_index1a;
+	dataOut->m_objectType = manifold->m_objectType;
+
+	for (int i = 0; i < this->getNumContacts(); i++)
+	{
+		const btManifoldPoint& pt = manifold->getContactPoint(i);
+		dataOut->m_pointCacheAppliedImpulse[i] = pt.m_appliedImpulse;
+		dataOut->m_pointCachePrevRHS[i] = pt.m_prevRHS;
+		dataOut->m_pointCacheAppliedImpulseLateral1[i] = pt.m_appliedImpulseLateral1;
+		dataOut->m_pointCacheAppliedImpulseLateral2[i] = pt.m_appliedImpulseLateral2;
+		pt.m_localPointA.serialize(dataOut->m_pointCacheLocalPointA[i]);
+		pt.m_localPointB.serialize(dataOut->m_pointCacheLocalPointB[i]);
+		pt.m_normalWorldOnB.serialize(dataOut->m_pointCacheNormalWorldOnB[i]);
+		dataOut->m_pointCacheDistance[i] = pt.m_distance1;
+		dataOut->m_pointCacheCombinedContactDamping1[i] = pt.m_combinedContactDamping1;
+		dataOut->m_pointCacheCombinedContactStiffness1[i] = pt.m_combinedContactStiffness1;
+		dataOut->m_pointCacheLifeTime[i] = pt.m_lifeTime;
+		dataOut->m_pointCacheFrictionCFM[i] = pt.m_frictionCFM;
+		dataOut->m_pointCacheContactERP[i] = pt.m_contactERP;
+		dataOut->m_pointCacheContactCFM[i] = pt.m_contactCFM;
+		dataOut->m_pointCacheContactPointFlags[i] = pt.m_contactPointFlags;
+		dataOut->m_pointCacheIndex0[i] = pt.m_index0;
+		dataOut->m_pointCacheIndex1[i] = pt.m_index1;
+		dataOut->m_pointCachePartId0[i] = pt.m_partId0;
+		dataOut->m_pointCachePartId1[i] = pt.m_partId1;
+		pt.m_positionWorldOnA.serialize(dataOut->m_pointCachePositionWorldOnA[i]);
+		pt.m_positionWorldOnB.serialize(dataOut->m_pointCachePositionWorldOnB[i]);
+		dataOut->m_pointCacheCombinedFriction[i] = pt.m_combinedFriction;
+		pt.m_lateralFrictionDir1.serialize(dataOut->m_pointCacheLateralFrictionDir1[i]);
+		pt.m_lateralFrictionDir2.serialize(dataOut->m_pointCacheLateralFrictionDir2[i]);
+		dataOut->m_pointCacheCombinedRollingFriction[i] = pt.m_combinedRollingFriction;
+		dataOut->m_pointCacheCombinedSpinningFriction[i] = pt.m_combinedSpinningFriction;
+		dataOut->m_pointCacheCombinedRestitution[i] = pt.m_combinedRestitution;
+		dataOut->m_pointCacheContactMotion1[i] = pt.m_contactMotion1;
+		dataOut->m_pointCacheContactMotion2[i] = pt.m_contactMotion2;
+	}
+	return btPersistentManifoldDataName;
+}
+
+void btPersistentManifold::deSerialize(const struct btPersistentManifoldDoubleData* manifoldDataPtr)
+{
+	m_contactBreakingThreshold = manifoldDataPtr->m_contactBreakingThreshold;
+	m_contactProcessingThreshold = manifoldDataPtr->m_contactProcessingThreshold;
+	m_cachedPoints = manifoldDataPtr->m_numCachedPoints;
+	m_companionIdA = manifoldDataPtr->m_companionIdA;
+	m_companionIdB = manifoldDataPtr->m_companionIdB;
+	//m_index1a = manifoldDataPtr->m_index1a;
+	m_objectType = manifoldDataPtr->m_objectType;
+
+	for (int i = 0; i < this->getNumContacts(); i++)
+	{
+		btManifoldPoint& pt = m_pointCache[i];
+
+		pt.m_appliedImpulse = manifoldDataPtr->m_pointCacheAppliedImpulse[i];
+		pt.m_prevRHS = manifoldDataPtr->m_pointCachePrevRHS[i];
+		pt.m_appliedImpulseLateral1 = manifoldDataPtr->m_pointCacheAppliedImpulseLateral1[i];
+		pt.m_appliedImpulseLateral2 = manifoldDataPtr->m_pointCacheAppliedImpulseLateral2[i];
+		pt.m_localPointA.deSerializeDouble(manifoldDataPtr->m_pointCacheLocalPointA[i]);
+		pt.m_localPointB.deSerializeDouble(manifoldDataPtr->m_pointCacheLocalPointB[i]);
+		pt.m_normalWorldOnB.deSerializeDouble(manifoldDataPtr->m_pointCacheNormalWorldOnB[i]);
+		pt.m_distance1 = manifoldDataPtr->m_pointCacheDistance[i];
+		pt.m_combinedContactDamping1 = manifoldDataPtr->m_pointCacheCombinedContactDamping1[i];
+		pt.m_combinedContactStiffness1 = manifoldDataPtr->m_pointCacheCombinedContactStiffness1[i];
+		pt.m_lifeTime = manifoldDataPtr->m_pointCacheLifeTime[i];
+		pt.m_frictionCFM = manifoldDataPtr->m_pointCacheFrictionCFM[i];
+		pt.m_contactERP = manifoldDataPtr->m_pointCacheContactERP[i];
+		pt.m_contactCFM = manifoldDataPtr->m_pointCacheContactCFM[i];
+		pt.m_contactPointFlags = manifoldDataPtr->m_pointCacheContactPointFlags[i];
+		pt.m_index0 = manifoldDataPtr->m_pointCacheIndex0[i];
+		pt.m_index1 = manifoldDataPtr->m_pointCacheIndex1[i];
+		pt.m_partId0 = manifoldDataPtr->m_pointCachePartId0[i];
+		pt.m_partId1 = manifoldDataPtr->m_pointCachePartId1[i];
+		pt.m_positionWorldOnA.deSerializeDouble(manifoldDataPtr->m_pointCachePositionWorldOnA[i]);
+		pt.m_positionWorldOnB.deSerializeDouble(manifoldDataPtr->m_pointCachePositionWorldOnB[i]);
+		pt.m_combinedFriction = manifoldDataPtr->m_pointCacheCombinedFriction[i];
+		pt.m_lateralFrictionDir1.deSerializeDouble(manifoldDataPtr->m_pointCacheLateralFrictionDir1[i]);
+		pt.m_lateralFrictionDir2.deSerializeDouble(manifoldDataPtr->m_pointCacheLateralFrictionDir2[i]);
+		pt.m_combinedRollingFriction = manifoldDataPtr->m_pointCacheCombinedRollingFriction[i];
+		pt.m_combinedSpinningFriction = manifoldDataPtr->m_pointCacheCombinedSpinningFriction[i];
+		pt.m_combinedRestitution = manifoldDataPtr->m_pointCacheCombinedRestitution[i];
+		pt.m_contactMotion1 = manifoldDataPtr->m_pointCacheContactMotion1[i];
+		pt.m_contactMotion2 = manifoldDataPtr->m_pointCacheContactMotion2[i];
+	}
+}
+
+void btPersistentManifold::deSerialize(const struct btPersistentManifoldFloatData* manifoldDataPtr)
+{
+	m_contactBreakingThreshold = manifoldDataPtr->m_contactBreakingThreshold;
+	m_contactProcessingThreshold = manifoldDataPtr->m_contactProcessingThreshold;
+	m_cachedPoints = manifoldDataPtr->m_numCachedPoints;
+	m_companionIdA = manifoldDataPtr->m_companionIdA;
+	m_companionIdB = manifoldDataPtr->m_companionIdB;
+	//m_index1a = manifoldDataPtr->m_index1a;
+	m_objectType = manifoldDataPtr->m_objectType;
+
+	for (int i = 0; i < this->getNumContacts(); i++)
+	{
+		btManifoldPoint& pt = m_pointCache[i];
+
+		pt.m_appliedImpulse = manifoldDataPtr->m_pointCacheAppliedImpulse[i];
+		pt.m_prevRHS = manifoldDataPtr->m_pointCachePrevRHS[i];
+		pt.m_appliedImpulseLateral1 = manifoldDataPtr->m_pointCacheAppliedImpulseLateral1[i];
+		pt.m_appliedImpulseLateral2 = manifoldDataPtr->m_pointCacheAppliedImpulseLateral2[i];
+		pt.m_localPointA.deSerialize(manifoldDataPtr->m_pointCacheLocalPointA[i]);
+		pt.m_localPointB.deSerialize(manifoldDataPtr->m_pointCacheLocalPointB[i]);
+		pt.m_normalWorldOnB.deSerialize(manifoldDataPtr->m_pointCacheNormalWorldOnB[i]);
+		pt.m_distance1 = manifoldDataPtr->m_pointCacheDistance[i];
+		pt.m_combinedContactDamping1 = manifoldDataPtr->m_pointCacheCombinedContactDamping1[i];
+		pt.m_combinedContactStiffness1 = manifoldDataPtr->m_pointCacheCombinedContactStiffness1[i];
+		pt.m_lifeTime = manifoldDataPtr->m_pointCacheLifeTime[i];
+		pt.m_frictionCFM = manifoldDataPtr->m_pointCacheFrictionCFM[i];
+		pt.m_contactERP = manifoldDataPtr->m_pointCacheContactERP[i];
+		pt.m_contactCFM = manifoldDataPtr->m_pointCacheContactCFM[i];
+		pt.m_contactPointFlags = manifoldDataPtr->m_pointCacheContactPointFlags[i];
+		pt.m_index0 = manifoldDataPtr->m_pointCacheIndex0[i];
+		pt.m_index1 = manifoldDataPtr->m_pointCacheIndex1[i];
+		pt.m_partId0 = manifoldDataPtr->m_pointCachePartId0[i];
+		pt.m_partId1 = manifoldDataPtr->m_pointCachePartId1[i];
+		pt.m_positionWorldOnA.deSerialize(manifoldDataPtr->m_pointCachePositionWorldOnA[i]);
+		pt.m_positionWorldOnB.deSerialize(manifoldDataPtr->m_pointCachePositionWorldOnB[i]);
+		pt.m_combinedFriction = manifoldDataPtr->m_pointCacheCombinedFriction[i];
+		pt.m_lateralFrictionDir1.deSerialize(manifoldDataPtr->m_pointCacheLateralFrictionDir1[i]);
+		pt.m_lateralFrictionDir2.deSerialize(manifoldDataPtr->m_pointCacheLateralFrictionDir2[i]);
+		pt.m_combinedRollingFriction = manifoldDataPtr->m_pointCacheCombinedRollingFriction[i];
+		pt.m_combinedSpinningFriction = manifoldDataPtr->m_pointCacheCombinedSpinningFriction[i];
+		pt.m_combinedRestitution = manifoldDataPtr->m_pointCacheCombinedRestitution[i];
+		pt.m_contactMotion1 = manifoldDataPtr->m_pointCacheContactMotion1[i];
+		pt.m_contactMotion2 = manifoldDataPtr->m_pointCacheContactMotion2[i];
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
new file mode 100644
index 0000000..b07e486
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
@@ -0,0 +1,374 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_PERSISTENT_MANIFOLD_H
+#define BT_PERSISTENT_MANIFOLD_H
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "btManifoldPoint.h"
+class btCollisionObject;
+#include "LinearMath/btAlignedAllocator.h"
+
+struct btCollisionResult;
+struct btCollisionObjectDoubleData;
+struct btCollisionObjectFloatData;
+
+///maximum contact breaking and merging threshold
+extern btScalar gContactBreakingThreshold;
+
+#ifndef SWIG
+class btPersistentManifold;
+
+typedef bool (*ContactDestroyedCallback)(void* userPersistentData);
+typedef bool (*ContactProcessedCallback)(btManifoldPoint& cp, void* body0, void* body1);
+typedef void (*ContactStartedCallback)(btPersistentManifold* const& manifold);
+typedef void (*ContactEndedCallback)(btPersistentManifold* const& manifold);
+extern ContactDestroyedCallback gContactDestroyedCallback;
+extern ContactProcessedCallback gContactProcessedCallback;
+extern ContactStartedCallback gContactStartedCallback;
+extern ContactEndedCallback gContactEndedCallback;
+#endif  //SWIG
+
+//the enum starts at 1024 to avoid type conflicts with btTypedConstraint
+enum btContactManifoldTypes
+{
+	MIN_CONTACT_MANIFOLD_TYPE = 1024,
+	BT_PERSISTENT_MANIFOLD_TYPE
+};
+
+#define MANIFOLD_CACHE_SIZE 4
+
+///btPersistentManifold is a contact point cache, it stays persistent as long as objects are overlapping in the broadphase.
+///Those contact points are created by the collision narrow phase.
+///The cache can be empty, or hold 1,2,3 or 4 points. Some collision algorithms (GJK) might only add one point at a time.
+///updates/refreshes old contact points, and throw them away if necessary (distance becomes too large)
+///reduces the cache to 4 points, when more then 4 points are added, using following rules:
+///the contact point with deepest penetration is always kept, and it tries to maximuze the area covered by the points
+///note that some pairs of objects might have more then one contact manifold.
+
+//ATTRIBUTE_ALIGNED128( class) btPersistentManifold : public btTypedObject
+ATTRIBUTE_ALIGNED16(class)
+btPersistentManifold : public btTypedObject
+{
+	btManifoldPoint m_pointCache[MANIFOLD_CACHE_SIZE];
+
+	/// this two body pointers can point to the physics rigidbody class.
+	const btCollisionObject* m_body0;
+	const btCollisionObject* m_body1;
+
+	int m_cachedPoints;
+
+	btScalar m_contactBreakingThreshold;
+	btScalar m_contactProcessingThreshold;
+
+	/// sort cached points so most isolated points come first
+	int sortCachedPoints(const btManifoldPoint& pt);
+
+	int findContactPoint(const btManifoldPoint* unUsed, int numUnused, const btManifoldPoint& pt);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_companionIdA;
+	int m_companionIdB;
+
+	int m_index1a;
+
+	btPersistentManifold();
+
+	btPersistentManifold(const btCollisionObject* body0, const btCollisionObject* body1, int, btScalar contactBreakingThreshold, btScalar contactProcessingThreshold)
+		: btTypedObject(BT_PERSISTENT_MANIFOLD_TYPE),
+		  m_body0(body0),
+		  m_body1(body1),
+		  m_cachedPoints(0),
+		  m_contactBreakingThreshold(contactBreakingThreshold),
+		  m_contactProcessingThreshold(contactProcessingThreshold),
+		  m_companionIdA(0),
+		  m_companionIdB(0),
+		  m_index1a(0)
+	{
+	}
+
+	SIMD_FORCE_INLINE const btCollisionObject* getBody0() const { return m_body0; }
+	SIMD_FORCE_INLINE const btCollisionObject* getBody1() const { return m_body1; }
+
+	void setBodies(const btCollisionObject* body0, const btCollisionObject* body1)
+	{
+		m_body0 = body0;
+		m_body1 = body1;
+	}
+
+	void clearUserCache(btManifoldPoint & pt);
+
+#ifdef DEBUG_PERSISTENCY
+	void DebugPersistency();
+#endif  //
+
+	SIMD_FORCE_INLINE int getNumContacts() const
+	{
+		return m_cachedPoints;
+	}
+	/// the setNumContacts API is usually not used, except when you gather/fill all contacts manually
+	void setNumContacts(int cachedPoints)
+	{
+		m_cachedPoints = cachedPoints;
+	}
+
+	SIMD_FORCE_INLINE const btManifoldPoint& getContactPoint(int index) const
+	{
+		btAssert(index < m_cachedPoints);
+		return m_pointCache[index];
+	}
+
+	SIMD_FORCE_INLINE btManifoldPoint& getContactPoint(int index)
+	{
+		btAssert(index < m_cachedPoints);
+		return m_pointCache[index];
+	}
+
+	///@todo: get this margin from the current physics / collision environment
+	btScalar getContactBreakingThreshold() const;
+
+	btScalar getContactProcessingThreshold() const
+	{
+		return m_contactProcessingThreshold;
+	}
+
+	void setContactBreakingThreshold(btScalar contactBreakingThreshold)
+	{
+		m_contactBreakingThreshold = contactBreakingThreshold;
+	}
+
+	void setContactProcessingThreshold(btScalar contactProcessingThreshold)
+	{
+		m_contactProcessingThreshold = contactProcessingThreshold;
+	}
+
+	int getCacheEntry(const btManifoldPoint& newPoint) const;
+
+	int addManifoldPoint(const btManifoldPoint& newPoint, bool isPredictive = false);
+
+	void removeContactPoint(int index)
+	{
+		clearUserCache(m_pointCache[index]);
+
+		int lastUsedIndex = getNumContacts() - 1;
+		//		m_pointCache[index] = m_pointCache[lastUsedIndex];
+		if (index != lastUsedIndex)
+		{
+			m_pointCache[index] = m_pointCache[lastUsedIndex];
+			//get rid of duplicated userPersistentData pointer
+			m_pointCache[lastUsedIndex].m_userPersistentData = 0;
+			m_pointCache[lastUsedIndex].m_appliedImpulse = 0.f;
+			m_pointCache[lastUsedIndex].m_prevRHS = 0.f;
+			m_pointCache[lastUsedIndex].m_contactPointFlags = 0;
+			m_pointCache[lastUsedIndex].m_appliedImpulseLateral1 = 0.f;
+			m_pointCache[lastUsedIndex].m_appliedImpulseLateral2 = 0.f;
+			m_pointCache[lastUsedIndex].m_lifeTime = 0;
+		}
+
+		btAssert(m_pointCache[lastUsedIndex].m_userPersistentData == 0);
+		m_cachedPoints--;
+
+		if (gContactEndedCallback && m_cachedPoints == 0)
+		{
+			gContactEndedCallback(this);
+		}
+	}
+	void replaceContactPoint(const btManifoldPoint& newPoint, int insertIndex)
+	{
+		btAssert(validContactDistance(newPoint));
+
+#define MAINTAIN_PERSISTENCY 1
+#ifdef MAINTAIN_PERSISTENCY
+		int lifeTime = m_pointCache[insertIndex].getLifeTime();
+		btScalar appliedImpulse = m_pointCache[insertIndex].m_appliedImpulse;
+		btScalar prevRHS = m_pointCache[insertIndex].m_prevRHS;
+		btScalar appliedLateralImpulse1 = m_pointCache[insertIndex].m_appliedImpulseLateral1;
+		btScalar appliedLateralImpulse2 = m_pointCache[insertIndex].m_appliedImpulseLateral2;
+
+		bool replacePoint = true;
+		///we keep existing contact points for friction anchors
+		///if the friction force is within the Coulomb friction cone
+		if (newPoint.m_contactPointFlags & BT_CONTACT_FLAG_FRICTION_ANCHOR)
+		{
+			//   printf("appliedImpulse=%f\n", appliedImpulse);
+			//   printf("appliedLateralImpulse1=%f\n", appliedLateralImpulse1);
+			//   printf("appliedLateralImpulse2=%f\n", appliedLateralImpulse2);
+			//   printf("mu = %f\n", m_pointCache[insertIndex].m_combinedFriction);
+			btScalar mu = m_pointCache[insertIndex].m_combinedFriction;
+			btScalar eps = 0;  //we could allow to enlarge or shrink the tolerance to check against the friction cone a bit, say 1e-7
+			btScalar a = appliedLateralImpulse1 * appliedLateralImpulse1 + appliedLateralImpulse2 * appliedLateralImpulse2;
+			btScalar b = eps + mu * appliedImpulse;
+			b = b * b;
+			replacePoint = (a) > (b);
+		}
+
+		if (replacePoint)
+		{
+			btAssert(lifeTime >= 0);
+			void* cache = m_pointCache[insertIndex].m_userPersistentData;
+
+			m_pointCache[insertIndex] = newPoint;
+			m_pointCache[insertIndex].m_userPersistentData = cache;
+			m_pointCache[insertIndex].m_appliedImpulse = appliedImpulse;
+			m_pointCache[insertIndex].m_prevRHS = prevRHS;
+			m_pointCache[insertIndex].m_appliedImpulseLateral1 = appliedLateralImpulse1;
+			m_pointCache[insertIndex].m_appliedImpulseLateral2 = appliedLateralImpulse2;
+		}
+
+		m_pointCache[insertIndex].m_lifeTime = lifeTime;
+#else
+		clearUserCache(m_pointCache[insertIndex]);
+		m_pointCache[insertIndex] = newPoint;
+
+#endif
+	}
+
+	bool validContactDistance(const btManifoldPoint& pt) const
+	{
+		return pt.m_distance1 <= getContactBreakingThreshold();
+	}
+	/// calculated new worldspace coordinates and depth, and reject points that exceed the collision margin
+	void refreshContactPoints(const btTransform& trA, const btTransform& trB);
+
+	SIMD_FORCE_INLINE void clearManifold()
+	{
+		int i;
+		for (i = 0; i < m_cachedPoints; i++)
+		{
+			clearUserCache(m_pointCache[i]);
+		}
+
+		if (gContactEndedCallback && m_cachedPoints)
+		{
+			gContactEndedCallback(this);
+		}
+		m_cachedPoints = 0;
+	}
+
+	int calculateSerializeBufferSize() const;
+	const char* serialize(const class btPersistentManifold* manifold, void* dataBuffer, class btSerializer* serializer) const;
+	void deSerialize(const struct btPersistentManifoldDoubleData* manifoldDataPtr);
+	void deSerialize(const struct btPersistentManifoldFloatData* manifoldDataPtr);
+};
+
+// clang-format off
+
+struct btPersistentManifoldDoubleData
+{
+	btVector3DoubleData m_pointCacheLocalPointA[4];
+	btVector3DoubleData m_pointCacheLocalPointB[4];
+	btVector3DoubleData m_pointCachePositionWorldOnA[4];
+	btVector3DoubleData m_pointCachePositionWorldOnB[4];
+	btVector3DoubleData m_pointCacheNormalWorldOnB[4];
+	btVector3DoubleData	m_pointCacheLateralFrictionDir1[4];
+	btVector3DoubleData	m_pointCacheLateralFrictionDir2[4];
+	double m_pointCacheDistance[4];
+	double m_pointCacheAppliedImpulse[4];
+	double m_pointCachePrevRHS[4];
+	 double m_pointCacheCombinedFriction[4];
+	double m_pointCacheCombinedRollingFriction[4];
+	double m_pointCacheCombinedSpinningFriction[4];
+	double m_pointCacheCombinedRestitution[4];
+	int	m_pointCachePartId0[4];
+	int	m_pointCachePartId1[4];
+	int	m_pointCacheIndex0[4];
+	int	m_pointCacheIndex1[4];
+	int m_pointCacheContactPointFlags[4];
+	double m_pointCacheAppliedImpulseLateral1[4];
+	double m_pointCacheAppliedImpulseLateral2[4];
+	double m_pointCacheContactMotion1[4];
+	double m_pointCacheContactMotion2[4];
+	double m_pointCacheContactCFM[4];
+	double m_pointCacheCombinedContactStiffness1[4];
+	double m_pointCacheContactERP[4];
+	double m_pointCacheCombinedContactDamping1[4];
+	double m_pointCacheFrictionCFM[4];
+	int m_pointCacheLifeTime[4];
+
+	int m_numCachedPoints;
+	int m_companionIdA;
+	int m_companionIdB;
+	int m_index1a;
+
+	int m_objectType;
+	double	m_contactBreakingThreshold;
+	double	m_contactProcessingThreshold;
+	int m_padding;
+
+	btCollisionObjectDoubleData *m_body0;
+	btCollisionObjectDoubleData *m_body1;
+};
+
+
+struct btPersistentManifoldFloatData
+{
+	btVector3FloatData m_pointCacheLocalPointA[4];
+	btVector3FloatData m_pointCacheLocalPointB[4];
+	btVector3FloatData m_pointCachePositionWorldOnA[4];
+	btVector3FloatData m_pointCachePositionWorldOnB[4];
+	btVector3FloatData m_pointCacheNormalWorldOnB[4];
+	btVector3FloatData	m_pointCacheLateralFrictionDir1[4];
+	btVector3FloatData	m_pointCacheLateralFrictionDir2[4];
+	float m_pointCacheDistance[4];
+	float m_pointCacheAppliedImpulse[4];
+	float m_pointCachePrevRHS[4];
+	float m_pointCacheCombinedFriction[4];
+	float m_pointCacheCombinedRollingFriction[4];
+	float m_pointCacheCombinedSpinningFriction[4];
+	float m_pointCacheCombinedRestitution[4];
+	int	m_pointCachePartId0[4];
+	int	m_pointCachePartId1[4];
+	int	m_pointCacheIndex0[4];
+	int	m_pointCacheIndex1[4];
+	int m_pointCacheContactPointFlags[4];
+	float m_pointCacheAppliedImpulseLateral1[4];
+	float m_pointCacheAppliedImpulseLateral2[4];
+	float m_pointCacheContactMotion1[4];
+	float m_pointCacheContactMotion2[4];
+	float m_pointCacheContactCFM[4];
+	float m_pointCacheCombinedContactStiffness1[4];
+	float m_pointCacheContactERP[4];
+	float m_pointCacheCombinedContactDamping1[4];
+	float m_pointCacheFrictionCFM[4];
+	int m_pointCacheLifeTime[4];
+
+	int m_numCachedPoints;
+	int m_companionIdA;
+	int m_companionIdB;
+	int m_index1a;
+
+	int m_objectType;
+	float	m_contactBreakingThreshold;
+	float	m_contactProcessingThreshold;
+	int m_padding;
+
+	btCollisionObjectFloatData *m_body0;
+	btCollisionObjectFloatData *m_body1;
+};
+
+// clang-format on
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btPersistentManifoldData btPersistentManifoldDoubleData
+#define btPersistentManifoldDataName "btPersistentManifoldDoubleData"
+#else
+#define btPersistentManifoldData btPersistentManifoldFloatData
+#define btPersistentManifoldDataName "btPersistentManifoldFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+#endif  //BT_PERSISTENT_MANIFOLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
new file mode 100644
index 0000000..adebcbe
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
@@ -0,0 +1,58 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_POINT_COLLECTOR_H
+#define BT_POINT_COLLECTOR_H
+
+#include "btDiscreteCollisionDetectorInterface.h"
+
+struct btPointCollector : public btDiscreteCollisionDetectorInterface::Result
+{
+	btVector3 m_normalOnBInWorld;
+	btVector3 m_pointInWorld;
+	btScalar m_distance;  //negative means penetration
+
+	bool m_hasResult;
+
+	btPointCollector()
+		: m_distance(btScalar(BT_LARGE_FLOAT)), m_hasResult(false)
+	{
+	}
+
+	virtual void setShapeIdentifiersA(int partId0, int index0)
+	{
+		(void)partId0;
+		(void)index0;
+	}
+	virtual void setShapeIdentifiersB(int partId1, int index1)
+	{
+		(void)partId1;
+		(void)index1;
+	}
+
+	virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth)
+	{
+		if (depth < m_distance)
+		{
+			m_hasResult = true;
+			m_normalOnBInWorld = normalOnBInWorld;
+			m_pointInWorld = pointInWorld;
+			//negative means penetration
+			m_distance = depth;
+		}
+	}
+};
+
+#endif  //BT_POINT_COLLECTOR_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
new file mode 100644
index 0000000..9d18360
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
@@ -0,0 +1,548 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+///Separating axis rest based on work from Pierre Terdiman, see
+///And contact clipping based on work from Simon Hobbs
+
+#include "btPolyhedralContactClipping.h"
+#include "BulletCollision/CollisionShapes/btConvexPolyhedron.h"
+
+#include <float.h>  //for FLT_MAX
+
+int gExpectedNbTests = 0;
+int gActualNbTests = 0;
+bool gUseInternalObject = true;
+
+// Clips a face to the back of a plane
+void btPolyhedralContactClipping::clipFace(const btVertexArray& pVtxIn, btVertexArray& ppVtxOut, const btVector3& planeNormalWS, btScalar planeEqWS)
+{
+	int ve;
+	btScalar ds, de;
+	int numVerts = pVtxIn.size();
+	if (numVerts < 2)
+		return;
+
+	btVector3 firstVertex = pVtxIn[pVtxIn.size() - 1];
+	btVector3 endVertex = pVtxIn[0];
+
+	ds = planeNormalWS.dot(firstVertex) + planeEqWS;
+
+	for (ve = 0; ve < numVerts; ve++)
+	{
+		endVertex = pVtxIn[ve];
+
+		de = planeNormalWS.dot(endVertex) + planeEqWS;
+
+		if (ds < 0)
+		{
+			if (de < 0)
+			{
+				// Start < 0, end < 0, so output endVertex
+				ppVtxOut.push_back(endVertex);
+			}
+			else
+			{
+				// Start < 0, end >= 0, so output intersection
+				ppVtxOut.push_back(firstVertex.lerp(endVertex, btScalar(ds * 1.f / (ds - de))));
+			}
+		}
+		else
+		{
+			if (de < 0)
+			{
+				// Start >= 0, end < 0 so output intersection and end
+				ppVtxOut.push_back(firstVertex.lerp(endVertex, btScalar(ds * 1.f / (ds - de))));
+				ppVtxOut.push_back(endVertex);
+			}
+		}
+		firstVertex = endVertex;
+		ds = de;
+	}
+}
+
+static bool TestSepAxis(const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA, const btTransform& transB, const btVector3& sep_axis, btScalar& depth, btVector3& witnessPointA, btVector3& witnessPointB)
+{
+	btScalar Min0, Max0;
+	btScalar Min1, Max1;
+	btVector3 witnesPtMinA, witnesPtMaxA;
+	btVector3 witnesPtMinB, witnesPtMaxB;
+
+	hullA.project(transA, sep_axis, Min0, Max0, witnesPtMinA, witnesPtMaxA);
+	hullB.project(transB, sep_axis, Min1, Max1, witnesPtMinB, witnesPtMaxB);
+
+	if (Max0 < Min1 || Max1 < Min0)
+		return false;
+
+	btScalar d0 = Max0 - Min1;
+	btAssert(d0 >= 0.0f);
+	btScalar d1 = Max1 - Min0;
+	btAssert(d1 >= 0.0f);
+	if (d0 < d1)
+	{
+		depth = d0;
+		witnessPointA = witnesPtMaxA;
+		witnessPointB = witnesPtMinB;
+	}
+	else
+	{
+		depth = d1;
+		witnessPointA = witnesPtMinA;
+		witnessPointB = witnesPtMaxB;
+	}
+
+	return true;
+}
+
+static int gActualSATPairTests = 0;
+
+inline bool IsAlmostZero(const btVector3& v)
+{
+	if (btFabs(v.x()) > 1e-6 || btFabs(v.y()) > 1e-6 || btFabs(v.z()) > 1e-6) return false;
+	return true;
+}
+
+#ifdef TEST_INTERNAL_OBJECTS
+
+inline void BoxSupport(const btScalar extents[3], const btScalar sv[3], btScalar p[3])
+{
+	// This version is ~11.000 cycles (4%) faster overall in one of the tests.
+	//	IR(p[0]) = IR(extents[0])|(IR(sv[0])&SIGN_BITMASK);
+	//	IR(p[1]) = IR(extents[1])|(IR(sv[1])&SIGN_BITMASK);
+	//	IR(p[2]) = IR(extents[2])|(IR(sv[2])&SIGN_BITMASK);
+	p[0] = sv[0] < 0.0f ? -extents[0] : extents[0];
+	p[1] = sv[1] < 0.0f ? -extents[1] : extents[1];
+	p[2] = sv[2] < 0.0f ? -extents[2] : extents[2];
+}
+
+void InverseTransformPoint3x3(btVector3& out, const btVector3& in, const btTransform& tr)
+{
+	const btMatrix3x3& rot = tr.getBasis();
+	const btVector3& r0 = rot[0];
+	const btVector3& r1 = rot[1];
+	const btVector3& r2 = rot[2];
+
+	const btScalar x = r0.x() * in.x() + r1.x() * in.y() + r2.x() * in.z();
+	const btScalar y = r0.y() * in.x() + r1.y() * in.y() + r2.y() * in.z();
+	const btScalar z = r0.z() * in.x() + r1.z() * in.y() + r2.z() * in.z();
+
+	out.setValue(x, y, z);
+}
+
+bool TestInternalObjects(const btTransform& trans0, const btTransform& trans1, const btVector3& delta_c, const btVector3& axis, const btConvexPolyhedron& convex0, const btConvexPolyhedron& convex1, btScalar dmin)
+{
+	const btScalar dp = delta_c.dot(axis);
+
+	btVector3 localAxis0;
+	InverseTransformPoint3x3(localAxis0, axis, trans0);
+	btVector3 localAxis1;
+	InverseTransformPoint3x3(localAxis1, axis, trans1);
+
+	btScalar p0[3];
+	BoxSupport(convex0.m_extents, localAxis0, p0);
+	btScalar p1[3];
+	BoxSupport(convex1.m_extents, localAxis1, p1);
+
+	const btScalar Radius0 = p0[0] * localAxis0.x() + p0[1] * localAxis0.y() + p0[2] * localAxis0.z();
+	const btScalar Radius1 = p1[0] * localAxis1.x() + p1[1] * localAxis1.y() + p1[2] * localAxis1.z();
+
+	const btScalar MinRadius = Radius0 > convex0.m_radius ? Radius0 : convex0.m_radius;
+	const btScalar MaxRadius = Radius1 > convex1.m_radius ? Radius1 : convex1.m_radius;
+
+	const btScalar MinMaxRadius = MaxRadius + MinRadius;
+	const btScalar d0 = MinMaxRadius + dp;
+	const btScalar d1 = MinMaxRadius - dp;
+
+	const btScalar depth = d0 < d1 ? d0 : d1;
+	if (depth > dmin)
+		return false;
+	return true;
+}
+#endif  //TEST_INTERNAL_OBJECTS
+
+SIMD_FORCE_INLINE void btSegmentsClosestPoints(
+	btVector3& ptsVector,
+	btVector3& offsetA,
+	btVector3& offsetB,
+	btScalar& tA, btScalar& tB,
+	const btVector3& translation,
+	const btVector3& dirA, btScalar hlenA,
+	const btVector3& dirB, btScalar hlenB)
+{
+	// compute the parameters of the closest points on each line segment
+
+	btScalar dirA_dot_dirB = btDot(dirA, dirB);
+	btScalar dirA_dot_trans = btDot(dirA, translation);
+	btScalar dirB_dot_trans = btDot(dirB, translation);
+
+	btScalar denom = 1.0f - dirA_dot_dirB * dirA_dot_dirB;
+
+	if (denom == 0.0f)
+	{
+		tA = 0.0f;
+	}
+	else
+	{
+		tA = (dirA_dot_trans - dirB_dot_trans * dirA_dot_dirB) / denom;
+		if (tA < -hlenA)
+			tA = -hlenA;
+		else if (tA > hlenA)
+			tA = hlenA;
+	}
+
+	tB = tA * dirA_dot_dirB - dirB_dot_trans;
+
+	if (tB < -hlenB)
+	{
+		tB = -hlenB;
+		tA = tB * dirA_dot_dirB + dirA_dot_trans;
+
+		if (tA < -hlenA)
+			tA = -hlenA;
+		else if (tA > hlenA)
+			tA = hlenA;
+	}
+	else if (tB > hlenB)
+	{
+		tB = hlenB;
+		tA = tB * dirA_dot_dirB + dirA_dot_trans;
+
+		if (tA < -hlenA)
+			tA = -hlenA;
+		else if (tA > hlenA)
+			tA = hlenA;
+	}
+
+	// compute the closest points relative to segment centers.
+
+	offsetA = dirA * tA;
+	offsetB = dirB * tB;
+
+	ptsVector = translation - offsetA + offsetB;
+}
+
+bool btPolyhedralContactClipping::findSeparatingAxis(const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA, const btTransform& transB, btVector3& sep, btDiscreteCollisionDetectorInterface::Result& resultOut)
+{
+	gActualSATPairTests++;
+
+	//#ifdef TEST_INTERNAL_OBJECTS
+	const btVector3 c0 = transA * hullA.m_localCenter;
+	const btVector3 c1 = transB * hullB.m_localCenter;
+	const btVector3 DeltaC2 = c0 - c1;
+	//#endif
+
+	btScalar dmin = FLT_MAX;
+	int curPlaneTests = 0;
+
+	int numFacesA = hullA.m_faces.size();
+	// Test normals from hullA
+	for (int i = 0; i < numFacesA; i++)
+	{
+		const btVector3 Normal(hullA.m_faces[i].m_plane[0], hullA.m_faces[i].m_plane[1], hullA.m_faces[i].m_plane[2]);
+		btVector3 faceANormalWS = transA.getBasis() * Normal;
+		if (DeltaC2.dot(faceANormalWS) < 0)
+			faceANormalWS *= -1.f;
+
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, faceANormalWS, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		btScalar d;
+		btVector3 wA, wB;
+		if (!TestSepAxis(hullA, hullB, transA, transB, faceANormalWS, d, wA, wB))
+			return false;
+
+		if (d < dmin)
+		{
+			dmin = d;
+			sep = faceANormalWS;
+		}
+	}
+
+	int numFacesB = hullB.m_faces.size();
+	// Test normals from hullB
+	for (int i = 0; i < numFacesB; i++)
+	{
+		const btVector3 Normal(hullB.m_faces[i].m_plane[0], hullB.m_faces[i].m_plane[1], hullB.m_faces[i].m_plane[2]);
+		btVector3 WorldNormal = transB.getBasis() * Normal;
+		if (DeltaC2.dot(WorldNormal) < 0)
+			WorldNormal *= -1.f;
+
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, WorldNormal, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		btScalar d;
+		btVector3 wA, wB;
+		if (!TestSepAxis(hullA, hullB, transA, transB, WorldNormal, d, wA, wB))
+			return false;
+
+		if (d < dmin)
+		{
+			dmin = d;
+			sep = WorldNormal;
+		}
+	}
+
+	btVector3 edgeAstart, edgeAend, edgeBstart, edgeBend;
+	int edgeA = -1;
+	int edgeB = -1;
+	btVector3 worldEdgeA;
+	btVector3 worldEdgeB;
+	btVector3 witnessPointA(0, 0, 0), witnessPointB(0, 0, 0);
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for (int e0 = 0; e0 < hullA.m_uniqueEdges.size(); e0++)
+	{
+		const btVector3 edge0 = hullA.m_uniqueEdges[e0];
+		const btVector3 WorldEdge0 = transA.getBasis() * edge0;
+		for (int e1 = 0; e1 < hullB.m_uniqueEdges.size(); e1++)
+		{
+			const btVector3 edge1 = hullB.m_uniqueEdges[e1];
+			const btVector3 WorldEdge1 = transB.getBasis() * edge1;
+
+			btVector3 Cross = WorldEdge0.cross(WorldEdge1);
+			curEdgeEdge++;
+			if (!IsAlmostZero(Cross))
+			{
+				Cross = Cross.normalize();
+				if (DeltaC2.dot(Cross) < 0)
+					Cross *= -1.f;
+
+#ifdef TEST_INTERNAL_OBJECTS
+				gExpectedNbTests++;
+				if (gUseInternalObject && !TestInternalObjects(transA, transB, DeltaC2, Cross, hullA, hullB, dmin))
+					continue;
+				gActualNbTests++;
+#endif
+
+				btScalar dist;
+				btVector3 wA, wB;
+				if (!TestSepAxis(hullA, hullB, transA, transB, Cross, dist, wA, wB))
+					return false;
+
+				if (dist < dmin)
+				{
+					dmin = dist;
+					sep = Cross;
+					edgeA = e0;
+					edgeB = e1;
+					worldEdgeA = WorldEdge0;
+					worldEdgeB = WorldEdge1;
+					witnessPointA = wA;
+					witnessPointB = wB;
+				}
+			}
+		}
+	}
+
+	if (edgeA >= 0 && edgeB >= 0)
+	{
+		//		printf("edge-edge\n");
+		//add an edge-edge contact
+
+		btVector3 ptsVector;
+		btVector3 offsetA;
+		btVector3 offsetB;
+		btScalar tA;
+		btScalar tB;
+
+		btVector3 translation = witnessPointB - witnessPointA;
+
+		btVector3 dirA = worldEdgeA;
+		btVector3 dirB = worldEdgeB;
+
+		btScalar hlenB = 1e30f;
+		btScalar hlenA = 1e30f;
+
+		btSegmentsClosestPoints(ptsVector, offsetA, offsetB, tA, tB,
+								translation,
+								dirA, hlenA,
+								dirB, hlenB);
+
+		btScalar nlSqrt = ptsVector.length2();
+		if (nlSqrt > SIMD_EPSILON)
+		{
+			btScalar nl = btSqrt(nlSqrt);
+			ptsVector *= 1.f / nl;
+			if (ptsVector.dot(DeltaC2) < 0.f)
+			{
+				ptsVector *= -1.f;
+			}
+			btVector3 ptOnB = witnessPointB + offsetB;
+			btScalar distance = nl;
+			resultOut.addContactPoint(ptsVector, ptOnB, -distance);
+		}
+	}
+
+	if ((DeltaC2.dot(sep)) < 0.0f)
+		sep = -sep;
+
+	return true;
+}
+
+void btPolyhedralContactClipping::clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btTransform& transA, btVertexArray& worldVertsB1, btVertexArray& worldVertsB2, const btScalar minDist, btScalar maxDist, btDiscreteCollisionDetectorInterface::Result& resultOut)
+{
+	worldVertsB2.resize(0);
+	btVertexArray* pVtxIn = &worldVertsB1;
+	btVertexArray* pVtxOut = &worldVertsB2;
+	pVtxOut->reserve(pVtxIn->size());
+
+	int closestFaceA = -1;
+	{
+		btScalar dmin = FLT_MAX;
+		for (int face = 0; face < hullA.m_faces.size(); face++)
+		{
+			const btVector3 Normal(hullA.m_faces[face].m_plane[0], hullA.m_faces[face].m_plane[1], hullA.m_faces[face].m_plane[2]);
+			const btVector3 faceANormalWS = transA.getBasis() * Normal;
+
+			btScalar d = faceANormalWS.dot(separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+			}
+		}
+	}
+	if (closestFaceA < 0)
+		return;
+
+	const btFace& polyA = hullA.m_faces[closestFaceA];
+
+	// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+	int numVerticesA = polyA.m_indices.size();
+	for (int e0 = 0; e0 < numVerticesA; e0++)
+	{
+		const btVector3& a = hullA.m_vertices[polyA.m_indices[e0]];
+		const btVector3& b = hullA.m_vertices[polyA.m_indices[(e0 + 1) % numVerticesA]];
+		const btVector3 edge0 = a - b;
+		const btVector3 WorldEdge0 = transA.getBasis() * edge0;
+		btVector3 worldPlaneAnormal1 = transA.getBasis() * btVector3(polyA.m_plane[0], polyA.m_plane[1], polyA.m_plane[2]);
+
+		btVector3 planeNormalWS1 = -WorldEdge0.cross(worldPlaneAnormal1);  //.cross(WorldEdge0);
+		btVector3 worldA1 = transA * a;
+		btScalar planeEqWS1 = -worldA1.dot(planeNormalWS1);
+
+//int otherFace=0;
+#ifdef BLA1
+		int otherFace = polyA.m_connectedFaces[e0];
+		btVector3 localPlaneNormal(hullA.m_faces[otherFace].m_plane[0], hullA.m_faces[otherFace].m_plane[1], hullA.m_faces[otherFace].m_plane[2]);
+		btScalar localPlaneEq = hullA.m_faces[otherFace].m_plane[3];
+
+		btVector3 planeNormalWS = transA.getBasis() * localPlaneNormal;
+		btScalar planeEqWS = localPlaneEq - planeNormalWS.dot(transA.getOrigin());
+#else
+		btVector3 planeNormalWS = planeNormalWS1;
+		btScalar planeEqWS = planeEqWS1;
+
+#endif
+		//clip face
+
+		clipFace(*pVtxIn, *pVtxOut, planeNormalWS, planeEqWS);
+		btSwap(pVtxIn, pVtxOut);
+		pVtxOut->resize(0);
+	}
+
+	//#define ONLY_REPORT_DEEPEST_POINT
+
+	btVector3 point;
+
+	// only keep points that are behind the witness face
+	{
+		btVector3 localPlaneNormal(polyA.m_plane[0], polyA.m_plane[1], polyA.m_plane[2]);
+		btScalar localPlaneEq = polyA.m_plane[3];
+		btVector3 planeNormalWS = transA.getBasis() * localPlaneNormal;
+		btScalar planeEqWS = localPlaneEq - planeNormalWS.dot(transA.getOrigin());
+		for (int i = 0; i < pVtxIn->size(); i++)
+		{
+			btVector3 vtx = pVtxIn->at(i);
+			btScalar depth = planeNormalWS.dot(vtx) + planeEqWS;
+			if (depth <= minDist)
+			{
+				//				printf("clamped: depth=%f to minDist=%f\n",depth,minDist);
+				depth = minDist;
+			}
+
+			if (depth <= maxDist)
+			{
+				btVector3 point = pVtxIn->at(i);
+#ifdef ONLY_REPORT_DEEPEST_POINT
+				curMaxDist = depth;
+#else
+#if 0
+				if (depth<-3)
+				{
+					printf("error in btPolyhedralContactClipping depth = %f\n", depth);
+					printf("likely wrong separatingNormal passed in\n");
+				}
+#endif
+				resultOut.addContactPoint(separatingNormal, point, depth);
+#endif
+			}
+		}
+	}
+#ifdef ONLY_REPORT_DEEPEST_POINT
+	if (curMaxDist < maxDist)
+	{
+		resultOut.addContactPoint(separatingNormal, point, curMaxDist);
+	}
+#endif  //ONLY_REPORT_DEEPEST_POINT
+}
+
+void btPolyhedralContactClipping::clipHullAgainstHull(const btVector3& separatingNormal1, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA, const btTransform& transB, const btScalar minDist, btScalar maxDist, btVertexArray& worldVertsB1, btVertexArray& worldVertsB2, btDiscreteCollisionDetectorInterface::Result& resultOut)
+{
+	btVector3 separatingNormal = separatingNormal1.normalized();
+	//	const btVector3 c0 = transA * hullA.m_localCenter;
+	//	const btVector3 c1 = transB * hullB.m_localCenter;
+	//const btVector3 DeltaC2 = c0 - c1;
+
+	int closestFaceB = -1;
+	btScalar dmax = -FLT_MAX;
+	{
+		for (int face = 0; face < hullB.m_faces.size(); face++)
+		{
+			const btVector3 Normal(hullB.m_faces[face].m_plane[0], hullB.m_faces[face].m_plane[1], hullB.m_faces[face].m_plane[2]);
+			const btVector3 WorldNormal = transB.getBasis() * Normal;
+			btScalar d = WorldNormal.dot(separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+	worldVertsB1.resize(0);
+	{
+		const btFace& polyB = hullB.m_faces[closestFaceB];
+		const int numVertices = polyB.m_indices.size();
+		for (int e0 = 0; e0 < numVertices; e0++)
+		{
+			const btVector3& b = hullB.m_vertices[polyB.m_indices[e0]];
+			worldVertsB1.push_back(transB * b);
+		}
+	}
+
+	if (closestFaceB >= 0)
+		clipFaceAgainstHull(separatingNormal, hullA, transA, worldVertsB1, worldVertsB2, minDist, maxDist, resultOut);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
new file mode 100644
index 0000000..328f642
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
@@ -0,0 +1,42 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_POLYHEDRAL_CONTACT_CLIPPING_H
+#define BT_POLYHEDRAL_CONTACT_CLIPPING_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btTransform.h"
+#include "btDiscreteCollisionDetectorInterface.h"
+
+class btConvexPolyhedron;
+
+typedef btAlignedObjectArray<btVector3> btVertexArray;
+
+// Clips a face to the back of a plane
+struct btPolyhedralContactClipping
+{
+	static void clipHullAgainstHull(const btVector3& separatingNormal1, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA, const btTransform& transB, const btScalar minDist, btScalar maxDist, btVertexArray& worldVertsB1, btVertexArray& worldVertsB2, btDiscreteCollisionDetectorInterface::Result& resultOut);
+
+	static void clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btTransform& transA, btVertexArray& worldVertsB1, btVertexArray& worldVertsB2, const btScalar minDist, btScalar maxDist, btDiscreteCollisionDetectorInterface::Result& resultOut);
+
+	static bool findSeparatingAxis(const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA, const btTransform& transB, btVector3& sep, btDiscreteCollisionDetectorInterface::Result& resultOut);
+
+	///the clipFace method is used internally
+	static void clipFace(const btVertexArray& pVtxIn, btVertexArray& ppVtxOut, const btVector3& planeNormalWS, btScalar planeEqWS);
+};
+
+#endif  // BT_POLYHEDRAL_CONTACT_CLIPPING_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
new file mode 100644
index 0000000..f2de4e9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
@@ -0,0 +1,175 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//#include <stdio.h>
+
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "btRaycastCallback.h"
+
+btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from, const btVector3& to, unsigned int flags)
+	: m_from(from),
+	  m_to(to),
+	  //@BP Mod
+	  m_flags(flags),
+	  m_hitFraction(btScalar(1.))
+{
+}
+
+void btTriangleRaycastCallback::processTriangle(btVector3* triangle, int partId, int triangleIndex)
+{
+	const btVector3& vert0 = triangle[0];
+	const btVector3& vert1 = triangle[1];
+	const btVector3& vert2 = triangle[2];
+
+	btVector3 v10;
+	v10 = vert1 - vert0;
+	btVector3 v20;
+	v20 = vert2 - vert0;
+
+	btVector3 triangleNormal;
+	triangleNormal = v10.cross(v20);
+
+	const btScalar dist = vert0.dot(triangleNormal);
+	btScalar dist_a = triangleNormal.dot(m_from);
+	dist_a -= dist;
+	btScalar dist_b = triangleNormal.dot(m_to);
+	dist_b -= dist;
+
+	if (dist_a * dist_b >= btScalar(0.0))
+	{
+		return;  // same sign
+	}
+
+	if (((m_flags & kF_FilterBackfaces) != 0) && (dist_a <= btScalar(0.0)))
+	{
+		// Backface, skip check
+		return;
+	}
+
+	const btScalar proj_length = dist_a - dist_b;
+	const btScalar distance = (dist_a) / (proj_length);
+	// Now we have the intersection point on the plane, we'll see if it's inside the triangle
+	// Add an epsilon as a tolerance for the raycast,
+	// in case the ray hits exacly on the edge of the triangle.
+	// It must be scaled for the triangle size.
+
+	if (distance < m_hitFraction)
+	{
+		btScalar edge_tolerance = triangleNormal.length2();
+		edge_tolerance *= btScalar(-0.0001);
+		btVector3 point;
+		point.setInterpolate3(m_from, m_to, distance);
+		{
+			btVector3 v0p;
+			v0p = vert0 - point;
+			btVector3 v1p;
+			v1p = vert1 - point;
+			btVector3 cp0;
+			cp0 = v0p.cross(v1p);
+
+			if ((btScalar)(cp0.dot(triangleNormal)) >= edge_tolerance)
+			{
+				btVector3 v2p;
+				v2p = vert2 - point;
+				btVector3 cp1;
+				cp1 = v1p.cross(v2p);
+				if ((btScalar)(cp1.dot(triangleNormal)) >= edge_tolerance)
+				{
+					btVector3 cp2;
+					cp2 = v2p.cross(v0p);
+
+					if ((btScalar)(cp2.dot(triangleNormal)) >= edge_tolerance)
+					{
+						//@BP Mod
+						// Triangle normal isn't normalized
+						triangleNormal.normalize();
+
+						//@BP Mod - Allow for unflipped normal when raycasting against backfaces
+						if (((m_flags & kF_KeepUnflippedNormal) == 0) && (dist_a <= btScalar(0.0)))
+						{
+							m_hitFraction = reportHit(-triangleNormal, distance, partId, triangleIndex);
+						}
+						else
+						{
+							m_hitFraction = reportHit(triangleNormal, distance, partId, triangleIndex);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+btTriangleConvexcastCallback::btTriangleConvexcastCallback(const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin)
+{
+	m_convexShape = convexShape;
+	m_convexShapeFrom = convexShapeFrom;
+	m_convexShapeTo = convexShapeTo;
+	m_triangleToWorld = triangleToWorld;
+	m_hitFraction = 1.0f;
+	m_triangleCollisionMargin = triangleCollisionMargin;
+	m_allowedPenetration = 0.f;
+}
+
+void btTriangleConvexcastCallback::processTriangle(btVector3* triangle, int partId, int triangleIndex)
+{
+	btTriangleShape triangleShape(triangle[0], triangle[1], triangle[2]);
+	triangleShape.setMargin(m_triangleCollisionMargin);
+
+	btVoronoiSimplexSolver simplexSolver;
+	btGjkEpaPenetrationDepthSolver gjkEpaPenetrationSolver;
+
+//#define  USE_SUBSIMPLEX_CONVEX_CAST 1
+//if you reenable USE_SUBSIMPLEX_CONVEX_CAST see commented out code below
+#ifdef USE_SUBSIMPLEX_CONVEX_CAST
+	btSubsimplexConvexCast convexCaster(m_convexShape, &triangleShape, &simplexSolver);
+#else
+	//btGjkConvexCast	convexCaster(m_convexShape,&triangleShape,&simplexSolver);
+	btContinuousConvexCollision convexCaster(m_convexShape, &triangleShape, &simplexSolver, &gjkEpaPenetrationSolver);
+#endif  //#USE_SUBSIMPLEX_CONVEX_CAST
+
+	btConvexCast::CastResult castResult;
+	castResult.m_fraction = btScalar(1.);
+	castResult.m_allowedPenetration = m_allowedPenetration;
+	if (convexCaster.calcTimeOfImpact(m_convexShapeFrom, m_convexShapeTo, m_triangleToWorld, m_triangleToWorld, castResult))
+	{
+		//add hit
+		if (castResult.m_normal.length2() > btScalar(0.0001))
+		{
+			if (castResult.m_fraction < m_hitFraction)
+			{
+				/* btContinuousConvexCast's normal is already in world space */
+				/*
+#ifdef USE_SUBSIMPLEX_CONVEX_CAST
+				//rotate normal into worldspace
+				castResult.m_normal = m_convexShapeFrom.getBasis() * castResult.m_normal;
+#endif //USE_SUBSIMPLEX_CONVEX_CAST
+*/
+				castResult.m_normal.normalize();
+
+				reportHit(castResult.m_normal,
+						  castResult.m_hitPoint,
+						  castResult.m_fraction,
+						  partId,
+						  triangleIndex);
+			}
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
new file mode 100644
index 0000000..58a48c7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
@@ -0,0 +1,72 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_RAYCAST_TRI_CALLBACK_H
+#define BT_RAYCAST_TRI_CALLBACK_H
+
+#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
+#include "LinearMath/btTransform.h"
+struct btBroadphaseProxy;
+class btConvexShape;
+
+class btTriangleRaycastCallback : public btTriangleCallback
+{
+public:
+	//input
+	btVector3 m_from;
+	btVector3 m_to;
+
+	//@BP Mod - allow backface filtering and unflipped normals
+	enum EFlags
+	{
+		kF_None = 0,
+		kF_FilterBackfaces = 1 << 0,
+		kF_KeepUnflippedNormal = 1 << 1,             // Prevents returned face normal getting flipped when a ray hits a back-facing triangle
+													 ///SubSimplexConvexCastRaytest is the default, even if kF_None is set.
+		kF_UseSubSimplexConvexCastRaytest = 1 << 2,  // Uses an approximate but faster ray versus convex intersection algorithm
+		kF_UseGjkConvexCastRaytest = 1 << 3,
+		kF_DisableHeightfieldAccelerator  = 1 << 4, //don't use the heightfield raycast accelerator. See https://github.com/bulletphysics/bullet3/pull/2062
+		kF_Terminator = 0xFFFFFFFF
+	};
+	unsigned int m_flags;
+
+	btScalar m_hitFraction;
+
+	btTriangleRaycastCallback(const btVector3& from, const btVector3& to, unsigned int flags = 0);
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
+
+	virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
+};
+
+class btTriangleConvexcastCallback : public btTriangleCallback
+{
+public:
+	const btConvexShape* m_convexShape;
+	btTransform m_convexShapeFrom;
+	btTransform m_convexShapeTo;
+	btTransform m_triangleToWorld;
+	btScalar m_hitFraction;
+	btScalar m_triangleCollisionMargin;
+	btScalar m_allowedPenetration;
+
+	btTriangleConvexcastCallback(const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin);
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
+
+	virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
+};
+
+#endif  //BT_RAYCAST_TRI_CALLBACK_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
new file mode 100644
index 0000000..b994aca
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
@@ -0,0 +1,58 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMPLEX_SOLVER_INTERFACE_H
+#define BT_SIMPLEX_SOLVER_INTERFACE_H
+
+#include "LinearMath/btVector3.h"
+
+#define NO_VIRTUAL_INTERFACE 1
+#ifdef NO_VIRTUAL_INTERFACE
+#include "btVoronoiSimplexSolver.h"
+#define btSimplexSolverInterface btVoronoiSimplexSolver
+#else
+
+/// btSimplexSolverInterface can incrementally calculate distance between origin and up to 4 vertices
+/// Used by GJK or Linear Casting. Can be implemented by the Johnson-algorithm or alternative approaches based on
+/// voronoi regions or barycentric coordinates
+class btSimplexSolverInterface
+{
+public:
+	virtual ~btSimplexSolverInterface(){};
+
+	virtual void reset() = 0;
+
+	virtual void addVertex(const btVector3& w, const btVector3& p, const btVector3& q) = 0;
+
+	virtual bool closest(btVector3& v) = 0;
+
+	virtual btScalar maxVertex() = 0;
+
+	virtual bool fullSimplex() const = 0;
+
+	virtual int getSimplex(btVector3* pBuf, btVector3* qBuf, btVector3* yBuf) const = 0;
+
+	virtual bool inSimplex(const btVector3& w) = 0;
+
+	virtual void backup_closest(btVector3& v) = 0;
+
+	virtual bool emptySimplex() const = 0;
+
+	virtual void compute_points(btVector3& p1, btVector3& p2) = 0;
+
+	virtual int numVertices() const = 0;
+};
+#endif
+#endif  //BT_SIMPLEX_SOLVER_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
new file mode 100644
index 0000000..8b011a8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
@@ -0,0 +1,143 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSubSimplexConvexCast.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+
+#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
+#include "btPointCollector.h"
+#include "LinearMath/btTransformUtil.h"
+
+btSubsimplexConvexCast::btSubsimplexConvexCast(const btConvexShape* convexA, const btConvexShape* convexB, btSimplexSolverInterface* simplexSolver)
+	: m_simplexSolver(simplexSolver),
+	  m_convexA(convexA),
+	  m_convexB(convexB)
+{
+}
+
+
+bool btSubsimplexConvexCast::calcTimeOfImpact(
+	const btTransform& fromA,
+	const btTransform& toA,
+	const btTransform& fromB,
+	const btTransform& toB,
+	CastResult& result)
+{
+	m_simplexSolver->reset();
+
+	btVector3 linVelA, linVelB;
+	linVelA = toA.getOrigin() - fromA.getOrigin();
+	linVelB = toB.getOrigin() - fromB.getOrigin();
+
+	btScalar lambda = btScalar(0.);
+
+	btTransform interpolatedTransA = fromA;
+	btTransform interpolatedTransB = fromB;
+
+	///take relative motion
+	btVector3 r = (linVelA - linVelB);
+	btVector3 v;
+
+	btVector3 supVertexA = fromA(m_convexA->localGetSupportingVertex(-r * fromA.getBasis()));
+	btVector3 supVertexB = fromB(m_convexB->localGetSupportingVertex(r * fromB.getBasis()));
+	v = supVertexA - supVertexB;
+	int maxIter = result.m_subSimplexCastMaxIterations;
+
+	btVector3 n;
+	n.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+
+	btVector3 c;
+
+	btScalar dist2 = v.length2();
+
+
+
+	btVector3 w, p;
+	btScalar VdotR;
+
+	while ((dist2 > result.m_subSimplexCastEpsilon) && maxIter--)
+	{
+		supVertexA = interpolatedTransA(m_convexA->localGetSupportingVertex(-v * interpolatedTransA.getBasis()));
+		supVertexB = interpolatedTransB(m_convexB->localGetSupportingVertex(v * interpolatedTransB.getBasis()));
+		w = supVertexA - supVertexB;
+
+		btScalar VdotW = v.dot(w);
+
+		if (lambda > btScalar(1.0))
+		{
+			return false;
+		}
+
+		if (VdotW > btScalar(0.))
+		{
+			VdotR = v.dot(r);
+
+			if (VdotR >= -(SIMD_EPSILON * SIMD_EPSILON))
+				return false;
+			else
+			{
+				lambda = lambda - VdotW / VdotR;
+				//interpolate to next lambda
+				//	x = s + lambda * r;
+				interpolatedTransA.getOrigin().setInterpolate3(fromA.getOrigin(), toA.getOrigin(), lambda);
+				interpolatedTransB.getOrigin().setInterpolate3(fromB.getOrigin(), toB.getOrigin(), lambda);
+				//m_simplexSolver->reset();
+				//check next line
+				w = supVertexA - supVertexB;
+
+				n = v;
+			}
+		}
+		///Just like regular GJK only add the vertex if it isn't already (close) to current vertex, it would lead to divisions by zero and NaN etc.
+		if (!m_simplexSolver->inSimplex(w))
+			m_simplexSolver->addVertex(w, supVertexA, supVertexB);
+
+		if (m_simplexSolver->closest(v))
+		{
+			dist2 = v.length2();
+
+			//todo: check this normal for validity
+			//n=v;
+			//printf("V=%f , %f, %f\n",v[0],v[1],v[2]);
+			//printf("DIST2=%f\n",dist2);
+			//printf("numverts = %i\n",m_simplexSolver->numVertices());
+		}
+		else
+		{
+			dist2 = btScalar(0.);
+		}
+	}
+
+	//int numiter = MAX_ITERATIONS - maxIter;
+	//	printf("number of iterations: %d", numiter);
+
+	//don't report a time of impact when moving 'away' from the hitnormal
+
+	result.m_fraction = lambda;
+	if (n.length2() >= (SIMD_EPSILON * SIMD_EPSILON))
+		result.m_normal = n.normalized();
+	else
+		result.m_normal = btVector3(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+
+	//don't report time of impact for motion away from the contact normal (or causes minor penetration)
+	if (result.m_normal.dot(r) >= -result.m_allowedPenetration)
+		return false;
+
+	btVector3 hitA, hitB;
+	m_simplexSolver->compute_points(hitA, hitB);
+	result.m_hitPoint = hitB;
+	return true;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
new file mode 100644
index 0000000..e2b6bbc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
@@ -0,0 +1,47 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SUBSIMPLEX_CONVEX_CAST_H
+#define BT_SUBSIMPLEX_CONVEX_CAST_H
+
+#include "btConvexCast.h"
+#include "btSimplexSolverInterface.h"
+class btConvexShape;
+
+/// btSubsimplexConvexCast implements Gino van den Bergens' paper
+///"Ray Casting against bteral Convex Objects with Application to Continuous Collision Detection"
+/// GJK based Ray Cast, optimized version
+/// Objects should not start in overlap, otherwise results are not defined.
+class btSubsimplexConvexCast : public btConvexCast
+{
+	btSimplexSolverInterface* m_simplexSolver;
+	const btConvexShape* m_convexA;
+	const btConvexShape* m_convexB;
+
+public:
+	btSubsimplexConvexCast(const btConvexShape* shapeA, const btConvexShape* shapeB, btSimplexSolverInterface* simplexSolver);
+
+	//virtual ~btSubsimplexConvexCast();
+	///SimsimplexConvexCast calculateTimeOfImpact calculates the time of impact+normal for the linear cast (sweep) between two moving objects.
+	///Precondition is that objects should not penetration/overlap at the start from the interval. Overlap can be tested using btGjkPairDetector.
+	virtual bool calcTimeOfImpact(
+		const btTransform& fromA,
+		const btTransform& toA,
+		const btTransform& fromB,
+		const btTransform& toB,
+		CastResult& result);
+};
+
+#endif  //BT_SUBSIMPLEX_CONVEX_CAST_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
new file mode 100644
index 0000000..6b65a25
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
@@ -0,0 +1,577 @@
+
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+	
+	Elsevier CDROM license agreements grants nonexclusive license to use the software
+	for any purpose, commercial or non-commercial as long as the following credit is included
+	identifying the original source of the software:
+
+	Parts of the source are "from the book Real-Time Collision Detection by
+	Christer Ericson, published by Morgan Kaufmann Publishers,
+	(c) 2005 Elsevier Inc."
+		
+*/
+
+#include "btVoronoiSimplexSolver.h"
+
+#define VERTA 0
+#define VERTB 1
+#define VERTC 2
+#define VERTD 3
+
+#define CATCH_DEGENERATE_TETRAHEDRON 1
+void btVoronoiSimplexSolver::removeVertex(int index)
+{
+	btAssert(m_numVertices > 0);
+	m_numVertices--;
+	m_simplexVectorW[index] = m_simplexVectorW[m_numVertices];
+	m_simplexPointsP[index] = m_simplexPointsP[m_numVertices];
+	m_simplexPointsQ[index] = m_simplexPointsQ[m_numVertices];
+}
+
+void btVoronoiSimplexSolver::reduceVertices(const btUsageBitfield& usedVerts)
+{
+	if ((numVertices() >= 4) && (!usedVerts.usedVertexD))
+		removeVertex(3);
+
+	if ((numVertices() >= 3) && (!usedVerts.usedVertexC))
+		removeVertex(2);
+
+	if ((numVertices() >= 2) && (!usedVerts.usedVertexB))
+		removeVertex(1);
+
+	if ((numVertices() >= 1) && (!usedVerts.usedVertexA))
+		removeVertex(0);
+}
+
+//clear the simplex, remove all the vertices
+void btVoronoiSimplexSolver::reset()
+{
+	m_cachedValidClosest = false;
+	m_numVertices = 0;
+	m_needsUpdate = true;
+	m_lastW = btVector3(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+	m_cachedBC.reset();
+}
+
+//add a vertex
+void btVoronoiSimplexSolver::addVertex(const btVector3& w, const btVector3& p, const btVector3& q)
+{
+	m_lastW = w;
+	m_needsUpdate = true;
+
+	m_simplexVectorW[m_numVertices] = w;
+	m_simplexPointsP[m_numVertices] = p;
+	m_simplexPointsQ[m_numVertices] = q;
+
+	m_numVertices++;
+}
+
+bool btVoronoiSimplexSolver::updateClosestVectorAndPoints()
+{
+	if (m_needsUpdate)
+	{
+		m_cachedBC.reset();
+
+		m_needsUpdate = false;
+
+		switch (numVertices())
+		{
+			case 0:
+				m_cachedValidClosest = false;
+				break;
+			case 1:
+			{
+				m_cachedP1 = m_simplexPointsP[0];
+				m_cachedP2 = m_simplexPointsQ[0];
+				m_cachedV = m_cachedP1 - m_cachedP2;  //== m_simplexVectorW[0]
+				m_cachedBC.reset();
+				m_cachedBC.setBarycentricCoordinates(btScalar(1.), btScalar(0.), btScalar(0.), btScalar(0.));
+				m_cachedValidClosest = m_cachedBC.isValid();
+				break;
+			};
+			case 2:
+			{
+				//closest point origin from line segment
+				const btVector3& from = m_simplexVectorW[0];
+				const btVector3& to = m_simplexVectorW[1];
+				btVector3 nearest;
+
+				btVector3 p(btScalar(0.), btScalar(0.), btScalar(0.));
+				btVector3 diff = p - from;
+				btVector3 v = to - from;
+				btScalar t = v.dot(diff);
+
+				if (t > 0)
+				{
+					btScalar dotVV = v.dot(v);
+					if (t < dotVV)
+					{
+						t /= dotVV;
+						diff -= t * v;
+						m_cachedBC.m_usedVertices.usedVertexA = true;
+						m_cachedBC.m_usedVertices.usedVertexB = true;
+					}
+					else
+					{
+						t = 1;
+						diff -= v;
+						//reduce to 1 point
+						m_cachedBC.m_usedVertices.usedVertexB = true;
+					}
+				}
+				else
+				{
+					t = 0;
+					//reduce to 1 point
+					m_cachedBC.m_usedVertices.usedVertexA = true;
+				}
+				m_cachedBC.setBarycentricCoordinates(1 - t, t);
+				nearest = from + t * v;
+
+				m_cachedP1 = m_simplexPointsP[0] + t * (m_simplexPointsP[1] - m_simplexPointsP[0]);
+				m_cachedP2 = m_simplexPointsQ[0] + t * (m_simplexPointsQ[1] - m_simplexPointsQ[0]);
+				m_cachedV = m_cachedP1 - m_cachedP2;
+
+				reduceVertices(m_cachedBC.m_usedVertices);
+
+				m_cachedValidClosest = m_cachedBC.isValid();
+				break;
+			}
+			case 3:
+			{
+				//closest point origin from triangle
+				btVector3 p(btScalar(0.), btScalar(0.), btScalar(0.));
+
+				const btVector3& a = m_simplexVectorW[0];
+				const btVector3& b = m_simplexVectorW[1];
+				const btVector3& c = m_simplexVectorW[2];
+
+				closestPtPointTriangle(p, a, b, c, m_cachedBC);
+				m_cachedP1 = m_simplexPointsP[0] * m_cachedBC.m_barycentricCoords[0] +
+							 m_simplexPointsP[1] * m_cachedBC.m_barycentricCoords[1] +
+							 m_simplexPointsP[2] * m_cachedBC.m_barycentricCoords[2];
+
+				m_cachedP2 = m_simplexPointsQ[0] * m_cachedBC.m_barycentricCoords[0] +
+							 m_simplexPointsQ[1] * m_cachedBC.m_barycentricCoords[1] +
+							 m_simplexPointsQ[2] * m_cachedBC.m_barycentricCoords[2];
+
+				m_cachedV = m_cachedP1 - m_cachedP2;
+
+				reduceVertices(m_cachedBC.m_usedVertices);
+				m_cachedValidClosest = m_cachedBC.isValid();
+
+				break;
+			}
+			case 4:
+			{
+				btVector3 p(btScalar(0.), btScalar(0.), btScalar(0.));
+
+				const btVector3& a = m_simplexVectorW[0];
+				const btVector3& b = m_simplexVectorW[1];
+				const btVector3& c = m_simplexVectorW[2];
+				const btVector3& d = m_simplexVectorW[3];
+
+				bool hasSeparation = closestPtPointTetrahedron(p, a, b, c, d, m_cachedBC);
+
+				if (hasSeparation)
+				{
+					m_cachedP1 = m_simplexPointsP[0] * m_cachedBC.m_barycentricCoords[0] +
+								 m_simplexPointsP[1] * m_cachedBC.m_barycentricCoords[1] +
+								 m_simplexPointsP[2] * m_cachedBC.m_barycentricCoords[2] +
+								 m_simplexPointsP[3] * m_cachedBC.m_barycentricCoords[3];
+
+					m_cachedP2 = m_simplexPointsQ[0] * m_cachedBC.m_barycentricCoords[0] +
+								 m_simplexPointsQ[1] * m_cachedBC.m_barycentricCoords[1] +
+								 m_simplexPointsQ[2] * m_cachedBC.m_barycentricCoords[2] +
+								 m_simplexPointsQ[3] * m_cachedBC.m_barycentricCoords[3];
+
+					m_cachedV = m_cachedP1 - m_cachedP2;
+					reduceVertices(m_cachedBC.m_usedVertices);
+				}
+				else
+				{
+					//					printf("sub distance got penetration\n");
+
+					if (m_cachedBC.m_degenerate)
+					{
+						m_cachedValidClosest = false;
+					}
+					else
+					{
+						m_cachedValidClosest = true;
+						//degenerate case == false, penetration = true + zero
+						m_cachedV.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+					}
+					break;
+				}
+
+				m_cachedValidClosest = m_cachedBC.isValid();
+
+				//closest point origin from tetrahedron
+				break;
+			}
+			default:
+			{
+				m_cachedValidClosest = false;
+			}
+		};
+	}
+
+	return m_cachedValidClosest;
+}
+
+//return/calculate the closest vertex
+bool btVoronoiSimplexSolver::closest(btVector3& v)
+{
+	bool succes = updateClosestVectorAndPoints();
+	v = m_cachedV;
+	return succes;
+}
+
+btScalar btVoronoiSimplexSolver::maxVertex()
+{
+	int i, numverts = numVertices();
+	btScalar maxV = btScalar(0.);
+	for (i = 0; i < numverts; i++)
+	{
+		btScalar curLen2 = m_simplexVectorW[i].length2();
+		if (maxV < curLen2)
+			maxV = curLen2;
+	}
+	return maxV;
+}
+
+//return the current simplex
+int btVoronoiSimplexSolver::getSimplex(btVector3* pBuf, btVector3* qBuf, btVector3* yBuf) const
+{
+	int i;
+	for (i = 0; i < numVertices(); i++)
+	{
+		yBuf[i] = m_simplexVectorW[i];
+		pBuf[i] = m_simplexPointsP[i];
+		qBuf[i] = m_simplexPointsQ[i];
+	}
+	return numVertices();
+}
+
+bool btVoronoiSimplexSolver::inSimplex(const btVector3& w)
+{
+	bool found = false;
+	int i, numverts = numVertices();
+	//btScalar maxV = btScalar(0.);
+
+	//w is in the current (reduced) simplex
+	for (i = 0; i < numverts; i++)
+	{
+#ifdef BT_USE_EQUAL_VERTEX_THRESHOLD
+		if (m_simplexVectorW[i].distance2(w) <= m_equalVertexThreshold)
+#else
+		if (m_simplexVectorW[i] == w)
+#endif
+		{
+			found = true;
+			break;
+		}
+	}
+
+	//check in case lastW is already removed
+	if (w == m_lastW)
+		return true;
+
+	return found;
+}
+
+void btVoronoiSimplexSolver::backup_closest(btVector3& v)
+{
+	v = m_cachedV;
+}
+
+bool btVoronoiSimplexSolver::emptySimplex() const
+{
+	return (numVertices() == 0);
+}
+
+void btVoronoiSimplexSolver::compute_points(btVector3& p1, btVector3& p2)
+{
+	updateClosestVectorAndPoints();
+	p1 = m_cachedP1;
+	p2 = m_cachedP2;
+}
+
+bool btVoronoiSimplexSolver::closestPtPointTriangle(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, btSubSimplexClosestResult& result)
+{
+	result.m_usedVertices.reset();
+
+	// Check if P in vertex region outside A
+	btVector3 ab = b - a;
+	btVector3 ac = c - a;
+	btVector3 ap = p - a;
+	btScalar d1 = ab.dot(ap);
+	btScalar d2 = ac.dot(ap);
+	if (d1 <= btScalar(0.0) && d2 <= btScalar(0.0))
+	{
+		result.m_closestPointOnSimplex = a;
+		result.m_usedVertices.usedVertexA = true;
+		result.setBarycentricCoordinates(1, 0, 0);
+		return true;  // a; // barycentric coordinates (1,0,0)
+	}
+
+	// Check if P in vertex region outside B
+	btVector3 bp = p - b;
+	btScalar d3 = ab.dot(bp);
+	btScalar d4 = ac.dot(bp);
+	if (d3 >= btScalar(0.0) && d4 <= d3)
+	{
+		result.m_closestPointOnSimplex = b;
+		result.m_usedVertices.usedVertexB = true;
+		result.setBarycentricCoordinates(0, 1, 0);
+
+		return true;  // b; // barycentric coordinates (0,1,0)
+	}
+	// Check if P in edge region of AB, if so return projection of P onto AB
+	btScalar vc = d1 * d4 - d3 * d2;
+	if (vc <= btScalar(0.0) && d1 >= btScalar(0.0) && d3 <= btScalar(0.0))
+	{
+		btScalar v = d1 / (d1 - d3);
+		result.m_closestPointOnSimplex = a + v * ab;
+		result.m_usedVertices.usedVertexA = true;
+		result.m_usedVertices.usedVertexB = true;
+		result.setBarycentricCoordinates(1 - v, v, 0);
+		return true;
+		//return a + v * ab; // barycentric coordinates (1-v,v,0)
+	}
+
+	// Check if P in vertex region outside C
+	btVector3 cp = p - c;
+	btScalar d5 = ab.dot(cp);
+	btScalar d6 = ac.dot(cp);
+	if (d6 >= btScalar(0.0) && d5 <= d6)
+	{
+		result.m_closestPointOnSimplex = c;
+		result.m_usedVertices.usedVertexC = true;
+		result.setBarycentricCoordinates(0, 0, 1);
+		return true;  //c; // barycentric coordinates (0,0,1)
+	}
+
+	// Check if P in edge region of AC, if so return projection of P onto AC
+	btScalar vb = d5 * d2 - d1 * d6;
+	if (vb <= btScalar(0.0) && d2 >= btScalar(0.0) && d6 <= btScalar(0.0))
+	{
+		btScalar w = d2 / (d2 - d6);
+		result.m_closestPointOnSimplex = a + w * ac;
+		result.m_usedVertices.usedVertexA = true;
+		result.m_usedVertices.usedVertexC = true;
+		result.setBarycentricCoordinates(1 - w, 0, w);
+		return true;
+		//return a + w * ac; // barycentric coordinates (1-w,0,w)
+	}
+
+	// Check if P in edge region of BC, if so return projection of P onto BC
+	btScalar va = d3 * d6 - d5 * d4;
+	if (va <= btScalar(0.0) && (d4 - d3) >= btScalar(0.0) && (d5 - d6) >= btScalar(0.0))
+	{
+		btScalar w = (d4 - d3) / ((d4 - d3) + (d5 - d6));
+
+		result.m_closestPointOnSimplex = b + w * (c - b);
+		result.m_usedVertices.usedVertexB = true;
+		result.m_usedVertices.usedVertexC = true;
+		result.setBarycentricCoordinates(0, 1 - w, w);
+		return true;
+		// return b + w * (c - b); // barycentric coordinates (0,1-w,w)
+	}
+
+	// P inside face region. Compute Q through its barycentric coordinates (u,v,w)
+	btScalar denom = btScalar(1.0) / (va + vb + vc);
+	btScalar v = vb * denom;
+	btScalar w = vc * denom;
+
+	result.m_closestPointOnSimplex = a + ab * v + ac * w;
+	result.m_usedVertices.usedVertexA = true;
+	result.m_usedVertices.usedVertexB = true;
+	result.m_usedVertices.usedVertexC = true;
+	result.setBarycentricCoordinates(1 - v - w, v, w);
+
+	return true;
+	//	return a + ab * v + ac * w; // = u*a + v*b + w*c, u = va * denom = btScalar(1.0) - v - w
+}
+
+/// Test if point p and d lie on opposite sides of plane through abc
+int btVoronoiSimplexSolver::pointOutsideOfPlane(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d)
+{
+	btVector3 normal = (b - a).cross(c - a);
+
+	btScalar signp = (p - a).dot(normal);  // [AP AB AC]
+	btScalar signd = (d - a).dot(normal);  // [AD AB AC]
+
+#ifdef CATCH_DEGENERATE_TETRAHEDRON
+#ifdef BT_USE_DOUBLE_PRECISION
+	if (signd * signd < (btScalar(1e-8) * btScalar(1e-8)))
+	{
+		return -1;
+	}
+#else
+	if (signd * signd < (btScalar(1e-4) * btScalar(1e-4)))
+	{
+		//		printf("affine dependent/degenerate\n");//
+		return -1;
+	}
+#endif
+
+#endif
+	// Points on opposite sides if expression signs are opposite
+	return signp * signd < btScalar(0.);
+}
+
+bool btVoronoiSimplexSolver::closestPtPointTetrahedron(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d, btSubSimplexClosestResult& finalResult)
+{
+	btSubSimplexClosestResult tempResult;
+
+	// Start out assuming point inside all halfspaces, so closest to itself
+	finalResult.m_closestPointOnSimplex = p;
+	finalResult.m_usedVertices.reset();
+	finalResult.m_usedVertices.usedVertexA = true;
+	finalResult.m_usedVertices.usedVertexB = true;
+	finalResult.m_usedVertices.usedVertexC = true;
+	finalResult.m_usedVertices.usedVertexD = true;
+
+	int pointOutsideABC = pointOutsideOfPlane(p, a, b, c, d);
+	int pointOutsideACD = pointOutsideOfPlane(p, a, c, d, b);
+	int pointOutsideADB = pointOutsideOfPlane(p, a, d, b, c);
+	int pointOutsideBDC = pointOutsideOfPlane(p, b, d, c, a);
+
+	if (pointOutsideABC < 0 || pointOutsideACD < 0 || pointOutsideADB < 0 || pointOutsideBDC < 0)
+	{
+		finalResult.m_degenerate = true;
+		return false;
+	}
+
+	if (!pointOutsideABC && !pointOutsideACD && !pointOutsideADB && !pointOutsideBDC)
+	{
+		return false;
+	}
+
+	btScalar bestSqDist = FLT_MAX;
+	// If point outside face abc then compute closest point on abc
+	if (pointOutsideABC)
+	{
+		closestPtPointTriangle(p, a, b, c, tempResult);
+		btVector3 q = tempResult.m_closestPointOnSimplex;
+
+		btScalar sqDist = (q - p).dot(q - p);
+		// Update best closest point if (squared) distance is less than current best
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			//convert result bitmask!
+			finalResult.m_usedVertices.reset();
+			finalResult.m_usedVertices.usedVertexA = tempResult.m_usedVertices.usedVertexA;
+			finalResult.m_usedVertices.usedVertexB = tempResult.m_usedVertices.usedVertexB;
+			finalResult.m_usedVertices.usedVertexC = tempResult.m_usedVertices.usedVertexC;
+			finalResult.setBarycentricCoordinates(
+				tempResult.m_barycentricCoords[VERTA],
+				tempResult.m_barycentricCoords[VERTB],
+				tempResult.m_barycentricCoords[VERTC],
+				0);
+		}
+	}
+
+	// Repeat test for face acd
+	if (pointOutsideACD)
+	{
+		closestPtPointTriangle(p, a, c, d, tempResult);
+		btVector3 q = tempResult.m_closestPointOnSimplex;
+		//convert result bitmask!
+
+		btScalar sqDist = (q - p).dot(q - p);
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			finalResult.m_usedVertices.reset();
+			finalResult.m_usedVertices.usedVertexA = tempResult.m_usedVertices.usedVertexA;
+
+			finalResult.m_usedVertices.usedVertexC = tempResult.m_usedVertices.usedVertexB;
+			finalResult.m_usedVertices.usedVertexD = tempResult.m_usedVertices.usedVertexC;
+			finalResult.setBarycentricCoordinates(
+				tempResult.m_barycentricCoords[VERTA],
+				0,
+				tempResult.m_barycentricCoords[VERTB],
+				tempResult.m_barycentricCoords[VERTC]);
+		}
+	}
+	// Repeat test for face adb
+
+	if (pointOutsideADB)
+	{
+		closestPtPointTriangle(p, a, d, b, tempResult);
+		btVector3 q = tempResult.m_closestPointOnSimplex;
+		//convert result bitmask!
+
+		btScalar sqDist = (q - p).dot(q - p);
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			finalResult.m_usedVertices.reset();
+			finalResult.m_usedVertices.usedVertexA = tempResult.m_usedVertices.usedVertexA;
+			finalResult.m_usedVertices.usedVertexB = tempResult.m_usedVertices.usedVertexC;
+
+			finalResult.m_usedVertices.usedVertexD = tempResult.m_usedVertices.usedVertexB;
+			finalResult.setBarycentricCoordinates(
+				tempResult.m_barycentricCoords[VERTA],
+				tempResult.m_barycentricCoords[VERTC],
+				0,
+				tempResult.m_barycentricCoords[VERTB]);
+		}
+	}
+	// Repeat test for face bdc
+
+	if (pointOutsideBDC)
+	{
+		closestPtPointTriangle(p, b, d, c, tempResult);
+		btVector3 q = tempResult.m_closestPointOnSimplex;
+		//convert result bitmask!
+		btScalar sqDist = (q - p).dot(q - p);
+		if (sqDist < bestSqDist)
+		{
+			bestSqDist = sqDist;
+			finalResult.m_closestPointOnSimplex = q;
+			finalResult.m_usedVertices.reset();
+			//
+			finalResult.m_usedVertices.usedVertexB = tempResult.m_usedVertices.usedVertexA;
+			finalResult.m_usedVertices.usedVertexC = tempResult.m_usedVertices.usedVertexC;
+			finalResult.m_usedVertices.usedVertexD = tempResult.m_usedVertices.usedVertexB;
+
+			finalResult.setBarycentricCoordinates(
+				0,
+				tempResult.m_barycentricCoords[VERTA],
+				tempResult.m_barycentricCoords[VERTC],
+				tempResult.m_barycentricCoords[VERTB]);
+		}
+	}
+
+	//help! we ended up full !
+
+	if (finalResult.m_usedVertices.usedVertexA &&
+		finalResult.m_usedVertices.usedVertexB &&
+		finalResult.m_usedVertices.usedVertexC &&
+		finalResult.m_usedVertices.usedVertexD)
+	{
+		return true;
+	}
+
+	return true;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
new file mode 100644
index 0000000..5ed896f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
@@ -0,0 +1,173 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_VORONOI_SIMPLEX_SOLVER_H
+#define BT_VORONOI_SIMPLEX_SOLVER_H
+
+#include "btSimplexSolverInterface.h"
+
+#define VORONOI_SIMPLEX_MAX_VERTS 5
+
+///disable next define, or use defaultCollisionConfiguration->getSimplexSolver()->setEqualVertexThreshold(0.f) to disable/configure
+#define BT_USE_EQUAL_VERTEX_THRESHOLD
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD 1e-12f
+#else
+#define VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD 0.0001f
+#endif  //BT_USE_DOUBLE_PRECISION
+
+struct btUsageBitfield
+{
+	btUsageBitfield()
+	{
+		reset();
+	}
+
+	void reset()
+	{
+		usedVertexA = false;
+		usedVertexB = false;
+		usedVertexC = false;
+		usedVertexD = false;
+	}
+	unsigned short usedVertexA : 1;
+	unsigned short usedVertexB : 1;
+	unsigned short usedVertexC : 1;
+	unsigned short usedVertexD : 1;
+	unsigned short unused1 : 1;
+	unsigned short unused2 : 1;
+	unsigned short unused3 : 1;
+	unsigned short unused4 : 1;
+};
+
+struct btSubSimplexClosestResult
+{
+	btVector3 m_closestPointOnSimplex;
+	//MASK for m_usedVertices
+	//stores the simplex vertex-usage, using the MASK,
+	// if m_usedVertices & MASK then the related vertex is used
+	btUsageBitfield m_usedVertices;
+	btScalar m_barycentricCoords[4];
+	bool m_degenerate;
+
+	void reset()
+	{
+		m_degenerate = false;
+		setBarycentricCoordinates();
+		m_usedVertices.reset();
+	}
+	bool isValid()
+	{
+		bool valid = (m_barycentricCoords[0] >= btScalar(0.)) &&
+					 (m_barycentricCoords[1] >= btScalar(0.)) &&
+					 (m_barycentricCoords[2] >= btScalar(0.)) &&
+					 (m_barycentricCoords[3] >= btScalar(0.));
+
+		return valid;
+	}
+	void setBarycentricCoordinates(btScalar a = btScalar(0.), btScalar b = btScalar(0.), btScalar c = btScalar(0.), btScalar d = btScalar(0.))
+	{
+		m_barycentricCoords[0] = a;
+		m_barycentricCoords[1] = b;
+		m_barycentricCoords[2] = c;
+		m_barycentricCoords[3] = d;
+	}
+};
+
+/// btVoronoiSimplexSolver is an implementation of the closest point distance algorithm from a 1-4 points simplex to the origin.
+/// Can be used with GJK, as an alternative to Johnson distance algorithm.
+#ifdef NO_VIRTUAL_INTERFACE
+ATTRIBUTE_ALIGNED16(class)
+btVoronoiSimplexSolver
+#else
+ATTRIBUTE_ALIGNED16(class)
+btVoronoiSimplexSolver : public btSimplexSolverInterface
+#endif
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_numVertices;
+
+	btVector3 m_simplexVectorW[VORONOI_SIMPLEX_MAX_VERTS];
+	btVector3 m_simplexPointsP[VORONOI_SIMPLEX_MAX_VERTS];
+	btVector3 m_simplexPointsQ[VORONOI_SIMPLEX_MAX_VERTS];
+
+	btVector3 m_cachedP1;
+	btVector3 m_cachedP2;
+	btVector3 m_cachedV;
+	btVector3 m_lastW;
+
+	btScalar m_equalVertexThreshold;
+	bool m_cachedValidClosest;
+
+	btSubSimplexClosestResult m_cachedBC;
+
+	bool m_needsUpdate;
+
+	void removeVertex(int index);
+	void reduceVertices(const btUsageBitfield& usedVerts);
+	bool updateClosestVectorAndPoints();
+
+	bool closestPtPointTetrahedron(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d, btSubSimplexClosestResult& finalResult);
+	int pointOutsideOfPlane(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d);
+	bool closestPtPointTriangle(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, btSubSimplexClosestResult& result);
+
+public:
+	btVoronoiSimplexSolver()
+		: m_equalVertexThreshold(VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD)
+	{
+	}
+	void reset();
+
+	void addVertex(const btVector3& w, const btVector3& p, const btVector3& q);
+
+	void setEqualVertexThreshold(btScalar threshold)
+	{
+		m_equalVertexThreshold = threshold;
+	}
+
+	btScalar getEqualVertexThreshold() const
+	{
+		return m_equalVertexThreshold;
+	}
+
+	bool closest(btVector3 & v);
+
+	btScalar maxVertex();
+
+	bool fullSimplex() const
+	{
+		return (m_numVertices == 4);
+	}
+
+	int getSimplex(btVector3 * pBuf, btVector3 * qBuf, btVector3 * yBuf) const;
+
+	bool inSimplex(const btVector3& w);
+
+	void backup_closest(btVector3 & v);
+
+	bool emptySimplex() const;
+
+	void compute_points(btVector3 & p1, btVector3 & p2);
+
+	int numVertices() const
+	{
+		return m_numVertices;
+	}
+};
+
+#endif  //BT_VORONOI_SIMPLEX_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletCollision/premake4.lua b/dali-physics/third-party/bullet3/src/BulletCollision/premake4.lua
new file mode 100644
index 0000000..e1c9bdb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletCollision/premake4.lua
@@ -0,0 +1,23 @@
+	project "BulletCollision"
+
+	kind "StaticLib"
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+	includedirs {
+		"..",
+	}
+	files {
+		"*.cpp",
+		"*.h",
+		"BroadphaseCollision/*.cpp",
+		"BroadphaseCollision/*.h",
+		"CollisionDispatch/*.cpp",
+                "CollisionDispatch/*.h",
+		"CollisionShapes/*.cpp",
+		"CollisionShapes/*.h",
+		"Gimpact/*.cpp",
+		"Gimpact/*.h",
+		"NarrowPhaseCollision/*.cpp",
+		"NarrowPhaseCollision/*.h",
+	}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/CMakeLists.txt b/dali-physics/third-party/bullet3/src/BulletDynamics/CMakeLists.txt
new file mode 100644
index 0000000..cfd49e9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/CMakeLists.txt
@@ -0,0 +1,179 @@
+INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src  )
+
+
+
+SET(BulletDynamics_SRCS
+	Character/btKinematicCharacterController.cpp
+	ConstraintSolver/btConeTwistConstraint.cpp
+	ConstraintSolver/btContactConstraint.cpp
+	ConstraintSolver/btFixedConstraint.cpp
+	ConstraintSolver/btGearConstraint.cpp
+	ConstraintSolver/btGeneric6DofConstraint.cpp
+	ConstraintSolver/btGeneric6DofSpringConstraint.cpp
+	ConstraintSolver/btGeneric6DofSpring2Constraint.cpp
+	ConstraintSolver/btHinge2Constraint.cpp
+	ConstraintSolver/btHingeConstraint.cpp
+	ConstraintSolver/btPoint2PointConstraint.cpp
+	ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+	ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp
+	ConstraintSolver/btBatchedConstraints.cpp
+	ConstraintSolver/btNNCGConstraintSolver.cpp
+	ConstraintSolver/btSliderConstraint.cpp
+	ConstraintSolver/btSolve2LinearConstraint.cpp
+	ConstraintSolver/btTypedConstraint.cpp
+	ConstraintSolver/btUniversalConstraint.cpp
+	Dynamics/btDiscreteDynamicsWorld.cpp
+	Dynamics/btDiscreteDynamicsWorldMt.cpp
+	Dynamics/btSimulationIslandManagerMt.cpp
+	Dynamics/btRigidBody.cpp
+	Dynamics/btSimpleDynamicsWorld.cpp
+#	Dynamics/Bullet-C-API.cpp
+	Vehicle/btRaycastVehicle.cpp
+	Vehicle/btWheelInfo.cpp
+	Featherstone/btMultiBody.cpp
+	Featherstone/btMultiBodyConstraint.cpp
+	Featherstone/btMultiBodyConstraintSolver.cpp
+	Featherstone/btMultiBodyDynamicsWorld.cpp
+	Featherstone/btMultiBodyFixedConstraint.cpp
+	Featherstone/btMultiBodyGearConstraint.cpp
+	Featherstone/btMultiBodyJointLimitConstraint.cpp
+	Featherstone/btMultiBodyJointMotor.cpp
+	Featherstone/btMultiBodyMLCPConstraintSolver.cpp
+	Featherstone/btMultiBodyPoint2Point.cpp
+	Featherstone/btMultiBodySliderConstraint.cpp
+	Featherstone/btMultiBodySphericalJointMotor.cpp
+	Featherstone/btMultiBodySphericalJointLimit.cpp
+	MLCPSolvers/btDantzigLCP.cpp
+	MLCPSolvers/btMLCPSolver.cpp
+	MLCPSolvers/btLemkeAlgorithm.cpp
+)
+
+SET(Root_HDRS
+	../btBulletDynamicsCommon.h
+	../btBulletCollisionCommon.h
+)
+SET(ConstraintSolver_HDRS
+	ConstraintSolver/btConeTwistConstraint.h
+	ConstraintSolver/btConstraintSolver.h
+	ConstraintSolver/btContactConstraint.h
+	ConstraintSolver/btContactSolverInfo.h
+	ConstraintSolver/btFixedConstraint.h
+	ConstraintSolver/btGearConstraint.h
+	ConstraintSolver/btGeneric6DofConstraint.h
+	ConstraintSolver/btGeneric6DofSpringConstraint.h
+	ConstraintSolver/btGeneric6DofSpring2Constraint.h
+	ConstraintSolver/btHinge2Constraint.h
+	ConstraintSolver/btHingeConstraint.h
+	ConstraintSolver/btJacobianEntry.h
+	ConstraintSolver/btPoint2PointConstraint.h
+	ConstraintSolver/btSequentialImpulseConstraintSolver.h
+	ConstraintSolver/btSequentialImpulseConstraintSolverMt.h
+	ConstraintSolver/btNNCGConstraintSolver.h
+	ConstraintSolver/btSliderConstraint.h
+	ConstraintSolver/btSolve2LinearConstraint.h
+	ConstraintSolver/btSolverBody.h
+	ConstraintSolver/btSolverConstraint.h
+	ConstraintSolver/btTypedConstraint.h
+	ConstraintSolver/btUniversalConstraint.h
+)
+SET(Dynamics_HDRS
+	Dynamics/btActionInterface.h
+	Dynamics/btDiscreteDynamicsWorld.h
+	Dynamics/btDiscreteDynamicsWorldMt.h
+	Dynamics/btSimulationIslandManagerMt.h
+	Dynamics/btDynamicsWorld.h
+	Dynamics/btSimpleDynamicsWorld.h
+	Dynamics/btRigidBody.h
+)
+SET(Vehicle_HDRS
+	Vehicle/btRaycastVehicle.h
+	Vehicle/btVehicleRaycaster.h
+	Vehicle/btWheelInfo.h
+)
+
+SET(Featherstone_HDRS
+	Featherstone/btMultiBody.h
+	Featherstone/btMultiBodyConstraint.h
+	Featherstone/btMultiBodyConstraintSolver.h
+	Featherstone/btMultiBodyDynamicsWorld.h
+	Featherstone/btMultiBodyFixedConstraint.h
+	Featherstone/btMultiBodyGearConstraint.h
+	Featherstone/btMultiBodyJointLimitConstraint.h
+	Featherstone/btMultiBodyJointMotor.h
+	Featherstone/btMultiBodyLink.h
+	Featherstone/btMultiBodyLinkCollider.h
+	Featherstone/btMultiBodyMLCPConstraintSolver.h
+	Featherstone/btMultiBodyPoint2Point.h
+	Featherstone/btMultiBodySliderConstraint.h
+	Featherstone/btMultiBodySolverConstraint.h
+  Featherstone/btMultiBodySphericalJointMotor.h
+	Featherstone/btMultiBodySphericalJointLimit.h
+
+)
+
+SET(MLCPSolvers_HDRS
+	MLCPSolvers/btDantzigLCP.h
+	MLCPSolvers/btDantzigSolver.h
+	MLCPSolvers/btMLCPSolver.h
+	MLCPSolvers/btMLCPSolverInterface.h
+	MLCPSolvers/btPATHSolver.h
+	MLCPSolvers/btSolveProjectedGaussSeidel.h
+	MLCPSolvers/btLemkeSolver.h
+	MLCPSolvers/btLemkeAlgorithm.h
+)
+
+SET(Character_HDRS
+	Character/btCharacterControllerInterface.h
+	Character/btKinematicCharacterController.h
+)
+
+
+
+SET(BulletDynamics_HDRS
+	${Root_HDRS}
+	${ConstraintSolver_HDRS}
+	${Dynamics_HDRS}
+	${Vehicle_HDRS}
+	${Character_HDRS}
+	${Featherstone_HDRS}
+	${MLCPSolvers_HDRS}
+)
+
+
+ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS})
+SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION})
+IF (BUILD_SHARED_LIBS)
+	TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath)
+ENDIF (BUILD_SHARED_LIBS)
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS BulletDynamics DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS BulletDynamics RUNTIME DESTINATION bin
+								LIBRARY DESTINATION lib${LIB_SUFFIX}
+								ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+				INSTALL(FILES ../btBulletDynamicsCommon.h
+DESTINATION ${INCLUDE_INSTALL_DIR}/BulletDynamics)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
+			# Have to list out sub-directories manually:
+			SET_PROPERTY(SOURCE ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver)
+			SET_PROPERTY(SOURCE ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics)
+			SET_PROPERTY(SOURCE ${Vehicle_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Vehicle)
+			SET_PROPERTY(SOURCE ${Character_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Character)
+			SET_PROPERTY(SOURCE ${Featherstone_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Featherstone)
+			SET_PROPERTY(SOURCE ${MLCPSolvers_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/MLCPSolvers)
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btCharacterControllerInterface.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btCharacterControllerInterface.h
new file mode 100644
index 0000000..2ccf317
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btCharacterControllerInterface.h
@@ -0,0 +1,46 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CHARACTER_CONTROLLER_INTERFACE_H
+#define BT_CHARACTER_CONTROLLER_INTERFACE_H
+
+#include "LinearMath/btVector3.h"
+#include "BulletDynamics/Dynamics/btActionInterface.h"
+
+class btCollisionShape;
+class btRigidBody;
+class btCollisionWorld;
+
+class btCharacterControllerInterface : public btActionInterface
+{
+public:
+	btCharacterControllerInterface(){};
+	virtual ~btCharacterControllerInterface(){};
+
+	virtual void setWalkDirection(const btVector3& walkDirection) = 0;
+	virtual void setVelocityForTimeInterval(const btVector3& velocity, btScalar timeInterval) = 0;
+	virtual void reset(btCollisionWorld* collisionWorld) = 0;
+	virtual void warp(const btVector3& origin) = 0;
+
+	virtual void preStep(btCollisionWorld* collisionWorld) = 0;
+	virtual void playerStep(btCollisionWorld* collisionWorld, btScalar dt) = 0;
+	virtual bool canJump() const = 0;
+	virtual void jump(const btVector3& dir = btVector3(0, 0, 0)) = 0;
+
+	virtual bool onGround() const = 0;
+	virtual void setUpInterpolate(bool value) = 0;
+};
+
+#endif  //BT_CHARACTER_CONTROLLER_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btKinematicCharacterController.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btKinematicCharacterController.cpp
new file mode 100644
index 0000000..2bbccb2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btKinematicCharacterController.cpp
@@ -0,0 +1,996 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdio.h>
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/CollisionDispatch/btGhostObject.h"
+#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "LinearMath/btDefaultMotionState.h"
+#include "btKinematicCharacterController.h"
+
+// static helper method
+static btVector3
+getNormalizedVector(const btVector3& v)
+{
+	btVector3 n(0, 0, 0);
+
+	if (v.length() > SIMD_EPSILON)
+	{
+		n = v.normalized();
+	}
+	return n;
+}
+
+///@todo Interact with dynamic objects,
+///Ride kinematicly animated platforms properly
+///More realistic (or maybe just a config option) falling
+/// -> Should integrate falling velocity manually and use that in stepDown()
+///Support jumping
+///Support ducking
+class btKinematicClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
+{
+public:
+	btKinematicClosestNotMeRayResultCallback(btCollisionObject* me) : btCollisionWorld::ClosestRayResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0))
+	{
+		m_me = me;
+	}
+
+	virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult, bool normalInWorldSpace)
+	{
+		if (rayResult.m_collisionObject == m_me)
+			return 1.0;
+
+		return ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
+	}
+
+protected:
+	btCollisionObject* m_me;
+};
+
+class btKinematicClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
+{
+public:
+	btKinematicClosestNotMeConvexResultCallback(btCollisionObject* me, const btVector3& up, btScalar minSlopeDot)
+		: btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0)), m_me(me), m_up(up), m_minSlopeDot(minSlopeDot)
+	{
+	}
+
+	virtual btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
+	{
+		if (convexResult.m_hitCollisionObject == m_me)
+			return btScalar(1.0);
+
+		if (!convexResult.m_hitCollisionObject->hasContactResponse())
+			return btScalar(1.0);
+
+		btVector3 hitNormalWorld;
+		if (normalInWorldSpace)
+		{
+			hitNormalWorld = convexResult.m_hitNormalLocal;
+		}
+		else
+		{
+			///need to transform normal into worldspace
+			hitNormalWorld = convexResult.m_hitCollisionObject->getWorldTransform().getBasis() * convexResult.m_hitNormalLocal;
+		}
+
+		btScalar dotUp = m_up.dot(hitNormalWorld);
+		if (dotUp < m_minSlopeDot)
+		{
+			return btScalar(1.0);
+		}
+
+		return ClosestConvexResultCallback::addSingleResult(convexResult, normalInWorldSpace);
+	}
+
+protected:
+	btCollisionObject* m_me;
+	const btVector3 m_up;
+	btScalar m_minSlopeDot;
+};
+
+/*
+ * Returns the reflection direction of a ray going 'direction' hitting a surface with normal 'normal'
+ *
+ * from: http://www-cs-students.stanford.edu/~adityagp/final/node3.html
+ */
+btVector3 btKinematicCharacterController::computeReflectionDirection(const btVector3& direction, const btVector3& normal)
+{
+	return direction - (btScalar(2.0) * direction.dot(normal)) * normal;
+}
+
+/*
+ * Returns the portion of 'direction' that is parallel to 'normal'
+ */
+btVector3 btKinematicCharacterController::parallelComponent(const btVector3& direction, const btVector3& normal)
+{
+	btScalar magnitude = direction.dot(normal);
+	return normal * magnitude;
+}
+
+/*
+ * Returns the portion of 'direction' that is perpindicular to 'normal'
+ */
+btVector3 btKinematicCharacterController::perpindicularComponent(const btVector3& direction, const btVector3& normal)
+{
+	return direction - parallelComponent(direction, normal);
+}
+
+btKinematicCharacterController::btKinematicCharacterController(btPairCachingGhostObject* ghostObject, btConvexShape* convexShape, btScalar stepHeight, const btVector3& up)
+{
+	m_ghostObject = ghostObject;
+	m_up.setValue(0.0f, 0.0f, 1.0f);
+	m_jumpAxis.setValue(0.0f, 0.0f, 1.0f);
+	m_addedMargin = 0.02;
+	m_walkDirection.setValue(0.0, 0.0, 0.0);
+	m_AngVel.setValue(0.0, 0.0, 0.0);
+	m_useGhostObjectSweepTest = true;
+	m_turnAngle = btScalar(0.0);
+	m_convexShape = convexShape;
+	m_useWalkDirection = true;  // use walk direction by default, legacy behavior
+	m_velocityTimeInterval = 0.0;
+	m_verticalVelocity = 0.0;
+	m_verticalOffset = 0.0;
+	m_gravity = 9.8 * 3.0;  // 3G acceleration.
+	m_fallSpeed = 55.0;     // Terminal velocity of a sky diver in m/s.
+	m_jumpSpeed = 10.0;     // ?
+	m_SetjumpSpeed = m_jumpSpeed;
+	m_wasOnGround = false;
+	m_wasJumping = false;
+	m_interpolateUp = true;
+	m_currentStepOffset = 0.0;
+	m_maxPenetrationDepth = 0.2;
+	full_drop = false;
+	bounce_fix = false;
+	m_linearDamping = btScalar(0.0);
+	m_angularDamping = btScalar(0.0);
+
+	setUp(up);
+	setStepHeight(stepHeight);
+	setMaxSlope(btRadians(45.0));
+}
+
+btKinematicCharacterController::~btKinematicCharacterController()
+{
+}
+
+btPairCachingGhostObject* btKinematicCharacterController::getGhostObject()
+{
+	return m_ghostObject;
+}
+
+bool btKinematicCharacterController::recoverFromPenetration(btCollisionWorld* collisionWorld)
+{
+	// Here we must refresh the overlapping paircache as the penetrating movement itself or the
+	// previous recovery iteration might have used setWorldTransform and pushed us into an object
+	// that is not in the previous cache contents from the last timestep, as will happen if we
+	// are pushed into a new AABB overlap. Unhandled this means the next convex sweep gets stuck.
+	//
+	// Do this by calling the broadphase's setAabb with the moved AABB, this will update the broadphase
+	// paircache and the ghostobject's internal paircache at the same time.    /BW
+
+	btVector3 minAabb, maxAabb;
+	m_convexShape->getAabb(m_ghostObject->getWorldTransform(), minAabb, maxAabb);
+	collisionWorld->getBroadphase()->setAabb(m_ghostObject->getBroadphaseHandle(),
+											 minAabb,
+											 maxAabb,
+											 collisionWorld->getDispatcher());
+
+	bool penetration = false;
+
+	collisionWorld->getDispatcher()->dispatchAllCollisionPairs(m_ghostObject->getOverlappingPairCache(), collisionWorld->getDispatchInfo(), collisionWorld->getDispatcher());
+
+	m_currentPosition = m_ghostObject->getWorldTransform().getOrigin();
+
+	//	btScalar maxPen = btScalar(0.0);
+	for (int i = 0; i < m_ghostObject->getOverlappingPairCache()->getNumOverlappingPairs(); i++)
+	{
+		m_manifoldArray.resize(0);
+
+		btBroadphasePair* collisionPair = &m_ghostObject->getOverlappingPairCache()->getOverlappingPairArray()[i];
+
+		btCollisionObject* obj0 = static_cast<btCollisionObject*>(collisionPair->m_pProxy0->m_clientObject);
+		btCollisionObject* obj1 = static_cast<btCollisionObject*>(collisionPair->m_pProxy1->m_clientObject);
+
+		if ((obj0 && !obj0->hasContactResponse()) || (obj1 && !obj1->hasContactResponse()))
+			continue;
+
+		if (!needsCollision(obj0, obj1))
+			continue;
+
+		if (collisionPair->m_algorithm)
+			collisionPair->m_algorithm->getAllContactManifolds(m_manifoldArray);
+
+		for (int j = 0; j < m_manifoldArray.size(); j++)
+		{
+			btPersistentManifold* manifold = m_manifoldArray[j];
+			btScalar directionSign = manifold->getBody0() == m_ghostObject ? btScalar(-1.0) : btScalar(1.0);
+			for (int p = 0; p < manifold->getNumContacts(); p++)
+			{
+				const btManifoldPoint& pt = manifold->getContactPoint(p);
+
+				btScalar dist = pt.getDistance();
+
+				if (dist < -m_maxPenetrationDepth)
+				{
+					// TODO: cause problems on slopes, not sure if it is needed
+					//if (dist < maxPen)
+					//{
+					//	maxPen = dist;
+					//	m_touchingNormal = pt.m_normalWorldOnB * directionSign;//??
+
+					//}
+					m_currentPosition += pt.m_normalWorldOnB * directionSign * dist * btScalar(0.2);
+					penetration = true;
+				}
+				else
+				{
+					//printf("touching %f\n", dist);
+				}
+			}
+
+			//manifold->clearManifold();
+		}
+	}
+	btTransform newTrans = m_ghostObject->getWorldTransform();
+	newTrans.setOrigin(m_currentPosition);
+	m_ghostObject->setWorldTransform(newTrans);
+	//	printf("m_touchingNormal = %f,%f,%f\n",m_touchingNormal[0],m_touchingNormal[1],m_touchingNormal[2]);
+	return penetration;
+}
+
+void btKinematicCharacterController::stepUp(btCollisionWorld* world)
+{
+	btScalar stepHeight = 0.0f;
+	if (m_verticalVelocity < 0.0)
+		stepHeight = m_stepHeight;
+
+	// phase 1: up
+	btTransform start, end;
+
+	start.setIdentity();
+	end.setIdentity();
+
+	/* FIXME: Handle penetration properly */
+	start.setOrigin(m_currentPosition);
+
+	m_targetPosition = m_currentPosition + m_up * (stepHeight) + m_jumpAxis * ((m_verticalOffset > 0.f ? m_verticalOffset : 0.f));
+	m_currentPosition = m_targetPosition;
+
+	end.setOrigin(m_targetPosition);
+
+	start.setRotation(m_currentOrientation);
+	end.setRotation(m_targetOrientation);
+
+	btKinematicClosestNotMeConvexResultCallback callback(m_ghostObject, -m_up, m_maxSlopeCosine);
+	callback.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup;
+	callback.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask;
+
+	if (m_useGhostObjectSweepTest)
+	{
+		m_ghostObject->convexSweepTest(m_convexShape, start, end, callback, world->getDispatchInfo().m_allowedCcdPenetration);
+	}
+	else
+	{
+		world->convexSweepTest(m_convexShape, start, end, callback, world->getDispatchInfo().m_allowedCcdPenetration);
+	}
+
+	if (callback.hasHit() && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback.m_hitCollisionObject))
+	{
+		// Only modify the position if the hit was a slope and not a wall or ceiling.
+		if (callback.m_hitNormalWorld.dot(m_up) > 0.0)
+		{
+			// we moved up only a fraction of the step height
+			m_currentStepOffset = stepHeight * callback.m_closestHitFraction;
+			if (m_interpolateUp == true)
+				m_currentPosition.setInterpolate3(m_currentPosition, m_targetPosition, callback.m_closestHitFraction);
+			else
+				m_currentPosition = m_targetPosition;
+		}
+
+		btTransform& xform = m_ghostObject->getWorldTransform();
+		xform.setOrigin(m_currentPosition);
+		m_ghostObject->setWorldTransform(xform);
+
+		// fix penetration if we hit a ceiling for example
+		int numPenetrationLoops = 0;
+		m_touchingContact = false;
+		while (recoverFromPenetration(world))
+		{
+			numPenetrationLoops++;
+			m_touchingContact = true;
+			if (numPenetrationLoops > 4)
+			{
+				//printf("character could not recover from penetration = %d\n", numPenetrationLoops);
+				break;
+			}
+		}
+		m_targetPosition = m_ghostObject->getWorldTransform().getOrigin();
+		m_currentPosition = m_targetPosition;
+
+		if (m_verticalOffset > 0)
+		{
+			m_verticalOffset = 0.0;
+			m_verticalVelocity = 0.0;
+			m_currentStepOffset = m_stepHeight;
+		}
+	}
+	else
+	{
+		m_currentStepOffset = stepHeight;
+		m_currentPosition = m_targetPosition;
+	}
+}
+
+bool btKinematicCharacterController::needsCollision(const btCollisionObject* body0, const btCollisionObject* body1)
+{
+	bool collides = (body0->getBroadphaseHandle()->m_collisionFilterGroup & body1->getBroadphaseHandle()->m_collisionFilterMask) != 0;
+	collides = collides && (body1->getBroadphaseHandle()->m_collisionFilterGroup & body0->getBroadphaseHandle()->m_collisionFilterMask);
+	return collides;
+}
+
+void btKinematicCharacterController::updateTargetPositionBasedOnCollision(const btVector3& hitNormal, btScalar tangentMag, btScalar normalMag)
+{
+	btVector3 movementDirection = m_targetPosition - m_currentPosition;
+	btScalar movementLength = movementDirection.length();
+	if (movementLength > SIMD_EPSILON)
+	{
+		movementDirection.normalize();
+
+		btVector3 reflectDir = computeReflectionDirection(movementDirection, hitNormal);
+		reflectDir.normalize();
+
+		btVector3 parallelDir, perpindicularDir;
+
+		parallelDir = parallelComponent(reflectDir, hitNormal);
+		perpindicularDir = perpindicularComponent(reflectDir, hitNormal);
+
+		m_targetPosition = m_currentPosition;
+		if (0)  //tangentMag != 0.0)
+		{
+			btVector3 parComponent = parallelDir * btScalar(tangentMag * movementLength);
+			//			printf("parComponent=%f,%f,%f\n",parComponent[0],parComponent[1],parComponent[2]);
+			m_targetPosition += parComponent;
+		}
+
+		if (normalMag != 0.0)
+		{
+			btVector3 perpComponent = perpindicularDir * btScalar(normalMag * movementLength);
+			//			printf("perpComponent=%f,%f,%f\n",perpComponent[0],perpComponent[1],perpComponent[2]);
+			m_targetPosition += perpComponent;
+		}
+	}
+	else
+	{
+		//		printf("movementLength don't normalize a zero vector\n");
+	}
+}
+
+void btKinematicCharacterController::stepForwardAndStrafe(btCollisionWorld* collisionWorld, const btVector3& walkMove)
+{
+	// printf("m_normalizedDirection=%f,%f,%f\n",
+	// 	m_normalizedDirection[0],m_normalizedDirection[1],m_normalizedDirection[2]);
+	// phase 2: forward and strafe
+	btTransform start, end;
+
+	m_targetPosition = m_currentPosition + walkMove;
+
+	start.setIdentity();
+	end.setIdentity();
+
+	btScalar fraction = 1.0;
+	btScalar distance2 = (m_currentPosition - m_targetPosition).length2();
+	//	printf("distance2=%f\n",distance2);
+
+	int maxIter = 10;
+
+	while (fraction > btScalar(0.01) && maxIter-- > 0)
+	{
+		start.setOrigin(m_currentPosition);
+		end.setOrigin(m_targetPosition);
+		btVector3 sweepDirNegative(m_currentPosition - m_targetPosition);
+
+		start.setRotation(m_currentOrientation);
+		end.setRotation(m_targetOrientation);
+
+		btKinematicClosestNotMeConvexResultCallback callback(m_ghostObject, sweepDirNegative, btScalar(0.0));
+		callback.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup;
+		callback.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask;
+
+		btScalar margin = m_convexShape->getMargin();
+		m_convexShape->setMargin(margin + m_addedMargin);
+
+		if (!(start == end))
+		{
+			if (m_useGhostObjectSweepTest)
+			{
+				m_ghostObject->convexSweepTest(m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration);
+			}
+			else
+			{
+				collisionWorld->convexSweepTest(m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration);
+			}
+		}
+		m_convexShape->setMargin(margin);
+
+		fraction -= callback.m_closestHitFraction;
+
+		if (callback.hasHit() && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback.m_hitCollisionObject))
+		{
+			// we moved only a fraction
+			//btScalar hitDistance;
+			//hitDistance = (callback.m_hitPointWorld - m_currentPosition).length();
+
+			//			m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction);
+
+			updateTargetPositionBasedOnCollision(callback.m_hitNormalWorld);
+			btVector3 currentDir = m_targetPosition - m_currentPosition;
+			distance2 = currentDir.length2();
+			if (distance2 > SIMD_EPSILON)
+			{
+				currentDir.normalize();
+				/* See Quake2: "If velocity is against original velocity, stop ead to avoid tiny oscilations in sloping corners." */
+				if (currentDir.dot(m_normalizedDirection) <= btScalar(0.0))
+				{
+					break;
+				}
+			}
+			else
+			{
+				//				printf("currentDir: don't normalize a zero vector\n");
+				break;
+			}
+		}
+		else
+		{
+			m_currentPosition = m_targetPosition;
+		}
+	}
+}
+
+void btKinematicCharacterController::stepDown(btCollisionWorld* collisionWorld, btScalar dt)
+{
+	btTransform start, end, end_double;
+	bool runonce = false;
+
+	// phase 3: down
+	/*btScalar additionalDownStep = (m_wasOnGround && !onGround()) ? m_stepHeight : 0.0;
+	btVector3 step_drop = m_up * (m_currentStepOffset + additionalDownStep);
+	btScalar downVelocity = (additionalDownStep == 0.0 && m_verticalVelocity<0.0?-m_verticalVelocity:0.0) * dt;
+	btVector3 gravity_drop = m_up * downVelocity; 
+	m_targetPosition -= (step_drop + gravity_drop);*/
+
+	btVector3 orig_position = m_targetPosition;
+
+	btScalar downVelocity = (m_verticalVelocity < 0.f ? -m_verticalVelocity : 0.f) * dt;
+
+	if (m_verticalVelocity > 0.0)
+		return;
+
+	if (downVelocity > 0.0 && downVelocity > m_fallSpeed && (m_wasOnGround || !m_wasJumping))
+		downVelocity = m_fallSpeed;
+
+	btVector3 step_drop = m_up * (m_currentStepOffset + downVelocity);
+	m_targetPosition -= step_drop;
+
+	btKinematicClosestNotMeConvexResultCallback callback(m_ghostObject, m_up, m_maxSlopeCosine);
+	callback.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup;
+	callback.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask;
+
+	btKinematicClosestNotMeConvexResultCallback callback2(m_ghostObject, m_up, m_maxSlopeCosine);
+	callback2.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup;
+	callback2.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask;
+
+	while (1)
+	{
+		start.setIdentity();
+		end.setIdentity();
+
+		end_double.setIdentity();
+
+		start.setOrigin(m_currentPosition);
+		end.setOrigin(m_targetPosition);
+
+		start.setRotation(m_currentOrientation);
+		end.setRotation(m_targetOrientation);
+
+		//set double test for 2x the step drop, to check for a large drop vs small drop
+		end_double.setOrigin(m_targetPosition - step_drop);
+
+		if (m_useGhostObjectSweepTest)
+		{
+			m_ghostObject->convexSweepTest(m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration);
+
+			if (!callback.hasHit() && m_ghostObject->hasContactResponse())
+			{
+				//test a double fall height, to see if the character should interpolate it's fall (full) or not (partial)
+				m_ghostObject->convexSweepTest(m_convexShape, start, end_double, callback2, collisionWorld->getDispatchInfo().m_allowedCcdPenetration);
+			}
+		}
+		else
+		{
+			collisionWorld->convexSweepTest(m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration);
+
+			if (!callback.hasHit() && m_ghostObject->hasContactResponse())
+			{
+				//test a double fall height, to see if the character should interpolate it's fall (large) or not (small)
+				collisionWorld->convexSweepTest(m_convexShape, start, end_double, callback2, collisionWorld->getDispatchInfo().m_allowedCcdPenetration);
+			}
+		}
+
+		btScalar downVelocity2 = (m_verticalVelocity < 0.f ? -m_verticalVelocity : 0.f) * dt;
+		bool has_hit;
+		if (bounce_fix == true)
+			has_hit = (callback.hasHit() || callback2.hasHit()) && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback.m_hitCollisionObject);
+		else
+			has_hit = callback2.hasHit() && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback2.m_hitCollisionObject);
+
+		btScalar stepHeight = 0.0f;
+		if (m_verticalVelocity < 0.0)
+			stepHeight = m_stepHeight;
+
+		if (downVelocity2 > 0.0 && downVelocity2 < stepHeight && has_hit == true && runonce == false && (m_wasOnGround || !m_wasJumping))
+		{
+			//redo the velocity calculation when falling a small amount, for fast stairs motion
+			//for larger falls, use the smoother/slower interpolated movement by not touching the target position
+
+			m_targetPosition = orig_position;
+			downVelocity = stepHeight;
+
+			step_drop = m_up * (m_currentStepOffset + downVelocity);
+			m_targetPosition -= step_drop;
+			runonce = true;
+			continue;  //re-run previous tests
+		}
+		break;
+	}
+
+	if ((m_ghostObject->hasContactResponse() && (callback.hasHit() && needsCollision(m_ghostObject, callback.m_hitCollisionObject))) || runonce == true)
+	{
+		// we dropped a fraction of the height -> hit floor
+		btScalar fraction = (m_currentPosition.getY() - callback.m_hitPointWorld.getY()) / 2;
+
+		//printf("hitpoint: %g - pos %g\n", callback.m_hitPointWorld.getY(), m_currentPosition.getY());
+
+		if (bounce_fix == true)
+		{
+			if (full_drop == true)
+				m_currentPosition.setInterpolate3(m_currentPosition, m_targetPosition, callback.m_closestHitFraction);
+			else
+				//due to errors in the closestHitFraction variable when used with large polygons, calculate the hit fraction manually
+				m_currentPosition.setInterpolate3(m_currentPosition, m_targetPosition, fraction);
+		}
+		else
+			m_currentPosition.setInterpolate3(m_currentPosition, m_targetPosition, callback.m_closestHitFraction);
+
+		full_drop = false;
+
+		m_verticalVelocity = 0.0;
+		m_verticalOffset = 0.0;
+		m_wasJumping = false;
+	}
+	else
+	{
+		// we dropped the full height
+
+		full_drop = true;
+
+		if (bounce_fix == true)
+		{
+			downVelocity = (m_verticalVelocity < 0.f ? -m_verticalVelocity : 0.f) * dt;
+			if (downVelocity > m_fallSpeed && (m_wasOnGround || !m_wasJumping))
+			{
+				m_targetPosition += step_drop;  //undo previous target change
+				downVelocity = m_fallSpeed;
+				step_drop = m_up * (m_currentStepOffset + downVelocity);
+				m_targetPosition -= step_drop;
+			}
+		}
+		//printf("full drop - %g, %g\n", m_currentPosition.getY(), m_targetPosition.getY());
+
+		m_currentPosition = m_targetPosition;
+	}
+}
+
+void btKinematicCharacterController::setWalkDirection(
+	const btVector3& walkDirection)
+{
+	m_useWalkDirection = true;
+	m_walkDirection = walkDirection;
+	m_normalizedDirection = getNormalizedVector(m_walkDirection);
+}
+
+void btKinematicCharacterController::setVelocityForTimeInterval(
+	const btVector3& velocity,
+	btScalar timeInterval)
+{
+	//	printf("setVelocity!\n");
+	//	printf("  interval: %f\n", timeInterval);
+	//	printf("  velocity: (%f, %f, %f)\n",
+	//		 velocity.x(), velocity.y(), velocity.z());
+
+	m_useWalkDirection = false;
+	m_walkDirection = velocity;
+	m_normalizedDirection = getNormalizedVector(m_walkDirection);
+	m_velocityTimeInterval += timeInterval;
+}
+
+void btKinematicCharacterController::setAngularVelocity(const btVector3& velocity)
+{
+	m_AngVel = velocity;
+}
+
+const btVector3& btKinematicCharacterController::getAngularVelocity() const
+{
+	return m_AngVel;
+}
+
+void btKinematicCharacterController::setLinearVelocity(const btVector3& velocity)
+{
+	m_walkDirection = velocity;
+
+	// HACK: if we are moving in the direction of the up, treat it as a jump :(
+	if (m_walkDirection.length2() > 0)
+	{
+		btVector3 w = velocity.normalized();
+		btScalar c = w.dot(m_up);
+		if (c != 0)
+		{
+			//there is a component in walkdirection for vertical velocity
+			btVector3 upComponent = m_up * (btSin(SIMD_HALF_PI - btAcos(c)) * m_walkDirection.length());
+			m_walkDirection -= upComponent;
+			m_verticalVelocity = (c < 0.0f ? -1 : 1) * upComponent.length();
+
+			if (c > 0.0f)
+			{
+				m_wasJumping = true;
+				m_jumpPosition = m_ghostObject->getWorldTransform().getOrigin();
+			}
+		}
+	}
+	else
+		m_verticalVelocity = 0.0f;
+}
+
+btVector3 btKinematicCharacterController::getLinearVelocity() const
+{
+	return m_walkDirection + (m_verticalVelocity * m_up);
+}
+
+void btKinematicCharacterController::reset(btCollisionWorld* collisionWorld)
+{
+	m_verticalVelocity = 0.0;
+	m_verticalOffset = 0.0;
+	m_wasOnGround = false;
+	m_wasJumping = false;
+	m_walkDirection.setValue(0, 0, 0);
+	m_velocityTimeInterval = 0.0;
+
+	//clear pair cache
+	btHashedOverlappingPairCache* cache = m_ghostObject->getOverlappingPairCache();
+	while (cache->getOverlappingPairArray().size() > 0)
+	{
+		cache->removeOverlappingPair(cache->getOverlappingPairArray()[0].m_pProxy0, cache->getOverlappingPairArray()[0].m_pProxy1, collisionWorld->getDispatcher());
+	}
+}
+
+void btKinematicCharacterController::warp(const btVector3& origin)
+{
+	btTransform xform;
+	xform.setIdentity();
+	xform.setOrigin(origin);
+	m_ghostObject->setWorldTransform(xform);
+}
+
+void btKinematicCharacterController::preStep(btCollisionWorld* collisionWorld)
+{
+	m_currentPosition = m_ghostObject->getWorldTransform().getOrigin();
+	m_targetPosition = m_currentPosition;
+
+	m_currentOrientation = m_ghostObject->getWorldTransform().getRotation();
+	m_targetOrientation = m_currentOrientation;
+	//	printf("m_targetPosition=%f,%f,%f\n",m_targetPosition[0],m_targetPosition[1],m_targetPosition[2]);
+}
+
+void btKinematicCharacterController::playerStep(btCollisionWorld* collisionWorld, btScalar dt)
+{
+	//	printf("playerStep(): ");
+	//	printf("  dt = %f", dt);
+
+	if (m_AngVel.length2() > 0.0f)
+	{
+		m_AngVel *= btPow(btScalar(1) - m_angularDamping, dt);
+	}
+
+	// integrate for angular velocity
+	if (m_AngVel.length2() > 0.0f)
+	{
+		btTransform xform;
+		xform = m_ghostObject->getWorldTransform();
+
+		btQuaternion rot(m_AngVel.normalized(), m_AngVel.length() * dt);
+
+		btQuaternion orn = rot * xform.getRotation();
+
+		xform.setRotation(orn);
+		m_ghostObject->setWorldTransform(xform);
+
+		m_currentPosition = m_ghostObject->getWorldTransform().getOrigin();
+		m_targetPosition = m_currentPosition;
+		m_currentOrientation = m_ghostObject->getWorldTransform().getRotation();
+		m_targetOrientation = m_currentOrientation;
+	}
+
+	// quick check...
+	if (!m_useWalkDirection && (m_velocityTimeInterval <= 0.0 || m_walkDirection.fuzzyZero())) 
+	{
+		//		printf("\n");
+		return;  // no motion
+	}
+
+	m_wasOnGround = onGround();
+
+	//btVector3 lvel = m_walkDirection;
+	//btScalar c = 0.0f;
+
+	if (m_walkDirection.length2() > 0)
+	{
+		// apply damping
+		m_walkDirection *= btPow(btScalar(1) - m_linearDamping, dt);
+	}
+
+	m_verticalVelocity *= btPow(btScalar(1) - m_linearDamping, dt);
+
+	// Update fall velocity.
+	m_verticalVelocity -= m_gravity * dt;
+	if (m_verticalVelocity > 0.0 && m_verticalVelocity > m_jumpSpeed)
+	{
+		m_verticalVelocity = m_jumpSpeed;
+	}
+	if (m_verticalVelocity < 0.0 && btFabs(m_verticalVelocity) > btFabs(m_fallSpeed))
+	{
+		m_verticalVelocity = -btFabs(m_fallSpeed);
+	}
+	m_verticalOffset = m_verticalVelocity * dt;
+
+	btTransform xform;
+	xform = m_ghostObject->getWorldTransform();
+
+	//	printf("walkDirection(%f,%f,%f)\n",walkDirection[0],walkDirection[1],walkDirection[2]);
+	//	printf("walkSpeed=%f\n",walkSpeed);
+
+	stepUp(collisionWorld);
+	//todo: Experimenting with behavior of controller when it hits a ceiling..
+	//bool hitUp = stepUp (collisionWorld);
+	//if (hitUp)
+	//{
+	//	m_verticalVelocity -= m_gravity * dt;
+	//	if (m_verticalVelocity > 0.0 && m_verticalVelocity > m_jumpSpeed)
+	//	{
+	//		m_verticalVelocity = m_jumpSpeed;
+	//	}
+	//	if (m_verticalVelocity < 0.0 && btFabs(m_verticalVelocity) > btFabs(m_fallSpeed))
+	//	{
+	//		m_verticalVelocity = -btFabs(m_fallSpeed);
+	//	}
+	//	m_verticalOffset = m_verticalVelocity * dt;
+
+	//	xform = m_ghostObject->getWorldTransform();
+	//}
+
+	if (m_useWalkDirection)
+	{
+		stepForwardAndStrafe(collisionWorld, m_walkDirection);
+	}
+	else
+	{
+		//printf("  time: %f", m_velocityTimeInterval);
+		// still have some time left for moving!
+		btScalar dtMoving =
+			(dt < m_velocityTimeInterval) ? dt : m_velocityTimeInterval;
+		m_velocityTimeInterval -= dt;
+
+		// how far will we move while we are moving?
+		btVector3 move = m_walkDirection * dtMoving;
+
+		//printf("  dtMoving: %f", dtMoving);
+
+		// okay, step
+		stepForwardAndStrafe(collisionWorld, move);
+	}
+	stepDown(collisionWorld, dt);
+
+	//todo: Experimenting with max jump height
+	//if (m_wasJumping)
+	//{
+	//	btScalar ds = m_currentPosition[m_upAxis] - m_jumpPosition[m_upAxis];
+	//	if (ds > m_maxJumpHeight)
+	//	{
+	//		// substract the overshoot
+	//		m_currentPosition[m_upAxis] -= ds - m_maxJumpHeight;
+
+	//		// max height was reached, so potential energy is at max
+	//		// and kinematic energy is 0, thus velocity is 0.
+	//		if (m_verticalVelocity > 0.0)
+	//			m_verticalVelocity = 0.0;
+	//	}
+	//}
+	// printf("\n");
+
+	xform.setOrigin(m_currentPosition);
+	m_ghostObject->setWorldTransform(xform);
+
+	int numPenetrationLoops = 0;
+	m_touchingContact = false;
+	while (recoverFromPenetration(collisionWorld))
+	{
+		numPenetrationLoops++;
+		m_touchingContact = true;
+		if (numPenetrationLoops > 4)
+		{
+			//printf("character could not recover from penetration = %d\n", numPenetrationLoops);
+			break;
+		}
+	}
+}
+
+void btKinematicCharacterController::setFallSpeed(btScalar fallSpeed)
+{
+	m_fallSpeed = fallSpeed;
+}
+
+void btKinematicCharacterController::setJumpSpeed(btScalar jumpSpeed)
+{
+	m_jumpSpeed = jumpSpeed;
+	m_SetjumpSpeed = m_jumpSpeed;
+}
+
+void btKinematicCharacterController::setMaxJumpHeight(btScalar maxJumpHeight)
+{
+	m_maxJumpHeight = maxJumpHeight;
+}
+
+bool btKinematicCharacterController::canJump() const
+{
+	return onGround();
+}
+
+void btKinematicCharacterController::jump(const btVector3& v)
+{
+	m_jumpSpeed = v.length2() == 0 ? m_SetjumpSpeed : v.length();
+	m_verticalVelocity = m_jumpSpeed;
+	m_wasJumping = true;
+
+	m_jumpAxis = v.length2() == 0 ? m_up : v.normalized();
+
+	m_jumpPosition = m_ghostObject->getWorldTransform().getOrigin();
+
+#if 0
+	currently no jumping.
+	btTransform xform;
+	m_rigidBody->getMotionState()->getWorldTransform (xform);
+	btVector3 up = xform.getBasis()[1];
+	up.normalize ();
+	btScalar magnitude = (btScalar(1.0)/m_rigidBody->getInvMass()) * btScalar(8.0);
+	m_rigidBody->applyCentralImpulse (up * magnitude);
+#endif
+}
+
+void btKinematicCharacterController::setGravity(const btVector3& gravity)
+{
+	if (gravity.length2() > 0) setUpVector(-gravity);
+
+	m_gravity = gravity.length();
+}
+
+btVector3 btKinematicCharacterController::getGravity() const
+{
+	return -m_gravity * m_up;
+}
+
+void btKinematicCharacterController::setMaxSlope(btScalar slopeRadians)
+{
+	m_maxSlopeRadians = slopeRadians;
+	m_maxSlopeCosine = btCos(slopeRadians);
+}
+
+btScalar btKinematicCharacterController::getMaxSlope() const
+{
+	return m_maxSlopeRadians;
+}
+
+void btKinematicCharacterController::setMaxPenetrationDepth(btScalar d)
+{
+	m_maxPenetrationDepth = d;
+}
+
+btScalar btKinematicCharacterController::getMaxPenetrationDepth() const
+{
+	return m_maxPenetrationDepth;
+}
+
+bool btKinematicCharacterController::onGround() const
+{
+	return (fabs(m_verticalVelocity) < SIMD_EPSILON) && (fabs(m_verticalOffset) < SIMD_EPSILON);
+}
+
+void btKinematicCharacterController::setStepHeight(btScalar h)
+{
+	m_stepHeight = h;
+}
+
+btVector3* btKinematicCharacterController::getUpAxisDirections()
+{
+	static btVector3 sUpAxisDirection[3] = {btVector3(1.0f, 0.0f, 0.0f), btVector3(0.0f, 1.0f, 0.0f), btVector3(0.0f, 0.0f, 1.0f)};
+
+	return sUpAxisDirection;
+}
+
+void btKinematicCharacterController::debugDraw(btIDebugDraw* debugDrawer)
+{
+}
+
+void btKinematicCharacterController::setUpInterpolate(bool value)
+{
+	m_interpolateUp = value;
+}
+
+void btKinematicCharacterController::setUp(const btVector3& up)
+{
+	if (up.length2() > 0 && m_gravity > 0.0f)
+	{
+		setGravity(-m_gravity * up.normalized());
+		return;
+	}
+
+	setUpVector(up);
+}
+
+void btKinematicCharacterController::setUpVector(const btVector3& up)
+{
+	if (m_up == up)
+		return;
+
+	btVector3 u = m_up;
+
+	if (up.length2() > 0)
+		m_up = up.normalized();
+	else
+		m_up = btVector3(0.0, 0.0, 0.0);
+
+	if (!m_ghostObject) return;
+	btQuaternion rot = getRotation(m_up, u);
+
+	//set orientation with new up
+	btTransform xform;
+	xform = m_ghostObject->getWorldTransform();
+	btQuaternion orn = rot.inverse() * xform.getRotation();
+	xform.setRotation(orn);
+	m_ghostObject->setWorldTransform(xform);
+}
+
+btQuaternion btKinematicCharacterController::getRotation(btVector3& v0, btVector3& v1) const
+{
+	if (v0.length2() == 0.0f || v1.length2() == 0.0f)
+	{
+		btQuaternion q;
+		return q;
+	}
+
+	return shortestArcQuatNormalize2(v0, v1);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btKinematicCharacterController.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btKinematicCharacterController.h
new file mode 100644
index 0000000..ff34fc8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Character/btKinematicCharacterController.h
@@ -0,0 +1,200 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_KINEMATIC_CHARACTER_CONTROLLER_H
+#define BT_KINEMATIC_CHARACTER_CONTROLLER_H
+
+#include "LinearMath/btVector3.h"
+
+#include "btCharacterControllerInterface.h"
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+
+class btCollisionShape;
+class btConvexShape;
+class btRigidBody;
+class btCollisionWorld;
+class btCollisionDispatcher;
+class btPairCachingGhostObject;
+
+///btKinematicCharacterController is an object that supports a sliding motion in a world.
+///It uses a ghost object and convex sweep test to test for upcoming collisions. This is combined with discrete collision detection to recover from penetrations.
+///Interaction between btKinematicCharacterController and dynamic rigid bodies needs to be explicity implemented by the user.
+ATTRIBUTE_ALIGNED16(class)
+btKinematicCharacterController : public btCharacterControllerInterface
+{
+protected:
+	btScalar m_halfHeight;
+
+	btPairCachingGhostObject* m_ghostObject;
+	btConvexShape* m_convexShape;  //is also in m_ghostObject, but it needs to be convex, so we store it here to avoid upcast
+
+	btScalar m_maxPenetrationDepth;
+	btScalar m_verticalVelocity;
+	btScalar m_verticalOffset;
+	btScalar m_fallSpeed;
+	btScalar m_jumpSpeed;
+	btScalar m_SetjumpSpeed;
+	btScalar m_maxJumpHeight;
+	btScalar m_maxSlopeRadians;  // Slope angle that is set (used for returning the exact value)
+	btScalar m_maxSlopeCosine;   // Cosine equivalent of m_maxSlopeRadians (calculated once when set, for optimization)
+	btScalar m_gravity;
+
+	btScalar m_turnAngle;
+
+	btScalar m_stepHeight;
+
+	btScalar m_addedMargin;  //@todo: remove this and fix the code
+
+	///this is the desired walk direction, set by the user
+	btVector3 m_walkDirection;
+	btVector3 m_normalizedDirection;
+	btVector3 m_AngVel;
+
+	btVector3 m_jumpPosition;
+
+	//some internal variables
+	btVector3 m_currentPosition;
+	btScalar m_currentStepOffset;
+	btVector3 m_targetPosition;
+
+	btQuaternion m_currentOrientation;
+	btQuaternion m_targetOrientation;
+
+	///keep track of the contact manifolds
+	btManifoldArray m_manifoldArray;
+
+	bool m_touchingContact;
+	btVector3 m_touchingNormal;
+
+	btScalar m_linearDamping;
+	btScalar m_angularDamping;
+
+	bool m_wasOnGround;
+	bool m_wasJumping;
+	bool m_useGhostObjectSweepTest;
+	bool m_useWalkDirection;
+	btScalar m_velocityTimeInterval;
+	btVector3 m_up;
+	btVector3 m_jumpAxis;
+
+	static btVector3* getUpAxisDirections();
+	bool m_interpolateUp;
+	bool full_drop;
+	bool bounce_fix;
+
+	btVector3 computeReflectionDirection(const btVector3& direction, const btVector3& normal);
+	btVector3 parallelComponent(const btVector3& direction, const btVector3& normal);
+	btVector3 perpindicularComponent(const btVector3& direction, const btVector3& normal);
+
+	bool recoverFromPenetration(btCollisionWorld * collisionWorld);
+	void stepUp(btCollisionWorld * collisionWorld);
+	void updateTargetPositionBasedOnCollision(const btVector3& hit_normal, btScalar tangentMag = btScalar(0.0), btScalar normalMag = btScalar(1.0));
+	void stepForwardAndStrafe(btCollisionWorld * collisionWorld, const btVector3& walkMove);
+	void stepDown(btCollisionWorld * collisionWorld, btScalar dt);
+
+	virtual bool needsCollision(const btCollisionObject* body0, const btCollisionObject* body1);
+
+	void setUpVector(const btVector3& up);
+
+	btQuaternion getRotation(btVector3 & v0, btVector3 & v1) const;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btKinematicCharacterController(btPairCachingGhostObject * ghostObject, btConvexShape * convexShape, btScalar stepHeight, const btVector3& up = btVector3(1.0, 0.0, 0.0));
+	~btKinematicCharacterController();
+
+	///btActionInterface interface
+	virtual void updateAction(btCollisionWorld * collisionWorld, btScalar deltaTime)
+	{
+		preStep(collisionWorld);
+		playerStep(collisionWorld, deltaTime);
+	}
+
+	///btActionInterface interface
+	void debugDraw(btIDebugDraw * debugDrawer);
+
+	void setUp(const btVector3& up);
+
+	const btVector3& getUp() { return m_up; }
+
+	/// This should probably be called setPositionIncrementPerSimulatorStep.
+	/// This is neither a direction nor a velocity, but the amount to
+	///	increment the position each simulation iteration, regardless
+	///	of dt.
+	/// This call will reset any velocity set by setVelocityForTimeInterval().
+	virtual void setWalkDirection(const btVector3& walkDirection);
+
+	/// Caller provides a velocity with which the character should move for
+	///	the given time period.  After the time period, velocity is reset
+	///	to zero.
+	/// This call will reset any walk direction set by setWalkDirection().
+	/// Negative time intervals will result in no motion.
+	virtual void setVelocityForTimeInterval(const btVector3& velocity,
+											btScalar timeInterval);
+
+	virtual void setAngularVelocity(const btVector3& velocity);
+	virtual const btVector3& getAngularVelocity() const;
+
+	virtual void setLinearVelocity(const btVector3& velocity);
+	virtual btVector3 getLinearVelocity() const;
+
+	void setLinearDamping(btScalar d) { m_linearDamping = btClamped(d, (btScalar)btScalar(0.0), (btScalar)btScalar(1.0)); }
+	btScalar getLinearDamping() const { return m_linearDamping; }
+	void setAngularDamping(btScalar d) { m_angularDamping = btClamped(d, (btScalar)btScalar(0.0), (btScalar)btScalar(1.0)); }
+	btScalar getAngularDamping() const { return m_angularDamping; }
+
+	void reset(btCollisionWorld * collisionWorld);
+	void warp(const btVector3& origin);
+
+	void preStep(btCollisionWorld * collisionWorld);
+	void playerStep(btCollisionWorld * collisionWorld, btScalar dt);
+
+	void setStepHeight(btScalar h);
+	btScalar getStepHeight() const { return m_stepHeight; }
+	void setFallSpeed(btScalar fallSpeed);
+	btScalar getFallSpeed() const { return m_fallSpeed; }
+	void setJumpSpeed(btScalar jumpSpeed);
+	btScalar getJumpSpeed() const { return m_jumpSpeed; }
+	void setMaxJumpHeight(btScalar maxJumpHeight);
+	bool canJump() const;
+
+	void jump(const btVector3& v = btVector3(0, 0, 0));
+
+	void applyImpulse(const btVector3& v) { jump(v); }
+
+	void setGravity(const btVector3& gravity);
+	btVector3 getGravity() const;
+
+	/// The max slope determines the maximum angle that the controller can walk up.
+	/// The slope angle is measured in radians.
+	void setMaxSlope(btScalar slopeRadians);
+	btScalar getMaxSlope() const;
+
+	void setMaxPenetrationDepth(btScalar d);
+	btScalar getMaxPenetrationDepth() const;
+
+	btPairCachingGhostObject* getGhostObject();
+	void setUseGhostSweepTest(bool useGhostObjectSweepTest)
+	{
+		m_useGhostObjectSweepTest = useGhostObjectSweepTest;
+	}
+
+	bool onGround() const;
+	void setUpInterpolate(bool value);
+};
+
+#endif  // BT_KINEMATIC_CHARACTER_CONTROLLER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp
new file mode 100644
index 0000000..89bd067
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp
@@ -0,0 +1,1084 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btBatchedConstraints.h"
+
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btMinMax.h"
+#include "LinearMath/btStackAlloc.h"
+#include "LinearMath/btQuickprof.h"
+
+#include <string.h>  //for memset
+
+#include <cmath>
+
+const int kNoMerge = -1;
+
+bool btBatchedConstraints::s_debugDrawBatches = false;
+
+struct btBatchedConstraintInfo
+{
+	int constraintIndex;
+	int numConstraintRows;
+	int bodyIds[2];
+};
+
+struct btBatchInfo
+{
+	int numConstraints;
+	int mergeIndex;
+
+	btBatchInfo() : numConstraints(0), mergeIndex(kNoMerge) {}
+};
+
+bool btBatchedConstraints::validate(btConstraintArray* constraints, const btAlignedObjectArray<btSolverBody>& bodies) const
+{
+	//
+	// validate: for debugging only. Verify coloring of bodies, that no body is touched by more than one batch in any given phase
+	//
+	int errors = 0;
+	const int kUnassignedBatch = -1;
+
+	btAlignedObjectArray<int> bodyBatchId;
+	for (int iPhase = 0; iPhase < m_phases.size(); ++iPhase)
+	{
+		bodyBatchId.resizeNoInitialize(0);
+		bodyBatchId.resize(bodies.size(), kUnassignedBatch);
+		const Range& phase = m_phases[iPhase];
+		for (int iBatch = phase.begin; iBatch < phase.end; ++iBatch)
+		{
+			const Range& batch = m_batches[iBatch];
+			for (int iiCons = batch.begin; iiCons < batch.end; ++iiCons)
+			{
+				int iCons = m_constraintIndices[iiCons];
+				const btSolverConstraint& cons = constraints->at(iCons);
+				const btSolverBody& bodyA = bodies[cons.m_solverBodyIdA];
+				const btSolverBody& bodyB = bodies[cons.m_solverBodyIdB];
+				if (!bodyA.internalGetInvMass().isZero())
+				{
+					int thisBodyBatchId = bodyBatchId[cons.m_solverBodyIdA];
+					if (thisBodyBatchId == kUnassignedBatch)
+					{
+						bodyBatchId[cons.m_solverBodyIdA] = iBatch;
+					}
+					else if (thisBodyBatchId != iBatch)
+					{
+						btAssert(!"dynamic body is used in 2 different batches in the same phase");
+						errors++;
+					}
+				}
+				if (!bodyB.internalGetInvMass().isZero())
+				{
+					int thisBodyBatchId = bodyBatchId[cons.m_solverBodyIdB];
+					if (thisBodyBatchId == kUnassignedBatch)
+					{
+						bodyBatchId[cons.m_solverBodyIdB] = iBatch;
+					}
+					else if (thisBodyBatchId != iBatch)
+					{
+						btAssert(!"dynamic body is used in 2 different batches in the same phase");
+						errors++;
+					}
+				}
+			}
+		}
+	}
+	return errors == 0;
+}
+
+static void debugDrawSingleBatch(const btBatchedConstraints* bc,
+								 btConstraintArray* constraints,
+								 const btAlignedObjectArray<btSolverBody>& bodies,
+								 int iBatch,
+								 const btVector3& color,
+								 const btVector3& offset)
+{
+	if (bc && bc->m_debugDrawer && iBatch < bc->m_batches.size())
+	{
+		const btBatchedConstraints::Range& b = bc->m_batches[iBatch];
+		for (int iiCon = b.begin; iiCon < b.end; ++iiCon)
+		{
+			int iCon = bc->m_constraintIndices[iiCon];
+			const btSolverConstraint& con = constraints->at(iCon);
+			int iBody0 = con.m_solverBodyIdA;
+			int iBody1 = con.m_solverBodyIdB;
+			btVector3 pos0 = bodies[iBody0].getWorldTransform().getOrigin() + offset;
+			btVector3 pos1 = bodies[iBody1].getWorldTransform().getOrigin() + offset;
+			bc->m_debugDrawer->drawLine(pos0, pos1, color);
+		}
+	}
+}
+
+static void debugDrawPhase(const btBatchedConstraints* bc,
+						   btConstraintArray* constraints,
+						   const btAlignedObjectArray<btSolverBody>& bodies,
+						   int iPhase,
+						   const btVector3& color0,
+						   const btVector3& color1,
+						   const btVector3& offset)
+{
+	BT_PROFILE("debugDrawPhase");
+	if (bc && bc->m_debugDrawer && iPhase < bc->m_phases.size())
+	{
+		const btBatchedConstraints::Range& phase = bc->m_phases[iPhase];
+		for (int iBatch = phase.begin; iBatch < phase.end; ++iBatch)
+		{
+			float tt = float(iBatch - phase.begin) / float(btMax(1, phase.end - phase.begin - 1));
+			btVector3 col = lerp(color0, color1, tt);
+			debugDrawSingleBatch(bc, constraints, bodies, iBatch, col, offset);
+		}
+	}
+}
+
+static void debugDrawAllBatches(const btBatchedConstraints* bc,
+								btConstraintArray* constraints,
+								const btAlignedObjectArray<btSolverBody>& bodies)
+{
+	BT_PROFILE("debugDrawAllBatches");
+	if (bc && bc->m_debugDrawer && bc->m_phases.size() > 0)
+	{
+		btVector3 bboxMin(BT_LARGE_FLOAT, BT_LARGE_FLOAT, BT_LARGE_FLOAT);
+		btVector3 bboxMax = -bboxMin;
+		for (int iBody = 0; iBody < bodies.size(); ++iBody)
+		{
+			const btVector3& pos = bodies[iBody].getWorldTransform().getOrigin();
+			bboxMin.setMin(pos);
+			bboxMax.setMax(pos);
+		}
+		btVector3 bboxExtent = bboxMax - bboxMin;
+		btVector3 offsetBase = btVector3(0, bboxExtent.y() * 1.1f, 0);
+		btVector3 offsetStep = btVector3(0, 0, bboxExtent.z() * 1.1f);
+		int numPhases = bc->m_phases.size();
+		for (int iPhase = 0; iPhase < numPhases; ++iPhase)
+		{
+			float b = float(iPhase) / float(numPhases - 1);
+			btVector3 color0 = btVector3(1, 0, b);
+			btVector3 color1 = btVector3(0, 1, b);
+			btVector3 offset = offsetBase + offsetStep * (float(iPhase) - float(numPhases - 1) * 0.5);
+			debugDrawPhase(bc, constraints, bodies, iPhase, color0, color1, offset);
+		}
+	}
+}
+
+static void initBatchedBodyDynamicFlags(btAlignedObjectArray<bool>* outBodyDynamicFlags, const btAlignedObjectArray<btSolverBody>& bodies)
+{
+	BT_PROFILE("initBatchedBodyDynamicFlags");
+	btAlignedObjectArray<bool>& bodyDynamicFlags = *outBodyDynamicFlags;
+	bodyDynamicFlags.resizeNoInitialize(bodies.size());
+	for (int i = 0; i < bodies.size(); ++i)
+	{
+		const btSolverBody& body = bodies[i];
+		bodyDynamicFlags[i] = (body.internalGetInvMass().x() > btScalar(0));
+	}
+}
+
+static int runLengthEncodeConstraintInfo(btBatchedConstraintInfo* outConInfos, int numConstraints)
+{
+	BT_PROFILE("runLengthEncodeConstraintInfo");
+	// detect and run-length encode constraint rows that repeat the same bodies
+	int iDest = 0;
+	int iSrc = 0;
+	while (iSrc < numConstraints)
+	{
+		const btBatchedConstraintInfo& srcConInfo = outConInfos[iSrc];
+		btBatchedConstraintInfo& conInfo = outConInfos[iDest];
+		conInfo.constraintIndex = iSrc;
+		conInfo.bodyIds[0] = srcConInfo.bodyIds[0];
+		conInfo.bodyIds[1] = srcConInfo.bodyIds[1];
+		while (iSrc < numConstraints && outConInfos[iSrc].bodyIds[0] == srcConInfo.bodyIds[0] && outConInfos[iSrc].bodyIds[1] == srcConInfo.bodyIds[1])
+		{
+			++iSrc;
+		}
+		conInfo.numConstraintRows = iSrc - conInfo.constraintIndex;
+		++iDest;
+	}
+	return iDest;
+}
+
+struct ReadSolverConstraintsLoop : public btIParallelForBody
+{
+	btBatchedConstraintInfo* m_outConInfos;
+	btConstraintArray* m_constraints;
+
+	ReadSolverConstraintsLoop(btBatchedConstraintInfo* outConInfos, btConstraintArray* constraints)
+	{
+		m_outConInfos = outConInfos;
+		m_constraints = constraints;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		for (int i = iBegin; i < iEnd; ++i)
+		{
+			btBatchedConstraintInfo& conInfo = m_outConInfos[i];
+			const btSolverConstraint& con = m_constraints->at(i);
+			conInfo.bodyIds[0] = con.m_solverBodyIdA;
+			conInfo.bodyIds[1] = con.m_solverBodyIdB;
+			conInfo.constraintIndex = i;
+			conInfo.numConstraintRows = 1;
+		}
+	}
+};
+
+static int initBatchedConstraintInfo(btBatchedConstraintInfo* outConInfos, btConstraintArray* constraints)
+{
+	BT_PROFILE("initBatchedConstraintInfo");
+	int numConstraints = constraints->size();
+	bool inParallel = true;
+	if (inParallel)
+	{
+		ReadSolverConstraintsLoop loop(outConInfos, constraints);
+		int grainSize = 1200;
+		btParallelFor(0, numConstraints, grainSize, loop);
+	}
+	else
+	{
+		for (int i = 0; i < numConstraints; ++i)
+		{
+			btBatchedConstraintInfo& conInfo = outConInfos[i];
+			const btSolverConstraint& con = constraints->at(i);
+			conInfo.bodyIds[0] = con.m_solverBodyIdA;
+			conInfo.bodyIds[1] = con.m_solverBodyIdB;
+			conInfo.constraintIndex = i;
+			conInfo.numConstraintRows = 1;
+		}
+	}
+	bool useRunLengthEncoding = true;
+	if (useRunLengthEncoding)
+	{
+		numConstraints = runLengthEncodeConstraintInfo(outConInfos, numConstraints);
+	}
+	return numConstraints;
+}
+
+static void expandConstraintRowsInPlace(int* constraintBatchIds, const btBatchedConstraintInfo* conInfos, int numConstraints, int numConstraintRows)
+{
+	BT_PROFILE("expandConstraintRowsInPlace");
+	if (numConstraintRows > numConstraints)
+	{
+		// we walk the array in reverse to avoid overwriteing
+		for (int iCon = numConstraints - 1; iCon >= 0; --iCon)
+		{
+			const btBatchedConstraintInfo& conInfo = conInfos[iCon];
+			int iBatch = constraintBatchIds[iCon];
+			for (int i = conInfo.numConstraintRows - 1; i >= 0; --i)
+			{
+				int iDest = conInfo.constraintIndex + i;
+				btAssert(iDest >= iCon);
+				btAssert(iDest >= 0 && iDest < numConstraintRows);
+				constraintBatchIds[iDest] = iBatch;
+			}
+		}
+	}
+}
+
+static void expandConstraintRows(int* destConstraintBatchIds, const int* srcConstraintBatchIds, const btBatchedConstraintInfo* conInfos, int numConstraints, int numConstraintRows)
+{
+	BT_PROFILE("expandConstraintRows");
+	for (int iCon = 0; iCon < numConstraints; ++iCon)
+	{
+		const btBatchedConstraintInfo& conInfo = conInfos[iCon];
+		int iBatch = srcConstraintBatchIds[iCon];
+		for (int i = 0; i < conInfo.numConstraintRows; ++i)
+		{
+			int iDest = conInfo.constraintIndex + i;
+			btAssert(iDest >= iCon);
+			btAssert(iDest >= 0 && iDest < numConstraintRows);
+			destConstraintBatchIds[iDest] = iBatch;
+		}
+	}
+}
+
+struct ExpandConstraintRowsLoop : public btIParallelForBody
+{
+	int* m_destConstraintBatchIds;
+	const int* m_srcConstraintBatchIds;
+	const btBatchedConstraintInfo* m_conInfos;
+	int m_numConstraintRows;
+
+	ExpandConstraintRowsLoop(int* destConstraintBatchIds, const int* srcConstraintBatchIds, const btBatchedConstraintInfo* conInfos, int numConstraintRows)
+	{
+		m_destConstraintBatchIds = destConstraintBatchIds;
+		m_srcConstraintBatchIds = srcConstraintBatchIds;
+		m_conInfos = conInfos;
+		m_numConstraintRows = numConstraintRows;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		expandConstraintRows(m_destConstraintBatchIds, m_srcConstraintBatchIds + iBegin, m_conInfos + iBegin, iEnd - iBegin, m_numConstraintRows);
+	}
+};
+
+static void expandConstraintRowsMt(int* destConstraintBatchIds, const int* srcConstraintBatchIds, const btBatchedConstraintInfo* conInfos, int numConstraints, int numConstraintRows)
+{
+	BT_PROFILE("expandConstraintRowsMt");
+	ExpandConstraintRowsLoop loop(destConstraintBatchIds, srcConstraintBatchIds, conInfos, numConstraintRows);
+	int grainSize = 600;
+	btParallelFor(0, numConstraints, grainSize, loop);
+}
+
+static void initBatchedConstraintInfoArray(btAlignedObjectArray<btBatchedConstraintInfo>* outConInfos, btConstraintArray* constraints)
+{
+	BT_PROFILE("initBatchedConstraintInfoArray");
+	btAlignedObjectArray<btBatchedConstraintInfo>& conInfos = *outConInfos;
+	int numConstraints = constraints->size();
+	conInfos.resizeNoInitialize(numConstraints);
+
+	int newSize = initBatchedConstraintInfo(&outConInfos->at(0), constraints);
+	conInfos.resizeNoInitialize(newSize);
+}
+
+static void mergeSmallBatches(btBatchInfo* batches, int iBeginBatch, int iEndBatch, int minBatchSize, int maxBatchSize)
+{
+	BT_PROFILE("mergeSmallBatches");
+	for (int iBatch = iEndBatch - 1; iBatch >= iBeginBatch; --iBatch)
+	{
+		btBatchInfo& batch = batches[iBatch];
+		if (batch.mergeIndex == kNoMerge && batch.numConstraints > 0 && batch.numConstraints < minBatchSize)
+		{
+			for (int iDestBatch = iBatch - 1; iDestBatch >= iBeginBatch; --iDestBatch)
+			{
+				btBatchInfo& destBatch = batches[iDestBatch];
+				if (destBatch.mergeIndex == kNoMerge && (destBatch.numConstraints + batch.numConstraints) < maxBatchSize)
+				{
+					destBatch.numConstraints += batch.numConstraints;
+					batch.numConstraints = 0;
+					batch.mergeIndex = iDestBatch;
+					break;
+				}
+			}
+		}
+	}
+	// flatten mergeIndexes
+	// e.g. in case where A was merged into B and then B was merged into C, we need A to point to C instead of B
+	// Note: loop goes forward through batches because batches always merge from higher indexes to lower,
+	//     so by going from low to high it reduces the amount of trail-following
+	for (int iBatch = iBeginBatch; iBatch < iEndBatch; ++iBatch)
+	{
+		btBatchInfo& batch = batches[iBatch];
+		if (batch.mergeIndex != kNoMerge)
+		{
+			int iMergeDest = batches[batch.mergeIndex].mergeIndex;
+			// follow trail of merges to the end
+			while (iMergeDest != kNoMerge)
+			{
+				int iNext = batches[iMergeDest].mergeIndex;
+				if (iNext == kNoMerge)
+				{
+					batch.mergeIndex = iMergeDest;
+					break;
+				}
+				iMergeDest = iNext;
+			}
+		}
+	}
+}
+
+static void updateConstraintBatchIdsForMerges(int* constraintBatchIds, int numConstraints, const btBatchInfo* batches, int numBatches)
+{
+	BT_PROFILE("updateConstraintBatchIdsForMerges");
+	// update batchIds to account for merges
+	for (int i = 0; i < numConstraints; ++i)
+	{
+		int iBatch = constraintBatchIds[i];
+		btAssert(iBatch < numBatches);
+		// if this constraint references a batch that was merged into another batch
+		if (batches[iBatch].mergeIndex != kNoMerge)
+		{
+			// update batchId
+			constraintBatchIds[i] = batches[iBatch].mergeIndex;
+		}
+	}
+}
+
+struct UpdateConstraintBatchIdsForMergesLoop : public btIParallelForBody
+{
+	int* m_constraintBatchIds;
+	const btBatchInfo* m_batches;
+	int m_numBatches;
+
+	UpdateConstraintBatchIdsForMergesLoop(int* constraintBatchIds, const btBatchInfo* batches, int numBatches)
+	{
+		m_constraintBatchIds = constraintBatchIds;
+		m_batches = batches;
+		m_numBatches = numBatches;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("UpdateConstraintBatchIdsForMergesLoop");
+		updateConstraintBatchIdsForMerges(m_constraintBatchIds + iBegin, iEnd - iBegin, m_batches, m_numBatches);
+	}
+};
+
+static void updateConstraintBatchIdsForMergesMt(int* constraintBatchIds, int numConstraints, const btBatchInfo* batches, int numBatches)
+{
+	BT_PROFILE("updateConstraintBatchIdsForMergesMt");
+	UpdateConstraintBatchIdsForMergesLoop loop(constraintBatchIds, batches, numBatches);
+	int grainSize = 800;
+	btParallelFor(0, numConstraints, grainSize, loop);
+}
+
+inline bool BatchCompare(const btBatchedConstraints::Range& a, const btBatchedConstraints::Range& b)
+{
+	int lenA = a.end - a.begin;
+	int lenB = b.end - b.begin;
+	return lenA > lenB;
+}
+
+static void writeOutConstraintIndicesForRangeOfBatches(btBatchedConstraints* bc,
+													   const int* constraintBatchIds,
+													   int numConstraints,
+													   int* constraintIdPerBatch,
+													   int batchBegin,
+													   int batchEnd)
+{
+	BT_PROFILE("writeOutConstraintIndicesForRangeOfBatches");
+	for (int iCon = 0; iCon < numConstraints; ++iCon)
+	{
+		int iBatch = constraintBatchIds[iCon];
+		if (iBatch >= batchBegin && iBatch < batchEnd)
+		{
+			int iDestCon = constraintIdPerBatch[iBatch];
+			constraintIdPerBatch[iBatch] = iDestCon + 1;
+			bc->m_constraintIndices[iDestCon] = iCon;
+		}
+	}
+}
+
+struct WriteOutConstraintIndicesLoop : public btIParallelForBody
+{
+	btBatchedConstraints* m_batchedConstraints;
+	const int* m_constraintBatchIds;
+	int m_numConstraints;
+	int* m_constraintIdPerBatch;
+	int m_maxNumBatchesPerPhase;
+
+	WriteOutConstraintIndicesLoop(btBatchedConstraints* bc, const int* constraintBatchIds, int numConstraints, int* constraintIdPerBatch, int maxNumBatchesPerPhase)
+	{
+		m_batchedConstraints = bc;
+		m_constraintBatchIds = constraintBatchIds;
+		m_numConstraints = numConstraints;
+		m_constraintIdPerBatch = constraintIdPerBatch;
+		m_maxNumBatchesPerPhase = maxNumBatchesPerPhase;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("WriteOutConstraintIndicesLoop");
+		int batchBegin = iBegin * m_maxNumBatchesPerPhase;
+		int batchEnd = iEnd * m_maxNumBatchesPerPhase;
+		writeOutConstraintIndicesForRangeOfBatches(m_batchedConstraints,
+												   m_constraintBatchIds,
+												   m_numConstraints,
+												   m_constraintIdPerBatch,
+												   batchBegin,
+												   batchEnd);
+	}
+};
+
+static void writeOutConstraintIndicesMt(btBatchedConstraints* bc,
+										const int* constraintBatchIds,
+										int numConstraints,
+										int* constraintIdPerBatch,
+										int maxNumBatchesPerPhase,
+										int numPhases)
+{
+	BT_PROFILE("writeOutConstraintIndicesMt");
+	bool inParallel = true;
+	if (inParallel)
+	{
+		WriteOutConstraintIndicesLoop loop(bc, constraintBatchIds, numConstraints, constraintIdPerBatch, maxNumBatchesPerPhase);
+		btParallelFor(0, numPhases, 1, loop);
+	}
+	else
+	{
+		for (int iCon = 0; iCon < numConstraints; ++iCon)
+		{
+			int iBatch = constraintBatchIds[iCon];
+			int iDestCon = constraintIdPerBatch[iBatch];
+			constraintIdPerBatch[iBatch] = iDestCon + 1;
+			bc->m_constraintIndices[iDestCon] = iCon;
+		}
+	}
+}
+
+static void writeGrainSizes(btBatchedConstraints* bc)
+{
+	typedef btBatchedConstraints::Range Range;
+	int numPhases = bc->m_phases.size();
+	bc->m_phaseGrainSize.resizeNoInitialize(numPhases);
+	int numThreads = btGetTaskScheduler()->getNumThreads();
+	for (int iPhase = 0; iPhase < numPhases; ++iPhase)
+	{
+		const Range& phase = bc->m_phases[iPhase];
+		int numBatches = phase.end - phase.begin;
+		float grainSize = std::floor((0.25f * numBatches / float(numThreads)) + 0.0f);
+		bc->m_phaseGrainSize[iPhase] = btMax(1, int(grainSize));
+	}
+}
+
+static void writeOutBatches(btBatchedConstraints* bc,
+							const int* constraintBatchIds,
+							int numConstraints,
+							const btBatchInfo* batches,
+							int* batchWork,
+							int maxNumBatchesPerPhase,
+							int numPhases)
+{
+	BT_PROFILE("writeOutBatches");
+	typedef btBatchedConstraints::Range Range;
+	bc->m_constraintIndices.reserve(numConstraints);
+	bc->m_batches.resizeNoInitialize(0);
+	bc->m_phases.resizeNoInitialize(0);
+
+	//int maxNumBatches = numPhases * maxNumBatchesPerPhase;
+	{
+		int* constraintIdPerBatch = batchWork;  // for each batch, keep an index into the next available slot in the m_constraintIndices array
+		int iConstraint = 0;
+		for (int iPhase = 0; iPhase < numPhases; ++iPhase)
+		{
+			int curPhaseBegin = bc->m_batches.size();
+			int iBegin = iPhase * maxNumBatchesPerPhase;
+			int iEnd = iBegin + maxNumBatchesPerPhase;
+			for (int i = iBegin; i < iEnd; ++i)
+			{
+				const btBatchInfo& batch = batches[i];
+				int curBatchBegin = iConstraint;
+				constraintIdPerBatch[i] = curBatchBegin;  // record the start of each batch in m_constraintIndices array
+				int numConstraints = batch.numConstraints;
+				iConstraint += numConstraints;
+				if (numConstraints > 0)
+				{
+					bc->m_batches.push_back(Range(curBatchBegin, iConstraint));
+				}
+			}
+			// if any batches were emitted this phase,
+			if (bc->m_batches.size() > curPhaseBegin)
+			{
+				// output phase
+				bc->m_phases.push_back(Range(curPhaseBegin, bc->m_batches.size()));
+			}
+		}
+
+		btAssert(iConstraint == numConstraints);
+		bc->m_constraintIndices.resizeNoInitialize(numConstraints);
+		writeOutConstraintIndicesMt(bc, constraintBatchIds, numConstraints, constraintIdPerBatch, maxNumBatchesPerPhase, numPhases);
+	}
+	// for each phase
+	for (int iPhase = 0; iPhase < bc->m_phases.size(); ++iPhase)
+	{
+		// sort the batches from largest to smallest (can be helpful to some task schedulers)
+		const Range& curBatches = bc->m_phases[iPhase];
+		bc->m_batches.quickSortInternal(BatchCompare, curBatches.begin, curBatches.end - 1);
+	}
+	bc->m_phaseOrder.resize(bc->m_phases.size());
+	for (int i = 0; i < bc->m_phases.size(); ++i)
+	{
+		bc->m_phaseOrder[i] = i;
+	}
+	writeGrainSizes(bc);
+}
+
+//
+// PreallocatedMemoryHelper -- helper object for allocating a number of chunks of memory in a single contiguous block.
+//                             It is generally more efficient to do a single larger allocation than many smaller allocations.
+//
+// Example Usage:
+//
+//  btVector3* bodyPositions = NULL;
+//  btBatchedConstraintInfo* conInfos = NULL;
+//  {
+//    PreallocatedMemoryHelper<8> memHelper;
+//    memHelper.addChunk( (void**) &bodyPositions, sizeof( btVector3 ) * bodies.size() );
+//    memHelper.addChunk( (void**) &conInfos, sizeof( btBatchedConstraintInfo ) * numConstraints );
+//    void* memPtr = malloc( memHelper.getSizeToAllocate() );  // allocate the memory
+//    memHelper.setChunkPointers( memPtr );  // update pointers to chunks
+//  }
+template <int N>
+class PreallocatedMemoryHelper
+{
+	struct Chunk
+	{
+		void** ptr;
+		size_t size;
+	};
+	Chunk m_chunks[N];
+	int m_numChunks;
+
+public:
+	PreallocatedMemoryHelper() { m_numChunks = 0; }
+	void addChunk(void** ptr, size_t sz)
+	{
+		btAssert(m_numChunks < N);
+		if (m_numChunks < N)
+		{
+			Chunk& chunk = m_chunks[m_numChunks];
+			chunk.ptr = ptr;
+			chunk.size = sz;
+			m_numChunks++;
+		}
+	}
+	size_t getSizeToAllocate() const
+	{
+		size_t totalSize = 0;
+		for (int i = 0; i < m_numChunks; ++i)
+		{
+			totalSize += m_chunks[i].size;
+		}
+		return totalSize;
+	}
+	void setChunkPointers(void* mem) const
+	{
+		size_t totalSize = 0;
+		for (int i = 0; i < m_numChunks; ++i)
+		{
+			const Chunk& chunk = m_chunks[i];
+			char* chunkPtr = static_cast<char*>(mem) + totalSize;
+			*chunk.ptr = chunkPtr;
+			totalSize += chunk.size;
+		}
+	}
+};
+
+static btVector3 findMaxDynamicConstraintExtent(
+	btVector3* bodyPositions,
+	bool* bodyDynamicFlags,
+	btBatchedConstraintInfo* conInfos,
+	int numConstraints,
+	int numBodies)
+{
+	BT_PROFILE("findMaxDynamicConstraintExtent");
+	btVector3 consExtent = btVector3(1, 1, 1) * 0.001;
+	for (int iCon = 0; iCon < numConstraints; ++iCon)
+	{
+		const btBatchedConstraintInfo& con = conInfos[iCon];
+		int iBody0 = con.bodyIds[0];
+		int iBody1 = con.bodyIds[1];
+		btAssert(iBody0 >= 0 && iBody0 < numBodies);
+		btAssert(iBody1 >= 0 && iBody1 < numBodies);
+		// is it a dynamic constraint?
+		if (bodyDynamicFlags[iBody0] && bodyDynamicFlags[iBody1])
+		{
+			btVector3 delta = bodyPositions[iBody1] - bodyPositions[iBody0];
+			consExtent.setMax(delta.absolute());
+		}
+	}
+	return consExtent;
+}
+
+struct btIntVec3
+{
+	int m_ints[3];
+
+	SIMD_FORCE_INLINE const int& operator[](int i) const { return m_ints[i]; }
+	SIMD_FORCE_INLINE int& operator[](int i) { return m_ints[i]; }
+};
+
+struct AssignConstraintsToGridBatchesParams
+{
+	bool* bodyDynamicFlags;
+	btIntVec3* bodyGridCoords;
+	int numBodies;
+	btBatchedConstraintInfo* conInfos;
+	int* constraintBatchIds;
+	btIntVec3 gridChunkDim;
+	int maxNumBatchesPerPhase;
+	int numPhases;
+	int phaseMask;
+
+	AssignConstraintsToGridBatchesParams()
+	{
+		memset(this, 0, sizeof(*this));
+	}
+};
+
+static void assignConstraintsToGridBatches(const AssignConstraintsToGridBatchesParams& params, int iConBegin, int iConEnd)
+{
+	BT_PROFILE("assignConstraintsToGridBatches");
+	// (can be done in parallel)
+	for (int iCon = iConBegin; iCon < iConEnd; ++iCon)
+	{
+		const btBatchedConstraintInfo& con = params.conInfos[iCon];
+		int iBody0 = con.bodyIds[0];
+		int iBody1 = con.bodyIds[1];
+		int iPhase = iCon;  //iBody0; // pseudorandom choice to distribute evenly amongst phases
+		iPhase &= params.phaseMask;
+		int gridCoord[3];
+		// is it a dynamic constraint?
+		if (params.bodyDynamicFlags[iBody0] && params.bodyDynamicFlags[iBody1])
+		{
+			const btIntVec3& body0Coords = params.bodyGridCoords[iBody0];
+			const btIntVec3& body1Coords = params.bodyGridCoords[iBody1];
+			// for each dimension x,y,z,
+			for (int i = 0; i < 3; ++i)
+			{
+				int coordMin = btMin(body0Coords.m_ints[i], body1Coords.m_ints[i]);
+				int coordMax = btMax(body0Coords.m_ints[i], body1Coords.m_ints[i]);
+				if (coordMin != coordMax)
+				{
+					btAssert(coordMax == coordMin + 1);
+					if ((coordMin & 1) == 0)
+					{
+						iPhase &= ~(1 << i);  // force bit off
+					}
+					else
+					{
+						iPhase |= (1 << i);  // force bit on
+						iPhase &= params.phaseMask;
+					}
+				}
+				gridCoord[i] = coordMin;
+			}
+		}
+		else
+		{
+			if (!params.bodyDynamicFlags[iBody0])
+			{
+				iBody0 = con.bodyIds[1];
+			}
+			btAssert(params.bodyDynamicFlags[iBody0]);
+			const btIntVec3& body0Coords = params.bodyGridCoords[iBody0];
+			// for each dimension x,y,z,
+			for (int i = 0; i < 3; ++i)
+			{
+				gridCoord[i] = body0Coords.m_ints[i];
+			}
+		}
+		// calculate chunk coordinates
+		int chunkCoord[3];
+		btIntVec3 gridChunkDim = params.gridChunkDim;
+		// for each dimension x,y,z,
+		for (int i = 0; i < 3; ++i)
+		{
+			int coordOffset = (iPhase >> i) & 1;
+			chunkCoord[i] = (gridCoord[i] - coordOffset) / 2;
+			btClamp(chunkCoord[i], 0, gridChunkDim[i] - 1);
+			btAssert(chunkCoord[i] < gridChunkDim[i]);
+		}
+		int iBatch = iPhase * params.maxNumBatchesPerPhase + chunkCoord[0] + chunkCoord[1] * gridChunkDim[0] + chunkCoord[2] * gridChunkDim[0] * gridChunkDim[1];
+		btAssert(iBatch >= 0 && iBatch < params.maxNumBatchesPerPhase * params.numPhases);
+		params.constraintBatchIds[iCon] = iBatch;
+	}
+}
+
+struct AssignConstraintsToGridBatchesLoop : public btIParallelForBody
+{
+	const AssignConstraintsToGridBatchesParams* m_params;
+
+	AssignConstraintsToGridBatchesLoop(const AssignConstraintsToGridBatchesParams& params)
+	{
+		m_params = &params;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		assignConstraintsToGridBatches(*m_params, iBegin, iEnd);
+	}
+};
+
+//
+// setupSpatialGridBatchesMt -- generate batches using a uniform 3D grid
+//
+/*
+
+Bodies are treated as 3D points at their center of mass. We only consider dynamic bodies at this stage,
+because only dynamic bodies are mutated when a constraint is solved, thus subject to race conditions.
+
+1. Compute a bounding box around all dynamic bodies
+2. Compute the maximum extent of all dynamic constraints. Each dynamic constraint is treated as a line segment, and we need the size of
+   box that will fully enclose any single dynamic constraint
+
+3. Establish the cell size of our grid, the cell size in each dimension must be at least as large as the dynamic constraints max-extent,
+   so that no dynamic constraint can span more than 2 cells of our grid on any axis of the grid. The cell size should be adjusted
+   larger in order to keep the total number of cells from being excessively high
+
+Key idea: Given that each constraint spans 1 or 2 grid cells in each dimension, we can handle all constraints by processing
+          in chunks of 2x2x2 cells with 8 different 1-cell offsets ((0,0,0),(0,0,1),(0,1,0),(0,1,1),(1,0,0)...).
+          For each of the 8 offsets, we create a phase, and for each 2x2x2 chunk with dynamic constraints becomes a batch in that phase.
+
+4. Once the grid is established, we can calculate for each constraint which phase and batch it belongs in.
+
+5. Do a merge small batches on the batches of each phase separately, to try to even out the sizes of batches
+
+Optionally, we can "collapse" one dimension of our 3D grid to turn it into a 2D grid, which reduces the number of phases
+to 4. With fewer phases, there are more constraints per phase and this makes it easier to create batches of a useful size.
+*/
+//
+static void setupSpatialGridBatchesMt(
+	btBatchedConstraints* batchedConstraints,
+	btAlignedObjectArray<char>* scratchMemory,
+	btConstraintArray* constraints,
+	const btAlignedObjectArray<btSolverBody>& bodies,
+	int minBatchSize,
+	int maxBatchSize,
+	bool use2DGrid)
+{
+	BT_PROFILE("setupSpatialGridBatchesMt");
+	const int numPhases = 8;
+	int numConstraints = constraints->size();
+	int numConstraintRows = constraints->size();
+
+	const int maxGridChunkCount = 128;
+	int allocNumBatchesPerPhase = maxGridChunkCount;
+	int minNumBatchesPerPhase = 16;
+	int allocNumBatches = allocNumBatchesPerPhase * numPhases;
+
+	btVector3* bodyPositions = NULL;
+	bool* bodyDynamicFlags = NULL;
+	btIntVec3* bodyGridCoords = NULL;
+	btBatchInfo* batches = NULL;
+	int* batchWork = NULL;
+	btBatchedConstraintInfo* conInfos = NULL;
+	int* constraintBatchIds = NULL;
+	int* constraintRowBatchIds = NULL;
+	{
+		PreallocatedMemoryHelper<10> memHelper;
+		memHelper.addChunk((void**)&bodyPositions, sizeof(btVector3) * bodies.size());
+		memHelper.addChunk((void**)&bodyDynamicFlags, sizeof(bool) * bodies.size());
+		memHelper.addChunk((void**)&bodyGridCoords, sizeof(btIntVec3) * bodies.size());
+		memHelper.addChunk((void**)&batches, sizeof(btBatchInfo) * allocNumBatches);
+		memHelper.addChunk((void**)&batchWork, sizeof(int) * allocNumBatches);
+		memHelper.addChunk((void**)&conInfos, sizeof(btBatchedConstraintInfo) * numConstraints);
+		memHelper.addChunk((void**)&constraintBatchIds, sizeof(int) * numConstraints);
+		memHelper.addChunk((void**)&constraintRowBatchIds, sizeof(int) * numConstraintRows);
+		size_t scratchSize = memHelper.getSizeToAllocate();
+		// if we need to reallocate
+		if (static_cast<size_t>(scratchMemory->capacity()) < scratchSize)
+		{
+			// allocate 6.25% extra to avoid repeated reallocs
+			scratchMemory->reserve(scratchSize + scratchSize / 16);
+		}
+		scratchMemory->resizeNoInitialize(scratchSize);
+		char* memPtr = &scratchMemory->at(0);
+		memHelper.setChunkPointers(memPtr);
+	}
+
+	numConstraints = initBatchedConstraintInfo(conInfos, constraints);
+
+	// compute bounding box around all dynamic bodies
+	// (could be done in parallel)
+	btVector3 bboxMin(BT_LARGE_FLOAT, BT_LARGE_FLOAT, BT_LARGE_FLOAT);
+	btVector3 bboxMax = -bboxMin;
+	//int dynamicBodyCount = 0;
+	for (int i = 0; i < bodies.size(); ++i)
+	{
+		const btSolverBody& body = bodies[i];
+		btVector3 bodyPos = body.getWorldTransform().getOrigin();
+		bool isDynamic = (body.internalGetInvMass().x() > btScalar(0));
+		bodyPositions[i] = bodyPos;
+		bodyDynamicFlags[i] = isDynamic;
+		if (isDynamic)
+		{
+			//dynamicBodyCount++;
+			bboxMin.setMin(bodyPos);
+			bboxMax.setMax(bodyPos);
+		}
+	}
+
+	// find max extent of all dynamic constraints
+	// (could be done in parallel)
+	btVector3 consExtent = findMaxDynamicConstraintExtent(bodyPositions, bodyDynamicFlags, conInfos, numConstraints, bodies.size());
+
+	btVector3 gridExtent = bboxMax - bboxMin;
+
+	gridExtent.setMax(btVector3(btScalar(1), btScalar(1), btScalar(1)));
+
+	btVector3 gridCellSize = consExtent;
+	int gridDim[3];
+	gridDim[0] = int(1.0 + gridExtent.x() / gridCellSize.x());
+	gridDim[1] = int(1.0 + gridExtent.y() / gridCellSize.y());
+	gridDim[2] = int(1.0 + gridExtent.z() / gridCellSize.z());
+
+	// if we can collapse an axis, it will cut our number of phases in half which could be more efficient
+	int phaseMask = 7;
+	bool collapseAxis = use2DGrid;
+	if (collapseAxis)
+	{
+		// pick the smallest axis to collapse, leaving us with the greatest number of cells in our grid
+		int iAxisToCollapse = 0;
+		int axisDim = gridDim[iAxisToCollapse];
+		//for each dimension
+		for (int i = 0; i < 3; ++i)
+		{
+			if (gridDim[i] < axisDim)
+			{
+				iAxisToCollapse = i;
+				axisDim = gridDim[i];
+			}
+		}
+		// collapse it
+		gridCellSize[iAxisToCollapse] = gridExtent[iAxisToCollapse] * 2.0f;
+		phaseMask &= ~(1 << iAxisToCollapse);
+	}
+
+	int numGridChunks = 0;
+	btIntVec3 gridChunkDim;  // each chunk is 2x2x2 group of cells
+	while (true)
+	{
+		gridDim[0] = int(1.0 + gridExtent.x() / gridCellSize.x());
+		gridDim[1] = int(1.0 + gridExtent.y() / gridCellSize.y());
+		gridDim[2] = int(1.0 + gridExtent.z() / gridCellSize.z());
+		gridChunkDim[0] = btMax(1, (gridDim[0] + 0) / 2);
+		gridChunkDim[1] = btMax(1, (gridDim[1] + 0) / 2);
+		gridChunkDim[2] = btMax(1, (gridDim[2] + 0) / 2);
+		numGridChunks = gridChunkDim[0] * gridChunkDim[1] * gridChunkDim[2];
+		float nChunks = float(gridChunkDim[0]) * float(gridChunkDim[1]) * float(gridChunkDim[2]);  // suceptible to integer overflow
+		if (numGridChunks <= maxGridChunkCount && nChunks <= maxGridChunkCount)
+		{
+			break;
+		}
+		gridCellSize *= 1.25;  // should roughly cut numCells in half
+	}
+	btAssert(numGridChunks <= maxGridChunkCount);
+	int maxNumBatchesPerPhase = numGridChunks;
+
+	// for each dynamic body, compute grid coords
+	btVector3 invGridCellSize = btVector3(1, 1, 1) / gridCellSize;
+	// (can be done in parallel)
+	for (int iBody = 0; iBody < bodies.size(); ++iBody)
+	{
+		btIntVec3& coords = bodyGridCoords[iBody];
+		if (bodyDynamicFlags[iBody])
+		{
+			btVector3 v = (bodyPositions[iBody] - bboxMin) * invGridCellSize;
+			coords.m_ints[0] = int(v.x());
+			coords.m_ints[1] = int(v.y());
+			coords.m_ints[2] = int(v.z());
+			btAssert(coords.m_ints[0] >= 0 && coords.m_ints[0] < gridDim[0]);
+			btAssert(coords.m_ints[1] >= 0 && coords.m_ints[1] < gridDim[1]);
+			btAssert(coords.m_ints[2] >= 0 && coords.m_ints[2] < gridDim[2]);
+		}
+		else
+		{
+			coords.m_ints[0] = -1;
+			coords.m_ints[1] = -1;
+			coords.m_ints[2] = -1;
+		}
+	}
+
+	for (int iPhase = 0; iPhase < numPhases; ++iPhase)
+	{
+		int batchBegin = iPhase * maxNumBatchesPerPhase;
+		int batchEnd = batchBegin + maxNumBatchesPerPhase;
+		for (int iBatch = batchBegin; iBatch < batchEnd; ++iBatch)
+		{
+			btBatchInfo& batch = batches[iBatch];
+			batch = btBatchInfo();
+		}
+	}
+
+	{
+		AssignConstraintsToGridBatchesParams params;
+		params.bodyDynamicFlags = bodyDynamicFlags;
+		params.bodyGridCoords = bodyGridCoords;
+		params.numBodies = bodies.size();
+		params.conInfos = conInfos;
+		params.constraintBatchIds = constraintBatchIds;
+		params.gridChunkDim = gridChunkDim;
+		params.maxNumBatchesPerPhase = maxNumBatchesPerPhase;
+		params.numPhases = numPhases;
+		params.phaseMask = phaseMask;
+		bool inParallel = true;
+		if (inParallel)
+		{
+			AssignConstraintsToGridBatchesLoop loop(params);
+			int grainSize = 250;
+			btParallelFor(0, numConstraints, grainSize, loop);
+		}
+		else
+		{
+			assignConstraintsToGridBatches(params, 0, numConstraints);
+		}
+	}
+	for (int iCon = 0; iCon < numConstraints; ++iCon)
+	{
+		const btBatchedConstraintInfo& con = conInfos[iCon];
+		int iBatch = constraintBatchIds[iCon];
+		btBatchInfo& batch = batches[iBatch];
+		batch.numConstraints += con.numConstraintRows;
+	}
+
+	for (int iPhase = 0; iPhase < numPhases; ++iPhase)
+	{
+		// if phase is legit,
+		if (iPhase == (iPhase & phaseMask))
+		{
+			int iBeginBatch = iPhase * maxNumBatchesPerPhase;
+			int iEndBatch = iBeginBatch + maxNumBatchesPerPhase;
+			mergeSmallBatches(batches, iBeginBatch, iEndBatch, minBatchSize, maxBatchSize);
+		}
+	}
+	// all constraints have been assigned a batchId
+	updateConstraintBatchIdsForMergesMt(constraintBatchIds, numConstraints, batches, maxNumBatchesPerPhase * numPhases);
+
+	if (numConstraintRows > numConstraints)
+	{
+		expandConstraintRowsMt(&constraintRowBatchIds[0], &constraintBatchIds[0], &conInfos[0], numConstraints, numConstraintRows);
+	}
+	else
+	{
+		constraintRowBatchIds = constraintBatchIds;
+	}
+
+	writeOutBatches(batchedConstraints, constraintRowBatchIds, numConstraintRows, batches, batchWork, maxNumBatchesPerPhase, numPhases);
+	btAssert(batchedConstraints->validate(constraints, bodies));
+}
+
+static void setupSingleBatch(
+	btBatchedConstraints* bc,
+	int numConstraints)
+{
+	BT_PROFILE("setupSingleBatch");
+	typedef btBatchedConstraints::Range Range;
+
+	bc->m_constraintIndices.resize(numConstraints);
+	for (int i = 0; i < numConstraints; ++i)
+	{
+		bc->m_constraintIndices[i] = i;
+	}
+
+	bc->m_batches.resizeNoInitialize(0);
+	bc->m_phases.resizeNoInitialize(0);
+	bc->m_phaseOrder.resizeNoInitialize(0);
+	bc->m_phaseGrainSize.resizeNoInitialize(0);
+
+	if (numConstraints > 0)
+	{
+		bc->m_batches.push_back(Range(0, numConstraints));
+		bc->m_phases.push_back(Range(0, 1));
+		bc->m_phaseOrder.push_back(0);
+		bc->m_phaseGrainSize.push_back(1);
+	}
+}
+
+void btBatchedConstraints::setup(
+	btConstraintArray* constraints,
+	const btAlignedObjectArray<btSolverBody>& bodies,
+	BatchingMethod batchingMethod,
+	int minBatchSize,
+	int maxBatchSize,
+	btAlignedObjectArray<char>* scratchMemory)
+{
+	if (constraints->size() >= minBatchSize * 4)
+	{
+		bool use2DGrid = batchingMethod == BATCHING_METHOD_SPATIAL_GRID_2D;
+		setupSpatialGridBatchesMt(this, scratchMemory, constraints, bodies, minBatchSize, maxBatchSize, use2DGrid);
+		if (s_debugDrawBatches)
+		{
+			debugDrawAllBatches(this, constraints, bodies);
+		}
+	}
+	else
+	{
+		setupSingleBatch(this, constraints->size());
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h
new file mode 100644
index 0000000..651df7a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h
@@ -0,0 +1,62 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_BATCHED_CONSTRAINTS_H
+#define BT_BATCHED_CONSTRAINTS_H
+
+#include "LinearMath/btThreads.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "BulletDynamics/ConstraintSolver/btSolverBody.h"
+#include "BulletDynamics/ConstraintSolver/btSolverConstraint.h"
+
+class btIDebugDraw;
+
+struct btBatchedConstraints
+{
+	enum BatchingMethod
+	{
+		BATCHING_METHOD_SPATIAL_GRID_2D,
+		BATCHING_METHOD_SPATIAL_GRID_3D,
+		BATCHING_METHOD_COUNT
+	};
+	struct Range
+	{
+		int begin;
+		int end;
+
+		Range() : begin(0), end(0) {}
+		Range(int _beg, int _end) : begin(_beg), end(_end) {}
+	};
+
+	btAlignedObjectArray<int> m_constraintIndices;
+	btAlignedObjectArray<Range> m_batches;        // each batch is a range of indices in the m_constraintIndices array
+	btAlignedObjectArray<Range> m_phases;         // each phase is range of indices in the m_batches array
+	btAlignedObjectArray<char> m_phaseGrainSize;  // max grain size for each phase
+	btAlignedObjectArray<int> m_phaseOrder;       // phases can be done in any order, so we can randomize the order here
+	btIDebugDraw* m_debugDrawer;
+
+	static bool s_debugDrawBatches;
+
+	btBatchedConstraints() { m_debugDrawer = NULL; }
+	void setup(btConstraintArray* constraints,
+			   const btAlignedObjectArray<btSolverBody>& bodies,
+			   BatchingMethod batchingMethod,
+			   int minBatchSize,
+			   int maxBatchSize,
+			   btAlignedObjectArray<char>* scratchMemory);
+	bool validate(btConstraintArray* constraints, const btAlignedObjectArray<btSolverBody>& bodies) const;
+};
+
+#endif  // BT_BATCHED_CONSTRAINTS_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
new file mode 100644
index 0000000..ac046aa
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -0,0 +1,1116 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+btConeTwistConstraint is Copyright (c) 2007 Starbreeze Studios
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Written by: Marcus Hennix
+*/
+
+#include "btConeTwistConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btMinMax.h"
+#include <cmath>
+#include <new>
+
+//#define CONETWIST_USE_OBSOLETE_SOLVER true
+#define CONETWIST_USE_OBSOLETE_SOLVER false
+#define CONETWIST_DEF_FIX_THRESH btScalar(.05f)
+
+SIMD_FORCE_INLINE btScalar computeAngularImpulseDenominator(const btVector3& axis, const btMatrix3x3& invInertiaWorld)
+{
+	btVector3 vec = axis * invInertiaWorld;
+	return axis.dot(vec);
+}
+
+btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA, btRigidBody& rbB,
+											 const btTransform& rbAFrame, const btTransform& rbBFrame)
+	: btTypedConstraint(CONETWIST_CONSTRAINT_TYPE, rbA, rbB), m_rbAFrame(rbAFrame), m_rbBFrame(rbBFrame), m_angularOnly(false), m_useSolveConstraintObsolete(CONETWIST_USE_OBSOLETE_SOLVER)
+{
+	init();
+}
+
+btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA, const btTransform& rbAFrame)
+	: btTypedConstraint(CONETWIST_CONSTRAINT_TYPE, rbA), m_rbAFrame(rbAFrame), m_angularOnly(false), m_useSolveConstraintObsolete(CONETWIST_USE_OBSOLETE_SOLVER)
+{
+	m_rbBFrame = m_rbAFrame;
+	m_rbBFrame.setOrigin(btVector3(0., 0., 0.));
+	init();
+}
+
+void btConeTwistConstraint::init()
+{
+	m_angularOnly = false;
+	m_solveTwistLimit = false;
+	m_solveSwingLimit = false;
+	m_bMotorEnabled = false;
+	m_maxMotorImpulse = btScalar(-1);
+
+	setLimit(btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT), btScalar(BT_LARGE_FLOAT));
+	m_damping = btScalar(0.01);
+	m_fixThresh = CONETWIST_DEF_FIX_THRESH;
+	m_flags = 0;
+	m_linCFM = btScalar(0.f);
+	m_linERP = btScalar(0.7f);
+	m_angCFM = btScalar(0.f);
+}
+
+void btConeTwistConstraint::getInfo1(btConstraintInfo1* info)
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		info->m_numConstraintRows = 0;
+		info->nub = 0;
+	}
+	else
+	{
+		info->m_numConstraintRows = 3;
+		info->nub = 3;
+		calcAngleInfo2(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform(), m_rbA.getInvInertiaTensorWorld(), m_rbB.getInvInertiaTensorWorld());
+		if (m_solveSwingLimit)
+		{
+			info->m_numConstraintRows++;
+			info->nub--;
+			if ((m_swingSpan1 < m_fixThresh) && (m_swingSpan2 < m_fixThresh))
+			{
+				info->m_numConstraintRows++;
+				info->nub--;
+			}
+		}
+		if (m_solveTwistLimit)
+		{
+			info->m_numConstraintRows++;
+			info->nub--;
+		}
+	}
+}
+
+void btConeTwistConstraint::getInfo1NonVirtual(btConstraintInfo1* info)
+{
+	//always reserve 6 rows: object transform is not available on SPU
+	info->m_numConstraintRows = 6;
+	info->nub = 0;
+}
+
+void btConeTwistConstraint::getInfo2(btConstraintInfo2* info)
+{
+	getInfo2NonVirtual(info, m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform(), m_rbA.getInvInertiaTensorWorld(), m_rbB.getInvInertiaTensorWorld());
+}
+
+void btConeTwistConstraint::getInfo2NonVirtual(btConstraintInfo2* info, const btTransform& transA, const btTransform& transB, const btMatrix3x3& invInertiaWorldA, const btMatrix3x3& invInertiaWorldB)
+{
+	calcAngleInfo2(transA, transB, invInertiaWorldA, invInertiaWorldB);
+
+	btAssert(!m_useSolveConstraintObsolete);
+	// set jacobian
+	info->m_J1linearAxis[0] = 1;
+	info->m_J1linearAxis[info->rowskip + 1] = 1;
+	info->m_J1linearAxis[2 * info->rowskip + 2] = 1;
+	btVector3 a1 = transA.getBasis() * m_rbAFrame.getOrigin();
+	{
+		btVector3* angular0 = (btVector3*)(info->m_J1angularAxis);
+		btVector3* angular1 = (btVector3*)(info->m_J1angularAxis + info->rowskip);
+		btVector3* angular2 = (btVector3*)(info->m_J1angularAxis + 2 * info->rowskip);
+		btVector3 a1neg = -a1;
+		a1neg.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+	info->m_J2linearAxis[0] = -1;
+	info->m_J2linearAxis[info->rowskip + 1] = -1;
+	info->m_J2linearAxis[2 * info->rowskip + 2] = -1;
+	btVector3 a2 = transB.getBasis() * m_rbBFrame.getOrigin();
+	{
+		btVector3* angular0 = (btVector3*)(info->m_J2angularAxis);
+		btVector3* angular1 = (btVector3*)(info->m_J2angularAxis + info->rowskip);
+		btVector3* angular2 = (btVector3*)(info->m_J2angularAxis + 2 * info->rowskip);
+		a2.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+	// set right hand side
+	btScalar linERP = (m_flags & BT_CONETWIST_FLAGS_LIN_ERP) ? m_linERP : info->erp;
+	btScalar k = info->fps * linERP;
+	int j;
+	for (j = 0; j < 3; j++)
+	{
+		info->m_constraintError[j * info->rowskip] = k * (a2[j] + transB.getOrigin()[j] - a1[j] - transA.getOrigin()[j]);
+		info->m_lowerLimit[j * info->rowskip] = -SIMD_INFINITY;
+		info->m_upperLimit[j * info->rowskip] = SIMD_INFINITY;
+		if (m_flags & BT_CONETWIST_FLAGS_LIN_CFM)
+		{
+			info->cfm[j * info->rowskip] = m_linCFM;
+		}
+	}
+	int row = 3;
+	int srow = row * info->rowskip;
+	btVector3 ax1;
+	// angular limits
+	if (m_solveSwingLimit)
+	{
+		btScalar* J1 = info->m_J1angularAxis;
+		btScalar* J2 = info->m_J2angularAxis;
+		if ((m_swingSpan1 < m_fixThresh) && (m_swingSpan2 < m_fixThresh))
+		{
+			btTransform trA = transA * m_rbAFrame;
+			btVector3 p = trA.getBasis().getColumn(1);
+			btVector3 q = trA.getBasis().getColumn(2);
+			int srow1 = srow + info->rowskip;
+			J1[srow + 0] = p[0];
+			J1[srow + 1] = p[1];
+			J1[srow + 2] = p[2];
+			J1[srow1 + 0] = q[0];
+			J1[srow1 + 1] = q[1];
+			J1[srow1 + 2] = q[2];
+			J2[srow + 0] = -p[0];
+			J2[srow + 1] = -p[1];
+			J2[srow + 2] = -p[2];
+			J2[srow1 + 0] = -q[0];
+			J2[srow1 + 1] = -q[1];
+			J2[srow1 + 2] = -q[2];
+			btScalar fact = info->fps * m_relaxationFactor;
+			info->m_constraintError[srow] = fact * m_swingAxis.dot(p);
+			info->m_constraintError[srow1] = fact * m_swingAxis.dot(q);
+			info->m_lowerLimit[srow] = -SIMD_INFINITY;
+			info->m_upperLimit[srow] = SIMD_INFINITY;
+			info->m_lowerLimit[srow1] = -SIMD_INFINITY;
+			info->m_upperLimit[srow1] = SIMD_INFINITY;
+			srow = srow1 + info->rowskip;
+		}
+		else
+		{
+			ax1 = m_swingAxis * m_relaxationFactor * m_relaxationFactor;
+			J1[srow + 0] = ax1[0];
+			J1[srow + 1] = ax1[1];
+			J1[srow + 2] = ax1[2];
+			J2[srow + 0] = -ax1[0];
+			J2[srow + 1] = -ax1[1];
+			J2[srow + 2] = -ax1[2];
+			btScalar k = info->fps * m_biasFactor;
+
+			info->m_constraintError[srow] = k * m_swingCorrection;
+			if (m_flags & BT_CONETWIST_FLAGS_ANG_CFM)
+			{
+				info->cfm[srow] = m_angCFM;
+			}
+			// m_swingCorrection is always positive or 0
+			info->m_lowerLimit[srow] = 0;
+			info->m_upperLimit[srow] = (m_bMotorEnabled && m_maxMotorImpulse >= 0.0f) ? m_maxMotorImpulse : SIMD_INFINITY;
+			srow += info->rowskip;
+		}
+	}
+	if (m_solveTwistLimit)
+	{
+		ax1 = m_twistAxis * m_relaxationFactor * m_relaxationFactor;
+		btScalar* J1 = info->m_J1angularAxis;
+		btScalar* J2 = info->m_J2angularAxis;
+		J1[srow + 0] = ax1[0];
+		J1[srow + 1] = ax1[1];
+		J1[srow + 2] = ax1[2];
+		J2[srow + 0] = -ax1[0];
+		J2[srow + 1] = -ax1[1];
+		J2[srow + 2] = -ax1[2];
+		btScalar k = info->fps * m_biasFactor;
+		info->m_constraintError[srow] = k * m_twistCorrection;
+		if (m_flags & BT_CONETWIST_FLAGS_ANG_CFM)
+		{
+			info->cfm[srow] = m_angCFM;
+		}
+		if (m_twistSpan > 0.0f)
+		{
+			if (m_twistCorrection > 0.0f)
+			{
+				info->m_lowerLimit[srow] = 0;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else
+			{
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = 0;
+			}
+		}
+		else
+		{
+			info->m_lowerLimit[srow] = -SIMD_INFINITY;
+			info->m_upperLimit[srow] = SIMD_INFINITY;
+		}
+		srow += info->rowskip;
+	}
+}
+
+void btConeTwistConstraint::buildJacobian()
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		m_appliedImpulse = btScalar(0.);
+		m_accTwistLimitImpulse = btScalar(0.);
+		m_accSwingLimitImpulse = btScalar(0.);
+		m_accMotorImpulse = btVector3(0., 0., 0.);
+
+		if (!m_angularOnly)
+		{
+			btVector3 pivotAInW = m_rbA.getCenterOfMassTransform() * m_rbAFrame.getOrigin();
+			btVector3 pivotBInW = m_rbB.getCenterOfMassTransform() * m_rbBFrame.getOrigin();
+			btVector3 relPos = pivotBInW - pivotAInW;
+
+			btVector3 normal[3];
+			if (relPos.length2() > SIMD_EPSILON)
+			{
+				normal[0] = relPos.normalized();
+			}
+			else
+			{
+				normal[0].setValue(btScalar(1.0), 0, 0);
+			}
+
+			btPlaneSpace1(normal[0], normal[1], normal[2]);
+
+			for (int i = 0; i < 3; i++)
+			{
+				new (&m_jac[i]) btJacobianEntry(
+					m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+					m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+					pivotAInW - m_rbA.getCenterOfMassPosition(),
+					pivotBInW - m_rbB.getCenterOfMassPosition(),
+					normal[i],
+					m_rbA.getInvInertiaDiagLocal(),
+					m_rbA.getInvMass(),
+					m_rbB.getInvInertiaDiagLocal(),
+					m_rbB.getInvMass());
+			}
+		}
+
+		calcAngleInfo2(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform(), m_rbA.getInvInertiaTensorWorld(), m_rbB.getInvInertiaTensorWorld());
+	}
+}
+
+void btConeTwistConstraint::solveConstraintObsolete(btSolverBody& bodyA, btSolverBody& bodyB, btScalar timeStep)
+{
+#ifndef __SPU__
+	if (m_useSolveConstraintObsolete)
+	{
+		btVector3 pivotAInW = m_rbA.getCenterOfMassTransform() * m_rbAFrame.getOrigin();
+		btVector3 pivotBInW = m_rbB.getCenterOfMassTransform() * m_rbBFrame.getOrigin();
+
+		btScalar tau = btScalar(0.3);
+
+		//linear part
+		if (!m_angularOnly)
+		{
+			btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition();
+			btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
+
+			btVector3 vel1;
+			bodyA.internalGetVelocityInLocalPointObsolete(rel_pos1, vel1);
+			btVector3 vel2;
+			bodyB.internalGetVelocityInLocalPointObsolete(rel_pos2, vel2);
+			btVector3 vel = vel1 - vel2;
+
+			for (int i = 0; i < 3; i++)
+			{
+				const btVector3& normal = m_jac[i].m_linearJointAxis;
+				btScalar jacDiagABInv = btScalar(1.) / m_jac[i].getDiagonal();
+
+				btScalar rel_vel;
+				rel_vel = normal.dot(vel);
+				//positional error (zeroth order error)
+				btScalar depth = -(pivotAInW - pivotBInW).dot(normal);  //this is the error projected on the normal
+				btScalar impulse = depth * tau / timeStep * jacDiagABInv - rel_vel * jacDiagABInv;
+				m_appliedImpulse += impulse;
+
+				btVector3 ftorqueAxis1 = rel_pos1.cross(normal);
+				btVector3 ftorqueAxis2 = rel_pos2.cross(normal);
+				bodyA.internalApplyImpulse(normal * m_rbA.getInvMass(), m_rbA.getInvInertiaTensorWorld() * ftorqueAxis1, impulse);
+				bodyB.internalApplyImpulse(normal * m_rbB.getInvMass(), m_rbB.getInvInertiaTensorWorld() * ftorqueAxis2, -impulse);
+			}
+		}
+
+		// apply motor
+		if (m_bMotorEnabled)
+		{
+			// compute current and predicted transforms
+			btTransform trACur = m_rbA.getCenterOfMassTransform();
+			btTransform trBCur = m_rbB.getCenterOfMassTransform();
+			btVector3 omegaA;
+			bodyA.internalGetAngularVelocity(omegaA);
+			btVector3 omegaB;
+			bodyB.internalGetAngularVelocity(omegaB);
+			btTransform trAPred;
+			trAPred.setIdentity();
+			btVector3 zerovec(0, 0, 0);
+			btTransformUtil::integrateTransform(
+				trACur, zerovec, omegaA, timeStep, trAPred);
+			btTransform trBPred;
+			trBPred.setIdentity();
+			btTransformUtil::integrateTransform(
+				trBCur, zerovec, omegaB, timeStep, trBPred);
+
+			// compute desired transforms in world
+			btTransform trPose(m_qTarget);
+			btTransform trABDes = m_rbBFrame * trPose * m_rbAFrame.inverse();
+			btTransform trADes = trBPred * trABDes;
+			btTransform trBDes = trAPred * trABDes.inverse();
+
+			// compute desired omegas in world
+			btVector3 omegaADes, omegaBDes;
+
+			btTransformUtil::calculateVelocity(trACur, trADes, timeStep, zerovec, omegaADes);
+			btTransformUtil::calculateVelocity(trBCur, trBDes, timeStep, zerovec, omegaBDes);
+
+			// compute delta omegas
+			btVector3 dOmegaA = omegaADes - omegaA;
+			btVector3 dOmegaB = omegaBDes - omegaB;
+
+			// compute weighted avg axis of dOmega (weighting based on inertias)
+			btVector3 axisA, axisB;
+			btScalar kAxisAInv = 0, kAxisBInv = 0;
+
+			if (dOmegaA.length2() > SIMD_EPSILON)
+			{
+				axisA = dOmegaA.normalized();
+				kAxisAInv = getRigidBodyA().computeAngularImpulseDenominator(axisA);
+			}
+
+			if (dOmegaB.length2() > SIMD_EPSILON)
+			{
+				axisB = dOmegaB.normalized();
+				kAxisBInv = getRigidBodyB().computeAngularImpulseDenominator(axisB);
+			}
+
+			btVector3 avgAxis = kAxisAInv * axisA + kAxisBInv * axisB;
+
+			static bool bDoTorque = true;
+			if (bDoTorque && avgAxis.length2() > SIMD_EPSILON)
+			{
+				avgAxis.normalize();
+				kAxisAInv = getRigidBodyA().computeAngularImpulseDenominator(avgAxis);
+				kAxisBInv = getRigidBodyB().computeAngularImpulseDenominator(avgAxis);
+				btScalar kInvCombined = kAxisAInv + kAxisBInv;
+
+				btVector3 impulse = (kAxisAInv * dOmegaA - kAxisBInv * dOmegaB) /
+									(kInvCombined * kInvCombined);
+
+				if (m_maxMotorImpulse >= 0)
+				{
+					btScalar fMaxImpulse = m_maxMotorImpulse;
+					if (m_bNormalizedMotorStrength)
+						fMaxImpulse = fMaxImpulse / kAxisAInv;
+
+					btVector3 newUnclampedAccImpulse = m_accMotorImpulse + impulse;
+					btScalar newUnclampedMag = newUnclampedAccImpulse.length();
+					if (newUnclampedMag > fMaxImpulse)
+					{
+						newUnclampedAccImpulse.normalize();
+						newUnclampedAccImpulse *= fMaxImpulse;
+						impulse = newUnclampedAccImpulse - m_accMotorImpulse;
+					}
+					m_accMotorImpulse += impulse;
+				}
+
+				btScalar impulseMag = impulse.length();
+				btVector3 impulseAxis = impulse / impulseMag;
+
+				bodyA.internalApplyImpulse(btVector3(0, 0, 0), m_rbA.getInvInertiaTensorWorld() * impulseAxis, impulseMag);
+				bodyB.internalApplyImpulse(btVector3(0, 0, 0), m_rbB.getInvInertiaTensorWorld() * impulseAxis, -impulseMag);
+			}
+		}
+		else if (m_damping > SIMD_EPSILON)  // no motor: do a little damping
+		{
+			btVector3 angVelA;
+			bodyA.internalGetAngularVelocity(angVelA);
+			btVector3 angVelB;
+			bodyB.internalGetAngularVelocity(angVelB);
+			btVector3 relVel = angVelB - angVelA;
+			if (relVel.length2() > SIMD_EPSILON)
+			{
+				btVector3 relVelAxis = relVel.normalized();
+				btScalar m_kDamping = btScalar(1.) /
+									  (getRigidBodyA().computeAngularImpulseDenominator(relVelAxis) +
+									   getRigidBodyB().computeAngularImpulseDenominator(relVelAxis));
+				btVector3 impulse = m_damping * m_kDamping * relVel;
+
+				btScalar impulseMag = impulse.length();
+				btVector3 impulseAxis = impulse / impulseMag;
+				bodyA.internalApplyImpulse(btVector3(0, 0, 0), m_rbA.getInvInertiaTensorWorld() * impulseAxis, impulseMag);
+				bodyB.internalApplyImpulse(btVector3(0, 0, 0), m_rbB.getInvInertiaTensorWorld() * impulseAxis, -impulseMag);
+			}
+		}
+
+		// joint limits
+		{
+			///solve angular part
+			btVector3 angVelA;
+			bodyA.internalGetAngularVelocity(angVelA);
+			btVector3 angVelB;
+			bodyB.internalGetAngularVelocity(angVelB);
+
+			// solve swing limit
+			if (m_solveSwingLimit)
+			{
+				btScalar amplitude = m_swingLimitRatio * m_swingCorrection * m_biasFactor / timeStep;
+				btScalar relSwingVel = (angVelB - angVelA).dot(m_swingAxis);
+				if (relSwingVel > 0)
+					amplitude += m_swingLimitRatio * relSwingVel * m_relaxationFactor;
+				btScalar impulseMag = amplitude * m_kSwing;
+
+				// Clamp the accumulated impulse
+				btScalar temp = m_accSwingLimitImpulse;
+				m_accSwingLimitImpulse = btMax(m_accSwingLimitImpulse + impulseMag, btScalar(0.0));
+				impulseMag = m_accSwingLimitImpulse - temp;
+
+				btVector3 impulse = m_swingAxis * impulseMag;
+
+				// don't let cone response affect twist
+				// (this can happen since body A's twist doesn't match body B's AND we use an elliptical cone limit)
+				{
+					btVector3 impulseTwistCouple = impulse.dot(m_twistAxisA) * m_twistAxisA;
+					btVector3 impulseNoTwistCouple = impulse - impulseTwistCouple;
+					impulse = impulseNoTwistCouple;
+				}
+
+				impulseMag = impulse.length();
+				btVector3 noTwistSwingAxis = impulse / impulseMag;
+
+				bodyA.internalApplyImpulse(btVector3(0, 0, 0), m_rbA.getInvInertiaTensorWorld() * noTwistSwingAxis, impulseMag);
+				bodyB.internalApplyImpulse(btVector3(0, 0, 0), m_rbB.getInvInertiaTensorWorld() * noTwistSwingAxis, -impulseMag);
+			}
+
+			// solve twist limit
+			if (m_solveTwistLimit)
+			{
+				btScalar amplitude = m_twistLimitRatio * m_twistCorrection * m_biasFactor / timeStep;
+				btScalar relTwistVel = (angVelB - angVelA).dot(m_twistAxis);
+				if (relTwistVel > 0)  // only damp when moving towards limit (m_twistAxis flipping is important)
+					amplitude += m_twistLimitRatio * relTwistVel * m_relaxationFactor;
+				btScalar impulseMag = amplitude * m_kTwist;
+
+				// Clamp the accumulated impulse
+				btScalar temp = m_accTwistLimitImpulse;
+				m_accTwistLimitImpulse = btMax(m_accTwistLimitImpulse + impulseMag, btScalar(0.0));
+				impulseMag = m_accTwistLimitImpulse - temp;
+
+				//		btVector3 impulse = m_twistAxis * impulseMag;
+
+				bodyA.internalApplyImpulse(btVector3(0, 0, 0), m_rbA.getInvInertiaTensorWorld() * m_twistAxis, impulseMag);
+				bodyB.internalApplyImpulse(btVector3(0, 0, 0), m_rbB.getInvInertiaTensorWorld() * m_twistAxis, -impulseMag);
+			}
+		}
+	}
+#else
+	btAssert(0);
+#endif  //__SPU__
+}
+
+void btConeTwistConstraint::updateRHS(btScalar timeStep)
+{
+	(void)timeStep;
+}
+
+#ifndef __SPU__
+void btConeTwistConstraint::calcAngleInfo()
+{
+	m_swingCorrection = btScalar(0.);
+	m_twistLimitSign = btScalar(0.);
+	m_solveTwistLimit = false;
+	m_solveSwingLimit = false;
+
+	btVector3 b1Axis1(0, 0, 0), b1Axis2(0, 0, 0), b1Axis3(0, 0, 0);
+	btVector3 b2Axis1(0, 0, 0), b2Axis2(0, 0, 0);
+
+	b1Axis1 = getRigidBodyA().getCenterOfMassTransform().getBasis() * this->m_rbAFrame.getBasis().getColumn(0);
+	b2Axis1 = getRigidBodyB().getCenterOfMassTransform().getBasis() * this->m_rbBFrame.getBasis().getColumn(0);
+
+	btScalar swing1 = btScalar(0.), swing2 = btScalar(0.);
+
+	btScalar swx = btScalar(0.), swy = btScalar(0.);
+	btScalar thresh = btScalar(10.);
+	btScalar fact;
+
+	// Get Frame into world space
+	if (m_swingSpan1 >= btScalar(0.05f))
+	{
+		b1Axis2 = getRigidBodyA().getCenterOfMassTransform().getBasis() * this->m_rbAFrame.getBasis().getColumn(1);
+		swx = b2Axis1.dot(b1Axis1);
+		swy = b2Axis1.dot(b1Axis2);
+		swing1 = btAtan2Fast(swy, swx);
+		fact = (swy * swy + swx * swx) * thresh * thresh;
+		fact = fact / (fact + btScalar(1.0));
+		swing1 *= fact;
+	}
+
+	if (m_swingSpan2 >= btScalar(0.05f))
+	{
+		b1Axis3 = getRigidBodyA().getCenterOfMassTransform().getBasis() * this->m_rbAFrame.getBasis().getColumn(2);
+		swx = b2Axis1.dot(b1Axis1);
+		swy = b2Axis1.dot(b1Axis3);
+		swing2 = btAtan2Fast(swy, swx);
+		fact = (swy * swy + swx * swx) * thresh * thresh;
+		fact = fact / (fact + btScalar(1.0));
+		swing2 *= fact;
+	}
+
+	btScalar RMaxAngle1Sq = 1.0f / (m_swingSpan1 * m_swingSpan1);
+	btScalar RMaxAngle2Sq = 1.0f / (m_swingSpan2 * m_swingSpan2);
+	btScalar EllipseAngle = btFabs(swing1 * swing1) * RMaxAngle1Sq + btFabs(swing2 * swing2) * RMaxAngle2Sq;
+
+	if (EllipseAngle > 1.0f)
+	{
+		m_swingCorrection = EllipseAngle - 1.0f;
+		m_solveSwingLimit = true;
+		// Calculate necessary axis & factors
+		m_swingAxis = b2Axis1.cross(b1Axis2 * b2Axis1.dot(b1Axis2) + b1Axis3 * b2Axis1.dot(b1Axis3));
+		m_swingAxis.normalize();
+		btScalar swingAxisSign = (b2Axis1.dot(b1Axis1) >= 0.0f) ? 1.0f : -1.0f;
+		m_swingAxis *= swingAxisSign;
+	}
+
+	// Twist limits
+	if (m_twistSpan >= btScalar(0.))
+	{
+		btVector3 b2Axis2 = getRigidBodyB().getCenterOfMassTransform().getBasis() * this->m_rbBFrame.getBasis().getColumn(1);
+		btQuaternion rotationArc = shortestArcQuat(b2Axis1, b1Axis1);
+		btVector3 TwistRef = quatRotate(rotationArc, b2Axis2);
+		btScalar twist = btAtan2Fast(TwistRef.dot(b1Axis3), TwistRef.dot(b1Axis2));
+		m_twistAngle = twist;
+
+		//		btScalar lockedFreeFactor = (m_twistSpan > btScalar(0.05f)) ? m_limitSoftness : btScalar(0.);
+		btScalar lockedFreeFactor = (m_twistSpan > btScalar(0.05f)) ? btScalar(1.0f) : btScalar(0.);
+		if (twist <= -m_twistSpan * lockedFreeFactor)
+		{
+			m_twistCorrection = -(twist + m_twistSpan);
+			m_solveTwistLimit = true;
+			m_twistAxis = (b2Axis1 + b1Axis1) * 0.5f;
+			m_twistAxis.normalize();
+			m_twistAxis *= -1.0f;
+		}
+		else if (twist > m_twistSpan * lockedFreeFactor)
+		{
+			m_twistCorrection = (twist - m_twistSpan);
+			m_solveTwistLimit = true;
+			m_twistAxis = (b2Axis1 + b1Axis1) * 0.5f;
+			m_twistAxis.normalize();
+		}
+	}
+}
+#endif  //__SPU__
+
+static btVector3 vTwist(1, 0, 0);  // twist axis in constraint's space
+
+void btConeTwistConstraint::calcAngleInfo2(const btTransform& transA, const btTransform& transB, const btMatrix3x3& invInertiaWorldA, const btMatrix3x3& invInertiaWorldB)
+{
+	m_swingCorrection = btScalar(0.);
+	m_twistLimitSign = btScalar(0.);
+	m_solveTwistLimit = false;
+	m_solveSwingLimit = false;
+	// compute rotation of A wrt B (in constraint space)
+	if (m_bMotorEnabled && (!m_useSolveConstraintObsolete))
+	{  // it is assumed that setMotorTarget() was alredy called
+		// and motor target m_qTarget is within constraint limits
+		// TODO : split rotation to pure swing and pure twist
+		// compute desired transforms in world
+		btTransform trPose(m_qTarget);
+		btTransform trA = transA * m_rbAFrame;
+		btTransform trB = transB * m_rbBFrame;
+		btTransform trDeltaAB = trB * trPose * trA.inverse();
+		btQuaternion qDeltaAB = trDeltaAB.getRotation();
+		btVector3 swingAxis = btVector3(qDeltaAB.x(), qDeltaAB.y(), qDeltaAB.z());
+		btScalar swingAxisLen2 = swingAxis.length2();
+		if (btFuzzyZero(swingAxisLen2))
+		{
+			return;
+		}
+		m_swingAxis = swingAxis;
+		m_swingAxis.normalize();
+		m_swingCorrection = qDeltaAB.getAngle();
+		if (!btFuzzyZero(m_swingCorrection))
+		{
+			m_solveSwingLimit = true;
+		}
+		return;
+	}
+
+	{
+		// compute rotation of A wrt B (in constraint space)
+		btQuaternion qA = transA.getRotation() * m_rbAFrame.getRotation();
+		btQuaternion qB = transB.getRotation() * m_rbBFrame.getRotation();
+		btQuaternion qAB = qB.inverse() * qA;
+		// split rotation into cone and twist
+		// (all this is done from B's perspective. Maybe I should be averaging axes...)
+		btVector3 vConeNoTwist = quatRotate(qAB, vTwist);
+		vConeNoTwist.normalize();
+		btQuaternion qABCone = shortestArcQuat(vTwist, vConeNoTwist);
+		qABCone.normalize();
+		btQuaternion qABTwist = qABCone.inverse() * qAB;
+		qABTwist.normalize();
+
+		if (m_swingSpan1 >= m_fixThresh && m_swingSpan2 >= m_fixThresh)
+		{
+			btScalar swingAngle, swingLimit = 0;
+			btVector3 swingAxis;
+			computeConeLimitInfo(qABCone, swingAngle, swingAxis, swingLimit);
+
+			if (swingAngle > swingLimit * m_limitSoftness)
+			{
+				m_solveSwingLimit = true;
+
+				// compute limit ratio: 0->1, where
+				// 0 == beginning of soft limit
+				// 1 == hard/real limit
+				m_swingLimitRatio = 1.f;
+				if (swingAngle < swingLimit && m_limitSoftness < 1.f - SIMD_EPSILON)
+				{
+					m_swingLimitRatio = (swingAngle - swingLimit * m_limitSoftness) /
+										(swingLimit - swingLimit * m_limitSoftness);
+				}
+
+				// swing correction tries to get back to soft limit
+				m_swingCorrection = swingAngle - (swingLimit * m_limitSoftness);
+
+				// adjustment of swing axis (based on ellipse normal)
+				adjustSwingAxisToUseEllipseNormal(swingAxis);
+
+				// Calculate necessary axis & factors
+				m_swingAxis = quatRotate(qB, -swingAxis);
+
+				m_twistAxisA.setValue(0, 0, 0);
+
+				m_kSwing = btScalar(1.) /
+						   (computeAngularImpulseDenominator(m_swingAxis, invInertiaWorldA) +
+							computeAngularImpulseDenominator(m_swingAxis, invInertiaWorldB));
+			}
+		}
+		else
+		{
+			// you haven't set any limits;
+			// or you're trying to set at least one of the swing limits too small. (if so, do you really want a conetwist constraint?)
+			// anyway, we have either hinge or fixed joint
+			btVector3 ivA = transA.getBasis() * m_rbAFrame.getBasis().getColumn(0);
+			btVector3 jvA = transA.getBasis() * m_rbAFrame.getBasis().getColumn(1);
+			btVector3 kvA = transA.getBasis() * m_rbAFrame.getBasis().getColumn(2);
+			btVector3 ivB = transB.getBasis() * m_rbBFrame.getBasis().getColumn(0);
+			btVector3 target;
+			btScalar x = ivB.dot(ivA);
+			btScalar y = ivB.dot(jvA);
+			btScalar z = ivB.dot(kvA);
+			if ((m_swingSpan1 < m_fixThresh) && (m_swingSpan2 < m_fixThresh))
+			{  // fixed. We'll need to add one more row to constraint
+				if ((!btFuzzyZero(y)) || (!(btFuzzyZero(z))))
+				{
+					m_solveSwingLimit = true;
+					m_swingAxis = -ivB.cross(ivA);
+				}
+			}
+			else
+			{
+				if (m_swingSpan1 < m_fixThresh)
+				{  // hinge around Y axis
+					//					if(!(btFuzzyZero(y)))
+					if ((!(btFuzzyZero(x))) || (!(btFuzzyZero(z))))
+					{
+						m_solveSwingLimit = true;
+						if (m_swingSpan2 >= m_fixThresh)
+						{
+							y = btScalar(0.f);
+							btScalar span2 = btAtan2(z, x);
+							if (span2 > m_swingSpan2)
+							{
+								x = btCos(m_swingSpan2);
+								z = btSin(m_swingSpan2);
+							}
+							else if (span2 < -m_swingSpan2)
+							{
+								x = btCos(m_swingSpan2);
+								z = -btSin(m_swingSpan2);
+							}
+						}
+					}
+				}
+				else
+				{  // hinge around Z axis
+					//					if(!btFuzzyZero(z))
+					if ((!(btFuzzyZero(x))) || (!(btFuzzyZero(y))))
+					{
+						m_solveSwingLimit = true;
+						if (m_swingSpan1 >= m_fixThresh)
+						{
+							z = btScalar(0.f);
+							btScalar span1 = btAtan2(y, x);
+							if (span1 > m_swingSpan1)
+							{
+								x = btCos(m_swingSpan1);
+								y = btSin(m_swingSpan1);
+							}
+							else if (span1 < -m_swingSpan1)
+							{
+								x = btCos(m_swingSpan1);
+								y = -btSin(m_swingSpan1);
+							}
+						}
+					}
+				}
+				target[0] = x * ivA[0] + y * jvA[0] + z * kvA[0];
+				target[1] = x * ivA[1] + y * jvA[1] + z * kvA[1];
+				target[2] = x * ivA[2] + y * jvA[2] + z * kvA[2];
+				target.normalize();
+				m_swingAxis = -ivB.cross(target);
+				m_swingCorrection = m_swingAxis.length();
+
+				if (!btFuzzyZero(m_swingCorrection))
+					m_swingAxis.normalize();
+			}
+		}
+
+		if (m_twistSpan >= btScalar(0.f))
+		{
+			btVector3 twistAxis;
+			computeTwistLimitInfo(qABTwist, m_twistAngle, twistAxis);
+
+			if (m_twistAngle > m_twistSpan * m_limitSoftness)
+			{
+				m_solveTwistLimit = true;
+
+				m_twistLimitRatio = 1.f;
+				if (m_twistAngle < m_twistSpan && m_limitSoftness < 1.f - SIMD_EPSILON)
+				{
+					m_twistLimitRatio = (m_twistAngle - m_twistSpan * m_limitSoftness) /
+										(m_twistSpan - m_twistSpan * m_limitSoftness);
+				}
+
+				// twist correction tries to get back to soft limit
+				m_twistCorrection = m_twistAngle - (m_twistSpan * m_limitSoftness);
+
+				m_twistAxis = quatRotate(qB, -twistAxis);
+
+				m_kTwist = btScalar(1.) /
+						   (computeAngularImpulseDenominator(m_twistAxis, invInertiaWorldA) +
+							computeAngularImpulseDenominator(m_twistAxis, invInertiaWorldB));
+			}
+
+			if (m_solveSwingLimit)
+				m_twistAxisA = quatRotate(qA, -twistAxis);
+		}
+		else
+		{
+			m_twistAngle = btScalar(0.f);
+		}
+	}
+}
+
+// given a cone rotation in constraint space, (pre: twist must already be removed)
+// this method computes its corresponding swing angle and axis.
+// more interestingly, it computes the cone/swing limit (angle) for this cone "pose".
+void btConeTwistConstraint::computeConeLimitInfo(const btQuaternion& qCone,
+												 btScalar& swingAngle,   // out
+												 btVector3& vSwingAxis,  // out
+												 btScalar& swingLimit)   // out
+{
+	swingAngle = qCone.getAngle();
+	if (swingAngle > SIMD_EPSILON)
+	{
+		vSwingAxis = btVector3(qCone.x(), qCone.y(), qCone.z());
+		vSwingAxis.normalize();
+#if 0
+        // non-zero twist?! this should never happen.
+       btAssert(fabs(vSwingAxis.x()) <= SIMD_EPSILON));
+#endif
+
+		// Compute limit for given swing. tricky:
+		// Given a swing axis, we're looking for the intersection with the bounding cone ellipse.
+		// (Since we're dealing with angles, this ellipse is embedded on the surface of a sphere.)
+
+		// For starters, compute the direction from center to surface of ellipse.
+		// This is just the perpendicular (ie. rotate 2D vector by PI/2) of the swing axis.
+		// (vSwingAxis is the cone rotation (in z,y); change vars and rotate to (x,y) coords.)
+		btScalar xEllipse = vSwingAxis.y();
+		btScalar yEllipse = -vSwingAxis.z();
+
+		// Now, we use the slope of the vector (using x/yEllipse) and find the length
+		// of the line that intersects the ellipse:
+		//  x^2   y^2
+		//  --- + --- = 1, where a and b are semi-major axes 2 and 1 respectively (ie. the limits)
+		//  a^2   b^2
+		// Do the math and it should be clear.
+
+		swingLimit = m_swingSpan1;  // if xEllipse == 0, we have a pure vSwingAxis.z rotation: just use swingspan1
+		if (fabs(xEllipse) > SIMD_EPSILON)
+		{
+			btScalar surfaceSlope2 = (yEllipse * yEllipse) / (xEllipse * xEllipse);
+			btScalar norm = 1 / (m_swingSpan2 * m_swingSpan2);
+			norm += surfaceSlope2 / (m_swingSpan1 * m_swingSpan1);
+			btScalar swingLimit2 = (1 + surfaceSlope2) / norm;
+			swingLimit = std::sqrt(swingLimit2);
+		}
+
+		// test!
+		/*swingLimit = m_swingSpan2;
+		if (fabs(vSwingAxis.z()) > SIMD_EPSILON)
+		{
+		btScalar mag_2 = m_swingSpan1*m_swingSpan1 + m_swingSpan2*m_swingSpan2;
+		btScalar sinphi = m_swingSpan2 / sqrt(mag_2);
+		btScalar phi = asin(sinphi);
+		btScalar theta = atan2(fabs(vSwingAxis.y()),fabs(vSwingAxis.z()));
+		btScalar alpha = 3.14159f - theta - phi;
+		btScalar sinalpha = sin(alpha);
+		swingLimit = m_swingSpan1 * sinphi/sinalpha;
+		}*/
+	}
+	else if (swingAngle < 0)
+	{
+		// this should never happen!
+#if 0
+        btAssert(0);
+#endif
+	}
+}
+
+btVector3 btConeTwistConstraint::GetPointForAngle(btScalar fAngleInRadians, btScalar fLength) const
+{
+	// compute x/y in ellipse using cone angle (0 -> 2*PI along surface of cone)
+	btScalar xEllipse = btCos(fAngleInRadians);
+	btScalar yEllipse = btSin(fAngleInRadians);
+
+	// Use the slope of the vector (using x/yEllipse) and find the length
+	// of the line that intersects the ellipse:
+	//  x^2   y^2
+	//  --- + --- = 1, where a and b are semi-major axes 2 and 1 respectively (ie. the limits)
+	//  a^2   b^2
+	// Do the math and it should be clear.
+
+	btScalar swingLimit = m_swingSpan1;  // if xEllipse == 0, just use axis b (1)
+	if (fabs(xEllipse) > SIMD_EPSILON)
+	{
+		btScalar surfaceSlope2 = (yEllipse * yEllipse) / (xEllipse * xEllipse);
+		btScalar norm = 1 / (m_swingSpan2 * m_swingSpan2);
+		norm += surfaceSlope2 / (m_swingSpan1 * m_swingSpan1);
+		btScalar swingLimit2 = (1 + surfaceSlope2) / norm;
+		swingLimit = std::sqrt(swingLimit2);
+	}
+
+	// convert into point in constraint space:
+	// note: twist is x-axis, swing 1 and 2 are along the z and y axes respectively
+	btVector3 vSwingAxis(0, xEllipse, -yEllipse);
+	btQuaternion qSwing(vSwingAxis, swingLimit);
+	btVector3 vPointInConstraintSpace(fLength, 0, 0);
+	return quatRotate(qSwing, vPointInConstraintSpace);
+}
+
+// given a twist rotation in constraint space, (pre: cone must already be removed)
+// this method computes its corresponding angle and axis.
+void btConeTwistConstraint::computeTwistLimitInfo(const btQuaternion& qTwist,
+												  btScalar& twistAngle,   // out
+												  btVector3& vTwistAxis)  // out
+{
+	btQuaternion qMinTwist = qTwist;
+	twistAngle = qTwist.getAngle();
+
+	if (twistAngle > SIMD_PI)  // long way around. flip quat and recalculate.
+	{
+		qMinTwist = -(qTwist);
+		twistAngle = qMinTwist.getAngle();
+	}
+	if (twistAngle < 0)
+	{
+		// this should never happen
+#if 0
+        btAssert(0);
+#endif
+	}
+
+	vTwistAxis = btVector3(qMinTwist.x(), qMinTwist.y(), qMinTwist.z());
+	if (twistAngle > SIMD_EPSILON)
+		vTwistAxis.normalize();
+}
+
+void btConeTwistConstraint::adjustSwingAxisToUseEllipseNormal(btVector3& vSwingAxis) const
+{
+	// the swing axis is computed as the "twist-free" cone rotation,
+	// but the cone limit is not circular, but elliptical (if swingspan1 != swingspan2).
+	// so, if we're outside the limits, the closest way back inside the cone isn't
+	// along the vector back to the center. better (and more stable) to use the ellipse normal.
+
+	// convert swing axis to direction from center to surface of ellipse
+	// (ie. rotate 2D vector by PI/2)
+	btScalar y = -vSwingAxis.z();
+	btScalar z = vSwingAxis.y();
+
+	// do the math...
+	if (fabs(z) > SIMD_EPSILON)  // avoid division by 0. and we don't need an update if z == 0.
+	{
+		// compute gradient/normal of ellipse surface at current "point"
+		btScalar grad = y / z;
+		grad *= m_swingSpan2 / m_swingSpan1;
+
+		// adjust y/z to represent normal at point (instead of vector to point)
+		if (y > 0)
+			y = fabs(grad * z);
+		else
+			y = -fabs(grad * z);
+
+		// convert ellipse direction back to swing axis
+		vSwingAxis.setZ(-y);
+		vSwingAxis.setY(z);
+		vSwingAxis.normalize();
+	}
+}
+
+void btConeTwistConstraint::setMotorTarget(const btQuaternion& q)
+{
+	//btTransform trACur = m_rbA.getCenterOfMassTransform();
+	//btTransform trBCur = m_rbB.getCenterOfMassTransform();
+	//	btTransform trABCur = trBCur.inverse() * trACur;
+	//	btQuaternion qABCur = trABCur.getRotation();
+	//	btTransform trConstraintCur = (trBCur * m_rbBFrame).inverse() * (trACur * m_rbAFrame);
+	//btQuaternion qConstraintCur = trConstraintCur.getRotation();
+
+	btQuaternion qConstraint = m_rbBFrame.getRotation().inverse() * q * m_rbAFrame.getRotation();
+	setMotorTargetInConstraintSpace(qConstraint);
+}
+
+void btConeTwistConstraint::setMotorTargetInConstraintSpace(const btQuaternion& q)
+{
+	m_qTarget = q;
+
+	// clamp motor target to within limits
+	{
+		btScalar softness = 1.f;  //m_limitSoftness;
+
+		// split into twist and cone
+		btVector3 vTwisted = quatRotate(m_qTarget, vTwist);
+		btQuaternion qTargetCone = shortestArcQuat(vTwist, vTwisted);
+		qTargetCone.normalize();
+		btQuaternion qTargetTwist = qTargetCone.inverse() * m_qTarget;
+		qTargetTwist.normalize();
+
+		// clamp cone
+		if (m_swingSpan1 >= btScalar(0.05f) && m_swingSpan2 >= btScalar(0.05f))
+		{
+			btScalar swingAngle, swingLimit;
+			btVector3 swingAxis;
+			computeConeLimitInfo(qTargetCone, swingAngle, swingAxis, swingLimit);
+
+			if (fabs(swingAngle) > SIMD_EPSILON)
+			{
+				if (swingAngle > swingLimit * softness)
+					swingAngle = swingLimit * softness;
+				else if (swingAngle < -swingLimit * softness)
+					swingAngle = -swingLimit * softness;
+				qTargetCone = btQuaternion(swingAxis, swingAngle);
+			}
+		}
+
+		// clamp twist
+		if (m_twistSpan >= btScalar(0.05f))
+		{
+			btScalar twistAngle;
+			btVector3 twistAxis;
+			computeTwistLimitInfo(qTargetTwist, twistAngle, twistAxis);
+
+			if (fabs(twistAngle) > SIMD_EPSILON)
+			{
+				// eddy todo: limitSoftness used here???
+				if (twistAngle > m_twistSpan * softness)
+					twistAngle = m_twistSpan * softness;
+				else if (twistAngle < -m_twistSpan * softness)
+					twistAngle = -m_twistSpan * softness;
+				qTargetTwist = btQuaternion(twistAxis, twistAngle);
+			}
+		}
+
+		m_qTarget = qTargetCone * qTargetTwist;
+	}
+}
+
+///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+///If no axis is provided, it uses the default axis for this constraint.
+void btConeTwistConstraint::setParam(int num, btScalar value, int axis)
+{
+	switch (num)
+	{
+		case BT_CONSTRAINT_ERP:
+		case BT_CONSTRAINT_STOP_ERP:
+			if ((axis >= 0) && (axis < 3))
+			{
+				m_linERP = value;
+				m_flags |= BT_CONETWIST_FLAGS_LIN_ERP;
+			}
+			else
+			{
+				m_biasFactor = value;
+			}
+			break;
+		case BT_CONSTRAINT_CFM:
+		case BT_CONSTRAINT_STOP_CFM:
+			if ((axis >= 0) && (axis < 3))
+			{
+				m_linCFM = value;
+				m_flags |= BT_CONETWIST_FLAGS_LIN_CFM;
+			}
+			else
+			{
+				m_angCFM = value;
+				m_flags |= BT_CONETWIST_FLAGS_ANG_CFM;
+			}
+			break;
+		default:
+			btAssertConstrParams(0);
+			break;
+	}
+}
+
+///return the local value of parameter
+btScalar btConeTwistConstraint::getParam(int num, int axis) const
+{
+	btScalar retVal = 0;
+	switch (num)
+	{
+		case BT_CONSTRAINT_ERP:
+		case BT_CONSTRAINT_STOP_ERP:
+			if ((axis >= 0) && (axis < 3))
+			{
+				btAssertConstrParams(m_flags & BT_CONETWIST_FLAGS_LIN_ERP);
+				retVal = m_linERP;
+			}
+			else if ((axis >= 3) && (axis < 6))
+			{
+				retVal = m_biasFactor;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+		case BT_CONSTRAINT_CFM:
+		case BT_CONSTRAINT_STOP_CFM:
+			if ((axis >= 0) && (axis < 3))
+			{
+				btAssertConstrParams(m_flags & BT_CONETWIST_FLAGS_LIN_CFM);
+				retVal = m_linCFM;
+			}
+			else if ((axis >= 3) && (axis < 6))
+			{
+				btAssertConstrParams(m_flags & BT_CONETWIST_FLAGS_ANG_CFM);
+				retVal = m_angCFM;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+		default:
+			btAssertConstrParams(0);
+	}
+	return retVal;
+}
+
+void btConeTwistConstraint::setFrames(const btTransform& frameA, const btTransform& frameB)
+{
+	m_rbAFrame = frameA;
+	m_rbBFrame = frameB;
+	buildJacobian();
+	//calculateTransforms();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
new file mode 100644
index 0000000..64f44df
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
@@ -0,0 +1,423 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+btConeTwistConstraint is Copyright (c) 2007 Starbreeze Studios
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Written by: Marcus Hennix
+*/
+
+/*
+Overview:
+
+btConeTwistConstraint can be used to simulate ragdoll joints (upper arm, leg etc).
+It is a fixed translation, 3 degree-of-freedom (DOF) rotational "joint".
+It divides the 3 rotational DOFs into swing (movement within a cone) and twist.
+Swing is divided into swing1 and swing2 which can have different limits, giving an elliptical shape.
+(Note: the cone's base isn't flat, so this ellipse is "embedded" on the surface of a sphere.)
+
+In the contraint's frame of reference:
+twist is along the x-axis,
+and swing 1 and 2 are along the z and y axes respectively.
+*/
+
+#ifndef BT_CONETWISTCONSTRAINT_H
+#define BT_CONETWISTCONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btConeTwistConstraintData2 btConeTwistConstraintDoubleData
+#define btConeTwistConstraintDataName "btConeTwistConstraintDoubleData"
+#else
+#define btConeTwistConstraintData2 btConeTwistConstraintData
+#define btConeTwistConstraintDataName "btConeTwistConstraintData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+class btRigidBody;
+
+enum btConeTwistFlags
+{
+	BT_CONETWIST_FLAGS_LIN_CFM = 1,
+	BT_CONETWIST_FLAGS_LIN_ERP = 2,
+	BT_CONETWIST_FLAGS_ANG_CFM = 4
+};
+
+///btConeTwistConstraint can be used to simulate ragdoll joints (upper arm, leg etc)
+ATTRIBUTE_ALIGNED16(class)
+btConeTwistConstraint : public btTypedConstraint
+{
+#ifdef IN_PARALLELL_SOLVER
+public:
+#endif
+	btJacobianEntry m_jac[3];  //3 orthogonal linear constraints
+
+	btTransform m_rbAFrame;
+	btTransform m_rbBFrame;
+
+	btScalar m_limitSoftness;
+	btScalar m_biasFactor;
+	btScalar m_relaxationFactor;
+
+	btScalar m_damping;
+
+	btScalar m_swingSpan1;
+	btScalar m_swingSpan2;
+	btScalar m_twistSpan;
+
+	btScalar m_fixThresh;
+
+	btVector3 m_swingAxis;
+	btVector3 m_twistAxis;
+
+	btScalar m_kSwing;
+	btScalar m_kTwist;
+
+	btScalar m_twistLimitSign;
+	btScalar m_swingCorrection;
+	btScalar m_twistCorrection;
+
+	btScalar m_twistAngle;
+
+	btScalar m_accSwingLimitImpulse;
+	btScalar m_accTwistLimitImpulse;
+
+	bool m_angularOnly;
+	bool m_solveTwistLimit;
+	bool m_solveSwingLimit;
+
+	bool m_useSolveConstraintObsolete;
+
+	// not yet used...
+	btScalar m_swingLimitRatio;
+	btScalar m_twistLimitRatio;
+	btVector3 m_twistAxisA;
+
+	// motor
+	bool m_bMotorEnabled;
+	bool m_bNormalizedMotorStrength;
+	btQuaternion m_qTarget;
+	btScalar m_maxMotorImpulse;
+	btVector3 m_accMotorImpulse;
+
+	// parameters
+	int m_flags;
+	btScalar m_linCFM;
+	btScalar m_linERP;
+	btScalar m_angCFM;
+
+protected:
+	void init();
+
+	void computeConeLimitInfo(const btQuaternion& qCone,                                           // in
+							  btScalar& swingAngle, btVector3& vSwingAxis, btScalar& swingLimit);  // all outs
+
+	void computeTwistLimitInfo(const btQuaternion& qTwist,                    // in
+							   btScalar& twistAngle, btVector3& vTwistAxis);  // all outs
+
+	void adjustSwingAxisToUseEllipseNormal(btVector3 & vSwingAxis) const;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btConeTwistConstraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& rbAFrame, const btTransform& rbBFrame);
+
+	btConeTwistConstraint(btRigidBody & rbA, const btTransform& rbAFrame);
+
+	virtual void buildJacobian();
+
+	virtual void getInfo1(btConstraintInfo1 * info);
+
+	void getInfo1NonVirtual(btConstraintInfo1 * info);
+
+	virtual void getInfo2(btConstraintInfo2 * info);
+
+	void getInfo2NonVirtual(btConstraintInfo2 * info, const btTransform& transA, const btTransform& transB, const btMatrix3x3& invInertiaWorldA, const btMatrix3x3& invInertiaWorldB);
+
+	virtual void solveConstraintObsolete(btSolverBody & bodyA, btSolverBody & bodyB, btScalar timeStep);
+
+	void updateRHS(btScalar timeStep);
+
+	const btRigidBody& getRigidBodyA() const
+	{
+		return m_rbA;
+	}
+	const btRigidBody& getRigidBodyB() const
+	{
+		return m_rbB;
+	}
+
+	void setAngularOnly(bool angularOnly)
+	{
+		m_angularOnly = angularOnly;
+	}
+
+	bool getAngularOnly() const
+	{
+		return m_angularOnly;
+	}
+
+	void setLimit(int limitIndex, btScalar limitValue)
+	{
+		switch (limitIndex)
+		{
+			case 3:
+			{
+				m_twistSpan = limitValue;
+				break;
+			}
+			case 4:
+			{
+				m_swingSpan2 = limitValue;
+				break;
+			}
+			case 5:
+			{
+				m_swingSpan1 = limitValue;
+				break;
+			}
+			default:
+			{
+			}
+		};
+	}
+
+	btScalar getLimit(int limitIndex) const
+	{
+		switch (limitIndex)
+		{
+			case 3:
+			{
+				return m_twistSpan;
+				break;
+			}
+			case 4:
+			{
+				return m_swingSpan2;
+				break;
+			}
+			case 5:
+			{
+				return m_swingSpan1;
+				break;
+			}
+			default:
+			{
+				btAssert(0 && "Invalid limitIndex specified for btConeTwistConstraint");
+				return 0.0;
+			}
+		};
+	}
+
+	// setLimit(), a few notes:
+	// _softness:
+	//		0->1, recommend ~0.8->1.
+	//		describes % of limits where movement is free.
+	//		beyond this softness %, the limit is gradually enforced until the "hard" (1.0) limit is reached.
+	// _biasFactor:
+	//		0->1?, recommend 0.3 +/-0.3 or so.
+	//		strength with which constraint resists zeroth order (angular, not angular velocity) limit violation.
+	// __relaxationFactor:
+	//		0->1, recommend to stay near 1.
+	//		the lower the value, the less the constraint will fight velocities which violate the angular limits.
+	void setLimit(btScalar _swingSpan1, btScalar _swingSpan2, btScalar _twistSpan, btScalar _softness = 1.f, btScalar _biasFactor = 0.3f, btScalar _relaxationFactor = 1.0f)
+	{
+		m_swingSpan1 = _swingSpan1;
+		m_swingSpan2 = _swingSpan2;
+		m_twistSpan = _twistSpan;
+
+		m_limitSoftness = _softness;
+		m_biasFactor = _biasFactor;
+		m_relaxationFactor = _relaxationFactor;
+	}
+
+	const btTransform& getAFrame() const { return m_rbAFrame; };
+	const btTransform& getBFrame() const { return m_rbBFrame; };
+
+	inline int getSolveTwistLimit()
+	{
+		return m_solveTwistLimit;
+	}
+
+	inline int getSolveSwingLimit()
+	{
+		return m_solveSwingLimit;
+	}
+
+	inline btScalar getTwistLimitSign()
+	{
+		return m_twistLimitSign;
+	}
+
+	void calcAngleInfo();
+	void calcAngleInfo2(const btTransform& transA, const btTransform& transB, const btMatrix3x3& invInertiaWorldA, const btMatrix3x3& invInertiaWorldB);
+
+	inline btScalar getSwingSpan1() const
+	{
+		return m_swingSpan1;
+	}
+	inline btScalar getSwingSpan2() const
+	{
+		return m_swingSpan2;
+	}
+	inline btScalar getTwistSpan() const
+	{
+		return m_twistSpan;
+	}
+	inline btScalar getLimitSoftness() const
+	{
+		return m_limitSoftness;
+	}
+	inline btScalar getBiasFactor() const
+	{
+		return m_biasFactor;
+	}
+	inline btScalar getRelaxationFactor() const
+	{
+		return m_relaxationFactor;
+	}
+	inline btScalar getTwistAngle() const
+	{
+		return m_twistAngle;
+	}
+	bool isPastSwingLimit() { return m_solveSwingLimit; }
+
+	btScalar getDamping() const { return m_damping; }
+	void setDamping(btScalar damping) { m_damping = damping; }
+
+	void enableMotor(bool b) { m_bMotorEnabled = b; }
+	bool isMotorEnabled() const { return m_bMotorEnabled; }
+	btScalar getMaxMotorImpulse() const { return m_maxMotorImpulse; }
+	bool isMaxMotorImpulseNormalized() const { return m_bNormalizedMotorStrength; }
+	void setMaxMotorImpulse(btScalar maxMotorImpulse)
+	{
+		m_maxMotorImpulse = maxMotorImpulse;
+		m_bNormalizedMotorStrength = false;
+	}
+	void setMaxMotorImpulseNormalized(btScalar maxMotorImpulse)
+	{
+		m_maxMotorImpulse = maxMotorImpulse;
+		m_bNormalizedMotorStrength = true;
+	}
+
+	btScalar getFixThresh() { return m_fixThresh; }
+	void setFixThresh(btScalar fixThresh) { m_fixThresh = fixThresh; }
+
+	// setMotorTarget:
+	// q: the desired rotation of bodyA wrt bodyB.
+	// note: if q violates the joint limits, the internal target is clamped to avoid conflicting impulses (very bad for stability)
+	// note: don't forget to enableMotor()
+	void setMotorTarget(const btQuaternion& q);
+	const btQuaternion& getMotorTarget() const { return m_qTarget; }
+
+	// same as above, but q is the desired rotation of frameA wrt frameB in constraint space
+	void setMotorTargetInConstraintSpace(const btQuaternion& q);
+
+	btVector3 GetPointForAngle(btScalar fAngleInRadians, btScalar fLength) const;
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, btScalar value, int axis = -1);
+
+	virtual void setFrames(const btTransform& frameA, const btTransform& frameB);
+
+	const btTransform& getFrameOffsetA() const
+	{
+		return m_rbAFrame;
+	}
+
+	const btTransform& getFrameOffsetB() const
+	{
+		return m_rbBFrame;
+	}
+
+	///return the local value of parameter
+	virtual btScalar getParam(int num, int axis = -1) const;
+
+	int getFlags() const
+	{
+		return m_flags;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+struct btConeTwistConstraintDoubleData
+{
+	btTypedConstraintDoubleData m_typeConstraintData;
+	btTransformDoubleData m_rbAFrame;
+	btTransformDoubleData m_rbBFrame;
+
+	//limits
+	double m_swingSpan1;
+	double m_swingSpan2;
+	double m_twistSpan;
+	double m_limitSoftness;
+	double m_biasFactor;
+	double m_relaxationFactor;
+
+	double m_damping;
+};
+
+#ifdef BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+///this structure is not used, except for loading pre-2.82 .bullet files
+struct btConeTwistConstraintData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btTransformFloatData m_rbAFrame;
+	btTransformFloatData m_rbBFrame;
+
+	//limits
+	float m_swingSpan1;
+	float m_swingSpan2;
+	float m_twistSpan;
+	float m_limitSoftness;
+	float m_biasFactor;
+	float m_relaxationFactor;
+
+	float m_damping;
+
+	char m_pad[4];
+};
+#endif  //BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+//
+
+SIMD_FORCE_INLINE int btConeTwistConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btConeTwistConstraintData2);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btConeTwistConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btConeTwistConstraintData2* cone = (btConeTwistConstraintData2*)dataBuffer;
+	btTypedConstraint::serialize(&cone->m_typeConstraintData, serializer);
+
+	m_rbAFrame.serialize(cone->m_rbAFrame);
+	m_rbBFrame.serialize(cone->m_rbBFrame);
+
+	cone->m_swingSpan1 = m_swingSpan1;
+	cone->m_swingSpan2 = m_swingSpan2;
+	cone->m_twistSpan = m_twistSpan;
+	cone->m_limitSoftness = m_limitSoftness;
+	cone->m_biasFactor = m_biasFactor;
+	cone->m_relaxationFactor = m_relaxationFactor;
+	cone->m_damping = m_damping;
+
+	return btConeTwistConstraintDataName;
+}
+
+#endif  //BT_CONETWISTCONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
new file mode 100644
index 0000000..777eccf
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
@@ -0,0 +1,59 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONSTRAINT_SOLVER_H
+#define BT_CONSTRAINT_SOLVER_H
+
+#include "LinearMath/btScalar.h"
+
+class btPersistentManifold;
+class btRigidBody;
+class btCollisionObject;
+class btTypedConstraint;
+struct btContactSolverInfo;
+struct btBroadphaseProxy;
+class btIDebugDraw;
+class btStackAlloc;
+class btDispatcher;
+/// btConstraintSolver provides solver interface
+
+enum btConstraintSolverType
+{
+	BT_SEQUENTIAL_IMPULSE_SOLVER = 1,
+	BT_MLCP_SOLVER = 2,
+	BT_NNCG_SOLVER = 4,
+	BT_MULTIBODY_SOLVER = 8,
+	BT_BLOCK_SOLVER = 16,
+};
+
+class btConstraintSolver
+{
+public:
+	virtual ~btConstraintSolver() {}
+
+	virtual void prepareSolve(int /* numBodies */, int /* numManifolds */) { ; }
+
+	///solve a group of constraints
+	virtual btScalar solveGroup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& info, class btIDebugDraw* debugDrawer, btDispatcher* dispatcher) = 0;
+
+	virtual void allSolved(const btContactSolverInfo& /* info */, class btIDebugDraw* /* debugDrawer */) { ; }
+
+	///clear internal cached data and reset random seed
+	virtual void reset() = 0;
+
+	virtual btConstraintSolverType getSolverType() const = 0;
+};
+
+#endif  //BT_CONSTRAINT_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
new file mode 100644
index 0000000..e8ebe3a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
@@ -0,0 +1,153 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btContactConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btContactSolverInfo.h"
+#include "LinearMath/btMinMax.h"
+#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
+
+btContactConstraint::btContactConstraint(btPersistentManifold* contactManifold, btRigidBody& rbA, btRigidBody& rbB)
+	: btTypedConstraint(CONTACT_CONSTRAINT_TYPE, rbA, rbB),
+	  m_contactManifold(*contactManifold)
+{
+}
+
+btContactConstraint::~btContactConstraint()
+{
+}
+
+void btContactConstraint::setContactManifold(btPersistentManifold* contactManifold)
+{
+	m_contactManifold = *contactManifold;
+}
+
+void btContactConstraint::getInfo1(btConstraintInfo1* info)
+{
+}
+
+void btContactConstraint::getInfo2(btConstraintInfo2* info)
+{
+}
+
+void btContactConstraint::buildJacobian()
+{
+}
+
+#include "btContactConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btContactSolverInfo.h"
+#include "LinearMath/btMinMax.h"
+#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
+
+//response  between two dynamic objects without friction and no restitution, assuming 0 penetration depth
+btScalar resolveSingleCollision(
+	btRigidBody* body1,
+	btCollisionObject* colObj2,
+	const btVector3& contactPositionWorld,
+	const btVector3& contactNormalOnB,
+	const btContactSolverInfo& solverInfo,
+	btScalar distance)
+{
+	btRigidBody* body2 = btRigidBody::upcast(colObj2);
+
+	const btVector3& normal = contactNormalOnB;
+
+	btVector3 rel_pos1 = contactPositionWorld - body1->getWorldTransform().getOrigin();
+	btVector3 rel_pos2 = contactPositionWorld - colObj2->getWorldTransform().getOrigin();
+
+	btVector3 vel1 = body1->getVelocityInLocalPoint(rel_pos1);
+	btVector3 vel2 = body2 ? body2->getVelocityInLocalPoint(rel_pos2) : btVector3(0, 0, 0);
+	btVector3 vel = vel1 - vel2;
+	btScalar rel_vel;
+	rel_vel = normal.dot(vel);
+
+	btScalar combinedRestitution = 0.f;
+	btScalar restitution = combinedRestitution * -rel_vel;
+
+	btScalar positionalError = solverInfo.m_erp * -distance / solverInfo.m_timeStep;
+	btScalar velocityError = -(1.0f + restitution) * rel_vel;  // * damping;
+	btScalar denom0 = body1->computeImpulseDenominator(contactPositionWorld, normal);
+	btScalar denom1 = body2 ? body2->computeImpulseDenominator(contactPositionWorld, normal) : 0.f;
+	btScalar relaxation = 1.f;
+	btScalar jacDiagABInv = relaxation / (denom0 + denom1);
+
+	btScalar penetrationImpulse = positionalError * jacDiagABInv;
+	btScalar velocityImpulse = velocityError * jacDiagABInv;
+
+	btScalar normalImpulse = penetrationImpulse + velocityImpulse;
+	normalImpulse = 0.f > normalImpulse ? 0.f : normalImpulse;
+
+	body1->applyImpulse(normal * (normalImpulse), rel_pos1);
+	if (body2)
+		body2->applyImpulse(-normal * (normalImpulse), rel_pos2);
+
+	return normalImpulse;
+}
+
+//bilateral constraint between two dynamic objects
+void resolveSingleBilateral(btRigidBody& body1, const btVector3& pos1,
+							btRigidBody& body2, const btVector3& pos2,
+							btScalar distance, const btVector3& normal, btScalar& impulse, btScalar timeStep)
+{
+	(void)timeStep;
+	(void)distance;
+
+	btScalar normalLenSqr = normal.length2();
+	btAssert(btFabs(normalLenSqr) < btScalar(1.1));
+	if (normalLenSqr > btScalar(1.1))
+	{
+		impulse = btScalar(0.);
+		return;
+	}
+	btVector3 rel_pos1 = pos1 - body1.getCenterOfMassPosition();
+	btVector3 rel_pos2 = pos2 - body2.getCenterOfMassPosition();
+	//this jacobian entry could be re-used for all iterations
+
+	btVector3 vel1 = body1.getVelocityInLocalPoint(rel_pos1);
+	btVector3 vel2 = body2.getVelocityInLocalPoint(rel_pos2);
+	btVector3 vel = vel1 - vel2;
+
+	btJacobianEntry jac(body1.getCenterOfMassTransform().getBasis().transpose(),
+						body2.getCenterOfMassTransform().getBasis().transpose(),
+						rel_pos1, rel_pos2, normal, body1.getInvInertiaDiagLocal(), body1.getInvMass(),
+						body2.getInvInertiaDiagLocal(), body2.getInvMass());
+
+	btScalar jacDiagAB = jac.getDiagonal();
+	btScalar jacDiagABInv = btScalar(1.) / jacDiagAB;
+
+	btScalar rel_vel = jac.getRelativeVelocity(
+		body1.getLinearVelocity(),
+		body1.getCenterOfMassTransform().getBasis().transpose() * body1.getAngularVelocity(),
+		body2.getLinearVelocity(),
+		body2.getCenterOfMassTransform().getBasis().transpose() * body2.getAngularVelocity());
+
+	rel_vel = normal.dot(vel);
+
+	//todo: move this into proper structure
+	btScalar contactDamping = btScalar(0.2);
+
+#ifdef ONLY_USE_LINEAR_MASS
+	btScalar massTerm = btScalar(1.) / (body1.getInvMass() + body2.getInvMass());
+	impulse = -contactDamping * rel_vel * massTerm;
+#else
+	btScalar velocityImpulse = -contactDamping * rel_vel * jacDiagABInv;
+	impulse = velocityImpulse;
+#endif
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
new file mode 100644
index 0000000..b213a38
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -0,0 +1,65 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONTACT_CONSTRAINT_H
+#define BT_CONTACT_CONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+
+///btContactConstraint can be automatically created to solve contact constraints using the unified btTypedConstraint interface
+ATTRIBUTE_ALIGNED16(class)
+btContactConstraint : public btTypedConstraint
+{
+protected:
+	btPersistentManifold m_contactManifold;
+
+protected:
+	btContactConstraint(btPersistentManifold * contactManifold, btRigidBody & rbA, btRigidBody & rbB);
+
+public:
+	void setContactManifold(btPersistentManifold * contactManifold);
+
+	btPersistentManifold* getContactManifold()
+	{
+		return &m_contactManifold;
+	}
+
+	const btPersistentManifold* getContactManifold() const
+	{
+		return &m_contactManifold;
+	}
+
+	virtual ~btContactConstraint();
+
+	virtual void getInfo1(btConstraintInfo1 * info);
+
+	virtual void getInfo2(btConstraintInfo2 * info);
+
+	///obsolete methods
+	virtual void buildJacobian();
+};
+
+///very basic collision resolution without friction
+btScalar resolveSingleCollision(btRigidBody* body1, class btCollisionObject* colObj2, const btVector3& contactPositionWorld, const btVector3& contactNormalOnB, const struct btContactSolverInfo& solverInfo, btScalar distance);
+
+///resolveSingleBilateral is an obsolete methods used for vehicle friction between two dynamic objects
+void resolveSingleBilateral(btRigidBody& body1, const btVector3& pos1,
+							btRigidBody& body2, const btVector3& pos2,
+							btScalar distance, const btVector3& normal, btScalar& impulse, btScalar timeStep);
+
+#endif  //BT_CONTACT_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
new file mode 100644
index 0000000..6304167
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
@@ -0,0 +1,177 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONTACT_SOLVER_INFO
+#define BT_CONTACT_SOLVER_INFO
+
+#include "LinearMath/btScalar.h"
+
+enum btSolverMode
+{
+	SOLVER_RANDMIZE_ORDER = 1,
+	SOLVER_FRICTION_SEPARATE = 2,
+	SOLVER_USE_WARMSTARTING = 4,
+	SOLVER_USE_2_FRICTION_DIRECTIONS = 16,
+	SOLVER_ENABLE_FRICTION_DIRECTION_CACHING = 32,
+	SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION = 64,
+	SOLVER_CACHE_FRIENDLY = 128,
+	SOLVER_SIMD = 256,
+	SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS = 512,
+	SOLVER_ALLOW_ZERO_LENGTH_FRICTION_DIRECTIONS = 1024,
+	SOLVER_DISABLE_IMPLICIT_CONE_FRICTION = 2048,
+	SOLVER_USE_ARTICULATED_WARMSTARTING = 4096,
+};
+
+struct btContactSolverInfoData
+{
+	btScalar m_tau;
+	btScalar m_damping;  //global non-contact constraint damping, can be locally overridden by constraints during 'getInfo2'.
+	btScalar m_friction;
+	btScalar m_timeStep;
+	btScalar m_restitution;
+	int m_numIterations;
+	btScalar m_maxErrorReduction;
+	btScalar m_sor;          //successive over-relaxation term
+	btScalar m_erp;          //error reduction for non-contact constraints
+	btScalar m_erp2;         //error reduction for contact constraints
+	btScalar m_deformable_erp;          //error reduction for deformable constraints
+	btScalar m_deformable_cfm;          //constraint force mixing for deformable constraints
+	btScalar m_deformable_maxErrorReduction; // maxErrorReduction for deformable contact
+	btScalar m_globalCfm;    //constraint force mixing for contacts and non-contacts
+	btScalar m_frictionERP;  //error reduction for friction constraints
+	btScalar m_frictionCFM;  //constraint force mixing for friction constraints
+
+	int m_splitImpulse;
+	btScalar m_splitImpulsePenetrationThreshold;
+	btScalar m_splitImpulseTurnErp;
+	btScalar m_linearSlop;
+	btScalar m_warmstartingFactor;
+	btScalar m_articulatedWarmstartingFactor;
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+	int m_minimumSolverBatchSize;
+	btScalar m_maxGyroscopicForce;
+	btScalar m_singleAxisRollingFrictionThreshold;
+	btScalar m_leastSquaresResidualThreshold;
+	btScalar m_restitutionVelocityThreshold;
+	bool m_jointFeedbackInWorldSpace;
+	bool m_jointFeedbackInJointFrame;
+	int m_reportSolverAnalytics;
+	int m_numNonContactInnerIterations;
+};
+
+struct btContactSolverInfo : public btContactSolverInfoData
+{
+	inline btContactSolverInfo()
+	{
+		m_tau = btScalar(0.6);
+		m_damping = btScalar(1.0);
+		m_friction = btScalar(0.3);
+		m_timeStep = btScalar(1.f / 60.f);
+		m_restitution = btScalar(0.);
+		m_maxErrorReduction = btScalar(20.);
+		m_numIterations = 10;
+		m_erp = btScalar(0.2);
+		m_erp2 = btScalar(0.2);
+		m_deformable_erp = btScalar(0.06);
+		m_deformable_cfm = btScalar(0.01);
+		m_deformable_maxErrorReduction = btScalar(0.1);
+		m_globalCfm = btScalar(0.);
+		m_frictionERP = btScalar(0.2);  //positional friction 'anchors' are disabled by default
+		m_frictionCFM = btScalar(0.);
+		m_sor = btScalar(1.);
+		m_splitImpulse = true;
+		m_splitImpulsePenetrationThreshold = -.04f;
+		m_splitImpulseTurnErp = 0.1f;
+		m_linearSlop = btScalar(0.0);
+		m_warmstartingFactor = btScalar(0.85);
+		m_articulatedWarmstartingFactor = btScalar(0.85);
+		//m_solverMode =  SOLVER_USE_WARMSTARTING |  SOLVER_SIMD | SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION|SOLVER_USE_2_FRICTION_DIRECTIONS|SOLVER_ENABLE_FRICTION_DIRECTION_CACHING;// | SOLVER_RANDMIZE_ORDER;
+		m_solverMode = SOLVER_USE_WARMSTARTING | SOLVER_SIMD;  // | SOLVER_RANDMIZE_ORDER;
+		m_restingContactRestitutionThreshold = 2;              //unused as of 2.81
+		m_minimumSolverBatchSize = 128;                        //try to combine islands until the amount of constraints reaches this limit
+		m_maxGyroscopicForce = 100.f;                          ///it is only used for 'explicit' version of gyroscopic force
+		m_singleAxisRollingFrictionThreshold = 1e30f;          ///if the velocity is above this threshold, it will use a single constraint row (axis), otherwise 3 rows.
+		m_leastSquaresResidualThreshold = 0.f;
+		m_restitutionVelocityThreshold = 0.2f;  //if the relative velocity is below this threshold, there is zero restitution
+		m_jointFeedbackInWorldSpace = false;
+		m_jointFeedbackInJointFrame = false;
+		m_reportSolverAnalytics = 0;
+		m_numNonContactInnerIterations = 1;   // the number of inner iterations for solving motor constraint in a single iteration of the constraint solve
+	}
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btContactSolverInfoDoubleData
+{
+	double m_tau;
+	double m_damping;  //global non-contact constraint damping, can be locally overridden by constraints during 'getInfo2'.
+	double m_friction;
+	double m_timeStep;
+	double m_restitution;
+	double m_maxErrorReduction;
+	double m_sor;
+	double m_erp;        //used as Baumgarte factor
+	double m_erp2;       //used in Split Impulse
+	double m_globalCfm;  //constraint force mixing
+	double m_splitImpulsePenetrationThreshold;
+	double m_splitImpulseTurnErp;
+	double m_linearSlop;
+	double m_warmstartingFactor;
+	double m_articulatedWarmstartingFactor;
+	double m_maxGyroscopicForce;  ///it is only used for 'explicit' version of gyroscopic force
+	double m_singleAxisRollingFrictionThreshold;
+
+	int m_numIterations;
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+	int m_minimumSolverBatchSize;
+	int m_splitImpulse;
+	char m_padding[4];
+};
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btContactSolverInfoFloatData
+{
+	float m_tau;
+	float m_damping;  //global non-contact constraint damping, can be locally overridden by constraints during 'getInfo2'.
+	float m_friction;
+	float m_timeStep;
+
+	float m_restitution;
+	float m_maxErrorReduction;
+	float m_sor;
+	float m_erp;  //used as Baumgarte factor
+
+	float m_erp2;       //used in Split Impulse
+	float m_globalCfm;  //constraint force mixing
+	float m_splitImpulsePenetrationThreshold;
+	float m_splitImpulseTurnErp;
+
+	float m_linearSlop;
+	float m_warmstartingFactor;
+	float m_articulatedWarmstartingFactor;
+	float m_maxGyroscopicForce;
+
+	float m_singleAxisRollingFrictionThreshold;
+	int m_numIterations;
+	int m_solverMode;
+	int m_restingContactRestitutionThreshold;
+
+	int m_minimumSolverBatchSize;
+	int m_splitImpulse;
+	
+};
+
+#endif  //BT_CONTACT_SOLVER_INFO
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
new file mode 100644
index 0000000..bba102d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
@@ -0,0 +1,32 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btFixedConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+#include <new>
+
+btFixedConstraint::btFixedConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB)
+	: btGeneric6DofSpring2Constraint(rbA, rbB, frameInA, frameInB)
+{
+	setAngularLowerLimit(btVector3(0, 0, 0));
+	setAngularUpperLimit(btVector3(0, 0, 0));
+	setLinearLowerLimit(btVector3(0, 0, 0));
+	setLinearUpperLimit(btVector3(0, 0, 0));
+}
+
+btFixedConstraint::~btFixedConstraint()
+{
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h
new file mode 100644
index 0000000..6d474ea
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h
@@ -0,0 +1,30 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_FIXED_CONSTRAINT_H
+#define BT_FIXED_CONSTRAINT_H
+
+#include "btGeneric6DofSpring2Constraint.h"
+
+ATTRIBUTE_ALIGNED16(class)
+btFixedConstraint : public btGeneric6DofSpring2Constraint
+{
+public:
+	btFixedConstraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& frameInA, const btTransform& frameInB);
+
+	virtual ~btFixedConstraint();
+};
+
+#endif  //BT_FIXED_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
new file mode 100644
index 0000000..7535c52
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
@@ -0,0 +1,52 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2012 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// Implemented by Erwin Coumans. The idea for the constraint comes from Dimitris Papavasiliou.
+
+#include "btGearConstraint.h"
+
+btGearConstraint::btGearConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& axisInA, const btVector3& axisInB, btScalar ratio)
+	: btTypedConstraint(GEAR_CONSTRAINT_TYPE, rbA, rbB),
+	  m_axisInA(axisInA),
+	  m_axisInB(axisInB),
+	  m_ratio(ratio)
+{
+}
+
+btGearConstraint::~btGearConstraint()
+{
+}
+
+void btGearConstraint::getInfo1(btConstraintInfo1* info)
+{
+	info->m_numConstraintRows = 1;
+	info->nub = 1;
+}
+
+void btGearConstraint::getInfo2(btConstraintInfo2* info)
+{
+	btVector3 globalAxisA, globalAxisB;
+
+	globalAxisA = m_rbA.getWorldTransform().getBasis() * this->m_axisInA;
+	globalAxisB = m_rbB.getWorldTransform().getBasis() * this->m_axisInB;
+
+	info->m_J1angularAxis[0] = globalAxisA[0];
+	info->m_J1angularAxis[1] = globalAxisA[1];
+	info->m_J1angularAxis[2] = globalAxisA[2];
+
+	info->m_J2angularAxis[0] = m_ratio * globalAxisB[0];
+	info->m_J2angularAxis[1] = m_ratio * globalAxisB[1];
+	info->m_J2angularAxis[2] = m_ratio * globalAxisB[2];
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
new file mode 100644
index 0000000..64b15df
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
@@ -0,0 +1,146 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2012 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GEAR_CONSTRAINT_H
+#define BT_GEAR_CONSTRAINT_H
+
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btGearConstraintData btGearConstraintDoubleData
+#define btGearConstraintDataName "btGearConstraintDoubleData"
+#else
+#define btGearConstraintData btGearConstraintFloatData
+#define btGearConstraintDataName "btGearConstraintFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+///The btGeatConstraint will couple the angular velocity for two bodies around given local axis and ratio.
+///See Bullet/Demos/ConstraintDemo for an example use.
+class btGearConstraint : public btTypedConstraint
+{
+protected:
+	btVector3 m_axisInA;
+	btVector3 m_axisInB;
+	bool m_useFrameA;
+	btScalar m_ratio;
+
+public:
+	btGearConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& axisInA, const btVector3& axisInB, btScalar ratio = 1.f);
+	virtual ~btGearConstraint();
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void getInfo1(btConstraintInfo1* info);
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void getInfo2(btConstraintInfo2* info);
+
+	void setAxisA(btVector3& axisA)
+	{
+		m_axisInA = axisA;
+	}
+	void setAxisB(btVector3& axisB)
+	{
+		m_axisInB = axisB;
+	}
+	void setRatio(btScalar ratio)
+	{
+		m_ratio = ratio;
+	}
+	const btVector3& getAxisA() const
+	{
+		return m_axisInA;
+	}
+	const btVector3& getAxisB() const
+	{
+		return m_axisInB;
+	}
+	btScalar getRatio() const
+	{
+		return m_ratio;
+	}
+
+	virtual void setParam(int num, btScalar value, int axis = -1)
+	{
+		(void)num;
+		(void)value;
+		(void)axis;
+		btAssert(0);
+	}
+
+	///return the local value of parameter
+	virtual btScalar getParam(int num, int axis = -1) const
+	{
+		(void)num;
+		(void)axis;
+		btAssert(0);
+		return 0.f;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btGearConstraintFloatData
+{
+	btTypedConstraintFloatData m_typeConstraintData;
+
+	btVector3FloatData m_axisInA;
+	btVector3FloatData m_axisInB;
+
+	float m_ratio;
+	char m_padding[4];
+};
+
+struct btGearConstraintDoubleData
+{
+	btTypedConstraintDoubleData m_typeConstraintData;
+
+	btVector3DoubleData m_axisInA;
+	btVector3DoubleData m_axisInB;
+
+	double m_ratio;
+};
+
+SIMD_FORCE_INLINE int btGearConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btGearConstraintData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btGearConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btGearConstraintData* gear = (btGearConstraintData*)dataBuffer;
+	btTypedConstraint::serialize(&gear->m_typeConstraintData, serializer);
+
+	m_axisInA.serialize(gear->m_axisInA);
+	m_axisInB.serialize(gear->m_axisInB);
+
+	gear->m_ratio = m_ratio;
+
+	// Fill padding with zeros to appease msan.
+#ifndef BT_USE_DOUBLE_PRECISION
+	gear->m_padding[0] = 0;
+	gear->m_padding[1] = 0;
+	gear->m_padding[2] = 0;
+	gear->m_padding[3] = 0;
+#endif
+
+	return btGearConstraintDataName;
+}
+
+#endif  //BT_GEAR_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
new file mode 100644
index 0000000..14ec4a8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -0,0 +1,975 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+/*
+2007-09-09
+Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
+
+#include "btGeneric6DofConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btTransformUtil.h"
+#include <new>
+
+#define D6_USE_OBSOLETE_METHOD false
+#define D6_USE_FRAME_OFFSET true
+
+btGeneric6DofConstraint::btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA)
+	: btTypedConstraint(D6_CONSTRAINT_TYPE, rbA, rbB), m_frameInA(frameInA), m_frameInB(frameInB), m_useLinearReferenceFrameA(useLinearReferenceFrameA), m_useOffsetForConstraintFrame(D6_USE_FRAME_OFFSET), m_flags(0), m_useSolveConstraintObsolete(D6_USE_OBSOLETE_METHOD)
+{
+	calculateTransforms();
+}
+
+btGeneric6DofConstraint::btGeneric6DofConstraint(btRigidBody& rbB, const btTransform& frameInB, bool useLinearReferenceFrameB)
+	: btTypedConstraint(D6_CONSTRAINT_TYPE, getFixedBody(), rbB),
+	  m_frameInB(frameInB),
+	  m_useLinearReferenceFrameA(useLinearReferenceFrameB),
+	  m_useOffsetForConstraintFrame(D6_USE_FRAME_OFFSET),
+	  m_flags(0),
+	  m_useSolveConstraintObsolete(false)
+{
+	///not providing rigidbody A means implicitly using worldspace for body A
+	m_frameInA = rbB.getCenterOfMassTransform() * m_frameInB;
+	calculateTransforms();
+}
+
+#define GENERIC_D6_DISABLE_WARMSTARTING 1
+
+btScalar btGetMatrixElem(const btMatrix3x3& mat, int index);
+btScalar btGetMatrixElem(const btMatrix3x3& mat, int index)
+{
+	int i = index % 3;
+	int j = index / 3;
+	return mat[i][j];
+}
+
+///MatrixToEulerXYZ from http://www.geometrictools.com/LibFoundation/Mathematics/Wm4Matrix3.inl.html
+bool matrixToEulerXYZ(const btMatrix3x3& mat, btVector3& xyz);
+bool matrixToEulerXYZ(const btMatrix3x3& mat, btVector3& xyz)
+{
+	//	// rot =  cy*cz          -cy*sz           sy
+	//	//        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
+	//	//       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
+	//
+
+	btScalar fi = btGetMatrixElem(mat, 2);
+	if (fi < btScalar(1.0f))
+	{
+		if (fi > btScalar(-1.0f))
+		{
+			xyz[0] = btAtan2(-btGetMatrixElem(mat, 5), btGetMatrixElem(mat, 8));
+			xyz[1] = btAsin(btGetMatrixElem(mat, 2));
+			xyz[2] = btAtan2(-btGetMatrixElem(mat, 1), btGetMatrixElem(mat, 0));
+			return true;
+		}
+		else
+		{
+			// WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
+			xyz[0] = -btAtan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 4));
+			xyz[1] = -SIMD_HALF_PI;
+			xyz[2] = btScalar(0.0);
+			return false;
+		}
+	}
+	else
+	{
+		// WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
+		xyz[0] = btAtan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 4));
+		xyz[1] = SIMD_HALF_PI;
+		xyz[2] = 0.0;
+	}
+	return false;
+}
+
+//////////////////////////// btRotationalLimitMotor ////////////////////////////////////
+
+int btRotationalLimitMotor::testLimitValue(btScalar test_value)
+{
+	if (m_loLimit > m_hiLimit)
+	{
+		m_currentLimit = 0;  //Free from violation
+		return 0;
+	}
+	if (test_value < m_loLimit)
+	{
+		m_currentLimit = 1;  //low limit violation
+		m_currentLimitError = test_value - m_loLimit;
+		if (m_currentLimitError > SIMD_PI)
+			m_currentLimitError -= SIMD_2_PI;
+		else if (m_currentLimitError < -SIMD_PI)
+			m_currentLimitError += SIMD_2_PI;
+		return 1;
+	}
+	else if (test_value > m_hiLimit)
+	{
+		m_currentLimit = 2;  //High limit violation
+		m_currentLimitError = test_value - m_hiLimit;
+		if (m_currentLimitError > SIMD_PI)
+			m_currentLimitError -= SIMD_2_PI;
+		else if (m_currentLimitError < -SIMD_PI)
+			m_currentLimitError += SIMD_2_PI;
+		return 2;
+	};
+
+	m_currentLimit = 0;  //Free from violation
+	return 0;
+}
+
+btScalar btRotationalLimitMotor::solveAngularLimits(
+	btScalar timeStep, btVector3& axis, btScalar jacDiagABInv,
+	btRigidBody* body0, btRigidBody* body1)
+{
+	if (needApplyTorques() == false) return 0.0f;
+
+	btScalar target_velocity = m_targetVelocity;
+	btScalar maxMotorForce = m_maxMotorForce;
+
+	//current error correction
+	if (m_currentLimit != 0)
+	{
+		target_velocity = -m_stopERP * m_currentLimitError / (timeStep);
+		maxMotorForce = m_maxLimitForce;
+	}
+
+	maxMotorForce *= timeStep;
+
+	// current velocity difference
+
+	btVector3 angVelA = body0->getAngularVelocity();
+	btVector3 angVelB = body1->getAngularVelocity();
+
+	btVector3 vel_diff;
+	vel_diff = angVelA - angVelB;
+
+	btScalar rel_vel = axis.dot(vel_diff);
+
+	// correction velocity
+	btScalar motor_relvel = m_limitSoftness * (target_velocity - m_damping * rel_vel);
+
+	if (motor_relvel < SIMD_EPSILON && motor_relvel > -SIMD_EPSILON)
+	{
+		return 0.0f;  //no need for applying force
+	}
+
+	// correction impulse
+	btScalar unclippedMotorImpulse = (1 + m_bounce) * motor_relvel * jacDiagABInv;
+
+	// clip correction impulse
+	btScalar clippedMotorImpulse;
+
+	///@todo: should clip against accumulated impulse
+	if (unclippedMotorImpulse > 0.0f)
+	{
+		clippedMotorImpulse = unclippedMotorImpulse > maxMotorForce ? maxMotorForce : unclippedMotorImpulse;
+	}
+	else
+	{
+		clippedMotorImpulse = unclippedMotorImpulse < -maxMotorForce ? -maxMotorForce : unclippedMotorImpulse;
+	}
+
+	// sort with accumulated impulses
+	btScalar lo = btScalar(-BT_LARGE_FLOAT);
+	btScalar hi = btScalar(BT_LARGE_FLOAT);
+
+	btScalar oldaccumImpulse = m_accumulatedImpulse;
+	btScalar sum = oldaccumImpulse + clippedMotorImpulse;
+	m_accumulatedImpulse = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
+
+	clippedMotorImpulse = m_accumulatedImpulse - oldaccumImpulse;
+
+	btVector3 motorImp = clippedMotorImpulse * axis;
+
+	body0->applyTorqueImpulse(motorImp);
+	body1->applyTorqueImpulse(-motorImp);
+
+	return clippedMotorImpulse;
+}
+
+//////////////////////////// End btRotationalLimitMotor ////////////////////////////////////
+
+//////////////////////////// btTranslationalLimitMotor ////////////////////////////////////
+
+int btTranslationalLimitMotor::testLimitValue(int limitIndex, btScalar test_value)
+{
+	btScalar loLimit = m_lowerLimit[limitIndex];
+	btScalar hiLimit = m_upperLimit[limitIndex];
+	if (loLimit > hiLimit)
+	{
+		m_currentLimit[limitIndex] = 0;  //Free from violation
+		m_currentLimitError[limitIndex] = btScalar(0.f);
+		return 0;
+	}
+
+	if (test_value < loLimit)
+	{
+		m_currentLimit[limitIndex] = 2;  //low limit violation
+		m_currentLimitError[limitIndex] = test_value - loLimit;
+		return 2;
+	}
+	else if (test_value > hiLimit)
+	{
+		m_currentLimit[limitIndex] = 1;  //High limit violation
+		m_currentLimitError[limitIndex] = test_value - hiLimit;
+		return 1;
+	};
+
+	m_currentLimit[limitIndex] = 0;  //Free from violation
+	m_currentLimitError[limitIndex] = btScalar(0.f);
+	return 0;
+}
+
+btScalar btTranslationalLimitMotor::solveLinearAxis(
+	btScalar timeStep,
+	btScalar jacDiagABInv,
+	btRigidBody& body1, const btVector3& pointInA,
+	btRigidBody& body2, const btVector3& pointInB,
+	int limit_index,
+	const btVector3& axis_normal_on_a,
+	const btVector3& anchorPos)
+{
+	///find relative velocity
+	//    btVector3 rel_pos1 = pointInA - body1.getCenterOfMassPosition();
+	//    btVector3 rel_pos2 = pointInB - body2.getCenterOfMassPosition();
+	btVector3 rel_pos1 = anchorPos - body1.getCenterOfMassPosition();
+	btVector3 rel_pos2 = anchorPos - body2.getCenterOfMassPosition();
+
+	btVector3 vel1 = body1.getVelocityInLocalPoint(rel_pos1);
+	btVector3 vel2 = body2.getVelocityInLocalPoint(rel_pos2);
+	btVector3 vel = vel1 - vel2;
+
+	btScalar rel_vel = axis_normal_on_a.dot(vel);
+
+	/// apply displacement correction
+
+	//positional error (zeroth order error)
+	btScalar depth = -(pointInA - pointInB).dot(axis_normal_on_a);
+	btScalar lo = btScalar(-BT_LARGE_FLOAT);
+	btScalar hi = btScalar(BT_LARGE_FLOAT);
+
+	btScalar minLimit = m_lowerLimit[limit_index];
+	btScalar maxLimit = m_upperLimit[limit_index];
+
+	//handle the limits
+	if (minLimit < maxLimit)
+	{
+		{
+			if (depth > maxLimit)
+			{
+				depth -= maxLimit;
+				lo = btScalar(0.);
+			}
+			else
+			{
+				if (depth < minLimit)
+				{
+					depth -= minLimit;
+					hi = btScalar(0.);
+				}
+				else
+				{
+					return 0.0f;
+				}
+			}
+		}
+	}
+
+	btScalar normalImpulse = m_limitSoftness * (m_restitution * depth / timeStep - m_damping * rel_vel) * jacDiagABInv;
+
+	btScalar oldNormalImpulse = m_accumulatedImpulse[limit_index];
+	btScalar sum = oldNormalImpulse + normalImpulse;
+	m_accumulatedImpulse[limit_index] = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
+	normalImpulse = m_accumulatedImpulse[limit_index] - oldNormalImpulse;
+
+	btVector3 impulse_vector = axis_normal_on_a * normalImpulse;
+	body1.applyImpulse(impulse_vector, rel_pos1);
+	body2.applyImpulse(-impulse_vector, rel_pos2);
+
+	return normalImpulse;
+}
+
+//////////////////////////// btTranslationalLimitMotor ////////////////////////////////////
+
+void btGeneric6DofConstraint::calculateAngleInfo()
+{
+	btMatrix3x3 relative_frame = m_calculatedTransformA.getBasis().inverse() * m_calculatedTransformB.getBasis();
+	matrixToEulerXYZ(relative_frame, m_calculatedAxisAngleDiff);
+	// in euler angle mode we do not actually constrain the angular velocity
+	// along the axes axis[0] and axis[2] (although we do use axis[1]) :
+	//
+	//    to get			constrain w2-w1 along		...not
+	//    ------			---------------------		------
+	//    d(angle[0])/dt = 0	ax[1] x ax[2]			ax[0]
+	//    d(angle[1])/dt = 0	ax[1]
+	//    d(angle[2])/dt = 0	ax[0] x ax[1]			ax[2]
+	//
+	// constraining w2-w1 along an axis 'a' means that a'*(w2-w1)=0.
+	// to prove the result for angle[0], write the expression for angle[0] from
+	// GetInfo1 then take the derivative. to prove this for angle[2] it is
+	// easier to take the euler rate expression for d(angle[2])/dt with respect
+	// to the components of w and set that to 0.
+	btVector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0);
+	btVector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2);
+
+	m_calculatedAxis[1] = axis2.cross(axis0);
+	m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2);
+	m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]);
+
+	m_calculatedAxis[0].normalize();
+	m_calculatedAxis[1].normalize();
+	m_calculatedAxis[2].normalize();
+}
+
+void btGeneric6DofConstraint::calculateTransforms()
+{
+	calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+}
+
+void btGeneric6DofConstraint::calculateTransforms(const btTransform& transA, const btTransform& transB)
+{
+	m_calculatedTransformA = transA * m_frameInA;
+	m_calculatedTransformB = transB * m_frameInB;
+	calculateLinearInfo();
+	calculateAngleInfo();
+	if (m_useOffsetForConstraintFrame)
+	{  //  get weight factors depending on masses
+		btScalar miA = getRigidBodyA().getInvMass();
+		btScalar miB = getRigidBodyB().getInvMass();
+		m_hasStaticBody = (miA < SIMD_EPSILON) || (miB < SIMD_EPSILON);
+		btScalar miS = miA + miB;
+		if (miS > btScalar(0.f))
+		{
+			m_factA = miB / miS;
+		}
+		else
+		{
+			m_factA = btScalar(0.5f);
+		}
+		m_factB = btScalar(1.0f) - m_factA;
+	}
+}
+
+void btGeneric6DofConstraint::buildLinearJacobian(
+	btJacobianEntry& jacLinear, const btVector3& normalWorld,
+	const btVector3& pivotAInW, const btVector3& pivotBInW)
+{
+	new (&jacLinear) btJacobianEntry(
+		m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+		m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+		pivotAInW - m_rbA.getCenterOfMassPosition(),
+		pivotBInW - m_rbB.getCenterOfMassPosition(),
+		normalWorld,
+		m_rbA.getInvInertiaDiagLocal(),
+		m_rbA.getInvMass(),
+		m_rbB.getInvInertiaDiagLocal(),
+		m_rbB.getInvMass());
+}
+
+void btGeneric6DofConstraint::buildAngularJacobian(
+	btJacobianEntry& jacAngular, const btVector3& jointAxisW)
+{
+	new (&jacAngular) btJacobianEntry(jointAxisW,
+									  m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+									  m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+									  m_rbA.getInvInertiaDiagLocal(),
+									  m_rbB.getInvInertiaDiagLocal());
+}
+
+bool btGeneric6DofConstraint::testAngularLimitMotor(int axis_index)
+{
+	btScalar angle = m_calculatedAxisAngleDiff[axis_index];
+	angle = btAdjustAngleToLimits(angle, m_angularLimits[axis_index].m_loLimit, m_angularLimits[axis_index].m_hiLimit);
+	m_angularLimits[axis_index].m_currentPosition = angle;
+	//test limits
+	m_angularLimits[axis_index].testLimitValue(angle);
+	return m_angularLimits[axis_index].needApplyTorques();
+}
+
+void btGeneric6DofConstraint::buildJacobian()
+{
+#ifndef __SPU__
+	if (m_useSolveConstraintObsolete)
+	{
+		// Clear accumulated impulses for the next simulation step
+		m_linearLimits.m_accumulatedImpulse.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+		int i;
+		for (i = 0; i < 3; i++)
+		{
+			m_angularLimits[i].m_accumulatedImpulse = btScalar(0.);
+		}
+		//calculates transform
+		calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+
+		//  const btVector3& pivotAInW = m_calculatedTransformA.getOrigin();
+		//  const btVector3& pivotBInW = m_calculatedTransformB.getOrigin();
+		calcAnchorPos();
+		btVector3 pivotAInW = m_AnchorPos;
+		btVector3 pivotBInW = m_AnchorPos;
+
+		// not used here
+		//    btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition();
+		//    btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
+
+		btVector3 normalWorld;
+		//linear part
+		for (i = 0; i < 3; i++)
+		{
+			if (m_linearLimits.isLimited(i))
+			{
+				if (m_useLinearReferenceFrameA)
+					normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
+				else
+					normalWorld = m_calculatedTransformB.getBasis().getColumn(i);
+
+				buildLinearJacobian(
+					m_jacLinear[i], normalWorld,
+					pivotAInW, pivotBInW);
+			}
+		}
+
+		// angular part
+		for (i = 0; i < 3; i++)
+		{
+			//calculates error angle
+			if (testAngularLimitMotor(i))
+			{
+				normalWorld = this->getAxis(i);
+				// Create angular atom
+				buildAngularJacobian(m_jacAng[i], normalWorld);
+			}
+		}
+	}
+#endif  //__SPU__
+}
+
+void btGeneric6DofConstraint::getInfo1(btConstraintInfo1* info)
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		info->m_numConstraintRows = 0;
+		info->nub = 0;
+	}
+	else
+	{
+		//prepare constraint
+		calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+		info->m_numConstraintRows = 0;
+		info->nub = 6;
+		int i;
+		//test linear limits
+		for (i = 0; i < 3; i++)
+		{
+			if (m_linearLimits.needApplyForce(i))
+			{
+				info->m_numConstraintRows++;
+				info->nub--;
+			}
+		}
+		//test angular limits
+		for (i = 0; i < 3; i++)
+		{
+			if (testAngularLimitMotor(i))
+			{
+				info->m_numConstraintRows++;
+				info->nub--;
+			}
+		}
+	}
+}
+
+void btGeneric6DofConstraint::getInfo1NonVirtual(btConstraintInfo1* info)
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		info->m_numConstraintRows = 0;
+		info->nub = 0;
+	}
+	else
+	{
+		//pre-allocate all 6
+		info->m_numConstraintRows = 6;
+		info->nub = 0;
+	}
+}
+
+void btGeneric6DofConstraint::getInfo2(btConstraintInfo2* info)
+{
+	btAssert(!m_useSolveConstraintObsolete);
+
+	const btTransform& transA = m_rbA.getCenterOfMassTransform();
+	const btTransform& transB = m_rbB.getCenterOfMassTransform();
+	const btVector3& linVelA = m_rbA.getLinearVelocity();
+	const btVector3& linVelB = m_rbB.getLinearVelocity();
+	const btVector3& angVelA = m_rbA.getAngularVelocity();
+	const btVector3& angVelB = m_rbB.getAngularVelocity();
+
+	if (m_useOffsetForConstraintFrame)
+	{  // for stability better to solve angular limits first
+		int row = setAngularLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setLinearLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+	else
+	{  // leave old version for compatibility
+		int row = setLinearLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setAngularLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+}
+
+void btGeneric6DofConstraint::getInfo2NonVirtual(btConstraintInfo2* info, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	btAssert(!m_useSolveConstraintObsolete);
+	//prepare constraint
+	calculateTransforms(transA, transB);
+
+	int i;
+	for (i = 0; i < 3; i++)
+	{
+		testAngularLimitMotor(i);
+	}
+
+	if (m_useOffsetForConstraintFrame)
+	{  // for stability better to solve angular limits first
+		int row = setAngularLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setLinearLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+	else
+	{  // leave old version for compatibility
+		int row = setLinearLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+		setAngularLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	}
+}
+
+int btGeneric6DofConstraint::setLinearLimits(btConstraintInfo2* info, int row, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	//	int row = 0;
+	//solve linear limits
+	btRotationalLimitMotor limot;
+	for (int i = 0; i < 3; i++)
+	{
+		if (m_linearLimits.needApplyForce(i))
+		{  // re-use rotational motor code
+			limot.m_bounce = btScalar(0.f);
+			limot.m_currentLimit = m_linearLimits.m_currentLimit[i];
+			limot.m_currentPosition = m_linearLimits.m_currentLinearDiff[i];
+			limot.m_currentLimitError = m_linearLimits.m_currentLimitError[i];
+			limot.m_damping = m_linearLimits.m_damping;
+			limot.m_enableMotor = m_linearLimits.m_enableMotor[i];
+			limot.m_hiLimit = m_linearLimits.m_upperLimit[i];
+			limot.m_limitSoftness = m_linearLimits.m_limitSoftness;
+			limot.m_loLimit = m_linearLimits.m_lowerLimit[i];
+			limot.m_maxLimitForce = btScalar(0.f);
+			limot.m_maxMotorForce = m_linearLimits.m_maxMotorForce[i];
+			limot.m_targetVelocity = m_linearLimits.m_targetVelocity[i];
+			btVector3 axis = m_calculatedTransformA.getBasis().getColumn(i);
+			int flags = m_flags >> (i * BT_6DOF_FLAGS_AXIS_SHIFT);
+			limot.m_normalCFM = (flags & BT_6DOF_FLAGS_CFM_NORM) ? m_linearLimits.m_normalCFM[i] : info->cfm[0];
+			limot.m_stopCFM = (flags & BT_6DOF_FLAGS_CFM_STOP) ? m_linearLimits.m_stopCFM[i] : info->cfm[0];
+			limot.m_stopERP = (flags & BT_6DOF_FLAGS_ERP_STOP) ? m_linearLimits.m_stopERP[i] : info->erp;
+			if (m_useOffsetForConstraintFrame)
+			{
+				int indx1 = (i + 1) % 3;
+				int indx2 = (i + 2) % 3;
+				int rotAllowed = 1;  // rotations around orthos to current axis
+				if (m_angularLimits[indx1].m_currentLimit && m_angularLimits[indx2].m_currentLimit)
+				{
+					rotAllowed = 0;
+				}
+				row += get_limit_motor_info2(&limot, transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 0, rotAllowed);
+			}
+			else
+			{
+				row += get_limit_motor_info2(&limot, transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 0);
+			}
+		}
+	}
+	return row;
+}
+
+int btGeneric6DofConstraint::setAngularLimits(btConstraintInfo2* info, int row_offset, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	btGeneric6DofConstraint* d6constraint = this;
+	int row = row_offset;
+	//solve angular limits
+	for (int i = 0; i < 3; i++)
+	{
+		if (d6constraint->getRotationalLimitMotor(i)->needApplyTorques())
+		{
+			btVector3 axis = d6constraint->getAxis(i);
+			int flags = m_flags >> ((i + 3) * BT_6DOF_FLAGS_AXIS_SHIFT);
+			if (!(flags & BT_6DOF_FLAGS_CFM_NORM))
+			{
+				m_angularLimits[i].m_normalCFM = info->cfm[0];
+			}
+			if (!(flags & BT_6DOF_FLAGS_CFM_STOP))
+			{
+				m_angularLimits[i].m_stopCFM = info->cfm[0];
+			}
+			if (!(flags & BT_6DOF_FLAGS_ERP_STOP))
+			{
+				m_angularLimits[i].m_stopERP = info->erp;
+			}
+			row += get_limit_motor_info2(d6constraint->getRotationalLimitMotor(i),
+										 transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 1);
+		}
+	}
+
+	return row;
+}
+
+void btGeneric6DofConstraint::updateRHS(btScalar timeStep)
+{
+	(void)timeStep;
+}
+
+void btGeneric6DofConstraint::setFrames(const btTransform& frameA, const btTransform& frameB)
+{
+	m_frameInA = frameA;
+	m_frameInB = frameB;
+	buildJacobian();
+	calculateTransforms();
+}
+
+btVector3 btGeneric6DofConstraint::getAxis(int axis_index) const
+{
+	return m_calculatedAxis[axis_index];
+}
+
+btScalar btGeneric6DofConstraint::getRelativePivotPosition(int axisIndex) const
+{
+	return m_calculatedLinearDiff[axisIndex];
+}
+
+btScalar btGeneric6DofConstraint::getAngle(int axisIndex) const
+{
+	return m_calculatedAxisAngleDiff[axisIndex];
+}
+
+void btGeneric6DofConstraint::calcAnchorPos(void)
+{
+	btScalar imA = m_rbA.getInvMass();
+	btScalar imB = m_rbB.getInvMass();
+	btScalar weight;
+	if (imB == btScalar(0.0))
+	{
+		weight = btScalar(1.0);
+	}
+	else
+	{
+		weight = imA / (imA + imB);
+	}
+	const btVector3& pA = m_calculatedTransformA.getOrigin();
+	const btVector3& pB = m_calculatedTransformB.getOrigin();
+	m_AnchorPos = pA * weight + pB * (btScalar(1.0) - weight);
+	return;
+}
+
+void btGeneric6DofConstraint::calculateLinearInfo()
+{
+	m_calculatedLinearDiff = m_calculatedTransformB.getOrigin() - m_calculatedTransformA.getOrigin();
+	m_calculatedLinearDiff = m_calculatedTransformA.getBasis().inverse() * m_calculatedLinearDiff;
+	for (int i = 0; i < 3; i++)
+	{
+		m_linearLimits.m_currentLinearDiff[i] = m_calculatedLinearDiff[i];
+		m_linearLimits.testLimitValue(i, m_calculatedLinearDiff[i]);
+	}
+}
+
+int btGeneric6DofConstraint::get_limit_motor_info2(
+	btRotationalLimitMotor* limot,
+	const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB,
+	btConstraintInfo2* info, int row, btVector3& ax1, int rotational, int rotAllowed)
+{
+	int srow = row * info->rowskip;
+	bool powered = limot->m_enableMotor;
+	int limit = limot->m_currentLimit;
+	if (powered || limit)
+	{  // if the joint is powered, or has joint limits, add in the extra row
+		btScalar* J1 = rotational ? info->m_J1angularAxis : info->m_J1linearAxis;
+		btScalar* J2 = rotational ? info->m_J2angularAxis : info->m_J2linearAxis;
+		J1[srow + 0] = ax1[0];
+		J1[srow + 1] = ax1[1];
+		J1[srow + 2] = ax1[2];
+
+		J2[srow + 0] = -ax1[0];
+		J2[srow + 1] = -ax1[1];
+		J2[srow + 2] = -ax1[2];
+
+		if ((!rotational))
+		{
+			if (m_useOffsetForConstraintFrame)
+			{
+				btVector3 tmpA, tmpB, relA, relB;
+				// get vector from bodyB to frameB in WCS
+				relB = m_calculatedTransformB.getOrigin() - transB.getOrigin();
+				// get its projection to constraint axis
+				btVector3 projB = ax1 * relB.dot(ax1);
+				// get vector directed from bodyB to constraint axis (and orthogonal to it)
+				btVector3 orthoB = relB - projB;
+				// same for bodyA
+				relA = m_calculatedTransformA.getOrigin() - transA.getOrigin();
+				btVector3 projA = ax1 * relA.dot(ax1);
+				btVector3 orthoA = relA - projA;
+				// get desired offset between frames A and B along constraint axis
+				btScalar desiredOffs = limot->m_currentPosition - limot->m_currentLimitError;
+				// desired vector from projection of center of bodyA to projection of center of bodyB to constraint axis
+				btVector3 totalDist = projA + ax1 * desiredOffs - projB;
+				// get offset vectors relA and relB
+				relA = orthoA + totalDist * m_factA;
+				relB = orthoB - totalDist * m_factB;
+				tmpA = relA.cross(ax1);
+				tmpB = relB.cross(ax1);
+				if (m_hasStaticBody && (!rotAllowed))
+				{
+					tmpA *= m_factA;
+					tmpB *= m_factB;
+				}
+				int i;
+				for (i = 0; i < 3; i++) info->m_J1angularAxis[srow + i] = tmpA[i];
+				for (i = 0; i < 3; i++) info->m_J2angularAxis[srow + i] = -tmpB[i];
+			}
+			else
+			{
+				btVector3 ltd;  // Linear Torque Decoupling vector
+				btVector3 c = m_calculatedTransformB.getOrigin() - transA.getOrigin();
+				ltd = c.cross(ax1);
+				info->m_J1angularAxis[srow + 0] = ltd[0];
+				info->m_J1angularAxis[srow + 1] = ltd[1];
+				info->m_J1angularAxis[srow + 2] = ltd[2];
+
+				c = m_calculatedTransformB.getOrigin() - transB.getOrigin();
+				ltd = -c.cross(ax1);
+				info->m_J2angularAxis[srow + 0] = ltd[0];
+				info->m_J2angularAxis[srow + 1] = ltd[1];
+				info->m_J2angularAxis[srow + 2] = ltd[2];
+			}
+		}
+		// if we're limited low and high simultaneously, the joint motor is
+		// ineffective
+		if (limit && (limot->m_loLimit == limot->m_hiLimit)) powered = false;
+		info->m_constraintError[srow] = btScalar(0.f);
+		if (powered)
+		{
+			info->cfm[srow] = limot->m_normalCFM;
+			if (!limit)
+			{
+				btScalar tag_vel = rotational ? limot->m_targetVelocity : -limot->m_targetVelocity;
+
+				btScalar mot_fact = getMotorFactor(limot->m_currentPosition,
+												   limot->m_loLimit,
+												   limot->m_hiLimit,
+												   tag_vel,
+												   info->fps * limot->m_stopERP);
+				info->m_constraintError[srow] += mot_fact * limot->m_targetVelocity;
+				info->m_lowerLimit[srow] = -limot->m_maxMotorForce / info->fps;
+				info->m_upperLimit[srow] = limot->m_maxMotorForce / info->fps;
+			}
+		}
+		if (limit)
+		{
+			btScalar k = info->fps * limot->m_stopERP;
+			if (!rotational)
+			{
+				info->m_constraintError[srow] += k * limot->m_currentLimitError;
+			}
+			else
+			{
+				info->m_constraintError[srow] += -k * limot->m_currentLimitError;
+			}
+			info->cfm[srow] = limot->m_stopCFM;
+			if (limot->m_loLimit == limot->m_hiLimit)
+			{  // limited low and high simultaneously
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else
+			{
+				if (limit == 1)
+				{
+					info->m_lowerLimit[srow] = 0;
+					info->m_upperLimit[srow] = SIMD_INFINITY;
+				}
+				else
+				{
+					info->m_lowerLimit[srow] = -SIMD_INFINITY;
+					info->m_upperLimit[srow] = 0;
+				}
+				// deal with bounce
+				if (limot->m_bounce > 0)
+				{
+					// calculate joint velocity
+					btScalar vel;
+					if (rotational)
+					{
+						vel = angVelA.dot(ax1);
+						//make sure that if no body -> angVelB == zero vec
+						//                        if (body1)
+						vel -= angVelB.dot(ax1);
+					}
+					else
+					{
+						vel = linVelA.dot(ax1);
+						//make sure that if no body -> angVelB == zero vec
+						//                        if (body1)
+						vel -= linVelB.dot(ax1);
+					}
+					// only apply bounce if the velocity is incoming, and if the
+					// resulting c[] exceeds what we already have.
+					if (limit == 1)
+					{
+						if (vel < 0)
+						{
+							btScalar newc = -limot->m_bounce * vel;
+							if (newc > info->m_constraintError[srow])
+								info->m_constraintError[srow] = newc;
+						}
+					}
+					else
+					{
+						if (vel > 0)
+						{
+							btScalar newc = -limot->m_bounce * vel;
+							if (newc < info->m_constraintError[srow])
+								info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+			}
+		}
+		return 1;
+	}
+	else
+		return 0;
+}
+
+///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+///If no axis is provided, it uses the default axis for this constraint.
+void btGeneric6DofConstraint::setParam(int num, btScalar value, int axis)
+{
+	if ((axis >= 0) && (axis < 3))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				m_linearLimits.m_stopERP[axis] = value;
+				m_flags |= BT_6DOF_FLAGS_ERP_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				m_linearLimits.m_stopCFM[axis] = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case BT_CONSTRAINT_CFM:
+				m_linearLimits.m_normalCFM[axis] = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_NORM << (axis * BT_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else if ((axis >= 3) && (axis < 6))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				m_angularLimits[axis - 3].m_stopERP = value;
+				m_flags |= BT_6DOF_FLAGS_ERP_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				m_angularLimits[axis - 3].m_stopCFM = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			case BT_CONSTRAINT_CFM:
+				m_angularLimits[axis - 3].m_normalCFM = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_NORM << (axis * BT_6DOF_FLAGS_AXIS_SHIFT);
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else
+	{
+		btAssertConstrParams(0);
+	}
+}
+
+///return the local value of parameter
+btScalar btGeneric6DofConstraint::getParam(int num, int axis) const
+{
+	btScalar retVal = 0;
+	if ((axis >= 0) && (axis < 3))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_linearLimits.m_stopERP[axis];
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_linearLimits.m_stopCFM[axis];
+				break;
+			case BT_CONSTRAINT_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_NORM << (axis * BT_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_linearLimits.m_normalCFM[axis];
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else if ((axis >= 3) && (axis < 6))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_angularLimits[axis - 3].m_stopERP;
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_STOP << (axis * BT_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_angularLimits[axis - 3].m_stopCFM;
+				break;
+			case BT_CONSTRAINT_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_NORM << (axis * BT_6DOF_FLAGS_AXIS_SHIFT)));
+				retVal = m_angularLimits[axis - 3].m_normalCFM;
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else
+	{
+		btAssertConstrParams(0);
+	}
+	return retVal;
+}
+
+void btGeneric6DofConstraint::setAxis(const btVector3& axis1, const btVector3& axis2)
+{
+	btVector3 zAxis = axis1.normalized();
+	btVector3 yAxis = axis2.normalized();
+	btVector3 xAxis = yAxis.cross(zAxis);  // we want right coordinate system
+
+	btTransform frameInW;
+	frameInW.setIdentity();
+	frameInW.getBasis().setValue(xAxis[0], yAxis[0], zAxis[0],
+								 xAxis[1], yAxis[1], zAxis[1],
+								 xAxis[2], yAxis[2], zAxis[2]);
+
+	// now get constraint frame in local coordinate systems
+	m_frameInA = m_rbA.getCenterOfMassTransform().inverse() * frameInW;
+	m_frameInB = m_rbB.getCenterOfMassTransform().inverse() * frameInW;
+
+	calculateTransforms();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
new file mode 100644
index 0000000..1febc2b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
@@ -0,0 +1,615 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// 2009 March: btGeneric6DofConstraint refactored by Roman Ponomarev
+/// Added support for generic constraint solver through getInfo1/getInfo2 methods
+
+/*
+2007-09-09
+btGeneric6DofConstraint Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
+
+#ifndef BT_GENERIC_6DOF_CONSTRAINT_H
+#define BT_GENERIC_6DOF_CONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+
+class btRigidBody;
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btGeneric6DofConstraintData2 btGeneric6DofConstraintDoubleData2
+#define btGeneric6DofConstraintDataName "btGeneric6DofConstraintDoubleData2"
+#else
+#define btGeneric6DofConstraintData2 btGeneric6DofConstraintData
+#define btGeneric6DofConstraintDataName "btGeneric6DofConstraintData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+//! Rotation Limit structure for generic joints
+class btRotationalLimitMotor
+{
+public:
+	//! limit_parameters
+	//!@{
+	btScalar m_loLimit;         //!< joint limit
+	btScalar m_hiLimit;         //!< joint limit
+	btScalar m_targetVelocity;  //!< target motor velocity
+	btScalar m_maxMotorForce;   //!< max force on motor
+	btScalar m_maxLimitForce;   //!< max force on limit
+	btScalar m_damping;         //!< Damping.
+	btScalar m_limitSoftness;   //! Relaxation factor
+	btScalar m_normalCFM;       //!< Constraint force mixing factor
+	btScalar m_stopERP;         //!< Error tolerance factor when joint is at limit
+	btScalar m_stopCFM;         //!< Constraint force mixing factor when joint is at limit
+	btScalar m_bounce;          //!< restitution factor
+	bool m_enableMotor;
+
+	//!@}
+
+	//! temp_variables
+	//!@{
+	btScalar m_currentLimitError;  //!  How much is violated this limit
+	btScalar m_currentPosition;    //!  current value of angle
+	int m_currentLimit;            //!< 0=free, 1=at lo limit, 2=at hi limit
+	btScalar m_accumulatedImpulse;
+	//!@}
+
+	btRotationalLimitMotor()
+	{
+		m_accumulatedImpulse = 0.f;
+		m_targetVelocity = 0;
+		m_maxMotorForce = 6.0f;
+		m_maxLimitForce = 300.0f;
+		m_loLimit = 1.0f;
+		m_hiLimit = -1.0f;
+		m_normalCFM = 0.f;
+		m_stopERP = 0.2f;
+		m_stopCFM = 0.f;
+		m_bounce = 0.0f;
+		m_damping = 1.0f;
+		m_limitSoftness = 0.5f;
+		m_currentLimit = 0;
+		m_currentLimitError = 0;
+		m_enableMotor = false;
+	}
+
+	btRotationalLimitMotor(const btRotationalLimitMotor& limot)
+	{
+		m_targetVelocity = limot.m_targetVelocity;
+		m_maxMotorForce = limot.m_maxMotorForce;
+		m_limitSoftness = limot.m_limitSoftness;
+		m_loLimit = limot.m_loLimit;
+		m_hiLimit = limot.m_hiLimit;
+		m_normalCFM = limot.m_normalCFM;
+		m_stopERP = limot.m_stopERP;
+		m_stopCFM = limot.m_stopCFM;
+		m_bounce = limot.m_bounce;
+		m_currentLimit = limot.m_currentLimit;
+		m_currentLimitError = limot.m_currentLimitError;
+		m_enableMotor = limot.m_enableMotor;
+	}
+
+	//! Is limited
+	bool isLimited() const
+	{
+		if (m_loLimit > m_hiLimit) return false;
+		return true;
+	}
+
+	//! Need apply correction
+	bool needApplyTorques() const
+	{
+		if (m_currentLimit == 0 && m_enableMotor == false) return false;
+		return true;
+	}
+
+	//! calculates  error
+	/*!
+	calculates m_currentLimit and m_currentLimitError.
+	*/
+	int testLimitValue(btScalar test_value);
+
+	//! apply the correction impulses for two bodies
+	btScalar solveAngularLimits(btScalar timeStep, btVector3& axis, btScalar jacDiagABInv, btRigidBody* body0, btRigidBody* body1);
+};
+
+class btTranslationalLimitMotor
+{
+public:
+	btVector3 m_lowerLimit;  //!< the constraint lower limits
+	btVector3 m_upperLimit;  //!< the constraint upper limits
+	btVector3 m_accumulatedImpulse;
+	//! Linear_Limit_parameters
+	//!@{
+	btScalar m_limitSoftness;  //!< Softness for linear limit
+	btScalar m_damping;        //!< Damping for linear limit
+	btScalar m_restitution;    //! Bounce parameter for linear limit
+	btVector3 m_normalCFM;     //!< Constraint force mixing factor
+	btVector3 m_stopERP;       //!< Error tolerance factor when joint is at limit
+	btVector3 m_stopCFM;       //!< Constraint force mixing factor when joint is at limit
+							   //!@}
+	bool m_enableMotor[3];
+	btVector3 m_targetVelocity;     //!< target motor velocity
+	btVector3 m_maxMotorForce;      //!< max force on motor
+	btVector3 m_currentLimitError;  //!  How much is violated this limit
+	btVector3 m_currentLinearDiff;  //!  Current relative offset of constraint frames
+	int m_currentLimit[3];          //!< 0=free, 1=at lower limit, 2=at upper limit
+
+	btTranslationalLimitMotor()
+	{
+		m_lowerLimit.setValue(0.f, 0.f, 0.f);
+		m_upperLimit.setValue(0.f, 0.f, 0.f);
+		m_accumulatedImpulse.setValue(0.f, 0.f, 0.f);
+		m_normalCFM.setValue(0.f, 0.f, 0.f);
+		m_stopERP.setValue(0.2f, 0.2f, 0.2f);
+		m_stopCFM.setValue(0.f, 0.f, 0.f);
+
+		m_limitSoftness = 0.7f;
+		m_damping = btScalar(1.0f);
+		m_restitution = btScalar(0.5f);
+		for (int i = 0; i < 3; i++)
+		{
+			m_enableMotor[i] = false;
+			m_targetVelocity[i] = btScalar(0.f);
+			m_maxMotorForce[i] = btScalar(0.f);
+		}
+	}
+
+	btTranslationalLimitMotor(const btTranslationalLimitMotor& other)
+	{
+		m_lowerLimit = other.m_lowerLimit;
+		m_upperLimit = other.m_upperLimit;
+		m_accumulatedImpulse = other.m_accumulatedImpulse;
+
+		m_limitSoftness = other.m_limitSoftness;
+		m_damping = other.m_damping;
+		m_restitution = other.m_restitution;
+		m_normalCFM = other.m_normalCFM;
+		m_stopERP = other.m_stopERP;
+		m_stopCFM = other.m_stopCFM;
+
+		for (int i = 0; i < 3; i++)
+		{
+			m_enableMotor[i] = other.m_enableMotor[i];
+			m_targetVelocity[i] = other.m_targetVelocity[i];
+			m_maxMotorForce[i] = other.m_maxMotorForce[i];
+		}
+	}
+
+	//! Test limit
+	/*!
+    - free means upper < lower,
+    - locked means upper == lower
+    - limited means upper > lower
+    - limitIndex: first 3 are linear, next 3 are angular
+    */
+	inline bool isLimited(int limitIndex) const
+	{
+		return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]);
+	}
+	inline bool needApplyForce(int limitIndex) const
+	{
+		if (m_currentLimit[limitIndex] == 0 && m_enableMotor[limitIndex] == false) return false;
+		return true;
+	}
+	int testLimitValue(int limitIndex, btScalar test_value);
+
+	btScalar solveLinearAxis(
+		btScalar timeStep,
+		btScalar jacDiagABInv,
+		btRigidBody& body1, const btVector3& pointInA,
+		btRigidBody& body2, const btVector3& pointInB,
+		int limit_index,
+		const btVector3& axis_normal_on_a,
+		const btVector3& anchorPos);
+};
+
+enum bt6DofFlags
+{
+	BT_6DOF_FLAGS_CFM_NORM = 1,
+	BT_6DOF_FLAGS_CFM_STOP = 2,
+	BT_6DOF_FLAGS_ERP_STOP = 4
+};
+#define BT_6DOF_FLAGS_AXIS_SHIFT 3  // bits per axis
+
+/// btGeneric6DofConstraint between two rigidbodies each with a pivotpoint that descibes the axis location in local space
+/*!
+btGeneric6DofConstraint can leave any of the 6 degree of freedom 'free' or 'locked'.
+currently this limit supports rotational motors<br>
+<ul>
+<li> For Linear limits, use btGeneric6DofConstraint.setLinearUpperLimit, btGeneric6DofConstraint.setLinearLowerLimit. You can set the parameters with the btTranslationalLimitMotor structure accsesible through the btGeneric6DofConstraint.getTranslationalLimitMotor method.
+At this moment translational motors are not supported. May be in the future. </li>
+
+<li> For Angular limits, use the btRotationalLimitMotor structure for configuring the limit.
+This is accessible through btGeneric6DofConstraint.getLimitMotor method,
+This brings support for limit parameters and motors. </li>
+
+<li> Angulars limits have these possible ranges:
+<table border=1 >
+<tr>
+	<td><b>AXIS</b></td>
+	<td><b>MIN ANGLE</b></td>
+	<td><b>MAX ANGLE</b></td>
+</tr><tr>
+	<td>X</td>
+	<td>-PI</td>
+	<td>PI</td>
+</tr><tr>
+	<td>Y</td>
+	<td>-PI/2</td>
+	<td>PI/2</td>
+</tr><tr>
+	<td>Z</td>
+	<td>-PI</td>
+	<td>PI</td>
+</tr>
+</table>
+</li>
+</ul>
+
+*/
+ATTRIBUTE_ALIGNED16(class)
+btGeneric6DofConstraint : public btTypedConstraint
+{
+protected:
+	//! relative_frames
+	//!@{
+	btTransform m_frameInA;  //!< the constraint space w.r.t body A
+	btTransform m_frameInB;  //!< the constraint space w.r.t body B
+	//!@}
+
+	//! Jacobians
+	//!@{
+	btJacobianEntry m_jacLinear[3];  //!< 3 orthogonal linear constraints
+	btJacobianEntry m_jacAng[3];     //!< 3 orthogonal angular constraints
+	//!@}
+
+	//! Linear_Limit_parameters
+	//!@{
+	btTranslationalLimitMotor m_linearLimits;
+	//!@}
+
+	//! hinge_parameters
+	//!@{
+	btRotationalLimitMotor m_angularLimits[3];
+	//!@}
+
+protected:
+	//! temporal variables
+	//!@{
+	btScalar m_timeStep;
+	btTransform m_calculatedTransformA;
+	btTransform m_calculatedTransformB;
+	btVector3 m_calculatedAxisAngleDiff;
+	btVector3 m_calculatedAxis[3];
+	btVector3 m_calculatedLinearDiff;
+	btScalar m_factA;
+	btScalar m_factB;
+	bool m_hasStaticBody;
+
+	btVector3 m_AnchorPos;  // point betwen pivots of bodies A and B to solve linear axes
+
+	bool m_useLinearReferenceFrameA;
+	bool m_useOffsetForConstraintFrame;
+
+	int m_flags;
+
+	//!@}
+
+	btGeneric6DofConstraint& operator=(btGeneric6DofConstraint& other)
+	{
+		btAssert(0);
+		(void)other;
+		return *this;
+	}
+
+	int setAngularLimits(btConstraintInfo2 * info, int row_offset, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB);
+
+	int setLinearLimits(btConstraintInfo2 * info, int row, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB);
+
+	void buildLinearJacobian(
+		btJacobianEntry & jacLinear, const btVector3& normalWorld,
+		const btVector3& pivotAInW, const btVector3& pivotBInW);
+
+	void buildAngularJacobian(btJacobianEntry & jacAngular, const btVector3& jointAxisW);
+
+	// tests linear limits
+	void calculateLinearInfo();
+
+	//! calcs the euler angles between the two bodies.
+	void calculateAngleInfo();
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	///for backwards compatibility during the transition to 'getInfo/getInfo2'
+	bool m_useSolveConstraintObsolete;
+
+	btGeneric6DofConstraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA);
+	btGeneric6DofConstraint(btRigidBody & rbB, const btTransform& frameInB, bool useLinearReferenceFrameB);
+
+	//! Calcs global transform of the offsets
+	/*!
+	Calcs the global transform for the joint offset for body A an B, and also calcs the agle differences between the bodies.
+	\sa btGeneric6DofConstraint.getCalculatedTransformA , btGeneric6DofConstraint.getCalculatedTransformB, btGeneric6DofConstraint.calculateAngleInfo
+	*/
+	void calculateTransforms(const btTransform& transA, const btTransform& transB);
+
+	void calculateTransforms();
+
+	//! Gets the global transform of the offset for body A
+	/*!
+    \sa btGeneric6DofConstraint.getFrameOffsetA, btGeneric6DofConstraint.getFrameOffsetB, btGeneric6DofConstraint.calculateAngleInfo.
+    */
+	const btTransform& getCalculatedTransformA() const
+	{
+		return m_calculatedTransformA;
+	}
+
+	//! Gets the global transform of the offset for body B
+	/*!
+    \sa btGeneric6DofConstraint.getFrameOffsetA, btGeneric6DofConstraint.getFrameOffsetB, btGeneric6DofConstraint.calculateAngleInfo.
+    */
+	const btTransform& getCalculatedTransformB() const
+	{
+		return m_calculatedTransformB;
+	}
+
+	const btTransform& getFrameOffsetA() const
+	{
+		return m_frameInA;
+	}
+
+	const btTransform& getFrameOffsetB() const
+	{
+		return m_frameInB;
+	}
+
+	btTransform& getFrameOffsetA()
+	{
+		return m_frameInA;
+	}
+
+	btTransform& getFrameOffsetB()
+	{
+		return m_frameInB;
+	}
+
+	//! performs Jacobian calculation, and also calculates angle differences and axis
+	virtual void buildJacobian();
+
+	virtual void getInfo1(btConstraintInfo1 * info);
+
+	void getInfo1NonVirtual(btConstraintInfo1 * info);
+
+	virtual void getInfo2(btConstraintInfo2 * info);
+
+	void getInfo2NonVirtual(btConstraintInfo2 * info, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB);
+
+	void updateRHS(btScalar timeStep);
+
+	//! Get the rotation axis in global coordinates
+	/*!
+	\pre btGeneric6DofConstraint.buildJacobian must be called previously.
+	*/
+	btVector3 getAxis(int axis_index) const;
+
+	//! Get the relative Euler angle
+	/*!
+	\pre btGeneric6DofConstraint::calculateTransforms() must be called previously.
+	*/
+	btScalar getAngle(int axis_index) const;
+
+	//! Get the relative position of the constraint pivot
+	/*!
+	\pre btGeneric6DofConstraint::calculateTransforms() must be called previously.
+	*/
+	btScalar getRelativePivotPosition(int axis_index) const;
+
+	void setFrames(const btTransform& frameA, const btTransform& frameB);
+
+	//! Test angular limit.
+	/*!
+	Calculates angular correction and returns true if limit needs to be corrected.
+	\pre btGeneric6DofConstraint::calculateTransforms() must be called previously.
+	*/
+	bool testAngularLimitMotor(int axis_index);
+
+	void setLinearLowerLimit(const btVector3& linearLower)
+	{
+		m_linearLimits.m_lowerLimit = linearLower;
+	}
+
+	void getLinearLowerLimit(btVector3 & linearLower) const
+	{
+		linearLower = m_linearLimits.m_lowerLimit;
+	}
+
+	void setLinearUpperLimit(const btVector3& linearUpper)
+	{
+		m_linearLimits.m_upperLimit = linearUpper;
+	}
+
+	void getLinearUpperLimit(btVector3 & linearUpper) const
+	{
+		linearUpper = m_linearLimits.m_upperLimit;
+	}
+
+	void setAngularLowerLimit(const btVector3& angularLower)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_loLimit = btNormalizeAngle(angularLower[i]);
+	}
+
+	void getAngularLowerLimit(btVector3 & angularLower) const
+	{
+		for (int i = 0; i < 3; i++)
+			angularLower[i] = m_angularLimits[i].m_loLimit;
+	}
+
+	void setAngularUpperLimit(const btVector3& angularUpper)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_hiLimit = btNormalizeAngle(angularUpper[i]);
+	}
+
+	void getAngularUpperLimit(btVector3 & angularUpper) const
+	{
+		for (int i = 0; i < 3; i++)
+			angularUpper[i] = m_angularLimits[i].m_hiLimit;
+	}
+
+	//! Retrieves the angular limit informacion
+	btRotationalLimitMotor* getRotationalLimitMotor(int index)
+	{
+		return &m_angularLimits[index];
+	}
+
+	//! Retrieves the  limit informacion
+	btTranslationalLimitMotor* getTranslationalLimitMotor()
+	{
+		return &m_linearLimits;
+	}
+
+	//first 3 are linear, next 3 are angular
+	void setLimit(int axis, btScalar lo, btScalar hi)
+	{
+		if (axis < 3)
+		{
+			m_linearLimits.m_lowerLimit[axis] = lo;
+			m_linearLimits.m_upperLimit[axis] = hi;
+		}
+		else
+		{
+			lo = btNormalizeAngle(lo);
+			hi = btNormalizeAngle(hi);
+			m_angularLimits[axis - 3].m_loLimit = lo;
+			m_angularLimits[axis - 3].m_hiLimit = hi;
+		}
+	}
+
+	//! Test limit
+	/*!
+    - free means upper < lower,
+    - locked means upper == lower
+    - limited means upper > lower
+    - limitIndex: first 3 are linear, next 3 are angular
+    */
+	bool isLimited(int limitIndex) const
+	{
+		if (limitIndex < 3)
+		{
+			return m_linearLimits.isLimited(limitIndex);
+		}
+		return m_angularLimits[limitIndex - 3].isLimited();
+	}
+
+	virtual void calcAnchorPos(void);  // overridable
+
+	int get_limit_motor_info2(btRotationalLimitMotor * limot,
+							  const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB,
+							  btConstraintInfo2* info, int row, btVector3& ax1, int rotational, int rotAllowed = false);
+
+	// access for UseFrameOffset
+	bool getUseFrameOffset() const { return m_useOffsetForConstraintFrame; }
+	void setUseFrameOffset(bool frameOffsetOnOff) { m_useOffsetForConstraintFrame = frameOffsetOnOff; }
+
+	bool getUseLinearReferenceFrameA() const { return m_useLinearReferenceFrameA; }
+	void setUseLinearReferenceFrameA(bool linearReferenceFrameA) { m_useLinearReferenceFrameA = linearReferenceFrameA; }
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, btScalar value, int axis = -1);
+	///return the local value of parameter
+	virtual btScalar getParam(int num, int axis = -1) const;
+
+	void setAxis(const btVector3& axis1, const btVector3& axis2);
+
+	virtual int getFlags() const
+	{
+		return m_flags;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+struct btGeneric6DofConstraintData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btTransformFloatData m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransformFloatData m_rbBFrame;
+
+	btVector3FloatData m_linearUpperLimit;
+	btVector3FloatData m_linearLowerLimit;
+
+	btVector3FloatData m_angularUpperLimit;
+	btVector3FloatData m_angularLowerLimit;
+
+	int m_useLinearReferenceFrameA;
+	int m_useOffsetForConstraintFrame;
+};
+
+struct btGeneric6DofConstraintDoubleData2
+{
+	btTypedConstraintDoubleData m_typeConstraintData;
+	btTransformDoubleData m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransformDoubleData m_rbBFrame;
+
+	btVector3DoubleData m_linearUpperLimit;
+	btVector3DoubleData m_linearLowerLimit;
+
+	btVector3DoubleData m_angularUpperLimit;
+	btVector3DoubleData m_angularLowerLimit;
+
+	int m_useLinearReferenceFrameA;
+	int m_useOffsetForConstraintFrame;
+};
+
+SIMD_FORCE_INLINE int btGeneric6DofConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btGeneric6DofConstraintData2);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btGeneric6DofConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btGeneric6DofConstraintData2* dof = (btGeneric6DofConstraintData2*)dataBuffer;
+	btTypedConstraint::serialize(&dof->m_typeConstraintData, serializer);
+
+	m_frameInA.serialize(dof->m_rbAFrame);
+	m_frameInB.serialize(dof->m_rbBFrame);
+
+	int i;
+	for (i = 0; i < 3; i++)
+	{
+		dof->m_angularLowerLimit.m_floats[i] = m_angularLimits[i].m_loLimit;
+		dof->m_angularUpperLimit.m_floats[i] = m_angularLimits[i].m_hiLimit;
+		dof->m_linearLowerLimit.m_floats[i] = m_linearLimits.m_lowerLimit[i];
+		dof->m_linearUpperLimit.m_floats[i] = m_linearLimits.m_upperLimit[i];
+	}
+
+	dof->m_useLinearReferenceFrameA = m_useLinearReferenceFrameA ? 1 : 0;
+	dof->m_useOffsetForConstraintFrame = m_useOffsetForConstraintFrame ? 1 : 0;
+
+	return btGeneric6DofConstraintDataName;
+}
+
+#endif  //BT_GENERIC_6DOF_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp
new file mode 100644
index 0000000..39e0cc0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp
@@ -0,0 +1,1243 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+2014 May: btGeneric6DofSpring2Constraint is created from the original (2.82.2712) btGeneric6DofConstraint by Gabor Puhr and Tamas Umenhoffer
+Pros:
+- Much more accurate and stable in a lot of situation. (Especially when a sleeping chain of RBs connected with 6dof2 is pulled)
+- Stable and accurate spring with minimal energy loss that works with all of the solvers. (latter is not true for the original 6dof spring)
+- Servo motor functionality
+- Much more accurate bouncing. 0 really means zero bouncing (not true for the original 6odf) and there is only a minimal energy loss when the value is 1 (because of the solvers' precision)
+- Rotation order for the Euler system can be set. (One axis' freedom is still limited to pi/2)
+
+Cons:
+- It is slower than the original 6dof. There is no exact ratio, but half speed is a good estimation. (with PGS)
+- At bouncing the correct velocity is calculated, but not the correct position. (it is because of the solver can correct position or velocity, but not both.)
+*/
+
+/// 2009 March: btGeneric6DofConstraint refactored by Roman Ponomarev
+/// Added support for generic constraint solver through getInfo1/getInfo2 methods
+
+/*
+2007-09-09
+btGeneric6DofConstraint Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
+
+#include "btGeneric6DofSpring2Constraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+#include <cmath>
+#include <new>
+
+btGeneric6DofSpring2Constraint::btGeneric6DofSpring2Constraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, RotateOrder rotOrder)
+	: btTypedConstraint(D6_SPRING_2_CONSTRAINT_TYPE, rbA, rbB), m_frameInA(frameInA), m_frameInB(frameInB), m_rotateOrder(rotOrder), m_flags(0)
+{
+	calculateTransforms();
+}
+
+btGeneric6DofSpring2Constraint::btGeneric6DofSpring2Constraint(btRigidBody& rbB, const btTransform& frameInB, RotateOrder rotOrder)
+	: btTypedConstraint(D6_SPRING_2_CONSTRAINT_TYPE, getFixedBody(), rbB), m_frameInB(frameInB), m_rotateOrder(rotOrder), m_flags(0)
+{
+	///not providing rigidbody A means implicitly using worldspace for body A
+	m_frameInA = rbB.getCenterOfMassTransform() * m_frameInB;
+	calculateTransforms();
+}
+
+btScalar btGeneric6DofSpring2Constraint::btGetMatrixElem(const btMatrix3x3& mat, int index)
+{
+	int i = index % 3;
+	int j = index / 3;
+	return mat[i][j];
+}
+
+// MatrixToEulerXYZ from http://www.geometrictools.com/LibFoundation/Mathematics/Wm4Matrix3.inl.html
+
+bool btGeneric6DofSpring2Constraint::matrixToEulerXYZ(const btMatrix3x3& mat, btVector3& xyz)
+{
+	// rot =  cy*cz          -cy*sz           sy
+	//        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
+	//       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
+
+	btScalar fi = btGetMatrixElem(mat, 2);
+	if (fi < btScalar(1.0f))
+	{
+		if (fi > btScalar(-1.0f))
+		{
+			xyz[0] = btAtan2(-btGetMatrixElem(mat, 5), btGetMatrixElem(mat, 8));
+			xyz[1] = btAsin(btGetMatrixElem(mat, 2));
+			xyz[2] = btAtan2(-btGetMatrixElem(mat, 1), btGetMatrixElem(mat, 0));
+			return true;
+		}
+		else
+		{
+			// WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
+			xyz[0] = -btAtan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 4));
+			xyz[1] = -SIMD_HALF_PI;
+			xyz[2] = btScalar(0.0);
+			return false;
+		}
+	}
+	else
+	{
+		// WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
+		xyz[0] = btAtan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 4));
+		xyz[1] = SIMD_HALF_PI;
+		xyz[2] = 0.0;
+	}
+	return false;
+}
+
+bool btGeneric6DofSpring2Constraint::matrixToEulerXZY(const btMatrix3x3& mat, btVector3& xyz)
+{
+	// rot =  cy*cz          -sz           sy*cz
+	//        cy*cx*sz+sx*sy  cx*cz        sy*cx*sz-cy*sx
+	//        cy*sx*sz-cx*sy  sx*cz        sy*sx*sz+cx*cy
+
+	btScalar fi = btGetMatrixElem(mat, 1);
+	if (fi < btScalar(1.0f))
+	{
+		if (fi > btScalar(-1.0f))
+		{
+			xyz[0] = btAtan2(btGetMatrixElem(mat, 7), btGetMatrixElem(mat, 4));
+			xyz[1] = btAtan2(btGetMatrixElem(mat, 2), btGetMatrixElem(mat, 0));
+			xyz[2] = btAsin(-btGetMatrixElem(mat, 1));
+			return true;
+		}
+		else
+		{
+			xyz[0] = -btAtan2(-btGetMatrixElem(mat, 6), btGetMatrixElem(mat, 8));
+			xyz[1] = btScalar(0.0);
+			xyz[2] = SIMD_HALF_PI;
+			return false;
+		}
+	}
+	else
+	{
+		xyz[0] = btAtan2(-btGetMatrixElem(mat, 6), btGetMatrixElem(mat, 8));
+		xyz[1] = 0.0;
+		xyz[2] = -SIMD_HALF_PI;
+	}
+	return false;
+}
+
+bool btGeneric6DofSpring2Constraint::matrixToEulerYXZ(const btMatrix3x3& mat, btVector3& xyz)
+{
+	// rot =  cy*cz+sy*sx*sz  cz*sy*sx-cy*sz  cx*sy
+	//        cx*sz           cx*cz           -sx
+	//        cy*sx*sz-cz*sy  sy*sz+cy*cz*sx  cy*cx
+
+	btScalar fi = btGetMatrixElem(mat, 5);
+	if (fi < btScalar(1.0f))
+	{
+		if (fi > btScalar(-1.0f))
+		{
+			xyz[0] = btAsin(-btGetMatrixElem(mat, 5));
+			xyz[1] = btAtan2(btGetMatrixElem(mat, 2), btGetMatrixElem(mat, 8));
+			xyz[2] = btAtan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 4));
+			return true;
+		}
+		else
+		{
+			xyz[0] = SIMD_HALF_PI;
+			xyz[1] = -btAtan2(-btGetMatrixElem(mat, 1), btGetMatrixElem(mat, 0));
+			xyz[2] = btScalar(0.0);
+			return false;
+		}
+	}
+	else
+	{
+		xyz[0] = -SIMD_HALF_PI;
+		xyz[1] = btAtan2(-btGetMatrixElem(mat, 1), btGetMatrixElem(mat, 0));
+		xyz[2] = 0.0;
+	}
+	return false;
+}
+
+bool btGeneric6DofSpring2Constraint::matrixToEulerYZX(const btMatrix3x3& mat, btVector3& xyz)
+{
+	// rot =  cy*cz   sy*sx-cy*cx*sz   cx*sy+cy*sz*sx
+	//        sz           cz*cx           -cz*sx
+	//        -cz*sy  cy*sx+cx*sy*sz   cy*cx-sy*sz*sx
+
+	btScalar fi = btGetMatrixElem(mat, 3);
+	if (fi < btScalar(1.0f))
+	{
+		if (fi > btScalar(-1.0f))
+		{
+			xyz[0] = btAtan2(-btGetMatrixElem(mat, 5), btGetMatrixElem(mat, 4));
+			xyz[1] = btAtan2(-btGetMatrixElem(mat, 6), btGetMatrixElem(mat, 0));
+			xyz[2] = btAsin(btGetMatrixElem(mat, 3));
+			return true;
+		}
+		else
+		{
+			xyz[0] = btScalar(0.0);
+			xyz[1] = -btAtan2(btGetMatrixElem(mat, 7), btGetMatrixElem(mat, 8));
+			xyz[2] = -SIMD_HALF_PI;
+			return false;
+		}
+	}
+	else
+	{
+		xyz[0] = btScalar(0.0);
+		xyz[1] = btAtan2(btGetMatrixElem(mat, 7), btGetMatrixElem(mat, 8));
+		xyz[2] = SIMD_HALF_PI;
+	}
+	return false;
+}
+
+bool btGeneric6DofSpring2Constraint::matrixToEulerZXY(const btMatrix3x3& mat, btVector3& xyz)
+{
+	// rot =  cz*cy-sz*sx*sy    -cx*sz   cz*sy+cy*sz*sx
+	//        cy*sz+cz*sx*sy     cz*cx   sz*sy-cz*xy*sx
+	//        -cx*sy              sx     cx*cy
+
+	btScalar fi = btGetMatrixElem(mat, 7);
+	if (fi < btScalar(1.0f))
+	{
+		if (fi > btScalar(-1.0f))
+		{
+			xyz[0] = btAsin(btGetMatrixElem(mat, 7));
+			xyz[1] = btAtan2(-btGetMatrixElem(mat, 6), btGetMatrixElem(mat, 8));
+			xyz[2] = btAtan2(-btGetMatrixElem(mat, 1), btGetMatrixElem(mat, 4));
+			return true;
+		}
+		else
+		{
+			xyz[0] = -SIMD_HALF_PI;
+			xyz[1] = btScalar(0.0);
+			xyz[2] = -btAtan2(btGetMatrixElem(mat, 2), btGetMatrixElem(mat, 0));
+			return false;
+		}
+	}
+	else
+	{
+		xyz[0] = SIMD_HALF_PI;
+		xyz[1] = btScalar(0.0);
+		xyz[2] = btAtan2(btGetMatrixElem(mat, 2), btGetMatrixElem(mat, 0));
+	}
+	return false;
+}
+
+bool btGeneric6DofSpring2Constraint::matrixToEulerZYX(const btMatrix3x3& mat, btVector3& xyz)
+{
+	// rot =  cz*cy   cz*sy*sx-cx*sz   sz*sx+cz*cx*sy
+	//        cy*sz   cz*cx+sz*sy*sx   cx*sz*sy-cz*sx
+	//        -sy          cy*sx         cy*cx
+
+	btScalar fi = btGetMatrixElem(mat, 6);
+	if (fi < btScalar(1.0f))
+	{
+		if (fi > btScalar(-1.0f))
+		{
+			xyz[0] = btAtan2(btGetMatrixElem(mat, 7), btGetMatrixElem(mat, 8));
+			xyz[1] = btAsin(-btGetMatrixElem(mat, 6));
+			xyz[2] = btAtan2(btGetMatrixElem(mat, 3), btGetMatrixElem(mat, 0));
+			return true;
+		}
+		else
+		{
+			xyz[0] = btScalar(0.0);
+			xyz[1] = SIMD_HALF_PI;
+			xyz[2] = -btAtan2(btGetMatrixElem(mat, 1), btGetMatrixElem(mat, 2));
+			return false;
+		}
+	}
+	else
+	{
+		xyz[0] = btScalar(0.0);
+		xyz[1] = -SIMD_HALF_PI;
+		xyz[2] = btAtan2(-btGetMatrixElem(mat, 1), -btGetMatrixElem(mat, 2));
+	}
+	return false;
+}
+
+void btGeneric6DofSpring2Constraint::calculateAngleInfo()
+{
+	btMatrix3x3 relative_frame = m_calculatedTransformA.getBasis().inverse() * m_calculatedTransformB.getBasis();
+	switch (m_rotateOrder)
+	{
+		case RO_XYZ:
+			matrixToEulerXYZ(relative_frame, m_calculatedAxisAngleDiff);
+			break;
+		case RO_XZY:
+			matrixToEulerXZY(relative_frame, m_calculatedAxisAngleDiff);
+			break;
+		case RO_YXZ:
+			matrixToEulerYXZ(relative_frame, m_calculatedAxisAngleDiff);
+			break;
+		case RO_YZX:
+			matrixToEulerYZX(relative_frame, m_calculatedAxisAngleDiff);
+			break;
+		case RO_ZXY:
+			matrixToEulerZXY(relative_frame, m_calculatedAxisAngleDiff);
+			break;
+		case RO_ZYX:
+			matrixToEulerZYX(relative_frame, m_calculatedAxisAngleDiff);
+			break;
+		default:
+			btAssert(false);
+	}
+	// in euler angle mode we do not actually constrain the angular velocity
+	// along the axes axis[0] and axis[2] (although we do use axis[1]) :
+	//
+	//    to get			constrain w2-w1 along		...not
+	//    ------			---------------------		------
+	//    d(angle[0])/dt = 0	ax[1] x ax[2]			ax[0]
+	//    d(angle[1])/dt = 0	ax[1]
+	//    d(angle[2])/dt = 0	ax[0] x ax[1]			ax[2]
+	//
+	// constraining w2-w1 along an axis 'a' means that a'*(w2-w1)=0.
+	// to prove the result for angle[0], write the expression for angle[0] from
+	// GetInfo1 then take the derivative. to prove this for angle[2] it is
+	// easier to take the euler rate expression for d(angle[2])/dt with respect
+	// to the components of w and set that to 0.
+	switch (m_rotateOrder)
+	{
+		case RO_XYZ:
+		{
+			//Is this the "line of nodes" calculation choosing planes YZ (B coordinate system) and xy (A coordinate system)? (http://en.wikipedia.org/wiki/Euler_angles)
+			//The two planes are non-homologous, so this is a Tait Bryan angle formalism and not a proper Euler
+			//Extrinsic rotations are equal to the reversed order intrinsic rotations so the above xyz extrinsic rotations (axes are fixed) are the same as the zy'x" intrinsic rotations (axes are refreshed after each rotation)
+			//that is why xy and YZ planes are chosen (this will describe a zy'x" intrinsic rotation) (see the figure on the left at http://en.wikipedia.org/wiki/Euler_angles under Tait Bryan angles)
+			// x' = Nperp = N.cross(axis2)
+			// y' = N = axis2.cross(axis0)
+			// z' = z
+			//
+			// x" = X
+			// y" = y'
+			// z" = ??
+			//in other words:
+			//first rotate around z
+			//second rotate around y'= z.cross(X)
+			//third rotate around x" = X
+			//Original XYZ extrinsic rotation order.
+			//Planes: xy and YZ normals: z, X.  Plane intersection (N) is z.cross(X)
+			btVector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0);
+			btVector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2);
+			m_calculatedAxis[1] = axis2.cross(axis0);
+			m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2);
+			m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]);
+			break;
+		}
+		case RO_XZY:
+		{
+			//planes: xz,ZY normals: y, X
+			//first rotate around y
+			//second rotate around z'= y.cross(X)
+			//third rotate around x" = X
+			btVector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0);
+			btVector3 axis1 = m_calculatedTransformA.getBasis().getColumn(1);
+			m_calculatedAxis[2] = axis0.cross(axis1);
+			m_calculatedAxis[0] = axis1.cross(m_calculatedAxis[2]);
+			m_calculatedAxis[1] = m_calculatedAxis[2].cross(axis0);
+			break;
+		}
+		case RO_YXZ:
+		{
+			//planes: yx,XZ normals: z, Y
+			//first rotate around z
+			//second rotate around x'= z.cross(Y)
+			//third rotate around y" = Y
+			btVector3 axis1 = m_calculatedTransformB.getBasis().getColumn(1);
+			btVector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2);
+			m_calculatedAxis[0] = axis1.cross(axis2);
+			m_calculatedAxis[1] = axis2.cross(m_calculatedAxis[0]);
+			m_calculatedAxis[2] = m_calculatedAxis[0].cross(axis1);
+			break;
+		}
+		case RO_YZX:
+		{
+			//planes: yz,ZX normals: x, Y
+			//first rotate around x
+			//second rotate around z'= x.cross(Y)
+			//third rotate around y" = Y
+			btVector3 axis0 = m_calculatedTransformA.getBasis().getColumn(0);
+			btVector3 axis1 = m_calculatedTransformB.getBasis().getColumn(1);
+			m_calculatedAxis[2] = axis0.cross(axis1);
+			m_calculatedAxis[0] = axis1.cross(m_calculatedAxis[2]);
+			m_calculatedAxis[1] = m_calculatedAxis[2].cross(axis0);
+			break;
+		}
+		case RO_ZXY:
+		{
+			//planes: zx,XY normals: y, Z
+			//first rotate around y
+			//second rotate around x'= y.cross(Z)
+			//third rotate around z" = Z
+			btVector3 axis1 = m_calculatedTransformA.getBasis().getColumn(1);
+			btVector3 axis2 = m_calculatedTransformB.getBasis().getColumn(2);
+			m_calculatedAxis[0] = axis1.cross(axis2);
+			m_calculatedAxis[1] = axis2.cross(m_calculatedAxis[0]);
+			m_calculatedAxis[2] = m_calculatedAxis[0].cross(axis1);
+			break;
+		}
+		case RO_ZYX:
+		{
+			//planes: zy,YX normals: x, Z
+			//first rotate around x
+			//second rotate around y' = x.cross(Z)
+			//third rotate around z" = Z
+			btVector3 axis0 = m_calculatedTransformA.getBasis().getColumn(0);
+			btVector3 axis2 = m_calculatedTransformB.getBasis().getColumn(2);
+			m_calculatedAxis[1] = axis2.cross(axis0);
+			m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2);
+			m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]);
+			break;
+		}
+		default:
+			btAssert(false);
+	}
+
+	m_calculatedAxis[0].normalize();
+	m_calculatedAxis[1].normalize();
+	m_calculatedAxis[2].normalize();
+}
+
+void btGeneric6DofSpring2Constraint::calculateTransforms()
+{
+	calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+}
+
+void btGeneric6DofSpring2Constraint::calculateTransforms(const btTransform& transA, const btTransform& transB)
+{
+	m_calculatedTransformA = transA * m_frameInA;
+	m_calculatedTransformB = transB * m_frameInB;
+	calculateLinearInfo();
+	calculateAngleInfo();
+
+	btScalar miA = getRigidBodyA().getInvMass();
+	btScalar miB = getRigidBodyB().getInvMass();
+	m_hasStaticBody = (miA < SIMD_EPSILON) || (miB < SIMD_EPSILON);
+	btScalar miS = miA + miB;
+	if (miS > btScalar(0.f))
+	{
+		m_factA = miB / miS;
+	}
+	else
+	{
+		m_factA = btScalar(0.5f);
+	}
+	m_factB = btScalar(1.0f) - m_factA;
+}
+
+void btGeneric6DofSpring2Constraint::testAngularLimitMotor(int axis_index)
+{
+	btScalar angle = m_calculatedAxisAngleDiff[axis_index];
+	angle = btAdjustAngleToLimits(angle, m_angularLimits[axis_index].m_loLimit, m_angularLimits[axis_index].m_hiLimit);
+	m_angularLimits[axis_index].m_currentPosition = angle;
+	m_angularLimits[axis_index].testLimitValue(angle);
+}
+
+void btGeneric6DofSpring2Constraint::getInfo1(btConstraintInfo1* info)
+{
+	//prepare constraint
+	calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+	info->m_numConstraintRows = 0;
+	info->nub = 0;
+	int i;
+	//test linear limits
+	for (i = 0; i < 3; i++)
+	{
+		if (m_linearLimits.m_currentLimit[i] == 4)
+			info->m_numConstraintRows += 2;
+		else if (m_linearLimits.m_currentLimit[i] != 0)
+			info->m_numConstraintRows += 1;
+		if (m_linearLimits.m_enableMotor[i]) info->m_numConstraintRows += 1;
+		if (m_linearLimits.m_enableSpring[i]) info->m_numConstraintRows += 1;
+	}
+	//test angular limits
+	for (i = 0; i < 3; i++)
+	{
+		testAngularLimitMotor(i);
+		if (m_angularLimits[i].m_currentLimit == 4)
+			info->m_numConstraintRows += 2;
+		else if (m_angularLimits[i].m_currentLimit != 0)
+			info->m_numConstraintRows += 1;
+		if (m_angularLimits[i].m_enableMotor) info->m_numConstraintRows += 1;
+		if (m_angularLimits[i].m_enableSpring) info->m_numConstraintRows += 1;
+	}
+}
+
+void btGeneric6DofSpring2Constraint::getInfo2(btConstraintInfo2* info)
+{
+	const btTransform& transA = m_rbA.getCenterOfMassTransform();
+	const btTransform& transB = m_rbB.getCenterOfMassTransform();
+	const btVector3& linVelA = m_rbA.getLinearVelocity();
+	const btVector3& linVelB = m_rbB.getLinearVelocity();
+	const btVector3& angVelA = m_rbA.getAngularVelocity();
+	const btVector3& angVelB = m_rbB.getAngularVelocity();
+
+	// for stability better to solve angular limits first
+	int row = setAngularLimits(info, 0, transA, transB, linVelA, linVelB, angVelA, angVelB);
+	setLinearLimits(info, row, transA, transB, linVelA, linVelB, angVelA, angVelB);
+}
+
+int btGeneric6DofSpring2Constraint::setLinearLimits(btConstraintInfo2* info, int row, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	//solve linear limits
+	btRotationalLimitMotor2 limot;
+	for (int i = 0; i < 3; i++)
+	{
+		if (m_linearLimits.m_currentLimit[i] || m_linearLimits.m_enableMotor[i] || m_linearLimits.m_enableSpring[i])
+		{  // re-use rotational motor code
+			limot.m_bounce = m_linearLimits.m_bounce[i];
+			limot.m_currentLimit = m_linearLimits.m_currentLimit[i];
+			limot.m_currentPosition = m_linearLimits.m_currentLinearDiff[i];
+			limot.m_currentLimitError = m_linearLimits.m_currentLimitError[i];
+			limot.m_currentLimitErrorHi = m_linearLimits.m_currentLimitErrorHi[i];
+			limot.m_enableMotor = m_linearLimits.m_enableMotor[i];
+			limot.m_servoMotor = m_linearLimits.m_servoMotor[i];
+			limot.m_servoTarget = m_linearLimits.m_servoTarget[i];
+			limot.m_enableSpring = m_linearLimits.m_enableSpring[i];
+			limot.m_springStiffness = m_linearLimits.m_springStiffness[i];
+			limot.m_springStiffnessLimited = m_linearLimits.m_springStiffnessLimited[i];
+			limot.m_springDamping = m_linearLimits.m_springDamping[i];
+			limot.m_springDampingLimited = m_linearLimits.m_springDampingLimited[i];
+			limot.m_equilibriumPoint = m_linearLimits.m_equilibriumPoint[i];
+			limot.m_hiLimit = m_linearLimits.m_upperLimit[i];
+			limot.m_loLimit = m_linearLimits.m_lowerLimit[i];
+			limot.m_maxMotorForce = m_linearLimits.m_maxMotorForce[i];
+			limot.m_targetVelocity = m_linearLimits.m_targetVelocity[i];
+			btVector3 axis = m_calculatedTransformA.getBasis().getColumn(i);
+			int flags = m_flags >> (i * BT_6DOF_FLAGS_AXIS_SHIFT2);
+			limot.m_stopCFM = (flags & BT_6DOF_FLAGS_CFM_STOP2) ? m_linearLimits.m_stopCFM[i] : info->cfm[0];
+			limot.m_stopERP = (flags & BT_6DOF_FLAGS_ERP_STOP2) ? m_linearLimits.m_stopERP[i] : info->erp;
+			limot.m_motorCFM = (flags & BT_6DOF_FLAGS_CFM_MOTO2) ? m_linearLimits.m_motorCFM[i] : info->cfm[0];
+			limot.m_motorERP = (flags & BT_6DOF_FLAGS_ERP_MOTO2) ? m_linearLimits.m_motorERP[i] : info->erp;
+
+			//rotAllowed is a bit of a magic from the original 6dof. The calculation of it here is something that imitates the original behavior as much as possible.
+			int indx1 = (i + 1) % 3;
+			int indx2 = (i + 2) % 3;
+			int rotAllowed = 1;  // rotations around orthos to current axis (it is used only when one of the body is static)
+#define D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION 1.0e-3
+			bool indx1Violated = m_angularLimits[indx1].m_currentLimit == 1 ||
+								 m_angularLimits[indx1].m_currentLimit == 2 ||
+								 (m_angularLimits[indx1].m_currentLimit == 3 && (m_angularLimits[indx1].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx1].m_currentLimitError > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION)) ||
+								 (m_angularLimits[indx1].m_currentLimit == 4 && (m_angularLimits[indx1].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx1].m_currentLimitErrorHi > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION));
+			bool indx2Violated = m_angularLimits[indx2].m_currentLimit == 1 ||
+								 m_angularLimits[indx2].m_currentLimit == 2 ||
+								 (m_angularLimits[indx2].m_currentLimit == 3 && (m_angularLimits[indx2].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx2].m_currentLimitError > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION)) ||
+								 (m_angularLimits[indx2].m_currentLimit == 4 && (m_angularLimits[indx2].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx2].m_currentLimitErrorHi > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION));
+			if (indx1Violated && indx2Violated)
+			{
+				rotAllowed = 0;
+			}
+			row += get_limit_motor_info2(&limot, transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 0, rotAllowed);
+		}
+	}
+	return row;
+}
+
+int btGeneric6DofSpring2Constraint::setAngularLimits(btConstraintInfo2* info, int row_offset, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	int row = row_offset;
+
+	//order of rotational constraint rows
+	int cIdx[] = {0, 1, 2};
+	switch (m_rotateOrder)
+	{
+		case RO_XYZ:
+			cIdx[0] = 0;
+			cIdx[1] = 1;
+			cIdx[2] = 2;
+			break;
+		case RO_XZY:
+			cIdx[0] = 0;
+			cIdx[1] = 2;
+			cIdx[2] = 1;
+			break;
+		case RO_YXZ:
+			cIdx[0] = 1;
+			cIdx[1] = 0;
+			cIdx[2] = 2;
+			break;
+		case RO_YZX:
+			cIdx[0] = 1;
+			cIdx[1] = 2;
+			cIdx[2] = 0;
+			break;
+		case RO_ZXY:
+			cIdx[0] = 2;
+			cIdx[1] = 0;
+			cIdx[2] = 1;
+			break;
+		case RO_ZYX:
+			cIdx[0] = 2;
+			cIdx[1] = 1;
+			cIdx[2] = 0;
+			break;
+		default:
+			btAssert(false);
+	}
+
+	for (int ii = 0; ii < 3; ii++)
+	{
+		int i = cIdx[ii];
+		if (m_angularLimits[i].m_currentLimit || m_angularLimits[i].m_enableMotor || m_angularLimits[i].m_enableSpring)
+		{
+			btVector3 axis = getAxis(i);
+			int flags = m_flags >> ((i + 3) * BT_6DOF_FLAGS_AXIS_SHIFT2);
+			if (!(flags & BT_6DOF_FLAGS_CFM_STOP2))
+			{
+				m_angularLimits[i].m_stopCFM = info->cfm[0];
+			}
+			if (!(flags & BT_6DOF_FLAGS_ERP_STOP2))
+			{
+				m_angularLimits[i].m_stopERP = info->erp;
+			}
+			if (!(flags & BT_6DOF_FLAGS_CFM_MOTO2))
+			{
+				m_angularLimits[i].m_motorCFM = info->cfm[0];
+			}
+			if (!(flags & BT_6DOF_FLAGS_ERP_MOTO2))
+			{
+				m_angularLimits[i].m_motorERP = info->erp;
+			}
+			row += get_limit_motor_info2(&m_angularLimits[i], transA, transB, linVelA, linVelB, angVelA, angVelB, info, row, axis, 1);
+		}
+	}
+
+	return row;
+}
+
+void btGeneric6DofSpring2Constraint::setFrames(const btTransform& frameA, const btTransform& frameB)
+{
+	m_frameInA = frameA;
+	m_frameInB = frameB;
+	buildJacobian();
+	calculateTransforms();
+}
+
+void btGeneric6DofSpring2Constraint::calculateLinearInfo()
+{
+	m_calculatedLinearDiff = m_calculatedTransformB.getOrigin() - m_calculatedTransformA.getOrigin();
+	m_calculatedLinearDiff = m_calculatedTransformA.getBasis().inverse() * m_calculatedLinearDiff;
+	for (int i = 0; i < 3; i++)
+	{
+		m_linearLimits.m_currentLinearDiff[i] = m_calculatedLinearDiff[i];
+		m_linearLimits.testLimitValue(i, m_calculatedLinearDiff[i]);
+	}
+}
+
+void btGeneric6DofSpring2Constraint::calculateJacobi(btRotationalLimitMotor2* limot, const btTransform& transA, const btTransform& transB, btConstraintInfo2* info, int srow, btVector3& ax1, int rotational, int rotAllowed)
+{
+	btScalar* J1 = rotational ? info->m_J1angularAxis : info->m_J1linearAxis;
+	btScalar* J2 = rotational ? info->m_J2angularAxis : info->m_J2linearAxis;
+
+	J1[srow + 0] = ax1[0];
+	J1[srow + 1] = ax1[1];
+	J1[srow + 2] = ax1[2];
+
+	J2[srow + 0] = -ax1[0];
+	J2[srow + 1] = -ax1[1];
+	J2[srow + 2] = -ax1[2];
+
+	if (!rotational)
+	{
+		btVector3 tmpA, tmpB, relA, relB;
+		// get vector from bodyB to frameB in WCS
+		relB = m_calculatedTransformB.getOrigin() - transB.getOrigin();
+		// same for bodyA
+		relA = m_calculatedTransformA.getOrigin() - transA.getOrigin();
+		tmpA = relA.cross(ax1);
+		tmpB = relB.cross(ax1);
+		if (m_hasStaticBody && (!rotAllowed))
+		{
+			tmpA *= m_factA;
+			tmpB *= m_factB;
+		}
+		int i;
+		for (i = 0; i < 3; i++) info->m_J1angularAxis[srow + i] = tmpA[i];
+		for (i = 0; i < 3; i++) info->m_J2angularAxis[srow + i] = -tmpB[i];
+	}
+}
+
+int btGeneric6DofSpring2Constraint::get_limit_motor_info2(
+	btRotationalLimitMotor2* limot,
+	const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB,
+	btConstraintInfo2* info, int row, btVector3& ax1, int rotational, int rotAllowed)
+{
+	int count = 0;
+	int srow = row * info->rowskip;
+
+	if (limot->m_currentLimit == 4)
+	{
+		btScalar vel = rotational ? angVelA.dot(ax1) - angVelB.dot(ax1) : linVelA.dot(ax1) - linVelB.dot(ax1);
+
+		calculateJacobi(limot, transA, transB, info, srow, ax1, rotational, rotAllowed);
+		info->m_constraintError[srow] = info->fps * limot->m_stopERP * limot->m_currentLimitError * (rotational ? -1 : 1);
+		if (rotational)
+		{
+			if (info->m_constraintError[srow] - vel * limot->m_stopERP > 0)
+			{
+				btScalar bounceerror = -limot->m_bounce * vel;
+				if (bounceerror > info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror;
+			}
+		}
+		else
+		{
+			if (info->m_constraintError[srow] - vel * limot->m_stopERP < 0)
+			{
+				btScalar bounceerror = -limot->m_bounce * vel;
+				if (bounceerror < info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror;
+			}
+		}
+		info->m_lowerLimit[srow] = rotational ? 0 : -SIMD_INFINITY;
+		info->m_upperLimit[srow] = rotational ? SIMD_INFINITY : 0;
+		info->cfm[srow] = limot->m_stopCFM;
+		srow += info->rowskip;
+		++count;
+
+		calculateJacobi(limot, transA, transB, info, srow, ax1, rotational, rotAllowed);
+		info->m_constraintError[srow] = info->fps * limot->m_stopERP * limot->m_currentLimitErrorHi * (rotational ? -1 : 1);
+		if (rotational)
+		{
+			if (info->m_constraintError[srow] - vel * limot->m_stopERP < 0)
+			{
+				btScalar bounceerror = -limot->m_bounce * vel;
+				if (bounceerror < info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror;
+			}
+		}
+		else
+		{
+			if (info->m_constraintError[srow] - vel * limot->m_stopERP > 0)
+			{
+				btScalar bounceerror = -limot->m_bounce * vel;
+				if (bounceerror > info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror;
+			}
+		}
+		info->m_lowerLimit[srow] = rotational ? -SIMD_INFINITY : 0;
+		info->m_upperLimit[srow] = rotational ? 0 : SIMD_INFINITY;
+		info->cfm[srow] = limot->m_stopCFM;
+		srow += info->rowskip;
+		++count;
+	}
+	else if (limot->m_currentLimit == 3)
+	{
+		calculateJacobi(limot, transA, transB, info, srow, ax1, rotational, rotAllowed);
+		info->m_constraintError[srow] = info->fps * limot->m_stopERP * limot->m_currentLimitError * (rotational ? -1 : 1);
+		info->m_lowerLimit[srow] = -SIMD_INFINITY;
+		info->m_upperLimit[srow] = SIMD_INFINITY;
+		info->cfm[srow] = limot->m_stopCFM;
+		srow += info->rowskip;
+		++count;
+	}
+
+	if (limot->m_enableMotor && !limot->m_servoMotor)
+	{
+		calculateJacobi(limot, transA, transB, info, srow, ax1, rotational, rotAllowed);
+		btScalar tag_vel = rotational ? limot->m_targetVelocity : -limot->m_targetVelocity;
+		btScalar mot_fact = getMotorFactor(limot->m_currentPosition,
+										   limot->m_loLimit,
+										   limot->m_hiLimit,
+										   tag_vel,
+										   info->fps * limot->m_motorERP);
+		info->m_constraintError[srow] = mot_fact * limot->m_targetVelocity;
+		info->m_lowerLimit[srow] = -limot->m_maxMotorForce / info->fps;
+		info->m_upperLimit[srow] = limot->m_maxMotorForce / info->fps;
+		info->cfm[srow] = limot->m_motorCFM;
+		srow += info->rowskip;
+		++count;
+	}
+
+	if (limot->m_enableMotor && limot->m_servoMotor)
+	{
+		btScalar error = limot->m_currentPosition - limot->m_servoTarget;
+		btScalar curServoTarget = limot->m_servoTarget;
+		if (rotational)
+		{
+			if (error > SIMD_PI)
+			{
+				error -= SIMD_2_PI;
+				curServoTarget += SIMD_2_PI;
+			}
+			if (error < -SIMD_PI)
+			{
+				error += SIMD_2_PI;
+				curServoTarget -= SIMD_2_PI;
+			}
+		}
+
+		calculateJacobi(limot, transA, transB, info, srow, ax1, rotational, rotAllowed);
+		btScalar targetvelocity = error < 0 ? -limot->m_targetVelocity : limot->m_targetVelocity;
+		btScalar tag_vel = -targetvelocity;
+		btScalar mot_fact;
+		if (error != 0)
+		{
+			btScalar lowLimit;
+			btScalar hiLimit;
+			if (limot->m_loLimit > limot->m_hiLimit)
+			{
+				lowLimit = error > 0 ? curServoTarget : -SIMD_INFINITY;
+				hiLimit = error < 0 ? curServoTarget : SIMD_INFINITY;
+			}
+			else
+			{
+				lowLimit = error > 0 && curServoTarget > limot->m_loLimit ? curServoTarget : limot->m_loLimit;
+				hiLimit = error < 0 && curServoTarget < limot->m_hiLimit ? curServoTarget : limot->m_hiLimit;
+			}
+			mot_fact = getMotorFactor(limot->m_currentPosition, lowLimit, hiLimit, tag_vel, info->fps * limot->m_motorERP);
+		}
+		else
+		{
+			mot_fact = 0;
+		}
+		info->m_constraintError[srow] = mot_fact * targetvelocity * (rotational ? -1 : 1);
+		info->m_lowerLimit[srow] = -limot->m_maxMotorForce / info->fps;
+		info->m_upperLimit[srow] = limot->m_maxMotorForce / info->fps;
+		info->cfm[srow] = limot->m_motorCFM;
+		srow += info->rowskip;
+		++count;
+	}
+
+	if (limot->m_enableSpring)
+	{
+		btScalar error = limot->m_currentPosition - limot->m_equilibriumPoint;
+		calculateJacobi(limot, transA, transB, info, srow, ax1, rotational, rotAllowed);
+
+		//btScalar cfm = 1.0 / ((1.0/info->fps)*limot->m_springStiffness+ limot->m_springDamping);
+		//if(cfm > 0.99999)
+		//	cfm = 0.99999;
+		//btScalar erp = (1.0/info->fps)*limot->m_springStiffness / ((1.0/info->fps)*limot->m_springStiffness + limot->m_springDamping);
+		//info->m_constraintError[srow] = info->fps * erp * error * (rotational ? -1.0 : 1.0);
+		//info->m_lowerLimit[srow] = -SIMD_INFINITY;
+		//info->m_upperLimit[srow] = SIMD_INFINITY;
+
+		btScalar dt = BT_ONE / info->fps;
+		btScalar kd = limot->m_springDamping;
+		btScalar ks = limot->m_springStiffness;
+		btScalar vel;
+		if (rotational)
+		{
+			vel = angVelA.dot(ax1) - angVelB.dot(ax1);
+		}
+		else
+		{
+			btVector3 tanVelA = angVelA.cross(m_calculatedTransformA.getOrigin() - transA.getOrigin());
+			btVector3 tanVelB = angVelB.cross(m_calculatedTransformB.getOrigin() - transB.getOrigin());
+			vel = (linVelA + tanVelA).dot(ax1) - (linVelB + tanVelB).dot(ax1);
+		}
+		btScalar cfm = BT_ZERO;
+		btScalar mA = BT_ONE / m_rbA.getInvMass();
+		btScalar mB = BT_ONE / m_rbB.getInvMass();
+		if (rotational)
+		{
+			btScalar rrA = (m_calculatedTransformA.getOrigin() - transA.getOrigin()).length2();
+			btScalar rrB = (m_calculatedTransformB.getOrigin() - transB.getOrigin()).length2();
+			if (m_rbA.getInvMass()) mA = mA * rrA + 1 / (m_rbA.getInvInertiaTensorWorld() * ax1).length();
+			if (m_rbB.getInvMass()) mB = mB * rrB + 1 / (m_rbB.getInvInertiaTensorWorld() * ax1).length();
+		}
+		btScalar m;
+		if (m_rbA.getInvMass() == 0) m = mB; else
+		if (m_rbB.getInvMass() == 0) m = mA; else
+			m = mA*mB / (mA + mB);
+		btScalar angularfreq = btSqrt(ks / m);
+
+		//limit stiffness (the spring should not be sampled faster that the quarter of its angular frequency)
+		if (limot->m_springStiffnessLimited && 0.25 < angularfreq * dt)
+		{
+			ks = BT_ONE / dt / dt / btScalar(16.0) * m;
+		}
+		//avoid damping that would blow up the spring
+		if (limot->m_springDampingLimited && kd * dt > m)
+		{
+			kd = m / dt;
+		}
+		btScalar fs = ks * error * dt;
+		btScalar fd = -kd * (vel) * (rotational ? -1 : 1) * dt;
+		btScalar f = (fs + fd);
+
+		// after the spring force affecting the body(es) the new velocity will be
+		// vel + f / m * (rotational ? -1 : 1)
+		// so in theory this should be set here for m_constraintError
+		// (with m_constraintError we set a desired velocity for the affected body(es))
+		// however in practice any value is fine as long as it is greater than the "proper" velocity,
+		// because the m_lowerLimit and the m_upperLimit will determinate the strength of the final pulling force
+		// so it is much simpler (and more robust) just to simply use inf (with the proper sign)
+		// (Even with our best intent the "new" velocity is only an estimation. If we underestimate
+		// the "proper" velocity that will weaken the spring, however if we overestimate it, it doesn't
+		// matter, because the solver will limit it according the force limit)
+		// you may also wonder what if the current velocity (vel) so high that the pulling force will not change its direction (in this iteration)
+		// will we not request a velocity with the wrong direction ?
+		// and the answer is not, because in practice during the solving the current velocity is subtracted from the m_constraintError
+		// so the sign of the force that is really matters
+		if (m_flags & BT_6DOF_FLAGS_USE_INFINITE_ERROR)
+			info->m_constraintError[srow] = (rotational ? -1 : 1) * (f < 0 ? -SIMD_INFINITY : SIMD_INFINITY);
+		else
+			info->m_constraintError[srow] = vel + f / m * (rotational ? -1 : 1);
+
+		btScalar minf = f < fd ? f : fd;
+		btScalar maxf = f < fd ? fd : f;
+		if (!rotational)
+		{
+			info->m_lowerLimit[srow] = minf > 0 ? 0 : minf;
+			info->m_upperLimit[srow] = maxf < 0 ? 0 : maxf;
+		}
+		else
+		{
+			info->m_lowerLimit[srow] = -maxf > 0 ? 0 : -maxf;
+			info->m_upperLimit[srow] = -minf < 0 ? 0 : -minf;
+		}
+
+		info->cfm[srow] = cfm;
+		srow += info->rowskip;
+		++count;
+	}
+
+	return count;
+}
+
+//override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+//If no axis is provided, it uses the default axis for this constraint.
+void btGeneric6DofSpring2Constraint::setParam(int num, btScalar value, int axis)
+{
+	if ((axis >= 0) && (axis < 3))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				m_linearLimits.m_stopERP[axis] = value;
+				m_flags |= BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				m_linearLimits.m_stopCFM[axis] = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			case BT_CONSTRAINT_ERP:
+				m_linearLimits.m_motorERP[axis] = value;
+				m_flags |= BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			case BT_CONSTRAINT_CFM:
+				m_linearLimits.m_motorCFM[axis] = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else if ((axis >= 3) && (axis < 6))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				m_angularLimits[axis - 3].m_stopERP = value;
+				m_flags |= BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				m_angularLimits[axis - 3].m_stopCFM = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			case BT_CONSTRAINT_ERP:
+				m_angularLimits[axis - 3].m_motorERP = value;
+				m_flags |= BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			case BT_CONSTRAINT_CFM:
+				m_angularLimits[axis - 3].m_motorCFM = value;
+				m_flags |= BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2);
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else
+	{
+		btAssertConstrParams(0);
+	}
+}
+
+//return the local value of parameter
+btScalar btGeneric6DofSpring2Constraint::getParam(int num, int axis) const
+{
+	btScalar retVal = 0;
+	if ((axis >= 0) && (axis < 3))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_linearLimits.m_stopERP[axis];
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_linearLimits.m_stopCFM[axis];
+				break;
+			case BT_CONSTRAINT_ERP:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_linearLimits.m_motorERP[axis];
+				break;
+			case BT_CONSTRAINT_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_linearLimits.m_motorCFM[axis];
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else if ((axis >= 3) && (axis < 6))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_angularLimits[axis - 3].m_stopERP;
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_angularLimits[axis - 3].m_stopCFM;
+				break;
+			case BT_CONSTRAINT_ERP:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_angularLimits[axis - 3].m_motorERP;
+				break;
+			case BT_CONSTRAINT_CFM:
+				btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2)));
+				retVal = m_angularLimits[axis - 3].m_motorCFM;
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else
+	{
+		btAssertConstrParams(0);
+	}
+	return retVal;
+}
+
+void btGeneric6DofSpring2Constraint::setAxis(const btVector3& axis1, const btVector3& axis2)
+{
+	btVector3 zAxis = axis1.normalized();
+	btVector3 yAxis = axis2.normalized();
+	btVector3 xAxis = yAxis.cross(zAxis);  // we want right coordinate system
+
+	btTransform frameInW;
+	frameInW.setIdentity();
+	frameInW.getBasis().setValue(xAxis[0], yAxis[0], zAxis[0],
+								 xAxis[1], yAxis[1], zAxis[1],
+								 xAxis[2], yAxis[2], zAxis[2]);
+
+	// now get constraint frame in local coordinate systems
+	m_frameInA = m_rbA.getCenterOfMassTransform().inverse() * frameInW;
+	m_frameInB = m_rbB.getCenterOfMassTransform().inverse() * frameInW;
+
+	calculateTransforms();
+}
+
+void btGeneric6DofSpring2Constraint::setBounce(int index, btScalar bounce)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+		m_linearLimits.m_bounce[index] = bounce;
+	else
+		m_angularLimits[index - 3].m_bounce = bounce;
+}
+
+void btGeneric6DofSpring2Constraint::enableMotor(int index, bool onOff)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+		m_linearLimits.m_enableMotor[index] = onOff;
+	else
+		m_angularLimits[index - 3].m_enableMotor = onOff;
+}
+
+void btGeneric6DofSpring2Constraint::setServo(int index, bool onOff)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+		m_linearLimits.m_servoMotor[index] = onOff;
+	else
+		m_angularLimits[index - 3].m_servoMotor = onOff;
+}
+
+void btGeneric6DofSpring2Constraint::setTargetVelocity(int index, btScalar velocity)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+		m_linearLimits.m_targetVelocity[index] = velocity;
+	else
+		m_angularLimits[index - 3].m_targetVelocity = velocity;
+}
+
+void btGeneric6DofSpring2Constraint::setServoTarget(int index, btScalar targetOrg)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+	{
+		m_linearLimits.m_servoTarget[index] = targetOrg;
+	}
+	else
+	{
+		//wrap between -PI and PI, see also
+		//https://stackoverflow.com/questions/4633177/c-how-to-wrap-a-float-to-the-interval-pi-pi
+
+		btScalar target = targetOrg + SIMD_PI;
+		if (1)
+		{
+			btScalar m = target - SIMD_2_PI * std::floor(target / SIMD_2_PI);
+			// handle boundary cases resulted from floating-point cut off:
+			{
+				if (m >= SIMD_2_PI)
+				{
+					target = 0;
+				}
+				else
+				{
+					if (m < 0)
+					{
+						if (SIMD_2_PI + m == SIMD_2_PI)
+							target = 0;
+						else
+							target = SIMD_2_PI + m;
+					}
+					else
+					{
+						target = m;
+					}
+				}
+			}
+			target -= SIMD_PI;
+		}
+
+		m_angularLimits[index - 3].m_servoTarget = target;
+	}
+}
+
+void btGeneric6DofSpring2Constraint::setMaxMotorForce(int index, btScalar force)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+		m_linearLimits.m_maxMotorForce[index] = force;
+	else
+		m_angularLimits[index - 3].m_maxMotorForce = force;
+}
+
+void btGeneric6DofSpring2Constraint::enableSpring(int index, bool onOff)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+		m_linearLimits.m_enableSpring[index] = onOff;
+	else
+		m_angularLimits[index - 3].m_enableSpring = onOff;
+}
+
+void btGeneric6DofSpring2Constraint::setStiffness(int index, btScalar stiffness, bool limitIfNeeded)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+	{
+		m_linearLimits.m_springStiffness[index] = stiffness;
+		m_linearLimits.m_springStiffnessLimited[index] = limitIfNeeded;
+	}
+	else
+	{
+		m_angularLimits[index - 3].m_springStiffness = stiffness;
+		m_angularLimits[index - 3].m_springStiffnessLimited = limitIfNeeded;
+	}
+}
+
+void btGeneric6DofSpring2Constraint::setDamping(int index, btScalar damping, bool limitIfNeeded)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+	{
+		m_linearLimits.m_springDamping[index] = damping;
+		m_linearLimits.m_springDampingLimited[index] = limitIfNeeded;
+	}
+	else
+	{
+		m_angularLimits[index - 3].m_springDamping = damping;
+		m_angularLimits[index - 3].m_springDampingLimited = limitIfNeeded;
+	}
+}
+
+void btGeneric6DofSpring2Constraint::setEquilibriumPoint()
+{
+	calculateTransforms();
+	int i;
+	for (i = 0; i < 3; i++)
+		m_linearLimits.m_equilibriumPoint[i] = m_calculatedLinearDiff[i];
+	for (i = 0; i < 3; i++)
+		m_angularLimits[i].m_equilibriumPoint = m_calculatedAxisAngleDiff[i];
+}
+
+void btGeneric6DofSpring2Constraint::setEquilibriumPoint(int index)
+{
+	btAssert((index >= 0) && (index < 6));
+	calculateTransforms();
+	if (index < 3)
+		m_linearLimits.m_equilibriumPoint[index] = m_calculatedLinearDiff[index];
+	else
+		m_angularLimits[index - 3].m_equilibriumPoint = m_calculatedAxisAngleDiff[index - 3];
+}
+
+void btGeneric6DofSpring2Constraint::setEquilibriumPoint(int index, btScalar val)
+{
+	btAssert((index >= 0) && (index < 6));
+	if (index < 3)
+		m_linearLimits.m_equilibriumPoint[index] = val;
+	else
+		m_angularLimits[index - 3].m_equilibriumPoint = val;
+}
+
+//////////////////////////// btRotationalLimitMotor2 ////////////////////////////////////
+
+void btRotationalLimitMotor2::testLimitValue(btScalar test_value)
+{
+	//we can't normalize the angles here because we would lost the sign that we use later, but it doesn't seem to be a problem
+	if (m_loLimit > m_hiLimit)
+	{
+		m_currentLimit = 0;
+		m_currentLimitError = btScalar(0.f);
+	}
+	else if (m_loLimit == m_hiLimit)
+	{
+		m_currentLimitError = test_value - m_loLimit;
+		m_currentLimit = 3;
+	}
+	else
+	{
+		m_currentLimitError = test_value - m_loLimit;
+		m_currentLimitErrorHi = test_value - m_hiLimit;
+		m_currentLimit = 4;
+	}
+}
+
+//////////////////////////// btTranslationalLimitMotor2 ////////////////////////////////////
+
+void btTranslationalLimitMotor2::testLimitValue(int limitIndex, btScalar test_value)
+{
+	btScalar loLimit = m_lowerLimit[limitIndex];
+	btScalar hiLimit = m_upperLimit[limitIndex];
+	if (loLimit > hiLimit)
+	{
+		m_currentLimitError[limitIndex] = 0;
+		m_currentLimit[limitIndex] = 0;
+	}
+	else if (loLimit == hiLimit)
+	{
+		m_currentLimitError[limitIndex] = test_value - loLimit;
+		m_currentLimit[limitIndex] = 3;
+	}
+	else
+	{
+		m_currentLimitError[limitIndex] = test_value - loLimit;
+		m_currentLimitErrorHi[limitIndex] = test_value - hiLimit;
+		m_currentLimit[limitIndex] = 4;
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h
new file mode 100644
index 0000000..d2fe24b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h
@@ -0,0 +1,667 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+2014 May: btGeneric6DofSpring2Constraint is created from the original (2.82.2712) btGeneric6DofConstraint by Gabor Puhr and Tamas Umenhoffer
+Pros:
+- Much more accurate and stable in a lot of situation. (Especially when a sleeping chain of RBs connected with 6dof2 is pulled)
+- Stable and accurate spring with minimal energy loss that works with all of the solvers. (latter is not true for the original 6dof spring)
+- Servo motor functionality
+- Much more accurate bouncing. 0 really means zero bouncing (not true for the original 6odf) and there is only a minimal energy loss when the value is 1 (because of the solvers' precision)
+- Rotation order for the Euler system can be set. (One axis' freedom is still limited to pi/2)
+
+Cons:
+- It is slower than the original 6dof. There is no exact ratio, but half speed is a good estimation.
+- At bouncing the correct velocity is calculated, but not the correct position. (it is because of the solver can correct position or velocity, but not both.)
+*/
+
+/// 2009 March: btGeneric6DofConstraint refactored by Roman Ponomarev
+/// Added support for generic constraint solver through getInfo1/getInfo2 methods
+
+/*
+2007-09-09
+btGeneric6DofConstraint Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
+
+#ifndef BT_GENERIC_6DOF_CONSTRAINT2_H
+#define BT_GENERIC_6DOF_CONSTRAINT2_H
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+
+class btRigidBody;
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btGeneric6DofSpring2ConstraintData2 btGeneric6DofSpring2ConstraintDoubleData2
+#define btGeneric6DofSpring2ConstraintDataName "btGeneric6DofSpring2ConstraintDoubleData2"
+#else
+#define btGeneric6DofSpring2ConstraintData2 btGeneric6DofSpring2ConstraintData
+#define btGeneric6DofSpring2ConstraintDataName "btGeneric6DofSpring2ConstraintData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+enum RotateOrder
+{
+	RO_XYZ = 0,
+	RO_XZY,
+	RO_YXZ,
+	RO_YZX,
+	RO_ZXY,
+	RO_ZYX
+};
+
+class btRotationalLimitMotor2
+{
+public:
+	// upper < lower means free
+	// upper == lower means locked
+	// upper > lower means limited
+	btScalar m_loLimit;
+	btScalar m_hiLimit;
+	btScalar m_bounce;
+	btScalar m_stopERP;
+	btScalar m_stopCFM;
+	btScalar m_motorERP;
+	btScalar m_motorCFM;
+	bool m_enableMotor;
+	btScalar m_targetVelocity;
+	btScalar m_maxMotorForce;
+	bool m_servoMotor;
+	btScalar m_servoTarget;
+	bool m_enableSpring;
+	btScalar m_springStiffness;
+	bool m_springStiffnessLimited;
+	btScalar m_springDamping;
+	bool m_springDampingLimited;
+	btScalar m_equilibriumPoint;
+
+	btScalar m_currentLimitError;
+	btScalar m_currentLimitErrorHi;
+	btScalar m_currentPosition;
+	int m_currentLimit;
+
+	btRotationalLimitMotor2()
+	{
+		m_loLimit = 1.0f;
+		m_hiLimit = -1.0f;
+		m_bounce = 0.0f;
+		m_stopERP = 0.2f;
+		m_stopCFM = 0.f;
+		m_motorERP = 0.9f;
+		m_motorCFM = 0.f;
+		m_enableMotor = false;
+		m_targetVelocity = 0;
+		m_maxMotorForce = 6.0f;
+		m_servoMotor = false;
+		m_servoTarget = 0;
+		m_enableSpring = false;
+		m_springStiffness = 0;
+		m_springStiffnessLimited = false;
+		m_springDamping = 0;
+		m_springDampingLimited = false;
+		m_equilibriumPoint = 0;
+
+		m_currentLimitError = 0;
+		m_currentLimitErrorHi = 0;
+		m_currentPosition = 0;
+		m_currentLimit = 0;
+	}
+
+	btRotationalLimitMotor2(const btRotationalLimitMotor2& limot)
+	{
+		m_loLimit = limot.m_loLimit;
+		m_hiLimit = limot.m_hiLimit;
+		m_bounce = limot.m_bounce;
+		m_stopERP = limot.m_stopERP;
+		m_stopCFM = limot.m_stopCFM;
+		m_motorERP = limot.m_motorERP;
+		m_motorCFM = limot.m_motorCFM;
+		m_enableMotor = limot.m_enableMotor;
+		m_targetVelocity = limot.m_targetVelocity;
+		m_maxMotorForce = limot.m_maxMotorForce;
+		m_servoMotor = limot.m_servoMotor;
+		m_servoTarget = limot.m_servoTarget;
+		m_enableSpring = limot.m_enableSpring;
+		m_springStiffness = limot.m_springStiffness;
+		m_springStiffnessLimited = limot.m_springStiffnessLimited;
+		m_springDamping = limot.m_springDamping;
+		m_springDampingLimited = limot.m_springDampingLimited;
+		m_equilibriumPoint = limot.m_equilibriumPoint;
+
+		m_currentLimitError = limot.m_currentLimitError;
+		m_currentLimitErrorHi = limot.m_currentLimitErrorHi;
+		m_currentPosition = limot.m_currentPosition;
+		m_currentLimit = limot.m_currentLimit;
+	}
+
+	bool isLimited()
+	{
+		if (m_loLimit > m_hiLimit) return false;
+		return true;
+	}
+
+	void testLimitValue(btScalar test_value);
+};
+
+class btTranslationalLimitMotor2
+{
+public:
+	// upper < lower means free
+	// upper == lower means locked
+	// upper > lower means limited
+	btVector3 m_lowerLimit;
+	btVector3 m_upperLimit;
+	btVector3 m_bounce;
+	btVector3 m_stopERP;
+	btVector3 m_stopCFM;
+	btVector3 m_motorERP;
+	btVector3 m_motorCFM;
+	bool m_enableMotor[3];
+	bool m_servoMotor[3];
+	bool m_enableSpring[3];
+	btVector3 m_servoTarget;
+	btVector3 m_springStiffness;
+	bool m_springStiffnessLimited[3];
+	btVector3 m_springDamping;
+	bool m_springDampingLimited[3];
+	btVector3 m_equilibriumPoint;
+	btVector3 m_targetVelocity;
+	btVector3 m_maxMotorForce;
+
+	btVector3 m_currentLimitError;
+	btVector3 m_currentLimitErrorHi;
+	btVector3 m_currentLinearDiff;
+	int m_currentLimit[3];
+
+	btTranslationalLimitMotor2()
+	{
+		m_lowerLimit.setValue(0.f, 0.f, 0.f);
+		m_upperLimit.setValue(0.f, 0.f, 0.f);
+		m_bounce.setValue(0.f, 0.f, 0.f);
+		m_stopERP.setValue(0.2f, 0.2f, 0.2f);
+		m_stopCFM.setValue(0.f, 0.f, 0.f);
+		m_motorERP.setValue(0.9f, 0.9f, 0.9f);
+		m_motorCFM.setValue(0.f, 0.f, 0.f);
+
+		m_currentLimitError.setValue(0.f, 0.f, 0.f);
+		m_currentLimitErrorHi.setValue(0.f, 0.f, 0.f);
+		m_currentLinearDiff.setValue(0.f, 0.f, 0.f);
+
+		for (int i = 0; i < 3; i++)
+		{
+			m_enableMotor[i] = false;
+			m_servoMotor[i] = false;
+			m_enableSpring[i] = false;
+			m_servoTarget[i] = btScalar(0.f);
+			m_springStiffness[i] = btScalar(0.f);
+			m_springStiffnessLimited[i] = false;
+			m_springDamping[i] = btScalar(0.f);
+			m_springDampingLimited[i] = false;
+			m_equilibriumPoint[i] = btScalar(0.f);
+			m_targetVelocity[i] = btScalar(0.f);
+			m_maxMotorForce[i] = btScalar(0.f);
+
+			m_currentLimit[i] = 0;
+		}
+	}
+
+	btTranslationalLimitMotor2(const btTranslationalLimitMotor2& other)
+	{
+		m_lowerLimit = other.m_lowerLimit;
+		m_upperLimit = other.m_upperLimit;
+		m_bounce = other.m_bounce;
+		m_stopERP = other.m_stopERP;
+		m_stopCFM = other.m_stopCFM;
+		m_motorERP = other.m_motorERP;
+		m_motorCFM = other.m_motorCFM;
+
+		m_currentLimitError = other.m_currentLimitError;
+		m_currentLimitErrorHi = other.m_currentLimitErrorHi;
+		m_currentLinearDiff = other.m_currentLinearDiff;
+
+		for (int i = 0; i < 3; i++)
+		{
+			m_enableMotor[i] = other.m_enableMotor[i];
+			m_servoMotor[i] = other.m_servoMotor[i];
+			m_enableSpring[i] = other.m_enableSpring[i];
+			m_servoTarget[i] = other.m_servoTarget[i];
+			m_springStiffness[i] = other.m_springStiffness[i];
+			m_springStiffnessLimited[i] = other.m_springStiffnessLimited[i];
+			m_springDamping[i] = other.m_springDamping[i];
+			m_springDampingLimited[i] = other.m_springDampingLimited[i];
+			m_equilibriumPoint[i] = other.m_equilibriumPoint[i];
+			m_targetVelocity[i] = other.m_targetVelocity[i];
+			m_maxMotorForce[i] = other.m_maxMotorForce[i];
+
+			m_currentLimit[i] = other.m_currentLimit[i];
+		}
+	}
+
+	inline bool isLimited(int limitIndex)
+	{
+		return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]);
+	}
+
+	void testLimitValue(int limitIndex, btScalar test_value);
+};
+
+enum bt6DofFlags2
+{
+	BT_6DOF_FLAGS_CFM_STOP2 = 1,
+	BT_6DOF_FLAGS_ERP_STOP2 = 2,
+	BT_6DOF_FLAGS_CFM_MOTO2 = 4,
+	BT_6DOF_FLAGS_ERP_MOTO2 = 8,
+	BT_6DOF_FLAGS_USE_INFINITE_ERROR = (1<<16)
+};
+#define BT_6DOF_FLAGS_AXIS_SHIFT2 4  // bits per axis
+
+ATTRIBUTE_ALIGNED16(class)
+btGeneric6DofSpring2Constraint : public btTypedConstraint
+{
+protected:
+	btTransform m_frameInA;
+	btTransform m_frameInB;
+
+	btJacobianEntry m_jacLinear[3];
+	btJacobianEntry m_jacAng[3];
+
+	btTranslationalLimitMotor2 m_linearLimits;
+	btRotationalLimitMotor2 m_angularLimits[3];
+
+	RotateOrder m_rotateOrder;
+
+protected:
+	btTransform m_calculatedTransformA;
+	btTransform m_calculatedTransformB;
+	btVector3 m_calculatedAxisAngleDiff;
+	btVector3 m_calculatedAxis[3];
+	btVector3 m_calculatedLinearDiff;
+	btScalar m_factA;
+	btScalar m_factB;
+	bool m_hasStaticBody;
+	int m_flags;
+
+	btGeneric6DofSpring2Constraint& operator=(const btGeneric6DofSpring2Constraint&)
+	{
+		btAssert(0);
+		return *this;
+	}
+
+	int setAngularLimits(btConstraintInfo2 * info, int row_offset, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB);
+	int setLinearLimits(btConstraintInfo2 * info, int row, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB);
+
+	void calculateLinearInfo();
+	void calculateAngleInfo();
+	void testAngularLimitMotor(int axis_index);
+
+	void calculateJacobi(btRotationalLimitMotor2 * limot, const btTransform& transA, const btTransform& transB, btConstraintInfo2* info, int srow, btVector3& ax1, int rotational, int rotAllowed);
+	int get_limit_motor_info2(btRotationalLimitMotor2 * limot,
+							  const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, const btVector3& angVelA, const btVector3& angVelB,
+							  btConstraintInfo2* info, int row, btVector3& ax1, int rotational, int rotAllowed = false);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btGeneric6DofSpring2Constraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& frameInA, const btTransform& frameInB, RotateOrder rotOrder = RO_XYZ);
+	btGeneric6DofSpring2Constraint(btRigidBody & rbB, const btTransform& frameInB, RotateOrder rotOrder = RO_XYZ);
+
+	virtual void buildJacobian() {}
+	virtual void getInfo1(btConstraintInfo1 * info);
+	virtual void getInfo2(btConstraintInfo2 * info);
+	virtual int calculateSerializeBufferSize() const;
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+
+	btRotationalLimitMotor2* getRotationalLimitMotor(int index) { return &m_angularLimits[index]; }
+	btTranslationalLimitMotor2* getTranslationalLimitMotor() { return &m_linearLimits; }
+
+	// Calculates the global transform for the joint offset for body A an B, and also calculates the angle differences between the bodies.
+	void calculateTransforms(const btTransform& transA, const btTransform& transB);
+	void calculateTransforms();
+
+	// Gets the global transform of the offset for body A
+	const btTransform& getCalculatedTransformA() const { return m_calculatedTransformA; }
+	// Gets the global transform of the offset for body B
+	const btTransform& getCalculatedTransformB() const { return m_calculatedTransformB; }
+
+	const btTransform& getFrameOffsetA() const { return m_frameInA; }
+	const btTransform& getFrameOffsetB() const { return m_frameInB; }
+
+	btTransform& getFrameOffsetA() { return m_frameInA; }
+	btTransform& getFrameOffsetB() { return m_frameInB; }
+
+	// Get the rotation axis in global coordinates ( btGeneric6DofSpring2Constraint::calculateTransforms() must be called previously )
+	btVector3 getAxis(int axis_index) const { return m_calculatedAxis[axis_index]; }
+
+	// Get the relative Euler angle ( btGeneric6DofSpring2Constraint::calculateTransforms() must be called previously )
+	btScalar getAngle(int axis_index) const { return m_calculatedAxisAngleDiff[axis_index]; }
+
+	// Get the relative position of the constraint pivot ( btGeneric6DofSpring2Constraint::calculateTransforms() must be called previously )
+	btScalar getRelativePivotPosition(int axis_index) const { return m_calculatedLinearDiff[axis_index]; }
+
+	void setFrames(const btTransform& frameA, const btTransform& frameB);
+
+	void setLinearLowerLimit(const btVector3& linearLower) { m_linearLimits.m_lowerLimit = linearLower; }
+	void getLinearLowerLimit(btVector3 & linearLower) { linearLower = m_linearLimits.m_lowerLimit; }
+	void setLinearUpperLimit(const btVector3& linearUpper) { m_linearLimits.m_upperLimit = linearUpper; }
+	void getLinearUpperLimit(btVector3 & linearUpper) { linearUpper = m_linearLimits.m_upperLimit; }
+
+	void setAngularLowerLimit(const btVector3& angularLower)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_loLimit = btNormalizeAngle(angularLower[i]);
+	}
+
+	void setAngularLowerLimitReversed(const btVector3& angularLower)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_hiLimit = btNormalizeAngle(-angularLower[i]);
+	}
+
+	void getAngularLowerLimit(btVector3 & angularLower)
+	{
+		for (int i = 0; i < 3; i++)
+			angularLower[i] = m_angularLimits[i].m_loLimit;
+	}
+
+	void getAngularLowerLimitReversed(btVector3 & angularLower)
+	{
+		for (int i = 0; i < 3; i++)
+			angularLower[i] = -m_angularLimits[i].m_hiLimit;
+	}
+
+	void setAngularUpperLimit(const btVector3& angularUpper)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_hiLimit = btNormalizeAngle(angularUpper[i]);
+	}
+
+	void setAngularUpperLimitReversed(const btVector3& angularUpper)
+	{
+		for (int i = 0; i < 3; i++)
+			m_angularLimits[i].m_loLimit = btNormalizeAngle(-angularUpper[i]);
+	}
+
+	void getAngularUpperLimit(btVector3 & angularUpper)
+	{
+		for (int i = 0; i < 3; i++)
+			angularUpper[i] = m_angularLimits[i].m_hiLimit;
+	}
+
+	void getAngularUpperLimitReversed(btVector3 & angularUpper)
+	{
+		for (int i = 0; i < 3; i++)
+			angularUpper[i] = -m_angularLimits[i].m_loLimit;
+	}
+
+	//first 3 are linear, next 3 are angular
+
+	void setLimit(int axis, btScalar lo, btScalar hi)
+	{
+		if (axis < 3)
+		{
+			m_linearLimits.m_lowerLimit[axis] = lo;
+			m_linearLimits.m_upperLimit[axis] = hi;
+		}
+		else
+		{
+			lo = btNormalizeAngle(lo);
+			hi = btNormalizeAngle(hi);
+			m_angularLimits[axis - 3].m_loLimit = lo;
+			m_angularLimits[axis - 3].m_hiLimit = hi;
+		}
+	}
+
+	void setLimitReversed(int axis, btScalar lo, btScalar hi)
+	{
+		if (axis < 3)
+		{
+			m_linearLimits.m_lowerLimit[axis] = lo;
+			m_linearLimits.m_upperLimit[axis] = hi;
+		}
+		else
+		{
+			lo = btNormalizeAngle(lo);
+			hi = btNormalizeAngle(hi);
+			m_angularLimits[axis - 3].m_hiLimit = -lo;
+			m_angularLimits[axis - 3].m_loLimit = -hi;
+		}
+	}
+
+	bool isLimited(int limitIndex)
+	{
+		if (limitIndex < 3)
+		{
+			return m_linearLimits.isLimited(limitIndex);
+		}
+		return m_angularLimits[limitIndex - 3].isLimited();
+	}
+
+	void setRotationOrder(RotateOrder order) { m_rotateOrder = order; }
+	RotateOrder getRotationOrder() { return m_rotateOrder; }
+
+	void setAxis(const btVector3& axis1, const btVector3& axis2);
+
+	void setBounce(int index, btScalar bounce);
+
+	void enableMotor(int index, bool onOff);
+	void setServo(int index, bool onOff);  // set the type of the motor (servo or not) (the motor has to be turned on for servo also)
+	void setTargetVelocity(int index, btScalar velocity);
+	void setServoTarget(int index, btScalar target);
+	void setMaxMotorForce(int index, btScalar force);
+
+	void enableSpring(int index, bool onOff);
+	void setStiffness(int index, btScalar stiffness, bool limitIfNeeded = true);  // if limitIfNeeded is true the system will automatically limit the stiffness in necessary situations where otherwise the spring would move unrealistically too widely
+	void setDamping(int index, btScalar damping, bool limitIfNeeded = true);      // if limitIfNeeded is true the system will automatically limit the damping in necessary situations where otherwise the spring would blow up
+	void setEquilibriumPoint();                                                   // set the current constraint position/orientation as an equilibrium point for all DOF
+	void setEquilibriumPoint(int index);                                          // set the current constraint position/orientation as an equilibrium point for given DOF
+	void setEquilibriumPoint(int index, btScalar val);
+
+	//override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	//If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, btScalar value, int axis = -1);
+	virtual btScalar getParam(int num, int axis = -1) const;
+
+	static btScalar btGetMatrixElem(const btMatrix3x3& mat, int index);
+	static bool matrixToEulerXYZ(const btMatrix3x3& mat, btVector3& xyz);
+	static bool matrixToEulerXZY(const btMatrix3x3& mat, btVector3& xyz);
+	static bool matrixToEulerYXZ(const btMatrix3x3& mat, btVector3& xyz);
+	static bool matrixToEulerYZX(const btMatrix3x3& mat, btVector3& xyz);
+	static bool matrixToEulerZXY(const btMatrix3x3& mat, btVector3& xyz);
+	static bool matrixToEulerZYX(const btMatrix3x3& mat, btVector3& xyz);
+};
+
+struct btGeneric6DofSpring2ConstraintData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btTransformFloatData m_rbAFrame;
+	btTransformFloatData m_rbBFrame;
+
+	btVector3FloatData m_linearUpperLimit;
+	btVector3FloatData m_linearLowerLimit;
+	btVector3FloatData m_linearBounce;
+	btVector3FloatData m_linearStopERP;
+	btVector3FloatData m_linearStopCFM;
+	btVector3FloatData m_linearMotorERP;
+	btVector3FloatData m_linearMotorCFM;
+	btVector3FloatData m_linearTargetVelocity;
+	btVector3FloatData m_linearMaxMotorForce;
+	btVector3FloatData m_linearServoTarget;
+	btVector3FloatData m_linearSpringStiffness;
+	btVector3FloatData m_linearSpringDamping;
+	btVector3FloatData m_linearEquilibriumPoint;
+	char m_linearEnableMotor[4];
+	char m_linearServoMotor[4];
+	char m_linearEnableSpring[4];
+	char m_linearSpringStiffnessLimited[4];
+	char m_linearSpringDampingLimited[4];
+	char m_padding1[4];
+
+	btVector3FloatData m_angularUpperLimit;
+	btVector3FloatData m_angularLowerLimit;
+	btVector3FloatData m_angularBounce;
+	btVector3FloatData m_angularStopERP;
+	btVector3FloatData m_angularStopCFM;
+	btVector3FloatData m_angularMotorERP;
+	btVector3FloatData m_angularMotorCFM;
+	btVector3FloatData m_angularTargetVelocity;
+	btVector3FloatData m_angularMaxMotorForce;
+	btVector3FloatData m_angularServoTarget;
+	btVector3FloatData m_angularSpringStiffness;
+	btVector3FloatData m_angularSpringDamping;
+	btVector3FloatData m_angularEquilibriumPoint;
+	char m_angularEnableMotor[4];
+	char m_angularServoMotor[4];
+	char m_angularEnableSpring[4];
+	char m_angularSpringStiffnessLimited[4];
+	char m_angularSpringDampingLimited[4];
+
+	int m_rotateOrder;
+};
+
+struct btGeneric6DofSpring2ConstraintDoubleData2
+{
+	btTypedConstraintDoubleData m_typeConstraintData;
+	btTransformDoubleData m_rbAFrame;
+	btTransformDoubleData m_rbBFrame;
+
+	btVector3DoubleData m_linearUpperLimit;
+	btVector3DoubleData m_linearLowerLimit;
+	btVector3DoubleData m_linearBounce;
+	btVector3DoubleData m_linearStopERP;
+	btVector3DoubleData m_linearStopCFM;
+	btVector3DoubleData m_linearMotorERP;
+	btVector3DoubleData m_linearMotorCFM;
+	btVector3DoubleData m_linearTargetVelocity;
+	btVector3DoubleData m_linearMaxMotorForce;
+	btVector3DoubleData m_linearServoTarget;
+	btVector3DoubleData m_linearSpringStiffness;
+	btVector3DoubleData m_linearSpringDamping;
+	btVector3DoubleData m_linearEquilibriumPoint;
+	char m_linearEnableMotor[4];
+	char m_linearServoMotor[4];
+	char m_linearEnableSpring[4];
+	char m_linearSpringStiffnessLimited[4];
+	char m_linearSpringDampingLimited[4];
+	char m_padding1[4];
+
+	btVector3DoubleData m_angularUpperLimit;
+	btVector3DoubleData m_angularLowerLimit;
+	btVector3DoubleData m_angularBounce;
+	btVector3DoubleData m_angularStopERP;
+	btVector3DoubleData m_angularStopCFM;
+	btVector3DoubleData m_angularMotorERP;
+	btVector3DoubleData m_angularMotorCFM;
+	btVector3DoubleData m_angularTargetVelocity;
+	btVector3DoubleData m_angularMaxMotorForce;
+	btVector3DoubleData m_angularServoTarget;
+	btVector3DoubleData m_angularSpringStiffness;
+	btVector3DoubleData m_angularSpringDamping;
+	btVector3DoubleData m_angularEquilibriumPoint;
+	char m_angularEnableMotor[4];
+	char m_angularServoMotor[4];
+	char m_angularEnableSpring[4];
+	char m_angularSpringStiffnessLimited[4];
+	char m_angularSpringDampingLimited[4];
+
+	int m_rotateOrder;
+};
+
+SIMD_FORCE_INLINE int btGeneric6DofSpring2Constraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btGeneric6DofSpring2ConstraintData2);
+}
+
+SIMD_FORCE_INLINE const char* btGeneric6DofSpring2Constraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btGeneric6DofSpring2ConstraintData2* dof = (btGeneric6DofSpring2ConstraintData2*)dataBuffer;
+	btTypedConstraint::serialize(&dof->m_typeConstraintData, serializer);
+
+	m_frameInA.serialize(dof->m_rbAFrame);
+	m_frameInB.serialize(dof->m_rbBFrame);
+
+	int i;
+	for (i = 0; i < 3; i++)
+	{
+		dof->m_angularLowerLimit.m_floats[i] = m_angularLimits[i].m_loLimit;
+		dof->m_angularUpperLimit.m_floats[i] = m_angularLimits[i].m_hiLimit;
+		dof->m_angularBounce.m_floats[i] = m_angularLimits[i].m_bounce;
+		dof->m_angularStopERP.m_floats[i] = m_angularLimits[i].m_stopERP;
+		dof->m_angularStopCFM.m_floats[i] = m_angularLimits[i].m_stopCFM;
+		dof->m_angularMotorERP.m_floats[i] = m_angularLimits[i].m_motorERP;
+		dof->m_angularMotorCFM.m_floats[i] = m_angularLimits[i].m_motorCFM;
+		dof->m_angularTargetVelocity.m_floats[i] = m_angularLimits[i].m_targetVelocity;
+		dof->m_angularMaxMotorForce.m_floats[i] = m_angularLimits[i].m_maxMotorForce;
+		dof->m_angularServoTarget.m_floats[i] = m_angularLimits[i].m_servoTarget;
+		dof->m_angularSpringStiffness.m_floats[i] = m_angularLimits[i].m_springStiffness;
+		dof->m_angularSpringDamping.m_floats[i] = m_angularLimits[i].m_springDamping;
+		dof->m_angularEquilibriumPoint.m_floats[i] = m_angularLimits[i].m_equilibriumPoint;
+	}
+	dof->m_angularLowerLimit.m_floats[3] = 0;
+	dof->m_angularUpperLimit.m_floats[3] = 0;
+	dof->m_angularBounce.m_floats[3] = 0;
+	dof->m_angularStopERP.m_floats[3] = 0;
+	dof->m_angularStopCFM.m_floats[3] = 0;
+	dof->m_angularMotorERP.m_floats[3] = 0;
+	dof->m_angularMotorCFM.m_floats[3] = 0;
+	dof->m_angularTargetVelocity.m_floats[3] = 0;
+	dof->m_angularMaxMotorForce.m_floats[3] = 0;
+	dof->m_angularServoTarget.m_floats[3] = 0;
+	dof->m_angularSpringStiffness.m_floats[3] = 0;
+	dof->m_angularSpringDamping.m_floats[3] = 0;
+	dof->m_angularEquilibriumPoint.m_floats[3] = 0;
+	for (i = 0; i < 4; i++)
+	{
+		dof->m_angularEnableMotor[i] = i < 3 ? (m_angularLimits[i].m_enableMotor ? 1 : 0) : 0;
+		dof->m_angularServoMotor[i] = i < 3 ? (m_angularLimits[i].m_servoMotor ? 1 : 0) : 0;
+		dof->m_angularEnableSpring[i] = i < 3 ? (m_angularLimits[i].m_enableSpring ? 1 : 0) : 0;
+		dof->m_angularSpringStiffnessLimited[i] = i < 3 ? (m_angularLimits[i].m_springStiffnessLimited ? 1 : 0) : 0;
+		dof->m_angularSpringDampingLimited[i] = i < 3 ? (m_angularLimits[i].m_springDampingLimited ? 1 : 0) : 0;
+	}
+
+	m_linearLimits.m_lowerLimit.serialize(dof->m_linearLowerLimit);
+	m_linearLimits.m_upperLimit.serialize(dof->m_linearUpperLimit);
+	m_linearLimits.m_bounce.serialize(dof->m_linearBounce);
+	m_linearLimits.m_stopERP.serialize(dof->m_linearStopERP);
+	m_linearLimits.m_stopCFM.serialize(dof->m_linearStopCFM);
+	m_linearLimits.m_motorERP.serialize(dof->m_linearMotorERP);
+	m_linearLimits.m_motorCFM.serialize(dof->m_linearMotorCFM);
+	m_linearLimits.m_targetVelocity.serialize(dof->m_linearTargetVelocity);
+	m_linearLimits.m_maxMotorForce.serialize(dof->m_linearMaxMotorForce);
+	m_linearLimits.m_servoTarget.serialize(dof->m_linearServoTarget);
+	m_linearLimits.m_springStiffness.serialize(dof->m_linearSpringStiffness);
+	m_linearLimits.m_springDamping.serialize(dof->m_linearSpringDamping);
+	m_linearLimits.m_equilibriumPoint.serialize(dof->m_linearEquilibriumPoint);
+	for (i = 0; i < 4; i++)
+	{
+		dof->m_linearEnableMotor[i] = i < 3 ? (m_linearLimits.m_enableMotor[i] ? 1 : 0) : 0;
+		dof->m_linearServoMotor[i] = i < 3 ? (m_linearLimits.m_servoMotor[i] ? 1 : 0) : 0;
+		dof->m_linearEnableSpring[i] = i < 3 ? (m_linearLimits.m_enableSpring[i] ? 1 : 0) : 0;
+		dof->m_linearSpringStiffnessLimited[i] = i < 3 ? (m_linearLimits.m_springStiffnessLimited[i] ? 1 : 0) : 0;
+		dof->m_linearSpringDampingLimited[i] = i < 3 ? (m_linearLimits.m_springDampingLimited[i] ? 1 : 0) : 0;
+	}
+
+	dof->m_rotateOrder = m_rotateOrder;
+
+	dof->m_padding1[0] = 0;
+	dof->m_padding1[1] = 0;
+	dof->m_padding1[2] = 0;
+	dof->m_padding1[3] = 0;
+
+	return btGeneric6DofSpring2ConstraintDataName;
+}
+
+#endif  //BT_GENERIC_6DOF_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
new file mode 100644
index 0000000..8baf52b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
@@ -0,0 +1,169 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGeneric6DofSpringConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+
+btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA)
+	: btGeneric6DofConstraint(rbA, rbB, frameInA, frameInB, useLinearReferenceFrameA)
+{
+	init();
+}
+
+btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbB, const btTransform& frameInB, bool useLinearReferenceFrameB)
+	: btGeneric6DofConstraint(rbB, frameInB, useLinearReferenceFrameB)
+{
+	init();
+}
+
+void btGeneric6DofSpringConstraint::init()
+{
+	m_objectType = D6_SPRING_CONSTRAINT_TYPE;
+
+	for (int i = 0; i < 6; i++)
+	{
+		m_springEnabled[i] = false;
+		m_equilibriumPoint[i] = btScalar(0.f);
+		m_springStiffness[i] = btScalar(0.f);
+		m_springDamping[i] = btScalar(1.f);
+	}
+}
+
+void btGeneric6DofSpringConstraint::enableSpring(int index, bool onOff)
+{
+	btAssert((index >= 0) && (index < 6));
+	m_springEnabled[index] = onOff;
+	if (index < 3)
+	{
+		m_linearLimits.m_enableMotor[index] = onOff;
+	}
+	else
+	{
+		m_angularLimits[index - 3].m_enableMotor = onOff;
+	}
+}
+
+void btGeneric6DofSpringConstraint::setStiffness(int index, btScalar stiffness)
+{
+	btAssert((index >= 0) && (index < 6));
+	m_springStiffness[index] = stiffness;
+}
+
+void btGeneric6DofSpringConstraint::setDamping(int index, btScalar damping)
+{
+	btAssert((index >= 0) && (index < 6));
+	m_springDamping[index] = damping;
+}
+
+void btGeneric6DofSpringConstraint::setEquilibriumPoint()
+{
+	calculateTransforms();
+	int i;
+
+	for (i = 0; i < 3; i++)
+	{
+		m_equilibriumPoint[i] = m_calculatedLinearDiff[i];
+	}
+	for (i = 0; i < 3; i++)
+	{
+		m_equilibriumPoint[i + 3] = m_calculatedAxisAngleDiff[i];
+	}
+}
+
+void btGeneric6DofSpringConstraint::setEquilibriumPoint(int index)
+{
+	btAssert((index >= 0) && (index < 6));
+	calculateTransforms();
+	if (index < 3)
+	{
+		m_equilibriumPoint[index] = m_calculatedLinearDiff[index];
+	}
+	else
+	{
+		m_equilibriumPoint[index] = m_calculatedAxisAngleDiff[index - 3];
+	}
+}
+
+void btGeneric6DofSpringConstraint::setEquilibriumPoint(int index, btScalar val)
+{
+	btAssert((index >= 0) && (index < 6));
+	m_equilibriumPoint[index] = val;
+}
+
+void btGeneric6DofSpringConstraint::internalUpdateSprings(btConstraintInfo2* info)
+{
+	// it is assumed that calculateTransforms() have been called before this call
+	int i;
+	//btVector3 relVel = m_rbB.getLinearVelocity() - m_rbA.getLinearVelocity();
+	for (i = 0; i < 3; i++)
+	{
+		if (m_springEnabled[i])
+		{
+			// get current position of constraint
+			btScalar currPos = m_calculatedLinearDiff[i];
+			// calculate difference
+			btScalar delta = currPos - m_equilibriumPoint[i];
+			// spring force is (delta * m_stiffness) according to Hooke's Law
+			btScalar force = delta * m_springStiffness[i];
+			btScalar velFactor = info->fps * m_springDamping[i] / btScalar(info->m_numIterations);
+			m_linearLimits.m_targetVelocity[i] = velFactor * force;
+			m_linearLimits.m_maxMotorForce[i] = btFabs(force);
+		}
+	}
+	for (i = 0; i < 3; i++)
+	{
+		if (m_springEnabled[i + 3])
+		{
+			// get current position of constraint
+			btScalar currPos = m_calculatedAxisAngleDiff[i];
+			// calculate difference
+			btScalar delta = currPos - m_equilibriumPoint[i + 3];
+			// spring force is (-delta * m_stiffness) according to Hooke's Law
+			btScalar force = -delta * m_springStiffness[i + 3];
+			btScalar velFactor = info->fps * m_springDamping[i + 3] / btScalar(info->m_numIterations);
+			m_angularLimits[i].m_targetVelocity = velFactor * force;
+			m_angularLimits[i].m_maxMotorForce = btFabs(force);
+		}
+	}
+}
+
+void btGeneric6DofSpringConstraint::getInfo2(btConstraintInfo2* info)
+{
+	// this will be called by constraint solver at the constraint setup stage
+	// set current motor parameters
+	internalUpdateSprings(info);
+	// do the rest of job for constraint setup
+	btGeneric6DofConstraint::getInfo2(info);
+}
+
+void btGeneric6DofSpringConstraint::setAxis(const btVector3& axis1, const btVector3& axis2)
+{
+	btVector3 zAxis = axis1.normalized();
+	btVector3 yAxis = axis2.normalized();
+	btVector3 xAxis = yAxis.cross(zAxis);  // we want right coordinate system
+
+	btTransform frameInW;
+	frameInW.setIdentity();
+	frameInW.getBasis().setValue(xAxis[0], yAxis[0], zAxis[0],
+								 xAxis[1], yAxis[1], zAxis[1],
+								 xAxis[2], yAxis[2], zAxis[2]);
+
+	// now get constraint frame in local coordinate systems
+	m_frameInA = m_rbA.getCenterOfMassTransform().inverse() * frameInW;
+	m_frameInB = m_rbB.getCenterOfMassTransform().inverse() * frameInW;
+
+	calculateTransforms();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
new file mode 100644
index 0000000..02b9d4d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
@@ -0,0 +1,135 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GENERIC_6DOF_SPRING_CONSTRAINT_H
+#define BT_GENERIC_6DOF_SPRING_CONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "btTypedConstraint.h"
+#include "btGeneric6DofConstraint.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btGeneric6DofSpringConstraintData2 btGeneric6DofSpringConstraintDoubleData2
+#define btGeneric6DofSpringConstraintDataName "btGeneric6DofSpringConstraintDoubleData2"
+#else
+#define btGeneric6DofSpringConstraintData2 btGeneric6DofSpringConstraintData
+#define btGeneric6DofSpringConstraintDataName "btGeneric6DofSpringConstraintData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+/// Generic 6 DOF constraint that allows to set spring motors to any translational and rotational DOF
+
+/// DOF index used in enableSpring() and setStiffness() means:
+/// 0 : translation X
+/// 1 : translation Y
+/// 2 : translation Z
+/// 3 : rotation X (3rd Euler rotational around new position of X axis, range [-PI+epsilon, PI-epsilon] )
+/// 4 : rotation Y (2nd Euler rotational around new position of Y axis, range [-PI/2+epsilon, PI/2-epsilon] )
+/// 5 : rotation Z (1st Euler rotational around Z axis, range [-PI+epsilon, PI-epsilon] )
+
+ATTRIBUTE_ALIGNED16(class)
+btGeneric6DofSpringConstraint : public btGeneric6DofConstraint
+{
+protected:
+	bool m_springEnabled[6];
+	btScalar m_equilibriumPoint[6];
+	btScalar m_springStiffness[6];
+	btScalar m_springDamping[6];  // between 0 and 1 (1 == no damping)
+	void init();
+	void internalUpdateSprings(btConstraintInfo2 * info);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btGeneric6DofSpringConstraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA);
+	btGeneric6DofSpringConstraint(btRigidBody & rbB, const btTransform& frameInB, bool useLinearReferenceFrameB);
+	void enableSpring(int index, bool onOff);
+	void setStiffness(int index, btScalar stiffness);
+	void setDamping(int index, btScalar damping);
+	void setEquilibriumPoint();           // set the current constraint position/orientation as an equilibrium point for all DOF
+	void setEquilibriumPoint(int index);  // set the current constraint position/orientation as an equilibrium point for given DOF
+	void setEquilibriumPoint(int index, btScalar val);
+
+	bool isSpringEnabled(int index) const
+	{
+		return m_springEnabled[index];
+	}
+
+	btScalar getStiffness(int index) const
+	{
+		return m_springStiffness[index];
+	}
+
+	btScalar getDamping(int index) const
+	{
+		return m_springDamping[index];
+	}
+
+	btScalar getEquilibriumPoint(int index) const
+	{
+		return m_equilibriumPoint[index];
+	}
+
+	virtual void setAxis(const btVector3& axis1, const btVector3& axis2);
+
+	virtual void getInfo2(btConstraintInfo2 * info);
+
+	virtual int calculateSerializeBufferSize() const;
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+struct btGeneric6DofSpringConstraintData
+{
+	btGeneric6DofConstraintData m_6dofData;
+
+	int m_springEnabled[6];
+	float m_equilibriumPoint[6];
+	float m_springStiffness[6];
+	float m_springDamping[6];
+};
+
+struct btGeneric6DofSpringConstraintDoubleData2
+{
+	btGeneric6DofConstraintDoubleData2 m_6dofData;
+
+	int m_springEnabled[6];
+	double m_equilibriumPoint[6];
+	double m_springStiffness[6];
+	double m_springDamping[6];
+};
+
+SIMD_FORCE_INLINE int btGeneric6DofSpringConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btGeneric6DofSpringConstraintData2);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btGeneric6DofSpringConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btGeneric6DofSpringConstraintData2* dof = (btGeneric6DofSpringConstraintData2*)dataBuffer;
+	btGeneric6DofConstraint::serialize(&dof->m_6dofData, serializer);
+
+	int i;
+	for (i = 0; i < 6; i++)
+	{
+		dof->m_equilibriumPoint[i] = m_equilibriumPoint[i];
+		dof->m_springDamping[i] = m_springDamping[i];
+		dof->m_springEnabled[i] = m_springEnabled[i] ? 1 : 0;
+		dof->m_springStiffness[i] = m_springStiffness[i];
+	}
+	return btGeneric6DofSpringConstraintDataName;
+}
+
+#endif  // BT_GENERIC_6DOF_SPRING_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
new file mode 100644
index 0000000..6507e1a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
@@ -0,0 +1,61 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btHinge2Constraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+
+// constructor
+// anchor, axis1 and axis2 are in world coordinate system
+// axis1 must be orthogonal to axis2
+btHinge2Constraint::btHinge2Constraint(btRigidBody& rbA, btRigidBody& rbB, btVector3& anchor, btVector3& axis1, btVector3& axis2)
+	: btGeneric6DofSpring2Constraint(rbA, rbB, btTransform::getIdentity(), btTransform::getIdentity(), RO_XYZ),
+	  m_anchor(anchor),
+	  m_axis1(axis1),
+	  m_axis2(axis2)
+{
+	// build frame basis
+	// 6DOF constraint uses Euler angles and to define limits
+	// it is assumed that rotational order is :
+	// Z - first, allowed limits are (-PI,PI);
+	// new position of Y - second (allowed limits are (-PI/2 + epsilon, PI/2 - epsilon), where epsilon is a small positive number
+	// used to prevent constraint from instability on poles;
+	// new position of X, allowed limits are (-PI,PI);
+	// So to simulate ODE Universal joint we should use parent axis as Z, child axis as Y and limit all other DOFs
+	// Build the frame in world coordinate system first
+	btVector3 zAxis = axis1.normalize();
+	btVector3 xAxis = axis2.normalize();
+	btVector3 yAxis = zAxis.cross(xAxis);  // we want right coordinate system
+	btTransform frameInW;
+	frameInW.setIdentity();
+	frameInW.getBasis().setValue(xAxis[0], yAxis[0], zAxis[0],
+								 xAxis[1], yAxis[1], zAxis[1],
+								 xAxis[2], yAxis[2], zAxis[2]);
+	frameInW.setOrigin(anchor);
+	// now get constraint frame in local coordinate systems
+	m_frameInA = rbA.getCenterOfMassTransform().inverse() * frameInW;
+	m_frameInB = rbB.getCenterOfMassTransform().inverse() * frameInW;
+	// sei limits
+	setLinearLowerLimit(btVector3(0.f, 0.f, -1.f));
+	setLinearUpperLimit(btVector3(0.f, 0.f, 1.f));
+	// like front wheels of a car
+	setAngularLowerLimit(btVector3(1.f, 0.f, -SIMD_HALF_PI * 0.5f));
+	setAngularUpperLimit(btVector3(-1.f, 0.f, SIMD_HALF_PI * 0.5f));
+	// enable suspension
+	enableSpring(2, true);
+	setStiffness(2, SIMD_PI * SIMD_PI * 4.f);
+	setDamping(2, 0.01f);
+	setEquilibriumPoint();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
new file mode 100644
index 0000000..95f604a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
@@ -0,0 +1,55 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_HINGE2_CONSTRAINT_H
+#define BT_HINGE2_CONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "btTypedConstraint.h"
+#include "btGeneric6DofSpring2Constraint.h"
+
+// Constraint similar to ODE Hinge2 Joint
+// has 3 degrees of frredom:
+// 2 rotational degrees of freedom, similar to Euler rotations around Z (axis 1) and X (axis 2)
+// 1 translational (along axis Z) with suspension spring
+
+ATTRIBUTE_ALIGNED16(class)
+btHinge2Constraint : public btGeneric6DofSpring2Constraint
+{
+protected:
+	btVector3 m_anchor;
+	btVector3 m_axis1;
+	btVector3 m_axis2;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	// constructor
+	// anchor, axis1 and axis2 are in world coordinate system
+	// axis1 must be orthogonal to axis2
+	btHinge2Constraint(btRigidBody & rbA, btRigidBody & rbB, btVector3 & anchor, btVector3 & axis1, btVector3 & axis2);
+	// access
+	const btVector3& getAnchor() { return m_calculatedTransformA.getOrigin(); }
+	const btVector3& getAnchor2() { return m_calculatedTransformB.getOrigin(); }
+	const btVector3& getAxis1() { return m_axis1; }
+	const btVector3& getAxis2() { return m_axis2; }
+	btScalar getAngle1() { return getAngle(2); }
+	btScalar getAngle2() { return getAngle(0); }
+	// limits
+	void setUpperLimit(btScalar ang1max) { setAngularUpperLimit(btVector3(-1.f, 0.f, ang1max)); }
+	void setLowerLimit(btScalar ang1min) { setAngularLowerLimit(btVector3(1.f, 0.f, ang1min)); }
+};
+
+#endif  // BT_HINGE2_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
new file mode 100644
index 0000000..cb59e5a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
@@ -0,0 +1,1083 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btHingeConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btMinMax.h"
+#include <new>
+#include "btSolverBody.h"
+
+//#define HINGE_USE_OBSOLETE_SOLVER false
+#define HINGE_USE_OBSOLETE_SOLVER false
+
+#define HINGE_USE_FRAME_OFFSET true
+
+#ifndef __SPU__
+
+btHingeConstraint::btHingeConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& pivotInA, const btVector3& pivotInB,
+									 const btVector3& axisInA, const btVector3& axisInB, bool useReferenceFrameA)
+	: btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA, rbB),
+#ifdef _BT_USE_CENTER_LIMIT_
+	  m_limit(),
+#endif
+	  m_angularOnly(false),
+	  m_enableAngularMotor(false),
+	  m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
+	  m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
+	  m_useReferenceFrameA(useReferenceFrameA),
+	  m_flags(0),
+	  m_normalCFM(0),
+	  m_normalERP(0),
+	  m_stopCFM(0),
+	  m_stopERP(0)
+{
+	m_rbAFrame.getOrigin() = pivotInA;
+
+	// since no frame is given, assume this to be zero angle and just pick rb transform axis
+	btVector3 rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(0);
+
+	btVector3 rbAxisA2;
+	btScalar projection = axisInA.dot(rbAxisA1);
+	if (projection >= 1.0f - SIMD_EPSILON)
+	{
+		rbAxisA1 = -rbA.getCenterOfMassTransform().getBasis().getColumn(2);
+		rbAxisA2 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);
+	}
+	else if (projection <= -1.0f + SIMD_EPSILON)
+	{
+		rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(2);
+		rbAxisA2 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);
+	}
+	else
+	{
+		rbAxisA2 = axisInA.cross(rbAxisA1);
+		rbAxisA1 = rbAxisA2.cross(axisInA);
+	}
+
+	m_rbAFrame.getBasis().setValue(rbAxisA1.getX(), rbAxisA2.getX(), axisInA.getX(),
+								   rbAxisA1.getY(), rbAxisA2.getY(), axisInA.getY(),
+								   rbAxisA1.getZ(), rbAxisA2.getZ(), axisInA.getZ());
+
+	btQuaternion rotationArc = shortestArcQuat(axisInA, axisInB);
+	btVector3 rbAxisB1 = quatRotate(rotationArc, rbAxisA1);
+	btVector3 rbAxisB2 = axisInB.cross(rbAxisB1);
+
+	m_rbBFrame.getOrigin() = pivotInB;
+	m_rbBFrame.getBasis().setValue(rbAxisB1.getX(), rbAxisB2.getX(), axisInB.getX(),
+								   rbAxisB1.getY(), rbAxisB2.getY(), axisInB.getY(),
+								   rbAxisB1.getZ(), rbAxisB2.getZ(), axisInB.getZ());
+
+#ifndef _BT_USE_CENTER_LIMIT_
+	//start with free
+	m_lowerLimit = btScalar(1.0f);
+	m_upperLimit = btScalar(-1.0f);
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
+#endif
+	m_referenceSign = m_useReferenceFrameA ? btScalar(-1.f) : btScalar(1.f);
+}
+
+btHingeConstraint::btHingeConstraint(btRigidBody& rbA, const btVector3& pivotInA, const btVector3& axisInA, bool useReferenceFrameA)
+	: btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA),
+#ifdef _BT_USE_CENTER_LIMIT_
+	  m_limit(),
+#endif
+	  m_angularOnly(false),
+	  m_enableAngularMotor(false),
+	  m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
+	  m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
+	  m_useReferenceFrameA(useReferenceFrameA),
+	  m_flags(0),
+	  m_normalCFM(0),
+	  m_normalERP(0),
+	  m_stopCFM(0),
+	  m_stopERP(0)
+{
+	// since no frame is given, assume this to be zero angle and just pick rb transform axis
+	// fixed axis in worldspace
+	btVector3 rbAxisA1, rbAxisA2;
+	btPlaneSpace1(axisInA, rbAxisA1, rbAxisA2);
+
+	m_rbAFrame.getOrigin() = pivotInA;
+	m_rbAFrame.getBasis().setValue(rbAxisA1.getX(), rbAxisA2.getX(), axisInA.getX(),
+								   rbAxisA1.getY(), rbAxisA2.getY(), axisInA.getY(),
+								   rbAxisA1.getZ(), rbAxisA2.getZ(), axisInA.getZ());
+
+	btVector3 axisInB = rbA.getCenterOfMassTransform().getBasis() * axisInA;
+
+	btQuaternion rotationArc = shortestArcQuat(axisInA, axisInB);
+	btVector3 rbAxisB1 = quatRotate(rotationArc, rbAxisA1);
+	btVector3 rbAxisB2 = axisInB.cross(rbAxisB1);
+
+	m_rbBFrame.getOrigin() = rbA.getCenterOfMassTransform()(pivotInA);
+	m_rbBFrame.getBasis().setValue(rbAxisB1.getX(), rbAxisB2.getX(), axisInB.getX(),
+								   rbAxisB1.getY(), rbAxisB2.getY(), axisInB.getY(),
+								   rbAxisB1.getZ(), rbAxisB2.getZ(), axisInB.getZ());
+
+#ifndef _BT_USE_CENTER_LIMIT_
+	//start with free
+	m_lowerLimit = btScalar(1.0f);
+	m_upperLimit = btScalar(-1.0f);
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
+#endif
+	m_referenceSign = m_useReferenceFrameA ? btScalar(-1.f) : btScalar(1.f);
+}
+
+btHingeConstraint::btHingeConstraint(btRigidBody& rbA, btRigidBody& rbB,
+									 const btTransform& rbAFrame, const btTransform& rbBFrame, bool useReferenceFrameA)
+	: btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA, rbB), m_rbAFrame(rbAFrame), m_rbBFrame(rbBFrame),
+#ifdef _BT_USE_CENTER_LIMIT_
+	  m_limit(),
+#endif
+	  m_angularOnly(false),
+	  m_enableAngularMotor(false),
+	  m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
+	  m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
+	  m_useReferenceFrameA(useReferenceFrameA),
+	  m_flags(0),
+	  m_normalCFM(0),
+	  m_normalERP(0),
+	  m_stopCFM(0),
+	  m_stopERP(0)
+{
+#ifndef _BT_USE_CENTER_LIMIT_
+	//start with free
+	m_lowerLimit = btScalar(1.0f);
+	m_upperLimit = btScalar(-1.0f);
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
+#endif
+	m_referenceSign = m_useReferenceFrameA ? btScalar(-1.f) : btScalar(1.f);
+}
+
+btHingeConstraint::btHingeConstraint(btRigidBody& rbA, const btTransform& rbAFrame, bool useReferenceFrameA)
+	: btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA), m_rbAFrame(rbAFrame), m_rbBFrame(rbAFrame),
+#ifdef _BT_USE_CENTER_LIMIT_
+	  m_limit(),
+#endif
+	  m_angularOnly(false),
+	  m_enableAngularMotor(false),
+	  m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
+	  m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
+	  m_useReferenceFrameA(useReferenceFrameA),
+	  m_flags(0),
+	  m_normalCFM(0),
+	  m_normalERP(0),
+	  m_stopCFM(0),
+	  m_stopERP(0)
+{
+	///not providing rigidbody B means implicitly using worldspace for body B
+
+	m_rbBFrame.getOrigin() = m_rbA.getCenterOfMassTransform()(m_rbAFrame.getOrigin());
+#ifndef _BT_USE_CENTER_LIMIT_
+	//start with free
+	m_lowerLimit = btScalar(1.0f);
+	m_upperLimit = btScalar(-1.0f);
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
+#endif
+	m_referenceSign = m_useReferenceFrameA ? btScalar(-1.f) : btScalar(1.f);
+}
+
+void btHingeConstraint::buildJacobian()
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		m_appliedImpulse = btScalar(0.);
+		m_accMotorImpulse = btScalar(0.);
+
+		if (!m_angularOnly)
+		{
+			btVector3 pivotAInW = m_rbA.getCenterOfMassTransform() * m_rbAFrame.getOrigin();
+			btVector3 pivotBInW = m_rbB.getCenterOfMassTransform() * m_rbBFrame.getOrigin();
+			btVector3 relPos = pivotBInW - pivotAInW;
+
+			btVector3 normal[3];
+			if (relPos.length2() > SIMD_EPSILON)
+			{
+				normal[0] = relPos.normalized();
+			}
+			else
+			{
+				normal[0].setValue(btScalar(1.0), 0, 0);
+			}
+
+			btPlaneSpace1(normal[0], normal[1], normal[2]);
+
+			for (int i = 0; i < 3; i++)
+			{
+				new (&m_jac[i]) btJacobianEntry(
+					m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+					m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+					pivotAInW - m_rbA.getCenterOfMassPosition(),
+					pivotBInW - m_rbB.getCenterOfMassPosition(),
+					normal[i],
+					m_rbA.getInvInertiaDiagLocal(),
+					m_rbA.getInvMass(),
+					m_rbB.getInvInertiaDiagLocal(),
+					m_rbB.getInvMass());
+			}
+		}
+
+		//calculate two perpendicular jointAxis, orthogonal to hingeAxis
+		//these two jointAxis require equal angular velocities for both bodies
+
+		//this is unused for now, it's a todo
+		btVector3 jointAxis0local;
+		btVector3 jointAxis1local;
+
+		btPlaneSpace1(m_rbAFrame.getBasis().getColumn(2), jointAxis0local, jointAxis1local);
+
+		btVector3 jointAxis0 = getRigidBodyA().getCenterOfMassTransform().getBasis() * jointAxis0local;
+		btVector3 jointAxis1 = getRigidBodyA().getCenterOfMassTransform().getBasis() * jointAxis1local;
+		btVector3 hingeAxisWorld = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(2);
+
+		new (&m_jacAng[0]) btJacobianEntry(jointAxis0,
+										   m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+										   m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+										   m_rbA.getInvInertiaDiagLocal(),
+										   m_rbB.getInvInertiaDiagLocal());
+
+		new (&m_jacAng[1]) btJacobianEntry(jointAxis1,
+										   m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+										   m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+										   m_rbA.getInvInertiaDiagLocal(),
+										   m_rbB.getInvInertiaDiagLocal());
+
+		new (&m_jacAng[2]) btJacobianEntry(hingeAxisWorld,
+										   m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+										   m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+										   m_rbA.getInvInertiaDiagLocal(),
+										   m_rbB.getInvInertiaDiagLocal());
+
+		// clear accumulator
+		m_accLimitImpulse = btScalar(0.);
+
+		// test angular limit
+		testLimit(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+
+		//Compute K = J*W*J' for hinge axis
+		btVector3 axisA = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(2);
+		m_kHinge = 1.0f / (getRigidBodyA().computeAngularImpulseDenominator(axisA) +
+						   getRigidBodyB().computeAngularImpulseDenominator(axisA));
+	}
+}
+
+#endif  //__SPU__
+
+static inline btScalar btNormalizeAnglePositive(btScalar angle)
+{
+	return btFmod(btFmod(angle, btScalar(2.0 * SIMD_PI)) + btScalar(2.0 * SIMD_PI), btScalar(2.0 * SIMD_PI));
+}
+
+static btScalar btShortestAngularDistance(btScalar accAngle, btScalar curAngle)
+{
+	btScalar result = btNormalizeAngle(btNormalizeAnglePositive(btNormalizeAnglePositive(curAngle) -
+																btNormalizeAnglePositive(accAngle)));
+	return result;
+}
+
+static btScalar btShortestAngleUpdate(btScalar accAngle, btScalar curAngle)
+{
+	btScalar tol(0.3);
+	btScalar result = btShortestAngularDistance(accAngle, curAngle);
+
+	if (btFabs(result) > tol)
+		return curAngle;
+	else
+		return accAngle + result;
+
+	return curAngle;
+}
+
+btScalar btHingeAccumulatedAngleConstraint::getAccumulatedHingeAngle()
+{
+	btScalar hingeAngle = getHingeAngle();
+	m_accumulatedAngle = btShortestAngleUpdate(m_accumulatedAngle, hingeAngle);
+	return m_accumulatedAngle;
+}
+void btHingeAccumulatedAngleConstraint::setAccumulatedHingeAngle(btScalar accAngle)
+{
+	m_accumulatedAngle = accAngle;
+}
+
+void btHingeAccumulatedAngleConstraint::getInfo1(btConstraintInfo1* info)
+{
+	//update m_accumulatedAngle
+	btScalar curHingeAngle = getHingeAngle();
+	m_accumulatedAngle = btShortestAngleUpdate(m_accumulatedAngle, curHingeAngle);
+
+	btHingeConstraint::getInfo1(info);
+}
+
+void btHingeConstraint::getInfo1(btConstraintInfo1* info)
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		info->m_numConstraintRows = 0;
+		info->nub = 0;
+	}
+	else
+	{
+		info->m_numConstraintRows = 5;  // Fixed 3 linear + 2 angular
+		info->nub = 1;
+		//always add the row, to avoid computation (data is not available yet)
+		//prepare constraint
+		testLimit(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+		if (getSolveLimit() || getEnableAngularMotor())
+		{
+			info->m_numConstraintRows++;  // limit 3rd anguar as well
+			info->nub--;
+		}
+	}
+}
+
+void btHingeConstraint::getInfo1NonVirtual(btConstraintInfo1* info)
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		info->m_numConstraintRows = 0;
+		info->nub = 0;
+	}
+	else
+	{
+		//always add the 'limit' row, to avoid computation (data is not available yet)
+		info->m_numConstraintRows = 6;  // Fixed 3 linear + 2 angular
+		info->nub = 0;
+	}
+}
+
+void btHingeConstraint::getInfo2(btConstraintInfo2* info)
+{
+	if (m_useOffsetForConstraintFrame)
+	{
+		getInfo2InternalUsingFrameOffset(info, m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform(), m_rbA.getAngularVelocity(), m_rbB.getAngularVelocity());
+	}
+	else
+	{
+		getInfo2Internal(info, m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform(), m_rbA.getAngularVelocity(), m_rbB.getAngularVelocity());
+	}
+}
+
+void btHingeConstraint::getInfo2NonVirtual(btConstraintInfo2* info, const btTransform& transA, const btTransform& transB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	///the regular (virtual) implementation getInfo2 already performs 'testLimit' during getInfo1, so we need to do it now
+	testLimit(transA, transB);
+
+	getInfo2Internal(info, transA, transB, angVelA, angVelB);
+}
+
+void btHingeConstraint::getInfo2Internal(btConstraintInfo2* info, const btTransform& transA, const btTransform& transB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	btAssert(!m_useSolveConstraintObsolete);
+	int i, skip = info->rowskip;
+	// transforms in world space
+	btTransform trA = transA * m_rbAFrame;
+	btTransform trB = transB * m_rbBFrame;
+	// pivot point
+	btVector3 pivotAInW = trA.getOrigin();
+	btVector3 pivotBInW = trB.getOrigin();
+#if 0
+	if (0)
+	{
+		for (i=0;i<6;i++)
+		{
+			info->m_J1linearAxis[i*skip]=0;
+			info->m_J1linearAxis[i*skip+1]=0;
+			info->m_J1linearAxis[i*skip+2]=0;
+
+			info->m_J1angularAxis[i*skip]=0;
+			info->m_J1angularAxis[i*skip+1]=0;
+			info->m_J1angularAxis[i*skip+2]=0;
+
+			info->m_J2linearAxis[i*skip]=0;
+			info->m_J2linearAxis[i*skip+1]=0;
+			info->m_J2linearAxis[i*skip+2]=0;
+
+			info->m_J2angularAxis[i*skip]=0;
+			info->m_J2angularAxis[i*skip+1]=0;
+			info->m_J2angularAxis[i*skip+2]=0;
+
+			info->m_constraintError[i*skip]=0.f;
+		}
+	}
+#endif  //#if 0
+	// linear (all fixed)
+
+	if (!m_angularOnly)
+	{
+		info->m_J1linearAxis[0] = 1;
+		info->m_J1linearAxis[skip + 1] = 1;
+		info->m_J1linearAxis[2 * skip + 2] = 1;
+
+		info->m_J2linearAxis[0] = -1;
+		info->m_J2linearAxis[skip + 1] = -1;
+		info->m_J2linearAxis[2 * skip + 2] = -1;
+	}
+
+	btVector3 a1 = pivotAInW - transA.getOrigin();
+	{
+		btVector3* angular0 = (btVector3*)(info->m_J1angularAxis);
+		btVector3* angular1 = (btVector3*)(info->m_J1angularAxis + skip);
+		btVector3* angular2 = (btVector3*)(info->m_J1angularAxis + 2 * skip);
+		btVector3 a1neg = -a1;
+		a1neg.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+	btVector3 a2 = pivotBInW - transB.getOrigin();
+	{
+		btVector3* angular0 = (btVector3*)(info->m_J2angularAxis);
+		btVector3* angular1 = (btVector3*)(info->m_J2angularAxis + skip);
+		btVector3* angular2 = (btVector3*)(info->m_J2angularAxis + 2 * skip);
+		a2.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+	// linear RHS
+	btScalar normalErp = (m_flags & BT_HINGE_FLAGS_ERP_NORM) ? m_normalERP : info->erp;
+
+	btScalar k = info->fps * normalErp;
+	if (!m_angularOnly)
+	{
+		for (i = 0; i < 3; i++)
+		{
+			info->m_constraintError[i * skip] = k * (pivotBInW[i] - pivotAInW[i]);
+		}
+	}
+	// make rotations around X and Y equal
+	// the hinge axis should be the only unconstrained
+	// rotational axis, the angular velocity of the two bodies perpendicular to
+	// the hinge axis should be equal. thus the constraint equations are
+	//    p*w1 - p*w2 = 0
+	//    q*w1 - q*w2 = 0
+	// where p and q are unit vectors normal to the hinge axis, and w1 and w2
+	// are the angular velocity vectors of the two bodies.
+	// get hinge axis (Z)
+	btVector3 ax1 = trA.getBasis().getColumn(2);
+	// get 2 orthos to hinge axis (X, Y)
+	btVector3 p = trA.getBasis().getColumn(0);
+	btVector3 q = trA.getBasis().getColumn(1);
+	// set the two hinge angular rows
+	int s3 = 3 * info->rowskip;
+	int s4 = 4 * info->rowskip;
+
+	info->m_J1angularAxis[s3 + 0] = p[0];
+	info->m_J1angularAxis[s3 + 1] = p[1];
+	info->m_J1angularAxis[s3 + 2] = p[2];
+	info->m_J1angularAxis[s4 + 0] = q[0];
+	info->m_J1angularAxis[s4 + 1] = q[1];
+	info->m_J1angularAxis[s4 + 2] = q[2];
+
+	info->m_J2angularAxis[s3 + 0] = -p[0];
+	info->m_J2angularAxis[s3 + 1] = -p[1];
+	info->m_J2angularAxis[s3 + 2] = -p[2];
+	info->m_J2angularAxis[s4 + 0] = -q[0];
+	info->m_J2angularAxis[s4 + 1] = -q[1];
+	info->m_J2angularAxis[s4 + 2] = -q[2];
+	// compute the right hand side of the constraint equation. set relative
+	// body velocities along p and q to bring the hinge back into alignment.
+	// if ax1,ax2 are the unit length hinge axes as computed from body1 and
+	// body2, we need to rotate both bodies along the axis u = (ax1 x ax2).
+	// if `theta' is the angle between ax1 and ax2, we need an angular velocity
+	// along u to cover angle erp*theta in one step :
+	//   |angular_velocity| = angle/time = erp*theta / stepsize
+	//                      = (erp*fps) * theta
+	//    angular_velocity  = |angular_velocity| * (ax1 x ax2) / |ax1 x ax2|
+	//                      = (erp*fps) * theta * (ax1 x ax2) / sin(theta)
+	// ...as ax1 and ax2 are unit length. if theta is smallish,
+	// theta ~= sin(theta), so
+	//    angular_velocity  = (erp*fps) * (ax1 x ax2)
+	// ax1 x ax2 is in the plane space of ax1, so we project the angular
+	// velocity to p and q to find the right hand side.
+	btVector3 ax2 = trB.getBasis().getColumn(2);
+	btVector3 u = ax1.cross(ax2);
+	info->m_constraintError[s3] = k * u.dot(p);
+	info->m_constraintError[s4] = k * u.dot(q);
+	// check angular limits
+	int nrow = 4;  // last filled row
+	int srow;
+	btScalar limit_err = btScalar(0.0);
+	int limit = 0;
+	if (getSolveLimit())
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		limit_err = m_limit.getCorrection() * m_referenceSign;
+#else
+		limit_err = m_correction * m_referenceSign;
+#endif
+		limit = (limit_err > btScalar(0.0)) ? 1 : 2;
+	}
+	// if the hinge has joint limits or motor, add in the extra row
+	bool powered = getEnableAngularMotor();
+	if (limit || powered)
+	{
+		nrow++;
+		srow = nrow * info->rowskip;
+		info->m_J1angularAxis[srow + 0] = ax1[0];
+		info->m_J1angularAxis[srow + 1] = ax1[1];
+		info->m_J1angularAxis[srow + 2] = ax1[2];
+
+		info->m_J2angularAxis[srow + 0] = -ax1[0];
+		info->m_J2angularAxis[srow + 1] = -ax1[1];
+		info->m_J2angularAxis[srow + 2] = -ax1[2];
+
+		btScalar lostop = getLowerLimit();
+		btScalar histop = getUpperLimit();
+		if (limit && (lostop == histop))
+		{  // the joint motor is ineffective
+			powered = false;
+		}
+		info->m_constraintError[srow] = btScalar(0.0f);
+		btScalar currERP = (m_flags & BT_HINGE_FLAGS_ERP_STOP) ? m_stopERP : normalErp;
+		if (powered)
+		{
+			if (m_flags & BT_HINGE_FLAGS_CFM_NORM)
+			{
+				info->cfm[srow] = m_normalCFM;
+			}
+			btScalar mot_fact = getMotorFactor(m_hingeAngle, lostop, histop, m_motorTargetVelocity, info->fps * currERP);
+			info->m_constraintError[srow] += mot_fact * m_motorTargetVelocity * m_referenceSign;
+			info->m_lowerLimit[srow] = -m_maxMotorImpulse;
+			info->m_upperLimit[srow] = m_maxMotorImpulse;
+		}
+		if (limit)
+		{
+			k = info->fps * currERP;
+			info->m_constraintError[srow] += k * limit_err;
+			if (m_flags & BT_HINGE_FLAGS_CFM_STOP)
+			{
+				info->cfm[srow] = m_stopCFM;
+			}
+			if (lostop == histop)
+			{
+				// limited low and high simultaneously
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else if (limit == 1)
+			{  // low limit
+				info->m_lowerLimit[srow] = 0;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else
+			{  // high limit
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = 0;
+			}
+			// bounce (we'll use slider parameter abs(1.0 - m_dampingLimAng) for that)
+#ifdef _BT_USE_CENTER_LIMIT_
+			btScalar bounce = m_limit.getRelaxationFactor();
+#else
+			btScalar bounce = m_relaxationFactor;
+#endif
+			if (bounce > btScalar(0.0))
+			{
+				btScalar vel = angVelA.dot(ax1);
+				vel -= angVelB.dot(ax1);
+				// only apply bounce if the velocity is incoming, and if the
+				// resulting c[] exceeds what we already have.
+				if (limit == 1)
+				{  // low limit
+					if (vel < 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc > info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+				else
+				{  // high limit - all those computations are reversed
+					if (vel > 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc < info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+			}
+#ifdef _BT_USE_CENTER_LIMIT_
+			info->m_constraintError[srow] *= m_limit.getBiasFactor();
+#else
+			info->m_constraintError[srow] *= m_biasFactor;
+#endif
+		}  // if(limit)
+	}      // if angular limit or powered
+}
+
+void btHingeConstraint::setFrames(const btTransform& frameA, const btTransform& frameB)
+{
+	m_rbAFrame = frameA;
+	m_rbBFrame = frameB;
+	buildJacobian();
+}
+
+void btHingeConstraint::updateRHS(btScalar timeStep)
+{
+	(void)timeStep;
+}
+
+btScalar btHingeConstraint::getHingeAngle()
+{
+	return getHingeAngle(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+}
+
+btScalar btHingeConstraint::getHingeAngle(const btTransform& transA, const btTransform& transB)
+{
+	const btVector3 refAxis0 = transA.getBasis() * m_rbAFrame.getBasis().getColumn(0);
+	const btVector3 refAxis1 = transA.getBasis() * m_rbAFrame.getBasis().getColumn(1);
+	const btVector3 swingAxis = transB.getBasis() * m_rbBFrame.getBasis().getColumn(1);
+	//	btScalar angle = btAtan2Fast(swingAxis.dot(refAxis0), swingAxis.dot(refAxis1));
+	btScalar angle = btAtan2(swingAxis.dot(refAxis0), swingAxis.dot(refAxis1));
+	return m_referenceSign * angle;
+}
+
+void btHingeConstraint::testLimit(const btTransform& transA, const btTransform& transB)
+{
+	// Compute limit information
+	m_hingeAngle = getHingeAngle(transA, transB);
+#ifdef _BT_USE_CENTER_LIMIT_
+	m_limit.test(m_hingeAngle);
+#else
+	m_correction = btScalar(0.);
+	m_limitSign = btScalar(0.);
+	m_solveLimit = false;
+	if (m_lowerLimit <= m_upperLimit)
+	{
+		m_hingeAngle = btAdjustAngleToLimits(m_hingeAngle, m_lowerLimit, m_upperLimit);
+		if (m_hingeAngle <= m_lowerLimit)
+		{
+			m_correction = (m_lowerLimit - m_hingeAngle);
+			m_limitSign = 1.0f;
+			m_solveLimit = true;
+		}
+		else if (m_hingeAngle >= m_upperLimit)
+		{
+			m_correction = m_upperLimit - m_hingeAngle;
+			m_limitSign = -1.0f;
+			m_solveLimit = true;
+		}
+	}
+#endif
+	return;
+}
+
+static btVector3 vHinge(0, 0, btScalar(1));
+
+void btHingeConstraint::setMotorTarget(const btQuaternion& qAinB, btScalar dt)
+{
+	// convert target from body to constraint space
+	btQuaternion qConstraint = m_rbBFrame.getRotation().inverse() * qAinB * m_rbAFrame.getRotation();
+	qConstraint.normalize();
+
+	// extract "pure" hinge component
+	btVector3 vNoHinge = quatRotate(qConstraint, vHinge);
+	vNoHinge.normalize();
+	btQuaternion qNoHinge = shortestArcQuat(vHinge, vNoHinge);
+	btQuaternion qHinge = qNoHinge.inverse() * qConstraint;
+	qHinge.normalize();
+
+	// compute angular target, clamped to limits
+	btScalar targetAngle = qHinge.getAngle();
+	if (targetAngle > SIMD_PI)  // long way around. flip quat and recalculate.
+	{
+		qHinge = -(qHinge);
+		targetAngle = qHinge.getAngle();
+	}
+	if (qHinge.getZ() < 0)
+		targetAngle = -targetAngle;
+
+	setMotorTarget(targetAngle, dt);
+}
+
+void btHingeConstraint::setMotorTarget(btScalar targetAngle, btScalar dt)
+{
+#ifdef _BT_USE_CENTER_LIMIT_
+	m_limit.fit(targetAngle);
+#else
+	if (m_lowerLimit < m_upperLimit)
+	{
+		if (targetAngle < m_lowerLimit)
+			targetAngle = m_lowerLimit;
+		else if (targetAngle > m_upperLimit)
+			targetAngle = m_upperLimit;
+	}
+#endif
+	// compute angular velocity
+	btScalar curAngle = getHingeAngle(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+	btScalar dAngle = targetAngle - curAngle;
+	m_motorTargetVelocity = dAngle / dt;
+}
+
+void btHingeConstraint::getInfo2InternalUsingFrameOffset(btConstraintInfo2* info, const btTransform& transA, const btTransform& transB, const btVector3& angVelA, const btVector3& angVelB)
+{
+	btAssert(!m_useSolveConstraintObsolete);
+	int i, s = info->rowskip;
+	// transforms in world space
+	btTransform trA = transA * m_rbAFrame;
+	btTransform trB = transB * m_rbBFrame;
+	// pivot point
+//	btVector3 pivotAInW = trA.getOrigin();
+//	btVector3 pivotBInW = trB.getOrigin();
+#if 1
+	// difference between frames in WCS
+	btVector3 ofs = trB.getOrigin() - trA.getOrigin();
+	// now get weight factors depending on masses
+	btScalar miA = getRigidBodyA().getInvMass();
+	btScalar miB = getRigidBodyB().getInvMass();
+	bool hasStaticBody = (miA < SIMD_EPSILON) || (miB < SIMD_EPSILON);
+	btScalar miS = miA + miB;
+	btScalar factA, factB;
+	if (miS > btScalar(0.f))
+	{
+		factA = miB / miS;
+	}
+	else
+	{
+		factA = btScalar(0.5f);
+	}
+	factB = btScalar(1.0f) - factA;
+	// get the desired direction of hinge axis
+	// as weighted sum of Z-orthos of frameA and frameB in WCS
+	btVector3 ax1A = trA.getBasis().getColumn(2);
+	btVector3 ax1B = trB.getBasis().getColumn(2);
+	btVector3 ax1 = ax1A * factA + ax1B * factB;
+	if (ax1.length2()<SIMD_EPSILON)
+	{
+		factA=0.f;
+		factB=1.f;
+		ax1 = ax1A * factA + ax1B * factB;
+	}
+	ax1.normalize();
+	// fill first 3 rows
+	// we want: velA + wA x relA == velB + wB x relB
+	btTransform bodyA_trans = transA;
+	btTransform bodyB_trans = transB;
+	int s0 = 0;
+	int s1 = s;
+	int s2 = s * 2;
+	int nrow = 2;  // last filled row
+	btVector3 tmpA, tmpB, relA, relB, p, q;
+	// get vector from bodyB to frameB in WCS
+	relB = trB.getOrigin() - bodyB_trans.getOrigin();
+	// get its projection to hinge axis
+	btVector3 projB = ax1 * relB.dot(ax1);
+	// get vector directed from bodyB to hinge axis (and orthogonal to it)
+	btVector3 orthoB = relB - projB;
+	// same for bodyA
+	relA = trA.getOrigin() - bodyA_trans.getOrigin();
+	btVector3 projA = ax1 * relA.dot(ax1);
+	btVector3 orthoA = relA - projA;
+	btVector3 totalDist = projA - projB;
+	// get offset vectors relA and relB
+	relA = orthoA + totalDist * factA;
+	relB = orthoB - totalDist * factB;
+	// now choose average ortho to hinge axis
+	p = orthoB * factA + orthoA * factB;
+	btScalar len2 = p.length2();
+	if (len2 > SIMD_EPSILON)
+	{
+		p /= btSqrt(len2);
+	}
+	else
+	{
+		p = trA.getBasis().getColumn(1);
+	}
+	// make one more ortho
+	q = ax1.cross(p);
+	// fill three rows
+	tmpA = relA.cross(p);
+	tmpB = relB.cross(p);
+	for (i = 0; i < 3; i++) info->m_J1angularAxis[s0 + i] = tmpA[i];
+	for (i = 0; i < 3; i++) info->m_J2angularAxis[s0 + i] = -tmpB[i];
+	tmpA = relA.cross(q);
+	tmpB = relB.cross(q);
+	if (hasStaticBody && getSolveLimit())
+	{  // to make constraint between static and dynamic objects more rigid
+		// remove wA (or wB) from equation if angular limit is hit
+		tmpB *= factB;
+		tmpA *= factA;
+	}
+	for (i = 0; i < 3; i++) info->m_J1angularAxis[s1 + i] = tmpA[i];
+	for (i = 0; i < 3; i++) info->m_J2angularAxis[s1 + i] = -tmpB[i];
+	tmpA = relA.cross(ax1);
+	tmpB = relB.cross(ax1);
+	if (hasStaticBody)
+	{  // to make constraint between static and dynamic objects more rigid
+		// remove wA (or wB) from equation
+		tmpB *= factB;
+		tmpA *= factA;
+	}
+	for (i = 0; i < 3; i++) info->m_J1angularAxis[s2 + i] = tmpA[i];
+	for (i = 0; i < 3; i++) info->m_J2angularAxis[s2 + i] = -tmpB[i];
+
+	btScalar normalErp = (m_flags & BT_HINGE_FLAGS_ERP_NORM) ? m_normalERP : info->erp;
+	btScalar k = info->fps * normalErp;
+
+	if (!m_angularOnly)
+	{
+		for (i = 0; i < 3; i++) info->m_J1linearAxis[s0 + i] = p[i];
+		for (i = 0; i < 3; i++) info->m_J1linearAxis[s1 + i] = q[i];
+		for (i = 0; i < 3; i++) info->m_J1linearAxis[s2 + i] = ax1[i];
+
+		for (i = 0; i < 3; i++) info->m_J2linearAxis[s0 + i] = -p[i];
+		for (i = 0; i < 3; i++) info->m_J2linearAxis[s1 + i] = -q[i];
+		for (i = 0; i < 3; i++) info->m_J2linearAxis[s2 + i] = -ax1[i];
+
+		// compute three elements of right hand side
+
+		btScalar rhs = k * p.dot(ofs);
+		info->m_constraintError[s0] = rhs;
+		rhs = k * q.dot(ofs);
+		info->m_constraintError[s1] = rhs;
+		rhs = k * ax1.dot(ofs);
+		info->m_constraintError[s2] = rhs;
+	}
+	// the hinge axis should be the only unconstrained
+	// rotational axis, the angular velocity of the two bodies perpendicular to
+	// the hinge axis should be equal. thus the constraint equations are
+	//    p*w1 - p*w2 = 0
+	//    q*w1 - q*w2 = 0
+	// where p and q are unit vectors normal to the hinge axis, and w1 and w2
+	// are the angular velocity vectors of the two bodies.
+	int s3 = 3 * s;
+	int s4 = 4 * s;
+	info->m_J1angularAxis[s3 + 0] = p[0];
+	info->m_J1angularAxis[s3 + 1] = p[1];
+	info->m_J1angularAxis[s3 + 2] = p[2];
+	info->m_J1angularAxis[s4 + 0] = q[0];
+	info->m_J1angularAxis[s4 + 1] = q[1];
+	info->m_J1angularAxis[s4 + 2] = q[2];
+
+	info->m_J2angularAxis[s3 + 0] = -p[0];
+	info->m_J2angularAxis[s3 + 1] = -p[1];
+	info->m_J2angularAxis[s3 + 2] = -p[2];
+	info->m_J2angularAxis[s4 + 0] = -q[0];
+	info->m_J2angularAxis[s4 + 1] = -q[1];
+	info->m_J2angularAxis[s4 + 2] = -q[2];
+	// compute the right hand side of the constraint equation. set relative
+	// body velocities along p and q to bring the hinge back into alignment.
+	// if ax1A,ax1B are the unit length hinge axes as computed from bodyA and
+	// bodyB, we need to rotate both bodies along the axis u = (ax1 x ax2).
+	// if "theta" is the angle between ax1 and ax2, we need an angular velocity
+	// along u to cover angle erp*theta in one step :
+	//   |angular_velocity| = angle/time = erp*theta / stepsize
+	//                      = (erp*fps) * theta
+	//    angular_velocity  = |angular_velocity| * (ax1 x ax2) / |ax1 x ax2|
+	//                      = (erp*fps) * theta * (ax1 x ax2) / sin(theta)
+	// ...as ax1 and ax2 are unit length. if theta is smallish,
+	// theta ~= sin(theta), so
+	//    angular_velocity  = (erp*fps) * (ax1 x ax2)
+	// ax1 x ax2 is in the plane space of ax1, so we project the angular
+	// velocity to p and q to find the right hand side.
+	k = info->fps * normalErp;  //??
+
+	btVector3 u = ax1A.cross(ax1B);
+	info->m_constraintError[s3] = k * u.dot(p);
+	info->m_constraintError[s4] = k * u.dot(q);
+#endif
+	// check angular limits
+	nrow = 4;  // last filled row
+	int srow;
+	btScalar limit_err = btScalar(0.0);
+	int limit = 0;
+	if (getSolveLimit())
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		limit_err = m_limit.getCorrection() * m_referenceSign;
+#else
+		limit_err = m_correction * m_referenceSign;
+#endif
+		limit = (limit_err > btScalar(0.0)) ? 1 : 2;
+	}
+	// if the hinge has joint limits or motor, add in the extra row
+	bool powered = getEnableAngularMotor();
+	if (limit || powered)
+	{
+		nrow++;
+		srow = nrow * info->rowskip;
+		info->m_J1angularAxis[srow + 0] = ax1[0];
+		info->m_J1angularAxis[srow + 1] = ax1[1];
+		info->m_J1angularAxis[srow + 2] = ax1[2];
+
+		info->m_J2angularAxis[srow + 0] = -ax1[0];
+		info->m_J2angularAxis[srow + 1] = -ax1[1];
+		info->m_J2angularAxis[srow + 2] = -ax1[2];
+
+		btScalar lostop = getLowerLimit();
+		btScalar histop = getUpperLimit();
+		if (limit && (lostop == histop))
+		{  // the joint motor is ineffective
+			powered = false;
+		}
+		info->m_constraintError[srow] = btScalar(0.0f);
+		btScalar currERP = (m_flags & BT_HINGE_FLAGS_ERP_STOP) ? m_stopERP : normalErp;
+		if (powered)
+		{
+			if (m_flags & BT_HINGE_FLAGS_CFM_NORM)
+			{
+				info->cfm[srow] = m_normalCFM;
+			}
+			btScalar mot_fact = getMotorFactor(m_hingeAngle, lostop, histop, m_motorTargetVelocity, info->fps * currERP);
+			info->m_constraintError[srow] += mot_fact * m_motorTargetVelocity * m_referenceSign;
+			info->m_lowerLimit[srow] = -m_maxMotorImpulse;
+			info->m_upperLimit[srow] = m_maxMotorImpulse;
+		}
+		if (limit)
+		{
+			k = info->fps * currERP;
+			info->m_constraintError[srow] += k * limit_err;
+			if (m_flags & BT_HINGE_FLAGS_CFM_STOP)
+			{
+				info->cfm[srow] = m_stopCFM;
+			}
+			if (lostop == histop)
+			{
+				// limited low and high simultaneously
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else if (limit == 1)
+			{  // low limit
+				info->m_lowerLimit[srow] = 0;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else
+			{  // high limit
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = 0;
+			}
+			// bounce (we'll use slider parameter abs(1.0 - m_dampingLimAng) for that)
+#ifdef _BT_USE_CENTER_LIMIT_
+			btScalar bounce = m_limit.getRelaxationFactor();
+#else
+			btScalar bounce = m_relaxationFactor;
+#endif
+			if (bounce > btScalar(0.0))
+			{
+				btScalar vel = angVelA.dot(ax1);
+				vel -= angVelB.dot(ax1);
+				// only apply bounce if the velocity is incoming, and if the
+				// resulting c[] exceeds what we already have.
+				if (limit == 1)
+				{  // low limit
+					if (vel < 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc > info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+				else
+				{  // high limit - all those computations are reversed
+					if (vel > 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc < info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+			}
+#ifdef _BT_USE_CENTER_LIMIT_
+			info->m_constraintError[srow] *= m_limit.getBiasFactor();
+#else
+			info->m_constraintError[srow] *= m_biasFactor;
+#endif
+		}  // if(limit)
+	}      // if angular limit or powered
+}
+
+///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+///If no axis is provided, it uses the default axis for this constraint.
+void btHingeConstraint::setParam(int num, btScalar value, int axis)
+{
+	if ((axis == -1) || (axis == 5))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				m_stopERP = value;
+				m_flags |= BT_HINGE_FLAGS_ERP_STOP;
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				m_stopCFM = value;
+				m_flags |= BT_HINGE_FLAGS_CFM_STOP;
+				break;
+			case BT_CONSTRAINT_CFM:
+				m_normalCFM = value;
+				m_flags |= BT_HINGE_FLAGS_CFM_NORM;
+				break;
+			case BT_CONSTRAINT_ERP:
+				m_normalERP = value;
+				m_flags |= BT_HINGE_FLAGS_ERP_NORM;
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else
+	{
+		btAssertConstrParams(0);
+	}
+}
+
+///return the local value of parameter
+btScalar btHingeConstraint::getParam(int num, int axis) const
+{
+	btScalar retVal = 0;
+	if ((axis == -1) || (axis == 5))
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_STOP_ERP:
+				btAssertConstrParams(m_flags & BT_HINGE_FLAGS_ERP_STOP);
+				retVal = m_stopERP;
+				break;
+			case BT_CONSTRAINT_STOP_CFM:
+				btAssertConstrParams(m_flags & BT_HINGE_FLAGS_CFM_STOP);
+				retVal = m_stopCFM;
+				break;
+			case BT_CONSTRAINT_CFM:
+				btAssertConstrParams(m_flags & BT_HINGE_FLAGS_CFM_NORM);
+				retVal = m_normalCFM;
+				break;
+			case BT_CONSTRAINT_ERP:
+				btAssertConstrParams(m_flags & BT_HINGE_FLAGS_ERP_NORM);
+				retVal = m_normalERP;
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	else
+	{
+		btAssertConstrParams(0);
+	}
+	return retVal;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
new file mode 100644
index 0000000..8b1f1af
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
@@ -0,0 +1,480 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Hinge Constraint by Dirk Gregorius. Limits added by Marcus Hennix at Starbreeze Studios */
+
+#ifndef BT_HINGECONSTRAINT_H
+#define BT_HINGECONSTRAINT_H
+
+#define _BT_USE_CENTER_LIMIT_ 1
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+
+class btRigidBody;
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btHingeConstraintData btHingeConstraintDoubleData2  //rename to 2 for backwards compatibility, so we can still load the 'btHingeConstraintDoubleData' version
+#define btHingeConstraintDataName "btHingeConstraintDoubleData2"
+#else
+#define btHingeConstraintData btHingeConstraintFloatData
+#define btHingeConstraintDataName "btHingeConstraintFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+enum btHingeFlags
+{
+	BT_HINGE_FLAGS_CFM_STOP = 1,
+	BT_HINGE_FLAGS_ERP_STOP = 2,
+	BT_HINGE_FLAGS_CFM_NORM = 4,
+	BT_HINGE_FLAGS_ERP_NORM = 8
+};
+
+/// hinge constraint between two rigidbodies each with a pivotpoint that descibes the axis location in local space
+/// axis defines the orientation of the hinge axis
+ATTRIBUTE_ALIGNED16(class)
+btHingeConstraint : public btTypedConstraint
+{
+#ifdef IN_PARALLELL_SOLVER
+public:
+#endif
+	btJacobianEntry m_jac[3];     //3 orthogonal linear constraints
+	btJacobianEntry m_jacAng[3];  //2 orthogonal angular constraints+ 1 for limit/motor
+
+	btTransform m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransform m_rbBFrame;
+
+	btScalar m_motorTargetVelocity;
+	btScalar m_maxMotorImpulse;
+
+#ifdef _BT_USE_CENTER_LIMIT_
+	btAngularLimit m_limit;
+#else
+	btScalar m_lowerLimit;
+	btScalar m_upperLimit;
+	btScalar m_limitSign;
+	btScalar m_correction;
+
+	btScalar m_limitSoftness;
+	btScalar m_biasFactor;
+	btScalar m_relaxationFactor;
+
+	bool m_solveLimit;
+#endif
+
+	btScalar m_kHinge;
+
+	btScalar m_accLimitImpulse;
+	btScalar m_hingeAngle;
+	btScalar m_referenceSign;
+
+	bool m_angularOnly;
+	bool m_enableAngularMotor;
+	bool m_useSolveConstraintObsolete;
+	bool m_useOffsetForConstraintFrame;
+	bool m_useReferenceFrameA;
+
+	btScalar m_accMotorImpulse;
+
+	int m_flags;
+	btScalar m_normalCFM;
+	btScalar m_normalERP;
+	btScalar m_stopCFM;
+	btScalar m_stopERP;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btHingeConstraint(btRigidBody & rbA, btRigidBody & rbB, const btVector3& pivotInA, const btVector3& pivotInB, const btVector3& axisInA, const btVector3& axisInB, bool useReferenceFrameA = false);
+
+	btHingeConstraint(btRigidBody & rbA, const btVector3& pivotInA, const btVector3& axisInA, bool useReferenceFrameA = false);
+
+	btHingeConstraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& rbAFrame, const btTransform& rbBFrame, bool useReferenceFrameA = false);
+
+	btHingeConstraint(btRigidBody & rbA, const btTransform& rbAFrame, bool useReferenceFrameA = false);
+
+	virtual void buildJacobian();
+
+	virtual void getInfo1(btConstraintInfo1 * info);
+
+	void getInfo1NonVirtual(btConstraintInfo1 * info);
+
+	virtual void getInfo2(btConstraintInfo2 * info);
+
+	void getInfo2NonVirtual(btConstraintInfo2 * info, const btTransform& transA, const btTransform& transB, const btVector3& angVelA, const btVector3& angVelB);
+
+	void getInfo2Internal(btConstraintInfo2 * info, const btTransform& transA, const btTransform& transB, const btVector3& angVelA, const btVector3& angVelB);
+	void getInfo2InternalUsingFrameOffset(btConstraintInfo2 * info, const btTransform& transA, const btTransform& transB, const btVector3& angVelA, const btVector3& angVelB);
+
+	void updateRHS(btScalar timeStep);
+
+	const btRigidBody& getRigidBodyA() const
+	{
+		return m_rbA;
+	}
+	const btRigidBody& getRigidBodyB() const
+	{
+		return m_rbB;
+	}
+
+	btRigidBody& getRigidBodyA()
+	{
+		return m_rbA;
+	}
+
+	btRigidBody& getRigidBodyB()
+	{
+		return m_rbB;
+	}
+
+	btTransform& getFrameOffsetA()
+	{
+		return m_rbAFrame;
+	}
+
+	btTransform& getFrameOffsetB()
+	{
+		return m_rbBFrame;
+	}
+
+	void setFrames(const btTransform& frameA, const btTransform& frameB);
+
+	void setAngularOnly(bool angularOnly)
+	{
+		m_angularOnly = angularOnly;
+	}
+
+	void enableAngularMotor(bool enableMotor, btScalar targetVelocity, btScalar maxMotorImpulse)
+	{
+		m_enableAngularMotor = enableMotor;
+		m_motorTargetVelocity = targetVelocity;
+		m_maxMotorImpulse = maxMotorImpulse;
+	}
+
+	// extra motor API, including ability to set a target rotation (as opposed to angular velocity)
+	// note: setMotorTarget sets angular velocity under the hood, so you must call it every tick to
+	//       maintain a given angular target.
+	void enableMotor(bool enableMotor) { m_enableAngularMotor = enableMotor; }
+	void setMaxMotorImpulse(btScalar maxMotorImpulse) { m_maxMotorImpulse = maxMotorImpulse; }
+	void setMotorTargetVelocity(btScalar motorTargetVelocity) { m_motorTargetVelocity = motorTargetVelocity; }
+	void setMotorTarget(const btQuaternion& qAinB, btScalar dt);  // qAinB is rotation of body A wrt body B.
+	void setMotorTarget(btScalar targetAngle, btScalar dt);
+
+	void setLimit(btScalar low, btScalar high, btScalar _softness = 0.9f, btScalar _biasFactor = 0.3f, btScalar _relaxationFactor = 1.0f)
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		m_limit.set(low, high, _softness, _biasFactor, _relaxationFactor);
+#else
+		m_lowerLimit = btNormalizeAngle(low);
+		m_upperLimit = btNormalizeAngle(high);
+		m_limitSoftness = _softness;
+		m_biasFactor = _biasFactor;
+		m_relaxationFactor = _relaxationFactor;
+#endif
+	}
+
+	btScalar getLimitSoftness() const
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.getSoftness();
+#else
+		return m_limitSoftness;
+#endif
+	}
+
+	btScalar getLimitBiasFactor() const
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.getBiasFactor();
+#else
+		return m_biasFactor;
+#endif
+	}
+
+	btScalar getLimitRelaxationFactor() const
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.getRelaxationFactor();
+#else
+		return m_relaxationFactor;
+#endif
+	}
+
+	void setAxis(btVector3 & axisInA)
+	{
+		btVector3 rbAxisA1, rbAxisA2;
+		btPlaneSpace1(axisInA, rbAxisA1, rbAxisA2);
+		btVector3 pivotInA = m_rbAFrame.getOrigin();
+		//		m_rbAFrame.getOrigin() = pivotInA;
+		m_rbAFrame.getBasis().setValue(rbAxisA1.getX(), rbAxisA2.getX(), axisInA.getX(),
+									   rbAxisA1.getY(), rbAxisA2.getY(), axisInA.getY(),
+									   rbAxisA1.getZ(), rbAxisA2.getZ(), axisInA.getZ());
+
+		btVector3 axisInB = m_rbA.getCenterOfMassTransform().getBasis() * axisInA;
+
+		btQuaternion rotationArc = shortestArcQuat(axisInA, axisInB);
+		btVector3 rbAxisB1 = quatRotate(rotationArc, rbAxisA1);
+		btVector3 rbAxisB2 = axisInB.cross(rbAxisB1);
+
+		m_rbBFrame.getOrigin() = m_rbB.getCenterOfMassTransform().inverse()(m_rbA.getCenterOfMassTransform()(pivotInA));
+
+		m_rbBFrame.getBasis().setValue(rbAxisB1.getX(), rbAxisB2.getX(), axisInB.getX(),
+									   rbAxisB1.getY(), rbAxisB2.getY(), axisInB.getY(),
+									   rbAxisB1.getZ(), rbAxisB2.getZ(), axisInB.getZ());
+		m_rbBFrame.getBasis() = m_rbB.getCenterOfMassTransform().getBasis().inverse() * m_rbBFrame.getBasis();
+	}
+
+	bool hasLimit() const
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.getHalfRange() > 0;
+#else
+		return m_lowerLimit <= m_upperLimit;
+#endif
+	}
+
+	btScalar getLowerLimit() const
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.getLow();
+#else
+		return m_lowerLimit;
+#endif
+	}
+
+	btScalar getUpperLimit() const
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.getHigh();
+#else
+		return m_upperLimit;
+#endif
+	}
+
+	///The getHingeAngle gives the hinge angle in range [-PI,PI]
+	btScalar getHingeAngle();
+
+	btScalar getHingeAngle(const btTransform& transA, const btTransform& transB);
+
+	void testLimit(const btTransform& transA, const btTransform& transB);
+
+	const btTransform& getAFrame() const { return m_rbAFrame; };
+	const btTransform& getBFrame() const { return m_rbBFrame; };
+
+	btTransform& getAFrame() { return m_rbAFrame; };
+	btTransform& getBFrame() { return m_rbBFrame; };
+
+	inline int getSolveLimit()
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.isLimit();
+#else
+		return m_solveLimit;
+#endif
+	}
+
+	inline btScalar getLimitSign()
+	{
+#ifdef _BT_USE_CENTER_LIMIT_
+		return m_limit.getSign();
+#else
+		return m_limitSign;
+#endif
+	}
+
+	inline bool getAngularOnly()
+	{
+		return m_angularOnly;
+	}
+	inline bool getEnableAngularMotor()
+	{
+		return m_enableAngularMotor;
+	}
+	inline btScalar getMotorTargetVelocity()
+	{
+		return m_motorTargetVelocity;
+	}
+	inline btScalar getMaxMotorImpulse()
+	{
+		return m_maxMotorImpulse;
+	}
+	// access for UseFrameOffset
+	bool getUseFrameOffset() { return m_useOffsetForConstraintFrame; }
+	void setUseFrameOffset(bool frameOffsetOnOff) { m_useOffsetForConstraintFrame = frameOffsetOnOff; }
+	// access for UseReferenceFrameA
+	bool getUseReferenceFrameA() const { return m_useReferenceFrameA; }
+	void setUseReferenceFrameA(bool useReferenceFrameA) { m_useReferenceFrameA = useReferenceFrameA; }
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, btScalar value, int axis = -1);
+	///return the local value of parameter
+	virtual btScalar getParam(int num, int axis = -1) const;
+
+	virtual int getFlags() const
+	{
+		return m_flags;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+//only for backward compatibility
+#ifdef BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+///this structure is not used, except for loading pre-2.82 .bullet files
+struct btHingeConstraintDoubleData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btTransformDoubleData m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransformDoubleData m_rbBFrame;
+	int m_useReferenceFrameA;
+	int m_angularOnly;
+	int m_enableAngularMotor;
+	float m_motorTargetVelocity;
+	float m_maxMotorImpulse;
+
+	float m_lowerLimit;
+	float m_upperLimit;
+	float m_limitSoftness;
+	float m_biasFactor;
+	float m_relaxationFactor;
+};
+#endif  //BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+
+///The getAccumulatedHingeAngle returns the accumulated hinge angle, taking rotation across the -PI/PI boundary into account
+ATTRIBUTE_ALIGNED16(class)
+btHingeAccumulatedAngleConstraint : public btHingeConstraint
+{
+protected:
+	btScalar m_accumulatedAngle;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btHingeAccumulatedAngleConstraint(btRigidBody & rbA, btRigidBody & rbB, const btVector3& pivotInA, const btVector3& pivotInB, const btVector3& axisInA, const btVector3& axisInB, bool useReferenceFrameA = false)
+		: btHingeConstraint(rbA, rbB, pivotInA, pivotInB, axisInA, axisInB, useReferenceFrameA)
+	{
+		m_accumulatedAngle = getHingeAngle();
+	}
+
+	btHingeAccumulatedAngleConstraint(btRigidBody & rbA, const btVector3& pivotInA, const btVector3& axisInA, bool useReferenceFrameA = false)
+		: btHingeConstraint(rbA, pivotInA, axisInA, useReferenceFrameA)
+	{
+		m_accumulatedAngle = getHingeAngle();
+	}
+
+	btHingeAccumulatedAngleConstraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& rbAFrame, const btTransform& rbBFrame, bool useReferenceFrameA = false)
+		: btHingeConstraint(rbA, rbB, rbAFrame, rbBFrame, useReferenceFrameA)
+	{
+		m_accumulatedAngle = getHingeAngle();
+	}
+
+	btHingeAccumulatedAngleConstraint(btRigidBody & rbA, const btTransform& rbAFrame, bool useReferenceFrameA = false)
+		: btHingeConstraint(rbA, rbAFrame, useReferenceFrameA)
+	{
+		m_accumulatedAngle = getHingeAngle();
+	}
+	btScalar getAccumulatedHingeAngle();
+	void setAccumulatedHingeAngle(btScalar accAngle);
+	virtual void getInfo1(btConstraintInfo1 * info);
+};
+
+struct btHingeConstraintFloatData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btTransformFloatData m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransformFloatData m_rbBFrame;
+	int m_useReferenceFrameA;
+	int m_angularOnly;
+
+	int m_enableAngularMotor;
+	float m_motorTargetVelocity;
+	float m_maxMotorImpulse;
+
+	float m_lowerLimit;
+	float m_upperLimit;
+	float m_limitSoftness;
+	float m_biasFactor;
+	float m_relaxationFactor;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btHingeConstraintDoubleData2
+{
+	btTypedConstraintDoubleData m_typeConstraintData;
+	btTransformDoubleData m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransformDoubleData m_rbBFrame;
+	int m_useReferenceFrameA;
+	int m_angularOnly;
+	int m_enableAngularMotor;
+	double m_motorTargetVelocity;
+	double m_maxMotorImpulse;
+
+	double m_lowerLimit;
+	double m_upperLimit;
+	double m_limitSoftness;
+	double m_biasFactor;
+	double m_relaxationFactor;
+	char m_padding1[4];
+};
+
+SIMD_FORCE_INLINE int btHingeConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btHingeConstraintData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btHingeConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btHingeConstraintData* hingeData = (btHingeConstraintData*)dataBuffer;
+	btTypedConstraint::serialize(&hingeData->m_typeConstraintData, serializer);
+
+	m_rbAFrame.serialize(hingeData->m_rbAFrame);
+	m_rbBFrame.serialize(hingeData->m_rbBFrame);
+
+	hingeData->m_angularOnly = m_angularOnly;
+	hingeData->m_enableAngularMotor = m_enableAngularMotor;
+	hingeData->m_maxMotorImpulse = float(m_maxMotorImpulse);
+	hingeData->m_motorTargetVelocity = float(m_motorTargetVelocity);
+	hingeData->m_useReferenceFrameA = m_useReferenceFrameA;
+#ifdef _BT_USE_CENTER_LIMIT_
+	hingeData->m_lowerLimit = float(m_limit.getLow());
+	hingeData->m_upperLimit = float(m_limit.getHigh());
+	hingeData->m_limitSoftness = float(m_limit.getSoftness());
+	hingeData->m_biasFactor = float(m_limit.getBiasFactor());
+	hingeData->m_relaxationFactor = float(m_limit.getRelaxationFactor());
+#else
+	hingeData->m_lowerLimit = float(m_lowerLimit);
+	hingeData->m_upperLimit = float(m_upperLimit);
+	hingeData->m_limitSoftness = float(m_limitSoftness);
+	hingeData->m_biasFactor = float(m_biasFactor);
+	hingeData->m_relaxationFactor = float(m_relaxationFactor);
+#endif
+
+	// Fill padding with zeros to appease msan.
+#ifdef BT_USE_DOUBLE_PRECISION
+	hingeData->m_padding1[0] = 0;
+	hingeData->m_padding1[1] = 0;
+	hingeData->m_padding1[2] = 0;
+	hingeData->m_padding1[3] = 0;
+#endif
+
+	return btHingeConstraintDataName;
+}
+
+#endif  //BT_HINGECONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
new file mode 100644
index 0000000..a251073
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
@@ -0,0 +1,150 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_JACOBIAN_ENTRY_H
+#define BT_JACOBIAN_ENTRY_H
+
+#include "LinearMath/btMatrix3x3.h"
+
+//notes:
+// Another memory optimization would be to store m_1MinvJt in the remaining 3 w components
+// which makes the btJacobianEntry memory layout 16 bytes
+// if you only are interested in angular part, just feed massInvA and massInvB zero
+
+/// Jacobian entry is an abstraction that allows to describe constraints
+/// it can be used in combination with a constraint solver
+/// Can be used to relate the effect of an impulse to the constraint error
+ATTRIBUTE_ALIGNED16(class)
+btJacobianEntry
+{
+public:
+	btJacobianEntry(){};
+	//constraint between two different rigidbodies
+	btJacobianEntry(
+		const btMatrix3x3& world2A,
+		const btMatrix3x3& world2B,
+		const btVector3& rel_pos1, const btVector3& rel_pos2,
+		const btVector3& jointAxis,
+		const btVector3& inertiaInvA,
+		const btScalar massInvA,
+		const btVector3& inertiaInvB,
+		const btScalar massInvB)
+		: m_linearJointAxis(jointAxis)
+	{
+		m_aJ = world2A * (rel_pos1.cross(m_linearJointAxis));
+		m_bJ = world2B * (rel_pos2.cross(-m_linearJointAxis));
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = inertiaInvB * m_bJ;
+		m_Adiag = massInvA + m_0MinvJt.dot(m_aJ) + massInvB + m_1MinvJt.dot(m_bJ);
+
+		btAssert(m_Adiag > btScalar(0.0));
+	}
+
+	//angular constraint between two different rigidbodies
+	btJacobianEntry(const btVector3& jointAxis,
+					const btMatrix3x3& world2A,
+					const btMatrix3x3& world2B,
+					const btVector3& inertiaInvA,
+					const btVector3& inertiaInvB)
+		: m_linearJointAxis(btVector3(btScalar(0.), btScalar(0.), btScalar(0.)))
+	{
+		m_aJ = world2A * jointAxis;
+		m_bJ = world2B * -jointAxis;
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = inertiaInvB * m_bJ;
+		m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ);
+
+		btAssert(m_Adiag > btScalar(0.0));
+	}
+
+	//angular constraint between two different rigidbodies
+	btJacobianEntry(const btVector3& axisInA,
+					const btVector3& axisInB,
+					const btVector3& inertiaInvA,
+					const btVector3& inertiaInvB)
+		: m_linearJointAxis(btVector3(btScalar(0.), btScalar(0.), btScalar(0.))), m_aJ(axisInA), m_bJ(-axisInB)
+	{
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = inertiaInvB * m_bJ;
+		m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ);
+
+		btAssert(m_Adiag > btScalar(0.0));
+	}
+
+	//constraint on one rigidbody
+	btJacobianEntry(
+		const btMatrix3x3& world2A,
+		const btVector3& rel_pos1, const btVector3& rel_pos2,
+		const btVector3& jointAxis,
+		const btVector3& inertiaInvA,
+		const btScalar massInvA)
+		: m_linearJointAxis(jointAxis)
+	{
+		m_aJ = world2A * (rel_pos1.cross(jointAxis));
+		m_bJ = world2A * (rel_pos2.cross(-jointAxis));
+		m_0MinvJt = inertiaInvA * m_aJ;
+		m_1MinvJt = btVector3(btScalar(0.), btScalar(0.), btScalar(0.));
+		m_Adiag = massInvA + m_0MinvJt.dot(m_aJ);
+
+		btAssert(m_Adiag > btScalar(0.0));
+	}
+
+	btScalar getDiagonal() const { return m_Adiag; }
+
+	// for two constraints on the same rigidbody (for example vehicle friction)
+	btScalar getNonDiagonal(const btJacobianEntry& jacB, const btScalar massInvA) const
+	{
+		const btJacobianEntry& jacA = *this;
+		btScalar lin = massInvA * jacA.m_linearJointAxis.dot(jacB.m_linearJointAxis);
+		btScalar ang = jacA.m_0MinvJt.dot(jacB.m_aJ);
+		return lin + ang;
+	}
+
+	// for two constraints on sharing two same rigidbodies (for example two contact points between two rigidbodies)
+	btScalar getNonDiagonal(const btJacobianEntry& jacB, const btScalar massInvA, const btScalar massInvB) const
+	{
+		const btJacobianEntry& jacA = *this;
+		btVector3 lin = jacA.m_linearJointAxis * jacB.m_linearJointAxis;
+		btVector3 ang0 = jacA.m_0MinvJt * jacB.m_aJ;
+		btVector3 ang1 = jacA.m_1MinvJt * jacB.m_bJ;
+		btVector3 lin0 = massInvA * lin;
+		btVector3 lin1 = massInvB * lin;
+		btVector3 sum = ang0 + ang1 + lin0 + lin1;
+		return sum[0] + sum[1] + sum[2];
+	}
+
+	btScalar getRelativeVelocity(const btVector3& linvelA, const btVector3& angvelA, const btVector3& linvelB, const btVector3& angvelB)
+	{
+		btVector3 linrel = linvelA - linvelB;
+		btVector3 angvela = angvelA * m_aJ;
+		btVector3 angvelb = angvelB * m_bJ;
+		linrel *= m_linearJointAxis;
+		angvela += angvelb;
+		angvela += linrel;
+		btScalar rel_vel2 = angvela[0] + angvela[1] + angvela[2];
+		return rel_vel2 + SIMD_EPSILON;
+	}
+	//private:
+
+	btVector3 m_linearJointAxis;
+	btVector3 m_aJ;
+	btVector3 m_bJ;
+	btVector3 m_0MinvJt;
+	btVector3 m_1MinvJt;
+	//Optimization: can be stored in the w/last component of one of the vectors
+	btScalar m_Adiag;
+};
+
+#endif  //BT_JACOBIAN_ENTRY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp
new file mode 100644
index 0000000..454adc8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp
@@ -0,0 +1,368 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btNNCGConstraintSolver.h"
+
+btScalar btNNCGConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	btScalar val = btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+	m_pNC.resizeNoInitialize(m_tmpSolverNonContactConstraintPool.size());
+	m_pC.resizeNoInitialize(m_tmpSolverContactConstraintPool.size());
+	m_pCF.resizeNoInitialize(m_tmpSolverContactFrictionConstraintPool.size());
+	m_pCRF.resizeNoInitialize(m_tmpSolverContactRollingFrictionConstraintPool.size());
+
+	m_deltafNC.resizeNoInitialize(m_tmpSolverNonContactConstraintPool.size());
+	m_deltafC.resizeNoInitialize(m_tmpSolverContactConstraintPool.size());
+	m_deltafCF.resizeNoInitialize(m_tmpSolverContactFrictionConstraintPool.size());
+	m_deltafCRF.resizeNoInitialize(m_tmpSolverContactRollingFrictionConstraintPool.size());
+
+	return val;
+}
+
+btScalar btNNCGConstraintSolver::solveSingleIteration(int iteration, btCollisionObject** /*bodies */, int /*numBodies*/, btPersistentManifold** /*manifoldPtr*/, int /*numManifolds*/, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* /*debugDrawer*/)
+{
+	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
+	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
+	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
+
+	if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
+	{
+		if (1)  // uncomment this for a bit less random ((iteration & 7) == 0)
+		{
+			for (int j = 0; j < numNonContactPool; ++j)
+			{
+				int tmp = m_orderNonContactConstraintPool[j];
+				int swapi = btRandInt2(j + 1);
+				m_orderNonContactConstraintPool[j] = m_orderNonContactConstraintPool[swapi];
+				m_orderNonContactConstraintPool[swapi] = tmp;
+			}
+
+			//contact/friction constraints are not solved more than
+			if (iteration < infoGlobal.m_numIterations)
+			{
+				for (int j = 0; j < numConstraintPool; ++j)
+				{
+					int tmp = m_orderTmpConstraintPool[j];
+					int swapi = btRandInt2(j + 1);
+					m_orderTmpConstraintPool[j] = m_orderTmpConstraintPool[swapi];
+					m_orderTmpConstraintPool[swapi] = tmp;
+				}
+
+				for (int j = 0; j < numFrictionPool; ++j)
+				{
+					int tmp = m_orderFrictionConstraintPool[j];
+					int swapi = btRandInt2(j + 1);
+					m_orderFrictionConstraintPool[j] = m_orderFrictionConstraintPool[swapi];
+					m_orderFrictionConstraintPool[swapi] = tmp;
+				}
+			}
+		}
+	}
+
+	btScalar deltaflengthsqr = 0;
+	{
+		for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++)
+		{
+			btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+			if (iteration < constraint.m_overrideNumSolverIterations)
+			{
+				btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[constraint.m_solverBodyIdA], m_tmpSolverBodyPool[constraint.m_solverBodyIdB], constraint);
+				m_deltafNC[j] = deltaf;
+				deltaflengthsqr += deltaf * deltaf;
+			}
+		}
+	}
+
+	if (m_onlyForNoneContact)
+	{
+		if (iteration == 0)
+		{
+			for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++) m_pNC[j] = m_deltafNC[j];
+		}
+		else
+		{
+			// deltaflengthsqrprev can be 0 only if the solver solved the problem exactly in the previous iteration. In this case we should have quit, but mainly for debug reason with this 'hack' it is now allowed to continue the calculation
+			btScalar beta = m_deltafLengthSqrPrev > 0 ? deltaflengthsqr / m_deltafLengthSqrPrev : 2;
+			if (beta > 1)
+			{
+				for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++) m_pNC[j] = 0;
+			}
+			else
+			{
+				for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++)
+				{
+					btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+					if (iteration < constraint.m_overrideNumSolverIterations)
+					{
+						btScalar additionaldeltaimpulse = beta * m_pNC[j];
+						constraint.m_appliedImpulse = btScalar(constraint.m_appliedImpulse) + additionaldeltaimpulse;
+						m_pNC[j] = beta * m_pNC[j] + m_deltafNC[j];
+						btSolverBody& body1 = m_tmpSolverBodyPool[constraint.m_solverBodyIdA];
+						btSolverBody& body2 = m_tmpSolverBodyPool[constraint.m_solverBodyIdB];
+						const btSolverConstraint& c = constraint;
+						body1.internalApplyImpulse(c.m_contactNormal1 * body1.internalGetInvMass(), c.m_angularComponentA, additionaldeltaimpulse);
+						body2.internalApplyImpulse(c.m_contactNormal2 * body2.internalGetInvMass(), c.m_angularComponentB, additionaldeltaimpulse);
+					}
+				}
+			}
+		}
+		m_deltafLengthSqrPrev = deltaflengthsqr;
+	}
+
+	{
+		if (iteration < infoGlobal.m_numIterations)
+		{
+			for (int j = 0; j < numConstraints; j++)
+			{
+				if (constraints[j]->isEnabled())
+				{
+					int bodyAid = getOrInitSolverBody(constraints[j]->getRigidBodyA(), infoGlobal.m_timeStep);
+					int bodyBid = getOrInitSolverBody(constraints[j]->getRigidBodyB(), infoGlobal.m_timeStep);
+					btSolverBody& bodyA = m_tmpSolverBodyPool[bodyAid];
+					btSolverBody& bodyB = m_tmpSolverBodyPool[bodyBid];
+					constraints[j]->solveConstraintObsolete(bodyA, bodyB, infoGlobal.m_timeStep);
+				}
+			}
+
+			///solve all contact constraints
+			if (infoGlobal.m_solverMode & SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS)
+			{
+				int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+				int multiplier = (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) ? 2 : 1;
+
+				for (int c = 0; c < numPoolConstraints; c++)
+				{
+					btScalar totalImpulse = 0;
+
+					{
+						const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[c]];
+						btScalar deltaf = resolveSingleConstraintRowLowerLimit(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+						m_deltafC[c] = deltaf;
+						deltaflengthsqr += deltaf * deltaf;
+						totalImpulse = solveManifold.m_appliedImpulse;
+					}
+					bool applyFriction = true;
+					if (applyFriction)
+					{
+						{
+							btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[c * multiplier]];
+
+							if (totalImpulse > btScalar(0))
+							{
+								solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+								solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+								btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+								m_deltafCF[c * multiplier] = deltaf;
+								deltaflengthsqr += deltaf * deltaf;
+							}
+							else
+							{
+								m_deltafCF[c * multiplier] = 0;
+							}
+						}
+
+						if (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)
+						{
+							btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[c * multiplier + 1]];
+
+							if (totalImpulse > btScalar(0))
+							{
+								solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+								solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+								btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+								m_deltafCF[c * multiplier + 1] = deltaf;
+								deltaflengthsqr += deltaf * deltaf;
+							}
+							else
+							{
+								m_deltafCF[c * multiplier + 1] = 0;
+							}
+						}
+					}
+				}
+			}
+			else  //SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS
+			{
+				//solve the friction constraints after all contact constraints, don't interleave them
+				int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+				int j;
+
+				for (j = 0; j < numPoolConstraints; j++)
+				{
+					const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+					btScalar deltaf = resolveSingleConstraintRowLowerLimit(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+					m_deltafC[j] = deltaf;
+					deltaflengthsqr += deltaf * deltaf;
+				}
+
+				///solve all friction constraints
+
+				int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
+				for (j = 0; j < numFrictionPoolConstraints; j++)
+				{
+					btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+					btScalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+
+					if (totalImpulse > btScalar(0))
+					{
+						solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+						solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+						btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+						m_deltafCF[j] = deltaf;
+						deltaflengthsqr += deltaf * deltaf;
+					}
+					else
+					{
+						m_deltafCF[j] = 0;
+					}
+				}
+			}
+
+			{
+				int numRollingFrictionPoolConstraints = m_tmpSolverContactRollingFrictionConstraintPool.size();
+				for (int j = 0; j < numRollingFrictionPoolConstraints; j++)
+				{
+					btSolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[j];
+					btScalar totalImpulse = m_tmpSolverContactConstraintPool[rollingFrictionConstraint.m_frictionIndex].m_appliedImpulse;
+					if (totalImpulse > btScalar(0))
+					{
+						btScalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction * totalImpulse;
+						if (rollingFrictionMagnitude > rollingFrictionConstraint.m_friction)
+							rollingFrictionMagnitude = rollingFrictionConstraint.m_friction;
+
+						rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude;
+						rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude;
+
+						btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA], m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB], rollingFrictionConstraint);
+						m_deltafCRF[j] = deltaf;
+						deltaflengthsqr += deltaf * deltaf;
+					}
+					else
+					{
+						m_deltafCRF[j] = 0;
+					}
+				}
+			}
+		}
+	}
+
+	if (!m_onlyForNoneContact)
+	{
+		if (iteration == 0)
+		{
+			for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++) m_pNC[j] = m_deltafNC[j];
+			for (int j = 0; j < m_tmpSolverContactConstraintPool.size(); j++) m_pC[j] = m_deltafC[j];
+			for (int j = 0; j < m_tmpSolverContactFrictionConstraintPool.size(); j++) m_pCF[j] = m_deltafCF[j];
+			for (int j = 0; j < m_tmpSolverContactRollingFrictionConstraintPool.size(); j++) m_pCRF[j] = m_deltafCRF[j];
+		}
+		else
+		{
+			// deltaflengthsqrprev can be 0 only if the solver solved the problem exactly in the previous iteration. In this case we should have quit, but mainly for debug reason with this 'hack' it is now allowed to continue the calculation
+			btScalar beta = m_deltafLengthSqrPrev > 0 ? deltaflengthsqr / m_deltafLengthSqrPrev : 2;
+			if (beta > 1)
+			{
+				for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++) m_pNC[j] = 0;
+				for (int j = 0; j < m_tmpSolverContactConstraintPool.size(); j++) m_pC[j] = 0;
+				for (int j = 0; j < m_tmpSolverContactFrictionConstraintPool.size(); j++) m_pCF[j] = 0;
+				for (int j = 0; j < m_tmpSolverContactRollingFrictionConstraintPool.size(); j++) m_pCRF[j] = 0;
+			}
+			else
+			{
+				for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++)
+				{
+					btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+					if (iteration < constraint.m_overrideNumSolverIterations)
+					{
+						btScalar additionaldeltaimpulse = beta * m_pNC[j];
+						constraint.m_appliedImpulse = btScalar(constraint.m_appliedImpulse) + additionaldeltaimpulse;
+						m_pNC[j] = beta * m_pNC[j] + m_deltafNC[j];
+						btSolverBody& body1 = m_tmpSolverBodyPool[constraint.m_solverBodyIdA];
+						btSolverBody& body2 = m_tmpSolverBodyPool[constraint.m_solverBodyIdB];
+						const btSolverConstraint& c = constraint;
+						body1.internalApplyImpulse(c.m_contactNormal1 * body1.internalGetInvMass(), c.m_angularComponentA, additionaldeltaimpulse);
+						body2.internalApplyImpulse(c.m_contactNormal2 * body2.internalGetInvMass(), c.m_angularComponentB, additionaldeltaimpulse);
+					}
+				}
+				for (int j = 0; j < m_tmpSolverContactConstraintPool.size(); j++)
+				{
+					btSolverConstraint& constraint = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+					if (iteration < infoGlobal.m_numIterations)
+					{
+						btScalar additionaldeltaimpulse = beta * m_pC[j];
+						constraint.m_appliedImpulse = btScalar(constraint.m_appliedImpulse) + additionaldeltaimpulse;
+						m_pC[j] = beta * m_pC[j] + m_deltafC[j];
+						btSolverBody& body1 = m_tmpSolverBodyPool[constraint.m_solverBodyIdA];
+						btSolverBody& body2 = m_tmpSolverBodyPool[constraint.m_solverBodyIdB];
+						const btSolverConstraint& c = constraint;
+						body1.internalApplyImpulse(c.m_contactNormal1 * body1.internalGetInvMass(), c.m_angularComponentA, additionaldeltaimpulse);
+						body2.internalApplyImpulse(c.m_contactNormal2 * body2.internalGetInvMass(), c.m_angularComponentB, additionaldeltaimpulse);
+					}
+				}
+				for (int j = 0; j < m_tmpSolverContactFrictionConstraintPool.size(); j++)
+				{
+					btSolverConstraint& constraint = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+					if (iteration < infoGlobal.m_numIterations)
+					{
+						btScalar additionaldeltaimpulse = beta * m_pCF[j];
+						constraint.m_appliedImpulse = btScalar(constraint.m_appliedImpulse) + additionaldeltaimpulse;
+						m_pCF[j] = beta * m_pCF[j] + m_deltafCF[j];
+						btSolverBody& body1 = m_tmpSolverBodyPool[constraint.m_solverBodyIdA];
+						btSolverBody& body2 = m_tmpSolverBodyPool[constraint.m_solverBodyIdB];
+						const btSolverConstraint& c = constraint;
+						body1.internalApplyImpulse(c.m_contactNormal1 * body1.internalGetInvMass(), c.m_angularComponentA, additionaldeltaimpulse);
+						body2.internalApplyImpulse(c.m_contactNormal2 * body2.internalGetInvMass(), c.m_angularComponentB, additionaldeltaimpulse);
+					}
+				}
+				{
+					for (int j = 0; j < m_tmpSolverContactRollingFrictionConstraintPool.size(); j++)
+					{
+						btSolverConstraint& constraint = m_tmpSolverContactRollingFrictionConstraintPool[j];
+						if (iteration < infoGlobal.m_numIterations)
+						{
+							btScalar additionaldeltaimpulse = beta * m_pCRF[j];
+							constraint.m_appliedImpulse = btScalar(constraint.m_appliedImpulse) + additionaldeltaimpulse;
+							m_pCRF[j] = beta * m_pCRF[j] + m_deltafCRF[j];
+							btSolverBody& body1 = m_tmpSolverBodyPool[constraint.m_solverBodyIdA];
+							btSolverBody& body2 = m_tmpSolverBodyPool[constraint.m_solverBodyIdB];
+							const btSolverConstraint& c = constraint;
+							body1.internalApplyImpulse(c.m_contactNormal1 * body1.internalGetInvMass(), c.m_angularComponentA, additionaldeltaimpulse);
+							body2.internalApplyImpulse(c.m_contactNormal2 * body2.internalGetInvMass(), c.m_angularComponentB, additionaldeltaimpulse);
+						}
+					}
+				}
+			}
+		}
+		m_deltafLengthSqrPrev = deltaflengthsqr;
+	}
+
+	return deltaflengthsqr;
+}
+
+btScalar btNNCGConstraintSolver::solveGroupCacheFriendlyFinish(btCollisionObject** bodies, int numBodies, const btContactSolverInfo& infoGlobal)
+{
+	m_pNC.resizeNoInitialize(0);
+	m_pC.resizeNoInitialize(0);
+	m_pCF.resizeNoInitialize(0);
+	m_pCRF.resizeNoInitialize(0);
+
+	m_deltafNC.resizeNoInitialize(0);
+	m_deltafC.resizeNoInitialize(0);
+	m_deltafCF.resizeNoInitialize(0);
+	m_deltafCRF.resizeNoInitialize(0);
+
+	return btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyFinish(bodies, numBodies, infoGlobal);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h
new file mode 100644
index 0000000..a01f34c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h
@@ -0,0 +1,57 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_NNCG_CONSTRAINT_SOLVER_H
+#define BT_NNCG_CONSTRAINT_SOLVER_H
+
+#include "btSequentialImpulseConstraintSolver.h"
+
+ATTRIBUTE_ALIGNED16(class)
+btNNCGConstraintSolver : public btSequentialImpulseConstraintSolver
+{
+protected:
+	btScalar m_deltafLengthSqrPrev;
+
+	btAlignedObjectArray<btScalar> m_pNC;   // p for None Contact constraints
+	btAlignedObjectArray<btScalar> m_pC;    // p for Contact constraints
+	btAlignedObjectArray<btScalar> m_pCF;   // p for ContactFriction constraints
+	btAlignedObjectArray<btScalar> m_pCRF;  // p for ContactRollingFriction constraints
+
+	//These are recalculated in every iterations. We just keep these to prevent reallocation in each iteration.
+	btAlignedObjectArray<btScalar> m_deltafNC;   // deltaf for NoneContact constraints
+	btAlignedObjectArray<btScalar> m_deltafC;    // deltaf for Contact constraints
+	btAlignedObjectArray<btScalar> m_deltafCF;   // deltaf for ContactFriction constraints
+	btAlignedObjectArray<btScalar> m_deltafCRF;  // deltaf for ContactRollingFriction constraints
+
+protected:
+	virtual btScalar solveGroupCacheFriendlyFinish(btCollisionObject * *bodies, int numBodies, const btContactSolverInfo& infoGlobal);
+	virtual btScalar solveSingleIteration(int iteration, btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+
+	virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btNNCGConstraintSolver() : btSequentialImpulseConstraintSolver(), m_onlyForNoneContact(false) {}
+
+	virtual btConstraintSolverType getSolverType() const
+	{
+		return BT_NNCG_SOLVER;
+	}
+
+	bool m_onlyForNoneContact;
+};
+
+#endif  //BT_NNCG_CONSTRAINT_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
new file mode 100644
index 0000000..49a46ed
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
@@ -0,0 +1,205 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btPoint2PointConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include <new>
+
+btPoint2PointConstraint::btPoint2PointConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& pivotInA, const btVector3& pivotInB)
+	: btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE, rbA, rbB), m_pivotInA(pivotInA), m_pivotInB(pivotInB), m_flags(0), m_useSolveConstraintObsolete(false)
+{
+}
+
+btPoint2PointConstraint::btPoint2PointConstraint(btRigidBody& rbA, const btVector3& pivotInA)
+	: btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE, rbA), m_pivotInA(pivotInA), m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA)), m_flags(0), m_useSolveConstraintObsolete(false)
+{
+}
+
+void btPoint2PointConstraint::buildJacobian()
+{
+	///we need it for both methods
+	{
+		m_appliedImpulse = btScalar(0.);
+
+		btVector3 normal(0, 0, 0);
+
+		for (int i = 0; i < 3; i++)
+		{
+			normal[i] = 1;
+			new (&m_jac[i]) btJacobianEntry(
+				m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+				m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+				m_rbA.getCenterOfMassTransform() * m_pivotInA - m_rbA.getCenterOfMassPosition(),
+				m_rbB.getCenterOfMassTransform() * m_pivotInB - m_rbB.getCenterOfMassPosition(),
+				normal,
+				m_rbA.getInvInertiaDiagLocal(),
+				m_rbA.getInvMass(),
+				m_rbB.getInvInertiaDiagLocal(),
+				m_rbB.getInvMass());
+			normal[i] = 0;
+		}
+	}
+}
+
+void btPoint2PointConstraint::getInfo1(btConstraintInfo1* info)
+{
+	getInfo1NonVirtual(info);
+}
+
+void btPoint2PointConstraint::getInfo1NonVirtual(btConstraintInfo1* info)
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		info->m_numConstraintRows = 0;
+		info->nub = 0;
+	}
+	else
+	{
+		info->m_numConstraintRows = 3;
+		info->nub = 3;
+	}
+}
+
+void btPoint2PointConstraint::getInfo2(btConstraintInfo2* info)
+{
+	getInfo2NonVirtual(info, m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+}
+
+void btPoint2PointConstraint::getInfo2NonVirtual(btConstraintInfo2* info, const btTransform& body0_trans, const btTransform& body1_trans)
+{
+	btAssert(!m_useSolveConstraintObsolete);
+
+	//retrieve matrices
+
+	// anchor points in global coordinates with respect to body PORs.
+
+	// set jacobian
+	info->m_J1linearAxis[0] = 1;
+	info->m_J1linearAxis[info->rowskip + 1] = 1;
+	info->m_J1linearAxis[2 * info->rowskip + 2] = 1;
+
+	btVector3 a1 = body0_trans.getBasis() * getPivotInA();
+	{
+		btVector3* angular0 = (btVector3*)(info->m_J1angularAxis);
+		btVector3* angular1 = (btVector3*)(info->m_J1angularAxis + info->rowskip);
+		btVector3* angular2 = (btVector3*)(info->m_J1angularAxis + 2 * info->rowskip);
+		btVector3 a1neg = -a1;
+		a1neg.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	info->m_J2linearAxis[0] = -1;
+	info->m_J2linearAxis[info->rowskip + 1] = -1;
+	info->m_J2linearAxis[2 * info->rowskip + 2] = -1;
+
+	btVector3 a2 = body1_trans.getBasis() * getPivotInB();
+
+	{
+		//	btVector3 a2n = -a2;
+		btVector3* angular0 = (btVector3*)(info->m_J2angularAxis);
+		btVector3* angular1 = (btVector3*)(info->m_J2angularAxis + info->rowskip);
+		btVector3* angular2 = (btVector3*)(info->m_J2angularAxis + 2 * info->rowskip);
+		a2.getSkewSymmetricMatrix(angular0, angular1, angular2);
+	}
+
+	// set right hand side
+	btScalar currERP = (m_flags & BT_P2P_FLAGS_ERP) ? m_erp : info->erp;
+	btScalar k = info->fps * currERP;
+	int j;
+	for (j = 0; j < 3; j++)
+	{
+		info->m_constraintError[j * info->rowskip] = k * (a2[j] + body1_trans.getOrigin()[j] - a1[j] - body0_trans.getOrigin()[j]);
+		//printf("info->m_constraintError[%d]=%f\n",j,info->m_constraintError[j]);
+	}
+	if (m_flags & BT_P2P_FLAGS_CFM)
+	{
+		for (j = 0; j < 3; j++)
+		{
+			info->cfm[j * info->rowskip] = m_cfm;
+		}
+	}
+
+	btScalar impulseClamp = m_setting.m_impulseClamp;  //
+	for (j = 0; j < 3; j++)
+	{
+		if (m_setting.m_impulseClamp > 0)
+		{
+			info->m_lowerLimit[j * info->rowskip] = -impulseClamp;
+			info->m_upperLimit[j * info->rowskip] = impulseClamp;
+		}
+	}
+	info->m_damping = m_setting.m_damping;
+}
+
+void btPoint2PointConstraint::updateRHS(btScalar timeStep)
+{
+	(void)timeStep;
+}
+
+///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+///If no axis is provided, it uses the default axis for this constraint.
+void btPoint2PointConstraint::setParam(int num, btScalar value, int axis)
+{
+	if (axis != -1)
+	{
+		btAssertConstrParams(0);
+	}
+	else
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_ERP:
+			case BT_CONSTRAINT_STOP_ERP:
+				m_erp = value;
+				m_flags |= BT_P2P_FLAGS_ERP;
+				break;
+			case BT_CONSTRAINT_CFM:
+			case BT_CONSTRAINT_STOP_CFM:
+				m_cfm = value;
+				m_flags |= BT_P2P_FLAGS_CFM;
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+}
+
+///return the local value of parameter
+btScalar btPoint2PointConstraint::getParam(int num, int axis) const
+{
+	btScalar retVal(SIMD_INFINITY);
+	if (axis != -1)
+	{
+		btAssertConstrParams(0);
+	}
+	else
+	{
+		switch (num)
+		{
+			case BT_CONSTRAINT_ERP:
+			case BT_CONSTRAINT_STOP_ERP:
+				btAssertConstrParams(m_flags & BT_P2P_FLAGS_ERP);
+				retVal = m_erp;
+				break;
+			case BT_CONSTRAINT_CFM:
+			case BT_CONSTRAINT_STOP_CFM:
+				btAssertConstrParams(m_flags & BT_P2P_FLAGS_CFM);
+				retVal = m_cfm;
+				break;
+			default:
+				btAssertConstrParams(0);
+		}
+	}
+	return retVal;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
new file mode 100644
index 0000000..c0b94e9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
@@ -0,0 +1,173 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_POINT2POINTCONSTRAINT_H
+#define BT_POINT2POINTCONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+
+class btRigidBody;
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btPoint2PointConstraintData2 btPoint2PointConstraintDoubleData2
+#define btPoint2PointConstraintDataName "btPoint2PointConstraintDoubleData2"
+#else
+#define btPoint2PointConstraintData2 btPoint2PointConstraintFloatData
+#define btPoint2PointConstraintDataName "btPoint2PointConstraintFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+struct btConstraintSetting
+{
+	btConstraintSetting() : m_tau(btScalar(0.3)),
+							m_damping(btScalar(1.)),
+							m_impulseClamp(btScalar(0.))
+	{
+	}
+	btScalar m_tau;
+	btScalar m_damping;
+	btScalar m_impulseClamp;
+};
+
+enum btPoint2PointFlags
+{
+	BT_P2P_FLAGS_ERP = 1,
+	BT_P2P_FLAGS_CFM = 2
+};
+
+/// point to point constraint between two rigidbodies each with a pivotpoint that descibes the 'ballsocket' location in local space
+ATTRIBUTE_ALIGNED16(class)
+btPoint2PointConstraint : public btTypedConstraint
+{
+#ifdef IN_PARALLELL_SOLVER
+public:
+#endif
+	btJacobianEntry m_jac[3];  //3 orthogonal linear constraints
+
+	btVector3 m_pivotInA;
+	btVector3 m_pivotInB;
+
+	int m_flags;
+	btScalar m_erp;
+	btScalar m_cfm;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	///for backwards compatibility during the transition to 'getInfo/getInfo2'
+	bool m_useSolveConstraintObsolete;
+
+	btConstraintSetting m_setting;
+
+	btPoint2PointConstraint(btRigidBody & rbA, btRigidBody & rbB, const btVector3& pivotInA, const btVector3& pivotInB);
+
+	btPoint2PointConstraint(btRigidBody & rbA, const btVector3& pivotInA);
+
+	virtual void buildJacobian();
+
+	virtual void getInfo1(btConstraintInfo1 * info);
+
+	void getInfo1NonVirtual(btConstraintInfo1 * info);
+
+	virtual void getInfo2(btConstraintInfo2 * info);
+
+	void getInfo2NonVirtual(btConstraintInfo2 * info, const btTransform& body0_trans, const btTransform& body1_trans);
+
+	void updateRHS(btScalar timeStep);
+
+	void setPivotA(const btVector3& pivotA)
+	{
+		m_pivotInA = pivotA;
+	}
+
+	void setPivotB(const btVector3& pivotB)
+	{
+		m_pivotInB = pivotB;
+	}
+
+	const btVector3& getPivotInA() const
+	{
+		return m_pivotInA;
+	}
+
+	const btVector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, btScalar value, int axis = -1);
+	///return the local value of parameter
+	virtual btScalar getParam(int num, int axis = -1) const;
+
+	virtual int getFlags() const
+	{
+		return m_flags;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btPoint2PointConstraintFloatData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btVector3FloatData m_pivotInA;
+	btVector3FloatData m_pivotInB;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btPoint2PointConstraintDoubleData2
+{
+	btTypedConstraintDoubleData m_typeConstraintData;
+	btVector3DoubleData m_pivotInA;
+	btVector3DoubleData m_pivotInB;
+};
+
+#ifdef BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+///this structure is not used, except for loading pre-2.82 .bullet files
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btPoint2PointConstraintDoubleData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btVector3DoubleData m_pivotInA;
+	btVector3DoubleData m_pivotInB;
+};
+#endif  //BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+
+SIMD_FORCE_INLINE int btPoint2PointConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btPoint2PointConstraintData2);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btPoint2PointConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btPoint2PointConstraintData2* p2pData = (btPoint2PointConstraintData2*)dataBuffer;
+
+	btTypedConstraint::serialize(&p2pData->m_typeConstraintData, serializer);
+	m_pivotInA.serialize(p2pData->m_pivotInA);
+	m_pivotInB.serialize(p2pData->m_pivotInB);
+
+	return btPoint2PointConstraintDataName;
+}
+
+#endif  //BT_POINT2POINTCONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
new file mode 100644
index 0000000..419e564
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -0,0 +1,1875 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//#define COMPUTE_IMPULSE_DENOM 1
+#ifdef BT_DEBUG
+#	define BT_ADDITIONAL_DEBUG
+#endif
+
+//It is not necessary (redundant) to refresh contact manifolds, this refresh has been moved to the collision algorithms.
+
+#include "btSequentialImpulseConstraintSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btCpuFeatureUtility.h"
+
+//#include "btJacobianEntry.h"
+#include "LinearMath/btMinMax.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include <new>
+#include "LinearMath/btStackAlloc.h"
+#include "LinearMath/btQuickprof.h"
+//#include "btSolverBody.h"
+//#include "btSolverConstraint.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include <string.h>  //for memset
+
+int gNumSplitImpulseRecoveries = 0;
+
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+//#define VERBOSE_RESIDUAL_PRINTF 1
+///This is the scalar reference implementation of solving a single constraint row, the innerloop of the Projected Gauss Seidel/Sequential Impulse constraint solver
+///Below are optional SSE2 and SSE4/FMA3 versions. We assume most hardware has SSE2. For SSE4/FMA3 we perform a CPU feature check.
+static btScalar gResolveSingleConstraintRowGeneric_scalar_reference(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	btScalar deltaImpulse = c.m_rhs - btScalar(c.m_appliedImpulse) * c.m_cfm;
+	const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(bodyA.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(bodyA.internalGetDeltaAngularVelocity());
+	const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(bodyB.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(bodyB.internalGetDeltaAngularVelocity());
+
+	//	const btScalar delta_rel_vel	=	deltaVel1Dotn-deltaVel2Dotn;
+	deltaImpulse -= deltaVel1Dotn * c.m_jacDiagABInv;
+	deltaImpulse -= deltaVel2Dotn * c.m_jacDiagABInv;
+
+	const btScalar sum = btScalar(c.m_appliedImpulse) + deltaImpulse;
+	if (sum < c.m_lowerLimit)
+	{
+		deltaImpulse = c.m_lowerLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_lowerLimit;
+	}
+	else if (sum > c.m_upperLimit)
+	{
+		deltaImpulse = c.m_upperLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_upperLimit;
+	}
+	else
+	{
+		c.m_appliedImpulse = sum;
+	}
+
+	bodyA.internalApplyImpulse(c.m_contactNormal1 * bodyA.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+	bodyB.internalApplyImpulse(c.m_contactNormal2 * bodyB.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+
+	return deltaImpulse * (1. / c.m_jacDiagABInv);
+}
+
+static btScalar gResolveSingleConstraintRowLowerLimit_scalar_reference(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	btScalar deltaImpulse = c.m_rhs - btScalar(c.m_appliedImpulse) * c.m_cfm;
+	const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(bodyA.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(bodyA.internalGetDeltaAngularVelocity());
+	const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(bodyB.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(bodyB.internalGetDeltaAngularVelocity());
+
+	deltaImpulse -= deltaVel1Dotn * c.m_jacDiagABInv;
+	deltaImpulse -= deltaVel2Dotn * c.m_jacDiagABInv;
+	const btScalar sum = btScalar(c.m_appliedImpulse) + deltaImpulse;
+	if (sum < c.m_lowerLimit)
+	{
+		deltaImpulse = c.m_lowerLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_lowerLimit;
+	}
+	else
+	{
+		c.m_appliedImpulse = sum;
+	}
+	bodyA.internalApplyImpulse(c.m_contactNormal1 * bodyA.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+	bodyB.internalApplyImpulse(c.m_contactNormal2 * bodyB.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+
+	return deltaImpulse * (1. / c.m_jacDiagABInv);
+}
+
+#ifdef USE_SIMD
+#include <emmintrin.h>
+
+#define btVecSplat(x, e) _mm_shuffle_ps(x, x, _MM_SHUFFLE(e, e, e, e))
+static inline __m128 btSimdDot3(__m128 vec0, __m128 vec1)
+{
+	__m128 result = _mm_mul_ps(vec0, vec1);
+	return _mm_add_ps(btVecSplat(result, 0), _mm_add_ps(btVecSplat(result, 1), btVecSplat(result, 2)));
+}
+
+#if defined(BT_ALLOW_SSE4)
+#include <intrin.h>
+
+#define USE_FMA 1
+#define USE_FMA3_INSTEAD_FMA4 1
+#define USE_SSE4_DOT 1
+
+#define SSE4_DP(a, b) _mm_dp_ps(a, b, 0x7f)
+#define SSE4_DP_FP(a, b) _mm_cvtss_f32(_mm_dp_ps(a, b, 0x7f))
+
+#if USE_SSE4_DOT
+#define DOT_PRODUCT(a, b) SSE4_DP(a, b)
+#else
+#define DOT_PRODUCT(a, b) btSimdDot3(a, b)
+#endif
+
+#if USE_FMA
+#if USE_FMA3_INSTEAD_FMA4
+// a*b + c
+#define FMADD(a, b, c) _mm_fmadd_ps(a, b, c)
+// -(a*b) + c
+#define FMNADD(a, b, c) _mm_fnmadd_ps(a, b, c)
+#else  // USE_FMA3
+// a*b + c
+#define FMADD(a, b, c) _mm_macc_ps(a, b, c)
+// -(a*b) + c
+#define FMNADD(a, b, c) _mm_nmacc_ps(a, b, c)
+#endif
+#else  // USE_FMA
+// c + a*b
+#define FMADD(a, b, c) _mm_add_ps(c, _mm_mul_ps(a, b))
+// c - a*b
+#define FMNADD(a, b, c) _mm_sub_ps(c, _mm_mul_ps(a, b))
+#endif
+#endif
+
+// Project Gauss Seidel or the equivalent Sequential Impulse
+static btScalar gResolveSingleConstraintRowGeneric_sse2(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	__m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse);
+	__m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit);
+	__m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit);
+	btSimdScalar deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse), _mm_set1_ps(c.m_cfm)));
+	__m128 deltaVel1Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal1.mVec128, bodyA.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos1CrossNormal.mVec128, bodyA.internalGetDeltaAngularVelocity().mVec128));
+	__m128 deltaVel2Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal2.mVec128, bodyB.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos2CrossNormal.mVec128, bodyB.internalGetDeltaAngularVelocity().mVec128));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	btSimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse);
+	btSimdScalar resultLowerLess, resultUpperLess;
+	resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1);
+	resultUpperLess = _mm_cmplt_ps(sum, upperLimit1);
+	__m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse));
+	c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum));
+	__m128 upperMinApplied = _mm_sub_ps(upperLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultUpperLess, deltaImpulse), _mm_andnot_ps(resultUpperLess, upperMinApplied));
+	c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultUpperLess, c.m_appliedImpulse), _mm_andnot_ps(resultUpperLess, upperLimit1));
+	__m128 linearComponentA = _mm_mul_ps(c.m_contactNormal1.mVec128, bodyA.internalGetInvMass().mVec128);
+	__m128 linearComponentB = _mm_mul_ps((c.m_contactNormal2).mVec128, bodyB.internalGetInvMass().mVec128);
+	__m128 impulseMagnitude = deltaImpulse;
+	bodyA.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(bodyA.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude));
+	bodyA.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(bodyA.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude));
+	bodyB.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(bodyB.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude));
+	bodyB.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(bodyB.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude));
+	return deltaImpulse.m_floats[0] / c.m_jacDiagABInv;
+}
+
+// Enhanced version of gResolveSingleConstraintRowGeneric_sse2 with SSE4.1 and FMA3
+static btScalar gResolveSingleConstraintRowGeneric_sse4_1_fma3(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+#if defined(BT_ALLOW_SSE4)
+	__m128 tmp = _mm_set_ps1(c.m_jacDiagABInv);
+	__m128 deltaImpulse = _mm_set_ps1(c.m_rhs - btScalar(c.m_appliedImpulse) * c.m_cfm);
+	const __m128 lowerLimit = _mm_set_ps1(c.m_lowerLimit);
+	const __m128 upperLimit = _mm_set_ps1(c.m_upperLimit);
+	const __m128 deltaVel1Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal1.mVec128, bodyA.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos1CrossNormal.mVec128, bodyA.internalGetDeltaAngularVelocity().mVec128));
+	const __m128 deltaVel2Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal2.mVec128, bodyB.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos2CrossNormal.mVec128, bodyB.internalGetDeltaAngularVelocity().mVec128));
+	deltaImpulse = FMNADD(deltaVel1Dotn, tmp, deltaImpulse);
+	deltaImpulse = FMNADD(deltaVel2Dotn, tmp, deltaImpulse);
+	tmp = _mm_add_ps(c.m_appliedImpulse, deltaImpulse);  // sum
+	const __m128 maskLower = _mm_cmpgt_ps(tmp, lowerLimit);
+	const __m128 maskUpper = _mm_cmpgt_ps(upperLimit, tmp);
+	deltaImpulse = _mm_blendv_ps(_mm_sub_ps(lowerLimit, c.m_appliedImpulse), _mm_blendv_ps(_mm_sub_ps(upperLimit, c.m_appliedImpulse), deltaImpulse, maskUpper), maskLower);
+	c.m_appliedImpulse = _mm_blendv_ps(lowerLimit, _mm_blendv_ps(upperLimit, tmp, maskUpper), maskLower);
+	bodyA.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal1.mVec128, bodyA.internalGetInvMass().mVec128), deltaImpulse, bodyA.internalGetDeltaLinearVelocity().mVec128);
+	bodyA.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentA.mVec128, deltaImpulse, bodyA.internalGetDeltaAngularVelocity().mVec128);
+	bodyB.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal2.mVec128, bodyB.internalGetInvMass().mVec128), deltaImpulse, bodyB.internalGetDeltaLinearVelocity().mVec128);
+	bodyB.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentB.mVec128, deltaImpulse, bodyB.internalGetDeltaAngularVelocity().mVec128);
+	btSimdScalar deltaImp = deltaImpulse;
+	return deltaImp.m_floats[0] * (1. / c.m_jacDiagABInv);
+#else
+	return gResolveSingleConstraintRowGeneric_sse2(bodyA, bodyB, c);
+#endif
+}
+
+static btScalar gResolveSingleConstraintRowLowerLimit_sse2(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	__m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse);
+	__m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit);
+	__m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit);
+	btSimdScalar deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse), _mm_set1_ps(c.m_cfm)));
+	__m128 deltaVel1Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal1.mVec128, bodyA.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos1CrossNormal.mVec128, bodyA.internalGetDeltaAngularVelocity().mVec128));
+	__m128 deltaVel2Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal2.mVec128, bodyB.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos2CrossNormal.mVec128, bodyB.internalGetDeltaAngularVelocity().mVec128));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	btSimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse);
+	btSimdScalar resultLowerLess, resultUpperLess;
+	resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1);
+	resultUpperLess = _mm_cmplt_ps(sum, upperLimit1);
+	__m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse));
+	c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum));
+	__m128 linearComponentA = _mm_mul_ps(c.m_contactNormal1.mVec128, bodyA.internalGetInvMass().mVec128);
+	__m128 linearComponentB = _mm_mul_ps(c.m_contactNormal2.mVec128, bodyB.internalGetInvMass().mVec128);
+	__m128 impulseMagnitude = deltaImpulse;
+	bodyA.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(bodyA.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude));
+	bodyA.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(bodyA.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude));
+	bodyB.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(bodyB.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude));
+	bodyB.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(bodyB.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude));
+	return deltaImpulse.m_floats[0] / c.m_jacDiagABInv;
+}
+
+// Enhanced version of gResolveSingleConstraintRowGeneric_sse2 with SSE4.1 and FMA3
+static btScalar gResolveSingleConstraintRowLowerLimit_sse4_1_fma3(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+#ifdef BT_ALLOW_SSE4
+	__m128 tmp = _mm_set_ps1(c.m_jacDiagABInv);
+	__m128 deltaImpulse = _mm_set_ps1(c.m_rhs - btScalar(c.m_appliedImpulse) * c.m_cfm);
+	const __m128 lowerLimit = _mm_set_ps1(c.m_lowerLimit);
+	const __m128 deltaVel1Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal1.mVec128, bodyA.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos1CrossNormal.mVec128, bodyA.internalGetDeltaAngularVelocity().mVec128));
+	const __m128 deltaVel2Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal2.mVec128, bodyB.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos2CrossNormal.mVec128, bodyB.internalGetDeltaAngularVelocity().mVec128));
+	deltaImpulse = FMNADD(deltaVel1Dotn, tmp, deltaImpulse);
+	deltaImpulse = FMNADD(deltaVel2Dotn, tmp, deltaImpulse);
+	tmp = _mm_add_ps(c.m_appliedImpulse, deltaImpulse);
+	const __m128 mask = _mm_cmpgt_ps(tmp, lowerLimit);
+	deltaImpulse = _mm_blendv_ps(_mm_sub_ps(lowerLimit, c.m_appliedImpulse), deltaImpulse, mask);
+	c.m_appliedImpulse = _mm_blendv_ps(lowerLimit, tmp, mask);
+	bodyA.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal1.mVec128, bodyA.internalGetInvMass().mVec128), deltaImpulse, bodyA.internalGetDeltaLinearVelocity().mVec128);
+	bodyA.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentA.mVec128, deltaImpulse, bodyA.internalGetDeltaAngularVelocity().mVec128);
+	bodyB.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal2.mVec128, bodyB.internalGetInvMass().mVec128), deltaImpulse, bodyB.internalGetDeltaLinearVelocity().mVec128);
+	bodyB.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentB.mVec128, deltaImpulse, bodyB.internalGetDeltaAngularVelocity().mVec128);
+	btSimdScalar deltaImp = deltaImpulse;
+	return deltaImp.m_floats[0] * (1. / c.m_jacDiagABInv);
+#else
+	return gResolveSingleConstraintRowLowerLimit_sse2(bodyA, bodyB, c);
+#endif  //BT_ALLOW_SSE4
+}
+
+#endif  //USE_SIMD
+
+btScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowGenericSIMD(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	return m_resolveSingleConstraintRowGeneric(bodyA, bodyB, c);
+}
+
+// Project Gauss Seidel or the equivalent Sequential Impulse
+btScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowGeneric(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	return m_resolveSingleConstraintRowGeneric(bodyA, bodyB, c);
+}
+
+btScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowLowerLimitSIMD(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	return m_resolveSingleConstraintRowLowerLimit(bodyA, bodyB, c);
+}
+
+btScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowLowerLimit(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+	return m_resolveSingleConstraintRowLowerLimit(bodyA, bodyB, c);
+}
+
+static btScalar gResolveSplitPenetrationImpulse_scalar_reference(
+	btSolverBody& bodyA,
+	btSolverBody& bodyB,
+	const btSolverConstraint& c)
+{
+	btScalar deltaImpulse = 0.f;
+
+	if (c.m_rhsPenetration)
+	{
+		gNumSplitImpulseRecoveries++;
+		deltaImpulse = c.m_rhsPenetration - btScalar(c.m_appliedPushImpulse) * c.m_cfm;
+		const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(bodyA.internalGetPushVelocity()) + c.m_relpos1CrossNormal.dot(bodyA.internalGetTurnVelocity());
+		const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(bodyB.internalGetPushVelocity()) + c.m_relpos2CrossNormal.dot(bodyB.internalGetTurnVelocity());
+
+		deltaImpulse -= deltaVel1Dotn * c.m_jacDiagABInv;
+		deltaImpulse -= deltaVel2Dotn * c.m_jacDiagABInv;
+		const btScalar sum = btScalar(c.m_appliedPushImpulse) + deltaImpulse;
+		if (sum < c.m_lowerLimit)
+		{
+			deltaImpulse = c.m_lowerLimit - c.m_appliedPushImpulse;
+			c.m_appliedPushImpulse = c.m_lowerLimit;
+		}
+		else
+		{
+			c.m_appliedPushImpulse = sum;
+		}
+		bodyA.internalApplyPushImpulse(c.m_contactNormal1 * bodyA.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+		bodyB.internalApplyPushImpulse(c.m_contactNormal2 * bodyB.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+	}
+	return deltaImpulse * (1. / c.m_jacDiagABInv);
+}
+
+static btScalar gResolveSplitPenetrationImpulse_sse2(btSolverBody& bodyA, btSolverBody& bodyB, const btSolverConstraint& c)
+{
+#ifdef USE_SIMD
+	if (!c.m_rhsPenetration)
+		return 0.f;
+
+	gNumSplitImpulseRecoveries++;
+
+	__m128 cpAppliedImp = _mm_set1_ps(c.m_appliedPushImpulse);
+	__m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit);
+	__m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit);
+	__m128 deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhsPenetration), _mm_mul_ps(_mm_set1_ps(c.m_appliedPushImpulse), _mm_set1_ps(c.m_cfm)));
+	__m128 deltaVel1Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal1.mVec128, bodyA.internalGetPushVelocity().mVec128), btSimdDot3(c.m_relpos1CrossNormal.mVec128, bodyA.internalGetTurnVelocity().mVec128));
+	__m128 deltaVel2Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal2.mVec128, bodyB.internalGetPushVelocity().mVec128), btSimdDot3(c.m_relpos2CrossNormal.mVec128, bodyB.internalGetTurnVelocity().mVec128));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv)));
+	btSimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse);
+	btSimdScalar resultLowerLess, resultUpperLess;
+	resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1);
+	resultUpperLess = _mm_cmplt_ps(sum, upperLimit1);
+	__m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp);
+	deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse));
+	c.m_appliedPushImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum));
+	__m128 linearComponentA = _mm_mul_ps(c.m_contactNormal1.mVec128, bodyA.internalGetInvMass().mVec128);
+	__m128 linearComponentB = _mm_mul_ps(c.m_contactNormal2.mVec128, bodyB.internalGetInvMass().mVec128);
+	__m128 impulseMagnitude = deltaImpulse;
+	bodyA.internalGetPushVelocity().mVec128 = _mm_add_ps(bodyA.internalGetPushVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude));
+	bodyA.internalGetTurnVelocity().mVec128 = _mm_add_ps(bodyA.internalGetTurnVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude));
+	bodyB.internalGetPushVelocity().mVec128 = _mm_add_ps(bodyB.internalGetPushVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude));
+	bodyB.internalGetTurnVelocity().mVec128 = _mm_add_ps(bodyB.internalGetTurnVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude));
+	btSimdScalar deltaImp = deltaImpulse;
+	return deltaImp.m_floats[0] * (1. / c.m_jacDiagABInv);
+#else
+	return gResolveSplitPenetrationImpulse_scalar_reference(bodyA, bodyB, c);
+#endif
+}
+
+btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
+{
+	m_btSeed2 = 0;
+	m_cachedSolverMode = 0;
+	setupSolverFunctions(false);
+}
+
+void btSequentialImpulseConstraintSolver::setupSolverFunctions(bool useSimd)
+{
+	m_resolveSingleConstraintRowGeneric = gResolveSingleConstraintRowGeneric_scalar_reference;
+	m_resolveSingleConstraintRowLowerLimit = gResolveSingleConstraintRowLowerLimit_scalar_reference;
+	m_resolveSplitPenetrationImpulse = gResolveSplitPenetrationImpulse_scalar_reference;
+
+	if (useSimd)
+	{
+#ifdef USE_SIMD
+		m_resolveSingleConstraintRowGeneric = gResolveSingleConstraintRowGeneric_sse2;
+		m_resolveSingleConstraintRowLowerLimit = gResolveSingleConstraintRowLowerLimit_sse2;
+		m_resolveSplitPenetrationImpulse = gResolveSplitPenetrationImpulse_sse2;
+
+#ifdef BT_ALLOW_SSE4
+		int cpuFeatures = btCpuFeatureUtility::getCpuFeatures();
+		if ((cpuFeatures & btCpuFeatureUtility::CPU_FEATURE_FMA3) && (cpuFeatures & btCpuFeatureUtility::CPU_FEATURE_SSE4_1))
+		{
+			m_resolveSingleConstraintRowGeneric = gResolveSingleConstraintRowGeneric_sse4_1_fma3;
+			m_resolveSingleConstraintRowLowerLimit = gResolveSingleConstraintRowLowerLimit_sse4_1_fma3;
+		}
+#endif  //BT_ALLOW_SSE4
+#endif  //USE_SIMD
+	}
+}
+
+btSequentialImpulseConstraintSolver::~btSequentialImpulseConstraintSolver()
+{
+}
+
+btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getScalarConstraintRowSolverGeneric()
+{
+	return gResolveSingleConstraintRowGeneric_scalar_reference;
+}
+
+btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getScalarConstraintRowSolverLowerLimit()
+{
+	return gResolveSingleConstraintRowLowerLimit_scalar_reference;
+}
+
+#ifdef USE_SIMD
+btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE2ConstraintRowSolverGeneric()
+{
+	return gResolveSingleConstraintRowGeneric_sse2;
+}
+btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE2ConstraintRowSolverLowerLimit()
+{
+	return gResolveSingleConstraintRowLowerLimit_sse2;
+}
+#ifdef BT_ALLOW_SSE4
+btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE4_1ConstraintRowSolverGeneric()
+{
+	return gResolveSingleConstraintRowGeneric_sse4_1_fma3;
+}
+btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE4_1ConstraintRowSolverLowerLimit()
+{
+	return gResolveSingleConstraintRowLowerLimit_sse4_1_fma3;
+}
+#endif  //BT_ALLOW_SSE4
+#endif  //USE_SIMD
+
+unsigned long btSequentialImpulseConstraintSolver::btRand2()
+{
+	m_btSeed2 = (1664525L * m_btSeed2 + 1013904223L) & 0xffffffff;
+	return m_btSeed2;
+}
+
+//See ODE: adam's all-int straightforward(?) dRandInt (0..n-1)
+int btSequentialImpulseConstraintSolver::btRandInt2(int n)
+{
+	// seems good; xor-fold and modulus
+	const unsigned long un = static_cast<unsigned long>(n);
+	unsigned long r = btRand2();
+
+	// note: probably more aggressive than it needs to be -- might be
+	//       able to get away without one or two of the innermost branches.
+	if (un <= 0x00010000UL)
+	{
+		r ^= (r >> 16);
+		if (un <= 0x00000100UL)
+		{
+			r ^= (r >> 8);
+			if (un <= 0x00000010UL)
+			{
+				r ^= (r >> 4);
+				if (un <= 0x00000004UL)
+				{
+					r ^= (r >> 2);
+					if (un <= 0x00000002UL)
+					{
+						r ^= (r >> 1);
+					}
+				}
+			}
+		}
+	}
+
+	return (int)(r % un);
+}
+
+void btSequentialImpulseConstraintSolver::initSolverBody(btSolverBody* solverBody, btCollisionObject* collisionObject, btScalar timeStep)
+{
+	btRigidBody* rb = collisionObject ? btRigidBody::upcast(collisionObject) : 0;
+
+	solverBody->internalGetDeltaLinearVelocity().setValue(0.f, 0.f, 0.f);
+	solverBody->internalGetDeltaAngularVelocity().setValue(0.f, 0.f, 0.f);
+	solverBody->internalGetPushVelocity().setValue(0.f, 0.f, 0.f);
+	solverBody->internalGetTurnVelocity().setValue(0.f, 0.f, 0.f);
+
+	if (rb)
+	{
+		solverBody->m_worldTransform = rb->getWorldTransform();
+		solverBody->internalSetInvMass(btVector3(rb->getInvMass(), rb->getInvMass(), rb->getInvMass()) * rb->getLinearFactor());
+		solverBody->m_originalBody = rb;
+		solverBody->m_angularFactor = rb->getAngularFactor();
+		solverBody->m_linearFactor = rb->getLinearFactor();
+		solverBody->m_linearVelocity = rb->getLinearVelocity();
+		solverBody->m_angularVelocity = rb->getAngularVelocity();
+		solverBody->m_externalForceImpulse = rb->getTotalForce() * rb->getInvMass() * timeStep;
+		solverBody->m_externalTorqueImpulse = rb->getTotalTorque() * rb->getInvInertiaTensorWorld() * timeStep;
+	}
+	else
+		{
+		solverBody->m_worldTransform.setIdentity();
+		solverBody->internalSetInvMass(btVector3(0, 0, 0));
+		solverBody->m_originalBody = 0;
+		solverBody->m_angularFactor.setValue(1, 1, 1);
+		solverBody->m_linearFactor.setValue(1, 1, 1);
+		solverBody->m_linearVelocity.setValue(0, 0, 0);
+		solverBody->m_angularVelocity.setValue(0, 0, 0);
+		solverBody->m_externalForceImpulse.setValue(0, 0, 0);
+		solverBody->m_externalTorqueImpulse.setValue(0, 0, 0);
+					}
+				}
+
+btScalar btSequentialImpulseConstraintSolver::restitutionCurve(btScalar rel_vel, btScalar restitution, btScalar velocityThreshold)
+{
+	//printf("rel_vel =%f\n", rel_vel);
+	if (btFabs(rel_vel) < velocityThreshold)
+		return 0.;
+
+	btScalar rest = restitution * -rel_vel;
+	return rest;
+}
+
+void btSequentialImpulseConstraintSolver::applyAnisotropicFriction(btCollisionObject* colObj, btVector3& frictionDirection, int frictionMode)
+{
+	if (colObj && colObj->hasAnisotropicFriction(frictionMode))
+	{
+		// transform to local coordinates
+		btVector3 loc_lateral = frictionDirection * colObj->getWorldTransform().getBasis();
+		const btVector3& friction_scaling = colObj->getAnisotropicFriction();
+		//apply anisotropic friction
+		loc_lateral *= friction_scaling;
+		// ... and transform it back to global coordinates
+		frictionDirection = colObj->getWorldTransform().getBasis() * loc_lateral;
+	}
+}
+
+void btSequentialImpulseConstraintSolver::setupFrictionConstraint(btSolverConstraint& solverConstraint, const btVector3& normalAxis, int solverBodyIdA, int solverBodyIdB, btManifoldPoint& cp, const btVector3& rel_pos1, const btVector3& rel_pos2, btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	btSolverBody& solverBodyA = m_tmpSolverBodyPool[solverBodyIdA];
+	btSolverBody& solverBodyB = m_tmpSolverBodyPool[solverBodyIdB];
+
+	btRigidBody* body0 = m_tmpSolverBodyPool[solverBodyIdA].m_originalBody;
+	btRigidBody* bodyA = m_tmpSolverBodyPool[solverBodyIdB].m_originalBody;
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+
+	solverConstraint.m_friction = cp.m_combinedFriction;
+	solverConstraint.m_originalContactPoint = 0;
+
+	solverConstraint.m_appliedImpulse = 0.f;
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	if (body0)
+	{
+		solverConstraint.m_contactNormal1 = normalAxis;
+		btVector3 ftorqueAxis1 = rel_pos1.cross(solverConstraint.m_contactNormal1);
+		solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentA = body0->getInvInertiaTensorWorld() * ftorqueAxis1 * body0->getAngularFactor();
+	}
+	else
+	{
+		solverConstraint.m_contactNormal1.setZero();
+		solverConstraint.m_relpos1CrossNormal.setZero();
+		solverConstraint.m_angularComponentA.setZero();
+	}
+
+	if (bodyA)
+	{
+		solverConstraint.m_contactNormal2 = -normalAxis;
+		btVector3 ftorqueAxis1 = rel_pos2.cross(solverConstraint.m_contactNormal2);
+		solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentB = bodyA->getInvInertiaTensorWorld() * ftorqueAxis1 * bodyA->getAngularFactor();
+	}
+	else
+	{
+		solverConstraint.m_contactNormal2.setZero();
+		solverConstraint.m_relpos2CrossNormal.setZero();
+		solverConstraint.m_angularComponentB.setZero();
+	}
+
+	{
+		btVector3 vec;
+		btScalar denom0 = 0.f;
+		btScalar denom1 = 0.f;
+		if (body0)
+		{
+			vec = (solverConstraint.m_angularComponentA).cross(rel_pos1);
+			denom0 = body0->getInvMass() + normalAxis.dot(vec);
+		}
+		if (bodyA)
+		{
+			vec = (-solverConstraint.m_angularComponentB).cross(rel_pos2);
+			denom1 = bodyA->getInvMass() + normalAxis.dot(vec);
+		}
+		btScalar denom = relaxation / (denom0 + denom1);
+		solverConstraint.m_jacDiagABInv = denom;
+	}
+
+	{
+		btScalar rel_vel;
+		btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(body0 ? solverBodyA.m_linearVelocity + solverBodyA.m_externalForceImpulse : btVector3(0, 0, 0)) + solverConstraint.m_relpos1CrossNormal.dot(body0 ? solverBodyA.m_angularVelocity : btVector3(0, 0, 0));
+		btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(bodyA ? solverBodyB.m_linearVelocity + solverBodyB.m_externalForceImpulse : btVector3(0, 0, 0)) + solverConstraint.m_relpos2CrossNormal.dot(bodyA ? solverBodyB.m_angularVelocity : btVector3(0, 0, 0));
+
+		rel_vel = vel1Dotn + vel2Dotn;
+
+		//		btScalar positionalError = 0.f;
+
+		btScalar velocityError = desiredVelocity - rel_vel;
+		btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+
+		btScalar penetrationImpulse = btScalar(0);
+
+		if (cp.m_contactPointFlags & BT_CONTACT_FLAG_FRICTION_ANCHOR)
+		{
+			btScalar distance = (cp.getPositionWorldOnA() - cp.getPositionWorldOnB()).dot(normalAxis);
+			btScalar positionalError = -distance * infoGlobal.m_frictionERP / infoGlobal.m_timeStep;
+			penetrationImpulse = positionalError * solverConstraint.m_jacDiagABInv;
+		}
+
+		solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+		solverConstraint.m_rhsPenetration = 0.f;
+		solverConstraint.m_cfm = cfmSlip;
+		solverConstraint.m_lowerLimit = -solverConstraint.m_friction;
+		solverConstraint.m_upperLimit = solverConstraint.m_friction;
+	}
+}
+
+btSolverConstraint& btSequentialImpulseConstraintSolver::addFrictionConstraint(const btVector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, btManifoldPoint& cp, const btVector3& rel_pos1, const btVector3& rel_pos2, btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	btSolverConstraint& solverConstraint = m_tmpSolverContactFrictionConstraintPool.expandNonInitializing();
+	solverConstraint.m_frictionIndex = frictionIndex;
+	setupFrictionConstraint(solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2,
+		colObj0, colObj1, relaxation, infoGlobal, desiredVelocity, cfmSlip);
+	return solverConstraint;
+}
+
+void btSequentialImpulseConstraintSolver::setupTorsionalFrictionConstraint(btSolverConstraint& solverConstraint, const btVector3& normalAxis1, int solverBodyIdA, int solverBodyIdB,
+	btManifoldPoint& cp, btScalar combinedTorsionalFriction, const btVector3& rel_pos1, const btVector3& rel_pos2,
+	btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation,
+	btScalar desiredVelocity, btScalar cfmSlip)
+
+{
+	btVector3 normalAxis(0, 0, 0);
+
+	solverConstraint.m_contactNormal1 = normalAxis;
+	solverConstraint.m_contactNormal2 = -normalAxis;
+	btSolverBody& solverBodyA = m_tmpSolverBodyPool[solverBodyIdA];
+	btSolverBody& solverBodyB = m_tmpSolverBodyPool[solverBodyIdB];
+
+	btRigidBody* body0 = m_tmpSolverBodyPool[solverBodyIdA].m_originalBody;
+	btRigidBody* bodyA = m_tmpSolverBodyPool[solverBodyIdB].m_originalBody;
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+
+	solverConstraint.m_friction = combinedTorsionalFriction;
+	solverConstraint.m_originalContactPoint = 0;
+
+	solverConstraint.m_appliedImpulse = 0.f;
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	{
+		btVector3 ftorqueAxis1 = -normalAxis1;
+		solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentA = body0 ? body0->getInvInertiaTensorWorld() * ftorqueAxis1 * body0->getAngularFactor() : btVector3(0, 0, 0);
+	}
+	{
+		btVector3 ftorqueAxis1 = normalAxis1;
+		solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentB = bodyA ? bodyA->getInvInertiaTensorWorld() * ftorqueAxis1 * bodyA->getAngularFactor() : btVector3(0, 0, 0);
+	}
+
+	{
+		btVector3 iMJaA = body0 ? body0->getInvInertiaTensorWorld() * solverConstraint.m_relpos1CrossNormal : btVector3(0, 0, 0);
+		btVector3 iMJaB = bodyA ? bodyA->getInvInertiaTensorWorld() * solverConstraint.m_relpos2CrossNormal : btVector3(0, 0, 0);
+		btScalar sum = 0;
+		sum += iMJaA.dot(solverConstraint.m_relpos1CrossNormal);
+		sum += iMJaB.dot(solverConstraint.m_relpos2CrossNormal);
+		solverConstraint.m_jacDiagABInv = btScalar(1.) / sum;
+	}
+
+	{
+		btScalar rel_vel;
+		btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(body0 ? solverBodyA.m_linearVelocity + solverBodyA.m_externalForceImpulse : btVector3(0, 0, 0)) + solverConstraint.m_relpos1CrossNormal.dot(body0 ? solverBodyA.m_angularVelocity : btVector3(0, 0, 0));
+		btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(bodyA ? solverBodyB.m_linearVelocity + solverBodyB.m_externalForceImpulse : btVector3(0, 0, 0)) + solverConstraint.m_relpos2CrossNormal.dot(bodyA ? solverBodyB.m_angularVelocity : btVector3(0, 0, 0));
+
+		rel_vel = vel1Dotn + vel2Dotn;
+
+		//		btScalar positionalError = 0.f;
+
+		btSimdScalar velocityError = desiredVelocity - rel_vel;
+		btSimdScalar velocityImpulse = velocityError * btSimdScalar(solverConstraint.m_jacDiagABInv);
+		solverConstraint.m_rhs = velocityImpulse;
+		solverConstraint.m_cfm = cfmSlip;
+		solverConstraint.m_lowerLimit = -solverConstraint.m_friction;
+		solverConstraint.m_upperLimit = solverConstraint.m_friction;
+	}
+}
+
+btSolverConstraint& btSequentialImpulseConstraintSolver::addTorsionalFrictionConstraint(const btVector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, btManifoldPoint& cp, btScalar combinedTorsionalFriction, const btVector3& rel_pos1, const btVector3& rel_pos2, btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	btSolverConstraint& solverConstraint = m_tmpSolverContactRollingFrictionConstraintPool.expandNonInitializing();
+	solverConstraint.m_frictionIndex = frictionIndex;
+	setupTorsionalFrictionConstraint(solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, combinedTorsionalFriction, rel_pos1, rel_pos2,
+		colObj0, colObj1, relaxation, desiredVelocity, cfmSlip);
+	return solverConstraint;
+}
+
+int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject& body, btScalar timeStep)
+{
+#if BT_THREADSAFE
+	int solverBodyId = -1;
+	const bool isRigidBodyType = btRigidBody::upcast(&body) != NULL;
+	const bool isStaticOrKinematic = body.isStaticOrKinematicObject();
+	const bool isKinematic = body.isKinematicObject();
+	if (isRigidBodyType && !isStaticOrKinematic)
+	{
+		// dynamic body
+		// Dynamic bodies can only be in one island, so it's safe to write to the companionId
+		solverBodyId = body.getCompanionId();
+		if (solverBodyId < 0)
+		{
+			solverBodyId = m_tmpSolverBodyPool.size();
+			btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+			initSolverBody(&solverBody, &body, timeStep);
+			body.setCompanionId(solverBodyId);
+		}
+	}
+	else if (isRigidBodyType && isKinematic)
+	{
+		//
+		// NOTE: must test for kinematic before static because some kinematic objects also
+		//   identify as "static"
+		//
+		// Kinematic bodies can be in multiple islands at once, so it is a
+		// race condition to write to them, so we use an alternate method
+		// to record the solverBodyId
+		int uniqueId = body.getWorldArrayIndex();
+		const int INVALID_SOLVER_BODY_ID = -1;
+		if (uniqueId >= m_kinematicBodyUniqueIdToSolverBodyTable.size())
+		{
+			m_kinematicBodyUniqueIdToSolverBodyTable.resize(uniqueId + 1, INVALID_SOLVER_BODY_ID);
+		}
+		solverBodyId = m_kinematicBodyUniqueIdToSolverBodyTable[uniqueId];
+		// if no table entry yet,
+		if (solverBodyId == INVALID_SOLVER_BODY_ID)
+		{
+			// create a table entry for this body
+			solverBodyId = m_tmpSolverBodyPool.size();
+			btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+			initSolverBody(&solverBody, &body, timeStep);
+			m_kinematicBodyUniqueIdToSolverBodyTable[uniqueId] = solverBodyId;
+		}
+	}
+	else
+	{
+		bool isMultiBodyType = (body.getInternalType() & btCollisionObject::CO_FEATHERSTONE_LINK);
+		// Incorrectly set collision object flags can degrade performance in various ways.
+		if (!isMultiBodyType)
+		{
+			btAssert(body.isStaticOrKinematicObject());
+		}
+		//it could be a multibody link collider
+		// all fixed bodies (inf mass) get mapped to a single solver id
+		if (m_fixedBodyId < 0)
+		{
+			m_fixedBodyId = m_tmpSolverBodyPool.size();
+			btSolverBody& fixedBody = m_tmpSolverBodyPool.expand();
+			initSolverBody(&fixedBody, 0, timeStep);
+		}
+		solverBodyId = m_fixedBodyId;
+	}
+	btAssert(solverBodyId >= 0 && solverBodyId < m_tmpSolverBodyPool.size());
+	return solverBodyId;
+#else   // BT_THREADSAFE
+
+	int solverBodyIdA = -1;
+
+	if (body.getCompanionId() >= 0)
+	{
+		//body has already been converted
+		solverBodyIdA = body.getCompanionId();
+		btAssert(solverBodyIdA < m_tmpSolverBodyPool.size());
+	}
+	else
+	{
+		btRigidBody* rb = btRigidBody::upcast(&body);
+		//convert both active and kinematic objects (for their velocity)
+		if (rb && (rb->getInvMass() || rb->isKinematicObject()))
+		{
+			solverBodyIdA = m_tmpSolverBodyPool.size();
+			btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+			initSolverBody(&solverBody, &body, timeStep);
+			body.setCompanionId(solverBodyIdA);
+		}
+		else
+		{
+			if (m_fixedBodyId < 0)
+			{
+				m_fixedBodyId = m_tmpSolverBodyPool.size();
+				btSolverBody& fixedBody = m_tmpSolverBodyPool.expand();
+				initSolverBody(&fixedBody, 0, timeStep);
+			}
+			return m_fixedBodyId;
+			//			return 0;//assume first one is a fixed solver body
+		}
+	}
+
+	return solverBodyIdA;
+#endif  // BT_THREADSAFE
+}
+#include <stdio.h>
+
+void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstraint& solverConstraint,
+	int solverBodyIdA, int solverBodyIdB,
+	btManifoldPoint& cp, const btContactSolverInfo& infoGlobal,
+	btScalar& relaxation,
+	const btVector3& rel_pos1, const btVector3& rel_pos2)
+{
+	//	const btVector3& pos1 = cp.getPositionWorldOnA();
+	//	const btVector3& pos2 = cp.getPositionWorldOnB();
+
+	btSolverBody* bodyA = &m_tmpSolverBodyPool[solverBodyIdA];
+	btSolverBody* bodyB = &m_tmpSolverBodyPool[solverBodyIdB];
+
+	btRigidBody* rb0 = bodyA->m_originalBody;
+	btRigidBody* rb1 = bodyB->m_originalBody;
+
+	//			btVector3 rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin();
+	//			btVector3 rel_pos2 = pos2 - colObj1->getWorldTransform().getOrigin();
+	//rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin();
+	//rel_pos2 = pos2 - bodyB->getWorldTransform().getOrigin();
+
+	relaxation = infoGlobal.m_sor;
+	btScalar invTimeStep = btScalar(1) / infoGlobal.m_timeStep;
+
+	//cfm = 1 /       ( dt * kp + kd )
+	//erp = dt * kp / ( dt * kp + kd )
+
+	btScalar cfm = infoGlobal.m_globalCfm;
+	btScalar erp = infoGlobal.m_erp2;
+
+	if ((cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_CFM) || (cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_ERP))
+	{
+		if (cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_CFM)
+			cfm = cp.m_contactCFM;
+		if (cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_ERP)
+			erp = cp.m_contactERP;
+	}
+	else
+	{
+		if (cp.m_contactPointFlags & BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING)
+		{
+			btScalar denom = (infoGlobal.m_timeStep * cp.m_combinedContactStiffness1 + cp.m_combinedContactDamping1);
+			if (denom < SIMD_EPSILON)
+			{
+				denom = SIMD_EPSILON;
+			}
+			cfm = btScalar(1) / denom;
+			erp = (infoGlobal.m_timeStep * cp.m_combinedContactStiffness1) / denom;
+		}
+	}
+
+	cfm *= invTimeStep;
+
+	btVector3 torqueAxis0 = rel_pos1.cross(cp.m_normalWorldOnB);
+	solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld() * torqueAxis0 * rb0->getAngularFactor() : btVector3(0, 0, 0);
+	btVector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB);
+	solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld() * -torqueAxis1 * rb1->getAngularFactor() : btVector3(0, 0, 0);
+
+	{
+#ifdef COMPUTE_IMPULSE_DENOM
+		btScalar denom0 = rb0->computeImpulseDenominator(pos1, cp.m_normalWorldOnB);
+		btScalar denom1 = rb1->computeImpulseDenominator(pos2, cp.m_normalWorldOnB);
+#else
+		btVector3 vec;
+		btScalar denom0 = 0.f;
+		btScalar denom1 = 0.f;
+		if (rb0)
+		{
+			vec = (solverConstraint.m_angularComponentA).cross(rel_pos1);
+			denom0 = rb0->getInvMass() + cp.m_normalWorldOnB.dot(vec);
+		}
+		if (rb1)
+		{
+			vec = (-solverConstraint.m_angularComponentB).cross(rel_pos2);
+			denom1 = rb1->getInvMass() + cp.m_normalWorldOnB.dot(vec);
+		}
+#endif  //COMPUTE_IMPULSE_DENOM
+
+		btScalar denom = relaxation / (denom0 + denom1 + cfm);
+		solverConstraint.m_jacDiagABInv = denom;
+	}
+
+	if (rb0)
+	{
+		solverConstraint.m_contactNormal1 = cp.m_normalWorldOnB;
+		solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+	}
+	else
+	{
+		solverConstraint.m_contactNormal1.setZero();
+		solverConstraint.m_relpos1CrossNormal.setZero();
+	}
+	if (rb1)
+	{
+		solverConstraint.m_contactNormal2 = -cp.m_normalWorldOnB;
+		solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
+	}
+	else
+	{
+		solverConstraint.m_contactNormal2.setZero();
+		solverConstraint.m_relpos2CrossNormal.setZero();
+	}
+
+	btScalar restitution = 0.f;
+	btScalar penetration = cp.getDistance() + infoGlobal.m_linearSlop;
+
+	{
+		btVector3 vel1, vel2;
+
+		vel1 = rb0 ? rb0->getVelocityInLocalPoint(rel_pos1) : btVector3(0, 0, 0);
+		vel2 = rb1 ? rb1->getVelocityInLocalPoint(rel_pos2) : btVector3(0, 0, 0);
+
+		//			btVector3 vel2 = rb1 ? rb1->getVelocityInLocalPoint(rel_pos2) : btVector3(0,0,0);
+		btVector3 vel = vel1 - vel2;
+		btScalar rel_vel = cp.m_normalWorldOnB.dot(vel);
+
+		solverConstraint.m_friction = cp.m_combinedFriction;
+
+		restitution = restitutionCurve(rel_vel, cp.m_combinedRestitution, infoGlobal.m_restitutionVelocityThreshold);
+		if (restitution <= btScalar(0.))
+		{
+			restitution = 0.f;
+		};
+	}
+
+	///warm starting (or zero if disabled)
+	if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+	{
+		solverConstraint.m_appliedImpulse = cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor;
+		if (rb0)
+			bodyA->internalApplyImpulse(solverConstraint.m_contactNormal1 * bodyA->internalGetInvMass(), solverConstraint.m_angularComponentA, solverConstraint.m_appliedImpulse);
+		if (rb1)
+			bodyB->internalApplyImpulse(-solverConstraint.m_contactNormal2 * bodyB->internalGetInvMass(), -solverConstraint.m_angularComponentB, -(btScalar)solverConstraint.m_appliedImpulse);
+	}
+	else
+	{
+		solverConstraint.m_appliedImpulse = 0.f;
+	}
+
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	{
+		btVector3 externalForceImpulseA = bodyA->m_originalBody ? bodyA->m_externalForceImpulse : btVector3(0, 0, 0);
+		btVector3 externalTorqueImpulseA = bodyA->m_originalBody ? bodyA->m_externalTorqueImpulse : btVector3(0, 0, 0);
+		btVector3 externalForceImpulseB = bodyB->m_originalBody ? bodyB->m_externalForceImpulse : btVector3(0, 0, 0);
+		btVector3 externalTorqueImpulseB = bodyB->m_originalBody ? bodyB->m_externalTorqueImpulse : btVector3(0, 0, 0);
+
+		btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(bodyA->m_linearVelocity + externalForceImpulseA) + solverConstraint.m_relpos1CrossNormal.dot(bodyA->m_angularVelocity + externalTorqueImpulseA);
+		btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(bodyB->m_linearVelocity + externalForceImpulseB) + solverConstraint.m_relpos2CrossNormal.dot(bodyB->m_angularVelocity + externalTorqueImpulseB);
+		btScalar rel_vel = vel1Dotn + vel2Dotn;
+
+		btScalar positionalError = 0.f;
+		btScalar velocityError = restitution - rel_vel;  // * damping;
+
+		if (penetration > 0)
+		{
+			positionalError = 0;
+
+			velocityError -= penetration * invTimeStep;
+		}
+		else
+		{
+			positionalError = -penetration * erp * invTimeStep;
+		}
+
+		btScalar penetrationImpulse = positionalError * solverConstraint.m_jacDiagABInv;
+		btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+
+		if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+		{
+			//combine position and velocity into rhs
+			solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;  //-solverConstraint.m_contactNormal1.dot(bodyA->m_externalForce*bodyA->m_invMass-bodyB->m_externalForce/bodyB->m_invMass)*solverConstraint.m_jacDiagABInv;
+			solverConstraint.m_rhsPenetration = 0.f;
+		}
+		else
+		{
+			//split position and velocity into rhs and m_rhsPenetration
+			solverConstraint.m_rhs = velocityImpulse;
+			solverConstraint.m_rhsPenetration = penetrationImpulse;
+		}
+		solverConstraint.m_cfm = cfm * solverConstraint.m_jacDiagABInv;
+		solverConstraint.m_lowerLimit = 0;
+		solverConstraint.m_upperLimit = 1e10f;
+	}
+}
+
+void btSequentialImpulseConstraintSolver::setFrictionConstraintImpulse(btSolverConstraint& solverConstraint,
+	int solverBodyIdA, int solverBodyIdB,
+	btManifoldPoint& cp, const btContactSolverInfo& infoGlobal)
+{
+	{
+		btSolverConstraint& frictionConstraint1 = m_tmpSolverContactFrictionConstraintPool[solverConstraint.m_frictionIndex];
+		
+		frictionConstraint1.m_appliedImpulse = 0.f;
+	}
+
+	if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+	{
+		btSolverConstraint& frictionConstraint2 = m_tmpSolverContactFrictionConstraintPool[solverConstraint.m_frictionIndex + 1];
+		
+		frictionConstraint2.m_appliedImpulse = 0.f;
+	}
+}
+
+void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* manifold, const btContactSolverInfo& infoGlobal)
+{
+	btCollisionObject *colObj0 = 0, *colObj1 = 0;
+
+	colObj0 = (btCollisionObject*)manifold->getBody0();
+	colObj1 = (btCollisionObject*)manifold->getBody1();
+
+	int solverBodyIdA = getOrInitSolverBody(*colObj0, infoGlobal.m_timeStep);
+	int solverBodyIdB = getOrInitSolverBody(*colObj1, infoGlobal.m_timeStep);
+
+	//	btRigidBody* bodyA = btRigidBody::upcast(colObj0);
+	//	btRigidBody* bodyB = btRigidBody::upcast(colObj1);
+
+	btSolverBody* solverBodyA = &m_tmpSolverBodyPool[solverBodyIdA];
+	btSolverBody* solverBodyB = &m_tmpSolverBodyPool[solverBodyIdB];
+
+	///avoid collision response between two static objects
+	if (!solverBodyA || (solverBodyA->m_invMass.fuzzyZero() && (!solverBodyB || solverBodyB->m_invMass.fuzzyZero())))
+		return;
+
+	int rollingFriction = 1;
+	for (int j = 0; j < manifold->getNumContacts(); j++)
+	{
+		btManifoldPoint& cp = manifold->getContactPoint(j);
+
+		if (cp.getDistance() <= manifold->getContactProcessingThreshold())
+		{
+			btVector3 rel_pos1;
+			btVector3 rel_pos2;
+			btScalar relaxation;
+
+			int frictionIndex = m_tmpSolverContactConstraintPool.size();
+			btSolverConstraint& solverConstraint = m_tmpSolverContactConstraintPool.expandNonInitializing();
+			solverConstraint.m_solverBodyIdA = solverBodyIdA;
+			solverConstraint.m_solverBodyIdB = solverBodyIdB;
+
+			solverConstraint.m_originalContactPoint = &cp;
+
+			const btVector3& pos1 = cp.getPositionWorldOnA();
+			const btVector3& pos2 = cp.getPositionWorldOnB();
+
+			rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin();
+			rel_pos2 = pos2 - colObj1->getWorldTransform().getOrigin();
+
+			btVector3 vel1;
+			btVector3 vel2;
+
+			solverBodyA->getVelocityInLocalPointNoDelta(rel_pos1, vel1);
+			solverBodyB->getVelocityInLocalPointNoDelta(rel_pos2, vel2);
+
+			btVector3 vel = vel1 - vel2;
+			btScalar rel_vel = cp.m_normalWorldOnB.dot(vel);
+
+			setupContactConstraint(solverConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal, relaxation, rel_pos1, rel_pos2);
+
+			/////setup the friction constraints
+
+			solverConstraint.m_frictionIndex = m_tmpSolverContactFrictionConstraintPool.size();
+
+			if ((cp.m_combinedRollingFriction > 0.f) && (rollingFriction > 0))
+			{
+				{
+					addTorsionalFrictionConstraint(cp.m_normalWorldOnB, solverBodyIdA, solverBodyIdB, frictionIndex, cp, cp.m_combinedSpinningFriction, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+					btVector3 axis0, axis1;
+					btPlaneSpace1(cp.m_normalWorldOnB, axis0, axis1);
+					axis0.normalize();
+					axis1.normalize();
+
+					applyAnisotropicFriction(colObj0, axis0, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+					applyAnisotropicFriction(colObj1, axis0, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+					applyAnisotropicFriction(colObj0, axis1, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+					applyAnisotropicFriction(colObj1, axis1, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+					if (axis0.length() > 0.001)
+						addTorsionalFrictionConstraint(axis0, solverBodyIdA, solverBodyIdB, frictionIndex, cp,
+							cp.m_combinedRollingFriction, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+					if (axis1.length() > 0.001)
+						addTorsionalFrictionConstraint(axis1, solverBodyIdA, solverBodyIdB, frictionIndex, cp,
+							cp.m_combinedRollingFriction, rel_pos1, rel_pos2, colObj0, colObj1, relaxation);
+					}
+				}
+
+			///Bullet has several options to set the friction directions
+			///By default, each contact has only a single friction direction that is recomputed automatically very frame
+			///based on the relative linear velocity.
+			///If the relative velocity it zero, it will automatically compute a friction direction.
+
+			///You can also enable two friction directions, using the SOLVER_USE_2_FRICTION_DIRECTIONS.
+			///In that case, the second friction direction will be orthogonal to both contact normal and first friction direction.
+			///
+			///If you choose SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION, then the friction will be independent from the relative projected velocity.
+			///
+			///The user can manually override the friction directions for certain contacts using a contact callback,
+			///and use contactPoint.m_contactPointFlags |= BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED
+			///In that case, you can set the target relative motion in each friction direction (cp.m_contactMotion1 and cp.m_contactMotion2)
+			///this will give a conveyor belt effect
+			///
+
+			if (!(infoGlobal.m_solverMode & SOLVER_ENABLE_FRICTION_DIRECTION_CACHING) || !(cp.m_contactPointFlags & BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED))
+			{
+				cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
+				btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
+				if (!(infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION) && lat_rel_vel > SIMD_EPSILON)
+				{
+					cp.m_lateralFrictionDir1 *= 1.f / btSqrt(lat_rel_vel);
+					applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					addFrictionConstraint(cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+
+					if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+					{
+						cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
+						cp.m_lateralFrictionDir2.normalize();  //??
+						applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+						applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+						addFrictionConstraint(cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+					}
+				}
+				else
+				{
+					btPlaneSpace1(cp.m_normalWorldOnB, cp.m_lateralFrictionDir1, cp.m_lateralFrictionDir2);
+
+					applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					addFrictionConstraint(cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+
+					if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+					{
+						applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+						applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+						addFrictionConstraint(cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+					}
+
+					if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION))
+					{
+						cp.m_contactPointFlags |= BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED;
+					}
+				}
+			}
+			else
+			{
+				addFrictionConstraint(cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal, cp.m_contactMotion1, cp.m_frictionCFM);
+
+				if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+					addFrictionConstraint(cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, frictionIndex, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal, cp.m_contactMotion2, cp.m_frictionCFM);
+				}
+			setFrictionConstraintImpulse(solverConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal);
+			}
+		}
+	}
+
+void btSequentialImpulseConstraintSolver::convertContacts(btPersistentManifold** manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal)
+{
+	int i;
+	btPersistentManifold* manifold = 0;
+	//			btCollisionObject* colObj0=0,*colObj1=0;
+
+	for (i = 0; i < numManifolds; i++)
+	{
+		manifold = manifoldPtr[i];
+		convertContact(manifold, infoGlobal);
+	}
+}
+
+void btSequentialImpulseConstraintSolver::convertJoint(btSolverConstraint* currentConstraintRow,
+	btTypedConstraint* constraint,
+	const btTypedConstraint::btConstraintInfo1& info1,
+	int solverBodyIdA,
+	int solverBodyIdB,
+	const btContactSolverInfo& infoGlobal)
+{
+	const btRigidBody& rbA = constraint->getRigidBodyA();
+	const btRigidBody& rbB = constraint->getRigidBodyB();
+
+	const btSolverBody* bodyAPtr = &m_tmpSolverBodyPool[solverBodyIdA];
+	const btSolverBody* bodyBPtr = &m_tmpSolverBodyPool[solverBodyIdB];
+
+	int overrideNumSolverIterations = constraint->getOverrideNumSolverIterations() > 0 ? constraint->getOverrideNumSolverIterations() : infoGlobal.m_numIterations;
+	if (overrideNumSolverIterations > m_maxOverrideNumSolverIterations)
+		m_maxOverrideNumSolverIterations = overrideNumSolverIterations;
+
+	for (int j = 0; j < info1.m_numConstraintRows; j++)
+	{
+		memset(&currentConstraintRow[j], 0, sizeof(btSolverConstraint));
+		currentConstraintRow[j].m_lowerLimit = -SIMD_INFINITY;
+		currentConstraintRow[j].m_upperLimit = SIMD_INFINITY;
+		currentConstraintRow[j].m_appliedImpulse = 0.f;
+		currentConstraintRow[j].m_appliedPushImpulse = 0.f;
+		currentConstraintRow[j].m_solverBodyIdA = solverBodyIdA;
+		currentConstraintRow[j].m_solverBodyIdB = solverBodyIdB;
+		currentConstraintRow[j].m_overrideNumSolverIterations = overrideNumSolverIterations;
+	}
+
+	// these vectors are already cleared in initSolverBody, no need to redundantly clear again
+	btAssert(bodyAPtr->getDeltaLinearVelocity().isZero());
+	btAssert(bodyAPtr->getDeltaAngularVelocity().isZero());
+	btAssert(bodyAPtr->getPushVelocity().isZero());
+	btAssert(bodyAPtr->getTurnVelocity().isZero());
+	btAssert(bodyBPtr->getDeltaLinearVelocity().isZero());
+	btAssert(bodyBPtr->getDeltaAngularVelocity().isZero());
+	btAssert(bodyBPtr->getPushVelocity().isZero());
+	btAssert(bodyBPtr->getTurnVelocity().isZero());
+	//bodyAPtr->internalGetDeltaLinearVelocity().setValue(0.f,0.f,0.f);
+	//bodyAPtr->internalGetDeltaAngularVelocity().setValue(0.f,0.f,0.f);
+	//bodyAPtr->internalGetPushVelocity().setValue(0.f,0.f,0.f);
+	//bodyAPtr->internalGetTurnVelocity().setValue(0.f,0.f,0.f);
+	//bodyBPtr->internalGetDeltaLinearVelocity().setValue(0.f,0.f,0.f);
+	//bodyBPtr->internalGetDeltaAngularVelocity().setValue(0.f,0.f,0.f);
+	//bodyBPtr->internalGetPushVelocity().setValue(0.f,0.f,0.f);
+	//bodyBPtr->internalGetTurnVelocity().setValue(0.f,0.f,0.f);
+
+	btTypedConstraint::btConstraintInfo2 info2;
+	info2.fps = 1.f / infoGlobal.m_timeStep;
+	info2.erp = infoGlobal.m_erp;
+	info2.m_J1linearAxis = currentConstraintRow->m_contactNormal1;
+	info2.m_J1angularAxis = currentConstraintRow->m_relpos1CrossNormal;
+	info2.m_J2linearAxis = currentConstraintRow->m_contactNormal2;
+	info2.m_J2angularAxis = currentConstraintRow->m_relpos2CrossNormal;
+	info2.rowskip = sizeof(btSolverConstraint) / sizeof(btScalar);  //check this
+																	///the size of btSolverConstraint needs be a multiple of btScalar
+	btAssert(info2.rowskip * sizeof(btScalar) == sizeof(btSolverConstraint));
+	info2.m_constraintError = &currentConstraintRow->m_rhs;
+	currentConstraintRow->m_cfm = infoGlobal.m_globalCfm;
+	info2.m_damping = infoGlobal.m_damping;
+	info2.cfm = &currentConstraintRow->m_cfm;
+	info2.m_lowerLimit = &currentConstraintRow->m_lowerLimit;
+	info2.m_upperLimit = &currentConstraintRow->m_upperLimit;
+	info2.m_numIterations = infoGlobal.m_numIterations;
+	constraint->getInfo2(&info2);
+
+	///finalize the constraint setup
+	for (int j = 0; j < info1.m_numConstraintRows; j++)
+	{
+		btSolverConstraint& solverConstraint = currentConstraintRow[j];
+
+		if (solverConstraint.m_upperLimit >= constraint->getBreakingImpulseThreshold())
+		{
+			solverConstraint.m_upperLimit = constraint->getBreakingImpulseThreshold();
+		}
+
+		if (solverConstraint.m_lowerLimit <= -constraint->getBreakingImpulseThreshold())
+		{
+			solverConstraint.m_lowerLimit = -constraint->getBreakingImpulseThreshold();
+		}
+
+		solverConstraint.m_originalContactPoint = constraint;
+
+		{
+			const btVector3& ftorqueAxis1 = solverConstraint.m_relpos1CrossNormal;
+			solverConstraint.m_angularComponentA = constraint->getRigidBodyA().getInvInertiaTensorWorld() * ftorqueAxis1 * constraint->getRigidBodyA().getAngularFactor();
+		}
+		{
+			const btVector3& ftorqueAxis2 = solverConstraint.m_relpos2CrossNormal;
+			solverConstraint.m_angularComponentB = constraint->getRigidBodyB().getInvInertiaTensorWorld() * ftorqueAxis2 * constraint->getRigidBodyB().getAngularFactor();
+		}
+
+		{
+			btVector3 iMJlA = solverConstraint.m_contactNormal1 * rbA.getInvMass();
+			btVector3 iMJaA = rbA.getInvInertiaTensorWorld() * solverConstraint.m_relpos1CrossNormal;
+			btVector3 iMJlB = solverConstraint.m_contactNormal2 * rbB.getInvMass();  //sign of normal?
+			btVector3 iMJaB = rbB.getInvInertiaTensorWorld() * solverConstraint.m_relpos2CrossNormal;
+
+			btScalar sum = iMJlA.dot(solverConstraint.m_contactNormal1);
+			sum += iMJaA.dot(solverConstraint.m_relpos1CrossNormal);
+			sum += iMJlB.dot(solverConstraint.m_contactNormal2);
+			sum += iMJaB.dot(solverConstraint.m_relpos2CrossNormal);
+			btScalar fsum = btFabs(sum);
+			btAssert(fsum > SIMD_EPSILON);
+			btScalar sorRelaxation = 1.f;  //todo: get from globalInfo?
+			solverConstraint.m_jacDiagABInv = fsum > SIMD_EPSILON ? sorRelaxation / sum : 0.f;
+		}
+
+		{
+			btScalar rel_vel;
+			btVector3 externalForceImpulseA = bodyAPtr->m_originalBody ? bodyAPtr->m_externalForceImpulse : btVector3(0, 0, 0);
+			btVector3 externalTorqueImpulseA = bodyAPtr->m_originalBody ? bodyAPtr->m_externalTorqueImpulse : btVector3(0, 0, 0);
+
+			btVector3 externalForceImpulseB = bodyBPtr->m_originalBody ? bodyBPtr->m_externalForceImpulse : btVector3(0, 0, 0);
+			btVector3 externalTorqueImpulseB = bodyBPtr->m_originalBody ? bodyBPtr->m_externalTorqueImpulse : btVector3(0, 0, 0);
+
+			btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(rbA.getLinearVelocity() + externalForceImpulseA) + solverConstraint.m_relpos1CrossNormal.dot(rbA.getAngularVelocity() + externalTorqueImpulseA);
+
+			btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(rbB.getLinearVelocity() + externalForceImpulseB) + solverConstraint.m_relpos2CrossNormal.dot(rbB.getAngularVelocity() + externalTorqueImpulseB);
+
+			rel_vel = vel1Dotn + vel2Dotn;
+			btScalar restitution = 0.f;
+			btScalar positionalError = solverConstraint.m_rhs;  //already filled in by getConstraintInfo2
+			btScalar velocityError = restitution - rel_vel * info2.m_damping;
+			btScalar penetrationImpulse = positionalError * solverConstraint.m_jacDiagABInv;
+			btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+			solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+			solverConstraint.m_appliedImpulse = 0.f;
+		}
+	}
+}
+
+void btSequentialImpulseConstraintSolver::convertJoints(btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("convertJoints");
+	for (int j = 0; j < numConstraints; j++)
+	{
+		btTypedConstraint* constraint = constraints[j];
+		constraint->buildJacobian();
+		constraint->internalSetAppliedImpulse(0.0f);
+	}
+
+	int totalNumRows = 0;
+
+	m_tmpConstraintSizesPool.resizeNoInitialize(numConstraints);
+	//calculate the total number of contraint rows
+	for (int i = 0; i < numConstraints; i++)
+	{
+		btTypedConstraint::btConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
+		btJointFeedback* fb = constraints[i]->getJointFeedback();
+		if (fb)
+		{
+			fb->m_appliedForceBodyA.setZero();
+			fb->m_appliedTorqueBodyA.setZero();
+			fb->m_appliedForceBodyB.setZero();
+			fb->m_appliedTorqueBodyB.setZero();
+		}
+
+		if (constraints[i]->isEnabled())
+		{
+			constraints[i]->getInfo1(&info1);
+		}
+		else
+		{
+			info1.m_numConstraintRows = 0;
+			info1.nub = 0;
+		}
+		totalNumRows += info1.m_numConstraintRows;
+	}
+	m_tmpSolverNonContactConstraintPool.resizeNoInitialize(totalNumRows);
+
+	///setup the btSolverConstraints
+	int currentRow = 0;
+
+	for (int i = 0; i < numConstraints; i++)
+	{
+		const btTypedConstraint::btConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
+
+		if (info1.m_numConstraintRows)
+		{
+			btAssert(currentRow < totalNumRows);
+
+			btSolverConstraint* currentConstraintRow = &m_tmpSolverNonContactConstraintPool[currentRow];
+			btTypedConstraint* constraint = constraints[i];
+			btRigidBody& rbA = constraint->getRigidBodyA();
+			btRigidBody& rbB = constraint->getRigidBodyB();
+
+			int solverBodyIdA = getOrInitSolverBody(rbA, infoGlobal.m_timeStep);
+			int solverBodyIdB = getOrInitSolverBody(rbB, infoGlobal.m_timeStep);
+
+			convertJoint(currentConstraintRow, constraint, info1, solverBodyIdA, solverBodyIdB, infoGlobal);
+		}
+		currentRow += info1.m_numConstraintRows;
+	}
+}
+
+void btSequentialImpulseConstraintSolver::convertBodies(btCollisionObject** bodies, int numBodies, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("convertBodies");
+	for (int i = 0; i < numBodies; i++)
+	{
+		bodies[i]->setCompanionId(-1);
+	}
+#if BT_THREADSAFE
+	m_kinematicBodyUniqueIdToSolverBodyTable.resize(0);
+#endif  // BT_THREADSAFE
+
+	m_tmpSolverBodyPool.reserve(numBodies + 1);
+	m_tmpSolverBodyPool.resize(0);
+
+	//btSolverBody& fixedBody = m_tmpSolverBodyPool.expand();
+	//initSolverBody(&fixedBody,0);
+
+	for (int i = 0; i < numBodies; i++)
+	{
+		int bodyId = getOrInitSolverBody(*bodies[i], infoGlobal.m_timeStep);
+
+		btRigidBody* body = btRigidBody::upcast(bodies[i]);
+		if (body && body->getInvMass())
+		{
+			btSolverBody& solverBody = m_tmpSolverBodyPool[bodyId];
+			btVector3 gyroForce(0, 0, 0);
+			if (body->getFlags() & BT_ENABLE_GYROSCOPIC_FORCE_EXPLICIT)
+			{
+				gyroForce = body->computeGyroscopicForceExplicit(infoGlobal.m_maxGyroscopicForce);
+				solverBody.m_externalTorqueImpulse -= gyroForce * body->getInvInertiaTensorWorld() * infoGlobal.m_timeStep;
+			}
+			if (body->getFlags() & BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_WORLD)
+			{
+				gyroForce = body->computeGyroscopicImpulseImplicit_World(infoGlobal.m_timeStep);
+				solverBody.m_externalTorqueImpulse += gyroForce;
+			}
+			if (body->getFlags() & BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY)
+			{
+				gyroForce = body->computeGyroscopicImpulseImplicit_Body(infoGlobal.m_timeStep);
+				solverBody.m_externalTorqueImpulse += gyroForce;
+			}
+		}
+	}
+}
+
+btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	m_fixedBodyId = -1;
+	BT_PROFILE("solveGroupCacheFriendlySetup");
+	(void)debugDrawer;
+
+	// if solver mode has changed,
+	if (infoGlobal.m_solverMode != m_cachedSolverMode)
+	{
+		// update solver functions to use SIMD or non-SIMD
+		bool useSimd = !!(infoGlobal.m_solverMode & SOLVER_SIMD);
+		setupSolverFunctions(useSimd);
+		m_cachedSolverMode = infoGlobal.m_solverMode;
+	}
+	m_maxOverrideNumSolverIterations = 0;
+
+#ifdef BT_ADDITIONAL_DEBUG
+	//make sure that dynamic bodies exist for all (enabled) constraints
+	for (int i = 0; i < numConstraints; i++)
+	{
+		btTypedConstraint* constraint = constraints[i];
+		if (constraint->isEnabled())
+		{
+			if (!constraint->getRigidBodyA().isStaticOrKinematicObject())
+			{
+				bool found = false;
+				for (int b = 0; b < numBodies; b++)
+				{
+					if (&constraint->getRigidBodyA() == bodies[b])
+					{
+						found = true;
+						break;
+					}
+				}
+				btAssert(found);
+			}
+			if (!constraint->getRigidBodyB().isStaticOrKinematicObject())
+			{
+				bool found = false;
+				for (int b = 0; b < numBodies; b++)
+				{
+					if (&constraint->getRigidBodyB() == bodies[b])
+					{
+						found = true;
+						break;
+					}
+				}
+				btAssert(found);
+			}
+		}
+	}
+	//make sure that dynamic bodies exist for all contact manifolds
+	for (int i = 0; i < numManifolds; i++)
+	{
+		if (!manifoldPtr[i]->getBody0()->isStaticOrKinematicObject())
+		{
+			bool found = false;
+			for (int b = 0; b < numBodies; b++)
+			{
+				if (manifoldPtr[i]->getBody0() == bodies[b])
+				{
+					found = true;
+					break;
+				}
+			}
+			btAssert(found);
+		}
+		if (!manifoldPtr[i]->getBody1()->isStaticOrKinematicObject())
+		{
+			bool found = false;
+			for (int b = 0; b < numBodies; b++)
+			{
+				if (manifoldPtr[i]->getBody1() == bodies[b])
+				{
+					found = true;
+					break;
+				}
+			}
+			btAssert(found);
+		}
+	}
+#endif  //BT_ADDITIONAL_DEBUG
+
+	//convert all bodies
+	convertBodies(bodies, numBodies, infoGlobal);
+
+	convertJoints(constraints, numConstraints, infoGlobal);
+
+	convertContacts(manifoldPtr, numManifolds, infoGlobal);
+
+	//	btContactSolverInfo info = infoGlobal;
+
+	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
+	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
+	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
+
+	///@todo: use stack allocator for such temporarily memory, same for solver bodies/constraints
+	m_orderNonContactConstraintPool.resizeNoInitialize(numNonContactPool);
+	if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+		m_orderTmpConstraintPool.resizeNoInitialize(numConstraintPool * 2);
+	else
+		m_orderTmpConstraintPool.resizeNoInitialize(numConstraintPool);
+
+	m_orderFrictionConstraintPool.resizeNoInitialize(numFrictionPool);
+	{
+		int i;
+		for (i = 0; i < numNonContactPool; i++)
+		{
+			m_orderNonContactConstraintPool[i] = i;
+		}
+		for (i = 0; i < numConstraintPool; i++)
+		{
+			m_orderTmpConstraintPool[i] = i;
+		}
+		for (i = 0; i < numFrictionPool; i++)
+		{
+			m_orderFrictionConstraintPool[i] = i;
+		}
+	}
+
+	return 0.f;
+}
+
+btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration, btCollisionObject** /*bodies */, int /*numBodies*/, btPersistentManifold** /*manifoldPtr*/, int /*numManifolds*/, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* /*debugDrawer*/)
+{
+	BT_PROFILE("solveSingleIteration");
+	btScalar leastSquaresResidual = 0.f;
+
+	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
+	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
+	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
+
+	if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
+	{
+		if (1)  // uncomment this for a bit less random ((iteration & 7) == 0)
+		{
+			for (int j = 0; j < numNonContactPool; ++j)
+			{
+				int tmp = m_orderNonContactConstraintPool[j];
+				int swapi = btRandInt2(j + 1);
+				m_orderNonContactConstraintPool[j] = m_orderNonContactConstraintPool[swapi];
+				m_orderNonContactConstraintPool[swapi] = tmp;
+			}
+
+			//contact/friction constraints are not solved more than
+			if (iteration < infoGlobal.m_numIterations)
+			{
+				for (int j = 0; j < numConstraintPool; ++j)
+				{
+					int tmp = m_orderTmpConstraintPool[j];
+					int swapi = btRandInt2(j + 1);
+					m_orderTmpConstraintPool[j] = m_orderTmpConstraintPool[swapi];
+					m_orderTmpConstraintPool[swapi] = tmp;
+				}
+
+				for (int j = 0; j < numFrictionPool; ++j)
+				{
+					int tmp = m_orderFrictionConstraintPool[j];
+					int swapi = btRandInt2(j + 1);
+					m_orderFrictionConstraintPool[j] = m_orderFrictionConstraintPool[swapi];
+					m_orderFrictionConstraintPool[swapi] = tmp;
+				}
+			}
+		}
+	}
+
+	///solve all joint constraints
+	for (int j = 0; j < m_tmpSolverNonContactConstraintPool.size(); j++)
+	{
+		btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+		if (iteration < constraint.m_overrideNumSolverIterations)
+		{
+			btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[constraint.m_solverBodyIdA], m_tmpSolverBodyPool[constraint.m_solverBodyIdB], constraint);
+			leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+		}
+	}
+
+	if (iteration < infoGlobal.m_numIterations)
+	{
+		for (int j = 0; j < numConstraints; j++)
+		{
+			if (constraints[j]->isEnabled())
+			{
+				int bodyAid = getOrInitSolverBody(constraints[j]->getRigidBodyA(), infoGlobal.m_timeStep);
+				int bodyBid = getOrInitSolverBody(constraints[j]->getRigidBodyB(), infoGlobal.m_timeStep);
+				btSolverBody& bodyA = m_tmpSolverBodyPool[bodyAid];
+				btSolverBody& bodyB = m_tmpSolverBodyPool[bodyBid];
+				constraints[j]->solveConstraintObsolete(bodyA, bodyB, infoGlobal.m_timeStep);
+			}
+		}
+
+		///solve all contact constraints
+		if (infoGlobal.m_solverMode & SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS)
+		{
+			int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+			int multiplier = (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) ? 2 : 1;
+
+			for (int c = 0; c < numPoolConstraints; c++)
+			{
+				btScalar totalImpulse = 0;
+
+				{
+					const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[c]];
+					btScalar residual = resolveSingleConstraintRowLowerLimit(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+					leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+
+					totalImpulse = solveManifold.m_appliedImpulse;
+				}
+				bool applyFriction = true;
+				if (applyFriction)
+				{
+					{
+						btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[c * multiplier]];
+
+						if (totalImpulse > btScalar(0))
+						{
+							solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+							solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+							btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+							leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+						}
+					}
+
+					if (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)
+					{
+						btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[c * multiplier + 1]];
+
+						if (totalImpulse > btScalar(0))
+						{
+							solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+							solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+							btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+							leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+						}
+					}
+				}
+			}
+		}
+		else  //SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS
+		{
+			//solve the friction constraints after all contact constraints, don't interleave them
+			int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+			int j;
+
+			for (j = 0; j < numPoolConstraints; j++)
+			{
+				const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+				btScalar residual = resolveSingleConstraintRowLowerLimit(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+				leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+			}
+
+			///solve all friction constraints
+
+			int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
+			for (j = 0; j < numFrictionPoolConstraints; j++)
+			{
+				btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+				btScalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+
+				if (totalImpulse > btScalar(0))
+				{
+					solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+					solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+					btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+					leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+				}
+			}
+		}
+
+		int numRollingFrictionPoolConstraints = m_tmpSolverContactRollingFrictionConstraintPool.size();
+		for (int j = 0; j < numRollingFrictionPoolConstraints; j++)
+		{
+			btSolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[j];
+			btScalar totalImpulse = m_tmpSolverContactConstraintPool[rollingFrictionConstraint.m_frictionIndex].m_appliedImpulse;
+			if (totalImpulse > btScalar(0))
+			{
+				btScalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction * totalImpulse;
+				if (rollingFrictionMagnitude > rollingFrictionConstraint.m_friction)
+					rollingFrictionMagnitude = rollingFrictionConstraint.m_friction;
+
+				rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude;
+				rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude;
+
+				btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA], m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB], rollingFrictionConstraint);
+				leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+			}
+		}
+	}
+	return leastSquaresResidual;
+}
+
+void btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySplitImpulseIterations(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	BT_PROFILE("solveGroupCacheFriendlySplitImpulseIterations");
+	int iteration;
+	if (infoGlobal.m_splitImpulse)
+	{
+		{
+			for (iteration = 0; iteration < infoGlobal.m_numIterations; iteration++)
+			{
+				btScalar leastSquaresResidual = 0.f;
+				{
+					int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+					int j;
+					for (j = 0; j < numPoolConstraints; j++)
+					{
+						const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+
+						btScalar residual = resolveSplitPenetrationImpulse(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+						leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+					}
+				}
+				if (leastSquaresResidual <= infoGlobal.m_leastSquaresResidualThreshold || iteration >= (infoGlobal.m_numIterations - 1))
+				{
+#ifdef VERBOSE_RESIDUAL_PRINTF
+					printf("residual = %f at iteration #%d\n", leastSquaresResidual, iteration);
+#endif
+					break;
+				}
+			}
+		}
+	}
+}
+
+btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	BT_PROFILE("solveGroupCacheFriendlyIterations");
+
+	{
+		///this is a special step to resolve penetrations (just for contacts)
+		solveGroupCacheFriendlySplitImpulseIterations(bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+		int maxIterations = m_maxOverrideNumSolverIterations > infoGlobal.m_numIterations ? m_maxOverrideNumSolverIterations : infoGlobal.m_numIterations;
+
+		for (int iteration = 0; iteration < maxIterations; iteration++)
+			//for ( int iteration = maxIterations-1  ; iteration >= 0;iteration--)
+		{
+			m_leastSquaresResidual = solveSingleIteration(iteration, bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+			if (m_leastSquaresResidual <= infoGlobal.m_leastSquaresResidualThreshold || (iteration >= (maxIterations - 1)))
+			{
+#ifdef VERBOSE_RESIDUAL_PRINTF
+				printf("residual = %f at iteration #%d\n", m_leastSquaresResidual, iteration);
+#endif
+				m_analyticsData.m_numSolverCalls++;
+				m_analyticsData.m_numIterationsUsed = iteration+1;
+				m_analyticsData.m_islandId = -2;
+				if (numBodies>0)
+					m_analyticsData.m_islandId = bodies[0]->getCompanionId();
+				m_analyticsData.m_numBodies = numBodies;
+				m_analyticsData.m_numContactManifolds = numManifolds;
+				m_analyticsData.m_remainingLeastSquaresResidual = m_leastSquaresResidual;
+				break;
+			}
+		}
+	}
+	return 0.f;
+}
+
+void btSequentialImpulseConstraintSolver::writeBackContacts(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	for (int j = iBegin; j < iEnd; j++)
+	{
+		const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[j];
+		btManifoldPoint* pt = (btManifoldPoint*)solveManifold.m_originalContactPoint;
+		btAssert(pt);
+		pt->m_appliedImpulse = solveManifold.m_appliedImpulse;
+		//	float f = m_tmpSolverContactFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+		//	printf("pt->m_appliedImpulseLateral1 = %f\n", f);
+		pt->m_appliedImpulseLateral1 = m_tmpSolverContactFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+		//printf("pt->m_appliedImpulseLateral1 = %f\n", pt->m_appliedImpulseLateral1);
+		if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+		{
+			pt->m_appliedImpulseLateral2 = m_tmpSolverContactFrictionConstraintPool[solveManifold.m_frictionIndex + 1].m_appliedImpulse;
+		}
+		//do a callback here?
+	}
+}
+
+void btSequentialImpulseConstraintSolver::writeBackJoints(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	for (int j = iBegin; j < iEnd; j++)
+	{
+		const btSolverConstraint& solverConstr = m_tmpSolverNonContactConstraintPool[j];
+		btTypedConstraint* constr = (btTypedConstraint*)solverConstr.m_originalContactPoint;
+		btJointFeedback* fb = constr->getJointFeedback();
+		if (fb)
+		{
+			fb->m_appliedForceBodyA += solverConstr.m_contactNormal1 * solverConstr.m_appliedImpulse * constr->getRigidBodyA().getLinearFactor() / infoGlobal.m_timeStep;
+			fb->m_appliedForceBodyB += solverConstr.m_contactNormal2 * solverConstr.m_appliedImpulse * constr->getRigidBodyB().getLinearFactor() / infoGlobal.m_timeStep;
+			fb->m_appliedTorqueBodyA += solverConstr.m_relpos1CrossNormal * constr->getRigidBodyA().getAngularFactor() * solverConstr.m_appliedImpulse / infoGlobal.m_timeStep;
+			fb->m_appliedTorqueBodyB += solverConstr.m_relpos2CrossNormal * constr->getRigidBodyB().getAngularFactor() * solverConstr.m_appliedImpulse / infoGlobal.m_timeStep; /*RGM ???? */
+		}
+
+		constr->internalSetAppliedImpulse(solverConstr.m_appliedImpulse);
+		if (btFabs(solverConstr.m_appliedImpulse) >= constr->getBreakingImpulseThreshold())
+		{
+			constr->setEnabled(false);
+		}
+	}
+}
+
+void btSequentialImpulseConstraintSolver::writeBackBodies(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	for (int i = iBegin; i < iEnd; i++)
+	{
+		btRigidBody* body = m_tmpSolverBodyPool[i].m_originalBody;
+		if (body)
+		{
+			if (infoGlobal.m_splitImpulse)
+				m_tmpSolverBodyPool[i].writebackVelocityAndTransform(infoGlobal.m_timeStep, infoGlobal.m_splitImpulseTurnErp);
+			else
+				m_tmpSolverBodyPool[i].writebackVelocity();
+
+			m_tmpSolverBodyPool[i].m_originalBody->setLinearVelocity(
+				m_tmpSolverBodyPool[i].m_linearVelocity +
+				m_tmpSolverBodyPool[i].m_externalForceImpulse);
+
+			m_tmpSolverBodyPool[i].m_originalBody->setAngularVelocity(
+				m_tmpSolverBodyPool[i].m_angularVelocity +
+				m_tmpSolverBodyPool[i].m_externalTorqueImpulse);
+
+			if (infoGlobal.m_splitImpulse)
+				m_tmpSolverBodyPool[i].m_originalBody->setWorldTransform(m_tmpSolverBodyPool[i].m_worldTransform);
+
+			m_tmpSolverBodyPool[i].m_originalBody->setCompanionId(-1);
+		}
+	}
+}
+
+btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyFinish(btCollisionObject** bodies, int numBodies, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("solveGroupCacheFriendlyFinish");
+
+	if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+	{
+		writeBackContacts(0, m_tmpSolverContactConstraintPool.size(), infoGlobal);
+	}
+
+	writeBackJoints(0, m_tmpSolverNonContactConstraintPool.size(), infoGlobal);
+	writeBackBodies(0, m_tmpSolverBodyPool.size(), infoGlobal);
+
+	m_tmpSolverContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverNonContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactFrictionConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactRollingFrictionConstraintPool.resizeNoInitialize(0);
+
+	m_tmpSolverBodyPool.resizeNoInitialize(0);
+	return 0.f;
+}
+
+/// btSequentialImpulseConstraintSolver Sequentially applies impulses
+btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer, btDispatcher* /*dispatcher*/)
+{
+	BT_PROFILE("solveGroup");
+	//you need to provide at least some bodies
+
+	solveGroupCacheFriendlySetup(bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+	solveGroupCacheFriendlyIterations(bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+	solveGroupCacheFriendlyFinish(bodies, numBodies, infoGlobal);
+
+	return 0.f;
+}
+
+void btSequentialImpulseConstraintSolver::reset()
+{
+	m_btSeed2 = 0;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
new file mode 100644
index 0000000..cd00967
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
@@ -0,0 +1,215 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
+#define BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
+
+class btIDebugDraw;
+class btPersistentManifold;
+class btDispatcher;
+class btCollisionObject;
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+#include "BulletDynamics/ConstraintSolver/btSolverBody.h"
+#include "BulletDynamics/ConstraintSolver/btSolverConstraint.h"
+#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
+#include "BulletDynamics/ConstraintSolver/btConstraintSolver.h"
+
+typedef btScalar (*btSingleConstraintRowSolver)(btSolverBody&, btSolverBody&, const btSolverConstraint&);
+
+struct btSolverAnalyticsData
+{
+	btSolverAnalyticsData()
+	{
+		m_numSolverCalls = 0;
+		m_numIterationsUsed = -1;
+		m_remainingLeastSquaresResidual = -1;
+		m_islandId = -2;
+	}
+	int m_islandId;
+	int m_numBodies;
+	int m_numContactManifolds;
+	int m_numSolverCalls;
+	int m_numIterationsUsed;
+	double m_remainingLeastSquaresResidual;
+};
+
+///The btSequentialImpulseConstraintSolver is a fast SIMD implementation of the Projected Gauss Seidel (iterative LCP) method.
+ATTRIBUTE_ALIGNED16(class)
+btSequentialImpulseConstraintSolver : public btConstraintSolver
+{
+	
+
+protected:
+	btAlignedObjectArray<btSolverBody> m_tmpSolverBodyPool;
+	btConstraintArray m_tmpSolverContactConstraintPool;
+	btConstraintArray m_tmpSolverNonContactConstraintPool;
+	btConstraintArray m_tmpSolverContactFrictionConstraintPool;
+	btConstraintArray m_tmpSolverContactRollingFrictionConstraintPool;
+
+	btAlignedObjectArray<int> m_orderTmpConstraintPool;
+	btAlignedObjectArray<int> m_orderNonContactConstraintPool;
+	btAlignedObjectArray<int> m_orderFrictionConstraintPool;
+	btAlignedObjectArray<btTypedConstraint::btConstraintInfo1> m_tmpConstraintSizesPool;
+	int m_maxOverrideNumSolverIterations;
+	int m_fixedBodyId;
+	// When running solvers on multiple threads, a race condition exists for Kinematic objects that
+	// participate in more than one solver.
+	// The getOrInitSolverBody() function writes the companionId of each body (storing the index of the solver body
+	// for the current solver). For normal dynamic bodies it isn't an issue because they can only be in one island
+	// (and therefore one thread) at a time. But kinematic bodies can be in multiple islands at once.
+	// To avoid this race condition, this solver does not write the companionId, instead it stores the solver body
+	// index in this solver-local table, indexed by the uniqueId of the body.
+	btAlignedObjectArray<int> m_kinematicBodyUniqueIdToSolverBodyTable;  // only used for multithreading
+
+	btSingleConstraintRowSolver m_resolveSingleConstraintRowGeneric;
+	btSingleConstraintRowSolver m_resolveSingleConstraintRowLowerLimit;
+	btSingleConstraintRowSolver m_resolveSplitPenetrationImpulse;
+	int m_cachedSolverMode;  // used to check if SOLVER_SIMD flag has been changed
+	void setupSolverFunctions(bool useSimd);
+
+	btScalar m_leastSquaresResidual;
+
+	void setupFrictionConstraint(btSolverConstraint & solverConstraint, const btVector3& normalAxis, int solverBodyIdA, int solverBodyIdB,
+		btManifoldPoint& cp, const btVector3& rel_pos1, const btVector3& rel_pos2,
+		btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation,
+		const btContactSolverInfo& infoGlobal,
+		btScalar desiredVelocity = 0., btScalar cfmSlip = 0.);
+
+	void setupTorsionalFrictionConstraint(btSolverConstraint & solverConstraint, const btVector3& normalAxis, int solverBodyIdA, int solverBodyIdB,
+		btManifoldPoint& cp, btScalar combinedTorsionalFriction, const btVector3& rel_pos1, const btVector3& rel_pos2,
+		btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation,
+		btScalar desiredVelocity = 0., btScalar cfmSlip = 0.);
+
+	btSolverConstraint& addFrictionConstraint(const btVector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, btManifoldPoint& cp, const btVector3& rel_pos1, const btVector3& rel_pos2, btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity = 0., btScalar cfmSlip = 0.);
+	btSolverConstraint& addTorsionalFrictionConstraint(const btVector3& normalAxis, int solverBodyIdA, int solverBodyIdB, int frictionIndex, btManifoldPoint& cp, btScalar torsionalFriction, const btVector3& rel_pos1, const btVector3& rel_pos2, btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity = 0, btScalar cfmSlip = 0.f);
+
+	void setupContactConstraint(btSolverConstraint & solverConstraint, int solverBodyIdA, int solverBodyIdB, btManifoldPoint& cp,
+		const btContactSolverInfo& infoGlobal, btScalar& relaxation, const btVector3& rel_pos1, const btVector3& rel_pos2);
+
+	static void applyAnisotropicFriction(btCollisionObject * colObj, btVector3 & frictionDirection, int frictionMode);
+
+	void setFrictionConstraintImpulse(btSolverConstraint & solverConstraint, int solverBodyIdA, int solverBodyIdB,
+		btManifoldPoint& cp, const btContactSolverInfo& infoGlobal);
+
+	///m_btSeed2 is used for re-arranging the constraint rows. improves convergence/quality of friction
+	unsigned long m_btSeed2;
+
+	btScalar restitutionCurve(btScalar rel_vel, btScalar restitution, btScalar velocityThreshold);
+
+	virtual void convertContacts(btPersistentManifold * *manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal);
+
+	void convertContact(btPersistentManifold * manifold, const btContactSolverInfo& infoGlobal);
+
+	virtual void convertJoints(btTypedConstraint * *constraints, int numConstraints, const btContactSolverInfo& infoGlobal);
+	void convertJoint(btSolverConstraint * currentConstraintRow, btTypedConstraint * constraint, const btTypedConstraint::btConstraintInfo1& info1, int solverBodyIdA, int solverBodyIdB, const btContactSolverInfo& infoGlobal);
+
+	virtual void convertBodies(btCollisionObject * *bodies, int numBodies, const btContactSolverInfo& infoGlobal);
+
+	btScalar resolveSplitPenetrationSIMD(btSolverBody & bodyA, btSolverBody & bodyB, const btSolverConstraint& contactConstraint)
+	{
+		return m_resolveSplitPenetrationImpulse(bodyA, bodyB, contactConstraint);
+	}
+
+	btScalar resolveSplitPenetrationImpulseCacheFriendly(btSolverBody & bodyA, btSolverBody & bodyB, const btSolverConstraint& contactConstraint)
+	{
+		return m_resolveSplitPenetrationImpulse(bodyA, bodyB, contactConstraint);
+	}
+
+	//internal method
+	int getOrInitSolverBody(btCollisionObject & body, btScalar timeStep);
+	void initSolverBody(btSolverBody * solverBody, btCollisionObject * collisionObject, btScalar timeStep);
+
+	btScalar resolveSingleConstraintRowGeneric(btSolverBody & bodyA, btSolverBody & bodyB, const btSolverConstraint& contactConstraint);
+	btScalar resolveSingleConstraintRowGenericSIMD(btSolverBody & bodyA, btSolverBody & bodyB, const btSolverConstraint& contactConstraint);
+	btScalar resolveSingleConstraintRowLowerLimit(btSolverBody & bodyA, btSolverBody & bodyB, const btSolverConstraint& contactConstraint);
+	btScalar resolveSingleConstraintRowLowerLimitSIMD(btSolverBody & bodyA, btSolverBody & bodyB, const btSolverConstraint& contactConstraint);
+	btScalar resolveSplitPenetrationImpulse(btSolverBody & bodyA, btSolverBody & bodyB, const btSolverConstraint& contactConstraint)
+	{
+		return m_resolveSplitPenetrationImpulse(bodyA, bodyB, contactConstraint);
+	}
+
+protected:
+	void writeBackContacts(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+	void writeBackJoints(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+	void writeBackBodies(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+	virtual void solveGroupCacheFriendlySplitImpulseIterations(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+	virtual btScalar solveGroupCacheFriendlyFinish(btCollisionObject * *bodies, int numBodies, const btContactSolverInfo& infoGlobal);
+	virtual btScalar solveSingleIteration(int iteration, btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+
+	virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+	virtual btScalar solveGroupCacheFriendlyIterations(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btSequentialImpulseConstraintSolver();
+	virtual ~btSequentialImpulseConstraintSolver();
+
+	virtual btScalar solveGroup(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btDispatcher* dispatcher);
+
+	///clear internal cached data and reset random seed
+	virtual void reset();
+
+	unsigned long btRand2();
+
+	int btRandInt2(int n);
+
+	void setRandSeed(unsigned long seed)
+	{
+		m_btSeed2 = seed;
+	}
+	unsigned long getRandSeed() const
+	{
+		return m_btSeed2;
+	}
+
+	virtual btConstraintSolverType getSolverType() const
+	{
+		return BT_SEQUENTIAL_IMPULSE_SOLVER;
+	}
+
+	btSingleConstraintRowSolver getActiveConstraintRowSolverGeneric()
+	{
+		return m_resolveSingleConstraintRowGeneric;
+	}
+	void setConstraintRowSolverGeneric(btSingleConstraintRowSolver rowSolver)
+	{
+		m_resolveSingleConstraintRowGeneric = rowSolver;
+	}
+	btSingleConstraintRowSolver getActiveConstraintRowSolverLowerLimit()
+	{
+		return m_resolveSingleConstraintRowLowerLimit;
+	}
+	void setConstraintRowSolverLowerLimit(btSingleConstraintRowSolver rowSolver)
+	{
+		m_resolveSingleConstraintRowLowerLimit = rowSolver;
+	}
+
+
+
+	///Various implementations of solving a single constraint row using a generic equality constraint, using scalar reference, SSE2 or SSE4
+	btSingleConstraintRowSolver getScalarConstraintRowSolverGeneric();
+	btSingleConstraintRowSolver getSSE2ConstraintRowSolverGeneric();
+	btSingleConstraintRowSolver getSSE4_1ConstraintRowSolverGeneric();
+
+	///Various implementations of solving a single constraint row using an inequality (lower limit) constraint, using scalar reference, SSE2 or SSE4
+	btSingleConstraintRowSolver getScalarConstraintRowSolverLowerLimit();
+	btSingleConstraintRowSolver getSSE2ConstraintRowSolverLowerLimit();
+	btSingleConstraintRowSolver getSSE4_1ConstraintRowSolverLowerLimit();
+	btSolverAnalyticsData m_analyticsData;
+};
+
+#endif  //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp
new file mode 100644
index 0000000..7aa9953
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp
@@ -0,0 +1,1554 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSequentialImpulseConstraintSolverMt.h"
+
+#include "LinearMath/btQuickprof.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+bool btSequentialImpulseConstraintSolverMt::s_allowNestedParallelForLoops = false;  // some task schedulers don't like nested loops
+int btSequentialImpulseConstraintSolverMt::s_minimumContactManifoldsForBatching = 250;
+int btSequentialImpulseConstraintSolverMt::s_minBatchSize = 50;
+int btSequentialImpulseConstraintSolverMt::s_maxBatchSize = 100;
+btBatchedConstraints::BatchingMethod btSequentialImpulseConstraintSolverMt::s_contactBatchingMethod = btBatchedConstraints::BATCHING_METHOD_SPATIAL_GRID_2D;
+btBatchedConstraints::BatchingMethod btSequentialImpulseConstraintSolverMt::s_jointBatchingMethod = btBatchedConstraints::BATCHING_METHOD_SPATIAL_GRID_2D;
+
+btSequentialImpulseConstraintSolverMt::btSequentialImpulseConstraintSolverMt()
+{
+	m_numFrictionDirections = 1;
+	m_useBatching = false;
+	m_useObsoleteJointConstraints = false;
+}
+
+btSequentialImpulseConstraintSolverMt::~btSequentialImpulseConstraintSolverMt()
+{
+}
+
+void btSequentialImpulseConstraintSolverMt::setupBatchedContactConstraints()
+{
+	BT_PROFILE("setupBatchedContactConstraints");
+	m_batchedContactConstraints.setup(&m_tmpSolverContactConstraintPool,
+									  m_tmpSolverBodyPool,
+									  s_contactBatchingMethod,
+									  s_minBatchSize,
+									  s_maxBatchSize,
+									  &m_scratchMemory);
+}
+
+void btSequentialImpulseConstraintSolverMt::setupBatchedJointConstraints()
+{
+	BT_PROFILE("setupBatchedJointConstraints");
+	m_batchedJointConstraints.setup(&m_tmpSolverNonContactConstraintPool,
+									m_tmpSolverBodyPool,
+									s_jointBatchingMethod,
+									s_minBatchSize,
+									s_maxBatchSize,
+									&m_scratchMemory);
+}
+
+void btSequentialImpulseConstraintSolverMt::internalSetupContactConstraints(int iContactConstraint, const btContactSolverInfo& infoGlobal)
+{
+	btSolverConstraint& contactConstraint = m_tmpSolverContactConstraintPool[iContactConstraint];
+
+	btVector3 rel_pos1;
+	btVector3 rel_pos2;
+	btScalar relaxation;
+
+	int solverBodyIdA = contactConstraint.m_solverBodyIdA;
+	int solverBodyIdB = contactConstraint.m_solverBodyIdB;
+
+	btSolverBody* solverBodyA = &m_tmpSolverBodyPool[solverBodyIdA];
+	btSolverBody* solverBodyB = &m_tmpSolverBodyPool[solverBodyIdB];
+
+	btRigidBody* colObj0 = solverBodyA->m_originalBody;
+	btRigidBody* colObj1 = solverBodyB->m_originalBody;
+
+	btManifoldPoint& cp = *static_cast<btManifoldPoint*>(contactConstraint.m_originalContactPoint);
+
+	const btVector3& pos1 = cp.getPositionWorldOnA();
+	const btVector3& pos2 = cp.getPositionWorldOnB();
+
+	rel_pos1 = pos1 - solverBodyA->getWorldTransform().getOrigin();
+	rel_pos2 = pos2 - solverBodyB->getWorldTransform().getOrigin();
+
+	btVector3 vel1;
+	btVector3 vel2;
+
+	solverBodyA->getVelocityInLocalPointNoDelta(rel_pos1, vel1);
+	solverBodyB->getVelocityInLocalPointNoDelta(rel_pos2, vel2);
+
+	btVector3 vel = vel1 - vel2;
+	btScalar rel_vel = cp.m_normalWorldOnB.dot(vel);
+
+	setupContactConstraint(contactConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal, relaxation, rel_pos1, rel_pos2);
+
+	// setup rolling friction constraints
+	int rollingFrictionIndex = m_rollingFrictionIndexTable[iContactConstraint];
+	if (rollingFrictionIndex >= 0)
+	{
+		btSolverConstraint& spinningFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[rollingFrictionIndex];
+		btAssert(spinningFrictionConstraint.m_frictionIndex == iContactConstraint);
+		setupTorsionalFrictionConstraint(spinningFrictionConstraint,
+										 cp.m_normalWorldOnB,
+										 solverBodyIdA,
+										 solverBodyIdB,
+										 cp,
+										 cp.m_combinedSpinningFriction,
+										 rel_pos1,
+										 rel_pos2,
+										 colObj0,
+										 colObj1,
+										 relaxation,
+										 0.0f,
+										 0.0f);
+		btVector3 axis[2];
+		btPlaneSpace1(cp.m_normalWorldOnB, axis[0], axis[1]);
+		axis[0].normalize();
+		axis[1].normalize();
+
+		applyAnisotropicFriction(colObj0, axis[0], btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+		applyAnisotropicFriction(colObj1, axis[0], btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+		applyAnisotropicFriction(colObj0, axis[1], btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+		applyAnisotropicFriction(colObj1, axis[1], btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+		// put the largest axis first
+		if (axis[1].length2() > axis[0].length2())
+		{
+			btSwap(axis[0], axis[1]);
+		}
+		const btScalar kRollingFrictionThreshold = 0.001f;
+		for (int i = 0; i < 2; ++i)
+		{
+			int iRollingFric = rollingFrictionIndex + 1 + i;
+			btSolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[iRollingFric];
+			btAssert(rollingFrictionConstraint.m_frictionIndex == iContactConstraint);
+			btVector3 dir = axis[i];
+			if (dir.length() > kRollingFrictionThreshold)
+			{
+				setupTorsionalFrictionConstraint(rollingFrictionConstraint,
+												 dir,
+												 solverBodyIdA,
+												 solverBodyIdB,
+												 cp,
+												 cp.m_combinedRollingFriction,
+												 rel_pos1,
+												 rel_pos2,
+												 colObj0,
+												 colObj1,
+												 relaxation,
+												 0.0f,
+												 0.0f);
+			}
+			else
+			{
+				rollingFrictionConstraint.m_frictionIndex = -1;  // disable constraint
+			}
+		}
+	}
+
+	// setup friction constraints
+	//	setupFrictionConstraint(solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal, desiredVelocity, cfmSlip);
+	{
+		///Bullet has several options to set the friction directions
+		///By default, each contact has only a single friction direction that is recomputed automatically very frame
+		///based on the relative linear velocity.
+		///If the relative velocity it zero, it will automatically compute a friction direction.
+
+		///You can also enable two friction directions, using the SOLVER_USE_2_FRICTION_DIRECTIONS.
+		///In that case, the second friction direction will be orthogonal to both contact normal and first friction direction.
+		///
+		///If you choose SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION, then the friction will be independent from the relative projected velocity.
+		///
+		///The user can manually override the friction directions for certain contacts using a contact callback,
+		///and set the cp.m_lateralFrictionInitialized to true
+		///In that case, you can set the target relative motion in each friction direction (cp.m_contactMotion1 and cp.m_contactMotion2)
+		///this will give a conveyor belt effect
+		///
+		btSolverConstraint* frictionConstraint1 = &m_tmpSolverContactFrictionConstraintPool[contactConstraint.m_frictionIndex];
+		btAssert(frictionConstraint1->m_frictionIndex == iContactConstraint);
+
+		btSolverConstraint* frictionConstraint2 = NULL;
+		if (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)
+		{
+			frictionConstraint2 = &m_tmpSolverContactFrictionConstraintPool[contactConstraint.m_frictionIndex + 1];
+			btAssert(frictionConstraint2->m_frictionIndex == iContactConstraint);
+		}
+
+		if (!(infoGlobal.m_solverMode & SOLVER_ENABLE_FRICTION_DIRECTION_CACHING) || !(cp.m_contactPointFlags & BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED))
+		{
+			cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
+			btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
+			if (!(infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION) && lat_rel_vel > SIMD_EPSILON)
+			{
+				cp.m_lateralFrictionDir1 *= 1.f / btSqrt(lat_rel_vel);
+				applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+				applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+				setupFrictionConstraint(*frictionConstraint1, cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+
+				if (frictionConstraint2)
+				{
+					cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
+					cp.m_lateralFrictionDir2.normalize();  //??
+					applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					setupFrictionConstraint(*frictionConstraint2, cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+				}
+			}
+			else
+			{
+				btPlaneSpace1(cp.m_normalWorldOnB, cp.m_lateralFrictionDir1, cp.m_lateralFrictionDir2);
+
+				applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+				applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+				setupFrictionConstraint(*frictionConstraint1, cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+
+				if (frictionConstraint2)
+				{
+					applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					setupFrictionConstraint(*frictionConstraint2, cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal);
+				}
+
+				if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION))
+				{
+					cp.m_contactPointFlags |= BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED;
+				}
+			}
+		}
+		else
+		{
+			setupFrictionConstraint(*frictionConstraint1, cp.m_lateralFrictionDir1, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal, cp.m_contactMotion1, cp.m_frictionCFM);
+			if (frictionConstraint2)
+			{
+				setupFrictionConstraint(*frictionConstraint2, cp.m_lateralFrictionDir2, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, infoGlobal, cp.m_contactMotion2, cp.m_frictionCFM);
+			}
+		}
+	}
+
+	setFrictionConstraintImpulse(contactConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal);
+}
+
+struct SetupContactConstraintsLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btBatchedConstraints* m_bc;
+	const btContactSolverInfo* m_infoGlobal;
+
+	SetupContactConstraintsLoop(btSequentialImpulseConstraintSolverMt* solver, const btBatchedConstraints* bc, const btContactSolverInfo& infoGlobal)
+	{
+		m_solver = solver;
+		m_bc = bc;
+		m_infoGlobal = &infoGlobal;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("SetupContactConstraintsLoop");
+		for (int iBatch = iBegin; iBatch < iEnd; ++iBatch)
+		{
+			const btBatchedConstraints::Range& batch = m_bc->m_batches[iBatch];
+			for (int i = batch.begin; i < batch.end; ++i)
+			{
+				int iContact = m_bc->m_constraintIndices[i];
+				m_solver->internalSetupContactConstraints(iContact, *m_infoGlobal);
+			}
+		}
+	}
+};
+
+void btSequentialImpulseConstraintSolverMt::setupAllContactConstraints(const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("setupAllContactConstraints");
+	if (m_useBatching)
+	{
+		const btBatchedConstraints& batchedCons = m_batchedContactConstraints;
+		SetupContactConstraintsLoop loop(this, &batchedCons, infoGlobal);
+		for (int iiPhase = 0; iiPhase < batchedCons.m_phases.size(); ++iiPhase)
+		{
+			int iPhase = batchedCons.m_phaseOrder[iiPhase];
+			const btBatchedConstraints::Range& phase = batchedCons.m_phases[iPhase];
+			int grainSize = 1;
+			btParallelFor(phase.begin, phase.end, grainSize, loop);
+		}
+	}
+	else
+	{
+		for (int i = 0; i < m_tmpSolverContactConstraintPool.size(); ++i)
+		{
+			internalSetupContactConstraints(i, infoGlobal);
+		}
+	}
+}
+
+int btSequentialImpulseConstraintSolverMt::getOrInitSolverBodyThreadsafe(btCollisionObject& body, btScalar timeStep)
+{
+	//
+	// getOrInitSolverBody is threadsafe only for a single thread per solver (with potentially multiple solvers)
+	//
+	// getOrInitSolverBodyThreadsafe -- attempts to be fully threadsafe (however may affect determinism)
+	//
+	int solverBodyId = -1;
+	bool isRigidBodyType = btRigidBody::upcast(&body) != NULL;
+	if (isRigidBodyType && !body.isStaticOrKinematicObject())
+	{
+		// dynamic body
+		// Dynamic bodies can only be in one island, so it's safe to write to the companionId
+		solverBodyId = body.getCompanionId();
+		if (solverBodyId < 0)
+		{
+			m_bodySolverArrayMutex.lock();
+			// now that we have the lock, check again
+			solverBodyId = body.getCompanionId();
+			if (solverBodyId < 0)
+			{
+				solverBodyId = m_tmpSolverBodyPool.size();
+				btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+				initSolverBody(&solverBody, &body, timeStep);
+				body.setCompanionId(solverBodyId);
+			}
+			m_bodySolverArrayMutex.unlock();
+		}
+	}
+	else if (isRigidBodyType && body.isKinematicObject())
+	{
+		//
+		// NOTE: must test for kinematic before static because some kinematic objects also
+		//   identify as "static"
+		//
+		// Kinematic bodies can be in multiple islands at once, so it is a
+		// race condition to write to them, so we use an alternate method
+		// to record the solverBodyId
+		int uniqueId = body.getWorldArrayIndex();
+		const int INVALID_SOLVER_BODY_ID = -1;
+		if (m_kinematicBodyUniqueIdToSolverBodyTable.size() <= uniqueId)
+		{
+			m_kinematicBodyUniqueIdToSolverBodyTableMutex.lock();
+			// now that we have the lock, check again
+			if (m_kinematicBodyUniqueIdToSolverBodyTable.size() <= uniqueId)
+			{
+				m_kinematicBodyUniqueIdToSolverBodyTable.resize(uniqueId + 1, INVALID_SOLVER_BODY_ID);
+			}
+			m_kinematicBodyUniqueIdToSolverBodyTableMutex.unlock();
+		}
+		solverBodyId = m_kinematicBodyUniqueIdToSolverBodyTable[uniqueId];
+		// if no table entry yet,
+		if (INVALID_SOLVER_BODY_ID == solverBodyId)
+		{
+			// need to acquire both locks
+			m_kinematicBodyUniqueIdToSolverBodyTableMutex.lock();
+			m_bodySolverArrayMutex.lock();
+			// now that we have the lock, check again
+			solverBodyId = m_kinematicBodyUniqueIdToSolverBodyTable[uniqueId];
+			if (INVALID_SOLVER_BODY_ID == solverBodyId)
+			{
+				// create a table entry for this body
+				solverBodyId = m_tmpSolverBodyPool.size();
+				btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+				initSolverBody(&solverBody, &body, timeStep);
+				m_kinematicBodyUniqueIdToSolverBodyTable[uniqueId] = solverBodyId;
+			}
+			m_bodySolverArrayMutex.unlock();
+			m_kinematicBodyUniqueIdToSolverBodyTableMutex.unlock();
+		}
+	}
+	else
+	{
+		// all fixed bodies (inf mass) get mapped to a single solver id
+		if (m_fixedBodyId < 0)
+		{
+			m_bodySolverArrayMutex.lock();
+			// now that we have the lock, check again
+			if (m_fixedBodyId < 0)
+			{
+				m_fixedBodyId = m_tmpSolverBodyPool.size();
+				btSolverBody& fixedBody = m_tmpSolverBodyPool.expand();
+				initSolverBody(&fixedBody, 0, timeStep);
+			}
+			m_bodySolverArrayMutex.unlock();
+		}
+		solverBodyId = m_fixedBodyId;
+	}
+	btAssert(solverBodyId >= 0 && solverBodyId < m_tmpSolverBodyPool.size());
+	return solverBodyId;
+}
+
+void btSequentialImpulseConstraintSolverMt::internalCollectContactManifoldCachedInfo(btContactManifoldCachedInfo* cachedInfoArray, btPersistentManifold** manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("internalCollectContactManifoldCachedInfo");
+	for (int i = 0; i < numManifolds; ++i)
+	{
+		btContactManifoldCachedInfo* cachedInfo = &cachedInfoArray[i];
+		btPersistentManifold* manifold = manifoldPtr[i];
+		btCollisionObject* colObj0 = (btCollisionObject*)manifold->getBody0();
+		btCollisionObject* colObj1 = (btCollisionObject*)manifold->getBody1();
+
+		int solverBodyIdA = getOrInitSolverBodyThreadsafe(*colObj0, infoGlobal.m_timeStep);
+		int solverBodyIdB = getOrInitSolverBodyThreadsafe(*colObj1, infoGlobal.m_timeStep);
+
+		cachedInfo->solverBodyIds[0] = solverBodyIdA;
+		cachedInfo->solverBodyIds[1] = solverBodyIdB;
+		cachedInfo->numTouchingContacts = 0;
+
+		btSolverBody* solverBodyA = &m_tmpSolverBodyPool[solverBodyIdA];
+		btSolverBody* solverBodyB = &m_tmpSolverBodyPool[solverBodyIdB];
+
+		// A contact manifold between 2 static object should not exist!
+		// check the collision flags of your objects if this assert fires.
+		// Incorrectly set collision object flags can degrade performance in various ways.
+		btAssert(!m_tmpSolverBodyPool[solverBodyIdA].m_invMass.isZero() || !m_tmpSolverBodyPool[solverBodyIdB].m_invMass.isZero());
+
+		int iContact = 0;
+		for (int j = 0; j < manifold->getNumContacts(); j++)
+		{
+			btManifoldPoint& cp = manifold->getContactPoint(j);
+
+			if (cp.getDistance() <= manifold->getContactProcessingThreshold())
+			{
+				cachedInfo->contactPoints[iContact] = &cp;
+				cachedInfo->contactHasRollingFriction[iContact] = (cp.m_combinedRollingFriction > 0.f);
+				iContact++;
+			}
+		}
+		cachedInfo->numTouchingContacts = iContact;
+	}
+}
+
+struct CollectContactManifoldCachedInfoLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	btSequentialImpulseConstraintSolverMt::btContactManifoldCachedInfo* m_cachedInfoArray;
+	btPersistentManifold** m_manifoldPtr;
+	const btContactSolverInfo* m_infoGlobal;
+
+	CollectContactManifoldCachedInfoLoop(btSequentialImpulseConstraintSolverMt* solver, btSequentialImpulseConstraintSolverMt::btContactManifoldCachedInfo* cachedInfoArray, btPersistentManifold** manifoldPtr, const btContactSolverInfo& infoGlobal)
+	{
+		m_solver = solver;
+		m_cachedInfoArray = cachedInfoArray;
+		m_manifoldPtr = manifoldPtr;
+		m_infoGlobal = &infoGlobal;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalCollectContactManifoldCachedInfo(m_cachedInfoArray + iBegin, m_manifoldPtr + iBegin, iEnd - iBegin, *m_infoGlobal);
+	}
+};
+
+void btSequentialImpulseConstraintSolverMt::internalAllocContactConstraints(const btContactManifoldCachedInfo* cachedInfoArray, int numManifolds)
+{
+	BT_PROFILE("internalAllocContactConstraints");
+	// possibly parallel part
+	for (int iManifold = 0; iManifold < numManifolds; ++iManifold)
+	{
+		const btContactManifoldCachedInfo& cachedInfo = cachedInfoArray[iManifold];
+		int contactIndex = cachedInfo.contactIndex;
+		int frictionIndex = contactIndex * m_numFrictionDirections;
+		int rollingFrictionIndex = cachedInfo.rollingFrictionIndex;
+		for (int i = 0; i < cachedInfo.numTouchingContacts; i++)
+		{
+			btSolverConstraint& contactConstraint = m_tmpSolverContactConstraintPool[contactIndex];
+			contactConstraint.m_solverBodyIdA = cachedInfo.solverBodyIds[0];
+			contactConstraint.m_solverBodyIdB = cachedInfo.solverBodyIds[1];
+			contactConstraint.m_originalContactPoint = cachedInfo.contactPoints[i];
+
+			// allocate the friction constraints
+			contactConstraint.m_frictionIndex = frictionIndex;
+			for (int iDir = 0; iDir < m_numFrictionDirections; ++iDir)
+			{
+				btSolverConstraint& frictionConstraint = m_tmpSolverContactFrictionConstraintPool[frictionIndex];
+				frictionConstraint.m_frictionIndex = contactIndex;
+				frictionIndex++;
+			}
+
+			// allocate rolling friction constraints
+			if (cachedInfo.contactHasRollingFriction[i])
+			{
+				m_rollingFrictionIndexTable[contactIndex] = rollingFrictionIndex;
+				// allocate 3 (although we may use only 2 sometimes)
+				for (int i = 0; i < 3; i++)
+				{
+					m_tmpSolverContactRollingFrictionConstraintPool[rollingFrictionIndex].m_frictionIndex = contactIndex;
+					rollingFrictionIndex++;
+				}
+			}
+			else
+			{
+				// indicate there is no rolling friction for this contact point
+				m_rollingFrictionIndexTable[contactIndex] = -1;
+			}
+			contactIndex++;
+		}
+	}
+}
+
+struct AllocContactConstraintsLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btSequentialImpulseConstraintSolverMt::btContactManifoldCachedInfo* m_cachedInfoArray;
+
+	AllocContactConstraintsLoop(btSequentialImpulseConstraintSolverMt* solver, btSequentialImpulseConstraintSolverMt::btContactManifoldCachedInfo* cachedInfoArray)
+	{
+		m_solver = solver;
+		m_cachedInfoArray = cachedInfoArray;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalAllocContactConstraints(m_cachedInfoArray + iBegin, iEnd - iBegin);
+	}
+};
+
+void btSequentialImpulseConstraintSolverMt::allocAllContactConstraints(btPersistentManifold** manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("allocAllContactConstraints");
+	btAlignedObjectArray<btContactManifoldCachedInfo> cachedInfoArray;  // = m_manifoldCachedInfoArray;
+	cachedInfoArray.resizeNoInitialize(numManifolds);
+	if (/* DISABLES CODE */ (false))
+	{
+		// sequential
+		internalCollectContactManifoldCachedInfo(&cachedInfoArray[0], manifoldPtr, numManifolds, infoGlobal);
+	}
+	else
+	{
+		// may alter ordering of bodies which affects determinism
+		CollectContactManifoldCachedInfoLoop loop(this, &cachedInfoArray[0], manifoldPtr, infoGlobal);
+		int grainSize = 200;
+		btParallelFor(0, numManifolds, grainSize, loop);
+	}
+
+	{
+		// serial part
+		int numContacts = 0;
+		int numRollingFrictionConstraints = 0;
+		for (int iManifold = 0; iManifold < numManifolds; ++iManifold)
+		{
+			btContactManifoldCachedInfo& cachedInfo = cachedInfoArray[iManifold];
+			cachedInfo.contactIndex = numContacts;
+			cachedInfo.rollingFrictionIndex = numRollingFrictionConstraints;
+			numContacts += cachedInfo.numTouchingContacts;
+			for (int i = 0; i < cachedInfo.numTouchingContacts; ++i)
+			{
+				if (cachedInfo.contactHasRollingFriction[i])
+				{
+					numRollingFrictionConstraints += 3;
+				}
+			}
+		}
+		{
+			BT_PROFILE("allocPools");
+			if (m_tmpSolverContactConstraintPool.capacity() < numContacts)
+			{
+				// if we need to reallocate, reserve some extra so we don't have to reallocate again next frame
+				int extraReserve = numContacts / 16;
+				m_tmpSolverContactConstraintPool.reserve(numContacts + extraReserve);
+				m_rollingFrictionIndexTable.reserve(numContacts + extraReserve);
+				m_tmpSolverContactFrictionConstraintPool.reserve((numContacts + extraReserve) * m_numFrictionDirections);
+				m_tmpSolverContactRollingFrictionConstraintPool.reserve(numRollingFrictionConstraints + extraReserve);
+			}
+			m_tmpSolverContactConstraintPool.resizeNoInitialize(numContacts);
+			m_rollingFrictionIndexTable.resizeNoInitialize(numContacts);
+			m_tmpSolverContactFrictionConstraintPool.resizeNoInitialize(numContacts * m_numFrictionDirections);
+			m_tmpSolverContactRollingFrictionConstraintPool.resizeNoInitialize(numRollingFrictionConstraints);
+		}
+	}
+	{
+		AllocContactConstraintsLoop loop(this, &cachedInfoArray[0]);
+		int grainSize = 200;
+		btParallelFor(0, numManifolds, grainSize, loop);
+	}
+}
+
+void btSequentialImpulseConstraintSolverMt::convertContacts(btPersistentManifold** manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal)
+{
+	if (!m_useBatching)
+	{
+		btSequentialImpulseConstraintSolver::convertContacts(manifoldPtr, numManifolds, infoGlobal);
+		return;
+	}
+	BT_PROFILE("convertContacts");
+	if (numManifolds > 0)
+	{
+		if (m_fixedBodyId < 0)
+		{
+			m_fixedBodyId = m_tmpSolverBodyPool.size();
+			btSolverBody& fixedBody = m_tmpSolverBodyPool.expand();
+			initSolverBody(&fixedBody, 0, infoGlobal.m_timeStep);
+		}
+		allocAllContactConstraints(manifoldPtr, numManifolds, infoGlobal);
+		if (m_useBatching)
+		{
+			setupBatchedContactConstraints();
+		}
+		setupAllContactConstraints(infoGlobal);
+	}
+}
+
+void btSequentialImpulseConstraintSolverMt::internalInitMultipleJoints(btTypedConstraint** constraints, int iBegin, int iEnd)
+{
+	BT_PROFILE("internalInitMultipleJoints");
+	for (int i = iBegin; i < iEnd; i++)
+	{
+		btTypedConstraint* constraint = constraints[i];
+		btTypedConstraint::btConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
+		if (constraint->isEnabled())
+		{
+			constraint->buildJacobian();
+			constraint->internalSetAppliedImpulse(0.0f);
+			btJointFeedback* fb = constraint->getJointFeedback();
+			if (fb)
+			{
+				fb->m_appliedForceBodyA.setZero();
+				fb->m_appliedTorqueBodyA.setZero();
+				fb->m_appliedForceBodyB.setZero();
+				fb->m_appliedTorqueBodyB.setZero();
+			}
+			constraint->getInfo1(&info1);
+		}
+		else
+		{
+			info1.m_numConstraintRows = 0;
+			info1.nub = 0;
+		}
+	}
+}
+
+struct InitJointsLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	btTypedConstraint** m_constraints;
+
+	InitJointsLoop(btSequentialImpulseConstraintSolverMt* solver, btTypedConstraint** constraints)
+	{
+		m_solver = solver;
+		m_constraints = constraints;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalInitMultipleJoints(m_constraints, iBegin, iEnd);
+	}
+};
+
+void btSequentialImpulseConstraintSolverMt::internalConvertMultipleJoints(const btAlignedObjectArray<JointParams>& jointParamsArray, btTypedConstraint** constraints, int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("internalConvertMultipleJoints");
+	for (int i = iBegin; i < iEnd; ++i)
+	{
+		const JointParams& jointParams = jointParamsArray[i];
+		int currentRow = jointParams.m_solverConstraint;
+		if (currentRow != -1)
+		{
+			const btTypedConstraint::btConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
+			btAssert(currentRow < m_tmpSolverNonContactConstraintPool.size());
+			btAssert(info1.m_numConstraintRows > 0);
+
+			btSolverConstraint* currentConstraintRow = &m_tmpSolverNonContactConstraintPool[currentRow];
+			btTypedConstraint* constraint = constraints[i];
+
+			convertJoint(currentConstraintRow, constraint, info1, jointParams.m_solverBodyA, jointParams.m_solverBodyB, infoGlobal);
+		}
+	}
+}
+
+struct ConvertJointsLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btAlignedObjectArray<btSequentialImpulseConstraintSolverMt::JointParams>& m_jointParamsArray;
+	btTypedConstraint** m_srcConstraints;
+	const btContactSolverInfo& m_infoGlobal;
+
+	ConvertJointsLoop(btSequentialImpulseConstraintSolverMt* solver,
+					  const btAlignedObjectArray<btSequentialImpulseConstraintSolverMt::JointParams>& jointParamsArray,
+					  btTypedConstraint** srcConstraints,
+					  const btContactSolverInfo& infoGlobal) : m_jointParamsArray(jointParamsArray),
+															   m_infoGlobal(infoGlobal)
+	{
+		m_solver = solver;
+		m_srcConstraints = srcConstraints;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalConvertMultipleJoints(m_jointParamsArray, m_srcConstraints, iBegin, iEnd, m_infoGlobal);
+	}
+};
+
+void btSequentialImpulseConstraintSolverMt::convertJoints(btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal)
+{
+	if (!m_useBatching)
+	{
+		btSequentialImpulseConstraintSolver::convertJoints(constraints, numConstraints, infoGlobal);
+		return;
+	}
+	BT_PROFILE("convertJoints");
+	bool parallelJointSetup = true;
+	m_tmpConstraintSizesPool.resizeNoInitialize(numConstraints);
+	if (parallelJointSetup)
+	{
+		InitJointsLoop loop(this, constraints);
+		int grainSize = 40;
+		btParallelFor(0, numConstraints, grainSize, loop);
+	}
+	else
+	{
+		internalInitMultipleJoints(constraints, 0, numConstraints);
+	}
+
+	int totalNumRows = 0;
+	btAlignedObjectArray<JointParams> jointParamsArray;
+	jointParamsArray.resizeNoInitialize(numConstraints);
+
+	//calculate the total number of contraint rows
+	for (int i = 0; i < numConstraints; i++)
+	{
+		btTypedConstraint* constraint = constraints[i];
+
+		JointParams& params = jointParamsArray[i];
+		const btTypedConstraint::btConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
+
+		if (info1.m_numConstraintRows)
+		{
+			params.m_solverConstraint = totalNumRows;
+			params.m_solverBodyA = getOrInitSolverBody(constraint->getRigidBodyA(), infoGlobal.m_timeStep);
+			params.m_solverBodyB = getOrInitSolverBody(constraint->getRigidBodyB(), infoGlobal.m_timeStep);
+		}
+		else
+		{
+			params.m_solverConstraint = -1;
+		}
+		totalNumRows += info1.m_numConstraintRows;
+	}
+	m_tmpSolverNonContactConstraintPool.resizeNoInitialize(totalNumRows);
+
+	///setup the btSolverConstraints
+	if (parallelJointSetup)
+	{
+		ConvertJointsLoop loop(this, jointParamsArray, constraints, infoGlobal);
+		int grainSize = 20;
+		btParallelFor(0, numConstraints, grainSize, loop);
+	}
+	else
+	{
+		internalConvertMultipleJoints(jointParamsArray, constraints, 0, numConstraints, infoGlobal);
+	}
+	setupBatchedJointConstraints();
+}
+
+void btSequentialImpulseConstraintSolverMt::internalConvertBodies(btCollisionObject** bodies, int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("internalConvertBodies");
+	for (int i = iBegin; i < iEnd; i++)
+	{
+		btCollisionObject* obj = bodies[i];
+		obj->setCompanionId(i);
+		btSolverBody& solverBody = m_tmpSolverBodyPool[i];
+		initSolverBody(&solverBody, obj, infoGlobal.m_timeStep);
+
+		btRigidBody* body = btRigidBody::upcast(obj);
+		if (body && body->getInvMass())
+		{
+			btVector3 gyroForce(0, 0, 0);
+			if (body->getFlags() & BT_ENABLE_GYROSCOPIC_FORCE_EXPLICIT)
+			{
+				gyroForce = body->computeGyroscopicForceExplicit(infoGlobal.m_maxGyroscopicForce);
+				solverBody.m_externalTorqueImpulse -= gyroForce * body->getInvInertiaTensorWorld() * infoGlobal.m_timeStep;
+			}
+			if (body->getFlags() & BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_WORLD)
+			{
+				gyroForce = body->computeGyroscopicImpulseImplicit_World(infoGlobal.m_timeStep);
+				solverBody.m_externalTorqueImpulse += gyroForce;
+			}
+			if (body->getFlags() & BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY)
+			{
+				gyroForce = body->computeGyroscopicImpulseImplicit_Body(infoGlobal.m_timeStep);
+				solverBody.m_externalTorqueImpulse += gyroForce;
+			}
+		}
+	}
+}
+
+struct ConvertBodiesLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	btCollisionObject** m_bodies;
+	int m_numBodies;
+	const btContactSolverInfo& m_infoGlobal;
+
+	ConvertBodiesLoop(btSequentialImpulseConstraintSolverMt* solver,
+					  btCollisionObject** bodies,
+					  int numBodies,
+					  const btContactSolverInfo& infoGlobal) : m_infoGlobal(infoGlobal)
+	{
+		m_solver = solver;
+		m_bodies = bodies;
+		m_numBodies = numBodies;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalConvertBodies(m_bodies, iBegin, iEnd, m_infoGlobal);
+	}
+};
+
+void btSequentialImpulseConstraintSolverMt::convertBodies(btCollisionObject** bodies, int numBodies, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("convertBodies");
+	m_kinematicBodyUniqueIdToSolverBodyTable.resize(0);
+
+	m_tmpSolverBodyPool.resizeNoInitialize(numBodies + 1);
+
+	m_fixedBodyId = numBodies;
+	{
+		btSolverBody& fixedBody = m_tmpSolverBodyPool[m_fixedBodyId];
+		initSolverBody(&fixedBody, NULL, infoGlobal.m_timeStep);
+	}
+
+	bool parallelBodySetup = true;
+	if (parallelBodySetup)
+	{
+		ConvertBodiesLoop loop(this, bodies, numBodies, infoGlobal);
+		int grainSize = 40;
+		btParallelFor(0, numBodies, grainSize, loop);
+	}
+	else
+	{
+		internalConvertBodies(bodies, 0, numBodies, infoGlobal);
+	}
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::solveGroupCacheFriendlySetup(
+	btCollisionObject** bodies,
+	int numBodies,
+	btPersistentManifold** manifoldPtr,
+	int numManifolds,
+	btTypedConstraint** constraints,
+	int numConstraints,
+	const btContactSolverInfo& infoGlobal,
+	btIDebugDraw* debugDrawer)
+{
+	m_numFrictionDirections = (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) ? 2 : 1;
+	m_useBatching = false;
+	if (numManifolds >= s_minimumContactManifoldsForBatching &&
+		(s_allowNestedParallelForLoops || !btThreadsAreRunning()))
+	{
+		m_useBatching = true;
+		m_batchedContactConstraints.m_debugDrawer = debugDrawer;
+		m_batchedJointConstraints.m_debugDrawer = debugDrawer;
+	}
+	btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(bodies,
+																	  numBodies,
+																	  manifoldPtr,
+																	  numManifolds,
+																	  constraints,
+																	  numConstraints,
+																	  infoGlobal,
+																	  debugDrawer);
+	return 0.0f;
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveMultipleContactSplitPenetrationImpulseConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd)
+{
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiCons = batchBegin; iiCons < batchEnd; ++iiCons)
+	{
+		int iCons = consIndices[iiCons];
+		const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[iCons];
+		btSolverBody& bodyA = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA];
+		btSolverBody& bodyB = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB];
+		btScalar residual = resolveSplitPenetrationImpulse(bodyA, bodyB, solveManifold);
+		leastSquaresResidual += residual * residual;
+	}
+	return leastSquaresResidual;
+}
+
+struct ContactSplitPenetrationImpulseSolverLoop : public btIParallelSumBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btBatchedConstraints* m_bc;
+
+	ContactSplitPenetrationImpulseSolverLoop(btSequentialImpulseConstraintSolverMt* solver, const btBatchedConstraints* bc)
+	{
+		m_solver = solver;
+		m_bc = bc;
+	}
+	btScalar sumLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("ContactSplitPenetrationImpulseSolverLoop");
+		btScalar sum = 0;
+		for (int iBatch = iBegin; iBatch < iEnd; ++iBatch)
+		{
+			const btBatchedConstraints::Range& batch = m_bc->m_batches[iBatch];
+			sum += m_solver->resolveMultipleContactSplitPenetrationImpulseConstraints(m_bc->m_constraintIndices, batch.begin, batch.end);
+		}
+		return sum;
+	}
+};
+
+void btSequentialImpulseConstraintSolverMt::solveGroupCacheFriendlySplitImpulseIterations(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	BT_PROFILE("solveGroupCacheFriendlySplitImpulseIterations");
+	if (infoGlobal.m_splitImpulse)
+	{
+		for (int iteration = 0; iteration < infoGlobal.m_numIterations; iteration++)
+		{
+			btScalar leastSquaresResidual = 0.f;
+			if (m_useBatching)
+			{
+				const btBatchedConstraints& batchedCons = m_batchedContactConstraints;
+				ContactSplitPenetrationImpulseSolverLoop loop(this, &batchedCons);
+				btScalar leastSquaresResidual = 0.f;
+				for (int iiPhase = 0; iiPhase < batchedCons.m_phases.size(); ++iiPhase)
+				{
+					int iPhase = batchedCons.m_phaseOrder[iiPhase];
+					const btBatchedConstraints::Range& phase = batchedCons.m_phases[iPhase];
+					int grainSize = batchedCons.m_phaseGrainSize[iPhase];
+					leastSquaresResidual += btParallelSum(phase.begin, phase.end, grainSize, loop);
+				}
+			}
+			else
+			{
+				// non-batched
+				leastSquaresResidual = resolveMultipleContactSplitPenetrationImpulseConstraints(m_orderTmpConstraintPool, 0, m_tmpSolverContactConstraintPool.size());
+			}
+			if (leastSquaresResidual <= infoGlobal.m_leastSquaresResidualThreshold || iteration >= (infoGlobal.m_numIterations - 1))
+			{
+#ifdef VERBOSE_RESIDUAL_PRINTF
+				printf("residual = %f at iteration #%d\n", leastSquaresResidual, iteration);
+#endif
+				break;
+			}
+		}
+	}
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::solveSingleIteration(int iteration, btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	if (!m_useBatching)
+	{
+		return btSequentialImpulseConstraintSolver::solveSingleIteration(iteration, bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+	}
+	BT_PROFILE("solveSingleIterationMt");
+	btScalar leastSquaresResidual = 0.f;
+
+	if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
+	{
+		if (1)  // uncomment this for a bit less random ((iteration & 7) == 0)
+		{
+			randomizeConstraintOrdering(iteration, infoGlobal.m_numIterations);
+		}
+	}
+
+	{
+		///solve all joint constraints
+		leastSquaresResidual += resolveAllJointConstraints(iteration);
+
+		if (iteration < infoGlobal.m_numIterations)
+		{
+			// this loop is only used for cone-twist constraints,
+			// it would be nice to skip this loop if none of the constraints need it
+			if (m_useObsoleteJointConstraints)
+			{
+				for (int j = 0; j < numConstraints; j++)
+				{
+					if (constraints[j]->isEnabled())
+					{
+						int bodyAid = getOrInitSolverBody(constraints[j]->getRigidBodyA(), infoGlobal.m_timeStep);
+						int bodyBid = getOrInitSolverBody(constraints[j]->getRigidBodyB(), infoGlobal.m_timeStep);
+						btSolverBody& bodyA = m_tmpSolverBodyPool[bodyAid];
+						btSolverBody& bodyB = m_tmpSolverBodyPool[bodyBid];
+						constraints[j]->solveConstraintObsolete(bodyA, bodyB, infoGlobal.m_timeStep);
+					}
+				}
+			}
+
+			if (infoGlobal.m_solverMode & SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS)
+			{
+				// solve all contact, contact-friction, and rolling friction constraints interleaved
+				leastSquaresResidual += resolveAllContactConstraintsInterleaved();
+			}
+			else  //SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS
+			{
+				// don't interleave them
+				// solve all contact constraints
+				leastSquaresResidual += resolveAllContactConstraints();
+
+				// solve all contact friction constraints
+				leastSquaresResidual += resolveAllContactFrictionConstraints();
+
+				// solve all rolling friction constraints
+				leastSquaresResidual += resolveAllRollingFrictionConstraints();
+			}
+		}
+	}
+	return leastSquaresResidual;
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveMultipleJointConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd, int iteration)
+{
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiCons = batchBegin; iiCons < batchEnd; ++iiCons)
+	{
+		int iCons = consIndices[iiCons];
+		const btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[iCons];
+		if (iteration < constraint.m_overrideNumSolverIterations)
+		{
+			btSolverBody& bodyA = m_tmpSolverBodyPool[constraint.m_solverBodyIdA];
+			btSolverBody& bodyB = m_tmpSolverBodyPool[constraint.m_solverBodyIdB];
+			btScalar residual = resolveSingleConstraintRowGeneric(bodyA, bodyB, constraint);
+			leastSquaresResidual += residual * residual;
+		}
+	}
+	return leastSquaresResidual;
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveMultipleContactConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd)
+{
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiCons = batchBegin; iiCons < batchEnd; ++iiCons)
+	{
+		int iCons = consIndices[iiCons];
+		const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[iCons];
+		btSolverBody& bodyA = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA];
+		btSolverBody& bodyB = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB];
+		btScalar residual = resolveSingleConstraintRowLowerLimit(bodyA, bodyB, solveManifold);
+		leastSquaresResidual += residual * residual;
+	}
+	return leastSquaresResidual;
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveMultipleContactFrictionConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd)
+{
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiCons = batchBegin; iiCons < batchEnd; ++iiCons)
+	{
+		int iContact = consIndices[iiCons];
+		btScalar totalImpulse = m_tmpSolverContactConstraintPool[iContact].m_appliedImpulse;
+
+		// apply sliding friction
+		if (totalImpulse > 0.0f)
+		{
+			int iBegin = iContact * m_numFrictionDirections;
+			int iEnd = iBegin + m_numFrictionDirections;
+			for (int iFriction = iBegin; iFriction < iEnd; ++iFriction)
+			{
+				btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[iFriction++];
+				btAssert(solveManifold.m_frictionIndex == iContact);
+
+				solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+				solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+				btSolverBody& bodyA = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA];
+				btSolverBody& bodyB = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB];
+				btScalar residual = resolveSingleConstraintRowGeneric(bodyA, bodyB, solveManifold);
+				leastSquaresResidual += residual * residual;
+			}
+		}
+	}
+	return leastSquaresResidual;
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveMultipleContactRollingFrictionConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd)
+{
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiCons = batchBegin; iiCons < batchEnd; ++iiCons)
+	{
+		int iContact = consIndices[iiCons];
+		int iFirstRollingFriction = m_rollingFrictionIndexTable[iContact];
+		if (iFirstRollingFriction >= 0)
+		{
+			btScalar totalImpulse = m_tmpSolverContactConstraintPool[iContact].m_appliedImpulse;
+			// apply rolling friction
+			if (totalImpulse > 0.0f)
+			{
+				int iBegin = iFirstRollingFriction;
+				int iEnd = iBegin + 3;
+				for (int iRollingFric = iBegin; iRollingFric < iEnd; ++iRollingFric)
+				{
+					btSolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[iRollingFric];
+					if (rollingFrictionConstraint.m_frictionIndex != iContact)
+					{
+						break;
+					}
+					btScalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction * totalImpulse;
+					if (rollingFrictionMagnitude > rollingFrictionConstraint.m_friction)
+					{
+						rollingFrictionMagnitude = rollingFrictionConstraint.m_friction;
+					}
+
+					rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude;
+					rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude;
+
+					btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA], m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB], rollingFrictionConstraint);
+					leastSquaresResidual += residual * residual;
+				}
+			}
+		}
+	}
+	return leastSquaresResidual;
+}
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveMultipleContactConstraintsInterleaved(const btAlignedObjectArray<int>& contactIndices,
+																							 int batchBegin,
+																							 int batchEnd)
+{
+	btScalar leastSquaresResidual = 0.f;
+	int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+
+	for (int iiCons = batchBegin; iiCons < batchEnd; iiCons++)
+	{
+		btScalar totalImpulse = 0;
+		int iContact = contactIndices[iiCons];
+		// apply penetration constraint
+		{
+			const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[iContact];
+			btScalar residual = resolveSingleConstraintRowLowerLimit(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+			leastSquaresResidual += residual * residual;
+			totalImpulse = solveManifold.m_appliedImpulse;
+		}
+
+		// apply sliding friction
+		if (totalImpulse > 0.0f)
+		{
+			int iBegin = iContact * m_numFrictionDirections;
+			int iEnd = iBegin + m_numFrictionDirections;
+			for (int iFriction = iBegin; iFriction < iEnd; ++iFriction)
+			{
+				btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[iFriction];
+				btAssert(solveManifold.m_frictionIndex == iContact);
+
+				solveManifold.m_lowerLimit = -(solveManifold.m_friction * totalImpulse);
+				solveManifold.m_upperLimit = solveManifold.m_friction * totalImpulse;
+
+				btSolverBody& bodyA = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA];
+				btSolverBody& bodyB = m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB];
+				btScalar residual = resolveSingleConstraintRowGeneric(bodyA, bodyB, solveManifold);
+				leastSquaresResidual += residual * residual;
+			}
+		}
+
+		// apply rolling friction
+		int iFirstRollingFriction = m_rollingFrictionIndexTable[iContact];
+		if (totalImpulse > 0.0f && iFirstRollingFriction >= 0)
+		{
+			int iBegin = iFirstRollingFriction;
+			int iEnd = iBegin + 3;
+			for (int iRollingFric = iBegin; iRollingFric < iEnd; ++iRollingFric)
+			{
+				btSolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[iRollingFric];
+				if (rollingFrictionConstraint.m_frictionIndex != iContact)
+				{
+					break;
+				}
+				btScalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction * totalImpulse;
+				if (rollingFrictionMagnitude > rollingFrictionConstraint.m_friction)
+				{
+					rollingFrictionMagnitude = rollingFrictionConstraint.m_friction;
+				}
+
+				rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude;
+				rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude;
+
+				btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA], m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB], rollingFrictionConstraint);
+				leastSquaresResidual += residual * residual;
+			}
+		}
+	}
+	return leastSquaresResidual;
+}
+
+void btSequentialImpulseConstraintSolverMt::randomizeBatchedConstraintOrdering(btBatchedConstraints* batchedConstraints)
+{
+	btBatchedConstraints& bc = *batchedConstraints;
+	// randomize ordering of phases
+	for (int ii = 1; ii < bc.m_phaseOrder.size(); ++ii)
+	{
+		int iSwap = btRandInt2(ii + 1);
+		bc.m_phaseOrder.swap(ii, iSwap);
+	}
+
+	// for each batch,
+	for (int iBatch = 0; iBatch < bc.m_batches.size(); ++iBatch)
+	{
+		// randomize ordering of constraints within the batch
+		const btBatchedConstraints::Range& batch = bc.m_batches[iBatch];
+		for (int iiCons = batch.begin; iiCons < batch.end; ++iiCons)
+		{
+			int iSwap = batch.begin + btRandInt2(iiCons - batch.begin + 1);
+			btAssert(iSwap >= batch.begin && iSwap < batch.end);
+			bc.m_constraintIndices.swap(iiCons, iSwap);
+		}
+	}
+}
+
+void btSequentialImpulseConstraintSolverMt::randomizeConstraintOrdering(int iteration, int numIterations)
+{
+	// randomize ordering of joint constraints
+	randomizeBatchedConstraintOrdering(&m_batchedJointConstraints);
+
+	//contact/friction constraints are not solved more than numIterations
+	if (iteration < numIterations)
+	{
+		randomizeBatchedConstraintOrdering(&m_batchedContactConstraints);
+	}
+}
+
+struct JointSolverLoop : public btIParallelSumBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btBatchedConstraints* m_bc;
+	int m_iteration;
+
+	JointSolverLoop(btSequentialImpulseConstraintSolverMt* solver, const btBatchedConstraints* bc, int iteration)
+	{
+		m_solver = solver;
+		m_bc = bc;
+		m_iteration = iteration;
+	}
+	btScalar sumLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("JointSolverLoop");
+		btScalar sum = 0;
+		for (int iBatch = iBegin; iBatch < iEnd; ++iBatch)
+		{
+			const btBatchedConstraints::Range& batch = m_bc->m_batches[iBatch];
+			sum += m_solver->resolveMultipleJointConstraints(m_bc->m_constraintIndices, batch.begin, batch.end, m_iteration);
+		}
+		return sum;
+	}
+};
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveAllJointConstraints(int iteration)
+{
+	BT_PROFILE("resolveAllJointConstraints");
+	const btBatchedConstraints& batchedCons = m_batchedJointConstraints;
+	JointSolverLoop loop(this, &batchedCons, iteration);
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiPhase = 0; iiPhase < batchedCons.m_phases.size(); ++iiPhase)
+	{
+		int iPhase = batchedCons.m_phaseOrder[iiPhase];
+		const btBatchedConstraints::Range& phase = batchedCons.m_phases[iPhase];
+		int grainSize = 1;
+		leastSquaresResidual += btParallelSum(phase.begin, phase.end, grainSize, loop);
+	}
+	return leastSquaresResidual;
+}
+
+struct ContactSolverLoop : public btIParallelSumBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btBatchedConstraints* m_bc;
+
+	ContactSolverLoop(btSequentialImpulseConstraintSolverMt* solver, const btBatchedConstraints* bc)
+	{
+		m_solver = solver;
+		m_bc = bc;
+	}
+	btScalar sumLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("ContactSolverLoop");
+		btScalar sum = 0;
+		for (int iBatch = iBegin; iBatch < iEnd; ++iBatch)
+		{
+			const btBatchedConstraints::Range& batch = m_bc->m_batches[iBatch];
+			sum += m_solver->resolveMultipleContactConstraints(m_bc->m_constraintIndices, batch.begin, batch.end);
+		}
+		return sum;
+	}
+};
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveAllContactConstraints()
+{
+	BT_PROFILE("resolveAllContactConstraints");
+	const btBatchedConstraints& batchedCons = m_batchedContactConstraints;
+	ContactSolverLoop loop(this, &batchedCons);
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiPhase = 0; iiPhase < batchedCons.m_phases.size(); ++iiPhase)
+	{
+		int iPhase = batchedCons.m_phaseOrder[iiPhase];
+		const btBatchedConstraints::Range& phase = batchedCons.m_phases[iPhase];
+		int grainSize = batchedCons.m_phaseGrainSize[iPhase];
+		leastSquaresResidual += btParallelSum(phase.begin, phase.end, grainSize, loop);
+	}
+	return leastSquaresResidual;
+}
+
+struct ContactFrictionSolverLoop : public btIParallelSumBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btBatchedConstraints* m_bc;
+
+	ContactFrictionSolverLoop(btSequentialImpulseConstraintSolverMt* solver, const btBatchedConstraints* bc)
+	{
+		m_solver = solver;
+		m_bc = bc;
+	}
+	btScalar sumLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("ContactFrictionSolverLoop");
+		btScalar sum = 0;
+		for (int iBatch = iBegin; iBatch < iEnd; ++iBatch)
+		{
+			const btBatchedConstraints::Range& batch = m_bc->m_batches[iBatch];
+			sum += m_solver->resolveMultipleContactFrictionConstraints(m_bc->m_constraintIndices, batch.begin, batch.end);
+		}
+		return sum;
+	}
+};
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveAllContactFrictionConstraints()
+{
+	BT_PROFILE("resolveAllContactFrictionConstraints");
+	const btBatchedConstraints& batchedCons = m_batchedContactConstraints;
+	ContactFrictionSolverLoop loop(this, &batchedCons);
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiPhase = 0; iiPhase < batchedCons.m_phases.size(); ++iiPhase)
+	{
+		int iPhase = batchedCons.m_phaseOrder[iiPhase];
+		const btBatchedConstraints::Range& phase = batchedCons.m_phases[iPhase];
+		int grainSize = batchedCons.m_phaseGrainSize[iPhase];
+		leastSquaresResidual += btParallelSum(phase.begin, phase.end, grainSize, loop);
+	}
+	return leastSquaresResidual;
+}
+
+struct InterleavedContactSolverLoop : public btIParallelSumBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btBatchedConstraints* m_bc;
+
+	InterleavedContactSolverLoop(btSequentialImpulseConstraintSolverMt* solver, const btBatchedConstraints* bc)
+	{
+		m_solver = solver;
+		m_bc = bc;
+	}
+	btScalar sumLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("InterleavedContactSolverLoop");
+		btScalar sum = 0;
+		for (int iBatch = iBegin; iBatch < iEnd; ++iBatch)
+		{
+			const btBatchedConstraints::Range& batch = m_bc->m_batches[iBatch];
+			sum += m_solver->resolveMultipleContactConstraintsInterleaved(m_bc->m_constraintIndices, batch.begin, batch.end);
+		}
+		return sum;
+	}
+};
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveAllContactConstraintsInterleaved()
+{
+	BT_PROFILE("resolveAllContactConstraintsInterleaved");
+	const btBatchedConstraints& batchedCons = m_batchedContactConstraints;
+	InterleavedContactSolverLoop loop(this, &batchedCons);
+	btScalar leastSquaresResidual = 0.f;
+	for (int iiPhase = 0; iiPhase < batchedCons.m_phases.size(); ++iiPhase)
+	{
+		int iPhase = batchedCons.m_phaseOrder[iiPhase];
+		const btBatchedConstraints::Range& phase = batchedCons.m_phases[iPhase];
+		int grainSize = 1;
+		leastSquaresResidual += btParallelSum(phase.begin, phase.end, grainSize, loop);
+	}
+	return leastSquaresResidual;
+}
+
+struct ContactRollingFrictionSolverLoop : public btIParallelSumBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btBatchedConstraints* m_bc;
+
+	ContactRollingFrictionSolverLoop(btSequentialImpulseConstraintSolverMt* solver, const btBatchedConstraints* bc)
+	{
+		m_solver = solver;
+		m_bc = bc;
+	}
+	btScalar sumLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		BT_PROFILE("ContactFrictionSolverLoop");
+		btScalar sum = 0;
+		for (int iBatch = iBegin; iBatch < iEnd; ++iBatch)
+		{
+			const btBatchedConstraints::Range& batch = m_bc->m_batches[iBatch];
+			sum += m_solver->resolveMultipleContactRollingFrictionConstraints(m_bc->m_constraintIndices, batch.begin, batch.end);
+		}
+		return sum;
+	}
+};
+
+btScalar btSequentialImpulseConstraintSolverMt::resolveAllRollingFrictionConstraints()
+{
+	BT_PROFILE("resolveAllRollingFrictionConstraints");
+	btScalar leastSquaresResidual = 0.f;
+	//
+	// We do not generate batches for rolling friction constraints. We assume that
+	// one of two cases is true:
+	//
+	//  1. either most bodies in the simulation have rolling friction, in which case we can use the
+	//     batches for contacts and use a lookup table to translate contact indices to rolling friction
+	//     (ignoring any contact indices that don't map to a rolling friction constraint). As long as
+	//     most contacts have a corresponding rolling friction constraint, this should parallelize well.
+	//
+	//  -OR-
+	//
+	//  2. few bodies in the simulation have rolling friction, so it is not worth trying to use the
+	//     batches from contacts as most of the contacts won't have corresponding rolling friction
+	//     constraints and most threads would end up doing very little work. Most of the time would
+	//     go to threading overhead, so we don't bother with threading.
+	//
+	int numRollingFrictionPoolConstraints = m_tmpSolverContactRollingFrictionConstraintPool.size();
+	if (numRollingFrictionPoolConstraints >= m_tmpSolverContactConstraintPool.size())
+	{
+		// use batching if there are many rolling friction constraints
+		const btBatchedConstraints& batchedCons = m_batchedContactConstraints;
+		ContactRollingFrictionSolverLoop loop(this, &batchedCons);
+		btScalar leastSquaresResidual = 0.f;
+		for (int iiPhase = 0; iiPhase < batchedCons.m_phases.size(); ++iiPhase)
+		{
+			int iPhase = batchedCons.m_phaseOrder[iiPhase];
+			const btBatchedConstraints::Range& phase = batchedCons.m_phases[iPhase];
+			int grainSize = 1;
+			leastSquaresResidual += btParallelSum(phase.begin, phase.end, grainSize, loop);
+		}
+	}
+	else
+	{
+		// no batching, also ignores SOLVER_RANDMIZE_ORDER
+		for (int j = 0; j < numRollingFrictionPoolConstraints; j++)
+		{
+			btSolverConstraint& rollingFrictionConstraint = m_tmpSolverContactRollingFrictionConstraintPool[j];
+			if (rollingFrictionConstraint.m_frictionIndex >= 0)
+			{
+				btScalar totalImpulse = m_tmpSolverContactConstraintPool[rollingFrictionConstraint.m_frictionIndex].m_appliedImpulse;
+				if (totalImpulse > 0.0f)
+				{
+					btScalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction * totalImpulse;
+					if (rollingFrictionMagnitude > rollingFrictionConstraint.m_friction)
+						rollingFrictionMagnitude = rollingFrictionConstraint.m_friction;
+
+					rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude;
+					rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude;
+
+					btScalar residual = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA], m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB], rollingFrictionConstraint);
+					leastSquaresResidual += residual * residual;
+				}
+			}
+		}
+	}
+	return leastSquaresResidual;
+}
+
+void btSequentialImpulseConstraintSolverMt::internalWriteBackContacts(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("internalWriteBackContacts");
+	writeBackContacts(iBegin, iEnd, infoGlobal);
+	//for ( int iContact = iBegin; iContact < iEnd; ++iContact)
+	//{
+	//    const btSolverConstraint& contactConstraint = m_tmpSolverContactConstraintPool[ iContact ];
+	//    btManifoldPoint* pt = (btManifoldPoint*) contactConstraint.m_originalContactPoint;
+	//    btAssert( pt );
+	//    pt->m_appliedImpulse = contactConstraint.m_appliedImpulse;
+	//    pt->m_appliedImpulseLateral1 = m_tmpSolverContactFrictionConstraintPool[ contactConstraint.m_frictionIndex ].m_appliedImpulse;
+	//    if ( m_numFrictionDirections == 2 )
+	//    {
+	//        pt->m_appliedImpulseLateral2 = m_tmpSolverContactFrictionConstraintPool[ contactConstraint.m_frictionIndex + 1 ].m_appliedImpulse;
+	//    }
+	//}
+}
+
+void btSequentialImpulseConstraintSolverMt::internalWriteBackJoints(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("internalWriteBackJoints");
+	writeBackJoints(iBegin, iEnd, infoGlobal);
+}
+
+void btSequentialImpulseConstraintSolverMt::internalWriteBackBodies(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("internalWriteBackBodies");
+	writeBackBodies(iBegin, iEnd, infoGlobal);
+}
+
+struct WriteContactPointsLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btContactSolverInfo* m_infoGlobal;
+
+	WriteContactPointsLoop(btSequentialImpulseConstraintSolverMt* solver, const btContactSolverInfo& infoGlobal)
+	{
+		m_solver = solver;
+		m_infoGlobal = &infoGlobal;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalWriteBackContacts(iBegin, iEnd, *m_infoGlobal);
+	}
+};
+
+struct WriteJointsLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btContactSolverInfo* m_infoGlobal;
+
+	WriteJointsLoop(btSequentialImpulseConstraintSolverMt* solver, const btContactSolverInfo& infoGlobal)
+	{
+		m_solver = solver;
+		m_infoGlobal = &infoGlobal;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalWriteBackJoints(iBegin, iEnd, *m_infoGlobal);
+	}
+};
+
+struct WriteBodiesLoop : public btIParallelForBody
+{
+	btSequentialImpulseConstraintSolverMt* m_solver;
+	const btContactSolverInfo* m_infoGlobal;
+
+	WriteBodiesLoop(btSequentialImpulseConstraintSolverMt* solver, const btContactSolverInfo& infoGlobal)
+	{
+		m_solver = solver;
+		m_infoGlobal = &infoGlobal;
+	}
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		m_solver->internalWriteBackBodies(iBegin, iEnd, *m_infoGlobal);
+	}
+};
+
+btScalar btSequentialImpulseConstraintSolverMt::solveGroupCacheFriendlyFinish(btCollisionObject** bodies, int numBodies, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("solveGroupCacheFriendlyFinish");
+
+	if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+	{
+		WriteContactPointsLoop loop(this, infoGlobal);
+		int grainSize = 500;
+		btParallelFor(0, m_tmpSolverContactConstraintPool.size(), grainSize, loop);
+	}
+
+	{
+		WriteJointsLoop loop(this, infoGlobal);
+		int grainSize = 400;
+		btParallelFor(0, m_tmpSolverNonContactConstraintPool.size(), grainSize, loop);
+	}
+	{
+		WriteBodiesLoop loop(this, infoGlobal);
+		int grainSize = 100;
+		btParallelFor(0, m_tmpSolverBodyPool.size(), grainSize, loop);
+	}
+
+	m_tmpSolverContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverNonContactConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactFrictionConstraintPool.resizeNoInitialize(0);
+	m_tmpSolverContactRollingFrictionConstraintPool.resizeNoInitialize(0);
+
+	m_tmpSolverBodyPool.resizeNoInitialize(0);
+	return 0.f;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h
new file mode 100644
index 0000000..73a9915
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h
@@ -0,0 +1,150 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_MT_H
+#define BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_MT_H
+
+#include "btSequentialImpulseConstraintSolver.h"
+#include "btBatchedConstraints.h"
+#include "LinearMath/btThreads.h"
+
+///
+/// btSequentialImpulseConstraintSolverMt
+///
+///  A multithreaded variant of the sequential impulse constraint solver. The constraints to be solved are grouped into
+///  batches and phases where each batch of constraints within a given phase can be solved in parallel with the rest.
+///  Ideally we want as few phases as possible, and each phase should have many batches, and all of the batches should
+///  have about the same number of constraints.
+///  This method works best on a large island of many constraints.
+///
+///  Supports all of the features of the normal sequential impulse solver such as:
+///    - split penetration impulse
+///    - rolling friction
+///    - interleaving constraints
+///    - warmstarting
+///    - 2 friction directions
+///    - randomized constraint ordering
+///    - early termination when leastSquaresResidualThreshold is satisfied
+///
+///  When the SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS flag is enabled, unlike the normal SequentialImpulse solver,
+///  the rolling friction is interleaved as well.
+///  Interleaving the contact penetration constraints with friction reduces the number of parallel loops that need to be done,
+///  which reduces threading overhead so it can be a performance win, however, it does seem to produce a less stable simulation,
+///  at least on stacks of blocks.
+///
+///  When the SOLVER_RANDMIZE_ORDER flag is enabled, the ordering of phases, and the ordering of constraints within each batch
+///  is randomized, however it does not swap constraints between batches.
+///  This is to avoid regenerating the batches for each solver iteration which would be quite costly in performance.
+///
+///  Note that a non-zero leastSquaresResidualThreshold could possibly affect the determinism of the simulation
+///  if the task scheduler's parallelSum operation is non-deterministic. The parallelSum operation can be non-deterministic
+///  because floating point addition is not associative due to rounding errors.
+///  The task scheduler can and should ensure that the result of any parallelSum operation is deterministic.
+///
+ATTRIBUTE_ALIGNED16(class)
+btSequentialImpulseConstraintSolverMt : public btSequentialImpulseConstraintSolver
+{
+public:
+	virtual void solveGroupCacheFriendlySplitImpulseIterations(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer) BT_OVERRIDE;
+	virtual btScalar solveSingleIteration(int iteration, btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer) BT_OVERRIDE;
+	virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer) BT_OVERRIDE;
+	virtual btScalar solveGroupCacheFriendlyFinish(btCollisionObject * *bodies, int numBodies, const btContactSolverInfo& infoGlobal) BT_OVERRIDE;
+
+	// temp struct used to collect info from persistent manifolds into a cache-friendly struct using multiple threads
+	struct btContactManifoldCachedInfo
+	{
+		static const int MAX_NUM_CONTACT_POINTS = 4;
+
+		int numTouchingContacts;
+		int solverBodyIds[2];
+		int contactIndex;
+		int rollingFrictionIndex;
+		bool contactHasRollingFriction[MAX_NUM_CONTACT_POINTS];
+		btManifoldPoint* contactPoints[MAX_NUM_CONTACT_POINTS];
+	};
+	// temp struct used for setting up joint constraints in parallel
+	struct JointParams
+	{
+		int m_solverConstraint;
+		int m_solverBodyA;
+		int m_solverBodyB;
+	};
+	void internalInitMultipleJoints(btTypedConstraint * *constraints, int iBegin, int iEnd);
+	void internalConvertMultipleJoints(const btAlignedObjectArray<JointParams>& jointParamsArray, btTypedConstraint** constraints, int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+
+	// parameters to control batching
+	static bool s_allowNestedParallelForLoops;        // whether to allow nested parallel operations
+	static int s_minimumContactManifoldsForBatching;  // don't even try to batch if fewer manifolds than this
+	static btBatchedConstraints::BatchingMethod s_contactBatchingMethod;
+	static btBatchedConstraints::BatchingMethod s_jointBatchingMethod;
+	static int s_minBatchSize;  // desired number of constraints per batch
+	static int s_maxBatchSize;
+
+protected:
+	static const int CACHE_LINE_SIZE = 64;
+
+	btBatchedConstraints m_batchedContactConstraints;
+	btBatchedConstraints m_batchedJointConstraints;
+	int m_numFrictionDirections;
+	bool m_useBatching;
+	bool m_useObsoleteJointConstraints;
+	btAlignedObjectArray<btContactManifoldCachedInfo> m_manifoldCachedInfoArray;
+	btAlignedObjectArray<int> m_rollingFrictionIndexTable;  // lookup table mapping contact index to rolling friction index
+	btSpinMutex m_bodySolverArrayMutex;
+	char m_antiFalseSharingPadding[CACHE_LINE_SIZE];  // padding to keep mutexes in separate cachelines
+	btSpinMutex m_kinematicBodyUniqueIdToSolverBodyTableMutex;
+	btAlignedObjectArray<char> m_scratchMemory;
+
+	virtual void randomizeConstraintOrdering(int iteration, int numIterations);
+	virtual btScalar resolveAllJointConstraints(int iteration);
+	virtual btScalar resolveAllContactConstraints();
+	virtual btScalar resolveAllContactFrictionConstraints();
+	virtual btScalar resolveAllContactConstraintsInterleaved();
+	virtual btScalar resolveAllRollingFrictionConstraints();
+
+	virtual void setupBatchedContactConstraints();
+	virtual void setupBatchedJointConstraints();
+	virtual void convertJoints(btTypedConstraint * *constraints, int numConstraints, const btContactSolverInfo& infoGlobal) BT_OVERRIDE;
+	virtual void convertContacts(btPersistentManifold * *manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal) BT_OVERRIDE;
+	virtual void convertBodies(btCollisionObject * *bodies, int numBodies, const btContactSolverInfo& infoGlobal) BT_OVERRIDE;
+
+	int getOrInitSolverBodyThreadsafe(btCollisionObject & body, btScalar timeStep);
+	void allocAllContactConstraints(btPersistentManifold * *manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal);
+	void setupAllContactConstraints(const btContactSolverInfo& infoGlobal);
+	void randomizeBatchedConstraintOrdering(btBatchedConstraints * batchedConstraints);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btSequentialImpulseConstraintSolverMt();
+	virtual ~btSequentialImpulseConstraintSolverMt();
+
+	btScalar resolveMultipleJointConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd, int iteration);
+	btScalar resolveMultipleContactConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd);
+	btScalar resolveMultipleContactSplitPenetrationImpulseConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd);
+	btScalar resolveMultipleContactFrictionConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd);
+	btScalar resolveMultipleContactRollingFrictionConstraints(const btAlignedObjectArray<int>& consIndices, int batchBegin, int batchEnd);
+	btScalar resolveMultipleContactConstraintsInterleaved(const btAlignedObjectArray<int>& contactIndices, int batchBegin, int batchEnd);
+
+	void internalCollectContactManifoldCachedInfo(btContactManifoldCachedInfo * cachedInfoArray, btPersistentManifold * *manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal);
+	void internalAllocContactConstraints(const btContactManifoldCachedInfo* cachedInfoArray, int numManifolds);
+	void internalSetupContactConstraints(int iContactConstraint, const btContactSolverInfo& infoGlobal);
+	void internalConvertBodies(btCollisionObject * *bodies, int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+	void internalWriteBackContacts(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+	void internalWriteBackJoints(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+	void internalWriteBackBodies(int iBegin, int iEnd, const btContactSolverInfo& infoGlobal);
+};
+
+#endif  //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_MT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
new file mode 100755
index 0000000..e42223c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
@@ -0,0 +1,823 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+Added by Roman Ponomarev (rponom@gmail.com)
+April 04, 2008
+*/
+
+#include "btSliderConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+#include <new>
+
+#define USE_OFFSET_FOR_CONSTANT_FRAME true
+
+void btSliderConstraint::initParams()
+{
+	m_lowerLinLimit = btScalar(1.0);
+	m_upperLinLimit = btScalar(-1.0);
+	m_lowerAngLimit = btScalar(0.);
+	m_upperAngLimit = btScalar(0.);
+	m_softnessDirLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionDirLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingDirLin = btScalar(0.);
+	m_cfmDirLin = SLIDER_CONSTRAINT_DEF_CFM;
+	m_softnessDirAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionDirAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingDirAng = btScalar(0.);
+	m_cfmDirAng = SLIDER_CONSTRAINT_DEF_CFM;
+	m_softnessOrthoLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionOrthoLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingOrthoLin = SLIDER_CONSTRAINT_DEF_DAMPING;
+	m_cfmOrthoLin = SLIDER_CONSTRAINT_DEF_CFM;
+	m_softnessOrthoAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionOrthoAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingOrthoAng = SLIDER_CONSTRAINT_DEF_DAMPING;
+	m_cfmOrthoAng = SLIDER_CONSTRAINT_DEF_CFM;
+	m_softnessLimLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionLimLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingLimLin = SLIDER_CONSTRAINT_DEF_DAMPING;
+	m_cfmLimLin = SLIDER_CONSTRAINT_DEF_CFM;
+	m_softnessLimAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionLimAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingLimAng = SLIDER_CONSTRAINT_DEF_DAMPING;
+	m_cfmLimAng = SLIDER_CONSTRAINT_DEF_CFM;
+
+	m_poweredLinMotor = false;
+	m_targetLinMotorVelocity = btScalar(0.);
+	m_maxLinMotorForce = btScalar(0.);
+	m_accumulatedLinMotorImpulse = btScalar(0.0);
+
+	m_poweredAngMotor = false;
+	m_targetAngMotorVelocity = btScalar(0.);
+	m_maxAngMotorForce = btScalar(0.);
+	m_accumulatedAngMotorImpulse = btScalar(0.0);
+
+	m_flags = 0;
+	m_flags = 0;
+
+	m_useOffsetForConstraintFrame = USE_OFFSET_FOR_CONSTANT_FRAME;
+
+	calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+}
+
+btSliderConstraint::btSliderConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA)
+	: btTypedConstraint(SLIDER_CONSTRAINT_TYPE, rbA, rbB),
+	  m_useSolveConstraintObsolete(false),
+	  m_frameInA(frameInA),
+	  m_frameInB(frameInB),
+	  m_useLinearReferenceFrameA(useLinearReferenceFrameA)
+{
+	initParams();
+}
+
+btSliderConstraint::btSliderConstraint(btRigidBody& rbB, const btTransform& frameInB, bool useLinearReferenceFrameA)
+	: btTypedConstraint(SLIDER_CONSTRAINT_TYPE, getFixedBody(), rbB),
+	  m_useSolveConstraintObsolete(false),
+	  m_frameInB(frameInB),
+	  m_useLinearReferenceFrameA(useLinearReferenceFrameA)
+{
+	///not providing rigidbody A means implicitly using worldspace for body A
+	m_frameInA = rbB.getCenterOfMassTransform() * m_frameInB;
+	//	m_frameInA.getOrigin() = m_rbA.getCenterOfMassTransform()(m_frameInA.getOrigin());
+
+	initParams();
+}
+
+void btSliderConstraint::getInfo1(btConstraintInfo1* info)
+{
+	if (m_useSolveConstraintObsolete)
+	{
+		info->m_numConstraintRows = 0;
+		info->nub = 0;
+	}
+	else
+	{
+		info->m_numConstraintRows = 4;  // Fixed 2 linear + 2 angular
+		info->nub = 2;
+		//prepare constraint
+		calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+		testAngLimits();
+		testLinLimits();
+		if (getSolveLinLimit() || getPoweredLinMotor())
+		{
+			info->m_numConstraintRows++;  // limit 3rd linear as well
+			info->nub--;
+		}
+		if (getSolveAngLimit() || getPoweredAngMotor())
+		{
+			info->m_numConstraintRows++;  // limit 3rd angular as well
+			info->nub--;
+		}
+	}
+}
+
+void btSliderConstraint::getInfo1NonVirtual(btConstraintInfo1* info)
+{
+	info->m_numConstraintRows = 6;  // Fixed 2 linear + 2 angular + 1 limit (even if not used)
+	info->nub = 0;
+}
+
+void btSliderConstraint::getInfo2(btConstraintInfo2* info)
+{
+	getInfo2NonVirtual(info, m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform(), m_rbA.getLinearVelocity(), m_rbB.getLinearVelocity(), m_rbA.getInvMass(), m_rbB.getInvMass());
+}
+
+void btSliderConstraint::calculateTransforms(const btTransform& transA, const btTransform& transB)
+{
+	if (m_useLinearReferenceFrameA || (!m_useSolveConstraintObsolete))
+	{
+		m_calculatedTransformA = transA * m_frameInA;
+		m_calculatedTransformB = transB * m_frameInB;
+	}
+	else
+	{
+		m_calculatedTransformA = transB * m_frameInB;
+		m_calculatedTransformB = transA * m_frameInA;
+	}
+	m_realPivotAInW = m_calculatedTransformA.getOrigin();
+	m_realPivotBInW = m_calculatedTransformB.getOrigin();
+	m_sliderAxis = m_calculatedTransformA.getBasis().getColumn(0);  // along X
+	if (m_useLinearReferenceFrameA || m_useSolveConstraintObsolete)
+	{
+		m_delta = m_realPivotBInW - m_realPivotAInW;
+	}
+	else
+	{
+		m_delta = m_realPivotAInW - m_realPivotBInW;
+	}
+	m_projPivotInW = m_realPivotAInW + m_sliderAxis.dot(m_delta) * m_sliderAxis;
+	btVector3 normalWorld;
+	int i;
+	//linear part
+	for (i = 0; i < 3; i++)
+	{
+		normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
+		m_depth[i] = m_delta.dot(normalWorld);
+	}
+}
+
+void btSliderConstraint::testLinLimits(void)
+{
+	m_solveLinLim = false;
+	m_linPos = m_depth[0];
+	if (m_lowerLinLimit <= m_upperLinLimit)
+	{
+		if (m_depth[0] > m_upperLinLimit)
+		{
+			m_depth[0] -= m_upperLinLimit;
+			m_solveLinLim = true;
+		}
+		else if (m_depth[0] < m_lowerLinLimit)
+		{
+			m_depth[0] -= m_lowerLinLimit;
+			m_solveLinLim = true;
+		}
+		else
+		{
+			m_depth[0] = btScalar(0.);
+		}
+	}
+	else
+	{
+		m_depth[0] = btScalar(0.);
+	}
+}
+
+void btSliderConstraint::testAngLimits(void)
+{
+	m_angDepth = btScalar(0.);
+	m_solveAngLim = false;
+	if (m_lowerAngLimit <= m_upperAngLimit)
+	{
+		const btVector3 axisA0 = m_calculatedTransformA.getBasis().getColumn(1);
+		const btVector3 axisA1 = m_calculatedTransformA.getBasis().getColumn(2);
+		const btVector3 axisB0 = m_calculatedTransformB.getBasis().getColumn(1);
+		//		btScalar rot = btAtan2Fast(axisB0.dot(axisA1), axisB0.dot(axisA0));
+		btScalar rot = btAtan2(axisB0.dot(axisA1), axisB0.dot(axisA0));
+		rot = btAdjustAngleToLimits(rot, m_lowerAngLimit, m_upperAngLimit);
+		m_angPos = rot;
+		if (rot < m_lowerAngLimit)
+		{
+			m_angDepth = rot - m_lowerAngLimit;
+			m_solveAngLim = true;
+		}
+		else if (rot > m_upperAngLimit)
+		{
+			m_angDepth = rot - m_upperAngLimit;
+			m_solveAngLim = true;
+		}
+	}
+}
+
+btVector3 btSliderConstraint::getAncorInA(void)
+{
+	btVector3 ancorInA;
+	ancorInA = m_realPivotAInW + (m_lowerLinLimit + m_upperLinLimit) * btScalar(0.5) * m_sliderAxis;
+	ancorInA = m_rbA.getCenterOfMassTransform().inverse() * ancorInA;
+	return ancorInA;
+}
+
+btVector3 btSliderConstraint::getAncorInB(void)
+{
+	btVector3 ancorInB;
+	ancorInB = m_frameInB.getOrigin();
+	return ancorInB;
+}
+
+void btSliderConstraint::getInfo2NonVirtual(btConstraintInfo2* info, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, btScalar rbAinvMass, btScalar rbBinvMass)
+{
+	const btTransform& trA = getCalculatedTransformA();
+	const btTransform& trB = getCalculatedTransformB();
+
+	btAssert(!m_useSolveConstraintObsolete);
+	int i, s = info->rowskip;
+
+	btScalar signFact = m_useLinearReferenceFrameA ? btScalar(1.0f) : btScalar(-1.0f);
+
+	// difference between frames in WCS
+	btVector3 ofs = trB.getOrigin() - trA.getOrigin();
+	// now get weight factors depending on masses
+	btScalar miA = rbAinvMass;
+	btScalar miB = rbBinvMass;
+	bool hasStaticBody = (miA < SIMD_EPSILON) || (miB < SIMD_EPSILON);
+	btScalar miS = miA + miB;
+	btScalar factA, factB;
+	if (miS > btScalar(0.f))
+	{
+		factA = miB / miS;
+	}
+	else
+	{
+		factA = btScalar(0.5f);
+	}
+	factB = btScalar(1.0f) - factA;
+	btVector3 ax1, p, q;
+	btVector3 ax1A = trA.getBasis().getColumn(0);
+	btVector3 ax1B = trB.getBasis().getColumn(0);
+	if (m_useOffsetForConstraintFrame)
+	{
+		// get the desired direction of slider axis
+		// as weighted sum of X-orthos of frameA and frameB in WCS
+		ax1 = ax1A * factA + ax1B * factB;
+		ax1.normalize();
+		// construct two orthos to slider axis
+		btPlaneSpace1(ax1, p, q);
+	}
+	else
+	{  // old way - use frameA
+		ax1 = trA.getBasis().getColumn(0);
+		// get 2 orthos to slider axis (Y, Z)
+		p = trA.getBasis().getColumn(1);
+		q = trA.getBasis().getColumn(2);
+	}
+	// make rotations around these orthos equal
+	// the slider axis should be the only unconstrained
+	// rotational axis, the angular velocity of the two bodies perpendicular to
+	// the slider axis should be equal. thus the constraint equations are
+	//    p*w1 - p*w2 = 0
+	//    q*w1 - q*w2 = 0
+	// where p and q are unit vectors normal to the slider axis, and w1 and w2
+	// are the angular velocity vectors of the two bodies.
+	info->m_J1angularAxis[0] = p[0];
+	info->m_J1angularAxis[1] = p[1];
+	info->m_J1angularAxis[2] = p[2];
+	info->m_J1angularAxis[s + 0] = q[0];
+	info->m_J1angularAxis[s + 1] = q[1];
+	info->m_J1angularAxis[s + 2] = q[2];
+
+	info->m_J2angularAxis[0] = -p[0];
+	info->m_J2angularAxis[1] = -p[1];
+	info->m_J2angularAxis[2] = -p[2];
+	info->m_J2angularAxis[s + 0] = -q[0];
+	info->m_J2angularAxis[s + 1] = -q[1];
+	info->m_J2angularAxis[s + 2] = -q[2];
+	// compute the right hand side of the constraint equation. set relative
+	// body velocities along p and q to bring the slider back into alignment.
+	// if ax1A,ax1B are the unit length slider axes as computed from bodyA and
+	// bodyB, we need to rotate both bodies along the axis u = (ax1 x ax2).
+	// if "theta" is the angle between ax1 and ax2, we need an angular velocity
+	// along u to cover angle erp*theta in one step :
+	//   |angular_velocity| = angle/time = erp*theta / stepsize
+	//                      = (erp*fps) * theta
+	//    angular_velocity  = |angular_velocity| * (ax1 x ax2) / |ax1 x ax2|
+	//                      = (erp*fps) * theta * (ax1 x ax2) / sin(theta)
+	// ...as ax1 and ax2 are unit length. if theta is smallish,
+	// theta ~= sin(theta), so
+	//    angular_velocity  = (erp*fps) * (ax1 x ax2)
+	// ax1 x ax2 is in the plane space of ax1, so we project the angular
+	// velocity to p and q to find the right hand side.
+	//	btScalar k = info->fps * info->erp * getSoftnessOrthoAng();
+	btScalar currERP = (m_flags & BT_SLIDER_FLAGS_ERP_ORTANG) ? m_softnessOrthoAng : m_softnessOrthoAng * info->erp;
+	btScalar k = info->fps * currERP;
+
+	btVector3 u = ax1A.cross(ax1B);
+	info->m_constraintError[0] = k * u.dot(p);
+	info->m_constraintError[s] = k * u.dot(q);
+	if (m_flags & BT_SLIDER_FLAGS_CFM_ORTANG)
+	{
+		info->cfm[0] = m_cfmOrthoAng;
+		info->cfm[s] = m_cfmOrthoAng;
+	}
+
+	int nrow = 1;  // last filled row
+	int srow;
+	btScalar limit_err;
+	int limit;
+
+	// next two rows.
+	// we want: velA + wA x relA == velB + wB x relB ... but this would
+	// result in three equations, so we project along two orthos to the slider axis
+
+	btTransform bodyA_trans = transA;
+	btTransform bodyB_trans = transB;
+	nrow++;
+	int s2 = nrow * s;
+	nrow++;
+	int s3 = nrow * s;
+	btVector3 tmpA(0, 0, 0), tmpB(0, 0, 0), relA(0, 0, 0), relB(0, 0, 0), c(0, 0, 0);
+	if (m_useOffsetForConstraintFrame)
+	{
+		// get vector from bodyB to frameB in WCS
+		relB = trB.getOrigin() - bodyB_trans.getOrigin();
+		// get its projection to slider axis
+		btVector3 projB = ax1 * relB.dot(ax1);
+		// get vector directed from bodyB to slider axis (and orthogonal to it)
+		btVector3 orthoB = relB - projB;
+		// same for bodyA
+		relA = trA.getOrigin() - bodyA_trans.getOrigin();
+		btVector3 projA = ax1 * relA.dot(ax1);
+		btVector3 orthoA = relA - projA;
+		// get desired offset between frames A and B along slider axis
+		btScalar sliderOffs = m_linPos - m_depth[0];
+		// desired vector from projection of center of bodyA to projection of center of bodyB to slider axis
+		btVector3 totalDist = projA + ax1 * sliderOffs - projB;
+		// get offset vectors relA and relB
+		relA = orthoA + totalDist * factA;
+		relB = orthoB - totalDist * factB;
+		// now choose average ortho to slider axis
+		p = orthoB * factA + orthoA * factB;
+		btScalar len2 = p.length2();
+		if (len2 > SIMD_EPSILON)
+		{
+			p /= btSqrt(len2);
+		}
+		else
+		{
+			p = trA.getBasis().getColumn(1);
+		}
+		// make one more ortho
+		q = ax1.cross(p);
+		// fill two rows
+		tmpA = relA.cross(p);
+		tmpB = relB.cross(p);
+		for (i = 0; i < 3; i++) info->m_J1angularAxis[s2 + i] = tmpA[i];
+		for (i = 0; i < 3; i++) info->m_J2angularAxis[s2 + i] = -tmpB[i];
+		tmpA = relA.cross(q);
+		tmpB = relB.cross(q);
+		if (hasStaticBody && getSolveAngLimit())
+		{  // to make constraint between static and dynamic objects more rigid
+			// remove wA (or wB) from equation if angular limit is hit
+			tmpB *= factB;
+			tmpA *= factA;
+		}
+		for (i = 0; i < 3; i++) info->m_J1angularAxis[s3 + i] = tmpA[i];
+		for (i = 0; i < 3; i++) info->m_J2angularAxis[s3 + i] = -tmpB[i];
+		for (i = 0; i < 3; i++) info->m_J1linearAxis[s2 + i] = p[i];
+		for (i = 0; i < 3; i++) info->m_J1linearAxis[s3 + i] = q[i];
+		for (i = 0; i < 3; i++) info->m_J2linearAxis[s2 + i] = -p[i];
+		for (i = 0; i < 3; i++) info->m_J2linearAxis[s3 + i] = -q[i];
+	}
+	else
+	{  // old way - maybe incorrect if bodies are not on the slider axis
+		// see discussion "Bug in slider constraint" http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=4024&start=0
+		c = bodyB_trans.getOrigin() - bodyA_trans.getOrigin();
+		btVector3 tmp = c.cross(p);
+		for (i = 0; i < 3; i++) info->m_J1angularAxis[s2 + i] = factA * tmp[i];
+		for (i = 0; i < 3; i++) info->m_J2angularAxis[s2 + i] = factB * tmp[i];
+		tmp = c.cross(q);
+		for (i = 0; i < 3; i++) info->m_J1angularAxis[s3 + i] = factA * tmp[i];
+		for (i = 0; i < 3; i++) info->m_J2angularAxis[s3 + i] = factB * tmp[i];
+
+		for (i = 0; i < 3; i++) info->m_J1linearAxis[s2 + i] = p[i];
+		for (i = 0; i < 3; i++) info->m_J1linearAxis[s3 + i] = q[i];
+		for (i = 0; i < 3; i++) info->m_J2linearAxis[s2 + i] = -p[i];
+		for (i = 0; i < 3; i++) info->m_J2linearAxis[s3 + i] = -q[i];
+	}
+	// compute two elements of right hand side
+
+	//	k = info->fps * info->erp * getSoftnessOrthoLin();
+	currERP = (m_flags & BT_SLIDER_FLAGS_ERP_ORTLIN) ? m_softnessOrthoLin : m_softnessOrthoLin * info->erp;
+	k = info->fps * currERP;
+
+	btScalar rhs = k * p.dot(ofs);
+	info->m_constraintError[s2] = rhs;
+	rhs = k * q.dot(ofs);
+	info->m_constraintError[s3] = rhs;
+	if (m_flags & BT_SLIDER_FLAGS_CFM_ORTLIN)
+	{
+		info->cfm[s2] = m_cfmOrthoLin;
+		info->cfm[s3] = m_cfmOrthoLin;
+	}
+
+	// check linear limits
+	limit_err = btScalar(0.0);
+	limit = 0;
+	if (getSolveLinLimit())
+	{
+		limit_err = getLinDepth() * signFact;
+		limit = (limit_err > btScalar(0.0)) ? 2 : 1;
+	}
+	bool powered = getPoweredLinMotor();
+	// if the slider has joint limits or motor, add in the extra row
+	if (limit || powered)
+	{
+		nrow++;
+		srow = nrow * info->rowskip;
+		info->m_J1linearAxis[srow + 0] = ax1[0];
+		info->m_J1linearAxis[srow + 1] = ax1[1];
+		info->m_J1linearAxis[srow + 2] = ax1[2];
+		info->m_J2linearAxis[srow + 0] = -ax1[0];
+		info->m_J2linearAxis[srow + 1] = -ax1[1];
+		info->m_J2linearAxis[srow + 2] = -ax1[2];
+		// linear torque decoupling step:
+		//
+		// we have to be careful that the linear constraint forces (+/- ax1) applied to the two bodies
+		// do not create a torque couple. in other words, the points that the
+		// constraint force is applied at must lie along the same ax1 axis.
+		// a torque couple will result in limited slider-jointed free
+		// bodies from gaining angular momentum.
+		if (m_useOffsetForConstraintFrame)
+		{
+			// this is needed only when bodyA and bodyB are both dynamic.
+			if (!hasStaticBody)
+			{
+				tmpA = relA.cross(ax1);
+				tmpB = relB.cross(ax1);
+				info->m_J1angularAxis[srow + 0] = tmpA[0];
+				info->m_J1angularAxis[srow + 1] = tmpA[1];
+				info->m_J1angularAxis[srow + 2] = tmpA[2];
+				info->m_J2angularAxis[srow + 0] = -tmpB[0];
+				info->m_J2angularAxis[srow + 1] = -tmpB[1];
+				info->m_J2angularAxis[srow + 2] = -tmpB[2];
+			}
+		}
+		else
+		{                   // The old way. May be incorrect if bodies are not on the slider axis
+			btVector3 ltd;  // Linear Torque Decoupling vector (a torque)
+			ltd = c.cross(ax1);
+			info->m_J1angularAxis[srow + 0] = factA * ltd[0];
+			info->m_J1angularAxis[srow + 1] = factA * ltd[1];
+			info->m_J1angularAxis[srow + 2] = factA * ltd[2];
+			info->m_J2angularAxis[srow + 0] = factB * ltd[0];
+			info->m_J2angularAxis[srow + 1] = factB * ltd[1];
+			info->m_J2angularAxis[srow + 2] = factB * ltd[2];
+		}
+		// right-hand part
+		btScalar lostop = getLowerLinLimit();
+		btScalar histop = getUpperLinLimit();
+		if (limit && (lostop == histop))
+		{  // the joint motor is ineffective
+			powered = false;
+		}
+		info->m_constraintError[srow] = 0.;
+		info->m_lowerLimit[srow] = 0.;
+		info->m_upperLimit[srow] = 0.;
+		currERP = (m_flags & BT_SLIDER_FLAGS_ERP_LIMLIN) ? m_softnessLimLin : info->erp;
+		if (powered)
+		{
+			if (m_flags & BT_SLIDER_FLAGS_CFM_DIRLIN)
+			{
+				info->cfm[srow] = m_cfmDirLin;
+			}
+			btScalar tag_vel = getTargetLinMotorVelocity();
+			btScalar mot_fact = getMotorFactor(m_linPos, m_lowerLinLimit, m_upperLinLimit, tag_vel, info->fps * currERP);
+			info->m_constraintError[srow] -= signFact * mot_fact * getTargetLinMotorVelocity();
+			info->m_lowerLimit[srow] += -getMaxLinMotorForce() / info->fps;
+			info->m_upperLimit[srow] += getMaxLinMotorForce() / info->fps;
+		}
+		if (limit)
+		{
+			k = info->fps * currERP;
+			info->m_constraintError[srow] += k * limit_err;
+			if (m_flags & BT_SLIDER_FLAGS_CFM_LIMLIN)
+			{
+				info->cfm[srow] = m_cfmLimLin;
+			}
+			if (lostop == histop)
+			{  // limited low and high simultaneously
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else if (limit == 1)
+			{  // low limit
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = 0;
+			}
+			else
+			{  // high limit
+				info->m_lowerLimit[srow] = 0;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			// bounce (we'll use slider parameter abs(1.0 - m_dampingLimLin) for that)
+			btScalar bounce = btFabs(btScalar(1.0) - getDampingLimLin());
+			if (bounce > btScalar(0.0))
+			{
+				btScalar vel = linVelA.dot(ax1);
+				vel -= linVelB.dot(ax1);
+				vel *= signFact;
+				// only apply bounce if the velocity is incoming, and if the
+				// resulting c[] exceeds what we already have.
+				if (limit == 1)
+				{  // low limit
+					if (vel < 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc > info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+				else
+				{  // high limit - all those computations are reversed
+					if (vel > 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc < info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+			}
+			info->m_constraintError[srow] *= getSoftnessLimLin();
+		}  // if(limit)
+	}      // if linear limit
+	// check angular limits
+	limit_err = btScalar(0.0);
+	limit = 0;
+	if (getSolveAngLimit())
+	{
+		limit_err = getAngDepth();
+		limit = (limit_err > btScalar(0.0)) ? 1 : 2;
+	}
+	// if the slider has joint limits, add in the extra row
+	powered = getPoweredAngMotor();
+	if (limit || powered)
+	{
+		nrow++;
+		srow = nrow * info->rowskip;
+		info->m_J1angularAxis[srow + 0] = ax1[0];
+		info->m_J1angularAxis[srow + 1] = ax1[1];
+		info->m_J1angularAxis[srow + 2] = ax1[2];
+
+		info->m_J2angularAxis[srow + 0] = -ax1[0];
+		info->m_J2angularAxis[srow + 1] = -ax1[1];
+		info->m_J2angularAxis[srow + 2] = -ax1[2];
+
+		btScalar lostop = getLowerAngLimit();
+		btScalar histop = getUpperAngLimit();
+		if (limit && (lostop == histop))
+		{  // the joint motor is ineffective
+			powered = false;
+		}
+		currERP = (m_flags & BT_SLIDER_FLAGS_ERP_LIMANG) ? m_softnessLimAng : info->erp;
+		if (powered)
+		{
+			if (m_flags & BT_SLIDER_FLAGS_CFM_DIRANG)
+			{
+				info->cfm[srow] = m_cfmDirAng;
+			}
+			btScalar mot_fact = getMotorFactor(m_angPos, m_lowerAngLimit, m_upperAngLimit, getTargetAngMotorVelocity(), info->fps * currERP);
+			info->m_constraintError[srow] = mot_fact * getTargetAngMotorVelocity();
+			info->m_lowerLimit[srow] = -getMaxAngMotorForce() / info->fps;
+			info->m_upperLimit[srow] = getMaxAngMotorForce() / info->fps;
+		}
+		if (limit)
+		{
+			k = info->fps * currERP;
+			info->m_constraintError[srow] += k * limit_err;
+			if (m_flags & BT_SLIDER_FLAGS_CFM_LIMANG)
+			{
+				info->cfm[srow] = m_cfmLimAng;
+			}
+			if (lostop == histop)
+			{
+				// limited low and high simultaneously
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else if (limit == 1)
+			{  // low limit
+				info->m_lowerLimit[srow] = 0;
+				info->m_upperLimit[srow] = SIMD_INFINITY;
+			}
+			else
+			{  // high limit
+				info->m_lowerLimit[srow] = -SIMD_INFINITY;
+				info->m_upperLimit[srow] = 0;
+			}
+			// bounce (we'll use slider parameter abs(1.0 - m_dampingLimAng) for that)
+			btScalar bounce = btFabs(btScalar(1.0) - getDampingLimAng());
+			if (bounce > btScalar(0.0))
+			{
+				btScalar vel = m_rbA.getAngularVelocity().dot(ax1);
+				vel -= m_rbB.getAngularVelocity().dot(ax1);
+				// only apply bounce if the velocity is incoming, and if the
+				// resulting c[] exceeds what we already have.
+				if (limit == 1)
+				{  // low limit
+					if (vel < 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc > info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+				else
+				{  // high limit - all those computations are reversed
+					if (vel > 0)
+					{
+						btScalar newc = -bounce * vel;
+						if (newc < info->m_constraintError[srow])
+						{
+							info->m_constraintError[srow] = newc;
+						}
+					}
+				}
+			}
+			info->m_constraintError[srow] *= getSoftnessLimAng();
+		}  // if(limit)
+	}      // if angular limit or powered
+}
+
+///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+///If no axis is provided, it uses the default axis for this constraint.
+void btSliderConstraint::setParam(int num, btScalar value, int axis)
+{
+	switch (num)
+	{
+		case BT_CONSTRAINT_STOP_ERP:
+			if (axis < 1)
+			{
+				m_softnessLimLin = value;
+				m_flags |= BT_SLIDER_FLAGS_ERP_LIMLIN;
+			}
+			else if (axis < 3)
+			{
+				m_softnessOrthoLin = value;
+				m_flags |= BT_SLIDER_FLAGS_ERP_ORTLIN;
+			}
+			else if (axis == 3)
+			{
+				m_softnessLimAng = value;
+				m_flags |= BT_SLIDER_FLAGS_ERP_LIMANG;
+			}
+			else if (axis < 6)
+			{
+				m_softnessOrthoAng = value;
+				m_flags |= BT_SLIDER_FLAGS_ERP_ORTANG;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+		case BT_CONSTRAINT_CFM:
+			if (axis < 1)
+			{
+				m_cfmDirLin = value;
+				m_flags |= BT_SLIDER_FLAGS_CFM_DIRLIN;
+			}
+			else if (axis == 3)
+			{
+				m_cfmDirAng = value;
+				m_flags |= BT_SLIDER_FLAGS_CFM_DIRANG;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+		case BT_CONSTRAINT_STOP_CFM:
+			if (axis < 1)
+			{
+				m_cfmLimLin = value;
+				m_flags |= BT_SLIDER_FLAGS_CFM_LIMLIN;
+			}
+			else if (axis < 3)
+			{
+				m_cfmOrthoLin = value;
+				m_flags |= BT_SLIDER_FLAGS_CFM_ORTLIN;
+			}
+			else if (axis == 3)
+			{
+				m_cfmLimAng = value;
+				m_flags |= BT_SLIDER_FLAGS_CFM_LIMANG;
+			}
+			else if (axis < 6)
+			{
+				m_cfmOrthoAng = value;
+				m_flags |= BT_SLIDER_FLAGS_CFM_ORTANG;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+	}
+}
+
+///return the local value of parameter
+btScalar btSliderConstraint::getParam(int num, int axis) const
+{
+	btScalar retVal(SIMD_INFINITY);
+	switch (num)
+	{
+		case BT_CONSTRAINT_STOP_ERP:
+			if (axis < 1)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_ERP_LIMLIN);
+				retVal = m_softnessLimLin;
+			}
+			else if (axis < 3)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_ERP_ORTLIN);
+				retVal = m_softnessOrthoLin;
+			}
+			else if (axis == 3)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_ERP_LIMANG);
+				retVal = m_softnessLimAng;
+			}
+			else if (axis < 6)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_ERP_ORTANG);
+				retVal = m_softnessOrthoAng;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+		case BT_CONSTRAINT_CFM:
+			if (axis < 1)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_CFM_DIRLIN);
+				retVal = m_cfmDirLin;
+			}
+			else if (axis == 3)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_CFM_DIRANG);
+				retVal = m_cfmDirAng;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+		case BT_CONSTRAINT_STOP_CFM:
+			if (axis < 1)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_CFM_LIMLIN);
+				retVal = m_cfmLimLin;
+			}
+			else if (axis < 3)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_CFM_ORTLIN);
+				retVal = m_cfmOrthoLin;
+			}
+			else if (axis == 3)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_CFM_LIMANG);
+				retVal = m_cfmLimAng;
+			}
+			else if (axis < 6)
+			{
+				btAssertConstrParams(m_flags & BT_SLIDER_FLAGS_CFM_ORTANG);
+				retVal = m_cfmOrthoAng;
+			}
+			else
+			{
+				btAssertConstrParams(0);
+			}
+			break;
+	}
+	return retVal;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
new file mode 100755
index 0000000..75b1857
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
@@ -0,0 +1,349 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+Added by Roman Ponomarev (rponom@gmail.com)
+April 04, 2008
+
+TODO:
+ - add clamping od accumulated impulse to improve stability
+ - add conversion for ODE constraint solver
+*/
+
+#ifndef BT_SLIDER_CONSTRAINT_H
+#define BT_SLIDER_CONSTRAINT_H
+
+#include "LinearMath/btScalar.h"  //for BT_USE_DOUBLE_PRECISION
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btSliderConstraintData2 btSliderConstraintDoubleData
+#define btSliderConstraintDataName "btSliderConstraintDoubleData"
+#else
+#define btSliderConstraintData2 btSliderConstraintData
+#define btSliderConstraintDataName "btSliderConstraintData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+
+class btRigidBody;
+
+#define SLIDER_CONSTRAINT_DEF_SOFTNESS (btScalar(1.0))
+#define SLIDER_CONSTRAINT_DEF_DAMPING (btScalar(1.0))
+#define SLIDER_CONSTRAINT_DEF_RESTITUTION (btScalar(0.7))
+#define SLIDER_CONSTRAINT_DEF_CFM (btScalar(0.f))
+
+enum btSliderFlags
+{
+	BT_SLIDER_FLAGS_CFM_DIRLIN = (1 << 0),
+	BT_SLIDER_FLAGS_ERP_DIRLIN = (1 << 1),
+	BT_SLIDER_FLAGS_CFM_DIRANG = (1 << 2),
+	BT_SLIDER_FLAGS_ERP_DIRANG = (1 << 3),
+	BT_SLIDER_FLAGS_CFM_ORTLIN = (1 << 4),
+	BT_SLIDER_FLAGS_ERP_ORTLIN = (1 << 5),
+	BT_SLIDER_FLAGS_CFM_ORTANG = (1 << 6),
+	BT_SLIDER_FLAGS_ERP_ORTANG = (1 << 7),
+	BT_SLIDER_FLAGS_CFM_LIMLIN = (1 << 8),
+	BT_SLIDER_FLAGS_ERP_LIMLIN = (1 << 9),
+	BT_SLIDER_FLAGS_CFM_LIMANG = (1 << 10),
+	BT_SLIDER_FLAGS_ERP_LIMANG = (1 << 11)
+};
+
+ATTRIBUTE_ALIGNED16(class)
+btSliderConstraint : public btTypedConstraint
+{
+protected:
+	///for backwards compatibility during the transition to 'getInfo/getInfo2'
+	bool m_useSolveConstraintObsolete;
+	bool m_useOffsetForConstraintFrame;
+	btTransform m_frameInA;
+	btTransform m_frameInB;
+	// use frameA fo define limits, if true
+	bool m_useLinearReferenceFrameA;
+	// linear limits
+	btScalar m_lowerLinLimit;
+	btScalar m_upperLinLimit;
+	// angular limits
+	btScalar m_lowerAngLimit;
+	btScalar m_upperAngLimit;
+	// softness, restitution and damping for different cases
+	// DirLin - moving inside linear limits
+	// LimLin - hitting linear limit
+	// DirAng - moving inside angular limits
+	// LimAng - hitting angular limit
+	// OrthoLin, OrthoAng - against constraint axis
+	btScalar m_softnessDirLin;
+	btScalar m_restitutionDirLin;
+	btScalar m_dampingDirLin;
+	btScalar m_cfmDirLin;
+
+	btScalar m_softnessDirAng;
+	btScalar m_restitutionDirAng;
+	btScalar m_dampingDirAng;
+	btScalar m_cfmDirAng;
+
+	btScalar m_softnessLimLin;
+	btScalar m_restitutionLimLin;
+	btScalar m_dampingLimLin;
+	btScalar m_cfmLimLin;
+
+	btScalar m_softnessLimAng;
+	btScalar m_restitutionLimAng;
+	btScalar m_dampingLimAng;
+	btScalar m_cfmLimAng;
+
+	btScalar m_softnessOrthoLin;
+	btScalar m_restitutionOrthoLin;
+	btScalar m_dampingOrthoLin;
+	btScalar m_cfmOrthoLin;
+
+	btScalar m_softnessOrthoAng;
+	btScalar m_restitutionOrthoAng;
+	btScalar m_dampingOrthoAng;
+	btScalar m_cfmOrthoAng;
+
+	// for interlal use
+	bool m_solveLinLim;
+	bool m_solveAngLim;
+
+	int m_flags;
+
+	btJacobianEntry m_jacLin[3];
+	btScalar m_jacLinDiagABInv[3];
+
+	btJacobianEntry m_jacAng[3];
+
+	btScalar m_timeStep;
+	btTransform m_calculatedTransformA;
+	btTransform m_calculatedTransformB;
+
+	btVector3 m_sliderAxis;
+	btVector3 m_realPivotAInW;
+	btVector3 m_realPivotBInW;
+	btVector3 m_projPivotInW;
+	btVector3 m_delta;
+	btVector3 m_depth;
+	btVector3 m_relPosA;
+	btVector3 m_relPosB;
+
+	btScalar m_linPos;
+	btScalar m_angPos;
+
+	btScalar m_angDepth;
+	btScalar m_kAngle;
+
+	bool m_poweredLinMotor;
+	btScalar m_targetLinMotorVelocity;
+	btScalar m_maxLinMotorForce;
+	btScalar m_accumulatedLinMotorImpulse;
+
+	bool m_poweredAngMotor;
+	btScalar m_targetAngMotorVelocity;
+	btScalar m_maxAngMotorForce;
+	btScalar m_accumulatedAngMotorImpulse;
+
+	//------------------------
+	void initParams();
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	// constructors
+	btSliderConstraint(btRigidBody & rbA, btRigidBody & rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA);
+	btSliderConstraint(btRigidBody & rbB, const btTransform& frameInB, bool useLinearReferenceFrameA);
+
+	// overrides
+
+	virtual void getInfo1(btConstraintInfo1 * info);
+
+	void getInfo1NonVirtual(btConstraintInfo1 * info);
+
+	virtual void getInfo2(btConstraintInfo2 * info);
+
+	void getInfo2NonVirtual(btConstraintInfo2 * info, const btTransform& transA, const btTransform& transB, const btVector3& linVelA, const btVector3& linVelB, btScalar rbAinvMass, btScalar rbBinvMass);
+
+	// access
+	const btRigidBody& getRigidBodyA() const { return m_rbA; }
+	const btRigidBody& getRigidBodyB() const { return m_rbB; }
+	const btTransform& getCalculatedTransformA() const { return m_calculatedTransformA; }
+	const btTransform& getCalculatedTransformB() const { return m_calculatedTransformB; }
+	const btTransform& getFrameOffsetA() const { return m_frameInA; }
+	const btTransform& getFrameOffsetB() const { return m_frameInB; }
+	btTransform& getFrameOffsetA() { return m_frameInA; }
+	btTransform& getFrameOffsetB() { return m_frameInB; }
+	btScalar getLowerLinLimit() { return m_lowerLinLimit; }
+	void setLowerLinLimit(btScalar lowerLimit) { m_lowerLinLimit = lowerLimit; }
+	btScalar getUpperLinLimit() { return m_upperLinLimit; }
+	void setUpperLinLimit(btScalar upperLimit) { m_upperLinLimit = upperLimit; }
+	btScalar getLowerAngLimit() { return m_lowerAngLimit; }
+	void setLowerAngLimit(btScalar lowerLimit) { m_lowerAngLimit = btNormalizeAngle(lowerLimit); }
+	btScalar getUpperAngLimit() { return m_upperAngLimit; }
+	void setUpperAngLimit(btScalar upperLimit) { m_upperAngLimit = btNormalizeAngle(upperLimit); }
+	bool getUseLinearReferenceFrameA() { return m_useLinearReferenceFrameA; }
+	btScalar getSoftnessDirLin() { return m_softnessDirLin; }
+	btScalar getRestitutionDirLin() { return m_restitutionDirLin; }
+	btScalar getDampingDirLin() { return m_dampingDirLin; }
+	btScalar getSoftnessDirAng() { return m_softnessDirAng; }
+	btScalar getRestitutionDirAng() { return m_restitutionDirAng; }
+	btScalar getDampingDirAng() { return m_dampingDirAng; }
+	btScalar getSoftnessLimLin() { return m_softnessLimLin; }
+	btScalar getRestitutionLimLin() { return m_restitutionLimLin; }
+	btScalar getDampingLimLin() { return m_dampingLimLin; }
+	btScalar getSoftnessLimAng() { return m_softnessLimAng; }
+	btScalar getRestitutionLimAng() { return m_restitutionLimAng; }
+	btScalar getDampingLimAng() { return m_dampingLimAng; }
+	btScalar getSoftnessOrthoLin() { return m_softnessOrthoLin; }
+	btScalar getRestitutionOrthoLin() { return m_restitutionOrthoLin; }
+	btScalar getDampingOrthoLin() { return m_dampingOrthoLin; }
+	btScalar getSoftnessOrthoAng() { return m_softnessOrthoAng; }
+	btScalar getRestitutionOrthoAng() { return m_restitutionOrthoAng; }
+	btScalar getDampingOrthoAng() { return m_dampingOrthoAng; }
+	void setSoftnessDirLin(btScalar softnessDirLin) { m_softnessDirLin = softnessDirLin; }
+	void setRestitutionDirLin(btScalar restitutionDirLin) { m_restitutionDirLin = restitutionDirLin; }
+	void setDampingDirLin(btScalar dampingDirLin) { m_dampingDirLin = dampingDirLin; }
+	void setSoftnessDirAng(btScalar softnessDirAng) { m_softnessDirAng = softnessDirAng; }
+	void setRestitutionDirAng(btScalar restitutionDirAng) { m_restitutionDirAng = restitutionDirAng; }
+	void setDampingDirAng(btScalar dampingDirAng) { m_dampingDirAng = dampingDirAng; }
+	void setSoftnessLimLin(btScalar softnessLimLin) { m_softnessLimLin = softnessLimLin; }
+	void setRestitutionLimLin(btScalar restitutionLimLin) { m_restitutionLimLin = restitutionLimLin; }
+	void setDampingLimLin(btScalar dampingLimLin) { m_dampingLimLin = dampingLimLin; }
+	void setSoftnessLimAng(btScalar softnessLimAng) { m_softnessLimAng = softnessLimAng; }
+	void setRestitutionLimAng(btScalar restitutionLimAng) { m_restitutionLimAng = restitutionLimAng; }
+	void setDampingLimAng(btScalar dampingLimAng) { m_dampingLimAng = dampingLimAng; }
+	void setSoftnessOrthoLin(btScalar softnessOrthoLin) { m_softnessOrthoLin = softnessOrthoLin; }
+	void setRestitutionOrthoLin(btScalar restitutionOrthoLin) { m_restitutionOrthoLin = restitutionOrthoLin; }
+	void setDampingOrthoLin(btScalar dampingOrthoLin) { m_dampingOrthoLin = dampingOrthoLin; }
+	void setSoftnessOrthoAng(btScalar softnessOrthoAng) { m_softnessOrthoAng = softnessOrthoAng; }
+	void setRestitutionOrthoAng(btScalar restitutionOrthoAng) { m_restitutionOrthoAng = restitutionOrthoAng; }
+	void setDampingOrthoAng(btScalar dampingOrthoAng) { m_dampingOrthoAng = dampingOrthoAng; }
+	void setPoweredLinMotor(bool onOff) { m_poweredLinMotor = onOff; }
+	bool getPoweredLinMotor() { return m_poweredLinMotor; }
+	void setTargetLinMotorVelocity(btScalar targetLinMotorVelocity) { m_targetLinMotorVelocity = targetLinMotorVelocity; }
+	btScalar getTargetLinMotorVelocity() { return m_targetLinMotorVelocity; }
+	void setMaxLinMotorForce(btScalar maxLinMotorForce) { m_maxLinMotorForce = maxLinMotorForce; }
+	btScalar getMaxLinMotorForce() { return m_maxLinMotorForce; }
+	void setPoweredAngMotor(bool onOff) { m_poweredAngMotor = onOff; }
+	bool getPoweredAngMotor() { return m_poweredAngMotor; }
+	void setTargetAngMotorVelocity(btScalar targetAngMotorVelocity) { m_targetAngMotorVelocity = targetAngMotorVelocity; }
+	btScalar getTargetAngMotorVelocity() { return m_targetAngMotorVelocity; }
+	void setMaxAngMotorForce(btScalar maxAngMotorForce) { m_maxAngMotorForce = maxAngMotorForce; }
+	btScalar getMaxAngMotorForce() { return m_maxAngMotorForce; }
+
+	btScalar getLinearPos() const { return m_linPos; }
+	btScalar getAngularPos() const { return m_angPos; }
+
+	// access for ODE solver
+	bool getSolveLinLimit() { return m_solveLinLim; }
+	btScalar getLinDepth() { return m_depth[0]; }
+	bool getSolveAngLimit() { return m_solveAngLim; }
+	btScalar getAngDepth() { return m_angDepth; }
+	// shared code used by ODE solver
+	void calculateTransforms(const btTransform& transA, const btTransform& transB);
+	void testLinLimits();
+	void testAngLimits();
+	// access for PE Solver
+	btVector3 getAncorInA();
+	btVector3 getAncorInB();
+	// access for UseFrameOffset
+	bool getUseFrameOffset() { return m_useOffsetForConstraintFrame; }
+	void setUseFrameOffset(bool frameOffsetOnOff) { m_useOffsetForConstraintFrame = frameOffsetOnOff; }
+
+	void setFrames(const btTransform& frameA, const btTransform& frameB)
+	{
+		m_frameInA = frameA;
+		m_frameInB = frameB;
+		calculateTransforms(m_rbA.getCenterOfMassTransform(), m_rbB.getCenterOfMassTransform());
+		buildJacobian();
+	}
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, btScalar value, int axis = -1);
+	///return the local value of parameter
+	virtual btScalar getParam(int num, int axis = -1) const;
+
+	virtual int getFlags() const
+	{
+		return m_flags;
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+
+struct btSliderConstraintData
+{
+	btTypedConstraintData m_typeConstraintData;
+	btTransformFloatData m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransformFloatData m_rbBFrame;
+
+	float m_linearUpperLimit;
+	float m_linearLowerLimit;
+
+	float m_angularUpperLimit;
+	float m_angularLowerLimit;
+
+	int m_useLinearReferenceFrameA;
+	int m_useOffsetForConstraintFrame;
+};
+
+struct btSliderConstraintDoubleData
+{
+	btTypedConstraintDoubleData m_typeConstraintData;
+	btTransformDoubleData m_rbAFrame;  // constraint axii. Assumes z is hinge axis.
+	btTransformDoubleData m_rbBFrame;
+
+	double m_linearUpperLimit;
+	double m_linearLowerLimit;
+
+	double m_angularUpperLimit;
+	double m_angularLowerLimit;
+
+	int m_useLinearReferenceFrameA;
+	int m_useOffsetForConstraintFrame;
+};
+
+SIMD_FORCE_INLINE int btSliderConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btSliderConstraintData2);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btSliderConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btSliderConstraintData2* sliderData = (btSliderConstraintData2*)dataBuffer;
+	btTypedConstraint::serialize(&sliderData->m_typeConstraintData, serializer);
+
+	m_frameInA.serialize(sliderData->m_rbAFrame);
+	m_frameInB.serialize(sliderData->m_rbBFrame);
+
+	sliderData->m_linearUpperLimit = m_upperLinLimit;
+	sliderData->m_linearLowerLimit = m_lowerLinLimit;
+
+	sliderData->m_angularUpperLimit = m_upperAngLimit;
+	sliderData->m_angularLowerLimit = m_lowerAngLimit;
+
+	sliderData->m_useLinearReferenceFrameA = m_useLinearReferenceFrameA;
+	sliderData->m_useOffsetForConstraintFrame = m_useOffsetForConstraintFrame;
+
+	return btSliderConstraintDataName;
+}
+
+#endif  //BT_SLIDER_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
new file mode 100644
index 0000000..5c2060c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
@@ -0,0 +1,239 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSolve2LinearConstraint.h"
+
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+
+void btSolve2LinearConstraint::resolveUnilateralPairConstraint(
+	btRigidBody* body1,
+	btRigidBody* body2,
+
+	const btMatrix3x3& world2A,
+	const btMatrix3x3& world2B,
+
+	const btVector3& invInertiaADiag,
+	const btScalar invMassA,
+	const btVector3& linvelA, const btVector3& angvelA,
+	const btVector3& rel_posA1,
+	const btVector3& invInertiaBDiag,
+	const btScalar invMassB,
+	const btVector3& linvelB, const btVector3& angvelB,
+	const btVector3& rel_posA2,
+
+	btScalar depthA, const btVector3& normalA,
+	const btVector3& rel_posB1, const btVector3& rel_posB2,
+	btScalar depthB, const btVector3& normalB,
+	btScalar& imp0, btScalar& imp1)
+{
+	(void)linvelA;
+	(void)linvelB;
+	(void)angvelB;
+	(void)angvelA;
+
+	imp0 = btScalar(0.);
+	imp1 = btScalar(0.);
+
+	btScalar len = btFabs(normalA.length()) - btScalar(1.);
+	if (btFabs(len) >= SIMD_EPSILON)
+		return;
+
+	btAssert(len < SIMD_EPSILON);
+
+	//this jacobian entry could be re-used for all iterations
+	btJacobianEntry jacA(world2A, world2B, rel_posA1, rel_posA2, normalA, invInertiaADiag, invMassA,
+						 invInertiaBDiag, invMassB);
+	btJacobianEntry jacB(world2A, world2B, rel_posB1, rel_posB2, normalB, invInertiaADiag, invMassA,
+						 invInertiaBDiag, invMassB);
+
+	//const btScalar vel0 = jacA.getRelativeVelocity(linvelA,angvelA,linvelB,angvelB);
+	//const btScalar vel1 = jacB.getRelativeVelocity(linvelA,angvelA,linvelB,angvelB);
+
+	const btScalar vel0 = normalA.dot(body1->getVelocityInLocalPoint(rel_posA1) - body2->getVelocityInLocalPoint(rel_posA1));
+	const btScalar vel1 = normalB.dot(body1->getVelocityInLocalPoint(rel_posB1) - body2->getVelocityInLocalPoint(rel_posB1));
+
+	//	btScalar penetrationImpulse = (depth*contactTau*timeCorrection)  * massTerm;//jacDiagABInv
+	btScalar massTerm = btScalar(1.) / (invMassA + invMassB);
+
+	// calculate rhs (or error) terms
+	const btScalar dv0 = depthA * m_tau * massTerm - vel0 * m_damping;
+	const btScalar dv1 = depthB * m_tau * massTerm - vel1 * m_damping;
+
+	// dC/dv * dv = -C
+
+	// jacobian * impulse = -error
+	//
+
+	//impulse = jacobianInverse * -error
+
+	// inverting 2x2 symmetric system (offdiagonal are equal!)
+	//
+
+	btScalar nonDiag = jacA.getNonDiagonal(jacB, invMassA, invMassB);
+	btScalar invDet = btScalar(1.0) / (jacA.getDiagonal() * jacB.getDiagonal() - nonDiag * nonDiag);
+
+	//imp0 = dv0 * jacA.getDiagonal() * invDet + dv1 * -nonDiag * invDet;
+	//imp1 = dv1 * jacB.getDiagonal() * invDet + dv0 * - nonDiag * invDet;
+
+	imp0 = dv0 * jacA.getDiagonal() * invDet + dv1 * -nonDiag * invDet;
+	imp1 = dv1 * jacB.getDiagonal() * invDet + dv0 * -nonDiag * invDet;
+
+	//[a b]								  [d -c]
+	//[c d] inverse = (1 / determinant) * [-b a] where determinant is (ad - bc)
+
+	//[jA nD] * [imp0] = [dv0]
+	//[nD jB]   [imp1]   [dv1]
+}
+
+void btSolve2LinearConstraint::resolveBilateralPairConstraint(
+	btRigidBody* body1,
+	btRigidBody* body2,
+	const btMatrix3x3& world2A,
+	const btMatrix3x3& world2B,
+
+	const btVector3& invInertiaADiag,
+	const btScalar invMassA,
+	const btVector3& linvelA, const btVector3& angvelA,
+	const btVector3& rel_posA1,
+	const btVector3& invInertiaBDiag,
+	const btScalar invMassB,
+	const btVector3& linvelB, const btVector3& angvelB,
+	const btVector3& rel_posA2,
+
+	btScalar depthA, const btVector3& normalA,
+	const btVector3& rel_posB1, const btVector3& rel_posB2,
+	btScalar depthB, const btVector3& normalB,
+	btScalar& imp0, btScalar& imp1)
+{
+	(void)linvelA;
+	(void)linvelB;
+	(void)angvelA;
+	(void)angvelB;
+
+	imp0 = btScalar(0.);
+	imp1 = btScalar(0.);
+
+	btScalar len = btFabs(normalA.length()) - btScalar(1.);
+	if (btFabs(len) >= SIMD_EPSILON)
+		return;
+
+	btAssert(len < SIMD_EPSILON);
+
+	//this jacobian entry could be re-used for all iterations
+	btJacobianEntry jacA(world2A, world2B, rel_posA1, rel_posA2, normalA, invInertiaADiag, invMassA,
+						 invInertiaBDiag, invMassB);
+	btJacobianEntry jacB(world2A, world2B, rel_posB1, rel_posB2, normalB, invInertiaADiag, invMassA,
+						 invInertiaBDiag, invMassB);
+
+	//const btScalar vel0 = jacA.getRelativeVelocity(linvelA,angvelA,linvelB,angvelB);
+	//const btScalar vel1 = jacB.getRelativeVelocity(linvelA,angvelA,linvelB,angvelB);
+
+	const btScalar vel0 = normalA.dot(body1->getVelocityInLocalPoint(rel_posA1) - body2->getVelocityInLocalPoint(rel_posA1));
+	const btScalar vel1 = normalB.dot(body1->getVelocityInLocalPoint(rel_posB1) - body2->getVelocityInLocalPoint(rel_posB1));
+
+	// calculate rhs (or error) terms
+	const btScalar dv0 = depthA * m_tau - vel0 * m_damping;
+	const btScalar dv1 = depthB * m_tau - vel1 * m_damping;
+
+	// dC/dv * dv = -C
+
+	// jacobian * impulse = -error
+	//
+
+	//impulse = jacobianInverse * -error
+
+	// inverting 2x2 symmetric system (offdiagonal are equal!)
+	//
+
+	btScalar nonDiag = jacA.getNonDiagonal(jacB, invMassA, invMassB);
+	btScalar invDet = btScalar(1.0) / (jacA.getDiagonal() * jacB.getDiagonal() - nonDiag * nonDiag);
+
+	//imp0 = dv0 * jacA.getDiagonal() * invDet + dv1 * -nonDiag * invDet;
+	//imp1 = dv1 * jacB.getDiagonal() * invDet + dv0 * - nonDiag * invDet;
+
+	imp0 = dv0 * jacA.getDiagonal() * invDet + dv1 * -nonDiag * invDet;
+	imp1 = dv1 * jacB.getDiagonal() * invDet + dv0 * -nonDiag * invDet;
+
+	//[a b]								  [d -c]
+	//[c d] inverse = (1 / determinant) * [-b a] where determinant is (ad - bc)
+
+	//[jA nD] * [imp0] = [dv0]
+	//[nD jB]   [imp1]   [dv1]
+
+	if (imp0 > btScalar(0.0))
+	{
+		if (imp1 > btScalar(0.0))
+		{
+			//both positive
+		}
+		else
+		{
+			imp1 = btScalar(0.);
+
+			// now imp0>0 imp1<0
+			imp0 = dv0 / jacA.getDiagonal();
+			if (imp0 > btScalar(0.0))
+			{
+			}
+			else
+			{
+				imp0 = btScalar(0.);
+			}
+		}
+	}
+	else
+	{
+		imp0 = btScalar(0.);
+
+		imp1 = dv1 / jacB.getDiagonal();
+		if (imp1 <= btScalar(0.0))
+		{
+			imp1 = btScalar(0.);
+			// now imp0>0 imp1<0
+			imp0 = dv0 / jacA.getDiagonal();
+			if (imp0 > btScalar(0.0))
+			{
+			}
+			else
+			{
+				imp0 = btScalar(0.);
+			}
+		}
+		else
+		{
+		}
+	}
+}
+
+/*
+void btSolve2LinearConstraint::resolveAngularConstraint(	const btMatrix3x3& invInertiaAWS,
+											const btScalar invMassA,
+											const btVector3& linvelA,const btVector3& angvelA,
+											const btVector3& rel_posA1,
+											const btMatrix3x3& invInertiaBWS,
+											const btScalar invMassB,
+											const btVector3& linvelB,const btVector3& angvelB,
+											const btVector3& rel_posA2,
+
+											btScalar depthA, const btVector3& normalA, 
+											const btVector3& rel_posB1,const btVector3& rel_posB2,
+											btScalar depthB, const btVector3& normalB, 
+											btScalar& imp0,btScalar& imp1)
+{
+
+}
+*/
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
new file mode 100644
index 0000000..0a8c901
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
@@ -0,0 +1,101 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOLVE_2LINEAR_CONSTRAINT_H
+#define BT_SOLVE_2LINEAR_CONSTRAINT_H
+
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btVector3.h"
+
+class btRigidBody;
+
+/// constraint class used for lateral tyre friction.
+class btSolve2LinearConstraint
+{
+	btScalar m_tau;
+	btScalar m_damping;
+
+public:
+	btSolve2LinearConstraint(btScalar tau, btScalar damping)
+	{
+		m_tau = tau;
+		m_damping = damping;
+	}
+	//
+	// solve unilateral constraint (equality, direct method)
+	//
+	void resolveUnilateralPairConstraint(
+		btRigidBody* body0,
+		btRigidBody* body1,
+
+		const btMatrix3x3& world2A,
+		const btMatrix3x3& world2B,
+
+		const btVector3& invInertiaADiag,
+		const btScalar invMassA,
+		const btVector3& linvelA, const btVector3& angvelA,
+		const btVector3& rel_posA1,
+		const btVector3& invInertiaBDiag,
+		const btScalar invMassB,
+		const btVector3& linvelB, const btVector3& angvelB,
+		const btVector3& rel_posA2,
+
+		btScalar depthA, const btVector3& normalA,
+		const btVector3& rel_posB1, const btVector3& rel_posB2,
+		btScalar depthB, const btVector3& normalB,
+		btScalar& imp0, btScalar& imp1);
+
+	//
+	// solving 2x2 lcp problem (inequality, direct solution )
+	//
+	void resolveBilateralPairConstraint(
+		btRigidBody* body0,
+		btRigidBody* body1,
+		const btMatrix3x3& world2A,
+		const btMatrix3x3& world2B,
+
+		const btVector3& invInertiaADiag,
+		const btScalar invMassA,
+		const btVector3& linvelA, const btVector3& angvelA,
+		const btVector3& rel_posA1,
+		const btVector3& invInertiaBDiag,
+		const btScalar invMassB,
+		const btVector3& linvelB, const btVector3& angvelB,
+		const btVector3& rel_posA2,
+
+		btScalar depthA, const btVector3& normalA,
+		const btVector3& rel_posB1, const btVector3& rel_posB2,
+		btScalar depthB, const btVector3& normalB,
+		btScalar& imp0, btScalar& imp1);
+
+	/*
+	void resolveAngularConstraint(	const btMatrix3x3& invInertiaAWS,
+						const btScalar invMassA,
+						const btVector3& linvelA,const btVector3& angvelA,
+						const btVector3& rel_posA1,
+						const btMatrix3x3& invInertiaBWS,
+						const btScalar invMassB,
+						const btVector3& linvelB,const btVector3& angvelB,
+						const btVector3& rel_posA2,
+
+					  btScalar depthA, const btVector3& normalA, 
+					  const btVector3& rel_posB1,const btVector3& rel_posB2,
+					  btScalar depthB, const btVector3& normalB, 
+					  btScalar& imp0,btScalar& imp1);
+
+*/
+};
+
+#endif  //BT_SOLVE_2LINEAR_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolverBody.h
new file mode 100644
index 0000000..8d2f108
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolverBody.h
@@ -0,0 +1,285 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOLVER_BODY_H
+#define BT_SOLVER_BODY_H
+
+class btRigidBody;
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMatrix3x3.h"
+
+#include "LinearMath/btAlignedAllocator.h"
+#include "LinearMath/btTransformUtil.h"
+
+///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision
+#ifdef BT_USE_SSE
+#define USE_SIMD 1
+#endif  //
+
+#ifdef USE_SIMD
+
+struct btSimdScalar
+{
+	SIMD_FORCE_INLINE btSimdScalar()
+	{
+	}
+
+	SIMD_FORCE_INLINE btSimdScalar(float fl)
+		: m_vec128(_mm_set1_ps(fl))
+	{
+	}
+
+	SIMD_FORCE_INLINE btSimdScalar(__m128 v128)
+		: m_vec128(v128)
+	{
+	}
+	union {
+		__m128 m_vec128;
+		float m_floats[4];
+		int m_ints[4];
+		btScalar m_unusedPadding;
+	};
+	SIMD_FORCE_INLINE __m128 get128()
+	{
+		return m_vec128;
+	}
+
+	SIMD_FORCE_INLINE const __m128 get128() const
+	{
+		return m_vec128;
+	}
+
+	SIMD_FORCE_INLINE void set128(__m128 v128)
+	{
+		m_vec128 = v128;
+	}
+
+	SIMD_FORCE_INLINE operator __m128()
+	{
+		return m_vec128;
+	}
+	SIMD_FORCE_INLINE operator const __m128() const
+	{
+		return m_vec128;
+	}
+
+	SIMD_FORCE_INLINE operator float() const
+	{
+		return m_floats[0];
+	}
+};
+
+///@brief Return the elementwise product of two btSimdScalar
+SIMD_FORCE_INLINE btSimdScalar
+operator*(const btSimdScalar& v1, const btSimdScalar& v2)
+{
+	return btSimdScalar(_mm_mul_ps(v1.get128(), v2.get128()));
+}
+
+///@brief Return the elementwise product of two btSimdScalar
+SIMD_FORCE_INLINE btSimdScalar
+operator+(const btSimdScalar& v1, const btSimdScalar& v2)
+{
+	return btSimdScalar(_mm_add_ps(v1.get128(), v2.get128()));
+}
+
+#else
+#define btSimdScalar btScalar
+#endif
+
+///The btSolverBody is an internal datastructure for the constraint solver. Only necessary data is packed to increase cache coherence/performance.
+ATTRIBUTE_ALIGNED16(struct)
+btSolverBody
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+	btTransform m_worldTransform;
+	btVector3 m_deltaLinearVelocity;
+	btVector3 m_deltaAngularVelocity;
+	btVector3 m_angularFactor;
+	btVector3 m_linearFactor;
+	btVector3 m_invMass;
+	btVector3 m_pushVelocity;
+	btVector3 m_turnVelocity;
+	btVector3 m_linearVelocity;
+	btVector3 m_angularVelocity;
+	btVector3 m_externalForceImpulse;
+	btVector3 m_externalTorqueImpulse;
+
+	btRigidBody* m_originalBody;
+	void setWorldTransform(const btTransform& worldTransform)
+	{
+		m_worldTransform = worldTransform;
+	}
+
+	const btTransform& getWorldTransform() const
+	{
+		return m_worldTransform;
+	}
+
+	SIMD_FORCE_INLINE void getVelocityInLocalPointNoDelta(const btVector3& rel_pos, btVector3& velocity) const
+	{
+		if (m_originalBody)
+			velocity = m_linearVelocity + m_externalForceImpulse + (m_angularVelocity + m_externalTorqueImpulse).cross(rel_pos);
+		else
+			velocity.setValue(0, 0, 0);
+	}
+
+	SIMD_FORCE_INLINE void getVelocityInLocalPointObsolete(const btVector3& rel_pos, btVector3& velocity) const
+	{
+		if (m_originalBody)
+			velocity = m_linearVelocity + m_deltaLinearVelocity + (m_angularVelocity + m_deltaAngularVelocity).cross(rel_pos);
+		else
+			velocity.setValue(0, 0, 0);
+	}
+
+	SIMD_FORCE_INLINE void getAngularVelocity(btVector3 & angVel) const
+	{
+		if (m_originalBody)
+			angVel = m_angularVelocity + m_deltaAngularVelocity;
+		else
+			angVel.setValue(0, 0, 0);
+	}
+
+	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
+	SIMD_FORCE_INLINE void applyImpulse(const btVector3& linearComponent, const btVector3& angularComponent, const btScalar impulseMagnitude)
+	{
+		if (m_originalBody)
+		{
+			m_deltaLinearVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_deltaAngularVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	SIMD_FORCE_INLINE void internalApplyPushImpulse(const btVector3& linearComponent, const btVector3& angularComponent, btScalar impulseMagnitude)
+	{
+		if (m_originalBody)
+		{
+			m_pushVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_turnVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	const btVector3& getDeltaLinearVelocity() const
+	{
+		return m_deltaLinearVelocity;
+	}
+
+	const btVector3& getDeltaAngularVelocity() const
+	{
+		return m_deltaAngularVelocity;
+	}
+
+	const btVector3& getPushVelocity() const
+	{
+		return m_pushVelocity;
+	}
+
+	const btVector3& getTurnVelocity() const
+	{
+		return m_turnVelocity;
+	}
+
+	////////////////////////////////////////////////
+	///some internal methods, don't use them
+
+	btVector3& internalGetDeltaLinearVelocity()
+	{
+		return m_deltaLinearVelocity;
+	}
+
+	btVector3& internalGetDeltaAngularVelocity()
+	{
+		return m_deltaAngularVelocity;
+	}
+
+	const btVector3& internalGetAngularFactor() const
+	{
+		return m_angularFactor;
+	}
+
+	const btVector3& internalGetInvMass() const
+	{
+		return m_invMass;
+	}
+
+	void internalSetInvMass(const btVector3& invMass)
+	{
+		m_invMass = invMass;
+	}
+
+	btVector3& internalGetPushVelocity()
+	{
+		return m_pushVelocity;
+	}
+
+	btVector3& internalGetTurnVelocity()
+	{
+		return m_turnVelocity;
+	}
+
+	SIMD_FORCE_INLINE void internalGetVelocityInLocalPointObsolete(const btVector3& rel_pos, btVector3& velocity) const
+	{
+		velocity = m_linearVelocity + m_deltaLinearVelocity + (m_angularVelocity + m_deltaAngularVelocity).cross(rel_pos);
+	}
+
+	SIMD_FORCE_INLINE void internalGetAngularVelocity(btVector3 & angVel) const
+	{
+		angVel = m_angularVelocity + m_deltaAngularVelocity;
+	}
+
+	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
+	SIMD_FORCE_INLINE void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent, const btScalar impulseMagnitude)
+	{
+		if (m_originalBody)
+		{
+			m_deltaLinearVelocity += linearComponent * impulseMagnitude * m_linearFactor;
+			m_deltaAngularVelocity += angularComponent * (impulseMagnitude * m_angularFactor);
+		}
+	}
+
+	void writebackVelocity()
+	{
+		if (m_originalBody)
+		{
+			m_linearVelocity += m_deltaLinearVelocity;
+			m_angularVelocity += m_deltaAngularVelocity;
+
+			//m_originalBody->setCompanionId(-1);
+		}
+	}
+
+	void writebackVelocityAndTransform(btScalar timeStep, btScalar splitImpulseTurnErp)
+	{
+		(void)timeStep;
+		if (m_originalBody)
+		{
+			m_linearVelocity += m_deltaLinearVelocity;
+			m_angularVelocity += m_deltaAngularVelocity;
+
+			//correct the position/orientation based on push/turn recovery
+			btTransform newTransform;
+			if (m_pushVelocity[0] != 0.f || m_pushVelocity[1] != 0 || m_pushVelocity[2] != 0 || m_turnVelocity[0] != 0.f || m_turnVelocity[1] != 0 || m_turnVelocity[2] != 0)
+			{
+				//	btQuaternion orn = m_worldTransform.getRotation();
+				btTransformUtil::integrateTransform(m_worldTransform, m_pushVelocity, m_turnVelocity * splitImpulseTurnErp, timeStep, newTransform);
+				m_worldTransform = newTransform;
+			}
+			//m_worldTransform.setRotation(orn);
+			//m_originalBody->setCompanionId(-1);
+		}
+	}
+};
+
+#endif  //BT_SOLVER_BODY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
new file mode 100644
index 0000000..9749b33
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
@@ -0,0 +1,74 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOLVER_CONSTRAINT_H
+#define BT_SOLVER_CONSTRAINT_H
+
+class btRigidBody;
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "btJacobianEntry.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+//#define NO_FRICTION_TANGENTIALS 1
+#include "btSolverBody.h"
+
+///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints.
+ATTRIBUTE_ALIGNED16(struct)
+btSolverConstraint
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btVector3 m_relpos1CrossNormal;
+	btVector3 m_contactNormal1;
+
+	btVector3 m_relpos2CrossNormal;
+	btVector3 m_contactNormal2;  //usually m_contactNormal2 == -m_contactNormal1, but not always
+
+	btVector3 m_angularComponentA;
+	btVector3 m_angularComponentB;
+
+	mutable btSimdScalar m_appliedPushImpulse;
+	mutable btSimdScalar m_appliedImpulse;
+
+	btScalar m_friction;
+	btScalar m_jacDiagABInv;
+	btScalar m_rhs;
+	btScalar m_cfm;
+
+	btScalar m_lowerLimit;
+	btScalar m_upperLimit;
+	btScalar m_rhsPenetration;
+	union {
+		void* m_originalContactPoint;
+		btScalar m_unusedPadding4;
+		int m_numRowsForNonContactConstraint;
+	};
+
+	int m_overrideNumSolverIterations;
+	int m_frictionIndex;
+	int m_solverBodyIdA;
+	int m_solverBodyIdB;
+
+	enum btSolverConstraintType
+	{
+		BT_SOLVER_CONTACT_1D = 0,
+		BT_SOLVER_FRICTION_1D
+	};
+};
+
+typedef btAlignedObjectArray<btSolverConstraint> btConstraintArray;
+
+#endif  //BT_SOLVER_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
new file mode 100644
index 0000000..9530911
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
@@ -0,0 +1,214 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btTypedConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btSerializer.h"
+
+#define DEFAULT_DEBUGDRAW_SIZE btScalar(0.05f)
+
+btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA)
+	: btTypedObject(type),
+	  m_userConstraintType(-1),
+	  m_userConstraintPtr((void*)-1),
+	  m_breakingImpulseThreshold(SIMD_INFINITY),
+	  m_isEnabled(true),
+	  m_needsFeedback(false),
+	  m_overrideNumSolverIterations(-1),
+	  m_rbA(rbA),
+	  m_rbB(getFixedBody()),
+	  m_appliedImpulse(btScalar(0.)),
+	  m_dbgDrawSize(DEFAULT_DEBUGDRAW_SIZE),
+	  m_jointFeedback(0)
+{
+}
+
+btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA, btRigidBody& rbB)
+	: btTypedObject(type),
+	  m_userConstraintType(-1),
+	  m_userConstraintPtr((void*)-1),
+	  m_breakingImpulseThreshold(SIMD_INFINITY),
+	  m_isEnabled(true),
+	  m_needsFeedback(false),
+	  m_overrideNumSolverIterations(-1),
+	  m_rbA(rbA),
+	  m_rbB(rbB),
+	  m_appliedImpulse(btScalar(0.)),
+	  m_dbgDrawSize(DEFAULT_DEBUGDRAW_SIZE),
+	  m_jointFeedback(0)
+{
+}
+
+btScalar btTypedConstraint::getMotorFactor(btScalar pos, btScalar lowLim, btScalar uppLim, btScalar vel, btScalar timeFact)
+{
+	if (lowLim > uppLim)
+	{
+		return btScalar(1.0f);
+	}
+	else if (lowLim == uppLim)
+	{
+		return btScalar(0.0f);
+	}
+	btScalar lim_fact = btScalar(1.0f);
+	btScalar delta_max = vel / timeFact;
+	if (delta_max < btScalar(0.0f))
+	{
+		if ((pos >= lowLim) && (pos < (lowLim - delta_max)))
+		{
+			lim_fact = (lowLim - pos) / delta_max;
+		}
+		else if (pos < lowLim)
+		{
+			lim_fact = btScalar(0.0f);
+		}
+		else
+		{
+			lim_fact = btScalar(1.0f);
+		}
+	}
+	else if (delta_max > btScalar(0.0f))
+	{
+		if ((pos <= uppLim) && (pos > (uppLim - delta_max)))
+		{
+			lim_fact = (uppLim - pos) / delta_max;
+		}
+		else if (pos > uppLim)
+		{
+			lim_fact = btScalar(0.0f);
+		}
+		else
+		{
+			lim_fact = btScalar(1.0f);
+		}
+	}
+	else
+	{
+		lim_fact = btScalar(0.0f);
+	}
+	return lim_fact;
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btTypedConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+	btTypedConstraintData2* tcd = (btTypedConstraintData2*)dataBuffer;
+
+	tcd->m_rbA = (btRigidBodyData*)serializer->getUniquePointer(&m_rbA);
+	tcd->m_rbB = (btRigidBodyData*)serializer->getUniquePointer(&m_rbB);
+	char* name = (char*)serializer->findNameForPointer(this);
+	tcd->m_name = (char*)serializer->getUniquePointer(name);
+	if (tcd->m_name)
+	{
+		serializer->serializeName(name);
+	}
+
+	tcd->m_objectType = m_objectType;
+	tcd->m_needsFeedback = m_needsFeedback;
+	tcd->m_overrideNumSolverIterations = m_overrideNumSolverIterations;
+	tcd->m_breakingImpulseThreshold = m_breakingImpulseThreshold;
+	tcd->m_isEnabled = m_isEnabled ? 1 : 0;
+
+	tcd->m_userConstraintId = m_userConstraintId;
+	tcd->m_userConstraintType = m_userConstraintType;
+
+	tcd->m_appliedImpulse = m_appliedImpulse;
+	tcd->m_dbgDrawSize = m_dbgDrawSize;
+
+	tcd->m_disableCollisionsBetweenLinkedBodies = false;
+
+	int i;
+	for (i = 0; i < m_rbA.getNumConstraintRefs(); i++)
+		if (m_rbA.getConstraintRef(i) == this)
+			tcd->m_disableCollisionsBetweenLinkedBodies = true;
+	for (i = 0; i < m_rbB.getNumConstraintRefs(); i++)
+		if (m_rbB.getConstraintRef(i) == this)
+			tcd->m_disableCollisionsBetweenLinkedBodies = true;
+
+	return btTypedConstraintDataName;
+}
+
+btRigidBody& btTypedConstraint::getFixedBody()
+{
+	static btRigidBody s_fixed(0, 0, 0);
+	s_fixed.setMassProps(btScalar(0.), btVector3(btScalar(0.), btScalar(0.), btScalar(0.)));
+	return s_fixed;
+}
+
+void btAngularLimit::set(btScalar low, btScalar high, btScalar _softness, btScalar _biasFactor, btScalar _relaxationFactor)
+{
+	m_halfRange = (high - low) / 2.0f;
+	m_center = btNormalizeAngle(low + m_halfRange);
+	m_softness = _softness;
+	m_biasFactor = _biasFactor;
+	m_relaxationFactor = _relaxationFactor;
+}
+
+void btAngularLimit::test(const btScalar angle)
+{
+	m_correction = 0.0f;
+	m_sign = 0.0f;
+	m_solveLimit = false;
+
+	if (m_halfRange >= 0.0f)
+	{
+		btScalar deviation = btNormalizeAngle(angle - m_center);
+		if (deviation < -m_halfRange)
+		{
+			m_solveLimit = true;
+			m_correction = -(deviation + m_halfRange);
+			m_sign = +1.0f;
+		}
+		else if (deviation > m_halfRange)
+		{
+			m_solveLimit = true;
+			m_correction = m_halfRange - deviation;
+			m_sign = -1.0f;
+		}
+	}
+}
+
+btScalar btAngularLimit::getError() const
+{
+	return m_correction * m_sign;
+}
+
+void btAngularLimit::fit(btScalar& angle) const
+{
+	if (m_halfRange > 0.0f)
+	{
+		btScalar relativeAngle = btNormalizeAngle(angle - m_center);
+		if (!btEqual(relativeAngle, m_halfRange))
+		{
+			if (relativeAngle > 0.0f)
+			{
+				angle = getHigh();
+			}
+			else
+			{
+				angle = getLow();
+			}
+		}
+	}
+}
+
+btScalar btAngularLimit::getLow() const
+{
+	return btNormalizeAngle(m_center - m_halfRange);
+}
+
+btScalar btAngularLimit::getHigh() const
+{
+	return btNormalizeAngle(m_center + m_halfRange);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
new file mode 100644
index 0000000..3d6b08d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
@@ -0,0 +1,532 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2010 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TYPED_CONSTRAINT_H
+#define BT_TYPED_CONSTRAINT_H
+
+#include "LinearMath/btScalar.h"
+#include "btSolverConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btTypedConstraintData2 btTypedConstraintDoubleData
+#define btTypedConstraintDataName "btTypedConstraintDoubleData"
+#else
+#define btTypedConstraintData2 btTypedConstraintFloatData
+#define btTypedConstraintDataName "btTypedConstraintFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+class btSerializer;
+
+//Don't change any of the existing enum values, so add enum types at the end for serialization compatibility
+enum btTypedConstraintType
+{
+	POINT2POINT_CONSTRAINT_TYPE = 3,
+	HINGE_CONSTRAINT_TYPE,
+	CONETWIST_CONSTRAINT_TYPE,
+	D6_CONSTRAINT_TYPE,
+	SLIDER_CONSTRAINT_TYPE,
+	CONTACT_CONSTRAINT_TYPE,
+	D6_SPRING_CONSTRAINT_TYPE,
+	GEAR_CONSTRAINT_TYPE,
+	FIXED_CONSTRAINT_TYPE,
+	D6_SPRING_2_CONSTRAINT_TYPE,
+	MAX_CONSTRAINT_TYPE
+};
+
+enum btConstraintParams
+{
+	BT_CONSTRAINT_ERP = 1,
+	BT_CONSTRAINT_STOP_ERP,
+	BT_CONSTRAINT_CFM,
+	BT_CONSTRAINT_STOP_CFM
+};
+
+#if 1
+#define btAssertConstrParams(_par) btAssert(_par)
+#else
+#define btAssertConstrParams(_par)
+#endif
+
+ATTRIBUTE_ALIGNED16(struct)
+btJointFeedback
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+	btVector3 m_appliedForceBodyA;
+	btVector3 m_appliedTorqueBodyA;
+	btVector3 m_appliedForceBodyB;
+	btVector3 m_appliedTorqueBodyB;
+};
+
+///TypedConstraint is the baseclass for Bullet constraints and vehicles
+ATTRIBUTE_ALIGNED16(class)
+btTypedConstraint : public btTypedObject
+{
+	int m_userConstraintType;
+
+	union {
+		int m_userConstraintId;
+		void* m_userConstraintPtr;
+	};
+
+	btScalar m_breakingImpulseThreshold;
+	bool m_isEnabled;
+	bool m_needsFeedback;
+	int m_overrideNumSolverIterations;
+
+	btTypedConstraint& operator=(btTypedConstraint& other)
+	{
+		btAssert(0);
+		(void)other;
+		return *this;
+	}
+
+protected:
+	btRigidBody& m_rbA;
+	btRigidBody& m_rbB;
+	btScalar m_appliedImpulse;
+	btScalar m_dbgDrawSize;
+	btJointFeedback* m_jointFeedback;
+
+	///internal method used by the constraint solver, don't use them directly
+	btScalar getMotorFactor(btScalar pos, btScalar lowLim, btScalar uppLim, btScalar vel, btScalar timeFact);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	virtual ~btTypedConstraint(){};
+	btTypedConstraint(btTypedConstraintType type, btRigidBody & rbA);
+	btTypedConstraint(btTypedConstraintType type, btRigidBody & rbA, btRigidBody & rbB);
+
+	struct btConstraintInfo1
+	{
+		int m_numConstraintRows, nub;
+	};
+
+	static btRigidBody& getFixedBody();
+
+	struct btConstraintInfo2
+	{
+		// integrator parameters: frames per second (1/stepsize), default error
+		// reduction parameter (0..1).
+		btScalar fps, erp;
+
+		// for the first and second body, pointers to two (linear and angular)
+		// n*3 jacobian sub matrices, stored by rows. these matrices will have
+		// been initialized to 0 on entry. if the second body is zero then the
+		// J2xx pointers may be 0.
+		btScalar *m_J1linearAxis, *m_J1angularAxis, *m_J2linearAxis, *m_J2angularAxis;
+
+		// elements to jump from one row to the next in J's
+		int rowskip;
+
+		// right hand sides of the equation J*v = c + cfm * lambda. cfm is the
+		// "constraint force mixing" vector. c is set to zero on entry, cfm is
+		// set to a constant value (typically very small or zero) value on entry.
+		btScalar *m_constraintError, *cfm;
+
+		// lo and hi limits for variables (set to -/+ infinity on entry).
+		btScalar *m_lowerLimit, *m_upperLimit;
+
+		// number of solver iterations
+		int m_numIterations;
+
+		//damping of the velocity
+		btScalar m_damping;
+	};
+
+	int getOverrideNumSolverIterations() const
+	{
+		return m_overrideNumSolverIterations;
+	}
+
+	///override the number of constraint solver iterations used to solve this constraint
+	///-1 will use the default number of iterations, as specified in SolverInfo.m_numIterations
+	void setOverrideNumSolverIterations(int overideNumIterations)
+	{
+		m_overrideNumSolverIterations = overideNumIterations;
+	}
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void buildJacobian(){};
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void setupSolverConstraint(btConstraintArray & ca, int solverBodyA, int solverBodyB, btScalar timeStep)
+	{
+		(void)ca;
+		(void)solverBodyA;
+		(void)solverBodyB;
+		(void)timeStep;
+	}
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void getInfo1(btConstraintInfo1 * info) = 0;
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void getInfo2(btConstraintInfo2 * info) = 0;
+
+	///internal method used by the constraint solver, don't use them directly
+	void internalSetAppliedImpulse(btScalar appliedImpulse)
+	{
+		m_appliedImpulse = appliedImpulse;
+	}
+	///internal method used by the constraint solver, don't use them directly
+	btScalar internalGetAppliedImpulse()
+	{
+		return m_appliedImpulse;
+	}
+
+	btScalar getBreakingImpulseThreshold() const
+	{
+		return m_breakingImpulseThreshold;
+	}
+
+	void setBreakingImpulseThreshold(btScalar threshold)
+	{
+		m_breakingImpulseThreshold = threshold;
+	}
+
+	bool isEnabled() const
+	{
+		return m_isEnabled;
+	}
+
+	void setEnabled(bool enabled)
+	{
+		m_isEnabled = enabled;
+	}
+
+	///internal method used by the constraint solver, don't use them directly
+	virtual void solveConstraintObsolete(btSolverBody& /*bodyA*/, btSolverBody& /*bodyB*/, btScalar /*timeStep*/){};
+
+	const btRigidBody& getRigidBodyA() const
+	{
+		return m_rbA;
+	}
+	const btRigidBody& getRigidBodyB() const
+	{
+		return m_rbB;
+	}
+
+	btRigidBody& getRigidBodyA()
+	{
+		return m_rbA;
+	}
+	btRigidBody& getRigidBodyB()
+	{
+		return m_rbB;
+	}
+
+	int getUserConstraintType() const
+	{
+		return m_userConstraintType;
+	}
+
+	void setUserConstraintType(int userConstraintType)
+	{
+		m_userConstraintType = userConstraintType;
+	};
+
+	void setUserConstraintId(int uid)
+	{
+		m_userConstraintId = uid;
+	}
+
+	int getUserConstraintId() const
+	{
+		return m_userConstraintId;
+	}
+
+	void setUserConstraintPtr(void* ptr)
+	{
+		m_userConstraintPtr = ptr;
+	}
+
+	void* getUserConstraintPtr()
+	{
+		return m_userConstraintPtr;
+	}
+
+	void setJointFeedback(btJointFeedback * jointFeedback)
+	{
+		m_jointFeedback = jointFeedback;
+	}
+
+	const btJointFeedback* getJointFeedback() const
+	{
+		return m_jointFeedback;
+	}
+
+	btJointFeedback* getJointFeedback()
+	{
+		return m_jointFeedback;
+	}
+
+	int getUid() const
+	{
+		return m_userConstraintId;
+	}
+
+	bool needsFeedback() const
+	{
+		return m_needsFeedback;
+	}
+
+	///enableFeedback will allow to read the applied linear and angular impulse
+	///use getAppliedImpulse, getAppliedLinearImpulse and getAppliedAngularImpulse to read feedback information
+	void enableFeedback(bool needsFeedback)
+	{
+		m_needsFeedback = needsFeedback;
+	}
+
+	///getAppliedImpulse is an estimated total applied impulse.
+	///This feedback could be used to determine breaking constraints or playing sounds.
+	btScalar getAppliedImpulse() const
+	{
+		btAssert(m_needsFeedback);
+		return m_appliedImpulse;
+	}
+
+	btTypedConstraintType getConstraintType() const
+	{
+		return btTypedConstraintType(m_objectType);
+	}
+
+	void setDbgDrawSize(btScalar dbgDrawSize)
+	{
+		m_dbgDrawSize = dbgDrawSize;
+	}
+	btScalar getDbgDrawSize()
+	{
+		return m_dbgDrawSize;
+	}
+
+	///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5).
+	///If no axis is provided, it uses the default axis for this constraint.
+	virtual void setParam(int num, btScalar value, int axis = -1) = 0;
+
+	///return the local value of parameter
+	virtual btScalar getParam(int num, int axis = -1) const = 0;
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
+};
+
+// returns angle in range [-SIMD_2_PI, SIMD_2_PI], closest to one of the limits
+// all arguments should be normalized angles (i.e. in range [-SIMD_PI, SIMD_PI])
+SIMD_FORCE_INLINE btScalar btAdjustAngleToLimits(btScalar angleInRadians, btScalar angleLowerLimitInRadians, btScalar angleUpperLimitInRadians)
+{
+	if (angleLowerLimitInRadians >= angleUpperLimitInRadians)
+	{
+		return angleInRadians;
+	}
+	else if (angleInRadians < angleLowerLimitInRadians)
+	{
+		btScalar diffLo = btFabs(btNormalizeAngle(angleLowerLimitInRadians - angleInRadians));
+		btScalar diffHi = btFabs(btNormalizeAngle(angleUpperLimitInRadians - angleInRadians));
+		return (diffLo < diffHi) ? angleInRadians : (angleInRadians + SIMD_2_PI);
+	}
+	else if (angleInRadians > angleUpperLimitInRadians)
+	{
+		btScalar diffHi = btFabs(btNormalizeAngle(angleInRadians - angleUpperLimitInRadians));
+		btScalar diffLo = btFabs(btNormalizeAngle(angleInRadians - angleLowerLimitInRadians));
+		return (diffLo < diffHi) ? (angleInRadians - SIMD_2_PI) : angleInRadians;
+	}
+	else
+	{
+		return angleInRadians;
+	}
+}
+
+// clang-format off
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct	btTypedConstraintFloatData
+{
+	btRigidBodyFloatData		*m_rbA;
+	btRigidBodyFloatData		*m_rbB;
+	char	*m_name;
+
+	int	m_objectType;
+	int	m_userConstraintType;
+	int	m_userConstraintId;
+	int	m_needsFeedback;
+
+	float	m_appliedImpulse;
+	float	m_dbgDrawSize;
+
+	int	m_disableCollisionsBetweenLinkedBodies;
+	int	m_overrideNumSolverIterations;
+
+	float	m_breakingImpulseThreshold;
+	int		m_isEnabled;
+	
+};
+
+
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+
+#define BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+#ifdef BT_BACKWARDS_COMPATIBLE_SERIALIZATION
+///this structure is not used, except for loading pre-2.82 .bullet files
+struct	btTypedConstraintData
+{
+	btRigidBodyData		*m_rbA;
+	btRigidBodyData		*m_rbB;
+	char	*m_name;
+
+	int	m_objectType;
+	int	m_userConstraintType;
+	int	m_userConstraintId;
+	int	m_needsFeedback;
+
+	float	m_appliedImpulse;
+	float	m_dbgDrawSize;
+
+	int	m_disableCollisionsBetweenLinkedBodies;
+	int	m_overrideNumSolverIterations;
+
+	float	m_breakingImpulseThreshold;
+	int		m_isEnabled;
+	
+};
+#endif //BACKWARDS_COMPATIBLE
+
+struct	btTypedConstraintDoubleData
+{
+	btRigidBodyDoubleData		*m_rbA;
+	btRigidBodyDoubleData		*m_rbB;
+	char	*m_name;
+
+	int	m_objectType;
+	int	m_userConstraintType;
+	int	m_userConstraintId;
+	int	m_needsFeedback;
+
+	double	m_appliedImpulse;
+	double	m_dbgDrawSize;
+
+	int	m_disableCollisionsBetweenLinkedBodies;
+	int	m_overrideNumSolverIterations;
+
+	double	m_breakingImpulseThreshold;
+	int		m_isEnabled;
+	char	padding[4];
+	
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btTypedConstraint::calculateSerializeBufferSize() const
+{
+	return sizeof(btTypedConstraintData2);
+}
+
+class btAngularLimit
+{
+private:
+	btScalar
+		m_center,
+		m_halfRange,
+		m_softness,
+		m_biasFactor,
+		m_relaxationFactor,
+		m_correction,
+		m_sign;
+
+	bool
+		m_solveLimit;
+
+public:
+	/// Default constructor initializes limit as inactive, allowing free constraint movement
+	btAngularLimit()
+		: m_center(0.0f),
+		  m_halfRange(-1.0f),
+		  m_softness(0.9f),
+		  m_biasFactor(0.3f),
+		  m_relaxationFactor(1.0f),
+		  m_correction(0.0f),
+		  m_sign(0.0f),
+		  m_solveLimit(false)
+	{
+	}
+
+	/// Sets all limit's parameters.
+	/// When low > high limit becomes inactive.
+	/// When high - low > 2PI limit is ineffective too becouse no angle can exceed the limit
+	void set(btScalar low, btScalar high, btScalar _softness = 0.9f, btScalar _biasFactor = 0.3f, btScalar _relaxationFactor = 1.0f);
+
+	/// Checks conastaint angle against limit. If limit is active and the angle violates the limit
+	/// correction is calculated.
+	void test(const btScalar angle);
+
+	/// Returns limit's softness
+	inline btScalar getSoftness() const
+	{
+		return m_softness;
+	}
+
+	/// Returns limit's bias factor
+	inline btScalar getBiasFactor() const
+	{
+		return m_biasFactor;
+	}
+
+	/// Returns limit's relaxation factor
+	inline btScalar getRelaxationFactor() const
+	{
+		return m_relaxationFactor;
+	}
+
+	/// Returns correction value evaluated when test() was invoked
+	inline btScalar getCorrection() const
+	{
+		return m_correction;
+	}
+
+	/// Returns sign value evaluated when test() was invoked
+	inline btScalar getSign() const
+	{
+		return m_sign;
+	}
+
+	/// Gives half of the distance between min and max limit angle
+	inline btScalar getHalfRange() const
+	{
+		return m_halfRange;
+	}
+
+	/// Returns true when the last test() invocation recognized limit violation
+	inline bool isLimit() const
+	{
+		return m_solveLimit;
+	}
+
+	/// Checks given angle against limit. If limit is active and angle doesn't fit it, the angle
+	/// returned is modified so it equals to the limit closest to given angle.
+	void fit(btScalar& angle) const;
+
+	/// Returns correction value multiplied by sign value
+	btScalar getError() const;
+
+	btScalar getLow() const;
+
+	btScalar getHigh() const;
+};
+
+#endif  //BT_TYPED_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
new file mode 100644
index 0000000..42ed1fb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
@@ -0,0 +1,80 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btUniversalConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+
+#define UNIV_EPS btScalar(0.01f)
+
+// constructor
+// anchor, axis1 and axis2 are in world coordinate system
+// axis1 must be orthogonal to axis2
+btUniversalConstraint::btUniversalConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& anchor, const btVector3& axis1, const btVector3& axis2)
+	: btGeneric6DofConstraint(rbA, rbB, btTransform::getIdentity(), btTransform::getIdentity(), true),
+	  m_anchor(anchor),
+	  m_axis1(axis1),
+	  m_axis2(axis2)
+{
+	// build frame basis
+	// 6DOF constraint uses Euler angles and to define limits
+	// it is assumed that rotational order is :
+	// Z - first, allowed limits are (-PI,PI);
+	// new position of Y - second (allowed limits are (-PI/2 + epsilon, PI/2 - epsilon), where epsilon is a small positive number
+	// used to prevent constraint from instability on poles;
+	// new position of X, allowed limits are (-PI,PI);
+	// So to simulate ODE Universal joint we should use parent axis as Z, child axis as Y and limit all other DOFs
+	// Build the frame in world coordinate system first
+	btVector3 zAxis = m_axis1.normalize();
+	btVector3 yAxis = m_axis2.normalize();
+	btVector3 xAxis = yAxis.cross(zAxis);  // we want right coordinate system
+	btTransform frameInW;
+	frameInW.setIdentity();
+	frameInW.getBasis().setValue(xAxis[0], yAxis[0], zAxis[0],
+								 xAxis[1], yAxis[1], zAxis[1],
+								 xAxis[2], yAxis[2], zAxis[2]);
+	frameInW.setOrigin(anchor);
+	// now get constraint frame in local coordinate systems
+	m_frameInA = rbA.getCenterOfMassTransform().inverse() * frameInW;
+	m_frameInB = rbB.getCenterOfMassTransform().inverse() * frameInW;
+	// sei limits
+	setLinearLowerLimit(btVector3(0., 0., 0.));
+	setLinearUpperLimit(btVector3(0., 0., 0.));
+	setAngularLowerLimit(btVector3(0.f, -SIMD_HALF_PI + UNIV_EPS, -SIMD_PI + UNIV_EPS));
+	setAngularUpperLimit(btVector3(0.f, SIMD_HALF_PI - UNIV_EPS, SIMD_PI - UNIV_EPS));
+}
+
+void btUniversalConstraint::setAxis(const btVector3& axis1, const btVector3& axis2)
+{
+	m_axis1 = axis1;
+	m_axis2 = axis2;
+
+	btVector3 zAxis = axis1.normalized();
+	btVector3 yAxis = axis2.normalized();
+	btVector3 xAxis = yAxis.cross(zAxis);  // we want right coordinate system
+
+	btTransform frameInW;
+	frameInW.setIdentity();
+	frameInW.getBasis().setValue(xAxis[0], yAxis[0], zAxis[0],
+								 xAxis[1], yAxis[1], zAxis[1],
+								 xAxis[2], yAxis[2], zAxis[2]);
+	frameInW.setOrigin(m_anchor);
+
+	// now get constraint frame in local coordinate systems
+	m_frameInA = m_rbA.getCenterOfMassTransform().inverse() * frameInW;
+	m_frameInB = m_rbB.getCenterOfMassTransform().inverse() * frameInW;
+
+	calculateTransforms();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
new file mode 100644
index 0000000..8c24d93
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
@@ -0,0 +1,59 @@
+/*
+Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
+Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. 
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_UNIVERSAL_CONSTRAINT_H
+#define BT_UNIVERSAL_CONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "btTypedConstraint.h"
+#include "btGeneric6DofConstraint.h"
+
+/// Constraint similar to ODE Universal Joint
+/// has 2 rotatioonal degrees of freedom, similar to Euler rotations around Z (axis 1)
+/// and Y (axis 2)
+/// Description from ODE manual :
+/// "Given axis 1 on body 1, and axis 2 on body 2 that is perpendicular to axis 1, it keeps them perpendicular.
+/// In other words, rotation of the two bodies about the direction perpendicular to the two axes will be equal."
+
+ATTRIBUTE_ALIGNED16(class)
+btUniversalConstraint : public btGeneric6DofConstraint
+{
+protected:
+	btVector3 m_anchor;
+	btVector3 m_axis1;
+	btVector3 m_axis2;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	// constructor
+	// anchor, axis1 and axis2 are in world coordinate system
+	// axis1 must be orthogonal to axis2
+	btUniversalConstraint(btRigidBody & rbA, btRigidBody & rbB, const btVector3& anchor, const btVector3& axis1, const btVector3& axis2);
+	// access
+	const btVector3& getAnchor() { return m_calculatedTransformA.getOrigin(); }
+	const btVector3& getAnchor2() { return m_calculatedTransformB.getOrigin(); }
+	const btVector3& getAxis1() { return m_axis1; }
+	const btVector3& getAxis2() { return m_axis2; }
+	btScalar getAngle1() { return getAngle(2); }
+	btScalar getAngle2() { return getAngle(1); }
+	// limits
+	void setUpperLimit(btScalar ang1max, btScalar ang2max) { setAngularUpperLimit(btVector3(0.f, ang1max, ang2max)); }
+	void setLowerLimit(btScalar ang1min, btScalar ang2min) { setAngularLowerLimit(btVector3(0.f, ang1min, ang2min)); }
+
+	void setAxis(const btVector3& axis1, const btVector3& axis2);
+};
+
+#endif  // BT_UNIVERSAL_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btActionInterface.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btActionInterface.h
new file mode 100644
index 0000000..51a3fa4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btActionInterface.h
@@ -0,0 +1,41 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _BT_ACTION_INTERFACE_H
+#define _BT_ACTION_INTERFACE_H
+
+class btIDebugDraw;
+class btCollisionWorld;
+
+#include "LinearMath/btScalar.h"
+#include "btRigidBody.h"
+
+///Basic interface to allow actions such as vehicles and characters to be updated inside a btDynamicsWorld
+class btActionInterface
+{
+protected:
+	static btRigidBody& getFixedBody();
+
+public:
+	virtual ~btActionInterface()
+	{
+	}
+
+	virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) = 0;
+
+	virtual void debugDraw(btIDebugDraw* debugDrawer) = 0;
+};
+
+#endif  //_BT_ACTION_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
new file mode 100644
index 0000000..9e99c15
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -0,0 +1,1469 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btDiscreteDynamicsWorld.h"
+
+//collision detection
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btQuickprof.h"
+
+//rigidbody & constraints
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btHingeConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
+#include "BulletDynamics/ConstraintSolver/btSliderConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btContactConstraint.h"
+
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+
+#include "BulletDynamics/Dynamics/btActionInterface.h"
+#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btMotionState.h"
+
+#include "LinearMath/btSerializer.h"
+
+#if 0
+btAlignedObjectArray<btVector3> debugContacts;
+btAlignedObjectArray<btVector3> debugNormals;
+int startHit=2;
+int firstHit=startHit;
+#endif
+
+SIMD_FORCE_INLINE int btGetConstraintIslandId(const btTypedConstraint* lhs)
+{
+	int islandId;
+
+	const btCollisionObject& rcolObj0 = lhs->getRigidBodyA();
+	const btCollisionObject& rcolObj1 = lhs->getRigidBodyB();
+	islandId = rcolObj0.getIslandTag() >= 0 ? rcolObj0.getIslandTag() : rcolObj1.getIslandTag();
+	return islandId;
+}
+
+class btSortConstraintOnIslandPredicate
+{
+public:
+	bool operator()(const btTypedConstraint* lhs, const btTypedConstraint* rhs) const
+	{
+		int rIslandId0, lIslandId0;
+		rIslandId0 = btGetConstraintIslandId(rhs);
+		lIslandId0 = btGetConstraintIslandId(lhs);
+		return lIslandId0 < rIslandId0;
+	}
+};
+
+struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback
+{
+	btContactSolverInfo* m_solverInfo;
+	btConstraintSolver* m_solver;
+	btTypedConstraint** m_sortedConstraints;
+	int m_numConstraints;
+	btIDebugDraw* m_debugDrawer;
+	btDispatcher* m_dispatcher;
+
+	btAlignedObjectArray<btCollisionObject*> m_bodies;
+	btAlignedObjectArray<btPersistentManifold*> m_manifolds;
+	btAlignedObjectArray<btTypedConstraint*> m_constraints;
+
+	InplaceSolverIslandCallback(
+		btConstraintSolver* solver,
+		btStackAlloc* stackAlloc,
+		btDispatcher* dispatcher)
+		: m_solverInfo(NULL),
+		  m_solver(solver),
+		  m_sortedConstraints(NULL),
+		  m_numConstraints(0),
+		  m_debugDrawer(NULL),
+		  m_dispatcher(dispatcher)
+	{
+	}
+
+	InplaceSolverIslandCallback& operator=(InplaceSolverIslandCallback& other)
+	{
+		btAssert(0);
+		(void)other;
+		return *this;
+	}
+
+	SIMD_FORCE_INLINE void setup(btContactSolverInfo* solverInfo, btTypedConstraint** sortedConstraints, int numConstraints, btIDebugDraw* debugDrawer)
+	{
+		btAssert(solverInfo);
+		m_solverInfo = solverInfo;
+		m_sortedConstraints = sortedConstraints;
+		m_numConstraints = numConstraints;
+		m_debugDrawer = debugDrawer;
+		m_bodies.resize(0);
+		m_manifolds.resize(0);
+		m_constraints.resize(0);
+	}
+
+	virtual void processIsland(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifolds, int numManifolds, int islandId)
+	{
+		if (islandId < 0)
+		{
+			///we don't split islands, so all constraints/contact manifolds/bodies are passed into the solver regardless the island id
+			m_solver->solveGroup(bodies, numBodies, manifolds, numManifolds, &m_sortedConstraints[0], m_numConstraints, *m_solverInfo, m_debugDrawer, m_dispatcher);
+		}
+		else
+		{
+			//also add all non-contact constraints/joints for this island
+			btTypedConstraint** startConstraint = 0;
+			int numCurConstraints = 0;
+			int i;
+
+			//find the first constraint for this island
+			for (i = 0; i < m_numConstraints; i++)
+			{
+				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+				{
+					startConstraint = &m_sortedConstraints[i];
+					break;
+				}
+			}
+			//count the number of constraints in this island
+			for (; i < m_numConstraints; i++)
+			{
+				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+				{
+					numCurConstraints++;
+				}
+			}
+
+			if (m_solverInfo->m_minimumSolverBatchSize <= 1)
+			{
+				m_solver->solveGroup(bodies, numBodies, manifolds, numManifolds, startConstraint, numCurConstraints, *m_solverInfo, m_debugDrawer, m_dispatcher);
+			}
+			else
+			{
+				for (i = 0; i < numBodies; i++)
+					m_bodies.push_back(bodies[i]);
+				for (i = 0; i < numManifolds; i++)
+					m_manifolds.push_back(manifolds[i]);
+				for (i = 0; i < numCurConstraints; i++)
+					m_constraints.push_back(startConstraint[i]);
+				if ((m_constraints.size() + m_manifolds.size()) > m_solverInfo->m_minimumSolverBatchSize)
+				{
+					processConstraints();
+				}
+				else
+				{
+					//printf("deferred\n");
+				}
+			}
+		}
+	}
+	void processConstraints()
+	{
+		btCollisionObject** bodies = m_bodies.size() ? &m_bodies[0] : 0;
+		btPersistentManifold** manifold = m_manifolds.size() ? &m_manifolds[0] : 0;
+		btTypedConstraint** constraints = m_constraints.size() ? &m_constraints[0] : 0;
+
+		m_solver->solveGroup(bodies, m_bodies.size(), manifold, m_manifolds.size(), constraints, m_constraints.size(), *m_solverInfo, m_debugDrawer, m_dispatcher);
+		m_bodies.resize(0);
+		m_manifolds.resize(0);
+		m_constraints.resize(0);
+	}
+};
+
+btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration)
+	: btDynamicsWorld(dispatcher, pairCache, collisionConfiguration),
+	  m_sortedConstraints(),
+	  m_solverIslandCallback(NULL),
+	  m_constraintSolver(constraintSolver),
+	  m_gravity(0, -10, 0),
+	  m_localTime(0),
+	  m_fixedTimeStep(0),
+	  m_synchronizeAllMotionStates(false),
+	  m_applySpeculativeContactRestitution(false),
+	  m_profileTimings(0),
+	  m_latencyMotionStateInterpolation(true)
+
+{
+	if (!m_constraintSolver)
+	{
+		void* mem = btAlignedAlloc(sizeof(btSequentialImpulseConstraintSolver), 16);
+		m_constraintSolver = new (mem) btSequentialImpulseConstraintSolver;
+		m_ownsConstraintSolver = true;
+	}
+	else
+	{
+		m_ownsConstraintSolver = false;
+	}
+
+	{
+		void* mem = btAlignedAlloc(sizeof(btSimulationIslandManager), 16);
+		m_islandManager = new (mem) btSimulationIslandManager();
+	}
+
+	m_ownsIslandManager = true;
+
+	{
+		void* mem = btAlignedAlloc(sizeof(InplaceSolverIslandCallback), 16);
+		m_solverIslandCallback = new (mem) InplaceSolverIslandCallback(m_constraintSolver, 0, dispatcher);
+	}
+}
+
+btDiscreteDynamicsWorld::~btDiscreteDynamicsWorld()
+{
+	//only delete it when we created it
+	if (m_ownsIslandManager)
+	{
+		m_islandManager->~btSimulationIslandManager();
+		btAlignedFree(m_islandManager);
+	}
+	if (m_solverIslandCallback)
+	{
+		m_solverIslandCallback->~InplaceSolverIslandCallback();
+		btAlignedFree(m_solverIslandCallback);
+	}
+	if (m_ownsConstraintSolver)
+	{
+		m_constraintSolver->~btConstraintSolver();
+		btAlignedFree(m_constraintSolver);
+	}
+}
+
+void btDiscreteDynamicsWorld::saveKinematicState(btScalar timeStep)
+{
+	///would like to iterate over m_nonStaticRigidBodies, but unfortunately old API allows
+	///to switch status _after_ adding kinematic objects to the world
+	///fix it for Bullet 3.x release
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body && body->getActivationState() != ISLAND_SLEEPING)
+		{
+			if (body->isKinematicObject())
+			{
+				//to calculate velocities next frame
+				body->saveKinematicState(timeStep);
+			}
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::debugDrawWorld()
+{
+	BT_PROFILE("debugDrawWorld");
+
+	btCollisionWorld::debugDrawWorld();
+
+	bool drawConstraints = false;
+	if (getDebugDrawer())
+	{
+		int mode = getDebugDrawer()->getDebugMode();
+		if (mode & (btIDebugDraw::DBG_DrawConstraints | btIDebugDraw::DBG_DrawConstraintLimits))
+		{
+			drawConstraints = true;
+		}
+	}
+	if (drawConstraints)
+	{
+		for (int i = getNumConstraints() - 1; i >= 0; i--)
+		{
+			btTypedConstraint* constraint = getConstraint(i);
+			debugDrawConstraint(constraint);
+		}
+	}
+
+	if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb | btIDebugDraw::DBG_DrawNormals)))
+	{
+		int i;
+
+		if (getDebugDrawer() && getDebugDrawer()->getDebugMode())
+		{
+			for (i = 0; i < m_actions.size(); i++)
+			{
+				m_actions[i]->debugDraw(m_debugDrawer);
+			}
+		}
+	}
+	if (getDebugDrawer())
+		getDebugDrawer()->flushLines();
+}
+
+void btDiscreteDynamicsWorld::clearForces()
+{
+	///@todo: iterate over awake simulation islands!
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); i++)
+	{
+		btRigidBody* body = m_nonStaticRigidBodies[i];
+		//need to check if next line is ok
+		//it might break backward compatibility (people applying forces on sleeping objects get never cleared and accumulate on wake-up
+		body->clearForces();
+	}
+}
+
+///apply gravity, call this once per timestep
+void btDiscreteDynamicsWorld::applyGravity()
+{
+	///@todo: iterate over awake simulation islands!
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); i++)
+	{
+		btRigidBody* body = m_nonStaticRigidBodies[i];
+		if (body->isActive())
+		{
+			body->applyGravity();
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::synchronizeSingleMotionState(btRigidBody* body)
+{
+	btAssert(body);
+
+	if (body->getMotionState() && !body->isStaticOrKinematicObject())
+	{
+		//we need to call the update at least once, even for sleeping objects
+		//otherwise the 'graphics' transform never updates properly
+		///@todo: add 'dirty' flag
+		//if (body->getActivationState() != ISLAND_SLEEPING)
+		{
+			btTransform interpolatedTransform;
+			btTransformUtil::integrateTransform(body->getInterpolationWorldTransform(),
+												body->getInterpolationLinearVelocity(), body->getInterpolationAngularVelocity(),
+												(m_latencyMotionStateInterpolation && m_fixedTimeStep) ? m_localTime - m_fixedTimeStep : m_localTime * body->getHitFraction(),
+												interpolatedTransform);
+			body->getMotionState()->setWorldTransform(interpolatedTransform);
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::synchronizeMotionStates()
+{
+	//	BT_PROFILE("synchronizeMotionStates");
+	if (m_synchronizeAllMotionStates)
+	{
+		//iterate  over all collision objects
+		for (int i = 0; i < m_collisionObjects.size(); i++)
+		{
+			btCollisionObject* colObj = m_collisionObjects[i];
+			btRigidBody* body = btRigidBody::upcast(colObj);
+			if (body)
+				synchronizeSingleMotionState(body);
+		}
+	}
+	else
+	{
+		//iterate over all active rigid bodies
+		for (int i = 0; i < m_nonStaticRigidBodies.size(); i++)
+		{
+			btRigidBody* body = m_nonStaticRigidBodies[i];
+			if (body->isActive())
+				synchronizeSingleMotionState(body);
+		}
+	}
+}
+
+int btDiscreteDynamicsWorld::stepSimulation(btScalar timeStep, int maxSubSteps, btScalar fixedTimeStep)
+{
+	startProfiling(timeStep);
+
+	int numSimulationSubSteps = 0;
+
+	if (maxSubSteps)
+	{
+		//fixed timestep with interpolation
+		m_fixedTimeStep = fixedTimeStep;
+		m_localTime += timeStep;
+		if (m_localTime >= fixedTimeStep)
+		{
+			numSimulationSubSteps = int(m_localTime / fixedTimeStep);
+			m_localTime -= numSimulationSubSteps * fixedTimeStep;
+		}
+	}
+	else
+	{
+		//variable timestep
+		fixedTimeStep = timeStep;
+		m_localTime = m_latencyMotionStateInterpolation ? 0 : timeStep;
+		m_fixedTimeStep = 0;
+		if (btFuzzyZero(timeStep))
+		{
+			numSimulationSubSteps = 0;
+			maxSubSteps = 0;
+		}
+		else
+		{
+			numSimulationSubSteps = 1;
+			maxSubSteps = 1;
+		}
+	}
+
+	//process some debugging flags
+	if (getDebugDrawer())
+	{
+		btIDebugDraw* debugDrawer = getDebugDrawer();
+		gDisableDeactivation = (debugDrawer->getDebugMode() & btIDebugDraw::DBG_NoDeactivation) != 0;
+	}
+	if (numSimulationSubSteps)
+	{
+		//clamp the number of substeps, to prevent simulation grinding spiralling down to a halt
+		int clampedSimulationSteps = (numSimulationSubSteps > maxSubSteps) ? maxSubSteps : numSimulationSubSteps;
+
+		saveKinematicState(fixedTimeStep * clampedSimulationSteps);
+
+		applyGravity();
+
+		for (int i = 0; i < clampedSimulationSteps; i++)
+		{
+			internalSingleStepSimulation(fixedTimeStep);
+			synchronizeMotionStates();
+		}
+	}
+	else
+	{
+		synchronizeMotionStates();
+	}
+
+	clearForces();
+
+#ifndef BT_NO_PROFILE
+	CProfileManager::Increment_Frame_Counter();
+#endif  //BT_NO_PROFILE
+
+	return numSimulationSubSteps;
+}
+
+void btDiscreteDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
+{
+	BT_PROFILE("internalSingleStepSimulation");
+
+	if (0 != m_internalPreTickCallback)
+	{
+		(*m_internalPreTickCallback)(this, timeStep);
+	}
+
+	///apply gravity, predict motion
+	predictUnconstraintMotion(timeStep);
+
+	btDispatcherInfo& dispatchInfo = getDispatchInfo();
+
+	dispatchInfo.m_timeStep = timeStep;
+	dispatchInfo.m_stepCount = 0;
+	dispatchInfo.m_debugDraw = getDebugDrawer();
+
+	createPredictiveContacts(timeStep);
+
+	///perform collision detection
+	performDiscreteCollisionDetection();
+
+	calculateSimulationIslands();
+
+	getSolverInfo().m_timeStep = timeStep;
+
+	///solve contact and other joint constraints
+	solveConstraints(getSolverInfo());
+
+	///CallbackTriggers();
+
+	///integrate transforms
+
+	integrateTransforms(timeStep);
+
+	///update vehicle simulation
+	updateActions(timeStep);
+
+	updateActivationState(timeStep);
+
+	if (0 != m_internalTickCallback)
+	{
+		(*m_internalTickCallback)(this, timeStep);
+	}
+}
+
+void btDiscreteDynamicsWorld::setGravity(const btVector3& gravity)
+{
+	m_gravity = gravity;
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); i++)
+	{
+		btRigidBody* body = m_nonStaticRigidBodies[i];
+		if (body->isActive() && !(body->getFlags() & BT_DISABLE_WORLD_GRAVITY))
+		{
+			body->setGravity(gravity);
+		}
+	}
+}
+
+btVector3 btDiscreteDynamicsWorld::getGravity() const
+{
+	return m_gravity;
+}
+
+void btDiscreteDynamicsWorld::addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask)
+{
+	btCollisionWorld::addCollisionObject(collisionObject, collisionFilterGroup, collisionFilterMask);
+}
+
+void btDiscreteDynamicsWorld::removeCollisionObject(btCollisionObject* collisionObject)
+{
+	btRigidBody* body = btRigidBody::upcast(collisionObject);
+	if (body)
+		removeRigidBody(body);
+	else
+		btCollisionWorld::removeCollisionObject(collisionObject);
+}
+
+void btDiscreteDynamicsWorld::removeRigidBody(btRigidBody* body)
+{
+	m_nonStaticRigidBodies.remove(body);
+	btCollisionWorld::removeCollisionObject(body);
+}
+
+void btDiscreteDynamicsWorld::addRigidBody(btRigidBody* body)
+{
+	if (!body->isStaticOrKinematicObject() && !(body->getFlags() & BT_DISABLE_WORLD_GRAVITY))
+	{
+		body->setGravity(m_gravity);
+	}
+
+	if (body->getCollisionShape())
+	{
+		if (!body->isStaticObject())
+		{
+			m_nonStaticRigidBodies.push_back(body);
+		}
+		else
+		{
+			body->setActivationState(ISLAND_SLEEPING);
+		}
+
+		bool isDynamic = !(body->isStaticObject() || body->isKinematicObject());
+		int collisionFilterGroup = isDynamic ? int(btBroadphaseProxy::DefaultFilter) : int(btBroadphaseProxy::StaticFilter);
+		int collisionFilterMask = isDynamic ? int(btBroadphaseProxy::AllFilter) : int(btBroadphaseProxy::AllFilter ^ btBroadphaseProxy::StaticFilter);
+
+		addCollisionObject(body, collisionFilterGroup, collisionFilterMask);
+	}
+}
+
+void btDiscreteDynamicsWorld::addRigidBody(btRigidBody* body, int group, int mask)
+{
+	if (!body->isStaticOrKinematicObject() && !(body->getFlags() & BT_DISABLE_WORLD_GRAVITY))
+	{
+		body->setGravity(m_gravity);
+	}
+
+	if (body->getCollisionShape())
+	{
+		if (!body->isStaticObject())
+		{
+			m_nonStaticRigidBodies.push_back(body);
+		}
+		else
+		{
+			body->setActivationState(ISLAND_SLEEPING);
+		}
+		addCollisionObject(body, group, mask);
+	}
+}
+
+void btDiscreteDynamicsWorld::updateActions(btScalar timeStep)
+{
+	BT_PROFILE("updateActions");
+
+	for (int i = 0; i < m_actions.size(); i++)
+	{
+		m_actions[i]->updateAction(this, timeStep);
+	}
+}
+
+void btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
+{
+	BT_PROFILE("updateActivationState");
+
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); i++)
+	{
+		btRigidBody* body = m_nonStaticRigidBodies[i];
+		if (body)
+		{
+			body->updateDeactivation(timeStep);
+
+			if (body->wantsSleeping())
+			{
+				if (body->isStaticOrKinematicObject())
+				{
+					body->setActivationState(ISLAND_SLEEPING);
+				}
+				else
+				{
+					if (body->getActivationState() == ACTIVE_TAG)
+						body->setActivationState(WANTS_DEACTIVATION);
+					if (body->getActivationState() == ISLAND_SLEEPING)
+					{
+						body->setAngularVelocity(btVector3(0, 0, 0));
+						body->setLinearVelocity(btVector3(0, 0, 0));
+					}
+				}
+			}
+			else
+			{
+				if (body->getActivationState() != DISABLE_DEACTIVATION)
+					body->setActivationState(ACTIVE_TAG);
+			}
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies)
+{
+	m_constraints.push_back(constraint);
+	//Make sure the two bodies of a type constraint are different (possibly add this to the btTypedConstraint constructor?)
+	btAssert(&constraint->getRigidBodyA() != &constraint->getRigidBodyB());
+
+	if (disableCollisionsBetweenLinkedBodies)
+	{
+		constraint->getRigidBodyA().addConstraintRef(constraint);
+		constraint->getRigidBodyB().addConstraintRef(constraint);
+	}
+}
+
+void btDiscreteDynamicsWorld::removeConstraint(btTypedConstraint* constraint)
+{
+	m_constraints.remove(constraint);
+	constraint->getRigidBodyA().removeConstraintRef(constraint);
+	constraint->getRigidBodyB().removeConstraintRef(constraint);
+}
+
+void btDiscreteDynamicsWorld::addAction(btActionInterface* action)
+{
+	m_actions.push_back(action);
+}
+
+void btDiscreteDynamicsWorld::removeAction(btActionInterface* action)
+{
+	m_actions.remove(action);
+}
+
+void btDiscreteDynamicsWorld::addVehicle(btActionInterface* vehicle)
+{
+	addAction(vehicle);
+}
+
+void btDiscreteDynamicsWorld::removeVehicle(btActionInterface* vehicle)
+{
+	removeAction(vehicle);
+}
+
+void btDiscreteDynamicsWorld::addCharacter(btActionInterface* character)
+{
+	addAction(character);
+}
+
+void btDiscreteDynamicsWorld::removeCharacter(btActionInterface* character)
+{
+	removeAction(character);
+}
+
+void btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
+{
+	BT_PROFILE("solveConstraints");
+
+	m_sortedConstraints.resize(m_constraints.size());
+	int i;
+	for (i = 0; i < getNumConstraints(); i++)
+	{
+		m_sortedConstraints[i] = m_constraints[i];
+	}
+
+	//	btAssert(0);
+
+	m_sortedConstraints.quickSort(btSortConstraintOnIslandPredicate());
+
+	btTypedConstraint** constraintsPtr = getNumConstraints() ? &m_sortedConstraints[0] : 0;
+
+	m_solverIslandCallback->setup(&solverInfo, constraintsPtr, m_sortedConstraints.size(), getDebugDrawer());
+	m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds());
+
+	/// solve all the constraints for this island
+	m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(), getCollisionWorld(), m_solverIslandCallback);
+
+	m_solverIslandCallback->processConstraints();
+
+	m_constraintSolver->allSolved(solverInfo, m_debugDrawer);
+}
+
+void btDiscreteDynamicsWorld::calculateSimulationIslands()
+{
+	BT_PROFILE("calculateSimulationIslands");
+
+	getSimulationIslandManager()->updateActivationState(getCollisionWorld(), getCollisionWorld()->getDispatcher());
+
+	{
+		//merge islands based on speculative contact manifolds too
+		for (int i = 0; i < this->m_predictiveManifolds.size(); i++)
+		{
+			btPersistentManifold* manifold = m_predictiveManifolds[i];
+
+			const btCollisionObject* colObj0 = manifold->getBody0();
+			const btCollisionObject* colObj1 = manifold->getBody1();
+
+			if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
+				((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
+			{
+				getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(), (colObj1)->getIslandTag());
+			}
+		}
+	}
+
+	{
+		int i;
+		int numConstraints = int(m_constraints.size());
+		for (i = 0; i < numConstraints; i++)
+		{
+			btTypedConstraint* constraint = m_constraints[i];
+			if (constraint->isEnabled())
+			{
+				const btRigidBody* colObj0 = &constraint->getRigidBodyA();
+				const btRigidBody* colObj1 = &constraint->getRigidBodyB();
+
+				if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
+					((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
+				{
+					getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(), (colObj1)->getIslandTag());
+				}
+			}
+		}
+	}
+
+	//Store the island id in each body
+	getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld());
+}
+
+class btClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
+{
+public:
+	btCollisionObject* m_me;
+	btScalar m_allowedPenetration;
+	btOverlappingPairCache* m_pairCache;
+	btDispatcher* m_dispatcher;
+
+public:
+	btClosestNotMeConvexResultCallback(btCollisionObject* me, const btVector3& fromA, const btVector3& toA, btOverlappingPairCache* pairCache, btDispatcher* dispatcher) : btCollisionWorld::ClosestConvexResultCallback(fromA, toA),
+																																										   m_me(me),
+																																										   m_allowedPenetration(0.0f),
+																																										   m_pairCache(pairCache),
+																																										   m_dispatcher(dispatcher)
+	{
+	}
+
+	virtual btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool normalInWorldSpace)
+	{
+		if (convexResult.m_hitCollisionObject == m_me)
+			return 1.0f;
+
+		//ignore result if there is no contact response
+		if (!convexResult.m_hitCollisionObject->hasContactResponse())
+			return 1.0f;
+
+		btVector3 linVelA, linVelB;
+		linVelA = m_convexToWorld - m_convexFromWorld;
+		linVelB = btVector3(0, 0, 0);  //toB.getOrigin()-fromB.getOrigin();
+
+		btVector3 relativeVelocity = (linVelA - linVelB);
+		//don't report time of impact for motion away from the contact normal (or causes minor penetration)
+		if (convexResult.m_hitNormalLocal.dot(relativeVelocity) >= -m_allowedPenetration)
+			return 1.f;
+
+		return ClosestConvexResultCallback::addSingleResult(convexResult, normalInWorldSpace);
+	}
+
+	virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+	{
+		//don't collide with itself
+		if (proxy0->m_clientObject == m_me)
+			return false;
+
+		///don't do CCD when the collision filters are not matching
+		if (!ClosestConvexResultCallback::needsCollision(proxy0))
+			return false;
+		if (m_pairCache->getOverlapFilterCallback()) {
+			btBroadphaseProxy* proxy1 = m_me->getBroadphaseHandle();
+			bool collides = m_pairCache->needsBroadphaseCollision(proxy0, proxy1);
+			if (!collides)
+			{
+				return false;
+			}
+		}
+
+		btCollisionObject* otherObj = (btCollisionObject*)proxy0->m_clientObject;
+
+		if (!m_dispatcher->needsCollision(m_me, otherObj))
+			return false;
+
+		//call needsResponse, see http://code.google.com/p/bullet/issues/detail?id=179
+		if (m_dispatcher->needsResponse(m_me, otherObj))
+		{
+#if 0
+			///don't do CCD when there are already contact points (touching contact/penetration)
+			btAlignedObjectArray<btPersistentManifold*> manifoldArray;
+			btBroadphasePair* collisionPair = m_pairCache->findPair(m_me->getBroadphaseHandle(),proxy0);
+			if (collisionPair)
+			{
+				if (collisionPair->m_algorithm)
+				{
+					manifoldArray.resize(0);
+					collisionPair->m_algorithm->getAllContactManifolds(manifoldArray);
+					for (int j=0;j<manifoldArray.size();j++)
+					{
+						btPersistentManifold* manifold = manifoldArray[j];
+						if (manifold->getNumContacts()>0)
+							return false;
+					}
+				}
+			}
+#endif
+			return true;
+		}
+
+		return false;
+	}
+};
+
+///internal debugging variable. this value shouldn't be too high
+int gNumClampedCcdMotions = 0;
+
+void btDiscreteDynamicsWorld::createPredictiveContactsInternal(btRigidBody** bodies, int numBodies, btScalar timeStep)
+{
+	btTransform predictedTrans;
+	for (int i = 0; i < numBodies; i++)
+	{
+		btRigidBody* body = bodies[i];
+		body->setHitFraction(1.f);
+
+		if (body->isActive() && (!body->isStaticOrKinematicObject()))
+		{
+			body->predictIntegratedTransform(timeStep, predictedTrans);
+
+			btScalar squareMotion = (predictedTrans.getOrigin() - body->getWorldTransform().getOrigin()).length2();
+
+			if (getDispatchInfo().m_useContinuous && body->getCcdSquareMotionThreshold() && body->getCcdSquareMotionThreshold() < squareMotion)
+			{
+				BT_PROFILE("predictive convexSweepTest");
+				if (body->getCollisionShape()->isConvex())
+				{
+					gNumClampedCcdMotions++;
+#ifdef PREDICTIVE_CONTACT_USE_STATIC_ONLY
+					class StaticOnlyCallback : public btClosestNotMeConvexResultCallback
+					{
+					public:
+						StaticOnlyCallback(btCollisionObject* me, const btVector3& fromA, const btVector3& toA, btOverlappingPairCache* pairCache, btDispatcher* dispatcher) : btClosestNotMeConvexResultCallback(me, fromA, toA, pairCache, dispatcher)
+						{
+						}
+
+						virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+						{
+							btCollisionObject* otherObj = (btCollisionObject*)proxy0->m_clientObject;
+							if (!otherObj->isStaticOrKinematicObject())
+								return false;
+							return btClosestNotMeConvexResultCallback::needsCollision(proxy0);
+						}
+					};
+
+					StaticOnlyCallback sweepResults(body, body->getWorldTransform().getOrigin(), predictedTrans.getOrigin(), getBroadphase()->getOverlappingPairCache(), getDispatcher());
+#else
+					btClosestNotMeConvexResultCallback sweepResults(body, body->getWorldTransform().getOrigin(), predictedTrans.getOrigin(), getBroadphase()->getOverlappingPairCache(), getDispatcher());
+#endif
+					//btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
+					btSphereShape tmpSphere(body->getCcdSweptSphereRadius());  //btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
+					sweepResults.m_allowedPenetration = getDispatchInfo().m_allowedCcdPenetration;
+
+					sweepResults.m_collisionFilterGroup = body->getBroadphaseProxy()->m_collisionFilterGroup;
+					sweepResults.m_collisionFilterMask = body->getBroadphaseProxy()->m_collisionFilterMask;
+					btTransform modifiedPredictedTrans = predictedTrans;
+					modifiedPredictedTrans.setBasis(body->getWorldTransform().getBasis());
+
+					convexSweepTest(&tmpSphere, body->getWorldTransform(), modifiedPredictedTrans, sweepResults);
+					if (sweepResults.hasHit() && (sweepResults.m_closestHitFraction < 1.f))
+					{
+						btVector3 distVec = (predictedTrans.getOrigin() - body->getWorldTransform().getOrigin()) * sweepResults.m_closestHitFraction;
+						btScalar distance = distVec.dot(-sweepResults.m_hitNormalWorld);
+
+						btMutexLock(&m_predictiveManifoldsMutex);
+						btPersistentManifold* manifold = m_dispatcher1->getNewManifold(body, sweepResults.m_hitCollisionObject);
+						m_predictiveManifolds.push_back(manifold);
+						btMutexUnlock(&m_predictiveManifoldsMutex);
+
+						btVector3 worldPointB = body->getWorldTransform().getOrigin() + distVec;
+						btVector3 localPointB = sweepResults.m_hitCollisionObject->getWorldTransform().inverse() * worldPointB;
+
+						btManifoldPoint newPoint(btVector3(0, 0, 0), localPointB, sweepResults.m_hitNormalWorld, distance);
+
+						bool isPredictive = true;
+						int index = manifold->addManifoldPoint(newPoint, isPredictive);
+						btManifoldPoint& pt = manifold->getContactPoint(index);
+						pt.m_combinedRestitution = 0;
+						pt.m_combinedFriction = gCalculateCombinedFrictionCallback(body, sweepResults.m_hitCollisionObject);
+						pt.m_positionWorldOnA = body->getWorldTransform().getOrigin();
+						pt.m_positionWorldOnB = worldPointB;
+					}
+				}
+			}
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::releasePredictiveContacts()
+{
+	BT_PROFILE("release predictive contact manifolds");
+
+	for (int i = 0; i < m_predictiveManifolds.size(); i++)
+	{
+		btPersistentManifold* manifold = m_predictiveManifolds[i];
+		this->m_dispatcher1->releaseManifold(manifold);
+	}
+	m_predictiveManifolds.clear();
+}
+
+void btDiscreteDynamicsWorld::createPredictiveContacts(btScalar timeStep)
+{
+	BT_PROFILE("createPredictiveContacts");
+	releasePredictiveContacts();
+	if (m_nonStaticRigidBodies.size() > 0)
+	{
+		createPredictiveContactsInternal(&m_nonStaticRigidBodies[0], m_nonStaticRigidBodies.size(), timeStep);
+	}
+}
+
+void btDiscreteDynamicsWorld::integrateTransformsInternal(btRigidBody** bodies, int numBodies, btScalar timeStep)
+{
+	btTransform predictedTrans;
+	for (int i = 0; i < numBodies; i++)
+	{
+		btRigidBody* body = bodies[i];
+		body->setHitFraction(1.f);
+
+		if (body->isActive() && (!body->isStaticOrKinematicObject()))
+		{
+			body->predictIntegratedTransform(timeStep, predictedTrans);
+
+			btScalar squareMotion = (predictedTrans.getOrigin() - body->getWorldTransform().getOrigin()).length2();
+
+			if (getDispatchInfo().m_useContinuous && body->getCcdSquareMotionThreshold() && body->getCcdSquareMotionThreshold() < squareMotion)
+			{
+				BT_PROFILE("CCD motion clamping");
+				if (body->getCollisionShape()->isConvex())
+				{
+					gNumClampedCcdMotions++;
+#ifdef USE_STATIC_ONLY
+					class StaticOnlyCallback : public btClosestNotMeConvexResultCallback
+					{
+					public:
+						StaticOnlyCallback(btCollisionObject* me, const btVector3& fromA, const btVector3& toA, btOverlappingPairCache* pairCache, btDispatcher* dispatcher) : btClosestNotMeConvexResultCallback(me, fromA, toA, pairCache, dispatcher)
+						{
+						}
+
+						virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+						{
+							btCollisionObject* otherObj = (btCollisionObject*)proxy0->m_clientObject;
+							if (!otherObj->isStaticOrKinematicObject())
+								return false;
+							return btClosestNotMeConvexResultCallback::needsCollision(proxy0);
+						}
+					};
+
+					StaticOnlyCallback sweepResults(body, body->getWorldTransform().getOrigin(), predictedTrans.getOrigin(), getBroadphase()->getOverlappingPairCache(), getDispatcher());
+#else
+					btClosestNotMeConvexResultCallback sweepResults(body, body->getWorldTransform().getOrigin(), predictedTrans.getOrigin(), getBroadphase()->getOverlappingPairCache(), getDispatcher());
+#endif
+					//btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
+					btSphereShape tmpSphere(body->getCcdSweptSphereRadius());  //btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
+					sweepResults.m_allowedPenetration = getDispatchInfo().m_allowedCcdPenetration;
+
+					sweepResults.m_collisionFilterGroup = body->getBroadphaseProxy()->m_collisionFilterGroup;
+					sweepResults.m_collisionFilterMask = body->getBroadphaseProxy()->m_collisionFilterMask;
+					btTransform modifiedPredictedTrans = predictedTrans;
+					modifiedPredictedTrans.setBasis(body->getWorldTransform().getBasis());
+
+					convexSweepTest(&tmpSphere, body->getWorldTransform(), modifiedPredictedTrans, sweepResults);
+					if (sweepResults.hasHit() && (sweepResults.m_closestHitFraction < 1.f))
+					{
+						//printf("clamped integration to hit fraction = %f\n",fraction);
+						body->setHitFraction(sweepResults.m_closestHitFraction);
+						body->predictIntegratedTransform(timeStep * body->getHitFraction(), predictedTrans);
+						body->setHitFraction(0.f);
+						body->proceedToTransform(predictedTrans);
+
+#if 0
+						btVector3 linVel = body->getLinearVelocity();
+
+						btScalar maxSpeed = body->getCcdMotionThreshold()/getSolverInfo().m_timeStep;
+						btScalar maxSpeedSqr = maxSpeed*maxSpeed;
+						if (linVel.length2()>maxSpeedSqr)
+						{
+							linVel.normalize();
+							linVel*= maxSpeed;
+							body->setLinearVelocity(linVel);
+							btScalar ms2 = body->getLinearVelocity().length2();
+							body->predictIntegratedTransform(timeStep, predictedTrans);
+
+							btScalar sm2 = (predictedTrans.getOrigin()-body->getWorldTransform().getOrigin()).length2();
+							btScalar smt = body->getCcdSquareMotionThreshold();
+							printf("sm2=%f\n",sm2);
+						}
+#else
+
+						//don't apply the collision response right now, it will happen next frame
+						//if you really need to, you can uncomment next 3 lines. Note that is uses zero restitution.
+						//btScalar appliedImpulse = 0.f;
+						//btScalar depth = 0.f;
+						//appliedImpulse = resolveSingleCollision(body,(btCollisionObject*)sweepResults.m_hitCollisionObject,sweepResults.m_hitPointWorld,sweepResults.m_hitNormalWorld,getSolverInfo(), depth);
+
+#endif
+
+						continue;
+					}
+				}
+			}
+
+			body->proceedToTransform(predictedTrans);
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
+{
+	BT_PROFILE("integrateTransforms");
+	if (m_nonStaticRigidBodies.size() > 0)
+	{
+		integrateTransformsInternal(&m_nonStaticRigidBodies[0], m_nonStaticRigidBodies.size(), timeStep);
+	}
+
+	///this should probably be switched on by default, but it is not well tested yet
+	if (m_applySpeculativeContactRestitution)
+	{
+		BT_PROFILE("apply speculative contact restitution");
+		for (int i = 0; i < m_predictiveManifolds.size(); i++)
+		{
+			btPersistentManifold* manifold = m_predictiveManifolds[i];
+			btRigidBody* body0 = btRigidBody::upcast((btCollisionObject*)manifold->getBody0());
+			btRigidBody* body1 = btRigidBody::upcast((btCollisionObject*)manifold->getBody1());
+
+			for (int p = 0; p < manifold->getNumContacts(); p++)
+			{
+				const btManifoldPoint& pt = manifold->getContactPoint(p);
+				btScalar combinedRestitution = gCalculateCombinedRestitutionCallback(body0, body1);
+
+				if (combinedRestitution > 0 && pt.m_appliedImpulse != 0.f)
+				//if (pt.getDistance()>0 && combinedRestitution>0 && pt.m_appliedImpulse != 0.f)
+				{
+					btVector3 imp = -pt.m_normalWorldOnB * pt.m_appliedImpulse * combinedRestitution;
+
+					const btVector3& pos1 = pt.getPositionWorldOnA();
+					const btVector3& pos2 = pt.getPositionWorldOnB();
+
+					btVector3 rel_pos0 = pos1 - body0->getWorldTransform().getOrigin();
+					btVector3 rel_pos1 = pos2 - body1->getWorldTransform().getOrigin();
+
+					if (body0)
+						body0->applyImpulse(imp, rel_pos0);
+					if (body1)
+						body1->applyImpulse(-imp, rel_pos1);
+				}
+			}
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
+{
+	BT_PROFILE("predictUnconstraintMotion");
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); i++)
+	{
+		btRigidBody* body = m_nonStaticRigidBodies[i];
+		if (!body->isStaticOrKinematicObject())
+		{
+			//don't integrate/update velocities here, it happens in the constraint solver
+
+			body->applyDamping(timeStep);
+
+			body->predictIntegratedTransform(timeStep, body->getInterpolationWorldTransform());
+		}
+	}
+}
+
+void btDiscreteDynamicsWorld::startProfiling(btScalar timeStep)
+{
+	(void)timeStep;
+
+#ifndef BT_NO_PROFILE
+	CProfileManager::Reset();
+#endif  //BT_NO_PROFILE
+}
+
+void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint)
+{
+	bool drawFrames = (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawConstraints) != 0;
+	bool drawLimits = (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawConstraintLimits) != 0;
+	btScalar dbgDrawSize = constraint->getDbgDrawSize();
+	if (dbgDrawSize <= btScalar(0.f))
+	{
+		return;
+	}
+
+	switch (constraint->getConstraintType())
+	{
+		case POINT2POINT_CONSTRAINT_TYPE:
+		{
+			btPoint2PointConstraint* p2pC = (btPoint2PointConstraint*)constraint;
+			btTransform tr;
+			tr.setIdentity();
+			btVector3 pivot = p2pC->getPivotInA();
+			pivot = p2pC->getRigidBodyA().getCenterOfMassTransform() * pivot;
+			tr.setOrigin(pivot);
+			getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			// that ideally should draw the same frame
+			pivot = p2pC->getPivotInB();
+			pivot = p2pC->getRigidBodyB().getCenterOfMassTransform() * pivot;
+			tr.setOrigin(pivot);
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+		}
+		break;
+		case HINGE_CONSTRAINT_TYPE:
+		{
+			btHingeConstraint* pHinge = (btHingeConstraint*)constraint;
+			btTransform tr = pHinge->getRigidBodyA().getCenterOfMassTransform() * pHinge->getAFrame();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			tr = pHinge->getRigidBodyB().getCenterOfMassTransform() * pHinge->getBFrame();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			btScalar minAng = pHinge->getLowerLimit();
+			btScalar maxAng = pHinge->getUpperLimit();
+			if (minAng == maxAng)
+			{
+				break;
+			}
+			bool drawSect = true;
+			if (!pHinge->hasLimit())
+			{
+				minAng = btScalar(0.f);
+				maxAng = SIMD_2_PI;
+				drawSect = false;
+			}
+			if (drawLimits)
+			{
+				btVector3& center = tr.getOrigin();
+				btVector3 normal = tr.getBasis().getColumn(2);
+				btVector3 axis = tr.getBasis().getColumn(0);
+				getDebugDrawer()->drawArc(center, normal, axis, dbgDrawSize, dbgDrawSize, minAng, maxAng, btVector3(0, 0, 0), drawSect);
+			}
+		}
+		break;
+		case CONETWIST_CONSTRAINT_TYPE:
+		{
+			btConeTwistConstraint* pCT = (btConeTwistConstraint*)constraint;
+			btTransform tr = pCT->getRigidBodyA().getCenterOfMassTransform() * pCT->getAFrame();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			tr = pCT->getRigidBodyB().getCenterOfMassTransform() * pCT->getBFrame();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			if (drawLimits)
+			{
+				//const btScalar length = btScalar(5);
+				const btScalar length = dbgDrawSize;
+				static int nSegments = 8 * 4;
+				btScalar fAngleInRadians = btScalar(2. * 3.1415926) * (btScalar)(nSegments - 1) / btScalar(nSegments);
+				btVector3 pPrev = pCT->GetPointForAngle(fAngleInRadians, length);
+				pPrev = tr * pPrev;
+				for (int i = 0; i < nSegments; i++)
+				{
+					fAngleInRadians = btScalar(2. * 3.1415926) * (btScalar)i / btScalar(nSegments);
+					btVector3 pCur = pCT->GetPointForAngle(fAngleInRadians, length);
+					pCur = tr * pCur;
+					getDebugDrawer()->drawLine(pPrev, pCur, btVector3(0, 0, 0));
+
+					if (i % (nSegments / 8) == 0)
+						getDebugDrawer()->drawLine(tr.getOrigin(), pCur, btVector3(0, 0, 0));
+
+					pPrev = pCur;
+				}
+				btScalar tws = pCT->getTwistSpan();
+				btScalar twa = pCT->getTwistAngle();
+				bool useFrameB = (pCT->getRigidBodyB().getInvMass() > btScalar(0.f));
+				if (useFrameB)
+				{
+					tr = pCT->getRigidBodyB().getCenterOfMassTransform() * pCT->getBFrame();
+				}
+				else
+				{
+					tr = pCT->getRigidBodyA().getCenterOfMassTransform() * pCT->getAFrame();
+				}
+				btVector3 pivot = tr.getOrigin();
+				btVector3 normal = tr.getBasis().getColumn(0);
+				btVector3 axis1 = tr.getBasis().getColumn(1);
+				getDebugDrawer()->drawArc(pivot, normal, axis1, dbgDrawSize, dbgDrawSize, -twa - tws, -twa + tws, btVector3(0, 0, 0), true);
+			}
+		}
+		break;
+		case D6_SPRING_CONSTRAINT_TYPE:
+		case D6_CONSTRAINT_TYPE:
+		{
+			btGeneric6DofConstraint* p6DOF = (btGeneric6DofConstraint*)constraint;
+			btTransform tr = p6DOF->getCalculatedTransformA();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			tr = p6DOF->getCalculatedTransformB();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			if (drawLimits)
+			{
+				tr = p6DOF->getCalculatedTransformA();
+				const btVector3& center = p6DOF->getCalculatedTransformB().getOrigin();
+				btVector3 up = tr.getBasis().getColumn(2);
+				btVector3 axis = tr.getBasis().getColumn(0);
+				btScalar minTh = p6DOF->getRotationalLimitMotor(1)->m_loLimit;
+				btScalar maxTh = p6DOF->getRotationalLimitMotor(1)->m_hiLimit;
+				btScalar minPs = p6DOF->getRotationalLimitMotor(2)->m_loLimit;
+				btScalar maxPs = p6DOF->getRotationalLimitMotor(2)->m_hiLimit;
+				getDebugDrawer()->drawSpherePatch(center, up, axis, dbgDrawSize * btScalar(.9f), minTh, maxTh, minPs, maxPs, btVector3(0, 0, 0));
+				axis = tr.getBasis().getColumn(1);
+				btScalar ay = p6DOF->getAngle(1);
+				btScalar az = p6DOF->getAngle(2);
+				btScalar cy = btCos(ay);
+				btScalar sy = btSin(ay);
+				btScalar cz = btCos(az);
+				btScalar sz = btSin(az);
+				btVector3 ref;
+				ref[0] = cy * cz * axis[0] + cy * sz * axis[1] - sy * axis[2];
+				ref[1] = -sz * axis[0] + cz * axis[1];
+				ref[2] = cz * sy * axis[0] + sz * sy * axis[1] + cy * axis[2];
+				tr = p6DOF->getCalculatedTransformB();
+				btVector3 normal = -tr.getBasis().getColumn(0);
+				btScalar minFi = p6DOF->getRotationalLimitMotor(0)->m_loLimit;
+				btScalar maxFi = p6DOF->getRotationalLimitMotor(0)->m_hiLimit;
+				if (minFi > maxFi)
+				{
+					getDebugDrawer()->drawArc(center, normal, ref, dbgDrawSize, dbgDrawSize, -SIMD_PI, SIMD_PI, btVector3(0, 0, 0), false);
+				}
+				else if (minFi < maxFi)
+				{
+					getDebugDrawer()->drawArc(center, normal, ref, dbgDrawSize, dbgDrawSize, minFi, maxFi, btVector3(0, 0, 0), true);
+				}
+				tr = p6DOF->getCalculatedTransformA();
+				btVector3 bbMin = p6DOF->getTranslationalLimitMotor()->m_lowerLimit;
+				btVector3 bbMax = p6DOF->getTranslationalLimitMotor()->m_upperLimit;
+				getDebugDrawer()->drawBox(bbMin, bbMax, tr, btVector3(0, 0, 0));
+			}
+		}
+		break;
+		///note: the code for D6_SPRING_2_CONSTRAINT_TYPE is identical to D6_CONSTRAINT_TYPE, the D6_CONSTRAINT_TYPE+D6_SPRING_CONSTRAINT_TYPE will likely become obsolete/deprecated at some stage
+		case D6_SPRING_2_CONSTRAINT_TYPE:
+		{
+			{
+				btGeneric6DofSpring2Constraint* p6DOF = (btGeneric6DofSpring2Constraint*)constraint;
+				btTransform tr = p6DOF->getCalculatedTransformA();
+				if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+				tr = p6DOF->getCalculatedTransformB();
+				if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+				if (drawLimits)
+				{
+					tr = p6DOF->getCalculatedTransformA();
+					const btVector3& center = p6DOF->getCalculatedTransformB().getOrigin();
+					btVector3 up = tr.getBasis().getColumn(2);
+					btVector3 axis = tr.getBasis().getColumn(0);
+					btScalar minTh = p6DOF->getRotationalLimitMotor(1)->m_loLimit;
+					btScalar maxTh = p6DOF->getRotationalLimitMotor(1)->m_hiLimit;
+					if (minTh <= maxTh)
+					{
+						btScalar minPs = p6DOF->getRotationalLimitMotor(2)->m_loLimit;
+						btScalar maxPs = p6DOF->getRotationalLimitMotor(2)->m_hiLimit;
+						getDebugDrawer()->drawSpherePatch(center, up, axis, dbgDrawSize * btScalar(.9f), minTh, maxTh, minPs, maxPs, btVector3(0, 0, 0));
+					}
+					axis = tr.getBasis().getColumn(1);
+					btScalar ay = p6DOF->getAngle(1);
+					btScalar az = p6DOF->getAngle(2);
+					btScalar cy = btCos(ay);
+					btScalar sy = btSin(ay);
+					btScalar cz = btCos(az);
+					btScalar sz = btSin(az);
+					btVector3 ref;
+					ref[0] = cy * cz * axis[0] + cy * sz * axis[1] - sy * axis[2];
+					ref[1] = -sz * axis[0] + cz * axis[1];
+					ref[2] = cz * sy * axis[0] + sz * sy * axis[1] + cy * axis[2];
+					tr = p6DOF->getCalculatedTransformB();
+					btVector3 normal = -tr.getBasis().getColumn(0);
+					btScalar minFi = p6DOF->getRotationalLimitMotor(0)->m_loLimit;
+					btScalar maxFi = p6DOF->getRotationalLimitMotor(0)->m_hiLimit;
+					if (minFi > maxFi)
+					{
+						getDebugDrawer()->drawArc(center, normal, ref, dbgDrawSize, dbgDrawSize, -SIMD_PI, SIMD_PI, btVector3(0, 0, 0), false);
+					}
+					else if (minFi < maxFi)
+					{
+						getDebugDrawer()->drawArc(center, normal, ref, dbgDrawSize, dbgDrawSize, minFi, maxFi, btVector3(0, 0, 0), true);
+					}
+					tr = p6DOF->getCalculatedTransformA();
+					btVector3 bbMin = p6DOF->getTranslationalLimitMotor()->m_lowerLimit;
+					btVector3 bbMax = p6DOF->getTranslationalLimitMotor()->m_upperLimit;
+					getDebugDrawer()->drawBox(bbMin, bbMax, tr, btVector3(0, 0, 0));
+				}
+			}
+			break;
+		}
+		case SLIDER_CONSTRAINT_TYPE:
+		{
+			btSliderConstraint* pSlider = (btSliderConstraint*)constraint;
+			btTransform tr = pSlider->getCalculatedTransformA();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			tr = pSlider->getCalculatedTransformB();
+			if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize);
+			if (drawLimits)
+			{
+				btTransform tr = pSlider->getUseLinearReferenceFrameA() ? pSlider->getCalculatedTransformA() : pSlider->getCalculatedTransformB();
+				btVector3 li_min = tr * btVector3(pSlider->getLowerLinLimit(), 0.f, 0.f);
+				btVector3 li_max = tr * btVector3(pSlider->getUpperLinLimit(), 0.f, 0.f);
+				getDebugDrawer()->drawLine(li_min, li_max, btVector3(0, 0, 0));
+				btVector3 normal = tr.getBasis().getColumn(0);
+				btVector3 axis = tr.getBasis().getColumn(1);
+				btScalar a_min = pSlider->getLowerAngLimit();
+				btScalar a_max = pSlider->getUpperAngLimit();
+				const btVector3& center = pSlider->getCalculatedTransformB().getOrigin();
+				getDebugDrawer()->drawArc(center, normal, axis, dbgDrawSize, dbgDrawSize, a_min, a_max, btVector3(0, 0, 0), true);
+			}
+		}
+		break;
+		default:
+			break;
+	}
+	return;
+}
+
+void btDiscreteDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
+{
+	if (m_ownsConstraintSolver)
+	{
+		btAlignedFree(m_constraintSolver);
+	}
+	m_ownsConstraintSolver = false;
+	m_constraintSolver = solver;
+	m_solverIslandCallback->m_solver = solver;
+}
+
+btConstraintSolver* btDiscreteDynamicsWorld::getConstraintSolver()
+{
+	return m_constraintSolver;
+}
+
+int btDiscreteDynamicsWorld::getNumConstraints() const
+{
+	return int(m_constraints.size());
+}
+btTypedConstraint* btDiscreteDynamicsWorld::getConstraint(int index)
+{
+	return m_constraints[index];
+}
+const btTypedConstraint* btDiscreteDynamicsWorld::getConstraint(int index) const
+{
+	return m_constraints[index];
+}
+
+void btDiscreteDynamicsWorld::serializeRigidBodies(btSerializer* serializer)
+{
+	int i;
+	//serialize all collision objects
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		if (colObj->getInternalType() & btCollisionObject::CO_RIGID_BODY)
+		{
+			int len = colObj->calculateSerializeBufferSize();
+			btChunk* chunk = serializer->allocate(len, 1);
+			const char* structType = colObj->serialize(chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_RIGIDBODY_CODE, colObj);
+		}
+	}
+
+	for (i = 0; i < m_constraints.size(); i++)
+	{
+		btTypedConstraint* constraint = m_constraints[i];
+		int size = constraint->calculateSerializeBufferSize();
+		btChunk* chunk = serializer->allocate(size, 1);
+		const char* structType = constraint->serialize(chunk->m_oldPtr, serializer);
+		serializer->finalizeChunk(chunk, structType, BT_CONSTRAINT_CODE, constraint);
+	}
+}
+
+void btDiscreteDynamicsWorld::serializeDynamicsWorldInfo(btSerializer* serializer)
+{
+#ifdef BT_USE_DOUBLE_PRECISION
+	int len = sizeof(btDynamicsWorldDoubleData);
+	btChunk* chunk = serializer->allocate(len, 1);
+	btDynamicsWorldDoubleData* worldInfo = (btDynamicsWorldDoubleData*)chunk->m_oldPtr;
+#else   //BT_USE_DOUBLE_PRECISION
+	int len = sizeof(btDynamicsWorldFloatData);
+	btChunk* chunk = serializer->allocate(len, 1);
+	btDynamicsWorldFloatData* worldInfo = (btDynamicsWorldFloatData*)chunk->m_oldPtr;
+#endif  //BT_USE_DOUBLE_PRECISION
+
+	memset(worldInfo, 0x00, len);
+
+	m_gravity.serialize(worldInfo->m_gravity);
+	worldInfo->m_solverInfo.m_tau = getSolverInfo().m_tau;
+	worldInfo->m_solverInfo.m_damping = getSolverInfo().m_damping;
+	worldInfo->m_solverInfo.m_friction = getSolverInfo().m_friction;
+	worldInfo->m_solverInfo.m_timeStep = getSolverInfo().m_timeStep;
+
+	worldInfo->m_solverInfo.m_restitution = getSolverInfo().m_restitution;
+	worldInfo->m_solverInfo.m_maxErrorReduction = getSolverInfo().m_maxErrorReduction;
+	worldInfo->m_solverInfo.m_sor = getSolverInfo().m_sor;
+	worldInfo->m_solverInfo.m_erp = getSolverInfo().m_erp;
+
+	worldInfo->m_solverInfo.m_erp2 = getSolverInfo().m_erp2;
+	worldInfo->m_solverInfo.m_globalCfm = getSolverInfo().m_globalCfm;
+	worldInfo->m_solverInfo.m_splitImpulsePenetrationThreshold = getSolverInfo().m_splitImpulsePenetrationThreshold;
+	worldInfo->m_solverInfo.m_splitImpulseTurnErp = getSolverInfo().m_splitImpulseTurnErp;
+
+	worldInfo->m_solverInfo.m_linearSlop = getSolverInfo().m_linearSlop;
+	worldInfo->m_solverInfo.m_warmstartingFactor = getSolverInfo().m_warmstartingFactor;
+	worldInfo->m_solverInfo.m_maxGyroscopicForce = getSolverInfo().m_maxGyroscopicForce;
+	worldInfo->m_solverInfo.m_singleAxisRollingFrictionThreshold = getSolverInfo().m_singleAxisRollingFrictionThreshold;
+
+	worldInfo->m_solverInfo.m_numIterations = getSolverInfo().m_numIterations;
+	worldInfo->m_solverInfo.m_solverMode = getSolverInfo().m_solverMode;
+	worldInfo->m_solverInfo.m_restingContactRestitutionThreshold = getSolverInfo().m_restingContactRestitutionThreshold;
+	worldInfo->m_solverInfo.m_minimumSolverBatchSize = getSolverInfo().m_minimumSolverBatchSize;
+
+	worldInfo->m_solverInfo.m_splitImpulse = getSolverInfo().m_splitImpulse;
+
+	
+#ifdef BT_USE_DOUBLE_PRECISION
+	const char* structType = "btDynamicsWorldDoubleData";
+#else   //BT_USE_DOUBLE_PRECISION
+	const char* structType = "btDynamicsWorldFloatData";
+#endif  //BT_USE_DOUBLE_PRECISION
+	serializer->finalizeChunk(chunk, structType, BT_DYNAMICSWORLD_CODE, worldInfo);
+}
+
+void btDiscreteDynamicsWorld::serialize(btSerializer* serializer)
+{
+	serializer->startSerialization();
+
+	serializeDynamicsWorldInfo(serializer);
+
+	serializeCollisionObjects(serializer);
+
+	serializeRigidBodies(serializer);
+
+	serializeContactManifolds(serializer);
+
+	serializer->finishSerialization();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
new file mode 100644
index 0000000..73607c6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
@@ -0,0 +1,244 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_DISCRETE_DYNAMICS_WORLD_H
+#define BT_DISCRETE_DYNAMICS_WORLD_H
+
+#include "btDynamicsWorld.h"
+class btDispatcher;
+class btOverlappingPairCache;
+class btConstraintSolver;
+class btSimulationIslandManager;
+class btTypedConstraint;
+class btActionInterface;
+class btPersistentManifold;
+class btIDebugDraw;
+
+struct InplaceSolverIslandCallback;
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btThreads.h"
+
+///btDiscreteDynamicsWorld provides discrete rigid body simulation
+///those classes replace the obsolete CcdPhysicsEnvironment/CcdPhysicsController
+ATTRIBUTE_ALIGNED16(class)
+btDiscreteDynamicsWorld : public btDynamicsWorld
+{
+protected:
+	btAlignedObjectArray<btTypedConstraint*> m_sortedConstraints;
+	InplaceSolverIslandCallback* m_solverIslandCallback;
+
+	btConstraintSolver* m_constraintSolver;
+
+	btSimulationIslandManager* m_islandManager;
+
+	btAlignedObjectArray<btTypedConstraint*> m_constraints;
+
+	btAlignedObjectArray<btRigidBody*> m_nonStaticRigidBodies;
+
+	btVector3 m_gravity;
+
+	//for variable timesteps
+	btScalar m_localTime;
+	btScalar m_fixedTimeStep;
+	//for variable timesteps
+
+	bool m_ownsIslandManager;
+	bool m_ownsConstraintSolver;
+	bool m_synchronizeAllMotionStates;
+	bool m_applySpeculativeContactRestitution;
+
+	btAlignedObjectArray<btActionInterface*> m_actions;
+
+	int m_profileTimings;
+
+	bool m_latencyMotionStateInterpolation;
+
+	btAlignedObjectArray<btPersistentManifold*> m_predictiveManifolds;
+	btSpinMutex m_predictiveManifoldsMutex;  // used to synchronize threads creating predictive contacts
+
+	virtual void predictUnconstraintMotion(btScalar timeStep);
+
+	void integrateTransformsInternal(btRigidBody * *bodies, int numBodies, btScalar timeStep);  // can be called in parallel
+	virtual void integrateTransforms(btScalar timeStep);
+
+	virtual void calculateSimulationIslands();
+
+	
+
+	virtual void updateActivationState(btScalar timeStep);
+
+	void updateActions(btScalar timeStep);
+
+	void startProfiling(btScalar timeStep);
+
+	virtual void internalSingleStepSimulation(btScalar timeStep);
+
+	void releasePredictiveContacts();
+	void createPredictiveContactsInternal(btRigidBody * *bodies, int numBodies, btScalar timeStep);  // can be called in parallel
+	virtual void createPredictiveContacts(btScalar timeStep);
+
+	virtual void saveKinematicState(btScalar timeStep);
+
+	void serializeRigidBodies(btSerializer * serializer);
+
+	void serializeDynamicsWorldInfo(btSerializer * serializer);
+    
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	///this btDiscreteDynamicsWorld constructor gets created objects from the user, and will not delete those
+	btDiscreteDynamicsWorld(btDispatcher * dispatcher, btBroadphaseInterface * pairCache, btConstraintSolver * constraintSolver, btCollisionConfiguration * collisionConfiguration);
+
+	virtual ~btDiscreteDynamicsWorld();
+
+	///if maxSubSteps > 0, it will interpolate motion between fixedTimeStep's
+	virtual int stepSimulation(btScalar timeStep, int maxSubSteps = 1, btScalar fixedTimeStep = btScalar(1.) / btScalar(60.));
+
+    virtual void solveConstraints(btContactSolverInfo & solverInfo);
+    
+	virtual void synchronizeMotionStates();
+
+	///this can be useful to synchronize a single rigid body -> graphics object
+	void synchronizeSingleMotionState(btRigidBody * body);
+
+	virtual void addConstraint(btTypedConstraint * constraint, bool disableCollisionsBetweenLinkedBodies = false);
+
+	virtual void removeConstraint(btTypedConstraint * constraint);
+
+	virtual void addAction(btActionInterface*);
+
+	virtual void removeAction(btActionInterface*);
+
+	btSimulationIslandManager* getSimulationIslandManager()
+	{
+		return m_islandManager;
+	}
+
+	const btSimulationIslandManager* getSimulationIslandManager() const
+	{
+		return m_islandManager;
+	}
+
+	btCollisionWorld* getCollisionWorld()
+	{
+		return this;
+	}
+
+	virtual void setGravity(const btVector3& gravity);
+
+	virtual btVector3 getGravity() const;
+
+	virtual void addCollisionObject(btCollisionObject * collisionObject, int collisionFilterGroup = btBroadphaseProxy::StaticFilter, int collisionFilterMask = btBroadphaseProxy::AllFilter ^ btBroadphaseProxy::StaticFilter);
+
+	virtual void addRigidBody(btRigidBody * body);
+
+	virtual void addRigidBody(btRigidBody * body, int group, int mask);
+
+	virtual void removeRigidBody(btRigidBody * body);
+
+	///removeCollisionObject will first check if it is a rigid body, if so call removeRigidBody otherwise call btCollisionWorld::removeCollisionObject
+	virtual void removeCollisionObject(btCollisionObject * collisionObject);
+
+	virtual void debugDrawConstraint(btTypedConstraint * constraint);
+
+	virtual void debugDrawWorld();
+
+	virtual void setConstraintSolver(btConstraintSolver * solver);
+
+	virtual btConstraintSolver* getConstraintSolver();
+
+	virtual int getNumConstraints() const;
+
+	virtual btTypedConstraint* getConstraint(int index);
+
+	virtual const btTypedConstraint* getConstraint(int index) const;
+
+	virtual btDynamicsWorldType getWorldType() const
+	{
+		return BT_DISCRETE_DYNAMICS_WORLD;
+	}
+
+	///the forces on each rigidbody is accumulating together with gravity. clear this after each timestep.
+	virtual void clearForces();
+
+	///apply gravity, call this once per timestep
+	virtual void applyGravity();
+
+	virtual void setNumTasks(int numTasks)
+	{
+		(void)numTasks;
+	}
+
+	///obsolete, use updateActions instead
+	virtual void updateVehicles(btScalar timeStep)
+	{
+		updateActions(timeStep);
+	}
+
+	///obsolete, use addAction instead
+	virtual void addVehicle(btActionInterface * vehicle);
+	///obsolete, use removeAction instead
+	virtual void removeVehicle(btActionInterface * vehicle);
+	///obsolete, use addAction instead
+	virtual void addCharacter(btActionInterface * character);
+	///obsolete, use removeAction instead
+	virtual void removeCharacter(btActionInterface * character);
+
+	void setSynchronizeAllMotionStates(bool synchronizeAll)
+	{
+		m_synchronizeAllMotionStates = synchronizeAll;
+	}
+	bool getSynchronizeAllMotionStates() const
+	{
+		return m_synchronizeAllMotionStates;
+	}
+
+	void setApplySpeculativeContactRestitution(bool enable)
+	{
+		m_applySpeculativeContactRestitution = enable;
+	}
+
+	bool getApplySpeculativeContactRestitution() const
+	{
+		return m_applySpeculativeContactRestitution;
+	}
+
+	///Preliminary serialization test for Bullet 2.76. Loading those files requires a separate parser (see Bullet/Demos/SerializeDemo)
+	virtual void serialize(btSerializer * serializer);
+
+	///Interpolate motion state between previous and current transform, instead of current and next transform.
+	///This can relieve discontinuities in the rendering, due to penetrations
+	void setLatencyMotionStateInterpolation(bool latencyInterpolation)
+	{
+		m_latencyMotionStateInterpolation = latencyInterpolation;
+	}
+	bool getLatencyMotionStateInterpolation() const
+	{
+		return m_latencyMotionStateInterpolation;
+	}
+    
+    btAlignedObjectArray<btRigidBody*>& getNonStaticRigidBodies()
+    {
+        return m_nonStaticRigidBodies;
+    }
+    
+    const btAlignedObjectArray<btRigidBody*>& getNonStaticRigidBodies() const
+    {
+        return m_nonStaticRigidBodies;
+    }
+};
+
+#endif  //BT_DISCRETE_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
new file mode 100644
index 0000000..8207b47
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
@@ -0,0 +1,263 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btDiscreteDynamicsWorldMt.h"
+
+//collision detection
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "btSimulationIslandManagerMt.h"
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btQuickprof.h"
+
+//rigidbody & constraints
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btHingeConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
+#include "BulletDynamics/ConstraintSolver/btSliderConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btContactConstraint.h"
+
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+
+#include "BulletDynamics/Dynamics/btActionInterface.h"
+#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btMotionState.h"
+
+#include "LinearMath/btSerializer.h"
+
+///
+/// btConstraintSolverPoolMt
+///
+
+btConstraintSolverPoolMt::ThreadSolver* btConstraintSolverPoolMt::getAndLockThreadSolver()
+{
+	int i = 0;
+#if BT_THREADSAFE
+	i = btGetCurrentThreadIndex() % m_solvers.size();
+#endif  // #if BT_THREADSAFE
+	while (true)
+	{
+		ThreadSolver& solver = m_solvers[i];
+		if (solver.mutex.tryLock())
+		{
+			return &solver;
+		}
+		// failed, try the next one
+		i = (i + 1) % m_solvers.size();
+	}
+	return NULL;
+}
+
+void btConstraintSolverPoolMt::init(btConstraintSolver** solvers, int numSolvers)
+{
+	m_solverType = BT_SEQUENTIAL_IMPULSE_SOLVER;
+	m_solvers.resize(numSolvers);
+	for (int i = 0; i < numSolvers; ++i)
+	{
+		m_solvers[i].solver = solvers[i];
+	}
+	if (numSolvers > 0)
+	{
+		m_solverType = solvers[0]->getSolverType();
+	}
+}
+
+// create the solvers for me
+btConstraintSolverPoolMt::btConstraintSolverPoolMt(int numSolvers)
+{
+	btAlignedObjectArray<btConstraintSolver*> solvers;
+	solvers.reserve(numSolvers);
+	for (int i = 0; i < numSolvers; ++i)
+	{
+		btConstraintSolver* solver = new btSequentialImpulseConstraintSolver();
+		solvers.push_back(solver);
+	}
+	init(&solvers[0], numSolvers);
+}
+
+// pass in fully constructed solvers (destructor will delete them)
+btConstraintSolverPoolMt::btConstraintSolverPoolMt(btConstraintSolver** solvers, int numSolvers)
+{
+	init(solvers, numSolvers);
+}
+
+btConstraintSolverPoolMt::~btConstraintSolverPoolMt()
+{
+	// delete all solvers
+	for (int i = 0; i < m_solvers.size(); ++i)
+	{
+		ThreadSolver& solver = m_solvers[i];
+		delete solver.solver;
+		solver.solver = NULL;
+	}
+}
+
+///solve a group of constraints
+btScalar btConstraintSolverPoolMt::solveGroup(btCollisionObject** bodies,
+											  int numBodies,
+											  btPersistentManifold** manifolds,
+											  int numManifolds,
+											  btTypedConstraint** constraints,
+											  int numConstraints,
+											  const btContactSolverInfo& info,
+											  btIDebugDraw* debugDrawer,
+											  btDispatcher* dispatcher)
+{
+	ThreadSolver* ts = getAndLockThreadSolver();
+	ts->solver->solveGroup(bodies, numBodies, manifolds, numManifolds, constraints, numConstraints, info, debugDrawer, dispatcher);
+	ts->mutex.unlock();
+	return 0.0f;
+}
+
+void btConstraintSolverPoolMt::reset()
+{
+	for (int i = 0; i < m_solvers.size(); ++i)
+	{
+		ThreadSolver& solver = m_solvers[i];
+		solver.mutex.lock();
+		solver.solver->reset();
+		solver.mutex.unlock();
+	}
+}
+
+///
+/// btDiscreteDynamicsWorldMt
+///
+
+btDiscreteDynamicsWorldMt::btDiscreteDynamicsWorldMt(btDispatcher* dispatcher,
+													 btBroadphaseInterface* pairCache,
+													 btConstraintSolverPoolMt* solverPool,
+													 btConstraintSolver* constraintSolverMt,
+													 btCollisionConfiguration* collisionConfiguration)
+	: btDiscreteDynamicsWorld(dispatcher, pairCache, solverPool, collisionConfiguration)
+{
+	if (m_ownsIslandManager)
+	{
+		m_islandManager->~btSimulationIslandManager();
+		btAlignedFree(m_islandManager);
+	}
+	{
+		void* mem = btAlignedAlloc(sizeof(btSimulationIslandManagerMt), 16);
+		btSimulationIslandManagerMt* im = new (mem) btSimulationIslandManagerMt();
+		im->setMinimumSolverBatchSize(m_solverInfo.m_minimumSolverBatchSize);
+		m_islandManager = im;
+	}
+	m_constraintSolverMt = constraintSolverMt;
+}
+
+btDiscreteDynamicsWorldMt::~btDiscreteDynamicsWorldMt()
+{
+}
+
+void btDiscreteDynamicsWorldMt::solveConstraints(btContactSolverInfo& solverInfo)
+{
+	BT_PROFILE("solveConstraints");
+
+	m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds());
+
+	/// solve all the constraints for this island
+	btSimulationIslandManagerMt* im = static_cast<btSimulationIslandManagerMt*>(m_islandManager);
+	btSimulationIslandManagerMt::SolverParams solverParams;
+	solverParams.m_solverPool = m_constraintSolver;
+	solverParams.m_solverMt = m_constraintSolverMt;
+	solverParams.m_solverInfo = &solverInfo;
+	solverParams.m_debugDrawer = m_debugDrawer;
+	solverParams.m_dispatcher = getCollisionWorld()->getDispatcher();
+	im->buildAndProcessIslands(getCollisionWorld()->getDispatcher(), getCollisionWorld(), m_constraints, solverParams);
+
+	m_constraintSolver->allSolved(solverInfo, m_debugDrawer);
+}
+
+struct UpdaterUnconstrainedMotion : public btIParallelForBody
+{
+	btScalar timeStep;
+	btRigidBody** rigidBodies;
+
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		for (int i = iBegin; i < iEnd; ++i)
+		{
+			btRigidBody* body = rigidBodies[i];
+			if (!body->isStaticOrKinematicObject())
+			{
+				//don't integrate/update velocities here, it happens in the constraint solver
+				body->applyDamping(timeStep);
+				body->predictIntegratedTransform(timeStep, body->getInterpolationWorldTransform());
+			}
+		}
+	}
+};
+
+void btDiscreteDynamicsWorldMt::predictUnconstraintMotion(btScalar timeStep)
+{
+	BT_PROFILE("predictUnconstraintMotion");
+	if (m_nonStaticRigidBodies.size() > 0)
+	{
+		UpdaterUnconstrainedMotion update;
+		update.timeStep = timeStep;
+		update.rigidBodies = &m_nonStaticRigidBodies[0];
+		int grainSize = 50;  // num of iterations per task for task scheduler
+		btParallelFor(0, m_nonStaticRigidBodies.size(), grainSize, update);
+	}
+}
+
+void btDiscreteDynamicsWorldMt::createPredictiveContacts(btScalar timeStep)
+{
+	BT_PROFILE("createPredictiveContacts");
+	releasePredictiveContacts();
+	if (m_nonStaticRigidBodies.size() > 0)
+	{
+		UpdaterCreatePredictiveContacts update;
+		update.world = this;
+		update.timeStep = timeStep;
+		update.rigidBodies = &m_nonStaticRigidBodies[0];
+		int grainSize = 50;  // num of iterations per task for task scheduler
+		btParallelFor(0, m_nonStaticRigidBodies.size(), grainSize, update);
+	}
+}
+
+void btDiscreteDynamicsWorldMt::integrateTransforms(btScalar timeStep)
+{
+	BT_PROFILE("integrateTransforms");
+	if (m_nonStaticRigidBodies.size() > 0)
+	{
+		UpdaterIntegrateTransforms update;
+		update.world = this;
+		update.timeStep = timeStep;
+		update.rigidBodies = &m_nonStaticRigidBodies[0];
+		int grainSize = 50;  // num of iterations per task for task scheduler
+		btParallelFor(0, m_nonStaticRigidBodies.size(), grainSize, update);
+	}
+}
+
+int btDiscreteDynamicsWorldMt::stepSimulation(btScalar timeStep, int maxSubSteps, btScalar fixedTimeStep)
+{
+	int numSubSteps = btDiscreteDynamicsWorld::stepSimulation(timeStep, maxSubSteps, fixedTimeStep);
+	if (btITaskScheduler* scheduler = btGetTaskScheduler())
+	{
+		// tell Bullet's threads to sleep, so other threads can run
+		scheduler->sleepWorkerThreadsHint();
+	}
+	return numSubSteps;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
new file mode 100644
index 0000000..dccf35d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
@@ -0,0 +1,131 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_DISCRETE_DYNAMICS_WORLD_MT_H
+#define BT_DISCRETE_DYNAMICS_WORLD_MT_H
+
+#include "btDiscreteDynamicsWorld.h"
+#include "btSimulationIslandManagerMt.h"
+#include "BulletDynamics/ConstraintSolver/btConstraintSolver.h"
+
+///
+/// btConstraintSolverPoolMt - masquerades as a constraint solver, but really it is a threadsafe pool of them.
+///
+///  Each solver in the pool is protected by a mutex.  When solveGroup is called from a thread,
+///  the pool looks for a solver that isn't being used by another thread, locks it, and dispatches the
+///  call to the solver.
+///  So long as there are at least as many solvers as there are hardware threads, it should never need to
+///  spin wait.
+///
+class btConstraintSolverPoolMt : public btConstraintSolver
+{
+public:
+	// create the solvers for me
+	explicit btConstraintSolverPoolMt(int numSolvers);
+
+	// pass in fully constructed solvers (destructor will delete them)
+	btConstraintSolverPoolMt(btConstraintSolver** solvers, int numSolvers);
+
+	virtual ~btConstraintSolverPoolMt();
+
+	///solve a group of constraints
+	virtual btScalar solveGroup(btCollisionObject** bodies,
+								int numBodies,
+								btPersistentManifold** manifolds,
+								int numManifolds,
+								btTypedConstraint** constraints,
+								int numConstraints,
+								const btContactSolverInfo& info,
+								btIDebugDraw* debugDrawer,
+								btDispatcher* dispatcher) BT_OVERRIDE;
+
+	virtual void reset() BT_OVERRIDE;
+	virtual btConstraintSolverType getSolverType() const BT_OVERRIDE { return m_solverType; }
+
+private:
+	const static size_t kCacheLineSize = 128;
+	struct ThreadSolver
+	{
+		btConstraintSolver* solver;
+		btSpinMutex mutex;
+		char _cachelinePadding[kCacheLineSize - sizeof(btSpinMutex) - sizeof(void*)];  // keep mutexes from sharing a cache line
+	};
+	btAlignedObjectArray<ThreadSolver> m_solvers;
+	btConstraintSolverType m_solverType;
+
+	ThreadSolver* getAndLockThreadSolver();
+	void init(btConstraintSolver** solvers, int numSolvers);
+};
+
+///
+/// btDiscreteDynamicsWorldMt -- a version of DiscreteDynamicsWorld with some minor changes to support
+///                              solving simulation islands on multiple threads.
+///
+///  Should function exactly like btDiscreteDynamicsWorld.
+///  Also 3 methods that iterate over all of the rigidbodies can run in parallel:
+///     - predictUnconstraintMotion
+///     - integrateTransforms
+///     - createPredictiveContacts
+///
+ATTRIBUTE_ALIGNED16(class)
+btDiscreteDynamicsWorldMt : public btDiscreteDynamicsWorld
+{
+protected:
+	btConstraintSolver* m_constraintSolverMt;
+
+	virtual void solveConstraints(btContactSolverInfo & solverInfo) BT_OVERRIDE;
+
+	virtual void predictUnconstraintMotion(btScalar timeStep) BT_OVERRIDE;
+
+	struct UpdaterCreatePredictiveContacts : public btIParallelForBody
+	{
+		btScalar timeStep;
+		btRigidBody** rigidBodies;
+		btDiscreteDynamicsWorldMt* world;
+
+		void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+		{
+			world->createPredictiveContactsInternal(&rigidBodies[iBegin], iEnd - iBegin, timeStep);
+		}
+	};
+	virtual void createPredictiveContacts(btScalar timeStep) BT_OVERRIDE;
+
+	struct UpdaterIntegrateTransforms : public btIParallelForBody
+	{
+		btScalar timeStep;
+		btRigidBody** rigidBodies;
+		btDiscreteDynamicsWorldMt* world;
+
+		void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+		{
+			world->integrateTransformsInternal(&rigidBodies[iBegin], iEnd - iBegin, timeStep);
+		}
+	};
+	virtual void integrateTransforms(btScalar timeStep) BT_OVERRIDE;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btDiscreteDynamicsWorldMt(btDispatcher * dispatcher,
+							  btBroadphaseInterface * pairCache,
+							  btConstraintSolverPoolMt * solverPool,        // Note this should be a solver-pool for multi-threading
+							  btConstraintSolver * constraintSolverMt,      // single multi-threaded solver for large islands (or NULL)
+							  btCollisionConfiguration * collisionConfiguration);
+	virtual ~btDiscreteDynamicsWorldMt();
+
+	virtual int stepSimulation(btScalar timeStep, int maxSubSteps, btScalar fixedTimeStep) BT_OVERRIDE;
+};
+
+#endif  //BT_DISCRETE_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDynamicsWorld.h
new file mode 100644
index 0000000..a5a4411
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btDynamicsWorld.h
@@ -0,0 +1,174 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_DYNAMICS_WORLD_H
+#define BT_DYNAMICS_WORLD_H
+
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+
+class btTypedConstraint;
+class btActionInterface;
+class btConstraintSolver;
+class btDynamicsWorld;
+
+/// Type for the callback for each tick
+typedef void (*btInternalTickCallback)(btDynamicsWorld* world, btScalar timeStep);
+
+enum btDynamicsWorldType
+{
+	BT_SIMPLE_DYNAMICS_WORLD = 1,
+	BT_DISCRETE_DYNAMICS_WORLD = 2,
+	BT_CONTINUOUS_DYNAMICS_WORLD = 3,
+	BT_SOFT_RIGID_DYNAMICS_WORLD = 4,
+	BT_GPU_DYNAMICS_WORLD = 5,
+	BT_SOFT_MULTIBODY_DYNAMICS_WORLD = 6,
+    BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD = 7
+};
+
+///The btDynamicsWorld is the interface class for several dynamics implementation, basic, discrete, parallel, and continuous etc.
+class btDynamicsWorld : public btCollisionWorld
+{
+protected:
+	btInternalTickCallback m_internalTickCallback;
+	btInternalTickCallback m_internalPreTickCallback;
+	void* m_worldUserInfo;
+
+	btContactSolverInfo m_solverInfo;
+
+public:
+	btDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* broadphase, btCollisionConfiguration* collisionConfiguration)
+		: btCollisionWorld(dispatcher, broadphase, collisionConfiguration), m_internalTickCallback(0), m_internalPreTickCallback(0), m_worldUserInfo(0)
+	{
+	}
+
+	virtual ~btDynamicsWorld()
+	{
+	}
+
+	///stepSimulation proceeds the simulation over 'timeStep', units in preferably in seconds.
+	///By default, Bullet will subdivide the timestep in constant substeps of each 'fixedTimeStep'.
+	///in order to keep the simulation real-time, the maximum number of substeps can be clamped to 'maxSubSteps'.
+	///You can disable subdividing the timestep/substepping by passing maxSubSteps=0 as second argument to stepSimulation, but in that case you have to keep the timeStep constant.
+	virtual int stepSimulation(btScalar timeStep, int maxSubSteps = 1, btScalar fixedTimeStep = btScalar(1.) / btScalar(60.)) = 0;
+
+	virtual void debugDrawWorld() = 0;
+
+	virtual void addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies = false)
+	{
+		(void)constraint;
+		(void)disableCollisionsBetweenLinkedBodies;
+	}
+
+	virtual void removeConstraint(btTypedConstraint* constraint) { (void)constraint; }
+
+	virtual void addAction(btActionInterface* action) = 0;
+
+	virtual void removeAction(btActionInterface* action) = 0;
+
+	//once a rigidbody is added to the dynamics world, it will get this gravity assigned
+	//existing rigidbodies in the world get gravity assigned too, during this method
+	virtual void setGravity(const btVector3& gravity) = 0;
+	virtual btVector3 getGravity() const = 0;
+
+	virtual void synchronizeMotionStates() = 0;
+
+	virtual void addRigidBody(btRigidBody* body) = 0;
+
+	virtual void addRigidBody(btRigidBody* body, int group, int mask) = 0;
+
+	virtual void removeRigidBody(btRigidBody* body) = 0;
+
+	virtual void setConstraintSolver(btConstraintSolver* solver) = 0;
+
+	virtual btConstraintSolver* getConstraintSolver() = 0;
+
+	virtual int getNumConstraints() const { return 0; }
+
+	virtual btTypedConstraint* getConstraint(int index)
+	{
+		(void)index;
+		return 0;
+	}
+
+	virtual const btTypedConstraint* getConstraint(int index) const
+	{
+		(void)index;
+		return 0;
+	}
+
+	virtual btDynamicsWorldType getWorldType() const = 0;
+
+	virtual void clearForces() = 0;
+
+	/// Set the callback for when an internal tick (simulation substep) happens, optional user info
+	void setInternalTickCallback(btInternalTickCallback cb, void* worldUserInfo = 0, bool isPreTick = false)
+	{
+		if (isPreTick)
+		{
+			m_internalPreTickCallback = cb;
+		}
+		else
+		{
+			m_internalTickCallback = cb;
+		}
+		m_worldUserInfo = worldUserInfo;
+	}
+
+	void setWorldUserInfo(void* worldUserInfo)
+	{
+		m_worldUserInfo = worldUserInfo;
+	}
+
+	void* getWorldUserInfo() const
+	{
+		return m_worldUserInfo;
+	}
+
+	btContactSolverInfo& getSolverInfo()
+	{
+		return m_solverInfo;
+	}
+
+	const btContactSolverInfo& getSolverInfo() const
+	{
+		return m_solverInfo;
+	}
+
+	///obsolete, use addAction instead.
+	virtual void addVehicle(btActionInterface* vehicle) { (void)vehicle; }
+	///obsolete, use removeAction instead
+	virtual void removeVehicle(btActionInterface* vehicle) { (void)vehicle; }
+	///obsolete, use addAction instead.
+	virtual void addCharacter(btActionInterface* character) { (void)character; }
+	///obsolete, use removeAction instead
+	virtual void removeCharacter(btActionInterface* character) { (void)character; }
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btDynamicsWorldDoubleData
+{
+	btContactSolverInfoDoubleData m_solverInfo;
+	btVector3DoubleData m_gravity;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btDynamicsWorldFloatData
+{
+	btContactSolverInfoFloatData m_solverInfo;
+	btVector3FloatData m_gravity;
+};
+
+#endif  //BT_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btRigidBody.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btRigidBody.cpp
new file mode 100644
index 0000000..bf7224b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btRigidBody.cpp
@@ -0,0 +1,505 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btRigidBody.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "LinearMath/btMinMax.h"
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btMotionState.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "LinearMath/btSerializer.h"
+
+//'temporarily' global variables
+btScalar gDeactivationTime = btScalar(2.);
+bool gDisableDeactivation = false;
+static int uniqueId = 0;
+
+btRigidBody::btRigidBody(const btRigidBody::btRigidBodyConstructionInfo& constructionInfo)
+{
+	setupRigidBody(constructionInfo);
+}
+
+btRigidBody::btRigidBody(btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia)
+{
+	btRigidBodyConstructionInfo cinfo(mass, motionState, collisionShape, localInertia);
+	setupRigidBody(cinfo);
+}
+
+void btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo& constructionInfo)
+{
+	m_internalType = CO_RIGID_BODY;
+
+	m_linearVelocity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	m_angularVelocity.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+	m_angularFactor.setValue(1, 1, 1);
+	m_linearFactor.setValue(1, 1, 1);
+	m_gravity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	m_gravity_acceleration.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	m_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+		setDamping(constructionInfo.m_linearDamping, constructionInfo.m_angularDamping);
+
+	m_linearSleepingThreshold = constructionInfo.m_linearSleepingThreshold;
+	m_angularSleepingThreshold = constructionInfo.m_angularSleepingThreshold;
+	m_optionalMotionState = constructionInfo.m_motionState;
+	m_contactSolverType = 0;
+	m_frictionSolverType = 0;
+	m_additionalDamping = constructionInfo.m_additionalDamping;
+	m_additionalDampingFactor = constructionInfo.m_additionalDampingFactor;
+	m_additionalLinearDampingThresholdSqr = constructionInfo.m_additionalLinearDampingThresholdSqr;
+	m_additionalAngularDampingThresholdSqr = constructionInfo.m_additionalAngularDampingThresholdSqr;
+	m_additionalAngularDampingFactor = constructionInfo.m_additionalAngularDampingFactor;
+
+	if (m_optionalMotionState)
+	{
+		m_optionalMotionState->getWorldTransform(m_worldTransform);
+	}
+	else
+	{
+		m_worldTransform = constructionInfo.m_startWorldTransform;
+	}
+
+	m_interpolationWorldTransform = m_worldTransform;
+	m_interpolationLinearVelocity.setValue(0, 0, 0);
+	m_interpolationAngularVelocity.setValue(0, 0, 0);
+
+	//moved to btCollisionObject
+	m_friction = constructionInfo.m_friction;
+	m_rollingFriction = constructionInfo.m_rollingFriction;
+	m_spinningFriction = constructionInfo.m_spinningFriction;
+
+	m_restitution = constructionInfo.m_restitution;
+
+	setCollisionShape(constructionInfo.m_collisionShape);
+	m_debugBodyId = uniqueId++;
+
+	setMassProps(constructionInfo.m_mass, constructionInfo.m_localInertia);
+	updateInertiaTensor();
+
+	m_rigidbodyFlags = BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY;
+
+	m_deltaLinearVelocity.setZero();
+	m_deltaAngularVelocity.setZero();
+	m_invMass = m_inverseMass * m_linearFactor;
+	m_pushVelocity.setZero();
+	m_turnVelocity.setZero();
+}
+
+void btRigidBody::predictIntegratedTransform(btScalar timeStep, btTransform& predictedTransform)
+{
+	btTransformUtil::integrateTransform(m_worldTransform, m_linearVelocity, m_angularVelocity, timeStep, predictedTransform);
+}
+
+void btRigidBody::saveKinematicState(btScalar timeStep)
+{
+	//todo: clamp to some (user definable) safe minimum timestep, to limit maximum angular/linear velocities
+	if (timeStep != btScalar(0.))
+	{
+		//if we use motionstate to synchronize world transforms, get the new kinematic/animated world transform
+		if (getMotionState())
+			getMotionState()->getWorldTransform(m_worldTransform);
+		btVector3 linVel, angVel;
+
+		btTransformUtil::calculateVelocity(m_interpolationWorldTransform, m_worldTransform, timeStep, m_linearVelocity, m_angularVelocity);
+		m_interpolationLinearVelocity = m_linearVelocity;
+		m_interpolationAngularVelocity = m_angularVelocity;
+		m_interpolationWorldTransform = m_worldTransform;
+		//printf("angular = %f %f %f\n",m_angularVelocity.getX(),m_angularVelocity.getY(),m_angularVelocity.getZ());
+	}
+}
+
+void btRigidBody::getAabb(btVector3& aabbMin, btVector3& aabbMax) const
+{
+	getCollisionShape()->getAabb(m_worldTransform, aabbMin, aabbMax);
+}
+
+void btRigidBody::setGravity(const btVector3& acceleration)
+{
+	if (m_inverseMass != btScalar(0.0))
+	{
+		m_gravity = acceleration * (btScalar(1.0) / m_inverseMass);
+	}
+	m_gravity_acceleration = acceleration;
+}
+
+void btRigidBody::setDamping(btScalar lin_damping, btScalar ang_damping)
+{
+#ifdef BT_USE_OLD_DAMPING_METHOD
+	m_linearDamping = btMax(lin_damping, btScalar(0.0));
+	m_angularDamping = btMax(ang_damping, btScalar(0.0));
+#else
+	m_linearDamping = btClamped(lin_damping, btScalar(0.0), btScalar(1.0));
+	m_angularDamping = btClamped(ang_damping, btScalar(0.0), btScalar(1.0));
+#endif
+}
+
+///applyDamping damps the velocity, using the given m_linearDamping and m_angularDamping
+void btRigidBody::applyDamping(btScalar timeStep)
+{
+	//On new damping: see discussion/issue report here: http://code.google.com/p/bullet/issues/detail?id=74
+	//todo: do some performance comparisons (but other parts of the engine are probably bottleneck anyway
+
+#ifdef BT_USE_OLD_DAMPING_METHOD
+	m_linearVelocity *= btMax((btScalar(1.0) - timeStep * m_linearDamping), btScalar(0.0));
+	m_angularVelocity *= btMax((btScalar(1.0) - timeStep * m_angularDamping), btScalar(0.0));
+#else
+	m_linearVelocity *= btPow(btScalar(1) - m_linearDamping, timeStep);
+	m_angularVelocity *= btPow(btScalar(1) - m_angularDamping, timeStep);
+#endif
+
+	if (m_additionalDamping)
+	{
+		//Additional damping can help avoiding lowpass jitter motion, help stability for ragdolls etc.
+		//Such damping is undesirable, so once the overall simulation quality of the rigid body dynamics system has improved, this should become obsolete
+		if ((m_angularVelocity.length2() < m_additionalAngularDampingThresholdSqr) &&
+			(m_linearVelocity.length2() < m_additionalLinearDampingThresholdSqr))
+		{
+			m_angularVelocity *= m_additionalDampingFactor;
+			m_linearVelocity *= m_additionalDampingFactor;
+		}
+
+		btScalar speed = m_linearVelocity.length();
+		if (speed < m_linearDamping)
+		{
+			btScalar dampVel = btScalar(0.005);
+			if (speed > dampVel)
+			{
+				btVector3 dir = m_linearVelocity.normalized();
+				m_linearVelocity -= dir * dampVel;
+			}
+			else
+			{
+				m_linearVelocity.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+			}
+		}
+
+		btScalar angSpeed = m_angularVelocity.length();
+		if (angSpeed < m_angularDamping)
+		{
+			btScalar angDampVel = btScalar(0.005);
+			if (angSpeed > angDampVel)
+			{
+				btVector3 dir = m_angularVelocity.normalized();
+				m_angularVelocity -= dir * angDampVel;
+			}
+			else
+			{
+				m_angularVelocity.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+			}
+		}
+	}
+}
+
+void btRigidBody::applyGravity()
+{
+	if (isStaticOrKinematicObject())
+		return;
+
+	applyCentralForce(m_gravity);
+}
+
+void btRigidBody::clearGravity()
+{
+    if (isStaticOrKinematicObject())
+        return;
+    
+    applyCentralForce(-m_gravity);
+}
+
+void btRigidBody::proceedToTransform(const btTransform& newTrans)
+{
+	setCenterOfMassTransform(newTrans);
+}
+
+void btRigidBody::setMassProps(btScalar mass, const btVector3& inertia)
+{
+	if (mass == btScalar(0.))
+	{
+		m_collisionFlags |= btCollisionObject::CF_STATIC_OBJECT;
+		m_inverseMass = btScalar(0.);
+	}
+	else
+	{
+		m_collisionFlags &= (~btCollisionObject::CF_STATIC_OBJECT);
+		m_inverseMass = btScalar(1.0) / mass;
+	}
+
+	//Fg = m * a
+	m_gravity = mass * m_gravity_acceleration;
+
+	m_invInertiaLocal.setValue(inertia.x() != btScalar(0.0) ? btScalar(1.0) / inertia.x() : btScalar(0.0),
+							   inertia.y() != btScalar(0.0) ? btScalar(1.0) / inertia.y() : btScalar(0.0),
+							   inertia.z() != btScalar(0.0) ? btScalar(1.0) / inertia.z() : btScalar(0.0));
+
+	m_invMass = m_linearFactor * m_inverseMass;
+}
+
+void btRigidBody::updateInertiaTensor()
+{
+	m_invInertiaTensorWorld = m_worldTransform.getBasis().scaled(m_invInertiaLocal) * m_worldTransform.getBasis().transpose();
+}
+
+btVector3 btRigidBody::getLocalInertia() const
+{
+	btVector3 inertiaLocal;
+	const btVector3 inertia = m_invInertiaLocal;
+	inertiaLocal.setValue(inertia.x() != btScalar(0.0) ? btScalar(1.0) / inertia.x() : btScalar(0.0),
+						  inertia.y() != btScalar(0.0) ? btScalar(1.0) / inertia.y() : btScalar(0.0),
+						  inertia.z() != btScalar(0.0) ? btScalar(1.0) / inertia.z() : btScalar(0.0));
+	return inertiaLocal;
+}
+
+inline btVector3 evalEulerEqn(const btVector3& w1, const btVector3& w0, const btVector3& T, const btScalar dt,
+							  const btMatrix3x3& I)
+{
+	const btVector3 w2 = I * w1 + w1.cross(I * w1) * dt - (T * dt + I * w0);
+	return w2;
+}
+
+inline btMatrix3x3 evalEulerEqnDeriv(const btVector3& w1, const btVector3& w0, const btScalar dt,
+									 const btMatrix3x3& I)
+{
+	btMatrix3x3 w1x, Iw1x;
+	const btVector3 Iwi = (I * w1);
+	w1.getSkewSymmetricMatrix(&w1x[0], &w1x[1], &w1x[2]);
+	Iwi.getSkewSymmetricMatrix(&Iw1x[0], &Iw1x[1], &Iw1x[2]);
+
+	const btMatrix3x3 dfw1 = I + (w1x * I - Iw1x) * dt;
+	return dfw1;
+}
+
+btVector3 btRigidBody::computeGyroscopicForceExplicit(btScalar maxGyroscopicForce) const
+{
+	btVector3 inertiaLocal = getLocalInertia();
+	btMatrix3x3 inertiaTensorWorld = getWorldTransform().getBasis().scaled(inertiaLocal) * getWorldTransform().getBasis().transpose();
+	btVector3 tmp = inertiaTensorWorld * getAngularVelocity();
+	btVector3 gf = getAngularVelocity().cross(tmp);
+	btScalar l2 = gf.length2();
+	if (l2 > maxGyroscopicForce * maxGyroscopicForce)
+	{
+		gf *= btScalar(1.) / btSqrt(l2) * maxGyroscopicForce;
+	}
+	return gf;
+}
+
+btVector3 btRigidBody::computeGyroscopicImpulseImplicit_Body(btScalar step) const
+{
+	btVector3 idl = getLocalInertia();
+	btVector3 omega1 = getAngularVelocity();
+	btQuaternion q = getWorldTransform().getRotation();
+
+	// Convert to body coordinates
+	btVector3 omegab = quatRotate(q.inverse(), omega1);
+	btMatrix3x3 Ib;
+	Ib.setValue(idl.x(), 0, 0,
+				0, idl.y(), 0,
+				0, 0, idl.z());
+
+	btVector3 ibo = Ib * omegab;
+
+	// Residual vector
+	btVector3 f = step * omegab.cross(ibo);
+
+	btMatrix3x3 skew0;
+	omegab.getSkewSymmetricMatrix(&skew0[0], &skew0[1], &skew0[2]);
+	btVector3 om = Ib * omegab;
+	btMatrix3x3 skew1;
+	om.getSkewSymmetricMatrix(&skew1[0], &skew1[1], &skew1[2]);
+
+	// Jacobian
+	btMatrix3x3 J = Ib + (skew0 * Ib - skew1) * step;
+
+	//	btMatrix3x3 Jinv = J.inverse();
+	//	btVector3 omega_div = Jinv*f;
+	btVector3 omega_div = J.solve33(f);
+
+	// Single Newton-Raphson update
+	omegab = omegab - omega_div;  //Solve33(J, f);
+	// Back to world coordinates
+	btVector3 omega2 = quatRotate(q, omegab);
+	btVector3 gf = omega2 - omega1;
+	return gf;
+}
+
+btVector3 btRigidBody::computeGyroscopicImpulseImplicit_World(btScalar step) const
+{
+	// use full newton-euler equations.  common practice to drop the wxIw term. want it for better tumbling behavior.
+	// calculate using implicit euler step so it's stable.
+
+	const btVector3 inertiaLocal = getLocalInertia();
+	const btVector3 w0 = getAngularVelocity();
+
+	btMatrix3x3 I;
+
+	I = m_worldTransform.getBasis().scaled(inertiaLocal) *
+		m_worldTransform.getBasis().transpose();
+
+	// use newtons method to find implicit solution for new angular velocity (w')
+	// f(w') = -(T*step + Iw) + Iw' + w' + w'xIw'*step = 0
+	// df/dw' = I + 1xIw'*step + w'xI*step
+
+	btVector3 w1 = w0;
+
+	// one step of newton's method
+	{
+		const btVector3 fw = evalEulerEqn(w1, w0, btVector3(0, 0, 0), step, I);
+		const btMatrix3x3 dfw = evalEulerEqnDeriv(w1, w0, step, I);
+
+		btVector3 dw;
+		dw = dfw.solve33(fw);
+		//const btMatrix3x3 dfw_inv = dfw.inverse();
+		//dw = dfw_inv*fw;
+
+		w1 -= dw;
+	}
+
+	btVector3 gf = (w1 - w0);
+	return gf;
+}
+
+void btRigidBody::integrateVelocities(btScalar step)
+{
+	if (isStaticOrKinematicObject())
+		return;
+
+	m_linearVelocity += m_totalForce * (m_inverseMass * step);
+	m_angularVelocity += m_invInertiaTensorWorld * m_totalTorque * step;
+
+#define MAX_ANGVEL SIMD_HALF_PI
+	/// clamp angular velocity. collision calculations will fail on higher angular velocities
+	btScalar angvel = m_angularVelocity.length();
+	if (angvel * step > MAX_ANGVEL)
+	{
+		m_angularVelocity *= (MAX_ANGVEL / step) / angvel;
+	}
+	#if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+	clampVelocity(m_angularVelocity);
+	#endif
+}
+
+btQuaternion btRigidBody::getOrientation() const
+{
+	btQuaternion orn;
+	m_worldTransform.getBasis().getRotation(orn);
+	return orn;
+}
+
+void btRigidBody::setCenterOfMassTransform(const btTransform& xform)
+{
+	if (isKinematicObject())
+	{
+		m_interpolationWorldTransform = m_worldTransform;
+	}
+	else
+	{
+		m_interpolationWorldTransform = xform;
+	}
+	m_interpolationLinearVelocity = getLinearVelocity();
+	m_interpolationAngularVelocity = getAngularVelocity();
+	m_worldTransform = xform;
+	updateInertiaTensor();
+}
+
+void btRigidBody::addConstraintRef(btTypedConstraint* c)
+{
+	///disable collision with the 'other' body
+
+	int index = m_constraintRefs.findLinearSearch(c);
+	//don't add constraints that are already referenced
+	//btAssert(index == m_constraintRefs.size());
+	if (index == m_constraintRefs.size())
+	{
+		m_constraintRefs.push_back(c);
+		btCollisionObject* colObjA = &c->getRigidBodyA();
+		btCollisionObject* colObjB = &c->getRigidBodyB();
+		if (colObjA == this)
+		{
+			colObjA->setIgnoreCollisionCheck(colObjB, true);
+		}
+		else
+		{
+			colObjB->setIgnoreCollisionCheck(colObjA, true);
+		}
+	}
+}
+
+void btRigidBody::removeConstraintRef(btTypedConstraint* c)
+{
+	int index = m_constraintRefs.findLinearSearch(c);
+	//don't remove constraints that are not referenced
+	if (index < m_constraintRefs.size())
+	{
+		m_constraintRefs.remove(c);
+		btCollisionObject* colObjA = &c->getRigidBodyA();
+		btCollisionObject* colObjB = &c->getRigidBodyB();
+		if (colObjA == this)
+		{
+			colObjA->setIgnoreCollisionCheck(colObjB, false);
+		}
+		else
+		{
+			colObjB->setIgnoreCollisionCheck(colObjA, false);
+		}
+	}
+}
+
+int btRigidBody::calculateSerializeBufferSize() const
+{
+	int sz = sizeof(btRigidBodyData);
+	return sz;
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btRigidBody::serialize(void* dataBuffer, class btSerializer* serializer) const
+{
+	btRigidBodyData* rbd = (btRigidBodyData*)dataBuffer;
+
+	btCollisionObject::serialize(&rbd->m_collisionObjectData, serializer);
+
+	m_invInertiaTensorWorld.serialize(rbd->m_invInertiaTensorWorld);
+	m_linearVelocity.serialize(rbd->m_linearVelocity);
+	m_angularVelocity.serialize(rbd->m_angularVelocity);
+	rbd->m_inverseMass = m_inverseMass;
+	m_angularFactor.serialize(rbd->m_angularFactor);
+	m_linearFactor.serialize(rbd->m_linearFactor);
+	m_gravity.serialize(rbd->m_gravity);
+	m_gravity_acceleration.serialize(rbd->m_gravity_acceleration);
+	m_invInertiaLocal.serialize(rbd->m_invInertiaLocal);
+	m_totalForce.serialize(rbd->m_totalForce);
+	m_totalTorque.serialize(rbd->m_totalTorque);
+	rbd->m_linearDamping = m_linearDamping;
+	rbd->m_angularDamping = m_angularDamping;
+	rbd->m_additionalDamping = m_additionalDamping;
+	rbd->m_additionalDampingFactor = m_additionalDampingFactor;
+	rbd->m_additionalLinearDampingThresholdSqr = m_additionalLinearDampingThresholdSqr;
+	rbd->m_additionalAngularDampingThresholdSqr = m_additionalAngularDampingThresholdSqr;
+	rbd->m_additionalAngularDampingFactor = m_additionalAngularDampingFactor;
+	rbd->m_linearSleepingThreshold = m_linearSleepingThreshold;
+	rbd->m_angularSleepingThreshold = m_angularSleepingThreshold;
+
+	// Fill padding with zeros to appease msan.
+#ifdef BT_USE_DOUBLE_PRECISION
+	memset(rbd->m_padding, 0, sizeof(rbd->m_padding));
+#endif
+
+	return btRigidBodyDataName;
+}
+
+void btRigidBody::serializeSingleObject(class btSerializer* serializer) const
+{
+	btChunk* chunk = serializer->allocate(calculateSerializeBufferSize(), 1);
+	const char* structType = serialize(chunk->m_oldPtr, serializer);
+	serializer->finalizeChunk(chunk, structType, BT_RIGIDBODY_CODE, (void*)this);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btRigidBody.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btRigidBody.h
new file mode 100644
index 0000000..00143ef
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btRigidBody.h
@@ -0,0 +1,687 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_RIGIDBODY_H
+#define BT_RIGIDBODY_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btTransform.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+class btCollisionShape;
+class btMotionState;
+class btTypedConstraint;
+
+extern btScalar gDeactivationTime;
+extern bool gDisableDeactivation;
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btRigidBodyData btRigidBodyDoubleData
+#define btRigidBodyDataName "btRigidBodyDoubleData"
+#else
+#define btRigidBodyData btRigidBodyFloatData
+#define btRigidBodyDataName "btRigidBodyFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+enum btRigidBodyFlags
+{
+	BT_DISABLE_WORLD_GRAVITY = 1,
+	///BT_ENABLE_GYROPSCOPIC_FORCE flags is enabled by default in Bullet 2.83 and onwards.
+	///and it BT_ENABLE_GYROPSCOPIC_FORCE becomes equivalent to BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY
+	///See Demos/GyroscopicDemo and computeGyroscopicImpulseImplicit
+	BT_ENABLE_GYROSCOPIC_FORCE_EXPLICIT = 2,
+	BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_WORLD = 4,
+	BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY = 8,
+	BT_ENABLE_GYROPSCOPIC_FORCE = BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY,
+};
+
+///The btRigidBody is the main class for rigid body objects. It is derived from btCollisionObject, so it keeps a pointer to a btCollisionShape.
+///It is recommended for performance and memory use to share btCollisionShape objects whenever possible.
+///There are 3 types of rigid bodies:
+///- A) Dynamic rigid bodies, with positive mass. Motion is controlled by rigid body dynamics.
+///- B) Fixed objects with zero mass. They are not moving (basically collision objects)
+///- C) Kinematic objects, which are objects without mass, but the user can move them. There is one-way interaction, and Bullet calculates a velocity based on the timestep and previous and current world transform.
+///Bullet automatically deactivates dynamic rigid bodies, when the velocity is below a threshold for a given time.
+///Deactivated (sleeping) rigid bodies don't take any processing time, except a minor broadphase collision detection impact (to allow active objects to activate/wake up sleeping objects)
+class btRigidBody : public btCollisionObject
+{
+	btMatrix3x3 m_invInertiaTensorWorld;
+	btVector3 m_linearVelocity;
+	btVector3 m_angularVelocity;
+	btScalar m_inverseMass;
+	btVector3 m_linearFactor;
+
+	btVector3 m_gravity;
+	btVector3 m_gravity_acceleration;
+	btVector3 m_invInertiaLocal;
+	btVector3 m_totalForce;
+	btVector3 m_totalTorque;
+
+	btScalar m_linearDamping;
+	btScalar m_angularDamping;
+
+	bool m_additionalDamping;
+	btScalar m_additionalDampingFactor;
+	btScalar m_additionalLinearDampingThresholdSqr;
+	btScalar m_additionalAngularDampingThresholdSqr;
+	btScalar m_additionalAngularDampingFactor;
+
+	btScalar m_linearSleepingThreshold;
+	btScalar m_angularSleepingThreshold;
+
+	//m_optionalMotionState allows to automatic synchronize the world transform for active objects
+	btMotionState* m_optionalMotionState;
+
+	//keep track of typed constraints referencing this rigid body, to disable collision between linked bodies
+	btAlignedObjectArray<btTypedConstraint*> m_constraintRefs;
+
+	int m_rigidbodyFlags;
+
+	int m_debugBodyId;
+
+protected:
+	ATTRIBUTE_ALIGNED16(btVector3 m_deltaLinearVelocity);
+	btVector3 m_deltaAngularVelocity;
+	btVector3 m_angularFactor;
+	btVector3 m_invMass;
+	btVector3 m_pushVelocity;
+	btVector3 m_turnVelocity;
+
+public:
+	///The btRigidBodyConstructionInfo structure provides information to create a rigid body. Setting mass to zero creates a fixed (non-dynamic) rigid body.
+	///For dynamic objects, you can use the collision shape to approximate the local inertia tensor, otherwise use the zero vector (default argument)
+	///You can use the motion state to synchronize the world transform between physics and graphics objects.
+	///And if the motion state is provided, the rigid body will initialize its initial world transform from the motion state,
+	///m_startWorldTransform is only used when you don't provide a motion state.
+	struct btRigidBodyConstructionInfo
+	{
+		btScalar m_mass;
+
+		///When a motionState is provided, the rigid body will initialize its world transform from the motion state
+		///In this case, m_startWorldTransform is ignored.
+		btMotionState* m_motionState;
+		btTransform m_startWorldTransform;
+
+		btCollisionShape* m_collisionShape;
+		btVector3 m_localInertia;
+		btScalar m_linearDamping;
+		btScalar m_angularDamping;
+
+		///best simulation results when friction is non-zero
+		btScalar m_friction;
+		///the m_rollingFriction prevents rounded shapes, such as spheres, cylinders and capsules from rolling forever.
+		///See Bullet/Demos/RollingFrictionDemo for usage
+		btScalar m_rollingFriction;
+		btScalar m_spinningFriction;  //torsional friction around contact normal
+
+		///best simulation results using zero restitution.
+		btScalar m_restitution;
+
+		btScalar m_linearSleepingThreshold;
+		btScalar m_angularSleepingThreshold;
+
+		//Additional damping can help avoiding lowpass jitter motion, help stability for ragdolls etc.
+		//Such damping is undesirable, so once the overall simulation quality of the rigid body dynamics system has improved, this should become obsolete
+		bool m_additionalDamping;
+		btScalar m_additionalDampingFactor;
+		btScalar m_additionalLinearDampingThresholdSqr;
+		btScalar m_additionalAngularDampingThresholdSqr;
+		btScalar m_additionalAngularDampingFactor;
+
+		btRigidBodyConstructionInfo(btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia = btVector3(0, 0, 0)) : m_mass(mass),
+																																									   m_motionState(motionState),
+																																									   m_collisionShape(collisionShape),
+																																									   m_localInertia(localInertia),
+																																									   m_linearDamping(btScalar(0.)),
+																																									   m_angularDamping(btScalar(0.)),
+																																									   m_friction(btScalar(0.5)),
+																																									   m_rollingFriction(btScalar(0)),
+																																									   m_spinningFriction(btScalar(0)),
+																																									   m_restitution(btScalar(0.)),
+																																									   m_linearSleepingThreshold(btScalar(0.8)),
+																																									   m_angularSleepingThreshold(btScalar(1.f)),
+																																									   m_additionalDamping(false),
+																																									   m_additionalDampingFactor(btScalar(0.005)),
+																																									   m_additionalLinearDampingThresholdSqr(btScalar(0.01)),
+																																									   m_additionalAngularDampingThresholdSqr(btScalar(0.01)),
+																																									   m_additionalAngularDampingFactor(btScalar(0.01))
+		{
+			m_startWorldTransform.setIdentity();
+		}
+	};
+
+	///btRigidBody constructor using construction info
+	btRigidBody(const btRigidBodyConstructionInfo& constructionInfo);
+
+	///btRigidBody constructor for backwards compatibility.
+	///To specify friction (etc) during rigid body construction, please use the other constructor (using btRigidBodyConstructionInfo)
+	btRigidBody(btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia = btVector3(0, 0, 0));
+
+	virtual ~btRigidBody()
+	{
+		//No constraints should point to this rigidbody
+		//Remove constraints from the dynamics world before you delete the related rigidbodies.
+		btAssert(m_constraintRefs.size() == 0);
+	}
+
+protected:
+	///setupRigidBody is only used internally by the constructor
+	void setupRigidBody(const btRigidBodyConstructionInfo& constructionInfo);
+
+public:
+	void proceedToTransform(const btTransform& newTrans);
+
+	///to keep collision detection and dynamics separate we don't store a rigidbody pointer
+	///but a rigidbody is derived from btCollisionObject, so we can safely perform an upcast
+	static const btRigidBody* upcast(const btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType() & btCollisionObject::CO_RIGID_BODY)
+			return (const btRigidBody*)colObj;
+		return 0;
+	}
+	static btRigidBody* upcast(btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType() & btCollisionObject::CO_RIGID_BODY)
+			return (btRigidBody*)colObj;
+		return 0;
+	}
+
+	/// continuous collision detection needs prediction
+	void predictIntegratedTransform(btScalar step, btTransform& predictedTransform);
+
+	void saveKinematicState(btScalar step);
+
+	void applyGravity();
+    
+    void clearGravity();
+
+	void setGravity(const btVector3& acceleration);
+
+	const btVector3& getGravity() const
+	{
+		return m_gravity_acceleration;
+	}
+
+	void setDamping(btScalar lin_damping, btScalar ang_damping);
+
+	btScalar getLinearDamping() const
+	{
+		return m_linearDamping;
+	}
+
+	btScalar getAngularDamping() const
+	{
+		return m_angularDamping;
+	}
+
+	btScalar getLinearSleepingThreshold() const
+	{
+		return m_linearSleepingThreshold;
+	}
+
+	btScalar getAngularSleepingThreshold() const
+	{
+		return m_angularSleepingThreshold;
+	}
+
+	void applyDamping(btScalar timeStep);
+
+	SIMD_FORCE_INLINE const btCollisionShape* getCollisionShape() const
+	{
+		return m_collisionShape;
+	}
+
+	SIMD_FORCE_INLINE btCollisionShape* getCollisionShape()
+	{
+		return m_collisionShape;
+	}
+
+	void setMassProps(btScalar mass, const btVector3& inertia);
+
+	const btVector3& getLinearFactor() const
+	{
+		return m_linearFactor;
+	}
+	void setLinearFactor(const btVector3& linearFactor)
+	{
+		m_linearFactor = linearFactor;
+		m_invMass = m_linearFactor * m_inverseMass;
+	}
+	btScalar getInvMass() const { return m_inverseMass; }
+	btScalar getMass() const { return m_inverseMass == btScalar(0.) ? btScalar(0.) : btScalar(1.0) / m_inverseMass; }
+	const btMatrix3x3& getInvInertiaTensorWorld() const
+	{
+		return m_invInertiaTensorWorld;
+	}
+
+	void integrateVelocities(btScalar step);
+
+	void setCenterOfMassTransform(const btTransform& xform);
+
+	void applyCentralForce(const btVector3& force)
+	{
+		m_totalForce += force * m_linearFactor;
+	}
+
+	const btVector3& getTotalForce() const
+	{
+		return m_totalForce;
+	};
+
+	const btVector3& getTotalTorque() const
+	{
+		return m_totalTorque;
+	};
+
+	const btVector3& getInvInertiaDiagLocal() const
+	{
+		return m_invInertiaLocal;
+	};
+
+	void setInvInertiaDiagLocal(const btVector3& diagInvInertia)
+	{
+		m_invInertiaLocal = diagInvInertia;
+	}
+
+	void setSleepingThresholds(btScalar linear, btScalar angular)
+	{
+		m_linearSleepingThreshold = linear;
+		m_angularSleepingThreshold = angular;
+	}
+
+	void applyTorque(const btVector3& torque)
+	{
+		m_totalTorque += torque * m_angularFactor;
+		#if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+		clampVelocity(m_totalTorque);
+		#endif
+	}
+
+	void applyForce(const btVector3& force, const btVector3& rel_pos)
+	{
+		applyCentralForce(force);
+		applyTorque(rel_pos.cross(force * m_linearFactor));
+	}
+
+	void applyCentralImpulse(const btVector3& impulse)
+	{
+		m_linearVelocity += impulse * m_linearFactor * m_inverseMass;
+		#if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+		clampVelocity(m_linearVelocity);
+		#endif
+	}
+
+	void applyTorqueImpulse(const btVector3& torque)
+	{
+		m_angularVelocity += m_invInertiaTensorWorld * torque * m_angularFactor;
+		#if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+		clampVelocity(m_angularVelocity);
+		#endif
+	}
+
+	void applyImpulse(const btVector3& impulse, const btVector3& rel_pos)
+	{
+		if (m_inverseMass != btScalar(0.))
+		{
+			applyCentralImpulse(impulse);
+			if (m_angularFactor)
+			{
+				applyTorqueImpulse(rel_pos.cross(impulse * m_linearFactor));
+			}
+		}
+	}
+    
+    void applyPushImpulse(const btVector3& impulse, const btVector3& rel_pos)
+    {
+        if (m_inverseMass != btScalar(0.))
+        {
+            applyCentralPushImpulse(impulse);
+            if (m_angularFactor)
+            {
+                applyTorqueTurnImpulse(rel_pos.cross(impulse * m_linearFactor));
+            }
+        }
+    }
+    
+    btVector3 getPushVelocity() const
+    {
+        return m_pushVelocity;
+    }
+    
+    btVector3 getTurnVelocity() const
+    {
+        return m_turnVelocity;
+    }
+    
+    void setPushVelocity(const btVector3& v)
+    {
+        m_pushVelocity = v;
+    }
+
+    #if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+    void clampVelocity(btVector3& v) const {
+        v.setX(
+            fmax(-BT_CLAMP_VELOCITY_TO,
+                 fmin(BT_CLAMP_VELOCITY_TO, v.getX()))
+        );
+        v.setY(
+            fmax(-BT_CLAMP_VELOCITY_TO,
+                 fmin(BT_CLAMP_VELOCITY_TO, v.getY()))
+        );
+        v.setZ(
+            fmax(-BT_CLAMP_VELOCITY_TO,
+                 fmin(BT_CLAMP_VELOCITY_TO, v.getZ()))
+        );
+    }
+    #endif
+
+    void setTurnVelocity(const btVector3& v)
+    {
+        m_turnVelocity = v;
+        #if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+        clampVelocity(m_turnVelocity);
+        #endif
+    }
+    
+    void applyCentralPushImpulse(const btVector3& impulse)
+    {
+        m_pushVelocity += impulse * m_linearFactor * m_inverseMass;
+        #if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+        clampVelocity(m_pushVelocity);
+        #endif
+    }
+    
+    void applyTorqueTurnImpulse(const btVector3& torque)
+    {
+        m_turnVelocity += m_invInertiaTensorWorld * torque * m_angularFactor;
+        #if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+        clampVelocity(m_turnVelocity);
+        #endif
+    }
+
+	void clearForces()
+	{
+		m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+		m_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	}
+
+	void updateInertiaTensor();
+
+	const btVector3& getCenterOfMassPosition() const
+	{
+		return m_worldTransform.getOrigin();
+	}
+	btQuaternion getOrientation() const;
+
+	const btTransform& getCenterOfMassTransform() const
+	{
+		return m_worldTransform;
+	}
+	const btVector3& getLinearVelocity() const
+	{
+		return m_linearVelocity;
+	}
+	const btVector3& getAngularVelocity() const
+	{
+		return m_angularVelocity;
+	}
+
+	inline void setLinearVelocity(const btVector3& lin_vel)
+	{
+		m_updateRevision++;
+		m_linearVelocity = lin_vel;
+		#if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+		clampVelocity(m_linearVelocity);
+		#endif
+	}
+
+	inline void setAngularVelocity(const btVector3& ang_vel)
+	{
+		m_updateRevision++;
+		m_angularVelocity = ang_vel;
+		#if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+		clampVelocity(m_angularVelocity);
+		#endif
+	}
+
+	btVector3 getVelocityInLocalPoint(const btVector3& rel_pos) const
+	{
+		//we also calculate lin/ang velocity for kinematic objects
+		return m_linearVelocity + m_angularVelocity.cross(rel_pos);
+
+		//for kinematic objects, we could also use use:
+		//		return 	(m_worldTransform(rel_pos) - m_interpolationWorldTransform(rel_pos)) / m_kinematicTimeStep;
+	}
+    
+    btVector3 getPushVelocityInLocalPoint(const btVector3& rel_pos) const
+    {
+        //we also calculate lin/ang velocity for kinematic objects
+        return m_pushVelocity + m_turnVelocity.cross(rel_pos);
+    }
+
+	void translate(const btVector3& v)
+	{
+		m_worldTransform.getOrigin() += v;
+	}
+
+	void getAabb(btVector3& aabbMin, btVector3& aabbMax) const;
+
+	SIMD_FORCE_INLINE btScalar computeImpulseDenominator(const btVector3& pos, const btVector3& normal) const
+	{
+		btVector3 r0 = pos - getCenterOfMassPosition();
+
+		btVector3 c0 = (r0).cross(normal);
+
+		btVector3 vec = (c0 * getInvInertiaTensorWorld()).cross(r0);
+
+		return m_inverseMass + normal.dot(vec);
+	}
+
+	SIMD_FORCE_INLINE btScalar computeAngularImpulseDenominator(const btVector3& axis) const
+	{
+		btVector3 vec = axis * getInvInertiaTensorWorld();
+		return axis.dot(vec);
+	}
+
+	SIMD_FORCE_INLINE void updateDeactivation(btScalar timeStep)
+	{
+		if ((getActivationState() == ISLAND_SLEEPING) || (getActivationState() == DISABLE_DEACTIVATION))
+			return;
+
+		if ((getLinearVelocity().length2() < m_linearSleepingThreshold * m_linearSleepingThreshold) &&
+			(getAngularVelocity().length2() < m_angularSleepingThreshold * m_angularSleepingThreshold))
+		{
+			m_deactivationTime += timeStep;
+		}
+		else
+		{
+			m_deactivationTime = btScalar(0.);
+			setActivationState(0);
+		}
+	}
+
+	SIMD_FORCE_INLINE bool wantsSleeping()
+	{
+		if (getActivationState() == DISABLE_DEACTIVATION)
+			return false;
+
+		//disable deactivation
+		if (gDisableDeactivation || (gDeactivationTime == btScalar(0.)))
+			return false;
+
+		if ((getActivationState() == ISLAND_SLEEPING) || (getActivationState() == WANTS_DEACTIVATION))
+			return true;
+
+		if (m_deactivationTime > gDeactivationTime)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	const btBroadphaseProxy* getBroadphaseProxy() const
+	{
+		return m_broadphaseHandle;
+	}
+	btBroadphaseProxy* getBroadphaseProxy()
+	{
+		return m_broadphaseHandle;
+	}
+	void setNewBroadphaseProxy(btBroadphaseProxy* broadphaseProxy)
+	{
+		m_broadphaseHandle = broadphaseProxy;
+	}
+
+	//btMotionState allows to automatic synchronize the world transform for active objects
+	btMotionState* getMotionState()
+	{
+		return m_optionalMotionState;
+	}
+	const btMotionState* getMotionState() const
+	{
+		return m_optionalMotionState;
+	}
+	void setMotionState(btMotionState* motionState)
+	{
+		m_optionalMotionState = motionState;
+		if (m_optionalMotionState)
+			motionState->getWorldTransform(m_worldTransform);
+	}
+
+	//for experimental overriding of friction/contact solver func
+	int m_contactSolverType;
+	int m_frictionSolverType;
+
+	void setAngularFactor(const btVector3& angFac)
+	{
+		m_updateRevision++;
+		m_angularFactor = angFac;
+	}
+
+	void setAngularFactor(btScalar angFac)
+	{
+		m_updateRevision++;
+		m_angularFactor.setValue(angFac, angFac, angFac);
+	}
+	const btVector3& getAngularFactor() const
+	{
+		return m_angularFactor;
+	}
+
+	//is this rigidbody added to a btCollisionWorld/btDynamicsWorld/btBroadphase?
+	bool isInWorld() const
+	{
+		return (getBroadphaseProxy() != 0);
+	}
+
+	void addConstraintRef(btTypedConstraint* c);
+	void removeConstraintRef(btTypedConstraint* c);
+
+	btTypedConstraint* getConstraintRef(int index)
+	{
+		return m_constraintRefs[index];
+	}
+
+	int getNumConstraintRefs() const
+	{
+		return m_constraintRefs.size();
+	}
+
+	void setFlags(int flags)
+	{
+		m_rigidbodyFlags = flags;
+	}
+
+	int getFlags() const
+	{
+		return m_rigidbodyFlags;
+	}
+
+	///perform implicit force computation in world space
+	btVector3 computeGyroscopicImpulseImplicit_World(btScalar dt) const;
+
+	///perform implicit force computation in body space (inertial frame)
+	btVector3 computeGyroscopicImpulseImplicit_Body(btScalar step) const;
+
+	///explicit version is best avoided, it gains energy
+	btVector3 computeGyroscopicForceExplicit(btScalar maxGyroscopicForce) const;
+	btVector3 getLocalInertia() const;
+
+	///////////////////////////////////////////////
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, class btSerializer* serializer) const;
+
+	virtual void serializeSingleObject(class btSerializer* serializer) const;
+};
+
+//@todo add m_optionalMotionState and m_constraintRefs to btRigidBodyData
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btRigidBodyFloatData
+{
+	btCollisionObjectFloatData m_collisionObjectData;
+	btMatrix3x3FloatData m_invInertiaTensorWorld;
+	btVector3FloatData m_linearVelocity;
+	btVector3FloatData m_angularVelocity;
+	btVector3FloatData m_angularFactor;
+	btVector3FloatData m_linearFactor;
+	btVector3FloatData m_gravity;
+	btVector3FloatData m_gravity_acceleration;
+	btVector3FloatData m_invInertiaLocal;
+	btVector3FloatData m_totalForce;
+	btVector3FloatData m_totalTorque;
+	float m_inverseMass;
+	float m_linearDamping;
+	float m_angularDamping;
+	float m_additionalDampingFactor;
+	float m_additionalLinearDampingThresholdSqr;
+	float m_additionalAngularDampingThresholdSqr;
+	float m_additionalAngularDampingFactor;
+	float m_linearSleepingThreshold;
+	float m_angularSleepingThreshold;
+	int m_additionalDamping;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btRigidBodyDoubleData
+{
+	btCollisionObjectDoubleData m_collisionObjectData;
+	btMatrix3x3DoubleData m_invInertiaTensorWorld;
+	btVector3DoubleData m_linearVelocity;
+	btVector3DoubleData m_angularVelocity;
+	btVector3DoubleData m_angularFactor;
+	btVector3DoubleData m_linearFactor;
+	btVector3DoubleData m_gravity;
+	btVector3DoubleData m_gravity_acceleration;
+	btVector3DoubleData m_invInertiaLocal;
+	btVector3DoubleData m_totalForce;
+	btVector3DoubleData m_totalTorque;
+	double m_inverseMass;
+	double m_linearDamping;
+	double m_angularDamping;
+	double m_additionalDampingFactor;
+	double m_additionalLinearDampingThresholdSqr;
+	double m_additionalAngularDampingThresholdSqr;
+	double m_additionalAngularDampingFactor;
+	double m_linearSleepingThreshold;
+	double m_angularSleepingThreshold;
+	int m_additionalDamping;
+	char m_padding[4];
+};
+
+#endif  //BT_RIGIDBODY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
new file mode 100644
index 0000000..134c482
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
@@ -0,0 +1,260 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSimpleDynamicsWorld.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+
+/*
+  Make sure this dummy function never changes so that it
+  can be used by probes that are checking whether the
+  library is actually installed.
+*/
+extern "C"
+{
+	void btBulletDynamicsProbe();
+	void btBulletDynamicsProbe() {}
+}
+
+btSimpleDynamicsWorld::btSimpleDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration)
+	: btDynamicsWorld(dispatcher, pairCache, collisionConfiguration),
+	  m_constraintSolver(constraintSolver),
+	  m_ownsConstraintSolver(false),
+	  m_gravity(0, 0, -10)
+{
+}
+
+btSimpleDynamicsWorld::~btSimpleDynamicsWorld()
+{
+	if (m_ownsConstraintSolver)
+		btAlignedFree(m_constraintSolver);
+}
+
+int btSimpleDynamicsWorld::stepSimulation(btScalar timeStep, int maxSubSteps, btScalar fixedTimeStep)
+{
+	(void)fixedTimeStep;
+	(void)maxSubSteps;
+
+	///apply gravity, predict motion
+	predictUnconstraintMotion(timeStep);
+
+	btDispatcherInfo& dispatchInfo = getDispatchInfo();
+	dispatchInfo.m_timeStep = timeStep;
+	dispatchInfo.m_stepCount = 0;
+	dispatchInfo.m_debugDraw = getDebugDrawer();
+
+	///perform collision detection
+	performDiscreteCollisionDetection();
+
+	///solve contact constraints
+	int numManifolds = m_dispatcher1->getNumManifolds();
+	if (numManifolds)
+	{
+		btPersistentManifold** manifoldPtr = ((btCollisionDispatcher*)m_dispatcher1)->getInternalManifoldPointer();
+
+		btContactSolverInfo infoGlobal;
+		infoGlobal.m_timeStep = timeStep;
+		m_constraintSolver->prepareSolve(0, numManifolds);
+		m_constraintSolver->solveGroup(&getCollisionObjectArray()[0], getNumCollisionObjects(), manifoldPtr, numManifolds, 0, 0, infoGlobal, m_debugDrawer, m_dispatcher1);
+		m_constraintSolver->allSolved(infoGlobal, m_debugDrawer);
+	}
+
+	///integrate transforms
+	integrateTransforms(timeStep);
+
+	updateAabbs();
+
+	synchronizeMotionStates();
+
+	clearForces();
+
+	return 1;
+}
+
+void btSimpleDynamicsWorld::clearForces()
+{
+	///@todo: iterate over awake simulation islands!
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			body->clearForces();
+		}
+	}
+}
+
+void btSimpleDynamicsWorld::setGravity(const btVector3& gravity)
+{
+	m_gravity = gravity;
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			body->setGravity(gravity);
+		}
+	}
+}
+
+btVector3 btSimpleDynamicsWorld::getGravity() const
+{
+	return m_gravity;
+}
+
+void btSimpleDynamicsWorld::removeRigidBody(btRigidBody* body)
+{
+	btCollisionWorld::removeCollisionObject(body);
+}
+
+void btSimpleDynamicsWorld::removeCollisionObject(btCollisionObject* collisionObject)
+{
+	btRigidBody* body = btRigidBody::upcast(collisionObject);
+	if (body)
+		removeRigidBody(body);
+	else
+		btCollisionWorld::removeCollisionObject(collisionObject);
+}
+
+void btSimpleDynamicsWorld::addRigidBody(btRigidBody* body)
+{
+	body->setGravity(m_gravity);
+
+	if (body->getCollisionShape())
+	{
+		addCollisionObject(body);
+	}
+}
+
+void btSimpleDynamicsWorld::addRigidBody(btRigidBody* body, int group, int mask)
+{
+	body->setGravity(m_gravity);
+
+	if (body->getCollisionShape())
+	{
+		addCollisionObject(body, group, mask);
+	}
+}
+
+void btSimpleDynamicsWorld::debugDrawWorld()
+{
+}
+
+void btSimpleDynamicsWorld::addAction(btActionInterface* action)
+{
+}
+
+void btSimpleDynamicsWorld::removeAction(btActionInterface* action)
+{
+}
+
+void btSimpleDynamicsWorld::updateAabbs()
+{
+	btTransform predictedTrans;
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			if (body->isActive() && (!body->isStaticObject()))
+			{
+				btVector3 minAabb, maxAabb;
+				colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb, maxAabb);
+				btBroadphaseInterface* bp = getBroadphase();
+				bp->setAabb(body->getBroadphaseHandle(), minAabb, maxAabb, m_dispatcher1);
+			}
+		}
+	}
+}
+
+void btSimpleDynamicsWorld::integrateTransforms(btScalar timeStep)
+{
+	btTransform predictedTrans;
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			if (body->isActive() && (!body->isStaticObject()))
+			{
+				body->predictIntegratedTransform(timeStep, predictedTrans);
+				body->proceedToTransform(predictedTrans);
+			}
+		}
+	}
+}
+
+void btSimpleDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
+{
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			if (!body->isStaticObject())
+			{
+				if (body->isActive())
+				{
+					body->applyGravity();
+					body->integrateVelocities(timeStep);
+					body->applyDamping(timeStep);
+					body->predictIntegratedTransform(timeStep, body->getInterpolationWorldTransform());
+				}
+			}
+		}
+	}
+}
+
+void btSimpleDynamicsWorld::synchronizeMotionStates()
+{
+	///@todo: iterate over awake simulation islands!
+	for (int i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body && body->getMotionState())
+		{
+			if (body->getActivationState() != ISLAND_SLEEPING)
+			{
+				body->getMotionState()->setWorldTransform(body->getWorldTransform());
+			}
+		}
+	}
+}
+
+void btSimpleDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
+{
+	if (m_ownsConstraintSolver)
+	{
+		btAlignedFree(m_constraintSolver);
+	}
+	m_ownsConstraintSolver = false;
+	m_constraintSolver = solver;
+}
+
+btConstraintSolver* btSimpleDynamicsWorld::getConstraintSolver()
+{
+	return m_constraintSolver;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
new file mode 100644
index 0000000..46bd535
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
@@ -0,0 +1,84 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMPLE_DYNAMICS_WORLD_H
+#define BT_SIMPLE_DYNAMICS_WORLD_H
+
+#include "btDynamicsWorld.h"
+
+class btDispatcher;
+class btOverlappingPairCache;
+class btConstraintSolver;
+
+///The btSimpleDynamicsWorld serves as unit-test and to verify more complicated and optimized dynamics worlds.
+///Please use btDiscreteDynamicsWorld instead
+class btSimpleDynamicsWorld : public btDynamicsWorld
+{
+protected:
+	btConstraintSolver* m_constraintSolver;
+
+	bool m_ownsConstraintSolver;
+
+	void predictUnconstraintMotion(btScalar timeStep);
+
+	void integrateTransforms(btScalar timeStep);
+
+	btVector3 m_gravity;
+
+public:
+	///this btSimpleDynamicsWorld constructor creates dispatcher, broadphase pairCache and constraintSolver
+	btSimpleDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration);
+
+	virtual ~btSimpleDynamicsWorld();
+
+	///maxSubSteps/fixedTimeStep for interpolation is currently ignored for btSimpleDynamicsWorld, use btDiscreteDynamicsWorld instead
+	virtual int stepSimulation(btScalar timeStep, int maxSubSteps = 1, btScalar fixedTimeStep = btScalar(1.) / btScalar(60.));
+
+	virtual void setGravity(const btVector3& gravity);
+
+	virtual btVector3 getGravity() const;
+
+	virtual void addRigidBody(btRigidBody* body);
+
+	virtual void addRigidBody(btRigidBody* body, int group, int mask);
+
+	virtual void removeRigidBody(btRigidBody* body);
+
+	virtual void debugDrawWorld();
+
+	virtual void addAction(btActionInterface* action);
+
+	virtual void removeAction(btActionInterface* action);
+
+	///removeCollisionObject will first check if it is a rigid body, if so call removeRigidBody otherwise call btCollisionWorld::removeCollisionObject
+	virtual void removeCollisionObject(btCollisionObject* collisionObject);
+
+	virtual void updateAabbs();
+
+	virtual void synchronizeMotionStates();
+
+	virtual void setConstraintSolver(btConstraintSolver* solver);
+
+	virtual btConstraintSolver* getConstraintSolver();
+
+	virtual btDynamicsWorldType getWorldType() const
+	{
+		return BT_SIMPLE_DYNAMICS_WORLD;
+	}
+
+	virtual void clearForces();
+};
+
+#endif  //BT_SIMPLE_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp
new file mode 100644
index 0000000..026c2a9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp
@@ -0,0 +1,696 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btThreads.h"
+#include "btSimulationIslandManagerMt.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h"  // for s_minimumContactManifoldsForBatching
+
+//#include <stdio.h>
+#include "LinearMath/btQuickprof.h"
+
+SIMD_FORCE_INLINE int calcBatchCost(int bodies, int manifolds, int constraints)
+{
+	// rough estimate of the cost of a batch, used for merging
+	int batchCost = bodies + 8 * manifolds + 4 * constraints;
+	return batchCost;
+}
+
+SIMD_FORCE_INLINE int calcBatchCost(const btSimulationIslandManagerMt::Island* island)
+{
+	return calcBatchCost(island->bodyArray.size(), island->manifoldArray.size(), island->constraintArray.size());
+}
+
+btSimulationIslandManagerMt::btSimulationIslandManagerMt()
+{
+	m_minimumSolverBatchSize = calcBatchCost(0, 128, 0);
+	m_batchIslandMinBodyCount = 32;
+	m_islandDispatch = parallelIslandDispatch;
+	m_batchIsland = NULL;
+}
+
+btSimulationIslandManagerMt::~btSimulationIslandManagerMt()
+{
+	for (int i = 0; i < m_allocatedIslands.size(); ++i)
+	{
+		delete m_allocatedIslands[i];
+	}
+	m_allocatedIslands.resize(0);
+	m_activeIslands.resize(0);
+	m_freeIslands.resize(0);
+}
+
+inline int getIslandId(const btPersistentManifold* lhs)
+{
+	const btCollisionObject* rcolObj0 = static_cast<const btCollisionObject*>(lhs->getBody0());
+	const btCollisionObject* rcolObj1 = static_cast<const btCollisionObject*>(lhs->getBody1());
+	int islandId = rcolObj0->getIslandTag() >= 0 ? rcolObj0->getIslandTag() : rcolObj1->getIslandTag();
+	return islandId;
+}
+
+SIMD_FORCE_INLINE int btGetConstraintIslandId1(const btTypedConstraint* lhs)
+{
+	const btCollisionObject& rcolObj0 = lhs->getRigidBodyA();
+	const btCollisionObject& rcolObj1 = lhs->getRigidBodyB();
+	int islandId = rcolObj0.getIslandTag() >= 0 ? rcolObj0.getIslandTag() : rcolObj1.getIslandTag();
+	return islandId;
+}
+
+/// function object that routes calls to operator<
+class IslandBatchSizeSortPredicate
+{
+public:
+	bool operator()(const btSimulationIslandManagerMt::Island* lhs, const btSimulationIslandManagerMt::Island* rhs) const
+	{
+		int lCost = calcBatchCost(lhs);
+		int rCost = calcBatchCost(rhs);
+		return lCost > rCost;
+	}
+};
+
+class IslandBodyCapacitySortPredicate
+{
+public:
+	bool operator()(const btSimulationIslandManagerMt::Island* lhs, const btSimulationIslandManagerMt::Island* rhs) const
+	{
+		return lhs->bodyArray.capacity() > rhs->bodyArray.capacity();
+	}
+};
+
+void btSimulationIslandManagerMt::Island::append(const Island& other)
+{
+	// append bodies
+	for (int i = 0; i < other.bodyArray.size(); ++i)
+	{
+		bodyArray.push_back(other.bodyArray[i]);
+	}
+	// append manifolds
+	for (int i = 0; i < other.manifoldArray.size(); ++i)
+	{
+		manifoldArray.push_back(other.manifoldArray[i]);
+	}
+	// append constraints
+	for (int i = 0; i < other.constraintArray.size(); ++i)
+	{
+		constraintArray.push_back(other.constraintArray[i]);
+	}
+}
+
+bool btIsBodyInIsland(const btSimulationIslandManagerMt::Island& island, const btCollisionObject* obj)
+{
+	for (int i = 0; i < island.bodyArray.size(); ++i)
+	{
+		if (island.bodyArray[i] == obj)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+void btSimulationIslandManagerMt::initIslandPools()
+{
+	// reset island pools
+	int numElem = getUnionFind().getNumElements();
+	m_lookupIslandFromId.resize(numElem);
+	for (int i = 0; i < m_lookupIslandFromId.size(); ++i)
+	{
+		m_lookupIslandFromId[i] = NULL;
+	}
+	m_activeIslands.resize(0);
+	m_freeIslands.resize(0);
+	// check whether allocated islands are sorted by body capacity (largest to smallest)
+	int lastCapacity = 0;
+	bool isSorted = true;
+	for (int i = 0; i < m_allocatedIslands.size(); ++i)
+	{
+		Island* island = m_allocatedIslands[i];
+		int cap = island->bodyArray.capacity();
+		if (cap > lastCapacity)
+		{
+			isSorted = false;
+			break;
+		}
+		lastCapacity = cap;
+	}
+	if (!isSorted)
+	{
+		m_allocatedIslands.quickSort(IslandBodyCapacitySortPredicate());
+	}
+
+	m_batchIsland = NULL;
+	// mark all islands free (but avoid deallocation)
+	for (int i = 0; i < m_allocatedIslands.size(); ++i)
+	{
+		Island* island = m_allocatedIslands[i];
+		island->bodyArray.resize(0);
+		island->manifoldArray.resize(0);
+		island->constraintArray.resize(0);
+		island->id = -1;
+		island->isSleeping = true;
+		m_freeIslands.push_back(island);
+	}
+}
+
+btSimulationIslandManagerMt::Island* btSimulationIslandManagerMt::getIsland(int id)
+{
+	btAssert(id >= 0);
+	btAssert(id < m_lookupIslandFromId.size());
+	Island* island = m_lookupIslandFromId[id];
+	if (island == NULL)
+	{
+		// search for existing island
+		for (int i = 0; i < m_activeIslands.size(); ++i)
+		{
+			if (m_activeIslands[i]->id == id)
+			{
+				island = m_activeIslands[i];
+				break;
+			}
+		}
+		m_lookupIslandFromId[id] = island;
+	}
+	return island;
+}
+
+btSimulationIslandManagerMt::Island* btSimulationIslandManagerMt::allocateIsland(int id, int numBodies)
+{
+	Island* island = NULL;
+	int allocSize = numBodies;
+	if (numBodies < m_batchIslandMinBodyCount)
+	{
+		if (m_batchIsland)
+		{
+			island = m_batchIsland;
+			m_lookupIslandFromId[id] = island;
+			// if we've made a large enough batch,
+			if (island->bodyArray.size() + numBodies >= m_batchIslandMinBodyCount)
+			{
+				// next time start a new batch
+				m_batchIsland = NULL;
+			}
+			return island;
+		}
+		else
+		{
+			// need to allocate a batch island
+			allocSize = m_batchIslandMinBodyCount * 2;
+		}
+	}
+	btAlignedObjectArray<Island*>& freeIslands = m_freeIslands;
+
+	// search for free island
+	if (freeIslands.size() > 0)
+	{
+		// try to reuse a previously allocated island
+		int iFound = freeIslands.size();
+		// linear search for smallest island that can hold our bodies
+		for (int i = freeIslands.size() - 1; i >= 0; --i)
+		{
+			if (freeIslands[i]->bodyArray.capacity() >= allocSize)
+			{
+				iFound = i;
+				island = freeIslands[i];
+				island->id = id;
+				break;
+			}
+		}
+		// if found, shrink array while maintaining ordering
+		if (island)
+		{
+			int iDest = iFound;
+			int iSrc = iDest + 1;
+			while (iSrc < freeIslands.size())
+			{
+				freeIslands[iDest++] = freeIslands[iSrc++];
+			}
+			freeIslands.pop_back();
+		}
+	}
+	if (island == NULL)
+	{
+		// no free island found, allocate
+		island = new Island();  // TODO: change this to use the pool allocator
+		island->id = id;
+		island->bodyArray.reserve(allocSize);
+		m_allocatedIslands.push_back(island);
+	}
+	m_lookupIslandFromId[id] = island;
+	if (numBodies < m_batchIslandMinBodyCount)
+	{
+		m_batchIsland = island;
+	}
+	m_activeIslands.push_back(island);
+	return island;
+}
+
+void btSimulationIslandManagerMt::buildIslands(btDispatcher* dispatcher, btCollisionWorld* collisionWorld)
+{
+	BT_PROFILE("buildIslands");
+
+	btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray();
+
+	//we are going to sort the unionfind array, and store the element id in the size
+	//afterwards, we clean unionfind, to make sure no-one uses it anymore
+
+	getUnionFind().sortIslands();
+	int numElem = getUnionFind().getNumElements();
+
+	int endIslandIndex = 1;
+	int startIslandIndex;
+
+	//update the sleeping state for bodies, if all are sleeping
+	for (startIslandIndex = 0; startIslandIndex < numElem; startIslandIndex = endIslandIndex)
+	{
+		int islandId = getUnionFind().getElement(startIslandIndex).m_id;
+		for (endIslandIndex = startIslandIndex + 1; (endIslandIndex < numElem) && (getUnionFind().getElement(endIslandIndex).m_id == islandId); endIslandIndex++)
+		{
+		}
+
+		//int numSleeping = 0;
+
+		bool allSleeping = true;
+
+		int idx;
+		for (idx = startIslandIndex; idx < endIslandIndex; idx++)
+		{
+			int i = getUnionFind().getElement(idx).m_sz;
+
+			btCollisionObject* colObj0 = collisionObjects[i];
+			if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
+			{
+				//				printf("error in island management\n");
+			}
+
+			btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
+			if (colObj0->getIslandTag() == islandId)
+			{
+				if (colObj0->getActivationState() == ACTIVE_TAG ||
+					colObj0->getActivationState() == DISABLE_DEACTIVATION)
+				{
+					allSleeping = false;
+					break;
+				}
+			}
+		}
+
+		if (allSleeping)
+		{
+			int idx;
+			for (idx = startIslandIndex; idx < endIslandIndex; idx++)
+			{
+				int i = getUnionFind().getElement(idx).m_sz;
+				btCollisionObject* colObj0 = collisionObjects[i];
+				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
+				{
+					//					printf("error in island management\n");
+				}
+
+				btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
+
+				if (colObj0->getIslandTag() == islandId)
+				{
+					colObj0->setActivationState(ISLAND_SLEEPING);
+				}
+			}
+		}
+		else
+		{
+			int idx;
+			for (idx = startIslandIndex; idx < endIslandIndex; idx++)
+			{
+				int i = getUnionFind().getElement(idx).m_sz;
+
+				btCollisionObject* colObj0 = collisionObjects[i];
+				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
+				{
+					//					printf("error in island management\n");
+				}
+
+				btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
+
+				if (colObj0->getIslandTag() == islandId)
+				{
+					if (colObj0->getActivationState() == ISLAND_SLEEPING)
+					{
+						colObj0->setActivationState(WANTS_DEACTIVATION);
+						colObj0->setDeactivationTime(0.f);
+					}
+				}
+			}
+		}
+	}
+}
+
+void btSimulationIslandManagerMt::addBodiesToIslands(btCollisionWorld* collisionWorld)
+{
+	btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray();
+	int endIslandIndex = 1;
+	int startIslandIndex;
+	int numElem = getUnionFind().getNumElements();
+
+	// create explicit islands and add bodies to each
+	for (startIslandIndex = 0; startIslandIndex < numElem; startIslandIndex = endIslandIndex)
+	{
+		int islandId = getUnionFind().getElement(startIslandIndex).m_id;
+
+		// find end index
+		for (endIslandIndex = startIslandIndex; (endIslandIndex < numElem) && (getUnionFind().getElement(endIslandIndex).m_id == islandId); endIslandIndex++)
+		{
+		}
+		// check if island is sleeping
+		bool islandSleeping = true;
+		for (int iElem = startIslandIndex; iElem < endIslandIndex; iElem++)
+		{
+			int i = getUnionFind().getElement(iElem).m_sz;
+			btCollisionObject* colObj = collisionObjects[i];
+			if (colObj->isActive())
+			{
+				islandSleeping = false;
+			}
+		}
+		if (!islandSleeping)
+		{
+			// want to count the number of bodies before allocating the island to optimize memory usage of the Island structures
+			int numBodies = endIslandIndex - startIslandIndex;
+			Island* island = allocateIsland(islandId, numBodies);
+			island->isSleeping = false;
+
+			// add bodies to island
+			for (int iElem = startIslandIndex; iElem < endIslandIndex; iElem++)
+			{
+				int i = getUnionFind().getElement(iElem).m_sz;
+				btCollisionObject* colObj = collisionObjects[i];
+				island->bodyArray.push_back(colObj);
+			}
+		}
+	}
+}
+
+void btSimulationIslandManagerMt::addManifoldsToIslands(btDispatcher* dispatcher)
+{
+	// walk all the manifolds, activating bodies touched by kinematic objects, and add each manifold to its Island
+	int maxNumManifolds = dispatcher->getNumManifolds();
+	for (int i = 0; i < maxNumManifolds; i++)
+	{
+		btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal(i);
+
+		const btCollisionObject* colObj0 = static_cast<const btCollisionObject*>(manifold->getBody0());
+		const btCollisionObject* colObj1 = static_cast<const btCollisionObject*>(manifold->getBody1());
+
+		///@todo: check sleeping conditions!
+		if (((colObj0) && colObj0->getActivationState() != ISLAND_SLEEPING) ||
+			((colObj1) && colObj1->getActivationState() != ISLAND_SLEEPING))
+		{
+			//kinematic objects don't merge islands, but wake up all connected objects
+			if (colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
+			{
+				if (colObj0->hasContactResponse())
+					colObj1->activate();
+			}
+			if (colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
+			{
+				if (colObj1->hasContactResponse())
+					colObj0->activate();
+			}
+			//filtering for response
+			if (dispatcher->needsResponse(colObj0, colObj1))
+			{
+				// scatter manifolds into various islands
+				int islandId = getIslandId(manifold);
+				// if island not sleeping,
+				if (Island* island = getIsland(islandId))
+				{
+					island->manifoldArray.push_back(manifold);
+				}
+			}
+		}
+	}
+}
+
+void btSimulationIslandManagerMt::addConstraintsToIslands(btAlignedObjectArray<btTypedConstraint*>& constraints)
+{
+	// walk constraints
+	for (int i = 0; i < constraints.size(); i++)
+	{
+		// scatter constraints into various islands
+		btTypedConstraint* constraint = constraints[i];
+		if (constraint->isEnabled())
+		{
+			int islandId = btGetConstraintIslandId1(constraint);
+			// if island is not sleeping,
+			if (Island* island = getIsland(islandId))
+			{
+				island->constraintArray.push_back(constraint);
+			}
+		}
+	}
+}
+
+void btSimulationIslandManagerMt::mergeIslands()
+{
+	// sort islands in order of decreasing batch size
+	m_activeIslands.quickSort(IslandBatchSizeSortPredicate());
+
+	// merge small islands to satisfy minimum batch size
+	// find first small batch island
+	int destIslandIndex = m_activeIslands.size();
+	for (int i = 0; i < m_activeIslands.size(); ++i)
+	{
+		Island* island = m_activeIslands[i];
+		int batchSize = calcBatchCost(island);
+		if (batchSize < m_minimumSolverBatchSize)
+		{
+			destIslandIndex = i;
+			break;
+		}
+	}
+	int lastIndex = m_activeIslands.size() - 1;
+	while (destIslandIndex < lastIndex)
+	{
+		// merge islands from the back of the list
+		Island* island = m_activeIslands[destIslandIndex];
+		int numBodies = island->bodyArray.size();
+		int numManifolds = island->manifoldArray.size();
+		int numConstraints = island->constraintArray.size();
+		int firstIndex = lastIndex;
+		// figure out how many islands we want to merge and find out how many bodies, manifolds and constraints we will have
+		while (true)
+		{
+			Island* src = m_activeIslands[firstIndex];
+			numBodies += src->bodyArray.size();
+			numManifolds += src->manifoldArray.size();
+			numConstraints += src->constraintArray.size();
+			int batchCost = calcBatchCost(numBodies, numManifolds, numConstraints);
+			if (batchCost >= m_minimumSolverBatchSize)
+			{
+				break;
+			}
+			if (firstIndex - 1 == destIslandIndex)
+			{
+				break;
+			}
+			firstIndex--;
+		}
+		// reserve space for these pointers to minimize reallocation
+		island->bodyArray.reserve(numBodies);
+		island->manifoldArray.reserve(numManifolds);
+		island->constraintArray.reserve(numConstraints);
+		// merge islands
+		for (int i = firstIndex; i <= lastIndex; ++i)
+		{
+			island->append(*m_activeIslands[i]);
+		}
+		// shrink array to exclude the islands that were merged from
+		m_activeIslands.resize(firstIndex);
+		lastIndex = firstIndex - 1;
+		destIslandIndex++;
+	}
+}
+
+void btSimulationIslandManagerMt::solveIsland(btConstraintSolver* solver, Island& island, const SolverParams& solverParams)
+{
+	btPersistentManifold** manifolds = island.manifoldArray.size() ? &island.manifoldArray[0] : NULL;
+	btTypedConstraint** constraintsPtr = island.constraintArray.size() ? &island.constraintArray[0] : NULL;
+	solver->solveGroup(&island.bodyArray[0],
+					   island.bodyArray.size(),
+					   manifolds,
+					   island.manifoldArray.size(),
+					   constraintsPtr,
+					   island.constraintArray.size(),
+					   *solverParams.m_solverInfo,
+					   solverParams.m_debugDrawer,
+					   solverParams.m_dispatcher);
+}
+
+void btSimulationIslandManagerMt::serialIslandDispatch(btAlignedObjectArray<Island*>* islandsPtr, const SolverParams& solverParams)
+{
+	BT_PROFILE("serialIslandDispatch");
+	// serial dispatch
+	btAlignedObjectArray<Island*>& islands = *islandsPtr;
+	btConstraintSolver* solver = solverParams.m_solverMt ? solverParams.m_solverMt : solverParams.m_solverPool;
+	for (int i = 0; i < islands.size(); ++i)
+	{
+		solveIsland(solver, *islands[i], solverParams);
+	}
+}
+
+struct UpdateIslandDispatcher : public btIParallelForBody
+{
+	btAlignedObjectArray<btSimulationIslandManagerMt::Island*>& m_islandsPtr;
+	const btSimulationIslandManagerMt::SolverParams& m_solverParams;
+
+	UpdateIslandDispatcher(btAlignedObjectArray<btSimulationIslandManagerMt::Island*>& islandsPtr, const btSimulationIslandManagerMt::SolverParams& solverParams)
+		: m_islandsPtr(islandsPtr), m_solverParams(solverParams)
+	{
+	}
+
+	void forLoop(int iBegin, int iEnd) const BT_OVERRIDE
+	{
+		btConstraintSolver* solver = m_solverParams.m_solverPool;
+		for (int i = iBegin; i < iEnd; ++i)
+		{
+			btSimulationIslandManagerMt::Island* island = m_islandsPtr[i];
+			btSimulationIslandManagerMt::solveIsland(solver, *island, m_solverParams);
+		}
+	}
+};
+
+void btSimulationIslandManagerMt::parallelIslandDispatch(btAlignedObjectArray<Island*>* islandsPtr, const SolverParams& solverParams)
+{
+	BT_PROFILE("parallelIslandDispatch");
+	//
+	// if there are islands with many contacts, it may be faster to submit these
+	// large islands *serially* to a single parallel constraint solver, and then later
+	// submit the remaining smaller islands in parallel to multiple sequential solvers.
+	//
+	// Some task schedulers do not deal well with nested parallelFor loops. One implementation
+	// of OpenMP was actually slower than doing everything single-threaded. Intel TBB
+	// on the other hand, seems to do a pretty respectable job with it.
+	//
+	// When solving islands in parallel, the worst case performance happens when there
+	// is one very large island and then perhaps a smattering of very small
+	// islands -- one worker thread takes the large island and the remaining workers
+	// tear through the smaller islands and then sit idle waiting for the first worker
+	// to finish. Solving islands in parallel works best when there are numerous small
+	// islands, roughly equal in size.
+	//
+	// By contrast, the other approach -- the parallel constraint solver -- is only
+	// able to deliver a worthwhile speedup when the island is large. For smaller islands,
+	// it is difficult to extract a useful amount of parallelism -- the overhead of grouping
+	// the constraints into batches and sending the batches to worker threads can nullify
+	// any gains from parallelism.
+	//
+
+	UpdateIslandDispatcher dispatcher(*islandsPtr, solverParams);
+	// We take advantage of the fact the islands are sorted in order of decreasing size
+	int iBegin = 0;
+	if (solverParams.m_solverMt)
+	{
+		while (iBegin < islandsPtr->size())
+		{
+			btSimulationIslandManagerMt::Island* island = (*islandsPtr)[iBegin];
+			if (island->manifoldArray.size() < btSequentialImpulseConstraintSolverMt::s_minimumContactManifoldsForBatching)
+			{
+				// OK to submit the rest of the array in parallel
+				break;
+			}
+			// serial dispatch to parallel solver for large islands (if any)
+			solveIsland(solverParams.m_solverMt, *island, solverParams);
+			++iBegin;
+		}
+	}
+	// parallel dispatch to sequential solvers for rest
+	btParallelFor(iBegin, islandsPtr->size(), 1, dispatcher);
+}
+
+///@todo: this is random access, it can be walked 'cache friendly'!
+void btSimulationIslandManagerMt::buildAndProcessIslands(btDispatcher* dispatcher,
+														 btCollisionWorld* collisionWorld,
+														 btAlignedObjectArray<btTypedConstraint*>& constraints,
+														 const SolverParams& solverParams)
+{
+	BT_PROFILE("buildAndProcessIslands");
+	btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray();
+
+	buildIslands(dispatcher, collisionWorld);
+
+	if (!getSplitIslands())
+	{
+		btPersistentManifold** manifolds = dispatcher->getInternalManifoldPointer();
+		int maxNumManifolds = dispatcher->getNumManifolds();
+
+		for (int i = 0; i < maxNumManifolds; i++)
+		{
+			btPersistentManifold* manifold = manifolds[i];
+
+			const btCollisionObject* colObj0 = static_cast<const btCollisionObject*>(manifold->getBody0());
+			const btCollisionObject* colObj1 = static_cast<const btCollisionObject*>(manifold->getBody1());
+
+			///@todo: check sleeping conditions!
+			if (((colObj0) && colObj0->getActivationState() != ISLAND_SLEEPING) ||
+				((colObj1) && colObj1->getActivationState() != ISLAND_SLEEPING))
+			{
+				//kinematic objects don't merge islands, but wake up all connected objects
+				if (colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
+				{
+					if (colObj0->hasContactResponse())
+						colObj1->activate();
+				}
+				if (colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
+				{
+					if (colObj1->hasContactResponse())
+						colObj0->activate();
+				}
+			}
+		}
+		btTypedConstraint** constraintsPtr = constraints.size() ? &constraints[0] : NULL;
+		btConstraintSolver* solver = solverParams.m_solverMt ? solverParams.m_solverMt : solverParams.m_solverPool;
+		solver->solveGroup(&collisionObjects[0],
+						   collisionObjects.size(),
+						   manifolds,
+						   maxNumManifolds,
+						   constraintsPtr,
+						   constraints.size(),
+						   *solverParams.m_solverInfo,
+						   solverParams.m_debugDrawer,
+						   solverParams.m_dispatcher);
+	}
+	else
+	{
+		initIslandPools();
+
+		//traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated
+		addBodiesToIslands(collisionWorld);
+		addManifoldsToIslands(dispatcher);
+		addConstraintsToIslands(constraints);
+
+		// m_activeIslands array should now contain all non-sleeping Islands, and each Island should
+		// have all the necessary bodies, manifolds and constraints.
+
+		// if we want to merge islands with small batch counts,
+		if (m_minimumSolverBatchSize > 1)
+		{
+			mergeIslands();
+		}
+		// dispatch islands to solver
+		m_islandDispatch(&m_activeIslands, solverParams);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h
new file mode 100644
index 0000000..dcc04cd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h
@@ -0,0 +1,112 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMULATION_ISLAND_MANAGER_MT_H
+#define BT_SIMULATION_ISLAND_MANAGER_MT_H
+
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+
+class btTypedConstraint;
+class btConstraintSolver;
+struct btContactSolverInfo;
+class btIDebugDraw;
+
+///
+/// SimulationIslandManagerMt -- Multithread capable version of SimulationIslandManager
+///                       Splits the world up into islands which can be solved in parallel.
+///                       In order to solve islands in parallel, an IslandDispatch function
+///                       must be provided which will dispatch calls to multiple threads.
+///                       The amount of parallelism that can be achieved depends on the number
+///                       of islands. If only a single island exists, then no parallelism is
+///                       possible.
+///
+class btSimulationIslandManagerMt : public btSimulationIslandManager
+{
+public:
+	struct Island
+	{
+		// a simulation island consisting of bodies, manifolds and constraints,
+		// to be passed into a constraint solver.
+		btAlignedObjectArray<btCollisionObject*> bodyArray;
+		btAlignedObjectArray<btPersistentManifold*> manifoldArray;
+		btAlignedObjectArray<btTypedConstraint*> constraintArray;
+		int id;  // island id
+		bool isSleeping;
+
+		void append(const Island& other);  // add bodies, manifolds, constraints to my own
+	};
+	struct SolverParams
+	{
+		btConstraintSolver* m_solverPool;
+		btConstraintSolver* m_solverMt;
+		btContactSolverInfo* m_solverInfo;
+		btIDebugDraw* m_debugDrawer;
+		btDispatcher* m_dispatcher;
+	};
+	static void solveIsland(btConstraintSolver* solver, Island& island, const SolverParams& solverParams);
+
+	typedef void (*IslandDispatchFunc)(btAlignedObjectArray<Island*>* islands, const SolverParams& solverParams);
+	static void serialIslandDispatch(btAlignedObjectArray<Island*>* islandsPtr, const SolverParams& solverParams);
+	static void parallelIslandDispatch(btAlignedObjectArray<Island*>* islandsPtr, const SolverParams& solverParams);
+
+protected:
+	btAlignedObjectArray<Island*> m_allocatedIslands;    // owner of all Islands
+	btAlignedObjectArray<Island*> m_activeIslands;       // islands actively in use
+	btAlignedObjectArray<Island*> m_freeIslands;         // islands ready to be reused
+	btAlignedObjectArray<Island*> m_lookupIslandFromId;  // big lookup table to map islandId to Island pointer
+	Island* m_batchIsland;
+	int m_minimumSolverBatchSize;
+	int m_batchIslandMinBodyCount;
+	IslandDispatchFunc m_islandDispatch;
+
+	Island* getIsland(int id);
+	virtual Island* allocateIsland(int id, int numBodies);
+	virtual void initIslandPools();
+	virtual void addBodiesToIslands(btCollisionWorld* collisionWorld);
+	virtual void addManifoldsToIslands(btDispatcher* dispatcher);
+	virtual void addConstraintsToIslands(btAlignedObjectArray<btTypedConstraint*>& constraints);
+	virtual void mergeIslands();
+
+public:
+	btSimulationIslandManagerMt();
+	virtual ~btSimulationIslandManagerMt();
+
+	virtual void buildAndProcessIslands(btDispatcher* dispatcher,
+										btCollisionWorld* collisionWorld,
+										btAlignedObjectArray<btTypedConstraint*>& constraints,
+										const SolverParams& solverParams);
+
+	virtual void buildIslands(btDispatcher* dispatcher, btCollisionWorld* colWorld);
+
+	int getMinimumSolverBatchSize() const
+	{
+		return m_minimumSolverBatchSize;
+	}
+	void setMinimumSolverBatchSize(int sz)
+	{
+		m_minimumSolverBatchSize = sz;
+	}
+	IslandDispatchFunc getIslandDispatchFunction() const
+	{
+		return m_islandDispatch;
+	}
+	// allow users to set their own dispatch function for multithreaded dispatch
+	void setIslandDispatchFunction(IslandDispatchFunc func)
+	{
+		m_islandDispatch = func;
+	}
+};
+
+#endif  //BT_SIMULATION_ISLAND_MANAGER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBody.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBody.cpp
new file mode 100644
index 0000000..d7588ae
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBody.cpp
@@ -0,0 +1,2461 @@
+/*
+ * PURPOSE:
+ *   Class representing an articulated rigid body. Stores the body's
+ *   current state, allows forces and torques to be set, handles
+ *   timestepping and implements Featherstone's algorithm.
+ *   
+ * COPYRIGHT:
+ *   Copyright (C) Stephen Thompson, <stephen@solarflare.org.uk>, 2011-2013
+ *   Portions written By Erwin Coumans: connection to LCP solver, various multibody constraints, replacing Eigen math library by Bullet LinearMath and a dedicated 6x6 matrix inverse (solveImatrix)
+ *   Portions written By Jakub Stepien: support for multi-DOF constraints, introduction of spatial algebra and several other improvements
+
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ 
+ */
+
+#include "btMultiBody.h"
+#include "btMultiBodyLink.h"
+#include "btMultiBodyLinkCollider.h"
+#include "btMultiBodyJointFeedback.h"
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btSerializer.h"
+//#include "Bullet3Common/b3Logging.h"
+// #define INCLUDE_GYRO_TERM
+
+
+namespace
+{
+const btScalar INITIAL_SLEEP_EPSILON = btScalar(0.05);  // this is a squared velocity (m^2 s^-2)
+const btScalar INITIAL_SLEEP_TIMEOUT = btScalar(2);     // in seconds
+}  // namespace
+
+void btMultiBody::spatialTransform(const btMatrix3x3 &rotation_matrix,  // rotates vectors in 'from' frame to vectors in 'to' frame
+	const btVector3 &displacement,       // vector from origin of 'from' frame to origin of 'to' frame, in 'to' coordinates
+	const btVector3 &top_in,             // top part of input vector
+	const btVector3 &bottom_in,          // bottom part of input vector
+	btVector3 &top_out,                  // top part of output vector
+	btVector3 &bottom_out)               // bottom part of output vector
+{
+	top_out = rotation_matrix * top_in;
+	bottom_out = -displacement.cross(top_out) + rotation_matrix * bottom_in;
+}
+
+namespace
+{
+
+
+#if 0
+    void InverseSpatialTransform(const btMatrix3x3 &rotation_matrix,
+                                 const btVector3 &displacement,
+                                 const btVector3 &top_in,
+                                 const btVector3 &bottom_in,
+                                 btVector3 &top_out,
+                                 btVector3 &bottom_out)
+    {
+        top_out = rotation_matrix.transpose() * top_in;
+        bottom_out = rotation_matrix.transpose() * (bottom_in + displacement.cross(top_in));		
+    }
+
+    btScalar SpatialDotProduct(const btVector3 &a_top,
+                            const btVector3 &a_bottom,
+                            const btVector3 &b_top,
+                            const btVector3 &b_bottom)
+    {
+        return a_bottom.dot(b_top) + a_top.dot(b_bottom);
+    }
+
+	void SpatialCrossProduct(const btVector3 &a_top,
+                            const btVector3 &a_bottom,
+                            const btVector3 &b_top,
+                            const btVector3 &b_bottom,
+							btVector3 &top_out,
+							btVector3 &bottom_out)
+	{
+		top_out = a_top.cross(b_top);
+		bottom_out = a_bottom.cross(b_top) + a_top.cross(b_bottom);
+	}
+#endif
+
+}  // namespace
+
+//
+// Implementation of class btMultiBody
+//
+
+btMultiBody::btMultiBody(int n_links,
+						 btScalar mass,
+						 const btVector3 &inertia,
+						 bool fixedBase,
+						 bool canSleep,
+						 bool /*deprecatedUseMultiDof*/)
+	: m_baseCollider(0),
+	  m_baseName(0),
+	  m_basePos(0, 0, 0),
+	  m_baseQuat(0, 0, 0, 1),
+      m_basePos_interpolate(0, 0, 0),
+      m_baseQuat_interpolate(0, 0, 0, 1),
+	  m_baseMass(mass),
+	  m_baseInertia(inertia),
+
+	  m_fixedBase(fixedBase),
+	  m_awake(true),
+	  m_canSleep(canSleep),
+	  m_canWakeup(true),
+	  m_sleepTimer(0),
+      m_sleepEpsilon(INITIAL_SLEEP_EPSILON),
+	  m_sleepTimeout(INITIAL_SLEEP_TIMEOUT),
+
+	  m_userObjectPointer(0),
+	  m_userIndex2(-1),
+	  m_userIndex(-1),
+	  m_companionId(-1),
+	  m_linearDamping(0.04f),
+	  m_angularDamping(0.04f),
+	  m_useGyroTerm(true),
+	  m_maxAppliedImpulse(1000.f),
+	  m_maxCoordinateVelocity(100.f),
+	  m_hasSelfCollision(true),
+	  __posUpdated(false),
+	  m_dofCount(0),
+	  m_posVarCnt(0),
+	  m_useRK4(false),
+	  m_useGlobalVelocities(false),
+	  m_internalNeedsJointFeedback(false),
+		m_kinematic_calculate_velocity(false)
+{
+	m_cachedInertiaTopLeft.setValue(0, 0, 0, 0, 0, 0, 0, 0, 0);
+	m_cachedInertiaTopRight.setValue(0, 0, 0, 0, 0, 0, 0, 0, 0);
+	m_cachedInertiaLowerLeft.setValue(0, 0, 0, 0, 0, 0, 0, 0, 0);
+	m_cachedInertiaLowerRight.setValue(0, 0, 0, 0, 0, 0, 0, 0, 0);
+	m_cachedInertiaValid = false;
+
+	m_links.resize(n_links);
+	m_matrixBuf.resize(n_links + 1);
+
+	m_baseForce.setValue(0, 0, 0);
+	m_baseTorque.setValue(0, 0, 0);
+
+	clearConstraintForces();
+	clearForcesAndTorques();
+}
+
+btMultiBody::~btMultiBody()
+{
+}
+
+void btMultiBody::setupFixed(int i,
+							 btScalar mass,
+							 const btVector3 &inertia,
+							 int parent,
+							 const btQuaternion &rotParentToThis,
+							 const btVector3 &parentComToThisPivotOffset,
+							 const btVector3 &thisPivotToThisComOffset, bool /*deprecatedDisableParentCollision*/)
+{
+	m_links[i].m_mass = mass;
+	m_links[i].m_inertiaLocal = inertia;
+	m_links[i].m_parent = parent;
+	m_links[i].setAxisTop(0, 0., 0., 0.);
+	m_links[i].setAxisBottom(0, btVector3(0, 0, 0));
+	m_links[i].m_zeroRotParentToThis = rotParentToThis;
+	m_links[i].m_dVector = thisPivotToThisComOffset;
+	m_links[i].m_eVector = parentComToThisPivotOffset;
+
+	m_links[i].m_jointType = btMultibodyLink::eFixed;
+	m_links[i].m_dofCount = 0;
+	m_links[i].m_posVarCount = 0;
+
+	m_links[i].m_flags |= BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION;
+
+	m_links[i].updateCacheMultiDof();
+
+	updateLinksDofOffsets();
+}
+
+void btMultiBody::setupPrismatic(int i,
+								 btScalar mass,
+								 const btVector3 &inertia,
+								 int parent,
+								 const btQuaternion &rotParentToThis,
+								 const btVector3 &jointAxis,
+								 const btVector3 &parentComToThisPivotOffset,
+								 const btVector3 &thisPivotToThisComOffset,
+								 bool disableParentCollision)
+{
+	m_dofCount += 1;
+	m_posVarCnt += 1;
+
+	m_links[i].m_mass = mass;
+	m_links[i].m_inertiaLocal = inertia;
+	m_links[i].m_parent = parent;
+	m_links[i].m_zeroRotParentToThis = rotParentToThis;
+	m_links[i].setAxisTop(0, 0., 0., 0.);
+	m_links[i].setAxisBottom(0, jointAxis);
+	m_links[i].m_eVector = parentComToThisPivotOffset;
+	m_links[i].m_dVector = thisPivotToThisComOffset;
+	m_links[i].m_cachedRotParentToThis = rotParentToThis;
+
+	m_links[i].m_jointType = btMultibodyLink::ePrismatic;
+	m_links[i].m_dofCount = 1;
+	m_links[i].m_posVarCount = 1;
+	m_links[i].m_jointPos[0] = 0.f;
+	m_links[i].m_jointTorque[0] = 0.f;
+
+	if (disableParentCollision)
+		m_links[i].m_flags |= BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION;
+	//
+
+	m_links[i].updateCacheMultiDof();
+
+	updateLinksDofOffsets();
+}
+
+void btMultiBody::setupRevolute(int i,
+								btScalar mass,
+								const btVector3 &inertia,
+								int parent,
+								const btQuaternion &rotParentToThis,
+								const btVector3 &jointAxis,
+								const btVector3 &parentComToThisPivotOffset,
+								const btVector3 &thisPivotToThisComOffset,
+								bool disableParentCollision)
+{
+	m_dofCount += 1;
+	m_posVarCnt += 1;
+
+	m_links[i].m_mass = mass;
+	m_links[i].m_inertiaLocal = inertia;
+	m_links[i].m_parent = parent;
+	m_links[i].m_zeroRotParentToThis = rotParentToThis;
+	m_links[i].setAxisTop(0, jointAxis);
+	m_links[i].setAxisBottom(0, jointAxis.cross(thisPivotToThisComOffset));
+	m_links[i].m_dVector = thisPivotToThisComOffset;
+	m_links[i].m_eVector = parentComToThisPivotOffset;
+
+	m_links[i].m_jointType = btMultibodyLink::eRevolute;
+	m_links[i].m_dofCount = 1;
+	m_links[i].m_posVarCount = 1;
+	m_links[i].m_jointPos[0] = 0.f;
+	m_links[i].m_jointTorque[0] = 0.f;
+
+	if (disableParentCollision)
+		m_links[i].m_flags |= BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION;
+	//
+	m_links[i].updateCacheMultiDof();
+	//
+	updateLinksDofOffsets();
+}
+
+void btMultiBody::setupSpherical(int i,
+								 btScalar mass,
+								 const btVector3 &inertia,
+								 int parent,
+								 const btQuaternion &rotParentToThis,
+								 const btVector3 &parentComToThisPivotOffset,
+								 const btVector3 &thisPivotToThisComOffset,
+								 bool disableParentCollision)
+{
+	m_dofCount += 3;
+	m_posVarCnt += 4;
+
+	m_links[i].m_mass = mass;
+	m_links[i].m_inertiaLocal = inertia;
+	m_links[i].m_parent = parent;
+	m_links[i].m_zeroRotParentToThis = rotParentToThis;
+	m_links[i].m_dVector = thisPivotToThisComOffset;
+	m_links[i].m_eVector = parentComToThisPivotOffset;
+
+	m_links[i].m_jointType = btMultibodyLink::eSpherical;
+	m_links[i].m_dofCount = 3;
+	m_links[i].m_posVarCount = 4;
+	m_links[i].setAxisTop(0, 1.f, 0.f, 0.f);
+	m_links[i].setAxisTop(1, 0.f, 1.f, 0.f);
+	m_links[i].setAxisTop(2, 0.f, 0.f, 1.f);
+	m_links[i].setAxisBottom(0, m_links[i].getAxisTop(0).cross(thisPivotToThisComOffset));
+	m_links[i].setAxisBottom(1, m_links[i].getAxisTop(1).cross(thisPivotToThisComOffset));
+	m_links[i].setAxisBottom(2, m_links[i].getAxisTop(2).cross(thisPivotToThisComOffset));
+	m_links[i].m_jointPos[0] = m_links[i].m_jointPos[1] = m_links[i].m_jointPos[2] = 0.f;
+	m_links[i].m_jointPos[3] = 1.f;
+	m_links[i].m_jointTorque[0] = m_links[i].m_jointTorque[1] = m_links[i].m_jointTorque[2] = 0.f;
+
+	if (disableParentCollision)
+		m_links[i].m_flags |= BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION;
+	//
+	m_links[i].updateCacheMultiDof();
+	//
+	updateLinksDofOffsets();
+}
+
+void btMultiBody::setupPlanar(int i,
+							  btScalar mass,
+							  const btVector3 &inertia,
+							  int parent,
+							  const btQuaternion &rotParentToThis,
+							  const btVector3 &rotationAxis,
+							  const btVector3 &parentComToThisComOffset,
+							  bool disableParentCollision)
+{
+	m_dofCount += 3;
+	m_posVarCnt += 3;
+
+	m_links[i].m_mass = mass;
+	m_links[i].m_inertiaLocal = inertia;
+	m_links[i].m_parent = parent;
+	m_links[i].m_zeroRotParentToThis = rotParentToThis;
+	m_links[i].m_dVector.setZero();
+	m_links[i].m_eVector = parentComToThisComOffset;
+
+	//
+	btVector3 vecNonParallelToRotAxis(1, 0, 0);
+	if (rotationAxis.normalized().dot(vecNonParallelToRotAxis) > 0.999)
+		vecNonParallelToRotAxis.setValue(0, 1, 0);
+	//
+
+	m_links[i].m_jointType = btMultibodyLink::ePlanar;
+	m_links[i].m_dofCount = 3;
+	m_links[i].m_posVarCount = 3;
+	btVector3 n = rotationAxis.normalized();
+	m_links[i].setAxisTop(0, n[0], n[1], n[2]);
+	m_links[i].setAxisTop(1, 0, 0, 0);
+	m_links[i].setAxisTop(2, 0, 0, 0);
+	m_links[i].setAxisBottom(0, 0, 0, 0);
+	btVector3 cr = m_links[i].getAxisTop(0).cross(vecNonParallelToRotAxis);
+	m_links[i].setAxisBottom(1, cr[0], cr[1], cr[2]);
+	cr = m_links[i].getAxisBottom(1).cross(m_links[i].getAxisTop(0));
+	m_links[i].setAxisBottom(2, cr[0], cr[1], cr[2]);
+	m_links[i].m_jointPos[0] = m_links[i].m_jointPos[1] = m_links[i].m_jointPos[2] = 0.f;
+	m_links[i].m_jointTorque[0] = m_links[i].m_jointTorque[1] = m_links[i].m_jointTorque[2] = 0.f;
+
+	if (disableParentCollision)
+		m_links[i].m_flags |= BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION;
+	//
+	m_links[i].updateCacheMultiDof();
+	//
+	updateLinksDofOffsets();
+
+	m_links[i].setAxisBottom(1, m_links[i].getAxisBottom(1).normalized());
+	m_links[i].setAxisBottom(2, m_links[i].getAxisBottom(2).normalized());
+}
+
+void btMultiBody::finalizeMultiDof()
+{
+	m_deltaV.resize(0);
+	m_deltaV.resize(6 + m_dofCount);
+    m_splitV.resize(0);
+    m_splitV.resize(6 + m_dofCount);
+	m_realBuf.resize(6 + m_dofCount + m_dofCount * m_dofCount + 6 + m_dofCount);  //m_dofCount for joint-space vels + m_dofCount^2 for "D" matrices + delta-pos vector (6 base "vels" + joint "vels")
+	m_vectorBuf.resize(2 * m_dofCount);                                           //two 3-vectors (i.e. one six-vector) for each system dof	("h" matrices)
+	m_matrixBuf.resize(m_links.size() + 1);
+	for (int i = 0; i < m_vectorBuf.size(); i++)
+	{
+		m_vectorBuf[i].setValue(0, 0, 0);
+	}
+	updateLinksDofOffsets();
+}
+
+int btMultiBody::getParent(int link_num) const
+{
+	return m_links[link_num].m_parent;
+}
+
+btScalar btMultiBody::getLinkMass(int i) const
+{
+	return m_links[i].m_mass;
+}
+
+const btVector3 &btMultiBody::getLinkInertia(int i) const
+{
+	return m_links[i].m_inertiaLocal;
+}
+
+btScalar btMultiBody::getJointPos(int i) const
+{
+	return m_links[i].m_jointPos[0];
+}
+
+btScalar btMultiBody::getJointVel(int i) const
+{
+	return m_realBuf[6 + m_links[i].m_dofOffset];
+}
+
+btScalar *btMultiBody::getJointPosMultiDof(int i)
+{
+	return &m_links[i].m_jointPos[0];
+}
+
+btScalar *btMultiBody::getJointVelMultiDof(int i)
+{
+	return &m_realBuf[6 + m_links[i].m_dofOffset];
+}
+
+const btScalar *btMultiBody::getJointPosMultiDof(int i) const
+{
+	return &m_links[i].m_jointPos[0];
+}
+
+const btScalar *btMultiBody::getJointVelMultiDof(int i) const
+{
+	return &m_realBuf[6 + m_links[i].m_dofOffset];
+}
+
+void btMultiBody::setJointPos(int i, btScalar q)
+{
+	m_links[i].m_jointPos[0] = q;
+	m_links[i].updateCacheMultiDof();
+}
+
+
+void btMultiBody::setJointPosMultiDof(int i, const double *q)
+{
+	for (int pos = 0; pos < m_links[i].m_posVarCount; ++pos)
+		m_links[i].m_jointPos[pos] = (btScalar)q[pos];
+
+	m_links[i].updateCacheMultiDof();
+}
+
+void btMultiBody::setJointPosMultiDof(int i, const float *q)
+{
+	for (int pos = 0; pos < m_links[i].m_posVarCount; ++pos)
+		m_links[i].m_jointPos[pos] = (btScalar)q[pos];
+
+	m_links[i].updateCacheMultiDof();
+}
+
+
+
+void btMultiBody::setJointVel(int i, btScalar qdot)
+{
+	m_realBuf[6 + m_links[i].m_dofOffset] = qdot;
+}
+
+void btMultiBody::setJointVelMultiDof(int i, const double *qdot)
+{
+	for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		m_realBuf[6 + m_links[i].m_dofOffset + dof] = (btScalar)qdot[dof];
+}
+
+void btMultiBody::setJointVelMultiDof(int i, const float* qdot)
+{
+	for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		m_realBuf[6 + m_links[i].m_dofOffset + dof] = (btScalar)qdot[dof];
+}
+
+const btVector3 &btMultiBody::getRVector(int i) const
+{
+	return m_links[i].m_cachedRVector;
+}
+
+const btQuaternion &btMultiBody::getParentToLocalRot(int i) const
+{
+	return m_links[i].m_cachedRotParentToThis;
+}
+
+const btVector3 &btMultiBody::getInterpolateRVector(int i) const
+{
+    return m_links[i].m_cachedRVector_interpolate;
+}
+
+const btQuaternion &btMultiBody::getInterpolateParentToLocalRot(int i) const
+{
+    return m_links[i].m_cachedRotParentToThis_interpolate;
+}
+
+btVector3 btMultiBody::localPosToWorld(int i, const btVector3 &local_pos) const
+{
+	btAssert(i >= -1);
+	btAssert(i < m_links.size());
+	if ((i < -1) || (i >= m_links.size()))
+	{
+		return btVector3(SIMD_INFINITY, SIMD_INFINITY, SIMD_INFINITY);
+	}
+
+	btVector3 result = local_pos;
+	while (i != -1)
+	{
+		// 'result' is in frame i. transform it to frame parent(i)
+		result += getRVector(i);
+		result = quatRotate(getParentToLocalRot(i).inverse(), result);
+		i = getParent(i);
+	}
+
+	// 'result' is now in the base frame. transform it to world frame
+	result = quatRotate(getWorldToBaseRot().inverse(), result);
+	result += getBasePos();
+
+	return result;
+}
+
+btVector3 btMultiBody::worldPosToLocal(int i, const btVector3 &world_pos) const
+{
+	btAssert(i >= -1);
+	btAssert(i < m_links.size());
+	if ((i < -1) || (i >= m_links.size()))
+	{
+		return btVector3(SIMD_INFINITY, SIMD_INFINITY, SIMD_INFINITY);
+	}
+
+	if (i == -1)
+	{
+		// world to base
+		return quatRotate(getWorldToBaseRot(), (world_pos - getBasePos()));
+	}
+	else
+	{
+		// find position in parent frame, then transform to current frame
+		return quatRotate(getParentToLocalRot(i), worldPosToLocal(getParent(i), world_pos)) - getRVector(i);
+	}
+}
+
+btVector3 btMultiBody::localDirToWorld(int i, const btVector3 &local_dir) const
+{
+	btAssert(i >= -1);
+	btAssert(i < m_links.size());
+	if ((i < -1) || (i >= m_links.size()))
+	{
+		return btVector3(SIMD_INFINITY, SIMD_INFINITY, SIMD_INFINITY);
+	}
+
+	btVector3 result = local_dir;
+	while (i != -1)
+	{
+		result = quatRotate(getParentToLocalRot(i).inverse(), result);
+		i = getParent(i);
+	}
+	result = quatRotate(getWorldToBaseRot().inverse(), result);
+	return result;
+}
+
+btVector3 btMultiBody::worldDirToLocal(int i, const btVector3 &world_dir) const
+{
+	btAssert(i >= -1);
+	btAssert(i < m_links.size());
+	if ((i < -1) || (i >= m_links.size()))
+	{
+		return btVector3(SIMD_INFINITY, SIMD_INFINITY, SIMD_INFINITY);
+	}
+
+	if (i == -1)
+	{
+		return quatRotate(getWorldToBaseRot(), world_dir);
+	}
+	else
+	{
+		return quatRotate(getParentToLocalRot(i), worldDirToLocal(getParent(i), world_dir));
+	}
+}
+
+btMatrix3x3 btMultiBody::localFrameToWorld(int i, const btMatrix3x3 &local_frame) const
+{
+	btMatrix3x3 result = local_frame;
+	btVector3 frameInWorld0 = localDirToWorld(i, local_frame.getColumn(0));
+	btVector3 frameInWorld1 = localDirToWorld(i, local_frame.getColumn(1));
+	btVector3 frameInWorld2 = localDirToWorld(i, local_frame.getColumn(2));
+	result.setValue(frameInWorld0[0], frameInWorld1[0], frameInWorld2[0], frameInWorld0[1], frameInWorld1[1], frameInWorld2[1], frameInWorld0[2], frameInWorld1[2], frameInWorld2[2]);
+	return result;
+}
+
+void btMultiBody::compTreeLinkVelocities(btVector3 *omega, btVector3 *vel) const
+{
+	int num_links = getNumLinks();
+	// Calculates the velocities of each link (and the base) in its local frame
+	const btQuaternion& base_rot = getWorldToBaseRot();
+	omega[0] = quatRotate(base_rot, getBaseOmega());
+	vel[0] = quatRotate(base_rot, getBaseVel());
+
+	for (int i = 0; i < num_links; ++i)
+	{
+		const btMultibodyLink& link = getLink(i);
+		const int parent = link.m_parent;
+
+		// transform parent vel into this frame, store in omega[i+1], vel[i+1]
+		spatialTransform(btMatrix3x3(link.m_cachedRotParentToThis), link.m_cachedRVector,
+			omega[parent + 1], vel[parent + 1],
+			omega[i + 1], vel[i + 1]);
+
+		// now add qidot * shat_i
+		const btScalar* jointVel = getJointVelMultiDof(i);
+		for (int dof = 0; dof < link.m_dofCount; ++dof)
+		{
+			omega[i + 1] += jointVel[dof] * link.getAxisTop(dof);
+			vel[i + 1] += jointVel[dof] * link.getAxisBottom(dof);
+		}
+	}
+}
+
+
+void btMultiBody::clearConstraintForces()
+{
+	m_baseConstraintForce.setValue(0, 0, 0);
+	m_baseConstraintTorque.setValue(0, 0, 0);
+
+	for (int i = 0; i < getNumLinks(); ++i)
+	{
+		m_links[i].m_appliedConstraintForce.setValue(0, 0, 0);
+		m_links[i].m_appliedConstraintTorque.setValue(0, 0, 0);
+	}
+}
+void btMultiBody::clearForcesAndTorques()
+{
+	m_baseForce.setValue(0, 0, 0);
+	m_baseTorque.setValue(0, 0, 0);
+
+	for (int i = 0; i < getNumLinks(); ++i)
+	{
+		m_links[i].m_appliedForce.setValue(0, 0, 0);
+		m_links[i].m_appliedTorque.setValue(0, 0, 0);
+		m_links[i].m_jointTorque[0] = m_links[i].m_jointTorque[1] = m_links[i].m_jointTorque[2] = m_links[i].m_jointTorque[3] = m_links[i].m_jointTorque[4] = m_links[i].m_jointTorque[5] = 0.f;
+	}
+}
+
+void btMultiBody::clearVelocities()
+{
+	for (int i = 0; i < 6 + getNumDofs(); ++i)
+	{
+		m_realBuf[i] = 0.f;
+	}
+}
+void btMultiBody::addLinkForce(int i, const btVector3 &f)
+{
+	m_links[i].m_appliedForce += f;
+}
+
+void btMultiBody::addLinkTorque(int i, const btVector3 &t)
+{
+	m_links[i].m_appliedTorque += t;
+}
+
+void btMultiBody::addLinkConstraintForce(int i, const btVector3 &f)
+{
+	m_links[i].m_appliedConstraintForce += f;
+}
+
+void btMultiBody::addLinkConstraintTorque(int i, const btVector3 &t)
+{
+	m_links[i].m_appliedConstraintTorque += t;
+}
+
+void btMultiBody::addJointTorque(int i, btScalar Q)
+{
+	m_links[i].m_jointTorque[0] += Q;
+}
+
+void btMultiBody::addJointTorqueMultiDof(int i, int dof, btScalar Q)
+{
+	m_links[i].m_jointTorque[dof] += Q;
+}
+
+void btMultiBody::addJointTorqueMultiDof(int i, const btScalar *Q)
+{
+	for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		m_links[i].m_jointTorque[dof] = Q[dof];
+}
+
+const btVector3 &btMultiBody::getLinkForce(int i) const
+{
+	return m_links[i].m_appliedForce;
+}
+
+const btVector3 &btMultiBody::getLinkTorque(int i) const
+{
+	return m_links[i].m_appliedTorque;
+}
+
+btScalar btMultiBody::getJointTorque(int i) const
+{
+	return m_links[i].m_jointTorque[0];
+}
+
+btScalar *btMultiBody::getJointTorqueMultiDof(int i)
+{
+	return &m_links[i].m_jointTorque[0];
+}
+
+bool btMultiBody::hasFixedBase() const
+{
+	return m_fixedBase || (getBaseCollider() && getBaseCollider()->isStaticObject());
+}
+
+bool btMultiBody::isBaseStaticOrKinematic() const
+{
+	return m_fixedBase || (getBaseCollider() && getBaseCollider()->isStaticOrKinematicObject());
+}
+
+bool btMultiBody::isBaseKinematic() const
+{
+	return getBaseCollider() && getBaseCollider()->isKinematicObject();
+}
+
+void btMultiBody::setBaseDynamicType(int dynamicType)
+{
+	if(getBaseCollider()) {
+		int oldFlags = getBaseCollider()->getCollisionFlags();
+		oldFlags &= ~(btCollisionObject::CF_STATIC_OBJECT | btCollisionObject::CF_KINEMATIC_OBJECT);
+		getBaseCollider()->setCollisionFlags(oldFlags | dynamicType);
+	}
+}
+
+inline btMatrix3x3 outerProduct(const btVector3 &v0, const btVector3 &v1)  //renamed it from vecMulVecTranspose (http://en.wikipedia.org/wiki/Outer_product); maybe it should be moved to btVector3 like dot and cross?
+{
+	btVector3 row0 = btVector3(
+		v0.x() * v1.x(),
+		v0.x() * v1.y(),
+		v0.x() * v1.z());
+	btVector3 row1 = btVector3(
+		v0.y() * v1.x(),
+		v0.y() * v1.y(),
+		v0.y() * v1.z());
+	btVector3 row2 = btVector3(
+		v0.z() * v1.x(),
+		v0.z() * v1.y(),
+		v0.z() * v1.z());
+
+	btMatrix3x3 m(row0[0], row0[1], row0[2],
+				  row1[0], row1[1], row1[2],
+				  row2[0], row2[1], row2[2]);
+	return m;
+}
+
+#define vecMulVecTranspose(v0, v1Transposed) outerProduct(v0, v1Transposed)
+//
+
+void btMultiBody::computeAccelerationsArticulatedBodyAlgorithmMultiDof(btScalar dt,
+    btAlignedObjectArray<btScalar> &scratch_r,
+    btAlignedObjectArray<btVector3> &scratch_v,
+    btAlignedObjectArray<btMatrix3x3> &scratch_m,
+	bool isConstraintPass,
+	bool jointFeedbackInWorldSpace,
+	bool jointFeedbackInJointFrame)
+{
+	// Implement Featherstone's algorithm to calculate joint accelerations (q_double_dot)
+	// and the base linear & angular accelerations.
+
+	// We apply damping forces in this routine as well as any external forces specified by the
+	// caller (via addBaseForce etc).
+
+	// output should point to an array of 6 + num_links reals.
+	// Format is: 3 angular accelerations (in world frame), 3 linear accelerations (in world frame),
+	// num_links joint acceleration values.
+
+	// We added support for multi degree of freedom (multi dof) joints.
+	// In addition we also can compute the joint reaction forces. This is performed in a second pass,
+	// so that we can include the effect of the constraint solver forces (computed in the PGS LCP solver)
+
+	m_internalNeedsJointFeedback = false;
+
+	int num_links = getNumLinks();
+
+	const btScalar DAMPING_K1_LINEAR = m_linearDamping;
+	const btScalar DAMPING_K2_LINEAR = m_linearDamping;
+
+	const btScalar DAMPING_K1_ANGULAR = m_angularDamping;
+	const btScalar DAMPING_K2_ANGULAR = m_angularDamping;
+
+	const btVector3 base_vel = getBaseVel();
+	const btVector3 base_omega = getBaseOmega();
+
+	// Temporary matrices/vectors -- use scratch space from caller
+	// so that we don't have to keep reallocating every frame
+
+	scratch_r.resize(2 * m_dofCount + 7);  //multidof? ("Y"s use it and it is used to store qdd) => 2 x m_dofCount
+	scratch_v.resize(8 * num_links + 6);
+	scratch_m.resize(4 * num_links + 4);
+
+	//btScalar * r_ptr = &scratch_r[0];
+	btScalar *output = &scratch_r[m_dofCount];  // "output" holds the q_double_dot results
+	btVector3 *v_ptr = &scratch_v[0];
+
+	// vhat_i  (top = angular, bottom = linear part)
+	btSpatialMotionVector *spatVel = (btSpatialMotionVector *)v_ptr;
+	v_ptr += num_links * 2 + 2;
+	//
+	// zhat_i^A
+	btSpatialForceVector *zeroAccSpatFrc = (btSpatialForceVector *)v_ptr;
+	v_ptr += num_links * 2 + 2;
+	//
+	// chat_i  (note NOT defined for the base)
+	btSpatialMotionVector *spatCoriolisAcc = (btSpatialMotionVector *)v_ptr;
+	v_ptr += num_links * 2;
+	//
+	// Ihat_i^A.
+	btSymmetricSpatialDyad *spatInertia = (btSymmetricSpatialDyad *)&scratch_m[num_links + 1];
+
+	// Cached 3x3 rotation matrices from parent frame to this frame.
+	btMatrix3x3 *rot_from_parent = &m_matrixBuf[0];
+	btMatrix3x3 *rot_from_world = &scratch_m[0];
+
+	// hhat_i, ahat_i
+	// hhat is NOT stored for the base (but ahat is)
+	btSpatialForceVector *h = (btSpatialForceVector *)(m_dofCount > 0 ? &m_vectorBuf[0] : 0);
+	btSpatialMotionVector *spatAcc = (btSpatialMotionVector *)v_ptr;
+	v_ptr += num_links * 2 + 2;
+	//
+	// Y_i, invD_i
+	btScalar *invD = m_dofCount > 0 ? &m_realBuf[6 + m_dofCount] : 0;
+	btScalar *Y = &scratch_r[0];
+	//
+	//aux variables
+	btSpatialMotionVector spatJointVel;         //spatial velocity due to the joint motion (i.e. without predecessors' influence)
+	btScalar D[36];                             //"D" matrix; it's dofxdof for each body so asingle 6x6 D matrix will do
+	btScalar invD_times_Y[6];                   //D^{-1} * Y [dofxdof x dofx1 = dofx1] <=> D^{-1} * u; better moved to buffers since it is recalced in calcAccelerationDeltasMultiDof; num_dof of btScalar would cover all bodies
+	btSpatialMotionVector result;               //holds results of the SolveImatrix op; it is a spatial motion vector (accel)
+	btScalar Y_minus_hT_a[6];                   //Y - h^{T} * a; it's dofx1 for each body so a single 6x1 temp is enough
+	btSpatialForceVector spatForceVecTemps[6];  //6 temporary spatial force vectors
+	btSpatialTransformationMatrix fromParent;   //spatial transform from parent to child
+	btSymmetricSpatialDyad dyadTemp;            //inertia matrix temp
+	btSpatialTransformationMatrix fromWorld;
+	fromWorld.m_trnVec.setZero();
+	/////////////////
+
+	// ptr to the joint accel part of the output
+	btScalar *joint_accel = output + 6;
+
+	// Start of the algorithm proper.
+
+	// First 'upward' loop.
+	// Combines CompTreeLinkVelocities and InitTreeLinks from Mirtich.
+
+	rot_from_parent[0] = btMatrix3x3(m_baseQuat);  //m_baseQuat assumed to be alias!?
+
+	//create the vector of spatial velocity of the base by transforming global-coor linear and angular velocities into base-local coordinates
+	spatVel[0].setVector(rot_from_parent[0] * base_omega, rot_from_parent[0] * base_vel);
+
+	if (isBaseStaticOrKinematic())
+	{
+		zeroAccSpatFrc[0].setZero();
+	}
+	else
+	{
+		const btVector3 &baseForce = isConstraintPass ? m_baseConstraintForce : m_baseForce;
+		const btVector3 &baseTorque = isConstraintPass ? m_baseConstraintTorque : m_baseTorque;
+		//external forces
+		zeroAccSpatFrc[0].setVector(-(rot_from_parent[0] * baseTorque), -(rot_from_parent[0] * baseForce));
+
+		//adding damping terms (only)
+		const btScalar linDampMult = 1., angDampMult = 1.;
+		zeroAccSpatFrc[0].addVector(angDampMult * m_baseInertia * spatVel[0].getAngular() * (DAMPING_K1_ANGULAR + DAMPING_K2_ANGULAR * spatVel[0].getAngular().safeNorm()),
+									linDampMult * m_baseMass * spatVel[0].getLinear() * (DAMPING_K1_LINEAR + DAMPING_K2_LINEAR * spatVel[0].getLinear().safeNorm()));
+
+		//
+		//p += vhat x Ihat vhat - done in a simpler way
+		if (m_useGyroTerm)
+			zeroAccSpatFrc[0].addAngular(spatVel[0].getAngular().cross(m_baseInertia * spatVel[0].getAngular()));
+		//
+		zeroAccSpatFrc[0].addLinear(m_baseMass * spatVel[0].getAngular().cross(spatVel[0].getLinear()));
+	}
+
+	//init the spatial AB inertia (it has the simple form thanks to choosing local body frames origins at their COMs)
+	spatInertia[0].setMatrix(btMatrix3x3(0, 0, 0, 0, 0, 0, 0, 0, 0),
+							 //
+							 btMatrix3x3(m_baseMass, 0, 0,
+										 0, m_baseMass, 0,
+										 0, 0, m_baseMass),
+							 //
+							 btMatrix3x3(m_baseInertia[0], 0, 0,
+										 0, m_baseInertia[1], 0,
+										 0, 0, m_baseInertia[2]));
+
+	rot_from_world[0] = rot_from_parent[0];
+
+	//
+	for (int i = 0; i < num_links; ++i)
+	{
+		const int parent = m_links[i].m_parent;
+		rot_from_parent[i + 1] = btMatrix3x3(m_links[i].m_cachedRotParentToThis);
+		rot_from_world[i + 1] = rot_from_parent[i + 1] * rot_from_world[parent + 1];
+
+		fromParent.m_rotMat = rot_from_parent[i + 1];
+		fromParent.m_trnVec = m_links[i].m_cachedRVector;
+		fromWorld.m_rotMat = rot_from_world[i + 1];
+		fromParent.transform(spatVel[parent + 1], spatVel[i + 1]);
+
+		// now set vhat_i to its true value by doing
+		// vhat_i += qidot * shat_i
+		if (!m_useGlobalVelocities)
+		{
+			spatJointVel.setZero();
+
+			for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+				spatJointVel += m_links[i].m_axes[dof] * getJointVelMultiDof(i)[dof];
+
+			// remember vhat_i is really vhat_p(i) (but in current frame) at this point	=> we need to add velocity across the inboard joint
+			spatVel[i + 1] += spatJointVel;
+
+			//
+			// vhat_i is vhat_p(i) transformed to local coors + the velocity across the i-th inboard joint
+			//spatVel[i+1] = fromParent * spatVel[parent+1] + spatJointVel;
+		}
+		else
+		{
+			fromWorld.transformRotationOnly(m_links[i].m_absFrameTotVelocity, spatVel[i + 1]);
+			fromWorld.transformRotationOnly(m_links[i].m_absFrameLocVelocity, spatJointVel);
+		}
+
+		// we can now calculate chat_i
+		spatVel[i + 1].cross(spatJointVel, spatCoriolisAcc[i]);
+
+		// calculate zhat_i^A
+		//
+		if (isLinkAndAllAncestorsKinematic(i))
+		{
+			zeroAccSpatFrc[i].setZero();
+		}
+		else{
+			//external forces
+			btVector3 linkAppliedForce = isConstraintPass ? m_links[i].m_appliedConstraintForce : m_links[i].m_appliedForce;
+			btVector3 linkAppliedTorque = isConstraintPass ? m_links[i].m_appliedConstraintTorque : m_links[i].m_appliedTorque;
+
+			zeroAccSpatFrc[i + 1].setVector(-(rot_from_world[i + 1] * linkAppliedTorque), -(rot_from_world[i + 1] * linkAppliedForce));
+
+#if 0	
+			{
+
+				b3Printf("stepVelocitiesMultiDof zeroAccSpatFrc[%d] linear:%f,%f,%f, angular:%f,%f,%f",
+				i+1,
+				zeroAccSpatFrc[i+1].m_topVec[0],
+				zeroAccSpatFrc[i+1].m_topVec[1],
+				zeroAccSpatFrc[i+1].m_topVec[2],
+
+				zeroAccSpatFrc[i+1].m_bottomVec[0],
+				zeroAccSpatFrc[i+1].m_bottomVec[1],
+				zeroAccSpatFrc[i+1].m_bottomVec[2]);
+			}
+#endif
+			//
+			//adding damping terms (only)
+			btScalar linDampMult = 1., angDampMult = 1.;
+			zeroAccSpatFrc[i + 1].addVector(angDampMult * m_links[i].m_inertiaLocal * spatVel[i + 1].getAngular() * (DAMPING_K1_ANGULAR + DAMPING_K2_ANGULAR * spatVel[i + 1].getAngular().safeNorm()),
+											linDampMult * m_links[i].m_mass * spatVel[i + 1].getLinear() * (DAMPING_K1_LINEAR + DAMPING_K2_LINEAR * spatVel[i + 1].getLinear().safeNorm()));
+			//p += vhat x Ihat vhat - done in a simpler way
+			if (m_useGyroTerm)
+				zeroAccSpatFrc[i + 1].addAngular(spatVel[i + 1].getAngular().cross(m_links[i].m_inertiaLocal * spatVel[i + 1].getAngular()));
+			//
+			zeroAccSpatFrc[i + 1].addLinear(m_links[i].m_mass * spatVel[i + 1].getAngular().cross(spatVel[i + 1].getLinear()));
+			//
+			//btVector3 temp = m_links[i].m_mass * spatVel[i+1].getAngular().cross(spatVel[i+1].getLinear());
+			////clamp parent's omega
+			//btScalar parOmegaMod = temp.length();
+			//btScalar parOmegaModMax = 1000;
+			//if(parOmegaMod > parOmegaModMax)
+			//	temp *= parOmegaModMax / parOmegaMod;
+			//zeroAccSpatFrc[i+1].addLinear(temp);
+			//printf("|zeroAccSpatFrc[%d]| = %.4f\n", i+1, temp.length());
+			//temp = spatCoriolisAcc[i].getLinear();
+			//printf("|spatCoriolisAcc[%d]| = %.4f\n", i+1, temp.length());
+		}
+
+		// calculate Ihat_i^A
+		//init the spatial AB inertia (it has the simple form thanks to choosing local body frames origins at their COMs)
+		spatInertia[i + 1].setMatrix(btMatrix3x3(0, 0, 0, 0, 0, 0, 0, 0, 0),
+									 //
+									 btMatrix3x3(m_links[i].m_mass, 0, 0,
+												 0, m_links[i].m_mass, 0,
+												 0, 0, m_links[i].m_mass),
+									 //
+									 btMatrix3x3(m_links[i].m_inertiaLocal[0], 0, 0,
+												 0, m_links[i].m_inertiaLocal[1], 0,
+												 0, 0, m_links[i].m_inertiaLocal[2]));
+
+		//printf("w[%d] = [%.4f %.4f %.4f]\n", i, vel_top_angular[i+1].x(), vel_top_angular[i+1].y(), vel_top_angular[i+1].z());
+		//printf("v[%d] = [%.4f %.4f %.4f]\n", i, vel_bottom_linear[i+1].x(), vel_bottom_linear[i+1].y(), vel_bottom_linear[i+1].z());
+		//printf("c[%d] = [%.4f %.4f %.4f]\n", i, coriolis_bottom_linear[i].x(), coriolis_bottom_linear[i].y(), coriolis_bottom_linear[i].z());
+	}
+
+	// 'Downward' loop.
+	// (part of TreeForwardDynamics in Mirtich.)
+	for (int i = num_links - 1; i >= 0; --i)
+	{
+		if(isLinkAndAllAncestorsKinematic(i))
+			continue;
+		const int parent = m_links[i].m_parent;
+		fromParent.m_rotMat = rot_from_parent[i + 1];
+		fromParent.m_trnVec = m_links[i].m_cachedRVector;
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof];
+			//
+			hDof = spatInertia[i + 1] * m_links[i].m_axes[dof];
+			//
+			Y[m_links[i].m_dofOffset + dof] = m_links[i].m_jointTorque[dof] - m_links[i].m_axes[dof].dot(zeroAccSpatFrc[i + 1]) - spatCoriolisAcc[i].dot(hDof);
+		}
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			btScalar *D_row = &D[dof * m_links[i].m_dofCount];
+			for (int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2)
+			{
+				const btSpatialForceVector &hDof2 = h[m_links[i].m_dofOffset + dof2];
+				D_row[dof2] = m_links[i].m_axes[dof].dot(hDof2);
+			}
+		}
+
+		btScalar *invDi = &invD[m_links[i].m_dofOffset * m_links[i].m_dofOffset];
+		switch (m_links[i].m_jointType)
+		{
+			case btMultibodyLink::ePrismatic:
+			case btMultibodyLink::eRevolute:
+			{
+				if (D[0] >= SIMD_EPSILON)
+				{
+					invDi[0] = 1.0f / D[0];
+				}
+				else
+				{
+					invDi[0] = 0;
+				}
+				break;
+			}
+			case btMultibodyLink::eSpherical:
+			case btMultibodyLink::ePlanar:
+			{
+				const btMatrix3x3 D3x3(D[0], D[1], D[2], D[3], D[4], D[5], D[6], D[7], D[8]);
+				const btMatrix3x3 invD3x3(D3x3.inverse());
+
+				//unroll the loop?
+				for (int row = 0; row < 3; ++row)
+				{
+					for (int col = 0; col < 3; ++col)
+					{
+						invDi[row * 3 + col] = invD3x3[row][col];
+					}
+				}
+
+				break;
+			}
+			default:
+			{
+			}
+		}
+
+		//determine h*D^{-1}
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			spatForceVecTemps[dof].setZero();
+
+			for (int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2)
+			{
+				const btSpatialForceVector &hDof2 = h[m_links[i].m_dofOffset + dof2];
+				//
+				spatForceVecTemps[dof] += hDof2 * invDi[dof2 * m_links[i].m_dofCount + dof];
+			}
+		}
+
+		dyadTemp = spatInertia[i + 1];
+
+		//determine (h*D^{-1}) * h^{T}
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			const btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof];
+			//
+			dyadTemp -= symmetricSpatialOuterProduct(hDof, spatForceVecTemps[dof]);
+		}
+
+		fromParent.transformInverse(dyadTemp, spatInertia[parent + 1], btSpatialTransformationMatrix::Add);
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			invD_times_Y[dof] = 0.f;
+
+			for (int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2)
+			{
+				invD_times_Y[dof] += invDi[dof * m_links[i].m_dofCount + dof2] * Y[m_links[i].m_dofOffset + dof2];
+			}
+		}
+
+		spatForceVecTemps[0] = zeroAccSpatFrc[i + 1] + spatInertia[i + 1] * spatCoriolisAcc[i];
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			const btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof];
+			//
+			spatForceVecTemps[0] += hDof * invD_times_Y[dof];
+		}
+
+		fromParent.transformInverse(spatForceVecTemps[0], spatForceVecTemps[1]);
+
+		zeroAccSpatFrc[parent + 1] += spatForceVecTemps[1];
+	}
+
+	// Second 'upward' loop
+	// (part of TreeForwardDynamics in Mirtich)
+
+	if (isBaseStaticOrKinematic())
+	{
+		spatAcc[0].setZero();
+	}
+	else
+	{
+		if (num_links > 0)
+		{
+			m_cachedInertiaValid = true;
+			m_cachedInertiaTopLeft = spatInertia[0].m_topLeftMat;
+			m_cachedInertiaTopRight = spatInertia[0].m_topRightMat;
+			m_cachedInertiaLowerLeft = spatInertia[0].m_bottomLeftMat;
+			m_cachedInertiaLowerRight = spatInertia[0].m_topLeftMat.transpose();
+		}
+
+		solveImatrix(zeroAccSpatFrc[0], result);
+		spatAcc[0] = -result;
+	}
+
+	// now do the loop over the m_links
+	for (int i = 0; i < num_links; ++i)
+	{
+		//	qdd = D^{-1} * (Y - h^{T}*apar) = (S^{T}*I*S)^{-1} * (tau - S^{T}*I*cor - S^{T}*zeroAccFrc - S^{T}*I*apar)
+		//	a = apar + cor + Sqdd
+		//or
+		//	qdd = D^{-1} * (Y - h^{T}*(apar+cor))
+		//	a = apar + Sqdd
+
+		const int parent = m_links[i].m_parent;
+		fromParent.m_rotMat = rot_from_parent[i + 1];
+		fromParent.m_trnVec = m_links[i].m_cachedRVector;
+
+		fromParent.transform(spatAcc[parent + 1], spatAcc[i + 1]);
+
+		if(!isLinkAndAllAncestorsKinematic(i))
+		{
+			for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+			{
+				const btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof];
+				//
+				Y_minus_hT_a[dof] = Y[m_links[i].m_dofOffset + dof] - spatAcc[i + 1].dot(hDof);
+			}
+			btScalar *invDi = &invD[m_links[i].m_dofOffset * m_links[i].m_dofOffset];
+			//D^{-1} * (Y - h^{T}*apar)
+			mulMatrix(invDi, Y_minus_hT_a, m_links[i].m_dofCount, m_links[i].m_dofCount, m_links[i].m_dofCount, 1, &joint_accel[m_links[i].m_dofOffset]);
+
+			spatAcc[i + 1] += spatCoriolisAcc[i];
+
+			for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+				spatAcc[i + 1] += m_links[i].m_axes[dof] * joint_accel[m_links[i].m_dofOffset + dof];
+		}
+
+		if (m_links[i].m_jointFeedback)
+		{
+			m_internalNeedsJointFeedback = true;
+
+			btVector3 angularBotVec = (spatInertia[i + 1] * spatAcc[i + 1] + zeroAccSpatFrc[i + 1]).m_bottomVec;
+			btVector3 linearTopVec = (spatInertia[i + 1] * spatAcc[i + 1] + zeroAccSpatFrc[i + 1]).m_topVec;
+
+			if (jointFeedbackInJointFrame)
+			{
+				//shift the reaction forces to the joint frame
+				//linear (force) component is the same
+				//shift the angular (torque, moment) component using the relative position,  m_links[i].m_dVector
+				angularBotVec = angularBotVec - linearTopVec.cross(m_links[i].m_dVector);
+			}
+
+			if (jointFeedbackInWorldSpace)
+			{
+				if (isConstraintPass)
+				{
+					m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec += m_links[i].m_cachedWorldTransform.getBasis() * angularBotVec;
+					m_links[i].m_jointFeedback->m_reactionForces.m_topVec += m_links[i].m_cachedWorldTransform.getBasis() * linearTopVec;
+				}
+				else
+				{
+					m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec = m_links[i].m_cachedWorldTransform.getBasis() * angularBotVec;
+					m_links[i].m_jointFeedback->m_reactionForces.m_topVec = m_links[i].m_cachedWorldTransform.getBasis() * linearTopVec;
+				}
+			}
+			else
+			{
+				if (isConstraintPass)
+				{
+					m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec += angularBotVec;
+					m_links[i].m_jointFeedback->m_reactionForces.m_topVec += linearTopVec;
+				}
+				else
+				{
+					m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec = angularBotVec;
+					m_links[i].m_jointFeedback->m_reactionForces.m_topVec = linearTopVec;
+				}
+			}
+		}
+	}
+
+	// transform base accelerations back to the world frame.
+	const btVector3 omegadot_out = rot_from_parent[0].transpose() * spatAcc[0].getAngular();
+	output[0] = omegadot_out[0];
+	output[1] = omegadot_out[1];
+	output[2] = omegadot_out[2];
+
+	const btVector3 vdot_out = rot_from_parent[0].transpose() * (spatAcc[0].getLinear() + spatVel[0].getAngular().cross(spatVel[0].getLinear()));
+	output[3] = vdot_out[0];
+	output[4] = vdot_out[1];
+	output[5] = vdot_out[2];
+
+	/////////////////
+	//printf("q = [");
+	//printf("%.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f ", m_baseQuat.x(), m_baseQuat.y(), m_baseQuat.z(), m_baseQuat.w(), m_basePos.x(), m_basePos.y(), m_basePos.z());
+	//for(int link = 0; link < getNumLinks(); ++link)
+	//	for(int dof = 0; dof < m_links[link].m_dofCount; ++dof)
+	//		printf("%.6f ", m_links[link].m_jointPos[dof]);
+	//printf("]\n");
+	////
+	//printf("qd = [");
+	//for(int dof = 0; dof < getNumDofs() + 6; ++dof)
+	//	printf("%.6f ", m_realBuf[dof]);
+	//printf("]\n");
+	//printf("qdd = [");
+	//for(int dof = 0; dof < getNumDofs() + 6; ++dof)
+	//	printf("%.6f ", output[dof]);
+	//printf("]\n");
+	/////////////////
+
+	// Final step: add the accelerations (times dt) to the velocities.
+
+	if (!isConstraintPass)
+	{
+		if (dt > 0.)
+			applyDeltaVeeMultiDof(output, dt);
+	}
+	/////
+	//btScalar angularThres = 1;
+	//btScalar maxAngVel = 0.;
+	//bool scaleDown = 1.;
+	//for(int link = 0; link < m_links.size(); ++link)
+	//{
+	//	if(spatVel[link+1].getAngular().length() > maxAngVel)
+	//	{
+	//		maxAngVel = spatVel[link+1].getAngular().length();
+	//		scaleDown = angularThres / spatVel[link+1].getAngular().length();
+	//		break;
+	//	}
+	//}
+
+	//if(scaleDown != 1.)
+	//{
+	//	for(int link = 0; link < m_links.size(); ++link)
+	//	{
+	//		if(m_links[link].m_jointType == btMultibodyLink::eRevolute || m_links[link].m_jointType == btMultibodyLink::eSpherical)
+	//		{
+	//			for(int dof = 0; dof < m_links[link].m_dofCount; ++dof)
+	//				getJointVelMultiDof(link)[dof] *= scaleDown;
+	//		}
+	//	}
+	//}
+	/////
+
+	/////////////////////
+	if (m_useGlobalVelocities)
+	{
+		for (int i = 0; i < num_links; ++i)
+		{
+			const int parent = m_links[i].m_parent;
+			//rot_from_parent[i+1] = btMatrix3x3(m_links[i].m_cachedRotParentToThis);    /// <- done
+			//rot_from_world[i+1] = rot_from_parent[i+1] * rot_from_world[parent+1];		/// <- done
+
+			fromParent.m_rotMat = rot_from_parent[i + 1];
+			fromParent.m_trnVec = m_links[i].m_cachedRVector;
+			fromWorld.m_rotMat = rot_from_world[i + 1];
+
+			// vhat_i = i_xhat_p(i) * vhat_p(i)
+			fromParent.transform(spatVel[parent + 1], spatVel[i + 1]);
+			//nice alternative below (using operator *) but it generates temps
+			/////////////////////////////////////////////////////////////
+
+			// now set vhat_i to its true value by doing
+			// vhat_i += qidot * shat_i
+			spatJointVel.setZero();
+
+			for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+				spatJointVel += m_links[i].m_axes[dof] * getJointVelMultiDof(i)[dof];
+
+			// remember vhat_i is really vhat_p(i) (but in current frame) at this point	=> we need to add velocity across the inboard joint
+			spatVel[i + 1] += spatJointVel;
+
+			fromWorld.transformInverseRotationOnly(spatVel[i + 1], m_links[i].m_absFrameTotVelocity);
+			fromWorld.transformInverseRotationOnly(spatJointVel, m_links[i].m_absFrameLocVelocity);
+		}
+	}
+}
+
+void btMultiBody::solveImatrix(const btVector3 &rhs_top, const btVector3 &rhs_bot, btScalar result[6]) const
+{
+	int num_links = getNumLinks();
+	///solve I * x = rhs, so the result = invI * rhs
+	if (num_links == 0)
+	{
+		// in the case of 0 m_links (i.e. a plain rigid body, not a multibody) rhs * invI is easier
+
+		if ((m_baseInertia[0] >= SIMD_EPSILON) && (m_baseInertia[1] >= SIMD_EPSILON) && (m_baseInertia[2] >= SIMD_EPSILON))
+		{
+			result[0] = rhs_bot[0] / m_baseInertia[0];
+			result[1] = rhs_bot[1] / m_baseInertia[1];
+			result[2] = rhs_bot[2] / m_baseInertia[2];
+		}
+		else
+		{
+			result[0] = 0;
+			result[1] = 0;
+			result[2] = 0;
+		}
+		if (m_baseMass >= SIMD_EPSILON)
+		{
+			result[3] = rhs_top[0] / m_baseMass;
+			result[4] = rhs_top[1] / m_baseMass;
+			result[5] = rhs_top[2] / m_baseMass;
+		}
+		else
+		{
+			result[3] = 0;
+			result[4] = 0;
+			result[5] = 0;
+		}
+	}
+	else
+	{
+		if (!m_cachedInertiaValid)
+		{
+			for (int i = 0; i < 6; i++)
+			{
+				result[i] = 0.f;
+			}
+			return;
+		}
+		/// Special routine for calculating the inverse of a spatial inertia matrix
+		///the 6x6 matrix is stored as 4 blocks of 3x3 matrices
+		btMatrix3x3 Binv = m_cachedInertiaTopRight.inverse() * -1.f;
+		btMatrix3x3 tmp = m_cachedInertiaLowerRight * Binv;
+		btMatrix3x3 invIupper_right = (tmp * m_cachedInertiaTopLeft + m_cachedInertiaLowerLeft).inverse();
+		tmp = invIupper_right * m_cachedInertiaLowerRight;
+		btMatrix3x3 invI_upper_left = (tmp * Binv);
+		btMatrix3x3 invI_lower_right = (invI_upper_left).transpose();
+		tmp = m_cachedInertiaTopLeft * invI_upper_left;
+		tmp[0][0] -= 1.0;
+		tmp[1][1] -= 1.0;
+		tmp[2][2] -= 1.0;
+		btMatrix3x3 invI_lower_left = (Binv * tmp);
+
+		//multiply result = invI * rhs
+		{
+			btVector3 vtop = invI_upper_left * rhs_top;
+			btVector3 tmp;
+			tmp = invIupper_right * rhs_bot;
+			vtop += tmp;
+			btVector3 vbot = invI_lower_left * rhs_top;
+			tmp = invI_lower_right * rhs_bot;
+			vbot += tmp;
+			result[0] = vtop[0];
+			result[1] = vtop[1];
+			result[2] = vtop[2];
+			result[3] = vbot[0];
+			result[4] = vbot[1];
+			result[5] = vbot[2];
+		}
+	}
+}
+void btMultiBody::solveImatrix(const btSpatialForceVector &rhs, btSpatialMotionVector &result) const
+{
+	int num_links = getNumLinks();
+	///solve I * x = rhs, so the result = invI * rhs
+	if (num_links == 0)
+	{
+		// in the case of 0 m_links (i.e. a plain rigid body, not a multibody) rhs * invI is easier
+		if ((m_baseInertia[0] >= SIMD_EPSILON) && (m_baseInertia[1] >= SIMD_EPSILON) && (m_baseInertia[2] >= SIMD_EPSILON))
+		{
+			result.setAngular(rhs.getAngular() / m_baseInertia);
+		}
+		else
+		{
+			result.setAngular(btVector3(0, 0, 0));
+		}
+		if (m_baseMass >= SIMD_EPSILON)
+		{
+			result.setLinear(rhs.getLinear() / m_baseMass);
+		}
+		else
+		{
+			result.setLinear(btVector3(0, 0, 0));
+		}
+	}
+	else
+	{
+		/// Special routine for calculating the inverse of a spatial inertia matrix
+		///the 6x6 matrix is stored as 4 blocks of 3x3 matrices
+		if (!m_cachedInertiaValid)
+		{
+			result.setLinear(btVector3(0, 0, 0));
+			result.setAngular(btVector3(0, 0, 0));
+			result.setVector(btVector3(0, 0, 0), btVector3(0, 0, 0));
+			return;
+		}
+		btMatrix3x3 Binv = m_cachedInertiaTopRight.inverse() * -1.f;
+		btMatrix3x3 tmp = m_cachedInertiaLowerRight * Binv;
+		btMatrix3x3 invIupper_right = (tmp * m_cachedInertiaTopLeft + m_cachedInertiaLowerLeft).inverse();
+		tmp = invIupper_right * m_cachedInertiaLowerRight;
+		btMatrix3x3 invI_upper_left = (tmp * Binv);
+		btMatrix3x3 invI_lower_right = (invI_upper_left).transpose();
+		tmp = m_cachedInertiaTopLeft * invI_upper_left;
+		tmp[0][0] -= 1.0;
+		tmp[1][1] -= 1.0;
+		tmp[2][2] -= 1.0;
+		btMatrix3x3 invI_lower_left = (Binv * tmp);
+
+		//multiply result = invI * rhs
+		{
+			btVector3 vtop = invI_upper_left * rhs.getLinear();
+			btVector3 tmp;
+			tmp = invIupper_right * rhs.getAngular();
+			vtop += tmp;
+			btVector3 vbot = invI_lower_left * rhs.getLinear();
+			tmp = invI_lower_right * rhs.getAngular();
+			vbot += tmp;
+			result.setVector(vtop, vbot);
+		}
+	}
+}
+
+void btMultiBody::mulMatrix(const btScalar *pA, const btScalar *pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const
+{
+	for (int row = 0; row < rowsA; row++)
+	{
+		for (int col = 0; col < colsB; col++)
+		{
+			pC[row * colsB + col] = 0.f;
+			for (int inner = 0; inner < rowsB; inner++)
+			{
+				pC[row * colsB + col] += pA[row * colsA + inner] * pB[col + inner * colsB];
+			}
+		}
+	}
+}
+
+void btMultiBody::calcAccelerationDeltasMultiDof(const btScalar *force, btScalar *output,
+												 btAlignedObjectArray<btScalar> &scratch_r, btAlignedObjectArray<btVector3> &scratch_v) const
+{
+	// Temporary matrices/vectors -- use scratch space from caller
+	// so that we don't have to keep reallocating every frame
+
+	int num_links = getNumLinks();
+	scratch_r.resize(m_dofCount);
+	scratch_v.resize(4 * num_links + 4);
+
+	btScalar *r_ptr = m_dofCount ? &scratch_r[0] : 0;
+	btVector3 *v_ptr = &scratch_v[0];
+
+	// zhat_i^A (scratch space)
+	btSpatialForceVector *zeroAccSpatFrc = (btSpatialForceVector *)v_ptr;
+	v_ptr += num_links * 2 + 2;
+
+	// rot_from_parent (cached from calcAccelerations)
+	const btMatrix3x3 *rot_from_parent = &m_matrixBuf[0];
+
+	// hhat (cached), accel (scratch)
+	// hhat is NOT stored for the base (but ahat is)
+	const btSpatialForceVector *h = (btSpatialForceVector *)(m_dofCount > 0 ? &m_vectorBuf[0] : 0);
+	btSpatialMotionVector *spatAcc = (btSpatialMotionVector *)v_ptr;
+	v_ptr += num_links * 2 + 2;
+
+	// Y_i (scratch), invD_i (cached)
+	const btScalar *invD = m_dofCount > 0 ? &m_realBuf[6 + m_dofCount] : 0;
+	btScalar *Y = r_ptr;
+	////////////////
+	//aux variables
+	btScalar invD_times_Y[6];                   //D^{-1} * Y [dofxdof x dofx1 = dofx1] <=> D^{-1} * u; better moved to buffers since it is recalced in calcAccelerationDeltasMultiDof; num_dof of btScalar would cover all bodies
+	btSpatialMotionVector result;               //holds results of the SolveImatrix op; it is a spatial motion vector (accel)
+	btScalar Y_minus_hT_a[6];                   //Y - h^{T} * a; it's dofx1 for each body so a single 6x1 temp is enough
+	btSpatialForceVector spatForceVecTemps[6];  //6 temporary spatial force vectors
+	btSpatialTransformationMatrix fromParent;
+	/////////////////
+
+	// First 'upward' loop.
+	// Combines CompTreeLinkVelocities and InitTreeLinks from Mirtich.
+
+	// Fill in zero_acc
+	// -- set to force/torque on the base, zero otherwise
+	if (isBaseStaticOrKinematic())
+	{
+		zeroAccSpatFrc[0].setZero();
+	}
+	else
+	{
+		//test forces
+		fromParent.m_rotMat = rot_from_parent[0];
+		fromParent.transformRotationOnly(btSpatialForceVector(-force[0], -force[1], -force[2], -force[3], -force[4], -force[5]), zeroAccSpatFrc[0]);
+	}
+	for (int i = 0; i < num_links; ++i)
+	{
+		zeroAccSpatFrc[i + 1].setZero();
+	}
+
+	// 'Downward' loop.
+	// (part of TreeForwardDynamics in Mirtich.)
+	for (int i = num_links - 1; i >= 0; --i)
+	{
+		if(isLinkAndAllAncestorsKinematic(i))
+			continue;
+		const int parent = m_links[i].m_parent;
+		fromParent.m_rotMat = rot_from_parent[i + 1];
+		fromParent.m_trnVec = m_links[i].m_cachedRVector;
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			Y[m_links[i].m_dofOffset + dof] = force[6 + m_links[i].m_dofOffset + dof] - m_links[i].m_axes[dof].dot(zeroAccSpatFrc[i + 1]);
+		}
+
+		btVector3 in_top, in_bottom, out_top, out_bottom;
+		const btScalar *invDi = &invD[m_links[i].m_dofOffset * m_links[i].m_dofOffset];
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			invD_times_Y[dof] = 0.f;
+
+			for (int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2)
+			{
+				invD_times_Y[dof] += invDi[dof * m_links[i].m_dofCount + dof2] * Y[m_links[i].m_dofOffset + dof2];
+			}
+		}
+
+		// Zp += pXi * (Zi + hi*Yi/Di)
+		spatForceVecTemps[0] = zeroAccSpatFrc[i + 1];
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			const btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof];
+			//
+			spatForceVecTemps[0] += hDof * invD_times_Y[dof];
+		}
+
+		fromParent.transformInverse(spatForceVecTemps[0], spatForceVecTemps[1]);
+
+		zeroAccSpatFrc[parent + 1] += spatForceVecTemps[1];
+	}
+
+	// ptr to the joint accel part of the output
+	btScalar *joint_accel = output + 6;
+
+	// Second 'upward' loop
+	// (part of TreeForwardDynamics in Mirtich)
+
+	if (isBaseStaticOrKinematic())
+	{
+		spatAcc[0].setZero();
+	}
+	else
+	{
+		solveImatrix(zeroAccSpatFrc[0], result);
+		spatAcc[0] = -result;
+	}
+
+	// now do the loop over the m_links
+	for (int i = 0; i < num_links; ++i)
+	{
+		if(isLinkAndAllAncestorsKinematic(i))
+			continue;
+		const int parent = m_links[i].m_parent;
+		fromParent.m_rotMat = rot_from_parent[i + 1];
+		fromParent.m_trnVec = m_links[i].m_cachedRVector;
+
+		fromParent.transform(spatAcc[parent + 1], spatAcc[i + 1]);
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+		{
+			const btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof];
+			//
+			Y_minus_hT_a[dof] = Y[m_links[i].m_dofOffset + dof] - spatAcc[i + 1].dot(hDof);
+		}
+
+		const btScalar *invDi = &invD[m_links[i].m_dofOffset * m_links[i].m_dofOffset];
+		mulMatrix(const_cast<btScalar *>(invDi), Y_minus_hT_a, m_links[i].m_dofCount, m_links[i].m_dofCount, m_links[i].m_dofCount, 1, &joint_accel[m_links[i].m_dofOffset]);
+
+		for (int dof = 0; dof < m_links[i].m_dofCount; ++dof)
+			spatAcc[i + 1] += m_links[i].m_axes[dof] * joint_accel[m_links[i].m_dofOffset + dof];
+	}
+
+	// transform base accelerations back to the world frame.
+	btVector3 omegadot_out;
+	omegadot_out = rot_from_parent[0].transpose() * spatAcc[0].getAngular();
+	output[0] = omegadot_out[0];
+	output[1] = omegadot_out[1];
+	output[2] = omegadot_out[2];
+
+	btVector3 vdot_out;
+	vdot_out = rot_from_parent[0].transpose() * spatAcc[0].getLinear();
+	output[3] = vdot_out[0];
+	output[4] = vdot_out[1];
+	output[5] = vdot_out[2];
+
+	/////////////////
+	//printf("delta = [");
+	//for(int dof = 0; dof < getNumDofs() + 6; ++dof)
+	//	printf("%.2f ", output[dof]);
+	//printf("]\n");
+	/////////////////
+}
+void btMultiBody::predictPositionsMultiDof(btScalar dt)
+{
+    int num_links = getNumLinks();
+		if(!isBaseKinematic())
+		{
+      // step position by adding dt * velocity
+      //btVector3 v = getBaseVel();
+      //m_basePos += dt * v;
+      //
+      btScalar *pBasePos;
+      btScalar *pBaseVel = &m_realBuf[3];  //note: the !pqd case assumes m_realBuf holds with base velocity at 3,4,5 (should be wrapped for safety)
+    
+    	// reset to current position
+    	for (int i = 0; i < 3; ++i)
+    	{
+    	    m_basePos_interpolate[i] = m_basePos[i];
+    	}
+    	pBasePos = m_basePos_interpolate;
+    	
+    	pBasePos[0] += dt * pBaseVel[0];
+    	pBasePos[1] += dt * pBaseVel[1];
+    	pBasePos[2] += dt * pBaseVel[2];
+		}
+    
+    ///////////////////////////////
+    //local functor for quaternion integration (to avoid error prone redundancy)
+    struct
+    {
+        //"exponential map" based on btTransformUtil::integrateTransform(..)
+        void operator()(const btVector3 &omega, btQuaternion &quat, bool baseBody, btScalar dt)
+        {
+            //baseBody    =>    quat is alias and omega is global coor
+            //!baseBody    =>    quat is alibi and omega is local coor
+            
+            btVector3 axis;
+            btVector3 angvel;
+            
+            if (!baseBody)
+                angvel = quatRotate(quat, omega);  //if quat is not m_baseQuat, it is alibi => ok
+            else
+                angvel = omega;
+            
+            btScalar fAngle = angvel.length();
+            //limit the angular motion
+            if (fAngle * dt > ANGULAR_MOTION_THRESHOLD)
+            {
+                fAngle = btScalar(0.5) * SIMD_HALF_PI / dt;
+            }
+            
+            if (fAngle < btScalar(0.001))
+            {
+                // use Taylor's expansions of sync function
+                axis = angvel * (btScalar(0.5) * dt - (dt * dt * dt) * (btScalar(0.020833333333)) * fAngle * fAngle);
+            }
+            else
+            {
+                // sync(fAngle) = sin(c*fAngle)/t
+                axis = angvel * (btSin(btScalar(0.5) * fAngle * dt) / fAngle);
+            }
+            
+            if (!baseBody)
+                quat = btQuaternion(axis.x(), axis.y(), axis.z(), btCos(fAngle * dt * btScalar(0.5))) * quat;
+            else
+                quat = quat * btQuaternion(-axis.x(), -axis.y(), -axis.z(), btCos(fAngle * dt * btScalar(0.5)));
+            //equivalent to: quat = (btQuaternion(axis.x(),axis.y(),axis.z(),btCos( fAngle*dt*btScalar(0.5) )) * quat.inverse()).inverse();
+            
+            quat.normalize();
+        }
+    } pQuatUpdateFun;
+    ///////////////////////////////
+    
+    //pQuatUpdateFun(getBaseOmega(), m_baseQuat, true, dt);
+    //
+		if(!isBaseKinematic())
+		{
+        btScalar *pBaseQuat;
+
+        // reset to current orientation
+        for (int i = 0; i < 4; ++i)
+        {
+            m_baseQuat_interpolate[i] = m_baseQuat[i];
+        }
+        pBaseQuat = m_baseQuat_interpolate;
+
+        btScalar *pBaseOmega = &m_realBuf[0];  //note: the !pqd case assumes m_realBuf starts with base omega (should be wrapped for safety)
+        //
+        btQuaternion baseQuat;
+        baseQuat.setValue(pBaseQuat[0], pBaseQuat[1], pBaseQuat[2], pBaseQuat[3]);
+        btVector3 baseOmega;
+        baseOmega.setValue(pBaseOmega[0], pBaseOmega[1], pBaseOmega[2]);
+        pQuatUpdateFun(baseOmega, baseQuat, true, dt);
+        pBaseQuat[0] = baseQuat.x();
+        pBaseQuat[1] = baseQuat.y();
+        pBaseQuat[2] = baseQuat.z();
+        pBaseQuat[3] = baseQuat.w();
+		}
+
+    // Finally we can update m_jointPos for each of the m_links
+    for (int i = 0; i < num_links; ++i)
+    {
+        btScalar *pJointPos;
+        pJointPos = &m_links[i].m_jointPos_interpolate[0];
+        
+        if (m_links[i].m_collider && m_links[i].m_collider->isStaticOrKinematic()) 
+		{
+            switch (m_links[i].m_jointType) 
+						{
+                case btMultibodyLink::ePrismatic:
+                case btMultibodyLink::eRevolute:
+                {
+                    pJointPos[0] = m_links[i].m_jointPos[0];
+                    break;
+                }
+                case btMultibodyLink::eSpherical:
+                {
+                    for (int j = 0; j < 4; ++j)
+                    {
+                        pJointPos[j] = m_links[i].m_jointPos[j];
+                    }
+                    break;
+                }
+                case btMultibodyLink::ePlanar:
+                {
+                    for (int j = 0; j < 3; ++j)
+                    {
+                        pJointPos[j] = m_links[i].m_jointPos[j];
+                    }
+                    break;
+                }
+                default:
+                   break;
+            }
+        }
+        else
+        {
+            btScalar *pJointVel = getJointVelMultiDof(i); 
+
+            switch (m_links[i].m_jointType)
+            {
+                case btMultibodyLink::ePrismatic:
+                case btMultibodyLink::eRevolute:
+                {
+                    //reset to current pos
+                    pJointPos[0] = m_links[i].m_jointPos[0];
+                    btScalar jointVel = pJointVel[0];
+                    pJointPos[0] += dt * jointVel;
+                    break;
+                }
+                case btMultibodyLink::eSpherical:
+                {
+                    //reset to current pos
+
+                    for (int j = 0; j < 4; ++j)
+                    {
+                        pJointPos[j] = m_links[i].m_jointPos[j];
+                    }
+                    
+                    btVector3 jointVel;
+                    jointVel.setValue(pJointVel[0], pJointVel[1], pJointVel[2]);
+                    btQuaternion jointOri;
+                    jointOri.setValue(pJointPos[0], pJointPos[1], pJointPos[2], pJointPos[3]);
+                    pQuatUpdateFun(jointVel, jointOri, false, dt);
+                    pJointPos[0] = jointOri.x();
+                    pJointPos[1] = jointOri.y();
+                    pJointPos[2] = jointOri.z();
+                    pJointPos[3] = jointOri.w();
+                    break;
+                }
+                case btMultibodyLink::ePlanar:
+                {
+                    for (int j = 0; j < 3; ++j)
+                    {
+                        pJointPos[j] = m_links[i].m_jointPos[j];
+                    }
+                    pJointPos[0] += dt * getJointVelMultiDof(i)[0];
+                    
+                    btVector3 q0_coors_qd1qd2 = getJointVelMultiDof(i)[1] * m_links[i].getAxisBottom(1) + getJointVelMultiDof(i)[2] * m_links[i].getAxisBottom(2);
+                    btVector3 no_q0_coors_qd1qd2 = quatRotate(btQuaternion(m_links[i].getAxisTop(0), pJointPos[0]), q0_coors_qd1qd2);
+                    pJointPos[1] += m_links[i].getAxisBottom(1).dot(no_q0_coors_qd1qd2) * dt;
+                    pJointPos[2] += m_links[i].getAxisBottom(2).dot(no_q0_coors_qd1qd2) * dt;
+                    break;
+                }
+                default:
+                {
+                }
+            }
+        }
+        
+        m_links[i].updateInterpolationCacheMultiDof();
+    }
+}
+
+void btMultiBody::stepPositionsMultiDof(btScalar dt, btScalar *pq, btScalar *pqd)
+{
+	int num_links = getNumLinks();
+	if(!isBaseKinematic())
+	{
+		// step position by adding dt * velocity
+		//btVector3 v = getBaseVel();
+		//m_basePos += dt * v;
+		//
+  	  btScalar *pBasePos = (pq ? &pq[4] : m_basePos);
+  	  btScalar *pBaseVel = (pqd ? &pqd[3] : &m_realBuf[3]);  //note: the !pqd case assumes m_realBuf holds with base velocity at 3,4,5 (should be wrapped for safety)
+  	  
+		pBasePos[0] += dt * pBaseVel[0];
+		pBasePos[1] += dt * pBaseVel[1];
+		pBasePos[2] += dt * pBaseVel[2];
+	}
+
+	///////////////////////////////
+	//local functor for quaternion integration (to avoid error prone redundancy)
+	struct
+	{
+		//"exponential map" based on btTransformUtil::integrateTransform(..)
+		void operator()(const btVector3 &omega, btQuaternion &quat, bool baseBody, btScalar dt)
+		{
+			//baseBody	=>	quat is alias and omega is global coor
+			//!baseBody	=>	quat is alibi and omega is local coor
+
+			btVector3 axis;
+			btVector3 angvel;
+
+			if (!baseBody)
+				angvel = quatRotate(quat, omega);  //if quat is not m_baseQuat, it is alibi => ok
+			else
+				angvel = omega;
+
+			btScalar fAngle = angvel.length();
+			//limit the angular motion
+			if (fAngle * dt > ANGULAR_MOTION_THRESHOLD)
+			{
+				fAngle = btScalar(0.5) * SIMD_HALF_PI / dt;
+			}
+
+			if (fAngle < btScalar(0.001))
+			{
+				// use Taylor's expansions of sync function
+				axis = angvel * (btScalar(0.5) * dt - (dt * dt * dt) * (btScalar(0.020833333333)) * fAngle * fAngle);
+			}
+			else
+			{
+				// sync(fAngle) = sin(c*fAngle)/t
+				axis = angvel * (btSin(btScalar(0.5) * fAngle * dt) / fAngle);
+			}
+
+			if (!baseBody)
+				quat = btQuaternion(axis.x(), axis.y(), axis.z(), btCos(fAngle * dt * btScalar(0.5))) * quat;
+			else
+				quat = quat * btQuaternion(-axis.x(), -axis.y(), -axis.z(), btCos(fAngle * dt * btScalar(0.5)));
+			//equivalent to: quat = (btQuaternion(axis.x(),axis.y(),axis.z(),btCos( fAngle*dt*btScalar(0.5) )) * quat.inverse()).inverse();
+
+			quat.normalize();
+		}
+	} pQuatUpdateFun;
+	///////////////////////////////
+
+	//pQuatUpdateFun(getBaseOmega(), m_baseQuat, true, dt);
+	//
+	if(!isBaseKinematic())
+	{
+		btScalar *pBaseQuat = pq ? pq : m_baseQuat;
+		btScalar *pBaseOmega = pqd ? pqd : &m_realBuf[0];  //note: the !pqd case assumes m_realBuf starts with base omega (should be wrapped for safety)
+		//
+		btQuaternion baseQuat;
+		baseQuat.setValue(pBaseQuat[0], pBaseQuat[1], pBaseQuat[2], pBaseQuat[3]);
+		btVector3 baseOmega;
+		baseOmega.setValue(pBaseOmega[0], pBaseOmega[1], pBaseOmega[2]);
+		pQuatUpdateFun(baseOmega, baseQuat, true, dt);
+		pBaseQuat[0] = baseQuat.x();
+		pBaseQuat[1] = baseQuat.y();
+		pBaseQuat[2] = baseQuat.z();
+		pBaseQuat[3] = baseQuat.w();
+
+		//printf("pBaseOmega = %.4f %.4f %.4f\n", pBaseOmega->x(), pBaseOmega->y(), pBaseOmega->z());
+		//printf("pBaseVel = %.4f %.4f %.4f\n", pBaseVel->x(), pBaseVel->y(), pBaseVel->z());
+		//printf("baseQuat = %.4f %.4f %.4f %.4f\n", pBaseQuat->x(), pBaseQuat->y(), pBaseQuat->z(), pBaseQuat->w());
+	}
+
+	if (pq)
+		pq += 7;
+	if (pqd)
+		pqd += 6;
+
+	// Finally we can update m_jointPos for each of the m_links
+	for (int i = 0; i < num_links; ++i)
+	{
+		if (!(m_links[i].m_collider && m_links[i].m_collider->isStaticOrKinematic()))
+		{
+			btScalar *pJointPos;
+			pJointPos= (pq ? pq : &m_links[i].m_jointPos[0]);
+		
+			btScalar *pJointVel = (pqd ? pqd : getJointVelMultiDof(i));
+
+			switch (m_links[i].m_jointType)
+			{
+				case btMultibodyLink::ePrismatic:
+				case btMultibodyLink::eRevolute:
+				{
+    	            //reset to current pos
+					btScalar jointVel = pJointVel[0];
+					pJointPos[0] += dt * jointVel;
+					break;
+				}
+				case btMultibodyLink::eSpherical:
+				{
+    	            //reset to current pos
+					btVector3 jointVel;
+					jointVel.setValue(pJointVel[0], pJointVel[1], pJointVel[2]);
+					btQuaternion jointOri;
+					jointOri.setValue(pJointPos[0], pJointPos[1], pJointPos[2], pJointPos[3]);
+					pQuatUpdateFun(jointVel, jointOri, false, dt);
+					pJointPos[0] = jointOri.x();
+					pJointPos[1] = jointOri.y();
+					pJointPos[2] = jointOri.z();
+					pJointPos[3] = jointOri.w();
+					break;
+				}
+				case btMultibodyLink::ePlanar:
+				{
+					pJointPos[0] += dt * getJointVelMultiDof(i)[0];
+
+					btVector3 q0_coors_qd1qd2 = getJointVelMultiDof(i)[1] * m_links[i].getAxisBottom(1) + getJointVelMultiDof(i)[2] * m_links[i].getAxisBottom(2);
+					btVector3 no_q0_coors_qd1qd2 = quatRotate(btQuaternion(m_links[i].getAxisTop(0), pJointPos[0]), q0_coors_qd1qd2);
+					pJointPos[1] += m_links[i].getAxisBottom(1).dot(no_q0_coors_qd1qd2) * dt;
+					pJointPos[2] += m_links[i].getAxisBottom(2).dot(no_q0_coors_qd1qd2) * dt;
+
+					break;
+				}
+				default:
+				{
+				}
+			}
+		}
+
+		m_links[i].updateCacheMultiDof(pq);
+
+		if (pq)
+			pq += m_links[i].m_posVarCount;
+		if (pqd)
+			pqd += m_links[i].m_dofCount;
+	}
+}
+
+void btMultiBody::fillConstraintJacobianMultiDof(int link,
+												 const btVector3 &contact_point,
+												 const btVector3 &normal_ang,
+												 const btVector3 &normal_lin,
+												 btScalar *jac,
+												 btAlignedObjectArray<btScalar> &scratch_r1,
+												 btAlignedObjectArray<btVector3> &scratch_v,
+												 btAlignedObjectArray<btMatrix3x3> &scratch_m) const
+{
+	// temporary space
+	int num_links = getNumLinks();
+	int m_dofCount = getNumDofs();
+	scratch_v.resize(3 * num_links + 3);  //(num_links + base) offsets + (num_links + base) normals_lin + (num_links + base) normals_ang
+	scratch_m.resize(num_links + 1);
+
+	btVector3 *v_ptr = &scratch_v[0];
+	btVector3 *p_minus_com_local = v_ptr;
+	v_ptr += num_links + 1;
+	btVector3 *n_local_lin = v_ptr;
+	v_ptr += num_links + 1;
+	btVector3 *n_local_ang = v_ptr;
+	v_ptr += num_links + 1;
+	btAssert(v_ptr - &scratch_v[0] == scratch_v.size());
+
+	//scratch_r.resize(m_dofCount);
+	//btScalar *results = m_dofCount > 0 ? &scratch_r[0] : 0;
+
+    scratch_r1.resize(m_dofCount+num_links);
+    btScalar * results = m_dofCount > 0 ? &scratch_r1[0] : 0;
+    btScalar* links = num_links? &scratch_r1[m_dofCount] : 0;
+    int numLinksChildToRoot=0;
+    int l = link;
+    while (l != -1)
+    {
+        links[numLinksChildToRoot++]=l;
+        l = m_links[l].m_parent;
+    }
+    
+	btMatrix3x3 *rot_from_world = &scratch_m[0];
+
+	const btVector3 p_minus_com_world = contact_point - m_basePos;
+	const btVector3 &normal_lin_world = normal_lin;  //convenience
+	const btVector3 &normal_ang_world = normal_ang;
+
+	rot_from_world[0] = btMatrix3x3(m_baseQuat);
+
+	// omega coeffients first.
+	btVector3 omega_coeffs_world;
+	omega_coeffs_world = p_minus_com_world.cross(normal_lin_world);
+	jac[0] = omega_coeffs_world[0] + normal_ang_world[0];
+	jac[1] = omega_coeffs_world[1] + normal_ang_world[1];
+	jac[2] = omega_coeffs_world[2] + normal_ang_world[2];
+	// then v coefficients
+	jac[3] = normal_lin_world[0];
+	jac[4] = normal_lin_world[1];
+	jac[5] = normal_lin_world[2];
+
+	//create link-local versions of p_minus_com and normal
+	p_minus_com_local[0] = rot_from_world[0] * p_minus_com_world;
+	n_local_lin[0] = rot_from_world[0] * normal_lin_world;
+	n_local_ang[0] = rot_from_world[0] * normal_ang_world;
+
+	// Set remaining jac values to zero for now.
+	for (int i = 6; i < 6 + m_dofCount; ++i)
+	{
+		jac[i] = 0;
+	}
+
+	// Qdot coefficients, if necessary.
+	if (num_links > 0 && link > -1)
+	{
+        // TODO: (Also, we are making 3 separate calls to this function, for the normal & the 2 friction directions,
+		// which is resulting in repeated work being done...)
+
+		// calculate required normals & positions in the local frames.
+        for (int a = 0; a < numLinksChildToRoot; a++)
+        {
+            int i = links[numLinksChildToRoot-1-a];
+        	// transform to local frame
+			const int parent = m_links[i].m_parent;
+			const btMatrix3x3 mtx(m_links[i].m_cachedRotParentToThis);
+			rot_from_world[i + 1] = mtx * rot_from_world[parent + 1];
+
+			n_local_lin[i + 1] = mtx * n_local_lin[parent + 1];
+			n_local_ang[i + 1] = mtx * n_local_ang[parent + 1];
+			p_minus_com_local[i + 1] = mtx * p_minus_com_local[parent + 1] - m_links[i].m_cachedRVector;
+
+			// calculate the jacobian entry
+			switch (m_links[i].m_jointType)
+			{
+				case btMultibodyLink::eRevolute:
+				{
+					results[m_links[i].m_dofOffset] = n_local_lin[i + 1].dot(m_links[i].getAxisTop(0).cross(p_minus_com_local[i + 1]) + m_links[i].getAxisBottom(0));
+					results[m_links[i].m_dofOffset] += n_local_ang[i + 1].dot(m_links[i].getAxisTop(0));
+					break;
+				}
+				case btMultibodyLink::ePrismatic:
+				{
+					results[m_links[i].m_dofOffset] = n_local_lin[i + 1].dot(m_links[i].getAxisBottom(0));
+					break;
+				}
+				case btMultibodyLink::eSpherical:
+				{
+					results[m_links[i].m_dofOffset + 0] = n_local_lin[i + 1].dot(m_links[i].getAxisTop(0).cross(p_minus_com_local[i + 1]) + m_links[i].getAxisBottom(0));
+					results[m_links[i].m_dofOffset + 1] = n_local_lin[i + 1].dot(m_links[i].getAxisTop(1).cross(p_minus_com_local[i + 1]) + m_links[i].getAxisBottom(1));
+					results[m_links[i].m_dofOffset + 2] = n_local_lin[i + 1].dot(m_links[i].getAxisTop(2).cross(p_minus_com_local[i + 1]) + m_links[i].getAxisBottom(2));
+
+					results[m_links[i].m_dofOffset + 0] += n_local_ang[i + 1].dot(m_links[i].getAxisTop(0));
+					results[m_links[i].m_dofOffset + 1] += n_local_ang[i + 1].dot(m_links[i].getAxisTop(1));
+					results[m_links[i].m_dofOffset + 2] += n_local_ang[i + 1].dot(m_links[i].getAxisTop(2));
+
+					break;
+				}
+				case btMultibodyLink::ePlanar:
+				{
+					results[m_links[i].m_dofOffset + 0] = n_local_lin[i + 1].dot(m_links[i].getAxisTop(0).cross(p_minus_com_local[i + 1]));  // + m_links[i].getAxisBottom(0));
+					results[m_links[i].m_dofOffset + 1] = n_local_lin[i + 1].dot(m_links[i].getAxisBottom(1));
+					results[m_links[i].m_dofOffset + 2] = n_local_lin[i + 1].dot(m_links[i].getAxisBottom(2));
+
+					break;
+				}
+				default:
+				{
+				}
+			}
+		}
+
+		// Now copy through to output.
+		//printf("jac[%d] = ", link);
+		while (link != -1)
+		{
+			for (int dof = 0; dof < m_links[link].m_dofCount; ++dof)
+			{
+				jac[6 + m_links[link].m_dofOffset + dof] = results[m_links[link].m_dofOffset + dof];
+				//printf("%.2f\t", jac[6 + m_links[link].m_dofOffset + dof]);
+			}
+
+			link = m_links[link].m_parent;
+		}
+		//printf("]\n");
+	}
+}
+
+void btMultiBody::wakeUp()
+{
+	m_sleepTimer = 0;
+	m_awake = true;
+}
+
+void btMultiBody::goToSleep()
+{
+	m_awake = false;
+}
+
+void btMultiBody::checkMotionAndSleepIfRequired(btScalar timestep)
+{
+	extern bool gDisableDeactivation;
+	if (!m_canSleep || gDisableDeactivation)
+	{
+		m_awake = true;
+		m_sleepTimer = 0;
+		return;
+	}
+
+	
+
+	// motion is computed as omega^2 + v^2 + (sum of squares of joint velocities)
+	btScalar motion = 0;
+	{
+		for (int i = 0; i < 6 + m_dofCount; ++i)
+			motion += m_realBuf[i] * m_realBuf[i];
+	}
+
+	if (motion < m_sleepEpsilon)
+	{
+		m_sleepTimer += timestep;
+		if (m_sleepTimer > m_sleepTimeout)
+		{
+			goToSleep();
+		}
+	}
+	else
+	{
+		m_sleepTimer = 0;
+		if (m_canWakeup)
+		{
+			if (!m_awake)
+				wakeUp();
+		}
+	}
+}
+
+void btMultiBody::forwardKinematics(btAlignedObjectArray<btQuaternion> &world_to_local, btAlignedObjectArray<btVector3> &local_origin)
+{
+	int num_links = getNumLinks();
+
+	// Cached 3x3 rotation matrices from parent frame to this frame.
+	btMatrix3x3 *rot_from_parent = (btMatrix3x3 *)&m_matrixBuf[0];
+
+	rot_from_parent[0] = btMatrix3x3(m_baseQuat);  //m_baseQuat assumed to be alias!?
+
+	for (int i = 0; i < num_links; ++i)
+	{
+		rot_from_parent[i + 1] = btMatrix3x3(m_links[i].m_cachedRotParentToThis);
+	}
+
+	int nLinks = getNumLinks();
+	///base + num m_links
+	world_to_local.resize(nLinks + 1);
+	local_origin.resize(nLinks + 1);
+
+	world_to_local[0] = getWorldToBaseRot();
+	local_origin[0] = getBasePos();
+
+	for (int k = 0; k < getNumLinks(); k++)
+	{
+		const int parent = getParent(k);
+		world_to_local[k + 1] = getParentToLocalRot(k) * world_to_local[parent + 1];
+		local_origin[k + 1] = local_origin[parent + 1] + (quatRotate(world_to_local[k + 1].inverse(), getRVector(k)));
+	}
+
+	for (int link = 0; link < getNumLinks(); link++)
+	{
+		int index = link + 1;
+
+		btVector3 posr = local_origin[index];
+		btScalar quat[4] = {-world_to_local[index].x(), -world_to_local[index].y(), -world_to_local[index].z(), world_to_local[index].w()};
+		btTransform tr;
+		tr.setIdentity();
+		tr.setOrigin(posr);
+		tr.setRotation(btQuaternion(quat[0], quat[1], quat[2], quat[3]));
+		getLink(link).m_cachedWorldTransform = tr;
+	}
+}
+
+void btMultiBody::updateCollisionObjectWorldTransforms(btAlignedObjectArray<btQuaternion> &world_to_local, btAlignedObjectArray<btVector3> &local_origin)
+{
+	world_to_local.resize(getNumLinks() + 1);
+	local_origin.resize(getNumLinks() + 1);
+
+	world_to_local[0] = getWorldToBaseRot();
+	local_origin[0] = getBasePos();
+
+	if (getBaseCollider())
+	{
+		btVector3 posr = local_origin[0];
+		//	float pos[4]={posr.x(),posr.y(),posr.z(),1};
+		btScalar quat[4] = {-world_to_local[0].x(), -world_to_local[0].y(), -world_to_local[0].z(), world_to_local[0].w()};
+		btTransform tr;
+		tr.setIdentity();
+		tr.setOrigin(posr);
+		tr.setRotation(btQuaternion(quat[0], quat[1], quat[2], quat[3]));
+
+		getBaseCollider()->setWorldTransform(tr);
+        getBaseCollider()->setInterpolationWorldTransform(tr);
+	}
+
+	for (int k = 0; k < getNumLinks(); k++)
+	{
+		const int parent = getParent(k);
+		world_to_local[k + 1] = getParentToLocalRot(k) * world_to_local[parent + 1];
+		local_origin[k + 1] = local_origin[parent + 1] + (quatRotate(world_to_local[k + 1].inverse(), getRVector(k)));
+	}
+
+	for (int m = 0; m < getNumLinks(); m++)
+	{
+		btMultiBodyLinkCollider *col = getLink(m).m_collider;
+		if (col)
+		{
+			int link = col->m_link;
+			btAssert(link == m);
+
+			int index = link + 1;
+
+			btVector3 posr = local_origin[index];
+			//			float pos[4]={posr.x(),posr.y(),posr.z(),1};
+			btScalar quat[4] = {-world_to_local[index].x(), -world_to_local[index].y(), -world_to_local[index].z(), world_to_local[index].w()};
+			btTransform tr;
+			tr.setIdentity();
+			tr.setOrigin(posr);
+			tr.setRotation(btQuaternion(quat[0], quat[1], quat[2], quat[3]));
+
+			col->setWorldTransform(tr);
+            col->setInterpolationWorldTransform(tr);
+		}
+	}
+}
+
+void btMultiBody::updateCollisionObjectInterpolationWorldTransforms(btAlignedObjectArray<btQuaternion> &world_to_local, btAlignedObjectArray<btVector3> &local_origin)
+{
+    world_to_local.resize(getNumLinks() + 1);
+    local_origin.resize(getNumLinks() + 1);
+    
+		if(isBaseKinematic()){
+        world_to_local[0] = getWorldToBaseRot();
+        local_origin[0] = getBasePos();
+		}
+		else
+		{
+        world_to_local[0] = getInterpolateWorldToBaseRot();
+        local_origin[0] = getInterpolateBasePos();
+		}
+    
+    if (getBaseCollider())
+    {
+        btVector3 posr = local_origin[0];
+        //    float pos[4]={posr.x(),posr.y(),posr.z(),1};
+        btScalar quat[4] = {-world_to_local[0].x(), -world_to_local[0].y(), -world_to_local[0].z(), world_to_local[0].w()};
+        btTransform tr;
+        tr.setIdentity();
+        tr.setOrigin(posr);
+        tr.setRotation(btQuaternion(quat[0], quat[1], quat[2], quat[3]));
+        
+        getBaseCollider()->setInterpolationWorldTransform(tr);
+    }
+    
+    for (int k = 0; k < getNumLinks(); k++)
+    {
+        const int parent = getParent(k);
+        world_to_local[k + 1] = getInterpolateParentToLocalRot(k) * world_to_local[parent + 1];
+        local_origin[k + 1] = local_origin[parent + 1] + (quatRotate(world_to_local[k + 1].inverse(), getInterpolateRVector(k)));
+    }
+    
+    for (int m = 0; m < getNumLinks(); m++)
+    {
+        btMultiBodyLinkCollider *col = getLink(m).m_collider;
+        if (col)
+        {
+            int link = col->m_link;
+            btAssert(link == m);
+            
+            int index = link + 1;
+            
+            btVector3 posr = local_origin[index];
+            //            float pos[4]={posr.x(),posr.y(),posr.z(),1};
+            btScalar quat[4] = {-world_to_local[index].x(), -world_to_local[index].y(), -world_to_local[index].z(), world_to_local[index].w()};
+            btTransform tr;
+            tr.setIdentity();
+            tr.setOrigin(posr);
+            tr.setRotation(btQuaternion(quat[0], quat[1], quat[2], quat[3]));
+            
+            col->setInterpolationWorldTransform(tr);
+        }
+    }
+}
+
+int btMultiBody::calculateSerializeBufferSize() const
+{
+	int sz = sizeof(btMultiBodyData);
+	return sz;
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char *btMultiBody::serialize(void *dataBuffer, class btSerializer *serializer) const
+{
+	btMultiBodyData *mbd = (btMultiBodyData *)dataBuffer;
+	getBasePos().serialize(mbd->m_baseWorldPosition);
+	getWorldToBaseRot().inverse().serialize(mbd->m_baseWorldOrientation);
+	getBaseVel().serialize(mbd->m_baseLinearVelocity);
+	getBaseOmega().serialize(mbd->m_baseAngularVelocity);
+
+	mbd->m_baseMass = this->getBaseMass();
+	getBaseInertia().serialize(mbd->m_baseInertia);
+	{
+		char *name = (char *)serializer->findNameForPointer(m_baseName);
+		mbd->m_baseName = (char *)serializer->getUniquePointer(name);
+		if (mbd->m_baseName)
+		{
+			serializer->serializeName(name);
+		}
+	}
+	mbd->m_numLinks = this->getNumLinks();
+	if (mbd->m_numLinks)
+	{
+		int sz = sizeof(btMultiBodyLinkData);
+		int numElem = mbd->m_numLinks;
+		btChunk *chunk = serializer->allocate(sz, numElem);
+		btMultiBodyLinkData *memPtr = (btMultiBodyLinkData *)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_jointType = getLink(i).m_jointType;
+			memPtr->m_dofCount = getLink(i).m_dofCount;
+			memPtr->m_posVarCount = getLink(i).m_posVarCount;
+
+			getLink(i).m_inertiaLocal.serialize(memPtr->m_linkInertia);
+
+			getLink(i).m_absFrameTotVelocity.m_topVec.serialize(memPtr->m_absFrameTotVelocityTop);
+			getLink(i).m_absFrameTotVelocity.m_bottomVec.serialize(memPtr->m_absFrameTotVelocityBottom);
+			getLink(i).m_absFrameLocVelocity.m_topVec.serialize(memPtr->m_absFrameLocVelocityTop);
+			getLink(i).m_absFrameLocVelocity.m_bottomVec.serialize(memPtr->m_absFrameLocVelocityBottom);
+
+			memPtr->m_linkMass = getLink(i).m_mass;
+			memPtr->m_parentIndex = getLink(i).m_parent;
+			memPtr->m_jointDamping = getLink(i).m_jointDamping;
+			memPtr->m_jointFriction = getLink(i).m_jointFriction;
+			memPtr->m_jointLowerLimit = getLink(i).m_jointLowerLimit;
+			memPtr->m_jointUpperLimit = getLink(i).m_jointUpperLimit;
+			memPtr->m_jointMaxForce = getLink(i).m_jointMaxForce;
+			memPtr->m_jointMaxVelocity = getLink(i).m_jointMaxVelocity;
+
+			getLink(i).m_eVector.serialize(memPtr->m_parentComToThisPivotOffset);
+			getLink(i).m_dVector.serialize(memPtr->m_thisPivotToThisComOffset);
+			getLink(i).m_zeroRotParentToThis.serialize(memPtr->m_zeroRotParentToThis);
+			btAssert(memPtr->m_dofCount <= 3);
+			for (int dof = 0; dof < getLink(i).m_dofCount; dof++)
+			{
+				getLink(i).getAxisBottom(dof).serialize(memPtr->m_jointAxisBottom[dof]);
+				getLink(i).getAxisTop(dof).serialize(memPtr->m_jointAxisTop[dof]);
+
+				memPtr->m_jointTorque[dof] = getLink(i).m_jointTorque[dof];
+				memPtr->m_jointVel[dof] = getJointVelMultiDof(i)[dof];
+			}
+			int numPosVar = getLink(i).m_posVarCount;
+			for (int posvar = 0; posvar < numPosVar; posvar++)
+			{
+				memPtr->m_jointPos[posvar] = getLink(i).m_jointPos[posvar];
+			}
+
+			{
+				char *name = (char *)serializer->findNameForPointer(m_links[i].m_linkName);
+				memPtr->m_linkName = (char *)serializer->getUniquePointer(name);
+				if (memPtr->m_linkName)
+				{
+					serializer->serializeName(name);
+				}
+			}
+			{
+				char *name = (char *)serializer->findNameForPointer(m_links[i].m_jointName);
+				memPtr->m_jointName = (char *)serializer->getUniquePointer(name);
+				if (memPtr->m_jointName)
+				{
+					serializer->serializeName(name);
+				}
+			}
+			memPtr->m_linkCollider = (btCollisionObjectData *)serializer->getUniquePointer(getLink(i).m_collider);
+		}
+		serializer->finalizeChunk(chunk, btMultiBodyLinkDataName, BT_ARRAY_CODE, (void *)&m_links[0]);
+	}
+	mbd->m_links = mbd->m_numLinks ? (btMultiBodyLinkData *)serializer->getUniquePointer((void *)&m_links[0]) : 0;
+
+	// Fill padding with zeros to appease msan.
+#ifdef BT_USE_DOUBLE_PRECISION
+	memset(mbd->m_padding, 0, sizeof(mbd->m_padding));
+#endif
+
+	return btMultiBodyDataName;
+}
+
+void btMultiBody::saveKinematicState(btScalar timeStep)
+{
+	//todo: clamp to some (user definable) safe minimum timestep, to limit maximum angular/linear velocities
+	if (m_kinematic_calculate_velocity && timeStep != btScalar(0.))
+	{
+		btVector3 linearVelocity, angularVelocity;
+		btTransformUtil::calculateVelocity(getInterpolateBaseWorldTransform(), getBaseWorldTransform(), timeStep, linearVelocity, angularVelocity);
+		setBaseVel(linearVelocity);
+		setBaseOmega(angularVelocity);
+		setInterpolateBaseWorldTransform(getBaseWorldTransform());
+	}
+}
+
+void btMultiBody::setLinkDynamicType(const int i, int type)
+{
+	if (i == -1)
+	{
+		setBaseDynamicType(type);
+	}
+	else if (i >= 0 && i < getNumLinks())
+	{
+		if (m_links[i].m_collider)
+		{
+			m_links[i].m_collider->setDynamicType(type);
+		}
+	}
+}
+
+bool btMultiBody::isLinkStaticOrKinematic(const int i) const
+{
+	if (i == -1)
+	{
+		return isBaseStaticOrKinematic();
+	}
+	else
+	{
+		if (m_links[i].m_collider)
+			return m_links[i].m_collider->isStaticOrKinematic();
+	}
+	return false;
+}
+
+bool btMultiBody::isLinkKinematic(const int i) const
+{
+	if (i == -1)
+	{
+		return isBaseKinematic();
+	}
+	else
+	{
+		if (m_links[i].m_collider)
+			return m_links[i].m_collider->isKinematic();
+	}
+	return false;
+}
+
+bool btMultiBody::isLinkAndAllAncestorsStaticOrKinematic(const int i) const
+{
+	int link = i;
+	while (link != -1) {
+		if (!isLinkStaticOrKinematic(link))
+			return false;
+		link = m_links[link].m_parent;
+	}
+	return isBaseStaticOrKinematic();
+}
+
+bool btMultiBody::isLinkAndAllAncestorsKinematic(const int i) const
+{
+	int link = i;
+	while (link != -1) {
+		if (!isLinkKinematic(link))
+			return false;
+		link = m_links[link].m_parent;
+	}
+	return isBaseKinematic();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBody.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBody.h
new file mode 100644
index 0000000..345970d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBody.h
@@ -0,0 +1,953 @@
+/*
+ * PURPOSE:
+ *   Class representing an articulated rigid body. Stores the body's
+ *   current state, allows forces and torques to be set, handles
+ *   timestepping and implements Featherstone's algorithm.
+ *   
+ * COPYRIGHT:
+ *   Copyright (C) Stephen Thompson, <stephen@solarflare.org.uk>, 2011-2013
+ *   Portions written By Erwin Coumans: connection to LCP solver, various multibody constraints, replacing Eigen math library by Bullet LinearMath and a dedicated 6x6 matrix inverse (solveImatrix)
+ *   Portions written By Jakub Stepien: support for multi-DOF constraints, introduction of spatial algebra and several other improvements
+
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ 
+ */
+
+#ifndef BT_MULTIBODY_H
+#define BT_MULTIBODY_H
+
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btQuaternion.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+///serialization data, don't change them if you are not familiar with the details of the serialization mechanisms
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btMultiBodyData btMultiBodyDoubleData
+#define btMultiBodyDataName "btMultiBodyDoubleData"
+#define btMultiBodyLinkData btMultiBodyLinkDoubleData
+#define btMultiBodyLinkDataName "btMultiBodyLinkDoubleData"
+#else
+#define btMultiBodyData btMultiBodyFloatData
+#define btMultiBodyDataName "btMultiBodyFloatData"
+#define btMultiBodyLinkData btMultiBodyLinkFloatData
+#define btMultiBodyLinkDataName "btMultiBodyLinkFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+#include "btMultiBodyLink.h"
+class btMultiBodyLinkCollider;
+
+ATTRIBUTE_ALIGNED16(class)
+btMultiBody
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	//
+	// initialization
+	//
+
+	btMultiBody(int n_links,               // NOT including the base
+				btScalar mass,             // mass of base
+				const btVector3 &inertia,  // inertia of base, in base frame; assumed diagonal
+				bool fixedBase,            // whether the base is fixed (true) or can move (false)
+				bool canSleep, bool deprecatedMultiDof = true);
+
+	virtual ~btMultiBody();
+
+	//note: fixed link collision with parent is always disabled
+	void setupFixed(int i, //linkIndex
+					btScalar mass,
+					const btVector3 &inertia,
+					int parent,
+					const btQuaternion &rotParentToThis,
+					const btVector3 &parentComToThisPivotOffset,
+					const btVector3 &thisPivotToThisComOffset, bool deprecatedDisableParentCollision = true);
+
+	void setupPrismatic(int i,
+						btScalar mass,
+						const btVector3 &inertia,
+						int parent,
+						const btQuaternion &rotParentToThis,
+						const btVector3 &jointAxis,
+						const btVector3 &parentComToThisPivotOffset,
+						const btVector3 &thisPivotToThisComOffset,
+						bool disableParentCollision);
+
+	void setupRevolute(int i,  // 0 to num_links-1
+					   btScalar mass,
+					   const btVector3 &inertia,
+					   int parentIndex,
+					   const btQuaternion &rotParentToThis,          // rotate points in parent frame to this frame, when q = 0
+					   const btVector3 &jointAxis,                   // in my frame
+					   const btVector3 &parentComToThisPivotOffset,  // vector from parent COM to joint axis, in PARENT frame
+					   const btVector3 &thisPivotToThisComOffset,    // vector from joint axis to my COM, in MY frame
+					   bool disableParentCollision = false);
+
+	void setupSpherical(int i,  // linkIndex, 0 to num_links-1
+						btScalar mass,
+						const btVector3 &inertia,
+						int parent,
+						const btQuaternion &rotParentToThis,          // rotate points in parent frame to this frame, when q = 0
+						const btVector3 &parentComToThisPivotOffset,  // vector from parent COM to joint axis, in PARENT frame
+						const btVector3 &thisPivotToThisComOffset,    // vector from joint axis to my COM, in MY frame
+						bool disableParentCollision = false);
+
+	void setupPlanar(int i,  // 0 to num_links-1
+					 btScalar mass,
+					 const btVector3 &inertia,
+					 int parent,
+					 const btQuaternion &rotParentToThis,  // rotate points in parent frame to this frame, when q = 0
+					 const btVector3 &rotationAxis,
+					 const btVector3 &parentComToThisComOffset,  // vector from parent COM to this COM, in PARENT frame
+					 bool disableParentCollision = false);
+
+	const btMultibodyLink &getLink(int index) const
+	{
+		return m_links[index];
+	}
+
+	btMultibodyLink &getLink(int index)
+	{
+		return m_links[index];
+	}
+
+	void setBaseCollider(btMultiBodyLinkCollider * collider)  //collider can be NULL to disable collision for the base
+	{
+		m_baseCollider = collider;
+	}
+	const btMultiBodyLinkCollider *getBaseCollider() const
+	{
+		return m_baseCollider;
+	}
+	btMultiBodyLinkCollider *getBaseCollider()
+	{
+		return m_baseCollider;
+	}
+
+	const btMultiBodyLinkCollider *getLinkCollider(int index) const
+	{
+		if (index >= 0 && index < getNumLinks())
+		{
+			return getLink(index).m_collider;
+		}
+		return 0;
+	}
+
+	btMultiBodyLinkCollider *getLinkCollider(int index)
+	{
+		if (index >= 0 && index < getNumLinks())
+		{
+			return getLink(index).m_collider;
+		}
+		return 0;
+	}
+
+	//
+	// get parent
+	// input: link num from 0 to num_links-1
+	// output: link num from 0 to num_links-1, OR -1 to mean the base.
+	//
+	int getParent(int link_num) const;
+
+	//
+	// get number of m_links, masses, moments of inertia
+	//
+
+	int getNumLinks() const { return m_links.size(); }
+	int getNumDofs() const { return m_dofCount; }
+	int getNumPosVars() const { return m_posVarCnt; }
+	btScalar getBaseMass() const { return m_baseMass; }
+	const btVector3 &getBaseInertia() const { return m_baseInertia; }
+	btScalar getLinkMass(int i) const;
+	const btVector3 &getLinkInertia(int i) const;
+
+	//
+	// change mass (incomplete: can only change base mass and inertia at present)
+	//
+
+	void setBaseMass(btScalar mass) { m_baseMass = mass; }
+	void setBaseInertia(const btVector3 &inertia) { m_baseInertia = inertia; }
+
+	//
+	// get/set pos/vel/rot/omega for the base link
+	//
+
+	const btVector3 &getBasePos() const 
+	{ 
+		return m_basePos; 
+	}  // in world frame
+	const btVector3 getBaseVel() const
+	{
+		return btVector3(m_realBuf[3], m_realBuf[4], m_realBuf[5]);
+	}  // in world frame
+	const btQuaternion &getWorldToBaseRot() const
+	{
+		return m_baseQuat;
+	}
+    
+    const btVector3 &getInterpolateBasePos() const
+    {
+        return m_basePos_interpolate;
+    }  // in world frame
+    const btQuaternion &getInterpolateWorldToBaseRot() const
+    {
+        return m_baseQuat_interpolate;
+    }
+    
+    // rotates world vectors into base frame
+	btVector3 getBaseOmega() const { return btVector3(m_realBuf[0], m_realBuf[1], m_realBuf[2]); }  // in world frame
+
+	void setBasePos(const btVector3 &pos)
+	{
+		m_basePos = pos;
+		if(!isBaseKinematic())
+			m_basePos_interpolate = pos;
+	}
+
+	void setInterpolateBasePos(const btVector3 &pos)
+	{
+		m_basePos_interpolate = pos;
+	}
+
+	void setBaseWorldTransform(const btTransform &tr)
+	{
+		setBasePos(tr.getOrigin());
+		setWorldToBaseRot(tr.getRotation().inverse());
+	}
+
+	btTransform getBaseWorldTransform() const
+	{
+		btTransform tr;
+		tr.setOrigin(getBasePos());
+		tr.setRotation(getWorldToBaseRot().inverse());
+		return tr;
+	}
+
+	void setInterpolateBaseWorldTransform(const btTransform &tr)
+	{
+		setInterpolateBasePos(tr.getOrigin());
+		setInterpolateWorldToBaseRot(tr.getRotation().inverse());
+	}
+
+	btTransform getInterpolateBaseWorldTransform() const
+	{
+		btTransform tr;
+		tr.setOrigin(getInterpolateBasePos());
+		tr.setRotation(getInterpolateWorldToBaseRot().inverse());
+		return tr;
+	}
+
+	void setBaseVel(const btVector3 &vel)
+	{
+		m_realBuf[3] = vel[0];
+		m_realBuf[4] = vel[1];
+		m_realBuf[5] = vel[2];
+	}
+
+	void setWorldToBaseRot(const btQuaternion &rot)
+	{
+		m_baseQuat = rot;  //m_baseQuat asumed to ba alias!?
+		if(!isBaseKinematic())
+			m_baseQuat_interpolate = rot;
+	}
+
+	void setInterpolateWorldToBaseRot(const btQuaternion &rot)
+	{
+		m_baseQuat_interpolate = rot;
+	}
+
+	void setBaseOmega(const btVector3 &omega)
+	{
+		m_realBuf[0] = omega[0];
+		m_realBuf[1] = omega[1];
+		m_realBuf[2] = omega[2];
+	}
+
+	void saveKinematicState(btScalar timeStep);
+
+	//
+	// get/set pos/vel for child m_links (i = 0 to num_links-1)
+	//
+
+	btScalar getJointPos(int i) const;
+	btScalar getJointVel(int i) const;
+
+	btScalar *getJointVelMultiDof(int i);
+	btScalar *getJointPosMultiDof(int i);
+
+	const btScalar *getJointVelMultiDof(int i) const;
+	const btScalar *getJointPosMultiDof(int i) const;
+
+	void setJointPos(int i, btScalar q);
+	void setJointVel(int i, btScalar qdot);
+	void setJointPosMultiDof(int i, const double *q);
+	void setJointVelMultiDof(int i, const double *qdot);
+	void setJointPosMultiDof(int i, const float *q);
+	void setJointVelMultiDof(int i, const float *qdot);
+
+	//
+	// direct access to velocities as a vector of 6 + num_links elements.
+	// (omega first, then v, then joint velocities.)
+	//
+	const btScalar *getVelocityVector() const
+	{
+		return &m_realBuf[0];
+	}
+    
+    const btScalar *getDeltaVelocityVector() const
+    {
+        return &m_deltaV[0];
+    }
+    
+    const btScalar *getSplitVelocityVector() const
+    {
+        return &m_splitV[0];
+    }
+	/*    btScalar * getVelocityVector() 
+	{ 
+		return &real_buf[0]; 
+	}
+  */
+
+	//
+	// get the frames of reference (positions and orientations) of the child m_links
+	// (i = 0 to num_links-1)
+	//
+
+	const btVector3 &getRVector(int i) const;              // vector from COM(parent(i)) to COM(i), in frame i's coords
+	const btQuaternion &getParentToLocalRot(int i) const;  // rotates vectors in frame parent(i) to vectors in frame i.
+    const btVector3 &getInterpolateRVector(int i) const;              // vector from COM(parent(i)) to COM(i), in frame i's coords
+    const btQuaternion &getInterpolateParentToLocalRot(int i) const;  // rotates vectors in frame parent(i) to vectors in frame i.
+
+	//
+	// transform vectors in local frame of link i to world frame (or vice versa)
+	//
+	btVector3 localPosToWorld(int i, const btVector3 &local_pos) const;
+	btVector3 localDirToWorld(int i, const btVector3 &local_dir) const;
+	btVector3 worldPosToLocal(int i, const btVector3 &world_pos) const;
+	btVector3 worldDirToLocal(int i, const btVector3 &world_dir) const;
+
+	//
+	// transform a frame in local coordinate to a frame in world coordinate
+	//
+	btMatrix3x3 localFrameToWorld(int i, const btMatrix3x3 &local_frame) const;
+
+
+	//
+	// set external forces and torques. Note all external forces/torques are given in the WORLD frame.
+	//
+
+	void clearForcesAndTorques();
+	void clearConstraintForces();
+
+	void clearVelocities();
+
+	void addBaseForce(const btVector3 &f)
+	{
+		m_baseForce += f;
+	}
+	void addBaseTorque(const btVector3 &t) { m_baseTorque += t; }
+	void addLinkForce(int i, const btVector3 &f);
+	void addLinkTorque(int i, const btVector3 &t);
+
+	void addBaseConstraintForce(const btVector3 &f)
+	{
+		m_baseConstraintForce += f;
+	}
+	void addBaseConstraintTorque(const btVector3 &t) { m_baseConstraintTorque += t; }
+	void addLinkConstraintForce(int i, const btVector3 &f);
+	void addLinkConstraintTorque(int i, const btVector3 &t);
+
+	void addJointTorque(int i, btScalar Q);
+	void addJointTorqueMultiDof(int i, int dof, btScalar Q);
+	void addJointTorqueMultiDof(int i, const btScalar *Q);
+
+	const btVector3 &getBaseForce() const { return m_baseForce; }
+	const btVector3 &getBaseTorque() const { return m_baseTorque; }
+	const btVector3 &getLinkForce(int i) const;
+	const btVector3 &getLinkTorque(int i) const;
+	btScalar getJointTorque(int i) const;
+	btScalar *getJointTorqueMultiDof(int i);
+
+	//
+	// dynamics routines.
+	//
+
+	// timestep the velocities (given the external forces/torques set using addBaseForce etc).
+	// also sets up caches for calcAccelerationDeltas.
+	//
+	// Note: the caller must provide three vectors which are used as
+	// temporary scratch space. The idea here is to reduce dynamic
+	// memory allocation: the same scratch vectors can be re-used
+	// again and again for different Multibodies, instead of each
+	// btMultiBody allocating (and then deallocating) their own
+	// individual scratch buffers. This gives a considerable speed
+	// improvement, at least on Windows (where dynamic memory
+	// allocation appears to be fairly slow).
+	//
+
+	void computeAccelerationsArticulatedBodyAlgorithmMultiDof(btScalar dt,
+															  btAlignedObjectArray<btScalar> & scratch_r,
+															  btAlignedObjectArray<btVector3> & scratch_v,
+															  btAlignedObjectArray<btMatrix3x3> & scratch_m,
+															  bool isConstraintPass,
+                                                              bool jointFeedbackInWorldSpace,
+                                                              bool jointFeedbackInJointFrame
+                                                              );
+
+	///stepVelocitiesMultiDof is deprecated, use computeAccelerationsArticulatedBodyAlgorithmMultiDof instead
+	//void stepVelocitiesMultiDof(btScalar dt,
+	//							btAlignedObjectArray<btScalar> & scratch_r,
+	//							btAlignedObjectArray<btVector3> & scratch_v,
+	//							btAlignedObjectArray<btMatrix3x3> & scratch_m,
+	//							bool isConstraintPass = false)
+	//{
+	//	computeAccelerationsArticulatedBodyAlgorithmMultiDof(dt, scratch_r, scratch_v, scratch_m, isConstraintPass, false, false);
+	//}
+
+	// calcAccelerationDeltasMultiDof
+	// input: force vector (in same format as jacobian, i.e.:
+	//                      3 torque values, 3 force values, num_links joint torque values)
+	// output: 3 omegadot values, 3 vdot values, num_links q_double_dot values
+	// (existing contents of output array are replaced)
+	// calcAccelerationDeltasMultiDof must have been called first.
+	void calcAccelerationDeltasMultiDof(const btScalar *force, btScalar *output,
+										btAlignedObjectArray<btScalar> &scratch_r,
+										btAlignedObjectArray<btVector3> &scratch_v) const;
+
+	void applyDeltaVeeMultiDof2(const btScalar *delta_vee, btScalar multiplier)
+	{
+		for (int dof = 0; dof < 6 + getNumDofs(); ++dof)
+		{
+			m_deltaV[dof] += delta_vee[dof] * multiplier;
+		}
+	}
+    void applyDeltaSplitVeeMultiDof(const btScalar *delta_vee, btScalar multiplier)
+    {
+        for (int dof = 0; dof < 6 + getNumDofs(); ++dof)
+        {
+            m_splitV[dof] += delta_vee[dof] * multiplier;
+        }
+    }
+    void addSplitV()
+    {
+        applyDeltaVeeMultiDof(&m_splitV[0], 1);
+    }
+    void substractSplitV()
+    {
+        applyDeltaVeeMultiDof(&m_splitV[0], -1);
+        
+        for (int dof = 0; dof < 6 + getNumDofs(); ++dof)
+        {
+            m_splitV[dof] = 0.f;
+        }
+    }
+	void processDeltaVeeMultiDof2()
+	{
+		applyDeltaVeeMultiDof(&m_deltaV[0], 1);
+
+		for (int dof = 0; dof < 6 + getNumDofs(); ++dof)
+		{
+			m_deltaV[dof] = 0.f;
+		}
+	}
+
+	void applyDeltaVeeMultiDof(const btScalar *delta_vee, btScalar multiplier)
+	{
+		//for (int dof = 0; dof < 6 + getNumDofs(); ++dof)
+		//	printf("%.4f ", delta_vee[dof]*multiplier);
+		//printf("\n");
+
+		//btScalar sum = 0;
+		//for (int dof = 0; dof < 6 + getNumDofs(); ++dof)
+		//{
+		//	sum += delta_vee[dof]*multiplier*delta_vee[dof]*multiplier;
+		//}
+		//btScalar l = btSqrt(sum);
+
+		//if (l>m_maxAppliedImpulse)
+		//{
+		//	multiplier *= m_maxAppliedImpulse/l;
+		//}
+
+		for (int dof = 0; dof < 6 + getNumDofs(); ++dof)
+		{
+			m_realBuf[dof] += delta_vee[dof] * multiplier;
+			btClamp(m_realBuf[dof], -m_maxCoordinateVelocity, m_maxCoordinateVelocity);
+		}
+	}
+
+	// timestep the positions (given current velocities).
+	void stepPositionsMultiDof(btScalar dt, btScalar *pq = 0, btScalar *pqd = 0);
+    
+    // predict the positions
+    void predictPositionsMultiDof(btScalar dt);
+
+	//
+	// contacts
+	//
+
+	// This routine fills out a contact constraint jacobian for this body.
+	// the 'normal' supplied must be -n for body1 or +n for body2 of the contact.
+	// 'normal' & 'contact_point' are both given in world coordinates.
+
+	void fillContactJacobianMultiDof(int link,
+									 const btVector3 &contact_point,
+									 const btVector3 &normal,
+									 btScalar *jac,
+									 btAlignedObjectArray<btScalar> &scratch_r,
+									 btAlignedObjectArray<btVector3> &scratch_v,
+									 btAlignedObjectArray<btMatrix3x3> &scratch_m) const { fillConstraintJacobianMultiDof(link, contact_point, btVector3(0, 0, 0), normal, jac, scratch_r, scratch_v, scratch_m); }
+
+	//a more general version of fillContactJacobianMultiDof which does not assume..
+	//.. that the constraint in question is contact or, to be more precise, constrains linear velocity only
+	void fillConstraintJacobianMultiDof(int link,
+										const btVector3 &contact_point,
+										const btVector3 &normal_ang,
+										const btVector3 &normal_lin,
+										btScalar *jac,
+										btAlignedObjectArray<btScalar> &scratch_r,
+										btAlignedObjectArray<btVector3> &scratch_v,
+										btAlignedObjectArray<btMatrix3x3> &scratch_m) const;
+
+	//
+	// sleeping
+	//
+	void setCanSleep(bool canSleep)
+	{
+		if (m_canWakeup)
+		{
+			m_canSleep = canSleep;
+		}
+	}
+
+	bool getCanSleep() const
+	{
+		return m_canSleep;
+	}
+
+	bool getCanWakeup() const
+	{
+		return m_canWakeup;
+	}
+	
+	void setCanWakeup(bool canWakeup) 
+	{
+		m_canWakeup = canWakeup;
+	}
+	bool isAwake() const 
+	{ 
+		return m_awake; 
+	}
+	void wakeUp();
+	void goToSleep();
+	void checkMotionAndSleepIfRequired(btScalar timestep);
+
+	bool hasFixedBase() const;
+
+	bool isBaseKinematic() const;
+
+	bool isBaseStaticOrKinematic() const;
+
+	// set the dynamic type in the base's collision flags.
+	void setBaseDynamicType(int dynamicType);
+
+	void setFixedBase(bool fixedBase)
+	{
+		m_fixedBase = fixedBase;
+		if(m_fixedBase)
+			setBaseDynamicType(btCollisionObject::CF_STATIC_OBJECT);
+		else
+			setBaseDynamicType(btCollisionObject::CF_DYNAMIC_OBJECT);
+	}
+
+	int getCompanionId() const
+	{
+		return m_companionId;
+	}
+	void setCompanionId(int id)
+	{
+		//printf("for %p setCompanionId(%d)\n",this, id);
+		m_companionId = id;
+	}
+
+	void setNumLinks(int numLinks)  //careful: when changing the number of m_links, make sure to re-initialize or update existing m_links
+	{
+		m_links.resize(numLinks);
+	}
+
+	btScalar getLinearDamping() const
+	{
+		return m_linearDamping;
+	}
+	void setLinearDamping(btScalar damp)
+	{
+		m_linearDamping = damp;
+	}
+	btScalar getAngularDamping() const
+	{
+		return m_angularDamping;
+	}
+	void setAngularDamping(btScalar damp)
+	{
+		m_angularDamping = damp;
+	}
+
+	bool getUseGyroTerm() const
+	{
+		return m_useGyroTerm;
+	}
+	void setUseGyroTerm(bool useGyro)
+	{
+		m_useGyroTerm = useGyro;
+	}
+	btScalar getMaxCoordinateVelocity() const
+	{
+		return m_maxCoordinateVelocity;
+	}
+	void setMaxCoordinateVelocity(btScalar maxVel)
+	{
+		m_maxCoordinateVelocity = maxVel;
+	}
+
+	btScalar getMaxAppliedImpulse() const
+	{
+		return m_maxAppliedImpulse;
+	}
+	void setMaxAppliedImpulse(btScalar maxImp)
+	{
+		m_maxAppliedImpulse = maxImp;
+	}
+	void setHasSelfCollision(bool hasSelfCollision)
+	{
+		m_hasSelfCollision = hasSelfCollision;
+	}
+	bool hasSelfCollision() const
+	{
+		return m_hasSelfCollision;
+	}
+
+	void finalizeMultiDof();
+
+	void useRK4Integration(bool use) { m_useRK4 = use; }
+	bool isUsingRK4Integration() const { return m_useRK4; }
+	void useGlobalVelocities(bool use) { m_useGlobalVelocities = use; }
+	bool isUsingGlobalVelocities() const { return m_useGlobalVelocities; }
+
+	bool isPosUpdated() const
+	{
+		return __posUpdated;
+	}
+	void setPosUpdated(bool updated)
+	{
+		__posUpdated = updated;
+	}
+
+	//internalNeedsJointFeedback is for internal use only
+	bool internalNeedsJointFeedback() const
+	{
+		return m_internalNeedsJointFeedback;
+	}
+	void forwardKinematics(btAlignedObjectArray<btQuaternion>& world_to_local, btAlignedObjectArray<btVector3> & local_origin);
+
+	void compTreeLinkVelocities(btVector3 * omega, btVector3 * vel) const;
+
+	void updateCollisionObjectWorldTransforms(btAlignedObjectArray<btQuaternion> & world_to_local, btAlignedObjectArray<btVector3> & local_origin);
+    void updateCollisionObjectInterpolationWorldTransforms(btAlignedObjectArray<btQuaternion> & world_to_local, btAlignedObjectArray<btVector3> & local_origin);
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char *serialize(void *dataBuffer, class btSerializer *serializer) const;
+
+	const char *getBaseName() const
+	{
+		return m_baseName;
+	}
+	///memory of setBaseName needs to be manager by user
+	void setBaseName(const char *name)
+	{
+		m_baseName = name;
+	}
+
+	///users can point to their objects, userPointer is not used by Bullet
+	void *getUserPointer() const
+	{
+		return m_userObjectPointer;
+	}
+
+	int getUserIndex() const
+	{
+		return m_userIndex;
+	}
+
+	int getUserIndex2() const
+	{
+		return m_userIndex2;
+	}
+	///users can point to their objects, userPointer is not used by Bullet
+	void setUserPointer(void *userPointer)
+	{
+		m_userObjectPointer = userPointer;
+	}
+
+	///users can point to their objects, userPointer is not used by Bullet
+	void setUserIndex(int index)
+	{
+		m_userIndex = index;
+	}
+
+	void setUserIndex2(int index)
+	{
+		m_userIndex2 = index;
+	}
+
+	static void spatialTransform(const btMatrix3x3 &rotation_matrix,  // rotates vectors in 'from' frame to vectors in 'to' frame
+		const btVector3 &displacement,     // vector from origin of 'from' frame to origin of 'to' frame, in 'to' coordinates
+		const btVector3 &top_in,       // top part of input vector
+		const btVector3 &bottom_in,    // bottom part of input vector
+		btVector3 &top_out,         // top part of output vector
+		btVector3 &bottom_out);      // bottom part of output vector
+
+	void setLinkDynamicType(const int i, int type);
+
+	bool isLinkStaticOrKinematic(const int i) const;
+
+	bool isLinkKinematic(const int i) const;
+
+	bool isLinkAndAllAncestorsStaticOrKinematic(const int i) const;
+
+	bool isLinkAndAllAncestorsKinematic(const int i) const;
+
+	void setSleepThreshold(btScalar sleepThreshold)
+	{
+		m_sleepEpsilon = sleepThreshold;
+	}
+
+	void setSleepTimeout(btScalar sleepTimeout)
+	{
+		this->m_sleepTimeout = sleepTimeout;
+	}
+
+
+private:
+	btMultiBody(const btMultiBody &);     // not implemented
+	void operator=(const btMultiBody &);  // not implemented
+
+	void solveImatrix(const btVector3 &rhs_top, const btVector3 &rhs_bot, btScalar result[6]) const;
+	void solveImatrix(const btSpatialForceVector &rhs, btSpatialMotionVector &result) const;
+
+	void updateLinksDofOffsets()
+	{
+		int dofOffset = 0, cfgOffset = 0;
+		for (int bidx = 0; bidx < m_links.size(); ++bidx)
+		{
+			m_links[bidx].m_dofOffset = dofOffset;
+			m_links[bidx].m_cfgOffset = cfgOffset;
+			dofOffset += m_links[bidx].m_dofCount;
+			cfgOffset += m_links[bidx].m_posVarCount;
+		}
+	}
+
+	void mulMatrix(const btScalar *pA, const btScalar *pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const;
+
+private:
+	btMultiBodyLinkCollider *m_baseCollider;  //can be NULL
+	const char *m_baseName;                   //memory needs to be manager by user!
+
+	btVector3 m_basePos;      // position of COM of base (world frame)
+    btVector3 m_basePos_interpolate;      // position of interpolated COM of base (world frame)
+	btQuaternion m_baseQuat;  // rotates world points into base frame
+    btQuaternion m_baseQuat_interpolate;  
+
+	btScalar m_baseMass;      // mass of the base
+	btVector3 m_baseInertia;  // inertia of the base (in local frame; diagonal)
+
+	btVector3 m_baseForce;   // external force applied to base. World frame.
+	btVector3 m_baseTorque;  // external torque applied to base. World frame.
+
+	btVector3 m_baseConstraintForce;   // external force applied to base. World frame.
+	btVector3 m_baseConstraintTorque;  // external torque applied to base. World frame.
+
+	btAlignedObjectArray<btMultibodyLink> m_links;  // array of m_links, excluding the base. index from 0 to num_links-1.
+
+	//
+	// realBuf:
+	//  offset         size            array
+	//   0              6 + num_links   v (base_omega; base_vel; joint_vels)					MULTIDOF [sysdof x sysdof for D matrices (TOO MUCH!) + pos_delta which is sys-cfg sized]
+	//   6+num_links    num_links       D
+	//
+	// vectorBuf:
+	//  offset         size         array
+	//   0              num_links    h_top
+	//   num_links      num_links    h_bottom
+	//
+	// matrixBuf:
+	//  offset         size         array
+	//   0              num_links+1  rot_from_parent
+	//
+    btAlignedObjectArray<btScalar> m_splitV;
+	btAlignedObjectArray<btScalar> m_deltaV;
+	btAlignedObjectArray<btScalar> m_realBuf;
+	btAlignedObjectArray<btVector3> m_vectorBuf;
+	btAlignedObjectArray<btMatrix3x3> m_matrixBuf;
+
+	btMatrix3x3 m_cachedInertiaTopLeft;
+	btMatrix3x3 m_cachedInertiaTopRight;
+	btMatrix3x3 m_cachedInertiaLowerLeft;
+	btMatrix3x3 m_cachedInertiaLowerRight;
+	bool m_cachedInertiaValid;
+
+	bool m_fixedBase;
+
+	// Sleep parameters.
+	bool m_awake;
+	bool m_canSleep;
+	bool m_canWakeup;
+	btScalar m_sleepTimer;
+	btScalar m_sleepEpsilon;
+	btScalar m_sleepTimeout;
+
+	void *m_userObjectPointer;
+	int m_userIndex2;
+	int m_userIndex;
+
+	int m_companionId;
+	btScalar m_linearDamping;
+	btScalar m_angularDamping;
+	bool m_useGyroTerm;
+	btScalar m_maxAppliedImpulse;
+	btScalar m_maxCoordinateVelocity;
+	bool m_hasSelfCollision;
+
+	bool __posUpdated;
+	int m_dofCount, m_posVarCnt;
+
+	bool m_useRK4, m_useGlobalVelocities;
+	//for global velocities, see 8.3.2B Proposed resolution in Jakub Stepien PhD Thesis
+	//https://drive.google.com/file/d/0Bz3vEa19XOYGNWdZWGpMdUdqVmZ5ZVBOaEh4ZnpNaUxxZFNV/view?usp=sharing
+
+	///the m_needsJointFeedback gets updated/computed during the stepVelocitiesMultiDof and it for internal usage only
+	bool m_internalNeedsJointFeedback;
+
+  //If enabled, calculate the velocity based on kinematic transform changes. Currently only implemented for the base.
+	bool m_kinematic_calculate_velocity;
+};
+
+struct btMultiBodyLinkDoubleData
+{
+	btQuaternionDoubleData m_zeroRotParentToThis;
+	btVector3DoubleData m_parentComToThisPivotOffset;
+	btVector3DoubleData m_thisPivotToThisComOffset;
+	btVector3DoubleData m_jointAxisTop[6];
+	btVector3DoubleData m_jointAxisBottom[6];
+
+	btVector3DoubleData m_linkInertia;  // inertia of the base (in local frame; diagonal)
+	btVector3DoubleData m_absFrameTotVelocityTop;
+	btVector3DoubleData m_absFrameTotVelocityBottom;
+	btVector3DoubleData m_absFrameLocVelocityTop;
+	btVector3DoubleData m_absFrameLocVelocityBottom;
+
+	double m_linkMass;
+	int m_parentIndex;
+	int m_jointType;
+
+	int m_dofCount;
+	int m_posVarCount;
+	double m_jointPos[7];
+	double m_jointVel[6];
+	double m_jointTorque[6];
+
+	double m_jointDamping;
+	double m_jointFriction;
+	double m_jointLowerLimit;
+	double m_jointUpperLimit;
+	double m_jointMaxForce;
+	double m_jointMaxVelocity;
+
+	char *m_linkName;
+	char *m_jointName;
+	btCollisionObjectDoubleData *m_linkCollider;
+	char *m_paddingPtr;
+};
+
+struct btMultiBodyLinkFloatData
+{
+	btQuaternionFloatData m_zeroRotParentToThis;
+	btVector3FloatData m_parentComToThisPivotOffset;
+	btVector3FloatData m_thisPivotToThisComOffset;
+	btVector3FloatData m_jointAxisTop[6];
+	btVector3FloatData m_jointAxisBottom[6];
+	btVector3FloatData m_linkInertia;  // inertia of the base (in local frame; diagonal)
+	btVector3FloatData m_absFrameTotVelocityTop;
+	btVector3FloatData m_absFrameTotVelocityBottom;
+	btVector3FloatData m_absFrameLocVelocityTop;
+	btVector3FloatData m_absFrameLocVelocityBottom;
+
+	int m_dofCount;
+	float m_linkMass;
+	int m_parentIndex;
+	int m_jointType;
+
+	float m_jointPos[7];
+	float m_jointVel[6];
+	float m_jointTorque[6];
+	int m_posVarCount;
+	float m_jointDamping;
+	float m_jointFriction;
+	float m_jointLowerLimit;
+	float m_jointUpperLimit;
+	float m_jointMaxForce;
+	float m_jointMaxVelocity;
+
+	char *m_linkName;
+	char *m_jointName;
+	btCollisionObjectFloatData *m_linkCollider;
+	char *m_paddingPtr;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btMultiBodyDoubleData
+{
+	btVector3DoubleData m_baseWorldPosition;
+	btQuaternionDoubleData m_baseWorldOrientation;
+	btVector3DoubleData m_baseLinearVelocity;
+	btVector3DoubleData m_baseAngularVelocity;
+	btVector3DoubleData m_baseInertia;  // inertia of the base (in local frame; diagonal)
+	double m_baseMass;
+	int m_numLinks;
+	char m_padding[4];
+
+	char *m_baseName;
+	btMultiBodyLinkDoubleData *m_links;
+	btCollisionObjectDoubleData *m_baseCollider;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btMultiBodyFloatData
+{
+	btVector3FloatData m_baseWorldPosition;
+	btQuaternionFloatData m_baseWorldOrientation;
+	btVector3FloatData m_baseLinearVelocity;
+	btVector3FloatData m_baseAngularVelocity;
+
+	btVector3FloatData m_baseInertia;  // inertia of the base (in local frame; diagonal)
+	float m_baseMass;
+	int m_numLinks;
+
+	char *m_baseName;
+	btMultiBodyLinkFloatData *m_links;
+	btCollisionObjectFloatData *m_baseCollider;
+};
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp
new file mode 100644
index 0000000..00d5fd5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp
@@ -0,0 +1,389 @@
+#include "btMultiBodyConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "btMultiBodyPoint2Point.h"  //for testing (BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST macro)
+
+btMultiBodyConstraint::btMultiBodyConstraint(btMultiBody* bodyA, btMultiBody* bodyB, int linkA, int linkB, int numRows, bool isUnilateral, int type)
+	: m_bodyA(bodyA),
+	  m_bodyB(bodyB),
+	  m_linkA(linkA),
+	  m_linkB(linkB),
+	  m_type(type),
+	  m_numRows(numRows),
+	  m_jacSizeA(0),
+	  m_jacSizeBoth(0),
+	  m_isUnilateral(isUnilateral),
+	  m_numDofsFinalized(-1),
+	  m_maxAppliedImpulse(100)
+{
+}
+
+void btMultiBodyConstraint::updateJacobianSizes()
+{
+	if (m_bodyA)
+	{
+		m_jacSizeA = (6 + m_bodyA->getNumDofs());
+	}
+
+	if (m_bodyB)
+	{
+		m_jacSizeBoth = m_jacSizeA + 6 + m_bodyB->getNumDofs();
+	}
+	else
+		m_jacSizeBoth = m_jacSizeA;
+}
+
+void btMultiBodyConstraint::allocateJacobiansMultiDof()
+{
+	updateJacobianSizes();
+
+	m_posOffset = ((1 + m_jacSizeBoth) * m_numRows);
+	m_data.resize((2 + m_jacSizeBoth) * m_numRows);
+}
+
+btMultiBodyConstraint::~btMultiBodyConstraint()
+{
+}
+
+void btMultiBodyConstraint::applyDeltaVee(btMultiBodyJacobianData& data, btScalar* delta_vee, btScalar impulse, int velocityIndex, int ndof)
+{
+	for (int i = 0; i < ndof; ++i)
+		data.m_deltaVelocities[velocityIndex + i] += delta_vee[i] * impulse;
+}
+
+btScalar btMultiBodyConstraint::fillMultiBodyConstraint(btMultiBodySolverConstraint& solverConstraint,
+														btMultiBodyJacobianData& data,
+														btScalar* jacOrgA, btScalar* jacOrgB,
+														const btVector3& constraintNormalAng,
+														const btVector3& constraintNormalLin,
+														const btVector3& posAworld, const btVector3& posBworld,
+														btScalar posError,
+														const btContactSolverInfo& infoGlobal,
+														btScalar lowerLimit, btScalar upperLimit,
+														bool angConstraint,
+														btScalar relaxation,
+														bool isFriction, btScalar desiredVelocity, btScalar cfmSlip,
+														btScalar damping)
+{
+	solverConstraint.m_multiBodyA = m_bodyA;
+	solverConstraint.m_multiBodyB = m_bodyB;
+	solverConstraint.m_linkA = m_linkA;
+	solverConstraint.m_linkB = m_linkB;
+
+	btMultiBody* multiBodyA = solverConstraint.m_multiBodyA;
+	btMultiBody* multiBodyB = solverConstraint.m_multiBodyB;
+
+	btSolverBody* bodyA = multiBodyA ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdA);
+	btSolverBody* bodyB = multiBodyB ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdB);
+
+	btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody;
+	btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody;
+
+	btVector3 rel_pos1, rel_pos2;  //these two used to be inited to posAworld and posBworld (respectively) but it does not seem necessary
+	if (bodyA)
+		rel_pos1 = posAworld - bodyA->getWorldTransform().getOrigin();
+	if (bodyB)
+		rel_pos2 = posBworld - bodyB->getWorldTransform().getOrigin();
+
+	if (multiBodyA)
+	{
+		if (solverConstraint.m_linkA < 0)
+		{
+			rel_pos1 = posAworld - multiBodyA->getBasePos();
+		}
+		else
+		{
+			rel_pos1 = posAworld - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin();
+		}
+
+		const int ndofA = multiBodyA->getNumDofs() + 6;
+
+		solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId();
+
+		if (solverConstraint.m_deltaVelAindex < 0)
+		{
+			solverConstraint.m_deltaVelAindex = data.m_deltaVelocities.size();
+			multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex);
+			data.m_deltaVelocities.resize(data.m_deltaVelocities.size() + ndofA);
+		}
+		else
+		{
+			btAssert(data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex + ndofA);
+		}
+
+		//determine jacobian of this 1D constraint in terms of multibodyA's degrees of freedom
+		//resize..
+		solverConstraint.m_jacAindex = data.m_jacobians.size();
+		data.m_jacobians.resize(data.m_jacobians.size() + ndofA);
+		//copy/determine
+		if (jacOrgA)
+		{
+			for (int i = 0; i < ndofA; i++)
+				data.m_jacobians[solverConstraint.m_jacAindex + i] = jacOrgA[i];
+		}
+		else
+		{
+			btScalar* jac1 = &data.m_jacobians[solverConstraint.m_jacAindex];
+			//multiBodyA->fillContactJacobianMultiDof(solverConstraint.m_linkA, posAworld, constraintNormalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m);
+			multiBodyA->fillConstraintJacobianMultiDof(solverConstraint.m_linkA, posAworld, constraintNormalAng, constraintNormalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m);
+		}
+
+		//determine the velocity response of multibodyA to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint)
+		//resize..
+		data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size() + ndofA);  //=> each constraint row has the constrained tree dofs allocated in m_deltaVelocitiesUnitImpulse
+		btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size());
+		btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+		//determine..
+		multiBodyA->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacAindex], delta, data.scratch_r, data.scratch_v);
+
+		btVector3 torqueAxis0;
+		if (angConstraint)
+		{
+			torqueAxis0 = constraintNormalAng;
+		}
+		else
+		{
+			torqueAxis0 = rel_pos1.cross(constraintNormalLin);
+		}
+		solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+		solverConstraint.m_contactNormal1 = constraintNormalLin;
+	}
+	else  //if(rb0)
+	{
+		btVector3 torqueAxis0;
+		if (angConstraint)
+		{
+			torqueAxis0 = constraintNormalAng;
+		}
+		else
+		{
+			torqueAxis0 = rel_pos1.cross(constraintNormalLin);
+		}
+		solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld() * torqueAxis0 * rb0->getAngularFactor() : btVector3(0, 0, 0);
+		solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+		solverConstraint.m_contactNormal1 = constraintNormalLin;
+	}
+
+	if (multiBodyB)
+	{
+		if (solverConstraint.m_linkB < 0)
+		{
+			rel_pos2 = posBworld - multiBodyB->getBasePos();
+		}
+		else
+		{
+			rel_pos2 = posBworld - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin();
+		}
+
+		const int ndofB = multiBodyB->getNumDofs() + 6;
+
+		solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId();
+		if (solverConstraint.m_deltaVelBindex < 0)
+		{
+			solverConstraint.m_deltaVelBindex = data.m_deltaVelocities.size();
+			multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex);
+			data.m_deltaVelocities.resize(data.m_deltaVelocities.size() + ndofB);
+		}
+
+		//determine jacobian of this 1D constraint in terms of multibodyB's degrees of freedom
+		//resize..
+		solverConstraint.m_jacBindex = data.m_jacobians.size();
+		data.m_jacobians.resize(data.m_jacobians.size() + ndofB);
+		//copy/determine..
+		if (jacOrgB)
+		{
+			for (int i = 0; i < ndofB; i++)
+				data.m_jacobians[solverConstraint.m_jacBindex + i] = jacOrgB[i];
+		}
+		else
+		{
+			//multiBodyB->fillContactJacobianMultiDof(solverConstraint.m_linkB, posBworld, -constraintNormalLin, &data.m_jacobians[solverConstraint.m_jacBindex], data.scratch_r, data.scratch_v, data.scratch_m);
+			multiBodyB->fillConstraintJacobianMultiDof(solverConstraint.m_linkB, posBworld, -constraintNormalAng, -constraintNormalLin, &data.m_jacobians[solverConstraint.m_jacBindex], data.scratch_r, data.scratch_v, data.scratch_m);
+		}
+
+		//determine velocity response of multibodyB to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint)
+		//resize..
+		data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size() + ndofB);
+		btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size());
+		btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
+		//determine..
+		multiBodyB->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacBindex], delta, data.scratch_r, data.scratch_v);
+
+		btVector3 torqueAxis1;
+		if (angConstraint)
+		{
+			torqueAxis1 = constraintNormalAng;
+		}
+		else
+		{
+			torqueAxis1 = rel_pos2.cross(constraintNormalLin);
+		}
+		solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
+		solverConstraint.m_contactNormal2 = -constraintNormalLin;
+	}
+	else  //if(rb1)
+	{
+		btVector3 torqueAxis1;
+		if (angConstraint)
+		{
+			torqueAxis1 = constraintNormalAng;
+		}
+		else
+		{
+			torqueAxis1 = rel_pos2.cross(constraintNormalLin);
+		}
+		solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld() * -torqueAxis1 * rb1->getAngularFactor() : btVector3(0, 0, 0);
+		solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
+		solverConstraint.m_contactNormal2 = -constraintNormalLin;
+	}
+	{
+		btVector3 vec;
+		btScalar denom0 = 0.f;
+		btScalar denom1 = 0.f;
+		btScalar* jacB = 0;
+		btScalar* jacA = 0;
+		btScalar* deltaVelA = 0;
+		btScalar* deltaVelB = 0;
+		int ndofA = 0;
+		//determine the "effective mass" of the constrained multibodyA with respect to this 1D constraint (i.e. 1/A[i,i])
+		if (multiBodyA)
+		{
+			ndofA = multiBodyA->getNumDofs() + 6;
+			jacA = &data.m_jacobians[solverConstraint.m_jacAindex];
+			deltaVelA = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+			for (int i = 0; i < ndofA; ++i)
+			{
+				btScalar j = jacA[i];
+				btScalar l = deltaVelA[i];
+				denom0 += j * l;
+			}
+		}
+		else if (rb0)
+		{
+			vec = (solverConstraint.m_angularComponentA).cross(rel_pos1);
+			if (angConstraint)
+			{
+				denom0 = constraintNormalAng.dot(solverConstraint.m_angularComponentA);
+			}
+			else
+			{
+				denom0 = rb0->getInvMass() + constraintNormalLin.dot(vec);
+			}
+		}
+		//
+		if (multiBodyB)
+		{
+			const int ndofB = multiBodyB->getNumDofs() + 6;
+			jacB = &data.m_jacobians[solverConstraint.m_jacBindex];
+			deltaVelB = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
+			for (int i = 0; i < ndofB; ++i)
+			{
+				btScalar j = jacB[i];
+				btScalar l = deltaVelB[i];
+				denom1 += j * l;
+			}
+		}
+		else if (rb1)
+		{
+			vec = (-solverConstraint.m_angularComponentB).cross(rel_pos2);
+			if (angConstraint)
+			{
+				denom1 = constraintNormalAng.dot(-solverConstraint.m_angularComponentB);
+			}
+			else
+			{
+				denom1 = rb1->getInvMass() + constraintNormalLin.dot(vec);
+			}
+		}
+
+		//
+		btScalar d = denom0 + denom1;
+		if (d > SIMD_EPSILON)
+		{
+			solverConstraint.m_jacDiagABInv = relaxation / (d);
+		}
+		else
+		{
+			//disable the constraint row to handle singularity/redundant constraint
+			solverConstraint.m_jacDiagABInv = 0.f;
+		}
+	}
+
+	//compute rhs and remaining solverConstraint fields
+	btScalar penetration = isFriction ? 0 : posError;
+
+	btScalar rel_vel = 0.f;
+	int ndofA = 0;
+	int ndofB = 0;
+	{
+		btVector3 vel1, vel2;
+		if (multiBodyA)
+		{
+			ndofA = multiBodyA->getNumDofs() + 6;
+			btScalar* jacA = &data.m_jacobians[solverConstraint.m_jacAindex];
+			for (int i = 0; i < ndofA; ++i)
+				rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i];
+		}
+		else if (rb0)
+		{
+			rel_vel += rb0->getLinearVelocity().dot(solverConstraint.m_contactNormal1);
+			rel_vel += rb0->getAngularVelocity().dot(solverConstraint.m_relpos1CrossNormal);
+		}
+		if (multiBodyB)
+		{
+			ndofB = multiBodyB->getNumDofs() + 6;
+			btScalar* jacB = &data.m_jacobians[solverConstraint.m_jacBindex];
+			for (int i = 0; i < ndofB; ++i)
+				rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i];
+		}
+		else if (rb1)
+		{
+			rel_vel += rb1->getLinearVelocity().dot(solverConstraint.m_contactNormal2);
+			rel_vel += rb1->getAngularVelocity().dot(solverConstraint.m_relpos2CrossNormal);
+		}
+
+		solverConstraint.m_friction = 0.f;  //cp.m_combinedFriction;
+	}
+
+	solverConstraint.m_appliedImpulse = 0.f;
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	{
+		btScalar positionalError = 0.f;
+		btScalar velocityError = (desiredVelocity - rel_vel) * damping;
+
+		btScalar erp = infoGlobal.m_erp2;
+
+		//split impulse is not implemented yet for btMultiBody*
+		//if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+		{
+			erp = infoGlobal.m_erp;
+		}
+
+		positionalError = -penetration * erp / infoGlobal.m_timeStep;
+
+		btScalar penetrationImpulse = positionalError * solverConstraint.m_jacDiagABInv;
+		btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+
+		//split impulse is not implemented yet for btMultiBody*
+
+		//  if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+		{
+			//combine position and velocity into rhs
+			solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+			solverConstraint.m_rhsPenetration = 0.f;
+		}
+		/*else
+        {
+            //split position and velocity into rhs and m_rhsPenetration
+            solverConstraint.m_rhs = velocityImpulse;
+            solverConstraint.m_rhsPenetration = penetrationImpulse;
+        }
+        */
+
+		solverConstraint.m_cfm = 0.f;
+		solverConstraint.m_lowerLimit = lowerLimit;
+		solverConstraint.m_upperLimit = upperLimit;
+	}
+
+	return rel_vel;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h
new file mode 100644
index 0000000..7287ccc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h
@@ -0,0 +1,215 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_CONSTRAINT_H
+#define BT_MULTIBODY_CONSTRAINT_H
+
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "btMultiBody.h"
+
+
+//Don't change any of the existing enum values, so add enum types at the end for serialization compatibility
+enum btTypedMultiBodyConstraintType
+{
+	MULTIBODY_CONSTRAINT_LIMIT=3,
+	MULTIBODY_CONSTRAINT_1DOF_JOINT_MOTOR,
+	MULTIBODY_CONSTRAINT_GEAR,
+	MULTIBODY_CONSTRAINT_POINT_TO_POINT,
+	MULTIBODY_CONSTRAINT_SLIDER,
+	MULTIBODY_CONSTRAINT_SPHERICAL_MOTOR,
+	MULTIBODY_CONSTRAINT_FIXED,
+	MULTIBODY_CONSTRAINT_SPHERICAL_LIMIT,
+	MAX_MULTIBODY_CONSTRAINT_TYPE,
+};
+
+class btMultiBody;
+struct btSolverInfo;
+
+#include "btMultiBodySolverConstraint.h"
+
+struct btMultiBodyJacobianData
+{
+	btAlignedObjectArray<btScalar> m_jacobians;
+	btAlignedObjectArray<btScalar> m_deltaVelocitiesUnitImpulse;  //holds the joint-space response of the corresp. tree to the test impulse in each constraint space dimension
+	btAlignedObjectArray<btScalar> m_deltaVelocities;             //holds joint-space vectors of all the constrained trees accumulating the effect of corrective impulses applied in SI
+	btAlignedObjectArray<btScalar> scratch_r;
+	btAlignedObjectArray<btVector3> scratch_v;
+	btAlignedObjectArray<btMatrix3x3> scratch_m;
+	btAlignedObjectArray<btSolverBody>* m_solverBodyPool;
+	int m_fixedBodyId;
+};
+
+ATTRIBUTE_ALIGNED16(class)
+btMultiBodyConstraint
+{
+protected:
+	btMultiBody* m_bodyA;
+	btMultiBody* m_bodyB;
+	int m_linkA;
+	int m_linkB;
+
+	int m_type; //btTypedMultiBodyConstraintType
+
+	int m_numRows;
+	int m_jacSizeA;
+	int m_jacSizeBoth;
+	int m_posOffset;
+
+	bool m_isUnilateral;
+	int m_numDofsFinalized;
+	btScalar m_maxAppliedImpulse;
+
+	// warning: the data block lay out is not consistent for all constraints
+	// data block laid out as follows:
+	// cached impulses. (one per row.)
+	// jacobians. (interleaved, row1 body1 then row1 body2 then row2 body 1 etc)
+	// positions. (one per row.)
+	btAlignedObjectArray<btScalar> m_data;
+
+	void applyDeltaVee(btMultiBodyJacobianData & data, btScalar * delta_vee, btScalar impulse, int velocityIndex, int ndof);
+
+	btScalar fillMultiBodyConstraint(btMultiBodySolverConstraint & solverConstraint,
+									 btMultiBodyJacobianData & data,
+									 btScalar * jacOrgA, btScalar * jacOrgB,
+									 const btVector3& constraintNormalAng,
+
+									 const btVector3& constraintNormalLin,
+									 const btVector3& posAworld, const btVector3& posBworld,
+									 btScalar posError,
+									 const btContactSolverInfo& infoGlobal,
+									 btScalar lowerLimit, btScalar upperLimit,
+									 bool angConstraint = false,
+
+									 btScalar relaxation = 1.f,
+									 bool isFriction = false, btScalar desiredVelocity = 0, btScalar cfmSlip = 0, btScalar damping = 1.0);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btMultiBodyConstraint(btMultiBody * bodyA, btMultiBody * bodyB, int linkA, int linkB, int numRows, bool isUnilateral, int type);
+	virtual ~btMultiBodyConstraint();
+
+	void updateJacobianSizes();
+	void allocateJacobiansMultiDof();
+
+	int getConstraintType() const
+	{
+		return m_type;
+	}
+	//many constraints have setFrameInB/setPivotInB. Will use 'getConstraintType' later.
+	virtual void setFrameInB(const btMatrix3x3& frameInB) {}
+	virtual void setPivotInB(const btVector3& pivotInB) {}
+
+	virtual void finalizeMultiDof() = 0;
+
+	virtual int getIslandIdA() const = 0;
+	virtual int getIslandIdB() const = 0;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray & constraintRows,
+									  btMultiBodyJacobianData & data,
+									  const btContactSolverInfo& infoGlobal) = 0;
+
+	int getNumRows() const
+	{
+		return m_numRows;
+	}
+
+	btMultiBody* getMultiBodyA()
+	{
+		return m_bodyA;
+	}
+	btMultiBody* getMultiBodyB()
+	{
+		return m_bodyB;
+	}
+
+	int getLinkA() const
+	{
+		return m_linkA;
+	}
+	int getLinkB() const
+	{
+		return m_linkB;
+	}
+	void internalSetAppliedImpulse(int dof, btScalar appliedImpulse)
+	{
+		btAssert(dof >= 0);
+		btAssert(dof < getNumRows());
+		m_data[dof] = appliedImpulse;
+	}
+
+	btScalar getAppliedImpulse(int dof)
+	{
+		btAssert(dof >= 0);
+		btAssert(dof < getNumRows());
+		return m_data[dof];
+	}
+	// current constraint position
+	// constraint is pos >= 0 for unilateral, or pos = 0 for bilateral
+	// NOTE: ignored position for friction rows.
+	btScalar getPosition(int row) const
+	{
+		return m_data[m_posOffset + row];
+	}
+
+	void setPosition(int row, btScalar pos)
+	{
+		m_data[m_posOffset + row] = pos;
+	}
+
+	bool isUnilateral() const
+	{
+		return m_isUnilateral;
+	}
+
+	// jacobian blocks.
+	// each of size 6 + num_links. (jacobian2 is null if no body2.)
+	// format: 3 'omega' coefficients, 3 'v' coefficients, then the 'qdot' coefficients.
+	btScalar* jacobianA(int row)
+	{
+		return &m_data[m_numRows + row * m_jacSizeBoth];
+	}
+	const btScalar* jacobianA(int row) const
+	{
+		return &m_data[m_numRows + (row * m_jacSizeBoth)];
+	}
+	btScalar* jacobianB(int row)
+	{
+		return &m_data[m_numRows + (row * m_jacSizeBoth) + m_jacSizeA];
+	}
+	const btScalar* jacobianB(int row) const
+	{
+		return &m_data[m_numRows + (row * m_jacSizeBoth) + m_jacSizeA];
+	}
+
+	btScalar getMaxAppliedImpulse() const
+	{
+		return m_maxAppliedImpulse;
+	}
+	void setMaxAppliedImpulse(btScalar maxImp)
+	{
+		m_maxAppliedImpulse = maxImp;
+	}
+
+	virtual void debugDraw(class btIDebugDraw * drawer) = 0;
+
+	virtual void setGearRatio(btScalar ratio) {}
+	virtual void setGearAuxLink(int gearAuxLink) {}
+	virtual void setRelativePositionTarget(btScalar relPosTarget) {}
+	virtual void setErp(btScalar erp) {}
+};
+
+#endif  //BT_MULTIBODY_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
new file mode 100644
index 0000000..2788367
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
@@ -0,0 +1,1752 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btMultiBodyConstraintSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "btMultiBodyLinkCollider.h"
+
+#include "BulletDynamics/ConstraintSolver/btSolverBody.h"
+#include "btMultiBodyConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+
+#include "LinearMath/btQuickprof.h"
+#include "BulletDynamics/Featherstone/btMultiBodySolverConstraint.h"
+#include "LinearMath/btScalar.h"
+
+btScalar btMultiBodyConstraintSolver::solveSingleIteration(int iteration, btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	btScalar leastSquaredResidual = btSequentialImpulseConstraintSolver::solveSingleIteration(iteration, bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+	//solve featherstone non-contact constraints
+	btScalar nonContactResidual = 0;
+	//printf("m_multiBodyNonContactConstraints = %d\n",m_multiBodyNonContactConstraints.size());
+	for (int i = 0; i < infoGlobal.m_numNonContactInnerIterations; ++i)
+	{
+		// reset the nonContactResdual to 0 at start of each inner iteration
+		nonContactResidual = 0;
+		for (int j = 0; j < m_multiBodyNonContactConstraints.size(); j++)
+		{
+			int index = iteration & 1 ? j : m_multiBodyNonContactConstraints.size() - 1 - j;
+
+			btMultiBodySolverConstraint& constraint = m_multiBodyNonContactConstraints[index];
+
+			btScalar residual = resolveSingleConstraintRowGeneric(constraint);
+			nonContactResidual = btMax(nonContactResidual, residual * residual);
+
+			if (constraint.m_multiBodyA)
+				constraint.m_multiBodyA->setPosUpdated(false);
+			if (constraint.m_multiBodyB)
+				constraint.m_multiBodyB->setPosUpdated(false);
+		}
+	}
+	leastSquaredResidual = btMax(leastSquaredResidual, nonContactResidual);
+
+	//solve featherstone normal contact
+	for (int j0 = 0; j0 < m_multiBodyNormalContactConstraints.size(); j0++)
+	{
+		int index = j0;  //iteration&1? j0 : m_multiBodyNormalContactConstraints.size()-1-j0;
+
+		btMultiBodySolverConstraint& constraint = m_multiBodyNormalContactConstraints[index];
+		btScalar residual = 0.f;
+
+		if (iteration < infoGlobal.m_numIterations)
+		{
+			residual = resolveSingleConstraintRowGeneric(constraint);
+		}
+
+		leastSquaredResidual = btMax(leastSquaredResidual, residual * residual);
+
+		if (constraint.m_multiBodyA)
+			constraint.m_multiBodyA->setPosUpdated(false);
+		if (constraint.m_multiBodyB)
+			constraint.m_multiBodyB->setPosUpdated(false);
+	}
+
+	//solve featherstone frictional contact
+	if (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS && ((infoGlobal.m_solverMode & SOLVER_DISABLE_IMPLICIT_CONE_FRICTION) == 0))
+	{
+		for (int j1 = 0; j1 < this->m_multiBodySpinningFrictionContactConstraints.size(); j1++)
+		{
+			if (iteration < infoGlobal.m_numIterations)
+			{
+				int index = j1;
+
+				btMultiBodySolverConstraint& frictionConstraint = m_multiBodySpinningFrictionContactConstraints[index];
+				btScalar totalImpulse = m_multiBodyNormalContactConstraints[frictionConstraint.m_frictionIndex].m_appliedImpulse;
+				//adjust friction limits here
+				if (totalImpulse > btScalar(0))
+				{
+					frictionConstraint.m_lowerLimit = -(frictionConstraint.m_friction * totalImpulse);
+					frictionConstraint.m_upperLimit = frictionConstraint.m_friction * totalImpulse;
+					btScalar residual = resolveSingleConstraintRowGeneric(frictionConstraint);
+					leastSquaredResidual = btMax(leastSquaredResidual, residual * residual);
+
+					if (frictionConstraint.m_multiBodyA)
+						frictionConstraint.m_multiBodyA->setPosUpdated(false);
+					if (frictionConstraint.m_multiBodyB)
+						frictionConstraint.m_multiBodyB->setPosUpdated(false);
+				}
+			}
+		}
+
+		for (int j1 = 0; j1 < this->m_multiBodyTorsionalFrictionContactConstraints.size(); j1++)
+		{
+			if (iteration < infoGlobal.m_numIterations)
+			{
+				int index = j1;  //iteration&1? j1 : m_multiBodyTorsionalFrictionContactConstraints.size()-1-j1;
+
+				btMultiBodySolverConstraint& frictionConstraint = m_multiBodyTorsionalFrictionContactConstraints[index];
+				btScalar totalImpulse = m_multiBodyNormalContactConstraints[frictionConstraint.m_frictionIndex].m_appliedImpulse;
+				j1++;
+				int index2 = j1;
+				btMultiBodySolverConstraint& frictionConstraintB = m_multiBodyTorsionalFrictionContactConstraints[index2];
+				//adjust friction limits here
+				if (totalImpulse > btScalar(0) && frictionConstraint.m_frictionIndex == frictionConstraintB.m_frictionIndex)
+				{
+					frictionConstraint.m_lowerLimit = -(frictionConstraint.m_friction * totalImpulse);
+					frictionConstraint.m_upperLimit = frictionConstraint.m_friction * totalImpulse;
+					frictionConstraintB.m_lowerLimit = -(frictionConstraintB.m_friction * totalImpulse);
+					frictionConstraintB.m_upperLimit = frictionConstraintB.m_friction * totalImpulse;
+
+					btScalar residual = resolveConeFrictionConstraintRows(frictionConstraint, frictionConstraintB);
+					leastSquaredResidual = btMax(leastSquaredResidual, residual * residual);
+
+					if (frictionConstraint.m_multiBodyA)
+						frictionConstraint.m_multiBodyA->setPosUpdated(false);
+					if (frictionConstraint.m_multiBodyB)
+						frictionConstraint.m_multiBodyB->setPosUpdated(false);
+
+					if (frictionConstraintB.m_multiBodyA)
+						frictionConstraintB.m_multiBodyA->setPosUpdated(false);
+					if (frictionConstraintB.m_multiBodyB)
+						frictionConstraintB.m_multiBodyB->setPosUpdated(false);
+				}
+			}
+		}
+
+		for (int j1 = 0; j1 < this->m_multiBodyFrictionContactConstraints.size(); j1++)
+		{
+			if (iteration < infoGlobal.m_numIterations)
+			{
+				int index = j1;  //iteration&1? j1 : m_multiBodyFrictionContactConstraints.size()-1-j1;
+				btMultiBodySolverConstraint& frictionConstraint = m_multiBodyFrictionContactConstraints[index];
+
+				btScalar totalImpulse = m_multiBodyNormalContactConstraints[frictionConstraint.m_frictionIndex].m_appliedImpulse;
+				j1++;
+				int index2 = j1;  //iteration&1? j1 : m_multiBodyFrictionContactConstraints.size()-1-j1;
+				btMultiBodySolverConstraint& frictionConstraintB = m_multiBodyFrictionContactConstraints[index2];
+				btAssert(frictionConstraint.m_frictionIndex == frictionConstraintB.m_frictionIndex);
+
+				if (frictionConstraint.m_frictionIndex == frictionConstraintB.m_frictionIndex)
+				{
+					frictionConstraint.m_lowerLimit = -(frictionConstraint.m_friction * totalImpulse);
+					frictionConstraint.m_upperLimit = frictionConstraint.m_friction * totalImpulse;
+					frictionConstraintB.m_lowerLimit = -(frictionConstraintB.m_friction * totalImpulse);
+					frictionConstraintB.m_upperLimit = frictionConstraintB.m_friction * totalImpulse;
+					btScalar residual = resolveConeFrictionConstraintRows(frictionConstraint, frictionConstraintB);
+					leastSquaredResidual = btMax(leastSquaredResidual, residual * residual);
+
+					if (frictionConstraintB.m_multiBodyA)
+						frictionConstraintB.m_multiBodyA->setPosUpdated(false);
+					if (frictionConstraintB.m_multiBodyB)
+						frictionConstraintB.m_multiBodyB->setPosUpdated(false);
+
+					if (frictionConstraint.m_multiBodyA)
+						frictionConstraint.m_multiBodyA->setPosUpdated(false);
+					if (frictionConstraint.m_multiBodyB)
+						frictionConstraint.m_multiBodyB->setPosUpdated(false);
+				}
+			}
+		}
+	}
+	else
+	{
+		for (int j1 = 0; j1 < this->m_multiBodyFrictionContactConstraints.size(); j1++)
+		{
+			if (iteration < infoGlobal.m_numIterations)
+			{
+				int index = j1;  //iteration&1? j1 : m_multiBodyFrictionContactConstraints.size()-1-j1;
+
+				btMultiBodySolverConstraint& frictionConstraint = m_multiBodyFrictionContactConstraints[index];
+				btScalar totalImpulse = m_multiBodyNormalContactConstraints[frictionConstraint.m_frictionIndex].m_appliedImpulse;
+				//adjust friction limits here
+				if (totalImpulse > btScalar(0))
+				{
+					frictionConstraint.m_lowerLimit = -(frictionConstraint.m_friction * totalImpulse);
+					frictionConstraint.m_upperLimit = frictionConstraint.m_friction * totalImpulse;
+					btScalar residual = resolveSingleConstraintRowGeneric(frictionConstraint);
+					leastSquaredResidual = btMax(leastSquaredResidual, residual * residual);
+
+					if (frictionConstraint.m_multiBodyA)
+						frictionConstraint.m_multiBodyA->setPosUpdated(false);
+					if (frictionConstraint.m_multiBodyB)
+						frictionConstraint.m_multiBodyB->setPosUpdated(false);
+				}
+			}
+		}
+	}
+	return leastSquaredResidual;
+}
+
+btScalar btMultiBodyConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	m_multiBodyNonContactConstraints.resize(0);
+	m_multiBodyNormalContactConstraints.resize(0);
+	m_multiBodyFrictionContactConstraints.resize(0);
+	m_multiBodyTorsionalFrictionContactConstraints.resize(0);
+	m_multiBodySpinningFrictionContactConstraints.resize(0);
+
+	m_data.m_jacobians.resize(0);
+	m_data.m_deltaVelocitiesUnitImpulse.resize(0);
+	m_data.m_deltaVelocities.resize(0);
+
+	for (int i = 0; i < numBodies; i++)
+	{
+		const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(bodies[i]);
+		if (fcA)
+		{
+			fcA->m_multiBody->setCompanionId(-1);
+		}
+	}
+
+	btScalar val = btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+	return val;
+}
+
+void btMultiBodyConstraintSolver::applyDeltaVee(btScalar* delta_vee, btScalar impulse, int velocityIndex, int ndof)
+{
+	for (int i = 0; i < ndof; ++i)
+		m_data.m_deltaVelocities[velocityIndex + i] += delta_vee[i] * impulse;
+}
+
+btScalar btMultiBodyConstraintSolver::resolveSingleConstraintRowGeneric(const btMultiBodySolverConstraint& c)
+{
+	btScalar deltaImpulse = c.m_rhs - btScalar(c.m_appliedImpulse) * c.m_cfm;
+	btScalar deltaVelADotn = 0;
+	btScalar deltaVelBDotn = 0;
+	btSolverBody* bodyA = 0;
+	btSolverBody* bodyB = 0;
+	int ndofA = 0;
+	int ndofB = 0;
+
+	if (c.m_multiBodyA)
+	{
+		ndofA = c.m_multiBodyA->getNumDofs() + 6;
+		for (int i = 0; i < ndofA; ++i)
+			deltaVelADotn += m_data.m_jacobians[c.m_jacAindex + i] * m_data.m_deltaVelocities[c.m_deltaVelAindex + i];
+	}
+	else if (c.m_solverBodyIdA >= 0)
+	{
+		bodyA = &m_tmpSolverBodyPool[c.m_solverBodyIdA];
+		deltaVelADotn += c.m_contactNormal1.dot(bodyA->internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(bodyA->internalGetDeltaAngularVelocity());
+	}
+
+	if (c.m_multiBodyB)
+	{
+		ndofB = c.m_multiBodyB->getNumDofs() + 6;
+		for (int i = 0; i < ndofB; ++i)
+			deltaVelBDotn += m_data.m_jacobians[c.m_jacBindex + i] * m_data.m_deltaVelocities[c.m_deltaVelBindex + i];
+	}
+	else if (c.m_solverBodyIdB >= 0)
+	{
+		bodyB = &m_tmpSolverBodyPool[c.m_solverBodyIdB];
+		deltaVelBDotn += c.m_contactNormal2.dot(bodyB->internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(bodyB->internalGetDeltaAngularVelocity());
+	}
+
+	deltaImpulse -= deltaVelADotn * c.m_jacDiagABInv;  //m_jacDiagABInv = 1./denom
+	deltaImpulse -= deltaVelBDotn * c.m_jacDiagABInv;
+	const btScalar sum = btScalar(c.m_appliedImpulse) + deltaImpulse;
+
+	if (sum < c.m_lowerLimit)
+	{
+		deltaImpulse = c.m_lowerLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_lowerLimit;
+	}
+	else if (sum > c.m_upperLimit)
+	{
+		deltaImpulse = c.m_upperLimit - c.m_appliedImpulse;
+		c.m_appliedImpulse = c.m_upperLimit;
+	}
+	else
+	{
+		c.m_appliedImpulse = sum;
+	}
+
+	if (c.m_multiBodyA)
+	{
+		applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex], deltaImpulse, c.m_deltaVelAindex, ndofA);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+		//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+		//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+		c.m_multiBodyA->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex], deltaImpulse);
+#endif  //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+	}
+	else if (c.m_solverBodyIdA >= 0)
+	{
+		bodyA->internalApplyImpulse(c.m_contactNormal1 * bodyA->internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+	}
+	if (c.m_multiBodyB)
+	{
+		applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex], deltaImpulse, c.m_deltaVelBindex, ndofB);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+		//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+		//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+		c.m_multiBodyB->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex], deltaImpulse);
+#endif  //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+	}
+	else if (c.m_solverBodyIdB >= 0)
+	{
+		bodyB->internalApplyImpulse(c.m_contactNormal2 * bodyB->internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+	}
+	btScalar deltaVel = deltaImpulse / c.m_jacDiagABInv;
+	return deltaVel;
+}
+
+btScalar btMultiBodyConstraintSolver::resolveConeFrictionConstraintRows(const btMultiBodySolverConstraint& cA1, const btMultiBodySolverConstraint& cB)
+{
+	int ndofA = 0;
+	int ndofB = 0;
+	btSolverBody* bodyA = 0;
+	btSolverBody* bodyB = 0;
+	btScalar deltaImpulseB = 0.f;
+	btScalar sumB = 0.f;
+	{
+		deltaImpulseB = cB.m_rhs - btScalar(cB.m_appliedImpulse) * cB.m_cfm;
+		btScalar deltaVelADotn = 0;
+		btScalar deltaVelBDotn = 0;
+		if (cB.m_multiBodyA)
+		{
+			ndofA = cB.m_multiBodyA->getNumDofs() + 6;
+			for (int i = 0; i < ndofA; ++i)
+				deltaVelADotn += m_data.m_jacobians[cB.m_jacAindex + i] * m_data.m_deltaVelocities[cB.m_deltaVelAindex + i];
+		}
+		else if (cB.m_solverBodyIdA >= 0)
+		{
+			bodyA = &m_tmpSolverBodyPool[cB.m_solverBodyIdA];
+			deltaVelADotn += cB.m_contactNormal1.dot(bodyA->internalGetDeltaLinearVelocity()) + cB.m_relpos1CrossNormal.dot(bodyA->internalGetDeltaAngularVelocity());
+		}
+
+		if (cB.m_multiBodyB)
+		{
+			ndofB = cB.m_multiBodyB->getNumDofs() + 6;
+			for (int i = 0; i < ndofB; ++i)
+				deltaVelBDotn += m_data.m_jacobians[cB.m_jacBindex + i] * m_data.m_deltaVelocities[cB.m_deltaVelBindex + i];
+		}
+		else if (cB.m_solverBodyIdB >= 0)
+		{
+			bodyB = &m_tmpSolverBodyPool[cB.m_solverBodyIdB];
+			deltaVelBDotn += cB.m_contactNormal2.dot(bodyB->internalGetDeltaLinearVelocity()) + cB.m_relpos2CrossNormal.dot(bodyB->internalGetDeltaAngularVelocity());
+		}
+
+		deltaImpulseB -= deltaVelADotn * cB.m_jacDiagABInv;  //m_jacDiagABInv = 1./denom
+		deltaImpulseB -= deltaVelBDotn * cB.m_jacDiagABInv;
+		sumB = btScalar(cB.m_appliedImpulse) + deltaImpulseB;
+	}
+
+	btScalar deltaImpulseA = 0.f;
+	btScalar sumA = 0.f;
+	const btMultiBodySolverConstraint& cA = cA1;
+	{
+		{
+			deltaImpulseA = cA.m_rhs - btScalar(cA.m_appliedImpulse) * cA.m_cfm;
+			btScalar deltaVelADotn = 0;
+			btScalar deltaVelBDotn = 0;
+			if (cA.m_multiBodyA)
+			{
+				ndofA = cA.m_multiBodyA->getNumDofs() + 6;
+				for (int i = 0; i < ndofA; ++i)
+					deltaVelADotn += m_data.m_jacobians[cA.m_jacAindex + i] * m_data.m_deltaVelocities[cA.m_deltaVelAindex + i];
+			}
+			else if (cA.m_solverBodyIdA >= 0)
+			{
+				bodyA = &m_tmpSolverBodyPool[cA.m_solverBodyIdA];
+				deltaVelADotn += cA.m_contactNormal1.dot(bodyA->internalGetDeltaLinearVelocity()) + cA.m_relpos1CrossNormal.dot(bodyA->internalGetDeltaAngularVelocity());
+			}
+
+			if (cA.m_multiBodyB)
+			{
+				ndofB = cA.m_multiBodyB->getNumDofs() + 6;
+				for (int i = 0; i < ndofB; ++i)
+					deltaVelBDotn += m_data.m_jacobians[cA.m_jacBindex + i] * m_data.m_deltaVelocities[cA.m_deltaVelBindex + i];
+			}
+			else if (cA.m_solverBodyIdB >= 0)
+			{
+				bodyB = &m_tmpSolverBodyPool[cA.m_solverBodyIdB];
+				deltaVelBDotn += cA.m_contactNormal2.dot(bodyB->internalGetDeltaLinearVelocity()) + cA.m_relpos2CrossNormal.dot(bodyB->internalGetDeltaAngularVelocity());
+			}
+
+			deltaImpulseA -= deltaVelADotn * cA.m_jacDiagABInv;  //m_jacDiagABInv = 1./denom
+			deltaImpulseA -= deltaVelBDotn * cA.m_jacDiagABInv;
+			sumA = btScalar(cA.m_appliedImpulse) + deltaImpulseA;
+		}
+	}
+
+	if (sumA * sumA + sumB * sumB >= cA.m_lowerLimit * cB.m_lowerLimit)
+	{
+		btScalar angle = btAtan2(sumA, sumB);
+		btScalar sumAclipped = btFabs(cA.m_lowerLimit * btSin(angle));
+		btScalar sumBclipped = btFabs(cB.m_lowerLimit * btCos(angle));
+
+		if (sumA < -sumAclipped)
+		{
+			deltaImpulseA = -sumAclipped - cA.m_appliedImpulse;
+			cA.m_appliedImpulse = -sumAclipped;
+		}
+		else if (sumA > sumAclipped)
+		{
+			deltaImpulseA = sumAclipped - cA.m_appliedImpulse;
+			cA.m_appliedImpulse = sumAclipped;
+		}
+		else
+		{
+			cA.m_appliedImpulse = sumA;
+		}
+
+		if (sumB < -sumBclipped)
+		{
+			deltaImpulseB = -sumBclipped - cB.m_appliedImpulse;
+			cB.m_appliedImpulse = -sumBclipped;
+		}
+		else if (sumB > sumBclipped)
+		{
+			deltaImpulseB = sumBclipped - cB.m_appliedImpulse;
+			cB.m_appliedImpulse = sumBclipped;
+		}
+		else
+		{
+			cB.m_appliedImpulse = sumB;
+		}
+		//deltaImpulseA = sumAclipped-cA.m_appliedImpulse;
+		//cA.m_appliedImpulse = sumAclipped;
+		//deltaImpulseB = sumBclipped-cB.m_appliedImpulse;
+		//cB.m_appliedImpulse = sumBclipped;
+	}
+	else
+	{
+		cA.m_appliedImpulse = sumA;
+		cB.m_appliedImpulse = sumB;
+	}
+
+	if (cA.m_multiBodyA)
+	{
+		applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[cA.m_jacAindex], deltaImpulseA, cA.m_deltaVelAindex, ndofA);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+		//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+		//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+		cA.m_multiBodyA->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[cA.m_jacAindex], deltaImpulseA);
+#endif  //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+	}
+	else if (cA.m_solverBodyIdA >= 0)
+	{
+		bodyA->internalApplyImpulse(cA.m_contactNormal1 * bodyA->internalGetInvMass(), cA.m_angularComponentA, deltaImpulseA);
+	}
+	if (cA.m_multiBodyB)
+	{
+		applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[cA.m_jacBindex], deltaImpulseA, cA.m_deltaVelBindex, ndofB);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+		//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+		//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+		cA.m_multiBodyB->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[cA.m_jacBindex], deltaImpulseA);
+#endif  //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+	}
+	else if (cA.m_solverBodyIdB >= 0)
+	{
+		bodyB->internalApplyImpulse(cA.m_contactNormal2 * bodyB->internalGetInvMass(), cA.m_angularComponentB, deltaImpulseA);
+	}
+
+	if (cB.m_multiBodyA)
+	{
+		applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[cB.m_jacAindex], deltaImpulseB, cB.m_deltaVelAindex, ndofA);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+		//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+		//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+		cB.m_multiBodyA->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[cB.m_jacAindex], deltaImpulseB);
+#endif  //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+	}
+	else if (cB.m_solverBodyIdA >= 0)
+	{
+		bodyA->internalApplyImpulse(cB.m_contactNormal1 * bodyA->internalGetInvMass(), cB.m_angularComponentA, deltaImpulseB);
+	}
+	if (cB.m_multiBodyB)
+	{
+		applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[cB.m_jacBindex], deltaImpulseB, cB.m_deltaVelBindex, ndofB);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+		//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+		//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+		cB.m_multiBodyB->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[cB.m_jacBindex], deltaImpulseB);
+#endif  //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+	}
+	else if (cB.m_solverBodyIdB >= 0)
+	{
+		bodyB->internalApplyImpulse(cB.m_contactNormal2 * bodyB->internalGetInvMass(), cB.m_angularComponentB, deltaImpulseB);
+	}
+
+	btScalar deltaVel = deltaImpulseA / cA.m_jacDiagABInv + deltaImpulseB / cB.m_jacDiagABInv;
+	return deltaVel;
+}
+
+void btMultiBodyConstraintSolver::setupMultiBodyContactConstraint(btMultiBodySolverConstraint& solverConstraint, const btVector3& contactNormal, const btScalar& appliedImpulse, btManifoldPoint& cp, const btContactSolverInfo& infoGlobal, btScalar& relaxation, bool isFriction, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	BT_PROFILE("setupMultiBodyContactConstraint");
+	btVector3 rel_pos1;
+	btVector3 rel_pos2;
+
+	btMultiBody* multiBodyA = solverConstraint.m_multiBodyA;
+	btMultiBody* multiBodyB = solverConstraint.m_multiBodyB;
+
+	const btVector3& pos1 = cp.getPositionWorldOnA();
+	const btVector3& pos2 = cp.getPositionWorldOnB();
+
+	btSolverBody* bodyA = multiBodyA ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA];
+	btSolverBody* bodyB = multiBodyB ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB];
+
+	btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody;
+	btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody;
+
+	if (bodyA)
+		rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin();
+	if (bodyB)
+		rel_pos2 = pos2 - bodyB->getWorldTransform().getOrigin();
+
+	relaxation = infoGlobal.m_sor;
+
+	btScalar invTimeStep = btScalar(1) / infoGlobal.m_timeStep;
+
+	//cfm = 1 /       ( dt * kp + kd )
+	//erp = dt * kp / ( dt * kp + kd )
+
+	btScalar cfm;
+	btScalar erp;
+	if (isFriction)
+	{
+		cfm = infoGlobal.m_frictionCFM;
+		erp = infoGlobal.m_frictionERP;
+	}
+	else
+	{
+		cfm = infoGlobal.m_globalCfm;
+		erp = infoGlobal.m_erp2;
+
+		if ((cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_CFM) || (cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_ERP))
+		{
+			if (cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_CFM)
+				cfm = cp.m_contactCFM;
+			if (cp.m_contactPointFlags & BT_CONTACT_FLAG_HAS_CONTACT_ERP)
+				erp = cp.m_contactERP;
+		}
+		else
+		{
+			if (cp.m_contactPointFlags & BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING)
+			{
+				btScalar denom = (infoGlobal.m_timeStep * cp.m_combinedContactStiffness1 + cp.m_combinedContactDamping1);
+				if (denom < SIMD_EPSILON)
+				{
+					denom = SIMD_EPSILON;
+				}
+				cfm = btScalar(1) / denom;
+				erp = (infoGlobal.m_timeStep * cp.m_combinedContactStiffness1) / denom;
+			}
+		}
+	}
+
+	cfm *= invTimeStep;
+
+	if (multiBodyA)
+	{
+		if (solverConstraint.m_linkA < 0)
+		{
+			rel_pos1 = pos1 - multiBodyA->getBasePos();
+		}
+		else
+		{
+			rel_pos1 = pos1 - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin();
+		}
+		const int ndofA = multiBodyA->getNumDofs() + 6;
+
+		solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId();
+
+		if (solverConstraint.m_deltaVelAindex < 0)
+		{
+			solverConstraint.m_deltaVelAindex = m_data.m_deltaVelocities.size();
+			multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex);
+			m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size() + ndofA);
+		}
+		else
+		{
+			btAssert(m_data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex + ndofA);
+		}
+
+		solverConstraint.m_jacAindex = m_data.m_jacobians.size();
+		m_data.m_jacobians.resize(m_data.m_jacobians.size() + ndofA);
+		m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size() + ndofA);
+		btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size());
+
+		btScalar* jac1 = &m_data.m_jacobians[solverConstraint.m_jacAindex];
+		multiBodyA->fillContactJacobianMultiDof(solverConstraint.m_linkA, cp.getPositionWorldOnA(), contactNormal, jac1, m_data.scratch_r, m_data.scratch_v, m_data.scratch_m);
+		btScalar* delta = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+		multiBodyA->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacAindex], delta, m_data.scratch_r, m_data.scratch_v);
+
+		btVector3 torqueAxis0 = rel_pos1.cross(contactNormal);
+		solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+		solverConstraint.m_contactNormal1 = contactNormal;
+	}
+	else
+	{
+		btVector3 torqueAxis0 = rel_pos1.cross(contactNormal);
+		solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+		solverConstraint.m_contactNormal1 = contactNormal;
+		solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld() * torqueAxis0 * rb0->getAngularFactor() : btVector3(0, 0, 0);
+	}
+
+	if (multiBodyB)
+	{
+		if (solverConstraint.m_linkB < 0)
+		{
+			rel_pos2 = pos2 - multiBodyB->getBasePos();
+		}
+		else
+		{
+			rel_pos2 = pos2 - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin();
+		}
+
+		const int ndofB = multiBodyB->getNumDofs() + 6;
+
+		solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId();
+		if (solverConstraint.m_deltaVelBindex < 0)
+		{
+			solverConstraint.m_deltaVelBindex = m_data.m_deltaVelocities.size();
+			multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex);
+			m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size() + ndofB);
+		}
+
+		solverConstraint.m_jacBindex = m_data.m_jacobians.size();
+
+		m_data.m_jacobians.resize(m_data.m_jacobians.size() + ndofB);
+		m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size() + ndofB);
+		btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size());
+
+		multiBodyB->fillContactJacobianMultiDof(solverConstraint.m_linkB, cp.getPositionWorldOnB(), -contactNormal, &m_data.m_jacobians[solverConstraint.m_jacBindex], m_data.scratch_r, m_data.scratch_v, m_data.scratch_m);
+		multiBodyB->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacBindex], &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex], m_data.scratch_r, m_data.scratch_v);
+
+		btVector3 torqueAxis1 = rel_pos2.cross(contactNormal);
+		solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
+		solverConstraint.m_contactNormal2 = -contactNormal;
+	}
+	else
+	{
+		btVector3 torqueAxis1 = rel_pos2.cross(contactNormal);
+		solverConstraint.m_relpos2CrossNormal = -torqueAxis1;
+		solverConstraint.m_contactNormal2 = -contactNormal;
+
+		solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld() * -torqueAxis1 * rb1->getAngularFactor() : btVector3(0, 0, 0);
+	}
+
+	{
+		btVector3 vec;
+		btScalar denom0 = 0.f;
+		btScalar denom1 = 0.f;
+		btScalar* jacB = 0;
+		btScalar* jacA = 0;
+		btScalar* lambdaA = 0;
+		btScalar* lambdaB = 0;
+		int ndofA = 0;
+		if (multiBodyA)
+		{
+			ndofA = multiBodyA->getNumDofs() + 6;
+			jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex];
+			lambdaA = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+			for (int i = 0; i < ndofA; ++i)
+			{
+				btScalar j = jacA[i];
+				btScalar l = lambdaA[i];
+				denom0 += j * l;
+			}
+		}
+		else
+		{
+			if (rb0)
+			{
+				vec = (solverConstraint.m_angularComponentA).cross(rel_pos1);
+				denom0 = rb0->getInvMass() + contactNormal.dot(vec);
+			}
+		}
+		if (multiBodyB)
+		{
+			const int ndofB = multiBodyB->getNumDofs() + 6;
+			jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex];
+			lambdaB = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
+			for (int i = 0; i < ndofB; ++i)
+			{
+				btScalar j = jacB[i];
+				btScalar l = lambdaB[i];
+				denom1 += j * l;
+			}
+		}
+		else
+		{
+			if (rb1)
+			{
+				vec = (-solverConstraint.m_angularComponentB).cross(rel_pos2);
+				denom1 = rb1->getInvMass() + contactNormal.dot(vec);
+			}
+		}
+
+		btScalar d = denom0 + denom1 + cfm;
+		if (d > SIMD_EPSILON)
+		{
+			solverConstraint.m_jacDiagABInv = relaxation / (d);
+		}
+		else
+		{
+			//disable the constraint row to handle singularity/redundant constraint
+			solverConstraint.m_jacDiagABInv = 0.f;
+		}
+	}
+
+	//compute rhs and remaining solverConstraint fields
+
+	btScalar restitution = 0.f;
+	btScalar distance = 0;
+	if (!isFriction)
+	{
+		distance = cp.getDistance() + infoGlobal.m_linearSlop;
+	}
+	else
+	{
+		if (cp.m_contactPointFlags & BT_CONTACT_FLAG_FRICTION_ANCHOR)
+		{
+			distance = (cp.getPositionWorldOnA() - cp.getPositionWorldOnB()).dot(contactNormal);
+		}
+	}
+
+	btScalar rel_vel = 0.f;
+	int ndofA = 0;
+	int ndofB = 0;
+	{
+		btVector3 vel1, vel2;
+		if (multiBodyA)
+		{
+			ndofA = multiBodyA->getNumDofs() + 6;
+			btScalar* jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex];
+			for (int i = 0; i < ndofA; ++i)
+				rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i];
+		}
+		else
+		{
+			if (rb0)
+			{
+				rel_vel += (rb0->getVelocityInLocalPoint(rel_pos1) +
+							(rb0->getTotalTorque() * rb0->getInvInertiaTensorWorld() * infoGlobal.m_timeStep).cross(rel_pos1) +
+							rb0->getTotalForce() * rb0->getInvMass() * infoGlobal.m_timeStep)
+							   .dot(solverConstraint.m_contactNormal1);
+			}
+		}
+		if (multiBodyB)
+		{
+			ndofB = multiBodyB->getNumDofs() + 6;
+			btScalar* jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex];
+			for (int i = 0; i < ndofB; ++i)
+				rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i];
+		}
+		else
+		{
+			if (rb1)
+			{
+				rel_vel += (rb1->getVelocityInLocalPoint(rel_pos2) +
+							(rb1->getTotalTorque() * rb1->getInvInertiaTensorWorld() * infoGlobal.m_timeStep).cross(rel_pos2) +
+							rb1->getTotalForce() * rb1->getInvMass() * infoGlobal.m_timeStep)
+							   .dot(solverConstraint.m_contactNormal2);
+			}
+		}
+
+		solverConstraint.m_friction = cp.m_combinedFriction;
+
+		if (!isFriction)
+		{
+			restitution = restitutionCurve(rel_vel, cp.m_combinedRestitution, infoGlobal.m_restitutionVelocityThreshold);
+			if (restitution <= btScalar(0.))
+			{
+				restitution = 0.f;
+			}
+		}
+	}
+
+	{
+		btScalar positionalError = 0.f;
+		btScalar velocityError = restitution - rel_vel;  // * damping;	//note for friction restitution is always set to 0 (check above) so it is acutally velocityError = -rel_vel for friction
+		if (isFriction)
+		{
+			positionalError = -distance * erp / infoGlobal.m_timeStep;
+		}
+		else
+		{
+			if (distance > 0)
+			{
+				positionalError = 0;
+				velocityError -= distance / infoGlobal.m_timeStep;
+			}
+			else
+			{
+				positionalError = -distance * erp / infoGlobal.m_timeStep;
+			}
+		}
+
+		btScalar penetrationImpulse = positionalError * solverConstraint.m_jacDiagABInv;
+		btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+
+		if (!isFriction)
+		{
+			//	if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+			{
+				//combine position and velocity into rhs
+				solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+				solverConstraint.m_rhsPenetration = 0.f;
+			}
+			/*else
+			{
+				//split position and velocity into rhs and m_rhsPenetration
+				solverConstraint.m_rhs = velocityImpulse;
+				solverConstraint.m_rhsPenetration = penetrationImpulse;
+			}
+			*/
+			solverConstraint.m_lowerLimit = 0;
+			solverConstraint.m_upperLimit = 1e10f;
+		}
+		else
+		{
+			solverConstraint.m_rhs = penetrationImpulse + velocityImpulse;
+			solverConstraint.m_rhsPenetration = 0.f;
+			solverConstraint.m_lowerLimit = -solverConstraint.m_friction;
+			solverConstraint.m_upperLimit = solverConstraint.m_friction;
+		}
+
+		solverConstraint.m_cfm = cfm * solverConstraint.m_jacDiagABInv;
+	}
+        
+	if (infoGlobal.m_solverMode & SOLVER_USE_ARTICULATED_WARMSTARTING)
+	{
+		if (btFabs(cp.m_prevRHS) > 1e-5 && cp.m_prevRHS < 2* solverConstraint.m_rhs && solverConstraint.m_rhs < 2*cp.m_prevRHS)
+		{
+			solverConstraint.m_appliedImpulse = isFriction ? 0 : cp.m_appliedImpulse / cp.m_prevRHS * solverConstraint.m_rhs * infoGlobal.m_articulatedWarmstartingFactor;
+			if (solverConstraint.m_appliedImpulse < 0)
+				solverConstraint.m_appliedImpulse = 0;
+		}
+		else
+		{
+			solverConstraint.m_appliedImpulse = 0.f;
+		}
+
+		if (solverConstraint.m_appliedImpulse)
+		{
+			if (multiBodyA)
+			{
+				btScalar impulse = solverConstraint.m_appliedImpulse;
+				btScalar* deltaV = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+				multiBodyA->applyDeltaVeeMultiDof2(deltaV, impulse);
+
+				applyDeltaVee(deltaV, impulse, solverConstraint.m_deltaVelAindex, ndofA);
+			}
+			else
+			{
+				if (rb0)
+					bodyA->internalApplyImpulse(solverConstraint.m_contactNormal1 * bodyA->internalGetInvMass() * rb0->getLinearFactor(), solverConstraint.m_angularComponentA, solverConstraint.m_appliedImpulse);
+			}
+			if (multiBodyB)
+			{
+				btScalar impulse = solverConstraint.m_appliedImpulse;
+				btScalar* deltaV = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
+				multiBodyB->applyDeltaVeeMultiDof2(deltaV, impulse);
+				applyDeltaVee(deltaV, impulse, solverConstraint.m_deltaVelBindex, ndofB);
+			}
+			else
+			{
+				if (rb1)
+					bodyB->internalApplyImpulse(-solverConstraint.m_contactNormal2 * bodyB->internalGetInvMass() * rb1->getLinearFactor(), -solverConstraint.m_angularComponentB, -(btScalar)solverConstraint.m_appliedImpulse);
+			}
+		}
+	}
+	else
+	{
+		solverConstraint.m_appliedImpulse = 0.f;
+   	solverConstraint.m_appliedPushImpulse = 0.f;
+	}
+}
+
+void btMultiBodyConstraintSolver::setupMultiBodyTorsionalFrictionConstraint(btMultiBodySolverConstraint& solverConstraint,
+																			const btVector3& constraintNormal,
+																			btManifoldPoint& cp,
+																			btScalar combinedTorsionalFriction,
+																			const btContactSolverInfo& infoGlobal,
+																			btScalar& relaxation,
+																			bool isFriction, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	BT_PROFILE("setupMultiBodyRollingFrictionConstraint");
+	btVector3 rel_pos1;
+	btVector3 rel_pos2;
+
+	btMultiBody* multiBodyA = solverConstraint.m_multiBodyA;
+	btMultiBody* multiBodyB = solverConstraint.m_multiBodyB;
+
+	const btVector3& pos1 = cp.getPositionWorldOnA();
+	const btVector3& pos2 = cp.getPositionWorldOnB();
+
+	btSolverBody* bodyA = multiBodyA ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA];
+	btSolverBody* bodyB = multiBodyB ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB];
+
+	btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody;
+	btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody;
+
+	if (bodyA)
+		rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin();
+	if (bodyB)
+		rel_pos2 = pos2 - bodyB->getWorldTransform().getOrigin();
+
+	relaxation = infoGlobal.m_sor;
+
+	// btScalar invTimeStep = btScalar(1)/infoGlobal.m_timeStep;
+
+	if (multiBodyA)
+	{
+		if (solverConstraint.m_linkA < 0)
+		{
+			rel_pos1 = pos1 - multiBodyA->getBasePos();
+		}
+		else
+		{
+			rel_pos1 = pos1 - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin();
+		}
+		const int ndofA = multiBodyA->getNumDofs() + 6;
+
+		solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId();
+
+		if (solverConstraint.m_deltaVelAindex < 0)
+		{
+			solverConstraint.m_deltaVelAindex = m_data.m_deltaVelocities.size();
+			multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex);
+			m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size() + ndofA);
+		}
+		else
+		{
+			btAssert(m_data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex + ndofA);
+		}
+
+		solverConstraint.m_jacAindex = m_data.m_jacobians.size();
+		m_data.m_jacobians.resize(m_data.m_jacobians.size() + ndofA);
+		m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size() + ndofA);
+		btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size());
+
+		btScalar* jac1 = &m_data.m_jacobians[solverConstraint.m_jacAindex];
+		multiBodyA->fillConstraintJacobianMultiDof(solverConstraint.m_linkA, cp.getPositionWorldOnA(), constraintNormal, btVector3(0, 0, 0), jac1, m_data.scratch_r, m_data.scratch_v, m_data.scratch_m);
+		btScalar* delta = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+		multiBodyA->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacAindex], delta, m_data.scratch_r, m_data.scratch_v);
+
+		btVector3 torqueAxis0 = constraintNormal;
+		solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+		solverConstraint.m_contactNormal1 = btVector3(0, 0, 0);
+	}
+	else
+	{
+		btVector3 torqueAxis0 = constraintNormal;
+		solverConstraint.m_relpos1CrossNormal = torqueAxis0;
+		solverConstraint.m_contactNormal1 = btVector3(0, 0, 0);
+		solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld() * torqueAxis0 * rb0->getAngularFactor() : btVector3(0, 0, 0);
+	}
+
+	if (multiBodyB)
+	{
+		if (solverConstraint.m_linkB < 0)
+		{
+			rel_pos2 = pos2 - multiBodyB->getBasePos();
+		}
+		else
+		{
+			rel_pos2 = pos2 - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin();
+		}
+
+		const int ndofB = multiBodyB->getNumDofs() + 6;
+
+		solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId();
+		if (solverConstraint.m_deltaVelBindex < 0)
+		{
+			solverConstraint.m_deltaVelBindex = m_data.m_deltaVelocities.size();
+			multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex);
+			m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size() + ndofB);
+		}
+
+		solverConstraint.m_jacBindex = m_data.m_jacobians.size();
+
+		m_data.m_jacobians.resize(m_data.m_jacobians.size() + ndofB);
+		m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size() + ndofB);
+		btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size());
+
+		multiBodyB->fillConstraintJacobianMultiDof(solverConstraint.m_linkB, cp.getPositionWorldOnB(), -constraintNormal, btVector3(0, 0, 0), &m_data.m_jacobians[solverConstraint.m_jacBindex], m_data.scratch_r, m_data.scratch_v, m_data.scratch_m);
+		multiBodyB->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacBindex], &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex], m_data.scratch_r, m_data.scratch_v);
+
+		btVector3 torqueAxis1 = -constraintNormal;
+		solverConstraint.m_relpos2CrossNormal = torqueAxis1;
+		solverConstraint.m_contactNormal2 = -btVector3(0, 0, 0);
+	}
+	else
+	{
+		btVector3 torqueAxis1 = -constraintNormal;
+		solverConstraint.m_relpos2CrossNormal = torqueAxis1;
+		solverConstraint.m_contactNormal2 = -btVector3(0, 0, 0);
+
+		solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld() * torqueAxis1 * rb1->getAngularFactor() : btVector3(0, 0, 0);
+	}
+
+	{
+		btScalar denom0 = 0.f;
+		btScalar denom1 = 0.f;
+		btScalar* jacB = 0;
+		btScalar* jacA = 0;
+		btScalar* lambdaA = 0;
+		btScalar* lambdaB = 0;
+		int ndofA = 0;
+		if (multiBodyA)
+		{
+			ndofA = multiBodyA->getNumDofs() + 6;
+			jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex];
+			lambdaA = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+			for (int i = 0; i < ndofA; ++i)
+			{
+				btScalar j = jacA[i];
+				btScalar l = lambdaA[i];
+				denom0 += j * l;
+			}
+		}
+		else
+		{
+			if (rb0)
+			{
+				btVector3 iMJaA = rb0 ? rb0->getInvInertiaTensorWorld() * solverConstraint.m_relpos1CrossNormal : btVector3(0, 0, 0);
+				denom0 = iMJaA.dot(solverConstraint.m_relpos1CrossNormal);
+			}
+		}
+		if (multiBodyB)
+		{
+			const int ndofB = multiBodyB->getNumDofs() + 6;
+			jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex];
+			lambdaB = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
+			for (int i = 0; i < ndofB; ++i)
+			{
+				btScalar j = jacB[i];
+				btScalar l = lambdaB[i];
+				denom1 += j * l;
+			}
+		}
+		else
+		{
+			if (rb1)
+			{
+				btVector3 iMJaB = rb1 ? rb1->getInvInertiaTensorWorld() * solverConstraint.m_relpos2CrossNormal : btVector3(0, 0, 0);
+				denom1 = iMJaB.dot(solverConstraint.m_relpos2CrossNormal);
+			}
+		}
+
+		btScalar d = denom0 + denom1 + infoGlobal.m_globalCfm;
+		if (d > SIMD_EPSILON)
+		{
+			solverConstraint.m_jacDiagABInv = relaxation / (d);
+		}
+		else
+		{
+			//disable the constraint row to handle singularity/redundant constraint
+			solverConstraint.m_jacDiagABInv = 0.f;
+		}
+	}
+
+	//compute rhs and remaining solverConstraint fields
+
+	btScalar restitution = 0.f;
+	btScalar penetration = isFriction ? 0 : cp.getDistance();
+
+	btScalar rel_vel = 0.f;
+	int ndofA = 0;
+	int ndofB = 0;
+	{
+		btVector3 vel1, vel2;
+		if (multiBodyA)
+		{
+			ndofA = multiBodyA->getNumDofs() + 6;
+			btScalar* jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex];
+			for (int i = 0; i < ndofA; ++i)
+				rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i];
+		}
+		else
+		{
+			if (rb0)
+			{
+				btSolverBody* solverBodyA = &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA];
+				rel_vel += solverConstraint.m_contactNormal1.dot(rb0 ? solverBodyA->m_linearVelocity + solverBodyA->m_externalForceImpulse : btVector3(0, 0, 0)) + solverConstraint.m_relpos1CrossNormal.dot(rb0 ? solverBodyA->m_angularVelocity : btVector3(0, 0, 0));
+			}
+		}
+		if (multiBodyB)
+		{
+			ndofB = multiBodyB->getNumDofs() + 6;
+			btScalar* jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex];
+			for (int i = 0; i < ndofB; ++i)
+				rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i];
+		}
+		else
+		{
+			if (rb1)
+			{
+				btSolverBody* solverBodyB = &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB];
+				rel_vel += solverConstraint.m_contactNormal2.dot(rb1 ? solverBodyB->m_linearVelocity + solverBodyB->m_externalForceImpulse : btVector3(0, 0, 0)) + solverConstraint.m_relpos2CrossNormal.dot(rb1 ? solverBodyB->m_angularVelocity : btVector3(0, 0, 0));
+			}
+		}
+
+		solverConstraint.m_friction = combinedTorsionalFriction;
+
+		if (!isFriction)
+		{
+			restitution = restitutionCurve(rel_vel, cp.m_combinedRestitution, infoGlobal.m_restitutionVelocityThreshold);
+			if (restitution <= btScalar(0.))
+			{
+				restitution = 0.f;
+			}
+		}
+	}
+
+	solverConstraint.m_appliedImpulse = 0.f;
+	solverConstraint.m_appliedPushImpulse = 0.f;
+
+	{
+		btScalar velocityError = 0 - rel_vel;  // * damping;	//note for friction restitution is always set to 0 (check above) so it is acutally velocityError = -rel_vel for friction
+
+		btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
+
+		solverConstraint.m_rhs = velocityImpulse;
+		solverConstraint.m_rhsPenetration = 0.f;
+		solverConstraint.m_lowerLimit = -solverConstraint.m_friction;
+		solverConstraint.m_upperLimit = solverConstraint.m_friction;
+
+		solverConstraint.m_cfm = infoGlobal.m_globalCfm * solverConstraint.m_jacDiagABInv;
+	}
+}
+
+btMultiBodySolverConstraint& btMultiBodyConstraintSolver::addMultiBodyFrictionConstraint(const btVector3& normalAxis, const btScalar& appliedImpulse, btPersistentManifold* manifold, int frictionIndex, btManifoldPoint& cp, btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	BT_PROFILE("addMultiBodyFrictionConstraint");
+	btMultiBodySolverConstraint& solverConstraint = m_multiBodyFrictionContactConstraints.expandNonInitializing();
+	solverConstraint.m_orgConstraint = 0;
+	solverConstraint.m_orgDofIndex = -1;
+
+	solverConstraint.m_frictionIndex = frictionIndex;
+	bool isFriction = true;
+
+	const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0());
+	const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1());
+
+	btMultiBody* mbA = fcA ? fcA->m_multiBody : 0;
+	btMultiBody* mbB = fcB ? fcB->m_multiBody : 0;
+
+	int solverBodyIdA = mbA ? -1 : getOrInitSolverBody(*colObj0, infoGlobal.m_timeStep);
+	int solverBodyIdB = mbB ? -1 : getOrInitSolverBody(*colObj1, infoGlobal.m_timeStep);
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+	solverConstraint.m_multiBodyA = mbA;
+	if (mbA)
+		solverConstraint.m_linkA = fcA->m_link;
+
+	solverConstraint.m_multiBodyB = mbB;
+	if (mbB)
+		solverConstraint.m_linkB = fcB->m_link;
+
+	solverConstraint.m_originalContactPoint = &cp;
+
+	setupMultiBodyContactConstraint(solverConstraint, normalAxis, 0, cp, infoGlobal, relaxation, isFriction, desiredVelocity, cfmSlip);
+	return solverConstraint;
+}
+
+btMultiBodySolverConstraint& btMultiBodyConstraintSolver::addMultiBodyTorsionalFrictionConstraint(const btVector3& normalAxis, btPersistentManifold* manifold, int frictionIndex, btManifoldPoint& cp,
+																								  btScalar combinedTorsionalFriction,
+																								  btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	BT_PROFILE("addMultiBodyRollingFrictionConstraint");
+
+	bool useTorsionalAndConeFriction = (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS && ((infoGlobal.m_solverMode & SOLVER_DISABLE_IMPLICIT_CONE_FRICTION) == 0));
+
+	btMultiBodySolverConstraint& solverConstraint = useTorsionalAndConeFriction ? m_multiBodyTorsionalFrictionContactConstraints.expandNonInitializing() : m_multiBodyFrictionContactConstraints.expandNonInitializing();
+	solverConstraint.m_orgConstraint = 0;
+	solverConstraint.m_orgDofIndex = -1;
+
+	solverConstraint.m_frictionIndex = frictionIndex;
+	bool isFriction = true;
+
+	const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0());
+	const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1());
+
+	btMultiBody* mbA = fcA ? fcA->m_multiBody : 0;
+	btMultiBody* mbB = fcB ? fcB->m_multiBody : 0;
+
+	int solverBodyIdA = mbA ? -1 : getOrInitSolverBody(*colObj0, infoGlobal.m_timeStep);
+	int solverBodyIdB = mbB ? -1 : getOrInitSolverBody(*colObj1, infoGlobal.m_timeStep);
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+	solverConstraint.m_multiBodyA = mbA;
+	if (mbA)
+		solverConstraint.m_linkA = fcA->m_link;
+
+	solverConstraint.m_multiBodyB = mbB;
+	if (mbB)
+		solverConstraint.m_linkB = fcB->m_link;
+
+	solverConstraint.m_originalContactPoint = &cp;
+
+	setupMultiBodyTorsionalFrictionConstraint(solverConstraint, normalAxis, cp, combinedTorsionalFriction, infoGlobal, relaxation, isFriction, desiredVelocity, cfmSlip);
+	return solverConstraint;
+}
+
+btMultiBodySolverConstraint& btMultiBodyConstraintSolver::addMultiBodySpinningFrictionConstraint(const btVector3& normalAxis, btPersistentManifold* manifold, int frictionIndex, btManifoldPoint& cp,
+	btScalar combinedTorsionalFriction,
+	btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity, btScalar cfmSlip)
+{
+	BT_PROFILE("addMultiBodyRollingFrictionConstraint");
+
+	btMultiBodySolverConstraint& solverConstraint = m_multiBodySpinningFrictionContactConstraints.expandNonInitializing();
+	solverConstraint.m_orgConstraint = 0;
+	solverConstraint.m_orgDofIndex = -1;
+
+	solverConstraint.m_frictionIndex = frictionIndex;
+	bool isFriction = true;
+
+	const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0());
+	const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1());
+
+	btMultiBody* mbA = fcA ? fcA->m_multiBody : 0;
+	btMultiBody* mbB = fcB ? fcB->m_multiBody : 0;
+
+	int solverBodyIdA = mbA ? -1 : getOrInitSolverBody(*colObj0, infoGlobal.m_timeStep);
+	int solverBodyIdB = mbB ? -1 : getOrInitSolverBody(*colObj1, infoGlobal.m_timeStep);
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+	solverConstraint.m_multiBodyA = mbA;
+	if (mbA)
+		solverConstraint.m_linkA = fcA->m_link;
+
+	solverConstraint.m_multiBodyB = mbB;
+	if (mbB)
+		solverConstraint.m_linkB = fcB->m_link;
+
+	solverConstraint.m_originalContactPoint = &cp;
+
+	setupMultiBodyTorsionalFrictionConstraint(solverConstraint, normalAxis, cp, combinedTorsionalFriction, infoGlobal, relaxation, isFriction, desiredVelocity, cfmSlip);
+	return solverConstraint;
+}
+void btMultiBodyConstraintSolver::convertMultiBodyContact(btPersistentManifold* manifold, const btContactSolverInfo& infoGlobal)
+{
+	const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0());
+	const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1());
+	
+	btMultiBody* mbA = fcA ? fcA->m_multiBody : 0;
+	btMultiBody* mbB = fcB ? fcB->m_multiBody : 0;
+
+	btCollisionObject *colObj0 = 0, *colObj1 = 0;
+
+	colObj0 = (btCollisionObject*)manifold->getBody0();
+	colObj1 = (btCollisionObject*)manifold->getBody1();
+
+	int solverBodyIdA = mbA ? -1 : getOrInitSolverBody(*colObj0, infoGlobal.m_timeStep);
+	int solverBodyIdB = mbB ? -1 : getOrInitSolverBody(*colObj1, infoGlobal.m_timeStep);
+
+	//	btSolverBody* solverBodyA = mbA ? 0 : &m_tmpSolverBodyPool[solverBodyIdA];
+	//	btSolverBody* solverBodyB = mbB ? 0 : &m_tmpSolverBodyPool[solverBodyIdB];
+
+	///avoid collision response between two static objects
+	//	if (!solverBodyA || (solverBodyA->m_invMass.isZero() && (!solverBodyB || solverBodyB->m_invMass.isZero())))
+	//	return;
+
+	//only a single rollingFriction per manifold
+	int rollingFriction = 4;
+
+	for (int j = 0; j < manifold->getNumContacts(); j++)
+	{
+		btManifoldPoint& cp = manifold->getContactPoint(j);
+
+		if (cp.getDistance() <= manifold->getContactProcessingThreshold())
+		{
+			btScalar relaxation;
+
+			int frictionIndex = m_multiBodyNormalContactConstraints.size();
+
+			btMultiBodySolverConstraint& solverConstraint = m_multiBodyNormalContactConstraints.expandNonInitializing();
+
+			//		btRigidBody* rb0 = btRigidBody::upcast(colObj0);
+			//		btRigidBody* rb1 = btRigidBody::upcast(colObj1);
+			solverConstraint.m_orgConstraint = 0;
+			solverConstraint.m_orgDofIndex = -1;
+			solverConstraint.m_solverBodyIdA = solverBodyIdA;
+			solverConstraint.m_solverBodyIdB = solverBodyIdB;
+			solverConstraint.m_multiBodyA = mbA;
+			if (mbA)
+				solverConstraint.m_linkA = fcA->m_link;
+
+			solverConstraint.m_multiBodyB = mbB;
+			if (mbB)
+				solverConstraint.m_linkB = fcB->m_link;
+
+			solverConstraint.m_originalContactPoint = &cp;
+
+			bool isFriction = false;
+			setupMultiBodyContactConstraint(solverConstraint, cp.m_normalWorldOnB, cp.m_appliedImpulse, cp, infoGlobal, relaxation, isFriction);
+
+			//			const btVector3& pos1 = cp.getPositionWorldOnA();
+			//			const btVector3& pos2 = cp.getPositionWorldOnB();
+
+			/////setup the friction constraints
+#define ENABLE_FRICTION
+#ifdef ENABLE_FRICTION
+			solverConstraint.m_frictionIndex = m_multiBodyFrictionContactConstraints.size();
+
+			///Bullet has several options to set the friction directions
+			///By default, each contact has only a single friction direction that is recomputed automatically every frame
+			///based on the relative linear velocity.
+			///If the relative velocity is zero, it will automatically compute a friction direction.
+
+			///You can also enable two friction directions, using the SOLVER_USE_2_FRICTION_DIRECTIONS.
+			///In that case, the second friction direction will be orthogonal to both contact normal and first friction direction.
+			///
+			///If you choose SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION, then the friction will be independent from the relative projected velocity.
+			///
+			///The user can manually override the friction directions for certain contacts using a contact callback,
+			///and set the cp.m_lateralFrictionInitialized to true
+			///In that case, you can set the target relative motion in each friction direction (cp.m_contactMotion1 and cp.m_contactMotion2)
+			///this will give a conveyor belt effect
+			///
+
+			btPlaneSpace1(cp.m_normalWorldOnB, cp.m_lateralFrictionDir1, cp.m_lateralFrictionDir2);
+			cp.m_lateralFrictionDir1.normalize();
+			cp.m_lateralFrictionDir2.normalize();
+
+			if (rollingFriction > 0)
+			{
+				if (cp.m_combinedSpinningFriction > 0)
+				{
+					addMultiBodySpinningFrictionConstraint(cp.m_normalWorldOnB, manifold, frictionIndex, cp, cp.m_combinedSpinningFriction, colObj0, colObj1, relaxation, infoGlobal);
+				}
+				if (cp.m_combinedRollingFriction > 0)
+				{
+					applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+					applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+					applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+					applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION);
+
+					addMultiBodyTorsionalFrictionConstraint(cp.m_lateralFrictionDir1, manifold, frictionIndex, cp, cp.m_combinedRollingFriction, colObj0, colObj1, relaxation, infoGlobal);
+					addMultiBodyTorsionalFrictionConstraint(cp.m_lateralFrictionDir2, manifold, frictionIndex, cp, cp.m_combinedRollingFriction, colObj0, colObj1, relaxation, infoGlobal);
+				}
+				rollingFriction--;
+			}
+			if (!(infoGlobal.m_solverMode & SOLVER_ENABLE_FRICTION_DIRECTION_CACHING) || !(cp.m_contactPointFlags & BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED))
+			{ /*
+				cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
+				btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
+				if (!(infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION) && lat_rel_vel > SIMD_EPSILON)
+				{
+					cp.m_lateralFrictionDir1 *= 1.f/btSqrt(lat_rel_vel);
+					if((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+					{
+						cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
+						cp.m_lateralFrictionDir2.normalize();//??
+						applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir2,btCollisionObject::CF_ANISOTROPIC_FRICTION);
+						applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir2,btCollisionObject::CF_ANISOTROPIC_FRICTION);
+						addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+
+					}
+
+					applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir1,btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir1,btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+
+				} else
+				*/
+				{
+					applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir1, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir1, cp.m_appliedImpulseLateral1, manifold, frictionIndex, cp, colObj0, colObj1, relaxation, infoGlobal);
+
+					if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+					{
+						applyAnisotropicFriction(colObj0, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+						applyAnisotropicFriction(colObj1, cp.m_lateralFrictionDir2, btCollisionObject::CF_ANISOTROPIC_FRICTION);
+					  addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir2, cp.m_appliedImpulseLateral2, manifold, frictionIndex, cp, colObj0, colObj1, relaxation, infoGlobal);
+					}
+
+					if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION))
+					{
+						cp.m_contactPointFlags |= BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED;
+					}
+				}
+			}
+			else
+			{
+				addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir1, cp.m_appliedImpulseLateral1, manifold, frictionIndex, cp, colObj0, colObj1, relaxation, infoGlobal, cp.m_contactMotion1, cp.m_frictionCFM);
+
+				if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+					addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir2, cp.m_appliedImpulseLateral2, manifold, frictionIndex, cp, colObj0, colObj1, relaxation, infoGlobal, cp.m_contactMotion2, cp.m_frictionCFM);
+				solverConstraint.m_appliedImpulse = 0.f;
+				solverConstraint.m_appliedPushImpulse = 0.f;
+      }
+
+#endif  //ENABLE_FRICTION
+		}
+		else
+		{
+			// Reset quantities related to warmstart as 0.
+			cp.m_appliedImpulse = 0;
+			cp.m_prevRHS = 0;
+		}
+	}
+}
+
+void btMultiBodyConstraintSolver::convertContacts(btPersistentManifold** manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal)
+{
+	for (int i = 0; i < numManifolds; i++)
+	{
+		btPersistentManifold* manifold = manifoldPtr[i];
+		const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0());
+		const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1());
+		if (!fcA && !fcB)
+		{
+			//the contact doesn't involve any Featherstone btMultiBody, so deal with the regular btRigidBody/btCollisionObject case
+			convertContact(manifold, infoGlobal);
+		}
+		else
+		{
+			convertMultiBodyContact(manifold, infoGlobal);
+		}
+	}
+
+	//also convert the multibody constraints, if any
+
+	for (int i = 0; i < m_tmpNumMultiBodyConstraints; i++)
+	{
+		btMultiBodyConstraint* c = m_tmpMultiBodyConstraints[i];
+		m_data.m_solverBodyPool = &m_tmpSolverBodyPool;
+		m_data.m_fixedBodyId = m_fixedBodyId;
+
+		c->createConstraintRows(m_multiBodyNonContactConstraints, m_data, infoGlobal);
+	}
+
+	// Warmstart for noncontact constraints
+	if (infoGlobal.m_solverMode & SOLVER_USE_ARTICULATED_WARMSTARTING)
+	{
+		for (int i = 0; i < m_multiBodyNonContactConstraints.size(); i++)
+		{
+			btMultiBodySolverConstraint& solverConstraint =
+				m_multiBodyNonContactConstraints[i];
+			solverConstraint.m_appliedImpulse =
+				solverConstraint.m_orgConstraint->getAppliedImpulse(solverConstraint.m_orgDofIndex) *
+				infoGlobal.m_articulatedWarmstartingFactor;
+
+			btMultiBody* multiBodyA = solverConstraint.m_multiBodyA;
+			btMultiBody* multiBodyB = solverConstraint.m_multiBodyB;
+			if (solverConstraint.m_appliedImpulse)
+			{
+				if (multiBodyA)
+				{
+					int ndofA = multiBodyA->getNumDofs() + 6;
+					btScalar* deltaV =
+						&m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex];
+					btScalar impulse = solverConstraint.m_appliedImpulse;
+					multiBodyA->applyDeltaVeeMultiDof2(deltaV, impulse);
+					applyDeltaVee(deltaV, impulse, solverConstraint.m_deltaVelAindex, ndofA);
+				}
+				if (multiBodyB)
+				{
+					int ndofB = multiBodyB->getNumDofs() + 6;
+					btScalar* deltaV =
+						&m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex];
+					btScalar impulse = solverConstraint.m_appliedImpulse;
+					multiBodyB->applyDeltaVeeMultiDof2(deltaV, impulse);
+					applyDeltaVee(deltaV, impulse, solverConstraint.m_deltaVelBindex, ndofB);
+				}
+			}
+		}
+	}
+	else
+	{
+		for (int i = 0; i < m_multiBodyNonContactConstraints.size(); i++)
+		{
+			btMultiBodySolverConstraint& solverConstraint = m_multiBodyNonContactConstraints[i];
+			solverConstraint.m_appliedImpulse = 0;
+		}
+	}
+}
+
+btScalar btMultiBodyConstraintSolver::solveGroup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btDispatcher* dispatcher)
+{
+	//printf("btMultiBodyConstraintSolver::solveGroup: numBodies=%d, numConstraints=%d\n", numBodies, numConstraints);
+	return btSequentialImpulseConstraintSolver::solveGroup(bodies, numBodies, manifold, numManifolds, constraints, numConstraints, info, debugDrawer, dispatcher);
+}
+
+#if 0
+static void applyJointFeedback(btMultiBodyJacobianData& data, const btMultiBodySolverConstraint& solverConstraint, int jacIndex, btMultiBody* mb, btScalar appliedImpulse)
+{
+	if (appliedImpulse!=0 && mb->internalNeedsJointFeedback())
+	{
+		//todo: get rid of those temporary memory allocations for the joint feedback
+		btAlignedObjectArray<btScalar> forceVector;
+		int numDofsPlusBase = 6+mb->getNumDofs();
+		forceVector.resize(numDofsPlusBase);
+		for (int i=0;i<numDofsPlusBase;i++)
+		{
+			forceVector[i] = data.m_jacobians[jacIndex+i]*appliedImpulse;
+		}
+		btAlignedObjectArray<btScalar> output;
+		output.resize(numDofsPlusBase);
+		bool applyJointFeedback = true;
+		mb->calcAccelerationDeltasMultiDof(&forceVector[0],&output[0],data.scratch_r,data.scratch_v,applyJointFeedback);
+	}
+}
+#endif
+
+void btMultiBodyConstraintSolver::writeBackSolverBodyToMultiBody(btMultiBodySolverConstraint& c, btScalar deltaTime)
+{
+#if 1
+
+	//bod->addBaseForce(m_gravity * bod->getBaseMass());
+	//bod->addLinkForce(j, m_gravity * bod->getLinkMass(j));
+
+	if (c.m_orgConstraint)
+	{
+		c.m_orgConstraint->internalSetAppliedImpulse(c.m_orgDofIndex, c.m_appliedImpulse);
+	}
+
+	if (c.m_multiBodyA)
+	{
+		c.m_multiBodyA->setCompanionId(-1);
+		btVector3 force = c.m_contactNormal1 * (c.m_appliedImpulse / deltaTime);
+		btVector3 torque = c.m_relpos1CrossNormal * (c.m_appliedImpulse / deltaTime);
+		if (c.m_linkA < 0)
+		{
+			c.m_multiBodyA->addBaseConstraintForce(force);
+			c.m_multiBodyA->addBaseConstraintTorque(torque);
+		}
+		else
+		{
+			c.m_multiBodyA->addLinkConstraintForce(c.m_linkA, force);
+			//b3Printf("force = %f,%f,%f\n",force[0],force[1],force[2]);//[0],torque[1],torque[2]);
+			c.m_multiBodyA->addLinkConstraintTorque(c.m_linkA, torque);
+		}
+	}
+
+	if (c.m_multiBodyB)
+	{
+		{
+			c.m_multiBodyB->setCompanionId(-1);
+			btVector3 force = c.m_contactNormal2 * (c.m_appliedImpulse / deltaTime);
+			btVector3 torque = c.m_relpos2CrossNormal * (c.m_appliedImpulse / deltaTime);
+			if (c.m_linkB < 0)
+			{
+				c.m_multiBodyB->addBaseConstraintForce(force);
+				c.m_multiBodyB->addBaseConstraintTorque(torque);
+			}
+			else
+			{
+				{
+					c.m_multiBodyB->addLinkConstraintForce(c.m_linkB, force);
+					//b3Printf("t = %f,%f,%f\n",force[0],force[1],force[2]);//[0],torque[1],torque[2]);
+					c.m_multiBodyB->addLinkConstraintTorque(c.m_linkB, torque);
+				}
+			}
+		}
+	}
+#endif
+
+#ifndef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+
+	if (c.m_multiBodyA)
+	{
+		c.m_multiBodyA->applyDeltaVeeMultiDof(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex], c.m_appliedImpulse);
+	}
+
+	if (c.m_multiBodyB)
+	{
+		c.m_multiBodyB->applyDeltaVeeMultiDof(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex], c.m_appliedImpulse);
+	}
+#endif
+}
+
+btScalar btMultiBodyConstraintSolver::solveGroupCacheFriendlyFinish(btCollisionObject** bodies, int numBodies, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("btMultiBodyConstraintSolver::solveGroupCacheFriendlyFinish");
+	int numPoolConstraints = m_multiBodyNormalContactConstraints.size();
+
+	//write back the delta v to the multi bodies, either as applied impulse (direct velocity change)
+	//or as applied force, so we can measure the joint reaction forces easier
+	for (int i = 0; i < numPoolConstraints; i++)
+	{
+		btMultiBodySolverConstraint& solverConstraint = m_multiBodyNormalContactConstraints[i];
+		writeBackSolverBodyToMultiBody(solverConstraint, infoGlobal.m_timeStep);
+
+		writeBackSolverBodyToMultiBody(m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex], infoGlobal.m_timeStep);
+
+		if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+		{
+			writeBackSolverBodyToMultiBody(m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex + 1], infoGlobal.m_timeStep);
+		}
+	}
+
+	for (int i = 0; i < m_multiBodyNonContactConstraints.size(); i++)
+	{
+		btMultiBodySolverConstraint& solverConstraint = m_multiBodyNonContactConstraints[i];
+		writeBackSolverBodyToMultiBody(solverConstraint, infoGlobal.m_timeStep);
+	}
+
+
+	{
+		BT_PROFILE("warm starting write back");
+		for (int j = 0; j < numPoolConstraints; j++)
+		{
+			const btMultiBodySolverConstraint& solverConstraint = m_multiBodyNormalContactConstraints[j];
+			btManifoldPoint* pt = (btManifoldPoint*)solverConstraint.m_originalContactPoint;
+			btAssert(pt);
+			pt->m_appliedImpulse = solverConstraint.m_appliedImpulse;
+ 		  pt->m_prevRHS = solverConstraint.m_rhs;
+			pt->m_appliedImpulseLateral1 = m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_appliedImpulse;
+
+			//printf("pt->m_appliedImpulseLateral1 = %f\n", pt->m_appliedImpulseLateral1);
+			if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+			{
+				pt->m_appliedImpulseLateral2 = m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex + 1].m_appliedImpulse;
+			} else
+			{
+				pt->m_appliedImpulseLateral2 = 0;
+			}
+		}
+	}
+
+#if 0
+	//multibody joint feedback
+	{
+		BT_PROFILE("multi body joint feedback");
+		for (int j=0;j<numPoolConstraints;j++)
+		{
+			const btMultiBodySolverConstraint& solverConstraint = m_multiBodyNormalContactConstraints[j];
+		
+			//apply the joint feedback into all links of the btMultiBody
+			//todo: double-check the signs of the applied impulse
+
+			if(solverConstraint.m_multiBodyA && solverConstraint.m_multiBodyA->isMultiDof())
+			{
+				applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacAindex,solverConstraint.m_multiBodyA, solverConstraint.m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep));
+			}
+			if(solverConstraint.m_multiBodyB && solverConstraint.m_multiBodyB->isMultiDof())
+			{
+				applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacBindex,solverConstraint.m_multiBodyB,solverConstraint.m_appliedImpulse*btSimdScalar(-1./infoGlobal.m_timeStep));
+			}
+#if 0
+			if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyA && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyA->isMultiDof())
+			{
+				applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex],
+					m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_jacAindex,
+					m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyA,
+					m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep));
+
+			}
+			if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyB && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyB->isMultiDof())
+			{
+				applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex],
+					m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_jacBindex,
+					m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyB,
+					m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_appliedImpulse*btSimdScalar(-1./infoGlobal.m_timeStep));
+			}
+		
+			if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS))
+			{
+				if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyA && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyA->isMultiDof())
+				{
+					applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1],
+						m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_jacAindex,
+						m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyA,
+						m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep));
+				}
+
+				if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyB && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyB->isMultiDof())
+				{
+					applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1],
+						m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_jacBindex,
+						m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyB,
+						m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_appliedImpulse*btSimdScalar(-1./infoGlobal.m_timeStep));
+				}
+			}
+#endif
+		}
+	
+		for (int i=0;i<m_multiBodyNonContactConstraints.size();i++)
+		{
+			const btMultiBodySolverConstraint& solverConstraint = m_multiBodyNonContactConstraints[i];
+			if(solverConstraint.m_multiBodyA && solverConstraint.m_multiBodyA->isMultiDof())
+			{
+				applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacAindex,solverConstraint.m_multiBodyA, solverConstraint.m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep));
+			}
+			if(solverConstraint.m_multiBodyB && solverConstraint.m_multiBodyB->isMultiDof())
+			{
+				applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacBindex,solverConstraint.m_multiBodyB,solverConstraint.m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep));
+			}
+		}
+	}
+
+	numPoolConstraints = m_multiBodyNonContactConstraints.size();
+
+#if 0
+	//@todo: m_originalContactPoint is not initialized for btMultiBodySolverConstraint
+	for (int i=0;i<numPoolConstraints;i++)
+	{
+		const btMultiBodySolverConstraint& c = m_multiBodyNonContactConstraints[i];
+
+		btTypedConstraint* constr = (btTypedConstraint*)c.m_originalContactPoint;
+		btJointFeedback* fb = constr->getJointFeedback();
+		if (fb)
+		{
+			fb->m_appliedForceBodyA += c.m_contactNormal1*c.m_appliedImpulse*constr->getRigidBodyA().getLinearFactor()/infoGlobal.m_timeStep;
+			fb->m_appliedForceBodyB += c.m_contactNormal2*c.m_appliedImpulse*constr->getRigidBodyB().getLinearFactor()/infoGlobal.m_timeStep;
+			fb->m_appliedTorqueBodyA += c.m_relpos1CrossNormal* constr->getRigidBodyA().getAngularFactor()*c.m_appliedImpulse/infoGlobal.m_timeStep;
+			fb->m_appliedTorqueBodyB += c.m_relpos2CrossNormal* constr->getRigidBodyB().getAngularFactor()*c.m_appliedImpulse/infoGlobal.m_timeStep; /*RGM ???? */
+			
+		}
+
+		constr->internalSetAppliedImpulse(c.m_appliedImpulse);
+		if (btFabs(c.m_appliedImpulse)>=constr->getBreakingImpulseThreshold())
+		{
+			constr->setEnabled(false);
+		}
+
+	}
+#endif
+#endif
+
+	return btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyFinish(bodies, numBodies, infoGlobal);
+}
+
+void btMultiBodyConstraintSolver::solveMultiBodyGroup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, btMultiBodyConstraint** multiBodyConstraints, int numMultiBodyConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btDispatcher* dispatcher)
+{
+	//printf("solveMultiBodyGroup: numBodies=%d, numConstraints=%d, numManifolds=%d, numMultiBodyConstraints=%d\n", numBodies, numConstraints, numManifolds, numMultiBodyConstraints);
+
+	//printf("solveMultiBodyGroup start\n");
+	m_tmpMultiBodyConstraints = multiBodyConstraints;
+	m_tmpNumMultiBodyConstraints = numMultiBodyConstraints;
+
+	btSequentialImpulseConstraintSolver::solveGroup(bodies, numBodies, manifold, numManifolds, constraints, numConstraints, info, debugDrawer, dispatcher);
+
+	m_tmpMultiBodyConstraints = 0;
+	m_tmpNumMultiBodyConstraints = 0;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h
new file mode 100644
index 0000000..f584360
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h
@@ -0,0 +1,101 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_CONSTRAINT_SOLVER_H
+#define BT_MULTIBODY_CONSTRAINT_SOLVER_H
+
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+#include "btMultiBodySolverConstraint.h"
+
+#define DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+
+class btMultiBody;
+
+#include "btMultiBodyConstraint.h"
+
+ATTRIBUTE_ALIGNED16(class)
+btMultiBodyConstraintSolver : public btSequentialImpulseConstraintSolver
+{
+protected:
+	btMultiBodyConstraintArray m_multiBodyNonContactConstraints;
+
+	btMultiBodyConstraintArray m_multiBodyNormalContactConstraints;
+	btMultiBodyConstraintArray m_multiBodyFrictionContactConstraints;
+	btMultiBodyConstraintArray m_multiBodyTorsionalFrictionContactConstraints;
+	btMultiBodyConstraintArray m_multiBodySpinningFrictionContactConstraints;
+
+	btMultiBodyJacobianData m_data;
+
+	//temp storage for multi body constraints for a specific island/group called by 'solveGroup'
+	btMultiBodyConstraint** m_tmpMultiBodyConstraints;
+	int m_tmpNumMultiBodyConstraints;
+
+	btScalar resolveSingleConstraintRowGeneric(const btMultiBodySolverConstraint& c);
+
+	//solve 2 friction directions and clamp against the implicit friction cone
+	btScalar resolveConeFrictionConstraintRows(const btMultiBodySolverConstraint& cA1, const btMultiBodySolverConstraint& cB);
+
+	void convertContacts(btPersistentManifold * *manifoldPtr, int numManifolds, const btContactSolverInfo& infoGlobal);
+
+	btMultiBodySolverConstraint& addMultiBodyFrictionConstraint(const btVector3& normalAxis, const btScalar& appliedImpulse, btPersistentManifold* manifold, int frictionIndex, btManifoldPoint& cp, btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity = 0, btScalar cfmSlip = 0);
+
+	btMultiBodySolverConstraint& addMultiBodyTorsionalFrictionConstraint(const btVector3& normalAxis, btPersistentManifold* manifold, int frictionIndex, btManifoldPoint& cp,
+																		 btScalar combinedTorsionalFriction,
+																		 btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity = 0, btScalar cfmSlip = 0);
+
+	btMultiBodySolverConstraint& addMultiBodySpinningFrictionConstraint(const btVector3& normalAxis, btPersistentManifold* manifold, int frictionIndex, btManifoldPoint& cp,
+		btScalar combinedTorsionalFriction,
+		btCollisionObject* colObj0, btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity = 0, btScalar cfmSlip = 0);
+
+	void setupMultiBodyJointLimitConstraint(btMultiBodySolverConstraint & constraintRow,
+											btScalar * jacA, btScalar * jacB,
+											btScalar penetration, btScalar combinedFrictionCoeff, btScalar combinedRestitutionCoeff,
+											const btContactSolverInfo& infoGlobal);
+
+	void setupMultiBodyContactConstraint(btMultiBodySolverConstraint & solverConstraint,
+										 const btVector3& contactNormal,
+                     const btScalar& appliedImpulse,
+										 btManifoldPoint& cp,
+                     const btContactSolverInfo& infoGlobal,
+										 btScalar& relaxation,
+										 bool isFriction, btScalar desiredVelocity = 0, btScalar cfmSlip = 0);
+
+	//either rolling or spinning friction
+	void setupMultiBodyTorsionalFrictionConstraint(btMultiBodySolverConstraint & solverConstraint,
+												   const btVector3& contactNormal,
+												   btManifoldPoint& cp,
+												   btScalar combinedTorsionalFriction,
+												   const btContactSolverInfo& infoGlobal,
+												   btScalar& relaxation,
+												   bool isFriction, btScalar desiredVelocity = 0, btScalar cfmSlip = 0);
+
+	void convertMultiBodyContact(btPersistentManifold * manifold, const btContactSolverInfo& infoGlobal);
+	virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+	//	virtual btScalar solveGroupCacheFriendlyIterations(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer);
+	virtual btScalar solveSingleIteration(int iteration, btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+	void applyDeltaVee(btScalar * deltaV, btScalar impulse, int velocityIndex, int ndof);
+	void writeBackSolverBodyToMultiBody(btMultiBodySolverConstraint & constraint, btScalar deltaTime);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	///this method should not be called, it was just used during porting/integration of Featherstone btMultiBody, providing backwards compatibility but no support for btMultiBodyConstraint (only contact constraints)
+	virtual btScalar solveGroup(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btDispatcher* dispatcher);
+	virtual btScalar solveGroupCacheFriendlyFinish(btCollisionObject * *bodies, int numBodies, const btContactSolverInfo& infoGlobal);
+
+	virtual void solveMultiBodyGroup(btCollisionObject * *bodies, int numBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, btMultiBodyConstraint** multiBodyConstraints, int numMultiBodyConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btDispatcher* dispatcher);
+};
+
+#endif  //BT_MULTIBODY_CONSTRAINT_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
new file mode 100644
index 0000000..e7af332
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
@@ -0,0 +1,895 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btMultiBodyDynamicsWorld.h"
+#include "btMultiBodyConstraintSolver.h"
+#include "btMultiBody.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+#include "LinearMath/btQuickprof.h"
+#include "btMultiBodyConstraint.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btSerializer.h"
+
+void btMultiBodyDynamicsWorld::addMultiBody(btMultiBody* body, int group, int mask)
+{
+	m_multiBodies.push_back(body);
+}
+
+void btMultiBodyDynamicsWorld::removeMultiBody(btMultiBody* body)
+{
+	m_multiBodies.remove(body);
+}
+
+void btMultiBodyDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
+{
+    btDiscreteDynamicsWorld::predictUnconstraintMotion(timeStep);
+    predictMultiBodyTransforms(timeStep);
+    
+}
+void btMultiBodyDynamicsWorld::calculateSimulationIslands()
+{
+	BT_PROFILE("calculateSimulationIslands");
+
+	getSimulationIslandManager()->updateActivationState(getCollisionWorld(), getCollisionWorld()->getDispatcher());
+
+	{
+		//merge islands based on speculative contact manifolds too
+		for (int i = 0; i < this->m_predictiveManifolds.size(); i++)
+		{
+			btPersistentManifold* manifold = m_predictiveManifolds[i];
+
+			const btCollisionObject* colObj0 = manifold->getBody0();
+			const btCollisionObject* colObj1 = manifold->getBody1();
+
+			if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
+				((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
+			{
+				getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(), (colObj1)->getIslandTag());
+			}
+		}
+	}
+
+	{
+		int i;
+		int numConstraints = int(m_constraints.size());
+		for (i = 0; i < numConstraints; i++)
+		{
+			btTypedConstraint* constraint = m_constraints[i];
+			if (constraint->isEnabled())
+			{
+				const btRigidBody* colObj0 = &constraint->getRigidBodyA();
+				const btRigidBody* colObj1 = &constraint->getRigidBodyB();
+
+				if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
+					((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
+				{
+					getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(), (colObj1)->getIslandTag());
+				}
+			}
+		}
+	}
+
+	//merge islands linked by Featherstone link colliders
+	for (int i = 0; i < m_multiBodies.size(); i++)
+	{
+		btMultiBody* body = m_multiBodies[i];
+		{
+			btMultiBodyLinkCollider* prev = body->getBaseCollider();
+
+			for (int b = 0; b < body->getNumLinks(); b++)
+			{
+				btMultiBodyLinkCollider* cur = body->getLink(b).m_collider;
+
+				if (((cur) && (!(cur)->isStaticOrKinematicObject())) &&
+					((prev) && (!(prev)->isStaticOrKinematicObject())))
+				{
+					int tagPrev = prev->getIslandTag();
+					int tagCur = cur->getIslandTag();
+					getSimulationIslandManager()->getUnionFind().unite(tagPrev, tagCur);
+				}
+				if (cur && !cur->isStaticOrKinematicObject())
+					prev = cur;
+			}
+		}
+	}
+
+	//merge islands linked by multibody constraints
+	{
+		for (int i = 0; i < this->m_multiBodyConstraints.size(); i++)
+		{
+			btMultiBodyConstraint* c = m_multiBodyConstraints[i];
+			int tagA = c->getIslandIdA();
+			int tagB = c->getIslandIdB();
+			if (tagA >= 0 && tagB >= 0)
+				getSimulationIslandManager()->getUnionFind().unite(tagA, tagB);
+		}
+	}
+
+	//Store the island id in each body
+	getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld());
+}
+
+void btMultiBodyDynamicsWorld::updateActivationState(btScalar timeStep)
+{
+	BT_PROFILE("btMultiBodyDynamicsWorld::updateActivationState");
+
+	for (int i = 0; i < m_multiBodies.size(); i++)
+	{
+		btMultiBody* body = m_multiBodies[i];
+		if (body)
+		{
+			body->checkMotionAndSleepIfRequired(timeStep);
+			if (!body->isAwake())
+			{
+				btMultiBodyLinkCollider* col = body->getBaseCollider();
+				if (col && col->getActivationState() == ACTIVE_TAG)
+				{
+                    if (body->hasFixedBase())
+					{
+                        col->setActivationState(FIXED_BASE_MULTI_BODY);
+                    } else
+					{
+                        col->setActivationState(WANTS_DEACTIVATION);
+                    }
+					
+					col->setDeactivationTime(0.f);
+				}
+				for (int b = 0; b < body->getNumLinks(); b++)
+				{
+					btMultiBodyLinkCollider* col = body->getLink(b).m_collider;
+					if (col && col->getActivationState() == ACTIVE_TAG)
+					{
+						col->setActivationState(WANTS_DEACTIVATION);
+						col->setDeactivationTime(0.f);
+					}
+				}
+			}
+			else
+			{
+				btMultiBodyLinkCollider* col = body->getBaseCollider();
+				if (col && col->getActivationState() != DISABLE_DEACTIVATION)
+					col->setActivationState(ACTIVE_TAG);
+
+				for (int b = 0; b < body->getNumLinks(); b++)
+				{
+					btMultiBodyLinkCollider* col = body->getLink(b).m_collider;
+					if (col && col->getActivationState() != DISABLE_DEACTIVATION)
+						col->setActivationState(ACTIVE_TAG);
+				}
+			}
+		}
+	}
+
+	btDiscreteDynamicsWorld::updateActivationState(timeStep);
+}
+
+void btMultiBodyDynamicsWorld::getAnalyticsData(btAlignedObjectArray<btSolverAnalyticsData>& islandAnalyticsData) const
+{
+	islandAnalyticsData = m_solverMultiBodyIslandCallback->m_islandAnalyticsData;
+}
+
+btMultiBodyDynamicsWorld::btMultiBodyDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btMultiBodyConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration)
+	: btDiscreteDynamicsWorld(dispatcher, pairCache, constraintSolver, collisionConfiguration),
+	  m_multiBodyConstraintSolver(constraintSolver)
+{
+	//split impulse is not yet supported for Featherstone hierarchies
+	//	getSolverInfo().m_splitImpulse = false;
+	getSolverInfo().m_solverMode |= SOLVER_USE_2_FRICTION_DIRECTIONS;
+	m_solverMultiBodyIslandCallback = new MultiBodyInplaceSolverIslandCallback(constraintSolver, dispatcher);
+}
+
+btMultiBodyDynamicsWorld::~btMultiBodyDynamicsWorld()
+{
+	delete m_solverMultiBodyIslandCallback;
+}
+
+void btMultiBodyDynamicsWorld::setMultiBodyConstraintSolver(btMultiBodyConstraintSolver* solver)
+{
+	m_multiBodyConstraintSolver = solver;
+	m_solverMultiBodyIslandCallback->setMultiBodyConstraintSolver(solver);
+	btDiscreteDynamicsWorld::setConstraintSolver(solver);
+}
+
+void btMultiBodyDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
+{
+	if (solver->getSolverType() == BT_MULTIBODY_SOLVER)
+	{
+		m_multiBodyConstraintSolver = (btMultiBodyConstraintSolver*)solver;
+	}
+	btDiscreteDynamicsWorld::setConstraintSolver(solver);
+}
+
+void btMultiBodyDynamicsWorld::forwardKinematics()
+{
+	for (int b = 0; b < m_multiBodies.size(); b++)
+	{
+		btMultiBody* bod = m_multiBodies[b];
+		bod->forwardKinematics(m_scratch_world_to_local, m_scratch_local_origin);
+	}
+}
+void btMultiBodyDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
+{
+    solveExternalForces(solverInfo);
+    buildIslands();
+    solveInternalConstraints(solverInfo);
+}
+
+void btMultiBodyDynamicsWorld::buildIslands()
+{
+    m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(), getCollisionWorld(), m_solverMultiBodyIslandCallback);
+}
+
+void btMultiBodyDynamicsWorld::solveInternalConstraints(btContactSolverInfo& solverInfo)
+{
+	/// solve all the constraints for this island
+	m_solverMultiBodyIslandCallback->processConstraints();
+	m_constraintSolver->allSolved(solverInfo, m_debugDrawer);
+    {
+        BT_PROFILE("btMultiBody stepVelocities");
+        for (int i = 0; i < this->m_multiBodies.size(); i++)
+        {
+            btMultiBody* bod = m_multiBodies[i];
+            
+            bool isSleeping = false;
+            
+            if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+            {
+                isSleeping = true;
+            }
+            for (int b = 0; b < bod->getNumLinks(); b++)
+            {
+                if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+                    isSleeping = true;
+            }
+            
+            if (!isSleeping)
+            {
+                //useless? they get resized in stepVelocities once again (AND DIFFERENTLY)
+                m_scratch_r.resize(bod->getNumLinks() + 1);  //multidof? ("Y"s use it and it is used to store qdd)
+                m_scratch_v.resize(bod->getNumLinks() + 1);
+                m_scratch_m.resize(bod->getNumLinks() + 1);
+                
+                if (bod->internalNeedsJointFeedback())
+                {
+                    if (!bod->isUsingRK4Integration())
+                    {
+                        if (bod->internalNeedsJointFeedback())
+                        {
+                            bool isConstraintPass = true;
+                            bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(solverInfo.m_timeStep, m_scratch_r, m_scratch_v, m_scratch_m, isConstraintPass,
+                                                                                      getSolverInfo().m_jointFeedbackInWorldSpace,
+                                                                                      getSolverInfo().m_jointFeedbackInJointFrame);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    for (int i = 0; i < this->m_multiBodies.size(); i++)
+    {
+        btMultiBody* bod = m_multiBodies[i];
+        bod->processDeltaVeeMultiDof2();
+    }
+}
+
+void btMultiBodyDynamicsWorld::solveExternalForces(btContactSolverInfo& solverInfo)
+{
+    forwardKinematics();
+    
+    BT_PROFILE("solveConstraints");
+    
+    clearMultiBodyConstraintForces();
+    
+    m_sortedConstraints.resize(m_constraints.size());
+    int i;
+    for (i = 0; i < getNumConstraints(); i++)
+    {
+        m_sortedConstraints[i] = m_constraints[i];
+    }
+    m_sortedConstraints.quickSort(btSortConstraintOnIslandPredicate2());
+    btTypedConstraint** constraintsPtr = getNumConstraints() ? &m_sortedConstraints[0] : 0;
+    
+    m_sortedMultiBodyConstraints.resize(m_multiBodyConstraints.size());
+    for (i = 0; i < m_multiBodyConstraints.size(); i++)
+    {
+        m_sortedMultiBodyConstraints[i] = m_multiBodyConstraints[i];
+    }
+    m_sortedMultiBodyConstraints.quickSort(btSortMultiBodyConstraintOnIslandPredicate());
+    
+    btMultiBodyConstraint** sortedMultiBodyConstraints = m_sortedMultiBodyConstraints.size() ? &m_sortedMultiBodyConstraints[0] : 0;
+    
+    m_solverMultiBodyIslandCallback->setup(&solverInfo, constraintsPtr, m_sortedConstraints.size(), sortedMultiBodyConstraints, m_sortedMultiBodyConstraints.size(), getDebugDrawer());
+    m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds());
+    
+#ifndef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+    {
+        BT_PROFILE("btMultiBody addForce");
+        for (int i = 0; i < this->m_multiBodies.size(); i++)
+        {
+            btMultiBody* bod = m_multiBodies[i];
+            
+            bool isSleeping = false;
+            
+            if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+            {
+                isSleeping = true;
+            }
+            for (int b = 0; b < bod->getNumLinks(); b++)
+            {
+                if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+                    isSleeping = true;
+            }
+            
+            if (!isSleeping)
+            {
+                //useless? they get resized in stepVelocities once again (AND DIFFERENTLY)
+                m_scratch_r.resize(bod->getNumLinks() + 1);  //multidof? ("Y"s use it and it is used to store qdd)
+                m_scratch_v.resize(bod->getNumLinks() + 1);
+                m_scratch_m.resize(bod->getNumLinks() + 1);
+                
+                bod->addBaseForce(m_gravity * bod->getBaseMass());
+                
+                for (int j = 0; j < bod->getNumLinks(); ++j)
+                {
+                    bod->addLinkForce(j, m_gravity * bod->getLinkMass(j));
+                }
+            }  //if (!isSleeping)
+        }
+    }
+#endif  //BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+    
+    {
+        BT_PROFILE("btMultiBody stepVelocities");
+        for (int i = 0; i < this->m_multiBodies.size(); i++)
+        {
+            btMultiBody* bod = m_multiBodies[i];
+            
+            bool isSleeping = false;
+            
+            if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+            {
+                isSleeping = true;
+            }
+            for (int b = 0; b < bod->getNumLinks(); b++)
+            {
+                if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+                    isSleeping = true;
+            }
+            
+            if (!isSleeping)
+            {
+                //useless? they get resized in stepVelocities once again (AND DIFFERENTLY)
+                m_scratch_r.resize(bod->getNumLinks() + 1);  //multidof? ("Y"s use it and it is used to store qdd)
+                m_scratch_v.resize(bod->getNumLinks() + 1);
+                m_scratch_m.resize(bod->getNumLinks() + 1);
+                bool doNotUpdatePos = false;
+                bool isConstraintPass = false;
+                {
+                    if (!bod->isUsingRK4Integration())
+                    {
+                        bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(solverInfo.m_timeStep,
+                                                                                  m_scratch_r, m_scratch_v, m_scratch_m,isConstraintPass,
+                                                                                  getSolverInfo().m_jointFeedbackInWorldSpace,
+                                                                                  getSolverInfo().m_jointFeedbackInJointFrame);
+                    }
+                    else
+                    {
+                        //
+                        int numDofs = bod->getNumDofs() + 6;
+                        int numPosVars = bod->getNumPosVars() + 7;
+                        btAlignedObjectArray<btScalar> scratch_r2;
+                        scratch_r2.resize(2 * numPosVars + 8 * numDofs);
+                        //convenience
+                        btScalar* pMem = &scratch_r2[0];
+                        btScalar* scratch_q0 = pMem;
+                        pMem += numPosVars;
+                        btScalar* scratch_qx = pMem;
+                        pMem += numPosVars;
+                        btScalar* scratch_qd0 = pMem;
+                        pMem += numDofs;
+                        btScalar* scratch_qd1 = pMem;
+                        pMem += numDofs;
+                        btScalar* scratch_qd2 = pMem;
+                        pMem += numDofs;
+                        btScalar* scratch_qd3 = pMem;
+                        pMem += numDofs;
+                        btScalar* scratch_qdd0 = pMem;
+                        pMem += numDofs;
+                        btScalar* scratch_qdd1 = pMem;
+                        pMem += numDofs;
+                        btScalar* scratch_qdd2 = pMem;
+                        pMem += numDofs;
+                        btScalar* scratch_qdd3 = pMem;
+                        pMem += numDofs;
+                        btAssert((pMem - (2 * numPosVars + 8 * numDofs)) == &scratch_r2[0]);
+                        
+                        /////
+                        //copy q0 to scratch_q0 and qd0 to scratch_qd0
+                        scratch_q0[0] = bod->getWorldToBaseRot().x();
+                        scratch_q0[1] = bod->getWorldToBaseRot().y();
+                        scratch_q0[2] = bod->getWorldToBaseRot().z();
+                        scratch_q0[3] = bod->getWorldToBaseRot().w();
+                        scratch_q0[4] = bod->getBasePos().x();
+                        scratch_q0[5] = bod->getBasePos().y();
+                        scratch_q0[6] = bod->getBasePos().z();
+                        //
+                        for (int link = 0; link < bod->getNumLinks(); ++link)
+                        {
+                            for (int dof = 0; dof < bod->getLink(link).m_posVarCount; ++dof)
+                                scratch_q0[7 + bod->getLink(link).m_cfgOffset + dof] = bod->getLink(link).m_jointPos[dof];
+                        }
+                        //
+                        for (int dof = 0; dof < numDofs; ++dof)
+                            scratch_qd0[dof] = bod->getVelocityVector()[dof];
+                        ////
+                        struct
+                        {
+                            btMultiBody* bod;
+                            btScalar *scratch_qx, *scratch_q0;
+                            
+                            void operator()()
+                            {
+                                for (int dof = 0; dof < bod->getNumPosVars() + 7; ++dof)
+                                    scratch_qx[dof] = scratch_q0[dof];
+                            }
+                        } pResetQx = {bod, scratch_qx, scratch_q0};
+                        //
+                        struct
+                        {
+                            void operator()(btScalar dt, const btScalar* pDer, const btScalar* pCurVal, btScalar* pVal, int size)
+                            {
+                                for (int i = 0; i < size; ++i)
+                                    pVal[i] = pCurVal[i] + dt * pDer[i];
+                            }
+                            
+                        } pEulerIntegrate;
+                        //
+                        struct
+                        {
+                            void operator()(btMultiBody* pBody, const btScalar* pData)
+                            {
+                                btScalar* pVel = const_cast<btScalar*>(pBody->getVelocityVector());
+                                
+                                for (int i = 0; i < pBody->getNumDofs() + 6; ++i)
+                                    pVel[i] = pData[i];
+                            }
+                        } pCopyToVelocityVector;
+                        //
+                        struct
+                        {
+                            void operator()(const btScalar* pSrc, btScalar* pDst, int start, int size)
+                            {
+                                for (int i = 0; i < size; ++i)
+                                    pDst[i] = pSrc[start + i];
+                            }
+                        } pCopy;
+                        //
+                        
+                        btScalar h = solverInfo.m_timeStep;
+#define output &m_scratch_r[bod->getNumDofs()]
+                        //calc qdd0 from: q0 & qd0
+                        bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m,
+                                                                                  isConstraintPass,getSolverInfo().m_jointFeedbackInWorldSpace,
+                                                                                  getSolverInfo().m_jointFeedbackInJointFrame);
+                        pCopy(output, scratch_qdd0, 0, numDofs);
+                        //calc q1 = q0 + h/2 * qd0
+                        pResetQx();
+                        bod->stepPositionsMultiDof(btScalar(.5) * h, scratch_qx, scratch_qd0);
+                        //calc qd1 = qd0 + h/2 * qdd0
+                        pEulerIntegrate(btScalar(.5) * h, scratch_qdd0, scratch_qd0, scratch_qd1, numDofs);
+                        //
+                        //calc qdd1 from: q1 & qd1
+                        pCopyToVelocityVector(bod, scratch_qd1);
+                        bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m,
+                                                                                  isConstraintPass,getSolverInfo().m_jointFeedbackInWorldSpace,
+                                                                                  getSolverInfo().m_jointFeedbackInJointFrame);
+                        pCopy(output, scratch_qdd1, 0, numDofs);
+                        //calc q2 = q0 + h/2 * qd1
+                        pResetQx();
+                        bod->stepPositionsMultiDof(btScalar(.5) * h, scratch_qx, scratch_qd1);
+                        //calc qd2 = qd0 + h/2 * qdd1
+                        pEulerIntegrate(btScalar(.5) * h, scratch_qdd1, scratch_qd0, scratch_qd2, numDofs);
+                        //
+                        //calc qdd2 from: q2 & qd2
+                        pCopyToVelocityVector(bod, scratch_qd2);
+                        bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m,
+                                                                                  isConstraintPass,getSolverInfo().m_jointFeedbackInWorldSpace,
+                                                                                  getSolverInfo().m_jointFeedbackInJointFrame);
+                        pCopy(output, scratch_qdd2, 0, numDofs);
+                        //calc q3 = q0 + h * qd2
+                        pResetQx();
+                        bod->stepPositionsMultiDof(h, scratch_qx, scratch_qd2);
+                        //calc qd3 = qd0 + h * qdd2
+                        pEulerIntegrate(h, scratch_qdd2, scratch_qd0, scratch_qd3, numDofs);
+                        //
+                        //calc qdd3 from: q3 & qd3
+                        pCopyToVelocityVector(bod, scratch_qd3);
+                        bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m,
+                                                                                  isConstraintPass,getSolverInfo().m_jointFeedbackInWorldSpace,
+                                                                                  getSolverInfo().m_jointFeedbackInJointFrame);
+                        pCopy(output, scratch_qdd3, 0, numDofs);
+                        
+                        //
+                        //calc q = q0 + h/6(qd0 + 2*(qd1 + qd2) + qd3)
+                        //calc qd = qd0 + h/6(qdd0 + 2*(qdd1 + qdd2) + qdd3)
+                        btAlignedObjectArray<btScalar> delta_q;
+                        delta_q.resize(numDofs);
+                        btAlignedObjectArray<btScalar> delta_qd;
+                        delta_qd.resize(numDofs);
+                        for (int i = 0; i < numDofs; ++i)
+                        {
+                            delta_q[i] = h / btScalar(6.) * (scratch_qd0[i] + 2 * scratch_qd1[i] + 2 * scratch_qd2[i] + scratch_qd3[i]);
+                            delta_qd[i] = h / btScalar(6.) * (scratch_qdd0[i] + 2 * scratch_qdd1[i] + 2 * scratch_qdd2[i] + scratch_qdd3[i]);
+                            //delta_q[i] = h*scratch_qd0[i];
+                            //delta_qd[i] = h*scratch_qdd0[i];
+                        }
+                        //
+                        pCopyToVelocityVector(bod, scratch_qd0);
+                        bod->applyDeltaVeeMultiDof(&delta_qd[0], 1);
+                        //
+                        if (!doNotUpdatePos)
+                        {
+                            btScalar* pRealBuf = const_cast<btScalar*>(bod->getVelocityVector());
+                            pRealBuf += 6 + bod->getNumDofs() + bod->getNumDofs() * bod->getNumDofs();
+                            
+                            for (int i = 0; i < numDofs; ++i)
+                                pRealBuf[i] = delta_q[i];
+                            
+                            //bod->stepPositionsMultiDof(1, 0, &delta_q[0]);
+                            bod->setPosUpdated(true);
+                        }
+                        
+                        //ugly hack which resets the cached data to t0 (needed for constraint solver)
+                        {
+                            for (int link = 0; link < bod->getNumLinks(); ++link)
+                                bod->getLink(link).updateCacheMultiDof();
+                            bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0, m_scratch_r, m_scratch_v, m_scratch_m,
+                                                                                      isConstraintPass,getSolverInfo().m_jointFeedbackInWorldSpace,
+                                                                                      getSolverInfo().m_jointFeedbackInJointFrame);
+                        }
+                    }
+                }
+                
+#ifndef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+                bod->clearForcesAndTorques();
+#endif         //BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+            }  //if (!isSleeping)
+        }
+    }
+}
+
+
+void btMultiBodyDynamicsWorld::integrateTransforms(btScalar timeStep)
+{
+	btDiscreteDynamicsWorld::integrateTransforms(timeStep);
+    integrateMultiBodyTransforms(timeStep);
+}
+
+void btMultiBodyDynamicsWorld::integrateMultiBodyTransforms(btScalar timeStep)
+{
+		BT_PROFILE("btMultiBody stepPositions");
+		//integrate and update the Featherstone hierarchies
+
+		for (int b = 0; b < m_multiBodies.size(); b++)
+		{
+			btMultiBody* bod = m_multiBodies[b];
+			bool isSleeping = false;
+			if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+			{
+				isSleeping = true;
+			}
+			for (int b = 0; b < bod->getNumLinks(); b++)
+			{
+				if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+					isSleeping = true;
+			}
+
+			if (!isSleeping)
+			{
+				bod->addSplitV();
+				int nLinks = bod->getNumLinks();
+
+				///base + num m_links
+                if (!bod->isPosUpdated())
+                    bod->stepPositionsMultiDof(timeStep);
+                else
+                {
+                    btScalar* pRealBuf = const_cast<btScalar*>(bod->getVelocityVector());
+                    pRealBuf += 6 + bod->getNumDofs() + bod->getNumDofs() * bod->getNumDofs();
+
+                    bod->stepPositionsMultiDof(1, 0, pRealBuf);
+                    bod->setPosUpdated(false);
+                }
+
+
+				m_scratch_world_to_local.resize(nLinks + 1);
+				m_scratch_local_origin.resize(nLinks + 1);
+                bod->updateCollisionObjectWorldTransforms(m_scratch_world_to_local, m_scratch_local_origin);
+				bod->substractSplitV();
+			}
+			else
+			{
+				bod->clearVelocities();
+			}
+		}
+}
+
+void btMultiBodyDynamicsWorld::predictMultiBodyTransforms(btScalar timeStep)
+{
+    BT_PROFILE("btMultiBody stepPositions");
+    //integrate and update the Featherstone hierarchies
+    
+    for (int b = 0; b < m_multiBodies.size(); b++)
+    {
+        btMultiBody* bod = m_multiBodies[b];
+        bool isSleeping = false;
+        if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+        {
+            isSleeping = true;
+        }
+        for (int b = 0; b < bod->getNumLinks(); b++)
+        {
+            if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+                isSleeping = true;
+        }
+        
+        if (!isSleeping)
+        {
+            int nLinks = bod->getNumLinks();
+            bod->predictPositionsMultiDof(timeStep);
+            m_scratch_world_to_local.resize(nLinks + 1);
+            m_scratch_local_origin.resize(nLinks + 1);
+            bod->updateCollisionObjectInterpolationWorldTransforms(m_scratch_world_to_local, m_scratch_local_origin);
+        }
+        else
+        {
+            bod->clearVelocities();
+        }
+    }
+}
+
+void btMultiBodyDynamicsWorld::addMultiBodyConstraint(btMultiBodyConstraint* constraint)
+{
+	m_multiBodyConstraints.push_back(constraint);
+}
+
+void btMultiBodyDynamicsWorld::removeMultiBodyConstraint(btMultiBodyConstraint* constraint)
+{
+	m_multiBodyConstraints.remove(constraint);
+}
+
+void btMultiBodyDynamicsWorld::debugDrawMultiBodyConstraint(btMultiBodyConstraint* constraint)
+{
+	constraint->debugDraw(getDebugDrawer());
+}
+
+void btMultiBodyDynamicsWorld::debugDrawWorld()
+{
+	BT_PROFILE("btMultiBodyDynamicsWorld debugDrawWorld");
+
+	btDiscreteDynamicsWorld::debugDrawWorld();
+
+	bool drawConstraints = false;
+	if (getDebugDrawer())
+	{
+		int mode = getDebugDrawer()->getDebugMode();
+		if (mode & (btIDebugDraw::DBG_DrawConstraints | btIDebugDraw::DBG_DrawConstraintLimits))
+		{
+			drawConstraints = true;
+		}
+
+		if (drawConstraints)
+		{
+			BT_PROFILE("btMultiBody debugDrawWorld");
+
+			for (int c = 0; c < m_multiBodyConstraints.size(); c++)
+			{
+				btMultiBodyConstraint* constraint = m_multiBodyConstraints[c];
+				debugDrawMultiBodyConstraint(constraint);
+			}
+
+			for (int b = 0; b < m_multiBodies.size(); b++)
+			{
+				btMultiBody* bod = m_multiBodies[b];
+				bod->forwardKinematics(m_scratch_world_to_local1, m_scratch_local_origin1);
+
+				if (mode & btIDebugDraw::DBG_DrawFrames)
+				{
+					getDebugDrawer()->drawTransform(bod->getBaseWorldTransform(), 0.1);
+				}
+
+				for (int m = 0; m < bod->getNumLinks(); m++)
+				{
+					const btTransform& tr = bod->getLink(m).m_cachedWorldTransform;
+					if (mode & btIDebugDraw::DBG_DrawFrames)
+					{
+						getDebugDrawer()->drawTransform(tr, 0.1);
+					}
+					//draw the joint axis
+					if (bod->getLink(m).m_jointType == btMultibodyLink::eRevolute)
+					{
+						btVector3 vec = quatRotate(tr.getRotation(), bod->getLink(m).m_axes[0].m_topVec) * 0.1;
+
+						btVector4 color(0, 0, 0, 1);  //1,1,1);
+						btVector3 from = vec + tr.getOrigin() - quatRotate(tr.getRotation(), bod->getLink(m).m_dVector);
+						btVector3 to = tr.getOrigin() - quatRotate(tr.getRotation(), bod->getLink(m).m_dVector);
+						getDebugDrawer()->drawLine(from, to, color);
+					}
+					if (bod->getLink(m).m_jointType == btMultibodyLink::eFixed)
+					{
+						btVector3 vec = quatRotate(tr.getRotation(), bod->getLink(m).m_axes[0].m_bottomVec) * 0.1;
+
+						btVector4 color(0, 0, 0, 1);  //1,1,1);
+						btVector3 from = vec + tr.getOrigin() - quatRotate(tr.getRotation(), bod->getLink(m).m_dVector);
+						btVector3 to = tr.getOrigin() - quatRotate(tr.getRotation(), bod->getLink(m).m_dVector);
+						getDebugDrawer()->drawLine(from, to, color);
+					}
+					if (bod->getLink(m).m_jointType == btMultibodyLink::ePrismatic)
+					{
+						btVector3 vec = quatRotate(tr.getRotation(), bod->getLink(m).m_axes[0].m_bottomVec) * 0.1;
+
+						btVector4 color(0, 0, 0, 1);  //1,1,1);
+						btVector3 from = vec + tr.getOrigin() - quatRotate(tr.getRotation(), bod->getLink(m).m_dVector);
+						btVector3 to = tr.getOrigin() - quatRotate(tr.getRotation(), bod->getLink(m).m_dVector);
+						getDebugDrawer()->drawLine(from, to, color);
+					}
+				}
+			}
+		}
+	}
+}
+
+void btMultiBodyDynamicsWorld::applyGravity()
+{
+	btDiscreteDynamicsWorld::applyGravity();
+#ifdef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+	BT_PROFILE("btMultiBody addGravity");
+	for (int i = 0; i < this->m_multiBodies.size(); i++)
+	{
+		btMultiBody* bod = m_multiBodies[i];
+
+		bool isSleeping = false;
+
+		if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+		{
+			isSleeping = true;
+		}
+		for (int b = 0; b < bod->getNumLinks(); b++)
+		{
+			if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+				isSleeping = true;
+		}
+
+		if (!isSleeping)
+		{
+			bod->addBaseForce(m_gravity * bod->getBaseMass());
+
+			for (int j = 0; j < bod->getNumLinks(); ++j)
+			{
+				bod->addLinkForce(j, m_gravity * bod->getLinkMass(j));
+			}
+		}  //if (!isSleeping)
+	}
+#endif  //BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+}
+
+void btMultiBodyDynamicsWorld::clearMultiBodyConstraintForces()
+{
+	for (int i = 0; i < this->m_multiBodies.size(); i++)
+	{
+		btMultiBody* bod = m_multiBodies[i];
+		bod->clearConstraintForces();
+	}
+}
+void btMultiBodyDynamicsWorld::clearMultiBodyForces()
+{
+	{
+		// BT_PROFILE("clearMultiBodyForces");
+		for (int i = 0; i < this->m_multiBodies.size(); i++)
+		{
+			btMultiBody* bod = m_multiBodies[i];
+
+			bool isSleeping = false;
+
+			if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+			{
+				isSleeping = true;
+			}
+			for (int b = 0; b < bod->getNumLinks(); b++)
+			{
+				if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+					isSleeping = true;
+			}
+
+			if (!isSleeping)
+			{
+				btMultiBody* bod = m_multiBodies[i];
+				bod->clearForcesAndTorques();
+			}
+		}
+	}
+}
+void btMultiBodyDynamicsWorld::clearForces()
+{
+	btDiscreteDynamicsWorld::clearForces();
+
+#ifdef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+	clearMultiBodyForces();
+#endif
+}
+
+void btMultiBodyDynamicsWorld::serialize(btSerializer* serializer)
+{
+	serializer->startSerialization();
+
+	serializeDynamicsWorldInfo(serializer);
+
+	serializeMultiBodies(serializer);
+
+	serializeRigidBodies(serializer);
+
+	serializeCollisionObjects(serializer);
+
+	serializeContactManifolds(serializer);
+
+	serializer->finishSerialization();
+}
+
+void btMultiBodyDynamicsWorld::serializeMultiBodies(btSerializer* serializer)
+{
+	int i;
+	//serialize all collision objects
+	for (i = 0; i < m_multiBodies.size(); i++)
+	{
+		btMultiBody* mb = m_multiBodies[i];
+		{
+			int len = mb->calculateSerializeBufferSize();
+			btChunk* chunk = serializer->allocate(len, 1);
+			const char* structType = mb->serialize(chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_MULTIBODY_CODE, mb);
+		}
+	}
+
+	//serialize all multibody links (collision objects)
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		if (colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+		{
+			int len = colObj->calculateSerializeBufferSize();
+			btChunk* chunk = serializer->allocate(len, 1);
+			const char* structType = colObj->serialize(chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_MB_LINKCOLLIDER_CODE, colObj);
+		}
+	}
+}
+
+void btMultiBodyDynamicsWorld::saveKinematicState(btScalar timeStep)
+{
+	btDiscreteDynamicsWorld::saveKinematicState(timeStep);
+	for(int i = 0; i < m_multiBodies.size(); i++)
+	{
+		btMultiBody* body = m_multiBodies[i];
+		if(body->isBaseKinematic())
+			body->saveKinematicState(timeStep);
+	}
+}
+
+//
+//void btMultiBodyDynamicsWorld::setSplitIslands(bool split)
+//{
+//    m_islandManager->setSplitIslands(split);
+//}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h
new file mode 100644
index 0000000..d2d76c8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h
@@ -0,0 +1,126 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_DYNAMICS_WORLD_H
+#define BT_MULTIBODY_DYNAMICS_WORLD_H
+
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+#include "BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h"
+
+#define BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY
+
+class btMultiBody;
+class btMultiBodyConstraint;
+class btMultiBodyConstraintSolver;
+struct MultiBodyInplaceSolverIslandCallback;
+
+///The btMultiBodyDynamicsWorld adds Featherstone multi body dynamics to Bullet
+///This implementation is still preliminary/experimental.
+class btMultiBodyDynamicsWorld : public btDiscreteDynamicsWorld
+{
+protected:
+	btAlignedObjectArray<btMultiBody*> m_multiBodies;
+	btAlignedObjectArray<btMultiBodyConstraint*> m_multiBodyConstraints;
+	btAlignedObjectArray<btMultiBodyConstraint*> m_sortedMultiBodyConstraints;
+	btMultiBodyConstraintSolver* m_multiBodyConstraintSolver;
+	MultiBodyInplaceSolverIslandCallback* m_solverMultiBodyIslandCallback;
+
+	//cached data to avoid memory allocations
+	btAlignedObjectArray<btQuaternion> m_scratch_world_to_local;
+	btAlignedObjectArray<btVector3> m_scratch_local_origin;
+	btAlignedObjectArray<btQuaternion> m_scratch_world_to_local1;
+	btAlignedObjectArray<btVector3> m_scratch_local_origin1;
+	btAlignedObjectArray<btScalar> m_scratch_r;
+	btAlignedObjectArray<btVector3> m_scratch_v;
+	btAlignedObjectArray<btMatrix3x3> m_scratch_m;
+
+	virtual void calculateSimulationIslands();
+	virtual void updateActivationState(btScalar timeStep);
+	
+
+	virtual void serializeMultiBodies(btSerializer* serializer);
+
+public:
+	btMultiBodyDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btMultiBodyConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration);
+
+	virtual ~btMultiBodyDynamicsWorld();
+    
+    virtual void solveConstraints(btContactSolverInfo& solverInfo);
+    
+	virtual void addMultiBody(btMultiBody* body, int group = btBroadphaseProxy::DefaultFilter, int mask = btBroadphaseProxy::AllFilter);
+
+	virtual void removeMultiBody(btMultiBody* body);
+
+	virtual int getNumMultibodies() const
+	{
+		return m_multiBodies.size();
+	}
+
+	btMultiBody* getMultiBody(int mbIndex)
+	{
+		return m_multiBodies[mbIndex];
+	}
+
+	const btMultiBody* getMultiBody(int mbIndex) const
+	{
+		return m_multiBodies[mbIndex];
+	}
+
+	virtual void addMultiBodyConstraint(btMultiBodyConstraint* constraint);
+
+	virtual int getNumMultiBodyConstraints() const
+	{
+		return m_multiBodyConstraints.size();
+	}
+
+	virtual btMultiBodyConstraint* getMultiBodyConstraint(int constraintIndex)
+	{
+		return m_multiBodyConstraints[constraintIndex];
+	}
+
+	virtual const btMultiBodyConstraint* getMultiBodyConstraint(int constraintIndex) const
+	{
+		return m_multiBodyConstraints[constraintIndex];
+	}
+
+	virtual void removeMultiBodyConstraint(btMultiBodyConstraint* constraint);
+
+	virtual void integrateTransforms(btScalar timeStep);
+    void integrateMultiBodyTransforms(btScalar timeStep);
+    void predictMultiBodyTransforms(btScalar timeStep);
+    
+    virtual void predictUnconstraintMotion(btScalar timeStep);
+	virtual void debugDrawWorld();
+
+	virtual void debugDrawMultiBodyConstraint(btMultiBodyConstraint* constraint);
+
+	void forwardKinematics();
+	virtual void clearForces();
+	virtual void clearMultiBodyConstraintForces();
+	virtual void clearMultiBodyForces();
+	virtual void applyGravity();
+
+	virtual void serialize(btSerializer* serializer);
+	virtual void setMultiBodyConstraintSolver(btMultiBodyConstraintSolver* solver);
+	virtual void setConstraintSolver(btConstraintSolver* solver);
+	virtual void getAnalyticsData(btAlignedObjectArray<struct btSolverAnalyticsData>& m_islandAnalyticsData) const;
+    
+    virtual void solveExternalForces(btContactSolverInfo& solverInfo);
+    virtual void solveInternalConstraints(btContactSolverInfo& solverInfo);
+    void buildIslands();
+
+	virtual void saveKinematicState(btScalar timeStep);
+};
+#endif  //BT_MULTIBODY_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp
new file mode 100644
index 0000000..df2abbe
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp
@@ -0,0 +1,215 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodyFixedConstraint.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
+#include "LinearMath/btIDebugDraw.h"
+
+#define BTMBFIXEDCONSTRAINT_DIM 6
+
+btMultiBodyFixedConstraint::btMultiBodyFixedConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB)
+	: btMultiBodyConstraint(body, 0, link, -1, BTMBFIXEDCONSTRAINT_DIM, false, MULTIBODY_CONSTRAINT_FIXED),
+	  m_rigidBodyA(0),
+	  m_rigidBodyB(bodyB),
+	  m_pivotInA(pivotInA),
+	  m_pivotInB(pivotInB),
+	  m_frameInA(frameInA),
+	  m_frameInB(frameInB)
+{
+	m_data.resize(BTMBFIXEDCONSTRAINT_DIM);  //at least store the applied impulses
+}
+
+btMultiBodyFixedConstraint::btMultiBodyFixedConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB)
+	: btMultiBodyConstraint(bodyA, bodyB, linkA, linkB, BTMBFIXEDCONSTRAINT_DIM, false, MULTIBODY_CONSTRAINT_FIXED),
+	  m_rigidBodyA(0),
+	  m_rigidBodyB(0),
+	  m_pivotInA(pivotInA),
+	  m_pivotInB(pivotInB),
+	  m_frameInA(frameInA),
+	  m_frameInB(frameInB)
+{
+	m_data.resize(BTMBFIXEDCONSTRAINT_DIM);  //at least store the applied impulses
+}
+
+void btMultiBodyFixedConstraint::finalizeMultiDof()
+{
+	//not implemented yet
+	btAssert(0);
+}
+
+btMultiBodyFixedConstraint::~btMultiBodyFixedConstraint()
+{
+}
+
+int btMultiBodyFixedConstraint::getIslandIdA() const
+{
+	if (m_rigidBodyA)
+		return m_rigidBodyA->getIslandTag();
+
+	if (m_bodyA)
+	{
+		if (m_linkA < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyA->getLink(m_linkA).m_collider)
+				return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodyFixedConstraint::getIslandIdB() const
+{
+	if (m_rigidBodyB)
+		return m_rigidBodyB->getIslandTag();
+	if (m_bodyB)
+	{
+		if (m_linkB < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyB->getLink(m_linkB).m_collider)
+				return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+void btMultiBodyFixedConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows, btMultiBodyJacobianData& data, const btContactSolverInfo& infoGlobal)
+{
+	int numDim = BTMBFIXEDCONSTRAINT_DIM;
+	for (int i = 0; i < numDim; i++)
+	{
+		btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+		constraintRow.m_orgConstraint = this;
+		constraintRow.m_orgDofIndex = i;
+		constraintRow.m_relpos1CrossNormal.setValue(0, 0, 0);
+		constraintRow.m_contactNormal1.setValue(0, 0, 0);
+		constraintRow.m_relpos2CrossNormal.setValue(0, 0, 0);
+		constraintRow.m_contactNormal2.setValue(0, 0, 0);
+		constraintRow.m_angularComponentA.setValue(0, 0, 0);
+		constraintRow.m_angularComponentB.setValue(0, 0, 0);
+
+		constraintRow.m_solverBodyIdA = data.m_fixedBodyId;
+		constraintRow.m_solverBodyIdB = data.m_fixedBodyId;
+
+		// Convert local points back to world
+		btVector3 pivotAworld = m_pivotInA;
+		btMatrix3x3 frameAworld = m_frameInA;
+		if (m_rigidBodyA)
+		{
+			constraintRow.m_solverBodyIdA = m_rigidBodyA->getCompanionId();
+			pivotAworld = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA;
+			frameAworld = frameAworld.transpose() * btMatrix3x3(m_rigidBodyA->getOrientation());
+		}
+		else
+		{
+			if (m_bodyA)
+			{
+				pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
+				frameAworld = m_bodyA->localFrameToWorld(m_linkA, frameAworld);
+			}
+		}
+		btVector3 pivotBworld = m_pivotInB;
+		btMatrix3x3 frameBworld = m_frameInB;
+		if (m_rigidBodyB)
+		{
+			constraintRow.m_solverBodyIdB = m_rigidBodyB->getCompanionId();
+			pivotBworld = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB;
+			frameBworld = frameBworld.transpose() * btMatrix3x3(m_rigidBodyB->getOrientation());
+		}
+		else
+		{
+			if (m_bodyB)
+			{
+				pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
+				frameBworld = m_bodyB->localFrameToWorld(m_linkB, frameBworld);
+			}
+		}
+
+		btMatrix3x3 relRot = frameAworld.inverse() * frameBworld;
+		btVector3 angleDiff;
+		btGeneric6DofSpring2Constraint::matrixToEulerXYZ(relRot, angleDiff);
+
+		btVector3 constraintNormalLin(0, 0, 0);
+		btVector3 constraintNormalAng(0, 0, 0);
+		btScalar posError = 0.0;
+		if (i < 3)
+		{
+			constraintNormalLin[i] = 1;
+			posError = (pivotAworld - pivotBworld).dot(constraintNormalLin);
+			fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
+									constraintNormalLin, pivotAworld, pivotBworld,
+									posError,
+									infoGlobal,
+									-m_maxAppliedImpulse, m_maxAppliedImpulse);
+		}
+		else
+		{  //i>=3
+			constraintNormalAng = frameAworld.getColumn(i % 3);
+			posError = angleDiff[i % 3];
+			fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
+									constraintNormalLin, pivotAworld, pivotBworld,
+									posError,
+									infoGlobal,
+									-m_maxAppliedImpulse, m_maxAppliedImpulse, true);
+		}
+	}
+}
+
+void btMultiBodyFixedConstraint::debugDraw(class btIDebugDraw* drawer)
+{
+	btTransform tr;
+	tr.setIdentity();
+
+	if (m_rigidBodyA)
+	{
+		btVector3 pivot = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA;
+		tr.setOrigin(pivot);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_bodyA)
+	{
+		btVector3 pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
+		tr.setOrigin(pivotAworld);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_rigidBodyB)
+	{
+		// that ideally should draw the same frame
+		btVector3 pivot = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB;
+		tr.setOrigin(pivot);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_bodyB)
+	{
+		btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
+		tr.setOrigin(pivotBworld);
+		drawer->drawTransform(tr, 0.1);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h
new file mode 100644
index 0000000..adb1cb4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h
@@ -0,0 +1,91 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_MULTIBODY_FIXED_CONSTRAINT_H
+#define BT_MULTIBODY_FIXED_CONSTRAINT_H
+
+#include "btMultiBodyConstraint.h"
+
+class btMultiBodyFixedConstraint : public btMultiBodyConstraint
+{
+protected:
+	btRigidBody* m_rigidBodyA;
+	btRigidBody* m_rigidBodyB;
+	btVector3 m_pivotInA;
+	btVector3 m_pivotInB;
+	btMatrix3x3 m_frameInA;
+	btMatrix3x3 m_frameInB;
+
+public:
+	btMultiBodyFixedConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB);
+	btMultiBodyFixedConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB);
+
+	virtual ~btMultiBodyFixedConstraint();
+
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+									  btMultiBodyJacobianData& data,
+									  const btContactSolverInfo& infoGlobal);
+
+	const btVector3& getPivotInA() const
+	{
+		return m_pivotInA;
+	}
+
+	void setPivotInA(const btVector3& pivotInA)
+	{
+		m_pivotInA = pivotInA;
+	}
+
+	const btVector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
+
+	virtual void setPivotInB(const btVector3& pivotInB)
+	{
+		m_pivotInB = pivotInB;
+	}
+
+	const btMatrix3x3& getFrameInA() const
+	{
+		return m_frameInA;
+	}
+
+	void setFrameInA(const btMatrix3x3& frameInA)
+	{
+		m_frameInA = frameInA;
+	}
+
+	const btMatrix3x3& getFrameInB() const
+	{
+		return m_frameInB;
+	}
+
+	virtual void setFrameInB(const btMatrix3x3& frameInB)
+	{
+		m_frameInB = frameInB;
+	}
+
+	virtual void debugDraw(class btIDebugDraw* drawer);
+};
+
+#endif  //BT_MULTIBODY_FIXED_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp
new file mode 100644
index 0000000..ee02cf9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp
@@ -0,0 +1,181 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodyGearConstraint.h"
+#include "btMultiBody.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+btMultiBodyGearConstraint::btMultiBodyGearConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB)
+	: btMultiBodyConstraint(bodyA, bodyB, linkA, linkB, 1, false, MULTIBODY_CONSTRAINT_GEAR),
+	  m_gearRatio(1),
+	  m_gearAuxLink(-1),
+	  m_erp(0),
+	  m_relativePositionTarget(0)
+{
+}
+
+void btMultiBodyGearConstraint::finalizeMultiDof()
+{
+	allocateJacobiansMultiDof();
+
+	m_numDofsFinalized = m_jacSizeBoth;
+}
+
+btMultiBodyGearConstraint::~btMultiBodyGearConstraint()
+{
+}
+
+int btMultiBodyGearConstraint::getIslandIdA() const
+{
+	if (m_bodyA)
+	{
+		if (m_linkA < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyA->getLink(m_linkA).m_collider)
+				return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodyGearConstraint::getIslandIdB() const
+{
+	if (m_bodyB)
+	{
+		if (m_linkB < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyB->getLink(m_linkB).m_collider)
+				return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+void btMultiBodyGearConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+													 btMultiBodyJacobianData& data,
+													 const btContactSolverInfo& infoGlobal)
+{
+	// only positions need to be updated -- data.m_jacobians and force
+	// directions were set in the ctor and never change.
+
+	if (m_numDofsFinalized != m_jacSizeBoth)
+	{
+		finalizeMultiDof();
+	}
+
+	//don't crash
+	if (m_numDofsFinalized != m_jacSizeBoth)
+		return;
+
+	if (m_maxAppliedImpulse == 0.f)
+		return;
+
+	// note: we rely on the fact that data.m_jacobians are
+	// always initialized to zero by the Constraint ctor
+	int linkDoF = 0;
+	unsigned int offsetA = 6 + (m_bodyA->getLink(m_linkA).m_dofOffset + linkDoF);
+	unsigned int offsetB = 6 + (m_bodyB->getLink(m_linkB).m_dofOffset + linkDoF);
+
+	// row 0: the lower bound
+	jacobianA(0)[offsetA] = 1;
+	jacobianB(0)[offsetB] = m_gearRatio;
+
+	btScalar posError = 0;
+	const btVector3 dummy(0, 0, 0);
+
+	btScalar kp = 1;
+	btScalar kd = 1;
+	int numRows = getNumRows();
+
+	for (int row = 0; row < numRows; row++)
+	{
+		btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+
+		int dof = 0;
+		btScalar currentPosition = m_bodyA->getJointPosMultiDof(m_linkA)[dof];
+		btScalar currentVelocity = m_bodyA->getJointVelMultiDof(m_linkA)[dof];
+		btScalar auxVel = 0;
+
+		if (m_gearAuxLink >= 0)
+		{
+			auxVel = m_bodyA->getJointVelMultiDof(m_gearAuxLink)[dof];
+		}
+		currentVelocity += auxVel;
+		if (m_erp != 0)
+		{
+			btScalar currentPositionA = m_bodyA->getJointPosMultiDof(m_linkA)[dof];
+			if (m_gearAuxLink >= 0)
+			{
+				currentPositionA -= m_bodyA->getJointPosMultiDof(m_gearAuxLink)[dof];
+			}
+			btScalar currentPositionB = m_gearRatio * m_bodyA->getJointPosMultiDof(m_linkB)[dof];
+			btScalar diff = currentPositionB + currentPositionA;
+			btScalar desiredPositionDiff = this->m_relativePositionTarget;
+			posError = -m_erp * (desiredPositionDiff - diff);
+		}
+
+		btScalar desiredRelativeVelocity = auxVel;
+
+		fillMultiBodyConstraint(constraintRow, data, jacobianA(row), jacobianB(row), dummy, dummy, dummy, dummy, posError, infoGlobal, -m_maxAppliedImpulse, m_maxAppliedImpulse, false, 1, false, desiredRelativeVelocity);
+
+		constraintRow.m_orgConstraint = this;
+		constraintRow.m_orgDofIndex = row;
+		{
+			//expect either prismatic or revolute joint type for now
+			btAssert((m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::eRevolute) || (m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::ePrismatic));
+			switch (m_bodyA->getLink(m_linkA).m_jointType)
+			{
+				case btMultibodyLink::eRevolute:
+				{
+					constraintRow.m_contactNormal1.setZero();
+					constraintRow.m_contactNormal2.setZero();
+					btVector3 revoluteAxisInWorld = quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(), m_bodyA->getLink(m_linkA).m_axes[0].m_topVec);
+					constraintRow.m_relpos1CrossNormal = revoluteAxisInWorld;
+					constraintRow.m_relpos2CrossNormal = -revoluteAxisInWorld;
+
+					break;
+				}
+				case btMultibodyLink::ePrismatic:
+				{
+					btVector3 prismaticAxisInWorld = quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(), m_bodyA->getLink(m_linkA).m_axes[0].m_bottomVec);
+					constraintRow.m_contactNormal1 = prismaticAxisInWorld;
+					constraintRow.m_contactNormal2 = -prismaticAxisInWorld;
+					constraintRow.m_relpos1CrossNormal.setZero();
+					constraintRow.m_relpos2CrossNormal.setZero();
+					break;
+				}
+				default:
+				{
+					btAssert(0);
+				}
+			};
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h
new file mode 100644
index 0000000..31888fb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h
@@ -0,0 +1,115 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_MULTIBODY_GEAR_CONSTRAINT_H
+#define BT_MULTIBODY_GEAR_CONSTRAINT_H
+
+#include "btMultiBodyConstraint.h"
+
+class btMultiBodyGearConstraint : public btMultiBodyConstraint
+{
+protected:
+	btRigidBody* m_rigidBodyA;
+	btRigidBody* m_rigidBodyB;
+	btVector3 m_pivotInA;
+	btVector3 m_pivotInB;
+	btMatrix3x3 m_frameInA;
+	btMatrix3x3 m_frameInB;
+	btScalar m_gearRatio;
+	int m_gearAuxLink;
+	btScalar m_erp;
+	btScalar m_relativePositionTarget;
+
+public:
+	//btMultiBodyGearConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB);
+	btMultiBodyGearConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB);
+
+	virtual ~btMultiBodyGearConstraint();
+
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+									  btMultiBodyJacobianData& data,
+									  const btContactSolverInfo& infoGlobal);
+
+	const btVector3& getPivotInA() const
+	{
+		return m_pivotInA;
+	}
+
+	void setPivotInA(const btVector3& pivotInA)
+	{
+		m_pivotInA = pivotInA;
+	}
+
+	const btVector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
+
+	virtual void setPivotInB(const btVector3& pivotInB)
+	{
+		m_pivotInB = pivotInB;
+	}
+
+	const btMatrix3x3& getFrameInA() const
+	{
+		return m_frameInA;
+	}
+
+	void setFrameInA(const btMatrix3x3& frameInA)
+	{
+		m_frameInA = frameInA;
+	}
+
+	const btMatrix3x3& getFrameInB() const
+	{
+		return m_frameInB;
+	}
+
+	virtual void setFrameInB(const btMatrix3x3& frameInB)
+	{
+		m_frameInB = frameInB;
+	}
+
+	virtual void debugDraw(class btIDebugDraw* drawer)
+	{
+		//todo(erwincoumans)
+	}
+
+	virtual void setGearRatio(btScalar gearRatio)
+	{
+		m_gearRatio = gearRatio;
+	}
+	virtual void setGearAuxLink(int gearAuxLink)
+	{
+		m_gearAuxLink = gearAuxLink;
+	}
+	virtual void setRelativePositionTarget(btScalar relPosTarget)
+	{
+		m_relativePositionTarget = relPosTarget;
+	}
+	virtual void setErp(btScalar erp)
+	{
+		m_erp = erp;
+	}
+};
+
+#endif  //BT_MULTIBODY_GEAR_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h
new file mode 100644
index 0000000..3169b86
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h
@@ -0,0 +1,247 @@
+/*
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_MULTIBODY_INPLACE_SOLVER_ISLAND_CALLBACK_H
+#define BT_MULTIBODY_INPLACE_SOLVER_ISLAND_CALLBACK_H
+
+#include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+#include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h"
+#include "btMultiBodyConstraintSolver.h"
+
+SIMD_FORCE_INLINE int btGetConstraintIslandId2(const btTypedConstraint* lhs)
+{
+    int islandId;
+    
+    const btCollisionObject& rcolObj0 = lhs->getRigidBodyA();
+    const btCollisionObject& rcolObj1 = lhs->getRigidBodyB();
+    islandId = rcolObj0.getIslandTag() >= 0 ? rcolObj0.getIslandTag() : rcolObj1.getIslandTag();
+    return islandId;
+}
+class btSortConstraintOnIslandPredicate2
+{
+public:
+    bool operator()(const btTypedConstraint* lhs, const btTypedConstraint* rhs) const
+    {
+        int rIslandId0, lIslandId0;
+        rIslandId0 = btGetConstraintIslandId2(rhs);
+        lIslandId0 = btGetConstraintIslandId2(lhs);
+        return lIslandId0 < rIslandId0;
+    }
+};
+
+SIMD_FORCE_INLINE int btGetMultiBodyConstraintIslandId(const btMultiBodyConstraint* lhs)
+{
+    int islandId;
+    
+    int islandTagA = lhs->getIslandIdA();
+    int islandTagB = lhs->getIslandIdB();
+    islandId = islandTagA >= 0 ? islandTagA : islandTagB;
+    return islandId;
+}
+
+class btSortMultiBodyConstraintOnIslandPredicate
+{
+public:
+    bool operator()(const btMultiBodyConstraint* lhs, const btMultiBodyConstraint* rhs) const
+    {
+        int rIslandId0, lIslandId0;
+        rIslandId0 = btGetMultiBodyConstraintIslandId(rhs);
+        lIslandId0 = btGetMultiBodyConstraintIslandId(lhs);
+        return lIslandId0 < rIslandId0;
+    }
+};
+
+struct MultiBodyInplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback
+{
+
+    btContactSolverInfo* m_solverInfo;
+    btMultiBodyConstraintSolver* m_solver;
+    btMultiBodyConstraint** m_multiBodySortedConstraints;
+    int m_numMultiBodyConstraints;
+    
+    btTypedConstraint** m_sortedConstraints;
+    int m_numConstraints;
+    btIDebugDraw* m_debugDrawer;
+    btDispatcher* m_dispatcher;
+    
+    btAlignedObjectArray<btCollisionObject*> m_bodies;
+	btAlignedObjectArray<btCollisionObject*> m_softBodies;
+    btAlignedObjectArray<btPersistentManifold*> m_manifolds;
+    btAlignedObjectArray<btTypedConstraint*> m_constraints;
+    btAlignedObjectArray<btMultiBodyConstraint*> m_multiBodyConstraints;
+    
+    btAlignedObjectArray<btSolverAnalyticsData> m_islandAnalyticsData;
+    
+    MultiBodyInplaceSolverIslandCallback(btMultiBodyConstraintSolver* solver,
+                                         btDispatcher* dispatcher)
+    : m_solverInfo(NULL),
+    m_solver(solver),
+    m_multiBodySortedConstraints(NULL),
+    m_numConstraints(0),
+    m_debugDrawer(NULL),
+    m_dispatcher(dispatcher)
+    {
+    }
+    
+    MultiBodyInplaceSolverIslandCallback& operator=(const MultiBodyInplaceSolverIslandCallback& other)
+    {
+        btAssert(0);
+        (void)other;
+        return *this;
+    }
+    
+    SIMD_FORCE_INLINE virtual void setup(btContactSolverInfo* solverInfo, btTypedConstraint** sortedConstraints, int numConstraints, btMultiBodyConstraint** sortedMultiBodyConstraints, int numMultiBodyConstraints, btIDebugDraw* debugDrawer)
+    {
+        m_islandAnalyticsData.clear();
+        btAssert(solverInfo);
+        m_solverInfo = solverInfo;
+        
+        m_multiBodySortedConstraints = sortedMultiBodyConstraints;
+        m_numMultiBodyConstraints = numMultiBodyConstraints;
+        m_sortedConstraints = sortedConstraints;
+        m_numConstraints = numConstraints;
+        
+        m_debugDrawer = debugDrawer;
+        m_bodies.resize(0);
+        m_manifolds.resize(0);
+        m_constraints.resize(0);
+        m_multiBodyConstraints.resize(0);
+    }
+    
+    void setMultiBodyConstraintSolver(btMultiBodyConstraintSolver* solver)
+    {
+        m_solver = solver;
+    }
+    
+    virtual void processIsland(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifolds, int numManifolds, int islandId)
+    {
+        if (islandId < 0)
+        {
+            ///we don't split islands, so all constraints/contact manifolds/bodies are passed into the solver regardless the island id
+            m_solver->solveMultiBodyGroup(bodies, numBodies, manifolds, numManifolds, m_sortedConstraints, m_numConstraints, &m_multiBodySortedConstraints[0], m_numConstraints, *m_solverInfo, m_debugDrawer, m_dispatcher);
+            if (m_solverInfo->m_reportSolverAnalytics&1)
+            {
+                m_solver->m_analyticsData.m_islandId = islandId;
+                m_islandAnalyticsData.push_back(m_solver->m_analyticsData);
+            }
+        }
+        else
+        {
+            //also add all non-contact constraints/joints for this island
+            btTypedConstraint** startConstraint = 0;
+            btMultiBodyConstraint** startMultiBodyConstraint = 0;
+            
+            int numCurConstraints = 0;
+            int numCurMultiBodyConstraints = 0;
+            
+            int i;
+            
+            //find the first constraint for this island
+            
+            for (i = 0; i < m_numConstraints; i++)
+            {
+                if (btGetConstraintIslandId2(m_sortedConstraints[i]) == islandId)
+                {
+                    startConstraint = &m_sortedConstraints[i];
+                    break;
+                }
+            }
+            //count the number of constraints in this island
+            for (; i < m_numConstraints; i++)
+            {
+                if (btGetConstraintIslandId2(m_sortedConstraints[i]) == islandId)
+                {
+                    numCurConstraints++;
+                }
+            }
+            
+            for (i = 0; i < m_numMultiBodyConstraints; i++)
+            {
+                if (btGetMultiBodyConstraintIslandId(m_multiBodySortedConstraints[i]) == islandId)
+                {
+                    startMultiBodyConstraint = &m_multiBodySortedConstraints[i];
+                    break;
+                }
+            }
+            //count the number of multi body constraints in this island
+            for (; i < m_numMultiBodyConstraints; i++)
+            {
+                if (btGetMultiBodyConstraintIslandId(m_multiBodySortedConstraints[i]) == islandId)
+                {
+                    numCurMultiBodyConstraints++;
+                }
+            }
+            
+            //if (m_solverInfo->m_minimumSolverBatchSize<=1)
+            //{
+            //    m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,*m_solverInfo,m_debugDrawer,m_dispatcher);
+            //} else
+            {
+                for (i = 0; i < numBodies; i++)
+				{
+					bool isSoftBodyType = (bodies[i]->getInternalType() & btCollisionObject::CO_SOFT_BODY);
+					if (!isSoftBodyType)
+					{
+						m_bodies.push_back(bodies[i]);
+					}
+					else
+					{
+						m_softBodies.push_back(bodies[i]);
+					}
+				}
+                for (i = 0; i < numManifolds; i++)
+                    m_manifolds.push_back(manifolds[i]);
+                for (i = 0; i < numCurConstraints; i++)
+                    m_constraints.push_back(startConstraint[i]);
+                
+                for (i = 0; i < numCurMultiBodyConstraints; i++)
+                    m_multiBodyConstraints.push_back(startMultiBodyConstraint[i]);
+                
+                if ((m_multiBodyConstraints.size() + m_constraints.size() + m_manifolds.size()) > m_solverInfo->m_minimumSolverBatchSize)
+                {
+                    processConstraints(islandId);
+                }
+                else
+                {
+                    //printf("deferred\n");
+                }
+            }
+        }
+    }
+    
+    virtual void processConstraints(int islandId=-1)
+    {
+        btCollisionObject** bodies = m_bodies.size() ? &m_bodies[0] : 0;
+        btPersistentManifold** manifold = m_manifolds.size() ? &m_manifolds[0] : 0;
+        btTypedConstraint** constraints = m_constraints.size() ? &m_constraints[0] : 0;
+        btMultiBodyConstraint** multiBodyConstraints = m_multiBodyConstraints.size() ? &m_multiBodyConstraints[0] : 0;
+        
+        //printf("mb contacts = %d, mb constraints = %d\n", mbContacts, m_multiBodyConstraints.size());
+        
+        m_solver->solveMultiBodyGroup(bodies, m_bodies.size(), manifold, m_manifolds.size(), constraints, m_constraints.size(), multiBodyConstraints, m_multiBodyConstraints.size(), *m_solverInfo, m_debugDrawer, m_dispatcher);
+        if (m_bodies.size() && (m_solverInfo->m_reportSolverAnalytics&1))
+        {
+            m_solver->m_analyticsData.m_islandId = islandId;
+            m_islandAnalyticsData.push_back(m_solver->m_analyticsData);
+        }
+        m_bodies.resize(0);
+		m_softBodies.resize(0);
+        m_manifolds.resize(0);
+        m_constraints.resize(0);
+        m_multiBodyConstraints.resize(0);
+    }
+};
+
+
+#endif /*BT_MULTIBODY_INPLACE_SOLVER_ISLAND_CALLBACK_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h
new file mode 100644
index 0000000..d943019
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h
@@ -0,0 +1,25 @@
+/*
+Copyright (c) 2015 Google Inc.
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_JOINT_FEEDBACK_H
+#define BT_MULTIBODY_JOINT_FEEDBACK_H
+
+#include "LinearMath/btSpatialAlgebra.h"
+
+struct btMultiBodyJointFeedback
+{
+	btSpatialForceVector m_reactionForces;
+};
+
+#endif  //BT_MULTIBODY_JOINT_FEEDBACK_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp
new file mode 100644
index 0000000..94b36ac
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp
@@ -0,0 +1,197 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodyJointLimitConstraint.h"
+#include "btMultiBody.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+btMultiBodyJointLimitConstraint::btMultiBodyJointLimitConstraint(btMultiBody* body, int link, btScalar lower, btScalar upper)
+	//:btMultiBodyConstraint(body,0,link,-1,2,true),
+	: btMultiBodyConstraint(body, body, link, body->getLink(link).m_parent, 2, true, MULTIBODY_CONSTRAINT_LIMIT),
+	  m_lowerBound(lower),
+	  m_upperBound(upper)
+{
+}
+
+void btMultiBodyJointLimitConstraint::finalizeMultiDof()
+{
+	// the data.m_jacobians never change, so may as well
+	// initialize them here
+
+	allocateJacobiansMultiDof();
+
+	unsigned int offset = 6 + m_bodyA->getLink(m_linkA).m_dofOffset;
+
+	// row 0: the lower bound
+	jacobianA(0)[offset] = 1;
+	// row 1: the upper bound
+	//jacobianA(1)[offset] = -1;
+	jacobianB(1)[offset] = -1;
+
+	m_numDofsFinalized = m_jacSizeBoth;
+}
+
+btMultiBodyJointLimitConstraint::~btMultiBodyJointLimitConstraint()
+{
+}
+
+int btMultiBodyJointLimitConstraint::getIslandIdA() const
+{
+	if (m_bodyA)
+	{
+		if (m_linkA < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyA->getLink(m_linkA).m_collider)
+				return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodyJointLimitConstraint::getIslandIdB() const
+{
+	if (m_bodyB)
+	{
+		if (m_linkB < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyB->getLink(m_linkB).m_collider)
+				return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+void btMultiBodyJointLimitConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+														   btMultiBodyJacobianData& data,
+														   const btContactSolverInfo& infoGlobal)
+{
+	// only positions need to be updated -- data.m_jacobians and force
+	// directions were set in the ctor and never change.
+
+	if (m_numDofsFinalized != m_jacSizeBoth)
+	{
+		finalizeMultiDof();
+	}
+
+	// row 0: the lower bound
+	setPosition(0, m_bodyA->getJointPos(m_linkA) - m_lowerBound);  //multidof: this is joint-type dependent
+
+	// row 1: the upper bound
+	setPosition(1, m_upperBound - m_bodyA->getJointPos(m_linkA));
+
+	for (int row = 0; row < getNumRows(); row++)
+	{
+		btScalar penetration = getPosition(row);
+
+		//todo: consider adding some safety threshold here
+		if (penetration > 0)
+		{
+			continue;
+		}
+		btScalar direction = row ? -1 : 1;
+
+		btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+		constraintRow.m_orgConstraint = this;
+		constraintRow.m_orgDofIndex = row;
+
+		constraintRow.m_multiBodyA = m_bodyA;
+		constraintRow.m_multiBodyB = m_bodyB;
+		const btScalar posError = 0;  //why assume it's zero?
+		const btVector3 dummy(0, 0, 0);
+
+		btScalar rel_vel = fillMultiBodyConstraint(constraintRow, data, jacobianA(row), jacobianB(row), dummy, dummy, dummy, dummy, posError, infoGlobal, 0, m_maxAppliedImpulse);
+
+		{
+			//expect either prismatic or revolute joint type for now
+			btAssert((m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::eRevolute) || (m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::ePrismatic));
+			switch (m_bodyA->getLink(m_linkA).m_jointType)
+			{
+				case btMultibodyLink::eRevolute:
+				{
+					constraintRow.m_contactNormal1.setZero();
+					constraintRow.m_contactNormal2.setZero();
+					btVector3 revoluteAxisInWorld = direction * quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(), m_bodyA->getLink(m_linkA).m_axes[0].m_topVec);
+					constraintRow.m_relpos1CrossNormal = revoluteAxisInWorld;
+					constraintRow.m_relpos2CrossNormal = -revoluteAxisInWorld;
+
+					break;
+				}
+				case btMultibodyLink::ePrismatic:
+				{
+					btVector3 prismaticAxisInWorld = direction * quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(), m_bodyA->getLink(m_linkA).m_axes[0].m_bottomVec);
+					constraintRow.m_contactNormal1 = prismaticAxisInWorld;
+					constraintRow.m_contactNormal2 = -prismaticAxisInWorld;
+					constraintRow.m_relpos1CrossNormal.setZero();
+					constraintRow.m_relpos2CrossNormal.setZero();
+
+					break;
+				}
+				default:
+				{
+					btAssert(0);
+				}
+			};
+		}
+
+		{
+			btScalar positionalError = 0.f;
+			btScalar velocityError = -rel_vel;  // * damping;
+			btScalar erp = infoGlobal.m_erp2;
+			if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+			{
+				erp = infoGlobal.m_erp;
+			}
+			if (penetration > 0)
+			{
+				positionalError = 0;
+				velocityError = -penetration / infoGlobal.m_timeStep;
+			}
+			else
+			{
+				positionalError = -penetration * erp / infoGlobal.m_timeStep;
+			}
+
+			btScalar penetrationImpulse = positionalError * constraintRow.m_jacDiagABInv;
+			btScalar velocityImpulse = velocityError * constraintRow.m_jacDiagABInv;
+			if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold))
+			{
+				//combine position and velocity into rhs
+				constraintRow.m_rhs = penetrationImpulse + velocityImpulse;
+				constraintRow.m_rhsPenetration = 0.f;
+			}
+			else
+			{
+				//split position and velocity into rhs and m_rhsPenetration
+				constraintRow.m_rhs = velocityImpulse;
+				constraintRow.m_rhsPenetration = penetrationImpulse;
+			}
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h
new file mode 100644
index 0000000..b810692
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h
@@ -0,0 +1,63 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H
+#define BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H
+
+#include "btMultiBodyConstraint.h"
+struct btSolverInfo;
+
+class btMultiBodyJointLimitConstraint : public btMultiBodyConstraint
+{
+protected:
+	btScalar m_lowerBound;
+	btScalar m_upperBound;
+
+public:
+	btMultiBodyJointLimitConstraint(btMultiBody* body, int link, btScalar lower, btScalar upper);
+	virtual ~btMultiBodyJointLimitConstraint();
+
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+									  btMultiBodyJacobianData& data,
+									  const btContactSolverInfo& infoGlobal);
+
+	virtual void debugDraw(class btIDebugDraw* drawer)
+	{
+		//todo(erwincoumans)
+	}
+	btScalar getLowerBound() const
+	{
+		return m_lowerBound;
+	}
+	btScalar getUpperBound() const
+	{
+		return m_upperBound;
+	}
+	void setLowerBound(btScalar lower)
+	{
+		m_lowerBound = lower;
+	}
+	void setUpperBound(btScalar upper)
+	{
+		m_upperBound = upper;
+	}
+};
+
+#endif  //BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp
new file mode 100644
index 0000000..fec9b03
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp
@@ -0,0 +1,183 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodyJointMotor.h"
+#include "btMultiBody.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+btMultiBodyJointMotor::btMultiBodyJointMotor(btMultiBody* body, int link, btScalar desiredVelocity, btScalar maxMotorImpulse)
+	: btMultiBodyConstraint(body, body, link, body->getLink(link).m_parent, 1, true, MULTIBODY_CONSTRAINT_1DOF_JOINT_MOTOR),
+	  m_desiredVelocity(desiredVelocity),
+	  m_desiredPosition(0),
+	  m_kd(1.),
+	  m_kp(0),
+	  m_erp(1),
+	  m_rhsClamp(SIMD_INFINITY)
+{
+	m_maxAppliedImpulse = maxMotorImpulse;
+	// the data.m_jacobians never change, so may as well
+	// initialize them here
+}
+
+void btMultiBodyJointMotor::finalizeMultiDof()
+{
+	allocateJacobiansMultiDof();
+	// note: we rely on the fact that data.m_jacobians are
+	// always initialized to zero by the Constraint ctor
+	int linkDoF = 0;
+	unsigned int offset = 6 + (m_bodyA->getLink(m_linkA).m_dofOffset + linkDoF);
+
+	// row 0: the lower bound
+	// row 0: the lower bound
+	jacobianA(0)[offset] = 1;
+
+	m_numDofsFinalized = m_jacSizeBoth;
+}
+
+btMultiBodyJointMotor::btMultiBodyJointMotor(btMultiBody* body, int link, int linkDoF, btScalar desiredVelocity, btScalar maxMotorImpulse)
+	//:btMultiBodyConstraint(body,0,link,-1,1,true),
+	: btMultiBodyConstraint(body, body, link, body->getLink(link).m_parent, 1, true, MULTIBODY_CONSTRAINT_1DOF_JOINT_MOTOR),
+	  m_desiredVelocity(desiredVelocity),
+	  m_desiredPosition(0),
+	  m_kd(1.),
+	  m_kp(0),
+	  m_erp(1),
+	  m_rhsClamp(SIMD_INFINITY)
+{
+	btAssert(linkDoF < body->getLink(link).m_dofCount);
+
+	m_maxAppliedImpulse = maxMotorImpulse;
+}
+btMultiBodyJointMotor::~btMultiBodyJointMotor()
+{
+}
+
+int btMultiBodyJointMotor::getIslandIdA() const
+{
+	if (this->m_linkA < 0)
+	{
+		btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+		if (col)
+			return col->getIslandTag();
+	}
+	else
+	{
+		if (m_bodyA->getLink(m_linkA).m_collider)
+		{
+			return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodyJointMotor::getIslandIdB() const
+{
+	if (m_linkB < 0)
+	{
+		btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+		if (col)
+			return col->getIslandTag();
+	}
+	else
+	{
+		if (m_bodyB->getLink(m_linkB).m_collider)
+		{
+			return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+void btMultiBodyJointMotor::createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+												 btMultiBodyJacobianData& data,
+												 const btContactSolverInfo& infoGlobal)
+{
+	// only positions need to be updated -- data.m_jacobians and force
+	// directions were set in the ctor and never change.
+
+	if (m_numDofsFinalized != m_jacSizeBoth)
+	{
+		finalizeMultiDof();
+	}
+
+	//don't crash
+	if (m_numDofsFinalized != m_jacSizeBoth)
+		return;
+
+	if (m_maxAppliedImpulse == 0.f)
+		return;
+
+	const btScalar posError = 0;
+	const btVector3 dummy(0, 0, 0);
+
+	for (int row = 0; row < getNumRows(); row++)
+	{
+		btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+
+		int dof = 0;
+		btScalar currentPosition = m_bodyA->getJointPosMultiDof(m_linkA)[dof];
+		btScalar currentVelocity = m_bodyA->getJointVelMultiDof(m_linkA)[dof];
+		btScalar positionStabiliationTerm = m_erp * (m_desiredPosition - currentPosition) / infoGlobal.m_timeStep;
+
+		btScalar velocityError = (m_desiredVelocity - currentVelocity);
+		btScalar rhs = m_kp * positionStabiliationTerm + currentVelocity + m_kd * velocityError;
+		if (rhs > m_rhsClamp)
+		{
+			rhs = m_rhsClamp;
+		}
+		if (rhs < -m_rhsClamp)
+		{
+			rhs = -m_rhsClamp;
+		}
+
+		fillMultiBodyConstraint(constraintRow, data, jacobianA(row), jacobianB(row), dummy, dummy, dummy, dummy, posError, infoGlobal, -m_maxAppliedImpulse, m_maxAppliedImpulse, false, 1, false, rhs);
+		constraintRow.m_orgConstraint = this;
+		constraintRow.m_orgDofIndex = row;
+		{
+			//expect either prismatic or revolute joint type for now
+			btAssert((m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::eRevolute) || (m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::ePrismatic));
+			switch (m_bodyA->getLink(m_linkA).m_jointType)
+			{
+				case btMultibodyLink::eRevolute:
+				{
+					constraintRow.m_contactNormal1.setZero();
+					constraintRow.m_contactNormal2.setZero();
+					btVector3 revoluteAxisInWorld = quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(), m_bodyA->getLink(m_linkA).m_axes[0].m_topVec);
+					constraintRow.m_relpos1CrossNormal = revoluteAxisInWorld;
+					constraintRow.m_relpos2CrossNormal = -revoluteAxisInWorld;
+
+					break;
+				}
+				case btMultibodyLink::ePrismatic:
+				{
+					btVector3 prismaticAxisInWorld = quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(), m_bodyA->getLink(m_linkA).m_axes[0].m_bottomVec);
+					constraintRow.m_contactNormal1 = prismaticAxisInWorld;
+					constraintRow.m_contactNormal2 = -prismaticAxisInWorld;
+					constraintRow.m_relpos1CrossNormal.setZero();
+					constraintRow.m_relpos2CrossNormal.setZero();
+
+					break;
+				}
+				default:
+				{
+					btAssert(0);
+				}
+			};
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h
new file mode 100644
index 0000000..1aca363
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h
@@ -0,0 +1,77 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_MULTIBODY_JOINT_MOTOR_H
+#define BT_MULTIBODY_JOINT_MOTOR_H
+
+#include "btMultiBodyConstraint.h"
+struct btSolverInfo;
+
+class btMultiBodyJointMotor : public btMultiBodyConstraint
+{
+protected:
+	btScalar m_desiredVelocity;
+	btScalar m_desiredPosition;
+	btScalar m_kd;
+	btScalar m_kp;
+	btScalar m_erp;
+	btScalar m_rhsClamp;  //maximum error
+
+public:
+	btMultiBodyJointMotor(btMultiBody* body, int link, btScalar desiredVelocity, btScalar maxMotorImpulse);
+	btMultiBodyJointMotor(btMultiBody* body, int link, int linkDoF, btScalar desiredVelocity, btScalar maxMotorImpulse);
+	virtual ~btMultiBodyJointMotor();
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+									  btMultiBodyJacobianData& data,
+									  const btContactSolverInfo& infoGlobal);
+
+	virtual void setVelocityTarget(btScalar velTarget, btScalar kd = 1.f)
+	{
+		m_desiredVelocity = velTarget;
+		m_kd = kd;
+	}
+
+	virtual void setPositionTarget(btScalar posTarget, btScalar kp = 1.f)
+	{
+		m_desiredPosition = posTarget;
+		m_kp = kp;
+	}
+
+	virtual void setErp(btScalar erp)
+	{
+		m_erp = erp;
+	}
+	virtual btScalar getErp() const
+	{
+		return m_erp;
+	}
+	virtual void setRhsClamp(btScalar rhsClamp)
+	{
+		m_rhsClamp = rhsClamp;
+	}
+	virtual void debugDraw(class btIDebugDraw* drawer)
+	{
+		//todo(erwincoumans)
+	}
+};
+
+#endif  //BT_MULTIBODY_JOINT_MOTOR_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyLink.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyLink.h
new file mode 100644
index 0000000..5a14293
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyLink.h
@@ -0,0 +1,303 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_LINK_H
+#define BT_MULTIBODY_LINK_H
+
+#include "LinearMath/btQuaternion.h"
+#include "LinearMath/btVector3.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+enum btMultiBodyLinkFlags
+{
+	BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION = 1,
+	BT_MULTIBODYLINKFLAGS_DISABLE_ALL_PARENT_COLLISION = 2,
+};
+
+//both defines are now permanently enabled
+#define BT_MULTIBODYLINK_INCLUDE_PLANAR_JOINTS
+#define TEST_SPATIAL_ALGEBRA_LAYER
+
+//
+// Various spatial helper functions
+//
+
+//namespace {
+
+#include "LinearMath/btSpatialAlgebra.h"
+
+//}
+
+//
+// Link struct
+//
+
+struct btMultibodyLink
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btScalar m_mass;           // mass of link
+	btVector3 m_inertiaLocal;  // inertia of link (local frame; diagonal)
+
+	int m_parent;  // index of the parent link (assumed to be < index of this link), or -1 if parent is the base link.
+
+	btQuaternion m_zeroRotParentToThis;  // rotates vectors in parent-frame to vectors in local-frame (when q=0). constant.
+
+	btVector3 m_dVector;  // vector from the inboard joint pos to this link's COM. (local frame.) constant.
+						  //this is set to zero for planar joint (see also m_eVector comment)
+
+	// m_eVector is constant, but depends on the joint type:
+	// revolute, fixed, prismatic, spherical: vector from parent's COM to the pivot point, in PARENT's frame.
+	// planar: vector from COM of parent to COM of this link, WHEN Q = 0. (local frame.)
+	// todo: fix the planar so it is consistent with the other joints
+
+	btVector3 m_eVector;
+
+	btSpatialMotionVector m_absFrameTotVelocity, m_absFrameLocVelocity;
+
+	enum eFeatherstoneJointType
+	{
+		eRevolute = 0,
+		ePrismatic = 1,
+		eSpherical = 2,
+		ePlanar = 3,
+		eFixed = 4,
+		eInvalid
+	};
+
+	// "axis" = spatial joint axis (Mirtich Defn 9 p104). (expressed in local frame.) constant.
+	// for prismatic: m_axesTop[0] = zero;
+	//                m_axesBottom[0] = unit vector along the joint axis.
+	// for revolute: m_axesTop[0] = unit vector along the rotation axis (u);
+	//               m_axesBottom[0] = u cross m_dVector (i.e. COM linear motion due to the rotation at the joint)
+	//
+	// for spherical: m_axesTop[0][1][2] (u1,u2,u3) form a 3x3 identity matrix (3 rotation axes)
+	//				  m_axesBottom[0][1][2] cross u1,u2,u3 (i.e. COM linear motion due to the rotation at the joint)
+	//
+	// for planar: m_axesTop[0] = unit vector along the rotation axis (u); defines the plane of motion
+	//			   m_axesTop[1][2] = zero
+	//			   m_axesBottom[0] = zero
+	//			   m_axesBottom[1][2] = unit vectors along the translational axes on that plane
+	btSpatialMotionVector m_axes[6];
+	void setAxisTop(int dof, const btVector3 &axis) { m_axes[dof].m_topVec = axis; }
+	void setAxisBottom(int dof, const btVector3 &axis)
+	{
+		m_axes[dof].m_bottomVec = axis;
+	}
+	void setAxisTop(int dof, const btScalar &x, const btScalar &y, const btScalar &z)
+	{
+		m_axes[dof].m_topVec.setValue(x, y, z);
+	}
+	void setAxisBottom(int dof, const btScalar &x, const btScalar &y, const btScalar &z)
+	{
+		m_axes[dof].m_bottomVec.setValue(x, y, z);
+	}
+	const btVector3 &getAxisTop(int dof) const { return m_axes[dof].m_topVec; }
+	const btVector3 &getAxisBottom(int dof) const { return m_axes[dof].m_bottomVec; }
+
+	int m_dofOffset, m_cfgOffset;
+
+	btQuaternion m_cachedRotParentToThis;  // rotates vectors in parent frame to vectors in local frame
+	btVector3 m_cachedRVector;             // vector from COM of parent to COM of this link, in local frame.
+    
+    // predicted verstion
+    btQuaternion m_cachedRotParentToThis_interpolate;  // rotates vectors in parent frame to vectors in local frame
+    btVector3 m_cachedRVector_interpolate;             // vector from COM of parent to COM of this link, in local frame.
+
+	btVector3 m_appliedForce;   // In WORLD frame
+	btVector3 m_appliedTorque;  // In WORLD frame
+
+	btVector3 m_appliedConstraintForce;   // In WORLD frame
+	btVector3 m_appliedConstraintTorque;  // In WORLD frame
+
+	btScalar m_jointPos[7];
+    btScalar m_jointPos_interpolate[7];
+
+	//m_jointTorque is the joint torque applied by the user using 'addJointTorque'.
+	//It gets set to zero after each internal stepSimulation call
+	btScalar m_jointTorque[6];
+
+	class btMultiBodyLinkCollider *m_collider;
+	int m_flags;
+
+	int m_dofCount, m_posVarCount;  //redundant but handy
+
+	eFeatherstoneJointType m_jointType;
+
+	struct btMultiBodyJointFeedback *m_jointFeedback;
+
+	btTransform m_cachedWorldTransform;  //this cache is updated when calling btMultiBody::forwardKinematics
+
+	const char *m_linkName;   //m_linkName memory needs to be managed by the developer/user!
+	const char *m_jointName;  //m_jointName memory needs to be managed by the developer/user!
+	const void *m_userPtr;    //m_userPtr ptr needs to be managed by the developer/user!
+
+	btScalar m_jointDamping;      //todo: implement this internally. It is unused for now, it is set by a URDF loader. User can apply manual damping.
+	btScalar m_jointFriction;     //todo: implement this internally. It is unused for now, it is set by a URDF loader. User can apply manual friction using a velocity motor.
+	btScalar m_jointLowerLimit;   //todo: implement this internally. It is unused for now, it is set by a URDF loader.
+	btScalar m_jointUpperLimit;   //todo: implement this internally. It is unused for now, it is set by a URDF loader.
+	btScalar m_jointMaxForce;     //todo: implement this internally. It is unused for now, it is set by a URDF loader.
+	btScalar m_jointMaxVelocity;  //todo: implement this internally. It is unused for now, it is set by a URDF loader.
+
+	// ctor: set some sensible defaults
+	btMultibodyLink()
+		: m_mass(1),
+		  m_parent(-1),
+		  m_zeroRotParentToThis(0, 0, 0, 1),
+		  m_cachedRotParentToThis(0, 0, 0, 1),
+          m_cachedRotParentToThis_interpolate(0, 0, 0, 1),
+		  m_collider(0),
+		  m_flags(0),
+		  m_dofCount(0),
+		  m_posVarCount(0),
+		  m_jointType(btMultibodyLink::eInvalid),
+		  m_jointFeedback(0),
+		  m_linkName(0),
+		  m_jointName(0),
+		  m_userPtr(0),
+		  m_jointDamping(0),
+		  m_jointFriction(0),
+		  m_jointLowerLimit(0),
+		  m_jointUpperLimit(0),
+		  m_jointMaxForce(0),
+		  m_jointMaxVelocity(0)
+	{
+		m_inertiaLocal.setValue(1, 1, 1);
+		setAxisTop(0, 0., 0., 0.);
+		setAxisBottom(0, 1., 0., 0.);
+		m_dVector.setValue(0, 0, 0);
+		m_eVector.setValue(0, 0, 0);
+		m_cachedRVector.setValue(0, 0, 0);
+        m_cachedRVector_interpolate.setValue(0, 0, 0);
+		m_appliedForce.setValue(0, 0, 0);
+		m_appliedTorque.setValue(0, 0, 0);
+		m_appliedConstraintForce.setValue(0, 0, 0);
+		m_appliedConstraintTorque.setValue(0, 0, 0);
+		//
+		m_jointPos[0] = m_jointPos[1] = m_jointPos[2] = m_jointPos[4] = m_jointPos[5] = m_jointPos[6] = 0.f;
+		m_jointPos[3] = 1.f;  //"quat.w"
+		m_jointTorque[0] = m_jointTorque[1] = m_jointTorque[2] = m_jointTorque[3] = m_jointTorque[4] = m_jointTorque[5] = 0.f;
+		m_cachedWorldTransform.setIdentity();
+	}
+
+	// routine to update m_cachedRotParentToThis and m_cachedRVector
+	void updateCacheMultiDof(btScalar *pq = 0)
+	{
+        btScalar *pJointPos = (pq ? pq : &m_jointPos[0]);
+        btQuaternion& cachedRot = m_cachedRotParentToThis;
+        btVector3& cachedVector = m_cachedRVector;
+		switch (m_jointType)
+		{
+			case eRevolute:
+			{
+				cachedRot = btQuaternion(getAxisTop(0), -pJointPos[0]) * m_zeroRotParentToThis;
+				cachedVector = m_dVector + quatRotate(m_cachedRotParentToThis, m_eVector);
+
+				break;
+			}
+			case ePrismatic:
+			{
+				// m_cachedRotParentToThis never changes, so no need to update
+				cachedVector = m_dVector + quatRotate(m_cachedRotParentToThis, m_eVector) + pJointPos[0] * getAxisBottom(0);
+
+				break;
+			}
+			case eSpherical:
+			{
+				cachedRot = btQuaternion(pJointPos[0], pJointPos[1], pJointPos[2], -pJointPos[3]) * m_zeroRotParentToThis;
+				cachedVector = m_dVector + quatRotate(cachedRot, m_eVector);
+
+				break;
+			}
+			case ePlanar:
+			{
+				cachedRot = btQuaternion(getAxisTop(0), -pJointPos[0]) * m_zeroRotParentToThis;
+				cachedVector = quatRotate(btQuaternion(getAxisTop(0), -pJointPos[0]), pJointPos[1] * getAxisBottom(1) + pJointPos[2] * getAxisBottom(2)) + quatRotate(cachedRot, m_eVector);
+
+				break;
+			}
+			case eFixed:
+			{
+				cachedRot = m_zeroRotParentToThis;
+				cachedVector = m_dVector + quatRotate(cachedRot, m_eVector);
+
+				break;
+			}
+			default:
+			{
+				//invalid type
+				btAssert(0);
+			}
+		}
+        m_cachedRotParentToThis_interpolate = m_cachedRotParentToThis;
+        m_cachedRVector_interpolate = m_cachedRVector;
+	}
+    
+    void updateInterpolationCacheMultiDof()
+    {
+        btScalar *pJointPos = &m_jointPos_interpolate[0];
+        
+        btQuaternion& cachedRot = m_cachedRotParentToThis_interpolate;
+        btVector3& cachedVector = m_cachedRVector_interpolate;
+        switch (m_jointType)
+        {
+            case eRevolute:
+            {
+                cachedRot = btQuaternion(getAxisTop(0), -pJointPos[0]) * m_zeroRotParentToThis;
+                cachedVector = m_dVector + quatRotate(m_cachedRotParentToThis, m_eVector);
+                
+                break;
+            }
+            case ePrismatic:
+            {
+                // m_cachedRotParentToThis never changes, so no need to update
+                cachedVector = m_dVector + quatRotate(m_cachedRotParentToThis, m_eVector) + pJointPos[0] * getAxisBottom(0);
+                
+                break;
+            }
+            case eSpherical:
+            {
+                cachedRot = btQuaternion(pJointPos[0], pJointPos[1], pJointPos[2], -pJointPos[3]) * m_zeroRotParentToThis;
+                cachedVector = m_dVector + quatRotate(cachedRot, m_eVector);
+                
+                break;
+            }
+            case ePlanar:
+            {
+                cachedRot = btQuaternion(getAxisTop(0), -pJointPos[0]) * m_zeroRotParentToThis;
+                cachedVector = quatRotate(btQuaternion(getAxisTop(0), -pJointPos[0]), pJointPos[1] * getAxisBottom(1) + pJointPos[2] * getAxisBottom(2)) + quatRotate(cachedRot, m_eVector);
+                
+                break;
+            }
+            case eFixed:
+            {
+                cachedRot = m_zeroRotParentToThis;
+                cachedVector = m_dVector + quatRotate(cachedRot, m_eVector);
+                
+                break;
+            }
+            default:
+            {
+                //invalid type
+                btAssert(0);
+            }
+        }
+    }
+
+ 
+
+};
+
+#endif  //BT_MULTIBODY_LINK_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h
new file mode 100644
index 0000000..3dc35a5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h
@@ -0,0 +1,195 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_FEATHERSTONE_LINK_COLLIDER_H
+#define BT_FEATHERSTONE_LINK_COLLIDER_H
+
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+#include "btMultiBody.h"
+#include "LinearMath/btSerializer.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btMultiBodyLinkColliderData btMultiBodyLinkColliderDoubleData
+#define btMultiBodyLinkColliderDataName "btMultiBodyLinkColliderDoubleData"
+#else
+#define btMultiBodyLinkColliderData btMultiBodyLinkColliderFloatData
+#define btMultiBodyLinkColliderDataName "btMultiBodyLinkColliderFloatData"
+#endif
+
+class btMultiBodyLinkCollider : public btCollisionObject
+{
+	//protected:
+public:
+	btMultiBody* m_multiBody;
+	int m_link;
+
+	virtual ~btMultiBodyLinkCollider()
+	{
+
+	}
+	btMultiBodyLinkCollider(btMultiBody* multiBody, int link)
+		: m_multiBody(multiBody),
+		  m_link(link)
+	{
+		m_checkCollideWith = true;
+		//we need to remove the 'CF_STATIC_OBJECT' flag, otherwise links/base doesn't merge islands
+		//this means that some constraints might point to bodies that are not in the islands, causing crashes
+		//if (link>=0 || (multiBody && !multiBody->hasFixedBase()))
+		{
+			m_collisionFlags &= (~btCollisionObject::CF_STATIC_OBJECT);
+		}
+		// else
+		//{
+		//	m_collisionFlags |= (btCollisionObject::CF_STATIC_OBJECT);
+		//}
+
+		m_internalType = CO_FEATHERSTONE_LINK;
+	}
+	static btMultiBodyLinkCollider* upcast(btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType() & btCollisionObject::CO_FEATHERSTONE_LINK)
+			return (btMultiBodyLinkCollider*)colObj;
+		return 0;
+	}
+	static const btMultiBodyLinkCollider* upcast(const btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType() & btCollisionObject::CO_FEATHERSTONE_LINK)
+			return (btMultiBodyLinkCollider*)colObj;
+		return 0;
+	}
+
+	virtual bool checkCollideWithOverride(const btCollisionObject* co) const
+	{
+		const btMultiBodyLinkCollider* other = btMultiBodyLinkCollider::upcast(co);
+		if (!other)
+			return true;
+		if (other->m_multiBody != this->m_multiBody)
+			return true;
+		if (!m_multiBody->hasSelfCollision())
+			return false;
+
+		//check if 'link' has collision disabled
+		if (m_link >= 0)
+		{
+			const btMultibodyLink& link = m_multiBody->getLink(this->m_link);
+			if (link.m_flags & BT_MULTIBODYLINKFLAGS_DISABLE_ALL_PARENT_COLLISION)
+			{
+				int parent_of_this = m_link;
+				while (1)
+				{
+					if (parent_of_this == -1)
+						break;
+					parent_of_this = m_multiBody->getLink(parent_of_this).m_parent;
+					if (parent_of_this == other->m_link)
+					{
+						return false;
+					}
+				}
+			}
+			else if (link.m_flags & BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION)
+			{
+				if (link.m_parent == other->m_link)
+					return false;
+			}
+		}
+
+		if (other->m_link >= 0)
+		{
+			const btMultibodyLink& otherLink = other->m_multiBody->getLink(other->m_link);
+			if (otherLink.m_flags & BT_MULTIBODYLINKFLAGS_DISABLE_ALL_PARENT_COLLISION)
+			{
+				int parent_of_other = other->m_link;
+				while (1)
+				{
+					if (parent_of_other == -1)
+						break;
+					parent_of_other = m_multiBody->getLink(parent_of_other).m_parent;
+					if (parent_of_other == this->m_link)
+						return false;
+				}
+			}
+			else if (otherLink.m_flags & BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION)
+			{
+				if (otherLink.m_parent == this->m_link)
+					return false;
+			}
+		}
+		return true;
+	}
+
+	bool isStaticOrKinematic() const
+	{
+		return isStaticOrKinematicObject();
+	}
+
+	bool isKinematic() const
+	{
+		return isKinematicObject();
+	}
+
+	void setDynamicType(int dynamicType)
+	{
+		int oldFlags = getCollisionFlags();
+		oldFlags &= ~(btCollisionObject::CF_STATIC_OBJECT | btCollisionObject::CF_KINEMATIC_OBJECT);
+		setCollisionFlags(oldFlags | dynamicType);
+	}
+
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, class btSerializer* serializer) const;
+};
+
+// clang-format off
+
+struct	btMultiBodyLinkColliderFloatData
+{
+	btCollisionObjectFloatData m_colObjData;
+	btMultiBodyFloatData	*m_multiBody;
+	int			m_link;
+	char		m_padding[4];
+};
+
+struct	btMultiBodyLinkColliderDoubleData
+{
+	btCollisionObjectDoubleData m_colObjData;
+	btMultiBodyDoubleData		*m_multiBody;
+	int			m_link;
+	char		m_padding[4];
+};
+
+// clang-format on
+
+SIMD_FORCE_INLINE int btMultiBodyLinkCollider::calculateSerializeBufferSize() const
+{
+	return sizeof(btMultiBodyLinkColliderData);
+}
+
+SIMD_FORCE_INLINE const char* btMultiBodyLinkCollider::serialize(void* dataBuffer, class btSerializer* serializer) const
+{
+	btMultiBodyLinkColliderData* dataOut = (btMultiBodyLinkColliderData*)dataBuffer;
+	btCollisionObject::serialize(&dataOut->m_colObjData, serializer);
+
+	dataOut->m_link = this->m_link;
+	dataOut->m_multiBody = (btMultiBodyData*)serializer->getUniquePointer(m_multiBody);
+
+	// Fill padding with zeros to appease msan.
+	memset(dataOut->m_padding, 0, sizeof(dataOut->m_padding));
+
+	return btMultiBodyLinkColliderDataName;
+}
+
+#endif  //BT_FEATHERSTONE_LINK_COLLIDER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.cpp
new file mode 100644
index 0000000..f2186a9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.cpp
@@ -0,0 +1,966 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2018 Google Inc. http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h"
+#include "BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h"
+
+#define DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+
+static bool interleaveContactAndFriction1 = false;
+
+struct btJointNode1
+{
+	int jointIndex;          // pointer to enclosing dxJoint object
+	int otherBodyIndex;      // *other* body this joint is connected to
+	int nextJointNodeIndex;  //-1 for null
+	int constraintRowIndex;
+};
+
+// Helper function to compute a delta velocity in the constraint space.
+static btScalar computeDeltaVelocityInConstraintSpace(
+	const btVector3& angularDeltaVelocity,
+	const btVector3& contactNormal,
+	btScalar invMass,
+	const btVector3& angularJacobian,
+	const btVector3& linearJacobian)
+{
+	return angularDeltaVelocity.dot(angularJacobian) + contactNormal.dot(linearJacobian) * invMass;
+}
+
+// Faster version of computeDeltaVelocityInConstraintSpace that can be used when contactNormal and linearJacobian are
+// identical.
+static btScalar computeDeltaVelocityInConstraintSpace(
+	const btVector3& angularDeltaVelocity,
+	btScalar invMass,
+	const btVector3& angularJacobian)
+{
+	return angularDeltaVelocity.dot(angularJacobian) + invMass;
+}
+
+// Helper function to compute a delta velocity in the constraint space.
+static btScalar computeDeltaVelocityInConstraintSpace(const btScalar* deltaVelocity, const btScalar* jacobian, int size)
+{
+	btScalar result = 0;
+	for (int i = 0; i < size; ++i)
+		result += deltaVelocity[i] * jacobian[i];
+
+	return result;
+}
+
+static btScalar computeConstraintMatrixDiagElementMultiBody(
+	const btAlignedObjectArray<btSolverBody>& solverBodyPool,
+	const btMultiBodyJacobianData& data,
+	const btMultiBodySolverConstraint& constraint)
+{
+	btScalar ret = 0;
+
+	const btMultiBody* multiBodyA = constraint.m_multiBodyA;
+	const btMultiBody* multiBodyB = constraint.m_multiBodyB;
+
+	if (multiBodyA)
+	{
+		const btScalar* jacA = &data.m_jacobians[constraint.m_jacAindex];
+		const btScalar* deltaA = &data.m_deltaVelocitiesUnitImpulse[constraint.m_jacAindex];
+		const int ndofA = multiBodyA->getNumDofs() + 6;
+		ret += computeDeltaVelocityInConstraintSpace(deltaA, jacA, ndofA);
+	}
+	else
+	{
+		const int solverBodyIdA = constraint.m_solverBodyIdA;
+		btAssert(solverBodyIdA != -1);
+		const btSolverBody* solverBodyA = &solverBodyPool[solverBodyIdA];
+		const btScalar invMassA = solverBodyA->m_originalBody ? solverBodyA->m_originalBody->getInvMass() : 0.0;
+		ret += computeDeltaVelocityInConstraintSpace(
+			constraint.m_relpos1CrossNormal,
+			invMassA,
+			constraint.m_angularComponentA);
+	}
+
+	if (multiBodyB)
+	{
+		const btScalar* jacB = &data.m_jacobians[constraint.m_jacBindex];
+		const btScalar* deltaB = &data.m_deltaVelocitiesUnitImpulse[constraint.m_jacBindex];
+		const int ndofB = multiBodyB->getNumDofs() + 6;
+		ret += computeDeltaVelocityInConstraintSpace(deltaB, jacB, ndofB);
+	}
+	else
+	{
+		const int solverBodyIdB = constraint.m_solverBodyIdB;
+		btAssert(solverBodyIdB != -1);
+		const btSolverBody* solverBodyB = &solverBodyPool[solverBodyIdB];
+		const btScalar invMassB = solverBodyB->m_originalBody ? solverBodyB->m_originalBody->getInvMass() : 0.0;
+		ret += computeDeltaVelocityInConstraintSpace(
+			constraint.m_relpos2CrossNormal,
+			invMassB,
+			constraint.m_angularComponentB);
+	}
+
+	return ret;
+}
+
+static btScalar computeConstraintMatrixOffDiagElementMultiBody(
+	const btAlignedObjectArray<btSolverBody>& solverBodyPool,
+	const btMultiBodyJacobianData& data,
+	const btMultiBodySolverConstraint& constraint,
+	const btMultiBodySolverConstraint& offDiagConstraint)
+{
+	btScalar offDiagA = btScalar(0);
+
+	const btMultiBody* multiBodyA = constraint.m_multiBodyA;
+	const btMultiBody* multiBodyB = constraint.m_multiBodyB;
+	const btMultiBody* offDiagMultiBodyA = offDiagConstraint.m_multiBodyA;
+	const btMultiBody* offDiagMultiBodyB = offDiagConstraint.m_multiBodyB;
+
+	// Assumed at least one system is multibody
+	btAssert(multiBodyA || multiBodyB);
+	btAssert(offDiagMultiBodyA || offDiagMultiBodyB);
+
+	if (offDiagMultiBodyA)
+	{
+		const btScalar* offDiagJacA = &data.m_jacobians[offDiagConstraint.m_jacAindex];
+
+		if (offDiagMultiBodyA == multiBodyA)
+		{
+			const int ndofA = multiBodyA->getNumDofs() + 6;
+			const btScalar* deltaA = &data.m_deltaVelocitiesUnitImpulse[constraint.m_jacAindex];
+			offDiagA += computeDeltaVelocityInConstraintSpace(deltaA, offDiagJacA, ndofA);
+		}
+		else if (offDiagMultiBodyA == multiBodyB)
+		{
+			const int ndofB = multiBodyB->getNumDofs() + 6;
+			const btScalar* deltaB = &data.m_deltaVelocitiesUnitImpulse[constraint.m_jacBindex];
+			offDiagA += computeDeltaVelocityInConstraintSpace(deltaB, offDiagJacA, ndofB);
+		}
+	}
+	else
+	{
+		const int solverBodyIdA = constraint.m_solverBodyIdA;
+		const int solverBodyIdB = constraint.m_solverBodyIdB;
+
+		const int offDiagSolverBodyIdA = offDiagConstraint.m_solverBodyIdA;
+		btAssert(offDiagSolverBodyIdA != -1);
+
+		if (offDiagSolverBodyIdA == solverBodyIdA)
+		{
+			btAssert(solverBodyIdA != -1);
+			const btSolverBody* solverBodyA = &solverBodyPool[solverBodyIdA];
+			const btScalar invMassA = solverBodyA->m_originalBody ? solverBodyA->m_originalBody->getInvMass() : 0.0;
+			offDiagA += computeDeltaVelocityInConstraintSpace(
+				offDiagConstraint.m_relpos1CrossNormal,
+				offDiagConstraint.m_contactNormal1,
+				invMassA, constraint.m_angularComponentA,
+				constraint.m_contactNormal1);
+		}
+		else if (offDiagSolverBodyIdA == solverBodyIdB)
+		{
+			btAssert(solverBodyIdB != -1);
+			const btSolverBody* solverBodyB = &solverBodyPool[solverBodyIdB];
+			const btScalar invMassB = solverBodyB->m_originalBody ? solverBodyB->m_originalBody->getInvMass() : 0.0;
+			offDiagA += computeDeltaVelocityInConstraintSpace(
+				offDiagConstraint.m_relpos1CrossNormal,
+				offDiagConstraint.m_contactNormal1,
+				invMassB,
+				constraint.m_angularComponentB,
+				constraint.m_contactNormal2);
+		}
+	}
+
+	if (offDiagMultiBodyB)
+	{
+		const btScalar* offDiagJacB = &data.m_jacobians[offDiagConstraint.m_jacBindex];
+
+		if (offDiagMultiBodyB == multiBodyA)
+		{
+			const int ndofA = multiBodyA->getNumDofs() + 6;
+			const btScalar* deltaA = &data.m_deltaVelocitiesUnitImpulse[constraint.m_jacAindex];
+			offDiagA += computeDeltaVelocityInConstraintSpace(deltaA, offDiagJacB, ndofA);
+		}
+		else if (offDiagMultiBodyB == multiBodyB)
+		{
+			const int ndofB = multiBodyB->getNumDofs() + 6;
+			const btScalar* deltaB = &data.m_deltaVelocitiesUnitImpulse[constraint.m_jacBindex];
+			offDiagA += computeDeltaVelocityInConstraintSpace(deltaB, offDiagJacB, ndofB);
+		}
+	}
+	else
+	{
+		const int solverBodyIdA = constraint.m_solverBodyIdA;
+		const int solverBodyIdB = constraint.m_solverBodyIdB;
+
+		const int offDiagSolverBodyIdB = offDiagConstraint.m_solverBodyIdB;
+		btAssert(offDiagSolverBodyIdB != -1);
+
+		if (offDiagSolverBodyIdB == solverBodyIdA)
+		{
+			btAssert(solverBodyIdA != -1);
+			const btSolverBody* solverBodyA = &solverBodyPool[solverBodyIdA];
+			const btScalar invMassA = solverBodyA->m_originalBody ? solverBodyA->m_originalBody->getInvMass() : 0.0;
+			offDiagA += computeDeltaVelocityInConstraintSpace(
+				offDiagConstraint.m_relpos2CrossNormal,
+				offDiagConstraint.m_contactNormal2,
+				invMassA, constraint.m_angularComponentA,
+				constraint.m_contactNormal1);
+		}
+		else if (offDiagSolverBodyIdB == solverBodyIdB)
+		{
+			btAssert(solverBodyIdB != -1);
+			const btSolverBody* solverBodyB = &solverBodyPool[solverBodyIdB];
+			const btScalar invMassB = solverBodyB->m_originalBody ? solverBodyB->m_originalBody->getInvMass() : 0.0;
+			offDiagA += computeDeltaVelocityInConstraintSpace(
+				offDiagConstraint.m_relpos2CrossNormal,
+				offDiagConstraint.m_contactNormal2,
+				invMassB, constraint.m_angularComponentB,
+				constraint.m_contactNormal2);
+		}
+	}
+
+	return offDiagA;
+}
+
+void btMultiBodyMLCPConstraintSolver::createMLCPFast(const btContactSolverInfo& infoGlobal)
+{
+	createMLCPFastRigidBody(infoGlobal);
+	createMLCPFastMultiBody(infoGlobal);
+}
+
+void btMultiBodyMLCPConstraintSolver::createMLCPFastRigidBody(const btContactSolverInfo& infoGlobal)
+{
+	int numContactRows = interleaveContactAndFriction1 ? 3 : 1;
+
+	int numConstraintRows = m_allConstraintPtrArray.size();
+
+	if (numConstraintRows == 0)
+		return;
+
+	int n = numConstraintRows;
+	{
+		BT_PROFILE("init b (rhs)");
+		m_b.resize(numConstraintRows);
+		m_bSplit.resize(numConstraintRows);
+		m_b.setZero();
+		m_bSplit.setZero();
+		for (int i = 0; i < numConstraintRows; i++)
+		{
+			btScalar jacDiag = m_allConstraintPtrArray[i]->m_jacDiagABInv;
+			if (!btFuzzyZero(jacDiag))
+			{
+				btScalar rhs = m_allConstraintPtrArray[i]->m_rhs;
+				btScalar rhsPenetration = m_allConstraintPtrArray[i]->m_rhsPenetration;
+				m_b[i] = rhs / jacDiag;
+				m_bSplit[i] = rhsPenetration / jacDiag;
+			}
+		}
+	}
+
+	//	btScalar* w = 0;
+	//	int nub = 0;
+
+	m_lo.resize(numConstraintRows);
+	m_hi.resize(numConstraintRows);
+
+	{
+		BT_PROFILE("init lo/ho");
+
+		for (int i = 0; i < numConstraintRows; i++)
+		{
+			if (0)  //m_limitDependencies[i]>=0)
+			{
+				m_lo[i] = -BT_INFINITY;
+				m_hi[i] = BT_INFINITY;
+			}
+			else
+			{
+				m_lo[i] = m_allConstraintPtrArray[i]->m_lowerLimit;
+				m_hi[i] = m_allConstraintPtrArray[i]->m_upperLimit;
+			}
+		}
+	}
+
+	//
+	int m = m_allConstraintPtrArray.size();
+
+	int numBodies = m_tmpSolverBodyPool.size();
+	btAlignedObjectArray<int> bodyJointNodeArray;
+	{
+		BT_PROFILE("bodyJointNodeArray.resize");
+		bodyJointNodeArray.resize(numBodies, -1);
+	}
+	btAlignedObjectArray<btJointNode1> jointNodeArray;
+	{
+		BT_PROFILE("jointNodeArray.reserve");
+		jointNodeArray.reserve(2 * m_allConstraintPtrArray.size());
+	}
+
+	btMatrixXu& J3 = m_scratchJ3;
+	{
+		BT_PROFILE("J3.resize");
+		J3.resize(2 * m, 8);
+	}
+	btMatrixXu& JinvM3 = m_scratchJInvM3;
+	{
+		BT_PROFILE("JinvM3.resize/setZero");
+
+		JinvM3.resize(2 * m, 8);
+		JinvM3.setZero();
+		J3.setZero();
+	}
+	int cur = 0;
+	int rowOffset = 0;
+	btAlignedObjectArray<int>& ofs = m_scratchOfs;
+	{
+		BT_PROFILE("ofs resize");
+		ofs.resize(0);
+		ofs.resizeNoInitialize(m_allConstraintPtrArray.size());
+	}
+	{
+		BT_PROFILE("Compute J and JinvM");
+		int c = 0;
+
+		int numRows = 0;
+
+		for (int i = 0; i < m_allConstraintPtrArray.size(); i += numRows, c++)
+		{
+			ofs[c] = rowOffset;
+			int sbA = m_allConstraintPtrArray[i]->m_solverBodyIdA;
+			int sbB = m_allConstraintPtrArray[i]->m_solverBodyIdB;
+			btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody;
+			btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody;
+
+			numRows = i < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[c].m_numConstraintRows : numContactRows;
+			if (orgBodyA)
+			{
+				{
+					int slotA = -1;
+					//find free jointNode slot for sbA
+					slotA = jointNodeArray.size();
+					jointNodeArray.expand();  //NonInitializing();
+					int prevSlot = bodyJointNodeArray[sbA];
+					bodyJointNodeArray[sbA] = slotA;
+					jointNodeArray[slotA].nextJointNodeIndex = prevSlot;
+					jointNodeArray[slotA].jointIndex = c;
+					jointNodeArray[slotA].constraintRowIndex = i;
+					jointNodeArray[slotA].otherBodyIndex = orgBodyB ? sbB : -1;
+				}
+				for (int row = 0; row < numRows; row++, cur++)
+				{
+					btVector3 normalInvMass = m_allConstraintPtrArray[i + row]->m_contactNormal1 * orgBodyA->getInvMass();
+					btVector3 relPosCrossNormalInvInertia = m_allConstraintPtrArray[i + row]->m_relpos1CrossNormal * orgBodyA->getInvInertiaTensorWorld();
+
+					for (int r = 0; r < 3; r++)
+					{
+						J3.setElem(cur, r, m_allConstraintPtrArray[i + row]->m_contactNormal1[r]);
+						J3.setElem(cur, r + 4, m_allConstraintPtrArray[i + row]->m_relpos1CrossNormal[r]);
+						JinvM3.setElem(cur, r, normalInvMass[r]);
+						JinvM3.setElem(cur, r + 4, relPosCrossNormalInvInertia[r]);
+					}
+					J3.setElem(cur, 3, 0);
+					JinvM3.setElem(cur, 3, 0);
+					J3.setElem(cur, 7, 0);
+					JinvM3.setElem(cur, 7, 0);
+				}
+			}
+			else
+			{
+				cur += numRows;
+			}
+			if (orgBodyB)
+			{
+				{
+					int slotB = -1;
+					//find free jointNode slot for sbA
+					slotB = jointNodeArray.size();
+					jointNodeArray.expand();  //NonInitializing();
+					int prevSlot = bodyJointNodeArray[sbB];
+					bodyJointNodeArray[sbB] = slotB;
+					jointNodeArray[slotB].nextJointNodeIndex = prevSlot;
+					jointNodeArray[slotB].jointIndex = c;
+					jointNodeArray[slotB].otherBodyIndex = orgBodyA ? sbA : -1;
+					jointNodeArray[slotB].constraintRowIndex = i;
+				}
+
+				for (int row = 0; row < numRows; row++, cur++)
+				{
+					btVector3 normalInvMassB = m_allConstraintPtrArray[i + row]->m_contactNormal2 * orgBodyB->getInvMass();
+					btVector3 relPosInvInertiaB = m_allConstraintPtrArray[i + row]->m_relpos2CrossNormal * orgBodyB->getInvInertiaTensorWorld();
+
+					for (int r = 0; r < 3; r++)
+					{
+						J3.setElem(cur, r, m_allConstraintPtrArray[i + row]->m_contactNormal2[r]);
+						J3.setElem(cur, r + 4, m_allConstraintPtrArray[i + row]->m_relpos2CrossNormal[r]);
+						JinvM3.setElem(cur, r, normalInvMassB[r]);
+						JinvM3.setElem(cur, r + 4, relPosInvInertiaB[r]);
+					}
+					J3.setElem(cur, 3, 0);
+					JinvM3.setElem(cur, 3, 0);
+					J3.setElem(cur, 7, 0);
+					JinvM3.setElem(cur, 7, 0);
+				}
+			}
+			else
+			{
+				cur += numRows;
+			}
+			rowOffset += numRows;
+		}
+	}
+
+	//compute JinvM = J*invM.
+	const btScalar* JinvM = JinvM3.getBufferPointer();
+
+	const btScalar* Jptr = J3.getBufferPointer();
+	{
+		BT_PROFILE("m_A.resize");
+		m_A.resize(n, n);
+	}
+
+	{
+		BT_PROFILE("m_A.setZero");
+		m_A.setZero();
+	}
+	int c = 0;
+	{
+		int numRows = 0;
+		BT_PROFILE("Compute A");
+		for (int i = 0; i < m_allConstraintPtrArray.size(); i += numRows, c++)
+		{
+			int row__ = ofs[c];
+			int sbA = m_allConstraintPtrArray[i]->m_solverBodyIdA;
+			int sbB = m_allConstraintPtrArray[i]->m_solverBodyIdB;
+			//	btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody;
+			//	btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody;
+
+			numRows = i < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[c].m_numConstraintRows : numContactRows;
+
+			const btScalar* JinvMrow = JinvM + 2 * 8 * (size_t)row__;
+
+			{
+				int startJointNodeA = bodyJointNodeArray[sbA];
+				while (startJointNodeA >= 0)
+				{
+					int j0 = jointNodeArray[startJointNodeA].jointIndex;
+					int cr0 = jointNodeArray[startJointNodeA].constraintRowIndex;
+					if (j0 < c)
+					{
+						int numRowsOther = cr0 < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[j0].m_numConstraintRows : numContactRows;
+						size_t ofsother = (m_allConstraintPtrArray[cr0]->m_solverBodyIdB == sbA) ? 8 * numRowsOther : 0;
+						//printf("%d joint i %d and j0: %d: ",count++,i,j0);
+						m_A.multiplyAdd2_p8r(JinvMrow,
+											 Jptr + 2 * 8 * (size_t)ofs[j0] + ofsother, numRows, numRowsOther, row__, ofs[j0]);
+					}
+					startJointNodeA = jointNodeArray[startJointNodeA].nextJointNodeIndex;
+				}
+			}
+
+			{
+				int startJointNodeB = bodyJointNodeArray[sbB];
+				while (startJointNodeB >= 0)
+				{
+					int j1 = jointNodeArray[startJointNodeB].jointIndex;
+					int cj1 = jointNodeArray[startJointNodeB].constraintRowIndex;
+
+					if (j1 < c)
+					{
+						int numRowsOther = cj1 < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[j1].m_numConstraintRows : numContactRows;
+						size_t ofsother = (m_allConstraintPtrArray[cj1]->m_solverBodyIdB == sbB) ? 8 * numRowsOther : 0;
+						m_A.multiplyAdd2_p8r(JinvMrow + 8 * (size_t)numRows,
+											 Jptr + 2 * 8 * (size_t)ofs[j1] + ofsother, numRows, numRowsOther, row__, ofs[j1]);
+					}
+					startJointNodeB = jointNodeArray[startJointNodeB].nextJointNodeIndex;
+				}
+			}
+		}
+
+		{
+			BT_PROFILE("compute diagonal");
+			// compute diagonal blocks of m_A
+
+			int row__ = 0;
+			int numJointRows = m_allConstraintPtrArray.size();
+
+			int jj = 0;
+			for (; row__ < numJointRows;)
+			{
+				//int sbA = m_allConstraintPtrArray[row__]->m_solverBodyIdA;
+				int sbB = m_allConstraintPtrArray[row__]->m_solverBodyIdB;
+				//	btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody;
+				btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody;
+
+				const unsigned int infom = row__ < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[jj].m_numConstraintRows : numContactRows;
+
+				const btScalar* JinvMrow = JinvM + 2 * 8 * (size_t)row__;
+				const btScalar* Jrow = Jptr + 2 * 8 * (size_t)row__;
+				m_A.multiply2_p8r(JinvMrow, Jrow, infom, infom, row__, row__);
+				if (orgBodyB)
+				{
+					m_A.multiplyAdd2_p8r(JinvMrow + 8 * (size_t)infom, Jrow + 8 * (size_t)infom, infom, infom, row__, row__);
+				}
+				row__ += infom;
+				jj++;
+			}
+		}
+	}
+
+	if (1)
+	{
+		// add cfm to the diagonal of m_A
+		for (int i = 0; i < m_A.rows(); ++i)
+		{
+			m_A.setElem(i, i, m_A(i, i) + infoGlobal.m_globalCfm / infoGlobal.m_timeStep);
+		}
+	}
+
+	///fill the upper triangle of the matrix, to make it symmetric
+	{
+		BT_PROFILE("fill the upper triangle ");
+		m_A.copyLowerToUpperTriangle();
+	}
+
+	{
+		BT_PROFILE("resize/init x");
+		m_x.resize(numConstraintRows);
+		m_xSplit.resize(numConstraintRows);
+
+		if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+		{
+			for (int i = 0; i < m_allConstraintPtrArray.size(); i++)
+			{
+				const btSolverConstraint& c = *m_allConstraintPtrArray[i];
+				m_x[i] = c.m_appliedImpulse;
+				m_xSplit[i] = c.m_appliedPushImpulse;
+			}
+		}
+		else
+		{
+			m_x.setZero();
+			m_xSplit.setZero();
+		}
+	}
+}
+
+void btMultiBodyMLCPConstraintSolver::createMLCPFastMultiBody(const btContactSolverInfo& infoGlobal)
+{
+	const int multiBodyNumConstraints = m_multiBodyAllConstraintPtrArray.size();
+
+	if (multiBodyNumConstraints == 0)
+		return;
+
+	// 1. Compute b
+	{
+		BT_PROFILE("init b (rhs)");
+
+		m_multiBodyB.resize(multiBodyNumConstraints);
+		m_multiBodyB.setZero();
+
+		for (int i = 0; i < multiBodyNumConstraints; ++i)
+		{
+			const btMultiBodySolverConstraint& constraint = *m_multiBodyAllConstraintPtrArray[i];
+			const btScalar jacDiag = constraint.m_jacDiagABInv;
+
+			if (!btFuzzyZero(jacDiag))
+			{
+				// Note that rhsPenetration is currently always zero because the split impulse hasn't been implemented for multibody yet.
+				const btScalar rhs = constraint.m_rhs;
+				m_multiBodyB[i] = rhs / jacDiag;
+			}
+		}
+	}
+
+	// 2. Compute lo and hi
+	{
+		BT_PROFILE("init lo/ho");
+
+		m_multiBodyLo.resize(multiBodyNumConstraints);
+		m_multiBodyHi.resize(multiBodyNumConstraints);
+
+		for (int i = 0; i < multiBodyNumConstraints; ++i)
+		{
+			const btMultiBodySolverConstraint& constraint = *m_multiBodyAllConstraintPtrArray[i];
+			m_multiBodyLo[i] = constraint.m_lowerLimit;
+			m_multiBodyHi[i] = constraint.m_upperLimit;
+		}
+	}
+
+	// 3. Construct A matrix by using the impulse testing
+	{
+		BT_PROFILE("Compute A");
+
+		{
+			BT_PROFILE("m_A.resize");
+			m_multiBodyA.resize(multiBodyNumConstraints, multiBodyNumConstraints);
+		}
+
+		for (int i = 0; i < multiBodyNumConstraints; ++i)
+		{
+			// Compute the diagonal of A, which is A(i, i)
+			const btMultiBodySolverConstraint& constraint = *m_multiBodyAllConstraintPtrArray[i];
+			const btScalar diagA = computeConstraintMatrixDiagElementMultiBody(m_tmpSolverBodyPool, m_data, constraint);
+			m_multiBodyA.setElem(i, i, diagA);
+
+			// Computes the off-diagonals of A:
+			//   a. The rest of i-th row of A, from A(i, i+1) to A(i, n)
+			//   b. The rest of i-th column of A, from A(i+1, i) to A(n, i)
+			for (int j = i + 1; j < multiBodyNumConstraints; ++j)
+			{
+				const btMultiBodySolverConstraint& offDiagConstraint = *m_multiBodyAllConstraintPtrArray[j];
+				const btScalar offDiagA = computeConstraintMatrixOffDiagElementMultiBody(m_tmpSolverBodyPool, m_data, constraint, offDiagConstraint);
+
+				// Set the off-diagonal values of A. Note that A is symmetric.
+				m_multiBodyA.setElem(i, j, offDiagA);
+				m_multiBodyA.setElem(j, i, offDiagA);
+			}
+		}
+	}
+
+	// Add CFM to the diagonal of m_A
+	for (int i = 0; i < m_multiBodyA.rows(); ++i)
+	{
+		m_multiBodyA.setElem(i, i, m_multiBodyA(i, i) + infoGlobal.m_globalCfm / infoGlobal.m_timeStep);
+	}
+
+	// 4. Initialize x
+	{
+		BT_PROFILE("resize/init x");
+
+		m_multiBodyX.resize(multiBodyNumConstraints);
+
+		if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+		{
+			for (int i = 0; i < multiBodyNumConstraints; ++i)
+			{
+				const btMultiBodySolverConstraint& constraint = *m_multiBodyAllConstraintPtrArray[i];
+				m_multiBodyX[i] = constraint.m_appliedImpulse;
+			}
+		}
+		else
+		{
+			m_multiBodyX.setZero();
+		}
+	}
+}
+
+bool btMultiBodyMLCPConstraintSolver::solveMLCP(const btContactSolverInfo& infoGlobal)
+{
+	bool result = true;
+
+	if (m_A.rows() != 0)
+	{
+		// If using split impulse, we solve 2 separate (M)LCPs
+		if (infoGlobal.m_splitImpulse)
+		{
+			const btMatrixXu Acopy = m_A;
+			const btAlignedObjectArray<int> limitDependenciesCopy = m_limitDependencies;
+			// TODO(JS): Do we really need these copies when solveMLCP takes them as const?
+
+			result = m_solver->solveMLCP(m_A, m_b, m_x, m_lo, m_hi, m_limitDependencies, infoGlobal.m_numIterations);
+			if (result)
+				result = m_solver->solveMLCP(Acopy, m_bSplit, m_xSplit, m_lo, m_hi, limitDependenciesCopy, infoGlobal.m_numIterations);
+		}
+		else
+		{
+			result = m_solver->solveMLCP(m_A, m_b, m_x, m_lo, m_hi, m_limitDependencies, infoGlobal.m_numIterations);
+		}
+	}
+
+	if (!result)
+		return false;
+
+	if (m_multiBodyA.rows() != 0)
+	{
+		result = m_solver->solveMLCP(m_multiBodyA, m_multiBodyB, m_multiBodyX, m_multiBodyLo, m_multiBodyHi, m_multiBodyLimitDependencies, infoGlobal.m_numIterations);
+	}
+
+	return result;
+}
+
+btScalar btMultiBodyMLCPConstraintSolver::solveGroupCacheFriendlySetup(
+	btCollisionObject** bodies,
+	int numBodies,
+	btPersistentManifold** manifoldPtr,
+	int numManifolds,
+	btTypedConstraint** constraints,
+	int numConstraints,
+	const btContactSolverInfo& infoGlobal,
+	btIDebugDraw* debugDrawer)
+{
+	// 1. Setup for rigid-bodies
+	btMultiBodyConstraintSolver::solveGroupCacheFriendlySetup(
+		bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+	// 2. Setup for multi-bodies
+	//   a. Collect all different kinds of constraint as pointers into one array, m_allConstraintPtrArray
+	//   b. Set the index array for frictional contact constraints, m_limitDependencies
+	{
+		BT_PROFILE("gather constraint data");
+
+		int dindex = 0;
+
+		const int numRigidBodyConstraints = m_tmpSolverNonContactConstraintPool.size() + m_tmpSolverContactConstraintPool.size() + m_tmpSolverContactFrictionConstraintPool.size();
+		const int numMultiBodyConstraints = m_multiBodyNonContactConstraints.size() + m_multiBodyNormalContactConstraints.size() + m_multiBodyFrictionContactConstraints.size();
+
+		m_allConstraintPtrArray.resize(0);
+		m_multiBodyAllConstraintPtrArray.resize(0);
+
+		// i. Setup for rigid bodies
+
+		m_limitDependencies.resize(numRigidBodyConstraints);
+
+		for (int i = 0; i < m_tmpSolverNonContactConstraintPool.size(); ++i)
+		{
+			m_allConstraintPtrArray.push_back(&m_tmpSolverNonContactConstraintPool[i]);
+			m_limitDependencies[dindex++] = -1;
+		}
+
+		int firstContactConstraintOffset = dindex;
+
+		// The btSequentialImpulseConstraintSolver moves all friction constraints at the very end, we can also interleave them instead
+		if (interleaveContactAndFriction1)
+		{
+			for (int i = 0; i < m_tmpSolverContactConstraintPool.size(); i++)
+			{
+				const int numFrictionPerContact = m_tmpSolverContactConstraintPool.size() == m_tmpSolverContactFrictionConstraintPool.size() ? 1 : 2;
+
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactConstraintPool[i]);
+				m_limitDependencies[dindex++] = -1;
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactFrictionConstraintPool[i * numFrictionPerContact]);
+				int findex = (m_tmpSolverContactFrictionConstraintPool[i * numFrictionPerContact].m_frictionIndex * (1 + numFrictionPerContact));
+				m_limitDependencies[dindex++] = findex + firstContactConstraintOffset;
+				if (numFrictionPerContact == 2)
+				{
+					m_allConstraintPtrArray.push_back(&m_tmpSolverContactFrictionConstraintPool[i * numFrictionPerContact + 1]);
+					m_limitDependencies[dindex++] = findex + firstContactConstraintOffset;
+				}
+			}
+		}
+		else
+		{
+			for (int i = 0; i < m_tmpSolverContactConstraintPool.size(); i++)
+			{
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactConstraintPool[i]);
+				m_limitDependencies[dindex++] = -1;
+			}
+			for (int i = 0; i < m_tmpSolverContactFrictionConstraintPool.size(); i++)
+			{
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactFrictionConstraintPool[i]);
+				m_limitDependencies[dindex++] = m_tmpSolverContactFrictionConstraintPool[i].m_frictionIndex + firstContactConstraintOffset;
+			}
+		}
+
+		if (!m_allConstraintPtrArray.size())
+		{
+			m_A.resize(0, 0);
+			m_b.resize(0);
+			m_x.resize(0);
+			m_lo.resize(0);
+			m_hi.resize(0);
+		}
+
+		// ii. Setup for multibodies
+
+		dindex = 0;
+
+		m_multiBodyLimitDependencies.resize(numMultiBodyConstraints);
+
+		for (int i = 0; i < m_multiBodyNonContactConstraints.size(); ++i)
+		{
+			m_multiBodyAllConstraintPtrArray.push_back(&m_multiBodyNonContactConstraints[i]);
+			m_multiBodyLimitDependencies[dindex++] = -1;
+		}
+
+		firstContactConstraintOffset = dindex;
+
+		// The btSequentialImpulseConstraintSolver moves all friction constraints at the very end, we can also interleave them instead
+		if (interleaveContactAndFriction1)
+		{
+			for (int i = 0; i < m_multiBodyNormalContactConstraints.size(); ++i)
+			{
+				const int numtiBodyNumFrictionPerContact = m_multiBodyNormalContactConstraints.size() == m_multiBodyFrictionContactConstraints.size() ? 1 : 2;
+
+				m_multiBodyAllConstraintPtrArray.push_back(&m_multiBodyNormalContactConstraints[i]);
+				m_multiBodyLimitDependencies[dindex++] = -1;
+
+				btMultiBodySolverConstraint& frictionContactConstraint1 = m_multiBodyFrictionContactConstraints[i * numtiBodyNumFrictionPerContact];
+				m_multiBodyAllConstraintPtrArray.push_back(&frictionContactConstraint1);
+
+				const int findex = (frictionContactConstraint1.m_frictionIndex * (1 + numtiBodyNumFrictionPerContact)) + firstContactConstraintOffset;
+
+				m_multiBodyLimitDependencies[dindex++] = findex;
+
+				if (numtiBodyNumFrictionPerContact == 2)
+				{
+					btMultiBodySolverConstraint& frictionContactConstraint2 = m_multiBodyFrictionContactConstraints[i * numtiBodyNumFrictionPerContact + 1];
+					m_multiBodyAllConstraintPtrArray.push_back(&frictionContactConstraint2);
+
+					m_multiBodyLimitDependencies[dindex++] = findex;
+				}
+			}
+		}
+		else
+		{
+			for (int i = 0; i < m_multiBodyNormalContactConstraints.size(); ++i)
+			{
+				m_multiBodyAllConstraintPtrArray.push_back(&m_multiBodyNormalContactConstraints[i]);
+				m_multiBodyLimitDependencies[dindex++] = -1;
+			}
+			for (int i = 0; i < m_multiBodyFrictionContactConstraints.size(); ++i)
+			{
+				m_multiBodyAllConstraintPtrArray.push_back(&m_multiBodyFrictionContactConstraints[i]);
+				m_multiBodyLimitDependencies[dindex++] = m_multiBodyFrictionContactConstraints[i].m_frictionIndex + firstContactConstraintOffset;
+			}
+		}
+
+		if (!m_multiBodyAllConstraintPtrArray.size())
+		{
+			m_multiBodyA.resize(0, 0);
+			m_multiBodyB.resize(0);
+			m_multiBodyX.resize(0);
+			m_multiBodyLo.resize(0);
+			m_multiBodyHi.resize(0);
+		}
+	}
+
+	// Construct MLCP terms
+	{
+		BT_PROFILE("createMLCPFast");
+		createMLCPFast(infoGlobal);
+	}
+
+	return btScalar(0);
+}
+
+btScalar btMultiBodyMLCPConstraintSolver::solveGroupCacheFriendlyIterations(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	bool result = true;
+	{
+		BT_PROFILE("solveMLCP");
+		result = solveMLCP(infoGlobal);
+	}
+
+	// Fallback to btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations if the solution isn't valid.
+	if (!result)
+	{
+		m_fallback++;
+		return btMultiBodyConstraintSolver::solveGroupCacheFriendlyIterations(bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+	}
+
+	{
+		BT_PROFILE("process MLCP results");
+
+		for (int i = 0; i < m_allConstraintPtrArray.size(); ++i)
+		{
+			const btSolverConstraint& c = *m_allConstraintPtrArray[i];
+
+			const btScalar deltaImpulse = m_x[i] - c.m_appliedImpulse;
+			c.m_appliedImpulse = m_x[i];
+
+			int sbA = c.m_solverBodyIdA;
+			int sbB = c.m_solverBodyIdB;
+
+			btSolverBody& solverBodyA = m_tmpSolverBodyPool[sbA];
+			btSolverBody& solverBodyB = m_tmpSolverBodyPool[sbB];
+
+			solverBodyA.internalApplyImpulse(c.m_contactNormal1 * solverBodyA.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+			solverBodyB.internalApplyImpulse(c.m_contactNormal2 * solverBodyB.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+
+			if (infoGlobal.m_splitImpulse)
+			{
+				const btScalar deltaPushImpulse = m_xSplit[i] - c.m_appliedPushImpulse;
+				solverBodyA.internalApplyPushImpulse(c.m_contactNormal1 * solverBodyA.internalGetInvMass(), c.m_angularComponentA, deltaPushImpulse);
+				solverBodyB.internalApplyPushImpulse(c.m_contactNormal2 * solverBodyB.internalGetInvMass(), c.m_angularComponentB, deltaPushImpulse);
+				c.m_appliedPushImpulse = m_xSplit[i];
+			}
+		}
+
+		for (int i = 0; i < m_multiBodyAllConstraintPtrArray.size(); ++i)
+		{
+			btMultiBodySolverConstraint& c = *m_multiBodyAllConstraintPtrArray[i];
+
+			const btScalar deltaImpulse = m_multiBodyX[i] - c.m_appliedImpulse;
+			c.m_appliedImpulse = m_multiBodyX[i];
+
+			btMultiBody* multiBodyA = c.m_multiBodyA;
+			if (multiBodyA)
+			{
+				const int ndofA = multiBodyA->getNumDofs() + 6;
+				applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex], deltaImpulse, c.m_deltaVelAindex, ndofA);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+				//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+				//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+				multiBodyA->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex], deltaImpulse);
+#endif  // DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+			}
+			else
+			{
+				const int sbA = c.m_solverBodyIdA;
+				btSolverBody& solverBodyA = m_tmpSolverBodyPool[sbA];
+				solverBodyA.internalApplyImpulse(c.m_contactNormal1 * solverBodyA.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+			}
+
+			btMultiBody* multiBodyB = c.m_multiBodyB;
+			if (multiBodyB)
+			{
+				const int ndofB = multiBodyB->getNumDofs() + 6;
+				applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex], deltaImpulse, c.m_deltaVelBindex, ndofB);
+#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+				//note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations
+				//it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity
+				multiBodyB->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex], deltaImpulse);
+#endif  // DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS
+			}
+			else
+			{
+				const int sbB = c.m_solverBodyIdB;
+				btSolverBody& solverBodyB = m_tmpSolverBodyPool[sbB];
+				solverBodyB.internalApplyImpulse(c.m_contactNormal2 * solverBodyB.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+			}
+		}
+	}
+
+	return btScalar(0);
+}
+
+btMultiBodyMLCPConstraintSolver::btMultiBodyMLCPConstraintSolver(btMLCPSolverInterface* solver)
+	: m_solver(solver), m_fallback(0)
+{
+	// Do nothing
+}
+
+btMultiBodyMLCPConstraintSolver::~btMultiBodyMLCPConstraintSolver()
+{
+	// Do nothing
+}
+
+void btMultiBodyMLCPConstraintSolver::setMLCPSolver(btMLCPSolverInterface* solver)
+{
+	m_solver = solver;
+}
+
+int btMultiBodyMLCPConstraintSolver::getNumFallbacks() const
+{
+	return m_fallback;
+}
+
+void btMultiBodyMLCPConstraintSolver::setNumFallbacks(int num)
+{
+	m_fallback = num;
+}
+
+btConstraintSolverType btMultiBodyMLCPConstraintSolver::getSolverType() const
+{
+	return BT_MLCP_SOLVER;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h
new file mode 100644
index 0000000..77fdb86
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h
@@ -0,0 +1,187 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2018 Google Inc. http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_MLCP_CONSTRAINT_SOLVER_H
+#define BT_MULTIBODY_MLCP_CONSTRAINT_SOLVER_H
+
+#include "LinearMath/btMatrixX.h"
+#include "LinearMath/btThreads.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h"
+
+class btMLCPSolverInterface;
+class btMultiBody;
+
+class btMultiBodyMLCPConstraintSolver : public btMultiBodyConstraintSolver
+{
+protected:
+	/// \name MLCP Formulation for Rigid Bodies
+	/// \{
+
+	/// A matrix in the MLCP formulation
+	btMatrixXu m_A;
+
+	/// b vector in the MLCP formulation.
+	btVectorXu m_b;
+
+	/// Constraint impulse, which is an output of MLCP solving.
+	btVectorXu m_x;
+
+	/// Lower bound of constraint impulse, \c m_x.
+	btVectorXu m_lo;
+
+	/// Upper bound of constraint impulse, \c m_x.
+	btVectorXu m_hi;
+
+	/// \}
+
+	/// \name Cache Variables for Split Impulse for Rigid Bodies
+	/// When using 'split impulse' we solve two separate (M)LCPs
+	/// \{
+
+	/// Split impulse Cache vector corresponding to \c m_b.
+	btVectorXu m_bSplit;
+
+	/// Split impulse cache vector corresponding to \c m_x.
+	btVectorXu m_xSplit;
+
+	/// \}
+
+	/// \name MLCP Formulation for Multibodies
+	/// \{
+
+	/// A matrix in the MLCP formulation
+	btMatrixXu m_multiBodyA;
+
+	/// b vector in the MLCP formulation.
+	btVectorXu m_multiBodyB;
+
+	/// Constraint impulse, which is an output of MLCP solving.
+	btVectorXu m_multiBodyX;
+
+	/// Lower bound of constraint impulse, \c m_x.
+	btVectorXu m_multiBodyLo;
+
+	/// Upper bound of constraint impulse, \c m_x.
+	btVectorXu m_multiBodyHi;
+
+	/// \}
+
+	/// Indices of normal contact constraint associated with frictional contact constraint for rigid bodies.
+	///
+	/// This is used by the MLCP solver to update the upper bounds of frictional contact impulse given intermediate
+	/// normal contact impulse. For example, i-th element represents the index of a normal constraint that is
+	/// accosiated with i-th frictional contact constraint if i-th constraint is a frictional contact constraint.
+	/// Otherwise, -1.
+	btAlignedObjectArray<int> m_limitDependencies;
+
+	/// Indices of normal contact constraint associated with frictional contact constraint for multibodies.
+	///
+	/// This is used by the MLCP solver to update the upper bounds of frictional contact impulse given intermediate
+	/// normal contact impulse. For example, i-th element represents the index of a normal constraint that is
+	/// accosiated with i-th frictional contact constraint if i-th constraint is a frictional contact constraint.
+	/// Otherwise, -1.
+	btAlignedObjectArray<int> m_multiBodyLimitDependencies;
+
+	/// Array of all the rigid body constraints
+	btAlignedObjectArray<btSolverConstraint*> m_allConstraintPtrArray;
+
+	/// Array of all the multibody constraints
+	btAlignedObjectArray<btMultiBodySolverConstraint*> m_multiBodyAllConstraintPtrArray;
+
+	/// MLCP solver
+	btMLCPSolverInterface* m_solver;
+
+	/// Count of fallbacks of using btSequentialImpulseConstraintSolver, which happens when the MLCP solver fails.
+	int m_fallback;
+
+	/// \name MLCP Scratch Variables
+	/// The following scratch variables are not stateful -- contents are cleared prior to each use.
+	/// They are only cached here to avoid extra memory allocations and deallocations and to ensure
+	/// that multiple instances of the solver can be run in parallel.
+	///
+	/// \{
+
+	/// Cache variable for constraint Jacobian matrix.
+	btMatrixXu m_scratchJ3;
+
+	/// Cache variable for constraint Jacobian times inverse mass matrix.
+	btMatrixXu m_scratchJInvM3;
+
+	/// Cache variable for offsets.
+	btAlignedObjectArray<int> m_scratchOfs;
+
+	/// \}
+
+	/// Constructs MLCP terms, which are \c m_A, \c m_b, \c m_lo, and \c m_hi.
+	virtual void createMLCPFast(const btContactSolverInfo& infoGlobal);
+
+	/// Constructs MLCP terms for constraints of two rigid bodies
+	void createMLCPFastRigidBody(const btContactSolverInfo& infoGlobal);
+
+	/// Constructs MLCP terms for constraints of two multi-bodies or one rigid body and one multibody
+	void createMLCPFastMultiBody(const btContactSolverInfo& infoGlobal);
+
+	/// Solves MLCP and returns the success
+	virtual bool solveMLCP(const btContactSolverInfo& infoGlobal);
+
+	// Documentation inherited
+	btScalar solveGroupCacheFriendlySetup(
+		btCollisionObject** bodies,
+		int numBodies,
+		btPersistentManifold** manifoldPtr,
+		int numManifolds,
+		btTypedConstraint** constraints,
+		int numConstraints,
+		const btContactSolverInfo& infoGlobal,
+		btIDebugDraw* debugDrawer) BT_OVERRIDE;
+
+	// Documentation inherited
+	btScalar solveGroupCacheFriendlyIterations(
+		btCollisionObject** bodies,
+		int numBodies,
+		btPersistentManifold** manifoldPtr,
+		int numManifolds,
+		btTypedConstraint** constraints,
+		int numConstraints,
+		const btContactSolverInfo& infoGlobal,
+		btIDebugDraw* debugDrawer) ;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR()
+
+	/// Constructor
+	///
+	/// \param[in] solver MLCP solver. Assumed it's not null.
+	/// \param[in] maxLCPSize Maximum size of LCP to solve using MLCP solver. If the MLCP size exceeds this number, sequaltial impulse method will be used.
+	explicit btMultiBodyMLCPConstraintSolver(btMLCPSolverInterface* solver);
+
+	/// Destructor
+	virtual ~btMultiBodyMLCPConstraintSolver();
+
+	/// Sets MLCP solver. Assumed it's not null.
+	void setMLCPSolver(btMLCPSolverInterface* solver);
+
+	/// Returns the number of fallbacks of using btSequentialImpulseConstraintSolver, which happens when the MLCP
+	/// solver fails.
+	int getNumFallbacks() const;
+
+	/// Sets the number of fallbacks. This function may be used to reset the number to zero.
+	void setNumFallbacks(int num);
+
+	/// Returns the constraint solver type.
+	virtual btConstraintSolverType getSolverType() const;
+};
+
+#endif  // BT_MULTIBODY_MLCP_CONSTRAINT_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp
new file mode 100644
index 0000000..f51e69d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp
@@ -0,0 +1,216 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodyPoint2Point.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btIDebugDraw.h"
+
+#ifndef BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST
+#define BTMBP2PCONSTRAINT_DIM 3
+#else
+#define BTMBP2PCONSTRAINT_DIM 6
+#endif
+
+btMultiBodyPoint2Point::btMultiBodyPoint2Point(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB)
+	: btMultiBodyConstraint(body, 0, link, -1, BTMBP2PCONSTRAINT_DIM, false, MULTIBODY_CONSTRAINT_POINT_TO_POINT),
+	  m_rigidBodyA(0),
+	  m_rigidBodyB(bodyB),
+	  m_pivotInA(pivotInA),
+	  m_pivotInB(pivotInB)
+{
+	m_data.resize(BTMBP2PCONSTRAINT_DIM);  //at least store the applied impulses
+}
+
+btMultiBodyPoint2Point::btMultiBodyPoint2Point(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB)
+	: btMultiBodyConstraint(bodyA, bodyB, linkA, linkB, BTMBP2PCONSTRAINT_DIM, false, MULTIBODY_CONSTRAINT_POINT_TO_POINT),
+	  m_rigidBodyA(0),
+	  m_rigidBodyB(0),
+	  m_pivotInA(pivotInA),
+	  m_pivotInB(pivotInB)
+{
+	m_data.resize(BTMBP2PCONSTRAINT_DIM);  //at least store the applied impulses
+}
+
+void btMultiBodyPoint2Point::finalizeMultiDof()
+{
+	//not implemented yet
+	btAssert(0);
+}
+
+btMultiBodyPoint2Point::~btMultiBodyPoint2Point()
+{
+}
+
+int btMultiBodyPoint2Point::getIslandIdA() const
+{
+	if (m_rigidBodyA)
+		return m_rigidBodyA->getIslandTag();
+
+	if (m_bodyA)
+	{
+		if (m_linkA < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyA->getLink(m_linkA).m_collider)
+				return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodyPoint2Point::getIslandIdB() const
+{
+	if (m_rigidBodyB)
+		return m_rigidBodyB->getIslandTag();
+	if (m_bodyB)
+	{
+		if (m_linkB < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyB->getLink(m_linkB).m_collider)
+				return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+void btMultiBodyPoint2Point::createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+												  btMultiBodyJacobianData& data,
+												  const btContactSolverInfo& infoGlobal)
+{
+	//	int i=1;
+	int numDim = BTMBP2PCONSTRAINT_DIM;
+	for (int i = 0; i < numDim; i++)
+	{
+		btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+		//memset(&constraintRow,0xffffffff,sizeof(btMultiBodySolverConstraint));
+		constraintRow.m_orgConstraint = this;
+		constraintRow.m_orgDofIndex = i;
+		constraintRow.m_relpos1CrossNormal.setValue(0, 0, 0);
+		constraintRow.m_contactNormal1.setValue(0, 0, 0);
+		constraintRow.m_relpos2CrossNormal.setValue(0, 0, 0);
+		constraintRow.m_contactNormal2.setValue(0, 0, 0);
+		constraintRow.m_angularComponentA.setValue(0, 0, 0);
+		constraintRow.m_angularComponentB.setValue(0, 0, 0);
+
+		constraintRow.m_solverBodyIdA = data.m_fixedBodyId;
+		constraintRow.m_solverBodyIdB = data.m_fixedBodyId;
+
+		btVector3 contactNormalOnB(0, 0, 0);
+#ifndef BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST
+		contactNormalOnB[i] = -1;
+#else
+		contactNormalOnB[i % 3] = -1;
+#endif
+
+		// Convert local points back to world
+		btVector3 pivotAworld = m_pivotInA;
+		if (m_rigidBodyA)
+		{
+			constraintRow.m_solverBodyIdA = m_rigidBodyA->getCompanionId();
+			pivotAworld = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA;
+		}
+		else
+		{
+			if (m_bodyA)
+				pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
+		}
+		btVector3 pivotBworld = m_pivotInB;
+		if (m_rigidBodyB)
+		{
+			constraintRow.m_solverBodyIdB = m_rigidBodyB->getCompanionId();
+			pivotBworld = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB;
+		}
+		else
+		{
+			if (m_bodyB)
+				pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
+		}
+
+		btScalar posError = i < 3 ? (pivotAworld - pivotBworld).dot(contactNormalOnB) : 0;
+
+#ifndef BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST
+
+		fillMultiBodyConstraint(constraintRow, data, 0, 0, btVector3(0, 0, 0),
+								contactNormalOnB, pivotAworld, pivotBworld,  //sucks but let it be this way "for the time being"
+								posError,
+								infoGlobal,
+								-m_maxAppliedImpulse, m_maxAppliedImpulse);
+		//@todo: support the case of btMultiBody versus btRigidBody,
+		//see btPoint2PointConstraint::getInfo2NonVirtual
+#else
+		const btVector3 dummy(0, 0, 0);
+
+		btAssert(m_bodyA->isMultiDof());
+
+		btScalar* jac1 = jacobianA(i);
+		const btVector3& normalAng = i >= 3 ? contactNormalOnB : dummy;
+		const btVector3& normalLin = i < 3 ? contactNormalOnB : dummy;
+
+		m_bodyA->filConstraintJacobianMultiDof(m_linkA, pivotAworld, normalAng, normalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m);
+
+		fillMultiBodyConstraint(constraintRow, data, jac1, 0,
+								dummy, dummy, dummy,  //sucks but let it be this way "for the time being"
+								posError,
+								infoGlobal,
+								-m_maxAppliedImpulse, m_maxAppliedImpulse);
+#endif
+	}
+}
+
+void btMultiBodyPoint2Point::debugDraw(class btIDebugDraw* drawer)
+{
+	btTransform tr;
+	tr.setIdentity();
+
+	if (m_rigidBodyA)
+	{
+		btVector3 pivot = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA;
+		tr.setOrigin(pivot);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_bodyA)
+	{
+		btVector3 pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
+		tr.setOrigin(pivotAworld);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_rigidBodyB)
+	{
+		// that ideally should draw the same frame
+		btVector3 pivot = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB;
+		tr.setOrigin(pivot);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_bodyB)
+	{
+		btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
+		tr.setOrigin(pivotBworld);
+		drawer->drawTransform(tr, 0.1);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h
new file mode 100644
index 0000000..ef03a55
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h
@@ -0,0 +1,64 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_MULTIBODY_POINT2POINT_H
+#define BT_MULTIBODY_POINT2POINT_H
+
+#include "btMultiBodyConstraint.h"
+
+//#define BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST
+
+ATTRIBUTE_ALIGNED16(class)
+btMultiBodyPoint2Point : public btMultiBodyConstraint
+{
+protected:
+	btRigidBody* m_rigidBodyA;
+	btRigidBody* m_rigidBodyB;
+	btVector3 m_pivotInA;
+	btVector3 m_pivotInB;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btMultiBodyPoint2Point(btMultiBody * body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB);
+	btMultiBodyPoint2Point(btMultiBody * bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB);
+
+	virtual ~btMultiBodyPoint2Point();
+
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray & constraintRows,
+									  btMultiBodyJacobianData & data,
+									  const btContactSolverInfo& infoGlobal);
+
+	const btVector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
+
+	virtual void setPivotInB(const btVector3& pivotInB)
+	{
+		m_pivotInB = pivotInB;
+	}
+
+	virtual void debugDraw(class btIDebugDraw * drawer);
+};
+
+#endif  //BT_MULTIBODY_POINT2POINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp
new file mode 100644
index 0000000..48ec1d5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp
@@ -0,0 +1,234 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodySliderConstraint.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
+#include "LinearMath/btIDebugDraw.h"
+
+#define BTMBSLIDERCONSTRAINT_DIM 5
+#define EPSILON 0.000001
+
+btMultiBodySliderConstraint::btMultiBodySliderConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis)
+	: btMultiBodyConstraint(body, 0, link, -1, BTMBSLIDERCONSTRAINT_DIM, false, MULTIBODY_CONSTRAINT_SLIDER),
+	  m_rigidBodyA(0),
+	  m_rigidBodyB(bodyB),
+	  m_pivotInA(pivotInA),
+	  m_pivotInB(pivotInB),
+	  m_frameInA(frameInA),
+	  m_frameInB(frameInB),
+	  m_jointAxis(jointAxis)
+{
+	m_data.resize(BTMBSLIDERCONSTRAINT_DIM);  //at least store the applied impulses
+}
+
+btMultiBodySliderConstraint::btMultiBodySliderConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis)
+	: btMultiBodyConstraint(bodyA, bodyB, linkA, linkB, BTMBSLIDERCONSTRAINT_DIM, false, MULTIBODY_CONSTRAINT_SLIDER),
+	  m_rigidBodyA(0),
+	  m_rigidBodyB(0),
+	  m_pivotInA(pivotInA),
+	  m_pivotInB(pivotInB),
+	  m_frameInA(frameInA),
+	  m_frameInB(frameInB),
+	  m_jointAxis(jointAxis)
+{
+	m_data.resize(BTMBSLIDERCONSTRAINT_DIM);  //at least store the applied impulses
+}
+
+void btMultiBodySliderConstraint::finalizeMultiDof()
+{
+	//not implemented yet
+	btAssert(0);
+}
+
+btMultiBodySliderConstraint::~btMultiBodySliderConstraint()
+{
+}
+
+int btMultiBodySliderConstraint::getIslandIdA() const
+{
+	if (m_rigidBodyA)
+		return m_rigidBodyA->getIslandTag();
+
+	if (m_bodyA)
+	{
+		if (m_linkA < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyA->getLink(m_linkA).m_collider)
+				return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodySliderConstraint::getIslandIdB() const
+{
+	if (m_rigidBodyB)
+		return m_rigidBodyB->getIslandTag();
+	if (m_bodyB)
+	{
+		if (m_linkB < 0)
+		{
+			btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+			if (col)
+				return col->getIslandTag();
+		}
+		else
+		{
+			if (m_bodyB->getLink(m_linkB).m_collider)
+				return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+void btMultiBodySliderConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows, btMultiBodyJacobianData& data, const btContactSolverInfo& infoGlobal)
+{
+	// Convert local points back to world
+	btVector3 pivotAworld = m_pivotInA;
+	btMatrix3x3 frameAworld = m_frameInA;
+	btVector3 jointAxis = m_jointAxis;
+	if (m_rigidBodyA)
+	{
+		pivotAworld = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA;
+		frameAworld = m_frameInA.transpose() * btMatrix3x3(m_rigidBodyA->getOrientation());
+		jointAxis = quatRotate(m_rigidBodyA->getOrientation(), m_jointAxis);
+	}
+	else if (m_bodyA)
+	{
+		pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
+		frameAworld = m_bodyA->localFrameToWorld(m_linkA, m_frameInA);
+		jointAxis = m_bodyA->localDirToWorld(m_linkA, m_jointAxis);
+	}
+	btVector3 pivotBworld = m_pivotInB;
+	btMatrix3x3 frameBworld = m_frameInB;
+	if (m_rigidBodyB)
+	{
+		pivotBworld = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB;
+		frameBworld = m_frameInB.transpose() * btMatrix3x3(m_rigidBodyB->getOrientation());
+	}
+	else if (m_bodyB)
+	{
+		pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
+		frameBworld = m_bodyB->localFrameToWorld(m_linkB, m_frameInB);
+	}
+
+	btVector3 constraintAxis[2];
+	for (int i = 0; i < 3; ++i)
+	{
+		constraintAxis[0] = frameAworld.getColumn(i).cross(jointAxis);
+		if (constraintAxis[0].safeNorm() > EPSILON)
+		{
+			constraintAxis[0] = constraintAxis[0].normalized();
+			constraintAxis[1] = jointAxis.cross(constraintAxis[0]);
+			constraintAxis[1] = constraintAxis[1].normalized();
+			break;
+		}
+	}
+
+	btMatrix3x3 relRot = frameAworld.inverse() * frameBworld;
+	btVector3 angleDiff;
+	btGeneric6DofSpring2Constraint::matrixToEulerXYZ(relRot, angleDiff);
+
+	int numDim = BTMBSLIDERCONSTRAINT_DIM;
+	for (int i = 0; i < numDim; i++)
+	{
+		btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+		constraintRow.m_orgConstraint = this;
+		constraintRow.m_orgDofIndex = i;
+		constraintRow.m_relpos1CrossNormal.setValue(0, 0, 0);
+		constraintRow.m_contactNormal1.setValue(0, 0, 0);
+		constraintRow.m_relpos2CrossNormal.setValue(0, 0, 0);
+		constraintRow.m_contactNormal2.setValue(0, 0, 0);
+		constraintRow.m_angularComponentA.setValue(0, 0, 0);
+		constraintRow.m_angularComponentB.setValue(0, 0, 0);
+
+		constraintRow.m_solverBodyIdA = data.m_fixedBodyId;
+		constraintRow.m_solverBodyIdB = data.m_fixedBodyId;
+
+		if (m_rigidBodyA)
+		{
+			constraintRow.m_solverBodyIdA = m_rigidBodyA->getCompanionId();
+		}
+		if (m_rigidBodyB)
+		{
+			constraintRow.m_solverBodyIdB = m_rigidBodyB->getCompanionId();
+		}
+
+		btVector3 constraintNormalLin(0, 0, 0);
+		btVector3 constraintNormalAng(0, 0, 0);
+		btScalar posError = 0.0;
+		if (i < 2)
+		{
+			constraintNormalLin = constraintAxis[i];
+			posError = (pivotAworld - pivotBworld).dot(constraintNormalLin);
+			fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
+									constraintNormalLin, pivotAworld, pivotBworld,
+									posError,
+									infoGlobal,
+									-m_maxAppliedImpulse, m_maxAppliedImpulse);
+		}
+		else
+		{  //i>=2
+			constraintNormalAng = frameAworld.getColumn(i % 3);
+			posError = angleDiff[i % 3];
+			fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
+									constraintNormalLin, pivotAworld, pivotBworld,
+									posError,
+									infoGlobal,
+									-m_maxAppliedImpulse, m_maxAppliedImpulse, true);
+		}
+	}
+}
+
+void btMultiBodySliderConstraint::debugDraw(class btIDebugDraw* drawer)
+{
+	btTransform tr;
+	tr.setIdentity();
+
+	if (m_rigidBodyA)
+	{
+		btVector3 pivot = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA;
+		tr.setOrigin(pivot);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_bodyA)
+	{
+		btVector3 pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA);
+		tr.setOrigin(pivotAworld);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_rigidBodyB)
+	{
+		// that ideally should draw the same frame
+		btVector3 pivot = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB;
+		tr.setOrigin(pivot);
+		drawer->drawTransform(tr, 0.1);
+	}
+	if (m_bodyB)
+	{
+		btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB);
+		tr.setOrigin(pivotBworld);
+		drawer->drawTransform(tr, 0.1);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h
new file mode 100644
index 0000000..b192b6f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h
@@ -0,0 +1,102 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_MULTIBODY_SLIDER_CONSTRAINT_H
+#define BT_MULTIBODY_SLIDER_CONSTRAINT_H
+
+#include "btMultiBodyConstraint.h"
+
+class btMultiBodySliderConstraint : public btMultiBodyConstraint
+{
+protected:
+	btRigidBody* m_rigidBodyA;
+	btRigidBody* m_rigidBodyB;
+	btVector3 m_pivotInA;
+	btVector3 m_pivotInB;
+	btMatrix3x3 m_frameInA;
+	btMatrix3x3 m_frameInB;
+	btVector3 m_jointAxis;
+
+public:
+	btMultiBodySliderConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis);
+	btMultiBodySliderConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis);
+
+	virtual ~btMultiBodySliderConstraint();
+
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+									  btMultiBodyJacobianData& data,
+									  const btContactSolverInfo& infoGlobal);
+
+	const btVector3& getPivotInA() const
+	{
+		return m_pivotInA;
+	}
+
+	void setPivotInA(const btVector3& pivotInA)
+	{
+		m_pivotInA = pivotInA;
+	}
+
+	const btVector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
+
+	virtual void setPivotInB(const btVector3& pivotInB)
+	{
+		m_pivotInB = pivotInB;
+	}
+
+	const btMatrix3x3& getFrameInA() const
+	{
+		return m_frameInA;
+	}
+
+	void setFrameInA(const btMatrix3x3& frameInA)
+	{
+		m_frameInA = frameInA;
+	}
+
+	const btMatrix3x3& getFrameInB() const
+	{
+		return m_frameInB;
+	}
+
+	virtual void setFrameInB(const btMatrix3x3& frameInB)
+	{
+		m_frameInB = frameInB;
+	}
+
+	const btVector3& getJointAxis() const
+	{
+		return m_jointAxis;
+	}
+
+	void setJointAxis(const btVector3& jointAxis)
+	{
+		m_jointAxis = jointAxis;
+	}
+
+	virtual void debugDraw(class btIDebugDraw* drawer);
+};
+
+#endif  //BT_MULTIBODY_SLIDER_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h
new file mode 100644
index 0000000..deed3e2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h
@@ -0,0 +1,90 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MULTIBODY_SOLVER_CONSTRAINT_H
+#define BT_MULTIBODY_SOLVER_CONSTRAINT_H
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+class btMultiBody;
+class btMultiBodyConstraint;
+#include "BulletDynamics/ConstraintSolver/btSolverBody.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+
+///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints.
+ATTRIBUTE_ALIGNED16(struct)
+btMultiBodySolverConstraint
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btMultiBodySolverConstraint() : m_solverBodyIdA(-1), m_multiBodyA(0), m_linkA(-1), m_solverBodyIdB(-1), m_multiBodyB(0), m_linkB(-1), m_orgConstraint(0), m_orgDofIndex(-1)
+	{
+	}
+
+	int m_deltaVelAindex;  //more generic version of m_relpos1CrossNormal/m_contactNormal1
+	int m_jacAindex;
+	int m_deltaVelBindex;
+	int m_jacBindex;
+
+	btVector3 m_relpos1CrossNormal;
+	btVector3 m_contactNormal1;
+	btVector3 m_relpos2CrossNormal;
+	btVector3 m_contactNormal2;  //usually m_contactNormal2 == -m_contactNormal1, but not always
+
+	btVector3 m_angularComponentA;
+	btVector3 m_angularComponentB;
+
+	mutable btSimdScalar m_appliedPushImpulse;
+	mutable btSimdScalar m_appliedImpulse;
+
+	btScalar m_friction;
+	btScalar m_jacDiagABInv;
+	btScalar m_rhs;
+	btScalar m_cfm;
+
+	btScalar m_lowerLimit;
+	btScalar m_upperLimit;
+	btScalar m_rhsPenetration;
+	union {
+		void* m_originalContactPoint;
+		btScalar m_unusedPadding4;
+	};
+
+	int m_overrideNumSolverIterations;
+	int m_frictionIndex;
+
+	int m_solverBodyIdA;
+	btMultiBody* m_multiBodyA;
+	int m_linkA;
+
+	int m_solverBodyIdB;
+	btMultiBody* m_multiBodyB;
+	int m_linkB;
+
+	//for writing back applied impulses
+	btMultiBodyConstraint* m_orgConstraint;
+	int m_orgDofIndex;
+
+	enum btSolverConstraintType
+	{
+		BT_SOLVER_CONTACT_1D = 0,
+		BT_SOLVER_FRICTION_1D
+	};
+};
+
+typedef btAlignedObjectArray<btMultiBodySolverConstraint> btMultiBodyConstraintArray;
+
+#endif  //BT_MULTIBODY_SOLVER_CONSTRAINT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointLimit.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointLimit.cpp
new file mode 100644
index 0000000..27c7520
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointLimit.cpp
@@ -0,0 +1,270 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2018 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodySphericalJointLimit.h"
+#include "btMultiBody.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "LinearMath/btTransformUtil.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
+#include "LinearMath/btIDebugDraw.h"
+
+btMultiBodySphericalJointLimit::btMultiBodySphericalJointLimit(btMultiBody* body, int link, 
+	btScalar swingxRange,
+	btScalar swingyRange,
+	btScalar twistRange,
+	btScalar maxAppliedImpulse)
+	: btMultiBodyConstraint(body, body, link, body->getLink(link).m_parent, 3, true, MULTIBODY_CONSTRAINT_SPHERICAL_LIMIT),
+	m_desiredVelocity(0, 0, 0),
+	m_desiredPosition(0,0,0,1),
+	m_use_multi_dof_params(false),
+	m_kd(1., 1., 1.),
+	m_kp(0.2, 0.2, 0.2),
+	m_erp(1),
+	m_rhsClamp(SIMD_INFINITY),
+	m_maxAppliedImpulseMultiDof(maxAppliedImpulse, maxAppliedImpulse, maxAppliedImpulse),
+	m_pivotA(m_bodyA->getLink(link).m_eVector),
+	m_pivotB(m_bodyB->getLink(link).m_eVector),
+	m_swingxRange(swingxRange),
+	m_swingyRange(swingyRange),
+	m_twistRange(twistRange)
+
+{
+
+	m_maxAppliedImpulse = maxAppliedImpulse;
+}
+
+
+void btMultiBodySphericalJointLimit::finalizeMultiDof()
+{
+	allocateJacobiansMultiDof();
+	// note: we rely on the fact that data.m_jacobians are
+	// always initialized to zero by the Constraint ctor
+	int linkDoF = 0;
+	unsigned int offset = 6 + (m_bodyA->getLink(m_linkA).m_dofOffset + linkDoF);
+
+	// row 0: the lower bound
+	// row 0: the lower bound
+	jacobianA(0)[offset] = 1;
+
+	jacobianB(1)[offset] = -1;
+
+	m_numDofsFinalized = m_jacSizeBoth;
+}
+
+
+btMultiBodySphericalJointLimit::~btMultiBodySphericalJointLimit()
+{
+}
+
+int btMultiBodySphericalJointLimit::getIslandIdA() const
+{
+	if (this->m_linkA < 0)
+	{
+		btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+		if (col)
+			return col->getIslandTag();
+	}
+	else
+	{
+		if (m_bodyA->getLink(m_linkA).m_collider)
+		{
+			return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodySphericalJointLimit::getIslandIdB() const
+{
+	if (m_linkB < 0)
+	{
+		btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+		if (col)
+			return col->getIslandTag();
+	}
+	else
+	{
+		if (m_bodyB->getLink(m_linkB).m_collider)
+		{
+			return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+void btMultiBodySphericalJointLimit::createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+												 btMultiBodyJacobianData& data,
+												 const btContactSolverInfo& infoGlobal)
+{
+	// only positions need to be updated -- data.m_jacobians and force
+	// directions were set in the ctor and never change.
+
+	if (m_numDofsFinalized != m_jacSizeBoth)
+	{
+		finalizeMultiDof();
+	}
+
+	//don't crash
+	if (m_numDofsFinalized != m_jacSizeBoth)
+		return;
+	
+
+	if (m_maxAppliedImpulse == 0.f)
+		return;
+
+	const btScalar posError = 0;
+	const btVector3 zero(0, 0, 0);
+
+	
+	btVector3 axis[3] = { btVector3(1, 0, 0), btVector3(0, 1, 0), btVector3(0, 0, 1) };
+	
+	btQuaternion currentQuat(m_bodyA->getJointPosMultiDof(m_linkA)[0],
+		m_bodyA->getJointPosMultiDof(m_linkA)[1],
+		m_bodyA->getJointPosMultiDof(m_linkA)[2],
+		m_bodyA->getJointPosMultiDof(m_linkA)[3]);
+
+	btQuaternion refQuat = m_desiredPosition;
+	btVector3 vTwist(0,0,1);
+	
+	btVector3 vConeNoTwist = quatRotate(currentQuat, vTwist);
+	vConeNoTwist.normalize();
+	btQuaternion qABCone = shortestArcQuat(vTwist, vConeNoTwist);
+	qABCone.normalize();
+	btQuaternion qABTwist = qABCone.inverse() * currentQuat;
+	qABTwist.normalize();
+	btQuaternion desiredQuat = qABTwist;
+
+
+	btQuaternion relRot = currentQuat.inverse() * desiredQuat;
+	btVector3 angleDiff;
+	btGeneric6DofSpring2Constraint::matrixToEulerXYZ(btMatrix3x3(relRot), angleDiff);
+	
+	btScalar limitRanges[3] = {m_swingxRange, m_swingyRange, m_twistRange};
+	
+	/// twist axis/angle
+	btQuaternion qMinTwist = qABTwist;
+	btScalar twistAngle = qABTwist.getAngle();
+
+	if (twistAngle > SIMD_PI)  // long way around. flip quat and recalculate.
+	{
+		qMinTwist = -(qABTwist);
+		twistAngle = qMinTwist.getAngle();
+	}
+	btVector3 vTwistAxis = btVector3(qMinTwist.x(), qMinTwist.y(), qMinTwist.z());
+	if (twistAngle > SIMD_EPSILON)
+		vTwistAxis.normalize();
+	
+	if (vTwistAxis.dot(vTwist)<0)
+		twistAngle*=-1.;
+
+	angleDiff[2] = twistAngle;
+
+
+	for (int row = 0; row < getNumRows(); row++)
+	{
+		btScalar allowed = limitRanges[row];
+		btScalar damp = 1;
+		if((angleDiff[row]>-allowed)&&(angleDiff[row]<allowed))
+		{
+			angleDiff[row]=0;
+			damp=0;
+
+		} else
+		{
+			if (angleDiff[row]>allowed)
+			{
+				angleDiff[row]-=allowed;
+				
+			}
+			if (angleDiff[row]<-allowed)
+			{
+				angleDiff[row]+=allowed;
+				
+			} 
+		}
+		
+
+		int dof = row;
+		
+		btScalar currentVelocity = m_bodyA->getJointVelMultiDof(m_linkA)[dof];
+		btScalar desiredVelocity = this->m_desiredVelocity[row];
+		
+		double kd = m_use_multi_dof_params ? m_kd[row % 3] : m_kd[0];
+		btScalar velocityError = (desiredVelocity - currentVelocity) * kd;
+
+		btMatrix3x3 frameAworld;
+		frameAworld.setIdentity();
+		frameAworld = m_bodyA->localFrameToWorld(m_linkA, frameAworld);
+		btScalar posError = 0;
+		{
+			btAssert(m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::eSpherical);
+			switch (m_bodyA->getLink(m_linkA).m_jointType)
+			{
+				case btMultibodyLink::eSpherical:
+				{
+					btVector3 constraintNormalAng = frameAworld.getColumn(row % 3);
+					double kp = m_use_multi_dof_params ? m_kp[row % 3] : m_kp[0];
+					posError = kp*angleDiff[row % 3];
+					double max_applied_impulse = m_use_multi_dof_params ? m_maxAppliedImpulseMultiDof[row % 3] : m_maxAppliedImpulse;
+					//should multiply by time step
+					//max_applied_impulse *= infoGlobal.m_timeStep
+
+					double min_applied_impulse = -max_applied_impulse;
+					
+
+					if (posError>0)
+						max_applied_impulse=0;
+					else
+						min_applied_impulse=0;
+
+					if (btFabs(posError)>SIMD_EPSILON)
+					{
+						btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+						fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
+							zero, zero, zero,//pure angular, so zero out linear parts
+							posError,
+							infoGlobal,
+							min_applied_impulse, max_applied_impulse, true,
+							1.0, false, 0, 0,
+							damp);
+						constraintRow.m_orgConstraint = this;
+						constraintRow.m_orgDofIndex = row;
+					}
+					break;
+				}
+				default:
+				{
+					btAssert(0);
+				}
+			};
+		}
+	}
+}
+
+
+void btMultiBodySphericalJointLimit::debugDraw(class btIDebugDraw* drawer)
+{
+	btTransform tr;
+	tr.setIdentity();
+	if (m_bodyB)
+	{
+		btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotB);
+		tr.setOrigin(pivotBworld);
+		drawer->drawTransform(tr, 0.1);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointLimit.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointLimit.h
new file mode 100644
index 0000000..b82db6a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointLimit.h
@@ -0,0 +1,115 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2018 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_MULTIBODY_SPHERICAL_JOINT_LIMIT_H
+#define BT_MULTIBODY_SPHERICAL_JOINT_LIMIT_H
+
+#include "btMultiBodyConstraint.h"
+struct btSolverInfo;
+
+class btMultiBodySphericalJointLimit : public btMultiBodyConstraint
+{
+protected:
+	btVector3 m_desiredVelocity;
+	btQuaternion m_desiredPosition;
+	bool m_use_multi_dof_params;
+	btVector3 m_kd;
+	btVector3 m_kp;
+	btScalar m_erp;
+	btScalar m_rhsClamp;  //maximum error
+	btVector3 m_maxAppliedImpulseMultiDof;
+	btVector3 m_pivotA;
+	btVector3 m_pivotB;
+	btScalar m_swingxRange;
+	btScalar m_swingyRange;
+	btScalar m_twistRange;
+
+public:
+	btMultiBodySphericalJointLimit(btMultiBody* body, int link, 
+		btScalar swingxRange,
+		btScalar swingyRange,
+		btScalar twistRange,
+		btScalar maxAppliedImpulse);
+	
+	virtual ~btMultiBodySphericalJointLimit();
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+									  btMultiBodyJacobianData& data,
+									  const btContactSolverInfo& infoGlobal);
+
+	virtual void setVelocityTarget(const btVector3& velTarget, btScalar kd = 1.0)
+	{
+		m_desiredVelocity = velTarget;
+		m_kd = btVector3(kd, kd, kd);
+		m_use_multi_dof_params = false;
+	}
+
+	virtual void setVelocityTargetMultiDof(const btVector3& velTarget, const btVector3& kd = btVector3(1.0, 1.0, 1.0))
+	{
+		m_desiredVelocity = velTarget;
+		m_kd = kd;
+		m_use_multi_dof_params = true;
+	}
+
+	virtual void setPositionTarget(const btQuaternion& posTarget, btScalar kp =1.f)
+	{
+		m_desiredPosition = posTarget;
+		m_kp = btVector3(kp, kp, kp);
+		m_use_multi_dof_params = false;
+	}
+
+	virtual void setPositionTargetMultiDof(const btQuaternion& posTarget, const btVector3& kp = btVector3(1.f, 1.f, 1.f))
+	{
+		m_desiredPosition = posTarget;
+		m_kp = kp;
+		m_use_multi_dof_params = true;
+	}
+
+	virtual void setErp(btScalar erp)
+	{
+		m_erp = erp;
+	}
+	virtual btScalar getErp() const
+	{
+		return m_erp;
+	}
+	virtual void setRhsClamp(btScalar rhsClamp)
+	{
+		m_rhsClamp = rhsClamp;
+	}
+
+	btScalar getMaxAppliedImpulseMultiDof(int i) const
+	{
+		return m_maxAppliedImpulseMultiDof[i];
+	}
+
+	void setMaxAppliedImpulseMultiDof(const btVector3& maxImp)
+	{
+		m_maxAppliedImpulseMultiDof = maxImp;
+		m_use_multi_dof_params = true;
+	}
+
+
+	virtual void debugDraw(class btIDebugDraw* drawer);
+
+};
+
+#endif  //BT_MULTIBODY_SPHERICAL_JOINT_LIMIT_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp
new file mode 100644
index 0000000..00a7ef3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp
@@ -0,0 +1,180 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2018 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#include "btMultiBodySphericalJointMotor.h"
+#include "btMultiBody.h"
+#include "btMultiBodyLinkCollider.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "LinearMath/btTransformUtil.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h"
+
+btMultiBodySphericalJointMotor::btMultiBodySphericalJointMotor(btMultiBody* body, int link, btScalar maxMotorImpulse)
+	: btMultiBodyConstraint(body, body, link, body->getLink(link).m_parent, 3, true, MULTIBODY_CONSTRAINT_SPHERICAL_MOTOR),
+	m_desiredVelocity(0, 0, 0),
+	m_desiredPosition(0,0,0,1),
+	m_use_multi_dof_params(false),
+	m_kd(1., 1., 1.),
+	m_kp(0.2, 0.2, 0.2),
+	m_erp(1),
+	m_rhsClamp(SIMD_INFINITY),
+	m_maxAppliedImpulseMultiDof(maxMotorImpulse, maxMotorImpulse, maxMotorImpulse),
+	m_damping(1.0, 1.0, 1.0)
+{
+
+	m_maxAppliedImpulse = maxMotorImpulse;
+}
+
+
+void btMultiBodySphericalJointMotor::finalizeMultiDof()
+{
+	allocateJacobiansMultiDof();
+	// note: we rely on the fact that data.m_jacobians are
+	// always initialized to zero by the Constraint ctor
+	int linkDoF = 0;
+	unsigned int offset = 6 + (m_bodyA->getLink(m_linkA).m_dofOffset + linkDoF);
+
+	// row 0: the lower bound
+	// row 0: the lower bound
+	jacobianA(0)[offset] = 1;
+
+	m_numDofsFinalized = m_jacSizeBoth;
+}
+
+
+btMultiBodySphericalJointMotor::~btMultiBodySphericalJointMotor()
+{
+}
+
+int btMultiBodySphericalJointMotor::getIslandIdA() const
+{
+	if (this->m_linkA < 0)
+	{
+		btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider();
+		if (col)
+			return col->getIslandTag();
+	}
+	else
+	{
+		if (m_bodyA->getLink(m_linkA).m_collider)
+		{
+			return m_bodyA->getLink(m_linkA).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+int btMultiBodySphericalJointMotor::getIslandIdB() const
+{
+	if (m_linkB < 0)
+	{
+		btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider();
+		if (col)
+			return col->getIslandTag();
+	}
+	else
+	{
+		if (m_bodyB->getLink(m_linkB).m_collider)
+		{
+			return m_bodyB->getLink(m_linkB).m_collider->getIslandTag();
+		}
+	}
+	return -1;
+}
+
+void btMultiBodySphericalJointMotor::createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+												 btMultiBodyJacobianData& data,
+												 const btContactSolverInfo& infoGlobal)
+{
+	// only positions need to be updated -- data.m_jacobians and force
+	// directions were set in the ctor and never change.
+
+	if (m_numDofsFinalized != m_jacSizeBoth)
+	{
+		finalizeMultiDof();
+	}
+
+	//don't crash
+	if (m_numDofsFinalized != m_jacSizeBoth)
+		return;
+	
+
+	if (m_maxAppliedImpulse == 0.f)
+		return;
+
+	const btScalar posError = 0;
+	const btVector3 dummy(0, 0, 0);
+
+	
+	btVector3 axis[3] = { btVector3(1, 0, 0), btVector3(0, 1, 0), btVector3(0, 0, 1) };
+	
+	btQuaternion desiredQuat = m_desiredPosition;
+	btQuaternion currentQuat(m_bodyA->getJointPosMultiDof(m_linkA)[0],
+		m_bodyA->getJointPosMultiDof(m_linkA)[1],
+		m_bodyA->getJointPosMultiDof(m_linkA)[2],
+		m_bodyA->getJointPosMultiDof(m_linkA)[3]);
+
+btQuaternion relRot = currentQuat.inverse() * desiredQuat;
+	btVector3 angleDiff;
+	btGeneric6DofSpring2Constraint::matrixToEulerXYZ(btMatrix3x3(relRot), angleDiff);
+
+
+
+	for (int row = 0; row < getNumRows(); row++)
+	{
+		btMultiBodySolverConstraint& constraintRow = constraintRows.expandNonInitializing();
+
+		int dof = row;
+		
+		btScalar currentVelocity = m_bodyA->getJointVelMultiDof(m_linkA)[dof];
+		btScalar desiredVelocity = this->m_desiredVelocity[row];
+		
+		double kd = m_use_multi_dof_params ? m_kd[row % 3] : m_kd[0];
+		btScalar velocityError = (desiredVelocity - currentVelocity) * kd;
+
+		btMatrix3x3 frameAworld;
+		frameAworld.setIdentity();
+		frameAworld = m_bodyA->localFrameToWorld(m_linkA, frameAworld);
+		btScalar posError = 0;
+		{
+			btAssert(m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::eSpherical);
+			switch (m_bodyA->getLink(m_linkA).m_jointType)
+			{
+				case btMultibodyLink::eSpherical:
+				{
+					btVector3 constraintNormalAng = frameAworld.getColumn(row % 3);
+					double kp = m_use_multi_dof_params ? m_kp[row % 3] : m_kp[0];
+					posError = kp*angleDiff[row % 3];
+					double max_applied_impulse = m_use_multi_dof_params ? m_maxAppliedImpulseMultiDof[row % 3] : m_maxAppliedImpulse;
+					fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng,
+						btVector3(0,0,0), dummy, dummy,
+						posError,
+						infoGlobal,
+						-max_applied_impulse, max_applied_impulse, true,
+						1.0, false, 0, 0,
+						m_damping[row % 3]);
+					constraintRow.m_orgConstraint = this;
+					constraintRow.m_orgDofIndex = row;
+					break;
+				}
+				default:
+				{
+					btAssert(0);
+				}
+			};
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h
new file mode 100644
index 0000000..bdeccc2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h
@@ -0,0 +1,118 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2018 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was written by Erwin Coumans
+
+#ifndef BT_MULTIBODY_SPHERICAL_JOINT_MOTOR_H
+#define BT_MULTIBODY_SPHERICAL_JOINT_MOTOR_H
+
+#include "btMultiBodyConstraint.h"
+struct btSolverInfo;
+
+class btMultiBodySphericalJointMotor : public btMultiBodyConstraint
+{
+protected:
+	btVector3 m_desiredVelocity;
+	btQuaternion m_desiredPosition;
+	bool m_use_multi_dof_params;
+	btVector3 m_kd;
+	btVector3 m_kp;
+	btScalar m_erp;
+	btScalar m_rhsClamp;  //maximum error
+	btVector3 m_maxAppliedImpulseMultiDof;
+	btVector3 m_damping;
+
+public:
+	btMultiBodySphericalJointMotor(btMultiBody* body, int link, btScalar maxMotorImpulse);
+	
+	virtual ~btMultiBodySphericalJointMotor();
+	virtual void finalizeMultiDof();
+
+	virtual int getIslandIdA() const;
+	virtual int getIslandIdB() const;
+
+	virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows,
+									  btMultiBodyJacobianData& data,
+									  const btContactSolverInfo& infoGlobal);
+
+	virtual void setVelocityTarget(const btVector3& velTarget, btScalar kd = 1.0)
+	{
+		m_desiredVelocity = velTarget;
+		m_kd = btVector3(kd, kd, kd);
+		m_use_multi_dof_params = false;
+	}
+
+	virtual void setVelocityTargetMultiDof(const btVector3& velTarget, const btVector3& kd = btVector3(1.0, 1.0, 1.0))
+	{
+		m_desiredVelocity = velTarget;
+		m_kd = kd;
+		m_use_multi_dof_params = true;
+	}
+
+	virtual void setPositionTarget(const btQuaternion& posTarget, btScalar kp =1.f)
+	{
+		m_desiredPosition = posTarget;
+		m_kp = btVector3(kp, kp, kp);
+		m_use_multi_dof_params = false;
+	}
+
+	virtual void setPositionTargetMultiDof(const btQuaternion& posTarget, const btVector3& kp = btVector3(1.f, 1.f, 1.f))
+	{
+		m_desiredPosition = posTarget;
+		m_kp = kp;
+		m_use_multi_dof_params = true;
+	}
+
+	virtual void setErp(btScalar erp)
+	{
+		m_erp = erp;
+	}
+	virtual btScalar getErp() const
+	{
+		return m_erp;
+	}
+	virtual void setRhsClamp(btScalar rhsClamp)
+	{
+		m_rhsClamp = rhsClamp;
+	}
+
+	btScalar getMaxAppliedImpulseMultiDof(int i) const
+	{
+		return m_maxAppliedImpulseMultiDof[i];
+	}
+
+	void setMaxAppliedImpulseMultiDof(const btVector3& maxImp)
+	{
+		m_maxAppliedImpulseMultiDof = maxImp;
+		m_use_multi_dof_params = true;
+	}
+
+	btScalar getDamping(int i) const
+	{
+		return m_damping[i];
+	}
+
+	void setDamping(const btVector3& damping)
+	{
+		m_damping = damping;
+	}
+
+	virtual void debugDraw(class btIDebugDraw* drawer)
+	{
+		//todo(erwincoumans)
+	}
+};
+
+#endif  //BT_MULTIBODY_SPHERICAL_JOINT_MOTOR_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp
new file mode 100644
index 0000000..98ecdc0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp
@@ -0,0 +1,2158 @@
+/*************************************************************************
+*                                                                       *
+* Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.       *
+* All rights reserved.  Email: russ@q12.org   Web: www.q12.org          *
+*                                                                       *
+* This library is free software; you can redistribute it and/or         *
+* modify it under the terms of EITHER:                                  *
+*   (1) The GNU Lesser General Public License as published by the Free  *
+*       Software Foundation; either version 2.1 of the License, or (at  *
+*       your option) any later version. The text of the GNU Lesser      *
+*       General Public License is included with this library in the     *
+*       file LICENSE.TXT.                                               *
+*   (2) The BSD-style license that is included with this library in     *
+*       the file LICENSE-BSD.TXT.                                       *
+*                                                                       *
+* This library is distributed in the hope that it will be useful,       *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files    *
+* LICENSE.TXT and LICENSE-BSD.TXT for more details.                     *
+*                                                                       *
+*************************************************************************/
+
+/*
+
+
+THE ALGORITHM
+-------------
+
+solve A*x = b+w, with x and w subject to certain LCP conditions.
+each x(i),w(i) must lie on one of the three line segments in the following
+diagram. each line segment corresponds to one index set :
+
+     w(i)
+     /|\      |           :
+      |       |           :
+      |       |i in N     :
+  w>0 |       |state[i]=0 :
+      |       |           :
+      |       |           :  i in C
+  w=0 +       +-----------------------+
+      |                   :           |
+      |                   :           |
+  w<0 |                   :           |i in N
+      |                   :           |state[i]=1
+      |                   :           |
+      |                   :           |
+      +-------|-----------|-----------|----------> x(i)
+             lo           0           hi
+
+the Dantzig algorithm proceeds as follows:
+  for i=1:n
+    * if (x(i),w(i)) is not on the line, push x(i) and w(i) positive or
+      negative towards the line. as this is done, the other (x(j),w(j))
+      for j<i are constrained to be on the line. if any (x,w) reaches the
+      end of a line segment then it is switched between index sets.
+    * i is added to the appropriate index set depending on what line segment
+      it hits.
+
+we restrict lo(i) <= 0 and hi(i) >= 0. this makes the algorithm a bit
+simpler, because the starting point for x(i),w(i) is always on the dotted
+line x=0 and x will only ever increase in one direction, so it can only hit
+two out of the three line segments.
+
+
+NOTES
+-----
+
+this is an implementation of "lcp_dantzig2_ldlt.m" and "lcp_dantzig_lohi.m".
+the implementation is split into an LCP problem object (btLCP) and an LCP
+driver function. most optimization occurs in the btLCP object.
+
+a naive implementation of the algorithm requires either a lot of data motion
+or a lot of permutation-array lookup, because we are constantly re-ordering
+rows and columns. to avoid this and make a more optimized algorithm, a
+non-trivial data structure is used to represent the matrix A (this is
+implemented in the fast version of the btLCP object).
+
+during execution of this algorithm, some indexes in A are clamped (set C),
+some are non-clamped (set N), and some are "don't care" (where x=0).
+A,x,b,w (and other problem vectors) are permuted such that the clamped
+indexes are first, the unclamped indexes are next, and the don't-care
+indexes are last. this permutation is recorded in the array `p'.
+initially p = 0..n-1, and as the rows and columns of A,x,b,w are swapped,
+the corresponding elements of p are swapped.
+
+because the C and N elements are grouped together in the rows of A, we can do
+lots of work with a fast dot product function. if A,x,etc were not permuted
+and we only had a permutation array, then those dot products would be much
+slower as we would have a permutation array lookup in some inner loops.
+
+A is accessed through an array of row pointers, so that element (i,j) of the
+permuted matrix is A[i][j]. this makes row swapping fast. for column swapping
+we still have to actually move the data.
+
+during execution of this algorithm we maintain an L*D*L' factorization of
+the clamped submatrix of A (call it `AC') which is the top left nC*nC
+submatrix of A. there are two ways we could arrange the rows/columns in AC.
+
+(1) AC is always permuted such that L*D*L' = AC. this causes a problem
+when a row/column is removed from C, because then all the rows/columns of A
+between the deleted index and the end of C need to be rotated downward.
+this results in a lot of data motion and slows things down.
+(2) L*D*L' is actually a factorization of a *permutation* of AC (which is
+itself a permutation of the underlying A). this is what we do - the
+permutation is recorded in the vector C. call this permutation A[C,C].
+when a row/column is removed from C, all we have to do is swap two
+rows/columns and manipulate C.
+
+*/
+
+#include "btDantzigLCP.h"
+
+#include <string.h>  //memcpy
+
+bool s_error = false;
+
+//***************************************************************************
+// code generation parameters
+
+#define btLCP_FAST  // use fast btLCP object
+
+// option 1 : matrix row pointers (less data copying)
+#define BTROWPTRS
+#define BTATYPE btScalar **
+#define BTAROW(i) (m_A[i])
+
+// option 2 : no matrix row pointers (slightly faster inner loops)
+//#define NOROWPTRS
+//#define BTATYPE btScalar *
+//#define BTAROW(i) (m_A+(i)*m_nskip)
+
+#define BTNUB_OPTIMIZATIONS
+
+/* solve L*X=B, with B containing 1 right hand sides.
+ * L is an n*n lower triangular matrix with ones on the diagonal.
+ * L is stored by rows and its leading dimension is lskip.
+ * B is an n*1 matrix that contains the right hand sides.
+ * B is stored by columns and its leading dimension is also lskip.
+ * B is overwritten with X.
+ * this processes blocks of 2*2.
+ * if this is in the factorizer source file, n must be a multiple of 2.
+ */
+
+static void btSolveL1_1(const btScalar *L, btScalar *B, int n, int lskip1)
+{
+	/* declare variables - Z matrix, p and q vectors, etc */
+	btScalar Z11, m11, Z21, m21, p1, q1, p2, *ex;
+	const btScalar *ell;
+	int i, j;
+	/* compute all 2 x 1 blocks of X */
+	for (i = 0; i < n; i += 2)
+	{
+		/* compute all 2 x 1 block of X, from rows i..i+2-1 */
+		/* set the Z matrix to 0 */
+		Z11 = 0;
+		Z21 = 0;
+		ell = L + i * lskip1;
+		ex = B;
+		/* the inner loop that computes outer products and adds them to Z */
+		for (j = i - 2; j >= 0; j -= 2)
+		{
+			/* compute outer product and add it to the Z matrix */
+			p1 = ell[0];
+			q1 = ex[0];
+			m11 = p1 * q1;
+			p2 = ell[lskip1];
+			m21 = p2 * q1;
+			Z11 += m11;
+			Z21 += m21;
+			/* compute outer product and add it to the Z matrix */
+			p1 = ell[1];
+			q1 = ex[1];
+			m11 = p1 * q1;
+			p2 = ell[1 + lskip1];
+			m21 = p2 * q1;
+			/* advance pointers */
+			ell += 2;
+			ex += 2;
+			Z11 += m11;
+			Z21 += m21;
+			/* end of inner loop */
+		}
+		/* compute left-over iterations */
+		j += 2;
+		for (; j > 0; j--)
+		{
+			/* compute outer product and add it to the Z matrix */
+			p1 = ell[0];
+			q1 = ex[0];
+			m11 = p1 * q1;
+			p2 = ell[lskip1];
+			m21 = p2 * q1;
+			/* advance pointers */
+			ell += 1;
+			ex += 1;
+			Z11 += m11;
+			Z21 += m21;
+		}
+		/* finish computing the X(i) block */
+		Z11 = ex[0] - Z11;
+		ex[0] = Z11;
+		p1 = ell[lskip1];
+		Z21 = ex[1] - Z21 - p1 * Z11;
+		ex[1] = Z21;
+		/* end of outer loop */
+	}
+}
+
+/* solve L*X=B, with B containing 2 right hand sides.
+ * L is an n*n lower triangular matrix with ones on the diagonal.
+ * L is stored by rows and its leading dimension is lskip.
+ * B is an n*2 matrix that contains the right hand sides.
+ * B is stored by columns and its leading dimension is also lskip.
+ * B is overwritten with X.
+ * this processes blocks of 2*2.
+ * if this is in the factorizer source file, n must be a multiple of 2.
+ */
+
+static void btSolveL1_2(const btScalar *L, btScalar *B, int n, int lskip1)
+{
+	/* declare variables - Z matrix, p and q vectors, etc */
+	btScalar Z11, m11, Z12, m12, Z21, m21, Z22, m22, p1, q1, p2, q2, *ex;
+	const btScalar *ell;
+	int i, j;
+	/* compute all 2 x 2 blocks of X */
+	for (i = 0; i < n; i += 2)
+	{
+		/* compute all 2 x 2 block of X, from rows i..i+2-1 */
+		/* set the Z matrix to 0 */
+		Z11 = 0;
+		Z12 = 0;
+		Z21 = 0;
+		Z22 = 0;
+		ell = L + i * lskip1;
+		ex = B;
+		/* the inner loop that computes outer products and adds them to Z */
+		for (j = i - 2; j >= 0; j -= 2)
+		{
+			/* compute outer product and add it to the Z matrix */
+			p1 = ell[0];
+			q1 = ex[0];
+			m11 = p1 * q1;
+			q2 = ex[lskip1];
+			m12 = p1 * q2;
+			p2 = ell[lskip1];
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z12 += m12;
+			Z21 += m21;
+			Z22 += m22;
+			/* compute outer product and add it to the Z matrix */
+			p1 = ell[1];
+			q1 = ex[1];
+			m11 = p1 * q1;
+			q2 = ex[1 + lskip1];
+			m12 = p1 * q2;
+			p2 = ell[1 + lskip1];
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			/* advance pointers */
+			ell += 2;
+			ex += 2;
+			Z11 += m11;
+			Z12 += m12;
+			Z21 += m21;
+			Z22 += m22;
+			/* end of inner loop */
+		}
+		/* compute left-over iterations */
+		j += 2;
+		for (; j > 0; j--)
+		{
+			/* compute outer product and add it to the Z matrix */
+			p1 = ell[0];
+			q1 = ex[0];
+			m11 = p1 * q1;
+			q2 = ex[lskip1];
+			m12 = p1 * q2;
+			p2 = ell[lskip1];
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			/* advance pointers */
+			ell += 1;
+			ex += 1;
+			Z11 += m11;
+			Z12 += m12;
+			Z21 += m21;
+			Z22 += m22;
+		}
+		/* finish computing the X(i) block */
+		Z11 = ex[0] - Z11;
+		ex[0] = Z11;
+		Z12 = ex[lskip1] - Z12;
+		ex[lskip1] = Z12;
+		p1 = ell[lskip1];
+		Z21 = ex[1] - Z21 - p1 * Z11;
+		ex[1] = Z21;
+		Z22 = ex[1 + lskip1] - Z22 - p1 * Z12;
+		ex[1 + lskip1] = Z22;
+		/* end of outer loop */
+	}
+}
+
+void btFactorLDLT(btScalar *A, btScalar *d, int n, int nskip1)
+{
+	int i, j;
+	btScalar sum, *ell, *dee, dd, p1, p2, q1, q2, Z11, m11, Z21, m21, Z22, m22;
+	if (n < 1) return;
+
+	for (i = 0; i <= n - 2; i += 2)
+	{
+		/* solve L*(D*l)=a, l is scaled elements in 2 x i block at A(i,0) */
+		btSolveL1_2(A, A + i * nskip1, i, nskip1);
+		/* scale the elements in a 2 x i block at A(i,0), and also */
+		/* compute Z = the outer product matrix that we'll need. */
+		Z11 = 0;
+		Z21 = 0;
+		Z22 = 0;
+		ell = A + i * nskip1;
+		dee = d;
+		for (j = i - 6; j >= 0; j -= 6)
+		{
+			p1 = ell[0];
+			p2 = ell[nskip1];
+			dd = dee[0];
+			q1 = p1 * dd;
+			q2 = p2 * dd;
+			ell[0] = q1;
+			ell[nskip1] = q2;
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z21 += m21;
+			Z22 += m22;
+			p1 = ell[1];
+			p2 = ell[1 + nskip1];
+			dd = dee[1];
+			q1 = p1 * dd;
+			q2 = p2 * dd;
+			ell[1] = q1;
+			ell[1 + nskip1] = q2;
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z21 += m21;
+			Z22 += m22;
+			p1 = ell[2];
+			p2 = ell[2 + nskip1];
+			dd = dee[2];
+			q1 = p1 * dd;
+			q2 = p2 * dd;
+			ell[2] = q1;
+			ell[2 + nskip1] = q2;
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z21 += m21;
+			Z22 += m22;
+			p1 = ell[3];
+			p2 = ell[3 + nskip1];
+			dd = dee[3];
+			q1 = p1 * dd;
+			q2 = p2 * dd;
+			ell[3] = q1;
+			ell[3 + nskip1] = q2;
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z21 += m21;
+			Z22 += m22;
+			p1 = ell[4];
+			p2 = ell[4 + nskip1];
+			dd = dee[4];
+			q1 = p1 * dd;
+			q2 = p2 * dd;
+			ell[4] = q1;
+			ell[4 + nskip1] = q2;
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z21 += m21;
+			Z22 += m22;
+			p1 = ell[5];
+			p2 = ell[5 + nskip1];
+			dd = dee[5];
+			q1 = p1 * dd;
+			q2 = p2 * dd;
+			ell[5] = q1;
+			ell[5 + nskip1] = q2;
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z21 += m21;
+			Z22 += m22;
+			ell += 6;
+			dee += 6;
+		}
+		/* compute left-over iterations */
+		j += 6;
+		for (; j > 0; j--)
+		{
+			p1 = ell[0];
+			p2 = ell[nskip1];
+			dd = dee[0];
+			q1 = p1 * dd;
+			q2 = p2 * dd;
+			ell[0] = q1;
+			ell[nskip1] = q2;
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m22 = p2 * q2;
+			Z11 += m11;
+			Z21 += m21;
+			Z22 += m22;
+			ell++;
+			dee++;
+		}
+		/* solve for diagonal 2 x 2 block at A(i,i) */
+		Z11 = ell[0] - Z11;
+		Z21 = ell[nskip1] - Z21;
+		Z22 = ell[1 + nskip1] - Z22;
+		dee = d + i;
+		/* factorize 2 x 2 block Z,dee */
+		/* factorize row 1 */
+		dee[0] = btRecip(Z11);
+		/* factorize row 2 */
+		sum = 0;
+		q1 = Z21;
+		q2 = q1 * dee[0];
+		Z21 = q2;
+		sum += q1 * q2;
+		dee[1] = btRecip(Z22 - sum);
+		/* done factorizing 2 x 2 block */
+		ell[nskip1] = Z21;
+	}
+	/* compute the (less than 2) rows at the bottom */
+	switch (n - i)
+	{
+		case 0:
+			break;
+
+		case 1:
+			btSolveL1_1(A, A + i * nskip1, i, nskip1);
+			/* scale the elements in a 1 x i block at A(i,0), and also */
+			/* compute Z = the outer product matrix that we'll need. */
+			Z11 = 0;
+			ell = A + i * nskip1;
+			dee = d;
+			for (j = i - 6; j >= 0; j -= 6)
+			{
+				p1 = ell[0];
+				dd = dee[0];
+				q1 = p1 * dd;
+				ell[0] = q1;
+				m11 = p1 * q1;
+				Z11 += m11;
+				p1 = ell[1];
+				dd = dee[1];
+				q1 = p1 * dd;
+				ell[1] = q1;
+				m11 = p1 * q1;
+				Z11 += m11;
+				p1 = ell[2];
+				dd = dee[2];
+				q1 = p1 * dd;
+				ell[2] = q1;
+				m11 = p1 * q1;
+				Z11 += m11;
+				p1 = ell[3];
+				dd = dee[3];
+				q1 = p1 * dd;
+				ell[3] = q1;
+				m11 = p1 * q1;
+				Z11 += m11;
+				p1 = ell[4];
+				dd = dee[4];
+				q1 = p1 * dd;
+				ell[4] = q1;
+				m11 = p1 * q1;
+				Z11 += m11;
+				p1 = ell[5];
+				dd = dee[5];
+				q1 = p1 * dd;
+				ell[5] = q1;
+				m11 = p1 * q1;
+				Z11 += m11;
+				ell += 6;
+				dee += 6;
+			}
+			/* compute left-over iterations */
+			j += 6;
+			for (; j > 0; j--)
+			{
+				p1 = ell[0];
+				dd = dee[0];
+				q1 = p1 * dd;
+				ell[0] = q1;
+				m11 = p1 * q1;
+				Z11 += m11;
+				ell++;
+				dee++;
+			}
+			/* solve for diagonal 1 x 1 block at A(i,i) */
+			Z11 = ell[0] - Z11;
+			dee = d + i;
+			/* factorize 1 x 1 block Z,dee */
+			/* factorize row 1 */
+			dee[0] = btRecip(Z11);
+			/* done factorizing 1 x 1 block */
+			break;
+
+			//default: *((char*)0)=0;  /* this should never happen! */
+	}
+}
+
+/* solve L*X=B, with B containing 1 right hand sides.
+ * L is an n*n lower triangular matrix with ones on the diagonal.
+ * L is stored by rows and its leading dimension is lskip.
+ * B is an n*1 matrix that contains the right hand sides.
+ * B is stored by columns and its leading dimension is also lskip.
+ * B is overwritten with X.
+ * this processes blocks of 4*4.
+ * if this is in the factorizer source file, n must be a multiple of 4.
+ */
+
+void btSolveL1(const btScalar *L, btScalar *B, int n, int lskip1)
+{
+	/* declare variables - Z matrix, p and q vectors, etc */
+	btScalar Z11, Z21, Z31, Z41, p1, q1, p2, p3, p4, *ex;
+	const btScalar *ell;
+	int lskip2, lskip3, i, j;
+	/* compute lskip values */
+	lskip2 = 2 * lskip1;
+	lskip3 = 3 * lskip1;
+	/* compute all 4 x 1 blocks of X */
+	for (i = 0; i <= n - 4; i += 4)
+	{
+		/* compute all 4 x 1 block of X, from rows i..i+4-1 */
+		/* set the Z matrix to 0 */
+		Z11 = 0;
+		Z21 = 0;
+		Z31 = 0;
+		Z41 = 0;
+		ell = L + i * lskip1;
+		ex = B;
+		/* the inner loop that computes outer products and adds them to Z */
+		for (j = i - 12; j >= 0; j -= 12)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			p2 = ell[lskip1];
+			p3 = ell[lskip2];
+			p4 = ell[lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[1];
+			q1 = ex[1];
+			p2 = ell[1 + lskip1];
+			p3 = ell[1 + lskip2];
+			p4 = ell[1 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[2];
+			q1 = ex[2];
+			p2 = ell[2 + lskip1];
+			p3 = ell[2 + lskip2];
+			p4 = ell[2 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[3];
+			q1 = ex[3];
+			p2 = ell[3 + lskip1];
+			p3 = ell[3 + lskip2];
+			p4 = ell[3 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[4];
+			q1 = ex[4];
+			p2 = ell[4 + lskip1];
+			p3 = ell[4 + lskip2];
+			p4 = ell[4 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[5];
+			q1 = ex[5];
+			p2 = ell[5 + lskip1];
+			p3 = ell[5 + lskip2];
+			p4 = ell[5 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[6];
+			q1 = ex[6];
+			p2 = ell[6 + lskip1];
+			p3 = ell[6 + lskip2];
+			p4 = ell[6 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[7];
+			q1 = ex[7];
+			p2 = ell[7 + lskip1];
+			p3 = ell[7 + lskip2];
+			p4 = ell[7 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[8];
+			q1 = ex[8];
+			p2 = ell[8 + lskip1];
+			p3 = ell[8 + lskip2];
+			p4 = ell[8 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[9];
+			q1 = ex[9];
+			p2 = ell[9 + lskip1];
+			p3 = ell[9 + lskip2];
+			p4 = ell[9 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[10];
+			q1 = ex[10];
+			p2 = ell[10 + lskip1];
+			p3 = ell[10 + lskip2];
+			p4 = ell[10 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* load p and q values */
+			p1 = ell[11];
+			q1 = ex[11];
+			p2 = ell[11 + lskip1];
+			p3 = ell[11 + lskip2];
+			p4 = ell[11 + lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* advance pointers */
+			ell += 12;
+			ex += 12;
+			/* end of inner loop */
+		}
+		/* compute left-over iterations */
+		j += 12;
+		for (; j > 0; j--)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			p2 = ell[lskip1];
+			p3 = ell[lskip2];
+			p4 = ell[lskip3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			Z21 += p2 * q1;
+			Z31 += p3 * q1;
+			Z41 += p4 * q1;
+			/* advance pointers */
+			ell += 1;
+			ex += 1;
+		}
+		/* finish computing the X(i) block */
+		Z11 = ex[0] - Z11;
+		ex[0] = Z11;
+		p1 = ell[lskip1];
+		Z21 = ex[1] - Z21 - p1 * Z11;
+		ex[1] = Z21;
+		p1 = ell[lskip2];
+		p2 = ell[1 + lskip2];
+		Z31 = ex[2] - Z31 - p1 * Z11 - p2 * Z21;
+		ex[2] = Z31;
+		p1 = ell[lskip3];
+		p2 = ell[1 + lskip3];
+		p3 = ell[2 + lskip3];
+		Z41 = ex[3] - Z41 - p1 * Z11 - p2 * Z21 - p3 * Z31;
+		ex[3] = Z41;
+		/* end of outer loop */
+	}
+	/* compute rows at end that are not a multiple of block size */
+	for (; i < n; i++)
+	{
+		/* compute all 1 x 1 block of X, from rows i..i+1-1 */
+		/* set the Z matrix to 0 */
+		Z11 = 0;
+		ell = L + i * lskip1;
+		ex = B;
+		/* the inner loop that computes outer products and adds them to Z */
+		for (j = i - 12; j >= 0; j -= 12)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[1];
+			q1 = ex[1];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[2];
+			q1 = ex[2];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[3];
+			q1 = ex[3];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[4];
+			q1 = ex[4];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[5];
+			q1 = ex[5];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[6];
+			q1 = ex[6];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[7];
+			q1 = ex[7];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[8];
+			q1 = ex[8];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[9];
+			q1 = ex[9];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[10];
+			q1 = ex[10];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* load p and q values */
+			p1 = ell[11];
+			q1 = ex[11];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* advance pointers */
+			ell += 12;
+			ex += 12;
+			/* end of inner loop */
+		}
+		/* compute left-over iterations */
+		j += 12;
+		for (; j > 0; j--)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			/* compute outer product and add it to the Z matrix */
+			Z11 += p1 * q1;
+			/* advance pointers */
+			ell += 1;
+			ex += 1;
+		}
+		/* finish computing the X(i) block */
+		Z11 = ex[0] - Z11;
+		ex[0] = Z11;
+	}
+}
+
+/* solve L^T * x=b, with b containing 1 right hand side.
+ * L is an n*n lower triangular matrix with ones on the diagonal.
+ * L is stored by rows and its leading dimension is lskip.
+ * b is an n*1 matrix that contains the right hand side.
+ * b is overwritten with x.
+ * this processes blocks of 4.
+ */
+
+void btSolveL1T(const btScalar *L, btScalar *B, int n, int lskip1)
+{
+	/* declare variables - Z matrix, p and q vectors, etc */
+	btScalar Z11, m11, Z21, m21, Z31, m31, Z41, m41, p1, q1, p2, p3, p4, *ex;
+	const btScalar *ell;
+	int lskip2, i, j;
+	//  int lskip3;
+	/* special handling for L and B because we're solving L1 *transpose* */
+	L = L + (n - 1) * (lskip1 + 1);
+	B = B + n - 1;
+	lskip1 = -lskip1;
+	/* compute lskip values */
+	lskip2 = 2 * lskip1;
+	//lskip3 = 3*lskip1;
+	/* compute all 4 x 1 blocks of X */
+	for (i = 0; i <= n - 4; i += 4)
+	{
+		/* compute all 4 x 1 block of X, from rows i..i+4-1 */
+		/* set the Z matrix to 0 */
+		Z11 = 0;
+		Z21 = 0;
+		Z31 = 0;
+		Z41 = 0;
+		ell = L - i;
+		ex = B;
+		/* the inner loop that computes outer products and adds them to Z */
+		for (j = i - 4; j >= 0; j -= 4)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			p2 = ell[-1];
+			p3 = ell[-2];
+			p4 = ell[-3];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m31 = p3 * q1;
+			m41 = p4 * q1;
+			ell += lskip1;
+			Z11 += m11;
+			Z21 += m21;
+			Z31 += m31;
+			Z41 += m41;
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[-1];
+			p2 = ell[-1];
+			p3 = ell[-2];
+			p4 = ell[-3];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m31 = p3 * q1;
+			m41 = p4 * q1;
+			ell += lskip1;
+			Z11 += m11;
+			Z21 += m21;
+			Z31 += m31;
+			Z41 += m41;
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[-2];
+			p2 = ell[-1];
+			p3 = ell[-2];
+			p4 = ell[-3];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m31 = p3 * q1;
+			m41 = p4 * q1;
+			ell += lskip1;
+			Z11 += m11;
+			Z21 += m21;
+			Z31 += m31;
+			Z41 += m41;
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[-3];
+			p2 = ell[-1];
+			p3 = ell[-2];
+			p4 = ell[-3];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m31 = p3 * q1;
+			m41 = p4 * q1;
+			ell += lskip1;
+			ex -= 4;
+			Z11 += m11;
+			Z21 += m21;
+			Z31 += m31;
+			Z41 += m41;
+			/* end of inner loop */
+		}
+		/* compute left-over iterations */
+		j += 4;
+		for (; j > 0; j--)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			p2 = ell[-1];
+			p3 = ell[-2];
+			p4 = ell[-3];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			m21 = p2 * q1;
+			m31 = p3 * q1;
+			m41 = p4 * q1;
+			ell += lskip1;
+			ex -= 1;
+			Z11 += m11;
+			Z21 += m21;
+			Z31 += m31;
+			Z41 += m41;
+		}
+		/* finish computing the X(i) block */
+		Z11 = ex[0] - Z11;
+		ex[0] = Z11;
+		p1 = ell[-1];
+		Z21 = ex[-1] - Z21 - p1 * Z11;
+		ex[-1] = Z21;
+		p1 = ell[-2];
+		p2 = ell[-2 + lskip1];
+		Z31 = ex[-2] - Z31 - p1 * Z11 - p2 * Z21;
+		ex[-2] = Z31;
+		p1 = ell[-3];
+		p2 = ell[-3 + lskip1];
+		p3 = ell[-3 + lskip2];
+		Z41 = ex[-3] - Z41 - p1 * Z11 - p2 * Z21 - p3 * Z31;
+		ex[-3] = Z41;
+		/* end of outer loop */
+	}
+	/* compute rows at end that are not a multiple of block size */
+	for (; i < n; i++)
+	{
+		/* compute all 1 x 1 block of X, from rows i..i+1-1 */
+		/* set the Z matrix to 0 */
+		Z11 = 0;
+		ell = L - i;
+		ex = B;
+		/* the inner loop that computes outer products and adds them to Z */
+		for (j = i - 4; j >= 0; j -= 4)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			ell += lskip1;
+			Z11 += m11;
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[-1];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			ell += lskip1;
+			Z11 += m11;
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[-2];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			ell += lskip1;
+			Z11 += m11;
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[-3];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			ell += lskip1;
+			ex -= 4;
+			Z11 += m11;
+			/* end of inner loop */
+		}
+		/* compute left-over iterations */
+		j += 4;
+		for (; j > 0; j--)
+		{
+			/* load p and q values */
+			p1 = ell[0];
+			q1 = ex[0];
+			/* compute outer product and add it to the Z matrix */
+			m11 = p1 * q1;
+			ell += lskip1;
+			ex -= 1;
+			Z11 += m11;
+		}
+		/* finish computing the X(i) block */
+		Z11 = ex[0] - Z11;
+		ex[0] = Z11;
+	}
+}
+
+void btVectorScale(btScalar *a, const btScalar *d, int n)
+{
+	btAssert(a && d && n >= 0);
+	for (int i = 0; i < n; i++)
+	{
+		a[i] *= d[i];
+	}
+}
+
+void btSolveLDLT(const btScalar *L, const btScalar *d, btScalar *b, int n, int nskip)
+{
+	btAssert(L && d && b && n > 0 && nskip >= n);
+	btSolveL1(L, b, n, nskip);
+	btVectorScale(b, d, n);
+	btSolveL1T(L, b, n, nskip);
+}
+
+//***************************************************************************
+
+// swap row/column i1 with i2 in the n*n matrix A. the leading dimension of
+// A is nskip. this only references and swaps the lower triangle.
+// if `do_fast_row_swaps' is nonzero and row pointers are being used, then
+// rows will be swapped by exchanging row pointers. otherwise the data will
+// be copied.
+
+static void btSwapRowsAndCols(BTATYPE A, int n, int i1, int i2, int nskip,
+							  int do_fast_row_swaps)
+{
+	btAssert(A && n > 0 && i1 >= 0 && i2 >= 0 && i1 < n && i2 < n &&
+			 nskip >= n && i1 < i2);
+
+#ifdef BTROWPTRS
+	btScalar *A_i1 = A[i1];
+	btScalar *A_i2 = A[i2];
+	for (int i = i1 + 1; i < i2; ++i)
+	{
+		btScalar *A_i_i1 = A[i] + i1;
+		A_i1[i] = *A_i_i1;
+		*A_i_i1 = A_i2[i];
+	}
+	A_i1[i2] = A_i1[i1];
+	A_i1[i1] = A_i2[i1];
+	A_i2[i1] = A_i2[i2];
+	// swap rows, by swapping row pointers
+	if (do_fast_row_swaps)
+	{
+		A[i1] = A_i2;
+		A[i2] = A_i1;
+	}
+	else
+	{
+		// Only swap till i2 column to match A plain storage variant.
+		for (int k = 0; k <= i2; ++k)
+		{
+			btScalar tmp = A_i1[k];
+			A_i1[k] = A_i2[k];
+			A_i2[k] = tmp;
+		}
+	}
+	// swap columns the hard way
+	for (int j = i2 + 1; j < n; ++j)
+	{
+		btScalar *A_j = A[j];
+		btScalar tmp = A_j[i1];
+		A_j[i1] = A_j[i2];
+		A_j[i2] = tmp;
+	}
+#else
+	btScalar *A_i1 = A + i1 * nskip;
+	btScalar *A_i2 = A + i2 * nskip;
+	for (int k = 0; k < i1; ++k)
+	{
+		btScalar tmp = A_i1[k];
+		A_i1[k] = A_i2[k];
+		A_i2[k] = tmp;
+	}
+	btScalar *A_i = A_i1 + nskip;
+	for (int i = i1 + 1; i < i2; A_i += nskip, ++i)
+	{
+		btScalar tmp = A_i2[i];
+		A_i2[i] = A_i[i1];
+		A_i[i1] = tmp;
+	}
+	{
+		btScalar tmp = A_i1[i1];
+		A_i1[i1] = A_i2[i2];
+		A_i2[i2] = tmp;
+	}
+	btScalar *A_j = A_i2 + nskip;
+	for (int j = i2 + 1; j < n; A_j += nskip, ++j)
+	{
+		btScalar tmp = A_j[i1];
+		A_j[i1] = A_j[i2];
+		A_j[i2] = tmp;
+	}
+#endif
+}
+
+// swap two indexes in the n*n LCP problem. i1 must be <= i2.
+
+static void btSwapProblem(BTATYPE A, btScalar *x, btScalar *b, btScalar *w, btScalar *lo,
+						  btScalar *hi, int *p, bool *state, int *findex,
+						  int n, int i1, int i2, int nskip,
+						  int do_fast_row_swaps)
+{
+	btScalar tmpr;
+	int tmpi;
+	bool tmpb;
+	btAssert(n > 0 && i1 >= 0 && i2 >= 0 && i1 < n && i2 < n && nskip >= n && i1 <= i2);
+	if (i1 == i2) return;
+
+	btSwapRowsAndCols(A, n, i1, i2, nskip, do_fast_row_swaps);
+
+	tmpr = x[i1];
+	x[i1] = x[i2];
+	x[i2] = tmpr;
+
+	tmpr = b[i1];
+	b[i1] = b[i2];
+	b[i2] = tmpr;
+
+	tmpr = w[i1];
+	w[i1] = w[i2];
+	w[i2] = tmpr;
+
+	tmpr = lo[i1];
+	lo[i1] = lo[i2];
+	lo[i2] = tmpr;
+
+	tmpr = hi[i1];
+	hi[i1] = hi[i2];
+	hi[i2] = tmpr;
+
+	tmpi = p[i1];
+	p[i1] = p[i2];
+	p[i2] = tmpi;
+
+	tmpb = state[i1];
+	state[i1] = state[i2];
+	state[i2] = tmpb;
+
+	if (findex)
+	{
+		tmpi = findex[i1];
+		findex[i1] = findex[i2];
+		findex[i2] = tmpi;
+	}
+}
+
+//***************************************************************************
+// btLCP manipulator object. this represents an n*n LCP problem.
+//
+// two index sets C and N are kept. each set holds a subset of
+// the variable indexes 0..n-1. an index can only be in one set.
+// initially both sets are empty.
+//
+// the index set C is special: solutions to A(C,C)\A(C,i) can be generated.
+
+//***************************************************************************
+// fast implementation of btLCP. see the above definition of btLCP for
+// interface comments.
+//
+// `p' records the permutation of A,x,b,w,etc. p is initially 1:n and is
+// permuted as the other vectors/matrices are permuted.
+//
+// A,x,b,w,lo,hi,state,findex,p,c are permuted such that sets C,N have
+// contiguous indexes. the don't-care indexes follow N.
+//
+// an L*D*L' factorization is maintained of A(C,C), and whenever indexes are
+// added or removed from the set C the factorization is updated.
+// thus L*D*L'=A[C,C], i.e. a permuted top left nC*nC submatrix of A.
+// the leading dimension of the matrix L is always `nskip'.
+//
+// at the start there may be other indexes that are unbounded but are not
+// included in `nub'. btLCP will permute the matrix so that absolutely all
+// unbounded vectors are at the start. thus there may be some initial
+// permutation.
+//
+// the algorithms here assume certain patterns, particularly with respect to
+// index transfer.
+
+#ifdef btLCP_FAST
+
+struct btLCP
+{
+	const int m_n;
+	const int m_nskip;
+	int m_nub;
+	int m_nC, m_nN;                                                         // size of each index set
+	BTATYPE const m_A;                                                      // A rows
+	btScalar *const m_x, *const m_b, *const m_w, *const m_lo, *const m_hi;  // permuted LCP problem data
+	btScalar *const m_L, *const m_d;                                        // L*D*L' factorization of set C
+	btScalar *const m_Dell, *const m_ell, *const m_tmp;
+	bool *const m_state;
+	int *const m_findex, *const m_p, *const m_C;
+
+	btLCP(int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w,
+		  btScalar *_lo, btScalar *_hi, btScalar *l, btScalar *_d,
+		  btScalar *_Dell, btScalar *_ell, btScalar *_tmp,
+		  bool *_state, int *_findex, int *p, int *c, btScalar **Arows);
+	int getNub() const { return m_nub; }
+	void transfer_i_to_C(int i);
+	void transfer_i_to_N(int i) { m_nN++; }  // because we can assume C and N span 1:i-1
+	void transfer_i_from_N_to_C(int i);
+	void transfer_i_from_C_to_N(int i, btAlignedObjectArray<btScalar> &scratch);
+	int numC() const { return m_nC; }
+	int numN() const { return m_nN; }
+	int indexC(int i) const { return i; }
+	int indexN(int i) const { return i + m_nC; }
+	btScalar Aii(int i) const { return BTAROW(i)[i]; }
+	btScalar AiC_times_qC(int i, btScalar *q) const { return btLargeDot(BTAROW(i), q, m_nC); }
+	btScalar AiN_times_qN(int i, btScalar *q) const { return btLargeDot(BTAROW(i) + m_nC, q + m_nC, m_nN); }
+	void pN_equals_ANC_times_qC(btScalar *p, btScalar *q);
+	void pN_plusequals_ANi(btScalar *p, int i, int sign = 1);
+	void pC_plusequals_s_times_qC(btScalar *p, btScalar s, btScalar *q);
+	void pN_plusequals_s_times_qN(btScalar *p, btScalar s, btScalar *q);
+	void solve1(btScalar *a, int i, int dir = 1, int only_transfer = 0);
+	void unpermute();
+};
+
+btLCP::btLCP(int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w,
+			 btScalar *_lo, btScalar *_hi, btScalar *l, btScalar *_d,
+			 btScalar *_Dell, btScalar *_ell, btScalar *_tmp,
+			 bool *_state, int *_findex, int *p, int *c, btScalar **Arows) : m_n(_n), m_nskip(_nskip), m_nub(_nub), m_nC(0), m_nN(0),
+#ifdef BTROWPTRS
+																			 m_A(Arows),
+#else
+																			 m_A(_Adata),
+#endif
+																			 m_x(_x),
+																			 m_b(_b),
+																			 m_w(_w),
+																			 m_lo(_lo),
+																			 m_hi(_hi),
+																			 m_L(l),
+																			 m_d(_d),
+																			 m_Dell(_Dell),
+																			 m_ell(_ell),
+																			 m_tmp(_tmp),
+																			 m_state(_state),
+																			 m_findex(_findex),
+																			 m_p(p),
+																			 m_C(c)
+{
+	{
+		btSetZero(m_x, m_n);
+	}
+
+	{
+#ifdef BTROWPTRS
+		// make matrix row pointers
+		btScalar *aptr = _Adata;
+		BTATYPE A = m_A;
+		const int n = m_n, nskip = m_nskip;
+		for (int k = 0; k < n; aptr += nskip, ++k) A[k] = aptr;
+#endif
+	}
+
+	{
+		int *p = m_p;
+		const int n = m_n;
+		for (int k = 0; k < n; ++k) p[k] = k;  // initially unpermuted
+	}
+
+	/*
+  // for testing, we can do some random swaps in the area i > nub
+  {
+    const int n = m_n;
+    const int nub = m_nub;
+    if (nub < n) {
+    for (int k=0; k<100; k++) {
+      int i1,i2;
+      do {
+        i1 = dRandInt(n-nub)+nub;
+        i2 = dRandInt(n-nub)+nub;
+      }
+      while (i1 > i2); 
+      //printf ("--> %d %d\n",i1,i2);
+      btSwapProblem (m_A,m_x,m_b,m_w,m_lo,m_hi,m_p,m_state,m_findex,n,i1,i2,m_nskip,0);
+    }
+  }
+  */
+
+	// permute the problem so that *all* the unbounded variables are at the
+	// start, i.e. look for unbounded variables not included in `nub'. we can
+	// potentially push up `nub' this way and get a bigger initial factorization.
+	// note that when we swap rows/cols here we must not just swap row pointers,
+	// as the initial factorization relies on the data being all in one chunk.
+	// variables that have findex >= 0 are *not* considered to be unbounded even
+	// if lo=-inf and hi=inf - this is because these limits may change during the
+	// solution process.
+
+	{
+		int *findex = m_findex;
+		btScalar *lo = m_lo, *hi = m_hi;
+		const int n = m_n;
+		for (int k = m_nub; k < n; ++k)
+		{
+			if (findex && findex[k] >= 0) continue;
+			if (lo[k] == -BT_INFINITY && hi[k] == BT_INFINITY)
+			{
+				btSwapProblem(m_A, m_x, m_b, m_w, lo, hi, m_p, m_state, findex, n, m_nub, k, m_nskip, 0);
+				m_nub++;
+			}
+		}
+	}
+
+	// if there are unbounded variables at the start, factorize A up to that
+	// point and solve for x. this puts all indexes 0..nub-1 into C.
+	if (m_nub > 0)
+	{
+		const int nub = m_nub;
+		{
+			btScalar *Lrow = m_L;
+			const int nskip = m_nskip;
+			for (int j = 0; j < nub; Lrow += nskip, ++j) memcpy(Lrow, BTAROW(j), (j + 1) * sizeof(btScalar));
+		}
+		btFactorLDLT(m_L, m_d, nub, m_nskip);
+		memcpy(m_x, m_b, nub * sizeof(btScalar));
+		btSolveLDLT(m_L, m_d, m_x, nub, m_nskip);
+		btSetZero(m_w, nub);
+		{
+			int *C = m_C;
+			for (int k = 0; k < nub; ++k) C[k] = k;
+		}
+		m_nC = nub;
+	}
+
+	// permute the indexes > nub such that all findex variables are at the end
+	if (m_findex)
+	{
+		const int nub = m_nub;
+		int *findex = m_findex;
+		int num_at_end = 0;
+		for (int k = m_n - 1; k >= nub; k--)
+		{
+			if (findex[k] >= 0)
+			{
+				btSwapProblem(m_A, m_x, m_b, m_w, m_lo, m_hi, m_p, m_state, findex, m_n, k, m_n - 1 - num_at_end, m_nskip, 1);
+				num_at_end++;
+			}
+		}
+	}
+
+	// print info about indexes
+	/*
+  {
+    const int n = m_n;
+    const int nub = m_nub;
+    for (int k=0; k<n; k++) {
+      if (k<nub) printf ("C");
+      else if (m_lo[k]==-BT_INFINITY && m_hi[k]==BT_INFINITY) printf ("c");
+      else printf (".");
+    }
+    printf ("\n");
+  }
+  */
+}
+
+void btLCP::transfer_i_to_C(int i)
+{
+	{
+		if (m_nC > 0)
+		{
+			// ell,Dell were computed by solve1(). note, ell = D \ L1solve (L,A(i,C))
+			{
+				const int nC = m_nC;
+				btScalar *const Ltgt = m_L + nC * m_nskip, *ell = m_ell;
+				for (int j = 0; j < nC; ++j) Ltgt[j] = ell[j];
+			}
+			const int nC = m_nC;
+			m_d[nC] = btRecip(BTAROW(i)[i] - btLargeDot(m_ell, m_Dell, nC));
+		}
+		else
+		{
+			m_d[0] = btRecip(BTAROW(i)[i]);
+		}
+
+		btSwapProblem(m_A, m_x, m_b, m_w, m_lo, m_hi, m_p, m_state, m_findex, m_n, m_nC, i, m_nskip, 1);
+
+		const int nC = m_nC;
+		m_C[nC] = nC;
+		m_nC = nC + 1;  // nC value is outdated after this line
+	}
+}
+
+void btLCP::transfer_i_from_N_to_C(int i)
+{
+	{
+		if (m_nC > 0)
+		{
+			{
+				btScalar *const aptr = BTAROW(i);
+				btScalar *Dell = m_Dell;
+				const int *C = m_C;
+#ifdef BTNUB_OPTIMIZATIONS
+				// if nub>0, initial part of aptr unpermuted
+				const int nub = m_nub;
+				int j = 0;
+				for (; j < nub; ++j) Dell[j] = aptr[j];
+				const int nC = m_nC;
+				for (; j < nC; ++j) Dell[j] = aptr[C[j]];
+#else
+				const int nC = m_nC;
+				for (int j = 0; j < nC; ++j) Dell[j] = aptr[C[j]];
+#endif
+			}
+			btSolveL1(m_L, m_Dell, m_nC, m_nskip);
+			{
+				const int nC = m_nC;
+				btScalar *const Ltgt = m_L + nC * m_nskip;
+				btScalar *ell = m_ell, *Dell = m_Dell, *d = m_d;
+				for (int j = 0; j < nC; ++j) Ltgt[j] = ell[j] = Dell[j] * d[j];
+			}
+			const int nC = m_nC;
+			m_d[nC] = btRecip(BTAROW(i)[i] - btLargeDot(m_ell, m_Dell, nC));
+		}
+		else
+		{
+			m_d[0] = btRecip(BTAROW(i)[i]);
+		}
+
+		btSwapProblem(m_A, m_x, m_b, m_w, m_lo, m_hi, m_p, m_state, m_findex, m_n, m_nC, i, m_nskip, 1);
+
+		const int nC = m_nC;
+		m_C[nC] = nC;
+		m_nN--;
+		m_nC = nC + 1;  // nC value is outdated after this line
+	}
+
+	// @@@ TO DO LATER
+	// if we just finish here then we'll go back and re-solve for
+	// delta_x. but actually we can be more efficient and incrementally
+	// update delta_x here. but if we do this, we wont have ell and Dell
+	// to use in updating the factorization later.
+}
+
+void btRemoveRowCol(btScalar *A, int n, int nskip, int r)
+{
+	btAssert(A && n > 0 && nskip >= n && r >= 0 && r < n);
+	if (r >= n - 1) return;
+	if (r > 0)
+	{
+		{
+			const size_t move_size = (n - r - 1) * sizeof(btScalar);
+			btScalar *Adst = A + r;
+			for (int i = 0; i < r; Adst += nskip, ++i)
+			{
+				btScalar *Asrc = Adst + 1;
+				memmove(Adst, Asrc, move_size);
+			}
+		}
+		{
+			const size_t cpy_size = r * sizeof(btScalar);
+			btScalar *Adst = A + r * nskip;
+			for (int i = r; i < (n - 1); ++i)
+			{
+				btScalar *Asrc = Adst + nskip;
+				memcpy(Adst, Asrc, cpy_size);
+				Adst = Asrc;
+			}
+		}
+	}
+	{
+		const size_t cpy_size = (n - r - 1) * sizeof(btScalar);
+		btScalar *Adst = A + r * (nskip + 1);
+		for (int i = r; i < (n - 1); ++i)
+		{
+			btScalar *Asrc = Adst + (nskip + 1);
+			memcpy(Adst, Asrc, cpy_size);
+			Adst = Asrc - 1;
+		}
+	}
+}
+
+void btLDLTAddTL(btScalar *L, btScalar *d, const btScalar *a, int n, int nskip, btAlignedObjectArray<btScalar> &scratch)
+{
+	btAssert(L && d && a && n > 0 && nskip >= n);
+
+	if (n < 2) return;
+	scratch.resize(2 * nskip);
+	btScalar *W1 = &scratch[0];
+
+	btScalar *W2 = W1 + nskip;
+
+	W1[0] = btScalar(0.0);
+	W2[0] = btScalar(0.0);
+	for (int j = 1; j < n; ++j)
+	{
+		W1[j] = W2[j] = (btScalar)(a[j] * SIMDSQRT12);
+	}
+	btScalar W11 = (btScalar)((btScalar(0.5) * a[0] + 1) * SIMDSQRT12);
+	btScalar W21 = (btScalar)((btScalar(0.5) * a[0] - 1) * SIMDSQRT12);
+
+	btScalar alpha1 = btScalar(1.0);
+	btScalar alpha2 = btScalar(1.0);
+
+	{
+		btScalar dee = d[0];
+		btScalar alphanew = alpha1 + (W11 * W11) * dee;
+		btAssert(alphanew != btScalar(0.0));
+		dee /= alphanew;
+		btScalar gamma1 = W11 * dee;
+		dee *= alpha1;
+		alpha1 = alphanew;
+		alphanew = alpha2 - (W21 * W21) * dee;
+		dee /= alphanew;
+		//btScalar gamma2 = W21 * dee;
+		alpha2 = alphanew;
+		btScalar k1 = btScalar(1.0) - W21 * gamma1;
+		btScalar k2 = W21 * gamma1 * W11 - W21;
+		btScalar *ll = L + nskip;
+		for (int p = 1; p < n; ll += nskip, ++p)
+		{
+			btScalar Wp = W1[p];
+			btScalar ell = *ll;
+			W1[p] = Wp - W11 * ell;
+			W2[p] = k1 * Wp + k2 * ell;
+		}
+	}
+
+	btScalar *ll = L + (nskip + 1);
+	for (int j = 1; j < n; ll += nskip + 1, ++j)
+	{
+		btScalar k1 = W1[j];
+		btScalar k2 = W2[j];
+
+		btScalar dee = d[j];
+		btScalar alphanew = alpha1 + (k1 * k1) * dee;
+		btAssert(alphanew != btScalar(0.0));
+		dee /= alphanew;
+		btScalar gamma1 = k1 * dee;
+		dee *= alpha1;
+		alpha1 = alphanew;
+		alphanew = alpha2 - (k2 * k2) * dee;
+		dee /= alphanew;
+		btScalar gamma2 = k2 * dee;
+		dee *= alpha2;
+		d[j] = dee;
+		alpha2 = alphanew;
+
+		btScalar *l = ll + nskip;
+		for (int p = j + 1; p < n; l += nskip, ++p)
+		{
+			btScalar ell = *l;
+			btScalar Wp = W1[p] - k1 * ell;
+			ell += gamma1 * Wp;
+			W1[p] = Wp;
+			Wp = W2[p] - k2 * ell;
+			ell -= gamma2 * Wp;
+			W2[p] = Wp;
+			*l = ell;
+		}
+	}
+}
+
+#define _BTGETA(i, j) (A[i][j])
+//#define _GETA(i,j) (A[(i)*nskip+(j)])
+#define BTGETA(i, j) ((i > j) ? _BTGETA(i, j) : _BTGETA(j, i))
+
+inline size_t btEstimateLDLTAddTLTmpbufSize(int nskip)
+{
+	return nskip * 2 * sizeof(btScalar);
+}
+
+void btLDLTRemove(btScalar **A, const int *p, btScalar *L, btScalar *d,
+				  int n1, int n2, int r, int nskip, btAlignedObjectArray<btScalar> &scratch)
+{
+	btAssert(A && p && L && d && n1 > 0 && n2 > 0 && r >= 0 && r < n2 &&
+			 n1 >= n2 && nskip >= n1);
+#ifdef BT_DEBUG
+	for (int i = 0; i < n2; ++i)
+		btAssert(p[i] >= 0 && p[i] < n1);
+#endif
+
+	if (r == n2 - 1)
+	{
+		return;  // deleting last row/col is easy
+	}
+	else
+	{
+		size_t LDLTAddTL_size = btEstimateLDLTAddTLTmpbufSize(nskip);
+		btAssert(LDLTAddTL_size % sizeof(btScalar) == 0);
+		scratch.resize(nskip * 2 + n2);
+		btScalar *tmp = &scratch[0];
+		if (r == 0)
+		{
+			btScalar *a = (btScalar *)((char *)tmp + LDLTAddTL_size);
+			const int p_0 = p[0];
+			for (int i = 0; i < n2; ++i)
+			{
+				a[i] = -BTGETA(p[i], p_0);
+			}
+			a[0] += btScalar(1.0);
+			btLDLTAddTL(L, d, a, n2, nskip, scratch);
+		}
+		else
+		{
+			btScalar *t = (btScalar *)((char *)tmp + LDLTAddTL_size);
+			{
+				btScalar *Lcurr = L + r * nskip;
+				for (int i = 0; i < r; ++Lcurr, ++i)
+				{
+					btAssert(d[i] != btScalar(0.0));
+					t[i] = *Lcurr / d[i];
+				}
+			}
+			btScalar *a = t + r;
+			{
+				btScalar *Lcurr = L + r * nskip;
+				const int *pp_r = p + r, p_r = *pp_r;
+				const int n2_minus_r = n2 - r;
+				for (int i = 0; i < n2_minus_r; Lcurr += nskip, ++i)
+				{
+					a[i] = btLargeDot(Lcurr, t, r) - BTGETA(pp_r[i], p_r);
+				}
+			}
+			a[0] += btScalar(1.0);
+			btLDLTAddTL(L + r * nskip + r, d + r, a, n2 - r, nskip, scratch);
+		}
+	}
+
+	// snip out row/column r from L and d
+	btRemoveRowCol(L, n2, nskip, r);
+	if (r < (n2 - 1)) memmove(d + r, d + r + 1, (n2 - r - 1) * sizeof(btScalar));
+}
+
+void btLCP::transfer_i_from_C_to_N(int i, btAlignedObjectArray<btScalar> &scratch)
+{
+	{
+		int *C = m_C;
+		// remove a row/column from the factorization, and adjust the
+		// indexes (black magic!)
+		int last_idx = -1;
+		const int nC = m_nC;
+		int j = 0;
+		for (; j < nC; ++j)
+		{
+			if (C[j] == nC - 1)
+			{
+				last_idx = j;
+			}
+			if (C[j] == i)
+			{
+				btLDLTRemove(m_A, C, m_L, m_d, m_n, nC, j, m_nskip, scratch);
+				int k;
+				if (last_idx == -1)
+				{
+					for (k = j + 1; k < nC; ++k)
+					{
+						if (C[k] == nC - 1)
+						{
+							break;
+						}
+					}
+					btAssert(k < nC);
+				}
+				else
+				{
+					k = last_idx;
+				}
+				C[k] = C[j];
+				if (j < (nC - 1)) memmove(C + j, C + j + 1, (nC - j - 1) * sizeof(int));
+				break;
+			}
+		}
+		btAssert(j < nC);
+
+		btSwapProblem(m_A, m_x, m_b, m_w, m_lo, m_hi, m_p, m_state, m_findex, m_n, i, nC - 1, m_nskip, 1);
+
+		m_nN++;
+		m_nC = nC - 1;  // nC value is outdated after this line
+	}
+}
+
+void btLCP::pN_equals_ANC_times_qC(btScalar *p, btScalar *q)
+{
+	// we could try to make this matrix-vector multiplication faster using
+	// outer product matrix tricks, e.g. with the dMultidotX() functions.
+	// but i tried it and it actually made things slower on random 100x100
+	// problems because of the overhead involved. so we'll stick with the
+	// simple method for now.
+	const int nC = m_nC;
+	btScalar *ptgt = p + nC;
+	const int nN = m_nN;
+	for (int i = 0; i < nN; ++i)
+	{
+		ptgt[i] = btLargeDot(BTAROW(i + nC), q, nC);
+	}
+}
+
+void btLCP::pN_plusequals_ANi(btScalar *p, int i, int sign)
+{
+	const int nC = m_nC;
+	btScalar *aptr = BTAROW(i) + nC;
+	btScalar *ptgt = p + nC;
+	if (sign > 0)
+	{
+		const int nN = m_nN;
+		for (int j = 0; j < nN; ++j) ptgt[j] += aptr[j];
+	}
+	else
+	{
+		const int nN = m_nN;
+		for (int j = 0; j < nN; ++j) ptgt[j] -= aptr[j];
+	}
+}
+
+void btLCP::pC_plusequals_s_times_qC(btScalar *p, btScalar s, btScalar *q)
+{
+	const int nC = m_nC;
+	for (int i = 0; i < nC; ++i)
+	{
+		p[i] += s * q[i];
+	}
+}
+
+void btLCP::pN_plusequals_s_times_qN(btScalar *p, btScalar s, btScalar *q)
+{
+	const int nC = m_nC;
+	btScalar *ptgt = p + nC, *qsrc = q + nC;
+	const int nN = m_nN;
+	for (int i = 0; i < nN; ++i)
+	{
+		ptgt[i] += s * qsrc[i];
+	}
+}
+
+void btLCP::solve1(btScalar *a, int i, int dir, int only_transfer)
+{
+	// the `Dell' and `ell' that are computed here are saved. if index i is
+	// later added to the factorization then they can be reused.
+	//
+	// @@@ question: do we need to solve for entire delta_x??? yes, but
+	//     only if an x goes below 0 during the step.
+
+	if (m_nC > 0)
+	{
+		{
+			btScalar *Dell = m_Dell;
+			int *C = m_C;
+			btScalar *aptr = BTAROW(i);
+#ifdef BTNUB_OPTIMIZATIONS
+			// if nub>0, initial part of aptr[] is guaranteed unpermuted
+			const int nub = m_nub;
+			int j = 0;
+			for (; j < nub; ++j) Dell[j] = aptr[j];
+			const int nC = m_nC;
+			for (; j < nC; ++j) Dell[j] = aptr[C[j]];
+#else
+			const int nC = m_nC;
+			for (int j = 0; j < nC; ++j) Dell[j] = aptr[C[j]];
+#endif
+		}
+		btSolveL1(m_L, m_Dell, m_nC, m_nskip);
+		{
+			btScalar *ell = m_ell, *Dell = m_Dell, *d = m_d;
+			const int nC = m_nC;
+			for (int j = 0; j < nC; ++j) ell[j] = Dell[j] * d[j];
+		}
+
+		if (!only_transfer)
+		{
+			btScalar *tmp = m_tmp, *ell = m_ell;
+			{
+				const int nC = m_nC;
+				for (int j = 0; j < nC; ++j) tmp[j] = ell[j];
+			}
+			btSolveL1T(m_L, tmp, m_nC, m_nskip);
+			if (dir > 0)
+			{
+				int *C = m_C;
+				btScalar *tmp = m_tmp;
+				const int nC = m_nC;
+				for (int j = 0; j < nC; ++j) a[C[j]] = -tmp[j];
+			}
+			else
+			{
+				int *C = m_C;
+				btScalar *tmp = m_tmp;
+				const int nC = m_nC;
+				for (int j = 0; j < nC; ++j) a[C[j]] = tmp[j];
+			}
+		}
+	}
+}
+
+void btLCP::unpermute()
+{
+	// now we have to un-permute x and w
+	{
+		memcpy(m_tmp, m_x, m_n * sizeof(btScalar));
+		btScalar *x = m_x, *tmp = m_tmp;
+		const int *p = m_p;
+		const int n = m_n;
+		for (int j = 0; j < n; ++j) x[p[j]] = tmp[j];
+	}
+	{
+		memcpy(m_tmp, m_w, m_n * sizeof(btScalar));
+		btScalar *w = m_w, *tmp = m_tmp;
+		const int *p = m_p;
+		const int n = m_n;
+		for (int j = 0; j < n; ++j) w[p[j]] = tmp[j];
+	}
+}
+
+#endif  // btLCP_FAST
+
+//***************************************************************************
+// an optimized Dantzig LCP driver routine for the lo-hi LCP problem.
+
+bool btSolveDantzigLCP(int n, btScalar *A, btScalar *x, btScalar *b,
+					   btScalar *outer_w, int nub, btScalar *lo, btScalar *hi, int *findex, btDantzigScratchMemory &scratchMem)
+{
+	s_error = false;
+
+	//	printf("btSolveDantzigLCP n=%d\n",n);
+	btAssert(n > 0 && A && x && b && lo && hi && nub >= 0 && nub <= n);
+	btAssert(outer_w);
+
+#ifdef BT_DEBUG
+	{
+		// check restrictions on lo and hi
+		for (int k = 0; k < n; ++k)
+			btAssert(lo[k] <= 0 && hi[k] >= 0);
+	}
+#endif
+
+	// if all the variables are unbounded then we can just factor, solve,
+	// and return
+	if (nub >= n)
+	{
+		int nskip = (n);
+		btFactorLDLT(A, outer_w, n, nskip);
+		btSolveLDLT(A, outer_w, b, n, nskip);
+		memcpy(x, b, n * sizeof(btScalar));
+
+		return !s_error;
+	}
+
+	const int nskip = (n);
+	scratchMem.L.resize(n * nskip);
+
+	scratchMem.d.resize(n);
+
+	btScalar *w = outer_w;
+	scratchMem.delta_w.resize(n);
+	scratchMem.delta_x.resize(n);
+	scratchMem.Dell.resize(n);
+	scratchMem.ell.resize(n);
+	scratchMem.Arows.resize(n);
+	scratchMem.p.resize(n);
+	scratchMem.C.resize(n);
+
+	// for i in N, state[i] is 0 if x(i)==lo(i) or 1 if x(i)==hi(i)
+	scratchMem.state.resize(n);
+
+	// create LCP object. note that tmp is set to delta_w to save space, this
+	// optimization relies on knowledge of how tmp is used, so be careful!
+	btLCP lcp(n, nskip, nub, A, x, b, w, lo, hi, &scratchMem.L[0], &scratchMem.d[0], &scratchMem.Dell[0], &scratchMem.ell[0], &scratchMem.delta_w[0], &scratchMem.state[0], findex, &scratchMem.p[0], &scratchMem.C[0], &scratchMem.Arows[0]);
+	int adj_nub = lcp.getNub();
+
+	// loop over all indexes adj_nub..n-1. for index i, if x(i),w(i) satisfy the
+	// LCP conditions then i is added to the appropriate index set. otherwise
+	// x(i),w(i) is driven either +ve or -ve to force it to the valid region.
+	// as we drive x(i), x(C) is also adjusted to keep w(C) at zero.
+	// while driving x(i) we maintain the LCP conditions on the other variables
+	// 0..i-1. we do this by watching out for other x(i),w(i) values going
+	// outside the valid region, and then switching them between index sets
+	// when that happens.
+
+	bool hit_first_friction_index = false;
+	for (int i = adj_nub; i < n; ++i)
+	{
+		s_error = false;
+		// the index i is the driving index and indexes i+1..n-1 are "dont care",
+		// i.e. when we make changes to the system those x's will be zero and we
+		// don't care what happens to those w's. in other words, we only consider
+		// an (i+1)*(i+1) sub-problem of A*x=b+w.
+
+		// if we've hit the first friction index, we have to compute the lo and
+		// hi values based on the values of x already computed. we have been
+		// permuting the indexes, so the values stored in the findex vector are
+		// no longer valid. thus we have to temporarily unpermute the x vector.
+		// for the purposes of this computation, 0*infinity = 0 ... so if the
+		// contact constraint's normal force is 0, there should be no tangential
+		// force applied.
+
+		if (!hit_first_friction_index && findex && findex[i] >= 0)
+		{
+			// un-permute x into delta_w, which is not being used at the moment
+			for (int j = 0; j < n; ++j) scratchMem.delta_w[scratchMem.p[j]] = x[j];
+
+			// set lo and hi values
+			for (int k = i; k < n; ++k)
+			{
+				btScalar wfk = scratchMem.delta_w[findex[k]];
+				if (wfk == 0)
+				{
+					hi[k] = 0;
+					lo[k] = 0;
+				}
+				else
+				{
+					hi[k] = btFabs(hi[k] * wfk);
+					lo[k] = -hi[k];
+				}
+			}
+			hit_first_friction_index = true;
+		}
+
+		// thus far we have not even been computing the w values for indexes
+		// greater than i, so compute w[i] now.
+		w[i] = lcp.AiC_times_qC(i, x) + lcp.AiN_times_qN(i, x) - b[i];
+
+		// if lo=hi=0 (which can happen for tangential friction when normals are
+		// 0) then the index will be assigned to set N with some state. however,
+		// set C's line has zero size, so the index will always remain in set N.
+		// with the "normal" switching logic, if w changed sign then the index
+		// would have to switch to set C and then back to set N with an inverted
+		// state. this is pointless, and also computationally expensive. to
+		// prevent this from happening, we use the rule that indexes with lo=hi=0
+		// will never be checked for set changes. this means that the state for
+		// these indexes may be incorrect, but that doesn't matter.
+
+		// see if x(i),w(i) is in a valid region
+		if (lo[i] == 0 && w[i] >= 0)
+		{
+			lcp.transfer_i_to_N(i);
+			scratchMem.state[i] = false;
+		}
+		else if (hi[i] == 0 && w[i] <= 0)
+		{
+			lcp.transfer_i_to_N(i);
+			scratchMem.state[i] = true;
+		}
+		else if (w[i] == 0)
+		{
+			// this is a degenerate case. by the time we get to this test we know
+			// that lo != 0, which means that lo < 0 as lo is not allowed to be +ve,
+			// and similarly that hi > 0. this means that the line segment
+			// corresponding to set C is at least finite in extent, and we are on it.
+			// NOTE: we must call lcp.solve1() before lcp.transfer_i_to_C()
+			lcp.solve1(&scratchMem.delta_x[0], i, 0, 1);
+
+			lcp.transfer_i_to_C(i);
+		}
+		else
+		{
+			// we must push x(i) and w(i)
+			for (;;)
+			{
+				int dir;
+				btScalar dirf;
+				// find direction to push on x(i)
+				if (w[i] <= 0)
+				{
+					dir = 1;
+					dirf = btScalar(1.0);
+				}
+				else
+				{
+					dir = -1;
+					dirf = btScalar(-1.0);
+				}
+
+				// compute: delta_x(C) = -dir*A(C,C)\A(C,i)
+				lcp.solve1(&scratchMem.delta_x[0], i, dir);
+
+				// note that delta_x[i] = dirf, but we wont bother to set it
+
+				// compute: delta_w = A*delta_x ... note we only care about
+				// delta_w(N) and delta_w(i), the rest is ignored
+				lcp.pN_equals_ANC_times_qC(&scratchMem.delta_w[0], &scratchMem.delta_x[0]);
+				lcp.pN_plusequals_ANi(&scratchMem.delta_w[0], i, dir);
+				scratchMem.delta_w[i] = lcp.AiC_times_qC(i, &scratchMem.delta_x[0]) + lcp.Aii(i) * dirf;
+
+				// find largest step we can take (size=s), either to drive x(i),w(i)
+				// to the valid LCP region or to drive an already-valid variable
+				// outside the valid region.
+
+				int cmd = 1;  // index switching command
+				int si = 0;   // si = index to switch if cmd>3
+				btScalar s = -w[i] / scratchMem.delta_w[i];
+				if (dir > 0)
+				{
+					if (hi[i] < BT_INFINITY)
+					{
+						btScalar s2 = (hi[i] - x[i]) * dirf;  // was (hi[i]-x[i])/dirf	// step to x(i)=hi(i)
+						if (s2 < s)
+						{
+							s = s2;
+							cmd = 3;
+						}
+					}
+				}
+				else
+				{
+					if (lo[i] > -BT_INFINITY)
+					{
+						btScalar s2 = (lo[i] - x[i]) * dirf;  // was (lo[i]-x[i])/dirf	// step to x(i)=lo(i)
+						if (s2 < s)
+						{
+							s = s2;
+							cmd = 2;
+						}
+					}
+				}
+
+				{
+					const int numN = lcp.numN();
+					for (int k = 0; k < numN; ++k)
+					{
+						const int indexN_k = lcp.indexN(k);
+						if (!scratchMem.state[indexN_k] ? scratchMem.delta_w[indexN_k] < 0 : scratchMem.delta_w[indexN_k] > 0)
+						{
+							// don't bother checking if lo=hi=0
+							if (lo[indexN_k] == 0 && hi[indexN_k] == 0) continue;
+							btScalar s2 = -w[indexN_k] / scratchMem.delta_w[indexN_k];
+							if (s2 < s)
+							{
+								s = s2;
+								cmd = 4;
+								si = indexN_k;
+							}
+						}
+					}
+				}
+
+				{
+					const int numC = lcp.numC();
+					for (int k = adj_nub; k < numC; ++k)
+					{
+						const int indexC_k = lcp.indexC(k);
+						if (scratchMem.delta_x[indexC_k] < 0 && lo[indexC_k] > -BT_INFINITY)
+						{
+							btScalar s2 = (lo[indexC_k] - x[indexC_k]) / scratchMem.delta_x[indexC_k];
+							if (s2 < s)
+							{
+								s = s2;
+								cmd = 5;
+								si = indexC_k;
+							}
+						}
+						if (scratchMem.delta_x[indexC_k] > 0 && hi[indexC_k] < BT_INFINITY)
+						{
+							btScalar s2 = (hi[indexC_k] - x[indexC_k]) / scratchMem.delta_x[indexC_k];
+							if (s2 < s)
+							{
+								s = s2;
+								cmd = 6;
+								si = indexC_k;
+							}
+						}
+					}
+				}
+
+				//static char* cmdstring[8] = {0,"->C","->NL","->NH","N->C",
+				//			     "C->NL","C->NH"};
+				//printf ("cmd=%d (%s), si=%d\n",cmd,cmdstring[cmd],(cmd>3) ? si : i);
+
+				// if s <= 0 then we've got a problem. if we just keep going then
+				// we're going to get stuck in an infinite loop. instead, just cross
+				// our fingers and exit with the current solution.
+				if (s <= btScalar(0.0))
+				{
+					//          printf("LCP internal error, s <= 0 (s=%.4e)",(double)s);
+					if (i < n)
+					{
+						btSetZero(x + i, n - i);
+						btSetZero(w + i, n - i);
+					}
+					s_error = true;
+					break;
+				}
+
+				// apply x = x + s * delta_x
+				lcp.pC_plusequals_s_times_qC(x, s, &scratchMem.delta_x[0]);
+				x[i] += s * dirf;
+
+				// apply w = w + s * delta_w
+				lcp.pN_plusequals_s_times_qN(w, s, &scratchMem.delta_w[0]);
+				w[i] += s * scratchMem.delta_w[i];
+
+				//        void *tmpbuf;
+				// switch indexes between sets if necessary
+				switch (cmd)
+				{
+					case 1:  // done
+						w[i] = 0;
+						lcp.transfer_i_to_C(i);
+						break;
+					case 2:  // done
+						x[i] = lo[i];
+						scratchMem.state[i] = false;
+						lcp.transfer_i_to_N(i);
+						break;
+					case 3:  // done
+						x[i] = hi[i];
+						scratchMem.state[i] = true;
+						lcp.transfer_i_to_N(i);
+						break;
+					case 4:  // keep going
+						w[si] = 0;
+						lcp.transfer_i_from_N_to_C(si);
+						break;
+					case 5:  // keep going
+						x[si] = lo[si];
+						scratchMem.state[si] = false;
+						lcp.transfer_i_from_C_to_N(si, scratchMem.m_scratch);
+						break;
+					case 6:  // keep going
+						x[si] = hi[si];
+						scratchMem.state[si] = true;
+						lcp.transfer_i_from_C_to_N(si, scratchMem.m_scratch);
+						break;
+				}
+
+				if (cmd <= 3) break;
+			}  // for (;;)
+		}      // else
+
+		if (s_error)
+		{
+			break;
+		}
+	}  // for (int i=adj_nub; i<n; ++i)
+
+	lcp.unpermute();
+
+	return !s_error;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h
new file mode 100644
index 0000000..8d9b2a1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *                                                                       *
+ * Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.       *
+ * All rights reserved.  Email: russ@q12.org   Web: www.q12.org          *
+ *                                                                       *
+ * This library is free software; you can redistribute it and/or         *
+ * modify it under the terms of                                          * 
+ *   The BSD-style license that is included with this library in         *
+ *   the file LICENSE-BSD.TXT.                                           *
+ *                                                                       *
+ * This library is distributed in the hope that it will be useful,       *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files    *
+ * LICENSE.TXT and LICENSE-BSD.TXT for more details.                     *
+ *                                                                       *
+ *************************************************************************/
+
+/*
+
+given (A,b,lo,hi), solve the LCP problem: A*x = b+w, where each x(i),w(i)
+satisfies one of
+	(1) x = lo, w >= 0
+	(2) x = hi, w <= 0
+	(3) lo < x < hi, w = 0
+A is a matrix of dimension n*n, everything else is a vector of size n*1.
+lo and hi can be +/- dInfinity as needed. the first `nub' variables are
+unbounded, i.e. hi and lo are assumed to be +/- dInfinity.
+
+we restrict lo(i) <= 0 and hi(i) >= 0.
+
+the original data (A,b) may be modified by this function.
+
+if the `findex' (friction index) parameter is nonzero, it points to an array
+of index values. in this case constraints that have findex[i] >= 0 are
+special. all non-special constraints are solved for, then the lo and hi values
+for the special constraints are set:
+  hi[i] = abs( hi[i] * x[findex[i]] )
+  lo[i] = -hi[i]
+and the solution continues. this mechanism allows a friction approximation
+to be implemented. the first `nub' variables are assumed to have findex < 0.
+
+*/
+
+#ifndef _BT_LCP_H_
+#define _BT_LCP_H_
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+struct btDantzigScratchMemory
+{
+	btAlignedObjectArray<btScalar> m_scratch;
+	btAlignedObjectArray<btScalar> L;
+	btAlignedObjectArray<btScalar> d;
+	btAlignedObjectArray<btScalar> delta_w;
+	btAlignedObjectArray<btScalar> delta_x;
+	btAlignedObjectArray<btScalar> Dell;
+	btAlignedObjectArray<btScalar> ell;
+	btAlignedObjectArray<btScalar *> Arows;
+	btAlignedObjectArray<int> p;
+	btAlignedObjectArray<int> C;
+	btAlignedObjectArray<bool> state;
+};
+
+//return false if solving failed
+bool btSolveDantzigLCP(int n, btScalar *A, btScalar *x, btScalar *b, btScalar *w,
+					   int nub, btScalar *lo, btScalar *hi, int *findex, btDantzigScratchMemory &scratch);
+
+#endif  //_BT_LCP_H_
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h
new file mode 100644
index 0000000..1f66975
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h
@@ -0,0 +1,106 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#ifndef BT_DANTZIG_SOLVER_H
+#define BT_DANTZIG_SOLVER_H
+
+#include "btMLCPSolverInterface.h"
+#include "btDantzigLCP.h"
+
+class btDantzigSolver : public btMLCPSolverInterface
+{
+protected:
+	btScalar m_acceptableUpperLimitSolution;
+
+	btAlignedObjectArray<char> m_tempBuffer;
+
+	btAlignedObjectArray<btScalar> m_A;
+	btAlignedObjectArray<btScalar> m_b;
+	btAlignedObjectArray<btScalar> m_x;
+	btAlignedObjectArray<btScalar> m_lo;
+	btAlignedObjectArray<btScalar> m_hi;
+	btAlignedObjectArray<int> m_dependencies;
+	btDantzigScratchMemory m_scratchMemory;
+
+public:
+	btDantzigSolver()
+		: m_acceptableUpperLimitSolution(btScalar(1000))
+	{
+	}
+
+	virtual bool solveMLCP(const btMatrixXu& A, const btVectorXu& b, btVectorXu& x, const btVectorXu& lo, const btVectorXu& hi, const btAlignedObjectArray<int>& limitDependency, int numIterations, bool useSparsity = true)
+	{
+		bool result = true;
+		int n = b.rows();
+		if (n)
+		{
+			int nub = 0;
+			btAlignedObjectArray<btScalar> ww;
+			ww.resize(n);
+
+			const btScalar* Aptr = A.getBufferPointer();
+			m_A.resize(n * n);
+			for (int i = 0; i < n * n; i++)
+			{
+				m_A[i] = Aptr[i];
+			}
+
+			m_b.resize(n);
+			m_x.resize(n);
+			m_lo.resize(n);
+			m_hi.resize(n);
+			m_dependencies.resize(n);
+			for (int i = 0; i < n; i++)
+			{
+				m_lo[i] = lo[i];
+				m_hi[i] = hi[i];
+				m_b[i] = b[i];
+				m_x[i] = x[i];
+				m_dependencies[i] = limitDependency[i];
+			}
+
+			result = btSolveDantzigLCP(n, &m_A[0], &m_x[0], &m_b[0], &ww[0], nub, &m_lo[0], &m_hi[0], &m_dependencies[0], m_scratchMemory);
+			if (!result)
+				return result;
+
+			//			printf("numAllocas = %d\n",numAllocas);
+			for (int i = 0; i < n; i++)
+			{
+				volatile btScalar xx = m_x[i];
+				if (xx != m_x[i])
+					return false;
+				if (x[i] >= m_acceptableUpperLimitSolution)
+				{
+					return false;
+				}
+
+				if (x[i] <= -m_acceptableUpperLimitSolution)
+				{
+					return false;
+				}
+			}
+
+			for (int i = 0; i < n; i++)
+			{
+				x[i] = m_x[i];
+			}
+		}
+
+		return result;
+	}
+};
+
+#endif  //BT_DANTZIG_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp
new file mode 100644
index 0000000..1007d04
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp
@@ -0,0 +1,393 @@
+/* Copyright (C) 2004-2013 MBSim Development Team
+
+Code was converted for the Bullet Continuous Collision Detection and Physics Library
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//The original version is here
+//https://code.google.com/p/mbsim-env/source/browse/trunk/kernel/mbsim/numerics/linear_complementarity_problem/lemke_algorithm.cc
+//This file is re-distributed under the ZLib license, with permission of the original author
+//Math library was replaced from fmatvec to a the file src/LinearMath/btMatrixX.h
+//STL/std::vector replaced by btAlignedObjectArray
+
+#include "btLemkeAlgorithm.h"
+
+#undef BT_DEBUG_OSTREAM
+#ifdef BT_DEBUG_OSTREAM
+using namespace std;
+#endif  //BT_DEBUG_OSTREAM
+
+btScalar btMachEps()
+{
+	static bool calculated = false;
+	static btScalar machEps = btScalar(1.);
+	if (!calculated)
+	{
+		do
+		{
+			machEps /= btScalar(2.0);
+			// If next epsilon yields 1, then break, because current
+			// epsilon is the machine epsilon.
+		} while ((btScalar)(1.0 + (machEps / btScalar(2.0))) != btScalar(1.0));
+		//		printf( "\nCalculated Machine epsilon: %G\n", machEps );
+		calculated = true;
+	}
+	return machEps;
+}
+
+btScalar btEpsRoot()
+{
+	static btScalar epsroot = 0.;
+	static bool alreadyCalculated = false;
+
+	if (!alreadyCalculated)
+	{
+		epsroot = btSqrt(btMachEps());
+		alreadyCalculated = true;
+	}
+	return epsroot;
+}
+
+btVectorXu btLemkeAlgorithm::solve(unsigned int maxloops /* = 0*/)
+{
+	steps = 0;
+
+	int dim = m_q.size();
+#ifdef BT_DEBUG_OSTREAM
+	if (DEBUGLEVEL >= 1)
+	{
+		cout << "Dimension = " << dim << endl;
+	}
+#endif  //BT_DEBUG_OSTREAM
+
+	btVectorXu solutionVector(2 * dim);
+	solutionVector.setZero();
+
+	//, INIT, 0.);
+
+	btMatrixXu ident(dim, dim);
+	ident.setIdentity();
+#ifdef BT_DEBUG_OSTREAM
+	cout << m_M << std::endl;
+#endif
+
+	btMatrixXu mNeg = m_M.negative();
+
+	btMatrixXu A(dim, 2 * dim + 2);
+	//
+	A.setSubMatrix(0, 0, dim - 1, dim - 1, ident);
+	A.setSubMatrix(0, dim, dim - 1, 2 * dim - 1, mNeg);
+	A.setSubMatrix(0, 2 * dim, dim - 1, 2 * dim, -1.f);
+	A.setSubMatrix(0, 2 * dim + 1, dim - 1, 2 * dim + 1, m_q);
+
+#ifdef BT_DEBUG_OSTREAM
+	cout << A << std::endl;
+#endif  //BT_DEBUG_OSTREAM
+
+	//   btVectorXu q_;
+	//   q_ >> A(0, 2 * dim + 1, dim - 1, 2 * dim + 1);
+
+	btAlignedObjectArray<int> basis;
+	//At first, all w-values are in the basis
+	for (int i = 0; i < dim; i++)
+		basis.push_back(i);
+
+	int pivotRowIndex = -1;
+	btScalar minValue = 1e30f;
+	bool greaterZero = true;
+	for (int i = 0; i < dim; i++)
+	{
+		btScalar v = A(i, 2 * dim + 1);
+		if (v < minValue)
+		{
+			minValue = v;
+			pivotRowIndex = i;
+		}
+		if (v < 0)
+			greaterZero = false;
+	}
+
+	//  int pivotRowIndex = q_.minIndex();//minIndex(q_);     // first row is that with lowest q-value
+	int z0Row = pivotRowIndex;    // remember the col of z0 for ending algorithm afterwards
+	int pivotColIndex = 2 * dim;  // first col is that of z0
+
+#ifdef BT_DEBUG_OSTREAM
+	if (DEBUGLEVEL >= 3)
+	{
+		//  cout << "A: " << A << endl;
+		cout << "pivotRowIndex " << pivotRowIndex << endl;
+		cout << "pivotColIndex " << pivotColIndex << endl;
+		cout << "Basis: ";
+		for (int i = 0; i < basis.size(); i++)
+			cout << basis[i] << " ";
+		cout << endl;
+	}
+#endif  //BT_DEBUG_OSTREAM
+
+	if (!greaterZero)
+	{
+		if (maxloops == 0)
+		{
+			maxloops = 100;
+			//        maxloops = UINT_MAX; //TODO: not a really nice way, problem is: maxloops should be 2^dim (=1<<dim), but this could exceed UINT_MAX and thus the result would be 0 and therefore the lemke algorithm wouldn't start but probably would find a solution within less then UINT_MAX steps. Therefore this constant is used as a upper border right now...
+		}
+
+		/*start looping*/
+		for (steps = 0; steps < maxloops; steps++)
+		{
+			GaussJordanEliminationStep(A, pivotRowIndex, pivotColIndex, basis);
+#ifdef BT_DEBUG_OSTREAM
+			if (DEBUGLEVEL >= 3)
+			{
+				//  cout << "A: " << A << endl;
+				cout << "pivotRowIndex " << pivotRowIndex << endl;
+				cout << "pivotColIndex " << pivotColIndex << endl;
+				cout << "Basis: ";
+				for (int i = 0; i < basis.size(); i++)
+					cout << basis[i] << " ";
+				cout << endl;
+			}
+#endif  //BT_DEBUG_OSTREAM
+
+			int pivotColIndexOld = pivotColIndex;
+
+			/*find new column index */
+			if (basis[pivotRowIndex] < dim)  //if a w-value left the basis get in the correspondent z-value
+				pivotColIndex = basis[pivotRowIndex] + dim;
+			else
+				//else do it the other way round and get in the corresponding w-value
+				pivotColIndex = basis[pivotRowIndex] - dim;
+
+			/*the column becomes part of the basis*/
+			basis[pivotRowIndex] = pivotColIndexOld;
+			bool isRayTermination = false;
+			pivotRowIndex = findLexicographicMinimum(A, pivotColIndex, z0Row, isRayTermination);
+			if (isRayTermination)
+			{
+				break; // ray termination
+			}
+			if (z0Row == pivotRowIndex)
+			{  //if z0 leaves the basis the solution is found --> one last elimination step is necessary
+				GaussJordanEliminationStep(A, pivotRowIndex, pivotColIndex, basis);
+				basis[pivotRowIndex] = pivotColIndex;  //update basis
+				break;
+			}
+		}
+#ifdef BT_DEBUG_OSTREAM
+		if (DEBUGLEVEL >= 1)
+		{
+			cout << "Number of loops: " << steps << endl;
+			cout << "Number of maximal loops: " << maxloops << endl;
+		}
+#endif  //BT_DEBUG_OSTREAM
+
+		if (!validBasis(basis))
+		{
+			info = -1;
+#ifdef BT_DEBUG_OSTREAM
+			if (DEBUGLEVEL >= 1)
+				cerr << "Lemke-Algorithm ended with Ray-Termination (no valid solution)." << endl;
+#endif  //BT_DEBUG_OSTREAM
+
+			return solutionVector;
+		}
+	}
+#ifdef BT_DEBUG_OSTREAM
+	if (DEBUGLEVEL >= 2)
+	{
+		// cout << "A: " << A << endl;
+		cout << "pivotRowIndex " << pivotRowIndex << endl;
+		cout << "pivotColIndex " << pivotColIndex << endl;
+	}
+#endif  //BT_DEBUG_OSTREAM
+
+	for (int i = 0; i < basis.size(); i++)
+	{
+		solutionVector[basis[i]] = A(i, 2 * dim + 1);  //q_[i];
+	}
+
+	info = 0;
+
+	return solutionVector;
+}
+
+int btLemkeAlgorithm::findLexicographicMinimum(const btMatrixXu& A, const int& pivotColIndex, const int& z0Row, bool& isRayTermination)
+{
+	isRayTermination = false;
+	btAlignedObjectArray<int> activeRows;
+
+        bool firstRow = true;
+	btScalar currentMin = 0.0;
+
+	int dim = A.rows();
+
+	for (int row = 0; row < dim; row++)
+	{
+		const btScalar denom = A(row, pivotColIndex);
+
+		if (denom > btMachEps())
+		{
+			const btScalar q = A(row, dim + dim + 1) / denom;
+			if (firstRow)
+			{
+				currentMin = q;
+				activeRows.push_back(row);
+				firstRow = false;
+			}
+			else if (fabs(currentMin - q) < btMachEps())
+			{
+				activeRows.push_back(row);
+			}
+			else if (currentMin > q)
+			{
+				currentMin = q;
+				activeRows.clear();
+				activeRows.push_back(row);
+			}
+		}
+	}
+
+	if (activeRows.size() == 0)
+	{
+		isRayTermination = true;
+		return 0;
+	}
+	else if (activeRows.size() == 1)
+	{
+		return activeRows[0];
+	}
+
+	// if there are multiple rows, check if they contain the row for z_0.
+	for (int i = 0; i < activeRows.size(); i++)
+	{
+		if (activeRows[i] == z0Row)
+		{
+			return z0Row;
+		}
+	}
+
+	// look through the columns of the inverse of the basic matrix from left to right until the tie is broken.
+	for (int col = 0; col < dim ; col++)
+	{
+		btAlignedObjectArray<int> activeRowsCopy(activeRows);
+		activeRows.clear();
+		firstRow = true;
+		for (int i = 0; i<activeRowsCopy.size();i++)
+		{
+			const int row = activeRowsCopy[i];
+
+			// denom is positive here as an invariant.
+			const btScalar denom = A(row, pivotColIndex);
+			const btScalar ratio = A(row, col) / denom;
+			if (firstRow)
+			{
+				currentMin = ratio;
+				activeRows.push_back(row);
+				firstRow = false;
+			}
+			else if (fabs(currentMin - ratio) < btMachEps())
+			{
+				activeRows.push_back(row);
+			}
+			else if (currentMin > ratio)
+			{
+				currentMin = ratio;
+				activeRows.clear();
+				activeRows.push_back(row);
+			}
+		}
+
+		if (activeRows.size() == 1)
+		{
+			return activeRows[0];
+		}
+	}
+	// must not reach here.
+	isRayTermination = true;
+	return 0;
+}
+
+void btLemkeAlgorithm::GaussJordanEliminationStep(btMatrixXu& A, int pivotRowIndex, int pivotColumnIndex, const btAlignedObjectArray<int>& basis)
+{
+	btScalar a = -1 / A(pivotRowIndex, pivotColumnIndex);
+#ifdef BT_DEBUG_OSTREAM
+	cout << A << std::endl;
+#endif
+
+	for (int i = 0; i < A.rows(); i++)
+	{
+		if (i != pivotRowIndex)
+		{
+			for (int j = 0; j < A.cols(); j++)
+			{
+				if (j != pivotColumnIndex)
+				{
+					btScalar v = A(i, j);
+					v += A(pivotRowIndex, j) * A(i, pivotColumnIndex) * a;
+					A.setElem(i, j, v);
+				}
+			}
+		}
+	}
+
+#ifdef BT_DEBUG_OSTREAM
+	cout << A << std::endl;
+#endif  //BT_DEBUG_OSTREAM
+	for (int i = 0; i < A.cols(); i++)
+	{
+		A.mulElem(pivotRowIndex, i, -a);
+	}
+#ifdef BT_DEBUG_OSTREAM
+	cout << A << std::endl;
+#endif  //#ifdef BT_DEBUG_OSTREAM
+
+	for (int i = 0; i < A.rows(); i++)
+	{
+		if (i != pivotRowIndex)
+		{
+			A.setElem(i, pivotColumnIndex, 0);
+		}
+	}
+#ifdef BT_DEBUG_OSTREAM
+	cout << A << std::endl;
+#endif  //#ifdef BT_DEBUG_OSTREAM
+}
+
+bool btLemkeAlgorithm::greaterZero(const btVectorXu& vector)
+{
+	bool isGreater = true;
+	for (int i = 0; i < vector.size(); i++)
+	{
+		if (vector[i] < 0)
+		{
+			isGreater = false;
+			break;
+		}
+	}
+
+	return isGreater;
+}
+
+bool btLemkeAlgorithm::validBasis(const btAlignedObjectArray<int>& basis)
+{
+	bool isValid = true;
+	for (int i = 0; i < basis.size(); i++)
+	{
+		if (basis[i] >= basis.size() * 2)
+		{  //then z0 is in the base
+			isValid = false;
+			break;
+		}
+	}
+
+	return isValid;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h
new file mode 100644
index 0000000..6c498dd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h
@@ -0,0 +1,101 @@
+/* Copyright (C) 2004-2013 MBSim Development Team
+
+Code was converted for the Bullet Continuous Collision Detection and Physics Library
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+//The original version is here
+//https://code.google.com/p/mbsim-env/source/browse/trunk/kernel/mbsim/numerics/linear_complementarity_problem/lemke_algorithm.cc
+//This file is re-distributed under the ZLib license, with permission of the original author (Kilian Grundl)
+//Math library was replaced from fmatvec to a the file src/LinearMath/btMatrixX.h
+//STL/std::vector replaced by btAlignedObjectArray
+
+#ifndef BT_NUMERICS_LEMKE_ALGORITHM_H_
+#define BT_NUMERICS_LEMKE_ALGORITHM_H_
+
+#include "LinearMath/btMatrixX.h"
+
+#include <vector>  //todo: replace by btAlignedObjectArray
+
+class btLemkeAlgorithm
+{
+public:
+	btLemkeAlgorithm(const btMatrixXu& M_, const btVectorXu& q_, const int& DEBUGLEVEL_ = 0) : DEBUGLEVEL(DEBUGLEVEL_)
+	{
+		setSystem(M_, q_);
+	}
+
+	/* GETTER / SETTER */
+	/**
+   * \brief return info of solution process
+   */
+	int getInfo()
+	{
+		return info;
+	}
+
+	/**
+   * \brief get the number of steps until the solution was found
+   */
+	int getSteps(void)
+	{
+		return steps;
+	}
+
+	/**
+   * \brief set system with Matrix M and vector q
+   */
+	void setSystem(const btMatrixXu& M_, const btVectorXu& q_)
+	{
+		m_M = M_;
+		m_q = q_;
+	}
+	/***************************************************/
+
+	/**
+   * \brief solve algorithm adapted from : Fast Implementation of Lemke’s Algorithm for Rigid Body Contact Simulation (John E. Lloyd)
+   */
+	btVectorXu solve(unsigned int maxloops = 0);
+
+	virtual ~btLemkeAlgorithm()
+	{
+	}
+
+protected:
+	int findLexicographicMinimum(const btMatrixXu& A, const int& pivotColIndex, const int& z0Row, bool& isRayTermination);
+	void GaussJordanEliminationStep(btMatrixXu& A, int pivotRowIndex, int pivotColumnIndex, const btAlignedObjectArray<int>& basis);
+	bool greaterZero(const btVectorXu& vector);
+	bool validBasis(const btAlignedObjectArray<int>& basis);
+
+	btMatrixXu m_M;
+	btVectorXu m_q;
+
+	/**
+   * \brief number of steps until the Lemke algorithm found a solution
+   */
+	unsigned int steps;
+
+	/**
+   * \brief define level of debug output
+   */
+	int DEBUGLEVEL;
+
+	/**
+   * \brief did the algorithm find a solution
+   *
+   * -1 : not successful
+   *  0 : successful
+   */
+	int info;
+};
+
+#endif /* BT_NUMERICS_LEMKE_ALGORITHM_H_ */
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h
new file mode 100644
index 0000000..f18c4ea
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h
@@ -0,0 +1,338 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#ifndef BT_LEMKE_SOLVER_H
+#define BT_LEMKE_SOLVER_H
+
+#include "btMLCPSolverInterface.h"
+#include "btLemkeAlgorithm.h"
+
+///The btLemkeSolver is based on "Fast Implementation of Lemke’s Algorithm for Rigid Body Contact Simulation (John E. Lloyd) "
+///It is a slower but more accurate solver. Increase the m_maxLoops for better convergence, at the cost of more CPU time.
+///The original implementation of the btLemkeAlgorithm was done by Kilian Grundl from the MBSim team
+class btLemkeSolver : public btMLCPSolverInterface
+{
+protected:
+public:
+	btScalar m_maxValue;
+	int m_debugLevel;
+	int m_maxLoops;
+	bool m_useLoHighBounds;
+
+	btLemkeSolver()
+		: m_maxValue(100000),
+		  m_debugLevel(0),
+		  m_maxLoops(1000),
+		  m_useLoHighBounds(true)
+	{
+	}
+	virtual bool solveMLCP(const btMatrixXu& A, const btVectorXu& b, btVectorXu& x, const btVectorXu& lo, const btVectorXu& hi, const btAlignedObjectArray<int>& limitDependency, int numIterations, bool useSparsity = true)
+	{
+		if (m_useLoHighBounds)
+		{
+			BT_PROFILE("btLemkeSolver::solveMLCP");
+			int n = A.rows();
+			if (0 == n)
+				return true;
+
+			bool fail = false;
+
+			btVectorXu solution(n);
+			btVectorXu q1;
+			q1.resize(n);
+			for (int row = 0; row < n; row++)
+			{
+				q1[row] = -b[row];
+			}
+
+			//		cout << "A" << endl;
+			//		cout << A << endl;
+
+			/////////////////////////////////////
+
+			//slow matrix inversion, replace with LU decomposition
+			btMatrixXu A1;
+			btMatrixXu B(n, n);
+			{
+				//BT_PROFILE("inverse(slow)");
+				A1.resize(A.rows(), A.cols());
+				for (int row = 0; row < A.rows(); row++)
+				{
+					for (int col = 0; col < A.cols(); col++)
+					{
+						A1.setElem(row, col, A(row, col));
+					}
+				}
+
+				btMatrixXu matrix;
+				matrix.resize(n, 2 * n);
+				for (int row = 0; row < n; row++)
+				{
+					for (int col = 0; col < n; col++)
+					{
+						matrix.setElem(row, col, A1(row, col));
+					}
+				}
+
+				btScalar ratio, a;
+				int i, j, k;
+				for (i = 0; i < n; i++)
+				{
+					for (j = n; j < 2 * n; j++)
+					{
+						if (i == (j - n))
+							matrix.setElem(i, j, 1.0);
+						else
+							matrix.setElem(i, j, 0.0);
+					}
+				}
+				for (i = 0; i < n; i++)
+				{
+					for (j = 0; j < n; j++)
+					{
+						if (i != j)
+						{
+							btScalar v = matrix(i, i);
+							if (btFuzzyZero(v))
+							{
+								a = 0.000001f;
+							}
+							ratio = matrix(j, i) / matrix(i, i);
+							for (k = 0; k < 2 * n; k++)
+							{
+								matrix.addElem(j, k, -ratio * matrix(i, k));
+							}
+						}
+					}
+				}
+				for (i = 0; i < n; i++)
+				{
+					a = matrix(i, i);
+					if (btFuzzyZero(a))
+					{
+						a = 0.000001f;
+					}
+					btScalar invA = 1.f / a;
+					for (j = 0; j < 2 * n; j++)
+					{
+						matrix.mulElem(i, j, invA);
+					}
+				}
+
+				for (int row = 0; row < n; row++)
+				{
+					for (int col = 0; col < n; col++)
+					{
+						B.setElem(row, col, matrix(row, n + col));
+					}
+				}
+			}
+
+			btMatrixXu b1(n, 1);
+
+			btMatrixXu M(n * 2, n * 2);
+			for (int row = 0; row < n; row++)
+			{
+				b1.setElem(row, 0, -b[row]);
+				for (int col = 0; col < n; col++)
+				{
+					btScalar v = B(row, col);
+					M.setElem(row, col, v);
+					M.setElem(n + row, n + col, v);
+					M.setElem(n + row, col, -v);
+					M.setElem(row, n + col, -v);
+				}
+			}
+
+			btMatrixXu Bb1 = B * b1;
+			//		q = [ (-B*b1 - lo)'   (hi + B*b1)' ]'
+
+			btVectorXu qq;
+			qq.resize(n * 2);
+			for (int row = 0; row < n; row++)
+			{
+				qq[row] = -Bb1(row, 0) - lo[row];
+				qq[n + row] = Bb1(row, 0) + hi[row];
+			}
+
+			btVectorXu z1;
+
+			btMatrixXu y1;
+			y1.resize(n, 1);
+			btLemkeAlgorithm lemke(M, qq, m_debugLevel);
+			{
+				//BT_PROFILE("lemke.solve");
+				lemke.setSystem(M, qq);
+				z1 = lemke.solve(m_maxLoops);
+			}
+			for (int row = 0; row < n; row++)
+			{
+				y1.setElem(row, 0, z1[2 * n + row] - z1[3 * n + row]);
+			}
+			btMatrixXu y1_b1(n, 1);
+			for (int i = 0; i < n; i++)
+			{
+				y1_b1.setElem(i, 0, y1(i, 0) - b1(i, 0));
+			}
+
+			btMatrixXu x1;
+
+			x1 = B * (y1_b1);
+
+			for (int row = 0; row < n; row++)
+			{
+				solution[row] = x1(row, 0);  //n];
+			}
+
+			int errorIndexMax = -1;
+			int errorIndexMin = -1;
+			float errorValueMax = -1e30;
+			float errorValueMin = 1e30;
+
+			for (int i = 0; i < n; i++)
+			{
+				x[i] = solution[i];
+				volatile btScalar check = x[i];
+				if (x[i] != check)
+				{
+					//printf("Lemke result is #NAN\n");
+					x.setZero();
+					return false;
+				}
+
+				//this is some hack/safety mechanism, to discard invalid solutions from the Lemke solver
+				//we need to figure out why it happens, and fix it, or detect it properly)
+				if (x[i] > m_maxValue)
+				{
+					if (x[i] > errorValueMax)
+					{
+						fail = true;
+						errorIndexMax = i;
+						errorValueMax = x[i];
+					}
+					////printf("x[i] = %f,",x[i]);
+				}
+				if (x[i] < -m_maxValue)
+				{
+					if (x[i] < errorValueMin)
+					{
+						errorIndexMin = i;
+						errorValueMin = x[i];
+						fail = true;
+						//printf("x[i] = %f,",x[i]);
+					}
+				}
+			}
+			if (fail)
+			{
+				int m_errorCountTimes = 0;
+				if (errorIndexMin < 0)
+					errorValueMin = 0.f;
+				if (errorIndexMax < 0)
+					errorValueMax = 0.f;
+				m_errorCountTimes++;
+				//	printf("Error (x[%d] = %f, x[%d] = %f), resetting %d times\n", errorIndexMin,errorValueMin, errorIndexMax, errorValueMax, errorCountTimes++);
+				for (int i = 0; i < n; i++)
+				{
+					x[i] = 0.f;
+				}
+			}
+			return !fail;
+		}
+		else
+
+		{
+			int dimension = A.rows();
+			if (0 == dimension)
+				return true;
+
+			//		printf("================ solving using Lemke/Newton/Fixpoint\n");
+
+			btVectorXu q;
+			q.resize(dimension);
+			for (int row = 0; row < dimension; row++)
+			{
+				q[row] = -b[row];
+			}
+
+			btLemkeAlgorithm lemke(A, q, m_debugLevel);
+
+			lemke.setSystem(A, q);
+
+			btVectorXu solution = lemke.solve(m_maxLoops);
+
+			//check solution
+
+			bool fail = false;
+			int errorIndexMax = -1;
+			int errorIndexMin = -1;
+			float errorValueMax = -1e30;
+			float errorValueMin = 1e30;
+
+			for (int i = 0; i < dimension; i++)
+			{
+				x[i] = solution[i + dimension];
+				volatile btScalar check = x[i];
+				if (x[i] != check)
+				{
+					x.setZero();
+					return false;
+				}
+
+				//this is some hack/safety mechanism, to discard invalid solutions from the Lemke solver
+				//we need to figure out why it happens, and fix it, or detect it properly)
+				if (x[i] > m_maxValue)
+				{
+					if (x[i] > errorValueMax)
+					{
+						fail = true;
+						errorIndexMax = i;
+						errorValueMax = x[i];
+					}
+					////printf("x[i] = %f,",x[i]);
+				}
+				if (x[i] < -m_maxValue)
+				{
+					if (x[i] < errorValueMin)
+					{
+						errorIndexMin = i;
+						errorValueMin = x[i];
+						fail = true;
+						//printf("x[i] = %f,",x[i]);
+					}
+				}
+			}
+			if (fail)
+			{
+				static int errorCountTimes = 0;
+				if (errorIndexMin < 0)
+					errorValueMin = 0.f;
+				if (errorIndexMax < 0)
+					errorValueMax = 0.f;
+				printf("Error (x[%d] = %f, x[%d] = %f), resetting %d times\n", errorIndexMin, errorValueMin, errorIndexMax, errorValueMax, errorCountTimes++);
+				for (int i = 0; i < dimension; i++)
+				{
+					x[i] = 0.f;
+				}
+			}
+
+			return !fail;
+		}
+		return true;
+	}
+};
+
+#endif  //BT_LEMKE_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp
new file mode 100644
index 0000000..ed4e0b6
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp
@@ -0,0 +1,620 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#include "btMLCPSolver.h"
+#include "LinearMath/btMatrixX.h"
+#include "LinearMath/btQuickprof.h"
+#include "btSolveProjectedGaussSeidel.h"
+
+btMLCPSolver::btMLCPSolver(btMLCPSolverInterface* solver)
+	: m_solver(solver),
+	  m_fallback(0)
+{
+}
+
+btMLCPSolver::~btMLCPSolver()
+{
+}
+
+bool gUseMatrixMultiply = false;
+bool interleaveContactAndFriction = false;
+
+btScalar btMLCPSolver::solveGroupCacheFriendlySetup(btCollisionObject** bodies, int numBodiesUnUsed, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(bodies, numBodiesUnUsed, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+	{
+		BT_PROFILE("gather constraint data");
+
+		int numFrictionPerContact = m_tmpSolverContactConstraintPool.size() == m_tmpSolverContactFrictionConstraintPool.size() ? 1 : 2;
+
+		//	int numBodies = m_tmpSolverBodyPool.size();
+		m_allConstraintPtrArray.resize(0);
+		m_limitDependencies.resize(m_tmpSolverNonContactConstraintPool.size() + m_tmpSolverContactConstraintPool.size() + m_tmpSolverContactFrictionConstraintPool.size());
+		btAssert(m_limitDependencies.size() == m_tmpSolverNonContactConstraintPool.size() + m_tmpSolverContactConstraintPool.size() + m_tmpSolverContactFrictionConstraintPool.size());
+		//	printf("m_limitDependencies.size() = %d\n",m_limitDependencies.size());
+
+		int dindex = 0;
+		for (int i = 0; i < m_tmpSolverNonContactConstraintPool.size(); i++)
+		{
+			m_allConstraintPtrArray.push_back(&m_tmpSolverNonContactConstraintPool[i]);
+			m_limitDependencies[dindex++] = -1;
+		}
+
+		///The btSequentialImpulseConstraintSolver moves all friction constraints at the very end, we can also interleave them instead
+
+		int firstContactConstraintOffset = dindex;
+
+		if (interleaveContactAndFriction)
+		{
+			for (int i = 0; i < m_tmpSolverContactConstraintPool.size(); i++)
+			{
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactConstraintPool[i]);
+				m_limitDependencies[dindex++] = -1;
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactFrictionConstraintPool[i * numFrictionPerContact]);
+				int findex = (m_tmpSolverContactFrictionConstraintPool[i * numFrictionPerContact].m_frictionIndex * (1 + numFrictionPerContact));
+				m_limitDependencies[dindex++] = findex + firstContactConstraintOffset;
+				if (numFrictionPerContact == 2)
+				{
+					m_allConstraintPtrArray.push_back(&m_tmpSolverContactFrictionConstraintPool[i * numFrictionPerContact + 1]);
+					m_limitDependencies[dindex++] = findex + firstContactConstraintOffset;
+				}
+			}
+		}
+		else
+		{
+			for (int i = 0; i < m_tmpSolverContactConstraintPool.size(); i++)
+			{
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactConstraintPool[i]);
+				m_limitDependencies[dindex++] = -1;
+			}
+			for (int i = 0; i < m_tmpSolverContactFrictionConstraintPool.size(); i++)
+			{
+				m_allConstraintPtrArray.push_back(&m_tmpSolverContactFrictionConstraintPool[i]);
+				m_limitDependencies[dindex++] = m_tmpSolverContactFrictionConstraintPool[i].m_frictionIndex + firstContactConstraintOffset;
+			}
+		}
+
+		if (!m_allConstraintPtrArray.size())
+		{
+			m_A.resize(0, 0);
+			m_b.resize(0);
+			m_x.resize(0);
+			m_lo.resize(0);
+			m_hi.resize(0);
+			return 0.f;
+		}
+	}
+
+	if (gUseMatrixMultiply)
+	{
+		BT_PROFILE("createMLCP");
+		createMLCP(infoGlobal);
+	}
+	else
+	{
+		BT_PROFILE("createMLCPFast");
+		createMLCPFast(infoGlobal);
+	}
+
+	return 0.f;
+}
+
+bool btMLCPSolver::solveMLCP(const btContactSolverInfo& infoGlobal)
+{
+	bool result = true;
+
+	if (m_A.rows() == 0)
+		return true;
+
+	//if using split impulse, we solve 2 separate (M)LCPs
+	if (infoGlobal.m_splitImpulse)
+	{
+		btMatrixXu Acopy = m_A;
+		btAlignedObjectArray<int> limitDependenciesCopy = m_limitDependencies;
+		//		printf("solve first LCP\n");
+		result = m_solver->solveMLCP(m_A, m_b, m_x, m_lo, m_hi, m_limitDependencies, infoGlobal.m_numIterations);
+		if (result)
+			result = m_solver->solveMLCP(Acopy, m_bSplit, m_xSplit, m_lo, m_hi, limitDependenciesCopy, infoGlobal.m_numIterations);
+	}
+	else
+	{
+		result = m_solver->solveMLCP(m_A, m_b, m_x, m_lo, m_hi, m_limitDependencies, infoGlobal.m_numIterations);
+	}
+	return result;
+}
+
+struct btJointNode
+{
+	int jointIndex;          // pointer to enclosing dxJoint object
+	int otherBodyIndex;      // *other* body this joint is connected to
+	int nextJointNodeIndex;  //-1 for null
+	int constraintRowIndex;
+};
+
+void btMLCPSolver::createMLCPFast(const btContactSolverInfo& infoGlobal)
+{
+	int numContactRows = interleaveContactAndFriction ? 3 : 1;
+
+	int numConstraintRows = m_allConstraintPtrArray.size();
+	int n = numConstraintRows;
+	{
+		BT_PROFILE("init b (rhs)");
+		m_b.resize(numConstraintRows);
+		m_bSplit.resize(numConstraintRows);
+		m_b.setZero();
+		m_bSplit.setZero();
+		for (int i = 0; i < numConstraintRows; i++)
+		{
+			btScalar jacDiag = m_allConstraintPtrArray[i]->m_jacDiagABInv;
+			if (!btFuzzyZero(jacDiag))
+			{
+				btScalar rhs = m_allConstraintPtrArray[i]->m_rhs;
+				btScalar rhsPenetration = m_allConstraintPtrArray[i]->m_rhsPenetration;
+				m_b[i] = rhs / jacDiag;
+				m_bSplit[i] = rhsPenetration / jacDiag;
+			}
+		}
+	}
+
+	//	btScalar* w = 0;
+	//	int nub = 0;
+
+	m_lo.resize(numConstraintRows);
+	m_hi.resize(numConstraintRows);
+
+	{
+		BT_PROFILE("init lo/ho");
+
+		for (int i = 0; i < numConstraintRows; i++)
+		{
+			if (0)  //m_limitDependencies[i]>=0)
+			{
+				m_lo[i] = -BT_INFINITY;
+				m_hi[i] = BT_INFINITY;
+			}
+			else
+			{
+				m_lo[i] = m_allConstraintPtrArray[i]->m_lowerLimit;
+				m_hi[i] = m_allConstraintPtrArray[i]->m_upperLimit;
+			}
+		}
+	}
+
+	//
+	int m = m_allConstraintPtrArray.size();
+
+	int numBodies = m_tmpSolverBodyPool.size();
+	btAlignedObjectArray<int> bodyJointNodeArray;
+	{
+		BT_PROFILE("bodyJointNodeArray.resize");
+		bodyJointNodeArray.resize(numBodies, -1);
+	}
+	btAlignedObjectArray<btJointNode> jointNodeArray;
+	{
+		BT_PROFILE("jointNodeArray.reserve");
+		jointNodeArray.reserve(2 * m_allConstraintPtrArray.size());
+	}
+
+	btMatrixXu& J3 = m_scratchJ3;
+	{
+		BT_PROFILE("J3.resize");
+		J3.resize(2 * m, 8);
+	}
+	btMatrixXu& JinvM3 = m_scratchJInvM3;
+	{
+		BT_PROFILE("JinvM3.resize/setZero");
+
+		JinvM3.resize(2 * m, 8);
+		JinvM3.setZero();
+		J3.setZero();
+	}
+	int cur = 0;
+	int rowOffset = 0;
+	btAlignedObjectArray<int>& ofs = m_scratchOfs;
+	{
+		BT_PROFILE("ofs resize");
+		ofs.resize(0);
+		ofs.resizeNoInitialize(m_allConstraintPtrArray.size());
+	}
+	{
+		BT_PROFILE("Compute J and JinvM");
+		int c = 0;
+
+		int numRows = 0;
+
+		for (int i = 0; i < m_allConstraintPtrArray.size(); i += numRows, c++)
+		{
+			ofs[c] = rowOffset;
+			int sbA = m_allConstraintPtrArray[i]->m_solverBodyIdA;
+			int sbB = m_allConstraintPtrArray[i]->m_solverBodyIdB;
+			btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody;
+			btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody;
+
+			numRows = i < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[c].m_numConstraintRows : numContactRows;
+			if (orgBodyA)
+			{
+				{
+					int slotA = -1;
+					//find free jointNode slot for sbA
+					slotA = jointNodeArray.size();
+					jointNodeArray.expand();  //NonInitializing();
+					int prevSlot = bodyJointNodeArray[sbA];
+					bodyJointNodeArray[sbA] = slotA;
+					jointNodeArray[slotA].nextJointNodeIndex = prevSlot;
+					jointNodeArray[slotA].jointIndex = c;
+					jointNodeArray[slotA].constraintRowIndex = i;
+					jointNodeArray[slotA].otherBodyIndex = orgBodyB ? sbB : -1;
+				}
+				for (int row = 0; row < numRows; row++, cur++)
+				{
+					btVector3 normalInvMass = m_allConstraintPtrArray[i + row]->m_contactNormal1 * orgBodyA->getInvMass();
+					btVector3 relPosCrossNormalInvInertia = m_allConstraintPtrArray[i + row]->m_relpos1CrossNormal * orgBodyA->getInvInertiaTensorWorld();
+
+					for (int r = 0; r < 3; r++)
+					{
+						J3.setElem(cur, r, m_allConstraintPtrArray[i + row]->m_contactNormal1[r]);
+						J3.setElem(cur, r + 4, m_allConstraintPtrArray[i + row]->m_relpos1CrossNormal[r]);
+						JinvM3.setElem(cur, r, normalInvMass[r]);
+						JinvM3.setElem(cur, r + 4, relPosCrossNormalInvInertia[r]);
+					}
+					J3.setElem(cur, 3, 0);
+					JinvM3.setElem(cur, 3, 0);
+					J3.setElem(cur, 7, 0);
+					JinvM3.setElem(cur, 7, 0);
+				}
+			}
+			else
+			{
+				cur += numRows;
+			}
+			if (orgBodyB)
+			{
+				{
+					int slotB = -1;
+					//find free jointNode slot for sbA
+					slotB = jointNodeArray.size();
+					jointNodeArray.expand();  //NonInitializing();
+					int prevSlot = bodyJointNodeArray[sbB];
+					bodyJointNodeArray[sbB] = slotB;
+					jointNodeArray[slotB].nextJointNodeIndex = prevSlot;
+					jointNodeArray[slotB].jointIndex = c;
+					jointNodeArray[slotB].otherBodyIndex = orgBodyA ? sbA : -1;
+					jointNodeArray[slotB].constraintRowIndex = i;
+				}
+
+				for (int row = 0; row < numRows; row++, cur++)
+				{
+					btVector3 normalInvMassB = m_allConstraintPtrArray[i + row]->m_contactNormal2 * orgBodyB->getInvMass();
+					btVector3 relPosInvInertiaB = m_allConstraintPtrArray[i + row]->m_relpos2CrossNormal * orgBodyB->getInvInertiaTensorWorld();
+
+					for (int r = 0; r < 3; r++)
+					{
+						J3.setElem(cur, r, m_allConstraintPtrArray[i + row]->m_contactNormal2[r]);
+						J3.setElem(cur, r + 4, m_allConstraintPtrArray[i + row]->m_relpos2CrossNormal[r]);
+						JinvM3.setElem(cur, r, normalInvMassB[r]);
+						JinvM3.setElem(cur, r + 4, relPosInvInertiaB[r]);
+					}
+					J3.setElem(cur, 3, 0);
+					JinvM3.setElem(cur, 3, 0);
+					J3.setElem(cur, 7, 0);
+					JinvM3.setElem(cur, 7, 0);
+				}
+			}
+			else
+			{
+				cur += numRows;
+			}
+			rowOffset += numRows;
+		}
+	}
+
+	//compute JinvM = J*invM.
+	const btScalar* JinvM = JinvM3.getBufferPointer();
+
+	const btScalar* Jptr = J3.getBufferPointer();
+	{
+		BT_PROFILE("m_A.resize");
+		m_A.resize(n, n);
+	}
+
+	{
+		BT_PROFILE("m_A.setZero");
+		m_A.setZero();
+	}
+	int c = 0;
+	{
+		int numRows = 0;
+		BT_PROFILE("Compute A");
+		for (int i = 0; i < m_allConstraintPtrArray.size(); i += numRows, c++)
+		{
+			int row__ = ofs[c];
+			int sbA = m_allConstraintPtrArray[i]->m_solverBodyIdA;
+			int sbB = m_allConstraintPtrArray[i]->m_solverBodyIdB;
+			//	btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody;
+			//	btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody;
+
+			numRows = i < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[c].m_numConstraintRows : numContactRows;
+
+			const btScalar* JinvMrow = JinvM + 2 * 8 * (size_t)row__;
+
+			{
+				int startJointNodeA = bodyJointNodeArray[sbA];
+				while (startJointNodeA >= 0)
+				{
+					int j0 = jointNodeArray[startJointNodeA].jointIndex;
+					int cr0 = jointNodeArray[startJointNodeA].constraintRowIndex;
+					if (j0 < c)
+					{
+						int numRowsOther = cr0 < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[j0].m_numConstraintRows : numContactRows;
+						size_t ofsother = (m_allConstraintPtrArray[cr0]->m_solverBodyIdB == sbA) ? 8 * numRowsOther : 0;
+						//printf("%d joint i %d and j0: %d: ",count++,i,j0);
+						m_A.multiplyAdd2_p8r(JinvMrow,
+											 Jptr + 2 * 8 * (size_t)ofs[j0] + ofsother, numRows, numRowsOther, row__, ofs[j0]);
+					}
+					startJointNodeA = jointNodeArray[startJointNodeA].nextJointNodeIndex;
+				}
+			}
+
+			{
+				int startJointNodeB = bodyJointNodeArray[sbB];
+				while (startJointNodeB >= 0)
+				{
+					int j1 = jointNodeArray[startJointNodeB].jointIndex;
+					int cj1 = jointNodeArray[startJointNodeB].constraintRowIndex;
+
+					if (j1 < c)
+					{
+						int numRowsOther = cj1 < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[j1].m_numConstraintRows : numContactRows;
+						size_t ofsother = (m_allConstraintPtrArray[cj1]->m_solverBodyIdB == sbB) ? 8 * numRowsOther : 0;
+						m_A.multiplyAdd2_p8r(JinvMrow + 8 * (size_t)numRows,
+											 Jptr + 2 * 8 * (size_t)ofs[j1] + ofsother, numRows, numRowsOther, row__, ofs[j1]);
+					}
+					startJointNodeB = jointNodeArray[startJointNodeB].nextJointNodeIndex;
+				}
+			}
+		}
+
+		{
+			BT_PROFILE("compute diagonal");
+			// compute diagonal blocks of m_A
+
+			int row__ = 0;
+			int numJointRows = m_allConstraintPtrArray.size();
+
+			int jj = 0;
+			for (; row__ < numJointRows;)
+			{
+				//int sbA = m_allConstraintPtrArray[row__]->m_solverBodyIdA;
+				int sbB = m_allConstraintPtrArray[row__]->m_solverBodyIdB;
+				//	btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody;
+				btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody;
+
+				const unsigned int infom = row__ < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[jj].m_numConstraintRows : numContactRows;
+
+				const btScalar* JinvMrow = JinvM + 2 * 8 * (size_t)row__;
+				const btScalar* Jrow = Jptr + 2 * 8 * (size_t)row__;
+				m_A.multiply2_p8r(JinvMrow, Jrow, infom, infom, row__, row__);
+				if (orgBodyB)
+				{
+					m_A.multiplyAdd2_p8r(JinvMrow + 8 * (size_t)infom, Jrow + 8 * (size_t)infom, infom, infom, row__, row__);
+				}
+				row__ += infom;
+				jj++;
+			}
+		}
+	}
+
+	if (1)
+	{
+		// add cfm to the diagonal of m_A
+		for (int i = 0; i < m_A.rows(); ++i)
+		{
+			m_A.setElem(i, i, m_A(i, i) + infoGlobal.m_globalCfm / infoGlobal.m_timeStep);
+		}
+	}
+
+	///fill the upper triangle of the matrix, to make it symmetric
+	{
+		BT_PROFILE("fill the upper triangle ");
+		m_A.copyLowerToUpperTriangle();
+	}
+
+	{
+		BT_PROFILE("resize/init x");
+		m_x.resize(numConstraintRows);
+		m_xSplit.resize(numConstraintRows);
+
+		if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+		{
+			for (int i = 0; i < m_allConstraintPtrArray.size(); i++)
+			{
+				const btSolverConstraint& c = *m_allConstraintPtrArray[i];
+				m_x[i] = c.m_appliedImpulse;
+				m_xSplit[i] = c.m_appliedPushImpulse;
+			}
+		}
+		else
+		{
+			m_x.setZero();
+			m_xSplit.setZero();
+		}
+	}
+}
+
+void btMLCPSolver::createMLCP(const btContactSolverInfo& infoGlobal)
+{
+	int numBodies = this->m_tmpSolverBodyPool.size();
+	int numConstraintRows = m_allConstraintPtrArray.size();
+
+	m_b.resize(numConstraintRows);
+	if (infoGlobal.m_splitImpulse)
+		m_bSplit.resize(numConstraintRows);
+
+	m_bSplit.setZero();
+	m_b.setZero();
+
+	for (int i = 0; i < numConstraintRows; i++)
+	{
+		if (m_allConstraintPtrArray[i]->m_jacDiagABInv)
+		{
+			m_b[i] = m_allConstraintPtrArray[i]->m_rhs / m_allConstraintPtrArray[i]->m_jacDiagABInv;
+			if (infoGlobal.m_splitImpulse)
+				m_bSplit[i] = m_allConstraintPtrArray[i]->m_rhsPenetration / m_allConstraintPtrArray[i]->m_jacDiagABInv;
+		}
+	}
+
+	btMatrixXu& Minv = m_scratchMInv;
+	Minv.resize(6 * numBodies, 6 * numBodies);
+	Minv.setZero();
+	for (int i = 0; i < numBodies; i++)
+	{
+		const btSolverBody& rb = m_tmpSolverBodyPool[i];
+		const btVector3& invMass = rb.m_invMass;
+		setElem(Minv, i * 6 + 0, i * 6 + 0, invMass[0]);
+		setElem(Minv, i * 6 + 1, i * 6 + 1, invMass[1]);
+		setElem(Minv, i * 6 + 2, i * 6 + 2, invMass[2]);
+		btRigidBody* orgBody = m_tmpSolverBodyPool[i].m_originalBody;
+
+		for (int r = 0; r < 3; r++)
+			for (int c = 0; c < 3; c++)
+				setElem(Minv, i * 6 + 3 + r, i * 6 + 3 + c, orgBody ? orgBody->getInvInertiaTensorWorld()[r][c] : 0);
+	}
+
+	btMatrixXu& J = m_scratchJ;
+	J.resize(numConstraintRows, 6 * numBodies);
+	J.setZero();
+
+	m_lo.resize(numConstraintRows);
+	m_hi.resize(numConstraintRows);
+
+	for (int i = 0; i < numConstraintRows; i++)
+	{
+		m_lo[i] = m_allConstraintPtrArray[i]->m_lowerLimit;
+		m_hi[i] = m_allConstraintPtrArray[i]->m_upperLimit;
+
+		int bodyIndex0 = m_allConstraintPtrArray[i]->m_solverBodyIdA;
+		int bodyIndex1 = m_allConstraintPtrArray[i]->m_solverBodyIdB;
+		if (m_tmpSolverBodyPool[bodyIndex0].m_originalBody)
+		{
+			setElem(J, i, 6 * bodyIndex0 + 0, m_allConstraintPtrArray[i]->m_contactNormal1[0]);
+			setElem(J, i, 6 * bodyIndex0 + 1, m_allConstraintPtrArray[i]->m_contactNormal1[1]);
+			setElem(J, i, 6 * bodyIndex0 + 2, m_allConstraintPtrArray[i]->m_contactNormal1[2]);
+			setElem(J, i, 6 * bodyIndex0 + 3, m_allConstraintPtrArray[i]->m_relpos1CrossNormal[0]);
+			setElem(J, i, 6 * bodyIndex0 + 4, m_allConstraintPtrArray[i]->m_relpos1CrossNormal[1]);
+			setElem(J, i, 6 * bodyIndex0 + 5, m_allConstraintPtrArray[i]->m_relpos1CrossNormal[2]);
+		}
+		if (m_tmpSolverBodyPool[bodyIndex1].m_originalBody)
+		{
+			setElem(J, i, 6 * bodyIndex1 + 0, m_allConstraintPtrArray[i]->m_contactNormal2[0]);
+			setElem(J, i, 6 * bodyIndex1 + 1, m_allConstraintPtrArray[i]->m_contactNormal2[1]);
+			setElem(J, i, 6 * bodyIndex1 + 2, m_allConstraintPtrArray[i]->m_contactNormal2[2]);
+			setElem(J, i, 6 * bodyIndex1 + 3, m_allConstraintPtrArray[i]->m_relpos2CrossNormal[0]);
+			setElem(J, i, 6 * bodyIndex1 + 4, m_allConstraintPtrArray[i]->m_relpos2CrossNormal[1]);
+			setElem(J, i, 6 * bodyIndex1 + 5, m_allConstraintPtrArray[i]->m_relpos2CrossNormal[2]);
+		}
+	}
+
+	btMatrixXu& J_transpose = m_scratchJTranspose;
+	J_transpose = J.transpose();
+
+	btMatrixXu& tmp = m_scratchTmp;
+	//Minv.printMatrix("Minv=");
+	{
+		{
+			BT_PROFILE("J*Minv");
+			tmp = J * Minv;
+		}
+		{
+			BT_PROFILE("J*tmp");
+			m_A = tmp * J_transpose;
+		}
+	}
+	//J.printMatrix("J");
+	if (1)
+	{
+		// add cfm to the diagonal of m_A
+		for (int i = 0; i < m_A.rows(); ++i)
+		{
+			m_A.setElem(i, i, m_A(i, i) + infoGlobal.m_globalCfm / infoGlobal.m_timeStep);
+		}
+	}
+
+	m_x.resize(numConstraintRows);
+	if (infoGlobal.m_splitImpulse)
+		m_xSplit.resize(numConstraintRows);
+	//	m_x.setZero();
+
+	for (int i = 0; i < m_allConstraintPtrArray.size(); i++)
+	{
+		const btSolverConstraint& c = *m_allConstraintPtrArray[i];
+		m_x[i] = c.m_appliedImpulse;
+		if (infoGlobal.m_splitImpulse)
+			m_xSplit[i] = c.m_appliedPushImpulse;
+	}
+}
+
+btScalar btMLCPSolver::solveGroupCacheFriendlyIterations(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	bool result = true;
+	{
+		BT_PROFILE("solveMLCP");
+		//		printf("m_A(%d,%d)\n", m_A.rows(),m_A.cols());
+		result = solveMLCP(infoGlobal);
+	}
+
+	//check if solution is valid, and otherwise fallback to btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations
+	if (result)
+	{
+		BT_PROFILE("process MLCP results");
+		for (int i = 0; i < m_allConstraintPtrArray.size(); i++)
+		{
+			{
+				btSolverConstraint& c = *m_allConstraintPtrArray[i];
+				int sbA = c.m_solverBodyIdA;
+				int sbB = c.m_solverBodyIdB;
+				//btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody;
+				//	btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody;
+
+				btSolverBody& solverBodyA = m_tmpSolverBodyPool[sbA];
+				btSolverBody& solverBodyB = m_tmpSolverBodyPool[sbB];
+
+				{
+					btScalar deltaImpulse = m_x[i] - c.m_appliedImpulse;
+					c.m_appliedImpulse = m_x[i];
+					solverBodyA.internalApplyImpulse(c.m_contactNormal1 * solverBodyA.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+					solverBodyB.internalApplyImpulse(c.m_contactNormal2 * solverBodyB.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+				}
+
+				if (infoGlobal.m_splitImpulse)
+				{
+					btScalar deltaImpulse = m_xSplit[i] - c.m_appliedPushImpulse;
+					solverBodyA.internalApplyPushImpulse(c.m_contactNormal1 * solverBodyA.internalGetInvMass(), c.m_angularComponentA, deltaImpulse);
+					solverBodyB.internalApplyPushImpulse(c.m_contactNormal2 * solverBodyB.internalGetInvMass(), c.m_angularComponentB, deltaImpulse);
+					c.m_appliedPushImpulse = m_xSplit[i];
+				}
+			}
+		}
+	}
+	else
+	{
+		//	printf("m_fallback = %d\n",m_fallback);
+		m_fallback++;
+		btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+	}
+
+	return 0.f;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.h
new file mode 100644
index 0000000..510ae59
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolver.h
@@ -0,0 +1,88 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#ifndef BT_MLCP_SOLVER_H
+#define BT_MLCP_SOLVER_H
+
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+#include "LinearMath/btMatrixX.h"
+#include "BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h"
+
+class btMLCPSolver : public btSequentialImpulseConstraintSolver
+{
+protected:
+	btMatrixXu m_A;
+	btVectorXu m_b;
+	btVectorXu m_x;
+	btVectorXu m_lo;
+	btVectorXu m_hi;
+
+	///when using 'split impulse' we solve two separate (M)LCPs
+	btVectorXu m_bSplit;
+	btVectorXu m_xSplit;
+	btVectorXu m_bSplit1;
+	btVectorXu m_xSplit2;
+
+	btAlignedObjectArray<int> m_limitDependencies;
+	btAlignedObjectArray<btSolverConstraint*> m_allConstraintPtrArray;
+	btMLCPSolverInterface* m_solver;
+	int m_fallback;
+
+	/// The following scratch variables are not stateful -- contents are cleared prior to each use.
+	/// They are only cached here to avoid extra memory allocations and deallocations and to ensure
+	/// that multiple instances of the solver can be run in parallel.
+	btMatrixXu m_scratchJ3;
+	btMatrixXu m_scratchJInvM3;
+	btAlignedObjectArray<int> m_scratchOfs;
+	btMatrixXu m_scratchMInv;
+	btMatrixXu m_scratchJ;
+	btMatrixXu m_scratchJTranspose;
+	btMatrixXu m_scratchTmp;
+
+	virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+	virtual btScalar solveGroupCacheFriendlyIterations(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+
+	virtual void createMLCP(const btContactSolverInfo& infoGlobal);
+	virtual void createMLCPFast(const btContactSolverInfo& infoGlobal);
+
+	//return true is it solves the problem successfully
+	virtual bool solveMLCP(const btContactSolverInfo& infoGlobal);
+
+public:
+	btMLCPSolver(btMLCPSolverInterface* solver);
+	virtual ~btMLCPSolver();
+
+	void setMLCPSolver(btMLCPSolverInterface* solver)
+	{
+		m_solver = solver;
+	}
+
+	int getNumFallbacks() const
+	{
+		return m_fallback;
+	}
+	void setNumFallbacks(int num)
+	{
+		m_fallback = num;
+	}
+
+	virtual btConstraintSolverType getSolverType() const
+	{
+		return BT_MLCP_SOLVER;
+	}
+};
+
+#endif  //BT_MLCP_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h
new file mode 100644
index 0000000..6b0465b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h
@@ -0,0 +1,33 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#ifndef BT_MLCP_SOLVER_INTERFACE_H
+#define BT_MLCP_SOLVER_INTERFACE_H
+
+#include "LinearMath/btMatrixX.h"
+
+class btMLCPSolverInterface
+{
+public:
+	virtual ~btMLCPSolverInterface()
+	{
+	}
+
+	//return true is it solves the problem successfully
+	virtual bool solveMLCP(const btMatrixXu& A, const btVectorXu& b, btVectorXu& x, const btVectorXu& lo, const btVectorXu& hi, const btAlignedObjectArray<int>& limitDependency, int numIterations, bool useSparsity = true) = 0;
+};
+
+#endif  //BT_MLCP_SOLVER_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btPATHSolver.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btPATHSolver.h
new file mode 100644
index 0000000..7f8eec3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btPATHSolver.h
@@ -0,0 +1,142 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#ifndef BT_PATH_SOLVER_H
+#define BT_PATH_SOLVER_H
+
+//#define BT_USE_PATH
+#ifdef BT_USE_PATH
+
+extern "C"
+{
+#include "PATH/SimpleLCP.h"
+#include "PATH/License.h"
+#include "PATH/Error_Interface.h"
+};
+void __stdcall MyError(Void *data, Char *msg)
+{
+	printf("Path Error: %s\n", msg);
+}
+void __stdcall MyWarning(Void *data, Char *msg)
+{
+	printf("Path Warning: %s\n", msg);
+}
+
+Error_Interface e;
+
+#include "btMLCPSolverInterface.h"
+#include "Dantzig/lcp.h"
+
+class btPathSolver : public btMLCPSolverInterface
+{
+public:
+	btPathSolver()
+	{
+		License_SetString("2069810742&Courtesy_License&&&USR&2013&14_12_2011&1000&PATH&GEN&31_12_2013&0_0_0&0&0_0");
+		e.error_data = 0;
+		e.warning = MyWarning;
+		e.error = MyError;
+		Error_SetInterface(&e);
+	}
+
+	virtual bool solveMLCP(const btMatrixXu &A, const btVectorXu &b, btVectorXu &x, const btVectorXu &lo, const btVectorXu &hi, const btAlignedObjectArray<int> &limitDependency, int numIterations, bool useSparsity = true)
+	{
+		MCP_Termination status;
+
+		int numVariables = b.rows();
+		if (0 == numVariables)
+			return true;
+
+		/*	 - variables - the number of variables in the problem
+			- m_nnz - the number of nonzeros in the M matrix
+			- m_i - a vector of size m_nnz containing the row indices for M
+			- m_j - a vector of size m_nnz containing the column indices for M
+			- m_ij - a vector of size m_nnz containing the data for M
+			- q - a vector of size variables
+			- lb - a vector of size variables containing the lower bounds on x
+			- ub - a vector of size variables containing the upper bounds on x
+			*/
+		btAlignedObjectArray<double> values;
+		btAlignedObjectArray<int> rowIndices;
+		btAlignedObjectArray<int> colIndices;
+
+		for (int i = 0; i < A.rows(); i++)
+		{
+			for (int j = 0; j < A.cols(); j++)
+			{
+				if (A(i, j) != 0.f)
+				{
+					//add 1, because Path starts at 1, instead of 0
+					rowIndices.push_back(i + 1);
+					colIndices.push_back(j + 1);
+					values.push_back(A(i, j));
+				}
+			}
+		}
+		int numNonZero = rowIndices.size();
+		btAlignedObjectArray<double> zResult;
+		zResult.resize(numVariables);
+		btAlignedObjectArray<double> rhs;
+		btAlignedObjectArray<double> upperBounds;
+		btAlignedObjectArray<double> lowerBounds;
+		for (int i = 0; i < numVariables; i++)
+		{
+			upperBounds.push_back(hi[i]);
+			lowerBounds.push_back(lo[i]);
+			rhs.push_back(-b[i]);
+		}
+
+		SimpleLCP(numVariables, numNonZero, &rowIndices[0], &colIndices[0], &values[0], &rhs[0], &lowerBounds[0], &upperBounds[0], &status, &zResult[0]);
+
+		if (status != MCP_Solved)
+		{
+			static const char *gReturnMsgs[] = {
+				"Invalid return",
+				"MCP_Solved: The problem was solved",
+				"MCP_NoProgress: A stationary point was found",
+				"MCP_MajorIterationLimit: Major iteration limit met",
+				"MCP_MinorIterationLimit: Cumulative minor iteration limit met",
+				"MCP_TimeLimit: Ran out of time",
+				"MCP_UserInterrupt: Control-C, typically",
+				"MCP_BoundError: Problem has a bound error",
+				"MCP_DomainError: Could not find starting point",
+				"MCP_Infeasible: Problem has no solution",
+				"MCP_Error: An error occurred within the code",
+				"MCP_LicenseError: License could not be found",
+				"MCP_OK"};
+
+			printf("ERROR: The PATH MCP solver failed: %s\n", gReturnMsgs[(unsigned int)status]);  // << std::endl;
+			printf("using Projected Gauss Seidel fallback\n");
+
+			return false;
+		}
+		else
+		{
+			for (int i = 0; i < numVariables; i++)
+			{
+				x[i] = zResult[i];
+				//check for #NAN
+				if (x[i] != zResult[i])
+					return false;
+			}
+			return true;
+		}
+	}
+};
+
+#endif  //BT_USE_PATH
+
+#endif  //BT_PATH_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h
new file mode 100644
index 0000000..c3f4ec3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h
@@ -0,0 +1,107 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#ifndef BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H
+#define BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H
+
+#include "btMLCPSolverInterface.h"
+
+///This solver is mainly for debug/learning purposes: it is functionally equivalent to the btSequentialImpulseConstraintSolver solver, but much slower (it builds the full LCP matrix)
+class btSolveProjectedGaussSeidel : public btMLCPSolverInterface
+{
+public:
+	btScalar m_leastSquaresResidualThreshold;
+	btScalar m_leastSquaresResidual;
+
+	btSolveProjectedGaussSeidel()
+		: m_leastSquaresResidualThreshold(0),
+		  m_leastSquaresResidual(0)
+	{
+	}
+
+	virtual bool solveMLCP(const btMatrixXu& A, const btVectorXu& b, btVectorXu& x, const btVectorXu& lo, const btVectorXu& hi, const btAlignedObjectArray<int>& limitDependency, int numIterations, bool useSparsity = true)
+	{
+		if (!A.rows())
+			return true;
+		//the A matrix is sparse, so compute the non-zero elements
+		A.rowComputeNonZeroElements();
+
+		//A is a m-n matrix, m rows, n columns
+		btAssert(A.rows() == b.rows());
+
+		int i, j, numRows = A.rows();
+
+		btScalar delta;
+
+		for (int k = 0; k < numIterations; k++)
+		{
+			m_leastSquaresResidual = 0.f;
+			for (i = 0; i < numRows; i++)
+			{
+				delta = 0.0f;
+				if (useSparsity)
+				{
+					for (int h = 0; h < A.m_rowNonZeroElements1[i].size(); h++)
+					{
+						j = A.m_rowNonZeroElements1[i][h];
+						if (j != i)  //skip main diagonal
+						{
+							delta += A(i, j) * x[j];
+						}
+					}
+				}
+				else
+				{
+					for (j = 0; j < i; j++)
+						delta += A(i, j) * x[j];
+					for (j = i + 1; j < numRows; j++)
+						delta += A(i, j) * x[j];
+				}
+
+				btScalar aDiag = A(i, i);
+				btScalar xOld = x[i];
+				x[i] = (b[i] - delta) / aDiag;
+				btScalar s = 1.f;
+
+				if (limitDependency[i] >= 0)
+				{
+					s = x[limitDependency[i]];
+					if (s < 0)
+						s = 1;
+				}
+
+				if (x[i] < lo[i] * s)
+					x[i] = lo[i] * s;
+				if (x[i] > hi[i] * s)
+					x[i] = hi[i] * s;
+				btScalar diff = x[i] - xOld;
+				m_leastSquaresResidual += diff * diff;
+			}
+
+			btScalar eps = m_leastSquaresResidualThreshold;
+			if ((m_leastSquaresResidual < eps) || (k >= (numIterations - 1)))
+			{
+#ifdef VERBOSE_PRINTF_RESIDUAL
+				printf("totalLenSqr = %f at iteration #%d\n", m_leastSquaresResidual, k);
+#endif
+				break;
+			}
+		}
+		return true;
+	}
+};
+
+#endif  //BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
new file mode 100644
index 0000000..cbb41ec
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
@@ -0,0 +1,708 @@
+/*
+ * Copyright (c) 2005 Erwin Coumans https://bulletphysics.org
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies.
+ * Erwin Coumans makes no representations about the suitability 
+ * of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+*/
+
+#include "LinearMath/btVector3.h"
+#include "btRaycastVehicle.h"
+
+#include "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btJacobianEntry.h"
+#include "LinearMath/btQuaternion.h"
+#include "BulletDynamics/Dynamics/btDynamicsWorld.h"
+#include "btVehicleRaycaster.h"
+#include "btWheelInfo.h"
+#include "LinearMath/btMinMax.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletDynamics/ConstraintSolver/btContactConstraint.h"
+
+#define ROLLING_INFLUENCE_FIX
+
+btRigidBody& btActionInterface::getFixedBody()
+{
+	static btRigidBody s_fixed(0, 0, 0);
+	s_fixed.setMassProps(btScalar(0.), btVector3(btScalar(0.), btScalar(0.), btScalar(0.)));
+	return s_fixed;
+}
+
+btRaycastVehicle::btRaycastVehicle(const btVehicleTuning& tuning, btRigidBody* chassis, btVehicleRaycaster* raycaster)
+	: m_vehicleRaycaster(raycaster),
+	  m_pitchControl(btScalar(0.))
+{
+	m_chassisBody = chassis;
+	m_indexRightAxis = 0;
+	m_indexUpAxis = 2;
+	m_indexForwardAxis = 1;
+	defaultInit(tuning);
+}
+
+void btRaycastVehicle::defaultInit(const btVehicleTuning& tuning)
+{
+	(void)tuning;
+	m_currentVehicleSpeedKmHour = btScalar(0.);
+	m_steeringValue = btScalar(0.);
+}
+
+btRaycastVehicle::~btRaycastVehicle()
+{
+}
+
+//
+// basically most of the code is general for 2 or 4 wheel vehicles, but some of it needs to be reviewed
+//
+btWheelInfo& btRaycastVehicle::addWheel(const btVector3& connectionPointCS, const btVector3& wheelDirectionCS0, const btVector3& wheelAxleCS, btScalar suspensionRestLength, btScalar wheelRadius, const btVehicleTuning& tuning, bool isFrontWheel)
+{
+	btWheelInfoConstructionInfo ci;
+
+	ci.m_chassisConnectionCS = connectionPointCS;
+	ci.m_wheelDirectionCS = wheelDirectionCS0;
+	ci.m_wheelAxleCS = wheelAxleCS;
+	ci.m_suspensionRestLength = suspensionRestLength;
+	ci.m_wheelRadius = wheelRadius;
+	ci.m_suspensionStiffness = tuning.m_suspensionStiffness;
+	ci.m_wheelsDampingCompression = tuning.m_suspensionCompression;
+	ci.m_wheelsDampingRelaxation = tuning.m_suspensionDamping;
+	ci.m_frictionSlip = tuning.m_frictionSlip;
+	ci.m_bIsFrontWheel = isFrontWheel;
+	ci.m_maxSuspensionTravelCm = tuning.m_maxSuspensionTravelCm;
+	ci.m_maxSuspensionForce = tuning.m_maxSuspensionForce;
+
+	m_wheelInfo.push_back(btWheelInfo(ci));
+
+	btWheelInfo& wheel = m_wheelInfo[getNumWheels() - 1];
+
+	updateWheelTransformsWS(wheel, false);
+	updateWheelTransform(getNumWheels() - 1, false);
+	return wheel;
+}
+
+const btTransform& btRaycastVehicle::getWheelTransformWS(int wheelIndex) const
+{
+	btAssert(wheelIndex < getNumWheels());
+	const btWheelInfo& wheel = m_wheelInfo[wheelIndex];
+	return wheel.m_worldTransform;
+}
+
+void btRaycastVehicle::updateWheelTransform(int wheelIndex, bool interpolatedTransform)
+{
+	btWheelInfo& wheel = m_wheelInfo[wheelIndex];
+	updateWheelTransformsWS(wheel, interpolatedTransform);
+	btVector3 up = -wheel.m_raycastInfo.m_wheelDirectionWS;
+	const btVector3& right = wheel.m_raycastInfo.m_wheelAxleWS;
+	btVector3 fwd = up.cross(right);
+	fwd = fwd.normalize();
+	//	up = right.cross(fwd);
+	//	up.normalize();
+
+	//rotate around steering over de wheelAxleWS
+	btScalar steering = wheel.m_steering;
+
+	btQuaternion steeringOrn(up, steering);  //wheel.m_steering);
+	btMatrix3x3 steeringMat(steeringOrn);
+
+	btQuaternion rotatingOrn(right, -wheel.m_rotation);
+	btMatrix3x3 rotatingMat(rotatingOrn);
+
+	btMatrix3x3 basis2;
+	basis2[0][m_indexRightAxis] = -right[0];
+	basis2[1][m_indexRightAxis] = -right[1];
+	basis2[2][m_indexRightAxis] = -right[2];
+
+	basis2[0][m_indexUpAxis] = up[0];
+	basis2[1][m_indexUpAxis] = up[1];
+	basis2[2][m_indexUpAxis] = up[2];
+
+	basis2[0][m_indexForwardAxis] = fwd[0];
+	basis2[1][m_indexForwardAxis] = fwd[1];
+	basis2[2][m_indexForwardAxis] = fwd[2];
+
+	wheel.m_worldTransform.setBasis(steeringMat * rotatingMat * basis2);
+	wheel.m_worldTransform.setOrigin(
+		wheel.m_raycastInfo.m_hardPointWS + wheel.m_raycastInfo.m_wheelDirectionWS * wheel.m_raycastInfo.m_suspensionLength);
+}
+
+void btRaycastVehicle::resetSuspension()
+{
+	int i;
+	for (i = 0; i < m_wheelInfo.size(); i++)
+	{
+		btWheelInfo& wheel = m_wheelInfo[i];
+		wheel.m_raycastInfo.m_suspensionLength = wheel.getSuspensionRestLength();
+		wheel.m_suspensionRelativeVelocity = btScalar(0.0);
+
+		wheel.m_raycastInfo.m_contactNormalWS = -wheel.m_raycastInfo.m_wheelDirectionWS;
+		//wheel_info.setContactFriction(btScalar(0.0));
+		wheel.m_clippedInvContactDotSuspension = btScalar(1.0);
+	}
+}
+
+void btRaycastVehicle::updateWheelTransformsWS(btWheelInfo& wheel, bool interpolatedTransform)
+{
+	wheel.m_raycastInfo.m_isInContact = false;
+
+	btTransform chassisTrans = getChassisWorldTransform();
+	if (interpolatedTransform && (getRigidBody()->getMotionState()))
+	{
+		getRigidBody()->getMotionState()->getWorldTransform(chassisTrans);
+	}
+
+	wheel.m_raycastInfo.m_hardPointWS = chassisTrans(wheel.m_chassisConnectionPointCS);
+	wheel.m_raycastInfo.m_wheelDirectionWS = chassisTrans.getBasis() * wheel.m_wheelDirectionCS;
+	wheel.m_raycastInfo.m_wheelAxleWS = chassisTrans.getBasis() * wheel.m_wheelAxleCS;
+}
+
+btScalar btRaycastVehicle::rayCast(btWheelInfo& wheel)
+{
+	updateWheelTransformsWS(wheel, false);
+
+	btScalar depth = -1;
+
+	btScalar raylen = wheel.getSuspensionRestLength() + wheel.m_wheelsRadius;
+
+	btVector3 rayvector = wheel.m_raycastInfo.m_wheelDirectionWS * (raylen);
+	const btVector3& source = wheel.m_raycastInfo.m_hardPointWS;
+	wheel.m_raycastInfo.m_contactPointWS = source + rayvector;
+	const btVector3& target = wheel.m_raycastInfo.m_contactPointWS;
+
+	btScalar param = btScalar(0.);
+
+	btVehicleRaycaster::btVehicleRaycasterResult rayResults;
+
+	btAssert(m_vehicleRaycaster);
+
+	void* object = m_vehicleRaycaster->castRay(source, target, rayResults);
+
+	wheel.m_raycastInfo.m_groundObject = 0;
+
+	if (object)
+	{
+		param = rayResults.m_distFraction;
+		depth = raylen * rayResults.m_distFraction;
+		wheel.m_raycastInfo.m_contactNormalWS = rayResults.m_hitNormalInWorld;
+		wheel.m_raycastInfo.m_isInContact = true;
+
+		wheel.m_raycastInfo.m_groundObject = &getFixedBody();  ///@todo for driving on dynamic/movable objects!;
+		//wheel.m_raycastInfo.m_groundObject = object;
+
+		btScalar hitDistance = param * raylen;
+		wheel.m_raycastInfo.m_suspensionLength = hitDistance - wheel.m_wheelsRadius;
+		//clamp on max suspension travel
+
+		btScalar minSuspensionLength = wheel.getSuspensionRestLength() - wheel.m_maxSuspensionTravelCm * btScalar(0.01);
+		btScalar maxSuspensionLength = wheel.getSuspensionRestLength() + wheel.m_maxSuspensionTravelCm * btScalar(0.01);
+		if (wheel.m_raycastInfo.m_suspensionLength < minSuspensionLength)
+		{
+			wheel.m_raycastInfo.m_suspensionLength = minSuspensionLength;
+		}
+		if (wheel.m_raycastInfo.m_suspensionLength > maxSuspensionLength)
+		{
+			wheel.m_raycastInfo.m_suspensionLength = maxSuspensionLength;
+		}
+
+		wheel.m_raycastInfo.m_contactPointWS = rayResults.m_hitPointInWorld;
+
+		btScalar denominator = wheel.m_raycastInfo.m_contactNormalWS.dot(wheel.m_raycastInfo.m_wheelDirectionWS);
+
+		btVector3 chassis_velocity_at_contactPoint;
+		btVector3 relpos = wheel.m_raycastInfo.m_contactPointWS - getRigidBody()->getCenterOfMassPosition();
+
+		chassis_velocity_at_contactPoint = getRigidBody()->getVelocityInLocalPoint(relpos);
+
+		btScalar projVel = wheel.m_raycastInfo.m_contactNormalWS.dot(chassis_velocity_at_contactPoint);
+
+		if (denominator >= btScalar(-0.1))
+		{
+			wheel.m_suspensionRelativeVelocity = btScalar(0.0);
+			wheel.m_clippedInvContactDotSuspension = btScalar(1.0) / btScalar(0.1);
+		}
+		else
+		{
+			btScalar inv = btScalar(-1.) / denominator;
+			wheel.m_suspensionRelativeVelocity = projVel * inv;
+			wheel.m_clippedInvContactDotSuspension = inv;
+		}
+	}
+	else
+	{
+		//put wheel info as in rest position
+		wheel.m_raycastInfo.m_suspensionLength = wheel.getSuspensionRestLength();
+		wheel.m_suspensionRelativeVelocity = btScalar(0.0);
+		wheel.m_raycastInfo.m_contactNormalWS = -wheel.m_raycastInfo.m_wheelDirectionWS;
+		wheel.m_clippedInvContactDotSuspension = btScalar(1.0);
+	}
+
+	return depth;
+}
+
+const btTransform& btRaycastVehicle::getChassisWorldTransform() const
+{
+	/*if (getRigidBody()->getMotionState())
+	{
+		btTransform chassisWorldTrans;
+		getRigidBody()->getMotionState()->getWorldTransform(chassisWorldTrans);
+		return chassisWorldTrans;
+	}
+	*/
+
+	return getRigidBody()->getCenterOfMassTransform();
+}
+
+void btRaycastVehicle::updateVehicle(btScalar step)
+{
+	{
+		for (int i = 0; i < getNumWheels(); i++)
+		{
+			updateWheelTransform(i, false);
+		}
+	}
+
+	m_currentVehicleSpeedKmHour = btScalar(3.6) * getRigidBody()->getLinearVelocity().length();
+
+	const btTransform& chassisTrans = getChassisWorldTransform();
+
+	btVector3 forwardW(
+		chassisTrans.getBasis()[0][m_indexForwardAxis],
+		chassisTrans.getBasis()[1][m_indexForwardAxis],
+		chassisTrans.getBasis()[2][m_indexForwardAxis]);
+
+	if (forwardW.dot(getRigidBody()->getLinearVelocity()) < btScalar(0.))
+	{
+		m_currentVehicleSpeedKmHour *= btScalar(-1.);
+	}
+
+	//
+	// simulate suspension
+	//
+
+	int i = 0;
+	for (i = 0; i < m_wheelInfo.size(); i++)
+	{
+		//btScalar depth;
+		//depth =
+		rayCast(m_wheelInfo[i]);
+	}
+
+	updateSuspension(step);
+
+	for (i = 0; i < m_wheelInfo.size(); i++)
+	{
+		//apply suspension force
+		btWheelInfo& wheel = m_wheelInfo[i];
+
+		btScalar suspensionForce = wheel.m_wheelsSuspensionForce;
+
+		if (suspensionForce > wheel.m_maxSuspensionForce)
+		{
+			suspensionForce = wheel.m_maxSuspensionForce;
+		}
+		btVector3 impulse = wheel.m_raycastInfo.m_contactNormalWS * suspensionForce * step;
+		btVector3 relpos = wheel.m_raycastInfo.m_contactPointWS - getRigidBody()->getCenterOfMassPosition();
+
+		getRigidBody()->applyImpulse(impulse, relpos);
+	}
+
+	updateFriction(step);
+
+	for (i = 0; i < m_wheelInfo.size(); i++)
+	{
+		btWheelInfo& wheel = m_wheelInfo[i];
+		btVector3 relpos = wheel.m_raycastInfo.m_hardPointWS - getRigidBody()->getCenterOfMassPosition();
+		btVector3 vel = getRigidBody()->getVelocityInLocalPoint(relpos);
+
+		if (wheel.m_raycastInfo.m_isInContact)
+		{
+			const btTransform& chassisWorldTransform = getChassisWorldTransform();
+
+			btVector3 fwd(
+				chassisWorldTransform.getBasis()[0][m_indexForwardAxis],
+				chassisWorldTransform.getBasis()[1][m_indexForwardAxis],
+				chassisWorldTransform.getBasis()[2][m_indexForwardAxis]);
+
+			btScalar proj = fwd.dot(wheel.m_raycastInfo.m_contactNormalWS);
+			fwd -= wheel.m_raycastInfo.m_contactNormalWS * proj;
+
+			btScalar proj2 = fwd.dot(vel);
+
+			wheel.m_deltaRotation = (proj2 * step) / (wheel.m_wheelsRadius);
+			wheel.m_rotation += wheel.m_deltaRotation;
+		}
+		else
+		{
+			wheel.m_rotation += wheel.m_deltaRotation;
+		}
+
+		wheel.m_deltaRotation *= btScalar(0.99);  //damping of rotation when not in contact
+	}
+}
+
+void btRaycastVehicle::setSteeringValue(btScalar steering, int wheel)
+{
+	btAssert(wheel >= 0 && wheel < getNumWheels());
+
+	btWheelInfo& wheelInfo = getWheelInfo(wheel);
+	wheelInfo.m_steering = steering;
+}
+
+btScalar btRaycastVehicle::getSteeringValue(int wheel) const
+{
+	return getWheelInfo(wheel).m_steering;
+}
+
+void btRaycastVehicle::applyEngineForce(btScalar force, int wheel)
+{
+	btAssert(wheel >= 0 && wheel < getNumWheels());
+	btWheelInfo& wheelInfo = getWheelInfo(wheel);
+	wheelInfo.m_engineForce = force;
+}
+
+const btWheelInfo& btRaycastVehicle::getWheelInfo(int index) const
+{
+	btAssert((index >= 0) && (index < getNumWheels()));
+
+	return m_wheelInfo[index];
+}
+
+btWheelInfo& btRaycastVehicle::getWheelInfo(int index)
+{
+	btAssert((index >= 0) && (index < getNumWheels()));
+
+	return m_wheelInfo[index];
+}
+
+void btRaycastVehicle::setBrake(btScalar brake, int wheelIndex)
+{
+	btAssert((wheelIndex >= 0) && (wheelIndex < getNumWheels()));
+	getWheelInfo(wheelIndex).m_brake = brake;
+}
+
+void btRaycastVehicle::updateSuspension(btScalar deltaTime)
+{
+	(void)deltaTime;
+
+	btScalar chassisMass = btScalar(1.) / m_chassisBody->getInvMass();
+
+	for (int w_it = 0; w_it < getNumWheels(); w_it++)
+	{
+		btWheelInfo& wheel_info = m_wheelInfo[w_it];
+
+		if (wheel_info.m_raycastInfo.m_isInContact)
+		{
+			btScalar force;
+			//	Spring
+			{
+				btScalar susp_length = wheel_info.getSuspensionRestLength();
+				btScalar current_length = wheel_info.m_raycastInfo.m_suspensionLength;
+
+				btScalar length_diff = (susp_length - current_length);
+
+				force = wheel_info.m_suspensionStiffness * length_diff * wheel_info.m_clippedInvContactDotSuspension;
+			}
+
+			// Damper
+			{
+				btScalar projected_rel_vel = wheel_info.m_suspensionRelativeVelocity;
+				{
+					btScalar susp_damping;
+					if (projected_rel_vel < btScalar(0.0))
+					{
+						susp_damping = wheel_info.m_wheelsDampingCompression;
+					}
+					else
+					{
+						susp_damping = wheel_info.m_wheelsDampingRelaxation;
+					}
+					force -= susp_damping * projected_rel_vel;
+				}
+			}
+
+			// RESULT
+			wheel_info.m_wheelsSuspensionForce = force * chassisMass;
+			if (wheel_info.m_wheelsSuspensionForce < btScalar(0.))
+			{
+				wheel_info.m_wheelsSuspensionForce = btScalar(0.);
+			}
+		}
+		else
+		{
+			wheel_info.m_wheelsSuspensionForce = btScalar(0.0);
+		}
+	}
+}
+
+struct btWheelContactPoint
+{
+	btRigidBody* m_body0;
+	btRigidBody* m_body1;
+	btVector3 m_frictionPositionWorld;
+	btVector3 m_frictionDirectionWorld;
+	btScalar m_jacDiagABInv;
+	btScalar m_maxImpulse;
+
+	btWheelContactPoint(btRigidBody* body0, btRigidBody* body1, const btVector3& frictionPosWorld, const btVector3& frictionDirectionWorld, btScalar maxImpulse)
+		: m_body0(body0),
+		  m_body1(body1),
+		  m_frictionPositionWorld(frictionPosWorld),
+		  m_frictionDirectionWorld(frictionDirectionWorld),
+		  m_maxImpulse(maxImpulse)
+	{
+		btScalar denom0 = body0->computeImpulseDenominator(frictionPosWorld, frictionDirectionWorld);
+		btScalar denom1 = body1->computeImpulseDenominator(frictionPosWorld, frictionDirectionWorld);
+		btScalar relaxation = 1.f;
+		m_jacDiagABInv = relaxation / (denom0 + denom1);
+	}
+};
+
+btScalar calcRollingFriction(btWheelContactPoint& contactPoint, int numWheelsOnGround);
+btScalar calcRollingFriction(btWheelContactPoint& contactPoint, int numWheelsOnGround)
+{
+	btScalar j1 = 0.f;
+
+	const btVector3& contactPosWorld = contactPoint.m_frictionPositionWorld;
+
+	btVector3 rel_pos1 = contactPosWorld - contactPoint.m_body0->getCenterOfMassPosition();
+	btVector3 rel_pos2 = contactPosWorld - contactPoint.m_body1->getCenterOfMassPosition();
+
+	btScalar maxImpulse = contactPoint.m_maxImpulse;
+
+	btVector3 vel1 = contactPoint.m_body0->getVelocityInLocalPoint(rel_pos1);
+	btVector3 vel2 = contactPoint.m_body1->getVelocityInLocalPoint(rel_pos2);
+	btVector3 vel = vel1 - vel2;
+
+	btScalar vrel = contactPoint.m_frictionDirectionWorld.dot(vel);
+
+	// calculate j that moves us to zero relative velocity
+	j1 = -vrel * contactPoint.m_jacDiagABInv / btScalar(numWheelsOnGround);
+	btSetMin(j1, maxImpulse);
+	btSetMax(j1, -maxImpulse);
+
+	return j1;
+}
+
+btScalar sideFrictionStiffness2 = btScalar(1.0);
+void btRaycastVehicle::updateFriction(btScalar timeStep)
+{
+	//calculate the impulse, so that the wheels don't move sidewards
+	int numWheel = getNumWheels();
+	if (!numWheel)
+		return;
+
+	m_forwardWS.resize(numWheel);
+	m_axle.resize(numWheel);
+	m_forwardImpulse.resize(numWheel);
+	m_sideImpulse.resize(numWheel);
+
+	int numWheelsOnGround = 0;
+
+	//collapse all those loops into one!
+	for (int i = 0; i < getNumWheels(); i++)
+	{
+		btWheelInfo& wheelInfo = m_wheelInfo[i];
+		class btRigidBody* groundObject = (class btRigidBody*)wheelInfo.m_raycastInfo.m_groundObject;
+		if (groundObject)
+			numWheelsOnGround++;
+		m_sideImpulse[i] = btScalar(0.);
+		m_forwardImpulse[i] = btScalar(0.);
+	}
+
+	{
+		for (int i = 0; i < getNumWheels(); i++)
+		{
+			btWheelInfo& wheelInfo = m_wheelInfo[i];
+
+			class btRigidBody* groundObject = (class btRigidBody*)wheelInfo.m_raycastInfo.m_groundObject;
+
+			if (groundObject)
+			{
+				const btTransform& wheelTrans = getWheelTransformWS(i);
+
+				btMatrix3x3 wheelBasis0 = wheelTrans.getBasis();
+				m_axle[i] = -btVector3(
+					wheelBasis0[0][m_indexRightAxis],
+					wheelBasis0[1][m_indexRightAxis],
+					wheelBasis0[2][m_indexRightAxis]);
+
+				const btVector3& surfNormalWS = wheelInfo.m_raycastInfo.m_contactNormalWS;
+				btScalar proj = m_axle[i].dot(surfNormalWS);
+				m_axle[i] -= surfNormalWS * proj;
+				m_axle[i] = m_axle[i].normalize();
+
+				m_forwardWS[i] = surfNormalWS.cross(m_axle[i]);
+				m_forwardWS[i].normalize();
+
+				resolveSingleBilateral(*m_chassisBody, wheelInfo.m_raycastInfo.m_contactPointWS,
+									   *groundObject, wheelInfo.m_raycastInfo.m_contactPointWS,
+									   btScalar(0.), m_axle[i], m_sideImpulse[i], timeStep);
+
+				m_sideImpulse[i] *= sideFrictionStiffness2;
+			}
+		}
+	}
+
+	btScalar sideFactor = btScalar(1.);
+	btScalar fwdFactor = 0.5;
+
+	bool sliding = false;
+	{
+		for (int wheel = 0; wheel < getNumWheels(); wheel++)
+		{
+			btWheelInfo& wheelInfo = m_wheelInfo[wheel];
+			class btRigidBody* groundObject = (class btRigidBody*)wheelInfo.m_raycastInfo.m_groundObject;
+
+			btScalar rollingFriction = 0.f;
+
+			if (groundObject)
+			{
+				if (wheelInfo.m_engineForce != 0.f)
+				{
+					rollingFriction = wheelInfo.m_engineForce * timeStep;
+				}
+				else
+				{
+					btScalar defaultRollingFrictionImpulse = 0.f;
+					btScalar maxImpulse = wheelInfo.m_brake ? wheelInfo.m_brake : defaultRollingFrictionImpulse;
+					btWheelContactPoint contactPt(m_chassisBody, groundObject, wheelInfo.m_raycastInfo.m_contactPointWS, m_forwardWS[wheel], maxImpulse);
+					btAssert(numWheelsOnGround > 0);
+					rollingFriction = calcRollingFriction(contactPt, numWheelsOnGround);
+				}
+			}
+
+			//switch between active rolling (throttle), braking and non-active rolling friction (no throttle/break)
+
+			m_forwardImpulse[wheel] = btScalar(0.);
+			m_wheelInfo[wheel].m_skidInfo = btScalar(1.);
+
+			if (groundObject)
+			{
+				m_wheelInfo[wheel].m_skidInfo = btScalar(1.);
+
+				btScalar maximp = wheelInfo.m_wheelsSuspensionForce * timeStep * wheelInfo.m_frictionSlip;
+				btScalar maximpSide = maximp;
+
+				btScalar maximpSquared = maximp * maximpSide;
+
+				m_forwardImpulse[wheel] = rollingFriction;  //wheelInfo.m_engineForce* timeStep;
+
+				btScalar x = (m_forwardImpulse[wheel]) * fwdFactor;
+				btScalar y = (m_sideImpulse[wheel]) * sideFactor;
+
+				btScalar impulseSquared = (x * x + y * y);
+
+				if (impulseSquared > maximpSquared)
+				{
+					sliding = true;
+
+					btScalar factor = maximp / btSqrt(impulseSquared);
+
+					m_wheelInfo[wheel].m_skidInfo *= factor;
+				}
+			}
+		}
+	}
+
+	if (sliding)
+	{
+		for (int wheel = 0; wheel < getNumWheels(); wheel++)
+		{
+			if (m_sideImpulse[wheel] != btScalar(0.))
+			{
+				if (m_wheelInfo[wheel].m_skidInfo < btScalar(1.))
+				{
+					m_forwardImpulse[wheel] *= m_wheelInfo[wheel].m_skidInfo;
+					m_sideImpulse[wheel] *= m_wheelInfo[wheel].m_skidInfo;
+				}
+			}
+		}
+	}
+
+	// apply the impulses
+	{
+		for (int wheel = 0; wheel < getNumWheels(); wheel++)
+		{
+			btWheelInfo& wheelInfo = m_wheelInfo[wheel];
+
+			btVector3 rel_pos = wheelInfo.m_raycastInfo.m_contactPointWS -
+								m_chassisBody->getCenterOfMassPosition();
+
+			if (m_forwardImpulse[wheel] != btScalar(0.))
+			{
+				m_chassisBody->applyImpulse(m_forwardWS[wheel] * (m_forwardImpulse[wheel]), rel_pos);
+			}
+			if (m_sideImpulse[wheel] != btScalar(0.))
+			{
+				class btRigidBody* groundObject = (class btRigidBody*)m_wheelInfo[wheel].m_raycastInfo.m_groundObject;
+
+				btVector3 rel_pos2 = wheelInfo.m_raycastInfo.m_contactPointWS -
+									 groundObject->getCenterOfMassPosition();
+
+				btVector3 sideImp = m_axle[wheel] * m_sideImpulse[wheel];
+
+#if defined ROLLING_INFLUENCE_FIX  // fix. It only worked if car's up was along Y - VT.
+				btVector3 vChassisWorldUp = getRigidBody()->getCenterOfMassTransform().getBasis().getColumn(m_indexUpAxis);
+				rel_pos -= vChassisWorldUp * (vChassisWorldUp.dot(rel_pos) * (1.f - wheelInfo.m_rollInfluence));
+#else
+				rel_pos[m_indexUpAxis] *= wheelInfo.m_rollInfluence;
+#endif
+				m_chassisBody->applyImpulse(sideImp, rel_pos);
+
+				//apply friction impulse on the ground
+				groundObject->applyImpulse(-sideImp, rel_pos2);
+			}
+		}
+	}
+}
+
+void btRaycastVehicle::debugDraw(btIDebugDraw* debugDrawer)
+{
+	for (int v = 0; v < this->getNumWheels(); v++)
+	{
+		btVector3 wheelColor(0, 1, 1);
+		if (getWheelInfo(v).m_raycastInfo.m_isInContact)
+		{
+			wheelColor.setValue(0, 0, 1);
+		}
+		else
+		{
+			wheelColor.setValue(1, 0, 1);
+		}
+
+		btVector3 wheelPosWS = getWheelInfo(v).m_worldTransform.getOrigin();
+
+		btVector3 axle = btVector3(
+			getWheelInfo(v).m_worldTransform.getBasis()[0][getRightAxis()],
+			getWheelInfo(v).m_worldTransform.getBasis()[1][getRightAxis()],
+			getWheelInfo(v).m_worldTransform.getBasis()[2][getRightAxis()]);
+
+		//debug wheels (cylinders)
+		debugDrawer->drawLine(wheelPosWS, wheelPosWS + axle, wheelColor);
+		debugDrawer->drawLine(wheelPosWS, getWheelInfo(v).m_raycastInfo.m_contactPointWS, wheelColor);
+	}
+}
+
+void* btDefaultVehicleRaycaster::castRay(const btVector3& from, const btVector3& to, btVehicleRaycasterResult& result)
+{
+	//	RayResultCallback& resultCallback;
+
+	btCollisionWorld::ClosestRayResultCallback rayCallback(from, to);
+
+	m_dynamicsWorld->rayTest(from, to, rayCallback);
+
+	if (rayCallback.hasHit())
+	{
+		const btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject);
+		if (body && body->hasContactResponse())
+		{
+			result.m_hitPointInWorld = rayCallback.m_hitPointWorld;
+			result.m_hitNormalInWorld = rayCallback.m_hitNormalWorld;
+			result.m_hitNormalInWorld.normalize();
+			result.m_distFraction = rayCallback.m_closestHitFraction;
+			return (void*)body;
+		}
+	}
+	return 0;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.h
new file mode 100644
index 0000000..b4a92b0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btRaycastVehicle.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2005 Erwin Coumans https://bulletphysics.org
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies.
+ * Erwin Coumans makes no representations about the suitability 
+ * of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+*/
+#ifndef BT_RAYCASTVEHICLE_H
+#define BT_RAYCASTVEHICLE_H
+
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "btVehicleRaycaster.h"
+class btDynamicsWorld;
+#include "LinearMath/btAlignedObjectArray.h"
+#include "btWheelInfo.h"
+#include "BulletDynamics/Dynamics/btActionInterface.h"
+
+//class btVehicleTuning;
+
+///rayCast vehicle, very special constraint that turn a rigidbody into a vehicle.
+class btRaycastVehicle : public btActionInterface
+{
+	btAlignedObjectArray<btVector3> m_forwardWS;
+	btAlignedObjectArray<btVector3> m_axle;
+	btAlignedObjectArray<btScalar> m_forwardImpulse;
+	btAlignedObjectArray<btScalar> m_sideImpulse;
+
+	///backwards compatibility
+	int m_userConstraintType;
+	int m_userConstraintId;
+
+public:
+	class btVehicleTuning
+	{
+	public:
+		btVehicleTuning()
+			: m_suspensionStiffness(btScalar(5.88)),
+			  m_suspensionCompression(btScalar(0.83)),
+			  m_suspensionDamping(btScalar(0.88)),
+			  m_maxSuspensionTravelCm(btScalar(500.)),
+			  m_frictionSlip(btScalar(10.5)),
+			  m_maxSuspensionForce(btScalar(6000.))
+		{
+		}
+		btScalar m_suspensionStiffness;
+		btScalar m_suspensionCompression;
+		btScalar m_suspensionDamping;
+		btScalar m_maxSuspensionTravelCm;
+		btScalar m_frictionSlip;
+		btScalar m_maxSuspensionForce;
+	};
+
+private:
+	btVehicleRaycaster* m_vehicleRaycaster;
+	btScalar m_pitchControl;
+	btScalar m_steeringValue;
+	btScalar m_currentVehicleSpeedKmHour;
+
+	btRigidBody* m_chassisBody;
+
+	int m_indexRightAxis;
+	int m_indexUpAxis;
+	int m_indexForwardAxis;
+
+	void defaultInit(const btVehicleTuning& tuning);
+
+public:
+	//constructor to create a car from an existing rigidbody
+	btRaycastVehicle(const btVehicleTuning& tuning, btRigidBody* chassis, btVehicleRaycaster* raycaster);
+
+	virtual ~btRaycastVehicle();
+
+	///btActionInterface interface
+	virtual void updateAction(btCollisionWorld* collisionWorld, btScalar step)
+	{
+		(void)collisionWorld;
+		updateVehicle(step);
+	}
+
+	///btActionInterface interface
+	void debugDraw(btIDebugDraw* debugDrawer);
+
+	const btTransform& getChassisWorldTransform() const;
+
+	btScalar rayCast(btWheelInfo& wheel);
+
+	virtual void updateVehicle(btScalar step);
+
+	void resetSuspension();
+
+	btScalar getSteeringValue(int wheel) const;
+
+	void setSteeringValue(btScalar steering, int wheel);
+
+	void applyEngineForce(btScalar force, int wheel);
+
+	const btTransform& getWheelTransformWS(int wheelIndex) const;
+
+	void updateWheelTransform(int wheelIndex, bool interpolatedTransform = true);
+
+	//	void	setRaycastWheelInfo( int wheelIndex , bool isInContact, const btVector3& hitPoint, const btVector3& hitNormal,btScalar depth);
+
+	btWheelInfo& addWheel(const btVector3& connectionPointCS0, const btVector3& wheelDirectionCS0, const btVector3& wheelAxleCS, btScalar suspensionRestLength, btScalar wheelRadius, const btVehicleTuning& tuning, bool isFrontWheel);
+
+	inline int getNumWheels() const
+	{
+		return int(m_wheelInfo.size());
+	}
+
+	btAlignedObjectArray<btWheelInfo> m_wheelInfo;
+
+	const btWheelInfo& getWheelInfo(int index) const;
+
+	btWheelInfo& getWheelInfo(int index);
+
+	void updateWheelTransformsWS(btWheelInfo& wheel, bool interpolatedTransform = true);
+
+	void setBrake(btScalar brake, int wheelIndex);
+
+	void setPitchControl(btScalar pitch)
+	{
+		m_pitchControl = pitch;
+	}
+
+	void updateSuspension(btScalar deltaTime);
+
+	virtual void updateFriction(btScalar timeStep);
+
+	inline btRigidBody* getRigidBody()
+	{
+		return m_chassisBody;
+	}
+
+	const btRigidBody* getRigidBody() const
+	{
+		return m_chassisBody;
+	}
+
+	inline int getRightAxis() const
+	{
+		return m_indexRightAxis;
+	}
+	inline int getUpAxis() const
+	{
+		return m_indexUpAxis;
+	}
+
+	inline int getForwardAxis() const
+	{
+		return m_indexForwardAxis;
+	}
+
+	///Worldspace forward vector
+	btVector3 getForwardVector() const
+	{
+		const btTransform& chassisTrans = getChassisWorldTransform();
+
+		btVector3 forwardW(
+			chassisTrans.getBasis()[0][m_indexForwardAxis],
+			chassisTrans.getBasis()[1][m_indexForwardAxis],
+			chassisTrans.getBasis()[2][m_indexForwardAxis]);
+
+		return forwardW;
+	}
+
+	///Velocity of vehicle (positive if velocity vector has same direction as foward vector)
+	btScalar getCurrentSpeedKmHour() const
+	{
+		return m_currentVehicleSpeedKmHour;
+	}
+
+	virtual void setCoordinateSystem(int rightIndex, int upIndex, int forwardIndex)
+	{
+		m_indexRightAxis = rightIndex;
+		m_indexUpAxis = upIndex;
+		m_indexForwardAxis = forwardIndex;
+	}
+
+	///backwards compatibility
+	int getUserConstraintType() const
+	{
+		return m_userConstraintType;
+	}
+
+	void setUserConstraintType(int userConstraintType)
+	{
+		m_userConstraintType = userConstraintType;
+	};
+
+	void setUserConstraintId(int uid)
+	{
+		m_userConstraintId = uid;
+	}
+
+	int getUserConstraintId() const
+	{
+		return m_userConstraintId;
+	}
+};
+
+class btDefaultVehicleRaycaster : public btVehicleRaycaster
+{
+	btDynamicsWorld* m_dynamicsWorld;
+
+public:
+	btDefaultVehicleRaycaster(btDynamicsWorld* world)
+		: m_dynamicsWorld(world)
+	{
+	}
+
+	virtual void* castRay(const btVector3& from, const btVector3& to, btVehicleRaycasterResult& result);
+};
+
+#endif  //BT_RAYCASTVEHICLE_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btVehicleRaycaster.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
new file mode 100644
index 0000000..2c44ce5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2005 Erwin Coumans http://bulletphysics.org
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies.
+ * Erwin Coumans makes no representations about the suitability 
+ * of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+*/
+#ifndef BT_VEHICLE_RAYCASTER_H
+#define BT_VEHICLE_RAYCASTER_H
+
+#include "LinearMath/btVector3.h"
+
+/// btVehicleRaycaster is provides interface for between vehicle simulation and raycasting
+struct btVehicleRaycaster
+{
+	virtual ~btVehicleRaycaster()
+	{
+	}
+	struct btVehicleRaycasterResult
+	{
+		btVehicleRaycasterResult() : m_distFraction(btScalar(-1.)){};
+		btVector3 m_hitPointInWorld;
+		btVector3 m_hitNormalInWorld;
+		btScalar m_distFraction;
+	};
+
+	virtual void* castRay(const btVector3& from, const btVector3& to, btVehicleRaycasterResult& result) = 0;
+};
+
+#endif  //BT_VEHICLE_RAYCASTER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btWheelInfo.cpp b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btWheelInfo.cpp
new file mode 100644
index 0000000..5313215
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btWheelInfo.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2005 Erwin Coumans https://bulletphysics.org
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies.
+ * Erwin Coumans makes no representations about the suitability 
+ * of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+*/
+#include "btWheelInfo.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"  // for pointvelocity
+
+btScalar btWheelInfo::getSuspensionRestLength() const
+{
+	return m_suspensionRestLength1;
+}
+
+void btWheelInfo::updateWheel(const btRigidBody& chassis, RaycastInfo& raycastInfo)
+{
+	(void)raycastInfo;
+
+	if (m_raycastInfo.m_isInContact)
+
+	{
+		btScalar project = m_raycastInfo.m_contactNormalWS.dot(m_raycastInfo.m_wheelDirectionWS);
+		btVector3 chassis_velocity_at_contactPoint;
+		btVector3 relpos = m_raycastInfo.m_contactPointWS - chassis.getCenterOfMassPosition();
+		chassis_velocity_at_contactPoint = chassis.getVelocityInLocalPoint(relpos);
+		btScalar projVel = m_raycastInfo.m_contactNormalWS.dot(chassis_velocity_at_contactPoint);
+		if (project >= btScalar(-0.1))
+		{
+			m_suspensionRelativeVelocity = btScalar(0.0);
+			m_clippedInvContactDotSuspension = btScalar(1.0) / btScalar(0.1);
+		}
+		else
+		{
+			btScalar inv = btScalar(-1.) / project;
+			m_suspensionRelativeVelocity = projVel * inv;
+			m_clippedInvContactDotSuspension = inv;
+		}
+	}
+
+	else  // Not in contact : position wheel in a nice (rest length) position
+	{
+		m_raycastInfo.m_suspensionLength = this->getSuspensionRestLength();
+		m_suspensionRelativeVelocity = btScalar(0.0);
+		m_raycastInfo.m_contactNormalWS = -m_raycastInfo.m_wheelDirectionWS;
+		m_clippedInvContactDotSuspension = btScalar(1.0);
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btWheelInfo.h b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btWheelInfo.h
new file mode 100644
index 0000000..68f6142
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/Vehicle/btWheelInfo.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2005 Erwin Coumans https://bulletphysics.org
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies.
+ * Erwin Coumans makes no representations about the suitability 
+ * of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+*/
+#ifndef BT_WHEEL_INFO_H
+#define BT_WHEEL_INFO_H
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+
+class btRigidBody;
+
+struct btWheelInfoConstructionInfo
+{
+	btVector3 m_chassisConnectionCS;
+	btVector3 m_wheelDirectionCS;
+	btVector3 m_wheelAxleCS;
+	btScalar m_suspensionRestLength;
+	btScalar m_maxSuspensionTravelCm;
+	btScalar m_wheelRadius;
+
+	btScalar m_suspensionStiffness;
+	btScalar m_wheelsDampingCompression;
+	btScalar m_wheelsDampingRelaxation;
+	btScalar m_frictionSlip;
+	btScalar m_maxSuspensionForce;
+	bool m_bIsFrontWheel;
+};
+
+/// btWheelInfo contains information per wheel about friction and suspension.
+struct btWheelInfo
+{
+	struct RaycastInfo
+	{
+		//set by raycaster
+		btVector3 m_contactNormalWS;  //contactnormal
+		btVector3 m_contactPointWS;   //raycast hitpoint
+		btScalar m_suspensionLength;
+		btVector3 m_hardPointWS;       //raycast starting point
+		btVector3 m_wheelDirectionWS;  //direction in worldspace
+		btVector3 m_wheelAxleWS;       // axle in worldspace
+		bool m_isInContact;
+		void* m_groundObject;  //could be general void* ptr
+	};
+
+	RaycastInfo m_raycastInfo;
+
+	btTransform m_worldTransform;
+
+	btVector3 m_chassisConnectionPointCS;  //const
+	btVector3 m_wheelDirectionCS;          //const
+	btVector3 m_wheelAxleCS;               // const or modified by steering
+	btScalar m_suspensionRestLength1;      //const
+	btScalar m_maxSuspensionTravelCm;
+	btScalar getSuspensionRestLength() const;
+	btScalar m_wheelsRadius;              //const
+	btScalar m_suspensionStiffness;       //const
+	btScalar m_wheelsDampingCompression;  //const
+	btScalar m_wheelsDampingRelaxation;   //const
+	btScalar m_frictionSlip;
+	btScalar m_steering;
+	btScalar m_rotation;
+	btScalar m_deltaRotation;
+	btScalar m_rollInfluence;
+	btScalar m_maxSuspensionForce;
+
+	btScalar m_engineForce;
+
+	btScalar m_brake;
+
+	bool m_bIsFrontWheel;
+
+	void* m_clientInfo;  //can be used to store pointer to sync transforms...
+
+	btWheelInfo() {}
+
+	btWheelInfo(btWheelInfoConstructionInfo& ci)
+
+	{
+		m_suspensionRestLength1 = ci.m_suspensionRestLength;
+		m_maxSuspensionTravelCm = ci.m_maxSuspensionTravelCm;
+
+		m_wheelsRadius = ci.m_wheelRadius;
+		m_suspensionStiffness = ci.m_suspensionStiffness;
+		m_wheelsDampingCompression = ci.m_wheelsDampingCompression;
+		m_wheelsDampingRelaxation = ci.m_wheelsDampingRelaxation;
+		m_chassisConnectionPointCS = ci.m_chassisConnectionCS;
+		m_wheelDirectionCS = ci.m_wheelDirectionCS;
+		m_wheelAxleCS = ci.m_wheelAxleCS;
+		m_frictionSlip = ci.m_frictionSlip;
+		m_steering = btScalar(0.);
+		m_engineForce = btScalar(0.);
+		m_rotation = btScalar(0.);
+		m_deltaRotation = btScalar(0.);
+		m_brake = btScalar(0.);
+		m_rollInfluence = btScalar(0.1);
+		m_bIsFrontWheel = ci.m_bIsFrontWheel;
+		m_maxSuspensionForce = ci.m_maxSuspensionForce;
+	}
+
+	void updateWheel(const btRigidBody& chassis, RaycastInfo& raycastInfo);
+
+	btScalar m_clippedInvContactDotSuspension;
+	btScalar m_suspensionRelativeVelocity;
+	//calculated by suspension
+	btScalar m_wheelsSuspensionForce;
+	btScalar m_skidInfo;
+};
+
+#endif  //BT_WHEEL_INFO_H
diff --git a/dali-physics/third-party/bullet3/src/BulletDynamics/premake4.lua b/dali-physics/third-party/bullet3/src/BulletDynamics/premake4.lua
new file mode 100644
index 0000000..fdaf051
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletDynamics/premake4.lua
@@ -0,0 +1,24 @@
+	project "BulletDynamics"
+	kind "StaticLib"
+	includedirs {
+		"..",
+	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+	files {
+		"Dynamics/*.cpp",
+                "Dynamics/*.h",
+                "ConstraintSolver/*.cpp",
+                "ConstraintSolver/*.h",
+                "Featherstone/*.cpp",
+                "Featherstone/*.h",
+                "MLCPSolvers/*.cpp",
+                "MLCPSolvers/*.h",
+                "Vehicle/*.cpp",
+                "Vehicle/*.h",
+                "Character/*.cpp",
+                "Character/*.h"
+
+	}
+
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/CMakeLists.txt b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/CMakeLists.txt
new file mode 100644
index 0000000..3331c27
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/CMakeLists.txt
@@ -0,0 +1,66 @@
+INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src  )
+
+SET(BulletInverseDynamics_SRCS
+	IDMath.cpp
+	MultiBodyTree.cpp
+	details/MultiBodyTreeInitCache.cpp
+	details/MultiBodyTreeImpl.cpp
+)
+
+SET(BulletInverseDynamicsRoot_HDRS
+	IDConfig.hpp
+	IDConfigEigen.hpp
+	IDMath.hpp
+	IDConfigBuiltin.hpp
+	IDErrorMessages.hpp
+	MultiBodyTree.hpp
+)
+SET(BulletInverseDynamicsDetails_HDRS
+	details/IDEigenInterface.hpp
+	details/IDMatVec.hpp
+	details/IDLinearMathInterface.hpp
+	details/MultiBodyTreeImpl.hpp
+	details/MultiBodyTreeInitCache.hpp
+)
+
+SET(BulletInverseDynamics_HDRS
+	${BulletInverseDynamicsRoot_HDRS}
+	${BulletInverseDynamicsDetails_HDRS}
+)
+
+
+ADD_LIBRARY(BulletInverseDynamics ${BulletInverseDynamics_SRCS} ${BulletInverseDynamics_HDRS})
+SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES SOVERSION ${BULLET_VERSION})
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(BulletInverseDynamics Bullet3Common LinearMath)
+ENDIF (BUILD_SHARED_LIBS)
+
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#INSTALL of other files requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS BulletInverseDynamics DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS BulletInverseDynamics RUNTIME DESTINATION bin
+								LIBRARY DESTINATION lib${LIB_SUFFIX}
+								ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+				INSTALL(FILES ../btBulletCollisionCommon.h
+DESTINATION ${INCLUDE_INSTALL_DIR}/BulletInverseDynamics)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES FRAMEWORK true)
+
+			SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES PUBLIC_HEADER "${BulletInverseDynamicsRoot_HDRS}")
+			# Have to list out sub-directories manually:
+			SET_PROPERTY(SOURCE ${BulletInverseDynamicsDetails_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/details)
+
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfig.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfig.hpp
new file mode 100644
index 0000000..b662b80
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfig.hpp
@@ -0,0 +1,107 @@
+///@file Configuration for Inverse Dynamics Library,
+///	  such as choice of linear algebra library and underlying scalar type
+#ifndef IDCONFIG_HPP_
+#define IDCONFIG_HPP_
+
+// If true, enable jacobian calculations.
+// This adds a 3xN matrix to every body, + 2 3-Vectors.
+// so it is not advised for large systems if it is not absolutely necessary.
+// Also, this is not required for standard inverse dynamics calculations.
+// Will only work with vector math libraries that support 3xN matrices.
+#define BT_ID_WITH_JACOBIANS
+
+// If we have a custom configuration, compile without using other parts of bullet.
+#ifdef BT_CUSTOM_INVERSE_DYNAMICS_CONFIG_H
+#include <cmath>
+#define BT_ID_WO_BULLET
+#define BT_ID_SQRT(x) std::sqrt(x)
+#define BT_ID_FABS(x) std::fabs(x)
+#define BT_ID_COS(x) std::cos(x)
+#define BT_ID_SIN(x) std::sin(x)
+#define BT_ID_ATAN2(x, y) std::atan2(x, y)
+#define BT_ID_POW(x, y) std::pow(x, y)
+#define BT_ID_SNPRINTF snprintf
+#define BT_ID_PI M_PI
+#define BT_ID_USE_DOUBLE_PRECISION
+#else
+#define BT_ID_SQRT(x) btSqrt(x)
+#define BT_ID_FABS(x) btFabs(x)
+#define BT_ID_COS(x) btCos(x)
+#define BT_ID_SIN(x) btSin(x)
+#define BT_ID_ATAN2(x, y) btAtan2(x, y)
+#define BT_ID_POW(x, y) btPow(x, y)
+#define BT_ID_PI SIMD_PI
+#ifdef _WIN32
+#define BT_ID_SNPRINTF _snprintf
+#else
+#define BT_ID_SNPRINTF snprintf
+#endif  //
+#endif
+// error messages
+#include "IDErrorMessages.hpp"
+
+#ifdef BT_CUSTOM_INVERSE_DYNAMICS_CONFIG_H
+/*
+#include "IDConfigEigen.hpp"
+#include "IDConfigBuiltin.hpp"
+*/
+#define INVDYN_INCLUDE_HELPER_2(x) #x
+#define INVDYN_INCLUDE_HELPER(x) INVDYN_INCLUDE_HELPER_2(x)
+#include INVDYN_INCLUDE_HELPER(BT_CUSTOM_INVERSE_DYNAMICS_CONFIG_H)
+#ifndef btInverseDynamics
+#error "custom inverse dynamics config, but no custom namespace defined"
+#endif
+
+#define BT_ID_MAX(a, b) std::max(a, b)
+#define BT_ID_MIN(a, b) std::min(a, b)
+
+#else
+#define btInverseDynamics btInverseDynamicsBullet3
+// Use default configuration with bullet's types
+// Use the same scalar type as rest of bullet library
+#include "LinearMath/btScalar.h"
+typedef btScalar idScalar;
+#include "LinearMath/btMinMax.h"
+#define BT_ID_MAX(a, b) btMax(a, b)
+#define BT_ID_MIN(a, b) btMin(a, b)
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define BT_ID_USE_DOUBLE_PRECISION
+#endif
+
+#ifndef BT_USE_INVERSE_DYNAMICS_WITH_BULLET2
+
+// use bullet types for arrays and array indices
+#include "Bullet3Common/b3AlignedObjectArray.h"
+// this is to make it work with C++2003, otherwise we could do this:
+// template <typename T>
+// using idArray = b3AlignedObjectArray<T>;
+template <typename T>
+struct idArray
+{
+	typedef b3AlignedObjectArray<T> type;
+};
+typedef int idArrayIdx;
+#define ID_DECLARE_ALIGNED_ALLOCATOR() B3_DECLARE_ALIGNED_ALLOCATOR()
+
+#else  // BT_USE_INVERSE_DYNAMICS_WITH_BULLET2
+
+#include "LinearMath/btAlignedObjectArray.h"
+template <typename T>
+struct idArray
+{
+	typedef btAlignedObjectArray<T> type;
+};
+typedef int idArrayIdx;
+#define ID_DECLARE_ALIGNED_ALLOCATOR() BT_DECLARE_ALIGNED_ALLOCATOR()
+
+#endif  // BT_USE_INVERSE_DYNAMICS_WITH_BULLET2
+
+// use bullet's allocator functions
+#define idMalloc btAllocFunc
+#define idFree btFreeFunc
+
+#define ID_LINEAR_MATH_USE_BULLET
+#include "details/IDLinearMathInterface.hpp"
+#endif
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfigBuiltin.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfigBuiltin.hpp
new file mode 100644
index 0000000..6392367
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfigBuiltin.hpp
@@ -0,0 +1,38 @@
+///@file Configuration for Inverse Dynamics Library without external dependencies
+#ifndef INVDYNCONFIG_BUILTIN_HPP_
+#define INVDYNCONFIG_BUILTIN_HPP_
+#define btInverseDynamics btInverseDynamicsBuiltin
+#ifdef BT_USE_DOUBLE_PRECISION
+// choose double/single precision version
+typedef double idScalar;
+#else
+typedef float idScalar;
+#endif
+// use std::vector for arrays
+#include <vector>
+// this is to make it work with C++2003, otherwise we could do this
+// template <typename T>
+// using idArray = std::vector<T>;
+template <typename T>
+struct idArray
+{
+	typedef std::vector<T> type;
+};
+typedef std::vector<int>::size_type idArrayIdx;
+// default to standard malloc/free
+#include <cstdlib>
+#define idMalloc ::malloc
+#define idFree ::free
+// currently not aligned at all...
+#define ID_DECLARE_ALIGNED_ALLOCATOR()                                                     \
+	inline void* operator new(std::size_t sizeInBytes) { return idMalloc(sizeInBytes); }   \
+	inline void operator delete(void* ptr) { idFree(ptr); }                                \
+	inline void* operator new(std::size_t, void* ptr) { return ptr; }                      \
+	inline void operator delete(void*, void*) {}                                           \
+	inline void* operator new[](std::size_t sizeInBytes) { return idMalloc(sizeInBytes); } \
+	inline void operator delete[](void* ptr) { idFree(ptr); }                              \
+	inline void* operator new[](std::size_t, void* ptr) { return ptr; }                    \
+	inline void operator delete[](void*, void*) {}
+
+#include "details/IDMatVec.hpp"
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfigEigen.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfigEigen.hpp
new file mode 100644
index 0000000..cfb308e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDConfigEigen.hpp
@@ -0,0 +1,32 @@
+///@file Configuration for Inverse Dynamics Library with Eigen
+#ifndef INVDYNCONFIG_EIGEN_HPP_
+#define INVDYNCONFIG_EIGEN_HPP_
+#define btInverseDynamics btInverseDynamicsEigen
+#ifdef BT_USE_DOUBLE_PRECISION
+// choose double/single precision version
+typedef double idScalar;
+#else
+typedef float idScalar;
+#endif
+
+// use std::vector for arrays
+#include <vector>
+// this is to make it work with C++2003, otherwise we could do this
+// template <typename T>
+// using idArray = std::vector<T>;
+template <typename T>
+struct idArray
+{
+	typedef std::vector<T> type;
+};
+typedef std::vector<int>::size_type idArrayIdx;
+// default to standard malloc/free
+#include <cstdlib>
+#define ID_DECLARE_ALIGNED_ALLOCATOR() EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+// Note on interfaces:
+// Eigen::Matrix has data(), to get c-array storage
+// HOWEVER: default storage is column-major!
+#define ID_LINEAR_MATH_USE_EIGEN
+#include "Eigen/Eigen"
+#include "details/IDEigenInterface.hpp"
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDErrorMessages.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDErrorMessages.hpp
new file mode 100644
index 0000000..5a98f01
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDErrorMessages.hpp
@@ -0,0 +1,31 @@
+///@file error message utility functions
+#ifndef IDUTILS_HPP_
+#define IDUTILS_HPP_
+#include <cstring>
+/// name of file being compiled, without leading path components
+#define __INVDYN_FILE_WO_DIR__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+
+#if !defined(BT_ID_WO_BULLET) && !defined(BT_USE_INVERSE_DYNAMICS_WITH_BULLET2)
+#include "Bullet3Common/b3Logging.h"
+#define bt_id_error_message(...) b3Error(__VA_ARGS__)
+#define bt_id_warning_message(...) b3Warning(__VA_ARGS__)
+#define id_printf(...) b3Printf(__VA_ARGS__)
+#else  // BT_ID_WO_BULLET
+#include <cstdio>
+/// print error message with file/line information
+#define bt_id_error_message(...)                                             \
+	do                                                                       \
+	{                                                                        \
+		fprintf(stderr, "[Error:%s:%d] ", __INVDYN_FILE_WO_DIR__, __LINE__); \
+		fprintf(stderr, __VA_ARGS__);                                        \
+	} while (0)
+/// print warning message with file/line information
+#define bt_id_warning_message(...)                                             \
+	do                                                                         \
+	{                                                                          \
+		fprintf(stderr, "[Warning:%s:%d] ", __INVDYN_FILE_WO_DIR__, __LINE__); \
+		fprintf(stderr, __VA_ARGS__);                                          \
+	} while (0)
+#define id_printf(...) printf(__VA_ARGS__)
+#endif  // BT_ID_WO_BULLET
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDMath.cpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDMath.cpp
new file mode 100644
index 0000000..0c3f5c9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDMath.cpp
@@ -0,0 +1,510 @@
+#include "IDMath.hpp"
+
+#include <cmath>
+#include <limits>
+
+namespace btInverseDynamics
+{
+static const idScalar kIsZero = 5 * std::numeric_limits<idScalar>::epsilon();
+// requirements for axis length deviation from 1.0
+// experimentally set from random euler angle rotation matrices
+static const idScalar kAxisLengthEpsilon = 10 * kIsZero;
+
+void setZero(vec3 &v)
+{
+	v(0) = 0;
+	v(1) = 0;
+	v(2) = 0;
+}
+
+void setZero(vecx &v)
+{
+	for (int i = 0; i < v.size(); i++)
+	{
+		v(i) = 0;
+	}
+}
+
+void setZero(mat33 &m)
+{
+	m(0, 0) = 0;
+	m(0, 1) = 0;
+	m(0, 2) = 0;
+	m(1, 0) = 0;
+	m(1, 1) = 0;
+	m(1, 2) = 0;
+	m(2, 0) = 0;
+	m(2, 1) = 0;
+	m(2, 2) = 0;
+}
+
+void skew(vec3 &v, mat33 *result)
+{
+	(*result)(0, 0) = 0.0;
+	(*result)(0, 1) = -v(2);
+	(*result)(0, 2) = v(1);
+	(*result)(1, 0) = v(2);
+	(*result)(1, 1) = 0.0;
+	(*result)(1, 2) = -v(0);
+	(*result)(2, 0) = -v(1);
+	(*result)(2, 1) = v(0);
+	(*result)(2, 2) = 0.0;
+}
+
+idScalar maxAbs(const vecx &v)
+{
+	idScalar result = 0.0;
+	for (int i = 0; i < v.size(); i++)
+	{
+		const idScalar tmp = BT_ID_FABS(v(i));
+		if (tmp > result)
+		{
+			result = tmp;
+		}
+	}
+	return result;
+}
+
+idScalar maxAbs(const vec3 &v)
+{
+	idScalar result = 0.0;
+	for (int i = 0; i < 3; i++)
+	{
+		const idScalar tmp = BT_ID_FABS(v(i));
+		if (tmp > result)
+		{
+			result = tmp;
+		}
+	}
+	return result;
+}
+
+#if (defined BT_ID_HAVE_MAT3X)
+idScalar maxAbsMat3x(const mat3x &m)
+{
+	// only used for tests -- so just loop here for portability
+	idScalar result = 0.0;
+	for (idArrayIdx col = 0; col < m.cols(); col++)
+	{
+		for (idArrayIdx row = 0; row < 3; row++)
+		{
+			result = BT_ID_MAX(result, std::fabs(m(row, col)));
+		}
+	}
+	return result;
+}
+
+void mul(const mat33 &a, const mat3x &b, mat3x *result)
+{
+	if (b.cols() != result->cols())
+	{
+		bt_id_error_message("size missmatch. b.cols()= %d, result->cols()= %d\n",
+							static_cast<int>(b.cols()), static_cast<int>(result->cols()));
+		abort();
+	}
+
+	for (idArrayIdx col = 0; col < b.cols(); col++)
+	{
+		const idScalar x = a(0, 0) * b(0, col) + a(0, 1) * b(1, col) + a(0, 2) * b(2, col);
+		const idScalar y = a(1, 0) * b(0, col) + a(1, 1) * b(1, col) + a(1, 2) * b(2, col);
+		const idScalar z = a(2, 0) * b(0, col) + a(2, 1) * b(1, col) + a(2, 2) * b(2, col);
+		setMat3xElem(0, col, x, result);
+		setMat3xElem(1, col, y, result);
+		setMat3xElem(2, col, z, result);
+	}
+}
+void add(const mat3x &a, const mat3x &b, mat3x *result)
+{
+	if (a.cols() != b.cols())
+	{
+		bt_id_error_message("size missmatch. a.cols()= %d, b.cols()= %d\n",
+							static_cast<int>(a.cols()), static_cast<int>(b.cols()));
+		abort();
+	}
+	for (idArrayIdx col = 0; col < b.cols(); col++)
+	{
+		for (idArrayIdx row = 0; row < 3; row++)
+		{
+			setMat3xElem(row, col, a(row, col) + b(row, col), result);
+		}
+	}
+}
+void sub(const mat3x &a, const mat3x &b, mat3x *result)
+{
+	if (a.cols() != b.cols())
+	{
+		bt_id_error_message("size missmatch. a.cols()= %d, b.cols()= %d\n",
+							static_cast<int>(a.cols()), static_cast<int>(b.cols()));
+		abort();
+	}
+	for (idArrayIdx col = 0; col < b.cols(); col++)
+	{
+		for (idArrayIdx row = 0; row < 3; row++)
+		{
+			setMat3xElem(row, col, a(row, col) - b(row, col), result);
+		}
+	}
+}
+#endif
+
+mat33 transformX(const idScalar &alpha)
+{
+	mat33 T;
+	const idScalar cos_alpha = BT_ID_COS(alpha);
+	const idScalar sin_alpha = BT_ID_SIN(alpha);
+	// [1  0 0]
+	// [0  c s]
+	// [0 -s c]
+	T(0, 0) = 1.0;
+	T(0, 1) = 0.0;
+	T(0, 2) = 0.0;
+
+	T(1, 0) = 0.0;
+	T(1, 1) = cos_alpha;
+	T(1, 2) = sin_alpha;
+
+	T(2, 0) = 0.0;
+	T(2, 1) = -sin_alpha;
+	T(2, 2) = cos_alpha;
+
+	return T;
+}
+
+mat33 transformY(const idScalar &beta)
+{
+	mat33 T;
+	const idScalar cos_beta = BT_ID_COS(beta);
+	const idScalar sin_beta = BT_ID_SIN(beta);
+	// [c 0 -s]
+	// [0 1  0]
+	// [s 0  c]
+	T(0, 0) = cos_beta;
+	T(0, 1) = 0.0;
+	T(0, 2) = -sin_beta;
+
+	T(1, 0) = 0.0;
+	T(1, 1) = 1.0;
+	T(1, 2) = 0.0;
+
+	T(2, 0) = sin_beta;
+	T(2, 1) = 0.0;
+	T(2, 2) = cos_beta;
+
+	return T;
+}
+
+mat33 transformZ(const idScalar &gamma)
+{
+	mat33 T;
+	const idScalar cos_gamma = BT_ID_COS(gamma);
+	const idScalar sin_gamma = BT_ID_SIN(gamma);
+	// [ c s 0]
+	// [-s c 0]
+	// [ 0 0 1]
+	T(0, 0) = cos_gamma;
+	T(0, 1) = sin_gamma;
+	T(0, 2) = 0.0;
+
+	T(1, 0) = -sin_gamma;
+	T(1, 1) = cos_gamma;
+	T(1, 2) = 0.0;
+
+	T(2, 0) = 0.0;
+	T(2, 1) = 0.0;
+	T(2, 2) = 1.0;
+
+	return T;
+}
+
+mat33 tildeOperator(const vec3 &v)
+{
+	mat33 m;
+	m(0, 0) = 0.0;
+	m(0, 1) = -v(2);
+	m(0, 2) = v(1);
+	m(1, 0) = v(2);
+	m(1, 1) = 0.0;
+	m(1, 2) = -v(0);
+	m(2, 0) = -v(1);
+	m(2, 1) = v(0);
+	m(2, 2) = 0.0;
+	return m;
+}
+
+void getVecMatFromDH(idScalar theta, idScalar d, idScalar a, idScalar alpha, vec3 *r, mat33 *T)
+{
+	const idScalar sa = BT_ID_SIN(alpha);
+	const idScalar ca = BT_ID_COS(alpha);
+	const idScalar st = BT_ID_SIN(theta);
+	const idScalar ct = BT_ID_COS(theta);
+
+	(*r)(0) = a;
+	(*r)(1) = -sa * d;
+	(*r)(2) = ca * d;
+
+	(*T)(0, 0) = ct;
+	(*T)(0, 1) = -st;
+	(*T)(0, 2) = 0.0;
+
+	(*T)(1, 0) = st * ca;
+	(*T)(1, 1) = ct * ca;
+	(*T)(1, 2) = -sa;
+
+	(*T)(2, 0) = st * sa;
+	(*T)(2, 1) = ct * sa;
+	(*T)(2, 2) = ca;
+}
+
+void bodyTParentFromAxisAngle(const vec3 &axis, const idScalar &angle, mat33 *T)
+{
+	const idScalar c = BT_ID_COS(angle);
+	const idScalar s = -BT_ID_SIN(angle);
+	const idScalar one_m_c = 1.0 - c;
+
+	const idScalar &x = axis(0);
+	const idScalar &y = axis(1);
+	const idScalar &z = axis(2);
+
+	(*T)(0, 0) = x * x * one_m_c + c;
+	(*T)(0, 1) = x * y * one_m_c - z * s;
+	(*T)(0, 2) = x * z * one_m_c + y * s;
+
+	(*T)(1, 0) = x * y * one_m_c + z * s;
+	(*T)(1, 1) = y * y * one_m_c + c;
+	(*T)(1, 2) = y * z * one_m_c - x * s;
+
+	(*T)(2, 0) = x * z * one_m_c - y * s;
+	(*T)(2, 1) = y * z * one_m_c + x * s;
+	(*T)(2, 2) = z * z * one_m_c + c;
+}
+
+bool isPositiveDefinite(const mat33 &m)
+{
+	// test if all upper left determinants are positive
+	if (m(0, 0) <= 0)
+	{  // upper 1x1
+		return false;
+	}
+	if (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0) <= 0)
+	{  // upper 2x2
+		return false;
+	}
+	if ((m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) -
+		 m(0, 1) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) +
+		 m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0))) < 0)
+	{
+		return false;
+	}
+	return true;
+}
+
+bool isPositiveSemiDefinite(const mat33 &m)
+{
+	// test if all upper left determinants are positive
+	if (m(0, 0) < 0)
+	{  // upper 1x1
+		return false;
+	}
+	if (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0) < 0)
+	{  // upper 2x2
+		return false;
+	}
+	if ((m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) -
+		 m(0, 1) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) +
+		 m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0))) < 0)
+	{
+		return false;
+	}
+	return true;
+}
+
+bool isPositiveSemiDefiniteFuzzy(const mat33 &m)
+{
+	// test if all upper left determinants are positive
+	if (m(0, 0) < -kIsZero)
+	{  // upper 1x1
+		return false;
+	}
+	if (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0) < -kIsZero)
+	{  // upper 2x2
+		return false;
+	}
+	if ((m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) -
+		 m(0, 1) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) +
+		 m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0))) < -kIsZero)
+	{
+		return false;
+	}
+	return true;
+}
+
+idScalar determinant(const mat33 &m)
+{
+	return m(0, 0) * m(1, 1) * m(2, 2) + m(0, 1) * m(1, 2) * m(2, 0) + m(0, 2) * m(1, 0) * m(2, 1) -
+		   m(0, 2) * m(1, 1) * m(2, 0) - m(0, 0) * m(1, 2) * m(2, 1) - m(0, 1) * m(1, 0) * m(2, 2);
+}
+
+bool isValidInertiaMatrix(const mat33 &I, const int index, bool has_fixed_joint)
+{
+	// TODO(Thomas) do we really want this?
+	//			  in cases where the inertia tensor about the center of mass is zero,
+	//			  the determinant of the inertia tensor about the joint axis is almost
+	//			  zero and can have a very small negative value.
+	if (!isPositiveSemiDefiniteFuzzy(I))
+	{
+		bt_id_error_message(
+			"invalid inertia matrix for body %d, not positive definite "
+			"(fixed joint)\n",
+			index);
+		bt_id_error_message(
+			"matrix is:\n"
+			"[%.20e %.20e %.20e;\n"
+			"%.20e %.20e %.20e;\n"
+			"%.20e %.20e %.20e]\n",
+			I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1),
+			I(2, 2));
+
+		return false;
+	}
+
+	// check triangle inequality, must have I(i,i)+I(j,j)>=I(k,k)
+	if (!has_fixed_joint)
+	{
+		if (I(0, 0) + I(1, 1) < I(2, 2))
+		{
+			bt_id_error_message("invalid inertia tensor for body %d, I(0,0) + I(1,1) < I(2,2)\n", index);
+			bt_id_error_message(
+				"matrix is:\n"
+				"[%.20e %.20e %.20e;\n"
+				"%.20e %.20e %.20e;\n"
+				"%.20e %.20e %.20e]\n",
+				I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1),
+				I(2, 2));
+			return false;
+		}
+		if (I(0, 0) + I(1, 1) < I(2, 2))
+		{
+			bt_id_error_message("invalid inertia tensor for body %d, I(0,0) + I(1,1) < I(2,2)\n", index);
+			bt_id_error_message(
+				"matrix is:\n"
+				"[%.20e %.20e %.20e;\n"
+				"%.20e %.20e %.20e;\n"
+				"%.20e %.20e %.20e]\n",
+				I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1),
+				I(2, 2));
+			return false;
+		}
+		if (I(1, 1) + I(2, 2) < I(0, 0))
+		{
+			bt_id_error_message("invalid inertia tensor for body %d, I(1,1) + I(2,2) < I(0,0)\n", index);
+			bt_id_error_message(
+				"matrix is:\n"
+				"[%.20e %.20e %.20e;\n"
+				"%.20e %.20e %.20e;\n"
+				"%.20e %.20e %.20e]\n",
+				I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1),
+				I(2, 2));
+			return false;
+		}
+	}
+	// check positive/zero diagonal elements
+	for (int i = 0; i < 3; i++)
+	{
+		if (I(i, i) < 0)
+		{  // accept zero
+			bt_id_error_message("invalid inertia tensor, I(%d,%d)= %e <0\n", i, i, I(i, i));
+			return false;
+		}
+	}
+	// check symmetry
+	if (BT_ID_FABS(I(1, 0) - I(0, 1)) > kIsZero)
+	{
+		bt_id_error_message(
+			"invalid inertia tensor for body %d I(1,0)!=I(0,1). I(1,0)-I(0,1)= "
+			"%e\n",
+			index, I(1, 0) - I(0, 1));
+		return false;
+	}
+	if (BT_ID_FABS(I(2, 0) - I(0, 2)) > kIsZero)
+	{
+		bt_id_error_message(
+			"invalid inertia tensor for body %d I(2,0)!=I(0,2). I(2,0)-I(0,2)= "
+			"%e\n",
+			index, I(2, 0) - I(0, 2));
+		return false;
+	}
+	if (BT_ID_FABS(I(1, 2) - I(2, 1)) > kIsZero)
+	{
+		bt_id_error_message("invalid inertia tensor body %d I(1,2)!=I(2,1). I(1,2)-I(2,1)= %e\n", index,
+							I(1, 2) - I(2, 1));
+		return false;
+	}
+	return true;
+}
+
+bool isValidTransformMatrix(const mat33 &m)
+{
+#define print_mat(x)                                                                                   \
+	bt_id_error_message("matrix is [%e, %e, %e; %e, %e, %e; %e, %e, %e]\n", x(0, 0), x(0, 1), x(0, 2), \
+						x(1, 0), x(1, 1), x(1, 2), x(2, 0), x(2, 1), x(2, 2))
+
+	// check for unit length column vectors
+	for (int i = 0; i < 3; i++)
+	{
+		const idScalar length_minus_1 =
+			BT_ID_FABS(m(0, i) * m(0, i) + m(1, i) * m(1, i) + m(2, i) * m(2, i) - 1.0);
+		if (length_minus_1 > kAxisLengthEpsilon)
+		{
+			bt_id_error_message(
+				"Not a valid rotation matrix (column %d not unit length)\n"
+				"column = [%.18e %.18e %.18e]\n"
+				"length-1.0= %.18e\n",
+				i, m(0, i), m(1, i), m(2, i), length_minus_1);
+			print_mat(m);
+			return false;
+		}
+	}
+	// check for orthogonal column vectors
+	if (BT_ID_FABS(m(0, 0) * m(0, 1) + m(1, 0) * m(1, 1) + m(2, 0) * m(2, 1)) > kAxisLengthEpsilon)
+	{
+		bt_id_error_message("Not a valid rotation matrix (columns 0 and 1 not orthogonal)\n");
+		print_mat(m);
+		return false;
+	}
+	if (BT_ID_FABS(m(0, 0) * m(0, 2) + m(1, 0) * m(1, 2) + m(2, 0) * m(2, 2)) > kAxisLengthEpsilon)
+	{
+		bt_id_error_message("Not a valid rotation matrix (columns 0 and 2 not orthogonal)\n");
+		print_mat(m);
+		return false;
+	}
+	if (BT_ID_FABS(m(0, 1) * m(0, 2) + m(1, 1) * m(1, 2) + m(2, 1) * m(2, 2)) > kAxisLengthEpsilon)
+	{
+		bt_id_error_message("Not a valid rotation matrix (columns 0 and 2 not orthogonal)\n");
+		print_mat(m);
+		return false;
+	}
+	// check determinant (rotation not reflection)
+	if (determinant(m) <= 0)
+	{
+		bt_id_error_message("Not a valid rotation matrix (determinant <=0)\n");
+		print_mat(m);
+		return false;
+	}
+	return true;
+}
+
+bool isUnitVector(const vec3 &vector)
+{
+	return BT_ID_FABS(vector(0) * vector(0) + vector(1) * vector(1) + vector(2) * vector(2) - 1.0) <
+		   kIsZero;
+}
+
+vec3 rpyFromMatrix(const mat33 &rot)
+{
+	vec3 rpy;
+	rpy(2) = BT_ID_ATAN2(-rot(1, 0), rot(0, 0));
+	rpy(0) = BT_ID_ATAN2(-rot(2, 0), rot(2, 2));
+	rpy(1) = BT_ID_ATAN2(rot(2, 0), BT_ID_COS(rpy(2)) * rot(0, 0) - BT_ID_SIN(rpy(0)) * rot(1, 0));
+	return rpy;
+}
+}  // namespace btInverseDynamics
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDMath.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDMath.hpp
new file mode 100644
index 0000000..40bee53
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/IDMath.hpp
@@ -0,0 +1,100 @@
+/// @file Math utility functions used in inverse dynamics library.
+///	   Defined here as they may not be provided by the math library.
+
+#ifndef IDMATH_HPP_
+#define IDMATH_HPP_
+#include "IDConfig.hpp"
+
+namespace btInverseDynamics
+{
+/// set all elements to zero
+void setZero(vec3& v);
+/// set all elements to zero
+void setZero(vecx& v);
+/// set all elements to zero
+void setZero(mat33& m);
+/// create a skew symmetric matrix from a vector (useful for cross product abstraction, e.g. v x a = V * a)
+void skew(vec3& v, mat33* result);
+/// return maximum absolute value
+idScalar maxAbs(const vecx& v);
+#ifndef ID_LINEAR_MATH_USE_EIGEN
+/// return maximum absolute value
+idScalar maxAbs(const vec3& v);
+#endif  //ID_LINEAR_MATH_USE_EIGEN
+
+#if (defined BT_ID_HAVE_MAT3X)
+idScalar maxAbsMat3x(const mat3x& m);
+void setZero(mat3x& m);
+// define math functions on mat3x here to avoid allocations in operators.
+void mul(const mat33& a, const mat3x& b, mat3x* result);
+void add(const mat3x& a, const mat3x& b, mat3x* result);
+void sub(const mat3x& a, const mat3x& b, mat3x* result);
+#endif
+
+/// get offset vector & transform matrix from DH parameters
+/// TODO: add documentation
+void getVecMatFromDH(idScalar theta, idScalar d, idScalar a, idScalar alpha, vec3* r, mat33* T);
+
+/// Check if a 3x3 matrix is positive definite
+/// @param m a 3x3 matrix
+/// @return true if m>0, false otherwise
+bool isPositiveDefinite(const mat33& m);
+
+/// Check if a 3x3 matrix is positive semi definite
+/// @param m a 3x3 matrix
+/// @return true if m>=0, false otherwise
+bool isPositiveSemiDefinite(const mat33& m);
+/// Check if a 3x3 matrix is positive semi definite within numeric limits
+/// @param m a 3x3 matrix
+/// @return true if m>=-eps, false otherwise
+bool isPositiveSemiDefiniteFuzzy(const mat33& m);
+
+/// Determinant of 3x3 matrix
+/// NOTE: implemented here for portability, as determinant operation
+///	   will be implemented differently for various matrix/vector libraries
+/// @param m a 3x3 matrix
+/// @return det(m)
+idScalar determinant(const mat33& m);
+
+/// Test if a 3x3 matrix satisfies some properties of inertia matrices
+/// @param I a 3x3 matrix
+/// @param index body index (for error messages)
+/// @param has_fixed_joint: if true, positive semi-definite matrices are accepted
+/// @return true if I satisfies inertia matrix properties, false otherwise.
+bool isValidInertiaMatrix(const mat33& I, int index, bool has_fixed_joint);
+
+/// Check if a 3x3 matrix is a valid transform (rotation) matrix
+/// @param m a 3x3 matrix
+/// @return true if m is a rotation matrix, false otherwise
+bool isValidTransformMatrix(const mat33& m);
+/// Transform matrix from parent to child frame,
+/// when the child frame is rotated about @param axis by @angle
+/// (mathematically positive)
+/// @param axis the axis of rotation
+/// @param angle rotation angle
+/// @param T pointer to transform matrix
+void bodyTParentFromAxisAngle(const vec3& axis, const idScalar& angle, mat33* T);
+
+/// Check if this is a unit vector
+/// @param vector
+/// @return true if |vector|=1 within numeric limits
+bool isUnitVector(const vec3& vector);
+
+/// @input a vector in R^3
+/// @returns corresponding spin tensor
+mat33 tildeOperator(const vec3& v);
+/// @param alpha angle in radians
+/// @returns transform matrix for ratation with @param alpha about x-axis
+mat33 transformX(const idScalar& alpha);
+/// @param beta angle in radians
+/// @returns transform matrix for ratation with @param beta about y-axis
+mat33 transformY(const idScalar& beta);
+/// @param gamma angle in radians
+/// @returns transform matrix for ratation with @param gamma about z-axis
+mat33 transformZ(const idScalar& gamma);
+///calculate rpy angles (x-y-z Euler angles) from a given rotation matrix
+/// @param rot rotation matrix
+/// @returns x-y-z Euler angles
+vec3 rpyFromMatrix(const mat33& rot);
+}  // namespace btInverseDynamics
+#endif  // IDMATH_HPP_
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/MultiBodyTree.cpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/MultiBodyTree.cpp
new file mode 100644
index 0000000..9326b0d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/MultiBodyTree.cpp
@@ -0,0 +1,548 @@
+#include "MultiBodyTree.hpp"
+
+#include <cmath>
+#include <limits>
+#include <vector>
+
+#include "IDMath.hpp"
+#include "details/MultiBodyTreeImpl.hpp"
+#include "details/MultiBodyTreeInitCache.hpp"
+
+namespace btInverseDynamics
+{
+MultiBodyTree::MultiBodyTree()
+	: m_is_finalized(false),
+	  m_mass_parameters_are_valid(true),
+	  m_accept_invalid_mass_parameters(false),
+	  m_impl(0x0),
+	  m_init_cache(0x0)
+{
+	m_init_cache = new InitCache();
+}
+
+MultiBodyTree::~MultiBodyTree()
+{
+	delete m_impl;
+	delete m_init_cache;
+}
+
+void MultiBodyTree::setAcceptInvalidMassParameters(bool flag)
+{
+	m_accept_invalid_mass_parameters = flag;
+}
+
+bool MultiBodyTree::getAcceptInvalidMassProperties() const
+{
+	return m_accept_invalid_mass_parameters;
+}
+
+int MultiBodyTree::getBodyOrigin(const int body_index, vec3 *world_origin) const
+{
+	return m_impl->getBodyOrigin(body_index, world_origin);
+}
+
+int MultiBodyTree::getBodyCoM(const int body_index, vec3 *world_com) const
+{
+	return m_impl->getBodyCoM(body_index, world_com);
+}
+
+int MultiBodyTree::getBodyTransform(const int body_index, mat33 *world_T_body) const
+{
+	return m_impl->getBodyTransform(body_index, world_T_body);
+}
+int MultiBodyTree::getBodyAngularVelocity(const int body_index, vec3 *world_omega) const
+{
+	return m_impl->getBodyAngularVelocity(body_index, world_omega);
+}
+int MultiBodyTree::getBodyLinearVelocity(const int body_index, vec3 *world_velocity) const
+{
+	return m_impl->getBodyLinearVelocity(body_index, world_velocity);
+}
+
+int MultiBodyTree::getBodyLinearVelocityCoM(const int body_index, vec3 *world_velocity) const
+{
+	return m_impl->getBodyLinearVelocityCoM(body_index, world_velocity);
+}
+
+int MultiBodyTree::getBodyAngularAcceleration(const int body_index, vec3 *world_dot_omega) const
+{
+	return m_impl->getBodyAngularAcceleration(body_index, world_dot_omega);
+}
+int MultiBodyTree::getBodyLinearAcceleration(const int body_index, vec3 *world_acceleration) const
+{
+	return m_impl->getBodyLinearAcceleration(body_index, world_acceleration);
+}
+
+int MultiBodyTree::getParentRParentBodyRef(const int body_index, vec3 *r) const
+{
+	return m_impl->getParentRParentBodyRef(body_index, r);
+}
+
+int MultiBodyTree::getBodyTParentRef(const int body_index, mat33 *T) const
+{
+	return m_impl->getBodyTParentRef(body_index, T);
+}
+
+int MultiBodyTree::getBodyAxisOfMotion(const int body_index, vec3 *axis) const
+{
+	return m_impl->getBodyAxisOfMotion(body_index, axis);
+}
+
+void MultiBodyTree::printTree() { m_impl->printTree(); }
+void MultiBodyTree::printTreeData() { m_impl->printTreeData(); }
+
+int MultiBodyTree::numBodies() const { return m_impl->m_num_bodies; }
+
+int MultiBodyTree::numDoFs() const { return m_impl->m_num_dofs; }
+
+int MultiBodyTree::calculateInverseDynamics(const vecx &q, const vecx &u, const vecx &dot_u,
+											vecx *joint_forces)
+{
+	if (false == m_is_finalized)
+	{
+		bt_id_error_message("system has not been initialized\n");
+		return -1;
+	}
+	if (-1 == m_impl->calculateInverseDynamics(q, u, dot_u, joint_forces))
+	{
+		bt_id_error_message("error in inverse dynamics calculation\n");
+		return -1;
+	}
+	return 0;
+}
+
+int MultiBodyTree::calculateMassMatrix(const vecx &q, const bool update_kinematics,
+									   const bool initialize_matrix,
+									   const bool set_lower_triangular_matrix, matxx *mass_matrix)
+{
+	if (false == m_is_finalized)
+	{
+		bt_id_error_message("system has not been initialized\n");
+		return -1;
+	}
+	if (-1 ==
+		m_impl->calculateMassMatrix(q, update_kinematics, initialize_matrix,
+									set_lower_triangular_matrix, mass_matrix))
+	{
+		bt_id_error_message("error in mass matrix calculation\n");
+		return -1;
+	}
+	return 0;
+}
+
+int MultiBodyTree::calculateMassMatrix(const vecx &q, matxx *mass_matrix)
+{
+	return calculateMassMatrix(q, true, true, true, mass_matrix);
+}
+
+int MultiBodyTree::calculateKinematics(const vecx &q, const vecx &u, const vecx &dot_u)
+{
+	vec3 world_gravity(m_impl->m_world_gravity);
+	// temporarily set gravity to zero, to ensure we get the actual accelerations
+	setZero(m_impl->m_world_gravity);
+
+	if (false == m_is_finalized)
+	{
+		bt_id_error_message("system has not been initialized\n");
+		return -1;
+	}
+	if (-1 == m_impl->calculateKinematics(q, u, dot_u,
+										  MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY_ACCELERATION))
+	{
+		bt_id_error_message("error in kinematics calculation\n");
+		return -1;
+	}
+
+	m_impl->m_world_gravity = world_gravity;
+	return 0;
+}
+
+int MultiBodyTree::calculatePositionKinematics(const vecx &q)
+{
+	if (false == m_is_finalized)
+	{
+		bt_id_error_message("system has not been initialized\n");
+		return -1;
+	}
+	if (-1 == m_impl->calculateKinematics(q, q, q,
+										  MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY))
+	{
+		bt_id_error_message("error in kinematics calculation\n");
+		return -1;
+	}
+	return 0;
+}
+
+int MultiBodyTree::calculatePositionAndVelocityKinematics(const vecx &q, const vecx &u)
+{
+	if (false == m_is_finalized)
+	{
+		bt_id_error_message("system has not been initialized\n");
+		return -1;
+	}
+	if (-1 == m_impl->calculateKinematics(q, u, u,
+										  MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY))
+	{
+		bt_id_error_message("error in kinematics calculation\n");
+		return -1;
+	}
+	return 0;
+}
+
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+int MultiBodyTree::calculateJacobians(const vecx &q, const vecx &u)
+{
+	if (false == m_is_finalized)
+	{
+		bt_id_error_message("system has not been initialized\n");
+		return -1;
+	}
+	if (-1 == m_impl->calculateJacobians(q, u,
+										 MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY))
+	{
+		bt_id_error_message("error in jacobian calculation\n");
+		return -1;
+	}
+	return 0;
+}
+
+int MultiBodyTree::calculateJacobians(const vecx &q)
+{
+	if (false == m_is_finalized)
+	{
+		bt_id_error_message("system has not been initialized\n");
+		return -1;
+	}
+	if (-1 == m_impl->calculateJacobians(q, q,
+										 MultiBodyTree::MultiBodyImpl::POSITION_ONLY))
+	{
+		bt_id_error_message("error in jacobian calculation\n");
+		return -1;
+	}
+	return 0;
+}
+
+int MultiBodyTree::getBodyDotJacobianTransU(const int body_index, vec3 *world_dot_jac_trans_u) const
+{
+	return m_impl->getBodyDotJacobianTransU(body_index, world_dot_jac_trans_u);
+}
+
+int MultiBodyTree::getBodyDotJacobianRotU(const int body_index, vec3 *world_dot_jac_rot_u) const
+{
+	return m_impl->getBodyDotJacobianRotU(body_index, world_dot_jac_rot_u);
+}
+
+int MultiBodyTree::getBodyJacobianTrans(const int body_index, mat3x *world_jac_trans) const
+{
+	return m_impl->getBodyJacobianTrans(body_index, world_jac_trans);
+}
+
+int MultiBodyTree::getBodyJacobianRot(const int body_index, mat3x *world_jac_rot) const
+{
+	return m_impl->getBodyJacobianRot(body_index, world_jac_rot);
+}
+
+#endif
+
+int MultiBodyTree::addBody(int body_index, int parent_index, JointType joint_type,
+						   const vec3 &parent_r_parent_body_ref, const mat33 &body_T_parent_ref,
+						   const vec3 &body_axis_of_motion_, idScalar mass,
+						   const vec3 &body_r_body_com, const mat33 &body_I_body,
+						   const int user_int, void *user_ptr)
+{
+	if (body_index < 0)
+	{
+		bt_id_error_message("body index must be positive (got %d)\n", body_index);
+		return -1;
+	}
+	vec3 body_axis_of_motion(body_axis_of_motion_);
+	switch (joint_type)
+	{
+		case REVOLUTE:
+		case PRISMATIC:
+			// check if axis is unit vector
+			if (!isUnitVector(body_axis_of_motion))
+			{
+				bt_id_warning_message(
+					"axis of motion not a unit axis ([%f %f %f]), will use normalized vector\n",
+					body_axis_of_motion(0), body_axis_of_motion(1), body_axis_of_motion(2));
+				idScalar length = BT_ID_SQRT(BT_ID_POW(body_axis_of_motion(0), 2) +
+											 BT_ID_POW(body_axis_of_motion(1), 2) +
+											 BT_ID_POW(body_axis_of_motion(2), 2));
+				if (length < BT_ID_SQRT(std::numeric_limits<idScalar>::min()))
+				{
+					bt_id_error_message("axis of motion vector too short (%e)\n", length);
+					return -1;
+				}
+				body_axis_of_motion = (1.0 / length) * body_axis_of_motion;
+			}
+			break;
+		case FIXED:
+			break;
+		case FLOATING:
+			break;
+		case SPHERICAL:
+			break;
+		default:
+			bt_id_error_message("unknown joint type %d\n", joint_type);
+			return -1;
+	}
+
+	// sanity check for mass properties. Zero mass is OK.
+	if (mass < 0)
+	{
+		m_mass_parameters_are_valid = false;
+		bt_id_error_message("Body %d has invalid mass %e\n", body_index, mass);
+		if (!m_accept_invalid_mass_parameters)
+		{
+			return -1;
+		}
+	}
+
+	if (!isValidInertiaMatrix(body_I_body, body_index, FIXED == joint_type))
+	{
+		m_mass_parameters_are_valid = false;
+		// error message printed in function call
+		if (!m_accept_invalid_mass_parameters)
+		{
+			return -1;
+		}
+	}
+
+	if (!isValidTransformMatrix(body_T_parent_ref))
+	{
+		return -1;
+	}
+
+	return m_init_cache->addBody(body_index, parent_index, joint_type, parent_r_parent_body_ref,
+								 body_T_parent_ref, body_axis_of_motion, mass, body_r_body_com,
+								 body_I_body, user_int, user_ptr);
+}
+
+int MultiBodyTree::getParentIndex(const int body_index, int *parent_index) const
+{
+	return m_impl->getParentIndex(body_index, parent_index);
+}
+
+int MultiBodyTree::getUserInt(const int body_index, int *user_int) const
+{
+	return m_impl->getUserInt(body_index, user_int);
+}
+
+int MultiBodyTree::getUserPtr(const int body_index, void **user_ptr) const
+{
+	return m_impl->getUserPtr(body_index, user_ptr);
+}
+
+int MultiBodyTree::setUserInt(const int body_index, const int user_int)
+{
+	return m_impl->setUserInt(body_index, user_int);
+}
+
+int MultiBodyTree::setUserPtr(const int body_index, void *const user_ptr)
+{
+	return m_impl->setUserPtr(body_index, user_ptr);
+}
+
+int MultiBodyTree::finalize()
+{
+	const int &num_bodies = m_init_cache->numBodies();
+	const int &num_dofs = m_init_cache->numDoFs();
+
+	if (num_dofs < 0)
+	{
+		bt_id_error_message("Need num_dofs>=1, but num_dofs= %d\n", num_dofs);
+		//return -1;
+	}
+
+	// 1 allocate internal MultiBody structure
+	m_impl = new MultiBodyImpl(num_bodies, num_dofs);
+
+	// 2 build new index set assuring index(parent) < index(child)
+	if (-1 == m_init_cache->buildIndexSets())
+	{
+		return -1;
+	}
+	m_init_cache->getParentIndexArray(&m_impl->m_parent_index);
+
+	// 3 setup internal kinematic and dynamic data
+	for (int index = 0; index < num_bodies; index++)
+	{
+		InertiaData inertia;
+		JointData joint;
+		if (-1 == m_init_cache->getInertiaData(index, &inertia))
+		{
+			return -1;
+		}
+		if (-1 == m_init_cache->getJointData(index, &joint))
+		{
+			return -1;
+		}
+
+		RigidBody &rigid_body = m_impl->m_body_list[index];
+
+		rigid_body.m_mass = inertia.m_mass;
+		rigid_body.m_body_mass_com = inertia.m_mass * inertia.m_body_pos_body_com;
+		rigid_body.m_body_I_body = inertia.m_body_I_body;
+		rigid_body.m_joint_type = joint.m_type;
+		rigid_body.m_parent_pos_parent_body_ref = joint.m_parent_pos_parent_child_ref;
+		rigid_body.m_body_T_parent_ref = joint.m_child_T_parent_ref;
+		rigid_body.m_parent_pos_parent_body_ref = joint.m_parent_pos_parent_child_ref;
+		rigid_body.m_joint_type = joint.m_type;
+
+		int user_int;
+		if (-1 == m_init_cache->getUserInt(index, &user_int))
+		{
+			return -1;
+		}
+		if (-1 == m_impl->setUserInt(index, user_int))
+		{
+			return -1;
+		}
+
+		void *user_ptr;
+		if (-1 == m_init_cache->getUserPtr(index, &user_ptr))
+		{
+			return -1;
+		}
+		if (-1 == m_impl->setUserPtr(index, user_ptr))
+		{
+			return -1;
+		}
+
+		// Set joint Jacobians. Note that the dimension is always 3x1 here to avoid variable sized
+		// matrices.
+		switch (rigid_body.m_joint_type)
+		{
+			case REVOLUTE:
+				rigid_body.m_Jac_JR(0) = joint.m_child_axis_of_motion(0);
+				rigid_body.m_Jac_JR(1) = joint.m_child_axis_of_motion(1);
+				rigid_body.m_Jac_JR(2) = joint.m_child_axis_of_motion(2);
+				rigid_body.m_Jac_JT(0) = 0.0;
+				rigid_body.m_Jac_JT(1) = 0.0;
+				rigid_body.m_Jac_JT(2) = 0.0;
+				break;
+			case PRISMATIC:
+				rigid_body.m_Jac_JR(0) = 0.0;
+				rigid_body.m_Jac_JR(1) = 0.0;
+				rigid_body.m_Jac_JR(2) = 0.0;
+				rigid_body.m_Jac_JT(0) = joint.m_child_axis_of_motion(0);
+				rigid_body.m_Jac_JT(1) = joint.m_child_axis_of_motion(1);
+				rigid_body.m_Jac_JT(2) = joint.m_child_axis_of_motion(2);
+				break;
+			case FIXED:
+				// NOTE/TODO: dimension really should be zero ..
+				rigid_body.m_Jac_JR(0) = 0.0;
+				rigid_body.m_Jac_JR(1) = 0.0;
+				rigid_body.m_Jac_JR(2) = 0.0;
+				rigid_body.m_Jac_JT(0) = 0.0;
+				rigid_body.m_Jac_JT(1) = 0.0;
+				rigid_body.m_Jac_JT(2) = 0.0;
+				break;
+			case SPHERICAL:
+				// NOTE/TODO: this is not really correct.
+				// the Jacobians should be 3x3 matrices here !
+				rigid_body.m_Jac_JR(0) = 0.0;
+				rigid_body.m_Jac_JR(1) = 0.0;
+				rigid_body.m_Jac_JR(2) = 0.0;
+				rigid_body.m_Jac_JT(0) = 0.0;
+				rigid_body.m_Jac_JT(1) = 0.0;
+				rigid_body.m_Jac_JT(2) = 0.0;
+				break;
+			case FLOATING:
+				// NOTE/TODO: this is not really correct.
+				// the Jacobians should be 3x3 matrices here !
+				rigid_body.m_Jac_JR(0) = 0.0;
+				rigid_body.m_Jac_JR(1) = 0.0;
+				rigid_body.m_Jac_JR(2) = 0.0;
+				rigid_body.m_Jac_JT(0) = 0.0;
+				rigid_body.m_Jac_JT(1) = 0.0;
+				rigid_body.m_Jac_JT(2) = 0.0;
+				break;
+			default:
+				bt_id_error_message("unsupported joint type %d\n", rigid_body.m_joint_type);
+				return -1;
+		}
+	}
+
+	// 4 assign degree of freedom indices & build per-joint-type index arrays
+	if (-1 == m_impl->generateIndexSets())
+	{
+		bt_id_error_message("generating index sets\n");
+		return -1;
+	}
+
+	// 5 do some pre-computations ..
+	m_impl->calculateStaticData();
+
+	// 6. make sure all user forces are set to zero, as this might not happen
+	//	in the vector ctors.
+	m_impl->clearAllUserForcesAndMoments();
+
+	m_is_finalized = true;
+	return 0;
+}
+
+int MultiBodyTree::setGravityInWorldFrame(const vec3 &gravity)
+{
+	return m_impl->setGravityInWorldFrame(gravity);
+}
+
+int MultiBodyTree::getJointType(const int body_index, JointType *joint_type) const
+{
+	return m_impl->getJointType(body_index, joint_type);
+}
+
+int MultiBodyTree::getJointTypeStr(const int body_index, const char **joint_type) const
+{
+	return m_impl->getJointTypeStr(body_index, joint_type);
+}
+
+int MultiBodyTree::getDoFOffset(const int body_index, int *q_offset) const
+{
+	return m_impl->getDoFOffset(body_index, q_offset);
+}
+
+int MultiBodyTree::setBodyMass(const int body_index, idScalar mass)
+{
+	return m_impl->setBodyMass(body_index, mass);
+}
+
+int MultiBodyTree::setBodyFirstMassMoment(const int body_index, const vec3 &first_mass_moment)
+{
+	return m_impl->setBodyFirstMassMoment(body_index, first_mass_moment);
+}
+
+int MultiBodyTree::setBodySecondMassMoment(const int body_index, const mat33 &second_mass_moment)
+{
+	return m_impl->setBodySecondMassMoment(body_index, second_mass_moment);
+}
+
+int MultiBodyTree::getBodyMass(const int body_index, idScalar *mass) const
+{
+	return m_impl->getBodyMass(body_index, mass);
+}
+
+int MultiBodyTree::getBodyFirstMassMoment(const int body_index, vec3 *first_mass_moment) const
+{
+	return m_impl->getBodyFirstMassMoment(body_index, first_mass_moment);
+}
+
+int MultiBodyTree::getBodySecondMassMoment(const int body_index, mat33 *second_mass_moment) const
+{
+	return m_impl->getBodySecondMassMoment(body_index, second_mass_moment);
+}
+
+void MultiBodyTree::clearAllUserForcesAndMoments() { m_impl->clearAllUserForcesAndMoments(); }
+
+int MultiBodyTree::addUserForce(const int body_index, const vec3 &body_force)
+{
+	return m_impl->addUserForce(body_index, body_force);
+}
+
+int MultiBodyTree::addUserMoment(const int body_index, const vec3 &body_moment)
+{
+	return m_impl->addUserMoment(body_index, body_moment);
+}
+
+}  // namespace btInverseDynamics
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/MultiBodyTree.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/MultiBodyTree.hpp
new file mode 100644
index 0000000..7b852f9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/MultiBodyTree.hpp
@@ -0,0 +1,367 @@
+#ifndef MULTIBODYTREE_HPP_
+#define MULTIBODYTREE_HPP_
+
+#include "IDConfig.hpp"
+#include "IDMath.hpp"
+
+namespace btInverseDynamics
+{
+/// Enumeration of supported joint types
+enum JointType
+{
+	/// no degree of freedom, moves with parent
+	FIXED = 0,
+	/// one rotational degree of freedom relative to parent
+	REVOLUTE,
+	/// one translational degree of freedom relative to parent
+	PRISMATIC,
+	/// six degrees of freedom relative to parent
+	FLOATING,
+	/// three degrees of freedom, relative to parent
+	SPHERICAL
+};
+
+/// Interface class for calculating inverse dynamics for tree structured
+/// multibody systems
+///
+/// Note on degrees of freedom
+/// The q vector contains the generalized coordinate set defining the tree's configuration.
+/// Every joint adds elements that define the corresponding link's frame pose relative to
+/// its parent. For the joint types that is:
+///	- FIXED:	 none
+///	- REVOLUTE:  angle of rotation [rad]
+///	- PRISMATIC: displacement [m]
+///	- FLOATING:  Euler x-y-z angles [rad] and displacement in body-fixed frame of parent [m]
+///				 (in that order)
+/// - SPHERICAL: Euler x-y-z angles [rad]
+/// The u vector contains the generalized speeds, which are
+///	- FIXED:	 none
+///	- REVOLUTE:  time derivative of angle of rotation [rad/s]
+///	- PRISMATIC: time derivative of displacement [m/s]
+///	- FLOATING:  angular velocity [rad/s] (*not* time derivative of rpy angles)
+///				 and time derivative of displacement in parent frame [m/s]
+//	- SPHERICAL:  angular velocity [rad/s]
+///
+/// The q and u vectors are obtained by stacking contributions of all bodies in one
+/// vector in the order of body indices.
+///
+/// Note on generalized forces: analogous to u, i.e.,
+///	 - FIXED:	 none
+///	 - REVOLUTE:  moment [Nm], about joint axis
+///	 - PRISMATIC: force  [N], along joint axis
+///	 - FLOATING:  moment vector [Nm] and force vector [N], both in body-fixed frame
+///				  (in that order)
+///  - SPHERICAL: moment vector [Nm] 
+/// TODO - force element interface (friction, springs, dampers, etc)
+///	  - gears and motor inertia
+class MultiBodyTree
+{
+public:
+	ID_DECLARE_ALIGNED_ALLOCATOR();
+	/// The contructor.
+	/// Initialization & allocation is via addBody and buildSystem calls.
+	MultiBodyTree();
+	/// the destructor. This also deallocates all memory
+	~MultiBodyTree();
+
+	/// Add body to the system. this allocates memory and not real-time safe.
+	/// This only adds the data to an initial cache. After all bodies have been
+	/// added,
+	/// the system is setup using the buildSystem call
+	/// @param body_index index of the body to be added. Must >=0, <number of bodies,
+	///		and index of parent must be < index of body
+	/// @param parent_index index of the parent body
+	///		The root of the tree has index 0 and its parent (the world frame)
+	///		is assigned index -1
+	///		the rotation and translation relative to the parent are taken as
+	///		pose of the root body relative to the world frame. Other parameters
+	///		are ignored
+	/// @param JointType type of joint connecting the body to the parent
+	/// @param mass the mass of the body
+	/// @param body_r_body_com the center of mass of the body relative to and
+	/// described in
+	///		the body fixed frame, which is located in the joint axis connecting
+	/// the body to its parent
+	/// @param body_I_body the moment of inertia of the body w.r.t the body-fixed
+	/// frame
+	///		(ie, the reference point is the origin of the body-fixed frame and
+	/// the matrix is written
+	///		 w.r.t. those unit vectors)
+	/// @param parent_r_parent_body_ref position of joint relative to the parent
+	/// body's reference frame
+	///		for q=0, written in the parent bodies reference frame
+	/// @param body_axis_of_motion translation/rotation axis in body-fixed frame.
+	///		Ignored for joints that are not revolute or prismatic.
+	///		must be a unit vector.
+	/// @param body_T_parent_ref transform matrix from parent to body reference
+	/// frame for q=0.
+	///		This is the matrix transforming a vector represented in the
+	/// parent's reference frame into one represented
+	///		in this body's reference frame.
+	///		ie, if parent_vec is a vector in R^3 whose components are w.r.t to
+	/// the parent's reference frame,
+	///		then the same vector written w.r.t. this body's frame (for q=0) is
+	/// given by
+	///		body_vec = parent_R_body_ref * parent_vec
+	/// @param user_ptr pointer to user data
+	/// @param user_int pointer to user integer
+	/// @return 0 on success, -1 on error
+	int addBody(int body_index, int parent_index, JointType joint_type,
+				const vec3& parent_r_parent_body_ref, const mat33& body_T_parent_ref,
+				const vec3& body_axis_of_motion, idScalar mass, const vec3& body_r_body_com,
+				const mat33& body_I_body, const int user_int, void* user_ptr);
+	/// set policy for invalid mass properties
+	/// @param flag if true, invalid mass properties are accepted,
+	///		the default is false
+	void setAcceptInvalidMassParameters(bool flag);
+	/// @return the mass properties policy flag
+	bool getAcceptInvalidMassProperties() const;
+	/// build internal data structures
+	/// call this after all bodies have been added via addBody
+	/// @return 0 on success, -1 on error
+	int finalize();
+	/// pretty print ascii description of tree to stdout
+	void printTree();
+	/// print tree data to stdout
+	void printTreeData();
+	/// Calculate joint forces for given generalized state & derivatives.
+	/// This also updates kinematic terms computed in calculateKinematics.
+	/// If gravity is not set to zero, acceleration terms will contain
+	/// gravitational acceleration.
+	/// @param q generalized coordinates
+	/// @param u generalized velocities. In the general case, u=T(q)*dot(q) and dim(q)>=dim(u)
+	/// @param dot_u time derivative of u
+	/// @param joint_forces this is where the resulting joint forces will be
+	///		stored. dim(joint_forces) = dim(u)
+	/// @return 0 on success, -1 on error
+	int calculateInverseDynamics(const vecx& q, const vecx& u, const vecx& dot_u,
+								 vecx* joint_forces);
+	/// Calculate joint space mass matrix
+	/// @param q generalized coordinates
+	/// @param initialize_matrix if true, initialize mass matrix with zero.
+	///		If mass_matrix is initialized to zero externally and only used
+	///		for mass matrix computations for the same system, it is safe to
+	///		set this to false.
+	/// @param set_lower_triangular_matrix if true, the lower triangular section of mass_matrix
+	///		is also populated, otherwise not.
+	/// @param mass_matrix matrix for storing the output (should be dim(q)xdim(q))
+	/// @return -1 on error, 0 on success
+	int calculateMassMatrix(const vecx& q, const bool update_kinematics,
+							const bool initialize_matrix, const bool set_lower_triangular_matrix,
+							matxx* mass_matrix);
+
+	/// Calculate joint space mass matrix.
+	/// This version will update kinematics, initialize all mass_matrix elements to zero and
+	/// populate all mass matrix entries.
+	/// @param q generalized coordinates
+	/// @param mass_matrix matrix for storing the output (should be dim(q)xdim(q))
+	/// @return -1 on error, 0 on success
+	int calculateMassMatrix(const vecx& q, matxx* mass_matrix);
+
+	/// Calculates kinematics also calculated in calculateInverseDynamics,
+	/// but not dynamics.
+	/// This function ensures that correct accelerations are computed that do not
+	/// contain gravitational acceleration terms.
+	/// Does not calculate Jacobians, but only vector quantities (positions, velocities & accelerations)
+	int calculateKinematics(const vecx& q, const vecx& u, const vecx& dot_u);
+	/// Calculate position kinematics
+	int calculatePositionKinematics(const vecx& q);
+	/// Calculate position and velocity kinematics
+	int calculatePositionAndVelocityKinematics(const vecx& q, const vecx& u);
+
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+	/// Calculate Jacobians (dvel/du), as well as velocity-dependent accelearation components
+	/// d(Jacobian)/dt*u
+	/// This function assumes that calculateInverseDynamics was called, or calculateKinematics,
+	/// or calculatePositionAndVelocityKinematics
+	int calculateJacobians(const vecx& q, const vecx& u);
+	/// Calculate Jacobians (dvel/du)
+	/// This function assumes that calculateInverseDynamics was called, or
+	/// one of the calculateKineamtics functions
+	int calculateJacobians(const vecx& q);
+#endif  // BT_ID_HAVE_MAT3X
+
+	/// set gravitational acceleration
+	/// the default is [0;0;-9.8] in the world frame
+	/// @param gravity the gravitational acceleration in world frame
+	/// @return 0 on success, -1 on error
+	int setGravityInWorldFrame(const vec3& gravity);
+	/// returns number of bodies in tree
+	int numBodies() const;
+	/// returns number of mechanical degrees of freedom (dimension of q-vector)
+	int numDoFs() const;
+	/// get origin of a body-fixed frame, represented in world frame
+	/// @param body_index index for frame/body
+	/// @param world_origin pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyOrigin(const int body_index, vec3* world_origin) const;
+	/// get center of mass of a body, represented in world frame
+	/// @param body_index index for frame/body
+	/// @param world_com pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyCoM(const int body_index, vec3* world_com) const;
+	/// get transform from of a body-fixed frame to the world frame
+	/// @param body_index index for frame/body
+	/// @param world_T_body pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyTransform(const int body_index, mat33* world_T_body) const;
+	/// get absolute angular velocity for a body, represented in the world frame
+	/// @param body_index index for frame/body
+	/// @param world_omega pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyAngularVelocity(const int body_index, vec3* world_omega) const;
+	/// get linear velocity of a body, represented in world frame
+	/// @param body_index index for frame/body
+	/// @param world_velocity pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyLinearVelocity(const int body_index, vec3* world_velocity) const;
+	/// get linear velocity of a body's CoM, represented in world frame
+	/// (not required for inverse dynamics, provided for convenience)
+	/// @param body_index index for frame/body
+	/// @param world_vel_com pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyLinearVelocityCoM(const int body_index, vec3* world_velocity) const;
+	/// get origin of a body-fixed frame, represented in world frame
+	/// @param body_index index for frame/body
+	/// @param world_origin pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyAngularAcceleration(const int body_index, vec3* world_dot_omega) const;
+	/// get origin of a body-fixed frame, represented in world frame
+	/// NOTE: this will include the gravitational acceleration, so the actual acceleration is
+	/// obtainened by setting gravitational acceleration to zero, or subtracting it.
+	/// @param body_index index for frame/body
+	/// @param world_origin pointer for return data
+	/// @return 0 on success, -1 on error
+	int getBodyLinearAcceleration(const int body_index, vec3* world_acceleration) const;
+
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+	// get translational jacobian, in world frame (dworld_velocity/du)
+	int getBodyJacobianTrans(const int body_index, mat3x* world_jac_trans) const;
+	// get rotational jacobian, in world frame (dworld_omega/du)
+	int getBodyJacobianRot(const int body_index, mat3x* world_jac_rot) const;
+	// get product of translational jacobian derivative * generatlized velocities
+	int getBodyDotJacobianTransU(const int body_index, vec3* world_dot_jac_trans_u) const;
+	// get product of rotational jacobian derivative * generatlized velocities
+	int getBodyDotJacobianRotU(const int body_index, vec3* world_dot_jac_rot_u) const;
+#endif  // BT_ID_HAVE_MAT3X
+
+	/// returns the (internal) index of body
+	/// @param body_index is the index of a body
+	/// @param parent_index pointer to where parent index will be stored
+	/// @return 0 on success, -1 on error
+	int getParentIndex(const int body_index, int* parent_index) const;
+	/// get joint type
+	/// @param body_index index of the body
+	/// @param joint_type the corresponding joint type
+	/// @return 0 on success, -1 on failure
+	int getJointType(const int body_index, JointType* joint_type) const;
+	/// get joint type as string
+	/// @param body_index index of the body
+	/// @param joint_type string naming the corresponding joint type
+	/// @return 0 on success, -1 on failure
+	int getJointTypeStr(const int body_index, const char** joint_type) const;
+	/// get offset translation to parent body (see addBody)
+	/// @param body_index index of the body
+	/// @param r the offset translation (see above)
+	/// @return 0 on success, -1 on failure
+	int getParentRParentBodyRef(const int body_index, vec3* r) const;
+	/// get offset rotation to parent body (see addBody)
+	/// @param body_index index of the body
+	/// @param T the transform (see above)
+	/// @return 0 on success, -1 on failure
+	int getBodyTParentRef(const int body_index, mat33* T) const;
+	/// get axis of motion (see addBody)
+	/// @param body_index index of the body
+	/// @param axis the axis (see above)
+	/// @return 0 on success, -1 on failure
+	int getBodyAxisOfMotion(const int body_index, vec3* axis) const;
+	/// get offset for degrees of freedom of this body into the q-vector
+	/// @param body_index index of the body
+	/// @param q_offset offset the q vector
+	/// @return -1 on error, 0 on success
+	int getDoFOffset(const int body_index, int* q_offset) const;
+	/// get user integer. not used by the library.
+	/// @param body_index index of the body
+	/// @param user_int   the user integer
+	/// @return 0 on success, -1 on error
+	int getUserInt(const int body_index, int* user_int) const;
+	/// get user pointer. not used by the library.
+	/// @param body_index index of the body
+	/// @param user_ptr   the user pointer
+	/// @return 0 on success, -1 on error
+	int getUserPtr(const int body_index, void** user_ptr) const;
+	/// set user integer. not used by the library.
+	/// @param body_index index of the body
+	/// @param user_int   the user integer
+	/// @return 0 on success, -1 on error
+	int setUserInt(const int body_index, const int user_int);
+	/// set user pointer. not used by the library.
+	/// @param body_index index of the body
+	/// @param user_ptr   the user pointer
+	/// @return 0 on success, -1 on error
+	int setUserPtr(const int body_index, void* const user_ptr);
+	/// set mass for a body
+	/// @param body_index index of the body
+	/// @param mass the mass to set
+	/// @return 0 on success, -1 on failure
+	int setBodyMass(const int body_index, const idScalar mass);
+	/// set first moment of mass for a body
+	/// (mass * center of mass, in body fixed frame, relative to joint)
+	/// @param body_index index of the body
+	/// @param first_mass_moment the vector to set
+	/// @return 0 on success, -1 on failure
+	int setBodyFirstMassMoment(const int body_index, const vec3& first_mass_moment);
+	/// set second moment of mass for a body
+	/// (moment of inertia, in body fixed frame, relative to joint)
+	/// @param body_index index of the body
+	/// @param second_mass_moment the inertia matrix
+	/// @return 0 on success, -1 on failure
+	int setBodySecondMassMoment(const int body_index, const mat33& second_mass_moment);
+	/// get mass for a body
+	/// @param body_index index of the body
+	/// @param mass the mass
+	/// @return 0 on success, -1 on failure
+	int getBodyMass(const int body_index, idScalar* mass) const;
+	/// get first moment of mass for a body
+	/// (mass * center of mass, in body fixed frame, relative to joint)
+	/// @param body_index index of the body
+	/// @param first_moment the vector
+	/// @return 0 on success, -1 on failure
+	int getBodyFirstMassMoment(const int body_index, vec3* first_mass_moment) const;
+	/// get second moment of mass for a body
+	/// (moment of inertia, in body fixed frame, relative to joint)
+	/// @param body_index index of the body
+	/// @param second_mass_moment the inertia matrix
+	/// @return 0 on success, -1 on failure
+	int getBodySecondMassMoment(const int body_index, mat33* second_mass_moment) const;
+	/// set all user forces and moments to zero
+	void clearAllUserForcesAndMoments();
+	/// Add an external force to a body, acting at the origin of the body-fixed frame.
+	/// Calls to addUserForce are cumulative. Set the user force and moment to zero
+	/// via clearAllUserForcesAndMoments()
+	/// @param body_force the force represented in the body-fixed frame of reference
+	/// @return 0 on success, -1 on error
+	int addUserForce(const int body_index, const vec3& body_force);
+	/// Add an external moment to a body.
+	/// Calls to addUserMoment are cumulative. Set the user force and moment to zero
+	/// via clearAllUserForcesAndMoments()
+	/// @param body_moment the moment represented in the body-fixed frame of reference
+	/// @return 0 on success, -1 on error
+	int addUserMoment(const int body_index, const vec3& body_moment);
+
+private:
+	// flag indicating if system has been initialized
+	bool m_is_finalized;
+	// flag indicating if mass properties are physically valid
+	bool m_mass_parameters_are_valid;
+	// flag defining if unphysical mass parameters are accepted
+	bool m_accept_invalid_mass_parameters;
+	// This struct implements the inverse dynamics calculations
+	class MultiBodyImpl;
+	MultiBodyImpl* m_impl;
+	// cache data structure for initialization
+	class InitCache;
+	InitCache* m_init_cache;
+};
+}  // namespace btInverseDynamics
+#endif  // MULTIBODYTREE_HPP_
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDEigenInterface.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDEigenInterface.hpp
new file mode 100644
index 0000000..fe4f102
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDEigenInterface.hpp
@@ -0,0 +1,39 @@
+#ifndef INVDYNEIGENINTERFACE_HPP_
+#define INVDYNEIGENINTERFACE_HPP_
+#include "../IDConfig.hpp"
+namespace btInverseDynamics
+{
+#define BT_ID_HAVE_MAT3X
+
+#ifdef BT_USE_DOUBLE_PRECISION
+typedef Eigen::Matrix<double, Eigen::Dynamic, 1, Eigen::DontAlign> vecx;
+typedef Eigen::Matrix<double, 3, 1, Eigen::DontAlign> vec3;
+typedef Eigen::Matrix<double, 3, 3, Eigen::DontAlign> mat33;
+typedef Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::DontAlign> matxx;
+typedef Eigen::Matrix<double, 3, Eigen::Dynamic, Eigen::DontAlign> mat3x;
+#else
+typedef Eigen::Matrix<float, Eigen::Dynamic, 1, Eigen::DontAlign> vecx;
+typedef Eigen::Matrix<float, 3, 1, Eigen::DontAlign> vec3;
+typedef Eigen::Matrix<float, 3, 3, Eigen::DontAlign> mat33;
+typedef Eigen::Matrix<float, Eigen::Dynamic, Eigen::Dynamic, Eigen::DontAlign> matxx;
+typedef Eigen::Matrix<float, 3, Eigen::Dynamic, Eigen::DontAlign> mat3x;
+#endif
+
+inline void resize(mat3x &m, Eigen::Index size)
+{
+	m.resize(3, size);
+	m.setZero();
+}
+
+inline void setMatxxElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, matxx *m)
+{
+	(*m)(row, col) = val;
+}
+
+inline void setMat3xElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, mat3x *m)
+{
+	(*m)(row, col) = val;
+}
+
+}  // namespace btInverseDynamics
+#endif  // INVDYNEIGENINTERFACE_HPP_
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp
new file mode 100644
index 0000000..0c398a3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp
@@ -0,0 +1,202 @@
+#ifndef IDLINEARMATHINTERFACE_HPP_
+#define IDLINEARMATHINTERFACE_HPP_
+
+#include <cstdlib>
+
+#include "../IDConfig.hpp"
+
+#include "../../LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btMatrixX.h"
+#define BT_ID_HAVE_MAT3X
+
+namespace btInverseDynamics
+{
+class vec3;
+class vecx;
+class mat33;
+typedef btMatrixX<idScalar> matxx;
+
+class vec3 : public btVector3
+{
+public:
+	vec3() : btVector3() {}
+	vec3(const btVector3& btv) { *this = btv; }
+	idScalar& operator()(int i) { return (*this)[i]; }
+	const idScalar& operator()(int i) const { return (*this)[i]; }
+	int size() const { return 3; }
+	const vec3& operator=(const btVector3& rhs)
+	{
+		*static_cast<btVector3*>(this) = rhs;
+		return *this;
+	}
+};
+
+class mat33 : public btMatrix3x3
+{
+public:
+	mat33() : btMatrix3x3() {}
+	mat33(const btMatrix3x3& btm) { *this = btm; }
+	idScalar& operator()(int i, int j) { return (*this)[i][j]; }
+	const idScalar& operator()(int i, int j) const { return (*this)[i][j]; }
+	const mat33& operator=(const btMatrix3x3& rhs)
+	{
+		*static_cast<btMatrix3x3*>(this) = rhs;
+		return *this;
+	}
+	friend mat33 operator*(const idScalar& s, const mat33& a);
+	friend mat33 operator/(const mat33& a, const idScalar& s);
+};
+
+inline mat33 operator/(const mat33& a, const idScalar& s) { return a * (1.0 / s); }
+
+inline mat33 operator*(const idScalar& s, const mat33& a) { return a * s; }
+
+class vecx : public btVectorX<idScalar>
+{
+public:
+	vecx(int size) : btVectorX<idScalar>(size) {}
+	const vecx& operator=(const btVectorX<idScalar>& rhs)
+	{
+		*static_cast<btVectorX<idScalar>*>(this) = rhs;
+		return *this;
+	}
+
+	idScalar& operator()(int i) { return (*this)[i]; }
+	const idScalar& operator()(int i) const { return (*this)[i]; }
+
+	friend vecx operator*(const vecx& a, const idScalar& s);
+	friend vecx operator*(const idScalar& s, const vecx& a);
+
+	friend vecx operator+(const vecx& a, const vecx& b);
+	friend vecx operator-(const vecx& a, const vecx& b);
+	friend vecx operator/(const vecx& a, const idScalar& s);
+};
+
+inline vecx operator*(const vecx& a, const idScalar& s)
+{
+	vecx result(a.size());
+	for (int i = 0; i < result.size(); i++)
+	{
+		result(i) = a(i) * s;
+	}
+	return result;
+}
+inline vecx operator*(const idScalar& s, const vecx& a) { return a * s; }
+inline vecx operator+(const vecx& a, const vecx& b)
+{
+	vecx result(a.size());
+	// TODO: error handling for a.size() != b.size()??
+	if (a.size() != b.size())
+	{
+		bt_id_error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size());
+		abort();
+	}
+	for (int i = 0; i < a.size(); i++)
+	{
+		result(i) = a(i) + b(i);
+	}
+
+	return result;
+}
+
+inline vecx operator-(const vecx& a, const vecx& b)
+{
+	vecx result(a.size());
+	// TODO: error handling for a.size() != b.size()??
+	if (a.size() != b.size())
+	{
+		bt_id_error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size());
+		abort();
+	}
+	for (int i = 0; i < a.size(); i++)
+	{
+		result(i) = a(i) - b(i);
+	}
+	return result;
+}
+inline vecx operator/(const vecx& a, const idScalar& s)
+{
+	vecx result(a.size());
+	for (int i = 0; i < result.size(); i++)
+	{
+		result(i) = a(i) / s;
+	}
+
+	return result;
+}
+
+// use btMatrixX to implement 3xX matrix
+class mat3x : public matxx
+{
+public:
+	mat3x() {}
+	mat3x(const mat3x& rhs)
+	{
+		matxx::resize(rhs.rows(), rhs.cols());
+		*this = rhs;
+	}
+	mat3x(int rows, int cols) : matxx(3, cols)
+	{
+	}
+	void operator=(const mat3x& rhs)
+	{
+		if (m_cols != rhs.m_cols)
+		{
+			bt_id_error_message("size missmatch, cols= %d but rhs.cols= %d\n", cols(), rhs.cols());
+			abort();
+		}
+		for (int i = 0; i < rows(); i++)
+		{
+			for (int k = 0; k < cols(); k++)
+			{
+				setElem(i, k, rhs(i, k));
+			}
+		}
+	}
+	void setZero()
+	{
+		matxx::setZero();
+	}
+};
+
+inline vec3 operator*(const mat3x& a, const vecx& b)
+{
+	vec3 result;
+	if (a.cols() != b.size())
+	{
+		bt_id_error_message("size missmatch. a.cols()= %d, b.size()= %d\n", a.cols(), b.size());
+		abort();
+	}
+	result(0) = 0.0;
+	result(1) = 0.0;
+	result(2) = 0.0;
+	for (int i = 0; i < b.size(); i++)
+	{
+		for (int k = 0; k < 3; k++)
+		{
+			result(k) += a(k, i) * b(i);
+		}
+	}
+	return result;
+}
+
+inline void resize(mat3x& m, idArrayIdx size)
+{
+	m.resize(3, size);
+	m.setZero();
+}
+
+inline void setMatxxElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, matxx* m)
+{
+	m->setElem(row, col, val);
+}
+
+inline void setMat3xElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, mat3x* m)
+{
+	m->setElem(row, col, val);
+}
+
+}  // namespace btInverseDynamics
+
+#endif  // IDLINEARMATHINTERFACE_HPP_
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDMatVec.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDMatVec.hpp
new file mode 100644
index 0000000..1c78609
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/IDMatVec.hpp
@@ -0,0 +1,489 @@
+/// @file Built-In Matrix-Vector functions
+#ifndef IDMATVEC_HPP_
+#define IDMATVEC_HPP_
+
+#include <cstdlib>
+
+#include "../IDConfig.hpp"
+#define BT_ID_HAVE_MAT3X
+
+namespace btInverseDynamics
+{
+class vec3;
+class vecx;
+class mat33;
+class matxx;
+class mat3x;
+
+/// This is a very basic implementation to enable stand-alone use of the library.
+/// The implementation is not really optimized and misses many features that you would
+/// want from a "fully featured" linear math library.
+class vec3
+{
+public:
+	idScalar& operator()(int i) { return m_data[i]; }
+	const idScalar& operator()(int i) const { return m_data[i]; }
+	const int size() const { return 3; }
+	const vec3& operator=(const vec3& rhs);
+	const vec3& operator+=(const vec3& b);
+	const vec3& operator-=(const vec3& b);
+	vec3 cross(const vec3& b) const;
+	idScalar dot(const vec3& b) const;
+
+	friend vec3 operator*(const mat33& a, const vec3& b);
+	friend vec3 operator*(const vec3& a, const idScalar& s);
+	friend vec3 operator*(const idScalar& s, const vec3& a);
+
+	friend vec3 operator+(const vec3& a, const vec3& b);
+	friend vec3 operator-(const vec3& a, const vec3& b);
+	friend vec3 operator/(const vec3& a, const idScalar& s);
+
+private:
+	idScalar m_data[3];
+};
+
+class mat33
+{
+public:
+	idScalar& operator()(int i, int j) { return m_data[3 * i + j]; }
+	const idScalar& operator()(int i, int j) const { return m_data[3 * i + j]; }
+	const mat33& operator=(const mat33& rhs);
+	mat33 transpose() const;
+	const mat33& operator+=(const mat33& b);
+	const mat33& operator-=(const mat33& b);
+
+	friend mat33 operator*(const mat33& a, const mat33& b);
+	friend vec3 operator*(const mat33& a, const vec3& b);
+	friend mat33 operator*(const mat33& a, const idScalar& s);
+	friend mat33 operator*(const idScalar& s, const mat33& a);
+	friend mat33 operator+(const mat33& a, const mat33& b);
+	friend mat33 operator-(const mat33& a, const mat33& b);
+	friend mat33 operator/(const mat33& a, const idScalar& s);
+
+private:
+	// layout is [0,1,2;3,4,5;6,7,8]
+	idScalar m_data[9];
+};
+
+class vecx
+{
+public:
+	vecx(int size) : m_size(size)
+	{
+		m_data = static_cast<idScalar*>(idMalloc(sizeof(idScalar) * size));
+	}
+	~vecx() { idFree(m_data); }
+	const vecx& operator=(const vecx& rhs);
+	idScalar& operator()(int i) { return m_data[i]; }
+	const idScalar& operator()(int i) const { return m_data[i]; }
+	const int& size() const { return m_size; }
+
+	friend vecx operator*(const vecx& a, const idScalar& s);
+	friend vecx operator*(const idScalar& s, const vecx& a);
+
+	friend vecx operator+(const vecx& a, const vecx& b);
+	friend vecx operator-(const vecx& a, const vecx& b);
+	friend vecx operator/(const vecx& a, const idScalar& s);
+
+private:
+	int m_size;
+	idScalar* m_data;
+};
+
+class matxx
+{
+public:
+	matxx()
+	{
+		m_data = 0x0;
+		m_cols = 0;
+		m_rows = 0;
+	}
+	matxx(int rows, int cols) : m_rows(rows), m_cols(cols)
+	{
+		m_data = static_cast<idScalar*>(idMalloc(sizeof(idScalar) * rows * cols));
+	}
+	~matxx() { idFree(m_data); }
+	idScalar& operator()(int row, int col) { return m_data[row * m_cols + col]; }
+	const idScalar& operator()(int row, int col) const { return m_data[row * m_cols + col]; }
+	const int& rows() const { return m_rows; }
+	const int& cols() const { return m_cols; }
+
+private:
+	int m_rows;
+	int m_cols;
+	idScalar* m_data;
+};
+
+class mat3x
+{
+public:
+	mat3x()
+	{
+		m_data = 0x0;
+		m_cols = 0;
+	}
+	mat3x(const mat3x& rhs)
+	{
+		m_cols = rhs.m_cols;
+		allocate();
+		*this = rhs;
+	}
+	mat3x(int rows, int cols) : m_cols(cols)
+	{
+		allocate();
+	};
+	void operator=(const mat3x& rhs)
+	{
+		if (m_cols != rhs.m_cols)
+		{
+			bt_id_error_message("size missmatch, cols= %d but rhs.cols= %d\n", cols(), rhs.cols());
+			abort();
+		}
+		for (int i = 0; i < 3 * m_cols; i++)
+		{
+			m_data[i] = rhs.m_data[i];
+		}
+	}
+
+	~mat3x()
+	{
+		free();
+	}
+	idScalar& operator()(int row, int col) { return m_data[row * m_cols + col]; }
+	const idScalar& operator()(int row, int col) const { return m_data[row * m_cols + col]; }
+	int rows() const { return m_rows; }
+	const int& cols() const { return m_cols; }
+	void resize(int rows, int cols)
+	{
+		m_cols = cols;
+		free();
+		allocate();
+	}
+	void setZero()
+	{
+		memset(m_data, 0x0, sizeof(idScalar) * m_rows * m_cols);
+	}
+	// avoid operators that would allocate -- use functions sub/add/mul in IDMath.hpp instead
+private:
+	void allocate() { m_data = static_cast<idScalar*>(idMalloc(sizeof(idScalar) * m_rows * m_cols)); }
+	void free() { idFree(m_data); }
+	enum
+	{
+		m_rows = 3
+	};
+	int m_cols;
+	idScalar* m_data;
+};
+
+inline void resize(mat3x& m, idArrayIdx size)
+{
+	m.resize(3, size);
+	m.setZero();
+}
+
+//////////////////////////////////////////////////
+// Implementations
+inline const vec3& vec3::operator=(const vec3& rhs)
+{
+	if (&rhs != this)
+	{
+		memcpy(m_data, rhs.m_data, 3 * sizeof(idScalar));
+	}
+	return *this;
+}
+
+inline vec3 vec3::cross(const vec3& b) const
+{
+	vec3 result;
+	result.m_data[0] = m_data[1] * b.m_data[2] - m_data[2] * b.m_data[1];
+	result.m_data[1] = m_data[2] * b.m_data[0] - m_data[0] * b.m_data[2];
+	result.m_data[2] = m_data[0] * b.m_data[1] - m_data[1] * b.m_data[0];
+
+	return result;
+}
+
+inline idScalar vec3::dot(const vec3& b) const
+{
+	return m_data[0] * b.m_data[0] + m_data[1] * b.m_data[1] + m_data[2] * b.m_data[2];
+}
+
+inline const mat33& mat33::operator=(const mat33& rhs)
+{
+	if (&rhs != this)
+	{
+		memcpy(m_data, rhs.m_data, 9 * sizeof(idScalar));
+	}
+	return *this;
+}
+inline mat33 mat33::transpose() const
+{
+	mat33 result;
+	result.m_data[0] = m_data[0];
+	result.m_data[1] = m_data[3];
+	result.m_data[2] = m_data[6];
+	result.m_data[3] = m_data[1];
+	result.m_data[4] = m_data[4];
+	result.m_data[5] = m_data[7];
+	result.m_data[6] = m_data[2];
+	result.m_data[7] = m_data[5];
+	result.m_data[8] = m_data[8];
+
+	return result;
+}
+
+inline mat33 operator*(const mat33& a, const mat33& b)
+{
+	mat33 result;
+	result.m_data[0] =
+		a.m_data[0] * b.m_data[0] + a.m_data[1] * b.m_data[3] + a.m_data[2] * b.m_data[6];
+	result.m_data[1] =
+		a.m_data[0] * b.m_data[1] + a.m_data[1] * b.m_data[4] + a.m_data[2] * b.m_data[7];
+	result.m_data[2] =
+		a.m_data[0] * b.m_data[2] + a.m_data[1] * b.m_data[5] + a.m_data[2] * b.m_data[8];
+	result.m_data[3] =
+		a.m_data[3] * b.m_data[0] + a.m_data[4] * b.m_data[3] + a.m_data[5] * b.m_data[6];
+	result.m_data[4] =
+		a.m_data[3] * b.m_data[1] + a.m_data[4] * b.m_data[4] + a.m_data[5] * b.m_data[7];
+	result.m_data[5] =
+		a.m_data[3] * b.m_data[2] + a.m_data[4] * b.m_data[5] + a.m_data[5] * b.m_data[8];
+	result.m_data[6] =
+		a.m_data[6] * b.m_data[0] + a.m_data[7] * b.m_data[3] + a.m_data[8] * b.m_data[6];
+	result.m_data[7] =
+		a.m_data[6] * b.m_data[1] + a.m_data[7] * b.m_data[4] + a.m_data[8] * b.m_data[7];
+	result.m_data[8] =
+		a.m_data[6] * b.m_data[2] + a.m_data[7] * b.m_data[5] + a.m_data[8] * b.m_data[8];
+
+	return result;
+}
+
+inline const mat33& mat33::operator+=(const mat33& b)
+{
+	for (int i = 0; i < 9; i++)
+	{
+		m_data[i] += b.m_data[i];
+	}
+
+	return *this;
+}
+
+inline const mat33& mat33::operator-=(const mat33& b)
+{
+	for (int i = 0; i < 9; i++)
+	{
+		m_data[i] -= b.m_data[i];
+	}
+	return *this;
+}
+
+inline vec3 operator*(const mat33& a, const vec3& b)
+{
+	vec3 result;
+
+	result.m_data[0] =
+		a.m_data[0] * b.m_data[0] + a.m_data[1] * b.m_data[1] + a.m_data[2] * b.m_data[2];
+	result.m_data[1] =
+		a.m_data[3] * b.m_data[0] + a.m_data[4] * b.m_data[1] + a.m_data[5] * b.m_data[2];
+	result.m_data[2] =
+		a.m_data[6] * b.m_data[0] + a.m_data[7] * b.m_data[1] + a.m_data[8] * b.m_data[2];
+
+	return result;
+}
+
+inline const vec3& vec3::operator+=(const vec3& b)
+{
+	for (int i = 0; i < 3; i++)
+	{
+		m_data[i] += b.m_data[i];
+	}
+	return *this;
+}
+
+inline const vec3& vec3::operator-=(const vec3& b)
+{
+	for (int i = 0; i < 3; i++)
+	{
+		m_data[i] -= b.m_data[i];
+	}
+	return *this;
+}
+
+inline mat33 operator*(const mat33& a, const idScalar& s)
+{
+	mat33 result;
+	for (int i = 0; i < 9; i++)
+	{
+		result.m_data[i] = a.m_data[i] * s;
+	}
+	return result;
+}
+
+inline mat33 operator*(const idScalar& s, const mat33& a) { return a * s; }
+
+inline vec3 operator*(const vec3& a, const idScalar& s)
+{
+	vec3 result;
+	for (int i = 0; i < 3; i++)
+	{
+		result.m_data[i] = a.m_data[i] * s;
+	}
+	return result;
+}
+inline vec3 operator*(const idScalar& s, const vec3& a) { return a * s; }
+
+inline mat33 operator+(const mat33& a, const mat33& b)
+{
+	mat33 result;
+	for (int i = 0; i < 9; i++)
+	{
+		result.m_data[i] = a.m_data[i] + b.m_data[i];
+	}
+	return result;
+}
+inline vec3 operator+(const vec3& a, const vec3& b)
+{
+	vec3 result;
+	for (int i = 0; i < 3; i++)
+	{
+		result.m_data[i] = a.m_data[i] + b.m_data[i];
+	}
+	return result;
+}
+
+inline mat33 operator-(const mat33& a, const mat33& b)
+{
+	mat33 result;
+	for (int i = 0; i < 9; i++)
+	{
+		result.m_data[i] = a.m_data[i] - b.m_data[i];
+	}
+	return result;
+}
+inline vec3 operator-(const vec3& a, const vec3& b)
+{
+	vec3 result;
+	for (int i = 0; i < 3; i++)
+	{
+		result.m_data[i] = a.m_data[i] - b.m_data[i];
+	}
+	return result;
+}
+
+inline mat33 operator/(const mat33& a, const idScalar& s)
+{
+	mat33 result;
+	for (int i = 0; i < 9; i++)
+	{
+		result.m_data[i] = a.m_data[i] / s;
+	}
+	return result;
+}
+
+inline vec3 operator/(const vec3& a, const idScalar& s)
+{
+	vec3 result;
+	for (int i = 0; i < 3; i++)
+	{
+		result.m_data[i] = a.m_data[i] / s;
+	}
+	return result;
+}
+
+inline const vecx& vecx::operator=(const vecx& rhs)
+{
+	if (size() != rhs.size())
+	{
+		bt_id_error_message("size missmatch, size()= %d but rhs.size()= %d\n", size(), rhs.size());
+		abort();
+	}
+	if (&rhs != this)
+	{
+		memcpy(m_data, rhs.m_data, rhs.size() * sizeof(idScalar));
+	}
+	return *this;
+}
+inline vecx operator*(const vecx& a, const idScalar& s)
+{
+	vecx result(a.size());
+	for (int i = 0; i < result.size(); i++)
+	{
+		result.m_data[i] = a.m_data[i] * s;
+	}
+	return result;
+}
+inline vecx operator*(const idScalar& s, const vecx& a) { return a * s; }
+inline vecx operator+(const vecx& a, const vecx& b)
+{
+	vecx result(a.size());
+	// TODO: error handling for a.size() != b.size()??
+	if (a.size() != b.size())
+	{
+		bt_id_error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size());
+		abort();
+	}
+	for (int i = 0; i < a.size(); i++)
+	{
+		result.m_data[i] = a.m_data[i] + b.m_data[i];
+	}
+
+	return result;
+}
+inline vecx operator-(const vecx& a, const vecx& b)
+{
+	vecx result(a.size());
+	// TODO: error handling for a.size() != b.size()??
+	if (a.size() != b.size())
+	{
+		bt_id_error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size());
+		abort();
+	}
+	for (int i = 0; i < a.size(); i++)
+	{
+		result.m_data[i] = a.m_data[i] - b.m_data[i];
+	}
+	return result;
+}
+inline vecx operator/(const vecx& a, const idScalar& s)
+{
+	vecx result(a.size());
+	for (int i = 0; i < result.size(); i++)
+	{
+		result.m_data[i] = a.m_data[i] / s;
+	}
+
+	return result;
+}
+
+inline vec3 operator*(const mat3x& a, const vecx& b)
+{
+	vec3 result;
+	if (a.cols() != b.size())
+	{
+		bt_id_error_message("size missmatch. a.cols()= %d, b.size()= %d\n", a.cols(), b.size());
+		abort();
+	}
+	result(0) = 0.0;
+	result(1) = 0.0;
+	result(2) = 0.0;
+	for (int i = 0; i < b.size(); i++)
+	{
+		for (int k = 0; k < 3; k++)
+		{
+			result(k) += a(k, i) * b(i);
+		}
+	}
+	return result;
+}
+
+inline void setMatxxElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, matxx* m)
+{
+	(*m)(row, col) = val;
+}
+
+inline void setMat3xElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, mat3x* m)
+{
+	(*m)(row, col) = val;
+}
+
+}  // namespace btInverseDynamics
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.cpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.cpp
new file mode 100644
index 0000000..ec9a562
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.cpp
@@ -0,0 +1,1286 @@
+#include "MultiBodyTreeImpl.hpp"
+
+namespace btInverseDynamics
+{
+MultiBodyTree::MultiBodyImpl::MultiBodyImpl(int num_bodies_, int num_dofs_)
+	: m_num_bodies(num_bodies_), m_num_dofs(num_dofs_)
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+	  ,
+	  m_m3x(3, m_num_dofs)
+#endif
+{
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+	resize(m_m3x, m_num_dofs);
+#endif
+	m_body_list.resize(num_bodies_);
+	m_parent_index.resize(num_bodies_);
+	m_child_indices.resize(num_bodies_);
+	m_user_int.resize(num_bodies_);
+	m_user_ptr.resize(num_bodies_);
+
+	m_world_gravity(0) = 0.0;
+	m_world_gravity(1) = 0.0;
+	m_world_gravity(2) = -9.8;
+}
+
+const char *MultiBodyTree::MultiBodyImpl::jointTypeToString(const JointType &type) const
+{
+	switch (type)
+	{
+		case FIXED:
+			return "fixed";
+		case REVOLUTE:
+			return "revolute";
+		case PRISMATIC:
+			return "prismatic";
+		case FLOATING:
+			return "floating";
+		case SPHERICAL:
+			return "spherical";
+	}
+	return "error: invalid";
+}
+
+inline void indent(const int &level)
+{
+	for (int j = 0; j < level; j++)
+		id_printf("  ");  // indent
+}
+
+void MultiBodyTree::MultiBodyImpl::printTree()
+{
+	id_printf("body %.2d[%s]: root\n", 0, jointTypeToString(m_body_list[0].m_joint_type));
+	printTree(0, 0);
+}
+
+void MultiBodyTree::MultiBodyImpl::printTreeData()
+{
+	for (idArrayIdx i = 0; i < m_body_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[i];
+		id_printf("body: %d\n", static_cast<int>(i));
+		id_printf("type: %s\n", jointTypeToString(body.m_joint_type));
+		id_printf("q_index= %d\n", body.m_q_index);
+		id_printf("Jac_JR= [%f;%f;%f]\n", body.m_Jac_JR(0), body.m_Jac_JR(1), body.m_Jac_JR(2));
+		id_printf("Jac_JT= [%f;%f;%f]\n", body.m_Jac_JT(0), body.m_Jac_JT(1), body.m_Jac_JT(2));
+
+		id_printf("mass = %f\n", body.m_mass);
+		id_printf("mass * com = [%f %f %f]\n", body.m_body_mass_com(0), body.m_body_mass_com(1),
+				  body.m_body_mass_com(2));
+		id_printf(
+			"I_o= [%f %f %f;\n"
+			"	  %f %f %f;\n"
+			"	  %f %f %f]\n",
+			body.m_body_I_body(0, 0), body.m_body_I_body(0, 1), body.m_body_I_body(0, 2),
+			body.m_body_I_body(1, 0), body.m_body_I_body(1, 1), body.m_body_I_body(1, 2),
+			body.m_body_I_body(2, 0), body.m_body_I_body(2, 1), body.m_body_I_body(2, 2));
+
+		id_printf("parent_pos_parent_body_ref= [%f %f %f]\n", body.m_parent_pos_parent_body_ref(0),
+				  body.m_parent_pos_parent_body_ref(1), body.m_parent_pos_parent_body_ref(2));
+	}
+}
+int MultiBodyTree::MultiBodyImpl::bodyNumDoFs(const JointType &type) const
+{
+	switch (type)
+	{
+		case FIXED:
+			return 0;
+		case REVOLUTE:
+		case PRISMATIC:
+			return 1;
+		case FLOATING:
+			return 6;
+		case SPHERICAL:
+			return 3;
+	}
+	bt_id_error_message("unknown joint type %d\n", type);
+	return 0;
+}
+
+void MultiBodyTree::MultiBodyImpl::printTree(int index, int indentation)
+{
+	// this is adapted from URDF2Bullet.
+	// TODO: fix this and print proper graph (similar to git --log --graph)
+	int num_children = m_child_indices[index].size();
+
+	indentation += 2;
+	int count = 0;
+
+	for (int i = 0; i < num_children; i++)
+	{
+		int child_index = m_child_indices[index][i];
+		indent(indentation);
+		id_printf("body %.2d[%s]: %.2d is child no. %d (qi= %d .. %d) \n", index,
+				  jointTypeToString(m_body_list[index].m_joint_type), child_index, (count++) + 1,
+				  m_body_list[index].m_q_index,
+				  m_body_list[index].m_q_index + bodyNumDoFs(m_body_list[index].m_joint_type));
+		// first grandchild
+		printTree(child_index, indentation);
+	}
+}
+
+int MultiBodyTree::MultiBodyImpl::setGravityInWorldFrame(const vec3 &gravity)
+{
+	m_world_gravity = gravity;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::generateIndexSets()
+{
+	m_body_revolute_list.resize(0);
+	m_body_prismatic_list.resize(0);
+	int q_index = 0;
+	for (idArrayIdx i = 0; i < m_body_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[i];
+		body.m_q_index = -1;
+		switch (body.m_joint_type)
+		{
+			case REVOLUTE:
+				m_body_revolute_list.push_back(i);
+				body.m_q_index = q_index;
+				q_index++;
+				break;
+			case PRISMATIC:
+				m_body_prismatic_list.push_back(i);
+				body.m_q_index = q_index;
+				q_index++;
+				break;
+			case FIXED:
+				// do nothing
+				break;
+			case FLOATING:
+				m_body_floating_list.push_back(i);
+				body.m_q_index = q_index;
+				q_index += 6;
+				break;
+			case SPHERICAL:
+				m_body_spherical_list.push_back(i);
+				body.m_q_index = q_index;
+				q_index += 3;
+				break;
+			default:
+				bt_id_error_message("unsupported joint type %d\n", body.m_joint_type);
+				return -1;
+		}
+	}
+	// sanity check
+	if (q_index != m_num_dofs)
+	{
+		bt_id_error_message("internal error, q_index= %d but num_dofs %d\n", q_index, m_num_dofs);
+		return -1;
+	}
+
+	m_child_indices.resize(m_body_list.size());
+
+	for (idArrayIdx child = 1; child < m_parent_index.size(); child++)
+	{
+		const int &parent = m_parent_index[child];
+		if (parent >= 0 && parent < (static_cast<int>(m_parent_index.size()) - 1))
+		{
+			m_child_indices[parent].push_back(child);
+		}
+		else
+		{
+			if (-1 == parent)
+			{
+				// multiple bodies are directly linked to the environment, ie, not a single root
+				bt_id_error_message("building index sets parent(%zu)= -1 (multiple roots)\n", child);
+			}
+			else
+			{
+				// should never happen
+				bt_id_error_message(
+					"building index sets. parent_index[%zu]= %d, but m_parent_index.size()= %d\n",
+					child, parent, static_cast<int>(m_parent_index.size()));
+			}
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+void MultiBodyTree::MultiBodyImpl::calculateStaticData()
+{
+	// relative kinematics that are not a function of q, u, dot_u
+	for (idArrayIdx i = 0; i < m_body_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[i];
+		switch (body.m_joint_type)
+		{
+			case REVOLUTE:
+				body.m_parent_vel_rel(0) = 0;
+				body.m_parent_vel_rel(1) = 0;
+				body.m_parent_vel_rel(2) = 0;
+				body.m_parent_acc_rel(0) = 0;
+				body.m_parent_acc_rel(1) = 0;
+				body.m_parent_acc_rel(2) = 0;
+				body.m_parent_pos_parent_body = body.m_parent_pos_parent_body_ref;
+				break;
+			case PRISMATIC:
+				body.m_body_T_parent = body.m_body_T_parent_ref;
+				body.m_parent_Jac_JT = body.m_body_T_parent_ref.transpose() * body.m_Jac_JT;
+				body.m_body_ang_vel_rel(0) = 0;
+				body.m_body_ang_vel_rel(1) = 0;
+				body.m_body_ang_vel_rel(2) = 0;
+				body.m_body_ang_acc_rel(0) = 0;
+				body.m_body_ang_acc_rel(1) = 0;
+				body.m_body_ang_acc_rel(2) = 0;
+				break;
+			case FIXED:
+				body.m_parent_pos_parent_body = body.m_parent_pos_parent_body_ref;
+				body.m_body_T_parent = body.m_body_T_parent_ref;
+				body.m_body_ang_vel_rel(0) = 0;
+				body.m_body_ang_vel_rel(1) = 0;
+				body.m_body_ang_vel_rel(2) = 0;
+				body.m_parent_vel_rel(0) = 0;
+				body.m_parent_vel_rel(1) = 0;
+				body.m_parent_vel_rel(2) = 0;
+				body.m_body_ang_acc_rel(0) = 0;
+				body.m_body_ang_acc_rel(1) = 0;
+				body.m_body_ang_acc_rel(2) = 0;
+				body.m_parent_acc_rel(0) = 0;
+				body.m_parent_acc_rel(1) = 0;
+				body.m_parent_acc_rel(2) = 0;
+				break;
+			case FLOATING:
+				// no static data
+				break;
+			case SPHERICAL:
+				//todo: review
+				body.m_parent_pos_parent_body = body.m_parent_pos_parent_body_ref;
+				body.m_parent_vel_rel(0) = 0;
+				body.m_parent_vel_rel(1) = 0;
+				body.m_parent_vel_rel(2) = 0;
+				body.m_parent_acc_rel(0) = 0;
+				body.m_parent_acc_rel(1) = 0;
+				body.m_parent_acc_rel(2) = 0;
+				break;
+		}
+
+			// resize & initialize jacobians to zero.
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+		body.m_body_dot_Jac_T_u(0) = 0.0;
+		body.m_body_dot_Jac_T_u(1) = 0.0;
+		body.m_body_dot_Jac_T_u(2) = 0.0;
+		body.m_body_dot_Jac_R_u(0) = 0.0;
+		body.m_body_dot_Jac_R_u(1) = 0.0;
+		body.m_body_dot_Jac_R_u(2) = 0.0;
+		resize(body.m_body_Jac_T, m_num_dofs);
+		resize(body.m_body_Jac_R, m_num_dofs);
+		body.m_body_Jac_T.setZero();
+		body.m_body_Jac_R.setZero();
+#endif  //
+	}
+}
+
+int MultiBodyTree::MultiBodyImpl::calculateInverseDynamics(const vecx &q, const vecx &u,
+														   const vecx &dot_u, vecx *joint_forces)
+{
+	if (q.size() != m_num_dofs || u.size() != m_num_dofs || dot_u.size() != m_num_dofs ||
+		joint_forces->size() != m_num_dofs)
+	{
+		bt_id_error_message(
+			"wrong vector dimension. system has %d DOFs,\n"
+			"but dim(q)= %d, dim(u)= %d, dim(dot_u)= %d, dim(joint_forces)= %d\n",
+			m_num_dofs, static_cast<int>(q.size()), static_cast<int>(u.size()),
+			static_cast<int>(dot_u.size()), static_cast<int>(joint_forces->size()));
+		return -1;
+	}
+	// 1. relative kinematics
+	if (-1 == calculateKinematics(q, u, dot_u, POSITION_VELOCITY_ACCELERATION))
+	{
+		bt_id_error_message("error in calculateKinematics\n");
+		return -1;
+	}
+	// 2. update contributions to equations of motion for every body.
+	for (idArrayIdx i = 0; i < m_body_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[i];
+		// 3.4 update dynamic terms (rate of change of angular & linear momentum)
+		body.m_eom_lhs_rotational =
+			body.m_body_I_body * body.m_body_ang_acc + body.m_body_mass_com.cross(body.m_body_acc) +
+			body.m_body_ang_vel.cross(body.m_body_I_body * body.m_body_ang_vel) -
+			body.m_body_moment_user;
+		body.m_eom_lhs_translational =
+			body.m_body_ang_acc.cross(body.m_body_mass_com) + body.m_mass * body.m_body_acc +
+			body.m_body_ang_vel.cross(body.m_body_ang_vel.cross(body.m_body_mass_com)) -
+			body.m_body_force_user;
+	}
+
+	// 3. calculate full set of forces at parent joint
+	// (not directly calculating the joint force along the free direction
+	// simplifies inclusion of fixed joints.
+	// An alternative would be to fuse bodies in a pre-processing step,
+	// but that would make changing masses online harder (eg, payload masses
+	// added with fixed  joints to a gripper)
+	// Also, this enables adding zero weight bodies as a way to calculate frame poses
+	// for force elements, etc.
+
+	for (int body_idx = m_body_list.size() - 1; body_idx >= 0; body_idx--)
+	{
+		// sum of forces and moments acting on this body from its children
+		vec3 sum_f_children;
+		vec3 sum_m_children;
+		setZero(sum_f_children);
+		setZero(sum_m_children);
+		for (idArrayIdx child_list_idx = 0; child_list_idx < m_child_indices[body_idx].size();
+			 child_list_idx++)
+		{
+			const RigidBody &child = m_body_list[m_child_indices[body_idx][child_list_idx]];
+			vec3 child_joint_force_in_this_frame =
+				child.m_body_T_parent.transpose() * child.m_force_at_joint;
+			sum_f_children -= child_joint_force_in_this_frame;
+			sum_m_children -= child.m_body_T_parent.transpose() * child.m_moment_at_joint +
+							  child.m_parent_pos_parent_body.cross(child_joint_force_in_this_frame);
+		}
+		RigidBody &body = m_body_list[body_idx];
+
+		body.m_force_at_joint = body.m_eom_lhs_translational - sum_f_children;
+		body.m_moment_at_joint = body.m_eom_lhs_rotational - sum_m_children;
+	}
+
+	// 4. Calculate Joint forces.
+	// These are the components of force_at_joint/moment_at_joint
+	// in the free directions given by Jac_JT/Jac_JR
+	// 4.1 revolute joints
+	for (idArrayIdx i = 0; i < m_body_revolute_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[m_body_revolute_list[i]];
+		// (*joint_forces)(body.m_q_index) = body.m_Jac_JR.transpose() * body.m_moment_at_joint;
+		(*joint_forces)(body.m_q_index) = body.m_Jac_JR.dot(body.m_moment_at_joint);
+	}
+	// 4.2 for prismatic joints
+	for (idArrayIdx i = 0; i < m_body_prismatic_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[m_body_prismatic_list[i]];
+		// (*joint_forces)(body.m_q_index) = body.m_Jac_JT.transpose() * body.m_force_at_joint;
+		(*joint_forces)(body.m_q_index) = body.m_Jac_JT.dot(body.m_force_at_joint);
+	}
+	// 4.3 floating bodies (6-DoF joints)
+	for (idArrayIdx i = 0; i < m_body_floating_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[m_body_floating_list[i]];
+		(*joint_forces)(body.m_q_index + 0) = body.m_moment_at_joint(0);
+		(*joint_forces)(body.m_q_index + 1) = body.m_moment_at_joint(1);
+		(*joint_forces)(body.m_q_index + 2) = body.m_moment_at_joint(2);
+
+		(*joint_forces)(body.m_q_index + 3) = body.m_force_at_joint(0);
+		(*joint_forces)(body.m_q_index + 4) = body.m_force_at_joint(1);
+		(*joint_forces)(body.m_q_index + 5) = body.m_force_at_joint(2);
+	}
+
+	// 4.4 spherical bodies (3-DoF joints)
+	for (idArrayIdx i = 0; i < m_body_spherical_list.size(); i++)
+	{
+		//todo: review
+		RigidBody &body = m_body_list[m_body_spherical_list[i]];
+		(*joint_forces)(body.m_q_index + 0) = body.m_moment_at_joint(0);
+		(*joint_forces)(body.m_q_index + 1) = body.m_moment_at_joint(1);
+		(*joint_forces)(body.m_q_index + 2) = body.m_moment_at_joint(2);
+	}
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::calculateKinematics(const vecx &q, const vecx &u, const vecx &dot_u,
+													  const KinUpdateType type)
+{
+	if (q.size() != m_num_dofs || u.size() != m_num_dofs || dot_u.size() != m_num_dofs)
+	{
+		bt_id_error_message(
+			"wrong vector dimension. system has %d DOFs,\n"
+			"but dim(q)= %d, dim(u)= %d, dim(dot_u)= %d\n",
+			m_num_dofs, static_cast<int>(q.size()), static_cast<int>(u.size()),
+			static_cast<int>(dot_u.size()));
+		return -1;
+	}
+	if (type != POSITION_ONLY && type != POSITION_VELOCITY && type != POSITION_VELOCITY_ACCELERATION)
+	{
+		bt_id_error_message("invalid type %d\n", type);
+		return -1;
+	}
+
+	// 1. update relative kinematics
+	// 1.1 for revolute
+	for (idArrayIdx i = 0; i < m_body_revolute_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[m_body_revolute_list[i]];
+		mat33 T;
+		bodyTParentFromAxisAngle(body.m_Jac_JR, q(body.m_q_index), &T);
+		body.m_body_T_parent = T * body.m_body_T_parent_ref;
+		if (type >= POSITION_VELOCITY)
+		{
+			body.m_body_ang_vel_rel = body.m_Jac_JR * u(body.m_q_index);
+		}
+		if (type >= POSITION_VELOCITY_ACCELERATION)
+		{
+			body.m_body_ang_acc_rel = body.m_Jac_JR * dot_u(body.m_q_index);
+		}
+	}
+	// 1.2 for prismatic
+	for (idArrayIdx i = 0; i < m_body_prismatic_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[m_body_prismatic_list[i]];
+		body.m_parent_pos_parent_body =
+			body.m_parent_pos_parent_body_ref + body.m_parent_Jac_JT * q(body.m_q_index);
+		if (type >= POSITION_VELOCITY)
+		{
+			body.m_parent_vel_rel =
+				body.m_body_T_parent_ref.transpose() * body.m_Jac_JT * u(body.m_q_index);
+		}
+		if (type >= POSITION_VELOCITY_ACCELERATION)
+		{
+			body.m_parent_acc_rel = body.m_parent_Jac_JT * dot_u(body.m_q_index);
+		}
+	}
+	// 1.3 fixed joints: nothing to do
+	// 1.4 6dof joints:
+	for (idArrayIdx i = 0; i < m_body_floating_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[m_body_floating_list[i]];
+
+		body.m_body_T_parent = transformZ(q(body.m_q_index + 2)) *
+							   transformY(q(body.m_q_index + 1)) *
+							   transformX(q(body.m_q_index));
+		body.m_parent_pos_parent_body(0) = q(body.m_q_index + 3);
+		body.m_parent_pos_parent_body(1) = q(body.m_q_index + 4);
+		body.m_parent_pos_parent_body(2) = q(body.m_q_index + 5);
+		body.m_parent_pos_parent_body = body.m_body_T_parent * body.m_parent_pos_parent_body;
+
+		if (type >= POSITION_VELOCITY)
+		{
+			body.m_body_ang_vel_rel(0) = u(body.m_q_index + 0);
+			body.m_body_ang_vel_rel(1) = u(body.m_q_index + 1);
+			body.m_body_ang_vel_rel(2) = u(body.m_q_index + 2);
+
+			body.m_parent_vel_rel(0) = u(body.m_q_index + 3);
+			body.m_parent_vel_rel(1) = u(body.m_q_index + 4);
+			body.m_parent_vel_rel(2) = u(body.m_q_index + 5);
+
+			body.m_parent_vel_rel = body.m_body_T_parent.transpose() * body.m_parent_vel_rel;
+		}
+		if (type >= POSITION_VELOCITY_ACCELERATION)
+		{
+			body.m_body_ang_acc_rel(0) = dot_u(body.m_q_index + 0);
+			body.m_body_ang_acc_rel(1) = dot_u(body.m_q_index + 1);
+			body.m_body_ang_acc_rel(2) = dot_u(body.m_q_index + 2);
+
+			body.m_parent_acc_rel(0) = dot_u(body.m_q_index + 3);
+			body.m_parent_acc_rel(1) = dot_u(body.m_q_index + 4);
+			body.m_parent_acc_rel(2) = dot_u(body.m_q_index + 5);
+
+			body.m_parent_acc_rel = body.m_body_T_parent.transpose() * body.m_parent_acc_rel;
+		}
+	}
+	
+	for (idArrayIdx i = 0; i < m_body_spherical_list.size(); i++)
+	{
+		//todo: review
+		RigidBody &body = m_body_list[m_body_spherical_list[i]];
+
+		mat33 T;
+
+		T = transformX(q(body.m_q_index)) *
+				transformY(q(body.m_q_index + 1)) *
+				transformZ(q(body.m_q_index + 2));
+		body.m_body_T_parent = T * body.m_body_T_parent_ref;
+			
+		body.m_parent_pos_parent_body(0)=0;
+		body.m_parent_pos_parent_body(1)=0;
+		body.m_parent_pos_parent_body(2)=0;
+		
+		body.m_parent_pos_parent_body = body.m_body_T_parent * body.m_parent_pos_parent_body;
+
+		if (type >= POSITION_VELOCITY)
+		{
+			body.m_body_ang_vel_rel(0) = u(body.m_q_index + 0);
+			body.m_body_ang_vel_rel(1) = u(body.m_q_index + 1);
+			body.m_body_ang_vel_rel(2) = u(body.m_q_index + 2);
+			body.m_parent_vel_rel = body.m_body_T_parent.transpose() * body.m_parent_vel_rel;
+		}
+		if (type >= POSITION_VELOCITY_ACCELERATION)
+		{
+			body.m_body_ang_acc_rel(0) = dot_u(body.m_q_index + 0);
+			body.m_body_ang_acc_rel(1) = dot_u(body.m_q_index + 1);
+			body.m_body_ang_acc_rel(2) = dot_u(body.m_q_index + 2);
+			body.m_parent_acc_rel = body.m_body_T_parent.transpose() * body.m_parent_acc_rel;
+		}
+	}
+
+	// 2. absolute kinematic quantities (vector valued)
+	// NOTE: this should be optimized by specializing for different body types
+	// (e.g., relative rotation is always zero for prismatic joints, etc.)
+
+	// calculations for root body
+	{
+		RigidBody &body = m_body_list[0];
+		// 3.1 update absolute positions and orientations:
+		// will be required if we add force elements (eg springs between bodies,
+		// or contacts)
+		// not required right now, added here for debugging purposes
+		body.m_body_pos = body.m_body_T_parent * body.m_parent_pos_parent_body;
+		body.m_body_T_world = body.m_body_T_parent;
+
+		if (type >= POSITION_VELOCITY)
+		{
+			// 3.2 update absolute velocities
+			body.m_body_ang_vel = body.m_body_ang_vel_rel;
+			body.m_body_vel = body.m_parent_vel_rel;
+		}
+		if (type >= POSITION_VELOCITY_ACCELERATION)
+		{
+			// 3.3 update absolute accelerations
+			// NOTE: assumption: dot(J_JR) = 0; true here, but not for general joints
+			body.m_body_ang_acc = body.m_body_ang_acc_rel;
+			body.m_body_acc = body.m_body_T_parent * body.m_parent_acc_rel;
+			// add gravitational acceleration to root body
+			// this is an efficient way to add gravitational terms,
+			// but it does mean that the kinematics are no longer
+			// correct at the acceleration level
+			// NOTE: To get correct acceleration kinematics, just set world_gravity to zero
+			body.m_body_acc = body.m_body_acc - body.m_body_T_parent * m_world_gravity;
+		}
+	}
+
+	for (idArrayIdx i = 1; i < m_body_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[i];
+		RigidBody &parent = m_body_list[m_parent_index[i]];
+		// 2.1 update absolute positions and orientations:
+		// will be required if we add force elements (eg springs between bodies,
+		// or contacts)  not required right now added here for debugging purposes
+		body.m_body_pos =
+			body.m_body_T_parent * (parent.m_body_pos + body.m_parent_pos_parent_body);
+		body.m_body_T_world = body.m_body_T_parent * parent.m_body_T_world;
+
+		if (type >= POSITION_VELOCITY)
+		{
+			// 2.2 update absolute velocities
+			body.m_body_ang_vel =
+				body.m_body_T_parent * parent.m_body_ang_vel + body.m_body_ang_vel_rel;
+
+			body.m_body_vel =
+				body.m_body_T_parent *
+				(parent.m_body_vel + parent.m_body_ang_vel.cross(body.m_parent_pos_parent_body) +
+				 body.m_parent_vel_rel);
+		}
+		if (type >= POSITION_VELOCITY_ACCELERATION)
+		{
+			// 2.3 update absolute accelerations
+			// NOTE: assumption: dot(J_JR) = 0; true here, but not for general joints
+			body.m_body_ang_acc =
+				body.m_body_T_parent * parent.m_body_ang_acc -
+				body.m_body_ang_vel_rel.cross(body.m_body_T_parent * parent.m_body_ang_vel) +
+				body.m_body_ang_acc_rel;
+			body.m_body_acc =
+				body.m_body_T_parent *
+				(parent.m_body_acc + parent.m_body_ang_acc.cross(body.m_parent_pos_parent_body) +
+				 parent.m_body_ang_vel.cross(parent.m_body_ang_vel.cross(body.m_parent_pos_parent_body)) +
+				 2.0 * parent.m_body_ang_vel.cross(body.m_parent_vel_rel) + body.m_parent_acc_rel);
+		}
+	}
+
+	return 0;
+}
+
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+
+void MultiBodyTree::MultiBodyImpl::addRelativeJacobianComponent(RigidBody &body)
+{
+	const int &idx = body.m_q_index;
+	switch (body.m_joint_type)
+	{
+		case FIXED:
+			break;
+		case REVOLUTE:
+			setMat3xElem(0, idx, body.m_Jac_JR(0), &body.m_body_Jac_R);
+			setMat3xElem(1, idx, body.m_Jac_JR(1), &body.m_body_Jac_R);
+			setMat3xElem(2, idx, body.m_Jac_JR(2), &body.m_body_Jac_R);
+			break;
+		case PRISMATIC:
+			setMat3xElem(0, idx, body.m_body_T_parent_ref(0, 0) * body.m_Jac_JT(0) + body.m_body_T_parent_ref(1, 0) * body.m_Jac_JT(1) + body.m_body_T_parent_ref(2, 0) * body.m_Jac_JT(2),
+						 &body.m_body_Jac_T);
+			setMat3xElem(1, idx, body.m_body_T_parent_ref(0, 1) * body.m_Jac_JT(0) + body.m_body_T_parent_ref(1, 1) * body.m_Jac_JT(1) + body.m_body_T_parent_ref(2, 1) * body.m_Jac_JT(2),
+						 &body.m_body_Jac_T);
+			setMat3xElem(2, idx, body.m_body_T_parent_ref(0, 2) * body.m_Jac_JT(0) + body.m_body_T_parent_ref(1, 2) * body.m_Jac_JT(1) + body.m_body_T_parent_ref(2, 2) * body.m_Jac_JT(2),
+						 &body.m_body_Jac_T);
+			break;
+		case FLOATING:
+			setMat3xElem(0, idx + 0, 1.0, &body.m_body_Jac_R);
+			setMat3xElem(1, idx + 1, 1.0, &body.m_body_Jac_R);
+			setMat3xElem(2, idx + 2, 1.0, &body.m_body_Jac_R);
+			// body_Jac_T = body_T_parent.transpose();
+			setMat3xElem(0, idx + 3, body.m_body_T_parent(0, 0), &body.m_body_Jac_T);
+			setMat3xElem(0, idx + 4, body.m_body_T_parent(1, 0), &body.m_body_Jac_T);
+			setMat3xElem(0, idx + 5, body.m_body_T_parent(2, 0), &body.m_body_Jac_T);
+
+			setMat3xElem(1, idx + 3, body.m_body_T_parent(0, 1), &body.m_body_Jac_T);
+			setMat3xElem(1, idx + 4, body.m_body_T_parent(1, 1), &body.m_body_Jac_T);
+			setMat3xElem(1, idx + 5, body.m_body_T_parent(2, 1), &body.m_body_Jac_T);
+
+			setMat3xElem(2, idx + 3, body.m_body_T_parent(0, 2), &body.m_body_Jac_T);
+			setMat3xElem(2, idx + 4, body.m_body_T_parent(1, 2), &body.m_body_Jac_T);
+			setMat3xElem(2, idx + 5, body.m_body_T_parent(2, 2), &body.m_body_Jac_T);
+
+			break;
+		case SPHERICAL:
+			//todo: review
+			setMat3xElem(0, idx + 0, 1.0, &body.m_body_Jac_R);
+			setMat3xElem(1, idx + 1, 1.0, &body.m_body_Jac_R);
+			setMat3xElem(2, idx + 2, 1.0, &body.m_body_Jac_R);
+			break;
+	}
+}
+
+int MultiBodyTree::MultiBodyImpl::calculateJacobians(const vecx &q, const vecx &u, const KinUpdateType type)
+{
+	if (q.size() != m_num_dofs || u.size() != m_num_dofs)
+	{
+		bt_id_error_message(
+			"wrong vector dimension. system has %d DOFs,\n"
+			"but dim(q)= %d, dim(u)= %d\n",
+			m_num_dofs, static_cast<int>(q.size()), static_cast<int>(u.size()));
+		return -1;
+	}
+	if (type != POSITION_ONLY && type != POSITION_VELOCITY)
+	{
+		bt_id_error_message("invalid type %d\n", type);
+		return -1;
+	}
+
+	addRelativeJacobianComponent(m_body_list[0]);
+	for (idArrayIdx i = 1; i < m_body_list.size(); i++)
+	{
+		RigidBody &body = m_body_list[i];
+		RigidBody &parent = m_body_list[m_parent_index[i]];
+
+		mul(body.m_body_T_parent, parent.m_body_Jac_R, &body.m_body_Jac_R);
+		body.m_body_Jac_T = parent.m_body_Jac_T;
+		mul(tildeOperator(body.m_parent_pos_parent_body), parent.m_body_Jac_R, &m_m3x);
+		sub(body.m_body_Jac_T, m_m3x, &body.m_body_Jac_T);
+
+		addRelativeJacobianComponent(body);
+		mul(body.m_body_T_parent, body.m_body_Jac_T, &body.m_body_Jac_T);
+
+		if (type >= POSITION_VELOCITY)
+		{
+			body.m_body_dot_Jac_R_u = body.m_body_T_parent * parent.m_body_dot_Jac_R_u -
+									  body.m_body_ang_vel_rel.cross(body.m_body_T_parent * parent.m_body_ang_vel);
+			body.m_body_dot_Jac_T_u = body.m_body_T_parent *
+									  (parent.m_body_dot_Jac_T_u + parent.m_body_dot_Jac_R_u.cross(body.m_parent_pos_parent_body) +
+									   parent.m_body_ang_vel.cross(parent.m_body_ang_vel.cross(body.m_parent_pos_parent_body)) +
+									   2.0 * parent.m_body_ang_vel.cross(body.m_parent_vel_rel));
+		}
+	}
+	return 0;
+}
+#endif
+
+static inline void setThreeDoFJacobians(const int dof, vec3 &Jac_JR, vec3 &Jac_JT)
+{
+	switch (dof)
+	{
+		// rotational part
+		case 0:
+			Jac_JR(0) = 1;
+			Jac_JR(1) = 0;
+			Jac_JR(2) = 0;
+			setZero(Jac_JT);
+			break;
+		case 1:
+			Jac_JR(0) = 0;
+			Jac_JR(1) = 1;
+			Jac_JR(2) = 0;
+			setZero(Jac_JT);
+			break;
+		case 2:
+			Jac_JR(0) = 0;
+			Jac_JR(1) = 0;
+			Jac_JR(2) = 1;
+			setZero(Jac_JT);
+			break;
+	}
+}
+
+static inline void setSixDoFJacobians(const int dof, vec3 &Jac_JR, vec3 &Jac_JT)
+{
+	switch (dof)
+	{
+		// rotational part
+		case 0:
+			Jac_JR(0) = 1;
+			Jac_JR(1) = 0;
+			Jac_JR(2) = 0;
+			setZero(Jac_JT);
+			break;
+		case 1:
+			Jac_JR(0) = 0;
+			Jac_JR(1) = 1;
+			Jac_JR(2) = 0;
+			setZero(Jac_JT);
+			break;
+		case 2:
+			Jac_JR(0) = 0;
+			Jac_JR(1) = 0;
+			Jac_JR(2) = 1;
+			setZero(Jac_JT);
+			break;
+		// translational part
+		case 3:
+			setZero(Jac_JR);
+			Jac_JT(0) = 1;
+			Jac_JT(1) = 0;
+			Jac_JT(2) = 0;
+			break;
+		case 4:
+			setZero(Jac_JR);
+			Jac_JT(0) = 0;
+			Jac_JT(1) = 1;
+			Jac_JT(2) = 0;
+			break;
+		case 5:
+			setZero(Jac_JR);
+			Jac_JT(0) = 0;
+			Jac_JT(1) = 0;
+			Jac_JT(2) = 1;
+			break;
+	}
+}
+
+static inline int jointNumDoFs(const JointType &type)
+{
+	switch (type)
+	{
+		case FIXED:
+			return 0;
+		case REVOLUTE:
+		case PRISMATIC:
+			return 1;
+		case FLOATING:
+			return 6;
+		case SPHERICAL:
+			return 3;
+	}
+	// this should never happen
+	bt_id_error_message("invalid joint type\n");
+	// TODO add configurable abort/crash function
+	abort();
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::calculateMassMatrix(const vecx &q, const bool update_kinematics,
+													  const bool initialize_matrix,
+													  const bool set_lower_triangular_matrix,
+													  matxx *mass_matrix)
+{
+	// This calculates the joint space mass matrix for the multibody system.
+	// The algorithm is essentially an implementation of "method 3"
+	// in "Efficient Dynamic Simulation of Robotic Mechanisms" (Walker and Orin, 1982)
+	// (Later named "Composite Rigid Body Algorithm" by Featherstone).
+	//
+	// This implementation, however, handles branched systems and uses a formulation centered
+	// on the origin of the body-fixed frame to avoid re-computing various quantities at the com.
+
+	if (q.size() != m_num_dofs || mass_matrix->rows() != m_num_dofs ||
+		mass_matrix->cols() != m_num_dofs)
+	{
+		bt_id_error_message(
+			"Dimension error. System has %d DOFs,\n"
+			"but dim(q)= %d, dim(mass_matrix)= %d x %d\n",
+			m_num_dofs, static_cast<int>(q.size()), static_cast<int>(mass_matrix->rows()),
+			static_cast<int>(mass_matrix->cols()));
+		return -1;
+	}
+
+	// TODO add optimized zeroing function?
+	if (initialize_matrix)
+	{
+		for (int i = 0; i < m_num_dofs; i++)
+		{
+			for (int j = 0; j < m_num_dofs; j++)
+			{
+				setMatxxElem(i, j, 0.0, mass_matrix);
+			}
+		}
+	}
+
+	if (update_kinematics)
+	{
+		// 1. update relative kinematics
+		// 1.1 for revolute joints
+		for (idArrayIdx i = 0; i < m_body_revolute_list.size(); i++)
+		{
+			RigidBody &body = m_body_list[m_body_revolute_list[i]];
+			// from reference orientation (q=0) of body-fixed frame to current orientation
+			mat33 body_T_body_ref;
+			bodyTParentFromAxisAngle(body.m_Jac_JR, q(body.m_q_index), &body_T_body_ref);
+			body.m_body_T_parent = body_T_body_ref * body.m_body_T_parent_ref;
+		}
+		// 1.2 for prismatic joints
+		for (idArrayIdx i = 0; i < m_body_prismatic_list.size(); i++)
+		{
+			RigidBody &body = m_body_list[m_body_prismatic_list[i]];
+			// body.m_body_T_parent= fixed
+			body.m_parent_pos_parent_body =
+				body.m_parent_pos_parent_body_ref + body.m_parent_Jac_JT * q(body.m_q_index);
+		}
+		// 1.3 fixed joints: nothing to do
+		// 1.4 6dof joints:
+		for (idArrayIdx i = 0; i < m_body_floating_list.size(); i++)
+		{
+			RigidBody &body = m_body_list[m_body_floating_list[i]];
+
+			body.m_body_T_parent = transformZ(q(body.m_q_index + 2)) *
+								   transformY(q(body.m_q_index + 1)) *
+								   transformX(q(body.m_q_index));
+			body.m_parent_pos_parent_body(0) = q(body.m_q_index + 3);
+			body.m_parent_pos_parent_body(1) = q(body.m_q_index + 4);
+			body.m_parent_pos_parent_body(2) = q(body.m_q_index + 5);
+
+			body.m_parent_pos_parent_body = body.m_body_T_parent * body.m_parent_pos_parent_body;
+		}
+
+		for (idArrayIdx i = 0; i < m_body_spherical_list.size(); i++)
+		{
+			//todo: review
+			RigidBody &body = m_body_list[m_body_spherical_list[i]];
+
+			mat33 T;
+
+			T = transformX(q(body.m_q_index)) *
+				transformY(q(body.m_q_index + 1)) *
+				transformZ(q(body.m_q_index + 2));
+			body.m_body_T_parent = T * body.m_body_T_parent_ref;
+
+			body.m_parent_pos_parent_body(0)=0;
+			body.m_parent_pos_parent_body(1)=0;
+			body.m_parent_pos_parent_body(2)=0;
+			
+			body.m_parent_pos_parent_body = body.m_body_T_parent * body.m_parent_pos_parent_body;
+		}
+	}
+	for (int i = m_body_list.size() - 1; i >= 0; i--)
+	{
+		RigidBody &body = m_body_list[i];
+		// calculate mass, center of mass and inertia of "composite rigid body",
+		// ie, sub-tree starting at current body
+		body.m_subtree_mass = body.m_mass;
+		body.m_body_subtree_mass_com = body.m_body_mass_com;
+		body.m_body_subtree_I_body = body.m_body_I_body;
+
+		for (idArrayIdx c = 0; c < m_child_indices[i].size(); c++)
+		{
+			RigidBody &child = m_body_list[m_child_indices[i][c]];
+			mat33 body_T_child = child.m_body_T_parent.transpose();
+
+			body.m_subtree_mass += child.m_subtree_mass;
+			body.m_body_subtree_mass_com += body_T_child * child.m_body_subtree_mass_com +
+											child.m_parent_pos_parent_body * child.m_subtree_mass;
+			body.m_body_subtree_I_body +=
+				body_T_child * child.m_body_subtree_I_body * child.m_body_T_parent;
+
+			if (child.m_subtree_mass > 0)
+			{
+				// Shift the reference point for the child subtree inertia using the
+				// Huygens-Steiner ("parallel axis") theorem.
+				// (First shift from child origin to child com, then from there to this body's
+				// origin)
+				vec3 r_com = body_T_child * child.m_body_subtree_mass_com / child.m_subtree_mass;
+				mat33 tilde_r_child_com = tildeOperator(r_com);
+				mat33 tilde_r_body_com = tildeOperator(child.m_parent_pos_parent_body + r_com);
+				body.m_body_subtree_I_body +=
+					child.m_subtree_mass *
+					(tilde_r_child_com * tilde_r_child_com - tilde_r_body_com * tilde_r_body_com);
+			}
+		}
+	}
+
+	for (int i = m_body_list.size() - 1; i >= 0; i--)
+	{
+		const RigidBody &body = m_body_list[i];
+
+		// determine DoF-range for body
+		const int q_index_min = body.m_q_index;
+		const int q_index_max = q_index_min + jointNumDoFs(body.m_joint_type) - 1;
+		// loop over the DoFs used by this body
+		// local joint jacobians (ok as is for 1-DoF joints)
+		vec3 Jac_JR = body.m_Jac_JR;
+		vec3 Jac_JT = body.m_Jac_JT;
+		for (int col = q_index_max; col >= q_index_min; col--)
+		{
+			// set jacobians for 6-DoF joints
+			if (FLOATING == body.m_joint_type)
+			{
+				setSixDoFJacobians(col - q_index_min, Jac_JR, Jac_JT);
+			}
+			if (SPHERICAL == body.m_joint_type)
+			{
+				//todo: review
+				setThreeDoFJacobians(col - q_index_min, Jac_JR, Jac_JT);
+			}
+
+			vec3 body_eom_rot =
+				body.m_body_subtree_I_body * Jac_JR + body.m_body_subtree_mass_com.cross(Jac_JT);
+			vec3 body_eom_trans =
+				body.m_subtree_mass * Jac_JT - body.m_body_subtree_mass_com.cross(Jac_JR);
+			setMatxxElem(col, col, Jac_JR.dot(body_eom_rot) + Jac_JT.dot(body_eom_trans), mass_matrix);
+
+			// rest of the mass matrix column upwards
+			{
+				// 1. for multi-dof joints, rest of the dofs of this body
+				for (int row = col - 1; row >= q_index_min; row--)
+				{
+					if (SPHERICAL == body.m_joint_type)
+					{
+						//todo: review
+						setThreeDoFJacobians(row - q_index_min, Jac_JR, Jac_JT);
+						const double Mrc = Jac_JR.dot(body_eom_rot) + Jac_JT.dot(body_eom_trans);
+						setMatxxElem(col, row, Mrc, mass_matrix);
+					}
+					if (FLOATING == body.m_joint_type)
+					{
+						setSixDoFJacobians(row - q_index_min, Jac_JR, Jac_JT);
+						const double Mrc = Jac_JR.dot(body_eom_rot) + Jac_JT.dot(body_eom_trans);
+						setMatxxElem(col, row, Mrc, mass_matrix);
+					}
+				}
+				// 2. ancestor dofs
+				int child_idx = i;
+				int parent_idx = m_parent_index[i];
+				while (parent_idx >= 0)
+				{
+					const RigidBody &child_body = m_body_list[child_idx];
+					const RigidBody &parent_body = m_body_list[parent_idx];
+
+					const mat33 parent_T_child = child_body.m_body_T_parent.transpose();
+					body_eom_rot = parent_T_child * body_eom_rot;
+					body_eom_trans = parent_T_child * body_eom_trans;
+					body_eom_rot += child_body.m_parent_pos_parent_body.cross(body_eom_trans);
+
+					const int parent_body_q_index_min = parent_body.m_q_index;
+					const int parent_body_q_index_max =
+						parent_body_q_index_min + jointNumDoFs(parent_body.m_joint_type) - 1;
+					vec3 Jac_JR = parent_body.m_Jac_JR;
+					vec3 Jac_JT = parent_body.m_Jac_JT;
+					for (int row = parent_body_q_index_max; row >= parent_body_q_index_min; row--)
+					{
+						if (SPHERICAL == parent_body.m_joint_type)
+						{
+							//todo: review
+							setThreeDoFJacobians(row - parent_body_q_index_min, Jac_JR, Jac_JT);
+						}
+						// set jacobians for 6-DoF joints
+						if (FLOATING == parent_body.m_joint_type)
+						{
+							setSixDoFJacobians(row - parent_body_q_index_min, Jac_JR, Jac_JT);
+						}
+						const double Mrc = Jac_JR.dot(body_eom_rot) + Jac_JT.dot(body_eom_trans);
+						setMatxxElem(col, row, Mrc, mass_matrix);
+					}
+
+					child_idx = parent_idx;
+					parent_idx = m_parent_index[child_idx];
+				}
+			}
+		}
+	}
+
+	if (set_lower_triangular_matrix)
+	{
+		for (int col = 0; col < m_num_dofs; col++)
+		{
+			for (int row = 0; row < col; row++)
+			{
+				setMatxxElem(row, col, (*mass_matrix)(col, row), mass_matrix);
+			}
+		}
+	}
+	return 0;
+}
+
+// utility macro
+#define CHECK_IF_BODY_INDEX_IS_VALID(index)                                                  \
+	do                                                                                       \
+	{                                                                                        \
+		if (index < 0 || index >= m_num_bodies)                                              \
+		{                                                                                    \
+			bt_id_error_message("invalid index %d (num_bodies= %d)\n", index, m_num_bodies); \
+			return -1;                                                                       \
+		}                                                                                    \
+	} while (0)
+
+int MultiBodyTree::MultiBodyImpl::getParentIndex(const int body_index, int *p)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*p = m_parent_index[body_index];
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getUserInt(const int body_index, int *user_int) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*user_int = m_user_int[body_index];
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::getUserPtr(const int body_index, void **user_ptr) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*user_ptr = m_user_ptr[body_index];
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::setUserInt(const int body_index, const int user_int)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	m_user_int[body_index] = user_int;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::setUserPtr(const int body_index, void *const user_ptr)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	m_user_ptr[body_index] = user_ptr;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyOrigin(int body_index, vec3 *world_origin) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_origin = body.m_body_T_world.transpose() * body.m_body_pos;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyCoM(int body_index, vec3 *world_com) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	if (body.m_mass > 0)
+	{
+		*world_com = body.m_body_T_world.transpose() *
+					 (body.m_body_pos + body.m_body_mass_com / body.m_mass);
+	}
+	else
+	{
+		*world_com = body.m_body_T_world.transpose() * (body.m_body_pos);
+	}
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyTransform(int body_index, mat33 *world_T_body) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_T_body = body.m_body_T_world.transpose();
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::getBodyAngularVelocity(int body_index, vec3 *world_omega) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_omega = body.m_body_T_world.transpose() * body.m_body_ang_vel;
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::getBodyLinearVelocity(int body_index,
+														vec3 *world_velocity) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_velocity = body.m_body_T_world.transpose() * body.m_body_vel;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyLinearVelocityCoM(int body_index,
+														   vec3 *world_velocity) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	vec3 com;
+	if (body.m_mass > 0)
+	{
+		com = body.m_body_mass_com / body.m_mass;
+	}
+	else
+	{
+		com(0) = 0;
+		com(1) = 0;
+		com(2) = 0;
+	}
+
+	*world_velocity =
+		body.m_body_T_world.transpose() * (body.m_body_vel + body.m_body_ang_vel.cross(com));
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyAngularAcceleration(int body_index,
+															 vec3 *world_dot_omega) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_dot_omega = body.m_body_T_world.transpose() * body.m_body_ang_acc;
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::getBodyLinearAcceleration(int body_index,
+															vec3 *world_acceleration) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_acceleration = body.m_body_T_world.transpose() * body.m_body_acc;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getJointType(const int body_index, JointType *joint_type) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*joint_type = m_body_list[body_index].m_joint_type;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getJointTypeStr(const int body_index,
+												  const char **joint_type) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*joint_type = jointTypeToString(m_body_list[body_index].m_joint_type);
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getParentRParentBodyRef(const int body_index, vec3 *r) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*r = m_body_list[body_index].m_parent_pos_parent_body_ref;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyTParentRef(const int body_index, mat33 *T) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*T = m_body_list[body_index].m_body_T_parent_ref;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyAxisOfMotion(const int body_index, vec3 *axis) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	if (m_body_list[body_index].m_joint_type == REVOLUTE)
+	{
+		*axis = m_body_list[body_index].m_Jac_JR;
+		return 0;
+	}
+	if (m_body_list[body_index].m_joint_type == PRISMATIC)
+	{
+		*axis = m_body_list[body_index].m_Jac_JT;
+		return 0;
+	}
+	setZero(*axis);
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getDoFOffset(const int body_index, int *q_index) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*q_index = m_body_list[body_index].m_q_index;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::setBodyMass(const int body_index, const idScalar mass)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	m_body_list[body_index].m_mass = mass;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::setBodyFirstMassMoment(const int body_index,
+														 const vec3 &first_mass_moment)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	m_body_list[body_index].m_body_mass_com = first_mass_moment;
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::setBodySecondMassMoment(const int body_index,
+														  const mat33 &second_mass_moment)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	m_body_list[body_index].m_body_I_body = second_mass_moment;
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::getBodyMass(const int body_index, idScalar *mass) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*mass = m_body_list[body_index].m_mass;
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::getBodyFirstMassMoment(const int body_index,
+														 vec3 *first_mass_moment) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*first_mass_moment = m_body_list[body_index].m_body_mass_com;
+	return 0;
+}
+int MultiBodyTree::MultiBodyImpl::getBodySecondMassMoment(const int body_index,
+														  mat33 *second_mass_moment) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	*second_mass_moment = m_body_list[body_index].m_body_I_body;
+	return 0;
+}
+
+void MultiBodyTree::MultiBodyImpl::clearAllUserForcesAndMoments()
+{
+	for (int index = 0; index < m_num_bodies; index++)
+	{
+		RigidBody &body = m_body_list[index];
+		setZero(body.m_body_force_user);
+		setZero(body.m_body_moment_user);
+	}
+}
+
+int MultiBodyTree::MultiBodyImpl::addUserForce(const int body_index, const vec3 &body_force)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	m_body_list[body_index].m_body_force_user += body_force;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::addUserMoment(const int body_index, const vec3 &body_moment)
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	m_body_list[body_index].m_body_moment_user += body_moment;
+	return 0;
+}
+
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+int MultiBodyTree::MultiBodyImpl::getBodyDotJacobianTransU(const int body_index, vec3 *world_dot_jac_trans_u) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_dot_jac_trans_u = body.m_body_T_world.transpose() * body.m_body_dot_Jac_T_u;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyDotJacobianRotU(const int body_index, vec3 *world_dot_jac_rot_u) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	*world_dot_jac_rot_u = body.m_body_T_world.transpose() * body.m_body_dot_Jac_R_u;
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyJacobianTrans(const int body_index, mat3x *world_jac_trans) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	mul(body.m_body_T_world.transpose(), body.m_body_Jac_T, world_jac_trans);
+	return 0;
+}
+
+int MultiBodyTree::MultiBodyImpl::getBodyJacobianRot(const int body_index, mat3x *world_jac_rot) const
+{
+	CHECK_IF_BODY_INDEX_IS_VALID(body_index);
+	const RigidBody &body = m_body_list[body_index];
+	mul(body.m_body_T_world.transpose(), body.m_body_Jac_R, world_jac_rot);
+	return 0;
+}
+
+#endif
+}  // namespace btInverseDynamics
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp
new file mode 100644
index 0000000..eabdbe1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp
@@ -0,0 +1,288 @@
+// The structs and classes defined here provide a basic inverse fynamics implementation used
+// by MultiBodyTree
+// User interaction should be through MultiBodyTree
+
+#ifndef MULTI_BODY_REFERENCE_IMPL_HPP_
+#define MULTI_BODY_REFERENCE_IMPL_HPP_
+
+#include "../IDConfig.hpp"
+#include "../MultiBodyTree.hpp"
+
+namespace btInverseDynamics
+{
+/// Structure for for rigid body mass properties, connectivity and kinematic state
+/// all vectors and matrices are in body-fixed frame, if not indicated otherwise.
+/// The body-fixed frame is located in the joint connecting the body to its parent.
+struct RigidBody
+{
+	ID_DECLARE_ALIGNED_ALLOCATOR();
+	// 1 Inertial properties
+	/// Mass
+	idScalar m_mass;
+	/// Mass times center of gravity in body-fixed frame
+	vec3 m_body_mass_com;
+	/// Moment of inertia w.r.t. body-fixed frame
+	mat33 m_body_I_body;
+
+	// 2 dynamic properties
+	/// Left-hand side of the body equation of motion, translational part
+	vec3 m_eom_lhs_translational;
+	/// Left-hand side of the body equation of motion, rotational part
+	vec3 m_eom_lhs_rotational;
+	/// Force acting at the joint when the body is cut from its parent;
+	/// includes impressed joint force in J_JT direction,
+	/// as well as constraint force,
+	/// in body-fixed frame
+	vec3 m_force_at_joint;
+	/// Moment acting at the joint when the body is cut from its parent;
+	/// includes impressed joint moment in J_JR direction, and constraint moment
+	/// in body-fixed frame
+	vec3 m_moment_at_joint;
+	/// external (user provided) force acting at the body-fixed frame's origin, written in that
+	/// frame
+	vec3 m_body_force_user;
+	/// external (user provided) moment acting at the body-fixed frame's origin, written in that
+	/// frame
+	vec3 m_body_moment_user;
+	// 3 absolute kinematic properties
+	/// Position of body-fixed frame relative to world frame
+	/// this is currently only for debugging purposes
+	vec3 m_body_pos;
+	/// Absolute velocity of body-fixed frame
+	vec3 m_body_vel;
+	/// Absolute acceleration of body-fixed frame
+	/// NOTE: if gravitational acceleration is not zero, this is the accelation PLUS gravitational
+	/// acceleration!
+	vec3 m_body_acc;
+	/// Absolute angular velocity
+	vec3 m_body_ang_vel;
+	/// Absolute angular acceleration
+	/// NOTE: if gravitational acceleration is not zero, this is the accelation PLUS gravitational
+	/// acceleration!
+	vec3 m_body_ang_acc;
+
+	// 4 relative kinematic properties.
+	// these are in the parent body frame
+	/// Transform from world to body-fixed frame;
+	/// this is currently only for debugging purposes
+	mat33 m_body_T_world;
+	/// Transform from parent to body-fixed frame
+	mat33 m_body_T_parent;
+	/// Vector from parent to child frame in parent frame
+	vec3 m_parent_pos_parent_body;
+	/// Relative angular velocity
+	vec3 m_body_ang_vel_rel;
+	/// Relative linear velocity
+	vec3 m_parent_vel_rel;
+	/// Relative angular acceleration
+	vec3 m_body_ang_acc_rel;
+	/// Relative linear acceleration
+	vec3 m_parent_acc_rel;
+
+	// 5 Data describing the joint type and geometry
+	/// Type of joint
+	JointType m_joint_type;
+	/// Position of joint frame (body-fixed frame at q=0) relative to the parent frame
+	/// Components are in body-fixed frame of the parent
+	vec3 m_parent_pos_parent_body_ref;
+	/// Orientation of joint frame (body-fixed frame at q=0) relative to the parent frame
+	mat33 m_body_T_parent_ref;
+	/// Joint rotational Jacobian, ie, the partial derivative of the body-fixed frames absolute
+	/// angular velocity w.r.t. the generalized velocity of this body's relative degree of freedom.
+	/// For revolute joints this is the joint axis, for prismatic joints it is a null matrix.
+	/// (NOTE: dimensions will have to be dynamic for additional joint types!)
+	vec3 m_Jac_JR;
+	/// Joint translational Jacobian, ie, the partial derivative of the body-fixed frames absolute
+	/// linear velocity w.r.t. the generalized velocity of this body's relative degree of freedom.
+	/// For prismatic joints this is the joint axis, for revolute joints it is a null matrix.
+	/// (NOTE: dimensions might have to be dynamic for additional joint types!)
+	vec3 m_Jac_JT;
+	/// m_Jac_JT in the parent frame, it, m_body_T_parent_ref.transpose()*m_Jac_JT
+	vec3 m_parent_Jac_JT;
+	/// Start of index range for the position degree(s) of freedom describing this body's motion
+	/// relative to
+	/// its parent. The indices are wrt the multibody system's q-vector of generalized coordinates.
+	int m_q_index;
+
+	// 6 Scratch data for mass matrix computation using "composite rigid body algorithm"
+	/// mass of the subtree rooted in this body
+	idScalar m_subtree_mass;
+	/// center of mass * mass for subtree rooted in this body, in body-fixed frame
+	vec3 m_body_subtree_mass_com;
+	/// moment of inertia of subtree rooted in this body, w.r.t. body origin, in body-fixed frame
+	mat33 m_body_subtree_I_body;
+
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+	/// translational jacobian in body-fixed frame d(m_body_vel)/du
+	mat3x m_body_Jac_T;
+	/// rotationsl jacobian in body-fixed frame d(m_body_ang_vel)/du
+	mat3x m_body_Jac_R;
+	/// components of linear acceleration depending on u
+	/// (same as is d(m_Jac_T)/dt*u)
+	vec3 m_body_dot_Jac_T_u;
+	/// components of angular acceleration depending on u
+	/// (same as is d(m_Jac_T)/dt*u)
+	vec3 m_body_dot_Jac_R_u;
+#endif
+};
+
+/// The MBS implements a tree structured multibody system
+class MultiBodyTree::MultiBodyImpl
+{
+	friend class MultiBodyTree;
+
+public:
+	ID_DECLARE_ALIGNED_ALLOCATOR();
+
+	enum KinUpdateType
+	{
+		POSITION_ONLY,
+		POSITION_VELOCITY,
+		POSITION_VELOCITY_ACCELERATION
+	};
+
+	/// constructor
+	/// @param num_bodies the number of bodies in the system
+	/// @param num_dofs number of degrees of freedom in the system
+	MultiBodyImpl(int num_bodies_, int num_dofs_);
+
+	/// \copydoc MultiBodyTree::calculateInverseDynamics
+	int calculateInverseDynamics(const vecx& q, const vecx& u, const vecx& dot_u,
+								 vecx* joint_forces);
+	///\copydoc MultiBodyTree::calculateMassMatrix
+	int calculateMassMatrix(const vecx& q, const bool update_kinematics,
+							const bool initialize_matrix, const bool set_lower_triangular_matrix,
+							matxx* mass_matrix);
+	/// calculate kinematics (vector quantities)
+	/// Depending on type, update positions only, positions & velocities, or positions, velocities
+	/// and accelerations.
+	int calculateKinematics(const vecx& q, const vecx& u, const vecx& dot_u, const KinUpdateType type);
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+	/// calculate jacobians and (if type == POSITION_VELOCITY), also velocity-dependent accelration terms.
+	int calculateJacobians(const vecx& q, const vecx& u, const KinUpdateType type);
+	/// \copydoc MultiBodyTree::getBodyDotJacobianTransU
+	int getBodyDotJacobianTransU(const int body_index, vec3* world_dot_jac_trans_u) const;
+	/// \copydoc MultiBodyTree::getBodyDotJacobianRotU
+	int getBodyDotJacobianRotU(const int body_index, vec3* world_dot_jac_rot_u) const;
+	/// \copydoc MultiBodyTree::getBodyJacobianTrans
+	int getBodyJacobianTrans(const int body_index, mat3x* world_jac_trans) const;
+	/// \copydoc MultiBodyTree::getBodyJacobianRot
+	int getBodyJacobianRot(const int body_index, mat3x* world_jac_rot) const;
+	/// Add relative Jacobian component from motion relative to parent body
+	/// @param body the body to add the Jacobian component for
+	void addRelativeJacobianComponent(RigidBody& body);
+#endif
+	/// generate additional index sets from the parent_index array
+	/// @return -1 on error, 0 on success
+	int generateIndexSets();
+	/// set gravity acceleration in world frame
+	/// @param gravity gravity vector in the world frame
+	/// @return 0 on success, -1 on error
+	int setGravityInWorldFrame(const vec3& gravity);
+	/// pretty print tree
+	void printTree();
+	/// print tree data
+	void printTreeData();
+	/// initialize fixed data
+	void calculateStaticData();
+	/// \copydoc MultiBodyTree::getBodyFrame
+	int getBodyFrame(const int index, vec3* world_origin, mat33* body_T_world) const;
+	/// \copydoc MultiBodyTree::getParentIndex
+	int getParentIndex(const int body_index, int* m_parent_index);
+	/// \copydoc MultiBodyTree::getJointType
+	int getJointType(const int body_index, JointType* joint_type) const;
+	/// \copydoc MultiBodyTree::getJointTypeStr
+	int getJointTypeStr(const int body_index, const char** joint_type) const;
+	/// \copydoc MultiBodyTree::getParentRParentBodyRef
+	int getParentRParentBodyRef(const int body_index, vec3* r) const;
+	/// \copydoc MultiBodyTree::getBodyTParentRef
+	int getBodyTParentRef(const int body_index, mat33* T) const;
+	/// \copydoc MultiBodyTree::getBodyAxisOfMotion
+	int getBodyAxisOfMotion(const int body_index, vec3* axis) const;
+	/// \copydoc MultiBodyTree:getDoFOffset
+	int getDoFOffset(const int body_index, int* q_index) const;
+	/// \copydoc MultiBodyTree::getBodyOrigin
+	int getBodyOrigin(const int body_index, vec3* world_origin) const;
+	/// \copydoc MultiBodyTree::getBodyCoM
+	int getBodyCoM(const int body_index, vec3* world_com) const;
+	/// \copydoc MultiBodyTree::getBodyTransform
+	int getBodyTransform(const int body_index, mat33* world_T_body) const;
+	/// \copydoc MultiBodyTree::getBodyAngularVelocity
+	int getBodyAngularVelocity(const int body_index, vec3* world_omega) const;
+	/// \copydoc MultiBodyTree::getBodyLinearVelocity
+	int getBodyLinearVelocity(const int body_index, vec3* world_velocity) const;
+	/// \copydoc MultiBodyTree::getBodyLinearVelocityCoM
+	int getBodyLinearVelocityCoM(const int body_index, vec3* world_velocity) const;
+	/// \copydoc MultiBodyTree::getBodyAngularAcceleration
+	int getBodyAngularAcceleration(const int body_index, vec3* world_dot_omega) const;
+	/// \copydoc MultiBodyTree::getBodyLinearAcceleration
+	int getBodyLinearAcceleration(const int body_index, vec3* world_acceleration) const;
+	/// \copydoc MultiBodyTree::getUserInt
+	int getUserInt(const int body_index, int* user_int) const;
+	/// \copydoc MultiBodyTree::getUserPtr
+	int getUserPtr(const int body_index, void** user_ptr) const;
+	/// \copydoc MultiBodyTree::setUserInt
+	int setUserInt(const int body_index, const int user_int);
+	/// \copydoc MultiBodyTree::setUserPtr
+	int setUserPtr(const int body_index, void* const user_ptr);
+	///\copydoc MultiBodytTree::setBodyMass
+	int setBodyMass(const int body_index, const idScalar mass);
+	///\copydoc MultiBodytTree::setBodyFirstMassMoment
+	int setBodyFirstMassMoment(const int body_index, const vec3& first_mass_moment);
+	///\copydoc MultiBodytTree::setBodySecondMassMoment
+	int setBodySecondMassMoment(const int body_index, const mat33& second_mass_moment);
+	///\copydoc MultiBodytTree::getBodyMass
+	int getBodyMass(const int body_index, idScalar* mass) const;
+	///\copydoc MultiBodytTree::getBodyFirstMassMoment
+	int getBodyFirstMassMoment(const int body_index, vec3* first_mass_moment) const;
+	///\copydoc MultiBodytTree::getBodySecondMassMoment
+	int getBodySecondMassMoment(const int body_index, mat33* second_mass_moment) const;
+	/// \copydoc MultiBodyTree::clearAllUserForcesAndMoments
+	void clearAllUserForcesAndMoments();
+	/// \copydoc MultiBodyTree::addUserForce
+	int addUserForce(const int body_index, const vec3& body_force);
+	/// \copydoc MultiBodyTree::addUserMoment
+	int addUserMoment(const int body_index, const vec3& body_moment);
+
+private:
+	// debug function. print tree structure to stdout
+	void printTree(int index, int indentation);
+	// get string representation of JointType (for debugging)
+	const char* jointTypeToString(const JointType& type) const;
+	// get number of degrees of freedom from joint type
+	int bodyNumDoFs(const JointType& type) const;
+	// number of bodies in the system
+	int m_num_bodies;
+	// number of degrees of freedom
+	int m_num_dofs;
+	// Gravitational acceleration (in world frame)
+	vec3 m_world_gravity;
+	// vector of bodies in the system
+	// body 0 is used as an environment body and is allways fixed.
+	// The bodies are ordered such that a parent body always has an index
+	// smaller than its child.
+	idArray<RigidBody>::type m_body_list;
+	// Parent_index[i] is the index for i's parent body in body_list.
+	// This fully describes the tree.
+	idArray<int>::type m_parent_index;
+	// child_indices[i] contains a vector of indices of
+	// all children of the i-th body
+	idArray<idArray<int>::type>::type m_child_indices;
+	// Indices of rotary joints
+	idArray<int>::type m_body_revolute_list;
+	// Indices of prismatic joints
+	idArray<int>::type m_body_prismatic_list;
+	// Indices of floating joints
+	idArray<int>::type m_body_floating_list;
+	// Indices of spherical joints
+	idArray<int>::type m_body_spherical_list;
+	// a user-provided integer
+	idArray<int>::type m_user_int;
+	// a user-provided pointer
+	idArray<void*>::type m_user_ptr;
+#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS)
+	mat3x m_m3x;
+#endif
+};
+}  // namespace btInverseDynamics
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp
new file mode 100644
index 0000000..a718db0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp
@@ -0,0 +1,131 @@
+#include "MultiBodyTreeInitCache.hpp"
+
+namespace btInverseDynamics
+{
+MultiBodyTree::InitCache::InitCache()
+{
+	m_inertias.resize(0);
+	m_joints.resize(0);
+	m_num_dofs = 0;
+	m_root_index = -1;
+}
+
+int MultiBodyTree::InitCache::addBody(const int body_index, const int parent_index,
+									  const JointType joint_type,
+									  const vec3& parent_r_parent_body_ref,
+									  const mat33& body_T_parent_ref,
+									  const vec3& body_axis_of_motion, const idScalar mass,
+									  const vec3& body_r_body_com, const mat33& body_I_body,
+									  const int user_int, void* user_ptr)
+{
+	switch (joint_type)
+	{
+		case REVOLUTE:
+		case PRISMATIC:
+			m_num_dofs += 1;
+			break;
+		case FIXED:
+			// does not add a degree of freedom
+			// m_num_dofs+=0;
+			break;
+		case SPHERICAL:
+			m_num_dofs += 3;
+			break;
+		case FLOATING:
+			m_num_dofs += 6;
+			break;
+		default:
+			bt_id_error_message("unknown joint type %d\n", joint_type);
+			return -1;
+	}
+
+	if (-1 == parent_index)
+	{
+		if (m_root_index >= 0)
+		{
+			bt_id_error_message("trying to add body %d as root, but already added %d as root body\n",
+								body_index, m_root_index);
+			return -1;
+		}
+		m_root_index = body_index;
+	}
+
+	JointData joint;
+	joint.m_child = body_index;
+	joint.m_parent = parent_index;
+	joint.m_type = joint_type;
+	joint.m_parent_pos_parent_child_ref = parent_r_parent_body_ref;
+	joint.m_child_T_parent_ref = body_T_parent_ref;
+	joint.m_child_axis_of_motion = body_axis_of_motion;
+
+	InertiaData body;
+	body.m_mass = mass;
+	body.m_body_pos_body_com = body_r_body_com;
+	body.m_body_I_body = body_I_body;
+
+	m_inertias.push_back(body);
+	m_joints.push_back(joint);
+	m_user_int.push_back(user_int);
+	m_user_ptr.push_back(user_ptr);
+	return 0;
+}
+int MultiBodyTree::InitCache::getInertiaData(const int index, InertiaData* inertia) const
+{
+	if (index < 0 || index > static_cast<int>(m_inertias.size()))
+	{
+		bt_id_error_message("index out of range\n");
+		return -1;
+	}
+
+	*inertia = m_inertias[index];
+	return 0;
+}
+
+int MultiBodyTree::InitCache::getUserInt(const int index, int* user_int) const
+{
+	if (index < 0 || index > static_cast<int>(m_user_int.size()))
+	{
+		bt_id_error_message("index out of range\n");
+		return -1;
+	}
+	*user_int = m_user_int[index];
+	return 0;
+}
+
+int MultiBodyTree::InitCache::getUserPtr(const int index, void** user_ptr) const
+{
+	if (index < 0 || index > static_cast<int>(m_user_ptr.size()))
+	{
+		bt_id_error_message("index out of range\n");
+		return -1;
+	}
+	*user_ptr = m_user_ptr[index];
+	return 0;
+}
+
+int MultiBodyTree::InitCache::getJointData(const int index, JointData* joint) const
+{
+	if (index < 0 || index > static_cast<int>(m_joints.size()))
+	{
+		bt_id_error_message("index out of range\n");
+		return -1;
+	}
+	*joint = m_joints[index];
+	return 0;
+}
+
+int MultiBodyTree::InitCache::buildIndexSets()
+{
+	// NOTE: This function assumes that proper indices were provided
+	//	   User2InternalIndex from utils can be used to facilitate this.
+
+	m_parent_index.resize(numBodies());
+	for (idArrayIdx j = 0; j < m_joints.size(); j++)
+	{
+		const JointData& joint = m_joints[j];
+		m_parent_index[joint.m_child] = joint.m_parent;
+	}
+
+	return 0;
+}
+}  // namespace btInverseDynamics
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp
new file mode 100644
index 0000000..dbdb3ff
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp
@@ -0,0 +1,113 @@
+#ifndef MULTIBODYTREEINITCACHE_HPP_
+#define MULTIBODYTREEINITCACHE_HPP_
+
+#include "../IDConfig.hpp"
+#include "../IDMath.hpp"
+#include "../MultiBodyTree.hpp"
+
+namespace btInverseDynamics
+{
+/// Mass properties of a rigid body
+struct InertiaData
+{
+	ID_DECLARE_ALIGNED_ALLOCATOR();
+
+	/// mass
+	idScalar m_mass;
+	/// vector from body-fixed frame to center of mass,
+	/// in body-fixed frame, multiplied by the mass
+	vec3 m_body_pos_body_com;
+	/// moment of inertia w.r.t. the origin of the body-fixed
+	/// frame, represented in that frame
+	mat33 m_body_I_body;
+};
+
+/// Joint properties
+struct JointData
+{
+	ID_DECLARE_ALIGNED_ALLOCATOR();
+
+	/// type of joint
+	JointType m_type;
+	/// index of parent body
+	int m_parent;
+	/// index of child body
+	int m_child;
+	/// vector from parent's body-fixed frame to child's body-fixed
+	/// frame for q=0, written in the parent's body fixed frame
+	vec3 m_parent_pos_parent_child_ref;
+	/// Transform matrix converting vectors written in the parent's frame
+	/// into vectors written in the child's frame for q=0
+	/// ie, child_vector = child_T_parent_ref * parent_vector;
+	mat33 m_child_T_parent_ref;
+	/// Axis of motion for 1 degree-of-freedom joints,
+	/// written in the child's frame
+	/// For revolute joints, the q-value is positive for a positive
+	/// rotation about this axis.
+	/// For prismatic joints, the q-value is positive for a positive
+	/// translation is this direction.
+	vec3 m_child_axis_of_motion;
+};
+
+/// Data structure to store data passed by the user.
+/// This is used in MultiBodyTree::finalize to build internal data structures.
+class MultiBodyTree::InitCache
+{
+public:
+	ID_DECLARE_ALIGNED_ALLOCATOR();
+	/// constructor
+	InitCache();
+	///\copydoc MultiBodyTree::addBody
+	int addBody(const int body_index, const int parent_index, const JointType joint_type,
+				const vec3 &parent_r_parent_body_ref, const mat33 &body_T_parent_ref,
+				const vec3 &body_axis_of_motion, idScalar mass, const vec3 &body_r_body_com,
+				const mat33 &body_I_body, const int user_int, void *user_ptr);
+	/// build index arrays
+	/// @return 0 on success, -1 on failure
+	int buildIndexSets();
+	/// @return number of degrees of freedom
+	int numDoFs() const { return m_num_dofs; }
+	/// @return number of bodies
+	int numBodies() const { return m_inertias.size(); }
+	/// get inertia data for index
+	/// @param index of the body
+	/// @param inertia pointer for return data
+	/// @return 0 on success, -1 on failure
+	int getInertiaData(const int index, InertiaData *inertia) const;
+	/// get joint data for index
+	/// @param index of the body
+	/// @param joint pointer for return data
+	/// @return 0 on success, -1 on failure
+	int getJointData(const int index, JointData *joint) const;
+	/// get parent index array (paren_index[i] is the index of the parent of i)
+	/// @param parent_index pointer for return data
+	void getParentIndexArray(idArray<int>::type *parent_index) { *parent_index = m_parent_index; }
+	/// get user integer
+	/// @param index body index
+	/// @param user_int user integer
+	/// @return 0 on success, -1 on failure
+	int getUserInt(const int index, int *user_int) const;
+	/// get user pointer
+	/// @param index body index
+	/// @param user_int user pointer
+	/// @return 0 on success, -1 on failure
+	int getUserPtr(const int index, void **user_ptr) const;
+
+private:
+	// vector of bodies
+	idArray<InertiaData>::type m_inertias;
+	// vector of joints
+	idArray<JointData>::type m_joints;
+	// number of mechanical degrees of freedom
+	int m_num_dofs;
+	// parent index array
+	idArray<int>::type m_parent_index;
+	// user integers
+	idArray<int>::type m_user_int;
+	// user pointers
+	idArray<void *>::type m_user_ptr;
+	// index of root body (or -1 if not set)
+	int m_root_index;
+};
+}  // namespace btInverseDynamics
+#endif  // MULTIBODYTREEINITCACHE_HPP_
diff --git a/dali-physics/third-party/bullet3/src/BulletInverseDynamics/premake4.lua b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/premake4.lua
new file mode 100644
index 0000000..fdd176b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletInverseDynamics/premake4.lua
@@ -0,0 +1,15 @@
+	project "BulletInverseDynamics"
+
+	kind "StaticLib"
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+	includedirs {
+		"..",
+	}
+	files {
+		"IDMath.cpp",
+		"MultiBodyTree.cpp",
+		"details/MultiBodyTreeInitCache.cpp",
+		"details/MultiBodyTreeImpl.cpp",
+	}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.cpp
new file mode 100644
index 0000000..feb30d5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.cpp
@@ -0,0 +1,792 @@
+#include "btReducedDeformableBody.h"
+#include "../btSoftBodyInternals.h"
+#include "btReducedDeformableBodyHelpers.h"
+#include "LinearMath/btTransformUtil.h"
+#include <iostream>
+#include <fstream>
+
+btReducedDeformableBody::btReducedDeformableBody(btSoftBodyWorldInfo* worldInfo, int node_count, const btVector3* x, const btScalar* m)
+ : btSoftBody(worldInfo, node_count, x, m), m_rigidOnly(false)
+{
+  // reduced deformable
+  m_reducedModel = true;
+  m_nReduced = 0;
+  m_nFull = 0;
+  m_nodeIndexOffset = 0;
+
+  m_transform_lock = false;
+  m_ksScale = 1.0;
+  m_rhoScale = 1.0;
+
+  // rigid motion
+  m_linearVelocity.setZero();
+	m_angularVelocity.setZero();
+  m_internalDeltaLinearVelocity.setZero();
+  m_internalDeltaAngularVelocity.setZero();
+  m_angularVelocityFromReduced.setZero();
+  m_internalDeltaAngularVelocityFromReduced.setZero();
+	m_angularFactor.setValue(1, 1, 1);
+	m_linearFactor.setValue(1, 1, 1);
+  // m_invInertiaLocal.setValue(1, 1, 1);
+  m_invInertiaLocal.setIdentity();
+  m_mass = 0.0;
+  m_inverseMass = 0.0;
+
+  m_linearDamping = 0;
+  m_angularDamping = 0;
+
+  // Rayleigh damping
+  m_dampingAlpha = 0;
+  m_dampingBeta = 0;
+
+  m_rigidTransformWorld.setIdentity();
+}
+
+void btReducedDeformableBody::setReducedModes(int num_modes, int full_size)
+{
+  m_nReduced = num_modes;
+  m_nFull = full_size;
+  m_reducedDofs.resize(m_nReduced, 0);
+  m_reducedDofsBuffer.resize(m_nReduced, 0);
+  m_reducedVelocity.resize(m_nReduced, 0);
+  m_reducedVelocityBuffer.resize(m_nReduced, 0);
+  m_reducedForceElastic.resize(m_nReduced, 0);
+  m_reducedForceDamping.resize(m_nReduced, 0);
+  m_reducedForceExternal.resize(m_nReduced, 0);
+  m_internalDeltaReducedVelocity.resize(m_nReduced, 0);
+  m_nodalMass.resize(full_size, 0);
+  m_localMomentArm.resize(m_nFull);
+}
+
+void btReducedDeformableBody::setMassProps(const tDenseArray& mass_array)
+{
+  btScalar total_mass = 0;
+  btVector3 CoM(0, 0, 0);
+	for (int i = 0; i < m_nFull; ++i)
+	{
+		m_nodalMass[i] = m_rhoScale * mass_array[i];
+		m_nodes[i].m_im = mass_array[i] > 0 ? 1.0 / (m_rhoScale * mass_array[i]) : 0;
+		total_mass += m_rhoScale * mass_array[i];
+
+    CoM += m_nodalMass[i] * m_nodes[i].m_x;
+	}
+  // total rigid body mass
+  m_mass = total_mass;
+  m_inverseMass = total_mass > 0 ? 1.0 / total_mass : 0;
+  // original CoM
+  m_initialCoM = CoM / total_mass;
+}
+
+void btReducedDeformableBody::setInertiaProps()
+{
+  // make sure the initial CoM is at the origin (0,0,0)
+  // for (int i = 0; i < m_nFull; ++i)
+  // {
+  //   m_nodes[i].m_x -= m_initialCoM;
+  // }
+  // m_initialCoM.setZero();
+  m_rigidTransformWorld.setOrigin(m_initialCoM);
+  m_interpolationWorldTransform = m_rigidTransformWorld;
+  
+  updateLocalInertiaTensorFromNodes();
+
+  // update world inertia tensor
+  btMatrix3x3 rotation;
+  rotation.setIdentity();
+  updateInitialInertiaTensor(rotation);
+  updateInertiaTensor();
+  m_interpolateInvInertiaTensorWorld = m_invInertiaTensorWorld;
+}
+
+void btReducedDeformableBody::setRigidVelocity(const btVector3& v)
+{
+  m_linearVelocity = v;
+}
+
+void btReducedDeformableBody::setRigidAngularVelocity(const btVector3& omega)
+{
+  m_angularVelocity = omega;
+}
+
+void btReducedDeformableBody::setStiffnessScale(const btScalar ks)
+{
+  m_ksScale = ks;
+}
+
+void btReducedDeformableBody::setMassScale(const btScalar rho)
+{
+  m_rhoScale = rho;
+}
+
+void btReducedDeformableBody::setFixedNodes(const int n_node)
+{
+  m_fixedNodes.push_back(n_node);
+  m_nodes[n_node].m_im = 0;   // set inverse mass to be zero for the constraint solver.
+}
+
+void btReducedDeformableBody::setDamping(const btScalar alpha, const btScalar beta)
+{
+  m_dampingAlpha = alpha;
+  m_dampingBeta = beta;
+}
+
+void btReducedDeformableBody::internalInitialization()
+{
+  // zeroing
+  endOfTimeStepZeroing();
+  // initialize rest position
+  updateRestNodalPositions();
+  // initialize local nodal moment arm form the CoM
+  updateLocalMomentArm();
+  // initialize projection matrix
+  updateExternalForceProjectMatrix(false);
+}
+
+void btReducedDeformableBody::updateLocalMomentArm()
+{
+  TVStack delta_x;
+  delta_x.resize(m_nFull);
+
+  for (int i = 0; i < m_nFull; ++i)
+  {
+    for (int k = 0; k < 3; ++k)
+    {
+      // compute displacement
+      delta_x[i][k] = 0;
+      for (int j = 0; j < m_nReduced; ++j) 
+      {
+        delta_x[i][k] += m_modes[j][3 * i + k] * m_reducedDofs[j];
+      }
+    }
+    // get new moment arm Sq + x0
+    m_localMomentArm[i] = m_x0[i] - m_initialCoM + delta_x[i];
+  }
+}
+
+void btReducedDeformableBody::updateExternalForceProjectMatrix(bool initialized)
+{
+  // if not initialized, need to compute both P_A and Cq
+  // otherwise, only need to udpate Cq
+  if (!initialized)
+  {
+    // resize
+    m_projPA.resize(m_nReduced);
+    m_projCq.resize(m_nReduced);
+
+    m_STP.resize(m_nReduced);
+    m_MrInvSTP.resize(m_nReduced);
+
+    // P_A
+    for (int r = 0; r < m_nReduced; ++r)
+    {
+      m_projPA[r].resize(3 * m_nFull, 0);
+      for (int i = 0; i < m_nFull; ++i)
+      {
+        btMatrix3x3 mass_scaled_i = Diagonal(1) - Diagonal(m_nodalMass[i] / m_mass);
+        btVector3 s_ri(m_modes[r][3 * i], m_modes[r][3 * i + 1], m_modes[r][3 * i + 2]);
+        btVector3 prod_i = mass_scaled_i * s_ri;
+
+        for (int k = 0; k < 3; ++k)
+          m_projPA[r][3 * i + k] = prod_i[k];
+
+        // btScalar ratio = m_nodalMass[i] / m_mass;
+        // m_projPA[r] += btVector3(- m_modes[r][3 * i] * ratio,
+        //                          - m_modes[r][3 * i + 1] * ratio,
+        //                          - m_modes[r][3 * i + 2] * ratio);
+      }
+    }
+  }
+
+  // C(q) is updated once per position update
+  for (int r = 0; r < m_nReduced; ++r)
+  {
+  	m_projCq[r].resize(3 * m_nFull, 0);
+    for (int i = 0; i < m_nFull; ++i)
+    {
+      btMatrix3x3 r_star = Cross(m_localMomentArm[i]);
+      btVector3 s_ri(m_modes[r][3 * i], m_modes[r][3 * i + 1], m_modes[r][3 * i + 2]);
+      btVector3 prod_i = r_star * m_invInertiaTensorWorld * r_star * s_ri;
+
+      for (int k = 0; k < 3; ++k)
+        m_projCq[r][3 * i + k] = m_nodalMass[i] * prod_i[k];
+
+      // btVector3 si(m_modes[r][3 * i], m_modes[r][3 * i + 1], m_modes[r][3 * i + 2]);
+      // m_projCq[r] += m_nodalMass[i] * si.cross(m_localMomentArm[i]);
+    }
+  }
+}
+
+void btReducedDeformableBody::endOfTimeStepZeroing()
+{
+  for (int i = 0; i < m_nReduced; ++i)
+  {
+    m_reducedForceElastic[i] = 0;
+    m_reducedForceDamping[i] = 0;
+    m_reducedForceExternal[i] = 0;
+    m_internalDeltaReducedVelocity[i] = 0;
+    m_reducedDofsBuffer[i] = m_reducedDofs[i];
+    m_reducedVelocityBuffer[i] = m_reducedVelocity[i];
+  }
+  // std::cout << "zeroed!\n";
+}
+
+void btReducedDeformableBody::applyInternalVelocityChanges()
+{
+  m_linearVelocity += m_internalDeltaLinearVelocity;
+  m_angularVelocity += m_internalDeltaAngularVelocity;
+  m_internalDeltaLinearVelocity.setZero();
+  m_internalDeltaAngularVelocity.setZero();
+  for (int r = 0; r < m_nReduced; ++r)
+  {
+    m_reducedVelocity[r] += m_internalDeltaReducedVelocity[r];
+    m_internalDeltaReducedVelocity[r] = 0;
+  }
+}
+
+void btReducedDeformableBody::predictIntegratedTransform(btScalar dt, btTransform& predictedTransform)
+{
+	btTransformUtil::integrateTransform(m_rigidTransformWorld, m_linearVelocity, m_angularVelocity, dt, predictedTransform);
+}
+
+void btReducedDeformableBody::updateReducedDofs(btScalar solverdt)
+{
+  for (int r = 0; r < m_nReduced; ++r)
+  { 
+    m_reducedDofs[r] = m_reducedDofsBuffer[r] + solverdt * m_reducedVelocity[r];
+  }
+}
+
+void btReducedDeformableBody::mapToFullPosition(const btTransform& ref_trans)
+{
+  btVector3 origin = ref_trans.getOrigin();
+  btMatrix3x3 rotation = ref_trans.getBasis();
+  
+
+  for (int i = 0; i < m_nFull; ++i)
+  {
+    m_nodes[i].m_x = rotation * m_localMomentArm[i] + origin;
+    m_nodes[i].m_q = m_nodes[i].m_x;
+  }
+}
+
+void btReducedDeformableBody::updateReducedVelocity(btScalar solverdt)
+{
+  // update reduced velocity
+  for (int r = 0; r < m_nReduced; ++r)
+  {
+    // the reduced mass is always identity!
+    btScalar delta_v = 0;
+    delta_v = solverdt * (m_reducedForceElastic[r] + m_reducedForceDamping[r]);
+    // delta_v = solverdt * (m_reducedForceElastic[r] + m_reducedForceDamping[r] + m_reducedForceExternal[r]);
+    m_reducedVelocity[r] = m_reducedVelocityBuffer[r] + delta_v;
+  }
+}
+
+void btReducedDeformableBody::mapToFullVelocity(const btTransform& ref_trans)
+{
+  // compute the reduced contribution to the angular velocity
+  // btVector3 sum_linear(0, 0, 0);
+  // btVector3 sum_angular(0, 0, 0);
+  // m_linearVelocityFromReduced.setZero();
+  // m_angularVelocityFromReduced.setZero();
+  // for (int i = 0; i < m_nFull; ++i)
+  // {
+  //   btVector3 r_com = ref_trans.getBasis() * m_localMomentArm[i];
+  //   btMatrix3x3 r_star = Cross(r_com);
+
+  //   btVector3 v_from_reduced(0, 0, 0);
+  //   for (int k = 0; k < 3; ++k)
+  //   {
+  //     for (int r = 0; r < m_nReduced; ++r)
+  //     {
+  //       v_from_reduced[k] += m_modes[r][3 * i + k] * m_reducedVelocity[r];
+  //     }
+  //   }
+
+  //   btVector3 delta_linear = m_nodalMass[i] * v_from_reduced;
+  //   btVector3 delta_angular = m_nodalMass[i] * (r_star * ref_trans.getBasis() * v_from_reduced);
+  //   sum_linear += delta_linear;
+  //   sum_angular += delta_angular;
+  //   // std::cout << "delta_linear: " << delta_linear[0] << "\t" << delta_linear[1] << "\t" << delta_linear[2] << "\n";
+  //   // std::cout << "delta_angular: " << delta_angular[0] << "\t" << delta_angular[1] << "\t" << delta_angular[2] << "\n";
+  //   // std::cout << "sum_linear: " << sum_linear[0] << "\t" << sum_linear[1] << "\t" << sum_linear[2] << "\n";
+  //   // std::cout << "sum_angular: " << sum_angular[0] << "\t" << sum_angular[1] << "\t" << sum_angular[2] << "\n";
+  // }
+  // m_linearVelocityFromReduced = 1.0 / m_mass * (ref_trans.getBasis() * sum_linear);
+  // m_angularVelocityFromReduced = m_interpolateInvInertiaTensorWorld * sum_angular;
+
+  // m_linearVelocity -= m_linearVelocityFromReduced;
+  // m_angularVelocity -= m_angularVelocityFromReduced;
+
+  for (int i = 0; i < m_nFull; ++i)
+  {
+    m_nodes[i].m_v = computeNodeFullVelocity(ref_trans, i);
+  }
+}
+
+const btVector3 btReducedDeformableBody::computeTotalAngularMomentum() const
+{
+  btVector3 L_rigid = m_invInertiaTensorWorld.inverse() * m_angularVelocity;
+  btVector3 L_reduced(0, 0, 0);
+  btMatrix3x3 omega_prime_star = Cross(m_angularVelocityFromReduced);
+
+  for (int i = 0; i < m_nFull; ++i)
+  {
+    btVector3 r_com = m_rigidTransformWorld.getBasis() * m_localMomentArm[i];
+    btMatrix3x3 r_star = Cross(r_com);
+
+    btVector3 v_from_reduced(0, 0, 0);
+    for (int k = 0; k < 3; ++k)
+    {
+      for (int r = 0; r < m_nReduced; ++r)
+      {
+        v_from_reduced[k] += m_modes[r][3 * i + k] * m_reducedVelocity[r];
+      }
+    }
+
+    L_reduced += m_nodalMass[i] * (r_star * (m_rigidTransformWorld.getBasis() * v_from_reduced - omega_prime_star * r_com));
+    // L_reduced += m_nodalMass[i] * (r_star * (m_rigidTransformWorld.getBasis() * v_from_reduced));
+  }
+  return L_rigid + L_reduced;
+}
+
+const btVector3 btReducedDeformableBody::computeNodeFullVelocity(const btTransform& ref_trans, int n_node) const
+{
+  btVector3 v_from_reduced(0, 0, 0);
+  btVector3 r_com = ref_trans.getBasis() * m_localMomentArm[n_node];
+  // compute velocity contributed by the reduced velocity
+  for (int k = 0; k < 3; ++k)
+  {
+    for (int r = 0; r < m_nReduced; ++r)
+    {
+      v_from_reduced[k] += m_modes[r][3 * n_node + k] * m_reducedVelocity[r];
+    }
+  }
+  // get new velocity
+  btVector3 vel = m_angularVelocity.cross(r_com) + 
+                  ref_trans.getBasis() * v_from_reduced +
+                  m_linearVelocity;
+  return vel;
+}
+
+const btVector3 btReducedDeformableBody::internalComputeNodeDeltaVelocity(const btTransform& ref_trans, int n_node) const
+{
+  btVector3 deltaV_from_reduced(0, 0, 0);
+  btVector3 r_com = ref_trans.getBasis() * m_localMomentArm[n_node];
+
+  // compute velocity contributed by the reduced velocity
+  for (int k = 0; k < 3; ++k)
+  {
+    for (int r = 0; r < m_nReduced; ++r)
+    {
+      deltaV_from_reduced[k] += m_modes[r][3 * n_node + k] * m_internalDeltaReducedVelocity[r];
+    }
+  }
+
+  // get delta velocity
+  btVector3 deltaV = m_internalDeltaAngularVelocity.cross(r_com) + 
+                     ref_trans.getBasis() * deltaV_from_reduced +
+                     m_internalDeltaLinearVelocity;
+  return deltaV;
+}
+
+void btReducedDeformableBody::proceedToTransform(btScalar dt, bool end_of_time_step)
+{
+  btTransformUtil::integrateTransform(m_rigidTransformWorld, m_linearVelocity, m_angularVelocity, dt, m_interpolationWorldTransform);
+  updateInertiaTensor();
+  // m_interpolateInvInertiaTensorWorld = m_interpolationWorldTransform.getBasis().scaled(m_invInertiaLocal) * m_interpolationWorldTransform.getBasis().transpose();
+  m_rigidTransformWorld = m_interpolationWorldTransform;
+  m_invInertiaTensorWorld = m_interpolateInvInertiaTensorWorld;
+}
+
+void btReducedDeformableBody::transformTo(const btTransform& trs)
+{
+	btTransform current_transform = getRigidTransform();
+	btTransform new_transform(trs.getBasis() * current_transform.getBasis().transpose(),
+                            trs.getOrigin() - current_transform.getOrigin());
+  transform(new_transform);
+}
+
+void btReducedDeformableBody::transform(const btTransform& trs)
+{
+  m_transform_lock = true;
+
+  // transform mesh
+  {
+    const btScalar margin = getCollisionShape()->getMargin();
+    ATTRIBUTE_ALIGNED16(btDbvtVolume)
+    vol;
+
+    btVector3 CoM = m_rigidTransformWorld.getOrigin();
+    btVector3 translation = trs.getOrigin();
+    btMatrix3x3 rotation = trs.getBasis();
+
+    for (int i = 0; i < m_nodes.size(); ++i)
+    {
+      Node& n = m_nodes[i];
+      n.m_x = rotation * (n.m_x - CoM) + CoM + translation;
+      n.m_q = rotation * (n.m_q - CoM) + CoM + translation;
+      n.m_n = rotation * n.m_n;
+      vol = btDbvtVolume::FromCR(n.m_x, margin);
+
+      m_ndbvt.update(n.m_leaf, vol);
+    }
+    updateNormals();
+    updateBounds();
+    updateConstants();
+  }
+
+  // update modes
+  updateModesByRotation(trs.getBasis());
+
+  // update inertia tensor
+  updateInitialInertiaTensor(trs.getBasis());
+  updateInertiaTensor();
+  m_interpolateInvInertiaTensorWorld = m_invInertiaTensorWorld;
+  
+  // update rigid frame (No need to update the rotation. Nodes have already been updated.)
+  m_rigidTransformWorld.setOrigin(m_initialCoM + trs.getOrigin());
+  m_interpolationWorldTransform = m_rigidTransformWorld;
+  m_initialCoM = m_rigidTransformWorld.getOrigin();
+
+  internalInitialization();
+}
+
+void btReducedDeformableBody::scale(const btVector3& scl)
+{
+  // Scaling the mesh after transform is applied is not allowed
+  btAssert(!m_transform_lock);
+
+  // scale the mesh
+  {
+    const btScalar margin = getCollisionShape()->getMargin();
+    ATTRIBUTE_ALIGNED16(btDbvtVolume)
+    vol;
+
+    btVector3 CoM = m_rigidTransformWorld.getOrigin();
+
+    for (int i = 0; i < m_nodes.size(); ++i)
+    {
+      Node& n = m_nodes[i];
+      n.m_x = (n.m_x - CoM) * scl + CoM;
+      n.m_q = (n.m_q - CoM) * scl + CoM;
+      vol = btDbvtVolume::FromCR(n.m_x, margin);
+      m_ndbvt.update(n.m_leaf, vol);
+    }
+    updateNormals();
+    updateBounds();
+    updateConstants();
+    initializeDmInverse();
+  }
+
+  // update inertia tensor
+  updateLocalInertiaTensorFromNodes();
+
+  btMatrix3x3 id;
+  id.setIdentity();
+  updateInitialInertiaTensor(id);   // there is no rotation, but the local inertia tensor has changed
+  updateInertiaTensor();
+  m_interpolateInvInertiaTensorWorld = m_invInertiaTensorWorld;
+
+  internalInitialization();
+}
+
+void btReducedDeformableBody::setTotalMass(btScalar mass, bool fromfaces)
+{
+  // Changing the total mass after transform is applied is not allowed
+  btAssert(!m_transform_lock);
+
+  btScalar scale_ratio = mass / m_mass;
+
+  // update nodal mass
+  for (int i = 0; i < m_nFull; ++i)
+  {
+    m_nodalMass[i] *= scale_ratio;
+  }
+  m_mass = mass;
+  m_inverseMass = mass > 0 ? 1.0 / mass : 0;
+
+  // update inertia tensors
+  updateLocalInertiaTensorFromNodes();
+
+  btMatrix3x3 id;
+  id.setIdentity();
+  updateInitialInertiaTensor(id);   // there is no rotation, but the local inertia tensor has changed
+  updateInertiaTensor();
+  m_interpolateInvInertiaTensorWorld = m_invInertiaTensorWorld;
+
+  internalInitialization();
+}
+
+void btReducedDeformableBody::updateRestNodalPositions()
+{
+  // update reset nodal position
+  m_x0.resize(m_nFull);
+  for (int i = 0; i < m_nFull; ++i)
+  {
+    m_x0[i] = m_nodes[i].m_x;
+  }
+}
+
+// reference notes:
+// https://ocw.mit.edu/courses/aeronautics-and-astronautics/16-07-dynamics-fall-2009/lecture-notes/MIT16_07F09_Lec26.pdf
+void btReducedDeformableBody::updateLocalInertiaTensorFromNodes()
+{
+  btMatrix3x3 inertia_tensor;
+  inertia_tensor.setZero();
+
+  for (int p = 0; p < m_nFull; ++p)
+  {
+    btMatrix3x3 particle_inertia;
+    particle_inertia.setZero();
+
+    btVector3 r = m_nodes[p].m_x - m_initialCoM;
+
+    particle_inertia[0][0] = m_nodalMass[p] * (r[1] * r[1] + r[2] * r[2]);
+    particle_inertia[1][1] = m_nodalMass[p] * (r[0] * r[0] + r[2] * r[2]);
+    particle_inertia[2][2] = m_nodalMass[p] * (r[0] * r[0] + r[1] * r[1]);
+
+    particle_inertia[0][1] = - m_nodalMass[p] * (r[0] * r[1]);
+    particle_inertia[0][2] = - m_nodalMass[p] * (r[0] * r[2]);
+    particle_inertia[1][2] = - m_nodalMass[p] * (r[1] * r[2]);
+
+    particle_inertia[1][0] = particle_inertia[0][1];
+    particle_inertia[2][0] = particle_inertia[0][2];
+    particle_inertia[2][1] = particle_inertia[1][2];
+
+    inertia_tensor += particle_inertia;
+  }
+  m_invInertiaLocal = inertia_tensor.inverse();
+}
+
+void btReducedDeformableBody::updateInitialInertiaTensor(const btMatrix3x3& rotation)
+{
+  // m_invInertiaTensorWorldInitial = rotation.scaled(m_invInertiaLocal) * rotation.transpose();
+  m_invInertiaTensorWorldInitial = rotation * m_invInertiaLocal * rotation.transpose();
+}
+
+void btReducedDeformableBody::updateModesByRotation(const btMatrix3x3& rotation)
+{
+  for (int r = 0; r < m_nReduced; ++r)
+  {
+    for (int i = 0; i < m_nFull; ++i)
+    {
+      btVector3 nodal_disp(m_modes[r][3 * i], m_modes[r][3 * i + 1], m_modes[r][3 * i + 2]);
+      nodal_disp = rotation * nodal_disp;
+
+      for (int k = 0; k < 3; ++k)
+      {
+        m_modes[r][3 * i + k] = nodal_disp[k];
+      }
+    }
+  }
+}
+
+void btReducedDeformableBody::updateInertiaTensor()
+{
+	m_invInertiaTensorWorld = m_rigidTransformWorld.getBasis() * m_invInertiaTensorWorldInitial * m_rigidTransformWorld.getBasis().transpose();
+}
+
+void btReducedDeformableBody::applyDamping(btScalar timeStep)
+{
+  m_linearVelocity *= btScalar(1) - m_linearDamping;
+  m_angularDamping *= btScalar(1) - m_angularDamping;
+}
+
+void btReducedDeformableBody::applyCentralImpulse(const btVector3& impulse)
+{
+  m_linearVelocity += impulse * m_linearFactor * m_inverseMass;
+  #if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+  clampVelocity(m_linearVelocity);
+  #endif
+}
+
+void btReducedDeformableBody::applyTorqueImpulse(const btVector3& torque)
+{
+  m_angularVelocity += m_interpolateInvInertiaTensorWorld * torque * m_angularFactor;
+  #if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+  clampVelocity(m_angularVelocity);
+  #endif
+}
+
+void btReducedDeformableBody::internalApplyRigidImpulse(const btVector3& impulse, const btVector3& rel_pos)
+{
+  if (m_inverseMass == btScalar(0.))
+  {
+    std::cout << "something went wrong...probably didn't initialize?\n";
+    btAssert(false);
+  }
+  // delta linear velocity
+  m_internalDeltaLinearVelocity += impulse * m_linearFactor * m_inverseMass;
+  // delta angular velocity
+  btVector3 torque = rel_pos.cross(impulse * m_linearFactor);
+  m_internalDeltaAngularVelocity += m_interpolateInvInertiaTensorWorld * torque * m_angularFactor;
+}
+
+btVector3 btReducedDeformableBody::getRelativePos(int n_node)
+{
+  btMatrix3x3 rotation = m_interpolationWorldTransform.getBasis();
+  btVector3 ri = rotation * m_localMomentArm[n_node];
+  return ri;
+}
+
+btMatrix3x3 btReducedDeformableBody::getImpulseFactor(int n_node)
+{
+  // relative position
+  btMatrix3x3 rotation = m_interpolationWorldTransform.getBasis();
+  btVector3 ri = rotation * m_localMomentArm[n_node];
+  btMatrix3x3 ri_skew = Cross(ri);
+
+  // calculate impulse factor
+  // rigid part
+  btScalar inv_mass = m_nodalMass[n_node] > btScalar(0) ? btScalar(1) / m_mass : btScalar(0);
+  btMatrix3x3 K1 = Diagonal(inv_mass);
+  K1 -= ri_skew * m_interpolateInvInertiaTensorWorld * ri_skew;
+
+  // reduced deformable part
+  btMatrix3x3 SA;
+  SA.setZero();
+  for (int i = 0; i < 3; ++i)
+  {
+    for (int j = 0; j < 3; ++j)
+    {
+      for (int r = 0; r < m_nReduced; ++r)
+      {
+        SA[i][j] += m_modes[r][3 * n_node + i] * (m_projPA[r][3 * n_node + j] + m_projCq[r][3 * n_node + j]);
+      }
+    }
+  }
+  btMatrix3x3 RSARinv = rotation * SA * rotation.transpose();
+
+
+  TVStack omega_helper; // Sum_i m_i r*_i R S_i
+  omega_helper.resize(m_nReduced);
+  for (int r = 0; r < m_nReduced; ++r)
+  {
+    omega_helper[r].setZero();
+    for (int i = 0; i < m_nFull; ++i)
+    {
+      btMatrix3x3 mi_rstar_i = rotation * Cross(m_localMomentArm[i]) * m_nodalMass[i];
+      btVector3 s_ri(m_modes[r][3 * i], m_modes[r][3 * i + 1], m_modes[r][3 * i + 2]);
+      omega_helper[r] += mi_rstar_i * rotation * s_ri;
+    }
+  }
+
+  btMatrix3x3 sum_multiply_A;
+  sum_multiply_A.setZero();
+  for (int i = 0; i < 3; ++i)
+  {
+    for (int j = 0; j < 3; ++j)
+    {
+      for (int r = 0; r < m_nReduced; ++r)
+      {
+        sum_multiply_A[i][j] += omega_helper[r][i] * (m_projPA[r][3 * n_node + j] + m_projCq[r][3 * n_node + j]);
+      }
+    }
+  }
+
+  btMatrix3x3 K2 = RSARinv + ri_skew * m_interpolateInvInertiaTensorWorld * sum_multiply_A * rotation.transpose();
+
+  return m_rigidOnly ? K1 : K1 + K2;
+}
+
+void btReducedDeformableBody::internalApplyFullSpaceImpulse(const btVector3& impulse, const btVector3& rel_pos, int n_node, btScalar dt)
+{
+  if (!m_rigidOnly)
+  {
+    // apply impulse force
+    applyFullSpaceNodalForce(impulse / dt, n_node);
+
+    // update delta damping force
+    tDenseArray reduced_vel_tmp;
+    reduced_vel_tmp.resize(m_nReduced);
+    for (int r = 0; r < m_nReduced; ++r)
+    {
+      reduced_vel_tmp[r] = m_reducedVelocity[r] + m_internalDeltaReducedVelocity[r];
+    }
+    applyReducedDampingForce(reduced_vel_tmp);
+    // applyReducedDampingForce(m_internalDeltaReducedVelocity);
+
+    // delta reduced velocity
+    for (int r = 0; r < m_nReduced; ++r)
+    {
+      // The reduced mass is always identity!
+      m_internalDeltaReducedVelocity[r] += dt * (m_reducedForceDamping[r] + m_reducedForceExternal[r]);
+    }
+  }
+
+  internalApplyRigidImpulse(impulse, rel_pos);
+}
+
+void btReducedDeformableBody::applyFullSpaceNodalForce(const btVector3& f_ext, int n_node)
+{
+  // f_local = R^-1 * f_ext //TODO: interpoalted transfrom
+  // btVector3 f_local = m_rigidTransformWorld.getBasis().transpose() * f_ext;
+  btVector3 f_local = m_interpolationWorldTransform.getBasis().transpose() * f_ext;
+
+  // f_ext_r = [S^T * P]_{n_node} * f_local
+  tDenseArray f_ext_r;
+  f_ext_r.resize(m_nReduced, 0);
+  for (int r = 0; r < m_nReduced; ++r)
+  {
+    m_reducedForceExternal[r] = 0;
+    for (int k = 0; k < 3; ++k)
+    {
+      f_ext_r[r] += (m_projPA[r][3 * n_node + k] + m_projCq[r][3 * n_node + k]) * f_local[k];
+    }
+
+    m_reducedForceExternal[r] += f_ext_r[r];
+  }
+}
+
+void btReducedDeformableBody::applyRigidGravity(const btVector3& gravity, btScalar dt)
+{
+  // update rigid frame velocity
+  m_linearVelocity += dt * gravity;
+}
+
+void btReducedDeformableBody::applyReducedElasticForce(const tDenseArray& reduce_dofs)
+{
+  for (int r = 0; r < m_nReduced; ++r) 
+  {
+    m_reducedForceElastic[r] = - m_ksScale * m_Kr[r] * reduce_dofs[r];
+  }
+}
+
+void btReducedDeformableBody::applyReducedDampingForce(const tDenseArray& reduce_vel)
+{
+  for (int r = 0; r < m_nReduced; ++r) 
+  {
+    m_reducedForceDamping[r] = - m_dampingBeta * m_ksScale * m_Kr[r] * reduce_vel[r];
+  }
+}
+
+btScalar btReducedDeformableBody::getTotalMass() const
+{
+  return m_mass;
+}
+
+btTransform& btReducedDeformableBody::getRigidTransform()
+{
+  return m_rigidTransformWorld;
+}
+
+const btVector3& btReducedDeformableBody::getLinearVelocity() const
+{
+  return m_linearVelocity;
+}
+
+const btVector3& btReducedDeformableBody::getAngularVelocity() const
+{
+  return m_angularVelocity;
+}
+
+void btReducedDeformableBody::disableReducedModes(const bool rigid_only)
+{
+  m_rigidOnly = rigid_only;
+}
+
+bool btReducedDeformableBody::isReducedModesOFF() const
+{
+  return m_rigidOnly;
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h
new file mode 100644
index 0000000..8968fb0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h
@@ -0,0 +1,257 @@
+#ifndef BT_REDUCED_SOFT_BODY_H
+#define BT_REDUCED_SOFT_BODY_H
+
+#include "../btSoftBody.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btTransform.h"
+
+// Reduced deformable body is a simplified deformable object embedded in a rigid frame.
+class btReducedDeformableBody : public btSoftBody
+{
+ public:
+  //
+  //  Typedefs
+  //
+  typedef btAlignedObjectArray<btVector3> TVStack;
+  // typedef btAlignedObjectArray<btMatrix3x3> tBlockDiagMatrix;
+  typedef btAlignedObjectArray<btScalar> tDenseArray;
+  typedef btAlignedObjectArray<btAlignedObjectArray<btScalar> > tDenseMatrix;
+
+ private:
+  // flag to turn off the reduced modes
+  bool m_rigidOnly;
+
+  // Flags for transform. Once transform is applied, users cannot scale the mesh or change its total mass.
+  bool m_transform_lock;
+
+  // scaling factors
+  btScalar m_rhoScale;         // mass density scale
+  btScalar m_ksScale;          // stiffness scale
+
+  // projection matrix
+  tDenseMatrix m_projPA;        // Eqn. 4.11 from Rahul Sheth's thesis
+  tDenseMatrix m_projCq;
+  tDenseArray m_STP;
+  tDenseArray m_MrInvSTP;
+
+  TVStack m_localMomentArm; // Sq + x0
+
+  btVector3 m_internalDeltaLinearVelocity;
+  btVector3 m_internalDeltaAngularVelocity;
+  tDenseArray m_internalDeltaReducedVelocity;
+  
+  btVector3 m_linearVelocityFromReduced;  // contribution to the linear velocity from reduced velocity
+  btVector3 m_angularVelocityFromReduced; // contribution to the angular velocity from reduced velocity
+  btVector3 m_internalDeltaAngularVelocityFromReduced;
+
+ protected:
+  // rigid frame
+  btScalar m_mass;          // total mass of the rigid frame
+  btScalar m_inverseMass;   // inverse of the total mass of the rigid frame
+  btVector3 m_linearVelocity;
+  btVector3 m_angularVelocity;
+  btScalar m_linearDamping;    // linear damping coefficient
+  btScalar m_angularDamping;    // angular damping coefficient
+  btVector3 m_linearFactor;
+  btVector3 m_angularFactor;
+  // btVector3 m_invInertiaLocal;
+  btMatrix3x3 m_invInertiaLocal;
+  btTransform m_rigidTransformWorld;
+  btMatrix3x3 m_invInertiaTensorWorldInitial;
+  btMatrix3x3 m_invInertiaTensorWorld;
+  btMatrix3x3 m_interpolateInvInertiaTensorWorld;
+  btVector3 m_initialCoM;  // initial center of mass (original of the m_rigidTransformWorld)
+
+  // damping
+  btScalar m_dampingAlpha;
+  btScalar m_dampingBeta;
+
+ public:
+  //
+  //  Fields
+  //
+
+  // reduced space
+  int m_nReduced;
+  int m_nFull;
+  tDenseMatrix m_modes;														// modes of the reduced deformable model. Each inner array is a mode, outer array size = n_modes
+  tDenseArray m_reducedDofs;				   // Reduced degree of freedom
+  tDenseArray m_reducedDofsBuffer;     // Reduced degree of freedom at t^n
+  tDenseArray m_reducedVelocity;		   // Reduced velocity array
+  tDenseArray m_reducedVelocityBuffer; // Reduced velocity array at t^n
+  tDenseArray m_reducedForceExternal;          // reduced external force
+  tDenseArray m_reducedForceElastic;           // reduced internal elastic force
+  tDenseArray m_reducedForceDamping;           // reduced internal damping force
+  tDenseArray m_eigenvalues;		// eigenvalues of the reduce deformable model
+  tDenseArray m_Kr;	// reduced stiffness matrix
+  
+  // full space
+  TVStack m_x0;					     				 // Rest position
+  tDenseArray m_nodalMass;           // Mass on each node
+  btAlignedObjectArray<int> m_fixedNodes; // index of the fixed nodes
+  int m_nodeIndexOffset;             // offset of the node index needed for contact solver when there are multiple reduced deformable body in the world.
+
+  // contacts
+  btAlignedObjectArray<int> m_contactNodesList;
+
+  //
+  // Api
+  //
+  btReducedDeformableBody(btSoftBodyWorldInfo* worldInfo, int node_count, const btVector3* x, const btScalar* m);
+
+  ~btReducedDeformableBody() {}
+
+  //
+  // initializing helpers
+  //
+  void internalInitialization();
+
+  void setReducedModes(int num_modes, int full_size);
+
+  void setMassProps(const tDenseArray& mass_array);
+
+  void setInertiaProps();
+
+  void setRigidVelocity(const btVector3& v);
+
+  void setRigidAngularVelocity(const btVector3& omega);
+
+  void setStiffnessScale(const btScalar ks);
+
+  void setMassScale(const btScalar rho);
+
+  void setFixedNodes(const int n_node);
+
+  void setDamping(const btScalar alpha, const btScalar beta);
+
+  void disableReducedModes(const bool rigid_only);
+
+  virtual void setTotalMass(btScalar mass, bool fromfaces = false);
+
+  //
+  // various internal updates
+  //
+  virtual void transformTo(const btTransform& trs);
+  virtual void transform(const btTransform& trs);
+  // caution: 
+  // need to use scale before using transform, because the scale is performed in the local frame 
+  // (i.e., may have some rotation already, but the m_rigidTransformWorld doesn't have this info)
+  virtual void scale(const btVector3& scl);
+
+ private:
+  void updateRestNodalPositions();
+
+  void updateInitialInertiaTensor(const btMatrix3x3& rotation);
+
+  void updateLocalInertiaTensorFromNodes();
+
+  void updateInertiaTensor();
+
+  void updateModesByRotation(const btMatrix3x3& rotation);
+ 
+ public:
+  void updateLocalMomentArm();
+
+  void predictIntegratedTransform(btScalar dt, btTransform& predictedTransform);
+
+  // update the external force projection matrix 
+  void updateExternalForceProjectMatrix(bool initialized);
+
+  void endOfTimeStepZeroing();
+
+  void applyInternalVelocityChanges();
+
+  //
+  // position and velocity update related
+  //
+
+  // compute reduced degree of freedoms
+  void updateReducedDofs(btScalar solverdt);
+
+  // compute reduced velocity update (for explicit time stepping)
+  void updateReducedVelocity(btScalar solverdt);
+
+  // map to full degree of freedoms
+  void mapToFullPosition(const btTransform& ref_trans);
+
+  // compute full space velocity from the reduced velocity
+  void mapToFullVelocity(const btTransform& ref_trans);
+
+  // compute total angular momentum
+  const btVector3 computeTotalAngularMomentum() const;
+
+  // get a single node's full space velocity from the reduced velocity
+  const btVector3 computeNodeFullVelocity(const btTransform& ref_trans, int n_node) const;
+
+  // get a single node's all delta velocity
+  const btVector3 internalComputeNodeDeltaVelocity(const btTransform& ref_trans, int n_node) const;
+
+  //
+  // rigid motion related
+  //
+  void applyDamping(btScalar timeStep);
+
+  void applyCentralImpulse(const btVector3& impulse);
+
+  void applyTorqueImpulse(const btVector3& torque);
+
+  void proceedToTransform(btScalar dt, bool end_of_time_step);
+
+  //
+  // force related
+  //
+
+  // apply impulse to the rigid frame
+  void internalApplyRigidImpulse(const btVector3& impulse, const btVector3& rel_pos);
+
+  // apply impulse to nodes in the full space
+  void internalApplyFullSpaceImpulse(const btVector3& impulse, const btVector3& rel_pos, int n_node, btScalar dt);
+
+  // apply nodal external force in the full space
+  void applyFullSpaceNodalForce(const btVector3& f_ext, int n_node);
+
+  // apply gravity to the rigid frame
+  void applyRigidGravity(const btVector3& gravity, btScalar dt);
+
+  // apply reduced elastic force
+  void applyReducedElasticForce(const tDenseArray& reduce_dofs);
+
+  // apply reduced damping force
+  void applyReducedDampingForce(const tDenseArray& reduce_vel);
+
+  // calculate the impulse factor
+  virtual btMatrix3x3 getImpulseFactor(int n_node);
+
+  // get relative position from a node to the CoM of the rigid frame
+  btVector3 getRelativePos(int n_node);
+
+  //
+  // accessors
+  //
+  bool isReducedModesOFF() const;
+  btScalar getTotalMass() const;
+  btTransform& getRigidTransform();
+  const btVector3& getLinearVelocity() const;
+	const btVector3& getAngularVelocity() const;
+
+  #if defined(BT_CLAMP_VELOCITY_TO) && BT_CLAMP_VELOCITY_TO > 0
+  void clampVelocity(btVector3& v) const {
+      v.setX(
+          fmax(-BT_CLAMP_VELOCITY_TO,
+                fmin(BT_CLAMP_VELOCITY_TO, v.getX()))
+      );
+      v.setY(
+          fmax(-BT_CLAMP_VELOCITY_TO,
+                fmin(BT_CLAMP_VELOCITY_TO, v.getY()))
+      );
+      v.setZ(
+          fmax(-BT_CLAMP_VELOCITY_TO,
+                fmin(BT_CLAMP_VELOCITY_TO, v.getZ()))
+      );
+  }
+  #endif
+};
+
+#endif // BT_REDUCED_SOFT_BODY_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp
new file mode 100644
index 0000000..0f95bc5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp
@@ -0,0 +1,215 @@
+#include "btReducedDeformableBodyHelpers.h"
+#include "../btSoftBodyHelpers.h"
+#include <iostream>
+#include <string>
+#include <sstream>
+
+btReducedDeformableBody* btReducedDeformableBodyHelpers::createReducedDeformableObject(btSoftBodyWorldInfo& worldInfo, const std::string& file_path, const std::string& vtk_file, const int num_modes, bool rigid_only) {
+	std::string filename = file_path + vtk_file;
+	btReducedDeformableBody* rsb = btReducedDeformableBodyHelpers::createFromVtkFile(worldInfo, filename.c_str());
+	
+	rsb->setReducedModes(num_modes, rsb->m_nodes.size());
+	btReducedDeformableBodyHelpers::readReducedDeformableInfoFromFiles(rsb, file_path.c_str());
+	
+	rsb->disableReducedModes(rigid_only);
+
+	return rsb;
+}
+
+btReducedDeformableBody* btReducedDeformableBodyHelpers::createFromVtkFile(btSoftBodyWorldInfo& worldInfo, const char* vtk_file)
+{
+	std::ifstream fs;
+	fs.open(vtk_file);
+	btAssert(fs);
+
+	typedef btAlignedObjectArray<int> Index;
+	std::string line;
+	btAlignedObjectArray<btVector3> X;
+	btVector3 position;
+	btAlignedObjectArray<Index> indices;
+	bool reading_points = false;
+	bool reading_tets = false;
+	size_t n_points = 0;
+	size_t n_tets = 0;
+	size_t x_count = 0;
+	size_t indices_count = 0;
+	while (std::getline(fs, line))
+	{
+		std::stringstream ss(line);
+		if (line.size() == (size_t)(0))
+		{
+		}
+		else if (line.substr(0, 6) == "POINTS")
+		{
+			reading_points = true;
+			reading_tets = false;
+			ss.ignore(128, ' ');  // ignore "POINTS"
+			ss >> n_points;
+			X.resize(n_points);
+		}
+		else if (line.substr(0, 5) == "CELLS")
+		{
+			reading_points = false;
+			reading_tets = true;
+			ss.ignore(128, ' ');  // ignore "CELLS"
+			ss >> n_tets;
+			indices.resize(n_tets);
+		}
+		else if (line.substr(0, 10) == "CELL_TYPES")
+		{
+			reading_points = false;
+			reading_tets = false;
+		}
+		else if (reading_points)
+		{
+			btScalar p;
+			ss >> p;
+			position.setX(p);
+			ss >> p;
+			position.setY(p);
+			ss >> p;
+			position.setZ(p);
+			//printf("v %f %f %f\n", position.getX(), position.getY(), position.getZ());
+			X[x_count++] = position;
+		}
+		else if (reading_tets)
+		{
+			int d;
+			ss >> d;
+			if (d != 4)
+			{
+				printf("Load deformable failed: Only Tetrahedra are supported in VTK file.\n");
+				fs.close();
+				return 0;
+			}
+			ss.ignore(128, ' ');  // ignore "4"
+			Index tet;
+			tet.resize(4);
+			for (size_t i = 0; i < 4; i++)
+			{
+				ss >> tet[i];
+				//printf("%d ", tet[i]);
+			}
+			//printf("\n");
+			indices[indices_count++] = tet;
+		}
+	}
+	btReducedDeformableBody* rsb = new btReducedDeformableBody(&worldInfo, n_points, &X[0], 0);
+
+	for (int i = 0; i < n_tets; ++i)
+	{
+		const Index& ni = indices[i];
+		rsb->appendTetra(ni[0], ni[1], ni[2], ni[3]);
+		{
+			rsb->appendLink(ni[0], ni[1], 0, true);
+			rsb->appendLink(ni[1], ni[2], 0, true);
+			rsb->appendLink(ni[2], ni[0], 0, true);
+			rsb->appendLink(ni[0], ni[3], 0, true);
+			rsb->appendLink(ni[1], ni[3], 0, true);
+			rsb->appendLink(ni[2], ni[3], 0, true);
+		}
+	}
+
+	btSoftBodyHelpers::generateBoundaryFaces(rsb);
+	rsb->initializeDmInverse();
+	rsb->m_tetraScratches.resize(rsb->m_tetras.size());
+	rsb->m_tetraScratchesTn.resize(rsb->m_tetras.size());
+	printf("Nodes:  %u\r\n", rsb->m_nodes.size());
+	printf("Links:  %u\r\n", rsb->m_links.size());
+	printf("Faces:  %u\r\n", rsb->m_faces.size());
+	printf("Tetras: %u\r\n", rsb->m_tetras.size());
+
+	fs.close();
+
+	return rsb;
+}
+
+void btReducedDeformableBodyHelpers::readReducedDeformableInfoFromFiles(btReducedDeformableBody* rsb, const char* file_path)
+{
+	// read in eigenmodes, stiffness and mass matrices
+	std::string eigenvalues_file = std::string(file_path) + "eigenvalues.bin";
+	btReducedDeformableBodyHelpers::readBinaryVec(rsb->m_eigenvalues, rsb->m_nReduced, eigenvalues_file.c_str());
+
+	std::string Kr_file = std::string(file_path) + "K_r_diag_mat.bin";
+	btReducedDeformableBodyHelpers::readBinaryVec(rsb->m_Kr,  rsb->m_nReduced, Kr_file.c_str());
+
+	// std::string Mr_file = std::string(file_path) + "M_r_diag_mat.bin";
+	// btReducedDeformableBodyHelpers::readBinaryVec(rsb->m_Mr, rsb->m_nReduced, Mr_file.c_str());
+
+	std::string modes_file = std::string(file_path) + "modes.bin";
+	btReducedDeformableBodyHelpers::readBinaryMat(rsb->m_modes, rsb->m_nReduced, 3 * rsb->m_nFull, modes_file.c_str());
+	
+	// read in full nodal mass
+	std::string M_file = std::string(file_path) + "M_diag_mat.bin";
+	btAlignedObjectArray<btScalar> mass_array;
+	btReducedDeformableBodyHelpers::readBinaryVec(mass_array, rsb->m_nFull, M_file.c_str());
+	rsb->setMassProps(mass_array);
+	
+	// calculate the inertia tensor in the local frame 
+ 	rsb->setInertiaProps();
+
+	// other internal initialization
+	rsb->internalInitialization();
+}
+
+// read in a vector from the binary file
+void btReducedDeformableBodyHelpers::readBinaryVec(btReducedDeformableBody::tDenseArray& vec, 
+																				  	 const unsigned int n_size, 				// #entries read
+																						 const char* file)
+{
+	std::ifstream f_in(file, std::ios::in | std::ios::binary);
+	// first get size
+	unsigned int size=0;
+	f_in.read((char*)&size, 4);//sizeof(unsigned int));
+	btAssert(size >= n_size); 	// make sure the #requested mode is smaller than the #available modes
+
+	// read data
+	vec.resize(n_size);
+	double temp;
+	for (unsigned int i = 0; i < n_size; ++i)
+	{
+		f_in.read((char*)&temp, sizeof(double));
+		vec[i] = btScalar(temp);
+	}
+  f_in.close();
+}
+
+// read in a matrix from the binary file
+void btReducedDeformableBodyHelpers::readBinaryMat(btReducedDeformableBody::tDenseMatrix& mat, 
+																						 const unsigned int n_modes, 		// #modes, outer array size
+																						 const unsigned int n_full, 		// inner array size
+																						 const char* file)
+{
+	std::ifstream f_in(file, std::ios::in | std::ios::binary);
+	// first get size
+	unsigned int v_size=0;
+	f_in.read((char*)&v_size, 4);//sizeof(unsigned int));
+	btAssert(v_size >= n_modes * n_full); 	// make sure the #requested mode is smaller than the #available modes
+
+	// read data
+	mat.resize(n_modes);
+	for (int i = 0; i < n_modes; ++i) 
+	{
+		for (int j = 0; j < n_full; ++j)
+		{
+			double temp;
+			f_in.read((char*)&temp, sizeof(double));
+
+			if (mat[i].size() != n_modes)
+				mat[i].resize(n_full);
+			mat[i][j] = btScalar(temp);
+		}
+	}
+  f_in.close();
+}
+
+void btReducedDeformableBodyHelpers::calculateLocalInertia(btVector3& inertia, const btScalar mass, const btVector3& half_extents, const btVector3& margin)
+{
+	btScalar lx = btScalar(2.) * (half_extents[0] + margin[0]);
+	btScalar ly = btScalar(2.) * (half_extents[1] + margin[1]);
+	btScalar lz = btScalar(2.) * (half_extents[2] + margin[2]);
+
+	inertia.setValue(mass / (btScalar(12.0)) * (ly * ly + lz * lz),
+								   mass / (btScalar(12.0)) * (lx * lx + lz * lz),
+								   mass / (btScalar(12.0)) * (lx * lx + ly * ly));
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h
new file mode 100644
index 0000000..2b259a9
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h
@@ -0,0 +1,25 @@
+#ifndef BT_REDUCED_SOFT_BODY_HELPERS_H
+#define BT_REDUCED_SOFT_BODY_HELPERS_H
+
+#include "btReducedDeformableBody.h"
+#include <string>
+
+struct btReducedDeformableBodyHelpers
+{
+	// create a reduced deformable object
+	static btReducedDeformableBody* createReducedDeformableObject(btSoftBodyWorldInfo& worldInfo, const std::string& file_path, const std::string& vtk_file, const int num_modes, bool rigid_only);
+	// read in geometry info from Vtk file
+  static btReducedDeformableBody* createFromVtkFile(btSoftBodyWorldInfo& worldInfo, const char* vtk_file);
+	// read in all reduced files
+	static void readReducedDeformableInfoFromFiles(btReducedDeformableBody* rsb, const char* file_path);
+	// read in a binary vector
+	static void readBinaryVec(btReducedDeformableBody::tDenseArray& vec, const unsigned int n_size, const char* file);
+	// read in a binary matrix
+	static void readBinaryMat(btReducedDeformableBody::tDenseMatrix& mat, const unsigned int n_modes, const unsigned int n_full, const char* file);
+	
+	// calculate the local inertia tensor for a box shape reduced deformable object
+	static void calculateLocalInertia(btVector3& inertia, const btScalar mass, const btVector3& half_extents, const btVector3& margin);
+};
+
+
+#endif // BT_REDUCED_SOFT_BODY_HELPERS_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp
new file mode 100644
index 0000000..1418cc2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp
@@ -0,0 +1,325 @@
+#include "btReducedDeformableBodySolver.h"
+#include "btReducedDeformableBody.h"
+
+btReducedDeformableBodySolver::btReducedDeformableBodySolver()
+{
+  m_ascendOrder = true;
+  m_reducedSolver = true;
+  m_dampingAlpha = 0;
+  m_dampingBeta = 0;
+  m_gravity = btVector3(0, 0, 0);
+}
+
+void btReducedDeformableBodySolver::setGravity(const btVector3& gravity)
+{
+  m_gravity = gravity;
+}
+
+void btReducedDeformableBodySolver::reinitialize(const btAlignedObjectArray<btSoftBody*>& bodies, btScalar dt)
+{
+  m_softBodies.copyFromArray(bodies);
+	bool nodeUpdated = updateNodes();
+
+	if (nodeUpdated)
+	{
+		m_dv.resize(m_numNodes, btVector3(0, 0, 0));
+		m_ddv.resize(m_numNodes, btVector3(0, 0, 0));
+		m_residual.resize(m_numNodes, btVector3(0, 0, 0));
+		m_backupVelocity.resize(m_numNodes, btVector3(0, 0, 0));
+	}
+
+	// need to setZero here as resize only set value for newly allocated items
+	for (int i = 0; i < m_numNodes; ++i)
+	{
+		m_dv[i].setZero();
+		m_ddv[i].setZero();
+		m_residual[i].setZero();
+	}
+
+	if (dt > 0)
+	{
+		m_dt = dt;
+	}
+	m_objective->reinitialize(nodeUpdated, dt);
+
+  int N = bodies.size();
+	if (nodeUpdated)
+	{
+		m_staticConstraints.resize(N);
+		m_nodeRigidConstraints.resize(N);
+		// m_faceRigidConstraints.resize(N);
+	}
+	for (int i = 0; i < N; ++i)
+	{
+		m_staticConstraints[i].clear();
+		m_nodeRigidConstraints[i].clear();
+		// m_faceRigidConstraints[i].clear();
+	}
+
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+    rsb->m_contactNodesList.clear();
+  }
+
+  // set node index offsets
+  int sum = 0;
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+    rsb->m_nodeIndexOffset = sum;
+    sum += rsb->m_nodes.size();
+  }
+
+	btDeformableBodySolver::updateSoftBodies();
+}
+
+void btReducedDeformableBodySolver::predictMotion(btScalar solverdt)
+{
+  applyExplicitForce(solverdt);
+
+  // predict new mesh location
+  predictReduceDeformableMotion(solverdt);
+
+  //TODO: check if there is anything missed from btDeformableBodySolver::predictDeformableMotion
+}
+
+void btReducedDeformableBodySolver::predictReduceDeformableMotion(btScalar solverdt)
+{
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+    if (!rsb->isActive())
+    {
+      continue;
+    }
+
+    // clear contacts variables
+		rsb->m_nodeRigidContacts.resize(0);
+		rsb->m_faceRigidContacts.resize(0);
+		rsb->m_faceNodeContacts.resize(0);
+    
+    // calculate inverse mass matrix for all nodes
+    for (int j = 0; j < rsb->m_nodes.size(); ++j)
+    {
+      if (rsb->m_nodes[j].m_im > 0)
+      {
+        rsb->m_nodes[j].m_effectiveMass_inv = rsb->m_nodes[j].m_effectiveMass.inverse();
+      }
+    }
+
+    // rigid motion: t, R at time^*
+    rsb->predictIntegratedTransform(solverdt, rsb->getInterpolationWorldTransform());
+
+    // update reduced dofs at time^*
+    // rsb->updateReducedDofs(solverdt);
+
+    // update local moment arm at time^*
+    // rsb->updateLocalMomentArm();
+    // rsb->updateExternalForceProjectMatrix(true);
+
+    // predict full space velocity at time^* (needed for constraints)
+    rsb->mapToFullVelocity(rsb->getInterpolationWorldTransform());
+
+    // update full space nodal position at time^*
+    rsb->mapToFullPosition(rsb->getInterpolationWorldTransform());
+
+    // update bounding box
+    rsb->updateBounds();
+
+    // update tree
+    rsb->updateNodeTree(true, true);
+    if (!rsb->m_fdbvt.empty())
+    {
+      rsb->updateFaceTree(true, true);
+    }
+  }
+}
+
+void btReducedDeformableBodySolver::applyExplicitForce(btScalar solverdt)
+{
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+
+    // apply gravity to the rigid frame, get m_linearVelocity at time^*
+    rsb->applyRigidGravity(m_gravity, solverdt);
+
+    if (!rsb->isReducedModesOFF())
+    {
+      // add internal force (elastic force & damping force)
+      rsb->applyReducedElasticForce(rsb->m_reducedDofsBuffer);
+      rsb->applyReducedDampingForce(rsb->m_reducedVelocityBuffer);
+
+      // get reduced velocity at time^* 
+      rsb->updateReducedVelocity(solverdt);
+    }
+
+    // apply damping (no need at this point)
+    // rsb->applyDamping(solverdt);
+  }
+}
+
+void btReducedDeformableBodySolver::applyTransforms(btScalar timeStep)
+{
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+
+    // rigid motion
+    rsb->proceedToTransform(timeStep, true);
+
+    if (!rsb->isReducedModesOFF())
+    {
+      // update reduced dofs for time^n+1
+      rsb->updateReducedDofs(timeStep);
+
+      // update local moment arm for time^n+1
+      rsb->updateLocalMomentArm();
+      rsb->updateExternalForceProjectMatrix(true);
+    }
+
+    // update mesh nodal positions for time^n+1
+    rsb->mapToFullPosition(rsb->getRigidTransform());
+
+    // update mesh nodal velocity
+    rsb->mapToFullVelocity(rsb->getRigidTransform());
+
+    // end of time step clean up and update
+    rsb->endOfTimeStepZeroing();
+
+    // update the rendering mesh
+    rsb->interpolateRenderMesh();
+  }
+}
+
+void btReducedDeformableBodySolver::setConstraints(const btContactSolverInfo& infoGlobal)
+{
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+    if (!rsb->isActive())
+		{
+			continue;
+		}
+
+    // set fixed constraints
+    for (int j = 0; j < rsb->m_fixedNodes.size(); ++j)
+		{
+      int i_node = rsb->m_fixedNodes[j];
+			if (rsb->m_nodes[i_node].m_im == 0)
+			{
+        for (int k = 0; k < 3; ++k)
+        {
+          btVector3 dir(0, 0, 0);
+          dir[k] = 1;
+          btReducedDeformableStaticConstraint static_constraint(rsb, &rsb->m_nodes[i_node], rsb->getRelativePos(i_node), rsb->m_x0[i_node], dir, infoGlobal, m_dt);
+          m_staticConstraints[i].push_back(static_constraint);
+        }
+			}
+		}
+    btAssert(rsb->m_fixedNodes.size() * 3 == m_staticConstraints[i].size());
+
+    // set Deformable Node vs. Rigid constraint
+		for (int j = 0; j < rsb->m_nodeRigidContacts.size(); ++j)
+		{
+			const btSoftBody::DeformableNodeRigidContact& contact = rsb->m_nodeRigidContacts[j];
+			// skip fixed points
+			if (contact.m_node->m_im == 0)
+			{
+				continue;
+			}
+			btReducedDeformableNodeRigidContactConstraint constraint(rsb, contact, infoGlobal, m_dt);
+			m_nodeRigidConstraints[i].push_back(constraint);
+      rsb->m_contactNodesList.push_back(contact.m_node->index - rsb->m_nodeIndexOffset);
+		}
+    // std::cout << "contact node list size: " << rsb->m_contactNodesList.size() << "\n";
+    // std::cout << "#contact nodes: " << m_nodeRigidConstraints[i].size() << "\n";
+
+  }
+}
+
+btScalar btReducedDeformableBodySolver::solveContactConstraints(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal)
+{
+  btScalar residualSquare = 0;
+
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btAlignedObjectArray<int> m_orderNonContactConstraintPool;
+    btAlignedObjectArray<int> m_orderContactConstraintPool;
+
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+
+    // shuffle the order of applying constraint
+    m_orderNonContactConstraintPool.resize(m_staticConstraints[i].size());
+    m_orderContactConstraintPool.resize(m_nodeRigidConstraints[i].size());
+    if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
+    {
+      // fixed constraint order
+      for (int j = 0; j < m_staticConstraints[i].size(); ++j)
+      {
+        m_orderNonContactConstraintPool[j] = m_ascendOrder ? j : m_staticConstraints[i].size() - 1 - j;
+      }
+      // contact constraint order
+      for (int j = 0; j < m_nodeRigidConstraints[i].size(); ++j)
+      {
+        m_orderContactConstraintPool[j] = m_ascendOrder ? j : m_nodeRigidConstraints[i].size() - 1 - j;
+      }
+
+      m_ascendOrder = m_ascendOrder ? false : true;
+    }
+    else
+    {
+      for (int j = 0; j < m_staticConstraints[i].size(); ++j)
+      {
+        m_orderNonContactConstraintPool[j] = j;
+      }
+      // contact constraint order
+      for (int j = 0; j < m_nodeRigidConstraints[i].size(); ++j)
+      {
+        m_orderContactConstraintPool[j] = j;
+      }
+    }
+
+    // handle fixed constraint
+    for (int k = 0; k < m_staticConstraints[i].size(); ++k)
+    {
+      btReducedDeformableStaticConstraint& constraint = m_staticConstraints[i][m_orderNonContactConstraintPool[k]];
+      btScalar localResidualSquare = constraint.solveConstraint(infoGlobal);
+      residualSquare = btMax(residualSquare, localResidualSquare);
+    }
+
+    // handle contact constraint
+
+    // node vs rigid contact
+    // std::cout << "!!#contact_nodes: " << m_nodeRigidConstraints[i].size() << '\n';
+    for (int k = 0; k < m_nodeRigidConstraints[i].size(); ++k)
+    {
+      btReducedDeformableNodeRigidContactConstraint& constraint = m_nodeRigidConstraints[i][m_orderContactConstraintPool[k]];
+      btScalar localResidualSquare = constraint.solveConstraint(infoGlobal);
+      residualSquare = btMax(residualSquare, localResidualSquare);
+    }
+
+    // face vs rigid contact
+    // for (int k = 0; k < m_faceRigidConstraints[i].size(); ++k)
+    // {
+    // 	btReducedDeformableFaceRigidContactConstraint& constraint = m_faceRigidConstraints[i][k];
+    // 	btScalar localResidualSquare = constraint.solveConstraint(infoGlobal);
+    // 	residualSquare = btMax(residualSquare, localResidualSquare);
+    // }
+  }
+
+  
+	return residualSquare;
+}
+
+void btReducedDeformableBodySolver::deformableBodyInternalWriteBack()
+{
+  // reduced deformable update
+  for (int i = 0; i < m_softBodies.size(); ++i)
+  {
+    btReducedDeformableBody* rsb = static_cast<btReducedDeformableBody*>(m_softBodies[i]);
+    rsb->applyInternalVelocityChanges();
+  }
+  m_ascendOrder = true;
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h
new file mode 100644
index 0000000..04c171f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h
@@ -0,0 +1,61 @@
+#ifndef BT_REDUCED_DEFORMABLE_BODY_DYNAMICS_WORLD_H
+#define BT_REDUCED_DEFORMABLE_BODY_DYNAMICS_WORLD_H
+
+#include "BulletSoftBody/btDeformableBodySolver.h"
+#include "btReducedDeformableContactConstraint.h"
+
+class btReducedDeformableBody;
+
+class btReducedDeformableBodySolver : public btDeformableBodySolver
+{
+ protected:
+  bool m_ascendOrder;
+  btScalar m_dampingAlpha;
+  btScalar m_dampingBeta;
+
+  btVector3 m_gravity;
+
+  void predictReduceDeformableMotion(btScalar solverdt);
+
+  void applyExplicitForce(btScalar solverdt);
+
+ public:
+  btAlignedObjectArray<btAlignedObjectArray<btReducedDeformableStaticConstraint> > m_staticConstraints;
+  btAlignedObjectArray<btAlignedObjectArray<btReducedDeformableNodeRigidContactConstraint> > m_nodeRigidConstraints;
+  btAlignedObjectArray<btAlignedObjectArray<btReducedDeformableFaceRigidContactConstraint> > m_faceRigidConstraints;
+  
+  btReducedDeformableBodySolver();
+  ~btReducedDeformableBodySolver() {}
+
+  virtual void setGravity(const btVector3& gravity);
+
+  virtual SolverTypes getSolverType() const
+  {
+    return REDUCED_DEFORMABLE_SOLVER;
+  }
+
+  // resize/clear data structures
+	virtual void reinitialize(const btAlignedObjectArray<btSoftBody*>& bodies, btScalar dt);
+
+  virtual void predictMotion(btScalar solverdt);
+
+  virtual void applyTransforms(btScalar timeStep);
+
+  // set up contact constraints
+	virtual void setConstraints(const btContactSolverInfo& infoGlobal);
+
+  // solve all constraints (fixed and contact)
+  virtual btScalar solveContactConstraints(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal);
+
+  // apply all the delta velocities
+  virtual void deformableBodyInternalWriteBack();
+
+  // virtual void setProjection() {}
+
+  // virtual void setLagrangeMultiplier() {}
+
+  // virtual void setupDeformableSolve(bool implicit);
+
+};
+
+#endif // BT_REDUCED_DEFORMABLE_BODY_DYNAMICS_WORLD_H
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp
new file mode 100644
index 0000000..3c78d2d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp
@@ -0,0 +1,579 @@
+#include "btReducedDeformableContactConstraint.h"
+#include <iostream>
+
+// ================= static constraints ===================
+btReducedDeformableStaticConstraint::btReducedDeformableStaticConstraint(
+  btReducedDeformableBody* rsb, 
+  btSoftBody::Node* node,
+	const btVector3& ri,
+	const btVector3& x0,
+	const btVector3& dir,
+  const btContactSolverInfo& infoGlobal,
+	btScalar dt)
+  : m_rsb(rsb), m_ri(ri), m_targetPos(x0), m_impulseDirection(dir), m_dt(dt), btDeformableStaticConstraint(node, infoGlobal)
+{
+	m_erp = 0.2;
+	m_appliedImpulse = 0;
+
+	// get impulse factor
+  m_impulseFactorMatrix = rsb->getImpulseFactor(m_node->index);
+	m_impulseFactor = (m_impulseFactorMatrix * m_impulseDirection).dot(m_impulseDirection);
+
+	btScalar vel_error = btDot(-m_node->m_v, m_impulseDirection);
+	btScalar pos_error = btDot(m_targetPos - m_node->m_x, m_impulseDirection);
+
+	m_rhs = (vel_error + m_erp * pos_error / m_dt) / m_impulseFactor;
+}
+
+btScalar btReducedDeformableStaticConstraint::solveConstraint(const btContactSolverInfo& infoGlobal)
+{
+	// target velocity of fixed constraint is 0
+	btVector3 deltaVa = getDeltaVa();
+	btScalar deltaV_rel = btDot(deltaVa, m_impulseDirection);
+  btScalar deltaImpulse = m_rhs - deltaV_rel / m_impulseFactor;
+	m_appliedImpulse = m_appliedImpulse + deltaImpulse;
+
+	btVector3 impulse = deltaImpulse * m_impulseDirection;
+	applyImpulse(impulse);
+
+	// calculate residual
+	btScalar residualSquare = m_impulseFactor * deltaImpulse;
+	residualSquare *= residualSquare;
+
+	return residualSquare;
+}
+  
+// this calls reduced deformable body's internalApplyFullSpaceImpulse
+void btReducedDeformableStaticConstraint::applyImpulse(const btVector3& impulse)
+{
+	// apply full space impulse
+	m_rsb->internalApplyFullSpaceImpulse(impulse, m_ri, m_node->index, m_dt);
+}
+
+btVector3 btReducedDeformableStaticConstraint::getDeltaVa() const
+{
+	return m_rsb->internalComputeNodeDeltaVelocity(m_rsb->getInterpolationWorldTransform(), m_node->index);
+}
+
+// ================= base contact constraints ===================
+btReducedDeformableRigidContactConstraint::btReducedDeformableRigidContactConstraint(
+  btReducedDeformableBody* rsb, 
+  const btSoftBody::DeformableRigidContact& c, 
+  const btContactSolverInfo& infoGlobal,
+	btScalar dt)
+  : m_rsb(rsb), m_dt(dt), btDeformableRigidContactConstraint(c, infoGlobal)
+{
+	m_nodeQueryIndex = 0;
+	m_appliedNormalImpulse = 0;
+  m_appliedTangentImpulse = 0;
+	m_rhs = 0;
+	m_rhs_tangent = 0;
+	m_cfm = infoGlobal.m_deformable_cfm;
+	m_cfm_friction = 0;
+	m_erp = infoGlobal.m_deformable_erp;
+	m_erp_friction = infoGlobal.m_deformable_erp;
+	m_friction = infoGlobal.m_friction;
+
+	m_collideStatic = m_contact->m_cti.m_colObj->isStaticObject();
+	m_collideMultibody = (m_contact->m_cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK);
+}
+
+void btReducedDeformableRigidContactConstraint::setSolverBody(const int bodyId, btSolverBody& solver_body)
+{
+	if (!m_collideMultibody)
+	{
+		m_solverBodyId = bodyId;
+		m_solverBody = &solver_body;
+		m_linearComponentNormal = -m_contactNormalA * m_solverBody->internalGetInvMass();
+		btVector3	torqueAxis = -m_relPosA.cross(m_contactNormalA);
+		m_angularComponentNormal = m_solverBody->m_originalBody->getInvInertiaTensorWorld() * torqueAxis;
+		
+		m_linearComponentTangent = m_contactTangent * m_solverBody->internalGetInvMass();
+		btVector3 torqueAxisTangent = m_relPosA.cross(m_contactTangent);
+		m_angularComponentTangent = m_solverBody->m_originalBody->getInvInertiaTensorWorld() * torqueAxisTangent;
+	}
+}
+
+btVector3 btReducedDeformableRigidContactConstraint::getVa() const
+{
+	btVector3 Va(0, 0, 0);
+	if (!m_collideStatic)
+	{
+		Va = btDeformableRigidContactConstraint::getVa();
+	}
+	return Va;
+}
+
+btScalar btReducedDeformableRigidContactConstraint::solveConstraint(const btContactSolverInfo& infoGlobal)
+{
+	// btVector3 Va = getVa();
+	// btVector3 deltaVa = Va - m_bufferVelocityA;
+	// if (!m_collideStatic)
+	// {
+		// std::cout << "moving collision!!!\n";
+		// std::cout << "relPosA: " << m_relPosA[0] << "\t" << m_relPosA[1] << "\t" << m_relPosA[2] << "\n";
+		// std::cout << "moving rigid linear_vel: " << m_solverBody->m_originalBody->getLinearVelocity()[0] << '\t'
+		//  << m_solverBody->m_originalBody->getLinearVelocity()[1] << '\t'
+		//   << m_solverBody->m_originalBody->getLinearVelocity()[2] << '\n';
+	// }
+	btVector3 deltaVa = getDeltaVa();
+	btVector3 deltaVb = getDeltaVb();
+
+	// if (!m_collideStatic)
+	// {
+	// 	std::cout << "deltaVa: " << deltaVa[0] << '\t' << deltaVa[1] << '\t' << deltaVa[2] << '\n';
+	// 	std::cout << "deltaVb: " << deltaVb[0] << '\t' << deltaVb[1] << '\t' << deltaVb[2] << '\n';
+	// }
+
+	// get delta relative velocity and magnitude (i.e., how much impulse has been applied?)
+	btVector3 deltaV_rel = deltaVa - deltaVb;
+	btScalar deltaV_rel_normal = -btDot(deltaV_rel, m_contactNormalA);
+
+	// if (!m_collideStatic)
+	// {
+	// 	std::cout << "deltaV_rel: " << deltaV_rel[0] << '\t' << deltaV_rel[1] << '\t' << deltaV_rel[2] << "\n";
+	// 	std::cout << "deltaV_rel_normal: " << deltaV_rel_normal << "\n";
+	// 	std::cout << "normal_A: " << m_contactNormalA[0] << '\t' << m_contactNormalA[1] << '\t' << m_contactNormalA[2] << '\n';
+	// }
+	
+	// get the normal impulse to be applied
+	btScalar deltaImpulse = m_rhs - m_appliedNormalImpulse * m_cfm - deltaV_rel_normal / m_normalImpulseFactor;
+	// if (!m_collideStatic)
+	// {
+	// 	std::cout << "m_rhs: " << m_rhs << '\t' << "m_appliedNormalImpulse: "  << m_appliedNormalImpulse << "\n";
+	// 	std::cout << "m_normalImpulseFactor: " << m_normalImpulseFactor << '\n';
+	// }
+
+	{
+		// cumulative impulse that has been applied
+		btScalar sum = m_appliedNormalImpulse + deltaImpulse;
+		// if the cumulative impulse is pushing the object into the rigid body, set it zero
+		if (sum < 0)
+		{
+			deltaImpulse = -m_appliedNormalImpulse;
+			m_appliedNormalImpulse = 0;
+		}
+		else
+		{
+			m_appliedNormalImpulse = sum;
+		}	
+	}
+
+	// if (!m_collideStatic)
+	// {
+	// 	std::cout << "m_appliedNormalImpulse: " << m_appliedNormalImpulse << '\n';
+	// 	std::cout << "deltaImpulse: " << deltaImpulse << '\n';
+	// }
+
+	// residual is the nodal normal velocity change in current iteration
+	btScalar residualSquare = deltaImpulse * m_normalImpulseFactor;	// get residual
+	residualSquare *= residualSquare;
+
+	
+	// apply Coulomb friction (based on delta velocity, |dv_t| = |dv_n * friction|)
+	btScalar deltaImpulse_tangent = 0;
+	btScalar deltaImpulse_tangent2 = 0;
+	{
+		// calculate how much impulse is needed
+		// btScalar deltaV_rel_tangent = btDot(deltaV_rel, m_contactTangent);
+		// btScalar impulse_changed = deltaV_rel_tangent * m_tangentImpulseFactorInv;
+		// deltaImpulse_tangent = m_rhs_tangent - impulse_changed;
+
+		// btScalar sum = m_appliedTangentImpulse + deltaImpulse_tangent;
+		btScalar lower_limit = - m_appliedNormalImpulse * m_friction;
+		btScalar upper_limit = m_appliedNormalImpulse * m_friction;
+		// if (sum > upper_limit)
+		// {
+		// 	deltaImpulse_tangent = upper_limit - m_appliedTangentImpulse;
+		// 	m_appliedTangentImpulse = upper_limit;
+		// }
+		// else if (sum < lower_limit)
+		// {
+		// 	deltaImpulse_tangent = lower_limit - m_appliedTangentImpulse;
+		// 	m_appliedTangentImpulse = lower_limit;
+		// }
+		// else
+		// {
+		// 	m_appliedTangentImpulse = sum;
+		// }
+		// 
+		calculateTangentialImpulse(deltaImpulse_tangent, m_appliedTangentImpulse, m_rhs_tangent,
+															 m_tangentImpulseFactorInv, m_contactTangent, lower_limit, upper_limit, deltaV_rel);
+		
+		if (m_collideMultibody)
+		{
+			calculateTangentialImpulse(deltaImpulse_tangent2, m_appliedTangentImpulse2, m_rhs_tangent2,
+															   m_tangentImpulseFactorInv2, m_contactTangent2, lower_limit, upper_limit, deltaV_rel);
+		}
+															 
+
+		if (!m_collideStatic)
+		{
+			// std::cout << "m_contactTangent: " << m_contactTangent[0] << "\t"  << m_contactTangent[1] << "\t"  << m_contactTangent[2] << "\n";
+			// std::cout << "deltaV_rel_tangent: " << deltaV_rel_tangent << '\n';
+			// std::cout << "deltaImpulseTangent: " << deltaImpulse_tangent << '\n';
+			// std::cout << "m_appliedTangentImpulse: " << m_appliedTangentImpulse << '\n';
+		}
+	}
+
+	// get the total impulse vector
+	btVector3 impulse_normal = deltaImpulse * m_contactNormalA;
+	btVector3 impulse_tangent = deltaImpulse_tangent * (-m_contactTangent);
+	btVector3 impulse_tangent2 = deltaImpulse_tangent2 * (-m_contactTangent2);
+	btVector3 impulse = impulse_normal + impulse_tangent + impulse_tangent2;
+
+	applyImpulse(impulse);
+	
+	// apply impulse to the rigid/multibodies involved and change their velocities
+	if (!m_collideStatic)
+	{
+		// std::cout << "linear_component: " << m_linearComponentNormal[0] << '\t'
+		// 																	<< m_linearComponentNormal[1] << '\t'
+		// 																	<< m_linearComponentNormal[2] << '\n';
+		// std::cout << "angular_component: " << m_angularComponentNormal[0] << '\t'
+		// 																	<< m_angularComponentNormal[1] << '\t'
+		// 																	<< m_angularComponentNormal[2] << '\n';
+
+		if (!m_collideMultibody)		// collision with rigid body
+		{
+			// std::cout << "rigid impulse applied!!\n";
+			// std::cout << "delta Linear: " << m_solverBody->getDeltaLinearVelocity()[0] << '\t'
+			// << m_solverBody->getDeltaLinearVelocity()[1] << '\t'
+			// 	<< m_solverBody->getDeltaLinearVelocity()[2] << '\n';
+			// std::cout << "delta Angular: " << m_solverBody->getDeltaAngularVelocity()[0] << '\t'
+			// << m_solverBody->getDeltaAngularVelocity()[1] << '\t'
+			// 	<< m_solverBody->getDeltaAngularVelocity()[2] << '\n';
+
+			m_solverBody->internalApplyImpulse(m_linearComponentNormal, m_angularComponentNormal, deltaImpulse);
+			m_solverBody->internalApplyImpulse(m_linearComponentTangent, m_angularComponentTangent, deltaImpulse_tangent);
+
+			// std::cout << "after\n";
+			// std::cout << "rigid impulse applied!!\n";
+			// std::cout << "delta Linear: " << m_solverBody->getDeltaLinearVelocity()[0] << '\t'
+			// << m_solverBody->getDeltaLinearVelocity()[1] << '\t'
+			// 	<< m_solverBody->getDeltaLinearVelocity()[2] << '\n';
+			// std::cout << "delta Angular: " << m_solverBody->getDeltaAngularVelocity()[0] << '\t'
+			// << m_solverBody->getDeltaAngularVelocity()[1] << '\t'
+			// 	<< m_solverBody->getDeltaAngularVelocity()[2] << '\n';
+		}
+		else		// collision with multibody
+		{
+			btMultiBodyLinkCollider* multibodyLinkCol = 0;
+			multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(m_contact->m_cti.m_colObj);
+			if (multibodyLinkCol)
+			{
+				const btScalar* deltaV_normal = &m_contact->jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+				// apply normal component of the impulse
+				multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_normal, -deltaImpulse);
+				
+				// const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+				// std::cout << "deltaV_normal: ";
+				// for (int i = 0; i < ndof; ++i)
+				// {
+				// 	std::cout << i << "\t" << deltaV_normal[i] << '\n';
+				// }
+
+				if (impulse_tangent.norm() > SIMD_EPSILON)
+				{
+					// apply tangential component of the impulse
+					const btScalar* deltaV_t1 = &m_contact->jacobianData_t1.m_deltaVelocitiesUnitImpulse[0];
+					multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_t1, deltaImpulse_tangent);
+					const btScalar* deltaV_t2 = &m_contact->jacobianData_t2.m_deltaVelocitiesUnitImpulse[0];
+					multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_t2, deltaImpulse_tangent2);
+				}
+			}
+		}
+	}
+	return residualSquare;
+}
+
+void btReducedDeformableRigidContactConstraint::calculateTangentialImpulse(btScalar& deltaImpulse_tangent, 
+																		 																			 btScalar& appliedImpulse, 
+																																					 const btScalar rhs_tangent,
+																																					 const btScalar tangentImpulseFactorInv,
+																																					 const btVector3& tangent,
+																		 																			 const btScalar lower_limit,
+																																					 const btScalar upper_limit,
+																																					 const btVector3& deltaV_rel)
+{
+	btScalar deltaV_rel_tangent = btDot(deltaV_rel, tangent);
+	btScalar impulse_changed = deltaV_rel_tangent * tangentImpulseFactorInv;
+	deltaImpulse_tangent = rhs_tangent - m_cfm_friction * appliedImpulse - impulse_changed;
+
+	btScalar sum = appliedImpulse + deltaImpulse_tangent;
+	if (sum > upper_limit)
+	{
+		deltaImpulse_tangent = upper_limit - appliedImpulse;
+		appliedImpulse = upper_limit;
+	}
+	else if (sum < lower_limit)
+	{
+		deltaImpulse_tangent = lower_limit - appliedImpulse;
+		appliedImpulse = lower_limit;
+	}
+	else
+	{
+		appliedImpulse = sum;
+	}
+}
+
+// ================= node vs rigid constraints ===================
+btReducedDeformableNodeRigidContactConstraint::btReducedDeformableNodeRigidContactConstraint(
+  btReducedDeformableBody* rsb, 
+  const btSoftBody::DeformableNodeRigidContact& contact, 
+  const btContactSolverInfo& infoGlobal,
+	btScalar dt)
+  : m_node(contact.m_node), btReducedDeformableRigidContactConstraint(rsb, contact, infoGlobal, dt)
+{
+	m_contactNormalA = contact.m_cti.m_normal;
+  m_contactNormalB = -contact.m_cti.m_normal;
+
+	if (contact.m_node->index < rsb->m_nodes.size())
+	{
+		m_nodeQueryIndex = contact.m_node->index;
+	}
+	else
+	{
+		m_nodeQueryIndex = m_node->index - rsb->m_nodeIndexOffset;
+	}
+
+	if (m_contact->m_cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+	{
+		m_relPosA = contact.m_c1;
+	}
+	else
+	{
+		m_relPosA = btVector3(0,0,0);
+	}
+	m_relPosB = m_node->m_x - m_rsb->getRigidTransform().getOrigin();
+
+	if (m_collideStatic)		// colliding with static object, only consider reduced deformable body's impulse factor
+	{
+		m_impulseFactor = m_rsb->getImpulseFactor(m_nodeQueryIndex);
+	}
+	else		// colliding with dynamic object, consider both reduced deformable and rigid body's impulse factors
+	{
+		m_impulseFactor = m_rsb->getImpulseFactor(m_nodeQueryIndex) + contact.m_c0;
+	}
+
+	m_normalImpulseFactor = (m_impulseFactor * m_contactNormalA).dot(m_contactNormalA);
+	m_tangentImpulseFactor = 0;
+
+	warmStarting();
+}
+
+void btReducedDeformableNodeRigidContactConstraint::warmStarting()
+{
+	btVector3 va = getVa();
+	btVector3 vb = getVb();
+	m_bufferVelocityA = va;
+	m_bufferVelocityB = vb;
+
+	// we define the (+) direction of errors to be the outward surface normal of the rigid object
+	btVector3 v_rel = vb - va;
+	// get tangent direction of the relative velocity
+	btVector3 v_tangent = v_rel - v_rel.dot(m_contactNormalA) * m_contactNormalA;
+	if (v_tangent.norm() < SIMD_EPSILON)
+	{
+		m_contactTangent = btVector3(0, 0, 0);
+		// tangent impulse factor
+		m_tangentImpulseFactor = 0;
+		m_tangentImpulseFactorInv = 0;
+	}
+	else
+	{
+		if (!m_collideMultibody)
+		{
+			m_contactTangent = v_tangent.normalized();
+			m_contactTangent2.setZero();
+			// tangent impulse factor 1
+			m_tangentImpulseFactor = (m_impulseFactor * m_contactTangent).dot(m_contactTangent);
+			m_tangentImpulseFactorInv = btScalar(1) / m_tangentImpulseFactor;
+			// tangent impulse factor 2
+			m_tangentImpulseFactor2 = 0;
+			m_tangentImpulseFactorInv2 = 0;
+		}
+		else	// multibody requires 2 contact directions
+		{
+			m_contactTangent = m_contact->t1;
+			m_contactTangent2 = m_contact->t2;
+
+			// tangent impulse factor 1
+			m_tangentImpulseFactor = (m_impulseFactor * m_contactTangent).dot(m_contactTangent);
+			m_tangentImpulseFactorInv = btScalar(1) / m_tangentImpulseFactor;
+			// tangent impulse factor 2
+			m_tangentImpulseFactor2 = (m_impulseFactor * m_contactTangent2).dot(m_contactTangent2);
+			m_tangentImpulseFactorInv2 = btScalar(1) / m_tangentImpulseFactor2;
+		}
+	}
+
+
+	// initial guess for normal impulse
+	{
+		btScalar velocity_error = btDot(v_rel, m_contactNormalA);	// magnitude of relative velocity
+		btScalar position_error = 0;
+		if (m_penetration > 0)
+		{
+			velocity_error += m_penetration / m_dt;
+		}
+		else
+		{
+			// add penetration correction vel
+			position_error = m_penetration * m_erp / m_dt;
+		}
+		// get the initial estimate of impulse magnitude to be applied
+		m_rhs = -(velocity_error + position_error) / m_normalImpulseFactor;
+	}
+
+	// initial guess for tangential impulse
+	{
+		btScalar velocity_error = btDot(v_rel, m_contactTangent);
+		m_rhs_tangent = velocity_error * m_tangentImpulseFactorInv;
+
+		if (m_collideMultibody)
+		{
+			btScalar velocity_error2 = btDot(v_rel, m_contactTangent2);
+			m_rhs_tangent2 = velocity_error2 * m_tangentImpulseFactorInv2;
+		}
+	}
+
+	// warm starting
+	// applyImpulse(m_rhs * m_contactNormalA);
+	// if (!m_collideStatic)
+	// {
+	// 	const btSoftBody::sCti& cti = m_contact->m_cti;
+	// 	if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+	// 	{
+	// 		m_solverBody->internalApplyImpulse(m_linearComponentNormal, m_angularComponentNormal, -m_rhs);
+	// 	}
+	// }
+}
+
+btVector3 btReducedDeformableNodeRigidContactConstraint::getVb() const
+{
+	return m_node->m_v;
+}
+
+btVector3 btReducedDeformableNodeRigidContactConstraint::getDeltaVa() const
+{
+	btVector3 deltaVa(0, 0, 0);
+	if (!m_collideStatic)
+	{
+		if (!m_collideMultibody)		// for rigid body
+		{
+			deltaVa = m_solverBody->internalGetDeltaLinearVelocity() + m_solverBody->internalGetDeltaAngularVelocity().cross(m_relPosA);
+		}
+		else		// for multibody
+		{
+			btMultiBodyLinkCollider* multibodyLinkCol = 0;
+			multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(m_contact->m_cti.m_colObj);
+			if (multibodyLinkCol)
+			{
+				const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+				const btScalar* J_n = &m_contact->jacobianData_normal.m_jacobians[0];
+				const btScalar* J_t1 = &m_contact->jacobianData_t1.m_jacobians[0];
+				const btScalar* J_t2 = &m_contact->jacobianData_t2.m_jacobians[0];
+				const btScalar* local_dv = multibodyLinkCol->m_multiBody->getDeltaVelocityVector();
+				// add in the normal component of the va
+				btScalar vel = 0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += local_dv[k] * J_n[k];
+				}
+				deltaVa = m_contact->m_cti.m_normal * vel;
+				
+				// add in the tangential components of the va
+				vel = 0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += local_dv[k] * J_t1[k];
+				}
+				deltaVa += m_contact->t1 * vel;
+
+				vel = 0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += local_dv[k] * J_t2[k];
+				}
+				deltaVa += m_contact->t2 * vel;
+			}
+		}
+	}
+	return deltaVa;
+}
+
+btVector3 btReducedDeformableNodeRigidContactConstraint::getDeltaVb() const
+{	
+	// std::cout << "node: " << m_node->index << '\n';
+	return m_rsb->internalComputeNodeDeltaVelocity(m_rsb->getInterpolationWorldTransform(), m_nodeQueryIndex);
+}
+
+btVector3 btReducedDeformableNodeRigidContactConstraint::getSplitVb() const
+{
+	return m_node->m_splitv;
+}
+
+btVector3 btReducedDeformableNodeRigidContactConstraint::getDv(const btSoftBody::Node* node) const
+{
+	return m_total_normal_dv + m_total_tangent_dv;
+}
+
+void btReducedDeformableNodeRigidContactConstraint::applyImpulse(const btVector3& impulse)
+{
+  m_rsb->internalApplyFullSpaceImpulse(impulse, m_relPosB, m_nodeQueryIndex, m_dt);
+	// m_rsb->applyFullSpaceImpulse(impulse, m_relPosB, m_node->index, m_dt);
+	// m_rsb->mapToFullVelocity(m_rsb->getInterpolationWorldTransform());
+	// if (!m_collideStatic)
+	// {
+	// 	// std::cout << "impulse applied: " << impulse[0] << '\t' << impulse[1] << '\t' << impulse[2] << '\n';
+	// 	// std::cout << "node: " << m_node->index << " vel: " << m_node->m_v[0] << '\t' << m_node->m_v[1] << '\t' << m_node->m_v[2] << '\n';
+	// 	btVector3 v_after = getDeltaVb() + m_node->m_v;
+	// 	// std::cout << "vel after: " << v_after[0] << '\t' << v_after[1] << '\t' << v_after[2] << '\n';
+	// }
+	// std::cout << "node: " << m_node->index << " pos: " << m_node->m_x[0] << '\t' << m_node->m_x[1] << '\t' << m_node->m_x[2] << '\n';
+}
+
+// ================= face vs rigid constraints ===================
+btReducedDeformableFaceRigidContactConstraint::btReducedDeformableFaceRigidContactConstraint(
+  btReducedDeformableBody* rsb, 
+  const btSoftBody::DeformableFaceRigidContact& contact, 
+  const btContactSolverInfo& infoGlobal,
+	btScalar dt, 
+  bool useStrainLimiting)
+  : m_face(contact.m_face), m_useStrainLimiting(useStrainLimiting), btReducedDeformableRigidContactConstraint(rsb, contact, infoGlobal, dt)
+{}
+
+btVector3 btReducedDeformableFaceRigidContactConstraint::getVb() const
+{
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	btVector3 vb = m_face->m_n[0]->m_v * contact->m_bary[0] + m_face->m_n[1]->m_v * contact->m_bary[1] + m_face->m_n[2]->m_v * contact->m_bary[2];
+	return vb;
+}
+
+btVector3 btReducedDeformableFaceRigidContactConstraint::getSplitVb() const
+{
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	btVector3 vb = (m_face->m_n[0]->m_splitv) * contact->m_bary[0] + (m_face->m_n[1]->m_splitv) * contact->m_bary[1] + (m_face->m_n[2]->m_splitv) * contact->m_bary[2];
+	return vb;
+}
+
+btVector3 btReducedDeformableFaceRigidContactConstraint::getDv(const btSoftBody::Node* node) const
+{
+	btVector3 face_dv = m_total_normal_dv + m_total_tangent_dv;
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	if (m_face->m_n[0] == node)
+	{
+		return face_dv * contact->m_weights[0];
+	}
+	if (m_face->m_n[1] == node)
+	{
+		return face_dv * contact->m_weights[1];
+	}
+	btAssert(node == m_face->m_n[2]);
+	return face_dv * contact->m_weights[2];
+}
+
+void btReducedDeformableFaceRigidContactConstraint::applyImpulse(const btVector3& impulse)
+{
+  //
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.h
new file mode 100644
index 0000000..10d0938
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.h
@@ -0,0 +1,194 @@
+#include "../btDeformableContactConstraint.h"
+#include "btReducedDeformableBody.h"
+
+// ================= static constraints ===================
+class btReducedDeformableStaticConstraint : public btDeformableStaticConstraint
+{
+ public:
+  btReducedDeformableBody* m_rsb;
+  btScalar m_dt;
+  btVector3 m_ri;
+  btVector3 m_targetPos;
+  btVector3 m_impulseDirection;
+  btMatrix3x3 m_impulseFactorMatrix;
+  btScalar m_impulseFactor;
+  btScalar m_rhs;
+  btScalar m_appliedImpulse;
+  btScalar m_erp;
+
+  btReducedDeformableStaticConstraint(btReducedDeformableBody* rsb, 
+                                      btSoftBody::Node* node,
+                                      const btVector3& ri,
+                                      const btVector3& x0,
+                                      const btVector3& dir,
+                                      const btContactSolverInfo& infoGlobal,
+                                      btScalar dt);
+	// btReducedDeformableStaticConstraint(const btReducedDeformableStaticConstraint& other);
+  btReducedDeformableStaticConstraint() {}
+  virtual ~btReducedDeformableStaticConstraint() {}
+
+  virtual btScalar solveConstraint(const btContactSolverInfo& infoGlobal);
+  
+  // this calls reduced deformable body's applyFullSpaceImpulse
+  virtual void applyImpulse(const btVector3& impulse);
+
+  btVector3 getDeltaVa() const;
+
+  // virtual void applySplitImpulse(const btVector3& impulse) {}
+};
+
+// ================= base contact constraints ===================
+class btReducedDeformableRigidContactConstraint : public btDeformableRigidContactConstraint
+{
+ public:
+  bool m_collideStatic;     // flag for collision with static object
+  bool m_collideMultibody;  // flag for collision with multibody
+
+  int m_nodeQueryIndex;
+  int m_solverBodyId;       // for debugging
+
+  btReducedDeformableBody* m_rsb;
+  btSolverBody* m_solverBody;
+  btScalar m_dt;
+
+  btScalar m_appliedNormalImpulse;
+  btScalar m_appliedTangentImpulse;
+  btScalar m_appliedTangentImpulse2;
+  btScalar m_normalImpulseFactor;
+  btScalar m_tangentImpulseFactor;
+  btScalar m_tangentImpulseFactor2;
+  btScalar m_tangentImpulseFactorInv;
+  btScalar m_tangentImpulseFactorInv2;
+  btScalar m_rhs;
+  btScalar m_rhs_tangent;
+  btScalar m_rhs_tangent2;
+  
+  btScalar m_cfm;
+  btScalar m_cfm_friction;
+  btScalar m_erp;
+  btScalar m_erp_friction;
+  btScalar m_friction;
+
+  btVector3 m_contactNormalA;     // surface normal for rigid body (opposite direction as impulse)
+  btVector3 m_contactNormalB;     // surface normal for reduced deformable body (opposite direction as impulse)
+  btVector3 m_contactTangent;     // tangential direction of the relative velocity
+  btVector3 m_contactTangent2;    // 2nd tangential direction of the relative velocity
+  btVector3 m_relPosA;            // relative position of the contact point for A (rigid)
+  btVector3 m_relPosB;            // relative position of the contact point for B
+  btMatrix3x3 m_impulseFactor;    // total impulse matrix
+
+  btVector3 m_bufferVelocityA;    // velocity at the beginning of the iteration
+  btVector3 m_bufferVelocityB;
+  btVector3 m_linearComponentNormal;    // linear components for the solver body
+  btVector3 m_angularComponentNormal;   // angular components for the solver body
+  // since 2nd contact direction only applies to multibody, these components will never be used
+  btVector3 m_linearComponentTangent;
+  btVector3 m_angularComponentTangent;
+
+  btReducedDeformableRigidContactConstraint(btReducedDeformableBody* rsb, 
+                                            const btSoftBody::DeformableRigidContact& c, 
+                                            const btContactSolverInfo& infoGlobal,
+                                            btScalar dt);
+	// btReducedDeformableRigidContactConstraint(const btReducedDeformableRigidContactConstraint& other);
+  btReducedDeformableRigidContactConstraint() {}
+  virtual ~btReducedDeformableRigidContactConstraint() {}
+
+  void setSolverBody(const int bodyId, btSolverBody& solver_body);
+
+  virtual void warmStarting() {}
+
+  virtual btScalar solveConstraint(const btContactSolverInfo& infoGlobal);
+
+  void calculateTangentialImpulse(btScalar& deltaImpulse_tangent, 
+                                  btScalar& appliedImpulse, 
+                                  const btScalar rhs_tangent,
+                                  const btScalar tangentImpulseFactorInv,
+                                  const btVector3& tangent,
+                                  const btScalar lower_limit,
+                                  const btScalar upper_limit,
+                                  const btVector3& deltaV_rel);
+
+  virtual void applyImpulse(const btVector3& impulse) {}
+
+  virtual void applySplitImpulse(const btVector3& impulse) {} // TODO: may need later
+
+  virtual btVector3 getVa() const;
+  virtual btVector3 getDeltaVa() const = 0;
+  virtual btVector3 getDeltaVb() const = 0;
+};
+
+// ================= node vs rigid constraints ===================
+class btReducedDeformableNodeRigidContactConstraint : public btReducedDeformableRigidContactConstraint
+{
+ public:
+  btSoftBody::Node* m_node;
+
+  btReducedDeformableNodeRigidContactConstraint(btReducedDeformableBody* rsb, 
+                                                const btSoftBody::DeformableNodeRigidContact& contact, 
+                                                const btContactSolverInfo& infoGlobal,
+                                                btScalar dt);
+	// btReducedDeformableNodeRigidContactConstraint(const btReducedDeformableNodeRigidContactConstraint& other);
+  btReducedDeformableNodeRigidContactConstraint() {}
+  virtual ~btReducedDeformableNodeRigidContactConstraint() {}
+
+  virtual void warmStarting();
+
+  // get the velocity of the deformable node in contact
+	virtual btVector3 getVb() const;
+
+  // get the velocity change of the rigid body
+  virtual btVector3 getDeltaVa() const;
+
+  // get velocity change of the node in contat
+  virtual btVector3 getDeltaVb() const;
+
+	// get the split impulse velocity of the deformable face at the contact point
+	virtual btVector3 getSplitVb() const;
+
+	// get the velocity change of the input soft body node in the constraint
+	virtual btVector3 getDv(const btSoftBody::Node*) const;
+
+	// cast the contact to the desired type
+	const btSoftBody::DeformableNodeRigidContact* getContact() const
+	{
+		return static_cast<const btSoftBody::DeformableNodeRigidContact*>(m_contact);
+	}
+  
+  // this calls reduced deformable body's applyFullSpaceImpulse
+  virtual void applyImpulse(const btVector3& impulse);
+};
+
+// ================= face vs rigid constraints ===================
+class btReducedDeformableFaceRigidContactConstraint : public btReducedDeformableRigidContactConstraint
+{
+ public:
+  btSoftBody::Face* m_face;
+	bool m_useStrainLimiting;
+
+  btReducedDeformableFaceRigidContactConstraint(btReducedDeformableBody* rsb, 
+                                                const btSoftBody::DeformableFaceRigidContact& contact, 
+                                                const btContactSolverInfo& infoGlobal,
+                                                btScalar dt, 
+                                                bool useStrainLimiting);
+	// btReducedDeformableFaceRigidContactConstraint(const btReducedDeformableFaceRigidContactConstraint& other);
+  btReducedDeformableFaceRigidContactConstraint() {}
+  virtual ~btReducedDeformableFaceRigidContactConstraint() {}
+
+  // get the velocity of the deformable face at the contact point
+	virtual btVector3 getVb() const;
+
+	// get the split impulse velocity of the deformable face at the contact point
+	virtual btVector3 getSplitVb() const;
+
+	// get the velocity change of the input soft body node in the constraint
+	virtual btVector3 getDv(const btSoftBody::Node*) const;
+
+	// cast the contact to the desired type
+	const btSoftBody::DeformableFaceRigidContact* getContact() const
+	{
+		return static_cast<const btSoftBody::DeformableFaceRigidContact*>(m_contact);
+	}
+
+  // this calls reduced deformable body's applyFullSpaceImpulse
+  virtual void applyImpulse(const btVector3& impulse);
+};
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/CMakeLists.txt b/dali-physics/third-party/bullet3/src/BulletSoftBody/CMakeLists.txt
new file mode 100644
index 0000000..c12eef5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/CMakeLists.txt
@@ -0,0 +1,107 @@
+
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/src
+
+)
+
+#SUBDIRS( Solvers )
+
+SET(BulletSoftBody_SRCS
+	btSoftBody.cpp
+	btSoftBodyConcaveCollisionAlgorithm.cpp
+	btSoftBodyHelpers.cpp
+	btSoftBodyRigidBodyCollisionConfiguration.cpp
+	btSoftRigidCollisionAlgorithm.cpp
+	btSoftRigidDynamicsWorld.cpp
+	btSoftMultiBodyDynamicsWorld.cpp
+	btSoftSoftCollisionAlgorithm.cpp
+	btDefaultSoftBodySolver.cpp
+
+	btDeformableBackwardEulerObjective.cpp
+	btDeformableBodySolver.cpp
+	btDeformableMultiBodyConstraintSolver.cpp
+	btDeformableContactProjection.cpp
+	btDeformableMultiBodyDynamicsWorld.cpp
+	btDeformableContactConstraint.cpp
+	poly34.cpp
+
+	BulletReducedDeformableBody/btReducedDeformableBody.cpp
+	BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp
+	BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp
+	BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp
+)
+
+
+SET(BulletSoftBody_HDRS
+	btSoftBody.h
+	btSoftBodyData.h
+	btSoftBodyConcaveCollisionAlgorithm.h
+	btSoftBodyHelpers.h
+	btSoftBodyRigidBodyCollisionConfiguration.h
+	btSoftRigidCollisionAlgorithm.h
+	btSoftRigidDynamicsWorld.h
+	btSoftMultiBodyDynamicsWorld.h
+	btSoftSoftCollisionAlgorithm.h
+	btSparseSDF.h
+
+	btSoftBodySolvers.h
+	btDefaultSoftBodySolver.h
+	
+	btCGProjection.h
+	btConjugateGradient.h
+	btConjugateResidual.h
+	btDeformableGravityForce.h
+	btDeformableMassSpringForce.h
+	btDeformableCorotatedForce.h
+	btDeformableNeoHookeanForce.h
+	btDeformableLinearElasticityForce.h
+	btDeformableLagrangianForce.h
+	btPreconditioner.h
+
+	btDeformableBackwardEulerObjective.h
+	btDeformableBodySolver.h
+	btDeformableMultiBodyConstraintSolver.h
+	btDeformableContactProjection.h
+	btDeformableMultiBodyDynamicsWorld.h
+	btDeformableContactConstraint.h
+	btKrylovSolver.h
+	poly34.h
+
+	btSoftBodySolverVertexBuffer.h
+
+	BulletReducedDeformableBody/btReducedDeformableBody.h
+	BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h
+	BulletReducedDeformableBody/btReducedDeformableBodySolver.h
+	BulletReducedDeformableBody/btReducedDeformableContactConstraint.h
+)
+
+
+
+ADD_LIBRARY(BulletSoftBody  ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS})
+SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES SOVERSION ${BULLET_VERSION})
+IF (BUILD_SHARED_LIBS)
+	TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics)
+ENDIF (BUILD_SHARED_LIBS)
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS BulletSoftBody DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			INSTALL(TARGETS BulletSoftBody RUNTIME DESTINATION bin
+							LIBRARY DESTINATION lib${LIB_SUFFIX}
+							ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h
new file mode 100644
index 0000000..01c7e93
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h
@@ -0,0 +1,45 @@
+//
+//  DeformableBodyInplaceSolverIslandCallback.h
+//  BulletSoftBody
+//
+//  Created by Xuchen Han on 12/16/19.
+//
+
+#ifndef DeformableBodyInplaceSolverIslandCallback_h
+#define DeformableBodyInplaceSolverIslandCallback_h
+
+struct DeformableBodyInplaceSolverIslandCallback : public MultiBodyInplaceSolverIslandCallback
+{
+	btDeformableMultiBodyConstraintSolver* m_deformableSolver;
+
+	DeformableBodyInplaceSolverIslandCallback(btDeformableMultiBodyConstraintSolver* solver,
+											  btDispatcher* dispatcher)
+		: MultiBodyInplaceSolverIslandCallback(solver, dispatcher), m_deformableSolver(solver)
+	{
+	}
+
+	virtual void processConstraints(int islandId = -1)
+	{
+		btCollisionObject** bodies = m_bodies.size() ? &m_bodies[0] : 0;
+		btCollisionObject** softBodies = m_softBodies.size() ? &m_softBodies[0] : 0;
+		btPersistentManifold** manifold = m_manifolds.size() ? &m_manifolds[0] : 0;
+		btTypedConstraint** constraints = m_constraints.size() ? &m_constraints[0] : 0;
+		btMultiBodyConstraint** multiBodyConstraints = m_multiBodyConstraints.size() ? &m_multiBodyConstraints[0] : 0;
+
+		//printf("mb contacts = %d, mb constraints = %d\n", mbContacts, m_multiBodyConstraints.size());
+
+		m_deformableSolver->solveDeformableBodyGroup(bodies, m_bodies.size(), softBodies, m_softBodies.size(), manifold, m_manifolds.size(), constraints, m_constraints.size(), multiBodyConstraints, m_multiBodyConstraints.size(), *m_solverInfo, m_debugDrawer, m_dispatcher);
+		if (m_bodies.size() && (m_solverInfo->m_reportSolverAnalytics & 1))
+		{
+			m_deformableSolver->m_analyticsData.m_islandId = islandId;
+			m_islandAnalyticsData.push_back(m_solver->m_analyticsData);
+		}
+		m_bodies.resize(0);
+		m_softBodies.resize(0);
+		m_manifolds.resize(0);
+		m_constraints.resize(0);
+		m_multiBodyConstraints.resize(0);
+	}
+};
+
+#endif /* DeformableBodyInplaceSolverIslandCallback_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btCGProjection.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btCGProjection.h
new file mode 100644
index 0000000..e059706
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btCGProjection.h
@@ -0,0 +1,104 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_CG_PROJECTION_H
+#define BT_CG_PROJECTION_H
+
+#include "btSoftBody.h"
+#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h"
+
+struct DeformableContactConstraint
+{
+	const btSoftBody::Node* m_node;
+	btAlignedObjectArray<const btSoftBody::RContact*> m_contact;
+	btAlignedObjectArray<btVector3> m_total_normal_dv;
+	btAlignedObjectArray<btVector3> m_total_tangent_dv;
+	btAlignedObjectArray<bool> m_static;
+	btAlignedObjectArray<bool> m_can_be_dynamic;
+
+	DeformableContactConstraint(const btSoftBody::RContact& rcontact) : m_node(rcontact.m_node)
+	{
+		append(rcontact);
+	}
+
+	DeformableContactConstraint() : m_node(NULL)
+	{
+		m_contact.push_back(NULL);
+	}
+
+	void append(const btSoftBody::RContact& rcontact)
+	{
+		m_contact.push_back(&rcontact);
+		m_total_normal_dv.push_back(btVector3(0, 0, 0));
+		m_total_tangent_dv.push_back(btVector3(0, 0, 0));
+		m_static.push_back(false);
+		m_can_be_dynamic.push_back(true);
+	}
+
+	void replace(const btSoftBody::RContact& rcontact)
+	{
+		m_contact.clear();
+		m_total_normal_dv.clear();
+		m_total_tangent_dv.clear();
+		m_static.clear();
+		m_can_be_dynamic.clear();
+		append(rcontact);
+	}
+
+	~DeformableContactConstraint()
+	{
+	}
+};
+
+class btCGProjection
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	typedef btAlignedObjectArray<btAlignedObjectArray<btVector3> > TVArrayStack;
+	typedef btAlignedObjectArray<btAlignedObjectArray<btScalar> > TArrayStack;
+	btAlignedObjectArray<btSoftBody*>& m_softBodies;
+	const btScalar& m_dt;
+	// map from node indices to node pointers
+	const btAlignedObjectArray<btSoftBody::Node*>* m_nodes;
+
+	btCGProjection(btAlignedObjectArray<btSoftBody*>& softBodies, const btScalar& dt)
+		: m_softBodies(softBodies), m_dt(dt)
+	{
+	}
+
+	virtual ~btCGProjection()
+	{
+	}
+
+	// apply the constraints
+	virtual void project(TVStack& x) = 0;
+
+	virtual void setConstraints() = 0;
+
+	// update the constraints
+	virtual btScalar update() = 0;
+
+	virtual void reinitialize(bool nodeUpdated)
+	{
+	}
+
+	virtual void setIndices(const btAlignedObjectArray<btSoftBody::Node*>* nodes)
+	{
+		m_nodes = nodes;
+	}
+};
+
+#endif /* btCGProjection_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btConjugateGradient.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btConjugateGradient.h
new file mode 100644
index 0000000..bcd5e6b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btConjugateGradient.h
@@ -0,0 +1,117 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_CONJUGATE_GRADIENT_H
+#define BT_CONJUGATE_GRADIENT_H
+#include "btKrylovSolver.h"
+template <class MatrixX>
+class btConjugateGradient : public btKrylovSolver<MatrixX>
+{
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	typedef btKrylovSolver<MatrixX> Base;
+	TVStack r, p, z, temp;
+
+public:
+	btConjugateGradient(const int max_it_in)
+		: btKrylovSolver<MatrixX>(max_it_in, SIMD_EPSILON)
+	{
+	}
+
+	virtual ~btConjugateGradient() {}
+
+	// return the number of iterations taken
+	int solve(MatrixX& A, TVStack& x, const TVStack& b, bool verbose = false)
+	{
+		BT_PROFILE("CGSolve");
+		btAssert(x.size() == b.size());
+		reinitialize(b);
+		temp = b;
+		A.project(temp);
+		p = temp;
+		A.precondition(p, z);
+		btScalar d0 = this->dot(z, temp);
+		d0 = btMin(btScalar(1), d0);
+		// r = b - A * x --with assigned dof zeroed out
+		A.multiply(x, temp);
+		r = this->sub(b, temp);
+		A.project(r);
+		// z = M^(-1) * r
+		A.precondition(r, z);
+		A.project(z);
+		btScalar r_dot_z = this->dot(z, r);
+		if (r_dot_z <= Base::m_tolerance * d0)
+		{
+			if (verbose)
+			{
+				std::cout << "Iteration = 0" << std::endl;
+				std::cout << "Two norm of the residual = " << r_dot_z << std::endl;
+			}
+			return 0;
+		}
+		p = z;
+		btScalar r_dot_z_new = r_dot_z;
+		for (int k = 1; k <= Base::m_maxIterations; k++)
+		{
+			// temp = A*p
+			A.multiply(p, temp);
+			A.project(temp);
+			if (this->dot(p, temp) < 0)
+			{
+				if (verbose)
+					std::cout << "Encountered negative direction in CG!" << std::endl;
+				if (k == 1)
+				{
+					x = b;
+				}
+				return k;
+			}
+			// alpha = r^T * z / (p^T * A * p)
+			btScalar alpha = r_dot_z_new / this->dot(p, temp);
+			//  x += alpha * p;
+			this->multAndAddTo(alpha, p, x);
+			//  r -= alpha * temp;
+			this->multAndAddTo(-alpha, temp, r);
+			// z = M^(-1) * r
+			A.precondition(r, z);
+			r_dot_z = r_dot_z_new;
+			r_dot_z_new = this->dot(r, z);
+			if (r_dot_z_new < Base::m_tolerance * d0)
+			{
+				if (verbose)
+				{
+					std::cout << "ConjugateGradient iterations " << k << " residual = " << r_dot_z_new << std::endl;
+				}
+				return k;
+			}
+
+			btScalar beta = r_dot_z_new / r_dot_z;
+			p = this->multAndAdd(beta, p, z);
+		}
+		if (verbose)
+		{
+			std::cout << "ConjugateGradient max iterations reached " << Base::m_maxIterations << " error = " << r_dot_z_new << std::endl;
+		}
+		return Base::m_maxIterations;
+	}
+
+	void reinitialize(const TVStack& b)
+	{
+		r.resize(b.size());
+		p.resize(b.size());
+		z.resize(b.size());
+		temp.resize(b.size());
+	}
+};
+#endif /* btConjugateGradient_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btConjugateResidual.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btConjugateResidual.h
new file mode 100644
index 0000000..6146120
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btConjugateResidual.h
@@ -0,0 +1,112 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_CONJUGATE_RESIDUAL_H
+#define BT_CONJUGATE_RESIDUAL_H
+#include "btKrylovSolver.h"
+
+template <class MatrixX>
+class btConjugateResidual : public btKrylovSolver<MatrixX>
+{
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	typedef btKrylovSolver<MatrixX> Base;
+	TVStack r, p, z, temp_p, temp_r, best_x;
+	// temp_r = A*r
+	// temp_p = A*p
+	// z = M^(-1) * temp_p = M^(-1) * A * p
+	btScalar best_r;
+
+public:
+	btConjugateResidual(const int max_it_in)
+		: Base(max_it_in, 1e-8)
+	{
+	}
+
+	virtual ~btConjugateResidual() {}
+
+	// return the number of iterations taken
+	int solve(MatrixX& A, TVStack& x, const TVStack& b, bool verbose = false)
+	{
+		BT_PROFILE("CRSolve");
+		btAssert(x.size() == b.size());
+		reinitialize(b);
+		// r = b - A * x --with assigned dof zeroed out
+		A.multiply(x, temp_r);  // borrow temp_r here to store A*x
+		r = this->sub(b, temp_r);
+		// z = M^(-1) * r
+		A.precondition(r, z);  // borrow z to store preconditioned r
+		r = z;
+		btScalar residual_norm = this->norm(r);
+		if (residual_norm <= Base::m_tolerance)
+		{
+			return 0;
+		}
+		p = r;
+		btScalar r_dot_Ar, r_dot_Ar_new;
+		// temp_p = A*p
+		A.multiply(p, temp_p);
+		// temp_r = A*r
+		temp_r = temp_p;
+		r_dot_Ar = this->dot(r, temp_r);
+		for (int k = 1; k <= Base::m_maxIterations; k++)
+		{
+			// z = M^(-1) * Ap
+			A.precondition(temp_p, z);
+			// alpha = r^T * A * r / (Ap)^T * M^-1 * Ap)
+			btScalar alpha = r_dot_Ar / this->dot(temp_p, z);
+			//  x += alpha * p;
+			this->multAndAddTo(alpha, p, x);
+			//  r -= alpha * z;
+			this->multAndAddTo(-alpha, z, r);
+			btScalar norm_r = this->norm(r);
+			if (norm_r < best_r)
+			{
+				best_x = x;
+				best_r = norm_r;
+				if (norm_r < Base::m_tolerance)
+				{
+					return k;
+				}
+			}
+			// temp_r = A * r;
+			A.multiply(r, temp_r);
+			r_dot_Ar_new = this->dot(r, temp_r);
+			btScalar beta = r_dot_Ar_new / r_dot_Ar;
+			r_dot_Ar = r_dot_Ar_new;
+			// p = beta*p + r;
+			p = this->multAndAdd(beta, p, r);
+			// temp_p = beta*temp_p + temp_r;
+			temp_p = this->multAndAdd(beta, temp_p, temp_r);
+		}
+		if (verbose)
+		{
+			std::cout << "ConjugateResidual max iterations reached, residual = " << best_r << std::endl;
+		}
+		x = best_x;
+		return Base::m_maxIterations;
+	}
+
+	void reinitialize(const TVStack& b)
+	{
+		r.resize(b.size());
+		p.resize(b.size());
+		z.resize(b.size());
+		temp_p.resize(b.size());
+		temp_r.resize(b.size());
+		best_x.resize(b.size());
+		best_r = SIMD_INFINITY;
+	}
+};
+#endif /* btConjugateResidual_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
new file mode 100644
index 0000000..acbf515
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
@@ -0,0 +1,146 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+
+#include "btDefaultSoftBodySolver.h"
+#include "BulletCollision/CollisionShapes/btCapsuleShape.h"
+#include "BulletSoftBody/btSoftBody.h"
+
+btDefaultSoftBodySolver::btDefaultSoftBodySolver()
+{
+	// Initial we will clearly need to update solver constants
+	// For now this is global for the cloths linked with this solver - we should probably make this body specific
+	// for performance in future once we understand more clearly when constants need to be updated
+	m_updateSolverConstants = true;
+}
+
+btDefaultSoftBodySolver::~btDefaultSoftBodySolver()
+{
+}
+
+// In this case the data is already in the soft bodies so there is no need for us to do anything
+void btDefaultSoftBodySolver::copyBackToSoftBodies(bool bMove)
+{
+}
+
+void btDefaultSoftBodySolver::optimize(btAlignedObjectArray<btSoftBody *> &softBodies, bool forceUpdate)
+{
+	m_softBodySet.copyFromArray(softBodies);
+}
+
+void btDefaultSoftBodySolver::updateSoftBodies()
+{
+	for (int i = 0; i < m_softBodySet.size(); i++)
+	{
+		btSoftBody *psb = (btSoftBody *)m_softBodySet[i];
+		if (psb->isActive())
+		{
+			psb->integrateMotion();
+		}
+	}
+}  // updateSoftBodies
+
+bool btDefaultSoftBodySolver::checkInitialized()
+{
+	return true;
+}
+
+void btDefaultSoftBodySolver::solveConstraints(btScalar solverdt)
+{
+	// Solve constraints for non-solver softbodies
+	for (int i = 0; i < m_softBodySet.size(); ++i)
+	{
+		btSoftBody *psb = static_cast<btSoftBody *>(m_softBodySet[i]);
+		if (psb->isActive())
+		{
+			psb->solveConstraints();
+		}
+	}
+}  // btDefaultSoftBodySolver::solveConstraints
+
+void btDefaultSoftBodySolver::copySoftBodyToVertexBuffer(const btSoftBody *const softBody, btVertexBufferDescriptor *vertexBuffer)
+{
+	// Currently only support CPU output buffers
+	// TODO: check for DX11 buffers. Take all offsets into the same DX11 buffer
+	// and use them together on a single kernel call if possible by setting up a
+	// per-cloth target buffer array for the copy kernel.
+
+	if (vertexBuffer->getBufferType() == btVertexBufferDescriptor::CPU_BUFFER)
+	{
+		const btAlignedObjectArray<btSoftBody::Node> &clothVertices(softBody->m_nodes);
+		int numVertices = clothVertices.size();
+
+		const btCPUVertexBufferDescriptor *cpuVertexBuffer = static_cast<btCPUVertexBufferDescriptor *>(vertexBuffer);
+		float *basePointer = cpuVertexBuffer->getBasePointer();
+
+		if (vertexBuffer->hasVertexPositions())
+		{
+			const int vertexOffset = cpuVertexBuffer->getVertexOffset();
+			const int vertexStride = cpuVertexBuffer->getVertexStride();
+			float *vertexPointer = basePointer + vertexOffset;
+
+			for (int vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex)
+			{
+				btVector3 position = clothVertices[vertexIndex].m_x;
+				*(vertexPointer + 0) = (float)position.getX();
+				*(vertexPointer + 1) = (float)position.getY();
+				*(vertexPointer + 2) = (float)position.getZ();
+				vertexPointer += vertexStride;
+			}
+		}
+		if (vertexBuffer->hasNormals())
+		{
+			const int normalOffset = cpuVertexBuffer->getNormalOffset();
+			const int normalStride = cpuVertexBuffer->getNormalStride();
+			float *normalPointer = basePointer + normalOffset;
+
+			for (int vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex)
+			{
+				btVector3 normal = clothVertices[vertexIndex].m_n;
+				*(normalPointer + 0) = (float)normal.getX();
+				*(normalPointer + 1) = (float)normal.getY();
+				*(normalPointer + 2) = (float)normal.getZ();
+				normalPointer += normalStride;
+			}
+		}
+	}
+}  // btDefaultSoftBodySolver::copySoftBodyToVertexBuffer
+
+void btDefaultSoftBodySolver::processCollision(btSoftBody *softBody, btSoftBody *otherSoftBody)
+{
+	softBody->defaultCollisionHandler(otherSoftBody);
+}
+
+// For the default solver just leave the soft body to do its collision processing
+void btDefaultSoftBodySolver::processCollision(btSoftBody *softBody, const btCollisionObjectWrapper *collisionObjectWrap)
+{
+	softBody->defaultCollisionHandler(collisionObjectWrap);
+}  // btDefaultSoftBodySolver::processCollision
+
+void btDefaultSoftBodySolver::predictMotion(btScalar timeStep)
+{
+	for (int i = 0; i < m_softBodySet.size(); ++i)
+	{
+		btSoftBody *psb = m_softBodySet[i];
+
+		if (psb->isActive())
+		{
+			psb->predictMotion(timeStep);
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.h
new file mode 100644
index 0000000..d54edca
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDefaultSoftBodySolver.h
@@ -0,0 +1,60 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_BODY_DEFAULT_SOLVER_H
+#define BT_SOFT_BODY_DEFAULT_SOLVER_H
+
+#include "BulletSoftBody/btSoftBodySolvers.h"
+#include "btSoftBodySolverVertexBuffer.h"
+struct btCollisionObjectWrapper;
+
+class btDefaultSoftBodySolver : public btSoftBodySolver
+{
+protected:
+	/** Variable to define whether we need to update solver constants on the next iteration */
+	bool m_updateSolverConstants;
+
+	btAlignedObjectArray<btSoftBody *> m_softBodySet;
+
+public:
+	btDefaultSoftBodySolver();
+
+	virtual ~btDefaultSoftBodySolver();
+
+	virtual SolverTypes getSolverType() const
+	{
+		return DEFAULT_SOLVER;
+	}
+
+	virtual bool checkInitialized();
+
+	virtual void updateSoftBodies();
+
+	virtual void optimize(btAlignedObjectArray<btSoftBody *> &softBodies, bool forceUpdate = false);
+
+	virtual void copyBackToSoftBodies(bool bMove = true);
+
+	virtual void solveConstraints(btScalar solverdt);
+
+	virtual void predictMotion(btScalar solverdt);
+
+	virtual void copySoftBodyToVertexBuffer(const btSoftBody *const softBody, btVertexBufferDescriptor *vertexBuffer);
+
+	virtual void processCollision(btSoftBody *, const btCollisionObjectWrapper *);
+
+	virtual void processCollision(btSoftBody *, btSoftBody *);
+};
+
+#endif  // #ifndef BT_ACCELERATED_SOFT_BODY_CPU_SOLVER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBackwardEulerObjective.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBackwardEulerObjective.cpp
new file mode 100644
index 0000000..2455ed2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBackwardEulerObjective.cpp
@@ -0,0 +1,299 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "btDeformableBackwardEulerObjective.h"
+#include "btPreconditioner.h"
+#include "LinearMath/btQuickprof.h"
+
+btDeformableBackwardEulerObjective::btDeformableBackwardEulerObjective(btAlignedObjectArray<btSoftBody*>& softBodies, const TVStack& backup_v)
+	: m_softBodies(softBodies), m_projection(softBodies), m_backupVelocity(backup_v), m_implicit(false)
+{
+	m_massPreconditioner = new MassPreconditioner(m_softBodies);
+	m_KKTPreconditioner = new KKTPreconditioner(m_softBodies, m_projection, m_lf, m_dt, m_implicit);
+	m_preconditioner = m_KKTPreconditioner;
+}
+
+btDeformableBackwardEulerObjective::~btDeformableBackwardEulerObjective()
+{
+	delete m_KKTPreconditioner;
+	delete m_massPreconditioner;
+}
+
+void btDeformableBackwardEulerObjective::reinitialize(bool nodeUpdated, btScalar dt)
+{
+	BT_PROFILE("reinitialize");
+	if (dt > 0)
+	{
+		setDt(dt);
+	}
+	if (nodeUpdated)
+	{
+		updateId();
+	}
+	for (int i = 0; i < m_lf.size(); ++i)
+	{
+		m_lf[i]->reinitialize(nodeUpdated);
+	}
+	btMatrix3x3 I;
+	I.setIdentity();
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			if (psb->m_nodes[j].m_im > 0)
+				psb->m_nodes[j].m_effectiveMass = I * (1.0 / psb->m_nodes[j].m_im);
+		}
+	}
+	m_projection.reinitialize(nodeUpdated);
+	//    m_preconditioner->reinitialize(nodeUpdated);
+}
+
+void btDeformableBackwardEulerObjective::setDt(btScalar dt)
+{
+	m_dt = dt;
+}
+
+void btDeformableBackwardEulerObjective::multiply(const TVStack& x, TVStack& b) const
+{
+	BT_PROFILE("multiply");
+	// add in the mass term
+	size_t counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			const btSoftBody::Node& node = psb->m_nodes[j];
+			b[counter] = (node.m_im == 0) ? btVector3(0, 0, 0) : x[counter] / node.m_im;
+			++counter;
+		}
+	}
+
+	for (int i = 0; i < m_lf.size(); ++i)
+	{
+		// add damping matrix
+		m_lf[i]->addScaledDampingForceDifferential(-m_dt, x, b);
+        // Always integrate picking force implicitly for stability.
+        if (m_implicit || m_lf[i]->getForceType() == BT_MOUSE_PICKING_FORCE)
+		{
+			m_lf[i]->addScaledElasticForceDifferential(-m_dt * m_dt, x, b);
+		}
+	}
+	int offset = m_nodes.size();
+	for (int i = offset; i < b.size(); ++i)
+	{
+		b[i].setZero();
+	}
+	// add in the lagrange multiplier terms
+
+	for (int c = 0; c < m_projection.m_lagrangeMultipliers.size(); ++c)
+	{
+		// C^T * lambda
+		const LagrangeMultiplier& lm = m_projection.m_lagrangeMultipliers[c];
+		for (int i = 0; i < lm.m_num_nodes; ++i)
+		{
+			for (int j = 0; j < lm.m_num_constraints; ++j)
+			{
+				b[lm.m_indices[i]] += x[offset + c][j] * lm.m_weights[i] * lm.m_dirs[j];
+			}
+		}
+		// C * x
+		for (int d = 0; d < lm.m_num_constraints; ++d)
+		{
+			for (int i = 0; i < lm.m_num_nodes; ++i)
+			{
+				b[offset + c][d] += lm.m_weights[i] * x[lm.m_indices[i]].dot(lm.m_dirs[d]);
+			}
+		}
+	}
+}
+
+void btDeformableBackwardEulerObjective::updateVelocity(const TVStack& dv)
+{
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			btSoftBody::Node& node = psb->m_nodes[j];
+			node.m_v = m_backupVelocity[node.index] + dv[node.index];
+		}
+	}
+}
+
+void btDeformableBackwardEulerObjective::applyForce(TVStack& force, bool setZero)
+{
+	size_t counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (!psb->isActive())
+		{
+			counter += psb->m_nodes.size();
+			continue;
+		}
+		if (m_implicit)
+		{
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				if (psb->m_nodes[j].m_im != 0)
+				{
+					psb->m_nodes[j].m_v += psb->m_nodes[j].m_effectiveMass_inv * force[counter++];
+				}
+			}
+		}
+		else
+		{
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				btScalar one_over_mass = (psb->m_nodes[j].m_im == 0) ? 0 : psb->m_nodes[j].m_im;
+				psb->m_nodes[j].m_v += one_over_mass * force[counter++];
+			}
+		}
+	}
+	if (setZero)
+	{
+		for (int i = 0; i < force.size(); ++i)
+			force[i].setZero();
+	}
+}
+
+void btDeformableBackwardEulerObjective::computeResidual(btScalar dt, TVStack& residual)
+{
+	BT_PROFILE("computeResidual");
+	// add implicit force
+	for (int i = 0; i < m_lf.size(); ++i)
+	{
+        // Always integrate picking force implicitly for stability.
+		if (m_implicit || m_lf[i]->getForceType() == BT_MOUSE_PICKING_FORCE)
+		{
+			m_lf[i]->addScaledForces(dt, residual);
+		}
+		else
+		{
+			m_lf[i]->addScaledDampingForce(dt, residual);
+		}
+	}
+	//    m_projection.project(residual);
+}
+
+btScalar btDeformableBackwardEulerObjective::computeNorm(const TVStack& residual) const
+{
+	btScalar mag = 0;
+	for (int i = 0; i < residual.size(); ++i)
+	{
+		mag += residual[i].length2();
+	}
+	return std::sqrt(mag);
+}
+
+btScalar btDeformableBackwardEulerObjective::totalEnergy(btScalar dt)
+{
+	btScalar e = 0;
+	for (int i = 0; i < m_lf.size(); ++i)
+	{
+		e += m_lf[i]->totalEnergy(dt);
+	}
+	return e;
+}
+
+void btDeformableBackwardEulerObjective::applyExplicitForce(TVStack& force)
+{
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		m_softBodies[i]->advanceDeformation();
+	}
+	if (m_implicit)
+	{
+		// apply forces except gravity force
+		btVector3 gravity;
+		for (int i = 0; i < m_lf.size(); ++i)
+		{
+			if (m_lf[i]->getForceType() == BT_GRAVITY_FORCE)
+			{
+				gravity = static_cast<btDeformableGravityForce*>(m_lf[i])->m_gravity;
+			}
+			else
+			{
+				m_lf[i]->addScaledForces(m_dt, force);
+			}
+		}
+		for (int i = 0; i < m_lf.size(); ++i)
+		{
+			m_lf[i]->addScaledHessian(m_dt);
+		}
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (psb->isActive())
+			{
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					// add gravity explicitly
+					psb->m_nodes[j].m_v += m_dt * psb->m_gravityFactor * gravity;
+				}
+			}
+		}
+	}
+	else
+	{
+		for (int i = 0; i < m_lf.size(); ++i)
+		{
+			m_lf[i]->addScaledExplicitForce(m_dt, force);
+		}
+	}
+	// calculate inverse mass matrix for all nodes
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (psb->isActive())
+		{
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				if (psb->m_nodes[j].m_im > 0)
+				{
+					psb->m_nodes[j].m_effectiveMass_inv = psb->m_nodes[j].m_effectiveMass.inverse();
+				}
+			}
+		}
+	}
+	applyForce(force, true);
+}
+
+void btDeformableBackwardEulerObjective::initialGuess(TVStack& dv, const TVStack& residual)
+{
+	size_t counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			dv[counter] = psb->m_nodes[j].m_im * residual[counter];
+			++counter;
+		}
+	}
+}
+
+//set constraints as projections
+void btDeformableBackwardEulerObjective::setConstraints(const btContactSolverInfo& infoGlobal)
+{
+	m_projection.setConstraints(infoGlobal);
+}
+
+void btDeformableBackwardEulerObjective::applyDynamicFriction(TVStack& r)
+{
+	m_projection.applyDynamicFriction(r);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBackwardEulerObjective.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBackwardEulerObjective.h
new file mode 100644
index 0000000..60b6fe3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBackwardEulerObjective.h
@@ -0,0 +1,204 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_BACKWARD_EULER_OBJECTIVE_H
+#define BT_BACKWARD_EULER_OBJECTIVE_H
+//#include "btConjugateGradient.h"
+#include "btDeformableLagrangianForce.h"
+#include "btDeformableMassSpringForce.h"
+#include "btDeformableGravityForce.h"
+#include "btDeformableCorotatedForce.h"
+#include "btDeformableMousePickingForce.h"
+#include "btDeformableLinearElasticityForce.h"
+#include "btDeformableNeoHookeanForce.h"
+#include "btDeformableContactProjection.h"
+#include "btPreconditioner.h"
+// #include "btDeformableMultiBodyDynamicsWorld.h"
+#include "LinearMath/btQuickprof.h"
+
+class btDeformableBackwardEulerObjective
+{
+public:
+	enum _
+	{
+		Mass_preconditioner,
+		KKT_preconditioner
+	};
+
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btScalar m_dt;
+	btAlignedObjectArray<btDeformableLagrangianForce*> m_lf;
+	btAlignedObjectArray<btSoftBody*>& m_softBodies;
+	Preconditioner* m_preconditioner;
+	btDeformableContactProjection m_projection;
+	const TVStack& m_backupVelocity;
+	btAlignedObjectArray<btSoftBody::Node*> m_nodes;
+	bool m_implicit;
+	MassPreconditioner* m_massPreconditioner;
+	KKTPreconditioner* m_KKTPreconditioner;
+
+	btDeformableBackwardEulerObjective(btAlignedObjectArray<btSoftBody*>& softBodies, const TVStack& backup_v);
+
+	virtual ~btDeformableBackwardEulerObjective();
+
+	void initialize() {}
+
+	// compute the rhs for CG solve, i.e, add the dt scaled implicit force to residual
+	void computeResidual(btScalar dt, TVStack& residual);
+
+	// add explicit force to the velocity
+	void applyExplicitForce(TVStack& force);
+
+	// apply force to velocity and optionally reset the force to zero
+	void applyForce(TVStack& force, bool setZero);
+
+	// compute the norm of the residual
+	btScalar computeNorm(const TVStack& residual) const;
+
+	// compute one step of the solve (there is only one solve if the system is linear)
+	void computeStep(TVStack& dv, const TVStack& residual, const btScalar& dt);
+
+	// perform A*x = b
+	void multiply(const TVStack& x, TVStack& b) const;
+
+	// set initial guess for CG solve
+	void initialGuess(TVStack& dv, const TVStack& residual);
+
+	// reset data structure and reset dt
+	void reinitialize(bool nodeUpdated, btScalar dt);
+
+	void setDt(btScalar dt);
+
+	// add friction force to residual
+	void applyDynamicFriction(TVStack& r);
+
+	// add dv to velocity
+	void updateVelocity(const TVStack& dv);
+
+	//set constraints as projections
+	void setConstraints(const btContactSolverInfo& infoGlobal);
+
+	// update the projections and project the residual
+	void project(TVStack& r)
+	{
+		BT_PROFILE("project");
+		m_projection.project(r);
+	}
+
+	// perform precondition M^(-1) x = b
+	void precondition(const TVStack& x, TVStack& b)
+	{
+		m_preconditioner->operator()(x, b);
+	}
+
+	// reindex all the vertices
+	virtual void updateId()
+	{
+		size_t node_id = 0;
+		size_t face_id = 0;
+		m_nodes.clear();
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				psb->m_nodes[j].index = node_id;
+				m_nodes.push_back(&psb->m_nodes[j]);
+				++node_id;
+			}
+			for (int j = 0; j < psb->m_faces.size(); ++j)
+			{
+				psb->m_faces[j].m_index = face_id;
+				++face_id;
+			}
+		}
+	}
+
+	const btAlignedObjectArray<btSoftBody::Node*>* getIndices() const
+	{
+		return &m_nodes;
+	}
+
+	void setImplicit(bool implicit)
+	{
+		m_implicit = implicit;
+	}
+
+	// Calculate the total potential energy in the system
+	btScalar totalEnergy(btScalar dt);
+
+	void addLagrangeMultiplier(const TVStack& vec, TVStack& extended_vec)
+	{
+		extended_vec.resize(vec.size() + m_projection.m_lagrangeMultipliers.size());
+		for (int i = 0; i < vec.size(); ++i)
+		{
+			extended_vec[i] = vec[i];
+		}
+		int offset = vec.size();
+		for (int i = 0; i < m_projection.m_lagrangeMultipliers.size(); ++i)
+		{
+			extended_vec[offset + i].setZero();
+		}
+	}
+
+	void addLagrangeMultiplierRHS(const TVStack& residual, const TVStack& m_dv, TVStack& extended_residual)
+	{
+		extended_residual.resize(residual.size() + m_projection.m_lagrangeMultipliers.size());
+		for (int i = 0; i < residual.size(); ++i)
+		{
+			extended_residual[i] = residual[i];
+		}
+		int offset = residual.size();
+		for (int i = 0; i < m_projection.m_lagrangeMultipliers.size(); ++i)
+		{
+			const LagrangeMultiplier& lm = m_projection.m_lagrangeMultipliers[i];
+			extended_residual[offset + i].setZero();
+			for (int d = 0; d < lm.m_num_constraints; ++d)
+			{
+				for (int n = 0; n < lm.m_num_nodes; ++n)
+				{
+					extended_residual[offset + i][d] += lm.m_weights[n] * m_dv[lm.m_indices[n]].dot(lm.m_dirs[d]);
+				}
+			}
+		}
+	}
+
+	void calculateContactForce(const TVStack& dv, const TVStack& rhs, TVStack& f)
+	{
+		size_t counter = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				f[counter] = (node.m_im == 0) ? btVector3(0, 0, 0) : dv[counter] / node.m_im;
+				++counter;
+			}
+		}
+		for (int i = 0; i < m_lf.size(); ++i)
+		{
+			// add damping matrix
+			m_lf[i]->addScaledDampingForceDifferential(-m_dt, dv, f);
+		}
+		counter = 0;
+		for (; counter < f.size(); ++counter)
+		{
+			f[counter] = rhs[counter] - f[counter];
+		}
+	}
+};
+
+#endif /* btBackwardEulerObjective_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBodySolver.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBodySolver.cpp
new file mode 100644
index 0000000..4e9df5f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBodySolver.cpp
@@ -0,0 +1,593 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include <stdio.h>
+#include <limits>
+#include "btDeformableBodySolver.h"
+#include "btSoftBodyInternals.h"
+#include "LinearMath/btQuickprof.h"
+static const int kMaxConjugateGradientIterations = 300;
+btDeformableBodySolver::btDeformableBodySolver()
+	: m_numNodes(0), m_cg(kMaxConjugateGradientIterations), m_cr(kMaxConjugateGradientIterations), m_maxNewtonIterations(1), m_newtonTolerance(1e-4), m_lineSearch(false), m_useProjection(false)
+{
+	m_objective = new btDeformableBackwardEulerObjective(m_softBodies, m_backupVelocity);
+	m_reducedSolver = false;
+}
+
+btDeformableBodySolver::~btDeformableBodySolver()
+{
+	delete m_objective;
+}
+
+void btDeformableBodySolver::solveDeformableConstraints(btScalar solverdt)
+{
+	BT_PROFILE("solveDeformableConstraints");
+	if (!m_implicit)
+	{
+		m_objective->computeResidual(solverdt, m_residual);
+		m_objective->applyDynamicFriction(m_residual);
+		if (m_useProjection)
+		{
+			computeStep(m_dv, m_residual);
+		}
+		else
+		{
+			TVStack rhs, x;
+			m_objective->addLagrangeMultiplierRHS(m_residual, m_dv, rhs);
+			m_objective->addLagrangeMultiplier(m_dv, x);
+			m_objective->m_preconditioner->reinitialize(true);
+			computeStep(x, rhs);
+			for (int i = 0; i < m_dv.size(); ++i)
+			{
+				m_dv[i] = x[i];
+			}
+		}
+		updateVelocity();
+	}
+	else
+	{
+		for (int i = 0; i < m_maxNewtonIterations; ++i)
+		{
+			updateState();
+			// add the inertia term in the residual
+			int counter = 0;
+			for (int k = 0; k < m_softBodies.size(); ++k)
+			{
+				btSoftBody* psb = m_softBodies[k];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					if (psb->m_nodes[j].m_im > 0)
+					{
+						m_residual[counter] = (-1. / psb->m_nodes[j].m_im) * m_dv[counter];
+					}
+					++counter;
+				}
+			}
+
+			m_objective->computeResidual(solverdt, m_residual);
+			if (m_objective->computeNorm(m_residual) < m_newtonTolerance && i > 0)
+			{
+				break;
+			}
+			// todo xuchenhan@: this really only needs to be calculated once
+			m_objective->applyDynamicFriction(m_residual);
+			if (m_lineSearch)
+			{
+				btScalar inner_product = computeDescentStep(m_ddv, m_residual);
+				btScalar alpha = 0.01, beta = 0.5;  // Boyd & Vandenberghe suggested alpha between 0.01 and 0.3, beta between 0.1 to 0.8
+				btScalar scale = 2;
+				btScalar f0 = m_objective->totalEnergy(solverdt) + kineticEnergy(), f1, f2;
+				backupDv();
+				do
+				{
+					scale *= beta;
+					if (scale < 1e-8)
+					{
+						return;
+					}
+					updateEnergy(scale);
+					f1 = m_objective->totalEnergy(solverdt) + kineticEnergy();
+					f2 = f0 - alpha * scale * inner_product;
+				} while (!(f1 < f2 + SIMD_EPSILON));  // if anything here is nan then the search continues
+				revertDv();
+				updateDv(scale);
+			}
+			else
+			{
+				computeStep(m_ddv, m_residual);
+				updateDv();
+			}
+			for (int j = 0; j < m_numNodes; ++j)
+			{
+				m_ddv[j].setZero();
+				m_residual[j].setZero();
+			}
+		}
+		updateVelocity();
+	}
+}
+
+btScalar btDeformableBodySolver::kineticEnergy()
+{
+	btScalar ke = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			btSoftBody::Node& node = psb->m_nodes[j];
+			if (node.m_im > 0)
+			{
+				ke += m_dv[node.index].length2() * 0.5 / node.m_im;
+			}
+		}
+	}
+	return ke;
+}
+
+void btDeformableBodySolver::backupDv()
+{
+	m_backup_dv.resize(m_dv.size());
+	for (int i = 0; i < m_backup_dv.size(); ++i)
+	{
+		m_backup_dv[i] = m_dv[i];
+	}
+}
+
+void btDeformableBodySolver::revertDv()
+{
+	for (int i = 0; i < m_backup_dv.size(); ++i)
+	{
+		m_dv[i] = m_backup_dv[i];
+	}
+}
+
+void btDeformableBodySolver::updateEnergy(btScalar scale)
+{
+	for (int i = 0; i < m_dv.size(); ++i)
+	{
+		m_dv[i] = m_backup_dv[i] + scale * m_ddv[i];
+	}
+	updateState();
+}
+
+btScalar btDeformableBodySolver::computeDescentStep(TVStack& ddv, const TVStack& residual, bool verbose)
+{
+	m_cg.solve(*m_objective, ddv, residual, false);
+	btScalar inner_product = m_cg.dot(residual, m_ddv);
+	btScalar res_norm = m_objective->computeNorm(residual);
+	btScalar tol = 1e-5 * res_norm * m_objective->computeNorm(m_ddv);
+	if (inner_product < -tol)
+	{
+		if (verbose)
+		{
+			std::cout << "Looking backwards!" << std::endl;
+		}
+		for (int i = 0; i < m_ddv.size(); ++i)
+		{
+			m_ddv[i] = -m_ddv[i];
+		}
+		inner_product = -inner_product;
+	}
+	else if (std::abs(inner_product) < tol)
+	{
+		if (verbose)
+		{
+			std::cout << "Gradient Descent!" << std::endl;
+		}
+		btScalar scale = m_objective->computeNorm(m_ddv) / res_norm;
+		for (int i = 0; i < m_ddv.size(); ++i)
+		{
+			m_ddv[i] = scale * residual[i];
+		}
+		inner_product = scale * res_norm * res_norm;
+	}
+	return inner_product;
+}
+
+void btDeformableBodySolver::updateState()
+{
+	updateVelocity();
+	updateTempPosition();
+}
+
+void btDeformableBodySolver::updateDv(btScalar scale)
+{
+	for (int i = 0; i < m_numNodes; ++i)
+	{
+		m_dv[i] += scale * m_ddv[i];
+	}
+}
+
+void btDeformableBodySolver::computeStep(TVStack& ddv, const TVStack& residual)
+{
+	if (m_useProjection)
+		m_cg.solve(*m_objective, ddv, residual, false);
+	else
+		m_cr.solve(*m_objective, ddv, residual, false);
+}
+
+void btDeformableBodySolver::reinitialize(const btAlignedObjectArray<btSoftBody*>& softBodies, btScalar dt)
+{
+	m_softBodies.copyFromArray(softBodies);
+	bool nodeUpdated = updateNodes();
+
+	if (nodeUpdated)
+	{
+		m_dv.resize(m_numNodes, btVector3(0, 0, 0));
+		m_ddv.resize(m_numNodes, btVector3(0, 0, 0));
+		m_residual.resize(m_numNodes, btVector3(0, 0, 0));
+		m_backupVelocity.resize(m_numNodes, btVector3(0, 0, 0));
+	}
+
+	// need to setZero here as resize only set value for newly allocated items
+	for (int i = 0; i < m_numNodes; ++i)
+	{
+		m_dv[i].setZero();
+		m_ddv[i].setZero();
+		m_residual[i].setZero();
+	}
+
+	if (dt > 0)
+	{
+		m_dt = dt;
+	}
+	m_objective->reinitialize(nodeUpdated, dt);
+	updateSoftBodies();
+}
+
+void btDeformableBodySolver::setConstraints(const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("setConstraint");
+	m_objective->setConstraints(infoGlobal);
+}
+
+btScalar btDeformableBodySolver::solveContactConstraints(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("solveContactConstraints");
+	btScalar maxSquaredResidual = m_objective->m_projection.update(deformableBodies, numDeformableBodies, infoGlobal);
+	return maxSquaredResidual;
+}
+
+void btDeformableBodySolver::updateVelocity()
+{
+	int counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		psb->m_maxSpeedSquared = 0;
+		if (!psb->isActive())
+		{
+			counter += psb->m_nodes.size();
+			continue;
+		}
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			// set NaN to zero;
+			if (m_dv[counter] != m_dv[counter])
+			{
+				m_dv[counter].setZero();
+			}
+			if (m_implicit)
+			{
+				psb->m_nodes[j].m_v = m_backupVelocity[counter] + m_dv[counter];
+			}
+			else
+			{
+				psb->m_nodes[j].m_v = m_backupVelocity[counter] + m_dv[counter] - psb->m_nodes[j].m_splitv;
+			}
+			psb->m_maxSpeedSquared = btMax(psb->m_maxSpeedSquared, psb->m_nodes[j].m_v.length2());
+			++counter;
+		}
+	}
+}
+
+void btDeformableBodySolver::updateTempPosition()
+{
+	int counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (!psb->isActive())
+		{
+			counter += psb->m_nodes.size();
+			continue;
+		}
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			psb->m_nodes[j].m_q = psb->m_nodes[j].m_x + m_dt * (psb->m_nodes[j].m_v + psb->m_nodes[j].m_splitv);
+			++counter;
+		}
+		psb->updateDeformation();
+	}
+}
+
+void btDeformableBodySolver::backupVelocity()
+{
+	int counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			m_backupVelocity[counter++] = psb->m_nodes[j].m_v;
+		}
+	}
+}
+
+void btDeformableBodySolver::setupDeformableSolve(bool implicit)
+{
+	int counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (!psb->isActive())
+		{
+			counter += psb->m_nodes.size();
+			continue;
+		}
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			if (implicit)
+			{
+				// setting the initial guess for newton, need m_dv = v_{n+1} - v_n for dofs that are in constraint.
+				if (psb->m_nodes[j].m_v == m_backupVelocity[counter])
+					m_dv[counter].setZero();
+				else
+					m_dv[counter] = psb->m_nodes[j].m_v - psb->m_nodes[j].m_vn;
+				m_backupVelocity[counter] = psb->m_nodes[j].m_vn;
+			}
+			else
+			{
+				m_dv[counter] = psb->m_nodes[j].m_v + psb->m_nodes[j].m_splitv - m_backupVelocity[counter];
+			}
+			psb->m_nodes[j].m_v = m_backupVelocity[counter];
+			++counter;
+		}
+	}
+}
+
+void btDeformableBodySolver::revertVelocity()
+{
+	int counter = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			psb->m_nodes[j].m_v = m_backupVelocity[counter++];
+		}
+	}
+}
+
+bool btDeformableBodySolver::updateNodes()
+{
+	int numNodes = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+		numNodes += m_softBodies[i]->m_nodes.size();
+	if (numNodes != m_numNodes)
+	{
+		m_numNodes = numNodes;
+		return true;
+	}
+	return false;
+}
+
+void btDeformableBodySolver::predictMotion(btScalar solverdt)
+{
+	// apply explicit forces to velocity
+	if (m_implicit)
+	{
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (psb->isActive())
+			{
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = psb->m_nodes[j].m_x + psb->m_nodes[j].m_v * solverdt;
+				}
+			}
+		}
+	}
+	applyExplicitForce();
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (psb->isActive())
+		{
+			/* Clear contacts when softbody is active*/
+			psb->m_nodeRigidContacts.resize(0);
+			psb->m_faceRigidContacts.resize(0);
+			psb->m_faceNodeContacts.resize(0);
+			psb->m_faceNodeContactsCCD.resize(0);
+			// predict motion for collision detection
+			predictDeformableMotion(psb, solverdt);
+		}
+	}
+}
+
+void btDeformableBodySolver::predictDeformableMotion(btSoftBody* psb, btScalar dt)
+{
+	BT_PROFILE("btDeformableBodySolver::predictDeformableMotion");
+	int i, ni;
+
+	/* Update                */
+	if (psb->m_bUpdateRtCst)
+	{
+		psb->m_bUpdateRtCst = false;
+		psb->updateConstants();
+		psb->m_fdbvt.clear();
+		if (psb->m_cfg.collisions & btSoftBody::fCollision::SDF_RD)
+		{
+			psb->initializeFaceTree();
+		}
+	}
+
+	/* Prepare                */
+	psb->m_sst.sdt = dt * psb->m_cfg.timescale;
+	psb->m_sst.isdt = 1 / psb->m_sst.sdt;
+	psb->m_sst.velmrg = psb->m_sst.sdt * 3;
+	psb->m_sst.radmrg = psb->getCollisionShape()->getMargin();
+	psb->m_sst.updmrg = psb->m_sst.radmrg * (btScalar)0.25;
+	/* Bounds                */
+	psb->updateBounds();
+
+	/* Integrate            */
+	// do not allow particles to move more than the bounding box size
+	btScalar max_v = (psb->m_bounds[1] - psb->m_bounds[0]).norm() / dt;
+	for (i = 0, ni = psb->m_nodes.size(); i < ni; ++i)
+	{
+		btSoftBody::Node& n = psb->m_nodes[i];
+		// apply drag
+		n.m_v *= (1 - psb->m_cfg.drag);
+		// scale velocity back
+		if (m_implicit)
+		{
+			n.m_q = n.m_x;
+		}
+		else
+		{
+			if (n.m_v.norm() > max_v)
+			{
+				n.m_v.safeNormalize();
+				n.m_v *= max_v;
+			}
+			n.m_q = n.m_x + n.m_v * dt;
+		}
+		n.m_splitv.setZero();
+		n.m_constrained = false;
+	}
+
+	/* Nodes                */
+	psb->updateNodeTree(true, true);
+	if (!psb->m_fdbvt.empty())
+	{
+		psb->updateFaceTree(true, true);
+	}
+	/* Optimize dbvt's        */
+	//    psb->m_ndbvt.optimizeIncremental(1);
+	//    psb->m_fdbvt.optimizeIncremental(1);
+}
+
+void btDeformableBodySolver::updateSoftBodies()
+{
+	BT_PROFILE("updateSoftBodies");
+	for (int i = 0; i < m_softBodies.size(); i++)
+	{
+		btSoftBody* psb = (btSoftBody*)m_softBodies[i];
+		if (psb->isActive())
+		{
+			psb->updateNormals();
+		}
+	}
+}
+
+void btDeformableBodySolver::setImplicit(bool implicit)
+{
+	m_implicit = implicit;
+	m_objective->setImplicit(implicit);
+}
+
+void btDeformableBodySolver::setLineSearch(bool lineSearch)
+{
+	m_lineSearch = lineSearch;
+}
+
+void btDeformableBodySolver::applyExplicitForce()
+{
+	m_objective->applyExplicitForce(m_residual);
+}
+
+void btDeformableBodySolver::applyTransforms(btScalar timeStep)
+{
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			btSoftBody::Node& node = psb->m_nodes[j];
+			btScalar maxDisplacement = psb->getWorldInfo()->m_maxDisplacement;
+			btScalar clampDeltaV = maxDisplacement / timeStep;
+			for (int c = 0; c < 3; c++)
+			{
+				if (node.m_v[c] > clampDeltaV)
+				{
+					node.m_v[c] = clampDeltaV;
+				}
+				if (node.m_v[c] < -clampDeltaV)
+				{
+					node.m_v[c] = -clampDeltaV;
+				}
+			}
+			node.m_x = node.m_x + timeStep * (node.m_v + node.m_splitv);
+			node.m_q = node.m_x;
+			node.m_vn = node.m_v;
+		}
+		// enforce anchor constraints
+		for (int j = 0; j < psb->m_deformableAnchors.size(); ++j)
+		{
+			btSoftBody::DeformableNodeRigidAnchor& a = psb->m_deformableAnchors[j];
+			btSoftBody::Node* n = a.m_node;
+			n->m_x = a.m_cti.m_colObj->getWorldTransform() * a.m_local;
+
+			// update multibody anchor info
+			if (a.m_cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+			{
+				btMultiBodyLinkCollider* multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(a.m_cti.m_colObj);
+				if (multibodyLinkCol)
+				{
+					btVector3 nrm;
+					const btCollisionShape* shp = multibodyLinkCol->getCollisionShape();
+					const btTransform& wtr = multibodyLinkCol->getWorldTransform();
+					psb->m_worldInfo->m_sparsesdf.Evaluate(
+						wtr.invXform(n->m_x),
+						shp,
+						nrm,
+						0);
+					a.m_cti.m_normal = wtr.getBasis() * nrm;
+					btVector3 normal = a.m_cti.m_normal;
+					btVector3 t1 = generateUnitOrthogonalVector(normal);
+					btVector3 t2 = btCross(normal, t1);
+					btMultiBodyJacobianData jacobianData_normal, jacobianData_t1, jacobianData_t2;
+					findJacobian(multibodyLinkCol, jacobianData_normal, a.m_node->m_x, normal);
+					findJacobian(multibodyLinkCol, jacobianData_t1, a.m_node->m_x, t1);
+					findJacobian(multibodyLinkCol, jacobianData_t2, a.m_node->m_x, t2);
+
+					btScalar* J_n = &jacobianData_normal.m_jacobians[0];
+					btScalar* J_t1 = &jacobianData_t1.m_jacobians[0];
+					btScalar* J_t2 = &jacobianData_t2.m_jacobians[0];
+
+					btScalar* u_n = &jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+					btScalar* u_t1 = &jacobianData_t1.m_deltaVelocitiesUnitImpulse[0];
+					btScalar* u_t2 = &jacobianData_t2.m_deltaVelocitiesUnitImpulse[0];
+
+					btMatrix3x3 rot(normal.getX(), normal.getY(), normal.getZ(),
+									t1.getX(), t1.getY(), t1.getZ(),
+									t2.getX(), t2.getY(), t2.getZ());  // world frame to local frame
+					const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+					btMatrix3x3 local_impulse_matrix = (Diagonal(n->m_im) + OuterProduct(J_n, J_t1, J_t2, u_n, u_t1, u_t2, ndof)).inverse();
+					a.m_c0 = rot.transpose() * local_impulse_matrix * rot;
+					a.jacobianData_normal = jacobianData_normal;
+					a.jacobianData_t1 = jacobianData_t1;
+					a.jacobianData_t2 = jacobianData_t2;
+					a.t1 = t1;
+					a.t2 = t2;
+				}
+			}
+		}
+		psb->interpolateRenderMesh();
+	}
+}
\ No newline at end of file
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBodySolver.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBodySolver.h
new file mode 100644
index 0000000..68354f1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableBodySolver.h
@@ -0,0 +1,224 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_DEFORMABLE_BODY_SOLVERS_H
+#define BT_DEFORMABLE_BODY_SOLVERS_H
+
+#include "btSoftBodySolvers.h"
+#include "btDeformableBackwardEulerObjective.h"
+#include "btDeformableMultiBodyDynamicsWorld.h"
+#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h"
+#include "btConjugateResidual.h"
+#include "btConjugateGradient.h"
+struct btCollisionObjectWrapper;
+// class btDeformableBackwardEulerObjective;
+// class btDeformableMultiBodyDynamicsWorld;
+
+class btDeformableBodySolver : public btSoftBodySolver
+{
+	typedef btAlignedObjectArray<btVector3> TVStack;
+
+protected:
+	int m_numNodes;                                                // total number of deformable body nodes
+	TVStack m_dv;                                                  // v_{n+1} - v_n
+	TVStack m_backup_dv;                                           // backed up dv
+	TVStack m_ddv;                                                 // incremental dv
+	TVStack m_residual;                                            // rhs of the linear solve
+	btAlignedObjectArray<btSoftBody*> m_softBodies;                // all deformable bodies
+	TVStack m_backupVelocity;                                      // backed up v, equals v_n for implicit, equals v_{n+1}^* for explicit
+	btScalar m_dt;                                                 // dt
+	btConjugateGradient<btDeformableBackwardEulerObjective> m_cg;  // CG solver
+	btConjugateResidual<btDeformableBackwardEulerObjective> m_cr;  // CR solver
+	bool m_implicit;                                               // use implicit scheme if true, explicit scheme if false
+	int m_maxNewtonIterations;                                     // max number of newton iterations
+	btScalar m_newtonTolerance;                                    // stop newton iterations if f(x) < m_newtonTolerance
+	bool m_lineSearch;                                             // If true, use newton's method with line search under implicit scheme
+	bool m_reducedSolver;																					 // flag for reduced soft body solver
+public:
+	// handles data related to objective function
+	btDeformableBackwardEulerObjective* m_objective;
+	bool m_useProjection;
+
+	btDeformableBodySolver();
+
+	virtual ~btDeformableBodySolver();
+
+	virtual SolverTypes getSolverType() const
+	{
+		return DEFORMABLE_SOLVER;
+	}
+
+	// update soft body normals
+	virtual void updateSoftBodies();
+
+	virtual btScalar solveContactConstraints(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal);
+
+	// solve the momentum equation
+	virtual void solveDeformableConstraints(btScalar solverdt);
+
+	// set gravity (get from deformable world)
+	virtual void setGravity(const btVector3& gravity)
+	{
+		// for full deformable object, we don't store gravity in the solver
+		// this function is overriden in the reduced deformable object
+	}
+
+	// resize/clear data structures
+	virtual void reinitialize(const btAlignedObjectArray<btSoftBody*>& softBodies, btScalar dt);
+
+	// set up contact constraints
+	virtual void setConstraints(const btContactSolverInfo& infoGlobal);
+
+	// add in elastic forces and gravity to obtain v_{n+1}^* and calls predictDeformableMotion
+	virtual void predictMotion(btScalar solverdt);
+
+	// move to temporary position x_{n+1}^* = x_n + dt * v_{n+1}^*
+	// x_{n+1}^* is stored in m_q
+	void predictDeformableMotion(btSoftBody* psb, btScalar dt);
+
+	// save the current velocity to m_backupVelocity
+	void backupVelocity();
+
+	// set m_dv and m_backupVelocity to desired value to prepare for momentum solve
+	virtual void setupDeformableSolve(bool implicit);
+
+	// set the current velocity to that backed up in m_backupVelocity
+	void revertVelocity();
+
+	// set velocity to m_dv + m_backupVelocity
+	void updateVelocity();
+
+	// update the node count
+	bool updateNodes();
+
+	// calculate the change in dv resulting from the momentum solve
+	void computeStep(TVStack& ddv, const TVStack& residual);
+
+	// calculate the change in dv resulting from the momentum solve when line search is turned on
+	btScalar computeDescentStep(TVStack& ddv, const TVStack& residual, bool verbose = false);
+
+	virtual void copySoftBodyToVertexBuffer(const btSoftBody* const softBody, btVertexBufferDescriptor* vertexBuffer) {}
+
+	// process collision between deformable and rigid
+	virtual void processCollision(btSoftBody* softBody, const btCollisionObjectWrapper* collisionObjectWrap)
+	{
+		softBody->defaultCollisionHandler(collisionObjectWrap);
+	}
+
+	// process collision between deformable and deformable
+	virtual void processCollision(btSoftBody* softBody, btSoftBody* otherSoftBody)
+	{
+		softBody->defaultCollisionHandler(otherSoftBody);
+	}
+
+	// If true, implicit time stepping scheme is used.
+	// Otherwise, explicit time stepping scheme is used
+	void setImplicit(bool implicit);
+
+	// If true, newton's method with line search is used when implicit time stepping scheme is turned on
+	void setLineSearch(bool lineSearch);
+
+	// set temporary position x^* = x_n + dt * v
+	// update the deformation gradient at position x^*
+	void updateState();
+
+	// set dv = dv + scale * ddv
+	void updateDv(btScalar scale = 1);
+
+	// set temporary position x^* = x_n + dt * v^*
+	void updateTempPosition();
+
+	// save the current dv to m_backup_dv;
+	void backupDv();
+
+	// set dv to the backed-up value
+	void revertDv();
+
+	// set dv = dv + scale * ddv
+	// set v^* = v_n + dv
+	// set temporary position x^* = x_n + dt * v^*
+	// update the deformation gradient at position x^*
+	void updateEnergy(btScalar scale);
+
+	// calculates the appropriately scaled kinetic energy in the system, which is
+	// 1/2 * dv^T * M * dv
+	// used in line search
+	btScalar kineticEnergy();
+
+	// add explicit force to the velocity in the objective class
+	virtual void applyExplicitForce();
+
+	// execute position/velocity update and apply anchor constraints in the integrateTransforms from the Dynamics world
+	virtual void applyTransforms(btScalar timeStep);
+
+	virtual void setStrainLimiting(bool opt)
+	{
+		m_objective->m_projection.m_useStrainLimiting = opt;
+	}
+
+	virtual void setPreconditioner(int opt)
+	{
+		switch (opt)
+		{
+			case btDeformableBackwardEulerObjective::Mass_preconditioner:
+				m_objective->m_preconditioner = m_objective->m_massPreconditioner;
+				break;
+
+			case btDeformableBackwardEulerObjective::KKT_preconditioner:
+				m_objective->m_preconditioner = m_objective->m_KKTPreconditioner;
+				break;
+			
+			default:
+				btAssert(false);
+				break;
+		}
+	}
+
+	virtual btAlignedObjectArray<btDeformableLagrangianForce*>* getLagrangianForceArray()
+	{
+		return &(m_objective->m_lf);
+	}
+
+	virtual const btAlignedObjectArray<btSoftBody::Node*>* getIndices()
+	{
+		return m_objective->getIndices();
+	}
+
+	virtual void setProjection()
+	{
+		m_objective->m_projection.setProjection();
+	}
+
+	virtual void setLagrangeMultiplier()
+	{
+		m_objective->m_projection.setLagrangeMultiplier();
+	}
+
+	virtual bool isReducedSolver()
+	{
+		return m_reducedSolver;
+	}
+	
+	virtual void deformableBodyInternalWriteBack() {}
+
+	// unused functions
+	virtual void optimize(btAlignedObjectArray<btSoftBody*>& softBodies, bool forceUpdate = false) {}
+	virtual void solveConstraints(btScalar dt) {}
+	virtual bool checkInitialized() { return true; }
+	virtual void copyBackToSoftBodies(bool bMove = true) {}
+};
+
+#endif /* btDeformableBodySolver_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactConstraint.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactConstraint.cpp
new file mode 100644
index 0000000..09398d7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactConstraint.cpp
@@ -0,0 +1,720 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "btDeformableContactConstraint.h"
+/* ================   Deformable Node Anchor   =================== */
+btDeformableNodeAnchorConstraint::btDeformableNodeAnchorConstraint(const btSoftBody::DeformableNodeRigidAnchor& a, const btContactSolverInfo& infoGlobal)
+	: m_anchor(&a), btDeformableContactConstraint(a.m_cti.m_normal, infoGlobal)
+{
+}
+
+btDeformableNodeAnchorConstraint::btDeformableNodeAnchorConstraint(const btDeformableNodeAnchorConstraint& other)
+	: m_anchor(other.m_anchor), btDeformableContactConstraint(other)
+{
+}
+
+btVector3 btDeformableNodeAnchorConstraint::getVa() const
+{
+	const btSoftBody::sCti& cti = m_anchor->m_cti;
+	btVector3 va(0, 0, 0);
+	if (cti.m_colObj->hasContactResponse())
+	{
+		btRigidBody* rigidCol = 0;
+		btMultiBodyLinkCollider* multibodyLinkCol = 0;
+
+		// grab the velocity of the rigid body
+		if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+		{
+			rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
+			va = rigidCol ? (rigidCol->getVelocityInLocalPoint(m_anchor->m_c1)) : btVector3(0, 0, 0);
+		}
+		else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+		{
+			multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+			if (multibodyLinkCol)
+			{
+				const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+				const btScalar* J_n = &m_anchor->jacobianData_normal.m_jacobians[0];
+				const btScalar* J_t1 = &m_anchor->jacobianData_t1.m_jacobians[0];
+				const btScalar* J_t2 = &m_anchor->jacobianData_t2.m_jacobians[0];
+				const btScalar* local_v = multibodyLinkCol->m_multiBody->getVelocityVector();
+				const btScalar* local_dv = multibodyLinkCol->m_multiBody->getDeltaVelocityVector();
+				// add in the normal component of the va
+				btScalar vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += (local_v[k] + local_dv[k]) * J_n[k];
+				}
+				va = cti.m_normal * vel;
+				// add in the tangential components of the va
+				vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += (local_v[k] + local_dv[k]) * J_t1[k];
+				}
+				va += m_anchor->t1 * vel;
+				vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += (local_v[k] + local_dv[k]) * J_t2[k];
+				}
+				va += m_anchor->t2 * vel;
+			}
+		}
+	}
+	return va;
+}
+
+btScalar btDeformableNodeAnchorConstraint::solveConstraint(const btContactSolverInfo& infoGlobal)
+{
+	const btSoftBody::sCti& cti = m_anchor->m_cti;
+	btVector3 va = getVa();
+	btVector3 vb = getVb();
+	btVector3 vr = (vb - va);
+	// + (m_anchor->m_node->m_x - cti.m_colObj->getWorldTransform() * m_anchor->m_local) * 10.0
+	const btScalar dn = btDot(vr, vr);
+	// dn is the normal component of velocity diffrerence. Approximates the residual. // todo xuchenhan@: this prob needs to be scaled by dt
+	btScalar residualSquare = dn * dn;
+	btVector3 impulse = m_anchor->m_c0 * vr;
+	// apply impulse to deformable nodes involved and change their velocities
+	applyImpulse(impulse);
+
+	// apply impulse to the rigid/multibodies involved and change their velocities
+	if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+	{
+		btRigidBody* rigidCol = 0;
+		rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
+		if (rigidCol)
+		{
+			rigidCol->applyImpulse(impulse, m_anchor->m_c1);
+		}
+	}
+	else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+	{
+		btMultiBodyLinkCollider* multibodyLinkCol = 0;
+		multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+		if (multibodyLinkCol)
+		{
+			const btScalar* deltaV_normal = &m_anchor->jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+			// apply normal component of the impulse
+			multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_normal, impulse.dot(cti.m_normal));
+			// apply tangential component of the impulse
+			const btScalar* deltaV_t1 = &m_anchor->jacobianData_t1.m_deltaVelocitiesUnitImpulse[0];
+			multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_t1, impulse.dot(m_anchor->t1));
+			const btScalar* deltaV_t2 = &m_anchor->jacobianData_t2.m_deltaVelocitiesUnitImpulse[0];
+			multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_t2, impulse.dot(m_anchor->t2));
+		}
+	}
+	return residualSquare;
+}
+
+btVector3 btDeformableNodeAnchorConstraint::getVb() const
+{
+	return m_anchor->m_node->m_v;
+}
+
+void btDeformableNodeAnchorConstraint::applyImpulse(const btVector3& impulse)
+{
+	btVector3 dv = impulse * m_anchor->m_c2;
+	m_anchor->m_node->m_v -= dv;
+}
+
+/* ================   Deformable vs. Rigid   =================== */
+btDeformableRigidContactConstraint::btDeformableRigidContactConstraint(const btSoftBody::DeformableRigidContact& c, const btContactSolverInfo& infoGlobal)
+	: m_contact(&c), btDeformableContactConstraint(c.m_cti.m_normal, infoGlobal)
+{
+	m_total_normal_dv.setZero();
+	m_total_tangent_dv.setZero();
+	// The magnitude of penetration is the depth of penetration.
+	m_penetration = c.m_cti.m_offset;
+	m_total_split_impulse = 0;
+	m_binding = false;
+}
+
+btDeformableRigidContactConstraint::btDeformableRigidContactConstraint(const btDeformableRigidContactConstraint& other)
+	: m_contact(other.m_contact), btDeformableContactConstraint(other), m_penetration(other.m_penetration), m_total_split_impulse(other.m_total_split_impulse), m_binding(other.m_binding)
+{
+	m_total_normal_dv = other.m_total_normal_dv;
+	m_total_tangent_dv = other.m_total_tangent_dv;
+}
+
+btVector3 btDeformableRigidContactConstraint::getVa() const
+{
+	const btSoftBody::sCti& cti = m_contact->m_cti;
+	btVector3 va(0, 0, 0);
+	if (cti.m_colObj->hasContactResponse())
+	{
+		btRigidBody* rigidCol = 0;
+		btMultiBodyLinkCollider* multibodyLinkCol = 0;
+
+		// grab the velocity of the rigid body
+		if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+		{
+			rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
+			va = rigidCol ? (rigidCol->getVelocityInLocalPoint(m_contact->m_c1)) : btVector3(0, 0, 0);
+		}
+		else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+		{
+			multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+			if (multibodyLinkCol)
+			{
+				const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+				const btScalar* J_n = &m_contact->jacobianData_normal.m_jacobians[0];
+				const btScalar* J_t1 = &m_contact->jacobianData_t1.m_jacobians[0];
+				const btScalar* J_t2 = &m_contact->jacobianData_t2.m_jacobians[0];
+				const btScalar* local_v = multibodyLinkCol->m_multiBody->getVelocityVector();
+				const btScalar* local_dv = multibodyLinkCol->m_multiBody->getDeltaVelocityVector();
+				// add in the normal component of the va
+				btScalar vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += (local_v[k] + local_dv[k]) * J_n[k];
+				}
+				va = cti.m_normal * vel;
+				// add in the tangential components of the va
+				vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += (local_v[k] + local_dv[k]) * J_t1[k];
+				}
+				va += m_contact->t1 * vel;
+				vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += (local_v[k] + local_dv[k]) * J_t2[k];
+				}
+				va += m_contact->t2 * vel;
+			}
+		}
+	}
+	return va;
+}
+
+btVector3 btDeformableRigidContactConstraint::getSplitVa() const
+{
+	const btSoftBody::sCti& cti = m_contact->m_cti;
+	btVector3 va(0, 0, 0);
+	if (cti.m_colObj->hasContactResponse())
+	{
+		btRigidBody* rigidCol = 0;
+		btMultiBodyLinkCollider* multibodyLinkCol = 0;
+
+		// grab the velocity of the rigid body
+		if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+		{
+			rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
+			va = rigidCol ? (rigidCol->getPushVelocityInLocalPoint(m_contact->m_c1)) : btVector3(0, 0, 0);
+		}
+		else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+		{
+			multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+			if (multibodyLinkCol)
+			{
+				const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+				const btScalar* J_n = &m_contact->jacobianData_normal.m_jacobians[0];
+				const btScalar* J_t1 = &m_contact->jacobianData_t1.m_jacobians[0];
+				const btScalar* J_t2 = &m_contact->jacobianData_t2.m_jacobians[0];
+				const btScalar* local_split_v = multibodyLinkCol->m_multiBody->getSplitVelocityVector();
+				// add in the normal component of the va
+				btScalar vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += local_split_v[k] * J_n[k];
+				}
+				va = cti.m_normal * vel;
+				// add in the tangential components of the va
+				vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += local_split_v[k] * J_t1[k];
+				}
+				va += m_contact->t1 * vel;
+				vel = 0.0;
+				for (int k = 0; k < ndof; ++k)
+				{
+					vel += local_split_v[k] * J_t2[k];
+				}
+				va += m_contact->t2 * vel;
+			}
+		}
+	}
+	return va;
+}
+
+btScalar btDeformableRigidContactConstraint::solveConstraint(const btContactSolverInfo& infoGlobal)
+{
+	const btSoftBody::sCti& cti = m_contact->m_cti;
+	btVector3 va = getVa();
+	btVector3 vb = getVb();
+	btVector3 vr = vb - va;
+	btScalar dn = btDot(vr, cti.m_normal) + m_total_normal_dv.dot(cti.m_normal) * infoGlobal.m_deformable_cfm;
+	if (m_penetration > 0)
+	{
+		dn += m_penetration / infoGlobal.m_timeStep;
+	}
+	if (!infoGlobal.m_splitImpulse)
+	{
+		dn += m_penetration * infoGlobal.m_deformable_erp / infoGlobal.m_timeStep;
+	}
+	// dn is the normal component of velocity diffrerence. Approximates the residual. // todo xuchenhan@: this prob needs to be scaled by dt
+	btVector3 impulse = m_contact->m_c0 * (vr + m_total_normal_dv * infoGlobal.m_deformable_cfm + ((m_penetration > 0) ? m_penetration / infoGlobal.m_timeStep * cti.m_normal : btVector3(0, 0, 0)));
+	if (!infoGlobal.m_splitImpulse)
+	{
+		impulse += m_contact->m_c0 * (m_penetration * infoGlobal.m_deformable_erp / infoGlobal.m_timeStep * cti.m_normal);
+	}
+	btVector3 impulse_normal = m_contact->m_c0 * (cti.m_normal * dn);
+	btVector3 impulse_tangent = impulse - impulse_normal;
+	if (dn > 0)
+	{
+		return 0;
+	}
+	m_binding = true;
+	btScalar residualSquare = dn * dn;
+	btVector3 old_total_tangent_dv = m_total_tangent_dv;
+	// m_c5 is the inverse mass of the deformable node/face
+	m_total_normal_dv -= m_contact->m_c5 * impulse_normal;
+	m_total_tangent_dv -= m_contact->m_c5 * impulse_tangent;
+
+	if (m_total_normal_dv.dot(cti.m_normal) < 0)
+	{
+		// separating in the normal direction
+		m_binding = false;
+		m_static = false;
+		impulse_tangent.setZero();
+	}
+	else
+	{
+		if (m_total_normal_dv.norm() * m_contact->m_c3 < m_total_tangent_dv.norm())
+		{
+			// dynamic friction
+			// with dynamic friction, the impulse are still applied to the two objects colliding, however, it does not pose a constraint in the cg solve, hence the change to dv merely serves to update velocity in the contact iterations.
+			m_static = false;
+			if (m_total_tangent_dv.safeNorm() < SIMD_EPSILON)
+			{
+				m_total_tangent_dv = btVector3(0, 0, 0);
+			}
+			else
+			{
+				m_total_tangent_dv = m_total_tangent_dv.normalized() * m_total_normal_dv.safeNorm() * m_contact->m_c3;
+			}
+			//            impulse_tangent = -btScalar(1)/m_contact->m_c2 * (m_total_tangent_dv - old_total_tangent_dv);
+			impulse_tangent = m_contact->m_c5.inverse() * (old_total_tangent_dv - m_total_tangent_dv);
+		}
+		else
+		{
+			// static friction
+			m_static = true;
+		}
+	}
+	impulse = impulse_normal + impulse_tangent;
+	// apply impulse to deformable nodes involved and change their velocities
+	applyImpulse(impulse);
+	// apply impulse to the rigid/multibodies involved and change their velocities
+	if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+	{
+		btRigidBody* rigidCol = 0;
+		rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
+		if (rigidCol)
+		{
+			rigidCol->applyImpulse(impulse, m_contact->m_c1);
+		}
+	}
+	else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+	{
+		btMultiBodyLinkCollider* multibodyLinkCol = 0;
+		multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+		if (multibodyLinkCol)
+		{
+			const btScalar* deltaV_normal = &m_contact->jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+			// apply normal component of the impulse
+			multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_normal, impulse.dot(cti.m_normal));
+			if (impulse_tangent.norm() > SIMD_EPSILON)
+			{
+				// apply tangential component of the impulse
+				const btScalar* deltaV_t1 = &m_contact->jacobianData_t1.m_deltaVelocitiesUnitImpulse[0];
+				multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_t1, impulse.dot(m_contact->t1));
+				const btScalar* deltaV_t2 = &m_contact->jacobianData_t2.m_deltaVelocitiesUnitImpulse[0];
+				multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof2(deltaV_t2, impulse.dot(m_contact->t2));
+			}
+		}
+	}
+	return residualSquare;
+}
+
+btScalar btDeformableRigidContactConstraint::solveSplitImpulse(const btContactSolverInfo& infoGlobal)
+{
+	btScalar MAX_PENETRATION_CORRECTION = infoGlobal.m_deformable_maxErrorReduction;
+	const btSoftBody::sCti& cti = m_contact->m_cti;
+	btVector3 vb = getSplitVb();
+	btVector3 va = getSplitVa();
+	btScalar p = m_penetration;
+	if (p > 0)
+	{
+		return 0;
+	}
+	btVector3 vr = vb - va;
+	btScalar dn = btDot(vr, cti.m_normal) + p * infoGlobal.m_deformable_erp / infoGlobal.m_timeStep;
+	if (dn > 0)
+	{
+		return 0;
+	}
+	if (m_total_split_impulse + dn > MAX_PENETRATION_CORRECTION)
+	{
+		dn = MAX_PENETRATION_CORRECTION - m_total_split_impulse;
+	}
+	if (m_total_split_impulse + dn < -MAX_PENETRATION_CORRECTION)
+	{
+		dn = -MAX_PENETRATION_CORRECTION - m_total_split_impulse;
+	}
+	m_total_split_impulse += dn;
+
+	btScalar residualSquare = dn * dn;
+	const btVector3 impulse = m_contact->m_c0 * (cti.m_normal * dn);
+	applySplitImpulse(impulse);
+
+	// apply split impulse to the rigid/multibodies involved and change their velocities
+	if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+	{
+		btRigidBody* rigidCol = 0;
+		rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
+		if (rigidCol)
+		{
+			rigidCol->applyPushImpulse(impulse, m_contact->m_c1);
+		}
+	}
+	else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+	{
+		btMultiBodyLinkCollider* multibodyLinkCol = 0;
+		multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+		if (multibodyLinkCol)
+		{
+			const btScalar* deltaV_normal = &m_contact->jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+			// apply normal component of the impulse
+			multibodyLinkCol->m_multiBody->applyDeltaSplitVeeMultiDof(deltaV_normal, impulse.dot(cti.m_normal));
+		}
+	}
+	return residualSquare;
+}
+/* ================   Node vs. Rigid   =================== */
+btDeformableNodeRigidContactConstraint::btDeformableNodeRigidContactConstraint(const btSoftBody::DeformableNodeRigidContact& contact, const btContactSolverInfo& infoGlobal)
+	: m_node(contact.m_node), btDeformableRigidContactConstraint(contact, infoGlobal)
+{
+}
+
+btDeformableNodeRigidContactConstraint::btDeformableNodeRigidContactConstraint(const btDeformableNodeRigidContactConstraint& other)
+	: m_node(other.m_node), btDeformableRigidContactConstraint(other)
+{
+}
+
+btVector3 btDeformableNodeRigidContactConstraint::getVb() const
+{
+	return m_node->m_v;
+}
+
+btVector3 btDeformableNodeRigidContactConstraint::getSplitVb() const
+{
+	return m_node->m_splitv;
+}
+
+btVector3 btDeformableNodeRigidContactConstraint::getDv(const btSoftBody::Node* node) const
+{
+	return m_total_normal_dv + m_total_tangent_dv;
+}
+
+void btDeformableNodeRigidContactConstraint::applyImpulse(const btVector3& impulse)
+{
+	const btSoftBody::DeformableNodeRigidContact* contact = getContact();
+	btVector3 dv = contact->m_c5 * impulse;
+	contact->m_node->m_v -= dv;
+}
+
+void btDeformableNodeRigidContactConstraint::applySplitImpulse(const btVector3& impulse)
+{
+	const btSoftBody::DeformableNodeRigidContact* contact = getContact();
+	btVector3 dv = contact->m_c5 * impulse;
+	contact->m_node->m_splitv -= dv;
+}
+
+/* ================   Face vs. Rigid   =================== */
+btDeformableFaceRigidContactConstraint::btDeformableFaceRigidContactConstraint(const btSoftBody::DeformableFaceRigidContact& contact, const btContactSolverInfo& infoGlobal, bool useStrainLimiting)
+	: m_face(contact.m_face), m_useStrainLimiting(useStrainLimiting), btDeformableRigidContactConstraint(contact, infoGlobal)
+{
+}
+
+btDeformableFaceRigidContactConstraint::btDeformableFaceRigidContactConstraint(const btDeformableFaceRigidContactConstraint& other)
+	: m_face(other.m_face), m_useStrainLimiting(other.m_useStrainLimiting), btDeformableRigidContactConstraint(other)
+{
+}
+
+btVector3 btDeformableFaceRigidContactConstraint::getVb() const
+{
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	btVector3 vb = m_face->m_n[0]->m_v * contact->m_bary[0] + m_face->m_n[1]->m_v * contact->m_bary[1] + m_face->m_n[2]->m_v * contact->m_bary[2];
+	return vb;
+}
+
+btVector3 btDeformableFaceRigidContactConstraint::getDv(const btSoftBody::Node* node) const
+{
+	btVector3 face_dv = m_total_normal_dv + m_total_tangent_dv;
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	if (m_face->m_n[0] == node)
+	{
+		return face_dv * contact->m_weights[0];
+	}
+	if (m_face->m_n[1] == node)
+	{
+		return face_dv * contact->m_weights[1];
+	}
+	btAssert(node == m_face->m_n[2]);
+	return face_dv * contact->m_weights[2];
+}
+
+void btDeformableFaceRigidContactConstraint::applyImpulse(const btVector3& impulse)
+{
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	btVector3 dv = impulse * contact->m_c2;
+	btSoftBody::Face* face = contact->m_face;
+
+	btVector3& v0 = face->m_n[0]->m_v;
+	btVector3& v1 = face->m_n[1]->m_v;
+	btVector3& v2 = face->m_n[2]->m_v;
+	const btScalar& im0 = face->m_n[0]->m_im;
+	const btScalar& im1 = face->m_n[1]->m_im;
+	const btScalar& im2 = face->m_n[2]->m_im;
+	if (im0 > 0)
+		v0 -= dv * contact->m_weights[0];
+	if (im1 > 0)
+		v1 -= dv * contact->m_weights[1];
+	if (im2 > 0)
+		v2 -= dv * contact->m_weights[2];
+	if (m_useStrainLimiting)
+	{
+		btScalar relaxation = 1. / btScalar(m_infoGlobal->m_numIterations);
+		btScalar m01 = (relaxation / (im0 + im1));
+		btScalar m02 = (relaxation / (im0 + im2));
+		btScalar m12 = (relaxation / (im1 + im2));
+#ifdef USE_STRAIN_RATE_LIMITING
+		// apply strain limiting to prevent the new velocity to change the current length of the edge by more than 1%.
+		btScalar p = 0.01;
+		btVector3& x0 = face->m_n[0]->m_x;
+		btVector3& x1 = face->m_n[1]->m_x;
+		btVector3& x2 = face->m_n[2]->m_x;
+		const btVector3 x_diff[3] = {x1 - x0, x2 - x0, x2 - x1};
+		const btVector3 v_diff[3] = {v1 - v0, v2 - v0, v2 - v1};
+		btVector3 u[3];
+		btScalar x_diff_dot_u, dn[3];
+		btScalar dt = m_infoGlobal->m_timeStep;
+		for (int i = 0; i < 3; ++i)
+		{
+			btScalar x_diff_norm = x_diff[i].safeNorm();
+			btScalar x_diff_norm_new = (x_diff[i] + v_diff[i] * dt).safeNorm();
+			btScalar strainRate = x_diff_norm_new / x_diff_norm;
+			u[i] = v_diff[i];
+			u[i].safeNormalize();
+			if (x_diff_norm == 0 || (1 - p <= strainRate && strainRate <= 1 + p))
+			{
+				dn[i] = 0;
+				continue;
+			}
+			x_diff_dot_u = btDot(x_diff[i], u[i]);
+			btScalar s;
+			if (1 - p > strainRate)
+			{
+				s = 1 / dt * (-x_diff_dot_u - btSqrt(x_diff_dot_u * x_diff_dot_u + (p * p - 2 * p) * x_diff_norm * x_diff_norm));
+			}
+			else
+			{
+				s = 1 / dt * (-x_diff_dot_u + btSqrt(x_diff_dot_u * x_diff_dot_u + (p * p + 2 * p) * x_diff_norm * x_diff_norm));
+			}
+			//		x_diff_norm_new = (x_diff[i] + s * u[i] * dt).safeNorm();
+			//		strainRate = x_diff_norm_new/x_diff_norm;
+			dn[i] = s - v_diff[i].safeNorm();
+		}
+		btVector3 dv0 = im0 * (m01 * u[0] * (-dn[0]) + m02 * u[1] * -(dn[1]));
+		btVector3 dv1 = im1 * (m01 * u[0] * (dn[0]) + m12 * u[2] * (-dn[2]));
+		btVector3 dv2 = im2 * (m12 * u[2] * (dn[2]) + m02 * u[1] * (dn[1]));
+#else
+		// apply strain limiting to prevent undamped modes
+		btVector3 dv0 = im0 * (m01 * (v1 - v0) + m02 * (v2 - v0));
+		btVector3 dv1 = im1 * (m01 * (v0 - v1) + m12 * (v2 - v1));
+		btVector3 dv2 = im2 * (m12 * (v1 - v2) + m02 * (v0 - v2));
+#endif
+		v0 += dv0;
+		v1 += dv1;
+		v2 += dv2;
+	}
+}
+
+btVector3 btDeformableFaceRigidContactConstraint::getSplitVb() const
+{
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	btVector3 vb = (m_face->m_n[0]->m_splitv) * contact->m_bary[0] + (m_face->m_n[1]->m_splitv) * contact->m_bary[1] + (m_face->m_n[2]->m_splitv) * contact->m_bary[2];
+	return vb;
+}
+
+void btDeformableFaceRigidContactConstraint::applySplitImpulse(const btVector3& impulse)
+{
+	const btSoftBody::DeformableFaceRigidContact* contact = getContact();
+	btVector3 dv = impulse * contact->m_c2;
+	btSoftBody::Face* face = contact->m_face;
+	btVector3& v0 = face->m_n[0]->m_splitv;
+	btVector3& v1 = face->m_n[1]->m_splitv;
+	btVector3& v2 = face->m_n[2]->m_splitv;
+	const btScalar& im0 = face->m_n[0]->m_im;
+	const btScalar& im1 = face->m_n[1]->m_im;
+	const btScalar& im2 = face->m_n[2]->m_im;
+	if (im0 > 0)
+	{
+		v0 -= dv * contact->m_weights[0];
+	}
+	if (im1 > 0)
+	{
+		v1 -= dv * contact->m_weights[1];
+	}
+	if (im2 > 0)
+	{
+		v2 -= dv * contact->m_weights[2];
+	}
+}
+
+/* ================   Face vs. Node   =================== */
+btDeformableFaceNodeContactConstraint::btDeformableFaceNodeContactConstraint(const btSoftBody::DeformableFaceNodeContact& contact, const btContactSolverInfo& infoGlobal)
+	: m_node(contact.m_node), m_face(contact.m_face), m_contact(&contact), btDeformableContactConstraint(contact.m_normal, infoGlobal)
+{
+	m_total_normal_dv.setZero();
+	m_total_tangent_dv.setZero();
+}
+
+btVector3 btDeformableFaceNodeContactConstraint::getVa() const
+{
+	return m_node->m_v;
+}
+
+btVector3 btDeformableFaceNodeContactConstraint::getVb() const
+{
+	const btSoftBody::DeformableFaceNodeContact* contact = getContact();
+	btVector3 vb = m_face->m_n[0]->m_v * contact->m_bary[0] + m_face->m_n[1]->m_v * contact->m_bary[1] + m_face->m_n[2]->m_v * contact->m_bary[2];
+	return vb;
+}
+
+btVector3 btDeformableFaceNodeContactConstraint::getDv(const btSoftBody::Node* n) const
+{
+	btVector3 dv = m_total_normal_dv + m_total_tangent_dv;
+	if (n == m_node)
+		return dv;
+	const btSoftBody::DeformableFaceNodeContact* contact = getContact();
+	if (m_face->m_n[0] == n)
+	{
+		return dv * contact->m_weights[0];
+	}
+	if (m_face->m_n[1] == n)
+	{
+		return dv * contact->m_weights[1];
+	}
+	btAssert(n == m_face->m_n[2]);
+	return dv * contact->m_weights[2];
+}
+
+btScalar btDeformableFaceNodeContactConstraint::solveConstraint(const btContactSolverInfo& infoGlobal)
+{
+	btVector3 va = getVa();
+	btVector3 vb = getVb();
+	btVector3 vr = vb - va;
+	const btScalar dn = btDot(vr, m_contact->m_normal);
+	// dn is the normal component of velocity diffrerence. Approximates the residual. // todo xuchenhan@: this prob needs to be scaled by dt
+	btScalar residualSquare = dn * dn;
+	btVector3 impulse = m_contact->m_c0 * vr;
+	const btVector3 impulse_normal = m_contact->m_c0 * (m_contact->m_normal * dn);
+	btVector3 impulse_tangent = impulse - impulse_normal;
+
+	btVector3 old_total_tangent_dv = m_total_tangent_dv;
+	// m_c2 is the inverse mass of the deformable node/face
+	if (m_node->m_im > 0)
+	{
+		m_total_normal_dv -= impulse_normal * m_node->m_im;
+		m_total_tangent_dv -= impulse_tangent * m_node->m_im;
+	}
+	else
+	{
+		m_total_normal_dv -= impulse_normal * m_contact->m_imf;
+		m_total_tangent_dv -= impulse_tangent * m_contact->m_imf;
+	}
+
+	if (m_total_normal_dv.dot(m_contact->m_normal) > 0)
+	{
+		// separating in the normal direction
+		m_static = false;
+		m_total_tangent_dv = btVector3(0, 0, 0);
+		impulse_tangent.setZero();
+	}
+	else
+	{
+		if (m_total_normal_dv.norm() * m_contact->m_friction < m_total_tangent_dv.norm())
+		{
+			// dynamic friction
+			// with dynamic friction, the impulse are still applied to the two objects colliding, however, it does not pose a constraint in the cg solve, hence the change to dv merely serves to update velocity in the contact iterations.
+			m_static = false;
+			if (m_total_tangent_dv.safeNorm() < SIMD_EPSILON)
+			{
+				m_total_tangent_dv = btVector3(0, 0, 0);
+			}
+			else
+			{
+				m_total_tangent_dv = m_total_tangent_dv.normalized() * m_total_normal_dv.safeNorm() * m_contact->m_friction;
+			}
+			impulse_tangent = -btScalar(1) / m_node->m_im * (m_total_tangent_dv - old_total_tangent_dv);
+		}
+		else
+		{
+			// static friction
+			m_static = true;
+		}
+	}
+	impulse = impulse_normal + impulse_tangent;
+	// apply impulse to deformable nodes involved and change their velocities
+	applyImpulse(impulse);
+	return residualSquare;
+}
+
+void btDeformableFaceNodeContactConstraint::applyImpulse(const btVector3& impulse)
+{
+	const btSoftBody::DeformableFaceNodeContact* contact = getContact();
+	btVector3 dva = impulse * contact->m_node->m_im;
+	btVector3 dvb = impulse * contact->m_imf;
+	if (contact->m_node->m_im > 0)
+	{
+		contact->m_node->m_v += dva;
+	}
+
+	btSoftBody::Face* face = contact->m_face;
+	btVector3& v0 = face->m_n[0]->m_v;
+	btVector3& v1 = face->m_n[1]->m_v;
+	btVector3& v2 = face->m_n[2]->m_v;
+	const btScalar& im0 = face->m_n[0]->m_im;
+	const btScalar& im1 = face->m_n[1]->m_im;
+	const btScalar& im2 = face->m_n[2]->m_im;
+	if (im0 > 0)
+	{
+		v0 -= dvb * contact->m_weights[0];
+	}
+	if (im1 > 0)
+	{
+		v1 -= dvb * contact->m_weights[1];
+	}
+	if (im2 > 0)
+	{
+		v2 -= dvb * contact->m_weights[2];
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactConstraint.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactConstraint.h
new file mode 100644
index 0000000..ddecb40
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactConstraint.h
@@ -0,0 +1,284 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_DEFORMABLE_CONTACT_CONSTRAINT_H
+#define BT_DEFORMABLE_CONTACT_CONSTRAINT_H
+#include "btSoftBody.h"
+
+// btDeformableContactConstraint is an abstract class specifying the method that each type of contact constraint needs to implement
+class btDeformableContactConstraint
+{
+public:
+	// True if the friction is static
+	// False if the friction is dynamic
+	bool m_static;
+	const btContactSolverInfo* m_infoGlobal;
+
+	// normal of the contact
+	btVector3 m_normal;
+
+	btDeformableContactConstraint(const btVector3& normal, const btContactSolverInfo& infoGlobal) : m_static(false), m_normal(normal), m_infoGlobal(&infoGlobal)
+	{
+	}
+
+	btDeformableContactConstraint(bool isStatic, const btVector3& normal, const btContactSolverInfo& infoGlobal) : m_static(isStatic), m_normal(normal), m_infoGlobal(&infoGlobal)
+	{
+	}
+
+	btDeformableContactConstraint() : m_static(false) {}
+
+	btDeformableContactConstraint(const btDeformableContactConstraint& other)
+		: m_static(other.m_static), m_normal(other.m_normal), m_infoGlobal(other.m_infoGlobal)
+	{
+	}
+
+	virtual ~btDeformableContactConstraint() {}
+
+	// solve the constraint with inelastic impulse and return the error, which is the square of normal component of velocity diffrerence
+	// the constraint is solved by calculating the impulse between object A and B in the contact and apply the impulse to both objects involved in the contact
+	virtual btScalar solveConstraint(const btContactSolverInfo& infoGlobal) = 0;
+
+	// get the velocity of the object A in the contact
+	virtual btVector3 getVa() const = 0;
+
+	// get the velocity of the object B in the contact
+	virtual btVector3 getVb() const = 0;
+
+	// get the velocity change of the soft body node in the constraint
+	virtual btVector3 getDv(const btSoftBody::Node*) const = 0;
+
+	// apply impulse to the soft body node and/or face involved
+	virtual void applyImpulse(const btVector3& impulse) = 0;
+
+	// scale the penetration depth by erp
+	virtual void setPenetrationScale(btScalar scale) = 0;
+};
+
+//
+// Constraint that a certain node in the deformable objects cannot move
+class btDeformableStaticConstraint : public btDeformableContactConstraint
+{
+public:
+	btSoftBody::Node* m_node;
+
+	btDeformableStaticConstraint(btSoftBody::Node* node, const btContactSolverInfo& infoGlobal) : m_node(node), btDeformableContactConstraint(false, btVector3(0, 0, 0), infoGlobal)
+	{
+	}
+	btDeformableStaticConstraint() {}
+	btDeformableStaticConstraint(const btDeformableStaticConstraint& other)
+		: m_node(other.m_node), btDeformableContactConstraint(other)
+	{
+	}
+
+	virtual ~btDeformableStaticConstraint() {}
+
+	virtual btScalar solveConstraint(const btContactSolverInfo& infoGlobal)
+	{
+		return 0;
+	}
+
+	virtual btVector3 getVa() const
+	{
+		return btVector3(0, 0, 0);
+	}
+
+	virtual btVector3 getVb() const
+	{
+		return btVector3(0, 0, 0);
+	}
+
+	virtual btVector3 getDv(const btSoftBody::Node* n) const
+	{
+		return btVector3(0, 0, 0);
+	}
+
+	virtual void applyImpulse(const btVector3& impulse) {}
+	virtual void setPenetrationScale(btScalar scale) {}
+};
+
+//
+// Anchor Constraint between rigid and deformable node
+class btDeformableNodeAnchorConstraint : public btDeformableContactConstraint
+{
+public:
+	const btSoftBody::DeformableNodeRigidAnchor* m_anchor;
+
+	btDeformableNodeAnchorConstraint(const btSoftBody::DeformableNodeRigidAnchor& c, const btContactSolverInfo& infoGlobal);
+	btDeformableNodeAnchorConstraint(const btDeformableNodeAnchorConstraint& other);
+	btDeformableNodeAnchorConstraint() {}
+	virtual ~btDeformableNodeAnchorConstraint()
+	{
+	}
+	virtual btScalar solveConstraint(const btContactSolverInfo& infoGlobal);
+
+	// object A is the rigid/multi body, and object B is the deformable node/face
+	virtual btVector3 getVa() const;
+	// get the velocity of the deformable node in contact
+	virtual btVector3 getVb() const;
+	virtual btVector3 getDv(const btSoftBody::Node* n) const
+	{
+		return btVector3(0, 0, 0);
+	}
+	virtual void applyImpulse(const btVector3& impulse);
+
+	virtual void setPenetrationScale(btScalar scale) {}
+};
+
+//
+// Constraint between rigid/multi body and deformable objects
+class btDeformableRigidContactConstraint : public btDeformableContactConstraint
+{
+public:
+	btVector3 m_total_normal_dv;
+	btVector3 m_total_tangent_dv;
+	btScalar m_penetration;
+	btScalar m_total_split_impulse;
+	bool m_binding;
+	const btSoftBody::DeformableRigidContact* m_contact;
+
+	btDeformableRigidContactConstraint(const btSoftBody::DeformableRigidContact& c, const btContactSolverInfo& infoGlobal);
+	btDeformableRigidContactConstraint(const btDeformableRigidContactConstraint& other);
+	btDeformableRigidContactConstraint() : m_binding(false) {}
+	virtual ~btDeformableRigidContactConstraint()
+	{
+	}
+
+	// object A is the rigid/multi body, and object B is the deformable node/face
+	virtual btVector3 getVa() const;
+
+	// get the split impulse velocity of the deformable face at the contact point
+	virtual btVector3 getSplitVb() const = 0;
+
+	// get the split impulse velocity of the rigid/multibdoy at the contaft
+	virtual btVector3 getSplitVa() const;
+
+	virtual btScalar solveConstraint(const btContactSolverInfo& infoGlobal);
+
+	virtual void setPenetrationScale(btScalar scale)
+	{
+		m_penetration *= scale;
+	}
+
+	btScalar solveSplitImpulse(const btContactSolverInfo& infoGlobal);
+
+	virtual void applySplitImpulse(const btVector3& impulse) = 0;
+};
+
+//
+// Constraint between rigid/multi body and deformable objects nodes
+class btDeformableNodeRigidContactConstraint : public btDeformableRigidContactConstraint
+{
+public:
+	// the deformable node in contact
+	btSoftBody::Node* m_node;
+
+	btDeformableNodeRigidContactConstraint(const btSoftBody::DeformableNodeRigidContact& contact, const btContactSolverInfo& infoGlobal);
+	btDeformableNodeRigidContactConstraint(const btDeformableNodeRigidContactConstraint& other);
+	btDeformableNodeRigidContactConstraint() {}
+	virtual ~btDeformableNodeRigidContactConstraint()
+	{
+	}
+
+	// get the velocity of the deformable node in contact
+	virtual btVector3 getVb() const;
+
+	// get the split impulse velocity of the deformable face at the contact point
+	virtual btVector3 getSplitVb() const;
+
+	// get the velocity change of the input soft body node in the constraint
+	virtual btVector3 getDv(const btSoftBody::Node*) const;
+
+	// cast the contact to the desired type
+	const btSoftBody::DeformableNodeRigidContact* getContact() const
+	{
+		return static_cast<const btSoftBody::DeformableNodeRigidContact*>(m_contact);
+	}
+
+	virtual void applyImpulse(const btVector3& impulse);
+
+	virtual void applySplitImpulse(const btVector3& impulse);
+};
+
+//
+// Constraint between rigid/multi body and deformable objects faces
+class btDeformableFaceRigidContactConstraint : public btDeformableRigidContactConstraint
+{
+public:
+	btSoftBody::Face* m_face;
+	bool m_useStrainLimiting;
+	btDeformableFaceRigidContactConstraint(const btSoftBody::DeformableFaceRigidContact& contact, const btContactSolverInfo& infoGlobal, bool useStrainLimiting);
+	btDeformableFaceRigidContactConstraint(const btDeformableFaceRigidContactConstraint& other);
+	btDeformableFaceRigidContactConstraint() : m_useStrainLimiting(false) {}
+	virtual ~btDeformableFaceRigidContactConstraint()
+	{
+	}
+
+	// get the velocity of the deformable face at the contact point
+	virtual btVector3 getVb() const;
+
+	// get the split impulse velocity of the deformable face at the contact point
+	virtual btVector3 getSplitVb() const;
+
+	// get the velocity change of the input soft body node in the constraint
+	virtual btVector3 getDv(const btSoftBody::Node*) const;
+
+	// cast the contact to the desired type
+	const btSoftBody::DeformableFaceRigidContact* getContact() const
+	{
+		return static_cast<const btSoftBody::DeformableFaceRigidContact*>(m_contact);
+	}
+
+	virtual void applyImpulse(const btVector3& impulse);
+
+	virtual void applySplitImpulse(const btVector3& impulse);
+};
+
+//
+// Constraint between  deformable objects faces and deformable objects nodes
+class btDeformableFaceNodeContactConstraint : public btDeformableContactConstraint
+{
+public:
+	btSoftBody::Node* m_node;
+	btSoftBody::Face* m_face;
+	const btSoftBody::DeformableFaceNodeContact* m_contact;
+	btVector3 m_total_normal_dv;
+	btVector3 m_total_tangent_dv;
+
+	btDeformableFaceNodeContactConstraint(const btSoftBody::DeformableFaceNodeContact& contact, const btContactSolverInfo& infoGlobal);
+	btDeformableFaceNodeContactConstraint() {}
+	virtual ~btDeformableFaceNodeContactConstraint() {}
+
+	virtual btScalar solveConstraint(const btContactSolverInfo& infoGlobal);
+
+	// get the velocity of the object A in the contact
+	virtual btVector3 getVa() const;
+
+	// get the velocity of the object B in the contact
+	virtual btVector3 getVb() const;
+
+	// get the velocity change of the input soft body node in the constraint
+	virtual btVector3 getDv(const btSoftBody::Node*) const;
+
+	// cast the contact to the desired type
+	const btSoftBody::DeformableFaceNodeContact* getContact() const
+	{
+		return static_cast<const btSoftBody::DeformableFaceNodeContact*>(m_contact);
+	}
+
+	virtual void applyImpulse(const btVector3& impulse);
+
+	virtual void setPenetrationScale(btScalar scale) {}
+};
+#endif /* BT_DEFORMABLE_CONTACT_CONSTRAINT_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactProjection.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactProjection.cpp
new file mode 100644
index 0000000..7f67260
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactProjection.cpp
@@ -0,0 +1,639 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "btDeformableContactProjection.h"
+#include "btDeformableMultiBodyDynamicsWorld.h"
+#include <algorithm>
+#include <cmath>
+btScalar btDeformableContactProjection::update(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal)
+{
+	btScalar residualSquare = 0;
+	for (int i = 0; i < numDeformableBodies; ++i)
+	{
+		for (int j = 0; j < m_softBodies.size(); ++j)
+		{
+			btCollisionObject* psb = m_softBodies[j];
+			if (psb != deformableBodies[i])
+			{
+				continue;
+			}
+			for (int k = 0; k < m_nodeRigidConstraints[j].size(); ++k)
+			{
+				btDeformableNodeRigidContactConstraint& constraint = m_nodeRigidConstraints[j][k];
+				btScalar localResidualSquare = constraint.solveConstraint(infoGlobal);
+				residualSquare = btMax(residualSquare, localResidualSquare);
+			}
+			for (int k = 0; k < m_nodeAnchorConstraints[j].size(); ++k)
+			{
+				btDeformableNodeAnchorConstraint& constraint = m_nodeAnchorConstraints[j][k];
+				btScalar localResidualSquare = constraint.solveConstraint(infoGlobal);
+				residualSquare = btMax(residualSquare, localResidualSquare);
+			}
+			for (int k = 0; k < m_faceRigidConstraints[j].size(); ++k)
+			{
+				btDeformableFaceRigidContactConstraint& constraint = m_faceRigidConstraints[j][k];
+				btScalar localResidualSquare = constraint.solveConstraint(infoGlobal);
+				residualSquare = btMax(residualSquare, localResidualSquare);
+			}
+			for (int k = 0; k < m_deformableConstraints[j].size(); ++k)
+			{
+				btDeformableFaceNodeContactConstraint& constraint = m_deformableConstraints[j][k];
+				btScalar localResidualSquare = constraint.solveConstraint(infoGlobal);
+				residualSquare = btMax(residualSquare, localResidualSquare);
+			}
+		}
+	}
+	return residualSquare;
+}
+
+btScalar btDeformableContactProjection::solveSplitImpulse(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal)
+{
+	btScalar residualSquare = 0;
+	for (int i = 0; i < numDeformableBodies; ++i)
+	{
+		for (int j = 0; j < m_softBodies.size(); ++j)
+		{
+			btCollisionObject* psb = m_softBodies[j];
+			if (psb != deformableBodies[i])
+			{
+				continue;
+			}
+			for (int k = 0; k < m_nodeRigidConstraints[j].size(); ++k)
+			{
+				btDeformableNodeRigidContactConstraint& constraint = m_nodeRigidConstraints[j][k];
+				btScalar localResidualSquare = constraint.solveSplitImpulse(infoGlobal);
+				residualSquare = btMax(residualSquare, localResidualSquare);
+			}
+			for (int k = 0; k < m_faceRigidConstraints[j].size(); ++k)
+			{
+				btDeformableFaceRigidContactConstraint& constraint = m_faceRigidConstraints[j][k];
+				btScalar localResidualSquare = constraint.solveSplitImpulse(infoGlobal);
+				residualSquare = btMax(residualSquare, localResidualSquare);
+			}
+		}
+	}
+	return residualSquare;
+}
+
+void btDeformableContactProjection::setConstraints(const btContactSolverInfo& infoGlobal)
+{
+	BT_PROFILE("setConstraints");
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (!psb->isActive())
+		{
+			continue;
+		}
+
+		// set Dirichlet constraint
+		for (int j = 0; j < psb->m_nodes.size(); ++j)
+		{
+			if (psb->m_nodes[j].m_im == 0)
+			{
+				btDeformableStaticConstraint static_constraint(&psb->m_nodes[j], infoGlobal);
+				m_staticConstraints[i].push_back(static_constraint);
+			}
+		}
+
+		// set up deformable anchors
+		for (int j = 0; j < psb->m_deformableAnchors.size(); ++j)
+		{
+			btSoftBody::DeformableNodeRigidAnchor& anchor = psb->m_deformableAnchors[j];
+			// skip fixed points
+			if (anchor.m_node->m_im == 0)
+			{
+				continue;
+			}
+			anchor.m_c1 = anchor.m_cti.m_colObj->getWorldTransform().getBasis() * anchor.m_local;
+			btDeformableNodeAnchorConstraint constraint(anchor, infoGlobal);
+			m_nodeAnchorConstraints[i].push_back(constraint);
+		}
+
+		// set Deformable Node vs. Rigid constraint
+		for (int j = 0; j < psb->m_nodeRigidContacts.size(); ++j)
+		{
+			const btSoftBody::DeformableNodeRigidContact& contact = psb->m_nodeRigidContacts[j];
+			// skip fixed points
+			if (contact.m_node->m_im == 0)
+			{
+				continue;
+			}
+			btDeformableNodeRigidContactConstraint constraint(contact, infoGlobal);
+			m_nodeRigidConstraints[i].push_back(constraint);
+		}
+
+		// set Deformable Face vs. Rigid constraint
+		for (int j = 0; j < psb->m_faceRigidContacts.size(); ++j)
+		{
+			const btSoftBody::DeformableFaceRigidContact& contact = psb->m_faceRigidContacts[j];
+			// skip fixed faces
+			if (contact.m_c2 == 0)
+			{
+				continue;
+			}
+			btDeformableFaceRigidContactConstraint constraint(contact, infoGlobal, m_useStrainLimiting);
+			m_faceRigidConstraints[i].push_back(constraint);
+		}
+	}
+}
+
+void btDeformableContactProjection::project(TVStack& x)
+{
+#ifndef USE_MGS
+	const int dim = 3;
+	for (int index = 0; index < m_projectionsDict.size(); ++index)
+	{
+		btAlignedObjectArray<btVector3>& projectionDirs = *m_projectionsDict.getAtIndex(index);
+		size_t i = m_projectionsDict.getKeyAtIndex(index).getUid1();
+		if (projectionDirs.size() >= dim)
+		{
+			// static node
+			x[i].setZero();
+			continue;
+		}
+		else if (projectionDirs.size() == 2)
+		{
+			btVector3 dir0 = projectionDirs[0];
+			btVector3 dir1 = projectionDirs[1];
+			btVector3 free_dir = btCross(dir0, dir1);
+			if (free_dir.safeNorm() < SIMD_EPSILON)
+			{
+				x[i] -= x[i].dot(dir0) * dir0;
+			}
+			else
+			{
+				free_dir.normalize();
+				x[i] = x[i].dot(free_dir) * free_dir;
+			}
+		}
+		else
+		{
+			btAssert(projectionDirs.size() == 1);
+			btVector3 dir0 = projectionDirs[0];
+			x[i] -= x[i].dot(dir0) * dir0;
+		}
+	}
+#else
+	btReducedVector p(x.size());
+	for (int i = 0; i < m_projections.size(); ++i)
+	{
+		p += (m_projections[i].dot(x) * m_projections[i]);
+	}
+	for (int i = 0; i < p.m_indices.size(); ++i)
+	{
+		x[p.m_indices[i]] -= p.m_vecs[i];
+	}
+#endif
+}
+
+void btDeformableContactProjection::setProjection()
+{
+#ifndef USE_MGS
+	BT_PROFILE("btDeformableContactProjection::setProjection");
+	btAlignedObjectArray<btVector3> units;
+	units.push_back(btVector3(1, 0, 0));
+	units.push_back(btVector3(0, 1, 0));
+	units.push_back(btVector3(0, 0, 1));
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (!psb->isActive())
+		{
+			continue;
+		}
+		for (int j = 0; j < m_staticConstraints[i].size(); ++j)
+		{
+			int index = m_staticConstraints[i][j].m_node->index;
+			m_staticConstraints[i][j].m_node->m_constrained = true;
+			if (m_projectionsDict.find(index) == NULL)
+			{
+				m_projectionsDict.insert(index, units);
+			}
+			else
+			{
+				btAlignedObjectArray<btVector3>& projections = *m_projectionsDict[index];
+				for (int k = 0; k < 3; ++k)
+				{
+					projections.push_back(units[k]);
+				}
+			}
+		}
+		for (int j = 0; j < m_nodeAnchorConstraints[i].size(); ++j)
+		{
+			int index = m_nodeAnchorConstraints[i][j].m_anchor->m_node->index;
+			m_nodeAnchorConstraints[i][j].m_anchor->m_node->m_constrained = true;
+			if (m_projectionsDict.find(index) == NULL)
+			{
+				m_projectionsDict.insert(index, units);
+			}
+			else
+			{
+				btAlignedObjectArray<btVector3>& projections = *m_projectionsDict[index];
+				for (int k = 0; k < 3; ++k)
+				{
+					projections.push_back(units[k]);
+				}
+			}
+		}
+		for (int j = 0; j < m_nodeRigidConstraints[i].size(); ++j)
+		{
+			int index = m_nodeRigidConstraints[i][j].m_node->index;
+			m_nodeRigidConstraints[i][j].m_node->m_constrained = true;
+			if (m_nodeRigidConstraints[i][j].m_binding)
+			{
+				if (m_nodeRigidConstraints[i][j].m_static)
+				{
+					if (m_projectionsDict.find(index) == NULL)
+					{
+						m_projectionsDict.insert(index, units);
+					}
+					else
+					{
+						btAlignedObjectArray<btVector3>& projections = *m_projectionsDict[index];
+						for (int k = 0; k < 3; ++k)
+						{
+							projections.push_back(units[k]);
+						}
+					}
+				}
+				else
+				{
+					if (m_projectionsDict.find(index) == NULL)
+					{
+						btAlignedObjectArray<btVector3> projections;
+						projections.push_back(m_nodeRigidConstraints[i][j].m_normal);
+						m_projectionsDict.insert(index, projections);
+					}
+					else
+					{
+						btAlignedObjectArray<btVector3>& projections = *m_projectionsDict[index];
+						projections.push_back(m_nodeRigidConstraints[i][j].m_normal);
+					}
+				}
+			}
+		}
+		for (int j = 0; j < m_faceRigidConstraints[i].size(); ++j)
+		{
+			const btSoftBody::Face* face = m_faceRigidConstraints[i][j].m_face;
+			if (m_faceRigidConstraints[i][j].m_binding)
+			{
+				for (int k = 0; k < 3; ++k)
+				{
+					face->m_n[k]->m_constrained = true;
+				}
+			}
+			for (int k = 0; k < 3; ++k)
+			{
+				btSoftBody::Node* node = face->m_n[k];
+				int index = node->index;
+				if (m_faceRigidConstraints[i][j].m_static)
+				{
+					if (m_projectionsDict.find(index) == NULL)
+					{
+						m_projectionsDict.insert(index, units);
+					}
+					else
+					{
+						btAlignedObjectArray<btVector3>& projections = *m_projectionsDict[index];
+						for (int l = 0; l < 3; ++l)
+						{
+							projections.push_back(units[l]);
+						}
+					}
+				}
+				else
+				{
+					if (m_projectionsDict.find(index) == NULL)
+					{
+						btAlignedObjectArray<btVector3> projections;
+						projections.push_back(m_faceRigidConstraints[i][j].m_normal);
+						m_projectionsDict.insert(index, projections);
+					}
+					else
+					{
+						btAlignedObjectArray<btVector3>& projections = *m_projectionsDict[index];
+						projections.push_back(m_faceRigidConstraints[i][j].m_normal);
+					}
+				}
+			}
+		}
+	}
+#else
+	int dof = 0;
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		dof += m_softBodies[i]->m_nodes.size();
+	}
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (!psb->isActive())
+		{
+			continue;
+		}
+		for (int j = 0; j < m_staticConstraints[i].size(); ++j)
+		{
+			int index = m_staticConstraints[i][j].m_node->index;
+			m_staticConstraints[i][j].m_node->m_penetration = SIMD_INFINITY;
+			btAlignedObjectArray<int> indices;
+			btAlignedObjectArray<btVector3> vecs1, vecs2, vecs3;
+			indices.push_back(index);
+			vecs1.push_back(btVector3(1, 0, 0));
+			vecs2.push_back(btVector3(0, 1, 0));
+			vecs3.push_back(btVector3(0, 0, 1));
+			m_projections.push_back(btReducedVector(dof, indices, vecs1));
+			m_projections.push_back(btReducedVector(dof, indices, vecs2));
+			m_projections.push_back(btReducedVector(dof, indices, vecs3));
+		}
+
+		for (int j = 0; j < m_nodeAnchorConstraints[i].size(); ++j)
+		{
+			int index = m_nodeAnchorConstraints[i][j].m_anchor->m_node->index;
+			m_nodeAnchorConstraints[i][j].m_anchor->m_node->m_penetration = SIMD_INFINITY;
+			btAlignedObjectArray<int> indices;
+			btAlignedObjectArray<btVector3> vecs1, vecs2, vecs3;
+			indices.push_back(index);
+			vecs1.push_back(btVector3(1, 0, 0));
+			vecs2.push_back(btVector3(0, 1, 0));
+			vecs3.push_back(btVector3(0, 0, 1));
+			m_projections.push_back(btReducedVector(dof, indices, vecs1));
+			m_projections.push_back(btReducedVector(dof, indices, vecs2));
+			m_projections.push_back(btReducedVector(dof, indices, vecs3));
+		}
+		for (int j = 0; j < m_nodeRigidConstraints[i].size(); ++j)
+		{
+			int index = m_nodeRigidConstraints[i][j].m_node->index;
+			m_nodeRigidConstraints[i][j].m_node->m_penetration = -m_nodeRigidConstraints[i][j].getContact()->m_cti.m_offset;
+			btAlignedObjectArray<int> indices;
+			indices.push_back(index);
+			btAlignedObjectArray<btVector3> vecs1, vecs2, vecs3;
+			if (m_nodeRigidConstraints[i][j].m_static)
+			{
+				vecs1.push_back(btVector3(1, 0, 0));
+				vecs2.push_back(btVector3(0, 1, 0));
+				vecs3.push_back(btVector3(0, 0, 1));
+				m_projections.push_back(btReducedVector(dof, indices, vecs1));
+				m_projections.push_back(btReducedVector(dof, indices, vecs2));
+				m_projections.push_back(btReducedVector(dof, indices, vecs3));
+			}
+			else
+			{
+				vecs1.push_back(m_nodeRigidConstraints[i][j].m_normal);
+				m_projections.push_back(btReducedVector(dof, indices, vecs1));
+			}
+		}
+		for (int j = 0; j < m_faceRigidConstraints[i].size(); ++j)
+		{
+			const btSoftBody::Face* face = m_faceRigidConstraints[i][j].m_face;
+			btVector3 bary = m_faceRigidConstraints[i][j].getContact()->m_bary;
+			btScalar penetration = -m_faceRigidConstraints[i][j].getContact()->m_cti.m_offset;
+			for (int k = 0; k < 3; ++k)
+			{
+				face->m_n[k]->m_penetration = btMax(face->m_n[k]->m_penetration, penetration);
+			}
+			if (m_faceRigidConstraints[i][j].m_static)
+			{
+				for (int l = 0; l < 3; ++l)
+				{
+					btReducedVector rv(dof);
+					for (int k = 0; k < 3; ++k)
+					{
+						rv.m_indices.push_back(face->m_n[k]->index);
+						btVector3 v(0, 0, 0);
+						v[l] = bary[k];
+						rv.m_vecs.push_back(v);
+						rv.sort();
+					}
+					m_projections.push_back(rv);
+				}
+			}
+			else
+			{
+				btReducedVector rv(dof);
+				for (int k = 0; k < 3; ++k)
+				{
+					rv.m_indices.push_back(face->m_n[k]->index);
+					rv.m_vecs.push_back(bary[k] * m_faceRigidConstraints[i][j].m_normal);
+					rv.sort();
+				}
+				m_projections.push_back(rv);
+			}
+		}
+	}
+	btModifiedGramSchmidt<btReducedVector> mgs(m_projections);
+	mgs.solve();
+	m_projections = mgs.m_out;
+#endif
+}
+
+void btDeformableContactProjection::checkConstraints(const TVStack& x)
+{
+	for (int i = 0; i < m_lagrangeMultipliers.size(); ++i)
+	{
+		btVector3 d(0, 0, 0);
+		const LagrangeMultiplier& lm = m_lagrangeMultipliers[i];
+		for (int j = 0; j < lm.m_num_constraints; ++j)
+		{
+			for (int k = 0; k < lm.m_num_nodes; ++k)
+			{
+				d[j] += lm.m_weights[k] * x[lm.m_indices[k]].dot(lm.m_dirs[j]);
+			}
+		}
+		//		printf("d = %f, %f, %f\n", d[0], d[1], d[2]);
+		//        printf("val = %f, %f, %f\n", lm.m_vals[0], lm.m_vals[1], lm.m_vals[2]);
+	}
+}
+
+void btDeformableContactProjection::setLagrangeMultiplier()
+{
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (!psb->isActive())
+		{
+			continue;
+		}
+		for (int j = 0; j < m_staticConstraints[i].size(); ++j)
+		{
+			int index = m_staticConstraints[i][j].m_node->index;
+			m_staticConstraints[i][j].m_node->m_constrained = true;
+			LagrangeMultiplier lm;
+			lm.m_num_nodes = 1;
+			lm.m_indices[0] = index;
+			lm.m_weights[0] = 1.0;
+			lm.m_num_constraints = 3;
+			lm.m_dirs[0] = btVector3(1, 0, 0);
+			lm.m_dirs[1] = btVector3(0, 1, 0);
+			lm.m_dirs[2] = btVector3(0, 0, 1);
+			m_lagrangeMultipliers.push_back(lm);
+		}
+		for (int j = 0; j < m_nodeAnchorConstraints[i].size(); ++j)
+		{
+			int index = m_nodeAnchorConstraints[i][j].m_anchor->m_node->index;
+			m_nodeAnchorConstraints[i][j].m_anchor->m_node->m_constrained = true;
+			LagrangeMultiplier lm;
+			lm.m_num_nodes = 1;
+			lm.m_indices[0] = index;
+			lm.m_weights[0] = 1.0;
+			lm.m_num_constraints = 3;
+			lm.m_dirs[0] = btVector3(1, 0, 0);
+			lm.m_dirs[1] = btVector3(0, 1, 0);
+			lm.m_dirs[2] = btVector3(0, 0, 1);
+			m_lagrangeMultipliers.push_back(lm);
+		}
+
+		for (int j = 0; j < m_nodeRigidConstraints[i].size(); ++j)
+		{
+			if (!m_nodeRigidConstraints[i][j].m_binding)
+			{
+				continue;
+			}
+			int index = m_nodeRigidConstraints[i][j].m_node->index;
+			m_nodeRigidConstraints[i][j].m_node->m_constrained = true;
+			LagrangeMultiplier lm;
+			lm.m_num_nodes = 1;
+			lm.m_indices[0] = index;
+			lm.m_weights[0] = 1.0;
+			if (m_nodeRigidConstraints[i][j].m_static)
+			{
+				lm.m_num_constraints = 3;
+				lm.m_dirs[0] = btVector3(1, 0, 0);
+				lm.m_dirs[1] = btVector3(0, 1, 0);
+				lm.m_dirs[2] = btVector3(0, 0, 1);
+			}
+			else
+			{
+				lm.m_num_constraints = 1;
+				lm.m_dirs[0] = m_nodeRigidConstraints[i][j].m_normal;
+			}
+			m_lagrangeMultipliers.push_back(lm);
+		}
+
+		for (int j = 0; j < m_faceRigidConstraints[i].size(); ++j)
+		{
+			if (!m_faceRigidConstraints[i][j].m_binding)
+			{
+				continue;
+			}
+			btSoftBody::Face* face = m_faceRigidConstraints[i][j].m_face;
+
+			btVector3 bary = m_faceRigidConstraints[i][j].getContact()->m_bary;
+			LagrangeMultiplier lm;
+			lm.m_num_nodes = 3;
+
+			for (int k = 0; k < 3; ++k)
+			{
+				face->m_n[k]->m_constrained = true;
+				lm.m_indices[k] = face->m_n[k]->index;
+				lm.m_weights[k] = bary[k];
+			}
+			if (m_faceRigidConstraints[i][j].m_static)
+			{
+				face->m_pcontact[3] = 1;
+				lm.m_num_constraints = 3;
+				lm.m_dirs[0] = btVector3(1, 0, 0);
+				lm.m_dirs[1] = btVector3(0, 1, 0);
+				lm.m_dirs[2] = btVector3(0, 0, 1);
+			}
+			else
+			{
+				face->m_pcontact[3] = 0;
+				lm.m_num_constraints = 1;
+				lm.m_dirs[0] = m_faceRigidConstraints[i][j].m_normal;
+			}
+			m_lagrangeMultipliers.push_back(lm);
+		}
+	}
+}
+
+//
+void btDeformableContactProjection::applyDynamicFriction(TVStack& f)
+{
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		for (int j = 0; j < m_nodeRigidConstraints[i].size(); ++j)
+		{
+			const btDeformableNodeRigidContactConstraint& constraint = m_nodeRigidConstraints[i][j];
+			const btSoftBody::Node* node = constraint.m_node;
+			if (node->m_im != 0)
+			{
+				int index = node->index;
+				f[index] += constraint.getDv(node) * (1. / node->m_im);
+			}
+		}
+		for (int j = 0; j < m_faceRigidConstraints[i].size(); ++j)
+		{
+			const btDeformableFaceRigidContactConstraint& constraint = m_faceRigidConstraints[i][j];
+			const btSoftBody::Face* face = constraint.getContact()->m_face;
+			for (int k = 0; k < 3; ++k)
+			{
+				const btSoftBody::Node* node = face->m_n[k];
+				if (node->m_im != 0)
+				{
+					int index = node->index;
+					f[index] += constraint.getDv(node) * (1. / node->m_im);
+				}
+			}
+		}
+		for (int j = 0; j < m_deformableConstraints[i].size(); ++j)
+		{
+			const btDeformableFaceNodeContactConstraint& constraint = m_deformableConstraints[i][j];
+			const btSoftBody::Face* face = constraint.getContact()->m_face;
+			const btSoftBody::Node* node = constraint.getContact()->m_node;
+			if (node->m_im != 0)
+			{
+				int index = node->index;
+				f[index] += constraint.getDv(node) * (1. / node->m_im);
+			}
+			for (int k = 0; k < 3; ++k)
+			{
+				const btSoftBody::Node* node = face->m_n[k];
+				if (node->m_im != 0)
+				{
+					int index = node->index;
+					f[index] += constraint.getDv(node) * (1. / node->m_im);
+				}
+			}
+		}
+	}
+}
+
+void btDeformableContactProjection::reinitialize(bool nodeUpdated)
+{
+	int N = m_softBodies.size();
+	if (nodeUpdated)
+	{
+		m_staticConstraints.resize(N);
+		m_nodeAnchorConstraints.resize(N);
+		m_nodeRigidConstraints.resize(N);
+		m_faceRigidConstraints.resize(N);
+		m_deformableConstraints.resize(N);
+	}
+	for (int i = 0; i < N; ++i)
+	{
+		m_staticConstraints[i].clear();
+		m_nodeAnchorConstraints[i].clear();
+		m_nodeRigidConstraints[i].clear();
+		m_faceRigidConstraints[i].clear();
+		m_deformableConstraints[i].clear();
+	}
+#ifndef USE_MGS
+	m_projectionsDict.clear();
+#else
+	m_projections.clear();
+#endif
+	m_lagrangeMultipliers.clear();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactProjection.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactProjection.h
new file mode 100644
index 0000000..4964eaf
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableContactProjection.h
@@ -0,0 +1,99 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_CONTACT_PROJECTION_H
+#define BT_CONTACT_PROJECTION_H
+#include "btCGProjection.h"
+#include "btSoftBody.h"
+#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h"
+#include "btDeformableContactConstraint.h"
+#include "LinearMath/btHashMap.h"
+#include "LinearMath/btReducedVector.h"
+#include "LinearMath/btModifiedGramSchmidt.h"
+#include <vector>
+
+struct LagrangeMultiplier
+{
+	int m_num_constraints;  // Number of constraints
+	int m_num_nodes;        // Number of nodes in these constraints
+	btScalar m_weights[3];  // weights of the nodes involved, same size as m_num_nodes
+	btVector3 m_dirs[3];    // Constraint directions, same size of m_num_constraints;
+	int m_indices[3];       // indices of the nodes involved, same size as m_num_nodes;
+};
+
+class btDeformableContactProjection
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btAlignedObjectArray<btSoftBody*>& m_softBodies;
+
+	// all constraints involving face
+	btAlignedObjectArray<btDeformableContactConstraint*> m_allFaceConstraints;
+#ifndef USE_MGS
+	// map from node index to projection directions
+	btHashMap<btHashInt, btAlignedObjectArray<btVector3> > m_projectionsDict;
+#else
+	btAlignedObjectArray<btReducedVector> m_projections;
+#endif
+
+	btAlignedObjectArray<LagrangeMultiplier> m_lagrangeMultipliers;
+
+	// map from node index to static constraint
+	btAlignedObjectArray<btAlignedObjectArray<btDeformableStaticConstraint> > m_staticConstraints;
+	// map from node index to node rigid constraint
+	btAlignedObjectArray<btAlignedObjectArray<btDeformableNodeRigidContactConstraint> > m_nodeRigidConstraints;
+	// map from node index to face rigid constraint
+	btAlignedObjectArray<btAlignedObjectArray<btDeformableFaceRigidContactConstraint> > m_faceRigidConstraints;
+	// map from node index to deformable constraint
+	btAlignedObjectArray<btAlignedObjectArray<btDeformableFaceNodeContactConstraint> > m_deformableConstraints;
+	// map from node index to node anchor constraint
+	btAlignedObjectArray<btAlignedObjectArray<btDeformableNodeAnchorConstraint> > m_nodeAnchorConstraints;
+
+	bool m_useStrainLimiting;
+
+	btDeformableContactProjection(btAlignedObjectArray<btSoftBody*>& softBodies)
+		: m_softBodies(softBodies)
+	{
+	}
+
+	virtual ~btDeformableContactProjection()
+	{
+	}
+
+	// apply the constraints to the rhs of the linear solve
+	virtual void project(TVStack& x);
+
+	// add friction force to the rhs of the linear solve
+	virtual void applyDynamicFriction(TVStack& f);
+
+	// update and solve the constraints
+	virtual btScalar update(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal);
+
+	// Add constraints to m_constraints. In addition, the constraints that each vertex own are recorded in m_constraintsDict.
+	virtual void setConstraints(const btContactSolverInfo& infoGlobal);
+
+	// Set up projections for each vertex by adding the projection direction to
+	virtual void setProjection();
+
+	virtual void reinitialize(bool nodeUpdated);
+
+	btScalar solveSplitImpulse(btCollisionObject** deformableBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal);
+
+	virtual void setLagrangeMultiplier();
+
+	void checkConstraints(const TVStack& x);
+};
+#endif /* btDeformableContactProjection_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableCorotatedForce.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableCorotatedForce.h
new file mode 100644
index 0000000..dfd8552
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableCorotatedForce.h
@@ -0,0 +1,124 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_COROTATED_H
+#define BT_COROTATED_H
+
+#include "btDeformableLagrangianForce.h"
+#include "LinearMath/btPolarDecomposition.h"
+
+static inline int PolarDecomposition(const btMatrix3x3& m, btMatrix3x3& q, btMatrix3x3& s)
+{
+	static const btPolarDecomposition polar;
+	return polar.decompose(m, q, s);
+}
+
+class btDeformableCorotatedForce : public btDeformableLagrangianForce
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btScalar m_mu, m_lambda;
+	btDeformableCorotatedForce() : m_mu(1), m_lambda(1)
+	{
+	}
+
+	btDeformableCorotatedForce(btScalar mu, btScalar lambda) : m_mu(mu), m_lambda(lambda)
+	{
+	}
+
+	virtual void addScaledForces(btScalar scale, TVStack& force)
+	{
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledExplicitForce(btScalar scale, TVStack& force)
+	{
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledDampingForce(btScalar scale, TVStack& force)
+	{
+	}
+
+	virtual void addScaledElasticForce(btScalar scale, TVStack& force)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btMatrix3x3 P;
+				firstPiola(tetra.m_F, P);
+				btVector3 force_on_node0 = P * (tetra.m_Dm_inverse.transpose() * grad_N_hat_1st_col);
+				btMatrix3x3 force_on_node123 = P * tetra.m_Dm_inverse.transpose();
+
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+
+				// elastic force
+				// explicit elastic force
+				btScalar scale1 = scale * tetra.m_element_measure;
+				force[id0] -= scale1 * force_on_node0;
+				force[id1] -= scale1 * force_on_node123.getColumn(0);
+				force[id2] -= scale1 * force_on_node123.getColumn(1);
+				force[id3] -= scale1 * force_on_node123.getColumn(2);
+			}
+		}
+	}
+
+	void firstPiola(const btMatrix3x3& F, btMatrix3x3& P)
+	{
+		// btMatrix3x3 JFinvT = F.adjoint();
+		btScalar J = F.determinant();
+		P = F.adjoint().transpose() * (m_lambda * (J - 1));
+		if (m_mu > SIMD_EPSILON)
+		{
+			btMatrix3x3 R, S;
+			if (J < 1024 * SIMD_EPSILON)
+				R.setIdentity();
+			else
+				PolarDecomposition(F, R, S);  // this QR is not robust, consider using implicit shift svd
+			/*https://fuchuyuan.github.io/research/svd/paper.pdf*/
+			P += (F - R) * 2 * m_mu;
+		}
+	}
+
+	virtual void addScaledElasticForceDifferential(btScalar scale, const TVStack& dx, TVStack& df)
+	{
+	}
+
+	virtual void addScaledDampingForceDifferential(btScalar scale, const TVStack& dv, TVStack& df)
+	{
+	}
+
+	virtual void buildDampingForceDifferentialDiagonal(btScalar scale, TVStack& diagA) {}
+
+	virtual btDeformableLagrangianForceType getForceType()
+	{
+		return BT_COROTATED_FORCE;
+	}
+};
+
+#endif /* btCorotated_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableGravityForce.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableGravityForce.h
new file mode 100644
index 0000000..d91867f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableGravityForce.h
@@ -0,0 +1,105 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_DEFORMABLE_GRAVITY_FORCE_H
+#define BT_DEFORMABLE_GRAVITY_FORCE_H
+
+#include "btDeformableLagrangianForce.h"
+
+class btDeformableGravityForce : public btDeformableLagrangianForce
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btVector3 m_gravity;
+
+	btDeformableGravityForce(const btVector3& g) : m_gravity(g)
+	{
+	}
+
+	virtual void addScaledForces(btScalar scale, TVStack& force)
+	{
+		addScaledGravityForce(scale, force);
+	}
+
+	virtual void addScaledExplicitForce(btScalar scale, TVStack& force)
+	{
+		addScaledGravityForce(scale, force);
+	}
+
+	virtual void addScaledDampingForce(btScalar scale, TVStack& force)
+	{
+	}
+
+	virtual void addScaledElasticForceDifferential(btScalar scale, const TVStack& dx, TVStack& df)
+	{
+	}
+
+	virtual void addScaledDampingForceDifferential(btScalar scale, const TVStack& dv, TVStack& df)
+	{
+	}
+
+	virtual void buildDampingForceDifferentialDiagonal(btScalar scale, TVStack& diagA) {}
+
+	virtual void addScaledGravityForce(btScalar scale, TVStack& force)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				btSoftBody::Node& n = psb->m_nodes[j];
+				size_t id = n.index;
+				btScalar mass = (n.m_im == 0) ? 0 : 1. / n.m_im;
+				btVector3 scaled_force = scale * m_gravity * mass * m_softBodies[i]->m_gravityFactor;
+				force[id] += scaled_force;
+			}
+		}
+	}
+
+	virtual btDeformableLagrangianForceType getForceType()
+	{
+		return BT_GRAVITY_FORCE;
+	}
+
+	// the gravitational potential energy
+	virtual double totalEnergy(btScalar dt)
+	{
+		double e = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				if (node.m_im > 0)
+				{
+					e -= m_gravity.dot(node.m_q) / node.m_im;
+				}
+			}
+		}
+		return e;
+	}
+};
+#endif /* BT_DEFORMABLE_GRAVITY_FORCE_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableLagrangianForce.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableLagrangianForce.h
new file mode 100644
index 0000000..d58d825
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableLagrangianForce.h
@@ -0,0 +1,372 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_DEFORMABLE_LAGRANGIAN_FORCE_H
+#define BT_DEFORMABLE_LAGRANGIAN_FORCE_H
+
+#include "btSoftBody.h"
+#include <LinearMath/btHashMap.h>
+#include <iostream>
+
+enum btDeformableLagrangianForceType
+{
+	BT_GRAVITY_FORCE = 1,
+	BT_MASSSPRING_FORCE = 2,
+	BT_COROTATED_FORCE = 3,
+	BT_NEOHOOKEAN_FORCE = 4,
+	BT_LINEAR_ELASTICITY_FORCE = 5,
+	BT_MOUSE_PICKING_FORCE = 6
+};
+
+static inline double randomDouble(double low, double high)
+{
+	return low + static_cast<double>(rand()) / RAND_MAX * (high - low);
+}
+
+class btDeformableLagrangianForce
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btAlignedObjectArray<btSoftBody*> m_softBodies;
+	const btAlignedObjectArray<btSoftBody::Node*>* m_nodes;
+
+	btDeformableLagrangianForce()
+	{
+	}
+
+	virtual ~btDeformableLagrangianForce() {}
+
+	// add all forces
+	virtual void addScaledForces(btScalar scale, TVStack& force) = 0;
+
+	// add damping df
+	virtual void addScaledDampingForceDifferential(btScalar scale, const TVStack& dv, TVStack& df) = 0;
+
+	// build diagonal of A matrix
+	virtual void buildDampingForceDifferentialDiagonal(btScalar scale, TVStack& diagA) = 0;
+
+	// add elastic df
+	virtual void addScaledElasticForceDifferential(btScalar scale, const TVStack& dx, TVStack& df) = 0;
+
+	// add all forces that are explicit in explicit solve
+	virtual void addScaledExplicitForce(btScalar scale, TVStack& force) = 0;
+
+	// add all damping forces
+	virtual void addScaledDampingForce(btScalar scale, TVStack& force) = 0;
+
+	virtual void addScaledHessian(btScalar scale) {}
+
+	virtual btDeformableLagrangianForceType getForceType() = 0;
+
+	virtual void reinitialize(bool nodeUpdated)
+	{
+	}
+
+	// get number of nodes that have the force
+	virtual int getNumNodes()
+	{
+		int numNodes = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			numNodes += m_softBodies[i]->m_nodes.size();
+		}
+		return numNodes;
+	}
+
+	// add a soft body to be affected by the particular lagrangian force
+	virtual void addSoftBody(btSoftBody* psb)
+	{
+		m_softBodies.push_back(psb);
+	}
+
+	virtual void removeSoftBody(btSoftBody* psb)
+	{
+		m_softBodies.remove(psb);
+	}
+
+	virtual void setIndices(const btAlignedObjectArray<btSoftBody::Node*>* nodes)
+	{
+		m_nodes = nodes;
+	}
+
+	// Calculate the incremental deformable generated from the input dx
+	virtual btMatrix3x3 Ds(int id0, int id1, int id2, int id3, const TVStack& dx)
+	{
+		btVector3 c1 = dx[id1] - dx[id0];
+		btVector3 c2 = dx[id2] - dx[id0];
+		btVector3 c3 = dx[id3] - dx[id0];
+		return btMatrix3x3(c1, c2, c3).transpose();
+	}
+
+	// Calculate the incremental deformable generated from the current velocity
+	virtual btMatrix3x3 DsFromVelocity(const btSoftBody::Node* n0, const btSoftBody::Node* n1, const btSoftBody::Node* n2, const btSoftBody::Node* n3)
+	{
+		btVector3 c1 = n1->m_v - n0->m_v;
+		btVector3 c2 = n2->m_v - n0->m_v;
+		btVector3 c3 = n3->m_v - n0->m_v;
+		return btMatrix3x3(c1, c2, c3).transpose();
+	}
+
+	// test for addScaledElasticForce function
+	virtual void testDerivative()
+	{
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				psb->m_nodes[j].m_q += btVector3(randomDouble(-.1, .1), randomDouble(-.1, .1), randomDouble(-.1, .1));
+			}
+			psb->updateDeformation();
+		}
+
+		TVStack dx;
+		dx.resize(getNumNodes());
+		TVStack dphi_dx;
+		dphi_dx.resize(dx.size());
+		for (int i = 0; i < dphi_dx.size(); ++i)
+		{
+			dphi_dx[i].setZero();
+		}
+		addScaledForces(-1, dphi_dx);
+
+		// write down the current position
+		TVStack x;
+		x.resize(dx.size());
+		int counter = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				x[counter] = psb->m_nodes[j].m_q;
+				counter++;
+			}
+		}
+		counter = 0;
+
+		// populate dx with random vectors
+		for (int i = 0; i < dx.size(); ++i)
+		{
+			dx[i].setX(randomDouble(-1, 1));
+			dx[i].setY(randomDouble(-1, 1));
+			dx[i].setZ(randomDouble(-1, 1));
+		}
+
+		btAlignedObjectArray<double> errors;
+		for (int it = 0; it < 10; ++it)
+		{
+			for (int i = 0; i < dx.size(); ++i)
+			{
+				dx[i] *= 0.5;
+			}
+
+			// get dphi/dx * dx
+			double dphi = 0;
+			for (int i = 0; i < dx.size(); ++i)
+			{
+				dphi += dphi_dx[i].dot(dx[i]);
+			}
+
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = x[counter] + dx[counter];
+					counter++;
+				}
+				psb->updateDeformation();
+			}
+			counter = 0;
+			double f1 = totalElasticEnergy(0);
+
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = x[counter] - dx[counter];
+					counter++;
+				}
+				psb->updateDeformation();
+			}
+			counter = 0;
+
+			double f2 = totalElasticEnergy(0);
+
+			//restore m_q
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = x[counter];
+					counter++;
+				}
+				psb->updateDeformation();
+			}
+			counter = 0;
+			double error = f1 - f2 - 2 * dphi;
+			errors.push_back(error);
+			std::cout << "Iteration = " << it << ", f1 = " << f1 << ", f2 = " << f2 << ", error = " << error << std::endl;
+		}
+		for (int i = 1; i < errors.size(); ++i)
+		{
+			std::cout << "Iteration = " << i << ", ratio = " << errors[i - 1] / errors[i] << std::endl;
+		}
+	}
+
+	// test for addScaledElasticForce function
+	virtual void testHessian()
+	{
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				psb->m_nodes[j].m_q += btVector3(randomDouble(-.1, .1), randomDouble(-.1, .1), randomDouble(-.1, .1));
+			}
+			psb->updateDeformation();
+		}
+
+		TVStack dx;
+		dx.resize(getNumNodes());
+		TVStack df;
+		df.resize(dx.size());
+		TVStack f1;
+		f1.resize(dx.size());
+		TVStack f2;
+		f2.resize(dx.size());
+
+		// write down the current position
+		TVStack x;
+		x.resize(dx.size());
+		int counter = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				x[counter] = psb->m_nodes[j].m_q;
+				counter++;
+			}
+		}
+		counter = 0;
+
+		// populate dx with random vectors
+		for (int i = 0; i < dx.size(); ++i)
+		{
+			dx[i].setX(randomDouble(-1, 1));
+			dx[i].setY(randomDouble(-1, 1));
+			dx[i].setZ(randomDouble(-1, 1));
+		}
+
+		btAlignedObjectArray<double> errors;
+		for (int it = 0; it < 10; ++it)
+		{
+			for (int i = 0; i < dx.size(); ++i)
+			{
+				dx[i] *= 0.5;
+			}
+
+			// get df
+			for (int i = 0; i < df.size(); ++i)
+			{
+				df[i].setZero();
+				f1[i].setZero();
+				f2[i].setZero();
+			}
+
+			//set df
+			addScaledElasticForceDifferential(-1, dx, df);
+
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = x[counter] + dx[counter];
+					counter++;
+				}
+				psb->updateDeformation();
+			}
+			counter = 0;
+
+			//set f1
+			addScaledForces(-1, f1);
+
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = x[counter] - dx[counter];
+					counter++;
+				}
+				psb->updateDeformation();
+			}
+			counter = 0;
+
+			//set f2
+			addScaledForces(-1, f2);
+
+			//restore m_q
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = x[counter];
+					counter++;
+				}
+				psb->updateDeformation();
+			}
+			counter = 0;
+			double error = 0;
+			for (int i = 0; i < df.size(); ++i)
+			{
+				btVector3 error_vector = f1[i] - f2[i] - 2 * df[i];
+				error += error_vector.length2();
+			}
+			error = btSqrt(error);
+			errors.push_back(error);
+			std::cout << "Iteration = " << it << ", error = " << error << std::endl;
+		}
+		for (int i = 1; i < errors.size(); ++i)
+		{
+			std::cout << "Iteration = " << i << ", ratio = " << errors[i - 1] / errors[i] << std::endl;
+		}
+	}
+
+	//
+	virtual double totalElasticEnergy(btScalar dt)
+	{
+		return 0;
+	}
+
+	//
+	virtual double totalDampingEnergy(btScalar dt)
+	{
+		return 0;
+	}
+
+	// total Energy takes dt as input because certain energies depend on dt
+	virtual double totalEnergy(btScalar dt)
+	{
+		return totalElasticEnergy(dt) + totalDampingEnergy(dt);
+	}
+};
+#endif /* BT_DEFORMABLE_LAGRANGIAN_FORCE */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableLinearElasticityForce.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableLinearElasticityForce.h
new file mode 100644
index 0000000..9711920
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableLinearElasticityForce.h
@@ -0,0 +1,462 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_LINEAR_ELASTICITY_H
+#define BT_LINEAR_ELASTICITY_H
+
+#include "btDeformableLagrangianForce.h"
+#include "LinearMath/btQuickprof.h"
+#include "btSoftBodyInternals.h"
+#define TETRA_FLAT_THRESHOLD 0.01
+class btDeformableLinearElasticityForce : public btDeformableLagrangianForce
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btScalar m_mu, m_lambda;
+	btScalar m_E, m_nu;  // Young's modulus and Poisson ratio
+	btScalar m_damping_alpha, m_damping_beta;
+	btDeformableLinearElasticityForce() : m_mu(1), m_lambda(1), m_damping_alpha(0.01), m_damping_beta(0.01)
+	{
+		updateYoungsModulusAndPoissonRatio();
+	}
+
+	btDeformableLinearElasticityForce(btScalar mu, btScalar lambda, btScalar damping_alpha = 0.01, btScalar damping_beta = 0.01) : m_mu(mu), m_lambda(lambda), m_damping_alpha(damping_alpha), m_damping_beta(damping_beta)
+	{
+		updateYoungsModulusAndPoissonRatio();
+	}
+
+	void updateYoungsModulusAndPoissonRatio()
+	{
+		// conversion from Lame Parameters to Young's modulus and Poisson ratio
+		// https://en.wikipedia.org/wiki/Lam%C3%A9_parameters
+		m_E = m_mu * (3 * m_lambda + 2 * m_mu) / (m_lambda + m_mu);
+		m_nu = m_lambda * 0.5 / (m_mu + m_lambda);
+	}
+
+	void updateLameParameters()
+	{
+		// conversion from Young's modulus and Poisson ratio to Lame Parameters
+		// https://en.wikipedia.org/wiki/Lam%C3%A9_parameters
+		m_mu = m_E * 0.5 / (1 + m_nu);
+		m_lambda = m_E * m_nu / ((1 + m_nu) * (1 - 2 * m_nu));
+	}
+
+	void setYoungsModulus(btScalar E)
+	{
+		m_E = E;
+		updateLameParameters();
+	}
+
+	void setPoissonRatio(btScalar nu)
+	{
+		m_nu = nu;
+		updateLameParameters();
+	}
+
+	void setDamping(btScalar damping_alpha, btScalar damping_beta)
+	{
+		m_damping_alpha = damping_alpha;
+		m_damping_beta = damping_beta;
+	}
+
+	void setLameParameters(btScalar mu, btScalar lambda)
+	{
+		m_mu = mu;
+		m_lambda = lambda;
+		updateYoungsModulusAndPoissonRatio();
+	}
+
+	virtual void addScaledForces(btScalar scale, TVStack& force)
+	{
+		addScaledDampingForce(scale, force);
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledExplicitForce(btScalar scale, TVStack& force)
+	{
+		addScaledElasticForce(scale, force);
+	}
+
+	// The damping matrix is calculated using the time n state as described in https://www.math.ucla.edu/~jteran/papers/GSSJT15.pdf to allow line search
+	virtual void addScaledDampingForce(btScalar scale, TVStack& force)
+	{
+		if (m_damping_alpha == 0 && m_damping_beta == 0)
+			return;
+		btScalar mu_damp = m_damping_beta * m_mu;
+		btScalar lambda_damp = m_damping_beta * m_lambda;
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				bool close_to_flat = (psb->m_tetraScratches[j].m_J < TETRA_FLAT_THRESHOLD);
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+				btMatrix3x3 dF = DsFromVelocity(node0, node1, node2, node3) * tetra.m_Dm_inverse;
+				if (!close_to_flat)
+				{
+					dF = psb->m_tetraScratches[j].m_corotation.transpose() * dF;
+				}
+				btMatrix3x3 I;
+				I.setIdentity();
+				btMatrix3x3 dP = (dF + dF.transpose()) * mu_damp + I * ((dF[0][0] + dF[1][1] + dF[2][2]) * lambda_damp);
+				btMatrix3x3 df_on_node123 = dP * tetra.m_Dm_inverse.transpose();
+				if (!close_to_flat)
+				{
+					df_on_node123 = psb->m_tetraScratches[j].m_corotation * df_on_node123;
+				}
+				btVector3 df_on_node0 = df_on_node123 * grad_N_hat_1st_col;
+				// damping force differential
+				btScalar scale1 = scale * tetra.m_element_measure;
+				force[id0] -= scale1 * df_on_node0;
+				force[id1] -= scale1 * df_on_node123.getColumn(0);
+				force[id2] -= scale1 * df_on_node123.getColumn(1);
+				force[id3] -= scale1 * df_on_node123.getColumn(2);
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				size_t id = node.index;
+				if (node.m_im > 0)
+				{
+					force[id] -= scale * node.m_v / node.m_im * m_damping_alpha;
+				}
+			}
+		}
+	}
+
+	virtual double totalElasticEnergy(btScalar dt)
+	{
+		double energy = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetraScratches.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::TetraScratch& s = psb->m_tetraScratches[j];
+				energy += tetra.m_element_measure * elasticEnergyDensity(s);
+			}
+		}
+		return energy;
+	}
+
+	// The damping energy is formulated as in https://www.math.ucla.edu/~jteran/papers/GSSJT15.pdf to allow line search
+	virtual double totalDampingEnergy(btScalar dt)
+	{
+		double energy = 0;
+		int sz = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				sz = btMax(sz, psb->m_nodes[j].index);
+			}
+		}
+		TVStack dampingForce;
+		dampingForce.resize(sz + 1);
+		for (int i = 0; i < dampingForce.size(); ++i)
+			dampingForce[i].setZero();
+		addScaledDampingForce(0.5, dampingForce);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				energy -= dampingForce[node.index].dot(node.m_v) / dt;
+			}
+		}
+		return energy;
+	}
+
+	double elasticEnergyDensity(const btSoftBody::TetraScratch& s)
+	{
+		double density = 0;
+		btMatrix3x3 epsilon = (s.m_F + s.m_F.transpose()) * 0.5 - btMatrix3x3::getIdentity();
+		btScalar trace = epsilon[0][0] + epsilon[1][1] + epsilon[2][2];
+		density += m_mu * (epsilon[0].length2() + epsilon[1].length2() + epsilon[2].length2());
+		density += m_lambda * trace * trace * 0.5;
+		return density;
+	}
+
+	virtual void addScaledElasticForce(btScalar scale, TVStack& force)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			btScalar max_p = psb->m_cfg.m_maxStress;
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btMatrix3x3 P;
+				firstPiola(psb->m_tetraScratches[j], P);
+#if USE_SVD
+				if (max_p > 0)
+				{
+					// since we want to clamp the principal stress to max_p, we only need to
+					// calculate SVD when sigma_0^2 + sigma_1^2 + sigma_2^2 > max_p * max_p
+					btScalar trPTP = (P[0].length2() + P[1].length2() + P[2].length2());
+					if (trPTP > max_p * max_p)
+					{
+						btMatrix3x3 U, V;
+						btVector3 sigma;
+						singularValueDecomposition(P, U, sigma, V);
+						sigma[0] = btMin(sigma[0], max_p);
+						sigma[1] = btMin(sigma[1], max_p);
+						sigma[2] = btMin(sigma[2], max_p);
+						sigma[0] = btMax(sigma[0], -max_p);
+						sigma[1] = btMax(sigma[1], -max_p);
+						sigma[2] = btMax(sigma[2], -max_p);
+						btMatrix3x3 Sigma;
+						Sigma.setIdentity();
+						Sigma[0][0] = sigma[0];
+						Sigma[1][1] = sigma[1];
+						Sigma[2][2] = sigma[2];
+						P = U * Sigma * V.transpose();
+					}
+				}
+#endif
+				//                btVector3 force_on_node0 = P * (tetra.m_Dm_inverse.transpose()*grad_N_hat_1st_col);
+				btMatrix3x3 force_on_node123 = psb->m_tetraScratches[j].m_corotation * P * tetra.m_Dm_inverse.transpose();
+				btVector3 force_on_node0 = force_on_node123 * grad_N_hat_1st_col;
+
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+
+				// elastic force
+				btScalar scale1 = scale * tetra.m_element_measure;
+				force[id0] -= scale1 * force_on_node0;
+				force[id1] -= scale1 * force_on_node123.getColumn(0);
+				force[id2] -= scale1 * force_on_node123.getColumn(1);
+				force[id3] -= scale1 * force_on_node123.getColumn(2);
+			}
+		}
+	}
+
+	virtual void buildDampingForceDifferentialDiagonal(btScalar scale, TVStack& diagA) {}
+
+	// The damping matrix is calculated using the time n state as described in https://www.math.ucla.edu/~jteran/papers/GSSJT15.pdf to allow line search
+	virtual void addScaledDampingForceDifferential(btScalar scale, const TVStack& dv, TVStack& df)
+	{
+		if (m_damping_alpha == 0 && m_damping_beta == 0)
+			return;
+		btScalar mu_damp = m_damping_beta * m_mu;
+		btScalar lambda_damp = m_damping_beta * m_lambda;
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= df.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				bool close_to_flat = (psb->m_tetraScratches[j].m_J < TETRA_FLAT_THRESHOLD);
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+				btMatrix3x3 dF = Ds(id0, id1, id2, id3, dv) * tetra.m_Dm_inverse;
+				if (!close_to_flat)
+				{
+					dF = psb->m_tetraScratches[j].m_corotation.transpose() * dF;
+				}
+				btMatrix3x3 I;
+				I.setIdentity();
+				btMatrix3x3 dP = (dF + dF.transpose()) * mu_damp + I * ((dF[0][0] + dF[1][1] + dF[2][2]) * lambda_damp);
+				btMatrix3x3 df_on_node123 = dP * tetra.m_Dm_inverse.transpose();
+				if (!close_to_flat)
+				{
+					df_on_node123 = psb->m_tetraScratches[j].m_corotation * df_on_node123;
+				}
+				btVector3 df_on_node0 = df_on_node123 * grad_N_hat_1st_col;
+
+				// damping force differential
+				btScalar scale1 = scale * tetra.m_element_measure;
+				df[id0] -= scale1 * df_on_node0;
+				df[id1] -= scale1 * df_on_node123.getColumn(0);
+				df[id2] -= scale1 * df_on_node123.getColumn(1);
+				df[id3] -= scale1 * df_on_node123.getColumn(2);
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				size_t id = node.index;
+				if (node.m_im > 0)
+				{
+					df[id] -= scale * dv[id] / node.m_im * m_damping_alpha;
+				}
+			}
+		}
+	}
+
+	virtual void addScaledElasticForceDifferential(btScalar scale, const TVStack& dx, TVStack& df)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= df.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+				btMatrix3x3 dF = psb->m_tetraScratches[j].m_corotation.transpose() * Ds(id0, id1, id2, id3, dx) * tetra.m_Dm_inverse;
+				btMatrix3x3 dP;
+				firstPiolaDifferential(psb->m_tetraScratches[j], dF, dP);
+				//                btVector3 df_on_node0 = dP * (tetra.m_Dm_inverse.transpose()*grad_N_hat_1st_col);
+				btMatrix3x3 df_on_node123 = psb->m_tetraScratches[j].m_corotation * dP * tetra.m_Dm_inverse.transpose();
+				btVector3 df_on_node0 = df_on_node123 * grad_N_hat_1st_col;
+
+				// elastic force differential
+				btScalar scale1 = scale * tetra.m_element_measure;
+				df[id0] -= scale1 * df_on_node0;
+				df[id1] -= scale1 * df_on_node123.getColumn(0);
+				df[id2] -= scale1 * df_on_node123.getColumn(1);
+				df[id3] -= scale1 * df_on_node123.getColumn(2);
+			}
+		}
+	}
+
+	void firstPiola(const btSoftBody::TetraScratch& s, btMatrix3x3& P)
+	{
+		btMatrix3x3 corotated_F = s.m_corotation.transpose() * s.m_F;
+
+		btMatrix3x3 epsilon = (corotated_F + corotated_F.transpose()) * 0.5 - btMatrix3x3::getIdentity();
+		btScalar trace = epsilon[0][0] + epsilon[1][1] + epsilon[2][2];
+		P = epsilon * btScalar(2) * m_mu + btMatrix3x3::getIdentity() * m_lambda * trace;
+	}
+
+	// Let P be the first piola stress.
+	// This function calculates the dP = dP/dF * dF
+	void firstPiolaDifferential(const btSoftBody::TetraScratch& s, const btMatrix3x3& dF, btMatrix3x3& dP)
+	{
+		btScalar trace = (dF[0][0] + dF[1][1] + dF[2][2]);
+		dP = (dF + dF.transpose()) * m_mu + btMatrix3x3::getIdentity() * m_lambda * trace;
+	}
+
+	// Let Q be the damping stress.
+	// This function calculates the dP = dQ/dF * dF
+	void firstPiolaDampingDifferential(const btSoftBody::TetraScratch& s, const btMatrix3x3& dF, btMatrix3x3& dP)
+	{
+		btScalar mu_damp = m_damping_beta * m_mu;
+		btScalar lambda_damp = m_damping_beta * m_lambda;
+		btScalar trace = (dF[0][0] + dF[1][1] + dF[2][2]);
+		dP = (dF + dF.transpose()) * mu_damp + btMatrix3x3::getIdentity() * lambda_damp * trace;
+	}
+
+	virtual void addScaledHessian(btScalar scale)
+	{
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btMatrix3x3 P;
+				firstPiola(psb->m_tetraScratches[j], P);  // make sure scratch is evaluated at x_n + dt * vn
+				btMatrix3x3 force_on_node123 = psb->m_tetraScratches[j].m_corotation * P * tetra.m_Dm_inverse.transpose();
+				btVector3 force_on_node0 = force_on_node123 * grad_N_hat_1st_col;
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				btScalar scale1 = scale * (scale + m_damping_beta) * tetra.m_element_measure;  // stiff and stiffness-damping terms;
+				node0->m_effectiveMass += OuterProduct(force_on_node0, force_on_node0) * scale1;
+				node1->m_effectiveMass += OuterProduct(force_on_node123.getColumn(0), force_on_node123.getColumn(0)) * scale1;
+				node2->m_effectiveMass += OuterProduct(force_on_node123.getColumn(1), force_on_node123.getColumn(1)) * scale1;
+				node3->m_effectiveMass += OuterProduct(force_on_node123.getColumn(2), force_on_node123.getColumn(2)) * scale1;
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				btSoftBody::Node& node = psb->m_nodes[j];
+				if (node.m_im > 0)
+				{
+					btMatrix3x3 I;
+					I.setIdentity();
+					node.m_effectiveMass += I * (scale * (1.0 / node.m_im) * m_damping_alpha);
+				}
+			}
+		}
+	}
+
+	virtual btDeformableLagrangianForceType getForceType()
+	{
+		return BT_LINEAR_ELASTICITY_FORCE;
+	}
+};
+#endif /* BT_LINEAR_ELASTICITY_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMassSpringForce.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMassSpringForce.h
new file mode 100644
index 0000000..8c97bd1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMassSpringForce.h
@@ -0,0 +1,301 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_MASS_SPRING_H
+#define BT_MASS_SPRING_H
+
+#include "btDeformableLagrangianForce.h"
+
+class btDeformableMassSpringForce : public btDeformableLagrangianForce
+{
+	// If true, the damping force will be in the direction of the spring
+	// If false, the damping force will be in the direction of the velocity
+	bool m_momentum_conserving;
+	btScalar m_elasticStiffness, m_dampingStiffness, m_bendingStiffness;
+
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btDeformableMassSpringForce() : m_momentum_conserving(false), m_elasticStiffness(1), m_dampingStiffness(0.05)
+	{
+	}
+	btDeformableMassSpringForce(btScalar k, btScalar d, bool conserve_angular = true, double bending_k = -1) : m_momentum_conserving(conserve_angular), m_elasticStiffness(k), m_dampingStiffness(d), m_bendingStiffness(bending_k)
+	{
+		if (m_bendingStiffness < btScalar(0))
+		{
+			m_bendingStiffness = m_elasticStiffness;
+		}
+	}
+
+	virtual void addScaledForces(btScalar scale, TVStack& force)
+	{
+		addScaledDampingForce(scale, force);
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledExplicitForce(btScalar scale, TVStack& force)
+	{
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledDampingForce(btScalar scale, TVStack& force)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			const btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_links.size(); ++j)
+			{
+				const btSoftBody::Link& link = psb->m_links[j];
+				btSoftBody::Node* node1 = link.m_n[0];
+				btSoftBody::Node* node2 = link.m_n[1];
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+
+				// damping force
+				btVector3 v_diff = (node2->m_v - node1->m_v);
+				btVector3 scaled_force = scale * m_dampingStiffness * v_diff;
+				if (m_momentum_conserving)
+				{
+					if ((node2->m_x - node1->m_x).norm() > SIMD_EPSILON)
+					{
+						btVector3 dir = (node2->m_x - node1->m_x).normalized();
+						scaled_force = scale * m_dampingStiffness * v_diff.dot(dir) * dir;
+					}
+				}
+				force[id1] += scaled_force;
+				force[id2] -= scaled_force;
+			}
+		}
+	}
+
+	virtual void addScaledElasticForce(btScalar scale, TVStack& force)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			const btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_links.size(); ++j)
+			{
+				const btSoftBody::Link& link = psb->m_links[j];
+				btSoftBody::Node* node1 = link.m_n[0];
+				btSoftBody::Node* node2 = link.m_n[1];
+				btScalar r = link.m_rl;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+
+				// elastic force
+				btVector3 dir = (node2->m_q - node1->m_q);
+				btVector3 dir_normalized = (dir.norm() > SIMD_EPSILON) ? dir.normalized() : btVector3(0, 0, 0);
+				btScalar scaled_stiffness = scale * (link.m_bbending ? m_bendingStiffness : m_elasticStiffness);
+				btVector3 scaled_force = scaled_stiffness * (dir - dir_normalized * r);
+				force[id1] += scaled_force;
+				force[id2] -= scaled_force;
+			}
+		}
+	}
+
+	virtual void addScaledDampingForceDifferential(btScalar scale, const TVStack& dv, TVStack& df)
+	{
+		// implicit damping force differential
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			btScalar scaled_k_damp = m_dampingStiffness * scale;
+			for (int j = 0; j < psb->m_links.size(); ++j)
+			{
+				const btSoftBody::Link& link = psb->m_links[j];
+				btSoftBody::Node* node1 = link.m_n[0];
+				btSoftBody::Node* node2 = link.m_n[1];
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+
+				btVector3 local_scaled_df = scaled_k_damp * (dv[id2] - dv[id1]);
+				if (m_momentum_conserving)
+				{
+					if ((node2->m_x - node1->m_x).norm() > SIMD_EPSILON)
+					{
+						btVector3 dir = (node2->m_x - node1->m_x).normalized();
+						local_scaled_df = scaled_k_damp * (dv[id2] - dv[id1]).dot(dir) * dir;
+					}
+				}
+				df[id1] += local_scaled_df;
+				df[id2] -= local_scaled_df;
+			}
+		}
+	}
+
+	virtual void buildDampingForceDifferentialDiagonal(btScalar scale, TVStack& diagA)
+	{
+		// implicit damping force differential
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			btScalar scaled_k_damp = m_dampingStiffness * scale;
+			for (int j = 0; j < psb->m_links.size(); ++j)
+			{
+				const btSoftBody::Link& link = psb->m_links[j];
+				btSoftBody::Node* node1 = link.m_n[0];
+				btSoftBody::Node* node2 = link.m_n[1];
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				if (m_momentum_conserving)
+				{
+					if ((node2->m_x - node1->m_x).norm() > SIMD_EPSILON)
+					{
+						btVector3 dir = (node2->m_x - node1->m_x).normalized();
+						for (int d = 0; d < 3; ++d)
+						{
+							if (node1->m_im > 0)
+								diagA[id1][d] -= scaled_k_damp * dir[d] * dir[d];
+							if (node2->m_im > 0)
+								diagA[id2][d] -= scaled_k_damp * dir[d] * dir[d];
+						}
+					}
+				}
+				else
+				{
+					for (int d = 0; d < 3; ++d)
+					{
+						if (node1->m_im > 0)
+							diagA[id1][d] -= scaled_k_damp;
+						if (node2->m_im > 0)
+							diagA[id2][d] -= scaled_k_damp;
+					}
+				}
+			}
+		}
+	}
+
+	virtual double totalElasticEnergy(btScalar dt)
+	{
+		double energy = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			const btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_links.size(); ++j)
+			{
+				const btSoftBody::Link& link = psb->m_links[j];
+				btSoftBody::Node* node1 = link.m_n[0];
+				btSoftBody::Node* node2 = link.m_n[1];
+				btScalar r = link.m_rl;
+
+				// elastic force
+				btVector3 dir = (node2->m_q - node1->m_q);
+				energy += 0.5 * m_elasticStiffness * (dir.norm() - r) * (dir.norm() - r);
+			}
+		}
+		return energy;
+	}
+
+	virtual double totalDampingEnergy(btScalar dt)
+	{
+		double energy = 0;
+		int sz = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				sz = btMax(sz, psb->m_nodes[j].index);
+			}
+		}
+		TVStack dampingForce;
+		dampingForce.resize(sz + 1);
+		for (int i = 0; i < dampingForce.size(); ++i)
+			dampingForce[i].setZero();
+		addScaledDampingForce(0.5, dampingForce);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				energy -= dampingForce[node.index].dot(node.m_v) / dt;
+			}
+		}
+		return energy;
+	}
+
+	virtual void addScaledElasticForceDifferential(btScalar scale, const TVStack& dx, TVStack& df)
+	{
+		// implicit damping force differential
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			const btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_links.size(); ++j)
+			{
+				const btSoftBody::Link& link = psb->m_links[j];
+				btSoftBody::Node* node1 = link.m_n[0];
+				btSoftBody::Node* node2 = link.m_n[1];
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				btScalar r = link.m_rl;
+
+				btVector3 dir = (node1->m_q - node2->m_q);
+				btScalar dir_norm = dir.norm();
+				btVector3 dir_normalized = (dir_norm > SIMD_EPSILON) ? dir.normalized() : btVector3(0, 0, 0);
+				btVector3 dx_diff = dx[id1] - dx[id2];
+				btVector3 scaled_df = btVector3(0, 0, 0);
+				btScalar scaled_k = scale * (link.m_bbending ? m_bendingStiffness : m_elasticStiffness);
+				if (dir_norm > SIMD_EPSILON)
+				{
+					scaled_df -= scaled_k * dir_normalized.dot(dx_diff) * dir_normalized;
+					scaled_df += scaled_k * dir_normalized.dot(dx_diff) * ((dir_norm - r) / dir_norm) * dir_normalized;
+					scaled_df -= scaled_k * ((dir_norm - r) / dir_norm) * dx_diff;
+				}
+
+				df[id1] += scaled_df;
+				df[id2] -= scaled_df;
+			}
+		}
+	}
+
+	virtual btDeformableLagrangianForceType getForceType()
+	{
+		return BT_MASSSPRING_FORCE;
+	}
+};
+
+#endif /* btMassSpring_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMousePickingForce.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMousePickingForce.h
new file mode 100644
index 0000000..6974083
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMousePickingForce.h
@@ -0,0 +1,162 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_MOUSE_PICKING_FORCE_H
+#define BT_MOUSE_PICKING_FORCE_H
+
+#include "btDeformableLagrangianForce.h"
+
+class btDeformableMousePickingForce : public btDeformableLagrangianForce
+{
+	// If true, the damping force will be in the direction of the spring
+	// If false, the damping force will be in the direction of the velocity
+	btScalar m_elasticStiffness, m_dampingStiffness;
+	const btSoftBody::Face& m_face;
+	btVector3 m_mouse_pos;
+	btScalar m_maxForce;
+
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btDeformableMousePickingForce(btScalar k, btScalar d, const btSoftBody::Face& face, const btVector3& mouse_pos, btScalar maxForce = 0.3) : m_elasticStiffness(k), m_dampingStiffness(d), m_face(face), m_mouse_pos(mouse_pos), m_maxForce(maxForce)
+	{
+	}
+
+	virtual void addScaledForces(btScalar scale, TVStack& force)
+	{
+		addScaledDampingForce(scale, force);
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledExplicitForce(btScalar scale, TVStack& force)
+	{
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledDampingForce(btScalar scale, TVStack& force)
+	{
+		for (int i = 0; i < 3; ++i)
+		{
+			btVector3 v_diff = m_face.m_n[i]->m_v;
+			btVector3 scaled_force = scale * m_dampingStiffness * v_diff;
+			if ((m_face.m_n[i]->m_x - m_mouse_pos).norm() > SIMD_EPSILON)
+			{
+				btVector3 dir = (m_face.m_n[i]->m_x - m_mouse_pos).normalized();
+				scaled_force = scale * m_dampingStiffness * v_diff.dot(dir) * dir;
+			}
+			force[m_face.m_n[i]->index] -= scaled_force;
+		}
+	}
+
+	virtual void addScaledElasticForce(btScalar scale, TVStack& force)
+	{
+		btScalar scaled_stiffness = scale * m_elasticStiffness;
+		for (int i = 0; i < 3; ++i)
+		{
+			btVector3 dir = (m_face.m_n[i]->m_q - m_mouse_pos);
+			btVector3 scaled_force = scaled_stiffness * dir;
+			if (scaled_force.safeNorm() > m_maxForce)
+			{
+				scaled_force.safeNormalize();
+				scaled_force *= m_maxForce;
+			}
+			force[m_face.m_n[i]->index] -= scaled_force;
+		}
+	}
+
+	virtual void addScaledDampingForceDifferential(btScalar scale, const TVStack& dv, TVStack& df)
+	{
+		btScalar scaled_k_damp = m_dampingStiffness * scale;
+		for (int i = 0; i < 3; ++i)
+		{
+			btVector3 local_scaled_df = scaled_k_damp * dv[m_face.m_n[i]->index];
+			if ((m_face.m_n[i]->m_x - m_mouse_pos).norm() > SIMD_EPSILON)
+			{
+				btVector3 dir = (m_face.m_n[i]->m_x - m_mouse_pos).normalized();
+				local_scaled_df = scaled_k_damp * dv[m_face.m_n[i]->index].dot(dir) * dir;
+			}
+			df[m_face.m_n[i]->index] -= local_scaled_df;
+		}
+	}
+
+	virtual void buildDampingForceDifferentialDiagonal(btScalar scale, TVStack& diagA) {}
+
+	virtual double totalElasticEnergy(btScalar dt)
+	{
+		double energy = 0;
+		for (int i = 0; i < 3; ++i)
+		{
+			btVector3 dir = (m_face.m_n[i]->m_q - m_mouse_pos);
+			btVector3 scaled_force = m_elasticStiffness * dir;
+			if (scaled_force.safeNorm() > m_maxForce)
+			{
+				scaled_force.safeNormalize();
+				scaled_force *= m_maxForce;
+			}
+			energy += 0.5 * scaled_force.dot(dir);
+		}
+		return energy;
+	}
+
+	virtual double totalDampingEnergy(btScalar dt)
+	{
+		double energy = 0;
+		for (int i = 0; i < 3; ++i)
+		{
+			btVector3 v_diff = m_face.m_n[i]->m_v;
+			btVector3 scaled_force = m_dampingStiffness * v_diff;
+			if ((m_face.m_n[i]->m_x - m_mouse_pos).norm() > SIMD_EPSILON)
+			{
+				btVector3 dir = (m_face.m_n[i]->m_x - m_mouse_pos).normalized();
+				scaled_force = m_dampingStiffness * v_diff.dot(dir) * dir;
+			}
+			energy -= scaled_force.dot(m_face.m_n[i]->m_v) / dt;
+		}
+		return energy;
+	}
+
+	virtual void addScaledElasticForceDifferential(btScalar scale, const TVStack& dx, TVStack& df)
+	{
+		btScalar scaled_stiffness = scale * m_elasticStiffness;
+		for (int i = 0; i < 3; ++i)
+		{
+			btVector3 dir = (m_face.m_n[i]->m_q - m_mouse_pos);
+			btScalar dir_norm = dir.norm();
+			btVector3 dir_normalized = (dir_norm > SIMD_EPSILON) ? dir.normalized() : btVector3(0, 0, 0);
+			int id = m_face.m_n[i]->index;
+			btVector3 dx_diff = dx[id];
+			btScalar r = 0;  // rest length is 0 for picking spring
+			btVector3 scaled_df = btVector3(0, 0, 0);
+			if (dir_norm > SIMD_EPSILON)
+			{
+				scaled_df -= scaled_stiffness * dir_normalized.dot(dx_diff) * dir_normalized;
+				scaled_df += scaled_stiffness * dir_normalized.dot(dx_diff) * ((dir_norm - r) / dir_norm) * dir_normalized;
+				scaled_df -= scaled_stiffness * ((dir_norm - r) / dir_norm) * dx_diff;
+			}
+			df[id] += scaled_df;
+		}
+	}
+
+	void setMousePos(const btVector3& p)
+	{
+		m_mouse_pos = p;
+	}
+
+	virtual btDeformableLagrangianForceType getForceType()
+	{
+		return BT_MOUSE_PICKING_FORCE;
+	}
+};
+
+#endif /* btMassSpring_h */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp
new file mode 100644
index 0000000..0f30054
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp
@@ -0,0 +1,215 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "btDeformableMultiBodyConstraintSolver.h"
+#include "BulletReducedDeformableBody/btReducedDeformableBodySolver.h"
+#include <iostream>
+
+// override the iterations method to include deformable/multibody contact
+btScalar btDeformableMultiBodyConstraintSolver::solveDeformableGroupIterations(btCollisionObject** bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	{
+		// pair deformable body with solver body
+		pairDeformableAndSolverBody(bodies, numBodies, numDeformableBodies, infoGlobal);
+
+		///this is a special step to resolve penetrations (just for contacts)
+		solveGroupCacheFriendlySplitImpulseIterations(bodies, numBodies, deformableBodies, numDeformableBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+
+		int maxIterations = m_maxOverrideNumSolverIterations > infoGlobal.m_numIterations ? m_maxOverrideNumSolverIterations : infoGlobal.m_numIterations;
+		for (int iteration = 0; iteration < maxIterations; iteration++)
+		{
+			// rigid bodies are solved using solver body velocity, but rigid/deformable contact directly uses the velocity of the actual rigid body. So we have to do the following: Solve one iteration of the rigid/rigid contact, get the updated velocity in the solver body and update the velocity of the underlying rigid body. Then solve the rigid/deformable contact. Finally, grab the (once again) updated rigid velocity and update the velocity of the wrapping solver body
+
+			// solve rigid/rigid in solver body
+			m_leastSquaresResidual = solveSingleIteration(iteration, bodies, numBodies, manifoldPtr, numManifolds, constraints, numConstraints, infoGlobal, debugDrawer);
+			// solver body velocity -> rigid body velocity
+			solverBodyWriteBack(infoGlobal);
+			btScalar deformableResidual = m_deformableSolver->solveContactConstraints(deformableBodies, numDeformableBodies, infoGlobal);
+			// update rigid body velocity in rigid/deformable contact
+			m_leastSquaresResidual = btMax(m_leastSquaresResidual, deformableResidual);
+			// solver body velocity <- rigid body velocity
+			writeToSolverBody(bodies, numBodies, infoGlobal);
+
+
+			// std::cout << "------------Iteration " << iteration << "------------\n";
+			// std::cout << "m_leastSquaresResidual: " << m_leastSquaresResidual << "\n";
+
+			if (m_leastSquaresResidual <= infoGlobal.m_leastSquaresResidualThreshold || (iteration >= (maxIterations - 1)))
+			{
+#ifdef VERBOSE_RESIDUAL_PRINTF
+				if (iteration >= (maxIterations - 1))
+					printf("residual = %f at iteration #%d\n", m_leastSquaresResidual, iteration);
+#endif
+				m_analyticsData.m_numSolverCalls++;
+				m_analyticsData.m_numIterationsUsed = iteration + 1;
+				m_analyticsData.m_islandId = -2;
+				if (numBodies > 0)
+					m_analyticsData.m_islandId = bodies[0]->getCompanionId();
+				m_analyticsData.m_numBodies = numBodies;
+				m_analyticsData.m_numContactManifolds = numManifolds;
+				m_analyticsData.m_remainingLeastSquaresResidual = m_leastSquaresResidual;
+				
+				m_deformableSolver->deformableBodyInternalWriteBack();
+				// std::cout << "[===================Next Step===================]\n";
+				break;
+			}
+		}
+	}
+	return 0.f;
+}
+
+void btDeformableMultiBodyConstraintSolver::solveDeformableBodyGroup(btCollisionObject** bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, btMultiBodyConstraint** multiBodyConstraints, int numMultiBodyConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btDispatcher* dispatcher)
+{
+	m_tmpMultiBodyConstraints = multiBodyConstraints;
+	m_tmpNumMultiBodyConstraints = numMultiBodyConstraints;
+
+	// inherited from MultiBodyConstraintSolver
+	solveGroupCacheFriendlySetup(bodies, numBodies, manifold, numManifolds, constraints, numConstraints, info, debugDrawer);
+
+	// overriden
+	solveDeformableGroupIterations(bodies, numBodies, deformableBodies, numDeformableBodies, manifold, numManifolds, constraints, numConstraints, info, debugDrawer);
+
+	// inherited from MultiBodyConstraintSolver
+	solveGroupCacheFriendlyFinish(bodies, numBodies, info);
+
+	m_tmpMultiBodyConstraints = 0;
+	m_tmpNumMultiBodyConstraints = 0;
+}
+
+void btDeformableMultiBodyConstraintSolver::writeToSolverBody(btCollisionObject** bodies, int numBodies, const btContactSolverInfo& infoGlobal)
+{
+	// reduced soft body solver directly modifies the solver body
+	if (m_deformableSolver->isReducedSolver())
+	{
+		return;
+	}
+
+	for (int i = 0; i < numBodies; i++)
+	{
+		int bodyId = getOrInitSolverBody(*bodies[i], infoGlobal.m_timeStep);
+
+		btRigidBody* body = btRigidBody::upcast(bodies[i]);
+		if (body && body->getInvMass())
+		{
+			btSolverBody& solverBody = m_tmpSolverBodyPool[bodyId];
+			solverBody.m_linearVelocity = body->getLinearVelocity() - solverBody.m_deltaLinearVelocity;
+			solverBody.m_angularVelocity = body->getAngularVelocity() - solverBody.m_deltaAngularVelocity;
+		}
+	}
+}
+
+void btDeformableMultiBodyConstraintSolver::solverBodyWriteBack(const btContactSolverInfo& infoGlobal)
+{
+	// reduced soft body solver directly modifies the solver body
+	if (m_deformableSolver->isReducedSolver())
+	{
+		return;
+	}
+
+	for (int i = 0; i < m_tmpSolverBodyPool.size(); i++)
+	{
+		btRigidBody* body = m_tmpSolverBodyPool[i].m_originalBody;
+		if (body)
+		{
+			m_tmpSolverBodyPool[i].m_originalBody->setLinearVelocity(m_tmpSolverBodyPool[i].m_linearVelocity + m_tmpSolverBodyPool[i].m_deltaLinearVelocity);
+			m_tmpSolverBodyPool[i].m_originalBody->setAngularVelocity(m_tmpSolverBodyPool[i].m_angularVelocity + m_tmpSolverBodyPool[i].m_deltaAngularVelocity);
+		}
+	}
+}
+
+
+void btDeformableMultiBodyConstraintSolver::pairDeformableAndSolverBody(btCollisionObject** bodies, int numBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal)
+{
+	if (!m_deformableSolver->isReducedSolver())
+	{
+		return;
+	}
+
+	btReducedDeformableBodySolver* solver = static_cast<btReducedDeformableBodySolver*>(m_deformableSolver);
+	
+	for (int i = 0; i < numDeformableBodies; ++i)
+	{
+		for (int k = 0; k < solver->m_nodeRigidConstraints[i].size(); ++k)
+    {
+      btReducedDeformableNodeRigidContactConstraint& constraint = solver->m_nodeRigidConstraints[i][k];
+
+			if (!constraint.m_contact->m_cti.m_colObj->isStaticObject())
+			{
+				btCollisionObject& col_obj = const_cast<btCollisionObject&>(*constraint.m_contact->m_cti.m_colObj);
+
+				// object index in the solver body pool
+				int bodyId = getOrInitSolverBody(col_obj, infoGlobal.m_timeStep);
+				
+				const btRigidBody* body = btRigidBody::upcast(bodies[bodyId]);
+				if (body && body->getInvMass())
+				{
+						// std::cout << "Node: " << constraint.m_node->index << ", body: " << bodyId << "\n";
+					btSolverBody& solverBody = m_tmpSolverBodyPool[bodyId];
+					constraint.setSolverBody(bodyId, solverBody);
+				}
+			}
+    }
+
+		// for (int j = 0; j < numBodies; j++)
+		// {
+		// 	int bodyId = getOrInitSolverBody(*bodies[j], infoGlobal.m_timeStep);
+
+		// 	btRigidBody* body = btRigidBody::upcast(bodies[j]);
+		// 	if (body && body->getInvMass())
+		// 	{
+		// 		btSolverBody& solverBody = m_tmpSolverBodyPool[bodyId];
+		// 		m_deformableSolver->pairConstraintWithSolverBody(i, bodyId, solverBody);
+		// 	}
+		// }	
+	}
+}
+
+void btDeformableMultiBodyConstraintSolver::solveGroupCacheFriendlySplitImpulseIterations(btCollisionObject** bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
+{
+	BT_PROFILE("solveGroupCacheFriendlySplitImpulseIterations");
+	int iteration;
+	if (infoGlobal.m_splitImpulse)
+	{
+		{
+			for (iteration = 0; iteration < infoGlobal.m_numIterations; iteration++)
+			{
+				btScalar leastSquaresResidual = 0.f;
+				{
+					int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+					int j;
+					for (j = 0; j < numPoolConstraints; j++)
+					{
+						const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+
+						btScalar residual = resolveSplitPenetrationImpulse(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA], m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB], solveManifold);
+						leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+					}
+					// solve the position correction between deformable and rigid/multibody
+					//                    btScalar residual = m_deformableSolver->solveSplitImpulse(infoGlobal);
+					btScalar residual = m_deformableSolver->m_objective->m_projection.solveSplitImpulse(deformableBodies, numDeformableBodies, infoGlobal);
+					leastSquaresResidual = btMax(leastSquaresResidual, residual * residual);
+				}
+				if (leastSquaresResidual <= infoGlobal.m_leastSquaresResidualThreshold || iteration >= (infoGlobal.m_numIterations - 1))
+				{
+#ifdef VERBOSE_RESIDUAL_PRINTF
+					if (iteration >= (infoGlobal.m_numIterations - 1))
+						printf("split impulse residual = %f at iteration #%d\n", leastSquaresResidual, iteration);
+#endif
+					break;
+				}
+			}
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h
new file mode 100644
index 0000000..76a7a33
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h
@@ -0,0 +1,66 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_DEFORMABLE_MULTIBODY_CONSTRAINT_SOLVER_H
+#define BT_DEFORMABLE_MULTIBODY_CONSTRAINT_SOLVER_H
+
+#include "btDeformableBodySolver.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h"
+
+class btDeformableBodySolver;
+
+// btDeformableMultiBodyConstraintSolver extendsn btMultiBodyConstraintSolver to solve for the contact among rigid/multibody and deformable bodies. Notice that the following constraints
+// 1. rigid/multibody against rigid/multibody
+// 2. rigid/multibody against deforamble
+// 3. deformable against deformable
+// 4. deformable self collision
+// 5. joint constraints
+// are all coupled in this solve.
+ATTRIBUTE_ALIGNED16(class)
+btDeformableMultiBodyConstraintSolver : public btMultiBodyConstraintSolver
+{
+	btDeformableBodySolver* m_deformableSolver;
+
+protected:
+	// override the iterations method to include deformable/multibody contact
+	//    virtual btScalar solveGroupCacheFriendlyIterations(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer);
+
+	// write the velocity of the the solver body to the underlying rigid body
+	void solverBodyWriteBack(const btContactSolverInfo& infoGlobal);
+
+	// write the velocity of the underlying rigid body to the the the solver body
+	void writeToSolverBody(btCollisionObject * *bodies, int numBodies, const btContactSolverInfo& infoGlobal);
+
+	// let each deformable body knows which solver body is in constact
+	void pairDeformableAndSolverBody(btCollisionObject** bodies, int numBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal);
+
+	// Modified by Samsung to compile under GCC13. 2024-01-10. eunkiki.hong@samsung.com
+	using btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySplitImpulseIterations;
+	virtual void solveGroupCacheFriendlySplitImpulseIterations(btCollisionObject * *bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+
+	virtual btScalar solveDeformableGroupIterations(btCollisionObject * *bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	void setDeformableSolver(btDeformableBodySolver * deformableSolver)
+	{
+		m_deformableSolver = deformableSolver;
+	}
+
+	virtual void solveDeformableBodyGroup(btCollisionObject * *bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifold, int numManifolds, btTypedConstraint** constraints, int numConstraints, btMultiBodyConstraint** multiBodyConstraints, int numMultiBodyConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btDispatcher* dispatcher);
+};
+
+#endif /* BT_DEFORMABLE_MULTIBODY_CONSTRAINT_SOLVER_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp
new file mode 100644
index 0000000..030cbaf
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp
@@ -0,0 +1,745 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+/* ====== Overview of the Deformable Algorithm ====== */
+
+/*
+A single step of the deformable body simulation contains the following main components:
+Call internalStepSimulation multiple times, to achieve 240Hz (4 steps of 60Hz).
+1. Deformable maintaintenance of rest lengths and volume preservation. Forces only depend on position: Update velocity to a temporary state v_{n+1}^* = v_n + explicit_force * dt / mass, where explicit forces include gravity and elastic forces.
+2. Detect discrete collisions between rigid and deformable bodies at position x_{n+1}^* = x_n + dt * v_{n+1}^*.
+
+3a. Solve all constraints, including LCP. Contact, position correction due to numerical drift, friction, and anchors for deformable.
+
+3b. 5 Newton steps (multiple step). Conjugent Gradient solves linear system. Deformable Damping: Then velocities of deformable bodies v_{n+1} are solved in
+        M(v_{n+1} - v_{n+1}^*) = damping_force * dt / mass,
+   by a conjugate gradient solver, where the damping force is implicit and depends on v_{n+1}.
+   Make sure contact constraints are not violated in step b by performing velocity projections as in the paper by Baraff and Witkin https://www.cs.cmu.edu/~baraff/papers/sig98.pdf. Dynamic frictions are treated as a force and added to the rhs of the CG solve, whereas static frictions are treated as constraints similar to contact.
+4. Position is updated via x_{n+1} = x_n + dt * v_{n+1}.
+
+
+The algorithm also closely resembles the one in http://physbam.stanford.edu/~fedkiw/papers/stanford2008-03.pdf
+ */
+
+#include <stdio.h>
+#include "btDeformableMultiBodyDynamicsWorld.h"
+#include "DeformableBodyInplaceSolverIslandCallback.h"
+#include "btDeformableBodySolver.h"
+#include "LinearMath/btQuickprof.h"
+#include "btSoftBodyInternals.h"
+btDeformableMultiBodyDynamicsWorld::btDeformableMultiBodyDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btDeformableMultiBodyConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration, btDeformableBodySolver* deformableBodySolver)
+	: btMultiBodyDynamicsWorld(dispatcher, pairCache, (btMultiBodyConstraintSolver*)constraintSolver, collisionConfiguration),
+	  m_deformableBodySolver(deformableBodySolver),
+	  m_solverCallback(0)
+{
+	m_drawFlags = fDrawFlags::Std;
+	m_drawNodeTree = true;
+	m_drawFaceTree = false;
+	m_drawClusterTree = false;
+	m_sbi.m_broadphase = pairCache;
+	m_sbi.m_dispatcher = dispatcher;
+	m_sbi.m_sparsesdf.Initialize();
+	m_sbi.m_sparsesdf.setDefaultVoxelsz(0.005);
+	m_sbi.m_sparsesdf.Reset();
+
+	m_sbi.air_density = (btScalar)1.2;
+	m_sbi.water_density = 0;
+	m_sbi.water_offset = 0;
+	m_sbi.water_normal = btVector3(0, 0, 0);
+	m_sbi.m_gravity.setValue(0, -9.8, 0);
+	m_internalTime = 0.0;
+	m_implicit = false;
+	m_lineSearch = false;
+	m_useProjection = false;
+	m_ccdIterations = 5;
+	m_solverDeformableBodyIslandCallback = new DeformableBodyInplaceSolverIslandCallback(constraintSolver, dispatcher);
+}
+
+btDeformableMultiBodyDynamicsWorld::~btDeformableMultiBodyDynamicsWorld()
+{
+	delete m_solverDeformableBodyIslandCallback;
+}
+
+void btDeformableMultiBodyDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
+{
+	BT_PROFILE("internalSingleStepSimulation");
+	if (0 != m_internalPreTickCallback)
+	{
+		(*m_internalPreTickCallback)(this, timeStep);
+	}
+	reinitialize(timeStep);
+
+	// add gravity to velocity of rigid and multi bodys
+	applyRigidBodyGravity(timeStep);
+
+	///apply gravity and explicit force to velocity, predict motion
+	predictUnconstraintMotion(timeStep);
+
+	///perform collision detection that involves rigid/multi bodies
+	btMultiBodyDynamicsWorld::performDiscreteCollisionDetection();
+
+	btMultiBodyDynamicsWorld::calculateSimulationIslands();
+
+	beforeSolverCallbacks(timeStep);
+
+	// ///solve contact constraints and then deformable bodies momemtum equation
+	solveConstraints(timeStep);
+
+	afterSolverCallbacks(timeStep);
+
+	performDeformableCollisionDetection();
+
+	applyRepulsionForce(timeStep);
+
+	performGeometricCollisions(timeStep);
+
+	integrateTransforms(timeStep);
+
+	///update vehicle simulation
+	btMultiBodyDynamicsWorld::updateActions(timeStep);
+
+	updateActivationState(timeStep);
+	// End solver-wise simulation step
+	// ///////////////////////////////
+}
+
+void btDeformableMultiBodyDynamicsWorld::performDeformableCollisionDetection()
+{
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		m_softBodies[i]->m_softSoftCollision = true;
+	}
+
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		for (int j = i; j < m_softBodies.size(); ++j)
+		{
+			m_softBodies[i]->defaultCollisionHandler(m_softBodies[j]);
+		}
+	}
+
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		m_softBodies[i]->m_softSoftCollision = false;
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::updateActivationState(btScalar timeStep)
+{
+	for (int i = 0; i < m_softBodies.size(); i++)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		psb->updateDeactivation(timeStep);
+		if (psb->wantsSleeping())
+		{
+			if (psb->getActivationState() == ACTIVE_TAG)
+				psb->setActivationState(WANTS_DEACTIVATION);
+			if (psb->getActivationState() == ISLAND_SLEEPING)
+			{
+				psb->setZeroVelocity();
+			}
+		}
+		else
+		{
+			if (psb->getActivationState() != DISABLE_DEACTIVATION)
+				psb->setActivationState(ACTIVE_TAG);
+		}
+	}
+	btMultiBodyDynamicsWorld::updateActivationState(timeStep);
+}
+
+void btDeformableMultiBodyDynamicsWorld::applyRepulsionForce(btScalar timeStep)
+{
+	BT_PROFILE("btDeformableMultiBodyDynamicsWorld::applyRepulsionForce");
+	for (int i = 0; i < m_softBodies.size(); i++)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (psb->isActive())
+		{
+			psb->applyRepulsionForce(timeStep, true);
+		}
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::performGeometricCollisions(btScalar timeStep)
+{
+	BT_PROFILE("btDeformableMultiBodyDynamicsWorld::performGeometricCollisions");
+	// refit the BVH tree for CCD
+	for (int i = 0; i < m_softBodies.size(); ++i)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (psb->isActive())
+		{
+			m_softBodies[i]->updateFaceTree(true, false);
+			m_softBodies[i]->updateNodeTree(true, false);
+			for (int j = 0; j < m_softBodies[i]->m_faces.size(); ++j)
+			{
+				btSoftBody::Face& f = m_softBodies[i]->m_faces[j];
+				f.m_n0 = (f.m_n[1]->m_x - f.m_n[0]->m_x).cross(f.m_n[2]->m_x - f.m_n[0]->m_x);
+			}
+		}
+	}
+
+	// clear contact points & update DBVT
+	for (int r = 0; r < m_ccdIterations; ++r)
+	{
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (psb->isActive())
+			{
+				// clear contact points in the previous iteration
+				psb->m_faceNodeContactsCCD.clear();
+
+				// update m_q and normals for CCD calculation
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+				{
+					psb->m_nodes[j].m_q = psb->m_nodes[j].m_x + timeStep * psb->m_nodes[j].m_v;
+				}
+				for (int j = 0; j < psb->m_faces.size(); ++j)
+				{
+					btSoftBody::Face& f = psb->m_faces[j];
+					f.m_n1 = (f.m_n[1]->m_q - f.m_n[0]->m_q).cross(f.m_n[2]->m_q - f.m_n[0]->m_q);
+					f.m_vn = (f.m_n[1]->m_v - f.m_n[0]->m_v).cross(f.m_n[2]->m_v - f.m_n[0]->m_v) * timeStep * timeStep;
+				}
+			}
+		}
+
+		// apply CCD to register new contact points
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			for (int j = i; j < m_softBodies.size(); ++j)
+			{
+				btSoftBody* psb1 = m_softBodies[i];
+				btSoftBody* psb2 = m_softBodies[j];
+				if (psb1->isActive() && psb2->isActive())
+				{
+					m_softBodies[i]->geometricCollisionHandler(m_softBodies[j]);
+				}
+			}
+		}
+
+		int penetration_count = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (psb->isActive())
+			{
+				penetration_count += psb->m_faceNodeContactsCCD.size();
+				;
+			}
+		}
+		if (penetration_count == 0)
+		{
+			break;
+		}
+
+		// apply inelastic impulse
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (psb->isActive())
+			{
+				psb->applyRepulsionForce(timeStep, false);
+			}
+		}
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::softBodySelfCollision()
+{
+	BT_PROFILE("btDeformableMultiBodyDynamicsWorld::softBodySelfCollision");
+	for (int i = 0; i < m_softBodies.size(); i++)
+	{
+		btSoftBody* psb = m_softBodies[i];
+		if (psb->isActive())
+		{
+			psb->defaultCollisionHandler(psb);
+		}
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::positionCorrection(btScalar timeStep)
+{
+	// correct the position of rigid bodies with temporary velocity generated from split impulse
+	btContactSolverInfo infoGlobal;
+	btVector3 zero(0, 0, 0);
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); ++i)
+	{
+		btRigidBody* rb = m_nonStaticRigidBodies[i];
+		//correct the position/orientation based on push/turn recovery
+		btTransform newTransform;
+		btVector3 pushVelocity = rb->getPushVelocity();
+		btVector3 turnVelocity = rb->getTurnVelocity();
+		if (pushVelocity[0] != 0.f || pushVelocity[1] != 0 || pushVelocity[2] != 0 || turnVelocity[0] != 0.f || turnVelocity[1] != 0 || turnVelocity[2] != 0)
+		{
+			btTransformUtil::integrateTransform(rb->getWorldTransform(), pushVelocity, turnVelocity * infoGlobal.m_splitImpulseTurnErp, timeStep, newTransform);
+			rb->setWorldTransform(newTransform);
+			rb->setPushVelocity(zero);
+			rb->setTurnVelocity(zero);
+		}
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::integrateTransforms(btScalar timeStep)
+{
+	BT_PROFILE("integrateTransforms");
+	positionCorrection(timeStep);
+	btMultiBodyDynamicsWorld::integrateTransforms(timeStep);
+	m_deformableBodySolver->applyTransforms(timeStep);
+}
+
+void btDeformableMultiBodyDynamicsWorld::solveConstraints(btScalar timeStep)
+{
+	BT_PROFILE("btDeformableMultiBodyDynamicsWorld::solveConstraints");
+	// save v_{n+1}^* velocity after explicit forces
+	m_deformableBodySolver->backupVelocity();
+
+	// set up constraints among multibodies and between multibodies and deformable bodies
+	setupConstraints();
+
+	// solve contact constraints
+	solveContactConstraints();
+
+	// set up the directions in which the velocity does not change in the momentum solve
+	if (m_useProjection)
+		m_deformableBodySolver->setProjection();
+	else
+		m_deformableBodySolver->setLagrangeMultiplier();
+
+	// for explicit scheme, m_backupVelocity = v_{n+1}^*
+	// for implicit scheme, m_backupVelocity = v_n
+	// Here, set dv = v_{n+1} - v_n for nodes in contact
+	m_deformableBodySolver->setupDeformableSolve(m_implicit);
+
+	// At this point, dv should be golden for nodes in contact
+	// proceed to solve deformable momentum equation
+	m_deformableBodySolver->solveDeformableConstraints(timeStep);
+}
+
+void btDeformableMultiBodyDynamicsWorld::setupConstraints()
+{
+	// set up constraints between multibody and deformable bodies
+	m_deformableBodySolver->setConstraints(m_solverInfo);
+
+	// set up constraints among multibodies
+	{
+		sortConstraints();
+		// setup the solver callback
+		btMultiBodyConstraint** sortedMultiBodyConstraints = m_sortedMultiBodyConstraints.size() ? &m_sortedMultiBodyConstraints[0] : 0;
+		btTypedConstraint** constraintsPtr = getNumConstraints() ? &m_sortedConstraints[0] : 0;
+		m_solverDeformableBodyIslandCallback->setup(&m_solverInfo, constraintsPtr, m_sortedConstraints.size(), sortedMultiBodyConstraints, m_sortedMultiBodyConstraints.size(), getDebugDrawer());
+
+		// build islands
+		m_islandManager->buildIslands(getCollisionWorld()->getDispatcher(), getCollisionWorld());
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::sortConstraints()
+{
+	m_sortedConstraints.resize(m_constraints.size());
+	int i;
+	for (i = 0; i < getNumConstraints(); i++)
+	{
+		m_sortedConstraints[i] = m_constraints[i];
+	}
+	m_sortedConstraints.quickSort(btSortConstraintOnIslandPredicate2());
+
+	m_sortedMultiBodyConstraints.resize(m_multiBodyConstraints.size());
+	for (i = 0; i < m_multiBodyConstraints.size(); i++)
+	{
+		m_sortedMultiBodyConstraints[i] = m_multiBodyConstraints[i];
+	}
+	m_sortedMultiBodyConstraints.quickSort(btSortMultiBodyConstraintOnIslandPredicate());
+}
+
+void btDeformableMultiBodyDynamicsWorld::solveContactConstraints()
+{
+	// process constraints on each island
+	m_islandManager->processIslands(getCollisionWorld()->getDispatcher(), getCollisionWorld(), m_solverDeformableBodyIslandCallback);
+
+	// process deferred
+	m_solverDeformableBodyIslandCallback->processConstraints();
+	m_constraintSolver->allSolved(m_solverInfo, m_debugDrawer);
+
+	// write joint feedback
+	{
+		for (int i = 0; i < this->m_multiBodies.size(); i++)
+		{
+			btMultiBody* bod = m_multiBodies[i];
+
+			bool isSleeping = false;
+
+			if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+			{
+				isSleeping = true;
+			}
+			for (int b = 0; b < bod->getNumLinks(); b++)
+			{
+				if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+					isSleeping = true;
+			}
+
+			if (!isSleeping)
+			{
+				//useless? they get resized in stepVelocities once again (AND DIFFERENTLY)
+				m_scratch_r.resize(bod->getNumLinks() + 1);  //multidof? ("Y"s use it and it is used to store qdd)
+				m_scratch_v.resize(bod->getNumLinks() + 1);
+				m_scratch_m.resize(bod->getNumLinks() + 1);
+
+				if (bod->internalNeedsJointFeedback())
+				{
+					if (!bod->isUsingRK4Integration())
+					{
+						if (bod->internalNeedsJointFeedback())
+						{
+							bool isConstraintPass = true;
+							bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(m_solverInfo.m_timeStep, m_scratch_r, m_scratch_v, m_scratch_m, isConstraintPass,
+																					  getSolverInfo().m_jointFeedbackInWorldSpace,
+																					  getSolverInfo().m_jointFeedbackInJointFrame);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	for (int i = 0; i < this->m_multiBodies.size(); i++)
+	{
+		btMultiBody* bod = m_multiBodies[i];
+		bod->processDeltaVeeMultiDof2();
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::addSoftBody(btSoftBody* body, int collisionFilterGroup, int collisionFilterMask)
+{
+	m_softBodies.push_back(body);
+
+	// Set the soft body solver that will deal with this body
+	// to be the world's solver
+	body->setSoftBodySolver(m_deformableBodySolver);
+
+	btCollisionWorld::addCollisionObject(body,
+										 collisionFilterGroup,
+										 collisionFilterMask);
+}
+
+void btDeformableMultiBodyDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
+{
+	BT_PROFILE("predictUnconstraintMotion");
+	btMultiBodyDynamicsWorld::predictUnconstraintMotion(timeStep);
+	m_deformableBodySolver->predictMotion(timeStep);
+}
+
+void btDeformableMultiBodyDynamicsWorld::setGravity(const btVector3& gravity)
+{
+	btDiscreteDynamicsWorld::setGravity(gravity);
+	m_deformableBodySolver->setGravity(gravity);
+}
+
+void btDeformableMultiBodyDynamicsWorld::reinitialize(btScalar timeStep)
+{
+	m_internalTime += timeStep;
+	m_deformableBodySolver->setImplicit(m_implicit);
+	m_deformableBodySolver->setLineSearch(m_lineSearch);
+	m_deformableBodySolver->reinitialize(m_softBodies, timeStep);
+	btDispatcherInfo& dispatchInfo = btMultiBodyDynamicsWorld::getDispatchInfo();
+	dispatchInfo.m_timeStep = timeStep;
+	dispatchInfo.m_stepCount = 0;
+	dispatchInfo.m_debugDraw = btMultiBodyDynamicsWorld::getDebugDrawer();
+	btMultiBodyDynamicsWorld::getSolverInfo().m_timeStep = timeStep;
+	if (m_useProjection)
+	{
+		m_deformableBodySolver->m_useProjection = true;
+		m_deformableBodySolver->setStrainLimiting(true);
+		m_deformableBodySolver->setPreconditioner(btDeformableBackwardEulerObjective::Mass_preconditioner);
+	}
+	else
+	{
+		m_deformableBodySolver->m_useProjection = false;
+		m_deformableBodySolver->setStrainLimiting(false);
+		m_deformableBodySolver->setPreconditioner(btDeformableBackwardEulerObjective::KKT_preconditioner);
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::debugDrawWorld()
+{
+	btMultiBodyDynamicsWorld::debugDrawWorld();
+
+	for (int i = 0; i < getSoftBodyArray().size(); i++)
+	{
+		btSoftBody* psb = (btSoftBody*)getSoftBodyArray()[i];
+		{
+			btSoftBodyHelpers::DrawFrame(psb, getDebugDrawer());
+			btSoftBodyHelpers::Draw(psb, getDebugDrawer(), getDrawFlags());
+		}
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::applyRigidBodyGravity(btScalar timeStep)
+{
+	// Gravity is applied in stepSimulation and then cleared here and then applied here and then cleared here again
+	// so that 1) gravity is applied to velocity before constraint solve and 2) gravity is applied in each substep
+	// when there are multiple substeps
+	btMultiBodyDynamicsWorld::applyGravity();
+	// integrate rigid body gravity
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); ++i)
+	{
+		btRigidBody* rb = m_nonStaticRigidBodies[i];
+		rb->integrateVelocities(timeStep);
+	}
+
+	// integrate multibody gravity
+	{
+		forwardKinematics();
+		clearMultiBodyConstraintForces();
+		{
+			for (int i = 0; i < this->m_multiBodies.size(); i++)
+			{
+				btMultiBody* bod = m_multiBodies[i];
+
+				bool isSleeping = false;
+
+				if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+				{
+					isSleeping = true;
+				}
+				for (int b = 0; b < bod->getNumLinks(); b++)
+				{
+					if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+						isSleeping = true;
+				}
+
+				if (!isSleeping)
+				{
+					m_scratch_r.resize(bod->getNumLinks() + 1);
+					m_scratch_v.resize(bod->getNumLinks() + 1);
+					m_scratch_m.resize(bod->getNumLinks() + 1);
+					bool isConstraintPass = false;
+					{
+						if (!bod->isUsingRK4Integration())
+						{
+							bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(m_solverInfo.m_timeStep,
+																					  m_scratch_r, m_scratch_v, m_scratch_m, isConstraintPass,
+																					  getSolverInfo().m_jointFeedbackInWorldSpace,
+																					  getSolverInfo().m_jointFeedbackInJointFrame);
+						}
+						else
+						{
+							btAssert(" RK4Integration is not supported");
+						}
+					}
+				}
+			}
+		}
+	}
+	clearGravity();
+}
+
+void btDeformableMultiBodyDynamicsWorld::clearGravity()
+{
+	BT_PROFILE("btMultiBody clearGravity");
+	// clear rigid body gravity
+	for (int i = 0; i < m_nonStaticRigidBodies.size(); i++)
+	{
+		btRigidBody* body = m_nonStaticRigidBodies[i];
+		if (body->isActive())
+		{
+			body->clearGravity();
+		}
+	}
+	// clear multibody gravity
+	for (int i = 0; i < this->m_multiBodies.size(); i++)
+	{
+		btMultiBody* bod = m_multiBodies[i];
+
+		bool isSleeping = false;
+
+		if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING)
+		{
+			isSleeping = true;
+		}
+		for (int b = 0; b < bod->getNumLinks(); b++)
+		{
+			if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState() == ISLAND_SLEEPING)
+				isSleeping = true;
+		}
+
+		if (!isSleeping)
+		{
+			bod->addBaseForce(-m_gravity * bod->getBaseMass());
+
+			for (int j = 0; j < bod->getNumLinks(); ++j)
+			{
+				bod->addLinkForce(j, -m_gravity * bod->getLinkMass(j));
+			}
+		}
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::beforeSolverCallbacks(btScalar timeStep)
+{
+	if (0 != m_internalTickCallback)
+	{
+		(*m_internalTickCallback)(this, timeStep);
+	}
+
+	if (0 != m_solverCallback)
+	{
+		(*m_solverCallback)(m_internalTime, this);
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::afterSolverCallbacks(btScalar timeStep)
+{
+	if (0 != m_solverCallback)
+	{
+		(*m_solverCallback)(m_internalTime, this);
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::addForce(btSoftBody* psb, btDeformableLagrangianForce* force)
+{
+	btAlignedObjectArray<btDeformableLagrangianForce*>& forces = *m_deformableBodySolver->getLagrangianForceArray();
+	bool added = false;
+	for (int i = 0; i < forces.size(); ++i)
+	{
+		if (forces[i]->getForceType() == force->getForceType())
+		{
+			forces[i]->addSoftBody(psb);
+			added = true;
+			break;
+		}
+	}
+	if (!added)
+	{
+		force->addSoftBody(psb);
+		force->setIndices(m_deformableBodySolver->getIndices());
+		forces.push_back(force);
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::removeForce(btSoftBody* psb, btDeformableLagrangianForce* force)
+{
+	btAlignedObjectArray<btDeformableLagrangianForce*>& forces = *m_deformableBodySolver->getLagrangianForceArray();
+	int removed_index = -1;
+	for (int i = 0; i < forces.size(); ++i)
+	{
+		if (forces[i]->getForceType() == force->getForceType())
+		{
+			forces[i]->removeSoftBody(psb);
+			if (forces[i]->m_softBodies.size() == 0)
+				removed_index = i;
+			break;
+		}
+	}
+	if (removed_index >= 0)
+		forces.removeAtIndex(removed_index);
+}
+
+void btDeformableMultiBodyDynamicsWorld::removeSoftBodyForce(btSoftBody* psb)
+{
+	btAlignedObjectArray<btDeformableLagrangianForce*>& forces = *m_deformableBodySolver->getLagrangianForceArray();
+	for (int i = 0; i < forces.size(); ++i)
+	{
+		forces[i]->removeSoftBody(psb);
+	}
+}
+
+void btDeformableMultiBodyDynamicsWorld::removeSoftBody(btSoftBody* body)
+{
+	removeSoftBodyForce(body);
+	m_softBodies.remove(body);
+	btCollisionWorld::removeCollisionObject(body);
+	// force a reinitialize so that node indices get updated.
+	m_deformableBodySolver->reinitialize(m_softBodies, btScalar(-1));
+}
+
+void btDeformableMultiBodyDynamicsWorld::removeCollisionObject(btCollisionObject* collisionObject)
+{
+	btSoftBody* body = btSoftBody::upcast(collisionObject);
+	if (body)
+		removeSoftBody(body);
+	else
+		btDiscreteDynamicsWorld::removeCollisionObject(collisionObject);
+}
+
+int btDeformableMultiBodyDynamicsWorld::stepSimulation(btScalar timeStep, int maxSubSteps, btScalar fixedTimeStep)
+{
+	startProfiling(timeStep);
+
+	int numSimulationSubSteps = 0;
+
+	if (maxSubSteps)
+	{
+		//fixed timestep with interpolation
+		m_fixedTimeStep = fixedTimeStep;
+		m_localTime += timeStep;
+		if (m_localTime >= fixedTimeStep)
+		{
+			numSimulationSubSteps = int(m_localTime / fixedTimeStep);
+			m_localTime -= numSimulationSubSteps * fixedTimeStep;
+		}
+	}
+	else
+	{
+		//variable timestep
+		fixedTimeStep = timeStep;
+		m_localTime = m_latencyMotionStateInterpolation ? 0 : timeStep;
+		m_fixedTimeStep = 0;
+		if (btFuzzyZero(timeStep))
+		{
+			numSimulationSubSteps = 0;
+			maxSubSteps = 0;
+		}
+		else
+		{
+			numSimulationSubSteps = 1;
+			maxSubSteps = 1;
+		}
+	}
+
+	//process some debugging flags
+	if (getDebugDrawer())
+	{
+		btIDebugDraw* debugDrawer = getDebugDrawer();
+		gDisableDeactivation = (debugDrawer->getDebugMode() & btIDebugDraw::DBG_NoDeactivation) != 0;
+	}
+	if (numSimulationSubSteps)
+	{
+		//clamp the number of substeps, to prevent simulation grinding spiralling down to a halt
+		int clampedSimulationSteps = (numSimulationSubSteps > maxSubSteps) ? maxSubSteps : numSimulationSubSteps;
+
+		saveKinematicState(fixedTimeStep * clampedSimulationSteps);
+
+		for (int i = 0; i < clampedSimulationSteps; i++)
+		{
+			internalSingleStepSimulation(fixedTimeStep);
+			synchronizeMotionStates();
+		}
+	}
+	else
+	{
+		synchronizeMotionStates();
+	}
+
+	clearForces();
+
+#ifndef BT_NO_PROFILE
+	CProfileManager::Increment_Frame_Counter();
+#endif  //BT_NO_PROFILE
+
+	return numSimulationSubSteps;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h
new file mode 100644
index 0000000..39af3e5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h
@@ -0,0 +1,320 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD_H
+#define BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD_H
+
+#include "btSoftMultiBodyDynamicsWorld.h"
+#include "btDeformableLagrangianForce.h"
+#include "btDeformableMassSpringForce.h"
+// #include "btDeformableBodySolver.h"
+#include "btDeformableMultiBodyConstraintSolver.h"
+#include "btSoftBodyHelpers.h"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+#include <functional>
+typedef btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
+
+class btDeformableBodySolver;
+class btDeformableLagrangianForce;
+struct MultiBodyInplaceSolverIslandCallback;
+struct DeformableBodyInplaceSolverIslandCallback;
+class btDeformableMultiBodyConstraintSolver;
+
+typedef btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
+
+class btDeformableMultiBodyDynamicsWorld : public btMultiBodyDynamicsWorld
+{
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	///Solver classes that encapsulate multiple deformable bodies for solving
+	btDeformableBodySolver* m_deformableBodySolver;
+	btSoftBodyArray m_softBodies;
+	int m_drawFlags;
+	bool m_drawNodeTree;
+	bool m_drawFaceTree;
+	bool m_drawClusterTree;
+	btSoftBodyWorldInfo m_sbi;
+	btScalar m_internalTime;
+	int m_ccdIterations;
+	bool m_implicit;
+	bool m_lineSearch;
+	bool m_useProjection;
+	DeformableBodyInplaceSolverIslandCallback* m_solverDeformableBodyIslandCallback;
+
+	typedef void (*btSolverCallback)(btScalar time, btDeformableMultiBodyDynamicsWorld* world);
+	btSolverCallback m_solverCallback;
+
+protected:
+	virtual void internalSingleStepSimulation(btScalar timeStep);
+
+	virtual void integrateTransforms(btScalar timeStep);
+
+	void positionCorrection(btScalar timeStep);
+
+	// Modified by Samsung to compile under GCC13. 2024-01-10. eunkiki.hong@samsung.com
+	using btMultiBodyDynamicsWorld::solveConstraints;
+	void solveConstraints(btScalar timeStep);
+
+	void updateActivationState(btScalar timeStep);
+
+	void clearGravity();
+
+public:
+	btDeformableMultiBodyDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btDeformableMultiBodyConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration, btDeformableBodySolver* deformableBodySolver = 0);
+
+	virtual int stepSimulation(btScalar timeStep, int maxSubSteps = 1, btScalar fixedTimeStep = btScalar(1.) / btScalar(60.));
+
+	virtual void debugDrawWorld();
+
+	void setSolverCallback(btSolverCallback cb)
+	{
+		m_solverCallback = cb;
+	}
+
+	virtual ~btDeformableMultiBodyDynamicsWorld();
+
+	virtual btMultiBodyDynamicsWorld* getMultiBodyDynamicsWorld()
+	{
+		return (btMultiBodyDynamicsWorld*)(this);
+	}
+
+	virtual const btMultiBodyDynamicsWorld* getMultiBodyDynamicsWorld() const
+	{
+		return (const btMultiBodyDynamicsWorld*)(this);
+	}
+
+	virtual btDynamicsWorldType getWorldType() const
+	{
+		return BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD;
+	}
+
+	virtual void predictUnconstraintMotion(btScalar timeStep);
+
+	virtual void addSoftBody(btSoftBody* body, int collisionFilterGroup = btBroadphaseProxy::DefaultFilter, int collisionFilterMask = btBroadphaseProxy::AllFilter);
+
+	btSoftBodyArray& getSoftBodyArray()
+	{
+		return m_softBodies;
+	}
+
+	const btSoftBodyArray& getSoftBodyArray() const
+	{
+		return m_softBodies;
+	}
+
+	btSoftBodyWorldInfo& getWorldInfo()
+	{
+		return m_sbi;
+	}
+
+	const btSoftBodyWorldInfo& getWorldInfo() const
+	{
+		return m_sbi;
+	}
+
+	virtual void setGravity(const btVector3& gravity);
+
+	void reinitialize(btScalar timeStep);
+
+	void applyRigidBodyGravity(btScalar timeStep);
+
+	void beforeSolverCallbacks(btScalar timeStep);
+
+	void afterSolverCallbacks(btScalar timeStep);
+
+	void addForce(btSoftBody* psb, btDeformableLagrangianForce* force);
+
+	void removeForce(btSoftBody* psb, btDeformableLagrangianForce* force);
+
+	void removeSoftBodyForce(btSoftBody* psb);
+
+	void removeSoftBody(btSoftBody* body);
+
+	void removeCollisionObject(btCollisionObject* collisionObject);
+
+	int getDrawFlags() const { return (m_drawFlags); }
+	void setDrawFlags(int f) { m_drawFlags = f; }
+
+	void setupConstraints();
+
+	void performDeformableCollisionDetection();
+
+	void solveMultiBodyConstraints();
+
+	void solveContactConstraints();
+
+	void sortConstraints();
+
+	void softBodySelfCollision();
+
+	void setImplicit(bool implicit)
+	{
+		m_implicit = implicit;
+	}
+
+	void setLineSearch(bool lineSearch)
+	{
+		m_lineSearch = lineSearch;
+	}
+
+	void setUseProjection(bool useProjection)
+	{
+		m_useProjection = useProjection;
+	}
+
+	void applyRepulsionForce(btScalar timeStep);
+
+	void performGeometricCollisions(btScalar timeStep);
+
+	struct btDeformableSingleRayCallback : public btBroadphaseRayCallback
+	{
+		btVector3 m_rayFromWorld;
+		btVector3 m_rayToWorld;
+		btTransform m_rayFromTrans;
+		btTransform m_rayToTrans;
+		btVector3 m_hitNormal;
+
+		const btDeformableMultiBodyDynamicsWorld* m_world;
+		btCollisionWorld::RayResultCallback& m_resultCallback;
+
+		btDeformableSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btDeformableMultiBodyDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback)
+			: m_rayFromWorld(rayFromWorld),
+			  m_rayToWorld(rayToWorld),
+			  m_world(world),
+			  m_resultCallback(resultCallback)
+		{
+			m_rayFromTrans.setIdentity();
+			m_rayFromTrans.setOrigin(m_rayFromWorld);
+			m_rayToTrans.setIdentity();
+			m_rayToTrans.setOrigin(m_rayToWorld);
+
+			btVector3 rayDir = (rayToWorld - rayFromWorld);
+
+			rayDir.normalize();
+			///what about division by zero? --> just set rayDirection[i] to INF/1e30
+			m_rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[0];
+			m_rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[1];
+			m_rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[2];
+			m_signs[0] = m_rayDirectionInverse[0] < 0.0;
+			m_signs[1] = m_rayDirectionInverse[1] < 0.0;
+			m_signs[2] = m_rayDirectionInverse[2] < 0.0;
+
+			m_lambda_max = rayDir.dot(m_rayToWorld - m_rayFromWorld);
+		}
+
+		virtual bool process(const btBroadphaseProxy* proxy)
+		{
+			///terminate further ray tests, once the closestHitFraction reached zero
+			if (m_resultCallback.m_closestHitFraction == btScalar(0.f))
+				return false;
+
+			btCollisionObject* collisionObject = (btCollisionObject*)proxy->m_clientObject;
+
+			//only perform raycast if filterMask matches
+			if (m_resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+			{
+				//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+				//btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+#if 0
+#ifdef RECALCULATE_AABB
+                btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+                collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
+#else
+                //getBroadphase()->getAabb(collisionObject->getBroadphaseHandle(),collisionObjectAabbMin,collisionObjectAabbMax);
+                const btVector3& collisionObjectAabbMin = collisionObject->getBroadphaseHandle()->m_aabbMin;
+                const btVector3& collisionObjectAabbMax = collisionObject->getBroadphaseHandle()->m_aabbMax;
+#endif
+#endif
+				//btScalar hitLambda = m_resultCallback.m_closestHitFraction;
+				//culling already done by broadphase
+				//if (btRayAabb(m_rayFromWorld,m_rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,m_hitNormal))
+				{
+					m_world->rayTestSingle(m_rayFromTrans, m_rayToTrans,
+										   collisionObject,
+										   collisionObject->getCollisionShape(),
+										   collisionObject->getWorldTransform(),
+										   m_resultCallback);
+				}
+			}
+			return true;
+		}
+	};
+
+	void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
+	{
+		BT_PROFILE("rayTest");
+		/// use the broadphase to accelerate the search for objects, based on their aabb
+		/// and for each object with ray-aabb overlap, perform an exact ray test
+		btDeformableSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback);
+
+#ifndef USE_BRUTEFORCE_RAYBROADPHASE
+		m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB);
+#else
+		for (int i = 0; i < this->getNumCollisionObjects(); i++)
+		{
+			rayCB.process(m_collisionObjects[i]->getBroadphaseHandle());
+		}
+#endif  //USE_BRUTEFORCE_RAYBROADPHASE
+	}
+
+	void rayTestSingle(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+					   btCollisionObject* collisionObject,
+					   const btCollisionShape* collisionShape,
+					   const btTransform& colObjWorldTransform,
+					   RayResultCallback& resultCallback) const
+	{
+		if (collisionShape->isSoftBody())
+		{
+			btSoftBody* softBody = btSoftBody::upcast(collisionObject);
+			if (softBody)
+			{
+				btSoftBody::sRayCast softResult;
+				if (softBody->rayFaceTest(rayFromTrans.getOrigin(), rayToTrans.getOrigin(), softResult))
+				{
+					if (softResult.fraction <= resultCallback.m_closestHitFraction)
+					{
+						btCollisionWorld::LocalShapeInfo shapeInfo;
+						shapeInfo.m_shapePart = 0;
+						shapeInfo.m_triangleIndex = softResult.index;
+						// get the normal
+						btVector3 rayDir = rayToTrans.getOrigin() - rayFromTrans.getOrigin();
+						btVector3 normal = -rayDir;
+						normal.normalize();
+						{
+							normal = softBody->m_faces[softResult.index].m_normal;
+							if (normal.dot(rayDir) > 0)
+							{
+								// normal always point toward origin of the ray
+								normal = -normal;
+							}
+						}
+
+						btCollisionWorld::LocalRayResult rayResult(collisionObject,
+																   &shapeInfo,
+																   normal,
+																   softResult.fraction);
+						bool normalInWorldSpace = true;
+						resultCallback.addSingleResult(rayResult, normalInWorldSpace);
+					}
+				}
+			}
+		}
+		else
+		{
+			btCollisionWorld::rayTestSingle(rayFromTrans, rayToTrans, collisionObject, collisionShape, colObjWorldTransform, resultCallback);
+		}
+	}
+};
+
+#endif  //BT_DEFORMABLE_MULTIBODY_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableNeoHookeanForce.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableNeoHookeanForce.h
new file mode 100644
index 0000000..60798c5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableNeoHookeanForce.h
@@ -0,0 +1,420 @@
+/*
+Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2019 Google Inc. http://bulletphysics.org
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_NEOHOOKEAN_H
+#define BT_NEOHOOKEAN_H
+
+#include "btDeformableLagrangianForce.h"
+#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btImplicitQRSVD.h"
+// This energy is as described in https://graphics.pixar.com/library/StableElasticity/paper.pdf
+class btDeformableNeoHookeanForce : public btDeformableLagrangianForce
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	btScalar m_mu, m_lambda;  // Lame Parameters
+	btScalar m_E, m_nu;       // Young's modulus and Poisson ratio
+	btScalar m_mu_damp, m_lambda_damp;
+	btDeformableNeoHookeanForce() : m_mu(1), m_lambda(1)
+	{
+		btScalar damping = 0.05;
+		m_mu_damp = damping * m_mu;
+		m_lambda_damp = damping * m_lambda;
+		updateYoungsModulusAndPoissonRatio();
+	}
+
+	btDeformableNeoHookeanForce(btScalar mu, btScalar lambda, btScalar damping = 0.05) : m_mu(mu), m_lambda(lambda)
+	{
+		m_mu_damp = damping * m_mu;
+		m_lambda_damp = damping * m_lambda;
+		updateYoungsModulusAndPoissonRatio();
+	}
+
+	void updateYoungsModulusAndPoissonRatio()
+	{
+		// conversion from Lame Parameters to Young's modulus and Poisson ratio
+		// https://en.wikipedia.org/wiki/Lam%C3%A9_parameters
+		m_E = m_mu * (3 * m_lambda + 2 * m_mu) / (m_lambda + m_mu);
+		m_nu = m_lambda * 0.5 / (m_mu + m_lambda);
+	}
+
+	void updateLameParameters()
+	{
+		// conversion from Young's modulus and Poisson ratio to Lame Parameters
+		// https://en.wikipedia.org/wiki/Lam%C3%A9_parameters
+		m_mu = m_E * 0.5 / (1 + m_nu);
+		m_lambda = m_E * m_nu / ((1 + m_nu) * (1 - 2 * m_nu));
+	}
+
+	void setYoungsModulus(btScalar E)
+	{
+		m_E = E;
+		updateLameParameters();
+	}
+
+	void setPoissonRatio(btScalar nu)
+	{
+		m_nu = nu;
+		updateLameParameters();
+	}
+
+	void setDamping(btScalar damping)
+	{
+		m_mu_damp = damping * m_mu;
+		m_lambda_damp = damping * m_lambda;
+	}
+
+	void setLameParameters(btScalar mu, btScalar lambda)
+	{
+		m_mu = mu;
+		m_lambda = lambda;
+		updateYoungsModulusAndPoissonRatio();
+	}
+
+	virtual void addScaledForces(btScalar scale, TVStack& force)
+	{
+		addScaledDampingForce(scale, force);
+		addScaledElasticForce(scale, force);
+	}
+
+	virtual void addScaledExplicitForce(btScalar scale, TVStack& force)
+	{
+		addScaledElasticForce(scale, force);
+	}
+
+	// The damping matrix is calculated using the time n state as described in https://www.math.ucla.edu/~jteran/papers/GSSJT15.pdf to allow line search
+	virtual void addScaledDampingForce(btScalar scale, TVStack& force)
+	{
+		if (m_mu_damp == 0 && m_lambda_damp == 0)
+			return;
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+				btMatrix3x3 dF = DsFromVelocity(node0, node1, node2, node3) * tetra.m_Dm_inverse;
+				btMatrix3x3 I;
+				I.setIdentity();
+				btMatrix3x3 dP = (dF + dF.transpose()) * m_mu_damp + I * (dF[0][0] + dF[1][1] + dF[2][2]) * m_lambda_damp;
+				//                firstPiolaDampingDifferential(psb->m_tetraScratchesTn[j], dF, dP);
+				btVector3 df_on_node0 = dP * (tetra.m_Dm_inverse.transpose() * grad_N_hat_1st_col);
+				btMatrix3x3 df_on_node123 = dP * tetra.m_Dm_inverse.transpose();
+
+				// damping force differential
+				btScalar scale1 = scale * tetra.m_element_measure;
+				force[id0] -= scale1 * df_on_node0;
+				force[id1] -= scale1 * df_on_node123.getColumn(0);
+				force[id2] -= scale1 * df_on_node123.getColumn(1);
+				force[id3] -= scale1 * df_on_node123.getColumn(2);
+			}
+		}
+	}
+
+	virtual double totalElasticEnergy(btScalar dt)
+	{
+		double energy = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetraScratches.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::TetraScratch& s = psb->m_tetraScratches[j];
+				energy += tetra.m_element_measure * elasticEnergyDensity(s);
+			}
+		}
+		return energy;
+	}
+
+	// The damping energy is formulated as in https://www.math.ucla.edu/~jteran/papers/GSSJT15.pdf to allow line search
+	virtual double totalDampingEnergy(btScalar dt)
+	{
+		double energy = 0;
+		int sz = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				sz = btMax(sz, psb->m_nodes[j].index);
+			}
+		}
+		TVStack dampingForce;
+		dampingForce.resize(sz + 1);
+		for (int i = 0; i < dampingForce.size(); ++i)
+			dampingForce[i].setZero();
+		addScaledDampingForce(0.5, dampingForce);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				energy -= dampingForce[node.index].dot(node.m_v) / dt;
+			}
+		}
+		return energy;
+	}
+
+	double elasticEnergyDensity(const btSoftBody::TetraScratch& s)
+	{
+		double density = 0;
+		density += m_mu * 0.5 * (s.m_trace - 3.);
+		density += m_lambda * 0.5 * (s.m_J - 1. - 0.75 * m_mu / m_lambda) * (s.m_J - 1. - 0.75 * m_mu / m_lambda);
+		density -= m_mu * 0.5 * log(s.m_trace + 1);
+		return density;
+	}
+
+	virtual void addScaledElasticForce(btScalar scale, TVStack& force)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= force.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			btScalar max_p = psb->m_cfg.m_maxStress;
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btMatrix3x3 P;
+				firstPiola(psb->m_tetraScratches[j], P);
+#ifdef USE_SVD
+				if (max_p > 0)
+				{
+					// since we want to clamp the principal stress to max_p, we only need to
+					// calculate SVD when sigma_0^2 + sigma_1^2 + sigma_2^2 > max_p * max_p
+					btScalar trPTP = (P[0].length2() + P[1].length2() + P[2].length2());
+					if (trPTP > max_p * max_p)
+					{
+						btMatrix3x3 U, V;
+						btVector3 sigma;
+						singularValueDecomposition(P, U, sigma, V);
+						sigma[0] = btMin(sigma[0], max_p);
+						sigma[1] = btMin(sigma[1], max_p);
+						sigma[2] = btMin(sigma[2], max_p);
+						sigma[0] = btMax(sigma[0], -max_p);
+						sigma[1] = btMax(sigma[1], -max_p);
+						sigma[2] = btMax(sigma[2], -max_p);
+						btMatrix3x3 Sigma;
+						Sigma.setIdentity();
+						Sigma[0][0] = sigma[0];
+						Sigma[1][1] = sigma[1];
+						Sigma[2][2] = sigma[2];
+						P = U * Sigma * V.transpose();
+					}
+				}
+#endif
+				//                btVector3 force_on_node0 = P * (tetra.m_Dm_inverse.transpose()*grad_N_hat_1st_col);
+				btMatrix3x3 force_on_node123 = P * tetra.m_Dm_inverse.transpose();
+				btVector3 force_on_node0 = force_on_node123 * grad_N_hat_1st_col;
+
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+
+				// elastic force
+				btScalar scale1 = scale * tetra.m_element_measure;
+				force[id0] -= scale1 * force_on_node0;
+				force[id1] -= scale1 * force_on_node123.getColumn(0);
+				force[id2] -= scale1 * force_on_node123.getColumn(1);
+				force[id3] -= scale1 * force_on_node123.getColumn(2);
+			}
+		}
+	}
+
+	// The damping matrix is calculated using the time n state as described in https://www.math.ucla.edu/~jteran/papers/GSSJT15.pdf to allow line search
+	virtual void addScaledDampingForceDifferential(btScalar scale, const TVStack& dv, TVStack& df)
+	{
+		if (m_mu_damp == 0 && m_lambda_damp == 0)
+			return;
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= df.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+				btMatrix3x3 dF = Ds(id0, id1, id2, id3, dv) * tetra.m_Dm_inverse;
+				btMatrix3x3 I;
+				I.setIdentity();
+				btMatrix3x3 dP = (dF + dF.transpose()) * m_mu_damp + I * (dF[0][0] + dF[1][1] + dF[2][2]) * m_lambda_damp;
+				//                firstPiolaDampingDifferential(psb->m_tetraScratchesTn[j], dF, dP);
+				//                btVector3 df_on_node0 = dP * (tetra.m_Dm_inverse.transpose()*grad_N_hat_1st_col);
+				btMatrix3x3 df_on_node123 = dP * tetra.m_Dm_inverse.transpose();
+				btVector3 df_on_node0 = df_on_node123 * grad_N_hat_1st_col;
+
+				// damping force differential
+				btScalar scale1 = scale * tetra.m_element_measure;
+				df[id0] -= scale1 * df_on_node0;
+				df[id1] -= scale1 * df_on_node123.getColumn(0);
+				df[id2] -= scale1 * df_on_node123.getColumn(1);
+				df[id3] -= scale1 * df_on_node123.getColumn(2);
+			}
+		}
+	}
+
+	virtual void buildDampingForceDifferentialDiagonal(btScalar scale, TVStack& diagA) {}
+
+	virtual void addScaledElasticForceDifferential(btScalar scale, const TVStack& dx, TVStack& df)
+	{
+		int numNodes = getNumNodes();
+		btAssert(numNodes <= df.size());
+		btVector3 grad_N_hat_1st_col = btVector3(-1, -1, -1);
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			if (!psb->isActive())
+			{
+				continue;
+			}
+			for (int j = 0; j < psb->m_tetras.size(); ++j)
+			{
+				btSoftBody::Tetra& tetra = psb->m_tetras[j];
+				btSoftBody::Node* node0 = tetra.m_n[0];
+				btSoftBody::Node* node1 = tetra.m_n[1];
+				btSoftBody::Node* node2 = tetra.m_n[2];
+				btSoftBody::Node* node3 = tetra.m_n[3];
+				size_t id0 = node0->index;
+				size_t id1 = node1->index;
+				size_t id2 = node2->index;
+				size_t id3 = node3->index;
+				btMatrix3x3 dF = Ds(id0, id1, id2, id3, dx) * tetra.m_Dm_inverse;
+				btMatrix3x3 dP;
+				firstPiolaDifferential(psb->m_tetraScratches[j], dF, dP);
+				//                btVector3 df_on_node0 = dP * (tetra.m_Dm_inverse.transpose()*grad_N_hat_1st_col);
+				btMatrix3x3 df_on_node123 = dP * tetra.m_Dm_inverse.transpose();
+				btVector3 df_on_node0 = df_on_node123 * grad_N_hat_1st_col;
+
+				// elastic force differential
+				btScalar scale1 = scale * tetra.m_element_measure;
+				df[id0] -= scale1 * df_on_node0;
+				df[id1] -= scale1 * df_on_node123.getColumn(0);
+				df[id2] -= scale1 * df_on_node123.getColumn(1);
+				df[id3] -= scale1 * df_on_node123.getColumn(2);
+			}
+		}
+	}
+
+	void firstPiola(const btSoftBody::TetraScratch& s, btMatrix3x3& P)
+	{
+		btScalar c1 = (m_mu * (1. - 1. / (s.m_trace + 1.)));
+		btScalar c2 = (m_lambda * (s.m_J - 1.) - 0.75 * m_mu);
+		P = s.m_F * c1 + s.m_cofF * c2;
+	}
+
+	// Let P be the first piola stress.
+	// This function calculates the dP = dP/dF * dF
+	void firstPiolaDifferential(const btSoftBody::TetraScratch& s, const btMatrix3x3& dF, btMatrix3x3& dP)
+	{
+		btScalar c1 = m_mu * (1. - 1. / (s.m_trace + 1.));
+		btScalar c2 = (2. * m_mu) * DotProduct(s.m_F, dF) * (1. / ((1. + s.m_trace) * (1. + s.m_trace)));
+		btScalar c3 = (m_lambda * DotProduct(s.m_cofF, dF));
+		dP = dF * c1 + s.m_F * c2;
+		addScaledCofactorMatrixDifferential(s.m_F, dF, m_lambda * (s.m_J - 1.) - 0.75 * m_mu, dP);
+		dP += s.m_cofF * c3;
+	}
+
+	// Let Q be the damping stress.
+	// This function calculates the dP = dQ/dF * dF
+	void firstPiolaDampingDifferential(const btSoftBody::TetraScratch& s, const btMatrix3x3& dF, btMatrix3x3& dP)
+	{
+		btScalar c1 = (m_mu_damp * (1. - 1. / (s.m_trace + 1.)));
+		btScalar c2 = ((2. * m_mu_damp) * DotProduct(s.m_F, dF) * (1. / ((1. + s.m_trace) * (1. + s.m_trace))));
+		btScalar c3 = (m_lambda_damp * DotProduct(s.m_cofF, dF));
+		dP = dF * c1 + s.m_F * c2;
+		addScaledCofactorMatrixDifferential(s.m_F, dF, m_lambda_damp * (s.m_J - 1.) - 0.75 * m_mu_damp, dP);
+		dP += s.m_cofF * c3;
+	}
+
+	btScalar DotProduct(const btMatrix3x3& A, const btMatrix3x3& B)
+	{
+		btScalar ans = 0;
+		for (int i = 0; i < 3; ++i)
+		{
+			ans += A[i].dot(B[i]);
+		}
+		return ans;
+	}
+
+	// Let C(A) be the cofactor of the matrix A
+	// Let H = the derivative of C(A) with respect to A evaluated at F = A
+	// This function calculates H*dF
+	void addScaledCofactorMatrixDifferential(const btMatrix3x3& F, const btMatrix3x3& dF, btScalar scale, btMatrix3x3& M)
+	{
+		M[0][0] += scale * (dF[1][1] * F[2][2] + F[1][1] * dF[2][2] - dF[2][1] * F[1][2] - F[2][1] * dF[1][2]);
+		M[1][0] += scale * (dF[2][1] * F[0][2] + F[2][1] * dF[0][2] - dF[0][1] * F[2][2] - F[0][1] * dF[2][2]);
+		M[2][0] += scale * (dF[0][1] * F[1][2] + F[0][1] * dF[1][2] - dF[1][1] * F[0][2] - F[1][1] * dF[0][2]);
+		M[0][1] += scale * (dF[2][0] * F[1][2] + F[2][0] * dF[1][2] - dF[1][0] * F[2][2] - F[1][0] * dF[2][2]);
+		M[1][1] += scale * (dF[0][0] * F[2][2] + F[0][0] * dF[2][2] - dF[2][0] * F[0][2] - F[2][0] * dF[0][2]);
+		M[2][1] += scale * (dF[1][0] * F[0][2] + F[1][0] * dF[0][2] - dF[0][0] * F[1][2] - F[0][0] * dF[1][2]);
+		M[0][2] += scale * (dF[1][0] * F[2][1] + F[1][0] * dF[2][1] - dF[2][0] * F[1][1] - F[2][0] * dF[1][1]);
+		M[1][2] += scale * (dF[2][0] * F[0][1] + F[2][0] * dF[0][1] - dF[0][0] * F[2][1] - F[0][0] * dF[2][1]);
+		M[2][2] += scale * (dF[0][0] * F[1][1] + F[0][0] * dF[1][1] - dF[1][0] * F[0][1] - F[1][0] * dF[0][1]);
+	}
+
+	virtual btDeformableLagrangianForceType getForceType()
+	{
+		return BT_NEOHOOKEAN_FORCE;
+	}
+};
+#endif /* BT_NEOHOOKEAN_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btKrylovSolver.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btKrylovSolver.h
new file mode 100644
index 0000000..59126b4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btKrylovSolver.h
@@ -0,0 +1,107 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_KRYLOV_SOLVER_H
+#define BT_KRYLOV_SOLVER_H
+#include <iostream>
+#include <cmath>
+#include <limits>
+#include <LinearMath/btAlignedObjectArray.h>
+#include <LinearMath/btVector3.h>
+#include <LinearMath/btScalar.h>
+#include "LinearMath/btQuickprof.h"
+
+template <class MatrixX>
+class btKrylovSolver
+{
+	typedef btAlignedObjectArray<btVector3> TVStack;
+
+public:
+	int m_maxIterations;
+	btScalar m_tolerance;
+	btKrylovSolver(int maxIterations, btScalar tolerance)
+		: m_maxIterations(maxIterations), m_tolerance(tolerance)
+	{
+	}
+
+	virtual ~btKrylovSolver() {}
+
+	virtual int solve(MatrixX& A, TVStack& x, const TVStack& b, bool verbose = false) = 0;
+
+	virtual void reinitialize(const TVStack& b) = 0;
+
+	virtual SIMD_FORCE_INLINE TVStack sub(const TVStack& a, const TVStack& b)
+	{
+		// c = a-b
+		btAssert(a.size() == b.size());
+		TVStack c;
+		c.resize(a.size());
+		for (int i = 0; i < a.size(); ++i)
+		{
+			c[i] = a[i] - b[i];
+		}
+		return c;
+	}
+
+	virtual SIMD_FORCE_INLINE btScalar squaredNorm(const TVStack& a)
+	{
+		return dot(a, a);
+	}
+
+	virtual SIMD_FORCE_INLINE btScalar norm(const TVStack& a)
+	{
+		btScalar ret = 0;
+		for (int i = 0; i < a.size(); ++i)
+		{
+			for (int d = 0; d < 3; ++d)
+			{
+				ret = btMax(ret, btFabs(a[i][d]));
+			}
+		}
+		return ret;
+	}
+
+	virtual SIMD_FORCE_INLINE btScalar dot(const TVStack& a, const TVStack& b)
+	{
+		btScalar ans(0);
+		for (int i = 0; i < a.size(); ++i)
+			ans += a[i].dot(b[i]);
+		return ans;
+	}
+
+	virtual SIMD_FORCE_INLINE void multAndAddTo(btScalar s, const TVStack& a, TVStack& result)
+	{
+		//        result += s*a
+		btAssert(a.size() == result.size());
+		for (int i = 0; i < a.size(); ++i)
+			result[i] += s * a[i];
+	}
+
+	virtual SIMD_FORCE_INLINE TVStack multAndAdd(btScalar s, const TVStack& a, const TVStack& b)
+	{
+		// result = a*s + b
+		TVStack result;
+		result.resize(a.size());
+		for (int i = 0; i < a.size(); ++i)
+			result[i] = s * a[i] + b[i];
+		return result;
+	}
+
+	virtual SIMD_FORCE_INLINE void setTolerance(btScalar tolerance)
+	{
+		m_tolerance = tolerance;
+	}
+};
+#endif /* BT_KRYLOV_SOLVER_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btPreconditioner.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btPreconditioner.h
new file mode 100644
index 0000000..21c1106
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btPreconditioner.h
@@ -0,0 +1,285 @@
+/*
+ Written by Xuchen Han <xuchenhan2015@u.northwestern.edu>
+ 
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef BT_PRECONDITIONER_H
+#define BT_PRECONDITIONER_H
+
+class Preconditioner
+{
+public:
+	typedef btAlignedObjectArray<btVector3> TVStack;
+	virtual void operator()(const TVStack& x, TVStack& b) = 0;
+	virtual void reinitialize(bool nodeUpdated) = 0;
+	virtual ~Preconditioner() {}
+};
+
+class DefaultPreconditioner : public Preconditioner
+{
+public:
+	virtual void operator()(const TVStack& x, TVStack& b)
+	{
+		btAssert(b.size() == x.size());
+		for (int i = 0; i < b.size(); ++i)
+			b[i] = x[i];
+	}
+	virtual void reinitialize(bool nodeUpdated)
+	{
+	}
+
+	virtual ~DefaultPreconditioner() {}
+};
+
+class MassPreconditioner : public Preconditioner
+{
+	btAlignedObjectArray<btScalar> m_inv_mass;
+	const btAlignedObjectArray<btSoftBody*>& m_softBodies;
+
+public:
+	MassPreconditioner(const btAlignedObjectArray<btSoftBody*>& softBodies)
+		: m_softBodies(softBodies)
+	{
+	}
+
+	virtual void reinitialize(bool nodeUpdated)
+	{
+		if (nodeUpdated)
+		{
+			m_inv_mass.clear();
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				for (int j = 0; j < psb->m_nodes.size(); ++j)
+					m_inv_mass.push_back(psb->m_nodes[j].m_im);
+			}
+		}
+	}
+
+	virtual void operator()(const TVStack& x, TVStack& b)
+	{
+		btAssert(b.size() == x.size());
+		btAssert(m_inv_mass.size() <= x.size());
+		for (int i = 0; i < m_inv_mass.size(); ++i)
+		{
+			b[i] = x[i] * m_inv_mass[i];
+		}
+		for (int i = m_inv_mass.size(); i < b.size(); ++i)
+		{
+			b[i] = x[i];
+		}
+	}
+};
+
+class KKTPreconditioner : public Preconditioner
+{
+	const btAlignedObjectArray<btSoftBody*>& m_softBodies;
+	const btDeformableContactProjection& m_projections;
+	const btAlignedObjectArray<btDeformableLagrangianForce*>& m_lf;
+	TVStack m_inv_A, m_inv_S;
+	const btScalar& m_dt;
+	const bool& m_implicit;
+
+public:
+	KKTPreconditioner(const btAlignedObjectArray<btSoftBody*>& softBodies, const btDeformableContactProjection& projections, const btAlignedObjectArray<btDeformableLagrangianForce*>& lf, const btScalar& dt, const bool& implicit)
+		: m_softBodies(softBodies), m_projections(projections), m_lf(lf), m_dt(dt), m_implicit(implicit)
+	{
+	}
+
+	virtual void reinitialize(bool nodeUpdated)
+	{
+		if (nodeUpdated)
+		{
+			int num_nodes = 0;
+			for (int i = 0; i < m_softBodies.size(); ++i)
+			{
+				btSoftBody* psb = m_softBodies[i];
+				num_nodes += psb->m_nodes.size();
+			}
+			m_inv_A.resize(num_nodes);
+		}
+		buildDiagonalA(m_inv_A);
+		for (int i = 0; i < m_inv_A.size(); ++i)
+		{
+			//            printf("A[%d] = %f, %f, %f \n", i, m_inv_A[i][0], m_inv_A[i][1], m_inv_A[i][2]);
+			for (int d = 0; d < 3; ++d)
+			{
+				m_inv_A[i][d] = (m_inv_A[i][d] == 0) ? 0.0 : 1.0 / m_inv_A[i][d];
+			}
+		}
+		m_inv_S.resize(m_projections.m_lagrangeMultipliers.size());
+		//        printf("S.size() = %d \n", m_inv_S.size());
+		buildDiagonalS(m_inv_A, m_inv_S);
+		for (int i = 0; i < m_inv_S.size(); ++i)
+		{
+			//            printf("S[%d] = %f, %f, %f \n", i, m_inv_S[i][0], m_inv_S[i][1], m_inv_S[i][2]);
+			for (int d = 0; d < 3; ++d)
+			{
+				m_inv_S[i][d] = (m_inv_S[i][d] == 0) ? 0.0 : 1.0 / m_inv_S[i][d];
+			}
+		}
+	}
+
+	void buildDiagonalA(TVStack& diagA) const
+	{
+		size_t counter = 0;
+		for (int i = 0; i < m_softBodies.size(); ++i)
+		{
+			btSoftBody* psb = m_softBodies[i];
+			for (int j = 0; j < psb->m_nodes.size(); ++j)
+			{
+				const btSoftBody::Node& node = psb->m_nodes[j];
+				diagA[counter] = (node.m_im == 0) ? btVector3(0, 0, 0) : btVector3(1.0 / node.m_im, 1.0 / node.m_im, 1.0 / node.m_im);
+				++counter;
+			}
+		}
+		if (m_implicit)
+		{
+			printf("implicit not implemented\n");
+			btAssert(false);
+		}
+		for (int i = 0; i < m_lf.size(); ++i)
+		{
+			// add damping matrix
+			m_lf[i]->buildDampingForceDifferentialDiagonal(-m_dt, diagA);
+		}
+	}
+
+	void buildDiagonalS(const TVStack& inv_A, TVStack& diagS)
+	{
+		for (int c = 0; c < m_projections.m_lagrangeMultipliers.size(); ++c)
+		{
+			// S[k,k] = e_k^T * C A_d^-1 C^T * e_k
+			const LagrangeMultiplier& lm = m_projections.m_lagrangeMultipliers[c];
+			btVector3& t = diagS[c];
+			t.setZero();
+			for (int j = 0; j < lm.m_num_constraints; ++j)
+			{
+				for (int i = 0; i < lm.m_num_nodes; ++i)
+				{
+					for (int d = 0; d < 3; ++d)
+					{
+						t[j] += inv_A[lm.m_indices[i]][d] * lm.m_dirs[j][d] * lm.m_dirs[j][d] * lm.m_weights[i] * lm.m_weights[i];
+					}
+				}
+			}
+		}
+	}
+//#define USE_FULL_PRECONDITIONER
+#ifndef USE_FULL_PRECONDITIONER
+	virtual void operator()(const TVStack& x, TVStack& b)
+	{
+		btAssert(b.size() == x.size());
+		for (int i = 0; i < m_inv_A.size(); ++i)
+		{
+			b[i] = x[i] * m_inv_A[i];
+		}
+		int offset = m_inv_A.size();
+		for (int i = 0; i < m_inv_S.size(); ++i)
+		{
+			b[i + offset] = x[i + offset] * m_inv_S[i];
+		}
+	}
+#else
+	virtual void operator()(const TVStack& x, TVStack& b)
+	{
+		btAssert(b.size() == x.size());
+		int offset = m_inv_A.size();
+
+		for (int i = 0; i < m_inv_A.size(); ++i)
+		{
+			b[i] = x[i] * m_inv_A[i];
+		}
+
+		for (int i = 0; i < m_inv_S.size(); ++i)
+		{
+			b[i + offset].setZero();
+		}
+
+		for (int c = 0; c < m_projections.m_lagrangeMultipliers.size(); ++c)
+		{
+			const LagrangeMultiplier& lm = m_projections.m_lagrangeMultipliers[c];
+			// C * x
+			for (int d = 0; d < lm.m_num_constraints; ++d)
+			{
+				for (int i = 0; i < lm.m_num_nodes; ++i)
+				{
+					b[offset + c][d] += lm.m_weights[i] * b[lm.m_indices[i]].dot(lm.m_dirs[d]);
+				}
+			}
+		}
+
+		for (int i = 0; i < m_inv_S.size(); ++i)
+		{
+			b[i + offset] = b[i + offset] * m_inv_S[i];
+		}
+
+		for (int i = 0; i < m_inv_A.size(); ++i)
+		{
+			b[i].setZero();
+		}
+
+		for (int c = 0; c < m_projections.m_lagrangeMultipliers.size(); ++c)
+		{
+			// C^T * lambda
+			const LagrangeMultiplier& lm = m_projections.m_lagrangeMultipliers[c];
+			for (int i = 0; i < lm.m_num_nodes; ++i)
+			{
+				for (int j = 0; j < lm.m_num_constraints; ++j)
+				{
+					b[lm.m_indices[i]] += b[offset + c][j] * lm.m_weights[i] * lm.m_dirs[j];
+				}
+			}
+		}
+
+		for (int i = 0; i < m_inv_A.size(); ++i)
+		{
+			b[i] = (x[i] - b[i]) * m_inv_A[i];
+		}
+
+		TVStack t;
+		t.resize(b.size());
+		for (int i = 0; i < m_inv_S.size(); ++i)
+		{
+			t[i + offset] = x[i + offset] * m_inv_S[i];
+		}
+		for (int i = 0; i < m_inv_A.size(); ++i)
+		{
+			t[i].setZero();
+		}
+		for (int c = 0; c < m_projections.m_lagrangeMultipliers.size(); ++c)
+		{
+			// C^T * lambda
+			const LagrangeMultiplier& lm = m_projections.m_lagrangeMultipliers[c];
+			for (int i = 0; i < lm.m_num_nodes; ++i)
+			{
+				for (int j = 0; j < lm.m_num_constraints; ++j)
+				{
+					t[lm.m_indices[i]] += t[offset + c][j] * lm.m_weights[i] * lm.m_dirs[j];
+				}
+			}
+		}
+		for (int i = 0; i < m_inv_A.size(); ++i)
+		{
+			b[i] += t[i] * m_inv_A[i];
+		}
+
+		for (int i = 0; i < m_inv_S.size(); ++i)
+		{
+			b[i + offset] -= x[i + offset] * m_inv_S[i];
+		}
+	}
+#endif
+};
+
+#endif /* BT_PRECONDITIONER_H */
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBody.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBody.cpp
new file mode 100644
index 0000000..c873099
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBody.cpp
@@ -0,0 +1,4757 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBody implementation by Nathanael Presson
+
+#include "btSoftBodyInternals.h"
+#include "BulletSoftBody/btSoftBodySolvers.h"
+#include "btSoftBodyData.h"
+#include "LinearMath/btSerializer.h"
+#include "LinearMath/btImplicitQRSVD.h"
+#include "LinearMath/btAlignedAllocator.h"
+#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include <iostream>
+//
+static inline btDbvtNode* buildTreeBottomUp(btAlignedObjectArray<btDbvtNode*>& leafNodes, btAlignedObjectArray<btAlignedObjectArray<int> >& adj)
+{
+	int N = leafNodes.size();
+	if (N == 0)
+	{
+		return NULL;
+	}
+	while (N > 1)
+	{
+		btAlignedObjectArray<bool> marked;
+		btAlignedObjectArray<btDbvtNode*> newLeafNodes;
+		btAlignedObjectArray<std::pair<int, int> > childIds;
+		btAlignedObjectArray<btAlignedObjectArray<int> > newAdj;
+		marked.resize(N);
+		for (int i = 0; i < N; ++i)
+			marked[i] = false;
+
+		// pair adjacent nodes into new(parent) node
+		for (int i = 0; i < N; ++i)
+		{
+			if (marked[i])
+				continue;
+			bool merged = false;
+			for (int j = 0; j < adj[i].size(); ++j)
+			{
+				int n = adj[i][j];
+				if (!marked[adj[i][j]])
+				{
+					btDbvtNode* node = new (btAlignedAlloc(sizeof(btDbvtNode), 16)) btDbvtNode();
+					node->parent = NULL;
+					node->childs[0] = leafNodes[i];
+					node->childs[1] = leafNodes[n];
+					leafNodes[i]->parent = node;
+					leafNodes[n]->parent = node;
+					newLeafNodes.push_back(node);
+					childIds.push_back(std::make_pair(i, n));
+					merged = true;
+					marked[n] = true;
+					break;
+				}
+			}
+			if (!merged)
+			{
+				newLeafNodes.push_back(leafNodes[i]);
+				childIds.push_back(std::make_pair(i, -1));
+			}
+			marked[i] = true;
+		}
+		// update adjacency matrix
+		newAdj.resize(newLeafNodes.size());
+		for (int i = 0; i < newLeafNodes.size(); ++i)
+		{
+			for (int j = i + 1; j < newLeafNodes.size(); ++j)
+			{
+				bool neighbor = false;
+				const btAlignedObjectArray<int>& leftChildNeighbors = adj[childIds[i].first];
+				for (int k = 0; k < leftChildNeighbors.size(); ++k)
+				{
+					if (leftChildNeighbors[k] == childIds[j].first || leftChildNeighbors[k] == childIds[j].second)
+					{
+						neighbor = true;
+						break;
+					}
+				}
+				if (!neighbor && childIds[i].second != -1)
+				{
+					const btAlignedObjectArray<int>& rightChildNeighbors = adj[childIds[i].second];
+					for (int k = 0; k < rightChildNeighbors.size(); ++k)
+					{
+						if (rightChildNeighbors[k] == childIds[j].first || rightChildNeighbors[k] == childIds[j].second)
+						{
+							neighbor = true;
+							break;
+						}
+					}
+				}
+				if (neighbor)
+				{
+					newAdj[i].push_back(j);
+					newAdj[j].push_back(i);
+				}
+			}
+		}
+		leafNodes = newLeafNodes;
+		//this assignment leaks memory, the assignment doesn't do a deep copy, for now a manual copy
+		//adj = newAdj;
+		adj.clear();
+		adj.resize(newAdj.size());
+		for (int i = 0; i < newAdj.size(); i++)
+		{
+			for (int j = 0; j < newAdj[i].size(); j++)
+			{
+				adj[i].push_back(newAdj[i][j]);
+			}
+		}
+		N = leafNodes.size();
+	}
+	return leafNodes[0];
+}
+
+//
+btSoftBody::btSoftBody(btSoftBodyWorldInfo* worldInfo, int node_count, const btVector3* x, const btScalar* m)
+	: m_softBodySolver(0), m_worldInfo(worldInfo)
+{
+	/* Init		*/
+	initDefaults();
+
+	/* Default material	*/
+	Material* pm = appendMaterial();
+	pm->m_kLST = 1;
+	pm->m_kAST = 1;
+	pm->m_kVST = 1;
+	pm->m_flags = fMaterial::Default;
+
+	/* Nodes			*/
+	const btScalar margin = getCollisionShape()->getMargin();
+	m_nodes.resize(node_count);
+	m_X.resize(node_count);
+	for (int i = 0, ni = node_count; i < ni; ++i)
+	{
+		Node& n = m_nodes[i];
+		ZeroInitialize(n);
+		n.m_x = x ? *x++ : btVector3(0, 0, 0);
+		n.m_q = n.m_x;
+		n.m_im = m ? *m++ : 1;
+		n.m_im = n.m_im > 0 ? 1 / n.m_im : 0;
+		n.m_leaf = m_ndbvt.insert(btDbvtVolume::FromCR(n.m_x, margin), &n);
+		n.m_material = pm;
+		m_X[i] = n.m_x;
+	}
+	updateBounds();
+	setCollisionQuadrature(3);
+	m_fdbvnt = 0;
+}
+
+btSoftBody::btSoftBody(btSoftBodyWorldInfo* worldInfo)
+	: m_worldInfo(worldInfo)
+{
+	initDefaults();
+}
+
+void btSoftBody::initDefaults()
+{
+	m_internalType = CO_SOFT_BODY;
+	m_cfg.aeromodel = eAeroModel::V_Point;
+	m_cfg.kVCF = 1;
+	m_cfg.kDG = 0;
+	m_cfg.kLF = 0;
+	m_cfg.kDP = 0;
+	m_cfg.kPR = 0;
+	m_cfg.kVC = 0;
+	m_cfg.kDF = (btScalar)0.2;
+	m_cfg.kMT = 0;
+	m_cfg.kCHR = (btScalar)1.0;
+	m_cfg.kKHR = (btScalar)0.1;
+	m_cfg.kSHR = (btScalar)1.0;
+	m_cfg.kAHR = (btScalar)0.7;
+	m_cfg.kSRHR_CL = (btScalar)0.1;
+	m_cfg.kSKHR_CL = (btScalar)1;
+	m_cfg.kSSHR_CL = (btScalar)0.5;
+	m_cfg.kSR_SPLT_CL = (btScalar)0.5;
+	m_cfg.kSK_SPLT_CL = (btScalar)0.5;
+	m_cfg.kSS_SPLT_CL = (btScalar)0.5;
+	m_cfg.maxvolume = (btScalar)1;
+	m_cfg.timescale = 1;
+	m_cfg.viterations = 0;
+	m_cfg.piterations = 1;
+	m_cfg.diterations = 0;
+	m_cfg.citerations = 4;
+	m_cfg.drag = 0;
+	m_cfg.m_maxStress = 0;
+	m_cfg.collisions = fCollision::Default;
+	m_pose.m_bvolume = false;
+	m_pose.m_bframe = false;
+	m_pose.m_volume = 0;
+	m_pose.m_com = btVector3(0, 0, 0);
+	m_pose.m_rot.setIdentity();
+	m_pose.m_scl.setIdentity();
+	m_tag = 0;
+	m_timeacc = 0;
+	m_bUpdateRtCst = true;
+	m_bounds[0] = btVector3(0, 0, 0);
+	m_bounds[1] = btVector3(0, 0, 0);
+	m_worldTransform.setIdentity();
+	setSolver(eSolverPresets::Positions);
+
+	/* Collision shape	*/
+	///for now, create a collision shape internally
+	m_collisionShape = new btSoftBodyCollisionShape(this);
+	m_collisionShape->setMargin(0.25f);
+
+	m_worldTransform.setIdentity();
+
+	m_windVelocity = btVector3(0, 0, 0);
+	m_restLengthScale = btScalar(1.0);
+	m_dampingCoefficient = 1.0;
+	m_sleepingThreshold = .04;
+	m_useSelfCollision = false;
+	m_collisionFlags = 0;
+	m_softSoftCollision = false;
+	m_maxSpeedSquared = 0;
+	m_repulsionStiffness = 0.5;
+	m_gravityFactor = 1;
+	m_cacheBarycenter = false;
+	m_fdbvnt = 0;
+
+	// reduced flag
+	m_reducedModel = false;
+}
+
+//
+btSoftBody::~btSoftBody()
+{
+	//for now, delete the internal shape
+	delete m_collisionShape;
+	int i;
+
+	releaseClusters();
+	for (i = 0; i < m_materials.size(); ++i)
+		btAlignedFree(m_materials[i]);
+	for (i = 0; i < m_joints.size(); ++i)
+		btAlignedFree(m_joints[i]);
+	if (m_fdbvnt)
+		delete m_fdbvnt;
+}
+
+//
+bool btSoftBody::checkLink(int node0, int node1) const
+{
+	return (checkLink(&m_nodes[node0], &m_nodes[node1]));
+}
+
+//
+bool btSoftBody::checkLink(const Node* node0, const Node* node1) const
+{
+	const Node* n[] = {node0, node1};
+	for (int i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		const Link& l = m_links[i];
+		if ((l.m_n[0] == n[0] && l.m_n[1] == n[1]) ||
+			(l.m_n[0] == n[1] && l.m_n[1] == n[0]))
+		{
+			return (true);
+		}
+	}
+	return (false);
+}
+
+//
+bool btSoftBody::checkFace(int node0, int node1, int node2) const
+{
+	const Node* n[] = {&m_nodes[node0],
+					   &m_nodes[node1],
+					   &m_nodes[node2]};
+	for (int i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		const Face& f = m_faces[i];
+		int c = 0;
+		for (int j = 0; j < 3; ++j)
+		{
+			if ((f.m_n[j] == n[0]) ||
+				(f.m_n[j] == n[1]) ||
+				(f.m_n[j] == n[2]))
+				c |= 1 << j;
+			else
+				break;
+		}
+		if (c == 7) return (true);
+	}
+	return (false);
+}
+
+//
+btSoftBody::Material* btSoftBody::appendMaterial()
+{
+	Material* pm = new (btAlignedAlloc(sizeof(Material), 16)) Material();
+	if (m_materials.size() > 0)
+		*pm = *m_materials[0];
+	else
+		ZeroInitialize(*pm);
+	m_materials.push_back(pm);
+	return (pm);
+}
+
+//
+void btSoftBody::appendNote(const char* text,
+							const btVector3& o,
+							const btVector4& c,
+							Node* n0,
+							Node* n1,
+							Node* n2,
+							Node* n3)
+{
+	Note n;
+	ZeroInitialize(n);
+	n.m_rank = 0;
+	n.m_text = text;
+	n.m_offset = o;
+	n.m_coords[0] = c.x();
+	n.m_coords[1] = c.y();
+	n.m_coords[2] = c.z();
+	n.m_coords[3] = c.w();
+	n.m_nodes[0] = n0;
+	n.m_rank += n0 ? 1 : 0;
+	n.m_nodes[1] = n1;
+	n.m_rank += n1 ? 1 : 0;
+	n.m_nodes[2] = n2;
+	n.m_rank += n2 ? 1 : 0;
+	n.m_nodes[3] = n3;
+	n.m_rank += n3 ? 1 : 0;
+	m_notes.push_back(n);
+}
+
+//
+void btSoftBody::appendNote(const char* text,
+							const btVector3& o,
+							Node* feature)
+{
+	appendNote(text, o, btVector4(1, 0, 0, 0), feature);
+}
+
+//
+void btSoftBody::appendNote(const char* text,
+							const btVector3& o,
+							Link* feature)
+{
+	static const btScalar w = 1 / (btScalar)2;
+	appendNote(text, o, btVector4(w, w, 0, 0), feature->m_n[0],
+			   feature->m_n[1]);
+}
+
+//
+void btSoftBody::appendNote(const char* text,
+							const btVector3& o,
+							Face* feature)
+{
+	static const btScalar w = 1 / (btScalar)3;
+	appendNote(text, o, btVector4(w, w, w, 0), feature->m_n[0],
+			   feature->m_n[1],
+			   feature->m_n[2]);
+}
+
+//
+void btSoftBody::appendNode(const btVector3& x, btScalar m)
+{
+	if (m_nodes.capacity() == m_nodes.size())
+	{
+		pointersToIndices();
+		m_nodes.reserve(m_nodes.size() * 2 + 1);
+		indicesToPointers();
+	}
+	const btScalar margin = getCollisionShape()->getMargin();
+	m_nodes.push_back(Node());
+	Node& n = m_nodes[m_nodes.size() - 1];
+	ZeroInitialize(n);
+	n.m_x = x;
+	n.m_q = n.m_x;
+	n.m_im = m > 0 ? 1 / m : 0;
+	n.m_material = m_materials[0];
+	n.m_leaf = m_ndbvt.insert(btDbvtVolume::FromCR(n.m_x, margin), &n);
+}
+
+//
+void btSoftBody::appendLink(int model, Material* mat)
+{
+	Link l;
+	if (model >= 0)
+		l = m_links[model];
+	else
+	{
+		ZeroInitialize(l);
+		l.m_material = mat ? mat : m_materials[0];
+	}
+	m_links.push_back(l);
+}
+
+//
+void btSoftBody::appendLink(int node0,
+							int node1,
+							Material* mat,
+							bool bcheckexist)
+{
+	appendLink(&m_nodes[node0], &m_nodes[node1], mat, bcheckexist);
+}
+
+//
+void btSoftBody::appendLink(Node* node0,
+							Node* node1,
+							Material* mat,
+							bool bcheckexist)
+{
+	if ((!bcheckexist) || (!checkLink(node0, node1)))
+	{
+		appendLink(-1, mat);
+		Link& l = m_links[m_links.size() - 1];
+		l.m_n[0] = node0;
+		l.m_n[1] = node1;
+		l.m_rl = (l.m_n[0]->m_x - l.m_n[1]->m_x).length();
+		m_bUpdateRtCst = true;
+	}
+}
+
+//
+void btSoftBody::appendFace(int model, Material* mat)
+{
+	Face f;
+	if (model >= 0)
+	{
+		f = m_faces[model];
+	}
+	else
+	{
+		ZeroInitialize(f);
+		f.m_material = mat ? mat : m_materials[0];
+	}
+	m_faces.push_back(f);
+}
+
+//
+void btSoftBody::appendFace(int node0, int node1, int node2, Material* mat)
+{
+	if (node0 == node1)
+		return;
+	if (node1 == node2)
+		return;
+	if (node2 == node0)
+		return;
+
+	appendFace(-1, mat);
+	Face& f = m_faces[m_faces.size() - 1];
+	btAssert(node0 != node1);
+	btAssert(node1 != node2);
+	btAssert(node2 != node0);
+	f.m_n[0] = &m_nodes[node0];
+	f.m_n[1] = &m_nodes[node1];
+	f.m_n[2] = &m_nodes[node2];
+	f.m_ra = AreaOf(f.m_n[0]->m_x,
+					f.m_n[1]->m_x,
+					f.m_n[2]->m_x);
+	m_bUpdateRtCst = true;
+}
+
+//
+void btSoftBody::appendTetra(int model, Material* mat)
+{
+	Tetra t;
+	if (model >= 0)
+		t = m_tetras[model];
+	else
+	{
+		ZeroInitialize(t);
+		t.m_material = mat ? mat : m_materials[0];
+	}
+	m_tetras.push_back(t);
+}
+
+//
+void btSoftBody::appendTetra(int node0,
+							 int node1,
+							 int node2,
+							 int node3,
+							 Material* mat)
+{
+	appendTetra(-1, mat);
+	Tetra& t = m_tetras[m_tetras.size() - 1];
+	t.m_n[0] = &m_nodes[node0];
+	t.m_n[1] = &m_nodes[node1];
+	t.m_n[2] = &m_nodes[node2];
+	t.m_n[3] = &m_nodes[node3];
+	t.m_rv = VolumeOf(t.m_n[0]->m_x, t.m_n[1]->m_x, t.m_n[2]->m_x, t.m_n[3]->m_x);
+	m_bUpdateRtCst = true;
+}
+
+//
+
+void btSoftBody::appendAnchor(int node, btRigidBody* body, bool disableCollisionBetweenLinkedBodies, btScalar influence)
+{
+	btVector3 local = body->getWorldTransform().inverse() * m_nodes[node].m_x;
+	appendAnchor(node, body, local, disableCollisionBetweenLinkedBodies, influence);
+}
+
+//
+void btSoftBody::appendAnchor(int node, btRigidBody* body, const btVector3& localPivot, bool disableCollisionBetweenLinkedBodies, btScalar influence)
+{
+	if (disableCollisionBetweenLinkedBodies)
+	{
+		if (m_collisionDisabledObjects.findLinearSearch(body) == m_collisionDisabledObjects.size())
+		{
+			m_collisionDisabledObjects.push_back(body);
+		}
+	}
+
+	Anchor a;
+	a.m_node = &m_nodes[node];
+	a.m_body = body;
+	a.m_local = localPivot;
+	a.m_node->m_battach = 1;
+	a.m_influence = influence;
+	m_anchors.push_back(a);
+}
+
+//
+void btSoftBody::appendDeformableAnchor(int node, btRigidBody* body)
+{
+	DeformableNodeRigidAnchor c;
+	btSoftBody::Node& n = m_nodes[node];
+	const btScalar ima = n.m_im;
+	const btScalar imb = body->getInvMass();
+	btVector3 nrm;
+	const btCollisionShape* shp = body->getCollisionShape();
+	const btTransform& wtr = body->getWorldTransform();
+	btScalar dst =
+		m_worldInfo->m_sparsesdf.Evaluate(
+			wtr.invXform(m_nodes[node].m_x),
+			shp,
+			nrm,
+			0);
+
+	c.m_cti.m_colObj = body;
+	c.m_cti.m_normal = wtr.getBasis() * nrm;
+	c.m_cti.m_offset = dst;
+	c.m_node = &m_nodes[node];
+	const btScalar fc = m_cfg.kDF * body->getFriction();
+	c.m_c2 = ima;
+	c.m_c3 = fc;
+	c.m_c4 = body->isStaticOrKinematicObject() ? m_cfg.kKHR : m_cfg.kCHR;
+	static const btMatrix3x3 iwiStatic(0, 0, 0, 0, 0, 0, 0, 0, 0);
+	const btMatrix3x3& iwi = body->getInvInertiaTensorWorld();
+	const btVector3 ra = n.m_x - wtr.getOrigin();
+
+	c.m_c0 = ImpulseMatrix(1, ima, imb, iwi, ra);
+	c.m_c1 = ra;
+	c.m_local = body->getWorldTransform().inverse() * m_nodes[node].m_x;
+	c.m_node->m_battach = 1;
+	m_deformableAnchors.push_back(c);
+}
+
+void btSoftBody::removeAnchor(int node)
+{
+	const btSoftBody::Node& n = m_nodes[node];
+	for (int i = 0; i < m_deformableAnchors.size();)
+	{
+		const DeformableNodeRigidAnchor& c = m_deformableAnchors[i];
+		if (c.m_node == &n)
+		{
+			m_deformableAnchors.removeAtIndex(i);
+		}
+		else
+		{
+			i++;
+		}
+	}
+}
+
+//
+void btSoftBody::appendDeformableAnchor(int node, btMultiBodyLinkCollider* link)
+{
+	DeformableNodeRigidAnchor c;
+	btSoftBody::Node& n = m_nodes[node];
+	const btScalar ima = n.m_im;
+	btVector3 nrm;
+	const btCollisionShape* shp = link->getCollisionShape();
+	const btTransform& wtr = link->getWorldTransform();
+	btScalar dst =
+		m_worldInfo->m_sparsesdf.Evaluate(
+			wtr.invXform(m_nodes[node].m_x),
+			shp,
+			nrm,
+			0);
+	c.m_cti.m_colObj = link;
+	c.m_cti.m_normal = wtr.getBasis() * nrm;
+	c.m_cti.m_offset = dst;
+	c.m_node = &m_nodes[node];
+	const btScalar fc = m_cfg.kDF * link->getFriction();
+	c.m_c2 = ima;
+	c.m_c3 = fc;
+	c.m_c4 = link->isStaticOrKinematicObject() ? m_cfg.kKHR : m_cfg.kCHR;
+	btVector3 normal = c.m_cti.m_normal;
+	btVector3 t1 = generateUnitOrthogonalVector(normal);
+	btVector3 t2 = btCross(normal, t1);
+	btMultiBodyJacobianData jacobianData_normal, jacobianData_t1, jacobianData_t2;
+	findJacobian(link, jacobianData_normal, c.m_node->m_x, normal);
+	findJacobian(link, jacobianData_t1, c.m_node->m_x, t1);
+	findJacobian(link, jacobianData_t2, c.m_node->m_x, t2);
+
+	btScalar* J_n = &jacobianData_normal.m_jacobians[0];
+	btScalar* J_t1 = &jacobianData_t1.m_jacobians[0];
+	btScalar* J_t2 = &jacobianData_t2.m_jacobians[0];
+
+	btScalar* u_n = &jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+	btScalar* u_t1 = &jacobianData_t1.m_deltaVelocitiesUnitImpulse[0];
+	btScalar* u_t2 = &jacobianData_t2.m_deltaVelocitiesUnitImpulse[0];
+
+	btMatrix3x3 rot(normal.getX(), normal.getY(), normal.getZ(),
+					t1.getX(), t1.getY(), t1.getZ(),
+					t2.getX(), t2.getY(), t2.getZ());  // world frame to local frame
+	const int ndof = link->m_multiBody->getNumDofs() + 6;
+	btMatrix3x3 local_impulse_matrix = (Diagonal(n.m_im) + OuterProduct(J_n, J_t1, J_t2, u_n, u_t1, u_t2, ndof)).inverse();
+	c.m_c0 = rot.transpose() * local_impulse_matrix * rot;
+	c.jacobianData_normal = jacobianData_normal;
+	c.jacobianData_t1 = jacobianData_t1;
+	c.jacobianData_t2 = jacobianData_t2;
+	c.t1 = t1;
+	c.t2 = t2;
+	const btVector3 ra = n.m_x - wtr.getOrigin();
+	c.m_c1 = ra;
+	c.m_local = link->getWorldTransform().inverse() * m_nodes[node].m_x;
+	c.m_node->m_battach = 1;
+	m_deformableAnchors.push_back(c);
+}
+//
+void btSoftBody::appendLinearJoint(const LJoint::Specs& specs, Cluster* body0, Body body1)
+{
+	LJoint* pj = new (btAlignedAlloc(sizeof(LJoint), 16)) LJoint();
+	pj->m_bodies[0] = body0;
+	pj->m_bodies[1] = body1;
+	pj->m_refs[0] = pj->m_bodies[0].xform().inverse() * specs.position;
+	pj->m_refs[1] = pj->m_bodies[1].xform().inverse() * specs.position;
+	pj->m_cfm = specs.cfm;
+	pj->m_erp = specs.erp;
+	pj->m_split = specs.split;
+	m_joints.push_back(pj);
+}
+
+//
+void btSoftBody::appendLinearJoint(const LJoint::Specs& specs, Body body)
+{
+	appendLinearJoint(specs, m_clusters[0], body);
+}
+
+//
+void btSoftBody::appendLinearJoint(const LJoint::Specs& specs, btSoftBody* body)
+{
+	appendLinearJoint(specs, m_clusters[0], body->m_clusters[0]);
+}
+
+//
+void btSoftBody::appendAngularJoint(const AJoint::Specs& specs, Cluster* body0, Body body1)
+{
+	AJoint* pj = new (btAlignedAlloc(sizeof(AJoint), 16)) AJoint();
+	pj->m_bodies[0] = body0;
+	pj->m_bodies[1] = body1;
+	pj->m_refs[0] = pj->m_bodies[0].xform().inverse().getBasis() * specs.axis;
+	pj->m_refs[1] = pj->m_bodies[1].xform().inverse().getBasis() * specs.axis;
+	pj->m_cfm = specs.cfm;
+	pj->m_erp = specs.erp;
+	pj->m_split = specs.split;
+	pj->m_icontrol = specs.icontrol;
+	m_joints.push_back(pj);
+}
+
+//
+void btSoftBody::appendAngularJoint(const AJoint::Specs& specs, Body body)
+{
+	appendAngularJoint(specs, m_clusters[0], body);
+}
+
+//
+void btSoftBody::appendAngularJoint(const AJoint::Specs& specs, btSoftBody* body)
+{
+	appendAngularJoint(specs, m_clusters[0], body->m_clusters[0]);
+}
+
+//
+void btSoftBody::addForce(const btVector3& force)
+{
+	for (int i = 0, ni = m_nodes.size(); i < ni; ++i) addForce(force, i);
+}
+
+//
+void btSoftBody::addForce(const btVector3& force, int node)
+{
+	Node& n = m_nodes[node];
+	if (n.m_im > 0)
+	{
+		n.m_f += force;
+	}
+}
+
+void btSoftBody::addAeroForceToNode(const btVector3& windVelocity, int nodeIndex)
+{
+	btAssert(nodeIndex >= 0 && nodeIndex < m_nodes.size());
+
+	const btScalar dt = m_sst.sdt;
+	const btScalar kLF = m_cfg.kLF;
+	const btScalar kDG = m_cfg.kDG;
+	//const btScalar kPR = m_cfg.kPR;
+	//const btScalar kVC = m_cfg.kVC;
+	const bool as_lift = kLF > 0;
+	const bool as_drag = kDG > 0;
+	const bool as_aero = as_lift || as_drag;
+	const bool as_vaero = as_aero && (m_cfg.aeromodel < btSoftBody::eAeroModel::F_TwoSided);
+
+	Node& n = m_nodes[nodeIndex];
+
+	if (n.m_im > 0)
+	{
+		btSoftBody::sMedium medium;
+
+		EvaluateMedium(m_worldInfo, n.m_x, medium);
+		medium.m_velocity = windVelocity;
+		medium.m_density = m_worldInfo->air_density;
+
+		/* Aerodynamics			*/
+		if (as_vaero)
+		{
+			const btVector3 rel_v = n.m_v - medium.m_velocity;
+			const btScalar rel_v_len = rel_v.length();
+			const btScalar rel_v2 = rel_v.length2();
+
+			if (rel_v2 > SIMD_EPSILON)
+			{
+				const btVector3 rel_v_nrm = rel_v.normalized();
+				btVector3 nrm = n.m_n;
+
+				if (m_cfg.aeromodel == btSoftBody::eAeroModel::V_TwoSidedLiftDrag)
+				{
+					nrm *= (btScalar)((btDot(nrm, rel_v) < 0) ? -1 : +1);
+					btVector3 fDrag(0, 0, 0);
+					btVector3 fLift(0, 0, 0);
+
+					btScalar n_dot_v = nrm.dot(rel_v_nrm);
+					btScalar tri_area = 0.5f * n.m_area;
+
+					fDrag = 0.5f * kDG * medium.m_density * rel_v2 * tri_area * n_dot_v * (-rel_v_nrm);
+
+					// Check angle of attack
+					// cos(10º) = 0.98480
+					if (0 < n_dot_v && n_dot_v < 0.98480f)
+						fLift = 0.5f * kLF * medium.m_density * rel_v_len * tri_area * btSqrt(1.0f - n_dot_v * n_dot_v) * (nrm.cross(rel_v_nrm).cross(rel_v_nrm));
+
+					// Check if the velocity change resulted by aero drag force exceeds the current velocity of the node.
+					btVector3 del_v_by_fDrag = fDrag * n.m_im * m_sst.sdt;
+					btScalar del_v_by_fDrag_len2 = del_v_by_fDrag.length2();
+					btScalar v_len2 = n.m_v.length2();
+
+					if (del_v_by_fDrag_len2 >= v_len2 && del_v_by_fDrag_len2 > 0)
+					{
+						btScalar del_v_by_fDrag_len = del_v_by_fDrag.length();
+						btScalar v_len = n.m_v.length();
+						fDrag *= btScalar(0.8) * (v_len / del_v_by_fDrag_len);
+					}
+
+					n.m_f += fDrag;
+					n.m_f += fLift;
+				}
+				else if (m_cfg.aeromodel == btSoftBody::eAeroModel::V_Point || m_cfg.aeromodel == btSoftBody::eAeroModel::V_OneSided || m_cfg.aeromodel == btSoftBody::eAeroModel::V_TwoSided)
+				{
+					if (m_cfg.aeromodel == btSoftBody::eAeroModel::V_TwoSided)
+						nrm *= (btScalar)((btDot(nrm, rel_v) < 0) ? -1 : +1);
+
+					const btScalar dvn = btDot(rel_v, nrm);
+					/* Compute forces	*/
+					if (dvn > 0)
+					{
+						btVector3 force(0, 0, 0);
+						const btScalar c0 = n.m_area * dvn * rel_v2 / 2;
+						const btScalar c1 = c0 * medium.m_density;
+						force += nrm * (-c1 * kLF);
+						force += rel_v.normalized() * (-c1 * kDG);
+						ApplyClampedForce(n, force, dt);
+					}
+				}
+			}
+		}
+	}
+}
+
+void btSoftBody::addAeroForceToFace(const btVector3& windVelocity, int faceIndex)
+{
+	const btScalar dt = m_sst.sdt;
+	const btScalar kLF = m_cfg.kLF;
+	const btScalar kDG = m_cfg.kDG;
+	//	const btScalar kPR = m_cfg.kPR;
+	//	const btScalar kVC = m_cfg.kVC;
+	const bool as_lift = kLF > 0;
+	const bool as_drag = kDG > 0;
+	const bool as_aero = as_lift || as_drag;
+	const bool as_faero = as_aero && (m_cfg.aeromodel >= btSoftBody::eAeroModel::F_TwoSided);
+
+	if (as_faero)
+	{
+		btSoftBody::Face& f = m_faces[faceIndex];
+
+		btSoftBody::sMedium medium;
+
+		const btVector3 v = (f.m_n[0]->m_v + f.m_n[1]->m_v + f.m_n[2]->m_v) / 3;
+		const btVector3 x = (f.m_n[0]->m_x + f.m_n[1]->m_x + f.m_n[2]->m_x) / 3;
+		EvaluateMedium(m_worldInfo, x, medium);
+		medium.m_velocity = windVelocity;
+		medium.m_density = m_worldInfo->air_density;
+		const btVector3 rel_v = v - medium.m_velocity;
+		const btScalar rel_v_len = rel_v.length();
+		const btScalar rel_v2 = rel_v.length2();
+
+		if (rel_v2 > SIMD_EPSILON)
+		{
+			const btVector3 rel_v_nrm = rel_v.normalized();
+			btVector3 nrm = f.m_normal;
+
+			if (m_cfg.aeromodel == btSoftBody::eAeroModel::F_TwoSidedLiftDrag)
+			{
+				nrm *= (btScalar)((btDot(nrm, rel_v) < 0) ? -1 : +1);
+
+				btVector3 fDrag(0, 0, 0);
+				btVector3 fLift(0, 0, 0);
+
+				btScalar n_dot_v = nrm.dot(rel_v_nrm);
+				btScalar tri_area = 0.5f * f.m_ra;
+
+				fDrag = 0.5f * kDG * medium.m_density * rel_v2 * tri_area * n_dot_v * (-rel_v_nrm);
+
+				// Check angle of attack
+				// cos(10º) = 0.98480
+				if (0 < n_dot_v && n_dot_v < 0.98480f)
+					fLift = 0.5f * kLF * medium.m_density * rel_v_len * tri_area * btSqrt(1.0f - n_dot_v * n_dot_v) * (nrm.cross(rel_v_nrm).cross(rel_v_nrm));
+
+				fDrag /= 3;
+				fLift /= 3;
+
+				for (int j = 0; j < 3; ++j)
+				{
+					if (f.m_n[j]->m_im > 0)
+					{
+						// Check if the velocity change resulted by aero drag force exceeds the current velocity of the node.
+						btVector3 del_v_by_fDrag = fDrag * f.m_n[j]->m_im * m_sst.sdt;
+						btScalar del_v_by_fDrag_len2 = del_v_by_fDrag.length2();
+						btScalar v_len2 = f.m_n[j]->m_v.length2();
+
+						if (del_v_by_fDrag_len2 >= v_len2 && del_v_by_fDrag_len2 > 0)
+						{
+							btScalar del_v_by_fDrag_len = del_v_by_fDrag.length();
+							btScalar v_len = f.m_n[j]->m_v.length();
+							fDrag *= btScalar(0.8) * (v_len / del_v_by_fDrag_len);
+						}
+
+						f.m_n[j]->m_f += fDrag;
+						f.m_n[j]->m_f += fLift;
+					}
+				}
+			}
+			else if (m_cfg.aeromodel == btSoftBody::eAeroModel::F_OneSided || m_cfg.aeromodel == btSoftBody::eAeroModel::F_TwoSided)
+			{
+				if (m_cfg.aeromodel == btSoftBody::eAeroModel::F_TwoSided)
+					nrm *= (btScalar)((btDot(nrm, rel_v) < 0) ? -1 : +1);
+
+				const btScalar dvn = btDot(rel_v, nrm);
+				/* Compute forces	*/
+				if (dvn > 0)
+				{
+					btVector3 force(0, 0, 0);
+					const btScalar c0 = f.m_ra * dvn * rel_v2;
+					const btScalar c1 = c0 * medium.m_density;
+					force += nrm * (-c1 * kLF);
+					force += rel_v.normalized() * (-c1 * kDG);
+					force /= 3;
+					for (int j = 0; j < 3; ++j) ApplyClampedForce(*f.m_n[j], force, dt);
+				}
+			}
+		}
+	}
+}
+
+//
+void btSoftBody::addVelocity(const btVector3& velocity)
+{
+	for (int i = 0, ni = m_nodes.size(); i < ni; ++i) addVelocity(velocity, i);
+}
+
+/* Set velocity for the entire body										*/
+void btSoftBody::setVelocity(const btVector3& velocity)
+{
+	for (int i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		Node& n = m_nodes[i];
+		if (n.m_im > 0)
+		{
+			n.m_v = velocity;
+			n.m_vn = velocity;
+		}
+	}
+}
+
+//
+void btSoftBody::addVelocity(const btVector3& velocity, int node)
+{
+	Node& n = m_nodes[node];
+	if (n.m_im > 0)
+	{
+		n.m_v += velocity;
+	}
+}
+
+//
+void btSoftBody::setMass(int node, btScalar mass)
+{
+	m_nodes[node].m_im = mass > 0 ? 1 / mass : 0;
+	m_bUpdateRtCst = true;
+}
+
+//
+btScalar btSoftBody::getMass(int node) const
+{
+	return (m_nodes[node].m_im > 0 ? 1 / m_nodes[node].m_im : 0);
+}
+
+//
+btScalar btSoftBody::getTotalMass() const
+{
+	btScalar mass = 0;
+	for (int i = 0; i < m_nodes.size(); ++i)
+	{
+		mass += getMass(i);
+	}
+	return (mass);
+}
+
+//
+void btSoftBody::setTotalMass(btScalar mass, bool fromfaces)
+{
+	int i;
+
+	if (fromfaces)
+	{
+		for (i = 0; i < m_nodes.size(); ++i)
+		{
+			m_nodes[i].m_im = 0;
+		}
+		for (i = 0; i < m_faces.size(); ++i)
+		{
+			const Face& f = m_faces[i];
+			const btScalar twicearea = AreaOf(f.m_n[0]->m_x,
+											  f.m_n[1]->m_x,
+											  f.m_n[2]->m_x);
+			for (int j = 0; j < 3; ++j)
+			{
+				f.m_n[j]->m_im += twicearea;
+			}
+		}
+		for (i = 0; i < m_nodes.size(); ++i)
+		{
+			m_nodes[i].m_im = 1 / m_nodes[i].m_im;
+		}
+	}
+	const btScalar tm = getTotalMass();
+	const btScalar itm = 1 / tm;
+	for (i = 0; i < m_nodes.size(); ++i)
+	{
+		m_nodes[i].m_im /= itm * mass;
+	}
+	m_bUpdateRtCst = true;
+}
+
+//
+void btSoftBody::setTotalDensity(btScalar density)
+{
+	setTotalMass(getVolume() * density, true);
+}
+
+//
+void btSoftBody::setVolumeMass(btScalar mass)
+{
+	btAlignedObjectArray<btScalar> ranks;
+	ranks.resize(m_nodes.size(), 0);
+	int i;
+
+	for (i = 0; i < m_nodes.size(); ++i)
+	{
+		m_nodes[i].m_im = 0;
+	}
+	for (i = 0; i < m_tetras.size(); ++i)
+	{
+		const Tetra& t = m_tetras[i];
+		for (int j = 0; j < 4; ++j)
+		{
+			t.m_n[j]->m_im += btFabs(t.m_rv);
+			ranks[int(t.m_n[j] - &m_nodes[0])] += 1;
+		}
+	}
+	for (i = 0; i < m_nodes.size(); ++i)
+	{
+		if (m_nodes[i].m_im > 0)
+		{
+			m_nodes[i].m_im = ranks[i] / m_nodes[i].m_im;
+		}
+	}
+	setTotalMass(mass, false);
+}
+
+//
+void btSoftBody::setVolumeDensity(btScalar density)
+{
+	btScalar volume = 0;
+	for (int i = 0; i < m_tetras.size(); ++i)
+	{
+		const Tetra& t = m_tetras[i];
+		for (int j = 0; j < 4; ++j)
+		{
+			volume += btFabs(t.m_rv);
+		}
+	}
+	setVolumeMass(volume * density / 6);
+}
+
+//
+btVector3 btSoftBody::getLinearVelocity()
+{
+	btVector3 total_momentum = btVector3(0, 0, 0);
+	for (int i = 0; i < m_nodes.size(); ++i)
+	{
+		btScalar mass = m_nodes[i].m_im == 0 ? 0 : 1.0 / m_nodes[i].m_im;
+		total_momentum += mass * m_nodes[i].m_v;
+	}
+	btScalar total_mass = getTotalMass();
+	return total_mass == 0 ? total_momentum : total_momentum / total_mass;
+}
+
+//
+void btSoftBody::setLinearVelocity(const btVector3& linVel)
+{
+	btVector3 old_vel = getLinearVelocity();
+	btVector3 diff = linVel - old_vel;
+	for (int i = 0; i < m_nodes.size(); ++i)
+		m_nodes[i].m_v += diff;
+}
+
+//
+void btSoftBody::setAngularVelocity(const btVector3& angVel)
+{
+	btVector3 old_vel = getLinearVelocity();
+	btVector3 com = getCenterOfMass();
+	for (int i = 0; i < m_nodes.size(); ++i)
+	{
+		m_nodes[i].m_v = angVel.cross(m_nodes[i].m_x - com) + old_vel;
+	}
+}
+
+//
+btTransform btSoftBody::getRigidTransform()
+{
+	btVector3 t = getCenterOfMass();
+	btMatrix3x3 S;
+	S.setZero();
+	// Get rotation that minimizes L2 difference: \sum_i || RX_i + t - x_i ||
+	// It's important to make sure that S has the correct signs.
+	// SVD is only unique up to the ordering of singular values.
+	// SVD will manipulate U and V to ensure the ordering of singular values. If all three singular
+	// vaues are negative, SVD will permute colums of U to make two of them positive.
+	for (int i = 0; i < m_nodes.size(); ++i)
+	{
+		S -= OuterProduct(m_X[i], t - m_nodes[i].m_x);
+	}
+	btVector3 sigma;
+	btMatrix3x3 U, V;
+	singularValueDecomposition(S, U, sigma, V);
+	btMatrix3x3 R = V * U.transpose();
+	btTransform trs;
+	trs.setIdentity();
+	trs.setOrigin(t);
+	trs.setBasis(R);
+	return trs;
+}
+
+//
+void btSoftBody::transformTo(const btTransform& trs)
+{
+	// get the current best rigid fit
+	btTransform current_transform = getRigidTransform();
+	// apply transform in material space
+	btTransform new_transform = trs * current_transform.inverse();
+	transform(new_transform);
+}
+
+//
+void btSoftBody::transform(const btTransform& trs)
+{
+	const btScalar margin = getCollisionShape()->getMargin();
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)
+	vol;
+
+	for (int i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		Node& n = m_nodes[i];
+		n.m_x = trs * n.m_x;
+		n.m_q = trs * n.m_q;
+		n.m_n = trs.getBasis() * n.m_n;
+		vol = btDbvtVolume::FromCR(n.m_x, margin);
+
+		m_ndbvt.update(n.m_leaf, vol);
+	}
+	updateNormals();
+	updateBounds();
+	updateConstants();
+}
+
+//
+void btSoftBody::translate(const btVector3& trs)
+{
+	btTransform t;
+	t.setIdentity();
+	t.setOrigin(trs);
+	transform(t);
+}
+
+//
+void btSoftBody::rotate(const btQuaternion& rot)
+{
+	btTransform t;
+	t.setIdentity();
+	t.setRotation(rot);
+	transform(t);
+}
+
+//
+void btSoftBody::scale(const btVector3& scl)
+{
+	const btScalar margin = getCollisionShape()->getMargin();
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)
+	vol;
+
+	for (int i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		Node& n = m_nodes[i];
+		n.m_x *= scl;
+		n.m_q *= scl;
+		vol = btDbvtVolume::FromCR(n.m_x, margin);
+		m_ndbvt.update(n.m_leaf, vol);
+	}
+	updateNormals();
+	updateBounds();
+	updateConstants();
+	initializeDmInverse();
+}
+
+//
+btScalar btSoftBody::getRestLengthScale()
+{
+	return m_restLengthScale;
+}
+
+//
+void btSoftBody::setRestLengthScale(btScalar restLengthScale)
+{
+	for (int i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		Link& l = m_links[i];
+		l.m_rl = l.m_rl / m_restLengthScale * restLengthScale;
+		l.m_c1 = l.m_rl * l.m_rl;
+	}
+	m_restLengthScale = restLengthScale;
+
+	if (getActivationState() == ISLAND_SLEEPING)
+		activate();
+}
+
+//
+void btSoftBody::setPose(bool bvolume, bool bframe)
+{
+	m_pose.m_bvolume = bvolume;
+	m_pose.m_bframe = bframe;
+	int i, ni;
+
+	/* Weights		*/
+	const btScalar omass = getTotalMass();
+	const btScalar kmass = omass * m_nodes.size() * 1000;
+	btScalar tmass = omass;
+	m_pose.m_wgh.resize(m_nodes.size());
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		if (m_nodes[i].m_im <= 0) tmass += kmass;
+	}
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		Node& n = m_nodes[i];
+		m_pose.m_wgh[i] = n.m_im > 0 ? 1 / (m_nodes[i].m_im * tmass) : kmass / tmass;
+	}
+	/* Pos		*/
+	const btVector3 com = evaluateCom();
+	m_pose.m_pos.resize(m_nodes.size());
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		m_pose.m_pos[i] = m_nodes[i].m_x - com;
+	}
+	m_pose.m_volume = bvolume ? getVolume() : 0;
+	m_pose.m_com = com;
+	m_pose.m_rot.setIdentity();
+	m_pose.m_scl.setIdentity();
+	/* Aqq		*/
+	m_pose.m_aqq[0] =
+		m_pose.m_aqq[1] =
+			m_pose.m_aqq[2] = btVector3(0, 0, 0);
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		const btVector3& q = m_pose.m_pos[i];
+		const btVector3 mq = m_pose.m_wgh[i] * q;
+		m_pose.m_aqq[0] += mq.x() * q;
+		m_pose.m_aqq[1] += mq.y() * q;
+		m_pose.m_aqq[2] += mq.z() * q;
+	}
+	m_pose.m_aqq = m_pose.m_aqq.inverse();
+
+	updateConstants();
+}
+
+void btSoftBody::resetLinkRestLengths()
+{
+	for (int i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		Link& l = m_links[i];
+		l.m_rl = (l.m_n[0]->m_x - l.m_n[1]->m_x).length();
+		l.m_c1 = l.m_rl * l.m_rl;
+	}
+}
+
+//
+btScalar btSoftBody::getVolume() const
+{
+	btScalar vol = 0;
+	if (m_nodes.size() > 0)
+	{
+		int i, ni;
+
+		const btVector3 org = m_nodes[0].m_x;
+		for (i = 0, ni = m_faces.size(); i < ni; ++i)
+		{
+			const Face& f = m_faces[i];
+			vol += btDot(f.m_n[0]->m_x - org, btCross(f.m_n[1]->m_x - org, f.m_n[2]->m_x - org));
+		}
+		vol /= (btScalar)6;
+	}
+	return (vol);
+}
+
+//
+int btSoftBody::clusterCount() const
+{
+	return (m_clusters.size());
+}
+
+//
+btVector3 btSoftBody::clusterCom(const Cluster* cluster)
+{
+	btVector3 com(0, 0, 0);
+	for (int i = 0, ni = cluster->m_nodes.size(); i < ni; ++i)
+	{
+		com += cluster->m_nodes[i]->m_x * cluster->m_masses[i];
+	}
+	return (com * cluster->m_imass);
+}
+
+//
+btVector3 btSoftBody::clusterCom(int cluster) const
+{
+	return (clusterCom(m_clusters[cluster]));
+}
+
+//
+btVector3 btSoftBody::clusterVelocity(const Cluster* cluster, const btVector3& rpos)
+{
+	return (cluster->m_lv + btCross(cluster->m_av, rpos));
+}
+
+//
+void btSoftBody::clusterVImpulse(Cluster* cluster, const btVector3& rpos, const btVector3& impulse)
+{
+	const btVector3 li = cluster->m_imass * impulse;
+	const btVector3 ai = cluster->m_invwi * btCross(rpos, impulse);
+	cluster->m_vimpulses[0] += li;
+	cluster->m_lv += li;
+	cluster->m_vimpulses[1] += ai;
+	cluster->m_av += ai;
+	cluster->m_nvimpulses++;
+}
+
+//
+void btSoftBody::clusterDImpulse(Cluster* cluster, const btVector3& rpos, const btVector3& impulse)
+{
+	const btVector3 li = cluster->m_imass * impulse;
+	const btVector3 ai = cluster->m_invwi * btCross(rpos, impulse);
+	cluster->m_dimpulses[0] += li;
+	cluster->m_dimpulses[1] += ai;
+	cluster->m_ndimpulses++;
+}
+
+//
+void btSoftBody::clusterImpulse(Cluster* cluster, const btVector3& rpos, const Impulse& impulse)
+{
+	if (impulse.m_asVelocity) clusterVImpulse(cluster, rpos, impulse.m_velocity);
+	if (impulse.m_asDrift) clusterDImpulse(cluster, rpos, impulse.m_drift);
+}
+
+//
+void btSoftBody::clusterVAImpulse(Cluster* cluster, const btVector3& impulse)
+{
+	const btVector3 ai = cluster->m_invwi * impulse;
+	cluster->m_vimpulses[1] += ai;
+	cluster->m_av += ai;
+	cluster->m_nvimpulses++;
+}
+
+//
+void btSoftBody::clusterDAImpulse(Cluster* cluster, const btVector3& impulse)
+{
+	const btVector3 ai = cluster->m_invwi * impulse;
+	cluster->m_dimpulses[1] += ai;
+	cluster->m_ndimpulses++;
+}
+
+//
+void btSoftBody::clusterAImpulse(Cluster* cluster, const Impulse& impulse)
+{
+	if (impulse.m_asVelocity) clusterVAImpulse(cluster, impulse.m_velocity);
+	if (impulse.m_asDrift) clusterDAImpulse(cluster, impulse.m_drift);
+}
+
+//
+void btSoftBody::clusterDCImpulse(Cluster* cluster, const btVector3& impulse)
+{
+	cluster->m_dimpulses[0] += impulse * cluster->m_imass;
+	cluster->m_ndimpulses++;
+}
+
+struct NodeLinks
+{
+	btAlignedObjectArray<int> m_links;
+};
+
+//
+int btSoftBody::generateBendingConstraints(int distance, Material* mat)
+{
+	int i, j;
+
+	if (distance > 1)
+	{
+		/* Build graph	*/
+		const int n = m_nodes.size();
+		const unsigned inf = (~(unsigned)0) >> 1;
+		unsigned* adj = new unsigned[n * n];
+
+#define IDX(_x_, _y_) ((_y_)*n + (_x_))
+		for (j = 0; j < n; ++j)
+		{
+			for (i = 0; i < n; ++i)
+			{
+				if (i != j)
+				{
+					adj[IDX(i, j)] = adj[IDX(j, i)] = inf;
+				}
+				else
+				{
+					adj[IDX(i, j)] = adj[IDX(j, i)] = 0;
+				}
+			}
+		}
+		for (i = 0; i < m_links.size(); ++i)
+		{
+			const int ia = (int)(m_links[i].m_n[0] - &m_nodes[0]);
+			const int ib = (int)(m_links[i].m_n[1] - &m_nodes[0]);
+			adj[IDX(ia, ib)] = 1;
+			adj[IDX(ib, ia)] = 1;
+		}
+
+		//special optimized case for distance == 2
+		if (distance == 2)
+		{
+			btAlignedObjectArray<NodeLinks> nodeLinks;
+
+			/* Build node links */
+			nodeLinks.resize(m_nodes.size());
+
+			for (i = 0; i < m_links.size(); ++i)
+			{
+				const int ia = (int)(m_links[i].m_n[0] - &m_nodes[0]);
+				const int ib = (int)(m_links[i].m_n[1] - &m_nodes[0]);
+				if (nodeLinks[ia].m_links.findLinearSearch(ib) == nodeLinks[ia].m_links.size())
+					nodeLinks[ia].m_links.push_back(ib);
+
+				if (nodeLinks[ib].m_links.findLinearSearch(ia) == nodeLinks[ib].m_links.size())
+					nodeLinks[ib].m_links.push_back(ia);
+			}
+			for (int ii = 0; ii < nodeLinks.size(); ii++)
+			{
+				int i = ii;
+
+				for (int jj = 0; jj < nodeLinks[ii].m_links.size(); jj++)
+				{
+					int k = nodeLinks[ii].m_links[jj];
+					for (int kk = 0; kk < nodeLinks[k].m_links.size(); kk++)
+					{
+						int j = nodeLinks[k].m_links[kk];
+						if (i != j)
+						{
+							const unsigned sum = adj[IDX(i, k)] + adj[IDX(k, j)];
+							btAssert(sum == 2);
+							if (adj[IDX(i, j)] > sum)
+							{
+								adj[IDX(i, j)] = adj[IDX(j, i)] = sum;
+							}
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			///generic Floyd's algorithm
+			for (int k = 0; k < n; ++k)
+			{
+				for (j = 0; j < n; ++j)
+				{
+					for (i = j + 1; i < n; ++i)
+					{
+						const unsigned sum = adj[IDX(i, k)] + adj[IDX(k, j)];
+						if (adj[IDX(i, j)] > sum)
+						{
+							adj[IDX(i, j)] = adj[IDX(j, i)] = sum;
+						}
+					}
+				}
+			}
+		}
+
+		/* Build links	*/
+		int nlinks = 0;
+		for (j = 0; j < n; ++j)
+		{
+			for (i = j + 1; i < n; ++i)
+			{
+				if (adj[IDX(i, j)] == (unsigned)distance)
+				{
+					appendLink(i, j, mat);
+					m_links[m_links.size() - 1].m_bbending = 1;
+					++nlinks;
+				}
+			}
+		}
+		delete[] adj;
+		return (nlinks);
+	}
+	return (0);
+}
+
+//
+void btSoftBody::randomizeConstraints()
+{
+	unsigned long seed = 243703;
+#define NEXTRAND (seed = (1664525L * seed + 1013904223L) & 0xffffffff)
+	int i, ni;
+
+	for (i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		btSwap(m_links[i], m_links[NEXTRAND % ni]);
+	}
+	for (i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		btSwap(m_faces[i], m_faces[NEXTRAND % ni]);
+	}
+#undef NEXTRAND
+}
+
+void btSoftBody::updateState(const btAlignedObjectArray<btVector3>& q, const btAlignedObjectArray<btVector3>& v)
+{
+	int node_count = m_nodes.size();
+	btAssert(node_count == q.size());
+	btAssert(node_count == v.size());
+	for (int i = 0; i < node_count; i++)
+	{
+		Node& n = m_nodes[i];
+		n.m_x = q[i];
+		n.m_q = q[i];
+		n.m_v = v[i];
+		n.m_vn = v[i];
+	}
+}
+
+//
+void btSoftBody::releaseCluster(int index)
+{
+	Cluster* c = m_clusters[index];
+	if (c->m_leaf) m_cdbvt.remove(c->m_leaf);
+	c->~Cluster();
+	btAlignedFree(c);
+	m_clusters.remove(c);
+}
+
+//
+void btSoftBody::releaseClusters()
+{
+	while (m_clusters.size() > 0) releaseCluster(0);
+}
+
+//
+int btSoftBody::generateClusters(int k, int maxiterations)
+{
+	int i;
+	releaseClusters();
+	m_clusters.resize(btMin(k, m_nodes.size()));
+	for (i = 0; i < m_clusters.size(); ++i)
+	{
+		m_clusters[i] = new (btAlignedAlloc(sizeof(Cluster), 16)) Cluster();
+		m_clusters[i]->m_collide = true;
+	}
+	k = m_clusters.size();
+	if (k > 0)
+	{
+		/* Initialize		*/
+		btAlignedObjectArray<btVector3> centers;
+		btVector3 cog(0, 0, 0);
+		int i;
+		for (i = 0; i < m_nodes.size(); ++i)
+		{
+			cog += m_nodes[i].m_x;
+			m_clusters[(i * 29873) % m_clusters.size()]->m_nodes.push_back(&m_nodes[i]);
+		}
+		cog /= (btScalar)m_nodes.size();
+		centers.resize(k, cog);
+		/* Iterate			*/
+		const btScalar slope = 16;
+		bool changed;
+		int iterations = 0;
+		do
+		{
+			const btScalar w = 2 - btMin<btScalar>(1, iterations / slope);
+			changed = false;
+			iterations++;
+			int i;
+
+			for (i = 0; i < k; ++i)
+			{
+				btVector3 c(0, 0, 0);
+				for (int j = 0; j < m_clusters[i]->m_nodes.size(); ++j)
+				{
+					c += m_clusters[i]->m_nodes[j]->m_x;
+				}
+				if (m_clusters[i]->m_nodes.size())
+				{
+					c /= (btScalar)m_clusters[i]->m_nodes.size();
+					c = centers[i] + (c - centers[i]) * w;
+					changed |= ((c - centers[i]).length2() > SIMD_EPSILON);
+					centers[i] = c;
+					m_clusters[i]->m_nodes.resize(0);
+				}
+			}
+			for (i = 0; i < m_nodes.size(); ++i)
+			{
+				const btVector3 nx = m_nodes[i].m_x;
+				int kbest = 0;
+				btScalar kdist = ClusterMetric(centers[0], nx);
+				for (int j = 1; j < k; ++j)
+				{
+					const btScalar d = ClusterMetric(centers[j], nx);
+					if (d < kdist)
+					{
+						kbest = j;
+						kdist = d;
+					}
+				}
+				m_clusters[kbest]->m_nodes.push_back(&m_nodes[i]);
+			}
+		} while (changed && (iterations < maxiterations));
+		/* Merge		*/
+		btAlignedObjectArray<int> cids;
+		cids.resize(m_nodes.size(), -1);
+		for (i = 0; i < m_clusters.size(); ++i)
+		{
+			for (int j = 0; j < m_clusters[i]->m_nodes.size(); ++j)
+			{
+				cids[int(m_clusters[i]->m_nodes[j] - &m_nodes[0])] = i;
+			}
+		}
+		for (i = 0; i < m_faces.size(); ++i)
+		{
+			const int idx[] = {int(m_faces[i].m_n[0] - &m_nodes[0]),
+							   int(m_faces[i].m_n[1] - &m_nodes[0]),
+							   int(m_faces[i].m_n[2] - &m_nodes[0])};
+			for (int j = 0; j < 3; ++j)
+			{
+				const int cid = cids[idx[j]];
+				for (int q = 1; q < 3; ++q)
+				{
+					const int kid = idx[(j + q) % 3];
+					if (cids[kid] != cid)
+					{
+						if (m_clusters[cid]->m_nodes.findLinearSearch(&m_nodes[kid]) == m_clusters[cid]->m_nodes.size())
+						{
+							m_clusters[cid]->m_nodes.push_back(&m_nodes[kid]);
+						}
+					}
+				}
+			}
+		}
+		/* Master		*/
+		if (m_clusters.size() > 1)
+		{
+			Cluster* pmaster = new (btAlignedAlloc(sizeof(Cluster), 16)) Cluster();
+			pmaster->m_collide = false;
+			pmaster->m_nodes.reserve(m_nodes.size());
+			for (int i = 0; i < m_nodes.size(); ++i) pmaster->m_nodes.push_back(&m_nodes[i]);
+			m_clusters.push_back(pmaster);
+			btSwap(m_clusters[0], m_clusters[m_clusters.size() - 1]);
+		}
+		/* Terminate	*/
+		for (i = 0; i < m_clusters.size(); ++i)
+		{
+			if (m_clusters[i]->m_nodes.size() == 0)
+			{
+				releaseCluster(i--);
+			}
+		}
+	}
+	else
+	{
+		//create a cluster for each tetrahedron (if tetrahedra exist) or each face
+		if (m_tetras.size())
+		{
+			m_clusters.resize(m_tetras.size());
+			for (i = 0; i < m_clusters.size(); ++i)
+			{
+				m_clusters[i] = new (btAlignedAlloc(sizeof(Cluster), 16)) Cluster();
+				m_clusters[i]->m_collide = true;
+			}
+			for (i = 0; i < m_tetras.size(); i++)
+			{
+				for (int j = 0; j < 4; j++)
+				{
+					m_clusters[i]->m_nodes.push_back(m_tetras[i].m_n[j]);
+				}
+			}
+		}
+		else
+		{
+			m_clusters.resize(m_faces.size());
+			for (i = 0; i < m_clusters.size(); ++i)
+			{
+				m_clusters[i] = new (btAlignedAlloc(sizeof(Cluster), 16)) Cluster();
+				m_clusters[i]->m_collide = true;
+			}
+
+			for (i = 0; i < m_faces.size(); ++i)
+			{
+				for (int j = 0; j < 3; ++j)
+				{
+					m_clusters[i]->m_nodes.push_back(m_faces[i].m_n[j]);
+				}
+			}
+		}
+	}
+
+	if (m_clusters.size())
+	{
+		initializeClusters();
+		updateClusters();
+
+		//for self-collision
+		m_clusterConnectivity.resize(m_clusters.size() * m_clusters.size());
+		{
+			for (int c0 = 0; c0 < m_clusters.size(); c0++)
+			{
+				m_clusters[c0]->m_clusterIndex = c0;
+				for (int c1 = 0; c1 < m_clusters.size(); c1++)
+				{
+					bool connected = false;
+					Cluster* cla = m_clusters[c0];
+					Cluster* clb = m_clusters[c1];
+					for (int i = 0; !connected && i < cla->m_nodes.size(); i++)
+					{
+						for (int j = 0; j < clb->m_nodes.size(); j++)
+						{
+							if (cla->m_nodes[i] == clb->m_nodes[j])
+							{
+								connected = true;
+								break;
+							}
+						}
+					}
+					m_clusterConnectivity[c0 + c1 * m_clusters.size()] = connected;
+				}
+			}
+		}
+	}
+
+	return (m_clusters.size());
+}
+
+//
+void btSoftBody::refine(ImplicitFn* ifn, btScalar accurary, bool cut)
+{
+	const Node* nbase = &m_nodes[0];
+	int ncount = m_nodes.size();
+	btSymMatrix<int> edges(ncount, -2);
+	int newnodes = 0;
+	int i, j, k, ni;
+
+	/* Filter out		*/
+	for (i = 0; i < m_links.size(); ++i)
+	{
+		Link& l = m_links[i];
+		if (l.m_bbending)
+		{
+			if (!SameSign(ifn->Eval(l.m_n[0]->m_x), ifn->Eval(l.m_n[1]->m_x)))
+			{
+				btSwap(m_links[i], m_links[m_links.size() - 1]);
+				m_links.pop_back();
+				--i;
+			}
+		}
+	}
+	/* Fill edges		*/
+	for (i = 0; i < m_links.size(); ++i)
+	{
+		Link& l = m_links[i];
+		edges(int(l.m_n[0] - nbase), int(l.m_n[1] - nbase)) = -1;
+	}
+	for (i = 0; i < m_faces.size(); ++i)
+	{
+		Face& f = m_faces[i];
+		edges(int(f.m_n[0] - nbase), int(f.m_n[1] - nbase)) = -1;
+		edges(int(f.m_n[1] - nbase), int(f.m_n[2] - nbase)) = -1;
+		edges(int(f.m_n[2] - nbase), int(f.m_n[0] - nbase)) = -1;
+	}
+	/* Intersect		*/
+	for (i = 0; i < ncount; ++i)
+	{
+		for (j = i + 1; j < ncount; ++j)
+		{
+			if (edges(i, j) == -1)
+			{
+				Node& a = m_nodes[i];
+				Node& b = m_nodes[j];
+				const btScalar t = ImplicitSolve(ifn, a.m_x, b.m_x, accurary);
+				if (t > 0)
+				{
+					const btVector3 x = Lerp(a.m_x, b.m_x, t);
+					const btVector3 v = Lerp(a.m_v, b.m_v, t);
+					btScalar m = 0;
+					if (a.m_im > 0)
+					{
+						if (b.m_im > 0)
+						{
+							const btScalar ma = 1 / a.m_im;
+							const btScalar mb = 1 / b.m_im;
+							const btScalar mc = Lerp(ma, mb, t);
+							const btScalar f = (ma + mb) / (ma + mb + mc);
+							a.m_im = 1 / (ma * f);
+							b.m_im = 1 / (mb * f);
+							m = mc * f;
+						}
+						else
+						{
+							a.m_im /= 0.5f;
+							m = 1 / a.m_im;
+						}
+					}
+					else
+					{
+						if (b.m_im > 0)
+						{
+							b.m_im /= 0.5f;
+							m = 1 / b.m_im;
+						}
+						else
+							m = 0;
+					}
+					appendNode(x, m);
+					edges(i, j) = m_nodes.size() - 1;
+					m_nodes[edges(i, j)].m_v = v;
+					++newnodes;
+				}
+			}
+		}
+	}
+	nbase = &m_nodes[0];
+	/* Refine links		*/
+	for (i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		Link& feat = m_links[i];
+		const int idx[] = {int(feat.m_n[0] - nbase),
+						   int(feat.m_n[1] - nbase)};
+		if ((idx[0] < ncount) && (idx[1] < ncount))
+		{
+			const int ni = edges(idx[0], idx[1]);
+			if (ni > 0)
+			{
+				appendLink(i);
+				Link* pft[] = {&m_links[i],
+							   &m_links[m_links.size() - 1]};
+				pft[0]->m_n[0] = &m_nodes[idx[0]];
+				pft[0]->m_n[1] = &m_nodes[ni];
+				pft[1]->m_n[0] = &m_nodes[ni];
+				pft[1]->m_n[1] = &m_nodes[idx[1]];
+			}
+		}
+	}
+	/* Refine faces		*/
+	for (i = 0; i < m_faces.size(); ++i)
+	{
+		const Face& feat = m_faces[i];
+		const int idx[] = {int(feat.m_n[0] - nbase),
+						   int(feat.m_n[1] - nbase),
+						   int(feat.m_n[2] - nbase)};
+		for (j = 2, k = 0; k < 3; j = k++)
+		{
+			if ((idx[j] < ncount) && (idx[k] < ncount))
+			{
+				const int ni = edges(idx[j], idx[k]);
+				if (ni > 0)
+				{
+					appendFace(i);
+					const int l = (k + 1) % 3;
+					Face* pft[] = {&m_faces[i],
+								   &m_faces[m_faces.size() - 1]};
+					pft[0]->m_n[0] = &m_nodes[idx[l]];
+					pft[0]->m_n[1] = &m_nodes[idx[j]];
+					pft[0]->m_n[2] = &m_nodes[ni];
+					pft[1]->m_n[0] = &m_nodes[ni];
+					pft[1]->m_n[1] = &m_nodes[idx[k]];
+					pft[1]->m_n[2] = &m_nodes[idx[l]];
+					appendLink(ni, idx[l], pft[0]->m_material);
+					--i;
+					break;
+				}
+			}
+		}
+	}
+	/* Cut				*/
+	if (cut)
+	{
+		btAlignedObjectArray<int> cnodes;
+		const int pcount = ncount;
+		int i;
+		ncount = m_nodes.size();
+		cnodes.resize(ncount, 0);
+		/* Nodes		*/
+		for (i = 0; i < ncount; ++i)
+		{
+			const btVector3 x = m_nodes[i].m_x;
+			if ((i >= pcount) || (btFabs(ifn->Eval(x)) < accurary))
+			{
+				const btVector3 v = m_nodes[i].m_v;
+				btScalar m = getMass(i);
+				if (m > 0)
+				{
+					m *= 0.5f;
+					m_nodes[i].m_im /= 0.5f;
+				}
+				appendNode(x, m);
+				cnodes[i] = m_nodes.size() - 1;
+				m_nodes[cnodes[i]].m_v = v;
+			}
+		}
+		nbase = &m_nodes[0];
+		/* Links		*/
+		for (i = 0, ni = m_links.size(); i < ni; ++i)
+		{
+			const int id[] = {int(m_links[i].m_n[0] - nbase),
+							  int(m_links[i].m_n[1] - nbase)};
+			int todetach = 0;
+			if (cnodes[id[0]] && cnodes[id[1]])
+			{
+				appendLink(i);
+				todetach = m_links.size() - 1;
+			}
+			else
+			{
+				if (((ifn->Eval(m_nodes[id[0]].m_x) < accurary) &&
+					 (ifn->Eval(m_nodes[id[1]].m_x) < accurary)))
+					todetach = i;
+			}
+			if (todetach)
+			{
+				Link& l = m_links[todetach];
+				for (int j = 0; j < 2; ++j)
+				{
+					int cn = cnodes[int(l.m_n[j] - nbase)];
+					if (cn) l.m_n[j] = &m_nodes[cn];
+				}
+			}
+		}
+		/* Faces		*/
+		for (i = 0, ni = m_faces.size(); i < ni; ++i)
+		{
+			Node** n = m_faces[i].m_n;
+			if ((ifn->Eval(n[0]->m_x) < accurary) &&
+				(ifn->Eval(n[1]->m_x) < accurary) &&
+				(ifn->Eval(n[2]->m_x) < accurary))
+			{
+				for (int j = 0; j < 3; ++j)
+				{
+					int cn = cnodes[int(n[j] - nbase)];
+					if (cn) n[j] = &m_nodes[cn];
+				}
+			}
+		}
+		/* Clean orphans	*/
+		int nnodes = m_nodes.size();
+		btAlignedObjectArray<int> ranks;
+		btAlignedObjectArray<int> todelete;
+		ranks.resize(nnodes, 0);
+		for (i = 0, ni = m_links.size(); i < ni; ++i)
+		{
+			for (int j = 0; j < 2; ++j) ranks[int(m_links[i].m_n[j] - nbase)]++;
+		}
+		for (i = 0, ni = m_faces.size(); i < ni; ++i)
+		{
+			for (int j = 0; j < 3; ++j) ranks[int(m_faces[i].m_n[j] - nbase)]++;
+		}
+		for (i = 0; i < m_links.size(); ++i)
+		{
+			const int id[] = {int(m_links[i].m_n[0] - nbase),
+							  int(m_links[i].m_n[1] - nbase)};
+			const bool sg[] = {ranks[id[0]] == 1,
+							   ranks[id[1]] == 1};
+			if (sg[0] || sg[1])
+			{
+				--ranks[id[0]];
+				--ranks[id[1]];
+				btSwap(m_links[i], m_links[m_links.size() - 1]);
+				m_links.pop_back();
+				--i;
+			}
+		}
+#if 0	
+		for(i=nnodes-1;i>=0;--i)
+		{
+			if(!ranks[i]) todelete.push_back(i);
+		}	
+		if(todelete.size())
+		{		
+			btAlignedObjectArray<int>&	map=ranks;
+			for(int i=0;i<nnodes;++i) map[i]=i;
+			PointersToIndices(this);
+			for(int i=0,ni=todelete.size();i<ni;++i)
+			{
+				int		j=todelete[i];
+				int&	a=map[j];
+				int&	b=map[--nnodes];
+				m_ndbvt.remove(m_nodes[a].m_leaf);m_nodes[a].m_leaf=0;
+				btSwap(m_nodes[a],m_nodes[b]);
+				j=a;a=b;b=j;			
+			}
+			IndicesToPointers(this,&map[0]);
+			m_nodes.resize(nnodes);
+		}
+#endif
+	}
+	m_bUpdateRtCst = true;
+}
+
+//
+bool btSoftBody::cutLink(const Node* node0, const Node* node1, btScalar position)
+{
+	return (cutLink(int(node0 - &m_nodes[0]), int(node1 - &m_nodes[0]), position));
+}
+
+//
+bool btSoftBody::cutLink(int node0, int node1, btScalar position)
+{
+	bool done = false;
+	int i, ni;
+	//	const btVector3	d=m_nodes[node0].m_x-m_nodes[node1].m_x;
+	const btVector3 x = Lerp(m_nodes[node0].m_x, m_nodes[node1].m_x, position);
+	const btVector3 v = Lerp(m_nodes[node0].m_v, m_nodes[node1].m_v, position);
+	const btScalar m = 1;
+	appendNode(x, m);
+	appendNode(x, m);
+	Node* pa = &m_nodes[node0];
+	Node* pb = &m_nodes[node1];
+	Node* pn[2] = {&m_nodes[m_nodes.size() - 2],
+				   &m_nodes[m_nodes.size() - 1]};
+	pn[0]->m_v = v;
+	pn[1]->m_v = v;
+	for (i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		const int mtch = MatchEdge(m_links[i].m_n[0], m_links[i].m_n[1], pa, pb);
+		if (mtch != -1)
+		{
+			appendLink(i);
+			Link* pft[] = {&m_links[i], &m_links[m_links.size() - 1]};
+			pft[0]->m_n[1] = pn[mtch];
+			pft[1]->m_n[0] = pn[1 - mtch];
+			done = true;
+		}
+	}
+	for (i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		for (int k = 2, l = 0; l < 3; k = l++)
+		{
+			const int mtch = MatchEdge(m_faces[i].m_n[k], m_faces[i].m_n[l], pa, pb);
+			if (mtch != -1)
+			{
+				appendFace(i);
+				Face* pft[] = {&m_faces[i], &m_faces[m_faces.size() - 1]};
+				pft[0]->m_n[l] = pn[mtch];
+				pft[1]->m_n[k] = pn[1 - mtch];
+				appendLink(pn[0], pft[0]->m_n[(l + 1) % 3], pft[0]->m_material, true);
+				appendLink(pn[1], pft[0]->m_n[(l + 1) % 3], pft[0]->m_material, true);
+			}
+		}
+	}
+	if (!done)
+	{
+		m_ndbvt.remove(pn[0]->m_leaf);
+		m_ndbvt.remove(pn[1]->m_leaf);
+		m_nodes.pop_back();
+		m_nodes.pop_back();
+	}
+	return (done);
+}
+
+//
+bool btSoftBody::rayTest(const btVector3& rayFrom,
+						 const btVector3& rayTo,
+						 sRayCast& results)
+{
+	if (m_faces.size() && m_fdbvt.empty())
+		initializeFaceTree();
+
+	results.body = this;
+	results.fraction = 1.f;
+	results.feature = eFeature::None;
+	results.index = -1;
+
+	return (rayTest(rayFrom, rayTo, results.fraction, results.feature, results.index, false) != 0);
+}
+
+bool btSoftBody::rayFaceTest(const btVector3& rayFrom,
+							 const btVector3& rayTo,
+							 sRayCast& results)
+{
+	if (m_faces.size() == 0)
+		return false;
+	else
+	{
+		if (m_fdbvt.empty())
+			initializeFaceTree();
+	}
+
+	results.body = this;
+	results.fraction = 1.f;
+	results.index = -1;
+
+	return (rayFaceTest(rayFrom, rayTo, results.fraction, results.index) != 0);
+}
+
+//
+void btSoftBody::setSolver(eSolverPresets::_ preset)
+{
+	m_cfg.m_vsequence.clear();
+	m_cfg.m_psequence.clear();
+	m_cfg.m_dsequence.clear();
+	switch (preset)
+	{
+		case eSolverPresets::Positions:
+			m_cfg.m_psequence.push_back(ePSolver::Anchors);
+			m_cfg.m_psequence.push_back(ePSolver::RContacts);
+			m_cfg.m_psequence.push_back(ePSolver::SContacts);
+			m_cfg.m_psequence.push_back(ePSolver::Linear);
+			break;
+		case eSolverPresets::Velocities:
+			m_cfg.m_vsequence.push_back(eVSolver::Linear);
+
+			m_cfg.m_psequence.push_back(ePSolver::Anchors);
+			m_cfg.m_psequence.push_back(ePSolver::RContacts);
+			m_cfg.m_psequence.push_back(ePSolver::SContacts);
+
+			m_cfg.m_dsequence.push_back(ePSolver::Linear);
+			break;
+	}
+}
+
+void btSoftBody::predictMotion(btScalar dt)
+{
+	int i, ni;
+
+	/* Update                */
+	if (m_bUpdateRtCst)
+	{
+		m_bUpdateRtCst = false;
+		updateConstants();
+		m_fdbvt.clear();
+		if (m_cfg.collisions & fCollision::VF_SS)
+		{
+			initializeFaceTree();
+		}
+	}
+
+	/* Prepare                */
+	m_sst.sdt = dt * m_cfg.timescale;
+	m_sst.isdt = 1 / m_sst.sdt;
+	m_sst.velmrg = m_sst.sdt * 3;
+	m_sst.radmrg = getCollisionShape()->getMargin();
+	m_sst.updmrg = m_sst.radmrg * (btScalar)0.25;
+	/* Forces                */
+	addVelocity(m_worldInfo->m_gravity * m_sst.sdt);
+	applyForces();
+	/* Integrate            */
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		Node& n = m_nodes[i];
+		n.m_q = n.m_x;
+		btVector3 deltaV = n.m_f * n.m_im * m_sst.sdt;
+		{
+			btScalar maxDisplacement = m_worldInfo->m_maxDisplacement;
+			btScalar clampDeltaV = maxDisplacement / m_sst.sdt;
+			for (int c = 0; c < 3; c++)
+			{
+				if (deltaV[c] > clampDeltaV)
+				{
+					deltaV[c] = clampDeltaV;
+				}
+				if (deltaV[c] < -clampDeltaV)
+				{
+					deltaV[c] = -clampDeltaV;
+				}
+			}
+		}
+		n.m_v += deltaV;
+		n.m_x += n.m_v * m_sst.sdt;
+		n.m_f = btVector3(0, 0, 0);
+	}
+	/* Clusters                */
+	updateClusters();
+	/* Bounds                */
+	updateBounds();
+	/* Nodes                */
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)
+	vol;
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		Node& n = m_nodes[i];
+		vol = btDbvtVolume::FromCR(n.m_x, m_sst.radmrg);
+		m_ndbvt.update(n.m_leaf,
+					   vol,
+					   n.m_v * m_sst.velmrg,
+					   m_sst.updmrg);
+	}
+	/* Faces                */
+	if (!m_fdbvt.empty())
+	{
+		for (int i = 0; i < m_faces.size(); ++i)
+		{
+			Face& f = m_faces[i];
+			const btVector3 v = (f.m_n[0]->m_v +
+								 f.m_n[1]->m_v +
+								 f.m_n[2]->m_v) /
+								3;
+			vol = VolumeOf(f, m_sst.radmrg);
+			m_fdbvt.update(f.m_leaf,
+						   vol,
+						   v * m_sst.velmrg,
+						   m_sst.updmrg);
+		}
+	}
+	/* Pose                    */
+	updatePose();
+	/* Match                */
+	if (m_pose.m_bframe && (m_cfg.kMT > 0))
+	{
+		const btMatrix3x3 posetrs = m_pose.m_rot;
+		for (int i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			Node& n = m_nodes[i];
+			if (n.m_im > 0)
+			{
+				const btVector3 x = posetrs * m_pose.m_pos[i] + m_pose.m_com;
+				n.m_x = Lerp(n.m_x, x, m_cfg.kMT);
+			}
+		}
+	}
+	/* Clear contacts        */
+	m_rcontacts.resize(0);
+	m_scontacts.resize(0);
+	/* Optimize dbvt's        */
+	m_ndbvt.optimizeIncremental(1);
+	m_fdbvt.optimizeIncremental(1);
+	m_cdbvt.optimizeIncremental(1);
+}
+
+//
+void btSoftBody::solveConstraints()
+{
+	/* Apply clusters		*/
+	applyClusters(false);
+	/* Prepare links		*/
+
+	int i, ni;
+
+	for (i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		Link& l = m_links[i];
+		l.m_c3 = l.m_n[1]->m_q - l.m_n[0]->m_q;
+		l.m_c2 = 1 / (l.m_c3.length2() * l.m_c0);
+	}
+	/* Prepare anchors		*/
+	for (i = 0, ni = m_anchors.size(); i < ni; ++i)
+	{
+		Anchor& a = m_anchors[i];
+		const btVector3 ra = a.m_body->getWorldTransform().getBasis() * a.m_local;
+		a.m_c0 = ImpulseMatrix(m_sst.sdt,
+							   a.m_node->m_im,
+							   a.m_body->getInvMass(),
+							   a.m_body->getInvInertiaTensorWorld(),
+							   ra);
+		a.m_c1 = ra;
+		a.m_c2 = m_sst.sdt * a.m_node->m_im;
+		a.m_body->activate();
+	}
+	/* Solve velocities		*/
+	if (m_cfg.viterations > 0)
+	{
+		/* Solve			*/
+		for (int isolve = 0; isolve < m_cfg.viterations; ++isolve)
+		{
+			for (int iseq = 0; iseq < m_cfg.m_vsequence.size(); ++iseq)
+			{
+				getSolver(m_cfg.m_vsequence[iseq])(this, 1);
+			}
+		}
+		/* Update			*/
+		for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			Node& n = m_nodes[i];
+			n.m_x = n.m_q + n.m_v * m_sst.sdt;
+		}
+	}
+	/* Solve positions		*/
+	if (m_cfg.piterations > 0)
+	{
+		for (int isolve = 0; isolve < m_cfg.piterations; ++isolve)
+		{
+			const btScalar ti = isolve / (btScalar)m_cfg.piterations;
+			for (int iseq = 0; iseq < m_cfg.m_psequence.size(); ++iseq)
+			{
+				getSolver(m_cfg.m_psequence[iseq])(this, 1, ti);
+			}
+		}
+		const btScalar vc = m_sst.isdt * (1 - m_cfg.kDP);
+		for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			Node& n = m_nodes[i];
+			n.m_v = (n.m_x - n.m_q) * vc;
+			n.m_f = btVector3(0, 0, 0);
+		}
+	}
+	/* Solve drift			*/
+	if (m_cfg.diterations > 0)
+	{
+		const btScalar vcf = m_cfg.kVCF * m_sst.isdt;
+		for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			Node& n = m_nodes[i];
+			n.m_q = n.m_x;
+		}
+		for (int idrift = 0; idrift < m_cfg.diterations; ++idrift)
+		{
+			for (int iseq = 0; iseq < m_cfg.m_dsequence.size(); ++iseq)
+			{
+				getSolver(m_cfg.m_dsequence[iseq])(this, 1, 0);
+			}
+		}
+		for (int i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			Node& n = m_nodes[i];
+			n.m_v += (n.m_x - n.m_q) * vcf;
+		}
+	}
+	/* Apply clusters		*/
+	dampClusters();
+	applyClusters(true);
+}
+
+//
+void btSoftBody::staticSolve(int iterations)
+{
+	for (int isolve = 0; isolve < iterations; ++isolve)
+	{
+		for (int iseq = 0; iseq < m_cfg.m_psequence.size(); ++iseq)
+		{
+			getSolver(m_cfg.m_psequence[iseq])(this, 1, 0);
+		}
+	}
+}
+
+//
+void btSoftBody::solveCommonConstraints(btSoftBody** /*bodies*/, int /*count*/, int /*iterations*/)
+{
+	/// placeholder
+}
+
+//
+void btSoftBody::solveClusters(const btAlignedObjectArray<btSoftBody*>& bodies)
+{
+	const int nb = bodies.size();
+	int iterations = 0;
+	int i;
+
+	for (i = 0; i < nb; ++i)
+	{
+		iterations = btMax(iterations, bodies[i]->m_cfg.citerations);
+	}
+	for (i = 0; i < nb; ++i)
+	{
+		bodies[i]->prepareClusters(iterations);
+	}
+	for (i = 0; i < iterations; ++i)
+	{
+		const btScalar sor = 1;
+		for (int j = 0; j < nb; ++j)
+		{
+			bodies[j]->solveClusters(sor);
+		}
+	}
+	for (i = 0; i < nb; ++i)
+	{
+		bodies[i]->cleanupClusters();
+	}
+}
+
+//
+void btSoftBody::integrateMotion()
+{
+	/* Update			*/
+	updateNormals();
+}
+
+//
+btSoftBody::RayFromToCaster::RayFromToCaster(const btVector3& rayFrom, const btVector3& rayTo, btScalar mxt)
+{
+	m_rayFrom = rayFrom;
+	m_rayNormalizedDirection = (rayTo - rayFrom);
+	m_rayTo = rayTo;
+	m_mint = mxt;
+	m_face = 0;
+	m_tests = 0;
+}
+
+//
+void btSoftBody::RayFromToCaster::Process(const btDbvtNode* leaf)
+{
+	btSoftBody::Face& f = *(btSoftBody::Face*)leaf->data;
+	const btScalar t = rayFromToTriangle(m_rayFrom, m_rayTo, m_rayNormalizedDirection,
+										 f.m_n[0]->m_x,
+										 f.m_n[1]->m_x,
+										 f.m_n[2]->m_x,
+										 m_mint);
+	if ((t > 0) && (t < m_mint))
+	{
+		m_mint = t;
+		m_face = &f;
+	}
+	++m_tests;
+}
+
+//
+btScalar btSoftBody::RayFromToCaster::rayFromToTriangle(const btVector3& rayFrom,
+														const btVector3& rayTo,
+														const btVector3& rayNormalizedDirection,
+														const btVector3& a,
+														const btVector3& b,
+														const btVector3& c,
+														btScalar maxt)
+{
+	static const btScalar ceps = -SIMD_EPSILON * 10;
+	static const btScalar teps = SIMD_EPSILON * 10;
+
+	const btVector3 n = btCross(b - a, c - a);
+	const btScalar d = btDot(a, n);
+	const btScalar den = btDot(rayNormalizedDirection, n);
+	if (!btFuzzyZero(den))
+	{
+		const btScalar num = btDot(rayFrom, n) - d;
+		const btScalar t = -num / den;
+		if ((t > teps) && (t < maxt))
+		{
+			const btVector3 hit = rayFrom + rayNormalizedDirection * t;
+			if ((btDot(n, btCross(a - hit, b - hit)) > ceps) &&
+				(btDot(n, btCross(b - hit, c - hit)) > ceps) &&
+				(btDot(n, btCross(c - hit, a - hit)) > ceps))
+			{
+				return (t);
+			}
+		}
+	}
+	return (-1);
+}
+
+//
+void btSoftBody::pointersToIndices()
+{
+#define PTR2IDX(_p_, _b_) reinterpret_cast<btSoftBody::Node*>((_p_) - (_b_))
+	btSoftBody::Node* base = m_nodes.size() ? &m_nodes[0] : 0;
+	int i, ni;
+
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		if (m_nodes[i].m_leaf)
+		{
+			m_nodes[i].m_leaf->data = *(void**)&i;
+		}
+	}
+	for (i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		m_links[i].m_n[0] = PTR2IDX(m_links[i].m_n[0], base);
+		m_links[i].m_n[1] = PTR2IDX(m_links[i].m_n[1], base);
+	}
+	for (i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		m_faces[i].m_n[0] = PTR2IDX(m_faces[i].m_n[0], base);
+		m_faces[i].m_n[1] = PTR2IDX(m_faces[i].m_n[1], base);
+		m_faces[i].m_n[2] = PTR2IDX(m_faces[i].m_n[2], base);
+		if (m_faces[i].m_leaf)
+		{
+			m_faces[i].m_leaf->data = *(void**)&i;
+		}
+	}
+	for (i = 0, ni = m_anchors.size(); i < ni; ++i)
+	{
+		m_anchors[i].m_node = PTR2IDX(m_anchors[i].m_node, base);
+	}
+	for (i = 0, ni = m_notes.size(); i < ni; ++i)
+	{
+		for (int j = 0; j < m_notes[i].m_rank; ++j)
+		{
+			m_notes[i].m_nodes[j] = PTR2IDX(m_notes[i].m_nodes[j], base);
+		}
+	}
+#undef PTR2IDX
+}
+
+//
+void btSoftBody::indicesToPointers(const int* map)
+{
+#define IDX2PTR(_p_, _b_) map ? (&(_b_)[map[(((char*)_p_) - (char*)0)]]) : (&(_b_)[(((char*)_p_) - (char*)0)])
+	btSoftBody::Node* base = m_nodes.size() ? &m_nodes[0] : 0;
+	int i, ni;
+
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		if (m_nodes[i].m_leaf)
+		{
+			m_nodes[i].m_leaf->data = &m_nodes[i];
+		}
+	}
+	for (i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		m_links[i].m_n[0] = IDX2PTR(m_links[i].m_n[0], base);
+		m_links[i].m_n[1] = IDX2PTR(m_links[i].m_n[1], base);
+	}
+	for (i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		m_faces[i].m_n[0] = IDX2PTR(m_faces[i].m_n[0], base);
+		m_faces[i].m_n[1] = IDX2PTR(m_faces[i].m_n[1], base);
+		m_faces[i].m_n[2] = IDX2PTR(m_faces[i].m_n[2], base);
+		if (m_faces[i].m_leaf)
+		{
+			m_faces[i].m_leaf->data = &m_faces[i];
+		}
+	}
+	for (i = 0, ni = m_anchors.size(); i < ni; ++i)
+	{
+		m_anchors[i].m_node = IDX2PTR(m_anchors[i].m_node, base);
+	}
+	for (i = 0, ni = m_notes.size(); i < ni; ++i)
+	{
+		for (int j = 0; j < m_notes[i].m_rank; ++j)
+		{
+			m_notes[i].m_nodes[j] = IDX2PTR(m_notes[i].m_nodes[j], base);
+		}
+	}
+#undef IDX2PTR
+}
+
+//
+int btSoftBody::rayTest(const btVector3& rayFrom, const btVector3& rayTo,
+						btScalar& mint, eFeature::_& feature, int& index, bool bcountonly) const
+{
+	int cnt = 0;
+	btVector3 dir = rayTo - rayFrom;
+
+	if (bcountonly || m_fdbvt.empty())
+	{ /* Full search	*/
+
+		for (int i = 0, ni = m_faces.size(); i < ni; ++i)
+		{
+			const btSoftBody::Face& f = m_faces[i];
+
+			const btScalar t = RayFromToCaster::rayFromToTriangle(rayFrom, rayTo, dir,
+																  f.m_n[0]->m_x,
+																  f.m_n[1]->m_x,
+																  f.m_n[2]->m_x,
+																  mint);
+			if (t > 0)
+			{
+				++cnt;
+				if (!bcountonly)
+				{
+					feature = btSoftBody::eFeature::Face;
+					index = i;
+					mint = t;
+				}
+			}
+		}
+	}
+	else
+	{ /* Use dbvt	*/
+		RayFromToCaster collider(rayFrom, rayTo, mint);
+
+		btDbvt::rayTest(m_fdbvt.m_root, rayFrom, rayTo, collider);
+		if (collider.m_face)
+		{
+			mint = collider.m_mint;
+			feature = btSoftBody::eFeature::Face;
+			index = (int)(collider.m_face - &m_faces[0]);
+			cnt = 1;
+		}
+	}
+
+	for (int i = 0; i < m_tetras.size(); i++)
+	{
+		const btSoftBody::Tetra& tet = m_tetras[i];
+		int tetfaces[4][3] = {{0, 1, 2}, {0, 1, 3}, {1, 2, 3}, {0, 2, 3}};
+		for (int f = 0; f < 4; f++)
+		{
+			int index0 = tetfaces[f][0];
+			int index1 = tetfaces[f][1];
+			int index2 = tetfaces[f][2];
+			btVector3 v0 = tet.m_n[index0]->m_x;
+			btVector3 v1 = tet.m_n[index1]->m_x;
+			btVector3 v2 = tet.m_n[index2]->m_x;
+
+			const btScalar t = RayFromToCaster::rayFromToTriangle(rayFrom, rayTo, dir,
+																  v0, v1, v2,
+																  mint);
+			if (t > 0)
+			{
+				++cnt;
+				if (!bcountonly)
+				{
+					feature = btSoftBody::eFeature::Tetra;
+					index = i;
+					mint = t;
+				}
+			}
+		}
+	}
+	return (cnt);
+}
+
+int btSoftBody::rayFaceTest(const btVector3& rayFrom, const btVector3& rayTo,
+							btScalar& mint, int& index) const
+{
+	int cnt = 0;
+	{ /* Use dbvt	*/
+		RayFromToCaster collider(rayFrom, rayTo, mint);
+
+		btDbvt::rayTest(m_fdbvt.m_root, rayFrom, rayTo, collider);
+		if (collider.m_face)
+		{
+			mint = collider.m_mint;
+			index = (int)(collider.m_face - &m_faces[0]);
+			cnt = 1;
+		}
+	}
+	return (cnt);
+}
+
+//
+static inline btDbvntNode* copyToDbvnt(const btDbvtNode* n)
+{
+	if (n == 0)
+		return 0;
+	btDbvntNode* root = new btDbvntNode(n);
+	if (n->isinternal())
+	{
+		btDbvntNode* c0 = copyToDbvnt(n->childs[0]);
+		root->childs[0] = c0;
+		btDbvntNode* c1 = copyToDbvnt(n->childs[1]);
+		root->childs[1] = c1;
+	}
+	return root;
+}
+
+static inline void calculateNormalCone(btDbvntNode* root)
+{
+	if (!root)
+		return;
+	if (root->isleaf())
+	{
+		const btSoftBody::Face* face = (btSoftBody::Face*)root->data;
+		root->normal = face->m_normal;
+		root->angle = 0;
+	}
+	else
+	{
+		btVector3 n0(0, 0, 0), n1(0, 0, 0);
+		btScalar a0 = 0, a1 = 0;
+		if (root->childs[0])
+		{
+			calculateNormalCone(root->childs[0]);
+			n0 = root->childs[0]->normal;
+			a0 = root->childs[0]->angle;
+		}
+		if (root->childs[1])
+		{
+			calculateNormalCone(root->childs[1]);
+			n1 = root->childs[1]->normal;
+			a1 = root->childs[1]->angle;
+		}
+		root->normal = (n0 + n1).safeNormalize();
+		root->angle = btMax(a0, a1) + btAngle(n0, n1) * 0.5;
+	}
+}
+
+void btSoftBody::initializeFaceTree()
+{
+	BT_PROFILE("btSoftBody::initializeFaceTree");
+	m_fdbvt.clear();
+	// create leaf nodes;
+	btAlignedObjectArray<btDbvtNode*> leafNodes;
+	leafNodes.resize(m_faces.size());
+	for (int i = 0; i < m_faces.size(); ++i)
+	{
+		Face& f = m_faces[i];
+		ATTRIBUTE_ALIGNED16(btDbvtVolume)
+		vol = VolumeOf(f, 0);
+		btDbvtNode* node = new (btAlignedAlloc(sizeof(btDbvtNode), 16)) btDbvtNode();
+		node->parent = NULL;
+		node->data = &f;
+		node->childs[1] = 0;
+		node->volume = vol;
+		leafNodes[i] = node;
+		f.m_leaf = node;
+	}
+	btAlignedObjectArray<btAlignedObjectArray<int> > adj;
+	adj.resize(m_faces.size());
+	// construct the adjacency list for triangles
+	for (int i = 0; i < adj.size(); ++i)
+	{
+		for (int j = i + 1; j < adj.size(); ++j)
+		{
+			int dup = 0;
+			for (int k = 0; k < 3; ++k)
+			{
+				for (int l = 0; l < 3; ++l)
+				{
+					if (m_faces[i].m_n[k] == m_faces[j].m_n[l])
+					{
+						++dup;
+						break;
+					}
+				}
+				if (dup == 2)
+				{
+					adj[i].push_back(j);
+					adj[j].push_back(i);
+				}
+			}
+		}
+	}
+	m_fdbvt.m_root = buildTreeBottomUp(leafNodes, adj);
+	if (m_fdbvnt)
+		delete m_fdbvnt;
+	m_fdbvnt = copyToDbvnt(m_fdbvt.m_root);
+	updateFaceTree(false, false);
+	rebuildNodeTree();
+}
+
+//
+void btSoftBody::rebuildNodeTree()
+{
+	m_ndbvt.clear();
+	btAlignedObjectArray<btDbvtNode*> leafNodes;
+	leafNodes.resize(m_nodes.size());
+	for (int i = 0; i < m_nodes.size(); ++i)
+	{
+		Node& n = m_nodes[i];
+		ATTRIBUTE_ALIGNED16(btDbvtVolume)
+		vol = btDbvtVolume::FromCR(n.m_x, 0);
+		btDbvtNode* node = new (btAlignedAlloc(sizeof(btDbvtNode), 16)) btDbvtNode();
+		node->parent = NULL;
+		node->data = &n;
+		node->childs[1] = 0;
+		node->volume = vol;
+		leafNodes[i] = node;
+		n.m_leaf = node;
+	}
+	btAlignedObjectArray<btAlignedObjectArray<int> > adj;
+	adj.resize(m_nodes.size());
+	btAlignedObjectArray<int> old_id;
+	old_id.resize(m_nodes.size());
+	for (int i = 0; i < m_nodes.size(); ++i)
+		old_id[i] = m_nodes[i].index;
+	for (int i = 0; i < m_nodes.size(); ++i)
+		m_nodes[i].index = i;
+	for (int i = 0; i < m_links.size(); ++i)
+	{
+		Link& l = m_links[i];
+		adj[l.m_n[0]->index].push_back(l.m_n[1]->index);
+		adj[l.m_n[1]->index].push_back(l.m_n[0]->index);
+	}
+	m_ndbvt.m_root = buildTreeBottomUp(leafNodes, adj);
+	for (int i = 0; i < m_nodes.size(); ++i)
+		m_nodes[i].index = old_id[i];
+}
+
+//
+btVector3 btSoftBody::evaluateCom() const
+{
+	btVector3 com(0, 0, 0);
+	if (m_pose.m_bframe)
+	{
+		for (int i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			com += m_nodes[i].m_x * m_pose.m_wgh[i];
+		}
+	}
+	return (com);
+}
+
+bool btSoftBody::checkContact(const btCollisionObjectWrapper* colObjWrap,
+							  const btVector3& x,
+							  btScalar margin,
+							  btSoftBody::sCti& cti) const
+{
+	btVector3 nrm;
+	const btCollisionShape* shp = colObjWrap->getCollisionShape();
+	//    const btRigidBody *tmpRigid = btRigidBody::upcast(colObjWrap->getCollisionObject());
+	//const btTransform &wtr = tmpRigid ? tmpRigid->getWorldTransform() : colObjWrap->getWorldTransform();
+	const btTransform& wtr = colObjWrap->getWorldTransform();
+	//todo: check which transform is needed here
+
+	btScalar dst =
+		m_worldInfo->m_sparsesdf.Evaluate(
+			wtr.invXform(x),
+			shp,
+			nrm,
+			margin);
+	if (dst < 0)
+	{
+		cti.m_colObj = colObjWrap->getCollisionObject();
+		cti.m_normal = wtr.getBasis() * nrm;
+		cti.m_offset = -btDot(cti.m_normal, x - cti.m_normal * dst);
+		return (true);
+	}
+	return (false);
+}
+
+//
+bool btSoftBody::checkDeformableContact(const btCollisionObjectWrapper* colObjWrap,
+										const btVector3& x,
+										btScalar margin,
+										btSoftBody::sCti& cti, bool predict) const
+{
+	btVector3 nrm;
+	const btCollisionShape* shp = colObjWrap->getCollisionShape();
+	const btCollisionObject* tmpCollisionObj = colObjWrap->getCollisionObject();
+	// use the position x_{n+1}^* = x_n + dt * v_{n+1}^* where v_{n+1}^* = v_n + dtg for collision detect
+	// but resolve contact at x_n
+	btTransform wtr = (predict) ? (colObjWrap->m_preTransform != NULL ? tmpCollisionObj->getInterpolationWorldTransform() * (*colObjWrap->m_preTransform) : tmpCollisionObj->getInterpolationWorldTransform())
+								: colObjWrap->getWorldTransform();
+	btScalar dst =
+		m_worldInfo->m_sparsesdf.Evaluate(
+			wtr.invXform(x),
+			shp,
+			nrm,
+			margin);
+
+	if (!predict)
+	{
+		cti.m_colObj = colObjWrap->getCollisionObject();
+		cti.m_normal = wtr.getBasis() * nrm;
+		cti.m_offset = dst;
+	}
+	if (dst < 0)
+		return true;
+	return (false);
+}
+
+//
+// Compute barycentric coordinates (u, v, w) for
+// point p with respect to triangle (a, b, c)
+static void getBarycentric(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, btVector3& bary)
+{
+	btVector3 v0 = b - a, v1 = c - a, v2 = p - a;
+	btScalar d00 = v0.dot(v0);
+	btScalar d01 = v0.dot(v1);
+	btScalar d11 = v1.dot(v1);
+	btScalar d20 = v2.dot(v0);
+	btScalar d21 = v2.dot(v1);
+	btScalar denom = d00 * d11 - d01 * d01;
+	// In the case of a degenerate triangle, pick a vertex.
+	if (btFabs(denom) < SIMD_EPSILON) 
+	{
+		bary.setY(btScalar(0.0));
+		bary.setZ(btScalar(0.0));
+	} 
+	else 
+	{
+		bary.setY((d11 * d20 - d01 * d21) / denom);
+		bary.setZ((d00 * d21 - d01 * d20) / denom);
+  	}
+	bary.setX(btScalar(1) - bary.getY() - bary.getZ());
+}
+
+//
+bool btSoftBody::checkDeformableFaceContact(const btCollisionObjectWrapper* colObjWrap,
+											Face& f,
+											btVector3& contact_point,
+											btVector3& bary,
+											btScalar margin,
+											btSoftBody::sCti& cti, bool predict) const
+{
+	btVector3 nrm;
+	const btCollisionShape* shp = colObjWrap->getCollisionShape();
+	const btCollisionObject* tmpCollisionObj = colObjWrap->getCollisionObject();
+	// use the position x_{n+1}^* = x_n + dt * v_{n+1}^* where v_{n+1}^* = v_n + dtg for collision detect
+	// but resolve contact at x_n
+	btTransform wtr = (predict) ? (colObjWrap->m_preTransform != NULL ? tmpCollisionObj->getInterpolationWorldTransform() * (*colObjWrap->m_preTransform) : tmpCollisionObj->getInterpolationWorldTransform())
+								: colObjWrap->getWorldTransform();
+	btScalar dst;
+	btGjkEpaSolver2::sResults results;
+
+	//	#define USE_QUADRATURE 1
+
+	// use collision quadrature point
+#ifdef USE_QUADRATURE
+	{
+		dst = SIMD_INFINITY;
+		btVector3 local_nrm;
+		for (int q = 0; q < m_quads.size(); ++q)
+		{
+			btVector3 p;
+			if (predict)
+				p = BaryEval(f.m_n[0]->m_q, f.m_n[1]->m_q, f.m_n[2]->m_q, m_quads[q]);
+			else
+				p = BaryEval(f.m_n[0]->m_x, f.m_n[1]->m_x, f.m_n[2]->m_x, m_quads[q]);
+			btScalar local_dst = m_worldInfo->m_sparsesdf.Evaluate(
+				wtr.invXform(p),
+				shp,
+				local_nrm,
+				margin);
+			if (local_dst < dst)
+			{
+				if (local_dst < 0 && predict)
+					return true;
+				dst = local_dst;
+				contact_point = p;
+				bary = m_quads[q];
+				nrm = local_nrm;
+			}
+			if (!predict)
+			{
+				cti.m_colObj = colObjWrap->getCollisionObject();
+				cti.m_normal = wtr.getBasis() * nrm;
+				cti.m_offset = dst;
+			}
+		}
+		return (dst < 0);
+	}
+#endif
+
+	// collision detection using x*
+	btTransform triangle_transform;
+	triangle_transform.setIdentity();
+	triangle_transform.setOrigin(f.m_n[0]->m_q);
+	btTriangleShape triangle(btVector3(0, 0, 0), f.m_n[1]->m_q - f.m_n[0]->m_q, f.m_n[2]->m_q - f.m_n[0]->m_q);
+	btVector3 guess(0, 0, 0);
+	const btConvexShape* csh = static_cast<const btConvexShape*>(shp);
+	btGjkEpaSolver2::SignedDistance(&triangle, triangle_transform, csh, wtr, guess, results);
+	dst = results.distance - 2.0 * csh->getMargin() - margin;  // margin padding so that the distance = the actual distance between face and rigid - margin of rigid - margin of deformable
+	if (dst >= 0)
+		return false;
+
+	// Use consistent barycenter to recalculate distance.
+	if (this->m_cacheBarycenter)
+	{
+		if (f.m_pcontact[3] != 0)
+		{
+			for (int i = 0; i < 3; ++i)
+				bary[i] = f.m_pcontact[i];
+			contact_point = BaryEval(f.m_n[0]->m_x, f.m_n[1]->m_x, f.m_n[2]->m_x, bary);
+			const btConvexShape* csh = static_cast<const btConvexShape*>(shp);
+			btGjkEpaSolver2::SignedDistance(contact_point, margin, csh, wtr, results);
+			cti.m_colObj = colObjWrap->getCollisionObject();
+			dst = results.distance;
+			cti.m_normal = results.normal;
+			cti.m_offset = dst;
+
+			//point-convex CD
+			wtr = colObjWrap->getWorldTransform();
+			btTriangleShape triangle2(btVector3(0, 0, 0), f.m_n[1]->m_x - f.m_n[0]->m_x, f.m_n[2]->m_x - f.m_n[0]->m_x);
+			triangle_transform.setOrigin(f.m_n[0]->m_x);
+			btGjkEpaSolver2::SignedDistance(&triangle2, triangle_transform, csh, wtr, guess, results);
+
+			dst = results.distance - csh->getMargin() - margin;
+			return true;
+		}
+	}
+
+	// Use triangle-convex CD.
+	wtr = colObjWrap->getWorldTransform();
+	btTriangleShape triangle2(btVector3(0, 0, 0), f.m_n[1]->m_x - f.m_n[0]->m_x, f.m_n[2]->m_x - f.m_n[0]->m_x);
+	triangle_transform.setOrigin(f.m_n[0]->m_x);
+	btGjkEpaSolver2::SignedDistance(&triangle2, triangle_transform, csh, wtr, guess, results);
+	contact_point = results.witnesses[0];
+	getBarycentric(contact_point, f.m_n[0]->m_x, f.m_n[1]->m_x, f.m_n[2]->m_x, bary);
+
+	for (int i = 0; i < 3; ++i)
+		f.m_pcontact[i] = bary[i];
+
+	dst = results.distance - csh->getMargin() - margin;
+	cti.m_colObj = colObjWrap->getCollisionObject();
+	cti.m_normal = results.normal;
+	cti.m_offset = dst;
+	return true;
+}
+
+void btSoftBody::updateNormals()
+{
+	const btVector3 zv(0, 0, 0);
+	int i, ni;
+
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		m_nodes[i].m_n = zv;
+	}
+	for (i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		btSoftBody::Face& f = m_faces[i];
+		const btVector3 n = btCross(f.m_n[1]->m_x - f.m_n[0]->m_x,
+									f.m_n[2]->m_x - f.m_n[0]->m_x);
+		f.m_normal = n;
+		f.m_normal.safeNormalize();
+		f.m_n[0]->m_n += n;
+		f.m_n[1]->m_n += n;
+		f.m_n[2]->m_n += n;
+	}
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		btScalar len = m_nodes[i].m_n.length();
+		if (len > SIMD_EPSILON)
+			m_nodes[i].m_n /= len;
+	}
+}
+
+//
+void btSoftBody::updateBounds()
+{
+	/*if( m_acceleratedSoftBody )
+	{
+		// If we have an accelerated softbody we need to obtain the bounds correctly
+		// For now (slightly hackily) just have a very large AABB
+		// TODO: Write get bounds kernel
+		// If that is updating in place, atomic collisions might be low (when the cloth isn't perfectly aligned to an axis) and we could
+		// probably do a test and exchange reasonably efficiently.
+
+		m_bounds[0] = btVector3(-1000, -1000, -1000);
+		m_bounds[1] = btVector3(1000, 1000, 1000);
+
+	} else {*/
+	//    if (m_ndbvt.m_root)
+	//    {
+	//        const btVector3& mins = m_ndbvt.m_root->volume.Mins();
+	//        const btVector3& maxs = m_ndbvt.m_root->volume.Maxs();
+	//        const btScalar csm = getCollisionShape()->getMargin();
+	//        const btVector3 mrg = btVector3(csm,
+	//                                        csm,
+	//                                        csm) *
+	//                              1;  // ??? to investigate...
+	//        m_bounds[0] = mins - mrg;
+	//        m_bounds[1] = maxs + mrg;
+	//        if (0 != getBroadphaseHandle())
+	//        {
+	//            m_worldInfo->m_broadphase->setAabb(getBroadphaseHandle(),
+	//                                               m_bounds[0],
+	//                                               m_bounds[1],
+	//                                               m_worldInfo->m_dispatcher);
+	//        }
+	//    }
+	//    else
+	//    {
+	//        m_bounds[0] =
+	//            m_bounds[1] = btVector3(0, 0, 0);
+	//    }
+	if (m_nodes.size())
+	{
+		btVector3 mins = m_nodes[0].m_x;
+		btVector3 maxs = m_nodes[0].m_x;
+		for (int i = 1; i < m_nodes.size(); ++i)
+		{
+			for (int d = 0; d < 3; ++d)
+			{
+				if (m_nodes[i].m_x[d] > maxs[d])
+					maxs[d] = m_nodes[i].m_x[d];
+				if (m_nodes[i].m_x[d] < mins[d])
+					mins[d] = m_nodes[i].m_x[d];
+			}
+		}
+		const btScalar csm = getCollisionShape()->getMargin();
+		const btVector3 mrg = btVector3(csm,
+										csm,
+										csm);
+		m_bounds[0] = mins - mrg;
+		m_bounds[1] = maxs + mrg;
+		if (0 != getBroadphaseHandle())
+		{
+			m_worldInfo->m_broadphase->setAabb(getBroadphaseHandle(),
+											   m_bounds[0],
+											   m_bounds[1],
+											   m_worldInfo->m_dispatcher);
+		}
+	}
+	else
+	{
+		m_bounds[0] =
+			m_bounds[1] = btVector3(0, 0, 0);
+	}
+}
+
+//
+void btSoftBody::updatePose()
+{
+	if (m_pose.m_bframe)
+	{
+		btSoftBody::Pose& pose = m_pose;
+		const btVector3 com = evaluateCom();
+		/* Com			*/
+		pose.m_com = com;
+		/* Rotation		*/
+		btMatrix3x3 Apq;
+		const btScalar eps = SIMD_EPSILON;
+		Apq[0] = Apq[1] = Apq[2] = btVector3(0, 0, 0);
+		Apq[0].setX(eps);
+		Apq[1].setY(eps * 2);
+		Apq[2].setZ(eps * 3);
+		for (int i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			const btVector3 a = pose.m_wgh[i] * (m_nodes[i].m_x - com);
+			const btVector3& b = pose.m_pos[i];
+			Apq[0] += a.x() * b;
+			Apq[1] += a.y() * b;
+			Apq[2] += a.z() * b;
+		}
+		btMatrix3x3 r, s;
+		PolarDecompose(Apq, r, s);
+		pose.m_rot = r;
+		pose.m_scl = pose.m_aqq * r.transpose() * Apq;
+		if (m_cfg.maxvolume > 1)
+		{
+			const btScalar idet = Clamp<btScalar>(1 / pose.m_scl.determinant(),
+												  1, m_cfg.maxvolume);
+			pose.m_scl = Mul(pose.m_scl, idet);
+		}
+	}
+}
+
+//
+void btSoftBody::updateArea(bool averageArea)
+{
+	int i, ni;
+
+	/* Face area		*/
+	for (i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		Face& f = m_faces[i];
+		f.m_ra = AreaOf(f.m_n[0]->m_x, f.m_n[1]->m_x, f.m_n[2]->m_x);
+	}
+
+	/* Node area		*/
+
+	if (averageArea)
+	{
+		btAlignedObjectArray<int> counts;
+		counts.resize(m_nodes.size(), 0);
+		for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			m_nodes[i].m_area = 0;
+		}
+		for (i = 0, ni = m_faces.size(); i < ni; ++i)
+		{
+			btSoftBody::Face& f = m_faces[i];
+			for (int j = 0; j < 3; ++j)
+			{
+				const int index = (int)(f.m_n[j] - &m_nodes[0]);
+				counts[index]++;
+				f.m_n[j]->m_area += btFabs(f.m_ra);
+			}
+		}
+		for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			if (counts[i] > 0)
+				m_nodes[i].m_area /= (btScalar)counts[i];
+			else
+				m_nodes[i].m_area = 0;
+		}
+	}
+	else
+	{
+		// initialize node area as zero
+		for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			m_nodes[i].m_area = 0;
+		}
+
+		for (i = 0, ni = m_faces.size(); i < ni; ++i)
+		{
+			btSoftBody::Face& f = m_faces[i];
+
+			for (int j = 0; j < 3; ++j)
+			{
+				f.m_n[j]->m_area += f.m_ra;
+			}
+		}
+
+		for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+		{
+			m_nodes[i].m_area *= 0.3333333f;
+		}
+	}
+}
+
+void btSoftBody::updateLinkConstants()
+{
+	int i, ni;
+
+	/* Links		*/
+	for (i = 0, ni = m_links.size(); i < ni; ++i)
+	{
+		Link& l = m_links[i];
+		Material& m = *l.m_material;
+		l.m_c0 = (l.m_n[0]->m_im + l.m_n[1]->m_im) / m.m_kLST;
+	}
+}
+
+void btSoftBody::updateConstants()
+{
+	resetLinkRestLengths();
+	updateLinkConstants();
+	updateArea();
+}
+
+//
+void btSoftBody::initializeClusters()
+{
+	int i;
+
+	for (i = 0; i < m_clusters.size(); ++i)
+	{
+		Cluster& c = *m_clusters[i];
+		c.m_imass = 0;
+		c.m_masses.resize(c.m_nodes.size());
+		for (int j = 0; j < c.m_nodes.size(); ++j)
+		{
+			if (c.m_nodes[j]->m_im == 0)
+			{
+				c.m_containsAnchor = true;
+				c.m_masses[j] = BT_LARGE_FLOAT;
+			}
+			else
+			{
+				c.m_masses[j] = btScalar(1.) / c.m_nodes[j]->m_im;
+			}
+			c.m_imass += c.m_masses[j];
+		}
+		c.m_imass = btScalar(1.) / c.m_imass;
+		c.m_com = btSoftBody::clusterCom(&c);
+		c.m_lv = btVector3(0, 0, 0);
+		c.m_av = btVector3(0, 0, 0);
+		c.m_leaf = 0;
+		/* Inertia	*/
+		btMatrix3x3& ii = c.m_locii;
+		ii[0] = ii[1] = ii[2] = btVector3(0, 0, 0);
+		{
+			int i, ni;
+
+			for (i = 0, ni = c.m_nodes.size(); i < ni; ++i)
+			{
+				const btVector3 k = c.m_nodes[i]->m_x - c.m_com;
+				const btVector3 q = k * k;
+				const btScalar m = c.m_masses[i];
+				ii[0][0] += m * (q[1] + q[2]);
+				ii[1][1] += m * (q[0] + q[2]);
+				ii[2][2] += m * (q[0] + q[1]);
+				ii[0][1] -= m * k[0] * k[1];
+				ii[0][2] -= m * k[0] * k[2];
+				ii[1][2] -= m * k[1] * k[2];
+			}
+		}
+		ii[1][0] = ii[0][1];
+		ii[2][0] = ii[0][2];
+		ii[2][1] = ii[1][2];
+
+		ii = ii.inverse();
+
+		/* Frame	*/
+		c.m_framexform.setIdentity();
+		c.m_framexform.setOrigin(c.m_com);
+		c.m_framerefs.resize(c.m_nodes.size());
+		{
+			int i;
+			for (i = 0; i < c.m_framerefs.size(); ++i)
+			{
+				c.m_framerefs[i] = c.m_nodes[i]->m_x - c.m_com;
+			}
+		}
+	}
+}
+
+//
+void btSoftBody::updateClusters()
+{
+	BT_PROFILE("UpdateClusters");
+	int i;
+
+	for (i = 0; i < m_clusters.size(); ++i)
+	{
+		btSoftBody::Cluster& c = *m_clusters[i];
+		const int n = c.m_nodes.size();
+		//const btScalar			invn=1/(btScalar)n;
+		if (n)
+		{
+			/* Frame				*/
+			const btScalar eps = btScalar(0.0001);
+			btMatrix3x3 m, r, s;
+			m[0] = m[1] = m[2] = btVector3(0, 0, 0);
+			m[0][0] = eps * 1;
+			m[1][1] = eps * 2;
+			m[2][2] = eps * 3;
+			c.m_com = clusterCom(&c);
+			for (int i = 0; i < c.m_nodes.size(); ++i)
+			{
+				const btVector3 a = c.m_nodes[i]->m_x - c.m_com;
+				const btVector3& b = c.m_framerefs[i];
+				m[0] += a[0] * b;
+				m[1] += a[1] * b;
+				m[2] += a[2] * b;
+			}
+			PolarDecompose(m, r, s);
+			c.m_framexform.setOrigin(c.m_com);
+			c.m_framexform.setBasis(r);
+			/* Inertia			*/
+#if 1 /* Constant	*/
+			c.m_invwi = c.m_framexform.getBasis() * c.m_locii * c.m_framexform.getBasis().transpose();
+#else
+#if 0 /* Sphere	*/ 
+			const btScalar	rk=(2*c.m_extents.length2())/(5*c.m_imass);
+			const btVector3	inertia(rk,rk,rk);
+			const btVector3	iin(btFabs(inertia[0])>SIMD_EPSILON?1/inertia[0]:0,
+				btFabs(inertia[1])>SIMD_EPSILON?1/inertia[1]:0,
+				btFabs(inertia[2])>SIMD_EPSILON?1/inertia[2]:0);
+
+			c.m_invwi=c.m_xform.getBasis().scaled(iin)*c.m_xform.getBasis().transpose();
+#else /* Actual	*/
+			c.m_invwi[0] = c.m_invwi[1] = c.m_invwi[2] = btVector3(0, 0, 0);
+			for (int i = 0; i < n; ++i)
+			{
+				const btVector3 k = c.m_nodes[i]->m_x - c.m_com;
+				const btVector3 q = k * k;
+				const btScalar m = 1 / c.m_nodes[i]->m_im;
+				c.m_invwi[0][0] += m * (q[1] + q[2]);
+				c.m_invwi[1][1] += m * (q[0] + q[2]);
+				c.m_invwi[2][2] += m * (q[0] + q[1]);
+				c.m_invwi[0][1] -= m * k[0] * k[1];
+				c.m_invwi[0][2] -= m * k[0] * k[2];
+				c.m_invwi[1][2] -= m * k[1] * k[2];
+			}
+			c.m_invwi[1][0] = c.m_invwi[0][1];
+			c.m_invwi[2][0] = c.m_invwi[0][2];
+			c.m_invwi[2][1] = c.m_invwi[1][2];
+			c.m_invwi = c.m_invwi.inverse();
+#endif
+#endif
+			/* Velocities			*/
+			c.m_lv = btVector3(0, 0, 0);
+			c.m_av = btVector3(0, 0, 0);
+			{
+				int i;
+
+				for (i = 0; i < n; ++i)
+				{
+					const btVector3 v = c.m_nodes[i]->m_v * c.m_masses[i];
+					c.m_lv += v;
+					c.m_av += btCross(c.m_nodes[i]->m_x - c.m_com, v);
+				}
+			}
+			c.m_lv = c.m_imass * c.m_lv * (1 - c.m_ldamping);
+			c.m_av = c.m_invwi * c.m_av * (1 - c.m_adamping);
+			c.m_vimpulses[0] =
+				c.m_vimpulses[1] = btVector3(0, 0, 0);
+			c.m_dimpulses[0] =
+				c.m_dimpulses[1] = btVector3(0, 0, 0);
+			c.m_nvimpulses = 0;
+			c.m_ndimpulses = 0;
+			/* Matching				*/
+			if (c.m_matching > 0)
+			{
+				for (int j = 0; j < c.m_nodes.size(); ++j)
+				{
+					Node& n = *c.m_nodes[j];
+					const btVector3 x = c.m_framexform * c.m_framerefs[j];
+					n.m_x = Lerp(n.m_x, x, c.m_matching);
+				}
+			}
+			/* Dbvt					*/
+			if (c.m_collide)
+			{
+				btVector3 mi = c.m_nodes[0]->m_x;
+				btVector3 mx = mi;
+				for (int j = 1; j < n; ++j)
+				{
+					mi.setMin(c.m_nodes[j]->m_x);
+					mx.setMax(c.m_nodes[j]->m_x);
+				}
+				ATTRIBUTE_ALIGNED16(btDbvtVolume)
+				bounds = btDbvtVolume::FromMM(mi, mx);
+				if (c.m_leaf)
+					m_cdbvt.update(c.m_leaf, bounds, c.m_lv * m_sst.sdt * 3, m_sst.radmrg);
+				else
+					c.m_leaf = m_cdbvt.insert(bounds, &c);
+			}
+		}
+	}
+}
+
+//
+void btSoftBody::cleanupClusters()
+{
+	for (int i = 0; i < m_joints.size(); ++i)
+	{
+		m_joints[i]->Terminate(m_sst.sdt);
+		if (m_joints[i]->m_delete)
+		{
+			btAlignedFree(m_joints[i]);
+			m_joints.remove(m_joints[i--]);
+		}
+	}
+}
+
+//
+void btSoftBody::prepareClusters(int iterations)
+{
+	for (int i = 0; i < m_joints.size(); ++i)
+	{
+		m_joints[i]->Prepare(m_sst.sdt, iterations);
+	}
+}
+
+//
+void btSoftBody::solveClusters(btScalar sor)
+{
+	for (int i = 0, ni = m_joints.size(); i < ni; ++i)
+	{
+		m_joints[i]->Solve(m_sst.sdt, sor);
+	}
+}
+
+//
+void btSoftBody::applyClusters(bool drift)
+{
+	BT_PROFILE("ApplyClusters");
+	//	const btScalar					f0=m_sst.sdt;
+	//const btScalar					f1=f0/2;
+	btAlignedObjectArray<btVector3> deltas;
+	btAlignedObjectArray<btScalar> weights;
+	deltas.resize(m_nodes.size(), btVector3(0, 0, 0));
+	weights.resize(m_nodes.size(), 0);
+	int i;
+
+	if (drift)
+	{
+		for (i = 0; i < m_clusters.size(); ++i)
+		{
+			Cluster& c = *m_clusters[i];
+			if (c.m_ndimpulses)
+			{
+				c.m_dimpulses[0] /= (btScalar)c.m_ndimpulses;
+				c.m_dimpulses[1] /= (btScalar)c.m_ndimpulses;
+			}
+		}
+	}
+
+	for (i = 0; i < m_clusters.size(); ++i)
+	{
+		Cluster& c = *m_clusters[i];
+		if (0 < (drift ? c.m_ndimpulses : c.m_nvimpulses))
+		{
+			const btVector3 v = (drift ? c.m_dimpulses[0] : c.m_vimpulses[0]) * m_sst.sdt;
+			const btVector3 w = (drift ? c.m_dimpulses[1] : c.m_vimpulses[1]) * m_sst.sdt;
+			for (int j = 0; j < c.m_nodes.size(); ++j)
+			{
+				const int idx = int(c.m_nodes[j] - &m_nodes[0]);
+				const btVector3& x = c.m_nodes[j]->m_x;
+				const btScalar q = c.m_masses[j];
+				deltas[idx] += (v + btCross(w, x - c.m_com)) * q;
+				weights[idx] += q;
+			}
+		}
+	}
+	for (i = 0; i < deltas.size(); ++i)
+	{
+		if (weights[i] > 0)
+		{
+			m_nodes[i].m_x += deltas[i] / weights[i];
+		}
+	}
+}
+
+//
+void btSoftBody::dampClusters()
+{
+	int i;
+
+	for (i = 0; i < m_clusters.size(); ++i)
+	{
+		Cluster& c = *m_clusters[i];
+		if (c.m_ndamping > 0)
+		{
+			for (int j = 0; j < c.m_nodes.size(); ++j)
+			{
+				Node& n = *c.m_nodes[j];
+				if (n.m_im > 0)
+				{
+					const btVector3 vx = c.m_lv + btCross(c.m_av, c.m_nodes[j]->m_q - c.m_com);
+					if (vx.length2() <= n.m_v.length2())
+					{
+						n.m_v += c.m_ndamping * (vx - n.m_v);
+					}
+				}
+			}
+		}
+	}
+}
+
+void btSoftBody::setSpringStiffness(btScalar k)
+{
+	for (int i = 0; i < m_links.size(); ++i)
+	{
+		m_links[i].Feature::m_material->m_kLST = k;
+	}
+	m_repulsionStiffness = k;
+}
+
+void btSoftBody::setGravityFactor(btScalar gravFactor)
+{
+	m_gravityFactor = gravFactor;
+}
+
+void btSoftBody::setCacheBarycenter(bool cacheBarycenter)
+{
+	m_cacheBarycenter = cacheBarycenter;
+}
+
+void btSoftBody::initializeDmInverse()
+{
+	btScalar unit_simplex_measure = 1. / 6.;
+
+	for (int i = 0; i < m_tetras.size(); ++i)
+	{
+		Tetra& t = m_tetras[i];
+		btVector3 c1 = t.m_n[1]->m_x - t.m_n[0]->m_x;
+		btVector3 c2 = t.m_n[2]->m_x - t.m_n[0]->m_x;
+		btVector3 c3 = t.m_n[3]->m_x - t.m_n[0]->m_x;
+		btMatrix3x3 Dm(c1.getX(), c2.getX(), c3.getX(),
+					   c1.getY(), c2.getY(), c3.getY(),
+					   c1.getZ(), c2.getZ(), c3.getZ());
+		t.m_element_measure = Dm.determinant() * unit_simplex_measure;
+		t.m_Dm_inverse = Dm.inverse();
+
+		// calculate the first three columns of P^{-1}
+		btVector3 a = t.m_n[0]->m_x;
+		btVector3 b = t.m_n[1]->m_x;
+		btVector3 c = t.m_n[2]->m_x;
+		btVector3 d = t.m_n[3]->m_x;
+
+		btScalar det = 1 / (a[0] * b[1] * c[2] - a[0] * b[1] * d[2] - a[0] * b[2] * c[1] + a[0] * b[2] * d[1] + a[0] * c[1] * d[2] - a[0] * c[2] * d[1] + a[1] * (-b[0] * c[2] + b[0] * d[2] + b[2] * c[0] - b[2] * d[0] - c[0] * d[2] + c[2] * d[0]) + a[2] * (b[0] * c[1] - b[0] * d[1] + b[1] * (d[0] - c[0]) + c[0] * d[1] - c[1] * d[0]) - b[0] * c[1] * d[2] + b[0] * c[2] * d[1] + b[1] * c[0] * d[2] - b[1] * c[2] * d[0] - b[2] * c[0] * d[1] + b[2] * c[1] * d[0]);
+
+		btScalar P11 = -b[2] * c[1] + d[2] * c[1] + b[1] * c[2] + b[2] * d[1] - c[2] * d[1] - b[1] * d[2];
+		btScalar P12 = b[2] * c[0] - d[2] * c[0] - b[0] * c[2] - b[2] * d[0] + c[2] * d[0] + b[0] * d[2];
+		btScalar P13 = -b[1] * c[0] + d[1] * c[0] + b[0] * c[1] + b[1] * d[0] - c[1] * d[0] - b[0] * d[1];
+		btScalar P21 = a[2] * c[1] - d[2] * c[1] - a[1] * c[2] - a[2] * d[1] + c[2] * d[1] + a[1] * d[2];
+		btScalar P22 = -a[2] * c[0] + d[2] * c[0] + a[0] * c[2] + a[2] * d[0] - c[2] * d[0] - a[0] * d[2];
+		btScalar P23 = a[1] * c[0] - d[1] * c[0] - a[0] * c[1] - a[1] * d[0] + c[1] * d[0] + a[0] * d[1];
+		btScalar P31 = -a[2] * b[1] + d[2] * b[1] + a[1] * b[2] + a[2] * d[1] - b[2] * d[1] - a[1] * d[2];
+		btScalar P32 = a[2] * b[0] - d[2] * b[0] - a[0] * b[2] - a[2] * d[0] + b[2] * d[0] + a[0] * d[2];
+		btScalar P33 = -a[1] * b[0] + d[1] * b[0] + a[0] * b[1] + a[1] * d[0] - b[1] * d[0] - a[0] * d[1];
+		btScalar P41 = a[2] * b[1] - c[2] * b[1] - a[1] * b[2] - a[2] * c[1] + b[2] * c[1] + a[1] * c[2];
+		btScalar P42 = -a[2] * b[0] + c[2] * b[0] + a[0] * b[2] + a[2] * c[0] - b[2] * c[0] - a[0] * c[2];
+		btScalar P43 = a[1] * b[0] - c[1] * b[0] - a[0] * b[1] - a[1] * c[0] + b[1] * c[0] + a[0] * c[1];
+
+		btVector4 p1(P11 * det, P21 * det, P31 * det, P41 * det);
+		btVector4 p2(P12 * det, P22 * det, P32 * det, P42 * det);
+		btVector4 p3(P13 * det, P23 * det, P33 * det, P43 * det);
+
+		t.m_P_inv[0] = p1;
+		t.m_P_inv[1] = p2;
+		t.m_P_inv[2] = p3;
+	}
+}
+
+static btScalar Dot4(const btVector4& a, const btVector4& b)
+{
+	return a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + a[3] * b[3];
+}
+
+void btSoftBody::updateDeformation()
+{
+	btQuaternion q;
+	for (int i = 0; i < m_tetras.size(); ++i)
+	{
+		btSoftBody::Tetra& t = m_tetras[i];
+		btVector3 c1 = t.m_n[1]->m_q - t.m_n[0]->m_q;
+		btVector3 c2 = t.m_n[2]->m_q - t.m_n[0]->m_q;
+		btVector3 c3 = t.m_n[3]->m_q - t.m_n[0]->m_q;
+		btMatrix3x3 Ds(c1.getX(), c2.getX(), c3.getX(),
+					   c1.getY(), c2.getY(), c3.getY(),
+					   c1.getZ(), c2.getZ(), c3.getZ());
+		t.m_F = Ds * t.m_Dm_inverse;
+
+		btSoftBody::TetraScratch& s = m_tetraScratches[i];
+		s.m_F = t.m_F;
+		s.m_J = t.m_F.determinant();
+		btMatrix3x3 C = t.m_F.transpose() * t.m_F;
+		s.m_trace = C[0].getX() + C[1].getY() + C[2].getZ();
+		s.m_cofF = t.m_F.adjoint().transpose();
+
+		btVector3 a = t.m_n[0]->m_q;
+		btVector3 b = t.m_n[1]->m_q;
+		btVector3 c = t.m_n[2]->m_q;
+		btVector3 d = t.m_n[3]->m_q;
+		btVector4 q1(a[0], b[0], c[0], d[0]);
+		btVector4 q2(a[1], b[1], c[1], d[1]);
+		btVector4 q3(a[2], b[2], c[2], d[2]);
+		btMatrix3x3 B(Dot4(q1, t.m_P_inv[0]), Dot4(q1, t.m_P_inv[1]), Dot4(q1, t.m_P_inv[2]),
+					  Dot4(q2, t.m_P_inv[0]), Dot4(q2, t.m_P_inv[1]), Dot4(q2, t.m_P_inv[2]),
+					  Dot4(q3, t.m_P_inv[0]), Dot4(q3, t.m_P_inv[1]), Dot4(q3, t.m_P_inv[2]));
+		q.setRotation(btVector3(0, 0, 1), 0);
+		B.extractRotation(q, 0.01);  // precision of the rotation is not very important for visual correctness.
+		btMatrix3x3 Q(q);
+		s.m_corotation = Q;
+	}
+}
+
+void btSoftBody::advanceDeformation()
+{
+	updateDeformation();
+	for (int i = 0; i < m_tetras.size(); ++i)
+	{
+		m_tetraScratchesTn[i] = m_tetraScratches[i];
+	}
+}
+//
+void btSoftBody::Joint::Prepare(btScalar dt, int)
+{
+	m_bodies[0].activate();
+	m_bodies[1].activate();
+}
+
+//
+void btSoftBody::LJoint::Prepare(btScalar dt, int iterations)
+{
+	static const btScalar maxdrift = 4;
+	Joint::Prepare(dt, iterations);
+	m_rpos[0] = m_bodies[0].xform() * m_refs[0];
+	m_rpos[1] = m_bodies[1].xform() * m_refs[1];
+	m_drift = Clamp(m_rpos[0] - m_rpos[1], maxdrift) * m_erp / dt;
+	m_rpos[0] -= m_bodies[0].xform().getOrigin();
+	m_rpos[1] -= m_bodies[1].xform().getOrigin();
+	m_massmatrix = ImpulseMatrix(m_bodies[0].invMass(), m_bodies[0].invWorldInertia(), m_rpos[0],
+								 m_bodies[1].invMass(), m_bodies[1].invWorldInertia(), m_rpos[1]);
+	if (m_split > 0)
+	{
+		m_sdrift = m_massmatrix * (m_drift * m_split);
+		m_drift *= 1 - m_split;
+	}
+	m_drift /= (btScalar)iterations;
+}
+
+//
+void btSoftBody::LJoint::Solve(btScalar dt, btScalar sor)
+{
+	const btVector3 va = m_bodies[0].velocity(m_rpos[0]);
+	const btVector3 vb = m_bodies[1].velocity(m_rpos[1]);
+	const btVector3 vr = va - vb;
+	btSoftBody::Impulse impulse;
+	impulse.m_asVelocity = 1;
+	impulse.m_velocity = m_massmatrix * (m_drift + vr * m_cfm) * sor;
+	m_bodies[0].applyImpulse(-impulse, m_rpos[0]);
+	m_bodies[1].applyImpulse(impulse, m_rpos[1]);
+}
+
+//
+void btSoftBody::LJoint::Terminate(btScalar dt)
+{
+	if (m_split > 0)
+	{
+		m_bodies[0].applyDImpulse(-m_sdrift, m_rpos[0]);
+		m_bodies[1].applyDImpulse(m_sdrift, m_rpos[1]);
+	}
+}
+
+//
+void btSoftBody::AJoint::Prepare(btScalar dt, int iterations)
+{
+	static const btScalar maxdrift = SIMD_PI / 16;
+	m_icontrol->Prepare(this);
+	Joint::Prepare(dt, iterations);
+	m_axis[0] = m_bodies[0].xform().getBasis() * m_refs[0];
+	m_axis[1] = m_bodies[1].xform().getBasis() * m_refs[1];
+	m_drift = NormalizeAny(btCross(m_axis[1], m_axis[0]));
+	m_drift *= btMin(maxdrift, btAcos(Clamp<btScalar>(btDot(m_axis[0], m_axis[1]), -1, +1)));
+	m_drift *= m_erp / dt;
+	m_massmatrix = AngularImpulseMatrix(m_bodies[0].invWorldInertia(), m_bodies[1].invWorldInertia());
+	if (m_split > 0)
+	{
+		m_sdrift = m_massmatrix * (m_drift * m_split);
+		m_drift *= 1 - m_split;
+	}
+	m_drift /= (btScalar)iterations;
+}
+
+//
+void btSoftBody::AJoint::Solve(btScalar dt, btScalar sor)
+{
+	const btVector3 va = m_bodies[0].angularVelocity();
+	const btVector3 vb = m_bodies[1].angularVelocity();
+	const btVector3 vr = va - vb;
+	const btScalar sp = btDot(vr, m_axis[0]);
+	const btVector3 vc = vr - m_axis[0] * m_icontrol->Speed(this, sp);
+	btSoftBody::Impulse impulse;
+	impulse.m_asVelocity = 1;
+	impulse.m_velocity = m_massmatrix * (m_drift + vc * m_cfm) * sor;
+	m_bodies[0].applyAImpulse(-impulse);
+	m_bodies[1].applyAImpulse(impulse);
+}
+
+//
+void btSoftBody::AJoint::Terminate(btScalar dt)
+{
+	if (m_split > 0)
+	{
+		m_bodies[0].applyDAImpulse(-m_sdrift);
+		m_bodies[1].applyDAImpulse(m_sdrift);
+	}
+}
+
+//
+void btSoftBody::CJoint::Prepare(btScalar dt, int iterations)
+{
+	Joint::Prepare(dt, iterations);
+	const bool dodrift = (m_life == 0);
+	m_delete = (++m_life) > m_maxlife;
+	if (dodrift)
+	{
+		m_drift = m_drift * m_erp / dt;
+		if (m_split > 0)
+		{
+			m_sdrift = m_massmatrix * (m_drift * m_split);
+			m_drift *= 1 - m_split;
+		}
+		m_drift /= (btScalar)iterations;
+	}
+	else
+	{
+		m_drift = m_sdrift = btVector3(0, 0, 0);
+	}
+}
+
+//
+void btSoftBody::CJoint::Solve(btScalar dt, btScalar sor)
+{
+	const btVector3 va = m_bodies[0].velocity(m_rpos[0]);
+	const btVector3 vb = m_bodies[1].velocity(m_rpos[1]);
+	const btVector3 vrel = va - vb;
+	const btScalar rvac = btDot(vrel, m_normal);
+	btSoftBody::Impulse impulse;
+	impulse.m_asVelocity = 1;
+	impulse.m_velocity = m_drift;
+	if (rvac < 0)
+	{
+		const btVector3 iv = m_normal * rvac;
+		const btVector3 fv = vrel - iv;
+		impulse.m_velocity += iv + fv * m_friction;
+	}
+	impulse.m_velocity = m_massmatrix * impulse.m_velocity * sor;
+
+	if (m_bodies[0].m_soft == m_bodies[1].m_soft)
+	{
+		if ((impulse.m_velocity.getX() == impulse.m_velocity.getX()) && (impulse.m_velocity.getY() == impulse.m_velocity.getY()) &&
+			(impulse.m_velocity.getZ() == impulse.m_velocity.getZ()))
+		{
+			if (impulse.m_asVelocity)
+			{
+				if (impulse.m_velocity.length() < m_bodies[0].m_soft->m_maxSelfCollisionImpulse)
+				{
+				}
+				else
+				{
+					m_bodies[0].applyImpulse(-impulse * m_bodies[0].m_soft->m_selfCollisionImpulseFactor, m_rpos[0]);
+					m_bodies[1].applyImpulse(impulse * m_bodies[0].m_soft->m_selfCollisionImpulseFactor, m_rpos[1]);
+				}
+			}
+		}
+	}
+	else
+	{
+		m_bodies[0].applyImpulse(-impulse, m_rpos[0]);
+		m_bodies[1].applyImpulse(impulse, m_rpos[1]);
+	}
+}
+
+//
+void btSoftBody::CJoint::Terminate(btScalar dt)
+{
+	if (m_split > 0)
+	{
+		m_bodies[0].applyDImpulse(-m_sdrift, m_rpos[0]);
+		m_bodies[1].applyDImpulse(m_sdrift, m_rpos[1]);
+	}
+}
+
+//
+void btSoftBody::applyForces()
+{
+	BT_PROFILE("SoftBody applyForces");
+	//	const btScalar					dt =			m_sst.sdt;
+	const btScalar kLF = m_cfg.kLF;
+	const btScalar kDG = m_cfg.kDG;
+	const btScalar kPR = m_cfg.kPR;
+	const btScalar kVC = m_cfg.kVC;
+	const bool as_lift = kLF > 0;
+	const bool as_drag = kDG > 0;
+	const bool as_pressure = kPR != 0;
+	const bool as_volume = kVC > 0;
+	const bool as_aero = as_lift ||
+						 as_drag;
+	//const bool						as_vaero =		as_aero	&&
+	//												(m_cfg.aeromodel < btSoftBody::eAeroModel::F_TwoSided);
+	//const bool						as_faero =		as_aero	&&
+	//												(m_cfg.aeromodel >= btSoftBody::eAeroModel::F_TwoSided);
+	const bool use_medium = as_aero;
+	const bool use_volume = as_pressure ||
+							as_volume;
+	btScalar volume = 0;
+	btScalar ivolumetp = 0;
+	btScalar dvolumetv = 0;
+	btSoftBody::sMedium medium;
+	if (use_volume)
+	{
+		volume = getVolume();
+		ivolumetp = 1 / btFabs(volume) * kPR;
+		dvolumetv = (m_pose.m_volume - volume) * kVC;
+	}
+	/* Per vertex forces			*/
+	int i, ni;
+
+	for (i = 0, ni = m_nodes.size(); i < ni; ++i)
+	{
+		btSoftBody::Node& n = m_nodes[i];
+		if (n.m_im > 0)
+		{
+			if (use_medium)
+			{
+				/* Aerodynamics			*/
+				addAeroForceToNode(m_windVelocity, i);
+			}
+			/* Pressure				*/
+			if (as_pressure)
+			{
+				n.m_f += n.m_n * (n.m_area * ivolumetp);
+			}
+			/* Volume				*/
+			if (as_volume)
+			{
+				n.m_f += n.m_n * (n.m_area * dvolumetv);
+			}
+		}
+	}
+
+	/* Per face forces				*/
+	for (i = 0, ni = m_faces.size(); i < ni; ++i)
+	{
+		//	btSoftBody::Face&	f=m_faces[i];
+
+		/* Aerodynamics			*/
+		addAeroForceToFace(m_windVelocity, i);
+	}
+}
+
+//
+void btSoftBody::setMaxStress(btScalar maxStress)
+{
+	m_cfg.m_maxStress = maxStress;
+}
+
+//
+void btSoftBody::interpolateRenderMesh()
+{
+	if (m_z.size() > 0)
+	{
+		for (int i = 0; i < m_renderNodes.size(); ++i)
+		{
+			const Node* p0 = m_renderNodesParents[i][0];
+			const Node* p1 = m_renderNodesParents[i][1];
+			const Node* p2 = m_renderNodesParents[i][2];
+			btVector3 normal = btCross(p1->m_x - p0->m_x, p2->m_x - p0->m_x);
+			btVector3 unit_normal = normal.normalized();
+			RenderNode& n = m_renderNodes[i];
+			n.m_x.setZero();
+			for (int j = 0; j < 3; ++j)
+			{
+				n.m_x += m_renderNodesParents[i][j]->m_x * m_renderNodesInterpolationWeights[i][j];
+			}
+			n.m_x += m_z[i] * unit_normal;
+		}
+	}
+	else
+	{
+		for (int i = 0; i < m_renderNodes.size(); ++i)
+		{
+			RenderNode& n = m_renderNodes[i];
+			n.m_x.setZero();
+			for (int j = 0; j < 4; ++j)
+			{
+				if (m_renderNodesParents[i].size())
+				{
+					n.m_x += m_renderNodesParents[i][j]->m_x * m_renderNodesInterpolationWeights[i][j];
+				}
+			}
+		}
+	}
+}
+
+void btSoftBody::setCollisionQuadrature(int N)
+{
+	for (int i = 0; i <= N; ++i)
+	{
+		for (int j = 0; i + j <= N; ++j)
+		{
+			m_quads.push_back(btVector3(btScalar(i) / btScalar(N), btScalar(j) / btScalar(N), btScalar(N - i - j) / btScalar(N)));
+		}
+	}
+}
+
+//
+void btSoftBody::PSolve_Anchors(btSoftBody* psb, btScalar kst, btScalar ti)
+{
+	BT_PROFILE("PSolve_Anchors");
+	const btScalar kAHR = psb->m_cfg.kAHR * kst;
+	const btScalar dt = psb->m_sst.sdt;
+	for (int i = 0, ni = psb->m_anchors.size(); i < ni; ++i)
+	{
+		const Anchor& a = psb->m_anchors[i];
+		const btTransform& t = a.m_body->getWorldTransform();
+		Node& n = *a.m_node;
+		const btVector3 wa = t * a.m_local;
+		const btVector3 va = a.m_body->getVelocityInLocalPoint(a.m_c1) * dt;
+		const btVector3 vb = n.m_x - n.m_q;
+		const btVector3 vr = (va - vb) + (wa - n.m_x) * kAHR;
+		const btVector3 impulse = a.m_c0 * vr * a.m_influence;
+		n.m_x += impulse * a.m_c2;
+		a.m_body->applyImpulse(-impulse, a.m_c1);
+	}
+}
+
+//
+void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti)
+{
+	BT_PROFILE("PSolve_RContacts");
+	const btScalar dt = psb->m_sst.sdt;
+	const btScalar mrg = psb->getCollisionShape()->getMargin();
+	btMultiBodyJacobianData jacobianData;
+	for (int i = 0, ni = psb->m_rcontacts.size(); i < ni; ++i)
+	{
+		const RContact& c = psb->m_rcontacts[i];
+		const sCti& cti = c.m_cti;
+		if (cti.m_colObj->hasContactResponse())
+		{
+			btVector3 va(0, 0, 0);
+			btRigidBody* rigidCol = 0;
+			btMultiBodyLinkCollider* multibodyLinkCol = 0;
+			btScalar* deltaV = NULL;
+
+			if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+			{
+				rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
+				va = rigidCol ? rigidCol->getVelocityInLocalPoint(c.m_c1) * dt : btVector3(0, 0, 0);
+			}
+			else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+			{
+				multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+				if (multibodyLinkCol)
+				{
+					const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+					jacobianData.m_jacobians.resize(ndof);
+					jacobianData.m_deltaVelocitiesUnitImpulse.resize(ndof);
+					btScalar* jac = &jacobianData.m_jacobians[0];
+
+					multibodyLinkCol->m_multiBody->fillContactJacobianMultiDof(multibodyLinkCol->m_link, c.m_node->m_x, cti.m_normal, jac, jacobianData.scratch_r, jacobianData.scratch_v, jacobianData.scratch_m);
+					deltaV = &jacobianData.m_deltaVelocitiesUnitImpulse[0];
+					multibodyLinkCol->m_multiBody->calcAccelerationDeltasMultiDof(&jacobianData.m_jacobians[0], deltaV, jacobianData.scratch_r, jacobianData.scratch_v);
+
+					btScalar vel = 0.0;
+					for (int j = 0; j < ndof; ++j)
+					{
+						vel += multibodyLinkCol->m_multiBody->getVelocityVector()[j] * jac[j];
+					}
+					va = cti.m_normal * vel * dt;
+				}
+			}
+
+			const btVector3 vb = c.m_node->m_x - c.m_node->m_q;
+			const btVector3 vr = vb - va;
+			const btScalar dn = btDot(vr, cti.m_normal);
+			if (dn <= SIMD_EPSILON)
+			{
+				const btScalar dp = btMin((btDot(c.m_node->m_x, cti.m_normal) + cti.m_offset), mrg);
+				const btVector3 fv = vr - (cti.m_normal * dn);
+				// c0 is the impulse matrix, c3 is 1 - the friction coefficient or 0, c4 is the contact hardness coefficient
+				const btVector3 impulse = c.m_c0 * ((vr - (fv * c.m_c3) + (cti.m_normal * (dp * c.m_c4))) * kst);
+				c.m_node->m_x -= impulse * c.m_c2;
+
+				if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+				{
+					if (rigidCol)
+						rigidCol->applyImpulse(impulse, c.m_c1);
+				}
+				else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+				{
+					if (multibodyLinkCol)
+					{
+						double multiplier = 0.5;
+						multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof(deltaV, -impulse.length() * multiplier);
+					}
+				}
+			}
+		}
+	}
+}
+
+//
+void btSoftBody::PSolve_SContacts(btSoftBody* psb, btScalar, btScalar ti)
+{
+	BT_PROFILE("PSolve_SContacts");
+
+	for (int i = 0, ni = psb->m_scontacts.size(); i < ni; ++i)
+	{
+		const SContact& c = psb->m_scontacts[i];
+		const btVector3& nr = c.m_normal;
+		Node& n = *c.m_node;
+		Face& f = *c.m_face;
+		const btVector3 p = BaryEval(f.m_n[0]->m_x,
+									 f.m_n[1]->m_x,
+									 f.m_n[2]->m_x,
+									 c.m_weights);
+		const btVector3 q = BaryEval(f.m_n[0]->m_q,
+									 f.m_n[1]->m_q,
+									 f.m_n[2]->m_q,
+									 c.m_weights);
+		const btVector3 vr = (n.m_x - n.m_q) - (p - q);
+		btVector3 corr(0, 0, 0);
+		btScalar dot = btDot(vr, nr);
+		if (dot < 0)
+		{
+			const btScalar j = c.m_margin - (btDot(nr, n.m_x) - btDot(nr, p));
+			corr += c.m_normal * j;
+		}
+		corr -= ProjectOnPlane(vr, nr) * c.m_friction;
+		n.m_x += corr * c.m_cfm[0];
+		f.m_n[0]->m_x -= corr * (c.m_cfm[1] * c.m_weights.x());
+		f.m_n[1]->m_x -= corr * (c.m_cfm[1] * c.m_weights.y());
+		f.m_n[2]->m_x -= corr * (c.m_cfm[1] * c.m_weights.z());
+	}
+}
+
+//
+void btSoftBody::PSolve_Links(btSoftBody* psb, btScalar kst, btScalar ti)
+{
+	BT_PROFILE("PSolve_Links");
+	for (int i = 0, ni = psb->m_links.size(); i < ni; ++i)
+	{
+		Link& l = psb->m_links[i];
+		if (l.m_c0 > 0)
+		{
+			Node& a = *l.m_n[0];
+			Node& b = *l.m_n[1];
+			const btVector3 del = b.m_x - a.m_x;
+			const btScalar len = del.length2();
+			if (l.m_c1 + len > SIMD_EPSILON)
+			{
+				const btScalar k = ((l.m_c1 - len) / (l.m_c0 * (l.m_c1 + len))) * kst;
+				a.m_x -= del * (k * a.m_im);
+				b.m_x += del * (k * b.m_im);
+			}
+		}
+	}
+}
+
+//
+void btSoftBody::VSolve_Links(btSoftBody* psb, btScalar kst)
+{
+	BT_PROFILE("VSolve_Links");
+	for (int i = 0, ni = psb->m_links.size(); i < ni; ++i)
+	{
+		Link& l = psb->m_links[i];
+		Node** n = l.m_n;
+		const btScalar j = -btDot(l.m_c3, n[0]->m_v - n[1]->m_v) * l.m_c2 * kst;
+		n[0]->m_v += l.m_c3 * (j * n[0]->m_im);
+		n[1]->m_v -= l.m_c3 * (j * n[1]->m_im);
+	}
+}
+
+//
+btSoftBody::psolver_t btSoftBody::getSolver(ePSolver::_ solver)
+{
+	switch (solver)
+	{
+		case ePSolver::Anchors:
+			return (&btSoftBody::PSolve_Anchors);
+		case ePSolver::Linear:
+			return (&btSoftBody::PSolve_Links);
+		case ePSolver::RContacts:
+			return (&btSoftBody::PSolve_RContacts);
+		case ePSolver::SContacts:
+			return (&btSoftBody::PSolve_SContacts);
+		default:
+		{
+		}
+	}
+	return (0);
+}
+
+//
+btSoftBody::vsolver_t btSoftBody::getSolver(eVSolver::_ solver)
+{
+	switch (solver)
+	{
+		case eVSolver::Linear:
+			return (&btSoftBody::VSolve_Links);
+		default:
+		{
+		}
+	}
+	return (0);
+}
+
+void btSoftBody::setSelfCollision(bool useSelfCollision)
+{
+	m_useSelfCollision = useSelfCollision;
+}
+
+bool btSoftBody::useSelfCollision()
+{
+	return m_useSelfCollision;
+}
+
+//
+void btSoftBody::defaultCollisionHandler(const btCollisionObjectWrapper* pcoWrap)
+{
+	switch (m_cfg.collisions & fCollision::RVSmask)
+	{
+		case fCollision::SDF_RS:
+		{
+			btSoftColliders::CollideSDF_RS docollide;
+			btRigidBody* prb1 = (btRigidBody*)btRigidBody::upcast(pcoWrap->getCollisionObject());
+			btTransform wtr = pcoWrap->getWorldTransform();
+
+			const btTransform ctr = pcoWrap->getWorldTransform();
+			const btScalar timemargin = (wtr.getOrigin() - ctr.getOrigin()).length();
+			const btScalar basemargin = getCollisionShape()->getMargin();
+			btVector3 mins;
+			btVector3 maxs;
+			ATTRIBUTE_ALIGNED16(btDbvtVolume)
+			volume;
+			pcoWrap->getCollisionShape()->getAabb(pcoWrap->getWorldTransform(),
+												  mins,
+												  maxs);
+			volume = btDbvtVolume::FromMM(mins, maxs);
+			volume.Expand(btVector3(basemargin, basemargin, basemargin));
+			docollide.psb = this;
+			docollide.m_colObj1Wrap = pcoWrap;
+			docollide.m_rigidBody = prb1;
+
+			docollide.dynmargin = basemargin + timemargin;
+			docollide.stamargin = basemargin;
+			m_ndbvt.collideTV(m_ndbvt.m_root, volume, docollide);
+		}
+		break;
+		case fCollision::CL_RS:
+		{
+			btSoftColliders::CollideCL_RS collider;
+			collider.ProcessColObj(this, pcoWrap);
+		}
+		break;
+		case fCollision::SDF_RD:
+		{
+			btRigidBody* prb1 = (btRigidBody*)btRigidBody::upcast(pcoWrap->getCollisionObject());
+			if (this->isActive())
+			{
+				const btTransform wtr = pcoWrap->getWorldTransform();
+				const btScalar timemargin = 0;
+				const btScalar basemargin = getCollisionShape()->getMargin();
+				btVector3 mins;
+				btVector3 maxs;
+				ATTRIBUTE_ALIGNED16(btDbvtVolume)
+				volume;
+				pcoWrap->getCollisionShape()->getAabb(wtr,
+													  mins,
+													  maxs);
+				volume = btDbvtVolume::FromMM(mins, maxs);
+				volume.Expand(btVector3(basemargin, basemargin, basemargin));
+				if (m_cfg.collisions & fCollision::SDF_RDN)
+				{
+					btSoftColliders::CollideSDF_RD docollideNode;
+					docollideNode.psb = this;
+					docollideNode.m_colObj1Wrap = pcoWrap;
+					docollideNode.m_rigidBody = prb1;
+					docollideNode.dynmargin = basemargin + timemargin;
+					docollideNode.stamargin = basemargin;
+					m_ndbvt.collideTV(m_ndbvt.m_root, volume, docollideNode);
+				}
+
+				if (((pcoWrap->getCollisionObject()->getInternalType() == CO_RIGID_BODY) && (m_cfg.collisions & fCollision::SDF_RDF)) || ((pcoWrap->getCollisionObject()->getInternalType() == CO_FEATHERSTONE_LINK) && (m_cfg.collisions & fCollision::SDF_MDF)))
+				{
+					btSoftColliders::CollideSDF_RDF docollideFace;
+					docollideFace.psb = this;
+					docollideFace.m_colObj1Wrap = pcoWrap;
+					docollideFace.m_rigidBody = prb1;
+					docollideFace.dynmargin = basemargin + timemargin;
+					docollideFace.stamargin = basemargin;
+					m_fdbvt.collideTV(m_fdbvt.m_root, volume, docollideFace);
+				}
+			}
+		}
+		break;
+	}
+}
+
+//
+void btSoftBody::defaultCollisionHandler(btSoftBody* psb)
+{
+	BT_PROFILE("Deformable Collision");
+	const int cf = m_cfg.collisions & psb->m_cfg.collisions;
+	switch (cf & fCollision::SVSmask)
+	{
+		case fCollision::CL_SS:
+		{
+			//support self-collision if CL_SELF flag set
+			if (this != psb || psb->m_cfg.collisions & fCollision::CL_SELF)
+			{
+				btSoftColliders::CollideCL_SS docollide;
+				docollide.ProcessSoftSoft(this, psb);
+			}
+		}
+		break;
+		case fCollision::VF_SS:
+		{
+			//only self-collision for Cluster, not Vertex-Face yet
+			if (this != psb)
+			{
+				btSoftColliders::CollideVF_SS docollide;
+				/* common					*/
+				docollide.mrg = getCollisionShape()->getMargin() +
+								psb->getCollisionShape()->getMargin();
+				/* psb0 nodes vs psb1 faces	*/
+				docollide.psb[0] = this;
+				docollide.psb[1] = psb;
+				docollide.psb[0]->m_ndbvt.collideTT(docollide.psb[0]->m_ndbvt.m_root,
+													docollide.psb[1]->m_fdbvt.m_root,
+													docollide);
+				/* psb1 nodes vs psb0 faces	*/
+				docollide.psb[0] = psb;
+				docollide.psb[1] = this;
+				docollide.psb[0]->m_ndbvt.collideTT(docollide.psb[0]->m_ndbvt.m_root,
+													docollide.psb[1]->m_fdbvt.m_root,
+													docollide);
+			}
+		}
+		break;
+		case fCollision::VF_DD:
+		{
+			if (!psb->m_softSoftCollision)
+				return;
+			if (psb->isActive() || this->isActive())
+			{
+				if (this != psb)
+				{
+					btSoftColliders::CollideVF_DD docollide;
+					/* common                    */
+					docollide.mrg = getCollisionShape()->getMargin() +
+									psb->getCollisionShape()->getMargin();
+					/* psb0 nodes vs psb1 faces    */
+					if (psb->m_tetras.size() > 0)
+						docollide.useFaceNormal = true;
+					else
+						docollide.useFaceNormal = false;
+					docollide.psb[0] = this;
+					docollide.psb[1] = psb;
+					docollide.psb[0]->m_ndbvt.collideTT(docollide.psb[0]->m_ndbvt.m_root,
+														docollide.psb[1]->m_fdbvt.m_root,
+														docollide);
+
+					/* psb1 nodes vs psb0 faces    */
+					if (this->m_tetras.size() > 0)
+						docollide.useFaceNormal = true;
+					else
+						docollide.useFaceNormal = false;
+					docollide.psb[0] = psb;
+					docollide.psb[1] = this;
+					docollide.psb[0]->m_ndbvt.collideTT(docollide.psb[0]->m_ndbvt.m_root,
+														docollide.psb[1]->m_fdbvt.m_root,
+														docollide);
+				}
+				else
+				{
+					if (psb->useSelfCollision())
+					{
+						btSoftColliders::CollideFF_DD docollide;
+						docollide.mrg = 2 * getCollisionShape()->getMargin();
+						docollide.psb[0] = this;
+						docollide.psb[1] = psb;
+						if (this->m_tetras.size() > 0)
+							docollide.useFaceNormal = true;
+						else
+							docollide.useFaceNormal = false;
+						/* psb0 faces vs psb0 faces    */
+						calculateNormalCone(this->m_fdbvnt);
+						this->m_fdbvt.selfCollideT(m_fdbvnt, docollide);
+					}
+				}
+			}
+		}
+		break;
+		default:
+		{
+		}
+	}
+}
+
+void btSoftBody::geometricCollisionHandler(btSoftBody* psb)
+{
+	if (psb->isActive() || this->isActive())
+	{
+		if (this != psb)
+		{
+			btSoftColliders::CollideCCD docollide;
+			/* common                    */
+			docollide.mrg = SAFE_EPSILON;  // for rounding error instead of actual margin
+			docollide.dt = psb->m_sst.sdt;
+			/* psb0 nodes vs psb1 faces    */
+			if (psb->m_tetras.size() > 0)
+				docollide.useFaceNormal = true;
+			else
+				docollide.useFaceNormal = false;
+			docollide.psb[0] = this;
+			docollide.psb[1] = psb;
+			docollide.psb[0]->m_ndbvt.collideTT(docollide.psb[0]->m_ndbvt.m_root,
+												docollide.psb[1]->m_fdbvt.m_root,
+												docollide);
+			/* psb1 nodes vs psb0 faces    */
+			if (this->m_tetras.size() > 0)
+				docollide.useFaceNormal = true;
+			else
+				docollide.useFaceNormal = false;
+			docollide.psb[0] = psb;
+			docollide.psb[1] = this;
+			docollide.psb[0]->m_ndbvt.collideTT(docollide.psb[0]->m_ndbvt.m_root,
+												docollide.psb[1]->m_fdbvt.m_root,
+												docollide);
+		}
+		else
+		{
+			if (psb->useSelfCollision())
+			{
+				btSoftColliders::CollideCCD docollide;
+				docollide.mrg = SAFE_EPSILON;
+				docollide.psb[0] = this;
+				docollide.psb[1] = psb;
+				docollide.dt = psb->m_sst.sdt;
+				if (this->m_tetras.size() > 0)
+					docollide.useFaceNormal = true;
+				else
+					docollide.useFaceNormal = false;
+				/* psb0 faces vs psb0 faces    */
+				calculateNormalCone(this->m_fdbvnt);  // should compute this outside of this scope
+				this->m_fdbvt.selfCollideT(m_fdbvnt, docollide);
+			}
+		}
+	}
+}
+
+void btSoftBody::setWindVelocity(const btVector3& velocity)
+{
+	m_windVelocity = velocity;
+}
+
+const btVector3& btSoftBody::getWindVelocity()
+{
+	return m_windVelocity;
+}
+
+int btSoftBody::calculateSerializeBufferSize() const
+{
+	int sz = sizeof(btSoftBodyData);
+	return sz;
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char* btSoftBody::serialize(void* dataBuffer, class btSerializer* serializer) const
+{
+	btSoftBodyData* sbd = (btSoftBodyData*)dataBuffer;
+
+	btCollisionObject::serialize(&sbd->m_collisionObjectData, serializer);
+
+	btHashMap<btHashPtr, int> m_nodeIndexMap;
+
+	sbd->m_numMaterials = m_materials.size();
+	sbd->m_materials = sbd->m_numMaterials ? (SoftBodyMaterialData**)serializer->getUniquePointer((void*)&m_materials) : 0;
+
+	if (sbd->m_materials)
+	{
+		int sz = sizeof(SoftBodyMaterialData*);
+		int numElem = sbd->m_numMaterials;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		//SoftBodyMaterialData** memPtr = chunk->m_oldPtr;
+		SoftBodyMaterialData** memPtr = (SoftBodyMaterialData**)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			btSoftBody::Material* mat = m_materials[i];
+			*memPtr = mat ? (SoftBodyMaterialData*)serializer->getUniquePointer((void*)mat) : 0;
+			if (!serializer->findPointer(mat))
+			{
+				//serialize it here
+				btChunk* chunk = serializer->allocate(sizeof(SoftBodyMaterialData), 1);
+				SoftBodyMaterialData* memPtr = (SoftBodyMaterialData*)chunk->m_oldPtr;
+				memPtr->m_flags = mat->m_flags;
+				memPtr->m_angularStiffness = mat->m_kAST;
+				memPtr->m_linearStiffness = mat->m_kLST;
+				memPtr->m_volumeStiffness = mat->m_kVST;
+				serializer->finalizeChunk(chunk, "SoftBodyMaterialData", BT_SBMATERIAL_CODE, mat);
+			}
+		}
+		serializer->finalizeChunk(chunk, "SoftBodyMaterialData", BT_ARRAY_CODE, (void*)&m_materials);
+	}
+
+	sbd->m_numNodes = m_nodes.size();
+	sbd->m_nodes = sbd->m_numNodes ? (SoftBodyNodeData*)serializer->getUniquePointer((void*)&m_nodes) : 0;
+	if (sbd->m_nodes)
+	{
+		int sz = sizeof(SoftBodyNodeData);
+		int numElem = sbd->m_numNodes;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		SoftBodyNodeData* memPtr = (SoftBodyNodeData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			m_nodes[i].m_f.serializeFloat(memPtr->m_accumulatedForce);
+			memPtr->m_area = m_nodes[i].m_area;
+			memPtr->m_attach = m_nodes[i].m_battach;
+			memPtr->m_inverseMass = m_nodes[i].m_im;
+			memPtr->m_material = m_nodes[i].m_material ? (SoftBodyMaterialData*)serializer->getUniquePointer((void*)m_nodes[i].m_material) : 0;
+			m_nodes[i].m_n.serializeFloat(memPtr->m_normal);
+			m_nodes[i].m_x.serializeFloat(memPtr->m_position);
+			m_nodes[i].m_q.serializeFloat(memPtr->m_previousPosition);
+			m_nodes[i].m_v.serializeFloat(memPtr->m_velocity);
+			m_nodeIndexMap.insert(&m_nodes[i], i);
+		}
+		serializer->finalizeChunk(chunk, "SoftBodyNodeData", BT_SBNODE_CODE, (void*)&m_nodes);
+	}
+
+	sbd->m_numLinks = m_links.size();
+	sbd->m_links = sbd->m_numLinks ? (SoftBodyLinkData*)serializer->getUniquePointer((void*)&m_links[0]) : 0;
+	if (sbd->m_links)
+	{
+		int sz = sizeof(SoftBodyLinkData);
+		int numElem = sbd->m_numLinks;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		SoftBodyLinkData* memPtr = (SoftBodyLinkData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_bbending = m_links[i].m_bbending;
+			memPtr->m_material = m_links[i].m_material ? (SoftBodyMaterialData*)serializer->getUniquePointer((void*)m_links[i].m_material) : 0;
+			memPtr->m_nodeIndices[0] = m_links[i].m_n[0] ? m_links[i].m_n[0] - &m_nodes[0] : -1;
+			memPtr->m_nodeIndices[1] = m_links[i].m_n[1] ? m_links[i].m_n[1] - &m_nodes[0] : -1;
+			btAssert(memPtr->m_nodeIndices[0] < m_nodes.size());
+			btAssert(memPtr->m_nodeIndices[1] < m_nodes.size());
+			memPtr->m_restLength = m_links[i].m_rl;
+		}
+		serializer->finalizeChunk(chunk, "SoftBodyLinkData", BT_ARRAY_CODE, (void*)&m_links[0]);
+	}
+
+	sbd->m_numFaces = m_faces.size();
+	sbd->m_faces = sbd->m_numFaces ? (SoftBodyFaceData*)serializer->getUniquePointer((void*)&m_faces[0]) : 0;
+	if (sbd->m_faces)
+	{
+		int sz = sizeof(SoftBodyFaceData);
+		int numElem = sbd->m_numFaces;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		SoftBodyFaceData* memPtr = (SoftBodyFaceData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_material = m_faces[i].m_material ? (SoftBodyMaterialData*)serializer->getUniquePointer((void*)m_faces[i].m_material) : 0;
+			m_faces[i].m_normal.serializeFloat(memPtr->m_normal);
+			for (int j = 0; j < 3; j++)
+			{
+				memPtr->m_nodeIndices[j] = m_faces[i].m_n[j] ? m_faces[i].m_n[j] - &m_nodes[0] : -1;
+			}
+			memPtr->m_restArea = m_faces[i].m_ra;
+		}
+		serializer->finalizeChunk(chunk, "SoftBodyFaceData", BT_ARRAY_CODE, (void*)&m_faces[0]);
+	}
+
+	sbd->m_numTetrahedra = m_tetras.size();
+	sbd->m_tetrahedra = sbd->m_numTetrahedra ? (SoftBodyTetraData*)serializer->getUniquePointer((void*)&m_tetras[0]) : 0;
+	if (sbd->m_tetrahedra)
+	{
+		int sz = sizeof(SoftBodyTetraData);
+		int numElem = sbd->m_numTetrahedra;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		SoftBodyTetraData* memPtr = (SoftBodyTetraData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			for (int j = 0; j < 4; j++)
+			{
+				m_tetras[i].m_c0[j].serializeFloat(memPtr->m_c0[j]);
+				memPtr->m_nodeIndices[j] = m_tetras[i].m_n[j] ? m_tetras[i].m_n[j] - &m_nodes[0] : -1;
+			}
+			memPtr->m_c1 = m_tetras[i].m_c1;
+			memPtr->m_c2 = m_tetras[i].m_c2;
+			memPtr->m_material = m_tetras[i].m_material ? (SoftBodyMaterialData*)serializer->getUniquePointer((void*)m_tetras[i].m_material) : 0;
+			memPtr->m_restVolume = m_tetras[i].m_rv;
+		}
+		serializer->finalizeChunk(chunk, "SoftBodyTetraData", BT_ARRAY_CODE, (void*)&m_tetras[0]);
+	}
+
+	sbd->m_numAnchors = m_anchors.size();
+	sbd->m_anchors = sbd->m_numAnchors ? (SoftRigidAnchorData*)serializer->getUniquePointer((void*)&m_anchors[0]) : 0;
+	if (sbd->m_anchors)
+	{
+		int sz = sizeof(SoftRigidAnchorData);
+		int numElem = sbd->m_numAnchors;
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		SoftRigidAnchorData* memPtr = (SoftRigidAnchorData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			m_anchors[i].m_c0.serializeFloat(memPtr->m_c0);
+			m_anchors[i].m_c1.serializeFloat(memPtr->m_c1);
+			memPtr->m_c2 = m_anchors[i].m_c2;
+			m_anchors[i].m_local.serializeFloat(memPtr->m_localFrame);
+			memPtr->m_nodeIndex = m_anchors[i].m_node ? m_anchors[i].m_node - &m_nodes[0] : -1;
+
+			memPtr->m_rigidBody = m_anchors[i].m_body ? (btRigidBodyData*)serializer->getUniquePointer((void*)m_anchors[i].m_body) : 0;
+			btAssert(memPtr->m_nodeIndex < m_nodes.size());
+		}
+		serializer->finalizeChunk(chunk, "SoftRigidAnchorData", BT_ARRAY_CODE, (void*)&m_anchors[0]);
+	}
+
+	sbd->m_config.m_dynamicFriction = m_cfg.kDF;
+	sbd->m_config.m_baumgarte = m_cfg.kVCF;
+	sbd->m_config.m_pressure = m_cfg.kPR;
+	sbd->m_config.m_aeroModel = this->m_cfg.aeromodel;
+	sbd->m_config.m_lift = m_cfg.kLF;
+	sbd->m_config.m_drag = m_cfg.kDG;
+	sbd->m_config.m_positionIterations = m_cfg.piterations;
+	sbd->m_config.m_driftIterations = m_cfg.diterations;
+	sbd->m_config.m_clusterIterations = m_cfg.citerations;
+	sbd->m_config.m_velocityIterations = m_cfg.viterations;
+	sbd->m_config.m_maxVolume = m_cfg.maxvolume;
+	sbd->m_config.m_damping = m_cfg.kDP;
+	sbd->m_config.m_poseMatch = m_cfg.kMT;
+	sbd->m_config.m_collisionFlags = m_cfg.collisions;
+	sbd->m_config.m_volume = m_cfg.kVC;
+	sbd->m_config.m_rigidContactHardness = m_cfg.kCHR;
+	sbd->m_config.m_kineticContactHardness = m_cfg.kKHR;
+	sbd->m_config.m_softContactHardness = m_cfg.kSHR;
+	sbd->m_config.m_anchorHardness = m_cfg.kAHR;
+	sbd->m_config.m_timeScale = m_cfg.timescale;
+	sbd->m_config.m_maxVolume = m_cfg.maxvolume;
+	sbd->m_config.m_softRigidClusterHardness = m_cfg.kSRHR_CL;
+	sbd->m_config.m_softKineticClusterHardness = m_cfg.kSKHR_CL;
+	sbd->m_config.m_softSoftClusterHardness = m_cfg.kSSHR_CL;
+	sbd->m_config.m_softRigidClusterImpulseSplit = m_cfg.kSR_SPLT_CL;
+	sbd->m_config.m_softKineticClusterImpulseSplit = m_cfg.kSK_SPLT_CL;
+	sbd->m_config.m_softSoftClusterImpulseSplit = m_cfg.kSS_SPLT_CL;
+
+	//pose for shape matching
+	{
+		sbd->m_pose = (SoftBodyPoseData*)serializer->getUniquePointer((void*)&m_pose);
+
+		int sz = sizeof(SoftBodyPoseData);
+		btChunk* chunk = serializer->allocate(sz, 1);
+		SoftBodyPoseData* memPtr = (SoftBodyPoseData*)chunk->m_oldPtr;
+
+		m_pose.m_aqq.serializeFloat(memPtr->m_aqq);
+		memPtr->m_bframe = m_pose.m_bframe;
+		memPtr->m_bvolume = m_pose.m_bvolume;
+		m_pose.m_com.serializeFloat(memPtr->m_com);
+
+		memPtr->m_numPositions = m_pose.m_pos.size();
+		memPtr->m_positions = memPtr->m_numPositions ? (btVector3FloatData*)serializer->getUniquePointer((void*)&m_pose.m_pos[0]) : 0;
+		if (memPtr->m_numPositions)
+		{
+			int numElem = memPtr->m_numPositions;
+			int sz = sizeof(btVector3Data);
+			btChunk* chunk = serializer->allocate(sz, numElem);
+			btVector3FloatData* memPtr = (btVector3FloatData*)chunk->m_oldPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				m_pose.m_pos[i].serializeFloat(*memPtr);
+			}
+			serializer->finalizeChunk(chunk, "btVector3FloatData", BT_ARRAY_CODE, (void*)&m_pose.m_pos[0]);
+		}
+		memPtr->m_restVolume = m_pose.m_volume;
+		m_pose.m_rot.serializeFloat(memPtr->m_rot);
+		m_pose.m_scl.serializeFloat(memPtr->m_scale);
+
+		memPtr->m_numWeigts = m_pose.m_wgh.size();
+		memPtr->m_weights = memPtr->m_numWeigts ? (float*)serializer->getUniquePointer((void*)&m_pose.m_wgh[0]) : 0;
+		if (memPtr->m_numWeigts)
+		{
+			int numElem = memPtr->m_numWeigts;
+			int sz = sizeof(float);
+			btChunk* chunk = serializer->allocate(sz, numElem);
+			float* memPtr = (float*)chunk->m_oldPtr;
+			for (int i = 0; i < numElem; i++, memPtr++)
+			{
+				*memPtr = m_pose.m_wgh[i];
+			}
+			serializer->finalizeChunk(chunk, "float", BT_ARRAY_CODE, (void*)&m_pose.m_wgh[0]);
+		}
+
+		serializer->finalizeChunk(chunk, "SoftBodyPoseData", BT_ARRAY_CODE, (void*)&m_pose);
+	}
+
+	//clusters for convex-cluster collision detection
+
+	sbd->m_numClusters = m_clusters.size();
+	sbd->m_clusters = sbd->m_numClusters ? (SoftBodyClusterData*)serializer->getUniquePointer((void*)m_clusters[0]) : 0;
+	if (sbd->m_numClusters)
+	{
+		int numElem = sbd->m_numClusters;
+		int sz = sizeof(SoftBodyClusterData);
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		SoftBodyClusterData* memPtr = (SoftBodyClusterData*)chunk->m_oldPtr;
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_adamping = m_clusters[i]->m_adamping;
+			m_clusters[i]->m_av.serializeFloat(memPtr->m_av);
+			memPtr->m_clusterIndex = m_clusters[i]->m_clusterIndex;
+			memPtr->m_collide = m_clusters[i]->m_collide;
+			m_clusters[i]->m_com.serializeFloat(memPtr->m_com);
+			memPtr->m_containsAnchor = m_clusters[i]->m_containsAnchor;
+			m_clusters[i]->m_dimpulses[0].serializeFloat(memPtr->m_dimpulses[0]);
+			m_clusters[i]->m_dimpulses[1].serializeFloat(memPtr->m_dimpulses[1]);
+			m_clusters[i]->m_framexform.serializeFloat(memPtr->m_framexform);
+			memPtr->m_idmass = m_clusters[i]->m_idmass;
+			memPtr->m_imass = m_clusters[i]->m_imass;
+			m_clusters[i]->m_invwi.serializeFloat(memPtr->m_invwi);
+			memPtr->m_ldamping = m_clusters[i]->m_ldamping;
+			m_clusters[i]->m_locii.serializeFloat(memPtr->m_locii);
+			m_clusters[i]->m_lv.serializeFloat(memPtr->m_lv);
+			memPtr->m_matching = m_clusters[i]->m_matching;
+			memPtr->m_maxSelfCollisionImpulse = m_clusters[i]->m_maxSelfCollisionImpulse;
+			memPtr->m_ndamping = m_clusters[i]->m_ndamping;
+			memPtr->m_ldamping = m_clusters[i]->m_ldamping;
+			memPtr->m_adamping = m_clusters[i]->m_adamping;
+			memPtr->m_selfCollisionImpulseFactor = m_clusters[i]->m_selfCollisionImpulseFactor;
+
+			memPtr->m_numFrameRefs = m_clusters[i]->m_framerefs.size();
+			memPtr->m_numMasses = m_clusters[i]->m_masses.size();
+			memPtr->m_numNodes = m_clusters[i]->m_nodes.size();
+
+			memPtr->m_nvimpulses = m_clusters[i]->m_nvimpulses;
+			m_clusters[i]->m_vimpulses[0].serializeFloat(memPtr->m_vimpulses[0]);
+			m_clusters[i]->m_vimpulses[1].serializeFloat(memPtr->m_vimpulses[1]);
+			memPtr->m_ndimpulses = m_clusters[i]->m_ndimpulses;
+
+			memPtr->m_framerefs = memPtr->m_numFrameRefs ? (btVector3FloatData*)serializer->getUniquePointer((void*)&m_clusters[i]->m_framerefs[0]) : 0;
+			if (memPtr->m_framerefs)
+			{
+				int numElem = memPtr->m_numFrameRefs;
+				int sz = sizeof(btVector3FloatData);
+				btChunk* chunk = serializer->allocate(sz, numElem);
+				btVector3FloatData* memPtr = (btVector3FloatData*)chunk->m_oldPtr;
+				for (int j = 0; j < numElem; j++, memPtr++)
+				{
+					m_clusters[i]->m_framerefs[j].serializeFloat(*memPtr);
+				}
+				serializer->finalizeChunk(chunk, "btVector3FloatData", BT_ARRAY_CODE, (void*)&m_clusters[i]->m_framerefs[0]);
+			}
+
+			memPtr->m_masses = memPtr->m_numMasses ? (float*)serializer->getUniquePointer((void*)&m_clusters[i]->m_masses[0]) : 0;
+			if (memPtr->m_masses)
+			{
+				int numElem = memPtr->m_numMasses;
+				int sz = sizeof(float);
+				btChunk* chunk = serializer->allocate(sz, numElem);
+				float* memPtr = (float*)chunk->m_oldPtr;
+				for (int j = 0; j < numElem; j++, memPtr++)
+				{
+					*memPtr = m_clusters[i]->m_masses[j];
+				}
+				serializer->finalizeChunk(chunk, "float", BT_ARRAY_CODE, (void*)&m_clusters[i]->m_masses[0]);
+			}
+
+			memPtr->m_nodeIndices = memPtr->m_numNodes ? (int*)serializer->getUniquePointer((void*)&m_clusters[i]->m_nodes) : 0;
+			if (memPtr->m_nodeIndices)
+			{
+				int numElem = memPtr->m_numMasses;
+				int sz = sizeof(int);
+				btChunk* chunk = serializer->allocate(sz, numElem);
+				int* memPtr = (int*)chunk->m_oldPtr;
+				for (int j = 0; j < numElem; j++, memPtr++)
+				{
+					int* indexPtr = m_nodeIndexMap.find(m_clusters[i]->m_nodes[j]);
+					btAssert(indexPtr);
+					*memPtr = *indexPtr;
+				}
+				serializer->finalizeChunk(chunk, "int", BT_ARRAY_CODE, (void*)&m_clusters[i]->m_nodes);
+			}
+		}
+		serializer->finalizeChunk(chunk, "SoftBodyClusterData", BT_ARRAY_CODE, (void*)m_clusters[0]);
+	}
+
+	sbd->m_numJoints = m_joints.size();
+	sbd->m_joints = m_joints.size() ? (btSoftBodyJointData*)serializer->getUniquePointer((void*)&m_joints[0]) : 0;
+
+	if (sbd->m_joints)
+	{
+		int sz = sizeof(btSoftBodyJointData);
+		int numElem = m_joints.size();
+		btChunk* chunk = serializer->allocate(sz, numElem);
+		btSoftBodyJointData* memPtr = (btSoftBodyJointData*)chunk->m_oldPtr;
+
+		for (int i = 0; i < numElem; i++, memPtr++)
+		{
+			memPtr->m_jointType = (int)m_joints[i]->Type();
+			m_joints[i]->m_refs[0].serializeFloat(memPtr->m_refs[0]);
+			m_joints[i]->m_refs[1].serializeFloat(memPtr->m_refs[1]);
+			memPtr->m_cfm = m_joints[i]->m_cfm;
+			memPtr->m_erp = float(m_joints[i]->m_erp);
+			memPtr->m_split = float(m_joints[i]->m_split);
+			memPtr->m_delete = m_joints[i]->m_delete;
+
+			for (int j = 0; j < 4; j++)
+			{
+				memPtr->m_relPosition[0].m_floats[j] = 0.f;
+				memPtr->m_relPosition[1].m_floats[j] = 0.f;
+			}
+			memPtr->m_bodyA = 0;
+			memPtr->m_bodyB = 0;
+			if (m_joints[i]->m_bodies[0].m_soft)
+			{
+				memPtr->m_bodyAtype = BT_JOINT_SOFT_BODY_CLUSTER;
+				memPtr->m_bodyA = serializer->getUniquePointer((void*)m_joints[i]->m_bodies[0].m_soft);
+			}
+			if (m_joints[i]->m_bodies[0].m_collisionObject)
+			{
+				memPtr->m_bodyAtype = BT_JOINT_COLLISION_OBJECT;
+				memPtr->m_bodyA = serializer->getUniquePointer((void*)m_joints[i]->m_bodies[0].m_collisionObject);
+			}
+			if (m_joints[i]->m_bodies[0].m_rigid)
+			{
+				memPtr->m_bodyAtype = BT_JOINT_RIGID_BODY;
+				memPtr->m_bodyA = serializer->getUniquePointer((void*)m_joints[i]->m_bodies[0].m_rigid);
+			}
+
+			if (m_joints[i]->m_bodies[1].m_soft)
+			{
+				memPtr->m_bodyBtype = BT_JOINT_SOFT_BODY_CLUSTER;
+				memPtr->m_bodyB = serializer->getUniquePointer((void*)m_joints[i]->m_bodies[1].m_soft);
+			}
+			if (m_joints[i]->m_bodies[1].m_collisionObject)
+			{
+				memPtr->m_bodyBtype = BT_JOINT_COLLISION_OBJECT;
+				memPtr->m_bodyB = serializer->getUniquePointer((void*)m_joints[i]->m_bodies[1].m_collisionObject);
+			}
+			if (m_joints[i]->m_bodies[1].m_rigid)
+			{
+				memPtr->m_bodyBtype = BT_JOINT_RIGID_BODY;
+				memPtr->m_bodyB = serializer->getUniquePointer((void*)m_joints[i]->m_bodies[1].m_rigid);
+			}
+		}
+		serializer->finalizeChunk(chunk, "btSoftBodyJointData", BT_ARRAY_CODE, (void*)&m_joints[0]);
+	}
+
+	return btSoftBodyDataName;
+}
+
+void btSoftBody::updateDeactivation(btScalar timeStep)
+{
+	if ((getActivationState() == ISLAND_SLEEPING) || (getActivationState() == DISABLE_DEACTIVATION))
+		return;
+
+	if (m_maxSpeedSquared < m_sleepingThreshold * m_sleepingThreshold)
+	{
+		m_deactivationTime += timeStep;
+	}
+	else
+	{
+		m_deactivationTime = btScalar(0.);
+		setActivationState(0);
+	}
+}
+
+void btSoftBody::setZeroVelocity()
+{
+	for (int i = 0; i < m_nodes.size(); ++i)
+	{
+		m_nodes[i].m_v.setZero();
+	}
+}
+
+bool btSoftBody::wantsSleeping()
+{
+	if (getActivationState() == DISABLE_DEACTIVATION)
+		return false;
+
+	//disable deactivation
+	if (gDisableDeactivation || (gDeactivationTime == btScalar(0.)))
+		return false;
+
+	if ((getActivationState() == ISLAND_SLEEPING) || (getActivationState() == WANTS_DEACTIVATION))
+		return true;
+
+	if (m_deactivationTime > gDeactivationTime)
+	{
+		return true;
+	}
+	return false;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBody.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBody.h
new file mode 100644
index 0000000..f91640a
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBody.h
@@ -0,0 +1,1409 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBody implementation by Nathanael Presson
+
+#ifndef _BT_SOFT_BODY_H
+#define _BT_SOFT_BODY_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btVector3.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+#include "BulletCollision/CollisionShapes/btConcaveShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "btSparseSDF.h"
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h"
+//#ifdef BT_USE_DOUBLE_PRECISION
+//#define btRigidBodyData	btRigidBodyDoubleData
+//#define btRigidBodyDataName	"btRigidBodyDoubleData"
+//#else
+#define btSoftBodyData btSoftBodyFloatData
+#define btSoftBodyDataName "btSoftBodyFloatData"
+static const btScalar OVERLAP_REDUCTION_FACTOR = 0.1;
+static unsigned long seed = 243703;
+//#endif //BT_USE_DOUBLE_PRECISION
+
+class btBroadphaseInterface;
+class btDispatcher;
+class btSoftBodySolver;
+
+/* btSoftBodyWorldInfo	*/
+struct btSoftBodyWorldInfo
+{
+	btScalar air_density;
+	btScalar water_density;
+	btScalar water_offset;
+	btScalar m_maxDisplacement;
+	btVector3 water_normal;
+	btBroadphaseInterface* m_broadphase;
+	btDispatcher* m_dispatcher;
+	btVector3 m_gravity;
+	btSparseSdf<3> m_sparsesdf;
+
+	btSoftBodyWorldInfo()
+		: air_density((btScalar)1.2),
+		  water_density(0),
+		  water_offset(0),
+		  m_maxDisplacement(1000.f),  //avoid soft body from 'exploding' so use some upper threshold of maximum motion that a node can travel per frame
+		  water_normal(0, 0, 0),
+		  m_broadphase(0),
+		  m_dispatcher(0),
+		  m_gravity(0, -10, 0)
+	{
+	}
+};
+
+///The btSoftBody is an class to simulate cloth and volumetric soft bodies.
+///There is two-way interaction between btSoftBody and btRigidBody/btCollisionObject.
+class btSoftBody : public btCollisionObject
+{
+public:
+	btAlignedObjectArray<const class btCollisionObject*> m_collisionDisabledObjects;
+
+	// The solver object that handles this soft body
+	btSoftBodySolver* m_softBodySolver;
+
+	//
+	// Enumerations
+	//
+
+	///eAeroModel
+	struct eAeroModel
+	{
+		enum _
+		{
+			V_Point,             ///Vertex normals are oriented toward velocity
+			V_TwoSided,          ///Vertex normals are flipped to match velocity
+			V_TwoSidedLiftDrag,  ///Vertex normals are flipped to match velocity and lift and drag forces are applied
+			V_OneSided,          ///Vertex normals are taken as it is
+			F_TwoSided,          ///Face normals are flipped to match velocity
+			F_TwoSidedLiftDrag,  ///Face normals are flipped to match velocity and lift and drag forces are applied
+			F_OneSided,          ///Face normals are taken as it is
+			END
+		};
+	};
+
+	///eVSolver : velocities solvers
+	struct eVSolver
+	{
+		enum _
+		{
+			Linear,  ///Linear solver
+			END
+		};
+	};
+
+	///ePSolver : positions solvers
+	struct ePSolver
+	{
+		enum _
+		{
+			Linear,     ///Linear solver
+			Anchors,    ///Anchor solver
+			RContacts,  ///Rigid contacts solver
+			SContacts,  ///Soft contacts solver
+			END
+		};
+	};
+
+	///eSolverPresets
+	struct eSolverPresets
+	{
+		enum _
+		{
+			Positions,
+			Velocities,
+			Default = Positions,
+			END
+		};
+	};
+
+	///eFeature
+	struct eFeature
+	{
+		enum _
+		{
+			None,
+			Node,
+			Link,
+			Face,
+			Tetra,
+			END
+		};
+	};
+
+	typedef btAlignedObjectArray<eVSolver::_> tVSolverArray;
+	typedef btAlignedObjectArray<ePSolver::_> tPSolverArray;
+
+	//
+	// Flags
+	//
+
+	///fCollision
+	struct fCollision
+	{
+		enum _
+		{
+			RVSmask = 0x000f,  ///Rigid versus soft mask
+			SDF_RS = 0x0001,   ///SDF based rigid vs soft
+			CL_RS = 0x0002,    ///Cluster vs convex rigid vs soft
+			SDF_RD = 0x0004,   ///rigid vs deformable
+
+			SVSmask = 0x00f0,  ///Rigid versus soft mask
+			VF_SS = 0x0010,    ///Vertex vs face soft vs soft handling
+			CL_SS = 0x0020,    ///Cluster vs cluster soft vs soft handling
+			CL_SELF = 0x0040,  ///Cluster soft body self collision
+			VF_DD = 0x0080,    ///Vertex vs face soft vs soft handling
+
+			RVDFmask = 0x0f00,  /// Rigid versus deformable face mask
+			SDF_RDF = 0x0100,   /// GJK based Rigid vs. deformable face
+			SDF_MDF = 0x0200,   /// GJK based Multibody vs. deformable face
+			SDF_RDN = 0x0400,   /// SDF based Rigid vs. deformable node
+			/* presets	*/
+			Default = SDF_RS,
+			END
+		};
+	};
+
+	///fMaterial
+	struct fMaterial
+	{
+		enum _
+		{
+			DebugDraw = 0x0001,  /// Enable debug draw
+			/* presets	*/
+			Default = DebugDraw,
+			END
+		};
+	};
+
+	//
+	// API Types
+	//
+
+	/* sRayCast		*/
+	struct sRayCast
+	{
+		btSoftBody* body;     /// soft body
+		eFeature::_ feature;  /// feature type
+		int index;            /// feature index
+		btScalar fraction;    /// time of impact fraction (rayorg+(rayto-rayfrom)*fraction)
+	};
+
+	/* ImplicitFn	*/
+	struct ImplicitFn
+	{
+		virtual ~ImplicitFn() {}
+		virtual btScalar Eval(const btVector3& x) = 0;
+	};
+
+	//
+	// Internal types
+	//
+
+	typedef btAlignedObjectArray<btScalar> tScalarArray;
+	typedef btAlignedObjectArray<btVector3> tVector3Array;
+
+	/* sCti is Softbody contact info	*/
+	struct sCti
+	{
+		const btCollisionObject* m_colObj; /* Rigid body			*/
+		btVector3 m_normal;                /* Outward normal		*/
+		btScalar m_offset;                 /* Offset from origin	*/
+		btVector3 m_bary;                  /* Barycentric weights for faces */
+	};
+
+	/* sMedium		*/
+	struct sMedium
+	{
+		btVector3 m_velocity; /* Velocity				*/
+		btScalar m_pressure;  /* Pressure				*/
+		btScalar m_density;   /* Density				*/
+	};
+
+	/* Base type	*/
+	struct Element
+	{
+		void* m_tag;  // User data
+		Element() : m_tag(0) {}
+	};
+	/* Material		*/
+	struct Material : Element
+	{
+		btScalar m_kLST;  // Linear stiffness coefficient [0,1]
+		btScalar m_kAST;  // Area/Angular stiffness coefficient [0,1]
+		btScalar m_kVST;  // Volume stiffness coefficient [0,1]
+		int m_flags;      // Flags
+	};
+
+	/* Feature		*/
+	struct Feature : Element
+	{
+		Material* m_material;  // Material
+	};
+	/* Node			*/
+	struct RenderNode
+	{
+		btVector3 m_x;
+		btVector3 m_uv1;
+		btVector3 m_normal;
+	};
+	struct Node : Feature
+	{
+		btVector3 m_x;       // Position
+		btVector3 m_q;       // Previous step position/Test position
+		btVector3 m_v;       // Velocity
+		btVector3 m_vn;      // Previous step velocity
+		btVector3 m_f;       // Force accumulator
+		btVector3 m_n;       // Normal
+		btScalar m_im;       // 1/mass
+		btScalar m_area;     // Area
+		btDbvtNode* m_leaf;  // Leaf data
+		int m_constrained;   // depth of penetration
+		int m_battach : 1;   // Attached
+		int index;
+		btVector3 m_splitv;               // velocity associated with split impulse
+		btMatrix3x3 m_effectiveMass;      // effective mass in contact
+		btMatrix3x3 m_effectiveMass_inv;  // inverse of effective mass
+	};
+	/* Link			*/
+	ATTRIBUTE_ALIGNED16(struct)
+	Link : Feature
+	{
+		btVector3 m_c3;      // gradient
+		Node* m_n[2];        // Node pointers
+		btScalar m_rl;       // Rest length
+		int m_bbending : 1;  // Bending link
+		btScalar m_c0;       // (ima+imb)*kLST
+		btScalar m_c1;       // rl^2
+		btScalar m_c2;       // |gradient|^2/c0
+
+		BT_DECLARE_ALIGNED_ALLOCATOR();
+	};
+	struct RenderFace
+	{
+		RenderNode* m_n[3];  // Node pointers
+	};
+
+	/* Face			*/
+	struct Face : Feature
+	{
+		Node* m_n[3];          // Node pointers
+		btVector3 m_normal;    // Normal
+		btScalar m_ra;         // Rest area
+		btDbvtNode* m_leaf;    // Leaf data
+		btVector4 m_pcontact;  // barycentric weights of the persistent contact
+		btVector3 m_n0, m_n1, m_vn;
+		int m_index;
+	};
+	/* Tetra		*/
+	struct Tetra : Feature
+	{
+		Node* m_n[4];              // Node pointers
+		btScalar m_rv;             // Rest volume
+		btDbvtNode* m_leaf;        // Leaf data
+		btVector3 m_c0[4];         // gradients
+		btScalar m_c1;             // (4*kVST)/(im0+im1+im2+im3)
+		btScalar m_c2;             // m_c1/sum(|g0..3|^2)
+		btMatrix3x3 m_Dm_inverse;  // rest Dm^-1
+		btMatrix3x3 m_F;
+		btScalar m_element_measure;
+		btVector4 m_P_inv[3];  // first three columns of P_inv matrix
+	};
+
+	/*  TetraScratch  */
+	struct TetraScratch
+	{
+		btMatrix3x3 m_F;           // deformation gradient F
+		btScalar m_trace;          // trace of F^T * F
+		btScalar m_J;              // det(F)
+		btMatrix3x3 m_cofF;        // cofactor of F
+		btMatrix3x3 m_corotation;  // corotatio of the tetra
+	};
+
+	/* RContact		*/
+	struct RContact
+	{
+		sCti m_cti;        // Contact infos
+		Node* m_node;      // Owner node
+		btMatrix3x3 m_c0;  // Impulse matrix
+		btVector3 m_c1;    // Relative anchor
+		btScalar m_c2;     // ima*dt
+		btScalar m_c3;     // Friction
+		btScalar m_c4;     // Hardness
+
+		// jacobians and unit impulse responses for multibody
+		btMultiBodyJacobianData jacobianData_normal;
+		btMultiBodyJacobianData jacobianData_t1;
+		btMultiBodyJacobianData jacobianData_t2;
+		btVector3 t1;
+		btVector3 t2;
+	};
+
+	class DeformableRigidContact
+	{
+	public:
+		sCti m_cti;        // Contact infos
+		btMatrix3x3 m_c0;  // Impulse matrix
+		btVector3 m_c1;    // Relative anchor
+		btScalar m_c2;     // inverse mass of node/face
+		btScalar m_c3;     // Friction
+		btScalar m_c4;     // Hardness
+		btMatrix3x3 m_c5;  // inverse effective mass
+
+		// jacobians and unit impulse responses for multibody
+		btMultiBodyJacobianData jacobianData_normal;
+		btMultiBodyJacobianData jacobianData_t1;
+		btMultiBodyJacobianData jacobianData_t2;
+		btVector3 t1;
+		btVector3 t2;
+	};
+
+	class DeformableNodeRigidContact : public DeformableRigidContact
+	{
+	public:
+		Node* m_node;  // Owner node
+	};
+
+	class DeformableNodeRigidAnchor : public DeformableNodeRigidContact
+	{
+	public:
+		btVector3 m_local;  // Anchor position in body space
+	};
+
+	class DeformableFaceRigidContact : public DeformableRigidContact
+	{
+	public:
+		Face* m_face;              // Owner face
+		btVector3 m_contactPoint;  // Contact point
+		btVector3 m_bary;          // Barycentric weights
+		btVector3 m_weights;       // v_contactPoint * m_weights[i] = m_face->m_node[i]->m_v;
+	};
+
+	struct DeformableFaceNodeContact
+	{
+		Node* m_node;         // Node
+		Face* m_face;         // Face
+		btVector3 m_bary;     // Barycentric weights
+		btVector3 m_weights;  // v_contactPoint * m_weights[i] = m_face->m_node[i]->m_v;
+		btVector3 m_normal;   // Normal
+		btScalar m_margin;    // Margin
+		btScalar m_friction;  // Friction
+		btScalar m_imf;       // inverse mass of the face at contact point
+		btScalar m_c0;        // scale of the impulse matrix;
+		const btCollisionObject* m_colObj;  // Collision object to collide with.
+	};
+
+	/* SContact		*/
+	struct SContact
+	{
+		Node* m_node;         // Node
+		Face* m_face;         // Face
+		btVector3 m_weights;  // Weigths
+		btVector3 m_normal;   // Normal
+		btScalar m_margin;    // Margin
+		btScalar m_friction;  // Friction
+		btScalar m_cfm[2];    // Constraint force mixing
+	};
+	/* Anchor		*/
+	struct Anchor
+	{
+		Node* m_node;         // Node pointer
+		btVector3 m_local;    // Anchor position in body space
+		btRigidBody* m_body;  // Body
+		btScalar m_influence;
+		btMatrix3x3 m_c0;  // Impulse matrix
+		btVector3 m_c1;    // Relative anchor
+		btScalar m_c2;     // ima*dt
+	};
+	/* Note			*/
+	struct Note : Element
+	{
+		const char* m_text;    // Text
+		btVector3 m_offset;    // Offset
+		int m_rank;            // Rank
+		Node* m_nodes[4];      // Nodes
+		btScalar m_coords[4];  // Coordinates
+	};
+	/* Pose			*/
+	struct Pose
+	{
+		bool m_bvolume;       // Is valid
+		bool m_bframe;        // Is frame
+		btScalar m_volume;    // Rest volume
+		tVector3Array m_pos;  // Reference positions
+		tScalarArray m_wgh;   // Weights
+		btVector3 m_com;      // COM
+		btMatrix3x3 m_rot;    // Rotation
+		btMatrix3x3 m_scl;    // Scale
+		btMatrix3x3 m_aqq;    // Base scaling
+	};
+	/* Cluster		*/
+	struct Cluster
+	{
+		tScalarArray m_masses;
+		btAlignedObjectArray<Node*> m_nodes;
+		tVector3Array m_framerefs;
+		btTransform m_framexform;
+		btScalar m_idmass;
+		btScalar m_imass;
+		btMatrix3x3 m_locii;
+		btMatrix3x3 m_invwi;
+		btVector3 m_com;
+		btVector3 m_vimpulses[2];
+		btVector3 m_dimpulses[2];
+		int m_nvimpulses;
+		int m_ndimpulses;
+		btVector3 m_lv;
+		btVector3 m_av;
+		btDbvtNode* m_leaf;
+		btScalar m_ndamping; /* Node damping		*/
+		btScalar m_ldamping; /* Linear damping	*/
+		btScalar m_adamping; /* Angular damping	*/
+		btScalar m_matching;
+		btScalar m_maxSelfCollisionImpulse;
+		btScalar m_selfCollisionImpulseFactor;
+		bool m_containsAnchor;
+		bool m_collide;
+		int m_clusterIndex;
+		Cluster() : m_leaf(0), m_ndamping(0), m_ldamping(0), m_adamping(0), m_matching(0), m_maxSelfCollisionImpulse(100.f), m_selfCollisionImpulseFactor(0.01f), m_containsAnchor(false)
+		{
+		}
+	};
+	/* Impulse		*/
+	struct Impulse
+	{
+		btVector3 m_velocity;
+		btVector3 m_drift;
+		int m_asVelocity : 1;
+		int m_asDrift : 1;
+		Impulse() : m_velocity(0, 0, 0), m_drift(0, 0, 0), m_asVelocity(0), m_asDrift(0) {}
+		Impulse operator-() const
+		{
+			Impulse i = *this;
+			i.m_velocity = -i.m_velocity;
+			i.m_drift = -i.m_drift;
+			return (i);
+		}
+		Impulse operator*(btScalar x) const
+		{
+			Impulse i = *this;
+			i.m_velocity *= x;
+			i.m_drift *= x;
+			return (i);
+		}
+	};
+	/* Body			*/
+	struct Body
+	{
+		Cluster* m_soft;
+		btRigidBody* m_rigid;
+		const btCollisionObject* m_collisionObject;
+
+		Body() : m_soft(0), m_rigid(0), m_collisionObject(0) {}
+		Body(Cluster* p) : m_soft(p), m_rigid(0), m_collisionObject(0) {}
+		Body(const btCollisionObject* colObj) : m_soft(0), m_collisionObject(colObj)
+		{
+			m_rigid = (btRigidBody*)btRigidBody::upcast(m_collisionObject);
+		}
+
+		void activate() const
+		{
+			if (m_rigid)
+				m_rigid->activate();
+			if (m_collisionObject)
+				m_collisionObject->activate();
+		}
+		const btMatrix3x3& invWorldInertia() const
+		{
+			static const btMatrix3x3 iwi(0, 0, 0, 0, 0, 0, 0, 0, 0);
+			if (m_rigid) return (m_rigid->getInvInertiaTensorWorld());
+			if (m_soft) return (m_soft->m_invwi);
+			return (iwi);
+		}
+		btScalar invMass() const
+		{
+			if (m_rigid) return (m_rigid->getInvMass());
+			if (m_soft) return (m_soft->m_imass);
+			return (0);
+		}
+		const btTransform& xform() const
+		{
+			static const btTransform identity = btTransform::getIdentity();
+			if (m_collisionObject) return (m_collisionObject->getWorldTransform());
+			if (m_soft) return (m_soft->m_framexform);
+			return (identity);
+		}
+		btVector3 linearVelocity() const
+		{
+			if (m_rigid) return (m_rigid->getLinearVelocity());
+			if (m_soft) return (m_soft->m_lv);
+			return (btVector3(0, 0, 0));
+		}
+		btVector3 angularVelocity(const btVector3& rpos) const
+		{
+			if (m_rigid) return (btCross(m_rigid->getAngularVelocity(), rpos));
+			if (m_soft) return (btCross(m_soft->m_av, rpos));
+			return (btVector3(0, 0, 0));
+		}
+		btVector3 angularVelocity() const
+		{
+			if (m_rigid) return (m_rigid->getAngularVelocity());
+			if (m_soft) return (m_soft->m_av);
+			return (btVector3(0, 0, 0));
+		}
+		btVector3 velocity(const btVector3& rpos) const
+		{
+			return (linearVelocity() + angularVelocity(rpos));
+		}
+		void applyVImpulse(const btVector3& impulse, const btVector3& rpos) const
+		{
+			if (m_rigid) m_rigid->applyImpulse(impulse, rpos);
+			if (m_soft) btSoftBody::clusterVImpulse(m_soft, rpos, impulse);
+		}
+		void applyDImpulse(const btVector3& impulse, const btVector3& rpos) const
+		{
+			if (m_rigid) m_rigid->applyImpulse(impulse, rpos);
+			if (m_soft) btSoftBody::clusterDImpulse(m_soft, rpos, impulse);
+		}
+		void applyImpulse(const Impulse& impulse, const btVector3& rpos) const
+		{
+			if (impulse.m_asVelocity)
+			{
+				//				printf("impulse.m_velocity = %f,%f,%f\n",impulse.m_velocity.getX(),impulse.m_velocity.getY(),impulse.m_velocity.getZ());
+				applyVImpulse(impulse.m_velocity, rpos);
+			}
+			if (impulse.m_asDrift)
+			{
+				//				printf("impulse.m_drift = %f,%f,%f\n",impulse.m_drift.getX(),impulse.m_drift.getY(),impulse.m_drift.getZ());
+				applyDImpulse(impulse.m_drift, rpos);
+			}
+		}
+		void applyVAImpulse(const btVector3& impulse) const
+		{
+			if (m_rigid) m_rigid->applyTorqueImpulse(impulse);
+			if (m_soft) btSoftBody::clusterVAImpulse(m_soft, impulse);
+		}
+		void applyDAImpulse(const btVector3& impulse) const
+		{
+			if (m_rigid) m_rigid->applyTorqueImpulse(impulse);
+			if (m_soft) btSoftBody::clusterDAImpulse(m_soft, impulse);
+		}
+		void applyAImpulse(const Impulse& impulse) const
+		{
+			if (impulse.m_asVelocity) applyVAImpulse(impulse.m_velocity);
+			if (impulse.m_asDrift) applyDAImpulse(impulse.m_drift);
+		}
+		void applyDCImpulse(const btVector3& impulse) const
+		{
+			if (m_rigid) m_rigid->applyCentralImpulse(impulse);
+			if (m_soft) btSoftBody::clusterDCImpulse(m_soft, impulse);
+		}
+	};
+	/* Joint		*/
+	struct Joint
+	{
+		struct eType
+		{
+			enum _
+			{
+				Linear = 0,
+				Angular,
+				Contact
+			};
+		};
+		struct Specs
+		{
+			Specs() : erp(1), cfm(1), split(1) {}
+			btScalar erp;
+			btScalar cfm;
+			btScalar split;
+		};
+		Body m_bodies[2];
+		btVector3 m_refs[2];
+		btScalar m_cfm;
+		btScalar m_erp;
+		btScalar m_split;
+		btVector3 m_drift;
+		btVector3 m_sdrift;
+		btMatrix3x3 m_massmatrix;
+		bool m_delete;
+		virtual ~Joint() {}
+		Joint() : m_delete(false) {}
+		virtual void Prepare(btScalar dt, int iterations);
+		virtual void Solve(btScalar dt, btScalar sor) = 0;
+		virtual void Terminate(btScalar dt) = 0;
+		virtual eType::_ Type() const = 0;
+	};
+	/* LJoint		*/
+	struct LJoint : Joint
+	{
+		struct Specs : Joint::Specs
+		{
+			btVector3 position;
+		};
+		btVector3 m_rpos[2];
+		void Prepare(btScalar dt, int iterations);
+		void Solve(btScalar dt, btScalar sor);
+		void Terminate(btScalar dt);
+		eType::_ Type() const { return (eType::Linear); }
+	};
+	/* AJoint		*/
+	struct AJoint : Joint
+	{
+		struct IControl
+		{
+			virtual ~IControl() {}
+			virtual void Prepare(AJoint*) {}
+			virtual btScalar Speed(AJoint*, btScalar current) { return (current); }
+			static IControl* Default()
+			{
+				static IControl def;
+				return (&def);
+			}
+		};
+		struct Specs : Joint::Specs
+		{
+			Specs() : icontrol(IControl::Default()) {}
+			btVector3 axis;
+			IControl* icontrol;
+		};
+		btVector3 m_axis[2];
+		IControl* m_icontrol;
+		void Prepare(btScalar dt, int iterations);
+		void Solve(btScalar dt, btScalar sor);
+		void Terminate(btScalar dt);
+		eType::_ Type() const { return (eType::Angular); }
+	};
+	/* CJoint		*/
+	struct CJoint : Joint
+	{
+		int m_life;
+		int m_maxlife;
+		btVector3 m_rpos[2];
+		btVector3 m_normal;
+		btScalar m_friction;
+		void Prepare(btScalar dt, int iterations);
+		void Solve(btScalar dt, btScalar sor);
+		void Terminate(btScalar dt);
+		eType::_ Type() const { return (eType::Contact); }
+	};
+	/* Config		*/
+	struct Config
+	{
+		eAeroModel::_ aeromodel;    // Aerodynamic model (default: V_Point)
+		btScalar kVCF;              // Velocities correction factor (Baumgarte)
+		btScalar kDP;               // Damping coefficient [0,1]
+		btScalar kDG;               // Drag coefficient [0,+inf]
+		btScalar kLF;               // Lift coefficient [0,+inf]
+		btScalar kPR;               // Pressure coefficient [-inf,+inf]
+		btScalar kVC;               // Volume conversation coefficient [0,+inf]
+		btScalar kDF;               // Dynamic friction coefficient [0,1]
+		btScalar kMT;               // Pose matching coefficient [0,1]
+		btScalar kCHR;              // Rigid contacts hardness [0,1]
+		btScalar kKHR;              // Kinetic contacts hardness [0,1]
+		btScalar kSHR;              // Soft contacts hardness [0,1]
+		btScalar kAHR;              // Anchors hardness [0,1]
+		btScalar kSRHR_CL;          // Soft vs rigid hardness [0,1] (cluster only)
+		btScalar kSKHR_CL;          // Soft vs kinetic hardness [0,1] (cluster only)
+		btScalar kSSHR_CL;          // Soft vs soft hardness [0,1] (cluster only)
+		btScalar kSR_SPLT_CL;       // Soft vs rigid impulse split [0,1] (cluster only)
+		btScalar kSK_SPLT_CL;       // Soft vs rigid impulse split [0,1] (cluster only)
+		btScalar kSS_SPLT_CL;       // Soft vs rigid impulse split [0,1] (cluster only)
+		btScalar maxvolume;         // Maximum volume ratio for pose
+		btScalar timescale;         // Time scale
+		int viterations;            // Velocities solver iterations
+		int piterations;            // Positions solver iterations
+		int diterations;            // Drift solver iterations
+		int citerations;            // Cluster solver iterations
+		int collisions;             // Collisions flags
+		tVSolverArray m_vsequence;  // Velocity solvers sequence
+		tPSolverArray m_psequence;  // Position solvers sequence
+		tPSolverArray m_dsequence;  // Drift solvers sequence
+		btScalar drag;              // deformable air drag
+		btScalar m_maxStress;       // Maximum principle first Piola stress
+	};
+	/* SolverState	*/
+	struct SolverState
+	{
+		//if you add new variables, always initialize them!
+		SolverState()
+			: sdt(0),
+			  isdt(0),
+			  velmrg(0),
+			  radmrg(0),
+			  updmrg(0)
+		{
+		}
+		btScalar sdt;     // dt*timescale
+		btScalar isdt;    // 1/sdt
+		btScalar velmrg;  // velocity margin
+		btScalar radmrg;  // radial margin
+		btScalar updmrg;  // Update margin
+	};
+	/// RayFromToCaster takes a ray from, ray to (instead of direction!)
+	struct RayFromToCaster : btDbvt::ICollide
+	{
+		btVector3 m_rayFrom;
+		btVector3 m_rayTo;
+		btVector3 m_rayNormalizedDirection;
+		btScalar m_mint;
+		Face* m_face;
+		int m_tests;
+		RayFromToCaster(const btVector3& rayFrom, const btVector3& rayTo, btScalar mxt);
+		void Process(const btDbvtNode* leaf);
+
+		static /*inline*/ btScalar rayFromToTriangle(const btVector3& rayFrom,
+													 const btVector3& rayTo,
+													 const btVector3& rayNormalizedDirection,
+													 const btVector3& a,
+													 const btVector3& b,
+													 const btVector3& c,
+													 btScalar maxt = SIMD_INFINITY);
+	};
+
+	//
+	// Typedefs
+	//
+
+	typedef void (*psolver_t)(btSoftBody*, btScalar, btScalar);
+	typedef void (*vsolver_t)(btSoftBody*, btScalar);
+	typedef btAlignedObjectArray<Cluster*> tClusterArray;
+	typedef btAlignedObjectArray<Note> tNoteArray;
+	typedef btAlignedObjectArray<Node> tNodeArray;
+	typedef btAlignedObjectArray<RenderNode> tRenderNodeArray;
+	typedef btAlignedObjectArray<btDbvtNode*> tLeafArray;
+	typedef btAlignedObjectArray<Link> tLinkArray;
+	typedef btAlignedObjectArray<Face> tFaceArray;
+	typedef btAlignedObjectArray<RenderFace> tRenderFaceArray;
+	typedef btAlignedObjectArray<Tetra> tTetraArray;
+	typedef btAlignedObjectArray<Anchor> tAnchorArray;
+	typedef btAlignedObjectArray<RContact> tRContactArray;
+	typedef btAlignedObjectArray<SContact> tSContactArray;
+	typedef btAlignedObjectArray<Material*> tMaterialArray;
+	typedef btAlignedObjectArray<Joint*> tJointArray;
+	typedef btAlignedObjectArray<btSoftBody*> tSoftBodyArray;
+	typedef btAlignedObjectArray<btAlignedObjectArray<btScalar> > tDenseMatrix;
+
+	//
+	// Fields
+	//
+
+	Config m_cfg;                      // Configuration
+	SolverState m_sst;                 // Solver state
+	Pose m_pose;                       // Pose
+	void* m_tag;                       // User data
+	btSoftBodyWorldInfo* m_worldInfo;  // World info
+	tNoteArray m_notes;                // Notes
+	tNodeArray m_nodes;                // Nodes
+	tRenderNodeArray m_renderNodes;    // Render Nodes
+	tLinkArray m_links;                // Links
+	tFaceArray m_faces;                // Faces
+	tRenderFaceArray m_renderFaces;    // Faces
+	tTetraArray m_tetras;              // Tetras
+	btAlignedObjectArray<TetraScratch> m_tetraScratches;
+	btAlignedObjectArray<TetraScratch> m_tetraScratchesTn;
+	tAnchorArray m_anchors;  // Anchors
+	btAlignedObjectArray<DeformableNodeRigidAnchor> m_deformableAnchors;
+	tRContactArray m_rcontacts;  // Rigid contacts
+	btAlignedObjectArray<DeformableNodeRigidContact> m_nodeRigidContacts;
+	btAlignedObjectArray<DeformableFaceNodeContact> m_faceNodeContacts;
+	btAlignedObjectArray<DeformableFaceRigidContact> m_faceRigidContacts;
+	btAlignedObjectArray<DeformableFaceNodeContact> m_faceNodeContactsCCD;
+	tSContactArray m_scontacts;     // Soft contacts
+	tJointArray m_joints;           // Joints
+	tMaterialArray m_materials;     // Materials
+	btScalar m_timeacc;             // Time accumulator
+	btVector3 m_bounds[2];          // Spatial bounds
+	bool m_bUpdateRtCst;            // Update runtime constants
+	btDbvt m_ndbvt;                 // Nodes tree
+	btDbvt m_fdbvt;                 // Faces tree
+	btDbvntNode* m_fdbvnt;          // Faces tree with normals
+	btDbvt m_cdbvt;                 // Clusters tree
+	tClusterArray m_clusters;       // Clusters
+	btScalar m_dampingCoefficient;  // Damping Coefficient
+	btScalar m_sleepingThreshold;
+	btScalar m_maxSpeedSquared;
+	btAlignedObjectArray<btVector3> m_quads;  // quadrature points for collision detection
+	btScalar m_repulsionStiffness;
+	btScalar m_gravityFactor;
+	bool m_cacheBarycenter;
+	btAlignedObjectArray<btVector3> m_X;  // initial positions
+
+	btAlignedObjectArray<btVector4> m_renderNodesInterpolationWeights;
+	btAlignedObjectArray<btAlignedObjectArray<const btSoftBody::Node*> > m_renderNodesParents;
+	btAlignedObjectArray<btScalar> m_z;  // vertical distance used in extrapolation
+	bool m_useSelfCollision;
+	bool m_softSoftCollision;
+
+	btAlignedObjectArray<bool> m_clusterConnectivity;  //cluster connectivity, for self-collision
+
+	btVector3 m_windVelocity;
+
+	btScalar m_restLengthScale;
+
+	bool m_reducedModel;	// Reduced deformable model flag
+	
+	//
+	// Api
+	//
+
+	/* ctor																	*/
+	btSoftBody(btSoftBodyWorldInfo* worldInfo, int node_count, const btVector3* x, const btScalar* m);
+
+	/* ctor																	*/
+	btSoftBody(btSoftBodyWorldInfo* worldInfo);
+
+	void initDefaults();
+
+	/* dtor																	*/
+	virtual ~btSoftBody();
+	/* Check for existing link												*/
+
+	btAlignedObjectArray<int> m_userIndexMapping;
+
+	btSoftBodyWorldInfo* getWorldInfo()
+	{
+		return m_worldInfo;
+	}
+
+	void setDampingCoefficient(btScalar damping_coeff)
+	{
+		m_dampingCoefficient = damping_coeff;
+	}
+
+	///@todo: avoid internal softbody shape hack and move collision code to collision library
+	virtual void setCollisionShape(btCollisionShape* collisionShape)
+	{
+	}
+
+	bool checkLink(int node0,
+				   int node1) const;
+	bool checkLink(const Node* node0,
+				   const Node* node1) const;
+	/* Check for existring face												*/
+	bool checkFace(int node0,
+				   int node1,
+				   int node2) const;
+	/* Append material														*/
+	Material* appendMaterial();
+	/* Append note															*/
+	void appendNote(const char* text,
+					const btVector3& o,
+					const btVector4& c = btVector4(1, 0, 0, 0),
+					Node* n0 = 0,
+					Node* n1 = 0,
+					Node* n2 = 0,
+					Node* n3 = 0);
+	void appendNote(const char* text,
+					const btVector3& o,
+					Node* feature);
+	void appendNote(const char* text,
+					const btVector3& o,
+					Link* feature);
+	void appendNote(const char* text,
+					const btVector3& o,
+					Face* feature);
+	/* Append node															*/
+	void appendNode(const btVector3& x, btScalar m);
+	/* Append link															*/
+	void appendLink(int model = -1, Material* mat = 0);
+	void appendLink(int node0,
+					int node1,
+					Material* mat = 0,
+					bool bcheckexist = false);
+	void appendLink(Node* node0,
+					Node* node1,
+					Material* mat = 0,
+					bool bcheckexist = false);
+	/* Append face															*/
+	void appendFace(int model = -1, Material* mat = 0);
+	void appendFace(int node0,
+					int node1,
+					int node2,
+					Material* mat = 0);
+	void appendTetra(int model, Material* mat);
+	//
+	void appendTetra(int node0,
+					 int node1,
+					 int node2,
+					 int node3,
+					 Material* mat = 0);
+
+	/* Append anchor														*/
+	void appendDeformableAnchor(int node, btRigidBody* body);
+	void appendDeformableAnchor(int node, btMultiBodyLinkCollider* link);
+	void appendAnchor(int node,
+					  btRigidBody* body, bool disableCollisionBetweenLinkedBodies = false, btScalar influence = 1);
+	void appendAnchor(int node, btRigidBody* body, const btVector3& localPivot, bool disableCollisionBetweenLinkedBodies = false, btScalar influence = 1);
+	void removeAnchor(int node);
+	/* Append linear joint													*/
+	void appendLinearJoint(const LJoint::Specs& specs, Cluster* body0, Body body1);
+	void appendLinearJoint(const LJoint::Specs& specs, Body body = Body());
+	void appendLinearJoint(const LJoint::Specs& specs, btSoftBody* body);
+	/* Append linear joint													*/
+	void appendAngularJoint(const AJoint::Specs& specs, Cluster* body0, Body body1);
+	void appendAngularJoint(const AJoint::Specs& specs, Body body = Body());
+	void appendAngularJoint(const AJoint::Specs& specs, btSoftBody* body);
+	/* Add force (or gravity) to the entire body							*/
+	void addForce(const btVector3& force);
+	/* Add force (or gravity) to a node of the body							*/
+	void addForce(const btVector3& force,
+				  int node);
+	/* Add aero force to a node of the body */
+	void addAeroForceToNode(const btVector3& windVelocity, int nodeIndex);
+
+	/* Add aero force to a face of the body */
+	void addAeroForceToFace(const btVector3& windVelocity, int faceIndex);
+
+	/* Add velocity to the entire body										*/
+	void addVelocity(const btVector3& velocity);
+
+	/* Set velocity for the entire body										*/
+	void setVelocity(const btVector3& velocity);
+
+	/* Add velocity to a node of the body									*/
+	void addVelocity(const btVector3& velocity,
+					 int node);
+	/* Set mass																*/
+	void setMass(int node,
+				 btScalar mass);
+	/* Get mass																*/
+	btScalar getMass(int node) const;
+	/* Get total mass														*/
+	btScalar getTotalMass() const;
+	/* Set total mass (weighted by previous masses)							*/
+	void setTotalMass(btScalar mass,
+					  bool fromfaces = false);
+	/* Set total density													*/
+	void setTotalDensity(btScalar density);
+	/* Set volume mass (using tetrahedrons)									*/
+	void setVolumeMass(btScalar mass);
+	/* Set volume density (using tetrahedrons)								*/
+	void setVolumeDensity(btScalar density);
+	/* Get the linear velocity of the center of mass                        */
+	btVector3 getLinearVelocity();
+	/* Set the linear velocity of the center of mass                        */
+	void setLinearVelocity(const btVector3& linVel);
+	/* Set the angular velocity of the center of mass                       */
+	void setAngularVelocity(const btVector3& angVel);
+	/* Get best fit rigid transform                                         */
+	btTransform getRigidTransform();
+	/* Transform to given pose                                              */
+	virtual void transformTo(const btTransform& trs);
+	/* Transform															*/
+	virtual void transform(const btTransform& trs);
+	/* Translate															*/
+	virtual void translate(const btVector3& trs);
+	/* Rotate															*/
+	virtual void rotate(const btQuaternion& rot);
+	/* Scale																*/
+	virtual void scale(const btVector3& scl);
+	/* Get link resting lengths scale										*/
+	btScalar getRestLengthScale();
+	/* Scale resting length of all springs									*/
+	void setRestLengthScale(btScalar restLength);
+	/* Set current state as pose											*/
+	void setPose(bool bvolume,
+				 bool bframe);
+	/* Set current link lengths as resting lengths							*/
+	void resetLinkRestLengths();
+	/* Return the volume													*/
+	btScalar getVolume() const;
+	/* Cluster count														*/
+	btVector3 getCenterOfMass() const
+	{
+		btVector3 com(0, 0, 0);
+		for (int i = 0; i < m_nodes.size(); i++)
+		{
+			com += (m_nodes[i].m_x * this->getMass(i));
+		}
+		com /= this->getTotalMass();
+		return com;
+	}
+	int clusterCount() const;
+	/* Cluster center of mass												*/
+	static btVector3 clusterCom(const Cluster* cluster);
+	btVector3 clusterCom(int cluster) const;
+	/* Cluster velocity at rpos												*/
+	static btVector3 clusterVelocity(const Cluster* cluster, const btVector3& rpos);
+	/* Cluster impulse														*/
+	static void clusterVImpulse(Cluster* cluster, const btVector3& rpos, const btVector3& impulse);
+	static void clusterDImpulse(Cluster* cluster, const btVector3& rpos, const btVector3& impulse);
+	static void clusterImpulse(Cluster* cluster, const btVector3& rpos, const Impulse& impulse);
+	static void clusterVAImpulse(Cluster* cluster, const btVector3& impulse);
+	static void clusterDAImpulse(Cluster* cluster, const btVector3& impulse);
+	static void clusterAImpulse(Cluster* cluster, const Impulse& impulse);
+	static void clusterDCImpulse(Cluster* cluster, const btVector3& impulse);
+	/* Generate bending constraints based on distance in the adjency graph	*/
+	int generateBendingConstraints(int distance,
+								   Material* mat = 0);
+	/* Randomize constraints to reduce solver bias							*/
+	void randomizeConstraints();
+
+	void updateState(const btAlignedObjectArray<btVector3>& qs, const btAlignedObjectArray<btVector3>& vs);
+
+	/* Release clusters														*/
+	void releaseCluster(int index);
+	void releaseClusters();
+	/* Generate clusters (K-mean)											*/
+	///generateClusters with k=0 will create a convex cluster for each tetrahedron or triangle
+	///otherwise an approximation will be used (better performance)
+	int generateClusters(int k, int maxiterations = 8192);
+	/* Refine																*/
+	void refine(ImplicitFn* ifn, btScalar accurary, bool cut);
+	/* CutLink																*/
+	bool cutLink(int node0, int node1, btScalar position);
+	bool cutLink(const Node* node0, const Node* node1, btScalar position);
+
+	///Ray casting using rayFrom and rayTo in worldspace, (not direction!)
+	bool rayTest(const btVector3& rayFrom,
+				 const btVector3& rayTo,
+				 sRayCast& results);
+	bool rayFaceTest(const btVector3& rayFrom,
+					 const btVector3& rayTo,
+					 sRayCast& results);
+	int rayFaceTest(const btVector3& rayFrom, const btVector3& rayTo,
+					btScalar& mint, int& index) const;
+	/* Solver presets														*/
+	void setSolver(eSolverPresets::_ preset);
+	/* predictMotion														*/
+	void predictMotion(btScalar dt);
+	/* solveConstraints														*/
+	void solveConstraints();
+	/* staticSolve															*/
+	void staticSolve(int iterations);
+	/* solveCommonConstraints												*/
+	static void solveCommonConstraints(btSoftBody** bodies, int count, int iterations);
+	/* solveClusters														*/
+	static void solveClusters(const btAlignedObjectArray<btSoftBody*>& bodies);
+	/* integrateMotion														*/
+	void integrateMotion();
+	/* defaultCollisionHandlers												*/
+	void defaultCollisionHandler(const btCollisionObjectWrapper* pcoWrap);
+	void defaultCollisionHandler(btSoftBody* psb);
+	void setSelfCollision(bool useSelfCollision);
+	bool useSelfCollision();
+	void updateDeactivation(btScalar timeStep);
+	void setZeroVelocity();
+	bool wantsSleeping();
+
+	virtual btMatrix3x3 getImpulseFactor(int n_node)
+	{
+		btMatrix3x3 tmp;
+		tmp.setIdentity();
+		return tmp;
+	}
+
+	//
+	// Functionality to deal with new accelerated solvers.
+	//
+
+	/**
+	 * Set a wind velocity for interaction with the air.
+	 */
+	void setWindVelocity(const btVector3& velocity);
+
+	/**
+	 * Return the wind velocity for interaction with the air.
+	 */
+	const btVector3& getWindVelocity();
+
+	//
+	// Set the solver that handles this soft body
+	// Should not be allowed to get out of sync with reality
+	// Currently called internally on addition to the world
+	void setSoftBodySolver(btSoftBodySolver* softBodySolver)
+	{
+		m_softBodySolver = softBodySolver;
+	}
+
+	//
+	// Return the solver that handles this soft body
+	//
+	btSoftBodySolver* getSoftBodySolver()
+	{
+		return m_softBodySolver;
+	}
+
+	//
+	// Return the solver that handles this soft body
+	//
+	btSoftBodySolver* getSoftBodySolver() const
+	{
+		return m_softBodySolver;
+	}
+
+	//
+	// Cast
+	//
+
+	static const btSoftBody* upcast(const btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType() == CO_SOFT_BODY)
+			return (const btSoftBody*)colObj;
+		return 0;
+	}
+	static btSoftBody* upcast(btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType() == CO_SOFT_BODY)
+			return (btSoftBody*)colObj;
+		return 0;
+	}
+
+	//
+	// ::btCollisionObject
+	//
+
+	virtual void getAabb(btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		aabbMin = m_bounds[0];
+		aabbMax = m_bounds[1];
+	}
+	//
+	// Private
+	//
+	void pointersToIndices();
+	void indicesToPointers(const int* map = 0);
+
+	int rayTest(const btVector3& rayFrom, const btVector3& rayTo,
+				btScalar& mint, eFeature::_& feature, int& index, bool bcountonly) const;
+	void initializeFaceTree();
+	void rebuildNodeTree();
+	btVector3 evaluateCom() const;
+	bool checkDeformableContact(const btCollisionObjectWrapper* colObjWrap, const btVector3& x, btScalar margin, btSoftBody::sCti& cti, bool predict = false) const;
+	bool checkDeformableFaceContact(const btCollisionObjectWrapper* colObjWrap, Face& f, btVector3& contact_point, btVector3& bary, btScalar margin, btSoftBody::sCti& cti, bool predict = false) const;
+	bool checkContact(const btCollisionObjectWrapper* colObjWrap, const btVector3& x, btScalar margin, btSoftBody::sCti& cti) const;
+	void updateNormals();
+	void updateBounds();
+	void updatePose();
+	void updateConstants();
+	void updateLinkConstants();
+	void updateArea(bool averageArea = true);
+	void initializeClusters();
+	void updateClusters();
+	void cleanupClusters();
+	void prepareClusters(int iterations);
+	void solveClusters(btScalar sor);
+	void applyClusters(bool drift);
+	void dampClusters();
+	void setSpringStiffness(btScalar k);
+	void setGravityFactor(btScalar gravFactor);
+	void setCacheBarycenter(bool cacheBarycenter);
+	void initializeDmInverse();
+	void updateDeformation();
+	void advanceDeformation();
+	void applyForces();
+	void setMaxStress(btScalar maxStress);
+	void interpolateRenderMesh();
+	void setCollisionQuadrature(int N);
+	static void PSolve_Anchors(btSoftBody* psb, btScalar kst, btScalar ti);
+	static void PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti);
+	static void PSolve_SContacts(btSoftBody* psb, btScalar, btScalar ti);
+	static void PSolve_Links(btSoftBody* psb, btScalar kst, btScalar ti);
+	static void VSolve_Links(btSoftBody* psb, btScalar kst);
+	static psolver_t getSolver(ePSolver::_ solver);
+	static vsolver_t getSolver(eVSolver::_ solver);
+	void geometricCollisionHandler(btSoftBody* psb);
+#define SAFE_EPSILON SIMD_EPSILON * 100.0
+	void updateNode(btDbvtNode* node, bool use_velocity, bool margin)
+	{
+		if (node->isleaf())
+		{
+			btSoftBody::Node* n = (btSoftBody::Node*)(node->data);
+			ATTRIBUTE_ALIGNED16(btDbvtVolume)
+			vol;
+			btScalar pad = margin ? m_sst.radmrg : SAFE_EPSILON;  // use user defined margin or margin for floating point precision
+			if (use_velocity)
+			{
+				btVector3 points[2] = {n->m_x, n->m_x + m_sst.sdt * n->m_v};
+				vol = btDbvtVolume::FromPoints(points, 2);
+				vol.Expand(btVector3(pad, pad, pad));
+			}
+			else
+			{
+				vol = btDbvtVolume::FromCR(n->m_x, pad);
+			}
+			node->volume = vol;
+			return;
+		}
+		else
+		{
+			updateNode(node->childs[0], use_velocity, margin);
+			updateNode(node->childs[1], use_velocity, margin);
+			ATTRIBUTE_ALIGNED16(btDbvtVolume)
+			vol;
+			Merge(node->childs[0]->volume, node->childs[1]->volume, vol);
+			node->volume = vol;
+		}
+	}
+
+	void updateNodeTree(bool use_velocity, bool margin)
+	{
+		if (m_ndbvt.m_root)
+			updateNode(m_ndbvt.m_root, use_velocity, margin);
+	}
+
+	template <class DBVTNODE>  // btDbvtNode or btDbvntNode
+	void updateFace(DBVTNODE* node, bool use_velocity, bool margin)
+	{
+		if (node->isleaf())
+		{
+			btSoftBody::Face* f = (btSoftBody::Face*)(node->data);
+			btScalar pad = margin ? m_sst.radmrg : SAFE_EPSILON;  // use user defined margin or margin for floating point precision
+			ATTRIBUTE_ALIGNED16(btDbvtVolume)
+			vol;
+			if (use_velocity)
+			{
+				btVector3 points[6] = {f->m_n[0]->m_x, f->m_n[0]->m_x + m_sst.sdt * f->m_n[0]->m_v,
+									   f->m_n[1]->m_x, f->m_n[1]->m_x + m_sst.sdt * f->m_n[1]->m_v,
+									   f->m_n[2]->m_x, f->m_n[2]->m_x + m_sst.sdt * f->m_n[2]->m_v};
+				vol = btDbvtVolume::FromPoints(points, 6);
+			}
+			else
+			{
+				btVector3 points[3] = {f->m_n[0]->m_x,
+									   f->m_n[1]->m_x,
+									   f->m_n[2]->m_x};
+				vol = btDbvtVolume::FromPoints(points, 3);
+			}
+			vol.Expand(btVector3(pad, pad, pad));
+			node->volume = vol;
+			return;
+		}
+		else
+		{
+			updateFace(node->childs[0], use_velocity, margin);
+			updateFace(node->childs[1], use_velocity, margin);
+			ATTRIBUTE_ALIGNED16(btDbvtVolume)
+			vol;
+			Merge(node->childs[0]->volume, node->childs[1]->volume, vol);
+			node->volume = vol;
+		}
+	}
+	void updateFaceTree(bool use_velocity, bool margin)
+	{
+		if (m_fdbvt.m_root)
+			updateFace(m_fdbvt.m_root, use_velocity, margin);
+		if (m_fdbvnt)
+			updateFace(m_fdbvnt, use_velocity, margin);
+	}
+
+	template <typename T>
+	static inline T BaryEval(const T& a,
+							 const T& b,
+							 const T& c,
+							 const btVector3& coord)
+	{
+		return (a * coord.x() + b * coord.y() + c * coord.z());
+	}
+
+	void applyRepulsionForce(btScalar timeStep, bool applySpringForce)
+	{
+		btAlignedObjectArray<int> indices;
+		{
+			// randomize the order of repulsive force
+			indices.resize(m_faceNodeContacts.size());
+			for (int i = 0; i < m_faceNodeContacts.size(); ++i)
+				indices[i] = i;
+#define NEXTRAND (seed = (1664525L * seed + 1013904223L) & 0xffffffff)
+			int i, ni;
+
+			for (i = 0, ni = indices.size(); i < ni; ++i)
+			{
+				btSwap(indices[i], indices[NEXTRAND % ni]);
+			}
+		}
+		for (int k = 0; k < m_faceNodeContacts.size(); ++k)
+		{
+			int idx = indices[k];
+			btSoftBody::DeformableFaceNodeContact& c = m_faceNodeContacts[idx];
+			btSoftBody::Node* node = c.m_node;
+			btSoftBody::Face* face = c.m_face;
+			const btVector3& w = c.m_bary;
+			const btVector3& n = c.m_normal;
+			btVector3 l = node->m_x - BaryEval(face->m_n[0]->m_x, face->m_n[1]->m_x, face->m_n[2]->m_x, w);
+			btScalar d = c.m_margin - n.dot(l);
+			d = btMax(btScalar(0), d);
+
+			const btVector3& va = node->m_v;
+			btVector3 vb = BaryEval(face->m_n[0]->m_v, face->m_n[1]->m_v, face->m_n[2]->m_v, w);
+			btVector3 vr = va - vb;
+			const btScalar vn = btDot(vr, n);  // dn < 0 <==> opposing
+			if (vn > OVERLAP_REDUCTION_FACTOR * d / timeStep)
+				continue;
+			btVector3 vt = vr - vn * n;
+			btScalar I = 0;
+			btScalar mass = node->m_im == 0 ? 0 : btScalar(1) / node->m_im;
+			if (applySpringForce)
+				I = -btMin(m_repulsionStiffness * timeStep * d, mass * (OVERLAP_REDUCTION_FACTOR * d / timeStep - vn));
+			if (vn < 0)
+				I += 0.5 * mass * vn;
+			int face_penetration = 0, node_penetration = node->m_constrained;
+			for (int i = 0; i < 3; ++i)
+				face_penetration |= face->m_n[i]->m_constrained;
+			btScalar I_tilde = 2.0 * I / (1.0 + w.length2());
+
+			//             double the impulse if node or face is constrained.
+			if (face_penetration > 0 || node_penetration > 0)
+			{
+				I_tilde *= 2.0;
+			}
+			if (face_penetration <= 0)
+			{
+				for (int j = 0; j < 3; ++j)
+					face->m_n[j]->m_v += w[j] * n * I_tilde * node->m_im;
+			}
+			if (node_penetration <= 0)
+			{
+				node->m_v -= I_tilde * node->m_im * n;
+			}
+
+			// apply frictional impulse
+			btScalar vt_norm = vt.safeNorm();
+			if (vt_norm > SIMD_EPSILON)
+			{
+				btScalar delta_vn = -2 * I * node->m_im;
+				btScalar mu = c.m_friction;
+				btScalar vt_new = btMax(btScalar(1) - mu * delta_vn / (vt_norm + SIMD_EPSILON), btScalar(0)) * vt_norm;
+				I = 0.5 * mass * (vt_norm - vt_new);
+				vt.safeNormalize();
+				I_tilde = 2.0 * I / (1.0 + w.length2());
+				//                 double the impulse if node or face is constrained.
+				if (face_penetration > 0 || node_penetration > 0)
+					I_tilde *= 2.0;
+				if (face_penetration <= 0)
+				{
+					for (int j = 0; j < 3; ++j)
+						face->m_n[j]->m_v += w[j] * vt * I_tilde * (face->m_n[j])->m_im;
+				}
+				if (node_penetration <= 0)
+				{
+					node->m_v -= I_tilde * node->m_im * vt;
+				}
+			}
+		}
+	}
+	virtual int calculateSerializeBufferSize() const;
+
+	///fills the dataBuffer and returns the struct name (and 0 on failure)
+	virtual const char* serialize(void* dataBuffer, class btSerializer* serializer) const;
+};
+
+#endif  //_BT_SOFT_BODY_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
new file mode 100644
index 0000000..383f528
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
@@ -0,0 +1,315 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftBodyConcaveCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionShapes/btConcaveShape.h"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btTetrahedronShape.h"
+#include "BulletCollision/CollisionShapes/btConvexHullShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletSoftBody/btSoftBody.h"
+
+#define BT_SOFTBODY_TRIANGLE_EXTRUSION btScalar(0.06)  //make this configurable
+
+btSoftBodyConcaveCollisionAlgorithm::btSoftBodyConcaveCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped)
+	: btCollisionAlgorithm(ci),
+	  m_isSwapped(isSwapped),
+	  m_btSoftBodyTriangleCallback(ci.m_dispatcher1, body0Wrap, body1Wrap, isSwapped)
+{
+}
+
+btSoftBodyConcaveCollisionAlgorithm::~btSoftBodyConcaveCollisionAlgorithm()
+{
+}
+
+btSoftBodyTriangleCallback::btSoftBodyTriangleCallback(btDispatcher* dispatcher, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped) : m_dispatcher(dispatcher),
+																																														 m_dispatchInfoPtr(0)
+{
+	m_softBody = (isSwapped ? (btSoftBody*)body1Wrap->getCollisionObject() : (btSoftBody*)body0Wrap->getCollisionObject());
+	m_triBody = isSwapped ? body0Wrap->getCollisionObject() : body1Wrap->getCollisionObject();
+
+	//
+	// create the manifold from the dispatcher 'manifold pool'
+	//
+	//	  m_manifoldPtr = m_dispatcher->getNewManifold(m_convexBody,m_triBody);
+
+	clearCache();
+}
+
+btSoftBodyTriangleCallback::~btSoftBodyTriangleCallback()
+{
+	clearCache();
+	//	m_dispatcher->releaseManifold( m_manifoldPtr );
+}
+
+void btSoftBodyTriangleCallback::clearCache()
+{
+	for (int i = 0; i < m_shapeCache.size(); i++)
+	{
+		btTriIndex* tmp = m_shapeCache.getAtIndex(i);
+		btAssert(tmp);
+		btAssert(tmp->m_childShape);
+		m_softBody->getWorldInfo()->m_sparsesdf.RemoveReferences(tmp->m_childShape);  //necessary?
+		delete tmp->m_childShape;
+	}
+	m_shapeCache.clear();
+}
+
+void btSoftBodyTriangleCallback::processTriangle(btVector3* triangle, int partId, int triangleIndex)
+{
+	//just for debugging purposes
+	//printf("triangle %d",m_triangleCount++);
+
+	btCollisionAlgorithmConstructionInfo ci;
+	ci.m_dispatcher1 = m_dispatcher;
+
+	///debug drawing of the overlapping triangles
+	if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && (m_dispatchInfoPtr->m_debugDraw->getDebugMode() & btIDebugDraw::DBG_DrawWireframe))
+	{
+		btVector3 color(1, 1, 0);
+		const btTransform& tr = m_triBody->getWorldTransform();
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]), tr(triangle[1]), color);
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]), tr(triangle[2]), color);
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]), tr(triangle[0]), color);
+	}
+
+	btTriIndex triIndex(partId, triangleIndex, 0);
+	btHashKey<btTriIndex> triKey(triIndex.getUid());
+
+	btTriIndex* shapeIndex = m_shapeCache[triKey];
+	if (shapeIndex)
+	{
+		btCollisionShape* tm = shapeIndex->m_childShape;
+		btAssert(tm);
+
+		//copy over user pointers to temporary shape
+		tm->setUserPointer(m_triBody->getCollisionShape()->getUserPointer());
+
+		btCollisionObjectWrapper softBody(0, m_softBody->getCollisionShape(), m_softBody, m_softBody->getWorldTransform(), -1, -1);
+		//btCollisionObjectWrapper triBody(0,tm, ob, btTransform::getIdentity());//ob->getWorldTransform());//??
+		btCollisionObjectWrapper triBody(0, tm, m_triBody, m_triBody->getWorldTransform(), partId, triangleIndex);
+		ebtDispatcherQueryType algoType = m_resultOut->m_closestPointDistanceThreshold > 0 ? BT_CLOSEST_POINT_ALGORITHMS : BT_CONTACT_POINT_ALGORITHMS;
+		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(&softBody, &triBody, 0, algoType);  //m_manifoldPtr);
+
+		colAlgo->processCollision(&softBody, &triBody, *m_dispatchInfoPtr, m_resultOut);
+		colAlgo->~btCollisionAlgorithm();
+		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
+
+		return;
+	}
+
+	//aabb filter is already applied!
+
+	//btCollisionObject* colObj = static_cast<btCollisionObject*>(m_convexProxy->m_clientObject);
+
+	//	if (m_softBody->getCollisionShape()->getShapeType()==
+	{
+		//		btVector3 other;
+		btVector3 normal = (triangle[1] - triangle[0]).cross(triangle[2] - triangle[0]);
+		normal.normalize();
+		normal *= BT_SOFTBODY_TRIANGLE_EXTRUSION;
+		//		other=(triangle[0]+triangle[1]+triangle[2])*0.333333f;
+		//		other+=normal*22.f;
+		btVector3 pts[6] = {triangle[0] + normal,
+							triangle[1] + normal,
+							triangle[2] + normal,
+							triangle[0] - normal,
+							triangle[1] - normal,
+							triangle[2] - normal};
+
+		btConvexHullShape* tm = new btConvexHullShape(&pts[0].getX(), 6);
+
+		//		btBU_Simplex1to4 tm(triangle[0],triangle[1],triangle[2],other);
+
+		//btTriangleShape tm(triangle[0],triangle[1],triangle[2]);
+		//	tm.setMargin(m_collisionMarginTriangle);
+
+		//copy over user pointers to temporary shape
+		tm->setUserPointer(m_triBody->getCollisionShape()->getUserPointer());
+
+		btCollisionObjectWrapper softBody(0, m_softBody->getCollisionShape(), m_softBody, m_softBody->getWorldTransform(), -1, -1);
+		btCollisionObjectWrapper triBody(0, tm, m_triBody, m_triBody->getWorldTransform(), partId, triangleIndex);  //btTransform::getIdentity());//??
+
+		ebtDispatcherQueryType algoType = m_resultOut->m_closestPointDistanceThreshold > 0 ? BT_CLOSEST_POINT_ALGORITHMS : BT_CONTACT_POINT_ALGORITHMS;
+		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(&softBody, &triBody, 0, algoType);  //m_manifoldPtr);
+
+		colAlgo->processCollision(&softBody, &triBody, *m_dispatchInfoPtr, m_resultOut);
+		colAlgo->~btCollisionAlgorithm();
+		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
+
+		triIndex.m_childShape = tm;
+		m_shapeCache.insert(triKey, triIndex);
+	}
+}
+
+void btSoftBodyTriangleCallback::setTimeStepAndCounters(btScalar collisionMarginTriangle, const btCollisionObjectWrapper* triBodyWrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	m_dispatchInfoPtr = &dispatchInfo;
+	m_collisionMarginTriangle = collisionMarginTriangle + btScalar(BT_SOFTBODY_TRIANGLE_EXTRUSION);
+	m_resultOut = resultOut;
+
+	btVector3 aabbWorldSpaceMin, aabbWorldSpaceMax;
+	m_softBody->getAabb(aabbWorldSpaceMin, aabbWorldSpaceMax);
+	btVector3 halfExtents = (aabbWorldSpaceMax - aabbWorldSpaceMin) * btScalar(0.5);
+	btVector3 softBodyCenter = (aabbWorldSpaceMax + aabbWorldSpaceMin) * btScalar(0.5);
+
+	btTransform softTransform;
+	softTransform.setIdentity();
+	softTransform.setOrigin(softBodyCenter);
+
+	btTransform convexInTriangleSpace;
+	convexInTriangleSpace = triBodyWrap->getWorldTransform().inverse() * softTransform;
+	btTransformAabb(halfExtents, m_collisionMarginTriangle, convexInTriangleSpace, m_aabbMin, m_aabbMax);
+}
+
+void btSoftBodyConcaveCollisionAlgorithm::clearCache()
+{
+	m_btSoftBodyTriangleCallback.clearCache();
+}
+
+void btSoftBodyConcaveCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	//btCollisionObject* convexBody = m_isSwapped ? body1 : body0;
+	const btCollisionObjectWrapper* triBody = m_isSwapped ? body0Wrap : body1Wrap;
+
+	if (triBody->getCollisionShape()->isConcave())
+	{
+		const btConcaveShape* concaveShape = static_cast<const btConcaveShape*>(triBody->getCollisionShape());
+
+		//	if (convexBody->getCollisionShape()->isConvex())
+		{
+			btScalar collisionMarginTriangle = concaveShape->getMargin();
+
+			//			resultOut->setPersistentManifold(m_btSoftBodyTriangleCallback.m_manifoldPtr);
+			m_btSoftBodyTriangleCallback.setTimeStepAndCounters(collisionMarginTriangle, triBody, dispatchInfo, resultOut);
+
+			concaveShape->processAllTriangles(&m_btSoftBodyTriangleCallback, m_btSoftBodyTriangleCallback.getAabbMin(), m_btSoftBodyTriangleCallback.getAabbMax());
+
+			//	resultOut->refreshContactPoints();
+		}
+	}
+}
+
+btScalar btSoftBodyConcaveCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	btCollisionObject* convexbody = m_isSwapped ? body1 : body0;
+	btCollisionObject* triBody = m_isSwapped ? body0 : body1;
+
+	//quick approximation using raycast, todo: hook up to the continuous collision detection (one of the btConvexCast)
+
+	//only perform CCD above a certain threshold, this prevents blocking on the long run
+	//because object in a blocked ccd state (hitfraction<1) get their linear velocity halved each frame...
+	btScalar squareMot0 = (convexbody->getInterpolationWorldTransform().getOrigin() - convexbody->getWorldTransform().getOrigin()).length2();
+	if (squareMot0 < convexbody->getCcdSquareMotionThreshold())
+	{
+		return btScalar(1.);
+	}
+
+	//const btVector3& from = convexbody->m_worldTransform.getOrigin();
+	//btVector3 to = convexbody->m_interpolationWorldTransform.getOrigin();
+	//todo: only do if the motion exceeds the 'radius'
+
+	btTransform triInv = triBody->getWorldTransform().inverse();
+	btTransform convexFromLocal = triInv * convexbody->getWorldTransform();
+	btTransform convexToLocal = triInv * convexbody->getInterpolationWorldTransform();
+
+	struct LocalTriangleSphereCastCallback : public btTriangleCallback
+	{
+		btTransform m_ccdSphereFromTrans;
+		btTransform m_ccdSphereToTrans;
+		btTransform m_meshTransform;
+
+		btScalar m_ccdSphereRadius;
+		btScalar m_hitFraction;
+
+		LocalTriangleSphereCastCallback(const btTransform& from, const btTransform& to, btScalar ccdSphereRadius, btScalar hitFraction)
+			: m_ccdSphereFromTrans(from),
+			  m_ccdSphereToTrans(to),
+			  m_ccdSphereRadius(ccdSphereRadius),
+			  m_hitFraction(hitFraction)
+		{
+		}
+
+		virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+		{
+			(void)partId;
+			(void)triangleIndex;
+			//do a swept sphere for now
+			btTransform ident;
+			ident.setIdentity();
+			btConvexCast::CastResult castResult;
+			castResult.m_fraction = m_hitFraction;
+			btSphereShape pointShape(m_ccdSphereRadius);
+			btTriangleShape triShape(triangle[0], triangle[1], triangle[2]);
+			btVoronoiSimplexSolver simplexSolver;
+			btSubsimplexConvexCast convexCaster(&pointShape, &triShape, &simplexSolver);
+			//GjkConvexCast	convexCaster(&pointShape,convexShape,&simplexSolver);
+			//ContinuousConvexCollision convexCaster(&pointShape,convexShape,&simplexSolver,0);
+			//local space?
+
+			if (convexCaster.calcTimeOfImpact(m_ccdSphereFromTrans, m_ccdSphereToTrans,
+											  ident, ident, castResult))
+			{
+				if (m_hitFraction > castResult.m_fraction)
+					m_hitFraction = castResult.m_fraction;
+			}
+		}
+	};
+
+	if (triBody->getCollisionShape()->isConcave())
+	{
+		btVector3 rayAabbMin = convexFromLocal.getOrigin();
+		rayAabbMin.setMin(convexToLocal.getOrigin());
+		btVector3 rayAabbMax = convexFromLocal.getOrigin();
+		rayAabbMax.setMax(convexToLocal.getOrigin());
+		btScalar ccdRadius0 = convexbody->getCcdSweptSphereRadius();
+		rayAabbMin -= btVector3(ccdRadius0, ccdRadius0, ccdRadius0);
+		rayAabbMax += btVector3(ccdRadius0, ccdRadius0, ccdRadius0);
+
+		btScalar curHitFraction = btScalar(1.);  //is this available?
+		LocalTriangleSphereCastCallback raycastCallback(convexFromLocal, convexToLocal,
+														convexbody->getCcdSweptSphereRadius(), curHitFraction);
+
+		raycastCallback.m_hitFraction = convexbody->getHitFraction();
+
+		btCollisionObject* concavebody = triBody;
+
+		btConcaveShape* triangleMesh = (btConcaveShape*)concavebody->getCollisionShape();
+
+		if (triangleMesh)
+		{
+			triangleMesh->processAllTriangles(&raycastCallback, rayAabbMin, rayAabbMax);
+		}
+
+		if (raycastCallback.m_hitFraction < convexbody->getHitFraction())
+		{
+			convexbody->setHitFraction(raycastCallback.m_hitFraction);
+			return raycastCallback.m_hitFraction;
+		}
+	}
+
+	return btScalar(1.);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
new file mode 100644
index 0000000..0dbceeb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
@@ -0,0 +1,147 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
+#define BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btDispatcher;
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btSoftBody;
+class btCollisionShape;
+
+#include "LinearMath/btHashMap.h"
+
+#include "BulletCollision/BroadphaseCollision/btQuantizedBvh.h"  //for definition of MAX_NUM_PARTS_IN_BITS
+
+struct btTriIndex
+{
+	int m_PartIdTriangleIndex;
+	class btCollisionShape* m_childShape;
+
+	btTriIndex(int partId, int triangleIndex, btCollisionShape* shape)
+	{
+		m_PartIdTriangleIndex = (partId << (31 - MAX_NUM_PARTS_IN_BITS)) | triangleIndex;
+		m_childShape = shape;
+	}
+
+	int getTriangleIndex() const
+	{
+		// Get only the lower bits where the triangle index is stored
+		unsigned int x = 0;
+		unsigned int y = (~(x & 0)) << (31 - MAX_NUM_PARTS_IN_BITS);
+		return (m_PartIdTriangleIndex & ~(y));
+	}
+	int getPartId() const
+	{
+		// Get only the highest bits where the part index is stored
+		return (m_PartIdTriangleIndex >> (31 - MAX_NUM_PARTS_IN_BITS));
+	}
+	int getUid() const
+	{
+		return m_PartIdTriangleIndex;
+	}
+};
+
+///For each triangle in the concave mesh that overlaps with the AABB of a soft body (m_softBody), processTriangle is called.
+class btSoftBodyTriangleCallback : public btTriangleCallback
+{
+	btSoftBody* m_softBody;
+	const btCollisionObject* m_triBody;
+
+	btVector3 m_aabbMin;
+	btVector3 m_aabbMax;
+
+	btManifoldResult* m_resultOut;
+
+	btDispatcher* m_dispatcher;
+	const btDispatcherInfo* m_dispatchInfoPtr;
+	btScalar m_collisionMarginTriangle;
+
+	btHashMap<btHashKey<btTriIndex>, btTriIndex> m_shapeCache;
+
+public:
+	int m_triangleCount;
+
+	//	btPersistentManifold*	m_manifoldPtr;
+
+	btSoftBodyTriangleCallback(btDispatcher* dispatcher, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped);
+
+	void setTimeStepAndCounters(btScalar collisionMarginTriangle, const btCollisionObjectWrapper* triObjWrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual ~btSoftBodyTriangleCallback();
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
+
+	void clearCache();
+
+	SIMD_FORCE_INLINE const btVector3& getAabbMin() const
+	{
+		return m_aabbMin;
+	}
+	SIMD_FORCE_INLINE const btVector3& getAabbMax() const
+	{
+		return m_aabbMax;
+	}
+};
+
+/// btSoftBodyConcaveCollisionAlgorithm  supports collision between soft body shapes and (concave) trianges meshes.
+class btSoftBodyConcaveCollisionAlgorithm : public btCollisionAlgorithm
+{
+	bool m_isSwapped;
+
+	btSoftBodyTriangleCallback m_btSoftBodyTriangleCallback;
+
+public:
+	btSoftBodyConcaveCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, bool isSwapped);
+
+	virtual ~btSoftBodyConcaveCollisionAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		//we don't add any manifolds
+	}
+
+	void clearCache();
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftBodyConcaveCollisionAlgorithm));
+			return new (mem) btSoftBodyConcaveCollisionAlgorithm(ci, body0Wrap, body1Wrap, false);
+		}
+	};
+
+	struct SwappedCreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftBodyConcaveCollisionAlgorithm));
+			return new (mem) btSoftBodyConcaveCollisionAlgorithm(ci, body0Wrap, body1Wrap, true);
+		}
+	};
+};
+
+#endif  //BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyData.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyData.h
new file mode 100644
index 0000000..8469c3c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyData.h
@@ -0,0 +1,212 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFTBODY_FLOAT_DATA
+#define BT_SOFTBODY_FLOAT_DATA
+
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+struct SoftBodyMaterialData
+{
+	float m_linearStiffness;
+	float m_angularStiffness;
+	float m_volumeStiffness;
+	int m_flags;
+};
+
+struct SoftBodyNodeData
+{
+	SoftBodyMaterialData *m_material;
+	btVector3FloatData m_position;
+	btVector3FloatData m_previousPosition;
+	btVector3FloatData m_velocity;
+	btVector3FloatData m_accumulatedForce;
+	btVector3FloatData m_normal;
+	float m_inverseMass;
+	float m_area;
+	int m_attach;
+	int m_pad;
+};
+
+struct SoftBodyLinkData
+{
+	SoftBodyMaterialData *m_material;
+	int m_nodeIndices[2];  // Node pointers
+	float m_restLength;    // Rest length
+	int m_bbending;        // Bending link
+};
+
+struct SoftBodyFaceData
+{
+	btVector3FloatData m_normal;  // Normal
+	SoftBodyMaterialData *m_material;
+	int m_nodeIndices[3];  // Node pointers
+	float m_restArea;      // Rest area
+};
+
+struct SoftBodyTetraData
+{
+	btVector3FloatData m_c0[4];  // gradients
+	SoftBodyMaterialData *m_material;
+	int m_nodeIndices[4];  // Node pointers
+	float m_restVolume;    // Rest volume
+	float m_c1;            // (4*kVST)/(im0+im1+im2+im3)
+	float m_c2;            // m_c1/sum(|g0..3|^2)
+	int m_pad;
+};
+
+struct SoftRigidAnchorData
+{
+	btMatrix3x3FloatData m_c0;        // Impulse matrix
+	btVector3FloatData m_c1;          // Relative anchor
+	btVector3FloatData m_localFrame;  // Anchor position in body space
+	btRigidBodyData *m_rigidBody;
+	int m_nodeIndex;  // Node pointer
+	float m_c2;       // ima*dt
+};
+
+struct SoftBodyConfigData
+{
+	int m_aeroModel;                         // Aerodynamic model (default: V_Point)
+	float m_baumgarte;                       // Velocities correction factor (Baumgarte)
+	float m_damping;                         // Damping coefficient [0,1]
+	float m_drag;                            // Drag coefficient [0,+inf]
+	float m_lift;                            // Lift coefficient [0,+inf]
+	float m_pressure;                        // Pressure coefficient [-inf,+inf]
+	float m_volume;                          // Volume conversation coefficient [0,+inf]
+	float m_dynamicFriction;                 // Dynamic friction coefficient [0,1]
+	float m_poseMatch;                       // Pose matching coefficient [0,1]
+	float m_rigidContactHardness;            // Rigid contacts hardness [0,1]
+	float m_kineticContactHardness;          // Kinetic contacts hardness [0,1]
+	float m_softContactHardness;             // Soft contacts hardness [0,1]
+	float m_anchorHardness;                  // Anchors hardness [0,1]
+	float m_softRigidClusterHardness;        // Soft vs rigid hardness [0,1] (cluster only)
+	float m_softKineticClusterHardness;      // Soft vs kinetic hardness [0,1] (cluster only)
+	float m_softSoftClusterHardness;         // Soft vs soft hardness [0,1] (cluster only)
+	float m_softRigidClusterImpulseSplit;    // Soft vs rigid impulse split [0,1] (cluster only)
+	float m_softKineticClusterImpulseSplit;  // Soft vs rigid impulse split [0,1] (cluster only)
+	float m_softSoftClusterImpulseSplit;     // Soft vs rigid impulse split [0,1] (cluster only)
+	float m_maxVolume;                       // Maximum volume ratio for pose
+	float m_timeScale;                       // Time scale
+	int m_velocityIterations;                // Velocities solver iterations
+	int m_positionIterations;                // Positions solver iterations
+	int m_driftIterations;                   // Drift solver iterations
+	int m_clusterIterations;                 // Cluster solver iterations
+	int m_collisionFlags;                    // Collisions flags
+};
+
+struct SoftBodyPoseData
+{
+	btMatrix3x3FloatData m_rot;    // Rotation
+	btMatrix3x3FloatData m_scale;  // Scale
+	btMatrix3x3FloatData m_aqq;    // Base scaling
+	btVector3FloatData m_com;      // COM
+
+	btVector3FloatData *m_positions;  // Reference positions
+	float *m_weights;                 // Weights
+	int m_numPositions;
+	int m_numWeigts;
+
+	int m_bvolume;       // Is valid
+	int m_bframe;        // Is frame
+	float m_restVolume;  // Rest volume
+	int m_pad;
+};
+
+struct SoftBodyClusterData
+{
+	btTransformFloatData m_framexform;
+	btMatrix3x3FloatData m_locii;
+	btMatrix3x3FloatData m_invwi;
+	btVector3FloatData m_com;
+	btVector3FloatData m_vimpulses[2];
+	btVector3FloatData m_dimpulses[2];
+	btVector3FloatData m_lv;
+	btVector3FloatData m_av;
+
+	btVector3FloatData *m_framerefs;
+	int *m_nodeIndices;
+	float *m_masses;
+
+	int m_numFrameRefs;
+	int m_numNodes;
+	int m_numMasses;
+
+	float m_idmass;
+	float m_imass;
+	int m_nvimpulses;
+	int m_ndimpulses;
+	float m_ndamping;
+	float m_ldamping;
+	float m_adamping;
+	float m_matching;
+	float m_maxSelfCollisionImpulse;
+	float m_selfCollisionImpulseFactor;
+	int m_containsAnchor;
+	int m_collide;
+	int m_clusterIndex;
+};
+
+enum btSoftJointBodyType
+{
+	BT_JOINT_SOFT_BODY_CLUSTER = 1,
+	BT_JOINT_RIGID_BODY,
+	BT_JOINT_COLLISION_OBJECT
+};
+
+struct btSoftBodyJointData
+{
+	void *m_bodyA;
+	void *m_bodyB;
+	btVector3FloatData m_refs[2];
+	float m_cfm;
+	float m_erp;
+	float m_split;
+	int m_delete;
+	btVector3FloatData m_relPosition[2];  //linear
+	int m_bodyAtype;
+	int m_bodyBtype;
+	int m_jointType;
+	int m_pad;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btSoftBodyFloatData
+{
+	btCollisionObjectFloatData m_collisionObjectData;
+
+	SoftBodyPoseData *m_pose;
+	SoftBodyMaterialData **m_materials;
+	SoftBodyNodeData *m_nodes;
+	SoftBodyLinkData *m_links;
+	SoftBodyFaceData *m_faces;
+	SoftBodyTetraData *m_tetrahedra;
+	SoftRigidAnchorData *m_anchors;
+	SoftBodyClusterData *m_clusters;
+	btSoftBodyJointData *m_joints;
+
+	int m_numMaterials;
+	int m_numNodes;
+	int m_numLinks;
+	int m_numFaces;
+	int m_numTetrahedra;
+	int m_numAnchors;
+	int m_numClusters;
+	int m_numJoints;
+	SoftBodyConfigData m_config;
+};
+
+#endif  //BT_SOFTBODY_FLOAT_DATA
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyHelpers.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyHelpers.cpp
new file mode 100644
index 0000000..fbb7298
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -0,0 +1,1695 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBodyHelpers.cpp by Nathanael Presson
+
+#include "btSoftBodyInternals.h"
+#include <stdio.h>
+#include <string>
+#include <iostream>
+#include <iomanip> 
+#include <sstream>
+#include <string.h>
+#include <algorithm>
+#include "btSoftBodyHelpers.h"
+#include "LinearMath/btConvexHull.h"
+#include "LinearMath/btConvexHullComputer.h"
+#include <map>
+#include <vector>
+
+static void drawVertex(btIDebugDraw* idraw,
+					   const btVector3& x, btScalar s, const btVector3& c)
+{
+	idraw->drawLine(x - btVector3(s, 0, 0), x + btVector3(s, 0, 0), c);
+	idraw->drawLine(x - btVector3(0, s, 0), x + btVector3(0, s, 0), c);
+	idraw->drawLine(x - btVector3(0, 0, s), x + btVector3(0, 0, s), c);
+}
+
+//
+static void drawBox(btIDebugDraw* idraw,
+					const btVector3& mins,
+					const btVector3& maxs,
+					const btVector3& color)
+{
+	const btVector3 c[] = {btVector3(mins.x(), mins.y(), mins.z()),
+						   btVector3(maxs.x(), mins.y(), mins.z()),
+						   btVector3(maxs.x(), maxs.y(), mins.z()),
+						   btVector3(mins.x(), maxs.y(), mins.z()),
+						   btVector3(mins.x(), mins.y(), maxs.z()),
+						   btVector3(maxs.x(), mins.y(), maxs.z()),
+						   btVector3(maxs.x(), maxs.y(), maxs.z()),
+						   btVector3(mins.x(), maxs.y(), maxs.z())};
+	idraw->drawLine(c[0], c[1], color);
+	idraw->drawLine(c[1], c[2], color);
+	idraw->drawLine(c[2], c[3], color);
+	idraw->drawLine(c[3], c[0], color);
+	idraw->drawLine(c[4], c[5], color);
+	idraw->drawLine(c[5], c[6], color);
+	idraw->drawLine(c[6], c[7], color);
+	idraw->drawLine(c[7], c[4], color);
+	idraw->drawLine(c[0], c[4], color);
+	idraw->drawLine(c[1], c[5], color);
+	idraw->drawLine(c[2], c[6], color);
+	idraw->drawLine(c[3], c[7], color);
+}
+
+//
+static void drawTree(btIDebugDraw* idraw,
+					 const btDbvtNode* node,
+					 int depth,
+					 const btVector3& ncolor,
+					 const btVector3& lcolor,
+					 int mindepth,
+					 int maxdepth)
+{
+	if (node)
+	{
+		if (node->isinternal() && ((depth < maxdepth) || (maxdepth < 0)))
+		{
+			drawTree(idraw, node->childs[0], depth + 1, ncolor, lcolor, mindepth, maxdepth);
+			drawTree(idraw, node->childs[1], depth + 1, ncolor, lcolor, mindepth, maxdepth);
+		}
+		if (depth >= mindepth)
+		{
+			const btScalar scl = (btScalar)(node->isinternal() ? 1 : 1);
+			const btVector3 mi = node->volume.Center() - node->volume.Extents() * scl;
+			const btVector3 mx = node->volume.Center() + node->volume.Extents() * scl;
+			drawBox(idraw, mi, mx, node->isleaf() ? lcolor : ncolor);
+		}
+	}
+}
+
+//
+template <typename T>
+static inline T sum(const btAlignedObjectArray<T>& items)
+{
+	T v;
+	if (items.size())
+	{
+		v = items[0];
+		for (int i = 1, ni = items.size(); i < ni; ++i)
+		{
+			v += items[i];
+		}
+	}
+	return (v);
+}
+
+//
+template <typename T, typename Q>
+static inline void add(btAlignedObjectArray<T>& items, const Q& value)
+{
+	for (int i = 0, ni = items.size(); i < ni; ++i)
+	{
+		items[i] += value;
+	}
+}
+
+//
+template <typename T, typename Q>
+static inline void mul(btAlignedObjectArray<T>& items, const Q& value)
+{
+	for (int i = 0, ni = items.size(); i < ni; ++i)
+	{
+		items[i] *= value;
+	}
+}
+
+//
+template <typename T>
+static inline T average(const btAlignedObjectArray<T>& items)
+{
+	const btScalar n = (btScalar)(items.size() > 0 ? items.size() : 1);
+	return (sum(items) / n);
+}
+
+#if 0
+//
+ inline static btScalar		tetravolume(const btVector3& x0,
+										const btVector3& x1,
+										const btVector3& x2,
+										const btVector3& x3)
+{
+	const btVector3	a=x1-x0;
+	const btVector3	b=x2-x0;
+	const btVector3	c=x3-x0;
+	return(btDot(a,btCross(b,c)));
+}
+#endif
+
+//
+#if 0
+static btVector3		stresscolor(btScalar stress)
+{
+	static const btVector3	spectrum[]=	{	btVector3(1,0,1),
+		btVector3(0,0,1),
+		btVector3(0,1,1),
+		btVector3(0,1,0),
+		btVector3(1,1,0),
+		btVector3(1,0,0),
+		btVector3(1,0,0)};
+	static const int		ncolors=sizeof(spectrum)/sizeof(spectrum[0])-1;
+	static const btScalar	one=1;
+	stress=btMax<btScalar>(0,btMin<btScalar>(1,stress))*ncolors;
+	const int				sel=(int)stress;
+	const btScalar			frc=stress-sel;
+	return(spectrum[sel]+(spectrum[sel+1]-spectrum[sel])*frc);
+}
+#endif
+
+//
+void btSoftBodyHelpers::Draw(btSoftBody* psb,
+							 btIDebugDraw* idraw,
+							 int drawflags)
+{
+	const btScalar scl = (btScalar)0.1;
+	const btScalar nscl = scl * 5;
+	const btVector3 lcolor = btVector3(0, 0, 0);
+	const btVector3 ncolor = btVector3(1, 1, 1);
+	const btVector3 ccolor = btVector3(1, 0, 0);
+	int i, j, nj;
+
+	/* Clusters	*/
+	if (0 != (drawflags & fDrawFlags::Clusters))
+	{
+		srand(1806);
+		for (i = 0; i < psb->m_clusters.size(); ++i)
+		{
+			if (psb->m_clusters[i]->m_collide)
+			{
+				btVector3 color(rand() / (btScalar)RAND_MAX,
+								rand() / (btScalar)RAND_MAX,
+								rand() / (btScalar)RAND_MAX);
+				color = color.normalized() * 0.75;
+				btAlignedObjectArray<btVector3> vertices;
+				vertices.resize(psb->m_clusters[i]->m_nodes.size());
+				for (j = 0, nj = vertices.size(); j < nj; ++j)
+				{
+					vertices[j] = psb->m_clusters[i]->m_nodes[j]->m_x;
+				}
+#define USE_NEW_CONVEX_HULL_COMPUTER
+#ifdef USE_NEW_CONVEX_HULL_COMPUTER
+				btConvexHullComputer computer;
+				int stride = sizeof(btVector3);
+				int count = vertices.size();
+				btScalar shrink = 0.f;
+				btScalar shrinkClamp = 0.f;
+				computer.compute(&vertices[0].getX(), stride, count, shrink, shrinkClamp);
+				for (int i = 0; i < computer.faces.size(); i++)
+				{
+					int face = computer.faces[i];
+					//printf("face=%d\n",face);
+					const btConvexHullComputer::Edge* firstEdge = &computer.edges[face];
+					const btConvexHullComputer::Edge* edge = firstEdge->getNextEdgeOfFace();
+
+					int v0 = firstEdge->getSourceVertex();
+					int v1 = firstEdge->getTargetVertex();
+					while (edge != firstEdge)
+					{
+						int v2 = edge->getTargetVertex();
+						idraw->drawTriangle(computer.vertices[v0], computer.vertices[v1], computer.vertices[v2], color, 1);
+						edge = edge->getNextEdgeOfFace();
+						v0 = v1;
+						v1 = v2;
+					};
+				}
+#else
+
+				HullDesc hdsc(QF_TRIANGLES, vertices.size(), &vertices[0]);
+				HullResult hres;
+				HullLibrary hlib;
+				hdsc.mMaxVertices = vertices.size();
+				hlib.CreateConvexHull(hdsc, hres);
+				const btVector3 center = average(hres.m_OutputVertices);
+				add(hres.m_OutputVertices, -center);
+				mul(hres.m_OutputVertices, (btScalar)1);
+				add(hres.m_OutputVertices, center);
+				for (j = 0; j < (int)hres.mNumFaces; ++j)
+				{
+					const int idx[] = {hres.m_Indices[j * 3 + 0], hres.m_Indices[j * 3 + 1], hres.m_Indices[j * 3 + 2]};
+					idraw->drawTriangle(hres.m_OutputVertices[idx[0]],
+										hres.m_OutputVertices[idx[1]],
+										hres.m_OutputVertices[idx[2]],
+										color, 1);
+				}
+				hlib.ReleaseResult(hres);
+#endif
+			}
+			/* Velocities	*/
+#if 0
+			for(int j=0;j<psb->m_clusters[i].m_nodes.size();++j)
+			{
+				const btSoftBody::Cluster&	c=psb->m_clusters[i];
+				const btVector3				r=c.m_nodes[j]->m_x-c.m_com;
+				const btVector3				v=c.m_lv+btCross(c.m_av,r);
+				idraw->drawLine(c.m_nodes[j]->m_x,c.m_nodes[j]->m_x+v,btVector3(1,0,0));
+			}
+#endif
+			/* Frame		*/
+			//		btSoftBody::Cluster& c=*psb->m_clusters[i];
+			//		idraw->drawLine(c.m_com,c.m_framexform*btVector3(10,0,0),btVector3(1,0,0));
+			//		idraw->drawLine(c.m_com,c.m_framexform*btVector3(0,10,0),btVector3(0,1,0));
+			//		idraw->drawLine(c.m_com,c.m_framexform*btVector3(0,0,10),btVector3(0,0,1));
+		}
+	}
+	else
+	{
+		/* Nodes	*/
+		if (0 != (drawflags & fDrawFlags::Nodes))
+		{
+			for (i = 0; i < psb->m_nodes.size(); ++i)
+			{
+				const btSoftBody::Node& n = psb->m_nodes[i];
+				if (0 == (n.m_material->m_flags & btSoftBody::fMaterial::DebugDraw)) continue;
+				idraw->drawLine(n.m_x - btVector3(scl, 0, 0), n.m_x + btVector3(scl, 0, 0), btVector3(1, 0, 0));
+				idraw->drawLine(n.m_x - btVector3(0, scl, 0), n.m_x + btVector3(0, scl, 0), btVector3(0, 1, 0));
+				idraw->drawLine(n.m_x - btVector3(0, 0, scl), n.m_x + btVector3(0, 0, scl), btVector3(0, 0, 1));
+			}
+		}
+		/* Links	*/
+		if (0 != (drawflags & fDrawFlags::Links))
+		{
+			for (i = 0; i < psb->m_links.size(); ++i)
+			{
+				const btSoftBody::Link& l = psb->m_links[i];
+				if (0 == (l.m_material->m_flags & btSoftBody::fMaterial::DebugDraw)) continue;
+				idraw->drawLine(l.m_n[0]->m_x, l.m_n[1]->m_x, lcolor);
+			}
+		}
+		/* Normals	*/
+		if (0 != (drawflags & fDrawFlags::Normals))
+		{
+			for (i = 0; i < psb->m_nodes.size(); ++i)
+			{
+				const btSoftBody::Node& n = psb->m_nodes[i];
+				if (0 == (n.m_material->m_flags & btSoftBody::fMaterial::DebugDraw)) continue;
+				const btVector3 d = n.m_n * nscl;
+				idraw->drawLine(n.m_x, n.m_x + d, ncolor);
+				idraw->drawLine(n.m_x, n.m_x - d, ncolor * 0.5);
+			}
+		}
+		/* Contacts	*/
+		if (0 != (drawflags & fDrawFlags::Contacts))
+		{
+			static const btVector3 axis[] = {btVector3(1, 0, 0),
+											 btVector3(0, 1, 0),
+											 btVector3(0, 0, 1)};
+			for (i = 0; i < psb->m_rcontacts.size(); ++i)
+			{
+				const btSoftBody::RContact& c = psb->m_rcontacts[i];
+				const btVector3 o = c.m_node->m_x - c.m_cti.m_normal *
+														(btDot(c.m_node->m_x, c.m_cti.m_normal) + c.m_cti.m_offset);
+				const btVector3 x = btCross(c.m_cti.m_normal, axis[c.m_cti.m_normal.minAxis()]).normalized();
+				const btVector3 y = btCross(x, c.m_cti.m_normal).normalized();
+				idraw->drawLine(o - x * nscl, o + x * nscl, ccolor);
+				idraw->drawLine(o - y * nscl, o + y * nscl, ccolor);
+				idraw->drawLine(o, o + c.m_cti.m_normal * nscl * 3, btVector3(1, 1, 0));
+			}
+		}
+		/* Faces	*/
+		if (0 != (drawflags & fDrawFlags::Faces))
+		{
+			const btScalar scl = (btScalar)0.8;
+			const btScalar alp = (btScalar)1;
+			const btVector3 col(0, (btScalar)0.7, 0);
+			for (i = 0; i < psb->m_faces.size(); ++i)
+			{
+				const btSoftBody::Face& f = psb->m_faces[i];
+				if (0 == (f.m_material->m_flags & btSoftBody::fMaterial::DebugDraw)) continue;
+				const btVector3 x[] = {f.m_n[0]->m_x, f.m_n[1]->m_x, f.m_n[2]->m_x};
+				const btVector3 c = (x[0] + x[1] + x[2]) / 3;
+				idraw->drawTriangle((x[0] - c) * scl + c,
+									(x[1] - c) * scl + c,
+									(x[2] - c) * scl + c,
+									col, alp);
+			}
+		}
+		/* Tetras	*/
+		if (0 != (drawflags & fDrawFlags::Tetras))
+		{
+			const btScalar scl = (btScalar)0.8;
+			const btScalar alp = (btScalar)1;
+			const btVector3 col((btScalar)0.3, (btScalar)0.3, (btScalar)0.7);
+			for (int i = 0; i < psb->m_tetras.size(); ++i)
+			{
+				const btSoftBody::Tetra& t = psb->m_tetras[i];
+				if (0 == (t.m_material->m_flags & btSoftBody::fMaterial::DebugDraw)) continue;
+				const btVector3 x[] = {t.m_n[0]->m_x, t.m_n[1]->m_x, t.m_n[2]->m_x, t.m_n[3]->m_x};
+				const btVector3 c = (x[0] + x[1] + x[2] + x[3]) / 4;
+				idraw->drawTriangle((x[0] - c) * scl + c, (x[1] - c) * scl + c, (x[2] - c) * scl + c, col, alp);
+				idraw->drawTriangle((x[0] - c) * scl + c, (x[1] - c) * scl + c, (x[3] - c) * scl + c, col, alp);
+				idraw->drawTriangle((x[1] - c) * scl + c, (x[2] - c) * scl + c, (x[3] - c) * scl + c, col, alp);
+				idraw->drawTriangle((x[2] - c) * scl + c, (x[0] - c) * scl + c, (x[3] - c) * scl + c, col, alp);
+			}
+		}
+	}
+	/* Anchors	*/
+	if (0 != (drawflags & fDrawFlags::Anchors))
+	{
+		for (i = 0; i < psb->m_anchors.size(); ++i)
+		{
+			const btSoftBody::Anchor& a = psb->m_anchors[i];
+			const btVector3 q = a.m_body->getWorldTransform() * a.m_local;
+			drawVertex(idraw, a.m_node->m_x, 0.25, btVector3(1, 0, 0));
+			drawVertex(idraw, q, 0.25, btVector3(0, 1, 0));
+			idraw->drawLine(a.m_node->m_x, q, btVector3(1, 1, 1));
+		}
+		for (i = 0; i < psb->m_nodes.size(); ++i)
+		{
+			const btSoftBody::Node& n = psb->m_nodes[i];
+			if (0 == (n.m_material->m_flags & btSoftBody::fMaterial::DebugDraw)) continue;
+			if (n.m_im <= 0)
+			{
+				drawVertex(idraw, n.m_x, 0.25, btVector3(1, 0, 0));
+			}
+		}
+	}
+
+	/* Notes	*/
+	if (0 != (drawflags & fDrawFlags::Notes))
+	{
+		for (i = 0; i < psb->m_notes.size(); ++i)
+		{
+			const btSoftBody::Note& n = psb->m_notes[i];
+			btVector3 p = n.m_offset;
+			for (int j = 0; j < n.m_rank; ++j)
+			{
+				p += n.m_nodes[j]->m_x * n.m_coords[j];
+			}
+			idraw->draw3dText(p, n.m_text);
+		}
+	}
+	/* Node tree	*/
+	if (0 != (drawflags & fDrawFlags::NodeTree)) DrawNodeTree(psb, idraw);
+	/* Face tree	*/
+	if (0 != (drawflags & fDrawFlags::FaceTree)) DrawFaceTree(psb, idraw);
+	/* Cluster tree	*/
+	if (0 != (drawflags & fDrawFlags::ClusterTree)) DrawClusterTree(psb, idraw);
+	/* Joints		*/
+	if (0 != (drawflags & fDrawFlags::Joints))
+	{
+		for (i = 0; i < psb->m_joints.size(); ++i)
+		{
+			const btSoftBody::Joint* pj = psb->m_joints[i];
+			switch (pj->Type())
+			{
+				case btSoftBody::Joint::eType::Linear:
+				{
+					const btSoftBody::LJoint* pjl = (const btSoftBody::LJoint*)pj;
+					const btVector3 a0 = pj->m_bodies[0].xform() * pjl->m_refs[0];
+					const btVector3 a1 = pj->m_bodies[1].xform() * pjl->m_refs[1];
+					idraw->drawLine(pj->m_bodies[0].xform().getOrigin(), a0, btVector3(1, 1, 0));
+					idraw->drawLine(pj->m_bodies[1].xform().getOrigin(), a1, btVector3(0, 1, 1));
+					drawVertex(idraw, a0, 0.25, btVector3(1, 1, 0));
+					drawVertex(idraw, a1, 0.25, btVector3(0, 1, 1));
+				}
+				break;
+				case btSoftBody::Joint::eType::Angular:
+				{
+					//const btSoftBody::AJoint*	pja=(const btSoftBody::AJoint*)pj;
+					const btVector3 o0 = pj->m_bodies[0].xform().getOrigin();
+					const btVector3 o1 = pj->m_bodies[1].xform().getOrigin();
+					const btVector3 a0 = pj->m_bodies[0].xform().getBasis() * pj->m_refs[0];
+					const btVector3 a1 = pj->m_bodies[1].xform().getBasis() * pj->m_refs[1];
+					idraw->drawLine(o0, o0 + a0 * 10, btVector3(1, 1, 0));
+					idraw->drawLine(o0, o0 + a1 * 10, btVector3(1, 1, 0));
+					idraw->drawLine(o1, o1 + a0 * 10, btVector3(0, 1, 1));
+					idraw->drawLine(o1, o1 + a1 * 10, btVector3(0, 1, 1));
+					break;
+				}
+				default:
+				{
+				}
+			}
+		}
+	}
+}
+
+//
+void btSoftBodyHelpers::DrawInfos(btSoftBody* psb,
+								  btIDebugDraw* idraw,
+								  bool masses,
+								  bool areas,
+								  bool /*stress*/)
+{
+	for (int i = 0; i < psb->m_nodes.size(); ++i)
+	{
+		const btSoftBody::Node& n = psb->m_nodes[i];
+		char text[2048] = {0};
+		char buff[1024];
+		if (masses)
+		{
+			sprintf(buff, " M(%.2f)", 1 / n.m_im);
+			strcat(text, buff);
+		}
+		if (areas)
+		{
+			sprintf(buff, " A(%.2f)", n.m_area);
+			strcat(text, buff);
+		}
+		if (text[0]) idraw->draw3dText(n.m_x, text);
+	}
+}
+
+//
+void btSoftBodyHelpers::DrawNodeTree(btSoftBody* psb,
+									 btIDebugDraw* idraw,
+									 int mindepth,
+									 int maxdepth)
+{
+	drawTree(idraw, psb->m_ndbvt.m_root, 0, btVector3(1, 0, 1), btVector3(1, 1, 1), mindepth, maxdepth);
+}
+
+//
+void btSoftBodyHelpers::DrawFaceTree(btSoftBody* psb,
+									 btIDebugDraw* idraw,
+									 int mindepth,
+									 int maxdepth)
+{
+	drawTree(idraw, psb->m_fdbvt.m_root, 0, btVector3(0, 1, 0), btVector3(1, 0, 0), mindepth, maxdepth);
+}
+
+//
+void btSoftBodyHelpers::DrawClusterTree(btSoftBody* psb,
+										btIDebugDraw* idraw,
+										int mindepth,
+										int maxdepth)
+{
+	drawTree(idraw, psb->m_cdbvt.m_root, 0, btVector3(0, 1, 1), btVector3(1, 0, 0), mindepth, maxdepth);
+}
+
+//The btSoftBody object from the BulletSDK includes an array of Nodes and Links. These links appear
+// to be first set up to connect a node to between 5 and 6 of its neighbors [480 links],
+//and then to the rest of the nodes after the execution of the Floyd-Warshall graph algorithm
+//[another 930 links].
+//The way the links are stored by default, we have a number of cases where adjacent links share a node in common
+// - this leads to the creation of a data dependency through memory.
+//The PSolve_Links() function reads and writes nodes as it iterates over each link.
+//So, we now have the possibility of a data dependency between iteration X
+//that processes link L with iteration X+1 that processes link L+1
+//because L and L+1 have one node in common, and iteration X updates the positions of that node,
+//and iteration X+1 reads in the position of that shared node.
+//
+//Such a memory dependency limits the ability of a modern CPU to speculate beyond
+//a certain point because it has to respect a possible dependency
+//- this prevents the CPU from making full use of its out-of-order resources.
+//If we re-order the links such that we minimize the cases where a link L and L+1 share a common node,
+//we create a temporal gap between when the node position is written,
+//and when it is subsequently read. This in turn allows the CPU to continue execution without
+//risking a dependency violation. Such a reordering would result in significant speedups on
+//modern CPUs with lots of execution resources.
+//In our testing, we see it have a tremendous impact not only on the A7,
+//but also on all x86 cores that ship with modern Macs.
+//The attached source file includes a single function (ReoptimizeLinkOrder) which can be called on a
+//btSoftBody object in the solveConstraints() function before the actual solver is invoked,
+//or right after generateBendingConstraints() once we have all 1410 links.
+
+//===================================================================
+//
+//
+// This function takes in a list of interdependent Links and tries
+// to maximize the distance between calculation
+// of dependent links.  This increases the amount of parallelism that can
+// be exploited by out-of-order instruction processors with large but
+// (inevitably) finite instruction windows.
+//
+//===================================================================
+
+// A small structure to track lists of dependent link calculations
+class LinkDeps_t
+{
+public:
+	int value;         // A link calculation that is dependent on this one
+					   // Positive values = "input A" while negative values = "input B"
+	LinkDeps_t* next;  // Next dependence in the list
+};
+typedef LinkDeps_t* LinkDepsPtr_t;
+
+// Dependency list constants
+#define REOP_NOT_DEPENDENT -1
+#define REOP_NODE_COMPLETE -2  // Must be less than REOP_NOT_DEPENDENT
+
+void btSoftBodyHelpers::ReoptimizeLinkOrder(btSoftBody* psb /* This can be replaced by a btSoftBody pointer */)
+{
+	int i, nLinks = psb->m_links.size(), nNodes = psb->m_nodes.size();
+	btSoftBody::Link* lr;
+	int ar, br;
+	btSoftBody::Node* node0 = &(psb->m_nodes[0]);
+	btSoftBody::Node* node1 = &(psb->m_nodes[1]);
+	LinkDepsPtr_t linkDep;
+	int readyListHead, readyListTail, linkNum, linkDepFrees, depLink;
+
+	// Allocate temporary buffers
+	int* nodeWrittenAt = new int[nNodes + 1];  // What link calculation produced this node's current values?
+	int* linkDepA = new int[nLinks];           // Link calculation input is dependent upon prior calculation #N
+	int* linkDepB = new int[nLinks];
+	int* readyList = new int[nLinks];                              // List of ready-to-process link calculations (# of links, maximum)
+	LinkDeps_t* linkDepFreeList = new LinkDeps_t[2 * nLinks];      // Dependent-on-me list elements (2x# of links, maximum)
+	LinkDepsPtr_t* linkDepListStarts = new LinkDepsPtr_t[nLinks];  // Start nodes of dependent-on-me lists, one for each link
+
+	// Copy the original, unsorted links to a side buffer
+	btSoftBody::Link* linkBuffer = new btSoftBody::Link[nLinks];
+	memcpy(linkBuffer, &(psb->m_links[0]), sizeof(btSoftBody::Link) * nLinks);
+
+	// Clear out the node setup and ready list
+	for (i = 0; i < nNodes + 1; i++)
+	{
+		nodeWrittenAt[i] = REOP_NOT_DEPENDENT;
+	}
+	for (i = 0; i < nLinks; i++)
+	{
+		linkDepListStarts[i] = NULL;
+	}
+	readyListHead = readyListTail = linkDepFrees = 0;
+
+	// Initial link analysis to set up data structures
+	for (i = 0; i < nLinks; i++)
+	{
+		// Note which prior link calculations we are dependent upon & build up dependence lists
+		lr = &(psb->m_links[i]);
+		ar = (lr->m_n[0] - node0) / (node1 - node0);
+		br = (lr->m_n[1] - node0) / (node1 - node0);
+		if (nodeWrittenAt[ar] > REOP_NOT_DEPENDENT)
+		{
+			linkDepA[i] = nodeWrittenAt[ar];
+			linkDep = &linkDepFreeList[linkDepFrees++];
+			linkDep->value = i;
+			linkDep->next = linkDepListStarts[nodeWrittenAt[ar]];
+			linkDepListStarts[nodeWrittenAt[ar]] = linkDep;
+		}
+		else
+		{
+			linkDepA[i] = REOP_NOT_DEPENDENT;
+		}
+		if (nodeWrittenAt[br] > REOP_NOT_DEPENDENT)
+		{
+			linkDepB[i] = nodeWrittenAt[br];
+			linkDep = &linkDepFreeList[linkDepFrees++];
+			linkDep->value = -(i + 1);
+			linkDep->next = linkDepListStarts[nodeWrittenAt[br]];
+			linkDepListStarts[nodeWrittenAt[br]] = linkDep;
+		}
+		else
+		{
+			linkDepB[i] = REOP_NOT_DEPENDENT;
+		}
+
+		// Add this link to the initial ready list, if it is not dependent on any other links
+		if ((linkDepA[i] == REOP_NOT_DEPENDENT) && (linkDepB[i] == REOP_NOT_DEPENDENT))
+		{
+			readyList[readyListTail++] = i;
+			linkDepA[i] = linkDepB[i] = REOP_NODE_COMPLETE;  // Probably not needed now
+		}
+
+		// Update the nodes to mark which ones are calculated by this link
+		nodeWrittenAt[ar] = nodeWrittenAt[br] = i;
+	}
+
+	// Process the ready list and create the sorted list of links
+	// -- By treating the ready list as a queue, we maximize the distance between any
+	//    inter-dependent node calculations
+	// -- All other (non-related) nodes in the ready list will automatically be inserted
+	//    in between each set of inter-dependent link calculations by this loop
+	i = 0;
+	while (readyListHead != readyListTail)
+	{
+		// Use ready list to select the next link to process
+		linkNum = readyList[readyListHead++];
+		// Copy the next-to-calculate link back into the original link array
+		psb->m_links[i++] = linkBuffer[linkNum];
+
+		// Free up any link inputs that are dependent on this one
+		linkDep = linkDepListStarts[linkNum];
+		while (linkDep)
+		{
+			depLink = linkDep->value;
+			if (depLink >= 0)
+			{
+				linkDepA[depLink] = REOP_NOT_DEPENDENT;
+			}
+			else
+			{
+				depLink = -depLink - 1;
+				linkDepB[depLink] = REOP_NOT_DEPENDENT;
+			}
+			// Add this dependent link calculation to the ready list if *both* inputs are clear
+			if ((linkDepA[depLink] == REOP_NOT_DEPENDENT) && (linkDepB[depLink] == REOP_NOT_DEPENDENT))
+			{
+				readyList[readyListTail++] = depLink;
+				linkDepA[depLink] = linkDepB[depLink] = REOP_NODE_COMPLETE;  // Probably not needed now
+			}
+			linkDep = linkDep->next;
+		}
+	}
+
+	// Delete the temporary buffers
+	delete[] nodeWrittenAt;
+	delete[] linkDepA;
+	delete[] linkDepB;
+	delete[] readyList;
+	delete[] linkDepFreeList;
+	delete[] linkDepListStarts;
+	delete[] linkBuffer;
+}
+
+//
+void btSoftBodyHelpers::DrawFrame(btSoftBody* psb,
+								  btIDebugDraw* idraw)
+{
+	if (psb->m_pose.m_bframe)
+	{
+		static const btScalar ascl = 10;
+		static const btScalar nscl = (btScalar)0.1;
+		const btVector3 com = psb->m_pose.m_com;
+		const btMatrix3x3 trs = psb->m_pose.m_rot * psb->m_pose.m_scl;
+		const btVector3 Xaxis = (trs * btVector3(1, 0, 0)).normalized();
+		const btVector3 Yaxis = (trs * btVector3(0, 1, 0)).normalized();
+		const btVector3 Zaxis = (trs * btVector3(0, 0, 1)).normalized();
+		idraw->drawLine(com, com + Xaxis * ascl, btVector3(1, 0, 0));
+		idraw->drawLine(com, com + Yaxis * ascl, btVector3(0, 1, 0));
+		idraw->drawLine(com, com + Zaxis * ascl, btVector3(0, 0, 1));
+		for (int i = 0; i < psb->m_pose.m_pos.size(); ++i)
+		{
+			const btVector3 x = com + trs * psb->m_pose.m_pos[i];
+			drawVertex(idraw, x, nscl, btVector3(1, 0, 1));
+		}
+	}
+}
+
+//
+btSoftBody* btSoftBodyHelpers::CreateRope(btSoftBodyWorldInfo& worldInfo, const btVector3& from,
+										  const btVector3& to,
+										  int res,
+										  int fixeds)
+{
+	/* Create nodes	*/
+	const int r = res + 2;
+	btVector3* x = new btVector3[r];
+	btScalar* m = new btScalar[r];
+	int i;
+
+	for (i = 0; i < r; ++i)
+	{
+		const btScalar t = i / (btScalar)(r - 1);
+		x[i] = lerp(from, to, t);
+		m[i] = 1;
+	}
+	btSoftBody* psb = new btSoftBody(&worldInfo, r, x, m);
+	if (fixeds & 1) psb->setMass(0, 0);
+	if (fixeds & 2) psb->setMass(r - 1, 0);
+	delete[] x;
+	delete[] m;
+	/* Create links	*/
+	for (i = 1; i < r; ++i)
+	{
+		psb->appendLink(i - 1, i);
+	}
+	/* Finished		*/
+	return (psb);
+}
+
+//
+btSoftBody* btSoftBodyHelpers::CreatePatch(btSoftBodyWorldInfo& worldInfo, const btVector3& corner00,
+										   const btVector3& corner10,
+										   const btVector3& corner01,
+										   const btVector3& corner11,
+										   int resx,
+										   int resy,
+										   int fixeds,
+										   bool gendiags,
+										   btScalar perturbation)
+{
+#define IDX(_x_, _y_) ((_y_)*rx + (_x_))
+	/* Create nodes	*/
+	if ((resx < 2) || (resy < 2)) return (0);
+	const int rx = resx;
+	const int ry = resy;
+	const int tot = rx * ry;
+	btVector3* x = new btVector3[tot];
+	btScalar* m = new btScalar[tot];
+	int iy;
+
+	for (iy = 0; iy < ry; ++iy)
+	{
+		const btScalar ty = iy / (btScalar)(ry - 1);
+		const btVector3 py0 = lerp(corner00, corner01, ty);
+		const btVector3 py1 = lerp(corner10, corner11, ty);
+		for (int ix = 0; ix < rx; ++ix)
+		{
+			const btScalar tx = ix / (btScalar)(rx - 1);
+			btScalar pert = perturbation * btScalar(rand()) / RAND_MAX;
+			btVector3 temp1 = py1;
+			temp1.setY(py1.getY() + pert);
+			btVector3 temp = py0;
+			pert = perturbation * btScalar(rand()) / RAND_MAX;
+			temp.setY(py0.getY() + pert);
+			x[IDX(ix, iy)] = lerp(temp, temp1, tx);
+			m[IDX(ix, iy)] = 1;
+		}
+	}
+	btSoftBody* psb = new btSoftBody(&worldInfo, tot, x, m);
+	if (fixeds & 1) psb->setMass(IDX(0, 0), 0);
+	if (fixeds & 2) psb->setMass(IDX(rx - 1, 0), 0);
+	if (fixeds & 4) psb->setMass(IDX(0, ry - 1), 0);
+	if (fixeds & 8) psb->setMass(IDX(rx - 1, ry - 1), 0);
+	delete[] x;
+	delete[] m;
+	/* Create links	and faces */
+	for (iy = 0; iy < ry; ++iy)
+	{
+		for (int ix = 0; ix < rx; ++ix)
+		{
+			const int idx = IDX(ix, iy);
+			const bool mdx = (ix + 1) < rx;
+			const bool mdy = (iy + 1) < ry;
+			if (mdx) psb->appendLink(idx, IDX(ix + 1, iy));
+			if (mdy) psb->appendLink(idx, IDX(ix, iy + 1));
+			if (mdx && mdy)
+			{
+				if ((ix + iy) & 1)
+				{
+					psb->appendFace(IDX(ix, iy), IDX(ix + 1, iy), IDX(ix + 1, iy + 1));
+					psb->appendFace(IDX(ix, iy), IDX(ix + 1, iy + 1), IDX(ix, iy + 1));
+					if (gendiags)
+					{
+						psb->appendLink(IDX(ix, iy), IDX(ix + 1, iy + 1));
+					}
+				}
+				else
+				{
+					psb->appendFace(IDX(ix, iy + 1), IDX(ix, iy), IDX(ix + 1, iy));
+					psb->appendFace(IDX(ix, iy + 1), IDX(ix + 1, iy), IDX(ix + 1, iy + 1));
+					if (gendiags)
+					{
+						psb->appendLink(IDX(ix + 1, iy), IDX(ix, iy + 1));
+					}
+				}
+			}
+		}
+	}
+	/* Finished		*/
+#undef IDX
+	return (psb);
+}
+
+//
+btSoftBody* btSoftBodyHelpers::CreatePatchUV(btSoftBodyWorldInfo& worldInfo,
+											 const btVector3& corner00,
+											 const btVector3& corner10,
+											 const btVector3& corner01,
+											 const btVector3& corner11,
+											 int resx,
+											 int resy,
+											 int fixeds,
+											 bool gendiags,
+											 float* tex_coords)
+{
+	/*
+	*
+	*  corners:
+	*
+	*  [0][0]     corner00 ------- corner01   [resx][0]
+	*                |                |
+	*                |                |
+	*  [0][resy]  corner10 -------- corner11  [resx][resy]
+	*
+	*
+	*
+	*
+	*
+	*
+	*   "fixedgs" map:
+	*
+	*  corner00     -->   +1
+	*  corner01     -->   +2
+	*  corner10     -->   +4
+	*  corner11     -->   +8
+	*  upper middle -->  +16
+	*  left middle  -->  +32
+	*  right middle -->  +64
+	*  lower middle --> +128
+	*  center       --> +256
+	*
+	*
+	*   tex_coords size   (resx-1)*(resy-1)*12
+	*
+	*
+	*
+	*     SINGLE QUAD INTERNALS
+	*
+	*  1) btSoftBody's nodes and links,
+	*     diagonal link is optional ("gendiags")
+	*
+	*
+	*    node00 ------ node01
+	*      | .              
+	*      |   .            
+	*      |     .          
+	*      |       .        
+	*      |         .      
+	*    node10        node11
+	*
+	*
+	*
+	*   2) Faces:
+	*      two triangles,
+	*      UV Coordinates (hier example for single quad)
+	*      
+	*     (0,1)          (0,1)  (1,1)
+	*     1 |\            3 \-----| 2
+	*       | \              \    |
+	*       |  \              \   |
+	*       |   \              \  |
+	*       |    \              \ |
+	*     2 |-----\ 3            \| 1
+	*     (0,0)    (1,0)       (1,0)
+	*
+	*
+	*
+	*
+	*
+	*
+	*/
+
+#define IDX(_x_, _y_) ((_y_)*rx + (_x_))
+	/* Create nodes		*/
+	if ((resx < 2) || (resy < 2)) return (0);
+	const int rx = resx;
+	const int ry = resy;
+	const int tot = rx * ry;
+	btVector3* x = new btVector3[tot];
+	btScalar* m = new btScalar[tot];
+
+	int iy;
+
+	for (iy = 0; iy < ry; ++iy)
+	{
+		const btScalar ty = iy / (btScalar)(ry - 1);
+		const btVector3 py0 = lerp(corner00, corner01, ty);
+		const btVector3 py1 = lerp(corner10, corner11, ty);
+		for (int ix = 0; ix < rx; ++ix)
+		{
+			const btScalar tx = ix / (btScalar)(rx - 1);
+			x[IDX(ix, iy)] = lerp(py0, py1, tx);
+			m[IDX(ix, iy)] = 1;
+		}
+	}
+	btSoftBody* psb = new btSoftBody(&worldInfo, tot, x, m);
+	if (fixeds & 1) psb->setMass(IDX(0, 0), 0);
+	if (fixeds & 2) psb->setMass(IDX(rx - 1, 0), 0);
+	if (fixeds & 4) psb->setMass(IDX(0, ry - 1), 0);
+	if (fixeds & 8) psb->setMass(IDX(rx - 1, ry - 1), 0);
+	if (fixeds & 16) psb->setMass(IDX((rx - 1) / 2, 0), 0);
+	if (fixeds & 32) psb->setMass(IDX(0, (ry - 1) / 2), 0);
+	if (fixeds & 64) psb->setMass(IDX(rx - 1, (ry - 1) / 2), 0);
+	if (fixeds & 128) psb->setMass(IDX((rx - 1) / 2, ry - 1), 0);
+	if (fixeds & 256) psb->setMass(IDX((rx - 1) / 2, (ry - 1) / 2), 0);
+	delete[] x;
+	delete[] m;
+
+	int z = 0;
+	/* Create links	and faces	*/
+	for (iy = 0; iy < ry; ++iy)
+	{
+		for (int ix = 0; ix < rx; ++ix)
+		{
+			const bool mdx = (ix + 1) < rx;
+			const bool mdy = (iy + 1) < ry;
+
+			int node00 = IDX(ix, iy);
+			int node01 = IDX(ix + 1, iy);
+			int node10 = IDX(ix, iy + 1);
+			int node11 = IDX(ix + 1, iy + 1);
+
+			if (mdx) psb->appendLink(node00, node01);
+			if (mdy) psb->appendLink(node00, node10);
+			if (mdx && mdy)
+			{
+				psb->appendFace(node00, node10, node11);
+				if (tex_coords)
+				{
+					tex_coords[z + 0] = CalculateUV(resx, resy, ix, iy, 0);
+					tex_coords[z + 1] = CalculateUV(resx, resy, ix, iy, 1);
+					tex_coords[z + 2] = CalculateUV(resx, resy, ix, iy, 0);
+					tex_coords[z + 3] = CalculateUV(resx, resy, ix, iy, 2);
+					tex_coords[z + 4] = CalculateUV(resx, resy, ix, iy, 3);
+					tex_coords[z + 5] = CalculateUV(resx, resy, ix, iy, 2);
+				}
+				psb->appendFace(node11, node01, node00);
+				if (tex_coords)
+				{
+					tex_coords[z + 6] = CalculateUV(resx, resy, ix, iy, 3);
+					tex_coords[z + 7] = CalculateUV(resx, resy, ix, iy, 2);
+					tex_coords[z + 8] = CalculateUV(resx, resy, ix, iy, 3);
+					tex_coords[z + 9] = CalculateUV(resx, resy, ix, iy, 1);
+					tex_coords[z + 10] = CalculateUV(resx, resy, ix, iy, 0);
+					tex_coords[z + 11] = CalculateUV(resx, resy, ix, iy, 1);
+				}
+				if (gendiags) psb->appendLink(node00, node11);
+				z += 12;
+			}
+		}
+	}
+	/* Finished	*/
+#undef IDX
+	return (psb);
+}
+
+float btSoftBodyHelpers::CalculateUV(int resx, int resy, int ix, int iy, int id)
+{
+	/*
+	*
+	*
+	*    node00 --- node01
+	*      |          |
+	*    node10 --- node11
+	*
+	*
+	*   ID map:
+	*
+	*   node00 s --> 0
+	*   node00 t --> 1
+	*
+	*   node01 s --> 3
+	*   node01 t --> 1
+	*
+	*   node10 s --> 0
+	*   node10 t --> 2
+	*
+	*   node11 s --> 3
+	*   node11 t --> 2
+	*
+	*
+	*/
+
+	float tc = 0.0f;
+	if (id == 0)
+	{
+		tc = (1.0f / ((resx - 1)) * ix);
+	}
+	else if (id == 1)
+	{
+		tc = (1.0f / ((resy - 1)) * (resy - 1 - iy));
+	}
+	else if (id == 2)
+	{
+		tc = (1.0f / ((resy - 1)) * (resy - 1 - iy - 1));
+	}
+	else if (id == 3)
+	{
+		tc = (1.0f / ((resx - 1)) * (ix + 1));
+	}
+	return tc;
+}
+//
+btSoftBody* btSoftBodyHelpers::CreateEllipsoid(btSoftBodyWorldInfo& worldInfo, const btVector3& center,
+											   const btVector3& radius,
+											   int res)
+{
+	struct Hammersley
+	{
+		static void Generate(btVector3* x, int n)
+		{
+			for (int i = 0; i < n; i++)
+			{
+				btScalar p = 0.5, t = 0;
+				for (int j = i; j; p *= 0.5, j >>= 1)
+					if (j & 1) t += p;
+				btScalar w = 2 * t - 1;
+				btScalar a = (SIMD_PI + 2 * i * SIMD_PI) / n;
+				btScalar s = btSqrt(1 - w * w);
+				*x++ = btVector3(s * btCos(a), s * btSin(a), w);
+			}
+		}
+	};
+	btAlignedObjectArray<btVector3> vtx;
+	vtx.resize(3 + res);
+	Hammersley::Generate(&vtx[0], vtx.size());
+	for (int i = 0; i < vtx.size(); ++i)
+	{
+		vtx[i] = vtx[i] * radius + center;
+	}
+	return (CreateFromConvexHull(worldInfo, &vtx[0], vtx.size()));
+}
+
+//
+btSoftBody* btSoftBodyHelpers::CreateFromTriMesh(btSoftBodyWorldInfo& worldInfo, const btScalar* vertices,
+												 const int* triangles,
+												 int ntriangles, bool randomizeConstraints)
+{
+	int maxidx = 0;
+	int i, j, ni;
+
+	for (i = 0, ni = ntriangles * 3; i < ni; ++i)
+	{
+		maxidx = btMax(triangles[i], maxidx);
+	}
+	++maxidx;
+	btAlignedObjectArray<bool> chks;
+	btAlignedObjectArray<btVector3> vtx;
+	chks.resize(maxidx * maxidx, false);
+	vtx.resize(maxidx);
+	for (i = 0, j = 0, ni = maxidx * 3; i < ni; ++j, i += 3)
+	{
+		vtx[j] = btVector3(vertices[i], vertices[i + 1], vertices[i + 2]);
+	}
+	btSoftBody* psb = new btSoftBody(&worldInfo, vtx.size(), &vtx[0], 0);
+	for (i = 0, ni = ntriangles * 3; i < ni; i += 3)
+	{
+		const int idx[] = {triangles[i], triangles[i + 1], triangles[i + 2]};
+#define IDX(_x_, _y_) ((_y_)*maxidx + (_x_))
+		for (int j = 2, k = 0; k < 3; j = k++)
+		{
+			if (!chks[IDX(idx[j], idx[k])])
+			{
+				chks[IDX(idx[j], idx[k])] = true;
+				chks[IDX(idx[k], idx[j])] = true;
+				psb->appendLink(idx[j], idx[k]);
+			}
+		}
+#undef IDX
+		psb->appendFace(idx[0], idx[1], idx[2]);
+	}
+
+	if (randomizeConstraints)
+	{
+		psb->randomizeConstraints();
+	}
+
+	return (psb);
+}
+
+//
+btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldInfo, const btVector3* vertices,
+													int nvertices, bool randomizeConstraints)
+{
+	HullDesc hdsc(QF_TRIANGLES, nvertices, vertices);
+	HullResult hres;
+	HullLibrary hlib; /*??*/
+	hdsc.mMaxVertices = nvertices;
+	hlib.CreateConvexHull(hdsc, hres);
+	btSoftBody* psb = new btSoftBody(&worldInfo, (int)hres.mNumOutputVertices,
+									 &hres.m_OutputVertices[0], 0);
+	for (int i = 0; i < (int)hres.mNumFaces; ++i)
+	{
+		const int idx[] = {static_cast<int>(hres.m_Indices[i * 3 + 0]),
+						   static_cast<int>(hres.m_Indices[i * 3 + 1]),
+						   static_cast<int>(hres.m_Indices[i * 3 + 2])};
+		if (idx[0] < idx[1]) psb->appendLink(idx[0], idx[1]);
+		if (idx[1] < idx[2]) psb->appendLink(idx[1], idx[2]);
+		if (idx[2] < idx[0]) psb->appendLink(idx[2], idx[0]);
+		psb->appendFace(idx[0], idx[1], idx[2]);
+	}
+	hlib.ReleaseResult(hres);
+	if (randomizeConstraints)
+	{
+		psb->randomizeConstraints();
+	}
+	return (psb);
+}
+
+static int nextLine(const char* buffer)
+{
+	int numBytesRead = 0;
+
+	while (*buffer != '\n')
+	{
+		buffer++;
+		numBytesRead++;
+	}
+
+	if (buffer[0] == 0x0a)
+	{
+		buffer++;
+		numBytesRead++;
+	}
+	return numBytesRead;
+}
+
+/* Create from TetGen .ele, .face, .node data							*/
+btSoftBody* btSoftBodyHelpers::CreateFromTetGenData(btSoftBodyWorldInfo& worldInfo,
+													const char* ele,
+													const char* face,
+													const char* node,
+													bool bfacelinks,
+													bool btetralinks,
+													bool bfacesfromtetras)
+{
+	btAlignedObjectArray<btVector3> pos;
+	int nnode = 0;
+	int ndims = 0;
+	int nattrb = 0;
+	int hasbounds = 0;
+	int result = sscanf(node, "%d %d %d %d", &nnode, &ndims, &nattrb, &hasbounds);
+	result = sscanf(node, "%d %d %d %d", &nnode, &ndims, &nattrb, &hasbounds);
+	node += nextLine(node);
+
+	pos.resize(nnode);
+	for (int i = 0; i < pos.size(); ++i)
+	{
+		int index = 0;
+		//int			bound=0;
+		float x, y, z;
+		sscanf(node, "%d %f %f %f", &index, &x, &y, &z);
+
+		//	sn>>index;
+		//	sn>>x;sn>>y;sn>>z;
+		node += nextLine(node);
+
+		//for(int j=0;j<nattrb;++j)
+		//	sn>>a;
+
+		//if(hasbounds)
+		//	sn>>bound;
+
+		pos[index].setX(btScalar(x));
+		pos[index].setY(btScalar(y));
+		pos[index].setZ(btScalar(z));
+	}
+	btSoftBody* psb = new btSoftBody(&worldInfo, nnode, &pos[0], 0);
+#if 0
+if(face&&face[0])
+	{
+	int								nface=0;
+	sf>>nface;sf>>hasbounds;
+	for(int i=0;i<nface;++i)
+		{
+		int			index=0;
+		int			bound=0;
+		int			ni[3];
+		sf>>index;
+		sf>>ni[0];sf>>ni[1];sf>>ni[2];
+		sf>>bound;
+		psb->appendFace(ni[0],ni[1],ni[2]);	
+		if(btetralinks)
+			{
+			psb->appendLink(ni[0],ni[1],0,true);
+			psb->appendLink(ni[1],ni[2],0,true);
+			psb->appendLink(ni[2],ni[0],0,true);
+			}
+		}
+	}
+#endif
+
+	if (ele && ele[0])
+	{
+		int ntetra = 0;
+		int ncorner = 0;
+		int neattrb = 0;
+		sscanf(ele, "%d %d %d", &ntetra, &ncorner, &neattrb);
+		ele += nextLine(ele);
+
+		//se>>ntetra;se>>ncorner;se>>neattrb;
+		for (int i = 0; i < ntetra; ++i)
+		{
+			int index = 0;
+			int ni[4];
+
+			//se>>index;
+			//se>>ni[0];se>>ni[1];se>>ni[2];se>>ni[3];
+			sscanf(ele, "%d %d %d %d %d", &index, &ni[0], &ni[1], &ni[2], &ni[3]);
+			ele += nextLine(ele);
+			//for(int j=0;j<neattrb;++j)
+			//	se>>a;
+			psb->appendTetra(ni[0], ni[1], ni[2], ni[3]);
+			if (btetralinks)
+			{
+				psb->appendLink(ni[0], ni[1], 0, true);
+				psb->appendLink(ni[1], ni[2], 0, true);
+				psb->appendLink(ni[2], ni[0], 0, true);
+				psb->appendLink(ni[0], ni[3], 0, true);
+				psb->appendLink(ni[1], ni[3], 0, true);
+				psb->appendLink(ni[2], ni[3], 0, true);
+			}
+		}
+	}
+	psb->initializeDmInverse();
+	psb->m_tetraScratches.resize(psb->m_tetras.size());
+	psb->m_tetraScratchesTn.resize(psb->m_tetras.size());
+	printf("Nodes:  %u\r\n", psb->m_nodes.size());
+	printf("Links:  %u\r\n", psb->m_links.size());
+	printf("Faces:  %u\r\n", psb->m_faces.size());
+	printf("Tetras: %u\r\n", psb->m_tetras.size());
+	return (psb);
+}
+
+btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, const char* vtk_file)
+{
+	std::ifstream fs;
+	fs.open(vtk_file);
+	btAssert(fs);
+
+	typedef btAlignedObjectArray<int> Index;
+	std::string line;
+	btAlignedObjectArray<btVector3> X;
+	btVector3 position;
+	btAlignedObjectArray<Index> indices;
+	bool reading_points = false;
+	bool reading_tets = false;
+	size_t n_points = 0;
+	size_t n_tets = 0;
+	size_t x_count = 0;
+	size_t indices_count = 0;
+	while (std::getline(fs, line))
+	{
+		std::stringstream ss(line);
+		if (line.size() == (size_t)(0))
+		{
+		}
+		else if (line.substr(0, 6) == "POINTS")
+		{
+			reading_points = true;
+			reading_tets = false;
+			ss.ignore(128, ' ');  // ignore "POINTS"
+			ss >> n_points;
+			X.resize(n_points);
+		}
+		else if (line.substr(0, 5) == "CELLS")
+		{
+			reading_points = false;
+			reading_tets = true;
+			ss.ignore(128, ' ');  // ignore "CELLS"
+			ss >> n_tets;
+			indices.resize(n_tets);
+		}
+		else if (line.substr(0, 10) == "CELL_TYPES")
+		{
+			reading_points = false;
+			reading_tets = false;
+		}
+		else if (reading_points)
+		{
+			btScalar p;
+			ss >> p;
+			position.setX(p);
+			ss >> p;
+			position.setY(p);
+			ss >> p;
+			position.setZ(p);
+			//printf("v %f %f %f\n", position.getX(), position.getY(), position.getZ());
+			X[x_count++] = position;
+		}
+		else if (reading_tets)
+		{
+			int d;
+			ss >> d;
+			if (d != 4)
+			{
+				printf("Load deformable failed: Only Tetrahedra are supported in VTK file.\n");
+				fs.close();
+				return 0;
+			}
+			ss.ignore(128, ' ');  // ignore "4"
+			Index tet;
+			tet.resize(4);
+			for (size_t i = 0; i < 4; i++)
+			{
+				ss >> tet[i];
+				//printf("%d ", tet[i]);
+			}
+			//printf("\n");
+			indices[indices_count++] = tet;
+		}
+	}
+	btSoftBody* psb = new btSoftBody(&worldInfo, n_points, &X[0], 0);
+
+	for (int i = 0; i < n_tets; ++i)
+	{
+		const Index& ni = indices[i];
+		psb->appendTetra(ni[0], ni[1], ni[2], ni[3]);
+		{
+			psb->appendLink(ni[0], ni[1], 0, true);
+			psb->appendLink(ni[1], ni[2], 0, true);
+			psb->appendLink(ni[2], ni[0], 0, true);
+			psb->appendLink(ni[0], ni[3], 0, true);
+			psb->appendLink(ni[1], ni[3], 0, true);
+			psb->appendLink(ni[2], ni[3], 0, true);
+		}
+	}
+
+	generateBoundaryFaces(psb);
+	psb->initializeDmInverse();
+	psb->m_tetraScratches.resize(psb->m_tetras.size());
+	psb->m_tetraScratchesTn.resize(psb->m_tetras.size());
+	printf("Nodes:  %u\r\n", psb->m_nodes.size());
+	printf("Links:  %u\r\n", psb->m_links.size());
+	printf("Faces:  %u\r\n", psb->m_faces.size());
+	printf("Tetras: %u\r\n", psb->m_tetras.size());
+
+	fs.close();
+	return psb;
+}
+
+void btSoftBodyHelpers::generateBoundaryFaces(btSoftBody* psb)
+{
+	int counter = 0;
+	for (int i = 0; i < psb->m_nodes.size(); ++i)
+	{
+		psb->m_nodes[i].index = counter++;
+	}
+	typedef btAlignedObjectArray<int> Index;
+	btAlignedObjectArray<Index> indices;
+	indices.resize(psb->m_tetras.size());
+	for (int i = 0; i < indices.size(); ++i)
+	{
+		Index index;
+		index.push_back(psb->m_tetras[i].m_n[0]->index);
+		index.push_back(psb->m_tetras[i].m_n[1]->index);
+		index.push_back(psb->m_tetras[i].m_n[2]->index);
+		index.push_back(psb->m_tetras[i].m_n[3]->index);
+		indices[i] = index;
+	}
+
+	std::map<std::vector<int>, std::vector<int> > dict;
+	for (int i = 0; i < indices.size(); ++i)
+	{
+		for (int j = 0; j < 4; ++j)
+		{
+			std::vector<int> f;
+			if (j == 0)
+			{
+				f.push_back(indices[i][1]);
+				f.push_back(indices[i][0]);
+				f.push_back(indices[i][2]);
+			}
+			if (j == 1)
+			{
+				f.push_back(indices[i][3]);
+				f.push_back(indices[i][0]);
+				f.push_back(indices[i][1]);
+			}
+			if (j == 2)
+			{
+				f.push_back(indices[i][3]);
+				f.push_back(indices[i][1]);
+				f.push_back(indices[i][2]);
+			}
+			if (j == 3)
+			{
+				f.push_back(indices[i][2]);
+				f.push_back(indices[i][0]);
+				f.push_back(indices[i][3]);
+			}
+			std::vector<int> f_sorted = f;
+			std::sort(f_sorted.begin(), f_sorted.end());
+			if (dict.find(f_sorted) != dict.end())
+			{
+				dict.erase(f_sorted);
+			}
+			else
+			{
+				dict.insert(std::make_pair(f_sorted, f));
+			}
+		}
+	}
+
+	for (std::map<std::vector<int>, std::vector<int> >::iterator it = dict.begin(); it != dict.end(); ++it)
+	{
+		std::vector<int> f = it->second;
+		psb->appendFace(f[0], f[1], f[2]);
+		//printf("f %d %d %d\n", f[0] + 1, f[1] + 1, f[2] + 1);
+	}
+}
+
+//Write the surface mesh to an obj file.
+void btSoftBodyHelpers::writeObj(const char* filename, const btSoftBody* psb)
+{
+	std::ofstream fs;
+	fs.open(filename);
+	btAssert(fs);
+
+	if (psb->m_tetras.size() > 0)
+	{
+		// For tetrahedron mesh, we need to re-index the surface mesh for it to be in obj file/
+		std::map<int, int> dict;
+		for (int i = 0; i < psb->m_faces.size(); i++)
+		{
+			for (int d = 0; d < 3; d++)
+			{
+				int index = psb->m_faces[i].m_n[d]->index;
+				if (dict.find(index) == dict.end())
+				{
+					int dict_size = dict.size();
+					dict[index] = dict_size;
+					fs << "v";
+					for (int k = 0; k < 3; k++)
+					{
+						fs << " " << psb->m_nodes[index].m_x[k];
+					}
+					fs << "\n";
+				}
+			}
+		}
+		// Write surface mesh.
+		for (int i = 0; i < psb->m_faces.size(); ++i)
+		{
+			fs << "f";
+			for (int n = 0; n < 3; n++)
+			{
+				fs << " " << dict[psb->m_faces[i].m_n[n]->index] + 1;
+			}
+			fs << "\n";
+		}
+	}
+	else
+	{
+		// For trimesh, directly write out all the nodes and faces.xs
+		for (int i = 0; i < psb->m_nodes.size(); ++i)
+		{
+			fs << "v";
+			for (int d = 0; d < 3; d++)
+			{
+				fs << " " << psb->m_nodes[i].m_x[d];
+			}
+			fs << "\n";
+		}
+
+		for (int i = 0; i < psb->m_faces.size(); ++i)
+		{
+			fs << "f";
+			for (int n = 0; n < 3; n++)
+			{
+				fs << " " << psb->m_faces[i].m_n[n]->index + 1;
+			}
+			fs << "\n";
+		}
+	}
+	fs.close();
+}
+
+
+void btSoftBodyHelpers::writeState(const char* file, const btSoftBody* psb)
+{
+	std::ofstream fs;
+	fs.open(file);
+	btAssert(fs);
+	fs << std::scientific << std::setprecision(16);
+
+	// Only write out for trimesh, directly write out all the nodes and faces.xs
+	for (int i = 0; i < psb->m_nodes.size(); ++i)
+	{
+		fs << "q";
+		for (int d = 0; d < 3; d++)
+		{
+			fs << " " << psb->m_nodes[i].m_q[d];
+		}
+		fs << "\n";
+	}
+
+	for (int i = 0; i < psb->m_nodes.size(); ++i)
+	{
+		fs << "v";
+		for (int d = 0; d < 3; d++)
+		{
+			fs << " " << psb->m_nodes[i].m_v[d];
+		}
+		fs << "\n";
+	}
+	fs.close();
+}
+
+void btSoftBodyHelpers::duplicateFaces(const char* filename, const btSoftBody* psb)
+{
+	std::ifstream fs_read;
+	fs_read.open(filename);
+	std::string line;
+	btVector3 pos;
+	btAlignedObjectArray<btAlignedObjectArray<int> > additional_faces;
+	while (std::getline(fs_read, line))
+	{
+		std::stringstream ss(line);
+		if (line[0] == 'v')
+		{
+		}
+		else if (line[0] == 'f')
+		{
+			ss.ignore();
+			int id0, id1, id2;
+			ss >> id0;
+			ss >> id1;
+			ss >> id2;
+			btAlignedObjectArray<int> new_face;
+			new_face.push_back(id1);
+			new_face.push_back(id0);
+			new_face.push_back(id2);
+			additional_faces.push_back(new_face);
+		}
+	}
+	fs_read.close();
+
+	std::ofstream fs_write;
+	fs_write.open(filename, std::ios_base::app);
+	for (int i = 0; i < additional_faces.size(); ++i)
+	{
+		fs_write << "f";
+		for (int n = 0; n < 3; n++)
+		{
+			fs_write << " " << additional_faces[i][n];
+		}
+		fs_write << "\n";
+	}
+	fs_write.close();
+}
+
+// Given a simplex with vertices a,b,c,d, find the barycentric weights of p in this simplex
+void btSoftBodyHelpers::getBarycentricWeights(const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d, const btVector3& p, btVector4& bary)
+{
+	btVector3 vap = p - a;
+	btVector3 vbp = p - b;
+
+	btVector3 vab = b - a;
+	btVector3 vac = c - a;
+	btVector3 vad = d - a;
+
+	btVector3 vbc = c - b;
+	btVector3 vbd = d - b;
+	btScalar va6 = (vbp.cross(vbd)).dot(vbc);
+	btScalar vb6 = (vap.cross(vac)).dot(vad);
+	btScalar vc6 = (vap.cross(vad)).dot(vab);
+	btScalar vd6 = (vap.cross(vab)).dot(vac);
+	btScalar v6 = btScalar(1) / (vab.cross(vac).dot(vad));
+	bary = btVector4(va6 * v6, vb6 * v6, vc6 * v6, vd6 * v6);
+}
+
+// Given a simplex with vertices a,b,c, find the barycentric weights of p in this simplex. bary[3] = 0.
+void btSoftBodyHelpers::getBarycentricWeights(const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& p, btVector4& bary)
+{
+	btVector3 v0 = b - a, v1 = c - a, v2 = p - a;
+	btScalar d00 = btDot(v0, v0);
+	btScalar d01 = btDot(v0, v1);
+	btScalar d11 = btDot(v1, v1);
+	btScalar d20 = btDot(v2, v0);
+	btScalar d21 = btDot(v2, v1);
+	btScalar invDenom = 1.0 / (d00 * d11 - d01 * d01);
+	bary[1] = (d11 * d20 - d01 * d21) * invDenom;
+	bary[2] = (d00 * d21 - d01 * d20) * invDenom;
+	bary[0] = 1.0 - bary[1] - bary[2];
+	bary[3] = 0;
+}
+
+// Iterate through all render nodes to find the simulation tetrahedron that contains the render node and record the barycentric weights
+// If the node is not inside any tetrahedron, assign it to the tetrahedron in which the node has the least negative barycentric weight
+void btSoftBodyHelpers::interpolateBarycentricWeights(btSoftBody* psb)
+{
+	psb->m_z.resize(0);
+	psb->m_renderNodesInterpolationWeights.resize(psb->m_renderNodes.size());
+	psb->m_renderNodesParents.resize(psb->m_renderNodes.size());
+	for (int i = 0; i < psb->m_renderNodes.size(); ++i)
+	{
+		const btVector3& p = psb->m_renderNodes[i].m_x;
+		btVector4 bary;
+		btVector4 optimal_bary;
+		btScalar min_bary_weight = -1e3;
+		btAlignedObjectArray<const btSoftBody::Node*> optimal_parents;
+		for (int j = 0; j < psb->m_tetras.size(); ++j)
+		{
+			const btSoftBody::Tetra& t = psb->m_tetras[j];
+			getBarycentricWeights(t.m_n[0]->m_x, t.m_n[1]->m_x, t.m_n[2]->m_x, t.m_n[3]->m_x, p, bary);
+			btScalar new_min_bary_weight = bary[0];
+			for (int k = 1; k < 4; ++k)
+			{
+				new_min_bary_weight = btMin(new_min_bary_weight, bary[k]);
+			}
+			if (new_min_bary_weight > min_bary_weight)
+			{
+				btAlignedObjectArray<const btSoftBody::Node*> parents;
+				parents.push_back(t.m_n[0]);
+				parents.push_back(t.m_n[1]);
+				parents.push_back(t.m_n[2]);
+				parents.push_back(t.m_n[3]);
+				optimal_parents = parents;
+				optimal_bary = bary;
+				min_bary_weight = new_min_bary_weight;
+				// stop searching if p is inside the tetrahedron at hand
+				if (bary[0] >= 0. && bary[1] >= 0. && bary[2] >= 0. && bary[3] >= 0.)
+				{
+					break;
+				}
+			}
+		}
+		psb->m_renderNodesInterpolationWeights[i] = optimal_bary;
+		psb->m_renderNodesParents[i] = optimal_parents;
+	}
+}
+
+// Iterate through all render nodes to find the simulation triangle that's closest to the node in the barycentric sense.
+void btSoftBodyHelpers::extrapolateBarycentricWeights(btSoftBody* psb)
+{
+	psb->m_renderNodesInterpolationWeights.resize(psb->m_renderNodes.size());
+	psb->m_renderNodesParents.resize(psb->m_renderNodes.size());
+	psb->m_z.resize(psb->m_renderNodes.size());
+	for (int i = 0; i < psb->m_renderNodes.size(); ++i)
+	{
+		const btVector3& p = psb->m_renderNodes[i].m_x;
+		btVector4 bary;
+		btVector4 optimal_bary;
+		btScalar min_bary_weight = -SIMD_INFINITY;
+		btAlignedObjectArray<const btSoftBody::Node*> optimal_parents;
+		btScalar dist = 0, optimal_dist = 0;
+		for (int j = 0; j < psb->m_faces.size(); ++j)
+		{
+			const btSoftBody::Face& f = psb->m_faces[j];
+			btVector3 n = btCross(f.m_n[1]->m_x - f.m_n[0]->m_x, f.m_n[2]->m_x - f.m_n[0]->m_x);
+			btVector3 unit_n = n.normalized();
+			dist = (p - f.m_n[0]->m_x).dot(unit_n);
+			btVector3 proj_p = p - dist * unit_n;
+			getBarycentricWeights(f.m_n[0]->m_x, f.m_n[1]->m_x, f.m_n[2]->m_x, proj_p, bary);
+			btScalar new_min_bary_weight = bary[0];
+			for (int k = 1; k < 3; ++k)
+			{
+				new_min_bary_weight = btMin(new_min_bary_weight, bary[k]);
+			}
+
+			// p is out of the current best triangle, we found a traingle that's better
+			bool better_than_closest_outisde = (new_min_bary_weight > min_bary_weight && min_bary_weight < 0.);
+			// p is inside of the current best triangle, we found a triangle that's better
+			bool better_than_best_inside = (new_min_bary_weight >= 0 && min_bary_weight >= 0 && btFabs(dist) < btFabs(optimal_dist));
+
+			if (better_than_closest_outisde || better_than_best_inside)
+			{
+				btAlignedObjectArray<const btSoftBody::Node*> parents;
+				parents.push_back(f.m_n[0]);
+				parents.push_back(f.m_n[1]);
+				parents.push_back(f.m_n[2]);
+				optimal_parents = parents;
+				optimal_bary = bary;
+				optimal_dist = dist;
+				min_bary_weight = new_min_bary_weight;
+			}
+		}
+		psb->m_renderNodesInterpolationWeights[i] = optimal_bary;
+		psb->m_renderNodesParents[i] = optimal_parents;
+		psb->m_z[i] = optimal_dist;
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyHelpers.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyHelpers.h
new file mode 100644
index 0000000..e48d7b7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyHelpers.h
@@ -0,0 +1,172 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_BODY_HELPERS_H
+#define BT_SOFT_BODY_HELPERS_H
+
+#include "btSoftBody.h"
+#include <fstream>
+#include <string>
+//
+// Helpers
+//
+
+/* fDrawFlags															*/
+struct fDrawFlags
+{
+	enum _
+	{
+		Nodes = 0x0001,
+		Links = 0x0002,
+		Faces = 0x0004,
+		Tetras = 0x0008,
+		Normals = 0x0010,
+		Contacts = 0x0020,
+		Anchors = 0x0040,
+		Notes = 0x0080,
+		Clusters = 0x0100,
+		NodeTree = 0x0200,
+		FaceTree = 0x0400,
+		ClusterTree = 0x0800,
+		Joints = 0x1000,
+		/* presets	*/
+		Std = Links + Faces + Tetras + Anchors + Notes + Joints,
+		StdTetra = Std - Faces + Tetras
+	};
+};
+
+struct btSoftBodyHelpers
+{
+	/* Draw body															*/
+	static void Draw(btSoftBody* psb,
+					 btIDebugDraw* idraw,
+					 int drawflags = fDrawFlags::Std);
+	/* Draw body infos														*/
+	static void DrawInfos(btSoftBody* psb,
+						  btIDebugDraw* idraw,
+						  bool masses,
+						  bool areas,
+						  bool stress);
+	/* Draw node tree														*/
+	static void DrawNodeTree(btSoftBody* psb,
+							 btIDebugDraw* idraw,
+							 int mindepth = 0,
+							 int maxdepth = -1);
+	/* Draw face tree														*/
+	static void DrawFaceTree(btSoftBody* psb,
+							 btIDebugDraw* idraw,
+							 int mindepth = 0,
+							 int maxdepth = -1);
+	/* Draw cluster tree													*/
+	static void DrawClusterTree(btSoftBody* psb,
+								btIDebugDraw* idraw,
+								int mindepth = 0,
+								int maxdepth = -1);
+	/* Draw rigid frame														*/
+	static void DrawFrame(btSoftBody* psb,
+						  btIDebugDraw* idraw);
+	/* Create a rope														*/
+	static btSoftBody* CreateRope(btSoftBodyWorldInfo& worldInfo,
+								  const btVector3& from,
+								  const btVector3& to,
+								  int res,
+								  int fixeds);
+	/* Create a patch														*/
+	static btSoftBody* CreatePatch(btSoftBodyWorldInfo& worldInfo,
+								   const btVector3& corner00,
+								   const btVector3& corner10,
+								   const btVector3& corner01,
+								   const btVector3& corner11,
+								   int resx,
+								   int resy,
+								   int fixeds,
+								   bool gendiags,
+								   btScalar perturbation = 0.);
+	/* Create a patch with UV Texture Coordinates	*/
+	static btSoftBody* CreatePatchUV(btSoftBodyWorldInfo& worldInfo,
+									 const btVector3& corner00,
+									 const btVector3& corner10,
+									 const btVector3& corner01,
+									 const btVector3& corner11,
+									 int resx,
+									 int resy,
+									 int fixeds,
+									 bool gendiags,
+									 float* tex_coords = 0);
+	static float CalculateUV(int resx, int resy, int ix, int iy, int id);
+	/* Create an ellipsoid													*/
+	static btSoftBody* CreateEllipsoid(btSoftBodyWorldInfo& worldInfo,
+									   const btVector3& center,
+									   const btVector3& radius,
+									   int res);
+	/* Create from trimesh													*/
+	static btSoftBody* CreateFromTriMesh(btSoftBodyWorldInfo& worldInfo,
+										 const btScalar* vertices,
+										 const int* triangles,
+										 int ntriangles,
+										 bool randomizeConstraints = true);
+	/* Create from convex-hull												*/
+	static btSoftBody* CreateFromConvexHull(btSoftBodyWorldInfo& worldInfo,
+											const btVector3* vertices,
+											int nvertices,
+											bool randomizeConstraints = true);
+
+	/* Export TetGen compatible .smesh file									*/
+	//	static void				ExportAsSMeshFile(	btSoftBody* psb,
+	//												const char* filename);
+	/* Create from TetGen .ele, .face, .node files							*/
+	//	static btSoftBody*		CreateFromTetGenFile(	btSoftBodyWorldInfo& worldInfo,
+	//													const char* ele,
+	//													const char* face,
+	//													const char* node,
+	//													bool bfacelinks,
+	//													bool btetralinks,
+	//													bool bfacesfromtetras);
+	/* Create from TetGen .ele, .face, .node data							*/
+	static btSoftBody* CreateFromTetGenData(btSoftBodyWorldInfo& worldInfo,
+											const char* ele,
+											const char* face,
+											const char* node,
+											bool bfacelinks,
+											bool btetralinks,
+											bool bfacesfromtetras);
+	static btSoftBody* CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, const char* vtk_file);
+
+	static void writeObj(const char* file, const btSoftBody* psb);
+
+	static void writeState(const char* file, const btSoftBody* psb);
+
+  //this code cannot be here, dependency on example code are not allowed
+	//static std::string loadDeformableState(btAlignedObjectArray<btVector3>& qs, btAlignedObjectArray<btVector3>& vs, const char* filename, CommonFileIOInterface* fileIO);
+
+	static void getBarycentricWeights(const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d, const btVector3& p, btVector4& bary);
+
+	static void getBarycentricWeights(const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& p, btVector4& bary);
+
+	static void interpolateBarycentricWeights(btSoftBody* psb);
+
+	static void extrapolateBarycentricWeights(btSoftBody* psb);
+
+	static void generateBoundaryFaces(btSoftBody* psb);
+
+	static void duplicateFaces(const char* filename, const btSoftBody* psb);
+	/// Sort the list of links to move link calculations that are dependent upon earlier
+	/// ones as far as possible away from the calculation of those values
+	/// This tends to make adjacent loop iterations not dependent upon one another,
+	/// so out-of-order processors can execute instructions from multiple iterations at once
+	static void ReoptimizeLinkOrder(btSoftBody* psb);
+};
+
+#endif  //BT_SOFT_BODY_HELPERS_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyInternals.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyInternals.h
new file mode 100644
index 0000000..1372586
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyInternals.h
@@ -0,0 +1,2146 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBody implementation by Nathanael Presson
+
+#ifndef _BT_SOFT_BODY_INTERNALS_H
+#define _BT_SOFT_BODY_INTERNALS_H
+
+#include "btSoftBody.h"
+#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btPolarDecomposition.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h"
+#include <string.h>  //for memset
+#include <cmath>
+#include "poly34.h"
+
+// Given a multibody link, a contact point and a contact direction, fill in the jacobian data needed to calculate the velocity change given an impulse in the contact direction
+static SIMD_FORCE_INLINE void findJacobian(const btMultiBodyLinkCollider* multibodyLinkCol,
+										   btMultiBodyJacobianData& jacobianData,
+										   const btVector3& contact_point,
+										   const btVector3& dir)
+{
+	const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+	jacobianData.m_jacobians.resize(ndof);
+	jacobianData.m_deltaVelocitiesUnitImpulse.resize(ndof);
+	btScalar* jac = &jacobianData.m_jacobians[0];
+
+	multibodyLinkCol->m_multiBody->fillContactJacobianMultiDof(multibodyLinkCol->m_link, contact_point, dir, jac, jacobianData.scratch_r, jacobianData.scratch_v, jacobianData.scratch_m);
+	multibodyLinkCol->m_multiBody->calcAccelerationDeltasMultiDof(&jacobianData.m_jacobians[0], &jacobianData.m_deltaVelocitiesUnitImpulse[0], jacobianData.scratch_r, jacobianData.scratch_v);
+}
+static SIMD_FORCE_INLINE btVector3 generateUnitOrthogonalVector(const btVector3& u)
+{
+	btScalar ux = u.getX();
+	btScalar uy = u.getY();
+	btScalar uz = u.getZ();
+	btScalar ax = std::abs(ux);
+	btScalar ay = std::abs(uy);
+	btScalar az = std::abs(uz);
+	btVector3 v;
+	if (ax <= ay && ax <= az)
+		v = btVector3(0, -uz, uy);
+	else if (ay <= ax && ay <= az)
+		v = btVector3(-uz, 0, ux);
+	else
+		v = btVector3(-uy, ux, 0);
+	v.normalize();
+	return v;
+}
+
+static SIMD_FORCE_INLINE bool proximityTest(const btVector3& x1, const btVector3& x2, const btVector3& x3, const btVector3& x4, const btVector3& normal, const btScalar& mrg, btVector3& bary)
+{
+	btVector3 x43 = x4 - x3;
+	if (std::abs(x43.dot(normal)) > mrg)
+		return false;
+	btVector3 x13 = x1 - x3;
+	btVector3 x23 = x2 - x3;
+	btScalar a11 = x13.length2();
+	btScalar a22 = x23.length2();
+	btScalar a12 = x13.dot(x23);
+	btScalar b1 = x13.dot(x43);
+	btScalar b2 = x23.dot(x43);
+	btScalar det = a11 * a22 - a12 * a12;
+	if (det < SIMD_EPSILON)
+		return false;
+	btScalar w1 = (b1 * a22 - b2 * a12) / det;
+	btScalar w2 = (b2 * a11 - b1 * a12) / det;
+	btScalar w3 = 1 - w1 - w2;
+	btScalar delta = mrg / std::sqrt(0.5 * std::abs(x13.cross(x23).safeNorm()));
+	bary = btVector3(w1, w2, w3);
+	for (int i = 0; i < 3; ++i)
+	{
+		if (bary[i] < -delta || bary[i] > 1 + delta)
+			return false;
+	}
+	return true;
+}
+static const int KDOP_COUNT = 13;
+static btVector3 dop[KDOP_COUNT] = {btVector3(1, 0, 0),
+									btVector3(0, 1, 0),
+									btVector3(0, 0, 1),
+									btVector3(1, 1, 0),
+									btVector3(1, 0, 1),
+									btVector3(0, 1, 1),
+									btVector3(1, -1, 0),
+									btVector3(1, 0, -1),
+									btVector3(0, 1, -1),
+									btVector3(1, 1, 1),
+									btVector3(1, -1, 1),
+									btVector3(1, 1, -1),
+									btVector3(1, -1, -1)};
+
+static inline int getSign(const btVector3& n, const btVector3& x)
+{
+	btScalar d = n.dot(x);
+	if (d > SIMD_EPSILON)
+		return 1;
+	if (d < -SIMD_EPSILON)
+		return -1;
+	return 0;
+}
+
+static SIMD_FORCE_INLINE bool hasSeparatingPlane(const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt)
+{
+	btVector3 hex[6] = {face->m_n[0]->m_x - node->m_x,
+						face->m_n[1]->m_x - node->m_x,
+						face->m_n[2]->m_x - node->m_x,
+						face->m_n[0]->m_x + dt * face->m_n[0]->m_v - node->m_x,
+						face->m_n[1]->m_x + dt * face->m_n[1]->m_v - node->m_x,
+						face->m_n[2]->m_x + dt * face->m_n[2]->m_v - node->m_x};
+	btVector3 segment = dt * node->m_v;
+	for (int i = 0; i < KDOP_COUNT; ++i)
+	{
+		int s = getSign(dop[i], segment);
+		int j = 0;
+		for (; j < 6; ++j)
+		{
+			if (getSign(dop[i], hex[j]) == s)
+				break;
+		}
+		if (j == 6)
+			return true;
+	}
+	return false;
+}
+
+static SIMD_FORCE_INLINE bool nearZero(const btScalar& a)
+{
+	return (a > -SAFE_EPSILON && a < SAFE_EPSILON);
+}
+static SIMD_FORCE_INLINE bool sameSign(const btScalar& a, const btScalar& b)
+{
+	return (nearZero(a) || nearZero(b) || (a > SAFE_EPSILON && b > SAFE_EPSILON) || (a < -SAFE_EPSILON && b < -SAFE_EPSILON));
+}
+static SIMD_FORCE_INLINE bool diffSign(const btScalar& a, const btScalar& b)
+{
+	return !sameSign(a, b);
+}
+inline btScalar evaluateBezier2(const btScalar& p0, const btScalar& p1, const btScalar& p2, const btScalar& t, const btScalar& s)
+{
+	btScalar s2 = s * s;
+	btScalar t2 = t * t;
+
+	return p0 * s2 + p1 * btScalar(2.0) * s * t + p2 * t2;
+}
+inline btScalar evaluateBezier(const btScalar& p0, const btScalar& p1, const btScalar& p2, const btScalar& p3, const btScalar& t, const btScalar& s)
+{
+	btScalar s2 = s * s;
+	btScalar s3 = s2 * s;
+	btScalar t2 = t * t;
+	btScalar t3 = t2 * t;
+
+	return p0 * s3 + p1 * btScalar(3.0) * s2 * t + p2 * btScalar(3.0) * s * t2 + p3 * t3;
+}
+static SIMD_FORCE_INLINE bool getSigns(bool type_c, const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btScalar& t0, const btScalar& t1, btScalar& lt0, btScalar& lt1)
+{
+	if (sameSign(t0, t1))
+	{
+		lt0 = t0;
+		lt1 = t0;
+		return true;
+	}
+
+	if (type_c || diffSign(k0, k3))
+	{
+		btScalar ft = evaluateBezier(k0, k1, k2, k3, t0, -t1);
+		if (t0 < -0)
+			ft = -ft;
+
+		if (sameSign(ft, k0))
+		{
+			lt0 = t1;
+			lt1 = t1;
+		}
+		else
+		{
+			lt0 = t0;
+			lt1 = t0;
+		}
+		return true;
+	}
+
+	if (!type_c)
+	{
+		btScalar ft = evaluateBezier(k0, k1, k2, k3, t0, -t1);
+		if (t0 < -0)
+			ft = -ft;
+
+		if (diffSign(ft, k0))
+		{
+			lt0 = t0;
+			lt1 = t1;
+			return true;
+		}
+
+		btScalar fk = evaluateBezier2(k1 - k0, k2 - k1, k3 - k2, t0, -t1);
+
+		if (sameSign(fk, k1 - k0))
+			lt0 = lt1 = t1;
+		else
+			lt0 = lt1 = t0;
+
+		return true;
+	}
+	return false;
+}
+
+static SIMD_FORCE_INLINE void getBernsteinCoeff(const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt, btScalar& k0, btScalar& k1, btScalar& k2, btScalar& k3)
+{
+	const btVector3& n0 = face->m_n0;
+	const btVector3& n1 = face->m_n1;
+	btVector3 n_hat = n0 + n1 - face->m_vn;
+	btVector3 p0ma0 = node->m_x - face->m_n[0]->m_x;
+	btVector3 p1ma1 = node->m_q - face->m_n[0]->m_q;
+	k0 = (p0ma0).dot(n0) * 3.0;
+	k1 = (p0ma0).dot(n_hat) + (p1ma1).dot(n0);
+	k2 = (p1ma1).dot(n_hat) + (p0ma0).dot(n1);
+	k3 = (p1ma1).dot(n1) * 3.0;
+}
+
+static SIMD_FORCE_INLINE void polyDecomposition(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btScalar& j0, const btScalar& j1, const btScalar& j2, btScalar& u0, btScalar& u1, btScalar& v0, btScalar& v1)
+{
+	btScalar denom = 4.0 * (j1 - j2) * (j1 - j0) + (j2 - j0) * (j2 - j0);
+	u0 = (2.0 * (j1 - j2) * (3.0 * k1 - 2.0 * k0 - k3) - (j0 - j2) * (3.0 * k2 - 2.0 * k3 - k0)) / denom;
+	u1 = (2.0 * (j1 - j0) * (3.0 * k2 - 2.0 * k3 - k0) - (j2 - j0) * (3.0 * k1 - 2.0 * k0 - k3)) / denom;
+	v0 = k0 - u0 * j0;
+	v1 = k3 - u1 * j2;
+}
+
+static SIMD_FORCE_INLINE bool rootFindingLemma(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3)
+{
+	btScalar u0, u1, v0, v1;
+	btScalar j0 = 3.0 * (k1 - k0);
+	btScalar j1 = 3.0 * (k2 - k1);
+	btScalar j2 = 3.0 * (k3 - k2);
+	polyDecomposition(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1);
+	if (sameSign(v0, v1))
+	{
+		btScalar Ypa = j0 * (1.0 - v0) * (1.0 - v0) + 2.0 * j1 * v0 * (1.0 - v0) + j2 * v0 * v0;  // Y'(v0)
+		if (sameSign(Ypa, j0))
+		{
+			return (diffSign(k0, v1));
+		}
+	}
+	return diffSign(k0, v0);
+}
+
+static SIMD_FORCE_INLINE void getJs(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btSoftBody::Node* a, const btSoftBody::Node* b, const btSoftBody::Node* c, const btSoftBody::Node* p, const btScalar& dt, btScalar& j0, btScalar& j1, btScalar& j2)
+{
+	const btVector3& a0 = a->m_x;
+	const btVector3& b0 = b->m_x;
+	const btVector3& c0 = c->m_x;
+	const btVector3& va = a->m_v;
+	const btVector3& vb = b->m_v;
+	const btVector3& vc = c->m_v;
+	const btVector3 a1 = a0 + dt * va;
+	const btVector3 b1 = b0 + dt * vb;
+	const btVector3 c1 = c0 + dt * vc;
+	btVector3 n0 = (b0 - a0).cross(c0 - a0);
+	btVector3 n1 = (b1 - a1).cross(c1 - a1);
+	btVector3 n_hat = n0 + n1 - dt * dt * (vb - va).cross(vc - va);
+	const btVector3& p0 = p->m_x;
+	const btVector3& vp = p->m_v;
+	btVector3 p1 = p0 + dt * vp;
+	btVector3 m0 = (b0 - p0).cross(c0 - p0);
+	btVector3 m1 = (b1 - p1).cross(c1 - p1);
+	btVector3 m_hat = m0 + m1 - dt * dt * (vb - vp).cross(vc - vp);
+	btScalar l0 = m0.dot(n0);
+	btScalar l1 = 0.25 * (m0.dot(n_hat) + m_hat.dot(n0));
+	btScalar l2 = btScalar(1) / btScalar(6) * (m0.dot(n1) + m_hat.dot(n_hat) + m1.dot(n0));
+	btScalar l3 = 0.25 * (m_hat.dot(n1) + m1.dot(n_hat));
+	btScalar l4 = m1.dot(n1);
+
+	btScalar k1p = 0.25 * k0 + 0.75 * k1;
+	btScalar k2p = 0.5 * k1 + 0.5 * k2;
+	btScalar k3p = 0.75 * k2 + 0.25 * k3;
+
+	btScalar s0 = (l1 * k0 - l0 * k1p) * 4.0;
+	btScalar s1 = (l2 * k0 - l0 * k2p) * 2.0;
+	btScalar s2 = (l3 * k0 - l0 * k3p) * btScalar(4) / btScalar(3);
+	btScalar s3 = l4 * k0 - l0 * k3;
+
+	j0 = (s1 * k0 - s0 * k1) * 3.0;
+	j1 = (s2 * k0 - s0 * k2) * 1.5;
+	j2 = (s3 * k0 - s0 * k3);
+}
+
+static SIMD_FORCE_INLINE bool signDetermination1Internal(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btScalar& u0, const btScalar& u1, const btScalar& v0, const btScalar& v1)
+{
+	btScalar Yu0 = k0 * (1.0 - u0) * (1.0 - u0) * (1.0 - u0) + 3.0 * k1 * u0 * (1.0 - u0) * (1.0 - u0) + 3.0 * k2 * u0 * u0 * (1.0 - u0) + k3 * u0 * u0 * u0;  // Y(u0)
+	btScalar Yv0 = k0 * (1.0 - v0) * (1.0 - v0) * (1.0 - v0) + 3.0 * k1 * v0 * (1.0 - v0) * (1.0 - v0) + 3.0 * k2 * v0 * v0 * (1.0 - v0) + k3 * v0 * v0 * v0;  // Y(v0)
+
+	btScalar sign_Ytp = (u0 > u1) ? Yu0 : -Yu0;
+	btScalar L = sameSign(sign_Ytp, k0) ? u1 : u0;
+	sign_Ytp = (v0 > v1) ? Yv0 : -Yv0;
+	btScalar K = (sameSign(sign_Ytp, k0)) ? v1 : v0;
+	return diffSign(L, K);
+}
+
+static SIMD_FORCE_INLINE bool signDetermination2Internal(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btScalar& j0, const btScalar& j1, const btScalar& j2, const btScalar& u0, const btScalar& u1, const btScalar& v0, const btScalar& v1)
+{
+	btScalar Yu0 = k0 * (1.0 - u0) * (1.0 - u0) * (1.0 - u0) + 3.0 * k1 * u0 * (1.0 - u0) * (1.0 - u0) + 3.0 * k2 * u0 * u0 * (1.0 - u0) + k3 * u0 * u0 * u0;  // Y(u0)
+	btScalar sign_Ytp = (u0 > u1) ? Yu0 : -Yu0, L1, L2;
+	if (diffSign(sign_Ytp, k0))
+	{
+		L1 = u0;
+		L2 = u1;
+	}
+	else
+	{
+		btScalar Yp_u0 = j0 * (1.0 - u0) * (1.0 - u0) + 2.0 * j1 * (1.0 - u0) * u0 + j2 * u0 * u0;
+		if (sameSign(Yp_u0, j0))
+		{
+			L1 = u1;
+			L2 = u1;
+		}
+		else
+		{
+			L1 = u0;
+			L2 = u0;
+		}
+	}
+	btScalar Yv0 = k0 * (1.0 - v0) * (1.0 - v0) * (1.0 - v0) + 3.0 * k1 * v0 * (1.0 - v0) * (1.0 - v0) + 3.0 * k2 * v0 * v0 * (1.0 - v0) + k3 * v0 * v0 * v0;  // Y(uv0)
+	sign_Ytp = (v0 > v1) ? Yv0 : -Yv0;
+	btScalar K1, K2;
+	if (diffSign(sign_Ytp, k0))
+	{
+		K1 = v0;
+		K2 = v1;
+	}
+	else
+	{
+		btScalar Yp_v0 = j0 * (1.0 - v0) * (1.0 - v0) + 2.0 * j1 * (1.0 - v0) * v0 + j2 * v0 * v0;
+		if (sameSign(Yp_v0, j0))
+		{
+			K1 = v1;
+			K2 = v1;
+		}
+		else
+		{
+			K1 = v0;
+			K2 = v0;
+		}
+	}
+	return (diffSign(K1, L1) || diffSign(L2, K2));
+}
+
+static SIMD_FORCE_INLINE bool signDetermination1(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt)
+{
+	btScalar j0, j1, j2, u0, u1, v0, v1;
+	// p1
+	getJs(k0, k1, k2, k3, face->m_n[0], face->m_n[1], face->m_n[2], node, dt, j0, j1, j2);
+	if (nearZero(j0 + j2 - j1 * 2.0))
+	{
+		btScalar lt0, lt1;
+		getSigns(true, k0, k1, k2, k3, j0, j2, lt0, lt1);
+		if (lt0 < -SAFE_EPSILON)
+			return false;
+	}
+	else
+	{
+		polyDecomposition(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1);
+		if (!signDetermination1Internal(k0, k1, k2, k3, u0, u1, v0, v1))
+			return false;
+	}
+	// p2
+	getJs(k0, k1, k2, k3, face->m_n[1], face->m_n[2], face->m_n[0], node, dt, j0, j1, j2);
+	if (nearZero(j0 + j2 - j1 * 2.0))
+	{
+		btScalar lt0, lt1;
+		getSigns(true, k0, k1, k2, k3, j0, j2, lt0, lt1);
+		if (lt0 < -SAFE_EPSILON)
+			return false;
+	}
+	else
+	{
+		polyDecomposition(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1);
+		if (!signDetermination1Internal(k0, k1, k2, k3, u0, u1, v0, v1))
+			return false;
+	}
+	// p3
+	getJs(k0, k1, k2, k3, face->m_n[2], face->m_n[0], face->m_n[1], node, dt, j0, j1, j2);
+	if (nearZero(j0 + j2 - j1 * 2.0))
+	{
+		btScalar lt0, lt1;
+		getSigns(true, k0, k1, k2, k3, j0, j2, lt0, lt1);
+		if (lt0 < -SAFE_EPSILON)
+			return false;
+	}
+	else
+	{
+		polyDecomposition(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1);
+		if (!signDetermination1Internal(k0, k1, k2, k3, u0, u1, v0, v1))
+			return false;
+	}
+	return true;
+}
+
+static SIMD_FORCE_INLINE bool signDetermination2(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt)
+{
+	btScalar j0, j1, j2, u0, u1, v0, v1;
+	// p1
+	getJs(k0, k1, k2, k3, face->m_n[0], face->m_n[1], face->m_n[2], node, dt, j0, j1, j2);
+	if (nearZero(j0 + j2 - j1 * 2.0))
+	{
+		btScalar lt0, lt1;
+		bool bt0 = true, bt1 = true;
+		getSigns(false, k0, k1, k2, k3, j0, j2, lt0, lt1);
+		if (lt0 < -SAFE_EPSILON)
+			bt0 = false;
+		if (lt1 < -SAFE_EPSILON)
+			bt1 = false;
+		if (!bt0 && !bt1)
+			return false;
+	}
+	else
+	{
+		polyDecomposition(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1);
+		if (!signDetermination2Internal(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1))
+			return false;
+	}
+	// p2
+	getJs(k0, k1, k2, k3, face->m_n[1], face->m_n[2], face->m_n[0], node, dt, j0, j1, j2);
+	if (nearZero(j0 + j2 - j1 * 2.0))
+	{
+		btScalar lt0, lt1;
+		bool bt0 = true, bt1 = true;
+		getSigns(false, k0, k1, k2, k3, j0, j2, lt0, lt1);
+		if (lt0 < -SAFE_EPSILON)
+			bt0 = false;
+		if (lt1 < -SAFE_EPSILON)
+			bt1 = false;
+		if (!bt0 && !bt1)
+			return false;
+	}
+	else
+	{
+		polyDecomposition(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1);
+		if (!signDetermination2Internal(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1))
+			return false;
+	}
+	// p3
+	getJs(k0, k1, k2, k3, face->m_n[2], face->m_n[0], face->m_n[1], node, dt, j0, j1, j2);
+	if (nearZero(j0 + j2 - j1 * 2.0))
+	{
+		btScalar lt0, lt1;
+		bool bt0 = true, bt1 = true;
+		getSigns(false, k0, k1, k2, k3, j0, j2, lt0, lt1);
+		if (lt0 < -SAFE_EPSILON)
+			bt0 = false;
+		if (lt1 < -SAFE_EPSILON)
+			bt1 = false;
+		if (!bt0 && !bt1)
+			return false;
+	}
+	else
+	{
+		polyDecomposition(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1);
+		if (!signDetermination2Internal(k0, k1, k2, k3, j0, j1, j2, u0, u1, v0, v1))
+			return false;
+	}
+	return true;
+}
+
+static SIMD_FORCE_INLINE bool coplanarAndInsideTest(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt)
+{
+	// Coplanar test
+	if (diffSign(k1 - k0, k3 - k2))
+	{
+		// Case b:
+		if (sameSign(k0, k3) && !rootFindingLemma(k0, k1, k2, k3))
+			return false;
+		// inside test
+		return signDetermination2(k0, k1, k2, k3, face, node, dt);
+	}
+	else
+	{
+		// Case c:
+		if (sameSign(k0, k3))
+			return false;
+		// inside test
+		return signDetermination1(k0, k1, k2, k3, face, node, dt);
+	}
+	return false;
+}
+static SIMD_FORCE_INLINE bool conservativeCulling(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btScalar& mrg)
+{
+	if (k0 > mrg && k1 > mrg && k2 > mrg && k3 > mrg)
+		return true;
+	if (k0 < -mrg && k1 < -mrg && k2 < -mrg && k3 < -mrg)
+		return true;
+	return false;
+}
+
+static SIMD_FORCE_INLINE bool bernsteinVFTest(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btScalar& mrg, const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt)
+{
+	if (conservativeCulling(k0, k1, k2, k3, mrg))
+		return false;
+	return coplanarAndInsideTest(k0, k1, k2, k3, face, node, dt);
+}
+
+static SIMD_FORCE_INLINE void deCasteljau(const btScalar& k0, const btScalar& k1, const btScalar& k2, const btScalar& k3, const btScalar& t0, btScalar& k10, btScalar& k20, btScalar& k30, btScalar& k21, btScalar& k12)
+{
+	k10 = k0 * (1.0 - t0) + k1 * t0;
+	btScalar k11 = k1 * (1.0 - t0) + k2 * t0;
+	k12 = k2 * (1.0 - t0) + k3 * t0;
+	k20 = k10 * (1.0 - t0) + k11 * t0;
+	k21 = k11 * (1.0 - t0) + k12 * t0;
+	k30 = k20 * (1.0 - t0) + k21 * t0;
+}
+static SIMD_FORCE_INLINE bool bernsteinVFTest(const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt, const btScalar& mrg)
+{
+	btScalar k0, k1, k2, k3;
+	getBernsteinCoeff(face, node, dt, k0, k1, k2, k3);
+	if (conservativeCulling(k0, k1, k2, k3, mrg))
+		return false;
+	return true;
+	if (diffSign(k2 - 2.0 * k1 + k0, k3 - 2.0 * k2 + k1))
+	{
+		btScalar k10, k20, k30, k21, k12;
+		btScalar t0 = (k2 - 2.0 * k1 + k0) / (k0 - 3.0 * k1 + 3.0 * k2 - k3);
+		deCasteljau(k0, k1, k2, k3, t0, k10, k20, k30, k21, k12);
+		return bernsteinVFTest(k0, k10, k20, k30, mrg, face, node, dt) || bernsteinVFTest(k30, k21, k12, k3, mrg, face, node, dt);
+	}
+	return coplanarAndInsideTest(k0, k1, k2, k3, face, node, dt);
+}
+
+static SIMD_FORCE_INLINE bool continuousCollisionDetection(const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt, const btScalar& mrg, btVector3& bary)
+{
+	if (hasSeparatingPlane(face, node, dt))
+		return false;
+	btVector3 x21 = face->m_n[1]->m_x - face->m_n[0]->m_x;
+	btVector3 x31 = face->m_n[2]->m_x - face->m_n[0]->m_x;
+	btVector3 x41 = node->m_x - face->m_n[0]->m_x;
+	btVector3 v21 = face->m_n[1]->m_v - face->m_n[0]->m_v;
+	btVector3 v31 = face->m_n[2]->m_v - face->m_n[0]->m_v;
+	btVector3 v41 = node->m_v - face->m_n[0]->m_v;
+	btVector3 a = x21.cross(x31);
+	btVector3 b = x21.cross(v31) + v21.cross(x31);
+	btVector3 c = v21.cross(v31);
+	btVector3 d = x41;
+	btVector3 e = v41;
+	btScalar a0 = a.dot(d);
+	btScalar a1 = a.dot(e) + b.dot(d);
+	btScalar a2 = c.dot(d) + b.dot(e);
+	btScalar a3 = c.dot(e);
+	btScalar eps = SAFE_EPSILON;
+	int num_roots = 0;
+	btScalar roots[3];
+	if (std::abs(a3) < eps)
+	{
+		// cubic term is zero
+		if (std::abs(a2) < eps)
+		{
+			if (std::abs(a1) < eps)
+			{
+				if (std::abs(a0) < eps)
+				{
+					num_roots = 2;
+					roots[0] = 0;
+					roots[1] = dt;
+				}
+			}
+			else
+			{
+				num_roots = 1;
+				roots[0] = -a0 / a1;
+			}
+		}
+		else
+		{
+			num_roots = SolveP2(roots, a1 / a2, a0 / a2);
+		}
+	}
+	else
+	{
+		num_roots = SolveP3(roots, a2 / a3, a1 / a3, a0 / a3);
+	}
+	//    std::sort(roots, roots+num_roots);
+	if (num_roots > 1)
+	{
+		if (roots[0] > roots[1])
+			btSwap(roots[0], roots[1]);
+	}
+	if (num_roots > 2)
+	{
+		if (roots[0] > roots[2])
+			btSwap(roots[0], roots[2]);
+		if (roots[1] > roots[2])
+			btSwap(roots[1], roots[2]);
+	}
+	for (int r = 0; r < num_roots; ++r)
+	{
+		double root = roots[r];
+		if (root <= 0)
+			continue;
+		if (root > dt + SIMD_EPSILON)
+			return false;
+		btVector3 x1 = face->m_n[0]->m_x + root * face->m_n[0]->m_v;
+		btVector3 x2 = face->m_n[1]->m_x + root * face->m_n[1]->m_v;
+		btVector3 x3 = face->m_n[2]->m_x + root * face->m_n[2]->m_v;
+		btVector3 x4 = node->m_x + root * node->m_v;
+		btVector3 normal = (x2 - x1).cross(x3 - x1);
+		normal.safeNormalize();
+		if (proximityTest(x1, x2, x3, x4, normal, mrg, bary))
+			return true;
+	}
+	return false;
+}
+static SIMD_FORCE_INLINE bool bernsteinCCD(const btSoftBody::Face* face, const btSoftBody::Node* node, const btScalar& dt, const btScalar& mrg, btVector3& bary)
+{
+	if (!bernsteinVFTest(face, node, dt, mrg))
+		return false;
+	if (!continuousCollisionDetection(face, node, dt, 1e-6, bary))
+		return false;
+	return true;
+}
+
+//
+// btSymMatrix
+//
+template <typename T>
+struct btSymMatrix
+{
+	btSymMatrix() : dim(0) {}
+	btSymMatrix(int n, const T& init = T()) { resize(n, init); }
+	void resize(int n, const T& init = T())
+	{
+		dim = n;
+		store.resize((n * (n + 1)) / 2, init);
+	}
+	int index(int c, int r) const
+	{
+		if (c > r) btSwap(c, r);
+		btAssert(r < dim);
+		return ((r * (r + 1)) / 2 + c);
+	}
+	T& operator()(int c, int r) { return (store[index(c, r)]); }
+	const T& operator()(int c, int r) const { return (store[index(c, r)]); }
+	btAlignedObjectArray<T> store;
+	int dim;
+};
+
+//
+// btSoftBodyCollisionShape
+//
+class btSoftBodyCollisionShape : public btConcaveShape
+{
+public:
+	btSoftBody* m_body;
+
+	btSoftBodyCollisionShape(btSoftBody* backptr)
+	{
+		m_shapeType = SOFTBODY_SHAPE_PROXYTYPE;
+		m_body = backptr;
+	}
+
+	virtual ~btSoftBodyCollisionShape()
+	{
+	}
+
+	void processAllTriangles(btTriangleCallback* /*callback*/, const btVector3& /*aabbMin*/, const btVector3& /*aabbMax*/) const
+	{
+		//not yet
+		btAssert(0);
+	}
+
+	///getAabb returns the axis aligned bounding box in the coordinate frame of the given transform t.
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+		/* t is usually identity, except when colliding against btCompoundShape. See Issue 512 */
+		const btVector3 mins = m_body->m_bounds[0];
+		const btVector3 maxs = m_body->m_bounds[1];
+		const btVector3 crns[] = {t * btVector3(mins.x(), mins.y(), mins.z()),
+								  t * btVector3(maxs.x(), mins.y(), mins.z()),
+								  t * btVector3(maxs.x(), maxs.y(), mins.z()),
+								  t * btVector3(mins.x(), maxs.y(), mins.z()),
+								  t * btVector3(mins.x(), mins.y(), maxs.z()),
+								  t * btVector3(maxs.x(), mins.y(), maxs.z()),
+								  t * btVector3(maxs.x(), maxs.y(), maxs.z()),
+								  t * btVector3(mins.x(), maxs.y(), maxs.z())};
+		aabbMin = aabbMax = crns[0];
+		for (int i = 1; i < 8; ++i)
+		{
+			aabbMin.setMin(crns[i]);
+			aabbMax.setMax(crns[i]);
+		}
+	}
+
+	virtual void setLocalScaling(const btVector3& /*scaling*/)
+	{
+		///na
+	}
+	virtual const btVector3& getLocalScaling() const
+	{
+		static const btVector3 dummy(1, 1, 1);
+		return dummy;
+	}
+	virtual void calculateLocalInertia(btScalar /*mass*/, btVector3& /*inertia*/) const
+	{
+		///not yet
+		btAssert(0);
+	}
+	virtual const char* getName() const
+	{
+		return "SoftBody";
+	}
+};
+
+//
+// btSoftClusterCollisionShape
+//
+class btSoftClusterCollisionShape : public btConvexInternalShape
+{
+public:
+	const btSoftBody::Cluster* m_cluster;
+
+	btSoftClusterCollisionShape(const btSoftBody::Cluster* cluster) : m_cluster(cluster) { setMargin(0); }
+
+	virtual btVector3 localGetSupportingVertex(const btVector3& vec) const
+	{
+		btSoftBody::Node* const* n = &m_cluster->m_nodes[0];
+		btScalar d = btDot(vec, n[0]->m_x);
+		int j = 0;
+		for (int i = 1, ni = m_cluster->m_nodes.size(); i < ni; ++i)
+		{
+			const btScalar k = btDot(vec, n[i]->m_x);
+			if (k > d)
+			{
+				d = k;
+				j = i;
+			}
+		}
+		return (n[j]->m_x);
+	}
+	virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec) const
+	{
+		return (localGetSupportingVertex(vec));
+	}
+	//notice that the vectors should be unit length
+	virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors, btVector3* supportVerticesOut, int numVectors) const
+	{
+	}
+
+	virtual void calculateLocalInertia(btScalar mass, btVector3& inertia) const
+	{
+	}
+
+	virtual void getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+	}
+
+	virtual int getShapeType() const { return SOFTBODY_SHAPE_PROXYTYPE; }
+
+	//debugging
+	virtual const char* getName() const { return "SOFTCLUSTER"; }
+
+	virtual void setMargin(btScalar margin)
+	{
+		btConvexInternalShape::setMargin(margin);
+	}
+	virtual btScalar getMargin() const
+	{
+		return btConvexInternalShape::getMargin();
+	}
+};
+
+//
+// Inline's
+//
+
+//
+template <typename T>
+static inline void ZeroInitialize(T& value)
+{
+	memset(&value, 0, sizeof(T));
+}
+//
+template <typename T>
+static inline bool CompLess(const T& a, const T& b)
+{
+	return (a < b);
+}
+//
+template <typename T>
+static inline bool CompGreater(const T& a, const T& b)
+{
+	return (a > b);
+}
+//
+template <typename T>
+static inline T Lerp(const T& a, const T& b, btScalar t)
+{
+	return (a + (b - a) * t);
+}
+//
+template <typename T>
+static inline T InvLerp(const T& a, const T& b, btScalar t)
+{
+	return ((b + a * t - b * t) / (a * b));
+}
+//
+static inline btMatrix3x3 Lerp(const btMatrix3x3& a,
+							   const btMatrix3x3& b,
+							   btScalar t)
+{
+	btMatrix3x3 r;
+	r[0] = Lerp(a[0], b[0], t);
+	r[1] = Lerp(a[1], b[1], t);
+	r[2] = Lerp(a[2], b[2], t);
+	return (r);
+}
+//
+static inline btVector3 Clamp(const btVector3& v, btScalar maxlength)
+{
+	const btScalar sql = v.length2();
+	if (sql > (maxlength * maxlength))
+		return ((v * maxlength) / btSqrt(sql));
+	else
+		return (v);
+}
+//
+template <typename T>
+static inline T Clamp(const T& x, const T& l, const T& h)
+{
+	return (x < l ? l : x > h ? h : x);
+}
+//
+template <typename T>
+static inline T Sq(const T& x)
+{
+	return (x * x);
+}
+//
+template <typename T>
+static inline T Cube(const T& x)
+{
+	return (x * x * x);
+}
+//
+template <typename T>
+static inline T Sign(const T& x)
+{
+	return ((T)(x < 0 ? -1 : +1));
+}
+//
+template <typename T>
+static inline bool SameSign(const T& x, const T& y)
+{
+	return ((x * y) > 0);
+}
+//
+static inline btScalar ClusterMetric(const btVector3& x, const btVector3& y)
+{
+	const btVector3 d = x - y;
+	return (btFabs(d[0]) + btFabs(d[1]) + btFabs(d[2]));
+}
+//
+static inline btMatrix3x3 ScaleAlongAxis(const btVector3& a, btScalar s)
+{
+	const btScalar xx = a.x() * a.x();
+	const btScalar yy = a.y() * a.y();
+	const btScalar zz = a.z() * a.z();
+	const btScalar xy = a.x() * a.y();
+	const btScalar yz = a.y() * a.z();
+	const btScalar zx = a.z() * a.x();
+	btMatrix3x3 m;
+	m[0] = btVector3(1 - xx + xx * s, xy * s - xy, zx * s - zx);
+	m[1] = btVector3(xy * s - xy, 1 - yy + yy * s, yz * s - yz);
+	m[2] = btVector3(zx * s - zx, yz * s - yz, 1 - zz + zz * s);
+	return (m);
+}
+//
+static inline btMatrix3x3 Cross(const btVector3& v)
+{
+	btMatrix3x3 m;
+	m[0] = btVector3(0, -v.z(), +v.y());
+	m[1] = btVector3(+v.z(), 0, -v.x());
+	m[2] = btVector3(-v.y(), +v.x(), 0);
+	return (m);
+}
+//
+static inline btMatrix3x3 Diagonal(btScalar x)
+{
+	btMatrix3x3 m;
+	m[0] = btVector3(x, 0, 0);
+	m[1] = btVector3(0, x, 0);
+	m[2] = btVector3(0, 0, x);
+	return (m);
+}
+
+static inline btMatrix3x3 Diagonal(const btVector3& v)
+{
+	btMatrix3x3 m;
+	m[0] = btVector3(v.getX(), 0, 0);
+	m[1] = btVector3(0, v.getY(), 0);
+	m[2] = btVector3(0, 0, v.getZ());
+	return (m);
+}
+
+static inline btScalar Dot(const btScalar* a, const btScalar* b, int ndof)
+{
+	btScalar result = 0;
+	for (int i = 0; i < ndof; ++i)
+		result += a[i] * b[i];
+	return result;
+}
+
+static inline btMatrix3x3 OuterProduct(const btScalar* v1, const btScalar* v2, const btScalar* v3,
+									   const btScalar* u1, const btScalar* u2, const btScalar* u3, int ndof)
+{
+	btMatrix3x3 m;
+	btScalar a11 = Dot(v1, u1, ndof);
+	btScalar a12 = Dot(v1, u2, ndof);
+	btScalar a13 = Dot(v1, u3, ndof);
+
+	btScalar a21 = Dot(v2, u1, ndof);
+	btScalar a22 = Dot(v2, u2, ndof);
+	btScalar a23 = Dot(v2, u3, ndof);
+
+	btScalar a31 = Dot(v3, u1, ndof);
+	btScalar a32 = Dot(v3, u2, ndof);
+	btScalar a33 = Dot(v3, u3, ndof);
+	m[0] = btVector3(a11, a12, a13);
+	m[1] = btVector3(a21, a22, a23);
+	m[2] = btVector3(a31, a32, a33);
+	return (m);
+}
+
+static inline btMatrix3x3 OuterProduct(const btVector3& v1, const btVector3& v2)
+{
+	btMatrix3x3 m;
+	btScalar a11 = v1[0] * v2[0];
+	btScalar a12 = v1[0] * v2[1];
+	btScalar a13 = v1[0] * v2[2];
+
+	btScalar a21 = v1[1] * v2[0];
+	btScalar a22 = v1[1] * v2[1];
+	btScalar a23 = v1[1] * v2[2];
+
+	btScalar a31 = v1[2] * v2[0];
+	btScalar a32 = v1[2] * v2[1];
+	btScalar a33 = v1[2] * v2[2];
+	m[0] = btVector3(a11, a12, a13);
+	m[1] = btVector3(a21, a22, a23);
+	m[2] = btVector3(a31, a32, a33);
+	return (m);
+}
+
+//
+static inline btMatrix3x3 Add(const btMatrix3x3& a,
+							  const btMatrix3x3& b)
+{
+	btMatrix3x3 r;
+	for (int i = 0; i < 3; ++i) r[i] = a[i] + b[i];
+	return (r);
+}
+//
+static inline btMatrix3x3 Sub(const btMatrix3x3& a,
+							  const btMatrix3x3& b)
+{
+	btMatrix3x3 r;
+	for (int i = 0; i < 3; ++i) r[i] = a[i] - b[i];
+	return (r);
+}
+//
+static inline btMatrix3x3 Mul(const btMatrix3x3& a,
+							  btScalar b)
+{
+	btMatrix3x3 r;
+	for (int i = 0; i < 3; ++i) r[i] = a[i] * b;
+	return (r);
+}
+//
+static inline void Orthogonalize(btMatrix3x3& m)
+{
+	m[2] = btCross(m[0], m[1]).normalized();
+	m[1] = btCross(m[2], m[0]).normalized();
+	m[0] = btCross(m[1], m[2]).normalized();
+}
+//
+static inline btMatrix3x3 MassMatrix(btScalar im, const btMatrix3x3& iwi, const btVector3& r)
+{
+	const btMatrix3x3 cr = Cross(r);
+	return (Sub(Diagonal(im), cr * iwi * cr));
+}
+
+//
+static inline btMatrix3x3 ImpulseMatrix(btScalar dt,
+										btScalar ima,
+										btScalar imb,
+										const btMatrix3x3& iwi,
+										const btVector3& r)
+{
+	return (Diagonal(1 / dt) * Add(Diagonal(ima), MassMatrix(imb, iwi, r)).inverse());
+}
+
+//
+static inline btMatrix3x3 ImpulseMatrix(btScalar dt,
+										const btMatrix3x3& effective_mass_inv,
+										btScalar imb,
+										const btMatrix3x3& iwi,
+										const btVector3& r)
+{
+	return (Diagonal(1 / dt) * Add(effective_mass_inv, MassMatrix(imb, iwi, r)).inverse());
+	//    btMatrix3x3 iimb = MassMatrix(imb, iwi, r);
+	//    if (iimb.determinant() == 0)
+	//        return effective_mass_inv.inverse();
+	//    return effective_mass_inv.inverse() *  Add(effective_mass_inv.inverse(), iimb.inverse()).inverse() * iimb.inverse();
+}
+
+//
+static inline btMatrix3x3 ImpulseMatrix(btScalar ima, const btMatrix3x3& iia, const btVector3& ra,
+										btScalar imb, const btMatrix3x3& iib, const btVector3& rb)
+{
+	return (Add(MassMatrix(ima, iia, ra), MassMatrix(imb, iib, rb)).inverse());
+}
+
+//
+static inline btMatrix3x3 AngularImpulseMatrix(const btMatrix3x3& iia,
+											   const btMatrix3x3& iib)
+{
+	return (Add(iia, iib).inverse());
+}
+
+//
+static inline btVector3 ProjectOnAxis(const btVector3& v,
+									  const btVector3& a)
+{
+	return (a * btDot(v, a));
+}
+//
+static inline btVector3 ProjectOnPlane(const btVector3& v,
+									   const btVector3& a)
+{
+	return (v - ProjectOnAxis(v, a));
+}
+
+//
+static inline void ProjectOrigin(const btVector3& a,
+								 const btVector3& b,
+								 btVector3& prj,
+								 btScalar& sqd)
+{
+	const btVector3 d = b - a;
+	const btScalar m2 = d.length2();
+	if (m2 > SIMD_EPSILON)
+	{
+		const btScalar t = Clamp<btScalar>(-btDot(a, d) / m2, 0, 1);
+		const btVector3 p = a + d * t;
+		const btScalar l2 = p.length2();
+		if (l2 < sqd)
+		{
+			prj = p;
+			sqd = l2;
+		}
+	}
+}
+//
+static inline void ProjectOrigin(const btVector3& a,
+								 const btVector3& b,
+								 const btVector3& c,
+								 btVector3& prj,
+								 btScalar& sqd)
+{
+	const btVector3& q = btCross(b - a, c - a);
+	const btScalar m2 = q.length2();
+	if (m2 > SIMD_EPSILON)
+	{
+		const btVector3 n = q / btSqrt(m2);
+		const btScalar k = btDot(a, n);
+		const btScalar k2 = k * k;
+		if (k2 < sqd)
+		{
+			const btVector3 p = n * k;
+			if ((btDot(btCross(a - p, b - p), q) > 0) &&
+				(btDot(btCross(b - p, c - p), q) > 0) &&
+				(btDot(btCross(c - p, a - p), q) > 0))
+			{
+				prj = p;
+				sqd = k2;
+			}
+			else
+			{
+				ProjectOrigin(a, b, prj, sqd);
+				ProjectOrigin(b, c, prj, sqd);
+				ProjectOrigin(c, a, prj, sqd);
+			}
+		}
+	}
+}
+
+//
+static inline bool rayIntersectsTriangle(const btVector3& origin, const btVector3& dir, const btVector3& v0, const btVector3& v1, const btVector3& v2, btScalar& t)
+{
+	btScalar a, f, u, v;
+
+	btVector3 e1 = v1 - v0;
+	btVector3 e2 = v2 - v0;
+	btVector3 h = dir.cross(e2);
+	a = e1.dot(h);
+
+	if (a > -0.00001 && a < 0.00001)
+		return (false);
+
+	f = btScalar(1) / a;
+	btVector3 s = origin - v0;
+	u = f * s.dot(h);
+
+	if (u < 0.0 || u > 1.0)
+		return (false);
+
+	btVector3 q = s.cross(e1);
+	v = f * dir.dot(q);
+	if (v < 0.0 || u + v > 1.0)
+		return (false);
+	// at this stage we can compute t to find out where
+	// the intersection point is on the line
+	t = f * e2.dot(q);
+	if (t > 0)  // ray intersection
+		return (true);
+	else  // this means that there is a line intersection
+		// but not a ray intersection
+		return (false);
+}
+
+static inline bool lineIntersectsTriangle(const btVector3& rayStart, const btVector3& rayEnd, const btVector3& p1, const btVector3& p2, const btVector3& p3, btVector3& sect, btVector3& normal)
+{
+	btVector3 dir = rayEnd - rayStart;
+	btScalar dir_norm = dir.norm();
+	if (dir_norm < SIMD_EPSILON)
+		return false;
+	dir.normalize();
+	btScalar t;
+	bool ret = rayIntersectsTriangle(rayStart, dir, p1, p2, p3, t);
+
+	if (ret)
+	{
+		if (t <= dir_norm)
+		{
+			sect = rayStart + dir * t;
+		}
+		else
+		{
+			ret = false;
+		}
+	}
+
+	if (ret)
+	{
+		btVector3 n = (p3 - p1).cross(p2 - p1);
+		n.safeNormalize();
+		if (n.dot(dir) < 0)
+			normal = n;
+		else
+			normal = -n;
+	}
+	return ret;
+}
+
+//
+template <typename T>
+static inline T BaryEval(const T& a,
+						 const T& b,
+						 const T& c,
+						 const btVector3& coord)
+{
+	return (a * coord.x() + b * coord.y() + c * coord.z());
+}
+//
+static inline btVector3 BaryCoord(const btVector3& a,
+								  const btVector3& b,
+								  const btVector3& c,
+								  const btVector3& p)
+{
+	const btScalar w[] = {btCross(a - p, b - p).length(),
+						  btCross(b - p, c - p).length(),
+						  btCross(c - p, a - p).length()};
+	const btScalar isum = 1 / (w[0] + w[1] + w[2]);
+	return (btVector3(w[1] * isum, w[2] * isum, w[0] * isum));
+}
+
+//
+inline static btScalar ImplicitSolve(btSoftBody::ImplicitFn* fn,
+									 const btVector3& a,
+									 const btVector3& b,
+									 const btScalar accuracy,
+									 const int maxiterations = 256)
+{
+	btScalar span[2] = {0, 1};
+	btScalar values[2] = {fn->Eval(a), fn->Eval(b)};
+	if (values[0] > values[1])
+	{
+		btSwap(span[0], span[1]);
+		btSwap(values[0], values[1]);
+	}
+	if (values[0] > -accuracy) return (-1);
+	if (values[1] < +accuracy) return (-1);
+	for (int i = 0; i < maxiterations; ++i)
+	{
+		const btScalar t = Lerp(span[0], span[1], values[0] / (values[0] - values[1]));
+		const btScalar v = fn->Eval(Lerp(a, b, t));
+		if ((t <= 0) || (t >= 1)) break;
+		if (btFabs(v) < accuracy) return (t);
+		if (v < 0)
+		{
+			span[0] = t;
+			values[0] = v;
+		}
+		else
+		{
+			span[1] = t;
+			values[1] = v;
+		}
+	}
+	return (-1);
+}
+
+inline static void EvaluateMedium(const btSoftBodyWorldInfo* wfi,
+								  const btVector3& x,
+								  btSoftBody::sMedium& medium)
+{
+	medium.m_velocity = btVector3(0, 0, 0);
+	medium.m_pressure = 0;
+	medium.m_density = wfi->air_density;
+	if (wfi->water_density > 0)
+	{
+		const btScalar depth = -(btDot(x, wfi->water_normal) + wfi->water_offset);
+		if (depth > 0)
+		{
+			medium.m_density = wfi->water_density;
+			medium.m_pressure = depth * wfi->water_density * wfi->m_gravity.length();
+		}
+	}
+}
+
+//
+static inline btVector3 NormalizeAny(const btVector3& v)
+{
+	const btScalar l = v.length();
+	if (l > SIMD_EPSILON)
+		return (v / l);
+	else
+		return (btVector3(0, 0, 0));
+}
+
+//
+static inline btDbvtVolume VolumeOf(const btSoftBody::Face& f,
+									btScalar margin)
+{
+	const btVector3* pts[] = {&f.m_n[0]->m_x,
+							  &f.m_n[1]->m_x,
+							  &f.m_n[2]->m_x};
+	btDbvtVolume vol = btDbvtVolume::FromPoints(pts, 3);
+	vol.Expand(btVector3(margin, margin, margin));
+	return (vol);
+}
+
+//
+static inline btVector3 CenterOf(const btSoftBody::Face& f)
+{
+	return ((f.m_n[0]->m_x + f.m_n[1]->m_x + f.m_n[2]->m_x) / 3);
+}
+
+//
+static inline btScalar AreaOf(const btVector3& x0,
+							  const btVector3& x1,
+							  const btVector3& x2)
+{
+	const btVector3 a = x1 - x0;
+	const btVector3 b = x2 - x0;
+	const btVector3 cr = btCross(a, b);
+	const btScalar area = cr.length();
+	return (area);
+}
+
+//
+static inline btScalar VolumeOf(const btVector3& x0,
+								const btVector3& x1,
+								const btVector3& x2,
+								const btVector3& x3)
+{
+	const btVector3 a = x1 - x0;
+	const btVector3 b = x2 - x0;
+	const btVector3 c = x3 - x0;
+	return (btDot(a, btCross(b, c)));
+}
+
+//
+
+//
+static inline void ApplyClampedForce(btSoftBody::Node& n,
+									 const btVector3& f,
+									 btScalar dt)
+{
+	const btScalar dtim = dt * n.m_im;
+	if ((f * dtim).length2() > n.m_v.length2())
+	{ /* Clamp	*/
+		n.m_f -= ProjectOnAxis(n.m_v, f.normalized()) / dtim;
+	}
+	else
+	{ /* Apply	*/
+		n.m_f += f;
+	}
+}
+
+//
+static inline int MatchEdge(const btSoftBody::Node* a,
+							const btSoftBody::Node* b,
+							const btSoftBody::Node* ma,
+							const btSoftBody::Node* mb)
+{
+	if ((a == ma) && (b == mb)) return (0);
+	if ((a == mb) && (b == ma)) return (1);
+	return (-1);
+}
+
+//
+// btEigen : Extract eigen system,
+// straitforward implementation of http://math.fullerton.edu/mathews/n2003/JacobiMethodMod.html
+// outputs are NOT sorted.
+//
+struct btEigen
+{
+	static int system(btMatrix3x3& a, btMatrix3x3* vectors, btVector3* values = 0)
+	{
+		static const int maxiterations = 16;
+		static const btScalar accuracy = (btScalar)0.0001;
+		btMatrix3x3& v = *vectors;
+		int iterations = 0;
+		vectors->setIdentity();
+		do
+		{
+			int p = 0, q = 1;
+			if (btFabs(a[p][q]) < btFabs(a[0][2]))
+			{
+				p = 0;
+				q = 2;
+			}
+			if (btFabs(a[p][q]) < btFabs(a[1][2]))
+			{
+				p = 1;
+				q = 2;
+			}
+			if (btFabs(a[p][q]) > accuracy)
+			{
+				const btScalar w = (a[q][q] - a[p][p]) / (2 * a[p][q]);
+				const btScalar z = btFabs(w);
+				const btScalar t = w / (z * (btSqrt(1 + w * w) + z));
+				if (t == t) /* [WARNING] let hope that one does not get thrown aways by some compilers... */
+				{
+					const btScalar c = 1 / btSqrt(t * t + 1);
+					const btScalar s = c * t;
+					mulPQ(a, c, s, p, q);
+					mulTPQ(a, c, s, p, q);
+					mulPQ(v, c, s, p, q);
+				}
+				else
+					break;
+			}
+			else
+				break;
+		} while ((++iterations) < maxiterations);
+		if (values)
+		{
+			*values = btVector3(a[0][0], a[1][1], a[2][2]);
+		}
+		return (iterations);
+	}
+
+private:
+	static inline void mulTPQ(btMatrix3x3& a, btScalar c, btScalar s, int p, int q)
+	{
+		const btScalar m[2][3] = {{a[p][0], a[p][1], a[p][2]},
+								  {a[q][0], a[q][1], a[q][2]}};
+		int i;
+
+		for (i = 0; i < 3; ++i) a[p][i] = c * m[0][i] - s * m[1][i];
+		for (i = 0; i < 3; ++i) a[q][i] = c * m[1][i] + s * m[0][i];
+	}
+	static inline void mulPQ(btMatrix3x3& a, btScalar c, btScalar s, int p, int q)
+	{
+		const btScalar m[2][3] = {{a[0][p], a[1][p], a[2][p]},
+								  {a[0][q], a[1][q], a[2][q]}};
+		int i;
+
+		for (i = 0; i < 3; ++i) a[i][p] = c * m[0][i] - s * m[1][i];
+		for (i = 0; i < 3; ++i) a[i][q] = c * m[1][i] + s * m[0][i];
+	}
+};
+
+//
+// Polar decomposition,
+// "Computing the Polar Decomposition with Applications", Nicholas J. Higham, 1986.
+//
+static inline int PolarDecompose(const btMatrix3x3& m, btMatrix3x3& q, btMatrix3x3& s)
+{
+	static const btPolarDecomposition polar;
+	return polar.decompose(m, q, s);
+}
+
+//
+// btSoftColliders
+//
+struct btSoftColliders
+{
+	//
+	// ClusterBase
+	//
+	struct ClusterBase : btDbvt::ICollide
+	{
+		btScalar erp;
+		btScalar idt;
+		btScalar m_margin;
+		btScalar friction;
+		btScalar threshold;
+		ClusterBase()
+		{
+			erp = (btScalar)1;
+			idt = 0;
+			m_margin = 0;
+			friction = 0;
+			threshold = (btScalar)0;
+		}
+		bool SolveContact(const btGjkEpaSolver2::sResults& res,
+						  btSoftBody::Body ba, const btSoftBody::Body bb,
+						  btSoftBody::CJoint& joint)
+		{
+			if (res.distance < m_margin)
+			{
+				btVector3 norm = res.normal;
+				norm.normalize();  //is it necessary?
+
+				const btVector3 ra = res.witnesses[0] - ba.xform().getOrigin();
+				const btVector3 rb = res.witnesses[1] - bb.xform().getOrigin();
+				const btVector3 va = ba.velocity(ra);
+				const btVector3 vb = bb.velocity(rb);
+				const btVector3 vrel = va - vb;
+				const btScalar rvac = btDot(vrel, norm);
+				btScalar depth = res.distance - m_margin;
+
+				//				printf("depth=%f\n",depth);
+				const btVector3 iv = norm * rvac;
+				const btVector3 fv = vrel - iv;
+				joint.m_bodies[0] = ba;
+				joint.m_bodies[1] = bb;
+				joint.m_refs[0] = ra * ba.xform().getBasis();
+				joint.m_refs[1] = rb * bb.xform().getBasis();
+				joint.m_rpos[0] = ra;
+				joint.m_rpos[1] = rb;
+				joint.m_cfm = 1;
+				joint.m_erp = 1;
+				joint.m_life = 0;
+				joint.m_maxlife = 0;
+				joint.m_split = 1;
+
+				joint.m_drift = depth * norm;
+
+				joint.m_normal = norm;
+				//				printf("normal=%f,%f,%f\n",res.normal.getX(),res.normal.getY(),res.normal.getZ());
+				joint.m_delete = false;
+				joint.m_friction = fv.length2() < (rvac * friction * rvac * friction) ? 1 : friction;
+				joint.m_massmatrix = ImpulseMatrix(ba.invMass(), ba.invWorldInertia(), joint.m_rpos[0],
+												   bb.invMass(), bb.invWorldInertia(), joint.m_rpos[1]);
+
+				return (true);
+			}
+			return (false);
+		}
+	};
+	//
+	// CollideCL_RS
+	//
+	struct CollideCL_RS : ClusterBase
+	{
+		btSoftBody* psb;
+		const btCollisionObjectWrapper* m_colObjWrap;
+
+		void Process(const btDbvtNode* leaf)
+		{
+			btSoftBody::Cluster* cluster = (btSoftBody::Cluster*)leaf->data;
+			btSoftClusterCollisionShape cshape(cluster);
+
+			const btConvexShape* rshape = (const btConvexShape*)m_colObjWrap->getCollisionShape();
+
+			///don't collide an anchored cluster with a static/kinematic object
+			if (m_colObjWrap->getCollisionObject()->isStaticOrKinematicObject() && cluster->m_containsAnchor)
+				return;
+
+			btGjkEpaSolver2::sResults res;
+			if (btGjkEpaSolver2::SignedDistance(&cshape, btTransform::getIdentity(),
+												rshape, m_colObjWrap->getWorldTransform(),
+												btVector3(1, 0, 0), res))
+			{
+				btSoftBody::CJoint joint;
+				if (SolveContact(res, cluster, m_colObjWrap->getCollisionObject(), joint))  //prb,joint))
+				{
+					btSoftBody::CJoint* pj = new (btAlignedAlloc(sizeof(btSoftBody::CJoint), 16)) btSoftBody::CJoint();
+					*pj = joint;
+					psb->m_joints.push_back(pj);
+					if (m_colObjWrap->getCollisionObject()->isStaticOrKinematicObject())
+					{
+						pj->m_erp *= psb->m_cfg.kSKHR_CL;
+						pj->m_split *= psb->m_cfg.kSK_SPLT_CL;
+					}
+					else
+					{
+						pj->m_erp *= psb->m_cfg.kSRHR_CL;
+						pj->m_split *= psb->m_cfg.kSR_SPLT_CL;
+					}
+				}
+			}
+		}
+		void ProcessColObj(btSoftBody* ps, const btCollisionObjectWrapper* colObWrap)
+		{
+			psb = ps;
+			m_colObjWrap = colObWrap;
+			idt = ps->m_sst.isdt;
+			m_margin = m_colObjWrap->getCollisionShape()->getMargin() + psb->getCollisionShape()->getMargin();
+			///Bullet rigid body uses multiply instead of minimum to determine combined friction. Some customization would be useful.
+			friction = btMin(psb->m_cfg.kDF, m_colObjWrap->getCollisionObject()->getFriction());
+			btVector3 mins;
+			btVector3 maxs;
+
+			ATTRIBUTE_ALIGNED16(btDbvtVolume)
+			volume;
+			colObWrap->getCollisionShape()->getAabb(colObWrap->getWorldTransform(), mins, maxs);
+			volume = btDbvtVolume::FromMM(mins, maxs);
+			volume.Expand(btVector3(1, 1, 1) * m_margin);
+			ps->m_cdbvt.collideTV(ps->m_cdbvt.m_root, volume, *this);
+		}
+	};
+	//
+	// CollideCL_SS
+	//
+	struct CollideCL_SS : ClusterBase
+	{
+		btSoftBody* bodies[2];
+		void Process(const btDbvtNode* la, const btDbvtNode* lb)
+		{
+			btSoftBody::Cluster* cla = (btSoftBody::Cluster*)la->data;
+			btSoftBody::Cluster* clb = (btSoftBody::Cluster*)lb->data;
+
+			bool connected = false;
+			if ((bodies[0] == bodies[1]) && (bodies[0]->m_clusterConnectivity.size()))
+			{
+				connected = bodies[0]->m_clusterConnectivity[cla->m_clusterIndex + bodies[0]->m_clusters.size() * clb->m_clusterIndex];
+			}
+
+			if (!connected)
+			{
+				btSoftClusterCollisionShape csa(cla);
+				btSoftClusterCollisionShape csb(clb);
+				btGjkEpaSolver2::sResults res;
+				if (btGjkEpaSolver2::SignedDistance(&csa, btTransform::getIdentity(),
+													&csb, btTransform::getIdentity(),
+													cla->m_com - clb->m_com, res))
+				{
+					btSoftBody::CJoint joint;
+					if (SolveContact(res, cla, clb, joint))
+					{
+						btSoftBody::CJoint* pj = new (btAlignedAlloc(sizeof(btSoftBody::CJoint), 16)) btSoftBody::CJoint();
+						*pj = joint;
+						bodies[0]->m_joints.push_back(pj);
+						pj->m_erp *= btMax(bodies[0]->m_cfg.kSSHR_CL, bodies[1]->m_cfg.kSSHR_CL);
+						pj->m_split *= (bodies[0]->m_cfg.kSS_SPLT_CL + bodies[1]->m_cfg.kSS_SPLT_CL) / 2;
+					}
+				}
+			}
+			else
+			{
+				static int count = 0;
+				count++;
+				//printf("count=%d\n",count);
+			}
+		}
+		void ProcessSoftSoft(btSoftBody* psa, btSoftBody* psb)
+		{
+			idt = psa->m_sst.isdt;
+			//m_margin		=	(psa->getCollisionShape()->getMargin()+psb->getCollisionShape()->getMargin())/2;
+			m_margin = (psa->getCollisionShape()->getMargin() + psb->getCollisionShape()->getMargin());
+			friction = btMin(psa->m_cfg.kDF, psb->m_cfg.kDF);
+			bodies[0] = psa;
+			bodies[1] = psb;
+			psa->m_cdbvt.collideTT(psa->m_cdbvt.m_root, psb->m_cdbvt.m_root, *this);
+		}
+	};
+	//
+	// CollideSDF_RS
+	//
+	struct CollideSDF_RS : btDbvt::ICollide
+	{
+		void Process(const btDbvtNode* leaf)
+		{
+			btSoftBody::Node* node = (btSoftBody::Node*)leaf->data;
+			DoNode(*node);
+		}
+		void DoNode(btSoftBody::Node& n) const
+		{
+			const btScalar m = n.m_im > 0 ? dynmargin : stamargin;
+			btSoftBody::RContact c;
+
+			if ((!n.m_battach) &&
+				psb->checkContact(m_colObj1Wrap, n.m_x, m, c.m_cti))
+			{
+				const btScalar ima = n.m_im;
+				const btScalar imb = m_rigidBody ? m_rigidBody->getInvMass() : 0.f;
+				const btScalar ms = ima + imb;
+				if (ms > 0)
+				{
+					const btTransform& wtr = m_rigidBody ? m_rigidBody->getWorldTransform() : m_colObj1Wrap->getCollisionObject()->getWorldTransform();
+					static const btMatrix3x3 iwiStatic(0, 0, 0, 0, 0, 0, 0, 0, 0);
+					const btMatrix3x3& iwi = m_rigidBody ? m_rigidBody->getInvInertiaTensorWorld() : iwiStatic;
+					const btVector3 ra = n.m_x - wtr.getOrigin();
+					const btVector3 va = m_rigidBody ? m_rigidBody->getVelocityInLocalPoint(ra) * psb->m_sst.sdt : btVector3(0, 0, 0);
+					const btVector3 vb = n.m_x - n.m_q;
+					const btVector3 vr = vb - va;
+					const btScalar dn = btDot(vr, c.m_cti.m_normal);
+					const btVector3 fv = vr - c.m_cti.m_normal * dn;
+					const btScalar fc = psb->m_cfg.kDF * m_colObj1Wrap->getCollisionObject()->getFriction();
+					c.m_node = &n;
+					c.m_c0 = ImpulseMatrix(psb->m_sst.sdt, ima, imb, iwi, ra);
+					c.m_c1 = ra;
+					c.m_c2 = ima * psb->m_sst.sdt;
+					c.m_c3 = fv.length2() < (dn * fc * dn * fc) ? 0 : 1 - fc;
+					c.m_c4 = m_colObj1Wrap->getCollisionObject()->isStaticOrKinematicObject() ? psb->m_cfg.kKHR : psb->m_cfg.kCHR;
+					psb->m_rcontacts.push_back(c);
+					if (m_rigidBody)
+						m_rigidBody->activate();
+				}
+			}
+		}
+		btSoftBody* psb;
+		const btCollisionObjectWrapper* m_colObj1Wrap;
+		btRigidBody* m_rigidBody;
+		btScalar dynmargin;
+		btScalar stamargin;
+	};
+
+	//
+	// CollideSDF_RD
+	//
+	struct CollideSDF_RD : btDbvt::ICollide
+	{
+		void Process(const btDbvtNode* leaf)
+		{
+			btSoftBody::Node* node = (btSoftBody::Node*)leaf->data;
+			DoNode(*node);
+		}
+		void DoNode(btSoftBody::Node& n) const
+		{
+			const btScalar m = n.m_im > 0 ? dynmargin : stamargin;
+			btSoftBody::DeformableNodeRigidContact c;
+
+			if (!n.m_battach)
+			{
+				// check for collision at x_{n+1}^*
+				if (psb->checkDeformableContact(m_colObj1Wrap, n.m_q, m, c.m_cti, /*predict = */ true))
+				{
+					const btScalar ima = n.m_im;
+					// todo: collision between multibody and fixed deformable node will be missed.
+					const btScalar imb = m_rigidBody ? m_rigidBody->getInvMass() : 0.f;
+					const btScalar ms = ima + imb;
+					if (ms > 0)
+					{
+						// resolve contact at x_n
+						psb->checkDeformableContact(m_colObj1Wrap, n.m_x, m, c.m_cti, /*predict = */ false);
+						btSoftBody::sCti& cti = c.m_cti;
+						c.m_node = &n;
+						const btScalar fc = psb->m_cfg.kDF * m_colObj1Wrap->getCollisionObject()->getFriction();
+						c.m_c2 = ima;
+						c.m_c3 = fc;
+						c.m_c4 = m_colObj1Wrap->getCollisionObject()->isStaticOrKinematicObject() ? psb->m_cfg.kKHR : psb->m_cfg.kCHR;
+						c.m_c5 = n.m_effectiveMass_inv;
+
+						if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+						{
+							const btTransform& wtr = m_rigidBody ? m_rigidBody->getWorldTransform() : m_colObj1Wrap->getCollisionObject()->getWorldTransform();
+							const btVector3 ra = n.m_x - wtr.getOrigin();
+
+							static const btMatrix3x3 iwiStatic(0, 0, 0, 0, 0, 0, 0, 0, 0);
+							const btMatrix3x3& iwi = m_rigidBody ? m_rigidBody->getInvInertiaTensorWorld() : iwiStatic;
+							if (psb->m_reducedModel)
+							{
+								c.m_c0 = MassMatrix(imb, iwi, ra); //impulse factor K of the rigid body only (not the inverse)
+							}
+							else
+							{
+								c.m_c0 = ImpulseMatrix(1, n.m_effectiveMass_inv, imb, iwi, ra);
+								//                            c.m_c0 = ImpulseMatrix(1, ima, imb, iwi, ra);
+							}
+							c.m_c1 = ra;
+						}
+						else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+						{
+							btMultiBodyLinkCollider* multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+							if (multibodyLinkCol)
+							{
+								btVector3 normal = cti.m_normal;
+								btVector3 t1 = generateUnitOrthogonalVector(normal);
+								btVector3 t2 = btCross(normal, t1);
+								btMultiBodyJacobianData jacobianData_normal, jacobianData_t1, jacobianData_t2;
+								findJacobian(multibodyLinkCol, jacobianData_normal, c.m_node->m_x, normal);
+								findJacobian(multibodyLinkCol, jacobianData_t1, c.m_node->m_x, t1);
+								findJacobian(multibodyLinkCol, jacobianData_t2, c.m_node->m_x, t2);
+
+								btScalar* J_n = &jacobianData_normal.m_jacobians[0];
+								btScalar* J_t1 = &jacobianData_t1.m_jacobians[0];
+								btScalar* J_t2 = &jacobianData_t2.m_jacobians[0];
+
+								btScalar* u_n = &jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+								btScalar* u_t1 = &jacobianData_t1.m_deltaVelocitiesUnitImpulse[0];
+								btScalar* u_t2 = &jacobianData_t2.m_deltaVelocitiesUnitImpulse[0];
+
+								btMatrix3x3 rot(normal.getX(), normal.getY(), normal.getZ(),
+												t1.getX(), t1.getY(), t1.getZ(),
+												t2.getX(), t2.getY(), t2.getZ());  // world frame to local frame
+								const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+								
+								btMatrix3x3 local_impulse_matrix;
+								if (psb->m_reducedModel)
+								{
+									local_impulse_matrix = OuterProduct(J_n, J_t1, J_t2, u_n, u_t1, u_t2, ndof);
+								}
+								else
+								{
+									local_impulse_matrix = (n.m_effectiveMass_inv + OuterProduct(J_n, J_t1, J_t2, u_n, u_t1, u_t2, ndof)).inverse();
+								}
+								c.m_c0 = rot.transpose() * local_impulse_matrix * rot;
+								c.jacobianData_normal = jacobianData_normal;
+								c.jacobianData_t1 = jacobianData_t1;
+								c.jacobianData_t2 = jacobianData_t2;
+								c.t1 = t1;
+								c.t2 = t2;
+							}
+						}
+						psb->m_nodeRigidContacts.push_back(c);
+					}
+				}
+			}
+		}
+		btSoftBody* psb;
+		const btCollisionObjectWrapper* m_colObj1Wrap;
+		btRigidBody* m_rigidBody;
+		btScalar dynmargin;
+		btScalar stamargin;
+	};
+
+	//
+	// CollideSDF_RDF
+	//
+	struct CollideSDF_RDF : btDbvt::ICollide
+	{
+		void Process(const btDbvtNode* leaf)
+		{
+			btSoftBody::Face* face = (btSoftBody::Face*)leaf->data;
+			DoNode(*face);
+		}
+		void DoNode(btSoftBody::Face& f) const
+		{
+			btSoftBody::Node* n0 = f.m_n[0];
+			btSoftBody::Node* n1 = f.m_n[1];
+			btSoftBody::Node* n2 = f.m_n[2];
+			const btScalar m = (n0->m_im > 0 && n1->m_im > 0 && n2->m_im > 0) ? dynmargin : stamargin;
+			btSoftBody::DeformableFaceRigidContact c;
+			btVector3 contact_point;
+			btVector3 bary;
+			if (psb->checkDeformableFaceContact(m_colObj1Wrap, f, contact_point, bary, m, c.m_cti, true))
+			{
+				btScalar ima = n0->m_im + n1->m_im + n2->m_im;
+				const btScalar imb = m_rigidBody ? m_rigidBody->getInvMass() : 0.f;
+				// todo: collision between multibody and fixed deformable face will be missed.
+				const btScalar ms = ima + imb;
+				if (ms > 0)
+				{
+					// resolve contact at x_n
+					//                    psb->checkDeformableFaceContact(m_colObj1Wrap, f, contact_point, bary, m, c.m_cti, /*predict = */ false);
+					btSoftBody::sCti& cti = c.m_cti;
+					c.m_contactPoint = contact_point;
+					c.m_bary = bary;
+					// todo xuchenhan@: this is assuming mass of all vertices are the same. Need to modify if mass are different for distinct vertices
+					c.m_weights = btScalar(2) / (btScalar(1) + bary.length2()) * bary;
+					c.m_face = &f;
+					// friction is handled by the nodes to prevent sticking
+					//                    const btScalar fc = 0;
+					const btScalar fc = psb->m_cfg.kDF * m_colObj1Wrap->getCollisionObject()->getFriction();
+
+					// the effective inverse mass of the face as in https://graphics.stanford.edu/papers/cloth-sig02/cloth.pdf
+					ima = bary.getX() * c.m_weights.getX() * n0->m_im + bary.getY() * c.m_weights.getY() * n1->m_im + bary.getZ() * c.m_weights.getZ() * n2->m_im;
+					c.m_c2 = ima;
+					c.m_c3 = fc;
+					c.m_c4 = m_colObj1Wrap->getCollisionObject()->isStaticOrKinematicObject() ? psb->m_cfg.kKHR : psb->m_cfg.kCHR;
+					c.m_c5 = Diagonal(ima);
+					if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
+					{
+						const btTransform& wtr = m_rigidBody ? m_rigidBody->getWorldTransform() : m_colObj1Wrap->getCollisionObject()->getWorldTransform();
+						static const btMatrix3x3 iwiStatic(0, 0, 0, 0, 0, 0, 0, 0, 0);
+						const btMatrix3x3& iwi = m_rigidBody ? m_rigidBody->getInvInertiaTensorWorld() : iwiStatic;
+						const btVector3 ra = contact_point - wtr.getOrigin();
+
+						// we do not scale the impulse matrix by dt
+						c.m_c0 = ImpulseMatrix(1, ima, imb, iwi, ra);
+						c.m_c1 = ra;
+					}
+					else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)
+					{
+						btMultiBodyLinkCollider* multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj);
+						if (multibodyLinkCol)
+						{
+							btVector3 normal = cti.m_normal;
+							btVector3 t1 = generateUnitOrthogonalVector(normal);
+							btVector3 t2 = btCross(normal, t1);
+							btMultiBodyJacobianData jacobianData_normal, jacobianData_t1, jacobianData_t2;
+							findJacobian(multibodyLinkCol, jacobianData_normal, contact_point, normal);
+							findJacobian(multibodyLinkCol, jacobianData_t1, contact_point, t1);
+							findJacobian(multibodyLinkCol, jacobianData_t2, contact_point, t2);
+
+							btScalar* J_n = &jacobianData_normal.m_jacobians[0];
+							btScalar* J_t1 = &jacobianData_t1.m_jacobians[0];
+							btScalar* J_t2 = &jacobianData_t2.m_jacobians[0];
+
+							btScalar* u_n = &jacobianData_normal.m_deltaVelocitiesUnitImpulse[0];
+							btScalar* u_t1 = &jacobianData_t1.m_deltaVelocitiesUnitImpulse[0];
+							btScalar* u_t2 = &jacobianData_t2.m_deltaVelocitiesUnitImpulse[0];
+
+							btMatrix3x3 rot(normal.getX(), normal.getY(), normal.getZ(),
+											t1.getX(), t1.getY(), t1.getZ(),
+											t2.getX(), t2.getY(), t2.getZ());  // world frame to local frame
+							const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6;
+							btMatrix3x3 local_impulse_matrix = (Diagonal(ima) + OuterProduct(J_n, J_t1, J_t2, u_n, u_t1, u_t2, ndof)).inverse();
+							c.m_c0 = rot.transpose() * local_impulse_matrix * rot;
+							c.jacobianData_normal = jacobianData_normal;
+							c.jacobianData_t1 = jacobianData_t1;
+							c.jacobianData_t2 = jacobianData_t2;
+							c.t1 = t1;
+							c.t2 = t2;
+						}
+					}
+					psb->m_faceRigidContacts.push_back(c);
+				}
+			}
+			// Set caching barycenters to be false after collision detection.
+			// Only turn on when contact is static.
+			f.m_pcontact[3] = 0;
+		}
+		btSoftBody* psb;
+		const btCollisionObjectWrapper* m_colObj1Wrap;
+		btRigidBody* m_rigidBody;
+		btScalar dynmargin;
+		btScalar stamargin;
+	};
+
+	//
+	// CollideVF_SS
+	//
+	struct CollideVF_SS : btDbvt::ICollide
+	{
+		void Process(const btDbvtNode* lnode,
+					 const btDbvtNode* lface)
+		{
+			btSoftBody::Node* node = (btSoftBody::Node*)lnode->data;
+			btSoftBody::Face* face = (btSoftBody::Face*)lface->data;
+			for (int i = 0; i < 3; ++i)
+			{
+				if (face->m_n[i] == node)
+					continue;
+			}
+
+			btVector3 o = node->m_x;
+			btVector3 p;
+			btScalar d = SIMD_INFINITY;
+			ProjectOrigin(face->m_n[0]->m_x - o,
+						  face->m_n[1]->m_x - o,
+						  face->m_n[2]->m_x - o,
+						  p, d);
+			const btScalar m = mrg + (o - node->m_q).length() * 2;
+			if (d < (m * m))
+			{
+				const btSoftBody::Node* n[] = {face->m_n[0], face->m_n[1], face->m_n[2]};
+				const btVector3 w = BaryCoord(n[0]->m_x, n[1]->m_x, n[2]->m_x, p + o);
+				const btScalar ma = node->m_im;
+				btScalar mb = BaryEval(n[0]->m_im, n[1]->m_im, n[2]->m_im, w);
+				if ((n[0]->m_im <= 0) ||
+					(n[1]->m_im <= 0) ||
+					(n[2]->m_im <= 0))
+				{
+					mb = 0;
+				}
+				const btScalar ms = ma + mb;
+				if (ms > 0)
+				{
+					btSoftBody::SContact c;
+					c.m_normal = p / -btSqrt(d);
+					c.m_margin = m;
+					c.m_node = node;
+					c.m_face = face;
+					c.m_weights = w;
+					c.m_friction = btMax(psb[0]->m_cfg.kDF, psb[1]->m_cfg.kDF);
+					c.m_cfm[0] = ma / ms * psb[0]->m_cfg.kSHR;
+					c.m_cfm[1] = mb / ms * psb[1]->m_cfg.kSHR;
+					psb[0]->m_scontacts.push_back(c);
+				}
+			}
+		}
+		btSoftBody* psb[2];
+		btScalar mrg;
+	};
+
+	//
+	// CollideVF_DD
+	//
+	struct CollideVF_DD : btDbvt::ICollide
+	{
+		void Process(const btDbvtNode* lnode,
+					 const btDbvtNode* lface)
+		{
+			btSoftBody::Node* node = (btSoftBody::Node*)lnode->data;
+			btSoftBody::Face* face = (btSoftBody::Face*)lface->data;
+			btVector3 bary;
+			if (proximityTest(face->m_n[0]->m_x, face->m_n[1]->m_x, face->m_n[2]->m_x, node->m_x, face->m_normal, mrg, bary))
+			{
+				const btSoftBody::Node* n[] = {face->m_n[0], face->m_n[1], face->m_n[2]};
+				const btVector3 w = bary;
+				const btScalar ma = node->m_im;
+				btScalar mb = BaryEval(n[0]->m_im, n[1]->m_im, n[2]->m_im, w);
+				if ((n[0]->m_im <= 0) ||
+					(n[1]->m_im <= 0) ||
+					(n[2]->m_im <= 0))
+				{
+					mb = 0;
+				}
+				const btScalar ms = ma + mb;
+				if (ms > 0)
+				{
+					btSoftBody::DeformableFaceNodeContact c;
+					c.m_normal = face->m_normal;
+					if (!useFaceNormal && c.m_normal.dot(node->m_x - face->m_n[2]->m_x) < 0)
+						c.m_normal = -face->m_normal;
+					c.m_margin = mrg;
+					c.m_node = node;
+					c.m_face = face;
+					c.m_bary = w;
+					c.m_friction = psb[0]->m_cfg.kDF * psb[1]->m_cfg.kDF;
+					// Initialize unused fields.
+					c.m_weights = btVector3(0, 0, 0);
+					c.m_imf = 0;
+					c.m_c0 = 0;
+					c.m_colObj = psb[1];
+					psb[0]->m_faceNodeContacts.push_back(c);
+				}
+			}
+		}
+		btSoftBody* psb[2];
+		btScalar mrg;
+		bool useFaceNormal;
+	};
+
+	//
+	// CollideFF_DD
+	//
+	struct CollideFF_DD : btDbvt::ICollide
+	{
+		void Process(const btDbvntNode* lface1,
+					 const btDbvntNode* lface2)
+		{
+			btSoftBody::Face* f1 = (btSoftBody::Face*)lface1->data;
+			btSoftBody::Face* f2 = (btSoftBody::Face*)lface2->data;
+			if (f1 != f2)
+			{
+				Repel(f1, f2);
+				Repel(f2, f1);
+			}
+		}
+		void Repel(btSoftBody::Face* f1, btSoftBody::Face* f2)
+		{
+			//#define REPEL_NEIGHBOR 1
+#ifndef REPEL_NEIGHBOR
+			for (int node_id = 0; node_id < 3; ++node_id)
+			{
+				btSoftBody::Node* node = f1->m_n[node_id];
+				for (int i = 0; i < 3; ++i)
+				{
+					if (f2->m_n[i] == node)
+						return;
+				}
+			}
+#endif
+			bool skip = false;
+			for (int node_id = 0; node_id < 3; ++node_id)
+			{
+				btSoftBody::Node* node = f1->m_n[node_id];
+#ifdef REPEL_NEIGHBOR
+				for (int i = 0; i < 3; ++i)
+				{
+					if (f2->m_n[i] == node)
+					{
+						skip = true;
+						break;
+					}
+				}
+				if (skip)
+				{
+					skip = false;
+					continue;
+				}
+#endif
+				btSoftBody::Face* face = f2;
+				btVector3 bary;
+				if (!proximityTest(face->m_n[0]->m_x, face->m_n[1]->m_x, face->m_n[2]->m_x, node->m_x, face->m_normal, mrg, bary))
+					continue;
+				btSoftBody::DeformableFaceNodeContact c;
+				c.m_normal = face->m_normal;
+				if (!useFaceNormal && c.m_normal.dot(node->m_x - face->m_n[2]->m_x) < 0)
+					c.m_normal = -face->m_normal;
+				c.m_margin = mrg;
+				c.m_node = node;
+				c.m_face = face;
+				c.m_bary = bary;
+				c.m_friction = psb[0]->m_cfg.kDF * psb[1]->m_cfg.kDF;
+				// Initialize unused fields.
+				c.m_weights = btVector3(0, 0, 0);
+				c.m_imf = 0;
+				c.m_c0 = 0;
+				c.m_colObj = psb[1];
+				psb[0]->m_faceNodeContacts.push_back(c);
+			}
+		}
+		btSoftBody* psb[2];
+		btScalar mrg;
+		bool useFaceNormal;
+	};
+
+	struct CollideCCD : btDbvt::ICollide
+	{
+		void Process(const btDbvtNode* lnode,
+					 const btDbvtNode* lface)
+		{
+			btSoftBody::Node* node = (btSoftBody::Node*)lnode->data;
+			btSoftBody::Face* face = (btSoftBody::Face*)lface->data;
+			btVector3 bary;
+			if (bernsteinCCD(face, node, dt, SAFE_EPSILON, bary))
+			{
+				btSoftBody::DeformableFaceNodeContact c;
+				c.m_normal = face->m_normal;
+				if (!useFaceNormal && c.m_normal.dot(node->m_x - face->m_n[2]->m_x) < 0)
+					c.m_normal = -face->m_normal;
+				c.m_node = node;
+				c.m_face = face;
+				c.m_bary = bary;
+				c.m_friction = psb[0]->m_cfg.kDF * psb[1]->m_cfg.kDF;
+				// Initialize unused fields.
+				c.m_weights = btVector3(0, 0, 0);
+				c.m_margin = mrg;
+				c.m_imf = 0;
+				c.m_c0 = 0;
+				c.m_colObj = psb[1];
+				psb[0]->m_faceNodeContactsCCD.push_back(c);
+			}
+		}
+		void Process(const btDbvntNode* lface1,
+					 const btDbvntNode* lface2)
+		{
+			btSoftBody::Face* f1 = (btSoftBody::Face*)lface1->data;
+			btSoftBody::Face* f2 = (btSoftBody::Face*)lface2->data;
+			if (f1 != f2)
+			{
+				Repel(f1, f2);
+				Repel(f2, f1);
+			}
+		}
+		void Repel(btSoftBody::Face* f1, btSoftBody::Face* f2)
+		{
+			//#define REPEL_NEIGHBOR 1
+#ifndef REPEL_NEIGHBOR
+			for (int node_id = 0; node_id < 3; ++node_id)
+			{
+				btSoftBody::Node* node = f1->m_n[node_id];
+				for (int i = 0; i < 3; ++i)
+				{
+					if (f2->m_n[i] == node)
+						return;
+				}
+			}
+#endif
+			bool skip = false;
+			for (int node_id = 0; node_id < 3; ++node_id)
+			{
+				btSoftBody::Node* node = f1->m_n[node_id];
+#ifdef REPEL_NEIGHBOR
+				for (int i = 0; i < 3; ++i)
+				{
+					if (f2->m_n[i] == node)
+					{
+						skip = true;
+						break;
+					}
+				}
+				if (skip)
+				{
+					skip = false;
+					continue;
+				}
+#endif
+				btSoftBody::Face* face = f2;
+				btVector3 bary;
+				if (bernsteinCCD(face, node, dt, SAFE_EPSILON, bary))
+				{
+					btSoftBody::DeformableFaceNodeContact c;
+					c.m_normal = face->m_normal;
+					if (!useFaceNormal && c.m_normal.dot(node->m_x - face->m_n[2]->m_x) < 0)
+						c.m_normal = -face->m_normal;
+					c.m_node = node;
+					c.m_face = face;
+					c.m_bary = bary;
+					c.m_friction = psb[0]->m_cfg.kDF * psb[1]->m_cfg.kDF;
+					// Initialize unused fields.
+					c.m_weights = btVector3(0, 0, 0);
+					c.m_margin = mrg;
+					c.m_imf = 0;
+					c.m_c0 = 0;
+					c.m_colObj = psb[1];
+					psb[0]->m_faceNodeContactsCCD.push_back(c);
+				}
+			}
+		}
+		btSoftBody* psb[2];
+		btScalar dt, mrg;
+		bool useFaceNormal;
+	};
+};
+#endif  //_BT_SOFT_BODY_INTERNALS_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
new file mode 100644
index 0000000..af728c0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
@@ -0,0 +1,131 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftBodyRigidBodyCollisionConfiguration.h"
+#include "btSoftRigidCollisionAlgorithm.h"
+#include "btSoftBodyConcaveCollisionAlgorithm.h"
+#include "btSoftSoftCollisionAlgorithm.h"
+
+#include "LinearMath/btPoolAllocator.h"
+
+#define ENABLE_SOFTBODY_CONCAVE_COLLISIONS 1
+
+btSoftBodyRigidBodyCollisionConfiguration::btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
+	: btDefaultCollisionConfiguration(constructionInfo)
+{
+	void* mem;
+
+	mem = btAlignedAlloc(sizeof(btSoftSoftCollisionAlgorithm::CreateFunc), 16);
+	m_softSoftCreateFunc = new (mem) btSoftSoftCollisionAlgorithm::CreateFunc;
+
+	mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc), 16);
+	m_softRigidConvexCreateFunc = new (mem) btSoftRigidCollisionAlgorithm::CreateFunc;
+
+	mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc), 16);
+	m_swappedSoftRigidConvexCreateFunc = new (mem) btSoftRigidCollisionAlgorithm::CreateFunc;
+	m_swappedSoftRigidConvexCreateFunc->m_swapped = true;
+
+#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
+	mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc), 16);
+	m_softRigidConcaveCreateFunc = new (mem) btSoftBodyConcaveCollisionAlgorithm::CreateFunc;
+
+	mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc), 16);
+	m_swappedSoftRigidConcaveCreateFunc = new (mem) btSoftBodyConcaveCollisionAlgorithm::SwappedCreateFunc;
+	m_swappedSoftRigidConcaveCreateFunc->m_swapped = true;
+#endif
+
+	//replace pool by a new one, with potential larger size
+
+	if (m_ownsCollisionAlgorithmPool && m_collisionAlgorithmPool)
+	{
+		int curElemSize = m_collisionAlgorithmPool->getElementSize();
+		///calculate maximum element size, big enough to fit any collision algorithm in the memory pool
+
+		int maxSize0 = sizeof(btSoftSoftCollisionAlgorithm);
+		int maxSize1 = sizeof(btSoftRigidCollisionAlgorithm);
+		int maxSize2 = sizeof(btSoftBodyConcaveCollisionAlgorithm);
+
+		int collisionAlgorithmMaxElementSize = btMax(maxSize0, maxSize1);
+		collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize, maxSize2);
+
+		if (collisionAlgorithmMaxElementSize > curElemSize)
+		{
+			m_collisionAlgorithmPool->~btPoolAllocator();
+			btAlignedFree(m_collisionAlgorithmPool);
+			void* mem = btAlignedAlloc(sizeof(btPoolAllocator), 16);
+			m_collisionAlgorithmPool = new (mem) btPoolAllocator(collisionAlgorithmMaxElementSize, constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize);
+		}
+	}
+}
+
+btSoftBodyRigidBodyCollisionConfiguration::~btSoftBodyRigidBodyCollisionConfiguration()
+{
+	m_softSoftCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_softSoftCreateFunc);
+
+	m_softRigidConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_softRigidConvexCreateFunc);
+
+	m_swappedSoftRigidConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_swappedSoftRigidConvexCreateFunc);
+
+#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
+	m_softRigidConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_softRigidConcaveCreateFunc);
+
+	m_swappedSoftRigidConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(m_swappedSoftRigidConcaveCreateFunc);
+#endif
+}
+
+///creation of soft-soft and soft-rigid, and otherwise fallback to base class implementation
+btCollisionAlgorithmCreateFunc* btSoftBodyRigidBodyCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1)
+{
+	///try to handle the softbody interactions first
+
+	if ((proxyType0 == SOFTBODY_SHAPE_PROXYTYPE) && (proxyType1 == SOFTBODY_SHAPE_PROXYTYPE))
+	{
+		return m_softSoftCreateFunc;
+	}
+
+	///softbody versus convex
+	if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE && btBroadphaseProxy::isConvex(proxyType1))
+	{
+		return m_softRigidConvexCreateFunc;
+	}
+
+	///convex versus soft body
+	if (btBroadphaseProxy::isConvex(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE)
+	{
+		return m_swappedSoftRigidConvexCreateFunc;
+	}
+
+#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
+	///softbody versus convex
+	if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE && btBroadphaseProxy::isConcave(proxyType1))
+	{
+		return m_softRigidConcaveCreateFunc;
+	}
+
+	///convex versus soft body
+	if (btBroadphaseProxy::isConcave(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE)
+	{
+		return m_swappedSoftRigidConcaveCreateFunc;
+	}
+#endif
+
+	///fallback to the regular rigid collision shape
+	return btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(proxyType0, proxyType1);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
new file mode 100644
index 0000000..0feb84f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
@@ -0,0 +1,43 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
+#define BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
+
+#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
+
+class btVoronoiSimplexSolver;
+class btGjkEpaPenetrationDepthSolver;
+
+///btSoftBodyRigidBodyCollisionConfiguration add softbody interaction on top of btDefaultCollisionConfiguration
+class btSoftBodyRigidBodyCollisionConfiguration : public btDefaultCollisionConfiguration
+{
+	//default CreationFunctions, filling the m_doubleDispatch table
+	btCollisionAlgorithmCreateFunc* m_softSoftCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_softRigidConvexCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_swappedSoftRigidConvexCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_softRigidConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_swappedSoftRigidConcaveCreateFunc;
+
+public:
+	btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
+
+	virtual ~btSoftBodyRigidBodyCollisionConfiguration();
+
+	///creation of soft-soft and soft-rigid, and otherwise fallback to base class implementation
+	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1);
+};
+
+#endif  //BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
new file mode 100644
index 0000000..c41ebf7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
@@ -0,0 +1,160 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_H
+#define BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_H
+
+class btVertexBufferDescriptor
+{
+public:
+	enum BufferTypes
+	{
+		CPU_BUFFER,
+		DX11_BUFFER,
+		OPENGL_BUFFER
+	};
+
+protected:
+	bool m_hasVertexPositions;
+	bool m_hasNormals;
+
+	int m_vertexOffset;
+	int m_vertexStride;
+
+	int m_normalOffset;
+	int m_normalStride;
+
+public:
+	btVertexBufferDescriptor()
+	{
+		m_hasVertexPositions = false;
+		m_hasNormals = false;
+		m_vertexOffset = 0;
+		m_vertexStride = 0;
+		m_normalOffset = 0;
+		m_normalStride = 0;
+	}
+
+	virtual ~btVertexBufferDescriptor()
+	{
+	}
+
+	virtual bool hasVertexPositions() const
+	{
+		return m_hasVertexPositions;
+	}
+
+	virtual bool hasNormals() const
+	{
+		return m_hasNormals;
+	}
+
+	/**
+	 * Return the type of the vertex buffer descriptor.
+	 */
+	virtual BufferTypes getBufferType() const = 0;
+
+	/**
+	 * Return the vertex offset in floats from the base pointer.
+	 */
+	virtual int getVertexOffset() const
+	{
+		return m_vertexOffset;
+	}
+
+	/**
+	 * Return the vertex stride in number of floats between vertices.
+	 */
+	virtual int getVertexStride() const
+	{
+		return m_vertexStride;
+	}
+
+	/**
+	 * Return the vertex offset in floats from the base pointer.
+	 */
+	virtual int getNormalOffset() const
+	{
+		return m_normalOffset;
+	}
+
+	/**
+	 * Return the vertex stride in number of floats between vertices.
+	 */
+	virtual int getNormalStride() const
+	{
+		return m_normalStride;
+	}
+};
+
+class btCPUVertexBufferDescriptor : public btVertexBufferDescriptor
+{
+protected:
+	float *m_basePointer;
+
+public:
+	/**
+	 * vertexBasePointer is pointer to beginning of the buffer.
+	 * vertexOffset is the offset in floats to the first vertex.
+	 * vertexStride is the stride in floats between vertices.
+	 */
+	btCPUVertexBufferDescriptor(float *basePointer, int vertexOffset, int vertexStride)
+	{
+		m_basePointer = basePointer;
+		m_vertexOffset = vertexOffset;
+		m_vertexStride = vertexStride;
+		m_hasVertexPositions = true;
+	}
+
+	/**
+	 * vertexBasePointer is pointer to beginning of the buffer.
+	 * vertexOffset is the offset in floats to the first vertex.
+	 * vertexStride is the stride in floats between vertices.
+	 */
+	btCPUVertexBufferDescriptor(float *basePointer, int vertexOffset, int vertexStride, int normalOffset, int normalStride)
+	{
+		m_basePointer = basePointer;
+
+		m_vertexOffset = vertexOffset;
+		m_vertexStride = vertexStride;
+		m_hasVertexPositions = true;
+
+		m_normalOffset = normalOffset;
+		m_normalStride = normalStride;
+		m_hasNormals = true;
+	}
+
+	virtual ~btCPUVertexBufferDescriptor()
+	{
+	}
+
+	/**
+	 * Return the type of the vertex buffer descriptor.
+	 */
+	virtual BufferTypes getBufferType() const
+	{
+		return CPU_BUFFER;
+	}
+
+	/**
+	 * Return the base pointer in memory to the first vertex.
+	 */
+	virtual float *getBasePointer() const
+	{
+		return m_basePointer;
+	}
+};
+
+#endif  // #ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodySolvers.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodySolvers.h
new file mode 100644
index 0000000..7eafc6c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftBodySolvers.h
@@ -0,0 +1,148 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_BODY_SOLVERS_H
+#define BT_SOFT_BODY_SOLVERS_H
+
+#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
+
+class btSoftBodyTriangleData;
+class btSoftBodyLinkData;
+class btSoftBodyVertexData;
+class btVertexBufferDescriptor;
+class btCollisionObject;
+class btSoftBody;
+
+class btSoftBodySolver
+{
+public:
+	enum SolverTypes
+	{
+		DEFAULT_SOLVER,
+		CPU_SOLVER,
+		CL_SOLVER,
+		CL_SIMD_SOLVER,
+		DX_SOLVER,
+		DX_SIMD_SOLVER,
+		DEFORMABLE_SOLVER,
+		REDUCED_DEFORMABLE_SOLVER
+	};
+
+protected:
+	int m_numberOfPositionIterations;
+	int m_numberOfVelocityIterations;
+	// Simulation timescale
+	float m_timeScale;
+
+public:
+	btSoftBodySolver() : m_numberOfPositionIterations(10),
+						 m_timeScale(1)
+	{
+		m_numberOfVelocityIterations = 0;
+		m_numberOfPositionIterations = 5;
+	}
+
+	virtual ~btSoftBodySolver()
+	{
+	}
+
+	/**
+	 * Return the type of the solver.
+	 */
+	virtual SolverTypes getSolverType() const = 0;
+
+	/** Ensure that this solver is initialized. */
+	virtual bool checkInitialized() = 0;
+
+	/** Optimize soft bodies in this solver. */
+	virtual void optimize(btAlignedObjectArray<btSoftBody *> &softBodies, bool forceUpdate = false) = 0;
+
+	/** Copy necessary data back to the original soft body source objects. */
+	virtual void copyBackToSoftBodies(bool bMove = true) = 0;
+
+	/** Predict motion of soft bodies into next timestep */
+	virtual void predictMotion(btScalar solverdt) = 0;
+
+	/** Solve constraints for a set of soft bodies */
+	virtual void solveConstraints(btScalar solverdt) = 0;
+
+	/** Perform necessary per-step updates of soft bodies such as recomputing normals and bounding boxes */
+	virtual void updateSoftBodies() = 0;
+
+	/** Process a collision between one of the world's soft bodies and another collision object */
+	virtual void processCollision(btSoftBody *, const struct btCollisionObjectWrapper *) = 0;
+
+	/** Process a collision between two soft bodies */
+	virtual void processCollision(btSoftBody *, btSoftBody *) = 0;
+
+	/** Set the number of velocity constraint solver iterations this solver uses. */
+	virtual void setNumberOfPositionIterations(int iterations)
+	{
+		m_numberOfPositionIterations = iterations;
+	}
+
+	/** Get the number of velocity constraint solver iterations this solver uses. */
+	virtual int getNumberOfPositionIterations()
+	{
+		return m_numberOfPositionIterations;
+	}
+
+	/** Set the number of velocity constraint solver iterations this solver uses. */
+	virtual void setNumberOfVelocityIterations(int iterations)
+	{
+		m_numberOfVelocityIterations = iterations;
+	}
+
+	/** Get the number of velocity constraint solver iterations this solver uses. */
+	virtual int getNumberOfVelocityIterations()
+	{
+		return m_numberOfVelocityIterations;
+	}
+
+	/** Return the timescale that the simulation is using */
+	float getTimeScale()
+	{
+		return m_timeScale;
+	}
+
+#if 0
+	/**
+	 * Add a collision object to be used by the indicated softbody.
+	 */
+	virtual void addCollisionObjectForSoftBody( int clothIdentifier, btCollisionObject *collisionObject ) = 0;
+#endif
+};
+
+/** 
+ * Class to manage movement of data from a solver to a given target.
+ * This version is abstract. Subclasses will have custom pairings for different combinations.
+ */
+class btSoftBodySolverOutput
+{
+protected:
+public:
+	btSoftBodySolverOutput()
+	{
+	}
+
+	virtual ~btSoftBodySolverOutput()
+	{
+	}
+
+	/** Output current computed vertex data to the vertex buffers for all cloths in the solver. */
+	virtual void copySoftBodyToVertexBuffer(const btSoftBody *const softBody, btVertexBufferDescriptor *vertexBuffer) = 0;
+};
+
+#endif  // #ifndef BT_SOFT_BODY_SOLVERS_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp
new file mode 100644
index 0000000..dcdd932
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp
@@ -0,0 +1,355 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftMultiBodyDynamicsWorld.h"
+#include "LinearMath/btQuickprof.h"
+
+//softbody & helpers
+#include "BulletSoftBody/btSoftBody.h"
+#include "BulletSoftBody/btSoftBodyHelpers.h"
+#include "BulletSoftBody/btSoftBodySolvers.h"
+#include "BulletSoftBody/btDefaultSoftBodySolver.h"
+#include "LinearMath/btSerializer.h"
+
+btSoftMultiBodyDynamicsWorld::btSoftMultiBodyDynamicsWorld(
+	btDispatcher* dispatcher,
+	btBroadphaseInterface* pairCache,
+	btMultiBodyConstraintSolver* constraintSolver,
+	btCollisionConfiguration* collisionConfiguration,
+	btSoftBodySolver* softBodySolver) : btMultiBodyDynamicsWorld(dispatcher, pairCache, constraintSolver, collisionConfiguration),
+										m_softBodySolver(softBodySolver),
+										m_ownsSolver(false)
+{
+	if (!m_softBodySolver)
+	{
+		void* ptr = btAlignedAlloc(sizeof(btDefaultSoftBodySolver), 16);
+		m_softBodySolver = new (ptr) btDefaultSoftBodySolver();
+		m_ownsSolver = true;
+	}
+
+	m_drawFlags = fDrawFlags::Std;
+	m_drawNodeTree = true;
+	m_drawFaceTree = false;
+	m_drawClusterTree = false;
+	m_sbi.m_broadphase = pairCache;
+	m_sbi.m_dispatcher = dispatcher;
+	m_sbi.m_sparsesdf.Initialize();
+	m_sbi.m_sparsesdf.Reset();
+
+	m_sbi.air_density = (btScalar)1.2;
+	m_sbi.water_density = 0;
+	m_sbi.water_offset = 0;
+	m_sbi.water_normal = btVector3(0, 0, 0);
+	m_sbi.m_gravity.setValue(0, -10, 0);
+
+	m_sbi.m_sparsesdf.Initialize();
+}
+
+btSoftMultiBodyDynamicsWorld::~btSoftMultiBodyDynamicsWorld()
+{
+	if (m_ownsSolver)
+	{
+		m_softBodySolver->~btSoftBodySolver();
+		btAlignedFree(m_softBodySolver);
+	}
+}
+
+void btSoftMultiBodyDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
+{
+	btDiscreteDynamicsWorld::predictUnconstraintMotion(timeStep);
+	{
+		BT_PROFILE("predictUnconstraintMotionSoftBody");
+		m_softBodySolver->predictMotion(float(timeStep));
+	}
+}
+
+void btSoftMultiBodyDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
+{
+	// Let the solver grab the soft bodies and if necessary optimize for it
+	m_softBodySolver->optimize(getSoftBodyArray());
+
+	if (!m_softBodySolver->checkInitialized())
+	{
+		btAssert("Solver initialization failed\n");
+	}
+
+	btDiscreteDynamicsWorld::internalSingleStepSimulation(timeStep);
+
+	///solve soft bodies constraints
+	solveSoftBodiesConstraints(timeStep);
+
+	//self collisions
+	for (int i = 0; i < m_softBodies.size(); i++)
+	{
+		btSoftBody* psb = (btSoftBody*)m_softBodies[i];
+		psb->defaultCollisionHandler(psb);
+	}
+
+	///update soft bodies
+	m_softBodySolver->updateSoftBodies();
+
+	for (int i = 0; i < m_softBodies.size(); i++)
+	{
+		btSoftBody* psb = (btSoftBody*)m_softBodies[i];
+		psb->interpolateRenderMesh();
+	}
+	// End solver-wise simulation step
+	// ///////////////////////////////
+}
+
+void btSoftMultiBodyDynamicsWorld::solveSoftBodiesConstraints(btScalar timeStep)
+{
+	BT_PROFILE("solveSoftConstraints");
+
+	if (m_softBodies.size())
+	{
+		btSoftBody::solveClusters(m_softBodies);
+	}
+
+	// Solve constraints solver-wise
+	m_softBodySolver->solveConstraints(timeStep * m_softBodySolver->getTimeScale());
+}
+
+void btSoftMultiBodyDynamicsWorld::addSoftBody(btSoftBody* body, int collisionFilterGroup, int collisionFilterMask)
+{
+	m_softBodies.push_back(body);
+
+	// Set the soft body solver that will deal with this body
+	// to be the world's solver
+	body->setSoftBodySolver(m_softBodySolver);
+
+	btCollisionWorld::addCollisionObject(body,
+										 collisionFilterGroup,
+										 collisionFilterMask);
+}
+
+void btSoftMultiBodyDynamicsWorld::removeSoftBody(btSoftBody* body)
+{
+	m_softBodies.remove(body);
+
+	btCollisionWorld::removeCollisionObject(body);
+}
+
+void btSoftMultiBodyDynamicsWorld::removeCollisionObject(btCollisionObject* collisionObject)
+{
+	btSoftBody* body = btSoftBody::upcast(collisionObject);
+	if (body)
+		removeSoftBody(body);
+	else
+		btDiscreteDynamicsWorld::removeCollisionObject(collisionObject);
+}
+
+void btSoftMultiBodyDynamicsWorld::debugDrawWorld()
+{
+	btMultiBodyDynamicsWorld::debugDrawWorld();
+
+	if (getDebugDrawer())
+	{
+		int i;
+		for (i = 0; i < this->m_softBodies.size(); i++)
+		{
+			btSoftBody* psb = (btSoftBody*)this->m_softBodies[i];
+			if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe)))
+			{
+				btSoftBodyHelpers::DrawFrame(psb, m_debugDrawer);
+				btSoftBodyHelpers::Draw(psb, m_debugDrawer, m_drawFlags);
+			}
+
+			if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+			{
+				if (m_drawNodeTree) btSoftBodyHelpers::DrawNodeTree(psb, m_debugDrawer);
+				if (m_drawFaceTree) btSoftBodyHelpers::DrawFaceTree(psb, m_debugDrawer);
+				if (m_drawClusterTree) btSoftBodyHelpers::DrawClusterTree(psb, m_debugDrawer);
+			}
+		}
+	}
+}
+
+struct btSoftSingleRayCallback : public btBroadphaseRayCallback
+{
+	btVector3 m_rayFromWorld;
+	btVector3 m_rayToWorld;
+	btTransform m_rayFromTrans;
+	btTransform m_rayToTrans;
+	btVector3 m_hitNormal;
+
+	const btSoftMultiBodyDynamicsWorld* m_world;
+	btCollisionWorld::RayResultCallback& m_resultCallback;
+
+	btSoftSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftMultiBodyDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback)
+		: m_rayFromWorld(rayFromWorld),
+		  m_rayToWorld(rayToWorld),
+		  m_world(world),
+		  m_resultCallback(resultCallback)
+	{
+		m_rayFromTrans.setIdentity();
+		m_rayFromTrans.setOrigin(m_rayFromWorld);
+		m_rayToTrans.setIdentity();
+		m_rayToTrans.setOrigin(m_rayToWorld);
+
+		btVector3 rayDir = (rayToWorld - rayFromWorld);
+
+		rayDir.normalize();
+		///what about division by zero? --> just set rayDirection[i] to INF/1e30
+		m_rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[0];
+		m_rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[1];
+		m_rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[2];
+		m_signs[0] = m_rayDirectionInverse[0] < 0.0;
+		m_signs[1] = m_rayDirectionInverse[1] < 0.0;
+		m_signs[2] = m_rayDirectionInverse[2] < 0.0;
+
+		m_lambda_max = rayDir.dot(m_rayToWorld - m_rayFromWorld);
+	}
+
+	virtual bool process(const btBroadphaseProxy* proxy)
+	{
+		///terminate further ray tests, once the closestHitFraction reached zero
+		if (m_resultCallback.m_closestHitFraction == btScalar(0.f))
+			return false;
+
+		btCollisionObject* collisionObject = (btCollisionObject*)proxy->m_clientObject;
+
+		//only perform raycast if filterMask matches
+		if (m_resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+			//btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+#if 0
+#ifdef RECALCULATE_AABB
+			btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
+#else
+			//getBroadphase()->getAabb(collisionObject->getBroadphaseHandle(),collisionObjectAabbMin,collisionObjectAabbMax);
+			const btVector3& collisionObjectAabbMin = collisionObject->getBroadphaseHandle()->m_aabbMin;
+			const btVector3& collisionObjectAabbMax = collisionObject->getBroadphaseHandle()->m_aabbMax;
+#endif
+#endif
+			//btScalar hitLambda = m_resultCallback.m_closestHitFraction;
+			//culling already done by broadphase
+			//if (btRayAabb(m_rayFromWorld,m_rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,m_hitNormal))
+			{
+				m_world->rayTestSingle(m_rayFromTrans, m_rayToTrans,
+									   collisionObject,
+									   collisionObject->getCollisionShape(),
+									   collisionObject->getWorldTransform(),
+									   m_resultCallback);
+			}
+		}
+		return true;
+	}
+};
+
+void btSoftMultiBodyDynamicsWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
+{
+	BT_PROFILE("rayTest");
+	/// use the broadphase to accelerate the search for objects, based on their aabb
+	/// and for each object with ray-aabb overlap, perform an exact ray test
+	btSoftSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback);
+
+#ifndef USE_BRUTEFORCE_RAYBROADPHASE
+	m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB);
+#else
+	for (int i = 0; i < this->getNumCollisionObjects(); i++)
+	{
+		rayCB.process(m_collisionObjects[i]->getBroadphaseHandle());
+	}
+#endif  //USE_BRUTEFORCE_RAYBROADPHASE
+}
+
+void btSoftMultiBodyDynamicsWorld::rayTestSingle(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+												 btCollisionObject* collisionObject,
+												 const btCollisionShape* collisionShape,
+												 const btTransform& colObjWorldTransform,
+												 RayResultCallback& resultCallback)
+{
+	if (collisionShape->isSoftBody())
+	{
+		btSoftBody* softBody = btSoftBody::upcast(collisionObject);
+		if (softBody)
+		{
+			btSoftBody::sRayCast softResult;
+			if (softBody->rayTest(rayFromTrans.getOrigin(), rayToTrans.getOrigin(), softResult))
+			{
+				if (softResult.fraction <= resultCallback.m_closestHitFraction)
+				{
+					btCollisionWorld::LocalShapeInfo shapeInfo;
+					shapeInfo.m_shapePart = 0;
+					shapeInfo.m_triangleIndex = softResult.index;
+					// get the normal
+					btVector3 rayDir = rayToTrans.getOrigin() - rayFromTrans.getOrigin();
+					btVector3 normal = -rayDir;
+					normal.normalize();
+
+					if (softResult.feature == btSoftBody::eFeature::Face)
+					{
+						normal = softBody->m_faces[softResult.index].m_normal;
+						if (normal.dot(rayDir) > 0)
+						{
+							// normal always point toward origin of the ray
+							normal = -normal;
+						}
+					}
+
+					btCollisionWorld::LocalRayResult rayResult(collisionObject,
+															   &shapeInfo,
+															   normal,
+															   softResult.fraction);
+					bool normalInWorldSpace = true;
+					resultCallback.addSingleResult(rayResult, normalInWorldSpace);
+				}
+			}
+		}
+	}
+	else
+	{
+		btCollisionWorld::rayTestSingle(rayFromTrans, rayToTrans, collisionObject, collisionShape, colObjWorldTransform, resultCallback);
+	}
+}
+
+void btSoftMultiBodyDynamicsWorld::serializeSoftBodies(btSerializer* serializer)
+{
+	int i;
+	//serialize all collision objects
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		if (colObj->getInternalType() & btCollisionObject::CO_SOFT_BODY)
+		{
+			int len = colObj->calculateSerializeBufferSize();
+			btChunk* chunk = serializer->allocate(len, 1);
+			const char* structType = colObj->serialize(chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_SOFTBODY_CODE, colObj);
+		}
+	}
+}
+
+void btSoftMultiBodyDynamicsWorld::serialize(btSerializer* serializer)
+{
+	serializer->startSerialization();
+
+	serializeDynamicsWorldInfo(serializer);
+
+	serializeSoftBodies(serializer);
+
+	serializeMultiBodies(serializer);
+
+	serializeRigidBodies(serializer);
+
+	serializeCollisionObjects(serializer);
+
+	serializeContactManifolds(serializer);
+
+	serializer->finishSerialization();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h
new file mode 100644
index 0000000..40cb1ec
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h
@@ -0,0 +1,105 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H
+#define BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H
+
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+#include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h"
+#include "BulletSoftBody/btSoftBody.h"
+
+#ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H
+typedef btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
+#endif
+
+class btSoftBodySolver;
+
+class btSoftMultiBodyDynamicsWorld : public btMultiBodyDynamicsWorld
+{
+	btSoftBodyArray m_softBodies;
+	int m_drawFlags;
+	bool m_drawNodeTree;
+	bool m_drawFaceTree;
+	bool m_drawClusterTree;
+	btSoftBodyWorldInfo m_sbi;
+	///Solver classes that encapsulate multiple soft bodies for solving
+	btSoftBodySolver* m_softBodySolver;
+	bool m_ownsSolver;
+
+protected:
+	virtual void predictUnconstraintMotion(btScalar timeStep);
+
+	virtual void internalSingleStepSimulation(btScalar timeStep);
+
+	void solveSoftBodiesConstraints(btScalar timeStep);
+
+	void serializeSoftBodies(btSerializer* serializer);
+
+public:
+	btSoftMultiBodyDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btMultiBodyConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration, btSoftBodySolver* softBodySolver = 0);
+
+	virtual ~btSoftMultiBodyDynamicsWorld();
+
+	virtual void debugDrawWorld();
+
+	void addSoftBody(btSoftBody* body, int collisionFilterGroup = btBroadphaseProxy::DefaultFilter, int collisionFilterMask = btBroadphaseProxy::AllFilter);
+
+	void removeSoftBody(btSoftBody* body);
+
+	///removeCollisionObject will first check if it is a rigid body, if so call removeRigidBody otherwise call btDiscreteDynamicsWorld::removeCollisionObject
+	virtual void removeCollisionObject(btCollisionObject* collisionObject);
+
+	int getDrawFlags() const { return (m_drawFlags); }
+	void setDrawFlags(int f) { m_drawFlags = f; }
+
+	btSoftBodyWorldInfo& getWorldInfo()
+	{
+		return m_sbi;
+	}
+	const btSoftBodyWorldInfo& getWorldInfo() const
+	{
+		return m_sbi;
+	}
+
+	virtual btDynamicsWorldType getWorldType() const
+	{
+		return BT_SOFT_MULTIBODY_DYNAMICS_WORLD;
+	}
+
+	btSoftBodyArray& getSoftBodyArray()
+	{
+		return m_softBodies;
+	}
+
+	const btSoftBodyArray& getSoftBodyArray() const
+	{
+		return m_softBodies;
+	}
+
+	virtual void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const;
+
+	/// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest.
+	/// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape.
+	/// This allows more customization.
+	static void rayTestSingle(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+							  btCollisionObject* collisionObject,
+							  const btCollisionShape* collisionShape,
+							  const btTransform& colObjWorldTransform,
+							  RayResultCallback& resultCallback);
+
+	virtual void serialize(btSerializer* serializer);
+};
+
+#endif  //BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
new file mode 100644
index 0000000..656b009
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
@@ -0,0 +1,78 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftRigidCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "btSoftBody.h"
+#include "BulletSoftBody/btSoftBodySolvers.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+///TODO: include all the shapes that the softbody can collide with
+///alternatively, implement special case collision algorithms (just like for rigid collision shapes)
+
+//#include <stdio.h>
+
+btSoftRigidCollisionAlgorithm::btSoftRigidCollisionAlgorithm(btPersistentManifold* /*mf*/, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper*, const btCollisionObjectWrapper*, bool isSwapped)
+	: btCollisionAlgorithm(ci),
+	  //m_ownManifold(false),
+	  //m_manifoldPtr(mf),
+	  m_isSwapped(isSwapped)
+{
+}
+
+btSoftRigidCollisionAlgorithm::~btSoftRigidCollisionAlgorithm()
+{
+	//m_softBody->m_overlappingRigidBodies.remove(m_rigidCollisionObject);
+
+	/*if (m_ownManifold)
+	{
+	if (m_manifoldPtr)
+	m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+	*/
+}
+
+#include <stdio.h>
+#include "LinearMath/btQuickprof.h"
+void btSoftRigidCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	BT_PROFILE("btSoftRigidCollisionAlgorithm::processCollision");
+	(void)dispatchInfo;
+	(void)resultOut;
+	//printf("btSoftRigidCollisionAlgorithm\n");
+	//	const btCollisionObjectWrapper* softWrap = m_isSwapped?body1Wrap:body0Wrap;
+	//	const btCollisionObjectWrapper* rigidWrap = m_isSwapped?body0Wrap:body1Wrap;
+	btSoftBody* softBody = m_isSwapped ? (btSoftBody*)body1Wrap->getCollisionObject() : (btSoftBody*)body0Wrap->getCollisionObject();
+	const btCollisionObjectWrapper* rigidCollisionObjectWrap = m_isSwapped ? body0Wrap : body1Wrap;
+
+	if (softBody->m_collisionDisabledObjects.findLinearSearch(rigidCollisionObjectWrap->getCollisionObject()) == softBody->m_collisionDisabledObjects.size())
+	{
+		softBody->getSoftBodySolver()->processCollision(softBody, rigidCollisionObjectWrap);
+	}
+}
+
+btScalar btSoftRigidCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0, btCollisionObject* col1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	(void)col0;
+	(void)col1;
+
+	//not yet
+	return btScalar(1.);
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
new file mode 100644
index 0000000..7b24545
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
@@ -0,0 +1,71 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_RIGID_COLLISION_ALGORITHM_H
+#define BT_SOFT_RIGID_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btPersistentManifold;
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+
+#include "LinearMath/btVector3.h"
+class btSoftBody;
+
+/// btSoftRigidCollisionAlgorithm  provides collision detection between btSoftBody and btRigidBody
+class btSoftRigidCollisionAlgorithm : public btCollisionAlgorithm
+{
+	//	bool	m_ownManifold;
+	//	btPersistentManifold*	m_manifoldPtr;
+
+	//btSoftBody*				m_softBody;
+	//btCollisionObject*		m_rigidCollisionObject;
+
+	///for rigid versus soft (instead of soft versus rigid), we use this swapped boolean
+	bool m_isSwapped;
+
+public:
+	btSoftRigidCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* col0, const btCollisionObjectWrapper* col1Wrap, bool isSwapped);
+
+	virtual ~btSoftRigidCollisionAlgorithm();
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		//we don't add any manifolds
+	}
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftRigidCollisionAlgorithm));
+			if (!m_swapped)
+			{
+				return new (mem) btSoftRigidCollisionAlgorithm(0, ci, body0Wrap, body1Wrap, false);
+			}
+			else
+			{
+				return new (mem) btSoftRigidCollisionAlgorithm(0, ci, body0Wrap, body1Wrap, true);
+			}
+		}
+	};
+};
+
+#endif  //BT_SOFT_RIGID_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
new file mode 100644
index 0000000..dc9b004
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
@@ -0,0 +1,346 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftRigidDynamicsWorld.h"
+#include "LinearMath/btQuickprof.h"
+
+//softbody & helpers
+#include "btSoftBody.h"
+#include "btSoftBodyHelpers.h"
+#include "btSoftBodySolvers.h"
+#include "btDefaultSoftBodySolver.h"
+#include "LinearMath/btSerializer.h"
+
+btSoftRigidDynamicsWorld::btSoftRigidDynamicsWorld(
+	btDispatcher* dispatcher,
+	btBroadphaseInterface* pairCache,
+	btConstraintSolver* constraintSolver,
+	btCollisionConfiguration* collisionConfiguration,
+	btSoftBodySolver* softBodySolver) : btDiscreteDynamicsWorld(dispatcher, pairCache, constraintSolver, collisionConfiguration),
+										m_softBodySolver(softBodySolver),
+										m_ownsSolver(false)
+{
+	if (!m_softBodySolver)
+	{
+		void* ptr = btAlignedAlloc(sizeof(btDefaultSoftBodySolver), 16);
+		m_softBodySolver = new (ptr) btDefaultSoftBodySolver();
+		m_ownsSolver = true;
+	}
+
+	m_drawFlags = fDrawFlags::Std;
+	m_drawNodeTree = true;
+	m_drawFaceTree = false;
+	m_drawClusterTree = false;
+	m_sbi.m_broadphase = pairCache;
+	m_sbi.m_dispatcher = dispatcher;
+	m_sbi.m_sparsesdf.Initialize();
+	m_sbi.m_sparsesdf.Reset();
+
+	m_sbi.air_density = (btScalar)1.2;
+	m_sbi.water_density = 0;
+	m_sbi.water_offset = 0;
+	m_sbi.water_normal = btVector3(0, 0, 0);
+	m_sbi.m_gravity.setValue(0, -10, 0);
+
+	m_sbi.m_sparsesdf.Initialize();
+}
+
+btSoftRigidDynamicsWorld::~btSoftRigidDynamicsWorld()
+{
+	if (m_ownsSolver)
+	{
+		m_softBodySolver->~btSoftBodySolver();
+		btAlignedFree(m_softBodySolver);
+	}
+}
+
+void btSoftRigidDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
+{
+	btDiscreteDynamicsWorld::predictUnconstraintMotion(timeStep);
+	{
+		BT_PROFILE("predictUnconstraintMotionSoftBody");
+		m_softBodySolver->predictMotion(float(timeStep));
+	}
+}
+
+void btSoftRigidDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
+{
+	// Let the solver grab the soft bodies and if necessary optimize for it
+	m_softBodySolver->optimize(getSoftBodyArray());
+
+	if (!m_softBodySolver->checkInitialized())
+	{
+		btAssert("Solver initialization failed\n");
+	}
+
+	btDiscreteDynamicsWorld::internalSingleStepSimulation(timeStep);
+
+	///solve soft bodies constraints
+	solveSoftBodiesConstraints(timeStep);
+
+	//self collisions
+	for (int i = 0; i < m_softBodies.size(); i++)
+	{
+		btSoftBody* psb = (btSoftBody*)m_softBodies[i];
+		psb->defaultCollisionHandler(psb);
+	}
+
+	///update soft bodies
+	m_softBodySolver->updateSoftBodies();
+
+	// End solver-wise simulation step
+	// ///////////////////////////////
+}
+
+void btSoftRigidDynamicsWorld::solveSoftBodiesConstraints(btScalar timeStep)
+{
+	BT_PROFILE("solveSoftConstraints");
+
+	if (m_softBodies.size())
+	{
+		btSoftBody::solveClusters(m_softBodies);
+	}
+
+	// Solve constraints solver-wise
+	m_softBodySolver->solveConstraints(timeStep * m_softBodySolver->getTimeScale());
+}
+
+void btSoftRigidDynamicsWorld::addSoftBody(btSoftBody* body, int collisionFilterGroup, int collisionFilterMask)
+{
+	m_softBodies.push_back(body);
+
+	// Set the soft body solver that will deal with this body
+	// to be the world's solver
+	body->setSoftBodySolver(m_softBodySolver);
+
+	btCollisionWorld::addCollisionObject(body,
+										 collisionFilterGroup,
+										 collisionFilterMask);
+}
+
+void btSoftRigidDynamicsWorld::removeSoftBody(btSoftBody* body)
+{
+	m_softBodies.remove(body);
+
+	btCollisionWorld::removeCollisionObject(body);
+}
+
+void btSoftRigidDynamicsWorld::removeCollisionObject(btCollisionObject* collisionObject)
+{
+	btSoftBody* body = btSoftBody::upcast(collisionObject);
+	if (body)
+		removeSoftBody(body);
+	else
+		btDiscreteDynamicsWorld::removeCollisionObject(collisionObject);
+}
+
+void btSoftRigidDynamicsWorld::debugDrawWorld()
+{
+	btDiscreteDynamicsWorld::debugDrawWorld();
+
+	if (getDebugDrawer())
+	{
+		int i;
+		for (i = 0; i < this->m_softBodies.size(); i++)
+		{
+			btSoftBody* psb = (btSoftBody*)this->m_softBodies[i];
+			if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe)))
+			{
+				btSoftBodyHelpers::DrawFrame(psb, m_debugDrawer);
+				btSoftBodyHelpers::Draw(psb, m_debugDrawer, m_drawFlags);
+			}
+
+			if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+			{
+				if (m_drawNodeTree) btSoftBodyHelpers::DrawNodeTree(psb, m_debugDrawer);
+				if (m_drawFaceTree) btSoftBodyHelpers::DrawFaceTree(psb, m_debugDrawer);
+				if (m_drawClusterTree) btSoftBodyHelpers::DrawClusterTree(psb, m_debugDrawer);
+			}
+		}
+	}
+}
+
+struct btSoftSingleRayCallback : public btBroadphaseRayCallback
+{
+	btVector3 m_rayFromWorld;
+	btVector3 m_rayToWorld;
+	btTransform m_rayFromTrans;
+	btTransform m_rayToTrans;
+	btVector3 m_hitNormal;
+
+	const btSoftRigidDynamicsWorld* m_world;
+	btCollisionWorld::RayResultCallback& m_resultCallback;
+
+	btSoftSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftRigidDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback)
+		: m_rayFromWorld(rayFromWorld),
+		  m_rayToWorld(rayToWorld),
+		  m_world(world),
+		  m_resultCallback(resultCallback)
+	{
+		m_rayFromTrans.setIdentity();
+		m_rayFromTrans.setOrigin(m_rayFromWorld);
+		m_rayToTrans.setIdentity();
+		m_rayToTrans.setOrigin(m_rayToWorld);
+
+		btVector3 rayDir = (rayToWorld - rayFromWorld);
+
+		rayDir.normalize();
+		///what about division by zero? --> just set rayDirection[i] to INF/1e30
+		m_rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[0];
+		m_rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[1];
+		m_rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[2];
+		m_signs[0] = m_rayDirectionInverse[0] < 0.0;
+		m_signs[1] = m_rayDirectionInverse[1] < 0.0;
+		m_signs[2] = m_rayDirectionInverse[2] < 0.0;
+
+		m_lambda_max = rayDir.dot(m_rayToWorld - m_rayFromWorld);
+	}
+
+	virtual bool process(const btBroadphaseProxy* proxy)
+	{
+		///terminate further ray tests, once the closestHitFraction reached zero
+		if (m_resultCallback.m_closestHitFraction == btScalar(0.f))
+			return false;
+
+		btCollisionObject* collisionObject = (btCollisionObject*)proxy->m_clientObject;
+
+		//only perform raycast if filterMask matches
+		if (m_resultCallback.needsCollision(collisionObject->getBroadphaseHandle()))
+		{
+			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+			//btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+#if 0
+#ifdef RECALCULATE_AABB
+			btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
+#else
+			//getBroadphase()->getAabb(collisionObject->getBroadphaseHandle(),collisionObjectAabbMin,collisionObjectAabbMax);
+			const btVector3& collisionObjectAabbMin = collisionObject->getBroadphaseHandle()->m_aabbMin;
+			const btVector3& collisionObjectAabbMax = collisionObject->getBroadphaseHandle()->m_aabbMax;
+#endif
+#endif
+			//btScalar hitLambda = m_resultCallback.m_closestHitFraction;
+			//culling already done by broadphase
+			//if (btRayAabb(m_rayFromWorld,m_rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,m_hitNormal))
+			{
+				m_world->rayTestSingle(m_rayFromTrans, m_rayToTrans,
+									   collisionObject,
+									   collisionObject->getCollisionShape(),
+									   collisionObject->getWorldTransform(),
+									   m_resultCallback);
+			}
+		}
+		return true;
+	}
+};
+
+void btSoftRigidDynamicsWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
+{
+	BT_PROFILE("rayTest");
+	/// use the broadphase to accelerate the search for objects, based on their aabb
+	/// and for each object with ray-aabb overlap, perform an exact ray test
+	btSoftSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback);
+
+#ifndef USE_BRUTEFORCE_RAYBROADPHASE
+	m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB);
+#else
+	for (int i = 0; i < this->getNumCollisionObjects(); i++)
+	{
+		rayCB.process(m_collisionObjects[i]->getBroadphaseHandle());
+	}
+#endif  //USE_BRUTEFORCE_RAYBROADPHASE
+}
+
+void btSoftRigidDynamicsWorld::rayTestSingle(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+											 btCollisionObject* collisionObject,
+											 const btCollisionShape* collisionShape,
+											 const btTransform& colObjWorldTransform,
+											 RayResultCallback& resultCallback)
+{
+	if (collisionShape->isSoftBody())
+	{
+		btSoftBody* softBody = btSoftBody::upcast(collisionObject);
+		if (softBody)
+		{
+			btSoftBody::sRayCast softResult;
+			if (softBody->rayTest(rayFromTrans.getOrigin(), rayToTrans.getOrigin(), softResult))
+			{
+				if (softResult.fraction <= resultCallback.m_closestHitFraction)
+				{
+					btCollisionWorld::LocalShapeInfo shapeInfo;
+					shapeInfo.m_shapePart = 0;
+					shapeInfo.m_triangleIndex = softResult.index;
+					// get the normal
+					btVector3 rayDir = rayToTrans.getOrigin() - rayFromTrans.getOrigin();
+					btVector3 normal = -rayDir;
+					normal.normalize();
+
+					if (softResult.feature == btSoftBody::eFeature::Face)
+					{
+						normal = softBody->m_faces[softResult.index].m_normal;
+						if (normal.dot(rayDir) > 0)
+						{
+							// normal always point toward origin of the ray
+							normal = -normal;
+						}
+					}
+
+					btCollisionWorld::LocalRayResult rayResult(collisionObject,
+															   &shapeInfo,
+															   normal,
+															   softResult.fraction);
+					bool normalInWorldSpace = true;
+					resultCallback.addSingleResult(rayResult, normalInWorldSpace);
+				}
+			}
+		}
+	}
+	else
+	{
+		btCollisionWorld::rayTestSingle(rayFromTrans, rayToTrans, collisionObject, collisionShape, colObjWorldTransform, resultCallback);
+	}
+}
+
+void btSoftRigidDynamicsWorld::serializeSoftBodies(btSerializer* serializer)
+{
+	int i;
+	//serialize all collision objects
+	for (i = 0; i < m_collisionObjects.size(); i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		if (colObj->getInternalType() & btCollisionObject::CO_SOFT_BODY)
+		{
+			int len = colObj->calculateSerializeBufferSize();
+			btChunk* chunk = serializer->allocate(len, 1);
+			const char* structType = colObj->serialize(chunk->m_oldPtr, serializer);
+			serializer->finalizeChunk(chunk, structType, BT_SOFTBODY_CODE, colObj);
+		}
+	}
+}
+
+void btSoftRigidDynamicsWorld::serialize(btSerializer* serializer)
+{
+	serializer->startSerialization();
+
+	serializeDynamicsWorldInfo(serializer);
+
+	serializeSoftBodies(serializer);
+
+	serializeRigidBodies(serializer);
+
+	serializeCollisionObjects(serializer);
+
+	serializer->finishSerialization();
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
new file mode 100644
index 0000000..0ecc7a0
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
@@ -0,0 +1,102 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H
+#define BT_SOFT_RIGID_DYNAMICS_WORLD_H
+
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+#include "btSoftBody.h"
+
+typedef btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
+
+class btSoftBodySolver;
+
+class btSoftRigidDynamicsWorld : public btDiscreteDynamicsWorld
+{
+	btSoftBodyArray m_softBodies;
+	int m_drawFlags;
+	bool m_drawNodeTree;
+	bool m_drawFaceTree;
+	bool m_drawClusterTree;
+	btSoftBodyWorldInfo m_sbi;
+	///Solver classes that encapsulate multiple soft bodies for solving
+	btSoftBodySolver* m_softBodySolver;
+	bool m_ownsSolver;
+
+protected:
+	virtual void predictUnconstraintMotion(btScalar timeStep);
+
+	virtual void internalSingleStepSimulation(btScalar timeStep);
+
+	void solveSoftBodiesConstraints(btScalar timeStep);
+
+	void serializeSoftBodies(btSerializer* serializer);
+
+public:
+	btSoftRigidDynamicsWorld(btDispatcher* dispatcher, btBroadphaseInterface* pairCache, btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration, btSoftBodySolver* softBodySolver = 0);
+
+	virtual ~btSoftRigidDynamicsWorld();
+
+	virtual void debugDrawWorld();
+
+	void addSoftBody(btSoftBody* body, int collisionFilterGroup = btBroadphaseProxy::DefaultFilter, int collisionFilterMask = btBroadphaseProxy::AllFilter);
+
+	void removeSoftBody(btSoftBody* body);
+
+	///removeCollisionObject will first check if it is a rigid body, if so call removeRigidBody otherwise call btDiscreteDynamicsWorld::removeCollisionObject
+	virtual void removeCollisionObject(btCollisionObject* collisionObject);
+
+	int getDrawFlags() const { return (m_drawFlags); }
+	void setDrawFlags(int f) { m_drawFlags = f; }
+
+	btSoftBodyWorldInfo& getWorldInfo()
+	{
+		return m_sbi;
+	}
+	const btSoftBodyWorldInfo& getWorldInfo() const
+	{
+		return m_sbi;
+	}
+
+	virtual btDynamicsWorldType getWorldType() const
+	{
+		return BT_SOFT_RIGID_DYNAMICS_WORLD;
+	}
+
+	btSoftBodyArray& getSoftBodyArray()
+	{
+		return m_softBodies;
+	}
+
+	const btSoftBodyArray& getSoftBodyArray() const
+	{
+		return m_softBodies;
+	}
+
+	virtual void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const;
+
+	/// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest.
+	/// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape.
+	/// This allows more customization.
+	static void rayTestSingle(const btTransform& rayFromTrans, const btTransform& rayToTrans,
+							  btCollisionObject* collisionObject,
+							  const btCollisionShape* collisionShape,
+							  const btTransform& colObjWorldTransform,
+							  RayResultCallback& resultCallback);
+
+	virtual void serialize(btSerializer* serializer);
+};
+
+#endif  //BT_SOFT_RIGID_DYNAMICS_WORLD_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
new file mode 100644
index 0000000..4e890ba
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
@@ -0,0 +1,48 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftSoftCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletSoftBody/btSoftBodySolvers.h"
+#include "btSoftBody.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+
+#define USE_PERSISTENT_CONTACTS 1
+
+btSoftSoftCollisionAlgorithm::btSoftSoftCollisionAlgorithm(btPersistentManifold* /*mf*/, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* /*obj0*/, const btCollisionObjectWrapper* /*obj1*/)
+	: btCollisionAlgorithm(ci)
+//m_ownManifold(false),
+//m_manifoldPtr(mf)
+{
+}
+
+btSoftSoftCollisionAlgorithm::~btSoftSoftCollisionAlgorithm()
+{
+}
+
+void btSoftSoftCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& /*dispatchInfo*/, btManifoldResult* /*resultOut*/)
+{
+	btSoftBody* soft0 = (btSoftBody*)body0Wrap->getCollisionObject();
+	btSoftBody* soft1 = (btSoftBody*)body1Wrap->getCollisionObject();
+	soft0->getSoftBodySolver()->processCollision(soft0, soft1);
+}
+
+btScalar btSoftSoftCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* /*body0*/, btCollisionObject* /*body1*/, const btDispatcherInfo& /*dispatchInfo*/, btManifoldResult* /*resultOut*/)
+{
+	//not yet
+	return 1.f;
+}
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
new file mode 100644
index 0000000..30923be
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
@@ -0,0 +1,65 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFT_SOFT_COLLISION_ALGORITHM_H
+#define BT_SOFT_SOFT_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+
+class btPersistentManifold;
+class btSoftBody;
+
+///collision detection between two btSoftBody shapes
+class btSoftSoftCollisionAlgorithm : public btCollisionAlgorithm
+{
+	bool m_ownManifold;
+	btPersistentManifold* m_manifoldPtr;
+
+	//	btSoftBody*	m_softBody0;
+	//	btSoftBody*	m_softBody1;
+
+public:
+	btSoftSoftCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+		: btCollisionAlgorithm(ci) {}
+
+	virtual void processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0, btCollisionObject* body1, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut);
+
+	virtual void getAllContactManifolds(btManifoldArray& manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+			manifoldArray.push_back(m_manifoldPtr);
+	}
+
+	btSoftSoftCollisionAlgorithm(btPersistentManifold* mf, const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap);
+
+	virtual ~btSoftSoftCollisionAlgorithm();
+
+	struct CreateFunc : public btCollisionAlgorithmCreateFunc
+	{
+		virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap)
+		{
+			int bbsize = sizeof(btSoftSoftCollisionAlgorithm);
+			void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize);
+			return new (ptr) btSoftSoftCollisionAlgorithm(0, ci, body0Wrap, body1Wrap);
+		}
+	};
+};
+
+#endif  //BT_SOFT_SOFT_COLLISION_ALGORITHM_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btSparseSDF.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSparseSDF.h
new file mode 100644
index 0000000..243b80f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btSparseSDF.h
@@ -0,0 +1,372 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSparseSdf implementation by Nathanael Presson
+
+#ifndef BT_SPARSE_SDF_H
+#define BT_SPARSE_SDF_H
+
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+
+// Fast Hash
+
+#if !defined(get16bits)
+#define get16bits(d) ((((unsigned int)(((const unsigned char*)(d))[1])) << 8) + (unsigned int)(((const unsigned char*)(d))[0]))
+#endif
+//
+// super hash function by Paul Hsieh
+//
+inline unsigned int HsiehHash(const char* data, int len)
+{
+	unsigned int hash = len, tmp;
+	len >>= 2;
+
+	/* Main loop */
+	for (; len > 0; len--)
+	{
+		hash += get16bits(data);
+		tmp = (get16bits(data + 2) << 11) ^ hash;
+		hash = (hash << 16) ^ tmp;
+		data += 2 * sizeof(unsigned short);
+		hash += hash >> 11;
+	}
+
+	/* Force "avalanching" of final 127 bits */
+	hash ^= hash << 3;
+	hash += hash >> 5;
+	hash ^= hash << 4;
+	hash += hash >> 17;
+	hash ^= hash << 25;
+	hash += hash >> 6;
+
+	return hash;
+}
+
+template <const int CELLSIZE>
+struct btSparseSdf
+{
+	//
+	// Inner types
+	//
+	struct IntFrac
+	{
+		int b;
+		int i;
+		btScalar f;
+	};
+	struct Cell
+	{
+		btScalar d[CELLSIZE + 1][CELLSIZE + 1][CELLSIZE + 1];
+		int c[3];
+		int puid;
+		unsigned hash;
+		const btCollisionShape* pclient;
+		Cell* next;
+	};
+	//
+	// Fields
+	//
+
+	btAlignedObjectArray<Cell*> cells;
+	btScalar voxelsz;
+	btScalar m_defaultVoxelsz;
+	int puid;
+	int ncells;
+	int m_clampCells;
+	int nprobes;
+	int nqueries;
+
+	~btSparseSdf()
+	{
+		Reset();
+	}
+	//
+	// Methods
+	//
+
+	//
+	void Initialize(int hashsize = 2383, int clampCells = 256 * 1024)
+	{
+		//avoid a crash due to running out of memory, so clamp the maximum number of cells allocated
+		//if this limit is reached, the SDF is reset (at the cost of some performance during the reset)
+		m_clampCells = clampCells;
+		cells.resize(hashsize, 0);
+		m_defaultVoxelsz = 0.25;
+		Reset();
+	}
+	//
+
+	void setDefaultVoxelsz(btScalar sz)
+	{
+		m_defaultVoxelsz = sz;
+	}
+
+	void Reset()
+	{
+		for (int i = 0, ni = cells.size(); i < ni; ++i)
+		{
+			Cell* pc = cells[i];
+			cells[i] = 0;
+			while (pc)
+			{
+				Cell* pn = pc->next;
+				delete pc;
+				pc = pn;
+			}
+		}
+		voxelsz = m_defaultVoxelsz;
+		puid = 0;
+		ncells = 0;
+		nprobes = 1;
+		nqueries = 1;
+	}
+	//
+	void GarbageCollect(int lifetime = 256)
+	{
+		const int life = puid - lifetime;
+		for (int i = 0; i < cells.size(); ++i)
+		{
+			Cell*& root = cells[i];
+			Cell* pp = 0;
+			Cell* pc = root;
+			while (pc)
+			{
+				Cell* pn = pc->next;
+				if (pc->puid < life)
+				{
+					if (pp)
+						pp->next = pn;
+					else
+						root = pn;
+					delete pc;
+					pc = pp;
+					--ncells;
+				}
+				pp = pc;
+				pc = pn;
+			}
+		}
+		//printf("GC[%d]: %d cells, PpQ: %f\r\n",puid,ncells,nprobes/(btScalar)nqueries);
+		nqueries = 1;
+		nprobes = 1;
+		++puid;  ///@todo: Reset puid's when int range limit is reached	*/
+		/* else setup a priority list...						*/
+	}
+	//
+	int RemoveReferences(btCollisionShape* pcs)
+	{
+		int refcount = 0;
+		for (int i = 0; i < cells.size(); ++i)
+		{
+			Cell*& root = cells[i];
+			Cell* pp = 0;
+			Cell* pc = root;
+			while (pc)
+			{
+				Cell* pn = pc->next;
+				if (pc->pclient == pcs)
+				{
+					if (pp)
+						pp->next = pn;
+					else
+						root = pn;
+					delete pc;
+					pc = pp;
+					++refcount;
+				}
+				pp = pc;
+				pc = pn;
+			}
+		}
+		return (refcount);
+	}
+	//
+	btScalar Evaluate(const btVector3& x,
+					  const btCollisionShape* shape,
+					  btVector3& normal,
+					  btScalar margin)
+	{
+		/* Lookup cell			*/
+		const btVector3 scx = x / voxelsz;
+		const IntFrac ix = Decompose(scx.x());
+		const IntFrac iy = Decompose(scx.y());
+		const IntFrac iz = Decompose(scx.z());
+		const unsigned h = Hash(ix.b, iy.b, iz.b, shape);
+		Cell*& root = cells[static_cast<int>(h % cells.size())];
+		Cell* c = root;
+		++nqueries;
+		while (c)
+		{
+			++nprobes;
+			if ((c->hash == h) &&
+				(c->c[0] == ix.b) &&
+				(c->c[1] == iy.b) &&
+				(c->c[2] == iz.b) &&
+				(c->pclient == shape))
+			{
+				break;
+			}
+			else
+			{
+				// printf("c->hash/c[0][1][2]=%d,%d,%d,%d\n", c->hash, c->c[0], c->c[1],c->c[2]);
+				//printf("h,ixb,iyb,izb=%d,%d,%d,%d\n", h,ix.b, iy.b, iz.b);
+
+				c = c->next;
+			}
+		}
+		if (!c)
+		{
+			++nprobes;
+			++ncells;
+			//int sz = sizeof(Cell);
+			if (ncells > m_clampCells)
+			{
+				//static int numResets = 0;
+				//numResets++;
+				//printf("numResets=%d\n",numResets);
+				Reset();
+			}
+
+			c = new Cell();
+			c->next = root;
+			root = c;
+			c->pclient = shape;
+			c->hash = h;
+			c->c[0] = ix.b;
+			c->c[1] = iy.b;
+			c->c[2] = iz.b;
+			BuildCell(*c);
+		}
+		c->puid = puid;
+		/* Extract infos		*/
+		const int o[] = {ix.i, iy.i, iz.i};
+		const btScalar d[] = {c->d[o[0] + 0][o[1] + 0][o[2] + 0],
+							  c->d[o[0] + 1][o[1] + 0][o[2] + 0],
+							  c->d[o[0] + 1][o[1] + 1][o[2] + 0],
+							  c->d[o[0] + 0][o[1] + 1][o[2] + 0],
+							  c->d[o[0] + 0][o[1] + 0][o[2] + 1],
+							  c->d[o[0] + 1][o[1] + 0][o[2] + 1],
+							  c->d[o[0] + 1][o[1] + 1][o[2] + 1],
+							  c->d[o[0] + 0][o[1] + 1][o[2] + 1]};
+		/* Normal	*/
+#if 1
+		const btScalar gx[] = {d[1] - d[0], d[2] - d[3],
+							   d[5] - d[4], d[6] - d[7]};
+		const btScalar gy[] = {d[3] - d[0], d[2] - d[1],
+							   d[7] - d[4], d[6] - d[5]};
+		const btScalar gz[] = {d[4] - d[0], d[5] - d[1],
+							   d[7] - d[3], d[6] - d[2]};
+		normal.setX(Lerp(Lerp(gx[0], gx[1], iy.f),
+						 Lerp(gx[2], gx[3], iy.f), iz.f));
+		normal.setY(Lerp(Lerp(gy[0], gy[1], ix.f),
+						 Lerp(gy[2], gy[3], ix.f), iz.f));
+		normal.setZ(Lerp(Lerp(gz[0], gz[1], ix.f),
+						 Lerp(gz[2], gz[3], ix.f), iy.f));
+		normal.safeNormalize();
+#else
+		normal = btVector3(d[1] - d[0], d[3] - d[0], d[4] - d[0]).normalized();
+#endif
+		/* Distance	*/
+		const btScalar d0 = Lerp(Lerp(d[0], d[1], ix.f),
+								 Lerp(d[3], d[2], ix.f), iy.f);
+		const btScalar d1 = Lerp(Lerp(d[4], d[5], ix.f),
+								 Lerp(d[7], d[6], ix.f), iy.f);
+		return (Lerp(d0, d1, iz.f) - margin);
+	}
+	//
+	void BuildCell(Cell& c)
+	{
+		const btVector3 org = btVector3((btScalar)c.c[0],
+										(btScalar)c.c[1],
+										(btScalar)c.c[2]) *
+							  CELLSIZE * voxelsz;
+		for (int k = 0; k <= CELLSIZE; ++k)
+		{
+			const btScalar z = voxelsz * k + org.z();
+			for (int j = 0; j <= CELLSIZE; ++j)
+			{
+				const btScalar y = voxelsz * j + org.y();
+				for (int i = 0; i <= CELLSIZE; ++i)
+				{
+					const btScalar x = voxelsz * i + org.x();
+					c.d[i][j][k] = DistanceToShape(btVector3(x, y, z),
+												   c.pclient);
+				}
+			}
+		}
+	}
+	//
+	static inline btScalar DistanceToShape(const btVector3& x,
+										   const btCollisionShape* shape)
+	{
+		btTransform unit;
+		unit.setIdentity();
+		if (shape->isConvex())
+		{
+			btGjkEpaSolver2::sResults res;
+			const btConvexShape* csh = static_cast<const btConvexShape*>(shape);
+			return (btGjkEpaSolver2::SignedDistance(x, 0, csh, unit, res));
+		}
+		return (0);
+	}
+	//
+	static inline IntFrac Decompose(btScalar x)
+	{
+		/* That one need a lot of improvements...	*/
+		/* Remove test, faster floor...				*/
+		IntFrac r;
+		x /= CELLSIZE;
+		const int o = x < 0 ? (int)(-x + 1) : 0;
+		x += o;
+		r.b = (int)x;
+		const btScalar k = (x - r.b) * CELLSIZE;
+		r.i = (int)k;
+		r.f = k - r.i;
+		r.b -= o;
+		return (r);
+	}
+	//
+	static inline btScalar Lerp(btScalar a, btScalar b, btScalar t)
+	{
+		return (a + (b - a) * t);
+	}
+
+	//
+	static inline unsigned int Hash(int x, int y, int z, const btCollisionShape* shape)
+	{
+		struct btS
+		{
+			int x, y, z, w;
+			void* p;
+		};
+
+		btS myset;
+		//memset may be needed in case of additional (uninitialized) padding!
+		//memset(&myset, 0, sizeof(btS));
+
+		myset.x = x;
+		myset.y = y;
+		myset.z = z;
+		myset.w = 0;
+		myset.p = (void*)shape;
+		const char* ptr = (const char*)&myset;
+
+		unsigned int result = HsiehHash(ptr, sizeof(btS));
+
+		return result;
+	}
+};
+
+#endif  //BT_SPARSE_SDF_H
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/poly34.cpp b/dali-physics/third-party/bullet3/src/BulletSoftBody/poly34.cpp
new file mode 100644
index 0000000..ec7549c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/poly34.cpp
@@ -0,0 +1,447 @@
+// poly34.cpp : solution of cubic and quartic equation
+// (c) Khashin S.I. http://math.ivanovo.ac.ru/dalgebra/Khashin/index.html
+// khash2 (at) gmail.com
+// Thanks to Alexandr Rakhmanin <rakhmanin (at) gmail.com>
+// public domain
+//
+#include <math.h>
+
+#include "poly34.h"  // solution of cubic and quartic equation
+#define TwoPi 6.28318530717958648
+const btScalar eps = SIMD_EPSILON;
+
+//=============================================================================
+// _root3, root3 from http://prografix.narod.ru
+//=============================================================================
+static SIMD_FORCE_INLINE btScalar _root3(btScalar x)
+{
+	btScalar s = 1.;
+	while (x < 1.)
+	{
+		x *= 8.;
+		s *= 0.5;
+	}
+	while (x > 8.)
+	{
+		x *= 0.125;
+		s *= 2.;
+	}
+	btScalar r = 1.5;
+	r -= 1. / 3. * (r - x / (r * r));
+	r -= 1. / 3. * (r - x / (r * r));
+	r -= 1. / 3. * (r - x / (r * r));
+	r -= 1. / 3. * (r - x / (r * r));
+	r -= 1. / 3. * (r - x / (r * r));
+	r -= 1. / 3. * (r - x / (r * r));
+	return r * s;
+}
+
+btScalar SIMD_FORCE_INLINE root3(btScalar x)
+{
+	if (x > 0)
+		return _root3(x);
+	else if (x < 0)
+		return -_root3(-x);
+	else
+		return 0.;
+}
+
+// x - array of size 2
+// return 2: 2 real roots x[0], x[1]
+// return 0: pair of complex roots: x[0]i*x[1]
+int SolveP2(btScalar* x, btScalar a, btScalar b)
+{  // solve equation x^2 + a*x + b = 0
+	btScalar D = 0.25 * a * a - b;
+	if (D >= 0)
+	{
+		D = sqrt(D);
+		x[0] = -0.5 * a + D;
+		x[1] = -0.5 * a - D;
+		return 2;
+	}
+	x[0] = -0.5 * a;
+	x[1] = sqrt(-D);
+	return 0;
+}
+//---------------------------------------------------------------------------
+// x - array of size 3
+// In case 3 real roots: => x[0], x[1], x[2], return 3
+//         2 real roots: x[0], x[1],          return 2
+//         1 real root : x[0], x[1]  i*x[2], return 1
+int SolveP3(btScalar* x, btScalar a, btScalar b, btScalar c)
+{  // solve cubic equation x^3 + a*x^2 + b*x + c = 0
+	btScalar a2 = a * a;
+	btScalar q = (a2 - 3 * b) / 9;
+	if (q < 0)
+		q = eps;
+	btScalar r = (a * (2 * a2 - 9 * b) + 27 * c) / 54;
+	// equation x^3 + q*x + r = 0
+	btScalar r2 = r * r;
+	btScalar q3 = q * q * q;
+	btScalar A, B;
+	if (r2 <= (q3 + eps))
+	{  //<<-- FIXED!
+		btScalar t = r / sqrt(q3);
+		if (t < -1)
+			t = -1;
+		if (t > 1)
+			t = 1;
+		t = acos(t);
+		a /= 3;
+		q = -2 * sqrt(q);
+		x[0] = q * cos(t / 3) - a;
+		x[1] = q * cos((t + TwoPi) / 3) - a;
+		x[2] = q * cos((t - TwoPi) / 3) - a;
+		return (3);
+	}
+	else
+	{
+		//A =-pow(fabs(r)+sqrt(r2-q3),1./3);
+		A = -root3(fabs(r) + sqrt(r2 - q3));
+		if (r < 0)
+			A = -A;
+		B = (A == 0 ? 0 : q / A);
+
+		a /= 3;
+		x[0] = (A + B) - a;
+		x[1] = -0.5 * (A + B) - a;
+		x[2] = 0.5 * sqrt(3.) * (A - B);
+		if (fabs(x[2]) < eps)
+		{
+			x[2] = x[1];
+			return (2);
+		}
+		return (1);
+	}
+}  // SolveP3(btScalar *x,btScalar a,btScalar b,btScalar c) {
+//---------------------------------------------------------------------------
+// a>=0!
+void CSqrt(btScalar x, btScalar y, btScalar& a, btScalar& b)  // returns:  a+i*s = sqrt(x+i*y)
+{
+	btScalar r = sqrt(x * x + y * y);
+	if (y == 0)
+	{
+		r = sqrt(r);
+		if (x >= 0)
+		{
+			a = r;
+			b = 0;
+		}
+		else
+		{
+			a = 0;
+			b = r;
+		}
+	}
+	else
+	{  // y != 0
+		a = sqrt(0.5 * (x + r));
+		b = 0.5 * y / a;
+	}
+}
+//---------------------------------------------------------------------------
+int SolveP4Bi(btScalar* x, btScalar b, btScalar d)  // solve equation x^4 + b*x^2 + d = 0
+{
+	btScalar D = b * b - 4 * d;
+	if (D >= 0)
+	{
+		btScalar sD = sqrt(D);
+		btScalar x1 = (-b + sD) / 2;
+		btScalar x2 = (-b - sD) / 2;  // x2 <= x1
+		if (x2 >= 0)                  // 0 <= x2 <= x1, 4 real roots
+		{
+			btScalar sx1 = sqrt(x1);
+			btScalar sx2 = sqrt(x2);
+			x[0] = -sx1;
+			x[1] = sx1;
+			x[2] = -sx2;
+			x[3] = sx2;
+			return 4;
+		}
+		if (x1 < 0)  // x2 <= x1 < 0, two pair of imaginary roots
+		{
+			btScalar sx1 = sqrt(-x1);
+			btScalar sx2 = sqrt(-x2);
+			x[0] = 0;
+			x[1] = sx1;
+			x[2] = 0;
+			x[3] = sx2;
+			return 0;
+		}
+		// now x2 < 0 <= x1 , two real roots and one pair of imginary root
+		btScalar sx1 = sqrt(x1);
+		btScalar sx2 = sqrt(-x2);
+		x[0] = -sx1;
+		x[1] = sx1;
+		x[2] = 0;
+		x[3] = sx2;
+		return 2;
+	}
+	else
+	{  // if( D < 0 ), two pair of compex roots
+		btScalar sD2 = 0.5 * sqrt(-D);
+		CSqrt(-0.5 * b, sD2, x[0], x[1]);
+		CSqrt(-0.5 * b, -sD2, x[2], x[3]);
+		return 0;
+	}  // if( D>=0 )
+}  // SolveP4Bi(btScalar *x, btScalar b, btScalar d)    // solve equation x^4 + b*x^2 d
+//---------------------------------------------------------------------------
+#define SWAP(a, b) \
+	{              \
+		t = b;     \
+		b = a;     \
+		a = t;     \
+	}
+static void dblSort3(btScalar& a, btScalar& b, btScalar& c)  // make: a <= b <= c
+{
+	btScalar t;
+	if (a > b)
+		SWAP(a, b);  // now a<=b
+	if (c < b)
+	{
+		SWAP(b, c);  // now a<=b, b<=c
+		if (a > b)
+			SWAP(a, b);  // now a<=b
+	}
+}
+//---------------------------------------------------------------------------
+int SolveP4De(btScalar* x, btScalar b, btScalar c, btScalar d)  // solve equation x^4 + b*x^2 + c*x + d
+{
+	//if( c==0 ) return SolveP4Bi(x,b,d); // After that, c!=0
+	if (fabs(c) < 1e-14 * (fabs(b) + fabs(d)))
+		return SolveP4Bi(x, b, d);  // After that, c!=0
+
+	int res3 = SolveP3(x, 2 * b, b * b - 4 * d, -c * c);  // solve resolvent
+	// by Viet theorem:  x1*x2*x3=-c*c not equals to 0, so x1!=0, x2!=0, x3!=0
+	if (res3 > 1)  // 3 real roots,
+	{
+		dblSort3(x[0], x[1], x[2]);  // sort roots to x[0] <= x[1] <= x[2]
+		// Note: x[0]*x[1]*x[2]= c*c > 0
+		if (x[0] > 0)  // all roots are positive
+		{
+			btScalar sz1 = sqrt(x[0]);
+			btScalar sz2 = sqrt(x[1]);
+			btScalar sz3 = sqrt(x[2]);
+			// Note: sz1*sz2*sz3= -c (and not equal to 0)
+			if (c > 0)
+			{
+				x[0] = (-sz1 - sz2 - sz3) / 2;
+				x[1] = (-sz1 + sz2 + sz3) / 2;
+				x[2] = (+sz1 - sz2 + sz3) / 2;
+				x[3] = (+sz1 + sz2 - sz3) / 2;
+				return 4;
+			}
+			// now: c<0
+			x[0] = (-sz1 - sz2 + sz3) / 2;
+			x[1] = (-sz1 + sz2 - sz3) / 2;
+			x[2] = (+sz1 - sz2 - sz3) / 2;
+			x[3] = (+sz1 + sz2 + sz3) / 2;
+			return 4;
+		}  // if( x[0] > 0) // all roots are positive
+		// now x[0] <= x[1] < 0, x[2] > 0
+		// two pair of comlex roots
+		btScalar sz1 = sqrt(-x[0]);
+		btScalar sz2 = sqrt(-x[1]);
+		btScalar sz3 = sqrt(x[2]);
+
+		if (c > 0)  // sign = -1
+		{
+			x[0] = -sz3 / 2;
+			x[1] = (sz1 - sz2) / 2;  // x[0]i*x[1]
+			x[2] = sz3 / 2;
+			x[3] = (-sz1 - sz2) / 2;  // x[2]i*x[3]
+			return 0;
+		}
+		// now: c<0 , sign = +1
+		x[0] = sz3 / 2;
+		x[1] = (-sz1 + sz2) / 2;
+		x[2] = -sz3 / 2;
+		x[3] = (sz1 + sz2) / 2;
+		return 0;
+	}  // if( res3>1 )    // 3 real roots,
+	// now resoventa have 1 real and pair of compex roots
+	// x[0] - real root, and x[0]>0,
+	// x[1]i*x[2] - complex roots,
+	// x[0] must be >=0. But one times x[0]=~ 1e-17, so:
+	if (x[0] < 0)
+		x[0] = 0;
+	btScalar sz1 = sqrt(x[0]);
+	btScalar szr, szi;
+	CSqrt(x[1], x[2], szr, szi);  // (szr+i*szi)^2 = x[1]+i*x[2]
+	if (c > 0)                    // sign = -1
+	{
+		x[0] = -sz1 / 2 - szr;  // 1st real root
+		x[1] = -sz1 / 2 + szr;  // 2nd real root
+		x[2] = sz1 / 2;
+		x[3] = szi;
+		return 2;
+	}
+	// now: c<0 , sign = +1
+	x[0] = sz1 / 2 - szr;  // 1st real root
+	x[1] = sz1 / 2 + szr;  // 2nd real root
+	x[2] = -sz1 / 2;
+	x[3] = szi;
+	return 2;
+}  // SolveP4De(btScalar *x, btScalar b, btScalar c, btScalar d)    // solve equation x^4 + b*x^2 + c*x + d
+//-----------------------------------------------------------------------------
+btScalar N4Step(btScalar x, btScalar a, btScalar b, btScalar c, btScalar d)  // one Newton step for x^4 + a*x^3 + b*x^2 + c*x + d
+{
+	btScalar fxs = ((4 * x + 3 * a) * x + 2 * b) * x + c;  // f'(x)
+	if (fxs == 0)
+		return x;                                       //return 1e99; <<-- FIXED!
+	btScalar fx = (((x + a) * x + b) * x + c) * x + d;  // f(x)
+	return x - fx / fxs;
+}
+//-----------------------------------------------------------------------------
+// x - array of size 4
+// return 4: 4 real roots x[0], x[1], x[2], x[3], possible multiple roots
+// return 2: 2 real roots x[0], x[1] and complex x[2]i*x[3],
+// return 0: two pair of complex roots: x[0]i*x[1],  x[2]i*x[3],
+int SolveP4(btScalar* x, btScalar a, btScalar b, btScalar c, btScalar d)
+{  // solve equation x^4 + a*x^3 + b*x^2 + c*x + d by Dekart-Euler method
+	// move to a=0:
+	btScalar d1 = d + 0.25 * a * (0.25 * b * a - 3. / 64 * a * a * a - c);
+	btScalar c1 = c + 0.5 * a * (0.25 * a * a - b);
+	btScalar b1 = b - 0.375 * a * a;
+	int res = SolveP4De(x, b1, c1, d1);
+	if (res == 4)
+	{
+		x[0] -= a / 4;
+		x[1] -= a / 4;
+		x[2] -= a / 4;
+		x[3] -= a / 4;
+	}
+	else if (res == 2)
+	{
+		x[0] -= a / 4;
+		x[1] -= a / 4;
+		x[2] -= a / 4;
+	}
+	else
+	{
+		x[0] -= a / 4;
+		x[2] -= a / 4;
+	}
+	// one Newton step for each real root:
+	if (res > 0)
+	{
+		x[0] = N4Step(x[0], a, b, c, d);
+		x[1] = N4Step(x[1], a, b, c, d);
+	}
+	if (res > 2)
+	{
+		x[2] = N4Step(x[2], a, b, c, d);
+		x[3] = N4Step(x[3], a, b, c, d);
+	}
+	return res;
+}
+//-----------------------------------------------------------------------------
+#define F5(t) (((((t + a) * t + b) * t + c) * t + d) * t + e)
+//-----------------------------------------------------------------------------
+btScalar SolveP5_1(btScalar a, btScalar b, btScalar c, btScalar d, btScalar e)  // return real root of x^5 + a*x^4 + b*x^3 + c*x^2 + d*x + e = 0
+{
+	int cnt;
+	if (fabs(e) < eps)
+		return 0;
+
+	btScalar brd = fabs(a);  // brd - border of real roots
+	if (fabs(b) > brd)
+		brd = fabs(b);
+	if (fabs(c) > brd)
+		brd = fabs(c);
+	if (fabs(d) > brd)
+		brd = fabs(d);
+	if (fabs(e) > brd)
+		brd = fabs(e);
+	brd++;  // brd - border of real roots
+
+	btScalar x0, f0;       // less than root
+	btScalar x1, f1;       // greater than root
+	btScalar x2, f2, f2s;  // next values, f(x2), f'(x2)
+	btScalar dx = 0;
+
+	if (e < 0)
+	{
+		x0 = 0;
+		x1 = brd;
+		f0 = e;
+		f1 = F5(x1);
+		x2 = 0.01 * brd;
+	}  // positive root
+	else
+	{
+		x0 = -brd;
+		x1 = 0;
+		f0 = F5(x0);
+		f1 = e;
+		x2 = -0.01 * brd;
+	}  // negative root
+
+	if (fabs(f0) < eps)
+		return x0;
+	if (fabs(f1) < eps)
+		return x1;
+
+	// now x0<x1, f(x0)<0, f(x1)>0
+	// Firstly 10 bisections
+	for (cnt = 0; cnt < 10; cnt++)
+	{
+		x2 = (x0 + x1) / 2;  // next point
+		//x2 = x0 - f0*(x1 - x0) / (f1 - f0);        // next point
+		f2 = F5(x2);  // f(x2)
+		if (fabs(f2) < eps)
+			return x2;
+		if (f2 > 0)
+		{
+			x1 = x2;
+			f1 = f2;
+		}
+		else
+		{
+			x0 = x2;
+			f0 = f2;
+		}
+	}
+
+	// At each step:
+	// x0<x1, f(x0)<0, f(x1)>0.
+	// x2 - next value
+	// we hope that x0 < x2 < x1, but not necessarily
+	do
+	{
+		if (cnt++ > 50)
+			break;
+		if (x2 <= x0 || x2 >= x1)
+			x2 = (x0 + x1) / 2;  // now  x0 < x2 < x1
+		f2 = F5(x2);             // f(x2)
+		if (fabs(f2) < eps)
+			return x2;
+		if (f2 > 0)
+		{
+			x1 = x2;
+			f1 = f2;
+		}
+		else
+		{
+			x0 = x2;
+			f0 = f2;
+		}
+		f2s = (((5 * x2 + 4 * a) * x2 + 3 * b) * x2 + 2 * c) * x2 + d;  // f'(x2)
+		if (fabs(f2s) < eps)
+		{
+			x2 = 1e99;
+			continue;
+		}
+		dx = f2 / f2s;
+		x2 -= dx;
+	} while (fabs(dx) > eps);
+	return x2;
+}  // SolveP5_1(btScalar a,btScalar b,btScalar c,btScalar d,btScalar e)    // return real root of x^5 + a*x^4 + b*x^3 + c*x^2 + d*x + e = 0
+//-----------------------------------------------------------------------------
+int SolveP5(btScalar* x, btScalar a, btScalar b, btScalar c, btScalar d, btScalar e)  // solve equation x^5 + a*x^4 + b*x^3 + c*x^2 + d*x + e = 0
+{
+	btScalar r = x[0] = SolveP5_1(a, b, c, d, e);
+	btScalar a1 = a + r, b1 = b + r * a1, c1 = c + r * b1, d1 = d + r * c1;
+	return 1 + SolveP4(x + 1, a1, b1, c1, d1);
+}  // SolveP5(btScalar *x,btScalar a,btScalar b,btScalar c,btScalar d,btScalar e)    // solve equation x^5 + a*x^4 + b*x^3 + c*x^2 + d*x + e = 0
+//-----------------------------------------------------------------------------
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/poly34.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/poly34.h
new file mode 100644
index 0000000..35a52c5
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/poly34.h
@@ -0,0 +1,38 @@
+// poly34.h : solution of cubic and quartic equation
+// (c) Khashin S.I. http://math.ivanovo.ac.ru/dalgebra/Khashin/index.html
+// khash2 (at) gmail.com
+
+#ifndef POLY_34
+#define POLY_34
+#include "LinearMath/btScalar.h"
+// x - array of size 2
+// return 2: 2 real roots x[0], x[1]
+// return 0: pair of complex roots: x[0]i*x[1]
+int SolveP2(btScalar* x, btScalar a, btScalar b);  // solve equation x^2 + a*x + b = 0
+
+// x - array of size 3
+// return 3: 3 real roots x[0], x[1], x[2]
+// return 1: 1 real root x[0] and pair of complex roots: x[1]i*x[2]
+int SolveP3(btScalar* x, btScalar a, btScalar b, btScalar c);  // solve cubic equation x^3 + a*x^2 + b*x + c = 0
+
+// x - array of size 4
+// return 4: 4 real roots x[0], x[1], x[2], x[3], possible multiple roots
+// return 2: 2 real roots x[0], x[1] and complex x[2]i*x[3],
+// return 0: two pair of complex roots: x[0]i*x[1],  x[2]i*x[3],
+int SolveP4(btScalar* x, btScalar a, btScalar b, btScalar c, btScalar d);  // solve equation x^4 + a*x^3 + b*x^2 + c*x + d = 0 by Dekart-Euler method
+
+// x - array of size 5
+// return 5: 5 real roots x[0], x[1], x[2], x[3], x[4], possible multiple roots
+// return 3: 3 real roots x[0], x[1], x[2] and complex x[3]i*x[4],
+// return 1: 1 real root x[0] and two pair of complex roots: x[1]i*x[2],  x[3]i*x[4],
+int SolveP5(btScalar* x, btScalar a, btScalar b, btScalar c, btScalar d, btScalar e);  // solve equation x^5 + a*x^4 + b*x^3 + c*x^2 + d*x + e = 0
+
+//-----------------------------------------------------------------------------
+// And some additional functions for internal use.
+// Your may remove this definitions from here
+int SolveP4Bi(btScalar* x, btScalar b, btScalar d);                              // solve equation x^4 + b*x^2 + d = 0
+int SolveP4De(btScalar* x, btScalar b, btScalar c, btScalar d);                  // solve equation x^4 + b*x^2 + c*x + d = 0
+void CSqrt(btScalar x, btScalar y, btScalar& a, btScalar& b);                    // returns as a+i*s,  sqrt(x+i*y)
+btScalar N4Step(btScalar x, btScalar a, btScalar b, btScalar c, btScalar d);     // one Newton step for x^4 + a*x^3 + b*x^2 + c*x + d
+btScalar SolveP5_1(btScalar a, btScalar b, btScalar c, btScalar d, btScalar e);  // return real root of x^5 + a*x^4 + b*x^3 + c*x^2 + d*x + e = 0
+#endif
diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/premake4.lua b/dali-physics/third-party/bullet3/src/BulletSoftBody/premake4.lua
new file mode 100644
index 0000000..370bd98
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/premake4.lua
@@ -0,0 +1,15 @@
+	project "BulletSoftBody"
+		
+	kind "StaticLib"
+	
+	includedirs {
+		"..",
+	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
+	files {
+		"**.cpp",
+                "BulletReducedDeformableBody/**.cpp",
+		"**.h"
+	}
diff --git a/dali-physics/third-party/bullet3/src/CMakeLists.txt b/dali-physics/third-party/bullet3/src/CMakeLists.txt
new file mode 100644
index 0000000..c30125c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+IF(BUILD_BULLET3)
+	SUBDIRS(  Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry )
+ENDIF(BUILD_BULLET3)
+
+
+SUBDIRS(   BulletInverseDynamics BulletSoftBody BulletCollision BulletDynamics LinearMath Bullet3Common)
+
+
+IF(INSTALL_LIBS)
+	#INSTALL of other files requires CMake 2.6
+	IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			# Don't actually need to install any common files, the frameworks include everything
+		ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h  DESTINATION ${INCLUDE_INSTALL_DIR})
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+ENDIF(INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/CMakeLists.txt b/dali-physics/third-party/bullet3/src/LinearMath/CMakeLists.txt
new file mode 100644
index 0000000..a0532c7
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/CMakeLists.txt
@@ -0,0 +1,83 @@
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+)
+
+SET(LinearMath_SRCS
+	btAlignedAllocator.cpp
+	btConvexHull.cpp
+	btConvexHullComputer.cpp
+	btGeometryUtil.cpp
+	btPolarDecomposition.cpp
+	btQuickprof.cpp
+	btReducedVector.cpp
+	btSerializer.cpp
+	btSerializer64.cpp
+	btThreads.cpp
+	btVector3.cpp
+	TaskScheduler/btTaskScheduler.cpp
+	TaskScheduler/btThreadSupportPosix.cpp
+	TaskScheduler/btThreadSupportWin32.cpp
+)
+
+SET(LinearMath_HDRS
+	btAabbUtil2.h
+	btAlignedAllocator.h
+	btAlignedObjectArray.h
+	btConvexHull.h
+	btConvexHullComputer.h
+	btDefaultMotionState.h
+	btGeometryUtil.h
+	btGrahamScan2dConvexHull.h
+	btHashMap.h
+	btIDebugDraw.h
+	btList.h
+	btMatrix3x3.h
+	btImplicitQRSVD.h
+	btMinMax.h
+	btModifiedGramSchmidt.h
+	btMotionState.h
+	btPolarDecomposition.h
+	btPoolAllocator.h
+	btQuadWord.h
+	btQuaternion.h
+	btQuickprof.h
+	btReducedVector.h
+	btRandom.h
+	btScalar.h
+	btSerializer.h
+	btStackAlloc.h
+	btThreads.h
+	btTransform.h
+	btTransformUtil.h
+	btVector3.h
+	TaskScheduler/btThreadSupportInterface.h
+)
+
+ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS})
+SET_TARGET_PROPERTIES(LinearMath PROPERTIES VERSION ${BULLET_VERSION})
+SET_TARGET_PROPERTIES(LinearMath PROPERTIES SOVERSION ${BULLET_VERSION})
+
+IF (INSTALL_LIBS)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		#FILES_MATCHING requires CMake 2.6
+		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS LinearMath DESTINATION .)
+			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+				INSTALL(TARGETS LinearMath
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
+				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
+".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
+			ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true)
+			SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF (INSTALL_LIBS)
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btTaskScheduler.cpp b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btTaskScheduler.cpp
new file mode 100644
index 0000000..5f1115c
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btTaskScheduler.cpp
@@ -0,0 +1,792 @@
+
+#include "LinearMath/btMinMax.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btThreads.h"
+#include "LinearMath/btQuickprof.h"
+#include <stdio.h>
+#include <algorithm>
+
+#if BT_THREADSAFE
+
+#include "btThreadSupportInterface.h"
+
+#if defined(_WIN32)
+
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+
+#endif
+
+typedef unsigned long long btU64;
+static const int kCacheLineSize = 64;
+
+void btSpinPause()
+{
+#if defined(_WIN32)
+	YieldProcessor();
+#endif
+}
+
+struct WorkerThreadStatus
+{
+	enum Type
+	{
+		kInvalid,
+		kWaitingForWork,
+		kWorking,
+		kSleeping,
+	};
+};
+
+ATTRIBUTE_ALIGNED64(class)
+WorkerThreadDirectives
+{
+	static const int kMaxThreadCount = BT_MAX_THREAD_COUNT;
+	// directives for all worker threads packed into a single cacheline
+	char m_threadDirs[kMaxThreadCount];
+
+public:
+	enum Type
+	{
+		kInvalid,
+		kGoToSleep,         // go to sleep
+		kStayAwakeButIdle,  // wait for not checking job queue
+		kScanForJobs,       // actively scan job queue for jobs
+	};
+	WorkerThreadDirectives()
+	{
+		for (int i = 0; i < kMaxThreadCount; ++i)
+		{
+			m_threadDirs[i] = 0;
+		}
+	}
+
+	Type getDirective(int threadId)
+	{
+		btAssert(threadId < kMaxThreadCount);
+		return static_cast<Type>(m_threadDirs[threadId]);
+	}
+
+	void setDirectiveByRange(int threadBegin, int threadEnd, Type dir)
+	{
+		btAssert(threadBegin < threadEnd);
+		btAssert(threadEnd <= kMaxThreadCount);
+		char dirChar = static_cast<char>(dir);
+		for (int i = threadBegin; i < threadEnd; ++i)
+		{
+			m_threadDirs[i] = dirChar;
+		}
+	}
+};
+
+class JobQueue;
+
+ATTRIBUTE_ALIGNED64(struct)
+ThreadLocalStorage
+{
+	int m_threadId;
+	WorkerThreadStatus::Type m_status;
+	int m_numJobsFinished;
+	btSpinMutex m_mutex;
+	btScalar m_sumResult;
+	WorkerThreadDirectives* m_directive;
+	JobQueue* m_queue;
+	btClock* m_clock;
+	unsigned int m_cooldownTime;
+};
+
+struct IJob
+{
+	virtual void executeJob(int threadId) = 0;
+};
+
+class ParallelForJob : public IJob
+{
+	const btIParallelForBody* m_body;
+	int m_begin;
+	int m_end;
+
+public:
+	ParallelForJob(int iBegin, int iEnd, const btIParallelForBody& body)
+	{
+		m_body = &body;
+		m_begin = iBegin;
+		m_end = iEnd;
+	}
+	virtual void executeJob(int threadId) BT_OVERRIDE
+	{
+		BT_PROFILE("executeJob");
+
+		// call the functor body to do the work
+		m_body->forLoop(m_begin, m_end);
+	}
+};
+
+class ParallelSumJob : public IJob
+{
+	const btIParallelSumBody* m_body;
+	ThreadLocalStorage* m_threadLocalStoreArray;
+	int m_begin;
+	int m_end;
+
+public:
+	ParallelSumJob(int iBegin, int iEnd, const btIParallelSumBody& body, ThreadLocalStorage* tls)
+	{
+		m_body = &body;
+		m_threadLocalStoreArray = tls;
+		m_begin = iBegin;
+		m_end = iEnd;
+	}
+	virtual void executeJob(int threadId) BT_OVERRIDE
+	{
+		BT_PROFILE("executeJob");
+
+		// call the functor body to do the work
+		btScalar val = m_body->sumLoop(m_begin, m_end);
+#if BT_PARALLEL_SUM_DETERMINISTISM
+		// by truncating bits of the result, we can make the parallelSum deterministic (at the expense of precision)
+		const float TRUNC_SCALE = float(1 << 19);
+		val = floor(val * TRUNC_SCALE + 0.5f) / TRUNC_SCALE;  // truncate some bits
+#endif
+		m_threadLocalStoreArray[threadId].m_sumResult += val;
+	}
+};
+
+ATTRIBUTE_ALIGNED64(class)
+JobQueue
+{
+	btThreadSupportInterface* m_threadSupport;
+	btCriticalSection* m_queueLock;
+	btSpinMutex m_mutex;
+
+	btAlignedObjectArray<IJob*> m_jobQueue;
+	char* m_jobMem;
+	int m_jobMemSize;
+	bool m_queueIsEmpty;
+	int m_tailIndex;
+	int m_headIndex;
+	int m_allocSize;
+	bool m_useSpinMutex;
+	btAlignedObjectArray<JobQueue*> m_neighborContexts;
+	char m_cachePadding[kCacheLineSize];  // prevent false sharing
+
+	void freeJobMem()
+	{
+		if (m_jobMem)
+		{
+			// free old
+			btAlignedFree(m_jobMem);
+			m_jobMem = NULL;
+		}
+	}
+	void resizeJobMem(int newSize)
+	{
+		if (newSize > m_jobMemSize)
+		{
+			freeJobMem();
+			m_jobMem = static_cast<char*>(btAlignedAlloc(newSize, kCacheLineSize));
+			m_jobMemSize = newSize;
+		}
+	}
+
+public:
+	JobQueue()
+	{
+		m_jobMem = NULL;
+		m_jobMemSize = 0;
+		m_threadSupport = NULL;
+		m_queueLock = NULL;
+		m_headIndex = 0;
+		m_tailIndex = 0;
+		m_useSpinMutex = false;
+	}
+	~JobQueue()
+	{
+		exit();
+	}
+	void exit()
+	{
+		freeJobMem();
+		if (m_queueLock && m_threadSupport)
+		{
+			m_threadSupport->deleteCriticalSection(m_queueLock);
+			m_queueLock = NULL;
+			m_threadSupport = 0;
+		}
+	}
+
+	void init(btThreadSupportInterface * threadSup, btAlignedObjectArray<JobQueue> * contextArray)
+	{
+		m_threadSupport = threadSup;
+		if (threadSup)
+		{
+			m_queueLock = m_threadSupport->createCriticalSection();
+		}
+		setupJobStealing(contextArray, contextArray->size());
+	}
+	void setupJobStealing(btAlignedObjectArray<JobQueue> * contextArray, int numActiveContexts)
+	{
+		btAlignedObjectArray<JobQueue>& contexts = *contextArray;
+		int selfIndex = 0;
+		for (int i = 0; i < contexts.size(); ++i)
+		{
+			if (this == &contexts[i])
+			{
+				selfIndex = i;
+				break;
+			}
+		}
+		int numNeighbors = btMin(2, contexts.size() - 1);
+		int neighborOffsets[] = {-1, 1, -2, 2, -3, 3};
+		int numOffsets = sizeof(neighborOffsets) / sizeof(neighborOffsets[0]);
+		m_neighborContexts.reserve(numNeighbors);
+		m_neighborContexts.resizeNoInitialize(0);
+		for (int i = 0; i < numOffsets && m_neighborContexts.size() < numNeighbors; i++)
+		{
+			int neighborIndex = selfIndex + neighborOffsets[i];
+			if (neighborIndex >= 0 && neighborIndex < numActiveContexts)
+			{
+				m_neighborContexts.push_back(&contexts[neighborIndex]);
+			}
+		}
+	}
+
+	bool isQueueEmpty() const { return m_queueIsEmpty; }
+	void lockQueue()
+	{
+		if (m_useSpinMutex)
+		{
+			m_mutex.lock();
+		}
+		else
+		{
+			m_queueLock->lock();
+		}
+	}
+	void unlockQueue()
+	{
+		if (m_useSpinMutex)
+		{
+			m_mutex.unlock();
+		}
+		else
+		{
+			m_queueLock->unlock();
+		}
+	}
+	void clearQueue(int jobCount, int jobSize)
+	{
+		lockQueue();
+		m_headIndex = 0;
+		m_tailIndex = 0;
+		m_allocSize = 0;
+		m_queueIsEmpty = true;
+		int jobBufSize = jobSize * jobCount;
+		// make sure we have enough memory allocated to store jobs
+		if (jobBufSize > m_jobMemSize)
+		{
+			resizeJobMem(jobBufSize);
+		}
+		// make sure job queue is big enough
+		if (jobCount > m_jobQueue.capacity())
+		{
+			m_jobQueue.reserve(jobCount);
+		}
+		unlockQueue();
+		m_jobQueue.resizeNoInitialize(0);
+	}
+	void* allocJobMem(int jobSize)
+	{
+		btAssert(m_jobMemSize >= (m_allocSize + jobSize));
+		void* jobMem = &m_jobMem[m_allocSize];
+		m_allocSize += jobSize;
+		return jobMem;
+	}
+	void submitJob(IJob * job)
+	{
+		btAssert(reinterpret_cast<char*>(job) >= &m_jobMem[0] && reinterpret_cast<char*>(job) < &m_jobMem[0] + m_allocSize);
+		m_jobQueue.push_back(job);
+		lockQueue();
+		m_tailIndex++;
+		m_queueIsEmpty = false;
+		unlockQueue();
+	}
+	IJob* consumeJobFromOwnQueue()
+	{
+		if (m_queueIsEmpty)
+		{
+			// lock free path. even if this is taken erroneously it isn't harmful
+			return NULL;
+		}
+		IJob* job = NULL;
+		lockQueue();
+		if (!m_queueIsEmpty)
+		{
+			job = m_jobQueue[m_headIndex++];
+			btAssert(reinterpret_cast<char*>(job) >= &m_jobMem[0] && reinterpret_cast<char*>(job) < &m_jobMem[0] + m_allocSize);
+			if (m_headIndex == m_tailIndex)
+			{
+				m_queueIsEmpty = true;
+			}
+		}
+		unlockQueue();
+		return job;
+	}
+	IJob* consumeJob()
+	{
+		if (IJob* job = consumeJobFromOwnQueue())
+		{
+			return job;
+		}
+		// own queue is empty, try to steal from neighbor
+		for (int i = 0; i < m_neighborContexts.size(); ++i)
+		{
+			JobQueue* otherContext = m_neighborContexts[i];
+			if (IJob* job = otherContext->consumeJobFromOwnQueue())
+			{
+				return job;
+			}
+		}
+		return NULL;
+	}
+};
+
+static void WorkerThreadFunc(void* userPtr)
+{
+	BT_PROFILE("WorkerThreadFunc");
+	ThreadLocalStorage* localStorage = (ThreadLocalStorage*)userPtr;
+	JobQueue* jobQueue = localStorage->m_queue;
+
+	bool shouldSleep = false;
+	int threadId = localStorage->m_threadId;
+	while (!shouldSleep)
+	{
+		// do work
+		localStorage->m_mutex.lock();
+		while (IJob* job = jobQueue->consumeJob())
+		{
+			localStorage->m_status = WorkerThreadStatus::kWorking;
+			job->executeJob(threadId);
+			localStorage->m_numJobsFinished++;
+		}
+		localStorage->m_status = WorkerThreadStatus::kWaitingForWork;
+		localStorage->m_mutex.unlock();
+		btU64 clockStart = localStorage->m_clock->getTimeMicroseconds();
+		// while queue is empty,
+		while (jobQueue->isQueueEmpty())
+		{
+			// todo: spin wait a bit to avoid hammering the empty queue
+			btSpinPause();
+			if (localStorage->m_directive->getDirective(threadId) == WorkerThreadDirectives::kGoToSleep)
+			{
+				shouldSleep = true;
+				break;
+			}
+			// if jobs are incoming,
+			if (localStorage->m_directive->getDirective(threadId) == WorkerThreadDirectives::kScanForJobs)
+			{
+				clockStart = localStorage->m_clock->getTimeMicroseconds();  // reset clock
+			}
+			else
+			{
+				for (int i = 0; i < 50; ++i)
+				{
+					btSpinPause();
+					btSpinPause();
+					btSpinPause();
+					btSpinPause();
+					if (localStorage->m_directive->getDirective(threadId) == WorkerThreadDirectives::kScanForJobs || !jobQueue->isQueueEmpty())
+					{
+						break;
+					}
+				}
+				// if no jobs incoming and queue has been empty for the cooldown time, sleep
+				btU64 timeElapsed = localStorage->m_clock->getTimeMicroseconds() - clockStart;
+				if (timeElapsed > localStorage->m_cooldownTime)
+				{
+					shouldSleep = true;
+					break;
+				}
+			}
+		}
+	}
+	{
+		BT_PROFILE("sleep");
+		// go sleep
+		localStorage->m_mutex.lock();
+		localStorage->m_status = WorkerThreadStatus::kSleeping;
+		localStorage->m_mutex.unlock();
+	}
+}
+
+class btTaskSchedulerDefault : public btITaskScheduler
+{
+	btThreadSupportInterface* m_threadSupport;
+	WorkerThreadDirectives* m_workerDirective;
+	btAlignedObjectArray<JobQueue> m_jobQueues;
+	btAlignedObjectArray<JobQueue*> m_perThreadJobQueues;
+	btAlignedObjectArray<ThreadLocalStorage> m_threadLocalStorage;
+	btSpinMutex m_antiNestingLock;  // prevent nested parallel-for
+	btClock m_clock;
+	int m_numThreads;
+	int m_numWorkerThreads;
+	int m_numActiveJobQueues;
+	int m_maxNumThreads;
+	int m_numJobs;
+	static const int kFirstWorkerThreadId = 1;
+
+public:
+	btTaskSchedulerDefault() : btITaskScheduler("ThreadSupport")
+	{
+		m_threadSupport = NULL;
+		m_workerDirective = NULL;
+	}
+
+	virtual ~btTaskSchedulerDefault()
+	{
+		waitForWorkersToSleep();
+
+		for (int i = 0; i < m_jobQueues.size(); ++i)
+		{
+			m_jobQueues[i].exit();
+		}
+
+		if (m_threadSupport)
+		{
+			delete m_threadSupport;
+			m_threadSupport = NULL;
+		}
+		if (m_workerDirective)
+		{
+			btAlignedFree(m_workerDirective);
+			m_workerDirective = NULL;
+		}
+	}
+
+	void init()
+	{
+		btThreadSupportInterface::ConstructionInfo constructionInfo("TaskScheduler", WorkerThreadFunc);
+		m_threadSupport = btThreadSupportInterface::create(constructionInfo);
+		m_workerDirective = static_cast<WorkerThreadDirectives*>(btAlignedAlloc(sizeof(*m_workerDirective), 64));
+
+		m_numWorkerThreads = m_threadSupport->getNumWorkerThreads();
+		m_maxNumThreads = m_threadSupport->getNumWorkerThreads() + 1;
+		m_numThreads = m_maxNumThreads;
+		// ideal to have one job queue for each physical processor (except for the main thread which needs no queue)
+		int numThreadsPerQueue = m_threadSupport->getLogicalToPhysicalCoreRatio();
+		int numJobQueues = (numThreadsPerQueue == 1) ? (m_maxNumThreads - 1) : (m_maxNumThreads / numThreadsPerQueue);
+		m_jobQueues.resize(numJobQueues);
+		m_numActiveJobQueues = numJobQueues;
+		for (int i = 0; i < m_jobQueues.size(); ++i)
+		{
+			m_jobQueues[i].init(m_threadSupport, &m_jobQueues);
+		}
+		m_perThreadJobQueues.resize(m_numThreads);
+		for (int i = 0; i < m_numThreads; i++)
+		{
+			JobQueue* jq = NULL;
+			// only worker threads get a job queue
+			if (i > 0)
+			{
+				if (numThreadsPerQueue == 1)
+				{
+					// one queue per worker thread
+					jq = &m_jobQueues[i - kFirstWorkerThreadId];
+				}
+				else
+				{
+					// 2 threads share each queue
+					jq = &m_jobQueues[i / numThreadsPerQueue];
+				}
+			}
+			m_perThreadJobQueues[i] = jq;
+		}
+		m_threadLocalStorage.resize(m_numThreads);
+		for (int i = 0; i < m_numThreads; i++)
+		{
+			ThreadLocalStorage& storage = m_threadLocalStorage[i];
+			storage.m_threadId = i;
+			storage.m_directive = m_workerDirective;
+			storage.m_status = WorkerThreadStatus::kSleeping;
+			storage.m_cooldownTime = 100;  // 100 microseconds, threads go to sleep after this long if they have nothing to do
+			storage.m_clock = &m_clock;
+			storage.m_queue = m_perThreadJobQueues[i];
+		}
+		setWorkerDirectives(WorkerThreadDirectives::kGoToSleep);  // no work for them yet
+		setNumThreads(m_threadSupport->getCacheFriendlyNumThreads());
+	}
+
+	void setWorkerDirectives(WorkerThreadDirectives::Type dir)
+	{
+		m_workerDirective->setDirectiveByRange(kFirstWorkerThreadId, m_numThreads, dir);
+	}
+
+	virtual int getMaxNumThreads() const BT_OVERRIDE
+	{
+		return m_maxNumThreads;
+	}
+
+	virtual int getNumThreads() const BT_OVERRIDE
+	{
+		return m_numThreads;
+	}
+
+	virtual void setNumThreads(int numThreads) BT_OVERRIDE
+	{
+		m_numThreads = btMax(btMin(numThreads, int(m_maxNumThreads)), 1);
+		m_numWorkerThreads = m_numThreads - 1;
+		m_numActiveJobQueues = 0;
+		// if there is at least 1 worker,
+		if (m_numWorkerThreads > 0)
+		{
+			// re-setup job stealing between queues to avoid attempting to steal from an inactive job queue
+			JobQueue* lastActiveContext = m_perThreadJobQueues[m_numThreads - 1];
+			int iLastActiveContext = lastActiveContext - &m_jobQueues[0];
+			m_numActiveJobQueues = iLastActiveContext + 1;
+			for (int i = 0; i < m_jobQueues.size(); ++i)
+			{
+				m_jobQueues[i].setupJobStealing(&m_jobQueues, m_numActiveJobQueues);
+			}
+		}
+		m_workerDirective->setDirectiveByRange(m_numThreads, BT_MAX_THREAD_COUNT, WorkerThreadDirectives::kGoToSleep);
+	}
+
+	void waitJobs()
+	{
+		BT_PROFILE("waitJobs");
+		// have the main thread work until the job queues are empty
+		int numMainThreadJobsFinished = 0;
+		for (int i = 0; i < m_numActiveJobQueues; ++i)
+		{
+			while (IJob* job = m_jobQueues[i].consumeJob())
+			{
+				job->executeJob(0);
+				numMainThreadJobsFinished++;
+			}
+		}
+
+		// done with jobs for now, tell workers to rest (but not sleep)
+		setWorkerDirectives(WorkerThreadDirectives::kStayAwakeButIdle);
+
+		btU64 clockStart = m_clock.getTimeMicroseconds();
+		// wait for workers to finish any jobs in progress
+		while (true)
+		{
+			int numWorkerJobsFinished = 0;
+			for (int iThread = kFirstWorkerThreadId; iThread < m_numThreads; ++iThread)
+			{
+				ThreadLocalStorage* storage = &m_threadLocalStorage[iThread];
+				storage->m_mutex.lock();
+				numWorkerJobsFinished += storage->m_numJobsFinished;
+				storage->m_mutex.unlock();
+			}
+			if (numWorkerJobsFinished + numMainThreadJobsFinished == m_numJobs)
+			{
+				break;
+			}
+			btU64 timeElapsed = m_clock.getTimeMicroseconds() - clockStart;
+			btAssert(timeElapsed < 1000);
+			if (timeElapsed > 100000)
+			{
+				break;
+			}
+			btSpinPause();
+		}
+	}
+
+	void wakeWorkers(int numWorkersToWake)
+	{
+		BT_PROFILE("wakeWorkers");
+		btAssert(m_workerDirective->getDirective(1) == WorkerThreadDirectives::kScanForJobs);
+		int numDesiredWorkers = btMin(numWorkersToWake, m_numWorkerThreads);
+		int numActiveWorkers = 0;
+		for (int iWorker = 0; iWorker < m_numWorkerThreads; ++iWorker)
+		{
+			// note this count of active workers is not necessarily totally reliable, because a worker thread could be
+			// just about to put itself to sleep. So we may on occasion fail to wake up all the workers. It should be rare.
+			ThreadLocalStorage& storage = m_threadLocalStorage[kFirstWorkerThreadId + iWorker];
+			if (storage.m_status != WorkerThreadStatus::kSleeping)
+			{
+				numActiveWorkers++;
+			}
+		}
+		for (int iWorker = 0; iWorker < m_numWorkerThreads && numActiveWorkers < numDesiredWorkers; ++iWorker)
+		{
+			ThreadLocalStorage& storage = m_threadLocalStorage[kFirstWorkerThreadId + iWorker];
+			if (storage.m_status == WorkerThreadStatus::kSleeping)
+			{
+				m_threadSupport->runTask(iWorker, &storage);
+				numActiveWorkers++;
+			}
+		}
+	}
+
+	void waitForWorkersToSleep()
+	{
+		BT_PROFILE("waitForWorkersToSleep");
+		setWorkerDirectives(WorkerThreadDirectives::kGoToSleep);
+		m_threadSupport->waitForAllTasks();
+		for (int i = kFirstWorkerThreadId; i < m_numThreads; i++)
+		{
+			ThreadLocalStorage& storage = m_threadLocalStorage[i];
+			btAssert(storage.m_status == WorkerThreadStatus::kSleeping);
+		}
+	}
+
+	virtual void sleepWorkerThreadsHint() BT_OVERRIDE
+	{
+		BT_PROFILE("sleepWorkerThreadsHint");
+		// hint the task scheduler that we may not be using these threads for a little while
+		setWorkerDirectives(WorkerThreadDirectives::kGoToSleep);
+	}
+
+	void prepareWorkerThreads()
+	{
+		for (int i = kFirstWorkerThreadId; i < m_numThreads; ++i)
+		{
+			ThreadLocalStorage& storage = m_threadLocalStorage[i];
+			storage.m_mutex.lock();
+			storage.m_numJobsFinished = 0;
+			storage.m_mutex.unlock();
+		}
+		setWorkerDirectives(WorkerThreadDirectives::kScanForJobs);
+	}
+
+	virtual void parallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelFor_ThreadSupport");
+		btAssert(iEnd >= iBegin);
+		btAssert(grainSize >= 1);
+		int iterationCount = iEnd - iBegin;
+		if (iterationCount > grainSize && m_numWorkerThreads > 0 && m_antiNestingLock.tryLock())
+		{
+			typedef ParallelForJob JobType;
+			int jobCount = (iterationCount + grainSize - 1) / grainSize;
+			m_numJobs = jobCount;
+			btAssert(jobCount >= 2);  // need more than one job for multithreading
+			int jobSize = sizeof(JobType);
+
+			for (int i = 0; i < m_numActiveJobQueues; ++i)
+			{
+				m_jobQueues[i].clearQueue(jobCount, jobSize);
+			}
+			// prepare worker threads for incoming work
+			prepareWorkerThreads();
+			// submit all of the jobs
+			int iJob = 0;
+			int iThread = kFirstWorkerThreadId;  // first worker thread
+			for (int i = iBegin; i < iEnd; i += grainSize)
+			{
+				btAssert(iJob < jobCount);
+				int iE = btMin(i + grainSize, iEnd);
+				JobQueue* jq = m_perThreadJobQueues[iThread];
+				btAssert(jq);
+				btAssert((jq - &m_jobQueues[0]) < m_numActiveJobQueues);
+				void* jobMem = jq->allocJobMem(jobSize);
+				JobType* job = new (jobMem) ParallelForJob(i, iE, body);  // placement new
+				jq->submitJob(job);
+				iJob++;
+				iThread++;
+				if (iThread >= m_numThreads)
+				{
+					iThread = kFirstWorkerThreadId;  // first worker thread
+				}
+			}
+			wakeWorkers(jobCount - 1);
+
+			// put the main thread to work on emptying the job queue and then wait for all workers to finish
+			waitJobs();
+			m_antiNestingLock.unlock();
+		}
+		else
+		{
+			BT_PROFILE("parallelFor_mainThread");
+			// just run on main thread
+			body.forLoop(iBegin, iEnd);
+		}
+	}
+	virtual btScalar parallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelSum_ThreadSupport");
+		btAssert(iEnd >= iBegin);
+		btAssert(grainSize >= 1);
+		int iterationCount = iEnd - iBegin;
+		if (iterationCount > grainSize && m_numWorkerThreads > 0 && m_antiNestingLock.tryLock())
+		{
+			typedef ParallelSumJob JobType;
+			int jobCount = (iterationCount + grainSize - 1) / grainSize;
+			m_numJobs = jobCount;
+			btAssert(jobCount >= 2);  // need more than one job for multithreading
+			int jobSize = sizeof(JobType);
+			for (int i = 0; i < m_numActiveJobQueues; ++i)
+			{
+				m_jobQueues[i].clearQueue(jobCount, jobSize);
+			}
+
+			// initialize summation
+			for (int iThread = 0; iThread < m_numThreads; ++iThread)
+			{
+				m_threadLocalStorage[iThread].m_sumResult = btScalar(0);
+			}
+
+			// prepare worker threads for incoming work
+			prepareWorkerThreads();
+			// submit all of the jobs
+			int iJob = 0;
+			int iThread = kFirstWorkerThreadId;  // first worker thread
+			for (int i = iBegin; i < iEnd; i += grainSize)
+			{
+				btAssert(iJob < jobCount);
+				int iE = btMin(i + grainSize, iEnd);
+				JobQueue* jq = m_perThreadJobQueues[iThread];
+				btAssert(jq);
+				btAssert((jq - &m_jobQueues[0]) < m_numActiveJobQueues);
+				void* jobMem = jq->allocJobMem(jobSize);
+				JobType* job = new (jobMem) ParallelSumJob(i, iE, body, &m_threadLocalStorage[0]);  // placement new
+				jq->submitJob(job);
+				iJob++;
+				iThread++;
+				if (iThread >= m_numThreads)
+				{
+					iThread = kFirstWorkerThreadId;  // first worker thread
+				}
+			}
+			wakeWorkers(jobCount - 1);
+
+			// put the main thread to work on emptying the job queue and then wait for all workers to finish
+			waitJobs();
+
+			// add up all the thread sums
+			btScalar sum = btScalar(0);
+			for (int iThread = 0; iThread < m_numThreads; ++iThread)
+			{
+				sum += m_threadLocalStorage[iThread].m_sumResult;
+			}
+			m_antiNestingLock.unlock();
+			return sum;
+		}
+		else
+		{
+			BT_PROFILE("parallelSum_mainThread");
+			// just run on main thread
+			return body.sumLoop(iBegin, iEnd);
+		}
+	}
+};
+
+btITaskScheduler* btCreateDefaultTaskScheduler()
+{
+	btTaskSchedulerDefault* ts = new btTaskSchedulerDefault();
+	ts->init();
+	return ts;
+}
+
+#else  // #if BT_THREADSAFE
+
+btITaskScheduler* btCreateDefaultTaskScheduler()
+{
+	return NULL;
+}
+
+#endif  // #else // #if BT_THREADSAFE
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportInterface.h b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportInterface.h
new file mode 100644
index 0000000..1fe4933
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportInterface.h
@@ -0,0 +1,64 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2018 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_THREAD_SUPPORT_INTERFACE_H
+#define BT_THREAD_SUPPORT_INTERFACE_H
+
+class btCriticalSection
+{
+public:
+	btCriticalSection() {}
+	virtual ~btCriticalSection() {}
+
+	virtual void lock() = 0;
+	virtual void unlock() = 0;
+};
+
+class btThreadSupportInterface
+{
+public:
+	virtual ~btThreadSupportInterface() {}
+
+	virtual int getNumWorkerThreads() const = 0;            // number of worker threads (total number of logical processors - 1)
+	virtual int getCacheFriendlyNumThreads() const = 0;     // the number of logical processors sharing a single L3 cache
+	virtual int getLogicalToPhysicalCoreRatio() const = 0;  // the number of logical processors per physical processor (usually 1 or 2)
+	virtual void runTask(int threadIndex, void* userData) = 0;
+	virtual void waitForAllTasks() = 0;
+
+	virtual btCriticalSection* createCriticalSection() = 0;
+	virtual void deleteCriticalSection(btCriticalSection* criticalSection) = 0;
+
+	typedef void (*ThreadFunc)(void* userPtr);
+
+	struct ConstructionInfo
+	{
+		ConstructionInfo(const char* uniqueName,
+						 ThreadFunc userThreadFunc,
+						 int threadStackSize = 65535)
+			: m_uniqueName(uniqueName),
+			  m_userThreadFunc(userThreadFunc),
+			  m_threadStackSize(threadStackSize)
+		{
+		}
+
+		const char* m_uniqueName;
+		ThreadFunc m_userThreadFunc;
+		int m_threadStackSize;
+	};
+
+	static btThreadSupportInterface* create(const ConstructionInfo& info);
+};
+
+#endif  //BT_THREAD_SUPPORT_INTERFACE_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp
new file mode 100644
index 0000000..a03f6dc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp
@@ -0,0 +1,353 @@
+
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2018 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#if BT_THREADSAFE && !defined(_WIN32)
+
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btThreads.h"
+#include "LinearMath/btMinMax.h"
+#include "btThreadSupportInterface.h"
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600  //for definition of pthread_barrier_t, see http://pages.cs.wisc.edu/~travitch/pthreads_primer.html
+#endif                     //_XOPEN_SOURCE
+#include <pthread.h>
+#include <semaphore.h>
+#include <unistd.h>  //for sysconf
+
+///
+/// getNumHardwareThreads()
+///
+///
+/// https://stackoverflow.com/questions/150355/programmatically-find-the-number-of-cores-on-a-machine
+///
+#if __cplusplus >= 201103L
+
+#include <thread>
+
+int btGetNumHardwareThreads()
+{
+	return btMax(1u, btMin(BT_MAX_THREAD_COUNT, std::thread::hardware_concurrency()));
+}
+
+#else
+
+int btGetNumHardwareThreads()
+{
+	return btMax(1, btMin<int>(BT_MAX_THREAD_COUNT, sysconf(_SC_NPROCESSORS_ONLN)));
+}
+
+#endif
+
+// btThreadSupportPosix helps to initialize/shutdown libspe2, start/stop SPU tasks and communication
+class btThreadSupportPosix : public btThreadSupportInterface
+{
+public:
+	struct btThreadStatus
+	{
+		int m_taskId;
+		int m_commandId;
+		int m_status;
+
+		ThreadFunc m_userThreadFunc;
+		void* m_userPtr;  //for taskDesc etc
+
+		pthread_t thread;
+		//each tread will wait until this signal to start its work
+		sem_t* startSemaphore;
+		btCriticalSection* m_cs;
+		// this is a copy of m_mainSemaphore,
+		//each tread will signal once it is finished with its work
+		sem_t* m_mainSemaphore;
+		unsigned long threadUsed;
+	};
+
+private:
+	typedef unsigned long long UINT64;
+
+	btAlignedObjectArray<btThreadStatus> m_activeThreadStatus;
+	// m_mainSemaphoresemaphore will signal, if and how many threads are finished with their work
+	sem_t* m_mainSemaphore;
+	int m_numThreads;
+	UINT64 m_startedThreadsMask;
+	void startThreads(const ConstructionInfo& threadInfo);
+	void stopThreads();
+	int waitForResponse();
+	btCriticalSection* m_cs;
+public:
+	btThreadSupportPosix(const ConstructionInfo& threadConstructionInfo);
+	virtual ~btThreadSupportPosix();
+
+	virtual int getNumWorkerThreads() const BT_OVERRIDE { return m_numThreads; }
+	// TODO: return the number of logical processors sharing the first L3 cache
+	virtual int getCacheFriendlyNumThreads() const BT_OVERRIDE { return m_numThreads + 1; }
+	// TODO: detect if CPU has hyperthreading enabled
+	virtual int getLogicalToPhysicalCoreRatio() const BT_OVERRIDE { return 1; }
+
+	virtual void runTask(int threadIndex, void* userData) BT_OVERRIDE;
+	virtual void waitForAllTasks() BT_OVERRIDE;
+
+	virtual btCriticalSection* createCriticalSection() BT_OVERRIDE;
+	virtual void deleteCriticalSection(btCriticalSection* criticalSection) BT_OVERRIDE;
+};
+
+#define checkPThreadFunction(returnValue)                                                                 \
+	if (0 != returnValue)                                                                                 \
+	{                                                                                                     \
+		printf("PThread problem at line %i in file %s: %i %d\n", __LINE__, __FILE__, returnValue, errno); \
+	}
+
+// The number of threads should be equal to the number of available cores
+// Todo: each worker should be linked to a single core, using SetThreadIdealProcessor.
+
+btThreadSupportPosix::btThreadSupportPosix(const ConstructionInfo& threadConstructionInfo)
+{
+	m_cs = createCriticalSection();
+	startThreads(threadConstructionInfo);
+}
+
+// cleanup/shutdown Libspe2
+btThreadSupportPosix::~btThreadSupportPosix()
+{
+	stopThreads();
+	deleteCriticalSection(m_cs);
+	m_cs=0;
+}
+
+#if (defined(__APPLE__))
+#define NAMED_SEMAPHORES
+#endif
+
+static sem_t* createSem(const char* baseName)
+{
+	static int semCount = 0;
+#ifdef NAMED_SEMAPHORES
+	/// Named semaphore begin
+	char name[32];
+	snprintf(name, 32, "/%8.s-%4.d-%4.4d", baseName, getpid(), semCount++);
+	sem_t* tempSem = sem_open(name, O_CREAT, 0600, 0);
+
+	if (tempSem != reinterpret_cast<sem_t*>(SEM_FAILED))
+	{
+		//        printf("Created \"%s\" Semaphore %p\n", name, tempSem);
+	}
+	else
+	{
+		//printf("Error creating Semaphore %d\n", errno);
+		exit(-1);
+	}
+	/// Named semaphore end
+#else
+	sem_t* tempSem = new sem_t;
+	checkPThreadFunction(sem_init(tempSem, 0, 0));
+#endif
+	return tempSem;
+}
+
+static void destroySem(sem_t* semaphore)
+{
+#ifdef NAMED_SEMAPHORES
+	checkPThreadFunction(sem_close(semaphore));
+#else
+	checkPThreadFunction(sem_destroy(semaphore));
+	delete semaphore;
+#endif
+}
+
+static void* threadFunction(void* argument)
+{
+	btThreadSupportPosix::btThreadStatus* status = (btThreadSupportPosix::btThreadStatus*)argument;
+
+	while (1)
+	{
+		checkPThreadFunction(sem_wait(status->startSemaphore));
+		void* userPtr = status->m_userPtr;
+
+		if (userPtr)
+		{
+			btAssert(status->m_status);
+			status->m_userThreadFunc(userPtr);
+			status->m_cs->lock();
+			status->m_status = 2;
+			status->m_cs->unlock();
+			checkPThreadFunction(sem_post(status->m_mainSemaphore));
+			status->threadUsed++;
+		}
+		else
+		{
+			//exit Thread
+			status->m_cs->lock();
+			status->m_status = 3;
+			status->m_cs->unlock();
+			checkPThreadFunction(sem_post(status->m_mainSemaphore));
+			break;
+		}
+	}
+
+	return 0;
+}
+
+///send messages to SPUs
+void btThreadSupportPosix::runTask(int threadIndex, void* userData)
+{
+	///we should spawn an SPU task here, and in 'waitForResponse' it should wait for response of the (one of) the first tasks that finished
+	btThreadStatus& threadStatus = m_activeThreadStatus[threadIndex];
+	btAssert(threadIndex >= 0);
+	btAssert(threadIndex < m_activeThreadStatus.size());
+	threadStatus.m_cs = m_cs;
+	threadStatus.m_commandId = 1;
+	threadStatus.m_status = 1;
+	threadStatus.m_userPtr = userData;
+	m_startedThreadsMask |= UINT64(1) << threadIndex;
+
+	// fire event to start new task
+	checkPThreadFunction(sem_post(threadStatus.startSemaphore));
+}
+
+///check for messages from SPUs
+int btThreadSupportPosix::waitForResponse()
+{
+	///We should wait for (one of) the first tasks to finish (or other SPU messages), and report its response
+	///A possible response can be 'yes, SPU handled it', or 'no, please do a PPU fallback'
+
+	btAssert(m_activeThreadStatus.size());
+
+	// wait for any of the threads to finish
+	checkPThreadFunction(sem_wait(m_mainSemaphore));
+	// get at least one thread which has finished
+	size_t last = -1;
+
+	for (size_t t = 0; t < size_t(m_activeThreadStatus.size()); ++t)
+	{
+		m_cs->lock();
+		bool hasFinished = (2 == m_activeThreadStatus[t].m_status);
+		m_cs->unlock(); 
+		if (hasFinished)
+		{
+			last = t;
+			break;
+		}
+	}
+
+	btThreadStatus& threadStatus = m_activeThreadStatus[last];
+
+	btAssert(threadStatus.m_status > 1);
+	threadStatus.m_status = 0;
+
+	// need to find an active spu
+	btAssert(last >= 0);
+	m_startedThreadsMask &= ~(UINT64(1) << last);
+
+	return last;
+}
+
+void btThreadSupportPosix::waitForAllTasks()
+{
+	while (m_startedThreadsMask)
+	{
+		waitForResponse();
+	}
+}
+
+void btThreadSupportPosix::startThreads(const ConstructionInfo& threadConstructionInfo)
+{
+	m_numThreads = btGetNumHardwareThreads() - 1;  // main thread exists already
+	m_activeThreadStatus.resize(m_numThreads);
+	m_startedThreadsMask = 0;
+
+	m_mainSemaphore = createSem("main");
+	//checkPThreadFunction(sem_wait(mainSemaphore));
+
+	for (int i = 0; i < m_numThreads; i++)
+	{
+		btThreadStatus& threadStatus = m_activeThreadStatus[i];
+		threadStatus.startSemaphore = createSem("threadLocal");
+		threadStatus.m_userPtr = 0;
+		threadStatus.m_cs = m_cs;
+		threadStatus.m_taskId = i;
+		threadStatus.m_commandId = 0;
+		threadStatus.m_status = 0;
+		threadStatus.m_mainSemaphore = m_mainSemaphore;
+		threadStatus.m_userThreadFunc = threadConstructionInfo.m_userThreadFunc;
+		threadStatus.threadUsed = 0;
+		checkPThreadFunction(pthread_create(&threadStatus.thread, NULL, &threadFunction, (void*)&threadStatus));
+
+	}
+}
+
+///tell the task scheduler we are done with the SPU tasks
+void btThreadSupportPosix::stopThreads()
+{
+	for (size_t t = 0; t < size_t(m_activeThreadStatus.size()); ++t)
+	{
+		btThreadStatus& threadStatus = m_activeThreadStatus[t];
+
+		threadStatus.m_userPtr = 0;
+		checkPThreadFunction(sem_post(threadStatus.startSemaphore));
+		checkPThreadFunction(sem_wait(m_mainSemaphore));
+
+		checkPThreadFunction(pthread_join(threadStatus.thread, 0));
+		destroySem(threadStatus.startSemaphore);
+	}
+	destroySem(m_mainSemaphore);
+	m_activeThreadStatus.clear();
+}
+
+class btCriticalSectionPosix : public btCriticalSection
+{
+	pthread_mutex_t m_mutex;
+
+public:
+	btCriticalSectionPosix()
+	{
+		pthread_mutex_init(&m_mutex, NULL);
+	}
+	virtual ~btCriticalSectionPosix()
+	{
+		pthread_mutex_destroy(&m_mutex);
+	}
+
+	virtual void lock()
+	{
+		pthread_mutex_lock(&m_mutex);
+	}
+	virtual void unlock()
+	{
+		pthread_mutex_unlock(&m_mutex);
+	}
+};
+
+btCriticalSection* btThreadSupportPosix::createCriticalSection()
+{
+	return new btCriticalSectionPosix();
+}
+
+void btThreadSupportPosix::deleteCriticalSection(btCriticalSection* cs)
+{
+	delete cs;
+}
+
+btThreadSupportInterface* btThreadSupportInterface::create(const ConstructionInfo& info)
+{
+	return new btThreadSupportPosix(info);
+}
+
+#endif  // BT_THREADSAFE && !defined( _WIN32 )
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportWin32.cpp b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
new file mode 100644
index 0000000..5010cca
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
@@ -0,0 +1,457 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2018 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#if defined(_WIN32) && BT_THREADSAFE
+
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btMinMax.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btThreads.h"
+#include "btThreadSupportInterface.h"
+#include <windows.h>
+#include <stdio.h>
+
+struct btProcessorInfo
+{
+	int numLogicalProcessors;
+	int numCores;
+	int numNumaNodes;
+	int numL1Cache;
+	int numL2Cache;
+	int numL3Cache;
+	int numPhysicalPackages;
+	static const int maxNumTeamMasks = 32;
+	int numTeamMasks;
+	UINT64 processorTeamMasks[maxNumTeamMasks];
+};
+
+UINT64 getProcessorTeamMask(const btProcessorInfo& procInfo, int procId)
+{
+	UINT64 procMask = UINT64(1) << procId;
+	for (int i = 0; i < procInfo.numTeamMasks; ++i)
+	{
+		if (procMask & procInfo.processorTeamMasks[i])
+		{
+			return procInfo.processorTeamMasks[i];
+		}
+	}
+	return 0;
+}
+
+int getProcessorTeamIndex(const btProcessorInfo& procInfo, int procId)
+{
+	UINT64 procMask = UINT64(1) << procId;
+	for (int i = 0; i < procInfo.numTeamMasks; ++i)
+	{
+		if (procMask & procInfo.processorTeamMasks[i])
+		{
+			return i;
+		}
+	}
+	return -1;
+}
+
+int countSetBits(ULONG64 bits)
+{
+	int count = 0;
+	while (bits)
+	{
+		if (bits & 1)
+		{
+			count++;
+		}
+		bits >>= 1;
+	}
+	return count;
+}
+
+typedef BOOL(WINAPI* Pfn_GetLogicalProcessorInformation)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
+
+void getProcessorInformation(btProcessorInfo* procInfo)
+{
+	memset(procInfo, 0, sizeof(*procInfo));
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+	// Can't dlopen libraries on UWP.
+	return;
+#else
+	Pfn_GetLogicalProcessorInformation getLogicalProcInfo =
+		(Pfn_GetLogicalProcessorInformation)GetProcAddress(GetModuleHandle(TEXT("kernel32")), "GetLogicalProcessorInformation");
+	if (getLogicalProcInfo == NULL)
+	{
+		// no info
+		return;
+	}
+	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION buf = NULL;
+	DWORD bufSize = 0;
+	while (true)
+	{
+		if (getLogicalProcInfo(buf, &bufSize))
+		{
+			break;
+		}
+		else
+		{
+			if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+			{
+				if (buf)
+				{
+					free(buf);
+				}
+				buf = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION)malloc(bufSize);
+			}
+		}
+	}
+
+	int len = bufSize / sizeof(*buf);
+	for (int i = 0; i < len; ++i)
+	{
+		PSYSTEM_LOGICAL_PROCESSOR_INFORMATION info = buf + i;
+		switch (info->Relationship)
+		{
+			case RelationNumaNode:
+				procInfo->numNumaNodes++;
+				break;
+
+			case RelationProcessorCore:
+				procInfo->numCores++;
+				procInfo->numLogicalProcessors += countSetBits(info->ProcessorMask);
+				break;
+
+			case RelationCache:
+				if (info->Cache.Level == 1)
+				{
+					procInfo->numL1Cache++;
+				}
+				else if (info->Cache.Level == 2)
+				{
+					procInfo->numL2Cache++;
+				}
+				else if (info->Cache.Level == 3)
+				{
+					procInfo->numL3Cache++;
+					// processors that share L3 cache are considered to be on the same team
+					// because they can more easily work together on the same data.
+					// Large performance penalties will occur if 2 or more threads from different
+					// teams attempt to frequently read and modify the same cache lines.
+					//
+					// On the AMD Ryzen 7 CPU for example, the 8 cores on the CPU are split into
+					// 2 CCX units of 4 cores each. Each CCX has a separate L3 cache, so if both
+					// CCXs are operating on the same data, many cycles will be spent keeping the
+					// two caches coherent.
+					if (procInfo->numTeamMasks < btProcessorInfo::maxNumTeamMasks)
+					{
+						procInfo->processorTeamMasks[procInfo->numTeamMasks] = info->ProcessorMask;
+						procInfo->numTeamMasks++;
+					}
+				}
+				break;
+
+			case RelationProcessorPackage:
+				procInfo->numPhysicalPackages++;
+				break;
+		}
+	}
+	free(buf);
+#endif
+}
+
+///btThreadSupportWin32 helps to initialize/shutdown libspe2, start/stop SPU tasks and communication
+class btThreadSupportWin32 : public btThreadSupportInterface
+{
+public:
+	struct btThreadStatus
+	{
+		int m_taskId;
+		int m_commandId;
+		int m_status;
+
+		ThreadFunc m_userThreadFunc;
+		void* m_userPtr;  //for taskDesc etc
+
+		void* m_threadHandle;  //this one is calling 'Win32ThreadFunc'
+
+		void* m_eventStartHandle;
+		char m_eventStartHandleName[32];
+
+		void* m_eventCompleteHandle;
+		char m_eventCompleteHandleName[32];
+	};
+
+private:
+	btAlignedObjectArray<btThreadStatus> m_activeThreadStatus;
+	btAlignedObjectArray<void*> m_completeHandles;
+	int m_numThreads;
+	DWORD_PTR m_startedThreadMask;
+	btProcessorInfo m_processorInfo;
+
+	void startThreads(const ConstructionInfo& threadInfo);
+	void stopThreads();
+	int waitForResponse();
+
+public:
+	btThreadSupportWin32(const ConstructionInfo& threadConstructionInfo);
+	virtual ~btThreadSupportWin32();
+
+	virtual int getNumWorkerThreads() const BT_OVERRIDE { return m_numThreads; }
+	virtual int getCacheFriendlyNumThreads() const BT_OVERRIDE { return countSetBits(m_processorInfo.processorTeamMasks[0]); }
+	virtual int getLogicalToPhysicalCoreRatio() const BT_OVERRIDE { return m_processorInfo.numLogicalProcessors / m_processorInfo.numCores; }
+
+	virtual void runTask(int threadIndex, void* userData) BT_OVERRIDE;
+	virtual void waitForAllTasks() BT_OVERRIDE;
+
+	virtual btCriticalSection* createCriticalSection() BT_OVERRIDE;
+	virtual void deleteCriticalSection(btCriticalSection* criticalSection) BT_OVERRIDE;
+};
+
+btThreadSupportWin32::btThreadSupportWin32(const ConstructionInfo& threadConstructionInfo)
+{
+	startThreads(threadConstructionInfo);
+}
+
+btThreadSupportWin32::~btThreadSupportWin32()
+{
+	stopThreads();
+}
+
+DWORD WINAPI win32threadStartFunc(LPVOID lpParam)
+{
+	btThreadSupportWin32::btThreadStatus* status = (btThreadSupportWin32::btThreadStatus*)lpParam;
+
+	while (1)
+	{
+		WaitForSingleObject(status->m_eventStartHandle, INFINITE);
+		void* userPtr = status->m_userPtr;
+
+		if (userPtr)
+		{
+			btAssert(status->m_status);
+			status->m_userThreadFunc(userPtr);
+			status->m_status = 2;
+			SetEvent(status->m_eventCompleteHandle);
+		}
+		else
+		{
+			//exit Thread
+			status->m_status = 3;
+			printf("Thread with taskId %i with handle %p exiting\n", status->m_taskId, status->m_threadHandle);
+			SetEvent(status->m_eventCompleteHandle);
+			break;
+		}
+	}
+	printf("Thread TERMINATED\n");
+	return 0;
+}
+
+void btThreadSupportWin32::runTask(int threadIndex, void* userData)
+{
+	btThreadStatus& threadStatus = m_activeThreadStatus[threadIndex];
+	btAssert(threadIndex >= 0);
+	btAssert(int(threadIndex) < m_activeThreadStatus.size());
+
+	threadStatus.m_commandId = 1;
+	threadStatus.m_status = 1;
+	threadStatus.m_userPtr = userData;
+	m_startedThreadMask |= DWORD_PTR(1) << threadIndex;
+
+	///fire event to start new task
+	SetEvent(threadStatus.m_eventStartHandle);
+}
+
+int btThreadSupportWin32::waitForResponse()
+{
+	btAssert(m_activeThreadStatus.size());
+
+	int last = -1;
+	DWORD res = WaitForMultipleObjects(m_completeHandles.size(), &m_completeHandles[0], FALSE, INFINITE);
+	btAssert(res != WAIT_FAILED);
+	last = res - WAIT_OBJECT_0;
+
+	btThreadStatus& threadStatus = m_activeThreadStatus[last];
+	btAssert(threadStatus.m_threadHandle);
+	btAssert(threadStatus.m_eventCompleteHandle);
+
+	//WaitForSingleObject(threadStatus.m_eventCompleteHandle, INFINITE);
+	btAssert(threadStatus.m_status > 1);
+	threadStatus.m_status = 0;
+
+	///need to find an active spu
+	btAssert(last >= 0);
+	m_startedThreadMask &= ~(DWORD_PTR(1) << last);
+
+	return last;
+}
+
+void btThreadSupportWin32::waitForAllTasks()
+{
+	while (m_startedThreadMask)
+	{
+		waitForResponse();
+	}
+}
+
+void btThreadSupportWin32::startThreads(const ConstructionInfo& threadConstructionInfo)
+{
+	static int uniqueId = 0;
+	uniqueId++;
+	btProcessorInfo& procInfo = m_processorInfo;
+	getProcessorInformation(&procInfo);
+	DWORD_PTR dwProcessAffinityMask = 0;
+	DWORD_PTR dwSystemAffinityMask = 0;
+	if (!GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask))
+	{
+		dwProcessAffinityMask = 0;
+	}
+	///The number of threads should be equal to the number of available cores - 1
+	m_numThreads = btMin(procInfo.numLogicalProcessors, int(BT_MAX_THREAD_COUNT)) - 1;  // cap to max thread count (-1 because main thread already exists)
+
+	m_activeThreadStatus.resize(m_numThreads);
+	m_completeHandles.resize(m_numThreads);
+	m_startedThreadMask = 0;
+
+	// set main thread affinity
+	if (DWORD_PTR mask = dwProcessAffinityMask & getProcessorTeamMask(procInfo, 0))
+	{
+		SetThreadAffinityMask(GetCurrentThread(), mask);
+		SetThreadIdealProcessor(GetCurrentThread(), 0);
+	}
+
+	for (int i = 0; i < m_numThreads; i++)
+	{
+		printf("starting thread %d\n", i);
+
+		btThreadStatus& threadStatus = m_activeThreadStatus[i];
+
+		LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL;
+		SIZE_T dwStackSize = threadConstructionInfo.m_threadStackSize;
+		LPTHREAD_START_ROUTINE lpStartAddress = &win32threadStartFunc;
+		LPVOID lpParameter = &threadStatus;
+		DWORD dwCreationFlags = 0;
+		LPDWORD lpThreadId = 0;
+
+		threadStatus.m_userPtr = 0;
+
+		sprintf(threadStatus.m_eventStartHandleName, "es%.8s%d%d", threadConstructionInfo.m_uniqueName, uniqueId, i);
+		threadStatus.m_eventStartHandle = CreateEventA(0, false, false, threadStatus.m_eventStartHandleName);
+
+		sprintf(threadStatus.m_eventCompleteHandleName, "ec%.8s%d%d", threadConstructionInfo.m_uniqueName, uniqueId, i);
+		threadStatus.m_eventCompleteHandle = CreateEventA(0, false, false, threadStatus.m_eventCompleteHandleName);
+
+		m_completeHandles[i] = threadStatus.m_eventCompleteHandle;
+
+		HANDLE handle = CreateThread(lpThreadAttributes, dwStackSize, lpStartAddress, lpParameter, dwCreationFlags, lpThreadId);
+		//SetThreadPriority( handle, THREAD_PRIORITY_HIGHEST );
+		// highest priority -- can cause erratic performance when numThreads > numCores
+		//                     we don't want worker threads to be higher priority than the main thread or the main thread could get
+		//                     totally shut out and unable to tell the workers to stop
+		//SetThreadPriority( handle, THREAD_PRIORITY_BELOW_NORMAL );
+
+		{
+			int processorId = i + 1;  // leave processor 0 for main thread
+			DWORD_PTR teamMask = getProcessorTeamMask(procInfo, processorId);
+			if (teamMask)
+			{
+				// bind each thread to only execute on processors of it's assigned team
+				//  - for single-socket Intel x86 CPUs this has no effect (only a single, shared L3 cache so there is only 1 team)
+				//  - for multi-socket Intel this will keep threads from migrating from one socket to another
+				//  - for AMD Ryzen this will keep threads from migrating from one CCX to another
+				DWORD_PTR mask = teamMask & dwProcessAffinityMask;
+				if (mask)
+				{
+					SetThreadAffinityMask(handle, mask);
+				}
+			}
+			SetThreadIdealProcessor(handle, processorId);
+		}
+
+		threadStatus.m_taskId = i;
+		threadStatus.m_commandId = 0;
+		threadStatus.m_status = 0;
+		threadStatus.m_threadHandle = handle;
+		threadStatus.m_userThreadFunc = threadConstructionInfo.m_userThreadFunc;
+
+		printf("started %s thread %d with threadHandle %p\n", threadConstructionInfo.m_uniqueName, i, handle);
+	}
+}
+
+///tell the task scheduler we are done with the SPU tasks
+void btThreadSupportWin32::stopThreads()
+{
+	for (int i = 0; i < m_activeThreadStatus.size(); i++)
+	{
+		btThreadStatus& threadStatus = m_activeThreadStatus[i];
+		if (threadStatus.m_status > 0)
+		{
+			WaitForSingleObject(threadStatus.m_eventCompleteHandle, INFINITE);
+		}
+
+		threadStatus.m_userPtr = NULL;
+		SetEvent(threadStatus.m_eventStartHandle);
+		WaitForSingleObject(threadStatus.m_eventCompleteHandle, INFINITE);
+
+		CloseHandle(threadStatus.m_eventCompleteHandle);
+		CloseHandle(threadStatus.m_eventStartHandle);
+		CloseHandle(threadStatus.m_threadHandle);
+	}
+
+	m_activeThreadStatus.clear();
+	m_completeHandles.clear();
+}
+
+class btWin32CriticalSection : public btCriticalSection
+{
+private:
+	CRITICAL_SECTION mCriticalSection;
+
+public:
+	btWin32CriticalSection()
+	{
+		InitializeCriticalSection(&mCriticalSection);
+	}
+
+	~btWin32CriticalSection()
+	{
+		DeleteCriticalSection(&mCriticalSection);
+	}
+
+	void lock()
+	{
+		EnterCriticalSection(&mCriticalSection);
+	}
+
+	void unlock()
+	{
+		LeaveCriticalSection(&mCriticalSection);
+	}
+};
+
+btCriticalSection* btThreadSupportWin32::createCriticalSection()
+{
+	unsigned char* mem = (unsigned char*)btAlignedAlloc(sizeof(btWin32CriticalSection), 16);
+	btWin32CriticalSection* cs = new (mem) btWin32CriticalSection();
+	return cs;
+}
+
+void btThreadSupportWin32::deleteCriticalSection(btCriticalSection* criticalSection)
+{
+	criticalSection->~btCriticalSection();
+	btAlignedFree(criticalSection);
+}
+
+btThreadSupportInterface* btThreadSupportInterface::create(const ConstructionInfo& info)
+{
+	return new btThreadSupportWin32(info);
+}
+
+#endif  //defined(_WIN32) && BT_THREADSAFE
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btAabbUtil2.h b/dali-physics/third-party/bullet3/src/LinearMath/btAabbUtil2.h
new file mode 100644
index 0000000..67ff479
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btAabbUtil2.h
@@ -0,0 +1,217 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_AABB_UTIL2
+#define BT_AABB_UTIL2
+
+#include "btTransform.h"
+#include "btVector3.h"
+#include "btMinMax.h"
+
+SIMD_FORCE_INLINE void AabbExpand(btVector3& aabbMin,
+								  btVector3& aabbMax,
+								  const btVector3& expansionMin,
+								  const btVector3& expansionMax)
+{
+	aabbMin = aabbMin + expansionMin;
+	aabbMax = aabbMax + expansionMax;
+}
+
+/// conservative test for overlap between two aabbs
+SIMD_FORCE_INLINE bool TestPointAgainstAabb2(const btVector3& aabbMin1, const btVector3& aabbMax1,
+											 const btVector3& point)
+{
+	bool overlap = true;
+	overlap = (aabbMin1.getX() > point.getX() || aabbMax1.getX() < point.getX()) ? false : overlap;
+	overlap = (aabbMin1.getZ() > point.getZ() || aabbMax1.getZ() < point.getZ()) ? false : overlap;
+	overlap = (aabbMin1.getY() > point.getY() || aabbMax1.getY() < point.getY()) ? false : overlap;
+	return overlap;
+}
+
+/// conservative test for overlap between two aabbs
+SIMD_FORCE_INLINE bool TestAabbAgainstAabb2(const btVector3& aabbMin1, const btVector3& aabbMax1,
+											const btVector3& aabbMin2, const btVector3& aabbMax2)
+{
+	bool overlap = true;
+	overlap = (aabbMin1.getX() > aabbMax2.getX() || aabbMax1.getX() < aabbMin2.getX()) ? false : overlap;
+	overlap = (aabbMin1.getZ() > aabbMax2.getZ() || aabbMax1.getZ() < aabbMin2.getZ()) ? false : overlap;
+	overlap = (aabbMin1.getY() > aabbMax2.getY() || aabbMax1.getY() < aabbMin2.getY()) ? false : overlap;
+	return overlap;
+}
+
+/// conservative test for overlap between triangle and aabb
+SIMD_FORCE_INLINE bool TestTriangleAgainstAabb2(const btVector3* vertices,
+												const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	const btVector3& p1 = vertices[0];
+	const btVector3& p2 = vertices[1];
+	const btVector3& p3 = vertices[2];
+
+	if (btMin(btMin(p1[0], p2[0]), p3[0]) > aabbMax[0]) return false;
+	if (btMax(btMax(p1[0], p2[0]), p3[0]) < aabbMin[0]) return false;
+
+	if (btMin(btMin(p1[2], p2[2]), p3[2]) > aabbMax[2]) return false;
+	if (btMax(btMax(p1[2], p2[2]), p3[2]) < aabbMin[2]) return false;
+
+	if (btMin(btMin(p1[1], p2[1]), p3[1]) > aabbMax[1]) return false;
+	if (btMax(btMax(p1[1], p2[1]), p3[1]) < aabbMin[1]) return false;
+	return true;
+}
+
+SIMD_FORCE_INLINE int btOutcode(const btVector3& p, const btVector3& halfExtent)
+{
+	return (p.getX() < -halfExtent.getX() ? 0x01 : 0x0) |
+		   (p.getX() > halfExtent.getX() ? 0x08 : 0x0) |
+		   (p.getY() < -halfExtent.getY() ? 0x02 : 0x0) |
+		   (p.getY() > halfExtent.getY() ? 0x10 : 0x0) |
+		   (p.getZ() < -halfExtent.getZ() ? 0x4 : 0x0) |
+		   (p.getZ() > halfExtent.getZ() ? 0x20 : 0x0);
+}
+
+SIMD_FORCE_INLINE bool btRayAabb2(const btVector3& rayFrom,
+								  const btVector3& rayInvDirection,
+								  const unsigned int raySign[3],
+								  const btVector3 bounds[2],
+								  btScalar& tmin,
+								  btScalar lambda_min,
+								  btScalar lambda_max)
+{
+	btScalar tmax, tymin, tymax, tzmin, tzmax;
+	tmin = (bounds[raySign[0]].getX() - rayFrom.getX()) * rayInvDirection.getX();
+	tmax = (bounds[1 - raySign[0]].getX() - rayFrom.getX()) * rayInvDirection.getX();
+	tymin = (bounds[raySign[1]].getY() - rayFrom.getY()) * rayInvDirection.getY();
+	tymax = (bounds[1 - raySign[1]].getY() - rayFrom.getY()) * rayInvDirection.getY();
+
+	if ((tmin > tymax) || (tymin > tmax))
+		return false;
+
+	if (tymin > tmin)
+		tmin = tymin;
+
+	if (tymax < tmax)
+		tmax = tymax;
+
+	tzmin = (bounds[raySign[2]].getZ() - rayFrom.getZ()) * rayInvDirection.getZ();
+	tzmax = (bounds[1 - raySign[2]].getZ() - rayFrom.getZ()) * rayInvDirection.getZ();
+
+	if ((tmin > tzmax) || (tzmin > tmax))
+		return false;
+	if (tzmin > tmin)
+		tmin = tzmin;
+	if (tzmax < tmax)
+		tmax = tzmax;
+	return ((tmin < lambda_max) && (tmax > lambda_min));
+}
+
+SIMD_FORCE_INLINE bool btRayAabb(const btVector3& rayFrom,
+								 const btVector3& rayTo,
+								 const btVector3& aabbMin,
+								 const btVector3& aabbMax,
+								 btScalar& param, btVector3& normal)
+{
+	btVector3 aabbHalfExtent = (aabbMax - aabbMin) * btScalar(0.5);
+	btVector3 aabbCenter = (aabbMax + aabbMin) * btScalar(0.5);
+	btVector3 source = rayFrom - aabbCenter;
+	btVector3 target = rayTo - aabbCenter;
+	int sourceOutcode = btOutcode(source, aabbHalfExtent);
+	int targetOutcode = btOutcode(target, aabbHalfExtent);
+	if ((sourceOutcode & targetOutcode) == 0x0)
+	{
+		btScalar lambda_enter = btScalar(0.0);
+		btScalar lambda_exit = param;
+		btVector3 r = target - source;
+		int i;
+		btScalar normSign = 1;
+		btVector3 hitNormal(0, 0, 0);
+		int bit = 1;
+
+		for (int j = 0; j < 2; j++)
+		{
+			for (i = 0; i != 3; ++i)
+			{
+				if (sourceOutcode & bit)
+				{
+					btScalar lambda = (-source[i] - aabbHalfExtent[i] * normSign) / r[i];
+					if (lambda_enter <= lambda)
+					{
+						lambda_enter = lambda;
+						hitNormal.setValue(0, 0, 0);
+						hitNormal[i] = normSign;
+					}
+				}
+				else if (targetOutcode & bit)
+				{
+					btScalar lambda = (-source[i] - aabbHalfExtent[i] * normSign) / r[i];
+					btSetMin(lambda_exit, lambda);
+				}
+				bit <<= 1;
+			}
+			normSign = btScalar(-1.);
+		}
+		if (lambda_enter <= lambda_exit)
+		{
+			param = lambda_enter;
+			normal = hitNormal;
+			return true;
+		}
+	}
+	return false;
+}
+
+SIMD_FORCE_INLINE void btTransformAabb(const btVector3& halfExtents, btScalar margin, const btTransform& t, btVector3& aabbMinOut, btVector3& aabbMaxOut)
+{
+	btVector3 halfExtentsWithMargin = halfExtents + btVector3(margin, margin, margin);
+	btMatrix3x3 abs_b = t.getBasis().absolute();
+	btVector3 center = t.getOrigin();
+	btVector3 extent = halfExtentsWithMargin.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	aabbMinOut = center - extent;
+	aabbMaxOut = center + extent;
+}
+
+SIMD_FORCE_INLINE void btTransformAabb(const btVector3& localAabbMin, const btVector3& localAabbMax, btScalar margin, const btTransform& trans, btVector3& aabbMinOut, btVector3& aabbMaxOut)
+{
+	btAssert(localAabbMin.getX() <= localAabbMax.getX());
+	btAssert(localAabbMin.getY() <= localAabbMax.getY());
+	btAssert(localAabbMin.getZ() <= localAabbMax.getZ());
+	btVector3 localHalfExtents = btScalar(0.5) * (localAabbMax - localAabbMin);
+	localHalfExtents += btVector3(margin, margin, margin);
+
+	btVector3 localCenter = btScalar(0.5) * (localAabbMax + localAabbMin);
+	btMatrix3x3 abs_b = trans.getBasis().absolute();
+	btVector3 center = trans(localCenter);
+	btVector3 extent = localHalfExtents.dot3(abs_b[0], abs_b[1], abs_b[2]);
+	aabbMinOut = center - extent;
+	aabbMaxOut = center + extent;
+}
+
+#define USE_BANCHLESS 1
+#ifdef USE_BANCHLESS
+//This block replaces the block below and uses no branches, and replaces the 8 bit return with a 32 bit return for improved performance (~3x on XBox 360)
+SIMD_FORCE_INLINE unsigned testQuantizedAabbAgainstQuantizedAabb(const unsigned short int* aabbMin1, const unsigned short int* aabbMax1, const unsigned short int* aabbMin2, const unsigned short int* aabbMax2)
+{
+	return static_cast<unsigned int>(btSelect((unsigned)((aabbMin1[0] <= aabbMax2[0]) & (aabbMax1[0] >= aabbMin2[0]) & (aabbMin1[2] <= aabbMax2[2]) & (aabbMax1[2] >= aabbMin2[2]) & (aabbMin1[1] <= aabbMax2[1]) & (aabbMax1[1] >= aabbMin2[1])),
+											  1, 0));
+}
+#else
+SIMD_FORCE_INLINE bool testQuantizedAabbAgainstQuantizedAabb(const unsigned short int* aabbMin1, const unsigned short int* aabbMax1, const unsigned short int* aabbMin2, const unsigned short int* aabbMax2)
+{
+	bool overlap = true;
+	overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap;
+	overlap = (aabbMin1[2] > aabbMax2[2] || aabbMax1[2] < aabbMin2[2]) ? false : overlap;
+	overlap = (aabbMin1[1] > aabbMax2[1] || aabbMax1[1] < aabbMin2[1]) ? false : overlap;
+	return overlap;
+}
+#endif  //USE_BANCHLESS
+
+#endif  //BT_AABB_UTIL2
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btAlignedAllocator.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btAlignedAllocator.cpp
new file mode 100644
index 0000000..c8f436f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btAlignedAllocator.cpp
@@ -0,0 +1,268 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btAlignedAllocator.h"
+#include <string.h>
+
+#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
+int gNumAlignedAllocs = 0;
+int gNumAlignedFree = 0;
+int gTotalBytesAlignedAllocs = 0;  //detect memory leaks
+#endif                             //BT_DEBUG_MEMORY_ALLOCATIONST_DEBUG_ALLOCATIONS
+
+static void *btAllocDefault(size_t size)
+{
+  char* data = (char*) malloc(size);
+  memset(data,0,size);//keep msan happy
+  return data;
+}
+
+static void btFreeDefault(void *ptr)
+{
+	free(ptr);
+}
+
+static btAllocFunc *sAllocFunc = btAllocDefault;
+static btFreeFunc *sFreeFunc = btFreeDefault;
+
+#if defined(BT_HAS_ALIGNED_ALLOCATOR)
+#include <malloc.h>
+static void *btAlignedAllocDefault(size_t size, int alignment)
+{
+	return _aligned_malloc(size, (size_t)alignment);
+}
+
+static void btAlignedFreeDefault(void *ptr)
+{
+	_aligned_free(ptr);
+}
+#elif defined(__CELLOS_LV2__)
+#include <stdlib.h>
+
+static inline void *btAlignedAllocDefault(size_t size, int alignment)
+{
+	return memalign(alignment, size);
+}
+
+static inline void btAlignedFreeDefault(void *ptr)
+{
+	free(ptr);
+}
+#else
+
+static inline void *btAlignedAllocDefault(size_t size, int alignment)
+{
+	void *ret;
+	char *real;
+	real = (char *)sAllocFunc(size + sizeof(void *) + (alignment - 1));
+	if (real)
+	{
+		ret = btAlignPointer(real + sizeof(void *), alignment);
+		*((void **)(ret)-1) = (void *)(real);
+	}
+	else
+	{
+		ret = (void *)(real);
+	}
+  //keep msan happy
+  memset((char*) ret, 0, size);
+	return (ret);
+}
+
+static inline void btAlignedFreeDefault(void *ptr)
+{
+	void *real;
+
+	if (ptr)
+	{
+		real = *((void **)(ptr)-1);
+		sFreeFunc(real);
+	}
+}
+#endif
+
+static btAlignedAllocFunc *sAlignedAllocFunc = btAlignedAllocDefault;
+static btAlignedFreeFunc *sAlignedFreeFunc = btAlignedFreeDefault;
+
+void btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc)
+{
+	sAlignedAllocFunc = allocFunc ? allocFunc : btAlignedAllocDefault;
+	sAlignedFreeFunc = freeFunc ? freeFunc : btAlignedFreeDefault;
+}
+
+void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc)
+{
+	sAllocFunc = allocFunc ? allocFunc : btAllocDefault;
+	sFreeFunc = freeFunc ? freeFunc : btFreeDefault;
+}
+
+#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
+
+static int allocations_id[10241024];
+static int allocations_bytes[10241024];
+static int mynumallocs = 0;
+#include <stdio.h>
+
+int btDumpMemoryLeaks()
+{
+	int totalLeak = 0;
+
+	for (int i = 0; i < mynumallocs; i++)
+	{
+		printf("Error: leaked memory of allocation #%d (%d bytes)\n", allocations_id[i], allocations_bytes[i]);
+		totalLeak += allocations_bytes[i];
+	}
+	if (totalLeak)
+	{
+		printf("Error: memory leaks: %d allocations were not freed and leaked together %d bytes\n", mynumallocs, totalLeak);
+	}
+	return totalLeak;
+}
+//this generic allocator provides the total allocated number of bytes
+#include <stdio.h>
+
+struct btDebugPtrMagic
+{
+	union {
+		void **vptrptr;
+		void *vptr;
+		int *iptr;
+		char *cptr;
+	};
+};
+
+void *btAlignedAllocInternal(size_t size, int alignment, int line, const char *filename)
+{
+	if (size == 0)
+	{
+		printf("Whaat? size==0");
+		return 0;
+	}
+	static int allocId = 0;
+
+	void *ret;
+	char *real;
+
+	// to find some particular memory leak, you could do something like this:
+	//	if (allocId==172)
+	//	{
+	//		printf("catch me!\n");
+	//	}
+	//	if (size>1024*1024)
+	//	{
+	//		printf("big alloc!%d\n", size);
+	//	}
+
+	gTotalBytesAlignedAllocs += size;
+	gNumAlignedAllocs++;
+
+	int sz4prt = 4 * sizeof(void *);
+
+	real = (char *)sAllocFunc(size + sz4prt + (alignment - 1));
+	if (real)
+	{
+		ret = (void *)btAlignPointer(real + sz4prt, alignment);
+		btDebugPtrMagic p;
+		p.vptr = ret;
+		p.cptr -= sizeof(void *);
+		*p.vptrptr = (void *)real;
+		p.cptr -= sizeof(void *);
+		*p.iptr = size;
+		p.cptr -= sizeof(void *);
+		*p.iptr = allocId;
+
+		allocations_id[mynumallocs] = allocId;
+		allocations_bytes[mynumallocs] = size;
+		mynumallocs++;
+	}
+	else
+	{
+		ret = (void *)(real);  //??
+	}
+
+	printf("allocation %d at address %x, from %s,line %d, size %d (total allocated = %d)\n", allocId, real, filename, line, size, gTotalBytesAlignedAllocs);
+	allocId++;
+
+	int *ptr = (int *)ret;
+	*ptr = 12;
+	return (ret);
+}
+
+void btAlignedFreeInternal(void *ptr, int line, const char *filename)
+{
+	void *real;
+
+	if (ptr)
+	{
+		gNumAlignedFree++;
+
+		btDebugPtrMagic p;
+		p.vptr = ptr;
+		p.cptr -= sizeof(void *);
+		real = *p.vptrptr;
+		p.cptr -= sizeof(void *);
+		int size = *p.iptr;
+		p.cptr -= sizeof(void *);
+		int allocId = *p.iptr;
+
+		bool found = false;
+
+		for (int i = 0; i < mynumallocs; i++)
+		{
+			if (allocations_id[i] == allocId)
+			{
+				allocations_id[i] = allocations_id[mynumallocs - 1];
+				allocations_bytes[i] = allocations_bytes[mynumallocs - 1];
+				mynumallocs--;
+				found = true;
+				break;
+			}
+		}
+
+		gTotalBytesAlignedAllocs -= size;
+
+		int diff = gNumAlignedAllocs - gNumAlignedFree;
+		printf("free %d at address %x, from %s,line %d, size %d (total remain = %d in %d non-freed allocations)\n", allocId, real, filename, line, size, gTotalBytesAlignedAllocs, diff);
+
+		sFreeFunc(real);
+	}
+	else
+	{
+		//printf("deleting a NULL ptr, no effect\n");
+	}
+}
+
+#else  //BT_DEBUG_MEMORY_ALLOCATIONS
+
+void *btAlignedAllocInternal(size_t size, int alignment)
+{
+	void *ptr;
+	ptr = sAlignedAllocFunc(size, alignment);
+	//	printf("btAlignedAllocInternal %d, %x\n",size,ptr);
+	return ptr;
+}
+
+void btAlignedFreeInternal(void *ptr)
+{
+	if (!ptr)
+	{
+		return;
+	}
+
+	//	printf("btAlignedFreeInternal %x\n",ptr);
+	sAlignedFreeFunc(ptr);
+}
+
+#endif  //BT_DEBUG_MEMORY_ALLOCATIONS
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btAlignedAllocator.h b/dali-physics/third-party/bullet3/src/LinearMath/btAlignedAllocator.h
new file mode 100644
index 0000000..f6bbcdb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btAlignedAllocator.h
@@ -0,0 +1,115 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_ALIGNED_ALLOCATOR
+#define BT_ALIGNED_ALLOCATOR
+
+///we probably replace this with our own aligned memory allocator
+///so we replace _aligned_malloc and _aligned_free with our own
+///that is better portable and more predictable
+
+#include "btScalar.h"
+
+///BT_DEBUG_MEMORY_ALLOCATIONS preprocessor can be set in build system
+///for regression tests to detect memory leaks
+///#define BT_DEBUG_MEMORY_ALLOCATIONS 1
+#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
+
+int btDumpMemoryLeaks();
+
+#define btAlignedAlloc(a, b) \
+	btAlignedAllocInternal(a, b, __LINE__, __FILE__)
+
+#define btAlignedFree(ptr) \
+	btAlignedFreeInternal(ptr, __LINE__, __FILE__)
+
+void* btAlignedAllocInternal(size_t size, int alignment, int line, const char* filename);
+
+void btAlignedFreeInternal(void* ptr, int line, const char* filename);
+
+#else
+void* btAlignedAllocInternal(size_t size, int alignment);
+void btAlignedFreeInternal(void* ptr);
+
+#define btAlignedAlloc(size, alignment) btAlignedAllocInternal(size, alignment)
+#define btAlignedFree(ptr) btAlignedFreeInternal(ptr)
+
+#endif
+typedef int size_type;
+
+typedef void*(btAlignedAllocFunc)(size_t size, int alignment);
+typedef void(btAlignedFreeFunc)(void* memblock);
+typedef void*(btAllocFunc)(size_t size);
+typedef void(btFreeFunc)(void* memblock);
+
+///The developer can let all Bullet memory allocations go through a custom memory allocator, using btAlignedAllocSetCustom
+void btAlignedAllocSetCustom(btAllocFunc* allocFunc, btFreeFunc* freeFunc);
+///If the developer has already an custom aligned allocator, then btAlignedAllocSetCustomAligned can be used. The default aligned allocator pre-allocates extra memory using the non-aligned allocator, and instruments it.
+void btAlignedAllocSetCustomAligned(btAlignedAllocFunc* allocFunc, btAlignedFreeFunc* freeFunc);
+
+///The btAlignedAllocator is a portable class for aligned memory allocations.
+///Default implementations for unaligned and aligned allocations can be overridden by a custom allocator using btAlignedAllocSetCustom and btAlignedAllocSetCustomAligned.
+template <typename T, unsigned Alignment>
+class btAlignedAllocator
+{
+	typedef btAlignedAllocator<T, Alignment> self_type;
+
+public:
+	//just going down a list:
+	btAlignedAllocator() {}
+	/*
+	btAlignedAllocator( const self_type & ) {}
+	*/
+
+	template <typename Other>
+	btAlignedAllocator(const btAlignedAllocator<Other, Alignment>&)
+	{
+	}
+
+	typedef const T* const_pointer;
+	typedef const T& const_reference;
+	typedef T* pointer;
+	typedef T& reference;
+	typedef T value_type;
+
+	pointer address(reference ref) const { return &ref; }
+	const_pointer address(const_reference ref) const { return &ref; }
+	pointer allocate(size_type n, const_pointer* hint = 0)
+	{
+		(void)hint;
+		return reinterpret_cast<pointer>(btAlignedAlloc(sizeof(value_type) * n, Alignment));
+	}
+	void construct(pointer ptr, const value_type& value) { new (ptr) value_type(value); }
+	void deallocate(pointer ptr)
+	{
+		btAlignedFree(reinterpret_cast<void*>(ptr));
+	}
+	void destroy(pointer ptr) { ptr->~value_type(); }
+
+	template <typename O>
+	struct rebind
+	{
+		typedef btAlignedAllocator<O, Alignment> other;
+	};
+	template <typename O>
+	self_type& operator=(const btAlignedAllocator<O, Alignment>&)
+	{
+		return *this;
+	}
+
+	friend bool operator==(const self_type&, const self_type&) { return true; }
+};
+
+#endif  //BT_ALIGNED_ALLOCATOR
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btAlignedObjectArray.h b/dali-physics/third-party/bullet3/src/LinearMath/btAlignedObjectArray.h
new file mode 100644
index 0000000..ac3e189
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btAlignedObjectArray.h
@@ -0,0 +1,504 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_OBJECT_ARRAY__
+#define BT_OBJECT_ARRAY__
+
+#include "btScalar.h"  // has definitions like SIMD_FORCE_INLINE
+#include "btAlignedAllocator.h"
+
+///If the platform doesn't support placement new, you can disable BT_USE_PLACEMENT_NEW
+///then the btAlignedObjectArray doesn't support objects with virtual methods, and non-trivial constructors/destructors
+///You can enable BT_USE_MEMCPY, then swapping elements in the array will use memcpy instead of operator=
+///see discussion here: https://bulletphysics.orgphpBB2/viewtopic.php?t=1231 and
+///http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1240
+
+#define BT_USE_PLACEMENT_NEW 1
+//#define BT_USE_MEMCPY 1 //disable, because it is cumbersome to find out for each platform where memcpy is defined. It can be in <memory.h> or <string.h> or otherwise...
+#define BT_ALLOW_ARRAY_COPY_OPERATOR  // enabling this can accidently perform deep copies of data if you are not careful
+
+#ifdef BT_USE_MEMCPY
+#include <memory.h>
+#include <string.h>
+#endif  //BT_USE_MEMCPY
+
+#ifdef BT_USE_PLACEMENT_NEW
+#include <new>  //for placement new
+#endif          //BT_USE_PLACEMENT_NEW
+
+///The btAlignedObjectArray template class uses a subset of the stl::vector interface for its methods
+///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data
+template <typename T>
+//template <class T>
+class btAlignedObjectArray
+{
+	btAlignedAllocator<T, 16> m_allocator;
+
+	int m_size;
+	int m_capacity;
+	T* m_data;
+	//PCK: added this line
+	bool m_ownsMemory;
+
+#ifdef BT_ALLOW_ARRAY_COPY_OPERATOR
+public:
+	SIMD_FORCE_INLINE btAlignedObjectArray<T>& operator=(const btAlignedObjectArray<T>& other)
+	{
+		copyFromArray(other);
+		return *this;
+	}
+#else   //BT_ALLOW_ARRAY_COPY_OPERATOR
+private:
+	SIMD_FORCE_INLINE btAlignedObjectArray<T>& operator=(const btAlignedObjectArray<T>& other);
+#endif  //BT_ALLOW_ARRAY_COPY_OPERATOR
+
+protected:
+	SIMD_FORCE_INLINE int allocSize(int size)
+	{
+		return (size ? size * 2 : 1);
+	}
+	SIMD_FORCE_INLINE void copy(int start, int end, T* dest) const
+	{
+		int i;
+		for (i = start; i < end; ++i)
+#ifdef BT_USE_PLACEMENT_NEW
+			new (&dest[i]) T(m_data[i]);
+#else
+			dest[i] = m_data[i];
+#endif  //BT_USE_PLACEMENT_NEW
+	}
+
+	SIMD_FORCE_INLINE void init()
+	{
+		//PCK: added this line
+		m_ownsMemory = true;
+		m_data = 0;
+		m_size = 0;
+		m_capacity = 0;
+	}
+	SIMD_FORCE_INLINE void destroy(int first, int last)
+	{
+		int i;
+		for (i = first; i < last; i++)
+		{
+			m_data[i].~T();
+		}
+	}
+
+	SIMD_FORCE_INLINE void* allocate(int size)
+	{
+		if (size)
+			return m_allocator.allocate(size);
+		return 0;
+	}
+
+	SIMD_FORCE_INLINE void deallocate()
+	{
+		if (m_data)
+		{
+			//PCK: enclosed the deallocation in this block
+			if (m_ownsMemory)
+			{
+				m_allocator.deallocate(m_data);
+			}
+			m_data = 0;
+		}
+	}
+
+public:
+	btAlignedObjectArray()
+	{
+		init();
+	}
+
+	~btAlignedObjectArray()
+	{
+		clear();
+	}
+
+	///Generally it is best to avoid using the copy constructor of an btAlignedObjectArray, and use a (const) reference to the array instead.
+	btAlignedObjectArray(const btAlignedObjectArray& otherArray)
+	{
+		init();
+
+		int otherSize = otherArray.size();
+		resize(otherSize);
+		otherArray.copy(0, otherSize, m_data);
+	}
+
+	/// return the number of elements in the array
+	SIMD_FORCE_INLINE int size() const
+	{
+		return m_size;
+	}
+
+	SIMD_FORCE_INLINE const T& at(int n) const
+	{
+		btAssert(n >= 0);
+		btAssert(n < size());
+		return m_data[n];
+	}
+
+	SIMD_FORCE_INLINE T& at(int n)
+	{
+		btAssert(n >= 0);
+		btAssert(n < size());
+		return m_data[n];
+	}
+
+	SIMD_FORCE_INLINE const T& operator[](int n) const
+	{
+		btAssert(n >= 0);
+		btAssert(n < size());
+		return m_data[n];
+	}
+
+	SIMD_FORCE_INLINE T& operator[](int n)
+	{
+		btAssert(n >= 0);
+		btAssert(n < size());
+		return m_data[n];
+	}
+
+	///clear the array, deallocated memory. Generally it is better to use array.resize(0), to reduce performance overhead of run-time memory (de)allocations.
+	SIMD_FORCE_INLINE void clear()
+	{
+		destroy(0, size());
+
+		deallocate();
+
+		init();
+	}
+
+	SIMD_FORCE_INLINE void pop_back()
+	{
+		btAssert(m_size > 0);
+		m_size--;
+		m_data[m_size].~T();
+	}
+
+	///resize changes the number of elements in the array. If the new size is larger, the new elements will be constructed using the optional second argument.
+	///when the new number of elements is smaller, the destructor will be called, but memory will not be freed, to reduce performance overhead of run-time memory (de)allocations.
+	SIMD_FORCE_INLINE void resizeNoInitialize(int newsize)
+	{
+		if (newsize > size())
+		{
+			reserve(newsize);
+		}
+		m_size = newsize;
+	}
+
+	SIMD_FORCE_INLINE void resize(int newsize, const T& fillData = T())
+	{
+		const int curSize = size();
+
+		if (newsize < curSize)
+		{
+			for (int i = newsize; i < curSize; i++)
+			{
+				m_data[i].~T();
+			}
+		}
+		else
+		{
+			if (newsize > curSize)
+			{
+				reserve(newsize);
+			}
+#ifdef BT_USE_PLACEMENT_NEW
+			for (int i = curSize; i < newsize; i++)
+			{
+				new (&m_data[i]) T(fillData);
+			}
+#endif  //BT_USE_PLACEMENT_NEW
+		}
+
+		m_size = newsize;
+	}
+	SIMD_FORCE_INLINE T& expandNonInitializing()
+	{
+		const int sz = size();
+		if (sz == capacity())
+		{
+			reserve(allocSize(size()));
+		}
+		m_size++;
+
+		return m_data[sz];
+	}
+
+	SIMD_FORCE_INLINE T& expand(const T& fillValue = T())
+	{
+		const int sz = size();
+		if (sz == capacity())
+		{
+			reserve(allocSize(size()));
+		}
+		m_size++;
+#ifdef BT_USE_PLACEMENT_NEW
+		new (&m_data[sz]) T(fillValue);  //use the in-place new (not really allocating heap memory)
+#endif
+
+		return m_data[sz];
+	}
+
+	SIMD_FORCE_INLINE void push_back(const T& _Val)
+	{
+		const int sz = size();
+		if (sz == capacity())
+		{
+			reserve(allocSize(size()));
+		}
+
+#ifdef BT_USE_PLACEMENT_NEW
+		new (&m_data[m_size]) T(_Val);
+#else
+		m_data[size()] = _Val;
+#endif  //BT_USE_PLACEMENT_NEW
+
+		m_size++;
+	}
+
+	/// return the pre-allocated (reserved) elements, this is at least as large as the total number of elements,see size() and reserve()
+	SIMD_FORCE_INLINE int capacity() const
+	{
+		return m_capacity;
+	}
+
+	SIMD_FORCE_INLINE void reserve(int _Count)
+	{  // determine new minimum length of allocated storage
+		if (capacity() < _Count)
+		{  // not enough room, reallocate
+			T* s = (T*)allocate(_Count);
+
+			copy(0, size(), s);
+
+			destroy(0, size());
+
+			deallocate();
+
+			//PCK: added this line
+			m_ownsMemory = true;
+
+			m_data = s;
+
+			m_capacity = _Count;
+		}
+	}
+
+	class less
+	{
+	public:
+		bool operator()(const T& a, const T& b) const
+		{
+			return (a < b);
+		}
+	};
+
+	template <typename L>
+	void quickSortInternal(const L& CompareFunc, int lo, int hi)
+	{
+		//  lo is the lower index, hi is the upper index
+		//  of the region of array a that is to be sorted
+		int i = lo, j = hi;
+		T x = m_data[(lo + hi) / 2];
+
+		//  partition
+		do
+		{
+			while (CompareFunc(m_data[i], x))
+				i++;
+			while (CompareFunc(x, m_data[j]))
+				j--;
+			if (i <= j)
+			{
+				swap(i, j);
+				i++;
+				j--;
+			}
+		} while (i <= j);
+
+		//  recursion
+		if (lo < j)
+			quickSortInternal(CompareFunc, lo, j);
+		if (i < hi)
+			quickSortInternal(CompareFunc, i, hi);
+	}
+
+	template <typename L>
+	void quickSort(const L& CompareFunc)
+	{
+		//don't sort 0 or 1 elements
+		if (size() > 1)
+		{
+			quickSortInternal(CompareFunc, 0, size() - 1);
+		}
+	}
+
+	///heap sort from http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Sort/Heap/
+	template <typename L>
+	void downHeap(T* pArr, int k, int n, const L& CompareFunc)
+	{
+		/*  PRE: a[k+1..N] is a heap */
+		/* POST:  a[k..N]  is a heap */
+
+		T temp = pArr[k - 1];
+		/* k has child(s) */
+		while (k <= n / 2)
+		{
+			int child = 2 * k;
+
+			if ((child < n) && CompareFunc(pArr[child - 1], pArr[child]))
+			{
+				child++;
+			}
+			/* pick larger child */
+			if (CompareFunc(temp, pArr[child - 1]))
+			{
+				/* move child up */
+				pArr[k - 1] = pArr[child - 1];
+				k = child;
+			}
+			else
+			{
+				break;
+			}
+		}
+		pArr[k - 1] = temp;
+	} /*downHeap*/
+
+	void swap(int index0, int index1)
+	{
+#ifdef BT_USE_MEMCPY
+		char temp[sizeof(T)];
+		memcpy(temp, &m_data[index0], sizeof(T));
+		memcpy(&m_data[index0], &m_data[index1], sizeof(T));
+		memcpy(&m_data[index1], temp, sizeof(T));
+#else
+		T temp = m_data[index0];
+		m_data[index0] = m_data[index1];
+		m_data[index1] = temp;
+#endif  //BT_USE_PLACEMENT_NEW
+	}
+
+	template <typename L>
+	void heapSort(const L& CompareFunc)
+	{
+		/* sort a[0..N-1],  N.B. 0 to N-1 */
+		int k;
+		int n = m_size;
+		for (k = n / 2; k > 0; k--)
+		{
+			downHeap(m_data, k, n, CompareFunc);
+		}
+
+		/* a[1..N] is now a heap */
+		while (n >= 1)
+		{
+			swap(0, n - 1); /* largest of a[0..n-1] */
+
+			n = n - 1;
+			/* restore a[1..i-1] heap */
+			downHeap(m_data, 1, n, CompareFunc);
+		}
+	}
+
+	///non-recursive binary search, assumes sorted array
+	int findBinarySearch(const T& key) const
+	{
+		int first = 0;
+		int last = size() - 1;
+
+		//assume sorted array
+		while (first <= last)
+		{
+			int mid = (first + last) / 2;  // compute mid point.
+			if (key > m_data[mid])
+				first = mid + 1;  // repeat search in top half.
+			else if (key < m_data[mid])
+				last = mid - 1;  // repeat search in bottom half.
+			else
+				return mid;  // found it. return position /////
+		}
+		return size();  // failed to find key
+	}
+
+	int findLinearSearch(const T& key) const
+	{
+		int index = size();
+		int i;
+
+		for (i = 0; i < size(); i++)
+		{
+			if (m_data[i] == key)
+			{
+				index = i;
+				break;
+			}
+		}
+		return index;
+	}
+
+	// If the key is not in the array, return -1 instead of 0,
+	// since 0 also means the first element in the array.
+	int findLinearSearch2(const T& key) const
+	{
+		int index = -1;
+		int i;
+
+		for (i = 0; i < size(); i++)
+		{
+			if (m_data[i] == key)
+			{
+				index = i;
+				break;
+			}
+		}
+		return index;
+	}
+
+	void removeAtIndex(int index)
+	{
+		if (index < size())
+		{
+			swap(index, size() - 1);
+			pop_back();
+		}
+	}
+	void remove(const T& key)
+	{
+		int findIndex = findLinearSearch(key);
+		removeAtIndex(findIndex);
+	}
+
+	//PCK: whole function
+	void initializeFromBuffer(void* buffer, int size, int capacity)
+	{
+		clear();
+		m_ownsMemory = false;
+		m_data = (T*)buffer;
+		m_size = size;
+		m_capacity = capacity;
+	}
+
+	void copyFromArray(const btAlignedObjectArray& otherArray)
+	{
+		int otherSize = otherArray.size();
+		resize(otherSize);
+		otherArray.copy(0, otherSize, m_data);
+	}
+};
+
+#endif  //BT_OBJECT_ARRAY__
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btConvexHull.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHull.cpp
new file mode 100644
index 0000000..94b68ba
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHull.cpp
@@ -0,0 +1,1122 @@
+/*
+Stan Melax Convex Hull Computation
+Copyright (c) 2003-2006 Stan Melax http://www.melax.com/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+
+#include "btConvexHull.h"
+#include "btAlignedObjectArray.h"
+#include "btMinMax.h"
+#include "btVector3.h"
+
+//----------------------------------
+
+class int3
+{
+public:
+	int x, y, z;
+	int3(){};
+	int3(int _x, int _y, int _z)
+	{
+		x = _x;
+		y = _y;
+		z = _z;
+	}
+	const int &operator[](int i) const { return (&x)[i]; }
+	int &operator[](int i) { return (&x)[i]; }
+};
+
+//------- btPlane ----------
+
+inline btPlane PlaneFlip(const btPlane &plane) { return btPlane(-plane.normal, -plane.dist); }
+inline int operator==(const btPlane &a, const btPlane &b) { return (a.normal == b.normal && a.dist == b.dist); }
+inline int coplanar(const btPlane &a, const btPlane &b) { return (a == b || a == PlaneFlip(b)); }
+
+//--------- Utility Functions ------
+
+btVector3 PlaneLineIntersection(const btPlane &plane, const btVector3 &p0, const btVector3 &p1);
+btVector3 PlaneProject(const btPlane &plane, const btVector3 &point);
+
+btVector3 ThreePlaneIntersection(const btPlane &p0, const btPlane &p1, const btPlane &p2);
+btVector3 ThreePlaneIntersection(const btPlane &p0, const btPlane &p1, const btPlane &p2)
+{
+	btVector3 N1 = p0.normal;
+	btVector3 N2 = p1.normal;
+	btVector3 N3 = p2.normal;
+
+	btVector3 n2n3;
+	n2n3 = N2.cross(N3);
+	btVector3 n3n1;
+	n3n1 = N3.cross(N1);
+	btVector3 n1n2;
+	n1n2 = N1.cross(N2);
+
+	btScalar quotient = (N1.dot(n2n3));
+
+	btAssert(btFabs(quotient) > btScalar(0.000001));
+
+	quotient = btScalar(-1.) / quotient;
+	n2n3 *= p0.dist;
+	n3n1 *= p1.dist;
+	n1n2 *= p2.dist;
+	btVector3 potentialVertex = n2n3;
+	potentialVertex += n3n1;
+	potentialVertex += n1n2;
+	potentialVertex *= quotient;
+
+	btVector3 result(potentialVertex.getX(), potentialVertex.getY(), potentialVertex.getZ());
+	return result;
+}
+
+btScalar DistanceBetweenLines(const btVector3 &ustart, const btVector3 &udir, const btVector3 &vstart, const btVector3 &vdir, btVector3 *upoint = NULL, btVector3 *vpoint = NULL);
+btVector3 TriNormal(const btVector3 &v0, const btVector3 &v1, const btVector3 &v2);
+btVector3 NormalOf(const btVector3 *vert, const int n);
+
+btVector3 PlaneLineIntersection(const btPlane &plane, const btVector3 &p0, const btVector3 &p1)
+{
+	// returns the point where the line p0-p1 intersects the plane n&d
+	btVector3 dif;
+	dif = p1 - p0;
+	btScalar dn = btDot(plane.normal, dif);
+	btScalar t = -(plane.dist + btDot(plane.normal, p0)) / dn;
+	return p0 + (dif * t);
+}
+
+btVector3 PlaneProject(const btPlane &plane, const btVector3 &point)
+{
+	return point - plane.normal * (btDot(point, plane.normal) + plane.dist);
+}
+
+btVector3 TriNormal(const btVector3 &v0, const btVector3 &v1, const btVector3 &v2)
+{
+	// return the normal of the triangle
+	// inscribed by v0, v1, and v2
+	btVector3 cp = btCross(v1 - v0, v2 - v1);
+	btScalar m = cp.length();
+	if (m == 0) return btVector3(1, 0, 0);
+	return cp * (btScalar(1.0) / m);
+}
+
+btScalar DistanceBetweenLines(const btVector3 &ustart, const btVector3 &udir, const btVector3 &vstart, const btVector3 &vdir, btVector3 *upoint, btVector3 *vpoint)
+{
+	btVector3 cp;
+	cp = btCross(udir, vdir).normalized();
+
+	btScalar distu = -btDot(cp, ustart);
+	btScalar distv = -btDot(cp, vstart);
+	btScalar dist = (btScalar)fabs(distu - distv);
+	if (upoint)
+	{
+		btPlane plane;
+		plane.normal = btCross(vdir, cp).normalized();
+		plane.dist = -btDot(plane.normal, vstart);
+		*upoint = PlaneLineIntersection(plane, ustart, ustart + udir);
+	}
+	if (vpoint)
+	{
+		btPlane plane;
+		plane.normal = btCross(udir, cp).normalized();
+		plane.dist = -btDot(plane.normal, ustart);
+		*vpoint = PlaneLineIntersection(plane, vstart, vstart + vdir);
+	}
+	return dist;
+}
+
+#define COPLANAR (0)
+#define UNDER (1)
+#define OVER (2)
+#define SPLIT (OVER | UNDER)
+#define PAPERWIDTH (btScalar(0.001))
+
+btScalar planetestepsilon = PAPERWIDTH;
+
+typedef ConvexH::HalfEdge HalfEdge;
+
+ConvexH::ConvexH(int vertices_size, int edges_size, int facets_size)
+{
+	vertices.resize(vertices_size);
+	edges.resize(edges_size);
+	facets.resize(facets_size);
+}
+
+int PlaneTest(const btPlane &p, const btVector3 &v);
+int PlaneTest(const btPlane &p, const btVector3 &v)
+{
+	btScalar a = btDot(v, p.normal) + p.dist;
+	int flag = (a > planetestepsilon) ? OVER : ((a < -planetestepsilon) ? UNDER : COPLANAR);
+	return flag;
+}
+
+int SplitTest(ConvexH &convex, const btPlane &plane);
+int SplitTest(ConvexH &convex, const btPlane &plane)
+{
+	int flag = 0;
+	for (int i = 0; i < convex.vertices.size(); i++)
+	{
+		flag |= PlaneTest(plane, convex.vertices[i]);
+	}
+	return flag;
+}
+
+class VertFlag
+{
+public:
+	unsigned char planetest;
+	unsigned char junk;
+	unsigned char undermap;
+	unsigned char overmap;
+};
+class EdgeFlag
+{
+public:
+	unsigned char planetest;
+	unsigned char fixes;
+	short undermap;
+	short overmap;
+};
+class PlaneFlag
+{
+public:
+	unsigned char undermap;
+	unsigned char overmap;
+};
+class Coplanar
+{
+public:
+	unsigned short ea;
+	unsigned char v0;
+	unsigned char v1;
+};
+
+template <class T>
+int maxdirfiltered(const T *p, int count, const T &dir, btAlignedObjectArray<int> &allow)
+{
+	btAssert(count);
+	int m = -1;
+	for (int i = 0; i < count; i++)
+		if (allow[i])
+		{
+			if (m == -1 || btDot(p[i], dir) > btDot(p[m], dir))
+				m = i;
+		}
+	btAssert(m != -1);
+	return m;
+}
+
+btVector3 orth(const btVector3 &v);
+btVector3 orth(const btVector3 &v)
+{
+	btVector3 a = btCross(v, btVector3(0, 0, 1));
+	btVector3 b = btCross(v, btVector3(0, 1, 0));
+	if (a.length() > b.length())
+	{
+		return a.normalized();
+	}
+	else
+	{
+		return b.normalized();
+	}
+}
+
+template <class T>
+int maxdirsterid(const T *p, int count, const T &dir, btAlignedObjectArray<int> &allow)
+{
+	int m = -1;
+	while (m == -1)
+	{
+		m = maxdirfiltered(p, count, dir, allow);
+		if (allow[m] == 3) return m;
+		T u = orth(dir);
+		T v = btCross(u, dir);
+		int ma = -1;
+		for (btScalar x = btScalar(0.0); x <= btScalar(360.0); x += btScalar(45.0))
+		{
+			btScalar s = btSin(SIMD_RADS_PER_DEG * (x));
+			btScalar c = btCos(SIMD_RADS_PER_DEG * (x));
+			int mb = maxdirfiltered(p, count, dir + (u * s + v * c) * btScalar(0.025), allow);
+			if (ma == m && mb == m)
+			{
+				allow[m] = 3;
+				return m;
+			}
+			if (ma != -1 && ma != mb)  // Yuck - this is really ugly
+			{
+				int mc = ma;
+				for (btScalar xx = x - btScalar(40.0); xx <= x; xx += btScalar(5.0))
+				{
+					btScalar s = btSin(SIMD_RADS_PER_DEG * (xx));
+					btScalar c = btCos(SIMD_RADS_PER_DEG * (xx));
+					int md = maxdirfiltered(p, count, dir + (u * s + v * c) * btScalar(0.025), allow);
+					if (mc == m && md == m)
+					{
+						allow[m] = 3;
+						return m;
+					}
+					mc = md;
+				}
+			}
+			ma = mb;
+		}
+		allow[m] = 0;
+		m = -1;
+	}
+	btAssert(0);
+	return m;
+}
+
+int operator==(const int3 &a, const int3 &b);
+int operator==(const int3 &a, const int3 &b)
+{
+	for (int i = 0; i < 3; i++)
+	{
+		if (a[i] != b[i]) return 0;
+	}
+	return 1;
+}
+
+int above(btVector3 *vertices, const int3 &t, const btVector3 &p, btScalar epsilon);
+int above(btVector3 *vertices, const int3 &t, const btVector3 &p, btScalar epsilon)
+{
+	btVector3 n = TriNormal(vertices[t[0]], vertices[t[1]], vertices[t[2]]);
+	return (btDot(n, p - vertices[t[0]]) > epsilon);  // EPSILON???
+}
+int hasedge(const int3 &t, int a, int b);
+int hasedge(const int3 &t, int a, int b)
+{
+	for (int i = 0; i < 3; i++)
+	{
+		int i1 = (i + 1) % 3;
+		if (t[i] == a && t[i1] == b) return 1;
+	}
+	return 0;
+}
+int hasvert(const int3 &t, int v);
+int hasvert(const int3 &t, int v)
+{
+	return (t[0] == v || t[1] == v || t[2] == v);
+}
+int shareedge(const int3 &a, const int3 &b);
+int shareedge(const int3 &a, const int3 &b)
+{
+	int i;
+	for (i = 0; i < 3; i++)
+	{
+		int i1 = (i + 1) % 3;
+		if (hasedge(a, b[i1], b[i])) return 1;
+	}
+	return 0;
+}
+
+class btHullTriangle;
+
+class btHullTriangle : public int3
+{
+public:
+	int3 n;
+	int id;
+	int vmax;
+	btScalar rise;
+	btHullTriangle(int a, int b, int c) : int3(a, b, c), n(-1, -1, -1)
+	{
+		vmax = -1;
+		rise = btScalar(0.0);
+	}
+	~btHullTriangle()
+	{
+	}
+	int &neib(int a, int b);
+};
+
+int &btHullTriangle::neib(int a, int b)
+{
+	static int er = -1;
+	int i;
+	for (i = 0; i < 3; i++)
+	{
+		int i1 = (i + 1) % 3;
+		int i2 = (i + 2) % 3;
+		if ((*this)[i] == a && (*this)[i1] == b) return n[i2];
+		if ((*this)[i] == b && (*this)[i1] == a) return n[i2];
+	}
+	btAssert(0);
+	return er;
+}
+void HullLibrary::b2bfix(btHullTriangle *s, btHullTriangle *t)
+{
+	int i;
+	for (i = 0; i < 3; i++)
+	{
+		int i1 = (i + 1) % 3;
+		int i2 = (i + 2) % 3;
+		int a = (*s)[i1];
+		int b = (*s)[i2];
+		btAssert(m_tris[s->neib(a, b)]->neib(b, a) == s->id);
+		btAssert(m_tris[t->neib(a, b)]->neib(b, a) == t->id);
+		m_tris[s->neib(a, b)]->neib(b, a) = t->neib(b, a);
+		m_tris[t->neib(b, a)]->neib(a, b) = s->neib(a, b);
+	}
+}
+
+void HullLibrary::removeb2b(btHullTriangle *s, btHullTriangle *t)
+{
+	b2bfix(s, t);
+	deAllocateTriangle(s);
+
+	deAllocateTriangle(t);
+}
+
+void HullLibrary::checkit(btHullTriangle *t)
+{
+	(void)t;
+
+	int i;
+	btAssert(m_tris[t->id] == t);
+	for (i = 0; i < 3; i++)
+	{
+		int i1 = (i + 1) % 3;
+		int i2 = (i + 2) % 3;
+		int a = (*t)[i1];
+		int b = (*t)[i2];
+
+		// release compile fix
+		(void)i1;
+		(void)i2;
+		(void)a;
+		(void)b;
+
+		btAssert(a != b);
+		btAssert(m_tris[t->n[i]]->neib(b, a) == t->id);
+	}
+}
+
+btHullTriangle *HullLibrary::allocateTriangle(int a, int b, int c)
+{
+	void *mem = btAlignedAlloc(sizeof(btHullTriangle), 16);
+	btHullTriangle *tr = new (mem) btHullTriangle(a, b, c);
+	tr->id = m_tris.size();
+	m_tris.push_back(tr);
+
+	return tr;
+}
+
+void HullLibrary::deAllocateTriangle(btHullTriangle *tri)
+{
+	btAssert(m_tris[tri->id] == tri);
+	m_tris[tri->id] = NULL;
+	tri->~btHullTriangle();
+	btAlignedFree(tri);
+}
+
+void HullLibrary::extrude(btHullTriangle *t0, int v)
+{
+	int3 t = *t0;
+	int n = m_tris.size();
+	btHullTriangle *ta = allocateTriangle(v, t[1], t[2]);
+	ta->n = int3(t0->n[0], n + 1, n + 2);
+	m_tris[t0->n[0]]->neib(t[1], t[2]) = n + 0;
+	btHullTriangle *tb = allocateTriangle(v, t[2], t[0]);
+	tb->n = int3(t0->n[1], n + 2, n + 0);
+	m_tris[t0->n[1]]->neib(t[2], t[0]) = n + 1;
+	btHullTriangle *tc = allocateTriangle(v, t[0], t[1]);
+	tc->n = int3(t0->n[2], n + 0, n + 1);
+	m_tris[t0->n[2]]->neib(t[0], t[1]) = n + 2;
+	checkit(ta);
+	checkit(tb);
+	checkit(tc);
+	if (hasvert(*m_tris[ta->n[0]], v)) removeb2b(ta, m_tris[ta->n[0]]);
+	if (hasvert(*m_tris[tb->n[0]], v)) removeb2b(tb, m_tris[tb->n[0]]);
+	if (hasvert(*m_tris[tc->n[0]], v)) removeb2b(tc, m_tris[tc->n[0]]);
+	deAllocateTriangle(t0);
+}
+
+btHullTriangle *HullLibrary::extrudable(btScalar epsilon)
+{
+	int i;
+	btHullTriangle *t = NULL;
+	for (i = 0; i < m_tris.size(); i++)
+	{
+		if (!t || (m_tris[i] && t->rise < m_tris[i]->rise))
+		{
+			t = m_tris[i];
+		}
+	}
+	return (t->rise > epsilon) ? t : NULL;
+}
+
+int4 HullLibrary::FindSimplex(btVector3 *verts, int verts_count, btAlignedObjectArray<int> &allow)
+{
+	btVector3 basis[3];
+	basis[0] = btVector3(btScalar(0.01), btScalar(0.02), btScalar(1.0));
+	int p0 = maxdirsterid(verts, verts_count, basis[0], allow);
+	int p1 = maxdirsterid(verts, verts_count, -basis[0], allow);
+	basis[0] = verts[p0] - verts[p1];
+	if (p0 == p1 || basis[0] == btVector3(0, 0, 0))
+		return int4(-1, -1, -1, -1);
+	basis[1] = btCross(btVector3(btScalar(1), btScalar(0.02), btScalar(0)), basis[0]);
+	basis[2] = btCross(btVector3(btScalar(-0.02), btScalar(1), btScalar(0)), basis[0]);
+	if (basis[1].length() > basis[2].length())
+	{
+		basis[1].normalize();
+	}
+	else
+	{
+		basis[1] = basis[2];
+		basis[1].normalize();
+	}
+	int p2 = maxdirsterid(verts, verts_count, basis[1], allow);
+	if (p2 == p0 || p2 == p1)
+	{
+		p2 = maxdirsterid(verts, verts_count, -basis[1], allow);
+	}
+	if (p2 == p0 || p2 == p1)
+		return int4(-1, -1, -1, -1);
+	basis[1] = verts[p2] - verts[p0];
+	basis[2] = btCross(basis[1], basis[0]).normalized();
+	int p3 = maxdirsterid(verts, verts_count, basis[2], allow);
+	if (p3 == p0 || p3 == p1 || p3 == p2) p3 = maxdirsterid(verts, verts_count, -basis[2], allow);
+	if (p3 == p0 || p3 == p1 || p3 == p2)
+		return int4(-1, -1, -1, -1);
+	btAssert(!(p0 == p1 || p0 == p2 || p0 == p3 || p1 == p2 || p1 == p3 || p2 == p3));
+	if (btDot(verts[p3] - verts[p0], btCross(verts[p1] - verts[p0], verts[p2] - verts[p0])) < 0)
+	{
+		btSwap(p2, p3);
+	}
+	return int4(p0, p1, p2, p3);
+}
+
+int HullLibrary::calchullgen(btVector3 *verts, int verts_count, int vlimit)
+{
+	if (verts_count < 4) return 0;
+	if (vlimit == 0) vlimit = 1000000000;
+	int j;
+	btVector3 bmin(*verts), bmax(*verts);
+	btAlignedObjectArray<int> isextreme;
+	isextreme.reserve(verts_count);
+	btAlignedObjectArray<int> allow;
+	allow.reserve(verts_count);
+
+	for (j = 0; j < verts_count; j++)
+	{
+		allow.push_back(1);
+		isextreme.push_back(0);
+		bmin.setMin(verts[j]);
+		bmax.setMax(verts[j]);
+	}
+	btScalar epsilon = (bmax - bmin).length() * btScalar(0.001);
+	btAssert(epsilon != 0.0);
+
+	int4 p = FindSimplex(verts, verts_count, allow);
+	if (p.x == -1) return 0;  // simplex failed
+
+	btVector3 center = (verts[p[0]] + verts[p[1]] + verts[p[2]] + verts[p[3]]) / btScalar(4.0);  // a valid interior point
+	btHullTriangle *t0 = allocateTriangle(p[2], p[3], p[1]);
+	t0->n = int3(2, 3, 1);
+	btHullTriangle *t1 = allocateTriangle(p[3], p[2], p[0]);
+	t1->n = int3(3, 2, 0);
+	btHullTriangle *t2 = allocateTriangle(p[0], p[1], p[3]);
+	t2->n = int3(0, 1, 3);
+	btHullTriangle *t3 = allocateTriangle(p[1], p[0], p[2]);
+	t3->n = int3(1, 0, 2);
+	isextreme[p[0]] = isextreme[p[1]] = isextreme[p[2]] = isextreme[p[3]] = 1;
+	checkit(t0);
+	checkit(t1);
+	checkit(t2);
+	checkit(t3);
+
+	for (j = 0; j < m_tris.size(); j++)
+	{
+		btHullTriangle *t = m_tris[j];
+		btAssert(t);
+		btAssert(t->vmax < 0);
+		btVector3 n = TriNormal(verts[(*t)[0]], verts[(*t)[1]], verts[(*t)[2]]);
+		t->vmax = maxdirsterid(verts, verts_count, n, allow);
+		t->rise = btDot(n, verts[t->vmax] - verts[(*t)[0]]);
+	}
+	btHullTriangle *te;
+	vlimit -= 4;
+	while (vlimit > 0 && ((te = extrudable(epsilon)) != 0))
+	{
+		//int3 ti=*te;
+		int v = te->vmax;
+		btAssert(v != -1);
+		btAssert(!isextreme[v]);  // wtf we've already done this vertex
+		isextreme[v] = 1;
+		//if(v==p0 || v==p1 || v==p2 || v==p3) continue; // done these already
+		j = m_tris.size();
+		while (j--)
+		{
+			if (!m_tris[j]) continue;
+			int3 t = *m_tris[j];
+			if (above(verts, t, verts[v], btScalar(0.01) * epsilon))
+			{
+				extrude(m_tris[j], v);
+			}
+		}
+		// now check for those degenerate cases where we have a flipped triangle or a really skinny triangle
+		j = m_tris.size();
+		while (j--)
+		{
+			if (!m_tris[j]) continue;
+			if (!hasvert(*m_tris[j], v)) break;
+			int3 nt = *m_tris[j];
+			if (above(verts, nt, center, btScalar(0.01) * epsilon) || btCross(verts[nt[1]] - verts[nt[0]], verts[nt[2]] - verts[nt[1]]).length() < epsilon * epsilon * btScalar(0.1))
+			{
+				btHullTriangle *nb = m_tris[m_tris[j]->n[0]];
+				btAssert(nb);
+				btAssert(!hasvert(*nb, v));
+				btAssert(nb->id < j);
+				extrude(nb, v);
+				j = m_tris.size();
+			}
+		}
+		j = m_tris.size();
+		while (j--)
+		{
+			btHullTriangle *t = m_tris[j];
+			if (!t) continue;
+			if (t->vmax >= 0) break;
+			btVector3 n = TriNormal(verts[(*t)[0]], verts[(*t)[1]], verts[(*t)[2]]);
+			t->vmax = maxdirsterid(verts, verts_count, n, allow);
+			if (isextreme[t->vmax])
+			{
+				t->vmax = -1;  // already done that vertex - algorithm needs to be able to terminate.
+			}
+			else
+			{
+				t->rise = btDot(n, verts[t->vmax] - verts[(*t)[0]]);
+			}
+		}
+		vlimit--;
+	}
+	return 1;
+}
+
+int HullLibrary::calchull(btVector3 *verts, int verts_count, TUIntArray &tris_out, int &tris_count, int vlimit)
+{
+	int rc = calchullgen(verts, verts_count, vlimit);
+	if (!rc) return 0;
+	btAlignedObjectArray<int> ts;
+	int i;
+
+	for (i = 0; i < m_tris.size(); i++)
+	{
+		if (m_tris[i])
+		{
+			for (int j = 0; j < 3; j++)
+				ts.push_back((*m_tris[i])[j]);
+			deAllocateTriangle(m_tris[i]);
+		}
+	}
+	tris_count = ts.size() / 3;
+	tris_out.resize(ts.size());
+
+	for (i = 0; i < ts.size(); i++)
+	{
+		tris_out[i] = static_cast<unsigned int>(ts[i]);
+	}
+	m_tris.resize(0);
+
+	return 1;
+}
+
+bool HullLibrary::ComputeHull(unsigned int vcount, const btVector3 *vertices, PHullResult &result, unsigned int vlimit)
+{
+	int tris_count;
+	int ret = calchull((btVector3 *)vertices, (int)vcount, result.m_Indices, tris_count, static_cast<int>(vlimit));
+	if (!ret) return false;
+	result.mIndexCount = (unsigned int)(tris_count * 3);
+	result.mFaceCount = (unsigned int)tris_count;
+	result.mVertices = (btVector3 *)vertices;
+	result.mVcount = (unsigned int)vcount;
+	return true;
+}
+
+void ReleaseHull(PHullResult &result);
+void ReleaseHull(PHullResult &result)
+{
+	if (result.m_Indices.size())
+	{
+		result.m_Indices.clear();
+	}
+
+	result.mVcount = 0;
+	result.mIndexCount = 0;
+	result.mVertices = 0;
+}
+
+//*********************************************************************
+//*********************************************************************
+//********  HullLib header
+//*********************************************************************
+//*********************************************************************
+
+//*********************************************************************
+//*********************************************************************
+//********  HullLib implementation
+//*********************************************************************
+//*********************************************************************
+
+HullError HullLibrary::CreateConvexHull(const HullDesc &desc,  // describes the input request
+										HullResult &result)    // contains the resulst
+{
+	HullError ret = QE_FAIL;
+
+	PHullResult hr;
+
+	unsigned int vcount = desc.mVcount;
+	if (vcount < 8) vcount = 8;
+
+	btAlignedObjectArray<btVector3> vertexSource;
+	btVector3 zero;
+	zero.setZero();
+	vertexSource.resize(static_cast<int>(vcount), zero);
+
+	btVector3 scale;
+
+	unsigned int ovcount;
+
+	bool ok = CleanupVertices(desc.mVcount, desc.mVertices, desc.mVertexStride, ovcount, &vertexSource[0], desc.mNormalEpsilon, scale);  // normalize point cloud, remove duplicates!
+
+	if (ok)
+	{
+		//		if ( 1 ) // scale vertices back to their original size.
+		{
+			for (unsigned int i = 0; i < ovcount; i++)
+			{
+				btVector3 &v = vertexSource[static_cast<int>(i)];
+				v[0] *= scale[0];
+				v[1] *= scale[1];
+				v[2] *= scale[2];
+			}
+		}
+
+		ok = ComputeHull(ovcount, &vertexSource[0], hr, desc.mMaxVertices);
+
+		if (ok)
+		{
+			// re-index triangle mesh so it refers to only used vertices, rebuild a new vertex table.
+			btAlignedObjectArray<btVector3> vertexScratch;
+			vertexScratch.resize(static_cast<int>(hr.mVcount));
+
+			BringOutYourDead(hr.mVertices, hr.mVcount, &vertexScratch[0], ovcount, &hr.m_Indices[0], hr.mIndexCount);
+
+			ret = QE_OK;
+
+			if (desc.HasHullFlag(QF_TRIANGLES))  // if he wants the results as triangle!
+			{
+				result.mPolygons = false;
+				result.mNumOutputVertices = ovcount;
+				result.m_OutputVertices.resize(static_cast<int>(ovcount));
+				result.mNumFaces = hr.mFaceCount;
+				result.mNumIndices = hr.mIndexCount;
+
+				result.m_Indices.resize(static_cast<int>(hr.mIndexCount));
+
+				memcpy(&result.m_OutputVertices[0], &vertexScratch[0], sizeof(btVector3) * ovcount);
+
+				if (desc.HasHullFlag(QF_REVERSE_ORDER))
+				{
+					const unsigned int *source = &hr.m_Indices[0];
+					unsigned int *dest = &result.m_Indices[0];
+
+					for (unsigned int i = 0; i < hr.mFaceCount; i++)
+					{
+						dest[0] = source[2];
+						dest[1] = source[1];
+						dest[2] = source[0];
+						dest += 3;
+						source += 3;
+					}
+				}
+				else
+				{
+					memcpy(&result.m_Indices[0], &hr.m_Indices[0], sizeof(unsigned int) * hr.mIndexCount);
+				}
+			}
+			else
+			{
+				result.mPolygons = true;
+				result.mNumOutputVertices = ovcount;
+				result.m_OutputVertices.resize(static_cast<int>(ovcount));
+				result.mNumFaces = hr.mFaceCount;
+				result.mNumIndices = hr.mIndexCount + hr.mFaceCount;
+				result.m_Indices.resize(static_cast<int>(result.mNumIndices));
+				memcpy(&result.m_OutputVertices[0], &vertexScratch[0], sizeof(btVector3) * ovcount);
+
+				//				if ( 1 )
+				{
+					const unsigned int *source = &hr.m_Indices[0];
+					unsigned int *dest = &result.m_Indices[0];
+					for (unsigned int i = 0; i < hr.mFaceCount; i++)
+					{
+						dest[0] = 3;
+						if (desc.HasHullFlag(QF_REVERSE_ORDER))
+						{
+							dest[1] = source[2];
+							dest[2] = source[1];
+							dest[3] = source[0];
+						}
+						else
+						{
+							dest[1] = source[0];
+							dest[2] = source[1];
+							dest[3] = source[2];
+						}
+
+						dest += 4;
+						source += 3;
+					}
+				}
+			}
+			ReleaseHull(hr);
+		}
+	}
+
+	return ret;
+}
+
+HullError HullLibrary::ReleaseResult(HullResult &result)  // release memory allocated for this result, we are done with it.
+{
+	if (result.m_OutputVertices.size())
+	{
+		result.mNumOutputVertices = 0;
+		result.m_OutputVertices.clear();
+	}
+	if (result.m_Indices.size())
+	{
+		result.mNumIndices = 0;
+		result.m_Indices.clear();
+	}
+	return QE_OK;
+}
+
+static void addPoint(unsigned int &vcount, btVector3 *p, btScalar x, btScalar y, btScalar z)
+{
+	// XXX, might be broken
+	btVector3 &dest = p[vcount];
+	dest[0] = x;
+	dest[1] = y;
+	dest[2] = z;
+	vcount++;
+}
+
+btScalar GetDist(btScalar px, btScalar py, btScalar pz, const btScalar *p2);
+btScalar GetDist(btScalar px, btScalar py, btScalar pz, const btScalar *p2)
+{
+	btScalar dx = px - p2[0];
+	btScalar dy = py - p2[1];
+	btScalar dz = pz - p2[2];
+
+	return dx * dx + dy * dy + dz * dz;
+}
+
+bool HullLibrary::CleanupVertices(unsigned int svcount,
+								  const btVector3 *svertices,
+								  unsigned int stride,
+								  unsigned int &vcount,  // output number of vertices
+								  btVector3 *vertices,   // location to store the results.
+								  btScalar normalepsilon,
+								  btVector3 &scale)
+{
+	if (svcount == 0) return false;
+
+	m_vertexIndexMapping.resize(0);
+
+#define EPSILON btScalar(0.000001) /* close enough to consider two btScalaring point numbers to be 'the same'. */
+
+	vcount = 0;
+
+	btScalar recip[3] = {0.f, 0.f, 0.f};
+
+	if (scale)
+	{
+		scale[0] = 1;
+		scale[1] = 1;
+		scale[2] = 1;
+	}
+
+	btScalar bmin[3] = {FLT_MAX, FLT_MAX, FLT_MAX};
+	btScalar bmax[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
+
+	const char *vtx = (const char *)svertices;
+
+	//	if ( 1 )
+	{
+		for (unsigned int i = 0; i < svcount; i++)
+		{
+			const btScalar *p = (const btScalar *)vtx;
+
+			vtx += stride;
+
+			for (int j = 0; j < 3; j++)
+			{
+				if (p[j] < bmin[j]) bmin[j] = p[j];
+				if (p[j] > bmax[j]) bmax[j] = p[j];
+			}
+		}
+	}
+
+	btScalar dx = bmax[0] - bmin[0];
+	btScalar dy = bmax[1] - bmin[1];
+	btScalar dz = bmax[2] - bmin[2];
+
+	btVector3 center;
+
+	center[0] = dx * btScalar(0.5) + bmin[0];
+	center[1] = dy * btScalar(0.5) + bmin[1];
+	center[2] = dz * btScalar(0.5) + bmin[2];
+
+	if (dx < EPSILON || dy < EPSILON || dz < EPSILON || svcount < 3)
+	{
+		btScalar len = FLT_MAX;
+
+		if (dx > EPSILON && dx < len) len = dx;
+		if (dy > EPSILON && dy < len) len = dy;
+		if (dz > EPSILON && dz < len) len = dz;
+
+		if (len == FLT_MAX)
+		{
+			dx = dy = dz = btScalar(0.01);  // one centimeter
+		}
+		else
+		{
+			if (dx < EPSILON) dx = len * btScalar(0.05);  // 1/5th the shortest non-zero edge.
+			if (dy < EPSILON) dy = len * btScalar(0.05);
+			if (dz < EPSILON) dz = len * btScalar(0.05);
+		}
+
+		btScalar x1 = center[0] - dx;
+		btScalar x2 = center[0] + dx;
+
+		btScalar y1 = center[1] - dy;
+		btScalar y2 = center[1] + dy;
+
+		btScalar z1 = center[2] - dz;
+		btScalar z2 = center[2] + dz;
+
+		addPoint(vcount, vertices, x1, y1, z1);
+		addPoint(vcount, vertices, x2, y1, z1);
+		addPoint(vcount, vertices, x2, y2, z1);
+		addPoint(vcount, vertices, x1, y2, z1);
+		addPoint(vcount, vertices, x1, y1, z2);
+		addPoint(vcount, vertices, x2, y1, z2);
+		addPoint(vcount, vertices, x2, y2, z2);
+		addPoint(vcount, vertices, x1, y2, z2);
+
+		return true;  // return cube
+	}
+	else
+	{
+		if (scale)
+		{
+			scale[0] = dx;
+			scale[1] = dy;
+			scale[2] = dz;
+
+			recip[0] = 1 / dx;
+			recip[1] = 1 / dy;
+			recip[2] = 1 / dz;
+
+			center[0] *= recip[0];
+			center[1] *= recip[1];
+			center[2] *= recip[2];
+		}
+	}
+
+	vtx = (const char *)svertices;
+
+	for (unsigned int i = 0; i < svcount; i++)
+	{
+		const btVector3 *p = (const btVector3 *)vtx;
+		vtx += stride;
+
+		btScalar px = p->getX();
+		btScalar py = p->getY();
+		btScalar pz = p->getZ();
+
+		if (scale)
+		{
+			px = px * recip[0];  // normalize
+			py = py * recip[1];  // normalize
+			pz = pz * recip[2];  // normalize
+		}
+
+		//		if ( 1 )
+		{
+			unsigned int j;
+
+			for (j = 0; j < vcount; j++)
+			{
+				/// XXX might be broken
+				btVector3 &v = vertices[j];
+
+				btScalar x = v[0];
+				btScalar y = v[1];
+				btScalar z = v[2];
+
+				btScalar dx = btFabs(x - px);
+				btScalar dy = btFabs(y - py);
+				btScalar dz = btFabs(z - pz);
+
+				if (dx < normalepsilon && dy < normalepsilon && dz < normalepsilon)
+				{
+					// ok, it is close enough to the old one
+					// now let us see if it is further from the center of the point cloud than the one we already recorded.
+					// in which case we keep this one instead.
+
+					btScalar dist1 = GetDist(px, py, pz, center);
+					btScalar dist2 = GetDist(v[0], v[1], v[2], center);
+
+					if (dist1 > dist2)
+					{
+						v[0] = px;
+						v[1] = py;
+						v[2] = pz;
+					}
+
+					break;
+				}
+			}
+
+			if (j == vcount)
+			{
+				btVector3 &dest = vertices[vcount];
+				dest[0] = px;
+				dest[1] = py;
+				dest[2] = pz;
+				vcount++;
+			}
+			m_vertexIndexMapping.push_back(j);
+		}
+	}
+
+	// ok..now make sure we didn't prune so many vertices it is now invalid.
+	//	if ( 1 )
+	{
+		btScalar bmin[3] = {FLT_MAX, FLT_MAX, FLT_MAX};
+		btScalar bmax[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
+
+		for (unsigned int i = 0; i < vcount; i++)
+		{
+			const btVector3 &p = vertices[i];
+			for (int j = 0; j < 3; j++)
+			{
+				if (p[j] < bmin[j]) bmin[j] = p[j];
+				if (p[j] > bmax[j]) bmax[j] = p[j];
+			}
+		}
+
+		btScalar dx = bmax[0] - bmin[0];
+		btScalar dy = bmax[1] - bmin[1];
+		btScalar dz = bmax[2] - bmin[2];
+
+		if (dx < EPSILON || dy < EPSILON || dz < EPSILON || vcount < 3)
+		{
+			btScalar cx = dx * btScalar(0.5) + bmin[0];
+			btScalar cy = dy * btScalar(0.5) + bmin[1];
+			btScalar cz = dz * btScalar(0.5) + bmin[2];
+
+			btScalar len = FLT_MAX;
+
+			if (dx >= EPSILON && dx < len) len = dx;
+			if (dy >= EPSILON && dy < len) len = dy;
+			if (dz >= EPSILON && dz < len) len = dz;
+
+			if (len == FLT_MAX)
+			{
+				dx = dy = dz = btScalar(0.01);  // one centimeter
+			}
+			else
+			{
+				if (dx < EPSILON) dx = len * btScalar(0.05);  // 1/5th the shortest non-zero edge.
+				if (dy < EPSILON) dy = len * btScalar(0.05);
+				if (dz < EPSILON) dz = len * btScalar(0.05);
+			}
+
+			btScalar x1 = cx - dx;
+			btScalar x2 = cx + dx;
+
+			btScalar y1 = cy - dy;
+			btScalar y2 = cy + dy;
+
+			btScalar z1 = cz - dz;
+			btScalar z2 = cz + dz;
+
+			vcount = 0;  // add box
+
+			addPoint(vcount, vertices, x1, y1, z1);
+			addPoint(vcount, vertices, x2, y1, z1);
+			addPoint(vcount, vertices, x2, y2, z1);
+			addPoint(vcount, vertices, x1, y2, z1);
+			addPoint(vcount, vertices, x1, y1, z2);
+			addPoint(vcount, vertices, x2, y1, z2);
+			addPoint(vcount, vertices, x2, y2, z2);
+			addPoint(vcount, vertices, x1, y2, z2);
+
+			return true;
+		}
+	}
+
+	return true;
+}
+
+void HullLibrary::BringOutYourDead(const btVector3 *verts, unsigned int vcount, btVector3 *overts, unsigned int &ocount, unsigned int *indices, unsigned indexcount)
+{
+	btAlignedObjectArray<int> tmpIndices;
+	tmpIndices.resize(m_vertexIndexMapping.size());
+	int i;
+
+	for (i = 0; i < m_vertexIndexMapping.size(); i++)
+	{
+		tmpIndices[i] = m_vertexIndexMapping[i];
+	}
+
+	TUIntArray usedIndices;
+	usedIndices.resize(static_cast<int>(vcount));
+	memset(&usedIndices[0], 0, sizeof(unsigned int) * vcount);
+
+	ocount = 0;
+
+	for (i = 0; i < int(indexcount); i++)
+	{
+		unsigned int v = indices[i];  // original array index
+
+		btAssert(v >= 0 && v < vcount);
+
+		if (usedIndices[static_cast<int>(v)])  // if already remapped
+		{
+			indices[i] = usedIndices[static_cast<int>(v)] - 1;  // index to new array
+		}
+		else
+		{
+			indices[i] = ocount;  // new index mapping
+
+			overts[ocount][0] = verts[v][0];  // copy old vert to new vert array
+			overts[ocount][1] = verts[v][1];
+			overts[ocount][2] = verts[v][2];
+
+			for (int k = 0; k < m_vertexIndexMapping.size(); k++)
+			{
+				if (tmpIndices[k] == int(v))
+					m_vertexIndexMapping[k] = ocount;
+			}
+
+			ocount++;  // increment output vert count
+
+			btAssert(ocount >= 0 && ocount <= vcount);
+
+			usedIndices[static_cast<int>(v)] = ocount;  // assign new index remapping
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btConvexHull.h b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHull.h
new file mode 100644
index 0000000..f890d75
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHull.h
@@ -0,0 +1,233 @@
+
+/*
+Stan Melax Convex Hull Computation
+Copyright (c) 2008 Stan Melax http://www.melax.com/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///includes modifications/improvements by John Ratcliff, see BringOutYourDead below.
+
+#ifndef BT_CD_HULL_H
+#define BT_CD_HULL_H
+
+#include "btVector3.h"
+#include "btAlignedObjectArray.h"
+
+typedef btAlignedObjectArray<unsigned int> TUIntArray;
+
+class HullResult
+{
+public:
+	HullResult(void)
+	{
+		mPolygons = true;
+		mNumOutputVertices = 0;
+		mNumFaces = 0;
+		mNumIndices = 0;
+	}
+	bool mPolygons;                                    // true if indices represents polygons, false indices are triangles
+	unsigned int mNumOutputVertices;                   // number of vertices in the output hull
+	btAlignedObjectArray<btVector3> m_OutputVertices;  // array of vertices
+	unsigned int mNumFaces;                            // the number of faces produced
+	unsigned int mNumIndices;                          // the total number of indices
+	btAlignedObjectArray<unsigned int> m_Indices;      // pointer to indices.
+
+	// If triangles, then indices are array indexes into the vertex list.
+	// If polygons, indices are in the form (number of points in face) (p1, p2, p3, ..) etc..
+};
+
+enum HullFlag
+{
+	QF_TRIANGLES = (1 << 0),      // report results as triangles, not polygons.
+	QF_REVERSE_ORDER = (1 << 1),  // reverse order of the triangle indices.
+	QF_DEFAULT = QF_TRIANGLES
+};
+
+class HullDesc
+{
+public:
+	HullDesc(void)
+	{
+		mFlags = QF_DEFAULT;
+		mVcount = 0;
+		mVertices = 0;
+		mVertexStride = sizeof(btVector3);
+		mNormalEpsilon = 0.001f;
+		mMaxVertices = 4096;  // maximum number of points to be considered for a convex hull.
+		mMaxFaces = 4096;
+	};
+
+	HullDesc(HullFlag flag,
+			 unsigned int vcount,
+			 const btVector3* vertices,
+			 unsigned int stride = sizeof(btVector3))
+	{
+		mFlags = flag;
+		mVcount = vcount;
+		mVertices = vertices;
+		mVertexStride = stride;
+		mNormalEpsilon = btScalar(0.001);
+		mMaxVertices = 4096;
+	}
+
+	bool HasHullFlag(HullFlag flag) const
+	{
+		if (mFlags & flag) return true;
+		return false;
+	}
+
+	void SetHullFlag(HullFlag flag)
+	{
+		mFlags |= flag;
+	}
+
+	void ClearHullFlag(HullFlag flag)
+	{
+		mFlags &= ~flag;
+	}
+
+	unsigned int mFlags;         // flags to use when generating the convex hull.
+	unsigned int mVcount;        // number of vertices in the input point cloud
+	const btVector3* mVertices;  // the array of vertices.
+	unsigned int mVertexStride;  // the stride of each vertex, in bytes.
+	btScalar mNormalEpsilon;     // the epsilon for removing duplicates.  This is a normalized value, if normalized bit is on.
+	unsigned int mMaxVertices;   // maximum number of vertices to be considered for the hull!
+	unsigned int mMaxFaces;
+};
+
+enum HullError
+{
+	QE_OK,   // success!
+	QE_FAIL  // failed.
+};
+
+class btPlane
+{
+public:
+	btVector3 normal;
+	btScalar dist;  // distance below origin - the D from plane equasion Ax+By+Cz+D=0
+	btPlane(const btVector3& n, btScalar d) : normal(n), dist(d) {}
+	btPlane() : normal(), dist(0) {}
+};
+
+class ConvexH
+{
+public:
+	class HalfEdge
+	{
+	public:
+		short ea;         // the other half of the edge (index into edges list)
+		unsigned char v;  // the vertex at the start of this edge (index into vertices list)
+		unsigned char p;  // the facet on which this edge lies (index into facets list)
+		HalfEdge() {}
+		HalfEdge(short _ea, unsigned char _v, unsigned char _p) : ea(_ea), v(_v), p(_p) {}
+	};
+	ConvexH()
+	{
+	}
+	~ConvexH()
+	{
+	}
+	btAlignedObjectArray<btVector3> vertices;
+	btAlignedObjectArray<HalfEdge> edges;
+	btAlignedObjectArray<btPlane> facets;
+	ConvexH(int vertices_size, int edges_size, int facets_size);
+};
+
+class int4
+{
+public:
+	int x, y, z, w;
+	int4(){};
+	int4(int _x, int _y, int _z, int _w)
+	{
+		x = _x;
+		y = _y;
+		z = _z;
+		w = _w;
+	}
+	const int& operator[](int i) const { return (&x)[i]; }
+	int& operator[](int i) { return (&x)[i]; }
+};
+
+class PHullResult
+{
+public:
+	PHullResult(void)
+	{
+		mVcount = 0;
+		mIndexCount = 0;
+		mFaceCount = 0;
+		mVertices = 0;
+	}
+
+	unsigned int mVcount;
+	unsigned int mIndexCount;
+	unsigned int mFaceCount;
+	btVector3* mVertices;
+	TUIntArray m_Indices;
+};
+
+///The HullLibrary class can create a convex hull from a collection of vertices, using the ComputeHull method.
+///The btShapeHull class uses this HullLibrary to create a approximate convex mesh given a general (non-polyhedral) convex shape.
+class HullLibrary
+{
+	btAlignedObjectArray<class btHullTriangle*> m_tris;
+
+public:
+	btAlignedObjectArray<int> m_vertexIndexMapping;
+
+	HullError CreateConvexHull(const HullDesc& desc,  // describes the input request
+							   HullResult& result);   // contains the resulst
+	HullError ReleaseResult(HullResult& result);      // release memory allocated for this result, we are done with it.
+
+private:
+	bool ComputeHull(unsigned int vcount, const btVector3* vertices, PHullResult& result, unsigned int vlimit);
+
+	class btHullTriangle* allocateTriangle(int a, int b, int c);
+	void deAllocateTriangle(btHullTriangle*);
+	void b2bfix(btHullTriangle* s, btHullTriangle* t);
+
+	void removeb2b(btHullTriangle* s, btHullTriangle* t);
+
+	void checkit(btHullTriangle* t);
+
+	btHullTriangle* extrudable(btScalar epsilon);
+
+	int calchull(btVector3* verts, int verts_count, TUIntArray& tris_out, int& tris_count, int vlimit);
+
+	int calchullgen(btVector3* verts, int verts_count, int vlimit);
+
+	int4 FindSimplex(btVector3* verts, int verts_count, btAlignedObjectArray<int>& allow);
+
+	class ConvexH* ConvexHCrop(ConvexH& convex, const btPlane& slice);
+
+	void extrude(class btHullTriangle* t0, int v);
+
+	ConvexH* test_cube();
+
+	//BringOutYourDead (John Ratcliff): When you create a convex hull you hand it a large input set of vertices forming a 'point cloud'.
+	//After the hull is generated it give you back a set of polygon faces which index the *original* point cloud.
+	//The thing is, often times, there are many 'dead vertices' in the point cloud that are on longer referenced by the hull.
+	//The routine 'BringOutYourDead' find only the referenced vertices, copies them to an new buffer, and re-indexes the hull so that it is a minimal representation.
+	void BringOutYourDead(const btVector3* verts, unsigned int vcount, btVector3* overts, unsigned int& ocount, unsigned int* indices, unsigned indexcount);
+
+	bool CleanupVertices(unsigned int svcount,
+						 const btVector3* svertices,
+						 unsigned int stride,
+						 unsigned int& vcount,  // output number of vertices
+						 btVector3* vertices,   // location to store the results.
+						 btScalar normalepsilon,
+						 btVector3& scale);
+};
+
+#endif  //BT_CD_HULL_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btConvexHullComputer.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHullComputer.cpp
new file mode 100644
index 0000000..12125fd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHullComputer.cpp
@@ -0,0 +1,2760 @@
+/*
+Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+
+#include "btConvexHullComputer.h"
+#include "btAlignedObjectArray.h"
+#include "btMinMax.h"
+#include "btVector3.h"
+
+#ifdef __GNUC__
+#include <stdint.h>
+#elif defined(_MSC_VER)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+#else
+typedef int int32_t;
+typedef long long int int64_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long int uint64_t;
+#endif
+
+//The definition of USE_X86_64_ASM is moved into the build system. You can enable it manually by commenting out the following lines
+//#if (defined(__GNUC__) && defined(__x86_64__) && !defined(__ICL))  // || (defined(__ICL) && defined(_M_X64))   bug in Intel compiler, disable inline assembly
+//	#define USE_X86_64_ASM
+//#endif
+
+//#define DEBUG_CONVEX_HULL
+//#define SHOW_ITERATIONS
+
+#if defined(DEBUG_CONVEX_HULL) || defined(SHOW_ITERATIONS)
+#include <stdio.h>
+#endif
+
+// Convex hull implementation based on Preparata and Hong
+// Ole Kniemeyer, MAXON Computer GmbH
+class btConvexHullInternal
+{
+public:
+	class Point64
+	{
+	public:
+		int64_t x;
+		int64_t y;
+		int64_t z;
+
+		Point64(int64_t x, int64_t y, int64_t z) : x(x), y(y), z(z)
+		{
+		}
+
+		bool isZero()
+		{
+			return (x == 0) && (y == 0) && (z == 0);
+		}
+
+		int64_t dot(const Point64& b) const
+		{
+			return x * b.x + y * b.y + z * b.z;
+		}
+	};
+
+	class Point32
+	{
+	public:
+		int32_t x;
+		int32_t y;
+		int32_t z;
+		int index;
+
+		Point32()
+		{
+		}
+
+		Point32(int32_t x, int32_t y, int32_t z) : x(x), y(y), z(z), index(-1)
+		{
+		}
+
+		bool operator==(const Point32& b) const
+		{
+			return (x == b.x) && (y == b.y) && (z == b.z);
+		}
+
+		bool operator!=(const Point32& b) const
+		{
+			return (x != b.x) || (y != b.y) || (z != b.z);
+		}
+
+		bool isZero()
+		{
+			return (x == 0) && (y == 0) && (z == 0);
+		}
+
+		Point64 cross(const Point32& b) const
+		{
+			return Point64(((int64_t)y) * b.z - ((int64_t)z) * b.y, ((int64_t)z) * b.x - ((int64_t)x) * b.z, ((int64_t)x) * b.y - ((int64_t)y) * b.x);
+		}
+
+		Point64 cross(const Point64& b) const
+		{
+			return Point64(y * b.z - z * b.y, z * b.x - x * b.z, x * b.y - y * b.x);
+		}
+
+		int64_t dot(const Point32& b) const
+		{
+			return ((int64_t)x) * b.x + ((int64_t)y) * b.y + ((int64_t)z) * b.z;
+		}
+
+		int64_t dot(const Point64& b) const
+		{
+			return x * b.x + y * b.y + z * b.z;
+		}
+
+		Point32 operator+(const Point32& b) const
+		{
+			return Point32(x + b.x, y + b.y, z + b.z);
+		}
+
+		Point32 operator-(const Point32& b) const
+		{
+			return Point32(x - b.x, y - b.y, z - b.z);
+		}
+	};
+
+	class Int128
+	{
+	public:
+		uint64_t low;
+		uint64_t high;
+
+		Int128()
+		{
+		}
+
+		Int128(uint64_t low, uint64_t high) : low(low), high(high)
+		{
+		}
+
+		Int128(uint64_t low) : low(low), high(0)
+		{
+		}
+
+		Int128(int64_t value) : low(value), high((value >= 0) ? 0 : (uint64_t)-1LL)
+		{
+		}
+
+		static Int128 mul(int64_t a, int64_t b);
+
+		static Int128 mul(uint64_t a, uint64_t b);
+
+		Int128 operator-() const
+		{
+			return Int128((uint64_t) - (int64_t)low, ~high + (low == 0));
+		}
+
+		Int128 operator+(const Int128& b) const
+		{
+#ifdef USE_X86_64_ASM
+			Int128 result;
+			__asm__(
+				"addq %[bl], %[rl]\n\t"
+				"adcq %[bh], %[rh]\n\t"
+				: [rl] "=r"(result.low), [rh] "=r"(result.high)
+				: "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+				: "cc");
+			return result;
+#else
+			uint64_t lo = low + b.low;
+			return Int128(lo, high + b.high + (lo < low));
+#endif
+		}
+
+		Int128 operator-(const Int128& b) const
+		{
+#ifdef USE_X86_64_ASM
+			Int128 result;
+			__asm__(
+				"subq %[bl], %[rl]\n\t"
+				"sbbq %[bh], %[rh]\n\t"
+				: [rl] "=r"(result.low), [rh] "=r"(result.high)
+				: "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+				: "cc");
+			return result;
+#else
+			return *this + -b;
+#endif
+		}
+
+		Int128& operator+=(const Int128& b)
+		{
+#ifdef USE_X86_64_ASM
+			__asm__(
+				"addq %[bl], %[rl]\n\t"
+				"adcq %[bh], %[rh]\n\t"
+				: [rl] "=r"(low), [rh] "=r"(high)
+				: "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+				: "cc");
+#else
+			uint64_t lo = low + b.low;
+			if (lo < low)
+			{
+				++high;
+			}
+			low = lo;
+			high += b.high;
+#endif
+			return *this;
+		}
+
+		Int128& operator++()
+		{
+			if (++low == 0)
+			{
+				++high;
+			}
+			return *this;
+		}
+
+		Int128 operator*(int64_t b) const;
+
+		btScalar toScalar() const
+		{
+			return ((int64_t)high >= 0) ? btScalar(high) * (btScalar(0x100000000LL) * btScalar(0x100000000LL)) + btScalar(low)
+										: -(-*this).toScalar();
+		}
+
+		int getSign() const
+		{
+			return ((int64_t)high < 0) ? -1 : (high || low) ? 1 : 0;
+		}
+
+		bool operator<(const Int128& b) const
+		{
+			return (high < b.high) || ((high == b.high) && (low < b.low));
+		}
+
+		int ucmp(const Int128& b) const
+		{
+			if (high < b.high)
+			{
+				return -1;
+			}
+			if (high > b.high)
+			{
+				return 1;
+			}
+			if (low < b.low)
+			{
+				return -1;
+			}
+			if (low > b.low)
+			{
+				return 1;
+			}
+			return 0;
+		}
+	};
+
+	class Rational64
+	{
+	private:
+		uint64_t m_numerator;
+		uint64_t m_denominator;
+		int sign;
+
+	public:
+		Rational64(int64_t numerator, int64_t denominator)
+		{
+			if (numerator > 0)
+			{
+				sign = 1;
+				m_numerator = (uint64_t)numerator;
+			}
+			else if (numerator < 0)
+			{
+				sign = -1;
+				m_numerator = (uint64_t)-numerator;
+			}
+			else
+			{
+				sign = 0;
+				m_numerator = 0;
+			}
+			if (denominator > 0)
+			{
+				m_denominator = (uint64_t)denominator;
+			}
+			else if (denominator < 0)
+			{
+				sign = -sign;
+				m_denominator = (uint64_t)-denominator;
+			}
+			else
+			{
+				m_denominator = 0;
+			}
+		}
+
+		bool isNegativeInfinity() const
+		{
+			return (sign < 0) && (m_denominator == 0);
+		}
+
+		bool isNaN() const
+		{
+			return (sign == 0) && (m_denominator == 0);
+		}
+
+		int compare(const Rational64& b) const;
+
+		btScalar toScalar() const
+		{
+			return sign * ((m_denominator == 0) ? SIMD_INFINITY : (btScalar)m_numerator / m_denominator);
+		}
+	};
+
+	class Rational128
+	{
+	private:
+		Int128 numerator;
+		Int128 denominator;
+		int sign;
+		bool isInt64;
+
+	public:
+		Rational128(int64_t value)
+		{
+			if (value > 0)
+			{
+				sign = 1;
+				this->numerator = value;
+			}
+			else if (value < 0)
+			{
+				sign = -1;
+				this->numerator = -value;
+			}
+			else
+			{
+				sign = 0;
+				this->numerator = (uint64_t)0;
+			}
+			this->denominator = (uint64_t)1;
+			isInt64 = true;
+		}
+
+		Rational128(const Int128& numerator, const Int128& denominator)
+		{
+			sign = numerator.getSign();
+			if (sign >= 0)
+			{
+				this->numerator = numerator;
+			}
+			else
+			{
+				this->numerator = -numerator;
+			}
+			int dsign = denominator.getSign();
+			if (dsign >= 0)
+			{
+				this->denominator = denominator;
+			}
+			else
+			{
+				sign = -sign;
+				this->denominator = -denominator;
+			}
+			isInt64 = false;
+		}
+
+		int compare(const Rational128& b) const;
+
+		int compare(int64_t b) const;
+
+		btScalar toScalar() const
+		{
+			return sign * ((denominator.getSign() == 0) ? SIMD_INFINITY : numerator.toScalar() / denominator.toScalar());
+		}
+	};
+
+	class PointR128
+	{
+	public:
+		Int128 x;
+		Int128 y;
+		Int128 z;
+		Int128 denominator;
+
+		PointR128()
+		{
+		}
+
+		PointR128(Int128 x, Int128 y, Int128 z, Int128 denominator) : x(x), y(y), z(z), denominator(denominator)
+		{
+		}
+
+		btScalar xvalue() const
+		{
+			return x.toScalar() / denominator.toScalar();
+		}
+
+		btScalar yvalue() const
+		{
+			return y.toScalar() / denominator.toScalar();
+		}
+
+		btScalar zvalue() const
+		{
+			return z.toScalar() / denominator.toScalar();
+		}
+	};
+
+	class Edge;
+	class Face;
+
+	class Vertex
+	{
+	public:
+		Vertex* next;
+		Vertex* prev;
+		Edge* edges;
+		Face* firstNearbyFace;
+		Face* lastNearbyFace;
+		PointR128 point128;
+		Point32 point;
+		int copy;
+
+		Vertex() : next(NULL), prev(NULL), edges(NULL), firstNearbyFace(NULL), lastNearbyFace(NULL), copy(-1)
+		{
+		}
+
+#ifdef DEBUG_CONVEX_HULL
+		void print()
+		{
+			printf("V%d (%d, %d, %d)", point.index, point.x, point.y, point.z);
+		}
+
+		void printGraph();
+#endif
+
+		Point32 operator-(const Vertex& b) const
+		{
+			return point - b.point;
+		}
+
+		Rational128 dot(const Point64& b) const
+		{
+			return (point.index >= 0) ? Rational128(point.dot(b))
+									  : Rational128(point128.x * b.x + point128.y * b.y + point128.z * b.z, point128.denominator);
+		}
+
+		btScalar xvalue() const
+		{
+			return (point.index >= 0) ? btScalar(point.x) : point128.xvalue();
+		}
+
+		btScalar yvalue() const
+		{
+			return (point.index >= 0) ? btScalar(point.y) : point128.yvalue();
+		}
+
+		btScalar zvalue() const
+		{
+			return (point.index >= 0) ? btScalar(point.z) : point128.zvalue();
+		}
+
+		void receiveNearbyFaces(Vertex* src)
+		{
+			if (lastNearbyFace)
+			{
+				lastNearbyFace->nextWithSameNearbyVertex = src->firstNearbyFace;
+			}
+			else
+			{
+				firstNearbyFace = src->firstNearbyFace;
+			}
+			if (src->lastNearbyFace)
+			{
+				lastNearbyFace = src->lastNearbyFace;
+			}
+			for (Face* f = src->firstNearbyFace; f; f = f->nextWithSameNearbyVertex)
+			{
+				btAssert(f->nearbyVertex == src);
+				f->nearbyVertex = this;
+			}
+			src->firstNearbyFace = NULL;
+			src->lastNearbyFace = NULL;
+		}
+	};
+
+	class Edge
+	{
+	public:
+		Edge* next;
+		Edge* prev;
+		Edge* reverse;
+		Vertex* target;
+		Face* face;
+		int copy;
+
+		~Edge()
+		{
+			next = NULL;
+			prev = NULL;
+			reverse = NULL;
+			target = NULL;
+			face = NULL;
+		}
+
+		void link(Edge* n)
+		{
+			btAssert(reverse->target == n->reverse->target);
+			next = n;
+			n->prev = this;
+		}
+
+#ifdef DEBUG_CONVEX_HULL
+		void print()
+		{
+			printf("E%p : %d -> %d,  n=%p p=%p   (0 %d\t%d\t%d) -> (%d %d %d)", this, reverse->target->point.index, target->point.index, next, prev,
+				   reverse->target->point.x, reverse->target->point.y, reverse->target->point.z, target->point.x, target->point.y, target->point.z);
+		}
+#endif
+	};
+
+	class Face
+	{
+	public:
+		Face* next;
+		Vertex* nearbyVertex;
+		Face* nextWithSameNearbyVertex;
+		Point32 origin;
+		Point32 dir0;
+		Point32 dir1;
+
+		Face() : next(NULL), nearbyVertex(NULL), nextWithSameNearbyVertex(NULL)
+		{
+		}
+
+		void init(Vertex* a, Vertex* b, Vertex* c)
+		{
+			nearbyVertex = a;
+			origin = a->point;
+			dir0 = *b - *a;
+			dir1 = *c - *a;
+			if (a->lastNearbyFace)
+			{
+				a->lastNearbyFace->nextWithSameNearbyVertex = this;
+			}
+			else
+			{
+				a->firstNearbyFace = this;
+			}
+			a->lastNearbyFace = this;
+		}
+
+		Point64 getNormal()
+		{
+			return dir0.cross(dir1);
+		}
+	};
+
+	template <typename UWord, typename UHWord>
+	class DMul
+	{
+	private:
+		static uint32_t high(uint64_t value)
+		{
+			return (uint32_t)(value >> 32);
+		}
+
+		static uint32_t low(uint64_t value)
+		{
+			return (uint32_t)value;
+		}
+
+		static uint64_t mul(uint32_t a, uint32_t b)
+		{
+			return (uint64_t)a * (uint64_t)b;
+		}
+
+		static void shlHalf(uint64_t& value)
+		{
+			value <<= 32;
+		}
+
+		static uint64_t high(Int128 value)
+		{
+			return value.high;
+		}
+
+		static uint64_t low(Int128 value)
+		{
+			return value.low;
+		}
+
+		static Int128 mul(uint64_t a, uint64_t b)
+		{
+			return Int128::mul(a, b);
+		}
+
+		static void shlHalf(Int128& value)
+		{
+			value.high = value.low;
+			value.low = 0;
+		}
+
+	public:
+		static void mul(UWord a, UWord b, UWord& resLow, UWord& resHigh)
+		{
+			UWord p00 = mul(low(a), low(b));
+			UWord p01 = mul(low(a), high(b));
+			UWord p10 = mul(high(a), low(b));
+			UWord p11 = mul(high(a), high(b));
+			UWord p0110 = UWord(low(p01)) + UWord(low(p10));
+			p11 += high(p01);
+			p11 += high(p10);
+			p11 += high(p0110);
+			shlHalf(p0110);
+			p00 += p0110;
+			if (p00 < p0110)
+			{
+				++p11;
+			}
+			resLow = p00;
+			resHigh = p11;
+		}
+	};
+
+private:
+	class IntermediateHull
+	{
+	public:
+		Vertex* minXy;
+		Vertex* maxXy;
+		Vertex* minYx;
+		Vertex* maxYx;
+
+		IntermediateHull() : minXy(NULL), maxXy(NULL), minYx(NULL), maxYx(NULL)
+		{
+		}
+
+		void print();
+	};
+
+	enum Orientation
+	{
+		NONE,
+		CLOCKWISE,
+		COUNTER_CLOCKWISE
+	};
+
+	template <typename T>
+	class PoolArray
+	{
+	private:
+		T* array;
+		int size;
+
+	public:
+		PoolArray<T>* next;
+
+		PoolArray(int size) : size(size), next(NULL)
+		{
+			array = (T*)btAlignedAlloc(sizeof(T) * size, 16);
+		}
+
+		~PoolArray()
+		{
+			btAlignedFree(array);
+		}
+
+		T* init()
+		{
+			T* o = array;
+			for (int i = 0; i < size; i++, o++)
+			{
+				o->next = (i + 1 < size) ? o + 1 : NULL;
+			}
+			return array;
+		}
+	};
+
+	template <typename T>
+	class Pool
+	{
+	private:
+		PoolArray<T>* arrays;
+		PoolArray<T>* nextArray;
+		T* freeObjects;
+		int arraySize;
+
+	public:
+		Pool() : arrays(NULL), nextArray(NULL), freeObjects(NULL), arraySize(256)
+		{
+		}
+
+		~Pool()
+		{
+			while (arrays)
+			{
+				PoolArray<T>* p = arrays;
+				arrays = p->next;
+				p->~PoolArray<T>();
+				btAlignedFree(p);
+			}
+		}
+
+		void reset()
+		{
+			nextArray = arrays;
+			freeObjects = NULL;
+		}
+
+		void setArraySize(int arraySize)
+		{
+			this->arraySize = arraySize;
+		}
+
+		T* newObject()
+		{
+			T* o = freeObjects;
+			if (!o)
+			{
+				PoolArray<T>* p = nextArray;
+				if (p)
+				{
+					nextArray = p->next;
+				}
+				else
+				{
+					p = new (btAlignedAlloc(sizeof(PoolArray<T>), 16)) PoolArray<T>(arraySize);
+					p->next = arrays;
+					arrays = p;
+				}
+				o = p->init();
+			}
+			freeObjects = o->next;
+			return new (o) T();
+		};
+
+		void freeObject(T* object)
+		{
+			object->~T();
+			object->next = freeObjects;
+			freeObjects = object;
+		}
+	};
+
+	btVector3 scaling;
+	btVector3 center;
+	Pool<Vertex> vertexPool;
+	Pool<Edge> edgePool;
+	Pool<Face> facePool;
+	btAlignedObjectArray<Vertex*> originalVertices;
+	int mergeStamp;
+	int minAxis;
+	int medAxis;
+	int maxAxis;
+	int usedEdgePairs;
+	int maxUsedEdgePairs;
+
+	static Orientation getOrientation(const Edge* prev, const Edge* next, const Point32& s, const Point32& t);
+	Edge* findMaxAngle(bool ccw, const Vertex* start, const Point32& s, const Point64& rxs, const Point64& sxrxs, Rational64& minCot);
+	void findEdgeForCoplanarFaces(Vertex* c0, Vertex* c1, Edge*& e0, Edge*& e1, Vertex* stop0, Vertex* stop1);
+
+	Edge* newEdgePair(Vertex* from, Vertex* to);
+
+	void removeEdgePair(Edge* edge)
+	{
+		Edge* n = edge->next;
+		Edge* r = edge->reverse;
+
+		btAssert(edge->target && r->target);
+
+		if (n != edge)
+		{
+			n->prev = edge->prev;
+			edge->prev->next = n;
+			r->target->edges = n;
+		}
+		else
+		{
+			r->target->edges = NULL;
+		}
+
+		n = r->next;
+
+		if (n != r)
+		{
+			n->prev = r->prev;
+			r->prev->next = n;
+			edge->target->edges = n;
+		}
+		else
+		{
+			edge->target->edges = NULL;
+		}
+
+		edgePool.freeObject(edge);
+		edgePool.freeObject(r);
+		usedEdgePairs--;
+	}
+
+	void computeInternal(int start, int end, IntermediateHull& result);
+
+	bool mergeProjection(IntermediateHull& h0, IntermediateHull& h1, Vertex*& c0, Vertex*& c1);
+
+	void merge(IntermediateHull& h0, IntermediateHull& h1);
+
+	btVector3 toBtVector(const Point32& v);
+
+	btVector3 getBtNormal(Face* face);
+
+	bool shiftFace(Face* face, btScalar amount, btAlignedObjectArray<Vertex*> stack);
+
+public:
+	Vertex* vertexList;
+
+	void compute(const void* coords, bool doubleCoords, int stride, int count);
+
+	btVector3 getCoordinates(const Vertex* v);
+
+	btScalar shrink(btScalar amount, btScalar clampAmount);
+};
+
+btConvexHullInternal::Int128 btConvexHullInternal::Int128::operator*(int64_t b) const
+{
+	bool negative = (int64_t)high < 0;
+	Int128 a = negative ? -*this : *this;
+	if (b < 0)
+	{
+		negative = !negative;
+		b = -b;
+	}
+	Int128 result = mul(a.low, (uint64_t)b);
+	result.high += a.high * (uint64_t)b;
+	return negative ? -result : result;
+}
+
+btConvexHullInternal::Int128 btConvexHullInternal::Int128::mul(int64_t a, int64_t b)
+{
+	Int128 result;
+
+#ifdef USE_X86_64_ASM
+	__asm__("imulq %[b]"
+			: "=a"(result.low), "=d"(result.high)
+			: "0"(a), [b] "r"(b)
+			: "cc");
+	return result;
+
+#else
+	bool negative = a < 0;
+	if (negative)
+	{
+		a = -a;
+	}
+	if (b < 0)
+	{
+		negative = !negative;
+		b = -b;
+	}
+	DMul<uint64_t, uint32_t>::mul((uint64_t)a, (uint64_t)b, result.low, result.high);
+	return negative ? -result : result;
+#endif
+}
+
+btConvexHullInternal::Int128 btConvexHullInternal::Int128::mul(uint64_t a, uint64_t b)
+{
+	Int128 result;
+
+#ifdef USE_X86_64_ASM
+	__asm__("mulq %[b]"
+			: "=a"(result.low), "=d"(result.high)
+			: "0"(a), [b] "r"(b)
+			: "cc");
+
+#else
+	DMul<uint64_t, uint32_t>::mul(a, b, result.low, result.high);
+#endif
+
+	return result;
+}
+
+int btConvexHullInternal::Rational64::compare(const Rational64& b) const
+{
+	if (sign != b.sign)
+	{
+		return sign - b.sign;
+	}
+	else if (sign == 0)
+	{
+		return 0;
+	}
+
+	//	return (numerator * b.denominator > b.numerator * denominator) ? sign : (numerator * b.denominator < b.numerator * denominator) ? -sign : 0;
+
+#ifdef USE_X86_64_ASM
+
+	int result;
+	int64_t tmp;
+	int64_t dummy;
+	__asm__(
+		"mulq %[bn]\n\t"
+		"movq %%rax, %[tmp]\n\t"
+		"movq %%rdx, %%rbx\n\t"
+		"movq %[tn], %%rax\n\t"
+		"mulq %[bd]\n\t"
+		"subq %[tmp], %%rax\n\t"
+		"sbbq %%rbx, %%rdx\n\t"  // rdx:rax contains 128-bit-difference "numerator*b.denominator - b.numerator*denominator"
+		"setnsb %%bh\n\t"        // bh=1 if difference is non-negative, bh=0 otherwise
+		"orq %%rdx, %%rax\n\t"
+		"setnzb %%bl\n\t"      // bl=1 if difference if non-zero, bl=0 if it is zero
+		"decb %%bh\n\t"        // now bx=0x0000 if difference is zero, 0xff01 if it is negative, 0x0001 if it is positive (i.e., same sign as difference)
+		"shll $16, %%ebx\n\t"  // ebx has same sign as difference
+		: "=&b"(result), [tmp] "=&r"(tmp), "=a"(dummy)
+		: "a"(m_denominator), [bn] "g"(b.m_numerator), [tn] "g"(m_numerator), [bd] "g"(b.m_denominator)
+		: "%rdx", "cc");
+	return result ? result ^ sign  // if sign is +1, only bit 0 of result is inverted, which does not change the sign of result (and cannot result in zero)
+								   // if sign is -1, all bits of result are inverted, which changes the sign of result (and again cannot result in zero)
+				  : 0;
+
+#else
+
+	return sign * Int128::mul(m_numerator, b.m_denominator).ucmp(Int128::mul(m_denominator, b.m_numerator));
+
+#endif
+}
+
+int btConvexHullInternal::Rational128::compare(const Rational128& b) const
+{
+	if (sign != b.sign)
+	{
+		return sign - b.sign;
+	}
+	else if (sign == 0)
+	{
+		return 0;
+	}
+	if (isInt64)
+	{
+		return -b.compare(sign * (int64_t)numerator.low);
+	}
+
+	Int128 nbdLow, nbdHigh, dbnLow, dbnHigh;
+	DMul<Int128, uint64_t>::mul(numerator, b.denominator, nbdLow, nbdHigh);
+	DMul<Int128, uint64_t>::mul(denominator, b.numerator, dbnLow, dbnHigh);
+
+	int cmp = nbdHigh.ucmp(dbnHigh);
+	if (cmp)
+	{
+		return cmp * sign;
+	}
+	return nbdLow.ucmp(dbnLow) * sign;
+}
+
+int btConvexHullInternal::Rational128::compare(int64_t b) const
+{
+	if (isInt64)
+	{
+		int64_t a = sign * (int64_t)numerator.low;
+		return (a > b) ? 1 : (a < b) ? -1 : 0;
+	}
+	if (b > 0)
+	{
+		if (sign <= 0)
+		{
+			return -1;
+		}
+	}
+	else if (b < 0)
+	{
+		if (sign >= 0)
+		{
+			return 1;
+		}
+		b = -b;
+	}
+	else
+	{
+		return sign;
+	}
+
+	return numerator.ucmp(denominator * b) * sign;
+}
+
+btConvexHullInternal::Edge* btConvexHullInternal::newEdgePair(Vertex* from, Vertex* to)
+{
+	btAssert(from && to);
+	Edge* e = edgePool.newObject();
+	Edge* r = edgePool.newObject();
+	e->reverse = r;
+	r->reverse = e;
+	e->copy = mergeStamp;
+	r->copy = mergeStamp;
+	e->target = to;
+	r->target = from;
+	e->face = NULL;
+	r->face = NULL;
+	usedEdgePairs++;
+	if (usedEdgePairs > maxUsedEdgePairs)
+	{
+		maxUsedEdgePairs = usedEdgePairs;
+	}
+	return e;
+}
+
+bool btConvexHullInternal::mergeProjection(IntermediateHull& h0, IntermediateHull& h1, Vertex*& c0, Vertex*& c1)
+{
+	Vertex* v0 = h0.maxYx;
+	Vertex* v1 = h1.minYx;
+	if ((v0->point.x == v1->point.x) && (v0->point.y == v1->point.y))
+	{
+		btAssert(v0->point.z < v1->point.z);
+		Vertex* v1p = v1->prev;
+		if (v1p == v1)
+		{
+			c0 = v0;
+			if (v1->edges)
+			{
+				btAssert(v1->edges->next == v1->edges);
+				v1 = v1->edges->target;
+				btAssert(v1->edges->next == v1->edges);
+			}
+			c1 = v1;
+			return false;
+		}
+		Vertex* v1n = v1->next;
+		v1p->next = v1n;
+		v1n->prev = v1p;
+		if (v1 == h1.minXy)
+		{
+			if ((v1n->point.x < v1p->point.x) || ((v1n->point.x == v1p->point.x) && (v1n->point.y < v1p->point.y)))
+			{
+				h1.minXy = v1n;
+			}
+			else
+			{
+				h1.minXy = v1p;
+			}
+		}
+		if (v1 == h1.maxXy)
+		{
+			if ((v1n->point.x > v1p->point.x) || ((v1n->point.x == v1p->point.x) && (v1n->point.y > v1p->point.y)))
+			{
+				h1.maxXy = v1n;
+			}
+			else
+			{
+				h1.maxXy = v1p;
+			}
+		}
+	}
+
+	v0 = h0.maxXy;
+	v1 = h1.maxXy;
+	Vertex* v00 = NULL;
+	Vertex* v10 = NULL;
+	int32_t sign = 1;
+
+	for (int side = 0; side <= 1; side++)
+	{
+		int32_t dx = (v1->point.x - v0->point.x) * sign;
+		if (dx > 0)
+		{
+			while (true)
+			{
+				int32_t dy = v1->point.y - v0->point.y;
+
+				Vertex* w0 = side ? v0->next : v0->prev;
+				if (w0 != v0)
+				{
+					int32_t dx0 = (w0->point.x - v0->point.x) * sign;
+					int32_t dy0 = w0->point.y - v0->point.y;
+					if ((dy0 <= 0) && ((dx0 == 0) || ((dx0 < 0) && (dy0 * dx <= dy * dx0))))
+					{
+						v0 = w0;
+						dx = (v1->point.x - v0->point.x) * sign;
+						continue;
+					}
+				}
+
+				Vertex* w1 = side ? v1->next : v1->prev;
+				if (w1 != v1)
+				{
+					int32_t dx1 = (w1->point.x - v1->point.x) * sign;
+					int32_t dy1 = w1->point.y - v1->point.y;
+					int32_t dxn = (w1->point.x - v0->point.x) * sign;
+					if ((dxn > 0) && (dy1 < 0) && ((dx1 == 0) || ((dx1 < 0) && (dy1 * dx < dy * dx1))))
+					{
+						v1 = w1;
+						dx = dxn;
+						continue;
+					}
+				}
+
+				break;
+			}
+		}
+		else if (dx < 0)
+		{
+			while (true)
+			{
+				int32_t dy = v1->point.y - v0->point.y;
+
+				Vertex* w1 = side ? v1->prev : v1->next;
+				if (w1 != v1)
+				{
+					int32_t dx1 = (w1->point.x - v1->point.x) * sign;
+					int32_t dy1 = w1->point.y - v1->point.y;
+					if ((dy1 >= 0) && ((dx1 == 0) || ((dx1 < 0) && (dy1 * dx <= dy * dx1))))
+					{
+						v1 = w1;
+						dx = (v1->point.x - v0->point.x) * sign;
+						continue;
+					}
+				}
+
+				Vertex* w0 = side ? v0->prev : v0->next;
+				if (w0 != v0)
+				{
+					int32_t dx0 = (w0->point.x - v0->point.x) * sign;
+					int32_t dy0 = w0->point.y - v0->point.y;
+					int32_t dxn = (v1->point.x - w0->point.x) * sign;
+					if ((dxn < 0) && (dy0 > 0) && ((dx0 == 0) || ((dx0 < 0) && (dy0 * dx < dy * dx0))))
+					{
+						v0 = w0;
+						dx = dxn;
+						continue;
+					}
+				}
+
+				break;
+			}
+		}
+		else
+		{
+			int32_t x = v0->point.x;
+			int32_t y0 = v0->point.y;
+			Vertex* w0 = v0;
+			Vertex* t;
+			while (((t = side ? w0->next : w0->prev) != v0) && (t->point.x == x) && (t->point.y <= y0))
+			{
+				w0 = t;
+				y0 = t->point.y;
+			}
+			v0 = w0;
+
+			int32_t y1 = v1->point.y;
+			Vertex* w1 = v1;
+			while (((t = side ? w1->prev : w1->next) != v1) && (t->point.x == x) && (t->point.y >= y1))
+			{
+				w1 = t;
+				y1 = t->point.y;
+			}
+			v1 = w1;
+		}
+
+		if (side == 0)
+		{
+			v00 = v0;
+			v10 = v1;
+
+			v0 = h0.minXy;
+			v1 = h1.minXy;
+			sign = -1;
+		}
+	}
+
+	v0->prev = v1;
+	v1->next = v0;
+
+	v00->next = v10;
+	v10->prev = v00;
+
+	if (h1.minXy->point.x < h0.minXy->point.x)
+	{
+		h0.minXy = h1.minXy;
+	}
+	if (h1.maxXy->point.x >= h0.maxXy->point.x)
+	{
+		h0.maxXy = h1.maxXy;
+	}
+
+	h0.maxYx = h1.maxYx;
+
+	c0 = v00;
+	c1 = v10;
+
+	return true;
+}
+
+void btConvexHullInternal::computeInternal(int start, int end, IntermediateHull& result)
+{
+	int n = end - start;
+	switch (n)
+	{
+		case 0:
+			result.minXy = NULL;
+			result.maxXy = NULL;
+			result.minYx = NULL;
+			result.maxYx = NULL;
+			return;
+		case 2:
+		{
+			Vertex* v = originalVertices[start];
+			Vertex* w = v + 1;
+			if (v->point != w->point)
+			{
+				int32_t dx = v->point.x - w->point.x;
+				int32_t dy = v->point.y - w->point.y;
+
+				if ((dx == 0) && (dy == 0))
+				{
+					if (v->point.z > w->point.z)
+					{
+						Vertex* t = w;
+						w = v;
+						v = t;
+					}
+					btAssert(v->point.z < w->point.z);
+					v->next = v;
+					v->prev = v;
+					result.minXy = v;
+					result.maxXy = v;
+					result.minYx = v;
+					result.maxYx = v;
+				}
+				else
+				{
+					v->next = w;
+					v->prev = w;
+					w->next = v;
+					w->prev = v;
+
+					if ((dx < 0) || ((dx == 0) && (dy < 0)))
+					{
+						result.minXy = v;
+						result.maxXy = w;
+					}
+					else
+					{
+						result.minXy = w;
+						result.maxXy = v;
+					}
+
+					if ((dy < 0) || ((dy == 0) && (dx < 0)))
+					{
+						result.minYx = v;
+						result.maxYx = w;
+					}
+					else
+					{
+						result.minYx = w;
+						result.maxYx = v;
+					}
+				}
+
+				Edge* e = newEdgePair(v, w);
+				e->link(e);
+				v->edges = e;
+
+				e = e->reverse;
+				e->link(e);
+				w->edges = e;
+
+				return;
+			}
+			{
+				Vertex* v = originalVertices[start];
+				v->edges = NULL;
+				v->next = v;
+				v->prev = v;
+
+				result.minXy = v;
+				result.maxXy = v;
+				result.minYx = v;
+				result.maxYx = v;
+			}
+
+			return;
+		}
+
+		case 1:
+		{
+			Vertex* v = originalVertices[start];
+			v->edges = NULL;
+			v->next = v;
+			v->prev = v;
+
+			result.minXy = v;
+			result.maxXy = v;
+			result.minYx = v;
+			result.maxYx = v;
+
+			return;
+		}
+	}
+
+	int split0 = start + n / 2;
+	Point32 p = originalVertices[split0 - 1]->point;
+	int split1 = split0;
+	while ((split1 < end) && (originalVertices[split1]->point == p))
+	{
+		split1++;
+	}
+	computeInternal(start, split0, result);
+	IntermediateHull hull1;
+	computeInternal(split1, end, hull1);
+#ifdef DEBUG_CONVEX_HULL
+	printf("\n\nMerge\n");
+	result.print();
+	hull1.print();
+#endif
+	merge(result, hull1);
+#ifdef DEBUG_CONVEX_HULL
+	printf("\n  Result\n");
+	result.print();
+#endif
+}
+
+#ifdef DEBUG_CONVEX_HULL
+void btConvexHullInternal::IntermediateHull::print()
+{
+	printf("    Hull\n");
+	for (Vertex* v = minXy; v;)
+	{
+		printf("      ");
+		v->print();
+		if (v == maxXy)
+		{
+			printf(" maxXy");
+		}
+		if (v == minYx)
+		{
+			printf(" minYx");
+		}
+		if (v == maxYx)
+		{
+			printf(" maxYx");
+		}
+		if (v->next->prev != v)
+		{
+			printf(" Inconsistency");
+		}
+		printf("\n");
+		v = v->next;
+		if (v == minXy)
+		{
+			break;
+		}
+	}
+	if (minXy)
+	{
+		minXy->copy = (minXy->copy == -1) ? -2 : -1;
+		minXy->printGraph();
+	}
+}
+
+void btConvexHullInternal::Vertex::printGraph()
+{
+	print();
+	printf("\nEdges\n");
+	Edge* e = edges;
+	if (e)
+	{
+		do
+		{
+			e->print();
+			printf("\n");
+			e = e->next;
+		} while (e != edges);
+		do
+		{
+			Vertex* v = e->target;
+			if (v->copy != copy)
+			{
+				v->copy = copy;
+				v->printGraph();
+			}
+			e = e->next;
+		} while (e != edges);
+	}
+}
+#endif
+
+btConvexHullInternal::Orientation btConvexHullInternal::getOrientation(const Edge* prev, const Edge* next, const Point32& s, const Point32& t)
+{
+	btAssert(prev->reverse->target == next->reverse->target);
+	if (prev->next == next)
+	{
+		if (prev->prev == next)
+		{
+			Point64 n = t.cross(s);
+			Point64 m = (*prev->target - *next->reverse->target).cross(*next->target - *next->reverse->target);
+			btAssert(!m.isZero());
+			int64_t dot = n.dot(m);
+			btAssert(dot != 0);
+			return (dot > 0) ? COUNTER_CLOCKWISE : CLOCKWISE;
+		}
+		return COUNTER_CLOCKWISE;
+	}
+	else if (prev->prev == next)
+	{
+		return CLOCKWISE;
+	}
+	else
+	{
+		return NONE;
+	}
+}
+
+btConvexHullInternal::Edge* btConvexHullInternal::findMaxAngle(bool ccw, const Vertex* start, const Point32& s, const Point64& rxs, const Point64& sxrxs, Rational64& minCot)
+{
+	Edge* minEdge = NULL;
+
+#ifdef DEBUG_CONVEX_HULL
+	printf("find max edge for %d\n", start->point.index);
+#endif
+	Edge* e = start->edges;
+	if (e)
+	{
+		do
+		{
+			if (e->copy > mergeStamp)
+			{
+				Point32 t = *e->target - *start;
+				Rational64 cot(t.dot(sxrxs), t.dot(rxs));
+#ifdef DEBUG_CONVEX_HULL
+				printf("      Angle is %f (%d) for ", (float)btAtan(cot.toScalar()), (int)cot.isNaN());
+				e->print();
+#endif
+				if (cot.isNaN())
+				{
+					btAssert(ccw ? (t.dot(s) < 0) : (t.dot(s) > 0));
+				}
+				else
+				{
+					int cmp;
+					if (minEdge == NULL)
+					{
+						minCot = cot;
+						minEdge = e;
+					}
+					else if ((cmp = cot.compare(minCot)) < 0)
+					{
+						minCot = cot;
+						minEdge = e;
+					}
+					else if ((cmp == 0) && (ccw == (getOrientation(minEdge, e, s, t) == COUNTER_CLOCKWISE)))
+					{
+						minEdge = e;
+					}
+				}
+#ifdef DEBUG_CONVEX_HULL
+				printf("\n");
+#endif
+			}
+			e = e->next;
+		} while (e != start->edges);
+	}
+	return minEdge;
+}
+
+void btConvexHullInternal::findEdgeForCoplanarFaces(Vertex* c0, Vertex* c1, Edge*& e0, Edge*& e1, Vertex* stop0, Vertex* stop1)
+{
+	Edge* start0 = e0;
+	Edge* start1 = e1;
+	Point32 et0 = start0 ? start0->target->point : c0->point;
+	Point32 et1 = start1 ? start1->target->point : c1->point;
+	Point32 s = c1->point - c0->point;
+	Point64 normal = ((start0 ? start0 : start1)->target->point - c0->point).cross(s);
+	int64_t dist = c0->point.dot(normal);
+	btAssert(!start1 || (start1->target->point.dot(normal) == dist));
+	Point64 perp = s.cross(normal);
+	btAssert(!perp.isZero());
+
+#ifdef DEBUG_CONVEX_HULL
+	printf("   Advancing %d %d  (%p %p, %d %d)\n", c0->point.index, c1->point.index, start0, start1, start0 ? start0->target->point.index : -1, start1 ? start1->target->point.index : -1);
+#endif
+
+	int64_t maxDot0 = et0.dot(perp);
+	if (e0)
+	{
+		while (e0->target != stop0)
+		{
+			Edge* e = e0->reverse->prev;
+			if (e->target->point.dot(normal) < dist)
+			{
+				break;
+			}
+			btAssert(e->target->point.dot(normal) == dist);
+			if (e->copy == mergeStamp)
+			{
+				break;
+			}
+			int64_t dot = e->target->point.dot(perp);
+			if (dot <= maxDot0)
+			{
+				break;
+			}
+			maxDot0 = dot;
+			e0 = e;
+			et0 = e->target->point;
+		}
+	}
+
+	int64_t maxDot1 = et1.dot(perp);
+	if (e1)
+	{
+		while (e1->target != stop1)
+		{
+			Edge* e = e1->reverse->next;
+			if (e->target->point.dot(normal) < dist)
+			{
+				break;
+			}
+			btAssert(e->target->point.dot(normal) == dist);
+			if (e->copy == mergeStamp)
+			{
+				break;
+			}
+			int64_t dot = e->target->point.dot(perp);
+			if (dot <= maxDot1)
+			{
+				break;
+			}
+			maxDot1 = dot;
+			e1 = e;
+			et1 = e->target->point;
+		}
+	}
+
+#ifdef DEBUG_CONVEX_HULL
+	printf("   Starting at %d %d\n", et0.index, et1.index);
+#endif
+
+	int64_t dx = maxDot1 - maxDot0;
+	if (dx > 0)
+	{
+		while (true)
+		{
+			int64_t dy = (et1 - et0).dot(s);
+
+			if (e0 && (e0->target != stop0))
+			{
+				Edge* f0 = e0->next->reverse;
+				if (f0->copy > mergeStamp)
+				{
+					int64_t dx0 = (f0->target->point - et0).dot(perp);
+					int64_t dy0 = (f0->target->point - et0).dot(s);
+					if ((dx0 == 0) ? (dy0 < 0) : ((dx0 < 0) && (Rational64(dy0, dx0).compare(Rational64(dy, dx)) >= 0)))
+					{
+						et0 = f0->target->point;
+						dx = (et1 - et0).dot(perp);
+						e0 = (e0 == start0) ? NULL : f0;
+						continue;
+					}
+				}
+			}
+
+			if (e1 && (e1->target != stop1))
+			{
+				Edge* f1 = e1->reverse->next;
+				if (f1->copy > mergeStamp)
+				{
+					Point32 d1 = f1->target->point - et1;
+					if (d1.dot(normal) == 0)
+					{
+						int64_t dx1 = d1.dot(perp);
+						int64_t dy1 = d1.dot(s);
+						int64_t dxn = (f1->target->point - et0).dot(perp);
+						if ((dxn > 0) && ((dx1 == 0) ? (dy1 < 0) : ((dx1 < 0) && (Rational64(dy1, dx1).compare(Rational64(dy, dx)) > 0))))
+						{
+							e1 = f1;
+							et1 = e1->target->point;
+							dx = dxn;
+							continue;
+						}
+					}
+					else
+					{
+						btAssert((e1 == start1) && (d1.dot(normal) < 0));
+					}
+				}
+			}
+
+			break;
+		}
+	}
+	else if (dx < 0)
+	{
+		while (true)
+		{
+			int64_t dy = (et1 - et0).dot(s);
+
+			if (e1 && (e1->target != stop1))
+			{
+				Edge* f1 = e1->prev->reverse;
+				if (f1->copy > mergeStamp)
+				{
+					int64_t dx1 = (f1->target->point - et1).dot(perp);
+					int64_t dy1 = (f1->target->point - et1).dot(s);
+					if ((dx1 == 0) ? (dy1 > 0) : ((dx1 < 0) && (Rational64(dy1, dx1).compare(Rational64(dy, dx)) <= 0)))
+					{
+						et1 = f1->target->point;
+						dx = (et1 - et0).dot(perp);
+						e1 = (e1 == start1) ? NULL : f1;
+						continue;
+					}
+				}
+			}
+
+			if (e0 && (e0->target != stop0))
+			{
+				Edge* f0 = e0->reverse->prev;
+				if (f0->copy > mergeStamp)
+				{
+					Point32 d0 = f0->target->point - et0;
+					if (d0.dot(normal) == 0)
+					{
+						int64_t dx0 = d0.dot(perp);
+						int64_t dy0 = d0.dot(s);
+						int64_t dxn = (et1 - f0->target->point).dot(perp);
+						if ((dxn < 0) && ((dx0 == 0) ? (dy0 > 0) : ((dx0 < 0) && (Rational64(dy0, dx0).compare(Rational64(dy, dx)) < 0))))
+						{
+							e0 = f0;
+							et0 = e0->target->point;
+							dx = dxn;
+							continue;
+						}
+					}
+					else
+					{
+						btAssert((e0 == start0) && (d0.dot(normal) < 0));
+					}
+				}
+			}
+
+			break;
+		}
+	}
+#ifdef DEBUG_CONVEX_HULL
+	printf("   Advanced edges to %d %d\n", et0.index, et1.index);
+#endif
+}
+
+void btConvexHullInternal::merge(IntermediateHull& h0, IntermediateHull& h1)
+{
+	if (!h1.maxXy)
+	{
+		return;
+	}
+	if (!h0.maxXy)
+	{
+		h0 = h1;
+		return;
+	}
+
+	mergeStamp--;
+
+	Vertex* c0 = NULL;
+	Edge* toPrev0 = NULL;
+	Edge* firstNew0 = NULL;
+	Edge* pendingHead0 = NULL;
+	Edge* pendingTail0 = NULL;
+	Vertex* c1 = NULL;
+	Edge* toPrev1 = NULL;
+	Edge* firstNew1 = NULL;
+	Edge* pendingHead1 = NULL;
+	Edge* pendingTail1 = NULL;
+	Point32 prevPoint;
+
+	if (mergeProjection(h0, h1, c0, c1))
+	{
+		Point32 s = *c1 - *c0;
+		Point64 normal = Point32(0, 0, -1).cross(s);
+		Point64 t = s.cross(normal);
+		btAssert(!t.isZero());
+
+		Edge* e = c0->edges;
+		Edge* start0 = NULL;
+		if (e)
+		{
+			do
+			{
+				int64_t dot = (*e->target - *c0).dot(normal);
+				btAssert(dot <= 0);
+				if ((dot == 0) && ((*e->target - *c0).dot(t) > 0))
+				{
+					if (!start0 || (getOrientation(start0, e, s, Point32(0, 0, -1)) == CLOCKWISE))
+					{
+						start0 = e;
+					}
+				}
+				e = e->next;
+			} while (e != c0->edges);
+		}
+
+		e = c1->edges;
+		Edge* start1 = NULL;
+		if (e)
+		{
+			do
+			{
+				int64_t dot = (*e->target - *c1).dot(normal);
+				btAssert(dot <= 0);
+				if ((dot == 0) && ((*e->target - *c1).dot(t) > 0))
+				{
+					if (!start1 || (getOrientation(start1, e, s, Point32(0, 0, -1)) == COUNTER_CLOCKWISE))
+					{
+						start1 = e;
+					}
+				}
+				e = e->next;
+			} while (e != c1->edges);
+		}
+
+		if (start0 || start1)
+		{
+			findEdgeForCoplanarFaces(c0, c1, start0, start1, NULL, NULL);
+			if (start0)
+			{
+				c0 = start0->target;
+			}
+			if (start1)
+			{
+				c1 = start1->target;
+			}
+		}
+
+		prevPoint = c1->point;
+		prevPoint.z++;
+	}
+	else
+	{
+		prevPoint = c1->point;
+		prevPoint.x++;
+	}
+
+	Vertex* first0 = c0;
+	Vertex* first1 = c1;
+	bool firstRun = true;
+
+	while (true)
+	{
+		Point32 s = *c1 - *c0;
+		Point32 r = prevPoint - c0->point;
+		Point64 rxs = r.cross(s);
+		Point64 sxrxs = s.cross(rxs);
+
+#ifdef DEBUG_CONVEX_HULL
+		printf("\n  Checking %d %d\n", c0->point.index, c1->point.index);
+#endif
+		Rational64 minCot0(0, 0);
+		Edge* min0 = findMaxAngle(false, c0, s, rxs, sxrxs, minCot0);
+		Rational64 minCot1(0, 0);
+		Edge* min1 = findMaxAngle(true, c1, s, rxs, sxrxs, minCot1);
+		if (!min0 && !min1)
+		{
+			Edge* e = newEdgePair(c0, c1);
+			e->link(e);
+			c0->edges = e;
+
+			e = e->reverse;
+			e->link(e);
+			c1->edges = e;
+			return;
+		}
+		else
+		{
+			int cmp = !min0 ? 1 : !min1 ? -1 : minCot0.compare(minCot1);
+#ifdef DEBUG_CONVEX_HULL
+			printf("    -> Result %d\n", cmp);
+#endif
+			if (firstRun || ((cmp >= 0) ? !minCot1.isNegativeInfinity() : !minCot0.isNegativeInfinity()))
+			{
+				Edge* e = newEdgePair(c0, c1);
+				if (pendingTail0)
+				{
+					pendingTail0->prev = e;
+				}
+				else
+				{
+					pendingHead0 = e;
+				}
+				e->next = pendingTail0;
+				pendingTail0 = e;
+
+				e = e->reverse;
+				if (pendingTail1)
+				{
+					pendingTail1->next = e;
+				}
+				else
+				{
+					pendingHead1 = e;
+				}
+				e->prev = pendingTail1;
+				pendingTail1 = e;
+			}
+
+			Edge* e0 = min0;
+			Edge* e1 = min1;
+
+#ifdef DEBUG_CONVEX_HULL
+			printf("   Found min edges to %d %d\n", e0 ? e0->target->point.index : -1, e1 ? e1->target->point.index : -1);
+#endif
+
+			if (cmp == 0)
+			{
+				findEdgeForCoplanarFaces(c0, c1, e0, e1, NULL, NULL);
+			}
+
+			if ((cmp >= 0) && e1)
+			{
+				if (toPrev1)
+				{
+					for (Edge *e = toPrev1->next, *n = NULL; e != min1; e = n)
+					{
+						n = e->next;
+						removeEdgePair(e);
+					}
+				}
+
+				if (pendingTail1)
+				{
+					if (toPrev1)
+					{
+						toPrev1->link(pendingHead1);
+					}
+					else
+					{
+						min1->prev->link(pendingHead1);
+						firstNew1 = pendingHead1;
+					}
+					pendingTail1->link(min1);
+					pendingHead1 = NULL;
+					pendingTail1 = NULL;
+				}
+				else if (!toPrev1)
+				{
+					firstNew1 = min1;
+				}
+
+				prevPoint = c1->point;
+				c1 = e1->target;
+				toPrev1 = e1->reverse;
+			}
+
+			if ((cmp <= 0) && e0)
+			{
+				if (toPrev0)
+				{
+					for (Edge *e = toPrev0->prev, *n = NULL; e != min0; e = n)
+					{
+						n = e->prev;
+						removeEdgePair(e);
+					}
+				}
+
+				if (pendingTail0)
+				{
+					if (toPrev0)
+					{
+						pendingHead0->link(toPrev0);
+					}
+					else
+					{
+						pendingHead0->link(min0->next);
+						firstNew0 = pendingHead0;
+					}
+					min0->link(pendingTail0);
+					pendingHead0 = NULL;
+					pendingTail0 = NULL;
+				}
+				else if (!toPrev0)
+				{
+					firstNew0 = min0;
+				}
+
+				prevPoint = c0->point;
+				c0 = e0->target;
+				toPrev0 = e0->reverse;
+			}
+		}
+
+		if ((c0 == first0) && (c1 == first1))
+		{
+			if (toPrev0 == NULL)
+			{
+				pendingHead0->link(pendingTail0);
+				c0->edges = pendingTail0;
+			}
+			else
+			{
+				for (Edge *e = toPrev0->prev, *n = NULL; e != firstNew0; e = n)
+				{
+					n = e->prev;
+					removeEdgePair(e);
+				}
+				if (pendingTail0)
+				{
+					pendingHead0->link(toPrev0);
+					firstNew0->link(pendingTail0);
+				}
+			}
+
+			if (toPrev1 == NULL)
+			{
+				pendingTail1->link(pendingHead1);
+				c1->edges = pendingTail1;
+			}
+			else
+			{
+				for (Edge *e = toPrev1->next, *n = NULL; e != firstNew1; e = n)
+				{
+					n = e->next;
+					removeEdgePair(e);
+				}
+				if (pendingTail1)
+				{
+					toPrev1->link(pendingHead1);
+					pendingTail1->link(firstNew1);
+				}
+			}
+
+			return;
+		}
+
+		firstRun = false;
+	}
+}
+
+class pointCmp
+{
+public:
+	bool operator()(const btConvexHullInternal::Point32& p, const btConvexHullInternal::Point32& q) const
+	{
+		return (p.y < q.y) || ((p.y == q.y) && ((p.x < q.x) || ((p.x == q.x) && (p.z < q.z))));
+	}
+};
+
+void btConvexHullInternal::compute(const void* coords, bool doubleCoords, int stride, int count)
+{
+	btVector3 min(btScalar(1e30), btScalar(1e30), btScalar(1e30)), max(btScalar(-1e30), btScalar(-1e30), btScalar(-1e30));
+	const char* ptr = (const char*)coords;
+	if (doubleCoords)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const double* v = (const double*)ptr;
+			btVector3 p((btScalar)v[0], (btScalar)v[1], (btScalar)v[2]);
+			ptr += stride;
+			min.setMin(p);
+			max.setMax(p);
+		}
+	}
+	else
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const float* v = (const float*)ptr;
+			btVector3 p(v[0], v[1], v[2]);
+			ptr += stride;
+			min.setMin(p);
+			max.setMax(p);
+		}
+	}
+
+	btVector3 s = max - min;
+	maxAxis = s.maxAxis();
+	minAxis = s.minAxis();
+	if (minAxis == maxAxis)
+	{
+		minAxis = (maxAxis + 1) % 3;
+	}
+	medAxis = 3 - maxAxis - minAxis;
+
+	s /= btScalar(10216);
+	if (((medAxis + 1) % 3) != maxAxis)
+	{
+		s *= -1;
+	}
+	scaling = s;
+
+	if (s[0] != 0)
+	{
+		s[0] = btScalar(1) / s[0];
+	}
+	if (s[1] != 0)
+	{
+		s[1] = btScalar(1) / s[1];
+	}
+	if (s[2] != 0)
+	{
+		s[2] = btScalar(1) / s[2];
+	}
+
+	center = (min + max) * btScalar(0.5);
+
+	btAlignedObjectArray<Point32> points;
+	points.resize(count);
+	ptr = (const char*)coords;
+	if (doubleCoords)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const double* v = (const double*)ptr;
+			btVector3 p((btScalar)v[0], (btScalar)v[1], (btScalar)v[2]);
+			ptr += stride;
+			p = (p - center) * s;
+			points[i].x = (int32_t)p[medAxis];
+			points[i].y = (int32_t)p[maxAxis];
+			points[i].z = (int32_t)p[minAxis];
+			points[i].index = i;
+		}
+	}
+	else
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const float* v = (const float*)ptr;
+			btVector3 p(v[0], v[1], v[2]);
+			ptr += stride;
+			p = (p - center) * s;
+			points[i].x = (int32_t)p[medAxis];
+			points[i].y = (int32_t)p[maxAxis];
+			points[i].z = (int32_t)p[minAxis];
+			points[i].index = i;
+		}
+	}
+	points.quickSort(pointCmp());
+
+	vertexPool.reset();
+	vertexPool.setArraySize(count);
+	originalVertices.resize(count);
+	for (int i = 0; i < count; i++)
+	{
+		Vertex* v = vertexPool.newObject();
+		v->edges = NULL;
+		v->point = points[i];
+		v->copy = -1;
+		originalVertices[i] = v;
+	}
+
+	points.clear();
+
+	edgePool.reset();
+	edgePool.setArraySize(6 * count);
+
+	usedEdgePairs = 0;
+	maxUsedEdgePairs = 0;
+
+	mergeStamp = -3;
+
+	IntermediateHull hull;
+	computeInternal(0, count, hull);
+	vertexList = hull.minXy;
+#ifdef DEBUG_CONVEX_HULL
+	printf("max. edges %d (3v = %d)", maxUsedEdgePairs, 3 * count);
+#endif
+}
+
+btVector3 btConvexHullInternal::toBtVector(const Point32& v)
+{
+	btVector3 p;
+	p[medAxis] = btScalar(v.x);
+	p[maxAxis] = btScalar(v.y);
+	p[minAxis] = btScalar(v.z);
+	return p * scaling;
+}
+
+btVector3 btConvexHullInternal::getBtNormal(Face* face)
+{
+	return toBtVector(face->dir0).cross(toBtVector(face->dir1)).normalized();
+}
+
+btVector3 btConvexHullInternal::getCoordinates(const Vertex* v)
+{
+	btVector3 p;
+	p[medAxis] = v->xvalue();
+	p[maxAxis] = v->yvalue();
+	p[minAxis] = v->zvalue();
+	return p * scaling + center;
+}
+
+btScalar btConvexHullInternal::shrink(btScalar amount, btScalar clampAmount)
+{
+	if (!vertexList)
+	{
+		return 0;
+	}
+	int stamp = --mergeStamp;
+	btAlignedObjectArray<Vertex*> stack;
+	vertexList->copy = stamp;
+	stack.push_back(vertexList);
+	btAlignedObjectArray<Face*> faces;
+
+	Point32 ref = vertexList->point;
+	Int128 hullCenterX(0, 0);
+	Int128 hullCenterY(0, 0);
+	Int128 hullCenterZ(0, 0);
+	Int128 volume(0, 0);
+
+	while (stack.size() > 0)
+	{
+		Vertex* v = stack[stack.size() - 1];
+		stack.pop_back();
+		Edge* e = v->edges;
+		if (e)
+		{
+			do
+			{
+				if (e->target->copy != stamp)
+				{
+					e->target->copy = stamp;
+					stack.push_back(e->target);
+				}
+				if (e->copy != stamp)
+				{
+					Face* face = facePool.newObject();
+					face->init(e->target, e->reverse->prev->target, v);
+					faces.push_back(face);
+					Edge* f = e;
+
+					Vertex* a = NULL;
+					Vertex* b = NULL;
+					do
+					{
+						if (a && b)
+						{
+							int64_t vol = (v->point - ref).dot((a->point - ref).cross(b->point - ref));
+							btAssert(vol >= 0);
+							Point32 c = v->point + a->point + b->point + ref;
+							hullCenterX += vol * c.x;
+							hullCenterY += vol * c.y;
+							hullCenterZ += vol * c.z;
+							volume += vol;
+						}
+
+						btAssert(f->copy != stamp);
+						f->copy = stamp;
+						f->face = face;
+
+						a = b;
+						b = f->target;
+
+						f = f->reverse->prev;
+					} while (f != e);
+				}
+				e = e->next;
+			} while (e != v->edges);
+		}
+	}
+
+	if (volume.getSign() <= 0)
+	{
+		return 0;
+	}
+
+	btVector3 hullCenter;
+	hullCenter[medAxis] = hullCenterX.toScalar();
+	hullCenter[maxAxis] = hullCenterY.toScalar();
+	hullCenter[minAxis] = hullCenterZ.toScalar();
+	hullCenter /= 4 * volume.toScalar();
+	hullCenter *= scaling;
+
+	int faceCount = faces.size();
+
+	if (clampAmount > 0)
+	{
+		btScalar minDist = SIMD_INFINITY;
+		for (int i = 0; i < faceCount; i++)
+		{
+			btVector3 normal = getBtNormal(faces[i]);
+			btScalar dist = normal.dot(toBtVector(faces[i]->origin) - hullCenter);
+			if (dist < minDist)
+			{
+				minDist = dist;
+			}
+		}
+
+		if (minDist <= 0)
+		{
+			return 0;
+		}
+
+		amount = btMin(amount, minDist * clampAmount);
+	}
+
+	unsigned int seed = 243703;
+	for (int i = 0; i < faceCount; i++, seed = 1664525 * seed + 1013904223)
+	{
+		btSwap(faces[i], faces[seed % faceCount]);
+	}
+
+	for (int i = 0; i < faceCount; i++)
+	{
+		if (!shiftFace(faces[i], amount, stack))
+		{
+			return -amount;
+		}
+	}
+
+	return amount;
+}
+
+bool btConvexHullInternal::shiftFace(Face* face, btScalar amount, btAlignedObjectArray<Vertex*> stack)
+{
+	btVector3 origShift = getBtNormal(face) * -amount;
+	if (scaling[0] != 0)
+	{
+		origShift[0] /= scaling[0];
+	}
+	if (scaling[1] != 0)
+	{
+		origShift[1] /= scaling[1];
+	}
+	if (scaling[2] != 0)
+	{
+		origShift[2] /= scaling[2];
+	}
+	Point32 shift((int32_t)origShift[medAxis], (int32_t)origShift[maxAxis], (int32_t)origShift[minAxis]);
+	if (shift.isZero())
+	{
+		return true;
+	}
+	Point64 normal = face->getNormal();
+#ifdef DEBUG_CONVEX_HULL
+	printf("\nShrinking face (%d %d %d) (%d %d %d) (%d %d %d) by (%d %d %d)\n",
+		   face->origin.x, face->origin.y, face->origin.z, face->dir0.x, face->dir0.y, face->dir0.z, face->dir1.x, face->dir1.y, face->dir1.z, shift.x, shift.y, shift.z);
+#endif
+	int64_t origDot = face->origin.dot(normal);
+	Point32 shiftedOrigin = face->origin + shift;
+	int64_t shiftedDot = shiftedOrigin.dot(normal);
+	btAssert(shiftedDot <= origDot);
+	if (shiftedDot >= origDot)
+	{
+		return false;
+	}
+
+	Edge* intersection = NULL;
+
+	Edge* startEdge = face->nearbyVertex->edges;
+#ifdef DEBUG_CONVEX_HULL
+	printf("Start edge is ");
+	startEdge->print();
+	printf(", normal is (%lld %lld %lld), shifted dot is %lld\n", normal.x, normal.y, normal.z, shiftedDot);
+#endif
+	Rational128 optDot = face->nearbyVertex->dot(normal);
+	int cmp = optDot.compare(shiftedDot);
+#ifdef SHOW_ITERATIONS
+	int n = 0;
+#endif
+	if (cmp >= 0)
+	{
+		Edge* e = startEdge;
+		do
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			Rational128 dot = e->target->dot(normal);
+			btAssert(dot.compare(origDot) <= 0);
+#ifdef DEBUG_CONVEX_HULL
+			printf("Moving downwards, edge is ");
+			e->print();
+			printf(", dot is %f (%f %lld)\n", (float)dot.toScalar(), (float)optDot.toScalar(), shiftedDot);
+#endif
+			if (dot.compare(optDot) < 0)
+			{
+				int c = dot.compare(shiftedDot);
+				optDot = dot;
+				e = e->reverse;
+				startEdge = e;
+				if (c < 0)
+				{
+					intersection = e;
+					break;
+				}
+				cmp = c;
+			}
+			e = e->prev;
+		} while (e != startEdge);
+
+		if (!intersection)
+		{
+			return false;
+		}
+	}
+	else
+	{
+		Edge* e = startEdge;
+		do
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			Rational128 dot = e->target->dot(normal);
+			btAssert(dot.compare(origDot) <= 0);
+#ifdef DEBUG_CONVEX_HULL
+			printf("Moving upwards, edge is ");
+			e->print();
+			printf(", dot is %f (%f %lld)\n", (float)dot.toScalar(), (float)optDot.toScalar(), shiftedDot);
+#endif
+			if (dot.compare(optDot) > 0)
+			{
+				cmp = dot.compare(shiftedDot);
+				if (cmp >= 0)
+				{
+					intersection = e;
+					break;
+				}
+				optDot = dot;
+				e = e->reverse;
+				startEdge = e;
+			}
+			e = e->prev;
+		} while (e != startEdge);
+
+		if (!intersection)
+		{
+			return true;
+		}
+	}
+
+#ifdef SHOW_ITERATIONS
+	printf("Needed %d iterations to find initial intersection\n", n);
+#endif
+
+	if (cmp == 0)
+	{
+		Edge* e = intersection->reverse->next;
+#ifdef SHOW_ITERATIONS
+		n = 0;
+#endif
+		while (e->target->dot(normal).compare(shiftedDot) <= 0)
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			e = e->next;
+			if (e == intersection->reverse)
+			{
+				return true;
+			}
+#ifdef DEBUG_CONVEX_HULL
+			printf("Checking for outwards edge, current edge is ");
+			e->print();
+			printf("\n");
+#endif
+		}
+#ifdef SHOW_ITERATIONS
+		printf("Needed %d iterations to check for complete containment\n", n);
+#endif
+	}
+
+	Edge* firstIntersection = NULL;
+	Edge* faceEdge = NULL;
+	Edge* firstFaceEdge = NULL;
+
+#ifdef SHOW_ITERATIONS
+	int m = 0;
+#endif
+	while (true)
+	{
+#ifdef SHOW_ITERATIONS
+		m++;
+#endif
+#ifdef DEBUG_CONVEX_HULL
+		printf("Intersecting edge is ");
+		intersection->print();
+		printf("\n");
+#endif
+		if (cmp == 0)
+		{
+			Edge* e = intersection->reverse->next;
+			startEdge = e;
+#ifdef SHOW_ITERATIONS
+			n = 0;
+#endif
+			while (true)
+			{
+#ifdef SHOW_ITERATIONS
+				n++;
+#endif
+				if (e->target->dot(normal).compare(shiftedDot) >= 0)
+				{
+					break;
+				}
+				intersection = e->reverse;
+				e = e->next;
+				if (e == startEdge)
+				{
+					return true;
+				}
+			}
+#ifdef SHOW_ITERATIONS
+			printf("Needed %d iterations to advance intersection\n", n);
+#endif
+		}
+
+#ifdef DEBUG_CONVEX_HULL
+		printf("Advanced intersecting edge to ");
+		intersection->print();
+		printf(", cmp = %d\n", cmp);
+#endif
+
+		if (!firstIntersection)
+		{
+			firstIntersection = intersection;
+		}
+		else if (intersection == firstIntersection)
+		{
+			break;
+		}
+
+		int prevCmp = cmp;
+		Edge* prevIntersection = intersection;
+		Edge* prevFaceEdge = faceEdge;
+
+		Edge* e = intersection->reverse;
+#ifdef SHOW_ITERATIONS
+		n = 0;
+#endif
+		while (true)
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			e = e->reverse->prev;
+			btAssert(e != intersection->reverse);
+			cmp = e->target->dot(normal).compare(shiftedDot);
+#ifdef DEBUG_CONVEX_HULL
+			printf("Testing edge ");
+			e->print();
+			printf(" -> cmp = %d\n", cmp);
+#endif
+			if (cmp >= 0)
+			{
+				intersection = e;
+				break;
+			}
+		}
+#ifdef SHOW_ITERATIONS
+		printf("Needed %d iterations to find other intersection of face\n", n);
+#endif
+
+		if (cmp > 0)
+		{
+			Vertex* removed = intersection->target;
+			e = intersection->reverse;
+			if (e->prev == e)
+			{
+				removed->edges = NULL;
+			}
+			else
+			{
+				removed->edges = e->prev;
+				e->prev->link(e->next);
+				e->link(e);
+			}
+#ifdef DEBUG_CONVEX_HULL
+			printf("1: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+
+			Point64 n0 = intersection->face->getNormal();
+			Point64 n1 = intersection->reverse->face->getNormal();
+			int64_t m00 = face->dir0.dot(n0);
+			int64_t m01 = face->dir1.dot(n0);
+			int64_t m10 = face->dir0.dot(n1);
+			int64_t m11 = face->dir1.dot(n1);
+			int64_t r0 = (intersection->face->origin - shiftedOrigin).dot(n0);
+			int64_t r1 = (intersection->reverse->face->origin - shiftedOrigin).dot(n1);
+			Int128 det = Int128::mul(m00, m11) - Int128::mul(m01, m10);
+			btAssert(det.getSign() != 0);
+			Vertex* v = vertexPool.newObject();
+			v->point.index = -1;
+			v->copy = -1;
+			v->point128 = PointR128(Int128::mul(face->dir0.x * r0, m11) - Int128::mul(face->dir0.x * r1, m01) + Int128::mul(face->dir1.x * r1, m00) - Int128::mul(face->dir1.x * r0, m10) + det * shiftedOrigin.x,
+									Int128::mul(face->dir0.y * r0, m11) - Int128::mul(face->dir0.y * r1, m01) + Int128::mul(face->dir1.y * r1, m00) - Int128::mul(face->dir1.y * r0, m10) + det * shiftedOrigin.y,
+									Int128::mul(face->dir0.z * r0, m11) - Int128::mul(face->dir0.z * r1, m01) + Int128::mul(face->dir1.z * r1, m00) - Int128::mul(face->dir1.z * r0, m10) + det * shiftedOrigin.z,
+									det);
+			v->point.x = (int32_t)v->point128.xvalue();
+			v->point.y = (int32_t)v->point128.yvalue();
+			v->point.z = (int32_t)v->point128.zvalue();
+			intersection->target = v;
+			v->edges = e;
+
+			stack.push_back(v);
+			stack.push_back(removed);
+			stack.push_back(NULL);
+		}
+
+		if (cmp || prevCmp || (prevIntersection->reverse->next->target != intersection->target))
+		{
+			faceEdge = newEdgePair(prevIntersection->target, intersection->target);
+			if (prevCmp == 0)
+			{
+				faceEdge->link(prevIntersection->reverse->next);
+			}
+			if ((prevCmp == 0) || prevFaceEdge)
+			{
+				prevIntersection->reverse->link(faceEdge);
+			}
+			if (cmp == 0)
+			{
+				intersection->reverse->prev->link(faceEdge->reverse);
+			}
+			faceEdge->reverse->link(intersection->reverse);
+		}
+		else
+		{
+			faceEdge = prevIntersection->reverse->next;
+		}
+
+		if (prevFaceEdge)
+		{
+			if (prevCmp > 0)
+			{
+				faceEdge->link(prevFaceEdge->reverse);
+			}
+			else if (faceEdge != prevFaceEdge->reverse)
+			{
+				stack.push_back(prevFaceEdge->target);
+				while (faceEdge->next != prevFaceEdge->reverse)
+				{
+					Vertex* removed = faceEdge->next->target;
+					removeEdgePair(faceEdge->next);
+					stack.push_back(removed);
+#ifdef DEBUG_CONVEX_HULL
+					printf("2: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+				}
+				stack.push_back(NULL);
+			}
+		}
+		faceEdge->face = face;
+		faceEdge->reverse->face = intersection->face;
+
+		if (!firstFaceEdge)
+		{
+			firstFaceEdge = faceEdge;
+		}
+	}
+#ifdef SHOW_ITERATIONS
+	printf("Needed %d iterations to process all intersections\n", m);
+#endif
+
+	if (cmp > 0)
+	{
+		firstFaceEdge->reverse->target = faceEdge->target;
+		firstIntersection->reverse->link(firstFaceEdge);
+		firstFaceEdge->link(faceEdge->reverse);
+	}
+	else if (firstFaceEdge != faceEdge->reverse)
+	{
+		stack.push_back(faceEdge->target);
+		while (firstFaceEdge->next != faceEdge->reverse)
+		{
+			Vertex* removed = firstFaceEdge->next->target;
+			removeEdgePair(firstFaceEdge->next);
+			stack.push_back(removed);
+#ifdef DEBUG_CONVEX_HULL
+			printf("3: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+		}
+		stack.push_back(NULL);
+	}
+
+	btAssert(stack.size() > 0);
+	vertexList = stack[0];
+
+#ifdef DEBUG_CONVEX_HULL
+	printf("Removing part\n");
+#endif
+#ifdef SHOW_ITERATIONS
+	n = 0;
+#endif
+	int pos = 0;
+	while (pos < stack.size())
+	{
+		int end = stack.size();
+		while (pos < end)
+		{
+			Vertex* kept = stack[pos++];
+#ifdef DEBUG_CONVEX_HULL
+			kept->print();
+#endif
+			bool deeper = false;
+			Vertex* removed;
+			while ((removed = stack[pos++]) != NULL)
+			{
+#ifdef SHOW_ITERATIONS
+				n++;
+#endif
+				kept->receiveNearbyFaces(removed);
+				while (removed->edges)
+				{
+					if (!deeper)
+					{
+						deeper = true;
+						stack.push_back(kept);
+					}
+					stack.push_back(removed->edges->target);
+					removeEdgePair(removed->edges);
+				}
+			}
+			if (deeper)
+			{
+				stack.push_back(NULL);
+			}
+		}
+	}
+#ifdef SHOW_ITERATIONS
+	printf("Needed %d iterations to remove part\n", n);
+#endif
+
+	stack.resize(0);
+	face->origin = shiftedOrigin;
+
+	return true;
+}
+
+static int getVertexCopy(btConvexHullInternal::Vertex* vertex, btAlignedObjectArray<btConvexHullInternal::Vertex*>& vertices)
+{
+	int index = vertex->copy;
+	if (index < 0)
+	{
+		index = vertices.size();
+		vertex->copy = index;
+		vertices.push_back(vertex);
+#ifdef DEBUG_CONVEX_HULL
+		printf("Vertex %d gets index *%d\n", vertex->point.index, index);
+#endif
+	}
+	return index;
+}
+
+btScalar btConvexHullComputer::compute(const void* coords, bool doubleCoords, int stride, int count, btScalar shrink, btScalar shrinkClamp)
+{
+	if (count <= 0)
+	{
+		vertices.clear();
+		edges.clear();
+		faces.clear();
+		return 0;
+	}
+
+	btConvexHullInternal hull;
+	hull.compute(coords, doubleCoords, stride, count);
+
+	btScalar shift = 0;
+	if ((shrink > 0) && ((shift = hull.shrink(shrink, shrinkClamp)) < 0))
+	{
+		vertices.clear();
+		edges.clear();
+		faces.clear();
+		return shift;
+	}
+
+	vertices.resize(0);
+	original_vertex_index.resize(0);
+	edges.resize(0);
+	faces.resize(0);
+
+	btAlignedObjectArray<btConvexHullInternal::Vertex*> oldVertices;
+	getVertexCopy(hull.vertexList, oldVertices);
+	int copied = 0;
+	while (copied < oldVertices.size())
+	{
+		btConvexHullInternal::Vertex* v = oldVertices[copied];
+		vertices.push_back(hull.getCoordinates(v));
+		original_vertex_index.push_back(v->point.index);
+		btConvexHullInternal::Edge* firstEdge = v->edges;
+		if (firstEdge)
+		{
+			int firstCopy = -1;
+			int prevCopy = -1;
+			btConvexHullInternal::Edge* e = firstEdge;
+			do
+			{
+				if (e->copy < 0)
+				{
+					int s = edges.size();
+					edges.push_back(Edge());
+					edges.push_back(Edge());
+					Edge* c = &edges[s];
+					Edge* r = &edges[s + 1];
+					e->copy = s;
+					e->reverse->copy = s + 1;
+					c->reverse = 1;
+					r->reverse = -1;
+					c->targetVertex = getVertexCopy(e->target, oldVertices);
+					r->targetVertex = copied;
+#ifdef DEBUG_CONVEX_HULL
+					printf("      CREATE: Vertex *%d has edge to *%d\n", copied, c->getTargetVertex());
+#endif
+				}
+				if (prevCopy >= 0)
+				{
+					edges[e->copy].next = prevCopy - e->copy;
+				}
+				else
+				{
+					firstCopy = e->copy;
+				}
+				prevCopy = e->copy;
+				e = e->next;
+			} while (e != firstEdge);
+			edges[firstCopy].next = prevCopy - firstCopy;
+		}
+		copied++;
+	}
+
+	for (int i = 0; i < copied; i++)
+	{
+		btConvexHullInternal::Vertex* v = oldVertices[i];
+		btConvexHullInternal::Edge* firstEdge = v->edges;
+		if (firstEdge)
+		{
+			btConvexHullInternal::Edge* e = firstEdge;
+			do
+			{
+				if (e->copy >= 0)
+				{
+#ifdef DEBUG_CONVEX_HULL
+					printf("Vertex *%d has edge to *%d\n", i, edges[e->copy].getTargetVertex());
+#endif
+					faces.push_back(e->copy);
+					btConvexHullInternal::Edge* f = e;
+					do
+					{
+#ifdef DEBUG_CONVEX_HULL
+						printf("   Face *%d\n", edges[f->copy].getTargetVertex());
+#endif
+						f->copy = -1;
+						f = f->reverse->prev;
+					} while (f != e);
+				}
+				e = e->next;
+			} while (e != firstEdge);
+		}
+	}
+
+	return shift;
+}
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btConvexHullComputer.h b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHullComputer.h
new file mode 100644
index 0000000..18b26ee
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btConvexHullComputer.h
@@ -0,0 +1,102 @@
+/*
+Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_HULL_COMPUTER_H
+#define BT_CONVEX_HULL_COMPUTER_H
+
+#include "btVector3.h"
+#include "btAlignedObjectArray.h"
+
+/// Convex hull implementation based on Preparata and Hong
+/// See http://code.google.com/p/bullet/issues/detail?id=275
+/// Ole Kniemeyer, MAXON Computer GmbH
+class btConvexHullComputer
+{
+private:
+	btScalar compute(const void* coords, bool doubleCoords, int stride, int count, btScalar shrink, btScalar shrinkClamp);
+
+public:
+	class Edge
+	{
+	private:
+		int next;
+		int reverse;
+		int targetVertex;
+
+		friend class btConvexHullComputer;
+
+	public:
+		int getSourceVertex() const
+		{
+			return (this + reverse)->targetVertex;
+		}
+
+		int getTargetVertex() const
+		{
+			return targetVertex;
+		}
+
+		const Edge* getNextEdgeOfVertex() const  // clockwise list of all edges of a vertex
+		{
+			return this + next;
+		}
+
+		const Edge* getNextEdgeOfFace() const  // counter-clockwise list of all edges of a face
+		{
+			return (this + reverse)->getNextEdgeOfVertex();
+		}
+
+		const Edge* getReverseEdge() const
+		{
+			return this + reverse;
+		}
+	};
+
+	// Vertices of the output hull
+	btAlignedObjectArray<btVector3> vertices;
+
+	// The original vertex index in the input coords array
+	btAlignedObjectArray<int> original_vertex_index;
+
+	// Edges of the output hull
+	btAlignedObjectArray<Edge> edges;
+
+	// Faces of the convex hull. Each entry is an index into the "edges" array pointing to an edge of the face. Faces are planar n-gons
+	btAlignedObjectArray<int> faces;
+
+	/*
+		Compute convex hull of "count" vertices stored in "coords". "stride" is the difference in bytes
+		between the addresses of consecutive vertices. If "shrink" is positive, the convex hull is shrunken
+		by that amount (each face is moved by "shrink" length units towards the center along its normal).
+		If "shrinkClamp" is positive, "shrink" is clamped to not exceed "shrinkClamp * innerRadius", where "innerRadius"
+		is the minimum distance of a face to the center of the convex hull.
+
+		The returned value is the amount by which the hull has been shrunken. If it is negative, the amount was so large
+		that the resulting convex hull is empty.
+
+		The output convex hull can be found in the member variables "vertices", "edges", "faces".
+		*/
+	btScalar compute(const float* coords, int stride, int count, btScalar shrink, btScalar shrinkClamp)
+	{
+		return compute(coords, false, stride, count, shrink, shrinkClamp);
+	}
+
+	// same as above, but double precision
+	btScalar compute(const double* coords, int stride, int count, btScalar shrink, btScalar shrinkClamp)
+	{
+		return compute(coords, true, stride, count, shrink, shrinkClamp);
+	}
+};
+
+#endif  //BT_CONVEX_HULL_COMPUTER_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btCpuFeatureUtility.h b/dali-physics/third-party/bullet3/src/LinearMath/btCpuFeatureUtility.h
new file mode 100644
index 0000000..5e4b9a3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btCpuFeatureUtility.h
@@ -0,0 +1,88 @@
+
+#ifndef BT_CPU_UTILITY_H
+#define BT_CPU_UTILITY_H
+
+#include "LinearMath/btScalar.h"
+
+#include <string.h>  //memset
+#ifdef USE_SIMD
+#include <emmintrin.h>
+#ifdef BT_ALLOW_SSE4
+#include <intrin.h>
+#endif  //BT_ALLOW_SSE4
+#endif  //USE_SIMD
+
+#if defined BT_USE_NEON
+#define ARM_NEON_GCC_COMPATIBILITY 1
+#include <arm_neon.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>  //for sysctlbyname
+#endif                   //BT_USE_NEON
+
+///Rudimentary btCpuFeatureUtility for CPU features: only report the features that Bullet actually uses (SSE4/FMA3, NEON_HPFP)
+///We assume SSE2 in case BT_USE_SSE2 is defined in LinearMath/btScalar.h
+class btCpuFeatureUtility
+{
+public:
+	enum btCpuFeature
+	{
+		CPU_FEATURE_FMA3 = 1,
+		CPU_FEATURE_SSE4_1 = 2,
+		CPU_FEATURE_NEON_HPFP = 4
+	};
+
+	static int getCpuFeatures()
+	{
+		static int capabilities = 0;
+		static bool testedCapabilities = false;
+		if (0 != testedCapabilities)
+		{
+			return capabilities;
+		}
+
+#ifdef BT_USE_NEON
+		{
+			uint32_t hasFeature = 0;
+			size_t featureSize = sizeof(hasFeature);
+			int err = sysctlbyname("hw.optional.neon_hpfp", &hasFeature, &featureSize, NULL, 0);
+			if (0 == err && hasFeature)
+				capabilities |= CPU_FEATURE_NEON_HPFP;
+		}
+#endif  //BT_USE_NEON
+
+#ifdef BT_ALLOW_SSE4
+		{
+			int cpuInfo[4];
+			memset(cpuInfo, 0, sizeof(cpuInfo));
+			unsigned long long sseExt = 0;
+			__cpuid(cpuInfo, 1);
+
+			bool osUsesXSAVE_XRSTORE = cpuInfo[2] & (1 << 27) || false;
+			bool cpuAVXSuport = cpuInfo[2] & (1 << 28) || false;
+
+			if (osUsesXSAVE_XRSTORE && cpuAVXSuport)
+			{
+				sseExt = _xgetbv(0);
+			}
+			const int OSXSAVEFlag = (1UL << 27);
+			const int AVXFlag = ((1UL << 28) | OSXSAVEFlag);
+			const int FMAFlag = ((1UL << 12) | AVXFlag | OSXSAVEFlag);
+			if ((cpuInfo[2] & FMAFlag) == FMAFlag && (sseExt & 6) == 6)
+			{
+				capabilities |= btCpuFeatureUtility::CPU_FEATURE_FMA3;
+			}
+
+			const int SSE41Flag = (1 << 19);
+			if (cpuInfo[2] & SSE41Flag)
+			{
+				capabilities |= btCpuFeatureUtility::CPU_FEATURE_SSE4_1;
+			}
+		}
+#endif  //BT_ALLOW_SSE4
+
+		testedCapabilities = true;
+		return capabilities;
+	}
+};
+
+#endif  //BT_CPU_UTILITY_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btDefaultMotionState.h b/dali-physics/third-party/bullet3/src/LinearMath/btDefaultMotionState.h
new file mode 100644
index 0000000..14c40d3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btDefaultMotionState.h
@@ -0,0 +1,40 @@
+#ifndef BT_DEFAULT_MOTION_STATE_H
+#define BT_DEFAULT_MOTION_STATE_H
+
+#include "btMotionState.h"
+
+///The btDefaultMotionState provides a common implementation to synchronize world transforms with offsets.
+ATTRIBUTE_ALIGNED16(struct)
+btDefaultMotionState : public btMotionState
+{
+	btTransform m_graphicsWorldTrans;
+	btTransform m_centerOfMassOffset;
+	btTransform m_startWorldTrans;
+	void* m_userPointer;
+
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btDefaultMotionState(const btTransform& startTrans = btTransform::getIdentity(), const btTransform& centerOfMassOffset = btTransform::getIdentity())
+		: m_graphicsWorldTrans(startTrans),
+		  m_centerOfMassOffset(centerOfMassOffset),
+		  m_startWorldTrans(startTrans),
+		  m_userPointer(0)
+
+	{
+	}
+
+	///synchronizes world transform from user to physics
+	virtual void getWorldTransform(btTransform & centerOfMassWorldTrans) const
+	{
+		centerOfMassWorldTrans = m_graphicsWorldTrans * m_centerOfMassOffset.inverse();
+	}
+
+	///synchronizes world transform from physics to user
+	///Bullet only calls the update of worldtransform for active objects
+	virtual void setWorldTransform(const btTransform& centerOfMassWorldTrans)
+	{
+		m_graphicsWorldTrans = centerOfMassWorldTrans * m_centerOfMassOffset;
+	}
+};
+
+#endif  //BT_DEFAULT_MOTION_STATE_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btGeometryUtil.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btGeometryUtil.cpp
new file mode 100644
index 0000000..62bbef2
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btGeometryUtil.cpp
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btGeometryUtil.h"
+
+/*
+  Make sure this dummy function never changes so that it
+  can be used by probes that are checking whether the
+  library is actually installed.
+*/
+extern "C"
+{
+	void btBulletMathProbe();
+
+	void btBulletMathProbe() {}
+}
+
+bool btGeometryUtil::isPointInsidePlanes(const btAlignedObjectArray<btVector3>& planeEquations, const btVector3& point, btScalar margin)
+{
+	int numbrushes = planeEquations.size();
+	for (int i = 0; i < numbrushes; i++)
+	{
+		const btVector3& N1 = planeEquations[i];
+		btScalar dist = btScalar(N1.dot(point)) + btScalar(N1[3]) - margin;
+		if (dist > btScalar(0.))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+bool btGeometryUtil::areVerticesBehindPlane(const btVector3& planeNormal, const btAlignedObjectArray<btVector3>& vertices, btScalar margin)
+{
+	int numvertices = vertices.size();
+	for (int i = 0; i < numvertices; i++)
+	{
+		const btVector3& N1 = vertices[i];
+		btScalar dist = btScalar(planeNormal.dot(N1)) + btScalar(planeNormal[3]) - margin;
+		if (dist > btScalar(0.))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+bool notExist(const btVector3& planeEquation, const btAlignedObjectArray<btVector3>& planeEquations);
+
+bool notExist(const btVector3& planeEquation, const btAlignedObjectArray<btVector3>& planeEquations)
+{
+	int numbrushes = planeEquations.size();
+	for (int i = 0; i < numbrushes; i++)
+	{
+		const btVector3& N1 = planeEquations[i];
+		if (planeEquation.dot(N1) > btScalar(0.999))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+void btGeometryUtil::getPlaneEquationsFromVertices(btAlignedObjectArray<btVector3>& vertices, btAlignedObjectArray<btVector3>& planeEquationsOut)
+{
+	const int numvertices = vertices.size();
+	// brute force:
+	for (int i = 0; i < numvertices; i++)
+	{
+		const btVector3& N1 = vertices[i];
+
+		for (int j = i + 1; j < numvertices; j++)
+		{
+			const btVector3& N2 = vertices[j];
+
+			for (int k = j + 1; k < numvertices; k++)
+			{
+				const btVector3& N3 = vertices[k];
+
+				btVector3 planeEquation, edge0, edge1;
+				edge0 = N2 - N1;
+				edge1 = N3 - N1;
+				btScalar normalSign = btScalar(1.);
+				for (int ww = 0; ww < 2; ww++)
+				{
+					planeEquation = normalSign * edge0.cross(edge1);
+					if (planeEquation.length2() > btScalar(0.0001))
+					{
+						planeEquation.normalize();
+						if (notExist(planeEquation, planeEquationsOut))
+						{
+							planeEquation[3] = -planeEquation.dot(N1);
+
+							//check if inside, and replace supportingVertexOut if needed
+							if (areVerticesBehindPlane(planeEquation, vertices, btScalar(0.01)))
+							{
+								planeEquationsOut.push_back(planeEquation);
+							}
+						}
+					}
+					normalSign = btScalar(-1.);
+				}
+			}
+		}
+	}
+}
+
+void btGeometryUtil::getVerticesFromPlaneEquations(const btAlignedObjectArray<btVector3>& planeEquations, btAlignedObjectArray<btVector3>& verticesOut)
+{
+	const int numbrushes = planeEquations.size();
+	// brute force:
+	for (int i = 0; i < numbrushes; i++)
+	{
+		const btVector3& N1 = planeEquations[i];
+
+		for (int j = i + 1; j < numbrushes; j++)
+		{
+			const btVector3& N2 = planeEquations[j];
+
+			for (int k = j + 1; k < numbrushes; k++)
+			{
+				const btVector3& N3 = planeEquations[k];
+
+				btVector3 n2n3;
+				n2n3 = N2.cross(N3);
+				btVector3 n3n1;
+				n3n1 = N3.cross(N1);
+				btVector3 n1n2;
+				n1n2 = N1.cross(N2);
+
+				if ((n2n3.length2() > btScalar(0.0001)) &&
+					(n3n1.length2() > btScalar(0.0001)) &&
+					(n1n2.length2() > btScalar(0.0001)))
+				{
+					//point P out of 3 plane equations:
+
+					//	d1 ( N2 * N3 ) + d2 ( N3 * N1 ) + d3 ( N1 * N2 )
+					//P =  -------------------------------------------------------------------------
+					//   N1 . ( N2 * N3 )
+
+					btScalar quotient = (N1.dot(n2n3));
+					if (btFabs(quotient) > btScalar(0.000001))
+					{
+						quotient = btScalar(-1.) / quotient;
+						n2n3 *= N1[3];
+						n3n1 *= N2[3];
+						n1n2 *= N3[3];
+						btVector3 potentialVertex = n2n3;
+						potentialVertex += n3n1;
+						potentialVertex += n1n2;
+						potentialVertex *= quotient;
+
+						//check if inside, and replace supportingVertexOut if needed
+						if (isPointInsidePlanes(planeEquations, potentialVertex, btScalar(0.01)))
+						{
+							verticesOut.push_back(potentialVertex);
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btGeometryUtil.h b/dali-physics/third-party/bullet3/src/LinearMath/btGeometryUtil.h
new file mode 100644
index 0000000..5ed8702
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btGeometryUtil.h
@@ -0,0 +1,36 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GEOMETRY_UTIL_H
+#define BT_GEOMETRY_UTIL_H
+
+#include "btVector3.h"
+#include "btAlignedObjectArray.h"
+
+///The btGeometryUtil helper class provides a few methods to convert between plane equations and vertices.
+class btGeometryUtil
+{
+public:
+	static void getPlaneEquationsFromVertices(btAlignedObjectArray<btVector3>& vertices, btAlignedObjectArray<btVector3>& planeEquationsOut);
+
+	static void getVerticesFromPlaneEquations(const btAlignedObjectArray<btVector3>& planeEquations, btAlignedObjectArray<btVector3>& verticesOut);
+
+	static bool isInside(const btAlignedObjectArray<btVector3>& vertices, const btVector3& planeNormal, btScalar margin);
+
+	static bool isPointInsidePlanes(const btAlignedObjectArray<btVector3>& planeEquations, const btVector3& point, btScalar margin);
+
+	static bool areVerticesBehindPlane(const btVector3& planeNormal, const btAlignedObjectArray<btVector3>& vertices, btScalar margin);
+};
+
+#endif  //BT_GEOMETRY_UTIL_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btGrahamScan2dConvexHull.h b/dali-physics/third-party/bullet3/src/LinearMath/btGrahamScan2dConvexHull.h
new file mode 100644
index 0000000..0fcb285
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btGrahamScan2dConvexHull.h
@@ -0,0 +1,129 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef GRAHAM_SCAN_2D_CONVEX_HULL_H
+#define GRAHAM_SCAN_2D_CONVEX_HULL_H
+
+#include "btVector3.h"
+#include "btAlignedObjectArray.h"
+
+struct GrahamVector3 : public btVector3
+{
+	GrahamVector3(const btVector3& org, int orgIndex)
+		: btVector3(org),
+		  m_orgIndex(orgIndex)
+	{
+	}
+	btScalar m_angle;
+	int m_orgIndex;
+};
+
+struct btAngleCompareFunc
+{
+	btVector3 m_anchor;
+	btAngleCompareFunc(const btVector3& anchor)
+		: m_anchor(anchor)
+	{
+	}
+	bool operator()(const GrahamVector3& a, const GrahamVector3& b) const
+	{
+		if (a.m_angle != b.m_angle)
+			return a.m_angle < b.m_angle;
+		else
+		{
+			btScalar al = (a - m_anchor).length2();
+			btScalar bl = (b - m_anchor).length2();
+			if (al != bl)
+				return al < bl;
+			else
+			{
+				return a.m_orgIndex < b.m_orgIndex;
+			}
+		}
+	}
+};
+
+inline void GrahamScanConvexHull2D(btAlignedObjectArray<GrahamVector3>& originalPoints, btAlignedObjectArray<GrahamVector3>& hull, const btVector3& normalAxis)
+{
+	btVector3 axis0, axis1;
+	btPlaneSpace1(normalAxis, axis0, axis1);
+
+	if (originalPoints.size() <= 1)
+	{
+		for (int i = 0; i < originalPoints.size(); i++)
+			hull.push_back(originalPoints[0]);
+		return;
+	}
+	//step1 : find anchor point with smallest projection on axis0 and move it to first location
+	for (int i = 0; i < originalPoints.size(); i++)
+	{
+		//		const btVector3& left = originalPoints[i];
+		//		const btVector3& right = originalPoints[0];
+		btScalar projL = originalPoints[i].dot(axis0);
+		btScalar projR = originalPoints[0].dot(axis0);
+		if (projL < projR)
+		{
+			originalPoints.swap(0, i);
+		}
+	}
+
+	//also precompute angles
+	originalPoints[0].m_angle = -1e30f;
+	for (int i = 1; i < originalPoints.size(); i++)
+	{
+		btVector3 ar = originalPoints[i] - originalPoints[0];
+		btScalar ar1 = axis1.dot(ar);
+		btScalar ar0 = axis0.dot(ar);
+		if (ar1 * ar1 + ar0 * ar0 < FLT_EPSILON)
+		{
+			originalPoints[i].m_angle = 0.0f;
+		}
+		else
+		{
+			originalPoints[i].m_angle = btAtan2Fast(ar1, ar0);
+		}
+	}
+
+	//step 2: sort all points, based on 'angle' with this anchor
+	btAngleCompareFunc comp(originalPoints[0]);
+	originalPoints.quickSortInternal(comp, 1, originalPoints.size() - 1);
+
+	int i;
+	for (i = 0; i < 2; i++)
+		hull.push_back(originalPoints[i]);
+
+	//step 3: keep all 'convex' points and discard concave points (using back tracking)
+	for (; i != originalPoints.size(); i++)
+	{
+		bool isConvex = false;
+		while (!isConvex && hull.size() > 1)
+		{
+			btVector3& a = hull[hull.size() - 2];
+			btVector3& b = hull[hull.size() - 1];
+			isConvex = btCross(a - b, a - originalPoints[i]).dot(normalAxis) > 0;
+			if (!isConvex)
+				hull.pop_back();
+			else
+				hull.push_back(originalPoints[i]);
+		}
+
+		if (hull.size() == 1)
+		{
+			hull.push_back(originalPoints[i]);
+		}
+	}
+}
+
+#endif  //GRAHAM_SCAN_2D_CONVEX_HULL_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btHashMap.h b/dali-physics/third-party/bullet3/src/LinearMath/btHashMap.h
new file mode 100644
index 0000000..1fca0fb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btHashMap.h
@@ -0,0 +1,470 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_HASH_MAP_H
+#define BT_HASH_MAP_H
+
+#include <string>
+#include "btAlignedObjectArray.h"
+
+///very basic hashable string implementation, compatible with btHashMap
+struct btHashString
+{
+	std::string m_string1;
+	unsigned int m_hash;
+
+	SIMD_FORCE_INLINE unsigned int getHash() const
+	{
+		return m_hash;
+	}
+
+	btHashString()
+	{
+		m_string1 = "";
+		m_hash = 0;
+	}
+	btHashString(const char* name)
+		: m_string1(name)
+	{
+		/* magic numbers from http://www.isthe.com/chongo/tech/comp/fnv/ */
+		static const unsigned int InitialFNV = 2166136261u;
+		static const unsigned int FNVMultiple = 16777619u;
+
+		/* Fowler / Noll / Vo (FNV) Hash */
+		unsigned int hash = InitialFNV;
+
+		for (int i = 0; m_string1.c_str()[i]; i++)
+		{
+			hash = hash ^ (m_string1.c_str()[i]); /* xor  the low 8 bits */
+			hash = hash * FNVMultiple;            /* multiply by the magic number */
+		}
+		m_hash = hash;
+	}
+
+	bool equals(const btHashString& other) const
+	{
+		return (m_string1 == other.m_string1);
+	}
+};
+
+const int BT_HASH_NULL = 0xffffffff;
+
+class btHashInt
+{
+	int m_uid;
+
+public:
+	btHashInt()
+	{
+	}
+
+	btHashInt(int uid) : m_uid(uid)
+	{
+	}
+
+	int getUid1() const
+	{
+		return m_uid;
+	}
+
+	void setUid1(int uid)
+	{
+		m_uid = uid;
+	}
+
+	bool equals(const btHashInt& other) const
+	{
+		return getUid1() == other.getUid1();
+	}
+	//to our success
+	SIMD_FORCE_INLINE unsigned int getHash() const
+	{
+		unsigned int key = m_uid;
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+
+		return key;
+	}
+};
+
+class btHashPtr
+{
+	union {
+		const void* m_pointer;
+		unsigned int m_hashValues[2];
+	};
+
+public:
+	btHashPtr(const void* ptr)
+		: m_pointer(ptr)
+	{
+	}
+
+	const void* getPointer() const
+	{
+		return m_pointer;
+	}
+
+	bool equals(const btHashPtr& other) const
+	{
+		return getPointer() == other.getPointer();
+	}
+
+	//to our success
+	SIMD_FORCE_INLINE unsigned int getHash() const
+	{
+		const bool VOID_IS_8 = ((sizeof(void*) == 8));
+
+		unsigned int key = VOID_IS_8 ? m_hashValues[0] + m_hashValues[1] : m_hashValues[0];
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+};
+
+template <class Value>
+class btHashKeyPtr
+{
+	int m_uid;
+
+public:
+	btHashKeyPtr(int uid) : m_uid(uid)
+	{
+	}
+
+	int getUid1() const
+	{
+		return m_uid;
+	}
+
+	bool equals(const btHashKeyPtr<Value>& other) const
+	{
+		return getUid1() == other.getUid1();
+	}
+
+	//to our success
+	SIMD_FORCE_INLINE unsigned int getHash() const
+	{
+		unsigned int key = m_uid;
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+};
+
+template <class Value>
+class btHashKey
+{
+	int m_uid;
+
+public:
+	btHashKey(int uid) : m_uid(uid)
+	{
+	}
+
+	int getUid1() const
+	{
+		return m_uid;
+	}
+
+	bool equals(const btHashKey<Value>& other) const
+	{
+		return getUid1() == other.getUid1();
+	}
+	//to our success
+	SIMD_FORCE_INLINE unsigned int getHash() const
+	{
+		unsigned int key = m_uid;
+		// Thomas Wang's hash
+		key += ~(key << 15);
+		key ^= (key >> 10);
+		key += (key << 3);
+		key ^= (key >> 6);
+		key += ~(key << 11);
+		key ^= (key >> 16);
+		return key;
+	}
+};
+
+///The btHashMap template class implements a generic and lightweight hashmap.
+///A basic sample of how to use btHashMap is located in Demos\BasicDemo\main.cpp
+template <class Key, class Value>
+class btHashMap
+{
+protected:
+	btAlignedObjectArray<int> m_hashTable;
+	btAlignedObjectArray<int> m_next;
+
+	btAlignedObjectArray<Value> m_valueArray;
+	btAlignedObjectArray<Key> m_keyArray;
+
+	void growTables(const Key& /*key*/)
+	{
+		int newCapacity = m_valueArray.capacity();
+
+		if (m_hashTable.size() < newCapacity)
+		{
+			//grow hashtable and next table
+			int curHashtableSize = m_hashTable.size();
+
+			m_hashTable.resize(newCapacity);
+			m_next.resize(newCapacity);
+
+			int i;
+
+			for (i = 0; i < newCapacity; ++i)
+			{
+				m_hashTable[i] = BT_HASH_NULL;
+			}
+			for (i = 0; i < newCapacity; ++i)
+			{
+				m_next[i] = BT_HASH_NULL;
+			}
+
+			for (i = 0; i < curHashtableSize; i++)
+			{
+				//const Value& value = m_valueArray[i];
+				//const Key& key = m_keyArray[i];
+
+				int hashValue = m_keyArray[i].getHash() & (m_valueArray.capacity() - 1);  // New hash value with new mask
+				m_next[i] = m_hashTable[hashValue];
+				m_hashTable[hashValue] = i;
+			}
+		}
+	}
+
+public:
+	void insert(const Key& key, const Value& value)
+	{
+		int hash = key.getHash() & (m_valueArray.capacity() - 1);
+
+		//replace value if the key is already there
+		int index = findIndex(key);
+		if (index != BT_HASH_NULL)
+		{
+			m_valueArray[index] = value;
+			return;
+		}
+
+		int count = m_valueArray.size();
+		int oldCapacity = m_valueArray.capacity();
+		m_valueArray.push_back(value);
+		m_keyArray.push_back(key);
+
+		int newCapacity = m_valueArray.capacity();
+		if (oldCapacity < newCapacity)
+		{
+			growTables(key);
+			//hash with new capacity
+			hash = key.getHash() & (m_valueArray.capacity() - 1);
+		}
+		m_next[count] = m_hashTable[hash];
+		m_hashTable[hash] = count;
+	}
+
+	void remove(const Key& key)
+	{
+		int hash = key.getHash() & (m_valueArray.capacity() - 1);
+
+		int pairIndex = findIndex(key);
+
+		if (pairIndex == BT_HASH_NULL)
+		{
+			return;
+		}
+
+		// Remove the pair from the hash table.
+		int index = m_hashTable[hash];
+		btAssert(index != BT_HASH_NULL);
+
+		int previous = BT_HASH_NULL;
+		while (index != pairIndex)
+		{
+			previous = index;
+			index = m_next[index];
+		}
+
+		if (previous != BT_HASH_NULL)
+		{
+			btAssert(m_next[previous] == pairIndex);
+			m_next[previous] = m_next[pairIndex];
+		}
+		else
+		{
+			m_hashTable[hash] = m_next[pairIndex];
+		}
+
+		// We now move the last pair into spot of the
+		// pair being removed. We need to fix the hash
+		// table indices to support the move.
+
+		int lastPairIndex = m_valueArray.size() - 1;
+
+		// If the removed pair is the last pair, we are done.
+		if (lastPairIndex == pairIndex)
+		{
+			m_valueArray.pop_back();
+			m_keyArray.pop_back();
+			return;
+		}
+
+		// Remove the last pair from the hash table.
+		int lastHash = m_keyArray[lastPairIndex].getHash() & (m_valueArray.capacity() - 1);
+
+		index = m_hashTable[lastHash];
+		btAssert(index != BT_HASH_NULL);
+
+		previous = BT_HASH_NULL;
+		while (index != lastPairIndex)
+		{
+			previous = index;
+			index = m_next[index];
+		}
+
+		if (previous != BT_HASH_NULL)
+		{
+			btAssert(m_next[previous] == lastPairIndex);
+			m_next[previous] = m_next[lastPairIndex];
+		}
+		else
+		{
+			m_hashTable[lastHash] = m_next[lastPairIndex];
+		}
+
+		// Copy the last pair into the remove pair's spot.
+		m_valueArray[pairIndex] = m_valueArray[lastPairIndex];
+		m_keyArray[pairIndex] = m_keyArray[lastPairIndex];
+
+		// Insert the last pair into the hash table
+		m_next[pairIndex] = m_hashTable[lastHash];
+		m_hashTable[lastHash] = pairIndex;
+
+		m_valueArray.pop_back();
+		m_keyArray.pop_back();
+	}
+
+	int size() const
+	{
+		return m_valueArray.size();
+	}
+
+	const Value* getAtIndex(int index) const
+	{
+		btAssert(index < m_valueArray.size());
+		btAssert(index >= 0);
+		if (index >= 0 && index < m_valueArray.size())
+		{
+			return &m_valueArray[index];
+		}
+		return 0;
+	}
+
+	Value* getAtIndex(int index)
+	{
+		btAssert(index < m_valueArray.size());
+		btAssert(index >= 0);
+		if (index >= 0 && index < m_valueArray.size())
+		{
+			return &m_valueArray[index];
+		}
+		return 0;
+	}
+
+	Key getKeyAtIndex(int index)
+	{
+		btAssert(index < m_keyArray.size());
+		btAssert(index >= 0);
+		return m_keyArray[index];
+	}
+
+	const Key getKeyAtIndex(int index) const
+	{
+		btAssert(index < m_keyArray.size());
+		btAssert(index >= 0);
+		return m_keyArray[index];
+	}
+
+	Value* operator[](const Key& key)
+	{
+		return find(key);
+	}
+
+	const Value* operator[](const Key& key) const
+	{
+		return find(key);
+	}
+
+	const Value* find(const Key& key) const
+	{
+		int index = findIndex(key);
+		if (index == BT_HASH_NULL)
+		{
+			return NULL;
+		}
+		return &m_valueArray[index];
+	}
+
+	Value* find(const Key& key)
+	{
+		int index = findIndex(key);
+		if (index == BT_HASH_NULL)
+		{
+			return NULL;
+		}
+		return &m_valueArray[index];
+	}
+
+	int findIndex(const Key& key) const
+	{
+		unsigned int hash = key.getHash() & (m_valueArray.capacity() - 1);
+
+		if (hash >= (unsigned int)m_hashTable.size())
+		{
+			return BT_HASH_NULL;
+		}
+
+		int index = m_hashTable[hash];
+		while ((index != BT_HASH_NULL) && key.equals(m_keyArray[index]) == false)
+		{
+			index = m_next[index];
+		}
+		return index;
+	}
+
+	void clear()
+	{
+		m_hashTable.clear();
+		m_next.clear();
+		m_valueArray.clear();
+		m_keyArray.clear();
+	}
+};
+
+#endif  //BT_HASH_MAP_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btIDebugDraw.h b/dali-physics/third-party/bullet3/src/LinearMath/btIDebugDraw.h
new file mode 100644
index 0000000..df4db2f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btIDebugDraw.h
@@ -0,0 +1,473 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_IDEBUG_DRAW__H
+#define BT_IDEBUG_DRAW__H
+
+#include "btVector3.h"
+#include "btTransform.h"
+
+///The btIDebugDraw interface class allows hooking up a debug renderer to visually debug simulations.
+///Typical use case: create a debug drawer object, and assign it to a btCollisionWorld or btDynamicsWorld using setDebugDrawer and call debugDrawWorld.
+///A class that implements the btIDebugDraw interface will need to provide non-empty implementations of the the drawLine and getDebugMode methods at a minimum.
+///For color arguments the X,Y,Z components refer to Red, Green and Blue each in the range [0..1]
+class btIDebugDraw
+{
+public:
+	ATTRIBUTE_ALIGNED16(struct)
+	DefaultColors
+	{
+		btVector3 m_activeObject;
+		btVector3 m_deactivatedObject;
+		btVector3 m_wantsDeactivationObject;
+		btVector3 m_disabledDeactivationObject;
+		btVector3 m_disabledSimulationObject;
+		btVector3 m_aabb;
+		btVector3 m_contactPoint;
+
+		DefaultColors()
+			: m_activeObject(1, 1, 1),
+			  m_deactivatedObject(0, 1, 0),
+			  m_wantsDeactivationObject(0, 1, 1),
+			  m_disabledDeactivationObject(1, 0, 0),
+			  m_disabledSimulationObject(1, 1, 0),
+			  m_aabb(1, 0, 0),
+			  m_contactPoint(1, 1, 0)
+		{
+		}
+	};
+
+	enum DebugDrawModes
+	{
+		DBG_NoDebug = 0,
+		DBG_DrawWireframe = 1,
+		DBG_DrawAabb = 2,
+		DBG_DrawFeaturesText = 4,
+		DBG_DrawContactPoints = 8,
+		DBG_NoDeactivation = 16,
+		DBG_NoHelpText = 32,
+		DBG_DrawText = 64,
+		DBG_ProfileTimings = 128,
+		DBG_EnableSatComparison = 256,
+		DBG_DisableBulletLCP = 512,
+		DBG_EnableCCD = 1024,
+		DBG_DrawConstraints = (1 << 11),
+		DBG_DrawConstraintLimits = (1 << 12),
+		DBG_FastWireframe = (1 << 13),
+		DBG_DrawNormals = (1 << 14),
+		DBG_DrawFrames = (1 << 15),
+		DBG_MAX_DEBUG_DRAW_MODE
+	};
+
+	virtual ~btIDebugDraw(){};
+
+	virtual DefaultColors getDefaultColors() const
+	{
+		DefaultColors colors;
+		return colors;
+	}
+	///the default implementation for setDefaultColors has no effect. A derived class can implement it and store the colors.
+	virtual void setDefaultColors(const DefaultColors& /*colors*/) {}
+
+	virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) = 0;
+
+	virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& fromColor, const btVector3& toColor)
+	{
+		(void)toColor;
+		drawLine(from, to, fromColor);
+	}
+
+	virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color)
+	{
+		btVector3 center = transform.getOrigin();
+		btVector3 up = transform.getBasis().getColumn(1);
+		btVector3 axis = transform.getBasis().getColumn(0);
+		btScalar minTh = -SIMD_HALF_PI;
+		btScalar maxTh = SIMD_HALF_PI;
+		btScalar minPs = -SIMD_HALF_PI;
+		btScalar maxPs = SIMD_HALF_PI;
+		btScalar stepDegrees = 30.f;
+		drawSpherePatch(center, up, axis, radius, minTh, maxTh, minPs, maxPs, color, stepDegrees, false);
+		drawSpherePatch(center, up, -axis, radius, minTh, maxTh, minPs, maxPs, color, stepDegrees, false);
+	}
+
+	virtual void drawSphere(const btVector3& p, btScalar radius, const btVector3& color)
+	{
+		btTransform tr;
+		tr.setIdentity();
+		tr.setOrigin(p);
+		drawSphere(radius, tr, color);
+	}
+
+	virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& /*n0*/, const btVector3& /*n1*/, const btVector3& /*n2*/, const btVector3& color, btScalar alpha)
+	{
+		drawTriangle(v0, v1, v2, color, alpha);
+	}
+	virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar /*alpha*/)
+	{
+		drawLine(v0, v1, color);
+		drawLine(v1, v2, color);
+		drawLine(v2, v0, color);
+	}
+
+	virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color) = 0;
+
+	virtual void reportErrorWarning(const char* warningString) = 0;
+
+	virtual void draw3dText(const btVector3& location, const char* textString) = 0;
+
+	virtual void setDebugMode(int debugMode) = 0;
+
+	virtual int getDebugMode() const = 0;
+
+	virtual void drawAabb(const btVector3& from, const btVector3& to, const btVector3& color)
+	{
+		btVector3 halfExtents = (to - from) * 0.5f;
+		btVector3 center = (to + from) * 0.5f;
+		int i, j;
+
+		btVector3 edgecoord(1.f, 1.f, 1.f), pa, pb;
+		for (i = 0; i < 4; i++)
+		{
+			for (j = 0; j < 3; j++)
+			{
+				pa = btVector3(edgecoord[0] * halfExtents[0], edgecoord[1] * halfExtents[1],
+							   edgecoord[2] * halfExtents[2]);
+				pa += center;
+
+				int othercoord = j % 3;
+				edgecoord[othercoord] *= -1.f;
+				pb = btVector3(edgecoord[0] * halfExtents[0], edgecoord[1] * halfExtents[1],
+							   edgecoord[2] * halfExtents[2]);
+				pb += center;
+
+				drawLine(pa, pb, color);
+			}
+			edgecoord = btVector3(-1.f, -1.f, -1.f);
+			if (i < 3)
+				edgecoord[i] *= -1.f;
+		}
+	}
+	virtual void drawTransform(const btTransform& transform, btScalar orthoLen)
+	{
+		btVector3 start = transform.getOrigin();
+		drawLine(start, start + transform.getBasis() * btVector3(orthoLen, 0, 0), btVector3(btScalar(1.), btScalar(0.3), btScalar(0.3)));
+		drawLine(start, start + transform.getBasis() * btVector3(0, orthoLen, 0), btVector3(btScalar(0.3), btScalar(1.), btScalar(0.3)));
+		drawLine(start, start + transform.getBasis() * btVector3(0, 0, orthoLen), btVector3(btScalar(0.3), btScalar(0.3), btScalar(1.)));
+	}
+
+	virtual void drawArc(const btVector3& center, const btVector3& normal, const btVector3& axis, btScalar radiusA, btScalar radiusB, btScalar minAngle, btScalar maxAngle,
+						 const btVector3& color, bool drawSect, btScalar stepDegrees = btScalar(10.f))
+	{
+		const btVector3& vx = axis;
+		btVector3 vy = normal.cross(axis);
+		btScalar step = stepDegrees * SIMD_RADS_PER_DEG;
+		int nSteps = (int)btFabs((maxAngle - minAngle) / step);
+		if (!nSteps) nSteps = 1;
+		btVector3 prev = center + radiusA * vx * btCos(minAngle) + radiusB * vy * btSin(minAngle);
+		if (drawSect)
+		{
+			drawLine(center, prev, color);
+		}
+		for (int i = 1; i <= nSteps; i++)
+		{
+			btScalar angle = minAngle + (maxAngle - minAngle) * btScalar(i) / btScalar(nSteps);
+			btVector3 next = center + radiusA * vx * btCos(angle) + radiusB * vy * btSin(angle);
+			drawLine(prev, next, color);
+			prev = next;
+		}
+		if (drawSect)
+		{
+			drawLine(center, prev, color);
+		}
+	}
+	virtual void drawSpherePatch(const btVector3& center, const btVector3& up, const btVector3& axis, btScalar radius,
+								 btScalar minTh, btScalar maxTh, btScalar minPs, btScalar maxPs, const btVector3& color, btScalar stepDegrees = btScalar(10.f), bool drawCenter = true)
+	{
+		btVector3 vA[74];
+		btVector3 vB[74];
+		btVector3 *pvA = vA, *pvB = vB, *pT;
+		btVector3 npole = center + up * radius;
+		btVector3 spole = center - up * radius;
+		btVector3 arcStart;
+		btScalar step = stepDegrees * SIMD_RADS_PER_DEG;
+		const btVector3& kv = up;
+		const btVector3& iv = axis;
+		btVector3 jv = kv.cross(iv);
+		bool drawN = false;
+		bool drawS = false;
+		if (minTh <= -SIMD_HALF_PI)
+		{
+			minTh = -SIMD_HALF_PI + step;
+			drawN = true;
+		}
+		if (maxTh >= SIMD_HALF_PI)
+		{
+			maxTh = SIMD_HALF_PI - step;
+			drawS = true;
+		}
+		if (minTh > maxTh)
+		{
+			minTh = -SIMD_HALF_PI + step;
+			maxTh = SIMD_HALF_PI - step;
+			drawN = drawS = true;
+		}
+		int n_hor = (int)((maxTh - minTh) / step) + 1;
+		if (n_hor < 2) n_hor = 2;
+		btScalar step_h = (maxTh - minTh) / btScalar(n_hor - 1);
+		bool isClosed = false;
+		if (minPs > maxPs)
+		{
+			minPs = -SIMD_PI + step;
+			maxPs = SIMD_PI;
+			isClosed = true;
+		}
+		else if ((maxPs - minPs) >= SIMD_PI * btScalar(2.f))
+		{
+			isClosed = true;
+		}
+		else
+		{
+			isClosed = false;
+		}
+		int n_vert = (int)((maxPs - minPs) / step) + 1;
+		if (n_vert < 2) n_vert = 2;
+		btScalar step_v = (maxPs - minPs) / btScalar(n_vert - 1);
+		for (int i = 0; i < n_hor; i++)
+		{
+			btScalar th = minTh + btScalar(i) * step_h;
+			btScalar sth = radius * btSin(th);
+			btScalar cth = radius * btCos(th);
+			for (int j = 0; j < n_vert; j++)
+			{
+				btScalar psi = minPs + btScalar(j) * step_v;
+				btScalar sps = btSin(psi);
+				btScalar cps = btCos(psi);
+				pvB[j] = center + cth * cps * iv + cth * sps * jv + sth * kv;
+				if (i)
+				{
+					drawLine(pvA[j], pvB[j], color);
+				}
+				else if (drawS)
+				{
+					drawLine(spole, pvB[j], color);
+				}
+				if (j)
+				{
+					drawLine(pvB[j - 1], pvB[j], color);
+				}
+				else
+				{
+					arcStart = pvB[j];
+				}
+				if ((i == (n_hor - 1)) && drawN)
+				{
+					drawLine(npole, pvB[j], color);
+				}
+
+				if (drawCenter)
+				{
+					if (isClosed)
+					{
+						if (j == (n_vert - 1))
+						{
+							drawLine(arcStart, pvB[j], color);
+						}
+					}
+					else
+					{
+						if (((!i) || (i == (n_hor - 1))) && ((!j) || (j == (n_vert - 1))))
+						{
+							drawLine(center, pvB[j], color);
+						}
+					}
+				}
+			}
+			pT = pvA;
+			pvA = pvB;
+			pvB = pT;
+		}
+	}
+
+	virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color)
+	{
+		drawLine(btVector3(bbMin[0], bbMin[1], bbMin[2]), btVector3(bbMax[0], bbMin[1], bbMin[2]), color);
+		drawLine(btVector3(bbMax[0], bbMin[1], bbMin[2]), btVector3(bbMax[0], bbMax[1], bbMin[2]), color);
+		drawLine(btVector3(bbMax[0], bbMax[1], bbMin[2]), btVector3(bbMin[0], bbMax[1], bbMin[2]), color);
+		drawLine(btVector3(bbMin[0], bbMax[1], bbMin[2]), btVector3(bbMin[0], bbMin[1], bbMin[2]), color);
+		drawLine(btVector3(bbMin[0], bbMin[1], bbMin[2]), btVector3(bbMin[0], bbMin[1], bbMax[2]), color);
+		drawLine(btVector3(bbMax[0], bbMin[1], bbMin[2]), btVector3(bbMax[0], bbMin[1], bbMax[2]), color);
+		drawLine(btVector3(bbMax[0], bbMax[1], bbMin[2]), btVector3(bbMax[0], bbMax[1], bbMax[2]), color);
+		drawLine(btVector3(bbMin[0], bbMax[1], bbMin[2]), btVector3(bbMin[0], bbMax[1], bbMax[2]), color);
+		drawLine(btVector3(bbMin[0], bbMin[1], bbMax[2]), btVector3(bbMax[0], bbMin[1], bbMax[2]), color);
+		drawLine(btVector3(bbMax[0], bbMin[1], bbMax[2]), btVector3(bbMax[0], bbMax[1], bbMax[2]), color);
+		drawLine(btVector3(bbMax[0], bbMax[1], bbMax[2]), btVector3(bbMin[0], bbMax[1], bbMax[2]), color);
+		drawLine(btVector3(bbMin[0], bbMax[1], bbMax[2]), btVector3(bbMin[0], bbMin[1], bbMax[2]), color);
+	}
+	virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color)
+	{
+		drawLine(trans * btVector3(bbMin[0], bbMin[1], bbMin[2]), trans * btVector3(bbMax[0], bbMin[1], bbMin[2]), color);
+		drawLine(trans * btVector3(bbMax[0], bbMin[1], bbMin[2]), trans * btVector3(bbMax[0], bbMax[1], bbMin[2]), color);
+		drawLine(trans * btVector3(bbMax[0], bbMax[1], bbMin[2]), trans * btVector3(bbMin[0], bbMax[1], bbMin[2]), color);
+		drawLine(trans * btVector3(bbMin[0], bbMax[1], bbMin[2]), trans * btVector3(bbMin[0], bbMin[1], bbMin[2]), color);
+		drawLine(trans * btVector3(bbMin[0], bbMin[1], bbMin[2]), trans * btVector3(bbMin[0], bbMin[1], bbMax[2]), color);
+		drawLine(trans * btVector3(bbMax[0], bbMin[1], bbMin[2]), trans * btVector3(bbMax[0], bbMin[1], bbMax[2]), color);
+		drawLine(trans * btVector3(bbMax[0], bbMax[1], bbMin[2]), trans * btVector3(bbMax[0], bbMax[1], bbMax[2]), color);
+		drawLine(trans * btVector3(bbMin[0], bbMax[1], bbMin[2]), trans * btVector3(bbMin[0], bbMax[1], bbMax[2]), color);
+		drawLine(trans * btVector3(bbMin[0], bbMin[1], bbMax[2]), trans * btVector3(bbMax[0], bbMin[1], bbMax[2]), color);
+		drawLine(trans * btVector3(bbMax[0], bbMin[1], bbMax[2]), trans * btVector3(bbMax[0], bbMax[1], bbMax[2]), color);
+		drawLine(trans * btVector3(bbMax[0], bbMax[1], bbMax[2]), trans * btVector3(bbMin[0], bbMax[1], bbMax[2]), color);
+		drawLine(trans * btVector3(bbMin[0], bbMax[1], bbMax[2]), trans * btVector3(bbMin[0], bbMin[1], bbMax[2]), color);
+	}
+
+	virtual void drawCapsule(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color)
+	{
+		int stepDegrees = 30;
+
+		btVector3 capStart(0.f, 0.f, 0.f);
+		capStart[upAxis] = -halfHeight;
+
+		btVector3 capEnd(0.f, 0.f, 0.f);
+		capEnd[upAxis] = halfHeight;
+
+		// Draw the ends
+		{
+			btTransform childTransform = transform;
+			childTransform.getOrigin() = transform * capStart;
+			{
+				btVector3 center = childTransform.getOrigin();
+				btVector3 up = childTransform.getBasis().getColumn((upAxis + 1) % 3);
+				btVector3 axis = -childTransform.getBasis().getColumn(upAxis);
+				btScalar minTh = -SIMD_HALF_PI;
+				btScalar maxTh = SIMD_HALF_PI;
+				btScalar minPs = -SIMD_HALF_PI;
+				btScalar maxPs = SIMD_HALF_PI;
+
+				drawSpherePatch(center, up, axis, radius, minTh, maxTh, minPs, maxPs, color, btScalar(stepDegrees), false);
+			}
+		}
+
+		{
+			btTransform childTransform = transform;
+			childTransform.getOrigin() = transform * capEnd;
+			{
+				btVector3 center = childTransform.getOrigin();
+				btVector3 up = childTransform.getBasis().getColumn((upAxis + 1) % 3);
+				btVector3 axis = childTransform.getBasis().getColumn(upAxis);
+				btScalar minTh = -SIMD_HALF_PI;
+				btScalar maxTh = SIMD_HALF_PI;
+				btScalar minPs = -SIMD_HALF_PI;
+				btScalar maxPs = SIMD_HALF_PI;
+				drawSpherePatch(center, up, axis, radius, minTh, maxTh, minPs, maxPs, color, btScalar(stepDegrees), false);
+			}
+		}
+
+		// Draw some additional lines
+		btVector3 start = transform.getOrigin();
+
+		for (int i = 0; i < 360; i += stepDegrees)
+		{
+			capEnd[(upAxis + 1) % 3] = capStart[(upAxis + 1) % 3] = btSin(btScalar(i) * SIMD_RADS_PER_DEG) * radius;
+			capEnd[(upAxis + 2) % 3] = capStart[(upAxis + 2) % 3] = btCos(btScalar(i) * SIMD_RADS_PER_DEG) * radius;
+			drawLine(start + transform.getBasis() * capStart, start + transform.getBasis() * capEnd, color);
+		}
+	}
+
+	virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color)
+	{
+		btVector3 start = transform.getOrigin();
+		btVector3 offsetHeight(0, 0, 0);
+		offsetHeight[upAxis] = halfHeight;
+		int stepDegrees = 30;
+		btVector3 capStart(0.f, 0.f, 0.f);
+		capStart[upAxis] = -halfHeight;
+		btVector3 capEnd(0.f, 0.f, 0.f);
+		capEnd[upAxis] = halfHeight;
+
+		for (int i = 0; i < 360; i += stepDegrees)
+		{
+			capEnd[(upAxis + 1) % 3] = capStart[(upAxis + 1) % 3] = btSin(btScalar(i) * SIMD_RADS_PER_DEG) * radius;
+			capEnd[(upAxis + 2) % 3] = capStart[(upAxis + 2) % 3] = btCos(btScalar(i) * SIMD_RADS_PER_DEG) * radius;
+			drawLine(start + transform.getBasis() * capStart, start + transform.getBasis() * capEnd, color);
+		}
+		// Drawing top and bottom caps of the cylinder
+		btVector3 yaxis(0, 0, 0);
+		yaxis[upAxis] = btScalar(1.0);
+		btVector3 xaxis(0, 0, 0);
+		xaxis[(upAxis + 1) % 3] = btScalar(1.0);
+		drawArc(start - transform.getBasis() * (offsetHeight), transform.getBasis() * yaxis, transform.getBasis() * xaxis, radius, radius, 0, SIMD_2_PI, color, false, btScalar(10.0));
+		drawArc(start + transform.getBasis() * (offsetHeight), transform.getBasis() * yaxis, transform.getBasis() * xaxis, radius, radius, 0, SIMD_2_PI, color, false, btScalar(10.0));
+	}
+
+	virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color)
+	{
+		int stepDegrees = 30;
+		btVector3 start = transform.getOrigin();
+
+		btVector3 offsetHeight(0, 0, 0);
+		btScalar halfHeight = height * btScalar(0.5);
+		offsetHeight[upAxis] = halfHeight;
+		btVector3 offsetRadius(0, 0, 0);
+		offsetRadius[(upAxis + 1) % 3] = radius;
+		btVector3 offset2Radius(0, 0, 0);
+		offset2Radius[(upAxis + 2) % 3] = radius;
+
+		btVector3 capEnd(0.f, 0.f, 0.f);
+		capEnd[upAxis] = -halfHeight;
+
+		for (int i = 0; i < 360; i += stepDegrees)
+		{
+			capEnd[(upAxis + 1) % 3] = btSin(btScalar(i) * SIMD_RADS_PER_DEG) * radius;
+			capEnd[(upAxis + 2) % 3] = btCos(btScalar(i) * SIMD_RADS_PER_DEG) * radius;
+			drawLine(start + transform.getBasis() * (offsetHeight), start + transform.getBasis() * capEnd, color);
+		}
+
+		drawLine(start + transform.getBasis() * (offsetHeight), start + transform.getBasis() * (-offsetHeight + offsetRadius), color);
+		drawLine(start + transform.getBasis() * (offsetHeight), start + transform.getBasis() * (-offsetHeight - offsetRadius), color);
+		drawLine(start + transform.getBasis() * (offsetHeight), start + transform.getBasis() * (-offsetHeight + offset2Radius), color);
+		drawLine(start + transform.getBasis() * (offsetHeight), start + transform.getBasis() * (-offsetHeight - offset2Radius), color);
+
+		// Drawing the base of the cone
+		btVector3 yaxis(0, 0, 0);
+		yaxis[upAxis] = btScalar(1.0);
+		btVector3 xaxis(0, 0, 0);
+		xaxis[(upAxis + 1) % 3] = btScalar(1.0);
+		drawArc(start - transform.getBasis() * (offsetHeight), transform.getBasis() * yaxis, transform.getBasis() * xaxis, radius, radius, 0, SIMD_2_PI, color, false, 10.0);
+	}
+
+	virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color)
+	{
+		btVector3 planeOrigin = planeNormal * planeConst;
+		btVector3 vec0, vec1;
+		btPlaneSpace1(planeNormal, vec0, vec1);
+		btScalar vecLen = 100.f;
+		btVector3 pt0 = planeOrigin + vec0 * vecLen;
+		btVector3 pt1 = planeOrigin - vec0 * vecLen;
+		btVector3 pt2 = planeOrigin + vec1 * vecLen;
+		btVector3 pt3 = planeOrigin - vec1 * vecLen;
+		drawLine(transform * pt0, transform * pt1, color);
+		drawLine(transform * pt2, transform * pt3, color);
+	}
+
+	virtual void clearLines()
+	{
+	}
+
+	virtual void flushLines()
+	{
+	}
+};
+
+#endif  //BT_IDEBUG_DRAW__H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btImplicitQRSVD.h b/dali-physics/third-party/bullet3/src/LinearMath/btImplicitQRSVD.h
new file mode 100644
index 0000000..aaedc96
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btImplicitQRSVD.h
@@ -0,0 +1,916 @@
+/**
+ Bullet Continuous Collision Detection and Physics Library
+ Copyright (c) 2019 Google Inc. http://bulletphysics.org
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ 
+ Copyright (c) 2016 Theodore Gast, Chuyuan Fu, Chenfanfu Jiang, Joseph Teran
+ 
+ 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.
+ 
+ If the code is used in an article, the following paper shall be cited:
+ @techreport{qrsvd:2016,
+ title={Implicit-shifted Symmetric QR Singular Value Decomposition of 3x3 Matrices},
+ author={Gast, Theodore and Fu, Chuyuan and Jiang, Chenfanfu and Teran, Joseph},
+ year={2016},
+ institution={University of California Los Angeles}
+ }
+ 
+ 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.
+**/
+
+#ifndef btImplicitQRSVD_h
+#define btImplicitQRSVD_h
+#include <limits>
+#include "btMatrix3x3.h"
+class btMatrix2x2
+{
+public:
+    btScalar m_00, m_01, m_10, m_11;
+    btMatrix2x2(): m_00(0), m_10(0), m_01(0), m_11(0)
+    {
+    }
+    btMatrix2x2(const btMatrix2x2& other): m_00(other.m_00),m_01(other.m_01),m_10(other.m_10),m_11(other.m_11)
+    {}
+    btScalar& operator()(int i, int j)
+    {
+        if (i == 0 && j == 0)
+            return m_00;
+        if (i == 1 && j == 0)
+            return m_10;
+        if (i == 0 && j == 1)
+            return m_01;
+        if (i == 1 && j == 1)
+            return m_11;
+        btAssert(false);
+        return m_00;
+    }
+    const btScalar& operator()(int i, int j) const
+    {
+        if (i == 0 && j == 0)
+            return m_00;
+        if (i == 1 && j == 0)
+            return m_10;
+        if (i == 0 && j == 1)
+            return m_01;
+        if (i == 1 && j == 1)
+            return m_11;
+        btAssert(false);
+        return m_00;
+    }
+    void setIdentity()
+    {
+        m_00 = 1;
+        m_11 = 1;
+        m_01 = 0;
+        m_10 = 0;
+    }
+};
+
+static inline btScalar copySign(btScalar x, btScalar y) {
+    if ((x < 0 && y > 0) || (x > 0 && y < 0))
+        return -x;
+    return x;
+}
+
+/**
+ Class for givens rotation.
+ Row rotation G*A corresponds to something like
+ c -s  0
+ ( s  c  0 ) A
+ 0  0  1
+ Column rotation A G' corresponds to something like
+ c -s  0
+ A ( s  c  0 )
+ 0  0  1
+ 
+ c and s are always computed so that
+ ( c -s ) ( a )  =  ( * )
+ s  c     b       ( 0 )
+ 
+ Assume rowi<rowk.
+ */
+
+class GivensRotation {
+public:
+    int rowi;
+    int rowk;
+    btScalar c;
+    btScalar s;
+    
+    inline GivensRotation(int rowi_in, int rowk_in)
+    : rowi(rowi_in)
+    , rowk(rowk_in)
+    , c(1)
+    , s(0)
+    {
+    }
+    
+    inline GivensRotation(btScalar a, btScalar b, int rowi_in, int rowk_in)
+    : rowi(rowi_in)
+    , rowk(rowk_in)
+    {
+        compute(a, b);
+    }
+    
+    ~GivensRotation() {}
+    
+    inline void transposeInPlace()
+    {
+        s = -s;
+    }
+    
+    /**
+     Compute c and s from a and b so that
+     ( c -s ) ( a )  =  ( * )
+     s  c     b       ( 0 )
+     */
+    inline void compute(const btScalar a, const btScalar b)
+    {
+        btScalar d = a * a + b * b;
+        c = 1;
+        s = 0;
+        if (d > SIMD_EPSILON) {
+            btScalar sqrtd = btSqrt(d);
+            if (sqrtd>SIMD_EPSILON)
+            {
+              btScalar t = btScalar(1.0)/sqrtd;
+              c = a * t;
+              s = -b * t;
+            }
+        }
+    }
+    
+    /**
+     This function computes c and s so that
+     ( c -s ) ( a )  =  ( 0 )
+     s  c     b       ( * )
+     */
+    inline void computeUnconventional(const btScalar a, const btScalar b)
+    {
+        btScalar d = a * a + b * b;
+        c = 0;
+        s = 1;
+        if (d > SIMD_EPSILON) {
+            btScalar t = btScalar(1.0)/btSqrt(d);
+            s = a * t;
+            c = b * t;
+        }
+    }
+    /**
+     Fill the R with the entries of this rotation
+     */
+    inline void fill(const btMatrix3x3& R) const
+    {
+        btMatrix3x3& A = const_cast<btMatrix3x3&>(R);
+        A.setIdentity();
+        A[rowi][rowi] = c;
+        A[rowk][rowi] = -s;
+        A[rowi][rowk] = s;
+        A[rowk][rowk] = c;
+    }
+    
+    inline void fill(const btMatrix2x2& R) const
+    {
+        btMatrix2x2& A = const_cast<btMatrix2x2&>(R);
+        A(rowi,rowi) = c;
+        A(rowk,rowi) = -s;
+        A(rowi,rowk) = s;
+        A(rowk,rowk) = c;
+    }
+    
+    /**
+     This function does something like
+     c -s  0
+     ( s  c  0 ) A -> A
+     0  0  1
+     It only affects row i and row k of A.
+     */
+    inline void rowRotation(btMatrix3x3& A) const
+    {
+        for (int j = 0; j < 3; j++) {
+            btScalar tau1 = A[rowi][j];
+            btScalar tau2 = A[rowk][j];
+            A[rowi][j] = c * tau1 - s * tau2;
+            A[rowk][j] = s * tau1 + c * tau2;
+        }
+    }
+    inline void rowRotation(btMatrix2x2& A) const
+    {
+        for (int j = 0; j < 2; j++) {
+            btScalar tau1 = A(rowi,j);
+            btScalar tau2 = A(rowk,j);
+            A(rowi,j) = c * tau1 - s * tau2;
+            A(rowk,j) = s * tau1 + c * tau2;
+        }
+    }
+    
+    /**
+     This function does something like
+     c  s  0
+     A ( -s  c  0 )  -> A
+     0  0  1
+     It only affects column i and column k of A.
+     */
+    inline void columnRotation(btMatrix3x3& A) const
+    {
+        for (int j = 0; j < 3; j++) {
+            btScalar tau1 = A[j][rowi];
+            btScalar tau2 = A[j][rowk];
+            A[j][rowi] = c * tau1 - s * tau2;
+            A[j][rowk] = s * tau1 + c * tau2;
+        }
+    }
+    inline void columnRotation(btMatrix2x2& A) const
+    {
+        for (int j = 0; j < 2; j++) {
+            btScalar tau1 = A(j,rowi);
+            btScalar tau2 = A(j,rowk);
+            A(j,rowi) = c * tau1 - s * tau2;
+            A(j,rowk) = s * tau1 + c * tau2;
+        }
+    }
+    
+    /**
+     Multiply givens must be for same row and column
+     **/
+    inline void operator*=(const GivensRotation& A)
+    {
+        btScalar new_c = c * A.c - s * A.s;
+        btScalar new_s = s * A.c + c * A.s;
+        c = new_c;
+        s = new_s;
+    }
+    
+    /**
+     Multiply givens must be for same row and column
+     **/
+    inline GivensRotation operator*(const GivensRotation& A) const
+    {
+        GivensRotation r(*this);
+        r *= A;
+        return r;
+    }
+};
+
+/**
+ \brief zero chasing the 3X3 matrix to bidiagonal form
+ original form of H:   x x 0
+ x x x
+ 0 0 x
+ after zero chase:
+ x x 0
+ 0 x x
+ 0 0 x
+ */
+inline void zeroChase(btMatrix3x3& H, btMatrix3x3& U, btMatrix3x3& V)
+{
+    
+    /**
+     Reduce H to of form
+     x x +
+     0 x x
+     0 0 x
+     */
+    GivensRotation r1(H[0][0], H[1][0], 0, 1);
+    /**
+     Reduce H to of form
+     x x 0
+     0 x x
+     0 + x
+     Can calculate r2 without multiplying by r1 since both entries are in first two
+     rows thus no need to divide by sqrt(a^2+b^2)
+     */
+    GivensRotation r2(1, 2);
+    if (H[1][0] != 0)
+        r2.compute(H[0][0] * H[0][1] + H[1][0] * H[1][1], H[0][0] * H[0][2] + H[1][0] * H[1][2]);
+    else
+        r2.compute(H[0][1], H[0][2]);
+    
+    r1.rowRotation(H);
+    
+    /* GivensRotation<T> r2(H(0, 1), H(0, 2), 1, 2); */
+    r2.columnRotation(H);
+    r2.columnRotation(V);
+    
+    /**
+     Reduce H to of form
+     x x 0
+     0 x x
+     0 0 x
+     */
+    GivensRotation r3(H[1][1], H[2][1], 1, 2);
+    r3.rowRotation(H);
+    
+    // Save this till end for better cache coherency
+    // r1.rowRotation(u_transpose);
+    // r3.rowRotation(u_transpose);
+    r1.columnRotation(U);
+    r3.columnRotation(U);
+}
+
+/**
+ \brief make a 3X3 matrix to upper bidiagonal form
+ original form of H:   x x x
+ x x x
+ x x x
+ after zero chase:
+ x x 0
+ 0 x x
+ 0 0 x
+ */
+inline void makeUpperBidiag(btMatrix3x3& H, btMatrix3x3& U, btMatrix3x3& V)
+{
+    U.setIdentity();
+    V.setIdentity();
+    
+    /**
+     Reduce H to of form
+     x x x
+     x x x
+     0 x x
+     */
+    
+    GivensRotation r(H[1][0], H[2][0], 1, 2);
+    r.rowRotation(H);
+    // r.rowRotation(u_transpose);
+    r.columnRotation(U);
+    // zeroChase(H, u_transpose, V);
+    zeroChase(H, U, V);
+}
+
+/**
+ \brief make a 3X3 matrix to lambda shape
+ original form of H:   x x x
+ *                     x x x
+ *                     x x x
+ after :
+ *                     x 0 0
+ *                     x x 0
+ *                     x 0 x
+ */
+inline void makeLambdaShape(btMatrix3x3& H, btMatrix3x3& U, btMatrix3x3& V)
+{
+    U.setIdentity();
+    V.setIdentity();
+    
+    /**
+     Reduce H to of form
+     *                    x x 0
+     *                    x x x
+     *                    x x x
+     */
+    
+    GivensRotation r1(H[0][1], H[0][2], 1, 2);
+    r1.columnRotation(H);
+    r1.columnRotation(V);
+    
+    /**
+     Reduce H to of form
+     *                    x x 0
+     *                    x x 0
+     *                    x x x
+     */
+    
+    r1.computeUnconventional(H[1][2], H[2][2]);
+    r1.rowRotation(H);
+    r1.columnRotation(U);
+    
+    /**
+     Reduce H to of form
+     *                    x x 0
+     *                    x x 0
+     *                    x 0 x
+     */
+    
+    GivensRotation r2(H[2][0], H[2][1], 0, 1);
+    r2.columnRotation(H);
+    r2.columnRotation(V);
+    
+    /**
+     Reduce H to of form
+     *                    x 0 0
+     *                    x x 0
+     *                    x 0 x
+     */
+    r2.computeUnconventional(H[0][1], H[1][1]);
+    r2.rowRotation(H);
+    r2.columnRotation(U);
+}
+
+/**
+ \brief 2x2 polar decomposition.
+ \param[in] A matrix.
+ \param[out] R Robustly a rotation matrix.
+ \param[out] S_Sym Symmetric. Whole matrix is stored
+ 
+ Polar guarantees negative sign is on the small magnitude singular value.
+ S is guaranteed to be the closest one to identity.
+ R is guaranteed to be the closest rotation to A.
+ */
+inline void polarDecomposition(const btMatrix2x2& A,
+                   GivensRotation& R,
+                   const btMatrix2x2& S_Sym)
+{
+    btScalar a = (A(0, 0) + A(1, 1)),  b = (A(1, 0) - A(0, 1));
+    btScalar denominator = btSqrt(a*a+b*b);
+    R.c = (btScalar)1;
+    R.s = (btScalar)0;
+    if (denominator > SIMD_EPSILON) { 
+        /*
+         No need to use a tolerance here because x(0) and x(1) always have
+         smaller magnitude then denominator, therefore overflow never happens.
+         In Bullet, we use a tolerance anyway.
+         */
+        R.c = a / denominator;
+        R.s = -b / denominator;
+    }
+    btMatrix2x2& S = const_cast<btMatrix2x2&>(S_Sym);
+    S = A;
+    R.rowRotation(S);
+}
+
+inline void polarDecomposition(const btMatrix2x2& A,
+                   const btMatrix2x2& R,
+                   const btMatrix2x2& S_Sym)
+{
+    GivensRotation r(0, 1);
+    polarDecomposition(A, r, S_Sym);
+    r.fill(R);
+}
+
+/**
+ \brief 2x2 SVD (singular value decomposition) A=USV'
+ \param[in] A Input matrix.
+ \param[out] U Robustly a rotation matrix in Givens form
+ \param[out] Sigma matrix of singular values sorted with decreasing magnitude. The second one can be negative.
+ \param[out] V Robustly a rotation matrix in Givens form
+ */
+inline void singularValueDecomposition(
+                           const btMatrix2x2& A,
+                           GivensRotation& U,
+                           const btMatrix2x2& Sigma,
+                           GivensRotation& V,
+                           const btScalar tol = 64 * std::numeric_limits<btScalar>::epsilon())
+{
+    btMatrix2x2& sigma = const_cast<btMatrix2x2&>(Sigma);
+    sigma.setIdentity();
+    btMatrix2x2 S_Sym;
+    polarDecomposition(A, U, S_Sym);
+    btScalar cosine, sine;
+    btScalar x = S_Sym(0, 0);
+    btScalar y = S_Sym(0, 1);
+    btScalar z = S_Sym(1, 1);
+    if (y == 0) {
+        // S is already diagonal
+        cosine = 1;
+        sine = 0;
+        sigma(0,0) = x;
+        sigma(1,1) = z;
+    }
+    else {
+        btScalar tau = 0.5 * (x - z);
+        btScalar val = tau * tau + y * y;
+        if (val > SIMD_EPSILON)
+        {
+        btScalar w = btSqrt(val);
+        // w > y > 0
+        btScalar t;
+        if (tau > 0) {
+            // tau + w > w > y > 0 ==> division is safe
+            t = y / (tau + w);
+        }
+        else {
+            // tau - w < -w < -y < 0 ==> division is safe
+            t = y / (tau - w);
+        }
+        cosine = btScalar(1) / btSqrt(t * t + btScalar(1));
+        sine = -t * cosine;
+        /*
+         V = [cosine -sine; sine cosine]
+         Sigma = V'SV. Only compute the diagonals for efficiency.
+         Also utilize symmetry of S and don't form V yet.
+         */
+        btScalar c2 = cosine * cosine;
+        btScalar csy = 2 * cosine * sine * y;
+        btScalar s2 = sine * sine;
+        sigma(0,0) = c2 * x - csy + s2 * z;
+        sigma(1,1) = s2 * x + csy + c2 * z;
+      } else
+      	{
+      		cosine = 1;
+        sine = 0;
+        sigma(0,0) = x;
+        sigma(1,1) = z;
+      	}
+    }
+    
+    // Sorting
+    // Polar already guarantees negative sign is on the small magnitude singular value.
+    if (sigma(0,0) < sigma(1,1)) {
+        std::swap(sigma(0,0), sigma(1,1));
+        V.c = -sine;
+        V.s = cosine;
+    }
+    else {
+        V.c = cosine;
+        V.s = sine;
+    }
+    U *= V;
+}
+
+/**
+ \brief 2x2 SVD (singular value decomposition) A=USV'
+ \param[in] A Input matrix.
+ \param[out] U Robustly a rotation matrix.
+ \param[out] Sigma Vector of singular values sorted with decreasing magnitude. The second one can be negative.
+ \param[out] V Robustly a rotation matrix.
+ */
+inline void singularValueDecomposition(
+                           const btMatrix2x2& A,
+                           const btMatrix2x2& U,
+                           const btMatrix2x2& Sigma,
+                           const btMatrix2x2& V,
+                           const btScalar tol = 64 * std::numeric_limits<btScalar>::epsilon())
+{
+    GivensRotation gv(0, 1);
+    GivensRotation gu(0, 1);
+    singularValueDecomposition(A, gu, Sigma, gv);
+    
+    gu.fill(U);
+    gv.fill(V);
+}
+
+/**
+ \brief compute wilkinsonShift of the block
+ a1     b1
+ b1     a2
+ based on the wilkinsonShift formula
+ mu = c + d - sign (d) \ sqrt (d*d + b*b), where d = (a-c)/2
+ 
+ */
+inline btScalar wilkinsonShift(const btScalar a1, const btScalar b1, const btScalar a2)
+{
+	btScalar d = (btScalar)0.5 * (a1 - a2);
+	btScalar bs = b1 * b1;
+	btScalar val = d * d + bs;
+	if (val>SIMD_EPSILON)
+	{
+		btScalar denom = btFabs(d) + btSqrt(val);
+
+		btScalar mu = a2 - copySign(bs / (denom), d);
+		// T mu = a2 - bs / ( d + sign_d*sqrt (d*d + bs));
+		return mu;
+	}
+	return a2;
+}
+
+/**
+ \brief Helper function of 3X3 SVD for processing 2X2 SVD
+ */
+template <int t>
+inline void process(btMatrix3x3& B, btMatrix3x3& U, btVector3& sigma, btMatrix3x3& V)
+{
+    int other = (t == 1) ? 0 : 2;
+    GivensRotation u(0, 1);
+    GivensRotation v(0, 1);
+    sigma[other] = B[other][other];
+    
+    btMatrix2x2 B_sub, sigma_sub;
+    if (t == 0)
+    {
+        B_sub.m_00 = B[0][0];
+        B_sub.m_10 = B[1][0];
+        B_sub.m_01 = B[0][1];
+        B_sub.m_11 = B[1][1];
+        sigma_sub.m_00 = sigma[0];
+        sigma_sub.m_11 = sigma[1];
+//        singularValueDecomposition(B.template block<2, 2>(t, t), u, sigma.template block<2, 1>(t, 0), v);
+        singularValueDecomposition(B_sub, u, sigma_sub, v);
+        B[0][0] = B_sub.m_00;
+        B[1][0] = B_sub.m_10;
+        B[0][1] = B_sub.m_01;
+        B[1][1] = B_sub.m_11;
+        sigma[0] = sigma_sub.m_00;
+        sigma[1] = sigma_sub.m_11;
+    }
+    else
+    {
+        B_sub.m_00 = B[1][1];
+        B_sub.m_10 = B[2][1];
+        B_sub.m_01 = B[1][2];
+        B_sub.m_11 = B[2][2];
+        sigma_sub.m_00 = sigma[1];
+        sigma_sub.m_11 = sigma[2];
+        //        singularValueDecomposition(B.template block<2, 2>(t, t), u, sigma.template block<2, 1>(t, 0), v);
+        singularValueDecomposition(B_sub, u, sigma_sub, v);
+        B[1][1] = B_sub.m_00;
+        B[2][1] = B_sub.m_10;
+        B[1][2] = B_sub.m_01;
+        B[2][2] = B_sub.m_11;
+        sigma[1] = sigma_sub.m_00;
+        sigma[2] = sigma_sub.m_11;
+    }
+    u.rowi += t;
+    u.rowk += t;
+    v.rowi += t;
+    v.rowk += t;
+    u.columnRotation(U);
+    v.columnRotation(V);
+}
+
+/**
+ \brief Helper function of 3X3 SVD for flipping signs due to flipping signs of sigma
+ */
+inline void flipSign(int i, btMatrix3x3& U, btVector3& sigma)
+{
+    sigma[i] = -sigma[i];
+    U[0][i] = -U[0][i];
+    U[1][i] = -U[1][i];
+    U[2][i] = -U[2][i];
+}
+
+inline void flipSign(int i, btMatrix3x3& U)
+{
+    U[0][i] = -U[0][i];
+    U[1][i] = -U[1][i];
+    U[2][i] = -U[2][i];
+}
+
+inline void swapCol(btMatrix3x3& A, int i, int j)
+{
+    for (int d = 0; d < 3; ++d)
+        std::swap(A[d][i], A[d][j]);
+}
+/**
+ \brief Helper function of 3X3 SVD for sorting singular values
+ */
+inline void sort(btMatrix3x3& U, btVector3& sigma, btMatrix3x3& V, int t)
+{
+    if (t == 0)
+    {
+        // Case: sigma(0) > |sigma(1)| >= |sigma(2)|
+        if (btFabs(sigma[1]) >= btFabs(sigma[2])) {
+            if (sigma[1] < 0) {
+                flipSign(1, U, sigma);
+                flipSign(2, U, sigma);
+            }
+            return;
+        }
+        
+        //fix sign of sigma for both cases
+        if (sigma[2] < 0) {
+            flipSign(1, U, sigma);
+            flipSign(2, U, sigma);
+        }
+        
+        //swap sigma(1) and sigma(2) for both cases
+        std::swap(sigma[1], sigma[2]);
+        // swap the col 1 and col 2 for U,V
+        swapCol(U,1,2);
+        swapCol(V,1,2);
+        
+        // Case: |sigma(2)| >= sigma(0) > |simga(1)|
+        if (sigma[1] > sigma[0]) {
+            std::swap(sigma[0], sigma[1]);
+            swapCol(U,0,1);
+            swapCol(V,0,1);
+        }
+        
+        // Case: sigma(0) >= |sigma(2)| > |simga(1)|
+        else {
+            flipSign(2, U);
+            flipSign(2, V);
+        }
+    }
+    else if (t == 1)
+    {
+        // Case: |sigma(0)| >= sigma(1) > |sigma(2)|
+        if (btFabs(sigma[0]) >= sigma[1]) {
+            if (sigma[0] < 0) {
+                flipSign(0, U, sigma);
+                flipSign(2, U, sigma);
+            }
+            return;
+        }
+        
+        //swap sigma(0) and sigma(1) for both cases
+        std::swap(sigma[0], sigma[1]);
+        swapCol(U, 0, 1);
+        swapCol(V, 0, 1);
+        
+        // Case: sigma(1) > |sigma(2)| >= |sigma(0)|
+        if (btFabs(sigma[1]) < btFabs(sigma[2])) {
+            std::swap(sigma[1], sigma[2]);
+            swapCol(U, 1, 2);
+            swapCol(V, 1, 2);
+        }
+        
+        // Case: sigma(1) >= |sigma(0)| > |sigma(2)|
+        else {
+            flipSign(1, U);
+            flipSign(1, V);
+        }
+        
+        // fix sign for both cases
+        if (sigma[1] < 0) {
+            flipSign(1, U, sigma);
+            flipSign(2, U, sigma);
+        }
+    }
+}
+
+/**
+ \brief 3X3 SVD (singular value decomposition) A=USV'
+ \param[in] A Input matrix.
+ \param[out] U is a rotation matrix.
+ \param[out] sigma Diagonal matrix, sorted with decreasing magnitude. The third one can be negative.
+ \param[out] V is a rotation matrix.
+ */
+inline int singularValueDecomposition(const btMatrix3x3& A,
+                                     btMatrix3x3& U,
+                                     btVector3& sigma,
+                                     btMatrix3x3& V,
+                                     btScalar tol = 128*std::numeric_limits<btScalar>::epsilon())
+{
+//    using std::fabs;
+    btMatrix3x3 B = A;
+    U.setIdentity();
+    V.setIdentity();
+    
+    makeUpperBidiag(B, U, V);
+    
+    int count = 0;
+    btScalar mu = (btScalar)0;
+    GivensRotation r(0, 1);
+    
+    btScalar alpha_1 = B[0][0];
+    btScalar beta_1 = B[0][1];
+    btScalar alpha_2 = B[1][1];
+    btScalar alpha_3 = B[2][2];
+    btScalar beta_2 = B[1][2];
+    btScalar gamma_1 = alpha_1 * beta_1;
+    btScalar gamma_2 = alpha_2 * beta_2;
+    btScalar val = alpha_1 * alpha_1 + alpha_2 * alpha_2 + alpha_3 * alpha_3 + beta_1 * beta_1 + beta_2 * beta_2;
+    if (val > SIMD_EPSILON)
+    {
+	    tol *= btMax((btScalar)0.5 * btSqrt(val), (btScalar)1);
+		}    
+    /**
+     Do implicit shift QR until A^T A is block diagonal
+     */
+    int max_count = 100;
+    
+    while (btFabs(beta_2) > tol && btFabs(beta_1) > tol
+           && btFabs(alpha_1) > tol && btFabs(alpha_2) > tol
+           && btFabs(alpha_3) > tol
+           && count < max_count) {
+        mu = wilkinsonShift(alpha_2 * alpha_2 + beta_1 * beta_1, gamma_2, alpha_3 * alpha_3 + beta_2 * beta_2);
+        
+        r.compute(alpha_1 * alpha_1 - mu, gamma_1);
+        r.columnRotation(B);
+        
+        r.columnRotation(V);
+        zeroChase(B, U, V);
+        
+        alpha_1 = B[0][0];
+        beta_1 = B[0][1];
+        alpha_2 = B[1][1];
+        alpha_3 = B[2][2];
+        beta_2 = B[1][2];
+        gamma_1 = alpha_1 * beta_1;
+        gamma_2 = alpha_2 * beta_2;
+        count++;
+    }
+    /**
+     Handle the cases of one of the alphas and betas being 0
+     Sorted by ease of handling and then frequency
+     of occurrence
+     
+     If B is of form
+     x x 0
+     0 x 0
+     0 0 x
+     */
+    if (btFabs(beta_2) <= tol) {
+        process<0>(B, U, sigma, V);
+        sort(U, sigma, V,0);
+    }
+    /**
+     If B is of form
+     x 0 0
+     0 x x
+     0 0 x
+     */
+    else if (btFabs(beta_1) <= tol) {
+        process<1>(B, U, sigma, V);
+        sort(U, sigma, V,1);
+    }
+    /**
+     If B is of form
+     x x 0
+     0 0 x
+     0 0 x
+     */
+    else if (btFabs(alpha_2) <= tol) {
+        /**
+         Reduce B to
+         x x 0
+         0 0 0
+         0 0 x
+         */
+        GivensRotation r1(1, 2);
+        r1.computeUnconventional(B[1][2], B[2][2]);
+        r1.rowRotation(B);
+        r1.columnRotation(U);
+        
+        process<0>(B, U, sigma, V);
+        sort(U, sigma, V, 0);
+    }
+    /**
+     If B is of form
+     x x 0
+     0 x x
+     0 0 0
+     */
+    else if (btFabs(alpha_3) <= tol) {
+        /**
+         Reduce B to
+         x x +
+         0 x 0
+         0 0 0
+         */
+        GivensRotation r1(1, 2);
+        r1.compute(B[1][1], B[1][2]);
+        r1.columnRotation(B);
+        r1.columnRotation(V);
+        /**
+         Reduce B to
+         x x 0
+         + x 0
+         0 0 0
+         */
+        GivensRotation r2(0, 2);
+        r2.compute(B[0][0], B[0][2]);
+        r2.columnRotation(B);
+        r2.columnRotation(V);
+        
+        process<0>(B, U, sigma, V);
+        sort(U, sigma, V, 0);
+    }
+    /**
+     If B is of form
+     0 x 0
+     0 x x
+     0 0 x
+     */
+    else if (btFabs(alpha_1) <= tol) {
+        /**
+         Reduce B to
+         0 0 +
+         0 x x
+         0 0 x
+         */
+        GivensRotation r1(0, 1);
+        r1.computeUnconventional(B[0][1], B[1][1]);
+        r1.rowRotation(B);
+        r1.columnRotation(U);
+        
+        /**
+         Reduce B to
+         0 0 0
+         0 x x
+         0 + x
+         */
+        GivensRotation r2(0, 2);
+        r2.computeUnconventional(B[0][2], B[2][2]);
+        r2.rowRotation(B);
+        r2.columnRotation(U);
+        
+        process<1>(B, U, sigma, V);
+        sort(U, sigma, V, 1);
+    }
+    
+    return count;
+}
+#endif /* btImplicitQRSVD_h */
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btList.h b/dali-physics/third-party/bullet3/src/LinearMath/btList.h
new file mode 100644
index 0000000..9072abc
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btList.h
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GEN_LIST_H
+#define BT_GEN_LIST_H
+
+class btGEN_Link
+{
+public:
+	btGEN_Link() : m_next(0), m_prev(0) {}
+	btGEN_Link(btGEN_Link *next, btGEN_Link *prev) : m_next(next), m_prev(prev) {}
+
+	btGEN_Link *getNext() const { return m_next; }
+	btGEN_Link *getPrev() const { return m_prev; }
+
+	bool isHead() const { return m_prev == 0; }
+	bool isTail() const { return m_next == 0; }
+
+	void insertBefore(btGEN_Link *link)
+	{
+		m_next = link;
+		m_prev = link->m_prev;
+		m_next->m_prev = this;
+		m_prev->m_next = this;
+	}
+
+	void insertAfter(btGEN_Link *link)
+	{
+		m_next = link->m_next;
+		m_prev = link;
+		m_next->m_prev = this;
+		m_prev->m_next = this;
+	}
+
+	void remove()
+	{
+		m_next->m_prev = m_prev;
+		m_prev->m_next = m_next;
+	}
+
+private:
+	btGEN_Link *m_next;
+	btGEN_Link *m_prev;
+};
+
+class btGEN_List
+{
+public:
+	btGEN_List() : m_head(&m_tail, 0), m_tail(0, &m_head) {}
+
+	btGEN_Link *getHead() const { return m_head.getNext(); }
+	btGEN_Link *getTail() const { return m_tail.getPrev(); }
+
+	void addHead(btGEN_Link *link) { link->insertAfter(&m_head); }
+	void addTail(btGEN_Link *link) { link->insertBefore(&m_tail); }
+
+private:
+	btGEN_Link m_head;
+	btGEN_Link m_tail;
+};
+
+#endif  //BT_GEN_LIST_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btMatrix3x3.h b/dali-physics/third-party/bullet3/src/LinearMath/btMatrix3x3.h
new file mode 100644
index 0000000..4391a52
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btMatrix3x3.h
@@ -0,0 +1,1431 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MATRIX3x3_H
+#define BT_MATRIX3x3_H
+
+#include "btVector3.h"
+#include "btQuaternion.h"
+#include <stdio.h>
+
+#ifdef BT_USE_SSE
+//const __m128 ATTRIBUTE_ALIGNED16(v2220) = {2.0f, 2.0f, 2.0f, 0.0f};
+//const __m128 ATTRIBUTE_ALIGNED16(vMPPP) = {-0.0f, +0.0f, +0.0f, +0.0f};
+#define vMPPP (_mm_set_ps(+0.0f, +0.0f, +0.0f, -0.0f))
+#endif
+
+#if defined(BT_USE_SSE)
+#define v0000 (_mm_set_ps(0.0f, 0.0f, 0.0f, 0.0f))
+#define v1000 (_mm_set_ps(0.0f, 0.0f, 0.0f, 1.0f))
+#define v0100 (_mm_set_ps(0.0f, 0.0f, 1.0f, 0.0f))
+#define v0010 (_mm_set_ps(0.0f, 1.0f, 0.0f, 0.0f))
+#elif defined(BT_USE_NEON)
+const btSimdFloat4 ATTRIBUTE_ALIGNED16(v0000) = {0.0f, 0.0f, 0.0f, 0.0f};
+const btSimdFloat4 ATTRIBUTE_ALIGNED16(v1000) = {1.0f, 0.0f, 0.0f, 0.0f};
+const btSimdFloat4 ATTRIBUTE_ALIGNED16(v0100) = {0.0f, 1.0f, 0.0f, 0.0f};
+const btSimdFloat4 ATTRIBUTE_ALIGNED16(v0010) = {0.0f, 0.0f, 1.0f, 0.0f};
+#endif
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btMatrix3x3Data btMatrix3x3DoubleData
+#else
+#define btMatrix3x3Data btMatrix3x3FloatData
+#endif  //BT_USE_DOUBLE_PRECISION
+
+/**@brief The btMatrix3x3 class implements a 3x3 rotation matrix, to perform linear algebra in combination with btQuaternion, btTransform and btVector3.
+* Make sure to only include a pure orthogonal matrix without scaling. */
+ATTRIBUTE_ALIGNED16(class)
+btMatrix3x3
+{
+	///Data storage for the matrix, each vector is a row of the matrix
+	btVector3 m_el[3];
+
+public:
+	/** @brief No initializaion constructor */
+	btMatrix3x3() {}
+
+	//		explicit btMatrix3x3(const btScalar *m) { setFromOpenGLSubMatrix(m); }
+
+	/**@brief Constructor from Quaternion */
+	explicit btMatrix3x3(const btQuaternion& q) { setRotation(q); }
+	/*
+	template <typename btScalar>
+	Matrix3x3(const btScalar& yaw, const btScalar& pitch, const btScalar& roll)
+	{ 
+	setEulerYPR(yaw, pitch, roll);
+	}
+	*/
+	/** @brief Constructor with row major formatting */
+	btMatrix3x3(const btScalar& xx, const btScalar& xy, const btScalar& xz,
+				const btScalar& yx, const btScalar& yy, const btScalar& yz,
+				const btScalar& zx, const btScalar& zy, const btScalar& zz)
+	{
+		setValue(xx, xy, xz,
+				 yx, yy, yz,
+				 zx, zy, zz);
+	}
+
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	SIMD_FORCE_INLINE btMatrix3x3(const btSimdFloat4 v0, const btSimdFloat4 v1, const btSimdFloat4 v2)
+	{
+		m_el[0].mVec128 = v0;
+		m_el[1].mVec128 = v1;
+		m_el[2].mVec128 = v2;
+	}
+
+	SIMD_FORCE_INLINE btMatrix3x3(const btVector3& v0, const btVector3& v1, const btVector3& v2)
+	{
+		m_el[0] = v0;
+		m_el[1] = v1;
+		m_el[2] = v2;
+	}
+
+	// Copy constructor
+	SIMD_FORCE_INLINE btMatrix3x3(const btMatrix3x3& rhs)
+	{
+		m_el[0].mVec128 = rhs.m_el[0].mVec128;
+		m_el[1].mVec128 = rhs.m_el[1].mVec128;
+		m_el[2].mVec128 = rhs.m_el[2].mVec128;
+	}
+
+	// Assignment Operator
+	SIMD_FORCE_INLINE btMatrix3x3& operator=(const btMatrix3x3& m)
+	{
+		m_el[0].mVec128 = m.m_el[0].mVec128;
+		m_el[1].mVec128 = m.m_el[1].mVec128;
+		m_el[2].mVec128 = m.m_el[2].mVec128;
+
+		return *this;
+	}
+
+#else
+
+	/** @brief Copy constructor */
+	SIMD_FORCE_INLINE btMatrix3x3(const btMatrix3x3& other)
+	{
+		m_el[0] = other.m_el[0];
+		m_el[1] = other.m_el[1];
+		m_el[2] = other.m_el[2];
+	}
+
+	/** @brief Assignment Operator */
+	SIMD_FORCE_INLINE btMatrix3x3& operator=(const btMatrix3x3& other)
+	{
+		m_el[0] = other.m_el[0];
+		m_el[1] = other.m_el[1];
+		m_el[2] = other.m_el[2];
+		return *this;
+	}
+    
+    SIMD_FORCE_INLINE btMatrix3x3(const btVector3& v0, const btVector3& v1, const btVector3& v2)
+    {
+        m_el[0] = v0;
+        m_el[1] = v1;
+        m_el[2] = v2;
+    }
+
+#endif
+
+	/** @brief Get a column of the matrix as a vector 
+	*  @param i Column number 0 indexed */
+	SIMD_FORCE_INLINE btVector3 getColumn(int i) const
+	{
+		return btVector3(m_el[0][i], m_el[1][i], m_el[2][i]);
+	}
+
+	/** @brief Get a row of the matrix as a vector 
+	*  @param i Row number 0 indexed */
+	SIMD_FORCE_INLINE const btVector3& getRow(int i) const
+	{
+		btFullAssert(0 <= i && i < 3);
+		return m_el[i];
+	}
+
+	/** @brief Get a mutable reference to a row of the matrix as a vector 
+	*  @param i Row number 0 indexed */
+	SIMD_FORCE_INLINE btVector3& operator[](int i)
+	{
+		btFullAssert(0 <= i && i < 3);
+		return m_el[i];
+	}
+
+	/** @brief Get a const reference to a row of the matrix as a vector 
+	*  @param i Row number 0 indexed */
+	SIMD_FORCE_INLINE const btVector3& operator[](int i) const
+	{
+		btFullAssert(0 <= i && i < 3);
+		return m_el[i];
+	}
+
+	/** @brief Multiply by the target matrix on the right
+	*  @param m Rotation matrix to be applied 
+	* Equivilant to this = this * m */
+	btMatrix3x3& operator*=(const btMatrix3x3& m);
+
+	/** @brief Adds by the target matrix on the right
+	*  @param m matrix to be applied 
+	* Equivilant to this = this + m */
+	btMatrix3x3& operator+=(const btMatrix3x3& m);
+
+	/** @brief Substractss by the target matrix on the right
+	*  @param m matrix to be applied 
+	* Equivilant to this = this - m */
+	btMatrix3x3& operator-=(const btMatrix3x3& m);
+
+	/** @brief Set from the rotational part of a 4x4 OpenGL matrix
+	*  @param m A pointer to the beginning of the array of scalars*/
+	void setFromOpenGLSubMatrix(const btScalar* m)
+	{
+		m_el[0].setValue(m[0], m[4], m[8]);
+		m_el[1].setValue(m[1], m[5], m[9]);
+		m_el[2].setValue(m[2], m[6], m[10]);
+	}
+	/** @brief Set the values of the matrix explicitly (row major)
+	*  @param xx Top left
+	*  @param xy Top Middle
+	*  @param xz Top Right
+	*  @param yx Middle Left
+	*  @param yy Middle Middle
+	*  @param yz Middle Right
+	*  @param zx Bottom Left
+	*  @param zy Bottom Middle
+	*  @param zz Bottom Right*/
+	void setValue(const btScalar& xx, const btScalar& xy, const btScalar& xz,
+				  const btScalar& yx, const btScalar& yy, const btScalar& yz,
+				  const btScalar& zx, const btScalar& zy, const btScalar& zz)
+	{
+		m_el[0].setValue(xx, xy, xz);
+		m_el[1].setValue(yx, yy, yz);
+		m_el[2].setValue(zx, zy, zz);
+	}
+
+	/** @brief Set the matrix from a quaternion
+	*  @param q The Quaternion to match */
+	void setRotation(const btQuaternion& q)
+	{
+		btScalar d = q.length2();
+		btFullAssert(d != btScalar(0.0));
+		btScalar s = btScalar(2.0) / d;
+
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vs, Q = q.get128();
+		__m128i Qi = btCastfTo128i(Q);
+		__m128 Y, Z;
+		__m128 V1, V2, V3;
+		__m128 V11, V21, V31;
+		__m128 NQ = _mm_xor_ps(Q, btvMzeroMask);
+		__m128i NQi = btCastfTo128i(NQ);
+
+		V1 = btCastiTo128f(_mm_shuffle_epi32(Qi, BT_SHUFFLE(1, 0, 2, 3)));  // Y X Z W
+		V2 = _mm_shuffle_ps(NQ, Q, BT_SHUFFLE(0, 0, 1, 3));                 // -X -X  Y  W
+		V3 = btCastiTo128f(_mm_shuffle_epi32(Qi, BT_SHUFFLE(2, 1, 0, 3)));  // Z Y X W
+		V1 = _mm_xor_ps(V1, vMPPP);                                         //	change the sign of the first element
+
+		V11 = btCastiTo128f(_mm_shuffle_epi32(Qi, BT_SHUFFLE(1, 1, 0, 3)));  // Y Y X W
+		V21 = _mm_unpackhi_ps(Q, Q);                                         //  Z  Z  W  W
+		V31 = _mm_shuffle_ps(Q, NQ, BT_SHUFFLE(0, 2, 0, 3));                 //  X  Z -X -W
+
+		V2 = V2 * V1;   //
+		V1 = V1 * V11;  //
+		V3 = V3 * V31;  //
+
+		V11 = _mm_shuffle_ps(NQ, Q, BT_SHUFFLE(2, 3, 1, 3));                //	-Z -W  Y  W
+		V11 = V11 * V21;                                                    //
+		V21 = _mm_xor_ps(V21, vMPPP);                                       //	change the sign of the first element
+		V31 = _mm_shuffle_ps(Q, NQ, BT_SHUFFLE(3, 3, 1, 3));                //	 W  W -Y -W
+		V31 = _mm_xor_ps(V31, vMPPP);                                       //	change the sign of the first element
+		Y = btCastiTo128f(_mm_shuffle_epi32(NQi, BT_SHUFFLE(3, 2, 0, 3)));  // -W -Z -X -W
+		Z = btCastiTo128f(_mm_shuffle_epi32(Qi, BT_SHUFFLE(1, 0, 1, 3)));   //  Y  X  Y  W
+
+		vs = _mm_load_ss(&s);
+		V21 = V21 * Y;
+		V31 = V31 * Z;
+
+		V1 = V1 + V11;
+		V2 = V2 + V21;
+		V3 = V3 + V31;
+
+		vs = bt_splat3_ps(vs, 0);
+		//	s ready
+		V1 = V1 * vs;
+		V2 = V2 * vs;
+		V3 = V3 * vs;
+
+		V1 = V1 + v1000;
+		V2 = V2 + v0100;
+		V3 = V3 + v0010;
+
+		m_el[0] = V1;
+		m_el[1] = V2;
+		m_el[2] = V3;
+#else
+		btScalar xs = q.x() * s, ys = q.y() * s, zs = q.z() * s;
+		btScalar wx = q.w() * xs, wy = q.w() * ys, wz = q.w() * zs;
+		btScalar xx = q.x() * xs, xy = q.x() * ys, xz = q.x() * zs;
+		btScalar yy = q.y() * ys, yz = q.y() * zs, zz = q.z() * zs;
+		setValue(
+			btScalar(1.0) - (yy + zz), xy - wz, xz + wy,
+			xy + wz, btScalar(1.0) - (xx + zz), yz - wx,
+			xz - wy, yz + wx, btScalar(1.0) - (xx + yy));
+#endif
+	}
+
+	/** @brief Set the matrix from euler angles using YPR around YXZ respectively
+	*  @param yaw Yaw about Y axis
+	*  @param pitch Pitch about X axis
+	*  @param roll Roll about Z axis 
+	*/
+	void setEulerYPR(const btScalar& yaw, const btScalar& pitch, const btScalar& roll)
+	{
+		setEulerZYX(roll, pitch, yaw);
+	}
+
+	/** @brief Set the matrix from euler angles YPR around ZYX axes
+	* @param eulerX Roll about X axis
+	* @param eulerY Pitch around Y axis
+	* @param eulerZ Yaw about Z axis
+	* 
+	* These angles are used to produce a rotation matrix. The euler
+	* angles are applied in ZYX order. I.e a vector is first rotated 
+	* about X then Y and then Z
+	**/
+	void setEulerZYX(btScalar eulerX, btScalar eulerY, btScalar eulerZ)
+	{
+		///@todo proposed to reverse this since it's labeled zyx but takes arguments xyz and it will match all other parts of the code
+		btScalar ci(btCos(eulerX));
+		btScalar cj(btCos(eulerY));
+		btScalar ch(btCos(eulerZ));
+		btScalar si(btSin(eulerX));
+		btScalar sj(btSin(eulerY));
+		btScalar sh(btSin(eulerZ));
+		btScalar cc = ci * ch;
+		btScalar cs = ci * sh;
+		btScalar sc = si * ch;
+		btScalar ss = si * sh;
+
+		setValue(cj * ch, sj * sc - cs, sj * cc + ss,
+				 cj * sh, sj * ss + cc, sj * cs - sc,
+				 -sj, cj * si, cj * ci);
+	}
+
+	/**@brief Set the matrix to the identity */
+	void setIdentity()
+	{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+		m_el[0] = v1000;
+		m_el[1] = v0100;
+		m_el[2] = v0010;
+#else
+		setValue(btScalar(1.0), btScalar(0.0), btScalar(0.0),
+				 btScalar(0.0), btScalar(1.0), btScalar(0.0),
+				 btScalar(0.0), btScalar(0.0), btScalar(1.0));
+#endif
+	}
+    
+    /**@brief Set the matrix to the identity */
+    void setZero()
+    {
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+        m_el[0] = v0000;
+        m_el[1] = v0000;
+        m_el[2] = v0000;
+#else
+        setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0),
+                 btScalar(0.0), btScalar(0.0), btScalar(0.0),
+                 btScalar(0.0), btScalar(0.0), btScalar(0.0));
+#endif
+    }
+
+	static const btMatrix3x3& getIdentity()
+	{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+		static const btMatrix3x3
+			identityMatrix(v1000, v0100, v0010);
+#else
+		static const btMatrix3x3
+			identityMatrix(
+				btScalar(1.0), btScalar(0.0), btScalar(0.0),
+				btScalar(0.0), btScalar(1.0), btScalar(0.0),
+				btScalar(0.0), btScalar(0.0), btScalar(1.0));
+#endif
+		return identityMatrix;
+	}
+
+	/**@brief Fill the rotational part of an OpenGL matrix and clear the shear/perspective
+	* @param m The array to be filled */
+	void getOpenGLSubMatrix(btScalar * m) const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 v0 = m_el[0].mVec128;
+		__m128 v1 = m_el[1].mVec128;
+		__m128 v2 = m_el[2].mVec128;  //  x2 y2 z2 w2
+		__m128* vm = (__m128*)m;
+		__m128 vT;
+
+		v2 = _mm_and_ps(v2, btvFFF0fMask);  //  x2 y2 z2 0
+
+		vT = _mm_unpackhi_ps(v0, v1);  //	z0 z1 * *
+		v0 = _mm_unpacklo_ps(v0, v1);  //	x0 x1 y0 y1
+
+		v1 = _mm_shuffle_ps(v0, v2, BT_SHUFFLE(2, 3, 1, 3));                    // y0 y1 y2 0
+		v0 = _mm_shuffle_ps(v0, v2, BT_SHUFFLE(0, 1, 0, 3));                    // x0 x1 x2 0
+		v2 = btCastdTo128f(_mm_move_sd(btCastfTo128d(v2), btCastfTo128d(vT)));  // z0 z1 z2 0
+
+		vm[0] = v0;
+		vm[1] = v1;
+		vm[2] = v2;
+#elif defined(BT_USE_NEON)
+		// note: zeros the w channel. We can preserve it at the cost of two more vtrn instructions.
+		static const uint32x2_t zMask = (const uint32x2_t){static_cast<uint32_t>(-1), 0};
+		float32x4_t* vm = (float32x4_t*)m;
+		float32x4x2_t top = vtrnq_f32(m_el[0].mVec128, m_el[1].mVec128);               // {x0 x1 z0 z1}, {y0 y1 w0 w1}
+		float32x2x2_t bl = vtrn_f32(vget_low_f32(m_el[2].mVec128), vdup_n_f32(0.0f));  // {x2  0 }, {y2 0}
+		float32x4_t v0 = vcombine_f32(vget_low_f32(top.val[0]), bl.val[0]);
+		float32x4_t v1 = vcombine_f32(vget_low_f32(top.val[1]), bl.val[1]);
+		float32x2_t q = (float32x2_t)vand_u32((uint32x2_t)vget_high_f32(m_el[2].mVec128), zMask);
+		float32x4_t v2 = vcombine_f32(vget_high_f32(top.val[0]), q);  // z0 z1 z2  0
+
+		vm[0] = v0;
+		vm[1] = v1;
+		vm[2] = v2;
+#else
+		m[0] = btScalar(m_el[0].x());
+		m[1] = btScalar(m_el[1].x());
+		m[2] = btScalar(m_el[2].x());
+		m[3] = btScalar(0.0);
+		m[4] = btScalar(m_el[0].y());
+		m[5] = btScalar(m_el[1].y());
+		m[6] = btScalar(m_el[2].y());
+		m[7] = btScalar(0.0);
+		m[8] = btScalar(m_el[0].z());
+		m[9] = btScalar(m_el[1].z());
+		m[10] = btScalar(m_el[2].z());
+		m[11] = btScalar(0.0);
+#endif
+	}
+
+	/**@brief Get the matrix represented as a quaternion 
+	* @param q The quaternion which will be set */
+	void getRotation(btQuaternion & q) const
+	{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+		btScalar trace = m_el[0].x() + m_el[1].y() + m_el[2].z();
+		btScalar s, x;
+
+		union {
+			btSimdFloat4 vec;
+			btScalar f[4];
+		} temp;
+
+		if (trace > btScalar(0.0))
+		{
+			x = trace + btScalar(1.0);
+
+			temp.f[0] = m_el[2].y() - m_el[1].z();
+			temp.f[1] = m_el[0].z() - m_el[2].x();
+			temp.f[2] = m_el[1].x() - m_el[0].y();
+			temp.f[3] = x;
+			//temp.f[3]= s * btScalar(0.5);
+		}
+		else
+		{
+			int i, j, k;
+			if (m_el[0].x() < m_el[1].y())
+			{
+				if (m_el[1].y() < m_el[2].z())
+				{
+					i = 2;
+					j = 0;
+					k = 1;
+				}
+				else
+				{
+					i = 1;
+					j = 2;
+					k = 0;
+				}
+			}
+			else
+			{
+				if (m_el[0].x() < m_el[2].z())
+				{
+					i = 2;
+					j = 0;
+					k = 1;
+				}
+				else
+				{
+					i = 0;
+					j = 1;
+					k = 2;
+				}
+			}
+
+			x = m_el[i][i] - m_el[j][j] - m_el[k][k] + btScalar(1.0);
+
+			temp.f[3] = (m_el[k][j] - m_el[j][k]);
+			temp.f[j] = (m_el[j][i] + m_el[i][j]);
+			temp.f[k] = (m_el[k][i] + m_el[i][k]);
+			temp.f[i] = x;
+			//temp.f[i] = s * btScalar(0.5);
+		}
+
+		s = btSqrt(x);
+		q.set128(temp.vec);
+		s = btScalar(0.5) / s;
+
+		q *= s;
+#else
+		btScalar trace = m_el[0].x() + m_el[1].y() + m_el[2].z();
+
+		btScalar temp[4];
+
+		if (trace > btScalar(0.0))
+		{
+			btScalar s = btSqrt(trace + btScalar(1.0));
+			temp[3] = (s * btScalar(0.5));
+			s = btScalar(0.5) / s;
+
+			temp[0] = ((m_el[2].y() - m_el[1].z()) * s);
+			temp[1] = ((m_el[0].z() - m_el[2].x()) * s);
+			temp[2] = ((m_el[1].x() - m_el[0].y()) * s);
+		}
+		else
+		{
+			int i = m_el[0].x() < m_el[1].y() ? (m_el[1].y() < m_el[2].z() ? 2 : 1) : (m_el[0].x() < m_el[2].z() ? 2 : 0);
+			int j = (i + 1) % 3;
+			int k = (i + 2) % 3;
+
+			btScalar s = btSqrt(m_el[i][i] - m_el[j][j] - m_el[k][k] + btScalar(1.0));
+			temp[i] = s * btScalar(0.5);
+			s = btScalar(0.5) / s;
+
+			temp[3] = (m_el[k][j] - m_el[j][k]) * s;
+			temp[j] = (m_el[j][i] + m_el[i][j]) * s;
+			temp[k] = (m_el[k][i] + m_el[i][k]) * s;
+		}
+		q.setValue(temp[0], temp[1], temp[2], temp[3]);
+#endif
+	}
+
+	/**@brief Get the matrix represented as euler angles around YXZ, roundtrip with setEulerYPR
+	* @param yaw Yaw around Y axis
+	* @param pitch Pitch around X axis
+	* @param roll around Z axis */
+	void getEulerYPR(btScalar & yaw, btScalar & pitch, btScalar & roll) const
+	{
+		// first use the normal calculus
+		yaw = btScalar(btAtan2(m_el[1].x(), m_el[0].x()));
+		pitch = btScalar(btAsin(-m_el[2].x()));
+		roll = btScalar(btAtan2(m_el[2].y(), m_el[2].z()));
+
+		// on pitch = +/-HalfPI
+		if (btFabs(pitch) == SIMD_HALF_PI)
+		{
+			if (yaw > 0)
+				yaw -= SIMD_PI;
+			else
+				yaw += SIMD_PI;
+
+			if (roll > 0)
+				roll -= SIMD_PI;
+			else
+				roll += SIMD_PI;
+		}
+	};
+
+	/**@brief Get the matrix represented as euler angles around ZYX
+	* @param yaw Yaw around Z axis
+	* @param pitch Pitch around Y axis
+	* @param roll around X axis 
+	* @param solution_number Which solution of two possible solutions ( 1 or 2) are possible values*/
+	void getEulerZYX(btScalar & yaw, btScalar & pitch, btScalar & roll, unsigned int solution_number = 1) const
+	{
+		struct Euler
+		{
+			btScalar yaw;
+			btScalar pitch;
+			btScalar roll;
+		};
+
+		Euler euler_out;
+		Euler euler_out2;  //second solution
+		//get the pointer to the raw data
+
+		// Check that pitch is not at a singularity
+		if (btFabs(m_el[2].x()) >= 1)
+		{
+			euler_out.yaw = 0;
+			euler_out2.yaw = 0;
+
+			// From difference of angles formula
+			btScalar delta = btAtan2(m_el[0].x(), m_el[0].z());
+			if (m_el[2].x() > 0)  //gimbal locked up
+			{
+				euler_out.pitch = SIMD_PI / btScalar(2.0);
+				euler_out2.pitch = SIMD_PI / btScalar(2.0);
+				euler_out.roll = euler_out.pitch + delta;
+				euler_out2.roll = euler_out.pitch + delta;
+			}
+			else  // gimbal locked down
+			{
+				euler_out.pitch = -SIMD_PI / btScalar(2.0);
+				euler_out2.pitch = -SIMD_PI / btScalar(2.0);
+				euler_out.roll = -euler_out.pitch + delta;
+				euler_out2.roll = -euler_out.pitch + delta;
+			}
+		}
+		else
+		{
+			euler_out.pitch = -btAsin(m_el[2].x());
+			euler_out2.pitch = SIMD_PI - euler_out.pitch;
+
+			euler_out.roll = btAtan2(m_el[2].y() / btCos(euler_out.pitch),
+									 m_el[2].z() / btCos(euler_out.pitch));
+			euler_out2.roll = btAtan2(m_el[2].y() / btCos(euler_out2.pitch),
+									  m_el[2].z() / btCos(euler_out2.pitch));
+
+			euler_out.yaw = btAtan2(m_el[1].x() / btCos(euler_out.pitch),
+									m_el[0].x() / btCos(euler_out.pitch));
+			euler_out2.yaw = btAtan2(m_el[1].x() / btCos(euler_out2.pitch),
+									 m_el[0].x() / btCos(euler_out2.pitch));
+		}
+
+		if (solution_number == 1)
+		{
+			yaw = euler_out.yaw;
+			pitch = euler_out.pitch;
+			roll = euler_out.roll;
+		}
+		else
+		{
+			yaw = euler_out2.yaw;
+			pitch = euler_out2.pitch;
+			roll = euler_out2.roll;
+		}
+	}
+
+	/**@brief Create a scaled copy of the matrix 
+	* @param s Scaling vector The elements of the vector will scale each column */
+
+	btMatrix3x3 scaled(const btVector3& s) const
+	{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+		return btMatrix3x3(m_el[0] * s, m_el[1] * s, m_el[2] * s);
+#else
+		return btMatrix3x3(
+			m_el[0].x() * s.x(), m_el[0].y() * s.y(), m_el[0].z() * s.z(),
+			m_el[1].x() * s.x(), m_el[1].y() * s.y(), m_el[1].z() * s.z(),
+			m_el[2].x() * s.x(), m_el[2].y() * s.y(), m_el[2].z() * s.z());
+#endif
+	}
+
+	/**@brief Return the determinant of the matrix */
+	btScalar determinant() const;
+	/**@brief Return the adjoint of the matrix */
+	btMatrix3x3 adjoint() const;
+	/**@brief Return the matrix with all values non negative */
+	btMatrix3x3 absolute() const;
+	/**@brief Return the transpose of the matrix */
+	btMatrix3x3 transpose() const;
+	/**@brief Return the inverse of the matrix */
+	btMatrix3x3 inverse() const;
+
+	/// Solve A * x = b, where b is a column vector. This is more efficient
+	/// than computing the inverse in one-shot cases.
+	///Solve33 is from Box2d, thanks to Erin Catto,
+	btVector3 solve33(const btVector3& b) const
+	{
+		btVector3 col1 = getColumn(0);
+		btVector3 col2 = getColumn(1);
+		btVector3 col3 = getColumn(2);
+
+		btScalar det = btDot(col1, btCross(col2, col3));
+		if (btFabs(det) > SIMD_EPSILON)
+		{
+			det = 1.0f / det;
+		}
+		btVector3 x;
+		x[0] = det * btDot(b, btCross(col2, col3));
+		x[1] = det * btDot(col1, btCross(b, col3));
+		x[2] = det * btDot(col1, btCross(col2, b));
+		return x;
+	}
+
+	btMatrix3x3 transposeTimes(const btMatrix3x3& m) const;
+	btMatrix3x3 timesTranspose(const btMatrix3x3& m) const;
+
+	SIMD_FORCE_INLINE btScalar tdotx(const btVector3& v) const
+	{
+		return m_el[0].x() * v.x() + m_el[1].x() * v.y() + m_el[2].x() * v.z();
+	}
+	SIMD_FORCE_INLINE btScalar tdoty(const btVector3& v) const
+	{
+		return m_el[0].y() * v.x() + m_el[1].y() * v.y() + m_el[2].y() * v.z();
+	}
+	SIMD_FORCE_INLINE btScalar tdotz(const btVector3& v) const
+	{
+		return m_el[0].z() * v.x() + m_el[1].z() * v.y() + m_el[2].z() * v.z();
+	}
+
+	///extractRotation is from "A robust method to extract the rotational part of deformations"
+	///See http://dl.acm.org/citation.cfm?doid=2994258.2994269
+	///decomposes a matrix A in a orthogonal matrix R and a
+	///symmetric matrix S:
+	///A = R*S.
+	///note that R can include both rotation and scaling.
+	SIMD_FORCE_INLINE void extractRotation(btQuaternion & q, btScalar tolerance = 1.0e-9, int maxIter = 100)
+	{
+		int iter = 0;
+		btScalar w;
+		const btMatrix3x3& A = *this;
+		for (iter = 0; iter < maxIter; iter++)
+		{
+			btMatrix3x3 R(q);
+			btVector3 omega = (R.getColumn(0).cross(A.getColumn(0)) + R.getColumn(1).cross(A.getColumn(1)) + R.getColumn(2).cross(A.getColumn(2))) * (btScalar(1.0) / btFabs(R.getColumn(0).dot(A.getColumn(0)) + R.getColumn(1).dot(A.getColumn(1)) + R.getColumn(2).dot(A.getColumn(2))) +
+																																					  tolerance);
+			w = omega.norm();
+			if (w < tolerance)
+				break;
+			q = btQuaternion(btVector3((btScalar(1.0) / w) * omega), w) *
+				q;
+			q.normalize();
+		}
+	}
+
+	/**@brief diagonalizes this matrix by the Jacobi method.
+	* @param rot stores the rotation from the coordinate system in which the matrix is diagonal to the original
+	* coordinate system, i.e., old_this = rot * new_this * rot^T.
+	* @param threshold See iteration
+	* @param iteration The iteration stops when all off-diagonal elements are less than the threshold multiplied
+	* by the sum of the absolute values of the diagonal, or when maxSteps have been executed.
+	*
+	* Note that this matrix is assumed to be symmetric.
+	*/
+	void diagonalize(btMatrix3x3 & rot, btScalar threshold, int maxSteps)
+	{
+		rot.setIdentity();
+		for (int step = maxSteps; step > 0; step--)
+		{
+			// find off-diagonal element [p][q] with largest magnitude
+			int p = 0;
+			int q = 1;
+			int r = 2;
+			btScalar max = btFabs(m_el[0][1]);
+			btScalar v = btFabs(m_el[0][2]);
+			if (v > max)
+			{
+				q = 2;
+				r = 1;
+				max = v;
+			}
+			v = btFabs(m_el[1][2]);
+			if (v > max)
+			{
+				p = 1;
+				q = 2;
+				r = 0;
+				max = v;
+			}
+
+			btScalar t = threshold * (btFabs(m_el[0][0]) + btFabs(m_el[1][1]) + btFabs(m_el[2][2]));
+			if (max <= t)
+			{
+				if (max <= SIMD_EPSILON * t)
+				{
+					return;
+				}
+				step = 1;
+			}
+
+			// compute Jacobi rotation J which leads to a zero for element [p][q]
+			btScalar mpq = m_el[p][q];
+			btScalar theta = (m_el[q][q] - m_el[p][p]) / (2 * mpq);
+			btScalar theta2 = theta * theta;
+			btScalar cos;
+			btScalar sin;
+			if (theta2 * theta2 < btScalar(10 / SIMD_EPSILON))
+			{
+				t = (theta >= 0) ? 1 / (theta + btSqrt(1 + theta2))
+								 : 1 / (theta - btSqrt(1 + theta2));
+				cos = 1 / btSqrt(1 + t * t);
+				sin = cos * t;
+			}
+			else
+			{
+				// approximation for large theta-value, i.e., a nearly diagonal matrix
+				t = 1 / (theta * (2 + btScalar(0.5) / theta2));
+				cos = 1 - btScalar(0.5) * t * t;
+				sin = cos * t;
+			}
+
+			// apply rotation to matrix (this = J^T * this * J)
+			m_el[p][q] = m_el[q][p] = 0;
+			m_el[p][p] -= t * mpq;
+			m_el[q][q] += t * mpq;
+			btScalar mrp = m_el[r][p];
+			btScalar mrq = m_el[r][q];
+			m_el[r][p] = m_el[p][r] = cos * mrp - sin * mrq;
+			m_el[r][q] = m_el[q][r] = cos * mrq + sin * mrp;
+
+			// apply rotation to rot (rot = rot * J)
+			for (int i = 0; i < 3; i++)
+			{
+				btVector3& row = rot[i];
+				mrp = row[p];
+				mrq = row[q];
+				row[p] = cos * mrp - sin * mrq;
+				row[q] = cos * mrq + sin * mrp;
+			}
+		}
+	}
+
+	/**@brief Calculate the matrix cofactor 
+	* @param r1 The first row to use for calculating the cofactor
+	* @param c1 The first column to use for calculating the cofactor
+	* @param r1 The second row to use for calculating the cofactor
+	* @param c1 The second column to use for calculating the cofactor
+	* See http://en.wikipedia.org/wiki/Cofactor_(linear_algebra) for more details
+	*/
+	btScalar cofac(int r1, int c1, int r2, int c2) const
+	{
+		return m_el[r1][c1] * m_el[r2][c2] - m_el[r1][c2] * m_el[r2][c1];
+	}
+
+	void serialize(struct btMatrix3x3Data & dataOut) const;
+
+	void serializeFloat(struct btMatrix3x3FloatData & dataOut) const;
+
+	void deSerialize(const struct btMatrix3x3Data& dataIn);
+
+	void deSerializeFloat(const struct btMatrix3x3FloatData& dataIn);
+
+	void deSerializeDouble(const struct btMatrix3x3DoubleData& dataIn);
+};
+
+SIMD_FORCE_INLINE btMatrix3x3&
+btMatrix3x3::operator*=(const btMatrix3x3& m)
+{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	__m128 rv00, rv01, rv02;
+	__m128 rv10, rv11, rv12;
+	__m128 rv20, rv21, rv22;
+	__m128 mv0, mv1, mv2;
+
+	rv02 = m_el[0].mVec128;
+	rv12 = m_el[1].mVec128;
+	rv22 = m_el[2].mVec128;
+
+	mv0 = _mm_and_ps(m[0].mVec128, btvFFF0fMask);
+	mv1 = _mm_and_ps(m[1].mVec128, btvFFF0fMask);
+	mv2 = _mm_and_ps(m[2].mVec128, btvFFF0fMask);
+
+	// rv0
+	rv00 = bt_splat_ps(rv02, 0);
+	rv01 = bt_splat_ps(rv02, 1);
+	rv02 = bt_splat_ps(rv02, 2);
+
+	rv00 = _mm_mul_ps(rv00, mv0);
+	rv01 = _mm_mul_ps(rv01, mv1);
+	rv02 = _mm_mul_ps(rv02, mv2);
+
+	// rv1
+	rv10 = bt_splat_ps(rv12, 0);
+	rv11 = bt_splat_ps(rv12, 1);
+	rv12 = bt_splat_ps(rv12, 2);
+
+	rv10 = _mm_mul_ps(rv10, mv0);
+	rv11 = _mm_mul_ps(rv11, mv1);
+	rv12 = _mm_mul_ps(rv12, mv2);
+
+	// rv2
+	rv20 = bt_splat_ps(rv22, 0);
+	rv21 = bt_splat_ps(rv22, 1);
+	rv22 = bt_splat_ps(rv22, 2);
+
+	rv20 = _mm_mul_ps(rv20, mv0);
+	rv21 = _mm_mul_ps(rv21, mv1);
+	rv22 = _mm_mul_ps(rv22, mv2);
+
+	rv00 = _mm_add_ps(rv00, rv01);
+	rv10 = _mm_add_ps(rv10, rv11);
+	rv20 = _mm_add_ps(rv20, rv21);
+
+	m_el[0].mVec128 = _mm_add_ps(rv00, rv02);
+	m_el[1].mVec128 = _mm_add_ps(rv10, rv12);
+	m_el[2].mVec128 = _mm_add_ps(rv20, rv22);
+
+#elif defined(BT_USE_NEON)
+
+	float32x4_t rv0, rv1, rv2;
+	float32x4_t v0, v1, v2;
+	float32x4_t mv0, mv1, mv2;
+
+	v0 = m_el[0].mVec128;
+	v1 = m_el[1].mVec128;
+	v2 = m_el[2].mVec128;
+
+	mv0 = (float32x4_t)vandq_s32((int32x4_t)m[0].mVec128, btvFFF0Mask);
+	mv1 = (float32x4_t)vandq_s32((int32x4_t)m[1].mVec128, btvFFF0Mask);
+	mv2 = (float32x4_t)vandq_s32((int32x4_t)m[2].mVec128, btvFFF0Mask);
+
+	rv0 = vmulq_lane_f32(mv0, vget_low_f32(v0), 0);
+	rv1 = vmulq_lane_f32(mv0, vget_low_f32(v1), 0);
+	rv2 = vmulq_lane_f32(mv0, vget_low_f32(v2), 0);
+
+	rv0 = vmlaq_lane_f32(rv0, mv1, vget_low_f32(v0), 1);
+	rv1 = vmlaq_lane_f32(rv1, mv1, vget_low_f32(v1), 1);
+	rv2 = vmlaq_lane_f32(rv2, mv1, vget_low_f32(v2), 1);
+
+	rv0 = vmlaq_lane_f32(rv0, mv2, vget_high_f32(v0), 0);
+	rv1 = vmlaq_lane_f32(rv1, mv2, vget_high_f32(v1), 0);
+	rv2 = vmlaq_lane_f32(rv2, mv2, vget_high_f32(v2), 0);
+
+	m_el[0].mVec128 = rv0;
+	m_el[1].mVec128 = rv1;
+	m_el[2].mVec128 = rv2;
+#else
+	setValue(
+		m.tdotx(m_el[0]), m.tdoty(m_el[0]), m.tdotz(m_el[0]),
+		m.tdotx(m_el[1]), m.tdoty(m_el[1]), m.tdotz(m_el[1]),
+		m.tdotx(m_el[2]), m.tdoty(m_el[2]), m.tdotz(m_el[2]));
+#endif
+	return *this;
+}
+
+SIMD_FORCE_INLINE btMatrix3x3&
+btMatrix3x3::operator+=(const btMatrix3x3& m)
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	m_el[0].mVec128 = m_el[0].mVec128 + m.m_el[0].mVec128;
+	m_el[1].mVec128 = m_el[1].mVec128 + m.m_el[1].mVec128;
+	m_el[2].mVec128 = m_el[2].mVec128 + m.m_el[2].mVec128;
+#else
+	setValue(
+		m_el[0][0] + m.m_el[0][0],
+		m_el[0][1] + m.m_el[0][1],
+		m_el[0][2] + m.m_el[0][2],
+		m_el[1][0] + m.m_el[1][0],
+		m_el[1][1] + m.m_el[1][1],
+		m_el[1][2] + m.m_el[1][2],
+		m_el[2][0] + m.m_el[2][0],
+		m_el[2][1] + m.m_el[2][1],
+		m_el[2][2] + m.m_el[2][2]);
+#endif
+	return *this;
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+operator*(const btMatrix3x3& m, const btScalar& k)
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+	__m128 vk = bt_splat_ps(_mm_load_ss((float*)&k), 0x80);
+	return btMatrix3x3(
+		_mm_mul_ps(m[0].mVec128, vk),
+		_mm_mul_ps(m[1].mVec128, vk),
+		_mm_mul_ps(m[2].mVec128, vk));
+#elif defined(BT_USE_NEON)
+	return btMatrix3x3(
+		vmulq_n_f32(m[0].mVec128, k),
+		vmulq_n_f32(m[1].mVec128, k),
+		vmulq_n_f32(m[2].mVec128, k));
+#else
+	return btMatrix3x3(
+		m[0].x() * k, m[0].y() * k, m[0].z() * k,
+		m[1].x() * k, m[1].y() * k, m[1].z() * k,
+		m[2].x() * k, m[2].y() * k, m[2].z() * k);
+#endif
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+operator+(const btMatrix3x3& m1, const btMatrix3x3& m2)
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	return btMatrix3x3(
+		m1[0].mVec128 + m2[0].mVec128,
+		m1[1].mVec128 + m2[1].mVec128,
+		m1[2].mVec128 + m2[2].mVec128);
+#else
+	return btMatrix3x3(
+		m1[0][0] + m2[0][0],
+		m1[0][1] + m2[0][1],
+		m1[0][2] + m2[0][2],
+
+		m1[1][0] + m2[1][0],
+		m1[1][1] + m2[1][1],
+		m1[1][2] + m2[1][2],
+
+		m1[2][0] + m2[2][0],
+		m1[2][1] + m2[2][1],
+		m1[2][2] + m2[2][2]);
+#endif
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+operator-(const btMatrix3x3& m1, const btMatrix3x3& m2)
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	return btMatrix3x3(
+		m1[0].mVec128 - m2[0].mVec128,
+		m1[1].mVec128 - m2[1].mVec128,
+		m1[2].mVec128 - m2[2].mVec128);
+#else
+	return btMatrix3x3(
+		m1[0][0] - m2[0][0],
+		m1[0][1] - m2[0][1],
+		m1[0][2] - m2[0][2],
+
+		m1[1][0] - m2[1][0],
+		m1[1][1] - m2[1][1],
+		m1[1][2] - m2[1][2],
+
+		m1[2][0] - m2[2][0],
+		m1[2][1] - m2[2][1],
+		m1[2][2] - m2[2][2]);
+#endif
+}
+
+SIMD_FORCE_INLINE btMatrix3x3&
+btMatrix3x3::operator-=(const btMatrix3x3& m)
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	m_el[0].mVec128 = m_el[0].mVec128 - m.m_el[0].mVec128;
+	m_el[1].mVec128 = m_el[1].mVec128 - m.m_el[1].mVec128;
+	m_el[2].mVec128 = m_el[2].mVec128 - m.m_el[2].mVec128;
+#else
+	setValue(
+		m_el[0][0] - m.m_el[0][0],
+		m_el[0][1] - m.m_el[0][1],
+		m_el[0][2] - m.m_el[0][2],
+		m_el[1][0] - m.m_el[1][0],
+		m_el[1][1] - m.m_el[1][1],
+		m_el[1][2] - m.m_el[1][2],
+		m_el[2][0] - m.m_el[2][0],
+		m_el[2][1] - m.m_el[2][1],
+		m_el[2][2] - m.m_el[2][2]);
+#endif
+	return *this;
+}
+
+SIMD_FORCE_INLINE btScalar
+btMatrix3x3::determinant() const
+{
+	return btTriple((*this)[0], (*this)[1], (*this)[2]);
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+btMatrix3x3::absolute() const
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+	return btMatrix3x3(
+		_mm_and_ps(m_el[0].mVec128, btvAbsfMask),
+		_mm_and_ps(m_el[1].mVec128, btvAbsfMask),
+		_mm_and_ps(m_el[2].mVec128, btvAbsfMask));
+#elif defined(BT_USE_NEON)
+	return btMatrix3x3(
+		(float32x4_t)vandq_s32((int32x4_t)m_el[0].mVec128, btv3AbsMask),
+		(float32x4_t)vandq_s32((int32x4_t)m_el[1].mVec128, btv3AbsMask),
+		(float32x4_t)vandq_s32((int32x4_t)m_el[2].mVec128, btv3AbsMask));
+#else
+	return btMatrix3x3(
+		btFabs(m_el[0].x()), btFabs(m_el[0].y()), btFabs(m_el[0].z()),
+		btFabs(m_el[1].x()), btFabs(m_el[1].y()), btFabs(m_el[1].z()),
+		btFabs(m_el[2].x()), btFabs(m_el[2].y()), btFabs(m_el[2].z()));
+#endif
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+btMatrix3x3::transpose() const
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+	__m128 v0 = m_el[0].mVec128;
+	__m128 v1 = m_el[1].mVec128;
+	__m128 v2 = m_el[2].mVec128;  //  x2 y2 z2 w2
+	__m128 vT;
+
+	v2 = _mm_and_ps(v2, btvFFF0fMask);  //  x2 y2 z2 0
+
+	vT = _mm_unpackhi_ps(v0, v1);  //	z0 z1 * *
+	v0 = _mm_unpacklo_ps(v0, v1);  //	x0 x1 y0 y1
+
+	v1 = _mm_shuffle_ps(v0, v2, BT_SHUFFLE(2, 3, 1, 3));                    // y0 y1 y2 0
+	v0 = _mm_shuffle_ps(v0, v2, BT_SHUFFLE(0, 1, 0, 3));                    // x0 x1 x2 0
+	v2 = btCastdTo128f(_mm_move_sd(btCastfTo128d(v2), btCastfTo128d(vT)));  // z0 z1 z2 0
+
+	return btMatrix3x3(v0, v1, v2);
+#elif defined(BT_USE_NEON)
+	// note: zeros the w channel. We can preserve it at the cost of two more vtrn instructions.
+	static const uint32x2_t zMask = (const uint32x2_t){static_cast<uint32_t>(-1), 0};
+	float32x4x2_t top = vtrnq_f32(m_el[0].mVec128, m_el[1].mVec128);               // {x0 x1 z0 z1}, {y0 y1 w0 w1}
+	float32x2x2_t bl = vtrn_f32(vget_low_f32(m_el[2].mVec128), vdup_n_f32(0.0f));  // {x2  0 }, {y2 0}
+	float32x4_t v0 = vcombine_f32(vget_low_f32(top.val[0]), bl.val[0]);
+	float32x4_t v1 = vcombine_f32(vget_low_f32(top.val[1]), bl.val[1]);
+	float32x2_t q = (float32x2_t)vand_u32((uint32x2_t)vget_high_f32(m_el[2].mVec128), zMask);
+	float32x4_t v2 = vcombine_f32(vget_high_f32(top.val[0]), q);  // z0 z1 z2  0
+	return btMatrix3x3(v0, v1, v2);
+#else
+	return btMatrix3x3(m_el[0].x(), m_el[1].x(), m_el[2].x(),
+					   m_el[0].y(), m_el[1].y(), m_el[2].y(),
+					   m_el[0].z(), m_el[1].z(), m_el[2].z());
+#endif
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+btMatrix3x3::adjoint() const
+{
+	return btMatrix3x3(cofac(1, 1, 2, 2), cofac(0, 2, 2, 1), cofac(0, 1, 1, 2),
+					   cofac(1, 2, 2, 0), cofac(0, 0, 2, 2), cofac(0, 2, 1, 0),
+					   cofac(1, 0, 2, 1), cofac(0, 1, 2, 0), cofac(0, 0, 1, 1));
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+btMatrix3x3::inverse() const
+{
+	btVector3 co(cofac(1, 1, 2, 2), cofac(1, 2, 2, 0), cofac(1, 0, 2, 1));
+	btScalar det = (*this)[0].dot(co);
+	//btFullAssert(det != btScalar(0.0));
+	btAssert(det != btScalar(0.0));
+	btScalar s = btScalar(1.0) / det;
+	return btMatrix3x3(co.x() * s, cofac(0, 2, 2, 1) * s, cofac(0, 1, 1, 2) * s,
+					   co.y() * s, cofac(0, 0, 2, 2) * s, cofac(0, 2, 1, 0) * s,
+					   co.z() * s, cofac(0, 1, 2, 0) * s, cofac(0, 0, 1, 1) * s);
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+btMatrix3x3::transposeTimes(const btMatrix3x3& m) const
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+	// zeros w
+	//    static const __m128i xyzMask = (const __m128i){ -1ULL, 0xffffffffULL };
+	__m128 row = m_el[0].mVec128;
+	__m128 m0 = _mm_and_ps(m.getRow(0).mVec128, btvFFF0fMask);
+	__m128 m1 = _mm_and_ps(m.getRow(1).mVec128, btvFFF0fMask);
+	__m128 m2 = _mm_and_ps(m.getRow(2).mVec128, btvFFF0fMask);
+	__m128 r0 = _mm_mul_ps(m0, _mm_shuffle_ps(row, row, 0));
+	__m128 r1 = _mm_mul_ps(m0, _mm_shuffle_ps(row, row, 0x55));
+	__m128 r2 = _mm_mul_ps(m0, _mm_shuffle_ps(row, row, 0xaa));
+	row = m_el[1].mVec128;
+	r0 = _mm_add_ps(r0, _mm_mul_ps(m1, _mm_shuffle_ps(row, row, 0)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(m1, _mm_shuffle_ps(row, row, 0x55)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(m1, _mm_shuffle_ps(row, row, 0xaa)));
+	row = m_el[2].mVec128;
+	r0 = _mm_add_ps(r0, _mm_mul_ps(m2, _mm_shuffle_ps(row, row, 0)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(m2, _mm_shuffle_ps(row, row, 0x55)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(m2, _mm_shuffle_ps(row, row, 0xaa)));
+	return btMatrix3x3(r0, r1, r2);
+
+#elif defined BT_USE_NEON
+	// zeros w
+	static const uint32x4_t xyzMask = (const uint32x4_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), 0};
+	float32x4_t m0 = (float32x4_t)vandq_u32((uint32x4_t)m.getRow(0).mVec128, xyzMask);
+	float32x4_t m1 = (float32x4_t)vandq_u32((uint32x4_t)m.getRow(1).mVec128, xyzMask);
+	float32x4_t m2 = (float32x4_t)vandq_u32((uint32x4_t)m.getRow(2).mVec128, xyzMask);
+	float32x4_t row = m_el[0].mVec128;
+	float32x4_t r0 = vmulq_lane_f32(m0, vget_low_f32(row), 0);
+	float32x4_t r1 = vmulq_lane_f32(m0, vget_low_f32(row), 1);
+	float32x4_t r2 = vmulq_lane_f32(m0, vget_high_f32(row), 0);
+	row = m_el[1].mVec128;
+	r0 = vmlaq_lane_f32(r0, m1, vget_low_f32(row), 0);
+	r1 = vmlaq_lane_f32(r1, m1, vget_low_f32(row), 1);
+	r2 = vmlaq_lane_f32(r2, m1, vget_high_f32(row), 0);
+	row = m_el[2].mVec128;
+	r0 = vmlaq_lane_f32(r0, m2, vget_low_f32(row), 0);
+	r1 = vmlaq_lane_f32(r1, m2, vget_low_f32(row), 1);
+	r2 = vmlaq_lane_f32(r2, m2, vget_high_f32(row), 0);
+	return btMatrix3x3(r0, r1, r2);
+#else
+	return btMatrix3x3(
+		m_el[0].x() * m[0].x() + m_el[1].x() * m[1].x() + m_el[2].x() * m[2].x(),
+		m_el[0].x() * m[0].y() + m_el[1].x() * m[1].y() + m_el[2].x() * m[2].y(),
+		m_el[0].x() * m[0].z() + m_el[1].x() * m[1].z() + m_el[2].x() * m[2].z(),
+		m_el[0].y() * m[0].x() + m_el[1].y() * m[1].x() + m_el[2].y() * m[2].x(),
+		m_el[0].y() * m[0].y() + m_el[1].y() * m[1].y() + m_el[2].y() * m[2].y(),
+		m_el[0].y() * m[0].z() + m_el[1].y() * m[1].z() + m_el[2].y() * m[2].z(),
+		m_el[0].z() * m[0].x() + m_el[1].z() * m[1].x() + m_el[2].z() * m[2].x(),
+		m_el[0].z() * m[0].y() + m_el[1].z() * m[1].y() + m_el[2].z() * m[2].y(),
+		m_el[0].z() * m[0].z() + m_el[1].z() * m[1].z() + m_el[2].z() * m[2].z());
+#endif
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+btMatrix3x3::timesTranspose(const btMatrix3x3& m) const
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+	__m128 a0 = m_el[0].mVec128;
+	__m128 a1 = m_el[1].mVec128;
+	__m128 a2 = m_el[2].mVec128;
+
+	btMatrix3x3 mT = m.transpose();  // we rely on transpose() zeroing w channel so that we don't have to do it here
+	__m128 mx = mT[0].mVec128;
+	__m128 my = mT[1].mVec128;
+	__m128 mz = mT[2].mVec128;
+
+	__m128 r0 = _mm_mul_ps(mx, _mm_shuffle_ps(a0, a0, 0x00));
+	__m128 r1 = _mm_mul_ps(mx, _mm_shuffle_ps(a1, a1, 0x00));
+	__m128 r2 = _mm_mul_ps(mx, _mm_shuffle_ps(a2, a2, 0x00));
+	r0 = _mm_add_ps(r0, _mm_mul_ps(my, _mm_shuffle_ps(a0, a0, 0x55)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(my, _mm_shuffle_ps(a1, a1, 0x55)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(my, _mm_shuffle_ps(a2, a2, 0x55)));
+	r0 = _mm_add_ps(r0, _mm_mul_ps(mz, _mm_shuffle_ps(a0, a0, 0xaa)));
+	r1 = _mm_add_ps(r1, _mm_mul_ps(mz, _mm_shuffle_ps(a1, a1, 0xaa)));
+	r2 = _mm_add_ps(r2, _mm_mul_ps(mz, _mm_shuffle_ps(a2, a2, 0xaa)));
+	return btMatrix3x3(r0, r1, r2);
+
+#elif defined BT_USE_NEON
+	float32x4_t a0 = m_el[0].mVec128;
+	float32x4_t a1 = m_el[1].mVec128;
+	float32x4_t a2 = m_el[2].mVec128;
+
+	btMatrix3x3 mT = m.transpose();  // we rely on transpose() zeroing w channel so that we don't have to do it here
+	float32x4_t mx = mT[0].mVec128;
+	float32x4_t my = mT[1].mVec128;
+	float32x4_t mz = mT[2].mVec128;
+
+	float32x4_t r0 = vmulq_lane_f32(mx, vget_low_f32(a0), 0);
+	float32x4_t r1 = vmulq_lane_f32(mx, vget_low_f32(a1), 0);
+	float32x4_t r2 = vmulq_lane_f32(mx, vget_low_f32(a2), 0);
+	r0 = vmlaq_lane_f32(r0, my, vget_low_f32(a0), 1);
+	r1 = vmlaq_lane_f32(r1, my, vget_low_f32(a1), 1);
+	r2 = vmlaq_lane_f32(r2, my, vget_low_f32(a2), 1);
+	r0 = vmlaq_lane_f32(r0, mz, vget_high_f32(a0), 0);
+	r1 = vmlaq_lane_f32(r1, mz, vget_high_f32(a1), 0);
+	r2 = vmlaq_lane_f32(r2, mz, vget_high_f32(a2), 0);
+	return btMatrix3x3(r0, r1, r2);
+
+#else
+	return btMatrix3x3(
+		m_el[0].dot(m[0]), m_el[0].dot(m[1]), m_el[0].dot(m[2]),
+		m_el[1].dot(m[0]), m_el[1].dot(m[1]), m_el[1].dot(m[2]),
+		m_el[2].dot(m[0]), m_el[2].dot(m[1]), m_el[2].dot(m[2]));
+#endif
+}
+
+SIMD_FORCE_INLINE btVector3
+operator*(const btMatrix3x3& m, const btVector3& v)
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	return v.dot3(m[0], m[1], m[2]);
+#else
+	return btVector3(m[0].dot(v), m[1].dot(v), m[2].dot(v));
+#endif
+}
+
+SIMD_FORCE_INLINE btVector3
+operator*(const btVector3& v, const btMatrix3x3& m)
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+
+	const __m128 vv = v.mVec128;
+
+	__m128 c0 = bt_splat_ps(vv, 0);
+	__m128 c1 = bt_splat_ps(vv, 1);
+	__m128 c2 = bt_splat_ps(vv, 2);
+
+	c0 = _mm_mul_ps(c0, _mm_and_ps(m[0].mVec128, btvFFF0fMask));
+	c1 = _mm_mul_ps(c1, _mm_and_ps(m[1].mVec128, btvFFF0fMask));
+	c0 = _mm_add_ps(c0, c1);
+	c2 = _mm_mul_ps(c2, _mm_and_ps(m[2].mVec128, btvFFF0fMask));
+
+	return btVector3(_mm_add_ps(c0, c2));
+#elif defined(BT_USE_NEON)
+	const float32x4_t vv = v.mVec128;
+	const float32x2_t vlo = vget_low_f32(vv);
+	const float32x2_t vhi = vget_high_f32(vv);
+
+	float32x4_t c0, c1, c2;
+
+	c0 = (float32x4_t)vandq_s32((int32x4_t)m[0].mVec128, btvFFF0Mask);
+	c1 = (float32x4_t)vandq_s32((int32x4_t)m[1].mVec128, btvFFF0Mask);
+	c2 = (float32x4_t)vandq_s32((int32x4_t)m[2].mVec128, btvFFF0Mask);
+
+	c0 = vmulq_lane_f32(c0, vlo, 0);
+	c1 = vmulq_lane_f32(c1, vlo, 1);
+	c2 = vmulq_lane_f32(c2, vhi, 0);
+	c0 = vaddq_f32(c0, c1);
+	c0 = vaddq_f32(c0, c2);
+
+	return btVector3(c0);
+#else
+	return btVector3(m.tdotx(v), m.tdoty(v), m.tdotz(v));
+#endif
+}
+
+SIMD_FORCE_INLINE btMatrix3x3
+operator*(const btMatrix3x3& m1, const btMatrix3x3& m2)
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+
+	__m128 m10 = m1[0].mVec128;
+	__m128 m11 = m1[1].mVec128;
+	__m128 m12 = m1[2].mVec128;
+
+	__m128 m2v = _mm_and_ps(m2[0].mVec128, btvFFF0fMask);
+
+	__m128 c0 = bt_splat_ps(m10, 0);
+	__m128 c1 = bt_splat_ps(m11, 0);
+	__m128 c2 = bt_splat_ps(m12, 0);
+
+	c0 = _mm_mul_ps(c0, m2v);
+	c1 = _mm_mul_ps(c1, m2v);
+	c2 = _mm_mul_ps(c2, m2v);
+
+	m2v = _mm_and_ps(m2[1].mVec128, btvFFF0fMask);
+
+	__m128 c0_1 = bt_splat_ps(m10, 1);
+	__m128 c1_1 = bt_splat_ps(m11, 1);
+	__m128 c2_1 = bt_splat_ps(m12, 1);
+
+	c0_1 = _mm_mul_ps(c0_1, m2v);
+	c1_1 = _mm_mul_ps(c1_1, m2v);
+	c2_1 = _mm_mul_ps(c2_1, m2v);
+
+	m2v = _mm_and_ps(m2[2].mVec128, btvFFF0fMask);
+
+	c0 = _mm_add_ps(c0, c0_1);
+	c1 = _mm_add_ps(c1, c1_1);
+	c2 = _mm_add_ps(c2, c2_1);
+
+	m10 = bt_splat_ps(m10, 2);
+	m11 = bt_splat_ps(m11, 2);
+	m12 = bt_splat_ps(m12, 2);
+
+	m10 = _mm_mul_ps(m10, m2v);
+	m11 = _mm_mul_ps(m11, m2v);
+	m12 = _mm_mul_ps(m12, m2v);
+
+	c0 = _mm_add_ps(c0, m10);
+	c1 = _mm_add_ps(c1, m11);
+	c2 = _mm_add_ps(c2, m12);
+
+	return btMatrix3x3(c0, c1, c2);
+
+#elif defined(BT_USE_NEON)
+
+	float32x4_t rv0, rv1, rv2;
+	float32x4_t v0, v1, v2;
+	float32x4_t mv0, mv1, mv2;
+
+	v0 = m1[0].mVec128;
+	v1 = m1[1].mVec128;
+	v2 = m1[2].mVec128;
+
+	mv0 = (float32x4_t)vandq_s32((int32x4_t)m2[0].mVec128, btvFFF0Mask);
+	mv1 = (float32x4_t)vandq_s32((int32x4_t)m2[1].mVec128, btvFFF0Mask);
+	mv2 = (float32x4_t)vandq_s32((int32x4_t)m2[2].mVec128, btvFFF0Mask);
+
+	rv0 = vmulq_lane_f32(mv0, vget_low_f32(v0), 0);
+	rv1 = vmulq_lane_f32(mv0, vget_low_f32(v1), 0);
+	rv2 = vmulq_lane_f32(mv0, vget_low_f32(v2), 0);
+
+	rv0 = vmlaq_lane_f32(rv0, mv1, vget_low_f32(v0), 1);
+	rv1 = vmlaq_lane_f32(rv1, mv1, vget_low_f32(v1), 1);
+	rv2 = vmlaq_lane_f32(rv2, mv1, vget_low_f32(v2), 1);
+
+	rv0 = vmlaq_lane_f32(rv0, mv2, vget_high_f32(v0), 0);
+	rv1 = vmlaq_lane_f32(rv1, mv2, vget_high_f32(v1), 0);
+	rv2 = vmlaq_lane_f32(rv2, mv2, vget_high_f32(v2), 0);
+
+	return btMatrix3x3(rv0, rv1, rv2);
+
+#else
+	return btMatrix3x3(
+		m2.tdotx(m1[0]), m2.tdoty(m1[0]), m2.tdotz(m1[0]),
+		m2.tdotx(m1[1]), m2.tdoty(m1[1]), m2.tdotz(m1[1]),
+		m2.tdotx(m1[2]), m2.tdoty(m1[2]), m2.tdotz(m1[2]));
+#endif
+}
+
+/*
+SIMD_FORCE_INLINE btMatrix3x3 btMultTransposeLeft(const btMatrix3x3& m1, const btMatrix3x3& m2) {
+return btMatrix3x3(
+m1[0][0] * m2[0][0] + m1[1][0] * m2[1][0] + m1[2][0] * m2[2][0],
+m1[0][0] * m2[0][1] + m1[1][0] * m2[1][1] + m1[2][0] * m2[2][1],
+m1[0][0] * m2[0][2] + m1[1][0] * m2[1][2] + m1[2][0] * m2[2][2],
+m1[0][1] * m2[0][0] + m1[1][1] * m2[1][0] + m1[2][1] * m2[2][0],
+m1[0][1] * m2[0][1] + m1[1][1] * m2[1][1] + m1[2][1] * m2[2][1],
+m1[0][1] * m2[0][2] + m1[1][1] * m2[1][2] + m1[2][1] * m2[2][2],
+m1[0][2] * m2[0][0] + m1[1][2] * m2[1][0] + m1[2][2] * m2[2][0],
+m1[0][2] * m2[0][1] + m1[1][2] * m2[1][1] + m1[2][2] * m2[2][1],
+m1[0][2] * m2[0][2] + m1[1][2] * m2[1][2] + m1[2][2] * m2[2][2]);
+}
+*/
+
+/**@brief Equality operator between two matrices
+* It will test all elements are equal.  */
+SIMD_FORCE_INLINE bool operator==(const btMatrix3x3& m1, const btMatrix3x3& m2)
+{
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+
+	__m128 c0, c1, c2;
+
+	c0 = _mm_cmpeq_ps(m1[0].mVec128, m2[0].mVec128);
+	c1 = _mm_cmpeq_ps(m1[1].mVec128, m2[1].mVec128);
+	c2 = _mm_cmpeq_ps(m1[2].mVec128, m2[2].mVec128);
+
+	c0 = _mm_and_ps(c0, c1);
+	c0 = _mm_and_ps(c0, c2);
+
+	int m = _mm_movemask_ps((__m128)c0);
+	return (0x7 == (m & 0x7));
+
+#else
+	return (m1[0][0] == m2[0][0] && m1[1][0] == m2[1][0] && m1[2][0] == m2[2][0] &&
+			m1[0][1] == m2[0][1] && m1[1][1] == m2[1][1] && m1[2][1] == m2[2][1] &&
+			m1[0][2] == m2[0][2] && m1[1][2] == m2[1][2] && m1[2][2] == m2[2][2]);
+#endif
+}
+
+///for serialization
+struct btMatrix3x3FloatData
+{
+	btVector3FloatData m_el[3];
+};
+
+///for serialization
+struct btMatrix3x3DoubleData
+{
+	btVector3DoubleData m_el[3];
+};
+
+SIMD_FORCE_INLINE void btMatrix3x3::serialize(struct btMatrix3x3Data& dataOut) const
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].serialize(dataOut.m_el[i]);
+}
+
+SIMD_FORCE_INLINE void btMatrix3x3::serializeFloat(struct btMatrix3x3FloatData& dataOut) const
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].serializeFloat(dataOut.m_el[i]);
+}
+
+SIMD_FORCE_INLINE void btMatrix3x3::deSerialize(const struct btMatrix3x3Data& dataIn)
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].deSerialize(dataIn.m_el[i]);
+}
+
+SIMD_FORCE_INLINE void btMatrix3x3::deSerializeFloat(const struct btMatrix3x3FloatData& dataIn)
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].deSerializeFloat(dataIn.m_el[i]);
+}
+
+SIMD_FORCE_INLINE void btMatrix3x3::deSerializeDouble(const struct btMatrix3x3DoubleData& dataIn)
+{
+	for (int i = 0; i < 3; i++)
+		m_el[i].deSerializeDouble(dataIn.m_el[i]);
+}
+
+#endif  //BT_MATRIX3x3_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btMatrixX.h b/dali-physics/third-party/bullet3/src/LinearMath/btMatrixX.h
new file mode 100644
index 0000000..bb0f0dd
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btMatrixX.h
@@ -0,0 +1,532 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///original version written by Erwin Coumans, October 2013
+
+#ifndef BT_MATRIX_X_H
+#define BT_MATRIX_X_H
+
+#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include <stdio.h>
+
+//#define BT_DEBUG_OSTREAM
+#ifdef BT_DEBUG_OSTREAM
+#include <iostream>
+#include <iomanip>  // std::setw
+#endif              //BT_DEBUG_OSTREAM
+
+class btIntSortPredicate
+{
+public:
+	bool operator()(const int& a, const int& b) const
+	{
+		return a < b;
+	}
+};
+
+template <typename T>
+struct btVectorX
+{
+	btAlignedObjectArray<T> m_storage;
+
+	btVectorX()
+	{
+	}
+	btVectorX(int numRows)
+	{
+		m_storage.resize(numRows);
+	}
+
+	void resize(int rows)
+	{
+		m_storage.resize(rows);
+	}
+	int cols() const
+	{
+		return 1;
+	}
+	int rows() const
+	{
+		return m_storage.size();
+	}
+	int size() const
+	{
+		return rows();
+	}
+
+	T nrm2() const
+	{
+		T norm = T(0);
+
+		int nn = rows();
+
+		{
+			if (nn == 1)
+			{
+				norm = btFabs((*this)[0]);
+			}
+			else
+			{
+				T scale = 0.0;
+				T ssq = 1.0;
+
+				/* The following loop is equivalent to this call to the LAPACK
+				 auxiliary routine:   CALL SLASSQ( N, X, INCX, SCALE, SSQ ) */
+
+				for (int ix = 0; ix < nn; ix++)
+				{
+					if ((*this)[ix] != 0.0)
+					{
+						T absxi = btFabs((*this)[ix]);
+						if (scale < absxi)
+						{
+							T temp;
+							temp = scale / absxi;
+							ssq = ssq * (temp * temp) + BT_ONE;
+							scale = absxi;
+						}
+						else
+						{
+							T temp;
+							temp = absxi / scale;
+							ssq += temp * temp;
+						}
+					}
+				}
+				norm = scale * sqrt(ssq);
+			}
+		}
+		return norm;
+	}
+	void setZero()
+	{
+		if (m_storage.size())
+		{
+			//	for (int i=0;i<m_storage.size();i++)
+			//		m_storage[i]=0;
+			//memset(&m_storage[0],0,sizeof(T)*m_storage.size());
+			btSetZero(&m_storage[0], m_storage.size());
+		}
+	}
+	const T& operator[](int index) const
+	{
+		return m_storage[index];
+	}
+
+	T& operator[](int index)
+	{
+		return m_storage[index];
+	}
+
+	T* getBufferPointerWritable()
+	{
+		return m_storage.size() ? &m_storage[0] : 0;
+	}
+
+	const T* getBufferPointer() const
+	{
+		return m_storage.size() ? &m_storage[0] : 0;
+	}
+};
+/*
+ template <typename T>
+ void setElem(btMatrixX<T>& mat, int row, int col, T val)
+ {
+ mat.setElem(row,col,val);
+ }
+ */
+
+template <typename T>
+struct btMatrixX
+{
+	int m_rows;
+	int m_cols;
+	int m_operations;
+	int m_resizeOperations;
+	int m_setElemOperations;
+
+	btAlignedObjectArray<T> m_storage;
+	mutable btAlignedObjectArray<btAlignedObjectArray<int> > m_rowNonZeroElements1;
+
+	T* getBufferPointerWritable()
+	{
+		return m_storage.size() ? &m_storage[0] : 0;
+	}
+
+	const T* getBufferPointer() const
+	{
+		return m_storage.size() ? &m_storage[0] : 0;
+	}
+	btMatrixX()
+		: m_rows(0),
+		  m_cols(0),
+		  m_operations(0),
+		  m_resizeOperations(0),
+		  m_setElemOperations(0)
+	{
+	}
+	btMatrixX(int rows, int cols)
+		: m_rows(rows),
+		  m_cols(cols),
+		  m_operations(0),
+		  m_resizeOperations(0),
+		  m_setElemOperations(0)
+	{
+		resize(rows, cols);
+	}
+	void resize(int rows, int cols)
+	{
+		m_resizeOperations++;
+		m_rows = rows;
+		m_cols = cols;
+		{
+			BT_PROFILE("m_storage.resize");
+			m_storage.resize(rows * cols);
+		}
+	}
+	int cols() const
+	{
+		return m_cols;
+	}
+	int rows() const
+	{
+		return m_rows;
+	}
+	///we don't want this read/write operator(), because we cannot keep track of non-zero elements, use setElem instead
+	/*T& operator() (int row,int col)
+	{
+		return m_storage[col*m_rows+row];
+	}
+	*/
+
+	void addElem(int row, int col, T val)
+	{
+		if (val)
+		{
+			if (m_storage[col + row * m_cols] == 0.f)
+			{
+				setElem(row, col, val);
+			}
+			else
+			{
+				m_storage[row * m_cols + col] += val;
+			}
+		}
+	}
+
+	void setElem(int row, int col, T val)
+	{
+		m_setElemOperations++;
+		m_storage[row * m_cols + col] = val;
+	}
+
+	void mulElem(int row, int col, T val)
+	{
+		m_setElemOperations++;
+		//mul doesn't change sparsity info
+
+		m_storage[row * m_cols + col] *= val;
+	}
+
+	void copyLowerToUpperTriangle()
+	{
+		int count = 0;
+		for (int row = 0; row < rows(); row++)
+		{
+			for (int col = 0; col < row; col++)
+			{
+				setElem(col, row, (*this)(row, col));
+				count++;
+			}
+		}
+		//printf("copyLowerToUpperTriangle copied %d elements out of %dx%d=%d\n", count,rows(),cols(),cols()*rows());
+	}
+
+	const T& operator()(int row, int col) const
+	{
+		return m_storage[col + row * m_cols];
+	}
+
+	void setZero()
+	{
+		{
+			BT_PROFILE("storage=0");
+			if (m_storage.size())
+			{
+				btSetZero(&m_storage[0], m_storage.size());
+			}
+			//memset(&m_storage[0],0,sizeof(T)*m_storage.size());
+			//for (int i=0;i<m_storage.size();i++)
+			//			m_storage[i]=0;
+		}
+	}
+
+	void setIdentity()
+	{
+		btAssert(rows() == cols());
+
+		setZero();
+		for (int row = 0; row < rows(); row++)
+		{
+			setElem(row, row, 1);
+		}
+	}
+
+	void printMatrix(const char* msg) const
+	{
+		printf("%s ---------------------\n", msg);
+		for (int i = 0; i < rows(); i++)
+		{
+			printf("\n");
+			for (int j = 0; j < cols(); j++)
+			{
+				printf("%2.1f\t", (*this)(i, j));
+			}
+		}
+		printf("\n---------------------\n");
+	}
+
+	void rowComputeNonZeroElements() const
+	{
+		m_rowNonZeroElements1.resize(rows());
+		for (int i = 0; i < rows(); i++)
+		{
+			m_rowNonZeroElements1[i].resize(0);
+			for (int j = 0; j < cols(); j++)
+			{
+				if ((*this)(i, j) != 0.f)
+				{
+					m_rowNonZeroElements1[i].push_back(j);
+				}
+			}
+		}
+	}
+	btMatrixX transpose() const
+	{
+		//transpose is optimized for sparse matrices
+		btMatrixX tr(m_cols, m_rows);
+		tr.setZero();
+		for (int i = 0; i < m_cols; i++)
+			for (int j = 0; j < m_rows; j++)
+			{
+				T v = (*this)(j, i);
+				if (v)
+				{
+					tr.setElem(i, j, v);
+				}
+			}
+		return tr;
+	}
+
+	btMatrixX operator*(const btMatrixX& other)
+	{
+		//btMatrixX*btMatrixX implementation, brute force
+		btAssert(cols() == other.rows());
+
+		btMatrixX res(rows(), other.cols());
+		res.setZero();
+		//		BT_PROFILE("btMatrixX mul");
+		for (int i = 0; i < rows(); ++i)
+		{
+			{
+				for (int j = 0; j < other.cols(); ++j)
+				{
+					T dotProd = 0;
+					{
+						{
+							int c = cols();
+
+							for (int k = 0; k < c; k++)
+							{
+								T w = (*this)(i, k);
+								if (other(k, j) != 0.f)
+								{
+									dotProd += w * other(k, j);
+								}
+							}
+						}
+					}
+					if (dotProd)
+						res.setElem(i, j, dotProd);
+				}
+			}
+		}
+		return res;
+	}
+
+	// this assumes the 4th and 8th rows of B and C are zero.
+	void multiplyAdd2_p8r(const btScalar* B, const btScalar* C, int numRows, int numRowsOther, int row, int col)
+	{
+		const btScalar* bb = B;
+		for (int i = 0; i < numRows; i++)
+		{
+			const btScalar* cc = C;
+			for (int j = 0; j < numRowsOther; j++)
+			{
+				btScalar sum;
+				sum = bb[0] * cc[0];
+				sum += bb[1] * cc[1];
+				sum += bb[2] * cc[2];
+				sum += bb[4] * cc[4];
+				sum += bb[5] * cc[5];
+				sum += bb[6] * cc[6];
+				addElem(row + i, col + j, sum);
+				cc += 8;
+			}
+			bb += 8;
+		}
+	}
+
+	void multiply2_p8r(const btScalar* B, const btScalar* C, int numRows, int numRowsOther, int row, int col)
+	{
+		btAssert(numRows > 0 && numRowsOther > 0 && B && C);
+		const btScalar* bb = B;
+		for (int i = 0; i < numRows; i++)
+		{
+			const btScalar* cc = C;
+			for (int j = 0; j < numRowsOther; j++)
+			{
+				btScalar sum;
+				sum = bb[0] * cc[0];
+				sum += bb[1] * cc[1];
+				sum += bb[2] * cc[2];
+				sum += bb[4] * cc[4];
+				sum += bb[5] * cc[5];
+				sum += bb[6] * cc[6];
+				setElem(row + i, col + j, sum);
+				cc += 8;
+			}
+			bb += 8;
+		}
+	}
+
+	void setSubMatrix(int rowstart, int colstart, int rowend, int colend, const T value)
+	{
+		int numRows = rowend + 1 - rowstart;
+		int numCols = colend + 1 - colstart;
+
+		for (int row = 0; row < numRows; row++)
+		{
+			for (int col = 0; col < numCols; col++)
+			{
+				setElem(rowstart + row, colstart + col, value);
+			}
+		}
+	}
+
+	void setSubMatrix(int rowstart, int colstart, int rowend, int colend, const btMatrixX& block)
+	{
+		btAssert(rowend + 1 - rowstart == block.rows());
+		btAssert(colend + 1 - colstart == block.cols());
+		for (int row = 0; row < block.rows(); row++)
+		{
+			for (int col = 0; col < block.cols(); col++)
+			{
+				setElem(rowstart + row, colstart + col, block(row, col));
+			}
+		}
+	}
+	void setSubMatrix(int rowstart, int colstart, int rowend, int colend, const btVectorX<T>& block)
+	{
+		btAssert(rowend + 1 - rowstart == block.rows());
+		btAssert(colend + 1 - colstart == block.cols());
+		for (int row = 0; row < block.rows(); row++)
+		{
+			for (int col = 0; col < block.cols(); col++)
+			{
+				setElem(rowstart + row, colstart + col, block[row]);
+			}
+		}
+	}
+
+	btMatrixX negative()
+	{
+		btMatrixX neg(rows(), cols());
+		for (int i = 0; i < rows(); i++)
+			for (int j = 0; j < cols(); j++)
+			{
+				T v = (*this)(i, j);
+				neg.setElem(i, j, -v);
+			}
+		return neg;
+	}
+};
+
+typedef btMatrixX<float> btMatrixXf;
+typedef btVectorX<float> btVectorXf;
+
+typedef btMatrixX<double> btMatrixXd;
+typedef btVectorX<double> btVectorXd;
+
+#ifdef BT_DEBUG_OSTREAM
+template <typename T>
+std::ostream& operator<<(std::ostream& os, const btMatrixX<T>& mat)
+{
+	os << " [";
+	//printf("%s ---------------------\n",msg);
+	for (int i = 0; i < mat.rows(); i++)
+	{
+		for (int j = 0; j < mat.cols(); j++)
+		{
+			os << std::setw(12) << mat(i, j);
+		}
+		if (i != mat.rows() - 1)
+			os << std::endl
+			   << "  ";
+	}
+	os << " ]";
+	//printf("\n---------------------\n");
+
+	return os;
+}
+template <typename T>
+std::ostream& operator<<(std::ostream& os, const btVectorX<T>& mat)
+{
+	os << " [";
+	//printf("%s ---------------------\n",msg);
+	for (int i = 0; i < mat.rows(); i++)
+	{
+		os << std::setw(12) << mat[i];
+		if (i != mat.rows() - 1)
+			os << std::endl
+			   << "  ";
+	}
+	os << " ]";
+	//printf("\n---------------------\n");
+
+	return os;
+}
+
+#endif  //BT_DEBUG_OSTREAM
+
+inline void setElem(btMatrixXd& mat, int row, int col, double val)
+{
+	mat.setElem(row, col, val);
+}
+
+inline void setElem(btMatrixXf& mat, int row, int col, float val)
+{
+	mat.setElem(row, col, val);
+}
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btVectorXu btVectorXd
+#define btMatrixXu btMatrixXd
+#else
+#define btVectorXu btVectorXf
+#define btMatrixXu btMatrixXf
+#endif  //BT_USE_DOUBLE_PRECISION
+
+#endif  //BT_MATRIX_H_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btMinMax.h b/dali-physics/third-party/bullet3/src/LinearMath/btMinMax.h
new file mode 100644
index 0000000..cdc54f3
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btMinMax.h
@@ -0,0 +1,69 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GEN_MINMAX_H
+#define BT_GEN_MINMAX_H
+
+#include "btScalar.h"
+
+template <class T>
+SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b)
+{
+	return a < b ? a : b;
+}
+
+template <class T>
+SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b)
+{
+	return a > b ? a : b;
+}
+
+template <class T>
+SIMD_FORCE_INLINE const T& btClamped(const T& a, const T& lb, const T& ub)
+{
+	return a < lb ? lb : (ub < a ? ub : a);
+}
+
+template <class T>
+SIMD_FORCE_INLINE void btSetMin(T& a, const T& b)
+{
+	if (b < a)
+	{
+		a = b;
+	}
+}
+
+template <class T>
+SIMD_FORCE_INLINE void btSetMax(T& a, const T& b)
+{
+	if (a < b)
+	{
+		a = b;
+	}
+}
+
+template <class T>
+SIMD_FORCE_INLINE void btClamp(T& a, const T& lb, const T& ub)
+{
+	if (a < lb)
+	{
+		a = lb;
+	}
+	else if (ub < a)
+	{
+		a = ub;
+	}
+}
+
+#endif  //BT_GEN_MINMAX_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btModifiedGramSchmidt.h b/dali-physics/third-party/bullet3/src/LinearMath/btModifiedGramSchmidt.h
new file mode 100644
index 0000000..33bab8d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btModifiedGramSchmidt.h
@@ -0,0 +1,83 @@
+//
+//  btModifiedGramSchmidt.h
+//  LinearMath
+//
+//  Created by Xuchen Han on 4/4/20.
+//
+
+#ifndef btModifiedGramSchmidt_h
+#define btModifiedGramSchmidt_h
+
+#include "btReducedVector.h"
+#include "btAlignedObjectArray.h"
+#include <iostream>
+#include <cmath>
+template<class TV>
+class btModifiedGramSchmidt
+{
+public:
+    btAlignedObjectArray<TV> m_in;
+    btAlignedObjectArray<TV> m_out;
+    
+    btModifiedGramSchmidt(const btAlignedObjectArray<TV>& vecs): m_in(vecs)
+    {
+        m_out.resize(0);
+    }
+    
+    void solve()
+    {
+        m_out.resize(m_in.size());
+        for (int i = 0; i < m_in.size(); ++i)
+        {
+//            printf("========= starting %d ==========\n", i);
+            TV v(m_in[i]);
+//            v.print();
+            for (int j = 0; j < i; ++j)
+            {
+                v = v - v.proj(m_out[j]);
+//                v.print();
+            }
+            v.normalize();
+            m_out[i] = v;
+//            v.print();
+        }
+    }
+    
+    void test()
+    {
+        std::cout << SIMD_EPSILON << std::endl;
+        printf("=======inputs=========\n");
+        for (int i = 0; i < m_out.size(); ++i)
+        {
+            m_in[i].print();
+        }
+        printf("=======output=========\n");
+        for (int i = 0; i < m_out.size(); ++i)
+        {
+            m_out[i].print();
+        }
+        btScalar eps = SIMD_EPSILON;
+        for (int i = 0; i < m_out.size(); ++i)
+        {
+            for (int j = 0; j < m_out.size(); ++j)
+            {
+                if (i == j)
+                {
+                    if (std::abs(1.0-m_out[i].dot(m_out[j])) > eps)// && std::abs(m_out[i].dot(m_out[j])) > eps)
+                    {
+                        printf("vec[%d] is not unit, norm squared = %f\n", i,m_out[i].dot(m_out[j]));
+                    }
+                }
+                else
+                {
+                    if (std::abs(m_out[i].dot(m_out[j])) > eps)
+                    {
+                        printf("vec[%d] and vec[%d] is not orthogonal, dot product = %f\n", i, j, m_out[i].dot(m_out[j]));
+                    }
+                }
+            }
+        }
+    }
+};
+template class btModifiedGramSchmidt<btReducedVector>;
+#endif /* btModifiedGramSchmidt_h */
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btMotionState.h b/dali-physics/third-party/bullet3/src/LinearMath/btMotionState.h
new file mode 100644
index 0000000..87aa602
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btMotionState.h
@@ -0,0 +1,36 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_MOTIONSTATE_H
+#define BT_MOTIONSTATE_H
+
+#include "btTransform.h"
+
+///The btMotionState interface class allows the dynamics world to synchronize and interpolate the updated world transforms with graphics
+///For optimizations, potentially only moving objects get synchronized (using setWorldPosition/setWorldOrientation)
+class btMotionState
+{
+public:
+	virtual ~btMotionState()
+	{
+	}
+
+	virtual void getWorldTransform(btTransform& worldTrans) const = 0;
+
+	//Bullet only calls the update of worldtransform for active objects
+	virtual void setWorldTransform(const btTransform& worldTrans) = 0;
+};
+
+#endif  //BT_MOTIONSTATE_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btPolarDecomposition.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btPolarDecomposition.cpp
new file mode 100644
index 0000000..d9c72a8
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btPolarDecomposition.cpp
@@ -0,0 +1,94 @@
+#include "btPolarDecomposition.h"
+#include "btMinMax.h"
+
+namespace
+{
+btScalar abs_column_sum(const btMatrix3x3& a, int i)
+{
+	return btFabs(a[0][i]) + btFabs(a[1][i]) + btFabs(a[2][i]);
+}
+
+btScalar abs_row_sum(const btMatrix3x3& a, int i)
+{
+	return btFabs(a[i][0]) + btFabs(a[i][1]) + btFabs(a[i][2]);
+}
+
+btScalar p1_norm(const btMatrix3x3& a)
+{
+	const btScalar sum0 = abs_column_sum(a, 0);
+	const btScalar sum1 = abs_column_sum(a, 1);
+	const btScalar sum2 = abs_column_sum(a, 2);
+	return btMax(btMax(sum0, sum1), sum2);
+}
+
+btScalar pinf_norm(const btMatrix3x3& a)
+{
+	const btScalar sum0 = abs_row_sum(a, 0);
+	const btScalar sum1 = abs_row_sum(a, 1);
+	const btScalar sum2 = abs_row_sum(a, 2);
+	return btMax(btMax(sum0, sum1), sum2);
+}
+}  // namespace
+
+btPolarDecomposition::btPolarDecomposition(btScalar tolerance, unsigned int maxIterations)
+	: m_tolerance(tolerance), m_maxIterations(maxIterations)
+{
+}
+
+unsigned int btPolarDecomposition::decompose(const btMatrix3x3& a, btMatrix3x3& u, btMatrix3x3& h) const
+{
+	// Use the 'u' and 'h' matrices for intermediate calculations
+	u = a;
+	h = a.inverse();
+
+	for (unsigned int i = 0; i < m_maxIterations; ++i)
+	{
+		const btScalar h_1 = p1_norm(h);
+		const btScalar h_inf = pinf_norm(h);
+		const btScalar u_1 = p1_norm(u);
+		const btScalar u_inf = pinf_norm(u);
+
+		const btScalar h_norm = h_1 * h_inf;
+		const btScalar u_norm = u_1 * u_inf;
+
+		// The matrix is effectively singular so we cannot invert it
+		if (btFuzzyZero(h_norm) || btFuzzyZero(u_norm))
+			break;
+
+		const btScalar gamma = btPow(h_norm / u_norm, 0.25f);
+		const btScalar inv_gamma = btScalar(1.0) / gamma;
+
+		// Determine the delta to 'u'
+		const btMatrix3x3 delta = (u * (gamma - btScalar(2.0)) + h.transpose() * inv_gamma) * btScalar(0.5);
+
+		// Update the matrices
+		u += delta;
+		h = u.inverse();
+
+		// Check for convergence
+		if (p1_norm(delta) <= m_tolerance * u_1)
+		{
+			h = u.transpose() * a;
+			h = (h + h.transpose()) * 0.5;
+			return i;
+		}
+	}
+
+	// The algorithm has failed to converge to the specified tolerance, but we
+	// want to make sure that the matrices returned are in the right form.
+	h = u.transpose() * a;
+	h = (h + h.transpose()) * 0.5;
+
+	return m_maxIterations;
+}
+
+unsigned int btPolarDecomposition::maxIterations() const
+{
+	return m_maxIterations;
+}
+
+unsigned int polarDecompose(const btMatrix3x3& a, btMatrix3x3& u, btMatrix3x3& h)
+{
+	static btPolarDecomposition polar;
+	return polar.decompose(a, u, h);
+}
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btPolarDecomposition.h b/dali-physics/third-party/bullet3/src/LinearMath/btPolarDecomposition.h
new file mode 100644
index 0000000..bf29140
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btPolarDecomposition.h
@@ -0,0 +1,69 @@
+#ifndef POLARDECOMPOSITION_H
+#define POLARDECOMPOSITION_H
+
+#include "btMatrix3x3.h"
+
+/**
+ * This class is used to compute the polar decomposition of a matrix. In
+ * general, the polar decomposition factorizes a matrix, A, into two parts: a
+ * unitary matrix (U) and a positive, semi-definite Hermitian matrix (H).
+ * However, in this particular implementation the original matrix, A, is
+ * required to be a square 3x3 matrix with real elements. This means that U will
+ * be an orthogonal matrix and H with be a positive-definite, symmetric matrix.
+ */
+class btPolarDecomposition
+{
+public:
+	/**
+     * Creates an instance with optional parameters.
+     *
+     * @param tolerance     - the tolerance used to determine convergence of the
+     *                        algorithm
+     * @param maxIterations - the maximum number of iterations used to achieve
+     *                        convergence
+     */
+	btPolarDecomposition(btScalar tolerance = btScalar(0.0001),
+						 unsigned int maxIterations = 16);
+
+	/**
+     * Decomposes a matrix into orthogonal and symmetric, positive-definite
+     * parts. If the number of iterations returned by this function is equal to
+     * the maximum number of iterations, the algorithm has failed to converge.
+     *
+     * @param a - the original matrix
+     * @param u - the resulting orthogonal matrix
+     * @param h - the resulting symmetric matrix
+     *
+     * @return the number of iterations performed by the algorithm.
+     */
+	unsigned int decompose(const btMatrix3x3& a, btMatrix3x3& u, btMatrix3x3& h) const;
+
+	/**
+     * Returns the maximum number of iterations that this algorithm will perform
+     * to achieve convergence.
+     *
+     * @return maximum number of iterations
+     */
+	unsigned int maxIterations() const;
+
+private:
+	btScalar m_tolerance;
+	unsigned int m_maxIterations;
+};
+
+/**
+ * This functions decomposes the matrix 'a' into two parts: an orthogonal matrix
+ * 'u' and a symmetric, positive-definite matrix 'h'. If the number of
+ * iterations returned by this function is equal to
+ * btPolarDecomposition::DEFAULT_MAX_ITERATIONS, the algorithm has failed to
+ * converge.
+ *
+ * @param a - the original matrix
+ * @param u - the resulting orthogonal matrix
+ * @param h - the resulting symmetric matrix
+ *
+ * @return the number of iterations performed by the algorithm.
+ */
+unsigned int polarDecompose(const btMatrix3x3& a, btMatrix3x3& u, btMatrix3x3& h);
+
+#endif  // POLARDECOMPOSITION_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btPoolAllocator.h b/dali-physics/third-party/bullet3/src/LinearMath/btPoolAllocator.h
new file mode 100644
index 0000000..816cd62
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btPoolAllocator.h
@@ -0,0 +1,130 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _BT_POOL_ALLOCATOR_H
+#define _BT_POOL_ALLOCATOR_H
+
+#include "btScalar.h"
+#include "btAlignedAllocator.h"
+#include "btThreads.h"
+
+///The btPoolAllocator class allows to efficiently allocate a large pool of objects, instead of dynamically allocating them separately.
+class btPoolAllocator
+{
+	int m_elemSize;
+	int m_maxElements;
+	int m_freeCount;
+	void* m_firstFree;
+	unsigned char* m_pool;
+	btSpinMutex m_mutex;  // only used if BT_THREADSAFE
+
+public:
+	btPoolAllocator(int elemSize, int maxElements)
+		: m_elemSize(elemSize),
+		  m_maxElements(maxElements)
+	{
+		m_pool = (unsigned char*)btAlignedAlloc(static_cast<unsigned int>(m_elemSize * m_maxElements), 16);
+
+		unsigned char* p = m_pool;
+		m_firstFree = p;
+		m_freeCount = m_maxElements;
+		int count = m_maxElements;
+		while (--count)
+		{
+			*(void**)p = (p + m_elemSize);
+			p += m_elemSize;
+		}
+		*(void**)p = 0;
+	}
+
+	~btPoolAllocator()
+	{
+		btAlignedFree(m_pool);
+	}
+
+	int getFreeCount() const
+	{
+		return m_freeCount;
+	}
+
+	int getUsedCount() const
+	{
+		return m_maxElements - m_freeCount;
+	}
+
+	int getMaxCount() const
+	{
+		return m_maxElements;
+	}
+
+	void* allocate(int size)
+	{
+		// release mode fix
+		(void)size;
+		btMutexLock(&m_mutex);
+		btAssert(!size || size <= m_elemSize);
+		//btAssert(m_freeCount>0);  // should return null if all full
+		void* result = m_firstFree;
+		if (NULL != m_firstFree)
+		{
+			m_firstFree = *(void**)m_firstFree;
+			--m_freeCount;
+		}
+		btMutexUnlock(&m_mutex);
+		return result;
+	}
+
+	bool validPtr(void* ptr)
+	{
+		if (ptr)
+		{
+			if (((unsigned char*)ptr >= m_pool && (unsigned char*)ptr < m_pool + m_maxElements * m_elemSize))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	void freeMemory(void* ptr)
+	{
+		if (ptr)
+		{
+			btAssert((unsigned char*)ptr >= m_pool && (unsigned char*)ptr < m_pool + m_maxElements * m_elemSize);
+
+			btMutexLock(&m_mutex);
+			*(void**)ptr = m_firstFree;
+			m_firstFree = ptr;
+			++m_freeCount;
+			btMutexUnlock(&m_mutex);
+		}
+	}
+
+	int getElementSize() const
+	{
+		return m_elemSize;
+	}
+
+	unsigned char* getPoolAddress()
+	{
+		return m_pool;
+	}
+
+	const unsigned char* getPoolAddress() const
+	{
+		return m_pool;
+	}
+};
+
+#endif  //_BT_POOL_ALLOCATOR_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btQuadWord.h b/dali-physics/third-party/bullet3/src/LinearMath/btQuadWord.h
new file mode 100644
index 0000000..851596b
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btQuadWord.h
@@ -0,0 +1,238 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMD_QUADWORD_H
+#define BT_SIMD_QUADWORD_H
+
+#include "btScalar.h"
+#include "btMinMax.h"
+
+#if defined(__CELLOS_LV2) && defined(__SPU__)
+#include <altivec.h>
+#endif
+
+/**@brief The btQuadWord class is base class for btVector3 and btQuaternion. 
+ * Some issues under PS3 Linux with IBM 2.1 SDK, gcc compiler prevent from using aligned quadword.
+ */
+#ifndef USE_LIBSPE2
+ATTRIBUTE_ALIGNED16(class)
+btQuadWord
+#else
+class btQuadWord
+#endif
+{
+protected:
+#if defined(__SPU__) && defined(__CELLOS_LV2__)
+	union {
+		vec_float4 mVec128;
+		btScalar m_floats[4];
+	};
+
+public:
+	vec_float4 get128() const
+	{
+		return mVec128;
+	}
+
+protected:
+#else  //__CELLOS_LV2__ __SPU__
+
+#if defined(BT_USE_SSE) || defined(BT_USE_NEON)
+	union {
+		btSimdFloat4 mVec128;
+		btScalar m_floats[4];
+	};
+
+public:
+	SIMD_FORCE_INLINE btSimdFloat4 get128() const
+	{
+		return mVec128;
+	}
+	SIMD_FORCE_INLINE void set128(btSimdFloat4 v128)
+	{
+		mVec128 = v128;
+	}
+#else
+	btScalar m_floats[4];
+#endif  // BT_USE_SSE
+
+#endif  //__CELLOS_LV2__ __SPU__
+
+public:
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+
+	// Set Vector
+	SIMD_FORCE_INLINE btQuadWord(const btSimdFloat4 vec)
+	{
+		mVec128 = vec;
+	}
+
+	// Copy constructor
+	SIMD_FORCE_INLINE btQuadWord(const btQuadWord& rhs)
+	{
+		mVec128 = rhs.mVec128;
+	}
+
+	// Assignment Operator
+	SIMD_FORCE_INLINE btQuadWord&
+	operator=(const btQuadWord& v)
+	{
+		mVec128 = v.mVec128;
+
+		return *this;
+	}
+
+#endif
+
+	/**@brief Return the x value */
+	SIMD_FORCE_INLINE const btScalar& getX() const { return m_floats[0]; }
+	/**@brief Return the y value */
+	SIMD_FORCE_INLINE const btScalar& getY() const { return m_floats[1]; }
+	/**@brief Return the z value */
+	SIMD_FORCE_INLINE const btScalar& getZ() const { return m_floats[2]; }
+	/**@brief Set the x value */
+	SIMD_FORCE_INLINE void setX(btScalar _x) { m_floats[0] = _x; };
+	/**@brief Set the y value */
+	SIMD_FORCE_INLINE void setY(btScalar _y) { m_floats[1] = _y; };
+	/**@brief Set the z value */
+	SIMD_FORCE_INLINE void setZ(btScalar _z) { m_floats[2] = _z; };
+	/**@brief Set the w value */
+	SIMD_FORCE_INLINE void setW(btScalar _w) { m_floats[3] = _w; };
+	/**@brief Return the x value */
+	SIMD_FORCE_INLINE const btScalar& x() const { return m_floats[0]; }
+	/**@brief Return the y value */
+	SIMD_FORCE_INLINE const btScalar& y() const { return m_floats[1]; }
+	/**@brief Return the z value */
+	SIMD_FORCE_INLINE const btScalar& z() const { return m_floats[2]; }
+	/**@brief Return the w value */
+	SIMD_FORCE_INLINE const btScalar& w() const { return m_floats[3]; }
+
+	//SIMD_FORCE_INLINE btScalar&       operator[](int i)       { return (&m_floats[0])[i];	}
+	//SIMD_FORCE_INLINE const btScalar& operator[](int i) const { return (&m_floats[0])[i]; }
+	///operator btScalar*() replaces operator[], using implicit conversion. We added operator != and operator == to avoid pointer comparisons.
+	SIMD_FORCE_INLINE operator btScalar*() { return &m_floats[0]; }
+	SIMD_FORCE_INLINE operator const btScalar*() const { return &m_floats[0]; }
+
+	SIMD_FORCE_INLINE bool operator==(const btQuadWord& other) const
+	{
+#ifdef BT_USE_SSE
+		return (0xf == _mm_movemask_ps((__m128)_mm_cmpeq_ps(mVec128, other.mVec128)));
+#else
+		return ((m_floats[3] == other.m_floats[3]) &&
+				(m_floats[2] == other.m_floats[2]) &&
+				(m_floats[1] == other.m_floats[1]) &&
+				(m_floats[0] == other.m_floats[0]));
+#endif
+	}
+
+	SIMD_FORCE_INLINE bool operator!=(const btQuadWord& other) const
+	{
+		return !(*this == other);
+	}
+
+	/**@brief Set x,y,z and zero w 
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   */
+	SIMD_FORCE_INLINE void setValue(const btScalar& _x, const btScalar& _y, const btScalar& _z)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = 0.f;
+	}
+
+	/*		void getValue(btScalar *m) const 
+		{
+			m[0] = m_floats[0];
+			m[1] = m_floats[1];
+			m[2] = m_floats[2];
+		}
+*/
+	/**@brief Set the values 
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   * @param w Value of w
+   */
+	SIMD_FORCE_INLINE void setValue(const btScalar& _x, const btScalar& _y, const btScalar& _z, const btScalar& _w)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = _w;
+	}
+	/**@brief No initialization constructor */
+	SIMD_FORCE_INLINE btQuadWord()
+	//	:m_floats[0](btScalar(0.)),m_floats[1](btScalar(0.)),m_floats[2](btScalar(0.)),m_floats[3](btScalar(0.))
+	{
+	}
+
+	/**@brief Three argument constructor (zeros w)
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   */
+	SIMD_FORCE_INLINE btQuadWord(const btScalar& _x, const btScalar& _y, const btScalar& _z)
+	{
+		m_floats[0] = _x, m_floats[1] = _y, m_floats[2] = _z, m_floats[3] = 0.0f;
+	}
+
+	/**@brief Initializing constructor
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   * @param w Value of w
+   */
+	SIMD_FORCE_INLINE btQuadWord(const btScalar& _x, const btScalar& _y, const btScalar& _z, const btScalar& _w)
+	{
+		m_floats[0] = _x, m_floats[1] = _y, m_floats[2] = _z, m_floats[3] = _w;
+	}
+
+	/**@brief Set each element to the max of the current values and the values of another btQuadWord
+   * @param other The other btQuadWord to compare with 
+   */
+	SIMD_FORCE_INLINE void setMax(const btQuadWord& other)
+	{
+#ifdef BT_USE_SSE
+		mVec128 = _mm_max_ps(mVec128, other.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vmaxq_f32(mVec128, other.mVec128);
+#else
+		btSetMax(m_floats[0], other.m_floats[0]);
+		btSetMax(m_floats[1], other.m_floats[1]);
+		btSetMax(m_floats[2], other.m_floats[2]);
+		btSetMax(m_floats[3], other.m_floats[3]);
+#endif
+	}
+	/**@brief Set each element to the min of the current values and the values of another btQuadWord
+   * @param other The other btQuadWord to compare with 
+   */
+	SIMD_FORCE_INLINE void setMin(const btQuadWord& other)
+	{
+#ifdef BT_USE_SSE
+		mVec128 = _mm_min_ps(mVec128, other.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vminq_f32(mVec128, other.mVec128);
+#else
+		btSetMin(m_floats[0], other.m_floats[0]);
+		btSetMin(m_floats[1], other.m_floats[1]);
+		btSetMin(m_floats[2], other.m_floats[2]);
+		btSetMin(m_floats[3], other.m_floats[3]);
+#endif
+	}
+};
+
+#endif  //BT_SIMD_QUADWORD_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btQuaternion.h b/dali-physics/third-party/bullet3/src/LinearMath/btQuaternion.h
new file mode 100644
index 0000000..40d6e14
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btQuaternion.h
@@ -0,0 +1,1021 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SIMD__QUATERNION_H_
+#define BT_SIMD__QUATERNION_H_
+
+#include "btVector3.h"
+#include "btQuadWord.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btQuaternionData btQuaternionDoubleData
+#define btQuaternionDataName "btQuaternionDoubleData"
+#else
+#define btQuaternionData btQuaternionFloatData
+#define btQuaternionDataName "btQuaternionFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+#ifdef BT_USE_SSE
+
+//const __m128 ATTRIBUTE_ALIGNED16(vOnes) = {1.0f, 1.0f, 1.0f, 1.0f};
+#define vOnes (_mm_set_ps(1.0f, 1.0f, 1.0f, 1.0f))
+
+#endif
+
+#if defined(BT_USE_SSE)
+
+#define vQInv (_mm_set_ps(+0.0f, -0.0f, -0.0f, -0.0f))
+#define vPPPM (_mm_set_ps(-0.0f, +0.0f, +0.0f, +0.0f))
+
+#elif defined(BT_USE_NEON)
+
+const btSimdFloat4 ATTRIBUTE_ALIGNED16(vQInv) = {-0.0f, -0.0f, -0.0f, +0.0f};
+const btSimdFloat4 ATTRIBUTE_ALIGNED16(vPPPM) = {+0.0f, +0.0f, +0.0f, -0.0f};
+
+#endif
+
+/**@brief The btQuaternion implements quaternion to perform linear algebra rotations in combination with btMatrix3x3, btVector3 and btTransform. */
+class btQuaternion : public btQuadWord
+{
+public:
+	/**@brief No initialization constructor */
+	btQuaternion() {}
+
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	// Set Vector
+	SIMD_FORCE_INLINE btQuaternion(const btSimdFloat4 vec)
+	{
+		mVec128 = vec;
+	}
+
+	// Copy constructor
+	SIMD_FORCE_INLINE btQuaternion(const btQuaternion& rhs)
+	{
+		mVec128 = rhs.mVec128;
+	}
+
+	// Assignment Operator
+	SIMD_FORCE_INLINE btQuaternion&
+	operator=(const btQuaternion& v)
+	{
+		mVec128 = v.mVec128;
+
+		return *this;
+	}
+
+#endif
+
+	//		template <typename btScalar>
+	//		explicit Quaternion(const btScalar *v) : Tuple4<btScalar>(v) {}
+	/**@brief Constructor from scalars */
+	btQuaternion(const btScalar& _x, const btScalar& _y, const btScalar& _z, const btScalar& _w)
+		: btQuadWord(_x, _y, _z, _w)
+	{
+	}
+	/**@brief Axis angle Constructor
+   * @param axis The axis which the rotation is around
+   * @param angle The magnitude of the rotation around the angle (Radians) */
+	btQuaternion(const btVector3& _axis, const btScalar& _angle)
+	{
+		setRotation(_axis, _angle);
+	}
+	/**@brief Constructor from Euler angles
+   * @param yaw Angle around Y unless BT_EULER_DEFAULT_ZYX defined then Z
+   * @param pitch Angle around X unless BT_EULER_DEFAULT_ZYX defined then Y
+   * @param roll Angle around Z unless BT_EULER_DEFAULT_ZYX defined then X */
+	btQuaternion(const btScalar& yaw, const btScalar& pitch, const btScalar& roll)
+	{
+#ifndef BT_EULER_DEFAULT_ZYX
+		setEuler(yaw, pitch, roll);
+#else
+		setEulerZYX(yaw, pitch, roll);
+#endif
+	}
+	/**@brief Set the rotation using axis angle notation 
+   * @param axis The axis around which to rotate
+   * @param angle The magnitude of the rotation in Radians */
+	void setRotation(const btVector3& axis, const btScalar& _angle)
+	{
+		btScalar d = axis.length();
+		btAssert(d != btScalar(0.0));
+		btScalar s = btSin(_angle * btScalar(0.5)) / d;
+		setValue(axis.x() * s, axis.y() * s, axis.z() * s,
+				 btCos(_angle * btScalar(0.5)));
+	}
+	/**@brief Set the quaternion using Euler angles
+   * @param yaw Angle around Y
+   * @param pitch Angle around X
+   * @param roll Angle around Z */
+	void setEuler(const btScalar& yaw, const btScalar& pitch, const btScalar& roll)
+	{
+		btScalar halfYaw = btScalar(yaw) * btScalar(0.5);
+		btScalar halfPitch = btScalar(pitch) * btScalar(0.5);
+		btScalar halfRoll = btScalar(roll) * btScalar(0.5);
+		btScalar cosYaw = btCos(halfYaw);
+		btScalar sinYaw = btSin(halfYaw);
+		btScalar cosPitch = btCos(halfPitch);
+		btScalar sinPitch = btSin(halfPitch);
+		btScalar cosRoll = btCos(halfRoll);
+		btScalar sinRoll = btSin(halfRoll);
+		setValue(cosRoll * sinPitch * cosYaw + sinRoll * cosPitch * sinYaw,
+				 cosRoll * cosPitch * sinYaw - sinRoll * sinPitch * cosYaw,
+				 sinRoll * cosPitch * cosYaw - cosRoll * sinPitch * sinYaw,
+				 cosRoll * cosPitch * cosYaw + sinRoll * sinPitch * sinYaw);
+	}
+	/**@brief Set the quaternion using euler angles 
+   * @param yaw Angle around Z
+   * @param pitch Angle around Y
+   * @param roll Angle around X */
+	void setEulerZYX(const btScalar& yawZ, const btScalar& pitchY, const btScalar& rollX)
+	{
+		btScalar halfYaw = btScalar(yawZ) * btScalar(0.5);
+		btScalar halfPitch = btScalar(pitchY) * btScalar(0.5);
+		btScalar halfRoll = btScalar(rollX) * btScalar(0.5);
+		btScalar cosYaw = btCos(halfYaw);
+		btScalar sinYaw = btSin(halfYaw);
+		btScalar cosPitch = btCos(halfPitch);
+		btScalar sinPitch = btSin(halfPitch);
+		btScalar cosRoll = btCos(halfRoll);
+		btScalar sinRoll = btSin(halfRoll);
+		setValue(sinRoll * cosPitch * cosYaw - cosRoll * sinPitch * sinYaw,   //x
+				 cosRoll * sinPitch * cosYaw + sinRoll * cosPitch * sinYaw,   //y
+				 cosRoll * cosPitch * sinYaw - sinRoll * sinPitch * cosYaw,   //z
+				 cosRoll * cosPitch * cosYaw + sinRoll * sinPitch * sinYaw);  //formerly yzx
+	}
+
+	/**@brief Get the euler angles from this quaternion
+	   * @param yaw Angle around Z
+	   * @param pitch Angle around Y
+	   * @param roll Angle around X */
+	void getEulerZYX(btScalar& yawZ, btScalar& pitchY, btScalar& rollX) const
+	{
+		btScalar squ;
+		btScalar sqx;
+		btScalar sqy;
+		btScalar sqz;
+		btScalar sarg;
+		sqx = m_floats[0] * m_floats[0];
+		sqy = m_floats[1] * m_floats[1];
+		sqz = m_floats[2] * m_floats[2];
+		squ = m_floats[3] * m_floats[3];
+		sarg = btScalar(-2.) * (m_floats[0] * m_floats[2] - m_floats[3] * m_floats[1]);
+
+		// If the pitch angle is PI/2 or -PI/2, we can only compute
+		// the sum roll + yaw.  However, any combination that gives
+		// the right sum will produce the correct orientation, so we
+		// set rollX = 0 and compute yawZ.
+		if (sarg <= -btScalar(0.99999))
+		{
+			pitchY = btScalar(-0.5) * SIMD_PI;
+			rollX = 0;
+			yawZ = btScalar(2) * btAtan2(m_floats[0], -m_floats[1]);
+		}
+		else if (sarg >= btScalar(0.99999))
+		{
+			pitchY = btScalar(0.5) * SIMD_PI;
+			rollX = 0;
+			yawZ = btScalar(2) * btAtan2(-m_floats[0], m_floats[1]);
+		}
+		else
+		{
+			pitchY = btAsin(sarg);
+			rollX = btAtan2(2 * (m_floats[1] * m_floats[2] + m_floats[3] * m_floats[0]), squ - sqx - sqy + sqz);
+			yawZ = btAtan2(2 * (m_floats[0] * m_floats[1] + m_floats[3] * m_floats[2]), squ + sqx - sqy - sqz);
+		}
+	}
+
+	/**@brief Add two quaternions
+   * @param q The quaternion to add to this one */
+	SIMD_FORCE_INLINE btQuaternion& operator+=(const btQuaternion& q)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = _mm_add_ps(mVec128, q.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vaddq_f32(mVec128, q.mVec128);
+#else
+		m_floats[0] += q.x();
+		m_floats[1] += q.y();
+		m_floats[2] += q.z();
+		m_floats[3] += q.m_floats[3];
+#endif
+		return *this;
+	}
+
+	/**@brief Subtract out a quaternion
+   * @param q The quaternion to subtract from this one */
+	btQuaternion& operator-=(const btQuaternion& q)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = _mm_sub_ps(mVec128, q.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vsubq_f32(mVec128, q.mVec128);
+#else
+		m_floats[0] -= q.x();
+		m_floats[1] -= q.y();
+		m_floats[2] -= q.z();
+		m_floats[3] -= q.m_floats[3];
+#endif
+		return *this;
+	}
+
+	/**@brief Scale this quaternion
+   * @param s The scalar to scale by */
+	btQuaternion& operator*=(const btScalar& s)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = bt_pshufd_ps(vs, 0);     //	(S S S S)
+		mVec128 = _mm_mul_ps(mVec128, vs);
+#elif defined(BT_USE_NEON)
+		mVec128 = vmulq_n_f32(mVec128, s);
+#else
+		m_floats[0] *= s;
+		m_floats[1] *= s;
+		m_floats[2] *= s;
+		m_floats[3] *= s;
+#endif
+		return *this;
+	}
+
+	/**@brief Multiply this quaternion by q on the right
+   * @param q The other quaternion 
+   * Equivilant to this = this * q */
+	btQuaternion& operator*=(const btQuaternion& q)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vQ2 = q.get128();
+
+		__m128 A1 = bt_pshufd_ps(mVec128, BT_SHUFFLE(0, 1, 2, 0));
+		__m128 B1 = bt_pshufd_ps(vQ2, BT_SHUFFLE(3, 3, 3, 0));
+
+		A1 = A1 * B1;
+
+		__m128 A2 = bt_pshufd_ps(mVec128, BT_SHUFFLE(1, 2, 0, 1));
+		__m128 B2 = bt_pshufd_ps(vQ2, BT_SHUFFLE(2, 0, 1, 1));
+
+		A2 = A2 * B2;
+
+		B1 = bt_pshufd_ps(mVec128, BT_SHUFFLE(2, 0, 1, 2));
+		B2 = bt_pshufd_ps(vQ2, BT_SHUFFLE(1, 2, 0, 2));
+
+		B1 = B1 * B2;  //	A3 *= B3
+
+		mVec128 = bt_splat_ps(mVec128, 3);  //	A0
+		mVec128 = mVec128 * vQ2;            //	A0 * B0
+
+		A1 = A1 + A2;                //	AB12
+		mVec128 = mVec128 - B1;      //	AB03 = AB0 - AB3
+		A1 = _mm_xor_ps(A1, vPPPM);  //	change sign of the last element
+		mVec128 = mVec128 + A1;      //	AB03 + AB12
+
+#elif defined(BT_USE_NEON)
+
+		float32x4_t vQ1 = mVec128;
+		float32x4_t vQ2 = q.get128();
+		float32x4_t A0, A1, B1, A2, B2, A3, B3;
+		float32x2_t vQ1zx, vQ2wx, vQ1yz, vQ2zx, vQ2yz, vQ2xz;
+
+		{
+			float32x2x2_t tmp;
+			tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+			vQ1zx = tmp.val[0];
+
+			tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+			vQ2zx = tmp.val[0];
+		}
+		vQ2wx = vext_f32(vget_high_f32(vQ2), vget_low_f32(vQ2), 1);
+
+		vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+		vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+		vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+		A1 = vcombine_f32(vget_low_f32(vQ1), vQ1zx);                     // X Y  z x
+		B1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ2), 1), vQ2wx);  // W W  W X
+
+		A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+		B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+		A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+		B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+		A1 = vmulq_f32(A1, B1);
+		A2 = vmulq_f32(A2, B2);
+		A3 = vmulq_f32(A3, B3);                           //	A3 *= B3
+		A0 = vmulq_lane_f32(vQ2, vget_high_f32(vQ1), 1);  //	A0 * B0
+
+		A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+		A0 = vsubq_f32(A0, A3);  //	AB03 = AB0 - AB3
+
+		//	change the sign of the last element
+		A1 = (btSimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)vPPPM);
+		A0 = vaddq_f32(A0, A1);  //	AB03 + AB12
+
+		mVec128 = A0;
+#else
+		setValue(
+			m_floats[3] * q.x() + m_floats[0] * q.m_floats[3] + m_floats[1] * q.z() - m_floats[2] * q.y(),
+			m_floats[3] * q.y() + m_floats[1] * q.m_floats[3] + m_floats[2] * q.x() - m_floats[0] * q.z(),
+			m_floats[3] * q.z() + m_floats[2] * q.m_floats[3] + m_floats[0] * q.y() - m_floats[1] * q.x(),
+			m_floats[3] * q.m_floats[3] - m_floats[0] * q.x() - m_floats[1] * q.y() - m_floats[2] * q.z());
+#endif
+		return *this;
+	}
+	/**@brief Return the dot product between this quaternion and another
+   * @param q The other quaternion */
+	btScalar dot(const btQuaternion& q) const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vd;
+
+		vd = _mm_mul_ps(mVec128, q.mVec128);
+
+		__m128 t = _mm_movehl_ps(vd, vd);
+		vd = _mm_add_ps(vd, t);
+		t = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, t);
+
+		return _mm_cvtss_f32(vd);
+#elif defined(BT_USE_NEON)
+		float32x4_t vd = vmulq_f32(mVec128, q.mVec128);
+		float32x2_t x = vpadd_f32(vget_low_f32(vd), vget_high_f32(vd));
+		x = vpadd_f32(x, x);
+		return vget_lane_f32(x, 0);
+#else
+		return m_floats[0] * q.x() +
+			   m_floats[1] * q.y() +
+			   m_floats[2] * q.z() +
+			   m_floats[3] * q.m_floats[3];
+#endif
+	}
+
+	/**@brief Return the length squared of the quaternion */
+	btScalar length2() const
+	{
+		return dot(*this);
+	}
+
+	/**@brief Return the length of the quaternion */
+	btScalar length() const
+	{
+		return btSqrt(length2());
+	}
+	btQuaternion& safeNormalize()
+	{
+		btScalar l2 = length2();
+		if (l2 > SIMD_EPSILON)
+		{
+			normalize();
+		}
+		return *this;
+	}
+	/**@brief Normalize the quaternion 
+   * Such that x^2 + y^2 + z^2 +w^2 = 1 */
+	btQuaternion& normalize()
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vd;
+
+		vd = _mm_mul_ps(mVec128, mVec128);
+
+		__m128 t = _mm_movehl_ps(vd, vd);
+		vd = _mm_add_ps(vd, t);
+		t = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, t);
+
+		vd = _mm_sqrt_ss(vd);
+		vd = _mm_div_ss(vOnes, vd);
+		vd = bt_pshufd_ps(vd, 0);  // splat
+		mVec128 = _mm_mul_ps(mVec128, vd);
+
+		return *this;
+#else
+		return *this /= length();
+#endif
+	}
+
+	/**@brief Return a scaled version of this quaternion
+   * @param s The scale factor */
+	SIMD_FORCE_INLINE btQuaternion
+	operator*(const btScalar& s) const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = bt_pshufd_ps(vs, 0x00);  //	(S S S S)
+
+		return btQuaternion(_mm_mul_ps(mVec128, vs));
+#elif defined(BT_USE_NEON)
+		return btQuaternion(vmulq_n_f32(mVec128, s));
+#else
+		return btQuaternion(x() * s, y() * s, z() * s, m_floats[3] * s);
+#endif
+	}
+
+	/**@brief Return an inversely scaled versionof this quaternion
+   * @param s The inverse scale factor */
+	btQuaternion operator/(const btScalar& s) const
+	{
+		btAssert(s != btScalar(0.0));
+		return *this * (btScalar(1.0) / s);
+	}
+
+	/**@brief Inversely scale this quaternion
+   * @param s The scale factor */
+	btQuaternion& operator/=(const btScalar& s)
+	{
+		btAssert(s != btScalar(0.0));
+		return *this *= btScalar(1.0) / s;
+	}
+
+	/**@brief Return a normalized version of this quaternion */
+	btQuaternion normalized() const
+	{
+		return *this / length();
+	}
+	/**@brief Return the ***half*** angle between this quaternion and the other
+   * @param q The other quaternion */
+	btScalar angle(const btQuaternion& q) const
+	{
+		btScalar s = btSqrt(length2() * q.length2());
+		btAssert(s != btScalar(0.0));
+		return btAcos(dot(q) / s);
+	}
+
+	/**@brief Return the angle between this quaternion and the other along the shortest path
+	* @param q The other quaternion */
+	btScalar angleShortestPath(const btQuaternion& q) const
+	{
+		btScalar s = btSqrt(length2() * q.length2());
+		btAssert(s != btScalar(0.0));
+		if (dot(q) < 0)  // Take care of long angle case see http://en.wikipedia.org/wiki/Slerp
+			return btAcos(dot(-q) / s) * btScalar(2.0);
+		else
+			return btAcos(dot(q) / s) * btScalar(2.0);
+	}
+
+	/**@brief Return the angle [0, 2Pi] of rotation represented by this quaternion */
+	btScalar getAngle() const
+	{
+		btScalar s = btScalar(2.) * btAcos(m_floats[3]);
+		return s;
+	}
+
+	/**@brief Return the angle [0, Pi] of rotation represented by this quaternion along the shortest path */
+	btScalar getAngleShortestPath() const
+	{
+		btScalar s;
+		if (m_floats[3] >= 0)
+			s = btScalar(2.) * btAcos(m_floats[3]);
+		else
+			s = btScalar(2.) * btAcos(-m_floats[3]);
+		return s;
+	}
+
+	/**@brief Return the axis of the rotation represented by this quaternion */
+	btVector3 getAxis() const
+	{
+		btScalar s_squared = 1.f - m_floats[3] * m_floats[3];
+
+		if (s_squared < btScalar(10.) * SIMD_EPSILON)  //Check for divide by zero
+			return btVector3(1.0, 0.0, 0.0);           // Arbitrary
+		btScalar s = 1.f / btSqrt(s_squared);
+		return btVector3(m_floats[0] * s, m_floats[1] * s, m_floats[2] * s);
+	}
+
+	/**@brief Return the inverse of this quaternion */
+	btQuaternion inverse() const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		return btQuaternion(_mm_xor_ps(mVec128, vQInv));
+#elif defined(BT_USE_NEON)
+		return btQuaternion((btSimdFloat4)veorq_s32((int32x4_t)mVec128, (int32x4_t)vQInv));
+#else
+		return btQuaternion(-m_floats[0], -m_floats[1], -m_floats[2], m_floats[3]);
+#endif
+	}
+
+	/**@brief Return the sum of this quaternion and the other 
+   * @param q2 The other quaternion */
+	SIMD_FORCE_INLINE btQuaternion
+	operator+(const btQuaternion& q2) const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		return btQuaternion(_mm_add_ps(mVec128, q2.mVec128));
+#elif defined(BT_USE_NEON)
+		return btQuaternion(vaddq_f32(mVec128, q2.mVec128));
+#else
+		const btQuaternion& q1 = *this;
+		return btQuaternion(q1.x() + q2.x(), q1.y() + q2.y(), q1.z() + q2.z(), q1.m_floats[3] + q2.m_floats[3]);
+#endif
+	}
+
+	/**@brief Return the difference between this quaternion and the other 
+   * @param q2 The other quaternion */
+	SIMD_FORCE_INLINE btQuaternion
+	operator-(const btQuaternion& q2) const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		return btQuaternion(_mm_sub_ps(mVec128, q2.mVec128));
+#elif defined(BT_USE_NEON)
+		return btQuaternion(vsubq_f32(mVec128, q2.mVec128));
+#else
+		const btQuaternion& q1 = *this;
+		return btQuaternion(q1.x() - q2.x(), q1.y() - q2.y(), q1.z() - q2.z(), q1.m_floats[3] - q2.m_floats[3]);
+#endif
+	}
+
+	/**@brief Return the negative of this quaternion 
+   * This simply negates each element */
+	SIMD_FORCE_INLINE btQuaternion operator-() const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		return btQuaternion(_mm_xor_ps(mVec128, btvMzeroMask));
+#elif defined(BT_USE_NEON)
+		return btQuaternion((btSimdFloat4)veorq_s32((int32x4_t)mVec128, (int32x4_t)btvMzeroMask));
+#else
+		const btQuaternion& q2 = *this;
+		return btQuaternion(-q2.x(), -q2.y(), -q2.z(), -q2.m_floats[3]);
+#endif
+	}
+	/**@todo document this and it's use */
+	SIMD_FORCE_INLINE btQuaternion farthest(const btQuaternion& qd) const
+	{
+		btQuaternion diff, sum;
+		diff = *this - qd;
+		sum = *this + qd;
+		if (diff.dot(diff) > sum.dot(sum))
+			return qd;
+		return (-qd);
+	}
+
+	/**@todo document this and it's use */
+	SIMD_FORCE_INLINE btQuaternion nearest(const btQuaternion& qd) const
+	{
+		btQuaternion diff, sum;
+		diff = *this - qd;
+		sum = *this + qd;
+		if (diff.dot(diff) < sum.dot(sum))
+			return qd;
+		return (-qd);
+	}
+
+	/**@brief Return the quaternion which is the result of Spherical Linear Interpolation between this and the other quaternion
+   * @param q The other quaternion to interpolate with 
+   * @param t The ratio between this and q to interpolate.  If t = 0 the result is this, if t=1 the result is q.
+   * Slerp interpolates assuming constant velocity.  */
+	btQuaternion slerp(const btQuaternion& q, const btScalar& t) const
+	{
+		const btScalar magnitude = btSqrt(length2() * q.length2());
+		btAssert(magnitude > btScalar(0));
+
+		const btScalar product = dot(q) / magnitude;
+		const btScalar absproduct = btFabs(product);
+
+		if (absproduct < btScalar(1.0 - SIMD_EPSILON))
+		{
+			// Take care of long angle case see http://en.wikipedia.org/wiki/Slerp
+			const btScalar theta = btAcos(absproduct);
+			const btScalar d = btSin(theta);
+			btAssert(d > btScalar(0));
+
+			const btScalar sign = (product < 0) ? btScalar(-1) : btScalar(1);
+			const btScalar s0 = btSin((btScalar(1.0) - t) * theta) / d;
+			const btScalar s1 = btSin(sign * t * theta) / d;
+
+			return btQuaternion(
+				(m_floats[0] * s0 + q.x() * s1),
+				(m_floats[1] * s0 + q.y() * s1),
+				(m_floats[2] * s0 + q.z() * s1),
+				(m_floats[3] * s0 + q.w() * s1));
+		}
+		else
+		{
+			return *this;
+		}
+	}
+
+	static const btQuaternion& getIdentity()
+	{
+		static const btQuaternion identityQuat(btScalar(0.), btScalar(0.), btScalar(0.), btScalar(1.));
+		return identityQuat;
+	}
+
+	SIMD_FORCE_INLINE const btScalar& getW() const { return m_floats[3]; }
+
+	SIMD_FORCE_INLINE void serialize(struct btQuaternionData& dataOut) const;
+
+	SIMD_FORCE_INLINE void deSerialize(const struct btQuaternionFloatData& dataIn);
+
+	SIMD_FORCE_INLINE void deSerialize(const struct btQuaternionDoubleData& dataIn);
+
+	SIMD_FORCE_INLINE void serializeFloat(struct btQuaternionFloatData& dataOut) const;
+
+	SIMD_FORCE_INLINE void deSerializeFloat(const struct btQuaternionFloatData& dataIn);
+
+	SIMD_FORCE_INLINE void serializeDouble(struct btQuaternionDoubleData& dataOut) const;
+
+	SIMD_FORCE_INLINE void deSerializeDouble(const struct btQuaternionDoubleData& dataIn);
+};
+
+/**@brief Return the product of two quaternions */
+SIMD_FORCE_INLINE btQuaternion
+operator*(const btQuaternion& q1, const btQuaternion& q2)
+{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	__m128 vQ1 = q1.get128();
+	__m128 vQ2 = q2.get128();
+	__m128 A0, A1, B1, A2, B2;
+
+	A1 = bt_pshufd_ps(vQ1, BT_SHUFFLE(0, 1, 2, 0));  // X Y  z x     //      vtrn
+	B1 = bt_pshufd_ps(vQ2, BT_SHUFFLE(3, 3, 3, 0));  // W W  W X     // vdup vext
+
+	A1 = A1 * B1;
+
+	A2 = bt_pshufd_ps(vQ1, BT_SHUFFLE(1, 2, 0, 1));  // Y Z  X Y     // vext
+	B2 = bt_pshufd_ps(vQ2, BT_SHUFFLE(2, 0, 1, 1));  // z x  Y Y     // vtrn vdup
+
+	A2 = A2 * B2;
+
+	B1 = bt_pshufd_ps(vQ1, BT_SHUFFLE(2, 0, 1, 2));  // z x Y Z      // vtrn vext
+	B2 = bt_pshufd_ps(vQ2, BT_SHUFFLE(1, 2, 0, 2));  // Y Z x z      // vext vtrn
+
+	B1 = B1 * B2;  //	A3 *= B3
+
+	A0 = bt_splat_ps(vQ1, 3);  //	A0
+	A0 = A0 * vQ2;             //	A0 * B0
+
+	A1 = A1 + A2;  //	AB12
+	A0 = A0 - B1;  //	AB03 = AB0 - AB3
+
+	A1 = _mm_xor_ps(A1, vPPPM);  //	change sign of the last element
+	A0 = A0 + A1;                //	AB03 + AB12
+
+	return btQuaternion(A0);
+
+#elif defined(BT_USE_NEON)
+
+	float32x4_t vQ1 = q1.get128();
+	float32x4_t vQ2 = q2.get128();
+	float32x4_t A0, A1, B1, A2, B2, A3, B3;
+	float32x2_t vQ1zx, vQ2wx, vQ1yz, vQ2zx, vQ2yz, vQ2xz;
+
+	{
+		float32x2x2_t tmp;
+		tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+		vQ1zx = tmp.val[0];
+
+		tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+		vQ2zx = tmp.val[0];
+	}
+	vQ2wx = vext_f32(vget_high_f32(vQ2), vget_low_f32(vQ2), 1);
+
+	vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+	vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+	vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+	A1 = vcombine_f32(vget_low_f32(vQ1), vQ1zx);                     // X Y  z x
+	B1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ2), 1), vQ2wx);  // W W  W X
+
+	A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+	B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+	A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+	B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+	A1 = vmulq_f32(A1, B1);
+	A2 = vmulq_f32(A2, B2);
+	A3 = vmulq_f32(A3, B3);                           //	A3 *= B3
+	A0 = vmulq_lane_f32(vQ2, vget_high_f32(vQ1), 1);  //	A0 * B0
+
+	A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+	A0 = vsubq_f32(A0, A3);  //	AB03 = AB0 - AB3
+
+	//	change the sign of the last element
+	A1 = (btSimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)vPPPM);
+	A0 = vaddq_f32(A0, A1);  //	AB03 + AB12
+
+	return btQuaternion(A0);
+
+#else
+	return btQuaternion(
+		q1.w() * q2.x() + q1.x() * q2.w() + q1.y() * q2.z() - q1.z() * q2.y(),
+		q1.w() * q2.y() + q1.y() * q2.w() + q1.z() * q2.x() - q1.x() * q2.z(),
+		q1.w() * q2.z() + q1.z() * q2.w() + q1.x() * q2.y() - q1.y() * q2.x(),
+		q1.w() * q2.w() - q1.x() * q2.x() - q1.y() * q2.y() - q1.z() * q2.z());
+#endif
+}
+
+SIMD_FORCE_INLINE btQuaternion
+operator*(const btQuaternion& q, const btVector3& w)
+{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	__m128 vQ1 = q.get128();
+	__m128 vQ2 = w.get128();
+	__m128 A1, B1, A2, B2, A3, B3;
+
+	A1 = bt_pshufd_ps(vQ1, BT_SHUFFLE(3, 3, 3, 0));
+	B1 = bt_pshufd_ps(vQ2, BT_SHUFFLE(0, 1, 2, 0));
+
+	A1 = A1 * B1;
+
+	A2 = bt_pshufd_ps(vQ1, BT_SHUFFLE(1, 2, 0, 1));
+	B2 = bt_pshufd_ps(vQ2, BT_SHUFFLE(2, 0, 1, 1));
+
+	A2 = A2 * B2;
+
+	A3 = bt_pshufd_ps(vQ1, BT_SHUFFLE(2, 0, 1, 2));
+	B3 = bt_pshufd_ps(vQ2, BT_SHUFFLE(1, 2, 0, 2));
+
+	A3 = A3 * B3;  //	A3 *= B3
+
+	A1 = A1 + A2;                //	AB12
+	A1 = _mm_xor_ps(A1, vPPPM);  //	change sign of the last element
+	A1 = A1 - A3;                //	AB123 = AB12 - AB3
+
+	return btQuaternion(A1);
+
+#elif defined(BT_USE_NEON)
+
+	float32x4_t vQ1 = q.get128();
+	float32x4_t vQ2 = w.get128();
+	float32x4_t A1, B1, A2, B2, A3, B3;
+	float32x2_t vQ1wx, vQ2zx, vQ1yz, vQ2yz, vQ1zx, vQ2xz;
+
+	vQ1wx = vext_f32(vget_high_f32(vQ1), vget_low_f32(vQ1), 1);
+	{
+		float32x2x2_t tmp;
+
+		tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+		vQ2zx = tmp.val[0];
+
+		tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+		vQ1zx = tmp.val[0];
+	}
+
+	vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+	vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+	vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+	A1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ1), 1), vQ1wx);  // W W  W X
+	B1 = vcombine_f32(vget_low_f32(vQ2), vQ2zx);                     // X Y  z x
+
+	A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+	B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+	A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+	B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+	A1 = vmulq_f32(A1, B1);
+	A2 = vmulq_f32(A2, B2);
+	A3 = vmulq_f32(A3, B3);  //	A3 *= B3
+
+	A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+
+	//	change the sign of the last element
+	A1 = (btSimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)vPPPM);
+
+	A1 = vsubq_f32(A1, A3);  //	AB123 = AB12 - AB3
+
+	return btQuaternion(A1);
+
+#else
+	return btQuaternion(
+		q.w() * w.x() + q.y() * w.z() - q.z() * w.y(),
+		q.w() * w.y() + q.z() * w.x() - q.x() * w.z(),
+		q.w() * w.z() + q.x() * w.y() - q.y() * w.x(),
+		-q.x() * w.x() - q.y() * w.y() - q.z() * w.z());
+#endif
+}
+
+SIMD_FORCE_INLINE btQuaternion
+operator*(const btVector3& w, const btQuaternion& q)
+{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	__m128 vQ1 = w.get128();
+	__m128 vQ2 = q.get128();
+	__m128 A1, B1, A2, B2, A3, B3;
+
+	A1 = bt_pshufd_ps(vQ1, BT_SHUFFLE(0, 1, 2, 0));  // X Y  z x
+	B1 = bt_pshufd_ps(vQ2, BT_SHUFFLE(3, 3, 3, 0));  // W W  W X
+
+	A1 = A1 * B1;
+
+	A2 = bt_pshufd_ps(vQ1, BT_SHUFFLE(1, 2, 0, 1));
+	B2 = bt_pshufd_ps(vQ2, BT_SHUFFLE(2, 0, 1, 1));
+
+	A2 = A2 * B2;
+
+	A3 = bt_pshufd_ps(vQ1, BT_SHUFFLE(2, 0, 1, 2));
+	B3 = bt_pshufd_ps(vQ2, BT_SHUFFLE(1, 2, 0, 2));
+
+	A3 = A3 * B3;  //	A3 *= B3
+
+	A1 = A1 + A2;                //	AB12
+	A1 = _mm_xor_ps(A1, vPPPM);  //	change sign of the last element
+	A1 = A1 - A3;                //	AB123 = AB12 - AB3
+
+	return btQuaternion(A1);
+
+#elif defined(BT_USE_NEON)
+
+	float32x4_t vQ1 = w.get128();
+	float32x4_t vQ2 = q.get128();
+	float32x4_t A1, B1, A2, B2, A3, B3;
+	float32x2_t vQ1zx, vQ2wx, vQ1yz, vQ2zx, vQ2yz, vQ2xz;
+
+	{
+		float32x2x2_t tmp;
+
+		tmp = vtrn_f32(vget_high_f32(vQ1), vget_low_f32(vQ1));  // {z x}, {w y}
+		vQ1zx = tmp.val[0];
+
+		tmp = vtrn_f32(vget_high_f32(vQ2), vget_low_f32(vQ2));  // {z x}, {w y}
+		vQ2zx = tmp.val[0];
+	}
+	vQ2wx = vext_f32(vget_high_f32(vQ2), vget_low_f32(vQ2), 1);
+
+	vQ1yz = vext_f32(vget_low_f32(vQ1), vget_high_f32(vQ1), 1);
+
+	vQ2yz = vext_f32(vget_low_f32(vQ2), vget_high_f32(vQ2), 1);
+	vQ2xz = vext_f32(vQ2zx, vQ2zx, 1);
+
+	A1 = vcombine_f32(vget_low_f32(vQ1), vQ1zx);                     // X Y  z x
+	B1 = vcombine_f32(vdup_lane_f32(vget_high_f32(vQ2), 1), vQ2wx);  // W W  W X
+
+	A2 = vcombine_f32(vQ1yz, vget_low_f32(vQ1));
+	B2 = vcombine_f32(vQ2zx, vdup_lane_f32(vget_low_f32(vQ2), 1));
+
+	A3 = vcombine_f32(vQ1zx, vQ1yz);  // Z X Y Z
+	B3 = vcombine_f32(vQ2yz, vQ2xz);  // Y Z x z
+
+	A1 = vmulq_f32(A1, B1);
+	A2 = vmulq_f32(A2, B2);
+	A3 = vmulq_f32(A3, B3);  //	A3 *= B3
+
+	A1 = vaddq_f32(A1, A2);  //	AB12 = AB1 + AB2
+
+	//	change the sign of the last element
+	A1 = (btSimdFloat4)veorq_s32((int32x4_t)A1, (int32x4_t)vPPPM);
+
+	A1 = vsubq_f32(A1, A3);  //	AB123 = AB12 - AB3
+
+	return btQuaternion(A1);
+
+#else
+	return btQuaternion(
+		+w.x() * q.w() + w.y() * q.z() - w.z() * q.y(),
+		+w.y() * q.w() + w.z() * q.x() - w.x() * q.z(),
+		+w.z() * q.w() + w.x() * q.y() - w.y() * q.x(),
+		-w.x() * q.x() - w.y() * q.y() - w.z() * q.z());
+#endif
+}
+
+/**@brief Calculate the dot product between two quaternions */
+SIMD_FORCE_INLINE btScalar
+dot(const btQuaternion& q1, const btQuaternion& q2)
+{
+	return q1.dot(q2);
+}
+
+/**@brief Return the length of a quaternion */
+SIMD_FORCE_INLINE btScalar
+length(const btQuaternion& q)
+{
+	return q.length();
+}
+
+/**@brief Return the angle between two quaternions*/
+SIMD_FORCE_INLINE btScalar
+btAngle(const btQuaternion& q1, const btQuaternion& q2)
+{
+	return q1.angle(q2);
+}
+
+/**@brief Return the inverse of a quaternion*/
+SIMD_FORCE_INLINE btQuaternion
+inverse(const btQuaternion& q)
+{
+	return q.inverse();
+}
+
+/**@brief Return the result of spherical linear interpolation betwen two quaternions 
+ * @param q1 The first quaternion
+ * @param q2 The second quaternion 
+ * @param t The ration between q1 and q2.  t = 0 return q1, t=1 returns q2 
+ * Slerp assumes constant velocity between positions. */
+SIMD_FORCE_INLINE btQuaternion
+slerp(const btQuaternion& q1, const btQuaternion& q2, const btScalar& t)
+{
+	return q1.slerp(q2, t);
+}
+
+SIMD_FORCE_INLINE btVector3
+quatRotate(const btQuaternion& rotation, const btVector3& v)
+{
+	btQuaternion q = rotation * v;
+	q *= rotation.inverse();
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	return btVector3(_mm_and_ps(q.get128(), btvFFF0fMask));
+#elif defined(BT_USE_NEON)
+	return btVector3((float32x4_t)vandq_s32((int32x4_t)q.get128(), btvFFF0Mask));
+#else
+	return btVector3(q.getX(), q.getY(), q.getZ());
+#endif
+}
+
+SIMD_FORCE_INLINE btQuaternion
+shortestArcQuat(const btVector3& v0, const btVector3& v1)  // Game Programming Gems 2.10. make sure v0,v1 are normalized
+{
+	btVector3 c = v0.cross(v1);
+	btScalar d = v0.dot(v1);
+
+	if (d < -1.0 + SIMD_EPSILON)
+	{
+		btVector3 n, unused;
+		btPlaneSpace1(v0, n, unused);
+		return btQuaternion(n.x(), n.y(), n.z(), 0.0f);  // just pick any vector that is orthogonal to v0
+	}
+
+	btScalar s = btSqrt((1.0f + d) * 2.0f);
+	btScalar rs = 1.0f / s;
+
+	return btQuaternion(c.getX() * rs, c.getY() * rs, c.getZ() * rs, s * 0.5f);
+}
+
+SIMD_FORCE_INLINE btQuaternion
+shortestArcQuatNormalize2(btVector3& v0, btVector3& v1)
+{
+	v0.normalize();
+	v1.normalize();
+	return shortestArcQuat(v0, v1);
+}
+
+struct btQuaternionFloatData
+{
+	float m_floats[4];
+};
+
+struct btQuaternionDoubleData
+{
+	double m_floats[4];
+};
+
+SIMD_FORCE_INLINE void btQuaternion::serializeFloat(struct btQuaternionFloatData& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = float(m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btQuaternion::deSerializeFloat(const struct btQuaternionFloatData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = btScalar(dataIn.m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btQuaternion::serializeDouble(struct btQuaternionDoubleData& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = double(m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btQuaternion::deSerializeDouble(const struct btQuaternionDoubleData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = btScalar(dataIn.m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btQuaternion::serialize(struct btQuaternionData& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = m_floats[i];
+}
+
+SIMD_FORCE_INLINE void btQuaternion::deSerialize(const struct btQuaternionFloatData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = (btScalar)dataIn.m_floats[i];
+}
+
+SIMD_FORCE_INLINE void btQuaternion::deSerialize(const struct btQuaternionDoubleData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = (btScalar)dataIn.m_floats[i];
+}
+
+#endif  //BT_SIMD__QUATERNION_H_
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btQuickprof.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btQuickprof.cpp
new file mode 100644
index 0000000..33b51eb
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btQuickprof.cpp
@@ -0,0 +1,805 @@
+/*
+
+***************************************************************************************************
+**
+** profile.cpp
+**
+** Real-Time Hierarchical Profiling for Game Programming Gems 3
+**
+** by Greg Hjelstrom & Byon Garrabrant
+**
+***************************************************************************************************/
+
+// Credits: The Clock class was inspired by the Timer classes in
+// Ogre (www.ogre3d.org).
+
+#include "btQuickprof.h"
+#include "btThreads.h"
+
+#ifdef __CELLOS_LV2__
+#include <sys/sys_time.h>
+#include <sys/time_util.h>
+#include <stdio.h>
+#endif
+
+#if defined(SUNOS) || defined(__SUNOS__)
+#include <stdio.h>
+#endif
+#ifdef __APPLE__
+#include <mach/mach_time.h>
+#include <TargetConditionals.h>
+#endif
+
+#if defined(WIN32) || defined(_WIN32)
+
+#define BT_USE_WINDOWS_TIMERS
+#define WIN32_LEAN_AND_MEAN
+#define NOWINRES
+#define NOMCX
+#define NOIME
+
+#ifdef _XBOX
+#include <Xtl.h>
+#else  //_XBOX
+#include <windows.h>
+
+#if WINVER < 0x0602
+#define GetTickCount64 GetTickCount
+#endif
+
+#endif  //_XBOX
+
+#include <time.h>
+
+#else  //_WIN32
+#include <sys/time.h>
+
+#ifdef BT_LINUX_REALTIME
+//required linking against rt (librt)
+#include <time.h>
+#endif  //BT_LINUX_REALTIME
+
+#endif  //_WIN32
+
+#define mymin(a, b) (a > b ? a : b)
+
+struct btClockData
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+	LARGE_INTEGER mClockFrequency;
+	LONGLONG mStartTick;
+	LARGE_INTEGER mStartTime;
+#else
+#ifdef __CELLOS_LV2__
+	uint64_t mStartTime;
+#else
+#ifdef __APPLE__
+	uint64_t mStartTimeNano;
+#endif
+	struct timeval mStartTime;
+#endif
+#endif  //__CELLOS_LV2__
+};
+
+///The btClock is a portable basic clock that measures accurate time in seconds, use for profiling.
+btClock::btClock()
+{
+	m_data = new btClockData;
+#ifdef BT_USE_WINDOWS_TIMERS
+	QueryPerformanceFrequency(&m_data->mClockFrequency);
+#endif
+	reset();
+}
+
+btClock::~btClock()
+{
+	delete m_data;
+}
+
+btClock::btClock(const btClock& other)
+{
+	m_data = new btClockData;
+	*m_data = *other.m_data;
+}
+
+btClock& btClock::operator=(const btClock& other)
+{
+	*m_data = *other.m_data;
+	return *this;
+}
+
+/// Resets the initial reference time.
+void btClock::reset()
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+	QueryPerformanceCounter(&m_data->mStartTime);
+	m_data->mStartTick = GetTickCount64();
+#else
+#ifdef __CELLOS_LV2__
+
+	typedef uint64_t ClockSize;
+	ClockSize newTime;
+	//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+	SYS_TIMEBASE_GET(newTime);
+	m_data->mStartTime = newTime;
+#else
+#ifdef __APPLE__
+	m_data->mStartTimeNano = mach_absolute_time();
+#endif
+	gettimeofday(&m_data->mStartTime, 0);
+#endif
+#endif
+}
+
+/// Returns the time in ms since the last call to reset or since
+/// the btClock was created.
+unsigned long long int btClock::getTimeMilliseconds()
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+	LARGE_INTEGER currentTime;
+	QueryPerformanceCounter(&currentTime);
+	LONGLONG elapsedTime = currentTime.QuadPart -
+						   m_data->mStartTime.QuadPart;
+	// Compute the number of millisecond ticks elapsed.
+	unsigned long msecTicks = (unsigned long)(1000 * elapsedTime /
+											  m_data->mClockFrequency.QuadPart);
+
+	return msecTicks;
+#else
+
+#ifdef __CELLOS_LV2__
+	uint64_t freq = sys_time_get_timebase_frequency();
+	double dFreq = ((double)freq) / 1000.0;
+	typedef uint64_t ClockSize;
+	ClockSize newTime;
+	SYS_TIMEBASE_GET(newTime);
+	//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+
+	return (unsigned long int)((double(newTime - m_data->mStartTime)) / dFreq);
+#else
+
+	struct timeval currentTime;
+	gettimeofday(&currentTime, 0);
+	return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000 +
+		   (currentTime.tv_usec - m_data->mStartTime.tv_usec) / 1000;
+#endif  //__CELLOS_LV2__
+#endif
+}
+
+/// Returns the time in us since the last call to reset or since
+/// the Clock was created.
+unsigned long long int btClock::getTimeMicroseconds()
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+	//see https://msdn.microsoft.com/en-us/library/windows/desktop/dn553408(v=vs.85).aspx
+	LARGE_INTEGER currentTime, elapsedTime;
+
+	QueryPerformanceCounter(&currentTime);
+	elapsedTime.QuadPart = currentTime.QuadPart -
+						   m_data->mStartTime.QuadPart;
+	elapsedTime.QuadPart *= 1000000;
+	elapsedTime.QuadPart /= m_data->mClockFrequency.QuadPart;
+
+	return (unsigned long long)elapsedTime.QuadPart;
+#else
+
+#ifdef __CELLOS_LV2__
+	uint64_t freq = sys_time_get_timebase_frequency();
+	double dFreq = ((double)freq) / 1000000.0;
+	typedef uint64_t ClockSize;
+	ClockSize newTime;
+	//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+	SYS_TIMEBASE_GET(newTime);
+
+	return (unsigned long int)((double(newTime - m_data->mStartTime)) / dFreq);
+#else
+
+	struct timeval currentTime;
+	gettimeofday(&currentTime, 0);
+	return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000000 +
+		   (currentTime.tv_usec - m_data->mStartTime.tv_usec);
+#endif  //__CELLOS_LV2__
+#endif
+}
+
+unsigned long long int btClock::getTimeNanoseconds()
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+	//see https://msdn.microsoft.com/en-us/library/windows/desktop/dn553408(v=vs.85).aspx
+	LARGE_INTEGER currentTime, elapsedTime;
+
+	QueryPerformanceCounter(&currentTime);
+	elapsedTime.QuadPart = currentTime.QuadPart -
+						   m_data->mStartTime.QuadPart;
+	elapsedTime.QuadPart *= 1000000000;
+	elapsedTime.QuadPart /= m_data->mClockFrequency.QuadPart;
+
+	return (unsigned long long)elapsedTime.QuadPart;
+#else
+
+#ifdef __CELLOS_LV2__
+	uint64_t freq = sys_time_get_timebase_frequency();
+	double dFreq = ((double)freq) / 1e9;
+	typedef uint64_t ClockSize;
+	ClockSize newTime;
+	//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+	SYS_TIMEBASE_GET(newTime);
+
+	return (unsigned long int)((double(newTime - m_data->mStartTime)) / dFreq);
+#else
+#ifdef __APPLE__
+	uint64_t ticks = mach_absolute_time() - m_data->mStartTimeNano;
+	static long double conversion = 0.0L;
+	if (0.0L == conversion)
+	{
+		// attempt to get conversion to nanoseconds
+		mach_timebase_info_data_t info;
+		int err = mach_timebase_info(&info);
+		if (err)
+		{
+			btAssert(0);
+			conversion = 1.;
+		}
+		conversion = info.numer / info.denom;
+	}
+	return (ticks * conversion);
+
+#else  //__APPLE__
+
+#ifdef BT_LINUX_REALTIME
+	timespec ts;
+	clock_gettime(CLOCK_REALTIME, &ts);
+	return 1000000000 * ts.tv_sec + ts.tv_nsec;
+#else
+	struct timeval currentTime;
+	gettimeofday(&currentTime, 0);
+	return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1e9 +
+		   (currentTime.tv_usec - m_data->mStartTime.tv_usec) * 1000;
+#endif  //BT_LINUX_REALTIME
+
+#endif  //__APPLE__
+#endif  //__CELLOS_LV2__
+#endif
+}
+
+/// Returns the time in s since the last call to reset or since
+/// the Clock was created.
+btScalar btClock::getTimeSeconds()
+{
+	static const btScalar microseconds_to_seconds = btScalar(0.000001);
+	return btScalar(getTimeMicroseconds()) * microseconds_to_seconds;
+}
+
+#ifndef BT_NO_PROFILE
+
+static btClock gProfileClock;
+
+inline void Profile_Get_Ticks(unsigned long int* ticks)
+{
+	*ticks = (unsigned long int)gProfileClock.getTimeMicroseconds();
+}
+
+inline float Profile_Get_Tick_Rate(void)
+{
+	//	return 1000000.f;
+	return 1000.f;
+}
+
+/***************************************************************************************************
+**
+** CProfileNode
+**
+***************************************************************************************************/
+
+/***********************************************************************************************
+ * INPUT:                                                                                      *
+ * name - pointer to a static string which is the name of this profile node                    *
+ * parent - parent pointer                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * The name is assumed to be a static pointer, only the pointer is stored and compared for     *
+ * efficiency reasons.                                                                         *
+ *=============================================================================================*/
+CProfileNode::CProfileNode(const char* name, CProfileNode* parent) : Name(name),
+																	 TotalCalls(0),
+																	 TotalTime(0),
+																	 StartTime(0),
+																	 RecursionCounter(0),
+																	 Parent(parent),
+																	 Child(NULL),
+																	 Sibling(NULL),
+																	 m_userPtr(0)
+{
+	Reset();
+}
+
+void CProfileNode::CleanupMemory()
+{
+	delete (Child);
+	Child = NULL;
+	delete (Sibling);
+	Sibling = NULL;
+}
+
+CProfileNode::~CProfileNode(void)
+{
+	CleanupMemory();
+}
+
+/***********************************************************************************************
+ * INPUT:                                                                                      *
+ * name - static string pointer to the name of the node we are searching for                   *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * All profile names are assumed to be static strings so this function uses pointer compares   *
+ * to find the named node.                                                                     *
+ *=============================================================================================*/
+CProfileNode* CProfileNode::Get_Sub_Node(const char* name)
+{
+	// Try to find this sub node
+	CProfileNode* child = Child;
+	while (child)
+	{
+		if (child->Name == name)
+		{
+			return child;
+		}
+		child = child->Sibling;
+	}
+
+	// We didn't find it, so add it
+
+	CProfileNode* node = new CProfileNode(name, this);
+	node->Sibling = Child;
+	Child = node;
+	return node;
+}
+
+void CProfileNode::Reset(void)
+{
+	TotalCalls = 0;
+	TotalTime = 0.0f;
+
+	if (Child)
+	{
+		Child->Reset();
+	}
+	if (Sibling)
+	{
+		Sibling->Reset();
+	}
+}
+
+void CProfileNode::Call(void)
+{
+	TotalCalls++;
+	if (RecursionCounter++ == 0)
+	{
+		Profile_Get_Ticks(&StartTime);
+	}
+}
+
+bool CProfileNode::Return(void)
+{
+	if (--RecursionCounter == 0 && TotalCalls != 0)
+	{
+		unsigned long int time;
+		Profile_Get_Ticks(&time);
+
+		time -= StartTime;
+		TotalTime += (float)time / Profile_Get_Tick_Rate();
+	}
+	return (RecursionCounter == 0);
+}
+
+/***************************************************************************************************
+**
+** CProfileIterator
+**
+***************************************************************************************************/
+CProfileIterator::CProfileIterator(CProfileNode* start)
+{
+	CurrentParent = start;
+	CurrentChild = CurrentParent->Get_Child();
+}
+
+void CProfileIterator::First(void)
+{
+	CurrentChild = CurrentParent->Get_Child();
+}
+
+void CProfileIterator::Next(void)
+{
+	CurrentChild = CurrentChild->Get_Sibling();
+}
+
+bool CProfileIterator::Is_Done(void)
+{
+	return CurrentChild == NULL;
+}
+
+void CProfileIterator::Enter_Child(int index)
+{
+	CurrentChild = CurrentParent->Get_Child();
+	while ((CurrentChild != NULL) && (index != 0))
+	{
+		index--;
+		CurrentChild = CurrentChild->Get_Sibling();
+	}
+
+	if (CurrentChild != NULL)
+	{
+		CurrentParent = CurrentChild;
+		CurrentChild = CurrentParent->Get_Child();
+	}
+}
+
+void CProfileIterator::Enter_Parent(void)
+{
+	if (CurrentParent->Get_Parent() != NULL)
+	{
+		CurrentParent = CurrentParent->Get_Parent();
+	}
+	CurrentChild = CurrentParent->Get_Child();
+}
+
+/***************************************************************************************************
+**
+** CProfileManager
+**
+***************************************************************************************************/
+
+CProfileNode gRoots[BT_QUICKPROF_MAX_THREAD_COUNT] = {
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL),
+	CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL), CProfileNode("Root", NULL)};
+
+CProfileNode* gCurrentNodes[BT_QUICKPROF_MAX_THREAD_COUNT] =
+	{
+		&gRoots[0],
+		&gRoots[1],
+		&gRoots[2],
+		&gRoots[3],
+		&gRoots[4],
+		&gRoots[5],
+		&gRoots[6],
+		&gRoots[7],
+		&gRoots[8],
+		&gRoots[9],
+		&gRoots[10],
+		&gRoots[11],
+		&gRoots[12],
+		&gRoots[13],
+		&gRoots[14],
+		&gRoots[15],
+		&gRoots[16],
+		&gRoots[17],
+		&gRoots[18],
+		&gRoots[19],
+		&gRoots[20],
+		&gRoots[21],
+		&gRoots[22],
+		&gRoots[23],
+		&gRoots[24],
+		&gRoots[25],
+		&gRoots[26],
+		&gRoots[27],
+		&gRoots[28],
+		&gRoots[29],
+		&gRoots[30],
+		&gRoots[31],
+		&gRoots[32],
+		&gRoots[33],
+		&gRoots[34],
+		&gRoots[35],
+		&gRoots[36],
+		&gRoots[37],
+		&gRoots[38],
+		&gRoots[39],
+		&gRoots[40],
+		&gRoots[41],
+		&gRoots[42],
+		&gRoots[43],
+		&gRoots[44],
+		&gRoots[45],
+		&gRoots[46],
+		&gRoots[47],
+		&gRoots[48],
+		&gRoots[49],
+		&gRoots[50],
+		&gRoots[51],
+		&gRoots[52],
+		&gRoots[53],
+		&gRoots[54],
+		&gRoots[55],
+		&gRoots[56],
+		&gRoots[57],
+		&gRoots[58],
+		&gRoots[59],
+		&gRoots[60],
+		&gRoots[61],
+		&gRoots[62],
+		&gRoots[63],
+};
+
+int CProfileManager::FrameCounter = 0;
+unsigned long int CProfileManager::ResetTime = 0;
+
+CProfileIterator* CProfileManager::Get_Iterator(void)
+{
+	int threadIndex = btQuickprofGetCurrentThreadIndex2();
+	if ((threadIndex < 0) || threadIndex >= BT_QUICKPROF_MAX_THREAD_COUNT)
+		return 0;
+
+	return new CProfileIterator(&gRoots[threadIndex]);
+}
+
+void CProfileManager::CleanupMemory(void)
+{
+	for (int i = 0; i < BT_QUICKPROF_MAX_THREAD_COUNT; i++)
+	{
+		gRoots[i].CleanupMemory();
+	}
+}
+
+/***********************************************************************************************
+ * CProfileManager::Start_Profile -- Begin a named profile                                    *
+ *                                                                                             *
+ * Steps one level deeper into the tree, if a child already exists with the specified name     *
+ * then it accumulates the profiling; otherwise a new child node is added to the profile tree. *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * name - name of this profiling record                                                        *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * The string used is assumed to be a static string; pointer compares are used throughout      *
+ * the profiling code for efficiency.                                                          *
+ *=============================================================================================*/
+void CProfileManager::Start_Profile(const char* name)
+{
+	int threadIndex = btQuickprofGetCurrentThreadIndex2();
+	if ((threadIndex < 0) || threadIndex >= BT_QUICKPROF_MAX_THREAD_COUNT)
+		return;
+
+	if (name != gCurrentNodes[threadIndex]->Get_Name())
+	{
+		gCurrentNodes[threadIndex] = gCurrentNodes[threadIndex]->Get_Sub_Node(name);
+	}
+
+	gCurrentNodes[threadIndex]->Call();
+}
+
+/***********************************************************************************************
+ * CProfileManager::Stop_Profile -- Stop timing and record the results.                       *
+ *=============================================================================================*/
+void CProfileManager::Stop_Profile(void)
+{
+	int threadIndex = btQuickprofGetCurrentThreadIndex2();
+	if ((threadIndex < 0) || threadIndex >= BT_QUICKPROF_MAX_THREAD_COUNT)
+		return;
+
+	// Return will indicate whether we should back up to our parent (we may
+	// be profiling a recursive function)
+	if (gCurrentNodes[threadIndex]->Return())
+	{
+		gCurrentNodes[threadIndex] = gCurrentNodes[threadIndex]->Get_Parent();
+	}
+}
+
+/***********************************************************************************************
+ * CProfileManager::Reset -- Reset the contents of the profiling system                       *
+ *                                                                                             *
+ *    This resets everything except for the tree structure.  All of the timing data is reset.  *
+ *=============================================================================================*/
+void CProfileManager::Reset(void)
+{
+	gProfileClock.reset();
+	int threadIndex = btQuickprofGetCurrentThreadIndex2();
+	if ((threadIndex < 0) || threadIndex >= BT_QUICKPROF_MAX_THREAD_COUNT)
+		return;
+	gRoots[threadIndex].Reset();
+	gRoots[threadIndex].Call();
+	FrameCounter = 0;
+	Profile_Get_Ticks(&ResetTime);
+}
+
+/***********************************************************************************************
+ * CProfileManager::Increment_Frame_Counter -- Increment the frame counter                    *
+ *=============================================================================================*/
+void CProfileManager::Increment_Frame_Counter(void)
+{
+	FrameCounter++;
+}
+
+/***********************************************************************************************
+ * CProfileManager::Get_Time_Since_Reset -- returns the elapsed time since last reset         *
+ *=============================================================================================*/
+float CProfileManager::Get_Time_Since_Reset(void)
+{
+	unsigned long int time;
+	Profile_Get_Ticks(&time);
+	time -= ResetTime;
+	return (float)time / Profile_Get_Tick_Rate();
+}
+
+#include <stdio.h>
+
+void CProfileManager::dumpRecursive(CProfileIterator* profileIterator, int spacing)
+{
+	profileIterator->First();
+	if (profileIterator->Is_Done())
+		return;
+
+	float accumulated_time = 0, parent_time = profileIterator->Is_Root() ? CProfileManager::Get_Time_Since_Reset() : profileIterator->Get_Current_Parent_Total_Time();
+	int i;
+	int frames_since_reset = CProfileManager::Get_Frame_Count_Since_Reset();
+	for (i = 0; i < spacing; i++) printf(".");
+	printf("----------------------------------\n");
+	for (i = 0; i < spacing; i++) printf(".");
+	printf("Profiling: %s (total running time: %.3f ms) ---\n", profileIterator->Get_Current_Parent_Name(), parent_time);
+	float totalTime = 0.f;
+
+	int numChildren = 0;
+
+	for (i = 0; !profileIterator->Is_Done(); i++, profileIterator->Next())
+	{
+		numChildren++;
+		float current_total_time = profileIterator->Get_Current_Total_Time();
+		accumulated_time += current_total_time;
+		float fraction = parent_time > SIMD_EPSILON ? (current_total_time / parent_time) * 100 : 0.f;
+		{
+			int i;
+			for (i = 0; i < spacing; i++) printf(".");
+		}
+		printf("%d -- %s (%.2f %%) :: %.3f ms / frame (%d calls)\n", i, profileIterator->Get_Current_Name(), fraction, (current_total_time / (double)frames_since_reset), profileIterator->Get_Current_Total_Calls());
+		totalTime += current_total_time;
+		//recurse into children
+	}
+
+	if (parent_time < accumulated_time)
+	{
+		//printf("what's wrong\n");
+	}
+	for (i = 0; i < spacing; i++) printf(".");
+	printf("%s (%.3f %%) :: %.3f ms\n", "Unaccounted:", parent_time > SIMD_EPSILON ? ((parent_time - accumulated_time) / parent_time) * 100 : 0.f, parent_time - accumulated_time);
+
+	for (i = 0; i < numChildren; i++)
+	{
+		profileIterator->Enter_Child(i);
+		dumpRecursive(profileIterator, spacing + 3);
+		profileIterator->Enter_Parent();
+	}
+}
+
+void CProfileManager::dumpAll()
+{
+	CProfileIterator* profileIterator = 0;
+	profileIterator = CProfileManager::Get_Iterator();
+
+	dumpRecursive(profileIterator, 0);
+
+	CProfileManager::Release_Iterator(profileIterator);
+}
+
+
+void btEnterProfileZoneDefault(const char* name)
+{
+}
+void btLeaveProfileZoneDefault()
+{
+}
+
+#else
+void btEnterProfileZoneDefault(const char* name)
+{
+}
+void btLeaveProfileZoneDefault()
+{
+}
+#endif  //BT_NO_PROFILE
+
+
+// clang-format off
+#if defined(_WIN32) && (defined(__MINGW32__) || defined(__MINGW64__))
+  #define BT_HAVE_TLS 1
+#elif __APPLE__ && !TARGET_OS_IPHONE
+  // TODO: Modern versions of iOS support TLS now with updated version checking.
+  #define BT_HAVE_TLS 1
+#elif __linux__
+  #define BT_HAVE_TLS 1
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+  // TODO: At the moment disabling purposely OpenBSD, albeit tls support exists but not fully functioning
+  #define BT_HAVE_TLS 1
+#endif
+
+// __thread is broken on Andorid clang until r12b. See
+// https://github.com/android-ndk/ndk/issues/8
+#if defined(__ANDROID__) && defined(__clang__)
+  #if __has_include(<android/ndk-version.h>)
+    #include <android/ndk-version.h>
+  #endif  // __has_include(<android/ndk-version.h>)
+  #if defined(__NDK_MAJOR__) && \
+    ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
+    #undef BT_HAVE_TLS
+  #endif
+#endif  // defined(__ANDROID__) && defined(__clang__)
+// clang-format on
+
+unsigned int btQuickprofGetCurrentThreadIndex2()
+{
+	const unsigned int kNullIndex = ~0U;
+
+#if BT_THREADSAFE
+	return btGetCurrentThreadIndex();
+#else
+#if defined(BT_HAVE_TLS)
+	static __thread unsigned int sThreadIndex = kNullIndex;
+#elif defined(_WIN32)
+	__declspec(thread) static unsigned int sThreadIndex = kNullIndex;
+#else
+	unsigned int sThreadIndex = 0;
+	return -1;
+#endif
+
+	static int gThreadCounter = 0;
+
+	if (sThreadIndex == kNullIndex)
+	{
+		sThreadIndex = gThreadCounter++;
+	}
+	return sThreadIndex;
+#endif  //BT_THREADSAFE
+}
+
+static btEnterProfileZoneFunc* bts_enterFunc = btEnterProfileZoneDefault;
+static btLeaveProfileZoneFunc* bts_leaveFunc = btLeaveProfileZoneDefault;
+
+void btEnterProfileZone(const char* name)
+{
+	(bts_enterFunc)(name);
+}
+void btLeaveProfileZone()
+{
+	(bts_leaveFunc)();
+}
+
+btEnterProfileZoneFunc* btGetCurrentEnterProfileZoneFunc()
+{
+	return bts_enterFunc;
+}
+btLeaveProfileZoneFunc* btGetCurrentLeaveProfileZoneFunc()
+{
+	return bts_leaveFunc;
+}
+
+void btSetCustomEnterProfileZoneFunc(btEnterProfileZoneFunc* enterFunc)
+{
+	bts_enterFunc = enterFunc;
+}
+void btSetCustomLeaveProfileZoneFunc(btLeaveProfileZoneFunc* leaveFunc)
+{
+	bts_leaveFunc = leaveFunc;
+}
+
+CProfileSample::CProfileSample(const char* name)
+{
+	btEnterProfileZone(name);
+}
+
+CProfileSample::~CProfileSample(void)
+{
+	btLeaveProfileZone();
+}
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btQuickprof.h b/dali-physics/third-party/bullet3/src/LinearMath/btQuickprof.h
new file mode 100644
index 0000000..990d401
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btQuickprof.h
@@ -0,0 +1,200 @@
+
+/***************************************************************************************************
+**
+** Real-Time Hierarchical Profiling for Game Programming Gems 3
+**
+** by Greg Hjelstrom & Byon Garrabrant
+**
+***************************************************************************************************/
+
+// Credits: The Clock class was inspired by the Timer classes in
+// Ogre (www.ogre3d.org).
+
+#ifndef BT_QUICK_PROF_H
+#define BT_QUICK_PROF_H
+
+#include "btScalar.h"
+#define USE_BT_CLOCK 1
+
+#ifdef USE_BT_CLOCK
+
+///The btClock is a portable basic clock that measures accurate time in seconds, use for profiling.
+class btClock
+{
+public:
+	btClock();
+
+	btClock(const btClock& other);
+	btClock& operator=(const btClock& other);
+
+	~btClock();
+
+	/// Resets the initial reference time.
+	void reset();
+
+	/// Returns the time in ms since the last call to reset or since
+	/// the btClock was created.
+	unsigned long long int getTimeMilliseconds();
+
+	/// Returns the time in us since the last call to reset or since
+	/// the Clock was created.
+	unsigned long long int getTimeMicroseconds();
+
+	unsigned long long int getTimeNanoseconds();
+
+	/// Returns the time in s since the last call to reset or since
+	/// the Clock was created.
+	btScalar getTimeSeconds();
+
+private:
+	struct btClockData* m_data;
+};
+
+#endif  //USE_BT_CLOCK
+
+typedef void(btEnterProfileZoneFunc)(const char* msg);
+typedef void(btLeaveProfileZoneFunc)();
+
+btEnterProfileZoneFunc* btGetCurrentEnterProfileZoneFunc();
+btLeaveProfileZoneFunc* btGetCurrentLeaveProfileZoneFunc();
+
+void btSetCustomEnterProfileZoneFunc(btEnterProfileZoneFunc* enterFunc);
+void btSetCustomLeaveProfileZoneFunc(btLeaveProfileZoneFunc* leaveFunc);
+
+#ifndef BT_ENABLE_PROFILE
+#define BT_NO_PROFILE 1
+#endif  //BT_NO_PROFILE
+
+const unsigned int BT_QUICKPROF_MAX_THREAD_COUNT = 64;
+
+//btQuickprofGetCurrentThreadIndex will return -1 if thread index cannot be determined,
+//otherwise returns thread index in range [0..maxThreads]
+unsigned int btQuickprofGetCurrentThreadIndex2();
+
+#ifndef BT_NO_PROFILE
+
+
+#include <stdio.h>  //@todo remove this, backwards compatibility
+
+#include "btAlignedAllocator.h"
+#include <new>
+
+///A node in the Profile Hierarchy Tree
+class CProfileNode
+{
+public:
+	CProfileNode(const char* name, CProfileNode* parent);
+	~CProfileNode(void);
+
+	CProfileNode* Get_Sub_Node(const char* name);
+
+	CProfileNode* Get_Parent(void) { return Parent; }
+	CProfileNode* Get_Sibling(void) { return Sibling; }
+	CProfileNode* Get_Child(void) { return Child; }
+
+	void CleanupMemory();
+	void Reset(void);
+	void Call(void);
+	bool Return(void);
+
+	const char* Get_Name(void) { return Name; }
+	int Get_Total_Calls(void) { return TotalCalls; }
+	float Get_Total_Time(void) { return TotalTime; }
+	void* GetUserPointer() const { return m_userPtr; }
+	void SetUserPointer(void* ptr) { m_userPtr = ptr; }
+
+protected:
+	const char* Name;
+	int TotalCalls;
+	float TotalTime;
+	unsigned long int StartTime;
+	int RecursionCounter;
+
+	CProfileNode* Parent;
+	CProfileNode* Child;
+	CProfileNode* Sibling;
+	void* m_userPtr;
+};
+
+///An iterator to navigate through the tree
+class CProfileIterator
+{
+public:
+	// Access all the children of the current parent
+	void First(void);
+	void Next(void);
+	bool Is_Done(void);
+	bool Is_Root(void) { return (CurrentParent->Get_Parent() == 0); }
+
+	void Enter_Child(int index);     // Make the given child the new parent
+	void Enter_Largest_Child(void);  // Make the largest child the new parent
+	void Enter_Parent(void);         // Make the current parent's parent the new parent
+
+	// Access the current child
+	const char* Get_Current_Name(void) { return CurrentChild->Get_Name(); }
+	int Get_Current_Total_Calls(void) { return CurrentChild->Get_Total_Calls(); }
+	float Get_Current_Total_Time(void) { return CurrentChild->Get_Total_Time(); }
+
+	void* Get_Current_UserPointer(void) { return CurrentChild->GetUserPointer(); }
+	void Set_Current_UserPointer(void* ptr) { CurrentChild->SetUserPointer(ptr); }
+	// Access the current parent
+	const char* Get_Current_Parent_Name(void) { return CurrentParent->Get_Name(); }
+	int Get_Current_Parent_Total_Calls(void) { return CurrentParent->Get_Total_Calls(); }
+	float Get_Current_Parent_Total_Time(void) { return CurrentParent->Get_Total_Time(); }
+
+protected:
+	CProfileNode* CurrentParent;
+	CProfileNode* CurrentChild;
+
+	CProfileIterator(CProfileNode* start);
+	friend class CProfileManager;
+};
+
+///The Manager for the Profile system
+class CProfileManager
+{
+public:
+	static void Start_Profile(const char* name);
+	static void Stop_Profile(void);
+
+	static void CleanupMemory(void);
+	//	{
+	//		Root.CleanupMemory();
+	//	}
+
+	static void Reset(void);
+	static void Increment_Frame_Counter(void);
+	static int Get_Frame_Count_Since_Reset(void) { return FrameCounter; }
+	static float Get_Time_Since_Reset(void);
+
+	static CProfileIterator* Get_Iterator(void);
+	//	{
+	//
+	//		return new CProfileIterator( &Root );
+	//	}
+	static void Release_Iterator(CProfileIterator* iterator) { delete (iterator); }
+
+	static void dumpRecursive(CProfileIterator* profileIterator, int spacing);
+
+	static void dumpAll();
+
+private:
+	static int FrameCounter;
+	static unsigned long int ResetTime;
+};
+
+#endif  //#ifndef BT_NO_PROFILE
+
+///ProfileSampleClass is a simple way to profile a function's scope
+///Use the BT_PROFILE macro at the start of scope to time
+class CProfileSample
+{
+public:
+	CProfileSample(const char* name);
+
+	~CProfileSample(void);
+};
+
+#define BT_PROFILE(name) CProfileSample __profile(name)
+
+#endif  //BT_QUICK_PROF_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btRandom.h b/dali-physics/third-party/bullet3/src/LinearMath/btRandom.h
new file mode 100644
index 0000000..7753130
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btRandom.h
@@ -0,0 +1,39 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_GEN_RANDOM_H
+#define BT_GEN_RANDOM_H
+
+#ifdef MT19937
+
+#include <limits.h>
+#include <mt19937.h>
+
+#define GEN_RAND_MAX UINT_MAX
+
+SIMD_FORCE_INLINE void GEN_srand(unsigned int seed) { init_genrand(seed); }
+SIMD_FORCE_INLINE unsigned int GEN_rand() { return genrand_int32(); }
+
+#else
+
+#include <stdlib.h>
+
+#define GEN_RAND_MAX RAND_MAX
+
+SIMD_FORCE_INLINE void GEN_srand(unsigned int seed) { srand(seed); }
+SIMD_FORCE_INLINE unsigned int GEN_rand() { return rand(); }
+
+#endif
+
+#endif  //BT_GEN_RANDOM_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btReducedVector.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btReducedVector.cpp
new file mode 100644
index 0000000..1539584
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btReducedVector.cpp
@@ -0,0 +1,170 @@
+//
+//  btReducedVector.cpp
+//  LinearMath
+//
+//  Created by Xuchen Han on 4/4/20.
+//
+#include <stdio.h>
+#include "btReducedVector.h"
+#include <cmath>
+
+// returns the projection of this onto other
+btReducedVector btReducedVector::proj(const btReducedVector& other) const
+{
+    btReducedVector ret(m_sz);
+    btScalar other_length2 = other.length2();
+    if (other_length2 < SIMD_EPSILON)
+    {
+        return ret;
+    }
+    return other*(this->dot(other))/other_length2;
+}
+
+void btReducedVector::normalize()
+{
+    if (this->length2() < SIMD_EPSILON)
+    {
+        m_indices.clear();
+        m_vecs.clear();
+        return;
+    }
+    *this /= std::sqrt(this->length2());
+}
+
+bool btReducedVector::testAdd() const
+{
+    int sz = 5;
+    btAlignedObjectArray<int> id1;
+    id1.push_back(1);
+    id1.push_back(3);
+    btAlignedObjectArray<btVector3> v1;
+    v1.push_back(btVector3(1,0,1));
+    v1.push_back(btVector3(3,1,5));
+    btAlignedObjectArray<int> id2;
+    id2.push_back(2);
+    id2.push_back(3);
+    id2.push_back(5);
+    btAlignedObjectArray<btVector3> v2;
+    v2.push_back(btVector3(2,3,1));
+    v2.push_back(btVector3(3,4,9));
+    v2.push_back(btVector3(0,4,0));
+    btAlignedObjectArray<int> id3;
+    id3.push_back(1);
+    id3.push_back(2);
+    id3.push_back(3);
+    id3.push_back(5);
+    btAlignedObjectArray<btVector3> v3;
+    v3.push_back(btVector3(1,0,1));
+    v3.push_back(btVector3(2,3,1));
+    v3.push_back(btVector3(6,5,14));
+    v3.push_back(btVector3(0,4,0));
+    btReducedVector rv1(sz, id1, v1);
+    btReducedVector rv2(sz, id2, v2);
+    btReducedVector ans(sz, id3, v3);
+    bool ret = ((ans == rv1+rv2) && (ans == rv2+rv1));
+    if (!ret)
+        printf("btReducedVector testAdd failed\n");
+    return ret;
+}
+
+bool btReducedVector::testMinus() const
+{
+    int sz = 5;
+    btAlignedObjectArray<int> id1;
+    id1.push_back(1);
+    id1.push_back(3);
+    btAlignedObjectArray<btVector3> v1;
+    v1.push_back(btVector3(1,0,1));
+    v1.push_back(btVector3(3,1,5));
+    btAlignedObjectArray<int> id2;
+    id2.push_back(2);
+    id2.push_back(3);
+    id2.push_back(5);
+    btAlignedObjectArray<btVector3> v2;
+    v2.push_back(btVector3(2,3,1));
+    v2.push_back(btVector3(3,4,9));
+    v2.push_back(btVector3(0,4,0));
+    btAlignedObjectArray<int> id3;
+    id3.push_back(1);
+    id3.push_back(2);
+    id3.push_back(3);
+    id3.push_back(5);
+    btAlignedObjectArray<btVector3> v3;
+    v3.push_back(btVector3(-1,-0,-1));
+    v3.push_back(btVector3(2,3,1));
+    v3.push_back(btVector3(0,3,4));
+    v3.push_back(btVector3(0,4,0));
+    btReducedVector rv1(sz, id1, v1);
+    btReducedVector rv2(sz, id2, v2);
+    btReducedVector ans(sz, id3, v3);
+    bool ret = (ans == rv2-rv1);
+    if (!ret)
+        printf("btReducedVector testMinus failed\n");
+    return ret;
+}
+
+bool btReducedVector::testDot() const
+{
+    int sz = 5;
+    btAlignedObjectArray<int> id1;
+    id1.push_back(1);
+    id1.push_back(3);
+    btAlignedObjectArray<btVector3> v1;
+    v1.push_back(btVector3(1,0,1));
+    v1.push_back(btVector3(3,1,5));
+    btAlignedObjectArray<int> id2;
+    id2.push_back(2);
+    id2.push_back(3);
+    id2.push_back(5);
+    btAlignedObjectArray<btVector3> v2;
+    v2.push_back(btVector3(2,3,1));
+    v2.push_back(btVector3(3,4,9));
+    v2.push_back(btVector3(0,4,0));
+    btReducedVector rv1(sz, id1, v1);
+    btReducedVector rv2(sz, id2, v2);
+    btScalar ans = 58;
+    bool ret = (ans == rv2.dot(rv1) && ans == rv1.dot(rv2));
+    ans = 14+16+9+16+81;
+    ret &= (ans==rv2.dot(rv2));
+    
+    if (!ret)
+        printf("btReducedVector testDot failed\n");
+    return ret;
+}
+
+bool btReducedVector::testMultiply() const
+{
+    int sz = 5;
+    btAlignedObjectArray<int> id1;
+    id1.push_back(1);
+    id1.push_back(3);
+    btAlignedObjectArray<btVector3> v1;
+    v1.push_back(btVector3(1,0,1));
+    v1.push_back(btVector3(3,1,5));
+    btScalar s = 2;
+    btReducedVector rv1(sz, id1, v1);
+    btAlignedObjectArray<int> id2;
+    id2.push_back(1);
+    id2.push_back(3);
+    btAlignedObjectArray<btVector3> v2;
+    v2.push_back(btVector3(2,0,2));
+    v2.push_back(btVector3(6,2,10));
+    btReducedVector ans(sz, id2, v2);
+    bool ret = (ans == rv1*s);
+    if (!ret)
+        printf("btReducedVector testMultiply failed\n");
+    return ret;
+}
+
+void btReducedVector::test() const
+{
+    bool ans = testAdd() && testMinus() && testDot() && testMultiply();
+    if (ans)
+    {
+        printf("All tests passed\n");
+    }
+    else
+    {
+        printf("Tests failed\n");
+    }
+}
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btReducedVector.h b/dali-physics/third-party/bullet3/src/LinearMath/btReducedVector.h
new file mode 100644
index 0000000..313a427
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btReducedVector.h
@@ -0,0 +1,320 @@
+//
+//  btReducedVectors.h
+//  BulletLinearMath
+//
+//  Created by Xuchen Han on 4/4/20.
+//
+#ifndef btReducedVectors_h
+#define btReducedVectors_h
+#include "btVector3.h"
+#include "btMatrix3x3.h"
+#include "btAlignedObjectArray.h"
+#include <stdio.h>
+#include <vector>
+#include <algorithm>
+struct TwoInts
+{
+    int a,b;
+};
+inline bool operator<(const TwoInts& A, const TwoInts& B)
+{
+    return A.b < B.b;
+}
+
+
+// A helper vector type used for CG projections
+class btReducedVector
+{
+public:
+    btAlignedObjectArray<int> m_indices;
+    btAlignedObjectArray<btVector3> m_vecs;
+    int m_sz; // all m_indices value < m_sz
+public:
+	btReducedVector():m_sz(0)
+	{
+		m_indices.resize(0);
+		m_vecs.resize(0);
+        m_indices.clear();
+        m_vecs.clear();
+	}
+	
+    btReducedVector(int sz): m_sz(sz)
+    {
+        m_indices.resize(0);
+        m_vecs.resize(0);
+        m_indices.clear();
+        m_vecs.clear();
+    }
+    
+    btReducedVector(int sz, const btAlignedObjectArray<int>& indices, const btAlignedObjectArray<btVector3>& vecs): m_sz(sz), m_indices(indices), m_vecs(vecs)
+    {
+    }
+    
+    void simplify()
+    {
+        btAlignedObjectArray<int> old_indices(m_indices);
+        btAlignedObjectArray<btVector3> old_vecs(m_vecs);
+        m_indices.resize(0);
+        m_vecs.resize(0);
+        m_indices.clear();
+        m_vecs.clear();
+        for (int i = 0; i < old_indices.size(); ++i)
+        {
+            if (old_vecs[i].length2() > SIMD_EPSILON)
+            {
+                m_indices.push_back(old_indices[i]);
+                m_vecs.push_back(old_vecs[i]);
+            }
+        }
+    }
+    
+    btReducedVector operator+(const btReducedVector& other)
+    {
+		btReducedVector ret(m_sz);
+		int i=0, j=0;
+		while (i < m_indices.size() && j < other.m_indices.size())
+		{
+			if (m_indices[i] < other.m_indices[j])
+			{
+				ret.m_indices.push_back(m_indices[i]);
+				ret.m_vecs.push_back(m_vecs[i]);
+				++i;
+			}
+			else if (m_indices[i] > other.m_indices[j])
+			{
+				ret.m_indices.push_back(other.m_indices[j]);
+				ret.m_vecs.push_back(other.m_vecs[j]);
+				++j;
+			}
+			else
+			{
+				ret.m_indices.push_back(other.m_indices[j]);
+				ret.m_vecs.push_back(m_vecs[i] + other.m_vecs[j]);
+				++i; ++j;
+			}
+		}
+		while (i < m_indices.size())
+		{
+			ret.m_indices.push_back(m_indices[i]);
+			ret.m_vecs.push_back(m_vecs[i]);
+			++i;
+		}
+		while (j < other.m_indices.size())
+		{
+			ret.m_indices.push_back(other.m_indices[j]);
+			ret.m_vecs.push_back(other.m_vecs[j]);
+			++j;
+		}
+        ret.simplify();
+        return ret;
+    }
+
+    btReducedVector operator-()
+    {
+        btReducedVector ret(m_sz);
+        for (int i = 0; i < m_indices.size(); ++i)
+        {
+            ret.m_indices.push_back(m_indices[i]);
+            ret.m_vecs.push_back(-m_vecs[i]);
+        }
+        ret.simplify();
+        return ret;
+    }
+    
+    btReducedVector operator-(const btReducedVector& other)
+    {
+		btReducedVector ret(m_sz);
+		int i=0, j=0;
+		while (i < m_indices.size() && j < other.m_indices.size())
+		{
+			if (m_indices[i] < other.m_indices[j])
+			{
+				ret.m_indices.push_back(m_indices[i]);
+				ret.m_vecs.push_back(m_vecs[i]);
+				++i;
+			}
+			else if (m_indices[i] > other.m_indices[j])
+			{
+				ret.m_indices.push_back(other.m_indices[j]);
+				ret.m_vecs.push_back(-other.m_vecs[j]);
+				++j;
+			}
+			else
+			{
+				ret.m_indices.push_back(other.m_indices[j]);
+				ret.m_vecs.push_back(m_vecs[i] - other.m_vecs[j]);
+				++i; ++j;
+			}
+		}
+		while (i < m_indices.size())
+		{
+			ret.m_indices.push_back(m_indices[i]);
+			ret.m_vecs.push_back(m_vecs[i]);
+			++i;
+		}
+		while (j < other.m_indices.size())
+		{
+			ret.m_indices.push_back(other.m_indices[j]);
+			ret.m_vecs.push_back(-other.m_vecs[j]);
+			++j;
+		}
+        ret.simplify();
+		return ret;
+    }
+    
+    bool operator==(const btReducedVector& other) const
+    {
+        if (m_sz != other.m_sz)
+            return false;
+        if (m_indices.size() != other.m_indices.size())
+            return false;
+        for (int i = 0; i < m_indices.size(); ++i)
+        {
+            if (m_indices[i] != other.m_indices[i] || m_vecs[i] != other.m_vecs[i])
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    bool operator!=(const btReducedVector& other) const
+    {
+        return !(*this == other);
+    }
+	
+	btReducedVector& operator=(const btReducedVector& other)
+	{
+		if (this == &other)
+		{
+			return *this;
+		}
+        m_sz = other.m_sz;
+		m_indices.copyFromArray(other.m_indices);
+		m_vecs.copyFromArray(other.m_vecs);
+		return *this;
+	}
+    
+    btScalar dot(const btReducedVector& other) const
+    {
+        btScalar ret = 0;
+        int j = 0;
+        for (int i = 0; i < m_indices.size(); ++i)
+        {
+            while (j < other.m_indices.size() && other.m_indices[j] < m_indices[i])
+            {
+                ++j;
+            }
+            if (j < other.m_indices.size() && other.m_indices[j] == m_indices[i])
+            {
+                ret += m_vecs[i].dot(other.m_vecs[j]);
+//                ++j;
+            }
+        }
+        return ret;
+    }
+    
+    btScalar dot(const btAlignedObjectArray<btVector3>& other) const
+    {
+        btScalar ret = 0;
+        for (int i = 0; i < m_indices.size(); ++i)
+        {
+            ret += m_vecs[i].dot(other[m_indices[i]]);
+        }
+        return ret;
+    }
+    
+    btScalar length2() const
+    {
+        return this->dot(*this);
+    }
+	
+	void normalize();
+    
+    // returns the projection of this onto other
+    btReducedVector proj(const btReducedVector& other) const;
+    
+    bool testAdd() const;
+    
+    bool testMinus() const;
+    
+    bool testDot() const;
+    
+    bool testMultiply() const;
+    
+    void test() const;
+    
+    void print() const
+    {
+        for (int i = 0; i < m_indices.size(); ++i)
+        {
+            printf("%d: (%f, %f, %f)/", m_indices[i], m_vecs[i][0],m_vecs[i][1],m_vecs[i][2]);
+        }
+        printf("\n");
+    }
+    
+    
+    void sort()
+    {
+        std::vector<TwoInts> tuples;
+        for (int i = 0; i < m_indices.size(); ++i)
+        {
+            TwoInts ti;
+            ti.a = i;
+            ti.b = m_indices[i];
+            tuples.push_back(ti);
+        }
+        std::sort(tuples.begin(), tuples.end());
+        btAlignedObjectArray<int> new_indices;
+        btAlignedObjectArray<btVector3> new_vecs;
+        for (size_t i = 0; i < tuples.size(); ++i)
+        {
+            new_indices.push_back(tuples[i].b);
+            new_vecs.push_back(m_vecs[tuples[i].a]);
+        }
+        m_indices = new_indices;
+        m_vecs = new_vecs;
+    }
+};
+
+SIMD_FORCE_INLINE btReducedVector operator*(const btReducedVector& v, btScalar s)
+{
+    btReducedVector ret(v.m_sz);
+    for (int i = 0; i < v.m_indices.size(); ++i)
+    {
+        ret.m_indices.push_back(v.m_indices[i]);
+        ret.m_vecs.push_back(s*v.m_vecs[i]);
+    }
+    ret.simplify();
+    return ret;
+}
+
+SIMD_FORCE_INLINE btReducedVector operator*(btScalar s, const btReducedVector& v)
+{
+    return v*s;
+}
+
+SIMD_FORCE_INLINE btReducedVector operator/(const btReducedVector& v, btScalar s)
+{
+	return v * (1.0/s);
+}
+
+SIMD_FORCE_INLINE btReducedVector& operator/=(btReducedVector& v, btScalar s)
+{
+	v = v/s;
+	return v;
+}
+
+SIMD_FORCE_INLINE btReducedVector& operator+=(btReducedVector& v1, const btReducedVector& v2)
+{
+	v1 = v1+v2;
+	return v1;
+}
+
+SIMD_FORCE_INLINE btReducedVector& operator-=(btReducedVector& v1, const btReducedVector& v2)
+{
+	v1 = v1-v2;
+	return v1;
+}
+
+#endif /* btReducedVectors_h */
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btScalar.h b/dali-physics/third-party/bullet3/src/LinearMath/btScalar.h
new file mode 100644
index 0000000..dea1b05
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btScalar.h
@@ -0,0 +1,832 @@
+/*
+Copyright (c) 2003-2009 Erwin Coumans  http://bullet.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SCALAR_H
+#define BT_SCALAR_H
+
+#ifdef BT_MANAGED_CODE
+//Aligned data types not supported in managed code
+#pragma unmanaged
+#endif
+
+#include <math.h>
+#include <stdlib.h>  //size_t for MSVC 6.0
+#include <float.h>
+
+/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
+#define BT_BULLET_VERSION 325
+
+inline int btGetVersion()
+{
+	return BT_BULLET_VERSION;
+}
+
+inline int btIsDoublePrecision()
+{
+  #ifdef BT_USE_DOUBLE_PRECISION
+  return true;
+  #else
+  return false;
+  #endif
+}
+
+
+// The following macro "BT_NOT_EMPTY_FILE" can be put into a file
+// in order suppress the MS Visual C++ Linker warning 4221
+//
+// warning LNK4221: no public symbols found; archive member will be inaccessible
+//
+// This warning occurs on PC and XBOX when a file compiles out completely
+// has no externally visible symbols which may be dependant on configuration
+// #defines and options.
+//
+// see more https://stackoverflow.com/questions/1822887/what-is-the-best-way-to-eliminate-ms-visual-c-linker-warning-warning-lnk422
+
+#if defined(_MSC_VER)
+#define BT_NOT_EMPTY_FILE_CAT_II(p, res) res
+#define BT_NOT_EMPTY_FILE_CAT_I(a, b) BT_NOT_EMPTY_FILE_CAT_II(~, a##b)
+#define BT_NOT_EMPTY_FILE_CAT(a, b) BT_NOT_EMPTY_FILE_CAT_I(a, b)
+#define BT_NOT_EMPTY_FILE                                      \
+	namespace                                                  \
+	{                                                          \
+	char BT_NOT_EMPTY_FILE_CAT(NoEmptyFileDummy, __COUNTER__); \
+	}
+#else
+#define BT_NOT_EMPTY_FILE
+#endif
+
+// clang and most formatting tools don't support indentation of preprocessor guards, so turn it off
+// clang-format off
+#if defined(DEBUG) || defined (_DEBUG)
+	#define BT_DEBUG
+#endif
+
+#ifdef _WIN32
+	#if  defined(__GNUC__)	// it should handle both MINGW and CYGWIN
+        	#define SIMD_FORCE_INLINE        __inline__ __attribute__((always_inline))
+        	#define ATTRIBUTE_ALIGNED16(a)   a __attribute__((aligned(16)))
+        	#define ATTRIBUTE_ALIGNED64(a)   a __attribute__((aligned(64)))
+        	#define ATTRIBUTE_ALIGNED128(a)  a __attribute__((aligned(128)))
+    	#elif ( defined(_MSC_VER) && _MSC_VER < 1300 )
+		#define SIMD_FORCE_INLINE inline
+		#define ATTRIBUTE_ALIGNED16(a) a
+		#define ATTRIBUTE_ALIGNED64(a) a
+		#define ATTRIBUTE_ALIGNED128(a) a
+	#elif defined(_M_ARM)
+		#define SIMD_FORCE_INLINE __forceinline
+		#define ATTRIBUTE_ALIGNED16(a) __declspec() a
+		#define ATTRIBUTE_ALIGNED64(a) __declspec() a
+		#define ATTRIBUTE_ALIGNED128(a) __declspec () a
+	#else//__MINGW32__
+		//#define BT_HAS_ALIGNED_ALLOCATOR
+		#pragma warning(disable : 4324) // disable padding warning
+//			#pragma warning(disable:4530) // Disable the exception disable but used in MSCV Stl warning.
+		#pragma warning(disable:4996) //Turn off warnings about deprecated C routines
+//			#pragma warning(disable:4786) // Disable the "debug name too long" warning
+
+		#define SIMD_FORCE_INLINE __forceinline
+		#define ATTRIBUTE_ALIGNED16(a) __declspec(align(16)) a
+		#define ATTRIBUTE_ALIGNED64(a) __declspec(align(64)) a
+		#define ATTRIBUTE_ALIGNED128(a) __declspec (align(128)) a
+		#ifdef _XBOX
+			#define BT_USE_VMX128
+
+			#include <ppcintrinsics.h>
+ 			#define BT_HAVE_NATIVE_FSEL
+ 			#define btFsel(a,b,c) __fsel((a),(b),(c))
+		#else
+
+#if defined (_M_ARM) || defined (_M_ARM64)
+            //Do not turn SSE on for ARM (may want to turn on BT_USE_NEON however)
+#elif (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION))
+
+#ifdef __clang__
+#define __BT_DISABLE_SSE__
+#endif
+#ifndef __BT_DISABLE_SSE__
+			#if _MSC_VER>1400
+				#define BT_USE_SIMD_VECTOR3
+			#endif
+			#define BT_USE_SSE
+#endif//__BT_DISABLE_SSE__
+			#ifdef BT_USE_SSE
+
+#if (_MSC_FULL_VER >= 170050727)//Visual Studio 2012 can compile SSE4/FMA3 (but SSE4/FMA3 is not enabled by default)
+			#define BT_ALLOW_SSE4
+#endif //(_MSC_FULL_VER >= 160040219)
+
+			//BT_USE_SSE_IN_API is disabled under Windows by default, because 
+			//it makes it harder to integrate Bullet into your application under Windows 
+			//(structured embedding Bullet structs/classes need to be 16-byte aligned)
+			//with relatively little performance gain
+			//If you are not embedded Bullet data in your classes, or make sure that you align those classes on 16-byte boundaries
+			//you can manually enable this line or set it in the build system for a bit of performance gain (a few percent, dependent on usage)
+			//#define BT_USE_SSE_IN_API
+			#endif //BT_USE_SSE
+			#include <emmintrin.h>
+#endif
+
+		#endif//_XBOX
+
+	#endif //__MINGW32__
+
+	#ifdef BT_DEBUG
+		#ifdef _MSC_VER
+			#include <stdio.h>
+			#define btAssert(x) { if(!(x)){printf("Assert " __FILE__ ":%u (%s)\n", __LINE__, #x);__debugbreak();	}}
+		#else//_MSC_VER
+			#include <assert.h>
+			#define btAssert assert
+		#endif//_MSC_VER
+	#else
+		#define btAssert(x)
+	#endif
+		//btFullAssert is optional, slows down a lot
+		#define btFullAssert(x)
+
+		#define btLikely(_c)  _c
+		#define btUnlikely(_c) _c
+
+#else//_WIN32
+	
+	#if defined	(__CELLOS_LV2__)
+		#define SIMD_FORCE_INLINE inline __attribute__((always_inline))
+		#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
+		#define ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64)))
+		#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
+		#ifndef assert
+		#include <assert.h>
+		#endif
+		#ifdef BT_DEBUG
+			#ifdef __SPU__
+				#include <spu_printf.h>
+				#define printf spu_printf
+				#define btAssert(x) {if(!(x)){printf("Assert " __FILE__ ":%u ("#x")\n", __LINE__);spu_hcmpeq(0,0);}}
+			#else
+				#define btAssert assert
+			#endif
+	
+		#else//BT_DEBUG
+				#define btAssert(x)
+		#endif//BT_DEBUG
+		//btFullAssert is optional, slows down a lot
+		#define btFullAssert(x)
+
+		#define btLikely(_c)  _c
+		#define btUnlikely(_c) _c
+
+	#else//defined	(__CELLOS_LV2__)
+
+		#ifdef USE_LIBSPE2
+
+			#define SIMD_FORCE_INLINE __inline
+			#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
+			#define ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64)))
+			#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
+			#ifndef assert
+			#include <assert.h>
+			#endif
+	#ifdef BT_DEBUG
+			#define btAssert assert
+	#else
+			#define btAssert(x)
+	#endif
+			//btFullAssert is optional, slows down a lot
+			#define btFullAssert(x)
+
+
+			#define btLikely(_c)   __builtin_expect((_c), 1)
+			#define btUnlikely(_c) __builtin_expect((_c), 0)
+		
+
+		#else//USE_LIBSPE2
+	//non-windows systems
+
+			#if (defined (__APPLE__) && (!defined (BT_USE_DOUBLE_PRECISION)))
+				#if defined (__i386__) || defined (__x86_64__)
+					#define BT_USE_SIMD_VECTOR3
+					#define BT_USE_SSE
+					//BT_USE_SSE_IN_API is enabled on Mac OSX by default, because memory is automatically aligned on 16-byte boundaries
+					//if apps run into issues, we will disable the next line
+					#define BT_USE_SSE_IN_API
+					#ifdef BT_USE_SSE
+						// include appropriate SSE level
+						#if defined (__SSE4_1__)
+							#include <smmintrin.h>
+						#elif defined (__SSSE3__)
+							#include <tmmintrin.h>
+						#elif defined (__SSE3__)
+							#include <pmmintrin.h>
+						#else
+							#include <emmintrin.h>
+						#endif
+					#endif //BT_USE_SSE
+				#elif defined( __ARM_NEON__ )
+					#ifdef __clang__
+						#define BT_USE_NEON 1
+						#define BT_USE_SIMD_VECTOR3
+		
+						#if defined BT_USE_NEON && defined (__clang__)
+							#include <arm_neon.h>
+						#endif//BT_USE_NEON
+				   #endif //__clang__
+				#endif//__arm__
+
+				#define SIMD_FORCE_INLINE inline __attribute__ ((always_inline))
+			///@todo: check out alignment methods for other platforms/compilers
+				#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
+				#define ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64)))
+				#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
+				#ifndef assert
+				#include <assert.h>
+				#endif
+
+				#if defined(DEBUG) || defined (_DEBUG)
+				 #if defined (__i386__) || defined (__x86_64__)
+				#include <stdio.h>
+				 #define btAssert(x)\
+				{\
+				if(!(x))\
+				{\
+					printf("Assert %s in line %d, file %s\n",#x, __LINE__, __FILE__);\
+					asm volatile ("int3");\
+				}\
+				}
+				#else//defined (__i386__) || defined (__x86_64__)
+					#define btAssert assert
+				#endif//defined (__i386__) || defined (__x86_64__)
+				#else//defined(DEBUG) || defined (_DEBUG)
+					#define btAssert(x)
+				#endif//defined(DEBUG) || defined (_DEBUG)
+
+				//btFullAssert is optional, slows down a lot
+				#define btFullAssert(x)
+				#define btLikely(_c)  _c
+				#define btUnlikely(_c) _c
+
+			#else//__APPLE__
+
+				#define SIMD_FORCE_INLINE inline
+				///@todo: check out alignment methods for other platforms/compilers
+				///#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
+				///#define ATTRIBUTE_ALIGNED64(a) a __attribute__ ((aligned (64)))
+				///#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
+				#define ATTRIBUTE_ALIGNED16(a) a
+				#define ATTRIBUTE_ALIGNED64(a) a
+				#define ATTRIBUTE_ALIGNED128(a) a
+				#ifndef assert
+				#include <assert.h>
+				#endif
+
+				#if defined(DEBUG) || defined (_DEBUG)
+					#define btAssert assert
+				#else
+					#define btAssert(x)
+				#endif
+
+				//btFullAssert is optional, slows down a lot
+				#define btFullAssert(x)
+				#define btLikely(_c)  _c
+				#define btUnlikely(_c) _c
+			#endif //__APPLE__ 
+		#endif // LIBSPE2
+	#endif	//__CELLOS_LV2__
+#endif//_WIN32
+
+
+///The btScalar type abstracts floating point numbers, to easily switch between double and single floating point precision.
+#if defined(BT_USE_DOUBLE_PRECISION)
+	typedef double btScalar;
+	//this number could be bigger in double precision
+	#define BT_LARGE_FLOAT 1e30
+#else
+	typedef float btScalar;
+	//keep BT_LARGE_FLOAT*BT_LARGE_FLOAT < FLT_MAX
+	#define BT_LARGE_FLOAT 1e18f
+#endif
+
+#ifdef BT_USE_SSE
+	typedef __m128 btSimdFloat4;
+#endif  //BT_USE_SSE
+
+#if defined(BT_USE_SSE)
+	//#if defined BT_USE_SSE_IN_API && defined (BT_USE_SSE)
+	#ifdef _WIN32
+
+		#ifndef BT_NAN
+			static int btNanMask = 0x7F800001;
+			#define BT_NAN (*(float *)&btNanMask)
+		#endif
+
+		#ifndef BT_INFINITY
+			static int btInfinityMask = 0x7F800000;
+			#define BT_INFINITY (*(float *)&btInfinityMask)
+			inline int btGetInfinityMask()  //suppress stupid compiler warning
+			{
+				return btInfinityMask;
+			}
+		#endif
+
+
+
+	//use this, in case there are clashes (such as xnamath.h)
+	#ifndef BT_NO_SIMD_OPERATOR_OVERLOADS
+	inline __m128 operator+(const __m128 A, const __m128 B)
+	{
+		return _mm_add_ps(A, B);
+	}
+
+	inline __m128 operator-(const __m128 A, const __m128 B)
+	{
+		return _mm_sub_ps(A, B);
+	}
+
+	inline __m128 operator*(const __m128 A, const __m128 B)
+	{
+		return _mm_mul_ps(A, B);
+	}
+	#endif  //BT_NO_SIMD_OPERATOR_OVERLOADS
+
+	#define btCastfTo128i(a) (_mm_castps_si128(a))
+	#define btCastfTo128d(a) (_mm_castps_pd(a))
+	#define btCastiTo128f(a) (_mm_castsi128_ps(a))
+	#define btCastdTo128f(a) (_mm_castpd_ps(a))
+	#define btCastdTo128i(a) (_mm_castpd_si128(a))
+	#define btAssign128(r0, r1, r2, r3) _mm_setr_ps(r0, r1, r2, r3)
+
+	#else  //_WIN32
+
+		#define btCastfTo128i(a) ((__m128i)(a))
+		#define btCastfTo128d(a) ((__m128d)(a))
+		#define btCastiTo128f(a) ((__m128)(a))
+		#define btCastdTo128f(a) ((__m128)(a))
+		#define btCastdTo128i(a) ((__m128i)(a))
+		#define btAssign128(r0, r1, r2, r3) \
+			(__m128) { r0, r1, r2, r3 }
+		#define BT_INFINITY INFINITY
+		#define BT_NAN NAN
+	#endif  //_WIN32
+#else//BT_USE_SSE
+
+	#ifdef BT_USE_NEON
+	#include <arm_neon.h>
+
+	typedef float32x4_t btSimdFloat4;
+	#define BT_INFINITY INFINITY
+	#define BT_NAN NAN
+	#define btAssign128(r0, r1, r2, r3) \
+		(float32x4_t) { r0, r1, r2, r3 }
+	#else  //BT_USE_NEON
+
+	#ifndef BT_INFINITY
+	struct btInfMaskConverter
+	{
+		union {
+			float mask;
+			int intmask;
+		};
+		btInfMaskConverter(int _mask = 0x7F800000)
+			: intmask(_mask)
+		{
+		}
+	};
+	static btInfMaskConverter btInfinityMask = 0x7F800000;
+	#define BT_INFINITY (btInfinityMask.mask)
+	inline int btGetInfinityMask()  //suppress stupid compiler warning
+	{
+		return btInfinityMask.intmask;
+	}
+	#endif
+	#endif  //BT_USE_NEON
+
+#endif  //BT_USE_SSE
+
+#ifdef BT_USE_NEON
+	#include <arm_neon.h>
+
+	typedef float32x4_t btSimdFloat4;
+	#define BT_INFINITY INFINITY
+	#define BT_NAN NAN
+	#define btAssign128(r0, r1, r2, r3) \
+		(float32x4_t) { r0, r1, r2, r3 }
+#endif//BT_USE_NEON
+
+#define BT_DECLARE_ALIGNED_ALLOCATOR()                                                                     \
+	SIMD_FORCE_INLINE void *operator new(size_t sizeInBytes) { return btAlignedAlloc(sizeInBytes, 16); }   \
+	SIMD_FORCE_INLINE void operator delete(void *ptr) { btAlignedFree(ptr); }                              \
+	SIMD_FORCE_INLINE void *operator new(size_t, void *ptr) { return ptr; }                                \
+	SIMD_FORCE_INLINE void operator delete(void *, void *) {}                                              \
+	SIMD_FORCE_INLINE void *operator new[](size_t sizeInBytes) { return btAlignedAlloc(sizeInBytes, 16); } \
+	SIMD_FORCE_INLINE void operator delete[](void *ptr) { btAlignedFree(ptr); }                            \
+	SIMD_FORCE_INLINE void *operator new[](size_t, void *ptr) { return ptr; }                              \
+	SIMD_FORCE_INLINE void operator delete[](void *, void *) {}
+
+#if defined(BT_USE_DOUBLE_PRECISION) || defined(BT_FORCE_DOUBLE_FUNCTIONS)
+
+	SIMD_FORCE_INLINE btScalar btSqrt(btScalar x)
+	{
+		return sqrt(x);
+	}
+	SIMD_FORCE_INLINE btScalar btFabs(btScalar x) { return fabs(x); }
+	SIMD_FORCE_INLINE btScalar btCos(btScalar x) { return cos(x); }
+	SIMD_FORCE_INLINE btScalar btSin(btScalar x) { return sin(x); }
+	SIMD_FORCE_INLINE btScalar btTan(btScalar x) { return tan(x); }
+	SIMD_FORCE_INLINE btScalar btAcos(btScalar x)
+	{
+		if (x < btScalar(-1)) x = btScalar(-1);
+		if (x > btScalar(1)) x = btScalar(1);
+		return acos(x);
+	}
+	SIMD_FORCE_INLINE btScalar btAsin(btScalar x)
+	{
+		if (x < btScalar(-1)) x = btScalar(-1);
+		if (x > btScalar(1)) x = btScalar(1);
+		return asin(x);
+	}
+	SIMD_FORCE_INLINE btScalar btAtan(btScalar x) { return atan(x); }
+	SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2(x, y); }
+	SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return exp(x); }
+	SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return log(x); }
+	SIMD_FORCE_INLINE btScalar btPow(btScalar x, btScalar y) { return pow(x, y); }
+	SIMD_FORCE_INLINE btScalar btFmod(btScalar x, btScalar y) { return fmod(x, y); }
+
+#else//BT_USE_DOUBLE_PRECISION
+
+	SIMD_FORCE_INLINE btScalar btSqrt(btScalar y)
+	{
+	#ifdef USE_APPROXIMATION
+	#ifdef __LP64__
+		float xhalf = 0.5f * y;
+		int i = *(int *)&y;
+		i = 0x5f375a86 - (i >> 1);
+		y = *(float *)&i;
+		y = y * (1.5f - xhalf * y * y);
+		y = y * (1.5f - xhalf * y * y);
+		y = y * (1.5f - xhalf * y * y);
+		y = 1 / y;
+		return y;
+	#else
+		double x, z, tempf;
+		unsigned long *tfptr = ((unsigned long *)&tempf) + 1;
+		tempf = y;
+		*tfptr = (0xbfcdd90a - *tfptr) >> 1; /* estimate of 1/sqrt(y) */
+		x = tempf;
+		z = y * btScalar(0.5);
+		x = (btScalar(1.5) * x) - (x * x) * (x * z); /* iteration formula     */
+		x = (btScalar(1.5) * x) - (x * x) * (x * z);
+		x = (btScalar(1.5) * x) - (x * x) * (x * z);
+		x = (btScalar(1.5) * x) - (x * x) * (x * z);
+		x = (btScalar(1.5) * x) - (x * x) * (x * z);
+		return x * y;
+	#endif
+	#else
+		return sqrtf(y);
+	#endif
+	}
+	SIMD_FORCE_INLINE btScalar btFabs(btScalar x) { return fabsf(x); }
+	SIMD_FORCE_INLINE btScalar btCos(btScalar x) { return cosf(x); }
+	SIMD_FORCE_INLINE btScalar btSin(btScalar x) { return sinf(x); }
+	SIMD_FORCE_INLINE btScalar btTan(btScalar x) { return tanf(x); }
+	SIMD_FORCE_INLINE btScalar btAcos(btScalar x)
+	{
+		if (x < btScalar(-1))
+			x = btScalar(-1);
+		if (x > btScalar(1))
+			x = btScalar(1);
+		return acosf(x);
+	}
+	SIMD_FORCE_INLINE btScalar btAsin(btScalar x)
+	{
+		if (x < btScalar(-1))
+			x = btScalar(-1);
+		if (x > btScalar(1))
+			x = btScalar(1);
+		return asinf(x);
+	}
+	SIMD_FORCE_INLINE btScalar btAtan(btScalar x) { return atanf(x); }
+	SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
+	SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
+	SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
+	SIMD_FORCE_INLINE btScalar btPow(btScalar x, btScalar y) { return powf(x, y); }
+	SIMD_FORCE_INLINE btScalar btFmod(btScalar x, btScalar y) { return fmodf(x, y); }
+
+#endif//BT_USE_DOUBLE_PRECISION
+
+#define SIMD_PI btScalar(3.1415926535897932384626433832795029)
+#define SIMD_2_PI (btScalar(2.0) * SIMD_PI)
+#define SIMD_HALF_PI (SIMD_PI * btScalar(0.5))
+#define SIMD_RADS_PER_DEG (SIMD_2_PI / btScalar(360.0))
+#define SIMD_DEGS_PER_RAD (btScalar(360.0) / SIMD_2_PI)
+#define SIMDSQRT12 btScalar(0.7071067811865475244008443621048490)
+#define btRecipSqrt(x) ((btScalar)(btScalar(1.0) / btSqrt(btScalar(x)))) /* reciprocal square root */
+#define btRecip(x) (btScalar(1.0) / btScalar(x))
+
+#ifdef BT_USE_DOUBLE_PRECISION
+	#define SIMD_EPSILON DBL_EPSILON
+	#define SIMD_INFINITY DBL_MAX
+	#define BT_ONE 1.0
+	#define BT_ZERO 0.0
+	#define BT_TWO 2.0
+	#define BT_HALF 0.5
+#else
+	#define SIMD_EPSILON FLT_EPSILON
+	#define SIMD_INFINITY FLT_MAX
+	#define BT_ONE 1.0f
+	#define BT_ZERO 0.0f
+	#define BT_TWO 2.0f
+	#define BT_HALF 0.5f
+#endif
+
+// clang-format on
+
+SIMD_FORCE_INLINE btScalar btAtan2Fast(btScalar y, btScalar x)
+{
+	btScalar coeff_1 = SIMD_PI / 4.0f;
+	btScalar coeff_2 = 3.0f * coeff_1;
+	btScalar abs_y = btFabs(y);
+	btScalar angle;
+	if (x >= 0.0f)
+	{
+		btScalar r = (x - abs_y) / (x + abs_y);
+		angle = coeff_1 - coeff_1 * r;
+	}
+	else
+	{
+		btScalar r = (x + abs_y) / (abs_y - x);
+		angle = coeff_2 - coeff_1 * r;
+	}
+	return (y < 0.0f) ? -angle : angle;
+}
+
+SIMD_FORCE_INLINE bool btFuzzyZero(btScalar x) { return btFabs(x) < SIMD_EPSILON; }
+
+SIMD_FORCE_INLINE bool btEqual(btScalar a, btScalar eps)
+{
+	return (((a) <= eps) && !((a) < -eps));
+}
+SIMD_FORCE_INLINE bool btGreaterEqual(btScalar a, btScalar eps)
+{
+	return (!((a) <= eps));
+}
+
+SIMD_FORCE_INLINE int btIsNegative(btScalar x)
+{
+	return x < btScalar(0.0) ? 1 : 0;
+}
+
+SIMD_FORCE_INLINE btScalar btRadians(btScalar x) { return x * SIMD_RADS_PER_DEG; }
+SIMD_FORCE_INLINE btScalar btDegrees(btScalar x) { return x * SIMD_DEGS_PER_RAD; }
+
+#define BT_DECLARE_HANDLE(name) \
+	typedef struct name##__     \
+	{                           \
+		int unused;             \
+	} * name
+
+#ifndef btFsel
+SIMD_FORCE_INLINE btScalar btFsel(btScalar a, btScalar b, btScalar c)
+{
+	return a >= 0 ? b : c;
+}
+#endif
+#define btFsels(a, b, c) (btScalar) btFsel(a, b, c)
+
+SIMD_FORCE_INLINE bool btMachineIsLittleEndian()
+{
+	long int i = 1;
+	const char *p = (const char *)&i;
+	if (p[0] == 1)  // Lowest address contains the least significant byte
+		return true;
+	else
+		return false;
+}
+
+///btSelect avoids branches, which makes performance much better for consoles like Playstation 3 and XBox 360
+///Thanks Phil Knight. See also http://www.cellperformance.com/articles/2006/04/more_techniques_for_eliminatin_1.html
+SIMD_FORCE_INLINE unsigned btSelect(unsigned condition, unsigned valueIfConditionNonZero, unsigned valueIfConditionZero)
+{
+	// Set testNz to 0xFFFFFFFF if condition is nonzero, 0x00000000 if condition is zero
+	// Rely on positive value or'ed with its negative having sign bit on
+	// and zero value or'ed with its negative (which is still zero) having sign bit off
+	// Use arithmetic shift right, shifting the sign bit through all 32 bits
+	unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
+	unsigned testEqz = ~testNz;
+	return ((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz));
+}
+SIMD_FORCE_INLINE int btSelect(unsigned condition, int valueIfConditionNonZero, int valueIfConditionZero)
+{
+	unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
+	unsigned testEqz = ~testNz;
+	return static_cast<int>((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz));
+}
+SIMD_FORCE_INLINE float btSelect(unsigned condition, float valueIfConditionNonZero, float valueIfConditionZero)
+{
+#ifdef BT_HAVE_NATIVE_FSEL
+	return (float)btFsel((btScalar)condition - btScalar(1.0f), valueIfConditionNonZero, valueIfConditionZero);
+#else
+	return (condition != 0) ? valueIfConditionNonZero : valueIfConditionZero;
+#endif
+}
+
+template <typename T>
+SIMD_FORCE_INLINE void btSwap(T &a, T &b)
+{
+	T tmp = a;
+	a = b;
+	b = tmp;
+}
+
+//PCK: endian swapping functions
+SIMD_FORCE_INLINE unsigned btSwapEndian(unsigned val)
+{
+	return (((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24));
+}
+
+SIMD_FORCE_INLINE unsigned short btSwapEndian(unsigned short val)
+{
+	return static_cast<unsigned short>(((val & 0xff00) >> 8) | ((val & 0x00ff) << 8));
+}
+
+SIMD_FORCE_INLINE unsigned btSwapEndian(int val)
+{
+	return btSwapEndian((unsigned)val);
+}
+
+SIMD_FORCE_INLINE unsigned short btSwapEndian(short val)
+{
+	return btSwapEndian((unsigned short)val);
+}
+
+///btSwapFloat uses using char pointers to swap the endianness
+////btSwapFloat/btSwapDouble will NOT return a float, because the machine might 'correct' invalid floating point values
+///Not all values of sign/exponent/mantissa are valid floating point numbers according to IEEE 754.
+///When a floating point unit is faced with an invalid value, it may actually change the value, or worse, throw an exception.
+///In most systems, running user mode code, you wouldn't get an exception, but instead the hardware/os/runtime will 'fix' the number for you.
+///so instead of returning a float/double, we return integer/long long integer
+SIMD_FORCE_INLINE unsigned int btSwapEndianFloat(float d)
+{
+	unsigned int a = 0;
+	unsigned char *dst = (unsigned char *)&a;
+	unsigned char *src = (unsigned char *)&d;
+
+	dst[0] = src[3];
+	dst[1] = src[2];
+	dst[2] = src[1];
+	dst[3] = src[0];
+	return a;
+}
+
+// unswap using char pointers
+SIMD_FORCE_INLINE float btUnswapEndianFloat(unsigned int a)
+{
+	float d = 0.0f;
+	unsigned char *src = (unsigned char *)&a;
+	unsigned char *dst = (unsigned char *)&d;
+
+	dst[0] = src[3];
+	dst[1] = src[2];
+	dst[2] = src[1];
+	dst[3] = src[0];
+
+	return d;
+}
+
+// swap using char pointers
+SIMD_FORCE_INLINE void btSwapEndianDouble(double d, unsigned char *dst)
+{
+	unsigned char *src = (unsigned char *)&d;
+
+	dst[0] = src[7];
+	dst[1] = src[6];
+	dst[2] = src[5];
+	dst[3] = src[4];
+	dst[4] = src[3];
+	dst[5] = src[2];
+	dst[6] = src[1];
+	dst[7] = src[0];
+}
+
+// unswap using char pointers
+SIMD_FORCE_INLINE double btUnswapEndianDouble(const unsigned char *src)
+{
+	double d = 0.0;
+	unsigned char *dst = (unsigned char *)&d;
+
+	dst[0] = src[7];
+	dst[1] = src[6];
+	dst[2] = src[5];
+	dst[3] = src[4];
+	dst[4] = src[3];
+	dst[5] = src[2];
+	dst[6] = src[1];
+	dst[7] = src[0];
+
+	return d;
+}
+
+template <typename T>
+SIMD_FORCE_INLINE void btSetZero(T *a, int n)
+{
+	T *acurr = a;
+	size_t ncurr = n;
+	while (ncurr > 0)
+	{
+		*(acurr++) = 0;
+		--ncurr;
+	}
+}
+
+SIMD_FORCE_INLINE btScalar btLargeDot(const btScalar *a, const btScalar *b, int n)
+{
+	btScalar p0, q0, m0, p1, q1, m1, sum;
+	sum = 0;
+	n -= 2;
+	while (n >= 0)
+	{
+		p0 = a[0];
+		q0 = b[0];
+		m0 = p0 * q0;
+		p1 = a[1];
+		q1 = b[1];
+		m1 = p1 * q1;
+		sum += m0;
+		sum += m1;
+		a += 2;
+		b += 2;
+		n -= 2;
+	}
+	n += 2;
+	while (n > 0)
+	{
+		sum += (*a) * (*b);
+		a++;
+		b++;
+		n--;
+	}
+	return sum;
+}
+
+// returns normalized value in range [-SIMD_PI, SIMD_PI]
+SIMD_FORCE_INLINE btScalar btNormalizeAngle(btScalar angleInRadians)
+{
+	angleInRadians = btFmod(angleInRadians, SIMD_2_PI);
+	if (angleInRadians < -SIMD_PI)
+	{
+		return angleInRadians + SIMD_2_PI;
+	}
+	else if (angleInRadians > SIMD_PI)
+	{
+		return angleInRadians - SIMD_2_PI;
+	}
+	else
+	{
+		return angleInRadians;
+	}
+}
+
+///rudimentary class to provide type info
+struct btTypedObject
+{
+	btTypedObject(int objectType)
+		: m_objectType(objectType)
+	{
+	}
+	int m_objectType;
+	inline int getObjectType() const
+	{
+		return m_objectType;
+	}
+};
+
+///align a pointer to the provided alignment, upwards
+template <typename T>
+T *btAlignPointer(T *unalignedPtr, size_t alignment)
+{
+	struct btConvertPointerSizeT
+	{
+		union {
+			T *ptr;
+			size_t integer;
+		};
+	};
+	btConvertPointerSizeT converter;
+
+	const size_t bit_mask = ~(alignment - 1);
+	converter.ptr = unalignedPtr;
+	converter.integer += alignment - 1;
+	converter.integer &= bit_mask;
+	return converter.ptr;
+}
+
+#endif  //BT_SCALAR_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btSerializer.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btSerializer.cpp
new file mode 100644
index 0000000..068836f
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btSerializer.cpp
@@ -0,0 +1,692 @@
+char sBulletDNAstr[]= {
+char(83),char(68),char(78),char(65),char(78),char(65),char(77),char(69),char(-74),char(1),char(0),char(0),char(109),char(95),char(115),char(105),char(122),char(101),char(0),char(109),
+char(95),char(99),char(97),char(112),char(97),char(99),char(105),char(116),char(121),char(0),char(42),char(109),char(95),char(100),char(97),char(116),char(97),char(0),char(109),char(95),
+char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(115),char(0),char(109),char(95),char(99),char(111),
+char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110),
+char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(115),char(0),char(42),char(102),char(105),char(114),char(115),char(116),char(0),char(42),char(108),char(97),char(115),
+char(116),char(0),char(109),char(95),char(102),char(108),char(111),char(97),char(116),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(101),char(108),char(91),char(51),
+char(93),char(0),char(109),char(95),char(98),char(97),char(115),char(105),char(115),char(0),char(109),char(95),char(111),char(114),char(105),char(103),char(105),char(110),char(0),char(109),
+char(95),char(114),char(111),char(111),char(116),char(78),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(115),char(117),char(98),
+char(116),char(114),char(101),char(101),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),
+char(65),char(97),char(98),char(98),char(77),char(105),char(110),char(91),char(51),char(93),char(0),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),
+char(101),char(100),char(65),char(97),char(98),char(98),char(77),char(97),char(120),char(91),char(51),char(93),char(0),char(109),char(95),char(97),char(97),char(98),char(98),char(77),
+char(105),char(110),char(79),char(114),char(103),char(0),char(109),char(95),char(97),char(97),char(98),char(98),char(77),char(97),char(120),char(79),char(114),char(103),char(0),char(109),
+char(95),char(101),char(115),char(99),char(97),char(112),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(115),char(117),char(98),char(80),char(97),
+char(114),char(116),char(0),char(109),char(95),char(116),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),
+char(95),char(112),char(97),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(101),char(115),char(99),char(97),char(112),char(101),char(73),char(110),char(100),char(101),
+char(120),char(79),char(114),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(98),
+char(118),char(104),char(65),char(97),char(98),char(98),char(77),char(105),char(110),char(0),char(109),char(95),char(98),char(118),char(104),char(65),char(97),char(98),char(98),char(77),
+char(97),char(120),char(0),char(109),char(95),char(98),char(118),char(104),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(97),char(116),char(105),char(111),char(110),
+char(0),char(109),char(95),char(99),char(117),char(114),char(78),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(117),char(115),
+char(101),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(110),char(117),char(109),char(67),
+char(111),char(110),char(116),char(105),char(103),char(117),char(111),char(117),char(115),char(76),char(101),char(97),char(102),char(78),char(111),char(100),char(101),char(115),char(0),char(109),
+char(95),char(110),char(117),char(109),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(67),char(111),char(110),char(116),char(105),char(103),char(117),
+char(111),char(117),char(115),char(78),char(111),char(100),char(101),char(115),char(0),char(42),char(109),char(95),char(99),char(111),char(110),char(116),char(105),char(103),char(117),char(111),
+char(117),char(115),char(78),char(111),char(100),char(101),char(115),char(80),char(116),char(114),char(0),char(42),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),
+char(122),char(101),char(100),char(67),char(111),char(110),char(116),char(105),char(103),char(117),char(111),char(117),char(115),char(78),char(111),char(100),char(101),char(115),char(80),char(116),
+char(114),char(0),char(42),char(109),char(95),char(115),char(117),char(98),char(84),char(114),char(101),char(101),char(73),char(110),char(102),char(111),char(80),char(116),char(114),char(0),
+char(109),char(95),char(116),char(114),char(97),char(118),char(101),char(114),char(115),char(97),char(108),char(77),char(111),char(100),char(101),char(0),char(109),char(95),char(110),char(117),
+char(109),char(83),char(117),char(98),char(116),char(114),char(101),char(101),char(72),char(101),char(97),char(100),char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(110),
+char(97),char(109),char(101),char(0),char(109),char(95),char(115),char(104),char(97),char(112),char(101),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(112),char(97),
+char(100),char(100),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),
+char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(83),char(99),char(97),
+char(108),char(105),char(110),char(103),char(0),char(109),char(95),char(112),char(108),char(97),char(110),char(101),char(78),char(111),char(114),char(109),char(97),char(108),char(0),char(109),
+char(95),char(112),char(108),char(97),char(110),char(101),char(67),char(111),char(110),char(115),char(116),char(97),char(110),char(116),char(0),char(109),char(95),char(105),char(109),char(112),
+char(108),char(105),char(99),char(105),char(116),char(83),char(104),char(97),char(112),char(101),char(68),char(105),char(109),char(101),char(110),char(115),char(105),char(111),char(110),char(115),
+char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(77),char(97),char(114),char(103),char(105),char(110),char(0),char(109),
+char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(0),char(109),char(95),char(112),char(111),char(115),char(0),char(109),char(95),char(114),char(97),char(100),
+char(105),char(117),char(115),char(0),char(109),char(95),char(99),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),char(110),char(97),char(108),
+char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(42),char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(80),char(111),
+char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(114),char(114),char(97),char(121),char(80),char(116),char(114),char(0),char(109),char(95),char(108),char(111),char(99),
+char(97),char(108),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(114),char(114),char(97),char(121),char(83),char(105),char(122),char(101),char(0),
+char(109),char(95),char(118),char(97),char(108),char(117),char(101),char(0),char(109),char(95),char(112),char(97),char(100),char(91),char(50),char(93),char(0),char(109),char(95),char(118),
+char(97),char(108),char(117),char(101),char(115),char(91),char(51),char(93),char(0),char(109),char(95),char(112),char(97),char(100),char(0),char(42),char(109),char(95),char(118),char(101),
+char(114),char(116),char(105),char(99),char(101),char(115),char(51),char(102),char(0),char(42),char(109),char(95),char(118),char(101),char(114),char(116),char(105),char(99),char(101),char(115),
+char(51),char(100),char(0),char(42),char(109),char(95),char(105),char(110),char(100),char(105),char(99),char(101),char(115),char(51),char(50),char(0),char(42),char(109),char(95),char(51),
+char(105),char(110),char(100),char(105),char(99),char(101),char(115),char(49),char(54),char(0),char(42),char(109),char(95),char(51),char(105),char(110),char(100),char(105),char(99),char(101),
+char(115),char(56),char(0),char(42),char(109),char(95),char(105),char(110),char(100),char(105),char(99),char(101),char(115),char(49),char(54),char(0),char(109),char(95),char(110),char(117),
+char(109),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(86),char(101),char(114),char(116),
+char(105),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(109),char(101),char(115),char(104),char(80),char(97),char(114),char(116),char(115),char(80),char(116),char(114),
+char(0),char(109),char(95),char(115),char(99),char(97),char(108),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(101),char(115),char(104),
+char(80),char(97),char(114),char(116),char(115),char(0),char(109),char(95),char(109),char(101),char(115),char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),
+char(101),char(0),char(42),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(70),char(108),char(111),char(97),char(116),char(66),
+char(118),char(104),char(0),char(42),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(68),char(111),char(117),char(98),char(108),
+char(101),char(66),char(118),char(104),char(0),char(42),char(109),char(95),char(116),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),
+char(77),char(97),char(112),char(0),char(109),char(95),char(112),char(97),char(100),char(51),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(114),char(105),char(109),
+char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(116),char(114),char(97),char(110),char(115),
+char(102),char(111),char(114),char(109),char(0),char(42),char(109),char(95),char(99),char(104),char(105),char(108),char(100),char(83),char(104),char(97),char(112),char(101),char(0),char(109),
+char(95),char(99),char(104),char(105),char(108),char(100),char(83),char(104),char(97),char(112),char(101),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),
+char(105),char(108),char(100),char(77),char(97),char(114),char(103),char(105),char(110),char(0),char(42),char(109),char(95),char(99),char(104),char(105),char(108),char(100),char(83),char(104),
+char(97),char(112),char(101),char(80),char(116),char(114),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(104),char(105),char(108),char(100),char(83),char(104),char(97),
+char(112),char(101),char(115),char(0),char(109),char(95),char(117),char(112),char(65),char(120),char(105),char(115),char(0),char(109),char(95),char(117),char(112),char(73),char(110),char(100),
+char(101),char(120),char(0),char(109),char(95),char(102),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(86),char(48),char(86),
+char(49),char(65),char(110),char(103),char(108),char(101),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(86),char(49),char(86),char(50),char(65),char(110),char(103),
+char(108),char(101),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(86),char(50),char(86),char(48),char(65),char(110),char(103),char(108),char(101),char(0),char(42),
+char(109),char(95),char(104),char(97),char(115),char(104),char(84),char(97),char(98),char(108),char(101),char(80),char(116),char(114),char(0),char(42),char(109),char(95),char(110),char(101),
+char(120),char(116),char(80),char(116),char(114),char(0),char(42),char(109),char(95),char(118),char(97),char(108),char(117),char(101),char(65),char(114),char(114),char(97),char(121),char(80),
+char(116),char(114),char(0),char(42),char(109),char(95),char(107),char(101),char(121),char(65),char(114),char(114),char(97),char(121),char(80),char(116),char(114),char(0),char(109),char(95),
+char(99),char(111),char(110),char(118),char(101),char(120),char(69),char(112),char(115),char(105),char(108),char(111),char(110),char(0),char(109),char(95),char(112),char(108),char(97),char(110),
+char(97),char(114),char(69),char(112),char(115),char(105),char(108),char(111),char(110),char(0),char(109),char(95),char(101),char(113),char(117),char(97),char(108),char(86),char(101),char(114),
+char(116),char(101),char(120),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(68),
+char(105),char(115),char(116),char(97),char(110),char(99),char(101),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(122),
+char(101),char(114),char(111),char(65),char(114),char(101),char(97),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(110),
+char(101),char(120),char(116),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(104),char(97),char(115),char(104),char(84),char(97),char(98),char(108),char(101),char(83),
+char(105),char(122),char(101),char(0),char(109),char(95),char(110),char(117),char(109),char(86),char(97),char(108),char(117),char(101),char(115),char(0),char(109),char(95),char(110),char(117),
+char(109),char(75),char(101),char(121),char(115),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(76),char(111),
+char(99),char(97),char(108),char(80),char(111),char(105),char(110),char(116),char(65),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(76),char(111),char(99),char(97),char(108),char(80),char(111),char(105),char(110),char(116),char(66),char(91),char(52),char(93),char(0),
+char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),
+char(87),char(111),char(114),char(108),char(100),char(79),char(110),char(65),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(87),char(111),char(114),char(108),char(100),char(79),char(110),char(66),
+char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(78),char(111),char(114),char(109),
+char(97),char(108),char(87),char(111),char(114),char(108),char(100),char(79),char(110),char(66),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),
+char(116),char(67),char(97),char(99),char(104),char(101),char(76),char(97),char(116),char(101),char(114),char(97),char(108),char(70),char(114),char(105),char(99),char(116),char(105),char(111),
+char(110),char(68),char(105),char(114),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),
+char(101),char(76),char(97),char(116),char(101),char(114),char(97),char(108),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(68),char(105),char(114),char(50),
+char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(68),char(105),char(115),char(116),
+char(97),char(110),char(99),char(101),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),
+char(65),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(91),char(52),char(93),char(0),char(109),char(95),
+char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(80),char(114),char(101),char(118),char(82),char(72),char(83),char(91),char(52),char(93),
+char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),
+char(100),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(82),char(111),char(108),char(108),char(105),char(110),char(103),
+char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(83),char(112),char(105),char(110),char(110),char(105),char(110),char(103),
+char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(82),char(101),char(115),char(116),char(105),char(116),char(117),char(116),
+char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(80),
+char(97),char(114),char(116),char(73),char(100),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),
+char(104),char(101),char(80),char(97),char(114),char(116),char(73),char(100),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(73),char(110),char(100),char(101),char(120),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),
+char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(73),char(110),char(100),char(101),char(120),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),
+char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(80),char(111),char(105),char(110),
+char(116),char(70),char(108),char(97),char(103),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),
+char(104),char(101),char(65),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(76),char(97),char(116),char(101),
+char(114),char(97),char(108),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),
+char(65),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(76),char(97),char(116),char(101),char(114),char(97),
+char(108),char(50),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),
+char(110),char(116),char(97),char(99),char(116),char(77),char(111),char(116),char(105),char(111),char(110),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),
+char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(77),char(111),char(116),char(105),char(111),
+char(110),char(50),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),
+char(110),char(116),char(97),char(99),char(116),char(67),char(70),char(77),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),
+char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(69),char(82),char(80),char(91),char(52),char(93),char(0),char(109),
+char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(67),
+char(111),char(110),char(116),char(97),char(99),char(116),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(49),char(91),char(52),char(93),char(0),char(109),char(95),
+char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(67),char(70),
+char(77),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(76),char(105),char(102),
+char(101),char(84),char(105),char(109),char(101),char(91),char(52),char(93),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(97),char(99),char(104),char(101),char(100),
+char(80),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),
+char(65),char(0),char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(66),char(0),char(109),char(95),char(105),
+char(110),char(100),char(101),char(120),char(49),char(97),char(0),char(109),char(95),char(111),char(98),char(106),char(101),char(99),char(116),char(84),char(121),char(112),char(101),char(0),
+char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(99),char(116),char(66),char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(84),char(104),char(114),
+char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(99),char(116),char(80),char(114),char(111),char(99),
+char(101),char(115),char(115),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(42),char(109),char(95),char(98),
+char(111),char(100),char(121),char(48),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(49),char(0),char(109),char(95),char(103),char(105),char(109),char(112),
+char(97),char(99),char(116),char(83),char(117),char(98),char(84),char(121),char(112),char(101),char(0),char(42),char(109),char(95),char(117),char(110),char(115),char(99),char(97),char(108),
+char(101),char(100),char(80),char(111),char(105),char(110),char(116),char(115),char(70),char(108),char(111),char(97),char(116),char(80),char(116),char(114),char(0),char(42),char(109),char(95),
+char(117),char(110),char(115),char(99),char(97),char(108),char(101),char(100),char(80),char(111),char(105),char(110),char(116),char(115),char(68),char(111),char(117),char(98),char(108),char(101),
+char(80),char(116),char(114),char(0),char(109),char(95),char(110),char(117),char(109),char(85),char(110),char(115),char(99),char(97),char(108),char(101),char(100),char(80),char(111),char(105),
+char(110),char(116),char(115),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(51),char(91),char(52),char(93),char(0),char(42),char(109),
+char(95),char(98),char(114),char(111),char(97),char(100),char(112),char(104),char(97),char(115),char(101),char(72),char(97),char(110),char(100),char(108),char(101),char(0),char(42),char(109),
+char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(0),char(42),char(109),char(95),char(114),
+char(111),char(111),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(0),char(109),char(95),
+char(119),char(111),char(114),char(108),char(100),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(105),char(110),char(116),
+char(101),char(114),char(112),char(111),char(108),char(97),char(116),char(105),char(111),char(110),char(87),char(111),char(114),char(108),char(100),char(84),char(114),char(97),char(110),char(115),
+char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(105),char(110),char(116),char(101),char(114),char(112),char(111),char(108),char(97),char(116),char(105),char(111),char(110),
+char(76),char(105),char(110),char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(105),char(110),char(116),
+char(101),char(114),char(112),char(111),char(108),char(97),char(116),char(105),char(111),char(110),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),
+char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(105),char(115),char(111),char(116),char(114),char(111),char(112),char(105),char(99),char(70),
+char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(100),char(101),char(97),char(99),char(116),char(105),char(118),char(97),char(116),char(105),
+char(111),char(110),char(84),char(105),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),
+char(114),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),
+char(110),char(116),char(97),char(99),char(116),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),
+char(99),char(116),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(116),
+char(117),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(104),char(105),char(116),char(70),char(114),char(97),char(99),char(116),char(105),char(111),char(110),char(0),
+char(109),char(95),char(99),char(99),char(100),char(83),char(119),char(101),char(112),char(116),char(83),char(112),char(104),char(101),char(114),char(101),char(82),char(97),char(100),char(105),
+char(117),char(115),char(0),char(109),char(95),char(99),char(99),char(100),char(77),char(111),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),
+char(111),char(108),char(100),char(0),char(109),char(95),char(104),char(97),char(115),char(65),char(110),char(105),char(115),char(111),char(116),char(114),char(111),char(112),char(105),char(99),
+char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),
+char(70),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(105),char(115),char(108),char(97),char(110),char(100),char(84),char(97),char(103),char(49),char(0),char(109),
+char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(0),char(109),char(95),char(97),char(99),char(116),char(105),char(118),
+char(97),char(116),char(105),char(111),char(110),char(83),char(116),char(97),char(116),char(101),char(49),char(0),char(109),char(95),char(105),char(110),char(116),char(101),char(114),char(110),
+char(97),char(108),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),char(101),char(99),char(107),char(67),char(111),char(108),char(108),char(105),char(100),
+char(101),char(87),char(105),char(116),char(104),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(70),char(105),char(108),
+char(116),char(101),char(114),char(71),char(114),char(111),char(117),char(112),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),
+char(70),char(105),char(108),char(116),char(101),char(114),char(77),char(97),char(115),char(107),char(0),char(109),char(95),char(117),char(110),char(105),char(113),char(117),char(101),char(73),
+char(100),char(0),char(109),char(95),char(116),char(97),char(117),char(0),char(109),char(95),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),
+char(116),char(105),char(109),char(101),char(83),char(116),char(101),char(112),char(0),char(109),char(95),char(109),char(97),char(120),char(69),char(114),char(114),char(111),char(114),char(82),
+char(101),char(100),char(117),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(115),char(111),char(114),char(0),char(109),char(95),char(101),char(114),char(112),
+char(0),char(109),char(95),char(101),char(114),char(112),char(50),char(0),char(109),char(95),char(103),char(108),char(111),char(98),char(97),char(108),char(67),char(102),char(109),char(0),
+char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(80),char(101),char(110),char(101),char(116),char(114),
+char(97),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(115),char(112),char(108),
+char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(117),char(114),char(110),char(69),char(114),char(112),char(0),char(109),char(95),char(108),
+char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(111),char(112),char(0),char(109),char(95),char(119),char(97),char(114),char(109),char(115),char(116),char(97),char(114),
+char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(97),char(114),char(116),char(105),char(99),char(117),char(108),
+char(97),char(116),char(101),char(100),char(87),char(97),char(114),char(109),char(115),char(116),char(97),char(114),char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),
+char(111),char(114),char(0),char(109),char(95),char(109),char(97),char(120),char(71),char(121),char(114),char(111),char(115),char(99),char(111),char(112),char(105),char(99),char(70),char(111),
+char(114),char(99),char(101),char(0),char(109),char(95),char(115),char(105),char(110),char(103),char(108),char(101),char(65),char(120),char(105),char(115),char(82),char(111),char(108),char(108),
+char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),
+char(0),char(109),char(95),char(110),char(117),char(109),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(115),
+char(111),char(108),char(118),char(101),char(114),char(77),char(111),char(100),char(101),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(110),char(103),char(67),
+char(111),char(110),char(116),char(97),char(99),char(116),char(82),char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(84),char(104),char(114),
+char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(109),char(105),char(110),char(105),char(109),char(117),char(109),char(83),char(111),char(108),char(118),
+char(101),char(114),char(66),char(97),char(116),char(99),char(104),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),
+char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(0),
+char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),
+char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),
+char(114),char(116),char(105),char(97),char(84),char(101),char(110),char(115),char(111),char(114),char(87),char(111),char(114),char(108),char(100),char(0),char(109),char(95),char(108),char(105),
+char(110),char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),
+char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),
+char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(70),char(97),char(99),char(116),char(111),
+char(114),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(95),char(97),char(99),char(99),char(101),char(108),char(101),char(114),char(97),
+char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(76),char(111),char(99),
+char(97),char(108),char(0),char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(116),char(111),
+char(116),char(97),char(108),char(84),char(111),char(114),char(113),char(117),char(101),char(0),char(109),char(95),char(105),char(110),char(118),char(101),char(114),char(115),char(101),char(77),
+char(97),char(115),char(115),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),
+char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),
+char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),
+char(111),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(76),char(105),char(110),char(101),char(97),
+char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),
+char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),
+char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),char(0),
+char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(68),
+char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),
+char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),
+char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),
+char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),
+char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),
+char(116),char(82),char(111),char(119),char(115),char(0),char(110),char(117),char(98),char(0),char(42),char(109),char(95),char(114),char(98),char(65),char(0),char(42),char(109),char(95),
+char(114),char(98),char(66),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),
+char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),
+char(116),char(73),char(100),char(0),char(109),char(95),char(110),char(101),char(101),char(100),char(115),char(70),char(101),char(101),char(100),char(98),char(97),char(99),char(107),char(0),
+char(109),char(95),char(97),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(100),
+char(98),char(103),char(68),char(114),char(97),char(119),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(100),char(105),char(115),char(97),char(98),char(108),char(101),
+char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(115),char(66),char(101),char(116),char(119),char(101),char(101),char(110),char(76),char(105),char(110),
+char(107),char(101),char(100),char(66),char(111),char(100),char(105),char(101),char(115),char(0),char(109),char(95),char(111),char(118),char(101),char(114),char(114),char(105),char(100),char(101),
+char(78),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),
+char(109),char(95),char(98),char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(104),char(114),
+char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(105),char(115),char(69),char(110),char(97),char(98),char(108),char(101),char(100),char(0),char(112),
+char(97),char(100),char(100),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(121),char(112),char(101),char(67),char(111),char(110),char(115),
+char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),
+char(65),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(98),char(65),char(70),char(114),
+char(97),char(109),char(101),char(0),char(109),char(95),char(114),char(98),char(66),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(117),char(115),char(101),
+char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(97),char(110),
+char(103),char(117),char(108),char(97),char(114),char(79),char(110),char(108),char(121),char(0),char(109),char(95),char(101),char(110),char(97),char(98),char(108),char(101),char(65),char(110),
+char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(0),char(109),char(95),char(109),char(111),char(116),char(111),char(114),char(84),char(97),
+char(114),char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(109),char(97),char(120),char(77),char(111),
+char(116),char(111),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(108),char(111),char(119),char(101),char(114),char(76),char(105),
+char(109),char(105),char(116),char(0),char(109),char(95),char(117),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(108),
+char(105),char(109),char(105),char(116),char(83),char(111),char(102),char(116),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(98),char(105),char(97),char(115),char(70),
+char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(114),char(101),char(108),char(97),char(120),char(97),char(116),char(105),char(111),char(110),char(70),char(97),
+char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(49),char(91),char(52),char(93),char(0),char(109),
+char(95),char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(49),char(0),char(109),char(95),char(115),char(119),char(105),char(110),char(103),char(83),
+char(112),char(97),char(110),char(50),char(0),char(109),char(95),char(116),char(119),char(105),char(115),char(116),char(83),char(112),char(97),char(110),char(0),char(109),char(95),char(108),
+char(105),char(110),char(101),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(108),char(105),
+char(110),char(101),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(97),char(110),char(103),
+char(117),char(108),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(97),char(110),char(103),
+char(117),char(108),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(117),char(115),char(101),
+char(76),char(105),char(110),char(101),char(97),char(114),char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101),
+char(65),char(0),char(109),char(95),char(117),char(115),char(101),char(79),char(102),char(102),char(115),char(101),char(116),char(70),char(111),char(114),char(67),char(111),char(110),char(115),
+char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(54),char(100),char(111),char(102),char(68),char(97),
+char(116),char(97),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(69),char(110),char(97),char(98),char(108),char(101),char(100),char(91),char(54),
+char(93),char(0),char(109),char(95),char(101),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117),char(109),char(80),char(111),char(105),char(110),char(116),
+char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),
+char(115),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),
+char(91),char(54),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(66),char(111),char(117),char(110),char(99),char(101),char(0),char(109),
+char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80),char(0),char(109),char(95),char(108),char(105),char(110),
+char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(77),
+char(111),char(116),char(111),char(114),char(69),char(82),char(80),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(77),char(111),char(116),char(111),
+char(114),char(67),char(70),char(77),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(84),char(97),char(114),char(103),char(101),char(116),char(86),
+char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(77),char(97),char(120),char(77),
+char(111),char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(101),
+char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),
+char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(108),char(105),char(110),char(101),
+char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(105),
+char(110),char(101),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117),char(109),char(80),char(111),char(105),char(110),char(116),
+char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),char(77),char(111),char(116),char(111),char(114),
+char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(77),char(111),char(116),
+char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),
+char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),
+char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(76),char(105),char(109),char(105),char(116),char(101),char(100),
+char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),
+char(109),char(112),char(105),char(110),char(103),char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),
+char(103),char(117),char(108),char(97),char(114),char(66),char(111),char(117),char(110),char(99),char(101),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),
+char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),
+char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),
+char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(67),char(70),
+char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(84),char(97),char(114),char(103),char(101),char(116),char(86),char(101),char(108),
+char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(97),char(120),char(77),char(111),
+char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(101),
+char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),
+char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(103),
+char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),
+char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117),char(109),char(80),char(111),
+char(105),char(110),char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),char(77),
+char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(101),char(114),
+char(118),char(111),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),
+char(69),char(110),char(97),char(98),char(108),char(101),char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),
+char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),
+char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),
+char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(76),char(105),char(109),char(105),char(116),char(101),char(100),
+char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(111),char(116),char(97),char(116),char(101),char(79),char(114),char(100),char(101),char(114),char(0),char(109),char(95),
+char(97),char(120),char(105),char(115),char(73),char(110),char(65),char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(66),char(0),char(109),char(95),
+char(114),char(97),char(116),char(105),char(111),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),
+char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),char(101),
+char(115),char(115),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),
+char(0),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(0),char(109),char(95),char(112),char(111),char(115),char(105),char(116),
+char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(114),char(101),char(118),char(105),char(111),char(117),char(115),char(80),char(111),char(115),char(105),char(116),char(105),
+char(111),char(110),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(99),char(99),char(117),
+char(109),char(117),char(108),char(97),char(116),char(101),char(100),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(110),char(111),char(114),char(109),char(97),
+char(108),char(0),char(109),char(95),char(97),char(114),char(101),char(97),char(0),char(109),char(95),char(97),char(116),char(116),char(97),char(99),char(104),char(0),char(109),char(95),
+char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(114),char(101),char(115),
+char(116),char(76),char(101),char(110),char(103),char(116),char(104),char(0),char(109),char(95),char(98),char(98),char(101),char(110),char(100),char(105),char(110),char(103),char(0),char(109),
+char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(51),char(93),char(0),char(109),char(95),char(114),char(101),
+char(115),char(116),char(65),char(114),char(101),char(97),char(0),char(109),char(95),char(99),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(110),char(111),char(100),
+char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(86),char(111),
+char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(99),char(49),char(0),char(109),char(95),char(99),char(50),char(0),char(109),char(95),char(99),char(48),char(0),
+char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(70),char(114),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(114),char(105),char(103),char(105),
+char(100),char(66),char(111),char(100),char(121),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),
+char(97),char(101),char(114),char(111),char(77),char(111),char(100),char(101),char(108),char(0),char(109),char(95),char(98),char(97),char(117),char(109),char(103),char(97),char(114),char(116),
+char(101),char(0),char(109),char(95),char(100),char(114),char(97),char(103),char(0),char(109),char(95),char(108),char(105),char(102),char(116),char(0),char(109),char(95),char(112),char(114),
+char(101),char(115),char(115),char(117),char(114),char(101),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(100),char(121),
+char(110),char(97),char(109),char(105),char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(111),char(115),char(101),
+char(77),char(97),char(116),char(99),char(104),char(0),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(67),char(111),char(110),char(116),char(97),char(99),char(116),
+char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(107),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(111),
+char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),
+char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),
+char(99),char(104),char(111),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),
+char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),
+char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116),char(101),char(114),
+char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),
+char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),
+char(116),char(82),char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),
+char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),
+char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),
+char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),
+char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(109),char(97),char(120),char(86),char(111),char(108),char(117),char(109),char(101),
+char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),
+char(105),char(116),char(121),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(112),char(111),char(115),char(105),
+char(116),char(105),char(111),char(110),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(100),char(114),char(105),
+char(102),char(116),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),
+char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(114),char(111),char(116),char(0),char(109),
+char(95),char(115),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(97),char(113),char(113),char(0),char(109),char(95),char(99),char(111),char(109),char(0),char(42),
+char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(42),char(109),char(95),char(119),char(101),char(105),char(103),char(104),
+char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),
+char(110),char(117),char(109),char(87),char(101),char(105),char(103),char(116),char(115),char(0),char(109),char(95),char(98),char(118),char(111),char(108),char(117),char(109),char(101),char(0),
+char(109),char(95),char(98),char(102),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(97),char(109),char(101),char(120),char(102),char(111),char(114),
+char(109),char(0),char(109),char(95),char(108),char(111),char(99),char(105),char(105),char(0),char(109),char(95),char(105),char(110),char(118),char(119),char(105),char(0),char(109),char(95),
+char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(100),char(105),char(109),char(112),char(117),
+char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(108),char(118),char(0),char(109),char(95),char(97),char(118),char(0),char(42),char(109),
+char(95),char(102),char(114),char(97),char(109),char(101),char(114),char(101),char(102),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),
+char(100),char(105),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(117),
+char(109),char(70),char(114),char(97),char(109),char(101),char(82),char(101),char(102),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(78),char(111),char(100),char(101),
+char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(105),char(100),char(109),char(97),
+char(115),char(115),char(0),char(109),char(95),char(105),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(110),char(118),char(105),char(109),char(112),char(117),char(108),
+char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0),char(109),char(95),char(110),
+char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),
+char(95),char(97),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97),char(116),char(99),char(104),char(105),char(110),char(103),
+char(0),char(109),char(95),char(109),char(97),char(120),char(83),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),
+char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(115),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),
+char(111),char(110),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(99),char(111),
+char(110),char(116),char(97),char(105),char(110),char(115),char(65),char(110),char(99),char(104),char(111),char(114),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),
+char(100),char(101),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(110),char(100),char(101),char(120),char(0),char(42),char(109),
+char(95),char(98),char(111),char(100),char(121),char(65),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(66),char(0),char(109),char(95),char(114),char(101),
+char(102),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(99),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(0),
+char(109),char(95),char(100),char(101),char(108),char(101),char(116),char(101),char(0),char(109),char(95),char(114),char(101),char(108),char(80),char(111),char(115),char(105),char(116),char(105),
+char(111),char(110),char(91),char(50),char(93),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(116),char(121),char(112),char(101),char(0),char(109),char(95),
+char(98),char(111),char(100),char(121),char(66),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(84),char(121),char(112),
+char(101),char(0),char(42),char(109),char(95),char(112),char(111),char(115),char(101),char(0),char(42),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),
+char(97),char(108),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(115),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),
+char(115),char(0),char(42),char(109),char(95),char(102),char(97),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(116),char(101),char(116),char(114),char(97),char(104),
+char(101),char(100),char(114),char(97),char(0),char(42),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114),char(115),char(0),char(42),char(109),char(95),char(99),
+char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),
+char(110),char(117),char(109),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(76),char(105),
+char(110),char(107),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(97),char(99),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),
+char(84),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(109),char(95),char(110),char(117),char(109),char(65),char(110),char(99),char(104),
+char(111),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(109),char(95),
+char(110),char(117),char(109),char(74),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110),char(102),char(105),char(103),char(0),char(109),
+char(95),char(122),char(101),char(114),char(111),char(82),char(111),char(116),char(80),char(97),char(114),char(101),char(110),char(116),char(84),char(111),char(84),char(104),char(105),char(115),
+char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(67),char(111),char(109),char(84),char(111),char(84),char(104),char(105),char(115),char(80),char(105),
+char(118),char(111),char(116),char(79),char(102),char(102),char(115),char(101),char(116),char(0),char(109),char(95),char(116),char(104),char(105),char(115),char(80),char(105),char(118),char(111),
+char(116),char(84),char(111),char(84),char(104),char(105),char(115),char(67),char(111),char(109),char(79),char(102),char(102),char(115),char(101),char(116),char(0),char(109),char(95),char(106),
+char(111),char(105),char(110),char(116),char(65),char(120),char(105),char(115),char(84),char(111),char(112),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),
+char(110),char(116),char(65),char(120),char(105),char(115),char(66),char(111),char(116),char(116),char(111),char(109),char(91),char(54),char(93),char(0),char(109),char(95),char(108),char(105),
+char(110),char(107),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(97),char(98),char(115),char(70),char(114),char(97),char(109),char(101),
+char(84),char(111),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(84),char(111),char(112),char(0),char(109),char(95),char(97),char(98),char(115),
+char(70),char(114),char(97),char(109),char(101),char(84),char(111),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(66),char(111),char(116),char(116),
+char(111),char(109),char(0),char(109),char(95),char(97),char(98),char(115),char(70),char(114),char(97),char(109),char(101),char(76),char(111),char(99),char(86),char(101),char(108),char(111),
+char(99),char(105),char(116),char(121),char(84),char(111),char(112),char(0),char(109),char(95),char(97),char(98),char(115),char(70),char(114),char(97),char(109),char(101),char(76),char(111),
+char(99),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(66),char(111),char(116),char(116),char(111),char(109),char(0),char(109),char(95),char(108),char(105),
+char(110),char(107),char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(73),char(110),char(100),char(101),char(120),
+char(0),char(109),char(95),char(100),char(111),char(102),char(67),char(111),char(117),char(110),char(116),char(0),char(109),char(95),char(112),char(111),char(115),char(86),char(97),char(114),
+char(67),char(111),char(117),char(110),char(116),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(80),char(111),char(115),char(91),char(55),char(93),char(0),
+char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(86),char(101),char(108),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),
+char(116),char(84),char(111),char(114),char(113),char(117),char(101),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(68),char(97),
+char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(70),char(114),char(105),char(99),char(116),char(105),char(111),
+char(110),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),
+char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),
+char(106),char(111),char(105),char(110),char(116),char(77),char(97),char(120),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(106),char(111),char(105),char(110),
+char(116),char(77),char(97),char(120),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),
+char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(78),char(97),char(109),char(101),char(0),char(42),char(109),
+char(95),char(108),char(105),char(110),char(107),char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114),char(0),char(42),char(109),char(95),char(112),char(97),char(100),
+char(100),char(105),char(110),char(103),char(80),char(116),char(114),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(87),char(111),char(114),char(108),char(100),char(80),
+char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(87),char(111),char(114),char(108),char(100),char(79),
+char(114),char(105),char(101),char(110),char(116),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(76),char(105),char(110),
+char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(65),char(110),
+char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(98),char(97),char(115),char(101),
+char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(77),char(97),char(115),char(115),char(0),char(42),
+char(109),char(95),char(98),char(97),char(115),char(101),char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(98),char(97),char(115),char(101),char(67),char(111),
+char(108),char(108),char(105),char(100),char(101),char(114),char(0),char(109),char(95),char(99),char(111),char(108),char(79),char(98),char(106),char(68),char(97),char(116),char(97),char(0),
+char(42),char(109),char(95),char(109),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(0),char(109),char(95),char(108),char(105),char(110),char(107),char(0),
+char(84),char(89),char(80),char(69),char(99),char(0),char(0),char(0),char(99),char(104),char(97),char(114),char(0),char(117),char(99),char(104),char(97),char(114),char(0),char(115),
+char(104),char(111),char(114),char(116),char(0),char(117),char(115),char(104),char(111),char(114),char(116),char(0),char(105),char(110),char(116),char(0),char(108),char(111),char(110),char(103),
+char(0),char(117),char(108),char(111),char(110),char(103),char(0),char(102),char(108),char(111),char(97),char(116),char(0),char(100),char(111),char(117),char(98),char(108),char(101),char(0),
+char(118),char(111),char(105),char(100),char(0),char(80),char(111),char(105),char(110),char(116),char(101),char(114),char(65),char(114),char(114),char(97),char(121),char(0),char(98),char(116),
+char(80),char(104),char(121),char(115),char(105),char(99),char(115),char(83),char(121),char(115),char(116),char(101),char(109),char(0),char(76),char(105),char(115),char(116),char(66),char(97),
+char(115),char(101),char(0),char(98),char(116),char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(116),char(101),char(114),char(110),char(105),char(111),char(110),char(70),char(108),char(111),char(97),char(116),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(116),char(101),char(114),char(110),char(105),char(111),char(110),char(68),char(111),char(117),char(98),
+char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(70),char(108),
+char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),
+char(109),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),
+char(114),char(109),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(66),char(118),char(104),char(83),char(117),
+char(98),char(116),char(114),char(101),char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),
+char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),
+char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),
+char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),
+char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),
+char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(97),char(116),char(105),char(99),char(80),char(108),char(97),char(110),char(101),char(83),char(104),char(97),
+char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),
+char(110),char(97),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(115),char(105),char(116),
+char(105),char(111),char(110),char(65),char(110),char(100),char(82),char(97),char(100),char(105),char(117),char(115),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),
+char(83),char(112),char(104),char(101),char(114),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(73),char(110),
+char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),
+char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),
+char(116),char(73),char(110),char(100),char(101),char(120),char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(67),char(104),char(97),char(114),char(73),char(110),char(100),char(101),char(120),char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(77),char(101),char(115),char(104),char(80),char(97),char(114),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),
+char(114),char(105),char(100),char(105),char(110),char(103),char(77),char(101),char(115),char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),char(101),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),
+char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),
+char(102),char(111),char(77),char(97),char(112),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(99),char(97),char(108),char(101),char(100),char(84),char(114),
+char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(67),char(104),char(105),char(108),char(100),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(121),char(108),char(105),char(110),char(100),char(101),char(114),char(83),char(104),char(97),char(112),char(101),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(67),char(97),char(112),char(115),char(117),char(108),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),
+char(116),char(80),char(101),char(114),char(115),char(105),char(115),char(116),char(101),char(110),char(116),char(77),char(97),char(110),char(105),char(102),char(111),char(108),char(100),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),
+char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(80),char(101),char(114),char(115),char(105),char(115),char(116),char(101),char(110),char(116),char(77),char(97),char(110),char(105),char(102),char(111),char(108),char(100),char(70),char(108),
+char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),
+char(98),char(106),char(101),char(99),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(73),char(109),
+char(112),char(97),char(99),char(116),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(67),char(111),char(110),char(118),char(101),char(120),char(72),char(117),char(108),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),
+char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),
+char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108),char(100),char(68),char(111),char(117),char(98),char(108),char(101),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108),char(100),
+char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),
+char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),
+char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(115),char(116),
+char(114),char(97),char(105),char(110),char(116),char(73),char(110),char(102),char(111),char(49),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),
+char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),
+char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),
+char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),
+char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),
+char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),
+char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),
+char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),
+char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),
+char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),
+char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),
+char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),
+char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),
+char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),
+char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),
+char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),
+char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),
+char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),
+char(112),char(114),char(105),char(110),char(103),char(50),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),
+char(50),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),
+char(97),char(50),char(0),char(98),char(116),char(83),char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),
+char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),
+char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),
+char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),
+char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(77),char(97),char(116),char(101),
+char(114),char(105),char(97),char(108),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(78),char(111),char(100),
+char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(97),
+char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(70),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),
+char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(84),char(101),char(116),char(114),char(97),char(68),char(97),char(116),char(97),char(0),char(83),char(111),
+char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(65),char(110),char(99),char(104),char(111),char(114),char(68),char(97),char(116),char(97),char(0),char(83),char(111),
+char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(111),char(110),char(102),char(105),char(103),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),
+char(116),char(66),char(111),char(100),char(121),char(80),char(111),char(115),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),
+char(100),char(121),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),
+char(66),char(111),char(100),char(121),char(74),char(111),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),
+char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),
+char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(70),char(108),char(111),char(97),char(116),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),
+char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(70),char(108),
+char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),
+char(105),char(110),char(107),char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(67),char(111),char(108),char(108),
+char(105),char(100),char(101),char(114),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(0),char(84),char(76),char(69),char(78),
+char(1),char(0),char(1),char(0),char(2),char(0),char(2),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(0),char(0),
+char(12),char(0),char(36),char(0),char(8),char(0),char(16),char(0),char(32),char(0),char(16),char(0),char(32),char(0),char(48),char(0),char(96),char(0),char(64),char(0),
+char(-128),char(0),char(20),char(0),char(48),char(0),char(80),char(0),char(16),char(0),char(84),char(0),char(-124),char(0),char(12),char(0),char(52),char(0),char(52),char(0),
+char(20),char(0),char(64),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(4),char(0),char(32),char(0),char(28),char(0),char(60),char(0),char(56),char(0),
+char(76),char(0),char(76),char(0),char(24),char(0),char(60),char(0),char(60),char(0),char(60),char(0),char(16),char(0),char(16),char(6),char(-24),char(1),char(72),char(3),
+char(16),char(1),char(64),char(0),char(68),char(0),char(-96),char(0),char(88),char(0),char(-64),char(0),char(104),char(0),char(-8),char(1),char(-72),char(3),char(8),char(0),
+char(52),char(0),char(52),char(0),char(0),char(0),char(68),char(0),char(84),char(0),char(-124),char(0),char(116),char(0),char(92),char(1),char(-36),char(0),char(-116),char(1),
+char(124),char(1),char(-44),char(0),char(-4),char(0),char(-52),char(1),char(92),char(1),char(116),char(2),char(-124),char(2),char(-76),char(4),char(-52),char(0),char(108),char(1),
+char(92),char(0),char(-116),char(0),char(16),char(0),char(100),char(0),char(20),char(0),char(36),char(0),char(100),char(0),char(92),char(0),char(104),char(0),char(-64),char(0),
+char(92),char(1),char(104),char(0),char(-68),char(1),char(112),char(3),char(-56),char(1),char(-68),char(0),char(100),char(0),char(28),char(1),char(-12),char(1),char(0),char(0),
+char(83),char(84),char(82),char(67),char(88),char(0),char(0),char(0),char(10),char(0),char(3),char(0),char(4),char(0),char(0),char(0),char(4),char(0),char(1),char(0),
+char(9),char(0),char(2),char(0),char(11),char(0),char(3),char(0),char(10),char(0),char(3),char(0),char(10),char(0),char(4),char(0),char(10),char(0),char(5),char(0),
+char(12),char(0),char(2),char(0),char(9),char(0),char(6),char(0),char(9),char(0),char(7),char(0),char(13),char(0),char(1),char(0),char(7),char(0),char(8),char(0),
+char(14),char(0),char(1),char(0),char(8),char(0),char(8),char(0),char(15),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(16),char(0),char(1),char(0),
+char(8),char(0),char(8),char(0),char(17),char(0),char(1),char(0),char(13),char(0),char(9),char(0),char(18),char(0),char(1),char(0),char(14),char(0),char(9),char(0),
+char(19),char(0),char(2),char(0),char(17),char(0),char(10),char(0),char(13),char(0),char(11),char(0),char(20),char(0),char(2),char(0),char(18),char(0),char(10),char(0),
+char(14),char(0),char(11),char(0),char(21),char(0),char(4),char(0),char(4),char(0),char(12),char(0),char(4),char(0),char(13),char(0),char(2),char(0),char(14),char(0),
+char(2),char(0),char(15),char(0),char(22),char(0),char(6),char(0),char(13),char(0),char(16),char(0),char(13),char(0),char(17),char(0),char(4),char(0),char(18),char(0),
+char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(23),char(0),char(6),char(0),char(14),char(0),char(16),char(0),
+char(14),char(0),char(17),char(0),char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),
+char(24),char(0),char(3),char(0),char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0),char(4),char(0),char(22),char(0),char(25),char(0),char(12),char(0),
+char(13),char(0),char(23),char(0),char(13),char(0),char(24),char(0),char(13),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),
+char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),char(22),char(0),char(30),char(0),char(24),char(0),char(31),char(0),char(21),char(0),char(32),char(0),
+char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(26),char(0),char(12),char(0),char(14),char(0),char(23),char(0),char(14),char(0),char(24),char(0),
+char(14),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),
+char(23),char(0),char(30),char(0),char(24),char(0),char(31),char(0),char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(21),char(0),char(32),char(0),
+char(27),char(0),char(3),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(36),char(0),char(0),char(0),char(37),char(0),char(28),char(0),char(5),char(0),
+char(27),char(0),char(38),char(0),char(13),char(0),char(39),char(0),char(13),char(0),char(40),char(0),char(7),char(0),char(41),char(0),char(0),char(0),char(21),char(0),
+char(29),char(0),char(5),char(0),char(27),char(0),char(38),char(0),char(13),char(0),char(39),char(0),char(13),char(0),char(42),char(0),char(7),char(0),char(43),char(0),
+char(4),char(0),char(44),char(0),char(30),char(0),char(2),char(0),char(13),char(0),char(45),char(0),char(7),char(0),char(46),char(0),char(31),char(0),char(4),char(0),
+char(29),char(0),char(47),char(0),char(30),char(0),char(48),char(0),char(4),char(0),char(49),char(0),char(0),char(0),char(37),char(0),char(32),char(0),char(1),char(0),
+char(4),char(0),char(50),char(0),char(33),char(0),char(2),char(0),char(2),char(0),char(50),char(0),char(0),char(0),char(51),char(0),char(34),char(0),char(2),char(0),
+char(2),char(0),char(52),char(0),char(0),char(0),char(51),char(0),char(35),char(0),char(2),char(0),char(0),char(0),char(52),char(0),char(0),char(0),char(53),char(0),
+char(36),char(0),char(8),char(0),char(13),char(0),char(54),char(0),char(14),char(0),char(55),char(0),char(32),char(0),char(56),char(0),char(34),char(0),char(57),char(0),
+char(35),char(0),char(58),char(0),char(33),char(0),char(59),char(0),char(4),char(0),char(60),char(0),char(4),char(0),char(61),char(0),char(37),char(0),char(4),char(0),
+char(36),char(0),char(62),char(0),char(13),char(0),char(63),char(0),char(4),char(0),char(64),char(0),char(0),char(0),char(37),char(0),char(38),char(0),char(7),char(0),
+char(27),char(0),char(38),char(0),char(37),char(0),char(65),char(0),char(25),char(0),char(66),char(0),char(26),char(0),char(67),char(0),char(39),char(0),char(68),char(0),
+char(7),char(0),char(43),char(0),char(0),char(0),char(69),char(0),char(40),char(0),char(2),char(0),char(38),char(0),char(70),char(0),char(13),char(0),char(39),char(0),
+char(41),char(0),char(4),char(0),char(19),char(0),char(71),char(0),char(27),char(0),char(72),char(0),char(4),char(0),char(73),char(0),char(7),char(0),char(74),char(0),
+char(42),char(0),char(4),char(0),char(27),char(0),char(38),char(0),char(41),char(0),char(75),char(0),char(4),char(0),char(76),char(0),char(7),char(0),char(43),char(0),
+char(43),char(0),char(3),char(0),char(29),char(0),char(47),char(0),char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(44),char(0),char(3),char(0),
+char(29),char(0),char(47),char(0),char(4),char(0),char(78),char(0),char(0),char(0),char(37),char(0),char(45),char(0),char(3),char(0),char(29),char(0),char(47),char(0),
+char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(46),char(0),char(4),char(0),char(4),char(0),char(79),char(0),char(7),char(0),char(80),char(0),
+char(7),char(0),char(81),char(0),char(7),char(0),char(82),char(0),char(39),char(0),char(14),char(0),char(4),char(0),char(83),char(0),char(4),char(0),char(84),char(0),
+char(46),char(0),char(85),char(0),char(4),char(0),char(86),char(0),char(7),char(0),char(87),char(0),char(7),char(0),char(88),char(0),char(7),char(0),char(89),char(0),
+char(7),char(0),char(90),char(0),char(7),char(0),char(91),char(0),char(4),char(0),char(92),char(0),char(4),char(0),char(93),char(0),char(4),char(0),char(94),char(0),
+char(4),char(0),char(95),char(0),char(0),char(0),char(37),char(0),char(47),char(0),char(39),char(0),char(14),char(0),char(96),char(0),char(14),char(0),char(97),char(0),
+char(14),char(0),char(98),char(0),char(14),char(0),char(99),char(0),char(14),char(0),char(100),char(0),char(14),char(0),char(101),char(0),char(14),char(0),char(102),char(0),
+char(8),char(0),char(103),char(0),char(8),char(0),char(104),char(0),char(8),char(0),char(105),char(0),char(8),char(0),char(106),char(0),char(8),char(0),char(107),char(0),
+char(8),char(0),char(108),char(0),char(8),char(0),char(109),char(0),char(4),char(0),char(110),char(0),char(4),char(0),char(111),char(0),char(4),char(0),char(112),char(0),
+char(4),char(0),char(113),char(0),char(4),char(0),char(114),char(0),char(8),char(0),char(115),char(0),char(8),char(0),char(116),char(0),char(8),char(0),char(117),char(0),
+char(8),char(0),char(118),char(0),char(8),char(0),char(119),char(0),char(8),char(0),char(120),char(0),char(8),char(0),char(121),char(0),char(8),char(0),char(122),char(0),
+char(8),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0),char(4),char(0),char(126),char(0),char(4),char(0),char(127),char(0),
+char(4),char(0),char(-128),char(0),char(4),char(0),char(-127),char(0),char(8),char(0),char(-126),char(0),char(8),char(0),char(-125),char(0),char(4),char(0),char(44),char(0),
+char(48),char(0),char(-124),char(0),char(48),char(0),char(-123),char(0),char(49),char(0),char(39),char(0),char(13),char(0),char(96),char(0),char(13),char(0),char(97),char(0),
+char(13),char(0),char(98),char(0),char(13),char(0),char(99),char(0),char(13),char(0),char(100),char(0),char(13),char(0),char(101),char(0),char(13),char(0),char(102),char(0),
+char(7),char(0),char(103),char(0),char(7),char(0),char(104),char(0),char(7),char(0),char(105),char(0),char(7),char(0),char(106),char(0),char(7),char(0),char(107),char(0),
+char(7),char(0),char(108),char(0),char(7),char(0),char(109),char(0),char(4),char(0),char(110),char(0),char(4),char(0),char(111),char(0),char(4),char(0),char(112),char(0),
+char(4),char(0),char(113),char(0),char(4),char(0),char(114),char(0),char(7),char(0),char(115),char(0),char(7),char(0),char(116),char(0),char(7),char(0),char(117),char(0),
+char(7),char(0),char(118),char(0),char(7),char(0),char(119),char(0),char(7),char(0),char(120),char(0),char(7),char(0),char(121),char(0),char(7),char(0),char(122),char(0),
+char(7),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0),char(4),char(0),char(126),char(0),char(4),char(0),char(127),char(0),
+char(4),char(0),char(-128),char(0),char(4),char(0),char(-127),char(0),char(7),char(0),char(-126),char(0),char(7),char(0),char(-125),char(0),char(4),char(0),char(44),char(0),
+char(50),char(0),char(-124),char(0),char(50),char(0),char(-123),char(0),char(51),char(0),char(5),char(0),char(27),char(0),char(38),char(0),char(37),char(0),char(65),char(0),
+char(13),char(0),char(39),char(0),char(7),char(0),char(43),char(0),char(4),char(0),char(-122),char(0),char(52),char(0),char(5),char(0),char(29),char(0),char(47),char(0),
+char(13),char(0),char(-121),char(0),char(14),char(0),char(-120),char(0),char(4),char(0),char(-119),char(0),char(0),char(0),char(-118),char(0),char(48),char(0),char(29),char(0),
+char(9),char(0),char(-117),char(0),char(9),char(0),char(-116),char(0),char(27),char(0),char(-115),char(0),char(0),char(0),char(35),char(0),char(20),char(0),char(-114),char(0),
+char(20),char(0),char(-113),char(0),char(14),char(0),char(-112),char(0),char(14),char(0),char(-111),char(0),char(14),char(0),char(-110),char(0),char(8),char(0),char(-125),char(0),
+char(8),char(0),char(-109),char(0),char(8),char(0),char(-108),char(0),char(8),char(0),char(-107),char(0),char(8),char(0),char(-106),char(0),char(8),char(0),char(-105),char(0),
+char(8),char(0),char(-104),char(0),char(8),char(0),char(-103),char(0),char(8),char(0),char(-102),char(0),char(8),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),
+char(4),char(0),char(-99),char(0),char(4),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0),char(4),char(0),char(-96),char(0),char(4),char(0),char(-95),char(0),
+char(4),char(0),char(-94),char(0),char(4),char(0),char(-93),char(0),char(4),char(0),char(-92),char(0),char(4),char(0),char(-91),char(0),char(50),char(0),char(29),char(0),
+char(9),char(0),char(-117),char(0),char(9),char(0),char(-116),char(0),char(27),char(0),char(-115),char(0),char(0),char(0),char(35),char(0),char(19),char(0),char(-114),char(0),
+char(19),char(0),char(-113),char(0),char(13),char(0),char(-112),char(0),char(13),char(0),char(-111),char(0),char(13),char(0),char(-110),char(0),char(7),char(0),char(-125),char(0),
+char(7),char(0),char(-109),char(0),char(7),char(0),char(-108),char(0),char(7),char(0),char(-107),char(0),char(7),char(0),char(-106),char(0),char(7),char(0),char(-105),char(0),
+char(7),char(0),char(-104),char(0),char(7),char(0),char(-103),char(0),char(7),char(0),char(-102),char(0),char(7),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),
+char(4),char(0),char(-99),char(0),char(4),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0),char(4),char(0),char(-96),char(0),char(4),char(0),char(-95),char(0),
+char(4),char(0),char(-94),char(0),char(4),char(0),char(-93),char(0),char(4),char(0),char(-92),char(0),char(4),char(0),char(-91),char(0),char(53),char(0),char(23),char(0),
+char(8),char(0),char(-90),char(0),char(8),char(0),char(-89),char(0),char(8),char(0),char(-108),char(0),char(8),char(0),char(-88),char(0),char(8),char(0),char(-104),char(0),
+char(8),char(0),char(-87),char(0),char(8),char(0),char(-86),char(0),char(8),char(0),char(-85),char(0),char(8),char(0),char(-84),char(0),char(8),char(0),char(-83),char(0),
+char(8),char(0),char(-82),char(0),char(8),char(0),char(-81),char(0),char(8),char(0),char(-80),char(0),char(8),char(0),char(-79),char(0),char(8),char(0),char(-78),char(0),
+char(8),char(0),char(-77),char(0),char(8),char(0),char(-76),char(0),char(4),char(0),char(-75),char(0),char(4),char(0),char(-74),char(0),char(4),char(0),char(-73),char(0),
+char(4),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0),char(0),char(0),char(37),char(0),char(54),char(0),char(22),char(0),char(7),char(0),char(-90),char(0),
+char(7),char(0),char(-89),char(0),char(7),char(0),char(-108),char(0),char(7),char(0),char(-88),char(0),char(7),char(0),char(-104),char(0),char(7),char(0),char(-87),char(0),
+char(7),char(0),char(-86),char(0),char(7),char(0),char(-85),char(0),char(7),char(0),char(-84),char(0),char(7),char(0),char(-83),char(0),char(7),char(0),char(-82),char(0),
+char(7),char(0),char(-81),char(0),char(7),char(0),char(-80),char(0),char(7),char(0),char(-79),char(0),char(7),char(0),char(-78),char(0),char(7),char(0),char(-77),char(0),
+char(7),char(0),char(-76),char(0),char(4),char(0),char(-75),char(0),char(4),char(0),char(-74),char(0),char(4),char(0),char(-73),char(0),char(4),char(0),char(-72),char(0),
+char(4),char(0),char(-71),char(0),char(55),char(0),char(2),char(0),char(53),char(0),char(-70),char(0),char(14),char(0),char(-69),char(0),char(56),char(0),char(2),char(0),
+char(54),char(0),char(-70),char(0),char(13),char(0),char(-69),char(0),char(57),char(0),char(21),char(0),char(50),char(0),char(-68),char(0),char(17),char(0),char(-67),char(0),
+char(13),char(0),char(-66),char(0),char(13),char(0),char(-65),char(0),char(13),char(0),char(-64),char(0),char(13),char(0),char(-63),char(0),char(13),char(0),char(-69),char(0),
+char(13),char(0),char(-62),char(0),char(13),char(0),char(-61),char(0),char(13),char(0),char(-60),char(0),char(13),char(0),char(-59),char(0),char(7),char(0),char(-58),char(0),
+char(7),char(0),char(-57),char(0),char(7),char(0),char(-56),char(0),char(7),char(0),char(-55),char(0),char(7),char(0),char(-54),char(0),char(7),char(0),char(-53),char(0),
+char(7),char(0),char(-52),char(0),char(7),char(0),char(-51),char(0),char(7),char(0),char(-50),char(0),char(4),char(0),char(-49),char(0),char(58),char(0),char(22),char(0),
+char(48),char(0),char(-68),char(0),char(18),char(0),char(-67),char(0),char(14),char(0),char(-66),char(0),char(14),char(0),char(-65),char(0),char(14),char(0),char(-64),char(0),
+char(14),char(0),char(-63),char(0),char(14),char(0),char(-69),char(0),char(14),char(0),char(-62),char(0),char(14),char(0),char(-61),char(0),char(14),char(0),char(-60),char(0),
+char(14),char(0),char(-59),char(0),char(8),char(0),char(-58),char(0),char(8),char(0),char(-57),char(0),char(8),char(0),char(-56),char(0),char(8),char(0),char(-55),char(0),
+char(8),char(0),char(-54),char(0),char(8),char(0),char(-53),char(0),char(8),char(0),char(-52),char(0),char(8),char(0),char(-51),char(0),char(8),char(0),char(-50),char(0),
+char(4),char(0),char(-49),char(0),char(0),char(0),char(37),char(0),char(59),char(0),char(2),char(0),char(4),char(0),char(-48),char(0),char(4),char(0),char(-47),char(0),
+char(60),char(0),char(13),char(0),char(57),char(0),char(-46),char(0),char(57),char(0),char(-45),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-127),char(0),
+char(4),char(0),char(-44),char(0),char(4),char(0),char(-43),char(0),char(4),char(0),char(-42),char(0),char(7),char(0),char(-41),char(0),char(7),char(0),char(-40),char(0),
+char(4),char(0),char(-39),char(0),char(4),char(0),char(-38),char(0),char(7),char(0),char(-37),char(0),char(4),char(0),char(-36),char(0),char(61),char(0),char(13),char(0),
+char(62),char(0),char(-46),char(0),char(62),char(0),char(-45),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-127),char(0),char(4),char(0),char(-44),char(0),
+char(4),char(0),char(-43),char(0),char(4),char(0),char(-42),char(0),char(7),char(0),char(-41),char(0),char(7),char(0),char(-40),char(0),char(4),char(0),char(-39),char(0),
+char(4),char(0),char(-38),char(0),char(7),char(0),char(-37),char(0),char(4),char(0),char(-36),char(0),char(63),char(0),char(14),char(0),char(58),char(0),char(-46),char(0),
+char(58),char(0),char(-45),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-127),char(0),char(4),char(0),char(-44),char(0),char(4),char(0),char(-43),char(0),
+char(4),char(0),char(-42),char(0),char(8),char(0),char(-41),char(0),char(8),char(0),char(-40),char(0),char(4),char(0),char(-39),char(0),char(4),char(0),char(-38),char(0),
+char(8),char(0),char(-37),char(0),char(4),char(0),char(-36),char(0),char(0),char(0),char(-35),char(0),char(64),char(0),char(3),char(0),char(61),char(0),char(-34),char(0),
+char(13),char(0),char(-33),char(0),char(13),char(0),char(-32),char(0),char(65),char(0),char(3),char(0),char(63),char(0),char(-34),char(0),char(14),char(0),char(-33),char(0),
+char(14),char(0),char(-32),char(0),char(66),char(0),char(3),char(0),char(61),char(0),char(-34),char(0),char(14),char(0),char(-33),char(0),char(14),char(0),char(-32),char(0),
+char(67),char(0),char(13),char(0),char(61),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(4),char(0),char(-29),char(0),
+char(4),char(0),char(-28),char(0),char(4),char(0),char(-27),char(0),char(7),char(0),char(-26),char(0),char(7),char(0),char(-25),char(0),char(7),char(0),char(-24),char(0),
+char(7),char(0),char(-23),char(0),char(7),char(0),char(-22),char(0),char(7),char(0),char(-21),char(0),char(7),char(0),char(-20),char(0),char(68),char(0),char(13),char(0),
+char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),char(4),char(0),char(-29),char(0),char(4),char(0),char(-28),char(0),
+char(4),char(0),char(-27),char(0),char(7),char(0),char(-26),char(0),char(7),char(0),char(-25),char(0),char(7),char(0),char(-24),char(0),char(7),char(0),char(-23),char(0),
+char(7),char(0),char(-22),char(0),char(7),char(0),char(-21),char(0),char(7),char(0),char(-20),char(0),char(69),char(0),char(14),char(0),char(63),char(0),char(-34),char(0),
+char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(4),char(0),char(-29),char(0),char(4),char(0),char(-28),char(0),char(4),char(0),char(-27),char(0),
+char(8),char(0),char(-26),char(0),char(8),char(0),char(-25),char(0),char(8),char(0),char(-24),char(0),char(8),char(0),char(-23),char(0),char(8),char(0),char(-22),char(0),
+char(8),char(0),char(-21),char(0),char(8),char(0),char(-20),char(0),char(0),char(0),char(-19),char(0),char(70),char(0),char(10),char(0),char(63),char(0),char(-34),char(0),
+char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(8),char(0),char(-18),char(0),char(8),char(0),char(-17),char(0),char(8),char(0),char(-16),char(0),
+char(8),char(0),char(-22),char(0),char(8),char(0),char(-21),char(0),char(8),char(0),char(-20),char(0),char(8),char(0),char(-89),char(0),char(71),char(0),char(11),char(0),
+char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),char(7),char(0),char(-18),char(0),char(7),char(0),char(-17),char(0),
+char(7),char(0),char(-16),char(0),char(7),char(0),char(-22),char(0),char(7),char(0),char(-21),char(0),char(7),char(0),char(-20),char(0),char(7),char(0),char(-89),char(0),
+char(0),char(0),char(21),char(0),char(72),char(0),char(9),char(0),char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),
+char(13),char(0),char(-15),char(0),char(13),char(0),char(-14),char(0),char(13),char(0),char(-13),char(0),char(13),char(0),char(-12),char(0),char(4),char(0),char(-11),char(0),
+char(4),char(0),char(-10),char(0),char(73),char(0),char(9),char(0),char(63),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),
+char(14),char(0),char(-15),char(0),char(14),char(0),char(-14),char(0),char(14),char(0),char(-13),char(0),char(14),char(0),char(-12),char(0),char(4),char(0),char(-11),char(0),
+char(4),char(0),char(-10),char(0),char(74),char(0),char(5),char(0),char(72),char(0),char(-9),char(0),char(4),char(0),char(-8),char(0),char(7),char(0),char(-7),char(0),
+char(7),char(0),char(-6),char(0),char(7),char(0),char(-5),char(0),char(75),char(0),char(5),char(0),char(73),char(0),char(-9),char(0),char(4),char(0),char(-8),char(0),
+char(8),char(0),char(-7),char(0),char(8),char(0),char(-6),char(0),char(8),char(0),char(-5),char(0),char(76),char(0),char(41),char(0),char(61),char(0),char(-34),char(0),
+char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),char(13),char(0),char(-15),char(0),char(13),char(0),char(-14),char(0),char(13),char(0),char(-4),char(0),
+char(13),char(0),char(-3),char(0),char(13),char(0),char(-2),char(0),char(13),char(0),char(-1),char(0),char(13),char(0),char(0),char(1),char(13),char(0),char(1),char(1),
+char(13),char(0),char(2),char(1),char(13),char(0),char(3),char(1),char(13),char(0),char(4),char(1),char(13),char(0),char(5),char(1),char(13),char(0),char(6),char(1),
+char(0),char(0),char(7),char(1),char(0),char(0),char(8),char(1),char(0),char(0),char(9),char(1),char(0),char(0),char(10),char(1),char(0),char(0),char(11),char(1),
+char(0),char(0),char(-19),char(0),char(13),char(0),char(-13),char(0),char(13),char(0),char(-12),char(0),char(13),char(0),char(12),char(1),char(13),char(0),char(13),char(1),
+char(13),char(0),char(14),char(1),char(13),char(0),char(15),char(1),char(13),char(0),char(16),char(1),char(13),char(0),char(17),char(1),char(13),char(0),char(18),char(1),
+char(13),char(0),char(19),char(1),char(13),char(0),char(20),char(1),char(13),char(0),char(21),char(1),char(13),char(0),char(22),char(1),char(0),char(0),char(23),char(1),
+char(0),char(0),char(24),char(1),char(0),char(0),char(25),char(1),char(0),char(0),char(26),char(1),char(0),char(0),char(27),char(1),char(4),char(0),char(28),char(1),
+char(77),char(0),char(41),char(0),char(63),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(14),char(0),char(-15),char(0),
+char(14),char(0),char(-14),char(0),char(14),char(0),char(-4),char(0),char(14),char(0),char(-3),char(0),char(14),char(0),char(-2),char(0),char(14),char(0),char(-1),char(0),
+char(14),char(0),char(0),char(1),char(14),char(0),char(1),char(1),char(14),char(0),char(2),char(1),char(14),char(0),char(3),char(1),char(14),char(0),char(4),char(1),
+char(14),char(0),char(5),char(1),char(14),char(0),char(6),char(1),char(0),char(0),char(7),char(1),char(0),char(0),char(8),char(1),char(0),char(0),char(9),char(1),
+char(0),char(0),char(10),char(1),char(0),char(0),char(11),char(1),char(0),char(0),char(-19),char(0),char(14),char(0),char(-13),char(0),char(14),char(0),char(-12),char(0),
+char(14),char(0),char(12),char(1),char(14),char(0),char(13),char(1),char(14),char(0),char(14),char(1),char(14),char(0),char(15),char(1),char(14),char(0),char(16),char(1),
+char(14),char(0),char(17),char(1),char(14),char(0),char(18),char(1),char(14),char(0),char(19),char(1),char(14),char(0),char(20),char(1),char(14),char(0),char(21),char(1),
+char(14),char(0),char(22),char(1),char(0),char(0),char(23),char(1),char(0),char(0),char(24),char(1),char(0),char(0),char(25),char(1),char(0),char(0),char(26),char(1),
+char(0),char(0),char(27),char(1),char(4),char(0),char(28),char(1),char(78),char(0),char(9),char(0),char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),
+char(19),char(0),char(-30),char(0),char(7),char(0),char(-15),char(0),char(7),char(0),char(-14),char(0),char(7),char(0),char(-13),char(0),char(7),char(0),char(-12),char(0),
+char(4),char(0),char(-11),char(0),char(4),char(0),char(-10),char(0),char(79),char(0),char(9),char(0),char(63),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),
+char(20),char(0),char(-30),char(0),char(8),char(0),char(-15),char(0),char(8),char(0),char(-14),char(0),char(8),char(0),char(-13),char(0),char(8),char(0),char(-12),char(0),
+char(4),char(0),char(-11),char(0),char(4),char(0),char(-10),char(0),char(80),char(0),char(5),char(0),char(60),char(0),char(-34),char(0),char(13),char(0),char(29),char(1),
+char(13),char(0),char(30),char(1),char(7),char(0),char(31),char(1),char(0),char(0),char(37),char(0),char(81),char(0),char(4),char(0),char(63),char(0),char(-34),char(0),
+char(14),char(0),char(29),char(1),char(14),char(0),char(30),char(1),char(8),char(0),char(31),char(1),char(82),char(0),char(4),char(0),char(7),char(0),char(32),char(1),
+char(7),char(0),char(33),char(1),char(7),char(0),char(34),char(1),char(4),char(0),char(79),char(0),char(83),char(0),char(10),char(0),char(82),char(0),char(35),char(1),
+char(13),char(0),char(36),char(1),char(13),char(0),char(37),char(1),char(13),char(0),char(38),char(1),char(13),char(0),char(39),char(1),char(13),char(0),char(40),char(1),
+char(7),char(0),char(-58),char(0),char(7),char(0),char(41),char(1),char(4),char(0),char(42),char(1),char(4),char(0),char(53),char(0),char(84),char(0),char(4),char(0),
+char(82),char(0),char(35),char(1),char(4),char(0),char(43),char(1),char(7),char(0),char(44),char(1),char(4),char(0),char(45),char(1),char(85),char(0),char(4),char(0),
+char(13),char(0),char(40),char(1),char(82),char(0),char(35),char(1),char(4),char(0),char(46),char(1),char(7),char(0),char(47),char(1),char(86),char(0),char(7),char(0),
+char(13),char(0),char(48),char(1),char(82),char(0),char(35),char(1),char(4),char(0),char(49),char(1),char(7),char(0),char(50),char(1),char(7),char(0),char(51),char(1),
+char(7),char(0),char(52),char(1),char(4),char(0),char(53),char(0),char(87),char(0),char(6),char(0),char(17),char(0),char(53),char(1),char(13),char(0),char(51),char(1),
+char(13),char(0),char(54),char(1),char(62),char(0),char(55),char(1),char(4),char(0),char(56),char(1),char(7),char(0),char(52),char(1),char(88),char(0),char(26),char(0),
+char(4),char(0),char(57),char(1),char(7),char(0),char(58),char(1),char(7),char(0),char(-89),char(0),char(7),char(0),char(59),char(1),char(7),char(0),char(60),char(1),
+char(7),char(0),char(61),char(1),char(7),char(0),char(62),char(1),char(7),char(0),char(63),char(1),char(7),char(0),char(64),char(1),char(7),char(0),char(65),char(1),
+char(7),char(0),char(66),char(1),char(7),char(0),char(67),char(1),char(7),char(0),char(68),char(1),char(7),char(0),char(69),char(1),char(7),char(0),char(70),char(1),
+char(7),char(0),char(71),char(1),char(7),char(0),char(72),char(1),char(7),char(0),char(73),char(1),char(7),char(0),char(74),char(1),char(7),char(0),char(75),char(1),
+char(7),char(0),char(76),char(1),char(4),char(0),char(77),char(1),char(4),char(0),char(78),char(1),char(4),char(0),char(79),char(1),char(4),char(0),char(80),char(1),
+char(4),char(0),char(-99),char(0),char(89),char(0),char(12),char(0),char(17),char(0),char(81),char(1),char(17),char(0),char(82),char(1),char(17),char(0),char(83),char(1),
+char(13),char(0),char(84),char(1),char(13),char(0),char(85),char(1),char(7),char(0),char(86),char(1),char(4),char(0),char(87),char(1),char(4),char(0),char(88),char(1),
+char(4),char(0),char(89),char(1),char(4),char(0),char(90),char(1),char(7),char(0),char(50),char(1),char(4),char(0),char(53),char(0),char(90),char(0),char(27),char(0),
+char(19),char(0),char(91),char(1),char(17),char(0),char(92),char(1),char(17),char(0),char(93),char(1),char(13),char(0),char(84),char(1),char(13),char(0),char(94),char(1),
+char(13),char(0),char(95),char(1),char(13),char(0),char(96),char(1),char(13),char(0),char(97),char(1),char(13),char(0),char(98),char(1),char(4),char(0),char(99),char(1),
+char(7),char(0),char(100),char(1),char(4),char(0),char(101),char(1),char(4),char(0),char(102),char(1),char(4),char(0),char(103),char(1),char(7),char(0),char(104),char(1),
+char(7),char(0),char(105),char(1),char(4),char(0),char(106),char(1),char(4),char(0),char(107),char(1),char(7),char(0),char(108),char(1),char(7),char(0),char(109),char(1),
+char(7),char(0),char(110),char(1),char(7),char(0),char(111),char(1),char(7),char(0),char(112),char(1),char(7),char(0),char(113),char(1),char(4),char(0),char(114),char(1),
+char(4),char(0),char(115),char(1),char(4),char(0),char(116),char(1),char(91),char(0),char(12),char(0),char(9),char(0),char(117),char(1),char(9),char(0),char(118),char(1),
+char(13),char(0),char(119),char(1),char(7),char(0),char(120),char(1),char(7),char(0),char(-85),char(0),char(7),char(0),char(121),char(1),char(4),char(0),char(122),char(1),
+char(13),char(0),char(123),char(1),char(4),char(0),char(124),char(1),char(4),char(0),char(125),char(1),char(4),char(0),char(126),char(1),char(4),char(0),char(53),char(0),
+char(92),char(0),char(19),char(0),char(50),char(0),char(-68),char(0),char(89),char(0),char(127),char(1),char(82),char(0),char(-128),char(1),char(83),char(0),char(-127),char(1),
+char(84),char(0),char(-126),char(1),char(85),char(0),char(-125),char(1),char(86),char(0),char(-124),char(1),char(87),char(0),char(-123),char(1),char(90),char(0),char(-122),char(1),
+char(91),char(0),char(-121),char(1),char(4),char(0),char(-120),char(1),char(4),char(0),char(102),char(1),char(4),char(0),char(-119),char(1),char(4),char(0),char(-118),char(1),
+char(4),char(0),char(-117),char(1),char(4),char(0),char(-116),char(1),char(4),char(0),char(-115),char(1),char(4),char(0),char(-114),char(1),char(88),char(0),char(-113),char(1),
+char(93),char(0),char(28),char(0),char(16),char(0),char(-112),char(1),char(14),char(0),char(-111),char(1),char(14),char(0),char(-110),char(1),char(14),char(0),char(-109),char(1),
+char(14),char(0),char(-108),char(1),char(14),char(0),char(-107),char(1),char(14),char(0),char(-106),char(1),char(14),char(0),char(-105),char(1),char(14),char(0),char(-104),char(1),
+char(14),char(0),char(-103),char(1),char(8),char(0),char(-102),char(1),char(4),char(0),char(-101),char(1),char(4),char(0),char(126),char(1),char(4),char(0),char(-100),char(1),
+char(4),char(0),char(-99),char(1),char(8),char(0),char(-98),char(1),char(8),char(0),char(-97),char(1),char(8),char(0),char(-96),char(1),char(8),char(0),char(-95),char(1),
+char(8),char(0),char(-94),char(1),char(8),char(0),char(-93),char(1),char(8),char(0),char(-92),char(1),char(8),char(0),char(-91),char(1),char(8),char(0),char(-90),char(1),
+char(0),char(0),char(-89),char(1),char(0),char(0),char(-88),char(1),char(48),char(0),char(-87),char(1),char(0),char(0),char(-86),char(1),char(94),char(0),char(28),char(0),
+char(15),char(0),char(-112),char(1),char(13),char(0),char(-111),char(1),char(13),char(0),char(-110),char(1),char(13),char(0),char(-109),char(1),char(13),char(0),char(-108),char(1),
+char(13),char(0),char(-107),char(1),char(13),char(0),char(-106),char(1),char(13),char(0),char(-105),char(1),char(13),char(0),char(-104),char(1),char(13),char(0),char(-103),char(1),
+char(4),char(0),char(-100),char(1),char(7),char(0),char(-102),char(1),char(4),char(0),char(-101),char(1),char(4),char(0),char(126),char(1),char(7),char(0),char(-98),char(1),
+char(7),char(0),char(-97),char(1),char(7),char(0),char(-96),char(1),char(4),char(0),char(-99),char(1),char(7),char(0),char(-95),char(1),char(7),char(0),char(-94),char(1),
+char(7),char(0),char(-93),char(1),char(7),char(0),char(-92),char(1),char(7),char(0),char(-91),char(1),char(7),char(0),char(-90),char(1),char(0),char(0),char(-89),char(1),
+char(0),char(0),char(-88),char(1),char(50),char(0),char(-87),char(1),char(0),char(0),char(-86),char(1),char(95),char(0),char(11),char(0),char(14),char(0),char(-85),char(1),
+char(16),char(0),char(-84),char(1),char(14),char(0),char(-83),char(1),char(14),char(0),char(-82),char(1),char(14),char(0),char(-81),char(1),char(8),char(0),char(-80),char(1),
+char(4),char(0),char(-119),char(1),char(0),char(0),char(37),char(0),char(0),char(0),char(-79),char(1),char(93),char(0),char(-126),char(1),char(48),char(0),char(-78),char(1),
+char(96),char(0),char(10),char(0),char(13),char(0),char(-85),char(1),char(15),char(0),char(-84),char(1),char(13),char(0),char(-83),char(1),char(13),char(0),char(-82),char(1),
+char(13),char(0),char(-81),char(1),char(7),char(0),char(-80),char(1),char(4),char(0),char(-119),char(1),char(0),char(0),char(-79),char(1),char(94),char(0),char(-126),char(1),
+char(50),char(0),char(-78),char(1),char(97),char(0),char(4),char(0),char(50),char(0),char(-77),char(1),char(96),char(0),char(-76),char(1),char(4),char(0),char(-75),char(1),
+char(0),char(0),char(37),char(0),char(98),char(0),char(4),char(0),char(48),char(0),char(-77),char(1),char(95),char(0),char(-76),char(1),char(4),char(0),char(-75),char(1),
+char(0),char(0),char(37),char(0),};
+int sBulletDNAlen= sizeof(sBulletDNAstr);
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btSerializer.h b/dali-physics/third-party/bullet3/src/LinearMath/btSerializer.h
new file mode 100644
index 0000000..8670956
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btSerializer.h
@@ -0,0 +1,866 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SERIALIZER_H
+#define BT_SERIALIZER_H
+
+#include "btScalar.h"  // has definitions like SIMD_FORCE_INLINE
+#include "btHashMap.h"
+
+#if !defined(__CELLOS_LV2__) && !defined(__MWERKS__)
+#include <memory.h>
+#endif
+#include <string.h>
+
+extern char sBulletDNAstr[];
+extern int sBulletDNAlen;
+extern char sBulletDNAstr64[];
+extern int sBulletDNAlen64;
+
+SIMD_FORCE_INLINE int btStrLen(const char* str)
+{
+	if (!str)
+		return (0);
+	int len = 0;
+
+	while (*str != 0)
+	{
+		str++;
+		len++;
+	}
+
+	return len;
+}
+
+class btChunk
+{
+public:
+	int m_chunkCode;
+	int m_length;
+	void* m_oldPtr;
+	int m_dna_nr;
+	int m_number;
+};
+
+enum btSerializationFlags
+{
+	BT_SERIALIZE_NO_BVH = 1,
+	BT_SERIALIZE_NO_TRIANGLEINFOMAP = 2,
+	BT_SERIALIZE_NO_DUPLICATE_ASSERT = 4,
+	BT_SERIALIZE_CONTACT_MANIFOLDS = 8,
+};
+
+class btSerializer
+{
+public:
+	virtual ~btSerializer() {}
+
+	virtual const unsigned char* getBufferPointer() const = 0;
+
+	virtual int getCurrentBufferSize() const = 0;
+
+	virtual btChunk* allocate(size_t size, int numElements) = 0;
+
+	virtual void finalizeChunk(btChunk* chunk, const char* structType, int chunkCode, void* oldPtr) = 0;
+
+	virtual void* findPointer(void* oldPtr) = 0;
+
+	virtual void* getUniquePointer(void* oldPtr) = 0;
+
+	virtual void startSerialization() = 0;
+
+	virtual void finishSerialization() = 0;
+
+	virtual const char* findNameForPointer(const void* ptr) const = 0;
+
+	virtual void registerNameForPointer(const void* ptr, const char* name) = 0;
+
+	virtual void serializeName(const char* ptr) = 0;
+
+	virtual int getSerializationFlags() const = 0;
+
+	virtual void setSerializationFlags(int flags) = 0;
+
+	virtual int getNumChunks() const = 0;
+
+	virtual const btChunk* getChunk(int chunkIndex) const = 0;
+};
+
+#define BT_HEADER_LENGTH 12
+#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined(__PPC__) || defined(__ppc__) || defined(__BIG_ENDIAN__)
+#define BT_MAKE_ID(a, b, c, d) ((int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d))
+#else
+#define BT_MAKE_ID(a, b, c, d) ((int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a))
+#endif
+
+#define BT_MULTIBODY_CODE BT_MAKE_ID('M', 'B', 'D', 'Y')
+#define BT_MB_LINKCOLLIDER_CODE BT_MAKE_ID('M', 'B', 'L', 'C')
+#define BT_SOFTBODY_CODE BT_MAKE_ID('S', 'B', 'D', 'Y')
+#define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C', 'O', 'B', 'J')
+#define BT_RIGIDBODY_CODE BT_MAKE_ID('R', 'B', 'D', 'Y')
+#define BT_CONSTRAINT_CODE BT_MAKE_ID('C', 'O', 'N', 'S')
+#define BT_BOXSHAPE_CODE BT_MAKE_ID('B', 'O', 'X', 'S')
+#define BT_QUANTIZED_BVH_CODE BT_MAKE_ID('Q', 'B', 'V', 'H')
+#define BT_TRIANLGE_INFO_MAP BT_MAKE_ID('T', 'M', 'A', 'P')
+#define BT_SHAPE_CODE BT_MAKE_ID('S', 'H', 'A', 'P')
+#define BT_ARRAY_CODE BT_MAKE_ID('A', 'R', 'A', 'Y')
+#define BT_SBMATERIAL_CODE BT_MAKE_ID('S', 'B', 'M', 'T')
+#define BT_SBNODE_CODE BT_MAKE_ID('S', 'B', 'N', 'D')
+#define BT_DYNAMICSWORLD_CODE BT_MAKE_ID('D', 'W', 'L', 'D')
+#define BT_CONTACTMANIFOLD_CODE BT_MAKE_ID('C', 'O', 'N', 'T')
+#define BT_DNA_CODE BT_MAKE_ID('D', 'N', 'A', '1')
+
+struct btPointerUid
+{
+	union {
+		void* m_ptr;
+		int m_uniqueIds[2];
+	};
+};
+
+struct btBulletSerializedArrays
+{
+	btBulletSerializedArrays()
+	{
+	}
+	btAlignedObjectArray<struct btQuantizedBvhDoubleData*> m_bvhsDouble;
+	btAlignedObjectArray<struct btQuantizedBvhFloatData*> m_bvhsFloat;
+	btAlignedObjectArray<struct btCollisionShapeData*> m_colShapeData;
+	btAlignedObjectArray<struct btDynamicsWorldDoubleData*> m_dynamicWorldInfoDataDouble;
+	btAlignedObjectArray<struct btDynamicsWorldFloatData*> m_dynamicWorldInfoDataFloat;
+	btAlignedObjectArray<struct btRigidBodyDoubleData*> m_rigidBodyDataDouble;
+	btAlignedObjectArray<struct btRigidBodyFloatData*> m_rigidBodyDataFloat;
+	btAlignedObjectArray<struct btCollisionObjectDoubleData*> m_collisionObjectDataDouble;
+	btAlignedObjectArray<struct btCollisionObjectFloatData*> m_collisionObjectDataFloat;
+	btAlignedObjectArray<struct btTypedConstraintFloatData*> m_constraintDataFloat;
+	btAlignedObjectArray<struct btTypedConstraintDoubleData*> m_constraintDataDouble;
+	btAlignedObjectArray<struct btTypedConstraintData*> m_constraintData;  //for backwards compatibility
+	btAlignedObjectArray<struct btSoftBodyFloatData*> m_softBodyFloatData;
+	btAlignedObjectArray<struct btSoftBodyDoubleData*> m_softBodyDoubleData;
+};
+
+///The btDefaultSerializer is the main Bullet serialization class.
+///The constructor takes an optional argument for backwards compatibility, it is recommended to leave this empty/zero.
+class btDefaultSerializer : public btSerializer
+{
+protected:
+	btAlignedObjectArray<char*> mTypes;
+	btAlignedObjectArray<short*> mStructs;
+	btAlignedObjectArray<short> mTlens;
+	btHashMap<btHashInt, int> mStructReverse;
+	btHashMap<btHashString, int> mTypeLookup;
+
+	btHashMap<btHashPtr, void*> m_chunkP;
+
+	btHashMap<btHashPtr, const char*> m_nameMap;
+
+	btHashMap<btHashPtr, btPointerUid> m_uniquePointers;
+	int m_uniqueIdGenerator;
+
+	int m_totalSize;
+	unsigned char* m_buffer;
+	bool m_ownsBuffer;
+	int m_currentSize;
+	void* m_dna;
+	int m_dnaLength;
+
+	int m_serializationFlags;
+
+	btAlignedObjectArray<btChunk*> m_chunkPtrs;
+
+protected:
+	virtual void* findPointer(void* oldPtr)
+	{
+		void** ptr = m_chunkP.find(oldPtr);
+		if (ptr && *ptr)
+			return *ptr;
+		return 0;
+	}
+
+	virtual void writeDNA()
+	{
+		btChunk* dnaChunk = allocate(m_dnaLength, 1);
+		memcpy(dnaChunk->m_oldPtr, m_dna, m_dnaLength);
+		finalizeChunk(dnaChunk, "DNA1", BT_DNA_CODE, m_dna);
+	}
+
+	int getReverseType(const char* type) const
+	{
+		btHashString key(type);
+		const int* valuePtr = mTypeLookup.find(key);
+		if (valuePtr)
+			return *valuePtr;
+
+		return -1;
+	}
+
+	void initDNA(const char* bdnaOrg, int dnalen)
+	{
+		///was already initialized
+		if (m_dna)
+			return;
+
+		int littleEndian = 1;
+		littleEndian = ((char*)&littleEndian)[0];
+
+		m_dna = btAlignedAlloc(dnalen, 16);
+		memcpy(m_dna, bdnaOrg, dnalen);
+		m_dnaLength = dnalen;
+
+		int* intPtr = 0;
+		short* shtPtr = 0;
+		char* cp = 0;
+		int dataLen = 0;
+		intPtr = (int*)m_dna;
+
+		/*
+				SDNA (4 bytes) (magic number)
+				NAME (4 bytes)
+				<nr> (4 bytes) amount of names (int)
+				<string>
+				<string>
+			*/
+
+		if (strncmp((const char*)m_dna, "SDNA", 4) == 0)
+		{
+			// skip ++ NAME
+			intPtr++;
+			intPtr++;
+		}
+
+		// Parse names
+		if (!littleEndian)
+			*intPtr = btSwapEndian(*intPtr);
+
+		dataLen = *intPtr;
+
+		intPtr++;
+
+		cp = (char*)intPtr;
+		int i;
+		for (i = 0; i < dataLen; i++)
+		{
+			while (*cp) cp++;
+			cp++;
+		}
+		cp = btAlignPointer(cp, 4);
+
+		/*
+				TYPE (4 bytes)
+				<nr> amount of types (int)
+				<string>
+				<string>
+			*/
+
+		intPtr = (int*)cp;
+		btAssert(strncmp(cp, "TYPE", 4) == 0);
+		intPtr++;
+
+		if (!littleEndian)
+			*intPtr = btSwapEndian(*intPtr);
+
+		dataLen = *intPtr;
+		intPtr++;
+
+		cp = (char*)intPtr;
+		for (i = 0; i < dataLen; i++)
+		{
+			mTypes.push_back(cp);
+			while (*cp) cp++;
+			cp++;
+		}
+
+		cp = btAlignPointer(cp, 4);
+
+		/*
+				TLEN (4 bytes)
+				<len> (short) the lengths of types
+				<len>
+			*/
+
+		// Parse type lens
+		intPtr = (int*)cp;
+		btAssert(strncmp(cp, "TLEN", 4) == 0);
+		intPtr++;
+
+		dataLen = (int)mTypes.size();
+
+		shtPtr = (short*)intPtr;
+		for (i = 0; i < dataLen; i++, shtPtr++)
+		{
+			if (!littleEndian)
+				shtPtr[0] = btSwapEndian(shtPtr[0]);
+			mTlens.push_back(shtPtr[0]);
+		}
+
+		if (dataLen & 1) shtPtr++;
+
+		/*
+				STRC (4 bytes)
+				<nr> amount of structs (int)
+				<typenr>
+				<nr_of_elems>
+				<typenr>
+				<namenr>
+				<typenr>
+				<namenr>
+			*/
+
+		intPtr = (int*)shtPtr;
+		cp = (char*)intPtr;
+		btAssert(strncmp(cp, "STRC", 4) == 0);
+		intPtr++;
+
+		if (!littleEndian)
+			*intPtr = btSwapEndian(*intPtr);
+		dataLen = *intPtr;
+		intPtr++;
+
+		shtPtr = (short*)intPtr;
+		for (i = 0; i < dataLen; i++)
+		{
+			mStructs.push_back(shtPtr);
+
+			if (!littleEndian)
+			{
+				shtPtr[0] = btSwapEndian(shtPtr[0]);
+				shtPtr[1] = btSwapEndian(shtPtr[1]);
+
+				int len = shtPtr[1];
+				shtPtr += 2;
+
+				for (int a = 0; a < len; a++, shtPtr += 2)
+				{
+					shtPtr[0] = btSwapEndian(shtPtr[0]);
+					shtPtr[1] = btSwapEndian(shtPtr[1]);
+				}
+			}
+			else
+			{
+				shtPtr += (2 * shtPtr[1]) + 2;
+			}
+		}
+
+		// build reverse lookups
+		for (i = 0; i < (int)mStructs.size(); i++)
+		{
+			short* strc = mStructs.at(i);
+			mStructReverse.insert(strc[0], i);
+			mTypeLookup.insert(btHashString(mTypes[strc[0]]), i);
+		}
+	}
+
+public:
+	btHashMap<btHashPtr, void*> m_skipPointers;
+
+	btDefaultSerializer(int totalSize = 0, unsigned char* buffer = 0)
+		: m_uniqueIdGenerator(0),
+		  m_totalSize(totalSize),
+		  m_currentSize(0),
+		  m_dna(0),
+		  m_dnaLength(0),
+		  m_serializationFlags(0)
+	{
+		if (buffer == 0)
+		{
+			m_buffer = m_totalSize ? (unsigned char*)btAlignedAlloc(totalSize, 16) : 0;
+			m_ownsBuffer = true;
+		}
+		else
+		{
+			m_buffer = buffer;
+			m_ownsBuffer = false;
+		}
+
+		const bool VOID_IS_8 = ((sizeof(void*) == 8));
+
+#ifdef BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+		if (VOID_IS_8)
+		{
+#if _WIN64
+			initDNA((const char*)sBulletDNAstr64, sBulletDNAlen64);
+#else
+			btAssert(0);
+#endif
+		}
+		else
+		{
+#ifndef _WIN64
+			initDNA((const char*)sBulletDNAstr, sBulletDNAlen);
+#else
+			btAssert(0);
+#endif
+		}
+
+#else   //BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+		if (VOID_IS_8)
+		{
+			initDNA((const char*)sBulletDNAstr64, sBulletDNAlen64);
+		}
+		else
+		{
+			initDNA((const char*)sBulletDNAstr, sBulletDNAlen);
+		}
+#endif  //BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES
+	}
+
+	virtual ~btDefaultSerializer()
+	{
+		if (m_buffer && m_ownsBuffer)
+			btAlignedFree(m_buffer);
+		if (m_dna)
+			btAlignedFree(m_dna);
+	}
+
+	static int getMemoryDnaSizeInBytes()
+	{
+		const bool VOID_IS_8 = ((sizeof(void*) == 8));
+
+		if (VOID_IS_8)
+		{
+			return sBulletDNAlen64;
+		}
+		return sBulletDNAlen;
+	}
+	static const char* getMemoryDna()
+	{
+		const bool VOID_IS_8 = ((sizeof(void*) == 8));
+		if (VOID_IS_8)
+		{
+			return (const char*)sBulletDNAstr64;
+		}
+		return (const char*)sBulletDNAstr;
+	}
+
+	void insertHeader()
+	{
+		writeHeader(m_buffer);
+		m_currentSize += BT_HEADER_LENGTH;
+	}
+
+	void writeHeader(unsigned char* buffer) const
+	{
+#ifdef BT_USE_DOUBLE_PRECISION
+		memcpy(buffer, "BULLETd", 7);
+#else
+		memcpy(buffer, "BULLETf", 7);
+#endif  //BT_USE_DOUBLE_PRECISION
+
+		int littleEndian = 1;
+		littleEndian = ((char*)&littleEndian)[0];
+
+		if (sizeof(void*) == 8)
+		{
+			buffer[7] = '-';
+		}
+		else
+		{
+			buffer[7] = '_';
+		}
+
+		if (littleEndian)
+		{
+			buffer[8] = 'v';
+		}
+		else
+		{
+			buffer[8] = 'V';
+		}
+
+		buffer[9] = '3';
+		buffer[10] = '2';
+		buffer[11] = '5';
+	}
+
+	virtual void startSerialization()
+	{
+		m_uniqueIdGenerator = 1;
+		if (m_totalSize)
+		{
+			unsigned char* buffer = internalAlloc(BT_HEADER_LENGTH);
+			writeHeader(buffer);
+		}
+	}
+
+	virtual void finishSerialization()
+	{
+		writeDNA();
+
+		//if we didn't pre-allocate a buffer, we need to create a contiguous buffer now
+		if (!m_totalSize)
+		{
+			if (m_buffer)
+				btAlignedFree(m_buffer);
+
+			m_currentSize += BT_HEADER_LENGTH;
+			m_buffer = (unsigned char*)btAlignedAlloc(m_currentSize, 16);
+
+			unsigned char* currentPtr = m_buffer;
+			writeHeader(m_buffer);
+			currentPtr += BT_HEADER_LENGTH;
+			for (int i = 0; i < m_chunkPtrs.size(); i++)
+			{
+				int curLength = (int)sizeof(btChunk) + m_chunkPtrs[i]->m_length;
+				memcpy(currentPtr, m_chunkPtrs[i], curLength);
+				btAlignedFree(m_chunkPtrs[i]);
+				currentPtr += curLength;
+			}
+		}
+
+		mTypes.clear();
+		mStructs.clear();
+		mTlens.clear();
+		mStructReverse.clear();
+		mTypeLookup.clear();
+		m_skipPointers.clear();
+		m_chunkP.clear();
+		m_nameMap.clear();
+		m_uniquePointers.clear();
+		m_chunkPtrs.clear();
+	}
+
+	virtual void* getUniquePointer(void* oldPtr)
+	{
+		btAssert(m_uniqueIdGenerator >= 0);
+		if (!oldPtr)
+			return 0;
+
+		btPointerUid* uptr = (btPointerUid*)m_uniquePointers.find(oldPtr);
+		if (uptr)
+		{
+			return uptr->m_ptr;
+		}
+
+		void** ptr2 = m_skipPointers[oldPtr];
+		if (ptr2)
+		{
+			return 0;
+		}
+
+		m_uniqueIdGenerator++;
+
+		btPointerUid uid;
+		uid.m_uniqueIds[0] = m_uniqueIdGenerator;
+		uid.m_uniqueIds[1] = m_uniqueIdGenerator;
+		m_uniquePointers.insert(oldPtr, uid);
+		return uid.m_ptr;
+	}
+
+	virtual const unsigned char* getBufferPointer() const
+	{
+		return m_buffer;
+	}
+
+	virtual int getCurrentBufferSize() const
+	{
+		return m_currentSize;
+	}
+
+	virtual void finalizeChunk(btChunk* chunk, const char* structType, int chunkCode, void* oldPtr)
+	{
+		if (!(m_serializationFlags & BT_SERIALIZE_NO_DUPLICATE_ASSERT))
+		{
+			btAssert(!findPointer(oldPtr));
+		}
+
+		chunk->m_dna_nr = getReverseType(structType);
+
+		chunk->m_chunkCode = chunkCode;
+
+		void* uniquePtr = getUniquePointer(oldPtr);
+
+		m_chunkP.insert(oldPtr, uniquePtr);  //chunk->m_oldPtr);
+		chunk->m_oldPtr = uniquePtr;         //oldPtr;
+	}
+
+	virtual unsigned char* internalAlloc(size_t size)
+	{
+		unsigned char* ptr = 0;
+
+		if (m_totalSize)
+		{
+			ptr = m_buffer + m_currentSize;
+			m_currentSize += int(size);
+			btAssert(m_currentSize < m_totalSize);
+		}
+		else
+		{
+			ptr = (unsigned char*)btAlignedAlloc(size, 16);
+			m_currentSize += int(size);
+		}
+		return ptr;
+	}
+
+	virtual btChunk* allocate(size_t size, int numElements)
+	{
+		unsigned char* ptr = internalAlloc(int(size) * numElements + sizeof(btChunk));
+
+		unsigned char* data = ptr + sizeof(btChunk);
+
+		btChunk* chunk = (btChunk*)ptr;
+		chunk->m_chunkCode = 0;
+		chunk->m_oldPtr = data;
+		chunk->m_length = int(size) * numElements;
+		chunk->m_number = numElements;
+
+		m_chunkPtrs.push_back(chunk);
+
+		return chunk;
+	}
+
+	virtual const char* findNameForPointer(const void* ptr) const
+	{
+		const char* const* namePtr = m_nameMap.find(ptr);
+		if (namePtr && *namePtr)
+			return *namePtr;
+		return 0;
+	}
+
+	virtual void registerNameForPointer(const void* ptr, const char* name)
+	{
+		m_nameMap.insert(ptr, name);
+	}
+
+	virtual void serializeName(const char* name)
+	{
+		if (name)
+		{
+			//don't serialize name twice
+			if (findPointer((void*)name))
+				return;
+
+			int len = btStrLen(name);
+			if (len)
+			{
+				int newLen = len + 1;
+				int padding = ((newLen + 3) & ~3) - newLen;
+				newLen += padding;
+
+				//serialize name string now
+				btChunk* chunk = allocate(sizeof(char), newLen);
+				char* destinationName = (char*)chunk->m_oldPtr;
+				for (int i = 0; i < len; i++)
+				{
+					destinationName[i] = name[i];
+				}
+				destinationName[len] = 0;
+				finalizeChunk(chunk, "char", BT_ARRAY_CODE, (void*)name);
+			}
+		}
+	}
+
+	virtual int getSerializationFlags() const
+	{
+		return m_serializationFlags;
+	}
+
+	virtual void setSerializationFlags(int flags)
+	{
+		m_serializationFlags = flags;
+	}
+	int getNumChunks() const
+	{
+		return m_chunkPtrs.size();
+	}
+
+	const btChunk* getChunk(int chunkIndex) const
+	{
+		return m_chunkPtrs[chunkIndex];
+	}
+};
+
+///In general it is best to use btDefaultSerializer,
+///in particular when writing the data to disk or sending it over the network.
+///The btInMemorySerializer is experimental and only suitable in a few cases.
+///The btInMemorySerializer takes a shortcut and can be useful to create a deep-copy
+///of objects. There will be a demo on how to use the btInMemorySerializer.
+#ifdef ENABLE_INMEMORY_SERIALIZER
+
+struct btInMemorySerializer : public btDefaultSerializer
+{
+	btHashMap<btHashPtr, btChunk*> m_uid2ChunkPtr;
+	btHashMap<btHashPtr, void*> m_orgPtr2UniqueDataPtr;
+	btHashMap<btHashString, const void*> m_names2Ptr;
+
+	btBulletSerializedArrays m_arrays;
+
+	btInMemorySerializer(int totalSize = 0, unsigned char* buffer = 0)
+		: btDefaultSerializer(totalSize, buffer)
+	{
+	}
+
+	virtual void startSerialization()
+	{
+		m_uid2ChunkPtr.clear();
+		//todo: m_arrays.clear();
+		btDefaultSerializer::startSerialization();
+	}
+
+	btChunk* findChunkFromUniquePointer(void* uniquePointer)
+	{
+		btChunk** chkPtr = m_uid2ChunkPtr[uniquePointer];
+		if (chkPtr)
+		{
+			return *chkPtr;
+		}
+		return 0;
+	}
+
+	virtual void registerNameForPointer(const void* ptr, const char* name)
+	{
+		btDefaultSerializer::registerNameForPointer(ptr, name);
+		m_names2Ptr.insert(name, ptr);
+	}
+
+	virtual void finishSerialization()
+	{
+	}
+
+	virtual void* getUniquePointer(void* oldPtr)
+	{
+		if (oldPtr == 0)
+			return 0;
+
+		// void* uniquePtr = getUniquePointer(oldPtr);
+		btChunk* chunk = findChunkFromUniquePointer(oldPtr);
+		if (chunk)
+		{
+			return chunk->m_oldPtr;
+		}
+		else
+		{
+			const char* n = (const char*)oldPtr;
+			const void** ptr = m_names2Ptr[n];
+			if (ptr)
+			{
+				return oldPtr;
+			}
+			else
+			{
+				void** ptr2 = m_skipPointers[oldPtr];
+				if (ptr2)
+				{
+					return 0;
+				}
+				else
+				{
+					//If this assert hit, serialization happened in the wrong order
+					// 'getUniquePointer'
+					btAssert(0);
+				}
+			}
+			return 0;
+		}
+		return oldPtr;
+	}
+
+	virtual void finalizeChunk(btChunk* chunk, const char* structType, int chunkCode, void* oldPtr)
+	{
+		if (!(m_serializationFlags & BT_SERIALIZE_NO_DUPLICATE_ASSERT))
+		{
+			btAssert(!findPointer(oldPtr));
+		}
+
+		chunk->m_dna_nr = getReverseType(structType);
+		chunk->m_chunkCode = chunkCode;
+		//void* uniquePtr = getUniquePointer(oldPtr);
+		m_chunkP.insert(oldPtr, oldPtr);  //chunk->m_oldPtr);
+		// chunk->m_oldPtr = uniquePtr;//oldPtr;
+
+		void* uid = findPointer(oldPtr);
+		m_uid2ChunkPtr.insert(uid, chunk);
+
+		switch (chunk->m_chunkCode)
+		{
+			case BT_SOFTBODY_CODE:
+			{
+#ifdef BT_USE_DOUBLE_PRECISION
+				m_arrays.m_softBodyDoubleData.push_back((btSoftBodyDoubleData*)chunk->m_oldPtr);
+#else
+				m_arrays.m_softBodyFloatData.push_back((btSoftBodyFloatData*)chunk->m_oldPtr);
+#endif
+				break;
+			}
+			case BT_COLLISIONOBJECT_CODE:
+			{
+#ifdef BT_USE_DOUBLE_PRECISION
+				m_arrays.m_collisionObjectDataDouble.push_back((btCollisionObjectDoubleData*)chunk->m_oldPtr);
+#else   //BT_USE_DOUBLE_PRECISION
+				m_arrays.m_collisionObjectDataFloat.push_back((btCollisionObjectFloatData*)chunk->m_oldPtr);
+#endif  //BT_USE_DOUBLE_PRECISION
+				break;
+			}
+			case BT_RIGIDBODY_CODE:
+			{
+#ifdef BT_USE_DOUBLE_PRECISION
+				m_arrays.m_rigidBodyDataDouble.push_back((btRigidBodyDoubleData*)chunk->m_oldPtr);
+#else
+				m_arrays.m_rigidBodyDataFloat.push_back((btRigidBodyFloatData*)chunk->m_oldPtr);
+#endif  //BT_USE_DOUBLE_PRECISION
+				break;
+			};
+			case BT_CONSTRAINT_CODE:
+			{
+#ifdef BT_USE_DOUBLE_PRECISION
+				m_arrays.m_constraintDataDouble.push_back((btTypedConstraintDoubleData*)chunk->m_oldPtr);
+#else
+				m_arrays.m_constraintDataFloat.push_back((btTypedConstraintFloatData*)chunk->m_oldPtr);
+#endif
+				break;
+			}
+			case BT_QUANTIZED_BVH_CODE:
+			{
+#ifdef BT_USE_DOUBLE_PRECISION
+				m_arrays.m_bvhsDouble.push_back((btQuantizedBvhDoubleData*)chunk->m_oldPtr);
+#else
+				m_arrays.m_bvhsFloat.push_back((btQuantizedBvhFloatData*)chunk->m_oldPtr);
+#endif
+				break;
+			}
+
+			case BT_SHAPE_CODE:
+			{
+				btCollisionShapeData* shapeData = (btCollisionShapeData*)chunk->m_oldPtr;
+				m_arrays.m_colShapeData.push_back(shapeData);
+				break;
+			}
+			case BT_TRIANLGE_INFO_MAP:
+			case BT_ARRAY_CODE:
+			case BT_SBMATERIAL_CODE:
+			case BT_SBNODE_CODE:
+			case BT_DYNAMICSWORLD_CODE:
+			case BT_DNA_CODE:
+			{
+				break;
+			}
+			default:
+			{
+			}
+		};
+	}
+
+	int getNumChunks() const
+	{
+		return m_uid2ChunkPtr.size();
+	}
+
+	const btChunk* getChunk(int chunkIndex) const
+	{
+		return *m_uid2ChunkPtr.getAtIndex(chunkIndex);
+	}
+};
+#endif  //ENABLE_INMEMORY_SERIALIZER
+
+#endif  //BT_SERIALIZER_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btSerializer64.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btSerializer64.cpp
new file mode 100644
index 0000000..6c4bc70
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btSerializer64.cpp
@@ -0,0 +1,692 @@
+char sBulletDNAstr64[]= {
+char(83),char(68),char(78),char(65),char(78),char(65),char(77),char(69),char(-74),char(1),char(0),char(0),char(109),char(95),char(115),char(105),char(122),char(101),char(0),char(109),
+char(95),char(99),char(97),char(112),char(97),char(99),char(105),char(116),char(121),char(0),char(42),char(109),char(95),char(100),char(97),char(116),char(97),char(0),char(109),char(95),
+char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(115),char(0),char(109),char(95),char(99),char(111),
+char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110),
+char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(115),char(0),char(42),char(102),char(105),char(114),char(115),char(116),char(0),char(42),char(108),char(97),char(115),
+char(116),char(0),char(109),char(95),char(102),char(108),char(111),char(97),char(116),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(101),char(108),char(91),char(51),
+char(93),char(0),char(109),char(95),char(98),char(97),char(115),char(105),char(115),char(0),char(109),char(95),char(111),char(114),char(105),char(103),char(105),char(110),char(0),char(109),
+char(95),char(114),char(111),char(111),char(116),char(78),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(115),char(117),char(98),
+char(116),char(114),char(101),char(101),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),
+char(65),char(97),char(98),char(98),char(77),char(105),char(110),char(91),char(51),char(93),char(0),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),
+char(101),char(100),char(65),char(97),char(98),char(98),char(77),char(97),char(120),char(91),char(51),char(93),char(0),char(109),char(95),char(97),char(97),char(98),char(98),char(77),
+char(105),char(110),char(79),char(114),char(103),char(0),char(109),char(95),char(97),char(97),char(98),char(98),char(77),char(97),char(120),char(79),char(114),char(103),char(0),char(109),
+char(95),char(101),char(115),char(99),char(97),char(112),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(115),char(117),char(98),char(80),char(97),
+char(114),char(116),char(0),char(109),char(95),char(116),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),
+char(95),char(112),char(97),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(101),char(115),char(99),char(97),char(112),char(101),char(73),char(110),char(100),char(101),
+char(120),char(79),char(114),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(98),
+char(118),char(104),char(65),char(97),char(98),char(98),char(77),char(105),char(110),char(0),char(109),char(95),char(98),char(118),char(104),char(65),char(97),char(98),char(98),char(77),
+char(97),char(120),char(0),char(109),char(95),char(98),char(118),char(104),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(97),char(116),char(105),char(111),char(110),
+char(0),char(109),char(95),char(99),char(117),char(114),char(78),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(117),char(115),
+char(101),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(110),char(117),char(109),char(67),
+char(111),char(110),char(116),char(105),char(103),char(117),char(111),char(117),char(115),char(76),char(101),char(97),char(102),char(78),char(111),char(100),char(101),char(115),char(0),char(109),
+char(95),char(110),char(117),char(109),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(67),char(111),char(110),char(116),char(105),char(103),char(117),
+char(111),char(117),char(115),char(78),char(111),char(100),char(101),char(115),char(0),char(42),char(109),char(95),char(99),char(111),char(110),char(116),char(105),char(103),char(117),char(111),
+char(117),char(115),char(78),char(111),char(100),char(101),char(115),char(80),char(116),char(114),char(0),char(42),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),
+char(122),char(101),char(100),char(67),char(111),char(110),char(116),char(105),char(103),char(117),char(111),char(117),char(115),char(78),char(111),char(100),char(101),char(115),char(80),char(116),
+char(114),char(0),char(42),char(109),char(95),char(115),char(117),char(98),char(84),char(114),char(101),char(101),char(73),char(110),char(102),char(111),char(80),char(116),char(114),char(0),
+char(109),char(95),char(116),char(114),char(97),char(118),char(101),char(114),char(115),char(97),char(108),char(77),char(111),char(100),char(101),char(0),char(109),char(95),char(110),char(117),
+char(109),char(83),char(117),char(98),char(116),char(114),char(101),char(101),char(72),char(101),char(97),char(100),char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(110),
+char(97),char(109),char(101),char(0),char(109),char(95),char(115),char(104),char(97),char(112),char(101),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(112),char(97),
+char(100),char(100),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),
+char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(83),char(99),char(97),
+char(108),char(105),char(110),char(103),char(0),char(109),char(95),char(112),char(108),char(97),char(110),char(101),char(78),char(111),char(114),char(109),char(97),char(108),char(0),char(109),
+char(95),char(112),char(108),char(97),char(110),char(101),char(67),char(111),char(110),char(115),char(116),char(97),char(110),char(116),char(0),char(109),char(95),char(105),char(109),char(112),
+char(108),char(105),char(99),char(105),char(116),char(83),char(104),char(97),char(112),char(101),char(68),char(105),char(109),char(101),char(110),char(115),char(105),char(111),char(110),char(115),
+char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(77),char(97),char(114),char(103),char(105),char(110),char(0),char(109),
+char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(0),char(109),char(95),char(112),char(111),char(115),char(0),char(109),char(95),char(114),char(97),char(100),
+char(105),char(117),char(115),char(0),char(109),char(95),char(99),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),char(110),char(97),char(108),
+char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(42),char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(80),char(111),
+char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(114),char(114),char(97),char(121),char(80),char(116),char(114),char(0),char(109),char(95),char(108),char(111),char(99),
+char(97),char(108),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(114),char(114),char(97),char(121),char(83),char(105),char(122),char(101),char(0),
+char(109),char(95),char(118),char(97),char(108),char(117),char(101),char(0),char(109),char(95),char(112),char(97),char(100),char(91),char(50),char(93),char(0),char(109),char(95),char(118),
+char(97),char(108),char(117),char(101),char(115),char(91),char(51),char(93),char(0),char(109),char(95),char(112),char(97),char(100),char(0),char(42),char(109),char(95),char(118),char(101),
+char(114),char(116),char(105),char(99),char(101),char(115),char(51),char(102),char(0),char(42),char(109),char(95),char(118),char(101),char(114),char(116),char(105),char(99),char(101),char(115),
+char(51),char(100),char(0),char(42),char(109),char(95),char(105),char(110),char(100),char(105),char(99),char(101),char(115),char(51),char(50),char(0),char(42),char(109),char(95),char(51),
+char(105),char(110),char(100),char(105),char(99),char(101),char(115),char(49),char(54),char(0),char(42),char(109),char(95),char(51),char(105),char(110),char(100),char(105),char(99),char(101),
+char(115),char(56),char(0),char(42),char(109),char(95),char(105),char(110),char(100),char(105),char(99),char(101),char(115),char(49),char(54),char(0),char(109),char(95),char(110),char(117),
+char(109),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(86),char(101),char(114),char(116),
+char(105),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(109),char(101),char(115),char(104),char(80),char(97),char(114),char(116),char(115),char(80),char(116),char(114),
+char(0),char(109),char(95),char(115),char(99),char(97),char(108),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(101),char(115),char(104),
+char(80),char(97),char(114),char(116),char(115),char(0),char(109),char(95),char(109),char(101),char(115),char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),
+char(101),char(0),char(42),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(70),char(108),char(111),char(97),char(116),char(66),
+char(118),char(104),char(0),char(42),char(109),char(95),char(113),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(68),char(111),char(117),char(98),char(108),
+char(101),char(66),char(118),char(104),char(0),char(42),char(109),char(95),char(116),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),
+char(77),char(97),char(112),char(0),char(109),char(95),char(112),char(97),char(100),char(51),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(114),char(105),char(109),
+char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(116),char(114),char(97),char(110),char(115),
+char(102),char(111),char(114),char(109),char(0),char(42),char(109),char(95),char(99),char(104),char(105),char(108),char(100),char(83),char(104),char(97),char(112),char(101),char(0),char(109),
+char(95),char(99),char(104),char(105),char(108),char(100),char(83),char(104),char(97),char(112),char(101),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),
+char(105),char(108),char(100),char(77),char(97),char(114),char(103),char(105),char(110),char(0),char(42),char(109),char(95),char(99),char(104),char(105),char(108),char(100),char(83),char(104),
+char(97),char(112),char(101),char(80),char(116),char(114),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(104),char(105),char(108),char(100),char(83),char(104),char(97),
+char(112),char(101),char(115),char(0),char(109),char(95),char(117),char(112),char(65),char(120),char(105),char(115),char(0),char(109),char(95),char(117),char(112),char(73),char(110),char(100),
+char(101),char(120),char(0),char(109),char(95),char(102),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(86),char(48),char(86),
+char(49),char(65),char(110),char(103),char(108),char(101),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(86),char(49),char(86),char(50),char(65),char(110),char(103),
+char(108),char(101),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(86),char(50),char(86),char(48),char(65),char(110),char(103),char(108),char(101),char(0),char(42),
+char(109),char(95),char(104),char(97),char(115),char(104),char(84),char(97),char(98),char(108),char(101),char(80),char(116),char(114),char(0),char(42),char(109),char(95),char(110),char(101),
+char(120),char(116),char(80),char(116),char(114),char(0),char(42),char(109),char(95),char(118),char(97),char(108),char(117),char(101),char(65),char(114),char(114),char(97),char(121),char(80),
+char(116),char(114),char(0),char(42),char(109),char(95),char(107),char(101),char(121),char(65),char(114),char(114),char(97),char(121),char(80),char(116),char(114),char(0),char(109),char(95),
+char(99),char(111),char(110),char(118),char(101),char(120),char(69),char(112),char(115),char(105),char(108),char(111),char(110),char(0),char(109),char(95),char(112),char(108),char(97),char(110),
+char(97),char(114),char(69),char(112),char(115),char(105),char(108),char(111),char(110),char(0),char(109),char(95),char(101),char(113),char(117),char(97),char(108),char(86),char(101),char(114),
+char(116),char(101),char(120),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(101),char(100),char(103),char(101),char(68),
+char(105),char(115),char(116),char(97),char(110),char(99),char(101),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(122),
+char(101),char(114),char(111),char(65),char(114),char(101),char(97),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(110),
+char(101),char(120),char(116),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(104),char(97),char(115),char(104),char(84),char(97),char(98),char(108),char(101),char(83),
+char(105),char(122),char(101),char(0),char(109),char(95),char(110),char(117),char(109),char(86),char(97),char(108),char(117),char(101),char(115),char(0),char(109),char(95),char(110),char(117),
+char(109),char(75),char(101),char(121),char(115),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(76),char(111),
+char(99),char(97),char(108),char(80),char(111),char(105),char(110),char(116),char(65),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(76),char(111),char(99),char(97),char(108),char(80),char(111),char(105),char(110),char(116),char(66),char(91),char(52),char(93),char(0),
+char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),
+char(87),char(111),char(114),char(108),char(100),char(79),char(110),char(65),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(87),char(111),char(114),char(108),char(100),char(79),char(110),char(66),
+char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(78),char(111),char(114),char(109),
+char(97),char(108),char(87),char(111),char(114),char(108),char(100),char(79),char(110),char(66),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),
+char(116),char(67),char(97),char(99),char(104),char(101),char(76),char(97),char(116),char(101),char(114),char(97),char(108),char(70),char(114),char(105),char(99),char(116),char(105),char(111),
+char(110),char(68),char(105),char(114),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),
+char(101),char(76),char(97),char(116),char(101),char(114),char(97),char(108),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(68),char(105),char(114),char(50),
+char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(68),char(105),char(115),char(116),
+char(97),char(110),char(99),char(101),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),
+char(65),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(91),char(52),char(93),char(0),char(109),char(95),
+char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(80),char(114),char(101),char(118),char(82),char(72),char(83),char(91),char(52),char(93),
+char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),
+char(100),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(82),char(111),char(108),char(108),char(105),char(110),char(103),
+char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(83),char(112),char(105),char(110),char(110),char(105),char(110),char(103),
+char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(82),char(101),char(115),char(116),char(105),char(116),char(117),char(116),
+char(105),char(111),char(110),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(80),
+char(97),char(114),char(116),char(73),char(100),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),
+char(104),char(101),char(80),char(97),char(114),char(116),char(73),char(100),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(73),char(110),char(100),char(101),char(120),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),
+char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(73),char(110),char(100),char(101),char(120),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),
+char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(80),char(111),char(105),char(110),
+char(116),char(70),char(108),char(97),char(103),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),
+char(104),char(101),char(65),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(76),char(97),char(116),char(101),
+char(114),char(97),char(108),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),
+char(65),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(76),char(97),char(116),char(101),char(114),char(97),
+char(108),char(50),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),
+char(110),char(116),char(97),char(99),char(116),char(77),char(111),char(116),char(105),char(111),char(110),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),
+char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(77),char(111),char(116),char(105),char(111),
+char(110),char(50),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),
+char(110),char(116),char(97),char(99),char(116),char(67),char(70),char(77),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),
+char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),
+char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),
+char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(69),char(82),char(80),char(91),char(52),char(93),char(0),char(109),
+char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(67),char(111),char(109),char(98),char(105),char(110),char(101),char(100),char(67),
+char(111),char(110),char(116),char(97),char(99),char(116),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(49),char(91),char(52),char(93),char(0),char(109),char(95),
+char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(67),char(70),
+char(77),char(91),char(52),char(93),char(0),char(109),char(95),char(112),char(111),char(105),char(110),char(116),char(67),char(97),char(99),char(104),char(101),char(76),char(105),char(102),
+char(101),char(84),char(105),char(109),char(101),char(91),char(52),char(93),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(97),char(99),char(104),char(101),char(100),
+char(80),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),
+char(65),char(0),char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(66),char(0),char(109),char(95),char(105),
+char(110),char(100),char(101),char(120),char(49),char(97),char(0),char(109),char(95),char(111),char(98),char(106),char(101),char(99),char(116),char(84),char(121),char(112),char(101),char(0),
+char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(99),char(116),char(66),char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(84),char(104),char(114),
+char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(99),char(116),char(80),char(114),char(111),char(99),
+char(101),char(115),char(115),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(42),char(109),char(95),char(98),
+char(111),char(100),char(121),char(48),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(49),char(0),char(109),char(95),char(103),char(105),char(109),char(112),
+char(97),char(99),char(116),char(83),char(117),char(98),char(84),char(121),char(112),char(101),char(0),char(42),char(109),char(95),char(117),char(110),char(115),char(99),char(97),char(108),
+char(101),char(100),char(80),char(111),char(105),char(110),char(116),char(115),char(70),char(108),char(111),char(97),char(116),char(80),char(116),char(114),char(0),char(42),char(109),char(95),
+char(117),char(110),char(115),char(99),char(97),char(108),char(101),char(100),char(80),char(111),char(105),char(110),char(116),char(115),char(68),char(111),char(117),char(98),char(108),char(101),
+char(80),char(116),char(114),char(0),char(109),char(95),char(110),char(117),char(109),char(85),char(110),char(115),char(99),char(97),char(108),char(101),char(100),char(80),char(111),char(105),
+char(110),char(116),char(115),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(51),char(91),char(52),char(93),char(0),char(42),char(109),
+char(95),char(98),char(114),char(111),char(97),char(100),char(112),char(104),char(97),char(115),char(101),char(72),char(97),char(110),char(100),char(108),char(101),char(0),char(42),char(109),
+char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(0),char(42),char(109),char(95),char(114),
+char(111),char(111),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(0),char(109),char(95),
+char(119),char(111),char(114),char(108),char(100),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(105),char(110),char(116),
+char(101),char(114),char(112),char(111),char(108),char(97),char(116),char(105),char(111),char(110),char(87),char(111),char(114),char(108),char(100),char(84),char(114),char(97),char(110),char(115),
+char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(105),char(110),char(116),char(101),char(114),char(112),char(111),char(108),char(97),char(116),char(105),char(111),char(110),
+char(76),char(105),char(110),char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(105),char(110),char(116),
+char(101),char(114),char(112),char(111),char(108),char(97),char(116),char(105),char(111),char(110),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),
+char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(105),char(115),char(111),char(116),char(114),char(111),char(112),char(105),char(99),char(70),
+char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(100),char(101),char(97),char(99),char(116),char(105),char(118),char(97),char(116),char(105),
+char(111),char(110),char(84),char(105),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),
+char(114),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),
+char(110),char(116),char(97),char(99),char(116),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),
+char(99),char(116),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(116),
+char(117),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(104),char(105),char(116),char(70),char(114),char(97),char(99),char(116),char(105),char(111),char(110),char(0),
+char(109),char(95),char(99),char(99),char(100),char(83),char(119),char(101),char(112),char(116),char(83),char(112),char(104),char(101),char(114),char(101),char(82),char(97),char(100),char(105),
+char(117),char(115),char(0),char(109),char(95),char(99),char(99),char(100),char(77),char(111),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),
+char(111),char(108),char(100),char(0),char(109),char(95),char(104),char(97),char(115),char(65),char(110),char(105),char(115),char(111),char(116),char(114),char(111),char(112),char(105),char(99),
+char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),
+char(70),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(105),char(115),char(108),char(97),char(110),char(100),char(84),char(97),char(103),char(49),char(0),char(109),
+char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(0),char(109),char(95),char(97),char(99),char(116),char(105),char(118),
+char(97),char(116),char(105),char(111),char(110),char(83),char(116),char(97),char(116),char(101),char(49),char(0),char(109),char(95),char(105),char(110),char(116),char(101),char(114),char(110),
+char(97),char(108),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),char(101),char(99),char(107),char(67),char(111),char(108),char(108),char(105),char(100),
+char(101),char(87),char(105),char(116),char(104),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(70),char(105),char(108),
+char(116),char(101),char(114),char(71),char(114),char(111),char(117),char(112),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),
+char(70),char(105),char(108),char(116),char(101),char(114),char(77),char(97),char(115),char(107),char(0),char(109),char(95),char(117),char(110),char(105),char(113),char(117),char(101),char(73),
+char(100),char(0),char(109),char(95),char(116),char(97),char(117),char(0),char(109),char(95),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),
+char(116),char(105),char(109),char(101),char(83),char(116),char(101),char(112),char(0),char(109),char(95),char(109),char(97),char(120),char(69),char(114),char(114),char(111),char(114),char(82),
+char(101),char(100),char(117),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(115),char(111),char(114),char(0),char(109),char(95),char(101),char(114),char(112),
+char(0),char(109),char(95),char(101),char(114),char(112),char(50),char(0),char(109),char(95),char(103),char(108),char(111),char(98),char(97),char(108),char(67),char(102),char(109),char(0),
+char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(80),char(101),char(110),char(101),char(116),char(114),
+char(97),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(115),char(112),char(108),
+char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(117),char(114),char(110),char(69),char(114),char(112),char(0),char(109),char(95),char(108),
+char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(111),char(112),char(0),char(109),char(95),char(119),char(97),char(114),char(109),char(115),char(116),char(97),char(114),
+char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(97),char(114),char(116),char(105),char(99),char(117),char(108),
+char(97),char(116),char(101),char(100),char(87),char(97),char(114),char(109),char(115),char(116),char(97),char(114),char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),
+char(111),char(114),char(0),char(109),char(95),char(109),char(97),char(120),char(71),char(121),char(114),char(111),char(115),char(99),char(111),char(112),char(105),char(99),char(70),char(111),
+char(114),char(99),char(101),char(0),char(109),char(95),char(115),char(105),char(110),char(103),char(108),char(101),char(65),char(120),char(105),char(115),char(82),char(111),char(108),char(108),
+char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),
+char(0),char(109),char(95),char(110),char(117),char(109),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(115),
+char(111),char(108),char(118),char(101),char(114),char(77),char(111),char(100),char(101),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(110),char(103),char(67),
+char(111),char(110),char(116),char(97),char(99),char(116),char(82),char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(84),char(104),char(114),
+char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(109),char(105),char(110),char(105),char(109),char(117),char(109),char(83),char(111),char(108),char(118),
+char(101),char(114),char(66),char(97),char(116),char(99),char(104),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),
+char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(0),
+char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),
+char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),
+char(114),char(116),char(105),char(97),char(84),char(101),char(110),char(115),char(111),char(114),char(87),char(111),char(114),char(108),char(100),char(0),char(109),char(95),char(108),char(105),
+char(110),char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),
+char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),
+char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(70),char(97),char(99),char(116),char(111),
+char(114),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(95),char(97),char(99),char(99),char(101),char(108),char(101),char(114),char(97),
+char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(76),char(111),char(99),
+char(97),char(108),char(0),char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(116),char(111),
+char(116),char(97),char(108),char(84),char(111),char(114),char(113),char(117),char(101),char(0),char(109),char(95),char(105),char(110),char(118),char(101),char(114),char(115),char(101),char(77),
+char(97),char(115),char(115),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),
+char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),
+char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),
+char(111),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(76),char(105),char(110),char(101),char(97),
+char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),
+char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),
+char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),char(0),
+char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(68),
+char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),
+char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),
+char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),
+char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),
+char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),
+char(116),char(82),char(111),char(119),char(115),char(0),char(110),char(117),char(98),char(0),char(42),char(109),char(95),char(114),char(98),char(65),char(0),char(42),char(109),char(95),
+char(114),char(98),char(66),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),
+char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),
+char(116),char(73),char(100),char(0),char(109),char(95),char(110),char(101),char(101),char(100),char(115),char(70),char(101),char(101),char(100),char(98),char(97),char(99),char(107),char(0),
+char(109),char(95),char(97),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(100),
+char(98),char(103),char(68),char(114),char(97),char(119),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(100),char(105),char(115),char(97),char(98),char(108),char(101),
+char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(115),char(66),char(101),char(116),char(119),char(101),char(101),char(110),char(76),char(105),char(110),
+char(107),char(101),char(100),char(66),char(111),char(100),char(105),char(101),char(115),char(0),char(109),char(95),char(111),char(118),char(101),char(114),char(114),char(105),char(100),char(101),
+char(78),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),
+char(109),char(95),char(98),char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(104),char(114),
+char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(105),char(115),char(69),char(110),char(97),char(98),char(108),char(101),char(100),char(0),char(112),
+char(97),char(100),char(100),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(121),char(112),char(101),char(67),char(111),char(110),char(115),
+char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),
+char(65),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(98),char(65),char(70),char(114),
+char(97),char(109),char(101),char(0),char(109),char(95),char(114),char(98),char(66),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(117),char(115),char(101),
+char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(97),char(110),
+char(103),char(117),char(108),char(97),char(114),char(79),char(110),char(108),char(121),char(0),char(109),char(95),char(101),char(110),char(97),char(98),char(108),char(101),char(65),char(110),
+char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(0),char(109),char(95),char(109),char(111),char(116),char(111),char(114),char(84),char(97),
+char(114),char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(109),char(97),char(120),char(77),char(111),
+char(116),char(111),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(108),char(111),char(119),char(101),char(114),char(76),char(105),
+char(109),char(105),char(116),char(0),char(109),char(95),char(117),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(108),
+char(105),char(109),char(105),char(116),char(83),char(111),char(102),char(116),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(98),char(105),char(97),char(115),char(70),
+char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(114),char(101),char(108),char(97),char(120),char(97),char(116),char(105),char(111),char(110),char(70),char(97),
+char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(49),char(91),char(52),char(93),char(0),char(109),
+char(95),char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(49),char(0),char(109),char(95),char(115),char(119),char(105),char(110),char(103),char(83),
+char(112),char(97),char(110),char(50),char(0),char(109),char(95),char(116),char(119),char(105),char(115),char(116),char(83),char(112),char(97),char(110),char(0),char(109),char(95),char(108),
+char(105),char(110),char(101),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(108),char(105),
+char(110),char(101),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(97),char(110),char(103),
+char(117),char(108),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(97),char(110),char(103),
+char(117),char(108),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(117),char(115),char(101),
+char(76),char(105),char(110),char(101),char(97),char(114),char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101),
+char(65),char(0),char(109),char(95),char(117),char(115),char(101),char(79),char(102),char(102),char(115),char(101),char(116),char(70),char(111),char(114),char(67),char(111),char(110),char(115),
+char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(54),char(100),char(111),char(102),char(68),char(97),
+char(116),char(97),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(69),char(110),char(97),char(98),char(108),char(101),char(100),char(91),char(54),
+char(93),char(0),char(109),char(95),char(101),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117),char(109),char(80),char(111),char(105),char(110),char(116),
+char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),
+char(115),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),
+char(91),char(54),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(66),char(111),char(117),char(110),char(99),char(101),char(0),char(109),
+char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80),char(0),char(109),char(95),char(108),char(105),char(110),
+char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(77),
+char(111),char(116),char(111),char(114),char(69),char(82),char(80),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(77),char(111),char(116),char(111),
+char(114),char(67),char(70),char(77),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(84),char(97),char(114),char(103),char(101),char(116),char(86),
+char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(77),char(97),char(120),char(77),
+char(111),char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(101),
+char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),
+char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(108),char(105),char(110),char(101),
+char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(105),
+char(110),char(101),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117),char(109),char(80),char(111),char(105),char(110),char(116),
+char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),char(77),char(111),char(116),char(111),char(114),
+char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(77),char(111),char(116),
+char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),
+char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),
+char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(76),char(105),char(109),char(105),char(116),char(101),char(100),
+char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),
+char(109),char(112),char(105),char(110),char(103),char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),
+char(103),char(117),char(108),char(97),char(114),char(66),char(111),char(117),char(110),char(99),char(101),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),
+char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),
+char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),
+char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(67),char(70),
+char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(84),char(97),char(114),char(103),char(101),char(116),char(86),char(101),char(108),
+char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(97),char(120),char(77),char(111),
+char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(101),
+char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),
+char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(103),
+char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),
+char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117),char(109),char(80),char(111),
+char(105),char(110),char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),char(77),
+char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(101),char(114),
+char(118),char(111),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),
+char(69),char(110),char(97),char(98),char(108),char(101),char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),
+char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),
+char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),
+char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(76),char(105),char(109),char(105),char(116),char(101),char(100),
+char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(111),char(116),char(97),char(116),char(101),char(79),char(114),char(100),char(101),char(114),char(0),char(109),char(95),
+char(97),char(120),char(105),char(115),char(73),char(110),char(65),char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(66),char(0),char(109),char(95),
+char(114),char(97),char(116),char(105),char(111),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),
+char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),char(101),
+char(115),char(115),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),
+char(0),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(0),char(109),char(95),char(112),char(111),char(115),char(105),char(116),
+char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(114),char(101),char(118),char(105),char(111),char(117),char(115),char(80),char(111),char(115),char(105),char(116),char(105),
+char(111),char(110),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(99),char(99),char(117),
+char(109),char(117),char(108),char(97),char(116),char(101),char(100),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(110),char(111),char(114),char(109),char(97),
+char(108),char(0),char(109),char(95),char(97),char(114),char(101),char(97),char(0),char(109),char(95),char(97),char(116),char(116),char(97),char(99),char(104),char(0),char(109),char(95),
+char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(114),char(101),char(115),
+char(116),char(76),char(101),char(110),char(103),char(116),char(104),char(0),char(109),char(95),char(98),char(98),char(101),char(110),char(100),char(105),char(110),char(103),char(0),char(109),
+char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(51),char(93),char(0),char(109),char(95),char(114),char(101),
+char(115),char(116),char(65),char(114),char(101),char(97),char(0),char(109),char(95),char(99),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(110),char(111),char(100),
+char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(86),char(111),
+char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(99),char(49),char(0),char(109),char(95),char(99),char(50),char(0),char(109),char(95),char(99),char(48),char(0),
+char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(70),char(114),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(114),char(105),char(103),char(105),
+char(100),char(66),char(111),char(100),char(121),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),
+char(97),char(101),char(114),char(111),char(77),char(111),char(100),char(101),char(108),char(0),char(109),char(95),char(98),char(97),char(117),char(109),char(103),char(97),char(114),char(116),
+char(101),char(0),char(109),char(95),char(100),char(114),char(97),char(103),char(0),char(109),char(95),char(108),char(105),char(102),char(116),char(0),char(109),char(95),char(112),char(114),
+char(101),char(115),char(115),char(117),char(114),char(101),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(100),char(121),
+char(110),char(97),char(109),char(105),char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(111),char(115),char(101),
+char(77),char(97),char(116),char(99),char(104),char(0),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(67),char(111),char(110),char(116),char(97),char(99),char(116),
+char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(107),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(111),
+char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),
+char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),
+char(99),char(104),char(111),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),
+char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),
+char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116),char(101),char(114),
+char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),
+char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),
+char(116),char(82),char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),
+char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),
+char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),
+char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),
+char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(109),char(97),char(120),char(86),char(111),char(108),char(117),char(109),char(101),
+char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),
+char(105),char(116),char(121),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(112),char(111),char(115),char(105),
+char(116),char(105),char(111),char(110),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(100),char(114),char(105),
+char(102),char(116),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),
+char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(114),char(111),char(116),char(0),char(109),
+char(95),char(115),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(97),char(113),char(113),char(0),char(109),char(95),char(99),char(111),char(109),char(0),char(42),
+char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(42),char(109),char(95),char(119),char(101),char(105),char(103),char(104),
+char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),
+char(110),char(117),char(109),char(87),char(101),char(105),char(103),char(116),char(115),char(0),char(109),char(95),char(98),char(118),char(111),char(108),char(117),char(109),char(101),char(0),
+char(109),char(95),char(98),char(102),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(97),char(109),char(101),char(120),char(102),char(111),char(114),
+char(109),char(0),char(109),char(95),char(108),char(111),char(99),char(105),char(105),char(0),char(109),char(95),char(105),char(110),char(118),char(119),char(105),char(0),char(109),char(95),
+char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(100),char(105),char(109),char(112),char(117),
+char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(108),char(118),char(0),char(109),char(95),char(97),char(118),char(0),char(42),char(109),
+char(95),char(102),char(114),char(97),char(109),char(101),char(114),char(101),char(102),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),
+char(100),char(105),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(117),
+char(109),char(70),char(114),char(97),char(109),char(101),char(82),char(101),char(102),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(78),char(111),char(100),char(101),
+char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(105),char(100),char(109),char(97),
+char(115),char(115),char(0),char(109),char(95),char(105),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(110),char(118),char(105),char(109),char(112),char(117),char(108),
+char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0),char(109),char(95),char(110),
+char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),
+char(95),char(97),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97),char(116),char(99),char(104),char(105),char(110),char(103),
+char(0),char(109),char(95),char(109),char(97),char(120),char(83),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),
+char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(115),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),
+char(111),char(110),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(99),char(111),
+char(110),char(116),char(97),char(105),char(110),char(115),char(65),char(110),char(99),char(104),char(111),char(114),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),
+char(100),char(101),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(110),char(100),char(101),char(120),char(0),char(42),char(109),
+char(95),char(98),char(111),char(100),char(121),char(65),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(66),char(0),char(109),char(95),char(114),char(101),
+char(102),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(99),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(0),
+char(109),char(95),char(100),char(101),char(108),char(101),char(116),char(101),char(0),char(109),char(95),char(114),char(101),char(108),char(80),char(111),char(115),char(105),char(116),char(105),
+char(111),char(110),char(91),char(50),char(93),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(116),char(121),char(112),char(101),char(0),char(109),char(95),
+char(98),char(111),char(100),char(121),char(66),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(84),char(121),char(112),
+char(101),char(0),char(42),char(109),char(95),char(112),char(111),char(115),char(101),char(0),char(42),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),
+char(97),char(108),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(115),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),
+char(115),char(0),char(42),char(109),char(95),char(102),char(97),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(116),char(101),char(116),char(114),char(97),char(104),
+char(101),char(100),char(114),char(97),char(0),char(42),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114),char(115),char(0),char(42),char(109),char(95),char(99),
+char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),
+char(110),char(117),char(109),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(76),char(105),
+char(110),char(107),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(97),char(99),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),
+char(84),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(109),char(95),char(110),char(117),char(109),char(65),char(110),char(99),char(104),
+char(111),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(109),char(95),
+char(110),char(117),char(109),char(74),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110),char(102),char(105),char(103),char(0),char(109),
+char(95),char(122),char(101),char(114),char(111),char(82),char(111),char(116),char(80),char(97),char(114),char(101),char(110),char(116),char(84),char(111),char(84),char(104),char(105),char(115),
+char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(67),char(111),char(109),char(84),char(111),char(84),char(104),char(105),char(115),char(80),char(105),
+char(118),char(111),char(116),char(79),char(102),char(102),char(115),char(101),char(116),char(0),char(109),char(95),char(116),char(104),char(105),char(115),char(80),char(105),char(118),char(111),
+char(116),char(84),char(111),char(84),char(104),char(105),char(115),char(67),char(111),char(109),char(79),char(102),char(102),char(115),char(101),char(116),char(0),char(109),char(95),char(106),
+char(111),char(105),char(110),char(116),char(65),char(120),char(105),char(115),char(84),char(111),char(112),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),
+char(110),char(116),char(65),char(120),char(105),char(115),char(66),char(111),char(116),char(116),char(111),char(109),char(91),char(54),char(93),char(0),char(109),char(95),char(108),char(105),
+char(110),char(107),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(97),char(98),char(115),char(70),char(114),char(97),char(109),char(101),
+char(84),char(111),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(84),char(111),char(112),char(0),char(109),char(95),char(97),char(98),char(115),
+char(70),char(114),char(97),char(109),char(101),char(84),char(111),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(66),char(111),char(116),char(116),
+char(111),char(109),char(0),char(109),char(95),char(97),char(98),char(115),char(70),char(114),char(97),char(109),char(101),char(76),char(111),char(99),char(86),char(101),char(108),char(111),
+char(99),char(105),char(116),char(121),char(84),char(111),char(112),char(0),char(109),char(95),char(97),char(98),char(115),char(70),char(114),char(97),char(109),char(101),char(76),char(111),
+char(99),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(66),char(111),char(116),char(116),char(111),char(109),char(0),char(109),char(95),char(108),char(105),
+char(110),char(107),char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(73),char(110),char(100),char(101),char(120),
+char(0),char(109),char(95),char(100),char(111),char(102),char(67),char(111),char(117),char(110),char(116),char(0),char(109),char(95),char(112),char(111),char(115),char(86),char(97),char(114),
+char(67),char(111),char(117),char(110),char(116),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(80),char(111),char(115),char(91),char(55),char(93),char(0),
+char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(86),char(101),char(108),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),
+char(116),char(84),char(111),char(114),char(113),char(117),char(101),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(68),char(97),
+char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(70),char(114),char(105),char(99),char(116),char(105),char(111),
+char(110),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),
+char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),
+char(106),char(111),char(105),char(110),char(116),char(77),char(97),char(120),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(106),char(111),char(105),char(110),
+char(116),char(77),char(97),char(120),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),
+char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(78),char(97),char(109),char(101),char(0),char(42),char(109),
+char(95),char(108),char(105),char(110),char(107),char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114),char(0),char(42),char(109),char(95),char(112),char(97),char(100),
+char(100),char(105),char(110),char(103),char(80),char(116),char(114),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(87),char(111),char(114),char(108),char(100),char(80),
+char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(87),char(111),char(114),char(108),char(100),char(79),
+char(114),char(105),char(101),char(110),char(116),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(76),char(105),char(110),
+char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(65),char(110),
+char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(98),char(97),char(115),char(101),
+char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(77),char(97),char(115),char(115),char(0),char(42),
+char(109),char(95),char(98),char(97),char(115),char(101),char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(98),char(97),char(115),char(101),char(67),char(111),
+char(108),char(108),char(105),char(100),char(101),char(114),char(0),char(109),char(95),char(99),char(111),char(108),char(79),char(98),char(106),char(68),char(97),char(116),char(97),char(0),
+char(42),char(109),char(95),char(109),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(0),char(109),char(95),char(108),char(105),char(110),char(107),char(0),
+char(84),char(89),char(80),char(69),char(99),char(0),char(0),char(0),char(99),char(104),char(97),char(114),char(0),char(117),char(99),char(104),char(97),char(114),char(0),char(115),
+char(104),char(111),char(114),char(116),char(0),char(117),char(115),char(104),char(111),char(114),char(116),char(0),char(105),char(110),char(116),char(0),char(108),char(111),char(110),char(103),
+char(0),char(117),char(108),char(111),char(110),char(103),char(0),char(102),char(108),char(111),char(97),char(116),char(0),char(100),char(111),char(117),char(98),char(108),char(101),char(0),
+char(118),char(111),char(105),char(100),char(0),char(80),char(111),char(105),char(110),char(116),char(101),char(114),char(65),char(114),char(114),char(97),char(121),char(0),char(98),char(116),
+char(80),char(104),char(121),char(115),char(105),char(99),char(115),char(83),char(121),char(115),char(116),char(101),char(109),char(0),char(76),char(105),char(115),char(116),char(66),char(97),
+char(115),char(101),char(0),char(98),char(116),char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(116),char(101),char(114),char(110),char(105),char(111),char(110),char(70),char(108),char(111),char(97),char(116),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(116),char(101),char(114),char(110),char(105),char(111),char(110),char(68),char(111),char(117),char(98),
+char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(70),char(108),
+char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),
+char(109),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),
+char(114),char(109),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(66),char(118),char(104),char(83),char(117),
+char(98),char(116),char(114),char(101),char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),
+char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),
+char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),
+char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),
+char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),
+char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(97),char(116),char(105),char(99),char(80),char(108),char(97),char(110),char(101),char(83),char(104),char(97),
+char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),
+char(110),char(97),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(115),char(105),char(116),
+char(105),char(111),char(110),char(65),char(110),char(100),char(82),char(97),char(100),char(105),char(117),char(115),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),
+char(83),char(112),char(104),char(101),char(114),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(73),char(110),
+char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),
+char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),
+char(116),char(73),char(110),char(100),char(101),char(120),char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(67),char(104),char(97),char(114),char(73),char(110),char(100),char(101),char(120),char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(77),char(101),char(115),char(104),char(80),char(97),char(114),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),
+char(114),char(105),char(100),char(105),char(110),char(103),char(77),char(101),char(115),char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),char(101),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),
+char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),
+char(102),char(111),char(77),char(97),char(112),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(99),char(97),char(108),char(101),char(100),char(84),char(114),
+char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(67),char(104),char(105),char(108),char(100),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(121),char(108),char(105),char(110),char(100),char(101),char(114),char(83),char(104),char(97),char(112),char(101),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(67),char(97),char(112),char(115),char(117),char(108),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),
+char(116),char(80),char(101),char(114),char(115),char(105),char(115),char(116),char(101),char(110),char(116),char(77),char(97),char(110),char(105),char(102),char(111),char(108),char(100),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),
+char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(80),char(101),char(114),char(115),char(105),char(115),char(116),char(101),char(110),char(116),char(77),char(97),char(110),char(105),char(102),char(111),char(108),char(100),char(70),char(108),
+char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),
+char(98),char(106),char(101),char(99),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(73),char(109),
+char(112),char(97),char(99),char(116),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(67),char(111),char(110),char(118),char(101),char(120),char(72),char(117),char(108),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),
+char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),
+char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108),char(100),char(68),char(111),char(117),char(98),char(108),char(101),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108),char(100),
+char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),
+char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),
+char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(115),char(116),
+char(114),char(97),char(105),char(110),char(116),char(73),char(110),char(102),char(111),char(49),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),
+char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),
+char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),
+char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),
+char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),
+char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),
+char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),
+char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),
+char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),
+char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),
+char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),
+char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),
+char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),
+char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),
+char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),
+char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),
+char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),
+char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),
+char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),
+char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),
+char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),
+char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),
+char(112),char(114),char(105),char(110),char(103),char(50),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),
+char(50),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),
+char(97),char(50),char(0),char(98),char(116),char(83),char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),
+char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),
+char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),
+char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),
+char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(77),char(97),char(116),char(101),
+char(114),char(105),char(97),char(108),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(78),char(111),char(100),
+char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(97),
+char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(70),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),
+char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(84),char(101),char(116),char(114),char(97),char(68),char(97),char(116),char(97),char(0),char(83),char(111),
+char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(65),char(110),char(99),char(104),char(111),char(114),char(68),char(97),char(116),char(97),char(0),char(83),char(111),
+char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(111),char(110),char(102),char(105),char(103),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),
+char(116),char(66),char(111),char(100),char(121),char(80),char(111),char(115),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),
+char(100),char(121),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),
+char(66),char(111),char(100),char(121),char(74),char(111),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),
+char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),
+char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),
+char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(70),char(108),char(111),char(97),char(116),
+char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),
+char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(70),char(108),
+char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),
+char(105),char(110),char(107),char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),
+char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(67),char(111),char(108),char(108),
+char(105),char(100),char(101),char(114),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(0),char(84),char(76),char(69),char(78),
+char(1),char(0),char(1),char(0),char(2),char(0),char(2),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(0),char(0),
+char(16),char(0),char(48),char(0),char(16),char(0),char(16),char(0),char(32),char(0),char(16),char(0),char(32),char(0),char(48),char(0),char(96),char(0),char(64),char(0),
+char(-128),char(0),char(20),char(0),char(48),char(0),char(80),char(0),char(16),char(0),char(96),char(0),char(-112),char(0),char(16),char(0),char(56),char(0),char(56),char(0),
+char(20),char(0),char(72),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(4),char(0),char(56),char(0),char(32),char(0),char(80),char(0),char(72),char(0),
+char(96),char(0),char(80),char(0),char(32),char(0),char(64),char(0),char(64),char(0),char(64),char(0),char(16),char(0),char(24),char(6),char(-8),char(1),char(80),char(3),
+char(32),char(1),char(72),char(0),char(80),char(0),char(-96),char(0),char(88),char(0),char(-64),char(0),char(104),char(0),char(8),char(2),char(-56),char(3),char(8),char(0),
+char(64),char(0),char(64),char(0),char(0),char(0),char(80),char(0),char(96),char(0),char(-112),char(0),char(-128),char(0),char(104),char(1),char(-24),char(0),char(-104),char(1),
+char(-120),char(1),char(-32),char(0),char(8),char(1),char(-40),char(1),char(104),char(1),char(-128),char(2),char(-112),char(2),char(-64),char(4),char(-40),char(0),char(120),char(1),
+char(104),char(0),char(-104),char(0),char(16),char(0),char(104),char(0),char(24),char(0),char(40),char(0),char(104),char(0),char(96),char(0),char(104),char(0),char(-56),char(0),
+char(104),char(1),char(112),char(0),char(-16),char(1),char(-128),char(3),char(-40),char(1),char(-56),char(0),char(112),char(0),char(48),char(1),char(8),char(2),char(0),char(0),
+char(83),char(84),char(82),char(67),char(88),char(0),char(0),char(0),char(10),char(0),char(3),char(0),char(4),char(0),char(0),char(0),char(4),char(0),char(1),char(0),
+char(9),char(0),char(2),char(0),char(11),char(0),char(3),char(0),char(10),char(0),char(3),char(0),char(10),char(0),char(4),char(0),char(10),char(0),char(5),char(0),
+char(12),char(0),char(2),char(0),char(9),char(0),char(6),char(0),char(9),char(0),char(7),char(0),char(13),char(0),char(1),char(0),char(7),char(0),char(8),char(0),
+char(14),char(0),char(1),char(0),char(8),char(0),char(8),char(0),char(15),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(16),char(0),char(1),char(0),
+char(8),char(0),char(8),char(0),char(17),char(0),char(1),char(0),char(13),char(0),char(9),char(0),char(18),char(0),char(1),char(0),char(14),char(0),char(9),char(0),
+char(19),char(0),char(2),char(0),char(17),char(0),char(10),char(0),char(13),char(0),char(11),char(0),char(20),char(0),char(2),char(0),char(18),char(0),char(10),char(0),
+char(14),char(0),char(11),char(0),char(21),char(0),char(4),char(0),char(4),char(0),char(12),char(0),char(4),char(0),char(13),char(0),char(2),char(0),char(14),char(0),
+char(2),char(0),char(15),char(0),char(22),char(0),char(6),char(0),char(13),char(0),char(16),char(0),char(13),char(0),char(17),char(0),char(4),char(0),char(18),char(0),
+char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(23),char(0),char(6),char(0),char(14),char(0),char(16),char(0),
+char(14),char(0),char(17),char(0),char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),
+char(24),char(0),char(3),char(0),char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0),char(4),char(0),char(22),char(0),char(25),char(0),char(12),char(0),
+char(13),char(0),char(23),char(0),char(13),char(0),char(24),char(0),char(13),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),
+char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),char(22),char(0),char(30),char(0),char(24),char(0),char(31),char(0),char(21),char(0),char(32),char(0),
+char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(26),char(0),char(12),char(0),char(14),char(0),char(23),char(0),char(14),char(0),char(24),char(0),
+char(14),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),
+char(23),char(0),char(30),char(0),char(24),char(0),char(31),char(0),char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(21),char(0),char(32),char(0),
+char(27),char(0),char(3),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(36),char(0),char(0),char(0),char(37),char(0),char(28),char(0),char(5),char(0),
+char(27),char(0),char(38),char(0),char(13),char(0),char(39),char(0),char(13),char(0),char(40),char(0),char(7),char(0),char(41),char(0),char(0),char(0),char(21),char(0),
+char(29),char(0),char(5),char(0),char(27),char(0),char(38),char(0),char(13),char(0),char(39),char(0),char(13),char(0),char(42),char(0),char(7),char(0),char(43),char(0),
+char(4),char(0),char(44),char(0),char(30),char(0),char(2),char(0),char(13),char(0),char(45),char(0),char(7),char(0),char(46),char(0),char(31),char(0),char(4),char(0),
+char(29),char(0),char(47),char(0),char(30),char(0),char(48),char(0),char(4),char(0),char(49),char(0),char(0),char(0),char(37),char(0),char(32),char(0),char(1),char(0),
+char(4),char(0),char(50),char(0),char(33),char(0),char(2),char(0),char(2),char(0),char(50),char(0),char(0),char(0),char(51),char(0),char(34),char(0),char(2),char(0),
+char(2),char(0),char(52),char(0),char(0),char(0),char(51),char(0),char(35),char(0),char(2),char(0),char(0),char(0),char(52),char(0),char(0),char(0),char(53),char(0),
+char(36),char(0),char(8),char(0),char(13),char(0),char(54),char(0),char(14),char(0),char(55),char(0),char(32),char(0),char(56),char(0),char(34),char(0),char(57),char(0),
+char(35),char(0),char(58),char(0),char(33),char(0),char(59),char(0),char(4),char(0),char(60),char(0),char(4),char(0),char(61),char(0),char(37),char(0),char(4),char(0),
+char(36),char(0),char(62),char(0),char(13),char(0),char(63),char(0),char(4),char(0),char(64),char(0),char(0),char(0),char(37),char(0),char(38),char(0),char(7),char(0),
+char(27),char(0),char(38),char(0),char(37),char(0),char(65),char(0),char(25),char(0),char(66),char(0),char(26),char(0),char(67),char(0),char(39),char(0),char(68),char(0),
+char(7),char(0),char(43),char(0),char(0),char(0),char(69),char(0),char(40),char(0),char(2),char(0),char(38),char(0),char(70),char(0),char(13),char(0),char(39),char(0),
+char(41),char(0),char(4),char(0),char(19),char(0),char(71),char(0),char(27),char(0),char(72),char(0),char(4),char(0),char(73),char(0),char(7),char(0),char(74),char(0),
+char(42),char(0),char(4),char(0),char(27),char(0),char(38),char(0),char(41),char(0),char(75),char(0),char(4),char(0),char(76),char(0),char(7),char(0),char(43),char(0),
+char(43),char(0),char(3),char(0),char(29),char(0),char(47),char(0),char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(44),char(0),char(3),char(0),
+char(29),char(0),char(47),char(0),char(4),char(0),char(78),char(0),char(0),char(0),char(37),char(0),char(45),char(0),char(3),char(0),char(29),char(0),char(47),char(0),
+char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(46),char(0),char(4),char(0),char(4),char(0),char(79),char(0),char(7),char(0),char(80),char(0),
+char(7),char(0),char(81),char(0),char(7),char(0),char(82),char(0),char(39),char(0),char(14),char(0),char(4),char(0),char(83),char(0),char(4),char(0),char(84),char(0),
+char(46),char(0),char(85),char(0),char(4),char(0),char(86),char(0),char(7),char(0),char(87),char(0),char(7),char(0),char(88),char(0),char(7),char(0),char(89),char(0),
+char(7),char(0),char(90),char(0),char(7),char(0),char(91),char(0),char(4),char(0),char(92),char(0),char(4),char(0),char(93),char(0),char(4),char(0),char(94),char(0),
+char(4),char(0),char(95),char(0),char(0),char(0),char(37),char(0),char(47),char(0),char(39),char(0),char(14),char(0),char(96),char(0),char(14),char(0),char(97),char(0),
+char(14),char(0),char(98),char(0),char(14),char(0),char(99),char(0),char(14),char(0),char(100),char(0),char(14),char(0),char(101),char(0),char(14),char(0),char(102),char(0),
+char(8),char(0),char(103),char(0),char(8),char(0),char(104),char(0),char(8),char(0),char(105),char(0),char(8),char(0),char(106),char(0),char(8),char(0),char(107),char(0),
+char(8),char(0),char(108),char(0),char(8),char(0),char(109),char(0),char(4),char(0),char(110),char(0),char(4),char(0),char(111),char(0),char(4),char(0),char(112),char(0),
+char(4),char(0),char(113),char(0),char(4),char(0),char(114),char(0),char(8),char(0),char(115),char(0),char(8),char(0),char(116),char(0),char(8),char(0),char(117),char(0),
+char(8),char(0),char(118),char(0),char(8),char(0),char(119),char(0),char(8),char(0),char(120),char(0),char(8),char(0),char(121),char(0),char(8),char(0),char(122),char(0),
+char(8),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0),char(4),char(0),char(126),char(0),char(4),char(0),char(127),char(0),
+char(4),char(0),char(-128),char(0),char(4),char(0),char(-127),char(0),char(8),char(0),char(-126),char(0),char(8),char(0),char(-125),char(0),char(4),char(0),char(44),char(0),
+char(48),char(0),char(-124),char(0),char(48),char(0),char(-123),char(0),char(49),char(0),char(39),char(0),char(13),char(0),char(96),char(0),char(13),char(0),char(97),char(0),
+char(13),char(0),char(98),char(0),char(13),char(0),char(99),char(0),char(13),char(0),char(100),char(0),char(13),char(0),char(101),char(0),char(13),char(0),char(102),char(0),
+char(7),char(0),char(103),char(0),char(7),char(0),char(104),char(0),char(7),char(0),char(105),char(0),char(7),char(0),char(106),char(0),char(7),char(0),char(107),char(0),
+char(7),char(0),char(108),char(0),char(7),char(0),char(109),char(0),char(4),char(0),char(110),char(0),char(4),char(0),char(111),char(0),char(4),char(0),char(112),char(0),
+char(4),char(0),char(113),char(0),char(4),char(0),char(114),char(0),char(7),char(0),char(115),char(0),char(7),char(0),char(116),char(0),char(7),char(0),char(117),char(0),
+char(7),char(0),char(118),char(0),char(7),char(0),char(119),char(0),char(7),char(0),char(120),char(0),char(7),char(0),char(121),char(0),char(7),char(0),char(122),char(0),
+char(7),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0),char(4),char(0),char(126),char(0),char(4),char(0),char(127),char(0),
+char(4),char(0),char(-128),char(0),char(4),char(0),char(-127),char(0),char(7),char(0),char(-126),char(0),char(7),char(0),char(-125),char(0),char(4),char(0),char(44),char(0),
+char(50),char(0),char(-124),char(0),char(50),char(0),char(-123),char(0),char(51),char(0),char(5),char(0),char(27),char(0),char(38),char(0),char(37),char(0),char(65),char(0),
+char(13),char(0),char(39),char(0),char(7),char(0),char(43),char(0),char(4),char(0),char(-122),char(0),char(52),char(0),char(5),char(0),char(29),char(0),char(47),char(0),
+char(13),char(0),char(-121),char(0),char(14),char(0),char(-120),char(0),char(4),char(0),char(-119),char(0),char(0),char(0),char(-118),char(0),char(48),char(0),char(29),char(0),
+char(9),char(0),char(-117),char(0),char(9),char(0),char(-116),char(0),char(27),char(0),char(-115),char(0),char(0),char(0),char(35),char(0),char(20),char(0),char(-114),char(0),
+char(20),char(0),char(-113),char(0),char(14),char(0),char(-112),char(0),char(14),char(0),char(-111),char(0),char(14),char(0),char(-110),char(0),char(8),char(0),char(-125),char(0),
+char(8),char(0),char(-109),char(0),char(8),char(0),char(-108),char(0),char(8),char(0),char(-107),char(0),char(8),char(0),char(-106),char(0),char(8),char(0),char(-105),char(0),
+char(8),char(0),char(-104),char(0),char(8),char(0),char(-103),char(0),char(8),char(0),char(-102),char(0),char(8),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),
+char(4),char(0),char(-99),char(0),char(4),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0),char(4),char(0),char(-96),char(0),char(4),char(0),char(-95),char(0),
+char(4),char(0),char(-94),char(0),char(4),char(0),char(-93),char(0),char(4),char(0),char(-92),char(0),char(4),char(0),char(-91),char(0),char(50),char(0),char(29),char(0),
+char(9),char(0),char(-117),char(0),char(9),char(0),char(-116),char(0),char(27),char(0),char(-115),char(0),char(0),char(0),char(35),char(0),char(19),char(0),char(-114),char(0),
+char(19),char(0),char(-113),char(0),char(13),char(0),char(-112),char(0),char(13),char(0),char(-111),char(0),char(13),char(0),char(-110),char(0),char(7),char(0),char(-125),char(0),
+char(7),char(0),char(-109),char(0),char(7),char(0),char(-108),char(0),char(7),char(0),char(-107),char(0),char(7),char(0),char(-106),char(0),char(7),char(0),char(-105),char(0),
+char(7),char(0),char(-104),char(0),char(7),char(0),char(-103),char(0),char(7),char(0),char(-102),char(0),char(7),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),
+char(4),char(0),char(-99),char(0),char(4),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0),char(4),char(0),char(-96),char(0),char(4),char(0),char(-95),char(0),
+char(4),char(0),char(-94),char(0),char(4),char(0),char(-93),char(0),char(4),char(0),char(-92),char(0),char(4),char(0),char(-91),char(0),char(53),char(0),char(23),char(0),
+char(8),char(0),char(-90),char(0),char(8),char(0),char(-89),char(0),char(8),char(0),char(-108),char(0),char(8),char(0),char(-88),char(0),char(8),char(0),char(-104),char(0),
+char(8),char(0),char(-87),char(0),char(8),char(0),char(-86),char(0),char(8),char(0),char(-85),char(0),char(8),char(0),char(-84),char(0),char(8),char(0),char(-83),char(0),
+char(8),char(0),char(-82),char(0),char(8),char(0),char(-81),char(0),char(8),char(0),char(-80),char(0),char(8),char(0),char(-79),char(0),char(8),char(0),char(-78),char(0),
+char(8),char(0),char(-77),char(0),char(8),char(0),char(-76),char(0),char(4),char(0),char(-75),char(0),char(4),char(0),char(-74),char(0),char(4),char(0),char(-73),char(0),
+char(4),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0),char(0),char(0),char(37),char(0),char(54),char(0),char(22),char(0),char(7),char(0),char(-90),char(0),
+char(7),char(0),char(-89),char(0),char(7),char(0),char(-108),char(0),char(7),char(0),char(-88),char(0),char(7),char(0),char(-104),char(0),char(7),char(0),char(-87),char(0),
+char(7),char(0),char(-86),char(0),char(7),char(0),char(-85),char(0),char(7),char(0),char(-84),char(0),char(7),char(0),char(-83),char(0),char(7),char(0),char(-82),char(0),
+char(7),char(0),char(-81),char(0),char(7),char(0),char(-80),char(0),char(7),char(0),char(-79),char(0),char(7),char(0),char(-78),char(0),char(7),char(0),char(-77),char(0),
+char(7),char(0),char(-76),char(0),char(4),char(0),char(-75),char(0),char(4),char(0),char(-74),char(0),char(4),char(0),char(-73),char(0),char(4),char(0),char(-72),char(0),
+char(4),char(0),char(-71),char(0),char(55),char(0),char(2),char(0),char(53),char(0),char(-70),char(0),char(14),char(0),char(-69),char(0),char(56),char(0),char(2),char(0),
+char(54),char(0),char(-70),char(0),char(13),char(0),char(-69),char(0),char(57),char(0),char(21),char(0),char(50),char(0),char(-68),char(0),char(17),char(0),char(-67),char(0),
+char(13),char(0),char(-66),char(0),char(13),char(0),char(-65),char(0),char(13),char(0),char(-64),char(0),char(13),char(0),char(-63),char(0),char(13),char(0),char(-69),char(0),
+char(13),char(0),char(-62),char(0),char(13),char(0),char(-61),char(0),char(13),char(0),char(-60),char(0),char(13),char(0),char(-59),char(0),char(7),char(0),char(-58),char(0),
+char(7),char(0),char(-57),char(0),char(7),char(0),char(-56),char(0),char(7),char(0),char(-55),char(0),char(7),char(0),char(-54),char(0),char(7),char(0),char(-53),char(0),
+char(7),char(0),char(-52),char(0),char(7),char(0),char(-51),char(0),char(7),char(0),char(-50),char(0),char(4),char(0),char(-49),char(0),char(58),char(0),char(22),char(0),
+char(48),char(0),char(-68),char(0),char(18),char(0),char(-67),char(0),char(14),char(0),char(-66),char(0),char(14),char(0),char(-65),char(0),char(14),char(0),char(-64),char(0),
+char(14),char(0),char(-63),char(0),char(14),char(0),char(-69),char(0),char(14),char(0),char(-62),char(0),char(14),char(0),char(-61),char(0),char(14),char(0),char(-60),char(0),
+char(14),char(0),char(-59),char(0),char(8),char(0),char(-58),char(0),char(8),char(0),char(-57),char(0),char(8),char(0),char(-56),char(0),char(8),char(0),char(-55),char(0),
+char(8),char(0),char(-54),char(0),char(8),char(0),char(-53),char(0),char(8),char(0),char(-52),char(0),char(8),char(0),char(-51),char(0),char(8),char(0),char(-50),char(0),
+char(4),char(0),char(-49),char(0),char(0),char(0),char(37),char(0),char(59),char(0),char(2),char(0),char(4),char(0),char(-48),char(0),char(4),char(0),char(-47),char(0),
+char(60),char(0),char(13),char(0),char(57),char(0),char(-46),char(0),char(57),char(0),char(-45),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-127),char(0),
+char(4),char(0),char(-44),char(0),char(4),char(0),char(-43),char(0),char(4),char(0),char(-42),char(0),char(7),char(0),char(-41),char(0),char(7),char(0),char(-40),char(0),
+char(4),char(0),char(-39),char(0),char(4),char(0),char(-38),char(0),char(7),char(0),char(-37),char(0),char(4),char(0),char(-36),char(0),char(61),char(0),char(13),char(0),
+char(62),char(0),char(-46),char(0),char(62),char(0),char(-45),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-127),char(0),char(4),char(0),char(-44),char(0),
+char(4),char(0),char(-43),char(0),char(4),char(0),char(-42),char(0),char(7),char(0),char(-41),char(0),char(7),char(0),char(-40),char(0),char(4),char(0),char(-39),char(0),
+char(4),char(0),char(-38),char(0),char(7),char(0),char(-37),char(0),char(4),char(0),char(-36),char(0),char(63),char(0),char(14),char(0),char(58),char(0),char(-46),char(0),
+char(58),char(0),char(-45),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-127),char(0),char(4),char(0),char(-44),char(0),char(4),char(0),char(-43),char(0),
+char(4),char(0),char(-42),char(0),char(8),char(0),char(-41),char(0),char(8),char(0),char(-40),char(0),char(4),char(0),char(-39),char(0),char(4),char(0),char(-38),char(0),
+char(8),char(0),char(-37),char(0),char(4),char(0),char(-36),char(0),char(0),char(0),char(-35),char(0),char(64),char(0),char(3),char(0),char(61),char(0),char(-34),char(0),
+char(13),char(0),char(-33),char(0),char(13),char(0),char(-32),char(0),char(65),char(0),char(3),char(0),char(63),char(0),char(-34),char(0),char(14),char(0),char(-33),char(0),
+char(14),char(0),char(-32),char(0),char(66),char(0),char(3),char(0),char(61),char(0),char(-34),char(0),char(14),char(0),char(-33),char(0),char(14),char(0),char(-32),char(0),
+char(67),char(0),char(13),char(0),char(61),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(4),char(0),char(-29),char(0),
+char(4),char(0),char(-28),char(0),char(4),char(0),char(-27),char(0),char(7),char(0),char(-26),char(0),char(7),char(0),char(-25),char(0),char(7),char(0),char(-24),char(0),
+char(7),char(0),char(-23),char(0),char(7),char(0),char(-22),char(0),char(7),char(0),char(-21),char(0),char(7),char(0),char(-20),char(0),char(68),char(0),char(13),char(0),
+char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),char(4),char(0),char(-29),char(0),char(4),char(0),char(-28),char(0),
+char(4),char(0),char(-27),char(0),char(7),char(0),char(-26),char(0),char(7),char(0),char(-25),char(0),char(7),char(0),char(-24),char(0),char(7),char(0),char(-23),char(0),
+char(7),char(0),char(-22),char(0),char(7),char(0),char(-21),char(0),char(7),char(0),char(-20),char(0),char(69),char(0),char(14),char(0),char(63),char(0),char(-34),char(0),
+char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(4),char(0),char(-29),char(0),char(4),char(0),char(-28),char(0),char(4),char(0),char(-27),char(0),
+char(8),char(0),char(-26),char(0),char(8),char(0),char(-25),char(0),char(8),char(0),char(-24),char(0),char(8),char(0),char(-23),char(0),char(8),char(0),char(-22),char(0),
+char(8),char(0),char(-21),char(0),char(8),char(0),char(-20),char(0),char(0),char(0),char(-19),char(0),char(70),char(0),char(10),char(0),char(63),char(0),char(-34),char(0),
+char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(8),char(0),char(-18),char(0),char(8),char(0),char(-17),char(0),char(8),char(0),char(-16),char(0),
+char(8),char(0),char(-22),char(0),char(8),char(0),char(-21),char(0),char(8),char(0),char(-20),char(0),char(8),char(0),char(-89),char(0),char(71),char(0),char(11),char(0),
+char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),char(7),char(0),char(-18),char(0),char(7),char(0),char(-17),char(0),
+char(7),char(0),char(-16),char(0),char(7),char(0),char(-22),char(0),char(7),char(0),char(-21),char(0),char(7),char(0),char(-20),char(0),char(7),char(0),char(-89),char(0),
+char(0),char(0),char(21),char(0),char(72),char(0),char(9),char(0),char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),
+char(13),char(0),char(-15),char(0),char(13),char(0),char(-14),char(0),char(13),char(0),char(-13),char(0),char(13),char(0),char(-12),char(0),char(4),char(0),char(-11),char(0),
+char(4),char(0),char(-10),char(0),char(73),char(0),char(9),char(0),char(63),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),
+char(14),char(0),char(-15),char(0),char(14),char(0),char(-14),char(0),char(14),char(0),char(-13),char(0),char(14),char(0),char(-12),char(0),char(4),char(0),char(-11),char(0),
+char(4),char(0),char(-10),char(0),char(74),char(0),char(5),char(0),char(72),char(0),char(-9),char(0),char(4),char(0),char(-8),char(0),char(7),char(0),char(-7),char(0),
+char(7),char(0),char(-6),char(0),char(7),char(0),char(-5),char(0),char(75),char(0),char(5),char(0),char(73),char(0),char(-9),char(0),char(4),char(0),char(-8),char(0),
+char(8),char(0),char(-7),char(0),char(8),char(0),char(-6),char(0),char(8),char(0),char(-5),char(0),char(76),char(0),char(41),char(0),char(61),char(0),char(-34),char(0),
+char(19),char(0),char(-31),char(0),char(19),char(0),char(-30),char(0),char(13),char(0),char(-15),char(0),char(13),char(0),char(-14),char(0),char(13),char(0),char(-4),char(0),
+char(13),char(0),char(-3),char(0),char(13),char(0),char(-2),char(0),char(13),char(0),char(-1),char(0),char(13),char(0),char(0),char(1),char(13),char(0),char(1),char(1),
+char(13),char(0),char(2),char(1),char(13),char(0),char(3),char(1),char(13),char(0),char(4),char(1),char(13),char(0),char(5),char(1),char(13),char(0),char(6),char(1),
+char(0),char(0),char(7),char(1),char(0),char(0),char(8),char(1),char(0),char(0),char(9),char(1),char(0),char(0),char(10),char(1),char(0),char(0),char(11),char(1),
+char(0),char(0),char(-19),char(0),char(13),char(0),char(-13),char(0),char(13),char(0),char(-12),char(0),char(13),char(0),char(12),char(1),char(13),char(0),char(13),char(1),
+char(13),char(0),char(14),char(1),char(13),char(0),char(15),char(1),char(13),char(0),char(16),char(1),char(13),char(0),char(17),char(1),char(13),char(0),char(18),char(1),
+char(13),char(0),char(19),char(1),char(13),char(0),char(20),char(1),char(13),char(0),char(21),char(1),char(13),char(0),char(22),char(1),char(0),char(0),char(23),char(1),
+char(0),char(0),char(24),char(1),char(0),char(0),char(25),char(1),char(0),char(0),char(26),char(1),char(0),char(0),char(27),char(1),char(4),char(0),char(28),char(1),
+char(77),char(0),char(41),char(0),char(63),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),char(20),char(0),char(-30),char(0),char(14),char(0),char(-15),char(0),
+char(14),char(0),char(-14),char(0),char(14),char(0),char(-4),char(0),char(14),char(0),char(-3),char(0),char(14),char(0),char(-2),char(0),char(14),char(0),char(-1),char(0),
+char(14),char(0),char(0),char(1),char(14),char(0),char(1),char(1),char(14),char(0),char(2),char(1),char(14),char(0),char(3),char(1),char(14),char(0),char(4),char(1),
+char(14),char(0),char(5),char(1),char(14),char(0),char(6),char(1),char(0),char(0),char(7),char(1),char(0),char(0),char(8),char(1),char(0),char(0),char(9),char(1),
+char(0),char(0),char(10),char(1),char(0),char(0),char(11),char(1),char(0),char(0),char(-19),char(0),char(14),char(0),char(-13),char(0),char(14),char(0),char(-12),char(0),
+char(14),char(0),char(12),char(1),char(14),char(0),char(13),char(1),char(14),char(0),char(14),char(1),char(14),char(0),char(15),char(1),char(14),char(0),char(16),char(1),
+char(14),char(0),char(17),char(1),char(14),char(0),char(18),char(1),char(14),char(0),char(19),char(1),char(14),char(0),char(20),char(1),char(14),char(0),char(21),char(1),
+char(14),char(0),char(22),char(1),char(0),char(0),char(23),char(1),char(0),char(0),char(24),char(1),char(0),char(0),char(25),char(1),char(0),char(0),char(26),char(1),
+char(0),char(0),char(27),char(1),char(4),char(0),char(28),char(1),char(78),char(0),char(9),char(0),char(61),char(0),char(-34),char(0),char(19),char(0),char(-31),char(0),
+char(19),char(0),char(-30),char(0),char(7),char(0),char(-15),char(0),char(7),char(0),char(-14),char(0),char(7),char(0),char(-13),char(0),char(7),char(0),char(-12),char(0),
+char(4),char(0),char(-11),char(0),char(4),char(0),char(-10),char(0),char(79),char(0),char(9),char(0),char(63),char(0),char(-34),char(0),char(20),char(0),char(-31),char(0),
+char(20),char(0),char(-30),char(0),char(8),char(0),char(-15),char(0),char(8),char(0),char(-14),char(0),char(8),char(0),char(-13),char(0),char(8),char(0),char(-12),char(0),
+char(4),char(0),char(-11),char(0),char(4),char(0),char(-10),char(0),char(80),char(0),char(5),char(0),char(60),char(0),char(-34),char(0),char(13),char(0),char(29),char(1),
+char(13),char(0),char(30),char(1),char(7),char(0),char(31),char(1),char(0),char(0),char(37),char(0),char(81),char(0),char(4),char(0),char(63),char(0),char(-34),char(0),
+char(14),char(0),char(29),char(1),char(14),char(0),char(30),char(1),char(8),char(0),char(31),char(1),char(82),char(0),char(4),char(0),char(7),char(0),char(32),char(1),
+char(7),char(0),char(33),char(1),char(7),char(0),char(34),char(1),char(4),char(0),char(79),char(0),char(83),char(0),char(10),char(0),char(82),char(0),char(35),char(1),
+char(13),char(0),char(36),char(1),char(13),char(0),char(37),char(1),char(13),char(0),char(38),char(1),char(13),char(0),char(39),char(1),char(13),char(0),char(40),char(1),
+char(7),char(0),char(-58),char(0),char(7),char(0),char(41),char(1),char(4),char(0),char(42),char(1),char(4),char(0),char(53),char(0),char(84),char(0),char(4),char(0),
+char(82),char(0),char(35),char(1),char(4),char(0),char(43),char(1),char(7),char(0),char(44),char(1),char(4),char(0),char(45),char(1),char(85),char(0),char(4),char(0),
+char(13),char(0),char(40),char(1),char(82),char(0),char(35),char(1),char(4),char(0),char(46),char(1),char(7),char(0),char(47),char(1),char(86),char(0),char(7),char(0),
+char(13),char(0),char(48),char(1),char(82),char(0),char(35),char(1),char(4),char(0),char(49),char(1),char(7),char(0),char(50),char(1),char(7),char(0),char(51),char(1),
+char(7),char(0),char(52),char(1),char(4),char(0),char(53),char(0),char(87),char(0),char(6),char(0),char(17),char(0),char(53),char(1),char(13),char(0),char(51),char(1),
+char(13),char(0),char(54),char(1),char(62),char(0),char(55),char(1),char(4),char(0),char(56),char(1),char(7),char(0),char(52),char(1),char(88),char(0),char(26),char(0),
+char(4),char(0),char(57),char(1),char(7),char(0),char(58),char(1),char(7),char(0),char(-89),char(0),char(7),char(0),char(59),char(1),char(7),char(0),char(60),char(1),
+char(7),char(0),char(61),char(1),char(7),char(0),char(62),char(1),char(7),char(0),char(63),char(1),char(7),char(0),char(64),char(1),char(7),char(0),char(65),char(1),
+char(7),char(0),char(66),char(1),char(7),char(0),char(67),char(1),char(7),char(0),char(68),char(1),char(7),char(0),char(69),char(1),char(7),char(0),char(70),char(1),
+char(7),char(0),char(71),char(1),char(7),char(0),char(72),char(1),char(7),char(0),char(73),char(1),char(7),char(0),char(74),char(1),char(7),char(0),char(75),char(1),
+char(7),char(0),char(76),char(1),char(4),char(0),char(77),char(1),char(4),char(0),char(78),char(1),char(4),char(0),char(79),char(1),char(4),char(0),char(80),char(1),
+char(4),char(0),char(-99),char(0),char(89),char(0),char(12),char(0),char(17),char(0),char(81),char(1),char(17),char(0),char(82),char(1),char(17),char(0),char(83),char(1),
+char(13),char(0),char(84),char(1),char(13),char(0),char(85),char(1),char(7),char(0),char(86),char(1),char(4),char(0),char(87),char(1),char(4),char(0),char(88),char(1),
+char(4),char(0),char(89),char(1),char(4),char(0),char(90),char(1),char(7),char(0),char(50),char(1),char(4),char(0),char(53),char(0),char(90),char(0),char(27),char(0),
+char(19),char(0),char(91),char(1),char(17),char(0),char(92),char(1),char(17),char(0),char(93),char(1),char(13),char(0),char(84),char(1),char(13),char(0),char(94),char(1),
+char(13),char(0),char(95),char(1),char(13),char(0),char(96),char(1),char(13),char(0),char(97),char(1),char(13),char(0),char(98),char(1),char(4),char(0),char(99),char(1),
+char(7),char(0),char(100),char(1),char(4),char(0),char(101),char(1),char(4),char(0),char(102),char(1),char(4),char(0),char(103),char(1),char(7),char(0),char(104),char(1),
+char(7),char(0),char(105),char(1),char(4),char(0),char(106),char(1),char(4),char(0),char(107),char(1),char(7),char(0),char(108),char(1),char(7),char(0),char(109),char(1),
+char(7),char(0),char(110),char(1),char(7),char(0),char(111),char(1),char(7),char(0),char(112),char(1),char(7),char(0),char(113),char(1),char(4),char(0),char(114),char(1),
+char(4),char(0),char(115),char(1),char(4),char(0),char(116),char(1),char(91),char(0),char(12),char(0),char(9),char(0),char(117),char(1),char(9),char(0),char(118),char(1),
+char(13),char(0),char(119),char(1),char(7),char(0),char(120),char(1),char(7),char(0),char(-85),char(0),char(7),char(0),char(121),char(1),char(4),char(0),char(122),char(1),
+char(13),char(0),char(123),char(1),char(4),char(0),char(124),char(1),char(4),char(0),char(125),char(1),char(4),char(0),char(126),char(1),char(4),char(0),char(53),char(0),
+char(92),char(0),char(19),char(0),char(50),char(0),char(-68),char(0),char(89),char(0),char(127),char(1),char(82),char(0),char(-128),char(1),char(83),char(0),char(-127),char(1),
+char(84),char(0),char(-126),char(1),char(85),char(0),char(-125),char(1),char(86),char(0),char(-124),char(1),char(87),char(0),char(-123),char(1),char(90),char(0),char(-122),char(1),
+char(91),char(0),char(-121),char(1),char(4),char(0),char(-120),char(1),char(4),char(0),char(102),char(1),char(4),char(0),char(-119),char(1),char(4),char(0),char(-118),char(1),
+char(4),char(0),char(-117),char(1),char(4),char(0),char(-116),char(1),char(4),char(0),char(-115),char(1),char(4),char(0),char(-114),char(1),char(88),char(0),char(-113),char(1),
+char(93),char(0),char(28),char(0),char(16),char(0),char(-112),char(1),char(14),char(0),char(-111),char(1),char(14),char(0),char(-110),char(1),char(14),char(0),char(-109),char(1),
+char(14),char(0),char(-108),char(1),char(14),char(0),char(-107),char(1),char(14),char(0),char(-106),char(1),char(14),char(0),char(-105),char(1),char(14),char(0),char(-104),char(1),
+char(14),char(0),char(-103),char(1),char(8),char(0),char(-102),char(1),char(4),char(0),char(-101),char(1),char(4),char(0),char(126),char(1),char(4),char(0),char(-100),char(1),
+char(4),char(0),char(-99),char(1),char(8),char(0),char(-98),char(1),char(8),char(0),char(-97),char(1),char(8),char(0),char(-96),char(1),char(8),char(0),char(-95),char(1),
+char(8),char(0),char(-94),char(1),char(8),char(0),char(-93),char(1),char(8),char(0),char(-92),char(1),char(8),char(0),char(-91),char(1),char(8),char(0),char(-90),char(1),
+char(0),char(0),char(-89),char(1),char(0),char(0),char(-88),char(1),char(48),char(0),char(-87),char(1),char(0),char(0),char(-86),char(1),char(94),char(0),char(28),char(0),
+char(15),char(0),char(-112),char(1),char(13),char(0),char(-111),char(1),char(13),char(0),char(-110),char(1),char(13),char(0),char(-109),char(1),char(13),char(0),char(-108),char(1),
+char(13),char(0),char(-107),char(1),char(13),char(0),char(-106),char(1),char(13),char(0),char(-105),char(1),char(13),char(0),char(-104),char(1),char(13),char(0),char(-103),char(1),
+char(4),char(0),char(-100),char(1),char(7),char(0),char(-102),char(1),char(4),char(0),char(-101),char(1),char(4),char(0),char(126),char(1),char(7),char(0),char(-98),char(1),
+char(7),char(0),char(-97),char(1),char(7),char(0),char(-96),char(1),char(4),char(0),char(-99),char(1),char(7),char(0),char(-95),char(1),char(7),char(0),char(-94),char(1),
+char(7),char(0),char(-93),char(1),char(7),char(0),char(-92),char(1),char(7),char(0),char(-91),char(1),char(7),char(0),char(-90),char(1),char(0),char(0),char(-89),char(1),
+char(0),char(0),char(-88),char(1),char(50),char(0),char(-87),char(1),char(0),char(0),char(-86),char(1),char(95),char(0),char(11),char(0),char(14),char(0),char(-85),char(1),
+char(16),char(0),char(-84),char(1),char(14),char(0),char(-83),char(1),char(14),char(0),char(-82),char(1),char(14),char(0),char(-81),char(1),char(8),char(0),char(-80),char(1),
+char(4),char(0),char(-119),char(1),char(0),char(0),char(37),char(0),char(0),char(0),char(-79),char(1),char(93),char(0),char(-126),char(1),char(48),char(0),char(-78),char(1),
+char(96),char(0),char(10),char(0),char(13),char(0),char(-85),char(1),char(15),char(0),char(-84),char(1),char(13),char(0),char(-83),char(1),char(13),char(0),char(-82),char(1),
+char(13),char(0),char(-81),char(1),char(7),char(0),char(-80),char(1),char(4),char(0),char(-119),char(1),char(0),char(0),char(-79),char(1),char(94),char(0),char(-126),char(1),
+char(50),char(0),char(-78),char(1),char(97),char(0),char(4),char(0),char(50),char(0),char(-77),char(1),char(96),char(0),char(-76),char(1),char(4),char(0),char(-75),char(1),
+char(0),char(0),char(37),char(0),char(98),char(0),char(4),char(0),char(48),char(0),char(-77),char(1),char(95),char(0),char(-76),char(1),char(4),char(0),char(-75),char(1),
+char(0),char(0),char(37),char(0),};
+int sBulletDNAlen64= sizeof(sBulletDNAstr64);
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btSpatialAlgebra.h b/dali-physics/third-party/bullet3/src/LinearMath/btSpatialAlgebra.h
new file mode 100644
index 0000000..6ad67a1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btSpatialAlgebra.h
@@ -0,0 +1,389 @@
+/*
+Copyright (c) 2003-2015 Erwin Coumans, Jakub Stepien
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///These spatial algebra classes are used for btMultiBody,
+///see BulletDynamics/Featherstone
+
+#ifndef BT_SPATIAL_ALGEBRA_H
+#define BT_SPATIAL_ALGEBRA_H
+
+#include "btMatrix3x3.h"
+
+struct btSpatialForceVector
+{
+	btVector3 m_topVec, m_bottomVec;
+	//
+	btSpatialForceVector() { setZero(); }
+	btSpatialForceVector(const btVector3 &angular, const btVector3 &linear) : m_topVec(linear), m_bottomVec(angular) {}
+	btSpatialForceVector(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz)
+	{
+		setValue(ax, ay, az, lx, ly, lz);
+	}
+	//
+	void setVector(const btVector3 &angular, const btVector3 &linear)
+	{
+		m_topVec = linear;
+		m_bottomVec = angular;
+	}
+	void setValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz)
+	{
+		m_bottomVec.setValue(ax, ay, az);
+		m_topVec.setValue(lx, ly, lz);
+	}
+	//
+	void addVector(const btVector3 &angular, const btVector3 &linear)
+	{
+		m_topVec += linear;
+		m_bottomVec += angular;
+	}
+	void addValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz)
+	{
+		m_bottomVec[0] += ax;
+		m_bottomVec[1] += ay;
+		m_bottomVec[2] += az;
+		m_topVec[0] += lx;
+		m_topVec[1] += ly;
+		m_topVec[2] += lz;
+	}
+	//
+	const btVector3 &getLinear() const { return m_topVec; }
+	const btVector3 &getAngular() const { return m_bottomVec; }
+	//
+	void setLinear(const btVector3 &linear) { m_topVec = linear; }
+	void setAngular(const btVector3 &angular) { m_bottomVec = angular; }
+	//
+	void addAngular(const btVector3 &angular) { m_bottomVec += angular; }
+	void addLinear(const btVector3 &linear) { m_topVec += linear; }
+	//
+	void setZero()
+	{
+		m_topVec.setZero();
+		m_bottomVec.setZero();
+	}
+	//
+	btSpatialForceVector &operator+=(const btSpatialForceVector &vec)
+	{
+		m_topVec += vec.m_topVec;
+		m_bottomVec += vec.m_bottomVec;
+		return *this;
+	}
+	btSpatialForceVector &operator-=(const btSpatialForceVector &vec)
+	{
+		m_topVec -= vec.m_topVec;
+		m_bottomVec -= vec.m_bottomVec;
+		return *this;
+	}
+	btSpatialForceVector operator-(const btSpatialForceVector &vec) const { return btSpatialForceVector(m_bottomVec - vec.m_bottomVec, m_topVec - vec.m_topVec); }
+	btSpatialForceVector operator+(const btSpatialForceVector &vec) const { return btSpatialForceVector(m_bottomVec + vec.m_bottomVec, m_topVec + vec.m_topVec); }
+	btSpatialForceVector operator-() const { return btSpatialForceVector(-m_bottomVec, -m_topVec); }
+	btSpatialForceVector operator*(const btScalar &s) const { return btSpatialForceVector(s * m_bottomVec, s * m_topVec); }
+	//btSpatialForceVector & operator = (const btSpatialForceVector &vec) { m_topVec = vec.m_topVec; m_bottomVec = vec.m_bottomVec; return *this; }
+};
+
+struct btSpatialMotionVector
+{
+	btVector3 m_topVec, m_bottomVec;
+	//
+	btSpatialMotionVector() { setZero(); }
+	btSpatialMotionVector(const btVector3 &angular, const btVector3 &linear) : m_topVec(angular), m_bottomVec(linear) {}
+	//
+	void setVector(const btVector3 &angular, const btVector3 &linear)
+	{
+		m_topVec = angular;
+		m_bottomVec = linear;
+	}
+	void setValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz)
+	{
+		m_topVec.setValue(ax, ay, az);
+		m_bottomVec.setValue(lx, ly, lz);
+	}
+	//
+	void addVector(const btVector3 &angular, const btVector3 &linear)
+	{
+		m_topVec += linear;
+		m_bottomVec += angular;
+	}
+	void addValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz)
+	{
+		m_topVec[0] += ax;
+		m_topVec[1] += ay;
+		m_topVec[2] += az;
+		m_bottomVec[0] += lx;
+		m_bottomVec[1] += ly;
+		m_bottomVec[2] += lz;
+	}
+	//
+	const btVector3 &getAngular() const { return m_topVec; }
+	const btVector3 &getLinear() const { return m_bottomVec; }
+	//
+	void setAngular(const btVector3 &angular) { m_topVec = angular; }
+	void setLinear(const btVector3 &linear) { m_bottomVec = linear; }
+	//
+	void addAngular(const btVector3 &angular) { m_topVec += angular; }
+	void addLinear(const btVector3 &linear) { m_bottomVec += linear; }
+	//
+	void setZero()
+	{
+		m_topVec.setZero();
+		m_bottomVec.setZero();
+	}
+	//
+	btScalar dot(const btSpatialForceVector &b) const
+	{
+		return m_bottomVec.dot(b.m_topVec) + m_topVec.dot(b.m_bottomVec);
+	}
+	//
+	template <typename SpatialVectorType>
+	void cross(const SpatialVectorType &b, SpatialVectorType &out) const
+	{
+		out.m_topVec = m_topVec.cross(b.m_topVec);
+		out.m_bottomVec = m_bottomVec.cross(b.m_topVec) + m_topVec.cross(b.m_bottomVec);
+	}
+	template <typename SpatialVectorType>
+	SpatialVectorType cross(const SpatialVectorType &b) const
+	{
+		SpatialVectorType out;
+		out.m_topVec = m_topVec.cross(b.m_topVec);
+		out.m_bottomVec = m_bottomVec.cross(b.m_topVec) + m_topVec.cross(b.m_bottomVec);
+		return out;
+	}
+	//
+	btSpatialMotionVector &operator+=(const btSpatialMotionVector &vec)
+	{
+		m_topVec += vec.m_topVec;
+		m_bottomVec += vec.m_bottomVec;
+		return *this;
+	}
+	btSpatialMotionVector &operator-=(const btSpatialMotionVector &vec)
+	{
+		m_topVec -= vec.m_topVec;
+		m_bottomVec -= vec.m_bottomVec;
+		return *this;
+	}
+	btSpatialMotionVector &operator*=(const btScalar &s)
+	{
+		m_topVec *= s;
+		m_bottomVec *= s;
+		return *this;
+	}
+	btSpatialMotionVector operator-(const btSpatialMotionVector &vec) const { return btSpatialMotionVector(m_topVec - vec.m_topVec, m_bottomVec - vec.m_bottomVec); }
+	btSpatialMotionVector operator+(const btSpatialMotionVector &vec) const { return btSpatialMotionVector(m_topVec + vec.m_topVec, m_bottomVec + vec.m_bottomVec); }
+	btSpatialMotionVector operator-() const { return btSpatialMotionVector(-m_topVec, -m_bottomVec); }
+	btSpatialMotionVector operator*(const btScalar &s) const { return btSpatialMotionVector(s * m_topVec, s * m_bottomVec); }
+};
+
+struct btSymmetricSpatialDyad
+{
+	btMatrix3x3 m_topLeftMat, m_topRightMat, m_bottomLeftMat;
+	//
+	btSymmetricSpatialDyad() { setIdentity(); }
+	btSymmetricSpatialDyad(const btMatrix3x3 &topLeftMat, const btMatrix3x3 &topRightMat, const btMatrix3x3 &bottomLeftMat) { setMatrix(topLeftMat, topRightMat, bottomLeftMat); }
+	//
+	void setMatrix(const btMatrix3x3 &topLeftMat, const btMatrix3x3 &topRightMat, const btMatrix3x3 &bottomLeftMat)
+	{
+		m_topLeftMat = topLeftMat;
+		m_topRightMat = topRightMat;
+		m_bottomLeftMat = bottomLeftMat;
+	}
+	//
+	void addMatrix(const btMatrix3x3 &topLeftMat, const btMatrix3x3 &topRightMat, const btMatrix3x3 &bottomLeftMat)
+	{
+		m_topLeftMat += topLeftMat;
+		m_topRightMat += topRightMat;
+		m_bottomLeftMat += bottomLeftMat;
+	}
+	//
+	void setIdentity()
+	{
+		m_topLeftMat.setIdentity();
+		m_topRightMat.setIdentity();
+		m_bottomLeftMat.setIdentity();
+	}
+	//
+	btSymmetricSpatialDyad &operator-=(const btSymmetricSpatialDyad &mat)
+	{
+		m_topLeftMat -= mat.m_topLeftMat;
+		m_topRightMat -= mat.m_topRightMat;
+		m_bottomLeftMat -= mat.m_bottomLeftMat;
+		return *this;
+	}
+	//
+	btSpatialForceVector operator*(const btSpatialMotionVector &vec)
+	{
+		return btSpatialForceVector(m_bottomLeftMat * vec.m_topVec + m_topLeftMat.transpose() * vec.m_bottomVec, m_topLeftMat * vec.m_topVec + m_topRightMat * vec.m_bottomVec);
+	}
+};
+
+struct btSpatialTransformationMatrix
+{
+	btMatrix3x3 m_rotMat;  //btMatrix3x3 m_trnCrossMat;
+	btVector3 m_trnVec;
+	//
+	enum eOutputOperation
+	{
+		None = 0,
+		Add = 1,
+		Subtract = 2
+	};
+	//
+	template <typename SpatialVectorType>
+	void transform(const SpatialVectorType &inVec,
+				   SpatialVectorType &outVec,
+				   eOutputOperation outOp = None)
+	{
+		if (outOp == None)
+		{
+			outVec.m_topVec = m_rotMat * inVec.m_topVec;
+			outVec.m_bottomVec = -m_trnVec.cross(outVec.m_topVec) + m_rotMat * inVec.m_bottomVec;
+		}
+		else if (outOp == Add)
+		{
+			outVec.m_topVec += m_rotMat * inVec.m_topVec;
+			outVec.m_bottomVec += -m_trnVec.cross(outVec.m_topVec) + m_rotMat * inVec.m_bottomVec;
+		}
+		else if (outOp == Subtract)
+		{
+			outVec.m_topVec -= m_rotMat * inVec.m_topVec;
+			outVec.m_bottomVec -= -m_trnVec.cross(outVec.m_topVec) + m_rotMat * inVec.m_bottomVec;
+		}
+	}
+
+	template <typename SpatialVectorType>
+	void transformRotationOnly(const SpatialVectorType &inVec,
+							   SpatialVectorType &outVec,
+							   eOutputOperation outOp = None)
+	{
+		if (outOp == None)
+		{
+			outVec.m_topVec = m_rotMat * inVec.m_topVec;
+			outVec.m_bottomVec = m_rotMat * inVec.m_bottomVec;
+		}
+		else if (outOp == Add)
+		{
+			outVec.m_topVec += m_rotMat * inVec.m_topVec;
+			outVec.m_bottomVec += m_rotMat * inVec.m_bottomVec;
+		}
+		else if (outOp == Subtract)
+		{
+			outVec.m_topVec -= m_rotMat * inVec.m_topVec;
+			outVec.m_bottomVec -= m_rotMat * inVec.m_bottomVec;
+		}
+	}
+
+	template <typename SpatialVectorType>
+	void transformInverse(const SpatialVectorType &inVec,
+						  SpatialVectorType &outVec,
+						  eOutputOperation outOp = None)
+	{
+		if (outOp == None)
+		{
+			outVec.m_topVec = m_rotMat.transpose() * inVec.m_topVec;
+			outVec.m_bottomVec = m_rotMat.transpose() * (inVec.m_bottomVec + m_trnVec.cross(inVec.m_topVec));
+		}
+		else if (outOp == Add)
+		{
+			outVec.m_topVec += m_rotMat.transpose() * inVec.m_topVec;
+			outVec.m_bottomVec += m_rotMat.transpose() * (inVec.m_bottomVec + m_trnVec.cross(inVec.m_topVec));
+		}
+		else if (outOp == Subtract)
+		{
+			outVec.m_topVec -= m_rotMat.transpose() * inVec.m_topVec;
+			outVec.m_bottomVec -= m_rotMat.transpose() * (inVec.m_bottomVec + m_trnVec.cross(inVec.m_topVec));
+		}
+	}
+
+	template <typename SpatialVectorType>
+	void transformInverseRotationOnly(const SpatialVectorType &inVec,
+									  SpatialVectorType &outVec,
+									  eOutputOperation outOp = None)
+	{
+		if (outOp == None)
+		{
+			outVec.m_topVec = m_rotMat.transpose() * inVec.m_topVec;
+			outVec.m_bottomVec = m_rotMat.transpose() * inVec.m_bottomVec;
+		}
+		else if (outOp == Add)
+		{
+			outVec.m_topVec += m_rotMat.transpose() * inVec.m_topVec;
+			outVec.m_bottomVec += m_rotMat.transpose() * inVec.m_bottomVec;
+		}
+		else if (outOp == Subtract)
+		{
+			outVec.m_topVec -= m_rotMat.transpose() * inVec.m_topVec;
+			outVec.m_bottomVec -= m_rotMat.transpose() * inVec.m_bottomVec;
+		}
+	}
+
+	void transformInverse(const btSymmetricSpatialDyad &inMat,
+						  btSymmetricSpatialDyad &outMat,
+						  eOutputOperation outOp = None)
+	{
+		const btMatrix3x3 r_cross(0, -m_trnVec[2], m_trnVec[1],
+								  m_trnVec[2], 0, -m_trnVec[0],
+								  -m_trnVec[1], m_trnVec[0], 0);
+
+		if (outOp == None)
+		{
+			outMat.m_topLeftMat = m_rotMat.transpose() * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) * m_rotMat;
+			outMat.m_topRightMat = m_rotMat.transpose() * inMat.m_topRightMat * m_rotMat;
+			outMat.m_bottomLeftMat = m_rotMat.transpose() * (r_cross * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) + inMat.m_bottomLeftMat - inMat.m_topLeftMat.transpose() * r_cross) * m_rotMat;
+		}
+		else if (outOp == Add)
+		{
+			outMat.m_topLeftMat += m_rotMat.transpose() * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) * m_rotMat;
+			outMat.m_topRightMat += m_rotMat.transpose() * inMat.m_topRightMat * m_rotMat;
+			outMat.m_bottomLeftMat += m_rotMat.transpose() * (r_cross * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) + inMat.m_bottomLeftMat - inMat.m_topLeftMat.transpose() * r_cross) * m_rotMat;
+		}
+		else if (outOp == Subtract)
+		{
+			outMat.m_topLeftMat -= m_rotMat.transpose() * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) * m_rotMat;
+			outMat.m_topRightMat -= m_rotMat.transpose() * inMat.m_topRightMat * m_rotMat;
+			outMat.m_bottomLeftMat -= m_rotMat.transpose() * (r_cross * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) + inMat.m_bottomLeftMat - inMat.m_topLeftMat.transpose() * r_cross) * m_rotMat;
+		}
+	}
+
+	template <typename SpatialVectorType>
+	SpatialVectorType operator*(const SpatialVectorType &vec)
+	{
+		SpatialVectorType out;
+		transform(vec, out);
+		return out;
+	}
+};
+
+template <typename SpatialVectorType>
+void symmetricSpatialOuterProduct(const SpatialVectorType &a, const SpatialVectorType &b, btSymmetricSpatialDyad &out)
+{
+	//output op maybe?
+
+	out.m_topLeftMat = outerProduct(a.m_topVec, b.m_bottomVec);
+	out.m_topRightMat = outerProduct(a.m_topVec, b.m_topVec);
+	out.m_topLeftMat = outerProduct(a.m_bottomVec, b.m_bottomVec);
+	//maybe simple a*spatTranspose(a) would be nicer?
+}
+
+template <typename SpatialVectorType>
+btSymmetricSpatialDyad symmetricSpatialOuterProduct(const SpatialVectorType &a, const SpatialVectorType &b)
+{
+	btSymmetricSpatialDyad out;
+
+	out.m_topLeftMat = outerProduct(a.m_topVec, b.m_bottomVec);
+	out.m_topRightMat = outerProduct(a.m_topVec, b.m_topVec);
+	out.m_bottomLeftMat = outerProduct(a.m_bottomVec, b.m_bottomVec);
+
+	return out;
+	//maybe simple a*spatTranspose(a) would be nicer?
+}
+
+#endif  //BT_SPATIAL_ALGEBRA_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btStackAlloc.h b/dali-physics/third-party/bullet3/src/LinearMath/btStackAlloc.h
new file mode 100644
index 0000000..761d6a4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btStackAlloc.h
@@ -0,0 +1,118 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+StackAlloc extracted from GJK-EPA collision solver by Nathanael Presson
+Nov.2006
+*/
+
+#ifndef BT_STACK_ALLOC
+#define BT_STACK_ALLOC
+
+#include "btScalar.h"  //for btAssert
+#include "btAlignedAllocator.h"
+
+///The btBlock class is an internal structure for the btStackAlloc memory allocator.
+struct btBlock
+{
+	btBlock* previous;
+	unsigned char* address;
+};
+
+///The StackAlloc class provides some fast stack-based memory allocator (LIFO last-in first-out)
+class btStackAlloc
+{
+public:
+	btStackAlloc(unsigned int size)
+	{
+		ctor();
+		create(size);
+	}
+	~btStackAlloc() { destroy(); }
+
+	inline void create(unsigned int size)
+	{
+		destroy();
+		data = (unsigned char*)btAlignedAlloc(size, 16);
+		totalsize = size;
+	}
+	inline void destroy()
+	{
+		btAssert(usedsize == 0);
+		//Raise(L"StackAlloc is still in use");
+
+		if (usedsize == 0)
+		{
+			if (!ischild && data)
+				btAlignedFree(data);
+
+			data = 0;
+			usedsize = 0;
+		}
+	}
+
+	int getAvailableMemory() const
+	{
+		return static_cast<int>(totalsize - usedsize);
+	}
+
+	unsigned char* allocate(unsigned int size)
+	{
+		const unsigned int nus(usedsize + size);
+		if (nus < totalsize)
+		{
+			usedsize = nus;
+			return (data + (usedsize - size));
+		}
+		btAssert(0);
+		//&& (L"Not enough memory"));
+
+		return (0);
+	}
+	SIMD_FORCE_INLINE btBlock* beginBlock()
+	{
+		btBlock* pb = (btBlock*)allocate(sizeof(btBlock));
+		pb->previous = current;
+		pb->address = data + usedsize;
+		current = pb;
+		return (pb);
+	}
+	SIMD_FORCE_INLINE void endBlock(btBlock* block)
+	{
+		btAssert(block == current);
+		//Raise(L"Unmatched blocks");
+		if (block == current)
+		{
+			current = block->previous;
+			usedsize = (unsigned int)((block->address - data) - sizeof(btBlock));
+		}
+	}
+
+private:
+	void ctor()
+	{
+		data = 0;
+		totalsize = 0;
+		usedsize = 0;
+		current = 0;
+		ischild = false;
+	}
+	unsigned char* data;
+	unsigned int totalsize;
+	unsigned int usedsize;
+	btBlock* current;
+	bool ischild;
+};
+
+#endif  //BT_STACK_ALLOC
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btThreads.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btThreads.cpp
new file mode 100644
index 0000000..69a8679
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btThreads.cpp
@@ -0,0 +1,792 @@
+/*
+Copyright (c) 2003-2014 Erwin Coumans  http://bullet.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btThreads.h"
+#include "btQuickprof.h"
+#include <algorithm>  // for min and max
+
+#if BT_USE_OPENMP && BT_THREADSAFE
+
+#include <omp.h>
+
+#endif  // #if BT_USE_OPENMP && BT_THREADSAFE
+
+#if BT_USE_PPL && BT_THREADSAFE
+
+// use Microsoft Parallel Patterns Library (installed with Visual Studio 2010 and later)
+#include <ppl.h>  // if you get a compile error here, check whether your version of Visual Studio includes PPL
+// Visual Studio 2010 and later should come with it
+#include <concrtrm.h>  // for GetProcessorCount()
+
+#endif  // #if BT_USE_PPL && BT_THREADSAFE
+
+#if BT_USE_TBB && BT_THREADSAFE
+
+// use Intel Threading Building Blocks for thread management
+#define __TBB_NO_IMPLICIT_LINKAGE 1
+#include <tbb/tbb.h>
+#include <tbb/task_scheduler_init.h>
+#include <tbb/parallel_for.h>
+#include <tbb/blocked_range.h>
+
+#endif  // #if BT_USE_TBB && BT_THREADSAFE
+
+#if BT_THREADSAFE
+//
+// Lightweight spin-mutex based on atomics
+// Using ordinary system-provided mutexes like Windows critical sections was noticeably slower
+// presumably because when it fails to lock at first it would sleep the thread and trigger costly
+// context switching.
+//
+
+#if __cplusplus >= 201103L
+
+// for anything claiming full C++11 compliance, use C++11 atomics
+// on GCC or Clang you need to compile with -std=c++11
+#define USE_CPP11_ATOMICS 1
+
+#elif defined(_MSC_VER)
+
+// on MSVC, use intrinsics instead
+#define USE_MSVC_INTRINSICS 1
+
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
+
+// available since GCC 4.7 and some versions of clang
+// todo: check for clang
+#define USE_GCC_BUILTIN_ATOMICS 1
+
+#elif defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+
+// available since GCC 4.1
+#define USE_GCC_BUILTIN_ATOMICS_OLD 1
+
+#endif
+
+#if USE_CPP11_ATOMICS
+
+#include <atomic>
+#include <thread>
+
+#define THREAD_LOCAL_STATIC thread_local static
+
+bool btSpinMutex::tryLock()
+{
+	std::atomic<int>* aDest = reinterpret_cast<std::atomic<int>*>(&mLock);
+	int expected = 0;
+	return std::atomic_compare_exchange_weak_explicit(aDest, &expected, int(1), std::memory_order_acq_rel, std::memory_order_acquire);
+}
+
+void btSpinMutex::lock()
+{
+	// note: this lock does not sleep the thread.
+	while (!tryLock())
+	{
+		// spin
+	}
+}
+
+void btSpinMutex::unlock()
+{
+	std::atomic<int>* aDest = reinterpret_cast<std::atomic<int>*>(&mLock);
+	std::atomic_store_explicit(aDest, int(0), std::memory_order_release);
+}
+
+#elif USE_MSVC_INTRINSICS
+
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include <intrin.h>
+
+#define THREAD_LOCAL_STATIC __declspec(thread) static
+
+bool btSpinMutex::tryLock()
+{
+	volatile long* aDest = reinterpret_cast<long*>(&mLock);
+	return (0 == _InterlockedCompareExchange(aDest, 1, 0));
+}
+
+void btSpinMutex::lock()
+{
+	// note: this lock does not sleep the thread
+	while (!tryLock())
+	{
+		// spin
+	}
+}
+
+void btSpinMutex::unlock()
+{
+	volatile long* aDest = reinterpret_cast<long*>(&mLock);
+	_InterlockedExchange(aDest, 0);
+}
+
+#elif USE_GCC_BUILTIN_ATOMICS
+
+#define THREAD_LOCAL_STATIC static __thread
+
+bool btSpinMutex::tryLock()
+{
+	int expected = 0;
+	bool weak = false;
+	const int memOrderSuccess = __ATOMIC_ACQ_REL;
+	const int memOrderFail = __ATOMIC_ACQUIRE;
+	return __atomic_compare_exchange_n(&mLock, &expected, int(1), weak, memOrderSuccess, memOrderFail);
+}
+
+void btSpinMutex::lock()
+{
+	// note: this lock does not sleep the thread
+	while (!tryLock())
+	{
+		// spin
+	}
+}
+
+void btSpinMutex::unlock()
+{
+	__atomic_store_n(&mLock, int(0), __ATOMIC_RELEASE);
+}
+
+#elif USE_GCC_BUILTIN_ATOMICS_OLD
+
+#define THREAD_LOCAL_STATIC static __thread
+
+bool btSpinMutex::tryLock()
+{
+	return __sync_bool_compare_and_swap(&mLock, int(0), int(1));
+}
+
+void btSpinMutex::lock()
+{
+	// note: this lock does not sleep the thread
+	while (!tryLock())
+	{
+		// spin
+	}
+}
+
+void btSpinMutex::unlock()
+{
+	// write 0
+	__sync_fetch_and_and(&mLock, int(0));
+}
+
+#else  //#elif USE_MSVC_INTRINSICS
+
+#error "no threading primitives defined -- unknown platform"
+
+#endif  //#else //#elif USE_MSVC_INTRINSICS
+
+#else  //#if BT_THREADSAFE
+
+// These should not be called ever
+void btSpinMutex::lock()
+{
+	btAssert(!"unimplemented btSpinMutex::lock() called");
+}
+
+void btSpinMutex::unlock()
+{
+	btAssert(!"unimplemented btSpinMutex::unlock() called");
+}
+
+bool btSpinMutex::tryLock()
+{
+	btAssert(!"unimplemented btSpinMutex::tryLock() called");
+	return true;
+}
+
+#define THREAD_LOCAL_STATIC static
+
+#endif  // #else //#if BT_THREADSAFE
+
+struct ThreadsafeCounter
+{
+	unsigned int mCounter;
+	btSpinMutex mMutex;
+
+	ThreadsafeCounter()
+	{
+		mCounter = 0;
+		--mCounter;  // first count should come back 0
+	}
+
+	unsigned int getNext()
+	{
+		// no need to optimize this with atomics, it is only called ONCE per thread!
+		mMutex.lock();
+		mCounter++;
+		if (mCounter >= BT_MAX_THREAD_COUNT)
+		{
+			btAssert(!"thread counter exceeded");
+			// wrap back to the first worker index
+			mCounter = 1;
+		}
+		unsigned int val = mCounter;
+		mMutex.unlock();
+		return val;
+	}
+};
+
+static btITaskScheduler* gBtTaskScheduler=0;
+static int gThreadsRunningCounter = 0;  // useful for detecting if we are trying to do nested parallel-for calls
+static btSpinMutex gThreadsRunningCounterMutex;
+static ThreadsafeCounter gThreadCounter;
+
+//
+// BT_DETECT_BAD_THREAD_INDEX tries to detect when there are multiple threads assigned the same thread index.
+//
+// BT_DETECT_BAD_THREAD_INDEX is a developer option to test if
+// certain assumptions about how the task scheduler manages its threads
+// holds true.
+// The main assumption is:
+//   - when the threadpool is resized, the task scheduler either
+//      1. destroys all worker threads and creates all new ones in the correct number, OR
+//      2. never destroys a worker thread
+//
+// We make that assumption because we can't easily enumerate the worker threads of a task scheduler
+// to assign nice sequential thread-indexes. We also do not get notified if a worker thread is destroyed,
+// so we can't tell when a thread-index is no longer being used.
+// We allocate thread-indexes as needed with a sequential global thread counter.
+//
+// Our simple thread-counting scheme falls apart if the task scheduler destroys some threads but
+// continues to re-use other threads and the application repeatedly resizes the thread pool of the
+// task scheduler.
+// In order to prevent the thread-counter from exceeding the global max (BT_MAX_THREAD_COUNT), we
+// wrap the thread counter back to 1. This should only happen if the worker threads have all been
+// destroyed and re-created.
+//
+// BT_DETECT_BAD_THREAD_INDEX only works for Win32 right now,
+// but could be adapted to work with pthreads
+#define BT_DETECT_BAD_THREAD_INDEX 0
+
+#if BT_DETECT_BAD_THREAD_INDEX
+
+typedef DWORD ThreadId_t;
+const static ThreadId_t kInvalidThreadId = 0;
+ThreadId_t gDebugThreadIds[BT_MAX_THREAD_COUNT];
+
+static ThreadId_t getDebugThreadId()
+{
+	return GetCurrentThreadId();
+}
+
+#endif  // #if BT_DETECT_BAD_THREAD_INDEX
+
+// return a unique index per thread, main thread is 0, worker threads are in [1, BT_MAX_THREAD_COUNT)
+unsigned int btGetCurrentThreadIndex()
+{
+	const unsigned int kNullIndex = ~0U;
+	THREAD_LOCAL_STATIC unsigned int sThreadIndex = kNullIndex;
+	if (sThreadIndex == kNullIndex)
+	{
+		sThreadIndex = gThreadCounter.getNext();
+		btAssert(sThreadIndex < BT_MAX_THREAD_COUNT);
+	}
+#if BT_DETECT_BAD_THREAD_INDEX
+	if (gBtTaskScheduler && sThreadIndex > 0)
+	{
+		ThreadId_t tid = getDebugThreadId();
+		// if not set
+		if (gDebugThreadIds[sThreadIndex] == kInvalidThreadId)
+		{
+			// set it
+			gDebugThreadIds[sThreadIndex] = tid;
+		}
+		else
+		{
+			if (gDebugThreadIds[sThreadIndex] != tid)
+			{
+				// this could indicate the task scheduler is breaking our assumptions about
+				// how threads are managed when threadpool is resized
+				btAssert(!"there are 2 or more threads with the same thread-index!");
+				__debugbreak();
+			}
+		}
+	}
+#endif  // #if BT_DETECT_BAD_THREAD_INDEX
+	return sThreadIndex;
+}
+
+bool btIsMainThread()
+{
+	return btGetCurrentThreadIndex() == 0;
+}
+
+void btResetThreadIndexCounter()
+{
+	// for when all current worker threads are destroyed
+	btAssert(btIsMainThread());
+	gThreadCounter.mCounter = 0;
+}
+
+btITaskScheduler::btITaskScheduler(const char* name)
+{
+	m_name = name;
+	m_savedThreadCounter = 0;
+	m_isActive = false;
+}
+
+void btITaskScheduler::activate()
+{
+	// gThreadCounter is used to assign a thread-index to each worker thread in a task scheduler.
+	// The main thread is always thread-index 0, and worker threads are numbered from 1 to 63 (BT_MAX_THREAD_COUNT-1)
+	// The thread-indexes need to be unique amongst the threads that can be running simultaneously.
+	// Since only one task scheduler can be used at a time, it is OK for a pair of threads that belong to different
+	// task schedulers to share the same thread index because they can't be running at the same time.
+	// So each task scheduler needs to keep its own thread counter value
+	if (!m_isActive)
+	{
+		gThreadCounter.mCounter = m_savedThreadCounter;  // restore saved thread counter
+		m_isActive = true;
+	}
+}
+
+void btITaskScheduler::deactivate()
+{
+	if (m_isActive)
+	{
+		m_savedThreadCounter = gThreadCounter.mCounter;  // save thread counter
+		m_isActive = false;
+	}
+}
+
+void btPushThreadsAreRunning()
+{
+	gThreadsRunningCounterMutex.lock();
+	gThreadsRunningCounter++;
+	gThreadsRunningCounterMutex.unlock();
+}
+
+void btPopThreadsAreRunning()
+{
+	gThreadsRunningCounterMutex.lock();
+	gThreadsRunningCounter--;
+	gThreadsRunningCounterMutex.unlock();
+}
+
+bool btThreadsAreRunning()
+{
+	return gThreadsRunningCounter != 0;
+}
+
+void btSetTaskScheduler(btITaskScheduler* ts)
+{
+	int threadId = btGetCurrentThreadIndex();  // make sure we call this on main thread at least once before any workers run
+	if (threadId != 0)
+	{
+		btAssert(!"btSetTaskScheduler must be called from the main thread!");
+		return;
+	}
+	if (gBtTaskScheduler)
+	{
+		// deactivate old task scheduler
+		gBtTaskScheduler->deactivate();
+	}
+	gBtTaskScheduler = ts;
+	if (ts)
+	{
+		// activate new task scheduler
+		ts->activate();
+	}
+}
+
+btITaskScheduler* btGetTaskScheduler()
+{
+	return gBtTaskScheduler;
+}
+
+void btParallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body)
+{
+#if BT_THREADSAFE
+
+#if BT_DETECT_BAD_THREAD_INDEX
+	if (!btThreadsAreRunning())
+	{
+		// clear out thread ids
+		for (int i = 0; i < BT_MAX_THREAD_COUNT; ++i)
+		{
+			gDebugThreadIds[i] = kInvalidThreadId;
+		}
+	}
+#endif  // #if BT_DETECT_BAD_THREAD_INDEX
+
+	btAssert(gBtTaskScheduler != NULL);  // call btSetTaskScheduler() with a valid task scheduler first!
+	gBtTaskScheduler->parallelFor(iBegin, iEnd, grainSize, body);
+
+#else  // #if BT_THREADSAFE
+
+	// non-parallel version of btParallelFor
+	btAssert(!"called btParallelFor in non-threadsafe build. enable BT_THREADSAFE");
+	body.forLoop(iBegin, iEnd);
+
+#endif  // #if BT_THREADSAFE
+}
+
+btScalar btParallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body)
+{
+#if BT_THREADSAFE
+
+#if BT_DETECT_BAD_THREAD_INDEX
+	if (!btThreadsAreRunning())
+	{
+		// clear out thread ids
+		for (int i = 0; i < BT_MAX_THREAD_COUNT; ++i)
+		{
+			gDebugThreadIds[i] = kInvalidThreadId;
+		}
+	}
+#endif  // #if BT_DETECT_BAD_THREAD_INDEX
+
+	btAssert(gBtTaskScheduler != NULL);  // call btSetTaskScheduler() with a valid task scheduler first!
+	return gBtTaskScheduler->parallelSum(iBegin, iEnd, grainSize, body);
+
+#else  // #if BT_THREADSAFE
+
+	// non-parallel version of btParallelSum
+	btAssert(!"called btParallelFor in non-threadsafe build. enable BT_THREADSAFE");
+	return body.sumLoop(iBegin, iEnd);
+
+#endif  //#else // #if BT_THREADSAFE
+}
+
+///
+/// btTaskSchedulerSequential -- non-threaded implementation of task scheduler
+///                              (really just useful for testing performance of single threaded vs multi)
+///
+class btTaskSchedulerSequential : public btITaskScheduler
+{
+public:
+	btTaskSchedulerSequential() : btITaskScheduler("Sequential") {}
+	virtual int getMaxNumThreads() const BT_OVERRIDE { return 1; }
+	virtual int getNumThreads() const BT_OVERRIDE { return 1; }
+	virtual void setNumThreads(int numThreads) BT_OVERRIDE {}
+	virtual void parallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelFor_sequential");
+		body.forLoop(iBegin, iEnd);
+	}
+	virtual btScalar parallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelSum_sequential");
+		return body.sumLoop(iBegin, iEnd);
+	}
+};
+
+#if BT_USE_OPENMP && BT_THREADSAFE
+///
+/// btTaskSchedulerOpenMP -- wrapper around OpenMP task scheduler
+///
+class btTaskSchedulerOpenMP : public btITaskScheduler
+{
+	int m_numThreads;
+
+public:
+	btTaskSchedulerOpenMP() : btITaskScheduler("OpenMP")
+	{
+		m_numThreads = 0;
+	}
+	virtual int getMaxNumThreads() const BT_OVERRIDE
+	{
+		return omp_get_max_threads();
+	}
+	virtual int getNumThreads() const BT_OVERRIDE
+	{
+		return m_numThreads;
+	}
+	virtual void setNumThreads(int numThreads) BT_OVERRIDE
+	{
+		// With OpenMP, because it is a standard with various implementations, we can't
+		// know for sure if every implementation has the same behavior of destroying all
+		// previous threads when resizing the threadpool
+		m_numThreads = (std::max)(1, (std::min)(int(BT_MAX_THREAD_COUNT), numThreads));
+		omp_set_num_threads(1);  // hopefully, all previous threads get destroyed here
+		omp_set_num_threads(m_numThreads);
+		m_savedThreadCounter = 0;
+		if (m_isActive)
+		{
+			btResetThreadIndexCounter();
+		}
+	}
+	virtual void parallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelFor_OpenMP");
+		btPushThreadsAreRunning();
+#pragma omp parallel for schedule(static, 1)
+		for (int i = iBegin; i < iEnd; i += grainSize)
+		{
+			BT_PROFILE("OpenMP_forJob");
+			body.forLoop(i, (std::min)(i + grainSize, iEnd));
+		}
+		btPopThreadsAreRunning();
+	}
+	virtual btScalar parallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelFor_OpenMP");
+		btPushThreadsAreRunning();
+		btScalar sum = btScalar(0);
+#pragma omp parallel for schedule(static, 1) reduction(+ \
+													   : sum)
+		for (int i = iBegin; i < iEnd; i += grainSize)
+		{
+			BT_PROFILE("OpenMP_sumJob");
+			sum += body.sumLoop(i, (std::min)(i + grainSize, iEnd));
+		}
+		btPopThreadsAreRunning();
+		return sum;
+	}
+};
+#endif  // #if BT_USE_OPENMP && BT_THREADSAFE
+
+#if BT_USE_TBB && BT_THREADSAFE
+///
+/// btTaskSchedulerTBB -- wrapper around Intel Threaded Building Blocks task scheduler
+///
+class btTaskSchedulerTBB : public btITaskScheduler
+{
+	int m_numThreads;
+	tbb::task_scheduler_init* m_tbbSchedulerInit;
+
+public:
+	btTaskSchedulerTBB() : btITaskScheduler("IntelTBB")
+	{
+		m_numThreads = 0;
+		m_tbbSchedulerInit = NULL;
+	}
+	~btTaskSchedulerTBB()
+	{
+		if (m_tbbSchedulerInit)
+		{
+			delete m_tbbSchedulerInit;
+			m_tbbSchedulerInit = NULL;
+		}
+	}
+
+	virtual int getMaxNumThreads() const BT_OVERRIDE
+	{
+		return tbb::task_scheduler_init::default_num_threads();
+	}
+	virtual int getNumThreads() const BT_OVERRIDE
+	{
+		return m_numThreads;
+	}
+	virtual void setNumThreads(int numThreads) BT_OVERRIDE
+	{
+		m_numThreads = (std::max)(1, (std::min)(int(BT_MAX_THREAD_COUNT), numThreads));
+		if (m_tbbSchedulerInit)
+		{
+			// destroys all previous threads
+			delete m_tbbSchedulerInit;
+			m_tbbSchedulerInit = NULL;
+		}
+		m_tbbSchedulerInit = new tbb::task_scheduler_init(m_numThreads);
+		m_savedThreadCounter = 0;
+		if (m_isActive)
+		{
+			btResetThreadIndexCounter();
+		}
+	}
+	struct ForBodyAdapter
+	{
+		const btIParallelForBody* mBody;
+
+		ForBodyAdapter(const btIParallelForBody* body) : mBody(body) {}
+		void operator()(const tbb::blocked_range<int>& range) const
+		{
+			BT_PROFILE("TBB_forJob");
+			mBody->forLoop(range.begin(), range.end());
+		}
+	};
+	virtual void parallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelFor_TBB");
+		ForBodyAdapter tbbBody(&body);
+		btPushThreadsAreRunning();
+		tbb::parallel_for(tbb::blocked_range<int>(iBegin, iEnd, grainSize),
+						  tbbBody,
+						  tbb::simple_partitioner());
+		btPopThreadsAreRunning();
+	}
+	struct SumBodyAdapter
+	{
+		const btIParallelSumBody* mBody;
+		btScalar mSum;
+
+		SumBodyAdapter(const btIParallelSumBody* body) : mBody(body), mSum(btScalar(0)) {}
+		SumBodyAdapter(const SumBodyAdapter& src, tbb::split) : mBody(src.mBody), mSum(btScalar(0)) {}
+		void join(const SumBodyAdapter& src) { mSum += src.mSum; }
+		void operator()(const tbb::blocked_range<int>& range)
+		{
+			BT_PROFILE("TBB_sumJob");
+			mSum += mBody->sumLoop(range.begin(), range.end());
+		}
+	};
+	virtual btScalar parallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelSum_TBB");
+		SumBodyAdapter tbbBody(&body);
+		btPushThreadsAreRunning();
+		tbb::parallel_deterministic_reduce(tbb::blocked_range<int>(iBegin, iEnd, grainSize), tbbBody);
+		btPopThreadsAreRunning();
+		return tbbBody.mSum;
+	}
+};
+#endif  // #if BT_USE_TBB && BT_THREADSAFE
+
+#if BT_USE_PPL && BT_THREADSAFE
+///
+/// btTaskSchedulerPPL -- wrapper around Microsoft Parallel Patterns Lib task scheduler
+///
+class btTaskSchedulerPPL : public btITaskScheduler
+{
+	int m_numThreads;
+	concurrency::combinable<btScalar> m_sum;  // for parallelSum
+public:
+	btTaskSchedulerPPL() : btITaskScheduler("PPL")
+	{
+		m_numThreads = 0;
+	}
+	virtual int getMaxNumThreads() const BT_OVERRIDE
+	{
+		return concurrency::GetProcessorCount();
+	}
+	virtual int getNumThreads() const BT_OVERRIDE
+	{
+		return m_numThreads;
+	}
+	virtual void setNumThreads(int numThreads) BT_OVERRIDE
+	{
+		// capping the thread count for PPL due to a thread-index issue
+		const int maxThreadCount = (std::min)(int(BT_MAX_THREAD_COUNT), 31);
+		m_numThreads = (std::max)(1, (std::min)(maxThreadCount, numThreads));
+		using namespace concurrency;
+		if (CurrentScheduler::Id() != -1)
+		{
+			CurrentScheduler::Detach();
+		}
+		SchedulerPolicy policy;
+		{
+			// PPL seems to destroy threads when threadpool is shrunk, but keeps reusing old threads
+			// force it to destroy old threads
+			policy.SetConcurrencyLimits(1, 1);
+			CurrentScheduler::Create(policy);
+			CurrentScheduler::Detach();
+		}
+		policy.SetConcurrencyLimits(m_numThreads, m_numThreads);
+		CurrentScheduler::Create(policy);
+		m_savedThreadCounter = 0;
+		if (m_isActive)
+		{
+			btResetThreadIndexCounter();
+		}
+	}
+	struct ForBodyAdapter
+	{
+		const btIParallelForBody* mBody;
+		int mGrainSize;
+		int mIndexEnd;
+
+		ForBodyAdapter(const btIParallelForBody* body, int grainSize, int end) : mBody(body), mGrainSize(grainSize), mIndexEnd(end) {}
+		void operator()(int i) const
+		{
+			BT_PROFILE("PPL_forJob");
+			mBody->forLoop(i, (std::min)(i + mGrainSize, mIndexEnd));
+		}
+	};
+	virtual void parallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelFor_PPL");
+		// PPL dispatch
+		ForBodyAdapter pplBody(&body, grainSize, iEnd);
+		btPushThreadsAreRunning();
+		// note: MSVC 2010 doesn't support partitioner args, so avoid them
+		concurrency::parallel_for(iBegin,
+								  iEnd,
+								  grainSize,
+								  pplBody);
+		btPopThreadsAreRunning();
+	}
+	struct SumBodyAdapter
+	{
+		const btIParallelSumBody* mBody;
+		concurrency::combinable<btScalar>* mSum;
+		int mGrainSize;
+		int mIndexEnd;
+
+		SumBodyAdapter(const btIParallelSumBody* body, concurrency::combinable<btScalar>* sum, int grainSize, int end) : mBody(body), mSum(sum), mGrainSize(grainSize), mIndexEnd(end) {}
+		void operator()(int i) const
+		{
+			BT_PROFILE("PPL_sumJob");
+			mSum->local() += mBody->sumLoop(i, (std::min)(i + mGrainSize, mIndexEnd));
+		}
+	};
+	static btScalar sumFunc(btScalar a, btScalar b) { return a + b; }
+	virtual btScalar parallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body) BT_OVERRIDE
+	{
+		BT_PROFILE("parallelSum_PPL");
+		m_sum.clear();
+		SumBodyAdapter pplBody(&body, &m_sum, grainSize, iEnd);
+		btPushThreadsAreRunning();
+		// note: MSVC 2010 doesn't support partitioner args, so avoid them
+		concurrency::parallel_for(iBegin,
+								  iEnd,
+								  grainSize,
+								  pplBody);
+		btPopThreadsAreRunning();
+		return m_sum.combine(sumFunc);
+	}
+};
+#endif  // #if BT_USE_PPL && BT_THREADSAFE
+
+// create a non-threaded task scheduler (always available)
+btITaskScheduler* btGetSequentialTaskScheduler()
+{
+	static btTaskSchedulerSequential sTaskScheduler;
+	return &sTaskScheduler;
+}
+
+// create an OpenMP task scheduler (if available, otherwise returns null)
+btITaskScheduler* btGetOpenMPTaskScheduler()
+{
+#if BT_USE_OPENMP && BT_THREADSAFE
+	static btTaskSchedulerOpenMP sTaskScheduler;
+	return &sTaskScheduler;
+#else
+	return NULL;
+#endif
+}
+
+// create an Intel TBB task scheduler (if available, otherwise returns null)
+btITaskScheduler* btGetTBBTaskScheduler()
+{
+#if BT_USE_TBB && BT_THREADSAFE
+	static btTaskSchedulerTBB sTaskScheduler;
+	return &sTaskScheduler;
+#else
+	return NULL;
+#endif
+}
+
+// create a PPL task scheduler (if available, otherwise returns null)
+btITaskScheduler* btGetPPLTaskScheduler()
+{
+#if BT_USE_PPL && BT_THREADSAFE
+	static btTaskSchedulerPPL sTaskScheduler;
+	return &sTaskScheduler;
+#else
+	return NULL;
+#endif
+}
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btThreads.h b/dali-physics/third-party/bullet3/src/LinearMath/btThreads.h
new file mode 100644
index 0000000..b2227e1
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btThreads.h
@@ -0,0 +1,177 @@
+/*
+Copyright (c) 2003-2014 Erwin Coumans  http://bullet.googlecode.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_THREADS_H
+#define BT_THREADS_H
+
+#include "btScalar.h"  // has definitions like SIMD_FORCE_INLINE
+
+#if defined(_MSC_VER) && _MSC_VER >= 1600
+// give us a compile error if any signatures of overriden methods is changed
+#define BT_OVERRIDE override
+#endif
+
+#ifndef BT_OVERRIDE
+#define BT_OVERRIDE
+#endif
+
+// Don't set this to larger than 64, without modifying btThreadSupportPosix
+// and btThreadSupportWin32. They use UINT64 bit-masks.
+const unsigned int BT_MAX_THREAD_COUNT = 64;  // only if BT_THREADSAFE is 1
+
+// for internal use only
+bool btIsMainThread();
+bool btThreadsAreRunning();
+unsigned int btGetCurrentThreadIndex();
+void btResetThreadIndexCounter();  // notify that all worker threads have been destroyed
+
+///
+/// btSpinMutex -- lightweight spin-mutex implemented with atomic ops, never puts
+///               a thread to sleep because it is designed to be used with a task scheduler
+///               which has one thread per core and the threads don't sleep until they
+///               run out of tasks. Not good for general purpose use.
+///
+class btSpinMutex
+{
+	int mLock;
+
+public:
+	btSpinMutex()
+	{
+		mLock = 0;
+	}
+	void lock();
+	void unlock();
+	bool tryLock();
+};
+
+//
+// NOTE: btMutex* is for internal Bullet use only
+//
+// If BT_THREADSAFE is undefined or 0, should optimize away to nothing.
+// This is good because for the single-threaded build of Bullet, any calls
+// to these functions will be optimized out.
+//
+// However, for users of the multi-threaded build of Bullet this is kind
+// of bad because if you call any of these functions from external code
+// (where BT_THREADSAFE is undefined) you will get unexpected race conditions.
+//
+SIMD_FORCE_INLINE void btMutexLock(btSpinMutex* mutex)
+{
+#if BT_THREADSAFE
+	mutex->lock();
+#else
+	(void)mutex;
+#endif  // #if BT_THREADSAFE
+}
+
+SIMD_FORCE_INLINE void btMutexUnlock(btSpinMutex* mutex)
+{
+#if BT_THREADSAFE
+	mutex->unlock();
+#else
+	(void)mutex;
+#endif  // #if BT_THREADSAFE
+}
+
+SIMD_FORCE_INLINE bool btMutexTryLock(btSpinMutex* mutex)
+{
+#if BT_THREADSAFE
+	return mutex->tryLock();
+#else
+	(void)mutex;
+	return true;
+#endif  // #if BT_THREADSAFE
+}
+
+//
+// btIParallelForBody -- subclass this to express work that can be done in parallel
+//
+class btIParallelForBody
+{
+public:
+	virtual ~btIParallelForBody() {}
+	virtual void forLoop(int iBegin, int iEnd) const = 0;
+};
+
+//
+// btIParallelSumBody -- subclass this to express work that can be done in parallel
+//                       and produces a sum over all loop elements
+//
+class btIParallelSumBody
+{
+public:
+	virtual ~btIParallelSumBody() {}
+	virtual btScalar sumLoop(int iBegin, int iEnd) const = 0;
+};
+
+//
+// btITaskScheduler -- subclass this to implement a task scheduler that can dispatch work to
+//                     worker threads
+//
+class btITaskScheduler
+{
+public:
+	btITaskScheduler(const char* name);
+	virtual ~btITaskScheduler() {}
+	const char* getName() const { return m_name; }
+
+	virtual int getMaxNumThreads() const = 0;
+	virtual int getNumThreads() const = 0;
+	virtual void setNumThreads(int numThreads) = 0;
+	virtual void parallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body) = 0;
+	virtual btScalar parallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body) = 0;
+	virtual void sleepWorkerThreadsHint() {}  // hint the task scheduler that we may not be using these threads for a little while
+
+	// internal use only
+	virtual void activate();
+	virtual void deactivate();
+
+protected:
+	const char* m_name;
+	unsigned int m_savedThreadCounter;
+	bool m_isActive;
+};
+
+// set the task scheduler to use for all calls to btParallelFor()
+// NOTE: you must set this prior to using any of the multi-threaded "Mt" classes
+void btSetTaskScheduler(btITaskScheduler* ts);
+
+// get the current task scheduler
+btITaskScheduler* btGetTaskScheduler();
+
+// get non-threaded task scheduler (always available)
+btITaskScheduler* btGetSequentialTaskScheduler();
+
+// create a default task scheduler (Win32 or pthreads based)
+btITaskScheduler* btCreateDefaultTaskScheduler();
+
+// get OpenMP task scheduler (if available, otherwise returns null)
+btITaskScheduler* btGetOpenMPTaskScheduler();
+
+// get Intel TBB task scheduler (if available, otherwise returns null)
+btITaskScheduler* btGetTBBTaskScheduler();
+
+// get PPL task scheduler (if available, otherwise returns null)
+btITaskScheduler* btGetPPLTaskScheduler();
+
+// btParallelFor -- call this to dispatch work like a for-loop
+//                 (iterations may be done out of order, so no dependencies are allowed)
+void btParallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body);
+
+// btParallelSum -- call this to dispatch work like a for-loop, returns the sum of all iterations
+//                 (iterations may be done out of order, so no dependencies are allowed)
+btScalar btParallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body);
+
+#endif
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btTransform.h b/dali-physics/third-party/bullet3/src/LinearMath/btTransform.h
new file mode 100644
index 0000000..b60c061
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btTransform.h
@@ -0,0 +1,287 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TRANSFORM_H
+#define BT_TRANSFORM_H
+
+#include "btMatrix3x3.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btTransformData btTransformDoubleData
+#else
+#define btTransformData btTransformFloatData
+#endif
+
+/**@brief The btTransform class supports rigid transforms with only translation and rotation and no scaling/shear.
+ *It can be used in combination with btVector3, btQuaternion and btMatrix3x3 linear algebra classes. */
+ATTRIBUTE_ALIGNED16(class)
+btTransform
+{
+	///Storage for the rotation
+	btMatrix3x3 m_basis;
+	///Storage for the translation
+	btVector3 m_origin;
+
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+	/**@brief No initialization constructor */
+	btTransform() {}
+	/**@brief Constructor from btQuaternion (optional btVector3 )
+   * @param q Rotation from quaternion 
+   * @param c Translation from Vector (default 0,0,0) */
+	explicit SIMD_FORCE_INLINE btTransform(const btQuaternion& q,
+										   const btVector3& c = btVector3(btScalar(0), btScalar(0), btScalar(0)))
+		: m_basis(q),
+		  m_origin(c)
+	{
+	}
+
+	/**@brief Constructor from btMatrix3x3 (optional btVector3)
+   * @param b Rotation from Matrix 
+   * @param c Translation from Vector default (0,0,0)*/
+	explicit SIMD_FORCE_INLINE btTransform(const btMatrix3x3& b,
+										   const btVector3& c = btVector3(btScalar(0), btScalar(0), btScalar(0)))
+		: m_basis(b),
+		  m_origin(c)
+	{
+	}
+	/**@brief Copy constructor */
+	SIMD_FORCE_INLINE btTransform(const btTransform& other)
+		: m_basis(other.m_basis),
+		  m_origin(other.m_origin)
+	{
+	}
+	/**@brief Assignment Operator */
+	SIMD_FORCE_INLINE btTransform& operator=(const btTransform& other)
+	{
+		m_basis = other.m_basis;
+		m_origin = other.m_origin;
+		return *this;
+	}
+
+	/**@brief Set the current transform as the value of the product of two transforms
+   * @param t1 Transform 1
+   * @param t2 Transform 2
+   * This = Transform1 * Transform2 */
+	SIMD_FORCE_INLINE void mult(const btTransform& t1, const btTransform& t2)
+	{
+		m_basis = t1.m_basis * t2.m_basis;
+		m_origin = t1(t2.m_origin);
+	}
+
+	/*		void multInverseLeft(const btTransform& t1, const btTransform& t2) {
+			btVector3 v = t2.m_origin - t1.m_origin;
+			m_basis = btMultTransposeLeft(t1.m_basis, t2.m_basis);
+			m_origin = v * t1.m_basis;
+		}
+		*/
+
+	/**@brief Return the transform of the vector */
+	SIMD_FORCE_INLINE btVector3 operator()(const btVector3& x) const
+	{
+		return x.dot3(m_basis[0], m_basis[1], m_basis[2]) + m_origin;
+	}
+
+	/**@brief Return the transform of the vector */
+	SIMD_FORCE_INLINE btVector3 operator*(const btVector3& x) const
+	{
+		return (*this)(x);
+	}
+
+	/**@brief Return the transform of the btQuaternion */
+	SIMD_FORCE_INLINE btQuaternion operator*(const btQuaternion& q) const
+	{
+		return getRotation() * q;
+	}
+
+	/**@brief Return the basis matrix for the rotation */
+	SIMD_FORCE_INLINE btMatrix3x3& getBasis() { return m_basis; }
+	/**@brief Return the basis matrix for the rotation */
+	SIMD_FORCE_INLINE const btMatrix3x3& getBasis() const { return m_basis; }
+
+	/**@brief Return the origin vector translation */
+	SIMD_FORCE_INLINE btVector3& getOrigin() { return m_origin; }
+	/**@brief Return the origin vector translation */
+	SIMD_FORCE_INLINE const btVector3& getOrigin() const { return m_origin; }
+
+	/**@brief Return a quaternion representing the rotation */
+	btQuaternion getRotation() const
+	{
+		btQuaternion q;
+		m_basis.getRotation(q);
+		return q;
+	}
+
+	/**@brief Set from an array 
+   * @param m A pointer to a 16 element array (12 rotation(row major padded on the right by 1), and 3 translation */
+	void setFromOpenGLMatrix(const btScalar* m)
+	{
+		m_basis.setFromOpenGLSubMatrix(m);
+		m_origin.setValue(m[12], m[13], m[14]);
+	}
+
+	/**@brief Fill an array representation
+   * @param m A pointer to a 16 element array (12 rotation(row major padded on the right by 1), and 3 translation */
+	void getOpenGLMatrix(btScalar * m) const
+	{
+		m_basis.getOpenGLSubMatrix(m);
+		m[12] = m_origin.x();
+		m[13] = m_origin.y();
+		m[14] = m_origin.z();
+		m[15] = btScalar(1.0);
+	}
+
+	/**@brief Set the translational element
+   * @param origin The vector to set the translation to */
+	SIMD_FORCE_INLINE void setOrigin(const btVector3& origin)
+	{
+		m_origin = origin;
+	}
+
+	SIMD_FORCE_INLINE btVector3 invXform(const btVector3& inVec) const;
+
+	/**@brief Set the rotational element by btMatrix3x3 */
+	SIMD_FORCE_INLINE void setBasis(const btMatrix3x3& basis)
+	{
+		m_basis = basis;
+	}
+
+	/**@brief Set the rotational element by btQuaternion */
+	SIMD_FORCE_INLINE void setRotation(const btQuaternion& q)
+	{
+		m_basis.setRotation(q);
+	}
+
+	/**@brief Set this transformation to the identity */
+	void setIdentity()
+	{
+		m_basis.setIdentity();
+		m_origin.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	}
+
+	/**@brief Multiply this Transform by another(this = this * another) 
+   * @param t The other transform */
+	btTransform& operator*=(const btTransform& t)
+	{
+		m_origin += m_basis * t.m_origin;
+		m_basis *= t.m_basis;
+		return *this;
+	}
+
+	/**@brief Return the inverse of this transform */
+	btTransform inverse() const
+	{
+		btMatrix3x3 inv = m_basis.transpose();
+		return btTransform(inv, inv * -m_origin);
+	}
+
+	/**@brief Return the inverse of this transform times the other transform
+   * @param t The other transform 
+   * return this.inverse() * the other */
+	btTransform inverseTimes(const btTransform& t) const;
+
+	/**@brief Return the product of this transform and the other */
+	btTransform operator*(const btTransform& t) const;
+
+	/**@brief Return an identity transform */
+	static const btTransform& getIdentity()
+	{
+		static const btTransform identityTransform(btMatrix3x3::getIdentity());
+		return identityTransform;
+	}
+
+	void serialize(struct btTransformData & dataOut) const;
+
+	void serializeFloat(struct btTransformFloatData & dataOut) const;
+
+	void deSerialize(const struct btTransformData& dataIn);
+
+	void deSerializeDouble(const struct btTransformDoubleData& dataIn);
+
+	void deSerializeFloat(const struct btTransformFloatData& dataIn);
+};
+
+SIMD_FORCE_INLINE btVector3
+btTransform::invXform(const btVector3& inVec) const
+{
+	btVector3 v = inVec - m_origin;
+	return (m_basis.transpose() * v);
+}
+
+SIMD_FORCE_INLINE btTransform
+btTransform::inverseTimes(const btTransform& t) const
+{
+	btVector3 v = t.getOrigin() - m_origin;
+	return btTransform(m_basis.transposeTimes(t.m_basis),
+					   v * m_basis);
+}
+
+SIMD_FORCE_INLINE btTransform
+	btTransform::operator*(const btTransform& t) const
+{
+	return btTransform(m_basis * t.m_basis,
+					   (*this)(t.m_origin));
+}
+
+/**@brief Test if two transforms have all elements equal */
+SIMD_FORCE_INLINE bool operator==(const btTransform& t1, const btTransform& t2)
+{
+	return (t1.getBasis() == t2.getBasis() &&
+			t1.getOrigin() == t2.getOrigin());
+}
+
+///for serialization
+struct btTransformFloatData
+{
+	btMatrix3x3FloatData m_basis;
+	btVector3FloatData m_origin;
+};
+
+struct btTransformDoubleData
+{
+	btMatrix3x3DoubleData m_basis;
+	btVector3DoubleData m_origin;
+};
+
+SIMD_FORCE_INLINE void btTransform::serialize(btTransformData& dataOut) const
+{
+	m_basis.serialize(dataOut.m_basis);
+	m_origin.serialize(dataOut.m_origin);
+}
+
+SIMD_FORCE_INLINE void btTransform::serializeFloat(btTransformFloatData& dataOut) const
+{
+	m_basis.serializeFloat(dataOut.m_basis);
+	m_origin.serializeFloat(dataOut.m_origin);
+}
+
+SIMD_FORCE_INLINE void btTransform::deSerialize(const btTransformData& dataIn)
+{
+	m_basis.deSerialize(dataIn.m_basis);
+	m_origin.deSerialize(dataIn.m_origin);
+}
+
+SIMD_FORCE_INLINE void btTransform::deSerializeFloat(const btTransformFloatData& dataIn)
+{
+	m_basis.deSerializeFloat(dataIn.m_basis);
+	m_origin.deSerializeFloat(dataIn.m_origin);
+}
+
+SIMD_FORCE_INLINE void btTransform::deSerializeDouble(const btTransformDoubleData& dataIn)
+{
+	m_basis.deSerializeDouble(dataIn.m_basis);
+	m_origin.deSerializeDouble(dataIn.m_origin);
+}
+
+#endif  //BT_TRANSFORM_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btTransformUtil.h b/dali-physics/third-party/bullet3/src/LinearMath/btTransformUtil.h
new file mode 100644
index 0000000..a5aab20
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btTransformUtil.h
@@ -0,0 +1,223 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_TRANSFORM_UTIL_H
+#define BT_TRANSFORM_UTIL_H
+
+#include "btTransform.h"
+#define ANGULAR_MOTION_THRESHOLD btScalar(0.5) * SIMD_HALF_PI
+
+SIMD_FORCE_INLINE btVector3 btAabbSupport(const btVector3& halfExtents, const btVector3& supportDir)
+{
+	return btVector3(supportDir.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
+					 supportDir.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
+					 supportDir.z() < btScalar(0.0) ? -halfExtents.z() : halfExtents.z());
+}
+
+/// Utils related to temporal transforms
+class btTransformUtil
+{
+public:
+	static void integrateTransform(const btTransform& curTrans, const btVector3& linvel, const btVector3& angvel, btScalar timeStep, btTransform& predictedTransform)
+	{
+		predictedTransform.setOrigin(curTrans.getOrigin() + linvel * timeStep);
+		//	#define QUATERNION_DERIVATIVE
+#ifdef QUATERNION_DERIVATIVE
+		btQuaternion predictedOrn = curTrans.getRotation();
+		predictedOrn += (angvel * predictedOrn) * (timeStep * btScalar(0.5));
+		predictedOrn.safeNormalize();
+#else
+		//Exponential map
+		//google for "Practical Parameterization of Rotations Using the Exponential Map", F. Sebastian Grassia
+
+		btVector3 axis;
+		btScalar fAngle2 = angvel.length2();
+		btScalar fAngle = 0;
+		if (fAngle2 > SIMD_EPSILON)
+		{
+			fAngle = btSqrt(fAngle2);
+		}
+
+		//limit the angular motion
+		if (fAngle * timeStep > ANGULAR_MOTION_THRESHOLD)
+		{
+			fAngle = ANGULAR_MOTION_THRESHOLD / timeStep;
+		}
+
+		if (fAngle < btScalar(0.001))
+		{
+			// use Taylor's expansions of sync function
+			axis = angvel * (btScalar(0.5) * timeStep - (timeStep * timeStep * timeStep) * (btScalar(0.020833333333)) * fAngle * fAngle);
+		}
+		else
+		{
+			// sync(fAngle) = sin(c*fAngle)/t
+			axis = angvel * (btSin(btScalar(0.5) * fAngle * timeStep) / fAngle);
+		}
+		btQuaternion dorn(axis.x(), axis.y(), axis.z(), btCos(fAngle * timeStep * btScalar(0.5)));
+		btQuaternion orn0 = curTrans.getRotation();
+
+		btQuaternion predictedOrn = dorn * orn0;
+		predictedOrn.safeNormalize();
+#endif
+		if (predictedOrn.length2() > SIMD_EPSILON)
+		{
+			predictedTransform.setRotation(predictedOrn);
+		}
+		else
+		{
+			predictedTransform.setBasis(curTrans.getBasis());
+		}
+	}
+
+	static void calculateVelocityQuaternion(const btVector3& pos0, const btVector3& pos1, const btQuaternion& orn0, const btQuaternion& orn1, btScalar timeStep, btVector3& linVel, btVector3& angVel)
+	{
+		linVel = (pos1 - pos0) / timeStep;
+		btVector3 axis;
+		btScalar angle;
+		if (orn0 != orn1)
+		{
+			calculateDiffAxisAngleQuaternion(orn0, orn1, axis, angle);
+			angVel = axis * angle / timeStep;
+		}
+		else
+		{
+			angVel.setValue(0, 0, 0);
+		}
+	}
+
+	static void calculateDiffAxisAngleQuaternion(const btQuaternion& orn0, const btQuaternion& orn1a, btVector3& axis, btScalar& angle)
+	{
+		btQuaternion orn1 = orn0.nearest(orn1a);
+		btQuaternion dorn = orn1 * orn0.inverse();
+		angle = dorn.getAngle();
+		axis = btVector3(dorn.x(), dorn.y(), dorn.z());
+		axis[3] = btScalar(0.);
+		//check for axis length
+		btScalar len = axis.length2();
+		if (len < SIMD_EPSILON * SIMD_EPSILON)
+			axis = btVector3(btScalar(1.), btScalar(0.), btScalar(0.));
+		else
+			axis /= btSqrt(len);
+	}
+
+	static void calculateVelocity(const btTransform& transform0, const btTransform& transform1, btScalar timeStep, btVector3& linVel, btVector3& angVel)
+	{
+		linVel = (transform1.getOrigin() - transform0.getOrigin()) / timeStep;
+		btVector3 axis;
+		btScalar angle;
+		calculateDiffAxisAngle(transform0, transform1, axis, angle);
+		angVel = axis * angle / timeStep;
+	}
+
+	static void calculateDiffAxisAngle(const btTransform& transform0, const btTransform& transform1, btVector3& axis, btScalar& angle)
+	{
+		btMatrix3x3 dmat = transform1.getBasis() * transform0.getBasis().inverse();
+		btQuaternion dorn;
+		dmat.getRotation(dorn);
+
+		///floating point inaccuracy can lead to w component > 1..., which breaks
+		dorn.normalize();
+
+		angle = dorn.getAngle();
+		axis = btVector3(dorn.x(), dorn.y(), dorn.z());
+		axis[3] = btScalar(0.);
+		//check for axis length
+		btScalar len = axis.length2();
+		if (len < SIMD_EPSILON * SIMD_EPSILON)
+			axis = btVector3(btScalar(1.), btScalar(0.), btScalar(0.));
+		else
+			axis /= btSqrt(len);
+	}
+};
+
+///The btConvexSeparatingDistanceUtil can help speed up convex collision detection
+///by conservatively updating a cached separating distance/vector instead of re-calculating the closest distance
+class btConvexSeparatingDistanceUtil
+{
+	btQuaternion m_ornA;
+	btQuaternion m_ornB;
+	btVector3 m_posA;
+	btVector3 m_posB;
+
+	btVector3 m_separatingNormal;
+
+	btScalar m_boundingRadiusA;
+	btScalar m_boundingRadiusB;
+	btScalar m_separatingDistance;
+
+public:
+	btConvexSeparatingDistanceUtil(btScalar boundingRadiusA, btScalar boundingRadiusB)
+		: m_boundingRadiusA(boundingRadiusA),
+		  m_boundingRadiusB(boundingRadiusB),
+		  m_separatingDistance(0.f)
+	{
+	}
+
+	btScalar getConservativeSeparatingDistance()
+	{
+		return m_separatingDistance;
+	}
+
+	void updateSeparatingDistance(const btTransform& transA, const btTransform& transB)
+	{
+		const btVector3& toPosA = transA.getOrigin();
+		const btVector3& toPosB = transB.getOrigin();
+		btQuaternion toOrnA = transA.getRotation();
+		btQuaternion toOrnB = transB.getRotation();
+
+		if (m_separatingDistance > 0.f)
+		{
+			btVector3 linVelA, angVelA, linVelB, angVelB;
+			btTransformUtil::calculateVelocityQuaternion(m_posA, toPosA, m_ornA, toOrnA, btScalar(1.), linVelA, angVelA);
+			btTransformUtil::calculateVelocityQuaternion(m_posB, toPosB, m_ornB, toOrnB, btScalar(1.), linVelB, angVelB);
+			btScalar maxAngularProjectedVelocity = angVelA.length() * m_boundingRadiusA + angVelB.length() * m_boundingRadiusB;
+			btVector3 relLinVel = (linVelB - linVelA);
+			btScalar relLinVelocLength = relLinVel.dot(m_separatingNormal);
+			if (relLinVelocLength < 0.f)
+			{
+				relLinVelocLength = 0.f;
+			}
+
+			btScalar projectedMotion = maxAngularProjectedVelocity + relLinVelocLength;
+			m_separatingDistance -= projectedMotion;
+		}
+
+		m_posA = toPosA;
+		m_posB = toPosB;
+		m_ornA = toOrnA;
+		m_ornB = toOrnB;
+	}
+
+	void initSeparatingDistance(const btVector3& separatingVector, btScalar separatingDistance, const btTransform& transA, const btTransform& transB)
+	{
+		m_separatingDistance = separatingDistance;
+
+		if (m_separatingDistance > 0.f)
+		{
+			m_separatingNormal = separatingVector;
+
+			const btVector3& toPosA = transA.getOrigin();
+			const btVector3& toPosB = transB.getOrigin();
+			btQuaternion toOrnA = transA.getRotation();
+			btQuaternion toOrnB = transB.getRotation();
+			m_posA = toPosA;
+			m_posB = toPosB;
+			m_ornA = toOrnA;
+			m_ornB = toOrnB;
+		}
+	}
+};
+
+#endif  //BT_TRANSFORM_UTIL_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btVector3.cpp b/dali-physics/third-party/bullet3/src/LinearMath/btVector3.cpp
new file mode 100644
index 0000000..55796c4
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btVector3.cpp
@@ -0,0 +1,1664 @@
+/*
+ Copyright (c) 2011 Apple Inc.
+ https://bulletphysics.org
+ 
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose, 
+ including commercial applications, and to alter it and redistribute it freely, 
+ subject to the following restrictions:
+ 
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ 
+ This source version has been altered.
+ */
+
+#if defined(_WIN32) || defined(__i386__)
+#define BT_USE_SSE_IN_API
+#endif
+
+#include "btVector3.h"
+
+#if defined BT_USE_SIMD_VECTOR3
+
+#if DEBUG
+#include <string.h>  //for memset
+#endif
+
+#ifdef __APPLE__
+#include <stdint.h>
+typedef float float4 __attribute__((vector_size(16)));
+#else
+#define float4 __m128
+#endif
+//typedef  uint32_t uint4 __attribute__ ((vector_size(16)));
+
+#if defined BT_USE_SSE || defined _WIN32
+
+#define LOG2_ARRAY_SIZE 6
+#define STACK_ARRAY_COUNT (1UL << LOG2_ARRAY_SIZE)
+
+#include <emmintrin.h>
+
+long _maxdot_large(const float *vv, const float *vec, unsigned long count, float *dotResult);
+long _maxdot_large(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	const float4 *vertices = (const float4 *)vv;
+	static const unsigned char indexTable[16] = {(unsigned char)-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0};
+	float4 dotMax = btAssign128(-BT_INFINITY, -BT_INFINITY, -BT_INFINITY, -BT_INFINITY);
+	float4 vvec = _mm_loadu_ps(vec);
+	float4 vHi = btCastiTo128f(_mm_shuffle_epi32(btCastfTo128i(vvec), 0xaa));  /// zzzz
+	float4 vLo = _mm_movelh_ps(vvec, vvec);                                    /// xyxy
+
+	long maxIndex = -1L;
+
+	size_t segment = 0;
+	float4 stack_array[STACK_ARRAY_COUNT];
+
+#if DEBUG
+	//memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) );
+#endif
+
+	size_t index;
+	float4 max;
+	// Faster loop without cleanup code for full tiles
+	for (segment = 0; segment + STACK_ARRAY_COUNT * 4 <= count; segment += STACK_ARRAY_COUNT * 4)
+	{
+		max = dotMax;
+
+		for (index = 0; index < STACK_ARRAY_COUNT; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			// It is too costly to keep the index of the max here. We will look for it again later.  We save a lot of work this way.
+		}
+
+		// If we found a new max
+		if (0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(max, dotMax)))
+		{
+			// copy the new max across all lanes of our max accumulator
+			max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0x4e));
+			max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0xb1));
+
+			dotMax = max;
+
+			// find first occurrence of that max
+			size_t test;
+			for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], max))); index++)  // local_count must be a multiple of 4
+			{
+			}
+			// record where it is.
+			maxIndex = 4 * index + segment + indexTable[test];
+		}
+	}
+
+	// account for work we've already done
+	count -= segment;
+
+	// Deal with the last < STACK_ARRAY_COUNT vectors
+	max = dotMax;
+	index = 0;
+
+	if (btUnlikely(count > 16))
+	{
+		for (; index + 4 <= count / 4; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+
+			// It is too costly to keep the index of the max here. We will look for it again later.  We save a lot of work this way.
+		}
+	}
+
+	size_t localCount = (count & -4L) - 4 * index;
+	if (localCount)
+	{
+#ifdef __APPLE__
+		float4 t0, t1, t2, t3, t4;
+		float4 *sap = &stack_array[index + localCount / 4];
+		vertices += localCount;  // counter the offset
+		size_t byteIndex = -(localCount) * sizeof(float);
+		//AT&T Code style assembly
+		asm volatile(
+			".align 4                                                                   \n\
+             0: movaps  %[max], %[t2]                            // move max out of the way to avoid propagating NaNs in max \n\
+          movaps  (%[vertices], %[byteIndex], 4),    %[t0]    // vertices[0]      \n\
+          movaps  16(%[vertices], %[byteIndex], 4),  %[t1]    // vertices[1]      \n\
+          movaps  %[t0], %[max]                               // vertices[0]      \n\
+          movlhps %[t1], %[max]                               // x0y0x1y1         \n\
+         movaps  32(%[vertices], %[byteIndex], 4),  %[t3]    // vertices[2]      \n\
+         movaps  48(%[vertices], %[byteIndex], 4),  %[t4]    // vertices[3]      \n\
+          mulps   %[vLo], %[max]                              // x0y0x1y1 * vLo   \n\
+         movhlps %[t0], %[t1]                                // z0w0z1w1         \n\
+         movaps  %[t3], %[t0]                                // vertices[2]      \n\
+         movlhps %[t4], %[t0]                                // x2y2x3y3         \n\
+         mulps   %[vLo], %[t0]                               // x2y2x3y3 * vLo   \n\
+          movhlps %[t3], %[t4]                                // z2w2z3w3         \n\
+          shufps  $0x88, %[t4], %[t1]                         // z0z1z2z3         \n\
+          mulps   %[vHi], %[t1]                               // z0z1z2z3 * vHi   \n\
+         movaps  %[max], %[t3]                               // x0y0x1y1 * vLo   \n\
+         shufps  $0x88, %[t0], %[max]                        // x0x1x2x3 * vLo.x \n\
+         shufps  $0xdd, %[t0], %[t3]                         // y0y1y2y3 * vLo.y \n\
+         addps   %[t3], %[max]                               // x + y            \n\
+         addps   %[t1], %[max]                               // x + y + z        \n\
+         movaps  %[max], (%[sap], %[byteIndex])              // record result for later scrutiny \n\
+         maxps   %[t2], %[max]                               // record max, restore max   \n\
+         add     $16, %[byteIndex]                           // advance loop counter\n\
+         jnz     0b                                          \n\
+     "
+			: [max] "+x"(max), [t0] "=&x"(t0), [t1] "=&x"(t1), [t2] "=&x"(t2), [t3] "=&x"(t3), [t4] "=&x"(t4), [byteIndex] "+r"(byteIndex)
+			: [vLo] "x"(vLo), [vHi] "x"(vHi), [vertices] "r"(vertices), [sap] "r"(sap)
+			: "memory", "cc");
+		index += localCount / 4;
+#else
+		{
+			for (unsigned int i = 0; i < localCount / 4; i++, index++)
+			{  // do four dot products at a time. Carefully avoid touching the w element.
+				float4 v0 = vertices[0];
+				float4 v1 = vertices[1];
+				float4 v2 = vertices[2];
+				float4 v3 = vertices[3];
+				vertices += 4;
+
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+				float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+				float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+				lo0 = lo0 * vLo;
+				lo1 = lo1 * vLo;
+				float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+				float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+				z = z * vHi;
+				x = x + y;
+				x = x + z;
+				stack_array[index] = x;
+				max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+			}
+		}
+#endif  //__APPLE__
+	}
+
+	// process the last few points
+	if (count & 3)
+	{
+		float4 v0, v1, v2, x, y, z;
+		switch (count & 3)
+		{
+			case 3:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				v2 = vertices[2];
+
+				// Calculate 3 dot products, transpose, duplicate v2
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // xyxy.lo
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z?z?.lo
+				lo0 = lo0 * vLo;
+				z = _mm_shuffle_ps(hi0, v2, 0xa8);  // z0z1z2z2
+				z = z * vHi;
+				float4 lo1 = _mm_movelh_ps(v2, v2);  // xyxy
+				lo1 = lo1 * vLo;
+				x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			}
+			break;
+			case 2:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				float4 xy = _mm_movelh_ps(v0, v1);
+				z = _mm_movehl_ps(v1, v0);
+				xy = xy * vLo;
+				z = _mm_shuffle_ps(z, z, 0xa8);
+				x = _mm_shuffle_ps(xy, xy, 0xa8);
+				y = _mm_shuffle_ps(xy, xy, 0xfd);
+				z = z * vHi;
+			}
+			break;
+			case 1:
+			{
+				float4 xy = vertices[0];
+				z = _mm_shuffle_ps(xy, xy, 0xaa);
+				xy = xy * vLo;
+				z = z * vHi;
+				x = _mm_shuffle_ps(xy, xy, 0);
+				y = _mm_shuffle_ps(xy, xy, 0x55);
+			}
+			break;
+		}
+		x = x + y;
+		x = x + z;
+		stack_array[index] = x;
+		max = _mm_max_ps(x, max);  // control the order here so that max is never NaN even if x is nan
+		index++;
+	}
+
+	// if we found a new max.
+	if (0 == segment || 0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(max, dotMax)))
+	{  // we found a new max. Search for it
+		// find max across the max vector, place in all elements of max -- big latency hit here
+		max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0x4e));
+		max = _mm_max_ps(max, (float4)_mm_shuffle_ps(max, max, 0xb1));
+
+		// It is slightly faster to do this part in scalar code when count < 8. However, the common case for
+		// this where it actually makes a difference is handled in the early out at the top of the function,
+		// so it is less than a 1% difference here. I opted for improved code size, fewer branches and reduced
+		// complexity, and removed it.
+
+		dotMax = max;
+
+		// scan for the first occurence of max in the array
+		size_t test;
+		for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], max))); index++)  // local_count must be a multiple of 4
+		{
+		}
+		maxIndex = 4 * index + segment + indexTable[test];
+	}
+
+	_mm_store_ss(dotResult, dotMax);
+	return maxIndex;
+}
+
+long _mindot_large(const float *vv, const float *vec, unsigned long count, float *dotResult);
+
+long _mindot_large(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	const float4 *vertices = (const float4 *)vv;
+	static const unsigned char indexTable[16] = {(unsigned char)-1, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0};
+	float4 dotmin = btAssign128(BT_INFINITY, BT_INFINITY, BT_INFINITY, BT_INFINITY);
+	float4 vvec = _mm_loadu_ps(vec);
+	float4 vHi = btCastiTo128f(_mm_shuffle_epi32(btCastfTo128i(vvec), 0xaa));  /// zzzz
+	float4 vLo = _mm_movelh_ps(vvec, vvec);                                    /// xyxy
+
+	long minIndex = -1L;
+
+	size_t segment = 0;
+	float4 stack_array[STACK_ARRAY_COUNT];
+
+#if DEBUG
+	//memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) );
+#endif
+
+	size_t index;
+	float4 min;
+	// Faster loop without cleanup code for full tiles
+	for (segment = 0; segment + STACK_ARRAY_COUNT * 4 <= count; segment += STACK_ARRAY_COUNT * 4)
+	{
+		min = dotmin;
+
+		for (index = 0; index < STACK_ARRAY_COUNT; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			// It is too costly to keep the index of the min here. We will look for it again later.  We save a lot of work this way.
+		}
+
+		// If we found a new min
+		if (0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(min, dotmin)))
+		{
+			// copy the new min across all lanes of our min accumulator
+			min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0x4e));
+			min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0xb1));
+
+			dotmin = min;
+
+			// find first occurrence of that min
+			size_t test;
+			for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], min))); index++)  // local_count must be a multiple of 4
+			{
+			}
+			// record where it is.
+			minIndex = 4 * index + segment + indexTable[test];
+		}
+	}
+
+	// account for work we've already done
+	count -= segment;
+
+	// Deal with the last < STACK_ARRAY_COUNT vectors
+	min = dotmin;
+	index = 0;
+
+	if (btUnlikely(count > 16))
+	{
+		for (; index + 4 <= count / 4; index += 4)
+		{  // do four dot products at a time. Carefully avoid touching the w element.
+			float4 v0 = vertices[0];
+			float4 v1 = vertices[1];
+			float4 v2 = vertices[2];
+			float4 v3 = vertices[3];
+			vertices += 4;
+
+			float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 1] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 2] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			v0 = vertices[0];
+			v1 = vertices[1];
+			v2 = vertices[2];
+			v3 = vertices[3];
+			vertices += 4;
+
+			lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+			hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+			lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+			hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+			lo0 = lo0 * vLo;
+			lo1 = lo1 * vLo;
+			z = _mm_shuffle_ps(hi0, hi1, 0x88);
+			x = _mm_shuffle_ps(lo0, lo1, 0x88);
+			y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			z = z * vHi;
+			x = x + y;
+			x = x + z;
+			stack_array[index + 3] = x;
+			min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+
+			// It is too costly to keep the index of the min here. We will look for it again later.  We save a lot of work this way.
+		}
+	}
+
+	size_t localCount = (count & -4L) - 4 * index;
+	if (localCount)
+	{
+#ifdef __APPLE__
+		vertices += localCount;  // counter the offset
+		float4 t0, t1, t2, t3, t4;
+		size_t byteIndex = -(localCount) * sizeof(float);
+		float4 *sap = &stack_array[index + localCount / 4];
+
+		asm volatile(
+			".align 4                                                                   \n\
+             0: movaps  %[min], %[t2]                            // move min out of the way to avoid propagating NaNs in min \n\
+             movaps  (%[vertices], %[byteIndex], 4),    %[t0]    // vertices[0]      \n\
+             movaps  16(%[vertices], %[byteIndex], 4),  %[t1]    // vertices[1]      \n\
+             movaps  %[t0], %[min]                               // vertices[0]      \n\
+             movlhps %[t1], %[min]                               // x0y0x1y1         \n\
+             movaps  32(%[vertices], %[byteIndex], 4),  %[t3]    // vertices[2]      \n\
+             movaps  48(%[vertices], %[byteIndex], 4),  %[t4]    // vertices[3]      \n\
+             mulps   %[vLo], %[min]                              // x0y0x1y1 * vLo   \n\
+             movhlps %[t0], %[t1]                                // z0w0z1w1         \n\
+             movaps  %[t3], %[t0]                                // vertices[2]      \n\
+             movlhps %[t4], %[t0]                                // x2y2x3y3         \n\
+             movhlps %[t3], %[t4]                                // z2w2z3w3         \n\
+             mulps   %[vLo], %[t0]                               // x2y2x3y3 * vLo   \n\
+             shufps  $0x88, %[t4], %[t1]                         // z0z1z2z3         \n\
+             mulps   %[vHi], %[t1]                               // z0z1z2z3 * vHi   \n\
+             movaps  %[min], %[t3]                               // x0y0x1y1 * vLo   \n\
+             shufps  $0x88, %[t0], %[min]                        // x0x1x2x3 * vLo.x \n\
+             shufps  $0xdd, %[t0], %[t3]                         // y0y1y2y3 * vLo.y \n\
+             addps   %[t3], %[min]                               // x + y            \n\
+             addps   %[t1], %[min]                               // x + y + z        \n\
+             movaps  %[min], (%[sap], %[byteIndex])              // record result for later scrutiny \n\
+             minps   %[t2], %[min]                               // record min, restore min   \n\
+             add     $16, %[byteIndex]                           // advance loop counter\n\
+             jnz     0b                                          \n\
+             "
+			: [min] "+x"(min), [t0] "=&x"(t0), [t1] "=&x"(t1), [t2] "=&x"(t2), [t3] "=&x"(t3), [t4] "=&x"(t4), [byteIndex] "+r"(byteIndex)
+			: [vLo] "x"(vLo), [vHi] "x"(vHi), [vertices] "r"(vertices), [sap] "r"(sap)
+			: "memory", "cc");
+		index += localCount / 4;
+#else
+		{
+			for (unsigned int i = 0; i < localCount / 4; i++, index++)
+			{  // do four dot products at a time. Carefully avoid touching the w element.
+				float4 v0 = vertices[0];
+				float4 v1 = vertices[1];
+				float4 v2 = vertices[2];
+				float4 v3 = vertices[3];
+				vertices += 4;
+
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // x0y0x1y1
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z0?0z1?1
+				float4 lo1 = _mm_movelh_ps(v2, v3);  // x2y2x3y3
+				float4 hi1 = _mm_movehl_ps(v3, v2);  // z2?2z3?3
+
+				lo0 = lo0 * vLo;
+				lo1 = lo1 * vLo;
+				float4 z = _mm_shuffle_ps(hi0, hi1, 0x88);
+				float4 x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				float4 y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+				z = z * vHi;
+				x = x + y;
+				x = x + z;
+				stack_array[index] = x;
+				min = _mm_min_ps(x, min);  // control the order here so that max is never NaN even if x is nan
+			}
+		}
+
+#endif
+	}
+
+	// process the last few points
+	if (count & 3)
+	{
+		float4 v0, v1, v2, x, y, z;
+		switch (count & 3)
+		{
+			case 3:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				v2 = vertices[2];
+
+				// Calculate 3 dot products, transpose, duplicate v2
+				float4 lo0 = _mm_movelh_ps(v0, v1);  // xyxy.lo
+				float4 hi0 = _mm_movehl_ps(v1, v0);  // z?z?.lo
+				lo0 = lo0 * vLo;
+				z = _mm_shuffle_ps(hi0, v2, 0xa8);  // z0z1z2z2
+				z = z * vHi;
+				float4 lo1 = _mm_movelh_ps(v2, v2);  // xyxy
+				lo1 = lo1 * vLo;
+				x = _mm_shuffle_ps(lo0, lo1, 0x88);
+				y = _mm_shuffle_ps(lo0, lo1, 0xdd);
+			}
+			break;
+			case 2:
+			{
+				v0 = vertices[0];
+				v1 = vertices[1];
+				float4 xy = _mm_movelh_ps(v0, v1);
+				z = _mm_movehl_ps(v1, v0);
+				xy = xy * vLo;
+				z = _mm_shuffle_ps(z, z, 0xa8);
+				x = _mm_shuffle_ps(xy, xy, 0xa8);
+				y = _mm_shuffle_ps(xy, xy, 0xfd);
+				z = z * vHi;
+			}
+			break;
+			case 1:
+			{
+				float4 xy = vertices[0];
+				z = _mm_shuffle_ps(xy, xy, 0xaa);
+				xy = xy * vLo;
+				z = z * vHi;
+				x = _mm_shuffle_ps(xy, xy, 0);
+				y = _mm_shuffle_ps(xy, xy, 0x55);
+			}
+			break;
+		}
+		x = x + y;
+		x = x + z;
+		stack_array[index] = x;
+		min = _mm_min_ps(x, min);  // control the order here so that min is never NaN even if x is nan
+		index++;
+	}
+
+	// if we found a new min.
+	if (0 == segment || 0xf != _mm_movemask_ps((float4)_mm_cmpeq_ps(min, dotmin)))
+	{  // we found a new min. Search for it
+		// find min across the min vector, place in all elements of min -- big latency hit here
+		min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0x4e));
+		min = _mm_min_ps(min, (float4)_mm_shuffle_ps(min, min, 0xb1));
+
+		// It is slightly faster to do this part in scalar code when count < 8. However, the common case for
+		// this where it actually makes a difference is handled in the early out at the top of the function,
+		// so it is less than a 1% difference here. I opted for improved code size, fewer branches and reduced
+		// complexity, and removed it.
+
+		dotmin = min;
+
+		// scan for the first occurence of min in the array
+		size_t test;
+		for (index = 0; 0 == (test = _mm_movemask_ps(_mm_cmpeq_ps(stack_array[index], min))); index++)  // local_count must be a multiple of 4
+		{
+		}
+		minIndex = 4 * index + segment + indexTable[test];
+	}
+
+	_mm_store_ss(dotResult, dotmin);
+	return minIndex;
+}
+
+#elif defined BT_USE_NEON
+
+#define ARM_NEON_GCC_COMPATIBILITY 1
+#include <arm_neon.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>  //for sysctlbyname
+
+static long _maxdot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long _maxdot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long _maxdot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long _mindot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long _mindot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult);
+static long _mindot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult);
+
+long (*_maxdot_large)(const float *vv, const float *vec, unsigned long count, float *dotResult) = _maxdot_large_sel;
+long (*_mindot_large)(const float *vv, const float *vec, unsigned long count, float *dotResult) = _mindot_large_sel;
+
+static inline uint32_t btGetCpuCapabilities(void)
+{
+	static uint32_t capabilities = 0;
+	static bool testedCapabilities = false;
+
+	if (0 == testedCapabilities)
+	{
+		uint32_t hasFeature = 0;
+		size_t featureSize = sizeof(hasFeature);
+		int err = sysctlbyname("hw.optional.neon_hpfp", &hasFeature, &featureSize, NULL, 0);
+
+		if (0 == err && hasFeature)
+			capabilities |= 0x2000;
+
+		testedCapabilities = true;
+	}
+
+	return capabilities;
+}
+
+static long _maxdot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	if (btGetCpuCapabilities() & 0x2000)
+		_maxdot_large = _maxdot_large_v1;
+	else
+		_maxdot_large = _maxdot_large_v0;
+
+	return _maxdot_large(vv, vec, count, dotResult);
+}
+
+static long _mindot_large_sel(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	if (btGetCpuCapabilities() & 0x2000)
+		_mindot_large = _mindot_large_v1;
+	else
+		_mindot_large = _mindot_large_v0;
+
+	return _mindot_large(vv, vec, count, dotResult);
+}
+
+#if defined __arm__
+#define vld1q_f32_aligned_postincrement(_ptr) ({ float32x4_t _r; asm( "vld1.f32 {%0}, [%1, :128]!\n" : "=w" (_r), "+r" (_ptr) ); /*return*/ _r; })
+#else
+//support 64bit arm
+#define vld1q_f32_aligned_postincrement(_ptr) ({ float32x4_t _r = ((float32x4_t*)(_ptr))[0]; (_ptr) = (const float*) ((const char*)(_ptr) + 16L); /*return*/ _r; })
+#endif
+
+long _maxdot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	unsigned long i = 0;
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x2_t vLo = vget_low_f32(vvec);
+	float32x2_t vHi = vdup_lane_f32(vget_high_f32(vvec), 0);
+	float32x2_t dotMaxLo = (float32x2_t){-BT_INFINITY, -BT_INFINITY};
+	float32x2_t dotMaxHi = (float32x2_t){-BT_INFINITY, -BT_INFINITY};
+	uint32x2_t indexLo = (uint32x2_t){0, 1};
+	uint32x2_t indexHi = (uint32x2_t){2, 3};
+	uint32x2_t iLo = (uint32x2_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1)};
+	uint32x2_t iHi = (uint32x2_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1)};
+	const uint32x2_t four = (uint32x2_t){4, 4};
+
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+		uint32x2_t maskHi = vcgt_f32(rHi, dotMaxHi);
+		dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+		dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		zLo = vmul_f32(z0.val[0], vHi);
+		zHi = vmul_f32(z1.val[0], vHi);
+
+		rLo = vpadd_f32(xy0, xy1);
+		rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		maskLo = vcgt_f32(rLo, dotMaxLo);
+		maskHi = vcgt_f32(rHi, dotMaxHi);
+		dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+		dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+		uint32x2_t maskHi = vcgt_f32(rHi, dotMaxHi);
+		dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+		dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+			float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+			float32x2_t zHi = vmul_f32(vdup_lane_f32(vget_high_f32(v2), 0), vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			float32x2_t rHi = vpadd_f32(xy2, xy2);
+			rLo = vadd_f32(rLo, zLo);
+			rHi = vadd_f32(rHi, zHi);
+
+			uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+			uint32x2_t maskHi = vcgt_f32(rHi, dotMaxHi);
+			dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+			dotMaxHi = vbsl_f32(maskHi, rHi, dotMaxHi);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+			iHi = vbsl_u32(maskHi, indexHi, iHi);
+		}
+		break;
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			rLo = vadd_f32(rLo, zLo);
+
+			uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+			dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t z0 = vdup_lane_f32(vget_high_f32(v0), 0);
+			float32x2_t zLo = vmul_f32(z0, vHi);
+			float32x2_t rLo = vpadd_f32(xy0, xy0);
+			rLo = vadd_f32(rLo, zLo);
+			uint32x2_t maskLo = vcgt_f32(rLo, dotMaxLo);
+			dotMaxLo = vbsl_f32(maskLo, rLo, dotMaxLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vcgt_f32(dotMaxHi, dotMaxLo);
+	dotMaxLo = vbsl_f32(mask, dotMaxHi, dotMaxLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	// select best answer between even and odd results
+	dotMaxHi = vdup_lane_f32(dotMaxLo, 1);
+	iHi = vdup_lane_u32(iLo, 1);
+	mask = vcgt_f32(dotMaxHi, dotMaxLo);
+	dotMaxLo = vbsl_f32(mask, dotMaxHi, dotMaxLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	*dotResult = vget_lane_f32(dotMaxLo, 0);
+	return vget_lane_u32(iLo, 0);
+}
+
+long _maxdot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x4_t vLo = vcombine_f32(vget_low_f32(vvec), vget_low_f32(vvec));
+	float32x4_t vHi = vdupq_lane_f32(vget_high_f32(vvec), 0);
+	const uint32x4_t four = (uint32x4_t){4, 4, 4, 4};
+	uint32x4_t local_index = (uint32x4_t){0, 1, 2, 3};
+	uint32x4_t index = (uint32x4_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), static_cast<uint32_t>(-1)};
+	float32x4_t maxDot = (float32x4_t){-BT_INFINITY, -BT_INFINITY, -BT_INFINITY, -BT_INFINITY};
+
+	unsigned long i = 0;
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcgtq_f32(x, maxDot);
+		maxDot = vbslq_f32(mask, x, maxDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		zb = vuzpq_f32(z0, z1);
+		z = vmulq_f32(zb.val[0], vHi);
+		xy = vuzpq_f32(xy0, xy1);
+		x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		mask = vcgtq_f32(x, maxDot);
+		maxDot = vbslq_f32(mask, x, maxDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcgtq_f32(x, maxDot);
+		maxDot = vbslq_f32(mask, x, maxDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v2));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v2));
+
+			xy0 = vmulq_f32(xy0, vLo);
+			xy1 = vmulq_f32(xy1, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z1);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcgtq_f32(x, maxDot);
+			maxDot = vbslq_f32(mask, x, maxDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z0);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcgtq_f32(x, maxDot);
+			maxDot = vbslq_f32(mask, x, maxDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v0));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z = vdupq_lane_f32(vget_high_f32(v0), 0);
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			z = vmulq_f32(z, vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcgtq_f32(x, maxDot);
+			maxDot = vbslq_f32(mask, x, maxDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vcgt_f32(vget_high_f32(maxDot), vget_low_f32(maxDot));
+	float32x2_t maxDot2 = vbsl_f32(mask, vget_high_f32(maxDot), vget_low_f32(maxDot));
+	uint32x2_t index2 = vbsl_u32(mask, vget_high_u32(index), vget_low_u32(index));
+
+	// select best answer between even and odd results
+	float32x2_t maxDotO = vdup_lane_f32(maxDot2, 1);
+	uint32x2_t indexHi = vdup_lane_u32(index2, 1);
+	mask = vcgt_f32(maxDotO, maxDot2);
+	maxDot2 = vbsl_f32(mask, maxDotO, maxDot2);
+	index2 = vbsl_u32(mask, indexHi, index2);
+
+	*dotResult = vget_lane_f32(maxDot2, 0);
+	return vget_lane_u32(index2, 0);
+}
+
+long _mindot_large_v0(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	unsigned long i = 0;
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x2_t vLo = vget_low_f32(vvec);
+	float32x2_t vHi = vdup_lane_f32(vget_high_f32(vvec), 0);
+	float32x2_t dotMinLo = (float32x2_t){BT_INFINITY, BT_INFINITY};
+	float32x2_t dotMinHi = (float32x2_t){BT_INFINITY, BT_INFINITY};
+	uint32x2_t indexLo = (uint32x2_t){0, 1};
+	uint32x2_t indexHi = (uint32x2_t){2, 3};
+	uint32x2_t iLo = (uint32x2_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1)};
+	uint32x2_t iHi = (uint32x2_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1)};
+	const uint32x2_t four = (uint32x2_t){4, 4};
+
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+		uint32x2_t maskHi = vclt_f32(rHi, dotMinHi);
+		dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+		dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		zLo = vmul_f32(z0.val[0], vHi);
+		zHi = vmul_f32(z1.val[0], vHi);
+
+		rLo = vpadd_f32(xy0, xy1);
+		rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		maskLo = vclt_f32(rLo, dotMinLo);
+		maskHi = vclt_f32(rHi, dotMinHi);
+		dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+		dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+		float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+		float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+		float32x2_t xy3 = vmul_f32(vget_low_f32(v3), vLo);
+
+		float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x2x2_t z1 = vtrn_f32(vget_high_f32(v2), vget_high_f32(v3));
+		float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+		float32x2_t zHi = vmul_f32(z1.val[0], vHi);
+
+		float32x2_t rLo = vpadd_f32(xy0, xy1);
+		float32x2_t rHi = vpadd_f32(xy2, xy3);
+		rLo = vadd_f32(rLo, zLo);
+		rHi = vadd_f32(rHi, zHi);
+
+		uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+		uint32x2_t maskHi = vclt_f32(rHi, dotMinHi);
+		dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+		dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+		iLo = vbsl_u32(maskLo, indexLo, iLo);
+		iHi = vbsl_u32(maskHi, indexHi, iHi);
+		indexLo = vadd_u32(indexLo, four);
+		indexHi = vadd_u32(indexHi, four);
+	}
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+			float32x2_t xy2 = vmul_f32(vget_low_f32(v2), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+			float32x2_t zHi = vmul_f32(vdup_lane_f32(vget_high_f32(v2), 0), vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			float32x2_t rHi = vpadd_f32(xy2, xy2);
+			rLo = vadd_f32(rLo, zLo);
+			rHi = vadd_f32(rHi, zHi);
+
+			uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+			uint32x2_t maskHi = vclt_f32(rHi, dotMinHi);
+			dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+			dotMinHi = vbsl_f32(maskHi, rHi, dotMinHi);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+			iHi = vbsl_u32(maskHi, indexHi, iHi);
+		}
+		break;
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t xy1 = vmul_f32(vget_low_f32(v1), vLo);
+
+			float32x2x2_t z0 = vtrn_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x2_t zLo = vmul_f32(z0.val[0], vHi);
+
+			float32x2_t rLo = vpadd_f32(xy0, xy1);
+			rLo = vadd_f32(rLo, zLo);
+
+			uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+			dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x2_t xy0 = vmul_f32(vget_low_f32(v0), vLo);
+			float32x2_t z0 = vdup_lane_f32(vget_high_f32(v0), 0);
+			float32x2_t zLo = vmul_f32(z0, vHi);
+			float32x2_t rLo = vpadd_f32(xy0, xy0);
+			rLo = vadd_f32(rLo, zLo);
+			uint32x2_t maskLo = vclt_f32(rLo, dotMinLo);
+			dotMinLo = vbsl_f32(maskLo, rLo, dotMinLo);
+			iLo = vbsl_u32(maskLo, indexLo, iLo);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vclt_f32(dotMinHi, dotMinLo);
+	dotMinLo = vbsl_f32(mask, dotMinHi, dotMinLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	// select best answer between even and odd results
+	dotMinHi = vdup_lane_f32(dotMinLo, 1);
+	iHi = vdup_lane_u32(iLo, 1);
+	mask = vclt_f32(dotMinHi, dotMinLo);
+	dotMinLo = vbsl_f32(mask, dotMinHi, dotMinLo);
+	iLo = vbsl_u32(mask, iHi, iLo);
+
+	*dotResult = vget_lane_f32(dotMinLo, 0);
+	return vget_lane_u32(iLo, 0);
+}
+
+long _mindot_large_v1(const float *vv, const float *vec, unsigned long count, float *dotResult)
+{
+	float32x4_t vvec = vld1q_f32_aligned_postincrement(vec);
+	float32x4_t vLo = vcombine_f32(vget_low_f32(vvec), vget_low_f32(vvec));
+	float32x4_t vHi = vdupq_lane_f32(vget_high_f32(vvec), 0);
+	const uint32x4_t four = (uint32x4_t){4, 4, 4, 4};
+	uint32x4_t local_index = (uint32x4_t){0, 1, 2, 3};
+	uint32x4_t index = (uint32x4_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), static_cast<uint32_t>(-1)};
+	float32x4_t minDot = (float32x4_t){BT_INFINITY, BT_INFINITY, BT_INFINITY, BT_INFINITY};
+
+	unsigned long i = 0;
+	for (; i + 8 <= count; i += 8)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcltq_f32(x, minDot);
+		minDot = vbslq_f32(mask, x, minDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+
+		v0 = vld1q_f32_aligned_postincrement(vv);
+		v1 = vld1q_f32_aligned_postincrement(vv);
+		v2 = vld1q_f32_aligned_postincrement(vv);
+		v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		zb = vuzpq_f32(z0, z1);
+		z = vmulq_f32(zb.val[0], vHi);
+		xy = vuzpq_f32(xy0, xy1);
+		x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		mask = vcltq_f32(x, minDot);
+		minDot = vbslq_f32(mask, x, minDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	for (; i + 4 <= count; i += 4)
+	{
+		float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+		float32x4_t v3 = vld1q_f32_aligned_postincrement(vv);
+
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+		float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v3));
+		// the next two lines should resolve to a single vswp d, d
+		float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+		float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v3));
+
+		xy0 = vmulq_f32(xy0, vLo);
+		xy1 = vmulq_f32(xy1, vLo);
+
+		float32x4x2_t zb = vuzpq_f32(z0, z1);
+		float32x4_t z = vmulq_f32(zb.val[0], vHi);
+		float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+		float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+		x = vaddq_f32(x, z);
+
+		uint32x4_t mask = vcltq_f32(x, minDot);
+		minDot = vbslq_f32(mask, x, minDot);
+		index = vbslq_u32(mask, local_index, index);
+		local_index = vaddq_u32(local_index, four);
+	}
+
+	switch (count & 3)
+	{
+		case 3:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v2 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			float32x4_t xy1 = vcombine_f32(vget_low_f32(v2), vget_low_f32(v2));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+			float32x4_t z1 = vcombine_f32(vget_high_f32(v2), vget_high_f32(v2));
+
+			xy0 = vmulq_f32(xy0, vLo);
+			xy1 = vmulq_f32(xy1, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z1);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy1);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcltq_f32(x, minDot);
+			minDot = vbslq_f32(mask, x, minDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 2:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+			float32x4_t v1 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v1));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z0 = vcombine_f32(vget_high_f32(v0), vget_high_f32(v1));
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			float32x4x2_t zb = vuzpq_f32(z0, z0);
+			float32x4_t z = vmulq_f32(zb.val[0], vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcltq_f32(x, minDot);
+			minDot = vbslq_f32(mask, x, minDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		case 1:
+		{
+			float32x4_t v0 = vld1q_f32_aligned_postincrement(vv);
+
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t xy0 = vcombine_f32(vget_low_f32(v0), vget_low_f32(v0));
+			// the next two lines should resolve to a single vswp d, d
+			float32x4_t z = vdupq_lane_f32(vget_high_f32(v0), 0);
+
+			xy0 = vmulq_f32(xy0, vLo);
+
+			z = vmulq_f32(z, vHi);
+			float32x4x2_t xy = vuzpq_f32(xy0, xy0);
+			float32x4_t x = vaddq_f32(xy.val[0], xy.val[1]);
+			x = vaddq_f32(x, z);
+
+			uint32x4_t mask = vcltq_f32(x, minDot);
+			minDot = vbslq_f32(mask, x, minDot);
+			index = vbslq_u32(mask, local_index, index);
+			local_index = vaddq_u32(local_index, four);
+		}
+		break;
+
+		default:
+			break;
+	}
+
+	// select best answer between hi and lo results
+	uint32x2_t mask = vclt_f32(vget_high_f32(minDot), vget_low_f32(minDot));
+	float32x2_t minDot2 = vbsl_f32(mask, vget_high_f32(minDot), vget_low_f32(minDot));
+	uint32x2_t index2 = vbsl_u32(mask, vget_high_u32(index), vget_low_u32(index));
+
+	// select best answer between even and odd results
+	float32x2_t minDotO = vdup_lane_f32(minDot2, 1);
+	uint32x2_t indexHi = vdup_lane_u32(index2, 1);
+	mask = vclt_f32(minDotO, minDot2);
+	minDot2 = vbsl_f32(mask, minDotO, minDot2);
+	index2 = vbsl_u32(mask, indexHi, index2);
+
+	*dotResult = vget_lane_f32(minDot2, 0);
+	return vget_lane_u32(index2, 0);
+}
+
+#else
+#error Unhandled __APPLE__ arch
+#endif
+
+#endif /* __APPLE__ */
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/btVector3.h b/dali-physics/third-party/bullet3/src/LinearMath/btVector3.h
new file mode 100644
index 0000000..9da1627
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/btVector3.h
@@ -0,0 +1,1336 @@
+/*
+Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_VECTOR3_H
+#define BT_VECTOR3_H
+
+//#include <stdint.h>
+#include "btScalar.h"
+#include "btMinMax.h"
+#include "btAlignedAllocator.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btVector3Data btVector3DoubleData
+#define btVector3DataName "btVector3DoubleData"
+#else
+#define btVector3Data btVector3FloatData
+#define btVector3DataName "btVector3FloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
+
+#if defined BT_USE_SSE
+
+//typedef  uint32_t __m128i __attribute__ ((vector_size(16)));
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4556)  // value of intrinsic immediate argument '4294967239' is out of range '0 - 255'
+#endif
+
+#define BT_SHUFFLE(x, y, z, w) (((w) << 6 | (z) << 4 | (y) << 2 | (x)) & 0xff)
+//#define bt_pshufd_ps( _a, _mask ) (__m128) _mm_shuffle_epi32((__m128i)(_a), (_mask) )
+#define bt_pshufd_ps(_a, _mask) _mm_shuffle_ps((_a), (_a), (_mask))
+#define bt_splat3_ps(_a, _i) bt_pshufd_ps((_a), BT_SHUFFLE(_i, _i, _i, 3))
+#define bt_splat_ps(_a, _i) bt_pshufd_ps((_a), BT_SHUFFLE(_i, _i, _i, _i))
+
+#define btv3AbsiMask (_mm_set_epi32(0x00000000, 0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF))
+#define btvAbsMask (_mm_set_epi32(0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF))
+#define btvFFF0Mask (_mm_set_epi32(0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF))
+#define btv3AbsfMask btCastiTo128f(btv3AbsiMask)
+#define btvFFF0fMask btCastiTo128f(btvFFF0Mask)
+#define btvxyzMaskf btvFFF0fMask
+#define btvAbsfMask btCastiTo128f(btvAbsMask)
+
+//there is an issue with XCode 3.2 (LCx errors)
+#define btvMzeroMask (_mm_set_ps(-0.0f, -0.0f, -0.0f, -0.0f))
+#define v1110 (_mm_set_ps(0.0f, 1.0f, 1.0f, 1.0f))
+#define vHalf (_mm_set_ps(0.5f, 0.5f, 0.5f, 0.5f))
+#define v1_5 (_mm_set_ps(1.5f, 1.5f, 1.5f, 1.5f))
+
+//const __m128 ATTRIBUTE_ALIGNED16(btvMzeroMask) = {-0.0f, -0.0f, -0.0f, -0.0f};
+//const __m128 ATTRIBUTE_ALIGNED16(v1110) = {1.0f, 1.0f, 1.0f, 0.0f};
+//const __m128 ATTRIBUTE_ALIGNED16(vHalf) = {0.5f, 0.5f, 0.5f, 0.5f};
+//const __m128 ATTRIBUTE_ALIGNED16(v1_5)  = {1.5f, 1.5f, 1.5f, 1.5f};
+
+#endif
+
+#ifdef BT_USE_NEON
+
+const float32x4_t ATTRIBUTE_ALIGNED16(btvMzeroMask) = (float32x4_t){-0.0f, -0.0f, -0.0f, -0.0f};
+const int32x4_t ATTRIBUTE_ALIGNED16(btvFFF0Mask) = (int32x4_t){static_cast<int32_t>(0xFFFFFFFF),
+															   static_cast<int32_t>(0xFFFFFFFF), static_cast<int32_t>(0xFFFFFFFF), 0x0};
+const int32x4_t ATTRIBUTE_ALIGNED16(btvAbsMask) = (int32x4_t){0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF};
+const int32x4_t ATTRIBUTE_ALIGNED16(btv3AbsMask) = (int32x4_t){0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF, 0x0};
+
+#endif
+
+/**@brief btVector3 can be used to represent 3D points and vectors.
+ * It has an un-used w component to suit 16-byte alignment when btVector3 is stored in containers. This extra component can be used by derived classes (Quaternion?) or by user
+ * Ideally, this class should be replaced by a platform optimized SIMD version that keeps the data in registers
+ */
+ATTRIBUTE_ALIGNED16(class)
+btVector3
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+#if defined(__SPU__) && defined(__CELLOS_LV2__)
+	btScalar m_floats[4];
+
+public:
+	SIMD_FORCE_INLINE const vec_float4& get128() const
+	{
+		return *((const vec_float4*)&m_floats[0]);
+	}
+
+public:
+#else                                            //__CELLOS_LV2__ __SPU__
+#if defined(BT_USE_SSE) || defined(BT_USE_NEON)  // _WIN32 || ARM
+	union {
+		btSimdFloat4 mVec128;
+		btScalar m_floats[4];
+	};
+	SIMD_FORCE_INLINE btSimdFloat4 get128() const
+	{
+		return mVec128;
+	}
+	SIMD_FORCE_INLINE void set128(btSimdFloat4 v128)
+	{
+		mVec128 = v128;
+	}
+#else
+	btScalar m_floats[4];
+#endif
+#endif  //__CELLOS_LV2__ __SPU__
+
+public:
+	/**@brief No initialization constructor */
+	SIMD_FORCE_INLINE btVector3()
+	{
+	}
+
+	/**@brief Constructor from scalars 
+   * @param x X value
+   * @param y Y value 
+   * @param z Z value 
+   */
+	SIMD_FORCE_INLINE btVector3(const btScalar& _x, const btScalar& _y, const btScalar& _z)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = btScalar(0.f);
+	}
+
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	// Set Vector
+	SIMD_FORCE_INLINE btVector3(btSimdFloat4 v)
+	{
+		mVec128 = v;
+	}
+
+	// Copy constructor
+	SIMD_FORCE_INLINE btVector3(const btVector3& rhs)
+	{
+		mVec128 = rhs.mVec128;
+	}
+
+	// Assignment Operator
+	SIMD_FORCE_INLINE btVector3&
+	operator=(const btVector3& v)
+	{
+		mVec128 = v.mVec128;
+
+		return *this;
+	}
+#endif  // #if defined (BT_USE_SSE_IN_API) || defined (BT_USE_NEON)
+
+	/**@brief Add a vector to this one 
+ * @param The vector to add to this one */
+	SIMD_FORCE_INLINE btVector3& operator+=(const btVector3& v)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = _mm_add_ps(mVec128, v.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vaddq_f32(mVec128, v.mVec128);
+#else
+		m_floats[0] += v.m_floats[0];
+		m_floats[1] += v.m_floats[1];
+		m_floats[2] += v.m_floats[2];
+#endif
+		return *this;
+	}
+
+	/**@brief Subtract a vector from this one
+   * @param The vector to subtract */
+	SIMD_FORCE_INLINE btVector3& operator-=(const btVector3& v)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = _mm_sub_ps(mVec128, v.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vsubq_f32(mVec128, v.mVec128);
+#else
+		m_floats[0] -= v.m_floats[0];
+		m_floats[1] -= v.m_floats[1];
+		m_floats[2] -= v.m_floats[2];
+#endif
+		return *this;
+	}
+
+	/**@brief Scale the vector
+   * @param s Scale factor */
+	SIMD_FORCE_INLINE btVector3& operator*=(const btScalar& s)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = bt_pshufd_ps(vs, 0x80);  //	(S S S 0.0)
+		mVec128 = _mm_mul_ps(mVec128, vs);
+#elif defined(BT_USE_NEON)
+		mVec128 = vmulq_n_f32(mVec128, s);
+#else
+		m_floats[0] *= s;
+		m_floats[1] *= s;
+		m_floats[2] *= s;
+#endif
+		return *this;
+	}
+
+	/**@brief Inversely scale the vector 
+   * @param s Scale factor to divide by */
+	SIMD_FORCE_INLINE btVector3& operator/=(const btScalar& s)
+	{
+		btFullAssert(s != btScalar(0.0));
+
+#if 0  //defined(BT_USE_SSE_IN_API)
+// this code is not faster !
+		__m128 vs = _mm_load_ss(&s);
+		vs = _mm_div_ss(v1110, vs);
+		vs = bt_pshufd_ps(vs, 0x00);	//	(S S S S)
+
+		mVec128 = _mm_mul_ps(mVec128, vs);
+		
+		return *this;
+#else
+		return *this *= btScalar(1.0) / s;
+#endif
+	}
+
+	/**@brief Return the dot product
+   * @param v The other vector in the dot product */
+	SIMD_FORCE_INLINE btScalar dot(const btVector3& v) const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vd = _mm_mul_ps(mVec128, v.mVec128);
+		__m128 z = _mm_movehl_ps(vd, vd);
+		__m128 y = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, y);
+		vd = _mm_add_ss(vd, z);
+		return _mm_cvtss_f32(vd);
+#elif defined(BT_USE_NEON)
+		float32x4_t vd = vmulq_f32(mVec128, v.mVec128);
+		float32x2_t x = vpadd_f32(vget_low_f32(vd), vget_low_f32(vd));
+		x = vadd_f32(x, vget_high_f32(vd));
+		return vget_lane_f32(x, 0);
+#else
+		return m_floats[0] * v.m_floats[0] +
+			   m_floats[1] * v.m_floats[1] +
+			   m_floats[2] * v.m_floats[2];
+#endif
+	}
+
+	/**@brief Return the length of the vector squared */
+	SIMD_FORCE_INLINE btScalar length2() const
+	{
+		return dot(*this);
+	}
+
+	/**@brief Return the length of the vector */
+	SIMD_FORCE_INLINE btScalar length() const
+	{
+		return btSqrt(length2());
+	}
+
+	/**@brief Return the norm (length) of the vector */
+	SIMD_FORCE_INLINE btScalar norm() const
+	{
+		return length();
+	}
+
+	/**@brief Return the norm (length) of the vector */
+	SIMD_FORCE_INLINE btScalar safeNorm() const
+	{
+		btScalar d = length2();
+		//workaround for some clang/gcc issue of sqrtf(tiny number) = -INF
+		if (d > SIMD_EPSILON)
+			return btSqrt(d);
+		return btScalar(0);
+	}
+
+	/**@brief Return the distance squared between the ends of this and another vector
+   * This is symantically treating the vector like a point */
+	SIMD_FORCE_INLINE btScalar distance2(const btVector3& v) const;
+
+	/**@brief Return the distance between the ends of this and another vector
+   * This is symantically treating the vector like a point */
+	SIMD_FORCE_INLINE btScalar distance(const btVector3& v) const;
+
+	SIMD_FORCE_INLINE btVector3& safeNormalize()
+	{
+		btScalar l2 = length2();
+		//triNormal.normalize();
+		if (l2 >= SIMD_EPSILON * SIMD_EPSILON)
+		{
+			(*this) /= btSqrt(l2);
+		}
+		else
+		{
+			setValue(1, 0, 0);
+		}
+		return *this;
+	}
+
+	/**@brief Normalize this vector 
+   * x^2 + y^2 + z^2 = 1 */
+	SIMD_FORCE_INLINE btVector3& normalize()
+	{
+		btAssert(!fuzzyZero());
+
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		// dot product first
+		__m128 vd = _mm_mul_ps(mVec128, mVec128);
+		__m128 z = _mm_movehl_ps(vd, vd);
+		__m128 y = _mm_shuffle_ps(vd, vd, 0x55);
+		vd = _mm_add_ss(vd, y);
+		vd = _mm_add_ss(vd, z);
+
+#if 0
+        vd = _mm_sqrt_ss(vd);
+		vd = _mm_div_ss(v1110, vd);
+		vd = bt_splat_ps(vd, 0x80);
+		mVec128 = _mm_mul_ps(mVec128, vd);
+#else
+
+		// NR step 1/sqrt(x) - vd is x, y is output
+		y = _mm_rsqrt_ss(vd);  // estimate
+
+		//  one step NR
+		z = v1_5;
+		vd = _mm_mul_ss(vd, vHalf);  // vd * 0.5
+		//x2 = vd;
+		vd = _mm_mul_ss(vd, y);  // vd * 0.5 * y0
+		vd = _mm_mul_ss(vd, y);  // vd * 0.5 * y0 * y0
+		z = _mm_sub_ss(z, vd);   // 1.5 - vd * 0.5 * y0 * y0
+
+		y = _mm_mul_ss(y, z);  // y0 * (1.5 - vd * 0.5 * y0 * y0)
+
+		y = bt_splat_ps(y, 0x80);
+		mVec128 = _mm_mul_ps(mVec128, y);
+
+#endif
+
+		return *this;
+#else
+		return *this /= length();
+#endif
+	}
+
+	/**@brief Return a normalized version of this vector */
+	SIMD_FORCE_INLINE btVector3 normalized() const;
+
+	/**@brief Return a rotated version of this vector
+   * @param wAxis The axis to rotate about 
+   * @param angle The angle to rotate by */
+	SIMD_FORCE_INLINE btVector3 rotate(const btVector3& wAxis, const btScalar angle) const;
+
+	/**@brief Return the angle between this and another vector
+   * @param v The other vector */
+	SIMD_FORCE_INLINE btScalar angle(const btVector3& v) const
+	{
+		btScalar s = btSqrt(length2() * v.length2());
+		btFullAssert(s != btScalar(0.0));
+		return btAcos(dot(v) / s);
+	}
+
+	/**@brief Return a vector with the absolute values of each element */
+	SIMD_FORCE_INLINE btVector3 absolute() const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		return btVector3(_mm_and_ps(mVec128, btv3AbsfMask));
+#elif defined(BT_USE_NEON)
+		return btVector3(vabsq_f32(mVec128));
+#else
+		return btVector3(
+			btFabs(m_floats[0]),
+			btFabs(m_floats[1]),
+			btFabs(m_floats[2]));
+#endif
+	}
+
+	/**@brief Return the cross product between this and another vector 
+   * @param v The other vector */
+	SIMD_FORCE_INLINE btVector3 cross(const btVector3& v) const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 T, V;
+
+		T = bt_pshufd_ps(mVec128, BT_SHUFFLE(1, 2, 0, 3));    //	(Y Z X 0)
+		V = bt_pshufd_ps(v.mVec128, BT_SHUFFLE(1, 2, 0, 3));  //	(Y Z X 0)
+
+		V = _mm_mul_ps(V, mVec128);
+		T = _mm_mul_ps(T, v.mVec128);
+		V = _mm_sub_ps(V, T);
+
+		V = bt_pshufd_ps(V, BT_SHUFFLE(1, 2, 0, 3));
+		return btVector3(V);
+#elif defined(BT_USE_NEON)
+		float32x4_t T, V;
+		// form (Y, Z, X, _) of mVec128 and v.mVec128
+		float32x2_t Tlow = vget_low_f32(mVec128);
+		float32x2_t Vlow = vget_low_f32(v.mVec128);
+		T = vcombine_f32(vext_f32(Tlow, vget_high_f32(mVec128), 1), Tlow);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(v.mVec128), 1), Vlow);
+
+		V = vmulq_f32(V, mVec128);
+		T = vmulq_f32(T, v.mVec128);
+		V = vsubq_f32(V, T);
+		Vlow = vget_low_f32(V);
+		// form (Y, Z, X, _);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(V), 1), Vlow);
+		V = (float32x4_t)vandq_s32((int32x4_t)V, btvFFF0Mask);
+
+		return btVector3(V);
+#else
+		return btVector3(
+			m_floats[1] * v.m_floats[2] - m_floats[2] * v.m_floats[1],
+			m_floats[2] * v.m_floats[0] - m_floats[0] * v.m_floats[2],
+			m_floats[0] * v.m_floats[1] - m_floats[1] * v.m_floats[0]);
+#endif
+	}
+
+	SIMD_FORCE_INLINE btScalar triple(const btVector3& v1, const btVector3& v2) const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		// cross:
+		__m128 T = _mm_shuffle_ps(v1.mVec128, v1.mVec128, BT_SHUFFLE(1, 2, 0, 3));  //	(Y Z X 0)
+		__m128 V = _mm_shuffle_ps(v2.mVec128, v2.mVec128, BT_SHUFFLE(1, 2, 0, 3));  //	(Y Z X 0)
+
+		V = _mm_mul_ps(V, v1.mVec128);
+		T = _mm_mul_ps(T, v2.mVec128);
+		V = _mm_sub_ps(V, T);
+
+		V = _mm_shuffle_ps(V, V, BT_SHUFFLE(1, 2, 0, 3));
+
+		// dot:
+		V = _mm_mul_ps(V, mVec128);
+		__m128 z = _mm_movehl_ps(V, V);
+		__m128 y = _mm_shuffle_ps(V, V, 0x55);
+		V = _mm_add_ss(V, y);
+		V = _mm_add_ss(V, z);
+		return _mm_cvtss_f32(V);
+
+#elif defined(BT_USE_NEON)
+		// cross:
+		float32x4_t T, V;
+		// form (Y, Z, X, _) of mVec128 and v.mVec128
+		float32x2_t Tlow = vget_low_f32(v1.mVec128);
+		float32x2_t Vlow = vget_low_f32(v2.mVec128);
+		T = vcombine_f32(vext_f32(Tlow, vget_high_f32(v1.mVec128), 1), Tlow);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(v2.mVec128), 1), Vlow);
+
+		V = vmulq_f32(V, v1.mVec128);
+		T = vmulq_f32(T, v2.mVec128);
+		V = vsubq_f32(V, T);
+		Vlow = vget_low_f32(V);
+		// form (Y, Z, X, _);
+		V = vcombine_f32(vext_f32(Vlow, vget_high_f32(V), 1), Vlow);
+
+		// dot:
+		V = vmulq_f32(mVec128, V);
+		float32x2_t x = vpadd_f32(vget_low_f32(V), vget_low_f32(V));
+		x = vadd_f32(x, vget_high_f32(V));
+		return vget_lane_f32(x, 0);
+#else
+		return m_floats[0] * (v1.m_floats[1] * v2.m_floats[2] - v1.m_floats[2] * v2.m_floats[1]) +
+			   m_floats[1] * (v1.m_floats[2] * v2.m_floats[0] - v1.m_floats[0] * v2.m_floats[2]) +
+			   m_floats[2] * (v1.m_floats[0] * v2.m_floats[1] - v1.m_floats[1] * v2.m_floats[0]);
+#endif
+	}
+
+	/**@brief Return the axis with the smallest value 
+   * Note return values are 0,1,2 for x, y, or z */
+	SIMD_FORCE_INLINE int minAxis() const
+	{
+		return m_floats[0] < m_floats[1] ? (m_floats[0] < m_floats[2] ? 0 : 2) : (m_floats[1] < m_floats[2] ? 1 : 2);
+	}
+
+	/**@brief Return the axis with the largest value 
+   * Note return values are 0,1,2 for x, y, or z */
+	SIMD_FORCE_INLINE int maxAxis() const
+	{
+		return m_floats[0] < m_floats[1] ? (m_floats[1] < m_floats[2] ? 2 : 1) : (m_floats[0] < m_floats[2] ? 2 : 0);
+	}
+
+	SIMD_FORCE_INLINE int furthestAxis() const
+	{
+		return absolute().minAxis();
+	}
+
+	SIMD_FORCE_INLINE int closestAxis() const
+	{
+		return absolute().maxAxis();
+	}
+
+	SIMD_FORCE_INLINE void setInterpolate3(const btVector3& v0, const btVector3& v1, btScalar rt)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vrt = _mm_load_ss(&rt);  //	(rt 0 0 0)
+		btScalar s = btScalar(1.0) - rt;
+		__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+		vs = bt_pshufd_ps(vs, 0x80);  //	(S S S 0.0)
+		__m128 r0 = _mm_mul_ps(v0.mVec128, vs);
+		vrt = bt_pshufd_ps(vrt, 0x80);  //	(rt rt rt 0.0)
+		__m128 r1 = _mm_mul_ps(v1.mVec128, vrt);
+		__m128 tmp3 = _mm_add_ps(r0, r1);
+		mVec128 = tmp3;
+#elif defined(BT_USE_NEON)
+		float32x4_t vl = vsubq_f32(v1.mVec128, v0.mVec128);
+		vl = vmulq_n_f32(vl, rt);
+		mVec128 = vaddq_f32(vl, v0.mVec128);
+#else
+		btScalar s = btScalar(1.0) - rt;
+		m_floats[0] = s * v0.m_floats[0] + rt * v1.m_floats[0];
+		m_floats[1] = s * v0.m_floats[1] + rt * v1.m_floats[1];
+		m_floats[2] = s * v0.m_floats[2] + rt * v1.m_floats[2];
+		//don't do the unused w component
+		//		m_co[3] = s * v0[3] + rt * v1[3];
+#endif
+	}
+
+	/**@brief Return the linear interpolation between this and another vector 
+   * @param v The other vector 
+   * @param t The ration of this to v (t = 0 => return this, t=1 => return other) */
+	SIMD_FORCE_INLINE btVector3 lerp(const btVector3& v, const btScalar& t) const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		__m128 vt = _mm_load_ss(&t);  //	(t 0 0 0)
+		vt = bt_pshufd_ps(vt, 0x80);  //	(rt rt rt 0.0)
+		__m128 vl = _mm_sub_ps(v.mVec128, mVec128);
+		vl = _mm_mul_ps(vl, vt);
+		vl = _mm_add_ps(vl, mVec128);
+
+		return btVector3(vl);
+#elif defined(BT_USE_NEON)
+		float32x4_t vl = vsubq_f32(v.mVec128, mVec128);
+		vl = vmulq_n_f32(vl, t);
+		vl = vaddq_f32(vl, mVec128);
+
+		return btVector3(vl);
+#else
+		return btVector3(m_floats[0] + (v.m_floats[0] - m_floats[0]) * t,
+						 m_floats[1] + (v.m_floats[1] - m_floats[1]) * t,
+						 m_floats[2] + (v.m_floats[2] - m_floats[2]) * t);
+#endif
+	}
+
+	/**@brief Elementwise multiply this vector by the other 
+   * @param v The other vector */
+	SIMD_FORCE_INLINE btVector3& operator*=(const btVector3& v)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = _mm_mul_ps(mVec128, v.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vmulq_f32(mVec128, v.mVec128);
+#else
+		m_floats[0] *= v.m_floats[0];
+		m_floats[1] *= v.m_floats[1];
+		m_floats[2] *= v.m_floats[2];
+#endif
+		return *this;
+	}
+
+	/**@brief Return the x value */
+	SIMD_FORCE_INLINE const btScalar& getX() const { return m_floats[0]; }
+	/**@brief Return the y value */
+	SIMD_FORCE_INLINE const btScalar& getY() const { return m_floats[1]; }
+	/**@brief Return the z value */
+	SIMD_FORCE_INLINE const btScalar& getZ() const { return m_floats[2]; }
+	/**@brief Set the x value */
+	SIMD_FORCE_INLINE void setX(btScalar _x) { m_floats[0] = _x; };
+	/**@brief Set the y value */
+	SIMD_FORCE_INLINE void setY(btScalar _y) { m_floats[1] = _y; };
+	/**@brief Set the z value */
+	SIMD_FORCE_INLINE void setZ(btScalar _z) { m_floats[2] = _z; };
+	/**@brief Set the w value */
+	SIMD_FORCE_INLINE void setW(btScalar _w) { m_floats[3] = _w; };
+	/**@brief Return the x value */
+	SIMD_FORCE_INLINE const btScalar& x() const { return m_floats[0]; }
+	/**@brief Return the y value */
+	SIMD_FORCE_INLINE const btScalar& y() const { return m_floats[1]; }
+	/**@brief Return the z value */
+	SIMD_FORCE_INLINE const btScalar& z() const { return m_floats[2]; }
+	/**@brief Return the w value */
+	SIMD_FORCE_INLINE const btScalar& w() const { return m_floats[3]; }
+
+	//SIMD_FORCE_INLINE btScalar&       operator[](int i)       { return (&m_floats[0])[i];	}
+	//SIMD_FORCE_INLINE const btScalar& operator[](int i) const { return (&m_floats[0])[i]; }
+	///operator btScalar*() replaces operator[], using implicit conversion. We added operator != and operator == to avoid pointer comparisons.
+	SIMD_FORCE_INLINE operator btScalar*() { return &m_floats[0]; }
+	SIMD_FORCE_INLINE operator const btScalar*() const { return &m_floats[0]; }
+
+	SIMD_FORCE_INLINE bool operator==(const btVector3& other) const
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		return (0xf == _mm_movemask_ps((__m128)_mm_cmpeq_ps(mVec128, other.mVec128)));
+#else
+		return ((m_floats[3] == other.m_floats[3]) &&
+				(m_floats[2] == other.m_floats[2]) &&
+				(m_floats[1] == other.m_floats[1]) &&
+				(m_floats[0] == other.m_floats[0]));
+#endif
+	}
+
+	SIMD_FORCE_INLINE bool operator!=(const btVector3& other) const
+	{
+		return !(*this == other);
+	}
+
+	/**@brief Set each element to the max of the current values and the values of another btVector3
+   * @param other The other btVector3 to compare with 
+   */
+	SIMD_FORCE_INLINE void setMax(const btVector3& other)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = _mm_max_ps(mVec128, other.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vmaxq_f32(mVec128, other.mVec128);
+#else
+		btSetMax(m_floats[0], other.m_floats[0]);
+		btSetMax(m_floats[1], other.m_floats[1]);
+		btSetMax(m_floats[2], other.m_floats[2]);
+		btSetMax(m_floats[3], other.w());
+#endif
+	}
+
+	/**@brief Set each element to the min of the current values and the values of another btVector3
+   * @param other The other btVector3 to compare with 
+   */
+	SIMD_FORCE_INLINE void setMin(const btVector3& other)
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = _mm_min_ps(mVec128, other.mVec128);
+#elif defined(BT_USE_NEON)
+		mVec128 = vminq_f32(mVec128, other.mVec128);
+#else
+		btSetMin(m_floats[0], other.m_floats[0]);
+		btSetMin(m_floats[1], other.m_floats[1]);
+		btSetMin(m_floats[2], other.m_floats[2]);
+		btSetMin(m_floats[3], other.w());
+#endif
+	}
+
+	SIMD_FORCE_INLINE void setValue(const btScalar& _x, const btScalar& _y, const btScalar& _z)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = btScalar(0.f);
+	}
+
+	void getSkewSymmetricMatrix(btVector3 * v0, btVector3 * v1, btVector3 * v2) const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+
+		__m128 V = _mm_and_ps(mVec128, btvFFF0fMask);
+		__m128 V0 = _mm_xor_ps(btvMzeroMask, V);
+		__m128 V2 = _mm_movelh_ps(V0, V);
+
+		__m128 V1 = _mm_shuffle_ps(V, V0, 0xCE);
+
+		V0 = _mm_shuffle_ps(V0, V, 0xDB);
+		V2 = _mm_shuffle_ps(V2, V, 0xF9);
+
+		v0->mVec128 = V0;
+		v1->mVec128 = V1;
+		v2->mVec128 = V2;
+#else
+		v0->setValue(0., -z(), y());
+		v1->setValue(z(), 0., -x());
+		v2->setValue(-y(), x(), 0.);
+#endif
+	}
+
+	void setZero()
+	{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		mVec128 = (__m128)_mm_xor_ps(mVec128, mVec128);
+#elif defined(BT_USE_NEON)
+		int32x4_t vi = vdupq_n_s32(0);
+		mVec128 = vreinterpretq_f32_s32(vi);
+#else
+		setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+#endif
+	}
+
+	SIMD_FORCE_INLINE bool isZero() const
+	{
+		return m_floats[0] == btScalar(0) && m_floats[1] == btScalar(0) && m_floats[2] == btScalar(0);
+	}
+
+	SIMD_FORCE_INLINE bool fuzzyZero() const
+	{
+		return length2() < SIMD_EPSILON * SIMD_EPSILON;
+	}
+
+	SIMD_FORCE_INLINE void serialize(struct btVector3Data & dataOut) const;
+
+	SIMD_FORCE_INLINE void deSerialize(const struct btVector3DoubleData& dataIn);
+
+	SIMD_FORCE_INLINE void deSerialize(const struct btVector3FloatData& dataIn);
+
+	SIMD_FORCE_INLINE void serializeFloat(struct btVector3FloatData & dataOut) const;
+
+	SIMD_FORCE_INLINE void deSerializeFloat(const struct btVector3FloatData& dataIn);
+
+	SIMD_FORCE_INLINE void serializeDouble(struct btVector3DoubleData & dataOut) const;
+
+	SIMD_FORCE_INLINE void deSerializeDouble(const struct btVector3DoubleData& dataIn);
+
+	/**@brief returns index of maximum dot product between this and vectors in array[]
+         * @param array The other vectors 
+         * @param array_count The number of other vectors 
+         * @param dotOut The maximum dot product */
+	SIMD_FORCE_INLINE long maxDot(const btVector3* array, long array_count, btScalar& dotOut) const;
+
+	/**@brief returns index of minimum dot product between this and vectors in array[]
+         * @param array The other vectors 
+         * @param array_count The number of other vectors 
+         * @param dotOut The minimum dot product */
+	SIMD_FORCE_INLINE long minDot(const btVector3* array, long array_count, btScalar& dotOut) const;
+
+	/* create a vector as  btVector3( this->dot( btVector3 v0 ), this->dot( btVector3 v1), this->dot( btVector3 v2 ))  */
+	SIMD_FORCE_INLINE btVector3 dot3(const btVector3& v0, const btVector3& v1, const btVector3& v2) const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+
+		__m128 a0 = _mm_mul_ps(v0.mVec128, this->mVec128);
+		__m128 a1 = _mm_mul_ps(v1.mVec128, this->mVec128);
+		__m128 a2 = _mm_mul_ps(v2.mVec128, this->mVec128);
+		__m128 b0 = _mm_unpacklo_ps(a0, a1);
+		__m128 b1 = _mm_unpackhi_ps(a0, a1);
+		__m128 b2 = _mm_unpacklo_ps(a2, _mm_setzero_ps());
+		__m128 r = _mm_movelh_ps(b0, b2);
+		r = _mm_add_ps(r, _mm_movehl_ps(b2, b0));
+		a2 = _mm_and_ps(a2, btvxyzMaskf);
+		r = _mm_add_ps(r, btCastdTo128f(_mm_move_sd(btCastfTo128d(a2), btCastfTo128d(b1))));
+		return btVector3(r);
+
+#elif defined(BT_USE_NEON)
+		static const uint32x4_t xyzMask = (const uint32x4_t){static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), static_cast<uint32_t>(-1), 0};
+		float32x4_t a0 = vmulq_f32(v0.mVec128, this->mVec128);
+		float32x4_t a1 = vmulq_f32(v1.mVec128, this->mVec128);
+		float32x4_t a2 = vmulq_f32(v2.mVec128, this->mVec128);
+		float32x2x2_t zLo = vtrn_f32(vget_high_f32(a0), vget_high_f32(a1));
+		a2 = (float32x4_t)vandq_u32((uint32x4_t)a2, xyzMask);
+		float32x2_t b0 = vadd_f32(vpadd_f32(vget_low_f32(a0), vget_low_f32(a1)), zLo.val[0]);
+		float32x2_t b1 = vpadd_f32(vpadd_f32(vget_low_f32(a2), vget_high_f32(a2)), vdup_n_f32(0.0f));
+		return btVector3(vcombine_f32(b0, b1));
+#else
+		return btVector3(dot(v0), dot(v1), dot(v2));
+#endif
+	}
+};
+
+/**@brief Return the sum of two vectors (Point symantics)*/
+SIMD_FORCE_INLINE btVector3
+operator+(const btVector3& v1, const btVector3& v2)
+{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	return btVector3(_mm_add_ps(v1.mVec128, v2.mVec128));
+#elif defined(BT_USE_NEON)
+	return btVector3(vaddq_f32(v1.mVec128, v2.mVec128));
+#else
+	return btVector3(
+		v1.m_floats[0] + v2.m_floats[0],
+		v1.m_floats[1] + v2.m_floats[1],
+		v1.m_floats[2] + v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the elementwise product of two vectors */
+SIMD_FORCE_INLINE btVector3
+operator*(const btVector3& v1, const btVector3& v2)
+{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	return btVector3(_mm_mul_ps(v1.mVec128, v2.mVec128));
+#elif defined(BT_USE_NEON)
+	return btVector3(vmulq_f32(v1.mVec128, v2.mVec128));
+#else
+	return btVector3(
+		v1.m_floats[0] * v2.m_floats[0],
+		v1.m_floats[1] * v2.m_floats[1],
+		v1.m_floats[2] * v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the difference between two vectors */
+SIMD_FORCE_INLINE btVector3
+operator-(const btVector3& v1, const btVector3& v2)
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+
+	//	without _mm_and_ps this code causes slowdown in Concave moving
+	__m128 r = _mm_sub_ps(v1.mVec128, v2.mVec128);
+	return btVector3(_mm_and_ps(r, btvFFF0fMask));
+#elif defined(BT_USE_NEON)
+	float32x4_t r = vsubq_f32(v1.mVec128, v2.mVec128);
+	return btVector3((float32x4_t)vandq_s32((int32x4_t)r, btvFFF0Mask));
+#else
+	return btVector3(
+		v1.m_floats[0] - v2.m_floats[0],
+		v1.m_floats[1] - v2.m_floats[1],
+		v1.m_floats[2] - v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the negative of the vector */
+SIMD_FORCE_INLINE btVector3
+operator-(const btVector3& v)
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+	__m128 r = _mm_xor_ps(v.mVec128, btvMzeroMask);
+	return btVector3(_mm_and_ps(r, btvFFF0fMask));
+#elif defined(BT_USE_NEON)
+	return btVector3((btSimdFloat4)veorq_s32((int32x4_t)v.mVec128, (int32x4_t)btvMzeroMask));
+#else
+	return btVector3(-v.m_floats[0], -v.m_floats[1], -v.m_floats[2]);
+#endif
+}
+
+/**@brief Return the vector scaled by s */
+SIMD_FORCE_INLINE btVector3
+operator*(const btVector3& v, const btScalar& s)
+{
+#if defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+	__m128 vs = _mm_load_ss(&s);  //	(S 0 0 0)
+	vs = bt_pshufd_ps(vs, 0x80);  //	(S S S 0.0)
+	return btVector3(_mm_mul_ps(v.mVec128, vs));
+#elif defined(BT_USE_NEON)
+	float32x4_t r = vmulq_n_f32(v.mVec128, s);
+	return btVector3((float32x4_t)vandq_s32((int32x4_t)r, btvFFF0Mask));
+#else
+	return btVector3(v.m_floats[0] * s, v.m_floats[1] * s, v.m_floats[2] * s);
+#endif
+}
+
+/**@brief Return the vector scaled by s */
+SIMD_FORCE_INLINE btVector3
+operator*(const btScalar& s, const btVector3& v)
+{
+	return v * s;
+}
+
+/**@brief Return the vector inversely scaled by s */
+SIMD_FORCE_INLINE btVector3
+operator/(const btVector3& v, const btScalar& s)
+{
+	btFullAssert(s != btScalar(0.0));
+#if 0  //defined(BT_USE_SSE_IN_API)
+// this code is not faster !
+	__m128 vs = _mm_load_ss(&s);
+    vs = _mm_div_ss(v1110, vs);
+	vs = bt_pshufd_ps(vs, 0x00);	//	(S S S S)
+
+	return btVector3(_mm_mul_ps(v.mVec128, vs));
+#else
+	return v * (btScalar(1.0) / s);
+#endif
+}
+
+/**@brief Return the vector inversely scaled by s */
+SIMD_FORCE_INLINE btVector3
+operator/(const btVector3& v1, const btVector3& v2)
+{
+#if defined BT_USE_SIMD_VECTOR3 && (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE))
+	__m128 vec = _mm_div_ps(v1.mVec128, v2.mVec128);
+	vec = _mm_and_ps(vec, btvFFF0fMask);
+	return btVector3(vec);
+#elif defined(BT_USE_NEON)
+	float32x4_t x, y, v, m;
+
+	x = v1.mVec128;
+	y = v2.mVec128;
+
+	v = vrecpeq_f32(y);     // v ~ 1/y
+	m = vrecpsq_f32(y, v);  // m = (2-v*y)
+	v = vmulq_f32(v, m);    // vv = v*m ~~ 1/y
+	m = vrecpsq_f32(y, v);  // mm = (2-vv*y)
+	v = vmulq_f32(v, x);    // x*vv
+	v = vmulq_f32(v, m);    // (x*vv)*(2-vv*y) = x*(vv(2-vv*y)) ~~~ x/y
+
+	return btVector3(v);
+#else
+	return btVector3(
+		v1.m_floats[0] / v2.m_floats[0],
+		v1.m_floats[1] / v2.m_floats[1],
+		v1.m_floats[2] / v2.m_floats[2]);
+#endif
+}
+
+/**@brief Return the dot product between two vectors */
+SIMD_FORCE_INLINE btScalar
+btDot(const btVector3& v1, const btVector3& v2)
+{
+	return v1.dot(v2);
+}
+
+/**@brief Return the distance squared between two vectors */
+SIMD_FORCE_INLINE btScalar
+btDistance2(const btVector3& v1, const btVector3& v2)
+{
+	return v1.distance2(v2);
+}
+
+/**@brief Return the distance between two vectors */
+SIMD_FORCE_INLINE btScalar
+btDistance(const btVector3& v1, const btVector3& v2)
+{
+	return v1.distance(v2);
+}
+
+/**@brief Return the angle between two vectors */
+SIMD_FORCE_INLINE btScalar
+btAngle(const btVector3& v1, const btVector3& v2)
+{
+	return v1.angle(v2);
+}
+
+/**@brief Return the cross product of two vectors */
+SIMD_FORCE_INLINE btVector3
+btCross(const btVector3& v1, const btVector3& v2)
+{
+	return v1.cross(v2);
+}
+
+SIMD_FORCE_INLINE btScalar
+btTriple(const btVector3& v1, const btVector3& v2, const btVector3& v3)
+{
+	return v1.triple(v2, v3);
+}
+
+/**@brief Return the linear interpolation between two vectors
+ * @param v1 One vector 
+ * @param v2 The other vector 
+ * @param t The ration of this to v (t = 0 => return v1, t=1 => return v2) */
+SIMD_FORCE_INLINE btVector3
+lerp(const btVector3& v1, const btVector3& v2, const btScalar& t)
+{
+	return v1.lerp(v2, t);
+}
+
+SIMD_FORCE_INLINE btScalar btVector3::distance2(const btVector3& v) const
+{
+	return (v - *this).length2();
+}
+
+SIMD_FORCE_INLINE btScalar btVector3::distance(const btVector3& v) const
+{
+	return (v - *this).length();
+}
+
+SIMD_FORCE_INLINE btVector3 btVector3::normalized() const
+{
+	btVector3 nrm = *this;
+
+	return nrm.normalize();
+}
+
+SIMD_FORCE_INLINE btVector3 btVector3::rotate(const btVector3& wAxis, const btScalar _angle) const
+{
+	// wAxis must be a unit lenght vector
+
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+
+	__m128 O = _mm_mul_ps(wAxis.mVec128, mVec128);
+	btScalar ssin = btSin(_angle);
+	__m128 C = wAxis.cross(mVec128).mVec128;
+	O = _mm_and_ps(O, btvFFF0fMask);
+	btScalar scos = btCos(_angle);
+
+	__m128 vsin = _mm_load_ss(&ssin);  //	(S 0 0 0)
+	__m128 vcos = _mm_load_ss(&scos);  //	(S 0 0 0)
+
+	__m128 Y = bt_pshufd_ps(O, 0xC9);  //	(Y Z X 0)
+	__m128 Z = bt_pshufd_ps(O, 0xD2);  //	(Z X Y 0)
+	O = _mm_add_ps(O, Y);
+	vsin = bt_pshufd_ps(vsin, 0x80);  //	(S S S 0)
+	O = _mm_add_ps(O, Z);
+	vcos = bt_pshufd_ps(vcos, 0x80);  //	(S S S 0)
+
+	vsin = vsin * C;
+	O = O * wAxis.mVec128;
+	__m128 X = mVec128 - O;
+
+	O = O + vsin;
+	vcos = vcos * X;
+	O = O + vcos;
+
+	return btVector3(O);
+#else
+	btVector3 o = wAxis * wAxis.dot(*this);
+	btVector3 _x = *this - o;
+	btVector3 _y;
+
+	_y = wAxis.cross(*this);
+
+	return (o + _x * btCos(_angle) + _y * btSin(_angle));
+#endif
+}
+
+SIMD_FORCE_INLINE long btVector3::maxDot(const btVector3* array, long array_count, btScalar& dotOut) const
+{
+#if (defined BT_USE_SSE && defined BT_USE_SIMD_VECTOR3 && defined BT_USE_SSE_IN_API) || defined(BT_USE_NEON)
+#if defined _WIN32 || defined(BT_USE_SSE)
+	const long scalar_cutoff = 10;
+	long _maxdot_large(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#elif defined BT_USE_NEON
+	const long scalar_cutoff = 4;
+	extern long (*_maxdot_large)(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#endif
+	if (array_count < scalar_cutoff)
+#endif
+	{
+		btScalar maxDot1 = -SIMD_INFINITY;
+		int i = 0;
+		int ptIndex = -1;
+		for (i = 0; i < array_count; i++)
+		{
+			btScalar dot = array[i].dot(*this);
+
+			if (dot > maxDot1)
+			{
+				maxDot1 = dot;
+				ptIndex = i;
+			}
+		}
+
+		dotOut = maxDot1;
+		return ptIndex;
+	}
+#if (defined BT_USE_SSE && defined BT_USE_SIMD_VECTOR3 && defined BT_USE_SSE_IN_API) || defined(BT_USE_NEON)
+	return _maxdot_large((float*)array, (float*)&m_floats[0], array_count, &dotOut);
+#endif
+}
+
+SIMD_FORCE_INLINE long btVector3::minDot(const btVector3* array, long array_count, btScalar& dotOut) const
+{
+#if (defined BT_USE_SSE && defined BT_USE_SIMD_VECTOR3 && defined BT_USE_SSE_IN_API) || defined(BT_USE_NEON)
+#if defined BT_USE_SSE
+	const long scalar_cutoff = 10;
+	long _mindot_large(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#elif defined BT_USE_NEON
+	const long scalar_cutoff = 4;
+	extern long (*_mindot_large)(const float* array, const float* vec, unsigned long array_count, float* dotOut);
+#else
+#error unhandled arch!
+#endif
+
+	if (array_count < scalar_cutoff)
+#endif
+	{
+		btScalar minDot = SIMD_INFINITY;
+		int i = 0;
+		int ptIndex = -1;
+
+		for (i = 0; i < array_count; i++)
+		{
+			btScalar dot = array[i].dot(*this);
+
+			if (dot < minDot)
+			{
+				minDot = dot;
+				ptIndex = i;
+			}
+		}
+
+		dotOut = minDot;
+
+		return ptIndex;
+	}
+#if (defined BT_USE_SSE && defined BT_USE_SIMD_VECTOR3 && defined BT_USE_SSE_IN_API) || defined(BT_USE_NEON)
+	return _mindot_large((float*)array, (float*)&m_floats[0], array_count, &dotOut);
+#endif  //BT_USE_SIMD_VECTOR3
+}
+
+class btVector4 : public btVector3
+{
+public:
+	SIMD_FORCE_INLINE btVector4() {}
+
+	SIMD_FORCE_INLINE btVector4(const btScalar& _x, const btScalar& _y, const btScalar& _z, const btScalar& _w)
+		: btVector3(_x, _y, _z)
+	{
+		m_floats[3] = _w;
+	}
+
+#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
+	SIMD_FORCE_INLINE btVector4(const btSimdFloat4 vec)
+	{
+		mVec128 = vec;
+	}
+
+	SIMD_FORCE_INLINE btVector4(const btVector3& rhs)
+	{
+		mVec128 = rhs.mVec128;
+	}
+
+	SIMD_FORCE_INLINE btVector4&
+	operator=(const btVector4& v)
+	{
+		mVec128 = v.mVec128;
+		return *this;
+	}
+#endif  // #if defined (BT_USE_SSE_IN_API) || defined (BT_USE_NEON)
+
+	SIMD_FORCE_INLINE btVector4 absolute4() const
+	{
+#if defined BT_USE_SIMD_VECTOR3 && defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)
+		return btVector4(_mm_and_ps(mVec128, btvAbsfMask));
+#elif defined(BT_USE_NEON)
+		return btVector4(vabsq_f32(mVec128));
+#else
+		return btVector4(
+			btFabs(m_floats[0]),
+			btFabs(m_floats[1]),
+			btFabs(m_floats[2]),
+			btFabs(m_floats[3]));
+#endif
+	}
+
+	btScalar getW() const { return m_floats[3]; }
+
+	SIMD_FORCE_INLINE int maxAxis4() const
+	{
+		int maxIndex = -1;
+		btScalar maxVal = btScalar(-BT_LARGE_FLOAT);
+		if (m_floats[0] > maxVal)
+		{
+			maxIndex = 0;
+			maxVal = m_floats[0];
+		}
+		if (m_floats[1] > maxVal)
+		{
+			maxIndex = 1;
+			maxVal = m_floats[1];
+		}
+		if (m_floats[2] > maxVal)
+		{
+			maxIndex = 2;
+			maxVal = m_floats[2];
+		}
+		if (m_floats[3] > maxVal)
+		{
+			maxIndex = 3;
+		}
+
+		return maxIndex;
+	}
+
+	SIMD_FORCE_INLINE int minAxis4() const
+	{
+		int minIndex = -1;
+		btScalar minVal = btScalar(BT_LARGE_FLOAT);
+		if (m_floats[0] < minVal)
+		{
+			minIndex = 0;
+			minVal = m_floats[0];
+		}
+		if (m_floats[1] < minVal)
+		{
+			minIndex = 1;
+			minVal = m_floats[1];
+		}
+		if (m_floats[2] < minVal)
+		{
+			minIndex = 2;
+			minVal = m_floats[2];
+		}
+		if (m_floats[3] < minVal)
+		{
+			minIndex = 3;
+		}
+
+		return minIndex;
+	}
+
+	SIMD_FORCE_INLINE int closestAxis4() const
+	{
+		return absolute4().maxAxis4();
+	}
+
+	/**@brief Set x,y,z and zero w 
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   */
+
+	/*		void getValue(btScalar *m) const 
+		{
+			m[0] = m_floats[0];
+			m[1] = m_floats[1];
+			m[2] =m_floats[2];
+		}
+*/
+	/**@brief Set the values 
+   * @param x Value of x
+   * @param y Value of y
+   * @param z Value of z
+   * @param w Value of w
+   */
+	SIMD_FORCE_INLINE void setValue(const btScalar& _x, const btScalar& _y, const btScalar& _z, const btScalar& _w)
+	{
+		m_floats[0] = _x;
+		m_floats[1] = _y;
+		m_floats[2] = _z;
+		m_floats[3] = _w;
+	}
+};
+
+///btSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+SIMD_FORCE_INLINE void btSwapScalarEndian(const btScalar& sourceVal, btScalar& destVal)
+{
+#ifdef BT_USE_DOUBLE_PRECISION
+	unsigned char* dest = (unsigned char*)&destVal;
+	const unsigned char* src = (const unsigned char*)&sourceVal;
+	dest[0] = src[7];
+	dest[1] = src[6];
+	dest[2] = src[5];
+	dest[3] = src[4];
+	dest[4] = src[3];
+	dest[5] = src[2];
+	dest[6] = src[1];
+	dest[7] = src[0];
+#else
+	unsigned char* dest = (unsigned char*)&destVal;
+	const unsigned char* src = (const unsigned char*)&sourceVal;
+	dest[0] = src[3];
+	dest[1] = src[2];
+	dest[2] = src[1];
+	dest[3] = src[0];
+#endif  //BT_USE_DOUBLE_PRECISION
+}
+///btSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+SIMD_FORCE_INLINE void btSwapVector3Endian(const btVector3& sourceVec, btVector3& destVec)
+{
+	for (int i = 0; i < 4; i++)
+	{
+		btSwapScalarEndian(sourceVec[i], destVec[i]);
+	}
+}
+
+///btUnSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+SIMD_FORCE_INLINE void btUnSwapVector3Endian(btVector3& vector)
+{
+	btVector3 swappedVec;
+	for (int i = 0; i < 4; i++)
+	{
+		btSwapScalarEndian(vector[i], swappedVec[i]);
+	}
+	vector = swappedVec;
+}
+
+template <class T>
+SIMD_FORCE_INLINE void btPlaneSpace1(const T& n, T& p, T& q)
+{
+	if (btFabs(n[2]) > SIMDSQRT12)
+	{
+		// choose p in y-z plane
+		btScalar a = n[1] * n[1] + n[2] * n[2];
+		btScalar k = btRecipSqrt(a);
+		p[0] = 0;
+		p[1] = -n[2] * k;
+		p[2] = n[1] * k;
+		// set q = n x p
+		q[0] = a * k;
+		q[1] = -n[0] * p[2];
+		q[2] = n[0] * p[1];
+	}
+	else
+	{
+		// choose p in x-y plane
+		btScalar a = n[0] * n[0] + n[1] * n[1];
+		btScalar k = btRecipSqrt(a);
+		p[0] = -n[1] * k;
+		p[1] = n[0] * k;
+		p[2] = 0;
+		// set q = n x p
+		q[0] = -n[2] * p[1];
+		q[1] = n[2] * p[0];
+		q[2] = a * k;
+	}
+}
+
+struct btVector3FloatData
+{
+	float m_floats[4];
+};
+
+struct btVector3DoubleData
+{
+	double m_floats[4];
+};
+
+SIMD_FORCE_INLINE void btVector3::serializeFloat(struct btVector3FloatData& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = float(m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btVector3::deSerializeFloat(const struct btVector3FloatData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = btScalar(dataIn.m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btVector3::serializeDouble(struct btVector3DoubleData& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = double(m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btVector3::deSerializeDouble(const struct btVector3DoubleData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = btScalar(dataIn.m_floats[i]);
+}
+
+SIMD_FORCE_INLINE void btVector3::serialize(struct btVector3Data& dataOut) const
+{
+	///could also do a memcpy, check if it is worth it
+	for (int i = 0; i < 4; i++)
+		dataOut.m_floats[i] = m_floats[i];
+}
+
+SIMD_FORCE_INLINE void btVector3::deSerialize(const struct btVector3FloatData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = (btScalar)dataIn.m_floats[i];
+}
+
+SIMD_FORCE_INLINE void btVector3::deSerialize(const struct btVector3DoubleData& dataIn)
+{
+	for (int i = 0; i < 4; i++)
+		m_floats[i] = (btScalar)dataIn.m_floats[i];
+}
+
+#endif  //BT_VECTOR3_H
diff --git a/dali-physics/third-party/bullet3/src/LinearMath/premake4.lua b/dali-physics/third-party/bullet3/src/LinearMath/premake4.lua
new file mode 100644
index 0000000..3765811
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/LinearMath/premake4.lua
@@ -0,0 +1,15 @@
+	project "LinearMath"
+
+	kind "StaticLib"
+	if os.is("Linux") then
+	    buildoptions{"-fPIC"}
+	end
+	includedirs {
+		"..",
+	}
+	files {
+		"*.cpp",
+		"*.h",
+		"TaskScheduler/*.cpp",
+		"TaskScheduler/*.h"
+	}
diff --git a/dali-physics/third-party/bullet3/src/btBulletCollisionAll.cpp b/dali-physics/third-party/bullet3/src/btBulletCollisionAll.cpp
new file mode 100644
index 0000000..4a3ec8d
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/btBulletCollisionAll.cpp
@@ -0,0 +1,97 @@
+#include "BulletCollision/BroadphaseCollision/btAxisSweep3.cpp"
+#include "BulletCollision/BroadphaseCollision/btDbvt.cpp"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp"
+#include "BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp"
+#include "BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.cpp"
+#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp"
+#include "BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp"
+#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp"
+#include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp"
+#include "BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.cpp"
+#include "BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp"
+#include "BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp"
+#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp"
+#include "BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.cpp"
+#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp"
+#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.cpp"
+#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp"
+#include "BulletCollision/CollisionDispatch/btUnionFind.cpp"
+#include "BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp"
+#include "BulletCollision/CollisionDispatch/btGhostObject.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btConvexCast.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp"
+#include "BulletCollision/CollisionShapes/btBox2dShape.cpp"
+#include "BulletCollision/CollisionShapes/btConvexPolyhedron.cpp"
+#include "BulletCollision/CollisionShapes/btShapeHull.cpp"
+#include "BulletCollision/CollisionShapes/btBoxShape.cpp"
+#include "BulletCollision/CollisionShapes/btConvexShape.cpp"
+#include "BulletCollision/CollisionShapes/btSphereShape.cpp"
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp"
+#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.cpp"
+#include "BulletCollision/CollisionShapes/btCapsuleShape.cpp"
+#include "BulletCollision/CollisionShapes/btCylinderShape.cpp"
+#include "BulletCollision/CollisionShapes/btStridingMeshInterface.cpp"
+#include "BulletCollision/CollisionShapes/btCollisionShape.cpp"
+#include "BulletCollision/CollisionShapes/btEmptyShape.cpp"
+#include "BulletCollision/CollisionShapes/btTetrahedronShape.cpp"
+#include "BulletCollision/CollisionShapes/btCompoundShape.cpp"
+#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp"
+#include "BulletCollision/CollisionShapes/btTriangleBuffer.cpp"
+#include "BulletCollision/CollisionShapes/btConcaveShape.cpp"
+#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp"
+#include "BulletCollision/CollisionShapes/btTriangleCallback.cpp"
+#include "BulletCollision/CollisionShapes/btConeShape.cpp"
+#include "BulletCollision/CollisionShapes/btMultiSphereShape.cpp"
+#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp"
+#include "BulletCollision/CollisionShapes/btConvex2dShape.cpp"
+#include "BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp"
+#include "BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp"
+#include "BulletCollision/CollisionShapes/btConvexHullShape.cpp"
+#include "BulletCollision/CollisionShapes/btOptimizedBvh.cpp"
+#include "BulletCollision/CollisionShapes/btTriangleMesh.cpp"
+#include "BulletCollision/CollisionShapes/btConvexInternalShape.cpp"
+#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp"
+#include "BulletCollision/CollisionShapes/btTriangleMeshShape.cpp"
+#include "BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp"
+#include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp"
+#include "BulletCollision/CollisionShapes/btSdfCollisionShape.cpp"
+#include "BulletCollision/CollisionShapes/btMiniSDF.cpp"
+#include "BulletCollision/CollisionShapes/btUniformScalingShape.cpp"
+#include "BulletCollision/Gimpact/btContactProcessing.cpp"
+#include "BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp"
+#include "BulletCollision/Gimpact/btTriangleShapeEx.cpp"
+#include "BulletCollision/Gimpact/gim_memory.cpp"
+#include "BulletCollision/Gimpact/btGImpactBvh.cpp"
+#include "BulletCollision/Gimpact/btGImpactShape.cpp"
+#include "BulletCollision/Gimpact/gim_box_set.cpp"
+#include "BulletCollision/Gimpact/gim_tri_collision.cpp"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp"
+#include "BulletCollision/Gimpact/btGenericPoolAllocator.cpp"
+#include "BulletCollision/Gimpact/gim_contact.cpp"
diff --git a/dali-physics/third-party/bullet3/src/btBulletCollisionCommon.h b/dali-physics/third-party/bullet3/src/btBulletCollisionCommon.h
new file mode 100644
index 0000000..2de34ad
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/btBulletCollisionCommon.h
@@ -0,0 +1,65 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BULLET_COLLISION_COMMON_H
+#define BULLET_COLLISION_COMMON_H
+
+///Common headerfile includes for Bullet Collision Detection
+
+///Bullet's btCollisionWorld and btCollisionObject definitions
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+
+///Collision Shapes
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btCapsuleShape.h"
+#include "BulletCollision/CollisionShapes/btCylinderShape.h"
+#include "BulletCollision/CollisionShapes/btConeShape.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+#include "BulletCollision/CollisionShapes/btConvexHullShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleMesh.h"
+#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
+#include "BulletCollision/CollisionShapes/btCompoundShape.h"
+#include "BulletCollision/CollisionShapes/btTetrahedronShape.h"
+#include "BulletCollision/CollisionShapes/btEmptyShape.h"
+#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
+#include "BulletCollision/CollisionShapes/btUniformScalingShape.h"
+
+///Narrowphase Collision Detector
+#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
+
+//#include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
+
+///Dispatching and generation of collision pairs (broadphase)
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
+#include "BulletCollision/BroadphaseCollision/btAxisSweep3.h"
+#include "BulletCollision/BroadphaseCollision/btDbvtBroadphase.h"
+
+///Math library & Utils
+#include "LinearMath/btQuaternion.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btDefaultMotionState.h"
+#include "LinearMath/btQuickprof.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btSerializer.h"
+
+#endif  //BULLET_COLLISION_COMMON_H
diff --git a/dali-physics/third-party/bullet3/src/btBulletDynamicsAll.cpp b/dali-physics/third-party/bullet3/src/btBulletDynamicsAll.cpp
new file mode 100644
index 0000000..6e73880
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/btBulletDynamicsAll.cpp
@@ -0,0 +1,43 @@
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp"
+#include "BulletDynamics/Dynamics/btRigidBody.cpp"
+#include "BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp"
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp"
+#include "BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp"
+#include "BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp"
+#include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btSliderConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btContactConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btFixedConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btHingeConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btGearConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp"
+#include "BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp"
+#include "BulletDynamics/MLCPSolvers/btDantzigLCP.cpp"
+#include "BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp"
+#include "BulletDynamics/MLCPSolvers/btMLCPSolver.cpp"
+#include "BulletDynamics/Featherstone/btMultiBody.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraint.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp"
+#include "BulletDynamics/Featherstone/btMultiBodySphericalJointLimit.cpp"
+#include "BulletDynamics/Vehicle/btRaycastVehicle.cpp"
+#include "BulletDynamics/Vehicle/btWheelInfo.cpp"
+#include "BulletDynamics/Character/btKinematicCharacterController.cpp"
+
diff --git a/dali-physics/third-party/bullet3/src/btBulletDynamicsCommon.h b/dali-physics/third-party/bullet3/src/btBulletDynamicsCommon.h
new file mode 100644
index 0000000..fef4380
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/btBulletDynamicsCommon.h
@@ -0,0 +1,43 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  https://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BULLET_DYNAMICS_COMMON_H
+#define BULLET_DYNAMICS_COMMON_H
+
+///Common headerfile includes for Bullet Dynamics, including Collision Detection
+#include "btBulletCollisionCommon.h"
+
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+
+#include "BulletDynamics/Dynamics/btSimpleDynamicsWorld.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btHingeConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btSliderConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btUniversalConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btHinge2Constraint.h"
+#include "BulletDynamics/ConstraintSolver/btGearConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btFixedConstraint.h"
+
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+
+///Vehicle simulation, with wheel contact simulated by raycasts
+#include "BulletDynamics/Vehicle/btRaycastVehicle.h"
+
+#endif  //BULLET_DYNAMICS_COMMON_H
diff --git a/dali-physics/third-party/bullet3/src/btLinearMathAll.cpp b/dali-physics/third-party/bullet3/src/btLinearMathAll.cpp
new file mode 100644
index 0000000..d05a19e
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/btLinearMathAll.cpp
@@ -0,0 +1,15 @@
+#include "LinearMath/btAlignedAllocator.cpp"
+#include "LinearMath/btGeometryUtil.cpp"
+#include "LinearMath/btSerializer.cpp"
+#include "LinearMath/btVector3.cpp"
+#include "LinearMath/btConvexHull.cpp"
+#include "LinearMath/btPolarDecomposition.cpp"
+#include "LinearMath/btSerializer64.cpp"
+#include "LinearMath/btConvexHullComputer.cpp"
+#include "LinearMath/btQuickprof.cpp"
+#include "LinearMath/btThreads.cpp"
+#include "LinearMath/btReducedVector.cpp"
+#include "LinearMath/TaskScheduler/btTaskScheduler.cpp"
+#include "LinearMath/TaskScheduler/btThreadSupportPosix.cpp"
+#include "LinearMath/TaskScheduler/btThreadSupportWin32.cpp"
+
diff --git a/dali-physics/third-party/bullet3/src/clew/clew.c b/dali-physics/third-party/bullet3/src/clew/clew.c
new file mode 100644
index 0000000..90caced
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/clew/clew.c
@@ -0,0 +1,374 @@
+//////////////////////////////////////////////////////////////////////////
+//  Copyright (c) 2009 Organic Vectory B.V.
+//  Written by George van Venrooij
+//
+//  Distributed under the Boost Software License, Version 1.0.
+//  (See accompanying file license.txt)
+//////////////////////////////////////////////////////////////////////////
+
+#include "clew.h"
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#include <windows.h>
+
+typedef HMODULE CLEW_DYNLIB_HANDLE;
+
+#define CLEW_DYNLIB_OPEN LoadLibraryA
+#define CLEW_DYNLIB_CLOSE FreeLibrary
+#define CLEW_DYNLIB_IMPORT GetProcAddress
+#else
+#include <dlfcn.h>
+
+typedef void* CLEW_DYNLIB_HANDLE;
+
+#define CLEW_DYNLIB_OPEN(path) dlopen(path, RTLD_NOW | RTLD_GLOBAL)
+#define CLEW_DYNLIB_CLOSE dlclose
+#define CLEW_DYNLIB_IMPORT dlsym
+#endif
+
+#include <stdlib.h>
+
+//! \brief module handle
+static CLEW_DYNLIB_HANDLE module = NULL;
+
+//  Variables holding function entry points
+PFNCLGETPLATFORMIDS __clewGetPlatformIDs = NULL;
+PFNCLGETPLATFORMINFO __clewGetPlatformInfo = NULL;
+PFNCLGETDEVICEIDS __clewGetDeviceIDs = NULL;
+PFNCLGETDEVICEINFO __clewGetDeviceInfo = NULL;
+PFNCLCREATECONTEXT __clewCreateContext = NULL;
+PFNCLCREATECONTEXTFROMTYPE __clewCreateContextFromType = NULL;
+PFNCLRETAINCONTEXT __clewRetainContext = NULL;
+PFNCLRELEASECONTEXT __clewReleaseContext = NULL;
+PFNCLGETCONTEXTINFO __clewGetContextInfo = NULL;
+PFNCLCREATECOMMANDQUEUE __clewCreateCommandQueue = NULL;
+PFNCLRETAINCOMMANDQUEUE __clewRetainCommandQueue = NULL;
+PFNCLRELEASECOMMANDQUEUE __clewReleaseCommandQueue = NULL;
+PFNCLGETCOMMANDQUEUEINFO __clewGetCommandQueueInfo = NULL;
+#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+PFNCLSETCOMMANDQUEUEPROPERTY __clewSetCommandQueueProperty = NULL;
+#endif
+PFNCLCREATEBUFFER __clewCreateBuffer = NULL;
+PFNCLCREATESUBBUFFER __clewCreateSubBuffer = NULL;
+PFNCLCREATEIMAGE2D __clewCreateImage2D = NULL;
+PFNCLCREATEIMAGE3D __clewCreateImage3D = NULL;
+PFNCLRETAINMEMOBJECT __clewRetainMemObject = NULL;
+PFNCLRELEASEMEMOBJECT __clewReleaseMemObject = NULL;
+PFNCLGETSUPPORTEDIMAGEFORMATS __clewGetSupportedImageFormats = NULL;
+PFNCLGETMEMOBJECTINFO __clewGetMemObjectInfo = NULL;
+PFNCLGETIMAGEINFO __clewGetImageInfo = NULL;
+PFNCLSETMEMOBJECTDESTRUCTORCALLBACK __clewSetMemObjectDestructorCallback = NULL;
+PFNCLCREATESAMPLER __clewCreateSampler = NULL;
+PFNCLRETAINSAMPLER __clewRetainSampler = NULL;
+PFNCLRELEASESAMPLER __clewReleaseSampler = NULL;
+PFNCLGETSAMPLERINFO __clewGetSamplerInfo = NULL;
+PFNCLCREATEPROGRAMWITHSOURCE __clewCreateProgramWithSource = NULL;
+PFNCLCREATEPROGRAMWITHBINARY __clewCreateProgramWithBinary = NULL;
+PFNCLRETAINPROGRAM __clewRetainProgram = NULL;
+PFNCLRELEASEPROGRAM __clewReleaseProgram = NULL;
+PFNCLBUILDPROGRAM __clewBuildProgram = NULL;
+PFNCLUNLOADCOMPILER __clewUnloadCompiler = NULL;
+PFNCLGETPROGRAMINFO __clewGetProgramInfo = NULL;
+PFNCLGETPROGRAMBUILDINFO __clewGetProgramBuildInfo = NULL;
+PFNCLCREATEKERNEL __clewCreateKernel = NULL;
+PFNCLCREATEKERNELSINPROGRAM __clewCreateKernelsInProgram = NULL;
+PFNCLRETAINKERNEL __clewRetainKernel = NULL;
+PFNCLRELEASEKERNEL __clewReleaseKernel = NULL;
+PFNCLSETKERNELARG __clewSetKernelArg = NULL;
+PFNCLGETKERNELINFO __clewGetKernelInfo = NULL;
+PFNCLGETKERNELWORKGROUPINFO __clewGetKernelWorkGroupInfo = NULL;
+PFNCLWAITFOREVENTS __clewWaitForEvents = NULL;
+PFNCLGETEVENTINFO __clewGetEventInfo = NULL;
+PFNCLCREATEUSEREVENT __clewCreateUserEvent = NULL;
+PFNCLRETAINEVENT __clewRetainEvent = NULL;
+PFNCLRELEASEEVENT __clewReleaseEvent = NULL;
+PFNCLSETUSEREVENTSTATUS __clewSetUserEventStatus = NULL;
+PFNCLSETEVENTCALLBACK __clewSetEventCallback = NULL;
+PFNCLGETEVENTPROFILINGINFO __clewGetEventProfilingInfo = NULL;
+PFNCLFLUSH __clewFlush = NULL;
+PFNCLFINISH __clewFinish = NULL;
+PFNCLENQUEUEREADBUFFER __clewEnqueueReadBuffer = NULL;
+PFNCLENQUEUEREADBUFFERRECT __clewEnqueueReadBufferRect = NULL;
+PFNCLENQUEUEWRITEBUFFER __clewEnqueueWriteBuffer = NULL;
+PFNCLENQUEUEWRITEBUFFERRECT __clewEnqueueWriteBufferRect = NULL;
+PFNCLENQUEUECOPYBUFFER __clewEnqueueCopyBuffer = NULL;
+PFNCLENQUEUEREADIMAGE __clewEnqueueReadImage = NULL;
+PFNCLENQUEUEWRITEIMAGE __clewEnqueueWriteImage = NULL;
+PFNCLENQUEUECOPYIMAGE __clewEnqueueCopyImage = NULL;
+PFNCLENQUEUECOPYBUFFERRECT __clewEnqueueCopyBufferRect = NULL;
+PFNCLENQUEUECOPYIMAGETOBUFFER __clewEnqueueCopyImageToBuffer = NULL;
+PFNCLENQUEUECOPYBUFFERTOIMAGE __clewEnqueueCopyBufferToImage = NULL;
+PFNCLENQUEUEMAPBUFFER __clewEnqueueMapBuffer = NULL;
+PFNCLENQUEUEMAPIMAGE __clewEnqueueMapImage = NULL;
+PFNCLENQUEUEUNMAPMEMOBJECT __clewEnqueueUnmapMemObject = NULL;
+PFNCLENQUEUENDRANGEKERNEL __clewEnqueueNDRangeKernel = NULL;
+PFNCLENQUEUETASK __clewEnqueueTask = NULL;
+PFNCLENQUEUENATIVEKERNEL __clewEnqueueNativeKernel = NULL;
+PFNCLENQUEUEMARKER __clewEnqueueMarker = NULL;
+PFNCLENQUEUEWAITFOREVENTS __clewEnqueueWaitForEvents = NULL;
+PFNCLENQUEUEBARRIER __clewEnqueueBarrier = NULL;
+PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress = NULL;
+
+void clewExit(void)
+{
+	if (module != NULL)
+	{
+		//  Ignore errors
+		CLEW_DYNLIB_CLOSE(module);
+		module = NULL;
+	}
+}
+
+int clewInit(const char* path)
+{
+	int error = 0;
+
+	//  Check if already initialized
+	if (module != NULL)
+	{
+		return CLEW_SUCCESS;
+	}
+
+	//  Load library
+	module = CLEW_DYNLIB_OPEN(path);
+
+	//  Check for errors
+	if (module == NULL)
+	{
+		return CLEW_ERROR_OPEN_FAILED;
+	}
+
+	//  Set unloading
+	error = atexit(clewExit);
+
+	if (error)
+	{
+		//  Failure queuing atexit, shutdown with error
+		CLEW_DYNLIB_CLOSE(module);
+		module = NULL;
+
+		return CLEW_ERROR_ATEXIT_FAILED;
+	}
+
+	//  Determine function entry-points
+	__clewGetPlatformIDs = (PFNCLGETPLATFORMIDS)CLEW_DYNLIB_IMPORT(module, "clGetPlatformIDs");
+	__clewGetPlatformInfo = (PFNCLGETPLATFORMINFO)CLEW_DYNLIB_IMPORT(module, "clGetPlatformInfo");
+	__clewGetDeviceIDs = (PFNCLGETDEVICEIDS)CLEW_DYNLIB_IMPORT(module, "clGetDeviceIDs");
+	__clewGetDeviceInfo = (PFNCLGETDEVICEINFO)CLEW_DYNLIB_IMPORT(module, "clGetDeviceInfo");
+	__clewCreateContext = (PFNCLCREATECONTEXT)CLEW_DYNLIB_IMPORT(module, "clCreateContext");
+	__clewCreateContextFromType = (PFNCLCREATECONTEXTFROMTYPE)CLEW_DYNLIB_IMPORT(module, "clCreateContextFromType");
+	__clewRetainContext = (PFNCLRETAINCONTEXT)CLEW_DYNLIB_IMPORT(module, "clRetainContext");
+	__clewReleaseContext = (PFNCLRELEASECONTEXT)CLEW_DYNLIB_IMPORT(module, "clReleaseContext");
+	__clewGetContextInfo = (PFNCLGETCONTEXTINFO)CLEW_DYNLIB_IMPORT(module, "clGetContextInfo");
+	__clewCreateCommandQueue = (PFNCLCREATECOMMANDQUEUE)CLEW_DYNLIB_IMPORT(module, "clCreateCommandQueue");
+	__clewRetainCommandQueue = (PFNCLRETAINCOMMANDQUEUE)CLEW_DYNLIB_IMPORT(module, "clRetainCommandQueue");
+	__clewReleaseCommandQueue = (PFNCLRELEASECOMMANDQUEUE)CLEW_DYNLIB_IMPORT(module, "clReleaseCommandQueue");
+	__clewGetCommandQueueInfo = (PFNCLGETCOMMANDQUEUEINFO)CLEW_DYNLIB_IMPORT(module, "clGetCommandQueueInfo");
+#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+	__clewSetCommandQueueProperty = (PFNCLSETCOMMANDQUEUEPROPERTY)CLEW_DYNLIB_IMPORT(module, "clSetCommandQueueProperty");
+#endif
+	__clewCreateBuffer = (PFNCLCREATEBUFFER)CLEW_DYNLIB_IMPORT(module, "clCreateBuffer");
+	__clewCreateSubBuffer = (PFNCLCREATESUBBUFFER)CLEW_DYNLIB_IMPORT(module, "clCreateBuffer");
+	__clewCreateImage2D = (PFNCLCREATEIMAGE2D)CLEW_DYNLIB_IMPORT(module, "clCreateImage2D");
+	__clewCreateImage3D = (PFNCLCREATEIMAGE3D)CLEW_DYNLIB_IMPORT(module, "clCreateImage3D");
+	__clewRetainMemObject = (PFNCLRETAINMEMOBJECT)CLEW_DYNLIB_IMPORT(module, "clRetainMemObject");
+	__clewReleaseMemObject = (PFNCLRELEASEMEMOBJECT)CLEW_DYNLIB_IMPORT(module, "clReleaseMemObject");
+	__clewGetSupportedImageFormats = (PFNCLGETSUPPORTEDIMAGEFORMATS)CLEW_DYNLIB_IMPORT(module, "clGetSupportedImageFormats");
+	__clewGetMemObjectInfo = (PFNCLGETMEMOBJECTINFO)CLEW_DYNLIB_IMPORT(module, "clGetMemObjectInfo");
+	__clewGetImageInfo = (PFNCLGETIMAGEINFO)CLEW_DYNLIB_IMPORT(module, "clGetImageInfo");
+	__clewSetMemObjectDestructorCallback = (PFNCLSETMEMOBJECTDESTRUCTORCALLBACK)CLEW_DYNLIB_IMPORT(module, "clSetMemObjectDestructorCallback");
+	__clewCreateSampler = (PFNCLCREATESAMPLER)CLEW_DYNLIB_IMPORT(module, "clCreateSampler");
+	__clewRetainSampler = (PFNCLRETAINSAMPLER)CLEW_DYNLIB_IMPORT(module, "clRetainSampler");
+	__clewReleaseSampler = (PFNCLRELEASESAMPLER)CLEW_DYNLIB_IMPORT(module, "clReleaseSampler");
+	__clewGetSamplerInfo = (PFNCLGETSAMPLERINFO)CLEW_DYNLIB_IMPORT(module, "clGetSamplerInfo");
+	__clewCreateProgramWithSource = (PFNCLCREATEPROGRAMWITHSOURCE)CLEW_DYNLIB_IMPORT(module, "clCreateProgramWithSource");
+	__clewCreateProgramWithBinary = (PFNCLCREATEPROGRAMWITHBINARY)CLEW_DYNLIB_IMPORT(module, "clCreateProgramWithBinary");
+	__clewRetainProgram = (PFNCLRETAINPROGRAM)CLEW_DYNLIB_IMPORT(module, "clRetainProgram");
+	__clewReleaseProgram = (PFNCLRELEASEPROGRAM)CLEW_DYNLIB_IMPORT(module, "clReleaseProgram");
+	__clewBuildProgram = (PFNCLBUILDPROGRAM)CLEW_DYNLIB_IMPORT(module, "clBuildProgram");
+	__clewUnloadCompiler = (PFNCLUNLOADCOMPILER)CLEW_DYNLIB_IMPORT(module, "clUnloadCompiler");
+	__clewGetProgramInfo = (PFNCLGETPROGRAMINFO)CLEW_DYNLIB_IMPORT(module, "clGetProgramInfo");
+	__clewGetProgramBuildInfo = (PFNCLGETPROGRAMBUILDINFO)CLEW_DYNLIB_IMPORT(module, "clGetProgramBuildInfo");
+	__clewCreateKernel = (PFNCLCREATEKERNEL)CLEW_DYNLIB_IMPORT(module, "clCreateKernel");
+	__clewCreateKernelsInProgram = (PFNCLCREATEKERNELSINPROGRAM)CLEW_DYNLIB_IMPORT(module, "clCreateKernelsInProgram");
+	__clewRetainKernel = (PFNCLRETAINKERNEL)CLEW_DYNLIB_IMPORT(module, "clRetainKernel");
+	__clewReleaseKernel = (PFNCLRELEASEKERNEL)CLEW_DYNLIB_IMPORT(module, "clReleaseKernel");
+	__clewSetKernelArg = (PFNCLSETKERNELARG)CLEW_DYNLIB_IMPORT(module, "clSetKernelArg");
+	__clewGetKernelInfo = (PFNCLGETKERNELINFO)CLEW_DYNLIB_IMPORT(module, "clGetKernelInfo");
+	__clewGetKernelWorkGroupInfo = (PFNCLGETKERNELWORKGROUPINFO)CLEW_DYNLIB_IMPORT(module, "clGetKernelWorkGroupInfo");
+	__clewWaitForEvents = (PFNCLWAITFOREVENTS)CLEW_DYNLIB_IMPORT(module, "clWaitForEvents");
+	__clewGetEventInfo = (PFNCLGETEVENTINFO)CLEW_DYNLIB_IMPORT(module, "clGetEventInfo");
+	__clewCreateUserEvent = (PFNCLCREATEUSEREVENT)CLEW_DYNLIB_IMPORT(module, "clCreateUserEvent");
+	__clewRetainEvent = (PFNCLRETAINEVENT)CLEW_DYNLIB_IMPORT(module, "clRetainEvent");
+	__clewReleaseEvent = (PFNCLRELEASEEVENT)CLEW_DYNLIB_IMPORT(module, "clReleaseEvent");
+	__clewSetUserEventStatus = (PFNCLSETUSEREVENTSTATUS)CLEW_DYNLIB_IMPORT(module, "clSetUserEventStatus");
+	__clewSetEventCallback = (PFNCLSETEVENTCALLBACK)CLEW_DYNLIB_IMPORT(module, "clSetEventCallback");
+	__clewGetEventProfilingInfo = (PFNCLGETEVENTPROFILINGINFO)CLEW_DYNLIB_IMPORT(module, "clGetEventProfilingInfo");
+	__clewFlush = (PFNCLFLUSH)CLEW_DYNLIB_IMPORT(module, "clFlush");
+	__clewFinish = (PFNCLFINISH)CLEW_DYNLIB_IMPORT(module, "clFinish");
+	__clewEnqueueReadBuffer = (PFNCLENQUEUEREADBUFFER)CLEW_DYNLIB_IMPORT(module, "clEnqueueReadBuffer");
+	__clewEnqueueReadBufferRect = (PFNCLENQUEUEREADBUFFERRECT)CLEW_DYNLIB_IMPORT(module, "clEnqueueReadBufferRect");
+	__clewEnqueueWriteBuffer = (PFNCLENQUEUEWRITEBUFFER)CLEW_DYNLIB_IMPORT(module, "clEnqueueWriteBuffer");
+	__clewEnqueueWriteBufferRect = (PFNCLENQUEUEWRITEBUFFERRECT)CLEW_DYNLIB_IMPORT(module, "clEnqueueWriteBufferRect");
+	__clewEnqueueCopyBuffer = (PFNCLENQUEUECOPYBUFFER)CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyBuffer");
+	__clewEnqueueCopyBufferRect = (PFNCLENQUEUECOPYBUFFERRECT)CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyBufferRect");
+	__clewEnqueueReadImage = (PFNCLENQUEUEREADIMAGE)CLEW_DYNLIB_IMPORT(module, "clEnqueueReadImage");
+	__clewEnqueueWriteImage = (PFNCLENQUEUEWRITEIMAGE)CLEW_DYNLIB_IMPORT(module, "clEnqueueWriteImage");
+	__clewEnqueueCopyImage = (PFNCLENQUEUECOPYIMAGE)CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyImage");
+	__clewEnqueueCopyImageToBuffer = (PFNCLENQUEUECOPYIMAGETOBUFFER)CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyImageToBuffer");
+	__clewEnqueueCopyBufferToImage = (PFNCLENQUEUECOPYBUFFERTOIMAGE)CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyBufferToImage");
+	__clewEnqueueMapBuffer = (PFNCLENQUEUEMAPBUFFER)CLEW_DYNLIB_IMPORT(module, "clEnqueueMapBuffer");
+	__clewEnqueueMapImage = (PFNCLENQUEUEMAPIMAGE)CLEW_DYNLIB_IMPORT(module, "clEnqueueMapImage");
+	__clewEnqueueUnmapMemObject = (PFNCLENQUEUEUNMAPMEMOBJECT)CLEW_DYNLIB_IMPORT(module, "clEnqueueUnmapMemObject");
+	__clewEnqueueNDRangeKernel = (PFNCLENQUEUENDRANGEKERNEL)CLEW_DYNLIB_IMPORT(module, "clEnqueueNDRangeKernel");
+	__clewEnqueueTask = (PFNCLENQUEUETASK)CLEW_DYNLIB_IMPORT(module, "clEnqueueTask");
+	__clewEnqueueNativeKernel = (PFNCLENQUEUENATIVEKERNEL)CLEW_DYNLIB_IMPORT(module, "clEnqueueNativeKernel");
+	__clewEnqueueMarker = (PFNCLENQUEUEMARKER)CLEW_DYNLIB_IMPORT(module, "clEnqueueMarker");
+	__clewEnqueueWaitForEvents = (PFNCLENQUEUEWAITFOREVENTS)CLEW_DYNLIB_IMPORT(module, "clEnqueueWaitForEvents");
+	__clewEnqueueBarrier = (PFNCLENQUEUEBARRIER)CLEW_DYNLIB_IMPORT(module, "clEnqueueBarrier");
+	__clewGetExtensionFunctionAddress = (PFNCLGETEXTENSIONFUNCTIONADDRESS)CLEW_DYNLIB_IMPORT(module, "clGetExtensionFunctionAddress");
+
+	return CLEW_SUCCESS;
+}
+
+const char* clewErrorString(cl_int error)
+{
+	static const char* strings[] =
+		{
+			// Error Codes
+			"CL_SUCCESS"  //   0
+			,
+			"CL_DEVICE_NOT_FOUND"  //  -1
+			,
+			"CL_DEVICE_NOT_AVAILABLE"  //  -2
+			,
+			"CL_COMPILER_NOT_AVAILABLE"  //  -3
+			,
+			"CL_MEM_OBJECT_ALLOCATION_FAILURE"  //  -4
+			,
+			"CL_OUT_OF_RESOURCES"  //  -5
+			,
+			"CL_OUT_OF_HOST_MEMORY"  //  -6
+			,
+			"CL_PROFILING_INFO_NOT_AVAILABLE"  //  -7
+			,
+			"CL_MEM_COPY_OVERLAP"  //  -8
+			,
+			"CL_IMAGE_FORMAT_MISMATCH"  //  -9
+			,
+			"CL_IMAGE_FORMAT_NOT_SUPPORTED"  //  -10
+			,
+			"CL_BUILD_PROGRAM_FAILURE"  //  -11
+			,
+			"CL_MAP_FAILURE"  //  -12
+
+			,
+			""  //  -13
+			,
+			""  //  -14
+			,
+			""  //  -15
+			,
+			""  //  -16
+			,
+			""  //  -17
+			,
+			""  //  -18
+			,
+			""  //  -19
+
+			,
+			""  //  -20
+			,
+			""  //  -21
+			,
+			""  //  -22
+			,
+			""  //  -23
+			,
+			""  //  -24
+			,
+			""  //  -25
+			,
+			""  //  -26
+			,
+			""  //  -27
+			,
+			""  //  -28
+			,
+			""  //  -29
+
+			,
+			"CL_INVALID_VALUE"  //  -30
+			,
+			"CL_INVALID_DEVICE_TYPE"  //  -31
+			,
+			"CL_INVALID_PLATFORM"  //  -32
+			,
+			"CL_INVALID_DEVICE"  //  -33
+			,
+			"CL_INVALID_CONTEXT"  //  -34
+			,
+			"CL_INVALID_QUEUE_PROPERTIES"  //  -35
+			,
+			"CL_INVALID_COMMAND_QUEUE"  //  -36
+			,
+			"CL_INVALID_HOST_PTR"  //  -37
+			,
+			"CL_INVALID_MEM_OBJECT"  //  -38
+			,
+			"CL_INVALID_IMAGE_FORMAT_DESCRIPTOR"  //  -39
+			,
+			"CL_INVALID_IMAGE_SIZE"  //  -40
+			,
+			"CL_INVALID_SAMPLER"  //  -41
+			,
+			"CL_INVALID_BINARY"  //  -42
+			,
+			"CL_INVALID_BUILD_OPTIONS"  //  -43
+			,
+			"CL_INVALID_PROGRAM"  //  -44
+			,
+			"CL_INVALID_PROGRAM_EXECUTABLE"  //  -45
+			,
+			"CL_INVALID_KERNEL_NAME"  //  -46
+			,
+			"CL_INVALID_KERNEL_DEFINITION"  //  -47
+			,
+			"CL_INVALID_KERNEL"  //  -48
+			,
+			"CL_INVALID_ARG_INDEX"  //  -49
+			,
+			"CL_INVALID_ARG_VALUE"  //  -50
+			,
+			"CL_INVALID_ARG_SIZE"  //  -51
+			,
+			"CL_INVALID_KERNEL_ARGS"  //  -52
+			,
+			"CL_INVALID_WORK_DIMENSION"  //  -53
+			,
+			"CL_INVALID_WORK_GROUP_SIZE"  //  -54
+			,
+			"CL_INVALID_WORK_ITEM_SIZE"  //  -55
+			,
+			"CL_INVALID_GLOBAL_OFFSET"  //  -56
+			,
+			"CL_INVALID_EVENT_WAIT_LIST"  //  -57
+			,
+			"CL_INVALID_EVENT"  //  -58
+			,
+			"CL_INVALID_OPERATION"  //  -59
+			,
+			"CL_INVALID_GL_OBJECT"  //  -60
+			,
+			"CL_INVALID_BUFFER_SIZE"  //  -61
+			,
+			"CL_INVALID_MIP_LEVEL"  //  -62
+			,
+			"CL_INVALID_GLOBAL_WORK_SIZE"  //  -63
+		};
+
+	return strings[-error];
+}
diff --git a/dali-physics/third-party/bullet3/src/clew/clew.h b/dali-physics/third-party/bullet3/src/clew/clew.h
new file mode 100644
index 0000000..cba8585
--- /dev/null
+++ b/dali-physics/third-party/bullet3/src/clew/clew.h
@@ -0,0 +1,2708 @@
+#ifndef CLEW_HPP_INCLUDED
+#define CLEW_HPP_INCLUDED
+
+//////////////////////////////////////////////////////////////////////////
+//  Copyright (c) 2009-2011 Organic Vectory B.V., KindDragon
+//  Written by George van Venrooij
+//
+//  Distributed under the MIT License.
+//////////////////////////////////////////////////////////////////////////
+
+//! \file clew.h
+//! \brief OpenCL run-time loader header
+//!
+//! This file contains a copy of the contents of CL.H and CL_PLATFORM.H from the
+//! official OpenCL spec. The purpose of this code is to load the OpenCL dynamic
+//! library at run-time and thus allow the executable to function on many
+//! platforms regardless of the vendor of the OpenCL driver actually installed.
+//! Some of the techniques used here were inspired by work done in the GLEW
+//! library (http://glew.sourceforge.net/)
+
+//  Run-time dynamic linking functionality based on concepts used in GLEW
+#ifdef __OPENCL_CL_H
+#error cl.h included before clew.h
+#endif
+
+#ifdef __OPENCL_CL_PLATFORM_H
+#error cl_platform.h included before clew.h
+#endif
+
+//  Prevent cl.h inclusion
+#define __OPENCL_CL_H
+//  Prevent cl_platform.h inclusion
+#define __CL_PLATFORM_H
+
+/*******************************************************************************
+* Copyright (c) 2008-2010 The Khronos Group Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and/or associated documentation files (the
+* "Materials"), to deal in the Materials without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Materials, and to
+* permit persons to whom the Materials are 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 Materials.
+*
+* THE MATERIALS ARE 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
+* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+******************************************************************************/
+#ifdef __APPLE__
+/* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */
+#include <AvailabilityMacros.h>
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if defined(_WIN32)
+#define CL_API_ENTRY
+#define CL_API_CALL __stdcall
+#define CL_CALLBACK __stdcall
+#else
+#define CL_API_ENTRY
+#define CL_API_CALL
+#define CL_CALLBACK
+#endif
+	//disabled the APPLE thing, don't know why it is there, is just causes tons of warnings
+
+#ifdef __APPLE1__
+#define CL_EXTENSION_WEAK_LINK __attribute__((weak_import))
+#define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#define CL_EXT_SUFFIX__VERSION_1_0 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#define CL_API_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK
+#define CL_EXT_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK
+#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#else
+#define CL_EXTENSION_WEAK_LINK
+#define CL_API_SUFFIX__VERSION_1_0
+#define CL_EXT_SUFFIX__VERSION_1_0
+#define CL_API_SUFFIX__VERSION_1_1
+#define CL_EXT_SUFFIX__VERSION_1_1
+#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+#endif
+
+#if (defined(_WIN32) && defined(_MSC_VER))
+
+	/* scalar types  */
+	typedef signed __int8 cl_char;
+	typedef unsigned __int8 cl_uchar;
+	typedef signed __int16 cl_short;
+	typedef unsigned __int16 cl_ushort;
+	typedef signed __int32 cl_int;
+	typedef unsigned __int32 cl_uint;
+	typedef signed __int64 cl_long;
+	typedef unsigned __int64 cl_ulong;
+
+	typedef unsigned __int16 cl_half;
+	typedef float cl_float;
+	typedef double cl_double;
+
+/* Macro names and corresponding values defined by OpenCL */
+#define CL_CHAR_BIT 8
+#define CL_SCHAR_MAX 127
+#define CL_SCHAR_MIN (-127 - 1)
+#define CL_CHAR_MAX CL_SCHAR_MAX
+#define CL_CHAR_MIN CL_SCHAR_MIN
+#define CL_UCHAR_MAX 255
+#define CL_SHRT_MAX 32767
+#define CL_SHRT_MIN (-32767 - 1)
+#define CL_USHRT_MAX 65535
+#define CL_INT_MAX 2147483647
+#define CL_INT_MIN (-2147483647 - 1)
+#define CL_UINT_MAX 0xffffffffU
+#define CL_LONG_MAX ((cl_long)0x7FFFFFFFFFFFFFFFLL)
+#define CL_LONG_MIN ((cl_long)-0x7FFFFFFFFFFFFFFFLL - 1LL)
+#define CL_ULONG_MAX ((cl_ulong)0xFFFFFFFFFFFFFFFFULL)
+
+#define CL_FLT_DIG 6
+#define CL_FLT_MANT_DIG 24
+#define CL_FLT_MAX_10_EXP +38
+#define CL_FLT_MAX_EXP +128
+#define CL_FLT_MIN_10_EXP -37
+#define CL_FLT_MIN_EXP -125
+#define CL_FLT_RADIX 2
+#define CL_FLT_MAX 340282346638528859811704183484516925440.0f
+#define CL_FLT_MIN 1.175494350822287507969e-38f
+#define CL_FLT_EPSILON 0x1.0p-23f
+
+#define CL_DBL_DIG 15
+#define CL_DBL_MANT_DIG 53
+#define CL_DBL_MAX_10_EXP +308
+#define CL_DBL_MAX_EXP +1024
+#define CL_DBL_MIN_10_EXP -307
+#define CL_DBL_MIN_EXP -1021
+#define CL_DBL_RADIX 2
+#define CL_DBL_MAX 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0
+#define CL_DBL_MIN 2.225073858507201383090e-308
+#define CL_DBL_EPSILON 2.220446049250313080847e-16
+
+#define CL_M_E 2.718281828459045090796
+#define CL_M_LOG2E 1.442695040888963387005
+#define CL_M_LOG10E 0.434294481903251816668
+#define CL_M_LN2 0.693147180559945286227
+#define CL_M_LN10 2.302585092994045901094
+#define CL_M_PI 3.141592653589793115998
+#define CL_M_PI_2 1.570796326794896557999
+#define CL_M_PI_4 0.785398163397448278999
+#define CL_M_1_PI 0.318309886183790691216
+#define CL_M_2_PI 0.636619772367581382433
+#define CL_M_2_SQRTPI 1.128379167095512558561
+#define CL_M_SQRT2 1.414213562373095145475
+#define CL_M_SQRT1_2 0.707106781186547572737
+
+#define CL_M_E_F 2.71828174591064f
+#define CL_M_LOG2E_F 1.44269502162933f
+#define CL_M_LOG10E_F 0.43429449200630f
+#define CL_M_LN2_F 0.69314718246460f
+#define CL_M_LN10_F 2.30258512496948f
+#define CL_M_PI_F 3.14159274101257f
+#define CL_M_PI_2_F 1.57079637050629f
+#define CL_M_PI_4_F 0.78539818525314f
+#define CL_M_1_PI_F 0.31830987334251f
+#define CL_M_2_PI_F 0.63661974668503f
+#define CL_M_2_SQRTPI_F 1.12837922573090f
+#define CL_M_SQRT2_F 1.41421353816986f
+#define CL_M_SQRT1_2_F 0.70710676908493f
+
+#define CL_NAN (CL_INFINITY - CL_INFINITY)
+#define CL_HUGE_VALF ((cl_float)1e50)
+#define CL_HUGE_VAL ((cl_double)1e500)
+#define CL_MAXFLOAT CL_FLT_MAX
+#define CL_INFINITY CL_HUGE_VALF
+
+#else
+
+#include <stdint.h>
+
+/* scalar types  */
+typedef int8_t cl_char;
+typedef uint8_t cl_uchar;
+typedef int16_t cl_short __attribute__((aligned(2)));
+typedef uint16_t cl_ushort __attribute__((aligned(2)));
+typedef int32_t cl_int __attribute__((aligned(4)));
+typedef uint32_t cl_uint __attribute__((aligned(4)));
+typedef int64_t cl_long __attribute__((aligned(8)));
+typedef uint64_t cl_ulong __attribute__((aligned(8)));
+
+typedef uint16_t cl_half __attribute__((aligned(2)));
+typedef float cl_float __attribute__((aligned(4)));
+typedef double cl_double __attribute__((aligned(8)));
+
+/* Macro names and corresponding values defined by OpenCL */
+#define CL_CHAR_BIT 8
+#define CL_SCHAR_MAX 127
+#define CL_SCHAR_MIN (-127 - 1)
+#define CL_CHAR_MAX CL_SCHAR_MAX
+#define CL_CHAR_MIN CL_SCHAR_MIN
+#define CL_UCHAR_MAX 255
+#define CL_SHRT_MAX 32767
+#define CL_SHRT_MIN (-32767 - 1)
+#define CL_USHRT_MAX 65535
+#define CL_INT_MAX 2147483647
+#define CL_INT_MIN (-2147483647 - 1)
+#define CL_UINT_MAX 0xffffffffU
+#define CL_LONG_MAX ((cl_long)0x7FFFFFFFFFFFFFFFLL)
+#define CL_LONG_MIN ((cl_long)-0x7FFFFFFFFFFFFFFFLL - 1LL)
+#define CL_ULONG_MAX ((cl_ulong)0xFFFFFFFFFFFFFFFFULL)
+
+#define CL_FLT_DIG 6
+#define CL_FLT_MANT_DIG 24
+#define CL_FLT_MAX_10_EXP +38
+#define CL_FLT_MAX_EXP +128
+#define CL_FLT_MIN_10_EXP -37
+#define CL_FLT_MIN_EXP -125
+#define CL_FLT_RADIX 2
+#define CL_FLT_MAX 0x1.fffffep127f
+#define CL_FLT_MIN 0x1.0p-126f
+#define CL_FLT_EPSILON 0x1.0p-23f
+
+#define CL_DBL_DIG 15
+#define CL_DBL_MANT_DIG 53
+#define CL_DBL_MAX_10_EXP +308
+#define CL_DBL_MAX_EXP +1024
+#define CL_DBL_MIN_10_EXP -307
+#define CL_DBL_MIN_EXP -1021
+#define CL_DBL_RADIX 2
+#define CL_DBL_MAX 0x1.fffffffffffffp1023
+#define CL_DBL_MIN 0x1.0p-1022
+#define CL_DBL_EPSILON 0x1.0p-52
+
+#define CL_M_E 2.718281828459045090796
+#define CL_M_LOG2E 1.442695040888963387005
+#define CL_M_LOG10E 0.434294481903251816668
+#define CL_M_LN2 0.693147180559945286227
+#define CL_M_LN10 2.302585092994045901094
+#define CL_M_PI 3.141592653589793115998
+#define CL_M_PI_2 1.570796326794896557999
+#define CL_M_PI_4 0.785398163397448278999
+#define CL_M_1_PI 0.318309886183790691216
+#define CL_M_2_PI 0.636619772367581382433
+#define CL_M_2_SQRTPI 1.128379167095512558561
+#define CL_M_SQRT2 1.414213562373095145475
+#define CL_M_SQRT1_2 0.707106781186547572737
+
+#define CL_M_E_F 2.71828174591064f
+#define CL_M_LOG2E_F 1.44269502162933f
+#define CL_M_LOG10E_F 0.43429449200630f
+#define CL_M_LN2_F 0.69314718246460f
+#define CL_M_LN10_F 2.30258512496948f
+#define CL_M_PI_F 3.14159274101257f
+#define CL_M_PI_2_F 1.57079637050629f
+#define CL_M_PI_4_F 0.78539818525314f
+#define CL_M_1_PI_F 0.31830987334251f
+#define CL_M_2_PI_F 0.63661974668503f
+#define CL_M_2_SQRTPI_F 1.12837922573090f
+#define CL_M_SQRT2_F 1.41421353816986f
+#define CL_M_SQRT1_2_F 0.70710676908493f
+
+#if defined(__GNUC__)
+#define CL_HUGE_VALF __builtin_huge_valf()
+#define CL_HUGE_VAL __builtin_huge_val()
+#define CL_NAN __builtin_nanf("")
+#else
+#define CL_HUGE_VALF ((cl_float)1e50)
+#define CL_HUGE_VAL ((cl_double)1e500)
+float nanf(const char *);
+#define CL_NAN nanf("")
+#endif
+#define CL_MAXFLOAT CL_FLT_MAX
+#define CL_INFINITY CL_HUGE_VALF
+
+#endif
+
+#include <stddef.h>
+
+	/* Mirror types to GL types. Mirror types allow us to avoid deciding which headers to load based on whether we are using GL or GLES here. */
+	typedef unsigned int cl_GLuint;
+	typedef int cl_GLint;
+	typedef unsigned int cl_GLenum;
+
+	/*
+ * Vector types 
+ *
+ *  Note:   OpenCL requires that all types be naturally aligned. 
+ *          This means that vector types must be naturally aligned.
+ *          For example, a vector of four floats must be aligned to
+ *          a 16 byte boundary (calculated as 4 * the natural 4-byte 
+ *          alignment of the float).  The alignment qualifiers here
+ *          will only function properly if your compiler supports them
+ *          and if you don't actively work to defeat them.  For example,
+ *          in order for a cl_float4 to be 16 byte aligned in a struct,
+ *          the start of the struct must itself be 16-byte aligned. 
+ *
+ *          Maintaining proper alignment is the user's responsibility.
+ */
+
+#ifdef _MSC_VER
+#if defined(_M_IX86)
+#if _M_IX86_FP >= 0
+#define __SSE__
+#endif
+#if _M_IX86_FP >= 1
+#define __SSE2__
+#endif
+#elif defined(_M_X64)
+#define __SSE__
+#define __SSE2__
+#endif
+#endif
+
+/* Define basic vector types */
+#if defined(__VEC__)
+#include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+	typedef vector unsigned char __cl_uchar16;
+	typedef vector signed char __cl_char16;
+	typedef vector unsigned short __cl_ushort8;
+	typedef vector signed short __cl_short8;
+	typedef vector unsigned int __cl_uint4;
+	typedef vector signed int __cl_int4;
+	typedef vector float __cl_float4;
+#define __CL_UCHAR16__ 1
+#define __CL_CHAR16__ 1
+#define __CL_USHORT8__ 1
+#define __CL_SHORT8__ 1
+#define __CL_UINT4__ 1
+#define __CL_INT4__ 1
+#define __CL_FLOAT4__ 1
+#endif
+
+#if defined(__SSE__)
+#if defined(__MINGW64__)
+#include <intrin.h>
+#else
+#include <xmmintrin.h>
+#endif
+#if defined(__GNUC__) && !defined(__ICC)
+	typedef float __cl_float4 __attribute__((vector_size(16)));
+#else
+	typedef __m128 __cl_float4;
+#endif
+#define __CL_FLOAT4__ 1
+#endif
+
+#if defined(__SSE2__)
+#if defined(__MINGW64__)
+#include <intrin.h>
+#else
+#include <emmintrin.h>
+#endif
+#if defined(__GNUC__) && !defined(__ICC)
+	typedef cl_uchar __cl_uchar16 __attribute__((vector_size(16)));
+	typedef cl_char __cl_char16 __attribute__((vector_size(16)));
+	typedef cl_ushort __cl_ushort8 __attribute__((vector_size(16)));
+	typedef cl_short __cl_short8 __attribute__((vector_size(16)));
+	typedef cl_uint __cl_uint4 __attribute__((vector_size(16)));
+	typedef cl_int __cl_int4 __attribute__((vector_size(16)));
+	typedef cl_ulong __cl_ulong2 __attribute__((vector_size(16)));
+	typedef cl_long __cl_long2 __attribute__((vector_size(16)));
+	typedef cl_double __cl_double2 __attribute__((vector_size(16)));
+#else
+	typedef __m128i __cl_uchar16;
+	typedef __m128i __cl_char16;
+	typedef __m128i __cl_ushort8;
+	typedef __m128i __cl_short8;
+	typedef __m128i __cl_uint4;
+	typedef __m128i __cl_int4;
+	typedef __m128i __cl_ulong2;
+	typedef __m128i __cl_long2;
+	typedef __m128d __cl_double2;
+#endif
+#define __CL_UCHAR16__ 1
+#define __CL_CHAR16__ 1
+#define __CL_USHORT8__ 1
+#define __CL_SHORT8__ 1
+#define __CL_INT4__ 1
+#define __CL_UINT4__ 1
+#define __CL_ULONG2__ 1
+#define __CL_LONG2__ 1
+#define __CL_DOUBLE2__ 1
+#endif
+
+#if defined(__MMX__)
+#include <mmintrin.h>
+#if defined(__GNUC__) && !defined(__ICC)
+	typedef cl_uchar __cl_uchar8 __attribute__((vector_size(8)));
+	typedef cl_char __cl_char8 __attribute__((vector_size(8)));
+	typedef cl_ushort __cl_ushort4 __attribute__((vector_size(8)));
+	typedef cl_short __cl_short4 __attribute__((vector_size(8)));
+	typedef cl_uint __cl_uint2 __attribute__((vector_size(8)));
+	typedef cl_int __cl_int2 __attribute__((vector_size(8)));
+	typedef cl_ulong __cl_ulong1 __attribute__((vector_size(8)));
+	typedef cl_long __cl_long1 __attribute__((vector_size(8)));
+	typedef cl_float __cl_float2 __attribute__((vector_size(8)));
+#else
+	typedef __m64 __cl_uchar8;
+	typedef __m64 __cl_char8;
+	typedef __m64 __cl_ushort4;
+	typedef __m64 __cl_short4;
+	typedef __m64 __cl_uint2;
+	typedef __m64 __cl_int2;
+	typedef __m64 __cl_ulong1;
+	typedef __m64 __cl_long1;
+	typedef __m64 __cl_float2;
+#endif
+#define __CL_UCHAR8__ 1
+#define __CL_CHAR8__ 1
+#define __CL_USHORT4__ 1
+#define __CL_SHORT4__ 1
+#define __CL_INT2__ 1
+#define __CL_UINT2__ 1
+#define __CL_ULONG1__ 1
+#define __CL_LONG1__ 1
+#define __CL_FLOAT2__ 1
+#endif
+
+#if defined(__AVX__)
+#if defined(__MINGW64__)
+#include <intrin.h>
+#else
+#include <immintrin.h>
+#endif
+#if defined(__GNUC__) && !defined(__ICC)
+	typedef cl_float __cl_float8 __attribute__((vector_size(32)));
+	typedef cl_double __cl_double4 __attribute__((vector_size(32)));
+#else
+	typedef __m256 __cl_float8;
+	typedef __m256d __cl_double4;
+#endif
+#define __CL_FLOAT8__ 1
+#define __CL_DOUBLE4__ 1
+#endif
+
+/* Define alignment keys */
+#if defined(__GNUC__)
+#define CL_ALIGNED(_x) __attribute__((aligned(_x)))
+#elif defined(_WIN32) && (_MSC_VER)
+/* Alignment keys neutered on windows because MSVC can't swallow function arguments with alignment requirements     */
+/* http://msdn.microsoft.com/en-us/library/373ak2y1%28VS.71%29.aspx                                                 */
+/* #include <crtdefs.h>                                                                                             */
+/* #define CL_ALIGNED(_x)          _CRT_ALIGN(_x)                                                                   */
+#define CL_ALIGNED(_x)
+#else
+#warning Need to implement some method to align data here
+#define CL_ALIGNED(_x)
+#endif
+
+/* Indicate whether .xyzw, .s0123 and .hi.lo are supported */
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(_MSC_VER) && !defined(__STDC__))
+/* .xyzw and .s0123...{f|F} are supported */
+#define CL_HAS_NAMED_VECTOR_FIELDS 1
+/* .hi and .lo are supported */
+#define CL_HAS_HI_LO_VECTOR_FIELDS 1
+
+#define CL_NAMED_STRUCT_SUPPORTED
+#endif
+
+#if defined(CL_NAMED_STRUCT_SUPPORTED) && defined(_MSC_VER)
+#define __extension__ __pragma(warning(suppress : 4201))
+#endif
+
+	/* Define cl_vector types */
+
+	/* ---- cl_charn ---- */
+	typedef union {
+		cl_char CL_ALIGNED(2) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_char x, y;
+		};
+		__extension__ struct
+		{
+			cl_char s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_char lo, hi;
+		};
+#endif
+#if defined(__CL_CHAR2__)
+		__cl_char2 v2;
+#endif
+	} cl_char2;
+
+	typedef union {
+		cl_char CL_ALIGNED(4) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_char x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_char s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_char2 lo, hi;
+		};
+#endif
+#if defined(__CL_CHAR2__)
+		__cl_char2 v2[2];
+#endif
+#if defined(__CL_CHAR4__)
+		__cl_char4 v4;
+#endif
+	} cl_char4;
+
+	/* cl_char3 is identical in size, alignment and behavior to cl_char4. See section 6.1.5. */
+	typedef cl_char4 cl_char3;
+
+	typedef union {
+		cl_char CL_ALIGNED(8) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_char x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_char s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_char4 lo, hi;
+		};
+#endif
+#if defined(__CL_CHAR2__)
+		__cl_char2 v2[4];
+#endif
+#if defined(__CL_CHAR4__)
+		__cl_char4 v4[2];
+#endif
+#if defined(__CL_CHAR8__)
+		__cl_char8 v8;
+#endif
+	} cl_char8;
+
+	typedef union {
+		cl_char CL_ALIGNED(16) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_char x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_char s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_char8 lo, hi;
+		};
+#endif
+#if defined(__CL_CHAR2__)
+		__cl_char2 v2[8];
+#endif
+#if defined(__CL_CHAR4__)
+		__cl_char4 v4[4];
+#endif
+#if defined(__CL_CHAR8__)
+		__cl_char8 v8[2];
+#endif
+#if defined(__CL_CHAR16__)
+		__cl_char16 v16;
+#endif
+	} cl_char16;
+
+	/* ---- cl_ucharn ---- */
+	typedef union {
+		cl_uchar CL_ALIGNED(2) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uchar x, y;
+		};
+		__extension__ struct
+		{
+			cl_uchar s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_uchar lo, hi;
+		};
+#endif
+#if defined(__cl_uchar2__)
+		__cl_uchar2 v2;
+#endif
+	} cl_uchar2;
+
+	typedef union {
+		cl_uchar CL_ALIGNED(4) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uchar x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_uchar s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_uchar2 lo, hi;
+		};
+#endif
+#if defined(__CL_UCHAR2__)
+		__cl_uchar2 v2[2];
+#endif
+#if defined(__CL_UCHAR4__)
+		__cl_uchar4 v4;
+#endif
+	} cl_uchar4;
+
+	/* cl_uchar3 is identical in size, alignment and behavior to cl_uchar4. See section 6.1.5. */
+	typedef cl_uchar4 cl_uchar3;
+
+	typedef union {
+		cl_uchar CL_ALIGNED(8) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uchar x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_uchar s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_uchar4 lo, hi;
+		};
+#endif
+#if defined(__CL_UCHAR2__)
+		__cl_uchar2 v2[4];
+#endif
+#if defined(__CL_UCHAR4__)
+		__cl_uchar4 v4[2];
+#endif
+#if defined(__CL_UCHAR8__)
+		__cl_uchar8 v8;
+#endif
+	} cl_uchar8;
+
+	typedef union {
+		cl_uchar CL_ALIGNED(16) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uchar x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_uchar s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_uchar8 lo, hi;
+		};
+#endif
+#if defined(__CL_UCHAR2__)
+		__cl_uchar2 v2[8];
+#endif
+#if defined(__CL_UCHAR4__)
+		__cl_uchar4 v4[4];
+#endif
+#if defined(__CL_UCHAR8__)
+		__cl_uchar8 v8[2];
+#endif
+#if defined(__CL_UCHAR16__)
+		__cl_uchar16 v16;
+#endif
+	} cl_uchar16;
+
+	/* ---- cl_shortn ---- */
+	typedef union {
+		cl_short CL_ALIGNED(4) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_short x, y;
+		};
+		__extension__ struct
+		{
+			cl_short s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_short lo, hi;
+		};
+#endif
+#if defined(__CL_SHORT2__)
+		__cl_short2 v2;
+#endif
+	} cl_short2;
+
+	typedef union {
+		cl_short CL_ALIGNED(8) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_short x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_short s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_short2 lo, hi;
+		};
+#endif
+#if defined(__CL_SHORT2__)
+		__cl_short2 v2[2];
+#endif
+#if defined(__CL_SHORT4__)
+		__cl_short4 v4;
+#endif
+	} cl_short4;
+
+	/* cl_short3 is identical in size, alignment and behavior to cl_short4. See section 6.1.5. */
+	typedef cl_short4 cl_short3;
+
+	typedef union {
+		cl_short CL_ALIGNED(16) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_short x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_short s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_short4 lo, hi;
+		};
+#endif
+#if defined(__CL_SHORT2__)
+		__cl_short2 v2[4];
+#endif
+#if defined(__CL_SHORT4__)
+		__cl_short4 v4[2];
+#endif
+#if defined(__CL_SHORT8__)
+		__cl_short8 v8;
+#endif
+	} cl_short8;
+
+	typedef union {
+		cl_short CL_ALIGNED(32) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_short x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_short s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_short8 lo, hi;
+		};
+#endif
+#if defined(__CL_SHORT2__)
+		__cl_short2 v2[8];
+#endif
+#if defined(__CL_SHORT4__)
+		__cl_short4 v4[4];
+#endif
+#if defined(__CL_SHORT8__)
+		__cl_short8 v8[2];
+#endif
+#if defined(__CL_SHORT16__)
+		__cl_short16 v16;
+#endif
+	} cl_short16;
+
+	/* ---- cl_ushortn ---- */
+	typedef union {
+		cl_ushort CL_ALIGNED(4) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ushort x, y;
+		};
+		__extension__ struct
+		{
+			cl_ushort s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_ushort lo, hi;
+		};
+#endif
+#if defined(__CL_USHORT2__)
+		__cl_ushort2 v2;
+#endif
+	} cl_ushort2;
+
+	typedef union {
+		cl_ushort CL_ALIGNED(8) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ushort x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_ushort s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_ushort2 lo, hi;
+		};
+#endif
+#if defined(__CL_USHORT2__)
+		__cl_ushort2 v2[2];
+#endif
+#if defined(__CL_USHORT4__)
+		__cl_ushort4 v4;
+#endif
+	} cl_ushort4;
+
+	/* cl_ushort3 is identical in size, alignment and behavior to cl_ushort4. See section 6.1.5. */
+	typedef cl_ushort4 cl_ushort3;
+
+	typedef union {
+		cl_ushort CL_ALIGNED(16) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ushort x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_ushort s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_ushort4 lo, hi;
+		};
+#endif
+#if defined(__CL_USHORT2__)
+		__cl_ushort2 v2[4];
+#endif
+#if defined(__CL_USHORT4__)
+		__cl_ushort4 v4[2];
+#endif
+#if defined(__CL_USHORT8__)
+		__cl_ushort8 v8;
+#endif
+	} cl_ushort8;
+
+	typedef union {
+		cl_ushort CL_ALIGNED(32) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ushort x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_ushort s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_ushort8 lo, hi;
+		};
+#endif
+#if defined(__CL_USHORT2__)
+		__cl_ushort2 v2[8];
+#endif
+#if defined(__CL_USHORT4__)
+		__cl_ushort4 v4[4];
+#endif
+#if defined(__CL_USHORT8__)
+		__cl_ushort8 v8[2];
+#endif
+#if defined(__CL_USHORT16__)
+		__cl_ushort16 v16;
+#endif
+	} cl_ushort16;
+
+	/* ---- cl_intn ---- */
+	typedef union {
+		cl_int CL_ALIGNED(8) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_int x, y;
+		};
+		__extension__ struct
+		{
+			cl_int s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_int lo, hi;
+		};
+#endif
+#if defined(__CL_INT2__)
+		__cl_int2 v2;
+#endif
+	} cl_int2;
+
+	typedef union {
+		cl_int CL_ALIGNED(16) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_int x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_int s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_int2 lo, hi;
+		};
+#endif
+#if defined(__CL_INT2__)
+		__cl_int2 v2[2];
+#endif
+#if defined(__CL_INT4__)
+		__cl_int4 v4;
+#endif
+	} cl_int4;
+
+	/* cl_int3 is identical in size, alignment and behavior to cl_int4. See section 6.1.5. */
+	typedef cl_int4 cl_int3;
+
+	typedef union {
+		cl_int CL_ALIGNED(32) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_int x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_int s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_int4 lo, hi;
+		};
+#endif
+#if defined(__CL_INT2__)
+		__cl_int2 v2[4];
+#endif
+#if defined(__CL_INT4__)
+		__cl_int4 v4[2];
+#endif
+#if defined(__CL_INT8__)
+		__cl_int8 v8;
+#endif
+	} cl_int8;
+
+	typedef union {
+		cl_int CL_ALIGNED(64) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_int x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_int s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_int8 lo, hi;
+		};
+#endif
+#if defined(__CL_INT2__)
+		__cl_int2 v2[8];
+#endif
+#if defined(__CL_INT4__)
+		__cl_int4 v4[4];
+#endif
+#if defined(__CL_INT8__)
+		__cl_int8 v8[2];
+#endif
+#if defined(__CL_INT16__)
+		__cl_int16 v16;
+#endif
+	} cl_int16;
+
+	/* ---- cl_uintn ---- */
+	typedef union {
+		cl_uint CL_ALIGNED(8) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uint x, y;
+		};
+		__extension__ struct
+		{
+			cl_uint s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_uint lo, hi;
+		};
+#endif
+#if defined(__CL_UINT2__)
+		__cl_uint2 v2;
+#endif
+	} cl_uint2;
+
+	typedef union {
+		cl_uint CL_ALIGNED(16) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uint x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_uint s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_uint2 lo, hi;
+		};
+#endif
+#if defined(__CL_UINT2__)
+		__cl_uint2 v2[2];
+#endif
+#if defined(__CL_UINT4__)
+		__cl_uint4 v4;
+#endif
+	} cl_uint4;
+
+	/* cl_uint3 is identical in size, alignment and behavior to cl_uint4. See section 6.1.5. */
+	typedef cl_uint4 cl_uint3;
+
+	typedef union {
+		cl_uint CL_ALIGNED(32) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uint x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_uint s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_uint4 lo, hi;
+		};
+#endif
+#if defined(__CL_UINT2__)
+		__cl_uint2 v2[4];
+#endif
+#if defined(__CL_UINT4__)
+		__cl_uint4 v4[2];
+#endif
+#if defined(__CL_UINT8__)
+		__cl_uint8 v8;
+#endif
+	} cl_uint8;
+
+	typedef union {
+		cl_uint CL_ALIGNED(64) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_uint x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_uint s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_uint8 lo, hi;
+		};
+#endif
+#if defined(__CL_UINT2__)
+		__cl_uint2 v2[8];
+#endif
+#if defined(__CL_UINT4__)
+		__cl_uint4 v4[4];
+#endif
+#if defined(__CL_UINT8__)
+		__cl_uint8 v8[2];
+#endif
+#if defined(__CL_UINT16__)
+		__cl_uint16 v16;
+#endif
+	} cl_uint16;
+
+	/* ---- cl_longn ---- */
+	typedef union {
+		cl_long CL_ALIGNED(16) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_long x, y;
+		};
+		__extension__ struct
+		{
+			cl_long s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_long lo, hi;
+		};
+#endif
+#if defined(__CL_LONG2__)
+		__cl_long2 v2;
+#endif
+	} cl_long2;
+
+	typedef union {
+		cl_long CL_ALIGNED(32) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_long x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_long s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_long2 lo, hi;
+		};
+#endif
+#if defined(__CL_LONG2__)
+		__cl_long2 v2[2];
+#endif
+#if defined(__CL_LONG4__)
+		__cl_long4 v4;
+#endif
+	} cl_long4;
+
+	/* cl_long3 is identical in size, alignment and behavior to cl_long4. See section 6.1.5. */
+	typedef cl_long4 cl_long3;
+
+	typedef union {
+		cl_long CL_ALIGNED(64) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_long x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_long s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_long4 lo, hi;
+		};
+#endif
+#if defined(__CL_LONG2__)
+		__cl_long2 v2[4];
+#endif
+#if defined(__CL_LONG4__)
+		__cl_long4 v4[2];
+#endif
+#if defined(__CL_LONG8__)
+		__cl_long8 v8;
+#endif
+	} cl_long8;
+
+	typedef union {
+		cl_long CL_ALIGNED(128) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_long x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_long s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_long8 lo, hi;
+		};
+#endif
+#if defined(__CL_LONG2__)
+		__cl_long2 v2[8];
+#endif
+#if defined(__CL_LONG4__)
+		__cl_long4 v4[4];
+#endif
+#if defined(__CL_LONG8__)
+		__cl_long8 v8[2];
+#endif
+#if defined(__CL_LONG16__)
+		__cl_long16 v16;
+#endif
+	} cl_long16;
+
+	/* ---- cl_ulongn ---- */
+	typedef union {
+		cl_ulong CL_ALIGNED(16) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ulong x, y;
+		};
+		__extension__ struct
+		{
+			cl_ulong s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_ulong lo, hi;
+		};
+#endif
+#if defined(__CL_ULONG2__)
+		__cl_ulong2 v2;
+#endif
+	} cl_ulong2;
+
+	typedef union {
+		cl_ulong CL_ALIGNED(32) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ulong x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_ulong s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_ulong2 lo, hi;
+		};
+#endif
+#if defined(__CL_ULONG2__)
+		__cl_ulong2 v2[2];
+#endif
+#if defined(__CL_ULONG4__)
+		__cl_ulong4 v4;
+#endif
+	} cl_ulong4;
+
+	/* cl_ulong3 is identical in size, alignment and behavior to cl_ulong4. See section 6.1.5. */
+	typedef cl_ulong4 cl_ulong3;
+
+	typedef union {
+		cl_ulong CL_ALIGNED(64) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ulong x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_ulong s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_ulong4 lo, hi;
+		};
+#endif
+#if defined(__CL_ULONG2__)
+		__cl_ulong2 v2[4];
+#endif
+#if defined(__CL_ULONG4__)
+		__cl_ulong4 v4[2];
+#endif
+#if defined(__CL_ULONG8__)
+		__cl_ulong8 v8;
+#endif
+	} cl_ulong8;
+
+	typedef union {
+		cl_ulong CL_ALIGNED(128) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_ulong x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_ulong s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_ulong8 lo, hi;
+		};
+#endif
+#if defined(__CL_ULONG2__)
+		__cl_ulong2 v2[8];
+#endif
+#if defined(__CL_ULONG4__)
+		__cl_ulong4 v4[4];
+#endif
+#if defined(__CL_ULONG8__)
+		__cl_ulong8 v8[2];
+#endif
+#if defined(__CL_ULONG16__)
+		__cl_ulong16 v16;
+#endif
+	} cl_ulong16;
+
+	/* --- cl_floatn ---- */
+
+	typedef union {
+		cl_float CL_ALIGNED(8) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_float x, y;
+		};
+		__extension__ struct
+		{
+			cl_float s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_float lo, hi;
+		};
+#endif
+#if defined(__CL_FLOAT2__)
+		__cl_float2 v2;
+#endif
+	} cl_float2;
+
+	typedef union {
+		cl_float CL_ALIGNED(16) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_float x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_float s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_float2 lo, hi;
+		};
+#endif
+#if defined(__CL_FLOAT2__)
+		__cl_float2 v2[2];
+#endif
+#if defined(__CL_FLOAT4__)
+		__cl_float4 v4;
+#endif
+	} cl_float4;
+
+	/* cl_float3 is identical in size, alignment and behavior to cl_float4. See section 6.1.5. */
+	typedef cl_float4 cl_float3;
+
+	typedef union {
+		cl_float CL_ALIGNED(32) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_float x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_float s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_float4 lo, hi;
+		};
+#endif
+#if defined(__CL_FLOAT2__)
+		__cl_float2 v2[4];
+#endif
+#if defined(__CL_FLOAT4__)
+		__cl_float4 v4[2];
+#endif
+#if defined(__CL_FLOAT8__)
+		__cl_float8 v8;
+#endif
+	} cl_float8;
+
+	typedef union {
+		cl_float CL_ALIGNED(64) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_float x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_float s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_float8 lo, hi;
+		};
+#endif
+#if defined(__CL_FLOAT2__)
+		__cl_float2 v2[8];
+#endif
+#if defined(__CL_FLOAT4__)
+		__cl_float4 v4[4];
+#endif
+#if defined(__CL_FLOAT8__)
+		__cl_float8 v8[2];
+#endif
+#if defined(__CL_FLOAT16__)
+		__cl_float16 v16;
+#endif
+	} cl_float16;
+
+	/* --- cl_doublen ---- */
+
+	typedef union {
+		cl_double CL_ALIGNED(16) s[2];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_double x, y;
+		};
+		__extension__ struct
+		{
+			cl_double s0, s1;
+		};
+		__extension__ struct
+		{
+			cl_double lo, hi;
+		};
+#endif
+#if defined(__CL_DOUBLE2__)
+		__cl_double2 v2;
+#endif
+	} cl_double2;
+
+	typedef union {
+		cl_double CL_ALIGNED(32) s[4];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_double x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_double s0, s1, s2, s3;
+		};
+		__extension__ struct
+		{
+			cl_double2 lo, hi;
+		};
+#endif
+#if defined(__CL_DOUBLE2__)
+		__cl_double2 v2[2];
+#endif
+#if defined(__CL_DOUBLE4__)
+		__cl_double4 v4;
+#endif
+	} cl_double4;
+
+	/* cl_double3 is identical in size, alignment and behavior to cl_double4. See section 6.1.5. */
+	typedef cl_double4 cl_double3;
+
+	typedef union {
+		cl_double CL_ALIGNED(64) s[8];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_double x, y, z, w;
+		};
+		__extension__ struct
+		{
+			cl_double s0, s1, s2, s3, s4, s5, s6, s7;
+		};
+		__extension__ struct
+		{
+			cl_double4 lo, hi;
+		};
+#endif
+#if defined(__CL_DOUBLE2__)
+		__cl_double2 v2[4];
+#endif
+#if defined(__CL_DOUBLE4__)
+		__cl_double4 v4[2];
+#endif
+#if defined(__CL_DOUBLE8__)
+		__cl_double8 v8;
+#endif
+	} cl_double8;
+
+	typedef union {
+		cl_double CL_ALIGNED(128) s[16];
+#if defined(CL_NAMED_STRUCT_SUPPORTED)
+		__extension__ struct
+		{
+			cl_double x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf;
+		};
+		__extension__ struct
+		{
+			cl_double s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF;
+		};
+		__extension__ struct
+		{
+			cl_double8 lo, hi;
+		};
+#endif
+#if defined(__CL_DOUBLE2__)
+		__cl_double2 v2[8];
+#endif
+#if defined(__CL_DOUBLE4__)
+		__cl_double4 v4[4];
+#endif
+#if defined(__CL_DOUBLE8__)
+		__cl_double8 v8[2];
+#endif
+#if defined(__CL_DOUBLE16__)
+		__cl_double16 v16;
+#endif
+	} cl_double16;
+
+/* Macro to facilitate debugging 
+ * Usage:
+ *   Place CL_PROGRAM_STRING_DEBUG_INFO on the line before the first line of your source. 
+ *   The first line ends with:   CL_PROGRAM_STRING_BEGIN \"
+ *   Each line thereafter of OpenCL C source must end with: \n\
+ *   The last line ends in ";
+ *
+ *   Example:
+ *
+ *   const char *my_program = CL_PROGRAM_STRING_BEGIN "\
+ *   kernel void foo( int a, float * b )             \n\
+ *   {                                               \n\
+ *      // my comment                                \n\
+ *      *b[ get_global_id(0)] = a;                   \n\
+ *   }                                               \n\
+ *   ";
+ *
+ * This should correctly set up the line, (column) and file information for your source 
+ * string so you can do source level debugging.
+ */
+#define __CL_STRINGIFY(_x) #_x
+#define _CL_STRINGIFY(_x) __CL_STRINGIFY(_x)
+#define CL_PROGRAM_STRING_DEBUG_INFO "#line " _CL_STRINGIFY(__LINE__) " \"" __FILE__ "\" \n\n"
+
+	//  CL.h contents
+	/******************************************************************************/
+
+	typedef struct _cl_platform_id *cl_platform_id;
+	typedef struct _cl_device_id *cl_device_id;
+	typedef struct _cl_context *cl_context;
+	typedef struct _cl_command_queue *cl_command_queue;
+	typedef struct _cl_mem *cl_mem;
+	typedef struct _cl_program *cl_program;
+	typedef struct _cl_kernel *cl_kernel;
+	typedef struct _cl_event *cl_event;
+	typedef struct _cl_sampler *cl_sampler;
+
+	typedef cl_uint cl_bool; /* WARNING!  Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */
+	typedef cl_ulong cl_bitfield;
+	typedef cl_bitfield cl_device_type;
+	typedef cl_uint cl_platform_info;
+	typedef cl_uint cl_device_info;
+	typedef cl_bitfield cl_device_fp_config;
+	typedef cl_uint cl_device_mem_cache_type;
+	typedef cl_uint cl_device_local_mem_type;
+	typedef cl_bitfield cl_device_exec_capabilities;
+	typedef cl_bitfield cl_command_queue_properties;
+
+	typedef intptr_t cl_context_properties;
+	typedef cl_uint cl_context_info;
+	typedef cl_uint cl_command_queue_info;
+	typedef cl_uint cl_channel_order;
+	typedef cl_uint cl_channel_type;
+	typedef cl_bitfield cl_mem_flags;
+	typedef cl_uint cl_mem_object_type;
+	typedef cl_uint cl_mem_info;
+	typedef cl_uint cl_image_info;
+	typedef cl_uint cl_buffer_create_type;
+	typedef cl_uint cl_addressing_mode;
+	typedef cl_uint cl_filter_mode;
+	typedef cl_uint cl_sampler_info;
+	typedef cl_bitfield cl_map_flags;
+	typedef cl_uint cl_program_info;
+	typedef cl_uint cl_program_build_info;
+	typedef cl_int cl_build_status;
+	typedef cl_uint cl_kernel_info;
+	typedef cl_uint cl_kernel_work_group_info;
+	typedef cl_uint cl_event_info;
+	typedef cl_uint cl_command_type;
+	typedef cl_uint cl_profiling_info;
+
+	typedef struct _cl_image_format
+	{
+		cl_channel_order image_channel_order;
+		cl_channel_type image_channel_data_type;
+	} cl_image_format;
+
+	typedef struct _cl_buffer_region
+	{
+		size_t origin;
+		size_t size;
+	} cl_buffer_region;
+
+/******************************************************************************/
+
+/* Error Codes */
+#define CL_SUCCESS 0
+#define CL_DEVICE_NOT_FOUND -1
+#define CL_DEVICE_NOT_AVAILABLE -2
+#define CL_COMPILER_NOT_AVAILABLE -3
+#define CL_MEM_OBJECT_ALLOCATION_FAILURE -4
+#define CL_OUT_OF_RESOURCES -5
+#define CL_OUT_OF_HOST_MEMORY -6
+#define CL_PROFILING_INFO_NOT_AVAILABLE -7
+#define CL_MEM_COPY_OVERLAP -8
+#define CL_IMAGE_FORMAT_MISMATCH -9
+#define CL_IMAGE_FORMAT_NOT_SUPPORTED -10
+#define CL_BUILD_PROGRAM_FAILURE -11
+#define CL_MAP_FAILURE -12
+#define CL_MISALIGNED_SUB_BUFFER_OFFSET -13
+#define CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST -14
+
+#define CL_INVALID_VALUE -30
+#define CL_INVALID_DEVICE_TYPE -31
+#define CL_INVALID_PLATFORM -32
+#define CL_INVALID_DEVICE -33
+#define CL_INVALID_CONTEXT -34
+#define CL_INVALID_QUEUE_PROPERTIES -35
+#define CL_INVALID_COMMAND_QUEUE -36
+#define CL_INVALID_HOST_PTR -37
+#define CL_INVALID_MEM_OBJECT -38
+#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR -39
+#define CL_INVALID_IMAGE_SIZE -40
+#define CL_INVALID_SAMPLER -41
+#define CL_INVALID_BINARY -42
+#define CL_INVALID_BUILD_OPTIONS -43
+#define CL_INVALID_PROGRAM -44
+#define CL_INVALID_PROGRAM_EXECUTABLE -45
+#define CL_INVALID_KERNEL_NAME -46
+#define CL_INVALID_KERNEL_DEFINITION -47
+#define CL_INVALID_KERNEL -48
+#define CL_INVALID_ARG_INDEX -49
+#define CL_INVALID_ARG_VALUE -50
+#define CL_INVALID_ARG_SIZE -51
+#define CL_INVALID_KERNEL_ARGS -52
+#define CL_INVALID_WORK_DIMENSION -53
+#define CL_INVALID_WORK_GROUP_SIZE -54
+#define CL_INVALID_WORK_ITEM_SIZE -55
+#define CL_INVALID_GLOBAL_OFFSET -56
+#define CL_INVALID_EVENT_WAIT_LIST -57
+#define CL_INVALID_EVENT -58
+#define CL_INVALID_OPERATION -59
+#define CL_INVALID_GL_OBJECT -60
+#define CL_INVALID_BUFFER_SIZE -61
+#define CL_INVALID_MIP_LEVEL -62
+#define CL_INVALID_GLOBAL_WORK_SIZE -63
+#define CL_INVALID_PROPERTY -64
+
+/* OpenCL Version */
+#define CL_VERSION_1_0 1
+#define CL_VERSION_1_1 1
+
+/* cl_bool */
+#define CL_FALSE 0
+#define CL_TRUE 1
+
+/* cl_platform_info */
+#define CL_PLATFORM_PROFILE 0x0900
+#define CL_PLATFORM_VERSION 0x0901
+#define CL_PLATFORM_NAME 0x0902
+#define CL_PLATFORM_VENDOR 0x0903
+#define CL_PLATFORM_EXTENSIONS 0x0904
+
+/* cl_device_type - bitfield */
+#define CL_DEVICE_TYPE_DEFAULT (1 << 0)
+#define CL_DEVICE_TYPE_CPU (1 << 1)
+#define CL_DEVICE_TYPE_GPU (1 << 2)
+#define CL_DEVICE_TYPE_ACCELERATOR (1 << 3)
+#define CL_DEVICE_TYPE_ALL 0xFFFFFFFF
+
+/* cl_device_info */
+#define CL_DEVICE_TYPE 0x1000
+#define CL_DEVICE_VENDOR_ID 0x1001
+#define CL_DEVICE_MAX_COMPUTE_UNITS 0x1002
+#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS 0x1003
+#define CL_DEVICE_MAX_WORK_GROUP_SIZE 0x1004
+#define CL_DEVICE_MAX_WORK_ITEM_SIZES 0x1005
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR 0x1006
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT 0x1007
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT 0x1008
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG 0x1009
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT 0x100A
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE 0x100B
+#define CL_DEVICE_MAX_CLOCK_FREQUENCY 0x100C
+#define CL_DEVICE_ADDRESS_BITS 0x100D
+#define CL_DEVICE_MAX_READ_IMAGE_ARGS 0x100E
+#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS 0x100F
+#define CL_DEVICE_MAX_MEM_ALLOC_SIZE 0x1010
+#define CL_DEVICE_IMAGE2D_MAX_WIDTH 0x1011
+#define CL_DEVICE_IMAGE2D_MAX_HEIGHT 0x1012
+#define CL_DEVICE_IMAGE3D_MAX_WIDTH 0x1013
+#define CL_DEVICE_IMAGE3D_MAX_HEIGHT 0x1014
+#define CL_DEVICE_IMAGE3D_MAX_DEPTH 0x1015
+#define CL_DEVICE_IMAGE_SUPPORT 0x1016
+#define CL_DEVICE_MAX_PARAMETER_SIZE 0x1017
+#define CL_DEVICE_MAX_SAMPLERS 0x1018
+#define CL_DEVICE_MEM_BASE_ADDR_ALIGN 0x1019
+#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE 0x101A
+#define CL_DEVICE_SINGLE_FP_CONFIG 0x101B
+#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE 0x101C
+#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE 0x101D
+#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE 0x101E
+#define CL_DEVICE_GLOBAL_MEM_SIZE 0x101F
+#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE 0x1020
+#define CL_DEVICE_MAX_CONSTANT_ARGS 0x1021
+#define CL_DEVICE_LOCAL_MEM_TYPE 0x1022
+#define CL_DEVICE_LOCAL_MEM_SIZE 0x1023
+#define CL_DEVICE_ERROR_CORRECTION_SUPPORT 0x1024
+#define CL_DEVICE_PROFILING_TIMER_RESOLUTION 0x1025
+#define CL_DEVICE_ENDIAN_LITTLE 0x1026
+#define CL_DEVICE_AVAILABLE 0x1027
+#define CL_DEVICE_COMPILER_AVAILABLE 0x1028
+#define CL_DEVICE_EXECUTION_CAPABILITIES 0x1029
+#define CL_DEVICE_QUEUE_PROPERTIES 0x102A
+#define CL_DEVICE_NAME 0x102B
+#define CL_DEVICE_VENDOR 0x102C
+#define CL_DRIVER_VERSION 0x102D
+#define CL_DEVICE_PROFILE 0x102E
+#define CL_DEVICE_VERSION 0x102F
+#define CL_DEVICE_EXTENSIONS 0x1030
+#define CL_DEVICE_PLATFORM 0x1031
+/* 0x1032 reserved for CL_DEVICE_DOUBLE_FP_CONFIG */
+/* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 0x1034
+#define CL_DEVICE_HOST_UNIFIED_MEMORY 0x1035
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 0x1036
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT 0x1037
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 0x1038
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 0x1039
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 0x103A
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 0x103B
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 0x103C
+#define CL_DEVICE_OPENCL_C_VERSION 0x103D
+
+/* cl_device_fp_config - bitfield */
+#define CL_FP_DENORM (1 << 0)
+#define CL_FP_INF_NAN (1 << 1)
+#define CL_FP_ROUND_TO_NEAREST (1 << 2)
+#define CL_FP_ROUND_TO_ZERO (1 << 3)
+#define CL_FP_ROUND_TO_INF (1 << 4)
+#define CL_FP_FMA (1 << 5)
+#define CL_FP_SOFT_FLOAT (1 << 6)
+
+/* cl_device_mem_cache_type */
+#define CL_NONE 0x0
+#define CL_READ_ONLY_CACHE 0x1
+#define CL_READ_WRITE_CACHE 0x2
+
+/* cl_device_local_mem_type */
+#define CL_LOCAL 0x1
+#define CL_GLOBAL 0x2
+
+/* cl_device_exec_capabilities - bitfield */
+#define CL_EXEC_KERNEL (1 << 0)
+#define CL_EXEC_NATIVE_KERNEL (1 << 1)
+
+/* cl_command_queue_properties - bitfield */
+#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE (1 << 0)
+#define CL_QUEUE_PROFILING_ENABLE (1 << 1)
+
+/* cl_context_info  */
+#define CL_CONTEXT_REFERENCE_COUNT 0x1080
+#define CL_CONTEXT_DEVICES 0x1081
+#define CL_CONTEXT_PROPERTIES 0x1082
+#define CL_CONTEXT_NUM_DEVICES 0x1083
+
+/* cl_context_info + cl_context_properties */
+#define CL_CONTEXT_PLATFORM 0x1084
+
+/* cl_command_queue_info */
+#define CL_QUEUE_CONTEXT 0x1090
+#define CL_QUEUE_DEVICE 0x1091
+#define CL_QUEUE_REFERENCE_COUNT 0x1092
+#define CL_QUEUE_PROPERTIES 0x1093
+
+/* cl_mem_flags - bitfield */
+#define CL_MEM_READ_WRITE (1 << 0)
+#define CL_MEM_WRITE_ONLY (1 << 1)
+#define CL_MEM_READ_ONLY (1 << 2)
+#define CL_MEM_USE_HOST_PTR (1 << 3)
+#define CL_MEM_ALLOC_HOST_PTR (1 << 4)
+#define CL_MEM_COPY_HOST_PTR (1 << 5)
+
+/* cl_channel_order */
+#define CL_R 0x10B0
+#define CL_A 0x10B1
+#define CL_RG 0x10B2
+#define CL_RA 0x10B3
+#define CL_RGB 0x10B4
+#define CL_RGBA 0x10B5
+#define CL_BGRA 0x10B6
+#define CL_ARGB 0x10B7
+#define CL_INTENSITY 0x10B8
+#define CL_LUMINANCE 0x10B9
+#define CL_Rx 0x10BA
+#define CL_RGx 0x10BB
+#define CL_RGBx 0x10BC
+
+/* cl_channel_type */
+#define CL_SNORM_INT8 0x10D0
+#define CL_SNORM_INT16 0x10D1
+#define CL_UNORM_INT8 0x10D2
+#define CL_UNORM_INT16 0x10D3
+#define CL_UNORM_SHORT_565 0x10D4
+#define CL_UNORM_SHORT_555 0x10D5
+#define CL_UNORM_INT_101010 0x10D6
+#define CL_SIGNED_INT8 0x10D7
+#define CL_SIGNED_INT16 0x10D8
+#define CL_SIGNED_INT32 0x10D9
+#define CL_UNSIGNED_INT8 0x10DA
+#define CL_UNSIGNED_INT16 0x10DB
+#define CL_UNSIGNED_INT32 0x10DC
+#define CL_HALF_FLOAT 0x10DD
+#define CL_FLOAT 0x10DE
+
+/* cl_mem_object_type */
+#define CL_MEM_OBJECT_BUFFER 0x10F0
+#define CL_MEM_OBJECT_IMAGE2D 0x10F1
+#define CL_MEM_OBJECT_IMAGE3D 0x10F2
+
+/* cl_mem_info */
+#define CL_MEM_TYPE 0x1100
+#define CL_MEM_FLAGS 0x1101
+#define CL_MEM_SIZE 0x1102
+#define CL_MEM_HOST_PTR 0x1103
+#define CL_MEM_MAP_COUNT 0x1104
+#define CL_MEM_REFERENCE_COUNT 0x1105
+#define CL_MEM_CONTEXT 0x1106
+#define CL_MEM_ASSOCIATED_MEMOBJECT 0x1107
+#define CL_MEM_OFFSET 0x1108
+
+/* cl_image_info */
+#define CL_IMAGE_FORMAT 0x1110
+#define CL_IMAGE_ELEMENT_SIZE 0x1111
+#define CL_IMAGE_ROW_PITCH 0x1112
+#define CL_IMAGE_SLICE_PITCH 0x1113
+#define CL_IMAGE_WIDTH 0x1114
+#define CL_IMAGE_HEIGHT 0x1115
+#define CL_IMAGE_DEPTH 0x1116
+
+/* cl_addressing_mode */
+#define CL_ADDRESS_NONE 0x1130
+#define CL_ADDRESS_CLAMP_TO_EDGE 0x1131
+#define CL_ADDRESS_CLAMP 0x1132
+#define CL_ADDRESS_REPEAT 0x1133
+#define CL_ADDRESS_MIRRORED_REPEAT 0x1134
+
+/* cl_filter_mode */
+#define CL_FILTER_NEAREST 0x1140
+#define CL_FILTER_LINEAR 0x1141
+
+/* cl_sampler_info */
+#define CL_SAMPLER_REFERENCE_COUNT 0x1150
+#define CL_SAMPLER_CONTEXT 0x1151
+#define CL_SAMPLER_NORMALIZED_COORDS 0x1152
+#define CL_SAMPLER_ADDRESSING_MODE 0x1153
+#define CL_SAMPLER_FILTER_MODE 0x1154
+
+/* cl_map_flags - bitfield */
+#define CL_MAP_READ (1 << 0)
+#define CL_MAP_WRITE (1 << 1)
+
+/* cl_program_info */
+#define CL_PROGRAM_REFERENCE_COUNT 0x1160
+#define CL_PROGRAM_CONTEXT 0x1161
+#define CL_PROGRAM_NUM_DEVICES 0x1162
+#define CL_PROGRAM_DEVICES 0x1163
+#define CL_PROGRAM_SOURCE 0x1164
+#define CL_PROGRAM_BINARY_SIZES 0x1165
+#define CL_PROGRAM_BINARIES 0x1166
+
+/* cl_program_build_info */
+#define CL_PROGRAM_BUILD_STATUS 0x1181
+#define CL_PROGRAM_BUILD_OPTIONS 0x1182
+#define CL_PROGRAM_BUILD_LOG 0x1183
+
+/* cl_build_status */
+#define CL_BUILD_SUCCESS 0
+#define CL_BUILD_NONE -1
+#define CL_BUILD_ERROR -2
+#define CL_BUILD_IN_PROGRESS -3
+
+/* cl_kernel_info */
+#define CL_KERNEL_FUNCTION_NAME 0x1190
+#define CL_KERNEL_NUM_ARGS 0x1191
+#define CL_KERNEL_REFERENCE_COUNT 0x1192
+#define CL_KERNEL_CONTEXT 0x1193
+#define CL_KERNEL_PROGRAM 0x1194
+
+/* cl_kernel_work_group_info */
+#define CL_KERNEL_WORK_GROUP_SIZE 0x11B0
+#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1
+#define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2
+#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3
+#define CL_KERNEL_PRIVATE_MEM_SIZE 0x11B4
+
+/* cl_event_info  */
+#define CL_EVENT_COMMAND_QUEUE 0x11D0
+#define CL_EVENT_COMMAND_TYPE 0x11D1
+#define CL_EVENT_REFERENCE_COUNT 0x11D2
+#define CL_EVENT_COMMAND_EXECUTION_STATUS 0x11D3
+#define CL_EVENT_CONTEXT 0x11D4
+
+/* cl_command_type */
+#define CL_COMMAND_NDRANGE_KERNEL 0x11F0
+#define CL_COMMAND_TASK 0x11F1
+#define CL_COMMAND_NATIVE_KERNEL 0x11F2
+#define CL_COMMAND_READ_BUFFER 0x11F3
+#define CL_COMMAND_WRITE_BUFFER 0x11F4
+#define CL_COMMAND_COPY_BUFFER 0x11F5
+#define CL_COMMAND_READ_IMAGE 0x11F6
+#define CL_COMMAND_WRITE_IMAGE 0x11F7
+#define CL_COMMAND_COPY_IMAGE 0x11F8
+#define CL_COMMAND_COPY_IMAGE_TO_BUFFER 0x11F9
+#define CL_COMMAND_COPY_BUFFER_TO_IMAGE 0x11FA
+#define CL_COMMAND_MAP_BUFFER 0x11FB
+#define CL_COMMAND_MAP_IMAGE 0x11FC
+#define CL_COMMAND_UNMAP_MEM_OBJECT 0x11FD
+#define CL_COMMAND_MARKER 0x11FE
+#define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x11FF
+#define CL_COMMAND_RELEASE_GL_OBJECTS 0x1200
+#define CL_COMMAND_READ_BUFFER_RECT 0x1201
+#define CL_COMMAND_WRITE_BUFFER_RECT 0x1202
+#define CL_COMMAND_COPY_BUFFER_RECT 0x1203
+#define CL_COMMAND_USER 0x1204
+
+/* command execution status */
+#define CL_COMPLETE 0x0
+#define CL_RUNNING 0x1
+#define CL_SUBMITTED 0x2
+#define CL_QUEUED 0x3
+
+/* cl_buffer_create_type  */
+#define CL_BUFFER_CREATE_TYPE_REGION 0x1220
+
+/* cl_profiling_info  */
+#define CL_PROFILING_COMMAND_QUEUED 0x1280
+#define CL_PROFILING_COMMAND_SUBMIT 0x1281
+#define CL_PROFILING_COMMAND_START 0x1282
+#define CL_PROFILING_COMMAND_END 0x1283
+
+	/********************************************************************************************************/
+
+	/********************************************************************************************************/
+
+	/*  Function signature typedef's */
+
+	/* Platform API */
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETPLATFORMIDS)(cl_uint /* num_entries */,
+														 cl_platform_id * /* platforms */,
+														 cl_uint * /* num_platforms */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETPLATFORMINFO)(cl_platform_id /* platform */,
+														  cl_platform_info /* param_name */,
+														  size_t /* param_value_size */,
+														  void * /* param_value */,
+														  size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	/* Device APIs */
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETDEVICEIDS)(cl_platform_id /* platform */,
+													   cl_device_type /* device_type */,
+													   cl_uint /* num_entries */,
+													   cl_device_id * /* devices */,
+													   cl_uint * /* num_devices */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETDEVICEINFO)(cl_device_id /* device */,
+														cl_device_info /* param_name */,
+														size_t /* param_value_size */,
+														void * /* param_value */,
+														size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	// Context APIs
+	typedef CL_API_ENTRY cl_context(CL_API_CALL *
+										PFNCLCREATECONTEXT)(const cl_context_properties * /* properties */,
+															cl_uint /* num_devices */,
+															const cl_device_id * /* devices */,
+															void(CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *),
+															void * /* user_data */,
+															cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_context(CL_API_CALL *
+										PFNCLCREATECONTEXTFROMTYPE)(const cl_context_properties * /* properties */,
+																	cl_device_type /* device_type */,
+																	void(CL_CALLBACK * /* pfn_notify*/)(const char *, const void *, size_t, void *),
+																	void * /* user_data */,
+																	cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRETAINCONTEXT)(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRELEASECONTEXT)(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETCONTEXTINFO)(cl_context /* context */,
+														 cl_context_info /* param_name */,
+														 size_t /* param_value_size */,
+														 void * /* param_value */,
+														 size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	/* Command Queue APIs */
+	typedef CL_API_ENTRY cl_command_queue(CL_API_CALL *
+											  PFNCLCREATECOMMANDQUEUE)(cl_context /* context */,
+																	   cl_device_id /* device */,
+																	   cl_command_queue_properties /* properties */,
+																	   cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRETAINCOMMANDQUEUE)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRELEASECOMMANDQUEUE)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETCOMMANDQUEUEINFO)(cl_command_queue /* command_queue */,
+															  cl_command_queue_info /* param_name */,
+															  size_t /* param_value_size */,
+															  void * /* param_value */,
+															  size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLSETCOMMANDQUEUEPROPERTY)(cl_command_queue /* command_queue */,
+																  cl_command_queue_properties /* properties */,
+																  cl_bool /* enable */,
+																  cl_command_queue_properties * /* old_properties */) CL_API_SUFFIX__VERSION_1_0;
+
+	/* Memory Object APIs */
+	typedef CL_API_ENTRY cl_mem(CL_API_CALL *
+									PFNCLCREATEBUFFER)(cl_context /* context */,
+													   cl_mem_flags /* flags */,
+													   size_t /* size */,
+													   void * /* host_ptr */,
+													   cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_mem(CL_API_CALL *
+									PFNCLCREATESUBBUFFER)(cl_mem /* buffer */,
+														  cl_mem_flags /* flags */,
+														  cl_buffer_create_type /* buffer_create_type */,
+														  const void * /* buffer_create_info */,
+														  cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
+
+	typedef CL_API_ENTRY cl_mem(CL_API_CALL *
+									PFNCLCREATEIMAGE2D)(cl_context /* context */,
+														cl_mem_flags /* flags */,
+														const cl_image_format * /* image_format */,
+														size_t /* image_width */,
+														size_t /* image_height */,
+														size_t /* image_row_pitch */,
+														void * /* host_ptr */,
+														cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_mem(CL_API_CALL *
+									PFNCLCREATEIMAGE3D)(cl_context /* context */,
+														cl_mem_flags /* flags */,
+														const cl_image_format * /* image_format */,
+														size_t /* image_width */,
+														size_t /* image_height */,
+														size_t /* image_depth */,
+														size_t /* image_row_pitch */,
+														size_t /* image_slice_pitch */,
+														void * /* host_ptr */,
+														cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRETAINMEMOBJECT)(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRELEASEMEMOBJECT)(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETSUPPORTEDIMAGEFORMATS)(cl_context /* context */,
+																   cl_mem_flags /* flags */,
+																   cl_mem_object_type /* image_type */,
+																   cl_uint /* num_entries */,
+																   cl_image_format * /* image_formats */,
+																   cl_uint * /* num_image_formats */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETMEMOBJECTINFO)(cl_mem /* memobj */,
+														   cl_mem_info /* param_name */,
+														   size_t /* param_value_size */,
+														   void * /* param_value */,
+														   size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETIMAGEINFO)(cl_mem /* image */,
+													   cl_image_info /* param_name */,
+													   size_t /* param_value_size */,
+													   void * /* param_value */,
+													   size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLSETMEMOBJECTDESTRUCTORCALLBACK)(cl_mem /* memobj */,
+																		 void(CL_CALLBACK * /*pfn_notify*/)(cl_mem /* memobj */, void * /*user_data*/),
+																		 void * /*user_data */) CL_API_SUFFIX__VERSION_1_1;
+
+	/* Sampler APIs  */
+	typedef CL_API_ENTRY cl_sampler(CL_API_CALL *
+										PFNCLCREATESAMPLER)(cl_context /* context */,
+															cl_bool /* normalized_coords */,
+															cl_addressing_mode /* addressing_mode */,
+															cl_filter_mode /* filter_mode */,
+															cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRETAINSAMPLER)(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRELEASESAMPLER)(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETSAMPLERINFO)(cl_sampler /* sampler */,
+														 cl_sampler_info /* param_name */,
+														 size_t /* param_value_size */,
+														 void * /* param_value */,
+														 size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	/* Program Object APIs  */
+	typedef CL_API_ENTRY cl_program(CL_API_CALL *
+										PFNCLCREATEPROGRAMWITHSOURCE)(cl_context /* context */,
+																	  cl_uint /* count */,
+																	  const char ** /* strings */,
+																	  const size_t * /* lengths */,
+																	  cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_program(CL_API_CALL *
+										PFNCLCREATEPROGRAMWITHBINARY)(cl_context /* context */,
+																	  cl_uint /* num_devices */,
+																	  const cl_device_id * /* device_list */,
+																	  const size_t * /* lengths */,
+																	  const unsigned char ** /* binaries */,
+																	  cl_int * /* binary_status */,
+																	  cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRETAINPROGRAM)(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRELEASEPROGRAM)(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLBUILDPROGRAM)(cl_program /* program */,
+													   cl_uint /* num_devices */,
+													   const cl_device_id * /* device_list */,
+													   const char * /* options */,
+													   void(CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+													   void * /* user_data */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLUNLOADCOMPILER)(void) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETPROGRAMINFO)(cl_program /* program */,
+														 cl_program_info /* param_name */,
+														 size_t /* param_value_size */,
+														 void * /* param_value */,
+														 size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETPROGRAMBUILDINFO)(cl_program /* program */,
+															  cl_device_id /* device */,
+															  cl_program_build_info /* param_name */,
+															  size_t /* param_value_size */,
+															  void * /* param_value */,
+															  size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	/* Kernel Object APIs */
+	typedef CL_API_ENTRY cl_kernel(CL_API_CALL *
+									   PFNCLCREATEKERNEL)(cl_program /* program */,
+														  const char * /* kernel_name */,
+														  cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLCREATEKERNELSINPROGRAM)(cl_program /* program */,
+																 cl_uint /* num_kernels */,
+																 cl_kernel * /* kernels */,
+																 cl_uint * /* num_kernels_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRETAINKERNEL)(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRELEASEKERNEL)(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLSETKERNELARG)(cl_kernel /* kernel */,
+													   cl_uint /* arg_index */,
+													   size_t /* arg_size */,
+													   const void * /* arg_value */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETKERNELINFO)(cl_kernel /* kernel */,
+														cl_kernel_info /* param_name */,
+														size_t /* param_value_size */,
+														void * /* param_value */,
+														size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETKERNELWORKGROUPINFO)(cl_kernel /* kernel */,
+																 cl_device_id /* device */,
+																 cl_kernel_work_group_info /* param_name */,
+																 size_t /* param_value_size */,
+																 void * /* param_value */,
+																 size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	// Event Object APIs
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLWAITFOREVENTS)(cl_uint /* num_events */,
+														const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETEVENTINFO)(cl_event /* event */,
+													   cl_event_info /* param_name */,
+													   size_t /* param_value_size */,
+													   void * /* param_value */,
+													   size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_event(CL_API_CALL *
+									  PFNCLCREATEUSEREVENT)(cl_context /* context */,
+															cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRETAINEVENT)(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLRELEASEEVENT)(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLSETUSEREVENTSTATUS)(cl_event /* event */,
+															 cl_int /* execution_status */) CL_API_SUFFIX__VERSION_1_1;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLSETEVENTCALLBACK)(cl_event /* event */,
+														   cl_int /* command_exec_callback_type */,
+														   void(CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *),
+														   void * /* user_data */) CL_API_SUFFIX__VERSION_1_1;
+
+	/* Profiling APIs  */
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLGETEVENTPROFILINGINFO)(cl_event /* event */,
+																cl_profiling_info /* param_name */,
+																size_t /* param_value_size */,
+																void * /* param_value */,
+																size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+	// Flush and Finish APIs
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLFLUSH)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLFINISH)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+	/* Enqueued Commands APIs */
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEREADBUFFER)(cl_command_queue /* command_queue */,
+															cl_mem /* buffer */,
+															cl_bool /* blocking_read */,
+															size_t /* offset */,
+															size_t /* cb */,
+															void * /* ptr */,
+															cl_uint /* num_events_in_wait_list */,
+															const cl_event * /* event_wait_list */,
+															cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEREADBUFFERRECT)(cl_command_queue /* command_queue */,
+																cl_mem /* buffer */,
+																cl_bool /* blocking_read */,
+																const size_t * /* buffer_origin */,
+																const size_t * /* host_origin */,
+																const size_t * /* region */,
+																size_t /* buffer_row_pitch */,
+																size_t /* buffer_slice_pitch */,
+																size_t /* host_row_pitch */,
+																size_t /* host_slice_pitch */,
+																void * /* ptr */,
+																cl_uint /* num_events_in_wait_list */,
+																const cl_event * /* event_wait_list */,
+																cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEWRITEBUFFER)(cl_command_queue /* command_queue */,
+															 cl_mem /* buffer */,
+															 cl_bool /* blocking_write */,
+															 size_t /* offset */,
+															 size_t /* cb */,
+															 const void * /* ptr */,
+															 cl_uint /* num_events_in_wait_list */,
+															 const cl_event * /* event_wait_list */,
+															 cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEWRITEBUFFERRECT)(cl_command_queue /* command_queue */,
+																 cl_mem /* buffer */,
+																 cl_bool /* blocking_write */,
+																 const size_t * /* buffer_origin */,
+																 const size_t * /* host_origin */,
+																 const size_t * /* region */,
+																 size_t /* buffer_row_pitch */,
+																 size_t /* buffer_slice_pitch */,
+																 size_t /* host_row_pitch */,
+																 size_t /* host_slice_pitch */,
+																 const void * /* ptr */,
+																 cl_uint /* num_events_in_wait_list */,
+																 const cl_event * /* event_wait_list */,
+																 cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUECOPYBUFFER)(cl_command_queue /* command_queue */,
+															cl_mem /* src_buffer */,
+															cl_mem /* dst_buffer */,
+															size_t /* src_offset */,
+															size_t /* dst_offset */,
+															size_t /* cb */,
+															cl_uint /* num_events_in_wait_list */,
+															const cl_event * /* event_wait_list */,
+															cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUECOPYBUFFERRECT)(cl_command_queue /* command_queue */,
+																cl_mem /* src_buffer */,
+																cl_mem /* dst_buffer */,
+																const size_t * /* src_origin */,
+																const size_t * /* dst_origin */,
+																const size_t * /* region */,
+																size_t /* src_row_pitch */,
+																size_t /* src_slice_pitch */,
+																size_t /* dst_row_pitch */,
+																size_t /* dst_slice_pitch */,
+																cl_uint /* num_events_in_wait_list */,
+																const cl_event * /* event_wait_list */,
+																cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEREADIMAGE)(cl_command_queue /* command_queue */,
+														   cl_mem /* image */,
+														   cl_bool /* blocking_read */,
+														   const size_t * /* origin[3] */,
+														   const size_t * /* region[3] */,
+														   size_t /* row_pitch */,
+														   size_t /* slice_pitch */,
+														   void * /* ptr */,
+														   cl_uint /* num_events_in_wait_list */,
+														   const cl_event * /* event_wait_list */,
+														   cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEWRITEIMAGE)(cl_command_queue /* command_queue */,
+															cl_mem /* image */,
+															cl_bool /* blocking_write */,
+															const size_t * /* origin[3] */,
+															const size_t * /* region[3] */,
+															size_t /* input_row_pitch */,
+															size_t /* input_slice_pitch */,
+															const void * /* ptr */,
+															cl_uint /* num_events_in_wait_list */,
+															const cl_event * /* event_wait_list */,
+															cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUECOPYIMAGE)(cl_command_queue /* command_queue */,
+														   cl_mem /* src_image */,
+														   cl_mem /* dst_image */,
+														   const size_t * /* src_origin[3] */,
+														   const size_t * /* dst_origin[3] */,
+														   const size_t * /* region[3] */,
+														   cl_uint /* num_events_in_wait_list */,
+														   const cl_event * /* event_wait_list */,
+														   cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUECOPYIMAGETOBUFFER)(cl_command_queue /* command_queue */,
+																   cl_mem /* src_image */,
+																   cl_mem /* dst_buffer */,
+																   const size_t * /* src_origin[3] */,
+																   const size_t * /* region[3] */,
+																   size_t /* dst_offset */,
+																   cl_uint /* num_events_in_wait_list */,
+																   const cl_event * /* event_wait_list */,
+																   cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUECOPYBUFFERTOIMAGE)(cl_command_queue /* command_queue */,
+																   cl_mem /* src_buffer */,
+																   cl_mem /* dst_image */,
+																   size_t /* src_offset */,
+																   const size_t * /* dst_origin[3] */,
+																   const size_t * /* region[3] */,
+																   cl_uint /* num_events_in_wait_list */,
+																   const cl_event * /* event_wait_list */,
+																   cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY void *(CL_API_CALL *
+									PFNCLENQUEUEMAPBUFFER)(cl_command_queue /* command_queue */,
+														   cl_mem /* buffer */,
+														   cl_bool /* blocking_map */,
+														   cl_map_flags /* map_flags */,
+														   size_t /* offset */,
+														   size_t /* cb */,
+														   cl_uint /* num_events_in_wait_list */,
+														   const cl_event * /* event_wait_list */,
+														   cl_event * /* event */,
+														   cl_int * /* errcode_ret */)CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY void *(CL_API_CALL *
+									PFNCLENQUEUEMAPIMAGE)(cl_command_queue /* command_queue */,
+														  cl_mem /* image */,
+														  cl_bool /* blocking_map */,
+														  cl_map_flags /* map_flags */,
+														  const size_t * /* origin[3] */,
+														  const size_t * /* region[3] */,
+														  size_t * /* image_row_pitch */,
+														  size_t * /* image_slice_pitch */,
+														  cl_uint /* num_events_in_wait_list */,
+														  const cl_event * /* event_wait_list */,
+														  cl_event * /* event */,
+														  cl_int * /* errcode_ret */)CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEUNMAPMEMOBJECT)(cl_command_queue /* command_queue */,
+																cl_mem /* memobj */,
+																void * /* mapped_ptr */,
+																cl_uint /* num_events_in_wait_list */,
+																const cl_event * /* event_wait_list */,
+																cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUENDRANGEKERNEL)(cl_command_queue /* command_queue */,
+															   cl_kernel /* kernel */,
+															   cl_uint /* work_dim */,
+															   const size_t * /* global_work_offset */,
+															   const size_t * /* global_work_size */,
+															   const size_t * /* local_work_size */,
+															   cl_uint /* num_events_in_wait_list */,
+															   const cl_event * /* event_wait_list */,
+															   cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUETASK)(cl_command_queue /* command_queue */,
+													  cl_kernel /* kernel */,
+													  cl_uint /* num_events_in_wait_list */,
+													  const cl_event * /* event_wait_list */,
+													  cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUENATIVEKERNEL)(cl_command_queue /* command_queue */,
+															  void (*user_func)(void *),
+															  void * /* args */,
+															  size_t /* cb_args */,
+															  cl_uint /* num_mem_objects */,
+															  const cl_mem * /* mem_list */,
+															  const void ** /* args_mem_loc */,
+															  cl_uint /* num_events_in_wait_list */,
+															  const cl_event * /* event_wait_list */,
+															  cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEMARKER)(cl_command_queue /* command_queue */,
+														cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEWAITFOREVENTS)(cl_command_queue /* command_queue */,
+															   cl_uint /* num_events */,
+															   const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0;
+
+	typedef CL_API_ENTRY cl_int(CL_API_CALL *
+									PFNCLENQUEUEBARRIER)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+	// Extension function access
+	//
+	// Returns the extension function address for the given function name,
+	// or NULL if a valid function can not be found.  The client must
+	// check to make sure the address is not NULL, before using or
+	// calling the returned function address.
+	//
+	typedef CL_API_ENTRY void *(CL_API_CALL *PFNCLGETEXTENSIONFUNCTIONADDRESS)(const char * /* func_name */)CL_API_SUFFIX__VERSION_1_0;
+
+#define CLEW_STATIC
+
+#ifdef CLEW_STATIC
+#define CLEWAPI extern
+#else
+#ifdef CLEW_BUILD
+#define CLEWAPI extern __declspec(dllexport)
+#else
+#define CLEWAPI extern __declspec(dllimport)
+#endif
+#endif
+
+#if defined(_WIN32)
+#define CLEW_FUN_EXPORT extern
+#else
+#define CLEW_FUN_EXPORT CLEWAPI
+#endif
+
+#define CLEW_GET_FUN(x) x
+
+	//  Variables holding function entry points
+	CLEW_FUN_EXPORT PFNCLGETPLATFORMIDS __clewGetPlatformIDs;
+	CLEW_FUN_EXPORT PFNCLGETPLATFORMINFO __clewGetPlatformInfo;
+	CLEW_FUN_EXPORT PFNCLGETDEVICEIDS __clewGetDeviceIDs;
+	CLEW_FUN_EXPORT PFNCLGETDEVICEINFO __clewGetDeviceInfo;
+	CLEW_FUN_EXPORT PFNCLCREATECONTEXT __clewCreateContext;
+	CLEW_FUN_EXPORT PFNCLCREATECONTEXTFROMTYPE __clewCreateContextFromType;
+	CLEW_FUN_EXPORT PFNCLRETAINCONTEXT __clewRetainContext;
+	CLEW_FUN_EXPORT PFNCLRELEASECONTEXT __clewReleaseContext;
+	CLEW_FUN_EXPORT PFNCLGETCONTEXTINFO __clewGetContextInfo;
+	CLEW_FUN_EXPORT PFNCLCREATECOMMANDQUEUE __clewCreateCommandQueue;
+	CLEW_FUN_EXPORT PFNCLRETAINCOMMANDQUEUE __clewRetainCommandQueue;
+	CLEW_FUN_EXPORT PFNCLRELEASECOMMANDQUEUE __clewReleaseCommandQueue;
+	CLEW_FUN_EXPORT PFNCLGETCOMMANDQUEUEINFO __clewGetCommandQueueInfo;
+#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+	CLEW_FUN_EXPORT PFNCLSETCOMMANDQUEUEPROPERTY __clewSetCommandQueueProperty;
+#endif
+	CLEW_FUN_EXPORT PFNCLCREATEBUFFER __clewCreateBuffer;
+	CLEW_FUN_EXPORT PFNCLCREATESUBBUFFER __clewCreateSubBuffer;
+	CLEW_FUN_EXPORT PFNCLCREATEIMAGE2D __clewCreateImage2D;
+	CLEW_FUN_EXPORT PFNCLCREATEIMAGE3D __clewCreateImage3D;
+	CLEW_FUN_EXPORT PFNCLRETAINMEMOBJECT __clewRetainMemObject;
+	CLEW_FUN_EXPORT PFNCLRELEASEMEMOBJECT __clewReleaseMemObject;
+	CLEW_FUN_EXPORT PFNCLGETSUPPORTEDIMAGEFORMATS __clewGetSupportedImageFormats;
+	CLEW_FUN_EXPORT PFNCLGETMEMOBJECTINFO __clewGetMemObjectInfo;
+	CLEW_FUN_EXPORT PFNCLGETIMAGEINFO __clewGetImageInfo;
+	CLEW_FUN_EXPORT PFNCLSETMEMOBJECTDESTRUCTORCALLBACK __clewSetMemObjectDestructorCallback;
+	CLEW_FUN_EXPORT PFNCLCREATESAMPLER __clewCreateSampler;
+	CLEW_FUN_EXPORT PFNCLRETAINSAMPLER __clewRetainSampler;
+	CLEW_FUN_EXPORT PFNCLRELEASESAMPLER __clewReleaseSampler;
+	CLEW_FUN_EXPORT PFNCLGETSAMPLERINFO __clewGetSamplerInfo;
+	CLEW_FUN_EXPORT PFNCLCREATEPROGRAMWITHSOURCE __clewCreateProgramWithSource;
+	CLEW_FUN_EXPORT PFNCLCREATEPROGRAMWITHBINARY __clewCreateProgramWithBinary;
+	CLEW_FUN_EXPORT PFNCLRETAINPROGRAM __clewRetainProgram;
+	CLEW_FUN_EXPORT PFNCLRELEASEPROGRAM __clewReleaseProgram;
+	CLEW_FUN_EXPORT PFNCLBUILDPROGRAM __clewBuildProgram;
+	CLEW_FUN_EXPORT PFNCLUNLOADCOMPILER __clewUnloadCompiler;
+	CLEW_FUN_EXPORT PFNCLGETPROGRAMINFO __clewGetProgramInfo;
+	CLEW_FUN_EXPORT PFNCLGETPROGRAMBUILDINFO __clewGetProgramBuildInfo;
+	CLEW_FUN_EXPORT PFNCLCREATEKERNEL __clewCreateKernel;
+	CLEW_FUN_EXPORT PFNCLCREATEKERNELSINPROGRAM __clewCreateKernelsInProgram;
+	CLEW_FUN_EXPORT PFNCLRETAINKERNEL __clewRetainKernel;
+	CLEW_FUN_EXPORT PFNCLRELEASEKERNEL __clewReleaseKernel;
+	CLEW_FUN_EXPORT PFNCLSETKERNELARG __clewSetKernelArg;
+	CLEW_FUN_EXPORT PFNCLGETKERNELINFO __clewGetKernelInfo;
+	CLEW_FUN_EXPORT PFNCLGETKERNELWORKGROUPINFO __clewGetKernelWorkGroupInfo;
+	CLEW_FUN_EXPORT PFNCLWAITFOREVENTS __clewWaitForEvents;
+	CLEW_FUN_EXPORT PFNCLGETEVENTINFO __clewGetEventInfo;
+	CLEW_FUN_EXPORT PFNCLCREATEUSEREVENT __clewCreateUserEvent;
+	CLEW_FUN_EXPORT PFNCLRETAINEVENT __clewRetainEvent;
+	CLEW_FUN_EXPORT PFNCLRELEASEEVENT __clewReleaseEvent;
+	CLEW_FUN_EXPORT PFNCLSETUSEREVENTSTATUS __clewSetUserEventStatus;
+	CLEW_FUN_EXPORT PFNCLSETEVENTCALLBACK __clewSetEventCallback;
+	CLEW_FUN_EXPORT PFNCLGETEVENTPROFILINGINFO __clewGetEventProfilingInfo;
+	CLEW_FUN_EXPORT PFNCLFLUSH __clewFlush;
+	CLEW_FUN_EXPORT PFNCLFINISH __clewFinish;
+	CLEW_FUN_EXPORT PFNCLENQUEUEREADBUFFER __clewEnqueueReadBuffer;
+	CLEW_FUN_EXPORT PFNCLENQUEUEREADBUFFERRECT __clewEnqueueReadBufferRect;
+	CLEW_FUN_EXPORT PFNCLENQUEUEWRITEBUFFER __clewEnqueueWriteBuffer;
+	CLEW_FUN_EXPORT PFNCLENQUEUEWRITEBUFFERRECT __clewEnqueueWriteBufferRect;
+	CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFER __clewEnqueueCopyBuffer;
+	CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFERRECT __clewEnqueueCopyBufferRect;
+	CLEW_FUN_EXPORT PFNCLENQUEUEREADIMAGE __clewEnqueueReadImage;
+	CLEW_FUN_EXPORT PFNCLENQUEUEWRITEIMAGE __clewEnqueueWriteImage;
+	CLEW_FUN_EXPORT PFNCLENQUEUECOPYIMAGE __clewEnqueueCopyImage;
+	CLEW_FUN_EXPORT PFNCLENQUEUECOPYIMAGETOBUFFER __clewEnqueueCopyImageToBuffer;
+	CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFERTOIMAGE __clewEnqueueCopyBufferToImage;
+	CLEW_FUN_EXPORT PFNCLENQUEUEMAPBUFFER __clewEnqueueMapBuffer;
+	CLEW_FUN_EXPORT PFNCLENQUEUEMAPIMAGE __clewEnqueueMapImage;
+	CLEW_FUN_EXPORT PFNCLENQUEUEUNMAPMEMOBJECT __clewEnqueueUnmapMemObject;
+	CLEW_FUN_EXPORT PFNCLENQUEUENDRANGEKERNEL __clewEnqueueNDRangeKernel;
+	CLEW_FUN_EXPORT PFNCLENQUEUETASK __clewEnqueueTask;
+	CLEW_FUN_EXPORT PFNCLENQUEUENATIVEKERNEL __clewEnqueueNativeKernel;
+	CLEW_FUN_EXPORT PFNCLENQUEUEMARKER __clewEnqueueMarker;
+	CLEW_FUN_EXPORT PFNCLENQUEUEWAITFOREVENTS __clewEnqueueWaitForEvents;
+	CLEW_FUN_EXPORT PFNCLENQUEUEBARRIER __clewEnqueueBarrier;
+	CLEW_FUN_EXPORT PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress;
+
+#define clGetPlatformIDs CLEW_GET_FUN(__clewGetPlatformIDs)
+#define clGetPlatformInfo CLEW_GET_FUN(__clewGetPlatformInfo)
+#define clGetDeviceIDs CLEW_GET_FUN(__clewGetDeviceIDs)
+#define clGetDeviceInfo CLEW_GET_FUN(__clewGetDeviceInfo)
+#define clCreateContext CLEW_GET_FUN(__clewCreateContext)
+#define clCreateContextFromType CLEW_GET_FUN(__clewCreateContextFromType)
+#define clRetainContext CLEW_GET_FUN(__clewRetainContext)
+#define clReleaseContext CLEW_GET_FUN(__clewReleaseContext)
+#define clGetContextInfo CLEW_GET_FUN(__clewGetContextInfo)
+#define clCreateCommandQueue CLEW_GET_FUN(__clewCreateCommandQueue)
+#define clRetainCommandQueue CLEW_GET_FUN(__clewRetainCommandQueue)
+#define clReleaseCommandQueue CLEW_GET_FUN(__clewReleaseCommandQueue)
+#define clGetCommandQueueInfo CLEW_GET_FUN(__clewGetCommandQueueInfo)
+#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+#warning CL_USE_DEPRECATED_OPENCL_1_0_APIS is defined. These APIs are unsupported and untested in OpenCL 1.1!
+/* 
+ *  WARNING:
+ *     This API introduces mutable state into the OpenCL implementation. It has been REMOVED
+ *  to better facilitate thread safety.  The 1.0 API is not thread safe. It is not tested by the
+ *  OpenCL 1.1 conformance test, and consequently may not work or may not work dependably.
+ *  It is likely to be non-performant. Use of this API is not advised. Use at your own risk.
+ *
+ *  Software developers previously relying on this API are instructed to set the command queue 
+ *  properties when creating the queue, instead. 
+ */
+#define clSetCommandQueueProperty CLEW_GET_FUN(__clewSetCommandQueueProperty)
+#endif /* CL_USE_DEPRECATED_OPENCL_1_0_APIS */
+#define clCreateBuffer CLEW_GET_FUN(__clewCreateBuffer)
+#define clCreateSubBuffer CLEW_GET_FUN(__clewCreateSubBuffer)
+#define clCreateImage2D CLEW_GET_FUN(__clewCreateImage2D)
+#define clCreateImage3D CLEW_GET_FUN(__clewCreateImage3D)
+#define clRetainMemObject CLEW_GET_FUN(__clewRetainMemObject)
+#define clReleaseMemObject CLEW_GET_FUN(__clewReleaseMemObject)
+#define clGetSupportedImageFormats CLEW_GET_FUN(__clewGetSupportedImageFormats)
+#define clGetMemObjectInfo CLEW_GET_FUN(__clewGetMemObjectInfo)
+#define clGetImageInfo CLEW_GET_FUN(__clewGetImageInfo)
+#define clSetMemObjectDestructorCallback CLEW_GET_FUN(__clewSetMemObjectDestructorCallback)
+#define clCreateSampler CLEW_GET_FUN(__clewCreateSampler)
+#define clRetainSampler CLEW_GET_FUN(__clewRetainSampler)
+#define clReleaseSampler CLEW_GET_FUN(__clewReleaseSampler)
+#define clGetSamplerInfo CLEW_GET_FUN(__clewGetSamplerInfo)
+#define clCreateProgramWithSource CLEW_GET_FUN(__clewCreateProgramWithSource)
+#define clCreateProgramWithBinary CLEW_GET_FUN(__clewCreateProgramWithBinary)
+#define clRetainProgram CLEW_GET_FUN(__clewRetainProgram)
+#define clReleaseProgram CLEW_GET_FUN(__clewReleaseProgram)
+#define clBuildProgram CLEW_GET_FUN(__clewBuildProgram)
+#define clUnloadCompiler CLEW_GET_FUN(__clewUnloadCompiler)
+#define clGetProgramInfo CLEW_GET_FUN(__clewGetProgramInfo)
+#define clGetProgramBuildInfo CLEW_GET_FUN(__clewGetProgramBuildInfo)
+#define clCreateKernel CLEW_GET_FUN(__clewCreateKernel)
+#define clCreateKernelsInProgram CLEW_GET_FUN(__clewCreateKernelsInProgram)
+#define clRetainKernel CLEW_GET_FUN(__clewRetainKernel)
+#define clReleaseKernel CLEW_GET_FUN(__clewReleaseKernel)
+#define clSetKernelArg CLEW_GET_FUN(__clewSetKernelArg)
+#define clGetKernelInfo CLEW_GET_FUN(__clewGetKernelInfo)
+#define clGetKernelWorkGroupInfo CLEW_GET_FUN(__clewGetKernelWorkGroupInfo)
+#define clWaitForEvents CLEW_GET_FUN(__clewWaitForEvents)
+#define clGetEventInfo CLEW_GET_FUN(__clewGetEventInfo)
+#define clCreateUserEvent CLEW_GET_FUN(__clewCreateUserEvent)
+#define clRetainEvent CLEW_GET_FUN(__clewRetainEvent)
+#define clReleaseEvent CLEW_GET_FUN(__clewReleaseEvent)
+#define clSetUserEventStatus CLEW_GET_FUN(__clewSetUserEventStatus)
+#define clSetEventCallback CLEW_GET_FUN(__clewSetEventCallback)
+#define clGetEventProfilingInfo CLEW_GET_FUN(__clewGetEventProfilingInfo)
+#define clFlush CLEW_GET_FUN(__clewFlush)
+#define clFinish CLEW_GET_FUN(__clewFinish)
+#define clEnqueueReadBuffer CLEW_GET_FUN(__clewEnqueueReadBuffer)
+#define clEnqueueReadBufferRect CLEW_GET_FUN(__clewEnqueueReadBufferRect)
+#define clEnqueueWriteBuffer CLEW_GET_FUN(__clewEnqueueWriteBuffer)
+#define clEnqueueWriteBufferRect CLEW_GET_FUN(__clewEnqueueWriteBufferRect)
+#define clEnqueueCopyBuffer CLEW_GET_FUN(__clewEnqueueCopyBuffer)
+#define clEnqueueCopyBufferRect CLEW_GET_FUN(__clewEnqueueCopyBufferRect)
+#define clEnqueueReadImage CLEW_GET_FUN(__clewEnqueueReadImage)
+#define clEnqueueWriteImage CLEW_GET_FUN(__clewEnqueueWriteImage)
+#define clEnqueueCopyImage CLEW_GET_FUN(__clewEnqueueCopyImage)
+#define clEnqueueCopyImageToBuffer CLEW_GET_FUN(__clewEnqueueCopyImageToBuffer)
+#define clEnqueueCopyBufferToImage CLEW_GET_FUN(__clewEnqueueCopyBufferToImage)
+#define clEnqueueMapBuffer CLEW_GET_FUN(__clewEnqueueMapBuffer)
+#define clEnqueueMapImage CLEW_GET_FUN(__clewEnqueueMapImage)
+#define clEnqueueUnmapMemObject CLEW_GET_FUN(__clewEnqueueUnmapMemObject)
+#define clEnqueueNDRangeKernel CLEW_GET_FUN(__clewEnqueueNDRangeKernel)
+#define clEnqueueTask CLEW_GET_FUN(__clewEnqueueTask)
+#define clEnqueueNativeKernel CLEW_GET_FUN(__clewEnqueueNativeKernel)
+#define clEnqueueMarker CLEW_GET_FUN(__clewEnqueueMarker)
+#define clEnqueueWaitForEvents CLEW_GET_FUN(__clewEnqueueWaitForEvents)
+#define clEnqueueBarrier CLEW_GET_FUN(__clewEnqueueBarrier)
+#define clGetExtensionFunctionAddress CLEW_GET_FUN(__clewGetExtensionFunctionAddress)
+
+#define CLEW_SUCCESS 0               //!<    Success error code
+#define CLEW_ERROR_OPEN_FAILED -1    //!<    Error code for failing to open the dynamic library
+#define CLEW_ERROR_ATEXIT_FAILED -2  //!<    Error code for failing to queue the closing of the dynamic library to atexit()
+
+	//! \brief Load OpenCL dynamic library and set function entry points
+	int clewInit(const char *);
+
+	//! \brief Exit clew and unload OpenCL dynamic library
+	void clewExit();
+
+	//! \brief Convert an OpenCL error code to its string equivalent
+	const char *clewErrorString(cl_int error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  //  CLEW_HPP_INCLUDED
diff --git a/dali-physics/third-party/chipmunk2d/.gitignore b/dali-physics/third-party/chipmunk2d/.gitignore
new file mode 100644
index 0000000..1167175
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/.gitignore
@@ -0,0 +1,60 @@
+.DS_Store
+doc/index.html
+
+*.pbxuser
+*.perspectivev3
+xcshareddata
+xcuserdata
+project.xcworkspace
+DerivedData
+build
+Chipmunk-Mac
+Chipmunk-iOS
+ObjectiveChipmunk-Mac
+ObjectiveChipmunk-iOS
+generated_docs
+
+CMakeCache.txt
+CMakeFiles
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
+*.o
+*.obj
+*.dll
+*.so
+*.so.*
+*.dylib
+*.a
+*.exe
+*.lib
+chipmunk_demos
+
+# Visual studio
+*.opensdf
+*.opendb
+*.sdf
+*.suo
+*.pdb
+*.vcxproj.user
+msvc/vc10/demo/ipch/
+msvc/vc10/chipmunk/Win32/
+msvc/vc10/chipmunk/x64/
+msvc/vc10/demo/Win32/
+msvc/vc10/demo/x64/
+msvc/vc12/chipmunk/Win32/
+msvc/vc12/chipmunk/x64/
+msvc/vc12/demo/Win32/
+msvc/vc12/demo/x64/
+msvc/vc13/chipmunk/Win32/
+msvc/vc13/chipmunk/x64/
+msvc/vc13/demo/Win32/
+msvc/vc13/demo/x64/
+msvc/vc14/demo/Win32/
+msvc/vc14/demo/x64/
+*.log
+*.tlog
+*.db
+
+.vscode
diff --git a/dali-physics/third-party/chipmunk2d/CMakeLists.txt b/dali-physics/third-party/chipmunk2d/CMakeLists.txt
new file mode 100644
index 0000000..9166edb
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/CMakeLists.txt
@@ -0,0 +1,53 @@
+cmake_minimum_required(VERSION 3.7)
+
+project(chipmunk)
+
+# to change the prefix, run cmake with the parameter:
+#   -D CMAKE_INSTALL_PREFIX=/my/prefix
+
+# to change the build type, run cmake with the parameter:
+#   -D CMAKE_BUILD_TYPE=<build-type>
+# run "cmake --help-variable CMAKE_BUILD_TYPE" for details
+if(NOT CMAKE_BUILD_TYPE)
+  SET(CMAKE_BUILD_TYPE Release CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+      FORCE)
+endif()
+
+# to manually select install locations of libraries and executables
+#   -D LIB_INSTALL_DIR mylib
+#   -D BIN_INSTALL_DIR newbin
+set(LIB_INSTALL_DIR ${LIB_DIR} CACHE STRING "Install location of libraries")
+set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
+
+# other options for the build, you can i.e. activate the shared library by passing
+#   -D BUILD_SHARED=ON
+# to cmake. Other options analog
+if(ANDROID)
+  option(BUILD_SHARED "Build and install the shared library" ON)
+  option(BUILD_STATIC "Build as static library" ON)
+  option(INSTALL_STATIC "Install the static library" OFF)
+else()
+  option(BUILD_SHARED "Build and install the shared library" ON)
+  option(BUILD_STATIC "Build as static library" ON)
+  option(INSTALL_STATIC "Install the static library" ON)
+endif()
+
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+  option(FORCE_CLANG_BLOCKS "Force enable Clang blocks" YES)
+endif()
+
+if(INSTALL_STATIC)
+  set(BUILD_STATIC ON FORCE)
+endif()
+
+if(NOT MSVC)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") # always use gnu99
+  if(FORCE_CLANG_BLOCKS)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fblocks")
+  endif()
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math") # extend release-profile with fast-math
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall") # extend debug-profile with -Wall
+endif()
+
+add_subdirectory(src)
diff --git a/dali-physics/third-party/chipmunk2d/LICENSE.txt b/dali-physics/third-party/chipmunk2d/LICENSE.txt
new file mode 100644
index 0000000..55c24c9
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2007-2015 Scott Lembcke and Howling Moon Software
+
+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.
diff --git a/dali-physics/third-party/chipmunk2d/README.md b/dali-physics/third-party/chipmunk2d/README.md
new file mode 100644
index 0000000..1eca892
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/README.md
@@ -0,0 +1,8 @@
+# Bullet Physics SDK
+
+This is the Chipmunk2D Physics Library Version 7.0.3.
+
+The commit used is: [87340c2](https://github.com/slembcke/Chipmunk2D/commit/87340c216bf97554dc552371bbdecf283f7c540e).
+
+Please refer to [Chipmunk2D Physics Library Github](https://github.com/slembcke/Chipmunk2D/tree/Chipmunk-7.0.3) for further information.
+
diff --git a/dali-physics/third-party/chipmunk2d/TODO.txt b/dali-physics/third-party/chipmunk2d/TODO.txt
new file mode 100644
index 0000000..e813c82
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/TODO.txt
@@ -0,0 +1,52 @@
+Priorities:
+	Basics tutorial.
+	Simple top down player controls.
+	* test tiny omega bug in cpvslerp().
+	User definable default winding.
+	User definable fast collision filtering.
+	Assertion (or warning?) for destroying a body with things still attached
+	Bilinearly sampled image sampler function. (override the sample method to always take bilinear samples)
+	RGB Image Sampler class.
+	Reorganize Chimpnuk Pro directory structure. Too flat and confusing.
+	Improve the ACD splitting plane algorithm.
+	Fishing game
+	Motorcycle in a spinning cage
+	Squid thingy like TomorrowPlusX.
+
+	Investigate getting better PhysicsEditor support.
+
+Unordered
+	Fix solver issues with the groove joint.
+	Use a slop tolerance on joint boundaries.
+
+Website things
+	Don't make any mistakes: http://www.gamasutra.com/view/feature/185773/the_top_10_mistakes_tool_.php
+	Several people want a Chipmunk Facebook page.
+	figure out and redo front page.	Chipmunk js examples.
+
+Future things to think about:
+	breakable object support functions?
+	Serialization
+	Tests for the query methods
+	Building bodies from shape collections.
+	Per body iterations and timestep?
+	Per body damping and gravity coefs?
+	Easy callback programable joint?
+	Top down racing game. (Need the callback constraint)
+	cpBodyActivateStatic() should also activate joints?
+
+Chipmunk 7:
+	Speculative contacts
+	User definable constraint
+	Custom contact constraint with rolling friction and per contact surface v.
+	Serialization
+	API changes, different body/shape instantiation.
+	Collision handler objects with additional callbacks.
+	Calculate contact anchors to get rid of contact pos. (needed for speculative contacts anyway)
+	Mass property calculation changes.
+	Change apply force/impulse and point velocity functions.
+	Separate doxygen docs for Objective-C parts and C parts.
+	Cocos2D xcode templates.
+	Custom contacts using cpArbiter user data.
+	Built in transform type.
+	
\ No newline at end of file
diff --git a/dali-physics/third-party/chipmunk2d/VERSION.txt b/dali-physics/third-party/chipmunk2d/VERSION.txt
new file mode 100644
index 0000000..489f434
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/VERSION.txt
@@ -0,0 +1,300 @@
+What's new in 7.0.3:
+* MISC: Replacing GLFW with Sokol in the demo application. No need to push GLFW binaries and has a nice x-platform renderer to build on.
+* MISC: Fixed some 'const' warnings for MSCV.
+
+What's new in 7.0.2:
+* MISC: Merging pull requests. Build fixes and the like.
+
+What's new in 7.0.1:
+* BUG: Remove references to M_PI sinces it's not actually part of C and causes problems with MSVC.
+* BUG: Build fixes for Mac/CMake and MSVC 13.
+* BUG: Move to using __declspec(dllexport) for Windows builds.
+* BUG: Fixed a precision issue with the EPA algorithm that would cause excessive iteration.
+* BUG: cpPolyshapeNewRaw() was undefined.
+* BUG: Changing gravity will wake up all objects in a space.
+
+What's new in 7.0.0:
+* All features from Chipmunk Pro are now free and open source! (threaded and NEON solver, autogeometry)
+* API: Lots of cleanup to the API naming for better consistency.
+* API: Renamed nearest point queries to simply point queries.
+* API: Removed many deprecated functions.
+* API: Struct definitions have become fully opaque instead of mangling names with the CP_PRIVATE() macro.
+* API: Replaced templated accessor functions with concrete ones. Should be simpler to deal with for FFIs.
+* API: Optional automatic mass properties for shapes. Calculates the moment of inertia and center of gravity for you.
+* API: Optional anchor point for bodies that is separate from the center of gravity.
+* API: Added radius parameters to many functions dealing with shapes (moment calculation, initialization, etc).
+* API: The convex hull and winding is automatically calculated when creating a poly shape.
+* API: Added a cpShapesCollide() function to check overlap of arbitrary shapes.
+* API: cpShape filter property to supersede layers and groups.
+* API: Collision handlers now return a collision handler struct to make it simpler to set up callbacks.
+* API: Wildcard collision types.
+* API: The cpArbiterTotalImpulseWithFriction() function was renamed to cpArbiterTotalImpulse(). The old useless cpArbiterTotalImpulse() implementation was removed.
+* API: Contacts now store the colliding point on the surface of both shapes.
+* API: cpArbiterIsRemoval() to check if a separate callback is called due to a removal and not a true separating collision.
+* API: Arbiters now only store one normal per pair of colliding shapes.
+* API: cpBBNewForExtents().
+* API: Added a concrete kinematic body type to replace the confusing "rogue" body concept.
+* API: Added a 2x3 affine transform type, cpTransform.
+* API: Added a new debug rendering API.
+* MISC: Numerous improvements to the collision detection.
+* MISC: cpPolyline structs are passed by reference instead of value. (I've regretted that decision for years!)
+
+What's new in 6.2.2:
+* Fixed some issues on arm64.
+* PRO: Added a 64 bit NEON solver to use on arm64.
+
+What's new in 6.2.1:
+* Added Android support to the CMake files. (Thanks Eric Wing!)
+* Added a MSVC 2012 project file. (Thanks Leonid Usov!)
+* Merged a fix for VAOs on Windows. (Thanks Leonid Usov!)
+* Merged a couple of other minor fixes.
+* BUG: Fixed a crash issue with the ChipmunkTileCache and ChipmunkPointCloudSampler classes. (Pro only).
+
+What's new in 6.2.0:
+* Collision detection now primarily uses the GJK and EPA algorithms instead of SAT. Internally this was a rather huge change. o_O
+* Improved collision point quality and better collision point identification.
+* All shape types can now be given a rounding radius.
+* Collisions are now guaranteed to have a maximum of 2 collision points.
+* Poly to poly collision performance is slightly better when they have a radius. Slightly worse with none.
+* Implemented smoothed segment collisions to prevent colliding with the "cracks" between segment shapes.
+* API: (Officially) added cpSegmentShapeSetNeighbors() used to enable smoothed line collisions.
+* API: Added cpBBCenter() to get the center of a bounding box.
+* API: Added cpPolyShapeInit2() and cpPolyShapeNew2() to create poly shapes with a radius. (Horrible names yes, but it will go away in Chipmunk 7)
+* API: Added cpBoxShapeInit3() and cpBoxShapeNew3() to create boxes with a radius.
+* API: Added cpPolyShapeGetRadius() and cpPolyShapeSetRadius() (the latter only in chipmunk_unsafe.h).
+* API: Added cpNearestPointQueryInfo.g which returns the gradient of the signed distance field for the shape.
+* BUG: cpMomentForPoly() will now return a correct value for degenerate 2 vertex polygons.
+* BUG: Fixed an issue where certain segment query calls would return a t value of 0 instead of 1 for a missed query.
+* MISC: Passing cpvzero to cpvnormalize() will now return cpvzero. No need to worry about NaNs or cpvnormalize_safe().
+* MISC: Demo app now uses GLFW instead of GLUT, and has improved drawing and text rendering routines.
+
+What's new in 6.1.5:
+* API: Added cpArbiter*SurfaceVelocity() to allow for custom surface velocity calculation.
+* API: Added cpArbiteSetContactPointSet() to allow changing the contact geometry on the fly.
+* API: Added cpSpaceConvertBodyToStatic() and cpSpaceConvertBodyToDynamic().
+* API: Added [ChipmunkBody velocityAt*Point:] methods to wrap their C equivalents. (Pro only)
+* API: Added overridable [ChipmunkBody updateVelocity:...] and [ChipmunkBody updatePosition:] methods. (Pro only)
+* API: Added .space properties to ChipmunkBody, ChipmunkShape and ChipmunkConstaint to wrap their C equivalents. (Pro only)
+* API: Added overridable [ChipmunkConstraint preSolve:] and [ChipmunkConstraint postSolve:] methods. (Pro only)
+* API: Added an ChipmunkMultiGrab.grabSort property that allows you to prioritize which shape is grabbed when there is overlap. (Pro only)
+* MISC: Segment queries started inside of a shape now return t=0 and n=cpvzero instead of being undefined.
+* MISC: Cleaned up a lot of common assertion messages to be more clear.
+* MISC: Added a new demo called Shatter.
+* MISC: Added a crushing force estimation example to the ContactGraph demo and a static/dynamic conversion example to Plink.
+* MISC: Modified the Sticky demo to use the new cpArbiteSetContactPointSet() to avoid the use of unnecessary sensor shapes.
+* MISC: [ChipmunkSpace addBounds:...] now returns a NSArray of the bounding segments. (Pro only)
+
+What's new in 6.1.4:
+* MISC: Fixed a build script issue that was preventing the documentation from being generated.
+
+What's new in 6.1.3:
+* BUG: Fixed a couple of very specific but fatal bugs that occur when sleeping is enabled and filtering collisions.
+* BUG: Fixed an issue with cpvslerp() between very similar vectors.
+* BUG: Fixed an issue with grab friction in ChipmunkMultiGrab. (Pro only)
+* MISC: Implemented the cpConstraintGetImpulse() functionality for spring joints.
+* MISC: Added more functions to chipmunk_ffi.h
+
+What's new in 6.1.2:
+* API: Added a cpArbiter.data pointer. Now you can tag collisions with custom persistent data.
+* API: Added segment to segment collisions (thanks to LegoCylon)
+* API: cpSpaceAddPostStepCallback() now returns false if the callback was a duplicate.
+* API: Added the ChipmunkAbstractSampler.marchThreshold property instead of hardcoding it to 0.5.
+* API: Added ChipmunkGrooveJoint properties for the groove and joint anchors.
+* API: ChipmunkMultiGrab now returns information about grabbed shapes.
+* BUG: Fixed a minor (non-crashing, non-leaking) memory pooling issue with reindexing lots of static shapes.
+* BUG: Fixed an issue with the slerp functions that would cause them to return incorrect results when given non-unit length input.
+* BUG: Fixed a precision bug with the ChipmunkImage sampler classes that could cause artifacts or miss small features.
+* BUG: Fixed a number of properties in Objective-Chipmunk that should have been nonatomic.
+* BUG: Fixed a number of types in Objective-Chipmunk that were incorrectly id that should have been cpGroup, cpCollisionType etc. It's now possible to redefine them at compile time if you wish.
+* MISC: Dropped armv6 support in favor of armv7s on iOS. (You can switch it back easily if you need.)
+* MISC: Updated iOS build scripts to guess the latest SDK.
+* MISC: Added the "Sticky Surfaces" demo as a cpArbiter.data example.
+* MISC: Updated Objective-Chipmunk build scripts to always use the latest iOS SDK.
+
+What's new in 6.1.1:
+* API: Renamed the new block based iterators as soon as possible to match the Apple convention ("_b" suffix).
+
+What's new in 6.1.0:
+* API: Added a pthread based, multi-threaded solver to accelerate the game on multi-core systems. (Pro only)
+* API: Added cpConvexHull() and CP_CONVEX_HULL() for generating convex hulls.
+* API: Added cpPolylineConvexDecomposition_BETA() to generate an approximate concave decomposition of a polyline. (Pro only)
+* API: Added [ChipmunkPolyline toConvexHull:] to generate approximate convex hulls. (Pro only).
+* API: Added [ChipmunkPolylineSet toConvexHulls_BETA:]. (Pro only)
+* API: Added nearest point queries.
+* API: Added a push mode to ChipmunkMultiGrab so touches can interact with the scene even if they didn't initially touch a shape. (Pro only)
+* API: Added optional block based iterators.
+* API: Added a space property to cpBody, cpShape and cpConstraint types.
+* BUG: Fixed an issue with changing the floating point and vector type on OS X.
+* BUG: Fixed a pixel offset in ChipmunkImageSampler that could cause minor sampling artifacts. (Pro only)
+* BUG: Fixed an issue where cpShape and cpConstraint structs could have garbage space pointers if cpcalloc() was redefined.
+* BUG: Fixed assertions in cpArbiter getters to correctly reflect a contact count of 0 from separate() callbacks.
+* BUG: Fixed a regression relating to registering post-step() callbacks from other post-step() callbacks.
+* BUG: Fixed a minor memory leak for sleeping bodies when destroying a space.
+* MISC: Point queries are now deprecated in preference to point queries.
+* MISC: cpSpatialIndexPointQuery() was redundant and has been removed. Use cpSpatialIndexQuery() instead.
+* MISC: cpShape*Query() functions now accept a NULL info pointer if you don't want detailed query info.
+* MISC: The enableContactGraph property of cpSpace is deprecated and always be true.
+* MISC: Added a new demos of the convex hull functions and a self balancing Unicycle.
+
+What's new in 6.0.3:
+* API: Added a cpBBForCircle() convenience function.
+* API: Added cpBBSegmentQuery() to check where a segment hits a cpBB.
+* API: Added cpBodyGetVelAtWorldPoint() and cpBodyGetVelAtLocalPoint() to get point velocities on a body.
+* API: Added cpArbiterTotalKE() to calculate the energy lost due to a collision. Great for calculating damage accurately.
+* API: Added methods to get an ObjC pointer from a C chipmunk struct.
+* API: Added a CHIPMUNK_ARBITER_GET_BODIES() macro for Objective-Chipmunk.
+* API: The Objective-Chipmunk headers are now ARC compatible.
+* API: Added a [ChipmunkSpace contains:] method to check if a ChipmunkObject has been added to the space or not.
+* API: Added a cpBBNewForCircle() function.
+* API: Added a cpBBSegmentQuery() function for raycasting againsts AABBs.
+* BUG: Fixed a regression with ChipmunkSpace.bodies and ChipmunkSpace.shapes that caused crashes.
+* BUG: Fixed a rare bug with postStep() callbacks and iterators.
+* BUG: Fixed a border case in cpBBIntersectsSegment() that could cause missed segment queries.
+* MISC: Added some new assertions for error conditions that were previously uncaught.
+* MISC: Accelerated segment queries in cpBBTree by sorting the nodes.
+* MISC: Added a new "Slice" demo that lets you cut up a polygon.
+* MISC: Added NEON optimizations for Chipmunk Pro. Expect running on most ARM platforms to be 25-35% faster for contact heavy simulations.
+* MISC: All ChipmunkObject instances added to a space are now retained, even composite ones.
+
+What's new in 6.0.2:
+* API: Added cpSpaceIsLocked() to check if you are in a callback or not.
+* API: Removed the long deprecated [ChipmunkSpace addShapeAHandler:] and [ChipmunkSpace addShapeBHandler:] methods.
+* API: The ChipmunkObject protocol now can return any id<NSFastEnumeration> object instead of just an NSSet.
+* API: The largely useless [ChipmunkSpace addBaseObjects:] and [ChipmunkSpace removeBaseObjects:] methods were removed.
+* API: Added [ChipmunkSpace smartAdd:] and [ChipmunkSpace smartRemove:] methods for a consistent API to remove objects inside and out of callbacks.
+* API: Added [ChipmunkSpace addPostStepBlock:key:] to complement [ChipmunkSpace addPostStepCallback:selector:key:].
+* API: Added [ChipmunkSpace addPostStepAddition:].
+* API: Objective-Chipmunk collision handlers no longer retain their target to avoid reference cycles.
+* API: Added callbacks to joints.
+* BUG: Soft errors (only checked when debug mode is enabled) and warnings were disabled. Whoops.
+* BUG: cpShapeIsSensor() was incorrectly named in chipmunk_ffi.h.
+* BUG: It should be safe to call cpActivateBody() from an space iterator callback now.
+* MISC: Very nice bouyancy demo added based on callbacks.
+* MISC: Breakable Joints demo showing how to use the new joint callbacks.
+* MISC: Player demo updated and greatly enhanced by Chipmunk 6 features.
+* MISC: Changed adding a static body to a space from a warning to a hard error.
+* MISC: cpGroup and cpCollisionType now default to uintptr_t so you can safely use pointers instead of ints for these types.
+* MISC: Updated the MSVC10 project file.
+* MISC: Updated the FFI defs.
+
+What's new in 6.0.1:
+* BUG: Calling cpBodySetPos() on a sleeping body was delaying the Separate() handler callback if one existed.
+* BUG: Fixed a bug where Separate() handler callbacks were not occuring when removing shapes.
+* BUG: Calling cpBodyApplyForce() or cpBodyResetForces() was not activating sleeping bodies.
+* API: Added cpSpaceEachConstraint().
+* API: Added a "CurrentTimeStep" property to cpSpace to retrieve the current (or most recent) timestep.
+* MISC: Got rid of anonymous unions so that it is C99 clean again.
+
+What's new in 6.0.0:
+Chipmunk 6.x's API is not quite 100% compatible with 5.x. Make sure you read the list of changes carefully.
+Keep in mind that this is a x.0.0 release and that it's likely there are still some bugs I don't know about yet. I've spent a lot of effort rewritting the collision detection, sleeping, and contact graph algorithms that have required large changes and cleanup to the 5.x codebase. I've ironed out all the bugs that I know of, and the beta test went well. So it's finally time for 6!
+
+* API: Chipmunk now has hard runtime assertions that aren't disabled in release mode for many error conditions. Most people have been using release builds of Chipmunk during development and were missing out on very important error checking.
+* API: Access to the private API has been disabled by default now and much of the private API has changed. I've added official APIs for all the uses of the private API I knew of.
+* API: Added accessor functions for every property on every type. As Chipmunk's complexity has grown, it's become more difficult to ignore accessors. You are encouraged to use them, but are not required to.
+* API: Added cpSpaceEachBody() and cpSpaceEachShape() to iterate bodies/shapes in a space.
+* API: Added cpSpaceReindexShapesForBody() to reindex all the shapes attached to a particular body.
+* API: Added a 'data' pointer to spaces now too.
+* API: cpSpace.staticBody is a pointer to the static body instead of a static reference.
+* API: The globals cp_bias_coef, cp_collision_slop, cp_contact_persistence have been moved to properties of a space. (collisionBias, collisionSlop, collisionPersistence respectively)
+* API: Added cpBodyActivateStatic() to wake up bodies touching a static body with an optional shape filter parameter.
+* API: Added cpBodyEachShape() and cpBodyEachConstraint() iterators to iterate the active shapes/constraints attached to a body.
+* API: Added cpBodyEeachArbiter() to iterate the collision pairs a body is involved in. This makes it easy to perform grounding checks or find how much collision force is being applied to an object.
+* API: The error correction applied by the collision bias and joint bias is now timestep independent and the units have completely changed.
+* FIX: Units of damping for springs are correct regardless of the number of iterations. Previously they were only correct if you had 1 or 2 iterations.
+* MISC: Numerous changes to help make Chipmunk work better with variable timesteps. Use of constant timesteps is still highly recommended, but it is now easier to change the time scale without introducing artifacts.
+* MISC: Performance! Chipmunk 6 should be way faster than Chipmunk 5 for almost any game.
+* MISC: Chipmunk supports multiple spatial indexes and uses a bounding box tree similar to the one found in the Bullet physics library by default. This should provide much better performance for scenes with objects of differening size and works without any tuning for any scale.
+
+
+What's new in 5.3.5
+* FIX: Fixed spelling of cpArbiterGetDepth(). Was cpArbiteGetDepth() before. Apparently nobody ever used this function.
+* FIX: Added defines for M_PI and M_E. Apparently these values were never part of the C standard math library. Who knew!?
+* FIX: Added a guard to cpBodyActivate() so that it's a noop for rouge bodies.
+* FIX: Shape queries now work with (and against) sensor shapes.
+* FIX: Fixed an issue where removing a collision handler while a separate() callback was waiting to fire the next step would cause crashes.
+* FIX: Fixed an issue where the default callback would not be called for sensor shapes.
+* FIX: Resetting or applying forces or impulses on a body causes it to wake up now.
+* MISC: Added a check that a space was not locked when adding or removing a callback.
+* MISC: Removed cpmalloc from the API and replaced all occurences with cpcalloc
+* MISC: Added a benchmarking mode to the demo app. -trial runs it in time trial mode and -bench makes it run some benchmarking demos.
+
+What's new in 5.3.4:
+* FIX: cpBodyActivate() can now be called from collision and query callbacks. This way you can use the setter functions to change properties without indirectly calling cpBodyActivate() and causing an assertion.
+* FIX: cpArbiterGetContactPointSet() was returning the collision points for the normals.
+* FIX: cpSpaceEachBody() now includes sleeping bodies.
+* FIX: Shapes attached to static rogue bodies created with cpBodyNewStatic() are added as static shapes.
+* MISC: Applied a user patch to update the MSVC project and add a .def file.
+
+What's new in 5.3.3:
+* API: Added cpArbiteGetCount() to return the number of contact points.
+* API: Added helper functions for calculating areas of Chipmunk shapes as well as calculating polygon centroids and centering polygons on their centroid.
+* API: Shape queries. Query a shape to test for collisions if it were to be inserted into a space.
+* API: cpBodyInitStatic() and cpBodyNewStatic() for creating additional static (rogue) bodies.
+* API: cpBodySleepWithGroup() to allow you to create groups of sleeping objects that are woken up together.
+* API: Added overloaded *, +, - and == operators for C++ users.
+* API: Added cpSpaceActivateShapesTouchingShape() to query for and activate any shapes touching a given shape. Useful if you ever need to move a static body.
+* FIX: Fixed an extremely rare memory bug in the collision cache.
+* FIX: Fixed a memory leak in Objective-Chipmunk that could cause ChipmunkSpace objects to be leaked.
+* MISC: C struct fields and function that are considered private have been explicitly marked as such. Defining CP_ALLOW_PRIVATE_ACCESS to 0 in Chipmunk.h will let you test which parts of the private API that you are using and give me feedback about how to build proper APIs in Chipmunk 6 for what you are trying to do.
+* MISC: Allow CGPoints to be used as cpVect on Mac OS X as well as iOS.
+
+
+What's new in 5.3.2:
+* FIX: Collision begin callbacks were being called continuously for sensors or collisions rejected from the pre-solve callback.
+* FIX: Plugged a nasty memory leak when adding post-step callbacks.
+* FIX: Shapes were being added to the spatial hash using an uninitialized bounding box in some cases.
+* FIX: Perfectly aligned circle shapes now push each other apart.
+* FIX: cpBody setter functions now call cpBodyActivate().
+* FIX: Collision handler targets are released in Objective-Chipmunk when they are no longer needed instead of waiting for the space to be deallocated.
+* API: cpSpaceSegmentQuery() no longer returns a boolean. Use cpSpaceSegmentQueryFirst() instead as it's more efficient.
+* NEW: cpSpaceRehashShape() Rehash an individual shape, active or static.
+* NEW: cpBodySleep() Force a body to fall asleep immediately.
+* NEW: cpConstraintGetImpulse() Return the most recent impulse applied by a constraint.
+* NEW: Added setter functions for the groove joint endpoints.
+* MISC: A number of other minor optimizations and fixes.
+
+What's new in 5.3.1:
+ * NEW: Added a brand new tutorial for Objective-Chipmunk: SimpleObjectiveChipmunk that can be found in the Objective-Chipmunk folder.
+ * NEW: Proper API docs for Objective-Chipmunk.
+ * NEW: Updated the included Objective-Chipmunk library.
+ * FIX: Fixed a rare memory crash in the sensor demo.
+ * FIX: Fixed some warnings that users submitted.
+
+What's new in 5.3.0:
+ * FIX: Fixed the source so it can compile as C, C++, Objective-C, and Objective-C++.
+ * FIX: Fixed cp_contact_persistence. It was broken so that it would forget collision solutions after 1 frame instead of respecting the value set.
+ * OPTIMIZATION: Several minor optimizations have been added. Though performance should only differ by a few percent.
+ * OPTIMIZATION: Chipmunk now supports putting bodies to sleep when they become inactive.
+ * API: Elastic iterations are now deprecated as they should no longer be necessary.
+ * API: Added API elements to support body sleeping.
+ * API: Added a statically allocated static body to each space for attaching static shapes to.
+ * API: Static shapes attached to the space's static body can simply be added to the space using cpSpaceAddShape().
+ * NEW: New MSVC projects.
+ * NEW: Added boolean and time stamp types for clarity.
+
+What's new in 5.2.0:
+ * OPTIMIZATION: Chipmunk structs used within the solver are now allocated linearly in large blocks. This is much more CPU cache friendly. Programs have seen up to 50% performance improvements though 15-20% should be expected.
+ * API: Shape references in cpArbiter structs changed to private_a and private_b to discourage accessing the fields directly and getting them out of order. You should be using cpArbiterGetShapes() or CP_ARBITER_GET_SHAPES() to access the shapes in the correct order.
+ * API: Added assertion error messages as well as warnings and covered many new assertion cases.
+ * FIX: separate() callbacks are called before shapes are removed from the space to prevent dangling pointers.
+ * NEW: Added convenience functions for creating box shapes and calculating moments.
+ 
+
+What's new in 5.1.0:
+ * FIX: fixed a NaN issue that was causing raycasts for horizontal or vertical lines to end up in an infinite loop
+ * FIX: fixed a number of memory leaks
+ * FIX: fixed warnings for various compiler/OS combinations
+ * API: Rejecting a collision from a begin() callback permanently rejects the collision until separation
+ * API: Erroneous collision type parameterns removed from cpSpaceDefaulteCollisionHandler()
+ * MOVE: FFI declarations of inlined functions into their own header
+ * MOVE: Rearranged the project structure to separate out the header files into a separate include/ directory.
+ * NEW: Added a static library target for the iPhone.
+ * NEW: Type changes when building on the iPhone to make it friendlier to other iPhone APIs
+ * NEW: Added an AABB query to complement point and segment queries
+ * NEW: CP_NO_GROUP and CP_ALL_LAYERS constants
+
+What's new in 5.0.0:
+ * Brand new Joint/Constraint API: New constraints can be added easily and are much more flexible than the old joint system
+ * Efficient Segment Queries - Like raycasting, but with line segments.
+ * Brand new collision callback API: Collision begin/separate events, API for removal of objects within callbacks, more programable control over collision handling.
\ No newline at end of file
diff --git a/dali-physics/third-party/chipmunk2d/android/Android.mk b/dali-physics/third-party/chipmunk2d/android/Android.mk
new file mode 100644
index 0000000..defb992
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/android/Android.mk
@@ -0,0 +1,86 @@
+# Copyright (C) PlayControl Software, LLC. 
+# Eric Wing <ewing . public @ playcontrol.net>
+#
+# This is a "Prebuilt" Android Makefile provided as an example/template (or direct use if no tweaking is required).
+# The idea is that you have already built the chipmunk .so and .a libraries using CMake.
+# Now you want to use those prebuilt libraries in your own project.
+# Android support prebuilt exteneral modules through its ndk-build system, but you need to have all the pieces setup and in the right place. This is one of those pieces.
+# 
+# This file assumes you built all your chipmunk libs and put things into a directory structure like so:
+# 
+# Android.mk (this file)
+# 	libs/armeabi/libchipmunk.a
+# 	libs/armeabi/libchipmunk.a
+# 	libs/armeabi-v7a/libchipmunk.a
+# 	libs/armeabi-v7a/libchipmunk.a
+# 	libs/x86/libchipmunk.a
+# 	libs/x86/libchipmunk.a
+# 
+# 	include/chipmunk/chipmunk.h
+# 	... (the other header files here)
+#
+# Note that this file is copied into the directory above libs and include.
+# Below is the code you need to make this Makefile export the correct headers, libraries, and flags for both dynamic and static versions.
+
+# LOCAL_PATH needs to be before include
+LOCAL_PATH := $(call my-dir)
+
+# For the dynamic library
+include $(CLEAR_VARS)
+# This is the name of module the caller will use in LOCAL_SHARED_LIBRARIES
+LOCAL_MODULE := chipmunk_shared
+LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libchipmunk.so
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include/chipmunk
+# Use LOCAL_EXPORT_CFLAGS to automatically export the correct flags (as necessary) to the calling module so the caller doesn't need to know the details.
+#LOCAL_EXPORT_CFLAGS := -DFOO=1 -DCP_USE_DOUBLES=1 -DCP_USE_CGPOINTS=0
+# The .so is already linked so we don't really need to export this.
+#LOCAL_EXPORT_LDLIBS := -lm
+include $(PREBUILT_SHARED_LIBRARY)
+
+# For the static library
+include $(CLEAR_VARS)
+# This is the name of module the caller will use in LOCAL_STATIC_LIBRARIES
+LOCAL_MODULE := chipmunk_static
+LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libchipmunk.a
+# Use LOCAL_EXPORT_CFLAGS to automatically export the correct flags (as necessary) to the calling module so the caller doesn't need to know the details.
+#LOCAL_EXPORT_CFLAGS := -DFOO=1 -DCP_USE_DOUBLES=1 -DCP_USE_CGPOINTS=0
+# Since the .a isn't linked, it's link dependencies must be passed on to the calling project.
+LOCAL_EXPORT_LDLIBS := -lm
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include/chipmunk
+include $(PREBUILT_STATIC_LIBRARY)
+
+
+
+# Two other pieces are needed to make this work which fall outside the scope of this file.
+# First, you must have a directory convention for the calling makefile.
+# So let's say we put all the above in a directory called Chipmunk2D. The layout looks like this:
+# Chipmunk2D/
+# 	Android.mk (this file)
+# 		libs/armeabi/libchipmunk.a
+# 		libs/armeabi/libchipmunk.a
+# 		libs/armeabi-v7a/libchipmunk.a
+# 		libs/armeabi-v7a/libchipmunk.a
+# 		libs/x86/libchipmunk.a
+# 		libs/x86/libchipmunk.a
+# 
+# 		include/chipmunk/chipmunk.h
+# 		... (the other header files here)
+
+# So the calling makefile looks something like:
+# LOCAL_PATH := $(call my-dir)
+# include $(CLEAR_VARS)
+# LOCAL_MODULE    := hello-jni
+# LOCAL_SRC_FILES := hello-jni.c
+# These are the LOCAL_MODULE names as defined in the prebuilt module's Android.mk. Define either shared or static, but not both. If you use dynamic, don't forget you need to do a System.loadLibrary("chipmunk") in your Java code.
+# #LOCAL_SHARED_LIBRARIES := chipmunk_shared
+# LOCAL_STATIC_LIBRARIES := chipmunk_static
+# include $(BUILD_SHARED_LIBRARY)
+# Android build system will look for folder `Chipmunk2D` in all import paths:
+# $(call import-module,Chipmunk2D) 
+# ------     end      -----
+
+# Second, you need to set the environmental variable NDK_MODULE_PATH to list the directory containing Chipmunk2D.
+# So if Chipmunk2D is in /Library/Frameworks/Android/PrebuiltModules
+# export NDK_MODULE_PATH=/Library/Frameworks/Android/PrebuiltModules
+# Note that NDK_MODULE_PATH may contain multiple directories like the PATH environmental variable.
+
diff --git a/dali-physics/third-party/chipmunk2d/codeblocks/Chipmunk.cbp b/dali-physics/third-party/chipmunk2d/codeblocks/Chipmunk.cbp
new file mode 100644
index 0000000..a6cc9ea
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/codeblocks/Chipmunk.cbp
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="Chipmunk" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin/Debug/libChipmunk" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-g" />
+					<Add directory="../include" />
+					<Add directory="../include/chipmunk" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin/Release/libChipmunk" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add option="-std=c99" />
+		</Compiler>
+		<Unit filename="../include/chipmunk/chipmunk.h" />
+		<Unit filename="../include/chipmunk/chipmunk_ffi.h" />
+		<Unit filename="../include/chipmunk/chipmunk_private.h" />
+		<Unit filename="../include/chipmunk/chipmunk_types.h" />
+		<Unit filename="../include/chipmunk/chipmunk_unsafe.h" />
+		<Unit filename="../include/chipmunk/cpArbiter.h" />
+		<Unit filename="../include/chipmunk/cpBB.h" />
+		<Unit filename="../include/chipmunk/cpBody.h" />
+		<Unit filename="../include/chipmunk/cpConstraint.h" />
+		<Unit filename="../include/chipmunk/cpDampedRotarySpring.h" />
+		<Unit filename="../include/chipmunk/cpDampedSpring.h" />
+		<Unit filename="../include/chipmunk/cpGearJoint.h" />
+		<Unit filename="../include/chipmunk/cpGrooveJoint.h" />
+		<Unit filename="../include/chipmunk/cpPinJoint.h" />
+		<Unit filename="../include/chipmunk/cpPivotJoint.h" />
+		<Unit filename="../include/chipmunk/cpPolyShape.h" />
+		<Unit filename="../include/chipmunk/cpRatchetJoint.h" />
+		<Unit filename="../include/chipmunk/cpRotaryLimitJoint.h" />
+		<Unit filename="../include/chipmunk/cpShape.h" />
+		<Unit filename="../include/chipmunk/cpSimpleMotor.h" />
+		<Unit filename="../include/chipmunk/cpSlideJoint.h" />
+		<Unit filename="../include/chipmunk/cpSpace.h" />
+		<Unit filename="../include/chipmunk/cpSpatialIndex.h" />
+		<Unit filename="../include/chipmunk/cpTransform.h" />
+		<Unit filename="../include/chipmunk/cpVect.h" />
+		<Unit filename="../src/chipmunk.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpArbiter.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpArray.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpBBTree.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpBody.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpCollision.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpConstraint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpDampedRotarySpring.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpDampedSpring.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpGearJoint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpGrooveJoint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpHashSet.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpPinJoint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpPivotJoint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpPolyShape.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpRatchetJoint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpRotaryLimitJoint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpShape.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSimpleMotor.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSlideJoint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSpace.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSpaceComponent.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSpaceDebug.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSpaceHash.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSpaceQuery.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSpaceStep.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSpatialIndex.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/cpSweep1D.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/prime.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk.h
new file mode 100644
index 0000000..d98ba7e
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk.h
@@ -0,0 +1,232 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#ifndef CHIPMUNK_H
+#define CHIPMUNK_H
+
+#include <stdlib.h>
+#include <math.h>
+
+#ifndef alloca
+	#ifdef _WIN32
+		#include <malloc.h>
+	#elif defined(__FreeBSD__)
+		/* already included in <stdlib.h> */
+	#else
+		#include <alloca.h>
+	#endif
+#endif
+
+#ifdef _WIN32
+	#define CP_EXPORT __declspec(dllexport)
+#else
+	#define CP_EXPORT
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+CP_EXPORT void cpMessage(const char *condition, const char *file, int line, int isError, int isHardError, const char *message, ...);
+#ifdef NDEBUG
+	#define	cpAssertWarn(__condition__, ...)
+	#define	cpAssertSoft(__condition__, ...)
+#else
+	#define cpAssertSoft(__condition__, ...) if(!(__condition__)){cpMessage(#__condition__, __FILE__, __LINE__, 1, 0, __VA_ARGS__); abort();}
+	#define cpAssertWarn(__condition__, ...) if(!(__condition__)) cpMessage(#__condition__, __FILE__, __LINE__, 0, 0, __VA_ARGS__)
+#endif
+
+// Hard assertions are used in situations where the program definitely will crash anyway, and the reason is inexpensive to detect.
+#define cpAssertHard(__condition__, ...) if(!(__condition__)){cpMessage(#__condition__, __FILE__, __LINE__, 1, 1, __VA_ARGS__); abort();}
+
+#include "chipmunk_types.h"
+	
+/// @defgroup misc Misc
+/// @{
+
+/// Allocated size for various Chipmunk buffers
+#ifndef CP_BUFFER_BYTES
+	#define CP_BUFFER_BYTES (32*1024)
+#endif
+
+#ifndef cpcalloc
+	/// Chipmunk calloc() alias.
+	#define cpcalloc calloc
+#endif
+
+#ifndef cprealloc
+	/// Chipmunk realloc() alias.
+	#define cprealloc realloc
+#endif
+
+#ifndef cpfree
+	/// Chipmunk free() alias.
+	#define cpfree free
+#endif
+
+typedef struct cpArray cpArray;
+typedef struct cpHashSet cpHashSet;
+
+typedef struct cpBody cpBody;
+
+typedef struct cpShape cpShape;
+typedef struct cpCircleShape cpCircleShape;
+typedef struct cpSegmentShape cpSegmentShape;
+typedef struct cpPolyShape cpPolyShape;
+
+typedef struct cpConstraint cpConstraint;
+typedef struct cpPinJoint cpPinJoint;
+typedef struct cpSlideJoint cpSlideJoint;
+typedef struct cpPivotJoint cpPivotJoint;
+typedef struct cpGrooveJoint cpGrooveJoint;
+typedef struct cpDampedSpring cpDampedSpring;
+typedef struct cpDampedRotarySpring cpDampedRotarySpring;
+typedef struct cpRotaryLimitJoint cpRotaryLimitJoint;
+typedef struct cpRatchetJoint cpRatchetJoint;
+typedef struct cpGearJoint cpGearJoint;
+typedef struct cpSimpleMotorJoint cpSimpleMotorJoint;
+
+typedef struct cpCollisionHandler cpCollisionHandler;
+typedef struct cpContactPointSet cpContactPointSet;
+typedef struct cpArbiter cpArbiter;
+
+typedef struct cpSpace cpSpace;
+
+#include "cpVect.h"
+#include "cpBB.h"
+#include "cpTransform.h"
+#include "cpSpatialIndex.h"
+
+#include "cpArbiter.h"	
+
+#include "cpBody.h"
+#include "cpShape.h"
+#include "cpPolyShape.h"
+
+#include "cpConstraint.h"
+
+#include "cpSpace.h"
+
+// Chipmunk 7.0.3
+#define CP_VERSION_MAJOR 7
+#define CP_VERSION_MINOR 0
+#define CP_VERSION_RELEASE 3
+
+/// Version string.
+CP_EXPORT extern const char *cpVersionString;
+
+/// Calculate the moment of inertia for a circle.
+/// @c r1 and @c r2 are the inner and outer diameters. A solid circle has an inner diameter of 0.
+CP_EXPORT cpFloat cpMomentForCircle(cpFloat m, cpFloat r1, cpFloat r2, cpVect offset);
+
+/// Calculate area of a hollow circle.
+/// @c r1 and @c r2 are the inner and outer diameters. A solid circle has an inner diameter of 0.
+CP_EXPORT cpFloat cpAreaForCircle(cpFloat r1, cpFloat r2);
+
+/// Calculate the moment of inertia for a line segment.
+/// Beveling radius is not supported.
+CP_EXPORT cpFloat cpMomentForSegment(cpFloat m, cpVect a, cpVect b, cpFloat radius);
+
+/// Calculate the area of a fattened (capsule shaped) line segment.
+CP_EXPORT cpFloat cpAreaForSegment(cpVect a, cpVect b, cpFloat radius);
+
+/// Calculate the moment of inertia for a solid polygon shape assuming it's center of gravity is at it's centroid. The offset is added to each vertex.
+CP_EXPORT cpFloat cpMomentForPoly(cpFloat m, int count, const cpVect *verts, cpVect offset, cpFloat radius);
+
+/// Calculate the signed area of a polygon. A Clockwise winding gives positive area.
+/// This is probably backwards from what you expect, but matches Chipmunk's the winding for poly shapes.
+CP_EXPORT cpFloat cpAreaForPoly(const int count, const cpVect *verts, cpFloat radius);
+
+/// Calculate the natural centroid of a polygon.
+CP_EXPORT cpVect cpCentroidForPoly(const int count, const cpVect *verts);
+
+/// Calculate the moment of inertia for a solid box.
+CP_EXPORT cpFloat cpMomentForBox(cpFloat m, cpFloat width, cpFloat height);
+
+/// Calculate the moment of inertia for a solid box.
+CP_EXPORT cpFloat cpMomentForBox2(cpFloat m, cpBB box);
+
+/// Calculate the convex hull of a given set of points. Returns the count of points in the hull.
+/// @c result must be a pointer to a @c cpVect array with at least @c count elements. If @c verts == @c result, then @c verts will be reduced inplace.
+/// @c first is an optional pointer to an integer to store where the first vertex in the hull came from (i.e. verts[first] == result[0])
+/// @c tol is the allowed amount to shrink the hull when simplifying it. A tolerance of 0.0 creates an exact hull.
+CP_EXPORT int cpConvexHull(int count, const cpVect *verts, cpVect *result, int *first, cpFloat tol);
+
+/// Convenience macro to work with cpConvexHull.
+/// @c count and @c verts is the input array passed to cpConvexHull().
+/// @c count_var and @c verts_var are the names of the variables the macro creates to store the result.
+/// The output vertex array is allocated on the stack using alloca() so it will be freed automatically, but cannot be returned from the current scope.
+#define CP_CONVEX_HULL(__count__, __verts__, __count_var__, __verts_var__) \
+cpVect *__verts_var__ = (cpVect *)alloca(__count__*sizeof(cpVect)); \
+int __count_var__ = cpConvexHull(__count__, __verts__, __verts_var__, NULL, 0.0); \
+
+/// Returns the closest point on the line segment ab, to the point p.
+static inline cpVect
+cpClosetPointOnSegment(const cpVect p, const cpVect a, const cpVect b)
+{
+	cpVect delta = cpvsub(a, b);
+	cpFloat t = cpfclamp01(cpvdot(delta, cpvsub(p, b))/cpvlengthsq(delta));
+	return cpvadd(b, cpvmult(delta, t));
+}
+
+#if defined(__has_extension)
+#if __has_extension(blocks)
+// Define alternate block based alternatives for a few of the callback heavy functions.
+// Collision handlers are post-step callbacks are not included to avoid memory management issues.
+// If you want to use blocks for those and are aware of how to correctly manage the memory, the implementation is trivial. 
+
+void cpSpaceEachBody_b(cpSpace *space, void (^block)(cpBody *body));
+void cpSpaceEachShape_b(cpSpace *space, void (^block)(cpShape *shape));
+void cpSpaceEachConstraint_b(cpSpace *space, void (^block)(cpConstraint *constraint));
+
+void cpBodyEachShape_b(cpBody *body, void (^block)(cpShape *shape));
+void cpBodyEachConstraint_b(cpBody *body, void (^block)(cpConstraint *constraint));
+void cpBodyEachArbiter_b(cpBody *body, void (^block)(cpArbiter *arbiter));
+
+typedef void (^cpSpacePointQueryBlock)(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient);
+void cpSpacePointQuery_b(cpSpace *space, cpVect point, cpFloat maxDistance, cpShapeFilter filter, cpSpacePointQueryBlock block);
+
+typedef void (^cpSpaceSegmentQueryBlock)(cpShape *shape, cpVect point, cpVect normal, cpFloat alpha);
+void cpSpaceSegmentQuery_b(cpSpace *space, cpVect start, cpVect end, cpFloat radius, cpShapeFilter filter, cpSpaceSegmentQueryBlock block);
+
+typedef void (^cpSpaceBBQueryBlock)(cpShape *shape);
+void cpSpaceBBQuery_b(cpSpace *space, cpBB bb, cpShapeFilter filter, cpSpaceBBQueryBlock block);
+
+typedef void (^cpSpaceShapeQueryBlock)(cpShape *shape, cpContactPointSet *points);
+cpBool cpSpaceShapeQuery_b(cpSpace *space, cpShape *shape, cpSpaceShapeQueryBlock block);
+
+#endif
+#endif
+
+
+//@}
+
+#ifdef __cplusplus
+}
+
+static inline cpVect operator *(const cpVect v, const cpFloat s){return cpvmult(v, s);}
+static inline cpVect operator +(const cpVect v1, const cpVect v2){return cpvadd(v1, v2);}
+static inline cpVect operator -(const cpVect v1, const cpVect v2){return cpvsub(v1, v2);}
+static inline cpBool operator ==(const cpVect v1, const cpVect v2){return cpveql(v1, v2);}
+static inline cpVect operator -(const cpVect v){return cpvneg(v);}
+
+#endif
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_ffi.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_ffi.h
new file mode 100644
index 0000000..86e3d9f
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_ffi.h
@@ -0,0 +1,105 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#ifdef CHIPMUNK_FFI
+
+// Create non static inlined copies of Chipmunk functions, useful for working with dynamic FFIs
+// For many languages, it may be faster to reimplement these functions natively instead.
+// Note: This file should only be included by chipmunk.c.
+
+#ifdef _MSC_VER
+ #if _MSC_VER >= 1600
+  #define MAKE_REF(name) CP_EXPORT decltype(name) *_##name = name
+ #else
+  #define MAKE_REF(name)
+ #endif
+#else
+ #define MAKE_REF(name) __typeof__(name) *_##name = name
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+MAKE_REF(cpv); // makes a variable named _cpv that contains the function pointer for cpv()
+MAKE_REF(cpveql);
+MAKE_REF(cpvadd);
+MAKE_REF(cpvneg);
+MAKE_REF(cpvsub);
+MAKE_REF(cpvmult);
+MAKE_REF(cpvdot);
+MAKE_REF(cpvcross);
+MAKE_REF(cpvperp);
+MAKE_REF(cpvrperp);
+MAKE_REF(cpvproject);
+MAKE_REF(cpvforangle);
+MAKE_REF(cpvtoangle);
+MAKE_REF(cpvrotate);
+MAKE_REF(cpvunrotate);
+MAKE_REF(cpvlengthsq);
+MAKE_REF(cpvlength);
+MAKE_REF(cpvlerp);
+MAKE_REF(cpvnormalize);
+MAKE_REF(cpvclamp);
+MAKE_REF(cpvlerpconst);
+MAKE_REF(cpvdist);
+MAKE_REF(cpvdistsq);
+MAKE_REF(cpvnear);
+
+MAKE_REF(cpfmax);
+MAKE_REF(cpfmin);
+MAKE_REF(cpfabs);
+MAKE_REF(cpfclamp);
+MAKE_REF(cpflerp);
+MAKE_REF(cpflerpconst);
+
+MAKE_REF(cpBBNew);
+MAKE_REF(cpBBNewForExtents);
+MAKE_REF(cpBBNewForCircle);
+MAKE_REF(cpBBIntersects);
+MAKE_REF(cpBBContainsBB);
+MAKE_REF(cpBBContainsVect);
+MAKE_REF(cpBBMerge);
+MAKE_REF(cpBBExpand);
+MAKE_REF(cpBBCenter);
+MAKE_REF(cpBBArea);
+MAKE_REF(cpBBMergedArea);
+MAKE_REF(cpBBSegmentQuery);
+MAKE_REF(cpBBIntersectsSegment);
+MAKE_REF(cpBBClampVect);
+
+MAKE_REF(cpSpatialIndexDestroy);
+MAKE_REF(cpSpatialIndexCount);
+MAKE_REF(cpSpatialIndexEach);
+MAKE_REF(cpSpatialIndexContains);
+MAKE_REF(cpSpatialIndexInsert);
+MAKE_REF(cpSpatialIndexRemove);
+MAKE_REF(cpSpatialIndexReindex);
+MAKE_REF(cpSpatialIndexReindexObject);
+MAKE_REF(cpSpatialIndexSegmentQuery);
+MAKE_REF(cpSpatialIndexQuery);
+MAKE_REF(cpSpatialIndexReindexQuery);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_private.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_private.h
new file mode 100644
index 0000000..e606ba1
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_private.h
@@ -0,0 +1,344 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#ifndef CHIPMUNK_PRIVATE_H
+#define CHIPMUNK_PRIVATE_H
+
+#include "chipmunk/chipmunk.h"
+#include "chipmunk/chipmunk_structs.h"
+
+#define CP_HASH_COEF (3344921057ul)
+#define CP_HASH_PAIR(A, B) ((cpHashValue)(A)*CP_HASH_COEF ^ (cpHashValue)(B)*CP_HASH_COEF)
+
+// TODO: Eww. Magic numbers.
+#define MAGIC_EPSILON 1e-5
+
+
+//MARK: cpArray
+
+cpArray *cpArrayNew(int size);
+
+void cpArrayFree(cpArray *arr);
+
+void cpArrayPush(cpArray *arr, void *object);
+void *cpArrayPop(cpArray *arr);
+void cpArrayDeleteObj(cpArray *arr, void *obj);
+cpBool cpArrayContains(cpArray *arr, void *ptr);
+
+void cpArrayFreeEach(cpArray *arr, void (freeFunc)(void*));
+
+
+//MARK: cpHashSet
+
+typedef cpBool (*cpHashSetEqlFunc)(const void *ptr, const void *elt);
+typedef void *(*cpHashSetTransFunc)(const void *ptr, void *data);
+
+cpHashSet *cpHashSetNew(int size, cpHashSetEqlFunc eqlFunc);
+void cpHashSetSetDefaultValue(cpHashSet *set, void *default_value);
+
+void cpHashSetFree(cpHashSet *set);
+
+int cpHashSetCount(cpHashSet *set);
+const void *cpHashSetInsert(cpHashSet *set, cpHashValue hash, const void *ptr, cpHashSetTransFunc trans, void *data);
+const void *cpHashSetRemove(cpHashSet *set, cpHashValue hash, const void *ptr);
+const void *cpHashSetFind(cpHashSet *set, cpHashValue hash, const void *ptr);
+
+typedef void (*cpHashSetIteratorFunc)(void *elt, void *data);
+void cpHashSetEach(cpHashSet *set, cpHashSetIteratorFunc func, void *data);
+
+typedef cpBool (*cpHashSetFilterFunc)(void *elt, void *data);
+void cpHashSetFilter(cpHashSet *set, cpHashSetFilterFunc func, void *data);
+
+
+//MARK: Bodies
+
+void cpBodyAddShape(cpBody *body, cpShape *shape);
+void cpBodyRemoveShape(cpBody *body, cpShape *shape);
+
+//void cpBodyAccumulateMassForShape(cpBody *body, cpShape *shape);
+void cpBodyAccumulateMassFromShapes(cpBody *body);
+
+void cpBodyRemoveConstraint(cpBody *body, cpConstraint *constraint);
+
+
+//MARK: Spatial Index Functions
+
+cpSpatialIndex *cpSpatialIndexInit(cpSpatialIndex *index, cpSpatialIndexClass *klass, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex);
+
+
+//MARK: Arbiters
+
+cpArbiter* cpArbiterInit(cpArbiter *arb, cpShape *a, cpShape *b);
+
+static inline struct cpArbiterThread *
+cpArbiterThreadForBody(cpArbiter *arb, cpBody *body)
+{
+	return (arb->body_a == body ? &arb->thread_a : &arb->thread_b);
+}
+
+void cpArbiterUnthread(cpArbiter *arb);
+
+void cpArbiterUpdate(cpArbiter *arb, struct cpCollisionInfo *info, cpSpace *space);
+void cpArbiterPreStep(cpArbiter *arb, cpFloat dt, cpFloat bias, cpFloat slop);
+void cpArbiterApplyCachedImpulse(cpArbiter *arb, cpFloat dt_coef);
+void cpArbiterApplyImpulse(cpArbiter *arb);
+
+
+//MARK: Shapes/Collisions
+
+cpShape *cpShapeInit(cpShape *shape, const cpShapeClass *klass, cpBody *body, struct cpShapeMassInfo massInfo);
+
+static inline cpBool
+cpShapeActive(cpShape *shape)
+{
+	// checks if the shape is added to a shape list.
+	// TODO could this just check the space now?
+	return (shape->prev || (shape->body && shape->body->shapeList == shape));
+}
+
+// Note: This function returns contact points with r1/r2 in absolute coordinates, not body relative.
+struct cpCollisionInfo cpCollide(const cpShape *a, const cpShape *b, cpCollisionID id, struct cpContact *contacts);
+
+static inline void
+CircleSegmentQuery(cpShape *shape, cpVect center, cpFloat r1, cpVect a, cpVect b, cpFloat r2, cpSegmentQueryInfo *info)
+{
+	cpVect da = cpvsub(a, center);
+	cpVect db = cpvsub(b, center);
+	cpFloat rsum = r1 + r2;
+	
+	cpFloat qa = cpvdot(da, da) - 2.0f*cpvdot(da, db) + cpvdot(db, db);
+	cpFloat qb = cpvdot(da, db) - cpvdot(da, da);
+	cpFloat det = qb*qb - qa*(cpvdot(da, da) - rsum*rsum);
+	
+	if(det >= 0.0f){
+		cpFloat t = (-qb - cpfsqrt(det))/(qa);
+		if(0.0f<= t && t <= 1.0f){
+			cpVect n = cpvnormalize(cpvlerp(da, db, t));
+			
+			info->shape = shape;
+			info->point = cpvsub(cpvlerp(a, b, t), cpvmult(n, r2));
+			info->normal = n;
+			info->alpha = t;
+		}
+	}
+}
+
+static inline cpBool
+cpShapeFilterReject(cpShapeFilter a, cpShapeFilter b)
+{
+	// Reject the collision if:
+	return (
+		// They are in the same non-zero group.
+		(a.group != 0 && a.group == b.group) ||
+		// One of the category/mask combinations fails.
+		(a.categories & b.mask) == 0 ||
+		(b.categories & a.mask) == 0
+	);
+}
+
+void cpLoopIndexes(const cpVect *verts, int count, int *start, int *end);
+
+
+//MARK: Constraints
+// TODO naming conventions here
+
+void cpConstraintInit(cpConstraint *constraint, const struct cpConstraintClass *klass, cpBody *a, cpBody *b);
+
+static inline void
+cpConstraintActivateBodies(cpConstraint *constraint)
+{
+	cpBody *a = constraint->a; cpBodyActivate(a);
+	cpBody *b = constraint->b; cpBodyActivate(b);
+}
+
+static inline cpVect
+relative_velocity(cpBody *a, cpBody *b, cpVect r1, cpVect r2){
+	cpVect v1_sum = cpvadd(a->v, cpvmult(cpvperp(r1), a->w));
+	cpVect v2_sum = cpvadd(b->v, cpvmult(cpvperp(r2), b->w));
+	
+	return cpvsub(v2_sum, v1_sum);
+}
+
+static inline cpFloat
+normal_relative_velocity(cpBody *a, cpBody *b, cpVect r1, cpVect r2, cpVect n){
+	return cpvdot(relative_velocity(a, b, r1, r2), n);
+}
+
+static inline void
+apply_impulse(cpBody *body, cpVect j, cpVect r){
+	body->v = cpvadd(body->v, cpvmult(j, body->m_inv));
+	body->w += body->i_inv*cpvcross(r, j);
+}
+
+static inline void
+apply_impulses(cpBody *a , cpBody *b, cpVect r1, cpVect r2, cpVect j)
+{
+	apply_impulse(a, cpvneg(j), r1);
+	apply_impulse(b, j, r2);
+}
+
+static inline void
+apply_bias_impulse(cpBody *body, cpVect j, cpVect r)
+{
+	body->v_bias = cpvadd(body->v_bias, cpvmult(j, body->m_inv));
+	body->w_bias += body->i_inv*cpvcross(r, j);
+}
+
+static inline void
+apply_bias_impulses(cpBody *a , cpBody *b, cpVect r1, cpVect r2, cpVect j)
+{
+	apply_bias_impulse(a, cpvneg(j), r1);
+	apply_bias_impulse(b, j, r2);
+}
+
+static inline cpFloat
+k_scalar_body(cpBody *body, cpVect r, cpVect n)
+{
+	cpFloat rcn = cpvcross(r, n);
+	return body->m_inv + body->i_inv*rcn*rcn;
+}
+
+static inline cpFloat
+k_scalar(cpBody *a, cpBody *b, cpVect r1, cpVect r2, cpVect n)
+{
+	cpFloat value = k_scalar_body(a, r1, n) + k_scalar_body(b, r2, n);
+	cpAssertSoft(value != 0.0, "Unsolvable collision or constraint.");
+	
+	return value;
+}
+
+static inline cpMat2x2
+k_tensor(cpBody *a, cpBody *b, cpVect r1, cpVect r2)
+{
+	cpFloat m_sum = a->m_inv + b->m_inv;
+	
+	// start with Identity*m_sum
+	cpFloat k11 = m_sum, k12 = 0.0f;
+	cpFloat k21 = 0.0f,  k22 = m_sum;
+	
+	// add the influence from r1
+	cpFloat a_i_inv = a->i_inv;
+	cpFloat r1xsq =  r1.x * r1.x * a_i_inv;
+	cpFloat r1ysq =  r1.y * r1.y * a_i_inv;
+	cpFloat r1nxy = -r1.x * r1.y * a_i_inv;
+	k11 += r1ysq; k12 += r1nxy;
+	k21 += r1nxy; k22 += r1xsq;
+	
+	// add the influnce from r2
+	cpFloat b_i_inv = b->i_inv;
+	cpFloat r2xsq =  r2.x * r2.x * b_i_inv;
+	cpFloat r2ysq =  r2.y * r2.y * b_i_inv;
+	cpFloat r2nxy = -r2.x * r2.y * b_i_inv;
+	k11 += r2ysq; k12 += r2nxy;
+	k21 += r2nxy; k22 += r2xsq;
+	
+	// invert
+	cpFloat det = k11*k22 - k12*k21;
+	cpAssertSoft(det != 0.0, "Unsolvable constraint.");
+	
+	cpFloat det_inv = 1.0f/det;
+	return cpMat2x2New(
+		 k22*det_inv, -k12*det_inv,
+		-k21*det_inv,  k11*det_inv
+ 	);
+}
+
+static inline cpFloat
+bias_coef(cpFloat errorBias, cpFloat dt)
+{
+	return 1.0f - cpfpow(errorBias, dt);
+}
+
+
+//MARK: Spaces
+
+#define cpAssertSpaceUnlocked(space) \
+	cpAssertHard(!space->locked, \
+		"This operation cannot be done safely during a call to cpSpaceStep() or during a query. " \
+		"Put these calls into a post-step callback." \
+	);
+
+void cpSpaceSetStaticBody(cpSpace *space, cpBody *body);
+
+extern cpCollisionHandler cpCollisionHandlerDoNothing;
+
+void cpSpaceProcessComponents(cpSpace *space, cpFloat dt);
+
+void cpSpacePushFreshContactBuffer(cpSpace *space);
+struct cpContact *cpContactBufferGetArray(cpSpace *space);
+void cpSpacePushContacts(cpSpace *space, int count);
+
+cpPostStepCallback *cpSpaceGetPostStepCallback(cpSpace *space, void *key);
+
+cpBool cpSpaceArbiterSetFilter(cpArbiter *arb, cpSpace *space);
+void cpSpaceFilterArbiters(cpSpace *space, cpBody *body, cpShape *filter);
+
+void cpSpaceActivateBody(cpSpace *space, cpBody *body);
+void cpSpaceLock(cpSpace *space);
+void cpSpaceUnlock(cpSpace *space, cpBool runPostStep);
+
+static inline void
+cpSpaceUncacheArbiter(cpSpace *space, cpArbiter *arb)
+{
+	const cpShape *a = arb->a, *b = arb->b;
+	const cpShape *shape_pair[] = {a, b};
+	cpHashValue arbHashID = CP_HASH_PAIR((cpHashValue)a, (cpHashValue)b);
+	cpHashSetRemove(space->cachedArbiters, arbHashID, shape_pair);
+	cpArrayDeleteObj(space->arbiters, arb);
+}
+
+static inline cpArray *
+cpSpaceArrayForBodyType(cpSpace *space, cpBodyType type)
+{
+	return (type == CP_BODY_TYPE_STATIC ? space->staticBodies : space->dynamicBodies);
+}
+
+void cpShapeUpdateFunc(cpShape *shape, void *unused);
+cpCollisionID cpSpaceCollideShapes(cpShape *a, cpShape *b, cpCollisionID id, cpSpace *space);
+
+
+//MARK: Foreach loops
+
+static inline cpConstraint *
+cpConstraintNext(cpConstraint *node, cpBody *body)
+{
+	return (node->a == body ? node->next_a : node->next_b);
+}
+
+#define CP_BODY_FOREACH_CONSTRAINT(bdy, var)\
+	for(cpConstraint *var = bdy->constraintList; var; var = cpConstraintNext(var, bdy))
+
+static inline cpArbiter *
+cpArbiterNext(cpArbiter *node, cpBody *body)
+{
+	return (node->body_a == body ? node->thread_a.next : node->thread_b.next);
+}
+
+#define CP_BODY_FOREACH_ARBITER(bdy, var)\
+	for(cpArbiter *var = bdy->arbiterList; var; var = cpArbiterNext(var, bdy))
+
+#define CP_BODY_FOREACH_SHAPE(body, var)\
+	for(cpShape *var = body->shapeList; var; var = var->next)
+
+#define CP_BODY_FOREACH_COMPONENT(root, var)\
+	for(cpBody *var = root; var; var = var->sleeping.next)
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_structs.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_structs.h
new file mode 100644
index 0000000..d5efa19
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_structs.h
@@ -0,0 +1,451 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+// All of the struct definitions for Chipmunk should be considered part of the private API.
+// However, it is very valuable to know the struct sizes for preallocating memory.
+
+#ifndef CHIPMUNK_STRUCTS_H
+#define CHIPMUNK_STRUCTS_H
+
+#include "chipmunk/chipmunk.h"
+
+struct cpArray {
+	int num, max;
+	void **arr;
+};
+
+struct cpBody {
+	// Integration functions
+	cpBodyVelocityFunc velocity_func;
+	cpBodyPositionFunc position_func;
+	
+	// mass and it's inverse
+	cpFloat m;
+	cpFloat m_inv;
+	
+	// moment of inertia and it's inverse
+	cpFloat i;
+	cpFloat i_inv;
+	
+	// center of gravity
+	cpVect cog;
+	
+	// position, velocity, force
+	cpVect p;
+	cpVect v;
+	cpVect f;
+	
+	// Angle, angular velocity, torque (radians)
+	cpFloat a;
+	cpFloat w;
+	cpFloat t;
+	
+	cpTransform transform;
+	
+	cpDataPointer userData;
+	cpDataPointer userData2;
+	
+	// "pseudo-velocities" used for eliminating overlap.
+	// Erin Catto has some papers that talk about what these are.
+	cpVect v_bias;
+	cpFloat w_bias;
+	
+	cpSpace *space;
+	
+	cpShape *shapeList;
+	cpArbiter *arbiterList;
+	cpConstraint *constraintList;
+	
+	struct {
+		cpBody *root;
+		cpBody *next;
+		cpFloat idleTime;
+	} sleeping;
+};
+
+enum cpArbiterState {
+	// Arbiter is active and its the first collision.
+	CP_ARBITER_STATE_FIRST_COLLISION,
+	// Arbiter is active and its not the first collision.
+	CP_ARBITER_STATE_NORMAL,
+	// Collision has been explicitly ignored.
+	// Either by returning false from a begin collision handler or calling cpArbiterIgnore().
+	CP_ARBITER_STATE_IGNORE,
+	// Collison is no longer active. A space will cache an arbiter for up to cpSpace.collisionPersistence more steps.
+	CP_ARBITER_STATE_CACHED,
+	// Collison arbiter is invalid because one of the shapes was removed.
+	CP_ARBITER_STATE_INVALIDATED,
+};
+
+struct cpArbiterThread {
+	struct cpArbiter *next, *prev;
+};
+
+struct cpContact {
+	cpVect r1, r2;
+	
+	cpFloat nMass, tMass;
+	cpFloat bounce; // TODO: look for an alternate bounce solution.
+
+	cpFloat jnAcc, jtAcc, jBias;
+	cpFloat bias;
+	
+	cpHashValue hash;
+};
+
+struct cpCollisionInfo {
+	const cpShape *a, *b;
+	cpCollisionID id;
+	
+	cpVect n;
+	
+	int count;
+	// TODO Should this be a unique struct type?
+	struct cpContact *arr;
+};
+
+struct cpArbiter {
+	cpFloat e;
+	cpFloat u;
+	cpVect surface_vr;
+	
+	cpDataPointer data;
+	
+	const cpShape *a, *b;
+	cpBody *body_a, *body_b;
+	struct cpArbiterThread thread_a, thread_b;
+	
+	int count;
+	struct cpContact *contacts;
+	cpVect n;
+	
+	// Regular, wildcard A and wildcard B collision handlers.
+	cpCollisionHandler *handler, *handlerA, *handlerB;
+	cpBool swapped;
+	
+	cpTimestamp stamp;
+	enum cpArbiterState state;
+};
+
+struct cpShapeMassInfo {
+	cpFloat m;
+	cpFloat i;
+	cpVect cog;
+	cpFloat area;
+};
+
+typedef enum cpShapeType{
+	CP_CIRCLE_SHAPE,
+	CP_SEGMENT_SHAPE,
+	CP_POLY_SHAPE,
+	CP_NUM_SHAPES
+} cpShapeType;
+
+typedef cpBB (*cpShapeCacheDataImpl)(cpShape *shape, cpTransform transform);
+typedef void (*cpShapeDestroyImpl)(cpShape *shape);
+typedef void (*cpShapePointQueryImpl)(const cpShape *shape, cpVect p, cpPointQueryInfo *info);
+typedef void (*cpShapeSegmentQueryImpl)(const cpShape *shape, cpVect a, cpVect b, cpFloat radius, cpSegmentQueryInfo *info);
+
+typedef struct cpShapeClass cpShapeClass;
+
+struct cpShapeClass {
+	cpShapeType type;
+	
+	cpShapeCacheDataImpl cacheData;
+	cpShapeDestroyImpl destroy;
+	cpShapePointQueryImpl pointQuery;
+	cpShapeSegmentQueryImpl segmentQuery;
+};
+
+struct cpShape {
+	const cpShapeClass *klass;
+	
+	cpSpace *space;
+	cpBody *body;
+	struct cpShapeMassInfo massInfo;
+	cpBB bb;
+	
+	cpBool sensor;
+	
+	cpFloat e;
+	cpFloat u;
+	cpVect surfaceV;
+
+	cpDataPointer userData;
+	
+	cpCollisionType type;
+	cpShapeFilter filter;
+	
+	cpShape *next;
+	cpShape *prev;
+	
+	cpHashValue hashid;
+};
+
+struct cpCircleShape {
+	cpShape shape;
+	
+	cpVect c, tc;
+	cpFloat r;
+};
+
+struct cpSegmentShape {
+	cpShape shape;
+	
+	cpVect a, b, n;
+	cpVect ta, tb, tn;
+	cpFloat r;
+	
+	cpVect a_tangent, b_tangent;
+};
+
+struct cpSplittingPlane {
+	cpVect v0, n;
+};
+
+#define CP_POLY_SHAPE_INLINE_ALLOC 6
+
+struct cpPolyShape {
+	cpShape shape;
+	
+	cpFloat r;
+	
+	int count;
+	// The untransformed planes are appended at the end of the transformed planes.
+	struct cpSplittingPlane *planes;
+	
+	// Allocate a small number of splitting planes internally for simple poly.
+	struct cpSplittingPlane _planes[2*CP_POLY_SHAPE_INLINE_ALLOC];
+};
+
+typedef void (*cpConstraintPreStepImpl)(cpConstraint *constraint, cpFloat dt);
+typedef void (*cpConstraintApplyCachedImpulseImpl)(cpConstraint *constraint, cpFloat dt_coef);
+typedef void (*cpConstraintApplyImpulseImpl)(cpConstraint *constraint, cpFloat dt);
+typedef cpFloat (*cpConstraintGetImpulseImpl)(cpConstraint *constraint);
+
+typedef struct cpConstraintClass {
+	cpConstraintPreStepImpl preStep;
+	cpConstraintApplyCachedImpulseImpl applyCachedImpulse;
+	cpConstraintApplyImpulseImpl applyImpulse;
+	cpConstraintGetImpulseImpl getImpulse;
+} cpConstraintClass;
+
+struct cpConstraint {
+	const cpConstraintClass *klass;
+	
+	cpSpace *space;
+	
+	cpBody *a, *b;
+	cpConstraint *next_a, *next_b;
+	
+	cpFloat maxForce;
+	cpFloat errorBias;
+	cpFloat maxBias;
+	
+	cpBool collideBodies;
+	
+	cpConstraintPreSolveFunc preSolve;
+	cpConstraintPostSolveFunc postSolve;
+	
+	cpDataPointer userData;
+};
+
+struct cpPinJoint {
+	cpConstraint constraint;
+	cpVect anchorA, anchorB;
+	cpFloat dist;
+	
+	cpVect r1, r2;
+	cpVect n;
+	cpFloat nMass;
+	
+	cpFloat jnAcc;
+	cpFloat bias;
+};
+
+struct cpSlideJoint {
+	cpConstraint constraint;
+	cpVect anchorA, anchorB;
+	cpFloat min, max;
+	
+	cpVect r1, r2;
+	cpVect n;
+	cpFloat nMass;
+	
+	cpFloat jnAcc;
+	cpFloat bias;
+};
+
+struct cpPivotJoint {
+	cpConstraint constraint;
+	cpVect anchorA, anchorB;
+	
+	cpVect r1, r2;
+	cpMat2x2 k;
+	
+	cpVect jAcc;
+	cpVect bias;
+};
+
+struct cpGrooveJoint {
+	cpConstraint constraint;
+	cpVect grv_n, grv_a, grv_b;
+	cpVect  anchorB;
+	
+	cpVect grv_tn;
+	cpFloat clamp;
+	cpVect r1, r2;
+	cpMat2x2 k;
+	
+	cpVect jAcc;
+	cpVect bias;
+};
+
+struct cpDampedSpring {
+	cpConstraint constraint;
+	cpVect anchorA, anchorB;
+	cpFloat restLength;
+	cpFloat stiffness;
+	cpFloat damping;
+	cpDampedSpringForceFunc springForceFunc;
+	
+	cpFloat target_vrn;
+	cpFloat v_coef;
+	
+	cpVect r1, r2;
+	cpFloat nMass;
+	cpVect n;
+	
+	cpFloat jAcc;
+};
+
+struct cpDampedRotarySpring {
+	cpConstraint constraint;
+	cpFloat restAngle;
+	cpFloat stiffness;
+	cpFloat damping;
+	cpDampedRotarySpringTorqueFunc springTorqueFunc;
+	
+	cpFloat target_wrn;
+	cpFloat w_coef;
+	
+	cpFloat iSum;
+	cpFloat jAcc;
+};
+
+struct cpRotaryLimitJoint {
+	cpConstraint constraint;
+	cpFloat min, max;
+	
+	cpFloat iSum;
+		
+	cpFloat bias;
+	cpFloat jAcc;
+};
+
+struct cpRatchetJoint {
+	cpConstraint constraint;
+	cpFloat angle, phase, ratchet;
+	
+	cpFloat iSum;
+		
+	cpFloat bias;
+	cpFloat jAcc;
+};
+
+struct cpGearJoint {
+	cpConstraint constraint;
+	cpFloat phase, ratio;
+	cpFloat ratio_inv;
+	
+	cpFloat iSum;
+		
+	cpFloat bias;
+	cpFloat jAcc;
+};
+
+struct cpSimpleMotor {
+	cpConstraint constraint;
+	cpFloat rate;
+	
+	cpFloat iSum;
+		
+	cpFloat jAcc;
+};
+
+typedef struct cpContactBufferHeader cpContactBufferHeader;
+typedef void (*cpSpaceArbiterApplyImpulseFunc)(cpArbiter *arb);
+
+struct cpSpace {
+	int iterations;
+	
+	cpVect gravity;
+	cpFloat damping;
+	
+	cpFloat idleSpeedThreshold;
+	cpFloat sleepTimeThreshold;
+	
+	cpFloat collisionSlop;
+	cpFloat collisionBias;
+	cpTimestamp collisionPersistence;
+	
+	cpDataPointer userData;
+	
+	cpTimestamp stamp;
+	cpFloat curr_dt;
+
+	cpArray *dynamicBodies;
+	cpArray *staticBodies;
+	cpArray *rousedBodies;
+	cpArray *sleepingComponents;
+	
+	cpHashValue shapeIDCounter;
+	cpSpatialIndex *staticShapes;
+	cpSpatialIndex *dynamicShapes;
+	
+	cpArray *constraints;
+	
+	cpArray *arbiters;
+	cpContactBufferHeader *contactBuffersHead;
+	cpHashSet *cachedArbiters;
+	cpArray *pooledArbiters;
+	
+	cpArray *allocatedBuffers;
+	unsigned int locked;
+	
+	cpBool usesWildcards;
+	cpHashSet *collisionHandlers;
+	cpCollisionHandler defaultHandler;
+	
+	cpBool skipPostStep;
+	cpArray *postStepCallbacks;
+	
+	cpBody *staticBody;
+	cpBody _staticBody;
+};
+
+typedef struct cpPostStepCallback {
+	cpPostStepFunc func;
+	void *key;
+	void *data;
+} cpPostStepCallback;
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_types.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_types.h
new file mode 100644
index 0000000..adc5c7e
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_types.h
@@ -0,0 +1,270 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#ifndef CHIPMUNK_TYPES_H
+#define CHIPMUNK_TYPES_H
+
+#include <stdint.h>
+#include <float.h>
+#include <math.h>
+
+#ifdef __APPLE__
+   #include "TargetConditionals.h"
+#endif
+
+// Use CGTypes by default on iOS and Mac.
+// Also enables usage of doubles on 64 bit.
+// Performance is usually very comparable when the CPU cache is well utilised.
+#if (TARGET_OS_IPHONE || TARGET_OS_MAC) && (!defined CP_USE_CGTYPES)
+	#define CP_USE_CGTYPES 1
+#endif
+
+#if CP_USE_CGTYPES
+	#if TARGET_OS_IPHONE
+		#include <CoreGraphics/CGGeometry.h>
+		#include <CoreGraphics/CGAffineTransform.h>
+	#elif TARGET_OS_MAC
+		#include <ApplicationServices/ApplicationServices.h>
+	#endif
+	
+	#if defined(__LP64__) && __LP64__
+		#define CP_USE_DOUBLES 1
+	#else
+		#define CP_USE_DOUBLES 0
+	#endif
+#endif
+
+#ifndef CP_USE_DOUBLES
+  #if !__arm__
+	  // Use doubles by default for higher precision (but not for 32 bit ARM).
+	  #define CP_USE_DOUBLES 1
+  #endif
+#endif
+
+/// @defgroup basicTypes Basic Types
+/// Most of these types can be configured at compile time.
+/// @{
+
+#if CP_USE_DOUBLES
+/// Chipmunk's floating point type.
+/// Can be reconfigured at compile time.
+	typedef double cpFloat;
+	#define cpfsqrt sqrt
+	#define cpfsin sin
+	#define cpfcos cos
+	#define cpfacos acos
+	#define cpfatan2 atan2
+	#define cpfmod fmod
+	#define cpfexp exp
+	#define cpfpow pow
+	#define cpffloor floor
+	#define cpfceil ceil
+	#define CPFLOAT_MIN DBL_MIN
+#else
+	typedef float cpFloat;
+	#define cpfsqrt sqrtf
+	#define cpfsin sinf
+	#define cpfcos cosf
+	#define cpfacos acosf
+	#define cpfatan2 atan2f
+	#define cpfmod fmodf
+	#define cpfexp expf
+	#define cpfpow powf
+	#define cpffloor floorf
+	#define cpfceil ceilf
+	#define CPFLOAT_MIN FLT_MIN
+#endif
+
+#ifndef INFINITY
+	#ifdef _MSC_VER
+		union MSVC_EVIL_FLOAT_HACK
+		{
+			unsigned __int8 Bytes[4];
+			float Value;
+		};
+		static union MSVC_EVIL_FLOAT_HACK INFINITY_HACK = {{0x00, 0x00, 0x80, 0x7F}};
+		#define INFINITY (INFINITY_HACK.Value)
+	#endif
+	
+	#ifdef __GNUC__
+		#define INFINITY (__builtin_inf())
+	#endif
+	
+	#ifndef INFINITY
+		#define INFINITY (1e1000)
+	#endif
+#endif
+
+
+#define CP_PI ((cpFloat)3.14159265358979323846264338327950288)
+
+
+/// Return the max of two cpFloats.
+static inline cpFloat cpfmax(cpFloat a, cpFloat b)
+{
+	return (a > b) ? a : b;
+}
+
+/// Return the min of two cpFloats.
+static inline cpFloat cpfmin(cpFloat a, cpFloat b)
+{
+	return (a < b) ? a : b;
+}
+
+/// Return the absolute value of a cpFloat.
+static inline cpFloat cpfabs(cpFloat f)
+{
+	return (f < 0) ? -f : f;
+}
+
+/// Clamp @c f to be between @c min and @c max.
+static inline cpFloat cpfclamp(cpFloat f, cpFloat min, cpFloat max)
+{
+	return cpfmin(cpfmax(f, min), max);
+}
+
+/// Clamp @c f to be between 0 and 1.
+static inline cpFloat cpfclamp01(cpFloat f)
+{
+	return cpfmax(0.0f, cpfmin(f, 1.0f));
+}
+
+
+
+/// Linearly interpolate (or extrapolate) between @c f1 and @c f2 by @c t percent.
+static inline cpFloat cpflerp(cpFloat f1, cpFloat f2, cpFloat t)
+{
+	return f1*(1.0f - t) + f2*t;
+}
+
+/// Linearly interpolate from @c f1 to @c f2 by no more than @c d.
+static inline cpFloat cpflerpconst(cpFloat f1, cpFloat f2, cpFloat d)
+{
+	return f1 + cpfclamp(f2 - f1, -d, d);
+}
+
+/// Hash value type.
+#ifdef CP_HASH_VALUE_TYPE
+	typedef CP_HASH_VALUE_TYPE cpHashValue;
+#else
+	typedef uintptr_t cpHashValue;
+#endif
+
+/// Type used internally to cache colliding object info for cpCollideShapes().
+/// Should be at least 32 bits.
+typedef uint32_t cpCollisionID;
+
+// Oh C, how we love to define our own boolean types to get compiler compatibility
+/// Chipmunk's boolean type.
+#ifdef CP_BOOL_TYPE
+	typedef CP_BOOL_TYPE cpBool;
+#else
+	typedef unsigned char cpBool;
+#endif
+
+#ifndef cpTrue
+/// true value.
+	#define cpTrue 1
+#endif
+
+#ifndef cpFalse
+/// false value.
+	#define cpFalse 0
+#endif
+
+#ifdef CP_DATA_POINTER_TYPE
+	typedef CP_DATA_POINTER_TYPE cpDataPointer;
+#else
+/// Type used for user data pointers.
+	typedef void * cpDataPointer;
+#endif
+
+#ifdef CP_COLLISION_TYPE_TYPE
+	typedef CP_COLLISION_TYPE_TYPE cpCollisionType;
+#else
+/// Type used for cpSpace.collision_type.
+	typedef uintptr_t cpCollisionType;
+#endif
+
+#ifdef CP_GROUP_TYPE
+	typedef CP_GROUP_TYPE cpGroup;
+#else
+/// Type used for cpShape.group.
+	typedef uintptr_t cpGroup;
+#endif
+
+#ifdef CP_BITMASK_TYPE
+	typedef CP_BITMASK_TYPE cpBitmask;
+#else
+/// Type used for cpShapeFilter category and mask.
+	typedef unsigned int cpBitmask;
+#endif
+
+#ifdef CP_TIMESTAMP_TYPE
+	typedef CP_TIMESTAMP_TYPE cpTimestamp;
+#else
+/// Type used for various timestamps in Chipmunk.
+	typedef unsigned int cpTimestamp;
+#endif
+
+#ifndef CP_NO_GROUP
+/// Value for cpShape.group signifying that a shape is in no group.
+	#define CP_NO_GROUP ((cpGroup)0)
+#endif
+
+#ifndef CP_ALL_CATEGORIES
+/// Value for cpShape.layers signifying that a shape is in every layer.
+	#define CP_ALL_CATEGORIES (~(cpBitmask)0)
+#endif
+
+#ifndef CP_WILDCARD_COLLISION_TYPE
+/// cpCollisionType value internally reserved for hashing wildcard handlers.
+	#define CP_WILDCARD_COLLISION_TYPE (~(cpCollisionType)0)
+#endif
+
+/// @}
+
+// CGPoints are structurally the same, and allow
+// easy interoperability with other Cocoa libraries
+#if CP_USE_CGTYPES
+	typedef CGPoint cpVect;
+#else
+/// Chipmunk's 2D vector type.
+/// @addtogroup cpVect
+	typedef struct cpVect{cpFloat x,y;} cpVect;
+#endif
+
+#if CP_USE_CGTYPES
+	typedef CGAffineTransform cpTransform;
+#else
+	/// Column major affine transform.
+	typedef struct cpTransform {
+		cpFloat a, b, c, d, tx, ty;
+	} cpTransform;
+#endif
+
+// NUKE
+typedef struct cpMat2x2 {
+	// Row major [[a, b][c d]]
+	cpFloat a, b, c, d;
+} cpMat2x2;
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_unsafe.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_unsafe.h
new file mode 100644
index 0000000..990bd01
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/chipmunk_unsafe.h
@@ -0,0 +1,66 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/* This header defines a number of "unsafe" operations on Chipmunk objects.
+ * In this case "unsafe" is referring to operations which may reduce the
+ * physical accuracy or numerical stability of the simulation, but will not
+ * cause crashes.
+ *
+ * The prime example is mutating collision shapes. Chipmunk does not support
+ * this directly. Mutating shapes using this API will caused objects in contact
+ * to be pushed apart using Chipmunk's overlap solver, but not using real
+ * persistent velocities. Probably not what you meant, but perhaps close enough.
+ */
+
+/// @defgroup unsafe Chipmunk Unsafe Shape Operations
+/// These functions are used for mutating collision shapes.
+/// Chipmunk does not have any way to get velocity information on changing shapes,
+/// so the results will be unrealistic. You must explicity include the chipmunk_unsafe.h header to use them.
+/// @{
+
+#ifndef CHIPMUNK_UNSAFE_H
+#define CHIPMUNK_UNSAFE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/// Set the radius of a circle shape.
+CP_EXPORT void cpCircleShapeSetRadius(cpShape *shape, cpFloat radius);
+/// Set the offset of a circle shape.
+CP_EXPORT void cpCircleShapeSetOffset(cpShape *shape, cpVect offset);
+
+/// Set the endpoints of a segment shape.
+CP_EXPORT void cpSegmentShapeSetEndpoints(cpShape *shape, cpVect a, cpVect b);
+/// Set the radius of a segment shape.
+CP_EXPORT void cpSegmentShapeSetRadius(cpShape *shape, cpFloat radius);
+
+/// Set the vertexes of a poly shape.
+CP_EXPORT void cpPolyShapeSetVerts(cpShape *shape, int count, cpVect *verts, cpTransform transform);
+CP_EXPORT void cpPolyShapeSetVertsRaw(cpShape *shape, int count, cpVect *verts);
+/// Set the radius of a poly shape.
+CP_EXPORT void cpPolyShapeSetRadius(cpShape *shape, cpFloat radius);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpArbiter.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpArbiter.h
new file mode 100644
index 0000000..1dc130a
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpArbiter.h
@@ -0,0 +1,145 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpArbiter cpArbiter
+/// The cpArbiter struct tracks pairs of colliding shapes.
+/// They are also used in conjuction with collision handler callbacks
+/// allowing you to retrieve information on the collision or change it.
+/// A unique arbiter value is used for each pair of colliding objects. It persists until the shapes separate.
+/// @{
+
+#define CP_MAX_CONTACTS_PER_ARBITER 2
+
+/// Get the restitution (elasticity) that will be applied to the pair of colliding objects.
+CP_EXPORT cpFloat cpArbiterGetRestitution(const cpArbiter *arb);
+/// Override the restitution (elasticity) that will be applied to the pair of colliding objects.
+CP_EXPORT void cpArbiterSetRestitution(cpArbiter *arb, cpFloat restitution);
+/// Get the friction coefficient that will be applied to the pair of colliding objects.
+CP_EXPORT cpFloat cpArbiterGetFriction(const cpArbiter *arb);
+/// Override the friction coefficient that will be applied to the pair of colliding objects.
+CP_EXPORT void cpArbiterSetFriction(cpArbiter *arb, cpFloat friction);
+
+// Get the relative surface velocity of the two shapes in contact.
+CP_EXPORT cpVect cpArbiterGetSurfaceVelocity(cpArbiter *arb);
+
+// Override the relative surface velocity of the two shapes in contact.
+// By default this is calculated to be the difference of the two surface velocities clamped to the tangent plane.
+CP_EXPORT void cpArbiterSetSurfaceVelocity(cpArbiter *arb, cpVect vr);
+
+/// Get the user data pointer associated with this pair of colliding objects.
+CP_EXPORT cpDataPointer cpArbiterGetUserData(const cpArbiter *arb);
+/// Set a user data point associated with this pair of colliding objects.
+/// If you need to perform any cleanup for this pointer, you must do it yourself, in the separate callback for instance.
+CP_EXPORT void cpArbiterSetUserData(cpArbiter *arb, cpDataPointer userData);
+
+/// Calculate the total impulse including the friction that was applied by this arbiter.
+/// This function should only be called from a post-solve, post-step or cpBodyEachArbiter callback.
+CP_EXPORT cpVect cpArbiterTotalImpulse(const cpArbiter *arb);
+/// Calculate the amount of energy lost in a collision including static, but not dynamic friction.
+/// This function should only be called from a post-solve, post-step or cpBodyEachArbiter callback.
+CP_EXPORT cpFloat cpArbiterTotalKE(const cpArbiter *arb);
+
+/// Mark a collision pair to be ignored until the two objects separate.
+/// Pre-solve and post-solve callbacks will not be called, but the separate callback will be called.
+CP_EXPORT cpBool cpArbiterIgnore(cpArbiter *arb);
+
+/// Return the colliding shapes involved for this arbiter.
+/// The order of their cpSpace.collision_type values will match
+/// the order set when the collision handler was registered.
+CP_EXPORT void cpArbiterGetShapes(const cpArbiter *arb, cpShape **a, cpShape **b);
+
+/// A macro shortcut for defining and retrieving the shapes from an arbiter.
+#define CP_ARBITER_GET_SHAPES(__arb__, __a__, __b__) cpShape *__a__, *__b__; cpArbiterGetShapes(__arb__, &__a__, &__b__);
+
+/// Return the colliding bodies involved for this arbiter.
+/// The order of the cpSpace.collision_type the bodies are associated with values will match
+/// the order set when the collision handler was registered.
+CP_EXPORT void cpArbiterGetBodies(const cpArbiter *arb, cpBody **a, cpBody **b);
+
+/// A macro shortcut for defining and retrieving the bodies from an arbiter.
+#define CP_ARBITER_GET_BODIES(__arb__, __a__, __b__) cpBody *__a__, *__b__; cpArbiterGetBodies(__arb__, &__a__, &__b__);
+
+/// A struct that wraps up the important collision data for an arbiter.
+struct cpContactPointSet {
+	/// The number of contact points in the set.
+	int count;
+	
+	/// The normal of the collision.
+	cpVect normal;
+	
+	/// The array of contact points.
+	struct {
+		/// The position of the contact on the surface of each shape.
+		cpVect pointA, pointB;
+		/// Penetration distance of the two shapes. Overlapping means it will be negative.
+		/// This value is calculated as cpvdot(cpvsub(point2, point1), normal) and is ignored by cpArbiterSetContactPointSet().
+		cpFloat distance;
+	} points[CP_MAX_CONTACTS_PER_ARBITER];
+};
+
+/// Return a contact set from an arbiter.
+CP_EXPORT cpContactPointSet cpArbiterGetContactPointSet(const cpArbiter *arb);
+
+/// Replace the contact point set for an arbiter.
+/// This can be a very powerful feature, but use it with caution!
+CP_EXPORT void cpArbiterSetContactPointSet(cpArbiter *arb, cpContactPointSet *set);
+
+/// Returns true if this is the first step a pair of objects started colliding.
+CP_EXPORT cpBool cpArbiterIsFirstContact(const cpArbiter *arb);
+/// Returns true if the separate callback is due to a shape being removed from the space.
+CP_EXPORT cpBool cpArbiterIsRemoval(const cpArbiter *arb);
+
+/// Get the number of contact points for this arbiter.
+CP_EXPORT int cpArbiterGetCount(const cpArbiter *arb);
+/// Get the normal of the collision.
+CP_EXPORT cpVect cpArbiterGetNormal(const cpArbiter *arb);
+/// Get the position of the @c ith contact point on the surface of the first shape.
+CP_EXPORT cpVect cpArbiterGetPointA(const cpArbiter *arb, int i);
+/// Get the position of the @c ith contact point on the surface of the second shape.
+CP_EXPORT cpVect cpArbiterGetPointB(const cpArbiter *arb, int i);
+/// Get the depth of the @c ith contact point.
+CP_EXPORT cpFloat cpArbiterGetDepth(const cpArbiter *arb, int i);
+
+/// If you want a custom callback to invoke the wildcard callback for the first collision type, you must call this function explicitly.
+/// You must decide how to handle the wildcard's return value since it may disagree with the other wildcard handler's return value or your own.
+CP_EXPORT cpBool cpArbiterCallWildcardBeginA(cpArbiter *arb, cpSpace *space);
+/// If you want a custom callback to invoke the wildcard callback for the second collision type, you must call this function explicitly.
+/// You must decide how to handle the wildcard's return value since it may disagree with the other wildcard handler's return value or your own.
+CP_EXPORT cpBool cpArbiterCallWildcardBeginB(cpArbiter *arb, cpSpace *space);
+
+/// If you want a custom callback to invoke the wildcard callback for the first collision type, you must call this function explicitly.
+/// You must decide how to handle the wildcard's return value since it may disagree with the other wildcard handler's return value or your own.
+CP_EXPORT cpBool cpArbiterCallWildcardPreSolveA(cpArbiter *arb, cpSpace *space);
+/// If you want a custom callback to invoke the wildcard callback for the second collision type, you must call this function explicitly.
+/// You must decide how to handle the wildcard's return value since it may disagree with the other wildcard handler's return value or your own.
+CP_EXPORT cpBool cpArbiterCallWildcardPreSolveB(cpArbiter *arb, cpSpace *space);
+
+/// If you want a custom callback to invoke the wildcard callback for the first collision type, you must call this function explicitly.
+CP_EXPORT void cpArbiterCallWildcardPostSolveA(cpArbiter *arb, cpSpace *space);
+/// If you want a custom callback to invoke the wildcard callback for the second collision type, you must call this function explicitly.
+CP_EXPORT void cpArbiterCallWildcardPostSolveB(cpArbiter *arb, cpSpace *space);
+
+/// If you want a custom callback to invoke the wildcard callback for the first collision type, you must call this function explicitly.
+CP_EXPORT void cpArbiterCallWildcardSeparateA(cpArbiter *arb, cpSpace *space);
+/// If you want a custom callback to invoke the wildcard callback for the second collision type, you must call this function explicitly.
+CP_EXPORT void cpArbiterCallWildcardSeparateB(cpArbiter *arb, cpSpace *space);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpBB.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpBB.h
new file mode 100644
index 0000000..8fc8704
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpBB.h
@@ -0,0 +1,187 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#ifndef CHIPMUNK_BB_H
+#define CHIPMUNK_BB_H
+
+#include "chipmunk_types.h"
+#include "cpVect.h"
+
+/// @defgroup cpBBB cpBB
+/// Chipmunk's axis-aligned 2D bounding box type along with a few handy routines.
+/// @{
+
+/// Chipmunk's axis-aligned 2D bounding box type. (left, bottom, right, top)
+typedef struct cpBB{
+	cpFloat l, b, r ,t;
+} cpBB;
+
+/// Convenience constructor for cpBB structs.
+static inline cpBB cpBBNew(const cpFloat l, const cpFloat b, const cpFloat r, const cpFloat t)
+{
+	cpBB bb = {l, b, r, t};
+	return bb;
+}
+
+/// Constructs a cpBB centered on a point with the given extents (half sizes).
+static inline cpBB
+cpBBNewForExtents(const cpVect c, const cpFloat hw, const cpFloat hh)
+{
+	return cpBBNew(c.x - hw, c.y - hh, c.x + hw, c.y + hh);
+}
+
+/// Constructs a cpBB for a circle with the given position and radius.
+static inline cpBB cpBBNewForCircle(const cpVect p, const cpFloat r)
+{
+	return cpBBNewForExtents(p, r, r);
+}
+
+/// Returns true if @c a and @c b intersect.
+static inline cpBool cpBBIntersects(const cpBB a, const cpBB b)
+{
+	return (a.l <= b.r && b.l <= a.r && a.b <= b.t && b.b <= a.t);
+}
+
+/// Returns true if @c other lies completely within @c bb.
+static inline cpBool cpBBContainsBB(const cpBB bb, const cpBB other)
+{
+	return (bb.l <= other.l && bb.r >= other.r && bb.b <= other.b && bb.t >= other.t);
+}
+
+/// Returns true if @c bb contains @c v.
+static inline cpBool cpBBContainsVect(const cpBB bb, const cpVect v)
+{
+	return (bb.l <= v.x && bb.r >= v.x && bb.b <= v.y && bb.t >= v.y);
+}
+
+/// Returns a bounding box that holds both bounding boxes.
+static inline cpBB cpBBMerge(const cpBB a, const cpBB b){
+	return cpBBNew(
+		cpfmin(a.l, b.l),
+		cpfmin(a.b, b.b),
+		cpfmax(a.r, b.r),
+		cpfmax(a.t, b.t)
+	);
+}
+
+/// Returns a bounding box that holds both @c bb and @c v.
+static inline cpBB cpBBExpand(const cpBB bb, const cpVect v){
+	return cpBBNew(
+		cpfmin(bb.l, v.x),
+		cpfmin(bb.b, v.y),
+		cpfmax(bb.r, v.x),
+		cpfmax(bb.t, v.y)
+	);
+}
+
+/// Returns the center of a bounding box.
+static inline cpVect
+cpBBCenter(cpBB bb)
+{
+	return cpvlerp(cpv(bb.l, bb.b), cpv(bb.r, bb.t), 0.5f);
+}
+
+/// Returns the area of the bounding box.
+static inline cpFloat cpBBArea(cpBB bb)
+{
+	return (bb.r - bb.l)*(bb.t - bb.b);
+}
+
+/// Merges @c a and @c b and returns the area of the merged bounding box.
+static inline cpFloat cpBBMergedArea(cpBB a, cpBB b)
+{
+	return (cpfmax(a.r, b.r) - cpfmin(a.l, b.l))*(cpfmax(a.t, b.t) - cpfmin(a.b, b.b));
+}
+
+/// Returns the fraction along the segment query the cpBB is hit. Returns INFINITY if it doesn't hit.
+static inline cpFloat cpBBSegmentQuery(cpBB bb, cpVect a, cpVect b)
+{
+	cpVect delta = cpvsub(b, a);
+	cpFloat tmin = -INFINITY, tmax = INFINITY;
+	
+	if(delta.x == 0.0f){
+		if(a.x < bb.l || bb.r < a.x) return INFINITY;
+	} else {
+		cpFloat t1 = (bb.l - a.x)/delta.x;
+		cpFloat t2 = (bb.r - a.x)/delta.x;
+		tmin = cpfmax(tmin, cpfmin(t1, t2));
+		tmax = cpfmin(tmax, cpfmax(t1, t2));
+	}
+	
+	if(delta.y == 0.0f){
+		if(a.y < bb.b || bb.t < a.y) return INFINITY;
+	} else {
+		cpFloat t1 = (bb.b - a.y)/delta.y;
+		cpFloat t2 = (bb.t - a.y)/delta.y;
+		tmin = cpfmax(tmin, cpfmin(t1, t2));
+		tmax = cpfmin(tmax, cpfmax(t1, t2));
+	}
+	
+	if(tmin <= tmax && 0.0f <= tmax && tmin <= 1.0f){
+		return cpfmax(tmin, 0.0f);
+	} else {
+		return INFINITY;
+	}
+}
+
+/// Return true if the bounding box intersects the line segment with ends @c a and @c b.
+static inline cpBool cpBBIntersectsSegment(cpBB bb, cpVect a, cpVect b)
+{
+	return (cpBBSegmentQuery(bb, a, b) != INFINITY);
+}
+
+/// Clamp a vector to a bounding box.
+static inline cpVect
+cpBBClampVect(const cpBB bb, const cpVect v)
+{
+	return cpv(cpfclamp(v.x, bb.l, bb.r), cpfclamp(v.y, bb.b, bb.t));
+}
+
+/// Wrap a vector to a bounding box.
+static inline cpVect
+cpBBWrapVect(const cpBB bb, const cpVect v)
+{
+	cpFloat dx = cpfabs(bb.r - bb.l);
+	cpFloat modx = cpfmod(v.x - bb.l, dx);
+	cpFloat x = (modx > 0.0f) ? modx : modx + dx;
+	
+	cpFloat dy = cpfabs(bb.t - bb.b);
+	cpFloat mody = cpfmod(v.y - bb.b, dy);
+	cpFloat y = (mody > 0.0f) ? mody : mody + dy;
+	
+	return cpv(x + bb.l, y + bb.b);
+}
+
+/// Returns a bounding box offseted by @c v.
+static inline cpBB
+cpBBOffset(const cpBB bb, const cpVect v)
+{
+	return cpBBNew(
+		bb.l + v.x,
+		bb.b + v.y,
+		bb.r + v.x,
+		bb.t + v.y
+	);
+}
+
+///@}
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpBody.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpBody.h
new file mode 100644
index 0000000..db7a9ea
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpBody.h
@@ -0,0 +1,197 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpBody cpBody
+/// Chipmunk's rigid body type. Rigid bodies hold the physical properties of an object like
+/// it's mass, and position and velocity of it's center of gravity. They don't have an shape on their own.
+/// They are given a shape by creating collision shapes (cpShape) that point to the body.
+/// @{
+
+typedef enum cpBodyType {
+	/// A dynamic body is one that is affected by gravity, forces, and collisions.
+	/// This is the default body type.
+	CP_BODY_TYPE_DYNAMIC,
+	/// A kinematic body is an infinite mass, user controlled body that is not affected by gravity, forces or collisions.
+	/// Instead the body only moves based on it's velocity.
+	/// Dynamic bodies collide normally with kinematic bodies, though the kinematic body will be unaffected.
+	/// Collisions between two kinematic bodies, or a kinematic body and a static body produce collision callbacks, but no collision response.
+	CP_BODY_TYPE_KINEMATIC,
+	/// A static body is a body that never (or rarely) moves. If you move a static body, you must call one of the cpSpaceReindex*() functions.
+	/// Chipmunk uses this information to optimize the collision detection.
+	/// Static bodies do not produce collision callbacks when colliding with other static bodies.
+	CP_BODY_TYPE_STATIC,
+} cpBodyType;
+
+/// Rigid body velocity update function type.
+typedef void (*cpBodyVelocityFunc)(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt);
+/// Rigid body position update function type.
+typedef void (*cpBodyPositionFunc)(cpBody *body, cpFloat dt);
+
+/// Allocate a cpBody.
+CP_EXPORT cpBody* cpBodyAlloc(void);
+/// Initialize a cpBody.
+CP_EXPORT cpBody* cpBodyInit(cpBody *body, cpFloat mass, cpFloat moment);
+/// Allocate and initialize a cpBody.
+CP_EXPORT cpBody* cpBodyNew(cpFloat mass, cpFloat moment);
+
+/// Allocate and initialize a cpBody, and set it as a kinematic body.
+CP_EXPORT cpBody* cpBodyNewKinematic(void);
+/// Allocate and initialize a cpBody, and set it as a static body.
+CP_EXPORT cpBody* cpBodyNewStatic(void);
+
+/// Destroy a cpBody.
+CP_EXPORT void cpBodyDestroy(cpBody *body);
+/// Destroy and free a cpBody.
+CP_EXPORT void cpBodyFree(cpBody *body);
+
+// Defined in cpSpace.c
+/// Wake up a sleeping or idle body.
+CP_EXPORT void cpBodyActivate(cpBody *body);
+/// Wake up any sleeping or idle bodies touching a static body.
+CP_EXPORT void cpBodyActivateStatic(cpBody *body, cpShape *filter);
+
+/// Force a body to fall asleep immediately.
+CP_EXPORT void cpBodySleep(cpBody *body);
+/// Force a body to fall asleep immediately along with other bodies in a group.
+CP_EXPORT void cpBodySleepWithGroup(cpBody *body, cpBody *group);
+
+/// Returns true if the body is sleeping.
+CP_EXPORT cpBool cpBodyIsSleeping(const cpBody *body);
+
+// Returns true if the body is exceeding the sleep threshold
+CP_EXPORT cpBool cpBodyIsSleepThresholdExceeded(const cpBody *body, const cpShape *shape);
+
+/// Get the type of the body.
+CP_EXPORT cpBodyType cpBodyGetType(cpBody *body);
+/// Set the type of the body.
+CP_EXPORT void cpBodySetType(cpBody *body, cpBodyType type);
+
+/// Get the space this body is added to.
+CP_EXPORT cpSpace* cpBodyGetSpace(const cpBody *body);
+
+/// Get the mass of the body.
+CP_EXPORT cpFloat cpBodyGetMass(const cpBody *body);
+/// Set the mass of the body.
+CP_EXPORT void cpBodySetMass(cpBody *body, cpFloat m);
+
+/// Get the moment of inertia of the body.
+CP_EXPORT cpFloat cpBodyGetMoment(const cpBody *body);
+/// Set the moment of inertia of the body.
+CP_EXPORT void cpBodySetMoment(cpBody *body, cpFloat i);
+
+/// Set the position of a body.
+CP_EXPORT cpVect cpBodyGetPosition(const cpBody *body);
+/// Set the position of the body.
+CP_EXPORT void cpBodySetPosition(cpBody *body, cpVect pos);
+
+/// Get the offset of the center of gravity in body local coordinates.
+CP_EXPORT cpVect cpBodyGetCenterOfGravity(const cpBody *body);
+/// Set the offset of the center of gravity in body local coordinates.
+CP_EXPORT void cpBodySetCenterOfGravity(cpBody *body, cpVect cog);
+
+/// Get the velocity of the body.
+CP_EXPORT cpVect cpBodyGetVelocity(const cpBody *body);
+/// Set the velocity of the body.
+CP_EXPORT void cpBodySetVelocity(cpBody *body, cpVect velocity);
+
+/// Get the force applied to the body for the next time step.
+CP_EXPORT cpVect cpBodyGetForce(const cpBody *body);
+/// Set the force applied to the body for the next time step.
+CP_EXPORT void cpBodySetForce(cpBody *body, cpVect force);
+
+/// Get the angle of the body.
+CP_EXPORT cpFloat cpBodyGetAngle(const cpBody *body);
+/// Set the angle of a body.
+CP_EXPORT void cpBodySetAngle(cpBody *body, cpFloat a);
+
+/// Get the angular velocity of the body.
+CP_EXPORT cpFloat cpBodyGetAngularVelocity(const cpBody *body);
+/// Set the angular velocity of the body.
+CP_EXPORT void cpBodySetAngularVelocity(cpBody *body, cpFloat angularVelocity);
+
+/// Get the torque applied to the body for the next time step.
+CP_EXPORT cpFloat cpBodyGetTorque(const cpBody *body);
+/// Set the torque applied to the body for the next time step.
+CP_EXPORT void cpBodySetTorque(cpBody *body, cpFloat torque);
+
+/// Get the rotation vector of the body. (The x basis vector of it's transform.)
+CP_EXPORT cpVect cpBodyGetRotation(const cpBody *body);
+
+/// Get the user data pointer assigned to the body.
+CP_EXPORT cpDataPointer cpBodyGetUserData(const cpBody *body);
+/// Set the user data pointer assigned to the body.
+CP_EXPORT void cpBodySetUserData(cpBody *body, cpDataPointer userData);
+
+/// Get the 2nd user data pointer assigned to the body.
+CP_EXPORT cpDataPointer cpBodyGetUserData2(const cpBody *body);
+/// Set the 2nd user data pointer assigned to the body.
+CP_EXPORT void cpBodySetUserData2(cpBody *body, cpDataPointer userData);
+
+/// Set the callback used to update a body's velocity.
+CP_EXPORT void cpBodySetVelocityUpdateFunc(cpBody *body, cpBodyVelocityFunc velocityFunc);
+/// Set the callback used to update a body's position.
+/// NOTE: It's not generally recommended to override this unless you call the default position update function.
+CP_EXPORT void cpBodySetPositionUpdateFunc(cpBody *body, cpBodyPositionFunc positionFunc);
+
+/// Default velocity integration function..
+CP_EXPORT void cpBodyUpdateVelocity(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt);
+/// Default position integration function.
+CP_EXPORT void cpBodyUpdatePosition(cpBody *body, cpFloat dt);
+
+/// Convert body relative/local coordinates to absolute/world coordinates.
+CP_EXPORT cpVect cpBodyLocalToWorld(const cpBody *body, const cpVect point);
+/// Convert body absolute/world coordinates to  relative/local coordinates.
+CP_EXPORT cpVect cpBodyWorldToLocal(const cpBody *body, const cpVect point);
+
+/// Apply a force to a body. Both the force and point are expressed in world coordinates.
+CP_EXPORT void cpBodyApplyForceAtWorldPoint(cpBody *body, cpVect force, cpVect point);
+/// Apply a force to a body. Both the force and point are expressed in body local coordinates.
+CP_EXPORT void cpBodyApplyForceAtLocalPoint(cpBody *body, cpVect force, cpVect point);
+
+/// Apply an impulse to a body. Both the impulse and point are expressed in world coordinates.
+CP_EXPORT void cpBodyApplyImpulseAtWorldPoint(cpBody *body, cpVect impulse, cpVect point);
+/// Apply an impulse to a body. Both the impulse and point are expressed in body local coordinates.
+CP_EXPORT void cpBodyApplyImpulseAtLocalPoint(cpBody *body, cpVect impulse, cpVect point);
+
+/// Get the velocity on a body (in world units) at a point on the body in world coordinates.
+CP_EXPORT cpVect cpBodyGetVelocityAtWorldPoint(const cpBody *body, cpVect point);
+/// Get the velocity on a body (in world units) at a point on the body in local coordinates.
+CP_EXPORT cpVect cpBodyGetVelocityAtLocalPoint(const cpBody *body, cpVect point);
+
+/// Get the amount of kinetic energy contained by the body.
+CP_EXPORT cpFloat cpBodyKineticEnergy(const cpBody *body);
+
+/// Body/shape iterator callback function type. 
+typedef void (*cpBodyShapeIteratorFunc)(cpBody *body, cpShape *shape, void *data);
+/// Call @c func once for each shape attached to @c body and added to the space.
+CP_EXPORT void cpBodyEachShape(cpBody *body, cpBodyShapeIteratorFunc func, void *data);
+
+/// Body/constraint iterator callback function type. 
+typedef void (*cpBodyConstraintIteratorFunc)(cpBody *body, cpConstraint *constraint, void *data);
+/// Call @c func once for each constraint attached to @c body and added to the space.
+CP_EXPORT void cpBodyEachConstraint(cpBody *body, cpBodyConstraintIteratorFunc func, void *data);
+
+/// Body/arbiter iterator callback function type. 
+typedef void (*cpBodyArbiterIteratorFunc)(cpBody *body, cpArbiter *arbiter, void *data);
+/// Call @c func once for each arbiter that is currently active on the body.
+CP_EXPORT void cpBodyEachArbiter(cpBody *body, cpBodyArbiterIteratorFunc func, void *data);
+
+///@}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpConstraint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpConstraint.h
new file mode 100644
index 0000000..b1a439f
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpConstraint.h
@@ -0,0 +1,95 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpConstraint cpConstraint
+/// @{
+
+/// Callback function type that gets called before solving a joint.
+typedef void (*cpConstraintPreSolveFunc)(cpConstraint *constraint, cpSpace *space);
+/// Callback function type that gets called after solving a joint.
+typedef void (*cpConstraintPostSolveFunc)(cpConstraint *constraint, cpSpace *space);
+
+/// Destroy a constraint.
+CP_EXPORT void cpConstraintDestroy(cpConstraint *constraint);
+/// Destroy and free a constraint.
+CP_EXPORT void cpConstraintFree(cpConstraint *constraint);
+
+/// Get the cpSpace this constraint is added to.
+CP_EXPORT cpSpace* cpConstraintGetSpace(const cpConstraint *constraint);
+
+/// Get the first body the constraint is attached to.
+CP_EXPORT cpBody* cpConstraintGetBodyA(const cpConstraint *constraint);
+
+/// Get the second body the constraint is attached to.
+CP_EXPORT cpBody* cpConstraintGetBodyB(const cpConstraint *constraint);
+
+/// Get the maximum force that this constraint is allowed to use.
+CP_EXPORT cpFloat cpConstraintGetMaxForce(const cpConstraint *constraint);
+/// Set the maximum force that this constraint is allowed to use. (defaults to INFINITY)
+CP_EXPORT void cpConstraintSetMaxForce(cpConstraint *constraint, cpFloat maxForce);
+
+/// Get rate at which joint error is corrected.
+CP_EXPORT cpFloat cpConstraintGetErrorBias(const cpConstraint *constraint);
+/// Set rate at which joint error is corrected.
+/// Defaults to pow(1.0 - 0.1, 60.0) meaning that it will
+/// correct 10% of the error every 1/60th of a second.
+CP_EXPORT void cpConstraintSetErrorBias(cpConstraint *constraint, cpFloat errorBias);
+
+/// Get the maximum rate at which joint error is corrected.
+CP_EXPORT cpFloat cpConstraintGetMaxBias(const cpConstraint *constraint);
+/// Set the maximum rate at which joint error is corrected. (defaults to INFINITY)
+CP_EXPORT void cpConstraintSetMaxBias(cpConstraint *constraint, cpFloat maxBias);
+
+/// Get if the two bodies connected by the constraint are allowed to collide or not.
+CP_EXPORT cpBool cpConstraintGetCollideBodies(const cpConstraint *constraint);
+/// Set if the two bodies connected by the constraint are allowed to collide or not. (defaults to cpFalse)
+CP_EXPORT void cpConstraintSetCollideBodies(cpConstraint *constraint, cpBool collideBodies);
+
+/// Get the pre-solve function that is called before the solver runs.
+CP_EXPORT cpConstraintPreSolveFunc cpConstraintGetPreSolveFunc(const cpConstraint *constraint);
+/// Set the pre-solve function that is called before the solver runs.
+CP_EXPORT void cpConstraintSetPreSolveFunc(cpConstraint *constraint, cpConstraintPreSolveFunc preSolveFunc);
+
+/// Get the post-solve function that is called before the solver runs.
+CP_EXPORT cpConstraintPostSolveFunc cpConstraintGetPostSolveFunc(const cpConstraint *constraint);
+/// Set the post-solve function that is called before the solver runs.
+CP_EXPORT void cpConstraintSetPostSolveFunc(cpConstraint *constraint, cpConstraintPostSolveFunc postSolveFunc);
+
+/// Get the user definable data pointer for this constraint
+CP_EXPORT cpDataPointer cpConstraintGetUserData(const cpConstraint *constraint);
+/// Set the user definable data pointer for this constraint
+CP_EXPORT void cpConstraintSetUserData(cpConstraint *constraint, cpDataPointer userData);
+
+/// Get the last impulse applied by this constraint.
+CP_EXPORT cpFloat cpConstraintGetImpulse(cpConstraint *constraint);
+
+#include "cpPinJoint.h"
+#include "cpSlideJoint.h"
+#include "cpPivotJoint.h"
+#include "cpGrooveJoint.h"
+#include "cpDampedSpring.h"
+#include "cpDampedRotarySpring.h"
+#include "cpRotaryLimitJoint.h"
+#include "cpRatchetJoint.h"
+#include "cpGearJoint.h"
+#include "cpSimpleMotor.h"
+
+///@}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpDampedRotarySpring.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpDampedRotarySpring.h
new file mode 100644
index 0000000..6f60e86
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpDampedRotarySpring.h
@@ -0,0 +1,58 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpDampedRotarySpring cpDampedRotarySpring
+/// @{
+
+/// Check if a constraint is a damped rotary springs.
+CP_EXPORT cpBool cpConstraintIsDampedRotarySpring(const cpConstraint *constraint);
+
+/// Function type used for damped rotary spring force callbacks.
+typedef cpFloat (*cpDampedRotarySpringTorqueFunc)(struct cpConstraint *spring, cpFloat relativeAngle);
+
+/// Allocate a damped rotary spring.
+CP_EXPORT cpDampedRotarySpring* cpDampedRotarySpringAlloc(void);
+/// Initialize a damped rotary spring.
+CP_EXPORT cpDampedRotarySpring* cpDampedRotarySpringInit(cpDampedRotarySpring *joint, cpBody *a, cpBody *b, cpFloat restAngle, cpFloat stiffness, cpFloat damping);
+/// Allocate and initialize a damped rotary spring.
+CP_EXPORT cpConstraint* cpDampedRotarySpringNew(cpBody *a, cpBody *b, cpFloat restAngle, cpFloat stiffness, cpFloat damping);
+
+/// Get the rest length of the spring.
+CP_EXPORT cpFloat cpDampedRotarySpringGetRestAngle(const cpConstraint *constraint);
+/// Set the rest length of the spring.
+CP_EXPORT void cpDampedRotarySpringSetRestAngle(cpConstraint *constraint, cpFloat restAngle);
+
+/// Get the stiffness of the spring in force/distance.
+CP_EXPORT cpFloat cpDampedRotarySpringGetStiffness(const cpConstraint *constraint);
+/// Set the stiffness of the spring in force/distance.
+CP_EXPORT void cpDampedRotarySpringSetStiffness(cpConstraint *constraint, cpFloat stiffness);
+
+/// Get the damping of the spring.
+CP_EXPORT cpFloat cpDampedRotarySpringGetDamping(const cpConstraint *constraint);
+/// Set the damping of the spring.
+CP_EXPORT void cpDampedRotarySpringSetDamping(cpConstraint *constraint, cpFloat damping);
+
+/// Get the damping of the spring.
+CP_EXPORT cpDampedRotarySpringTorqueFunc cpDampedRotarySpringGetSpringTorqueFunc(const cpConstraint *constraint);
+/// Set the damping of the spring.
+CP_EXPORT void cpDampedRotarySpringSetSpringTorqueFunc(cpConstraint *constraint, cpDampedRotarySpringTorqueFunc springTorqueFunc);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpDampedSpring.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpDampedSpring.h
new file mode 100644
index 0000000..b332fc7
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpDampedSpring.h
@@ -0,0 +1,68 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpDampedSpring cpDampedSpring
+/// @{
+
+/// Check if a constraint is a slide joint.
+CP_EXPORT cpBool cpConstraintIsDampedSpring(const cpConstraint *constraint);
+
+/// Function type used for damped spring force callbacks.
+typedef cpFloat (*cpDampedSpringForceFunc)(cpConstraint *spring, cpFloat dist);
+
+/// Allocate a damped spring.
+CP_EXPORT cpDampedSpring* cpDampedSpringAlloc(void);
+/// Initialize a damped spring.
+CP_EXPORT cpDampedSpring* cpDampedSpringInit(cpDampedSpring *joint, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat restLength, cpFloat stiffness, cpFloat damping);
+/// Allocate and initialize a damped spring.
+CP_EXPORT cpConstraint* cpDampedSpringNew(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat restLength, cpFloat stiffness, cpFloat damping);
+
+/// Get the location of the first anchor relative to the first body.
+CP_EXPORT cpVect cpDampedSpringGetAnchorA(const cpConstraint *constraint);
+/// Set the location of the first anchor relative to the first body.
+CP_EXPORT void cpDampedSpringSetAnchorA(cpConstraint *constraint, cpVect anchorA);
+
+/// Get the location of the second anchor relative to the second body.
+CP_EXPORT cpVect cpDampedSpringGetAnchorB(const cpConstraint *constraint);
+/// Set the location of the second anchor relative to the second body.
+CP_EXPORT void cpDampedSpringSetAnchorB(cpConstraint *constraint, cpVect anchorB);
+
+/// Get the rest length of the spring.
+CP_EXPORT cpFloat cpDampedSpringGetRestLength(const cpConstraint *constraint);
+/// Set the rest length of the spring.
+CP_EXPORT void cpDampedSpringSetRestLength(cpConstraint *constraint, cpFloat restLength);
+
+/// Get the stiffness of the spring in force/distance.
+CP_EXPORT cpFloat cpDampedSpringGetStiffness(const cpConstraint *constraint);
+/// Set the stiffness of the spring in force/distance.
+CP_EXPORT void cpDampedSpringSetStiffness(cpConstraint *constraint, cpFloat stiffness);
+
+/// Get the damping of the spring.
+CP_EXPORT cpFloat cpDampedSpringGetDamping(const cpConstraint *constraint);
+/// Set the damping of the spring.
+CP_EXPORT void cpDampedSpringSetDamping(cpConstraint *constraint, cpFloat damping);
+
+/// Get the damping of the spring.
+CP_EXPORT cpDampedSpringForceFunc cpDampedSpringGetSpringForceFunc(const cpConstraint *constraint);
+/// Set the damping of the spring.
+CP_EXPORT void cpDampedSpringSetSpringForceFunc(cpConstraint *constraint, cpDampedSpringForceFunc springForceFunc);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpGearJoint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpGearJoint.h
new file mode 100644
index 0000000..8cd80e0
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpGearJoint.h
@@ -0,0 +1,45 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpGearJoint cpGearJoint
+/// @{
+
+/// Check if a constraint is a damped rotary springs.
+CP_EXPORT cpBool cpConstraintIsGearJoint(const cpConstraint *constraint);
+
+/// Allocate a gear joint.
+CP_EXPORT cpGearJoint* cpGearJointAlloc(void);
+/// Initialize a gear joint.
+CP_EXPORT cpGearJoint* cpGearJointInit(cpGearJoint *joint, cpBody *a, cpBody *b, cpFloat phase, cpFloat ratio);
+/// Allocate and initialize a gear joint.
+CP_EXPORT cpConstraint* cpGearJointNew(cpBody *a, cpBody *b, cpFloat phase, cpFloat ratio);
+
+/// Get the phase offset of the gears.
+CP_EXPORT cpFloat cpGearJointGetPhase(const cpConstraint *constraint);
+/// Set the phase offset of the gears.
+CP_EXPORT void cpGearJointSetPhase(cpConstraint *constraint, cpFloat phase);
+
+/// Get the angular distance of each ratchet.
+CP_EXPORT cpFloat cpGearJointGetRatio(const cpConstraint *constraint);
+/// Set the ratio of a gear joint.
+CP_EXPORT void cpGearJointSetRatio(cpConstraint *constraint, cpFloat ratio);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpGrooveJoint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpGrooveJoint.h
new file mode 100644
index 0000000..8bdafc1
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpGrooveJoint.h
@@ -0,0 +1,50 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpGrooveJoint cpGrooveJoint
+/// @{
+
+/// Check if a constraint is a slide joint.
+CP_EXPORT cpBool cpConstraintIsGrooveJoint(const cpConstraint *constraint);
+
+/// Allocate a groove joint.
+CP_EXPORT cpGrooveJoint* cpGrooveJointAlloc(void);
+/// Initialize a groove joint.
+CP_EXPORT cpGrooveJoint* cpGrooveJointInit(cpGrooveJoint *joint, cpBody *a, cpBody *b, cpVect groove_a, cpVect groove_b, cpVect anchorB);
+/// Allocate and initialize a groove joint.
+CP_EXPORT cpConstraint* cpGrooveJointNew(cpBody *a, cpBody *b, cpVect groove_a, cpVect groove_b, cpVect anchorB);
+
+/// Get the first endpoint of the groove relative to the first body.
+CP_EXPORT cpVect cpGrooveJointGetGrooveA(const cpConstraint *constraint);
+/// Set the first endpoint of the groove relative to the first body.
+CP_EXPORT void cpGrooveJointSetGrooveA(cpConstraint *constraint, cpVect grooveA);
+
+/// Get the first endpoint of the groove relative to the first body.
+CP_EXPORT cpVect cpGrooveJointGetGrooveB(const cpConstraint *constraint);
+/// Set the first endpoint of the groove relative to the first body.
+CP_EXPORT void cpGrooveJointSetGrooveB(cpConstraint *constraint, cpVect grooveB);
+
+/// Get the location of the second anchor relative to the second body.
+CP_EXPORT cpVect cpGrooveJointGetAnchorB(const cpConstraint *constraint);
+/// Set the location of the second anchor relative to the second body.
+CP_EXPORT void cpGrooveJointSetAnchorB(cpConstraint *constraint, cpVect anchorB);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpHastySpace.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpHastySpace.h
new file mode 100644
index 0000000..6de2283
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpHastySpace.h
@@ -0,0 +1,27 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+/// cpHastySpace is exclusive to Chipmunk Pro
+/// Currently it enables ARM NEON optimizations in the solver, but in the future will include other optimizations such as
+/// a multi-threaded solver and multi-threaded collision broadphases.
+
+struct cpHastySpace;
+typedef struct cpHastySpace cpHastySpace;
+
+/// Create a new hasty space.
+/// On ARM platforms that support NEON, this will enable the vectorized solver.
+/// cpHastySpace also supports multiple threads, but runs single threaded by default for determinism.
+CP_EXPORT cpSpace *cpHastySpaceNew(void);
+CP_EXPORT void cpHastySpaceFree(cpSpace *space);
+
+/// Set the number of threads to use for the solver.
+/// Currently Chipmunk is limited to 2 threads as using more generally provides very minimal performance gains.
+/// Passing 0 as the thread count on iOS or OS X will cause Chipmunk to automatically detect the number of threads it should use.
+/// On other platforms passing 0 for the thread count will set 1 thread.
+CP_EXPORT void cpHastySpaceSetThreads(cpSpace *space, unsigned long threads);
+
+/// Returns the number of threads the solver is using to run.
+CP_EXPORT unsigned long cpHastySpaceGetThreads(cpSpace *space);
+
+/// When stepping a hasty space, you must use this function.
+CP_EXPORT void cpHastySpaceStep(cpSpace *space, cpFloat dt);
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpMarch.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpMarch.h
new file mode 100644
index 0000000..cc1f5c0
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpMarch.h
@@ -0,0 +1,28 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+/// Function type used as a callback from the marching squares algorithm to sample an image function.
+/// It passes you the point to sample and your context pointer, and you return the density.
+typedef cpFloat (*cpMarchSampleFunc)(cpVect point, void *data);
+
+/// Function type used as a callback from the marching squares algorithm to output a line segment.
+/// It passes you the two endpoints and your context pointer.
+typedef void (*cpMarchSegmentFunc)(cpVect v0, cpVect v1, void *data);
+
+/// Trace an anti-aliased contour of an image along a particular threshold.
+/// The given number of samples will be taken and spread across the bounding box area using the sampling function and context.
+/// The segment function will be called for each segment detected that lies along the density contour for @c threshold.
+CP_EXPORT void cpMarchSoft(
+  cpBB bb, unsigned long x_samples, unsigned long y_samples, cpFloat threshold,
+  cpMarchSegmentFunc segment, void *segment_data,
+  cpMarchSampleFunc sample, void *sample_data
+);
+
+/// Trace an aliased curve of an image along a particular threshold.
+/// The given number of samples will be taken and spread across the bounding box area using the sampling function and context.
+/// The segment function will be called for each segment detected that lies along the density contour for @c threshold.
+CP_EXPORT void cpMarchHard(
+  cpBB bb, unsigned long x_samples, unsigned long y_samples, cpFloat threshold,
+  cpMarchSegmentFunc segment, void *segment_data,
+  cpMarchSampleFunc sample, void *sample_data
+);
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPinJoint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPinJoint.h
new file mode 100644
index 0000000..45aaa3e
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPinJoint.h
@@ -0,0 +1,50 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpPinJoint cpPinJoint
+/// @{
+
+/// Check if a constraint is a pin joint.
+CP_EXPORT cpBool cpConstraintIsPinJoint(const cpConstraint *constraint);
+
+/// Allocate a pin joint.
+CP_EXPORT cpPinJoint* cpPinJointAlloc(void);
+/// Initialize a pin joint.
+CP_EXPORT cpPinJoint* cpPinJointInit(cpPinJoint *joint, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB);
+/// Allocate and initialize a pin joint.
+CP_EXPORT cpConstraint* cpPinJointNew(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB);
+
+/// Get the location of the first anchor relative to the first body.
+CP_EXPORT cpVect cpPinJointGetAnchorA(const cpConstraint *constraint);
+/// Set the location of the first anchor relative to the first body.
+CP_EXPORT void cpPinJointSetAnchorA(cpConstraint *constraint, cpVect anchorA);
+
+/// Get the location of the second anchor relative to the second body.
+CP_EXPORT cpVect cpPinJointGetAnchorB(const cpConstraint *constraint);
+/// Set the location of the second anchor relative to the second body.
+CP_EXPORT void cpPinJointSetAnchorB(cpConstraint *constraint, cpVect anchorB);
+
+/// Get the distance the joint will maintain between the two anchors.
+CP_EXPORT cpFloat cpPinJointGetDist(const cpConstraint *constraint);
+/// Set the distance the joint will maintain between the two anchors.
+CP_EXPORT void cpPinJointSetDist(cpConstraint *constraint, cpFloat dist);
+
+///@}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPivotJoint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPivotJoint.h
new file mode 100644
index 0000000..4a620ef
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPivotJoint.h
@@ -0,0 +1,47 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpPivotJoint cpPivotJoint
+/// @{
+
+/// Check if a constraint is a slide joint.
+CP_EXPORT cpBool cpConstraintIsPivotJoint(const cpConstraint *constraint);
+
+/// Allocate a pivot joint
+CP_EXPORT cpPivotJoint* cpPivotJointAlloc(void);
+/// Initialize a pivot joint.
+CP_EXPORT cpPivotJoint* cpPivotJointInit(cpPivotJoint *joint, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB);
+/// Allocate and initialize a pivot joint.
+CP_EXPORT cpConstraint* cpPivotJointNew(cpBody *a, cpBody *b, cpVect pivot);
+/// Allocate and initialize a pivot joint with specific anchors.
+CP_EXPORT cpConstraint* cpPivotJointNew2(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB);
+
+/// Get the location of the first anchor relative to the first body.
+CP_EXPORT cpVect cpPivotJointGetAnchorA(const cpConstraint *constraint);
+/// Set the location of the first anchor relative to the first body.
+CP_EXPORT void cpPivotJointSetAnchorA(cpConstraint *constraint, cpVect anchorA);
+
+/// Get the location of the second anchor relative to the second body.
+CP_EXPORT cpVect cpPivotJointGetAnchorB(const cpConstraint *constraint);
+/// Set the location of the second anchor relative to the second body.
+CP_EXPORT void cpPivotJointSetAnchorB(cpConstraint *constraint, cpVect anchorB);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPolyShape.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPolyShape.h
new file mode 100644
index 0000000..25f688b
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPolyShape.h
@@ -0,0 +1,56 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpPolyShape cpPolyShape
+/// @{
+
+/// Allocate a polygon shape.
+CP_EXPORT cpPolyShape* cpPolyShapeAlloc(void);
+/// Initialize a polygon shape with rounded corners.
+/// A convex hull will be created from the vertexes.
+CP_EXPORT cpPolyShape* cpPolyShapeInit(cpPolyShape *poly, cpBody *body, int count, const cpVect *verts, cpTransform transform, cpFloat radius);
+/// Initialize a polygon shape with rounded corners.
+/// The vertexes must be convex with a counter-clockwise winding.
+CP_EXPORT cpPolyShape* cpPolyShapeInitRaw(cpPolyShape *poly, cpBody *body, int count, const cpVect *verts, cpFloat radius);
+/// Allocate and initialize a polygon shape with rounded corners.
+/// A convex hull will be created from the vertexes.
+CP_EXPORT cpShape* cpPolyShapeNew(cpBody *body, int count, const cpVect *verts, cpTransform transform, cpFloat radius);
+/// Allocate and initialize a polygon shape with rounded corners.
+/// The vertexes must be convex with a counter-clockwise winding.
+CP_EXPORT cpShape* cpPolyShapeNewRaw(cpBody *body, int count, const cpVect *verts, cpFloat radius);
+
+/// Initialize a box shaped polygon shape with rounded corners.
+CP_EXPORT cpPolyShape* cpBoxShapeInit(cpPolyShape *poly, cpBody *body, cpFloat width, cpFloat height, cpFloat radius);
+/// Initialize an offset box shaped polygon shape with rounded corners.
+CP_EXPORT cpPolyShape* cpBoxShapeInit2(cpPolyShape *poly, cpBody *body, cpBB box, cpFloat radius);
+/// Allocate and initialize a box shaped polygon shape.
+CP_EXPORT cpShape* cpBoxShapeNew(cpBody *body, cpFloat width, cpFloat height, cpFloat radius);
+/// Allocate and initialize an offset box shaped polygon shape.
+CP_EXPORT cpShape* cpBoxShapeNew2(cpBody *body, cpBB box, cpFloat radius);
+
+/// Get the number of verts in a polygon shape.
+CP_EXPORT int cpPolyShapeGetCount(const cpShape *shape);
+/// Get the @c ith vertex of a polygon shape.
+CP_EXPORT cpVect cpPolyShapeGetVert(const cpShape *shape, int index);
+/// Get the radius of a polygon shape.
+CP_EXPORT cpFloat cpPolyShapeGetRadius(const cpShape *shape);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPolyline.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPolyline.h
new file mode 100644
index 0000000..4e878f0
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpPolyline.h
@@ -0,0 +1,70 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+// Polylines are just arrays of vertexes.
+// They are looped if the first vertex is equal to the last.
+// cpPolyline structs are intended to be passed by value and destroyed when you are done with them.
+typedef struct cpPolyline {
+  int count, capacity;
+  cpVect verts[];
+} cpPolyline;
+
+/// Destroy and free a polyline instance.
+CP_EXPORT void cpPolylineFree(cpPolyline *line);
+
+/// Returns true if the first vertex is equal to the last.
+CP_EXPORT cpBool cpPolylineIsClosed(cpPolyline *line);
+
+/**
+	Returns a copy of a polyline simplified by using the Douglas-Peucker algorithm.
+	This works very well on smooth or gently curved shapes, but not well on straight edged or angular shapes.
+*/
+CP_EXPORT cpPolyline *cpPolylineSimplifyCurves(cpPolyline *line, cpFloat tol);
+
+/**
+	Returns a copy of a polyline simplified by discarding "flat" vertexes.
+	This works well on straigt edged or angular shapes, not as well on smooth shapes.
+*/
+CP_EXPORT cpPolyline *cpPolylineSimplifyVertexes(cpPolyline *line, cpFloat tol);
+
+/// Get the convex hull of a polyline as a looped polyline.
+CP_EXPORT cpPolyline *cpPolylineToConvexHull(cpPolyline *line, cpFloat tol);
+
+
+/// Polyline sets are collections of polylines, generally built by cpMarchSoft() or cpMarchHard().
+typedef struct cpPolylineSet {
+  int count, capacity;
+  cpPolyline **lines;
+} cpPolylineSet;
+
+/// Allocate a new polyline set.
+CP_EXPORT cpPolylineSet *cpPolylineSetAlloc(void);
+
+/// Initialize a new polyline set.
+CP_EXPORT cpPolylineSet *cpPolylineSetInit(cpPolylineSet *set);
+
+/// Allocate and initialize a polyline set.
+CP_EXPORT cpPolylineSet *cpPolylineSetNew(void);
+
+/// Destroy a polyline set.
+CP_EXPORT void cpPolylineSetDestroy(cpPolylineSet *set, cpBool freePolylines);
+
+/// Destroy and free a polyline set.
+CP_EXPORT void cpPolylineSetFree(cpPolylineSet *set, cpBool freePolylines);
+
+/**
+	Add a line segment to a polyline set.
+	A segment will either start a new polyline, join two others, or add to or loop an existing polyline.
+	This is mostly intended to be used as a callback directly from cpMarchSoft() or cpMarchHard().
+*/
+CP_EXPORT void cpPolylineSetCollectSegment(cpVect v0, cpVect v1, cpPolylineSet *lines);
+
+/**
+	Get an approximate convex decomposition from a polyline.
+	Returns a cpPolylineSet of convex hulls that match the original shape to within 'tol'.
+	NOTE: If the input is a self intersecting polygon, the output might end up overly simplified.
+*/
+
+CP_EXPORT cpPolylineSet *cpPolylineConvexDecomposition(cpPolyline *line, cpFloat tol);
+
+#define cpPolylineConvexDecomposition_BETA cpPolylineConvexDecomposition
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRatchetJoint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRatchetJoint.h
new file mode 100644
index 0000000..3ed4c91
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRatchetJoint.h
@@ -0,0 +1,50 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpRatchetJoint cpRatchetJoint
+/// @{
+
+/// Check if a constraint is a damped rotary springs.
+CP_EXPORT cpBool cpConstraintIsRatchetJoint(const cpConstraint *constraint);
+
+/// Allocate a ratchet joint.
+CP_EXPORT cpRatchetJoint* cpRatchetJointAlloc(void);
+/// Initialize a ratched joint.
+CP_EXPORT cpRatchetJoint* cpRatchetJointInit(cpRatchetJoint *joint, cpBody *a, cpBody *b, cpFloat phase, cpFloat ratchet);
+/// Allocate and initialize a ratchet joint.
+CP_EXPORT cpConstraint* cpRatchetJointNew(cpBody *a, cpBody *b, cpFloat phase, cpFloat ratchet);
+
+/// Get the angle of the current ratchet tooth.
+CP_EXPORT cpFloat cpRatchetJointGetAngle(const cpConstraint *constraint);
+/// Set the angle of the current ratchet tooth.
+CP_EXPORT void cpRatchetJointSetAngle(cpConstraint *constraint, cpFloat angle);
+
+/// Get the phase offset of the ratchet.
+CP_EXPORT cpFloat cpRatchetJointGetPhase(const cpConstraint *constraint);
+/// Get the phase offset of the ratchet.
+CP_EXPORT void cpRatchetJointSetPhase(cpConstraint *constraint, cpFloat phase);
+
+/// Get the angular distance of each ratchet.
+CP_EXPORT cpFloat cpRatchetJointGetRatchet(const cpConstraint *constraint);
+/// Set the angular distance of each ratchet.
+CP_EXPORT void cpRatchetJointSetRatchet(cpConstraint *constraint, cpFloat ratchet);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRobust.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRobust.h
new file mode 100644
index 0000000..e4b2c42
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRobust.h
@@ -0,0 +1,11 @@
+#include "chipmunk/cpVect.h"
+
+// This is a private header for functions (currently just one) that need strict floating point results.
+// It was easier to put this in it's own file than to fiddle with 4 different compiler specific pragmas or attributes.
+// "Fast math" should be disabled here.
+
+// Check if c is to the left of segment (a, b).
+cpBool cpCheckPointGreater(const cpVect a, const cpVect b, const cpVect c);
+
+// Check if p is behind one of v0 or v1 on axis n.
+cpBool cpCheckAxis(cpVect v0, cpVect v1, cpVect p, cpVect n);
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRotaryLimitJoint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRotaryLimitJoint.h
new file mode 100644
index 0000000..fac7ad8
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpRotaryLimitJoint.h
@@ -0,0 +1,45 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpRotaryLimitJoint cpRotaryLimitJoint
+/// @{
+
+/// Check if a constraint is a damped rotary springs.
+CP_EXPORT cpBool cpConstraintIsRotaryLimitJoint(const cpConstraint *constraint);
+
+/// Allocate a damped rotary limit joint.
+CP_EXPORT cpRotaryLimitJoint* cpRotaryLimitJointAlloc(void);
+/// Initialize a damped rotary limit joint.
+CP_EXPORT cpRotaryLimitJoint* cpRotaryLimitJointInit(cpRotaryLimitJoint *joint, cpBody *a, cpBody *b, cpFloat min, cpFloat max);
+/// Allocate and initialize a damped rotary limit joint.
+CP_EXPORT cpConstraint* cpRotaryLimitJointNew(cpBody *a, cpBody *b, cpFloat min, cpFloat max);
+
+/// Get the minimum distance the joint will maintain between the two anchors.
+CP_EXPORT cpFloat cpRotaryLimitJointGetMin(const cpConstraint *constraint);
+/// Set the minimum distance the joint will maintain between the two anchors.
+CP_EXPORT void cpRotaryLimitJointSetMin(cpConstraint *constraint, cpFloat min);
+
+/// Get the maximum distance the joint will maintain between the two anchors.
+CP_EXPORT cpFloat cpRotaryLimitJointGetMax(const cpConstraint *constraint);
+/// Set the maximum distance the joint will maintain between the two anchors.
+CP_EXPORT void cpRotaryLimitJointSetMax(cpConstraint *constraint, cpFloat max);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpShape.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpShape.h
new file mode 100644
index 0000000..2b04062
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpShape.h
@@ -0,0 +1,202 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpShape cpShape
+/// The cpShape struct defines the shape of a rigid body.
+/// @{
+
+/// Point query info struct.
+typedef struct cpPointQueryInfo {
+	/// The nearest shape, NULL if no shape was within range.
+	const cpShape *shape;
+	/// The closest point on the shape's surface. (in world space coordinates)
+	cpVect point;
+	/// The distance to the point. The distance is negative if the point is inside the shape.
+	cpFloat distance;
+	/// The gradient of the signed distance function.
+	/// The value should be similar to info.p/info.d, but accurate even for very small values of info.d.
+	cpVect gradient;
+} cpPointQueryInfo;
+
+/// Segment query info struct.
+typedef struct cpSegmentQueryInfo {
+	/// The shape that was hit, or NULL if no collision occured.
+	const cpShape *shape;
+	/// The point of impact.
+	cpVect point;
+	/// The normal of the surface hit.
+	cpVect normal;
+	/// The normalized distance along the query segment in the range [0, 1].
+	cpFloat alpha;
+} cpSegmentQueryInfo;
+
+/// Fast collision filtering type that is used to determine if two objects collide before calling collision or query callbacks.
+typedef struct cpShapeFilter {
+	/// Two objects with the same non-zero group value do not collide.
+	/// This is generally used to group objects in a composite object together to disable self collisions.
+	cpGroup group;
+	/// A bitmask of user definable categories that this object belongs to.
+	/// The category/mask combinations of both objects in a collision must agree for a collision to occur.
+	cpBitmask categories;
+	/// A bitmask of user definable category types that this object object collides with.
+	/// The category/mask combinations of both objects in a collision must agree for a collision to occur.
+	cpBitmask mask;
+} cpShapeFilter;
+
+/// Collision filter value for a shape that will collide with anything except CP_SHAPE_FILTER_NONE.
+static const cpShapeFilter CP_SHAPE_FILTER_ALL = {CP_NO_GROUP, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES};
+/// Collision filter value for a shape that does not collide with anything.
+static const cpShapeFilter CP_SHAPE_FILTER_NONE = {CP_NO_GROUP, ~CP_ALL_CATEGORIES, ~CP_ALL_CATEGORIES};
+
+/// Create a new collision filter.
+static inline cpShapeFilter
+cpShapeFilterNew(cpGroup group, cpBitmask categories, cpBitmask mask)
+{
+	cpShapeFilter filter = {group, categories, mask};
+	return filter;
+}
+
+/// Destroy a shape.
+CP_EXPORT void cpShapeDestroy(cpShape *shape);
+/// Destroy and Free a shape.
+CP_EXPORT void cpShapeFree(cpShape *shape);
+
+/// Get the hash ID of the shape
+CP_EXPORT cpHashValue cpShapeGetHashId(cpShape* shape);
+
+/// Update, cache and return the bounding box of a shape based on the body it's attached to.
+CP_EXPORT cpBB cpShapeCacheBB(cpShape *shape);
+/// Update, cache and return the bounding box of a shape with an explicit transformation.
+CP_EXPORT cpBB cpShapeUpdate(cpShape *shape, cpTransform transform);
+
+/// Perform a nearest point query. It finds the closest point on the surface of shape to a specific point.
+/// The value returned is the distance between the points. A negative distance means the point is inside the shape.
+CP_EXPORT cpFloat cpShapePointQuery(const cpShape *shape, cpVect p, cpPointQueryInfo *out);
+
+/// Perform a segment query against a shape. @c info must be a pointer to a valid cpSegmentQueryInfo structure.
+CP_EXPORT cpBool cpShapeSegmentQuery(const cpShape *shape, cpVect a, cpVect b, cpFloat radius, cpSegmentQueryInfo *info);
+
+/// Return contact information about two shapes.
+CP_EXPORT cpContactPointSet cpShapesCollide(const cpShape *a, const cpShape *b);
+
+/// The cpSpace this body is added to.
+CP_EXPORT cpSpace* cpShapeGetSpace(const cpShape *shape);
+
+/// The cpBody this shape is connected to.
+CP_EXPORT cpBody* cpShapeGetBody(const cpShape *shape);
+/// Set the cpBody this shape is connected to.
+/// Can only be used if the shape is not currently added to a space.
+CP_EXPORT void cpShapeSetBody(cpShape *shape, cpBody *body);
+
+/// Get the mass of the shape if you are having Chipmunk calculate mass properties for you.
+CP_EXPORT cpFloat cpShapeGetMass(cpShape *shape);
+/// Set the mass of this shape to have Chipmunk calculate mass properties for you.
+CP_EXPORT void cpShapeSetMass(cpShape *shape, cpFloat mass);
+
+/// Get the density of the shape if you are having Chipmunk calculate mass properties for you.
+CP_EXPORT cpFloat cpShapeGetDensity(cpShape *shape);
+/// Set the density  of this shape to have Chipmunk calculate mass properties for you.
+CP_EXPORT void cpShapeSetDensity(cpShape *shape, cpFloat density);
+
+/// Get the calculated moment of inertia for this shape.
+CP_EXPORT cpFloat cpShapeGetMoment(cpShape *shape);
+/// Get the calculated area of this shape.
+CP_EXPORT cpFloat cpShapeGetArea(cpShape *shape);
+/// Get the centroid of this shape.
+CP_EXPORT cpVect cpShapeGetCenterOfGravity(cpShape *shape);
+
+/// Get the bounding box that contains the shape given it's current position and angle.
+CP_EXPORT cpBB cpShapeGetBB(const cpShape *shape);
+
+/// Get if the shape is set to be a sensor or not.
+CP_EXPORT cpBool cpShapeGetSensor(const cpShape *shape);
+/// Set if the shape is a sensor or not.
+CP_EXPORT void cpShapeSetSensor(cpShape *shape, cpBool sensor);
+
+/// Get the elasticity of this shape.
+CP_EXPORT cpFloat cpShapeGetElasticity(const cpShape *shape);
+/// Set the elasticity of this shape.
+CP_EXPORT void cpShapeSetElasticity(cpShape *shape, cpFloat elasticity);
+
+/// Get the friction of this shape.
+CP_EXPORT cpFloat cpShapeGetFriction(const cpShape *shape);
+/// Set the friction of this shape.
+CP_EXPORT void cpShapeSetFriction(cpShape *shape, cpFloat friction);
+
+/// Get the surface velocity of this shape.
+CP_EXPORT cpVect cpShapeGetSurfaceVelocity(const cpShape *shape);
+/// Set the surface velocity of this shape.
+CP_EXPORT void cpShapeSetSurfaceVelocity(cpShape *shape, cpVect surfaceVelocity);
+
+/// Get the user definable data pointer of this shape.
+CP_EXPORT cpDataPointer cpShapeGetUserData(const cpShape *shape);
+/// Set the user definable data pointer of this shape.
+CP_EXPORT void cpShapeSetUserData(cpShape *shape, cpDataPointer userData);
+
+/// Set the collision type of this shape.
+CP_EXPORT cpCollisionType cpShapeGetCollisionType(const cpShape *shape);
+/// Get the collision type of this shape.
+CP_EXPORT void cpShapeSetCollisionType(cpShape *shape, cpCollisionType collisionType);
+
+/// Get the collision filtering parameters of this shape.
+CP_EXPORT cpShapeFilter cpShapeGetFilter(const cpShape *shape);
+/// Set the collision filtering parameters of this shape.
+CP_EXPORT void cpShapeSetFilter(cpShape *shape, cpShapeFilter filter);
+
+
+/// @}
+/// @defgroup cpCircleShape cpCircleShape
+
+/// Allocate a circle shape.
+CP_EXPORT cpCircleShape* cpCircleShapeAlloc(void);
+/// Initialize a circle shape.
+CP_EXPORT cpCircleShape* cpCircleShapeInit(cpCircleShape *circle, cpBody *body, cpFloat radius, cpVect offset);
+/// Allocate and initialize a circle shape.
+CP_EXPORT cpShape* cpCircleShapeNew(cpBody *body, cpFloat radius, cpVect offset);
+
+/// Get the offset of a circle shape.
+CP_EXPORT cpVect cpCircleShapeGetOffset(const cpShape *shape);
+/// Get the radius of a circle shape.
+CP_EXPORT cpFloat cpCircleShapeGetRadius(const cpShape *shape);
+
+/// @}
+/// @defgroup cpSegmentShape cpSegmentShape
+
+/// Allocate a segment shape.
+CP_EXPORT cpSegmentShape* cpSegmentShapeAlloc(void);
+/// Initialize a segment shape.
+CP_EXPORT cpSegmentShape* cpSegmentShapeInit(cpSegmentShape *seg, cpBody *body, cpVect a, cpVect b, cpFloat radius);
+/// Allocate and initialize a segment shape.
+CP_EXPORT cpShape* cpSegmentShapeNew(cpBody *body, cpVect a, cpVect b, cpFloat radius);
+
+/// Let Chipmunk know about the geometry of adjacent segments to avoid colliding with endcaps.
+CP_EXPORT void cpSegmentShapeSetNeighbors(cpShape *shape, cpVect prev, cpVect next);
+
+/// Get the first endpoint of a segment shape.
+CP_EXPORT cpVect cpSegmentShapeGetA(const cpShape *shape);
+/// Get the second endpoint of a segment shape.
+CP_EXPORT cpVect cpSegmentShapeGetB(const cpShape *shape);
+/// Get the normal of a segment shape.
+CP_EXPORT cpVect cpSegmentShapeGetNormal(const cpShape *shape);
+/// Get the first endpoint of a segment shape.
+CP_EXPORT cpFloat cpSegmentShapeGetRadius(const cpShape *shape);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSimpleMotor.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSimpleMotor.h
new file mode 100644
index 0000000..811b011
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSimpleMotor.h
@@ -0,0 +1,43 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpSimpleMotor cpSimpleMotor
+/// @{
+
+/// Opaque struct type for damped rotary springs.
+typedef struct cpSimpleMotor cpSimpleMotor;
+
+/// Check if a constraint is a damped rotary springs.
+CP_EXPORT cpBool cpConstraintIsSimpleMotor(const cpConstraint *constraint);
+
+/// Allocate a simple motor.
+CP_EXPORT cpSimpleMotor* cpSimpleMotorAlloc(void);
+/// initialize a simple motor.
+CP_EXPORT cpSimpleMotor* cpSimpleMotorInit(cpSimpleMotor *joint, cpBody *a, cpBody *b, cpFloat rate);
+/// Allocate and initialize a simple motor.
+CP_EXPORT cpConstraint* cpSimpleMotorNew(cpBody *a, cpBody *b, cpFloat rate);
+
+/// Get the rate of the motor.
+CP_EXPORT cpFloat cpSimpleMotorGetRate(const cpConstraint *constraint);
+/// Set the rate of the motor.
+CP_EXPORT void cpSimpleMotorSetRate(cpConstraint *constraint, cpFloat rate);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSlideJoint.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSlideJoint.h
new file mode 100644
index 0000000..c41f9a4
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSlideJoint.h
@@ -0,0 +1,55 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpSlideJoint cpSlideJoint
+/// @{
+
+/// Check if a constraint is a slide joint.
+CP_EXPORT cpBool cpConstraintIsSlideJoint(const cpConstraint *constraint);
+
+/// Allocate a slide joint.
+CP_EXPORT cpSlideJoint* cpSlideJointAlloc(void);
+/// Initialize a slide joint.
+CP_EXPORT cpSlideJoint* cpSlideJointInit(cpSlideJoint *joint, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat min, cpFloat max);
+/// Allocate and initialize a slide joint.
+CP_EXPORT cpConstraint* cpSlideJointNew(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat min, cpFloat max);
+
+/// Get the location of the first anchor relative to the first body.
+CP_EXPORT cpVect cpSlideJointGetAnchorA(const cpConstraint *constraint);
+/// Set the location of the first anchor relative to the first body.
+CP_EXPORT void cpSlideJointSetAnchorA(cpConstraint *constraint, cpVect anchorA);
+
+/// Get the location of the second anchor relative to the second body.
+CP_EXPORT cpVect cpSlideJointGetAnchorB(const cpConstraint *constraint);
+/// Set the location of the second anchor relative to the second body.
+CP_EXPORT void cpSlideJointSetAnchorB(cpConstraint *constraint, cpVect anchorB);
+
+/// Get the minimum distance the joint will maintain between the two anchors.
+CP_EXPORT cpFloat cpSlideJointGetMin(const cpConstraint *constraint);
+/// Set the minimum distance the joint will maintain between the two anchors.
+CP_EXPORT void cpSlideJointSetMin(cpConstraint *constraint, cpFloat min);
+
+/// Get the maximum distance the joint will maintain between the two anchors.
+CP_EXPORT cpFloat cpSlideJointGetMax(const cpConstraint *constraint);
+/// Set the maximum distance the joint will maintain between the two anchors.
+CP_EXPORT void cpSlideJointSetMax(cpConstraint *constraint, cpFloat max);
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSpace.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSpace.h
new file mode 100644
index 0000000..7bbabb8
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSpace.h
@@ -0,0 +1,319 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/// @defgroup cpSpace cpSpace
+/// @{
+
+//MARK: Definitions
+
+/// Collision begin event function callback type.
+/// Returning false from a begin callback causes the collision to be ignored until
+/// the the separate callback is called when the objects stop colliding.
+typedef cpBool (*cpCollisionBeginFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);
+/// Collision pre-solve event function callback type.
+/// Returning false from a pre-step callback causes the collision to be ignored until the next step.
+typedef cpBool (*cpCollisionPreSolveFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);
+/// Collision post-solve event function callback type.
+typedef void (*cpCollisionPostSolveFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);
+/// Collision separate event function callback type.
+typedef void (*cpCollisionSeparateFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);
+
+/// Struct that holds function callback pointers to configure custom collision handling.
+/// Collision handlers have a pair of types; when a collision occurs between two shapes that have these types, the collision handler functions are triggered.
+struct cpCollisionHandler {
+	/// Collision type identifier of the first shape that this handler recognizes.
+	/// In the collision handler callback, the shape with this type will be the first argument. Read only.
+	const cpCollisionType typeA;
+	/// Collision type identifier of the second shape that this handler recognizes.
+	/// In the collision handler callback, the shape with this type will be the second argument. Read only.
+	const cpCollisionType typeB;
+	/// This function is called when two shapes with types that match this collision handler begin colliding.
+	cpCollisionBeginFunc beginFunc;
+	/// This function is called each step when two shapes with types that match this collision handler are colliding.
+	/// It's called before the collision solver runs so that you can affect a collision's outcome.
+	cpCollisionPreSolveFunc preSolveFunc;
+	/// This function is called each step when two shapes with types that match this collision handler are colliding.
+	/// It's called after the collision solver runs so that you can read back information about the collision to trigger events in your game.
+	cpCollisionPostSolveFunc postSolveFunc;
+	/// This function is called when two shapes with types that match this collision handler stop colliding.
+	cpCollisionSeparateFunc separateFunc;
+	/// This is a user definable context pointer that is passed to all of the collision handler functions.
+	cpDataPointer userData;
+};
+
+// TODO: Make timestep a parameter?
+
+
+//MARK: Memory and Initialization
+
+/// Allocate a cpSpace.
+CP_EXPORT cpSpace* cpSpaceAlloc(void);
+/// Initialize a cpSpace.
+CP_EXPORT cpSpace* cpSpaceInit(cpSpace *space);
+/// Allocate and initialize a cpSpace.
+CP_EXPORT cpSpace* cpSpaceNew(void);
+
+/// Destroy a cpSpace.
+CP_EXPORT void cpSpaceDestroy(cpSpace *space);
+/// Destroy and free a cpSpace.
+CP_EXPORT void cpSpaceFree(cpSpace *space);
+
+
+//MARK: Properties
+
+/// Number of iterations to use in the impulse solver to solve contacts and other constraints.
+CP_EXPORT int cpSpaceGetIterations(const cpSpace *space);
+CP_EXPORT void cpSpaceSetIterations(cpSpace *space, int iterations);
+
+/// Gravity to pass to rigid bodies when integrating velocity.
+CP_EXPORT cpVect cpSpaceGetGravity(const cpSpace *space);
+CP_EXPORT void cpSpaceSetGravity(cpSpace *space, cpVect gravity);
+
+/// Damping rate expressed as the fraction of velocity bodies retain each second.
+/// A value of 0.9 would mean that each body's velocity will drop 10% per second.
+/// The default value is 1.0, meaning no damping is applied.
+/// @note This damping value is different than those of cpDampedSpring and cpDampedRotarySpring.
+CP_EXPORT cpFloat cpSpaceGetDamping(const cpSpace *space);
+CP_EXPORT void cpSpaceSetDamping(cpSpace *space, cpFloat damping);
+
+/// Speed threshold for a body to be considered idle.
+/// The default value of 0 means to let the space guess a good threshold based on gravity.
+CP_EXPORT cpFloat cpSpaceGetIdleSpeedThreshold(const cpSpace *space);
+CP_EXPORT void cpSpaceSetIdleSpeedThreshold(cpSpace *space, cpFloat idleSpeedThreshold);
+
+/// Time a group of bodies must remain idle in order to fall asleep.
+/// Enabling sleeping also implicitly enables the the contact graph.
+/// The default value of INFINITY disables the sleeping algorithm.
+CP_EXPORT cpFloat cpSpaceGetSleepTimeThreshold(const cpSpace *space);
+CP_EXPORT void cpSpaceSetSleepTimeThreshold(cpSpace *space, cpFloat sleepTimeThreshold);
+
+/// Amount of encouraged penetration between colliding shapes.
+/// Used to reduce oscillating contacts and keep the collision cache warm.
+/// Defaults to 0.1. If you have poor simulation quality,
+/// increase this number as much as possible without allowing visible amounts of overlap.
+CP_EXPORT cpFloat cpSpaceGetCollisionSlop(const cpSpace *space);
+CP_EXPORT void cpSpaceSetCollisionSlop(cpSpace *space, cpFloat collisionSlop);
+
+/// Determines how fast overlapping shapes are pushed apart.
+/// Expressed as a fraction of the error remaining after each second.
+/// Defaults to pow(1.0 - 0.1, 60.0) meaning that Chipmunk fixes 10% of overlap each frame at 60Hz.
+CP_EXPORT cpFloat cpSpaceGetCollisionBias(const cpSpace *space);
+CP_EXPORT void cpSpaceSetCollisionBias(cpSpace *space, cpFloat collisionBias);
+
+/// Number of frames that contact information should persist.
+/// Defaults to 3. There is probably never a reason to change this value.
+CP_EXPORT cpTimestamp cpSpaceGetCollisionPersistence(const cpSpace *space);
+CP_EXPORT void cpSpaceSetCollisionPersistence(cpSpace *space, cpTimestamp collisionPersistence);
+
+/// User definable data pointer.
+/// Generally this points to your game's controller or game state
+/// class so you can access it when given a cpSpace reference in a callback.
+CP_EXPORT cpDataPointer cpSpaceGetUserData(const cpSpace *space);
+CP_EXPORT void cpSpaceSetUserData(cpSpace *space, cpDataPointer userData);
+
+/// The Space provided static body for a given cpSpace.
+/// This is merely provided for convenience and you are not required to use it.
+CP_EXPORT cpBody* cpSpaceGetStaticBody(const cpSpace *space);
+
+/// Returns the current (or most recent) time step used with the given space.
+/// Useful from callbacks if your time step is not a compile-time global.
+CP_EXPORT cpFloat cpSpaceGetCurrentTimeStep(const cpSpace *space);
+
+/// returns true from inside a callback when objects cannot be added/removed.
+CP_EXPORT cpBool cpSpaceIsLocked(cpSpace *space);
+
+
+//MARK: Collision Handlers
+
+/// Create or return the existing collision handler that is called for all collisions that are not handled by a more specific collision handler.
+CP_EXPORT cpCollisionHandler *cpSpaceAddDefaultCollisionHandler(cpSpace *space);
+/// Create or return the existing collision handler for the specified pair of collision types.
+/// If wildcard handlers are used with either of the collision types, it's the responibility of the custom handler to invoke the wildcard handlers.
+CP_EXPORT cpCollisionHandler *cpSpaceAddCollisionHandler(cpSpace *space, cpCollisionType a, cpCollisionType b);
+/// Create or return the existing wildcard collision handler for the specified type.
+CP_EXPORT cpCollisionHandler *cpSpaceAddWildcardHandler(cpSpace *space, cpCollisionType type);
+
+
+//MARK: Add/Remove objects
+
+/// Add a collision shape to the simulation.
+/// If the shape is attached to a static body, it will be added as a static shape.
+CP_EXPORT cpShape* cpSpaceAddShape(cpSpace *space, cpShape *shape);
+/// Add a rigid body to the simulation.
+CP_EXPORT cpBody* cpSpaceAddBody(cpSpace *space, cpBody *body);
+/// Add a constraint to the simulation.
+CP_EXPORT cpConstraint* cpSpaceAddConstraint(cpSpace *space, cpConstraint *constraint);
+
+/// Remove a collision shape from the simulation.
+CP_EXPORT void cpSpaceRemoveShape(cpSpace *space, cpShape *shape);
+/// Remove a rigid body from the simulation.
+CP_EXPORT void cpSpaceRemoveBody(cpSpace *space, cpBody *body);
+/// Remove a constraint from the simulation.
+CP_EXPORT void cpSpaceRemoveConstraint(cpSpace *space, cpConstraint *constraint);
+
+/// Test if a collision shape has been added to the space.
+CP_EXPORT cpBool cpSpaceContainsShape(cpSpace *space, cpShape *shape);
+/// Test if a rigid body has been added to the space.
+CP_EXPORT cpBool cpSpaceContainsBody(cpSpace *space, cpBody *body);
+/// Test if a constraint has been added to the space.
+CP_EXPORT cpBool cpSpaceContainsConstraint(cpSpace *space, cpConstraint *constraint);
+
+//MARK: Post-Step Callbacks
+
+/// Post Step callback function type.
+typedef void (*cpPostStepFunc)(cpSpace *space, void *key, void *data);
+/// Schedule a post-step callback to be called when cpSpaceStep() finishes.
+/// You can only register one callback per unique value for @c key.
+/// Returns true only if @c key has never been scheduled before.
+/// It's possible to pass @c NULL for @c func if you only want to mark @c key as being used.
+CP_EXPORT cpBool cpSpaceAddPostStepCallback(cpSpace *space, cpPostStepFunc func, void *key, void *data);
+
+
+//MARK: Queries
+
+// TODO: Queries and iterators should take a cpSpace parametery.
+// TODO: They should also be abortable.
+
+/// Nearest point query callback function type.
+typedef void (*cpSpacePointQueryFunc)(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient, void *data);
+/// Query the space at a point and call @c func for each shape found.
+CP_EXPORT void cpSpacePointQuery(cpSpace *space, cpVect point, cpFloat maxDistance, cpShapeFilter filter, cpSpacePointQueryFunc func, void *data);
+/// Query the space at a point and return the nearest shape found. Returns NULL if no shapes were found.
+CP_EXPORT cpShape *cpSpacePointQueryNearest(cpSpace *space, cpVect point, cpFloat maxDistance, cpShapeFilter filter, cpPointQueryInfo *out);
+
+/// Segment query callback function type.
+typedef void (*cpSpaceSegmentQueryFunc)(cpShape *shape, cpVect point, cpVect normal, cpFloat alpha, void *data);
+/// Perform a directed line segment query (like a raycast) against the space calling @c func for each shape intersected.
+CP_EXPORT void cpSpaceSegmentQuery(cpSpace *space, cpVect start, cpVect end, cpFloat radius, cpShapeFilter filter, cpSpaceSegmentQueryFunc func, void *data);
+/// Perform a directed line segment query (like a raycast) against the space and return the first shape hit. Returns NULL if no shapes were hit.
+CP_EXPORT cpShape *cpSpaceSegmentQueryFirst(cpSpace *space, cpVect start, cpVect end, cpFloat radius, cpShapeFilter filter, cpSegmentQueryInfo *out);
+
+/// Rectangle Query callback function type.
+typedef void (*cpSpaceBBQueryFunc)(cpShape *shape, void *data);
+/// Perform a fast rectangle query on the space calling @c func for each shape found.
+/// Only the shape's bounding boxes are checked for overlap, not their full shape.
+CP_EXPORT void cpSpaceBBQuery(cpSpace *space, cpBB bb, cpShapeFilter filter, cpSpaceBBQueryFunc func, void *data);
+
+/// Shape query callback function type.
+typedef void (*cpSpaceShapeQueryFunc)(cpShape *shape, cpContactPointSet *points, void *data);
+/// Query a space for any shapes overlapping the given shape and call @c func for each shape found.
+CP_EXPORT cpBool cpSpaceShapeQuery(cpSpace *space, cpShape *shape, cpSpaceShapeQueryFunc func, void *data);
+
+
+//MARK: Iteration
+
+/// Space/body iterator callback function type.
+typedef void (*cpSpaceBodyIteratorFunc)(cpBody *body, void *data);
+/// Call @c func for each body in the space.
+CP_EXPORT void cpSpaceEachBody(cpSpace *space, cpSpaceBodyIteratorFunc func, void *data);
+
+/// Space/body iterator callback function type.
+typedef void (*cpSpaceShapeIteratorFunc)(cpShape *shape, void *data);
+/// Call @c func for each shape in the space.
+CP_EXPORT void cpSpaceEachShape(cpSpace *space, cpSpaceShapeIteratorFunc func, void *data);
+
+/// Space/constraint iterator callback function type.
+typedef void (*cpSpaceConstraintIteratorFunc)(cpConstraint *constraint, void *data);
+/// Call @c func for each shape in the space.
+CP_EXPORT void cpSpaceEachConstraint(cpSpace *space, cpSpaceConstraintIteratorFunc func, void *data);
+
+
+//MARK: Indexing
+
+/// Update the collision detection info for the static shapes in the space.
+CP_EXPORT void cpSpaceReindexStatic(cpSpace *space);
+/// Update the collision detection data for a specific shape in the space.
+CP_EXPORT void cpSpaceReindexShape(cpSpace *space, cpShape *shape);
+/// Update the collision detection data for all shapes attached to a body.
+CP_EXPORT void cpSpaceReindexShapesForBody(cpSpace *space, cpBody *body);
+
+/// Switch the space to use a spatial has as it's spatial index.
+CP_EXPORT void cpSpaceUseSpatialHash(cpSpace *space, cpFloat dim, int count);
+
+
+//MARK: Time Stepping
+
+/// Step the space forward in time by @c dt.
+CP_EXPORT void cpSpaceStep(cpSpace *space, cpFloat dt);
+
+
+//MARK: Debug API
+
+#ifndef CP_SPACE_DISABLE_DEBUG_API
+
+/// Color type to use with the space debug drawing API.
+typedef struct cpSpaceDebugColor {
+	float r, g, b, a;
+} cpSpaceDebugColor;
+
+/// Callback type for a function that draws a filled, stroked circle.
+typedef void (*cpSpaceDebugDrawCircleImpl)(cpVect pos, cpFloat angle, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor, cpDataPointer data);
+/// Callback type for a function that draws a line segment.
+typedef void (*cpSpaceDebugDrawSegmentImpl)(cpVect a, cpVect b, cpSpaceDebugColor color, cpDataPointer data);
+/// Callback type for a function that draws a thick line segment.
+typedef void (*cpSpaceDebugDrawFatSegmentImpl)(cpVect a, cpVect b, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor, cpDataPointer data);
+/// Callback type for a function that draws a convex polygon.
+typedef void (*cpSpaceDebugDrawPolygonImpl)(int count, const cpVect *verts, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor, cpDataPointer data);
+/// Callback type for a function that draws a dot.
+typedef void (*cpSpaceDebugDrawDotImpl)(cpFloat size, cpVect pos, cpSpaceDebugColor color, cpDataPointer data);
+/// Callback type for a function that returns a color for a given shape. This gives you an opportunity to color shapes based on how they are used in your engine.
+typedef cpSpaceDebugColor (*cpSpaceDebugDrawColorForShapeImpl)(cpShape *shape, cpDataPointer data);
+
+typedef enum cpSpaceDebugDrawFlags {
+	CP_SPACE_DEBUG_DRAW_SHAPES = 1<<0,
+	CP_SPACE_DEBUG_DRAW_CONSTRAINTS = 1<<1,
+	CP_SPACE_DEBUG_DRAW_COLLISION_POINTS = 1<<2,
+} cpSpaceDebugDrawFlags;
+
+/// Struct used with cpSpaceDebugDraw() containing drawing callbacks and other drawing settings.
+typedef struct cpSpaceDebugDrawOptions {
+	/// Function that will be invoked to draw circles.
+	cpSpaceDebugDrawCircleImpl drawCircle;
+	/// Function that will be invoked to draw line segments.
+	cpSpaceDebugDrawSegmentImpl drawSegment;
+	/// Function that will be invoked to draw thick line segments.
+	cpSpaceDebugDrawFatSegmentImpl drawFatSegment;
+	/// Function that will be invoked to draw convex polygons.
+	cpSpaceDebugDrawPolygonImpl drawPolygon;
+	/// Function that will be invoked to draw dots.
+	cpSpaceDebugDrawDotImpl drawDot;
+	
+	/// Flags that request which things to draw (collision shapes, constraints, contact points).
+	cpSpaceDebugDrawFlags flags;
+	/// Outline color passed to the drawing function.
+	cpSpaceDebugColor shapeOutlineColor;
+	/// Function that decides what fill color to draw shapes using.
+	cpSpaceDebugDrawColorForShapeImpl colorForShape;
+	/// Color passed to drawing functions for constraints.
+	cpSpaceDebugColor constraintColor;
+	/// Color passed to drawing functions for collision points.
+	cpSpaceDebugColor collisionPointColor;
+	
+	/// User defined context pointer passed to all of the callback functions as the 'data' argument.
+	cpDataPointer data;
+} cpSpaceDebugDrawOptions;
+
+/// Debug draw the current state of the space using the supplied drawing options.
+CP_EXPORT void cpSpaceDebugDraw(cpSpace *space, cpSpaceDebugDrawOptions *options);
+
+#endif
+
+/// @}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSpatialIndex.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSpatialIndex.h
new file mode 100644
index 0000000..1f7c68c
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpSpatialIndex.h
@@ -0,0 +1,227 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/**
+	@defgroup cpSpatialIndex cpSpatialIndex
+	
+	Spatial indexes are data structures that are used to accelerate collision detection
+	and spatial queries. Chipmunk provides a number of spatial index algorithms to pick from
+	and they are programmed in a generic way so that you can use them for holding more than
+	just cpShape structs.
+	
+	It works by using @c void pointers to the objects you add and using a callback to ask your code
+	for bounding boxes when it needs them. Several types of queries can be performed an index as well
+	as reindexing and full collision information. All communication to the spatial indexes is performed
+	through callback functions.
+	
+	Spatial indexes should be treated as opaque structs.
+	This meanns you shouldn't be reading any of the struct fields.
+	@{
+*/
+
+//MARK: Spatial Index
+
+/// Spatial index bounding box callback function type.
+/// The spatial index calls this function and passes you a pointer to an object you added
+/// when it needs to get the bounding box associated with that object.
+typedef cpBB (*cpSpatialIndexBBFunc)(void *obj);
+/// Spatial index/object iterator callback function type.
+typedef void (*cpSpatialIndexIteratorFunc)(void *obj, void *data);
+/// Spatial query callback function type.
+typedef cpCollisionID (*cpSpatialIndexQueryFunc)(void *obj1, void *obj2, cpCollisionID id, void *data);
+/// Spatial segment query callback function type.
+typedef cpFloat (*cpSpatialIndexSegmentQueryFunc)(void *obj1, void *obj2, void *data);
+
+
+typedef struct cpSpatialIndexClass cpSpatialIndexClass;
+typedef struct cpSpatialIndex cpSpatialIndex;
+
+/// @private
+struct cpSpatialIndex {
+	cpSpatialIndexClass *klass;
+	
+	cpSpatialIndexBBFunc bbfunc;
+	
+	cpSpatialIndex *staticIndex, *dynamicIndex;
+};
+
+
+//MARK: Spatial Hash
+
+typedef struct cpSpaceHash cpSpaceHash;
+
+/// Allocate a spatial hash.
+CP_EXPORT cpSpaceHash* cpSpaceHashAlloc(void);
+/// Initialize a spatial hash. 
+CP_EXPORT cpSpatialIndex* cpSpaceHashInit(cpSpaceHash *hash, cpFloat celldim, int numcells, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex);
+/// Allocate and initialize a spatial hash.
+CP_EXPORT cpSpatialIndex* cpSpaceHashNew(cpFloat celldim, int cells, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex);
+
+/// Change the cell dimensions and table size of the spatial hash to tune it.
+/// The cell dimensions should roughly match the average size of your objects
+/// and the table size should be ~10 larger than the number of objects inserted.
+/// Some trial and error is required to find the optimum numbers for efficiency.
+CP_EXPORT void cpSpaceHashResize(cpSpaceHash *hash, cpFloat celldim, int numcells);
+
+//MARK: AABB Tree
+
+typedef struct cpBBTree cpBBTree;
+
+/// Allocate a bounding box tree.
+CP_EXPORT cpBBTree* cpBBTreeAlloc(void);
+/// Initialize a bounding box tree.
+CP_EXPORT cpSpatialIndex* cpBBTreeInit(cpBBTree *tree, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex);
+/// Allocate and initialize a bounding box tree.
+CP_EXPORT cpSpatialIndex* cpBBTreeNew(cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex);
+
+/// Perform a static top down optimization of the tree.
+CP_EXPORT void cpBBTreeOptimize(cpSpatialIndex *index);
+
+/// Bounding box tree velocity callback function.
+/// This function should return an estimate for the object's velocity.
+typedef cpVect (*cpBBTreeVelocityFunc)(void *obj);
+/// Set the velocity function for the bounding box tree to enable temporal coherence.
+CP_EXPORT void cpBBTreeSetVelocityFunc(cpSpatialIndex *index, cpBBTreeVelocityFunc func);
+
+//MARK: Single Axis Sweep
+
+typedef struct cpSweep1D cpSweep1D;
+
+/// Allocate a 1D sort and sweep broadphase.
+CP_EXPORT cpSweep1D* cpSweep1DAlloc(void);
+/// Initialize a 1D sort and sweep broadphase.
+CP_EXPORT cpSpatialIndex* cpSweep1DInit(cpSweep1D *sweep, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex);
+/// Allocate and initialize a 1D sort and sweep broadphase.
+CP_EXPORT cpSpatialIndex* cpSweep1DNew(cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex);
+
+//MARK: Spatial Index Implementation
+
+typedef void (*cpSpatialIndexDestroyImpl)(cpSpatialIndex *index);
+
+typedef int (*cpSpatialIndexCountImpl)(cpSpatialIndex *index);
+typedef void (*cpSpatialIndexEachImpl)(cpSpatialIndex *index, cpSpatialIndexIteratorFunc func, void *data);
+
+typedef cpBool (*cpSpatialIndexContainsImpl)(cpSpatialIndex *index, void *obj, cpHashValue hashid);
+typedef void (*cpSpatialIndexInsertImpl)(cpSpatialIndex *index, void *obj, cpHashValue hashid);
+typedef void (*cpSpatialIndexRemoveImpl)(cpSpatialIndex *index, void *obj, cpHashValue hashid);
+
+typedef void (*cpSpatialIndexReindexImpl)(cpSpatialIndex *index);
+typedef void (*cpSpatialIndexReindexObjectImpl)(cpSpatialIndex *index, void *obj, cpHashValue hashid);
+typedef void (*cpSpatialIndexReindexQueryImpl)(cpSpatialIndex *index, cpSpatialIndexQueryFunc func, void *data);
+
+typedef void (*cpSpatialIndexQueryImpl)(cpSpatialIndex *index, void *obj, cpBB bb, cpSpatialIndexQueryFunc func, void *data);
+typedef void (*cpSpatialIndexSegmentQueryImpl)(cpSpatialIndex *index, void *obj, cpVect a, cpVect b, cpFloat t_exit, cpSpatialIndexSegmentQueryFunc func, void *data);
+
+struct cpSpatialIndexClass {
+	cpSpatialIndexDestroyImpl destroy;
+	
+	cpSpatialIndexCountImpl count;
+	cpSpatialIndexEachImpl each;
+	
+	cpSpatialIndexContainsImpl contains;
+	cpSpatialIndexInsertImpl insert;
+	cpSpatialIndexRemoveImpl remove;
+	
+	cpSpatialIndexReindexImpl reindex;
+	cpSpatialIndexReindexObjectImpl reindexObject;
+	cpSpatialIndexReindexQueryImpl reindexQuery;
+	
+	cpSpatialIndexQueryImpl query;
+	cpSpatialIndexSegmentQueryImpl segmentQuery;
+};
+
+/// Destroy and free a spatial index.
+CP_EXPORT void cpSpatialIndexFree(cpSpatialIndex *index);
+/// Collide the objects in @c dynamicIndex against the objects in @c staticIndex using the query callback function.
+CP_EXPORT void cpSpatialIndexCollideStatic(cpSpatialIndex *dynamicIndex, cpSpatialIndex *staticIndex, cpSpatialIndexQueryFunc func, void *data);
+
+/// Destroy a spatial index.
+static inline void cpSpatialIndexDestroy(cpSpatialIndex *index)
+{
+	if(index->klass) index->klass->destroy(index);
+}
+
+/// Get the number of objects in the spatial index.
+static inline int cpSpatialIndexCount(cpSpatialIndex *index)
+{
+	return index->klass->count(index);
+}
+
+/// Iterate the objects in the spatial index. @c func will be called once for each object.
+static inline void cpSpatialIndexEach(cpSpatialIndex *index, cpSpatialIndexIteratorFunc func, void *data)
+{
+	index->klass->each(index, func, data);
+}
+
+/// Returns true if the spatial index contains the given object.
+/// Most spatial indexes use hashed storage, so you must provide a hash value too.
+static inline cpBool cpSpatialIndexContains(cpSpatialIndex *index, void *obj, cpHashValue hashid)
+{
+	return index->klass->contains(index, obj, hashid);
+}
+
+/// Add an object to a spatial index.
+/// Most spatial indexes use hashed storage, so you must provide a hash value too.
+static inline void cpSpatialIndexInsert(cpSpatialIndex *index, void *obj, cpHashValue hashid)
+{
+	index->klass->insert(index, obj, hashid);
+}
+
+/// Remove an object from a spatial index.
+/// Most spatial indexes use hashed storage, so you must provide a hash value too.
+static inline void cpSpatialIndexRemove(cpSpatialIndex *index, void *obj, cpHashValue hashid)
+{
+	index->klass->remove(index, obj, hashid);
+}
+
+/// Perform a full reindex of a spatial index.
+static inline void cpSpatialIndexReindex(cpSpatialIndex *index)
+{
+	index->klass->reindex(index);
+}
+
+/// Reindex a single object in the spatial index.
+static inline void cpSpatialIndexReindexObject(cpSpatialIndex *index, void *obj, cpHashValue hashid)
+{
+	index->klass->reindexObject(index, obj, hashid);
+}
+
+/// Perform a rectangle query against the spatial index, calling @c func for each potential match.
+static inline void cpSpatialIndexQuery(cpSpatialIndex *index, void *obj, cpBB bb, cpSpatialIndexQueryFunc func, void *data)
+{
+	index->klass->query(index, obj, bb, func, data);
+}
+
+/// Perform a segment query against the spatial index, calling @c func for each potential match.
+static inline void cpSpatialIndexSegmentQuery(cpSpatialIndex *index, void *obj, cpVect a, cpVect b, cpFloat t_exit, cpSpatialIndexSegmentQueryFunc func, void *data)
+{
+	index->klass->segmentQuery(index, obj, a, b, t_exit, func, data);
+}
+
+/// Simultaneously reindex and find all colliding objects.
+/// @c func will be called once for each potentially overlapping pair of objects found.
+/// If the spatial index was initialized with a static index, it will collide it's objects against that as well.
+static inline void cpSpatialIndexReindexQuery(cpSpatialIndex *index, cpSpatialIndexQueryFunc func, void *data)
+{
+	index->klass->reindexQuery(index, func, data);
+}
+
+///@}
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpTransform.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpTransform.h
new file mode 100644
index 0000000..4a6256b
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpTransform.h
@@ -0,0 +1,198 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#ifndef CHIPMUNK_TRANSFORM_H
+#define CHIPMUNK_TRANSFORM_H
+
+#include "chipmunk_types.h"
+#include "cpVect.h"
+#include "cpBB.h"
+
+/// Identity transform matrix.
+static const cpTransform cpTransformIdentity = {1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f};
+
+/// Construct a new transform matrix.
+/// (a, b) is the x basis vector.
+/// (c, d) is the y basis vector.
+/// (tx, ty) is the translation.
+static inline cpTransform
+cpTransformNew(cpFloat a, cpFloat b, cpFloat c, cpFloat d, cpFloat tx, cpFloat ty)
+{
+	cpTransform t = {a, b, c, d, tx, ty};
+	return t;
+}
+
+/// Construct a new transform matrix in transposed order.
+static inline cpTransform
+cpTransformNewTranspose(cpFloat a, cpFloat c, cpFloat tx, cpFloat b, cpFloat d, cpFloat ty)
+{
+	cpTransform t = {a, b, c, d, tx, ty};
+	return t;
+}
+
+/// Get the inverse of a transform matrix.
+static inline cpTransform
+cpTransformInverse(cpTransform t)
+{
+  cpFloat inv_det = 1.0/(t.a*t.d - t.c*t.b);
+  return cpTransformNewTranspose(
+     t.d*inv_det, -t.c*inv_det, (t.c*t.ty - t.tx*t.d)*inv_det,
+    -t.b*inv_det,  t.a*inv_det, (t.tx*t.b - t.a*t.ty)*inv_det
+  );
+}
+
+/// Multiply two transformation matrices.
+static inline cpTransform
+cpTransformMult(cpTransform t1, cpTransform t2)
+{
+  return cpTransformNewTranspose(
+    t1.a*t2.a + t1.c*t2.b, t1.a*t2.c + t1.c*t2.d, t1.a*t2.tx + t1.c*t2.ty + t1.tx,
+    t1.b*t2.a + t1.d*t2.b, t1.b*t2.c + t1.d*t2.d, t1.b*t2.tx + t1.d*t2.ty + t1.ty
+  );
+}
+
+/// Transform an absolute point. (i.e. a vertex)
+static inline cpVect
+cpTransformPoint(cpTransform t, cpVect p)
+{
+  return cpv(t.a*p.x + t.c*p.y + t.tx, t.b*p.x + t.d*p.y + t.ty);
+}
+
+/// Transform a vector (i.e. a normal)
+static inline cpVect
+cpTransformVect(cpTransform t, cpVect v)
+{
+  return cpv(t.a*v.x + t.c*v.y, t.b*v.x + t.d*v.y);
+}
+
+/// Transform a cpBB.
+static inline cpBB
+cpTransformbBB(cpTransform t, cpBB bb)
+{
+	cpVect center = cpBBCenter(bb);
+	cpFloat hw = (bb.r - bb.l)*0.5;
+	cpFloat hh = (bb.t - bb.b)*0.5;
+	
+	cpFloat a = t.a*hw, b = t.c*hh, d = t.b*hw, e = t.d*hh;
+	cpFloat hw_max = cpfmax(cpfabs(a + b), cpfabs(a - b));
+	cpFloat hh_max = cpfmax(cpfabs(d + e), cpfabs(d - e));
+	return cpBBNewForExtents(cpTransformPoint(t, center), hw_max, hh_max);
+}
+
+/// Create a transation matrix.
+static inline cpTransform
+cpTransformTranslate(cpVect translate)
+{
+  return cpTransformNewTranspose(
+    1.0, 0.0, translate.x,
+    0.0, 1.0, translate.y
+  );
+}
+
+/// Create a scale matrix.
+static inline cpTransform
+cpTransformScale(cpFloat scaleX, cpFloat scaleY)
+{
+	return cpTransformNewTranspose(
+		scaleX,    0.0, 0.0,
+		   0.0, scaleY, 0.0
+	);
+}
+
+/// Create a rotation matrix.
+static inline cpTransform
+cpTransformRotate(cpFloat radians)
+{
+	cpVect rot = cpvforangle(radians);
+	return cpTransformNewTranspose(
+		rot.x, -rot.y, 0.0,
+		rot.y,  rot.x, 0.0
+	);
+}
+
+/// Create a rigid transformation matrix. (transation + rotation)
+static inline cpTransform
+cpTransformRigid(cpVect translate, cpFloat radians)
+{
+	cpVect rot = cpvforangle(radians);
+	return cpTransformNewTranspose(
+		rot.x, -rot.y, translate.x,
+		rot.y,  rot.x, translate.y
+	);
+}
+
+/// Fast inverse of a rigid transformation matrix.
+static inline cpTransform
+cpTransformRigidInverse(cpTransform t)
+{
+  return cpTransformNewTranspose(
+     t.d, -t.c, (t.c*t.ty - t.tx*t.d),
+    -t.b,  t.a, (t.tx*t.b - t.a*t.ty)
+  );
+}
+
+//MARK: Miscellaneous (but useful) transformation matrices.
+// See source for documentation...
+
+static inline cpTransform
+cpTransformWrap(cpTransform outer, cpTransform inner)
+{
+  return cpTransformMult(cpTransformInverse(outer), cpTransformMult(inner, outer));
+}
+
+static inline cpTransform
+cpTransformWrapInverse(cpTransform outer, cpTransform inner)
+{
+  return cpTransformMult(outer, cpTransformMult(inner, cpTransformInverse(outer)));
+}
+
+static inline cpTransform
+cpTransformOrtho(cpBB bb)
+{
+  return cpTransformNewTranspose(
+    2.0/(bb.r - bb.l), 0.0, -(bb.r + bb.l)/(bb.r - bb.l),
+    0.0, 2.0/(bb.t - bb.b), -(bb.t + bb.b)/(bb.t - bb.b)
+  );
+}
+
+static inline cpTransform
+cpTransformBoneScale(cpVect v0, cpVect v1)
+{
+  cpVect d = cpvsub(v1, v0); 
+  return cpTransformNewTranspose(
+    d.x, -d.y, v0.x,
+    d.y,  d.x, v0.y
+  );
+}
+
+static inline cpTransform
+cpTransformAxialScale(cpVect axis, cpVect pivot, cpFloat scale)
+{
+  cpFloat A = axis.x*axis.y*(scale - 1.0);
+  cpFloat B = cpvdot(axis, pivot)*(1.0 - scale);
+  
+  return cpTransformNewTranspose(
+    scale*axis.x*axis.x + axis.y*axis.y, A, axis.x*B,
+    A, axis.x*axis.x + scale*axis.y*axis.y, axis.y*B
+  );
+}
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/include/chipmunk/cpVect.h b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpVect.h
new file mode 100644
index 0000000..8ec02bd
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/include/chipmunk/cpVect.h
@@ -0,0 +1,230 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#ifndef CHIPMUNK_VECT_H
+#define CHIPMUNK_VECT_H
+
+#include "chipmunk_types.h"
+
+/// @defgroup cpVect cpVect
+/// Chipmunk's 2D vector type along with a handy 2D vector math lib.
+/// @{
+
+/// Constant for the zero vector.
+static const cpVect cpvzero = {0.0f,0.0f};
+
+/// Convenience constructor for cpVect structs.
+static inline cpVect cpv(const cpFloat x, const cpFloat y)
+{
+	cpVect v = {x, y};
+	return v;
+}
+
+/// Check if two vectors are equal. (Be careful when comparing floating point numbers!)
+static inline cpBool cpveql(const cpVect v1, const cpVect v2)
+{
+	return (v1.x == v2.x && v1.y == v2.y);
+}
+
+/// Add two vectors
+static inline cpVect cpvadd(const cpVect v1, const cpVect v2)
+{
+	return cpv(v1.x + v2.x, v1.y + v2.y);
+}
+
+/// Subtract two vectors.
+static inline cpVect cpvsub(const cpVect v1, const cpVect v2)
+{
+	return cpv(v1.x - v2.x, v1.y - v2.y);
+}
+
+/// Negate a vector.
+static inline cpVect cpvneg(const cpVect v)
+{
+	return cpv(-v.x, -v.y);
+}
+
+/// Scalar multiplication.
+static inline cpVect cpvmult(const cpVect v, const cpFloat s)
+{
+	return cpv(v.x*s, v.y*s);
+}
+
+/// Vector dot product.
+static inline cpFloat cpvdot(const cpVect v1, const cpVect v2)
+{
+	return v1.x*v2.x + v1.y*v2.y;
+}
+
+/// 2D vector cross product analog.
+/// The cross product of 2D vectors results in a 3D vector with only a z component.
+/// This function returns the magnitude of the z value.
+static inline cpFloat cpvcross(const cpVect v1, const cpVect v2)
+{
+	return v1.x*v2.y - v1.y*v2.x;
+}
+
+/// Returns a perpendicular vector. (90 degree rotation)
+static inline cpVect cpvperp(const cpVect v)
+{
+	return cpv(-v.y, v.x);
+}
+
+/// Returns a perpendicular vector. (-90 degree rotation)
+static inline cpVect cpvrperp(const cpVect v)
+{
+	return cpv(v.y, -v.x);
+}
+
+/// Returns the vector projection of v1 onto v2.
+static inline cpVect cpvproject(const cpVect v1, const cpVect v2)
+{
+	return cpvmult(v2, cpvdot(v1, v2)/cpvdot(v2, v2));
+}
+
+/// Returns the unit length vector for the given angle (in radians).
+static inline cpVect cpvforangle(const cpFloat a)
+{
+	return cpv(cpfcos(a), cpfsin(a));
+}
+
+/// Returns the angular direction v is pointing in (in radians).
+static inline cpFloat cpvtoangle(const cpVect v)
+{
+	return cpfatan2(v.y, v.x);
+}
+
+/// Uses complex number multiplication to rotate v1 by v2. Scaling will occur if v1 is not a unit vector.
+static inline cpVect cpvrotate(const cpVect v1, const cpVect v2)
+{
+	return cpv(v1.x*v2.x - v1.y*v2.y, v1.x*v2.y + v1.y*v2.x);
+}
+
+/// Inverse of cpvrotate().
+static inline cpVect cpvunrotate(const cpVect v1, const cpVect v2)
+{
+	return cpv(v1.x*v2.x + v1.y*v2.y, v1.y*v2.x - v1.x*v2.y);
+}
+
+/// Returns the squared length of v. Faster than cpvlength() when you only need to compare lengths.
+static inline cpFloat cpvlengthsq(const cpVect v)
+{
+	return cpvdot(v, v);
+}
+
+/// Returns the length of v.
+static inline cpFloat cpvlength(const cpVect v)
+{
+	return cpfsqrt(cpvdot(v, v));
+}
+
+/// Linearly interpolate between v1 and v2.
+static inline cpVect cpvlerp(const cpVect v1, const cpVect v2, const cpFloat t)
+{
+	return cpvadd(cpvmult(v1, 1.0f - t), cpvmult(v2, t));
+}
+
+/// Returns a normalized copy of v.
+static inline cpVect cpvnormalize(const cpVect v)
+{
+	// Neat trick I saw somewhere to avoid div/0.
+	return cpvmult(v, 1.0f/(cpvlength(v) + CPFLOAT_MIN));
+}
+
+/// Spherical linearly interpolate between v1 and v2.
+static inline cpVect
+cpvslerp(const cpVect v1, const cpVect v2, const cpFloat t)
+{
+	cpFloat dot = cpvdot(cpvnormalize(v1), cpvnormalize(v2));
+	cpFloat omega = cpfacos(cpfclamp(dot, -1.0f, 1.0f));
+	
+	if(omega < 1e-3){
+		// If the angle between two vectors is very small, lerp instead to avoid precision issues.
+		return cpvlerp(v1, v2, t);
+	} else {
+		cpFloat denom = 1.0f/cpfsin(omega);
+		return cpvadd(cpvmult(v1, cpfsin((1.0f - t)*omega)*denom), cpvmult(v2, cpfsin(t*omega)*denom));
+	}
+}
+
+/// Spherical linearly interpolate between v1 towards v2 by no more than angle a radians
+static inline cpVect
+cpvslerpconst(const cpVect v1, const cpVect v2, const cpFloat a)
+{
+	cpFloat dot = cpvdot(cpvnormalize(v1), cpvnormalize(v2));
+	cpFloat omega = cpfacos(cpfclamp(dot, -1.0f, 1.0f));
+	
+	return cpvslerp(v1, v2, cpfmin(a, omega)/omega);
+}
+
+/// Clamp v to length len.
+static inline cpVect cpvclamp(const cpVect v, const cpFloat len)
+{
+	return (cpvdot(v,v) > len*len) ? cpvmult(cpvnormalize(v), len) : v;
+}
+
+/// Linearly interpolate between v1 towards v2 by distance d.
+static inline cpVect cpvlerpconst(cpVect v1, cpVect v2, cpFloat d)
+{
+	return cpvadd(v1, cpvclamp(cpvsub(v2, v1), d));
+}
+
+/// Returns the distance between v1 and v2.
+static inline cpFloat cpvdist(const cpVect v1, const cpVect v2)
+{
+	return cpvlength(cpvsub(v1, v2));
+}
+
+/// Returns the squared distance between v1 and v2. Faster than cpvdist() when you only need to compare distances.
+static inline cpFloat cpvdistsq(const cpVect v1, const cpVect v2)
+{
+	return cpvlengthsq(cpvsub(v1, v2));
+}
+
+/// Returns true if the distance between v1 and v2 is less than dist.
+static inline cpBool cpvnear(const cpVect v1, const cpVect v2, const cpFloat dist)
+{
+	return cpvdistsq(v1, v2) < dist*dist;
+}
+
+/// @}
+
+/// @defgroup cpMat2x2 cpMat2x2
+/// 2x2 matrix type used for tensors and such.
+/// @{
+
+// NUKE
+static inline cpMat2x2
+cpMat2x2New(cpFloat a, cpFloat b, cpFloat c, cpFloat d)
+{
+	cpMat2x2 m = {a, b, c, d};
+	return m;
+}
+
+static inline cpVect
+cpMat2x2Transform(cpMat2x2 m, cpVect v)
+{
+	return cpv(v.x*m.a + v.y*m.b, v.x*m.c + v.y*m.d);
+}
+
+///@}
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkAutoGeometry.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkAutoGeometry.h
new file mode 100644
index 0000000..0a5c683
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkAutoGeometry.h
@@ -0,0 +1,136 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+
+#import "chipmunk/cpMarch.h"
+#import "chipmunk/cpPolyline.h"
+
+@class ChipmunkPolylineSet;
+
+/// Wrapper for the cpPolyline type.
+@interface ChipmunkPolyline : NSObject {
+@private
+	cpPolyline *_line;
+	cpFloat _area;
+}
+
+-(id)initWithPolyline:(cpPolyline *)line;
++(ChipmunkPolyline *)fromPolyline:(cpPolyline *)line;
+
+/// Returns true if the first and last vertex are equal.
+@property(nonatomic, readonly) bool isClosed;
+
+/// Returns the signed area of the polyline calculated by cpAreaForPoly.
+/// Non-closed polylines return an area of 0.
+@property(nonatomic, readonly) cpFloat area;
+
+/// Centroid of the polyline calculated by cpCentroidForPoly.
+/// It is an error to call this on a non-closed polyline.
+@property(nonatomic, readonly) cpVect centroid;
+
+/// Calculates the moment of inertia for a closed polyline with the given mass and offset.
+-(cpFloat)momentForMass:(cpFloat)mass offset:(cpVect)offset;
+
+
+/// Vertex count.
+@property(nonatomic, readonly) NSUInteger count;
+
+/// Array of vertexes.
+@property(nonatomic, readonly) const cpVect *verts;
+
+/**
+	Returns a copy of a polyline simplified by using the Douglas-Peucker algorithm.
+	This works very well on smooth or gently curved shapes, but not well on straight edged or angular shapes.
+*/
+-(ChipmunkPolyline *)simplifyCurves:(cpFloat)tolerance;
+
+/**
+	Returns a copy of a polyline simplified by discarding "flat" vertexes.
+	This works well on straigt edged or angular shapes, not as well on smooth shapes.
+*/
+-(ChipmunkPolyline *)simplifyVertexes:(cpFloat)tolerance;
+
+/// Generate a convex hull that contains a polyline. (closed or not)
+-(ChipmunkPolyline *)toConvexHull;
+
+/// Generate an approximate convex hull that contains a polyline. (closed or not)
+-(ChipmunkPolyline *)toConvexHull:(cpFloat)tolerance;
+
+/// Generate a set of convex hulls for a polyline.
+/// See the note on cpPolylineConvexDecomposition_BETA() for more information.
+-(ChipmunkPolylineSet *)toConvexHulls_BETA:(cpFloat)tolerance;
+
+/// Create an array of segments for each segment in this polyline.
+-(NSArray *)asChipmunkSegmentsWithBody:(ChipmunkBody *)body radius:(cpFloat)radius offset:(cpVect)offset;
+
+/// Create a ChipmunkPolyShape from this polyline. (Must be convex!)
+-(ChipmunkPolyShape *)asChipmunkPolyShapeWithBody:(ChipmunkBody *)body transform:(cpTransform)transform radius:(cpFloat)radius;
+
+@end
+
+
+/// Wrapper for the cpPolylineSet type.
+@interface ChipmunkPolylineSet : NSObject<NSFastEnumeration> {
+@private
+	NSMutableArray *_lines;
+}
+
+-(id)initWithPolylineSet:(cpPolylineSet *)set;
++(ChipmunkPolylineSet *)fromPolylineSet:(cpPolylineSet *)set;
+
+@property(nonatomic, readonly) NSUInteger count;
+
+-(ChipmunkPolyline *)lineAtIndex:(NSUInteger)index;
+
+@end
+
+
+/**
+	A sampler is an object that provides a basis function to build shapes from.
+	This can be from a block of pixel data (loaded from a file, or dumped from the screen), or even a mathematical function such as Perlin noise.
+*/
+@interface ChipmunkAbstractSampler : NSObject {
+@protected
+	cpFloat _marchThreshold;
+	cpMarchSampleFunc _sampleFunc;
+}
+
+/// The threshold passed to the cpMarch*() functions.
+/// The value of the contour you want to extract.
+@property(nonatomic, assign) cpFloat marchThreshold;
+
+/// Get the primitive cpMarchSampleFunc used by this sampler.
+@property(nonatomic, readonly) cpMarchSampleFunc sampleFunc;
+
+/// Designated initializer.
+-(id)initWithSamplingFunction:(cpMarchSampleFunc)sampleFunc;
+
+/// Sample at a specific point.
+-(cpFloat)sample:(cpVect)pos;
+
+/// March a certain area of the sampler.
+-(ChipmunkPolylineSet *)march:(cpBB)bb xSamples:(NSUInteger)xSamples ySamples:(NSUInteger)ySamples hard:(bool)hard;
+
+@end
+
+
+
+/// A simple sampler type that wraps a block as it's sampling function.
+typedef cpFloat (^ChipmunkMarchSampleBlock)(cpVect point);
+
+@interface ChipmunkBlockSampler : ChipmunkAbstractSampler {
+	ChipmunkMarchSampleBlock _block;
+}
+
+/// Initializes the sampler using a copy of the passed block.
+-(id)initWithBlock:(ChipmunkMarchSampleBlock)block;
++(ChipmunkBlockSampler *)samplerWithBlock:(ChipmunkMarchSampleBlock)block;
+
+@end
+
+
+
+#import "ChipmunkImageSampler.h"
+#import "ChipmunkPointCloudSampler.h"
+#import "ChipmunkTileCache.h"
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkBody.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkBody.h
new file mode 100644
index 0000000..2427b9b
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkBody.h
@@ -0,0 +1,192 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+@class ChipmunkShape;
+@class ChipmunkConstraint;
+
+/**
+	Rigid bodies are the basic unit of simulation in Chipmunk.
+	They hold the physical properties of an object (mass, position, rotation, velocity, etc.). After creating a ChipmunkBody object, you can attach collision shapes (ChipmunkShape) and joints (ChipmunkConstraint) to it.
+*/
+@interface ChipmunkBody : NSObject <ChipmunkBaseObject>
+
+/// Get the ChipmunkBody object associciated with a cpBody pointer.
+/// Undefined if the cpBody wasn't created using Objective-Chipmunk.
++(ChipmunkBody *)bodyFromCPBody:(cpBody *)body;
+
+/**
+  Create an autoreleased rigid body with the given mass and moment.
+  Guessing the moment of inertia is usually a bad idea. Use the moment estimation functions (cpMomentFor*()).
+*/
++ (id)bodyWithMass:(cpFloat)mass andMoment:(cpFloat)moment;
+
+/**
+  Create an autoreleased static body.
+*/
++ (id)staticBody;
+
+/**
+  Create an autoreleased kinematic body.
+*/
++ (id)kinematicBody;
+
+/**
+  Initialize a rigid body with the given mass and moment of inertia.
+  Guessing the moment of inertia is usually a bad idea. Use the moment estimation functions (cpMomentFor*()).
+*/
+- (id)initWithMass:(cpFloat)mass andMoment:(cpFloat)moment;
+
+/// Type of the body (dynamic, kinematic, static).
+@property(nonatomic, assign) cpBodyType type;
+
+/// Mass of the rigid body. Mass does not have to be expressed in any particular units, but relative masses should be consistent.
+@property(nonatomic, assign) cpFloat mass;
+
+/// Moment of inertia of the body. The mass tells you how hard it is to push an object, the MoI tells you how hard it is to spin the object. Don't try to guess the MoI, use the cpMomentFor*() functions to try and estimate it.
+@property(nonatomic, assign) cpFloat moment;
+
+/// Location of the body's center of gravity relative to it's position. Defaults to @c cpvzero.
+@property(nonatomic, assign) cpVect centerOfGravity;
+
+/// The position of the rigid body's center of gravity.
+@property(nonatomic, assign) cpVect position;
+
+/// The linear velocity of the rigid body.
+@property(nonatomic, assign) cpVect velocity;
+
+/// The linear force applied to the rigid body. Unlike in some physics engines, the force does not reset itself during each step. Make sure that you are reseting the force between frames if that is what you intended.
+@property(nonatomic, assign) cpVect force;
+
+/// The rotation angle of the rigid body in radians.
+@property(nonatomic, assign) cpFloat angle;
+
+/// The angular velocity of the rigid body in radians per second.
+@property(nonatomic, assign) cpFloat angularVelocity;
+
+/// The torque being applied to the rigid body. Like force, this property is not reset every frame.
+@property(nonatomic, assign) cpFloat torque;
+
+/// The rigid transform of the body.
+@property(nonatomic, readonly) cpTransform transform;
+
+/// Returns a pointer to the underlying cpBody C struct.
+@property(nonatomic, readonly) cpBody *body;
+
+/**
+	An object that this constraint is associated with. You can use this get a reference to your game object or controller object from within callbacks.
+	@attention Like most @c delegate properties this is a weak reference and does not call @c retain. This prevents reference cycles from occuring.
+*/
+@property(nonatomic, assign) id userData;
+
+/// Has the body been put to sleep by the space?
+@property(nonatomic, readonly) bool isSleeping;
+
+/// Get the kinetic energy of this body.
+@property(nonatomic, readonly) cpFloat kineticEnergy;
+
+/// Get the space the body is added to.
+@property(nonatomic, readonly) ChipmunkSpace *space;
+
+/**
+  Convert from body local to world coordinates.
+  Convert a point in world (absolute) coordinates to body local coordinates affected by the position and rotation of the rigid body.
+*/
+- (cpVect)localToWorld:(cpVect)v;
+
+/**
+  Convert from world to body local Coordinates.
+  Convert a point in body local coordinates coordinates to world (absolute) coordinates.
+*/
+- (cpVect)worldToLocal:(cpVect)v;
+
+/**
+	Get the velocity of a point on a body.
+	Get the world (absolute) velocity of a point on a rigid body specified in body local coordinates.
+*/
+- (cpVect)velocityAtLocalPoint:(cpVect)p;
+
+/**
+	Get the velocity of a point on a body.
+	Get the world (absolute) velocity of a point on a rigid body specified in world coordinates.
+*/
+- (cpVect)velocityAtWorldPoint:(cpVect)p;
+
+/**
+  Apply a force to a rigid body. An offset of cpvzero is equivalent to adding directly to the force property.
+  @param force A force in expressed in absolute (word) coordinates.
+	@param offset An offset expressed in world coordinates. Note that it is still an offset, meaning that it's position is relative, but the rotation is not.
+*/
+- (void)applyForce:(cpVect)force atLocalPoint:(cpVect)point;
+- (void)applyForce:(cpVect)force atWorldPoint:(cpVect)point;
+
+/**
+  Apply an impulse to a rigid body.
+  @param impulse An impulse in expressed in absolute (word) coordinates.
+	@param offset An offset expressed in world coordinates. Note that it is still an offset, meaning that it's position is relative, but the rotation is not.
+*/
+- (void)applyImpulse:(cpVect)impulse atLocalPoint:(cpVect)point;
+- (void)applyImpulse:(cpVect)impulse atWorldPoint:(cpVect)point;
+
+/// Wake up the body if it's sleeping, or reset the idle timer if it's active.
+- (void)activate;
+
+/// Wake up any bodies touching a static body through shape @c filter Pass @c nil for @c filter to away all touching bodies.
+- (void)activateStatic:(ChipmunkShape *)filter;
+
+/**
+	Force the body to sleep immediately. The body will be added to the same group as @c group. When any object in a group is woken up, all of the bodies are woken up with it.
+	If @c group is nil, then a new group is created and the body is added to it. It is an error pass a non-sleeping body as @c group.
+	This is useful if you want an object to be inactive until something hits it such as a pile of boxes you want the player to plow through or a stalactite hanging from a cave ceiling.
+	Make sure the body is fully set up before you call this. Adding this body or any shapes or constraints attached to it to a space, or modifying any of their properties automatically wake a body up.
+*/
+- (void)sleepWithGroup:(ChipmunkBody *)group;
+
+/**
+	Equivalent to [ChipmunkBody sleepWithGroup:nil]. That is the object is forced to sleep immediately, but is not grouped with any other sleeping bodies.
+*/
+- (void)sleep;
+
+/// Get a list of shapes that are attached to this body and currently added to a space.
+- (NSArray *)shapes;
+
+/// Get a list of constraints that are attached to this body and currently added to a space.
+- (NSArray *)constraints;
+
+/// Body/arbiter iterator callback block type.
+typedef void (^ChipmunkBodyArbiterIteratorBlock)(cpArbiter *arbiter);
+
+/// Call @c block once for each arbiter that is currently active on the body.
+- (void)eachArbiter:(ChipmunkBodyArbiterIteratorBlock)block;
+
+/// Implements the ChipmunkBaseObject protocol, not particularly useful outside of the library code
+- (void)addToSpace:(ChipmunkSpace *)space;
+/// Implements the ChipmunkBaseObject protocol, not particularly useful outside of the library code
+- (void)removeFromSpace:(ChipmunkSpace *)space;
+
+/// Override this to change the way that the body's velocity is integrated.
+/// You should either understand how the cpBodyUpdateVelocity() function works, or use the super method.
+-(void)updateVelocity:(cpFloat)dt gravity:(cpVect)gravity damping:(cpFloat)damping;
+
+/// OVerride this to change the way that the body's position is intgrated.
+/// You should either understand how the cpBodyUpdatePosition() function works, or use the super method.
+-(void)updatePosition:(cpFloat)dt;
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkConstraint.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkConstraint.h
new file mode 100644
index 0000000..d72af0f
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkConstraint.h
@@ -0,0 +1,405 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+/**
+	Constraints connect two ChipmunkBody objects together. Most often constraints are simple joints, but can also be things like motors, friction generators or servos.
+	
+	@htmlonly
+	<object width="425" height="344">
+		<param name="movie" value="http://www.youtube.com/v/ZgJJZTS0aMM?fs=1&amp;hl=en_US&amp;rel=0"></param>
+		<param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
+		<embed src="http://www.youtube.com/v/ZgJJZTS0aMM?fs=1&amp;hl=en_US&amp;rel=0" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="425" height="344"></embed>
+	</object>
+	@endhtmlonly
+*/
+@interface ChipmunkConstraint : NSObject <ChipmunkBaseObject> {
+@private
+	id _userData;
+}
+
+/// Returns a pointer to the underlying cpConstraint C struct.
+@property(nonatomic, readonly) cpConstraint *constraint;
+
+/// The first ChipmunkBody the constraint controls.
+@property(nonatomic, readonly) ChipmunkBody *bodyA;
+
+/// The second ChipmunkBody the constraint controls.
+@property(nonatomic, readonly) ChipmunkBody *bodyB;
+
+/// Get the ChipmunkConstraint object associciated with a cpConstraint pointer.
+/// Undefined if the cpConstraint wasn't created using Objective-Chipmunk.
++(ChipmunkConstraint *)constraintFromCPConstraint:(cpConstraint *)constraint;
+
+/**
+	Maximum force this constraint is allowed to use (defalts to infinity).
+	This allows joints to be pulled apart if too much force is applied to them.
+	It also allows you to use constraints as force or friction generators for controlling bodies.
+*/
+@property(nonatomic, assign) cpFloat maxForce;
+
+/**
+	The rate at which joint error is corrected.
+	Defaults to pow(1.0 - 0.1, 60.0) meaning that it will correct 10% of the error every 1/60th of a second.
+*/
+@property(nonatomic, assign) cpFloat errorBias;
+
+/**
+	Maximum rate (speed) that a joint can be corrected at (defaults to infinity).
+	Setting this value to a finite value allows you to control a joint like a servo motor.
+*/
+@property(nonatomic, assign) cpFloat maxBias;
+
+/**
+	Whether or not the connected bodies should checked for collisions.
+	Collisions are filtered before calling callbacks.
+	Defaults to TRUE.
+*/
+@property(nonatomic, assign) BOOL collideBodies;
+
+/// Get the most recent impulse applied by this constraint.
+@property(nonatomic, readonly) cpFloat impulse;
+
+/// Get the space the body is added to.
+@property(nonatomic, readonly) ChipmunkSpace *space;
+
+/**
+	An object that this constraint is associated with. You can use this get a reference to your game object or controller object from within callbacks.
+	@attention Like most @c delegate properties this is a weak reference and does not call @c retain. This prevents reference cycles from occuring.
+*/
+@property(nonatomic, assign) id userData;
+
+/// Override this method to update a constraints parameters just before running the physics each step.
+-(void)preSolve:(ChipmunkSpace *)space;
+
+/// Override this method to poll values from a constraint each frame after the physics runs.
+/// This can be used to implement breakable joints for instance.
+-(void)postSolve:(ChipmunkSpace *)space;
+
+@end
+
+
+/**
+	Pin joints hold a set distance between points on two bodies.
+	Think of them as connecting a solid pin or rod between the two anchor points.
+*/
+@interface ChipmunkPinJoint : ChipmunkConstraint
+
+/**
+	Create an autoreleased pin joint between the two bodies with the given anchor points.
+	The distance is calculated when the joint is initialized. It can be set explicitly using the property.
+*/
++ (ChipmunkPinJoint *)pinJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB;
+
+/**
+	Initialize a pin joint between the two bodies with the given anchor points.
+	The distance is calculated when the joint is initialized. It can be set explicitly using the property.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB;
+
+/// The anchor point on the first body.
+@property(nonatomic, assign) cpVect anchorA;
+
+/// The anchor point on the second body.
+@property(nonatomic, assign) cpVect anchorB;
+
+/// The distance between the two anchor points that the joint keeps.
+@property(nonatomic, assign) cpFloat dist;
+
+@end
+
+
+/**
+	Slide joints hold the distance between points on two bodies between a minimum and a maximum.
+	Think of them as a telescoping ChipmunkPinJoint.
+*/
+@interface ChipmunkSlideJoint : ChipmunkConstraint
+
+/**
+	Create an autoreleased slide joint between the two bodies with the given anchor points and distance range.
+*/
++ (ChipmunkSlideJoint *)slideJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB min:(cpFloat)min max:(cpFloat)max;
+
+/**
+	Initialize a slide joint between the two bodies with the given anchor points and distance range.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB min:(cpFloat)min max:(cpFloat)max;
+
+/// The anchor point on the first body.
+@property(nonatomic, assign) cpVect anchorA;
+
+/// The anchor point on the second body.
+@property(nonatomic, assign) cpVect anchorB;
+
+/// The minimum allowed distance between anchor points.
+@property(nonatomic, assign) cpFloat min;
+
+/// The maximum allowed distance between anchor points.
+@property(nonatomic, assign) cpFloat max;
+
+@end
+
+
+/**
+	Pivot joints hold two points on two bodies together allowing them to rotate freely around the pivot.
+*/
+@interface ChipmunkPivotJoint : ChipmunkConstraint
+
+/**
+	Create an autoreleased pivot joint between the two bodies with the two anchor points.
+	Make sure you have the bodies in the right place as the joint will fix itself as soon as you start simulating the space.
+*/
++ (ChipmunkPivotJoint *)pivotJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB;
+
+/**
+	Create an autoreleased pivot joint between the two bodies by calculating the anchor points from the pivot point given in absolute coordinates.
+*/
++ (ChipmunkPivotJoint *)pivotJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b pivot:(cpVect)pivot;
+
+/**
+	Initialize a pivot joint between the two bodies with the two anchor points.
+	Make sure you have the bodies in the right place as the joint will fix itself as soon as you start simulating the space.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB;
+
+/**
+	Initialize a pivot joint between the two bodies by calculating the anchor points from the pivot point given in absolute coordinates.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b pivot:(cpVect)pivot;
+
+/// The anchor point on the first body.
+@property(nonatomic, assign) cpVect anchorA;
+
+/// The anchor point on the second body.
+@property(nonatomic, assign) cpVect anchorB;
+
+@end
+
+
+/**
+	Groove joints hold a pivot point on one body to line along a line segment on another like a pin in a groove.
+*/
+@interface ChipmunkGrooveJoint : ChipmunkConstraint
+
+/**
+	Create an autoreleased groove joint between the two bodies.
+	Make sure you have the bodies in the right place as the joint will snap into shape as soon as you start simulating the space.
+	@param grooveA The start of the line segment on the first body.
+	@param grooveB The end of the line segment on the first body.
+	@param anchorB The anchor point on the second body that is held to the line segment on the first.
+*/
++ (ChipmunkGrooveJoint *)grooveJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b grooveA:(cpVect)grooveA grooveB:(cpVect)grooveB anchorB:(cpVect)anchorB;
+
+/**
+	Initialize a groove joint between the two bodies.
+	Make sure you have the bodies in the right place as the joint will snap into shape as soon as you start simulating the space.
+	@param grooveA The start of the line segment on the first body.
+	@param grooveB The end of the line segment on the first body.
+	@param anchorB The anchor point on the second body that is held to the line segment on the first.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b grooveA:(cpVect)grooveA grooveB:(cpVect)grooveB anchorB:(cpVect)anchorB;
+
+/// The start point of the groove on the first body.
+@property(nonatomic, assign) cpVect grooveA;
+/// The end point of the groove on the first body.
+@property(nonatomic, assign) cpVect grooveB;
+
+/// The anchor point on the second body.
+@property(nonatomic, assign) cpVect anchorB;
+
+@end
+
+
+/**
+	A spring with a damper.
+	While a spring is not technically a constraint, the damper is. The spring forces are simply a convenience.
+*/
+@interface ChipmunkDampedSpring : ChipmunkConstraint
+
+/**
+	Create an autoreleased damped spring between two bodies at the given anchor points.
+	@param restLength The length the spring wants to contract or expand to.
+	@param stiffness The <a href="http://en.wikipedia.org/wiki/Young's_modulus">young's modulus</a> of the spring.
+	@param damping The amount of viscous damping to apply.
+*/
++ (ChipmunkDampedSpring *)dampedSpringWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB restLength:(cpFloat)restLength stiffness:(cpFloat)stiffness damping:(cpFloat)damping;
+
+/**
+	Initialize a damped spring between two bodies at the given anchor points.
+	@param restLength The length the spring wants to contract or expand to.
+	@param stiffness The <a href="http://en.wikipedia.org/wiki/Young's_modulus">young's modulus</a> of the spring.
+	@param damping The amount of viscous damping to apply.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB restLength:(cpFloat)restLength stiffness:(cpFloat)stiffness damping:(cpFloat)damping;
+
+/// The anchor point on the first body.
+@property(nonatomic, assign) cpVect anchorA;
+
+/// The anchor point on the second body.
+@property(nonatomic, assign) cpVect anchorB;
+
+/// The length the spring wants to contract or expand to.
+@property(nonatomic, assign) cpFloat restLength;
+
+/// The <a href="http://en.wikipedia.org/wiki/Young's_modulus">young's modulus</a> of the spring.
+@property(nonatomic, assign) cpFloat stiffness;
+
+/// The amount of viscous damping to apply.
+@property(nonatomic, assign) cpFloat damping;
+
+@end
+
+
+/**
+	Like a ChipmunkDampedSpring, but operates in a rotational fashion.
+*/
+@interface ChipmunkDampedRotarySpring : ChipmunkConstraint
+
+
+/**
+	Create an autoreleased damped rotary spring between the given bodies.
+	@param restAngle The angular offset in radians the spring attempts to keep between the two bodies.
+	@param stiffness The <a href="http://en.wikipedia.org/wiki/Young's_modulus">young's modulus</a> of the spring.
+	@param damping The amount of viscous damping to apply.
+*/
++ (ChipmunkDampedRotarySpring *)dampedRotarySpringWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b restAngle:(cpFloat)restAngle stiffness:(cpFloat)stiffness damping:(cpFloat)damping;
+
+/**
+	Initialize a damped rotary spring between the given bodies.
+	@param restAngle The angular offset in radians the spring attempts to keep between the two bodies.
+	@param stiffness The <a href="http://en.wikipedia.org/wiki/Young's_modulus">young's modulus</a> of the spring.
+	@param damping The amount of viscous damping to apply.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b restAngle:(cpFloat)restAngle stiffness:(cpFloat)stiffness damping:(cpFloat)damping;
+
+/// The angular offset the spring attempts to keep between the two bodies.
+@property(nonatomic, assign) cpFloat restAngle;
+
+/// The <a href="http://en.wikipedia.org/wiki/Young's_modulus">young's modulus</a> of the spring.
+@property(nonatomic, assign) cpFloat stiffness;
+
+/// The amount of viscous damping to apply.
+@property(nonatomic, assign) cpFloat damping;
+
+@end
+
+
+/**
+	Constrains the angle between two bodies.
+	This joint is often used in conjuction with a separate ChipmunkPivotJoint in order to limit the rotation around the pivot.
+*/
+@interface ChipmunkRotaryLimitJoint : ChipmunkConstraint
+
+/**
+	Create an autoreleased rotary limit joint between the two bodies and angular range in radians.
+	Make sure you have the bodies in the right place as the joint will snap into shape as soon as you start simulating the space.
+*/
++ (ChipmunkRotaryLimitJoint *)rotaryLimitJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b min:(cpFloat)min max:(cpFloat)max;
+
+/**
+	Create an autoreleased rotary limit joint between the two bodies and angular range in radians.
+	Make sure you have the bodies in the right place as the joint will snap into shape as soon as you start simulating the space.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b min:(cpFloat)min max:(cpFloat)max;
+
+/// The minimum angular delta of the joint in radians.
+@property(nonatomic, assign) cpFloat min;
+
+/// The maximum angular delta of the joint in radians.
+@property(nonatomic, assign) cpFloat max;
+
+@end
+
+
+/**
+	Simple motors make two objects spin relative to each other.
+	They are most often used with the ChipmunkConstraint.maxForce property set to a finite value.
+*/
+@interface ChipmunkSimpleMotor : ChipmunkConstraint
+
+/// Create an autoreleased simple motor between the given bodies and relative rotation rate in radians per second.
++ (ChipmunkSimpleMotor *)simpleMotorWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b rate:(cpFloat)rate;
+
+/// Initialize a simple motor between the given bodies and relative rotation rate in radians per second.
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b rate:(cpFloat)rate;
+
+/// The relative rotation speed of the two bodies in radians per second.
+@property(nonatomic, assign) cpFloat rate;
+
+@end
+
+
+/**
+	Gear joints constrain the rotational speed of one body to another.
+	A ratio of 1.0 will lock the rotation of two bodies together, and negative ratios will cause them to spin in opposite directions.
+	You can also use gear joints as rotary servos by setting ChipmunkConstraint.maxForce and ChipmunkConstraint.maxBias to finite values and changing the ChipmunkGearJoint.phase property.
+*/
+@interface ChipmunkGearJoint : ChipmunkConstraint
+
+/**
+	Create an autoreleased gear joint between the given bodies.
+	@param phase The angular offset.
+	@param ratio The ratio of the rotational speeds.
+*/
++ (ChipmunkGearJoint *)gearJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratio:(cpFloat)ratio;
+
+/**
+	Initialize a gear joint between the given bodies.
+	@param phase The angular offset in radians.
+	@param ratio The ratio of the rotational speeds.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratio:(cpFloat)ratio;
+
+/// The angular offset in radians.
+@property(nonatomic, assign) cpFloat phase;
+/// The ratio of the rotational speeds.
+@property(nonatomic, assign) cpFloat ratio;
+
+@end
+
+/**
+	Ratchet joints create rotary ratches similar to a socket wrench.
+*/
+@interface ChipmunkRatchetJoint : ChipmunkConstraint
+
+/**
+	Create an autoreleased ratchet joint between the given bodies.
+	@param phase The angular offset of the ratchet positions in radians.
+	@param ratchet The angle in radians of each ratchet position. Negative values cause the ratchet to operate in the opposite direction.
+*/
++ (ChipmunkRatchetJoint *)ratchetJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratchet:(cpFloat)ratchet;
+
+/**
+	Initialize a ratchet joint between the given bodies.
+	@param phase The angular offset of the ratchet positions in radians.
+	@param ratchet The angle in radians of each ratchet position. Negative values cause the ratchet to operate in the opposite direction.
+*/
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratchet:(cpFloat)ratchet;
+
+/// The current ratchet position in radians.
+@property(nonatomic, assign) cpFloat angle;
+
+/// The angular offset of the ratchet positions in radians
+@property(nonatomic, assign) cpFloat phase;
+
+/// The angle in radians of each ratchet position. Negative values cause the ratchet to operate in the opposite direction.
+@property(nonatomic, assign) cpFloat ratchet;
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkImageSampler.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkImageSampler.h
new file mode 100644
index 0000000..cba21c8
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkImageSampler.h
@@ -0,0 +1,114 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+#import "ChipmunkAutoGeometry.h"
+
+#import <TargetConditionals.h>
+
+#if TARGET_OS_IPHONE == 1
+	#import <CoreGraphics/CoreGraphics.h>
+#endif
+
+
+/**
+	Generic sampler used with bitmap data.
+	Currently limited to 8 bit per component data.
+	Bitmap samplers currently provide no filtering, but could be easily extended to do so.
+*/
+@interface ChipmunkBitmapSampler : ChipmunkAbstractSampler {
+@private
+	NSUInteger _width, _height, _stride;
+	NSUInteger _bytesPerPixel, _component;
+	
+	bool _flip;
+	const uint8_t *_pixels;
+	NSData *_pixelData;
+	
+	cpFloat _borderValue;
+	
+	cpBB _outputRect;
+}
+
+/// Width of the bitmap in pixels.
+@property(nonatomic, readonly) NSUInteger width;
+
+/// Height of the bitmap in pixels.
+@property(nonatomic, readonly) NSUInteger height;
+
+/// Bytes per pixel of the bitmap. (ex: RGBA8888 would be 4)
+@property(nonatomic, readonly) NSUInteger bytesPerPixel;
+
+/// Zero-based ndex of the component to sample. (ex: alpha of RGBA would be 3)
+@property(nonatomic, assign) NSUInteger component;
+
+/// NSData object holding the pixel data.
+@property(nonatomic, readonly) NSData *pixelData;
+
+/// Rect that the image maps to.
+/// Defaults to (0.5, 0.5, width - 0.5, height - 0.5) so that pixel centers will be cleanly sampled.
+@property(nonatomic, assign) cpBB outputRect;
+
+/**
+	Init a sampler from bitmap data.
+	Stride refers to the length of a row of pixels in bytes. (Generally just w*h*bytesPerPixel unless there is padding)
+	Image must use one byte per component, but can have any number of components.
+	@c component refers to the 0-based index of the component to sample. (i.e. 3 would sample the alpha in an RGBA bitmap)
+	@c flip allows you to flip the image vertically to match how it migh be drawn.
+	@c pixelData can be either a NSData or NSMutableData (i.e. for deformable terrain) that contains the bitmap data.
+*/
+-(id)initWithWidth:(NSUInteger)width height:(NSUInteger)height stride:(NSUInteger)stride bytesPerPixel:(NSUInteger)bytesPerPixel component:(NSUInteger)component flip:(bool)flip pixelData:(NSData *)pixelData;
+
+/// Set the border of the bitmap to repeat the edge pixels.
+-(void)setBorderRepeat;
+
+/// Set the border of the bitmap to be a specific value.
+-(void)setBorderValue:(cpFloat)borderValue;
+
+/// March the entire image.
+-(ChipmunkPolylineSet *)marchAllWithBorder:(bool)bordered hard:(bool)hard;
+
+@end
+
+
+
+/// Sampler built on top of a CGBitmapContext to allow deformable geometry.
+/// Very efficient when paired with a ChipmunkTileCache.
+@interface ChipmunkCGContextSampler : ChipmunkBitmapSampler {
+@private
+	CGContextRef _context;
+}
+
+/// CGBitmapContext for this sampler.
+@property(nonatomic, readonly) CGContextRef context;
+
+/// NSMutableData object holding the pixel data.
+@property(nonatomic, readonly) NSMutableData *pixelData;
+
+/// Initialize a context based sampler. Must provide options for a valid context.
+/// Find out more here in the Quartz 2D Programming Guide.
+-(id)initWithWidth:(unsigned long)width height:(unsigned long)height colorSpace:(CGColorSpaceRef)colorSpace bitmapInfo:(CGBitmapInfo)bitmapInfo component:(NSUInteger)component;
+
+@end
+
+
+
+/// A CGBitmapContext sampler initialized with an CGImage.
+@interface ChipmunkImageSampler : ChipmunkCGContextSampler
+
+/// Helper method to easily load CGImageRefs by path. You are responsible for releasing the CGImage.
++(CGImageRef)loadImage:(NSURL *)url;
+
+/// Initialize an image sampler of a certain size with a CGImage.
+/// If isMask is TRUE, the image will be loaded as a black and white image, if FALSE only the image alpha will be loaded.
+-(id)initWithImage:(CGImageRef)image isMask:(bool)isMask contextWidth:(NSUInteger)width contextHeight:(NSUInteger)height;
+
+/// Initialize an image sampler with an image file.
+/// If isMask is TRUE, the image will be loaded as a black and white image, if FALSE only the image alpha will be loaded.
+-(id)initWithImageFile:(NSURL *)url isMask:(bool)isMask;
+
+/// Return an autoreleased image sampler initialized with an image file.
+/// If isMask is TRUE, the image will be loaded as a black and white image, if FALSE only the image alpha will be loaded.
++(ChipmunkImageSampler *)samplerWithImageFile:(NSURL *)url isMask:(bool)isMask;
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkMultiGrab.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkMultiGrab.h
new file mode 100644
index 0000000..8cb59ce
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkMultiGrab.h
@@ -0,0 +1,136 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+
+@interface ChipmunkGrab : NSObject<ChipmunkObject> {
+	NSArray *_chipmunkObjects;
+	
+	cpVect _pos;
+	cpFloat _smoothing;
+	
+	ChipmunkShape *_grabbedShape;
+	
+	id _data;
+}
+
+/// Last touch location of the grab.
+@property(nonatomic, readonly) cpVect pos;
+
+/// The ChipmunkShape that this grab was created for.
+@property(nonatomic, readonly) ChipmunkShape *grabbedShape;
+
+/// User definable pointer
+@property(nonatomic, retain) id data;
+
+@end
+
+
+/// Simple class to implement multitouch grabbing of physics objects.
+@interface ChipmunkMultiGrab : NSObject {
+	ChipmunkSpace *_space;
+	NSMutableArray *_grabs;
+	
+	cpFloat _smoothing;
+	cpFloat _grabForce;
+	
+	cpFloat _grabFriction;
+	cpFloat _grabRotaryFriction;
+	cpFloat _grabRadius;
+	
+	cpShapeFilter filter;
+	bool (^_grabFilter)(ChipmunkShape *shape);
+	cpFloat (^_grabSort)(ChipmunkShape *shape, cpFloat depth);
+	
+	bool _pushMode, _pullMode;
+	
+	cpFloat _pushMass;
+	cpFloat _pushFriction;
+	cpFloat _pushElasticity;
+	cpCollisionType _pushCollisionType;
+}
+
+@property(nonatomic, assign) cpFloat smoothing;
+@property(nonatomic, assign) cpFloat grabForce;
+
+/// Layers used for the point query when grabbing objects.
+@property(nonatomic, assign) cpShapeFilter filter;
+
+/// Group used for the point query when grabbing objects
+@property(nonatomic, assign) cpGroup group;
+
+/// Gives you the opportunity to further filter shapes. Return FALSE to ignore a shape.
+/// The default implementation always returns TRUE.
+@property(nonatomic, copy) bool (^grabFilter)(ChipmunkShape *shape);
+
+/// When clicking on a spot where two shapes overlap, the default behavior is to grab the shape that
+/// overlaps the grab point the most. It's possible to use a custom sorting order instead however.
+/// The block is called with each shape and the grab depth.
+/// It should return a positive float. The shape with the highest value is grabbed.
+/// The block is only called if the touch location is within a shape.
+@property(nonatomic, copy) cpFloat (^grabSort)(ChipmunkShape *shape, cpFloat depth);
+
+/// Amount of friction applied by the touch.
+/// Should be less than the grabForce. Defaults to 0.0.
+@property(nonatomic, assign) cpFloat grabFriction;
+
+/// The amount torque to apply to the grab to keep it from spinning.
+/// Defaults to 0.0.
+@property(nonatomic, assign) cpFloat grabRotaryFriction;
+
+/// On a touch screen, a single point query can make it really hard to grab small objects with a fat finger.
+/// By providing a radius, it will make it much easier for users to grab objects.
+/// Defaults to 0.0.
+@property(nonatomic, assign) cpFloat grabRadius;
+
+@property(nonatomic, assign) bool pullMode;
+@property(nonatomic, assign) bool pushMode;
+
+@property(nonatomic, assign) cpFloat pushMass;
+@property(nonatomic, assign) cpFloat pushFriction;
+@property(nonatomic, assign) cpFloat pushElasticity;
+@property(nonatomic, assign) cpCollisionType pushCollisionType;
+
+@property(nonatomic, readonly) NSArray *grabs;
+
+
+/**
+	@c space is the space to grab shapes in.
+	@c smoothing is the amount of mouse smoothing to apply as percentage of remaining error per second.
+	cpfpow(0.8, 60) is a good starting point that provides fast response, but smooth mouse updates.
+	@c force is the force the grab points can apply.
+*/
+-(id)initForSpace:(ChipmunkSpace *)space withSmoothing:(cpFloat)smoothing withGrabForce:(cpFloat)grabForce;
+
+/// Start tracking a new grab point
+/// Returns the ChipmunkGrab that is tracking the touch, but only if a shape was grabbed.
+/// Returns nil when creating a push shape (if push mode is enabled), or when no shape is grabbed.
+-(ChipmunkGrab *)beginLocation:(cpVect)pos;
+
+/// Update a grab point.
+/// Returns the ChipmunkGrab that is tracking the touch, but only if the grab is tracking a shape.
+-(ChipmunkGrab *)updateLocation:(cpVect)pos;
+
+/// End a grab point.
+/// Returns the ChipmunkGrab that was tracking the touch, but only if the grab was tracking a shape.
+-(ChipmunkGrab *)endLocation:(cpVect)pos;
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkPointCloudSampler.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkPointCloudSampler.h
new file mode 100644
index 0000000..e18ea17
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkPointCloudSampler.h
@@ -0,0 +1,26 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+#import "ChipmunkAutoGeometry.h"
+
+/**
+	A point cloud sampler allows you to perform deformable terrain like with a bitmap backed sampler,
+	but without any bounds. It only requires memory for the points you add instead of large RAM chewing bitmap.
+	However, unlike a bitmap, the deformation can only go one way. (i.e. You can add or remove terrain, but not both).
+	Without any points, the sampler will return 1.0. Adding points will put "holes" in it causing it to return lower values.
+*/
+@interface ChipmunkPointCloudSampler : ChipmunkAbstractSampler {
+@private
+	cpFloat _cellSize;
+	cpSpatialIndex *_index;
+}
+
+/// Initialize the sampler with the given cell size,
+/// which should roughly match the size of the points added to the sampler.
+- (id)initWithCellSize:(cpFloat)cellSize;
+
+/// Add a point to the cloud and return the dirty rect for the point.
+-(cpBB)addPoint:(cpVect)pos radius:(cpFloat)radius fuzz:(cpFloat)fuzz;
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkShape.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkShape.h
new file mode 100644
index 0000000..ab982e8
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkShape.h
@@ -0,0 +1,249 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+@class ChipmunkPointQueryInfo;
+@class ChipmunkSegmentQueryInfo;
+
+
+/// Abstract base class for collsion shape types.
+@interface ChipmunkShape : NSObject <ChipmunkBaseObject> {
+@private
+	id _userData;
+}
+
+/// Get the ChipmunkShape object associciated with a cpShape pointer.
+/// Undefined if the cpShape wasn't created using Objective-Chipmunk.
++(ChipmunkShape *)shapeFromCPShape:(cpShape *)shape;
+
+/// Returns a pointer to the underlying cpShape C struct.
+@property(nonatomic, readonly) cpShape *shape;
+
+/// The ChipmunkBody that this shape is attached to.
+@property(nonatomic, retain) ChipmunkBody *body;
+
+// TODO doc
+@property(nonatomic, assign) cpFloat mass;
+@property(nonatomic, assign) cpFloat density;
+@property(nonatomic, readonly) cpFloat moment;
+@property(nonatomic, readonly) cpFloat area;
+@property(nonatomic, readonly) cpVect centerOfGravity;
+
+/// The axis-aligned bounding box for this shape.
+@property(nonatomic, readonly) cpBB bb;
+
+/// Sensor shapes send collision callback messages, but don't create a collision response.
+@property(nonatomic, assign) BOOL sensor;
+
+/// How bouncy this shape is.
+@property(nonatomic, assign) cpFloat elasticity;
+
+/// How much friction this shape has.
+@property(nonatomic, assign) cpFloat friction;
+
+/**
+	The velocity of the shape's surface.
+	This velocity is used in the collision response when calculating the friction only.
+*/
+@property(nonatomic, assign) cpVect surfaceVelocity;
+
+/**
+	An object reference used as a collision type identifier. This is used when defining collision handlers.
+	@attention Like most @c delegate properties this is a weak reference and does not call @c retain.
+*/
+@property(nonatomic, assign) cpCollisionType collisionType;
+
+/**
+	The collision filtering parameters of this shape.
+*/
+@property(nonatomic, assign) cpShapeFilter filter;
+
+/// Get the space the body is added to.
+@property(nonatomic, readonly) ChipmunkSpace *space;
+
+/**
+	An object that this shape is associated with. You can use this get a reference to your game object or controller object from within callbacks.
+	@attention Like most @c delegate properties this is a weak reference and does not call @c retain. This prevents reference cycles from occuring.
+*/
+@property(nonatomic, assign) id userData;
+
+/// Update and cache the axis-aligned bounding box for this shape.
+- (cpBB)cacheBB;
+
+- (ChipmunkPointQueryInfo *)pointQuery:(cpVect)point;
+- (ChipmunkSegmentQueryInfo *)segmentQueryFrom:(cpVect)start to:(cpVect)end radius:(cpFloat)radius;
+
+@end
+
+
+@interface ChipmunkPointQueryInfo : NSObject {
+	@private
+	cpPointQueryInfo _info;
+}
+
+- (id)initWithInfo:(cpPointQueryInfo *)info;
+
+/// Returns a pointer to the underlying cpNearestPointQueryInfo C struct.
+@property(nonatomic, readonly) cpPointQueryInfo *info;
+
+/// The ChipmunkShape found.
+@property(nonatomic, readonly) ChipmunkShape *shape;
+
+/// The closest point on the surface of the shape to the point.
+@property(nonatomic, readonly) cpVect point;
+
+/// The distance between the point and the surface of the shape.
+/// Negative distances mean that the point is that depth inside the shape.
+@property(nonatomic, readonly) cpFloat distance;
+
+/// The gradient of the signed distance function.
+/// The same as info.point/info.dist, but accurate even for very small values of info.dist.
+@property(nonatomic, readonly) cpVect gradient;
+
+@end
+
+
+/// Holds collision information from segment queries. You should never need to create one.
+@interface ChipmunkSegmentQueryInfo : NSObject {
+@private
+	cpSegmentQueryInfo _info;
+	cpVect _start, _end;
+}
+
+- (id)initWithInfo:(cpSegmentQueryInfo *)info start:(cpVect)start end:(cpVect)end;
+
+/// Returns a pointer to the underlying cpSegmentQueryInfo C struct.
+@property(nonatomic, readonly) cpSegmentQueryInfo *info;
+
+/// The ChipmunkShape found.
+@property(nonatomic, readonly) ChipmunkShape *shape;
+
+/// The percentage between the start and end points where the collision occurred.
+@property(nonatomic, readonly) cpFloat t;
+
+/// The normal of the collision with the shape.
+@property(nonatomic, readonly) cpVect normal;
+
+/// The point of the collision in absolute (world) coordinates.
+@property(nonatomic, readonly) cpVect point;
+
+/// The distance from the start point where the collision occurred.
+@property(nonatomic, readonly) cpFloat dist;
+
+/// The start point.
+@property(nonatomic, readonly) cpVect start;
+
+/// The end point.
+@property(nonatomic, readonly) cpVect end;
+
+@end
+
+
+/// Holds collision information from segment queries. You should never need to create one.
+@interface ChipmunkShapeQueryInfo : NSObject {
+@private
+	ChipmunkShape *_shape;
+	cpContactPointSet _contactPoints;
+}
+
+- (id)initWithShape:(ChipmunkShape *)shape andPoints:(cpContactPointSet *)set;
+
+@property(nonatomic, readonly) ChipmunkShape *shape;
+@property(nonatomic, readonly) cpContactPointSet *contactPoints;
+
+@end
+
+
+/// A perfect circle shape.
+@interface ChipmunkCircleShape : ChipmunkShape
+
+/// Create an autoreleased circle shape with the given radius and offset from the center of gravity.
++ (id)circleWithBody:(ChipmunkBody *)body radius:(cpFloat)radius offset:(cpVect)offset;
+
+/// Initialize a circle shape with the given radius and offset from the center of gravity.
+- (id)initWithBody:(ChipmunkBody *)body radius:(cpFloat)radius offset:(cpVect)offset;
+
+/// The radius of the circle.
+@property(nonatomic, readonly) cpFloat radius;
+
+/// The offset from the center of gravity.
+@property(nonatomic, readonly) cpVect offset;
+
+@end
+
+
+/// A beveled (rounded) segment shape.
+@interface ChipmunkSegmentShape : ChipmunkShape
+
+/// Create an autoreleased segment shape with the given endpoints and radius.
++ (id)segmentWithBody:(ChipmunkBody *)body from:(cpVect)a to:(cpVect)b radius:(cpFloat)radius;
+
+/// Initialize a segment shape with the given endpoints and radius.
+- (id)initWithBody:(ChipmunkBody *)body from:(cpVect)a to:(cpVect)b radius:(cpFloat)radius;
+
+/// Let Chipmunk know about the geometry of adjacent segments to avoid colliding with endcaps.
+- (void)setPrevNeighbor:(cpVect)prev nextNeighbor:(cpVect)next;
+
+/// The start of the segment shape.
+@property(nonatomic, readonly) cpVect a;
+
+/// The end of the segment shape.
+@property(nonatomic, readonly) cpVect b;
+
+/// The normal of the segment shape.
+@property(nonatomic, readonly) cpVect normal;
+
+/// The beveling radius of the segment shape.
+@property(nonatomic, readonly) cpFloat radius;
+
+@end
+
+
+/// A convex polygon shape.
+@interface ChipmunkPolyShape : ChipmunkShape
+
+/// Create an autoreleased polygon shape from the given vertexes after applying the transform and with the given rounding radius.
++ (id)polyWithBody:(ChipmunkBody *)body count:(int)count verts:(const cpVect *)verts transform:(cpTransform)transform radius:(cpFloat)radius;
+
+/// Create an autoreleased box shape centered on the center of gravity.
++ (id)boxWithBody:(ChipmunkBody *)body width:(cpFloat)width height:(cpFloat)height radius:(cpFloat)radius;
+
+/// Create an autoreleased box shape with the given bounding box in body local coordinates and rounding radius.
++ (id)boxWithBody:(ChipmunkBody *)body bb:(cpBB)bb radius:(cpFloat)radius;
+
+/// Initialize a polygon shape from the given vertexes after applying the transform and with the given rounding radius.
+- (id)initWithBody:(ChipmunkBody *)body count:(int)count verts:(const cpVect *)verts transform:(cpTransform)transform radius:(cpFloat)radius;
+
+/// Initialize a box shape centered on the center of gravity.
+- (id)initBoxWithBody:(ChipmunkBody *)body width:(cpFloat)width height:(cpFloat)height radius:(cpFloat)radius;
+
+/// Initialize a box shape with the given bounding box in body local coordinates and rounding radius.
+- (id)initBoxWithBody:(ChipmunkBody *)body bb:(cpBB)bb radius:(cpFloat)radius;
+
+/// The number of vertexes in this polygon.
+@property(nonatomic, readonly) int count;
+
+/// Get the rounding radius of the polygon.
+@property(nonatomic, readonly) cpFloat radius;
+
+/// Access the vertexes of this polygon.
+- (cpVect)getVertex:(int)index;
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkSpace.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkSpace.h
new file mode 100644
index 0000000..5d8534a
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkSpace.h
@@ -0,0 +1,313 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+
+/// Default to using the NEON optimized solver.
+#define CHIPMUNK_SPACE_USE_HASTY_SPACE 1
+
+
+/**
+	Chipmunk spaces are simulation containers. You add a bunch of physics objects to a space (rigid bodies, collision shapes, and joints) and step the entire space forward through time as a whole.
+	If you have Chipmunk Pro, you'll want to use the ChipmunkHastySpace subclass instead as it has iPhone specific optimizations.
+	Unfortunately because of how Objective-C code is linked I can't dynamically substitute a ChipmunkHastySpace from a static library.
+*/
+@interface ChipmunkSpace : NSObject {
+@protected
+	struct cpSpace *_space;
+	ChipmunkBody *_staticBody;
+	
+	NSMutableSet *_children;
+	NSMutableArray *_handlers;
+	
+	id _userData;
+}
+
+/**
+	The iteration count is how many solver passes the space should use when solving collisions and joints (default is 10).
+	Fewer iterations mean less CPU usage, but lower quality (mushy looking) physics.
+*/
+@property(nonatomic, assign) int iterations;
+
+/// Global gravity value to use for all rigid bodies in this space (default value is @c cpvzero).
+@property(nonatomic, assign) cpVect gravity;
+
+/**
+	Global viscous damping value to use for all rigid bodies in this space (default value is 1.0 which disables damping).
+	This value is the fraction of velocity a body should have after 1 second.
+	A value of 0.9 would mean that each second, a body would have 80% of the velocity it had the previous second.
+*/
+@property(nonatomic, assign) cpFloat damping;
+
+/// If a body is moving slower than this speed, it is considered idle. The default value is 0, which signals that the space should guess a good value based on the current gravity.
+@property(nonatomic, assign) cpFloat idleSpeedThreshold;
+
+/**
+	Elapsed time before a group of idle bodies is put to sleep (defaults to infinity which disables sleeping).
+	If an entire group of touching or jointed bodies has been idle for at least this long, the space will put all of the bodies into a sleeping state where they consume very little CPU.
+*/
+@property(nonatomic, assign) cpFloat sleepTimeThreshold;
+
+/**
+	Amount of encouraged penetration between colliding shapes..
+	Used to reduce oscillating contacts and keep the collision cache warm.
+	Defaults to 0.1. If you have poor simulation quality,
+	increase this number as much as possible without allowing visible amounts of overlap.
+*/
+@property(nonatomic, assign) cpFloat collisionSlop;
+
+/**
+	Determines how fast overlapping shapes are pushed apart.
+	Expressed as a fraction of the error remaining after each second.
+	Defaults to pow(1.0 - 0.1, 60.0) meaning that Chipmunk fixes 10% of overlap each frame at 60Hz.
+*/
+@property(nonatomic, assign) cpFloat collisionBias;
+
+/**
+	Number of frames that contact information should persist.
+	Defaults to 3. There is probably never a reason to change this value.
+*/
+@property(nonatomic, assign) cpTimestamp collisionPersistence;
+
+/// Returns a pointer to the underlying cpSpace C struct
+@property(nonatomic, readonly) cpSpace *space;
+
+/**
+	The space's designated static body.
+	Collision shapes added to the body will automatically be marked as static shapes, and rigid bodies that come to rest while touching or jointed to this body will fall asleep.
+*/
+@property(nonatomic, readonly) ChipmunkBody *staticBody;
+
+/**
+	Retrieves the current (if you are in a callback from [ChipmunkSpace step:]) or most recent (outside of a [ChipmunkSpace step:] call) timestep.
+*/
+@property(nonatomic, readonly) cpFloat currentTimeStep;
+
+/**
+	Returns true if the space is currently executing a timestep.
+*/
+@property(nonatomic, readonly) BOOL isLocked;
+@property(nonatomic, readonly) BOOL locked __deprecated;
+
+/**
+	An object that this space is associated with. You can use this get a reference to your game state or controller object from within callbacks.
+	@attention Like most @c delegate properties this is a weak reference and does not call @c retain. This prevents reference cycles from occuring.
+*/
+@property(nonatomic, assign) id userData;
+
+/// Get the ChipmunkSpace object associciated with a cpSpace pointer.
+/// Undefined if the cpSpace wasn't created using Objective-Chipmunk.
++(ChipmunkSpace *)spaceFromCPSpace:(cpSpace *)space;
+
+/**
+  Set the default collision handler.
+  The default handler is used for all collisions when a specific collision handler cannot be found.
+  
+  The expected method selectors are as follows:
+	@code
+- (bool)begin:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+- (bool)preSolve:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+- (void)postSolve:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+- (void)separate:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+	@endcode
+*/
+- (void)setDefaultCollisionHandler:(id)delegate
+	begin:(SEL)begin
+	preSolve:(SEL)preSolve
+	postSolve:(SEL)postSolve
+	separate:(SEL)separate;
+
+/**
+  Set a collision handler to handle specific collision types.
+  The methods are called only when shapes with the specified collisionTypes collide.
+  
+  @c typeA and @c typeB should be the same object references set to ChipmunkShape.collisionType. They can be any uniquely identifying object.
+	Class and global NSString objects work well as collision types as they are easy to get a reference to and do not require you to allocate any objects.
+  
+  The expected method selectors are as follows:
+	@code
+- (bool)begin:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+- (bool)preSolve:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+- (void)postSolve:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+- (void)separate:(cpArbiter *)arbiter space:(ChipmunkSpace*)space
+	@endcode
+*/
+- (void)addCollisionHandler:(id)delegate
+	typeA:(cpCollisionType)a typeB:(cpCollisionType)b
+	begin:(SEL)begin
+	preSolve:(SEL)preSolve
+	postSolve:(SEL)postSolve
+	separate:(SEL)separate;
+
+
+/**
+  Add an object to the space.
+  This can be any object that implements the ChipmunkObject protocol.
+	This includes all the basic types such as ChipmunkBody, ChipmunkShape and ChipmunkConstraint as well as any composite game objects you may define that implement the protocol.
+	@warning This method may not be called from a collision handler callback. See smartAdd: or ChipmunkSpace.addPostStepCallback:selector:context: for information on how to do that.
+*/
+-(id)add:(NSObject<ChipmunkObject> *)obj;
+
+/**
+  Remove an object from the space.
+  This can be any object that implements the ChipmunkObject protocol.
+	This includes all the basic types such as ChipmunkBody, ChipmunkShape and ChipmunkConstraint as well as any composite game objects you may define that implement the protocol.
+	@warning This method may not be called from a collision handler callback. See smartRemove: or ChipmunkSpace.addPostStepCallback:selector:context: for information on how to do that.
+*/
+-(id)remove:(NSObject<ChipmunkObject> *)obj;
+
+/// Check if a space already contains a particular object:
+-(BOOL)contains:(NSObject<ChipmunkObject> *)obj;
+
+/// If the space is locked and it's unsafe to call add: it will call addPostStepAddition: instead.
+- (id)smartAdd:(NSObject<ChipmunkObject> *)obj;
+
+/// If the space is locked and it's unsafe to call remove: it will call addPostStepRemoval: instead.
+- (id)smartRemove:(NSObject<ChipmunkObject> *)obj;
+
+/// Handy utility method to add a border of collision segments around a box. See ChipmunkShape for more information on the other parameters.
+/// Returns an NSArray of the shapes. Since NSArray implements the ChipmunkObject protocol, you can use the [ChipmunkSpace remove:] method to remove the bounds.
+- (NSArray *)addBounds:(cpBB)bounds thickness:(cpFloat)radius
+	elasticity:(cpFloat)elasticity friction:(cpFloat)friction
+	filter:(cpShapeFilter)filter collisionType:(id)collisionType;
+
+
+/**
+  Define a callback to be run just before [ChipmunkSpace step:] finishes.
+  The main reason you want to define post-step callbacks is to get around the restriction that you cannot call the add/remove methods from a collision handler callback.
+	Post-step callbacks run right before the next (or current) call to ChipmunkSpace.step: returns when it is safe to add and remove objects.
+	You can only schedule one post-step callback per key value, this prevents you from accidentally removing an object twice. Registering a second callback for the same key is a no-op.
+  
+  The method signature of the method should be:
+  @code
+- (void)postStepCallback:(id)key</code></pre>
+	@endcode
+	
+  This makes it easy to call a removal method on your game controller to remove a game object that died or was destroyed as the result of a collision:
+  @code
+[space addPostStepCallback:gameController selector:@selector(remove:) key:gameObject];
+	@endcode
+	
+	@attention Not to be confused with post-solve collision handler callbacks.
+	@warning @c target and @c object cannot be retained by the ChipmunkSpace. If you need to release either after registering the callback, use autorelease to ensure that they won't be deallocated until after [ChipmunkSpace step:] returns.
+	@see ChipmunkSpace.addPostStepRemoval:
+*/
+- (BOOL)addPostStepCallback:(id)target selector:(SEL)selector key:(id)key;
+
+/// Block type used with [ChipmunkSpace addPostStepBlock:]
+typedef void (^ChipmunkPostStepBlock)(void);
+
+/// Same as [ChipmunkSpace addPostStepCallback:] but with a block. The block is copied.
+- (BOOL)addPostStepBlock:(ChipmunkPostStepBlock)block key:(id)key;
+
+/// Add the Chipmunk Object to the space at the end of the step.
+- (void)addPostStepAddition:(NSObject<ChipmunkObject> *)obj;
+
+/// Remove the Chipmunk Object from the space at the end of the step.
+- (void)addPostStepRemoval:(NSObject<ChipmunkObject> *)obj;
+
+/// Return an array of ChipmunkNearestPointQueryInfo objects for shapes within @c maxDistance of @c point.
+/// The point is treated as having the given group and layers.
+- (NSArray *)pointQueryAll:(cpVect)point maxDistance:(cpFloat)maxDistance filter:(cpShapeFilter)filter;
+
+/// Find the closest shape to a point that is within @c maxDistance of @c point.
+/// The point is treated as having the given layers and group.
+- (ChipmunkPointQueryInfo *)pointQueryNearest:(cpVect)point maxDistance:(cpFloat)maxDistance filter:(cpShapeFilter)filter;
+
+/// Return a NSArray of ChipmunkSegmentQueryInfo objects for all the shapes that overlap the segment. The objects are unsorted.
+- (NSArray *)segmentQueryAllFrom:(cpVect)start to:(cpVect)end radius:(cpFloat)radius filter:(cpShapeFilter)filter;
+
+/// Returns the first shape that overlaps the given segment. The segment is treated as having the given group and layers. 
+- (ChipmunkSegmentQueryInfo *)segmentQueryFirstFrom:(cpVect)start to:(cpVect)end radius:(cpFloat)radius filter:(cpShapeFilter)filter;
+
+/// Returns a NSArray of all shapes whose bounding boxes overlap the given bounding box. The box is treated as having the given group and layers. 
+- (NSArray *)bbQueryAll:(cpBB)bb filter:(cpShapeFilter)filter;
+
+/// Returns a NSArray of ChipmunkShapeQueryInfo objects for all the shapes that overlap @c shape.
+- (NSArray *)shapeQueryAll:(ChipmunkShape *)shape;
+
+/// Returns true if the shape overlaps anything in the space.
+- (BOOL)shapeTest:(ChipmunkShape *)shape;
+
+/// Get a copy of the list of all the bodies in the space.
+- (NSArray *)bodies;
+
+/// Get a copy of the list of all the shapes in the space
+- (NSArray *)shapes;
+
+/// Get a copy of the list of all the constraints in the space
+- (NSArray *)constraints;
+
+/// Update all the static shapes.
+- (void)reindexStatic;
+
+/// Update the collision info for a single shape.
+/// Can be used to update individual static shapes that were moved or active shapes that were moved that you want to query against.
+- (void)reindexShape:(ChipmunkShape *)shape;
+
+/// Update the collision info for all shapes attached to a body.
+- (void)reindexShapesForBody:(ChipmunkBody *)body;
+
+/// Step time forward. While variable timesteps may be used, a constant timestep will allow you to reduce CPU usage by using fewer iterations.
+- (void)step:(cpFloat)dt;
+
+@end
+
+
+/// ChipmunkHastySpace is an Objective-Chipmunk wrapper for cpHastySpace.
+/// Subclass this class instead of ChipmunkSpace if you want to enable the cpHastySpace optimizations.
+/// If ChipmunkHastySpace is linked correctly, calling [[ChipmunkSpace alloc] init] will actually return a ChipmunkHastySpace.
+@interface ChipmunkHastySpace : ChipmunkSpace
+
+/// Number of threads to use for the solver.
+///	Setting 0 will choose the thread count automatically (recommended).
+/// There is currently little benefit in using more than 2 threads.
+/// Defaults to 1.
+@property(nonatomic, assign) NSUInteger threads;
+
+@end
+
+
+//MARK: Misc
+
+/**
+	A macro that defines and initializes shape variables for you in a collision callback.
+	They are initialized in the order that they were defined in the collision handler associated with the arbiter.
+	If you defined the handler as:
+	
+	@code
+		[space addCollisionHandler:target typeA:foo typeB:bar ...]
+	@endcode
+	
+	You you will find that @code a->collision_type == 1 @endcode and @code b->collision_type == 2 @endcode.
+*/
+#define CHIPMUNK_ARBITER_GET_SHAPES(__arb__, __a__, __b__) ChipmunkShape *__a__, *__b__; { \
+	cpShape *__shapeA__, *__shapeB__; \
+	cpArbiterGetShapes(__arb__, &__shapeA__, &__shapeB__); \
+	__a__ = cpShapeGetUserData(__shapeA__); __b__ = cpShapeGetUserData(__shapeB__); \
+}
+
+#define CHIPMUNK_ARBITER_GET_BODIES(__arb__, __a__, __b__) ChipmunkBody *__a__, *__b__; { \
+	cpBody *__bodyA__, *__bodyB__; \
+	cpArbiterGetBodies(__arb__, &__bodyA__, &__bodyB__); \
+	__a__ = cpBodyGetUserData(__bodyA__); __b__ = cpBodyGetUserData(__bodyB__); \
+}
+
+
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkTileCache.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkTileCache.h
new file mode 100644
index 0000000..a6c79dc
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ChipmunkTileCache.h
@@ -0,0 +1,100 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+#import "ChipmunkAutoGeometry.h"
+
+
+@class ChipmunkCachedTile;
+
+/// A tile cache enables an efficient means of updating a large deformable terrain.
+/// General usage would be to pass a rectangle covering the viewport to ensureRect:
+/// and calling markDirtyRect: each time a change is made that requires an area to be resampled.
+@interface ChipmunkAbstractTileCache : NSObject {
+@private
+	ChipmunkAbstractSampler *_sampler;
+	ChipmunkSpace *_space;
+	
+	cpFloat _tileSize;
+	cpFloat _samplesPerTile;
+	cpVect _tileOffset;
+	
+	NSUInteger _tileCount, _cacheSize;
+	cpSpatialIndex *_tileIndex;
+	ChipmunkCachedTile *_cacheHead, *_cacheTail;
+	
+	cpBB _ensuredBB;
+	bool _ensuredDirty;
+	
+	bool _marchHard;
+}
+
+/// Should the marching be hard or soft?
+/// See cpMarchHard() and cpMarchSoft() for more information.
+@property(nonatomic, assign) bool marchHard;
+
+/// Offset of the tile grid origin.
+@property(nonatomic, assign) cpVect tileOffset;
+
+/// The sampling function to use.
+@property(nonatomic, readonly) ChipmunkAbstractSampler *sampler;
+
+/// Create the cache from the given sampler, space to add the generated segments to,
+/// size of the tiles, and the number of samples for each tile.
+-(id)initWithSampler:(ChipmunkAbstractSampler *)sampler space:(ChipmunkSpace *)space tileSize:(cpFloat)tileSize samplesPerTile:(NSUInteger)samplesPerTile cacheSize:(NSUInteger)cacheSize;
+
+/// Clear out all the cached tiles to force a full regen.
+-(void)resetCache;
+
+/// Mark a region as needing an update.
+/// Geometry is not regenerated until ensureRect: is called.
+-(void)markDirtyRect:(cpBB)bounds;
+
+/// Ensure that the given rect has been fully generated and contains no dirty rects.
+-(void)ensureRect:(cpBB)bounds;
+
+/// Override this in a subclass to make custom polygon simplification behavior.
+/// Defaults to cpPolylineSimplifyCurves(polyline, 2.0f)
+-(cpPolyline *)simplify:(cpPolyline *)polyline;
+
+/// Override this method to construct the segment shapes.
+/// By default, it creates a 0 radius segment and sets 1.0 for friction and elasticity and nothing else.
+-(ChipmunkSegmentShape *)makeSegmentFor:(ChipmunkBody *)staticBody from:(cpVect)a to:(cpVect)b;
+
+@end
+
+
+/// Generic tile cache. Configurable enough to be useful for most uses.
+@interface ChipmunkBasicTileCache : ChipmunkAbstractTileCache {
+@private
+	cpFloat _simplifyThreshold;
+	
+	cpFloat _segmentRadius;
+	
+	cpFloat _segmentFriction;
+	cpFloat _segmentElasticity;
+	
+	cpShapeFilter _segmentFilter;
+	
+	cpCollisionType _segmentCollisionType;
+}
+
+/// Threshold value used by cpPolylineSimplifyCurves().
+@property(nonatomic, assign) cpFloat simplifyThreshold;
+
+/// Radius of the generated segments.
+@property(nonatomic, assign) cpFloat segmentRadius;
+
+/// Friction of the generated segments.
+@property(nonatomic, assign) cpFloat segmentFriction;
+
+/// Elasticity of the generated segments.
+@property(nonatomic, assign) cpFloat segmentElasticity;
+
+/// Collision filter of the generated segments.
+@property(nonatomic, assign) cpShapeFilter segmentFilter;
+
+/// Collision type of the generated segments.
+@property(nonatomic, assign) cpCollisionType segmentCollisionType;
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ObjectiveChipmunk.h b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ObjectiveChipmunk.h
new file mode 100644
index 0000000..18e7ee2
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/include/ObjectiveChipmunk/ObjectiveChipmunk.h
@@ -0,0 +1,77 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+#if __has_feature(objc_arc)
+	#define CP_DATA_POINTER_TYPE __unsafe_unretained id
+	#define CP_GROUP_TYPE __unsafe_unretained id
+	#define CP_COLLISION_TYPE_TYPE __unsafe_unretained id
+#else
+	#define CP_DATA_POINTER_TYPE id
+	#define CP_GROUP_TYPE id
+	#define CP_COLLISION_TYPE_TYPE id
+#endif
+
+#ifdef CP_ALLOW_PRIVATE_ACCESS
+	#import "chipmunk/chipmunk_private.h"
+#else
+	#import "chipmunk/chipmunk.h"
+	#import "chipmunk/chipmunk_structs.h"
+#endif
+
+/**
+	Allows you to add composite objects to a space in a single method call.
+	The easiest way to implement the ChipmunkObject protocol is to add a @c chipmunkObjects instance variable with a type of @c NSArray* to your class,
+	create a synthesized property for it, and initialize it with the ChipmunkObjectFlatten() function.
+*/
+@protocol ChipmunkObject
+
+/// Returns a list of ChipmunkBaseObject objects.
+- (id <NSFastEnumeration>)chipmunkObjects;
+
+@end
+
+
+/// A category to have NSArray implement the ChipmunkObject protocol.
+/// They make for very easy containers.
+@interface NSArray(ChipmunkObject) <ChipmunkObject>
+@end
+
+
+@class ChipmunkSpace;
+
+/**
+	This protocol is implemented by objects that know how to add themselves to a space.
+	It's used internally as part of the ChipmunkObject protocol. You should never need to implement it yourself.
+*/
+@protocol ChipmunkBaseObject <ChipmunkObject>
+
+- (void)addToSpace:(ChipmunkSpace *)space;
+- (void)removeFromSpace:(ChipmunkSpace *)space;
+
+@end
+
+#import "ChipmunkBody.h"
+#import "ChipmunkShape.h"
+#import "ChipmunkConstraint.h"
+#import "ChipmunkSpace.h"
+#import "ChipmunkMultiGrab.h"
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkAutoGeometry.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkAutoGeometry.m
new file mode 100644
index 0000000..640096f
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkAutoGeometry.m
@@ -0,0 +1,232 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#import <malloc/malloc.h>
+
+#import "ChipmunkAutoGeometry.h"
+
+@implementation ChipmunkPolyline
+
+-(id)initWithPolyline:(cpPolyline *)line
+{
+	if((self = [super init])){
+		_line = line;
+	}
+	
+	return self;
+}
+
+-(void)dealloc
+{
+	cpPolylineFree(_line);
+	
+	[super dealloc];
+}
+
++(ChipmunkPolyline *)fromPolyline:(cpPolyline *)line
+{
+	return [[[self alloc] initWithPolyline:line] autorelease];
+}
+
+-(bool)isClosed
+{
+	return cpPolylineIsClosed(_line);
+}
+
+-(cpFloat)area
+{
+	if(_area == 0.0 && [self isClosed]){
+		_area = cpAreaForPoly(_line->count - 1, _line->verts, 0.0);
+	}
+	
+	return _area;
+}
+
+-(cpVect)centroid
+{
+	cpAssertHard([self isClosed], "Cannot compute the centroid of a non-looped polyline.");
+	return cpCentroidForPoly(_line->count - 1, _line->verts);
+}
+
+-(cpFloat)momentForMass:(cpFloat)mass offset:(cpVect)offset
+{
+	cpAssertHard([self isClosed], "Cannot compute the moment of a non-looped polyline.");
+	return cpMomentForPoly(mass, _line->count - 1, _line->verts, offset, 0.0);
+}
+
+-(NSUInteger)count {return _line->count;}
+-(const cpVect *)verts {return _line->verts;}
+
+-(ChipmunkPolyline *)simplifyCurves:(cpFloat)tolerance
+{
+	return [ChipmunkPolyline fromPolyline:cpPolylineSimplifyCurves(_line, tolerance)];
+}
+
+-(ChipmunkPolyline *)simplifyVertexes:(cpFloat)tolerance
+{
+	return [ChipmunkPolyline fromPolyline:cpPolylineSimplifyVertexes(_line, tolerance)];
+}
+
+-(ChipmunkPolyline *)toConvexHull:(cpFloat)tolerance
+{
+	return [ChipmunkPolyline fromPolyline:cpPolylineToConvexHull(_line, tolerance)];
+}
+
+-(ChipmunkPolyline *)toConvexHull
+{
+	return [self toConvexHull:0.0];
+}
+
+-(ChipmunkPolylineSet *)toConvexHulls_BETA:(cpFloat)tolerance
+{
+	cpPolylineSet *set = cpPolylineConvexDecomposition_BETA(_line, tolerance);
+	ChipmunkPolylineSet *value = [ChipmunkPolylineSet fromPolylineSet:set];
+	cpPolylineSetFree(set, FALSE);
+	
+	return value;
+}
+
+-(NSArray *)asChipmunkSegmentsWithBody:(ChipmunkBody *)body radius:(cpFloat)radius offset:(cpVect)offset
+{
+	NSMutableArray *arr = [NSMutableArray arrayWithCapacity:_line->count];
+	
+	
+	cpVect a = cpvadd(_line->verts[0], offset);
+	for(int i=1; i<_line->count; i++){
+		cpVect b = cpvadd(_line->verts[i], offset);
+		[arr addObject:[ChipmunkSegmentShape segmentWithBody:body from:a to:b radius:radius]];
+		a = b;
+	}
+	
+	return arr;
+}
+
+-(ChipmunkPolyShape *)asChipmunkPolyShapeWithBody:(ChipmunkBody *)body transform:(cpTransform)transform radius:(cpFloat)radius
+{
+	cpAssertHard([self isClosed], "Cannot create a poly shape for a non-closed polyline.");
+	return [ChipmunkPolyShape polyWithBody:body count:_line->count - 1 verts:_line->verts transform:transform radius:radius];
+}
+
+@end
+
+
+
+@implementation ChipmunkPolylineSet
+
+-(id)initWithPolylineSet:(cpPolylineSet *)set
+{
+	if((self = [super init])){
+		_lines = [[NSMutableArray alloc] initWithCapacity:set->count];
+		for(int i=0; i<set->count; i++) [_lines addObject:[ChipmunkPolyline fromPolyline:set->lines[i]]];
+	}
+	
+	return self;
+}
+
+-(void)dealloc
+{
+	[_lines release];
+	
+	[super dealloc];
+}
+
++(ChipmunkPolylineSet *)fromPolylineSet:(cpPolylineSet *)set
+{
+	return [[[self alloc] initWithPolylineSet:set] autorelease];
+}
+
+-(NSUInteger)count {return _lines.count;}
+
+-(ChipmunkPolyline *)lineAtIndex:(NSUInteger)index
+{
+	return [_lines objectAtIndex:index];
+}
+
+- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len
+{
+	return [_lines countByEnumeratingWithState:state objects:stackbuf count:len];
+}
+
+@end
+
+
+
+@implementation ChipmunkAbstractSampler
+
+@synthesize marchThreshold = _marchThreshold;
+@synthesize sampleFunc = _sampleFunc;
+
+-(id)init {
+	@throw [NSException
+		exceptionWithName:NSInternalInconsistencyException
+		reason:[NSString stringWithFormat:@"Use designated initializer initWithSamplingFunction: to initialize a sampler."]
+		userInfo:nil
+	];
+}
+
+-(id)initWithSamplingFunction:(cpMarchSampleFunc)sampleFunc
+{
+	if((self = [super init])){
+		_sampleFunc = sampleFunc;
+		_marchThreshold = 0.5;
+	}
+	
+	return self;
+}
+
+-(cpFloat)sample:(cpVect)pos
+{
+	return _sampleFunc(pos, self);
+}
+
+
+-(ChipmunkPolylineSet *)march:(cpBB)bb xSamples:(NSUInteger)xSamples ySamples:(NSUInteger)ySamples hard:(bool)hard
+{
+	cpPolylineSet set;
+	cpPolylineSetInit(&set);
+	
+	(hard ? cpMarchHard : cpMarchSoft)(
+		bb, xSamples, ySamples, _marchThreshold,
+		(cpMarchSegmentFunc)cpPolylineSetCollectSegment, &set,
+		_sampleFunc, self
+	);
+	
+	ChipmunkPolylineSet *value = [ChipmunkPolylineSet fromPolylineSet:&set];
+	
+	cpPolylineSetDestroy(&set, FALSE);
+	return value;
+}
+
+@end
+
+
+
+@implementation ChipmunkBlockSampler
+
+static cpFloat
+SampleFromBlock(cpVect point, ChipmunkBlockSampler *self)
+{
+	return self->_block(point);
+}
+
+-(id)initWithBlock:(ChipmunkMarchSampleBlock)block
+{
+	if((self = [super initWithSamplingFunction:(cpMarchSampleFunc)SampleFromBlock])){
+		_block = [block copy];
+	}
+	
+	return self;
+}
+
++(ChipmunkBlockSampler *)samplerWithBlock:(ChipmunkMarchSampleBlock)block
+{
+	return [[[self alloc] initWithBlock:block] autorelease];
+}
+
+-(void)dealloc
+{
+	[_block release];
+	[super dealloc];
+}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkBody.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkBody.m
new file mode 100644
index 0000000..95dbadc
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkBody.m
@@ -0,0 +1,205 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+
+@interface ChipmunkSpace(DoubleDispatch)
+
+- (ChipmunkBody *)addBody:(ChipmunkBody *)obj;
+- (ChipmunkBody *)removeBody:(ChipmunkBody *)obj;
+
+@end
+
+@implementation ChipmunkBody {
+	cpBody _body;
+	id _userData;
+}
+
+// MARK: Integration Helpers
+
+-(void)updateVelocity:(cpFloat)dt gravity:(cpVect)gravity damping:(cpFloat)damping
+{
+	cpBodyUpdateVelocity(&_body, gravity, damping, dt);
+}
+
+-(void)updatePosition:(cpFloat)dt
+{
+	cpBodyUpdatePosition(&_body, dt);
+}
+
+static void
+VelocityFunction
+(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt)
+{
+	[(ChipmunkBody *)body->userData updateVelocity:dt gravity:gravity damping:damping];
+}
+
+static void
+PositionFunction
+(cpBody *body, cpFloat dt)
+{
+	[(ChipmunkBody *)body->userData updatePosition:dt];
+}
+
+// Check if the method was overridden.
+// No reason to add the extra method overhead if it's not needed.
+-(BOOL)methodIsOverriden:(SEL)selector
+{
+	return ([self methodForSelector:selector] != [[ChipmunkBody class] instanceMethodForSelector:selector]);
+}
+
+// MARK: Constructors
+
++(ChipmunkBody *)bodyFromCPBody:(cpBody *)body
+{	
+	ChipmunkBody *obj = body->userData;
+	cpAssertHard([obj isKindOfClass:[ChipmunkBody class]], "'body->data' is not a pointer to a ChipmunkBody object.");
+	
+	return obj;
+}
+
++ (id)bodyWithMass:(cpFloat)mass andMoment:(cpFloat)moment
+{
+	return [[[self alloc] initWithMass:mass andMoment:moment] autorelease];
+}
+
++ (id)staticBody
+{
+	ChipmunkBody *body = [[self alloc] initWithMass:0.0f andMoment:0.0f];
+	body.type = CP_BODY_TYPE_STATIC;
+	
+	return [body autorelease];
+}
+
++ (id)kinematicBody
+{
+	ChipmunkBody *body = [[self alloc] initWithMass:0.0f andMoment:0.0f];
+	body.type = CP_BODY_TYPE_KINEMATIC;
+	
+	return [body autorelease];
+}
+
+- (id)initWithMass:(cpFloat)mass andMoment:(cpFloat)moment
+{
+	if((self = [super init])){
+		cpBodyInit(&_body, mass, moment);
+		_body.userData = self;
+		
+		// Setup integration callbacks if necessary.
+		if([self methodIsOverriden:@selector(updateVelocity:gravity:damping:)]){
+			_body.velocity_func = VelocityFunction;
+		}
+		
+		if([self methodIsOverriden:@selector(updatePosition:)]){
+			_body.position_func = PositionFunction;
+		}
+	}
+	
+	return self;
+}
+
+- (void) dealloc
+{
+	cpBodyDestroy(&_body);
+	[super dealloc];
+}
+
+- (cpTransform)transform {return _body.transform;}
+- (cpBody *)body {return &_body;}
+
+
+@synthesize userData = _userData;
+
+// accessor macros
+#define getter(type, lower, upper) \
+- (type)lower {return cpBodyGet##upper(&_body);}
+#define setter(type, lower, upper) \
+- (void)set##upper:(type)value {cpBodySet##upper(&_body, value);};
+#define both(type, lower, upper) \
+getter(type, lower, upper) \
+setter(type, lower, upper)
+
+
+both(cpBodyType, type, Type)
+both(cpFloat, mass, Mass)
+both(cpFloat, moment, Moment)
+both(cpVect, centerOfGravity, CenterOfGravity)
+both(cpVect, position, Position)
+both(cpVect, velocity, Velocity)
+both(cpVect, force, Force)
+both(cpFloat, angle, Angle)
+both(cpFloat, angularVelocity, AngularVelocity)
+both(cpFloat, torque, Torque)
+
+-(ChipmunkSpace *)space {
+	cpSpace *space = cpBodyGetSpace(&_body);
+	return (ChipmunkSpace *)(space ? cpSpaceGetUserData(space) : nil);
+}
+
+- (cpFloat)kineticEnergy {return cpBodyKineticEnergy(&_body);}
+
+- (cpVect)localToWorld:(cpVect)v {return cpBodyLocalToWorld(&_body, v);}
+- (cpVect)worldToLocal:(cpVect)v {return cpBodyWorldToLocal(&_body, v);}
+
+- (cpVect)velocityAtLocalPoint:(cpVect)p {return cpBodyGetVelocityAtLocalPoint(&_body, p);}
+- (cpVect)velocityAtWorldPoint:(cpVect)p {return cpBodyGetVelocityAtWorldPoint(&_body, p);}
+
+- (void)applyForce:(cpVect)force atLocalPoint:(cpVect)point {cpBodyApplyForceAtLocalPoint(&_body, force, point);}
+- (void)applyForce:(cpVect)force atWorldPoint:(cpVect)point {cpBodyApplyForceAtWorldPoint(&_body, force, point);}
+- (void)applyImpulse:(cpVect)impulse atLocalPoint:(cpVect)point {cpBodyApplyImpulseAtLocalPoint(&_body, impulse, point);}
+- (void)applyImpulse:(cpVect)impulse atWorldPoint:(cpVect)point {cpBodyApplyImpulseAtWorldPoint(&_body, impulse, point);}
+
+- (bool)isSleeping {return cpBodyIsSleeping(&_body);}
+
+- (void)activate {cpBodyActivate(&_body);}
+- (void)activateStatic:(ChipmunkShape *)filter {cpBodyActivateStatic(&_body, filter.shape);}
+- (void)sleepWithGroup:(ChipmunkBody *)group {cpBodySleepWithGroup(&_body, group.body);}
+- (void)sleep {cpBodySleep(&_body);}
+
+- (NSArray *)chipmunkObjects {return [NSArray arrayWithObject:self];}
+- (void)addToSpace:(ChipmunkSpace *)space {[space addBody:self];}
+- (void)removeFromSpace:(ChipmunkSpace *)space {[space removeBody:self];}
+
+static void PushShape(cpBody *ignored, cpShape *shape, NSMutableArray *arr){[arr addObject:shape->userData];}
+- (NSArray *)shapes
+{
+	NSMutableArray *arr = [NSMutableArray array];
+	cpBodyEachShape(&_body, (cpBodyShapeIteratorFunc)PushShape, arr);
+	
+	return arr;
+}
+
+static void PushConstraint(cpBody *ignored, cpConstraint *constraint, NSMutableArray *arr){[arr addObject:constraint->userData];}
+- (NSArray *)constraints
+{
+	NSMutableArray *arr = [NSMutableArray array];
+	cpBodyEachConstraint(&_body, (cpBodyConstraintIteratorFunc)PushConstraint, arr);
+	
+	return arr;
+}
+
+static void CallArbiterBlock(cpBody *body, cpArbiter *arbiter, ChipmunkBodyArbiterIteratorBlock block){block(arbiter);}
+- (void)eachArbiter:(ChipmunkBodyArbiterIteratorBlock)block
+{
+	cpBodyEachArbiter(&_body, (cpBodyArbiterIteratorFunc)CallArbiterBlock, block);
+}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkConstraint.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkConstraint.m
new file mode 100644
index 0000000..74ebff0
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkConstraint.m
@@ -0,0 +1,481 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+
+@interface ChipmunkSpace(DoubleDispatch)
+
+- (ChipmunkConstraint *)addConstraint:(ChipmunkConstraint *)obj;
+- (ChipmunkConstraint *)removeConstraint:(ChipmunkConstraint *)obj;
+
+@end
+
+@implementation ChipmunkConstraint
+
+@synthesize userData = _userData;
+
++(ChipmunkConstraint *)constraintFromCPConstraint:(cpConstraint *)constraint
+{	
+	ChipmunkConstraint *obj = constraint->userData;
+	cpAssertHard([obj isKindOfClass:[ChipmunkConstraint class]], "'constraint->data' is not a pointer to a ChipmunkConstraint object.");
+	
+	return obj;
+}
+
+- (void) dealloc
+{
+	cpConstraint *constraint = self.constraint;
+	[self.bodyA release];
+	[self.bodyB release];
+	cpConstraintDestroy(constraint);
+	
+	[super dealloc];
+}
+
+- (cpConstraint *)constraint
+{
+	[self doesNotRecognizeSelector:_cmd];
+	return nil;
+}
+
+// accessor macros
+#define getter(type, lower, upper) \
+- (type)lower {return cpConstraintGet##upper(self.constraint);}
+#define setter(type, lower, upper) \
+- (void)set##upper:(type)value {cpConstraintSet##upper(self.constraint, value);};
+#define both(type, lower, upper) \
+getter(type, lower, upper) \
+setter(type, lower, upper)
+
+both(cpFloat, maxForce, MaxForce)
+both(cpFloat, errorBias, ErrorBias)
+both(cpFloat, maxBias, MaxBias)
+both(BOOL, collideBodies, CollideBodies)
+
+-(cpFloat)impulse {return cpConstraintGetImpulse(self.constraint);}
+
+-(ChipmunkSpace *)space {
+	cpSpace *space = cpConstraintGetSpace(self.constraint);
+	return (ChipmunkSpace *)(space ? cpSpaceGetUserData(space) : nil);
+}
+
+- (ChipmunkBody *)bodyA
+{
+	cpBody *body = cpConstraintGetBodyA(self.constraint);
+	return (body ? cpBodyGetUserData(body) : nil);
+}
+
+//- (void)setBodyA:(ChipmunkBody *)value {
+//	if(self.bodyA != value){
+//		[self.bodyA release];
+//		self.constraint->a = [[value retain] body];
+//	}
+//}
+
+- (ChipmunkBody *)bodyB
+{
+	cpBody *body = cpConstraintGetBodyB(self.constraint);
+	return (body ? cpBodyGetUserData(body) : nil);
+}
+
+//- (void)setBodyB:(ChipmunkBody *)value {
+//	if(self.bodyB != value){
+//		[self.bodyB release];
+//		self.constraint->b = [[value retain] body];
+//	}
+//}
+
+- (NSArray *)chipmunkObjects {return [NSArray arrayWithObject:self];}
+- (void)addToSpace:(ChipmunkSpace *)space {[space addConstraint:self];}
+- (void)removeFromSpace:(ChipmunkSpace *)space {[space removeConstraint:self];}
+
+-(void)preSolve:(ChipmunkSpace *)space {}
+-(void)postSolve:(ChipmunkSpace *)space {}
+
+// MARK: Callbacks
+static void
+PreSolve(cpConstraint *constraint, cpSpace *space)
+{
+	[(ChipmunkConstraint *)constraint->userData preSolve:(ChipmunkSpace *)space->userData];
+}
+
+static void
+PostSolve(cpConstraint *constraint, cpSpace *space)
+{
+	[(ChipmunkConstraint *)constraint->userData postSolve:(ChipmunkSpace *)space->userData];
+}
+
+// Check if the method was overridden.
+// No reason to add the extra method overhead if it's not needed.
+-(BOOL)methodIsOverriden:(SEL)selector
+{
+	return ([self methodForSelector:selector] != [[ChipmunkConstraint class] instanceMethodForSelector:selector]);
+}
+
+-(void)setupCallbacks
+{
+	if([self methodIsOverriden:@selector(preSolve:)]){
+		cpConstraintSetPreSolveFunc(self.constraint, PreSolve);
+	}
+	
+	if([self methodIsOverriden:@selector(postSolve:)]){
+		cpConstraintSetPostSolveFunc(self.constraint, PostSolve);
+	}
+}
+
+@end
+
+// accessor macros
+#define getter2(type, struct, lower, upper) \
+- (type)lower {return struct##Get##upper((cpConstraint *)&_constraint);}
+#define setter2(type, struct, lower, upper) \
+- (void)set##upper:(type)value {struct##Set##upper((cpConstraint *)&_constraint, value);};
+#define both2(type, struct, lower, upper) \
+getter2(type, struct, lower, upper) \
+setter2(type, struct, lower, upper)
+
+
+@implementation ChipmunkPinJoint {
+	cpPinJoint _constraint;
+}
+
++ (id)pinJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b anchorA:anchorA anchorB:anchorB] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpPinJointInit(&_constraint, a.body, b.body, anchorA, anchorB);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpVect, cpPinJoint, anchorA, AnchorA)
+both2(cpVect, cpPinJoint, anchorB, AnchorB)
+both2(cpFloat, cpPinJoint, dist, Dist)
+
+@end
+
+
+@implementation ChipmunkSlideJoint {
+	cpSlideJoint _constraint;
+}
+
++ (id)slideJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB min:(cpFloat)min max:(cpFloat)max
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b anchorA:anchorA anchorB:anchorB min:min max:max] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB min:(cpFloat)min max:(cpFloat)max
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpSlideJointInit(&_constraint, a.body, b.body, anchorA, anchorB, min, max);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpVect, cpSlideJoint, anchorA, AnchorA)
+both2(cpVect, cpSlideJoint, anchorB, AnchorB)
+both2(cpFloat, cpSlideJoint, min, Min)
+both2(cpFloat, cpSlideJoint, max, Max)
+
+@end
+
+
+@implementation ChipmunkPivotJoint {
+	cpPivotJoint _constraint;
+}
+
++ (id)pivotJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b anchorA:anchorA anchorB:anchorB] autorelease];
+}
+
++ (id)pivotJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b pivot:(cpVect)pivot
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b pivot:pivot] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpPivotJointInit(&_constraint, a.body, b.body, anchorA, anchorB);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b pivot:(cpVect)pivot
+{
+	return [self initWithBodyA:a bodyB:b anchorA:[a worldToLocal:pivot] anchorB:[b worldToLocal:pivot]];
+}
+
+both2(cpVect, cpPivotJoint, anchorA, AnchorA)
+both2(cpVect, cpPivotJoint, anchorB, AnchorB)
+
+@end
+
+
+@implementation ChipmunkGrooveJoint {
+	cpGrooveJoint _constraint;
+}
+
++ (id)grooveJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b grooveA:(cpVect)grooveA grooveB:(cpVect)grooveB anchorB:(cpVect)anchorB
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b grooveA:grooveA grooveB:grooveB anchorB:anchorB] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b grooveA:(cpVect)grooveA grooveB:(cpVect)grooveB anchorB:(cpVect)anchorB
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpGrooveJointInit(&_constraint, a.body, b.body, grooveA, grooveB, anchorB);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpVect, cpGrooveJoint, grooveA, GrooveA)
+both2(cpVect, cpGrooveJoint, grooveB, GrooveB)
+both2(cpVect, cpGrooveJoint, anchorB, AnchorB)
+
+@end
+
+
+@implementation ChipmunkDampedSpring {
+	cpDampedSpring _constraint;
+}
+
++ (id)dampedSpringWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB restLength:(cpFloat)restLength stiffness:(cpFloat)stiffness damping:(cpFloat)damping
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b anchorA:anchorA anchorB:anchorB restLength:restLength stiffness:stiffness damping:damping] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b anchorA:(cpVect)anchorA anchorB:(cpVect)anchorB restLength:(cpFloat)restLength stiffness:(cpFloat)stiffness damping:(cpFloat)damping
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpDampedSpringInit(&_constraint, a.body, b.body, anchorA, anchorB, restLength, stiffness, damping);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpVect, cpDampedSpring, anchorA, AnchorA)
+both2(cpVect, cpDampedSpring, anchorB, AnchorB)
+both2(cpFloat, cpDampedSpring, restLength, RestLength)
+both2(cpFloat, cpDampedSpring, stiffness, Stiffness)
+both2(cpFloat, cpDampedSpring, damping, Damping)
+
+@end
+
+
+@implementation ChipmunkDampedRotarySpring {
+	cpDampedRotarySpring _constraint;
+}
+
++ (id)dampedRotarySpringWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b restAngle:(cpFloat)restAngle stiffness:(cpFloat)stiffness damping:(cpFloat)damping
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b restAngle:restAngle stiffness:stiffness damping:damping] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b restAngle:(cpFloat)restAngle stiffness:(cpFloat)stiffness damping:(cpFloat)damping
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpDampedRotarySpringInit(&_constraint, a.body, b.body, restAngle, stiffness, damping);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpFloat, cpDampedRotarySpring, restAngle, RestAngle)
+both2(cpFloat, cpDampedRotarySpring, stiffness, Stiffness)
+both2(cpFloat, cpDampedRotarySpring, damping, Damping)
+
+@end
+
+
+@implementation ChipmunkRotaryLimitJoint {
+	cpRotaryLimitJoint _constraint;
+}
+
++ (id)rotaryLimitJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b min:(cpFloat)min max:(cpFloat)max
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b min:min max:max] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b min:(cpFloat)min max:(cpFloat)max
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpRotaryLimitJointInit(&_constraint, a.body, b.body, min, max);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpFloat, cpRotaryLimitJoint, min, Min)
+both2(cpFloat, cpRotaryLimitJoint, max, Max)
+
+@end
+
+
+@implementation ChipmunkSimpleMotor {
+	cpSimpleMotor _constraint;
+}
+
++ (id)simpleMotorWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b rate:(cpFloat)rate
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b rate:rate] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b rate:(cpFloat)rate
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpSimpleMotorInit(&_constraint, a.body, b.body, rate);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpFloat, cpSimpleMotor, rate, Rate)
+
+@end
+
+
+@implementation ChipmunkGearJoint {
+	cpGearJoint _constraint;
+}
+
++ (id)gearJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratio:(cpFloat)ratio
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b phase:phase ratio:ratio] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratio:(cpFloat)ratio
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpGearJointInit(&_constraint, a.body, b.body, phase, ratio);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpFloat, cpGearJoint, phase, Phase)
+both2(cpFloat, cpGearJoint, ratio, Ratio)
+
+@end
+
+
+@implementation ChipmunkRatchetJoint {
+	cpRatchetJoint _constraint;
+}
+
++ (id)ratchetJointWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratchet:(cpFloat)ratchet
+{
+	return [[[self alloc] initWithBodyA:a bodyB:b phase:phase ratchet:ratchet] autorelease];
+}
+
+- (cpConstraint *)constraint {return (cpConstraint *)&_constraint;}
+
+- (id)initWithBodyA:(ChipmunkBody *)a bodyB:(ChipmunkBody *)b phase:(cpFloat)phase ratchet:(cpFloat)ratchet
+{
+	if((self = [super init])){
+		[a retain];
+		[b retain];
+		cpRatchetJointInit(&_constraint, a.body, b.body, phase, ratchet);
+		self.constraint->userData = self;
+		
+		[self setupCallbacks];
+	}
+	
+	return self;
+}
+
+both2(cpFloat, cpRatchetJoint, angle, Angle)
+both2(cpFloat, cpRatchetJoint, phase, Phase)
+both2(cpFloat, cpRatchetJoint, ratchet, Ratchet)
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkImageSampler.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkImageSampler.m
new file mode 100644
index 0000000..61be81e
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkImageSampler.m
@@ -0,0 +1,233 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+//
+//  ChipmunkImageSampler.m
+//  DeformableChipmunk
+//
+//  Created by Scott Lembcke on 8/26/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <TargetConditionals.h>
+
+#if TARGET_OS_IPHONE == 1
+	#import <ImageIO/ImageIO.h>
+#endif
+
+#import "ChipmunkImageSampler.h"
+
+@implementation ChipmunkBitmapSampler
+
+@synthesize width = _width, height = _height, bytesPerPixel = _bytesPerPixel, component = _component, pixelData = _pixelData, outputRect = _outputRect;
+
+// Much faster than (int)floor(f)
+// Profiling showed floor() to be a sizable performance hog
+static inline int
+floor_int(cpFloat f)
+{
+	int i = (int)f;
+	return (f < 0.0f && f != i ? i - 1 : i);
+}
+
+// TODO finish this?
+//static inline cpFloat
+//SampleFunc4444(cpVect point, ChipmunkImageSampler *self)
+//{
+//	int x = (int)point.x;
+//	int y = (int)point.y - (self->_flip ? self->_height - 1 : 0);
+//	
+//	int com = self->_component;
+//	int byte = self->_pixels[y*self->_stride + x*self->_bytesPerPixel + com/2];
+//	int value = 
+//	return (cpFloat)(byte>>())/15.0;
+//}
+
+static cpFloat
+SampleFunc8Clamp(cpVect point, ChipmunkBitmapSampler *self)
+{
+	unsigned long w = self->_width;
+	unsigned long h = self->_height;
+	
+	cpBB bb = self->_outputRect;
+	cpVect clamped = cpBBClampVect(bb, point);
+	
+	unsigned long x = floor_int((w - 1)*(clamped.x - bb.l)/(bb.r - bb.l) + 0.5);
+	unsigned long y = floor_int((h - 1)*(clamped.y - bb.b)/(bb.t - bb.b) + 0.5);
+	
+	if(self->_flip) y = h - 1 - y;
+	
+//	printf("(%6.2f, %6.2f) -> (% 4d, % 4d) : %d\n", point.x, point.y, x, y, self->_pixels[y*self->_stride + x*self->_bytesPerPixel + self->_component]);
+	return (cpFloat)self->_pixels[y*self->_stride + x*self->_bytesPerPixel + self->_component]/255.0;
+}
+
+static cpFloat
+SampleFunc8Border(cpVect point, ChipmunkBitmapSampler *self)
+{
+	unsigned long w = self->_width;
+	unsigned long h = self->_height;
+	
+	cpBB bb = self->_outputRect;
+	if(cpBBContainsVect(bb, point)){
+		unsigned long x = floor_int((w - 1)*(point.x - bb.l)/(bb.r - bb.l) + 0.5);
+		unsigned long y = floor_int((h - 1)*(point.y - bb.b)/(bb.t - bb.b) + 0.5);
+		
+		if(self->_flip) y = h - 1 - y;
+		
+//		printf("(%6.2f, %6.2f) -> (% 4d, % 4d)\n", point.x, point.y, x, y);
+		return (cpFloat)self->_pixels[y*self->_stride + x*self->_bytesPerPixel + self->_component]/255.0;
+	} else {
+		return self->_borderValue;
+	}
+}
+
+-(id)initWithWidth:(NSUInteger)width height:(NSUInteger)height stride:(NSUInteger)stride bytesPerPixel:(NSUInteger)bytesPerPixel component:(NSUInteger)component flip:(bool)flip pixelData:(NSData *)pixelData
+{
+	if((self = [super initWithSamplingFunction:(cpMarchSampleFunc)SampleFunc8Clamp])){
+		_width = width;
+		_height = height;
+		_stride = stride;
+		
+		_bytesPerPixel = bytesPerPixel;
+		_component = component;
+		
+		_flip = flip;
+		_pixelData = [pixelData retain];
+		_pixels = [pixelData bytes];
+		
+		_outputRect = cpBBNew(0.5, 0.5, self.width - 0.5, self.height - 0.5);
+	}
+
+	return self;
+}
+
+
+- (void)dealloc
+{
+	[_pixelData release];
+	
+	[super dealloc];
+}
+
+-(void)setBorderRepeat
+{
+	_sampleFunc = (cpMarchSampleFunc)SampleFunc8Clamp;
+}
+
+-(void)setBorderValue:(cpFloat)borderValue
+{
+	_sampleFunc = (cpMarchSampleFunc)SampleFunc8Border;
+	_borderValue = borderValue;
+}
+
+static cpBB
+BorderedBB(cpBB bb, NSUInteger width, NSUInteger height)
+{
+	cpFloat xBorder = (bb.r - bb.l)/(cpFloat)(width - 1);
+	cpFloat yBorder = (bb.t - bb.b)/(cpFloat)(height - 1);
+	
+	return cpBBNew(bb.l - xBorder, bb.b - yBorder, bb.r + xBorder, bb.t + yBorder);
+}
+
+-(ChipmunkPolylineSet *)marchAllWithBorder:(bool)bordered hard:(bool)hard
+{
+	NSUInteger width = self.width;
+	NSUInteger height = self.height;
+	cpBB bb = self.outputRect;
+	
+	if(bordered){
+		return [self march:BorderedBB(bb, width, height) xSamples:width+2 ySamples:height+2 hard:hard];
+	} else {
+		return [self march:bb xSamples:width ySamples:height hard:hard];
+	}
+}
+
+@end
+
+
+
+@implementation ChipmunkCGContextSampler
+
+@synthesize context = _context;
+
+-(NSMutableData *)pixelData {return (NSMutableData *)super.pixelData;}
+
+-(id)initWithWidth:(unsigned long)width height:(unsigned long)height colorSpace:(CGColorSpaceRef)colorSpace bitmapInfo:(CGBitmapInfo)bitmapInfo component:(NSUInteger)component
+{
+	// Need to create a context to get info about the context.
+	// If you let the context allocate it's own memory it seems to move it around. O_o
+	CGContextRef temp = CGBitmapContextCreate(NULL, width, height, 8, 0, colorSpace, bitmapInfo);
+	cpAssertHard(temp, "Failed to create temporary CGBitmapContext");
+	
+	unsigned long bpc = CGBitmapContextGetBitsPerComponent(temp);
+	unsigned long bpp = CGBitmapContextGetBitsPerPixel(temp)/8;
+	cpAssertHard(bpc == 8, "Cannot handle non-8bit-per-pixel bitmap data!");
+	
+	CGContextRelease(temp);	
+	
+	unsigned long stride = width*bpp;
+	NSMutableData *pixelData = [NSMutableData dataWithLength:stride*height];
+	_context = CGBitmapContextCreate([pixelData mutableBytes], width, height, bpc, stride, colorSpace, bitmapInfo);
+	
+	return [self initWithWidth:width height:height stride:stride bytesPerPixel:bpp component:component flip:TRUE pixelData:pixelData];
+}
+
+-(void)dealloc
+{
+	CGContextRelease(_context);
+	
+	[super dealloc];
+}
+
+@end
+
+
+
+@implementation ChipmunkImageSampler
+
++(CGImageRef)loadImage:(NSURL *)url
+{
+	CGImageSourceRef image_source = CGImageSourceCreateWithURL((CFURLRef)url, NULL);
+	CGImageRef image = CGImageSourceCreateImageAtIndex(image_source, 0, NULL);
+	cpAssertHard(image, "Image %s could not be loaded.", [[url description] UTF8String]);
+	
+	CFRelease(image_source);
+	return image;
+}
+
+-(id)initWithImage:(CGImageRef)image isMask:(bool)isMask contextWidth:(NSUInteger)width contextHeight:(NSUInteger)height
+{
+	if(width == 0) width = CGImageGetWidth(image);
+	if(height == 0)  height = CGImageGetHeight(image);
+	
+	CGColorSpaceRef colorSpace = (isMask ? CGColorSpaceCreateDeviceGray() : NULL);
+	CGBitmapInfo bitmapInfo = (CGBitmapInfo)(isMask ? kCGImageAlphaNone : kCGImageAlphaOnly);
+	
+	if((self = [super initWithWidth:width height:height colorSpace:colorSpace bitmapInfo:bitmapInfo component:0])){
+		CGContextDrawImage(self.context, CGRectMake(0, 0, width, height), image);
+	}
+	
+	CGColorSpaceRelease(colorSpace);
+	
+	return self;
+}
+
+-(id)initWithImageFile:(NSURL *)url isMask:(bool)isMask
+{
+	CGImageRef image = [[self class] loadImage:url];
+	unsigned long width = CGImageGetWidth(image);
+	unsigned long height = CGImageGetHeight(image);
+	
+	self = [self initWithImage:image isMask:isMask contextWidth:width contextHeight:height];
+	
+	CGImageRelease(image);
+	
+	return self;
+}
+
++(ChipmunkImageSampler *)samplerWithImageFile:(NSURL *)url isMask:(bool)isMask
+{
+	return [[[self alloc] initWithImageFile:url	isMask:isMask] autorelease];
+}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkMultiGrab.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkMultiGrab.m
new file mode 100644
index 0000000..9d4927d
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkMultiGrab.m
@@ -0,0 +1,264 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#import "ChipmunkMultiGrab.h"
+
+
+// A constraint subclass that tracks a grab point
+@interface ChipmunkGrab() <ChipmunkObject>
+
+@property(nonatomic, readwrite) cpVect pos;
+@property(nonatomic, readonly) NSArray *chipmunkObjects;
+
+@end
+
+
+@implementation ChipmunkGrab
+
+@synthesize pos = _pos;
+@synthesize chipmunkObjects = _chipmunkObjects;
+@synthesize grabbedShape = _grabbedShape;
+@synthesize data = _data;
+
+static void 
+GrabPreSolve(cpConstraint *constraint, cpSpace *space)
+{
+	cpBody *grabBody = cpConstraintGetBodyA(constraint);
+	ChipmunkGrab *grab = [ChipmunkConstraint constraintFromCPConstraint:constraint].userData;
+	cpFloat dt = cpSpaceGetCurrentTimeStep(space);
+	cpFloat coef = cpfpow(grab->_smoothing, dt);
+	
+	// Smooth out the mouse position.
+	cpVect pos = cpvlerp(grab->_pos, cpBodyGetPosition(grabBody), coef);
+	cpBodySetVelocity(grabBody, cpvmult(cpvsub(pos, cpBodyGetPosition(grabBody)), 1.0/dt));
+//	cpBodySetPosition(grabBody, pos);
+}
+
+// Body will be nil if no object was grabbed.
+-(id)initWithMultiGrab:(ChipmunkMultiGrab *)multiGrab pos:(cpVect)pos nearest:(cpVect)nearest
+	body:(ChipmunkBody *)body grabbedShape:(ChipmunkShape *)grabbedShape
+	chipmunkObjects:(NSArray *)chipmunkObjects
+{
+	ChipmunkBody *grabBody = [ChipmunkBody kinematicBody];
+	grabBody.position = pos;
+	// TODO the repeated appending is a little silly here.
+	chipmunkObjects = [chipmunkObjects arrayByAddingObject:grabBody];
+	
+	if((self = [super init])){
+		_pos = pos;
+		_smoothing = multiGrab.smoothing;
+		_grabbedShape = grabbedShape;
+		
+		if(body){
+			ChipmunkPivotJoint *pivot = [ChipmunkPivotJoint pivotJointWithBodyA:grabBody bodyB:body anchorA:cpvzero anchorB:[body worldToLocal:nearest]];
+			pivot.maxForce = multiGrab.grabForce;
+			pivot.userData = self;
+			cpConstraintSetPreSolveFunc(pivot.constraint, GrabPreSolve);
+			chipmunkObjects = [chipmunkObjects arrayByAddingObject:pivot];
+			
+			if(grabbedShape){
+				cpFloat frictionForce = multiGrab.grabFriction;
+				if(frictionForce > 0.0 && (1.0/body.mass + 1.0/grabBody.mass != 0.0)){
+					ChipmunkPivotJoint *friction = [ChipmunkPivotJoint pivotJointWithBodyA:grabBody bodyB:body anchorA:cpvzero anchorB:[body worldToLocal:nearest]];
+					friction.maxForce = frictionForce;
+					friction.maxBias = 0.0;
+					chipmunkObjects = [chipmunkObjects arrayByAddingObject:friction];
+				}
+				
+				cpFloat rotaryFriction = multiGrab.grabRotaryFriction;
+				if(rotaryFriction > 0.0 && (1.0/body.moment + 1.0/grabBody.moment != 0.0)){
+					ChipmunkGearJoint *friction = [ChipmunkGearJoint gearJointWithBodyA:grabBody bodyB:body phase:0.0 ratio:1.0];
+					friction.maxForce = rotaryFriction;
+					friction.maxBias = 0.0;
+					chipmunkObjects = [chipmunkObjects arrayByAddingObject:friction];
+				}
+			}
+			
+			_chipmunkObjects = [chipmunkObjects retain];
+		}
+	}
+	
+	return self;
+}
+
+-(void)dealloc
+{
+	[_chipmunkObjects release]; _chipmunkObjects = nil;
+	[super dealloc];
+}
+
+@end
+
+
+@implementation ChipmunkMultiGrab
+
+@synthesize grabForce = _grabForce;
+@synthesize smoothing = _smoothing;
+
+@synthesize filter = _filter;
+@synthesize grabFilter = _grabFilter;
+@synthesize grabSort = _grabSort;
+
+@synthesize grabFriction = _grabFriction, grabRotaryFriction = _grabRotaryFriction;
+@synthesize grabRadius = _grabRadius;
+
+@synthesize pullMode = _pullMode, pushMode = _pushMode;
+
+@synthesize pushMass = _pushMass;
+@synthesize pushFriction = _pushFriction, pushElasticity = _pushElasticity;
+@synthesize pushCollisionType = _pushCollisionType;
+
+-(id)initForSpace:(ChipmunkSpace *)space withSmoothing:(cpFloat)smoothing withGrabForce:(cpFloat)grabForce
+{
+	if((self = [super init])){
+		_space = [space retain];
+		_grabs = [[NSMutableArray alloc] init];
+		
+		_smoothing = smoothing;
+		_grabForce = grabForce;
+		
+		_filter = CP_SHAPE_FILTER_ALL;
+		
+		_grabFilter = ^(ChipmunkShape *shape){return (bool)TRUE;};
+		_grabSort = ^(ChipmunkShape *shape, cpFloat depth){return depth;};
+		
+		_pullMode = TRUE;
+		_pushMode = FALSE;
+	}
+	
+	return self;
+}
+
+-(void)dealloc
+{
+	[_space release];
+	[_grabs release];
+	
+	[super dealloc];
+}
+
+// Don't integrate push bodies.
+static void PushBodyVelocityUpdate(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt){}
+
+-(ChipmunkGrab *)beginLocation:(cpVect)pos
+{
+	__block cpFloat min = INFINITY;
+	__block cpVect nearest = pos;
+	__block ChipmunkShape *grabbedShape = nil;
+	
+	if(_pullMode){
+		cpSpacePointQuery_b(_space.space, pos, _grabRadius, _filter, ^(cpShape *c_shape, cpVect point, cpFloat dist, cpVect gradient){
+			ChipmunkShape *shape = [ChipmunkShape shapeFromCPShape:c_shape];
+			cpFloat sort = dist;
+			
+			// Call the sorting callback if dist is negative.
+			// Otherwise just take the nearest shape.
+			if(dist <= 0.0f){
+				sort = -_grabSort(shape, -dist);
+				cpAssertWarn(sort <= 0.0f, "You must return a positive value from the sorting callback.");
+			}
+			
+			if(sort < min && cpBodyGetMass(cpShapeGetBody(c_shape)) != INFINITY){
+				if(_grabFilter(shape)){
+					min = sort;
+					nearest = (dist > 0.0 ? point : pos);
+					grabbedShape = shape;
+				}
+			}
+		});
+	}
+	
+	ChipmunkBody *pushBody = nil;
+	NSArray *chipmunkObjects = [NSArray array];
+	
+	if(!grabbedShape && _pushMode){
+		pushBody = [ChipmunkBody bodyWithMass:_pushMass andMoment:INFINITY];
+		pushBody.position = pos;
+		cpBodySetVelocityUpdateFunc(pushBody.body, PushBodyVelocityUpdate);
+		
+		ChipmunkShape *pushShape = [ChipmunkCircleShape circleWithBody:pushBody radius:_grabRadius offset:cpvzero];
+		pushShape.friction = _pushFriction;
+		pushShape.elasticity = _pushElasticity;
+		pushShape.filter = _filter;
+		pushShape.collisionType = _pushCollisionType;
+		
+		chipmunkObjects = [NSArray arrayWithObjects:pushBody, pushShape, nil];
+	}
+	
+	ChipmunkBody *grabBody = (grabbedShape ? grabbedShape.body : pushBody);
+	ChipmunkGrab *grab = [[ChipmunkGrab alloc] initWithMultiGrab:self pos:pos nearest:nearest body:grabBody grabbedShape:grabbedShape chipmunkObjects:chipmunkObjects];
+	
+	[_grabs addObject:grab];
+	[_space add:grab];
+	[grab release];
+	
+	return (grab.grabbedShape ? grab : nil);
+}
+
+static ChipmunkGrab *
+BestGrab(NSArray *grabs, cpVect pos)
+{
+	ChipmunkGrab *match = nil;
+	cpFloat best = INFINITY;
+	
+	for(ChipmunkGrab *grab in grabs){
+		cpFloat dist = cpvdistsq(pos, grab.pos);
+		if(dist < best){
+			match = grab;
+			best = dist;
+		}
+	}
+	
+	return match;
+}
+
+-(ChipmunkGrab *)updateLocation:(cpVect)pos
+{
+	ChipmunkGrab *grab = BestGrab(_grabs, pos);
+	grab.pos = pos;
+	
+	return (grab.grabbedShape ? grab : nil);
+}
+
+-(ChipmunkGrab *)endLocation:(cpVect)pos
+{
+	cpAssertHard([_grabs count] != 0, "Grab set is already empty!");
+	ChipmunkGrab *grab = BestGrab(_grabs, pos);
+	[grab retain];
+	
+	[_space remove:grab];
+	[_grabs removeObject:grab];
+	
+	[grab autorelease];
+	return (grab.grabbedShape ? grab : nil);
+}
+
+-(NSArray *)grabs
+{
+	NSMutableArray *grabs = [NSMutableArray array];
+	for(ChipmunkGrab *grab in _grabs){
+		if(grab.grabbedShape) [grabs addObject:grab];
+	}
+	
+	return grabs;
+}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkPointCloudSampler.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkPointCloudSampler.m
new file mode 100644
index 0000000..8e858ad
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkPointCloudSampler.m
@@ -0,0 +1,81 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#import "ChipmunkPointCloudSampler.h"
+
+
+typedef struct DeformPoint {
+	cpVect pos;
+	cpFloat radius;
+	cpFloat fuzz;
+} DeformPoint;
+
+static cpBB
+PointBB(DeformPoint *point)
+{
+	cpVect v = point->pos;
+	cpFloat r = point->radius;
+	
+	return cpBBNew(v.x - r, v.y - r, v.x + r, v.y + r);
+}
+
+
+
+@implementation ChipmunkPointCloudSampler
+
+static inline cpFloat
+fuzz(cpVect v, cpVect c, cpFloat r, cpFloat softness)
+{
+	cpFloat distsq = cpvdistsq(v, c);
+	return (distsq < r*r ? 1.0f - cpfclamp01((r - cpfsqrt(distsq))/(softness*r)) : 1.0f);
+}
+
+static void
+PointQuery(cpVect *v, DeformPoint *point, cpCollisionID id, cpFloat *density)
+{
+	(*density) *= fuzz(*v, point->pos, point->radius, point->fuzz);
+}
+
+static cpFloat
+PointCloudSample(ChipmunkPointCloudSampler *cloud, cpVect pos)
+{
+	cpFloat density = 1.0f;
+	cpSpatialIndexQuery(cloud->_index, &pos, cpBBNewForCircle(pos, 0.0f), (cpSpatialIndexQueryFunc)PointQuery, &density);
+	
+	return density;
+}
+
+- (id)initWithCellSize:(cpFloat)cellSize
+{
+	if((self = [super initWithSamplingFunction:(cpMarchSampleFunc)PointCloudSample])){
+		_cellSize = cellSize;
+		// TODO table size
+		_index = cpSpaceHashNew(cellSize, 1000, (cpSpatialIndexBBFunc)PointBB, NULL);
+	}
+	
+	return self;
+}
+
+static void freeWrap(void *ptr, void *unused){cpfree(ptr);}
+
+- (void)dealloc
+{
+	cpSpatialIndexEach(_index, (cpSpatialIndexIteratorFunc)freeWrap, NULL);
+	cpSpatialIndexFree(_index);
+	
+	[super dealloc];
+}
+
+-(cpBB)addPoint:(cpVect)pos radius:(cpFloat)radius fuzz:(cpFloat)fuzz
+{
+	DeformPoint *point = (DeformPoint *)cpcalloc(1, sizeof(DeformPoint));
+	point->pos = pos;
+	point->radius = radius;
+	point->fuzz = fuzz;
+	
+	cpSpatialIndexInsert(_index, point, (cpHashValue)point);
+	
+	return PointBB(point);
+}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkShape.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkShape.m
new file mode 100644
index 0000000..5042811
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkShape.m
@@ -0,0 +1,330 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+
+@interface ChipmunkSpace(DoubleDispatch)
+
+- (ChipmunkShape *)addShape:(ChipmunkShape *)obj;
+- (ChipmunkShape *)removeShape:(ChipmunkShape *)obj;
+
+@end
+
+@implementation ChipmunkShape
+
+@synthesize userData = _userData;
+
++(ChipmunkShape *)shapeFromCPShape:(cpShape *)shape
+{
+	ChipmunkShape *obj = shape->userData;
+	cpAssertHard([obj isKindOfClass:[ChipmunkShape class]], "'shape->data' is not a pointer to a ChipmunkShape object.");
+	
+	return obj;
+}
+
+- (void) dealloc {
+	[self.body release];
+	cpShapeDestroy(self.shape);
+	[super dealloc];
+}
+
+
+- (cpShape *)shape {
+	[self doesNotRecognizeSelector:_cmd];
+	return nil;
+}
+
+- (ChipmunkBody *)body {
+	cpBody *body = cpShapeGetBody(self.shape);
+	return (body ? cpBodyGetUserData(body) : nil);
+}
+
+- (void)setBody:(ChipmunkBody *)body {
+	if(self.body != body){
+		[self.body release];
+		cpShapeSetBody(self.shape, [body retain].body);
+	}
+}
+
+-(cpFloat)mass {return cpShapeGetMass(self.shape);}
+-(void)setMass:(cpFloat)mass {cpShapeSetMass(self.shape, mass);}
+
+-(cpFloat)density {return cpShapeGetDensity(self.shape);}
+-(void)setDensity:(cpFloat)density {cpShapeSetDensity(self.shape, density);}
+
+-(cpFloat)moment {return cpShapeGetMoment(self.shape);}
+-(cpFloat)area {return cpShapeGetArea(self.shape);}
+-(cpVect)centerOfGravity {return cpShapeGetCenterOfGravity(self.shape);}
+
+// accessor macros
+#define getter(type, lower, upper) \
+- (type)lower {return cpShapeGet##upper(self.shape);}
+#define setter(type, lower, upper) \
+- (void)set##upper:(type)value {cpShapeSet##upper(self.shape, value);};
+#define both(type, lower, upper) \
+getter(type, lower, upper) \
+setter(type, lower, upper)
+
+getter(cpBB, bb, BB)
+both(BOOL, sensor, Sensor)
+both(cpFloat, elasticity, Elasticity)
+both(cpFloat, friction, Friction)
+both(cpVect, surfaceVelocity, SurfaceVelocity)
+both(cpCollisionType, collisionType, CollisionType)
+both(cpShapeFilter, filter, Filter)
+
+-(ChipmunkSpace *)space {
+	cpSpace *space = cpShapeGetSpace(self.shape);
+	return (ChipmunkSpace *)(space ? cpSpaceGetUserData(space) : nil);
+}
+
+- (cpBB)cacheBB {return cpShapeCacheBB(self.shape);}
+
+- (ChipmunkPointQueryInfo *)pointQuery:(cpVect)point
+{
+	cpPointQueryInfo info;
+	cpShapePointQuery(self.shape, point, &info);
+	return (info.shape ? [[[ChipmunkPointQueryInfo alloc] initWithInfo:&info] autorelease] : nil);
+}
+
+- (ChipmunkSegmentQueryInfo *)segmentQueryFrom:(cpVect)start to:(cpVect)end radius:(cpFloat)radius
+{
+	cpSegmentQueryInfo info;
+	if(cpShapeSegmentQuery(self.shape, start, end, radius, &info)){
+		return [[[ChipmunkSegmentQueryInfo alloc] initWithInfo:&info start:start end:end] autorelease];
+	} else {
+		return nil;
+	}
+}
+
+
+- (NSArray *)chipmunkObjects {return [NSArray arrayWithObject:self];}
+- (void)addToSpace:(ChipmunkSpace *)space {[space addShape:self];}
+- (void)removeFromSpace:(ChipmunkSpace *)space {[space removeShape:self];}
+
+@end
+
+
+@implementation ChipmunkPointQueryInfo
+
+- (id)initWithInfo:(cpPointQueryInfo *)info
+{
+	if((self = [super init])){
+		_info = (*info);
+		[self.shape retain];
+	}
+	
+	return self;
+}
+
+- (cpPointQueryInfo *)info {return &_info;}
+- (ChipmunkShape *)shape {return (_info.shape ? _info.shape->userData : nil);}
+- (cpVect)point {return _info.point;}
+- (cpFloat)distance {return _info.distance;}
+- (cpVect)gradient {return _info.gradient;}
+
+- (void)dealloc
+{
+	[self.shape release];
+	[super dealloc];
+}
+
+
+@end
+
+
+@implementation ChipmunkSegmentQueryInfo
+
+- (id)initWithInfo:(cpSegmentQueryInfo *)info start:(cpVect)start end:(cpVect)end
+{
+	if((self = [super init])){
+		_info = (*info);
+		_start = start;
+		_end = end;
+		
+		[self.shape retain];
+	}
+	
+	return self;
+}
+
+- (cpSegmentQueryInfo *)info {return &_info;}
+- (ChipmunkShape *)shape {return (_info.shape ? _info.shape->userData : nil);}
+- (cpFloat)t {return _info.alpha;}
+- (cpVect)normal {return _info.normal;}
+- (cpVect)point {return _info.point;}
+- (cpFloat)dist {return cpvdist(_start, _end)*_info.alpha;}
+- (cpVect)start {return _start;}
+- (cpVect)end {return _end;}
+
+- (void)dealloc
+{
+	[self.shape release];
+	[super dealloc];
+}
+
+
+@end
+
+
+@implementation ChipmunkShapeQueryInfo
+
+@synthesize shape = _shape;
+- (cpContactPointSet *)contactPoints {return &_contactPoints;}
+
+- (id)initWithShape:(ChipmunkShape *)shape andPoints:(cpContactPointSet *)set
+{
+	if((self = [super init])){
+		_shape = [shape retain];
+		_contactPoints = *set;
+	}
+	
+	return self;
+}
+
+- (void)dealloc {
+	[_shape release];
+	[super dealloc];
+}
+
+@end
+
+@implementation ChipmunkCircleShape {
+	cpCircleShape _shape;
+}
+
+
++ (ChipmunkCircleShape *)circleWithBody:(ChipmunkBody *)body radius:(cpFloat)radius offset:(cpVect)offset
+{
+	return [[[self alloc] initWithBody:body radius:radius offset:offset] autorelease];
+}
+
+- (cpShape *)shape {return (cpShape *)&_shape;}
+
+- (id)initWithBody:(ChipmunkBody *)body radius:(cpFloat)radius offset:(cpVect)offset {
+	if((self = [super init])){
+		[body retain];
+		cpCircleShapeInit(&_shape, body.body, radius, offset);
+		self.shape->userData = self;
+	}
+	
+	return self;
+}
+
+- (cpFloat)radius {return cpCircleShapeGetRadius((cpShape *)&_shape);}
+- (cpVect)offset {return cpCircleShapeGetOffset((cpShape *)&_shape);}
+
+@end
+
+
+@implementation ChipmunkSegmentShape {
+	cpSegmentShape _shape;
+}
+
++ (ChipmunkSegmentShape *)segmentWithBody:(ChipmunkBody *)body from:(cpVect)a to:(cpVect)b radius:(cpFloat)radius
+{
+	return [[[self alloc] initWithBody:body from:a to:b radius:radius] autorelease];
+}
+
+- (cpShape *)shape {return (cpShape *)&_shape;}
+
+- (id)initWithBody:(ChipmunkBody *)body from:(cpVect)a to:(cpVect)b radius:(cpFloat)radius {
+	if((self = [super init])){
+		[body retain];
+		cpSegmentShapeInit(&_shape, body.body, a, b, radius);
+		self.shape->userData = self;
+	}
+	
+	return self;
+}
+
+- (void)setPrevNeighbor:(cpVect)prev nextNeighbor:(cpVect)next
+{
+	cpSegmentShapeSetNeighbors((cpShape *)&_shape, prev, next);
+}
+
+- (cpVect)a {return cpSegmentShapeGetA((cpShape *)&_shape);}
+- (cpVect)b {return cpSegmentShapeGetB((cpShape *)&_shape);}
+- (cpVect)normal {return cpSegmentShapeGetNormal((cpShape *)&_shape);}
+- (cpFloat)radius {return cpSegmentShapeGetRadius((cpShape *)&_shape);}
+
+@end
+
+
+@implementation ChipmunkPolyShape {
+	cpPolyShape _shape;
+}
+
++ (id)polyWithBody:(ChipmunkBody *)body count:(int)count verts:(const cpVect *)verts transform:(cpTransform)transform radius:(cpFloat)radius
+{
+	return [[[self alloc] initWithBody:body count:count verts:verts transform:transform radius:radius] autorelease];
+}
+
++ (id)boxWithBody:(ChipmunkBody *)body width:(cpFloat)width height:(cpFloat)height radius:(cpFloat)radius
+{
+	return [[[self alloc] initBoxWithBody:body width:width height:height radius:radius] autorelease];
+}
+
++ (id)boxWithBody:(ChipmunkBody *)body bb:(cpBB)bb radius:(cpFloat)radius
+{
+	return [[[self alloc] initBoxWithBody:body bb:bb radius:radius] autorelease];
+}
+
+- (cpShape *)shape {return (cpShape *)&_shape;}
+
+- (id)initWithBody:(ChipmunkBody *)body count:(int)count verts:(const cpVect *)verts transform:(cpTransform)transform radius:(cpFloat)radius
+{
+	if((self = [super init])){
+		[body retain];
+		cpPolyShapeInit(&_shape, body.body, count, verts, transform, radius);
+		self.shape->userData = self;
+	}
+	
+	return self;
+}
+
+- (id)initBoxWithBody:(ChipmunkBody *)body width:(cpFloat)width height:(cpFloat)height radius:(cpFloat)radius
+{
+	if((self = [super init])){
+		[body retain];
+		cpBoxShapeInit(&_shape, body.body, width, height, radius);
+		self.shape->userData = self;
+	}
+	
+	return self;
+}
+
+- (id)initBoxWithBody:(ChipmunkBody *)body bb:(cpBB)bb radius:(cpFloat)radius
+{
+	if((self = [super init])){
+		[body retain];
+		cpBoxShapeInit2(&_shape, body.body, bb, radius);
+		self.shape->userData = self;
+	}
+	
+	return self;
+}
+
+- (int)count {return cpPolyShapeGetCount((cpShape *)&_shape);}
+- (cpFloat)radius {return cpPolyShapeGetRadius((cpShape *)&_shape);}
+- (cpVect)getVertex:(int)index {return cpPolyShapeGetVert((cpShape *)&_shape, index);}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkSpace.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkSpace.m
new file mode 100644
index 0000000..7eebc83
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkSpace.m
@@ -0,0 +1,575 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#import "ObjectiveChipmunk/ObjectiveChipmunk.h"
+#import "chipmunk/chipmunk_private.h"
+#import "chipmunk/cpHastySpace.h"
+
+#import <objc/message.h>
+#import <TargetConditionals.h>
+
+// Just in case the user doesn't have -ObjC in their linker flags.
+// Annoyingly, this is the case more often than not.
+@interface NSArrayChipmunkObject : NSArray<ChipmunkObject>
+
+@property(nonatomic, retain) NSArray *chipmunkObjects;
+
+@end
+
+@implementation NSArrayChipmunkObject
+
+@synthesize chipmunkObjects = _chipmunkObjects;
+
+-(id)initWithArray:(NSArray *)objects {
+	if((self = [super init])){
+		self.chipmunkObjects = objects;
+	}
+	
+	return self;
+}
+
+-(NSUInteger)count
+{
+	return [_chipmunkObjects count];
+}
+
+-(id)objectAtIndex:(NSUInteger)index
+{
+	return [_chipmunkObjects objectAtIndex:index];
+}
+
+@end
+
+@implementation NSArray(ChipmunkObject)
+
+-(id<NSFastEnumeration>)chipmunkObjects
+{
+	return self;
+}
+
+@end
+
+
+// Private class used to wrap the statically allocated staticBody attached to each space.
+@interface _ChipmunkStaticBodySingleton : ChipmunkBody {
+	cpBody *_bodyPtr;
+	ChipmunkSpace *space; // weak ref
+}
+
+@end
+
+typedef struct HandlerContext {
+	ChipmunkSpace *space;
+	id delegate;
+	cpCollisionType typeA, typeB;
+	SEL beginSelector;
+	SEL preSolveSelector;
+	SEL postSolveSelector;
+	SEL separateSelector;
+} HandlerContext;
+
+@implementation ChipmunkSpace
+
++(ChipmunkSpace *)spaceFromCPSpace:(cpSpace *)space
+{	
+	ChipmunkSpace *obj = space->userData;
+	cpAssertHard([obj isKindOfClass:[ChipmunkSpace class]], "'space->data' is not a pointer to a ChipmunkSpace object.");
+	
+	return obj;
+}
+
++(instancetype)allocWithZone:(struct _NSZone *)zone
+{
+    Class class = self;
+#if CHIPMUNK_SPACE_USE_HASTY_SPACE
+    if (self == [ChipmunkSpace class]) {
+        class = [ChipmunkHastySpace class];
+    }
+#endif
+
+	return NSAllocateObject(class, 0, zone);
+}
+
+- (id)initWithSpace:(cpSpace *)space
+{
+	if((self = [super init])){
+		_children = [[NSMutableSet alloc] init];
+		_handlers = [[NSMutableArray alloc] init];
+		
+		_space = space;
+		cpSpaceSetUserData(_space, self);
+		
+		_staticBody = [[ChipmunkBody alloc] initWithMass:0.0f andMoment:0.0f];
+		_staticBody.type = CP_BODY_TYPE_STATIC;
+		cpSpaceSetStaticBody(_space, _staticBody.body);
+	}
+	
+	return self;
+}
+
+- (id)init {
+	return [self initWithSpace:cpSpaceNew()];
+}
+
+-(void)freeSpace
+{
+	cpSpaceFree(_space);
+}
+
+- (void) dealloc {
+	[self freeSpace];
+	[_staticBody release];
+	
+	[_children release];
+	[_handlers release];
+	
+	[super dealloc];
+}
+
+- (cpSpace *)space {return _space;}
+
+@synthesize userData = _userData;
+
+// accessor macros
+#define getter(type, lower, upper) \
+- (type)lower {return cpSpaceGet##upper(_space);}
+#define setter(type, lower, upper) \
+- (void)set##upper:(type)value {cpSpaceSet##upper(_space, value);};
+#define both(type, lower, upper) \
+getter(type, lower, upper) \
+setter(type, lower, upper)
+
+both(int, iterations, Iterations);
+both(cpVect, gravity, Gravity);
+both(cpFloat, damping, Damping);
+both(cpFloat, idleSpeedThreshold, IdleSpeedThreshold);
+both(cpFloat, sleepTimeThreshold, SleepTimeThreshold);
+both(cpFloat, collisionSlop, CollisionSlop);
+both(cpFloat, collisionBias, CollisionBias);
+both(cpTimestamp, collisionPersistence, CollisionPersistence);
+getter(cpFloat, currentTimeStep, CurrentTimeStep);
+
+- (BOOL)isLocked {return cpSpaceIsLocked(_space);}
+- (BOOL)locked {return self.isLocked;}
+
+- (ChipmunkBody *)staticBody {return _staticBody;}
+
+typedef BOOL (*BeginProto)(id, SEL, cpArbiter *, ChipmunkSpace *);
+static bool Begin(cpArbiter *arb, struct cpSpace *space, HandlerContext *ctx){return ((BeginProto)objc_msgSend)(ctx->delegate, ctx->beginSelector, arb, ctx->space);}
+
+typedef BOOL (*PreSolveProto)(id, SEL, cpArbiter *, ChipmunkSpace *);
+static bool PreSolve(cpArbiter *arb, struct cpSpace *space, HandlerContext *ctx){return ((PreSolveProto)objc_msgSend)(ctx->delegate, ctx->preSolveSelector, arb, ctx->space);}
+
+typedef void (*PostSolveProto)(id, SEL, cpArbiter *, ChipmunkSpace *);
+static void PostSolve(cpArbiter *arb, struct cpSpace *space, HandlerContext *ctx){((PostSolveProto)objc_msgSend)(ctx->delegate, ctx->postSolveSelector, arb, ctx->space);}
+
+typedef void (*SeparateProto)(id, SEL, cpArbiter *, ChipmunkSpace *);
+static void Separate(cpArbiter *arb, struct cpSpace *space, HandlerContext *ctx){((SeparateProto)objc_msgSend)(ctx->delegate, ctx->separateSelector, arb, ctx->space);}
+
+// TODO handlers are never filtered.
+
+- (void)setDefaultCollisionHandler:(id)delegate
+	begin:(SEL)begin
+	preSolve:(SEL)preSolve
+	postSolve:(SEL)postSolve
+	separate:(SEL)separate
+{
+	cpCollisionType sentinel = (cpCollisionType)@"DEFAULT";
+	
+	HandlerContext context = {self, delegate, sentinel, sentinel, begin, preSolve, postSolve, separate};
+	NSData *data = [NSData dataWithBytes:&context length:sizeof(context)];
+	[_handlers addObject:data];
+	
+	cpCollisionHandler *handler = cpSpaceAddDefaultCollisionHandler(_space);
+	if(begin) handler->beginFunc = (cpCollisionBeginFunc)Begin;
+	if(preSolve) handler->preSolveFunc = (cpCollisionPreSolveFunc)PreSolve;
+	if(postSolve) handler->postSolveFunc = (cpCollisionPostSolveFunc)PostSolve;
+	if(separate) handler->separateFunc = (cpCollisionSeparateFunc)Separate;
+	handler->userData = (void *)[data bytes];
+}
+	
+- (void)addCollisionHandler:(id)delegate
+	typeA:(cpCollisionType)a typeB:(cpCollisionType)b
+	begin:(SEL)begin
+	preSolve:(SEL)preSolve
+	postSolve:(SEL)postSolve
+	separate:(SEL)separate
+{
+	HandlerContext context = {self, delegate, a, b, begin, preSolve, postSolve, separate};
+	NSData *data = [NSData dataWithBytes:&context length:sizeof(context)];
+	[_handlers addObject:data];
+	
+	cpCollisionHandler *handler = cpSpaceAddCollisionHandler(_space, a, b);
+	if(begin) handler->beginFunc = (cpCollisionBeginFunc)Begin;
+	if(preSolve) handler->preSolveFunc = (cpCollisionPreSolveFunc)PreSolve;
+	if(postSolve) handler->postSolveFunc = (cpCollisionPostSolveFunc)PostSolve;
+	if(separate) handler->separateFunc = (cpCollisionSeparateFunc)Separate;
+	handler->userData = (void *)[data bytes];
+}
+
+- (id)add:(NSObject<ChipmunkObject> *)obj
+{
+	if([obj conformsToProtocol:@protocol(ChipmunkBaseObject)]){
+		[(NSObject<ChipmunkBaseObject> *)obj addToSpace:self];
+	} else if([obj conformsToProtocol:@protocol(ChipmunkObject)]){
+		for(NSObject<ChipmunkBaseObject> *child in [obj chipmunkObjects]) [self add:child];
+	} else {
+		[NSException raise:@"NSArgumentError" format:@"Attempted to add an object of type %@ to a ChipmunkSpace.", [obj class]];
+	}
+	
+	[_children addObject:obj];
+	return obj;
+}
+
+- (id)remove:(NSObject<ChipmunkObject> *)obj
+{
+	if([obj conformsToProtocol:@protocol(ChipmunkBaseObject)]){
+		[(NSObject<ChipmunkBaseObject> *)obj removeFromSpace:self];
+	} else if([obj conformsToProtocol:@protocol(ChipmunkObject)]){
+		for(NSObject<ChipmunkBaseObject> *child in [obj chipmunkObjects]) [self remove:child];
+	} else {
+		[NSException raise:@"NSArgumentError" format:@"Attempted to remove an object of type %@ from a ChipmunkSpace.", [obj class]];
+	}
+	
+	[_children removeObject:obj];
+	return obj;
+}
+
+-(BOOL)contains:(NSObject<ChipmunkObject> *)obj
+{
+	return [_children containsObject:obj];
+}
+
+- (NSObject<ChipmunkObject> *)smartAdd:(NSObject<ChipmunkObject> *)obj
+{
+	if(cpSpaceIsLocked(_space)){
+		[self addPostStepAddition:obj];
+	} else {
+		[self add:obj];
+	}
+	
+	return obj;
+}
+
+- (NSObject<ChipmunkObject> *)smartRemove:(NSObject<ChipmunkObject> *)obj
+{
+	if(cpSpaceIsLocked(_space)){
+		[self addPostStepRemoval:obj];
+	} else {
+		[self remove:obj];
+	}
+	
+	return obj;
+}
+
+struct PostStepTargetContext {
+	id target;
+	SEL selector;
+};
+
+static void
+postStepPerform(cpSpace *unused, id key, struct PostStepTargetContext *context)
+{
+	[context->target performSelector:context->selector withObject:key];
+	
+	[context->target release];
+	cpfree(context);
+	[key release];
+}
+
+- (BOOL)addPostStepCallback:(id)target selector:(SEL)selector key:(id)key
+{
+	if(!cpSpaceGetPostStepCallback(_space, key)){
+		struct PostStepTargetContext *context = cpcalloc(1, sizeof(struct PostStepTargetContext));
+		(*context) = (struct PostStepTargetContext){target, selector};
+		cpSpaceAddPostStepCallback(_space, (cpPostStepFunc)postStepPerform, key, context);
+		
+		[target retain];
+		[key retain];
+		
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+static void
+postStepPerformBlock(cpSpace *unused, id key, ChipmunkPostStepBlock block)
+{
+	block();
+	
+	[block release];
+	[key release];
+}
+
+- (BOOL)addPostStepBlock:(ChipmunkPostStepBlock)block key:(id)key
+{
+	if(!cpSpaceGetPostStepCallback(_space, key)){
+		cpSpaceAddPostStepCallback(_space, (cpPostStepFunc)postStepPerformBlock, key, [block copy]);
+		
+		[key retain];
+		
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+- (void)addPostStepAddition:(NSObject<ChipmunkObject> *)obj
+{
+	[self addPostStepCallback:self selector:@selector(add:) key:obj];
+}
+
+- (void)addPostStepRemoval:(NSObject<ChipmunkObject> *)obj
+{
+	[self addPostStepCallback:self selector:@selector(remove:) key:obj];
+}
+
+- (NSArray *)pointQueryAll:(cpVect)point maxDistance:(cpFloat)maxDistance filter:(cpShapeFilter)filter
+{
+	NSMutableArray *array = [NSMutableArray array];
+	cpSpacePointQuery_b(_space, point, maxDistance, filter, ^(cpShape *shape, cpVect p, cpFloat d, cpVect g){
+		ChipmunkPointQueryInfo *info = [[ChipmunkPointQueryInfo alloc] initWithInfo:&(cpPointQueryInfo){shape, p, d, g}];
+		[array addObject:info];
+		[info release];
+	});
+	
+	return array;
+}
+
+- (ChipmunkPointQueryInfo *)pointQueryNearest:(cpVect)point maxDistance:(cpFloat)maxDistance filter:(cpShapeFilter)filter
+{
+	cpPointQueryInfo info;
+	cpSpacePointQueryNearest(_space, point, maxDistance, filter, &info);
+	return (info.shape ? [[[ChipmunkPointQueryInfo alloc] initWithInfo:&info] autorelease] : nil);
+}
+
+typedef struct segmentQueryContext {
+	cpVect start, end;
+	NSMutableArray *array;
+} segmentQueryContext;
+
+- (NSArray *)segmentQueryAllFrom:(cpVect)start to:(cpVect)end radius:(cpFloat)radius filter:(cpShapeFilter)filter
+{
+	NSMutableArray *array = [NSMutableArray array];
+	cpSpaceSegmentQuery_b(_space, start, end, radius, filter, ^(cpShape *shape, cpVect p, cpVect n, cpFloat t){
+		// TODO point
+		ChipmunkSegmentQueryInfo *info = [[ChipmunkSegmentQueryInfo alloc] initWithInfo:&(cpSegmentQueryInfo){shape, p, n, t} start:start end:end];
+		[array addObject:info];
+		[info release];
+	});
+	
+	return array;
+}
+
+- (ChipmunkSegmentQueryInfo *)segmentQueryFirstFrom:(cpVect)start to:(cpVect)end radius:(cpFloat)radius filter:(cpShapeFilter)filter
+{
+	cpSegmentQueryInfo info;
+	cpSpaceSegmentQueryFirst(_space, start, end, radius, filter, &info);
+	
+	return (info.shape ? [[[ChipmunkSegmentQueryInfo alloc] initWithInfo:&info start:start end:end] autorelease] : nil);
+}
+
+- (NSArray *)bbQueryAll:(cpBB)bb filter:(cpShapeFilter)filter
+{
+	NSMutableArray *array = [NSMutableArray array];
+	cpSpaceBBQuery_b(_space, bb, filter, ^(cpShape *shape){
+		[array addObject:shape->userData];
+	});
+	
+	return array;
+}
+
+//static void
+//shapeQueryAll(cpShape *shape, cpContactPointSet *points, NSMutableArray *array)
+//{
+//	ChipmunkShapeQueryInfo *info = [[ChipmunkShapeQueryInfo alloc] initWithShape:shape->userData andPoints:points];
+//	[array addObject:info];
+//	[info release];
+//}
+
+- (NSArray *)shapeQueryAll:(ChipmunkShape *)shape
+{
+	NSMutableArray *array = [NSMutableArray array];
+	cpSpaceShapeQuery_b(_space, shape.shape, ^(cpShape *shape, cpContactPointSet *points){
+		ChipmunkShapeQueryInfo *info = [[ChipmunkShapeQueryInfo alloc] initWithShape:shape->userData andPoints:points];
+		[array addObject:info];
+		[info release];
+	});
+	
+	return array;
+}
+
+- (BOOL)shapeTest:(ChipmunkShape *)shape
+{
+	return cpSpaceShapeQuery(_space, shape.shape, NULL, NULL);
+}
+
+static void PushBody(cpBody *body, NSMutableArray *arr){[arr addObject:body->userData];}
+- (NSArray *)bodies
+{
+	NSMutableArray *arr = [NSMutableArray array];
+	cpSpaceEachBody(_space, (cpSpaceBodyIteratorFunc)PushBody, arr);
+	
+	return arr;
+}
+
+static void PushShape(cpShape *shape, NSMutableArray *arr){[arr addObject:shape->userData];}
+- (NSArray *)shapes
+{
+	NSMutableArray *arr = [NSMutableArray array];
+	cpSpaceEachShape(_space, (cpSpaceShapeIteratorFunc)PushShape, arr);
+	
+	return arr;
+}
+
+static void PushConstraint(cpConstraint *constraint, NSMutableArray *arr){[arr addObject:constraint->userData];}
+- (NSArray *)constraints
+{
+	NSMutableArray *arr = [NSMutableArray array];
+	cpSpaceEachConstraint(_space, (cpSpaceConstraintIteratorFunc)PushConstraint, arr);
+	
+	return arr;
+}
+
+
+- (void)reindexStatic
+{
+	cpSpaceReindexStatic(_space);
+}
+
+- (void)reindexShape:(ChipmunkShape *)shape
+{
+	cpSpaceReindexShape(_space, shape.shape);
+}
+
+- (void)reindexShapesForBody:(ChipmunkBody *)body
+{
+	cpSpaceReindexShapesForBody(_space, body.body);
+}
+
+- (void)step:(cpFloat)dt
+{
+	cpSpaceStep(_space, dt);
+}
+
+//MARK: Extras
+
+- (ChipmunkBody *)addBody:(ChipmunkBody *)obj {
+	cpSpaceAddBody(_space, obj.body);
+	[_children addObject:obj];
+	return obj;
+}
+
+- (ChipmunkBody *)removeBody:(ChipmunkBody *)obj {
+	cpSpaceRemoveBody(_space, obj.body);
+	[_children removeObject:obj];
+	return obj;
+}
+
+
+- (ChipmunkShape *)addShape:(ChipmunkShape *)obj {
+	cpSpaceAddShape(_space, obj.shape);
+	[_children addObject:obj];
+	return obj;
+}
+
+- (ChipmunkShape *)removeShape:(ChipmunkShape *)obj {
+	cpSpaceRemoveShape(_space, obj.shape);
+	[_children removeObject:obj];
+	return obj;
+}
+
+- (ChipmunkConstraint *)addConstraint:(ChipmunkConstraint *)obj {
+	cpSpaceAddConstraint(_space, obj.constraint);
+	[_children addObject:obj];
+	return obj;
+}
+
+- (ChipmunkConstraint *)removeConstraint:(ChipmunkConstraint *)obj {
+	cpSpaceRemoveConstraint(_space, obj.constraint);
+	[_children removeObject:obj];
+	return obj;
+}
+
+static ChipmunkSegmentShape *
+boundSeg(ChipmunkBody *body, cpVect a, cpVect b, cpFloat radius, cpFloat elasticity,cpFloat friction, cpShapeFilter filter, cpCollisionType collisionType)
+{
+	ChipmunkSegmentShape *seg = [ChipmunkSegmentShape segmentWithBody:body from:a to:b radius:radius];
+	seg.elasticity = elasticity;
+	seg.friction = friction;
+	seg.filter = filter;
+	seg.collisionType = collisionType;
+	
+	return seg;
+}
+
+- (NSArray *)addBounds:(cpBB)bounds thickness:(cpFloat)radius
+	elasticity:(cpFloat)elasticity friction:(cpFloat)friction
+	filter:(cpShapeFilter)filter collisionType:(cpCollisionType)collisionType
+{
+	cpFloat l = bounds.l - radius;
+	cpFloat b = bounds.b - radius;
+	cpFloat r = bounds.r + radius;
+	cpFloat t = bounds.t + radius;
+	
+	NSArray *segs = [[NSArrayChipmunkObject alloc] initWithArray:[NSArray arrayWithObjects:
+		boundSeg(_staticBody, cpv(l,b), cpv(l,t), radius, elasticity, friction, filter, collisionType),
+		boundSeg(_staticBody, cpv(l,t), cpv(r,t), radius, elasticity, friction, filter, collisionType),
+		boundSeg(_staticBody, cpv(r,t), cpv(r,b), radius, elasticity, friction, filter, collisionType),
+		boundSeg(_staticBody, cpv(r,b), cpv(l,b), radius, elasticity, friction, filter, collisionType),
+		nil
+	]];
+	
+	[self add:segs];
+	return [segs autorelease];
+}
+
+@end
+
+
+@implementation ChipmunkHastySpace
+
+- (id)init {
+	return [self initWithSpace:cpHastySpaceNew()];
+}
+
+-(void)freeSpace
+{
+	cpHastySpaceFree(_space);
+}
+
+- (void)step:(cpFloat)dt
+{
+	cpHastySpaceStep(_space, dt);
+}
+
+-(NSUInteger)threads
+{
+	return cpHastySpaceGetThreads(_space);
+}
+
+-(void)setThreads:(NSUInteger)threads
+{
+	cpHastySpaceSetThreads(_space, threads);
+}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkTileCache.m b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkTileCache.m
new file mode 100644
index 0000000..7af8f73
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/objectivec/src/ChipmunkTileCache.m
@@ -0,0 +1,354 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#import "ChipmunkTileCache.h"
+
+
+@interface ChipmunkCachedTile : NSObject {
+	cpBB _bb;
+	bool _dirty;
+	
+	ChipmunkCachedTile *_next, *_prev;
+	
+	NSArray *_shapes;
+}
+
+@property(nonatomic, readonly) cpBB bb;
+@property(nonatomic, assign) bool dirty;
+
+@property(nonatomic, assign) ChipmunkCachedTile *next;
+@property(nonatomic, assign) ChipmunkCachedTile *prev;
+
+@property(nonatomic, retain) NSArray *shapes;
+
+@end
+
+
+
+@implementation ChipmunkCachedTile
+
+@synthesize bb = _bb, dirty = _dirty, shapes = _shapes, next = _next, prev = _prev;
+
+static cpBB
+ChipmunkCachedTileBB(ChipmunkCachedTile *tile)
+{
+	return tile->_bb;
+}
+
+static void
+ChipmunkCachedTileQuery(cpVect *pos, ChipmunkCachedTile *tile, cpCollisionID id, ChipmunkCachedTile **out)
+{
+	if(cpBBContainsVect(tile->_bb, *pos)) (*out) = tile;
+}
+
+
+-(id)initWithBB:(cpBB)bb
+{
+	if((self = [super init])) _bb = bb;
+	return self;
+}
+
+-(void)dealloc
+{
+	self.shapes = nil;
+	[super dealloc];
+}
+
+@end
+
+
+
+@implementation ChipmunkAbstractTileCache
+
+@synthesize marchHard = _marchHard, sampler = _sampler, tileOffset = _tileOffset;
+
+-(id)initWithSampler:(ChipmunkAbstractSampler *)sampler space:(ChipmunkSpace *)space tileSize:(cpFloat)tileSize samplesPerTile:(NSUInteger)samplesPerTile cacheSize:(NSUInteger)cacheSize
+{
+	if((self = [super init])){
+		_sampler = [sampler retain];
+		_space = [space retain];
+		
+		_tileSize = tileSize;
+		_samplesPerTile =samplesPerTile;
+		_tileOffset = cpvzero;
+		
+		_cacheSize = cacheSize;
+		[self resetCache];
+	}
+
+	return self;
+}
+
+-(void)removeShapesForTile:(ChipmunkCachedTile *)tile
+{
+	for(ChipmunkShape *shape in tile.shapes) [_space remove:shape];
+}
+
+-(void)dealloc
+{
+	for(ChipmunkCachedTile *tile = _cacheTail; tile; tile = tile.next){
+		[tile autorelease];
+	}
+	
+	[_sampler release];
+	[_space release];
+	
+	cpSpatialIndexFree(_tileIndex);
+	
+	[super dealloc];
+}
+
+-(void)resetCache
+{
+	_ensuredDirty = TRUE;
+	
+	// Reset the spatial index.
+	if(_tileIndex) cpSpatialIndexFree(_tileIndex);
+	_tileIndex = cpSpaceHashNew(_tileSize, (int)_cacheSize, (cpSpatialIndexBBFunc)ChipmunkCachedTileBB, NULL);
+	
+	// Remove all the shapes and release all the tiles.
+	for(ChipmunkCachedTile *tile = _cacheTail; tile; tile = tile.next){
+		[self removeShapesForTile:tile];
+		[tile autorelease];
+	}
+	
+	// Clear out the tile list.
+	_cacheHead = _cacheTail = nil;
+	_tileCount = 0;
+}
+
+-(void)marchTile:(ChipmunkCachedTile *)tile
+{
+	// Remove old shapes for this tile.
+	for(ChipmunkShape *shape in tile.shapes) [_space remove:shape];
+	cpPolylineSet *set = cpPolylineSetNew();
+	
+	(_marchHard ? cpMarchHard : cpMarchSoft)(
+		tile.bb, _samplesPerTile, _samplesPerTile, _sampler.marchThreshold,
+		(cpMarchSegmentFunc)cpPolylineSetCollectSegment, set,
+		_sampler.sampleFunc, _sampler
+	);
+	
+	if(set->count){
+		ChipmunkBody *staticBody = [ChipmunkBody staticBody];
+		NSMutableArray *shapes = [NSMutableArray array];
+		
+		for(int i=0; i<set->count; i++){
+			cpPolyline *simplified = [self simplify:set->lines[i]];
+			
+			for(int i=0; i<simplified->count - 1; i++){
+				ChipmunkSegmentShape *segment = [self makeSegmentFor:staticBody from:simplified->verts[i] to:simplified->verts[i+1]];
+				[shapes addObject:segment];
+				[_space add:segment];
+			}
+			
+			cpPolylineFree(simplified);
+		}
+		
+		tile.shapes = shapes;
+	} else {
+		tile.shapes = nil;
+	}
+	
+	cpPolylineSetFree(set, TRUE);
+	tile.dirty = FALSE;
+}
+
+static inline ChipmunkCachedTile *
+GetTileAt(cpSpatialIndex *index, int i, int j, cpFloat size, cpVect offset)
+{
+	// Cannot directly get spatial hash cells, so we'll point query at the centers.
+	cpVect point = cpv((i + 0.5)*size + offset.x, (j + 0.5)*size + offset.y);
+	ChipmunkCachedTile *tile = nil;
+	cpSpatialIndexQuery(index, &point, cpBBNewForCircle(point, 0.0f), (cpSpatialIndexQueryFunc)ChipmunkCachedTileQuery, &tile);
+	
+	return tile;
+}
+
+struct TileRect {int l, b, r, t;};
+
+static inline cpBB
+BBForTileRect(struct TileRect rect, cpFloat size, cpVect offset)
+{
+	return cpBBNew(rect.l*size + offset.x, rect.b*size + offset.y, rect.r*size + offset.x, rect.t*size + offset.y);
+}
+
+static inline struct TileRect
+TileRectForBB(cpBB bb, cpFloat size, cpVect offset, cpFloat spt_inv)
+{
+	return (struct TileRect){
+		(int)cpffloor((bb.l - offset.x)/size - spt_inv),
+		(int)cpffloor((bb.b - offset.x)/size - spt_inv),
+		(int) cpfceil((bb.r - offset.y)/size + spt_inv),
+		(int) cpfceil((bb.t - offset.y)/size + spt_inv),
+	};
+}
+
+-(void)markDirtyRect:(cpBB)bounds
+{
+	cpFloat size = _tileSize;
+	cpVect offset = _tileOffset;
+	struct TileRect rect = TileRectForBB(bounds, size, offset, 1.0/(cpFloat)_samplesPerTile);
+	
+	if(!_ensuredDirty && cpBBContainsBB(_ensuredBB, BBForTileRect(rect, size, offset))){
+		_ensuredDirty = TRUE;
+	}
+	
+	for(int i=rect.l; i<rect.r; i++){
+		for(int j=rect.b; j<rect.t; j++){
+			ChipmunkCachedTile *tile = GetTileAt(_tileIndex, i, j, size, offset);
+			if(tile) tile.dirty = TRUE;
+		}	
+	}
+}
+
+-(void)pushTile:(ChipmunkCachedTile *)tile
+{
+	[tile retain];
+	
+	_cacheHead.next = tile;
+	tile.prev = _cacheHead;
+	
+	_cacheHead = tile;
+	_cacheTail = _cacheTail ?: tile;
+}
+
+-(void)removeTile:(ChipmunkCachedTile *)tile
+{
+	if(tile.prev == nil && _cacheTail == tile) _cacheTail = tile.next;
+	if(tile.next == nil && _cacheHead == tile) _cacheHead = tile.prev;
+	
+	tile.prev.next = tile.next;
+	tile.next.prev = tile.prev;
+	tile.prev = tile.next = nil;
+	
+	[tile autorelease];
+}
+
+#define LOADING_FACTOR 1.0
+
+//extern double GetMilliseconds();
+
+-(void)ensureRect:(cpBB)bounds
+{
+//	double time = GetMilliseconds();
+	
+	cpFloat size = _tileSize;
+	cpVect offset = _tileOffset;
+	struct TileRect rect = TileRectForBB(bounds, size, offset, 1.0/(cpFloat)_samplesPerTile);
+	
+	cpBB ensure = BBForTileRect(rect, size, offset);
+	if(!_ensuredDirty && cpBBContainsBB(_ensuredBB, ensure)) return;
+	
+//	int count = 0;
+//	printf("Marching tiles in (% 4d, % 4d) - (% 4d, % 4d):\n", l, b, r, t);
+	for(int i=rect.l; i<rect.r; i++){
+		for(int j=rect.b; j<rect.t; j++){
+//			printf("Marching tile (% 4d, % 4d)\n", i, j);
+			
+			ChipmunkCachedTile *tile = GetTileAt(_tileIndex, i, j, size, offset);
+			
+			if(!tile){
+				// Tile does not exist yet, make a new dirty tile.
+				// Let the code below push it into the tile list.
+				tile = [[ChipmunkCachedTile alloc] initWithBB:BBForTileRect((struct TileRect){i, j, i+1, j+1}, size, offset)];
+				tile.dirty = TRUE;
+				
+				cpSpatialIndexInsert(_tileIndex, tile, (cpHashValue)tile);
+				_tileCount++;
+			}
+			
+			if(tile.dirty) [self marchTile:tile];
+			
+			// Move tile to the front of the cache. (or add it for the first time)
+			[self removeTile:tile];
+			[self pushTile:tile];
+		}
+	}
+	
+	_ensuredBB = ensure;
+	_ensuredDirty = FALSE;
+	
+	// Remove tiles used the longest ago if over the cache count;
+	NSInteger removeCount = _tileCount - _cacheSize;
+	for(int i=0; i<removeCount; i++){
+		cpSpatialIndexRemove(_tileIndex, _cacheTail, (cpHashValue)_cacheTail);
+		[self removeShapesForTile:_cacheTail];
+		[self removeTile:_cacheTail];
+		
+		_tileCount--;
+	}
+	
+//	NSLog(@"Updated %3d tiles in %6.3fms", count, GetMilliseconds() - time);
+}
+
+-(cpPolyline *)simplify:(cpPolyline *)polyline
+{
+	@throw [NSException
+		exceptionWithName:NSInternalInconsistencyException
+		reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
+		userInfo:nil
+	];
+}
+
+-(ChipmunkSegmentShape *)makeSegmentFor:(ChipmunkBody *)staticBody from:(cpVect)a to:(cpVect)b
+{
+	@throw [NSException
+		exceptionWithName:NSInternalInconsistencyException
+		reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
+		userInfo:nil
+	];
+}
+
+@end
+
+
+
+@implementation ChipmunkBasicTileCache
+
+@synthesize simplifyThreshold = _simplifyThreshold;
+
+@synthesize segmentRadius = _segmentRadius;
+
+@synthesize segmentFriction = _segmentFriction;
+@synthesize segmentElasticity = _segmentElasticity;
+
+@synthesize segmentFilter = _segmentFilter;
+
+@synthesize segmentCollisionType = _segmentCollisionType;
+
+-(id)initWithSampler:(ChipmunkAbstractSampler *)sampler space:(ChipmunkSpace *)space tileSize:(cpFloat)tileSize samplesPerTile:(NSUInteger)samplesPerTile cacheSize:(NSUInteger)cacheSize
+{
+	if((self = [super initWithSampler:sampler space:space tileSize:tileSize samplesPerTile:samplesPerTile cacheSize:cacheSize])){
+		_simplifyThreshold = 2.0;
+		
+		_segmentRadius = 0.0;
+		
+		_segmentFriction = 1.0;
+		_segmentElasticity = 1.0;
+		
+		_segmentFilter = CP_SHAPE_FILTER_ALL;
+		
+		_segmentCollisionType = (cpCollisionType)0;
+	}
+	
+	return self;
+}
+
+-(cpPolyline *)simplify:(cpPolyline *)polyline
+{
+	return cpPolylineSimplifyCurves(polyline, _simplifyThreshold);
+}
+
+-(ChipmunkSegmentShape *)makeSegmentFor:(ChipmunkBody *)staticBody from:(cpVect)a to:(cpVect)b
+{
+	ChipmunkSegmentShape *segment = [ChipmunkSegmentShape segmentWithBody:staticBody from:a to:b radius:_segmentRadius];
+	segment.friction = _segmentFriction;
+	segment.elasticity = _segmentElasticity;
+	segment.filter = _segmentFilter;
+	segment.collisionType = _segmentCollisionType;
+	
+	return segment;
+}
+
+@end
diff --git a/dali-physics/third-party/chipmunk2d/src/CMakeLists.txt b/dali-physics/third-party/chipmunk2d/src/CMakeLists.txt
new file mode 100644
index 0000000..5c30d43
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/CMakeLists.txt
@@ -0,0 +1,125 @@
+file(GLOB chipmunk_source_files "*.c")
+file(GLOB chipmunk_public_header "${chipmunk_SOURCE_DIR}/include/chipmunk/*.h")
+
+include_directories(BEFORE ${chipmunk_SOURCE_DIR}/include)
+
+# Chipmunk2D 7.0.3
+set(CHIPMUNK_VERSION_MAJOR 7)
+set(CHIPMUNK_VERSION_MINOR 0)
+set(CHIPMUNK_VERSION_PATCH 3)
+set(CHIPMUNK_VERSION "${CHIPMUNK_VERSION_MAJOR}.${CHIPMUNK_VERSION_MINOR}.${CHIPMUNK_VERSION_PATCH}")
+message("Configuring Chipmunk2D version ${CHIPMUNK_VERSION}")
+
+set(prefix ${CMAKE_INSTALL_PREFIX})
+option(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
+
+if(ENABLE_PKG_CONFIGURE)
+    find_package(PkgConfig REQUIRED)
+
+    # Configure the pkg-config file
+    # Requires the following variables to be setup:
+    # @PREFIX@ @EXEC_PREFIX@ @CHIPMUNK_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
+    set( LIB_DIR $ENV{libdir} )
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
+    endif()
+    if( NOT LIB_DIR )
+        set( LIB_DIR ${prefix}/lib )
+    endif()
+
+    set(PREFIX ${prefix})
+    set(EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
+    set(DEV_INCLUDE_PATH ${INCLUDE_DIR})
+
+    set(chipmunk_pkg_cfg_file chipmunk2d.pc)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/${chipmunk_pkg_cfg_file}.in ${chipmunk_pkg_cfg_file} @ONLY)
+endif(ENABLE_PKG_CONFIGURE)
+
+if(ANDROID)
+  FIND_LIBRARY(LOGLIB log)
+endif(ANDROID)
+
+# If you want to reduce the size of the library slightly, uncomment this section
+#
+#if(NOT ENABLE_DEBUG)
+#  add_definitions( "-DCP_SPACE_DISABLE_DEBUG_API")
+#endif()
+
+if(BUILD_SHARED)
+  add_library(chipmunk SHARED
+    ${chipmunk_source_files}
+  )
+  # Tell MSVC to compile the code as C++.
+  if(MSVC)
+    set_source_files_properties(${chipmunk_source_files} PROPERTIES LANGUAGE CXX)
+    set_target_properties(chipmunk PROPERTIES LINKER_LANGUAGE CXX)
+  endif(MSVC)
+  # set the lib's version number
+  # But avoid on Android because symlinks to version numbered .so's don't work with Android's Java-side loadLibrary.
+  if(NOT ANDROID)
+    set_target_properties(chipmunk PROPERTIES
+      SOVERSION ${CHIPMUNK_VERSION_MAJOR}
+      VERSION ${CHIPMUNK_VERSION})
+  endif(NOT ANDROID)
+  target_compile_options(chipmunk PRIVATE -fvisibility=default)
+  if(ANDROID OR UNIX)
+    # need to explicitly link to the math library because the CMake/Android toolchains may not do it automatically
+    target_link_libraries(chipmunk m ${COVERAGE})
+  endif(ANDROID OR UNIX)
+  if(ANDROID)
+    target_link_libraries(chipmunk ${LOGLIB})
+  endif(ANDROID)
+  install(TARGETS chipmunk EXPORT chipmunk-targets
+                           RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+                           LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+                           ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                           )
+endif(BUILD_SHARED)
+
+if(BUILD_STATIC)
+  add_library(chipmunk_static STATIC
+    ${chipmunk_source_files}
+  )
+  # Tell MSVC to compile the code as C++.
+  if(MSVC)
+    set_source_files_properties(${chipmunk_source_files} PROPERTIES LANGUAGE CXX)
+    set_target_properties(chipmunk_static PROPERTIES LINKER_LANGUAGE CXX)
+  endif(MSVC)
+  # Sets chipmunk_static to output "libchipmunk.a" not "libchipmunk_static.a"
+  set_target_properties(chipmunk_static PROPERTIES OUTPUT_NAME chipmunk)
+  target_compile_options(chipmunk PRIVATE -fvisibility=default)
+  target_link_libraries(chipmunk m ${COVERAGE})
+  if(ANDROID)
+    target_link_libraries(chipmunk ${LOGLIB})
+  endif(ANDROID)
+  if(INSTALL_STATIC)
+    install(TARGETS chipmunk_static EXPORT chipmunk-targets ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+  endif(INSTALL_STATIC)
+endif(BUILD_STATIC)
+
+if(BUILD_SHARED OR INSTALL_STATIC)
+  # FIXME: change to PUBLIC_HEADER to allow building frameworks
+  install(FILES ${chipmunk_public_header} DESTINATION include/chipmunk)
+  install(FILES ${chipmunk_constraint_header} DESTINATION include/chipmunk/constraints)
+
+  if(INSTALL_CMAKE_MODULES)
+    install(
+      EXPORT chipmunk-targets
+      NAMESPACE chipmunk::
+      FILE chipmunk-targets.cmake
+      DESTINATION share/chipmunk
+    )
+
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/chipmunk-config.cmake "
+      include(CMakeFindDependencyMacro)
+      include(\${CMAKE_CURRENT_LIST_DIR}/chipmunk-targets.cmake)
+    ")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/chipmunk-config.cmake DESTINATION share/chipmunk)
+  endif()
+endif(BUILD_SHARED OR INSTALL_STATIC)
+
+if (ENABLE_PKG_CONFIGURE)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${chipmunk_pkg_cfg_file}
+        DESTINATION ${LIB_DIR}/pkgconfig
+    )
+endif()
diff --git a/dali-physics/third-party/chipmunk2d/src/chipmunk.c b/dali-physics/third-party/chipmunk2d/src/chipmunk.c
new file mode 100644
index 0000000..a6cc9d6
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/chipmunk.c
@@ -0,0 +1,331 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#if defined(ANDROID)
+#	include <android/log.h>
+#endif
+
+#include "chipmunk/chipmunk_private.h"
+
+void
+cpMessage(const char *condition, const char *file, int line, int isError, int isHardError, const char *message, ...)
+{
+	fprintf(stderr, (isError ? "Aborting due to Chipmunk error: " : "Chipmunk warning: "));
+	
+	va_list vargs;
+	va_start(vargs, message); {
+#if defined(ANDROID)
+		__android_log_print( ANDROID_LOG_INFO, "Chipmunk", "%s(%d)", file, line );
+		__android_log_print( ANDROID_LOG_INFO, "Chipmunk", message, vargs );
+#else
+		vfprintf(stderr, message, vargs);
+		fprintf(stderr, "\n");
+#endif
+	} va_end(vargs);
+	
+#if defined(ANDROID)
+	__android_log_print(ANDROID_LOG_INFO, "Chipmunk", "\tFailed condition: %s\n", condition);
+	__android_log_print(ANDROID_LOG_INFO, "Chipmunk", "\tSource:%s:%d\n", file, line);
+#else
+	fprintf(stderr, "\tFailed condition: %s\n", condition);
+	fprintf(stderr, "\tSource:%s:%d\n", file, line);
+#endif
+}
+
+#define STR(s) #s
+#define XSTR(s) STR(s)
+
+const char *cpVersionString = XSTR(CP_VERSION_MAJOR) "." XSTR(CP_VERSION_MINOR) "." XSTR(CP_VERSION_RELEASE);
+
+//MARK: Misc Functions
+
+cpFloat
+cpMomentForCircle(cpFloat m, cpFloat r1, cpFloat r2, cpVect offset)
+{
+	return m*(0.5f*(r1*r1 + r2*r2) + cpvlengthsq(offset));
+}
+
+cpFloat
+cpAreaForCircle(cpFloat r1, cpFloat r2)
+{
+	return (cpFloat)CP_PI*cpfabs(r1*r1 - r2*r2);
+}
+
+cpFloat
+cpMomentForSegment(cpFloat m, cpVect a, cpVect b, cpFloat r)
+{
+	cpVect offset = cpvlerp(a, b, 0.5f);
+	
+	// This approximates the shape as a box for rounded segments, but it's quite close.
+	cpFloat length = cpvdist(b, a) + 2.0f*r;
+	return m*((length*length + 4.0f*r*r)/12.0f + cpvlengthsq(offset));
+}
+
+cpFloat
+cpAreaForSegment(cpVect a, cpVect b, cpFloat r)
+{
+	return r*((cpFloat)CP_PI*r + 2.0f*cpvdist(a, b));
+}
+
+cpFloat
+cpMomentForPoly(cpFloat m, int count, const cpVect *verts, cpVect offset, cpFloat r)
+{
+	// TODO account for radius.
+	if(count == 2) return cpMomentForSegment(m, verts[0], verts[1], 0.0f);
+	
+	cpFloat sum1 = 0.0f;
+	cpFloat sum2 = 0.0f;
+	for(int i=0; i<count; i++){
+		cpVect v1 = cpvadd(verts[i], offset);
+		cpVect v2 = cpvadd(verts[(i+1)%count], offset);
+		
+		cpFloat a = cpvcross(v2, v1);
+		cpFloat b = cpvdot(v1, v1) + cpvdot(v1, v2) + cpvdot(v2, v2);
+		
+		sum1 += a*b;
+		sum2 += a;
+	}
+	
+	return (m*sum1)/(6.0f*sum2);
+}
+
+cpFloat
+cpAreaForPoly(const int count, const cpVect *verts, cpFloat r)
+{
+	cpFloat area = 0.0f;
+	cpFloat perimeter = 0.0f;
+	for(int i=0; i<count; i++){
+		cpVect v1 = verts[i];
+		cpVect v2 = verts[(i+1)%count];
+		
+		area += cpvcross(v1, v2);
+		perimeter += cpvdist(v1, v2);
+	}
+	
+	return r*(CP_PI*cpfabs(r) + perimeter) + area/2.0f;
+}
+
+cpVect
+cpCentroidForPoly(const int count, const cpVect *verts)
+{
+	cpFloat sum = 0.0f;
+	cpVect vsum = cpvzero;
+	
+	for(int i=0; i<count; i++){
+		cpVect v1 = verts[i];
+		cpVect v2 = verts[(i+1)%count];
+		cpFloat cross = cpvcross(v1, v2);
+		
+		sum += cross;
+		vsum = cpvadd(vsum, cpvmult(cpvadd(v1, v2), cross));
+	}
+	
+	return cpvmult(vsum, 1.0f/(3.0f*sum));
+}
+
+//void
+//cpRecenterPoly(const int count, cpVect *verts){
+//	cpVect centroid = cpCentroidForPoly(count, verts);
+//	
+//	for(int i=0; i<count; i++){
+//		verts[i] = cpvsub(verts[i], centroid);
+//	}
+//}
+
+cpFloat
+cpMomentForBox(cpFloat m, cpFloat width, cpFloat height)
+{
+	return m*(width*width + height*height)/12.0f;
+}
+
+cpFloat
+cpMomentForBox2(cpFloat m, cpBB box)
+{
+	cpFloat width = box.r - box.l;
+	cpFloat height = box.t - box.b;
+	cpVect offset = cpvmult(cpv(box.l + box.r, box.b + box.t), 0.5f);
+	
+	// TODO: NaN when offset is 0 and m is INFINITY
+	return cpMomentForBox(m, width, height) + m*cpvlengthsq(offset);
+}
+
+//MARK: Quick Hull
+
+void
+cpLoopIndexes(const cpVect *verts, int count, int *start, int *end)
+{
+	(*start) = (*end) = 0;
+	cpVect min = verts[0];
+	cpVect max = min;
+	
+  for(int i=1; i<count; i++){
+    cpVect v = verts[i];
+		
+    if(v.x < min.x || (v.x == min.x && v.y < min.y)){
+      min = v;
+      (*start) = i;
+    } else if(v.x > max.x || (v.x == max.x && v.y > max.y)){
+			max = v;
+			(*end) = i;
+		}
+	}
+}
+
+#define SWAP(__A__, __B__) {cpVect __TMP__ = __A__; __A__ = __B__; __B__ = __TMP__;}
+
+static int
+QHullPartition(cpVect *verts, int count, cpVect a, cpVect b, cpFloat tol)
+{
+	if(count == 0) return 0;
+	
+	cpFloat max = 0;
+	int pivot = 0;
+	
+	cpVect delta = cpvsub(b, a);
+	cpFloat valueTol = tol*cpvlength(delta);
+	
+	int head = 0;
+	for(int tail = count-1; head <= tail;){
+		cpFloat value = cpvcross(cpvsub(verts[head], a), delta);
+		if(value > valueTol){
+			if(value > max){
+				max = value;
+				pivot = head;
+			}
+			
+			head++;
+		} else {
+			SWAP(verts[head], verts[tail]);
+			tail--;
+		}
+	}
+	
+	// move the new pivot to the front if it's not already there.
+	if(pivot != 0) SWAP(verts[0], verts[pivot]);
+	return head;
+}
+
+static int
+QHullReduce(cpFloat tol, cpVect *verts, int count, cpVect a, cpVect pivot, cpVect b, cpVect *result)
+{
+	if(count < 0){
+		return 0;
+	} else if(count == 0) {
+		result[0] = pivot;
+		return 1;
+	} else {
+		int left_count = QHullPartition(verts, count, a, pivot, tol);
+		int index = QHullReduce(tol, verts + 1, left_count - 1, a, verts[0], pivot, result);
+		
+		result[index++] = pivot;
+		
+		int right_count = QHullPartition(verts + left_count, count - left_count, pivot, b, tol);
+		return index + QHullReduce(tol, verts + left_count + 1, right_count - 1, pivot, verts[left_count], b, result + index);
+	}
+}
+
+// QuickHull seemed like a neat algorithm, and efficient-ish for large input sets.
+// My implementation performs an in place reduction using the result array as scratch space.
+int
+cpConvexHull(int count, const cpVect *verts, cpVect *result, int *first, cpFloat tol)
+{
+	if(verts != result){
+		// Copy the line vertexes into the empty part of the result polyline to use as a scratch buffer.
+		memcpy(result, verts, count*sizeof(cpVect));
+	}
+	
+	// Degenerate case, all points are the same.
+	int start, end;
+	cpLoopIndexes(verts, count, &start, &end);
+	if(start == end){
+		if(first) (*first) = 0;
+		return 1;
+	}
+	
+	SWAP(result[0], result[start]);
+	SWAP(result[1], result[end == 0 ? start : end]);
+	
+	cpVect a = result[0];
+	cpVect b = result[1];
+	
+	if(first) (*first) = start;
+	return QHullReduce(tol, result + 2, count - 2, a, b, a, result + 1) + 1;
+}
+
+//MARK: Alternate Block Iterators
+
+#if defined(__has_extension)
+#if __has_extension(blocks)
+
+static void IteratorFunc(void *ptr, void (^block)(void *ptr)){block(ptr);}
+
+void cpSpaceEachBody_b(cpSpace *space, void (^block)(cpBody *body)){
+	cpSpaceEachBody(space, (cpSpaceBodyIteratorFunc)IteratorFunc, block);
+}
+
+void cpSpaceEachShape_b(cpSpace *space, void (^block)(cpShape *shape)){
+	cpSpaceEachShape(space, (cpSpaceShapeIteratorFunc)IteratorFunc, block);
+}
+
+void cpSpaceEachConstraint_b(cpSpace *space, void (^block)(cpConstraint *constraint)){
+	cpSpaceEachConstraint(space, (cpSpaceConstraintIteratorFunc)IteratorFunc, block);
+}
+
+static void BodyIteratorFunc(cpBody *body, void *ptr, void (^block)(void *ptr)){block(ptr);}
+
+void cpBodyEachShape_b(cpBody *body, void (^block)(cpShape *shape)){
+	cpBodyEachShape(body, (cpBodyShapeIteratorFunc)BodyIteratorFunc, block);
+}
+
+void cpBodyEachConstraint_b(cpBody *body, void (^block)(cpConstraint *constraint)){
+	cpBodyEachConstraint(body, (cpBodyConstraintIteratorFunc)BodyIteratorFunc, block);
+}
+
+void cpBodyEachArbiter_b(cpBody *body, void (^block)(cpArbiter *arbiter)){
+	cpBodyEachArbiter(body, (cpBodyArbiterIteratorFunc)BodyIteratorFunc, block);
+}
+
+static void PointQueryIteratorFunc(cpShape *shape, cpVect p, cpFloat d, cpVect g, cpSpacePointQueryBlock block){block(shape, p, d, g);}
+void cpSpacePointQuery_b(cpSpace *space, cpVect point, cpFloat maxDistance, cpShapeFilter filter, cpSpacePointQueryBlock block){
+	cpSpacePointQuery(space, point, maxDistance, filter, (cpSpacePointQueryFunc)PointQueryIteratorFunc, block);
+}
+
+static void SegmentQueryIteratorFunc(cpShape *shape, cpVect p, cpVect n, cpFloat t, cpSpaceSegmentQueryBlock block){block(shape, p, n, t);}
+void cpSpaceSegmentQuery_b(cpSpace *space, cpVect start, cpVect end, cpFloat radius, cpShapeFilter filter, cpSpaceSegmentQueryBlock block){
+	cpSpaceSegmentQuery(space, start, end, radius, filter, (cpSpaceSegmentQueryFunc)SegmentQueryIteratorFunc, block);
+}
+
+void cpSpaceBBQuery_b(cpSpace *space, cpBB bb, cpShapeFilter filter, cpSpaceBBQueryBlock block){
+	cpSpaceBBQuery(space, bb, filter, (cpSpaceBBQueryFunc)IteratorFunc, block);
+}
+
+static void ShapeQueryIteratorFunc(cpShape *shape, cpContactPointSet *points, cpSpaceShapeQueryBlock block){block(shape, points);}
+cpBool cpSpaceShapeQuery_b(cpSpace *space, cpShape *shape, cpSpaceShapeQueryBlock block){
+	return cpSpaceShapeQuery(space, shape, (cpSpaceShapeQueryFunc)ShapeQueryIteratorFunc, block);
+}
+
+#endif
+#endif
+
+#include "chipmunk/chipmunk_ffi.h"
diff --git a/dali-physics/third-party/chipmunk2d/src/chipmunk2d.pc.in b/dali-physics/third-party/chipmunk2d/src/chipmunk2d.pc.in
new file mode 100644
index 0000000..1f26f46
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/chipmunk2d.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@CHIPMUNK_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: Chipmunk2D
+Description: Chipmunk2D Rigid Body Physics Library
+Version: ${apiversion}
+Requires:
+Libs: -L${libdir} -lchipmunk
+Cflags: -I${includedir}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpArbiter.c b/dali-physics/third-party/chipmunk2d/src/cpArbiter.c
new file mode 100644
index 0000000..6c52cee
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpArbiter.c
@@ -0,0 +1,496 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+// TODO: make this generic so I can reuse it for constraints also.
+static inline void
+unthreadHelper(cpArbiter *arb, cpBody *body)
+{
+	struct cpArbiterThread *thread = cpArbiterThreadForBody(arb, body);
+	cpArbiter *prev = thread->prev;
+	cpArbiter *next = thread->next;
+	
+	if(prev){
+		cpArbiterThreadForBody(prev, body)->next = next;
+	} else if(body->arbiterList == arb) {
+		// IFF prev is NULL and body->arbiterList == arb, is arb at the head of the list.
+		// This function may be called for an arbiter that was never in a list.
+		// In that case, we need to protect it from wiping out the body->arbiterList pointer.
+		body->arbiterList = next;
+	}
+	
+	if(next) cpArbiterThreadForBody(next, body)->prev = prev;
+	
+	thread->prev = NULL;
+	thread->next = NULL;
+}
+
+void
+cpArbiterUnthread(cpArbiter *arb)
+{
+	unthreadHelper(arb, arb->body_a);
+	unthreadHelper(arb, arb->body_b);
+}
+
+cpBool cpArbiterIsFirstContact(const cpArbiter *arb)
+{
+	return arb->state == CP_ARBITER_STATE_FIRST_COLLISION;
+}
+
+cpBool cpArbiterIsRemoval(const cpArbiter *arb)
+{
+	return arb->state == CP_ARBITER_STATE_INVALIDATED;
+}
+
+int cpArbiterGetCount(const cpArbiter *arb)
+{
+	// Return 0 contacts if we are in a separate callback.
+	return (arb->state < CP_ARBITER_STATE_CACHED ? arb->count : 0);
+}
+
+cpVect
+cpArbiterGetNormal(const cpArbiter *arb)
+{
+	return cpvmult(arb->n, arb->swapped ? -1.0f : 1.0);
+}
+
+cpVect
+cpArbiterGetPointA(const cpArbiter *arb, int i)
+{
+	cpAssertHard(0 <= i && i < cpArbiterGetCount(arb), "Index error: The specified contact index is invalid for this arbiter");
+	return cpvadd(arb->body_a->p, arb->contacts[i].r1);
+}
+
+cpVect
+cpArbiterGetPointB(const cpArbiter *arb, int i)
+{
+	cpAssertHard(0 <= i && i < cpArbiterGetCount(arb), "Index error: The specified contact index is invalid for this arbiter");
+	return cpvadd(arb->body_b->p, arb->contacts[i].r2);
+}
+
+cpFloat
+cpArbiterGetDepth(const cpArbiter *arb, int i)
+{
+	cpAssertHard(0 <= i && i < cpArbiterGetCount(arb), "Index error: The specified contact index is invalid for this arbiter");
+	
+	struct cpContact *con = &arb->contacts[i];
+	return cpvdot(cpvadd(cpvsub(con->r2, con->r1), cpvsub(arb->body_b->p, arb->body_a->p)), arb->n);
+}
+
+cpContactPointSet
+cpArbiterGetContactPointSet(const cpArbiter *arb)
+{
+	cpContactPointSet set;
+	set.count = cpArbiterGetCount(arb);
+	
+	cpBool swapped = arb->swapped;
+	cpVect n = arb->n;
+	set.normal = (swapped ? cpvneg(n) : n);
+	
+	for(int i=0; i<set.count; i++){
+		// Contact points are relative to body CoGs;
+		cpVect p1 = cpvadd(arb->body_a->p, arb->contacts[i].r1);
+		cpVect p2 = cpvadd(arb->body_b->p, arb->contacts[i].r2);
+		
+		set.points[i].pointA = (swapped ? p2 : p1);
+		set.points[i].pointB = (swapped ? p1 : p2);
+		set.points[i].distance = cpvdot(cpvsub(p2, p1), n);
+	}
+	
+	return set;
+}
+
+void
+cpArbiterSetContactPointSet(cpArbiter *arb, cpContactPointSet *set)
+{
+	int count = set->count;
+	cpAssertHard(count == arb->count, "The number of contact points cannot be changed.");
+	
+	cpBool swapped = arb->swapped;
+	arb->n = (swapped ? cpvneg(set->normal) : set->normal);
+	
+	for(int i=0; i<count; i++){
+		// Convert back to CoG relative offsets.
+		cpVect p1 = set->points[i].pointA;
+		cpVect p2 = set->points[i].pointB;
+		
+		arb->contacts[i].r1 = cpvsub(swapped ? p2 : p1, arb->body_a->p);
+		arb->contacts[i].r2 = cpvsub(swapped ? p1 : p2, arb->body_b->p);
+	}
+}
+
+cpVect
+cpArbiterTotalImpulse(const cpArbiter *arb)
+{
+	struct cpContact *contacts = arb->contacts;
+	cpVect n = arb->n;
+	cpVect sum = cpvzero;
+	
+	for(int i=0, count=cpArbiterGetCount(arb); i<count; i++){
+		struct cpContact *con = &contacts[i];
+		sum = cpvadd(sum, cpvrotate(n, cpv(con->jnAcc, con->jtAcc)));
+	}
+		
+	return (arb->swapped ? sum : cpvneg(sum));
+	return cpvzero;
+}
+
+cpFloat
+cpArbiterTotalKE(const cpArbiter *arb)
+{
+	cpFloat eCoef = (1 - arb->e)/(1 + arb->e);
+	cpFloat sum = 0.0;
+	
+	struct cpContact *contacts = arb->contacts;
+	for(int i=0, count=cpArbiterGetCount(arb); i<count; i++){
+		struct cpContact *con = &contacts[i];
+		cpFloat jnAcc = con->jnAcc;
+		cpFloat jtAcc = con->jtAcc;
+		
+		sum += eCoef*jnAcc*jnAcc/con->nMass + jtAcc*jtAcc/con->tMass;
+	}
+	
+	return sum;
+}
+
+cpBool
+cpArbiterIgnore(cpArbiter *arb)
+{
+	arb->state = CP_ARBITER_STATE_IGNORE;
+	return cpFalse;
+}
+
+cpFloat
+cpArbiterGetRestitution(const cpArbiter *arb)
+{
+	return arb->e;
+}
+
+void
+cpArbiterSetRestitution(cpArbiter *arb, cpFloat restitution)
+{
+	arb->e = restitution;
+}
+
+cpFloat
+cpArbiterGetFriction(const cpArbiter *arb)
+{
+	return arb->u;
+}
+
+void
+cpArbiterSetFriction(cpArbiter *arb, cpFloat friction)
+{
+	arb->u = friction;
+}
+
+cpVect
+cpArbiterGetSurfaceVelocity(cpArbiter *arb)
+{
+	return cpvmult(arb->surface_vr, arb->swapped ? -1.0f : 1.0);
+}
+
+void
+cpArbiterSetSurfaceVelocity(cpArbiter *arb, cpVect vr)
+{
+	arb->surface_vr = cpvmult(vr, arb->swapped ? -1.0f : 1.0);
+}
+
+cpDataPointer
+cpArbiterGetUserData(const cpArbiter *arb)
+{
+	return arb->data;
+}
+
+void
+cpArbiterSetUserData(cpArbiter *arb, cpDataPointer userData)
+{
+	arb->data = userData;
+}
+
+void
+cpArbiterGetShapes(const cpArbiter *arb, cpShape **a, cpShape **b)
+{
+	if(arb->swapped){
+		(*a) = (cpShape *)arb->b, (*b) = (cpShape *)arb->a;
+	} else {
+		(*a) = (cpShape *)arb->a, (*b) = (cpShape *)arb->b;
+	}
+}
+
+void cpArbiterGetBodies(const cpArbiter *arb, cpBody **a, cpBody **b)
+{
+	CP_ARBITER_GET_SHAPES(arb, shape_a, shape_b);
+	(*a) = shape_a->body;
+	(*b) = shape_b->body;
+}
+
+cpBool
+cpArbiterCallWildcardBeginA(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerA;
+	return handler->beginFunc(arb, space, handler->userData);
+}
+
+cpBool
+cpArbiterCallWildcardBeginB(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerB;
+	arb->swapped = !arb->swapped;
+	cpBool retval = handler->beginFunc(arb, space, handler->userData);
+	arb->swapped = !arb->swapped;
+	return retval;
+}
+
+cpBool
+cpArbiterCallWildcardPreSolveA(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerA;
+	return handler->preSolveFunc(arb, space, handler->userData);
+}
+
+cpBool
+cpArbiterCallWildcardPreSolveB(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerB;
+	arb->swapped = !arb->swapped;
+	cpBool retval = handler->preSolveFunc(arb, space, handler->userData);
+	arb->swapped = !arb->swapped;
+	return retval;
+}
+
+void
+cpArbiterCallWildcardPostSolveA(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerA;
+	handler->postSolveFunc(arb, space, handler->userData);
+}
+
+void
+cpArbiterCallWildcardPostSolveB(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerB;
+	arb->swapped = !arb->swapped;
+	handler->postSolveFunc(arb, space, handler->userData);
+	arb->swapped = !arb->swapped;
+}
+
+void
+cpArbiterCallWildcardSeparateA(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerA;
+	handler->separateFunc(arb, space, handler->userData);
+}
+
+void
+cpArbiterCallWildcardSeparateB(cpArbiter *arb, cpSpace *space)
+{
+	cpCollisionHandler *handler = arb->handlerB;
+	arb->swapped = !arb->swapped;
+	handler->separateFunc(arb, space, handler->userData);
+	arb->swapped = !arb->swapped;
+}
+
+cpArbiter*
+cpArbiterInit(cpArbiter *arb, cpShape *a, cpShape *b)
+{
+	arb->handler = NULL;
+	arb->swapped = cpFalse;
+	
+	arb->handler = NULL;
+	arb->handlerA = NULL;
+	arb->handlerB = NULL;
+	
+	arb->e = 0.0f;
+	arb->u = 0.0f;
+	arb->surface_vr = cpvzero;
+	
+	arb->count = 0;
+	arb->contacts = NULL;
+	
+	arb->a = a; arb->body_a = a->body;
+	arb->b = b; arb->body_b = b->body;
+	
+	arb->thread_a.next = NULL;
+	arb->thread_b.next = NULL;
+	arb->thread_a.prev = NULL;
+	arb->thread_b.prev = NULL;
+	
+	arb->stamp = 0;
+	arb->state = CP_ARBITER_STATE_FIRST_COLLISION;
+	
+	arb->data = NULL;
+	
+	return arb;
+}
+
+static inline cpCollisionHandler *
+cpSpaceLookupHandler(cpSpace *space, cpCollisionType a, cpCollisionType b, cpCollisionHandler *defaultValue)
+{
+	cpCollisionType types[] = {a, b};
+	cpCollisionHandler *handler = (cpCollisionHandler *)cpHashSetFind(space->collisionHandlers, CP_HASH_PAIR(a, b), types);
+	return (handler ? handler : defaultValue);
+}
+
+void
+cpArbiterUpdate(cpArbiter *arb, struct cpCollisionInfo *info, cpSpace *space)
+{
+	const cpShape *a = info->a, *b = info->b;
+	
+	// For collisions between two similar primitive types, the order could have been swapped since the last frame.
+	arb->a = a; arb->body_a = a->body;
+	arb->b = b; arb->body_b = b->body;
+	
+	// Iterate over the possible pairs to look for hash value matches.
+	for(int i=0; i<info->count; i++){
+		struct cpContact *con = &info->arr[i];
+		
+		// r1 and r2 store absolute offsets at init time.
+		// Need to convert them to relative offsets.
+		con->r1 = cpvsub(con->r1, a->body->p);
+		con->r2 = cpvsub(con->r2, b->body->p);
+		
+		// Cached impulses are not zeroed at init time.
+		con->jnAcc = con->jtAcc = 0.0f;
+		
+		for(int j=0; j<arb->count; j++){
+			struct cpContact *old = &arb->contacts[j];
+			
+			// This could trigger false positives, but is fairly unlikely nor serious if it does.
+			if(con->hash == old->hash){
+				// Copy the persistant contact information.
+				con->jnAcc = old->jnAcc;
+				con->jtAcc = old->jtAcc;
+			}
+		}
+	}
+	
+	arb->contacts = info->arr;
+	arb->count = info->count;
+	arb->n = info->n;
+	
+	arb->e = a->e * b->e;
+	arb->u = a->u * b->u;
+	
+	cpVect surface_vr = cpvsub(b->surfaceV, a->surfaceV);
+	arb->surface_vr = cpvsub(surface_vr, cpvmult(info->n, cpvdot(surface_vr, info->n)));
+	
+	cpCollisionType typeA = info->a->type, typeB = info->b->type;
+	cpCollisionHandler *defaultHandler = &space->defaultHandler;
+	cpCollisionHandler *handler = arb->handler = cpSpaceLookupHandler(space, typeA, typeB, defaultHandler);
+	
+	// Check if the types match, but don't swap for a default handler which use the wildcard for type A.
+	cpBool swapped = arb->swapped = (typeA != handler->typeA && handler->typeA != CP_WILDCARD_COLLISION_TYPE);
+	
+	if(handler != defaultHandler || space->usesWildcards){
+		// The order of the main handler swaps the wildcard handlers too. Uffda.
+		arb->handlerA = cpSpaceLookupHandler(space, (swapped ? typeB : typeA), CP_WILDCARD_COLLISION_TYPE, &cpCollisionHandlerDoNothing);
+		arb->handlerB = cpSpaceLookupHandler(space, (swapped ? typeA : typeB), CP_WILDCARD_COLLISION_TYPE, &cpCollisionHandlerDoNothing);
+	}
+		
+	// mark it as new if it's been cached
+	if(arb->state == CP_ARBITER_STATE_CACHED) arb->state = CP_ARBITER_STATE_FIRST_COLLISION;
+}
+
+void
+cpArbiterPreStep(cpArbiter *arb, cpFloat dt, cpFloat slop, cpFloat bias)
+{
+	cpBody *a = arb->body_a;
+	cpBody *b = arb->body_b;
+	cpVect n = arb->n;
+	cpVect body_delta = cpvsub(b->p, a->p);
+	
+	for(int i=0; i<arb->count; i++){
+		struct cpContact *con = &arb->contacts[i];
+		
+		// Calculate the mass normal and mass tangent.
+		con->nMass = 1.0f/k_scalar(a, b, con->r1, con->r2, n);
+		con->tMass = 1.0f/k_scalar(a, b, con->r1, con->r2, cpvperp(n));
+				
+		// Calculate the target bias velocity.
+		cpFloat dist = cpvdot(cpvadd(cpvsub(con->r2, con->r1), body_delta), n);
+		con->bias = -bias*cpfmin(0.0f, dist + slop)/dt;
+		con->jBias = 0.0f;
+		
+		// Calculate the target bounce velocity.
+		con->bounce = normal_relative_velocity(a, b, con->r1, con->r2, n)*arb->e;
+	}
+}
+
+void
+cpArbiterApplyCachedImpulse(cpArbiter *arb, cpFloat dt_coef)
+{
+	if(cpArbiterIsFirstContact(arb)) return;
+	
+	cpBody *a = arb->body_a;
+	cpBody *b = arb->body_b;
+	cpVect n = arb->n;
+	
+	for(int i=0; i<arb->count; i++){
+		struct cpContact *con = &arb->contacts[i];
+		cpVect j = cpvrotate(n, cpv(con->jnAcc, con->jtAcc));
+		apply_impulses(a, b, con->r1, con->r2, cpvmult(j, dt_coef));
+	}
+}
+
+// TODO: is it worth splitting velocity/position correction?
+
+void
+cpArbiterApplyImpulse(cpArbiter *arb)
+{
+	cpBody *a = arb->body_a;
+	cpBody *b = arb->body_b;
+	cpVect n = arb->n;
+	cpVect surface_vr = arb->surface_vr;
+	cpFloat friction = arb->u;
+
+	for(int i=0; i<arb->count; i++){
+		struct cpContact *con = &arb->contacts[i];
+		cpFloat nMass = con->nMass;
+		cpVect r1 = con->r1;
+		cpVect r2 = con->r2;
+		
+		cpVect vb1 = cpvadd(a->v_bias, cpvmult(cpvperp(r1), a->w_bias));
+		cpVect vb2 = cpvadd(b->v_bias, cpvmult(cpvperp(r2), b->w_bias));
+		cpVect vr = cpvadd(relative_velocity(a, b, r1, r2), surface_vr);
+		
+		cpFloat vbn = cpvdot(cpvsub(vb2, vb1), n);
+		cpFloat vrn = cpvdot(vr, n);
+		cpFloat vrt = cpvdot(vr, cpvperp(n));
+		
+		cpFloat jbn = (con->bias - vbn)*nMass;
+		cpFloat jbnOld = con->jBias;
+		con->jBias = cpfmax(jbnOld + jbn, 0.0f);
+		
+		cpFloat jn = -(con->bounce + vrn)*nMass;
+		cpFloat jnOld = con->jnAcc;
+		con->jnAcc = cpfmax(jnOld + jn, 0.0f);
+		
+		cpFloat jtMax = friction*con->jnAcc;
+		cpFloat jt = -vrt*con->tMass;
+		cpFloat jtOld = con->jtAcc;
+		con->jtAcc = cpfclamp(jtOld + jt, -jtMax, jtMax);
+		
+		apply_bias_impulses(a, b, r1, r2, cpvmult(n, con->jBias - jbnOld));
+		apply_impulses(a, b, r1, r2, cpvrotate(n, cpv(con->jnAcc - jnOld, con->jtAcc - jtOld)));
+	}
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpArray.c b/dali-physics/third-party/chipmunk2d/src/cpArray.c
new file mode 100644
index 0000000..a1f8df5
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpArray.c
@@ -0,0 +1,101 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include <string.h>
+
+#include "chipmunk/chipmunk_private.h"
+
+
+cpArray *
+cpArrayNew(int size)
+{
+	cpArray *arr = (cpArray *)cpcalloc(1, sizeof(cpArray));
+	
+	arr->num = 0;
+	arr->max = (size ? size : 4);
+	arr->arr = (void **)cpcalloc(arr->max, sizeof(void*));
+	
+	return arr;
+}
+
+void
+cpArrayFree(cpArray *arr)
+{
+	if(arr){
+		cpfree(arr->arr);
+		arr->arr = NULL;
+		
+		cpfree(arr);
+	}
+}
+
+void
+cpArrayPush(cpArray *arr, void *object)
+{
+	if(arr->num == arr->max){
+		arr->max = 3*(arr->max + 1)/2;
+		arr->arr = (void **)cprealloc(arr->arr, arr->max*sizeof(void*));
+	}
+	
+	arr->arr[arr->num] = object;
+	arr->num++;
+}
+
+void *
+cpArrayPop(cpArray *arr)
+{
+	arr->num--;
+	
+	void *value = arr->arr[arr->num];
+	arr->arr[arr->num] = NULL;
+	
+	return value;
+}
+
+void
+cpArrayDeleteObj(cpArray *arr, void *obj)
+{
+	for(int i=0; i<arr->num; i++){
+		if(arr->arr[i] == obj){
+			arr->num--;
+			
+			arr->arr[i] = arr->arr[arr->num];
+			arr->arr[arr->num] = NULL;
+			
+			return;
+		}
+	}
+}
+
+void
+cpArrayFreeEach(cpArray *arr, void (freeFunc)(void*))
+{
+	for(int i=0; i<arr->num; i++) freeFunc(arr->arr[i]);
+}
+
+cpBool
+cpArrayContains(cpArray *arr, void *ptr)
+{
+	for(int i=0; i<arr->num; i++)
+		if(arr->arr[i] == ptr) return cpTrue;
+	
+	return cpFalse;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpBBTree.c b/dali-physics/third-party/chipmunk2d/src/cpBBTree.c
new file mode 100644
index 0000000..eb2944b
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpBBTree.c
@@ -0,0 +1,896 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "stdlib.h"
+#include "stdio.h"
+
+#include "chipmunk/chipmunk_private.h"
+
+static inline cpSpatialIndexClass *Klass();
+
+typedef struct Node Node;
+typedef struct Pair Pair;
+
+struct cpBBTree {
+	cpSpatialIndex spatialIndex;
+	cpBBTreeVelocityFunc velocityFunc;
+	
+	cpHashSet *leaves;
+	Node *root;
+	
+	Node *pooledNodes;
+	Pair *pooledPairs;
+	cpArray *allocatedBuffers;
+	
+	cpTimestamp stamp;
+};
+
+struct Node {
+	void *obj;
+	cpBB bb;
+	Node *parent;
+	
+	union {
+		// Internal nodes
+		struct { Node *a, *b; } children;
+		
+		// Leaves
+		struct {
+			cpTimestamp stamp;
+			Pair *pairs;
+		} leaf;
+	} node;
+};
+
+// Can't use anonymous unions and still get good x-compiler compatability
+#define A node.children.a
+#define B node.children.b
+#define STAMP node.leaf.stamp
+#define PAIRS node.leaf.pairs
+
+typedef struct Thread {
+	Pair *prev;
+	Node *leaf;
+	Pair *next;
+} Thread;
+
+struct Pair {
+	Thread a, b;
+	cpCollisionID id;
+};
+
+//MARK: Misc Functions
+
+static inline cpBB
+GetBB(cpBBTree *tree, void *obj)
+{
+	cpBB bb = tree->spatialIndex.bbfunc(obj);
+	
+	cpBBTreeVelocityFunc velocityFunc = tree->velocityFunc;
+	if(velocityFunc){
+		cpFloat coef = 0.1f;
+		cpFloat x = (bb.r - bb.l)*coef;
+		cpFloat y = (bb.t - bb.b)*coef;
+		
+		cpVect v = cpvmult(velocityFunc(obj), 0.1f);
+		return cpBBNew(bb.l + cpfmin(-x, v.x), bb.b + cpfmin(-y, v.y), bb.r + cpfmax(x, v.x), bb.t + cpfmax(y, v.y));
+	} else {
+		return bb;
+	}
+}
+
+static inline cpBBTree *
+GetTree(cpSpatialIndex *index)
+{
+	return (index && index->klass == Klass() ? (cpBBTree *)index : NULL);
+}
+
+static inline Node *
+GetRootIfTree(cpSpatialIndex *index){
+	return (index && index->klass == Klass() ? ((cpBBTree *)index)->root : NULL);
+}
+
+static inline cpBBTree *
+GetMasterTree(cpBBTree *tree)
+{
+	cpBBTree *dynamicTree = GetTree(tree->spatialIndex.dynamicIndex);
+	return (dynamicTree ? dynamicTree : tree);
+}
+
+static inline void
+IncrementStamp(cpBBTree *tree)
+{
+	cpBBTree *dynamicTree = GetTree(tree->spatialIndex.dynamicIndex);
+	if(dynamicTree){
+		dynamicTree->stamp++;
+	} else {
+		tree->stamp++;
+	}
+}
+
+//MARK: Pair/Thread Functions
+
+static void
+PairRecycle(cpBBTree *tree, Pair *pair)
+{
+	// Share the pool of the master tree.
+	// TODO: would be lovely to move the pairs stuff into an external data structure.
+	tree = GetMasterTree(tree);
+	
+	pair->a.next = tree->pooledPairs;
+	tree->pooledPairs = pair;
+}
+
+static Pair *
+PairFromPool(cpBBTree *tree)
+{
+	// Share the pool of the master tree.
+	// TODO: would be lovely to move the pairs stuff into an external data structure.
+	tree = GetMasterTree(tree);
+	
+	Pair *pair = tree->pooledPairs;
+	
+	if(pair){
+		tree->pooledPairs = pair->a.next;
+		return pair;
+	} else {
+		// Pool is exhausted, make more
+		int count = CP_BUFFER_BYTES/sizeof(Pair);
+		cpAssertHard(count, "Internal Error: Buffer size is too small.");
+		
+		Pair *buffer = (Pair *)cpcalloc(1, CP_BUFFER_BYTES);
+		cpArrayPush(tree->allocatedBuffers, buffer);
+		
+		// push all but the first one, return the first instead
+		for(int i=1; i<count; i++) PairRecycle(tree, buffer + i);
+		return buffer;
+	}
+}
+
+static inline void
+ThreadUnlink(Thread thread)
+{
+	Pair *next = thread.next;
+	Pair *prev = thread.prev;
+	
+	if(next){
+		if(next->a.leaf == thread.leaf) next->a.prev = prev; else next->b.prev = prev;
+	}
+	
+	if(prev){
+		if(prev->a.leaf == thread.leaf) prev->a.next = next; else prev->b.next = next;
+	} else {
+		thread.leaf->PAIRS = next;
+	}
+}
+
+static void
+PairsClear(Node *leaf, cpBBTree *tree)
+{
+	Pair *pair = leaf->PAIRS;
+	leaf->PAIRS = NULL;
+	
+	while(pair){
+		if(pair->a.leaf == leaf){
+			Pair *next = pair->a.next;
+			ThreadUnlink(pair->b);
+			PairRecycle(tree, pair);
+			pair = next;
+		} else {
+			Pair *next = pair->b.next;
+			ThreadUnlink(pair->a);
+			PairRecycle(tree, pair);
+			pair = next;
+		}
+	}
+}
+
+static void
+PairInsert(Node *a, Node *b, cpBBTree *tree)
+{
+	Pair *nextA = a->PAIRS, *nextB = b->PAIRS;
+	Pair *pair = PairFromPool(tree);
+	Pair temp = {{NULL, a, nextA},{NULL, b, nextB}, 0};
+	
+	a->PAIRS = b->PAIRS = pair;
+	*pair = temp;
+	
+	if(nextA){
+		if(nextA->a.leaf == a) nextA->a.prev = pair; else nextA->b.prev = pair;
+	}
+	
+	if(nextB){
+		if(nextB->a.leaf == b) nextB->a.prev = pair; else nextB->b.prev = pair;
+	}
+}
+
+
+//MARK: Node Functions
+
+static void
+NodeRecycle(cpBBTree *tree, Node *node)
+{
+	node->parent = tree->pooledNodes;
+	tree->pooledNodes = node;
+}
+
+static Node *
+NodeFromPool(cpBBTree *tree)
+{
+	Node *node = tree->pooledNodes;
+	
+	if(node){
+		tree->pooledNodes = node->parent;
+		return node;
+	} else {
+		// Pool is exhausted, make more
+		int count = CP_BUFFER_BYTES/sizeof(Node);
+		cpAssertHard(count, "Internal Error: Buffer size is too small.");
+		
+		Node *buffer = (Node *)cpcalloc(1, CP_BUFFER_BYTES);
+		cpArrayPush(tree->allocatedBuffers, buffer);
+		
+		// push all but the first one, return the first instead
+		for(int i=1; i<count; i++) NodeRecycle(tree, buffer + i);
+		return buffer;
+	}
+}
+
+static inline void
+NodeSetA(Node *node, Node *value)
+{
+	node->A = value;
+	value->parent = node;
+}
+
+static inline void
+NodeSetB(Node *node, Node *value)
+{
+	node->B = value;
+	value->parent = node;
+}
+
+static Node *
+NodeNew(cpBBTree *tree, Node *a, Node *b)
+{
+	Node *node = NodeFromPool(tree);
+	
+	node->obj = NULL;
+	node->bb = cpBBMerge(a->bb, b->bb);
+	node->parent = NULL;
+	
+	NodeSetA(node, a);
+	NodeSetB(node, b);
+	
+	return node;
+}
+
+static inline cpBool
+NodeIsLeaf(Node *node)
+{
+	return (node->obj != NULL);
+}
+
+static inline Node *
+NodeOther(Node *node, Node *child)
+{
+	return (node->A == child ? node->B : node->A);
+}
+
+static inline void
+NodeReplaceChild(Node *parent, Node *child, Node *value, cpBBTree *tree)
+{
+	cpAssertSoft(!NodeIsLeaf(parent), "Internal Error: Cannot replace child of a leaf.");
+	cpAssertSoft(child == parent->A || child == parent->B, "Internal Error: Node is not a child of parent.");
+	
+	if(parent->A == child){
+		NodeRecycle(tree, parent->A);
+		NodeSetA(parent, value);
+	} else {
+		NodeRecycle(tree, parent->B);
+		NodeSetB(parent, value);
+	}
+	
+	for(Node *node=parent; node; node = node->parent){
+		node->bb = cpBBMerge(node->A->bb, node->B->bb);
+	}
+}
+
+//MARK: Subtree Functions
+
+static inline cpFloat
+cpBBProximity(cpBB a, cpBB b)
+{
+	return cpfabs(a.l + a.r - b.l - b.r) + cpfabs(a.b + a.t - b.b - b.t);
+}
+
+static Node *
+SubtreeInsert(Node *subtree, Node *leaf, cpBBTree *tree)
+{
+	if(subtree == NULL){
+		return leaf;
+	} else if(NodeIsLeaf(subtree)){
+		return NodeNew(tree, leaf, subtree);
+	} else {
+		cpFloat cost_a = cpBBArea(subtree->B->bb) + cpBBMergedArea(subtree->A->bb, leaf->bb);
+		cpFloat cost_b = cpBBArea(subtree->A->bb) + cpBBMergedArea(subtree->B->bb, leaf->bb);
+		
+		if(cost_a == cost_b){
+			cost_a = cpBBProximity(subtree->A->bb, leaf->bb);
+			cost_b = cpBBProximity(subtree->B->bb, leaf->bb);
+		}
+		
+		if(cost_b < cost_a){
+			NodeSetB(subtree, SubtreeInsert(subtree->B, leaf, tree));
+		} else {
+			NodeSetA(subtree, SubtreeInsert(subtree->A, leaf, tree));
+		}
+		
+		subtree->bb = cpBBMerge(subtree->bb, leaf->bb);
+		return subtree;
+	}
+}
+
+static void
+SubtreeQuery(Node *subtree, void *obj, cpBB bb, cpSpatialIndexQueryFunc func, void *data)
+{
+	if(cpBBIntersects(subtree->bb, bb)){
+		if(NodeIsLeaf(subtree)){
+			func(obj, subtree->obj, 0, data);
+		} else {
+			SubtreeQuery(subtree->A, obj, bb, func, data);
+			SubtreeQuery(subtree->B, obj, bb, func, data);
+		}
+	}
+}
+
+
+static cpFloat
+SubtreeSegmentQuery(Node *subtree, void *obj, cpVect a, cpVect b, cpFloat t_exit, cpSpatialIndexSegmentQueryFunc func, void *data)
+{
+	if(NodeIsLeaf(subtree)){
+		return func(obj, subtree->obj, data);
+	} else {
+		cpFloat t_a = cpBBSegmentQuery(subtree->A->bb, a, b);
+		cpFloat t_b = cpBBSegmentQuery(subtree->B->bb, a, b);
+		
+		if(t_a < t_b){
+			if(t_a < t_exit) t_exit = cpfmin(t_exit, SubtreeSegmentQuery(subtree->A, obj, a, b, t_exit, func, data));
+			if(t_b < t_exit) t_exit = cpfmin(t_exit, SubtreeSegmentQuery(subtree->B, obj, a, b, t_exit, func, data));
+		} else {
+			if(t_b < t_exit) t_exit = cpfmin(t_exit, SubtreeSegmentQuery(subtree->B, obj, a, b, t_exit, func, data));
+			if(t_a < t_exit) t_exit = cpfmin(t_exit, SubtreeSegmentQuery(subtree->A, obj, a, b, t_exit, func, data));
+		}
+		
+		return t_exit;
+	}
+}
+
+static void
+SubtreeRecycle(cpBBTree *tree, Node *node)
+{
+	if(!NodeIsLeaf(node)){
+		SubtreeRecycle(tree, node->A);
+		SubtreeRecycle(tree, node->B);
+		NodeRecycle(tree, node);
+	}
+}
+
+static inline Node *
+SubtreeRemove(Node *subtree, Node *leaf, cpBBTree *tree)
+{
+	if(leaf == subtree){
+		return NULL;
+	} else {
+		Node *parent = leaf->parent;
+		if(parent == subtree){
+			Node *other = NodeOther(subtree, leaf);
+			other->parent = subtree->parent;
+			NodeRecycle(tree, subtree);
+			return other;
+		} else {
+			NodeReplaceChild(parent->parent, parent, NodeOther(parent, leaf), tree);
+			return subtree;
+		}
+	}
+}
+
+//MARK: Marking Functions
+
+typedef struct MarkContext {
+	cpBBTree *tree;
+	Node *staticRoot;
+	cpSpatialIndexQueryFunc func;
+	void *data;
+} MarkContext;
+
+static void
+MarkLeafQuery(Node *subtree, Node *leaf, cpBool left, MarkContext *context)
+{
+	if(cpBBIntersects(leaf->bb, subtree->bb)){
+		if(NodeIsLeaf(subtree)){
+			if(left){
+				PairInsert(leaf, subtree, context->tree);
+			} else {
+				if(subtree->STAMP < leaf->STAMP) PairInsert(subtree, leaf, context->tree);
+				context->func(leaf->obj, subtree->obj, 0, context->data);
+			}
+		} else {
+			MarkLeafQuery(subtree->A, leaf, left, context);
+			MarkLeafQuery(subtree->B, leaf, left, context);
+		}
+	}
+}
+
+static void
+MarkLeaf(Node *leaf, MarkContext *context)
+{
+	cpBBTree *tree = context->tree;
+	if(leaf->STAMP == GetMasterTree(tree)->stamp){
+		Node *staticRoot = context->staticRoot;
+		if(staticRoot) MarkLeafQuery(staticRoot, leaf, cpFalse, context);
+		
+		for(Node *node = leaf; node->parent; node = node->parent){
+			if(node == node->parent->A){
+				MarkLeafQuery(node->parent->B, leaf, cpTrue, context);
+			} else {
+				MarkLeafQuery(node->parent->A, leaf, cpFalse, context);
+			}
+		}
+	} else {
+		Pair *pair = leaf->PAIRS;
+		while(pair){
+			if(leaf == pair->b.leaf){
+				pair->id = context->func(pair->a.leaf->obj, leaf->obj, pair->id, context->data);
+				pair = pair->b.next;
+			} else {
+				pair = pair->a.next;
+			}
+		}
+	}
+}
+
+static void
+MarkSubtree(Node *subtree, MarkContext *context)
+{
+	if(NodeIsLeaf(subtree)){
+		MarkLeaf(subtree, context);
+	} else {
+		MarkSubtree(subtree->A, context);
+		MarkSubtree(subtree->B, context); // TODO: Force TCO here?
+	}
+}
+
+//MARK: Leaf Functions
+
+static Node *
+LeafNew(cpBBTree *tree, void *obj, cpBB bb)
+{
+	Node *node = NodeFromPool(tree);
+	node->obj = obj;
+	node->bb = GetBB(tree, obj);
+	
+	node->parent = NULL;
+	node->STAMP = 0;
+	node->PAIRS = NULL;
+	
+	return node;
+}
+
+static cpBool
+LeafUpdate(Node *leaf, cpBBTree *tree)
+{
+	Node *root = tree->root;
+	cpBB bb = tree->spatialIndex.bbfunc(leaf->obj);
+	
+	if(!cpBBContainsBB(leaf->bb, bb)){
+		leaf->bb = GetBB(tree, leaf->obj);
+		
+		root = SubtreeRemove(root, leaf, tree);
+		tree->root = SubtreeInsert(root, leaf, tree);
+		
+		PairsClear(leaf, tree);
+		leaf->STAMP = GetMasterTree(tree)->stamp;
+		
+		return cpTrue;
+	} else {
+		return cpFalse;
+	}
+}
+
+static cpCollisionID VoidQueryFunc(void *obj1, void *obj2, cpCollisionID id, void *data){return id;}
+
+static void
+LeafAddPairs(Node *leaf, cpBBTree *tree)
+{
+	cpSpatialIndex *dynamicIndex = tree->spatialIndex.dynamicIndex;
+	if(dynamicIndex){
+		Node *dynamicRoot = GetRootIfTree(dynamicIndex);
+		if(dynamicRoot){
+			cpBBTree *dynamicTree = GetTree(dynamicIndex);
+			MarkContext context = {dynamicTree, NULL, NULL, NULL};
+			MarkLeafQuery(dynamicRoot, leaf, cpTrue, &context);
+		}
+	} else {
+		Node *staticRoot = GetRootIfTree(tree->spatialIndex.staticIndex);
+		MarkContext context = {tree, staticRoot, VoidQueryFunc, NULL};
+		MarkLeaf(leaf, &context);
+	}
+}
+
+//MARK: Memory Management Functions
+
+cpBBTree *
+cpBBTreeAlloc(void)
+{
+	return (cpBBTree *)cpcalloc(1, sizeof(cpBBTree));
+}
+
+static int
+leafSetEql(void *obj, Node *node)
+{
+	return (obj == node->obj);
+}
+
+static void *
+leafSetTrans(void *obj, cpBBTree *tree)
+{
+	return LeafNew(tree, obj, tree->spatialIndex.bbfunc(obj));
+}
+
+cpSpatialIndex *
+cpBBTreeInit(cpBBTree *tree, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex)
+{
+	cpSpatialIndexInit((cpSpatialIndex *)tree, Klass(), bbfunc, staticIndex);
+	
+	tree->velocityFunc = NULL;
+	
+	tree->leaves = cpHashSetNew(0, (cpHashSetEqlFunc)leafSetEql);
+	tree->root = NULL;
+	
+	tree->pooledNodes = NULL;
+	tree->allocatedBuffers = cpArrayNew(0);
+	
+	tree->stamp = 0;
+	
+	return (cpSpatialIndex *)tree;
+}
+
+void
+cpBBTreeSetVelocityFunc(cpSpatialIndex *index, cpBBTreeVelocityFunc func)
+{
+	if(index->klass != Klass()){
+		cpAssertWarn(cpFalse, "Ignoring cpBBTreeSetVelocityFunc() call to non-tree spatial index.");
+		return;
+	}
+	
+	((cpBBTree *)index)->velocityFunc = func;
+}
+
+cpSpatialIndex *
+cpBBTreeNew(cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex)
+{
+	return cpBBTreeInit(cpBBTreeAlloc(), bbfunc, staticIndex);
+}
+
+static void
+cpBBTreeDestroy(cpBBTree *tree)
+{
+	cpHashSetFree(tree->leaves);
+	
+	if(tree->allocatedBuffers) cpArrayFreeEach(tree->allocatedBuffers, cpfree);
+	cpArrayFree(tree->allocatedBuffers);
+}
+
+//MARK: Insert/Remove
+
+static void
+cpBBTreeInsert(cpBBTree *tree, void *obj, cpHashValue hashid)
+{
+	Node *leaf = (Node *)cpHashSetInsert(tree->leaves, hashid, obj, (cpHashSetTransFunc)leafSetTrans, tree);
+	
+	Node *root = tree->root;
+	tree->root = SubtreeInsert(root, leaf, tree);
+	
+	leaf->STAMP = GetMasterTree(tree)->stamp;
+	LeafAddPairs(leaf, tree);
+	IncrementStamp(tree);
+}
+
+static void
+cpBBTreeRemove(cpBBTree *tree, void *obj, cpHashValue hashid)
+{
+	Node *leaf = (Node *)cpHashSetRemove(tree->leaves, hashid, obj);
+	
+	tree->root = SubtreeRemove(tree->root, leaf, tree);
+	PairsClear(leaf, tree);
+	NodeRecycle(tree, leaf);
+}
+
+static cpBool
+cpBBTreeContains(cpBBTree *tree, void *obj, cpHashValue hashid)
+{
+	return (cpHashSetFind(tree->leaves, hashid, obj) != NULL);
+}
+
+//MARK: Reindex
+
+static void LeafUpdateWrap(Node *leaf, cpBBTree *tree) {LeafUpdate(leaf, tree);}
+
+static void
+cpBBTreeReindexQuery(cpBBTree *tree, cpSpatialIndexQueryFunc func, void *data)
+{
+	if(!tree->root) return;
+	
+	// LeafUpdate() may modify tree->root. Don't cache it.
+	cpHashSetEach(tree->leaves, (cpHashSetIteratorFunc)LeafUpdateWrap, tree);
+	
+	cpSpatialIndex *staticIndex = tree->spatialIndex.staticIndex;
+	Node *staticRoot = (staticIndex && staticIndex->klass == Klass() ? ((cpBBTree *)staticIndex)->root : NULL);
+	
+	MarkContext context = {tree, staticRoot, func, data};
+	MarkSubtree(tree->root, &context);
+	if(staticIndex && !staticRoot) cpSpatialIndexCollideStatic((cpSpatialIndex *)tree, staticIndex, func, data);
+	
+	IncrementStamp(tree);
+}
+
+static void
+cpBBTreeReindex(cpBBTree *tree)
+{
+	cpBBTreeReindexQuery(tree, VoidQueryFunc, NULL);
+}
+
+static void
+cpBBTreeReindexObject(cpBBTree *tree, void *obj, cpHashValue hashid)
+{
+	Node *leaf = (Node *)cpHashSetFind(tree->leaves, hashid, obj);
+	if(leaf){
+		if(LeafUpdate(leaf, tree)) LeafAddPairs(leaf, tree);
+		IncrementStamp(tree);
+	}
+}
+
+//MARK: Query
+
+static void
+cpBBTreeSegmentQuery(cpBBTree *tree, void *obj, cpVect a, cpVect b, cpFloat t_exit, cpSpatialIndexSegmentQueryFunc func, void *data)
+{
+	Node *root = tree->root;
+	if(root) SubtreeSegmentQuery(root, obj, a, b, t_exit, func, data);
+}
+
+static void
+cpBBTreeQuery(cpBBTree *tree, void *obj, cpBB bb, cpSpatialIndexQueryFunc func, void *data)
+{
+	if(tree->root) SubtreeQuery(tree->root, obj, bb, func, data);
+}
+
+//MARK: Misc
+
+static int
+cpBBTreeCount(cpBBTree *tree)
+{
+	return cpHashSetCount(tree->leaves);
+}
+
+typedef struct eachContext {
+	cpSpatialIndexIteratorFunc func;
+	void *data;
+} eachContext;
+
+static void each_helper(Node *node, eachContext *context){context->func(node->obj, context->data);}
+
+static void
+cpBBTreeEach(cpBBTree *tree, cpSpatialIndexIteratorFunc func, void *data)
+{
+	eachContext context = {func, data};
+	cpHashSetEach(tree->leaves, (cpHashSetIteratorFunc)each_helper, &context);
+}
+
+static cpSpatialIndexClass klass = {
+	(cpSpatialIndexDestroyImpl)cpBBTreeDestroy,
+	
+	(cpSpatialIndexCountImpl)cpBBTreeCount,
+	(cpSpatialIndexEachImpl)cpBBTreeEach,
+	
+	(cpSpatialIndexContainsImpl)cpBBTreeContains,
+	(cpSpatialIndexInsertImpl)cpBBTreeInsert,
+	(cpSpatialIndexRemoveImpl)cpBBTreeRemove,
+	
+	(cpSpatialIndexReindexImpl)cpBBTreeReindex,
+	(cpSpatialIndexReindexObjectImpl)cpBBTreeReindexObject,
+	(cpSpatialIndexReindexQueryImpl)cpBBTreeReindexQuery,
+	
+	(cpSpatialIndexQueryImpl)cpBBTreeQuery,
+	(cpSpatialIndexSegmentQueryImpl)cpBBTreeSegmentQuery,
+};
+
+static inline cpSpatialIndexClass *Klass(){return &klass;}
+
+
+//MARK: Tree Optimization
+
+static int
+cpfcompare(const cpFloat *a, const cpFloat *b){
+	return (*a < *b ? -1 : (*b < *a ? 1 : 0));
+}
+
+static void
+fillNodeArray(Node *node, Node ***cursor){
+	(**cursor) = node;
+	(*cursor)++;
+}
+
+static Node *
+partitionNodes(cpBBTree *tree, Node **nodes, int count)
+{
+	if(count == 1){
+		return nodes[0];
+	} else if(count == 2) {
+		return NodeNew(tree, nodes[0], nodes[1]);
+	}
+	
+	// Find the AABB for these nodes
+	cpBB bb = nodes[0]->bb;
+	for(int i=1; i<count; i++) bb = cpBBMerge(bb, nodes[i]->bb);
+	
+	// Split it on it's longest axis
+	cpBool splitWidth = (bb.r - bb.l > bb.t - bb.b);
+	
+	// Sort the bounds and use the median as the splitting point
+	cpFloat *bounds = (cpFloat *)cpcalloc(count*2, sizeof(cpFloat));
+	if(splitWidth){
+		for(int i=0; i<count; i++){
+			bounds[2*i + 0] = nodes[i]->bb.l;
+			bounds[2*i + 1] = nodes[i]->bb.r;
+		}
+	} else {
+		for(int i=0; i<count; i++){
+			bounds[2*i + 0] = nodes[i]->bb.b;
+			bounds[2*i + 1] = nodes[i]->bb.t;
+		}
+	}
+	
+	qsort(bounds, count*2, sizeof(cpFloat), (int (*)(const void *, const void *))cpfcompare);
+	cpFloat split = (bounds[count - 1] + bounds[count])*0.5f; // use the medain as the split
+	cpfree(bounds);
+
+	// Generate the child BBs
+	cpBB a = bb, b = bb;
+	if(splitWidth) a.r = b.l = split; else a.t = b.b = split;
+	
+	// Partition the nodes
+	int right = count;
+	for(int left=0; left < right;){
+		Node *node = nodes[left];
+		if(cpBBMergedArea(node->bb, b) < cpBBMergedArea(node->bb, a)){
+//		if(cpBBProximity(node->bb, b) < cpBBProximity(node->bb, a)){
+			right--;
+			nodes[left] = nodes[right];
+			nodes[right] = node;
+		} else {
+			left++;
+		}
+	}
+	
+	if(right == count){
+		Node *node = NULL;
+		for(int i=0; i<count; i++) node = SubtreeInsert(node, nodes[i], tree);
+		return node;
+	}
+	
+	// Recurse and build the node!
+	return NodeNew(tree,
+		partitionNodes(tree, nodes, right),
+		partitionNodes(tree, nodes + right, count - right)
+	);
+}
+
+//static void
+//cpBBTreeOptimizeIncremental(cpBBTree *tree, int passes)
+//{
+//	for(int i=0; i<passes; i++){
+//		Node *root = tree->root;
+//		Node *node = root;
+//		int bit = 0;
+//		unsigned int path = tree->opath;
+//		
+//		while(!NodeIsLeaf(node)){
+//			node = (path&(1<<bit) ? node->a : node->b);
+//			bit = (bit + 1)&(sizeof(unsigned int)*8 - 1);
+//		}
+//		
+//		root = subtreeRemove(root, node, tree);
+//		tree->root = subtreeInsert(root, node, tree);
+//	}
+//}
+
+void
+cpBBTreeOptimize(cpSpatialIndex *index)
+{
+	if(index->klass != &klass){
+		cpAssertWarn(cpFalse, "Ignoring cpBBTreeOptimize() call to non-tree spatial index.");
+		return;
+	}
+	
+	cpBBTree *tree = (cpBBTree *)index;
+	Node *root = tree->root;
+	if(!root) return;
+	
+	int count = cpBBTreeCount(tree);
+	Node **nodes = (Node **)cpcalloc(count, sizeof(Node *));
+	Node **cursor = nodes;
+	
+	cpHashSetEach(tree->leaves, (cpHashSetIteratorFunc)fillNodeArray, &cursor);
+	
+	SubtreeRecycle(tree, root);
+	tree->root = partitionNodes(tree, nodes, count);
+	cpfree(nodes);
+}
+
+//MARK: Debug Draw
+
+//#define CP_BBTREE_DEBUG_DRAW
+#ifdef CP_BBTREE_DEBUG_DRAW
+#include "OpenGL/gl.h"
+#include "OpenGL/glu.h"
+#include <GLUT/glut.h>
+
+static void
+NodeRender(Node *node, int depth)
+{
+	if(!NodeIsLeaf(node) && depth <= 10){
+		NodeRender(node->a, depth + 1);
+		NodeRender(node->b, depth + 1);
+	}
+	
+	cpBB bb = node->bb;
+	
+//	GLfloat v = depth/2.0f;	
+//	glColor3f(1.0f - v, v, 0.0f);
+	glLineWidth(cpfmax(5.0f - depth, 1.0f));
+	glBegin(GL_LINES); {
+		glVertex2f(bb.l, bb.b);
+		glVertex2f(bb.l, bb.t);
+		
+		glVertex2f(bb.l, bb.t);
+		glVertex2f(bb.r, bb.t);
+		
+		glVertex2f(bb.r, bb.t);
+		glVertex2f(bb.r, bb.b);
+		
+		glVertex2f(bb.r, bb.b);
+		glVertex2f(bb.l, bb.b);
+	}; glEnd();
+}
+
+void
+cpBBTreeRenderDebug(cpSpatialIndex *index){
+	if(index->klass != &klass){
+		cpAssertWarn(cpFalse, "Ignoring cpBBTreeRenderDebug() call to non-tree spatial index.");
+		return;
+	}
+	
+	cpBBTree *tree = (cpBBTree *)index;
+	if(tree->root) NodeRender(tree->root, 0);
+}
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/src/cpBody.c b/dali-physics/third-party/chipmunk2d/src/cpBody.c
new file mode 100644
index 0000000..3d2bb1c
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpBody.c
@@ -0,0 +1,644 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include <float.h>
+#include <stdarg.h>
+
+#include "chipmunk/chipmunk_private.h"
+
+cpBody*
+cpBodyAlloc(void)
+{
+	return (cpBody *)cpcalloc(1, sizeof(cpBody));
+}
+
+cpBody *
+cpBodyInit(cpBody *body, cpFloat mass, cpFloat moment)
+{
+	body->space = NULL;
+	body->shapeList = NULL;
+	body->arbiterList = NULL;
+	body->constraintList = NULL;
+	
+	body->velocity_func = cpBodyUpdateVelocity;
+	body->position_func = cpBodyUpdatePosition;
+	
+	body->sleeping.root = NULL;
+	body->sleeping.next = NULL;
+	body->sleeping.idleTime = 0.0f;
+	
+	body->p = cpvzero;
+	body->v = cpvzero;
+	body->f = cpvzero;
+	
+	body->w = 0.0f;
+	body->t = 0.0f;
+	
+	body->v_bias = cpvzero;
+	body->w_bias = 0.0f;
+	
+	body->userData = NULL;
+	body->userData2 = NULL;
+	
+	// Setters must be called after full initialization so the sanity checks don't assert on garbage data.
+	cpBodySetMass(body, mass);
+	cpBodySetMoment(body, moment);
+	cpBodySetAngle(body, 0.0f);
+	
+	return body;
+}
+
+cpBody*
+cpBodyNew(cpFloat mass, cpFloat moment)
+{
+	return cpBodyInit(cpBodyAlloc(), mass, moment);
+}
+
+cpBody*
+cpBodyNewKinematic()
+{
+	cpBody *body = cpBodyNew(0.0f, 0.0f);
+	cpBodySetType(body, CP_BODY_TYPE_KINEMATIC);
+	
+	return body;
+}
+
+cpBody*
+cpBodyNewStatic()
+{
+	cpBody *body = cpBodyNew(0.0f, 0.0f);
+	cpBodySetType(body, CP_BODY_TYPE_STATIC);
+	
+	return body;
+}
+
+void cpBodyDestroy(cpBody *body){}
+
+void
+cpBodyFree(cpBody *body)
+{
+	if(body){
+		cpBodyDestroy(body);
+		cpfree(body);
+	}
+}
+
+#ifdef NDEBUG
+	#define	cpAssertSaneBody(body)
+#else
+	static void cpv_assert_nan(cpVect v, char *message){cpAssertHard(v.x == v.x && v.y == v.y, message);}
+	static void cpv_assert_infinite(cpVect v, char *message){cpAssertHard(cpfabs(v.x) != INFINITY && cpfabs(v.y) != INFINITY, message);}
+	static void cpv_assert_sane(cpVect v, char *message){cpv_assert_nan(v, message); cpv_assert_infinite(v, message);}
+	
+	static void
+	cpBodySanityCheck(const cpBody *body)
+	{
+		cpAssertHard(body->m == body->m && body->m_inv == body->m_inv, "Body's mass is NaN.");
+		cpAssertHard(body->i == body->i && body->i_inv == body->i_inv, "Body's moment is NaN.");
+		cpAssertHard(body->m >= 0.0f, "Body's mass is negative.");
+		cpAssertHard(body->i >= 0.0f, "Body's moment is negative.");
+		
+		cpv_assert_sane(body->p, "Body's position is invalid.");
+		cpv_assert_sane(body->v, "Body's velocity is invalid.");
+		cpv_assert_sane(body->f, "Body's force is invalid.");
+
+		cpAssertHard(body->a == body->a && cpfabs(body->a) != INFINITY, "Body's angle is invalid.");
+		cpAssertHard(body->w == body->w && cpfabs(body->w) != INFINITY, "Body's angular velocity is invalid.");
+		cpAssertHard(body->t == body->t && cpfabs(body->t) != INFINITY, "Body's torque is invalid.");
+	}
+	
+	#define	cpAssertSaneBody(body) cpBodySanityCheck(body)
+#endif
+
+cpBool
+cpBodyIsSleeping(const cpBody *body)
+{
+	return (body->sleeping.root != ((cpBody*)0));
+}
+
+cpBool
+cpBodyIsSleepThresholdExceeded(const cpBody *body, const cpShape *shape)
+{
+  return body->sleeping.idleTime > shape->space->sleepTimeThreshold;
+}
+
+cpBodyType
+cpBodyGetType(cpBody *body)
+{
+	if(body->sleeping.idleTime == INFINITY){
+		return CP_BODY_TYPE_STATIC;
+	} else if(body->m == INFINITY){
+		return CP_BODY_TYPE_KINEMATIC;
+	} else {
+		return CP_BODY_TYPE_DYNAMIC;
+	}
+}
+
+void
+cpBodySetType(cpBody *body, cpBodyType type)
+{
+	cpBodyType oldType = cpBodyGetType(body);
+	if(oldType == type) return;
+	
+	// Static bodies have their idle timers set to infinity.
+	// Non-static bodies should have their idle timer reset.
+	body->sleeping.idleTime = (type == CP_BODY_TYPE_STATIC ? INFINITY : 0.0f);
+	
+	if(type == CP_BODY_TYPE_DYNAMIC){
+		body->m = body->i = 0.0f;
+		body->m_inv = body->i_inv = INFINITY;
+		
+		cpBodyAccumulateMassFromShapes(body);
+	} else {
+		body->m = body->i = INFINITY;
+		body->m_inv = body->i_inv = 0.0f;
+		
+		body->v = cpvzero;
+		body->w = 0.0f;
+	}
+	
+	// If the body is added to a space already, we'll need to update some space data structures.
+	cpSpace *space = cpBodyGetSpace(body);
+	if(space != NULL){
+		cpAssertSpaceUnlocked(space);
+		
+		if(oldType == CP_BODY_TYPE_STATIC){
+			// TODO This is probably not necessary
+//			cpBodyActivateStatic(body, NULL);
+		} else {
+			cpBodyActivate(body);
+		}
+		
+		// Move the bodies to the correct array.
+		cpArray *fromArray = cpSpaceArrayForBodyType(space, oldType);
+		cpArray *toArray = cpSpaceArrayForBodyType(space, type);
+		if(fromArray != toArray){
+			cpArrayDeleteObj(fromArray, body);
+			cpArrayPush(toArray, body);
+		}
+		
+		// Move the body's shapes to the correct spatial index.
+		cpSpatialIndex *fromIndex = (oldType == CP_BODY_TYPE_STATIC ? space->staticShapes : space->dynamicShapes);
+		cpSpatialIndex *toIndex = (type == CP_BODY_TYPE_STATIC ? space->staticShapes : space->dynamicShapes);
+		if(fromIndex != toIndex){
+			CP_BODY_FOREACH_SHAPE(body, shape){
+				cpSpatialIndexRemove(fromIndex, shape, shape->hashid);
+				cpSpatialIndexInsert(toIndex, shape, shape->hashid);
+			}
+		}
+	}
+}
+
+
+
+// Should *only* be called when shapes with mass info are modified, added or removed.
+void
+cpBodyAccumulateMassFromShapes(cpBody *body)
+{
+	if(body == NULL || cpBodyGetType(body) != CP_BODY_TYPE_DYNAMIC) return;
+	
+	// Reset the body's mass data.
+	body->m = body->i = 0.0f;
+	body->cog = cpvzero;
+	
+	// Cache the position to realign it at the end.
+	cpVect pos = cpBodyGetPosition(body);
+	
+	// Accumulate mass from shapes.
+	CP_BODY_FOREACH_SHAPE(body, shape){
+		struct cpShapeMassInfo *info = &shape->massInfo;
+		cpFloat m = info->m;
+		
+		if(m > 0.0f){
+			cpFloat msum = body->m + m;
+			
+			body->i += m*info->i + cpvdistsq(body->cog, info->cog)*(m*body->m)/msum;
+			body->cog = cpvlerp(body->cog, info->cog, m/msum);
+			body->m = msum;
+		}
+	}
+	
+	// Recalculate the inverses.
+	body->m_inv = 1.0f/body->m;
+	body->i_inv = 1.0f/body->i;
+	
+	// Realign the body since the CoG has probably moved.
+	cpBodySetPosition(body, pos);
+	cpAssertSaneBody(body);
+}
+
+cpSpace *
+cpBodyGetSpace(const cpBody *body)
+{
+	return body->space;
+}
+
+cpFloat
+cpBodyGetMass(const cpBody *body)
+{
+	return body->m;
+}
+
+void
+cpBodySetMass(cpBody *body, cpFloat mass)
+{
+	cpAssertHard(cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC, "You cannot set the mass of kinematic or static bodies.");
+	cpAssertHard(0.0f <= mass && mass < INFINITY, "Mass must be positive and finite.");
+	
+	cpBodyActivate(body);
+	body->m = mass;
+	body->m_inv = mass == 0.0f ? INFINITY : 1.0f/mass;
+	cpAssertSaneBody(body);
+}
+
+cpFloat
+cpBodyGetMoment(const cpBody *body)
+{
+	return body->i;
+}
+
+void
+cpBodySetMoment(cpBody *body, cpFloat moment)
+{
+	cpAssertHard(moment >= 0.0f, "Moment of Inertia must be positive.");
+	
+	cpBodyActivate(body);
+	body->i = moment;
+	body->i_inv = moment == 0.0f ? INFINITY : 1.0f/moment;
+	cpAssertSaneBody(body);
+}
+
+cpVect
+cpBodyGetRotation(const cpBody *body)
+{
+	return cpv(body->transform.a, body->transform.b);
+}
+
+void
+cpBodyAddShape(cpBody *body, cpShape *shape)
+{
+	cpShape *next = body->shapeList;
+	if(next) next->prev = shape;
+	
+	shape->next = next;
+	body->shapeList = shape;
+	
+	if(shape->massInfo.m > 0.0f){
+		cpBodyAccumulateMassFromShapes(body);
+	}
+}
+
+void
+cpBodyRemoveShape(cpBody *body, cpShape *shape)
+{
+  cpShape *prev = shape->prev;
+  cpShape *next = shape->next;
+  
+  if(prev){
+		prev->next = next;
+  } else {
+		body->shapeList = next;
+  }
+  
+  if(next){
+		next->prev = prev;
+	}
+  
+  shape->prev = NULL;
+  shape->next = NULL;
+	
+	if(cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC && shape->massInfo.m > 0.0f){
+		cpBodyAccumulateMassFromShapes(body);
+	}
+}
+
+static cpConstraint *
+filterConstraints(cpConstraint *node, cpBody *body, cpConstraint *filter)
+{
+	if(node == filter){
+		return cpConstraintNext(node, body);
+	} else if(node->a == body){
+		node->next_a = filterConstraints(node->next_a, body, filter);
+	} else {
+		node->next_b = filterConstraints(node->next_b, body, filter);
+	}
+	
+	return node;
+}
+
+void
+cpBodyRemoveConstraint(cpBody *body, cpConstraint *constraint)
+{
+	body->constraintList = filterConstraints(body->constraintList, body, constraint);
+}
+
+// 'p' is the position of the CoG
+static void
+SetTransform(cpBody *body, cpVect p, cpFloat a)
+{
+	cpVect rot = cpvforangle(a);
+	cpVect c = body->cog;
+	
+	body->transform = cpTransformNewTranspose(
+		rot.x, -rot.y, p.x - (c.x*rot.x - c.y*rot.y),
+		rot.y,  rot.x, p.y - (c.x*rot.y + c.y*rot.x)
+	);
+}
+
+static inline cpFloat
+SetAngle(cpBody *body, cpFloat a)
+{
+	body->a = a;
+	cpAssertSaneBody(body);
+	
+	return a;
+}
+
+cpVect
+cpBodyGetPosition(const cpBody *body)
+{
+	return cpTransformPoint(body->transform, cpvzero);
+}
+
+void
+cpBodySetPosition(cpBody *body, cpVect position)
+{
+	cpBodyActivate(body);
+	cpVect p = body->p = cpvadd(cpTransformVect(body->transform, body->cog), position);
+	cpAssertSaneBody(body);
+	
+	SetTransform(body, p, body->a);
+}
+
+cpVect
+cpBodyGetCenterOfGravity(const cpBody *body)
+{
+	return body->cog;
+}
+
+void
+cpBodySetCenterOfGravity(cpBody *body, cpVect cog)
+{
+	cpBodyActivate(body);
+	body->cog = cog;
+	cpAssertSaneBody(body);
+}
+
+cpVect
+cpBodyGetVelocity(const cpBody *body)
+{
+	return body->v;
+}
+
+void
+cpBodySetVelocity(cpBody *body, cpVect velocity)
+{
+	cpBodyActivate(body);
+	body->v = velocity;
+	cpAssertSaneBody(body);
+}
+
+cpVect
+cpBodyGetForce(const cpBody *body)
+{
+	return body->f;
+}
+
+void
+cpBodySetForce(cpBody *body, cpVect force)
+{
+	cpBodyActivate(body);
+	body->f = force;
+	cpAssertSaneBody(body);
+}
+
+cpFloat
+cpBodyGetAngle(const cpBody *body)
+{
+	return body->a;
+}
+
+void
+cpBodySetAngle(cpBody *body, cpFloat angle)
+{
+	cpBodyActivate(body);
+	SetAngle(body, angle);
+	
+	SetTransform(body, body->p, angle);
+}
+
+cpFloat
+cpBodyGetAngularVelocity(const cpBody *body)
+{
+	return body->w;
+}
+
+void
+cpBodySetAngularVelocity(cpBody *body, cpFloat angularVelocity)
+{
+	cpBodyActivate(body);
+	body->w = angularVelocity;
+	cpAssertSaneBody(body);
+}
+
+cpFloat
+cpBodyGetTorque(const cpBody *body)
+{
+	return body->t;
+}
+
+void
+cpBodySetTorque(cpBody *body, cpFloat torque)
+{
+	cpBodyActivate(body);
+	body->t = torque;
+	cpAssertSaneBody(body);
+}
+
+cpDataPointer
+cpBodyGetUserData(const cpBody *body)
+{
+	return body->userData;
+}
+
+void
+cpBodySetUserData(cpBody *body, cpDataPointer userData)
+{
+	body->userData = userData;
+}
+cpDataPointer
+cpBodyGetUserData2(const cpBody *body)
+{
+	return body->userData2;
+}
+
+void
+cpBodySetUserData2(cpBody *body, cpDataPointer userData)
+{
+	body->userData2 = userData;
+}
+
+void
+cpBodySetVelocityUpdateFunc(cpBody *body, cpBodyVelocityFunc velocityFunc)
+{
+	body->velocity_func = velocityFunc;
+}
+
+void
+cpBodySetPositionUpdateFunc(cpBody *body, cpBodyPositionFunc positionFunc)
+{
+	body->position_func = positionFunc;
+}
+
+void
+cpBodyUpdateVelocity(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt)
+{
+	// Skip kinematic bodies.
+	if(cpBodyGetType(body) == CP_BODY_TYPE_KINEMATIC) return;
+	
+	cpAssertSoft(body->m > 0.0f && body->i > 0.0f, "Body's mass and moment must be positive to simulate. (Mass: %f Moment: %f)", body->m, body->i);
+	
+	body->v = cpvadd(cpvmult(body->v, damping), cpvmult(cpvadd(gravity, cpvmult(body->f, body->m_inv)), dt));
+	body->w = body->w*damping + body->t*body->i_inv*dt;
+	
+	// Reset forces.
+	body->f = cpvzero;
+	body->t = 0.0f;
+	
+	cpAssertSaneBody(body);
+}
+
+void
+cpBodyUpdatePosition(cpBody *body, cpFloat dt)
+{
+	cpVect p = body->p = cpvadd(body->p, cpvmult(cpvadd(body->v, body->v_bias), dt));
+	cpFloat a = SetAngle(body, body->a + (body->w + body->w_bias)*dt);
+	SetTransform(body, p, a);
+	
+	body->v_bias = cpvzero;
+	body->w_bias = 0.0f;
+	
+	cpAssertSaneBody(body);
+}
+
+cpVect
+cpBodyLocalToWorld(const cpBody *body, const cpVect point)
+{
+	return cpTransformPoint(body->transform, point);
+}
+
+cpVect
+cpBodyWorldToLocal(const cpBody *body, const cpVect point)
+{
+	return cpTransformPoint(cpTransformRigidInverse(body->transform), point);
+}
+
+void
+cpBodyApplyForceAtWorldPoint(cpBody *body, cpVect force, cpVect point)
+{
+	cpBodyActivate(body);
+	body->f = cpvadd(body->f, force);
+	
+	cpVect r = cpvsub(point, cpTransformPoint(body->transform, body->cog));
+	body->t += cpvcross(r, force);
+}
+
+void
+cpBodyApplyForceAtLocalPoint(cpBody *body, cpVect force, cpVect point)
+{
+	cpBodyApplyForceAtWorldPoint(body, cpTransformVect(body->transform, force), cpTransformPoint(body->transform, point));
+}
+
+void
+cpBodyApplyImpulseAtWorldPoint(cpBody *body, cpVect impulse, cpVect point)
+{
+	cpBodyActivate(body);
+	
+	cpVect r = cpvsub(point, cpTransformPoint(body->transform, body->cog));
+	apply_impulse(body, impulse, r);
+}
+
+void
+cpBodyApplyImpulseAtLocalPoint(cpBody *body, cpVect impulse, cpVect point)
+{
+	cpBodyApplyImpulseAtWorldPoint(body, cpTransformVect(body->transform, impulse), cpTransformPoint(body->transform, point));
+}
+
+cpVect
+cpBodyGetVelocityAtLocalPoint(const cpBody *body, cpVect point)
+{
+	cpVect r = cpTransformVect(body->transform, cpvsub(point, body->cog));
+	return cpvadd(body->v, cpvmult(cpvperp(r), body->w));
+}
+
+cpVect
+cpBodyGetVelocityAtWorldPoint(const cpBody *body, cpVect point)
+{
+	cpVect r = cpvsub(point, cpTransformPoint(body->transform, body->cog));
+	return cpvadd(body->v, cpvmult(cpvperp(r), body->w));
+}
+
+cpFloat
+cpBodyKineticEnergy(const cpBody *body)
+{
+	// Need to do some fudging to avoid NaNs
+	cpFloat vsq = cpvdot(body->v, body->v);
+	cpFloat wsq = body->w*body->w;
+	return (vsq ? vsq*body->m : 0.0f) + (wsq ? wsq*body->i : 0.0f);
+}
+
+void
+cpBodyEachShape(cpBody *body, cpBodyShapeIteratorFunc func, void *data)
+{
+	cpShape *shape = body->shapeList;
+	while(shape){
+		cpShape *next = shape->next;
+		func(body, shape, data);
+		shape = next;
+	}
+}
+
+void
+cpBodyEachConstraint(cpBody *body, cpBodyConstraintIteratorFunc func, void *data)
+{
+	cpConstraint *constraint = body->constraintList;
+	while(constraint){
+		cpConstraint *next = cpConstraintNext(constraint, body);
+		func(body, constraint, data);
+		constraint = next;
+	}
+}
+
+void
+cpBodyEachArbiter(cpBody *body, cpBodyArbiterIteratorFunc func, void *data)
+{
+	cpArbiter *arb = body->arbiterList;
+	while(arb){
+		cpArbiter *next = cpArbiterNext(arb, body);
+		
+		cpBool swapped = arb->swapped; {
+			arb->swapped = (body == arb->body_b);
+			func(body, arb, data);
+		} arb->swapped = swapped;
+		
+		arb = next;
+	}
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpCollision.c b/dali-physics/third-party/chipmunk2d/src/cpCollision.c
new file mode 100644
index 0000000..0d31473
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpCollision.c
@@ -0,0 +1,726 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "chipmunk/chipmunk_private.h"
+#include "chipmunk/cpRobust.h"
+
+#if DEBUG && 0
+#include "ChipmunkDemo.h"
+#define DRAW_ALL 0
+#define DRAW_GJK (0 || DRAW_ALL)
+#define DRAW_EPA (0 || DRAW_ALL)
+#define DRAW_CLOSEST (0 || DRAW_ALL)
+#define DRAW_CLIP (0 || DRAW_ALL)
+
+#define PRINT_LOG 0
+#endif
+
+#define MAX_GJK_ITERATIONS 30
+#define MAX_EPA_ITERATIONS 30
+#define WARN_GJK_ITERATIONS 20
+#define WARN_EPA_ITERATIONS 20
+
+static inline void
+cpCollisionInfoPushContact(struct cpCollisionInfo *info, cpVect p1, cpVect p2, cpHashValue hash)
+{
+	cpAssertSoft(info->count <= CP_MAX_CONTACTS_PER_ARBITER, "Internal error: Tried to push too many contacts.");
+	
+	struct cpContact *con = &info->arr[info->count];
+	con->r1 = p1;
+	con->r2 = p2;
+	con->hash = hash;
+	
+	info->count++;
+}
+
+//MARK: Support Points and Edges:
+
+// Support points are the maximal points on a shape's perimeter along a certain axis.
+// The GJK and EPA algorithms use support points to iteratively sample the surface of the two shapes' minkowski difference.
+
+static inline int
+PolySupportPointIndex(const int count, const struct cpSplittingPlane *planes, const cpVect n)
+{
+	cpFloat max = -INFINITY;
+	int index = 0;
+	
+	for(int i=0; i<count; i++){
+		cpVect v = planes[i].v0;
+		cpFloat d = cpvdot(v, n);
+		if(d > max){
+			max = d;
+			index = i;
+		}
+	}
+	
+	return index;
+}
+
+struct SupportPoint {
+	cpVect p;
+	// Save an index of the point so it can be cheaply looked up as a starting point for the next frame.
+	cpCollisionID index;
+};
+
+static inline struct SupportPoint
+SupportPointNew(cpVect p, cpCollisionID index)
+{
+	struct SupportPoint point = {p, index};
+	return point;
+}
+
+typedef struct SupportPoint (*SupportPointFunc)(const cpShape *shape, const cpVect n);
+
+static inline struct SupportPoint
+CircleSupportPoint(const cpCircleShape *circle, const cpVect n)
+{
+	return SupportPointNew(circle->tc, 0);
+}
+
+static inline struct SupportPoint
+SegmentSupportPoint(const cpSegmentShape *seg, const cpVect n)
+{
+	if(cpvdot(seg->ta, n) > cpvdot(seg->tb, n)){
+		return SupportPointNew(seg->ta, 0);
+	} else {
+		return SupportPointNew(seg->tb, 1);
+	}
+}
+
+static inline struct SupportPoint
+PolySupportPoint(const cpPolyShape *poly, const cpVect n)
+{
+	const struct cpSplittingPlane *planes = poly->planes;
+	int i = PolySupportPointIndex(poly->count, planes, n);
+	return SupportPointNew(planes[i].v0, i);
+}
+
+// A point on the surface of two shape's minkowski difference.
+struct MinkowskiPoint {
+	// Cache the two original support points.
+	cpVect a, b;
+	// b - a
+	cpVect ab;
+	// Concatenate the two support point indexes.
+	cpCollisionID id;
+};
+
+static inline struct MinkowskiPoint
+MinkowskiPointNew(const struct SupportPoint a, const struct SupportPoint b)
+{
+	struct MinkowskiPoint point = {a.p, b.p, cpvsub(b.p, a.p), (a.index & 0xFF)<<8 | (b.index & 0xFF)};
+	return point;
+}
+
+struct SupportContext {
+	const cpShape *shape1, *shape2;
+	SupportPointFunc func1, func2;
+};
+
+// Calculate the maximal point on the minkowski difference of two shapes along a particular axis.
+static inline struct MinkowskiPoint
+Support(const struct SupportContext *ctx, const cpVect n)
+{
+	struct SupportPoint a = ctx->func1(ctx->shape1, cpvneg(n));
+	struct SupportPoint b = ctx->func2(ctx->shape2, n);
+	return MinkowskiPointNew(a, b);
+}
+
+struct EdgePoint {
+	cpVect p;
+	// Keep a hash value for Chipmunk's collision hashing mechanism.
+	cpHashValue hash;
+};
+
+// Support edges are the edges of a polygon or segment shape that are in contact.
+struct Edge {
+	struct EdgePoint a, b;
+	cpFloat r;
+	cpVect n;
+};
+
+static struct Edge
+SupportEdgeForPoly(const cpPolyShape *poly, const cpVect n)
+{
+	int count = poly->count;
+	int i1 = PolySupportPointIndex(poly->count, poly->planes, n);
+	
+	// TODO: get rid of mod eventually, very expensive on ARM
+	int i0 = (i1 - 1 + count)%count;
+	int i2 = (i1 + 1)%count;
+	
+	const struct cpSplittingPlane *planes = poly->planes;
+	cpHashValue hashid = poly->shape.hashid;
+	if(cpvdot(n, planes[i1].n) > cpvdot(n, planes[i2].n)){
+		struct Edge edge = {{planes[i0].v0, CP_HASH_PAIR(hashid, i0)}, {planes[i1].v0, CP_HASH_PAIR(hashid, i1)}, poly->r, planes[i1].n};
+		return edge;
+	} else {
+		struct Edge edge = {{planes[i1].v0, CP_HASH_PAIR(hashid, i1)}, {planes[i2].v0, CP_HASH_PAIR(hashid, i2)}, poly->r, planes[i2].n};
+		return edge;
+	}
+}
+
+static struct Edge
+SupportEdgeForSegment(const cpSegmentShape *seg, const cpVect n)
+{
+	cpHashValue hashid = seg->shape.hashid;
+	if(cpvdot(seg->tn, n) > 0.0){
+		struct Edge edge = {{seg->ta, CP_HASH_PAIR(hashid, 0)}, {seg->tb, CP_HASH_PAIR(hashid, 1)}, seg->r, seg->tn};
+		return edge;
+	} else {
+		struct Edge edge = {{seg->tb, CP_HASH_PAIR(hashid, 1)}, {seg->ta, CP_HASH_PAIR(hashid, 0)}, seg->r, cpvneg(seg->tn)};
+		return edge;
+	}
+}
+
+// Find the closest p(t) to (0, 0) where p(t) = a*(1-t)/2 + b*(1+t)/2
+// The range for t is [-1, 1] to avoid floating point issues if the parameters are swapped.
+static inline cpFloat
+ClosestT(const cpVect a, const cpVect b)
+{
+	cpVect delta = cpvsub(b, a);
+	return -cpfclamp(cpvdot(delta, cpvadd(a, b))/cpvlengthsq(delta), -1.0f, 1.0f);
+}
+
+// Basically the same as cpvlerp(), except t = [-1, 1]
+static inline cpVect
+LerpT(const cpVect a, const cpVect b, const cpFloat t)
+{
+	cpFloat ht = 0.5f*t;
+	return cpvadd(cpvmult(a, 0.5f - ht), cpvmult(b, 0.5f + ht));
+}
+
+// Closest points on the surface of two shapes.
+struct ClosestPoints {
+	// Surface points in absolute coordinates.
+	cpVect a, b;
+	// Minimum separating axis of the two shapes.
+	cpVect n;
+	// Signed distance between the points.
+	cpFloat d;
+	// Concatenation of the id's of the minkoski points.
+	cpCollisionID id;
+};
+
+// Calculate the closest points on two shapes given the closest edge on their minkowski difference to (0, 0)
+static inline struct ClosestPoints
+ClosestPointsNew(const struct MinkowskiPoint v0, const struct MinkowskiPoint v1)
+{
+	// Find the closest p(t) on the minkowski difference to (0, 0)
+	cpFloat t = ClosestT(v0.ab, v1.ab);
+	cpVect p = LerpT(v0.ab, v1.ab, t);
+	
+	// Interpolate the original support points using the same 't' value as above.
+	// This gives you the closest surface points in absolute coordinates. NEAT!
+	cpVect pa = LerpT(v0.a, v1.a, t);
+	cpVect pb = LerpT(v0.b, v1.b, t);
+	cpCollisionID id = (v0.id & 0xFFFF)<<16 | (v1.id & 0xFFFF);
+	
+	// First try calculating the MSA from the minkowski difference edge.
+	// This gives us a nice, accurate MSA when the surfaces are close together.
+	cpVect delta = cpvsub(v1.ab, v0.ab);
+	cpVect n = cpvnormalize(cpvrperp(delta));
+	cpFloat d = cpvdot(n, p);
+	
+	if(d <= 0.0f || (-1.0f < t && t < 1.0f)){
+		// If the shapes are overlapping, or we have a regular vertex/edge collision, we are done.
+		struct ClosestPoints points = {pa, pb, n, d, id};
+		return points;
+	} else {
+		// Vertex/vertex collisions need special treatment since the MSA won't be shared with an axis of the minkowski difference.
+		cpFloat d2 = cpvlength(p);
+		cpVect n2 = cpvmult(p, 1.0f/(d2 + CPFLOAT_MIN));
+		
+		struct ClosestPoints points = {pa, pb, n2, d2, id};
+		return points;
+	}
+}
+
+//MARK: EPA Functions
+
+static inline cpFloat
+ClosestDist(const cpVect v0,const cpVect v1)
+{
+	return cpvlengthsq(LerpT(v0, v1, ClosestT(v0, v1)));
+}
+
+// Recursive implementation of the EPA loop.
+// Each recursion adds a point to the convex hull until it's known that we have the closest point on the surface.
+static struct ClosestPoints
+EPARecurse(const struct SupportContext *ctx, const int count, const struct MinkowskiPoint *hull, const int iteration)
+{
+	int mini = 0;
+	cpFloat minDist = INFINITY;
+	
+	// TODO: precalculate this when building the hull and save a step.
+	// Find the closest segment hull[i] and hull[i + 1] to (0, 0)
+	for(int j=0, i=count-1; j<count; i=j, j++){
+		cpFloat d = ClosestDist(hull[i].ab, hull[j].ab);
+		if(d < minDist){
+			minDist = d;
+			mini = i;
+		}
+	}
+	
+	struct MinkowskiPoint v0 = hull[mini];
+	struct MinkowskiPoint v1 = hull[(mini + 1)%count];
+	cpAssertSoft(!cpveql(v0.ab, v1.ab), "Internal Error: EPA vertexes are the same (%d and %d)", mini, (mini + 1)%count);
+	
+	// Check if there is a point on the minkowski difference beyond this edge.
+	struct MinkowskiPoint p = Support(ctx, cpvperp(cpvsub(v1.ab, v0.ab)));
+	
+#if DRAW_EPA
+	cpVect verts[count];
+	for(int i=0; i<count; i++) verts[i] = hull[i].ab;
+	
+	ChipmunkDebugDrawPolygon(count, verts, 0.0, RGBAColor(1, 1, 0, 1), RGBAColor(1, 1, 0, 0.25));
+	ChipmunkDebugDrawSegment(v0.ab, v1.ab, RGBAColor(1, 0, 0, 1));
+	
+	ChipmunkDebugDrawDot(5, p.ab, LAColor(1, 1));
+#endif
+	
+	// The usual exit condition is a duplicated vertex.
+	// Much faster to check the ids than to check the signed area.
+	cpBool duplicate = (p.id == v0.id || p.id == v1.id);
+	
+	if(!duplicate && cpCheckPointGreater(v0.ab, v1.ab, p.ab) && iteration < MAX_EPA_ITERATIONS){
+		// Rebuild the convex hull by inserting p.
+		struct MinkowskiPoint *hull2 = (struct MinkowskiPoint *)alloca((count + 1)*sizeof(struct MinkowskiPoint));
+		int count2 = 1;
+		hull2[0] = p;
+		
+		for(int i=0; i<count; i++){
+			int index = (mini + 1 + i)%count;
+			
+			cpVect h0 = hull2[count2 - 1].ab;
+			cpVect h1 = hull[index].ab;
+			cpVect h2 = (i + 1 < count ? hull[(index + 1)%count] : p).ab;
+			
+			if(cpCheckPointGreater(h0, h2, h1)){
+				hull2[count2] = hull[index];
+				count2++;
+			}
+		}
+		
+		return EPARecurse(ctx, count2, hull2, iteration + 1);
+	} else {
+		// Could not find a new point to insert, so we have found the closest edge of the minkowski difference.
+		cpAssertWarn(iteration < WARN_EPA_ITERATIONS, "High EPA iterations: %d", iteration);
+		return ClosestPointsNew(v0, v1);
+	}
+}
+
+// Find the closest points on the surface of two overlapping shapes using the EPA algorithm.
+// EPA is called from GJK when two shapes overlap.
+// This is a moderately expensive step! Avoid it by adding radii to your shapes so their inner polygons won't overlap.
+static struct ClosestPoints
+EPA(const struct SupportContext *ctx, const struct MinkowskiPoint v0, const struct MinkowskiPoint v1, const struct MinkowskiPoint v2)
+{
+	// TODO: allocate a NxM array here and do an in place convex hull reduction in EPARecurse?
+	struct MinkowskiPoint hull[3] = {v0, v1, v2};
+	return EPARecurse(ctx, 3, hull, 1);
+}
+
+//MARK: GJK Functions.
+
+// Recursive implementation of the GJK loop.
+static inline struct ClosestPoints
+GJKRecurse(const struct SupportContext *ctx, const struct MinkowskiPoint v0, const struct MinkowskiPoint v1, const int iteration)
+{
+	if(iteration > MAX_GJK_ITERATIONS){
+		cpAssertWarn(iteration < WARN_GJK_ITERATIONS, "High GJK iterations: %d", iteration);
+		return ClosestPointsNew(v0, v1);
+	}
+	
+	if(cpCheckPointGreater(v1.ab, v0.ab, cpvzero)){
+		// Origin is behind axis. Flip and try again.
+		return GJKRecurse(ctx, v1, v0, iteration);
+	} else {
+		cpFloat t = ClosestT(v0.ab, v1.ab);
+		cpVect n = (-1.0f < t && t < 1.0f ? cpvperp(cpvsub(v1.ab, v0.ab)) : cpvneg(LerpT(v0.ab, v1.ab, t)));
+		struct MinkowskiPoint p = Support(ctx, n);
+		
+#if DRAW_GJK
+		ChipmunkDebugDrawSegment(v0.ab, v1.ab, RGBAColor(1, 1, 1, 1));
+		cpVect c = cpvlerp(v0.ab, v1.ab, 0.5);
+		ChipmunkDebugDrawSegment(c, cpvadd(c, cpvmult(cpvnormalize(n), 5.0)), RGBAColor(1, 0, 0, 1));
+		
+		ChipmunkDebugDrawDot(5.0, p.ab, LAColor(1, 1));
+#endif
+		
+		if(cpCheckPointGreater(p.ab, v0.ab, cpvzero) && cpCheckPointGreater(v1.ab, p.ab, cpvzero)){
+			// The triangle v0, p, v1 contains the origin. Use EPA to find the MSA.
+			cpAssertWarn(iteration < WARN_GJK_ITERATIONS, "High GJK->EPA iterations: %d", iteration);
+			return EPA(ctx, v0, p, v1);
+		} else {
+			if(cpCheckAxis(v0.ab, v1.ab, p.ab, n)){
+				// The edge v0, v1 that we already have is the closest to (0, 0) since p was not closer.
+				cpAssertWarn(iteration < WARN_GJK_ITERATIONS, "High GJK iterations: %d", iteration);
+				return ClosestPointsNew(v0, v1);
+			} else {
+				// p was closer to the origin than our existing edge.
+				// Need to figure out which existing point to drop.
+				if(ClosestDist(v0.ab, p.ab) < ClosestDist(p.ab, v1.ab)){
+					return GJKRecurse(ctx, v0, p, iteration + 1);
+				} else {
+					return GJKRecurse(ctx, p, v1, iteration + 1);
+				}
+			}
+		}
+	}
+}
+
+// Get a SupportPoint from a cached shape and index.
+static struct SupportPoint
+ShapePoint(const cpShape *shape, const int i)
+{
+	switch(shape->klass->type){
+		case CP_CIRCLE_SHAPE: {
+			return SupportPointNew(((cpCircleShape *)shape)->tc, 0);
+		} case CP_SEGMENT_SHAPE: {
+			cpSegmentShape *seg = (cpSegmentShape *)shape;
+			return SupportPointNew(i == 0 ? seg->ta : seg->tb, i);
+		} case CP_POLY_SHAPE: {
+			cpPolyShape *poly = (cpPolyShape *)shape;
+			// Poly shapes may change vertex count.
+			int index = (i < poly->count ? i : 0);
+			return SupportPointNew(poly->planes[index].v0, index);
+		} default: {
+			return SupportPointNew(cpvzero, 0);
+		}
+	}
+}
+
+// Find the closest points between two shapes using the GJK algorithm.
+static struct ClosestPoints
+GJK(const struct SupportContext *ctx, cpCollisionID *id)
+{
+#if DRAW_GJK || DRAW_EPA
+	int count1 = 1;
+	int count2 = 1;
+	
+	switch(ctx->shape1->klass->type){
+		case CP_SEGMENT_SHAPE: count1 = 2; break;
+		case CP_POLY_SHAPE: count1 = ((cpPolyShape *)ctx->shape1)->count; break;
+		default: break;
+	}
+	
+	switch(ctx->shape2->klass->type){
+		case CP_SEGMENT_SHAPE: count1 = 2; break;
+		case CP_POLY_SHAPE: count2 = ((cpPolyShape *)ctx->shape2)->count; break;
+		default: break;
+	}
+	
+	
+	// draw the minkowski difference origin
+	cpVect origin = cpvzero;
+	ChipmunkDebugDrawDot(5.0, origin, RGBAColor(1,0,0,1));
+	
+	int mdiffCount = count1*count2;
+	cpVect *mdiffVerts = alloca(mdiffCount*sizeof(cpVect));
+	
+	for(int i=0; i<count1; i++){
+		for(int j=0; j<count2; j++){
+			cpVect v = cpvsub(ShapePoint(ctx->shape2, j).p, ShapePoint(ctx->shape1, i).p);
+			mdiffVerts[i*count2 + j] = v;
+			ChipmunkDebugDrawDot(2.0, v, RGBAColor(1, 0, 0, 1));
+		}
+	}
+	 
+	cpVect *hullVerts = alloca(mdiffCount*sizeof(cpVect));
+	int hullCount = cpConvexHull(mdiffCount, mdiffVerts, hullVerts, NULL, 0.0);
+	
+	ChipmunkDebugDrawPolygon(hullCount, hullVerts, 0.0, RGBAColor(1, 0, 0, 1), RGBAColor(1, 0, 0, 0.25));
+#endif
+	
+	struct MinkowskiPoint v0, v1;
+	if(*id){
+		// Use the minkowski points from the last frame as a starting point using the cached indexes.
+		v0 = MinkowskiPointNew(ShapePoint(ctx->shape1, (*id>>24)&0xFF), ShapePoint(ctx->shape2, (*id>>16)&0xFF));
+		v1 = MinkowskiPointNew(ShapePoint(ctx->shape1, (*id>> 8)&0xFF), ShapePoint(ctx->shape2, (*id    )&0xFF));
+	} else {
+		// No cached indexes, use the shapes' bounding box centers as a guess for a starting axis.
+		cpVect axis = cpvperp(cpvsub(cpBBCenter(ctx->shape1->bb), cpBBCenter(ctx->shape2->bb)));
+		v0 = Support(ctx, axis);
+		v1 = Support(ctx, cpvneg(axis));
+	}
+	
+	struct ClosestPoints points = GJKRecurse(ctx, v0, v1, 1);
+	*id = points.id;
+	return points;
+}
+
+//MARK: Contact Clipping
+
+// Given two support edges, find contact point pairs on their surfaces.
+static inline void
+ContactPoints(const struct Edge e1, const struct Edge e2, const struct ClosestPoints points, struct cpCollisionInfo *info)
+{
+	cpFloat mindist = e1.r + e2.r;
+	if(points.d <= mindist){
+#ifdef DRAW_CLIP
+	ChipmunkDebugDrawFatSegment(e1.a.p, e1.b.p, e1.r, RGBAColor(0, 1, 0, 1), LAColor(0, 0));
+	ChipmunkDebugDrawFatSegment(e2.a.p, e2.b.p, e2.r, RGBAColor(1, 0, 0, 1), LAColor(0, 0));
+#endif
+		cpVect n = info->n = points.n;
+		
+		// Distances along the axis parallel to n
+		cpFloat d_e1_a = cpvcross(e1.a.p, n);
+		cpFloat d_e1_b = cpvcross(e1.b.p, n);
+		cpFloat d_e2_a = cpvcross(e2.a.p, n);
+		cpFloat d_e2_b = cpvcross(e2.b.p, n);
+		
+		// TODO + min isn't a complete fix.
+		cpFloat e1_denom = 1.0f/(d_e1_b - d_e1_a + CPFLOAT_MIN);
+		cpFloat e2_denom = 1.0f/(d_e2_b - d_e2_a + CPFLOAT_MIN);
+		
+		// Project the endpoints of the two edges onto the opposing edge, clamping them as necessary.
+		// Compare the projected points to the collision normal to see if the shapes overlap there.
+		{
+			cpVect p1 = cpvadd(cpvmult(n,  e1.r), cpvlerp(e1.a.p, e1.b.p, cpfclamp01((d_e2_b - d_e1_a)*e1_denom)));
+			cpVect p2 = cpvadd(cpvmult(n, -e2.r), cpvlerp(e2.a.p, e2.b.p, cpfclamp01((d_e1_a - d_e2_a)*e2_denom)));
+			cpFloat dist = cpvdot(cpvsub(p2, p1), n);
+			if(dist <= 0.0f){
+				cpHashValue hash_1a2b = CP_HASH_PAIR(e1.a.hash, e2.b.hash);
+				cpCollisionInfoPushContact(info, p1, p2, hash_1a2b);
+			}
+		}{
+			cpVect p1 = cpvadd(cpvmult(n,  e1.r), cpvlerp(e1.a.p, e1.b.p, cpfclamp01((d_e2_a - d_e1_a)*e1_denom)));
+			cpVect p2 = cpvadd(cpvmult(n, -e2.r), cpvlerp(e2.a.p, e2.b.p, cpfclamp01((d_e1_b - d_e2_a)*e2_denom)));
+			cpFloat dist = cpvdot(cpvsub(p2, p1), n);
+			if(dist <= 0.0f){
+				cpHashValue hash_1b2a = CP_HASH_PAIR(e1.b.hash, e2.a.hash);
+				cpCollisionInfoPushContact(info, p1, p2, hash_1b2a);
+			}
+		}
+	}
+}
+
+//MARK: Collision Functions
+
+typedef void (*CollisionFunc)(const cpShape *a, const cpShape *b, struct cpCollisionInfo *info);
+
+// Collide circle shapes.
+static void
+CircleToCircle(const cpCircleShape *c1, const cpCircleShape *c2, struct cpCollisionInfo *info)
+{
+	cpFloat mindist = c1->r + c2->r;
+	cpVect delta = cpvsub(c2->tc, c1->tc);
+	cpFloat distsq = cpvlengthsq(delta);
+	
+	if(distsq < mindist*mindist){
+		cpFloat dist = cpfsqrt(distsq);
+		cpVect n = info->n = (dist ? cpvmult(delta, 1.0f/dist) : cpv(1.0f, 0.0f));
+		cpCollisionInfoPushContact(info, cpvadd(c1->tc, cpvmult(n, c1->r)), cpvadd(c2->tc, cpvmult(n, -c2->r)), 0);
+	}
+}
+
+static void
+CircleToSegment(const cpCircleShape *circle, const cpSegmentShape *segment, struct cpCollisionInfo *info)
+{
+	cpVect seg_a = segment->ta;
+	cpVect seg_b = segment->tb;
+	cpVect center = circle->tc;
+	
+	// Find the closest point on the segment to the circle.
+	cpVect seg_delta = cpvsub(seg_b, seg_a);
+	cpFloat closest_t = cpfclamp01(cpvdot(seg_delta, cpvsub(center, seg_a))/cpvlengthsq(seg_delta));
+	cpVect closest = cpvadd(seg_a, cpvmult(seg_delta, closest_t));
+	
+	// Compare the radii of the two shapes to see if they are colliding.
+	cpFloat mindist = circle->r + segment->r;
+	cpVect delta = cpvsub(closest, center);
+	cpFloat distsq = cpvlengthsq(delta);
+	if(distsq < mindist*mindist){
+		cpFloat dist = cpfsqrt(distsq);
+		// Handle coincident shapes as gracefully as possible.
+		cpVect n = info->n = (dist ? cpvmult(delta, 1.0f/dist) : segment->tn);
+		
+		// Reject endcap collisions if tangents are provided.
+		cpVect rot = cpBodyGetRotation(segment->shape.body);
+		if(
+			(closest_t != 0.0f || cpvdot(n, cpvrotate(segment->a_tangent, rot)) >= 0.0) &&
+			(closest_t != 1.0f || cpvdot(n, cpvrotate(segment->b_tangent, rot)) >= 0.0)
+		){
+			cpCollisionInfoPushContact(info, cpvadd(center, cpvmult(n, circle->r)), cpvadd(closest, cpvmult(n, -segment->r)), 0);
+		}
+	}
+}
+
+static void
+SegmentToSegment(const cpSegmentShape *seg1, const cpSegmentShape *seg2, struct cpCollisionInfo *info)
+{
+	struct SupportContext context = {(cpShape *)seg1, (cpShape *)seg2, (SupportPointFunc)SegmentSupportPoint, (SupportPointFunc)SegmentSupportPoint};
+	struct ClosestPoints points = GJK(&context, &info->id);
+	
+#if DRAW_CLOSEST
+#if PRINT_LOG
+//	ChipmunkDemoPrintString("Distance: %.2f\n", points.d);
+#endif
+	
+	ChipmunkDebugDrawDot(6.0, points.a, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawDot(6.0, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, cpvadd(points.a, cpvmult(points.n, 10.0)), RGBAColor(1, 0, 0, 1));
+#endif
+	
+	cpVect n = points.n;
+	cpVect rot1 = cpBodyGetRotation(seg1->shape.body);
+	cpVect rot2 = cpBodyGetRotation(seg2->shape.body);
+	
+	// If the closest points are nearer than the sum of the radii...
+	if(
+		points.d <= (seg1->r + seg2->r) && (
+			// Reject endcap collisions if tangents are provided.
+			(!cpveql(points.a, seg1->ta) || cpvdot(n, cpvrotate(seg1->a_tangent, rot1)) <= 0.0) &&
+			(!cpveql(points.a, seg1->tb) || cpvdot(n, cpvrotate(seg1->b_tangent, rot1)) <= 0.0) &&
+			(!cpveql(points.b, seg2->ta) || cpvdot(n, cpvrotate(seg2->a_tangent, rot2)) >= 0.0) &&
+			(!cpveql(points.b, seg2->tb) || cpvdot(n, cpvrotate(seg2->b_tangent, rot2)) >= 0.0)
+		)
+	){
+		ContactPoints(SupportEdgeForSegment(seg1, n), SupportEdgeForSegment(seg2, cpvneg(n)), points, info);
+	}
+}
+
+static void
+PolyToPoly(const cpPolyShape *poly1, const cpPolyShape *poly2, struct cpCollisionInfo *info)
+{
+	struct SupportContext context = {(cpShape *)poly1, (cpShape *)poly2, (SupportPointFunc)PolySupportPoint, (SupportPointFunc)PolySupportPoint};
+	struct ClosestPoints points = GJK(&context, &info->id);
+	
+#if DRAW_CLOSEST
+#if PRINT_LOG
+//	ChipmunkDemoPrintString("Distance: %.2f\n", points.d);
+#endif
+	
+	ChipmunkDebugDrawDot(3.0, points.a, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawDot(3.0, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, cpvadd(points.a, cpvmult(points.n, 10.0)), RGBAColor(1, 0, 0, 1));
+#endif
+	
+	// If the closest points are nearer than the sum of the radii...
+	if(points.d - poly1->r - poly2->r <= 0.0){
+		ContactPoints(SupportEdgeForPoly(poly1, points.n), SupportEdgeForPoly(poly2, cpvneg(points.n)), points, info);
+	}
+}
+
+static void
+SegmentToPoly(const cpSegmentShape *seg, const cpPolyShape *poly, struct cpCollisionInfo *info)
+{
+	struct SupportContext context = {(cpShape *)seg, (cpShape *)poly, (SupportPointFunc)SegmentSupportPoint, (SupportPointFunc)PolySupportPoint};
+	struct ClosestPoints points = GJK(&context, &info->id);
+	
+#if DRAW_CLOSEST
+#if PRINT_LOG
+//	ChipmunkDemoPrintString("Distance: %.2f\n", points.d);
+#endif
+	
+	ChipmunkDebugDrawDot(3.0, points.a, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawDot(3.0, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, cpvadd(points.a, cpvmult(points.n, 10.0)), RGBAColor(1, 0, 0, 1));
+#endif
+	
+	cpVect n = points.n;
+	cpVect rot = cpBodyGetRotation(seg->shape.body);
+	
+	if(
+		// If the closest points are nearer than the sum of the radii...
+		points.d - seg->r - poly->r <= 0.0 && (
+			// Reject endcap collisions if tangents are provided.
+			(!cpveql(points.a, seg->ta) || cpvdot(n, cpvrotate(seg->a_tangent, rot)) <= 0.0) &&
+			(!cpveql(points.a, seg->tb) || cpvdot(n, cpvrotate(seg->b_tangent, rot)) <= 0.0)
+		)
+	){
+		ContactPoints(SupportEdgeForSegment(seg, n), SupportEdgeForPoly(poly, cpvneg(n)), points, info);
+	}
+}
+
+static void
+CircleToPoly(const cpCircleShape *circle, const cpPolyShape *poly, struct cpCollisionInfo *info)
+{
+	struct SupportContext context = {(cpShape *)circle, (cpShape *)poly, (SupportPointFunc)CircleSupportPoint, (SupportPointFunc)PolySupportPoint};
+	struct ClosestPoints points = GJK(&context, &info->id);
+	
+#if DRAW_CLOSEST
+	ChipmunkDebugDrawDot(3.0, points.a, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawDot(3.0, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, points.b, RGBAColor(1, 1, 1, 1));
+	ChipmunkDebugDrawSegment(points.a, cpvadd(points.a, cpvmult(points.n, 10.0)), RGBAColor(1, 0, 0, 1));
+#endif
+	
+	// If the closest points are nearer than the sum of the radii...
+	if(points.d <= circle->r + poly->r){
+		cpVect n = info->n = points.n;
+		cpCollisionInfoPushContact(info, cpvadd(points.a, cpvmult(n, circle->r)), cpvadd(points.b, cpvmult(n, poly->r)), 0);
+	}
+}
+
+static void
+CollisionError(const cpShape *circle, const cpShape *poly, struct cpCollisionInfo *info)
+{
+	cpAssertHard(cpFalse, "Internal Error: Shape types are not sorted.");
+}
+
+
+static const CollisionFunc BuiltinCollisionFuncs[9] = {
+	(CollisionFunc)CircleToCircle,
+	CollisionError,
+	CollisionError,
+	(CollisionFunc)CircleToSegment,
+	(CollisionFunc)SegmentToSegment,
+	CollisionError,
+	(CollisionFunc)CircleToPoly,
+	(CollisionFunc)SegmentToPoly,
+	(CollisionFunc)PolyToPoly,
+};
+static const CollisionFunc *CollisionFuncs = BuiltinCollisionFuncs;
+
+struct cpCollisionInfo
+cpCollide(const cpShape *a, const cpShape *b, cpCollisionID id, struct cpContact *contacts)
+{
+	struct cpCollisionInfo info = {a, b, id, cpvzero, 0, contacts};
+	
+	// Make sure the shape types are in order.
+	if(a->klass->type > b->klass->type){
+		info.a = b;
+		info.b = a;
+	}
+	
+	CollisionFuncs[info.a->klass->type + info.b->klass->type*CP_NUM_SHAPES](info.a, info.b, &info);
+	
+//	if(0){
+//		for(int i=0; i<info.count; i++){
+//			cpVect r1 = info.arr[i].r1;
+//			cpVect r2 = info.arr[i].r2;
+//			cpVect mid = cpvlerp(r1, r2, 0.5f);
+//			
+//			ChipmunkDebugDrawSegment(r1, mid, RGBAColor(1, 0, 0, 1));
+//			ChipmunkDebugDrawSegment(r2, mid, RGBAColor(0, 0, 1, 1));
+//		}
+//	}
+	
+	return info;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpConstraint.c b/dali-physics/third-party/chipmunk2d/src/cpConstraint.c
new file mode 100644
index 0000000..7952ea1
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpConstraint.c
@@ -0,0 +1,173 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+// TODO: Comment me!
+
+void cpConstraintDestroy(cpConstraint *constraint){}
+
+void
+cpConstraintFree(cpConstraint *constraint)
+{
+	if(constraint){
+		cpConstraintDestroy(constraint);
+		cpfree(constraint);
+	}
+}
+
+void
+cpConstraintInit(cpConstraint *constraint, const cpConstraintClass *klass, cpBody *a, cpBody *b)
+{
+	constraint->klass = klass;
+	
+	constraint->a = a;
+	constraint->b = b;
+	constraint->space = NULL;
+	
+	constraint->next_a = NULL;
+	constraint->next_b = NULL;
+	
+	constraint->maxForce = (cpFloat)INFINITY;
+	constraint->errorBias = cpfpow(1.0f - 0.1f, 60.0f);
+	constraint->maxBias = (cpFloat)INFINITY;
+	
+	constraint->collideBodies = cpTrue;
+	
+	constraint->preSolve = NULL;
+	constraint->postSolve = NULL;
+}
+
+cpSpace *
+cpConstraintGetSpace(const cpConstraint *constraint)
+{
+	return constraint->space;
+}
+
+cpBody *
+cpConstraintGetBodyA(const cpConstraint *constraint)
+{
+	return constraint->a;
+}
+
+cpBody *
+cpConstraintGetBodyB(const cpConstraint *constraint)
+{
+	return constraint->b;
+}
+
+cpFloat
+cpConstraintGetMaxForce(const cpConstraint *constraint)
+{
+	return constraint->maxForce;
+}
+
+void
+cpConstraintSetMaxForce(cpConstraint *constraint, cpFloat maxForce)
+{
+	cpAssertHard(maxForce >= 0.0f, "maxForce must be positive.");
+	cpConstraintActivateBodies(constraint);
+	constraint->maxForce = maxForce;
+}
+
+cpFloat
+cpConstraintGetErrorBias(const cpConstraint *constraint)
+{
+	return constraint->errorBias;
+}
+
+void
+cpConstraintSetErrorBias(cpConstraint *constraint, cpFloat errorBias)
+{
+	cpAssertHard(errorBias >= 0.0f, "errorBias must be positive.");
+	cpConstraintActivateBodies(constraint);
+	constraint->errorBias = errorBias;
+}
+
+cpFloat
+cpConstraintGetMaxBias(const cpConstraint *constraint)
+{
+	return constraint->maxBias;
+}
+
+void
+cpConstraintSetMaxBias(cpConstraint *constraint, cpFloat maxBias)
+{
+	cpAssertHard(maxBias >= 0.0f, "maxBias must be positive.");
+	cpConstraintActivateBodies(constraint);
+	constraint->maxBias = maxBias;
+}
+
+cpBool
+cpConstraintGetCollideBodies(const cpConstraint *constraint)
+{
+	return constraint->collideBodies;
+}
+
+void
+cpConstraintSetCollideBodies(cpConstraint *constraint, cpBool collideBodies)
+{
+	cpConstraintActivateBodies(constraint);
+	constraint->collideBodies = collideBodies;
+}
+
+cpConstraintPreSolveFunc
+cpConstraintGetPreSolveFunc(const cpConstraint *constraint)
+{
+	return constraint->preSolve;
+}
+
+void
+cpConstraintSetPreSolveFunc(cpConstraint *constraint, cpConstraintPreSolveFunc preSolveFunc)
+{
+	constraint->preSolve = preSolveFunc;
+}
+
+cpConstraintPostSolveFunc
+cpConstraintGetPostSolveFunc(const cpConstraint *constraint)
+{
+	return constraint->postSolve;
+}
+
+void
+cpConstraintSetPostSolveFunc(cpConstraint *constraint, cpConstraintPostSolveFunc postSolveFunc)
+{
+	constraint->postSolve = postSolveFunc;
+}
+
+cpDataPointer
+cpConstraintGetUserData(const cpConstraint *constraint)
+{
+	return constraint->userData;
+}
+
+void
+cpConstraintSetUserData(cpConstraint *constraint, cpDataPointer userData)
+{
+	constraint->userData = userData;
+}
+
+
+cpFloat
+cpConstraintGetImpulse(cpConstraint *constraint)
+{
+	return constraint->klass->getImpulse(constraint);
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpDampedRotarySpring.c b/dali-physics/third-party/chipmunk2d/src/cpDampedRotarySpring.c
new file mode 100644
index 0000000..8d38a54
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpDampedRotarySpring.c
@@ -0,0 +1,178 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static cpFloat
+defaultSpringTorque(cpDampedRotarySpring *spring, cpFloat relativeAngle){
+	return (relativeAngle - spring->restAngle)*spring->stiffness;
+}
+
+static void
+preStep(cpDampedRotarySpring *spring, cpFloat dt)
+{
+	cpBody *a = spring->constraint.a;
+	cpBody *b = spring->constraint.b;
+	
+	cpFloat moment = a->i_inv + b->i_inv;
+	cpAssertSoft(moment != 0.0, "Unsolvable spring.");
+	spring->iSum = 1.0f/moment;
+
+	spring->w_coef = 1.0f - cpfexp(-spring->damping*dt*moment);
+	spring->target_wrn = 0.0f;
+
+	// apply spring torque
+	cpFloat j_spring = spring->springTorqueFunc((cpConstraint *)spring, a->a - b->a)*dt;
+	spring->jAcc = j_spring;
+	
+	a->w -= j_spring*a->i_inv;
+	b->w += j_spring*b->i_inv;
+}
+
+static void applyCachedImpulse(cpDampedRotarySpring *spring, cpFloat dt_coef){}
+
+static void
+applyImpulse(cpDampedRotarySpring *spring, cpFloat dt)
+{
+	cpBody *a = spring->constraint.a;
+	cpBody *b = spring->constraint.b;
+	
+	// compute relative velocity
+	cpFloat wrn = a->w - b->w;//normal_relative_velocity(a, b, r1, r2, n) - spring->target_vrn;
+	
+	// compute velocity loss from drag
+	// not 100% certain this is derived correctly, though it makes sense
+	cpFloat w_damp = (spring->target_wrn - wrn)*spring->w_coef;
+	spring->target_wrn = wrn + w_damp;
+	
+	//apply_impulses(a, b, spring->r1, spring->r2, cpvmult(spring->n, v_damp*spring->nMass));
+	cpFloat j_damp = w_damp*spring->iSum;
+	spring->jAcc += j_damp;
+	
+	a->w += j_damp*a->i_inv;
+	b->w -= j_damp*b->i_inv;
+}
+
+static cpFloat
+getImpulse(cpDampedRotarySpring *spring)
+{
+	return spring->jAcc;
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpDampedRotarySpring *
+cpDampedRotarySpringAlloc(void)
+{
+	return (cpDampedRotarySpring *)cpcalloc(1, sizeof(cpDampedRotarySpring));
+}
+
+cpDampedRotarySpring *
+cpDampedRotarySpringInit(cpDampedRotarySpring *spring, cpBody *a, cpBody *b, cpFloat restAngle, cpFloat stiffness, cpFloat damping)
+{
+	cpConstraintInit((cpConstraint *)spring, &klass, a, b);
+	
+	spring->restAngle = restAngle;
+	spring->stiffness = stiffness;
+	spring->damping = damping;
+	spring->springTorqueFunc = (cpDampedRotarySpringTorqueFunc)defaultSpringTorque;
+	
+	spring->jAcc = 0.0f;
+	
+	return spring;
+}
+
+cpConstraint *
+cpDampedRotarySpringNew(cpBody *a, cpBody *b, cpFloat restAngle, cpFloat stiffness, cpFloat damping)
+{
+	return (cpConstraint *)cpDampedRotarySpringInit(cpDampedRotarySpringAlloc(), a, b, restAngle, stiffness, damping);
+}
+
+cpBool
+cpConstraintIsDampedRotarySpring(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpFloat
+cpDampedRotarySpringGetRestAngle(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	return ((cpDampedRotarySpring *)constraint)->restAngle;
+}
+
+void
+cpDampedRotarySpringSetRestAngle(cpConstraint *constraint, cpFloat restAngle)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedRotarySpring *)constraint)->restAngle = restAngle;
+}
+
+cpFloat
+cpDampedRotarySpringGetStiffness(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	return ((cpDampedRotarySpring *)constraint)->stiffness;
+}
+
+void
+cpDampedRotarySpringSetStiffness(cpConstraint *constraint, cpFloat stiffness)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedRotarySpring *)constraint)->stiffness = stiffness;
+}
+
+cpFloat
+cpDampedRotarySpringGetDamping(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	return ((cpDampedRotarySpring *)constraint)->damping;
+}
+
+void
+cpDampedRotarySpringSetDamping(cpConstraint *constraint, cpFloat damping)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedRotarySpring *)constraint)->damping = damping;
+}
+
+cpDampedRotarySpringTorqueFunc
+cpDampedRotarySpringGetSpringTorqueFunc(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	return ((cpDampedRotarySpring *)constraint)->springTorqueFunc;
+}
+
+void
+cpDampedRotarySpringSetSpringTorqueFunc(cpConstraint *constraint, cpDampedRotarySpringTorqueFunc springTorqueFunc)
+{
+	cpAssertHard(cpConstraintIsDampedRotarySpring(constraint), "Constraint is not a damped rotary spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedRotarySpring *)constraint)->springTorqueFunc = springTorqueFunc;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpDampedSpring.c b/dali-physics/third-party/chipmunk2d/src/cpDampedSpring.c
new file mode 100644
index 0000000..e4d019e
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpDampedSpring.c
@@ -0,0 +1,216 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static cpFloat
+defaultSpringForce(cpDampedSpring *spring, cpFloat dist){
+	return (spring->restLength - dist)*spring->stiffness;
+}
+
+static void
+preStep(cpDampedSpring *spring, cpFloat dt)
+{
+	cpBody *a = spring->constraint.a;
+	cpBody *b = spring->constraint.b;
+	
+	spring->r1 = cpTransformVect(a->transform, cpvsub(spring->anchorA, a->cog));
+	spring->r2 = cpTransformVect(b->transform, cpvsub(spring->anchorB, b->cog));
+	
+	cpVect delta = cpvsub(cpvadd(b->p, spring->r2), cpvadd(a->p, spring->r1));
+	cpFloat dist = cpvlength(delta);
+	spring->n = cpvmult(delta, 1.0f/(dist ? dist : INFINITY));
+	
+	cpFloat k = k_scalar(a, b, spring->r1, spring->r2, spring->n);
+	cpAssertSoft(k != 0.0, "Unsolvable spring.");
+	spring->nMass = 1.0f/k;
+	
+	spring->target_vrn = 0.0f;
+	spring->v_coef = 1.0f - cpfexp(-spring->damping*dt*k);
+
+	// apply spring force
+	cpFloat f_spring = spring->springForceFunc((cpConstraint *)spring, dist);
+	cpFloat j_spring = spring->jAcc = f_spring*dt;
+	apply_impulses(a, b, spring->r1, spring->r2, cpvmult(spring->n, j_spring));
+}
+
+static void applyCachedImpulse(cpDampedSpring *spring, cpFloat dt_coef){}
+
+static void
+applyImpulse(cpDampedSpring *spring, cpFloat dt)
+{
+	cpBody *a = spring->constraint.a;
+	cpBody *b = spring->constraint.b;
+	
+	cpVect n = spring->n;
+	cpVect r1 = spring->r1;
+	cpVect r2 = spring->r2;
+
+	// compute relative velocity
+	cpFloat vrn = normal_relative_velocity(a, b, r1, r2, n);
+	
+	// compute velocity loss from drag
+	cpFloat v_damp = (spring->target_vrn - vrn)*spring->v_coef;
+	spring->target_vrn = vrn + v_damp;
+	
+	cpFloat j_damp = v_damp*spring->nMass;
+	spring->jAcc += j_damp;
+	apply_impulses(a, b, spring->r1, spring->r2, cpvmult(spring->n, j_damp));
+}
+
+static cpFloat
+getImpulse(cpDampedSpring *spring)
+{
+	return spring->jAcc;
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpDampedSpring *
+cpDampedSpringAlloc(void)
+{
+	return (cpDampedSpring *)cpcalloc(1, sizeof(cpDampedSpring));
+}
+
+cpDampedSpring *
+cpDampedSpringInit(cpDampedSpring *spring, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat restLength, cpFloat stiffness, cpFloat damping)
+{
+	cpConstraintInit((cpConstraint *)spring, &klass, a, b);
+	
+	spring->anchorA = anchorA;
+	spring->anchorB = anchorB;
+	
+	spring->restLength = restLength;
+	spring->stiffness = stiffness;
+	spring->damping = damping;
+	spring->springForceFunc = (cpDampedSpringForceFunc)defaultSpringForce;
+	
+	spring->jAcc = 0.0f;
+	
+	return spring;
+}
+
+cpConstraint *
+cpDampedSpringNew(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat restLength, cpFloat stiffness, cpFloat damping)
+{
+	return (cpConstraint *)cpDampedSpringInit(cpDampedSpringAlloc(), a, b, anchorA, anchorB, restLength, stiffness, damping);
+}
+
+cpBool
+cpConstraintIsDampedSpring(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpVect
+cpDampedSpringGetAnchorA(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	return ((cpDampedSpring *)constraint)->anchorA;
+}
+
+void
+cpDampedSpringSetAnchorA(cpConstraint *constraint, cpVect anchorA)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedSpring *)constraint)->anchorA = anchorA;
+}
+
+cpVect
+cpDampedSpringGetAnchorB(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	return ((cpDampedSpring *)constraint)->anchorB;
+}
+
+void
+cpDampedSpringSetAnchorB(cpConstraint *constraint, cpVect anchorB)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedSpring *)constraint)->anchorB = anchorB;
+}
+
+cpFloat
+cpDampedSpringGetRestLength(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	return ((cpDampedSpring *)constraint)->restLength;
+}
+
+void
+cpDampedSpringSetRestLength(cpConstraint *constraint, cpFloat restLength)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedSpring *)constraint)->restLength = restLength;
+}
+
+cpFloat
+cpDampedSpringGetStiffness(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	return ((cpDampedSpring *)constraint)->stiffness;
+}
+
+void
+cpDampedSpringSetStiffness(cpConstraint *constraint, cpFloat stiffness)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedSpring *)constraint)->stiffness = stiffness;
+}
+
+cpFloat
+cpDampedSpringGetDamping(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	return ((cpDampedSpring *)constraint)->damping;
+}
+
+void
+cpDampedSpringSetDamping(cpConstraint *constraint, cpFloat damping)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedSpring *)constraint)->damping = damping;
+}
+
+cpDampedSpringForceFunc
+cpDampedSpringGetSpringForceFunc(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	return ((cpDampedSpring *)constraint)->springForceFunc;
+}
+
+void
+cpDampedSpringSetSpringForceFunc(cpConstraint *constraint, cpDampedSpringForceFunc springForceFunc)
+{
+	cpAssertHard(cpConstraintIsDampedSpring(constraint), "Constraint is not a damped spring.");
+	cpConstraintActivateBodies(constraint);
+	((cpDampedSpring *)constraint)->springForceFunc = springForceFunc;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpGearJoint.c b/dali-physics/third-party/chipmunk2d/src/cpGearJoint.c
new file mode 100644
index 0000000..3670173
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpGearJoint.c
@@ -0,0 +1,145 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpGearJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	// calculate moment of inertia coefficient.
+	joint->iSum = 1.0f/(a->i_inv*joint->ratio_inv + joint->ratio*b->i_inv);
+	
+	// calculate bias velocity
+	cpFloat maxBias = joint->constraint.maxBias;
+	joint->bias = cpfclamp(-bias_coef(joint->constraint.errorBias, dt)*(b->a*joint->ratio - a->a - joint->phase)/dt, -maxBias, maxBias);
+}
+
+static void
+applyCachedImpulse(cpGearJoint *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpFloat j = joint->jAcc*dt_coef;
+	a->w -= j*a->i_inv*joint->ratio_inv;
+	b->w += j*b->i_inv;
+}
+
+static void
+applyImpulse(cpGearJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	// compute relative rotational velocity
+	cpFloat wr = b->w*joint->ratio - a->w;
+	
+	cpFloat jMax = joint->constraint.maxForce*dt;
+	
+	// compute normal impulse	
+	cpFloat j = (joint->bias - wr)*joint->iSum;
+	cpFloat jOld = joint->jAcc;
+	joint->jAcc = cpfclamp(jOld + j, -jMax, jMax);
+	j = joint->jAcc - jOld;
+	
+	// apply impulse
+	a->w -= j*a->i_inv*joint->ratio_inv;
+	b->w += j*b->i_inv;
+}
+
+static cpFloat
+getImpulse(cpGearJoint *joint)
+{
+	return cpfabs(joint->jAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpGearJoint *
+cpGearJointAlloc(void)
+{
+	return (cpGearJoint *)cpcalloc(1, sizeof(cpGearJoint));
+}
+
+cpGearJoint *
+cpGearJointInit(cpGearJoint *joint, cpBody *a, cpBody *b, cpFloat phase, cpFloat ratio)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->phase = phase;
+	joint->ratio = ratio;
+	joint->ratio_inv = 1.0f/ratio;
+	
+	joint->jAcc = 0.0f;
+	
+	return joint;
+}
+
+cpConstraint *
+cpGearJointNew(cpBody *a, cpBody *b, cpFloat phase, cpFloat ratio)
+{
+	return (cpConstraint *)cpGearJointInit(cpGearJointAlloc(), a, b, phase, ratio);
+}
+
+cpBool
+cpConstraintIsGearJoint(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpFloat
+cpGearJointGetPhase(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsGearJoint(constraint), "Constraint is not a ratchet joint.");
+	return ((cpGearJoint *)constraint)->phase;
+}
+
+void
+cpGearJointSetPhase(cpConstraint *constraint, cpFloat phase)
+{
+	cpAssertHard(cpConstraintIsGearJoint(constraint), "Constraint is not a ratchet joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpGearJoint *)constraint)->phase = phase;
+}
+
+cpFloat
+cpGearJointGetRatio(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsGearJoint(constraint), "Constraint is not a ratchet joint.");
+	return ((cpGearJoint *)constraint)->ratio;
+}
+
+void
+cpGearJointSetRatio(cpConstraint *constraint, cpFloat ratio)
+{
+	cpAssertHard(cpConstraintIsGearJoint(constraint), "Constraint is not a ratchet joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpGearJoint *)constraint)->ratio = ratio;
+	((cpGearJoint *)constraint)->ratio_inv = 1.0f/ratio;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpGrooveJoint.c b/dali-physics/third-party/chipmunk2d/src/cpGrooveJoint.c
new file mode 100644
index 0000000..50d1857
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpGrooveJoint.c
@@ -0,0 +1,197 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpGrooveJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	// calculate endpoints in worldspace
+	cpVect ta = cpTransformPoint(a->transform, joint->grv_a);
+	cpVect tb = cpTransformPoint(a->transform, joint->grv_b);
+
+	// calculate axis
+	cpVect n = cpTransformVect(a->transform, joint->grv_n);
+	cpFloat d = cpvdot(ta, n);
+	
+	joint->grv_tn = n;
+	joint->r2 = cpTransformVect(b->transform, cpvsub(joint->anchorB, b->cog));
+	
+	// calculate tangential distance along the axis of r2
+	cpFloat td = cpvcross(cpvadd(b->p, joint->r2), n);
+	// calculate clamping factor and r2
+	if(td <= cpvcross(ta, n)){
+		joint->clamp = 1.0f;
+		joint->r1 = cpvsub(ta, a->p);
+	} else if(td >= cpvcross(tb, n)){
+		joint->clamp = -1.0f;
+		joint->r1 = cpvsub(tb, a->p);
+	} else {
+		joint->clamp = 0.0f;
+		joint->r1 = cpvsub(cpvadd(cpvmult(cpvperp(n), -td), cpvmult(n, d)), a->p);
+	}
+	
+	// Calculate mass tensor
+	joint->k = k_tensor(a, b, joint->r1, joint->r2);
+	
+	// calculate bias velocity
+	cpVect delta = cpvsub(cpvadd(b->p, joint->r2), cpvadd(a->p, joint->r1));
+	joint->bias = cpvclamp(cpvmult(delta, -bias_coef(joint->constraint.errorBias, dt)/dt), joint->constraint.maxBias);
+}
+
+static void
+applyCachedImpulse(cpGrooveJoint *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+		
+	apply_impulses(a, b, joint->r1, joint->r2, cpvmult(joint->jAcc, dt_coef));
+}
+
+static inline cpVect
+grooveConstrain(cpGrooveJoint *joint, cpVect j, cpFloat dt){
+	cpVect n = joint->grv_tn;
+	cpVect jClamp = (joint->clamp*cpvcross(j, n) > 0.0f) ? j : cpvproject(j, n);
+	return cpvclamp(jClamp, joint->constraint.maxForce*dt);
+}
+
+static void
+applyImpulse(cpGrooveJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpVect r1 = joint->r1;
+	cpVect r2 = joint->r2;
+	
+	// compute impulse
+	cpVect vr = relative_velocity(a, b, r1, r2);
+
+	cpVect j = cpMat2x2Transform(joint->k, cpvsub(joint->bias, vr));
+	cpVect jOld = joint->jAcc;
+	joint->jAcc = grooveConstrain(joint, cpvadd(jOld, j), dt);
+	j = cpvsub(joint->jAcc, jOld);
+	
+	// apply impulse
+	apply_impulses(a, b, joint->r1, joint->r2, j);
+}
+
+static cpFloat
+getImpulse(cpGrooveJoint *joint)
+{
+	return cpvlength(joint->jAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpGrooveJoint *
+cpGrooveJointAlloc(void)
+{
+	return (cpGrooveJoint *)cpcalloc(1, sizeof(cpGrooveJoint));
+}
+
+cpGrooveJoint *
+cpGrooveJointInit(cpGrooveJoint *joint, cpBody *a, cpBody *b, cpVect groove_a, cpVect groove_b, cpVect anchorB)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->grv_a = groove_a;
+	joint->grv_b = groove_b;
+	joint->grv_n = cpvperp(cpvnormalize(cpvsub(groove_b, groove_a)));
+	joint->anchorB = anchorB;
+	
+	joint->jAcc = cpvzero;
+	
+	return joint;
+}
+
+cpConstraint *
+cpGrooveJointNew(cpBody *a, cpBody *b, cpVect groove_a, cpVect groove_b, cpVect anchorB)
+{
+	return (cpConstraint *)cpGrooveJointInit(cpGrooveJointAlloc(), a, b, groove_a, groove_b, anchorB);
+}
+
+cpBool
+cpConstraintIsGrooveJoint(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpVect
+cpGrooveJointGetGrooveA(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsGrooveJoint(constraint), "Constraint is not a groove joint.");
+	return ((cpGrooveJoint *)constraint)->grv_a;
+}
+
+void
+cpGrooveJointSetGrooveA(cpConstraint *constraint, cpVect value)
+{
+	cpAssertHard(cpConstraintIsGrooveJoint(constraint), "Constraint is not a groove joint.");
+	cpGrooveJoint *g = (cpGrooveJoint *)constraint;
+	
+	g->grv_a = value;
+	g->grv_n = cpvperp(cpvnormalize(cpvsub(g->grv_b, value)));
+	
+	cpConstraintActivateBodies(constraint);
+}
+
+cpVect
+cpGrooveJointGetGrooveB(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsGrooveJoint(constraint), "Constraint is not a groove joint.");
+	return ((cpGrooveJoint *)constraint)->grv_b;
+}
+
+void
+cpGrooveJointSetGrooveB(cpConstraint *constraint, cpVect value)
+{
+	cpAssertHard(cpConstraintIsGrooveJoint(constraint), "Constraint is not a groove joint.");
+	cpGrooveJoint *g = (cpGrooveJoint *)constraint;
+	
+	g->grv_b = value;
+	g->grv_n = cpvperp(cpvnormalize(cpvsub(value, g->grv_a)));
+	
+	cpConstraintActivateBodies(constraint);
+}
+
+cpVect
+cpGrooveJointGetAnchorB(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsGrooveJoint(constraint), "Constraint is not a groove joint.");
+	return ((cpGrooveJoint *)constraint)->anchorB;
+}
+
+void
+cpGrooveJointSetAnchorB(cpConstraint *constraint, cpVect anchorB)
+{
+	cpAssertHard(cpConstraintIsGrooveJoint(constraint), "Constraint is not a groove joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpGrooveJoint *)constraint)->anchorB = anchorB;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpHashSet.c b/dali-physics/third-party/chipmunk2d/src/cpHashSet.c
new file mode 100644
index 0000000..b2918de
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpHashSet.c
@@ -0,0 +1,253 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+#include "prime.h"
+
+typedef struct cpHashSetBin {
+	void *elt;
+	cpHashValue hash;
+	struct cpHashSetBin *next;
+} cpHashSetBin;
+
+struct cpHashSet {
+	unsigned int entries, size;
+	
+	cpHashSetEqlFunc eql;
+	void *default_value;
+	
+	cpHashSetBin **table;
+	cpHashSetBin *pooledBins;
+	
+	cpArray *allocatedBuffers;
+};
+
+void
+cpHashSetFree(cpHashSet *set)
+{
+	if(set){
+		cpfree(set->table);
+		
+		cpArrayFreeEach(set->allocatedBuffers, cpfree);
+		cpArrayFree(set->allocatedBuffers);
+		
+		cpfree(set);
+	}
+}
+
+cpHashSet *
+cpHashSetNew(int size, cpHashSetEqlFunc eqlFunc)
+{
+	cpHashSet *set = (cpHashSet *)cpcalloc(1, sizeof(cpHashSet));
+	
+	set->size = next_prime(size);
+	set->entries = 0;
+	
+	set->eql = eqlFunc;
+	set->default_value = NULL;
+	
+	set->table = (cpHashSetBin **)cpcalloc(set->size, sizeof(cpHashSetBin *));
+	set->pooledBins = NULL;
+	
+	set->allocatedBuffers = cpArrayNew(0);
+	
+	return set;
+}
+
+void
+cpHashSetSetDefaultValue(cpHashSet *set, void *default_value)
+{
+	set->default_value = default_value;
+}
+
+static int
+setIsFull(cpHashSet *set)
+{
+	return (set->entries >= set->size);
+}
+
+static void
+cpHashSetResize(cpHashSet *set)
+{
+	// Get the next approximate doubled prime.
+	unsigned int newSize = next_prime(set->size + 1);
+	// Allocate a new table.
+	cpHashSetBin **newTable = (cpHashSetBin **)cpcalloc(newSize, sizeof(cpHashSetBin *));
+	
+	// Iterate over the chains.
+	for(unsigned int i=0; i<set->size; i++){
+		// Rehash the bins into the new table.
+		cpHashSetBin *bin = set->table[i];
+		while(bin){
+			cpHashSetBin *next = bin->next;
+			
+			cpHashValue idx = bin->hash%newSize;
+			bin->next = newTable[idx];
+			newTable[idx] = bin;
+			
+			bin = next;
+		}
+	}
+	
+	cpfree(set->table);
+	
+	set->table = newTable;
+	set->size = newSize;
+}
+
+static inline void
+recycleBin(cpHashSet *set, cpHashSetBin *bin)
+{
+	bin->next = set->pooledBins;
+	set->pooledBins = bin;
+	bin->elt = NULL;
+}
+
+static cpHashSetBin *
+getUnusedBin(cpHashSet *set)
+{
+	cpHashSetBin *bin = set->pooledBins;
+	
+	if(bin){
+		set->pooledBins = bin->next;
+		return bin;
+	} else {
+		// Pool is exhausted, make more
+		int count = CP_BUFFER_BYTES/sizeof(cpHashSetBin);
+		cpAssertHard(count, "Internal Error: Buffer size is too small.");
+		
+		cpHashSetBin *buffer = (cpHashSetBin *)cpcalloc(1, CP_BUFFER_BYTES);
+		cpArrayPush(set->allocatedBuffers, buffer);
+		
+		// push all but the first one, return it instead
+		for(int i=1; i<count; i++) recycleBin(set, buffer + i);
+		return buffer;
+	}
+}
+
+int
+cpHashSetCount(cpHashSet *set)
+{
+	return set->entries;
+}
+
+const void *
+cpHashSetInsert(cpHashSet *set, cpHashValue hash, const void *ptr, cpHashSetTransFunc trans, void *data)
+{
+	cpHashValue idx = hash%set->size;
+	
+	// Find the bin with the matching element.
+	cpHashSetBin *bin = set->table[idx];
+	while(bin && !set->eql(ptr, bin->elt))
+		bin = bin->next;
+	
+	// Create it if necessary.
+	if(!bin){
+		bin = getUnusedBin(set);
+		bin->hash = hash;
+		bin->elt = (trans ? trans(ptr, data) : data);
+		
+		bin->next = set->table[idx];
+		set->table[idx] = bin;
+		
+		set->entries++;
+		if(setIsFull(set)) cpHashSetResize(set);
+	}
+	
+	return bin->elt;
+}
+
+const void *
+cpHashSetRemove(cpHashSet *set, cpHashValue hash, const void *ptr)
+{
+	cpHashValue idx = hash%set->size;
+	
+	cpHashSetBin **prev_ptr = &set->table[idx];
+	cpHashSetBin *bin = set->table[idx];
+	
+	// Find the bin
+	while(bin && !set->eql(ptr, bin->elt)){
+		prev_ptr = &bin->next;
+		bin = bin->next;
+	}
+	
+	// Remove it if it exists.
+	if(bin){
+		// Update the previous linked list pointer
+		(*prev_ptr) = bin->next;
+		set->entries--;
+		
+		const void *elt = bin->elt;
+		recycleBin(set, bin);
+		
+		return elt;
+	}
+	
+	return NULL;
+}
+
+const void *
+cpHashSetFind(cpHashSet *set, cpHashValue hash, const void *ptr)
+{	
+	cpHashValue idx = hash%set->size;
+	cpHashSetBin *bin = set->table[idx];
+	while(bin && !set->eql(ptr, bin->elt))
+		bin = bin->next;
+		
+	return (bin ? bin->elt : set->default_value);
+}
+
+void
+cpHashSetEach(cpHashSet *set, cpHashSetIteratorFunc func, void *data)
+{
+	for(unsigned int i=0; i<set->size; i++){
+		cpHashSetBin *bin = set->table[i];
+		while(bin){
+			cpHashSetBin *next = bin->next;
+			func(bin->elt, data);
+			bin = next;
+		}
+	}
+}
+
+void
+cpHashSetFilter(cpHashSet *set, cpHashSetFilterFunc func, void *data)
+{
+	for(unsigned int i=0; i<set->size; i++){
+		// The rest works similarly to cpHashSetRemove() above.
+		cpHashSetBin **prev_ptr = &set->table[i];
+		cpHashSetBin *bin = set->table[i];
+		while(bin){
+			cpHashSetBin *next = bin->next;
+			
+			if(func(bin->elt, data)){
+				prev_ptr = &bin->next;
+			} else {
+				(*prev_ptr) = next;
+
+				set->entries--;
+				recycleBin(set, bin);
+			}
+			
+			bin = next;
+		}
+	}
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpHastySpace.c b/dali-physics/third-party/chipmunk2d/src/cpHastySpace.c
new file mode 100644
index 0000000..8422c3e
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpHastySpace.c
@@ -0,0 +1,700 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#include <stdlib.h>
+#include <stdio.h>
+
+//TODO: Move all the thread stuff to another file
+
+//#include <sys/param.h >
+
+#ifdef __APPLE__
+#include <sys/sysctl.h>
+#endif
+
+#ifndef _WIN32
+#include <pthread.h>
+#elif defined(__MINGW32__)
+#include <pthread.h>
+#else
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#include <process.h> // _beginthreadex
+#include <windows.h>
+
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 1
+#endif
+
+// Simple pthread implementation for Windows
+// Made from scratch to avoid the LGPL licence from pthread-win32
+enum {
+	SIGNAL = 0,
+	BROADCAST = 1,
+	MAX_EVENTS = 2
+};
+
+typedef HANDLE pthread_t;
+typedef struct
+{
+	// Based on http://www.cs.wustl.edu/~schmidt/win32-cv-1.html since Windows has no condition variable until NT6
+	UINT waiters_count;
+	// Count of the number of waiters.
+
+	CRITICAL_SECTION waiters_count_lock;
+	// Serialize access to <waiters_count_>.
+
+	HANDLE events[MAX_EVENTS];
+} pthread_cond_t;
+typedef CRITICAL_SECTION pthread_mutex_t;
+
+typedef struct {} pthread_condattr_t; // Dummy;
+
+int pthread_cond_destroy(pthread_cond_t* cv)
+{
+	CloseHandle(cv->events[BROADCAST]);
+	CloseHandle(cv->events[SIGNAL]);
+
+	DeleteCriticalSection(&cv->waiters_count_lock);
+
+	return 0;
+}
+
+int pthread_cond_init(pthread_cond_t* cv, const pthread_condattr_t* attr)
+{
+	// Initialize the count to 0.
+	cv->waiters_count = 0;
+
+	// Create an auto-reset event.
+	cv->events[SIGNAL] = CreateEvent(NULL,  // no security
+	                                 FALSE, // auto-reset event
+	                                 FALSE, // non-signaled initially
+	                                 NULL); // unnamed
+
+	// Create a manual-reset event.
+	cv->events[BROADCAST] = CreateEvent(NULL,  // no security
+	                                    TRUE,  // manual-reset
+	                                    FALSE, // non-signaled initially
+	                                    NULL); // unnamed
+
+	InitializeCriticalSection(&cv->waiters_count_lock);
+
+	return 0;
+}
+
+int pthread_cond_broadcast(pthread_cond_t *cv)
+{
+	// Avoid race conditions.
+	EnterCriticalSection(&cv->waiters_count_lock);
+	int have_waiters = cv->waiters_count > 0;
+	LeaveCriticalSection(&cv->waiters_count_lock);
+
+	if (have_waiters)
+		SetEvent(cv->events[BROADCAST]);
+
+	return 0;
+}
+
+int pthread_cond_signal(pthread_cond_t* cv)
+{
+	// Avoid race conditions.
+	EnterCriticalSection(&cv->waiters_count_lock);
+	int have_waiters = cv->waiters_count > 0;
+	LeaveCriticalSection(&cv->waiters_count_lock);
+
+	if (have_waiters)
+		SetEvent(cv->events[SIGNAL]);
+
+	return 0;
+}
+
+int pthread_cond_wait(pthread_cond_t* cv, pthread_mutex_t* external_mutex)
+{
+	// Avoid race conditions.
+	EnterCriticalSection(&cv->waiters_count_lock);
+	cv->waiters_count++;
+	LeaveCriticalSection(&cv->waiters_count_lock);
+
+	// It's ok to release the <external_mutex> here since Win32
+	// manual-reset events maintain state when used with
+	// <SetEvent>.  This avoids the "lost wakeup" bug...
+	LeaveCriticalSection(external_mutex);
+
+	// Wait for either event to become signaled due to <pthread_cond_signal>
+	// being called or <pthread_cond_broadcast> being called.
+	int result = WaitForMultipleObjects(2, cv->events, FALSE, INFINITE);
+
+	EnterCriticalSection(&cv->waiters_count_lock);
+	cv->waiters_count--;
+	int last_waiter =
+		result == WAIT_OBJECT_0 + BROADCAST
+		&& cv->waiters_count == 0;
+	LeaveCriticalSection(&cv->waiters_count_lock);
+
+	// Some thread called <pthread_cond_broadcast>.
+	if (last_waiter)
+		// We're the last waiter to be notified or to stop waiting, so
+		// reset the manual event. 
+		ResetEvent(cv->events[BROADCAST]);
+
+	// Reacquire the <external_mutex>.
+	EnterCriticalSection(external_mutex);
+
+	return result == WAIT_TIMEOUT ? ETIMEDOUT : 0;
+}
+
+typedef struct {} pthread_mutexattr_t; //< Dummy
+
+int pthread_mutex_init(pthread_mutex_t* mutex, const pthread_mutexattr_t* attr)
+{
+	InitializeCriticalSection(mutex);
+	return 0;
+}
+
+int pthread_mutex_destroy(pthread_mutex_t* mutex)
+{
+	DeleteCriticalSection(mutex);
+	return 0;
+}
+
+int pthread_mutex_lock(pthread_mutex_t* mutex)
+{
+	EnterCriticalSection(mutex);
+	return 0;
+}
+
+int pthread_mutex_unlock(pthread_mutex_t* mutex)
+{
+	LeaveCriticalSection(mutex);
+	return 0;
+}
+
+typedef struct {} pthread_attr_t;
+
+typedef struct
+{
+	void *(*start_routine) (void *);
+	void* arg;
+} pthread_internal_thread;
+
+unsigned int __stdcall ThreadProc(void* userdata)
+{
+	pthread_internal_thread* ud = (pthread_internal_thread*) userdata;
+	ud->start_routine(ud->arg);
+
+	free(ud);
+
+	return 0;
+}
+
+int pthread_create(pthread_t* thread, const pthread_attr_t* attr, void *(*start_routine) (void *), void *arg)
+{
+	pthread_internal_thread* ud = (pthread_internal_thread*) malloc(sizeof(pthread_internal_thread));
+	ud->start_routine = start_routine;
+	ud->arg = arg;
+
+	*thread = (HANDLE) (_beginthreadex(NULL, 0, &ThreadProc, ud, 0, NULL));
+	if (!*thread)
+		return 1;
+
+	return 0;
+}
+
+int pthread_join(pthread_t thread, void **value_ptr)
+{
+	WaitForSingleObject(thread, INFINITE);
+	CloseHandle(thread);
+
+	return 0;
+}
+
+#endif
+
+#include "chipmunk/chipmunk_private.h"
+#include "chipmunk/cpHastySpace.h"
+
+
+//MARK: ARM NEON Solver
+
+#if __ARM_NEON__
+#include <arm_neon.h>
+
+// Tested and known to work fine with Clang 3.0 and GCC 4.2
+// Doesn't work with Clang 1.6, and I have no idea why.
+#if defined(__clang_major__) && __clang_major__ < 3
+	#error Compiler not supported.
+#endif
+
+#if CP_USE_DOUBLES
+	#if !__arm64
+		#error Cannot use CP_USE_DOUBLES on 32 bit ARM.
+	#endif
+	
+	typedef float64_t cpFloat_t;
+	typedef float64x2_t cpFloatx2_t;
+	#define vld vld1q_f64
+	#define vdup_n vdupq_n_f64
+	#define vst vst1q_f64
+	#define vst_lane vst1q_lane_f64
+	#define vadd vaddq_f64
+	#define vsub vsubq_f64
+	#define vpadd vpaddq_f64
+	#define vmul vmulq_f64
+	#define vmul_n vmulq_n_f64
+	#define vneg vnegq_f64
+	#define vget_lane vgetq_lane_f64
+	#define vset_lane vsetq_lane_f64
+	#define vmin vminq_f64
+	#define vmax vmaxq_f64
+	#define vrev(__a) __builtin_shufflevector(__a, __a, 1, 0)
+#else
+	typedef float32_t cpFloat_t;
+	typedef float32x2_t cpFloatx2_t;
+	#define vld vld1_f32
+	#define vdup_n vdup_n_f32
+	#define vst vst1_f32
+	#define vst_lane vst1_lane_f32
+	#define vadd vadd_f32
+	#define vsub vsub_f32
+	#define vpadd vpadd_f32
+	#define vmul vmul_f32
+	#define vmul_n vmul_n_f32
+	#define vneg vneg_f32
+	#define vget_lane vget_lane_f32
+	#define vset_lane vset_lane_f32
+	#define vmin vmin_f32
+	#define vmax vmax_f32
+	#define vrev vrev64_f32
+#endif
+
+// TODO could probably do better here, maybe using vcreate?
+// especially for the constants
+// Maybe use the {} notation for GCC/Clang?
+static inline cpFloatx2_t
+vmake(cpFloat_t x, cpFloat_t y)
+{
+//	cpFloatx2_t v = {};
+//	v = vset_lane(x, v, 0);
+//	v = vset_lane(y, v, 1);
+//	
+//	return v;
+	
+	// This might not be super compatible, but all the NEON headers use it...
+	return (cpFloatx2_t){x, y};
+}
+
+static void
+cpArbiterApplyImpulse_NEON(cpArbiter *arb)
+{
+	cpBody *a = arb->body_a;
+	cpBody *b = arb->body_b;
+	cpFloatx2_t surface_vr = vld((cpFloat_t *)&arb->surface_vr);
+	cpFloatx2_t n = vld((cpFloat_t *)&arb->n);
+	cpFloat_t friction = arb->u;
+	
+	int numContacts = arb->count;
+	struct cpContact *contacts = arb->contacts;
+	for(int i=0; i<numContacts; i++){
+		struct cpContact *con = contacts + i;
+		cpFloatx2_t r1 = vld((cpFloat_t *)&con->r1);
+		cpFloatx2_t r2 = vld((cpFloat_t *)&con->r2);
+		
+		cpFloatx2_t perp = vmake(-1.0, 1.0);
+		cpFloatx2_t r1p = vmul(vrev(r1), perp);
+		cpFloatx2_t r2p = vmul(vrev(r2), perp);
+		
+		cpFloatx2_t vBias_a = vld((cpFloat_t *)&a->v_bias);
+		cpFloatx2_t vBias_b = vld((cpFloat_t *)&b->v_bias);
+		cpFloatx2_t wBias = vmake(a->w_bias, b->w_bias);
+		
+		cpFloatx2_t vb1 = vadd(vBias_a, vmul_n(r1p, vget_lane(wBias, 0)));
+		cpFloatx2_t vb2 = vadd(vBias_b, vmul_n(r2p, vget_lane(wBias, 1)));
+		cpFloatx2_t vbr = vsub(vb2, vb1);
+		
+		cpFloatx2_t v_a = vld((cpFloat_t *)&a->v);
+		cpFloatx2_t v_b = vld((cpFloat_t *)&b->v);
+		cpFloatx2_t w = vmake(a->w, b->w);
+		cpFloatx2_t v1 = vadd(v_a, vmul_n(r1p, vget_lane(w, 0)));
+		cpFloatx2_t v2 = vadd(v_b, vmul_n(r2p, vget_lane(w, 1)));
+		cpFloatx2_t vr = vsub(v2, v1);
+		
+		cpFloatx2_t vbn_vrn = vpadd(vmul(vbr, n), vmul(vr, n));
+		
+		cpFloatx2_t v_offset = vmake(con->bias, -con->bounce);
+		cpFloatx2_t jOld = vmake(con->jBias, con->jnAcc);
+		cpFloatx2_t jbn_jn = vmul_n(vsub(v_offset, vbn_vrn), con->nMass);
+		jbn_jn = vmax(vadd(jOld, jbn_jn), vdup_n(0.0));
+		cpFloatx2_t jApply = vsub(jbn_jn, jOld);
+		
+		cpFloatx2_t t = vmul(vrev(n), perp);
+		cpFloatx2_t vrt_tmp = vmul(vadd(vr, surface_vr), t);
+		cpFloatx2_t vrt = vpadd(vrt_tmp, vrt_tmp);
+		
+		cpFloatx2_t jtOld = {}; jtOld = vset_lane(con->jtAcc, jtOld, 0);
+		cpFloatx2_t jtMax = vrev(vmul_n(jbn_jn, friction));
+		cpFloatx2_t jt = vmul_n(vrt, -con->tMass);
+		jt = vmax(vneg(jtMax), vmin(vadd(jtOld, jt), jtMax));
+		cpFloatx2_t jtApply = vsub(jt, jtOld);
+		
+		cpFloatx2_t i_inv = vmake(-a->i_inv, b->i_inv);
+		cpFloatx2_t nperp = vmake(1.0, -1.0);
+		
+		cpFloatx2_t jBias = vmul_n(n, vget_lane(jApply, 0));
+		cpFloatx2_t jBiasCross = vmul(vrev(jBias), nperp);
+		cpFloatx2_t biasCrosses = vpadd(vmul(r1, jBiasCross), vmul(r2, jBiasCross));
+		wBias = vadd(wBias, vmul(i_inv, biasCrosses));
+		
+		vBias_a = vsub(vBias_a, vmul_n(jBias, a->m_inv));
+		vBias_b = vadd(vBias_b, vmul_n(jBias, b->m_inv));
+		
+		cpFloatx2_t j = vadd(vmul_n(n, vget_lane(jApply, 1)), vmul_n(t, vget_lane(jtApply, 0)));
+		cpFloatx2_t jCross = vmul(vrev(j), nperp);
+		cpFloatx2_t crosses = vpadd(vmul(r1, jCross), vmul(r2, jCross));
+		w = vadd(w, vmul(i_inv, crosses));
+		
+		v_a = vsub(v_a, vmul_n(j, a->m_inv));
+		v_b = vadd(v_b, vmul_n(j, b->m_inv));
+		
+		// TODO would moving these earlier help pipeline them better?
+		vst((cpFloat_t *)&a->v_bias, vBias_a);
+		vst((cpFloat_t *)&b->v_bias, vBias_b);
+		vst_lane((cpFloat_t *)&a->w_bias, wBias, 0);
+		vst_lane((cpFloat_t *)&b->w_bias, wBias, 1);
+		
+		vst((cpFloat_t *)&a->v, v_a);
+		vst((cpFloat_t *)&b->v, v_b);
+		vst_lane((cpFloat_t *)&a->w, w, 0);
+		vst_lane((cpFloat_t *)&b->w, w, 1);
+		
+		vst_lane((cpFloat_t *)&con->jBias, jbn_jn, 0);
+		vst_lane((cpFloat_t *)&con->jnAcc, jbn_jn, 1);
+		vst_lane((cpFloat_t *)&con->jtAcc, jt, 0);
+	}
+}
+
+#endif
+
+//MARK: PThreads
+
+// Right now using more than 2 threads probably wont help your performance any.
+// If you are using a ridiculous number of iterations it could help though.
+#define MAX_THREADS 2
+
+struct ThreadContext {
+	pthread_t thread;
+	cpHastySpace *space;
+	unsigned long thread_num;
+};
+
+typedef	void (*cpHastySpaceWorkFunction)(cpSpace *space, unsigned long worker, unsigned long worker_count);
+
+struct cpHastySpace {
+	cpSpace space;
+	
+	// Number of worker threads (including the main thread)
+	unsigned long num_threads;
+	
+	// Number of worker threads currently executing. (also including the main thread)
+	unsigned long num_working;
+	
+	// Number of constraints (plus contacts) that must exist per step to start the worker threads.
+	unsigned long constraint_count_threshold;
+	
+	pthread_mutex_t mutex;
+	pthread_cond_t cond_work, cond_resume;
+	
+	// Work function to invoke.
+	cpHastySpaceWorkFunction work;
+	
+	struct ThreadContext workers[MAX_THREADS - 1];
+};
+
+static void *
+WorkerThreadLoop(struct ThreadContext *context)
+{
+	cpHastySpace *hasty = context->space;
+	
+	unsigned long thread = context->thread_num;
+	unsigned long num_threads = hasty->num_threads;
+	
+	for(;;){
+		pthread_mutex_lock(&hasty->mutex); {
+			if(--hasty->num_working == 0){
+				pthread_cond_signal(&hasty->cond_resume);
+			}
+			
+			pthread_cond_wait(&hasty->cond_work, &hasty->mutex);
+		} pthread_mutex_unlock(&hasty->mutex);
+		
+		cpHastySpaceWorkFunction func = hasty->work;
+		if(func){
+			hasty->work(&hasty->space, thread, num_threads);
+		} else {
+			break;
+		}
+	}
+	
+	return NULL;
+}
+
+static void
+RunWorkers(cpHastySpace *hasty, cpHastySpaceWorkFunction func)
+{
+	hasty->num_working = hasty->num_threads - 1;
+	hasty->work = func;
+	
+	if(hasty->num_working > 0){
+		pthread_mutex_lock(&hasty->mutex); {
+			pthread_cond_broadcast(&hasty->cond_work);
+		} pthread_mutex_unlock(&hasty->mutex);
+		
+		func((cpSpace *)hasty, 0, hasty->num_threads);
+			
+		pthread_mutex_lock(&hasty->mutex); {
+			if(hasty->num_working > 0){
+				pthread_cond_wait(&hasty->cond_resume, &hasty->mutex);
+			}
+		} pthread_mutex_unlock(&hasty->mutex);
+	} else {
+		func((cpSpace *)hasty, 0, hasty->num_threads);
+	}
+	
+	hasty->work = NULL;
+}
+
+static void
+Solver(cpSpace *space, unsigned long worker, unsigned long worker_count)
+{
+	cpArray *constraints = space->constraints;
+	cpArray *arbiters = space->arbiters;
+	
+	cpFloat dt = space->curr_dt;
+	unsigned long iterations = (space->iterations + worker_count - 1)/worker_count;
+	
+	for(unsigned long i=0; i<iterations; i++){
+		for(int j=0; j<arbiters->num; j++){
+			cpArbiter *arb = (cpArbiter *)arbiters->arr[j];
+			#ifdef __ARM_NEON__
+				cpArbiterApplyImpulse_NEON(arb);
+			#else
+				cpArbiterApplyImpulse(arb);
+			#endif
+		}
+			
+		for(int j=0; j<constraints->num; j++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[j];
+			constraint->klass->applyImpulse(constraint, dt);
+		}
+	}
+}
+
+//MARK: Thread Management Functions
+
+static void
+HaltThreads(cpHastySpace *hasty)
+{
+	pthread_mutex_t *mutex = &hasty->mutex;
+	pthread_mutex_lock(mutex); {
+		hasty->work = NULL; // NULL work function means break and exit
+		pthread_cond_broadcast(&hasty->cond_work);
+	} pthread_mutex_unlock(mutex);
+	
+	for(unsigned long i=0; i<(hasty->num_threads-1); i++){
+		pthread_join(hasty->workers[i].thread, NULL);
+	}
+}
+
+void
+cpHastySpaceSetThreads(cpSpace *space, unsigned long threads)
+{
+#if TARGET_IPHONE_SIMULATOR == 1
+	// Individual values appear to be written non-atomically when compiled as debug for the simulator.
+	// No idea why, so threads are disabled.
+	threads = 1;
+#endif	
+	
+	cpHastySpace *hasty = (cpHastySpace *)space;
+	HaltThreads(hasty);
+	
+#ifdef __APPLE__
+	if(threads == 0){
+		size_t size = sizeof(threads);
+		sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
+	}
+#else
+	if(threads == 0) threads = 1;
+#endif
+	
+	hasty->num_threads = (threads < MAX_THREADS ? threads : MAX_THREADS);
+	hasty->num_working = hasty->num_threads - 1;
+	
+	// Create the worker threads and wait for them to signal ready.
+	if(hasty->num_working > 0){
+		pthread_mutex_lock(&hasty->mutex);
+		for(unsigned long i=0; i<(hasty->num_threads-1); i++){
+			hasty->workers[i].space = hasty;
+			hasty->workers[i].thread_num = i + 1;
+			
+			pthread_create(&hasty->workers[i].thread, NULL, (void*(*)(void*))WorkerThreadLoop, &hasty->workers[i]);
+		}
+		
+		pthread_cond_wait(&hasty->cond_resume, &hasty->mutex);
+		pthread_mutex_unlock(&hasty->mutex);
+	}
+}
+
+unsigned long
+cpHastySpaceGetThreads(cpSpace *space)
+{
+	return ((cpHastySpace *)space)->num_threads;
+}
+
+//MARK: Overriden cpSpace Functions.
+
+cpSpace *
+cpHastySpaceNew(void)
+{
+	cpHastySpace *hasty = (cpHastySpace *)cpcalloc(1, sizeof(cpHastySpace));
+	cpSpaceInit((cpSpace *)hasty);
+	
+	pthread_mutex_init(&hasty->mutex, NULL);
+	pthread_cond_init(&hasty->cond_work, NULL);
+	pthread_cond_init(&hasty->cond_resume, NULL);
+	
+	// TODO magic number, should test this more thoroughly.
+	hasty->constraint_count_threshold = 50;
+	
+	// Default to 1 thread for determinism.
+	hasty->num_threads = 1;
+	cpHastySpaceSetThreads((cpSpace *)hasty, 1);
+
+	return (cpSpace *)hasty;
+}
+
+void
+cpHastySpaceFree(cpSpace *space)
+{
+	cpHastySpace *hasty = (cpHastySpace *)space;
+	
+	HaltThreads(hasty);
+	
+	pthread_mutex_destroy(&hasty->mutex);
+	pthread_cond_destroy(&hasty->cond_work);
+	pthread_cond_destroy(&hasty->cond_resume);
+	
+	cpSpaceFree(space);
+}
+
+void
+cpHastySpaceStep(cpSpace *space, cpFloat dt)
+{
+	// don't step if the timestep is 0!
+	if(dt == 0.0f) return;
+	
+	space->stamp++;
+	
+	cpFloat prev_dt = space->curr_dt;
+	space->curr_dt = dt;
+		
+	cpArray *bodies = space->dynamicBodies;
+	cpArray *constraints = space->constraints;
+	cpArray *arbiters = space->arbiters;
+	
+	// Reset and empty the arbiter list.
+	for(int i=0; i<arbiters->num; i++){
+		cpArbiter *arb = (cpArbiter *)arbiters->arr[i];
+		arb->state = CP_ARBITER_STATE_NORMAL;
+		
+		// If both bodies are awake, unthread the arbiter from the contact graph.
+		if(!cpBodyIsSleeping(arb->body_a) && !cpBodyIsSleeping(arb->body_b)){
+			cpArbiterUnthread(arb);
+		}
+	}
+	arbiters->num = 0;
+	
+	cpSpaceLock(space); {
+		// Integrate positions
+		for(int i=0; i<bodies->num; i++){
+			cpBody *body = (cpBody *)bodies->arr[i];
+			body->position_func(body, dt);
+		}
+		
+		// Find colliding pairs.
+		cpSpacePushFreshContactBuffer(space);
+		cpSpatialIndexEach(space->dynamicShapes, (cpSpatialIndexIteratorFunc)cpShapeUpdateFunc, NULL);
+		cpSpatialIndexReindexQuery(space->dynamicShapes, (cpSpatialIndexQueryFunc)cpSpaceCollideShapes, space);
+	} cpSpaceUnlock(space, cpFalse);
+	
+	// Rebuild the contact graph (and detect sleeping components if sleeping is enabled)
+	cpSpaceProcessComponents(space, dt);
+	
+	cpSpaceLock(space); {
+		// Clear out old cached arbiters and call separate callbacks
+		cpHashSetFilter(space->cachedArbiters, (cpHashSetFilterFunc)cpSpaceArbiterSetFilter, space);
+
+		// Prestep the arbiters and constraints.
+		cpFloat slop = space->collisionSlop;
+		cpFloat biasCoef = 1.0f - cpfpow(space->collisionBias, dt);
+		for(int i=0; i<arbiters->num; i++){
+			cpArbiterPreStep((cpArbiter *)arbiters->arr[i], dt, slop, biasCoef);
+		}
+
+		for(int i=0; i<constraints->num; i++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[i];
+			
+			cpConstraintPreSolveFunc preSolve = constraint->preSolve;
+			if(preSolve) preSolve(constraint, space);
+			
+			constraint->klass->preStep(constraint, dt);
+		}
+	
+		// Integrate velocities.
+		cpFloat damping = cpfpow(space->damping, dt);
+		cpVect gravity = space->gravity;
+		for(int i=0; i<bodies->num; i++){
+			cpBody *body = (cpBody *)bodies->arr[i];
+			body->velocity_func(body, gravity, damping, dt);
+		}
+		
+		// Apply cached impulses
+		cpFloat dt_coef = (prev_dt == 0.0f ? 0.0f : dt/prev_dt);
+		for(int i=0; i<arbiters->num; i++){
+			cpArbiterApplyCachedImpulse((cpArbiter *)arbiters->arr[i], dt_coef);
+		}
+		
+		for(int i=0; i<constraints->num; i++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[i];
+			constraint->klass->applyCachedImpulse(constraint, dt_coef);
+		}
+		
+		// Run the impulse solver.
+		cpHastySpace *hasty = (cpHastySpace *)space;
+		if((unsigned long)(arbiters->num + constraints->num) > hasty->constraint_count_threshold){
+			RunWorkers(hasty, Solver);
+		} else {
+			Solver(space, 0, 1);
+		}
+		
+		// Run the constraint post-solve callbacks
+		for(int i=0; i<constraints->num; i++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[i];
+			
+			cpConstraintPostSolveFunc postSolve = constraint->postSolve;
+			if(postSolve) postSolve(constraint, space);
+		}
+		
+		// run the post-solve callbacks
+		for(int i=0; i<arbiters->num; i++){
+			cpArbiter *arb = (cpArbiter *) arbiters->arr[i];
+			
+			cpCollisionHandler *handler = arb->handler;
+			handler->postSolveFunc(arb, space, handler->userData);
+		}
+	} cpSpaceUnlock(space, cpTrue);
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpMarch.c b/dali-physics/third-party/chipmunk2d/src/cpMarch.c
new file mode 100644
index 0000000..c666bd2
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpMarch.c
@@ -0,0 +1,157 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+
+#include "chipmunk/chipmunk.h"
+#include "chipmunk/cpMarch.h"
+
+
+typedef void (*cpMarchCellFunc)(
+	cpFloat t, cpFloat a, cpFloat b, cpFloat c, cpFloat d,
+	cpFloat x0, cpFloat x1, cpFloat y0, cpFloat y1,
+	cpMarchSegmentFunc segment, void *segment_data
+);
+
+// The looping and sample caching code is shared between cpMarchHard() and cpMarchSoft().
+static void
+cpMarchCells(
+  cpBB bb, unsigned long x_samples, unsigned long y_samples, cpFloat t,
+  cpMarchSegmentFunc segment, void *segment_data,
+  cpMarchSampleFunc sample, void *sample_data,
+	cpMarchCellFunc cell
+){
+	cpFloat x_denom = 1.0/(cpFloat)(x_samples - 1);
+	cpFloat y_denom = 1.0/(cpFloat)(y_samples - 1);
+	
+	// TODO range assertions and short circuit for 0 sized windows.
+	
+	// Keep a copy of the previous row to avoid double lookups.
+	cpFloat *buffer = (cpFloat *)cpcalloc(x_samples, sizeof(cpFloat));
+	for(unsigned long i=0; i<x_samples; i++) buffer[i] = sample(cpv(cpflerp(bb.l, bb.r, i*x_denom), bb.b), sample_data);
+	
+	for(unsigned long j=0; j<y_samples-1; j++){
+		cpFloat y0 = cpflerp(bb.b, bb.t, (j+0)*y_denom);
+		cpFloat y1 = cpflerp(bb.b, bb.t, (j+1)*y_denom);
+		
+		cpFloat a, b = buffer[0];
+		cpFloat c, d = sample(cpv(bb.l, y1), sample_data);
+		buffer[0] = d;
+		
+		for(unsigned long i=0; i<x_samples-1; i++){
+			cpFloat x0 = cpflerp(bb.l, bb.r, (i+0)*x_denom);
+			cpFloat x1 = cpflerp(bb.l, bb.r, (i+1)*x_denom);
+			
+			a = b, b = buffer[i + 1];
+			c = d, d = sample(cpv(x1, y1), sample_data);
+			buffer[i + 1] = d;
+			
+			cell(t, a, b, c, d, x0, x1, y0, y1, segment, segment_data);
+		}
+	}
+	
+	cpfree(buffer);
+}
+
+
+// TODO should flip this around eventually.
+static inline void
+seg(cpVect v0, cpVect v1, cpMarchSegmentFunc f, void *data)
+{
+	if(!cpveql(v0, v1)) f(v1, v0, data);
+}
+
+// Lerps between two positions based on their sample values.
+static inline cpFloat
+midlerp(cpFloat x0, cpFloat x1, cpFloat s0, cpFloat s1, cpFloat t)
+{
+	return cpflerp(x0, x1, (t - s0)/(s1 - s0));
+}
+
+static void
+cpMarchCellSoft(
+	cpFloat t, cpFloat a, cpFloat b, cpFloat c, cpFloat d,
+	cpFloat x0, cpFloat x1, cpFloat y0, cpFloat y1,
+	cpMarchSegmentFunc segment, void *segment_data
+){
+	// TODO this switch part is super expensive, can it be NEONized?
+	switch((a>t)<<0 | (b>t)<<1 | (c>t)<<2 | (d>t)<<3){
+		case 0x1: seg(cpv(x0, midlerp(y0,y1,a,c,t)), cpv(midlerp(x0,x1,a,b,t), y0), segment, segment_data); break;
+		case 0x2: seg(cpv(midlerp(x0,x1,a,b,t), y0), cpv(x1, midlerp(y0,y1,b,d,t)), segment, segment_data); break;
+		case 0x3: seg(cpv(x0, midlerp(y0,y1,a,c,t)), cpv(x1, midlerp(y0,y1,b,d,t)), segment, segment_data); break;
+		case 0x4: seg(cpv(midlerp(x0,x1,c,d,t), y1), cpv(x0, midlerp(y0,y1,a,c,t)), segment, segment_data); break;
+		case 0x5: seg(cpv(midlerp(x0,x1,c,d,t), y1), cpv(midlerp(x0,x1,a,b,t), y0), segment, segment_data); break;
+		case 0x6: seg(cpv(midlerp(x0,x1,a,b,t), y0), cpv(x1, midlerp(y0,y1,b,d,t)), segment, segment_data);
+							seg(cpv(midlerp(x0,x1,c,d,t), y1), cpv(x0, midlerp(y0,y1,a,c,t)), segment, segment_data); break;
+		case 0x7: seg(cpv(midlerp(x0,x1,c,d,t), y1), cpv(x1, midlerp(y0,y1,b,d,t)), segment, segment_data); break;
+		case 0x8: seg(cpv(x1, midlerp(y0,y1,b,d,t)), cpv(midlerp(x0,x1,c,d,t), y1), segment, segment_data); break;
+		case 0x9: seg(cpv(x0, midlerp(y0,y1,a,c,t)), cpv(midlerp(x0,x1,a,b,t), y0), segment, segment_data);
+							seg(cpv(x1, midlerp(y0,y1,b,d,t)), cpv(midlerp(x0,x1,c,d,t), y1), segment, segment_data); break;
+		case 0xA: seg(cpv(midlerp(x0,x1,a,b,t), y0), cpv(midlerp(x0,x1,c,d,t), y1), segment, segment_data); break;
+		case 0xB: seg(cpv(x0, midlerp(y0,y1,a,c,t)), cpv(midlerp(x0,x1,c,d,t), y1), segment, segment_data); break;
+		case 0xC: seg(cpv(x1, midlerp(y0,y1,b,d,t)), cpv(x0, midlerp(y0,y1,a,c,t)), segment, segment_data); break;
+		case 0xD: seg(cpv(x1, midlerp(y0,y1,b,d,t)), cpv(midlerp(x0,x1,a,b,t), y0), segment, segment_data); break;
+		case 0xE: seg(cpv(midlerp(x0,x1,a,b,t), y0), cpv(x0, midlerp(y0,y1,a,c,t)), segment, segment_data); break;
+		default: break; // 0x0 and 0xF
+	}
+}
+
+void
+cpMarchSoft(
+  cpBB bb, unsigned long x_samples, unsigned long y_samples, cpFloat t,
+  cpMarchSegmentFunc segment, void *segment_data,
+  cpMarchSampleFunc sample, void *sample_data
+){
+	cpMarchCells(bb, x_samples, y_samples, t, segment, segment_data, sample, sample_data, cpMarchCellSoft);
+}
+
+
+// TODO should flip this around eventually.
+static inline void
+segs(cpVect a, cpVect b, cpVect c, cpMarchSegmentFunc f, void *data)
+{
+	seg(b, c, f, data);
+	seg(a, b, f, data);
+}
+
+static void
+cpMarchCellHard(
+	cpFloat t, cpFloat a, cpFloat b, cpFloat c, cpFloat d,
+	cpFloat x0, cpFloat x1, cpFloat y0, cpFloat y1,
+	cpMarchSegmentFunc segment, void *segment_data
+){
+	// midpoints
+	cpFloat xm = cpflerp(x0, x1, 0.5f);
+	cpFloat ym = cpflerp(y0, y1, 0.5f);
+	
+	switch((a>t)<<0 | (b>t)<<1 | (c>t)<<2 | (d>t)<<3){
+		case 0x1: segs(cpv(x0, ym), cpv(xm, ym), cpv(xm, y0), segment, segment_data); break;
+		case 0x2: segs(cpv(xm, y0), cpv(xm, ym), cpv(x1, ym), segment, segment_data); break;
+		case 0x3: seg(cpv(x0, ym), cpv(x1, ym), segment, segment_data); break;
+		case 0x4: segs(cpv(xm, y1), cpv(xm, ym), cpv(x0, ym), segment, segment_data); break;
+		case 0x5: seg(cpv(xm, y1), cpv(xm, y0), segment, segment_data); break;
+		case 0x6: segs(cpv(xm, y0), cpv(xm, ym), cpv(x0, ym), segment, segment_data);
+		          segs(cpv(xm, y1), cpv(xm, ym), cpv(x1, ym), segment, segment_data); break;
+		case 0x7: segs(cpv(xm, y1), cpv(xm, ym), cpv(x1, ym), segment, segment_data); break;
+		case 0x8: segs(cpv(x1, ym), cpv(xm, ym), cpv(xm, y1), segment, segment_data); break;
+		case 0x9: segs(cpv(x1, ym), cpv(xm, ym), cpv(xm, y0), segment, segment_data);
+		          segs(cpv(x0, ym), cpv(xm, ym), cpv(xm, y1), segment, segment_data); break;
+		case 0xA: seg(cpv(xm, y0), cpv(xm, y1), segment, segment_data); break;
+		case 0xB: segs(cpv(x0, ym), cpv(xm, ym), cpv(xm, y1), segment, segment_data); break;
+		case 0xC: seg(cpv(x1, ym), cpv(x0, ym), segment, segment_data); break;
+		case 0xD: segs(cpv(x1, ym), cpv(xm, ym), cpv(xm, y0), segment, segment_data); break;
+		case 0xE: segs(cpv(xm, y0), cpv(xm, ym), cpv(x0, ym), segment, segment_data); break;
+		default: break; // 0x0 and 0xF
+	}
+}
+
+void
+cpMarchHard(
+  cpBB bb, unsigned long x_samples, unsigned long y_samples, cpFloat t,
+  cpMarchSegmentFunc segment, void *segment_data,
+  cpMarchSampleFunc sample, void *sample_data
+){
+	cpMarchCells(bb, x_samples, y_samples, t, segment, segment_data, sample, sample_data, cpMarchCellHard);
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpPinJoint.c b/dali-physics/third-party/chipmunk2d/src/cpPinJoint.c
new file mode 100644
index 0000000..545e78b
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpPinJoint.c
@@ -0,0 +1,172 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpPinJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	joint->r1 = cpTransformVect(a->transform, cpvsub(joint->anchorA, a->cog));
+	joint->r2 = cpTransformVect(b->transform, cpvsub(joint->anchorB, b->cog));
+	
+	cpVect delta = cpvsub(cpvadd(b->p, joint->r2), cpvadd(a->p, joint->r1));
+	cpFloat dist = cpvlength(delta);
+	joint->n = cpvmult(delta, 1.0f/(dist ? dist : (cpFloat)INFINITY));
+	
+	// calculate mass normal
+	joint->nMass = 1.0f/k_scalar(a, b, joint->r1, joint->r2, joint->n);
+	
+	// calculate bias velocity
+	cpFloat maxBias = joint->constraint.maxBias;
+	joint->bias = cpfclamp(-bias_coef(joint->constraint.errorBias, dt)*(dist - joint->dist)/dt, -maxBias, maxBias);
+}
+
+static void
+applyCachedImpulse(cpPinJoint *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpVect j = cpvmult(joint->n, joint->jnAcc*dt_coef);
+	apply_impulses(a, b, joint->r1, joint->r2, j);
+}
+
+static void
+applyImpulse(cpPinJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	cpVect n = joint->n;
+
+	// compute relative velocity
+	cpFloat vrn = normal_relative_velocity(a, b, joint->r1, joint->r2, n);
+	
+	cpFloat jnMax = joint->constraint.maxForce*dt;
+	
+	// compute normal impulse
+	cpFloat jn = (joint->bias - vrn)*joint->nMass;
+	cpFloat jnOld = joint->jnAcc;
+	joint->jnAcc = cpfclamp(jnOld + jn, -jnMax, jnMax);
+	jn = joint->jnAcc - jnOld;
+	
+	// apply impulse
+	apply_impulses(a, b, joint->r1, joint->r2, cpvmult(n, jn));
+}
+
+static cpFloat
+getImpulse(cpPinJoint *joint)
+{
+	return cpfabs(joint->jnAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+
+cpPinJoint *
+cpPinJointAlloc(void)
+{
+	return (cpPinJoint *)cpcalloc(1, sizeof(cpPinJoint));
+}
+
+cpPinJoint *
+cpPinJointInit(cpPinJoint *joint, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->anchorA = anchorA;
+	joint->anchorB = anchorB;
+	
+	// STATIC_BODY_CHECK
+	cpVect p1 = (a ? cpTransformPoint(a->transform, anchorA) : anchorA);
+	cpVect p2 = (b ? cpTransformPoint(b->transform, anchorB) : anchorB);
+	joint->dist = cpvlength(cpvsub(p2, p1));
+	
+	cpAssertWarn(joint->dist > 0.0, "You created a 0 length pin joint. A pivot joint will be much more stable.");
+
+	joint->jnAcc = 0.0f;
+	
+	return joint;
+}
+
+cpConstraint *
+cpPinJointNew(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB)
+{
+	return (cpConstraint *)cpPinJointInit(cpPinJointAlloc(), a, b, anchorA, anchorB);
+}
+
+cpBool
+cpConstraintIsPinJoint(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpVect
+cpPinJointGetAnchorA(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsPinJoint(constraint), "Constraint is not a pin joint.");
+	return ((cpPinJoint *)constraint)->anchorA;
+}
+
+void
+cpPinJointSetAnchorA(cpConstraint *constraint, cpVect anchorA)
+{
+	cpAssertHard(cpConstraintIsPinJoint(constraint), "Constraint is not a pin joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpPinJoint *)constraint)->anchorA = anchorA;
+}
+
+cpVect
+cpPinJointGetAnchorB(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsPinJoint(constraint), "Constraint is not a pin joint.");
+	return ((cpPinJoint *)constraint)->anchorB;
+}
+
+void
+cpPinJointSetAnchorB(cpConstraint *constraint, cpVect anchorB)
+{
+	cpAssertHard(cpConstraintIsPinJoint(constraint), "Constraint is not a pin joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpPinJoint *)constraint)->anchorB = anchorB;
+}
+
+cpFloat
+cpPinJointGetDist(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsPinJoint(constraint), "Constraint is not a pin joint.");
+	return ((cpPinJoint *)constraint)->dist;
+}
+
+void
+cpPinJointSetDist(cpConstraint *constraint, cpFloat dist)
+{
+	cpAssertHard(cpConstraintIsPinJoint(constraint), "Constraint is not a pin joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpPinJoint *)constraint)->dist = dist;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpPivotJoint.c b/dali-physics/third-party/chipmunk2d/src/cpPivotJoint.c
new file mode 100644
index 0000000..e45ba07
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpPivotJoint.c
@@ -0,0 +1,152 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpPivotJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	joint->r1 = cpTransformVect(a->transform, cpvsub(joint->anchorA, a->cog));
+	joint->r2 = cpTransformVect(b->transform, cpvsub(joint->anchorB, b->cog));
+	
+	// Calculate mass tensor
+	joint-> k = k_tensor(a, b, joint->r1, joint->r2);
+	
+	// calculate bias velocity
+	cpVect delta = cpvsub(cpvadd(b->p, joint->r2), cpvadd(a->p, joint->r1));
+	joint->bias = cpvclamp(cpvmult(delta, -bias_coef(joint->constraint.errorBias, dt)/dt), joint->constraint.maxBias);
+}
+
+static void
+applyCachedImpulse(cpPivotJoint *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	apply_impulses(a, b, joint->r1, joint->r2, cpvmult(joint->jAcc, dt_coef));
+}
+
+static void
+applyImpulse(cpPivotJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpVect r1 = joint->r1;
+	cpVect r2 = joint->r2;
+		
+	// compute relative velocity
+	cpVect vr = relative_velocity(a, b, r1, r2);
+	
+	// compute normal impulse
+	cpVect j = cpMat2x2Transform(joint->k, cpvsub(joint->bias, vr));
+	cpVect jOld = joint->jAcc;
+	joint->jAcc = cpvclamp(cpvadd(joint->jAcc, j), joint->constraint.maxForce*dt);
+	j = cpvsub(joint->jAcc, jOld);
+	
+	// apply impulse
+	apply_impulses(a, b, joint->r1, joint->r2, j);
+}
+
+static cpFloat
+getImpulse(cpConstraint *joint)
+{
+	return cpvlength(((cpPivotJoint *)joint)->jAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpPivotJoint *
+cpPivotJointAlloc(void)
+{
+	return (cpPivotJoint *)cpcalloc(1, sizeof(cpPivotJoint));
+}
+
+cpPivotJoint *
+cpPivotJointInit(cpPivotJoint *joint, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->anchorA = anchorA;
+	joint->anchorB = anchorB;
+	
+	joint->jAcc = cpvzero;
+	
+	return joint;
+}
+
+cpConstraint *
+cpPivotJointNew2(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB)
+{
+	return (cpConstraint *)cpPivotJointInit(cpPivotJointAlloc(), a, b, anchorA, anchorB);
+}
+
+cpConstraint *
+cpPivotJointNew(cpBody *a, cpBody *b, cpVect pivot)
+{
+	cpVect anchorA = (a ? cpBodyWorldToLocal(a, pivot) : pivot);
+	cpVect anchorB = (b ? cpBodyWorldToLocal(b, pivot) : pivot);
+	return cpPivotJointNew2(a, b, anchorA, anchorB);
+}
+
+cpBool
+cpConstraintIsPivotJoint(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpVect
+cpPivotJointGetAnchorA(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsPivotJoint(constraint), "Constraint is not a pivot joint.");
+	return ((cpPivotJoint *)constraint)->anchorA;
+}
+
+void
+cpPivotJointSetAnchorA(cpConstraint *constraint, cpVect anchorA)
+{
+	cpAssertHard(cpConstraintIsPivotJoint(constraint), "Constraint is not a pivot joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpPivotJoint *)constraint)->anchorA = anchorA;
+}
+
+cpVect
+cpPivotJointGetAnchorB(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsPivotJoint(constraint), "Constraint is not a pivot joint.");
+	return ((cpPivotJoint *)constraint)->anchorB;
+}
+
+void
+cpPivotJointSetAnchorB(cpConstraint *constraint, cpVect anchorB)
+{
+	cpAssertHard(cpConstraintIsPivotJoint(constraint), "Constraint is not a pivot joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpPivotJoint *)constraint)->anchorB = anchorB;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpPolyShape.c b/dali-physics/third-party/chipmunk2d/src/cpPolyShape.c
new file mode 100644
index 0000000..db68cdc
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpPolyShape.c
@@ -0,0 +1,323 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+#include "chipmunk/chipmunk_unsafe.h"
+
+cpPolyShape *
+cpPolyShapeAlloc(void)
+{
+	return (cpPolyShape *)cpcalloc(1, sizeof(cpPolyShape));
+}
+
+static void
+cpPolyShapeDestroy(cpPolyShape *poly)
+{
+	if(poly->count > CP_POLY_SHAPE_INLINE_ALLOC){
+		cpfree(poly->planes);
+	}
+}
+
+static cpBB
+cpPolyShapeCacheData(cpPolyShape *poly, cpTransform transform)
+{
+	int count = poly->count;
+	struct cpSplittingPlane *dst = poly->planes;
+	struct cpSplittingPlane *src = dst + count;
+	
+	cpFloat l = (cpFloat)INFINITY, r = -(cpFloat)INFINITY;
+	cpFloat b = (cpFloat)INFINITY, t = -(cpFloat)INFINITY;
+	
+	for(int i=0; i<count; i++){
+		cpVect v = cpTransformPoint(transform, src[i].v0);
+		cpVect n = cpTransformVect(transform, src[i].n);
+		
+		dst[i].v0 = v;
+		dst[i].n = n;
+		
+		l = cpfmin(l, v.x);
+		r = cpfmax(r, v.x);
+		b = cpfmin(b, v.y);
+		t = cpfmax(t, v.y);
+	}
+	
+	cpFloat radius = poly->r;
+	return (poly->shape.bb = cpBBNew(l - radius, b - radius, r + radius, t + radius));
+}
+
+static void
+cpPolyShapePointQuery(cpPolyShape *poly, cpVect p, cpPointQueryInfo *info){
+	int count = poly->count;
+	struct cpSplittingPlane *planes = poly->planes;
+	cpFloat r = poly->r;
+	
+	cpVect v0 = planes[count - 1].v0;
+	cpFloat minDist = INFINITY;
+	cpVect closestPoint = cpvzero;
+	cpVect closestNormal = cpvzero;
+	cpBool outside = cpFalse;
+	
+	for(int i=0; i<count; i++){
+		cpVect v1 = planes[i].v0;
+		outside = outside || (cpvdot(planes[i].n, cpvsub(p,v1)) > 0.0f);
+		
+		cpVect closest = cpClosetPointOnSegment(p, v0, v1);
+		
+		cpFloat dist = cpvdist(p, closest);
+		if(dist < minDist){
+			minDist = dist;
+			closestPoint = closest;
+			closestNormal = planes[i].n;
+		}
+		
+		v0 = v1;
+	}
+	
+	cpFloat dist = (outside ? minDist : -minDist);
+	cpVect g = cpvmult(cpvsub(p, closestPoint), 1.0f/dist);
+	
+	info->shape = (cpShape *)poly;
+	info->point = cpvadd(closestPoint, cpvmult(g, r));
+	info->distance = dist - r;
+	
+	// Use the normal of the closest segment if the distance is small.
+	info->gradient = (minDist > MAGIC_EPSILON ? g : closestNormal);
+}
+
+static void
+cpPolyShapeSegmentQuery(cpPolyShape *poly, cpVect a, cpVect b, cpFloat r2, cpSegmentQueryInfo *info)
+{
+	struct cpSplittingPlane *planes = poly->planes;
+	int count = poly->count;
+	cpFloat r = poly->r;
+	cpFloat rsum = r + r2;
+	
+	for(int i=0; i<count; i++){
+		cpVect n = planes[i].n;
+		cpFloat an = cpvdot(a, n);
+		cpFloat d =  an - cpvdot(planes[i].v0, n) - rsum;
+		if(d < 0.0f) continue;
+		
+		cpFloat bn = cpvdot(b, n);
+		cpFloat t = d/(an - bn);
+		if(t < 0.0f || 1.0f < t) continue;
+		
+		cpVect point = cpvlerp(a, b, t);
+		cpFloat dt = cpvcross(n, point);
+		cpFloat dtMin = cpvcross(n, planes[(i - 1 + count)%count].v0);
+		cpFloat dtMax = cpvcross(n, planes[i].v0);
+		
+		if(dtMin <= dt && dt <= dtMax){
+			info->shape = (cpShape *)poly;
+			info->point = cpvsub(cpvlerp(a, b, t), cpvmult(n, r2));
+			info->normal = n;
+			info->alpha = t;
+		}
+	}
+	
+	// Also check against the beveled vertexes.
+	if(rsum > 0.0f){
+		for(int i=0; i<count; i++){
+			cpSegmentQueryInfo circle_info = {NULL, b, cpvzero, 1.0f};
+			CircleSegmentQuery(&poly->shape, planes[i].v0, r, a, b, r2, &circle_info);
+			if(circle_info.alpha < info->alpha) (*info) = circle_info;
+		}
+	}
+}
+
+static void
+SetVerts(cpPolyShape *poly, int count, const cpVect *verts)
+{
+	poly->count = count;
+	if(count <= CP_POLY_SHAPE_INLINE_ALLOC){
+		poly->planes = poly->_planes;
+	} else {
+		poly->planes = (struct cpSplittingPlane *)cpcalloc(2*count, sizeof(struct cpSplittingPlane));
+	}
+	
+	for(int i=0; i<count; i++){
+		cpVect a = verts[(i - 1 + count)%count];
+		cpVect b = verts[i];
+		cpVect n = cpvnormalize(cpvrperp(cpvsub(b, a)));
+		
+		poly->planes[i + count].v0 = b;
+		poly->planes[i + count].n = n;
+	}
+}
+
+static struct cpShapeMassInfo
+cpPolyShapeMassInfo(cpFloat mass, int count, const cpVect *verts, cpFloat radius)
+{
+	// TODO moment is approximate due to radius.
+	
+	cpVect centroid = cpCentroidForPoly(count, verts);
+	struct cpShapeMassInfo info = {
+		mass, cpMomentForPoly(1.0f, count, verts, cpvneg(centroid), radius),
+		centroid,
+		cpAreaForPoly(count, verts, radius),
+	};
+	
+	return info;
+}
+
+static const cpShapeClass polyClass = {
+	CP_POLY_SHAPE,
+	(cpShapeCacheDataImpl)cpPolyShapeCacheData,
+	(cpShapeDestroyImpl)cpPolyShapeDestroy,
+	(cpShapePointQueryImpl)cpPolyShapePointQuery,
+	(cpShapeSegmentQueryImpl)cpPolyShapeSegmentQuery,
+};
+
+cpPolyShape *
+cpPolyShapeInit(cpPolyShape *poly, cpBody *body, int count, const cpVect *verts, cpTransform transform, cpFloat radius)
+{
+	cpVect *hullVerts = (cpVect *)alloca(count*sizeof(cpVect));
+	
+	// Transform the verts before building the hull in case of a negative scale.
+	for(int i=0; i<count; i++) hullVerts[i] = cpTransformPoint(transform, verts[i]);
+	
+	unsigned int hullCount = cpConvexHull(count, hullVerts, hullVerts, NULL, 0.0);
+	return cpPolyShapeInitRaw(poly, body, hullCount, hullVerts, radius);
+}
+
+cpPolyShape *
+cpPolyShapeInitRaw(cpPolyShape *poly, cpBody *body, int count, const cpVect *verts, cpFloat radius)
+{
+	cpShapeInit((cpShape *)poly, &polyClass, body, cpPolyShapeMassInfo(0.0f, count, verts, radius));
+	
+	SetVerts(poly, count, verts);
+	poly->r = radius;
+
+	return poly;
+}
+
+cpShape *
+cpPolyShapeNew(cpBody *body, int count, const cpVect *verts, cpTransform transform, cpFloat radius)
+{
+	return (cpShape *)cpPolyShapeInit(cpPolyShapeAlloc(), body, count, verts, transform, radius);
+}
+
+cpShape *
+cpPolyShapeNewRaw(cpBody *body, int count, const cpVect *verts, cpFloat radius)
+{
+	return (cpShape *)cpPolyShapeInitRaw(cpPolyShapeAlloc(), body, count, verts, radius);
+}
+
+cpPolyShape *
+cpBoxShapeInit(cpPolyShape *poly, cpBody *body, cpFloat width, cpFloat height, cpFloat radius)
+{
+	cpFloat hw = width/2.0f;
+	cpFloat hh = height/2.0f;
+	
+	return cpBoxShapeInit2(poly, body, cpBBNew(-hw, -hh, hw, hh), radius);
+}
+
+cpPolyShape *
+cpBoxShapeInit2(cpPolyShape *poly, cpBody *body, cpBB box, cpFloat radius)
+{
+	cpVect verts[] = {
+		cpv(box.r, box.b),
+		cpv(box.r, box.t),
+		cpv(box.l, box.t),
+		cpv(box.l, box.b),
+	};
+	
+	return cpPolyShapeInitRaw(poly, body, 4, verts, radius);
+}
+
+cpShape *
+cpBoxShapeNew(cpBody *body, cpFloat width, cpFloat height, cpFloat radius)
+{
+	return (cpShape *)cpBoxShapeInit(cpPolyShapeAlloc(), body, width, height, radius);
+}
+
+cpShape *
+cpBoxShapeNew2(cpBody *body, cpBB box, cpFloat radius)
+{
+	return (cpShape *)cpBoxShapeInit2(cpPolyShapeAlloc(), body, box, radius);
+}
+
+int
+cpPolyShapeGetCount(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &polyClass, "Shape is not a poly shape.");
+	return ((cpPolyShape *)shape)->count;
+}
+
+cpVect
+cpPolyShapeGetVert(const cpShape *shape, int i)
+{
+	cpAssertHard(shape->klass == &polyClass, "Shape is not a poly shape.");
+	
+	int count = cpPolyShapeGetCount(shape);
+	cpAssertHard(0 <= i && i < count, "Index out of range.");
+	
+	return ((cpPolyShape *)shape)->planes[i + count].v0;
+}
+
+cpFloat
+cpPolyShapeGetRadius(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &polyClass, "Shape is not a poly shape.");
+	return ((cpPolyShape *)shape)->r;
+}
+
+// Unsafe API (chipmunk_unsafe.h)
+
+void
+cpPolyShapeSetVerts(cpShape *shape, int count, cpVect *verts, cpTransform transform)
+{
+	cpVect *hullVerts = (cpVect *)alloca(count*sizeof(cpVect));
+	
+	// Transform the verts before building the hull in case of a negative scale.
+	for(int i=0; i<count; i++) hullVerts[i] = cpTransformPoint(transform, verts[i]);
+	
+	unsigned int hullCount = cpConvexHull(count, hullVerts, hullVerts, NULL, 0.0);
+	cpPolyShapeSetVertsRaw(shape, hullCount, hullVerts);
+}
+
+void
+cpPolyShapeSetVertsRaw(cpShape *shape, int count, cpVect *verts)
+{
+	cpAssertHard(shape->klass == &polyClass, "Shape is not a poly shape.");
+	cpPolyShape *poly = (cpPolyShape *)shape;
+	cpPolyShapeDestroy(poly);
+	
+	SetVerts(poly, count, verts);
+	
+	cpFloat mass = shape->massInfo.m;
+	shape->massInfo = cpPolyShapeMassInfo(shape->massInfo.m, count, verts, poly->r);
+	if(mass > 0.0f) cpBodyAccumulateMassFromShapes(shape->body);
+}
+
+void
+cpPolyShapeSetRadius(cpShape *shape, cpFloat radius)
+{
+	cpAssertHard(shape->klass == &polyClass, "Shape is not a poly shape.");
+	cpPolyShape *poly = (cpPolyShape *)shape;
+	poly->r = radius;
+	
+	
+	// TODO radius is not handled by moment/area
+//	cpFloat mass = shape->massInfo.m;
+//	shape->massInfo = cpPolyShapeMassInfo(shape->massInfo.m, poly->count, poly->verts, poly->r);
+//	if(mass > 0.0f) cpBodyAccumulateMassFromShapes(shape->body);
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpPolyline.c b/dali-physics/third-party/chipmunk2d/src/cpPolyline.c
new file mode 100644
index 0000000..5b37534
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpPolyline.c
@@ -0,0 +1,652 @@
+// Copyright 2013 Howling Moon Software. All rights reserved.
+// See http://chipmunk2d.net/legal.php for more information.
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#include "chipmunk/chipmunk_private.h"
+#include "chipmunk/cpPolyline.h"
+
+
+static inline int Next(int i, int count){return (i+1)%count;}
+
+//MARK: Polylines
+
+#define DEFAULT_POLYLINE_CAPACITY 16
+
+static int
+cpPolylineSizeForCapacity(int capacity)
+{
+	return sizeof(cpPolyline) + capacity*sizeof(cpVect);
+}
+
+static cpPolyline *
+cpPolylineMake(int capacity)
+{
+	capacity = (capacity > DEFAULT_POLYLINE_CAPACITY ? capacity : DEFAULT_POLYLINE_CAPACITY);
+	
+	cpPolyline *line = (cpPolyline *)cpcalloc(1, cpPolylineSizeForCapacity(capacity));
+	line->count = 0;
+	line->capacity = capacity;
+	
+	return line;
+}
+
+static cpPolyline *
+cpPolylineMake2(int capacity, cpVect a, cpVect b)
+{
+	cpPolyline *line = cpPolylineMake(capacity);
+	line->count = 2;
+	line->verts[0] = a;
+	line->verts[1] = b;
+	
+	return line;
+}
+
+static cpPolyline *
+cpPolylineShrink(cpPolyline *line)
+{
+	line->capacity = line->count;
+	return (cpPolyline*) cprealloc(line, cpPolylineSizeForCapacity(line->count));
+}
+
+void
+cpPolylineFree(cpPolyline *line)
+{
+	cpfree(line);
+}
+
+// Grow the allocated memory for a polyline.
+static cpPolyline *
+cpPolylineGrow(cpPolyline *line, int count)
+{
+  line->count += count;
+  
+  int capacity = line->capacity;
+  while(line->count > capacity) capacity *= 2;
+  
+  if(line->capacity < capacity){
+    line->capacity = capacity;
+		line = (cpPolyline*) cprealloc(line, cpPolylineSizeForCapacity(capacity));
+  }
+	
+	return line;
+}
+
+// Push v onto the end of line.
+static cpPolyline *
+cpPolylinePush(cpPolyline *line, cpVect v)
+{
+  int count = line->count;
+  line = cpPolylineGrow(line, 1);
+  line->verts[count] = v;
+	
+	return line;
+}
+
+// Push v onto the beginning of line.
+static cpPolyline *
+cpPolylineEnqueue(cpPolyline *line, cpVect v)
+{
+	// TODO could optimize this to grow in both directions.
+	// Probably doesn't matter though.
+  int count = line->count;
+  line = cpPolylineGrow(line, 1);
+  memmove(line->verts + 1, line->verts, count*sizeof(cpVect));
+  line->verts[0] = v;
+	
+	return line;
+}
+
+// Returns true if the polyline starts and ends with the same vertex.
+cpBool
+cpPolylineIsClosed(cpPolyline *line)
+{
+	return (line->count > 1 && cpveql(line->verts[0], line->verts[line->count-1]));
+}
+
+// Check if a cpPolyline is longer than a certain length
+// Takes a range which can wrap around if the polyline is looped.
+static cpBool
+cpPolylineIsShort(cpVect *points, int count, int start, int end, cpFloat min)
+{
+  cpFloat length = 0.0f;
+	for(int i=start; i!=end; i=Next(i, count)){
+		length += cpvdist(points[i], points[Next(i, count)]);
+		if(length > min) return cpFalse;
+	}
+  
+  return cpTrue;
+}
+
+//MARK: Polyline Simplification
+
+static inline cpFloat
+Sharpness(cpVect a, cpVect b, cpVect c)
+{
+	// TODO could speed this up by caching the normals instead of calculating each twice.
+  return cpvdot(cpvnormalize(cpvsub(a, b)), cpvnormalize(cpvsub(c, b)));
+}
+
+// Join similar adjacent line segments together. Works well for hard edged shapes.
+// 'tol' is the minimum anglular difference in radians of a vertex.
+cpPolyline *
+cpPolylineSimplifyVertexes(cpPolyline *line, cpFloat tol)
+{
+	cpPolyline *reduced = cpPolylineMake2(0, line->verts[0], line->verts[1]);
+	
+	cpFloat minSharp = -cpfcos(tol);
+	
+	for(int i=2; i<line->count; i++){
+		cpVect vert = line->verts[i];
+		cpFloat sharp = Sharpness(reduced->verts[reduced->count - 2], reduced->verts[reduced->count - 1], vert);
+		
+		if(sharp <= minSharp){
+			reduced->verts[reduced->count - 1] = vert;
+		} else {
+			reduced = cpPolylinePush(reduced, vert);
+		}
+	}
+	
+	if(
+		cpPolylineIsClosed(line) &&
+		Sharpness(reduced->verts[reduced->count - 2], reduced->verts[0], reduced->verts[1]) < minSharp
+	){
+		reduced->verts[0] = reduced->verts[reduced->count - 2];
+		reduced->count--;
+	}
+	
+	// TODO shrink
+	return reduced;
+}
+
+// Recursive function used by cpPolylineSimplifyCurves().
+static cpPolyline *
+DouglasPeucker(
+	cpVect *verts, cpPolyline *reduced,
+	int length, int start, int end,
+	cpFloat min, cpFloat tol
+){
+	// Early exit if the points are adjacent
+  if((end - start + length)%length < 2) return reduced;
+  
+	cpVect a = verts[start];
+	cpVect b = verts[end];
+	
+	// Check if the length is below the threshold
+	if(cpvnear(a, b, min) && cpPolylineIsShort(verts, length, start, end, min)) return reduced;
+	
+	// Find the maximal vertex to split and recurse on
+	cpFloat max = 0.0;
+	int maxi = start;
+	
+	cpVect n = cpvnormalize(cpvperp(cpvsub(b, a)));
+	cpFloat d = cpvdot(n, a);
+	
+	for(int i=Next(start, length); i!=end; i=Next(i, length)){
+		cpFloat dist = fabs(cpvdot(n, verts[i]) - d);
+		
+		if(dist > max){
+			max = dist;
+			maxi = i;
+		}
+	}
+	
+	if(max > tol){
+    reduced = DouglasPeucker(verts, reduced, length, start, maxi, min, tol);
+		reduced = cpPolylinePush(reduced, verts[maxi]);
+    reduced = DouglasPeucker(verts, reduced, length, maxi, end, min, tol);
+	}
+	
+	return reduced;
+}
+
+// Recursively reduce the vertex count on a polyline. Works best for smooth shapes.
+// 'tol' is the maximum error for the reduction.
+// The reduced polyline will never be farther than this distance from the original polyline.
+cpPolyline *
+cpPolylineSimplifyCurves(cpPolyline *line, cpFloat tol)
+{
+	cpPolyline *reduced = cpPolylineMake(line->count);
+	
+	cpFloat min = tol/2.0f;
+  
+  if(cpPolylineIsClosed(line)){
+		int start, end;
+    cpLoopIndexes(line->verts, line->count - 1, &start, &end);
+    
+		reduced = cpPolylinePush(reduced, line->verts[start]);
+		reduced = DouglasPeucker(line->verts, reduced, line->count - 1, start, end, min, tol);
+		reduced = cpPolylinePush(reduced, line->verts[end]);
+		reduced = DouglasPeucker(line->verts, reduced, line->count - 1, end, start, min, tol);
+		reduced = cpPolylinePush(reduced, line->verts[start]);
+  } else {
+		reduced = cpPolylinePush(reduced, line->verts[0]);
+		reduced = DouglasPeucker(line->verts, reduced, line->count, 0, line->count - 1, min, tol);
+		reduced = cpPolylinePush(reduced, line->verts[line->count - 1]);
+  }
+	
+	return cpPolylineShrink(reduced);
+}
+
+//MARK: Polyline Sets
+
+cpPolylineSet *
+cpPolylineSetAlloc(void)
+{
+	return (cpPolylineSet *)cpcalloc(1, sizeof(cpPolylineSet));
+}
+
+cpPolylineSet *
+cpPolylineSetInit(cpPolylineSet *set)
+{
+	set->count = 0;
+	set->capacity = 8;
+	set->lines = (cpPolyline**) cpcalloc(set->capacity, sizeof(cpPolyline));
+	
+  return set;
+}
+
+
+cpPolylineSet *
+cpPolylineSetNew(void)
+{
+	return cpPolylineSetInit(cpPolylineSetAlloc());
+}
+
+void
+cpPolylineSetDestroy(cpPolylineSet *set, cpBool freePolylines)
+{
+	if(freePolylines){
+		for(int i=0; i<set->count; i++){
+			cpPolylineFree(set->lines[i]);
+		}
+	}
+	
+	cpfree(set->lines);
+}
+
+
+void
+cpPolylineSetFree(cpPolylineSet *set, cpBool freePolylines)
+{
+	if(set){
+		cpPolylineSetDestroy(set, freePolylines);
+		cpfree(set);
+	}
+}
+
+// Find the polyline that ends with v.
+static int
+cpPolylineSetFindEnds(cpPolylineSet *set, cpVect v){
+	int count = set->count;
+	cpPolyline **lines = set->lines;
+	
+  for(int i=0; i<count; i++){
+		cpPolyline *line = lines[i];
+    if(cpveql(line->verts[line->count - 1], v)) return i;
+  }
+  
+  return -1;
+}
+
+// Find the polyline that starts with v.
+static int
+cpPolylineSetFindStarts(cpPolylineSet *set, cpVect v){
+	int count = set->count;
+	cpPolyline **lines = set->lines;
+	
+  for(int i=0; i<count; i++){
+    if(cpveql(lines[i]->verts[0], v)) return i;
+  }
+  
+  return -1;
+}
+
+// Add a new polyline to a polyline set.
+static void
+cpPolylineSetPush(cpPolylineSet *set, cpPolyline *line)
+{
+  // grow set
+  set->count++;
+  if(set->count > set->capacity){
+    set->capacity *= 2;
+    set->lines = (cpPolyline**) cprealloc(set->lines, set->capacity*sizeof(cpPolyline));
+  }
+  
+	set->lines[set->count - 1] = line;
+}
+
+// Add a new polyline to a polyline set.
+static void
+cpPolylineSetAdd(cpPolylineSet *set, cpVect v0, cpVect v1)
+{
+	cpPolylineSetPush(set, cpPolylineMake2(DEFAULT_POLYLINE_CAPACITY, v0, v1));
+}
+
+// Join two cpPolylines in a polyline set together.
+static void
+cpPolylineSetJoin(cpPolylineSet *set, int before, int after)
+{
+  cpPolyline *lbefore = set->lines[before];
+  cpPolyline *lafter = set->lines[after];
+  
+  // append
+  int count = lbefore->count;
+  lbefore = cpPolylineGrow(lbefore, lafter->count);
+  memmove(lbefore->verts + count, lafter->verts, lafter->count*sizeof(cpVect));
+	set->lines[before] = lbefore;
+  
+  // delete lafter
+  set->count--;
+	cpPolylineFree(set->lines[after]);
+  set->lines[after] = set->lines[set->count];
+}
+
+// Add a segment to a polyline set.
+// A segment will either start a new polyline, join two others, or add to or loop an existing polyline.
+void
+cpPolylineSetCollectSegment(cpVect v0, cpVect v1, cpPolylineSet *lines)
+{
+  int before = cpPolylineSetFindEnds(lines, v0);
+  int after = cpPolylineSetFindStarts(lines, v1);
+  
+  if(before >= 0 && after >= 0){
+    if(before == after){
+      // loop by pushing v1 onto before
+      lines->lines[before] = cpPolylinePush(lines->lines[before], v1);
+    } else {
+      // join before and after
+      cpPolylineSetJoin(lines, before, after);
+    }
+  } else if(before >= 0){
+    // push v1 onto before
+    lines->lines[before] = cpPolylinePush(lines->lines[before], v1);
+  } else if(after >= 0){
+    // enqueue v0 onto after
+    lines->lines[after] = cpPolylineEnqueue(lines->lines[after], v0);
+  } else {
+    // create new line from v0 and v1
+    cpPolylineSetAdd(lines, v0, v1);
+  }
+}
+
+//MARK: Convex Hull Functions
+
+cpPolyline *
+cpPolylineToConvexHull(cpPolyline *line, cpFloat tol)
+{
+	cpPolyline *hull = cpPolylineMake(line->count + 1);
+	hull->count = cpConvexHull(line->count, line->verts, hull->verts, NULL, tol);
+	hull = cpPolylinePush(hull, hull->verts[0]);
+	
+	return cpPolylineShrink(hull);
+}
+
+//MARK: Approximate Concave Decompostition
+
+struct Notch {
+	int i;
+	cpFloat d;
+	cpVect v;
+	cpVect n;
+};
+
+static cpFloat
+FindSteiner(int count, cpVect *verts, struct Notch notch)
+{
+	cpFloat min = INFINITY;
+	cpFloat feature = -1.0;
+	
+	for(int i=1; i<count-1; i++){
+		int index = (notch.i + i)%count;
+		
+		cpVect seg_a = verts[index];
+		cpVect seg_b = verts[Next(index, count)];
+		
+		cpFloat thing_a = cpvcross(notch.n, cpvsub(seg_a, notch.v));
+		cpFloat thing_b = cpvcross(notch.n, cpvsub(seg_b, notch.v));
+		if(thing_a*thing_b <= 0.0){
+			cpFloat t = thing_a/(thing_a - thing_b);
+			cpFloat dist = cpvdot(notch.n, cpvsub(cpvlerp(seg_a, seg_b, t), notch.v));
+			
+			if(dist >= 0.0 && dist <= min){
+				min = dist;
+				feature = index + t;
+			}
+		}
+	}
+	
+	return feature;
+}
+
+//static cpFloat
+//FindSteiner2(cpVect *verts, int count, struct Notch notch)
+//{
+//	cpVect a = verts[(notch.i + count - 1)%count];
+//	cpVect b = verts[(notch.i + 1)%count];
+//	cpVect n = cpvnormalize(cpvadd(cpvnormalize(cpvsub(notch.v, a)), cpvnormalize(cpvsub(notch.v, b))));
+//	
+//	cpFloat min = INFINITY;
+//	cpFloat feature = -1.0;
+//	
+//	for(int i=1; i<count-1; i++){
+//		int index = (notch.i + i)%count;
+//		
+//		cpVect seg_a = verts[index];
+//		cpVect seg_b = verts[Next(index, count)];
+//		
+//		cpFloat thing_a = cpvcross(n, cpvsub(seg_a, notch.v));
+//		cpFloat thing_b = cpvcross(n, cpvsub(seg_b, notch.v));
+//		if(thing_a*thing_b <= 0.0){
+//			cpFloat t = thing_a/(thing_a - thing_b);
+//			cpFloat dist = cpvdot(n, cpvsub(cpvlerp(seg_a, seg_b, t), notch.v));
+//			
+//			if(dist >= 0.0 && dist <= min){
+//				min = dist;
+//				feature = index + t;
+//			}
+//		}
+//	}
+//	
+//	cpAssertSoft(feature >= 0.0, "No closest features detected. This is likely due to a self intersecting polygon.");
+//	return feature;
+//}
+
+//struct Range {cpFloat min, max;};
+//static inline struct Range
+//clip_range(cpVect delta_a, cpVect delta_b, cpVect clip)
+//{
+//	cpFloat da = cpvcross(delta_a, clip);
+//	cpFloat db = cpvcross(delta_b, clip);
+//	cpFloat clamp = da/(da - db);
+//	if(da > db){
+//		return (struct Range){-INFINITY, clamp};
+//	} else if(da < db){
+//		return (struct Range){clamp, INFINITY};
+//	} else {
+//		return (struct Range){-INFINITY, INFINITY};
+//	}
+//}
+//
+//static cpFloat
+//FindSteiner3(cpVect *verts, int count, struct Notch notch)
+//{
+//	cpFloat min = INFINITY;
+//	cpFloat feature = -1.0;
+//	
+//	cpVect support_a = verts[(notch.i - 1 + count)%count];
+//	cpVect support_b = verts[(notch.i + 1)%count];
+//	
+//	cpVect clip_a = cpvlerp(support_a, support_b, 0.1);
+//	cpVect clip_b = cpvlerp(support_b, support_b, 0.9);
+//	
+//	for(int i=1; i<count - 1; i++){
+//		int index = (notch.i + i)%count;
+//		cpVect seg_a = verts[index];
+//		cpVect seg_b = verts[Next(index, count)];
+//		
+//		cpVect delta_a = cpvsub(seg_a, notch.v);
+//		cpVect delta_b = cpvsub(seg_b, notch.v);
+//		
+//		// Ignore if the segment faces away from the point.
+//		if(cpvcross(delta_b, delta_a) > 0.0){
+//			struct Range range1 = clip_range(delta_a, delta_b, cpvsub(notch.v, clip_a));
+//			struct Range range2 = clip_range(delta_a, delta_b, cpvsub(clip_b, notch.v));
+//			
+//			cpFloat min_t = cpfmax(0.0, cpfmax(range1.min, range2.min));
+//			cpFloat max_t = cpfmin(1.0, cpfmin(range1.max, range2.max));
+//			
+//			// Ignore if the segment has been completely clipped away.
+//			if(min_t < max_t){
+//				cpVect seg_delta = cpvsub(seg_b, seg_a);
+//				cpFloat closest_t = cpfclamp(cpvdot(seg_delta, cpvsub(notch.v, seg_a))/cpvlengthsq(seg_delta), min_t, max_t);
+//				cpVect closest = cpvlerp(seg_a, seg_b, closest_t);
+//				
+//				cpFloat dist = cpvdistsq(notch.v, closest);
+//				if(dist < min){
+//					min = dist;
+//					feature = index + closest_t;
+//				}
+//			}
+//		}
+//	}
+//	
+//	cpAssertWarn(feature >= 0.0, "Internal Error: No closest features detected.");
+//	return feature;
+//}
+
+//static cpBool
+//VertexUnobscured(int count, cpVect *verts, int index, int notch_i)
+//{
+//	cpVect v = verts[notch_i];
+//	cpVect n = cpvnormalize(cpvsub(verts[index], v));
+//	
+//	for(int i=0; i<count; i++){
+//		if(i == index || i == Next(i, count) || i == notch_i || i == Next(notch_i, count)) continue;
+//		
+//		cpVect seg_a = verts[i];
+//		cpVect seg_b = verts[Next(i, count)];
+//		
+//		cpFloat thing_a = cpvcross(n, cpvsub(seg_a, v));
+//		cpFloat thing_b = cpvcross(n, cpvsub(seg_b, v));
+//		if(thing_a*thing_b <= 0.0) return cpTrue;
+//	}
+//	
+//	return cpFalse;
+//}
+//
+//static cpFloat
+//FindSteiner4(int count, cpVect *verts, struct Notch notch, cpFloat *convexity)
+//{
+//	cpFloat min = INFINITY;
+//	cpFloat feature = -1.0;
+//	
+//	for(int i=Next(notch.b, count); i!=notch.a; i=Next(i, count)){
+//		cpVect v = verts[i];
+//		cpFloat weight = (1.0 + 0.1*convexity[i])/(1.0*cpvdist(notch.v, v));
+//		
+//		if(weight <= min && VertexUnobscured(count, verts, i, notch.i)){
+//			min = weight;
+//			feature = i;
+//		}
+//	}
+//	
+//	cpAssertSoft(feature >= 0.0, "No closest features detected. This is likely due to a self intersecting polygon.");
+//	return feature;
+//}
+
+static struct Notch
+DeepestNotch(int count, cpVect *verts, int hullCount, cpVect *hullVerts, int first, cpFloat tol)
+{
+	struct Notch notch = {};
+	int j = Next(first, count);
+	
+	for(int i=0; i<hullCount; i++){
+		cpVect a = hullVerts[i];
+		cpVect b = hullVerts[Next(i, hullCount)];
+		
+		// TODO use a cross check instead?
+		cpVect n = cpvnormalize(cpvrperp(cpvsub(a, b)));
+		cpFloat d = cpvdot(n, a);
+		
+		cpVect v = verts[j];
+		while(!cpveql(v, b)){
+			cpFloat depth = cpvdot(n, v) - d;
+			
+			if(depth > notch.d){
+				notch.d = depth;
+				notch.i = j;
+				notch.v = v;
+				notch.n = n;
+			}
+			
+			j = Next(j, count);
+			v = verts[j];
+		}
+		
+		j = Next(j, count);
+	}
+	
+	return notch;
+}
+
+static inline int IMAX(int a, int b){return (a > b ? a : b);}
+
+static void
+ApproximateConcaveDecomposition(cpVect *verts, int count, cpFloat tol, cpPolylineSet *set)
+{
+	int first;
+	cpVect *hullVerts = (cpVect*) alloca(count*sizeof(cpVect));
+	int hullCount = cpConvexHull(count, verts, hullVerts, &first, 0.0);
+	
+	if(hullCount != count){
+		struct Notch notch = DeepestNotch(count, verts, hullCount, hullVerts, first, tol);
+		
+		if(notch.d > tol){
+			cpFloat steiner_it = FindSteiner(count, verts, notch);
+			
+			if(steiner_it >= 0.0){
+				int steiner_i = (int)steiner_it;
+				cpVect steiner = cpvlerp(verts[steiner_i], verts[Next(steiner_i, count)], steiner_it - steiner_i);
+				
+				// Vertex counts NOT including the steiner point.
+				int sub1_count = (steiner_i - notch.i + count)%count + 1;
+				int sub2_count = count - (steiner_i - notch.i + count)%count;
+				cpVect *scratch = (cpVect*) alloca((IMAX(sub1_count, sub2_count) + 1)*sizeof(cpVect));
+				
+				for(int i=0; i<sub1_count; i++) scratch[i] = verts[(notch.i + i)%count];
+				scratch[sub1_count] = steiner;
+				ApproximateConcaveDecomposition(scratch, sub1_count + 1, tol, set);
+				
+				for(int i=0; i<sub2_count; i++) scratch[i] = verts[(steiner_i + 1 + i)%count];
+				scratch[sub2_count] = steiner;
+				ApproximateConcaveDecomposition(scratch, sub2_count + 1, tol, set);
+				
+				return;
+			}
+		}
+	}
+	
+	cpPolyline *hull = cpPolylineMake(hullCount + 1);
+	
+	memcpy(hull->verts, hullVerts, hullCount*sizeof(cpVect));
+	hull->verts[hullCount] = hullVerts[0];
+	hull->count = hullCount + 1;
+	
+	cpPolylineSetPush(set, hull);
+}
+
+cpPolylineSet *
+cpPolylineConvexDecomposition_BETA(cpPolyline *line, cpFloat tol)
+{
+	cpAssertSoft(cpPolylineIsClosed(line), "Cannot decompose an open polygon.");
+	cpAssertSoft(cpAreaForPoly(line->count, line->verts, 0.0) >= 0.0, "Winding is backwards. (Are you passing a hole?)");
+	
+	cpPolylineSet *set = cpPolylineSetNew();
+	ApproximateConcaveDecomposition(line->verts, line->count - 1, tol, set);
+	
+	return set;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpRatchetJoint.c b/dali-physics/third-party/chipmunk2d/src/cpRatchetJoint.c
new file mode 100644
index 0000000..b3c9687
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpRatchetJoint.c
@@ -0,0 +1,179 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpRatchetJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpFloat angle = joint->angle;
+	cpFloat phase = joint->phase;
+	cpFloat ratchet = joint->ratchet;
+	
+	cpFloat delta = b->a - a->a;
+	cpFloat diff = angle - delta;
+	cpFloat pdist = 0.0f;
+	
+	if(diff*ratchet > 0.0f){
+		pdist = diff;
+	} else {
+		joint->angle = cpffloor((delta - phase)/ratchet)*ratchet + phase;
+	}
+	
+	// calculate moment of inertia coefficient.
+	joint->iSum = 1.0f/(a->i_inv + b->i_inv);
+	
+	// calculate bias velocity
+	cpFloat maxBias = joint->constraint.maxBias;
+	joint->bias = cpfclamp(-bias_coef(joint->constraint.errorBias, dt)*pdist/dt, -maxBias, maxBias);
+
+	// If the bias is 0, the joint is not at a limit. Reset the impulse.
+	if(!joint->bias) joint->jAcc = 0.0f;
+}
+
+static void
+applyCachedImpulse(cpRatchetJoint *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpFloat j = joint->jAcc*dt_coef;
+	a->w -= j*a->i_inv;
+	b->w += j*b->i_inv;
+}
+
+static void
+applyImpulse(cpRatchetJoint *joint, cpFloat dt)
+{
+	if(!joint->bias) return; // early exit
+
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	// compute relative rotational velocity
+	cpFloat wr = b->w - a->w;
+	cpFloat ratchet = joint->ratchet;
+	
+	cpFloat jMax = joint->constraint.maxForce*dt;
+	
+	// compute normal impulse	
+	cpFloat j = -(joint->bias + wr)*joint->iSum;
+	cpFloat jOld = joint->jAcc;
+	joint->jAcc = cpfclamp((jOld + j)*ratchet, 0.0f, jMax*cpfabs(ratchet))/ratchet;
+	j = joint->jAcc - jOld;
+	
+	// apply impulse
+	a->w -= j*a->i_inv;
+	b->w += j*b->i_inv;
+}
+
+static cpFloat
+getImpulse(cpRatchetJoint *joint)
+{
+	return cpfabs(joint->jAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpRatchetJoint *
+cpRatchetJointAlloc(void)
+{
+	return (cpRatchetJoint *)cpcalloc(1, sizeof(cpRatchetJoint));
+}
+
+cpRatchetJoint *
+cpRatchetJointInit(cpRatchetJoint *joint, cpBody *a, cpBody *b, cpFloat phase, cpFloat ratchet)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->angle = 0.0f;
+	joint->phase = phase;
+	joint->ratchet = ratchet;
+	
+	// STATIC_BODY_CHECK
+	joint->angle = (b ? b->a : 0.0f) - (a ? a->a : 0.0f);
+	
+	return joint;
+}
+
+cpConstraint *
+cpRatchetJointNew(cpBody *a, cpBody *b, cpFloat phase, cpFloat ratchet)
+{
+	return (cpConstraint *)cpRatchetJointInit(cpRatchetJointAlloc(), a, b, phase, ratchet);
+}
+
+cpBool
+cpConstraintIsRatchetJoint(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpFloat
+cpRatchetJointGetAngle(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsRatchetJoint(constraint), "Constraint is not a ratchet joint.");
+	return ((cpRatchetJoint *)constraint)->angle;
+}
+
+void
+cpRatchetJointSetAngle(cpConstraint *constraint, cpFloat angle)
+{
+	cpAssertHard(cpConstraintIsRatchetJoint(constraint), "Constraint is not a ratchet joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpRatchetJoint *)constraint)->angle = angle;
+}
+
+cpFloat
+cpRatchetJointGetPhase(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsRatchetJoint(constraint), "Constraint is not a ratchet joint.");
+	return ((cpRatchetJoint *)constraint)->phase;
+}
+
+void
+cpRatchetJointSetPhase(cpConstraint *constraint, cpFloat phase)
+{
+	cpAssertHard(cpConstraintIsRatchetJoint(constraint), "Constraint is not a ratchet joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpRatchetJoint *)constraint)->phase = phase;
+}
+cpFloat
+cpRatchetJointGetRatchet(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsRatchetJoint(constraint), "Constraint is not a ratchet joint.");
+	return ((cpRatchetJoint *)constraint)->ratchet;
+}
+
+void
+cpRatchetJointSetRatchet(cpConstraint *constraint, cpFloat ratchet)
+{
+	cpAssertHard(cpConstraintIsRatchetJoint(constraint), "Constraint is not a ratchet joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpRatchetJoint *)constraint)->ratchet = ratchet;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpRobust.c b/dali-physics/third-party/chipmunk2d/src/cpRobust.c
new file mode 100644
index 0000000..57507d1
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpRobust.c
@@ -0,0 +1,13 @@
+#include "chipmunk/cpRobust.h"
+
+
+cpBool
+cpCheckPointGreater(const cpVect a, const cpVect b, const cpVect c)
+{
+	return (b.y - a.y)*(a.x + b.x - 2*c.x) > (b.x - a.x)*(a.y + b.y - 2*c.y);
+}
+
+cpBool
+cpCheckAxis(cpVect v0, cpVect v1, cpVect p, cpVect n){
+	return cpvdot(p, n) <= cpfmax(cpvdot(v0, n), cpvdot(v1, n));
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpRotaryLimitJoint.c b/dali-physics/third-party/chipmunk2d/src/cpRotaryLimitJoint.c
new file mode 100644
index 0000000..548adbe
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpRotaryLimitJoint.c
@@ -0,0 +1,160 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpRotaryLimitJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpFloat dist = b->a - a->a;
+	cpFloat pdist = 0.0f;
+	if(dist > joint->max) {
+		pdist = joint->max - dist;
+	} else if(dist < joint->min) {
+		pdist = joint->min - dist;
+	}
+	
+	// calculate moment of inertia coefficient.
+	joint->iSum = 1.0f/(a->i_inv + b->i_inv);
+	
+	// calculate bias velocity
+	cpFloat maxBias = joint->constraint.maxBias;
+	joint->bias = cpfclamp(-bias_coef(joint->constraint.errorBias, dt)*pdist/dt, -maxBias, maxBias);
+
+	// If the bias is 0, the joint is not at a limit. Reset the impulse.
+	if(!joint->bias) joint->jAcc = 0.0f;
+}
+
+static void
+applyCachedImpulse(cpRotaryLimitJoint *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpFloat j = joint->jAcc*dt_coef;
+	a->w -= j*a->i_inv;
+	b->w += j*b->i_inv;
+}
+
+static void
+applyImpulse(cpRotaryLimitJoint *joint, cpFloat dt)
+{
+	if(!joint->bias) return; // early exit
+
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	// compute relative rotational velocity
+	cpFloat wr = b->w - a->w;
+	
+	cpFloat jMax = joint->constraint.maxForce*dt;
+	
+	// compute normal impulse	
+	cpFloat j = -(joint->bias + wr)*joint->iSum;
+	cpFloat jOld = joint->jAcc;
+	if(joint->bias < 0.0f){
+		joint->jAcc = cpfclamp(jOld + j, 0.0f, jMax);
+	} else {
+		joint->jAcc = cpfclamp(jOld + j, -jMax, 0.0f);
+	}
+	j = joint->jAcc - jOld;
+	
+	// apply impulse
+	a->w -= j*a->i_inv;
+	b->w += j*b->i_inv;
+}
+
+static cpFloat
+getImpulse(cpRotaryLimitJoint *joint)
+{
+	return cpfabs(joint->jAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpRotaryLimitJoint *
+cpRotaryLimitJointAlloc(void)
+{
+	return (cpRotaryLimitJoint *)cpcalloc(1, sizeof(cpRotaryLimitJoint));
+}
+
+cpRotaryLimitJoint *
+cpRotaryLimitJointInit(cpRotaryLimitJoint *joint, cpBody *a, cpBody *b, cpFloat min, cpFloat max)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->min = min;
+	joint->max  = max;
+	
+	joint->jAcc = 0.0f;
+	
+	return joint;
+}
+
+cpConstraint *
+cpRotaryLimitJointNew(cpBody *a, cpBody *b, cpFloat min, cpFloat max)
+{
+	return (cpConstraint *)cpRotaryLimitJointInit(cpRotaryLimitJointAlloc(), a, b, min, max);
+}
+
+cpBool
+cpConstraintIsRotaryLimitJoint(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpFloat
+cpRotaryLimitJointGetMin(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsRotaryLimitJoint(constraint), "Constraint is not a rotary limit joint.");
+	return ((cpRotaryLimitJoint *)constraint)->min;
+}
+
+void
+cpRotaryLimitJointSetMin(cpConstraint *constraint, cpFloat min)
+{
+	cpAssertHard(cpConstraintIsRotaryLimitJoint(constraint), "Constraint is not a rotary limit joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpRotaryLimitJoint *)constraint)->min = min;
+}
+
+cpFloat
+cpRotaryLimitJointGetMax(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsRotaryLimitJoint(constraint), "Constraint is not a rotary limit joint.");
+	return ((cpRotaryLimitJoint *)constraint)->max;
+}
+
+void
+cpRotaryLimitJointSetMax(cpConstraint *constraint, cpFloat max)
+{
+	cpAssertHard(cpConstraintIsRotaryLimitJoint(constraint), "Constraint is not a rotary limit joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpRotaryLimitJoint *)constraint)->max = max;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpShape.c b/dali-physics/third-party/chipmunk2d/src/cpShape.c
new file mode 100644
index 0000000..942bfff
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpShape.c
@@ -0,0 +1,610 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+#include "chipmunk/chipmunk_unsafe.h"
+
+#define CP_DefineShapeGetter(struct, type, member, name) \
+CP_DeclareShapeGetter(struct, type, name){ \
+	cpAssertHard(shape->klass == &struct##Class, "shape is not a "#struct); \
+	return ((struct *)shape)->member; \
+}
+
+cpShape *
+cpShapeInit(cpShape *shape, const cpShapeClass *klass, cpBody *body, struct cpShapeMassInfo massInfo)
+{
+	shape->klass = klass;
+	
+	shape->body = body;
+	shape->massInfo = massInfo;
+	
+	shape->sensor = 0;
+	
+	shape->e = 0.0f;
+	shape->u = 0.0f;
+	shape->surfaceV = cpvzero;
+	
+	shape->type = 0;
+	shape->filter.group = CP_NO_GROUP;
+	shape->filter.categories = CP_ALL_CATEGORIES;
+	shape->filter.mask = CP_ALL_CATEGORIES;
+	
+	shape->userData = NULL;
+	
+	shape->space = NULL;
+	
+	shape->next = NULL;
+	shape->prev = NULL;
+	
+	return shape;
+}
+
+void
+cpShapeDestroy(cpShape *shape)
+{
+	if(shape->klass && shape->klass->destroy) shape->klass->destroy(shape);
+}
+
+void
+cpShapeFree(cpShape *shape)
+{
+	if(shape){
+		cpShapeDestroy(shape);
+		cpfree(shape);
+	}
+}
+
+cpSpace *
+cpShapeGetSpace(const cpShape *shape)
+{
+	return shape->space;
+}
+
+cpBody *
+cpShapeGetBody(const cpShape *shape)
+{
+	return shape->body;
+}
+
+void
+cpShapeSetBody(cpShape *shape, cpBody *body)
+{
+	cpAssertHard(!cpShapeActive(shape), "You cannot change the body on an active shape. You must remove the shape from the space before changing the body.");
+	shape->body = body;
+}
+
+cpFloat cpShapeGetMass(cpShape *shape){ return shape->massInfo.m; }
+
+void
+cpShapeSetMass(cpShape *shape, cpFloat mass){
+	cpBody *body = shape->body;
+	cpBodyActivate(body);
+	
+	shape->massInfo.m = mass;
+	cpBodyAccumulateMassFromShapes(body);
+}
+
+cpFloat cpShapeGetDensity(cpShape *shape){ return shape->massInfo.m/shape->massInfo.area; }
+void cpShapeSetDensity(cpShape *shape, cpFloat density){ cpShapeSetMass(shape, density*shape->massInfo.area); }
+
+cpFloat cpShapeGetMoment(cpShape *shape){ return shape->massInfo.m*shape->massInfo.i; }
+cpFloat cpShapeGetArea(cpShape *shape){ return shape->massInfo.area; }
+cpVect cpShapeGetCenterOfGravity(cpShape *shape) { return shape->massInfo.cog; }
+
+cpHashValue
+cpShapeGetHashId(cpShape* shape)
+{
+  return shape->hashid;
+}
+
+cpBB
+cpShapeGetBB(const cpShape *shape)
+{
+	return shape->bb;
+}
+
+cpBool
+cpShapeGetSensor(const cpShape *shape)
+{
+	return shape->sensor;
+}
+
+void
+cpShapeSetSensor(cpShape *shape, cpBool sensor)
+{
+	cpBodyActivate(shape->body);
+	shape->sensor = sensor;
+}
+
+cpFloat
+cpShapeGetElasticity(const cpShape *shape)
+{
+	return shape->e;
+}
+
+void
+cpShapeSetElasticity(cpShape *shape, cpFloat elasticity)
+{
+	cpAssertHard(elasticity >= 0.0f, "Elasticity must be positive.");
+	cpBodyActivate(shape->body);
+	shape->e = elasticity;
+}
+
+cpFloat
+cpShapeGetFriction(const cpShape *shape)
+{
+	return shape->u;
+}
+
+void
+cpShapeSetFriction(cpShape *shape, cpFloat friction)
+{
+	cpAssertHard(friction >= 0.0f, "Friction must be postive.");
+	cpBodyActivate(shape->body);
+	shape->u = friction;
+}
+
+cpVect
+cpShapeGetSurfaceVelocity(const cpShape *shape)
+{
+	return shape->surfaceV;
+}
+
+void
+cpShapeSetSurfaceVelocity(cpShape *shape, cpVect surfaceVelocity)
+{
+	cpBodyActivate(shape->body);
+	shape->surfaceV = surfaceVelocity;
+}
+
+cpDataPointer
+cpShapeGetUserData(const cpShape *shape)
+{
+	return shape->userData;
+}
+
+void
+cpShapeSetUserData(cpShape *shape, cpDataPointer userData)
+{
+	shape->userData = userData;
+}
+
+cpCollisionType
+cpShapeGetCollisionType(const cpShape *shape)
+{
+	return shape->type;
+}
+
+void
+cpShapeSetCollisionType(cpShape *shape, cpCollisionType collisionType)
+{
+	cpBodyActivate(shape->body);
+	shape->type = collisionType;
+}
+
+cpShapeFilter
+cpShapeGetFilter(const cpShape *shape)
+{
+	return shape->filter;
+}
+
+void
+cpShapeSetFilter(cpShape *shape, cpShapeFilter filter)
+{
+	cpBodyActivate(shape->body);
+	shape->filter = filter;
+}
+
+cpBB
+cpShapeCacheBB(cpShape *shape)
+{
+	return cpShapeUpdate(shape, shape->body->transform);
+}
+
+cpBB
+cpShapeUpdate(cpShape *shape, cpTransform transform)
+{
+	return (shape->bb = shape->klass->cacheData(shape, transform));
+}
+
+cpFloat
+cpShapePointQuery(const cpShape *shape, cpVect p, cpPointQueryInfo *info)
+{
+	cpPointQueryInfo blank = {NULL, cpvzero, INFINITY, cpvzero};
+	if(info){
+		(*info) = blank;
+	} else {
+		info = &blank;
+	}
+	
+	shape->klass->pointQuery(shape, p, info);
+	return info->distance;
+}
+
+
+cpBool
+cpShapeSegmentQuery(const cpShape *shape, cpVect a, cpVect b, cpFloat radius, cpSegmentQueryInfo *info){
+	cpSegmentQueryInfo blank = {NULL, b, cpvzero, 1.0f};
+	if(info){
+		(*info) = blank;
+	} else {
+		info = &blank;
+	}
+	
+	cpPointQueryInfo nearest;
+	shape->klass->pointQuery(shape, a, &nearest);
+	if(nearest.distance <= radius){
+		info->shape = shape;
+		info->alpha = 0.0;
+		info->normal = cpvnormalize(cpvsub(a, nearest.point));
+	} else {
+		shape->klass->segmentQuery(shape, a, b, radius, info);
+	}
+	
+	return (info->shape != NULL);
+}
+
+cpContactPointSet
+cpShapesCollide(const cpShape *a, const cpShape *b)
+{
+	struct cpContact contacts[CP_MAX_CONTACTS_PER_ARBITER];
+	struct cpCollisionInfo info = cpCollide(a, b, 0, contacts);
+	
+	cpContactPointSet set;
+	set.count = info.count;
+	
+	// cpCollideShapes() may have swapped the contact order. Flip the normal.
+	cpBool swapped = (a != info.a);
+	set.normal = (swapped ? cpvneg(info.n) : info.n);
+	
+	for(int i=0; i<info.count; i++){
+		// cpCollideShapesInfo() returns contacts with absolute positions.
+		cpVect p1 = contacts[i].r1;
+		cpVect p2 = contacts[i].r2;
+		
+		set.points[i].pointA = (swapped ? p2 : p1);
+		set.points[i].pointB = (swapped ? p1 : p2);
+		set.points[i].distance = cpvdot(cpvsub(p2, p1), set.normal);
+	}
+	
+	return set;
+}
+
+cpCircleShape *
+cpCircleShapeAlloc(void)
+{
+	return (cpCircleShape *)cpcalloc(1, sizeof(cpCircleShape));
+}
+
+static cpBB
+cpCircleShapeCacheData(cpCircleShape *circle, cpTransform transform)
+{
+	cpVect c = circle->tc = cpTransformPoint(transform, circle->c);
+	return cpBBNewForCircle(c, circle->r);
+}
+
+static void
+cpCircleShapePointQuery(cpCircleShape *circle, cpVect p, cpPointQueryInfo *info)
+{
+	cpVect delta = cpvsub(p, circle->tc);
+	cpFloat d = cpvlength(delta);
+	cpFloat r = circle->r;
+	
+	info->shape = (cpShape *)circle;
+	cpFloat r_over_d = d > 0.0f ? r/d : r;
+	info->point = cpvadd(circle->tc, cpvmult(delta, r_over_d)); // TODO: div/0
+	info->distance = d - r;
+	
+	// Use up for the gradient if the distance is very small.
+	info->gradient = (d > MAGIC_EPSILON ? cpvmult(delta, 1.0f/d) : cpv(0.0f, 1.0f));
+}
+
+static void
+cpCircleShapeSegmentQuery(cpCircleShape *circle, cpVect a, cpVect b, cpFloat radius, cpSegmentQueryInfo *info)
+{
+	CircleSegmentQuery((cpShape *)circle, circle->tc, circle->r, a, b, radius, info);
+}
+
+static struct cpShapeMassInfo
+cpCircleShapeMassInfo(cpFloat mass, cpFloat radius, cpVect center)
+{
+	struct cpShapeMassInfo info = {
+		mass, cpMomentForCircle(1.0f, 0.0f, radius, cpvzero),
+		center,
+		cpAreaForCircle(0.0f, radius),
+	};
+	
+	return info;
+}
+
+static const cpShapeClass cpCircleShapeClass = {
+	CP_CIRCLE_SHAPE,
+	(cpShapeCacheDataImpl)cpCircleShapeCacheData,
+	NULL,
+	(cpShapePointQueryImpl)cpCircleShapePointQuery,
+	(cpShapeSegmentQueryImpl)cpCircleShapeSegmentQuery,
+};
+
+cpCircleShape *
+cpCircleShapeInit(cpCircleShape *circle, cpBody *body, cpFloat radius, cpVect offset)
+{
+	circle->c = offset;
+	circle->r = radius;
+	
+	cpShapeInit((cpShape *)circle, &cpCircleShapeClass, body, cpCircleShapeMassInfo(0.0f, radius, offset));
+	
+	return circle;
+}
+
+cpShape *
+cpCircleShapeNew(cpBody *body, cpFloat radius, cpVect offset)
+{
+	return (cpShape *)cpCircleShapeInit(cpCircleShapeAlloc(), body, radius, offset);
+}
+
+cpVect
+cpCircleShapeGetOffset(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &cpCircleShapeClass, "Shape is not a circle shape.");
+	return ((cpCircleShape *)shape)->c;
+}
+
+cpFloat
+cpCircleShapeGetRadius(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &cpCircleShapeClass, "Shape is not a circle shape.");
+	return ((cpCircleShape *)shape)->r;
+}
+
+
+cpSegmentShape *
+cpSegmentShapeAlloc(void)
+{
+	return (cpSegmentShape *)cpcalloc(1, sizeof(cpSegmentShape));
+}
+
+static cpBB
+cpSegmentShapeCacheData(cpSegmentShape *seg, cpTransform transform)
+{
+	seg->ta = cpTransformPoint(transform, seg->a);
+	seg->tb = cpTransformPoint(transform, seg->b);
+	seg->tn = cpTransformVect(transform, seg->n);
+	
+	cpFloat l,r,b,t;
+	
+	if(seg->ta.x < seg->tb.x){
+		l = seg->ta.x;
+		r = seg->tb.x;
+	} else {
+		l = seg->tb.x;
+		r = seg->ta.x;
+	}
+	
+	if(seg->ta.y < seg->tb.y){
+		b = seg->ta.y;
+		t = seg->tb.y;
+	} else {
+		b = seg->tb.y;
+		t = seg->ta.y;
+	}
+	
+	cpFloat rad = seg->r;
+	return cpBBNew(l - rad, b - rad, r + rad, t + rad);
+}
+
+static void
+cpSegmentShapePointQuery(cpSegmentShape *seg, cpVect p, cpPointQueryInfo *info)
+{
+	cpVect closest = cpClosetPointOnSegment(p, seg->ta, seg->tb);
+	
+	cpVect delta = cpvsub(p, closest);
+	cpFloat d = cpvlength(delta);
+	cpFloat r = seg->r;
+	cpVect g = cpvmult(delta, 1.0f/d);
+	
+	info->shape = (cpShape *)seg;
+	info->point = (d ? cpvadd(closest, cpvmult(g, r)) : closest);
+	info->distance = d - r;
+	
+	// Use the segment's normal if the distance is very small.
+	info->gradient = (d > MAGIC_EPSILON ? g : seg->n);
+}
+
+static void
+cpSegmentShapeSegmentQuery(cpSegmentShape *seg, cpVect a, cpVect b, cpFloat r2, cpSegmentQueryInfo *info)
+{
+	cpVect n = seg->tn;
+	cpFloat d = cpvdot(cpvsub(seg->ta, a), n);
+	cpFloat r = seg->r + r2;
+	
+	cpVect flipped_n = (d > 0.0f ? cpvneg(n) : n);
+	cpVect seg_offset = cpvsub(cpvmult(flipped_n, r), a);
+	
+	// Make the endpoints relative to 'a' and move them by the thickness of the segment.
+	cpVect seg_a = cpvadd(seg->ta, seg_offset);
+	cpVect seg_b = cpvadd(seg->tb, seg_offset);
+	cpVect delta = cpvsub(b, a);
+	
+	if(cpvcross(delta, seg_a)*cpvcross(delta, seg_b) <= 0.0f){
+		cpFloat d_offset = d + (d > 0.0f ? -r : r);
+		cpFloat ad = -d_offset;
+		cpFloat bd = cpvdot(delta, n) - d_offset;
+		
+		if(ad*bd < 0.0f){
+			cpFloat t = ad/(ad - bd);
+			
+			info->shape = (cpShape *)seg;
+			info->point = cpvsub(cpvlerp(a, b, t), cpvmult(flipped_n, r2));
+			info->normal = flipped_n;
+			info->alpha = t;
+		}
+	} else if(r != 0.0f){
+		cpSegmentQueryInfo info1 = {NULL, b, cpvzero, 1.0f};
+		cpSegmentQueryInfo info2 = {NULL, b, cpvzero, 1.0f};
+		CircleSegmentQuery((cpShape *)seg, seg->ta, seg->r, a, b, r2, &info1);
+		CircleSegmentQuery((cpShape *)seg, seg->tb, seg->r, a, b, r2, &info2);
+		
+		if(info1.alpha < info2.alpha){
+			(*info) = info1;
+		} else {
+			(*info) = info2;
+		}
+	}
+}
+
+static struct cpShapeMassInfo
+cpSegmentShapeMassInfo(cpFloat mass, cpVect a, cpVect b, cpFloat r)
+{
+	struct cpShapeMassInfo info = {
+		mass, cpMomentForBox(1.0f, cpvdist(a, b) + 2.0f*r, 2.0f*r), // TODO is an approximation.
+		cpvlerp(a, b, 0.5f),
+		cpAreaForSegment(a, b, r),
+	};
+	
+	return info;
+}
+
+static const cpShapeClass cpSegmentShapeClass = {
+	CP_SEGMENT_SHAPE,
+	(cpShapeCacheDataImpl)cpSegmentShapeCacheData,
+	NULL,
+	(cpShapePointQueryImpl)cpSegmentShapePointQuery,
+	(cpShapeSegmentQueryImpl)cpSegmentShapeSegmentQuery,
+};
+
+cpSegmentShape *
+cpSegmentShapeInit(cpSegmentShape *seg, cpBody *body, cpVect a, cpVect b, cpFloat r)
+{
+	seg->a = a;
+	seg->b = b;
+	seg->n = cpvrperp(cpvnormalize(cpvsub(b, a)));
+	
+	seg->r = r;
+	
+	seg->a_tangent = cpvzero;
+	seg->b_tangent = cpvzero;
+	
+	cpShapeInit((cpShape *)seg, &cpSegmentShapeClass, body, cpSegmentShapeMassInfo(0.0f, a, b, r));
+	
+	return seg;
+}
+
+cpShape*
+cpSegmentShapeNew(cpBody *body, cpVect a, cpVect b, cpFloat r)
+{
+	return (cpShape *)cpSegmentShapeInit(cpSegmentShapeAlloc(), body, a, b, r);
+}
+
+cpVect
+cpSegmentShapeGetA(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &cpSegmentShapeClass, "Shape is not a segment shape.");
+	return ((cpSegmentShape *)shape)->a;
+}
+
+cpVect
+cpSegmentShapeGetB(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &cpSegmentShapeClass, "Shape is not a segment shape.");
+	return ((cpSegmentShape *)shape)->b;
+}
+
+cpVect
+cpSegmentShapeGetNormal(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &cpSegmentShapeClass, "Shape is not a segment shape.");
+	return ((cpSegmentShape *)shape)->n;
+}
+
+cpFloat
+cpSegmentShapeGetRadius(const cpShape *shape)
+{
+	cpAssertHard(shape->klass == &cpSegmentShapeClass, "Shape is not a segment shape.");
+	return ((cpSegmentShape *)shape)->r;
+}
+
+void
+cpSegmentShapeSetNeighbors(cpShape *shape, cpVect prev, cpVect next)
+{
+	cpAssertHard(shape->klass == &cpSegmentShapeClass, "Shape is not a segment shape.");
+	cpSegmentShape *seg = (cpSegmentShape *)shape;
+	
+	seg->a_tangent = cpvsub(prev, seg->a);
+	seg->b_tangent = cpvsub(next, seg->b);
+}
+
+// Unsafe API (chipmunk_unsafe.h)
+
+// TODO setters should wake the shape up?
+
+void
+cpCircleShapeSetRadius(cpShape *shape, cpFloat radius)
+{
+	cpAssertHard(shape->klass == &cpCircleShapeClass, "Shape is not a circle shape.");
+	cpCircleShape *circle = (cpCircleShape *)shape;
+	
+	circle->r = radius;
+	
+	cpFloat mass = shape->massInfo.m;
+	shape->massInfo = cpCircleShapeMassInfo(mass, circle->r, circle->c);
+	if(mass > 0.0f) cpBodyAccumulateMassFromShapes(shape->body);
+}
+
+void
+cpCircleShapeSetOffset(cpShape *shape, cpVect offset)
+{
+	cpAssertHard(shape->klass == &cpCircleShapeClass, "Shape is not a circle shape.");
+	cpCircleShape *circle = (cpCircleShape *)shape;
+	
+	circle->c = offset;
+
+	cpFloat mass = shape->massInfo.m;
+	shape->massInfo = cpCircleShapeMassInfo(shape->massInfo.m, circle->r, circle->c);
+	if(mass > 0.0f) cpBodyAccumulateMassFromShapes(shape->body);
+}
+
+void
+cpSegmentShapeSetEndpoints(cpShape *shape, cpVect a, cpVect b)
+{
+	cpAssertHard(shape->klass == &cpSegmentShapeClass, "Shape is not a segment shape.");
+	cpSegmentShape *seg = (cpSegmentShape *)shape;
+	
+	seg->a = a;
+	seg->b = b;
+	seg->n = cpvperp(cpvnormalize(cpvsub(b, a)));
+
+	cpFloat mass = shape->massInfo.m;
+	shape->massInfo = cpSegmentShapeMassInfo(shape->massInfo.m, seg->a, seg->b, seg->r);
+	if(mass > 0.0f) cpBodyAccumulateMassFromShapes(shape->body);
+}
+
+void
+cpSegmentShapeSetRadius(cpShape *shape, cpFloat radius)
+{
+	cpAssertHard(shape->klass == &cpSegmentShapeClass, "Shape is not a segment shape.");
+	cpSegmentShape *seg = (cpSegmentShape *)shape;
+	
+	seg->r = radius;
+
+	cpFloat mass = shape->massInfo.m;
+	shape->massInfo = cpSegmentShapeMassInfo(shape->massInfo.m, seg->a, seg->b, seg->r);
+	if(mass > 0.0f) cpBodyAccumulateMassFromShapes(shape->body);
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSimpleMotor.c b/dali-physics/third-party/chipmunk2d/src/cpSimpleMotor.c
new file mode 100644
index 0000000..6d83f80
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSimpleMotor.c
@@ -0,0 +1,123 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpSimpleMotor *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	// calculate moment of inertia coefficient.
+	joint->iSum = 1.0f/(a->i_inv + b->i_inv);
+}
+
+static void
+applyCachedImpulse(cpSimpleMotor *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpFloat j = joint->jAcc*dt_coef;
+	a->w -= j*a->i_inv;
+	b->w += j*b->i_inv;
+}
+
+static void
+applyImpulse(cpSimpleMotor *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	// compute relative rotational velocity
+	cpFloat wr = b->w - a->w + joint->rate;
+	
+	cpFloat jMax = joint->constraint.maxForce*dt;
+	
+	// compute normal impulse	
+	cpFloat j = -wr*joint->iSum;
+	cpFloat jOld = joint->jAcc;
+	joint->jAcc = cpfclamp(jOld + j, -jMax, jMax);
+	j = joint->jAcc - jOld;
+	
+	// apply impulse
+	a->w -= j*a->i_inv;
+	b->w += j*b->i_inv;
+}
+
+static cpFloat
+getImpulse(cpSimpleMotor *joint)
+{
+	return cpfabs(joint->jAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpSimpleMotor *
+cpSimpleMotorAlloc(void)
+{
+	return (cpSimpleMotor *)cpcalloc(1, sizeof(cpSimpleMotor));
+}
+
+cpSimpleMotor *
+cpSimpleMotorInit(cpSimpleMotor *joint, cpBody *a, cpBody *b, cpFloat rate)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->rate = rate;
+	
+	joint->jAcc = 0.0f;
+	
+	return joint;
+}
+
+cpConstraint *
+cpSimpleMotorNew(cpBody *a, cpBody *b, cpFloat rate)
+{
+	return (cpConstraint *)cpSimpleMotorInit(cpSimpleMotorAlloc(), a, b, rate);
+}
+
+cpBool
+cpConstraintIsSimpleMotor(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpFloat
+cpSimpleMotorGetRate(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsSimpleMotor(constraint), "Constraint is not a pin joint.");
+	return ((cpSimpleMotor *)constraint)->rate;
+}
+
+void
+cpSimpleMotorSetRate(cpConstraint *constraint, cpFloat rate)
+{
+	cpAssertHard(cpConstraintIsSimpleMotor(constraint), "Constraint is not a pin joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpSimpleMotor *)constraint)->rate = rate;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSlideJoint.c b/dali-physics/third-party/chipmunk2d/src/cpSlideJoint.c
new file mode 100644
index 0000000..61afe33
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSlideJoint.c
@@ -0,0 +1,195 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static void
+preStep(cpSlideJoint *joint, cpFloat dt)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	joint->r1 = cpTransformVect(a->transform, cpvsub(joint->anchorA, a->cog));
+	joint->r2 = cpTransformVect(b->transform, cpvsub(joint->anchorB, b->cog));
+	
+	cpVect delta = cpvsub(cpvadd(b->p, joint->r2), cpvadd(a->p, joint->r1));
+	cpFloat dist = cpvlength(delta);
+	cpFloat pdist = 0.0f;
+	if(dist > joint->max) {
+		pdist = dist - joint->max;
+		joint->n = cpvnormalize(delta);
+	} else if(dist < joint->min) {
+		pdist = joint->min - dist;
+		joint->n = cpvneg(cpvnormalize(delta));
+	} else {
+		joint->n = cpvzero;
+		joint->jnAcc = 0.0f;
+	}
+	
+	// calculate mass normal
+	joint->nMass = 1.0f/k_scalar(a, b, joint->r1, joint->r2, joint->n);
+	
+	// calculate bias velocity
+	cpFloat maxBias = joint->constraint.maxBias;
+	joint->bias = cpfclamp(-bias_coef(joint->constraint.errorBias, dt)*pdist/dt, -maxBias, maxBias);
+}
+
+static void
+applyCachedImpulse(cpSlideJoint *joint, cpFloat dt_coef)
+{
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpVect j = cpvmult(joint->n, joint->jnAcc*dt_coef);
+	apply_impulses(a, b, joint->r1, joint->r2, j);
+}
+
+static void
+applyImpulse(cpSlideJoint *joint, cpFloat dt)
+{
+	if(cpveql(joint->n, cpvzero)) return;  // early exit
+
+	cpBody *a = joint->constraint.a;
+	cpBody *b = joint->constraint.b;
+	
+	cpVect n = joint->n;
+	cpVect r1 = joint->r1;
+	cpVect r2 = joint->r2;
+		
+	// compute relative velocity
+	cpVect vr = relative_velocity(a, b, r1, r2);
+	cpFloat vrn = cpvdot(vr, n);
+	
+	// compute normal impulse
+	cpFloat jn = (joint->bias - vrn)*joint->nMass;
+	cpFloat jnOld = joint->jnAcc;
+	joint->jnAcc = cpfclamp(jnOld + jn, -joint->constraint.maxForce*dt, 0.0f);
+	jn = joint->jnAcc - jnOld;
+	
+	// apply impulse
+	apply_impulses(a, b, joint->r1, joint->r2, cpvmult(n, jn));
+}
+
+static cpFloat
+getImpulse(cpConstraint *joint)
+{
+	return cpfabs(((cpSlideJoint *)joint)->jnAcc);
+}
+
+static const cpConstraintClass klass = {
+	(cpConstraintPreStepImpl)preStep,
+	(cpConstraintApplyCachedImpulseImpl)applyCachedImpulse,
+	(cpConstraintApplyImpulseImpl)applyImpulse,
+	(cpConstraintGetImpulseImpl)getImpulse,
+};
+
+cpSlideJoint *
+cpSlideJointAlloc(void)
+{
+	return (cpSlideJoint *)cpcalloc(1, sizeof(cpSlideJoint));
+}
+
+cpSlideJoint *
+cpSlideJointInit(cpSlideJoint *joint, cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat min, cpFloat max)
+{
+	cpConstraintInit((cpConstraint *)joint, &klass, a, b);
+	
+	joint->anchorA = anchorA;
+	joint->anchorB = anchorB;
+	joint->min = min;
+	joint->max = max;
+	
+	joint->jnAcc = 0.0f;
+	
+	return joint;
+}
+
+cpConstraint *
+cpSlideJointNew(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat min, cpFloat max)
+{
+	return (cpConstraint *)cpSlideJointInit(cpSlideJointAlloc(), a, b, anchorA, anchorB, min, max);
+}
+
+cpBool
+cpConstraintIsSlideJoint(const cpConstraint *constraint)
+{
+	return (constraint->klass == &klass);
+}
+
+cpVect
+cpSlideJointGetAnchorA(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	return ((cpSlideJoint *)constraint)->anchorA;
+}
+
+void
+cpSlideJointSetAnchorA(cpConstraint *constraint, cpVect anchorA)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpSlideJoint *)constraint)->anchorA = anchorA;
+}
+
+cpVect
+cpSlideJointGetAnchorB(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	return ((cpSlideJoint *)constraint)->anchorB;
+}
+
+void
+cpSlideJointSetAnchorB(cpConstraint *constraint, cpVect anchorB)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpSlideJoint *)constraint)->anchorB = anchorB;
+}
+
+cpFloat
+cpSlideJointGetMin(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	return ((cpSlideJoint *)constraint)->min;
+}
+
+void
+cpSlideJointSetMin(cpConstraint *constraint, cpFloat min)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpSlideJoint *)constraint)->min = min;
+}
+
+cpFloat
+cpSlideJointGetMax(const cpConstraint *constraint)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	return ((cpSlideJoint *)constraint)->max;
+}
+
+void
+cpSlideJointSetMax(cpConstraint *constraint, cpFloat max)
+{
+	cpAssertHard(cpConstraintIsSlideJoint(constraint), "Constraint is not a slide joint.");
+	cpConstraintActivateBodies(constraint);
+	((cpSlideJoint *)constraint)->max = max;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSpace.c b/dali-physics/third-party/chipmunk2d/src/cpSpace.c
new file mode 100644
index 0000000..079752d
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSpace.c
@@ -0,0 +1,700 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "chipmunk/chipmunk_private.h"
+
+//MARK: Contact Set Helpers
+
+// Equal function for arbiterSet.
+static cpBool
+arbiterSetEql(cpShape **shapes, cpArbiter *arb)
+{
+	cpShape *a = shapes[0];
+	cpShape *b = shapes[1];
+	
+	return ((a == arb->a && b == arb->b) || (b == arb->a && a == arb->b));
+}
+
+//MARK: Collision Handler Set HelperFunctions
+
+// Equals function for collisionHandlers.
+static cpBool
+handlerSetEql(cpCollisionHandler *check, cpCollisionHandler *pair)
+{
+	return (
+		(check->typeA == pair->typeA && check->typeB == pair->typeB) ||
+		(check->typeB == pair->typeA && check->typeA == pair->typeB)
+	);
+}
+
+// Transformation function for collisionHandlers.
+static void *
+handlerSetTrans(cpCollisionHandler *handler, void *unused)
+{
+	cpCollisionHandler *copy = (cpCollisionHandler *)cpcalloc(1, sizeof(cpCollisionHandler));
+	memcpy(copy, handler, sizeof(cpCollisionHandler));
+	
+	return copy;
+}
+
+//MARK: Misc Helper Funcs
+
+// Default collision functions.
+
+static cpBool
+DefaultBegin(cpArbiter *arb, cpSpace *space, void *data){
+	cpBool retA = cpArbiterCallWildcardBeginA(arb, space);
+	cpBool retB = cpArbiterCallWildcardBeginB(arb, space);
+	return retA && retB;
+}
+
+static cpBool
+DefaultPreSolve(cpArbiter *arb, cpSpace *space, void *data){
+	cpBool retA = cpArbiterCallWildcardPreSolveA(arb, space);
+	cpBool retB = cpArbiterCallWildcardPreSolveB(arb, space);
+	return retA && retB;
+}
+
+static void
+DefaultPostSolve(cpArbiter *arb, cpSpace *space, void *data){
+	cpArbiterCallWildcardPostSolveA(arb, space);
+	cpArbiterCallWildcardPostSolveB(arb, space);
+}
+
+static void
+DefaultSeparate(cpArbiter *arb, cpSpace *space, void *data){
+	cpArbiterCallWildcardSeparateA(arb, space);
+	cpArbiterCallWildcardSeparateB(arb, space);
+}
+
+// Use the wildcard identifier since  the default handler should never match any type pair.
+static cpCollisionHandler cpCollisionHandlerDefault = {
+	CP_WILDCARD_COLLISION_TYPE, CP_WILDCARD_COLLISION_TYPE,
+	DefaultBegin, DefaultPreSolve, DefaultPostSolve, DefaultSeparate, NULL
+};
+
+static cpBool AlwaysCollide(cpArbiter *arb, cpSpace *space, void *data){return cpTrue;}
+static void DoNothing(cpArbiter *arb, cpSpace *space, void *data){}
+
+cpCollisionHandler cpCollisionHandlerDoNothing = {
+	CP_WILDCARD_COLLISION_TYPE, CP_WILDCARD_COLLISION_TYPE,
+	AlwaysCollide, AlwaysCollide, DoNothing, DoNothing, NULL
+};
+
+// function to get the estimated velocity of a shape for the cpBBTree.
+static cpVect ShapeVelocityFunc(cpShape *shape){return shape->body->v;}
+
+// Used for disposing of collision handlers.
+static void FreeWrap(void *ptr, void *unused){cpfree(ptr);}
+
+//MARK: Memory Management Functions
+
+cpSpace *
+cpSpaceAlloc(void)
+{
+	return (cpSpace *)cpcalloc(1, sizeof(cpSpace));
+}
+
+cpSpace*
+cpSpaceInit(cpSpace *space)
+{
+#ifndef NDEBUG
+	static cpBool done = cpFalse;
+	if(!done){
+		printf("Initializing cpSpace - Chipmunk v%s (Debug Enabled)\n", cpVersionString);
+		printf("Compile with -DNDEBUG defined to disable debug mode and runtime assertion checks\n");
+		done = cpTrue;
+	}
+#endif
+
+	space->iterations = 10;
+	
+	space->gravity = cpvzero;
+	space->damping = 1.0f;
+	
+	space->collisionSlop = 0.1f;
+	space->collisionBias = cpfpow(1.0f - 0.1f, 60.0f);
+	space->collisionPersistence = 3;
+	
+	space->locked = 0;
+	space->stamp = 0;
+	
+	space->shapeIDCounter = 0;
+	space->staticShapes = cpBBTreeNew((cpSpatialIndexBBFunc)cpShapeGetBB, NULL);
+	space->dynamicShapes = cpBBTreeNew((cpSpatialIndexBBFunc)cpShapeGetBB, space->staticShapes);
+	cpBBTreeSetVelocityFunc(space->dynamicShapes, (cpBBTreeVelocityFunc)ShapeVelocityFunc);
+	
+	space->allocatedBuffers = cpArrayNew(0);
+	
+	space->dynamicBodies = cpArrayNew(0);
+	space->staticBodies = cpArrayNew(0);
+	space->sleepingComponents = cpArrayNew(0);
+	space->rousedBodies = cpArrayNew(0);
+	
+	space->sleepTimeThreshold = INFINITY;
+	space->idleSpeedThreshold = 0.0f;
+	
+	space->arbiters = cpArrayNew(0);
+	space->pooledArbiters = cpArrayNew(0);
+	
+	space->contactBuffersHead = NULL;
+	space->cachedArbiters = cpHashSetNew(0, (cpHashSetEqlFunc)arbiterSetEql);
+	
+	space->constraints = cpArrayNew(0);
+	
+	space->usesWildcards = cpFalse;
+	memcpy(&space->defaultHandler, &cpCollisionHandlerDoNothing, sizeof(cpCollisionHandler));
+	space->collisionHandlers = cpHashSetNew(0, (cpHashSetEqlFunc)handlerSetEql);
+	
+	space->postStepCallbacks = cpArrayNew(0);
+	space->skipPostStep = cpFalse;
+	
+	cpBody *staticBody = cpBodyInit(&space->_staticBody, 0.0f, 0.0f);
+	cpBodySetType(staticBody, CP_BODY_TYPE_STATIC);
+	cpSpaceSetStaticBody(space, staticBody);
+	
+	return space;
+}
+
+cpSpace*
+cpSpaceNew(void)
+{
+	return cpSpaceInit(cpSpaceAlloc());
+}
+
+static void cpBodyActivateWrap(cpBody *body, void *unused){cpBodyActivate(body);}
+
+void
+cpSpaceDestroy(cpSpace *space)
+{
+	cpSpaceEachBody(space, (cpSpaceBodyIteratorFunc)cpBodyActivateWrap, NULL);
+	
+	cpSpatialIndexFree(space->staticShapes);
+	cpSpatialIndexFree(space->dynamicShapes);
+	
+	cpArrayFree(space->dynamicBodies);
+	cpArrayFree(space->staticBodies);
+	cpArrayFree(space->sleepingComponents);
+	cpArrayFree(space->rousedBodies);
+	
+	cpArrayFree(space->constraints);
+	
+	cpHashSetFree(space->cachedArbiters);
+	
+	cpArrayFree(space->arbiters);
+	cpArrayFree(space->pooledArbiters);
+	
+	if(space->allocatedBuffers){
+		cpArrayFreeEach(space->allocatedBuffers, cpfree);
+		cpArrayFree(space->allocatedBuffers);
+	}
+	
+	if(space->postStepCallbacks){
+		cpArrayFreeEach(space->postStepCallbacks, cpfree);
+		cpArrayFree(space->postStepCallbacks);
+	}
+	
+	if(space->collisionHandlers) cpHashSetEach(space->collisionHandlers, FreeWrap, NULL);
+	cpHashSetFree(space->collisionHandlers);
+}
+
+void
+cpSpaceFree(cpSpace *space)
+{
+	if(space){
+		cpSpaceDestroy(space);
+		cpfree(space);
+	}
+}
+
+
+//MARK: Basic properties:
+
+int
+cpSpaceGetIterations(const cpSpace *space)
+{
+	return space->iterations;
+}
+
+void
+cpSpaceSetIterations(cpSpace *space, int iterations)
+{
+	cpAssertHard(iterations > 0, "Iterations must be positive and non-zero.");
+	space->iterations = iterations;
+}
+
+cpVect
+cpSpaceGetGravity(const cpSpace *space)
+{
+	return space->gravity;
+}
+
+void
+cpSpaceSetGravity(cpSpace *space, cpVect gravity)
+{
+	space->gravity = gravity;
+	
+	// Wake up all of the bodies since the gravity changed.
+	cpArray *components = space->sleepingComponents;
+	for(int i=0; i<components->num; i++){
+		cpBodyActivate((cpBody *)components->arr[i]);
+	}
+}
+
+cpFloat
+cpSpaceGetDamping(const cpSpace *space)
+{
+	return space->damping;
+}
+
+void
+cpSpaceSetDamping(cpSpace *space, cpFloat damping)
+{
+	cpAssertHard(damping >= 0.0, "Damping must be positive.");
+	space->damping = damping;
+}
+
+cpFloat
+cpSpaceGetIdleSpeedThreshold(const cpSpace *space)
+{
+	return space->idleSpeedThreshold;
+}
+
+void
+cpSpaceSetIdleSpeedThreshold(cpSpace *space, cpFloat idleSpeedThreshold)
+{
+	space->idleSpeedThreshold = idleSpeedThreshold;
+}
+
+cpFloat
+cpSpaceGetSleepTimeThreshold(const cpSpace *space)
+{
+	return space->sleepTimeThreshold;
+}
+
+void
+cpSpaceSetSleepTimeThreshold(cpSpace *space, cpFloat sleepTimeThreshold)
+{
+	space->sleepTimeThreshold = sleepTimeThreshold;
+}
+
+cpFloat
+cpSpaceGetCollisionSlop(const cpSpace *space)
+{
+	return space->collisionSlop;
+}
+
+void
+cpSpaceSetCollisionSlop(cpSpace *space, cpFloat collisionSlop)
+{
+	space->collisionSlop = collisionSlop;
+}
+
+cpFloat
+cpSpaceGetCollisionBias(const cpSpace *space)
+{
+	return space->collisionBias;
+}
+
+void
+cpSpaceSetCollisionBias(cpSpace *space, cpFloat collisionBias)
+{
+	space->collisionBias = collisionBias;
+}
+
+cpTimestamp
+cpSpaceGetCollisionPersistence(const cpSpace *space)
+{
+	return space->collisionPersistence;
+}
+
+void
+cpSpaceSetCollisionPersistence(cpSpace *space, cpTimestamp collisionPersistence)
+{
+	space->collisionPersistence = collisionPersistence;
+}
+
+cpDataPointer
+cpSpaceGetUserData(const cpSpace *space)
+{
+	return space->userData;
+}
+
+void
+cpSpaceSetUserData(cpSpace *space, cpDataPointer userData)
+{
+	space->userData = userData;
+}
+
+cpBody *
+cpSpaceGetStaticBody(const cpSpace *space)
+{
+	return space->staticBody;
+}
+
+cpFloat
+cpSpaceGetCurrentTimeStep(const cpSpace *space)
+{
+	return space->curr_dt;
+}
+
+void
+cpSpaceSetStaticBody(cpSpace *space, cpBody *body)
+{
+	if(space->staticBody != NULL){
+		cpAssertHard(space->staticBody->shapeList == NULL, "Internal Error: Changing the designated static body while the old one still had shapes attached.");
+		space->staticBody->space = NULL;
+	}
+	
+	space->staticBody = body;
+	body->space = space;
+}
+
+cpBool
+cpSpaceIsLocked(cpSpace *space)
+{
+	return (space->locked > 0);
+}
+
+//MARK: Collision Handler Function Management
+
+static void
+cpSpaceUseWildcardDefaultHandler(cpSpace *space)
+{
+	// Spaces default to using the slightly faster "do nothing" default handler until wildcards are potentially needed.
+	if(!space->usesWildcards){
+		space->usesWildcards = cpTrue;
+		memcpy(&space->defaultHandler, &cpCollisionHandlerDefault, sizeof(cpCollisionHandler));
+	}
+}
+
+cpCollisionHandler *cpSpaceAddDefaultCollisionHandler(cpSpace *space)
+{
+	cpSpaceUseWildcardDefaultHandler(space);
+	return &space->defaultHandler;
+}
+
+cpCollisionHandler *cpSpaceAddCollisionHandler(cpSpace *space, cpCollisionType a, cpCollisionType b)
+{
+	cpHashValue hash = CP_HASH_PAIR(a, b);
+	cpCollisionHandler handler = {a, b, DefaultBegin, DefaultPreSolve, DefaultPostSolve, DefaultSeparate, NULL};
+	return (cpCollisionHandler*)cpHashSetInsert(space->collisionHandlers, hash, &handler, (cpHashSetTransFunc)handlerSetTrans, NULL);
+}
+
+cpCollisionHandler *
+cpSpaceAddWildcardHandler(cpSpace *space, cpCollisionType type)
+{
+	cpSpaceUseWildcardDefaultHandler(space);
+	
+	cpHashValue hash = CP_HASH_PAIR(type, CP_WILDCARD_COLLISION_TYPE);
+	cpCollisionHandler handler = {type, CP_WILDCARD_COLLISION_TYPE, AlwaysCollide, AlwaysCollide, DoNothing, DoNothing, NULL};
+	return (cpCollisionHandler*)cpHashSetInsert(space->collisionHandlers, hash, &handler, (cpHashSetTransFunc)handlerSetTrans, NULL);
+}
+
+
+//MARK: Body, Shape, and Joint Management
+cpShape *
+cpSpaceAddShape(cpSpace *space, cpShape *shape)
+{
+	cpBody *body = shape->body;
+	
+	cpAssertHard(shape->space != space, "You have already added this shape to this space. You must not add it a second time.");
+	cpAssertHard(!shape->space, "You have already added this shape to another space. You cannot add it to a second.");
+//	cpAssertHard(body->space == space, "The shape's body must be added to the space before the shape.");
+	cpAssertSpaceUnlocked(space);
+	
+	cpBool isStatic = (cpBodyGetType(body) == CP_BODY_TYPE_STATIC);
+	if(!isStatic) cpBodyActivate(body);
+	cpBodyAddShape(body, shape);
+	
+	shape->hashid = space->shapeIDCounter++;
+	cpShapeUpdate(shape, body->transform);
+	cpSpatialIndexInsert(isStatic ? space->staticShapes : space->dynamicShapes, shape, shape->hashid);
+	shape->space = space;
+		
+	return shape;
+}
+
+cpBody *
+cpSpaceAddBody(cpSpace *space, cpBody *body)
+{
+	cpAssertHard(body->space != space, "You have already added this body to this space. You must not add it a second time.");
+	cpAssertHard(!body->space, "You have already added this body to another space. You cannot add it to a second.");
+	cpAssertSpaceUnlocked(space);
+	
+	cpArrayPush(cpSpaceArrayForBodyType(space, cpBodyGetType(body)), body);
+	body->space = space;
+	
+	return body;
+}
+
+cpConstraint *
+cpSpaceAddConstraint(cpSpace *space, cpConstraint *constraint)
+{
+	cpAssertHard(constraint->space != space, "You have already added this constraint to this space. You must not add it a second time.");
+	cpAssertHard(!constraint->space, "You have already added this constraint to another space. You cannot add it to a second.");
+	cpAssertSpaceUnlocked(space);
+	
+	cpBody *a = constraint->a, *b = constraint->b;
+	cpAssertHard(a != NULL && b != NULL, "Constraint is attached to a NULL body.");
+//	cpAssertHard(a->space == space && b->space == space, "The constraint's bodies must be added to the space before the constraint.");
+	
+	cpBodyActivate(a);
+	cpBodyActivate(b);
+	cpArrayPush(space->constraints, constraint);
+	
+	// Push onto the heads of the bodies' constraint lists
+	constraint->next_a = a->constraintList; a->constraintList = constraint;
+	constraint->next_b = b->constraintList; b->constraintList = constraint;
+	constraint->space = space;
+	
+	return constraint;
+}
+
+struct arbiterFilterContext {
+	cpSpace *space;
+	cpBody *body;
+	cpShape *shape;
+};
+
+static cpBool
+cachedArbitersFilter(cpArbiter *arb, struct arbiterFilterContext *context)
+{
+	cpShape *shape = context->shape;
+	cpBody *body = context->body;
+	
+	
+	// Match on the filter shape, or if it's NULL the filter body
+	if(
+		(body == arb->body_a && (shape == arb->a || shape == NULL)) ||
+		(body == arb->body_b && (shape == arb->b || shape == NULL))
+	){
+		// Call separate when removing shapes.
+		if(shape && arb->state != CP_ARBITER_STATE_CACHED){
+			// Invalidate the arbiter since one of the shapes was removed.
+			arb->state = CP_ARBITER_STATE_INVALIDATED;
+			
+			cpCollisionHandler *handler = arb->handler;
+			handler->separateFunc(arb, context->space, handler->userData);
+		}
+		
+		cpArbiterUnthread(arb);
+		cpArrayDeleteObj(context->space->arbiters, arb);
+		cpArrayPush(context->space->pooledArbiters, arb);
+		
+		return cpFalse;
+	}
+	
+	return cpTrue;
+}
+
+void
+cpSpaceFilterArbiters(cpSpace *space, cpBody *body, cpShape *filter)
+{
+	cpSpaceLock(space); {
+		struct arbiterFilterContext context = {space, body, filter};
+		cpHashSetFilter(space->cachedArbiters, (cpHashSetFilterFunc)cachedArbitersFilter, &context);
+	} cpSpaceUnlock(space, cpTrue);
+}
+
+void
+cpSpaceRemoveShape(cpSpace *space, cpShape *shape)
+{
+	cpBody *body = shape->body;
+	cpAssertHard(cpSpaceContainsShape(space, shape), "Cannot remove a shape that was not added to the space. (Removed twice maybe?)");
+	cpAssertSpaceUnlocked(space);
+	
+	cpBool isStatic = (cpBodyGetType(body) == CP_BODY_TYPE_STATIC);
+	if(isStatic){
+		cpBodyActivateStatic(body, shape);
+	} else {
+		cpBodyActivate(body);
+	}
+
+	cpBodyRemoveShape(body, shape);
+	cpSpaceFilterArbiters(space, body, shape);
+	cpSpatialIndexRemove(isStatic ? space->staticShapes : space->dynamicShapes, shape, shape->hashid);
+	shape->space = NULL;
+	shape->hashid = 0;
+}
+
+void
+cpSpaceRemoveBody(cpSpace *space, cpBody *body)
+{
+	cpAssertHard(body != cpSpaceGetStaticBody(space), "Cannot remove the designated static body for the space.");
+	cpAssertHard(cpSpaceContainsBody(space, body), "Cannot remove a body that was not added to the space. (Removed twice maybe?)");
+//	cpAssertHard(body->shapeList == NULL, "Cannot remove a body from the space before removing the bodies attached to it.");
+//	cpAssertHard(body->constraintList == NULL, "Cannot remove a body from the space before removing the constraints attached to it.");
+	cpAssertSpaceUnlocked(space);
+	
+	cpBodyActivate(body);
+//	cpSpaceFilterArbiters(space, body, NULL);
+	cpArrayDeleteObj(cpSpaceArrayForBodyType(space, cpBodyGetType(body)), body);
+	body->space = NULL;
+}
+
+void
+cpSpaceRemoveConstraint(cpSpace *space, cpConstraint *constraint)
+{
+	cpAssertHard(cpSpaceContainsConstraint(space, constraint), "Cannot remove a constraint that was not added to the space. (Removed twice maybe?)");
+	cpAssertSpaceUnlocked(space);
+	
+	cpBodyActivate(constraint->a);
+	cpBodyActivate(constraint->b);
+	cpArrayDeleteObj(space->constraints, constraint);
+	
+	cpBodyRemoveConstraint(constraint->a, constraint);
+	cpBodyRemoveConstraint(constraint->b, constraint);
+	constraint->space = NULL;
+}
+
+cpBool cpSpaceContainsShape(cpSpace *space, cpShape *shape)
+{
+	return (shape->space == space);
+}
+
+cpBool cpSpaceContainsBody(cpSpace *space, cpBody *body)
+{
+	return (body->space == space);
+}
+
+cpBool cpSpaceContainsConstraint(cpSpace *space, cpConstraint *constraint)
+{
+	return (constraint->space == space);
+}
+
+//MARK: Iteration
+
+void
+cpSpaceEachBody(cpSpace *space, cpSpaceBodyIteratorFunc func, void *data)
+{
+	cpSpaceLock(space); {
+		cpArray *bodies = space->dynamicBodies;
+		for(int i=0; i<bodies->num; i++){
+			func((cpBody *)bodies->arr[i], data);
+		}
+		
+		cpArray *otherBodies = space->staticBodies;
+		for(int i=0; i<otherBodies->num; i++){
+			func((cpBody *)otherBodies->arr[i], data);
+		}
+		
+		cpArray *components = space->sleepingComponents;
+		for(int i=0; i<components->num; i++){
+			cpBody *root = (cpBody *)components->arr[i];
+			
+			cpBody *body = root;
+			while(body){
+				cpBody *next = body->sleeping.next;
+				func(body, data);
+				body = next;
+			}
+		}
+	} cpSpaceUnlock(space, cpTrue);
+}
+
+typedef struct spaceShapeContext {
+	cpSpaceShapeIteratorFunc func;
+	void *data;
+} spaceShapeContext;
+
+static void
+spaceEachShapeIterator(cpShape *shape, spaceShapeContext *context)
+{
+	context->func(shape, context->data);
+}
+
+void
+cpSpaceEachShape(cpSpace *space, cpSpaceShapeIteratorFunc func, void *data)
+{
+	cpSpaceLock(space); {
+		spaceShapeContext context = {func, data};
+		cpSpatialIndexEach(space->dynamicShapes, (cpSpatialIndexIteratorFunc)spaceEachShapeIterator, &context);
+		cpSpatialIndexEach(space->staticShapes, (cpSpatialIndexIteratorFunc)spaceEachShapeIterator, &context);
+	} cpSpaceUnlock(space, cpTrue);
+}
+
+void
+cpSpaceEachConstraint(cpSpace *space, cpSpaceConstraintIteratorFunc func, void *data)
+{
+	cpSpaceLock(space); {
+		cpArray *constraints = space->constraints;
+		
+		for(int i=0; i<constraints->num; i++){
+			func((cpConstraint *)constraints->arr[i], data);
+		}
+	} cpSpaceUnlock(space, cpTrue);
+}
+
+//MARK: Spatial Index Management
+
+void 
+cpSpaceReindexStatic(cpSpace *space)
+{
+	cpAssertHard(!space->locked, "You cannot manually reindex objects while the space is locked. Wait until the current query or step is complete.");
+	
+	cpSpatialIndexEach(space->staticShapes, (cpSpatialIndexIteratorFunc)&cpShapeUpdateFunc, NULL);
+	cpSpatialIndexReindex(space->staticShapes);
+}
+
+void
+cpSpaceReindexShape(cpSpace *space, cpShape *shape)
+{
+	cpAssertHard(!space->locked, "You cannot manually reindex objects while the space is locked. Wait until the current query or step is complete.");
+	
+	cpShapeCacheBB(shape);
+	
+	// attempt to rehash the shape in both hashes
+	cpSpatialIndexReindexObject(space->dynamicShapes, shape, shape->hashid);
+	cpSpatialIndexReindexObject(space->staticShapes, shape, shape->hashid);
+}
+
+void
+cpSpaceReindexShapesForBody(cpSpace *space, cpBody *body)
+{
+	CP_BODY_FOREACH_SHAPE(body, shape) cpSpaceReindexShape(space, shape);
+}
+
+
+static void
+copyShapes(cpShape *shape, cpSpatialIndex *index)
+{
+	cpSpatialIndexInsert(index, shape, shape->hashid);
+}
+
+void
+cpSpaceUseSpatialHash(cpSpace *space, cpFloat dim, int count)
+{
+	cpSpatialIndex *staticShapes = cpSpaceHashNew(dim, count, (cpSpatialIndexBBFunc)cpShapeGetBB, NULL);
+	cpSpatialIndex *dynamicShapes = cpSpaceHashNew(dim, count, (cpSpatialIndexBBFunc)cpShapeGetBB, staticShapes);
+	
+	cpSpatialIndexEach(space->staticShapes, (cpSpatialIndexIteratorFunc)copyShapes, staticShapes);
+	cpSpatialIndexEach(space->dynamicShapes, (cpSpatialIndexIteratorFunc)copyShapes, dynamicShapes);
+	
+	cpSpatialIndexFree(space->staticShapes);
+	cpSpatialIndexFree(space->dynamicShapes);
+	
+	space->staticShapes = staticShapes;
+	space->dynamicShapes = dynamicShapes;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSpaceComponent.c b/dali-physics/third-party/chipmunk2d/src/cpSpaceComponent.c
new file mode 100644
index 0000000..7b2d606
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSpaceComponent.c
@@ -0,0 +1,349 @@
+/* Copyright (c) 2007 Scott Lembcke
+ * 
+ * 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.
+ */
+ 
+#include <string.h>
+
+#include "chipmunk/chipmunk_private.h"
+
+//MARK: Sleeping Functions
+
+void
+cpSpaceActivateBody(cpSpace *space, cpBody *body)
+{
+	cpAssertHard(cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC, "Internal error: Attempting to activate a non-dynamic body.");
+		
+	if(space->locked){
+		// cpSpaceActivateBody() is called again once the space is unlocked
+		if(!cpArrayContains(space->rousedBodies, body)) cpArrayPush(space->rousedBodies, body);
+	} else {
+		cpAssertSoft(body->sleeping.root == NULL && body->sleeping.next == NULL, "Internal error: Activating body non-NULL node pointers.");
+		cpArrayPush(space->dynamicBodies, body);
+
+		CP_BODY_FOREACH_SHAPE(body, shape){
+			cpSpatialIndexRemove(space->staticShapes, shape, shape->hashid);
+			cpSpatialIndexInsert(space->dynamicShapes, shape, shape->hashid);
+		}
+		
+		CP_BODY_FOREACH_ARBITER(body, arb){
+			cpBody *bodyA = arb->body_a;
+			
+			// Arbiters are shared between two bodies that are always woken up together.
+			// You only want to restore the arbiter once, so bodyA is arbitrarily chosen to own the arbiter.
+			// The edge case is when static bodies are involved as the static bodies never actually sleep.
+			// If the static body is bodyB then all is good. If the static body is bodyA, that can easily be checked.
+			if(body == bodyA || cpBodyGetType(bodyA) == CP_BODY_TYPE_STATIC){
+				int numContacts = arb->count;
+				struct cpContact *contacts = arb->contacts;
+				
+				// Restore contact values back to the space's contact buffer memory
+				arb->contacts = cpContactBufferGetArray(space);
+				memcpy(arb->contacts, contacts, numContacts*sizeof(struct cpContact));
+				cpSpacePushContacts(space, numContacts);
+				
+				// Reinsert the arbiter into the arbiter cache
+				const cpShape *a = arb->a, *b = arb->b;
+				const cpShape *shape_pair[] = {a, b};
+				cpHashValue arbHashID = CP_HASH_PAIR((cpHashValue)a, (cpHashValue)b);
+				cpHashSetInsert(space->cachedArbiters, arbHashID, shape_pair, NULL, arb);
+				
+				// Update the arbiter's state
+				arb->stamp = space->stamp;
+				cpArrayPush(space->arbiters, arb);
+				
+				cpfree(contacts);
+			}
+		}
+		
+		CP_BODY_FOREACH_CONSTRAINT(body, constraint){
+			cpBody *bodyA = constraint->a;
+			if(body == bodyA || cpBodyGetType(bodyA) == CP_BODY_TYPE_STATIC) cpArrayPush(space->constraints, constraint);
+		}
+	}
+}
+
+static void
+cpSpaceDeactivateBody(cpSpace *space, cpBody *body)
+{
+	cpAssertHard(cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC, "Internal error: Attempting to deactivate a non-dynamic body.");
+	
+	cpArrayDeleteObj(space->dynamicBodies, body);
+	
+	CP_BODY_FOREACH_SHAPE(body, shape){
+		cpSpatialIndexRemove(space->dynamicShapes, shape, shape->hashid);
+		cpSpatialIndexInsert(space->staticShapes, shape, shape->hashid);
+	}
+	
+	CP_BODY_FOREACH_ARBITER(body, arb){
+		cpBody *bodyA = arb->body_a;
+		if(body == bodyA || cpBodyGetType(bodyA) == CP_BODY_TYPE_STATIC){
+			cpSpaceUncacheArbiter(space, arb);
+			
+			// Save contact values to a new block of memory so they won't time out
+			size_t bytes = arb->count*sizeof(struct cpContact);
+			struct cpContact *contacts = (struct cpContact *)cpcalloc(1, bytes);
+			memcpy(contacts, arb->contacts, bytes);
+			arb->contacts = contacts;
+		}
+	}
+		
+	CP_BODY_FOREACH_CONSTRAINT(body, constraint){
+		cpBody *bodyA = constraint->a;
+		if(body == bodyA || cpBodyGetType(bodyA) == CP_BODY_TYPE_STATIC) cpArrayDeleteObj(space->constraints, constraint);
+	}
+}
+
+static inline cpBody *
+ComponentRoot(cpBody *body)
+{
+	return (body ? body->sleeping.root : NULL);
+}
+
+void
+cpBodyActivate(cpBody *body)
+{
+	if(body != NULL && cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC){
+		body->sleeping.idleTime = 0.0f;
+		
+		cpBody *root = ComponentRoot(body);
+		if(root && cpBodyIsSleeping(root)){
+			// TODO should cpBodyIsSleeping(root) be an assertion?
+			cpAssertSoft(cpBodyGetType(root) == CP_BODY_TYPE_DYNAMIC, "Internal Error: Non-dynamic body component root detected.");
+			
+			cpSpace *space = root->space;
+			cpBody *body = root;
+			while(body){
+				cpBody *next = body->sleeping.next;
+				
+				body->sleeping.idleTime = 0.0f;
+				body->sleeping.root = NULL;
+				body->sleeping.next = NULL;
+				cpSpaceActivateBody(space, body);
+				
+				body = next;
+			}
+			
+			cpArrayDeleteObj(space->sleepingComponents, root);
+		}
+		
+		CP_BODY_FOREACH_ARBITER(body, arb){
+			// Reset the idle timer of things the body is touching as well.
+			// That way things don't get left hanging in the air.
+			cpBody *other = (arb->body_a == body ? arb->body_b : arb->body_a);
+			if(cpBodyGetType(other) != CP_BODY_TYPE_STATIC) other->sleeping.idleTime = 0.0f;
+		}
+	}
+}
+
+void
+cpBodyActivateStatic(cpBody *body, cpShape *filter)
+{
+	cpAssertHard(cpBodyGetType(body) == CP_BODY_TYPE_STATIC, "cpBodyActivateStatic() called on a non-static body.");
+	
+	CP_BODY_FOREACH_ARBITER(body, arb){
+		if(!filter || filter == arb->a || filter == arb->b){
+			cpBodyActivate(arb->body_a == body ? arb->body_b : arb->body_a);
+		}
+	}
+	
+	// TODO: should also activate joints?
+}
+
+static inline void
+cpBodyPushArbiter(cpBody *body, cpArbiter *arb)
+{
+	cpAssertSoft(cpArbiterThreadForBody(arb, body)->next == NULL, "Internal Error: Dangling contact graph pointers detected. (A)");
+	cpAssertSoft(cpArbiterThreadForBody(arb, body)->prev == NULL, "Internal Error: Dangling contact graph pointers detected. (B)");
+	
+	cpArbiter *next = body->arbiterList;
+	cpAssertSoft(next == NULL || cpArbiterThreadForBody(next, body)->prev == NULL, "Internal Error: Dangling contact graph pointers detected. (C)");
+	cpArbiterThreadForBody(arb, body)->next = next;
+	
+	if(next) cpArbiterThreadForBody(next, body)->prev = arb;
+	body->arbiterList = arb;
+}
+
+static inline void
+ComponentAdd(cpBody *root, cpBody *body){
+	body->sleeping.root = root;
+
+	if(body != root){
+		body->sleeping.next = root->sleeping.next;
+		root->sleeping.next = body;
+	}
+}
+
+static inline void
+FloodFillComponent(cpBody *root, cpBody *body)
+{
+	// Kinematic bodies cannot be put to sleep and prevent bodies they are touching from sleeping.
+	// Static bodies are effectively sleeping all the time.
+	if(cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC){
+		cpBody *other_root = ComponentRoot(body);
+		if(other_root == NULL){
+			ComponentAdd(root, body);
+			CP_BODY_FOREACH_ARBITER(body, arb) FloodFillComponent(root, (body == arb->body_a ? arb->body_b : arb->body_a));
+			CP_BODY_FOREACH_CONSTRAINT(body, constraint) FloodFillComponent(root, (body == constraint->a ? constraint->b : constraint->a));
+		} else {
+			cpAssertSoft(other_root == root, "Internal Error: Inconsistency dectected in the contact graph.");
+		}
+	}
+}
+
+static inline cpBool
+ComponentActive(cpBody *root, cpFloat threshold)
+{
+	CP_BODY_FOREACH_COMPONENT(root, body){
+		if(body->sleeping.idleTime < threshold) return cpTrue;
+	}
+	
+	return cpFalse;
+}
+
+void
+cpSpaceProcessComponents(cpSpace *space, cpFloat dt)
+{
+	cpBool sleep = (space->sleepTimeThreshold != INFINITY);
+	cpArray *bodies = space->dynamicBodies;
+	
+#ifndef NDEBUG
+	for(int i=0; i<bodies->num; i++){
+		cpBody *body = (cpBody*)bodies->arr[i];
+		
+		cpAssertSoft(body->sleeping.next == NULL, "Internal Error: Dangling next pointer detected in contact graph.");
+		cpAssertSoft(body->sleeping.root == NULL, "Internal Error: Dangling root pointer detected in contact graph.");
+	}
+#endif
+	
+	// Calculate the kinetic energy of all the bodies.
+	if(sleep){
+		cpFloat dv = space->idleSpeedThreshold;
+		cpFloat dvsq = (dv ? dv*dv : cpvlengthsq(space->gravity)*dt*dt);
+		
+		// update idling and reset component nodes
+		for(int i=0; i<bodies->num; i++){
+			cpBody *body = (cpBody*)bodies->arr[i];
+			
+			// TODO should make a separate array for kinematic bodies.
+			if(cpBodyGetType(body) != CP_BODY_TYPE_DYNAMIC) continue;
+			
+			// Need to deal with infinite mass objects
+			cpFloat keThreshold = (dvsq ? body->m*dvsq : 0.0f);
+			body->sleeping.idleTime = (cpBodyKineticEnergy(body) > keThreshold ? 0.0f : body->sleeping.idleTime + dt);
+		}
+	}
+	
+	// Awaken any sleeping bodies found and then push arbiters to the bodies' lists.
+	cpArray *arbiters = space->arbiters;
+	for(int i=0, count=arbiters->num; i<count; i++){
+		cpArbiter *arb = (cpArbiter*)arbiters->arr[i];
+		cpBody *a = arb->body_a, *b = arb->body_b;
+		
+		if(sleep){
+			// TODO checking cpBodyIsSleepin() redundant?
+			if(cpBodyGetType(b) == CP_BODY_TYPE_KINEMATIC || cpBodyIsSleeping(a)) cpBodyActivate(a);
+			if(cpBodyGetType(a) == CP_BODY_TYPE_KINEMATIC || cpBodyIsSleeping(b)) cpBodyActivate(b);
+		}
+		
+		cpBodyPushArbiter(a, arb);
+		cpBodyPushArbiter(b, arb);
+	}
+	
+	if(sleep){
+		// Bodies should be held active if connected by a joint to a kinematic.
+		cpArray *constraints = space->constraints;
+		for(int i=0; i<constraints->num; i++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[i];
+			cpBody *a = constraint->a, *b = constraint->b;
+			
+			if(cpBodyGetType(b) == CP_BODY_TYPE_KINEMATIC) cpBodyActivate(a);
+			if(cpBodyGetType(a) == CP_BODY_TYPE_KINEMATIC) cpBodyActivate(b);
+		}
+		
+		// Generate components and deactivate sleeping ones
+		for(int i=0; i<bodies->num;){
+			cpBody *body = (cpBody*)bodies->arr[i];
+			
+			if(ComponentRoot(body) == NULL){
+				// Body not in a component yet. Perform a DFS to flood fill mark 
+				// the component in the contact graph using this body as the root.
+				FloodFillComponent(body, body);
+				
+				// Check if the component should be put to sleep.
+				if(!ComponentActive(body, space->sleepTimeThreshold)){
+					cpArrayPush(space->sleepingComponents, body);
+					CP_BODY_FOREACH_COMPONENT(body, other) cpSpaceDeactivateBody(space, other);
+					
+					// cpSpaceDeactivateBody() removed the current body from the list.
+					// Skip incrementing the index counter.
+					continue;
+				}
+			}
+			
+			i++;
+			
+			// Only sleeping bodies retain their component node pointers.
+			body->sleeping.root = NULL;
+			body->sleeping.next = NULL;
+		}
+	}
+}
+
+void
+cpBodySleep(cpBody *body)
+{
+	cpBodySleepWithGroup(body, NULL);
+}
+
+void
+cpBodySleepWithGroup(cpBody *body, cpBody *group){
+	cpAssertHard(cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC, "Non-dynamic bodies cannot be put to sleep.");
+	
+	cpSpace *space = body->space;
+	cpAssertHard(!cpSpaceIsLocked(space), "Bodies cannot be put to sleep during a query or a call to cpSpaceStep(). Put these calls into a post-step callback.");
+	cpAssertHard(cpSpaceGetSleepTimeThreshold(space) < INFINITY, "Sleeping is not enabled on the space. You cannot sleep a body without setting a sleep time threshold on the space.");
+	cpAssertHard(group == NULL || cpBodyIsSleeping(group), "Cannot use a non-sleeping body as a group identifier.");
+	
+	if(cpBodyIsSleeping(body)){
+		cpAssertHard(ComponentRoot(body) == ComponentRoot(group), "The body is already sleeping and it's group cannot be reassigned.");
+		return;
+	}
+	
+	CP_BODY_FOREACH_SHAPE(body, shape) cpShapeCacheBB(shape);
+	cpSpaceDeactivateBody(space, body);
+	
+	if(group){
+		cpBody *root = ComponentRoot(group);
+		
+		body->sleeping.root = root;
+		body->sleeping.next = root->sleeping.next;
+		body->sleeping.idleTime = 0.0f;
+		
+		root->sleeping.next = body;
+	} else {
+		body->sleeping.root = body;
+		body->sleeping.next = NULL;
+		body->sleeping.idleTime = 0.0f;
+		
+		cpArrayPush(space->sleepingComponents, body);
+	}
+	
+	cpArrayDeleteObj(space->dynamicBodies, body);
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSpaceDebug.c b/dali-physics/third-party/chipmunk2d/src/cpSpaceDebug.c
new file mode 100644
index 0000000..4711ac5
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSpaceDebug.c
@@ -0,0 +1,189 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+#ifndef CP_SPACE_DISABLE_DEBUG_API
+
+static void
+cpSpaceDebugDrawShape(cpShape *shape, cpSpaceDebugDrawOptions *options)
+{
+	cpBody *body = shape->body;
+	cpDataPointer data = options->data;
+	
+	cpSpaceDebugColor outline_color = options->shapeOutlineColor;
+	cpSpaceDebugColor fill_color = options->colorForShape(shape, data);
+	
+	switch(shape->klass->type){
+		case CP_CIRCLE_SHAPE: {
+			cpCircleShape *circle = (cpCircleShape *)shape;
+			options->drawCircle(circle->tc, body->a, circle->r, outline_color, fill_color, data);
+			break;
+		}
+		case CP_SEGMENT_SHAPE: {
+			cpSegmentShape *seg = (cpSegmentShape *)shape;
+			options->drawFatSegment(seg->ta, seg->tb, seg->r, outline_color, fill_color, data);
+			break;
+		}
+		case CP_POLY_SHAPE: {
+			cpPolyShape *poly = (cpPolyShape *)shape;
+			
+			int count = poly->count;
+			struct cpSplittingPlane *planes = poly->planes;
+			cpVect *verts = (cpVect *)alloca(count*sizeof(cpVect));
+			
+			for(int i=0; i<count; i++) verts[i] = planes[i].v0;
+			options->drawPolygon(count, verts, poly->r, outline_color, fill_color, data);
+			break;
+		}
+		default: break;
+	}
+}
+
+static const cpVect spring_verts[] = {
+	{0.00f, 0.0f},
+	{0.20f, 0.0f},
+	{0.25f, 3.0f},
+	{0.30f,-6.0f},
+	{0.35f, 6.0f},
+	{0.40f,-6.0f},
+	{0.45f, 6.0f},
+	{0.50f,-6.0f},
+	{0.55f, 6.0f},
+	{0.60f,-6.0f},
+	{0.65f, 6.0f},
+	{0.70f,-3.0f},
+	{0.75f, 6.0f},
+	{0.80f, 0.0f},
+	{1.00f, 0.0f},
+};
+static const int spring_count = sizeof(spring_verts)/sizeof(cpVect);
+
+static void
+cpSpaceDebugDrawConstraint(cpConstraint *constraint, cpSpaceDebugDrawOptions *options)
+{
+	cpDataPointer data = options->data;
+	cpSpaceDebugColor color = options->constraintColor;
+	
+	cpBody *body_a = constraint->a;
+	cpBody *body_b = constraint->b;
+
+	if(cpConstraintIsPinJoint(constraint)){
+		cpPinJoint *joint = (cpPinJoint *)constraint;
+		
+		cpVect a = cpTransformPoint(body_a->transform, joint->anchorA);
+		cpVect b = cpTransformPoint(body_b->transform, joint->anchorB);
+		
+		options->drawDot(5, a, color, data);
+		options->drawDot(5, b, color, data);
+		options->drawSegment(a, b, color, data);
+	} else if(cpConstraintIsSlideJoint(constraint)){
+		cpSlideJoint *joint = (cpSlideJoint *)constraint;
+	
+		cpVect a = cpTransformPoint(body_a->transform, joint->anchorA);
+		cpVect b = cpTransformPoint(body_b->transform, joint->anchorB);
+		
+		options->drawDot(5, a, color, data);
+		options->drawDot(5, b, color, data);
+		options->drawSegment(a, b, color, data);
+	} else if(cpConstraintIsPivotJoint(constraint)){
+		cpPivotJoint *joint = (cpPivotJoint *)constraint;
+	
+		cpVect a = cpTransformPoint(body_a->transform, joint->anchorA);
+		cpVect b = cpTransformPoint(body_b->transform, joint->anchorB);
+
+		options->drawDot(5, a, color, data);
+		options->drawDot(5, b, color, data);
+	} else if(cpConstraintIsGrooveJoint(constraint)){
+		cpGrooveJoint *joint = (cpGrooveJoint *)constraint;
+	
+		cpVect a = cpTransformPoint(body_a->transform, joint->grv_a);
+		cpVect b = cpTransformPoint(body_a->transform, joint->grv_b);
+		cpVect c = cpTransformPoint(body_b->transform, joint->anchorB);
+		
+		options->drawDot(5, c, color, data);
+		options->drawSegment(a, b, color, data);
+	} else if(cpConstraintIsDampedSpring(constraint)){
+		cpDampedSpring *spring = (cpDampedSpring *)constraint;
+		cpDataPointer data = options->data;
+		cpSpaceDebugColor color = options->constraintColor;
+		
+		cpVect a = cpTransformPoint(body_a->transform, spring->anchorA);
+		cpVect b = cpTransformPoint(body_b->transform, spring->anchorB);
+		
+		options->drawDot(5, a, color, data);
+		options->drawDot(5, b, color, data);
+
+		cpVect delta = cpvsub(b, a);
+		cpFloat cos = delta.x;
+		cpFloat sin = delta.y;
+		cpFloat s = 1.0f/cpvlength(delta);
+		
+		cpVect r1 = cpv(cos, -sin*s);
+		cpVect r2 = cpv(sin,  cos*s);
+		
+		cpVect *verts = (cpVect *)alloca(spring_count*sizeof(cpVect));
+		for(int i=0; i<spring_count; i++){
+			cpVect v = spring_verts[i];
+			verts[i] = cpv(cpvdot(v, r1) + a.x, cpvdot(v, r2) + a.y);
+		}
+		
+		for(int i=0; i<spring_count-1; i++){
+			options->drawSegment(verts[i], verts[i + 1], color, data);
+		}
+	}
+}
+
+void
+cpSpaceDebugDraw(cpSpace *space, cpSpaceDebugDrawOptions *options)
+{
+	if(options->flags & CP_SPACE_DEBUG_DRAW_SHAPES){
+		cpSpaceEachShape(space, (cpSpaceShapeIteratorFunc)cpSpaceDebugDrawShape, options);
+	}
+	
+	if(options->flags & CP_SPACE_DEBUG_DRAW_CONSTRAINTS){
+		cpSpaceEachConstraint(space, (cpSpaceConstraintIteratorFunc)cpSpaceDebugDrawConstraint, options);
+	}
+	
+	if(options->flags & CP_SPACE_DEBUG_DRAW_COLLISION_POINTS){
+		cpArray *arbiters = space->arbiters;
+		cpSpaceDebugColor color = options->collisionPointColor;
+		cpSpaceDebugDrawSegmentImpl draw_seg = options->drawSegment;
+		cpDataPointer data = options->data;
+		
+		for(int i=0; i<arbiters->num; i++){
+			cpArbiter *arb = (cpArbiter*)arbiters->arr[i];
+			cpVect n = arb->n;
+			
+			for(int j=0; j<arb->count; j++){
+				cpVect p1 = cpvadd(arb->body_a->p, arb->contacts[j].r1);
+				cpVect p2 = cpvadd(arb->body_b->p, arb->contacts[j].r2);
+				
+				cpFloat d = 2.0f;
+				cpVect a = cpvadd(p1, cpvmult(n, -d));
+				cpVect b = cpvadd(p2, cpvmult(n,  d));
+				draw_seg(a, b, color, data);
+			}
+		}
+	}
+}
+
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSpaceHash.c b/dali-physics/third-party/chipmunk2d/src/cpSpaceHash.c
new file mode 100644
index 0000000..656c3bd
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSpaceHash.c
@@ -0,0 +1,634 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+#include "prime.h"
+
+typedef struct cpSpaceHashBin cpSpaceHashBin;
+typedef struct cpHandle cpHandle;
+
+struct cpSpaceHash {
+	cpSpatialIndex spatialIndex;
+	
+	int numcells;
+	cpFloat celldim;
+	
+	cpSpaceHashBin **table;
+	cpHashSet *handleSet;
+	
+	cpSpaceHashBin *pooledBins;
+	cpArray *pooledHandles;
+	cpArray *allocatedBuffers;
+	
+	cpTimestamp stamp;
+};
+
+
+//MARK: Handle Functions
+
+struct cpHandle {
+	void *obj;
+	int retain;
+	cpTimestamp stamp;
+};
+
+static cpHandle*
+cpHandleInit(cpHandle *hand, void *obj)
+{
+	hand->obj = obj;
+	hand->retain = 0;
+	hand->stamp = 0;
+	
+	return hand;
+}
+
+static inline void cpHandleRetain(cpHandle *hand){hand->retain++;}
+
+static inline void
+cpHandleRelease(cpHandle *hand, cpArray *pooledHandles)
+{
+	hand->retain--;
+	if(hand->retain == 0) cpArrayPush(pooledHandles, hand);
+}
+
+static int handleSetEql(void *obj, cpHandle *hand){return (obj == hand->obj);}
+
+static void *
+handleSetTrans(void *obj, cpSpaceHash *hash)
+{
+	if(hash->pooledHandles->num == 0){
+		// handle pool is exhausted, make more
+		int count = CP_BUFFER_BYTES/sizeof(cpHandle);
+		cpAssertHard(count, "Internal Error: Buffer size is too small.");
+		
+		cpHandle *buffer = (cpHandle *)cpcalloc(1, CP_BUFFER_BYTES);
+		cpArrayPush(hash->allocatedBuffers, buffer);
+		
+		for(int i=0; i<count; i++) cpArrayPush(hash->pooledHandles, buffer + i);
+	}
+	
+	cpHandle *hand = cpHandleInit((cpHandle *)cpArrayPop(hash->pooledHandles), obj);
+	cpHandleRetain(hand);
+	
+	return hand;
+}
+
+//MARK: Bin Functions
+
+struct cpSpaceHashBin {
+	cpHandle *handle;
+	cpSpaceHashBin *next;
+};
+
+static inline void
+recycleBin(cpSpaceHash *hash, cpSpaceHashBin *bin)
+{
+	bin->next = hash->pooledBins;
+	hash->pooledBins = bin;
+}
+
+static inline void
+clearTableCell(cpSpaceHash *hash, int idx)
+{
+	cpSpaceHashBin *bin = hash->table[idx];
+	while(bin){
+		cpSpaceHashBin *next = bin->next;
+		
+		cpHandleRelease(bin->handle, hash->pooledHandles);
+		recycleBin(hash, bin);
+		
+		bin = next;
+	}
+	
+	hash->table[idx] = NULL;
+}
+
+static void
+clearTable(cpSpaceHash *hash)
+{
+	for(int i=0; i<hash->numcells; i++) clearTableCell(hash, i);
+}
+
+// Get a recycled or new bin.
+static inline cpSpaceHashBin *
+getEmptyBin(cpSpaceHash *hash)
+{
+	cpSpaceHashBin *bin = hash->pooledBins;
+	
+	if(bin){
+		hash->pooledBins = bin->next;
+		return bin;
+	} else {
+		// Pool is exhausted, make more
+		int count = CP_BUFFER_BYTES/sizeof(cpSpaceHashBin);
+		cpAssertHard(count, "Internal Error: Buffer size is too small.");
+		
+		cpSpaceHashBin *buffer = (cpSpaceHashBin *)cpcalloc(1, CP_BUFFER_BYTES);
+		cpArrayPush(hash->allocatedBuffers, buffer);
+		
+		// push all but the first one, return the first instead
+		for(int i=1; i<count; i++) recycleBin(hash, buffer + i);
+		return buffer;
+	}
+}
+
+//MARK: Memory Management Functions
+
+cpSpaceHash *
+cpSpaceHashAlloc(void)
+{
+	return (cpSpaceHash *)cpcalloc(1, sizeof(cpSpaceHash));
+}
+
+// Frees the old table, and allocate a new one.
+static void
+cpSpaceHashAllocTable(cpSpaceHash *hash, int numcells)
+{
+	cpfree(hash->table);
+	
+	hash->numcells = numcells;
+	hash->table = (cpSpaceHashBin **)cpcalloc(numcells, sizeof(cpSpaceHashBin *));
+}
+
+static inline cpSpatialIndexClass *Klass();
+
+cpSpatialIndex *
+cpSpaceHashInit(cpSpaceHash *hash, cpFloat celldim, int numcells, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex)
+{
+	cpSpatialIndexInit((cpSpatialIndex *)hash, Klass(), bbfunc, staticIndex);
+	
+	cpSpaceHashAllocTable(hash, next_prime(numcells));
+	hash->celldim = celldim;
+	
+	hash->handleSet = cpHashSetNew(0, (cpHashSetEqlFunc)handleSetEql);
+	
+	hash->pooledHandles = cpArrayNew(0);
+	
+	hash->pooledBins = NULL;
+	hash->allocatedBuffers = cpArrayNew(0);
+	
+	hash->stamp = 1;
+	
+	return (cpSpatialIndex *)hash;
+}
+
+cpSpatialIndex *
+cpSpaceHashNew(cpFloat celldim, int cells, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex)
+{
+	return cpSpaceHashInit(cpSpaceHashAlloc(), celldim, cells, bbfunc, staticIndex);
+}
+
+static void
+cpSpaceHashDestroy(cpSpaceHash *hash)
+{
+	if(hash->table) clearTable(hash);
+	cpfree(hash->table);
+	
+	cpHashSetFree(hash->handleSet);
+	
+	cpArrayFreeEach(hash->allocatedBuffers, cpfree);
+	cpArrayFree(hash->allocatedBuffers);
+	cpArrayFree(hash->pooledHandles);
+}
+
+//MARK: Helper Functions
+
+static inline cpBool
+containsHandle(cpSpaceHashBin *bin, cpHandle *hand)
+{
+	while(bin){
+		if(bin->handle == hand) return cpTrue;
+		bin = bin->next;
+	}
+	
+	return cpFalse;
+}
+
+// The hash function itself.
+static inline cpHashValue
+hash_func(cpHashValue x, cpHashValue y, cpHashValue n)
+{
+	return (x*1640531513ul ^ y*2654435789ul) % n;
+}
+
+// Much faster than (int)floor(f)
+// Profiling showed floor() to be a sizable performance hog
+static inline int
+floor_int(cpFloat f)
+{
+	int i = (int)f;
+	return (f < 0.0f && f != i ? i - 1 : i);
+}
+
+static inline void
+hashHandle(cpSpaceHash *hash, cpHandle *hand, cpBB bb)
+{
+	// Find the dimensions in cell coordinates.
+	cpFloat dim = hash->celldim;
+	int l = floor_int(bb.l/dim); // Fix by ShiftZ
+	int r = floor_int(bb.r/dim);
+	int b = floor_int(bb.b/dim);
+	int t = floor_int(bb.t/dim);
+	
+	int n = hash->numcells;
+	for(int i=l; i<=r; i++){
+		for(int j=b; j<=t; j++){
+			cpHashValue idx = hash_func(i,j,n);
+			cpSpaceHashBin *bin = hash->table[idx];
+			
+			// Don't add an object twice to the same cell.
+			if(containsHandle(bin, hand)) continue;
+
+			cpHandleRetain(hand);
+			// Insert a new bin for the handle in this cell.
+			cpSpaceHashBin *newBin = getEmptyBin(hash);
+			newBin->handle = hand;
+			newBin->next = bin;
+			hash->table[idx] = newBin;
+		}
+	}
+}
+
+//MARK: Basic Operations
+
+static void
+cpSpaceHashInsert(cpSpaceHash *hash, void *obj, cpHashValue hashid)
+{
+	cpHandle *hand = (cpHandle *)cpHashSetInsert(hash->handleSet, hashid, obj, (cpHashSetTransFunc)handleSetTrans, hash);
+	hashHandle(hash, hand, hash->spatialIndex.bbfunc(obj));
+}
+
+static void
+cpSpaceHashRehashObject(cpSpaceHash *hash, void *obj, cpHashValue hashid)
+{
+	cpHandle *hand = (cpHandle *)cpHashSetRemove(hash->handleSet, hashid, obj);
+	
+	if(hand){
+		hand->obj = NULL;
+		cpHandleRelease(hand, hash->pooledHandles);
+		
+		cpSpaceHashInsert(hash, obj, hashid);
+	}
+}
+
+static void
+rehash_helper(cpHandle *hand, cpSpaceHash *hash)
+{
+	hashHandle(hash, hand, hash->spatialIndex.bbfunc(hand->obj));
+}
+
+static void
+cpSpaceHashRehash(cpSpaceHash *hash)
+{
+	clearTable(hash);
+	cpHashSetEach(hash->handleSet, (cpHashSetIteratorFunc)rehash_helper, hash);
+}
+
+static void
+cpSpaceHashRemove(cpSpaceHash *hash, void *obj, cpHashValue hashid)
+{
+	cpHandle *hand = (cpHandle *)cpHashSetRemove(hash->handleSet, hashid, obj);
+	
+	if(hand){
+		hand->obj = NULL;
+		cpHandleRelease(hand, hash->pooledHandles);
+	}
+}
+
+typedef struct eachContext {
+	cpSpatialIndexIteratorFunc func;
+	void *data;
+} eachContext;
+
+static void eachHelper(cpHandle *hand, eachContext *context){context->func(hand->obj, context->data);}
+
+static void
+cpSpaceHashEach(cpSpaceHash *hash, cpSpatialIndexIteratorFunc func, void *data)
+{
+	eachContext context = {func, data};
+	cpHashSetEach(hash->handleSet, (cpHashSetIteratorFunc)eachHelper, &context);
+}
+
+static void
+remove_orphaned_handles(cpSpaceHash *hash, cpSpaceHashBin **bin_ptr)
+{
+	cpSpaceHashBin *bin = *bin_ptr;
+	while(bin){
+		cpHandle *hand = bin->handle;
+		cpSpaceHashBin *next = bin->next;
+		
+		if(!hand->obj){
+			// orphaned handle, unlink and recycle the bin
+			(*bin_ptr) = bin->next;
+			recycleBin(hash, bin);
+			
+			cpHandleRelease(hand, hash->pooledHandles);
+		} else {
+			bin_ptr = &bin->next;
+		}
+		
+		bin = next;
+	}
+}
+
+//MARK: Query Functions
+
+static inline void
+query_helper(cpSpaceHash *hash, cpSpaceHashBin **bin_ptr, void *obj, cpSpatialIndexQueryFunc func, void *data)
+{
+	restart:
+	for(cpSpaceHashBin *bin = *bin_ptr; bin; bin = bin->next){
+		cpHandle *hand = bin->handle;
+		void *other = hand->obj;
+		
+		if(hand->stamp == hash->stamp || obj == other){
+			continue;
+		} else if(other){
+			func(obj, other, 0, data);
+			hand->stamp = hash->stamp;
+		} else {
+			// The object for this handle has been removed
+			// cleanup this cell and restart the query
+			remove_orphaned_handles(hash, bin_ptr);
+			goto restart; // GCC not smart enough/able to tail call an inlined function.
+		}
+	}
+}
+
+static void
+cpSpaceHashQuery(cpSpaceHash *hash, void *obj, cpBB bb, cpSpatialIndexQueryFunc func, void *data)
+{
+	// Get the dimensions in cell coordinates.
+	cpFloat dim = hash->celldim;
+	int l = floor_int(bb.l/dim);  // Fix by ShiftZ
+	int r = floor_int(bb.r/dim);
+	int b = floor_int(bb.b/dim);
+	int t = floor_int(bb.t/dim);
+	
+	int n = hash->numcells;
+	cpSpaceHashBin **table = hash->table;
+	
+	// Iterate over the cells and query them.
+	for(int i=l; i<=r; i++){
+		for(int j=b; j<=t; j++){
+			query_helper(hash, &table[hash_func(i,j,n)], obj, func, data);
+		}
+	}
+	
+	hash->stamp++;
+}
+
+// Similar to struct eachPair above.
+typedef struct queryRehashContext {
+	cpSpaceHash *hash;
+	cpSpatialIndexQueryFunc func;
+	void *data;
+} queryRehashContext;
+
+// Hashset iterator func used with cpSpaceHashQueryRehash().
+static void
+queryRehash_helper(cpHandle *hand, queryRehashContext *context)
+{
+	cpSpaceHash *hash = context->hash;
+	cpSpatialIndexQueryFunc func = context->func;
+	void *data = context->data;
+
+	cpFloat dim = hash->celldim;
+	int n = hash->numcells;
+
+	void *obj = hand->obj;
+	cpBB bb = hash->spatialIndex.bbfunc(obj);
+
+	int l = floor_int(bb.l/dim);
+	int r = floor_int(bb.r/dim);
+	int b = floor_int(bb.b/dim);
+	int t = floor_int(bb.t/dim);
+	
+	cpSpaceHashBin **table = hash->table;
+
+	for(int i=l; i<=r; i++){
+		for(int j=b; j<=t; j++){
+			cpHashValue idx = hash_func(i,j,n);
+			cpSpaceHashBin *bin = table[idx];
+			
+			if(containsHandle(bin, hand)) continue;
+			
+			cpHandleRetain(hand); // this MUST be done first in case the object is removed in func()
+			query_helper(hash, &bin, obj, func, data);
+			
+			cpSpaceHashBin *newBin = getEmptyBin(hash);
+			newBin->handle = hand;
+			newBin->next = bin;
+			table[idx] = newBin;
+		}
+	}
+	
+	// Increment the stamp for each object hashed.
+	hash->stamp++;
+}
+
+static void
+cpSpaceHashReindexQuery(cpSpaceHash *hash, cpSpatialIndexQueryFunc func, void *data)
+{
+	clearTable(hash);
+	
+	queryRehashContext context = {hash, func, data};
+	cpHashSetEach(hash->handleSet, (cpHashSetIteratorFunc)queryRehash_helper, &context);
+	
+	cpSpatialIndexCollideStatic((cpSpatialIndex *)hash, hash->spatialIndex.staticIndex, func, data);
+}
+
+static inline cpFloat
+segmentQuery_helper(cpSpaceHash *hash, cpSpaceHashBin **bin_ptr, void *obj, cpSpatialIndexSegmentQueryFunc func, void *data)
+{
+	cpFloat t = 1.0f;
+	 
+	restart:
+	for(cpSpaceHashBin *bin = *bin_ptr; bin; bin = bin->next){
+		cpHandle *hand = bin->handle;
+		void *other = hand->obj;
+		
+		// Skip over certain conditions
+		if(hand->stamp == hash->stamp){
+			continue;
+		} else if(other){
+			t = cpfmin(t, func(obj, other, data));
+			hand->stamp = hash->stamp;
+		} else {
+			// The object for this handle has been removed
+			// cleanup this cell and restart the query
+			remove_orphaned_handles(hash, bin_ptr);
+			goto restart; // GCC not smart enough/able to tail call an inlined function.
+		}
+	}
+	
+	return t;
+}
+
+// modified from http://playtechs.blogspot.com/2007/03/raytracing-on-grid.html
+static void
+cpSpaceHashSegmentQuery(cpSpaceHash *hash, void *obj, cpVect a, cpVect b, cpFloat t_exit, cpSpatialIndexSegmentQueryFunc func, void *data)
+{
+	a = cpvmult(a, 1.0f/hash->celldim);
+	b = cpvmult(b, 1.0f/hash->celldim);
+	
+	int cell_x = floor_int(a.x), cell_y = floor_int(a.y);
+
+	cpFloat t = 0;
+
+	int x_inc, y_inc;
+	cpFloat temp_v, temp_h;
+
+	if (b.x > a.x){
+		x_inc = 1;
+		temp_h = (cpffloor(a.x + 1.0f) - a.x);
+	} else {
+		x_inc = -1;
+		temp_h = (a.x - cpffloor(a.x));
+	}
+
+	if (b.y > a.y){
+		y_inc = 1;
+		temp_v = (cpffloor(a.y + 1.0f) - a.y);
+	} else {
+		y_inc = -1;
+		temp_v = (a.y - cpffloor(a.y));
+	}
+	
+	// Division by zero is *very* slow on ARM
+	cpFloat dx = cpfabs(b.x - a.x), dy = cpfabs(b.y - a.y);
+	cpFloat dt_dx = (dx ? 1.0f/dx : INFINITY), dt_dy = (dy ? 1.0f/dy : INFINITY);
+	
+	// fix NANs in horizontal directions
+	cpFloat next_h = (temp_h ? temp_h*dt_dx : dt_dx);
+	cpFloat next_v = (temp_v ? temp_v*dt_dy : dt_dy);
+	
+	int n = hash->numcells;
+	cpSpaceHashBin **table = hash->table;
+
+	while(t < t_exit){
+		cpHashValue idx = hash_func(cell_x, cell_y, n);
+		t_exit = cpfmin(t_exit, segmentQuery_helper(hash, &table[idx], obj, func, data));
+
+		if (next_v < next_h){
+			cell_y += y_inc;
+			t = next_v;
+			next_v += dt_dy;
+		} else {
+			cell_x += x_inc;
+			t = next_h;
+			next_h += dt_dx;
+		}
+	}
+	
+	hash->stamp++;
+}
+
+//MARK: Misc
+
+void
+cpSpaceHashResize(cpSpaceHash *hash, cpFloat celldim, int numcells)
+{
+	if(hash->spatialIndex.klass != Klass()){
+		cpAssertWarn(cpFalse, "Ignoring cpSpaceHashResize() call to non-cpSpaceHash spatial index.");
+		return;
+	}
+	
+	clearTable(hash);
+	
+	hash->celldim = celldim;
+	cpSpaceHashAllocTable(hash, next_prime(numcells));
+}
+
+static int
+cpSpaceHashCount(cpSpaceHash *hash)
+{
+	return cpHashSetCount(hash->handleSet);
+}
+
+static int
+cpSpaceHashContains(cpSpaceHash *hash, void *obj, cpHashValue hashid)
+{
+	return cpHashSetFind(hash->handleSet, hashid, obj) != NULL;
+}
+
+static cpSpatialIndexClass klass = {
+	(cpSpatialIndexDestroyImpl)cpSpaceHashDestroy,
+	
+	(cpSpatialIndexCountImpl)cpSpaceHashCount,
+	(cpSpatialIndexEachImpl)cpSpaceHashEach,
+	(cpSpatialIndexContainsImpl)cpSpaceHashContains,
+	
+	(cpSpatialIndexInsertImpl)cpSpaceHashInsert,
+	(cpSpatialIndexRemoveImpl)cpSpaceHashRemove,
+	
+	(cpSpatialIndexReindexImpl)cpSpaceHashRehash,
+	(cpSpatialIndexReindexObjectImpl)cpSpaceHashRehashObject,
+	(cpSpatialIndexReindexQueryImpl)cpSpaceHashReindexQuery,
+	
+	(cpSpatialIndexQueryImpl)cpSpaceHashQuery,
+	(cpSpatialIndexSegmentQueryImpl)cpSpaceHashSegmentQuery,
+};
+
+static inline cpSpatialIndexClass *Klass(){return &klass;}
+
+//MARK: Debug Drawing
+
+//#define CP_BBTREE_DEBUG_DRAW
+#ifdef CP_BBTREE_DEBUG_DRAW
+#include "OpenGL/gl.h"
+#include "OpenGL/glu.h"
+#include <GLUT/glut.h>
+
+void
+cpSpaceHashRenderDebug(cpSpatialIndex *index)
+{
+	if(index->klass != &klass){
+		cpAssertWarn(cpFalse, "Ignoring cpSpaceHashRenderDebug() call to non-spatial hash spatial index.");
+		return;
+	}
+	
+	cpSpaceHash *hash = (cpSpaceHash *)index;
+	cpBB bb = cpBBNew(-320, -240, 320, 240);
+	
+	cpFloat dim = hash->celldim;
+	int n = hash->numcells;
+	
+	int l = (int)floor(bb.l/dim);
+	int r = (int)floor(bb.r/dim);
+	int b = (int)floor(bb.b/dim);
+	int t = (int)floor(bb.t/dim);
+	
+	for(int i=l; i<=r; i++){
+		for(int j=b; j<=t; j++){
+			int cell_count = 0;
+			
+			int index = hash_func(i,j,n);
+			for(cpSpaceHashBin *bin = hash->table[index]; bin; bin = bin->next)
+				cell_count++;
+			
+			GLfloat v = 1.0f - (GLfloat)cell_count/10.0f;
+			glColor3f(v,v,v);
+			glRectf(i*dim, j*dim, (i + 1)*dim, (j + 1)*dim);
+		}
+	}
+}
+#endif
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSpaceQuery.c b/dali-physics/third-party/chipmunk2d/src/cpSpaceQuery.c
new file mode 100644
index 0000000..1ce4a10
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSpaceQuery.c
@@ -0,0 +1,246 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+//MARK: Nearest Point Query Functions
+
+struct PointQueryContext {
+	cpVect point;
+	cpFloat maxDistance;
+	cpShapeFilter filter;
+	cpSpacePointQueryFunc func;
+};
+
+static cpCollisionID
+NearestPointQuery(struct PointQueryContext *context, cpShape *shape, cpCollisionID id, void *data)
+{
+	if(
+		!cpShapeFilterReject(shape->filter, context->filter)
+	){
+		cpPointQueryInfo info;
+		cpShapePointQuery(shape, context->point, &info);
+		
+		if(info.shape && info.distance < context->maxDistance) context->func(shape, info.point, info.distance, info.gradient, data);
+	}
+	
+	return id;
+}
+
+void
+cpSpacePointQuery(cpSpace *space, cpVect point, cpFloat maxDistance, cpShapeFilter filter, cpSpacePointQueryFunc func, void *data)
+{
+	struct PointQueryContext context = {point, maxDistance, filter, func};
+	cpBB bb = cpBBNewForCircle(point, cpfmax(maxDistance, 0.0f));
+	
+	cpSpaceLock(space); {
+		cpSpatialIndexQuery(space->dynamicShapes, &context, bb, (cpSpatialIndexQueryFunc)NearestPointQuery, data);
+		cpSpatialIndexQuery(space->staticShapes, &context, bb, (cpSpatialIndexQueryFunc)NearestPointQuery, data);
+	} cpSpaceUnlock(space, cpTrue);
+}
+
+static cpCollisionID
+NearestPointQueryNearest(struct PointQueryContext *context, cpShape *shape, cpCollisionID id, cpPointQueryInfo *out)
+{
+	if(
+		!cpShapeFilterReject(shape->filter, context->filter) && !shape->sensor
+	){
+		cpPointQueryInfo info;
+		cpShapePointQuery(shape, context->point, &info);
+		
+		if(info.distance < out->distance) (*out) = info;
+	}
+	
+	return id;
+}
+
+cpShape *
+cpSpacePointQueryNearest(cpSpace *space, cpVect point, cpFloat maxDistance, cpShapeFilter filter, cpPointQueryInfo *out)
+{
+	cpPointQueryInfo info = {NULL, cpvzero, maxDistance, cpvzero};
+	if(out){
+		(*out) = info;
+  } else {
+		out = &info;
+	}
+	
+	struct PointQueryContext context = {
+		point, maxDistance,
+		filter,
+		NULL
+	};
+	
+	cpBB bb = cpBBNewForCircle(point, cpfmax(maxDistance, 0.0f));
+	cpSpatialIndexQuery(space->dynamicShapes, &context, bb, (cpSpatialIndexQueryFunc)NearestPointQueryNearest, out);
+	cpSpatialIndexQuery(space->staticShapes, &context, bb, (cpSpatialIndexQueryFunc)NearestPointQueryNearest, out);
+	
+	return (cpShape *)out->shape;
+}
+
+
+//MARK: Segment Query Functions
+
+struct SegmentQueryContext {
+	cpVect start, end;
+	cpFloat radius;
+	cpShapeFilter filter;
+	cpSpaceSegmentQueryFunc func;
+};
+
+static cpFloat
+SegmentQuery(struct SegmentQueryContext *context, cpShape *shape, void *data)
+{
+	cpSegmentQueryInfo info;
+	
+	if(
+		!cpShapeFilterReject(shape->filter, context->filter) &&
+		cpShapeSegmentQuery(shape, context->start, context->end, context->radius, &info)
+	){
+		context->func(shape, info.point, info.normal, info.alpha, data);
+	}
+	
+	return 1.0f;
+}
+
+void
+cpSpaceSegmentQuery(cpSpace *space, cpVect start, cpVect end, cpFloat radius, cpShapeFilter filter, cpSpaceSegmentQueryFunc func, void *data)
+{
+	struct SegmentQueryContext context = {
+		start, end,
+		radius,
+		filter,
+		func,
+	};
+	
+	cpSpaceLock(space); {
+    cpSpatialIndexSegmentQuery(space->staticShapes, &context, start, end, 1.0f, (cpSpatialIndexSegmentQueryFunc)SegmentQuery, data);
+    cpSpatialIndexSegmentQuery(space->dynamicShapes, &context, start, end, 1.0f, (cpSpatialIndexSegmentQueryFunc)SegmentQuery, data);
+	} cpSpaceUnlock(space, cpTrue);
+}
+
+static cpFloat
+SegmentQueryFirst(struct SegmentQueryContext *context, cpShape *shape, cpSegmentQueryInfo *out)
+{
+	cpSegmentQueryInfo info;
+	
+	if(
+		!cpShapeFilterReject(shape->filter, context->filter) && !shape->sensor &&
+		cpShapeSegmentQuery(shape, context->start, context->end, context->radius, &info) &&
+		info.alpha < out->alpha
+	){
+		(*out) = info;
+	}
+	
+	return out->alpha;
+}
+
+cpShape *
+cpSpaceSegmentQueryFirst(cpSpace *space, cpVect start, cpVect end, cpFloat radius, cpShapeFilter filter, cpSegmentQueryInfo *out)
+{
+	cpSegmentQueryInfo info = {NULL, end, cpvzero, 1.0f};
+	if(out){
+		(*out) = info;
+  } else {
+		out = &info;
+	}
+	
+	struct SegmentQueryContext context = {
+		start, end,
+		radius,
+		filter,
+		NULL
+	};
+	
+	cpSpatialIndexSegmentQuery(space->staticShapes, &context, start, end, 1.0f, (cpSpatialIndexSegmentQueryFunc)SegmentQueryFirst, out);
+	cpSpatialIndexSegmentQuery(space->dynamicShapes, &context, start, end, out->alpha, (cpSpatialIndexSegmentQueryFunc)SegmentQueryFirst, out);
+	
+	return (cpShape *)out->shape;
+}
+
+//MARK: BB Query Functions
+
+struct BBQueryContext {
+	cpBB bb;
+	cpShapeFilter filter;
+	cpSpaceBBQueryFunc func;
+};
+
+static cpCollisionID
+BBQuery(struct BBQueryContext *context, cpShape *shape, cpCollisionID id, void *data)
+{
+	if(
+		!cpShapeFilterReject(shape->filter, context->filter) &&
+		cpBBIntersects(context->bb, shape->bb)
+	){
+		context->func(shape, data);
+	}
+	
+	return id;
+}
+
+void
+cpSpaceBBQuery(cpSpace *space, cpBB bb, cpShapeFilter filter, cpSpaceBBQueryFunc func, void *data)
+{
+	struct BBQueryContext context = {bb, filter, func};
+	
+	cpSpaceLock(space); {
+    cpSpatialIndexQuery(space->dynamicShapes, &context, bb, (cpSpatialIndexQueryFunc)BBQuery, data);
+    cpSpatialIndexQuery(space->staticShapes, &context, bb, (cpSpatialIndexQueryFunc)BBQuery, data);
+	} cpSpaceUnlock(space, cpTrue);
+}
+
+//MARK: Shape Query Functions
+
+struct ShapeQueryContext {
+	cpSpaceShapeQueryFunc func;
+	void *data;
+	cpBool anyCollision;
+};
+
+// Callback from the spatial hash.
+static cpCollisionID
+ShapeQuery(cpShape *a, cpShape *b, cpCollisionID id, struct ShapeQueryContext *context)
+{
+	if(cpShapeFilterReject(a->filter, b->filter) || a == b) return id;
+	
+	cpContactPointSet set = cpShapesCollide(a, b);
+	if(set.count){
+		if(context->func) context->func(b, &set, context->data);
+		context->anyCollision = !(a->sensor || b->sensor);
+	}
+	
+	return id;
+}
+
+cpBool
+cpSpaceShapeQuery(cpSpace *space, cpShape *shape, cpSpaceShapeQueryFunc func, void *data)
+{
+	cpBody *body = shape->body;
+	cpBB bb = (body ? cpShapeUpdate(shape, body->transform) : shape->bb);
+	struct ShapeQueryContext context = {func, data, cpFalse};
+	
+	cpSpaceLock(space); {
+    cpSpatialIndexQuery(space->dynamicShapes, shape, bb, (cpSpatialIndexQueryFunc)ShapeQuery, &context);
+    cpSpatialIndexQuery(space->staticShapes, shape, bb, (cpSpatialIndexQueryFunc)ShapeQuery, &context);
+	} cpSpaceUnlock(space, cpTrue);
+	
+	return context.anyCollision;
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSpaceStep.c b/dali-physics/third-party/chipmunk2d/src/cpSpaceStep.c
new file mode 100644
index 0000000..85cbb3d
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSpaceStep.c
@@ -0,0 +1,445 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+//MARK: Post Step Callback Functions
+
+cpPostStepCallback *
+cpSpaceGetPostStepCallback(cpSpace *space, void *key)
+{
+	cpArray *arr = space->postStepCallbacks;
+	for(int i=0; i<arr->num; i++){
+		cpPostStepCallback *callback = (cpPostStepCallback *)arr->arr[i];
+		if(callback && callback->key == key) return callback;
+	}
+	
+	return NULL;
+}
+
+static void PostStepDoNothing(cpSpace *space, void *obj, void *data){}
+
+cpBool
+cpSpaceAddPostStepCallback(cpSpace *space, cpPostStepFunc func, void *key, void *data)
+{
+	cpAssertWarn(space->locked,
+		"Adding a post-step callback when the space is not locked is unnecessary. "
+		"Post-step callbacks will not called until the end of the next call to cpSpaceStep() or the next query.");
+	
+	if(!cpSpaceGetPostStepCallback(space, key)){
+		cpPostStepCallback *callback = (cpPostStepCallback *)cpcalloc(1, sizeof(cpPostStepCallback));
+		callback->func = (func ? func : PostStepDoNothing);
+		callback->key = key;
+		callback->data = data;
+		
+		cpArrayPush(space->postStepCallbacks, callback);
+		return cpTrue;
+	} else {
+		return cpFalse;
+	}
+}
+
+//MARK: Locking Functions
+
+void
+cpSpaceLock(cpSpace *space)
+{
+	space->locked++;
+}
+
+void
+cpSpaceUnlock(cpSpace *space, cpBool runPostStep)
+{
+	space->locked--;
+	cpAssertHard(space->locked >= 0, "Internal Error: Space lock underflow.");
+	
+	if(space->locked == 0){
+		cpArray *waking = space->rousedBodies;
+		
+		for(int i=0, count=waking->num; i<count; i++){
+			cpSpaceActivateBody(space, (cpBody *)waking->arr[i]);
+			waking->arr[i] = NULL;
+		}
+		
+		waking->num = 0;
+		
+		if(space->locked == 0 && runPostStep && !space->skipPostStep){
+			space->skipPostStep = cpTrue;
+			
+			cpArray *arr = space->postStepCallbacks;
+			for(int i=0; i<arr->num; i++){
+				cpPostStepCallback *callback = (cpPostStepCallback *)arr->arr[i];
+				cpPostStepFunc func = callback->func;
+				
+				// Mark the func as NULL in case calling it calls cpSpaceRunPostStepCallbacks() again.
+				// TODO: need more tests around this case I think.
+				callback->func = NULL;
+				if(func) func(space, callback->key, callback->data);
+				
+				arr->arr[i] = NULL;
+				cpfree(callback);
+			}
+			
+			arr->num = 0;
+			space->skipPostStep = cpFalse;
+		}
+	}
+}
+
+//MARK: Contact Buffer Functions
+
+struct cpContactBufferHeader {
+	cpTimestamp stamp;
+	cpContactBufferHeader *next;
+	unsigned int numContacts;
+};
+
+#define CP_CONTACTS_BUFFER_SIZE ((CP_BUFFER_BYTES - sizeof(cpContactBufferHeader))/sizeof(struct cpContact))
+typedef struct cpContactBuffer {
+	cpContactBufferHeader header;
+	struct cpContact contacts[CP_CONTACTS_BUFFER_SIZE];
+} cpContactBuffer;
+
+static cpContactBufferHeader *
+cpSpaceAllocContactBuffer(cpSpace *space)
+{
+	cpContactBuffer *buffer = (cpContactBuffer *)cpcalloc(1, sizeof(cpContactBuffer));
+	cpArrayPush(space->allocatedBuffers, buffer);
+	return (cpContactBufferHeader *)buffer;
+}
+
+static cpContactBufferHeader *
+cpContactBufferHeaderInit(cpContactBufferHeader *header, cpTimestamp stamp, cpContactBufferHeader *splice)
+{
+	header->stamp = stamp;
+	header->next = (splice ? splice->next : header);
+	header->numContacts = 0;
+	
+	return header;
+}
+
+void
+cpSpacePushFreshContactBuffer(cpSpace *space)
+{
+	cpTimestamp stamp = space->stamp;
+	
+	cpContactBufferHeader *head = space->contactBuffersHead;
+	
+	if(!head){
+		// No buffers have been allocated, make one
+		space->contactBuffersHead = cpContactBufferHeaderInit(cpSpaceAllocContactBuffer(space), stamp, NULL);
+	} else if(stamp - head->next->stamp > space->collisionPersistence){
+		// The tail buffer is available, rotate the ring
+	cpContactBufferHeader *tail = head->next;
+		space->contactBuffersHead = cpContactBufferHeaderInit(tail, stamp, tail);
+	} else {
+		// Allocate a new buffer and push it into the ring
+		cpContactBufferHeader *buffer = cpContactBufferHeaderInit(cpSpaceAllocContactBuffer(space), stamp, head);
+		space->contactBuffersHead = head->next = buffer;
+	}
+}
+
+
+struct cpContact *
+cpContactBufferGetArray(cpSpace *space)
+{
+	if(space->contactBuffersHead->numContacts + CP_MAX_CONTACTS_PER_ARBITER > CP_CONTACTS_BUFFER_SIZE){
+		// contact buffer could overflow on the next collision, push a fresh one.
+		cpSpacePushFreshContactBuffer(space);
+	}
+	
+	cpContactBufferHeader *head = space->contactBuffersHead;
+	return ((cpContactBuffer *)head)->contacts + head->numContacts;
+}
+
+void
+cpSpacePushContacts(cpSpace *space, int count)
+{
+	cpAssertHard(count <= CP_MAX_CONTACTS_PER_ARBITER, "Internal Error: Contact buffer overflow!");
+	space->contactBuffersHead->numContacts += count;
+}
+
+static void
+cpSpacePopContacts(cpSpace *space, int count){
+	space->contactBuffersHead->numContacts -= count;
+}
+
+//MARK: Collision Detection Functions
+
+static void *
+cpSpaceArbiterSetTrans(cpShape **shapes, cpSpace *space)
+{
+	if(space->pooledArbiters->num == 0){
+		// arbiter pool is exhausted, make more
+		int count = CP_BUFFER_BYTES/sizeof(cpArbiter);
+		cpAssertHard(count, "Internal Error: Buffer size too small.");
+		
+		cpArbiter *buffer = (cpArbiter *)cpcalloc(1, CP_BUFFER_BYTES);
+		cpArrayPush(space->allocatedBuffers, buffer);
+		
+		for(int i=0; i<count; i++) cpArrayPush(space->pooledArbiters, buffer + i);
+	}
+	
+	return cpArbiterInit((cpArbiter *)cpArrayPop(space->pooledArbiters), shapes[0], shapes[1]);
+}
+
+static inline cpBool
+QueryRejectConstraint(cpBody *a, cpBody *b)
+{
+	CP_BODY_FOREACH_CONSTRAINT(a, constraint){
+		if(
+			!constraint->collideBodies && (
+				(constraint->a == a && constraint->b == b) ||
+				(constraint->a == b && constraint->b == a)
+			)
+		) return cpTrue;
+	}
+	
+	return cpFalse;
+}
+
+static inline cpBool
+QueryReject(cpShape *a, cpShape *b)
+{
+	return (
+		// BBoxes must overlap
+		!cpBBIntersects(a->bb, b->bb)
+		// Don't collide shapes attached to the same body.
+		|| a->body == b->body
+		// Don't collide shapes that are filtered.
+		|| cpShapeFilterReject(a->filter, b->filter)
+		// Don't collide bodies if they have a constraint with collideBodies == cpFalse.
+		|| QueryRejectConstraint(a->body, b->body)
+	);
+}
+
+// Callback from the spatial hash.
+cpCollisionID
+cpSpaceCollideShapes(cpShape *a, cpShape *b, cpCollisionID id, cpSpace *space)
+{
+	// Reject any of the simple cases
+	if(QueryReject(a,b)) return id;
+	
+	// Narrow-phase collision detection.
+	struct cpCollisionInfo info = cpCollide(a, b, id, cpContactBufferGetArray(space));
+	
+	if(info.count == 0) return info.id; // Shapes are not colliding.
+	cpSpacePushContacts(space, info.count);
+	
+	// Get an arbiter from space->arbiterSet for the two shapes.
+	// This is where the persistant contact magic comes from.
+	const cpShape *shape_pair[] = {info.a, info.b};
+	cpHashValue arbHashID = CP_HASH_PAIR((cpHashValue)info.a, (cpHashValue)info.b);
+	cpArbiter *arb = (cpArbiter *)cpHashSetInsert(space->cachedArbiters, arbHashID, shape_pair, (cpHashSetTransFunc)cpSpaceArbiterSetTrans, space);
+	cpArbiterUpdate(arb, &info, space);
+	
+	cpCollisionHandler *handler = arb->handler;
+	
+	// Call the begin function first if it's the first step
+	if(arb->state == CP_ARBITER_STATE_FIRST_COLLISION && !handler->beginFunc(arb, space, handler->userData)){
+		cpArbiterIgnore(arb); // permanently ignore the collision until separation
+	}
+	
+	if(
+		// Ignore the arbiter if it has been flagged
+		(arb->state != CP_ARBITER_STATE_IGNORE) && 
+		// Call preSolve
+		handler->preSolveFunc(arb, space, handler->userData) &&
+		// Check (again) in case the pre-solve() callback called cpArbiterIgnored().
+		arb->state != CP_ARBITER_STATE_IGNORE &&
+		// Process, but don't add collisions for sensors.
+		!(a->sensor || b->sensor) &&
+		// Don't process collisions between two infinite mass bodies.
+		// This includes collisions between two kinematic bodies, or a kinematic body and a static body.
+		!(a->body->m == INFINITY && b->body->m == INFINITY)
+	){
+		cpArrayPush(space->arbiters, arb);
+	} else {
+		cpSpacePopContacts(space, info.count);
+		
+		arb->contacts = NULL;
+		arb->count = 0;
+		
+		// Normally arbiters are set as used after calling the post-solve callback.
+		// However, post-solve() callbacks are not called for sensors or arbiters rejected from pre-solve.
+		if(arb->state != CP_ARBITER_STATE_IGNORE) arb->state = CP_ARBITER_STATE_NORMAL;
+	}
+	
+	// Time stamp the arbiter so we know it was used recently.
+	arb->stamp = space->stamp;
+	return info.id;
+}
+
+// Hashset filter func to throw away old arbiters.
+cpBool
+cpSpaceArbiterSetFilter(cpArbiter *arb, cpSpace *space)
+{
+	cpTimestamp ticks = space->stamp - arb->stamp;
+	
+	cpBody *a = arb->body_a, *b = arb->body_b;
+	
+	// TODO: should make an arbiter state for this so it doesn't require filtering arbiters for dangling body pointers on body removal.
+	// Preserve arbiters on sensors and rejected arbiters for sleeping objects.
+	// This prevents errant separate callbacks from happenening.
+	if(
+		(cpBodyGetType(a) == CP_BODY_TYPE_STATIC || cpBodyIsSleeping(a)) &&
+		(cpBodyGetType(b) == CP_BODY_TYPE_STATIC || cpBodyIsSleeping(b))
+	){
+		return cpTrue;
+	}
+	
+	// Arbiter was used last frame, but not this one
+	if(ticks >= 1 && arb->state != CP_ARBITER_STATE_CACHED){
+		arb->state = CP_ARBITER_STATE_CACHED;
+		cpCollisionHandler *handler = arb->handler;
+		handler->separateFunc(arb, space, handler->userData);
+	}
+	
+	if(ticks >= space->collisionPersistence){
+		arb->contacts = NULL;
+		arb->count = 0;
+		
+		cpArrayPush(space->pooledArbiters, arb);
+		return cpFalse;
+	}
+	
+	return cpTrue;
+}
+
+//MARK: All Important cpSpaceStep() Function
+
+ void
+cpShapeUpdateFunc(cpShape *shape, void *unused)
+{
+	cpShapeCacheBB(shape);
+}
+
+void
+cpSpaceStep(cpSpace *space, cpFloat dt)
+{
+	// don't step if the timestep is 0!
+	if(dt == 0.0f) return;
+	
+	space->stamp++;
+	
+	cpFloat prev_dt = space->curr_dt;
+	space->curr_dt = dt;
+		
+	cpArray *bodies = space->dynamicBodies;
+	cpArray *constraints = space->constraints;
+	cpArray *arbiters = space->arbiters;
+	
+	// Reset and empty the arbiter lists.
+	for(int i=0; i<arbiters->num; i++){
+		cpArbiter *arb = (cpArbiter *)arbiters->arr[i];
+		arb->state = CP_ARBITER_STATE_NORMAL;
+		
+		// If both bodies are awake, unthread the arbiter from the contact graph.
+		if(!cpBodyIsSleeping(arb->body_a) && !cpBodyIsSleeping(arb->body_b)){
+			cpArbiterUnthread(arb);
+		}
+	}
+	arbiters->num = 0;
+
+	cpSpaceLock(space); {
+		// Integrate positions
+		for(int i=0; i<bodies->num; i++){
+			cpBody *body = (cpBody *)bodies->arr[i];
+			body->position_func(body, dt);
+		}
+		
+		// Find colliding pairs.
+		cpSpacePushFreshContactBuffer(space);
+		cpSpatialIndexEach(space->dynamicShapes, (cpSpatialIndexIteratorFunc)cpShapeUpdateFunc, NULL);
+		cpSpatialIndexReindexQuery(space->dynamicShapes, (cpSpatialIndexQueryFunc)cpSpaceCollideShapes, space);
+	} cpSpaceUnlock(space, cpFalse);
+	
+	// Rebuild the contact graph (and detect sleeping components if sleeping is enabled)
+	cpSpaceProcessComponents(space, dt);
+	
+	cpSpaceLock(space); {
+		// Clear out old cached arbiters and call separate callbacks
+		cpHashSetFilter(space->cachedArbiters, (cpHashSetFilterFunc)cpSpaceArbiterSetFilter, space);
+
+		// Prestep the arbiters and constraints.
+		cpFloat slop = space->collisionSlop;
+		cpFloat biasCoef = 1.0f - cpfpow(space->collisionBias, dt);
+		for(int i=0; i<arbiters->num; i++){
+			cpArbiterPreStep((cpArbiter *)arbiters->arr[i], dt, slop, biasCoef);
+		}
+
+		for(int i=0; i<constraints->num; i++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[i];
+			
+			cpConstraintPreSolveFunc preSolve = constraint->preSolve;
+			if(preSolve) preSolve(constraint, space);
+			
+			constraint->klass->preStep(constraint, dt);
+		}
+	
+		// Integrate velocities.
+		cpFloat damping = cpfpow(space->damping, dt);
+		cpVect gravity = space->gravity;
+		for(int i=0; i<bodies->num; i++){
+			cpBody *body = (cpBody *)bodies->arr[i];
+			body->velocity_func(body, gravity, damping, dt);
+		}
+		
+		// Apply cached impulses
+		cpFloat dt_coef = (prev_dt == 0.0f ? 0.0f : dt/prev_dt);
+		for(int i=0; i<arbiters->num; i++){
+			cpArbiterApplyCachedImpulse((cpArbiter *)arbiters->arr[i], dt_coef);
+		}
+		
+		for(int i=0; i<constraints->num; i++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[i];
+			constraint->klass->applyCachedImpulse(constraint, dt_coef);
+		}
+		
+		// Run the impulse solver.
+		for(int i=0; i<space->iterations; i++){
+			for(int j=0; j<arbiters->num; j++){
+				cpArbiterApplyImpulse((cpArbiter *)arbiters->arr[j]);
+			}
+				
+			for(int j=0; j<constraints->num; j++){
+				cpConstraint *constraint = (cpConstraint *)constraints->arr[j];
+				constraint->klass->applyImpulse(constraint, dt);
+			}
+		}
+		
+		// Run the constraint post-solve callbacks
+		for(int i=0; i<constraints->num; i++){
+			cpConstraint *constraint = (cpConstraint *)constraints->arr[i];
+			
+			cpConstraintPostSolveFunc postSolve = constraint->postSolve;
+			if(postSolve) postSolve(constraint, space);
+		}
+		
+		// run the post-solve callbacks
+		for(int i=0; i<arbiters->num; i++){
+			cpArbiter *arb = (cpArbiter *) arbiters->arr[i];
+			
+			cpCollisionHandler *handler = arb->handler;
+			handler->postSolveFunc(arb, space, handler->userData);
+		}
+	} cpSpaceUnlock(space, cpTrue);
+}
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSpatialIndex.c b/dali-physics/third-party/chipmunk2d/src/cpSpatialIndex.c
new file mode 100644
index 0000000..3fb7cb5
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSpatialIndex.c
@@ -0,0 +1,69 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+void
+cpSpatialIndexFree(cpSpatialIndex *index)
+{
+	if(index){
+		cpSpatialIndexDestroy(index);
+		cpfree(index);
+	}
+}
+
+cpSpatialIndex *
+cpSpatialIndexInit(cpSpatialIndex *index, cpSpatialIndexClass *klass, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex)
+{
+	index->klass = klass;
+	index->bbfunc = bbfunc;
+	index->staticIndex = staticIndex;
+	
+	if(staticIndex){
+		cpAssertHard(!staticIndex->dynamicIndex, "This static index is already associated with a dynamic index.");
+		staticIndex->dynamicIndex = index;
+	}
+	
+	return index;
+}
+
+typedef struct dynamicToStaticContext {
+	cpSpatialIndexBBFunc bbfunc;
+	cpSpatialIndex *staticIndex;
+	cpSpatialIndexQueryFunc queryFunc;
+	void *data;
+} dynamicToStaticContext;
+
+static void
+dynamicToStaticIter(void *obj, dynamicToStaticContext *context)
+{
+	cpSpatialIndexQuery(context->staticIndex, obj, context->bbfunc(obj), context->queryFunc, context->data);
+}
+
+void
+cpSpatialIndexCollideStatic(cpSpatialIndex *dynamicIndex, cpSpatialIndex *staticIndex, cpSpatialIndexQueryFunc func, void *data)
+{
+	if(staticIndex && cpSpatialIndexCount(staticIndex) > 0){
+		dynamicToStaticContext context = {dynamicIndex->bbfunc, staticIndex, func, data};
+		cpSpatialIndexEach(dynamicIndex, (cpSpatialIndexIteratorFunc)dynamicToStaticIter, &context);
+	}
+}
+
diff --git a/dali-physics/third-party/chipmunk2d/src/cpSweep1D.c b/dali-physics/third-party/chipmunk2d/src/cpSweep1D.c
new file mode 100644
index 0000000..e200cf9
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/cpSweep1D.c
@@ -0,0 +1,254 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+#include "chipmunk/chipmunk_private.h"
+
+static inline cpSpatialIndexClass *Klass();
+
+//MARK: Basic Structures
+
+typedef struct Bounds {
+	cpFloat min, max;
+} Bounds;
+
+typedef struct TableCell {
+	void *obj;
+	Bounds bounds;
+} TableCell;
+
+struct cpSweep1D
+{
+	cpSpatialIndex spatialIndex;
+	
+	int num;
+	int max;
+	TableCell *table;
+};
+
+static inline cpBool
+BoundsOverlap(Bounds a, Bounds b)
+{
+	return (a.min <= b.max && b.min <= a.max);
+}
+
+static inline Bounds
+BBToBounds(cpSweep1D *sweep, cpBB bb)
+{
+	Bounds bounds = {bb.l, bb.r};
+	return bounds;
+}
+
+static inline TableCell
+MakeTableCell(cpSweep1D *sweep, void *obj)
+{
+	TableCell cell = {obj, BBToBounds(sweep, sweep->spatialIndex.bbfunc(obj))};
+	return cell;
+}
+
+//MARK: Memory Management Functions
+
+cpSweep1D *
+cpSweep1DAlloc(void)
+{
+	return (cpSweep1D *)cpcalloc(1, sizeof(cpSweep1D));
+}
+
+static void
+ResizeTable(cpSweep1D *sweep, int size)
+{
+	sweep->max = size;
+	sweep->table = (TableCell *)cprealloc(sweep->table, size*sizeof(TableCell));
+}
+
+cpSpatialIndex *
+cpSweep1DInit(cpSweep1D *sweep, cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex)
+{
+	cpSpatialIndexInit((cpSpatialIndex *)sweep, Klass(), bbfunc, staticIndex);
+	
+	sweep->num = 0;
+	ResizeTable(sweep, 32);
+	
+	return (cpSpatialIndex *)sweep;
+}
+
+cpSpatialIndex *
+cpSweep1DNew(cpSpatialIndexBBFunc bbfunc, cpSpatialIndex *staticIndex)
+{
+	return cpSweep1DInit(cpSweep1DAlloc(), bbfunc, staticIndex);
+}
+
+static void
+cpSweep1DDestroy(cpSweep1D *sweep)
+{
+	cpfree(sweep->table);
+	sweep->table = NULL;
+}
+
+//MARK: Misc
+
+static int
+cpSweep1DCount(cpSweep1D *sweep)
+{
+	return sweep->num;
+}
+
+static void
+cpSweep1DEach(cpSweep1D *sweep, cpSpatialIndexIteratorFunc func, void *data)
+{
+	TableCell *table = sweep->table;
+	for(int i=0, count=sweep->num; i<count; i++) func(table[i].obj, data);
+}
+
+static int
+cpSweep1DContains(cpSweep1D *sweep, void *obj, cpHashValue hashid)
+{
+	TableCell *table = sweep->table;
+	for(int i=0, count=sweep->num; i<count; i++){
+		if(table[i].obj == obj) return cpTrue;
+	}
+	
+	return cpFalse;
+}
+
+//MARK: Basic Operations
+
+static void
+cpSweep1DInsert(cpSweep1D *sweep, void *obj, cpHashValue hashid)
+{
+	if(sweep->num == sweep->max) ResizeTable(sweep, sweep->max*2);
+	
+	sweep->table[sweep->num] = MakeTableCell(sweep, obj);
+	sweep->num++;
+}
+
+static void
+cpSweep1DRemove(cpSweep1D *sweep, void *obj, cpHashValue hashid)
+{
+	TableCell *table = sweep->table;
+	for(int i=0, count=sweep->num; i<count; i++){
+		if(table[i].obj == obj){
+			int num = --sweep->num;
+			
+			table[i] = table[num];
+			table[num].obj = NULL;
+			
+			return;
+		}
+	}
+}
+
+//MARK: Reindexing Functions
+
+static void
+cpSweep1DReindexObject(cpSweep1D *sweep, void *obj, cpHashValue hashid)
+{
+	// Nothing to do here
+}
+
+static void
+cpSweep1DReindex(cpSweep1D *sweep)
+{
+	// Nothing to do here
+	// Could perform a sort, but queries are not accelerated anyway.
+}
+
+//MARK: Query Functions
+
+static void
+cpSweep1DQuery(cpSweep1D *sweep, void *obj, cpBB bb, cpSpatialIndexQueryFunc func, void *data)
+{
+	// Implementing binary search here would allow you to find an upper limit
+	// but not a lower limit. Probably not worth the hassle.
+	
+	Bounds bounds = BBToBounds(sweep, bb);
+	
+	TableCell *table = sweep->table;
+	for(int i=0, count=sweep->num; i<count; i++){
+		TableCell cell = table[i];
+		if(BoundsOverlap(bounds, cell.bounds) && obj != cell.obj) func(obj, cell.obj, 0, data);
+	}
+}
+
+static void
+cpSweep1DSegmentQuery(cpSweep1D *sweep, void *obj, cpVect a, cpVect b, cpFloat t_exit, cpSpatialIndexSegmentQueryFunc func, void *data)
+{
+	cpBB bb = cpBBExpand(cpBBNew(a.x, a.y, a.x, a.y), b);
+	Bounds bounds = BBToBounds(sweep, bb);
+	
+	TableCell *table = sweep->table;
+	for(int i=0, count=sweep->num; i<count; i++){
+		TableCell cell = table[i];
+		if(BoundsOverlap(bounds, cell.bounds)) func(obj, cell.obj, data);
+	}
+}
+
+//MARK: Reindex/Query
+
+static int
+TableSort(TableCell *a, TableCell *b)
+{
+	return (a->bounds.min < b->bounds.min ? -1 : (a->bounds.min > b->bounds.min ? 1 : 0));
+}
+
+static void
+cpSweep1DReindexQuery(cpSweep1D *sweep, cpSpatialIndexQueryFunc func, void *data)
+{
+	TableCell *table = sweep->table;
+	int count = sweep->num;
+	
+	// Update bounds and sort
+	for(int i=0; i<count; i++) table[i] = MakeTableCell(sweep, table[i].obj);
+	qsort(table, count, sizeof(TableCell), (int (*)(const void *, const void *))TableSort); // TODO: use insertion sort instead
+	
+	for(int i=0; i<count; i++){
+		TableCell cell = table[i];
+		cpFloat max = cell.bounds.max;
+		
+		for(int j=i+1; table[j].bounds.min < max && j<count; j++){
+			func(cell.obj, table[j].obj, 0, data);
+		}
+	}
+	
+	// Reindex query is also responsible for colliding against the static index.
+	// Fortunately there is a helper function for that.
+	cpSpatialIndexCollideStatic((cpSpatialIndex *)sweep, sweep->spatialIndex.staticIndex, func, data);
+}
+
+static cpSpatialIndexClass klass = {
+	(cpSpatialIndexDestroyImpl)cpSweep1DDestroy,
+	
+	(cpSpatialIndexCountImpl)cpSweep1DCount,
+	(cpSpatialIndexEachImpl)cpSweep1DEach,
+	(cpSpatialIndexContainsImpl)cpSweep1DContains,
+	
+	(cpSpatialIndexInsertImpl)cpSweep1DInsert,
+	(cpSpatialIndexRemoveImpl)cpSweep1DRemove,
+	
+	(cpSpatialIndexReindexImpl)cpSweep1DReindex,
+	(cpSpatialIndexReindexObjectImpl)cpSweep1DReindexObject,
+	(cpSpatialIndexReindexQueryImpl)cpSweep1DReindexQuery,
+	
+	(cpSpatialIndexQueryImpl)cpSweep1DQuery,
+	(cpSpatialIndexSegmentQueryImpl)cpSweep1DSegmentQuery,
+};
+
+static inline cpSpatialIndexClass *Klass(){return &klass;}
+
diff --git a/dali-physics/third-party/chipmunk2d/src/prime.h b/dali-physics/third-party/chipmunk2d/src/prime.h
new file mode 100644
index 0000000..d470c2c
--- /dev/null
+++ b/dali-physics/third-party/chipmunk2d/src/prime.h
@@ -0,0 +1,68 @@
+/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
+ * 
+ * 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.
+ */
+
+// Used for resizing hash tables.
+// Values approximately double.
+// http://planetmath.org/encyclopedia/GoodHashTablePrimes.html
+static int primes[] = {
+	5,
+	13,
+	23,
+	47,
+	97,
+	193,
+	389,
+	769,
+	1543,
+	3079,
+	6151,
+	12289,
+	24593,
+	49157,
+	98317,
+	196613,
+	393241,
+	786433,
+	1572869,
+	3145739,
+	6291469,
+	12582917,
+	25165843,
+	50331653,
+	100663319,
+	201326611,
+	402653189,
+	805306457,
+	1610612741,
+	0,
+};
+
+static inline int
+next_prime(int n)
+{
+	int i = 0;
+	while(n > primes[i]){
+		i++;
+		cpAssertHard(primes[i], "Tried to resize a hash table to a size greater than 1610612741 O_o"); // realistically this should never happen
+	}
+	
+	return primes[i];
+}
diff --git a/dali-scene-loader/README.md b/dali-scene-loader/README.md
deleted file mode 100644
index b29c463..0000000
--- a/dali-scene-loader/README.md
+++ /dev/null
@@ -1,365 +0,0 @@
-# Table of contents
-   * [Overview](#overview)
-   * [`scenes`](#scenes)
-   * [`nodes`](#nodes)
-      * [Transformations](#transformations)
-      * [Size](#size)
-      * [Visibility](#visibility)
-      * [`children`](#children)
-      * [`customization`](#customization)
-      * [Renderables](#renderables)
-         * [`model`](#model)
-         * [`arc`](#arc)
-      * [`inverseBindPoseMatrix`](#inversebindposematrix)
-   * [`materials`](#materials)
-   * [`meshes`](#meshes)
-   * [`shaders`](#shaders)
-      * [`rendererState`](#rendererState)
-      * [`defines`](#defines)
-      * [`hints`](#hints)
-      * [Uniforms](#uniforms)
-   * [`skeletons`](#skeletons)
-   * [`cameras`](#cameras)
-      * [Perspective cameras](#perspective-cameras)
-      * [Orthographic cameras](#orthographic-cameras)
-   * [`lights`](#lights)
-   * [`animations`](#animations)
-      * [`properties`](#properties)
-         * [`keyFramesBin`](#keyframesbin)
-         * [`keyFrames`](#keyFrames)
-         * [`value`](#value)
-   * [`animationGroups`](#animationGroups)
-
-# Overview
-DLI is a JSON based format for representing 3D scenes.
-   * Like glTF, the DLI document defines a set of scenes, which in turn define a hierarchical structure of nodes, and the additional data required to render them - meshes, geometry.
-   * Unlike glTF, it allows definitions of shaders, environment maps, and lighting parameters as well;
-   * Unlike glTF, DLI does not concern itself with buffers, buffer views and accessors;
-   * It supports customizations, which allow replacing parts of the scene based on customization tags and options, without reloading the whole scene.
-   * It supports the processing of custom categories, which can be scheduled to take place prior to or after the processing of the scene data, as well as custom node and animation processors.
-
-# `scenes`
-The "scenes" element is an array of JSON objects, each of which must define a `nodes` array with the index of the definition of the root node.
-
-:warning: The array must not be empty. Only the first element is used.
-An optional `scene` element with an integer value may be defined to specify the index of the first scene to be created.
-The rest of the scenes are created in the order of their definition (from index 0 to the highest, skipping the default - already created - scene).
-```js
-{
-    "scene": 0,
-    "scenes": [ { "nodes": [ 0 ] } ],
-    "nodes": [ {
-        "name": "some_unique_name"
-    } ]
-}
-```
-
-# `nodes`
-The 3D scene is built using a hierarchy of nodes, which are used to position the objects to render.
-
-:warning: Each node must have a `name` string that 1, is not an empty string and 2, is unique within the DLI document. The use of alpha-numeric characters and underscore only is highly recommeneded.
-
-## Transformations
-There are two ways to define the local transform of each nodes. Both are optional, defaulting to a position at the origin, a scale of one and no rotation.
-   * A `matrix` array of 16 numerical values defining a column-major 4x4 matrix;
-   * A `position` array of 3 numerical values defining a 3D vector and an `angle` array of 3 numerical values defining euler angles of rotation along the 3 axes.
-
-## Size
-The size of the bounding box of a node may be specified using either of the optional `size` or `bounds` properties, as arrays of 2 or 3 numerical values. Its default value is the unit vector.
-
-## Visibility
-The `visible` optional boolean property defines whether a node and its children are rendered (`true`) or not (`false`).
-
-## `children`
-An array of 0 or more indices into the top level `nodes` array, which shall inherit the transform and visibility of their parent node.
-
-:warning: Nodes are processed in the order they are encountered during the depth-first traversal of the hierarchy.
-```js
-  "nodes": [ {
-    "name": "hip",
-    "children": [ 3, 1, 2 ]
-  }, {
-    "name": "spine"
-  }, {
-    "name": "left leg"
-  }, {
-    "name": "right leg"
-  } ]
-```
-
-## `customization`
-Customizations may allow creating a different sub-tree of each node that define them, based on application specific configuration settings known at the time of creating the scene.
-The definition of a `customization` is a single string tag: 
-```js
-  "nodes": [ {
-    "name": "Soup du jour",
-    "customization": "flavor", // this one
-    "children": [ 1, 2, 3 ]
-  }, {
-    "name": "Broccoli and Stilton",
-  }, {
-    "name": "Butternut Squash",
-  }, {
-    "name": "Strawberry and Cream",
-  } ]
-```
-:warning: Customizations and renderables are mutually exclusive on the same node.
-
-## Renderables
-There is support for two types of nodes that define renderable content.
-The definition of these renderables come in sub-objects.
-All of them support a `color` property, which is an array of 3 or 4 numerical values for RGB or RGBA components. For the alpha value to take effect, alpha blending must be enabled; this is controlled by the [material](#materiaL).
-
-:warning: Customizations and renderables are mutually exclusive on the same node.
-
-### `model`
-Provides definition for a 3D object, which requires a `mesh`, `shader` and `material`.
-Each of these are provided in form of an integer index into the related top-level array of the DLI document.
-
-:warning: `mesh` must be provided; the rest are optional and default to 0.
-```js
-  "nodes": [ {
-    "name": "Sphere",
-    "model": {
-      "mesh": 0, // required
-      "shader": 0, // optional, defaults to 0
-      "material": 1 // optional, defaults to 0
-    }
-  } ]
-```
-
-### `arc`
-Arc is a specialisation of a model that allows the rendering of circular progress bars. As such, it also must provide a `mesh` ID.
-```js
-  "nodes": [ {
-    "name": "Any Name",
-    "arc": {
-      "mesh": 0, // required
-      "shader": 0, // optional, defaults to 0
-      "material": 1 // optional, defaults to 0
-      "antiAliasing": true,
-      "radius": -0.928,
-      "startAngle": -81.0,
-      "endAngle": 261
-    }
-  } ]
-```
-   * `startAngle` and `endAngle` are the angular positions where the arc starts and ends, in degrees.
-   * `radius` is the inner radius of the arc, the outer radius being defined by the [`size`](#size) of the node.
-   * `antiAliasing` defines whether the edges of the arc should be smoothed.
-   
-## `inverseBindPoseMatrix`
-Nodes that serve as joints of a [skeleton](#skeleton) must define this property as an array of 16 numerical values for a column major 4x4 matrix.
-```js
-  "nodes": [ {
-    "name" : "l_shoulder_JNT",
-    "inverseBindPoseMatrix" : [ 0.996081, -0.0407448, 0.0785079, 0.0, 0.0273643, 0.985992, 0.164531, 0.0, -0.0841121, -0.161738, 0.983242, 0.0, -0.0637747, -1.16091, -0.161038, 1.0 ]
-  } ]
-```
-
-# `environment`
-An array of environment map definitions, which have the following format:
-```js
-  "environment": [{
-    "cubeSpecular": "Studio_001/Radiance.ktx",
-    "cubeDiffuse": "Studio_001/Irradiance.ktx",
-    "cubeInitialOrientation": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] 
-  } ]
-```
-`cubeSpecular` and `cubeDiffuse` are the names of the respective cube map files that will be attempted to be located from the _environment_ path, which is up to the application. A 1x1x1 white RGB888 cubemap is created in place of either that was omitted.
-`cubeInitialOrientation` may be used to inform the (PBR) shader of a matrix which describes the initial orientation of the cube map. Defaults to the identity matrix.
-
-# `materials`
-Defines configurations of textures (and their samplers) that form materials. These can be created from single values or image files (in the formats that DALi supports).
-```js
-  "materials": [ {
-    "environment": 0,
-    "albedoMap": "A.png",
-    "normal": "N.png",
-    "metallicRoughnessMap": "MR.png",
-    "color": [ 1.0, 0.8, 0.7, 0.5 ]
-  } ]
-```
-   * `environment`: The index of the [environment map](#environments) to use. Single integer, defaults to `0`.
-   * `mipmap`: A boolean to speficy if the creation and sampling of mipmaps should be enabled. Off by default.
-   * `color`: Base color, which the color of the node gets multiplied by. Defaults to white.
-   * `metallic` and `roughness`: Properties for PBR materials; both are expected to be a single numerical value and default to `1.0`.
-
-## Texture maps
-`albedoMap` / `albedoMetallicMap` / `normalMap` / `normalRoughnessMap` / `metallicRoughnessMap` / `subsurfaceMap`: define various texture semantics, i.e. the role of the texture, which shall be loaded from an image _inside the materials path_, which is up to the application. All of them are optional.
-
-:warning: Semantics shall not overlap within the same material, e.g. multiple albedo definitions, or albedo and albedoMetallic.
-
-# `meshes`
-Defines an array of meshes which are used to access geometry data stored in a binary file. The `uri` property is used to locate each file _inside the mesh path_, which is up to the application; alternatively it can be set to `"quad"`, resulting in the creation of a unit quad.
-Those models loaded from a file may provide an accessor, and flag its presence in the `attributes` bitmask property. The following are supported:
-|Attribute Name|Bit|Decimal value|Type|Remarks|
-|-|-|-|-|-|
-|`indices`  |0|  1|unsigned short||
-|`positions`|1|  2|Vector3||
-|`normals`  |2|  4|Vector3||
-|`textures` |3|  8|Vector2|UVs|
-|`tangents` |4| 16|Vector3||
-|           |5| 32||Ignored, but reserved for bitangents|
-|`joints0`  |6| 64|Vector4|Joint IDs for skinned meshes|
-|`weights0` |7|128|Vector4|Joint weights for skinned meshes|
-
-E.g. if positions, normals and tangents are provided, the `attributes` property must have a value of 2 + 4 + 16 = 22.
-Each attribute must provide a `byteOffset` and `byteLength` property, which must be correctly sized for the type of the given attribute.
-Finally, to specify what primitives should the geometry be rendered as, a `primitive` property may be provided with one of the following values: `TRIANGLES` (default), `LINES`, `POINTS`.
-
-## Skinned meshes
-DLI supports meshes that allow deformation by skeletal animation. These must define a few additional properties:
-   * `joints0` and `weights0` attributes, as above.
-   * A [`skeleton`](#skeletons) ID, to specify which (joint) nodes' transformations affect the mesh.
-
-:warning: The maximum number of bones supported by DALi Scene Loader is `64`.
-
-## Blend shapes
-Blend shapes provide alternate configurations of vertex `positions`, `normals` and/or `tangents` that may be blended with the same attributes of the base mesh, controlled by an animatable `weight`.
-```js
-  "meshes": [ {
-      "uri": "example.bin",
-      "attributes": 2,
-      "positions": {
-          "byteOffset": 0,
-          "byteLength": 12000
-      },
-      "blendShapesHeader": {
-          "version": "2.0",
-          "byteOffset": 12000,
-          "byteLEngth": 4
-      },
-      "blendShapes": [ {
-          "weight": 0.0,
-          "positions": {
-              byteOffset: 12004,
-              byteLength: 12000
-          }
-      } ]
-  } ]
-```
-A `blendShapesHeader`, if present, must define:
-   * the `version` of the blend shapes; supported values are `1.0` and `2.0`. The difference between the versions is that v1.0 requires a per-blend shape definition of an un-normalization factor.
-   * the `byteOffset` and `byteLength` of a buffer in the binary which defines the width (2 bytes) and height (2 bytes) of the texture that dali-scene-loader creates for blend shape data.
-
-The `blendShapes` array then defines the shapes that are available to blend between, comprising of:
-   * An initial `weight` numerical, the default is 0;
-   * `position` / `normals` / `tangents` attributes, which must be also present in the base mesh and are the same format (`byteOffset` / `byteLength`);
-
-:warning: The size of the attributes of the blend shape must match that of the base mesh (and each other) - i.e. they must define the same number of vertices.
-
-# `shaders`
-Provides an array of shader programs that renderables may use for rendering.
-For each shader, `vertex` and `fragment` are required string properties pointing to the shader files _inside the shader path_, which is up to the application.
-   * `rendererState`: This string defines the options for configuring the settings of the renderer. Refer to public-api/renderer-state.h for details.
-   * `defines`: An optional array of strings which will be used to create #defines into the vertex and fragment shaders.
-   * `hints`: An optional array of strings that map to `Dali::Shader::Hint` values. Therefore two values are supported - `MODIFIES_GEOMETRY` and `OUTPUT_IS_TRANSPARENT`.
-
-## Uniforms
-Every property that is not one of the reserved keys above, will be attempted to be registered as a uniform of the same name.
-
-:warning: Boolean values will be converted to floating point 1.0 (for `true`) or 0.0 (for `false`).
-
-:warning: Integer values will be converted to floating point.
-
-:warning: Arrays of numerical values will be treated as one of the vec2 / vec3 / vec4 / mat3 / mat4 types, depending on what do they define sufficient components for.
-```js
-  "shaders": [ {
-    "vertex": "dli_pbr.vsh",
-    "fragment": "dli_pbr.fsh",
-    "defines": [ "HIGHP", SKINNING" ],
-    "rendererState": "DEPTH_WRITE|DEPTH_TEST|CULL_BACK",
-    "hints": 
-    "uMaxLOD": 6
-  } ]
-```
-
-# `skeletons`
-Skeletons in DLI simply define the name of a `node` that shall serve as the _root joint_ of the given skeleton.
-```js
-  "skeletons": [ {
-    "node": "hipJoint"
-  } ]
-```
-The Joint IDs in skinned mesh data relate to the descendants of the [node](#nodes) identified as the root joint that are joints, i.e. define [`inverseBindPoseMatrix`](#inversebindposematrix), in depth-first traversal order.
-
-# `cameras`
-Define the transformation of viewers and the projection used by them.
-All cameras may define:
-   * `matrix`: an array of 16 numerical values for the transform matrix
-   * `near` and `far` values for the position of the respective clipping planes. These default to `0.1` and `1000.0`, respectively.
-
-## Perspective cameras
-This projection type - and a vertical field of view of `60` degrees - is the default.
-The (V)FOV can be specified in the `fov` property, as a single numerical value.
-
-## Orthographic cameras
-If the `orthographic` is defined with an array of four numerical values for the left, right, bottom and top clipping planes (in this order), then orthographic projection is used, and `fov` is ignored.
-
-# `lights`
-Define parameters for a single light source - the implementation is up to the application. The following properties are supported.
-   * `transform`: matrix of 16 numerical values for the positioning / directing of the light;
-   * `color`: array of 3 components for RGB;
-   * `intensity`: single float;
-   * `shadowIntensity`: single float;
-   * `shadowMapSize`: unsigned integer size (same width & height) of shadow map.
-   * `orthographicSize`: single float to define the size (same width & height) of orthographic position.
-
-# `animations`
-Animations provide a way to change properties of nodes (and those of their renderables) over time.
-```js
-  "animations": [ {
-     "name": "Idle",
-     "loopCount": 0,
-     "duration": 4.0,
-     "endAction": "DISCARD",
-     "disconnectAction": "DISCARD",
-     "properties": []
-  } ]
-```
-   * `name`: the identifier to look the animation up by;
-   * `loopCount`: the number of times that the animation should be played. The default is `1`; `0` signifies infinity repetitions.
-   * `duration`: the duration of the animation in seconds. If not provided, it will be calculated from the properties.
-   * `endAction` and `disconnectAction`: the supported values, defaults and their meaning are described in the `Dali::Animation::EndAction` enum;
-
-## `properties`
-An array of animation property definitions.
-   * `node`: the name of the node whose property shall be animated;
-   * `property`: the name that the property was registered under.
-   * `alphaFunction`: the name of an alpha function which shall be used in animating a value, or between key frames;
-   * `timePeriod`: `delay` (defaults to `0.0`) and `duration` (defaults to the `duration` of the animation) of the property animation, in sceonds;
-
-The property may be animated using one of the following methods. They are listed in priority order; if e.g. a property defines `keyFramesBin` and `keyFrames`, then only `keyFramesBin` is used. 
-
-### `keyFramesBin`
-JSON object that defines a keyframe animation in a binary buffer, with the following properties:
-   * `url` the path to the file containing the buffer;
-   * `numKeys`: the number of keys.
-   * `byteOffset`: offset to the start of the buffer
-
-The size of the buffer depends on the property being animated, where  the property value for each frame follows a 4 byte floating point value determining progress (between 0 and 1).
-
-:warning: Only `position` (3D vector of floats, 12 bytes), `rotation` (Quaternion, 12 bytes), and `scale` (3D vector, 12 bytes) properties are supported.
-
-### `keyFrames`
-JSON array of keyframe objects defined with the following properties:
-   * `progress`: a scalar between `0` and `1` to apply to the duration to get the time stamp of the frame;
-   * `value`: array of 3 or 4 numerical values depending on which property is being animated;
-
-:warning: Only `position`, `rotation`, and `scale` properties are supported.
-
-### `value`
-Value animations animate a property using a single value that may be absolute or relative.
-The properties it supports are the following:
-   * `value`: the value to animate to (if absolute) or by (if `relative`);
-   * `relative`: whether `value` is a target, or an offset;
-
-# `animationGroups`
-Animation groups simply group animations together by name, under another name, which may be used to trigger them at the same time.
-```js
-  "animationGroups": [ {
-    "name": "Idle",
-    "animations": [ "IdleBody", "IdleFace" ]
-  } ]
-```
diff --git a/dali-scene-loader/internal/file.list b/dali-scene-loader/internal/file.list
deleted file mode 100644
index 70d94f3..0000000
--- a/dali-scene-loader/internal/file.list
+++ /dev/null
@@ -1,8 +0,0 @@
-set(scene_loader_internal_dir "${scene_loader_dir}/internal")
-
-set(scene_loader_src_files ${scene_loader_src_files}
-	${scene_loader_internal_dir}/gltf2-asset.cpp
-	${scene_loader_internal_dir}/hash.cpp
-	${scene_loader_internal_dir}/json-reader.cpp
-	${scene_loader_internal_dir}/json-util.cpp
-)
diff --git a/dali-scene-loader/internal/gltf2-asset.cpp b/dali-scene-loader/internal/gltf2-asset.cpp
deleted file mode 100644
index d0e183a..0000000
--- a/dali-scene-loader/internal/gltf2-asset.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-* Copyright (c) 2021 Samsung Electronics Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*/
-#include "dali-scene-loader/internal/gltf2-asset.h"
-#include <algorithm>
-#include <map>
-#include "dali/public-api/math/matrix.h"
-
-#define ENUM_STRING_MAPPING(t, x) \
-  {                               \
-#x, t::x                      \
-  }
-
-using namespace Dali;
-
-namespace gltf2
-{
-namespace
-{
-constexpr uint32_t ACCESSOR_TYPE_ELEMENT_COUNT[]{
-  1,
-  2,
-  3,
-  4,
-  4,
-  9,
-  16,
-  static_cast<uint32_t>(-1)};
-
-const std::map<std::string_view, AccessorType::Type> ACCESSOR_TYPES{
-  ENUM_STRING_MAPPING(AccessorType, SCALAR),
-  ENUM_STRING_MAPPING(AccessorType, VEC2),
-  ENUM_STRING_MAPPING(AccessorType, VEC3),
-  ENUM_STRING_MAPPING(AccessorType, VEC4),
-  ENUM_STRING_MAPPING(AccessorType, MAT2),
-  ENUM_STRING_MAPPING(AccessorType, MAT3),
-  ENUM_STRING_MAPPING(AccessorType, MAT4),
-};
-
-const std::map<std::string_view, AlphaMode::Type> ALPHA_MODE_TYPES{
-  ENUM_STRING_MAPPING(AlphaMode::Type, OPAQUE),
-  ENUM_STRING_MAPPING(AlphaMode::Type, MASK),
-  ENUM_STRING_MAPPING(AlphaMode::Type, BLEND),
-};
-
-const std::map<std::string_view, Attribute::Type> ATTRIBUTE_TYPES{
-  ENUM_STRING_MAPPING(Attribute::Type, POSITION),
-  ENUM_STRING_MAPPING(Attribute::Type, NORMAL),
-  ENUM_STRING_MAPPING(Attribute::Type, TANGENT),
-  ENUM_STRING_MAPPING(Attribute::Type, TEXCOORD_0),
-  ENUM_STRING_MAPPING(Attribute::Type, TEXCOORD_1),
-  ENUM_STRING_MAPPING(Attribute::Type, COLOR_0),
-  ENUM_STRING_MAPPING(Attribute::Type, JOINTS_0),
-  ENUM_STRING_MAPPING(Attribute::Type, WEIGHTS_0),
-};
-
-const std::map<std::string_view, Animation::Sampler::Interpolation::Type> ANIMATION_SAMPLER_INTERPOLATION{
-  ENUM_STRING_MAPPING(Animation::Sampler::Interpolation::Type, STEP),
-  ENUM_STRING_MAPPING(Animation::Sampler::Interpolation::Type, LINEAR),
-  ENUM_STRING_MAPPING(Animation::Sampler::Interpolation::Type, CUBICSPLINE),
-};
-
-const std::map<std::string_view, Animation::Channel::Target::Type> ANIMATION_CHANNEL_TARGET_PATH_TYPES{
-  ENUM_STRING_MAPPING(Animation::Channel::Target::Type, TRANSLATION),
-  ENUM_STRING_MAPPING(Animation::Channel::Target::Type, ROTATION),
-  ENUM_STRING_MAPPING(Animation::Channel::Target::Type, SCALE),
-  ENUM_STRING_MAPPING(Animation::Channel::Target::Type, WEIGHTS),
-};
-
-} // namespace
-
-bool Component::IsUnsigned(Type t)
-{
-  return t == UNSIGNED_BYTE || t == UNSIGNED_SHORT || t == UNSIGNED_INT;
-}
-
-uint32_t Component::Size(Type t)
-{
-  switch(t)
-  {
-    case BYTE:
-    case UNSIGNED_BYTE:
-      return 1;
-    case SHORT:
-    case UNSIGNED_SHORT:
-      return 2;
-    case UNSIGNED_INT:
-    case FLOAT:
-      return 4;
-    default:
-      return -1;
-  }
-}
-
-uint32_t AccessorType::ElementCount(Type t)
-{
-  return ACCESSOR_TYPE_ELEMENT_COUNT[t];
-}
-
-AccessorType::Type AccessorType::FromString(const char* s, size_t len)
-{
-  auto iFind = ACCESSOR_TYPES.find(std::string_view(s, len));
-  if(iFind != ACCESSOR_TYPES.end())
-  {
-    return iFind->second;
-  }
-  return AccessorType::INVALID;
-}
-
-AlphaMode::Type AlphaMode::FromString(const char* s, size_t len)
-{
-  auto iFind = ALPHA_MODE_TYPES.find(std::string_view(s, len));
-  if(iFind != ALPHA_MODE_TYPES.end())
-  {
-    return iFind->second;
-  }
-  return AlphaMode::INVALID;
-}
-
-Attribute::Type Attribute::FromString(const char* s, size_t len)
-{
-  auto iFind = ATTRIBUTE_TYPES.find(std::string_view(s, len));
-  if(iFind != ATTRIBUTE_TYPES.end())
-  {
-    return iFind->second;
-  }
-  return Attribute::INVALID;
-}
-
-Animation::Sampler::Interpolation::Type Animation::Sampler::Interpolation::FromString(const char* s, size_t len)
-{
-  auto iFind = ANIMATION_SAMPLER_INTERPOLATION.find(std::string_view(s, len));
-  if(iFind != ANIMATION_SAMPLER_INTERPOLATION.end())
-  {
-    return iFind->second;
-  }
-  return Animation::Sampler::Interpolation::Type::INVALID;
-}
-
-uint32_t ComponentTypedBufferViewClient::GetBytesPerComponent() const
-{
-  return Component::Size(mComponentType);
-}
-
-Animation::Channel::Target::Type Animation::Channel::Target::FromString(const char* s, size_t len)
-{
-  std::string target(s, len);
-  std::transform(target.begin(), target.end(), target.begin(), ::toupper);
-
-  auto iFind = ANIMATION_CHANNEL_TARGET_PATH_TYPES.find(std::string_view(target.c_str(), len));
-  if(iFind != ANIMATION_CHANNEL_TARGET_PATH_TYPES.end())
-  {
-    return iFind->second;
-  }
-  return Animation::Channel::Target::INVALID;
-};
-
-void Node::SetMatrix(const Matrix& m)
-{
-  m.GetTransformComponents(mTranslation, mRotation, mScale);
-}
-
-Quaternion ReadQuaternion(const json_value_s& j)
-{
-  return Quaternion(ReadDaliVector<Vector4>(j));
-}
-
-} // namespace gltf2
diff --git a/dali-scene-loader/internal/gltf2-asset.h b/dali-scene-loader/internal/gltf2-asset.h
deleted file mode 100644
index 1ec67e2..0000000
--- a/dali-scene-loader/internal/gltf2-asset.h
+++ /dev/null
@@ -1,596 +0,0 @@
-#ifndef DALI_SCENE_LOADER_GLTF2_ASSET_H_
-#define DALI_SCENE_LOADER_GLTF2_ASSET_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/internal/json-reader.h"
-#include "dali-scene-loader/public-api/index.h"
-
-// EXTERNAL INCLUDES
-#include <cstdint>
-#include <memory>
-#include "dali/devel-api/common/map-wrapper.h"
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/math/quaternion.h"
-#include "dali/public-api/math/vector4.h"
-
-namespace gltf2
-{
-using Index = Dali::SceneLoader::Index;
-
-template<typename T>
-class Ref
-{
-public:
-  Ref() = default;
-  Ref(std::vector<T>& v, Index i)
-  : mVector(&v),
-    mIndex(i)
-  {
-  }
-
-  /**
-   * @return The index of the object into the vector.
-   * @note It is client code responsibility to ensure that the vector is unambiguous. It should be in
-   *  a glTF document, since there's one vector for each type.
-   */
-  Index GetIndex() const
-  {
-    return mIndex;
-  }
-
-  /**
-   * @brief There may be scenarios in which the object, whose vector we're populating, changes, e.g.
-   *  when we don't have a final one at the time of reading the references.
-   */
-  void UpdateVector(std::vector<T>& v)
-  {
-    mVector = &v;
-  }
-
-  operator bool() const
-  {
-    return mVector != nullptr;
-  }
-  T* operator->() const
-  {
-    return &(*mVector)[mIndex];
-  }
-  T& operator*() const
-  {
-    return (*mVector)[mIndex];
-  }
-
-  bool operator==(const Ref<T>& other) const
-  {
-    return mVector == other.mVector && mIndex == other.mIndex;
-  }
-
-  bool operator!=(const Ref<T>& other) const
-  {
-    return !operator==(other);
-  }
-
-private:
-  std::vector<T>* mVector = nullptr;
-  Index           mIndex  = Dali::SceneLoader::INVALID_INDEX;
-};
-
-struct Asset
-{
-  std::string_view mVersion;
-};
-
-struct Component
-{
-  enum Type
-  {
-    BYTE           = 5120,
-    UNSIGNED_BYTE  = 5121,
-    SHORT          = 5122,
-    UNSIGNED_SHORT = 5123,
-    UNSIGNED_INT   = 5125,
-    FLOAT          = 5126,
-    INVALID        = -1
-  };
-
-  static bool     IsUnsigned(Type t);
-  static uint32_t Size(Type t);
-
-  Component() = delete;
-};
-
-struct AccessorType
-{
-  enum Type
-  {
-    SCALAR,
-    VEC2,
-    VEC3,
-    VEC4,
-    MAT2,
-    MAT3,
-    MAT4,
-    INVALID
-  };
-
-  static uint32_t ElementCount(Type t);
-
-  static Type FromString(const char* s, size_t len);
-
-  AccessorType() = delete;
-};
-
-struct AlphaMode
-{
-  enum Type
-  {
-    OPAQUE,
-    MASK,
-    BLEND,
-    INVALID
-  };
-
-  static Type FromString(const char* s, size_t len);
-
-  AlphaMode() = delete;
-};
-
-struct Attribute
-{
-  enum Type
-  {
-    POSITION,
-    NORMAL,
-    TANGENT,
-    TEXCOORD_0,
-    TEXCOORD_1,
-    COLOR_0,
-    JOINTS_0,
-    WEIGHTS_0,
-    INVALID
-  };
-
-  static Type FromString(const char* s, size_t len);
-
-  Attribute() = delete;
-};
-
-struct Buffer
-{
-  uint32_t         mByteLength;
-  std::string_view mUri;
-  //TODO: extensions
-  //TODO: extras
-};
-
-struct BufferView
-{
-  struct Target
-  {
-    enum Type
-    {
-      NONE,
-      ARRAY_BUFFER         = 34962,
-      ELEMENT_ARRAY_BUFFER = 34963
-    };
-
-    Target() = delete;
-  };
-
-  Ref<Buffer> mBuffer;
-  uint32_t    mByteOffset = 0;
-  uint32_t    mByteLength;
-  uint32_t    mByteStride = 0; // if 0 after reading, it needs to be calculated
-  uint32_t    mTarget;
-  //TODO: extensions
-  //TODO: extras
-};
-
-struct BufferViewClient
-{
-  Ref<BufferView> mBufferView;
-  uint32_t        mByteOffset = 0;
-};
-
-struct ComponentTypedBufferViewClient : BufferViewClient
-{
-  Component::Type mComponentType = Component::INVALID;
-
-  uint32_t GetBytesPerComponent() const;
-};
-
-struct Named
-{
-  std::string_view mName;
-
-protected:
-  Named() = default;
-};
-
-struct Accessor : ComponentTypedBufferViewClient, Named
-{
-  struct Sparse
-  {
-    uint32_t                       mCount;
-    ComponentTypedBufferViewClient mIndices;
-    BufferViewClient               mValues;
-    //TODO: extensions
-    //TODO: extras
-  };
-
-  uint32_t                mCount;
-  bool                    mNormalized = false;
-  AccessorType::Type      mType       = AccessorType::INVALID;
-  std::vector<float>      mMin;
-  std::vector<float>      mMax;
-  std::unique_ptr<Sparse> mSparse;
-  //TODO: extensions
-  //TODO: extras
-
-  uint32_t GetElementSizeBytes() const
-  {
-    return GetBytesPerComponent() * AccessorType::ElementCount(mType);
-  }
-
-  uint32_t GetBytesLength() const
-  {
-    return GetElementSizeBytes() * mCount;
-  }
-
-  void SetSparse(const Sparse& s)
-  {
-    mSparse.reset(new Sparse(s));
-  }
-};
-
-struct Image : Named
-{
-  std::string_view mUri;
-  std::string_view mMimeType;
-  Ref<BufferView>  mBufferView;
-  //TODO: extensions
-  //TODO: extras
-};
-
-struct Filter
-{
-  enum Type
-  {
-    NEAREST                = 9728,
-    LINEAR                 = 9729,
-    NEAREST_MIPMAP_NEAREST = 9984,
-    NEAREST_MIPMAP_LINEAR  = 9985,
-    LINEAR_MIPMAP_NEAREST  = 9986,
-    LINEAR_MIPMAP_LINEAR   = 9987,
-  };
-
-  Filter() = delete;
-};
-
-struct Wrap
-{
-  enum Type
-  {
-    REPEAT          = 10497,
-    CLAMP_TO_EDGE   = 33071,
-    MIRRORED_REPEAT = 33648,
-  };
-
-  Wrap() = delete;
-};
-
-struct Sampler
-{
-  Filter::Type mMinFilter = Filter::LINEAR;
-  Filter::Type mMagFilter = Filter::LINEAR;
-  Wrap::Type   mWrapS     = Wrap::CLAMP_TO_EDGE;
-  Wrap::Type   mWrapT     = Wrap::CLAMP_TO_EDGE;
-  //TODO: extensions
-  //TODO: extras
-};
-
-struct Texture
-{
-  Ref<Image>   mSource;
-  Ref<Sampler> mSampler;
-};
-
-struct TextureInfo
-{
-  Ref<gltf2::Texture> mTexture;
-  uint32_t            mTexCoord = 0;
-  float               mScale    = 1.f;
-
-  operator bool() const
-  {
-    return !!mTexture;
-  }
-};
-
-struct Material : Named
-{
-  struct Pbr //MetallicRoughness
-  {
-    Dali::Vector4 mBaseColorFactor = Dali::Vector4::ONE;
-    TextureInfo   mBaseColorTexture;
-    float         mMetallicFactor  = 1.f;
-    float         mRoughnessFactor = 1.f;
-    TextureInfo   mMetallicRoughnessTexture;
-    //TODO: extensions
-    //TODO: extras
-  };
-
-  Pbr             mPbrMetallicRoughness;
-  TextureInfo     mNormalTexture;
-  TextureInfo     mOcclusionTexture;
-  TextureInfo     mEmissiveTexture;
-  Dali::Vector3   mEmissiveFactor;
-  AlphaMode::Type mAlphaMode   = AlphaMode::OPAQUE;
-  float           mAlphaCutoff = .5f;
-  bool            mDoubleSided = false;
-  //TODO: extensions
-  //TODO: extras
-};
-
-struct Mesh : Named
-{
-  struct Primitive
-  {
-    enum Mode
-    {
-      POINTS,
-      LINES,
-      LINE_LOOP,
-      LINE_STRIP,
-      TRIANGLES,
-      TRIANGLE_STRIP,
-      TRIANGLE_FAN,
-      INVALID
-    };
-
-    std::map<Attribute::Type, Ref<Accessor>>              mAttributes;
-    std::vector<std::map<Attribute::Type, Ref<Accessor>>> mTargets;
-    Ref<Accessor>                                         mIndices;
-    Ref<Material>                                         mMaterial;
-    Mode                                                  mMode = TRIANGLES;
-
-    //TODO: [morph] targets
-    //TODO: extras
-    //TODO: extensions
-  };
-
-  std::vector<Primitive> mPrimitives;
-  std::vector<float>     mWeights;
-  //TODO: extras
-  //TODO: extensions
-};
-
-struct Node;
-
-struct Skin : Named
-{
-  Ref<Accessor>          mInverseBindMatrices;
-  Ref<Node>              mSkeleton;
-  std::vector<Ref<Node>> mJoints;
-  //TODO: extras
-  //TODO: extensions
-};
-
-struct Camera : Named
-{
-  struct Perspective
-  {
-    float mAspectRatio;
-    float mYFov;
-    float mZFar;
-    float mZNear;
-    //TODO: extras
-    //TODO: extensions
-  };
-
-  struct Orthographic
-  {
-    float mXMag;
-    float mYMag;
-    float mZFar;
-    float mZNear;
-    //TODO: extras
-    //TODO: extensions
-  };
-
-  std::string_view mType;
-  Perspective      mPerspective;
-  Orthographic     mOrthographic;
-  //TODO: extras
-  //TODO: extensions
-};
-
-struct Node : Named
-{
-  Dali::Vector3    mTranslation = Dali::Vector3::ZERO;
-  Dali::Quaternion mRotation    = Dali::Quaternion::IDENTITY;
-  Dali::Vector3    mScale       = Dali::Vector3::ONE;
-
-  Ref<Camera>            mCamera;
-  std::vector<Ref<Node>> mChildren;
-  Ref<Mesh>              mMesh;
-
-  Ref<Skin> mSkin;
-  //TODO: [morph] weights
-  //TODO: extras
-  //TODO: extensions
-
-  void SetMatrix(const Dali::Matrix& m);
-};
-
-struct Animation : Named
-{
-  struct Sampler
-  {
-    struct Interpolation
-    {
-      enum Type
-      {
-        STEP,
-        LINEAR,
-        CUBICSPLINE,
-        INVALID
-      };
-      static Type FromString(const char* s, size_t len);
-    };
-
-    Ref<Accessor>       mInput;
-    Ref<Accessor>       mOutput;
-    Interpolation::Type mInterpolation;
-
-    //TODO: extras
-    //TODO: extensions
-  };
-
-  struct Channel
-  {
-    struct Target
-    {
-      enum Type
-      {
-        TRANSLATION,
-        ROTATION,
-        SCALE,
-        WEIGHTS,
-        INVALID
-      };
-
-      static Type FromString(const char* s, size_t len);
-
-      Ref<Node> mNode;
-      Type      mPath;
-    };
-
-    Ref<Sampler> mSampler;
-    Target       mTarget;
-    //TODO: extras
-    //TODO: extensions
-  };
-
-  std::vector<Sampler> mSamplers;
-  std::vector<Channel> mChannels;
-};
-
-struct Scene : Named
-{
-  std::vector<Ref<Node>> mNodes;
-};
-
-struct Document
-{
-  Asset mAsset;
-
-  std::vector<Buffer>     mBuffers;
-  std::vector<BufferView> mBufferViews;
-  std::vector<Accessor>   mAccessors;
-
-  std::vector<Image>    mImages;
-  std::vector<Sampler>  mSamplers;
-  std::vector<Texture>  mTextures;
-  std::vector<Material> mMaterials;
-
-  std::vector<Mesh> mMeshes;
-  std::vector<Skin> mSkins;
-
-  std::vector<Camera> mCameras;
-  std::vector<Node>   mNodes;
-
-  std::vector<Animation> mAnimations;
-
-  std::vector<Scene> mScenes;
-  Ref<Scene>         mScene;
-
-  Document()                = default;
-  Document(const Document&) = delete;
-  Document(Document&&)      = default;
-
-  Document& operator=(const Document&) = delete;
-  Document& operator=(Document&&) = default;
-};
-
-/**
- * @brief Provides a json::Property<T>::ReadFn for interpreting unsigned integers
- *  as a Ref<U> into a std::vector<U> data member of a type T.
- */
-template<typename T>
-struct RefReader
-{
-  static T* sObject;
-
-  template<typename U, std::vector<U> T::*V>
-  static Ref<U> Read(const json_value_s& j)
-  {
-    uint32_t index = json::Read::Number<uint32_t>(j);
-    return Ref<U>(sObject->*V, index);
-  }
-};
-
-template<typename T>
-T* RefReader<T>::sObject = nullptr;
-
-/**
- * @brief Convenience method to set the object for RefReader.
- */
-template<typename T>
-void SetRefReaderObject(T& object)
-{
-  RefReader<T>::sObject = &object;
-}
-
-/**
- * @brief Reads a string and attempts to convert it to an enum.
- * @note The enum must: 1, be called Type, nested to T, 2, provide a FromString static method taking a const char*
- *  (string data) and a size_t (string length) and returning T::Type.
- */
-template<typename T> // T must have a nested enum called Type and a static Type FromString(const char*) method.
-typename T::Type ReadStringEnum(const json_value_s& j)
-{
-  auto str = json::Read::StringView(j);
-
-  return T::FromString(str.data(), str.size());
-}
-
-/**
- * @brief Convenience method to attempt to create a Dali vector type T from an array of floats.
- * @note T must provide an AsFloat() member method returning the non-const array of its
- *  float components.
- */
-template<typename T>
-inline T ReadDaliVector(const json_value_s& j)
-{
-  std::vector<float> floats = json::Read::Array<float, json::Read::Number<float>>(j);
-  T                  result;
-  std::copy(floats.begin(), std::min(floats.end(), floats.begin() + sizeof(T) / sizeof(float)), result.AsFloat());
-  return result;
-}
-
-/**
- * @brief Convenience method to attemt to read a Quaternion, which implicitly converts
- *  to Vector4 but fails to provide an AsFloat() method.
- */
-Dali::Quaternion ReadQuaternion(const json_value_s& j);
-
-} // namespace gltf2
-
-#endif //DALI_SCENE_LOADER_GLTF2_ASSET_H_
diff --git a/dali-scene-loader/internal/graphics/shaders/scene-loader-joint-debug.frag b/dali-scene-loader/internal/graphics/shaders/scene-loader-joint-debug.frag
deleted file mode 100644
index a1153c9..0000000
--- a/dali-scene-loader/internal/graphics/shaders/scene-loader-joint-debug.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 300 es
-
-precision mediump float;
-flat in float vColor;
-out vec4 FragColor;
-
-void main()
-{
-  vec3 rgb = vec3(fract(vColor), fract(vColor * 0.00390625), fract(vColor * 0.00390625 * 0.00390625));
-  FragColor = vec4(rgb, 1.);
-}
\ No newline at end of file
diff --git a/dali-scene-loader/internal/graphics/shaders/scene-loader-joint-debug.vert b/dali-scene-loader/internal/graphics/shaders/scene-loader-joint-debug.vert
deleted file mode 100644
index 98b6086..0000000
--- a/dali-scene-loader/internal/graphics/shaders/scene-loader-joint-debug.vert
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 300 es
-
-precision mediump float;
-uniform mat4 uMvpMatrix;
-in vec3 aPosition;
-in float aColor;
-flat out float vColor;
-
-void main()
-{
-  vColor = aColor;
-  gl_Position = uMvpMatrix * vec4(aPosition, 1.0);
-}
\ No newline at end of file
diff --git a/dali-scene-loader/internal/hash.cpp b/dali-scene-loader/internal/hash.cpp
deleted file mode 100644
index 43d410f..0000000
--- a/dali-scene-loader/internal/hash.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/internal/hash.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-Hash::Hash(uint64_t initial)
-: mValue(initial)
-{
-}
-
-Hash& Hash::Add(bool b)
-{
-  mValue = Concatenate(b ? 0 : 1);
-  return *this;
-}
-
-Hash& Hash::Add(int32_t i)
-{
-  mValue = Concatenate(i);
-  return *this;
-}
-
-Hash& Hash::Add(uint32_t i)
-{
-  mValue = Concatenate(i);
-  return *this;
-}
-
-Hash& Hash::Add(uint64_t i)
-{
-  mValue = Concatenate(i);
-  return *this;
-}
-
-Hash& Hash::Add(float f)
-{
-  return AddObjectBytes(f);
-}
-
-Hash& Hash::Add(const char* cStr)
-{
-  return Add(cStr, strlen(cStr));
-}
-
-Hash& Hash::Add(const char* cStr, size_t len)
-{
-  auto i0 = reinterpret_cast<const uint8_t*>(cStr);
-  return AddBytes(i0, i0 + len);
-}
-
-Hash& Hash::Add(const std::string& str)
-{
-  auto i0 = reinterpret_cast<const uint8_t*>(str.c_str());
-  return AddBytes(i0, i0 + str.size());
-}
-
-Hash& Hash::AddBytes(const uint8_t* i0, const uint8_t* i1)
-{
-  while(i0 != i1)
-  {
-    mValue = Concatenate(*i0);
-    ++i0;
-  }
-  return *this;
-}
-
-Hash::operator uint64_t() const
-{
-  return mValue;
-}
-
-uint64_t Hash::Concatenate(uint64_t value)
-{
-  return mValue * 31 + value;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/internal/hash.h b/dali-scene-loader/internal/hash.h
deleted file mode 100644
index 22b770e..0000000
--- a/dali-scene-loader/internal/hash.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef DALI_SCENE_LOADER_HASH_H_
-#define DALI_SCENE_LOADER_HASH_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <cstdint>
-#include <cstring>
-#include <string>
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Rudimentary hash generator that follows a builder pattern.
- */
-class Hash
-{
-public:
-  static constexpr uint64_t DEFAULT_SEED = 61081;
-
-  explicit Hash(uint64_t initial = DEFAULT_SEED);
-
-  /**
-   * @brief Applies a boolean to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(bool b);
-
-  /**
-   * @brief Applies a signed 32-bit integer to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(int32_t i);
-
-  /**
-   * @brief Applies an unsigned 32-bit integer to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(uint32_t i);
-
-  /**
-   * @brief Applies an unsigned 64-bit integer to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(uint64_t i);
-
-  /**
-   * @brief Applies a float to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(float f);
-
-  /**
-   * @brief Applies a c-string to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(const char* cStr);
-
-  /**
-   * @brief Applies a c-string @a cStr of @a len characters, to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(const char* cStr, size_t len);
-
-  /**
-   * @brief Applies a string to the hash.
-   * @return Its updated self.
-   */
-  Hash& Add(const std::string& str);
-
-  /**
-   * @brief Applies a series of bytes between @a i0 and @a i1 to the hash.
-   * @return Its updated self.
-   */
-  Hash& AddBytes(const uint8_t* i0, const uint8_t* i1);
-
-  /**
-   * @brief Applies the bytes of an object @a value, to the hash.
-   * @return Its updated self.
-   */
-  template<typename T>
-  Hash& AddObjectBytes(const T& value);
-
-  operator uint64_t() const;
-
-private:
-  uint64_t mValue;
-
-  uint64_t Concatenate(uint64_t value);
-};
-
-template<typename T>
-Hash& Hash::AddObjectBytes(const T& value)
-{
-  auto i0 = reinterpret_cast<const uint8_t*>(&value);
-  auto i1 = i0 + sizeof(T);
-  while(i0 != i1)
-  {
-    mValue = Concatenate(*i0);
-    ++i0;
-  }
-  return *this;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_HASH_H_
diff --git a/dali-scene-loader/internal/json-reader.cpp b/dali-scene-loader/internal/json-reader.cpp
deleted file mode 100644
index 0353817..0000000
--- a/dali-scene-loader/internal/json-reader.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2021 Samsung Electronics Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*/
-#include "dali-scene-loader/internal/json-reader.h"
-#include <algorithm>
-#include <cstring>
-
-namespace json
-{
-int StrCmp(const json_string_s& js, const char* s)
-{
-  auto sSize   = strlen(s);
-  auto shorter = std::min(js.string_size, sSize);
-  auto base    = strncmp(js.string, s, shorter);
-  return ((base != 0) || (sSize == js.string_size)) ? base : ((js.string_size < sSize) ? -s[shorter] : js.string[shorter]);
-}
-
-int StrCmp(const json_string_s& js, const std::string& s)
-{
-  auto sSize   = s.size();
-  auto shorter = std::min(js.string_size, sSize);
-  auto base    = strncmp(js.string, s.c_str(), shorter);
-  return ((base != 0) || (sSize == js.string_size)) ? base : ((js.string_size < sSize) ? -s[shorter] : js.string[shorter]);
-}
-
-void Validate(const json_value_s& jv, json_type_e type)
-{
-  if(jv.type != type)
-  {
-    throw std::runtime_error("Invalid type; expected: " + std::to_string(type) + ", got: " + std::to_string(jv.type));
-  }
-}
-
-json_value_s* FindObjectChild(const std::string& key, json_object_s& obj)
-{
-  auto i = obj.start;
-  while(i)
-  {
-    if(0 == StrCmp(*i->name, key))
-    {
-      return i->value;
-    }
-    i = i->next;
-  }
-  return nullptr;
-}
-
-} // namespace json
diff --git a/dali-scene-loader/internal/json-reader.h b/dali-scene-loader/internal/json-reader.h
deleted file mode 100644
index 4fb6f7a..0000000
--- a/dali-scene-loader/internal/json-reader.h
+++ /dev/null
@@ -1,450 +0,0 @@
-#ifndef DALI_SCENE_LOADER_JSON_READER_H_
-#define DALI_SCENE_LOADER_JSON_READER_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/third-party/json.h"
-
-// EXTERNAL INCLUDES
-#include <algorithm>
-#include <cstring>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string_view>
-#include "dali/public-api/common/vector-wrapper.h"
-
-namespace json
-{
-/**
- * @brief Helper for freeing the memory allocated by json_parse()
- */
-struct json_value_deleter
-{
-  void operator()(json_value_s* p) const
-  {
-    free(p);
-  }
-};
-typedef std::unique_ptr<json_value_s, json_value_deleter> unique_ptr;
-
-/**
- * @brief Case sensitive comparison of json_string_s and c-string.
- * @return difference in first different character, or 0 if the strings are identical.
- */
-int StrCmp(const json_string_s& js, const char* s);
-
-/**
- * @brief Case sensitive comparison of json_string_s and std::string.
- * @return difference in first different character, or 0 if the strings are identical.
- */
-int StrCmp(const json_string_s& js, const std::string& s);
-
-/**
- * @brief Convenience function to compare json_string_s and other supported string type,
- *  in swapped order.
- */
-template<typename String>
-inline int StrCmp(String& s, const json_string_s& js)
-{
-  return -StrCmp(js, s);
-}
-
-/**
- * @brief Checks @a jv to be the given @a type, otherwise a std::runtime_error is thrown.
- */
-void Validate(const json_value_s& jv, json_type_e type);
-
-namespace detail
-{
-/**
- * @brief Compile-time type-enum mapping.
- */
-template<typename T>
-struct Type2Enum
-{
-};
-
-#define TYPE2ENUM(x)             \
-  template<>                     \
-  struct Type2Enum<json_##x##_s> \
-  {                              \
-    enum                         \
-    {                            \
-      VALUE = json_type_##x      \
-    };                           \
-  };
-
-TYPE2ENUM(object)
-TYPE2ENUM(array)
-TYPE2ENUM(string)
-TYPE2ENUM(number)
-#undef TYPE2ENUM
-} // namespace detail
-
-/**
- * @brief Casts the payload of a json_value_s to the given type.
- */
-template<typename Out>
-inline const Out& Cast(const json_value_s& j)
-{
-  Validate(j, static_cast<json_type_e>(detail::Type2Enum<typename std::decay<Out>::type>::VALUE));
-  return *static_cast<const Out*>(j.payload);
-}
-
-/**
- * @brief Casts the payload of a json_value_s to the given type.
- * @note std::runtime_error is thrown if the value is not the given type.
- */
-template<typename Out>
-inline Out& Cast(json_value_s& j)
-{
-  Validate(j, static_cast<json_type_e>(detail::Type2Enum<typename std::decay<Out>::type>::VALUE));
-  return *static_cast<Out*>(j.payload);
-}
-
-/**
- * @brief Helper function to find a child element of @a obj mapped to @a key.
- * @return Pointer to the element, or nullptr if it could not be found.
- */
-json_value_s* FindObjectChild(const std::string& key, json_object_s& obj);
-
-/**
- * @brief Helper functions for reading various value types.
- */
-struct Read
-{
-  static bool Boolean(const json_value_s& j)
-  {
-    if(j.type == json_type_true)
-    {
-      return true;
-    }
-    else if(j.type == json_type_false)
-    {
-      return false;
-    }
-    else // try to interpret a numeric value.
-    {
-      return Number<int>(j) != 0;
-    }
-  }
-
-  template<typename T>
-  static T Number(const json_value_s& j)
-  {
-    auto&             jn = Cast<const json_number_s>(j);
-    std::stringstream ss;
-    for(auto i0 = jn.number, i1 = i0 + jn.number_size; i0 != i1; ++i0)
-    {
-      ss.put(*i0);
-    }
-
-    T result;
-    if(ss >> result)
-    {
-      return result;
-    }
-    throw std::runtime_error("Failed to convert value to number");
-  }
-
-  template<typename E>
-  static E Enum(const json_value_s& j)
-  {
-    size_t number = Number<size_t>(j);
-    return static_cast<E>(number);
-  }
-
-  static std::string_view StringView(const json_value_s& j)
-  {
-    auto& js = Cast<json_string_s>(j);
-    return std::string_view(js.string, js.string_size);
-  }
-
-  static std::string String(const json_value_s& j)
-  {
-    auto& js = Cast<const json_string_s>(j);
-    return std::string(js.string, js.string_size);
-  }
-
-  template<typename T, T (*readElement)(const json_value_s&)>
-  static std::vector<T> Array(const json_value_s& j)
-  {
-    auto&          ja = Cast<const json_array_s>(j);
-    std::vector<T> result;
-    result.reserve(ja.length);
-    auto i = ja.start;
-    while(i)
-    {
-      result.push_back(std::move(readElement(*i->value)));
-      i = i->next;
-    }
-    return result;
-  }
-};
-
-/**
- * @brief Core class for object properties.
- */
-struct PropertyCore
-{
-protected:
-  explicit PropertyCore(const std::string& key)
-  : mKey(key)
-  {
-  }
-
-  const std::string& GetKey() const
-  {
-    return mKey;
-  }
-
-private:
-  std::string mKey;
-};
-
-/**
- * @brief Base class for the properties of a type T.
- */
-template<typename T>
-struct PropertyBase : PropertyCore
-{
-  using PropertyCore::GetKey;
-
-  explicit PropertyBase(const std::string& key)
-  : PropertyCore(key)
-  {
-  }
-
-  virtual ~PropertyBase()
-  {
-  }
-
-  virtual void Read(const json_value_s& j, T& obj) = 0;
-};
-
-/**
- * @brief Concrete property of an object to read into from JSON with a given function.
- */
-template<class T, typename U>
-struct Property : PropertyBase<T>
-{
-  using ReadFn        = U (*)(const json_value_s&);
-  using MemberPtr     = U T::*;
-  using SetterArgType = typename std::conditional<sizeof(U) <= sizeof(uintptr_t), U, const U&>::type;
-  using Setter        = void (T::*)(SetterArgType);
-
-  Property(const std::string& key, ReadFn read, MemberPtr ptr)
-  : PropertyBase<T>(key),
-    mRead(read),
-    mAccessor(new DirectAccessor(ptr))
-  {
-  }
-
-  Property(const std::string& key, ReadFn read, Setter setter)
-  : PropertyBase<T>(key),
-    mRead(read),
-    mAccessor(new SetterAccessor(setter))
-  {
-  }
-
-  ~Property()
-  {
-  }
-
-  void Read(const json_value_s& j, T& obj) override
-  {
-    mAccessor->Set(mRead(j), obj);
-  }
-
-private:
-  struct AccessorBase
-  {
-    virtual ~AccessorBase()
-    {
-    }
-
-    virtual void Set(U value, T& obj) const = 0;
-  };
-
-  struct DirectAccessor : AccessorBase
-  {
-    DirectAccessor(MemberPtr ptr)
-    : mPointer(ptr)
-    {
-    }
-
-    void Set(U value, T& obj) const override
-    {
-      obj.*mPointer = std::move(value);
-    }
-
-    MemberPtr mPointer;
-  };
-
-  struct SetterAccessor : AccessorBase
-  {
-    SetterAccessor(Setter setter)
-    : mSetter(setter)
-    {
-    }
-
-    void Set(U value, T& obj) const override
-    {
-      (obj.*mSetter)(value);
-    }
-
-    Setter mSetter;
-  };
-
-  ReadFn                        mRead;
-  std::unique_ptr<AccessorBase> mAccessor;
-};
-
-/**
- * @brief Helper function to make a Property for a member of type U, of object of type T.
- */
-template<class T, typename U>
-Property<T, U>* MakeProperty(const std::string& key, typename Property<T, U>::ReadFn readFn, U T::*ptr)
-{
-  return new Property<T, U>(key, readFn, ptr);
-}
-
-/**
- * @brief Core class for an object Reader.
- */
-struct ReaderCore
-{
-protected:
-  std::vector<void*> mProperties;
-
-  ReaderCore() = default;
-
-  ReaderCore(const ReaderCore& other) = delete;
-  ReaderCore& operator=(const ReaderCore& other) = delete;
-
-  ReaderCore(ReaderCore&& other) = default;
-  ReaderCore& operator=(ReaderCore&& other) = default;
-};
-
-/**
- * @brief Object Reader template for reading into an object of a given type,
- *  with properties registered for the various members.
- */
-template<typename T>
-class Reader : protected ReaderCore
-{
-public:
-  Reader() = default;
-
-  Reader(const Reader<T>& other) = delete;
-  Reader<T>& operator=(const Reader<T>& other) = delete;
-
-  Reader(Reader<T>&& other) = default;
-  Reader<T>& operator=(Reader&& other) = default;
-
-  ~Reader()
-  {
-    for(auto& p : mProperties)
-    {
-      delete Cast(p);
-    }
-  }
-
-  Reader<T>& Register(PropertyBase<T>& prop)
-  {
-    auto iInsert = std::lower_bound(mProperties.begin(), mProperties.end(), &prop, SortPredicate);
-    if(iInsert == mProperties.end() || Cast(*iInsert)->GetKey() != prop.GetKey())
-    {
-      mProperties.insert(iInsert, &prop);
-    }
-    else
-    {
-      delete Cast(*iInsert);
-      *iInsert = &prop;
-    }
-    return *this;
-  }
-
-  void Read(const json_object_s& jo, T& obj) const
-  {
-    auto i = jo.start;
-    while(i)
-    {
-      auto iFind = std::lower_bound(mProperties.begin(), mProperties.end(), *i->name, FindPredicate);
-      if(iFind != mProperties.end())
-      {
-        auto prop = Cast(*iFind);
-        if(0 == StrCmp(*i->name, prop->GetKey()))
-        {
-          prop->Read(*i->value, obj);
-        }
-      }
-      i = i->next;
-    }
-  }
-
-private:
-  static inline PropertyBase<T>* Cast(void* p)
-  {
-    return static_cast<PropertyBase<T>*>(p);
-  }
-
-  static bool SortPredicate(void* p, PropertyBase<T>* prop)
-  {
-    const auto prop0 = Cast(p);
-    return prop0->GetKey().compare(prop->GetKey()) < 0;
-  }
-
-  static bool FindPredicate(void* p, const json_string_s& key)
-  {
-    const auto prop = Cast(p);
-    return StrCmp(prop->GetKey(), key) < 0;
-  }
-};
-
-/**
- * @brief Wraps a Reader<T> in a function usable as a Property<T>::ReadFn, i.e. to facilitate
- *  deserializing structures of nested objects.
- */
-template<typename T>
-struct ObjectReader
-{
-  static const Reader<T>* sReader;
-
-  static T Read(const json_value_s& j)
-  {
-    T     result;
-    auto& jo = Cast<json_object_s>(j);
-    sReader->Read(jo, result);
-    return result;
-  }
-};
-
-template<typename T>
-const Reader<T>* ObjectReader<T>::sReader = nullptr;
-
-template<typename T>
-void SetObjectReader(const Reader<T>& r)
-{
-  ObjectReader<T>::sReader = &r;
-}
-
-} // namespace json
-
-#endif //DALI_SCENE_LOADER_JSON_READER_H_
diff --git a/dali-scene-loader/internal/json-util.cpp b/dali-scene-loader/internal/json-util.cpp
deleted file mode 100644
index 765568d..0000000
--- a/dali-scene-loader/internal/json-util.cpp
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/internal/json-util.h"
-
-// EXTERNAL INCLUDES
-#include <array>
-#include "dali/devel-api/common/map-wrapper.h"
-#include "dali/public-api/common/extents.h"
-#include "dali/public-api/math/matrix.h"
-#include "dali/public-api/math/matrix3.h"
-#include "dali/public-api/math/quaternion.h"
-#include "dali/public-api/math/radian.h"
-#include "dali/public-api/math/vector2.h"
-#include "dali/public-api/math/vector3.h"
-#include "dali/public-api/object/property-value.h"
-
-namespace Dali
-{
-using namespace Toolkit;
-
-namespace SceneLoader
-{
-namespace
-{
-template<typename T>
-Property::Value ReadPrimitiveHelper(const TreeNode* tn, bool (*reader)(const TreeNode*, T&))
-{
-  T value;
-  if(reader(tn, value))
-  {
-    return Property::Value(value);
-  }
-  return Property::Value();
-}
-
-template<typename T>
-Property::Value ReadVectorHelper(const TreeNode* tn)
-{
-  static_assert(sizeof(T) % sizeof(float) == 0, "");
-  T value;
-  if(ReadVector(tn, value.AsFloat(), sizeof(T) / sizeof(float)))
-  {
-    return Property::Value(value);
-  }
-  return Property::Value();
-}
-
-Property::Value ReadVectorSingleFloatHelper(const TreeNode* tn)
-{
-  float value;
-  if(ReadVector(tn, &value, 1u))
-  {
-    return Property::Value(value);
-  }
-  return Property::Value();
-}
-
-Property::Value ReadRotationHelper(const TreeNode* tn)
-{
-  switch(tn->Size())
-  {
-    case 3:
-    {
-      // degrees as per spec
-      Vector3 rotation;
-      ReadVector(tn, rotation.AsFloat(), 3u);
-      return Property::Value(Quaternion(Radian(Degree(rotation.x)),
-                                        Radian(Degree(rotation.y)),
-                                        Radian(Degree(rotation.z))));
-    }
-    case 4:
-    {
-      Vector4 v;
-      ReadVector(tn, v.AsFloat(), 4u);
-      //Quaternion
-      return Property::Value(Quaternion(v));
-    }
-    default:
-      return Property::Value();
-  }
-}
-
-template<typename T>
-bool ReadQuadHelper(const TreeNode* tn, const std::array<T*, 4>& quad)
-{
-  auto i     = quad.begin();
-  auto iEnd  = quad.end();
-  auto iJson = tn->CBegin();
-  while(iJson != tn->CEnd() && i != iEnd)
-  {
-    int value;
-    if(ReadInt(&(*iJson).second, value) && value <= std::numeric_limits<T>::max())
-    {
-      **i = value;
-      ++i;
-      ++iJson;
-    }
-    else
-    {
-      return false;
-    }
-  }
-  return true;
-}
-
-const std::map<std::string, Property::Value (*)(const TreeNode*)> kTypeIds{
-  // NONE
-  {"boolean", [](const TreeNode* tn) {
-     return ReadPrimitiveHelper<bool>(tn, ReadBool);
-   }},
-  {"float", [](const TreeNode* tn) {
-     return ReadPrimitiveHelper<float>(tn, ReadFloat);
-   }},
-  {"integer", [](const TreeNode* tn) {
-     return ReadPrimitiveHelper<int>(tn, ReadInt);
-   }},
-  {"vector2", ReadVectorHelper<Vector2>},
-  {"vector3", ReadVectorHelper<Vector3>},
-  {"vector4", ReadVectorHelper<Vector4>},
-  {"matrix3", ReadVectorHelper<Matrix3>},
-  {"matrix", ReadVectorHelper<Matrix>},
-  {"rectangle", [](const TreeNode* tn) {
-     Rect<int> value;
-     if(ReadQuadHelper<int>(tn, {&value.x, &value.y, &value.width, &value.height}))
-     {
-       return Property::Value(value);
-     }
-     return Property::Value();
-   }},
-  {"rotation", ReadRotationHelper},
-  // STRING - not particularly animatable
-  // ARRAY - not particularly animatable
-  // MAP - not particularly animatable
-  {"extents", [](const TreeNode* tn) {
-     Extents value;
-     if(ReadQuadHelper<uint16_t>(tn, {&value.start, &value.end, &value.top, &value.bottom}))
-     {
-       return Property::Value(value);
-     }
-     return Property::Value();
-   }},
-};
-
-Property::Value (*const kArrayPropertyProcessors[])(const TreeNode*){
-  ReadVectorHelper<Matrix>,
-  ReadVectorHelper<Matrix3>,
-  ReadVectorHelper<Vector4>,
-  ReadVectorHelper<Vector3>,
-  ReadVectorHelper<Vector2>,
-  ReadVectorSingleFloatHelper};
-
-} // namespace
-
-bool ReadBool(const TreeNode* node, bool& num)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  bool returnValue = false;
-  if(node->GetType() == TreeNode::BOOLEAN)
-  {
-    num         = node->GetBoolean();
-    returnValue = true;
-  }
-
-  return returnValue;
-}
-
-bool ReadInt(const TreeNode* node, int& num)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  bool returnValue = false;
-  if(node->GetType() == TreeNode::INTEGER)
-  {
-    num         = node->GetInteger();
-    returnValue = true;
-  }
-  else if(node->GetType() == TreeNode::FLOAT)
-  {
-    num         = static_cast<int>(node->GetFloat());
-    returnValue = true;
-  }
-
-  return returnValue;
-}
-
-bool ReadFloat(const TreeNode* node, float& num)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  bool returnValue = false;
-  if(node->GetType() == TreeNode::FLOAT)
-  {
-    num         = node->GetFloat();
-    returnValue = true;
-  }
-  else if(node->GetType() == TreeNode::INTEGER)
-  {
-    num         = static_cast<float>(node->GetInteger());
-    returnValue = true;
-  }
-
-  return returnValue;
-}
-
-bool ReadIndex(const Toolkit::TreeNode* node, Index& num)
-{
-  bool returnValue = node && node->GetType() == TreeNode::INTEGER;
-  if(returnValue)
-  {
-    num = static_cast<Index>(node->GetInteger());
-  }
-
-  return returnValue;
-}
-
-bool ReadBlob(const Toolkit::TreeNode* node, unsigned int& offset, unsigned int& length)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  int  iOffset, iLength;
-  bool success = ReadInt(node->GetChild("byteOffset"), iOffset) &&
-                 ReadInt(node->GetChild("byteLength"), iLength) &&
-                 iOffset >= 0 && iLength >= 0; // 0 length might not be sensible, but is not an error at this stage.
-  if(success)
-  {
-    offset = static_cast<unsigned int>(iOffset);
-    length = static_cast<unsigned int>(iLength);
-  }
-  return success;
-}
-
-size_t GetNumericalArraySize(const TreeNode* node)
-{
-  size_t size = 0;
-  if(node->GetType() == TreeNode::ARRAY)
-  {
-    for(auto i0 = node->CBegin(), i1 = node->CEnd(); i0 != i1 &&
-                                                     ((*i0).second.GetType() == TreeNode::FLOAT || (*i0).second.GetType() == TreeNode::INTEGER);
-        ++i0)
-    {
-      ++size;
-    }
-  }
-  return size;
-}
-
-bool ReadVector(const TreeNode* node, float* num, unsigned int size)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  bool returnValue = false;
-  if((node->Size() >= size) && (node->GetType() == TreeNode::ARRAY))
-  {
-    unsigned int offset = 0u;
-    for(TreeNode::ConstIterator it = node->CBegin(); offset < size; ++it, ++offset)
-    {
-      const TreeNode& coord = (*it).second;
-      if(!ReadFloat(&coord, *(num + offset)))
-      {
-        return false;
-      }
-    }
-    returnValue = true;
-  }
-
-  return returnValue;
-}
-
-bool ReadVector(const Toolkit::TreeNode* node, int* num, unsigned int size)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  bool returnValue = false;
-  if((node->Size() >= size) && (node->GetType() == TreeNode::ARRAY))
-  {
-    unsigned int offset = 0u;
-    for(TreeNode::ConstIterator it = node->CBegin(); offset < size; ++it, ++offset)
-    {
-      const TreeNode& coord = (*it).second;
-      if(!ReadInt(&coord, *(num + offset)))
-      {
-        return false;
-      }
-    }
-    returnValue = true;
-  }
-
-  return returnValue;
-}
-
-bool ReadColor(const TreeNode* node, Vector4& color)
-{
-  if(nullptr == node)
-  {
-    return false;
-  }
-
-  if(!ReadVector(node, color.AsFloat(), 4))
-  {
-    if(!ReadVector(node, color.AsFloat(), 3))
-    {
-      return false;
-    }
-    color.a = 1.f;
-  }
-
-  return true;
-}
-
-bool ReadTimePeriod(const TreeNode* node, TimePeriod& timePeriod)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  if(!ReadFloat(node->GetChild("delay"), timePeriod.delaySeconds) || !ReadFloat(node->GetChild("duration"), timePeriod.durationSeconds))
-  {
-    return false;
-  }
-  return true;
-}
-
-bool ReadString(const TreeNode* node, std::string& strValue)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  bool returnValue = false;
-  if(node->GetType() == TreeNode::STRING)
-  {
-    strValue    = node->GetString();
-    returnValue = true;
-  }
-  return returnValue;
-}
-
-bool ReadStringVector(const TreeNode* node, std::vector<std::string>& strvector)
-{
-  if(!node)
-  {
-    return false;
-  }
-
-  bool returnValue = false;
-  if(node->GetType() == TreeNode::ARRAY)
-  {
-    for(TreeNode::ConstIterator it = node->CBegin(); it != node->CEnd(); ++it)
-    {
-      const TreeNode& strNode = (*it).second;
-      if(strNode.GetType() == TreeNode::STRING)
-      {
-        strvector.push_back(strNode.GetString());
-      }
-      else
-      {
-        return false;
-      }
-    }
-    returnValue = true;
-  }
-  return returnValue;
-}
-
-Property::Value ReadPropertyValue(const Property::Type& propType, const TreeNode& tn)
-{
-  switch(propType)
-  {
-    case Property::BOOLEAN:
-      return ReadPrimitiveHelper<bool>(&tn, ReadBool);
-
-    case Property::FLOAT:
-      return ReadPrimitiveHelper<float>(&tn, ReadFloat);
-
-    case Property::INTEGER:
-      return ReadPrimitiveHelper<int>(&tn, ReadInt);
-
-    case Property::VECTOR2:
-      return ReadVectorHelper<Vector2>(&tn);
-
-    case Property::VECTOR3:
-      return ReadVectorHelper<Vector3>(&tn);
-
-    case Property::VECTOR4:
-      return ReadVectorHelper<Vector4>(&tn);
-
-    case Property::MATRIX3:
-      return ReadVectorHelper<Matrix3>(&tn);
-
-    case Property::MATRIX:
-      return ReadVectorHelper<Matrix>(&tn);
-
-    case Property::RECTANGLE:
-    {
-      Rect<int> value;
-      if(ReadQuadHelper<int>(&tn, {&value.x, &value.y, &value.width, &value.height}))
-      {
-        return Property::Value(value);
-      }
-      break;
-    }
-
-    case Property::ROTATION:
-      return ReadRotationHelper(&tn);
-
-    case Property::EXTENTS:
-    {
-      Extents value;
-      if(ReadQuadHelper<uint16_t>(&tn, {&value.start, &value.end, &value.top, &value.bottom}))
-      {
-        return Property::Value(value);
-      }
-      break;
-    }
-
-    case Property::NONE: // fall
-    default:
-    {
-      DALI_ASSERT_ALWAYS(!"Property type incorrect");
-    }
-  }
-  return Property::Value();
-}
-
-Property::Value ReadPropertyValue(const Toolkit::TreeNode& tn)
-{
-  Property::Value propValue;
-  if(tn.GetType() == TreeNode::OBJECT) // attempt to disambiguate type.
-  {
-    auto jsonType = tn.GetChild("type");
-    if(jsonType && jsonType->GetType() == TreeNode::STRING)
-    {
-      auto iFind = kTypeIds.find(jsonType->GetString());
-      if(iFind != kTypeIds.end())
-      {
-        propValue = iFind->second(tn.GetChild("value"));
-      }
-    }
-  }
-
-  if(propValue.GetType() == Property::NONE)
-  {
-    if(tn.Size() == 0)
-    {
-      switch(tn.GetType())
-      {
-        case TreeNode::BOOLEAN:
-          propValue = ReadPrimitiveHelper<bool>(&tn, ReadBool);
-          break;
-
-        case TreeNode::INTEGER:
-          propValue = ReadPrimitiveHelper<int>(&tn, ReadInt);
-          break;
-
-        case TreeNode::FLOAT:
-          propValue = ReadPrimitiveHelper<float>(&tn, ReadFloat);
-          break;
-
-        default:
-          break;
-      }
-    }
-    else
-    {
-      bool allNumbers = true;
-      for(auto i0 = tn.CBegin(), i1 = tn.CEnd(); i0 != i1; ++i0)
-      {
-        auto type = (*i0).second.GetType();
-        if(!(type == TreeNode::FLOAT || type == TreeNode::INTEGER))
-        {
-          allNumbers = false;
-          break;
-        }
-      }
-
-      if(allNumbers)
-      {
-        // NOTE: rotations / rectangles / extents must be disambiguated in all circumstances.
-        for(auto& r : kArrayPropertyProcessors)
-        {
-          propValue = r(&tn);
-          if(propValue.GetType() != Property::NONE)
-          {
-            break;
-          }
-        }
-      }
-    }
-  }
-  return propValue;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/internal/json-util.h b/dali-scene-loader/internal/json-util.h
deleted file mode 100644
index 9121bcd..0000000
--- a/dali-scene-loader/internal/json-util.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef DALI_SCENE_LOADER_JSON_UTIL_H_
-#define DALI_SCENE_LOADER_JSON_UTIL_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/index.h"
-
-// EXTERNAL INCLUDES
-#include "dali-toolkit/devel-api/builder/tree-node.h"
-#include "dali/public-api/animation/time-period.h"
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/math/vector4.h"
-#include "dali/public-api/object/property.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-bool ReadBool(const Toolkit::TreeNode* node, bool& num);
-
-bool ReadInt(const Toolkit::TreeNode* node, int& num);
-
-bool ReadFloat(const Toolkit::TreeNode* node, float& num);
-
-bool ReadIndex(const Toolkit::TreeNode* node, Index& num);
-
-bool ReadBlob(const Toolkit::TreeNode* node, unsigned int& offset, unsigned int& length);
-
-/**
- * @brief Gets the number of numerical element of a JSON array;
- * @return 0 if not an array, otherwise the number of float or integer elements
- *  at the front of the array.
- */
-size_t GetNumericalArraySize(const Toolkit::TreeNode* node);
-
-bool ReadVector(const Toolkit::TreeNode* node, float* num, unsigned int size);
-
-bool ReadVector(const Toolkit::TreeNode* node, int* num, unsigned int size);
-
-/**
- * @brief Reads a color.
- * 
- * The node contents could be a vector of 4 floats [r,g,b,a].
- * 
- * @param[in] node The tree node with the color.
- * @param[out] color The RGBA color.
- * 
- * @return true if succedded to read the color.
- */
-bool ReadColor(const Toolkit::TreeNode* node, Vector4& color);
-
-bool ReadTimePeriod(const Toolkit::TreeNode* node, TimePeriod& timePeriod);
-
-bool ReadString(const Toolkit::TreeNode* node, std::string& strValue);
-
-bool ReadStringVector(const Toolkit::TreeNode* node, std::vector<std::string>& strvector);
-
-/**
- * @brief Attempts to read a property of the given type from the given JSON node.
- * @return The property value that it could interpret. If unsuccessful, its type will be NONE.
- * @note Currently only numerical types are supported (including boolean).
- */
-Property::Value ReadPropertyValue(const Property::Type& propType, const Toolkit::TreeNode& tn);
-
-/**
- * @brief Attempts to read a property, whose type it will attempt to determine from the given
- *  JSON node.
- * @return The property value that it could interpret. If unsuccessful, its type will be NONE.
- * @note Currently only numerical types are supported (including boolean).
- * @note Supports a disambiguation syntax, whereby the type can be specified explicitly:
- *  { "type": "rotation", "value": [...] } .
- * @note: rotation / rectangle / extents type properties must be disambiguated in all circumstances.
- */
-Property::Value ReadPropertyValue(const Toolkit::TreeNode& tn);
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_JSON_UTIL_H_
diff --git a/dali-scene-loader/public-api/alpha-function-helper.cpp b/dali-scene-loader/public-api/alpha-function-helper.cpp
deleted file mode 100644
index b5168e0..0000000
--- a/dali-scene-loader/public-api/alpha-function-helper.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/alpha-function-helper.h"
-#include <unordered_map>
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-// clang-format off
-#define DALI_ALPHA_FUNCTION_ENTRY(x) { #x, AlphaFunction::x }
-// clang-format on
-
-std::unordered_map<std::string, AlphaFunction> sFunctions{
-  DALI_ALPHA_FUNCTION_ENTRY(DEFAULT),
-  DALI_ALPHA_FUNCTION_ENTRY(LINEAR),
-  DALI_ALPHA_FUNCTION_ENTRY(REVERSE),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_SQUARE),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT_SQUARE),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_IN),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_OUT),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_SINE),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT_SINE),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_OUT_SINE),
-  DALI_ALPHA_FUNCTION_ENTRY(BOUNCE),
-  DALI_ALPHA_FUNCTION_ENTRY(SIN),
-  DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT_BACK),
-};
-
-#undef DALI_ALPHA_FUNCTION_ENTRY
-
-} // namespace
-
-AlphaFunction GetAlphaFunction(const std::string& name, bool* found)
-{
-  auto iFind   = sFunctions.find(name);
-  bool success = iFind != sFunctions.end();
-  if(found)
-  {
-    *found = success;
-  }
-  return success ? iFind->second : AlphaFunction(AlphaFunction::DEFAULT);
-}
-
-void RegisterAlphaFunction(const std::string& name, AlphaFunction alphaFn)
-{
-  DALI_ASSERT_ALWAYS(sFunctions.insert({name, alphaFn}).second &&
-                     "Function with given key already exists.");
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/alpha-function-helper.h b/dali-scene-loader/public-api/alpha-function-helper.h
deleted file mode 100644
index a524b81..0000000
--- a/dali-scene-loader/public-api/alpha-function-helper.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
-#define DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "dali-scene-loader/public-api/api.h"
-
-#include <string>
-#include "dali/public-api/animation/alpha-function.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @return Given a name, provide a AlphaFunction; if the name was not
- *  recognised, get the default one.
- */
-AlphaFunction DALI_SCENE_LOADER_API GetAlphaFunction(const std::string& name, bool* found = nullptr);
-
-/**
- * @brief Registers an alpha function only if one with the same @a name has
- *  not yet been registered. Throws Exception the name isn't unique.
- */
-void DALI_SCENE_LOADER_API RegisterAlphaFunction(const std::string& name, AlphaFunction alphaFn) noexcept(false);
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
diff --git a/dali-scene-loader/public-api/animated-property.cpp b/dali-scene-loader/public-api/animated-property.cpp
deleted file mode 100644
index 3d1542d..0000000
--- a/dali-scene-loader/public-api/animated-property.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/animated-property.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-void AnimatedProperty::Animate(Animation& anim, GetActor getActor)
-{
-  if(Actor actor = getActor(mNodeName))
-  {
-    Property prop = GetProperty(actor);
-    if(mKeyFrames)
-    {
-      anim.AnimateBetween(prop, mKeyFrames, mAlphaFunction, mTimePeriod);
-    }
-    else if(mValue)
-    {
-      if(mValue->mIsRelative)
-      {
-        anim.AnimateBy(prop, mValue->mValue, mAlphaFunction, mTimePeriod);
-      }
-      else
-      {
-        anim.AnimateTo(prop, mValue->mValue, mAlphaFunction, mTimePeriod);
-      }
-    }
-  }
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/animated-property.h b/dali-scene-loader/public-api/animated-property.h
deleted file mode 100644
index 085b977..0000000
--- a/dali-scene-loader/public-api/animated-property.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef DALI_SCENE_LOADER_ANIMATED_PROPERTY_H
-#define DALI_SCENE_LOADER_ANIMATED_PROPERTY_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <functional>
-#include <memory>
-#include "dali/public-api/actors/actor.h"
-#include "dali/public-api/animation/animation.h"
-#include "dali/public-api/object/property.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Intermediate representation for a property that's given to
- *  a Animation to animate. Since there is no getting an
- *  animated property back from the Animation (i.e. past AnimateBetween/By/To()),
- *  changing properties (e.g. from the SDK) requires the whole Animation
- *  object to be recreated with all of its properties (incl. modifications).
- */
-struct DALI_SCENE_LOADER_API AnimatedProperty
-{
-public: // METHODS
-  /**
-   * @brief Function to obtain an Actor based on its name. Its processing will
-   *  ignore empty handles returned by it.
-   */
-  using GetActor = std::function<Actor(const std::string&)>;
-
-  /**
-   * @return The Property object (of the given @a actor) whose value is being animated.
-   */
-  Property GetProperty(Actor& actor)
-  {
-    auto idx = actor.GetPropertyIndex(mPropertyName);
-    return Property(actor, idx);
-  }
-
-  /**
-   * @brief The type of the Property (of the given @a actor) that is being animated.
-   */
-  Property::Type GetPropertyType(Actor& actor)
-  {
-    auto idx = actor.GetPropertyIndex(mPropertyName);
-    return actor.GetPropertyType(idx);
-  }
-
-  /**
-   * @brief Registers the animation of this property against the given @a anim.
-   *  @a getActor will be used to obtain the Actor named by this property.
-   *  Failing to find the actor purely means that this property will not be
-   *  animated.
-   */
-  void Animate(Animation& anim, GetActor getActor);
-
-public: // DATA
-  struct Value
-  {
-    Property::Value mValue;
-    bool            mIsRelative;
-  };
-
-  std::string mNodeName;
-  std::string mPropertyName;
-
-  KeyFrames              mKeyFrames;
-  std::unique_ptr<Value> mValue;
-
-  AlphaFunction mAlphaFunction = AlphaFunction::DEFAULT;
-  TimePeriod    mTimePeriod    = TimePeriod(0.f);
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_ANIMATED_PROPERTY_H
diff --git a/dali-scene-loader/public-api/animation-definition.cpp b/dali-scene-loader/public-api/animation-definition.cpp
deleted file mode 100644
index 850dd00..0000000
--- a/dali-scene-loader/public-api/animation-definition.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/animation-definition.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-const float AnimationDefinition::DEFAULT_DURATION_SECONDS = 1.f;
-const float AnimationDefinition::MIN_DURATION_SECONDS     = 1e-2f;
-
-Animation::EndAction AnimationDefinition::StopForModification(Animation& anim)
-{
-  const auto endAction = anim.GetEndAction();
-  anim.SetEndAction(Animation::DISCARD);
-  anim.Stop();
-  return endAction;
-}
-
-AnimationDefinition::AnimationDefinition() = default;
-
-AnimationDefinition::AnimationDefinition(AnimationDefinition&& other)
-: mName(std::move(other.mName)),
-  mDuration(other.mDuration),
-  mLoopCount(other.mLoopCount),
-  mDisconnectAction(other.mDisconnectAction),
-  mEndAction(other.mEndAction),
-  mSpeedFactor(other.mSpeedFactor),
-  mPlayRange(other.mPlayRange),
-  mProperties(std::move(other.mProperties))
-{
-}
-
-void AnimationDefinition::Animate(Animation& animation, AnimatedProperty::GetActor getActor)
-{
-  DALI_ASSERT_ALWAYS(animation);
-  for(auto& ap : mProperties)
-  {
-    ap.Animate(animation, getActor);
-  }
-}
-
-Animation AnimationDefinition::ReAnimate(AnimatedProperty::GetActor getActor)
-{
-  // Create and configure new animation.
-  Animation a = Animation::New(mDuration);
-  a.SetLoopCount(mLoopCount);
-  a.SetDisconnectAction(mDisconnectAction);
-  a.SetEndAction(mEndAction);
-
-  a.SetSpeedFactor(mSpeedFactor);
-  a.SetPlayRange(mPlayRange);
-
-  Animate(a, getActor);
-  return a;
-}
-
-AnimationDefinition& AnimationDefinition::operator=(AnimationDefinition&& other)
-{
-  AnimationDefinition tmp(std::move(other));
-  mName             = std::move(tmp.mName);
-  mDuration         = tmp.mDuration;
-  mLoopCount        = tmp.mLoopCount;
-  mDisconnectAction = tmp.mDisconnectAction;
-  mEndAction        = tmp.mEndAction;
-  mSpeedFactor      = tmp.mSpeedFactor;
-  mPlayRange        = tmp.mPlayRange;
-  mProperties.swap(tmp.mProperties);
-  return *this;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/animation-definition.h b/dali-scene-loader/public-api/animation-definition.h
deleted file mode 100644
index ea0dcb9..0000000
--- a/dali-scene-loader/public-api/animation-definition.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
-#define DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "dali-scene-loader/public-api/animated-property.h"
-#include "dali-scene-loader/public-api/api.h"
-#include "dali/public-api/common/vector-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Animation handle + name + definition of properties.
- */
-class DALI_SCENE_LOADER_API AnimationDefinition
-{
-public: // STATIC
-  // For Animations created in the SDK.
-  static const float DEFAULT_DURATION_SECONDS;
-
-  // For parsing Animations from dli, when duration was not defined.
-  static const float MIN_DURATION_SECONDS;
-
-  /**
-   * @brief Saves the original end action of @a anim, sets the end action to
-   *  Discard, then stops the animation and returns the end action.
-   */
-  static Animation::EndAction StopForModification(Animation& anim);
-
-public: // METHODS
-  AnimationDefinition();
-
-  AnimationDefinition(AnimationDefinition&& other);
-
-  /**
-   * @brief Registers the properties against the given @a animation. @a getActor
-   *  will be used to obtain the Actors for each AnimatedProperty.
-   */
-  void Animate(Animation& animation, AnimatedProperty::GetActor getActor);
-
-  /**
-   * @brief Creates a new Animation and Animates() its properties. @a getActor
-   *  will be used to obtain the Actors for each AnimatedProperty.
-   */
-  Animation ReAnimate(AnimatedProperty::GetActor getActor);
-
-  AnimationDefinition& operator=(AnimationDefinition&& other);
-
-public: // DATA
-  std::string mName;
-
-  float                mDuration         = DEFAULT_DURATION_SECONDS;
-  int                  mLoopCount        = 1;
-  Animation::EndAction mDisconnectAction = Animation::BAKE_FINAL;
-  Animation::EndAction mEndAction        = Animation::BAKE;
-  float                mSpeedFactor      = 1.f;
-  Vector2              mPlayRange        = Vector2{0.f, 1.f};
-
-  std::vector<AnimatedProperty> mProperties;
-};
-
-struct AnimationGroupDefinition
-{
-  std::string              mName;
-  std::vector<std::string> mAnimations;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_ANIMATION_DEFINITION_H
diff --git a/dali-scene-loader/public-api/api.h b/dali-scene-loader/public-api/api.h
deleted file mode 100644
index 45f4a1c..0000000
--- a/dali-scene-loader/public-api/api.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef DALI_SCENE_LOADER_API_H
-#define DALI_SCENE_LOADER_API_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#if __GNUC__ >= 4
-#define DALI_SCENE_LOADER_API __attribute__((visibility("default")))
-
-#elif defined(WIN32)
-#ifdef BUILDING_DALI_SCENE_LOADER
-#define DALI_SCENE_LOADER_API __declspec(dllexport)
-#else
-#define DALI_SCENE_LOADER_API __declspec(dllimport)
-#endif // BUILDING_DALI_SCENE_LOADER
-
-#endif
-
-#endif //DALI_SCENE_LOADER_API_H
diff --git a/dali-scene-loader/public-api/blend-shape-details.cpp b/dali-scene-loader/public-api/blend-shape-details.cpp
deleted file mode 100644
index 9e76924..0000000
--- a/dali-scene-loader/public-api/blend-shape-details.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-
-/*
-* Copyright (c) 2021 Samsung Electronics Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*/
-
-// FILE HEADER
-#include "dali-scene-loader/public-api/blend-shape-details.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/animation/constraints.h"
-#include "dali/public-api/object/property.h"
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/resource-bundle.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-const std::string BlendShapes::NUMBER_OF_BLEND_SHAPES("uNumberOfBlendShapes");
-const std::string BlendShapes::UNNORMALIZE_FACTOR("uBlendShapeUnnormalizeFactor");
-const std::string BlendShapes::COMPONENT_SIZE("uBlendShapeComponentSize");
-
-const std::string BlendShapes::COMPONENTS("blendShapeComponents");
-
-const std::string BlendShapes::WEIGHTS_UNIFORM("uBlendShapeWeight");
-
-void BlendShapes::ConfigureProperties(const std::pair<MeshDefinition, MeshGeometry>& mesh, Shader shader, Actor actor)
-{
-  unsigned int index = 0u;
-
-  char        weightNameBuffer[32];
-  char        unnormalizeFactorNameBuffer[64];
-  char* const pWeightName = weightNameBuffer + snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s", WEIGHTS_UNIFORM.c_str());
-  char* const pFactorName = unnormalizeFactorNameBuffer + snprintf(unnormalizeFactorNameBuffer, sizeof(unnormalizeFactorNameBuffer), "%s", UNNORMALIZE_FACTOR.c_str());
-  for(const auto& blendShape : mesh.first.mBlendShapes)
-  {
-    snprintf(pWeightName, sizeof(weightNameBuffer) - (pWeightName - weightNameBuffer), "[%d]", index);
-    std::string weightName{weightNameBuffer};
-    actor.RegisterProperty(weightName, blendShape.weight);
-
-    if(mesh.first.mBlendShapeVersion == Version::VERSION_1_0)
-    {
-      snprintf(pFactorName, sizeof(unnormalizeFactorNameBuffer) - (pFactorName - unnormalizeFactorNameBuffer), "[%d]", index);
-      std::string factorName{unnormalizeFactorNameBuffer};
-      shader.RegisterProperty(factorName, mesh.second.blendShapeUnnormalizeFactor[index]);
-    }
-
-    ++index;
-  }
-
-  if(Version::VERSION_2_0 == mesh.first.mBlendShapeVersion)
-  {
-    shader.RegisterProperty(UNNORMALIZE_FACTOR, mesh.second.blendShapeUnnormalizeFactor[0u]);
-  }
-
-  shader.RegisterProperty(NUMBER_OF_BLEND_SHAPES, Property::Value(static_cast<int>(index)));
-  shader.RegisterProperty(COMPONENT_SIZE, Property::Value(static_cast<int>(mesh.second.blendShapeBufferOffset)));
-
-  // Create a read only property to preserve the components of the blend shape.
-  int32_t components = 0x0;
-  for(auto& bs : mesh.first.mBlendShapes)
-  {
-    components |= (bs.deltas.IsDefined() * Component::POSITIONS) |
-                  (bs.normals.IsDefined() * Component::NORMALS) | (bs.tangents.IsDefined() * Component::TANGENTS);
-  }
-  shader.RegisterProperty(COMPONENTS, components, Property::AccessMode::READ_ONLY);
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/blend-shape-details.h b/dali-scene-loader/public-api/blend-shape-details.h
deleted file mode 100644
index 505fc5a..0000000
--- a/dali-scene-loader/public-api/blend-shape-details.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef DALI_SCENE_LOADER_BLEND_SHAPE_DETAILS_H
-#define DALI_SCENE_LOADER_BLEND_SHAPE_DETAILS_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <string>
-#include "dali/public-api/actors/actor.h"
-#include "dali/public-api/rendering/shader.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-struct MeshDefinition;
-struct MeshGeometry;
-
-struct DALI_SCENE_LOADER_API BlendShapes
-{
-  enum class Version
-  {
-    VERSION_1_0,
-    VERSION_2_0,
-    INVALID
-  };
-
-  struct Component
-  {
-    enum
-    {
-      POSITIONS = 0x1,
-      NORMALS   = 0x2,
-      TANGENTS  = 0x4
-    };
-  };
-
-  // shader properties - animatable (uniforms)
-  static const std::string NUMBER_OF_BLEND_SHAPES; ///< Integer number of blend shapes loaded.
-  static const std::string UNNORMALIZE_FACTOR;     ///< Scalar(s) for position components of blend shapes; Version 1.0: float array (1 per blend shape); Version 2.0: single float.
-  static const std::string COMPONENT_SIZE;         ///< Integer offset from one component (positions / normals / tangents) of a blend shape to the next.
-
-  // shader properties - read-only (not available as uniforms)
-  static const std::string COMPONENTS; ///< Integer bitmask of the blend shape components that the shader uses; refer to the Components enum.
-
-  // actor property (instance) - animatable (uniforms)
-  static const std::string WEIGHTS_UNIFORM; ///< The weight of each blend shape in a float array
-
-  /**
-   * @brief Registers properties based on the mesh definition (and geometry) and identified by the above string constants,
-   *  on the given @a shader and @a actor.
-   */
-  static void ConfigureProperties(const std::pair<MeshDefinition, MeshGeometry>& mesh, Shader shader, Actor actor);
-
-  BlendShapes() = delete;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_BLEND_SHAPE_DETAILS_H
diff --git a/dali-scene-loader/public-api/camera-parameters.cpp b/dali-scene-loader/public-api/camera-parameters.cpp
deleted file mode 100644
index d895255..0000000
--- a/dali-scene-loader/public-api/camera-parameters.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/camera-parameters.h"
-#include "dali-scene-loader/public-api/utils.h"
-#include "dali/integration-api/debug.h"
-#include "dali/public-api/actors/camera-actor.h"
-#include "dali/public-api/math/quaternion.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-/**
- * @brief Creates a perspective matrix.
- *
- * @param[out] result The perspective matrix.
- * @param[in] left The coordinate for the left vertical clipping plane.
- * @param[in] right The coordinate for the right vertical clipping plane.
- * @param[in] bottom The coordinate for the bottom horizontal clipping plane.
- * @param[in] top The coordinate for the top horizontal clipping plane.
- * @param[in] near The distance to the near depth clipping plane.
- * @param[in] far The distance to the far depth clipping plane.
- * @param[in] invertYAxis Whether to invert the 'Y' axis.
- */
-void Frustum(Matrix& result, float left, float right, float bottom, float top, float nearPlane, float farPlane, bool invertYAxis)
-{
-  float deltaZ = farPlane - nearPlane;
-  if((nearPlane <= 0.0f) || (farPlane <= 0.0f) || Equals(right, left) || Equals(bottom, top) || (deltaZ <= 0.0f))
-  {
-    DALI_LOG_ERROR("Invalid parameters passed into Frustum!\n");
-    DALI_ASSERT_DEBUG("Invalid parameters passed into Frustum!");
-    return;
-  }
-
-  float deltaX = right - left;
-  float deltaY = invertYAxis ? bottom - top : top - bottom;
-
-  result.SetIdentity();
-
-  float* m = result.AsFloat();
-  m[0]     = -2.0f * nearPlane / deltaX;
-  m[1] = m[2] = m[3] = 0.0f;
-
-  m[5] = -2.0f * nearPlane / deltaY;
-  m[4] = m[6] = m[7] = 0.0f;
-
-  m[8]  = (right + left) / deltaX;
-  m[9]  = (top + bottom) / deltaY;
-  m[10] = (nearPlane + farPlane) / deltaZ;
-  m[11] = 1.0f;
-
-  m[14] = -2.0f * nearPlane * farPlane / deltaZ;
-  m[12] = m[13] = m[15] = 0.0f;
-}
-
-/**
- * @brief Creates a perspective projection matrix.
- *
- * It calls Frustum()
- *
- * @param[out] result The perspective projection matrix.
- * @param[in] fovy The vertical field of view.
- * @param[in] aspect The aspect ratio.
- * @param[in] nearPlane The distance to the near depth clipping plane.
- * @param[in] farPlane The distance to the far depth clipping plane.
- * @param[in] invertYAxis Whether to invert the 'Y' axis.
- */
-void Perspective(Matrix& result, float fovy, float aspect, float nearPlane, float farPlane, bool invertYAxis)
-{
-  float frustumH = tanf(fovy * 0.5f) * nearPlane;
-  float frustumW = frustumH * aspect;
-
-  Frustum(result, -frustumW, frustumW, -frustumH, frustumH, nearPlane, farPlane, invertYAxis);
-}
-
-/**
-* @brief Creates an orthographic projection matrix.
-*
-* @param[out] result The orthographic projection matrix.
-* @param[in] left The coordinate for the left vertical clipping plane.
-* @param[in] right The coordinate for the right vertical clipping plane.
-* @param[in] bottom The coordinate for the bottom horizontal clipping plane.
-* @param[in] top The coordinate for the top horizontal clipping plane.
-* @param[in] nearPlane The distance to the near depth clipping plane.
-* @param[in] farPlane The distance to the far depth clipping plane.
-* @param[in] invertYAxis Whether to invert the 'Y' axis.
-*/
-void Orthographic(Matrix& result, float left, float right, float bottom, float top, float nearPlane, float farPlane, bool invertYAxis)
-{
-  if(Equals(right, left) || Equals(top, bottom) || Equals(farPlane, nearPlane))
-  {
-    DALI_LOG_ERROR("Cannot create orthographic projection matrix with a zero dimension.\n");
-    DALI_ASSERT_DEBUG("Cannot create orthographic projection matrix with a zero dimension.");
-    return;
-  }
-
-  float deltaX = right - left;
-  float deltaY = invertYAxis ? bottom - top : top - bottom;
-  float deltaZ = farPlane - nearPlane;
-
-  float* m = result.AsFloat();
-  m[0]     = -2.0f / deltaX;
-  m[1]     = 0.0f;
-  m[2]     = 0.0f;
-  m[3]     = 0.0f;
-
-  m[4] = 0.0f;
-  m[5] = -2.0f / deltaY;
-  m[6] = 0.0f;
-  m[7] = 0.0f;
-
-  m[8]  = 0.0f;
-  m[9]  = 0.0f;
-  m[10] = 2.0f / deltaZ;
-  m[11] = 0.0f;
-  m[12] = -(right + left) / deltaX;
-  m[13] = -(top + bottom) / deltaY;
-  m[14] = -(nearPlane + farPlane) / deltaZ;
-  m[15] = 1.0f;
-}
-
-} // namespace
-
-ViewProjection CameraParameters::GetViewProjection() const
-{
-  ViewProjection viewProjection;
-  // The projection matrix.
-  if(isPerspective)
-  {
-    Perspective(viewProjection.GetProjection(),
-                Radian(Degree(yFov)),
-                1.f,
-                zNear,
-                zFar,
-                true);
-  }
-  else
-  {
-    Orthographic(viewProjection.GetProjection(),
-                 orthographicSize.x,
-                 orthographicSize.y,
-                 orthographicSize.z,
-                 orthographicSize.w,
-                 zNear,
-                 zFar,
-                 true);
-  }
-
-  // The view matrix.
-  const Quaternion viewQuaternion(ANGLE_180, Vector3::YAXIS);
-  Vector3          translation;
-  Quaternion       cameraOrientation;
-  Vector3          scale;
-  matrix.GetTransformComponents(translation, cameraOrientation, scale);
-  cameraOrientation *= viewQuaternion;
-
-  viewProjection.GetView().SetInverseTransformComponents(scale,
-                                                         cameraOrientation,
-                                                         translation);
-
-  viewProjection.Update();
-  return viewProjection;
-}
-
-void CameraParameters::CalculateTransformComponents(Vector3& position, Quaternion& orientation, Vector3& scale) const
-{
-  matrix.GetTransformComponents(position, orientation, scale);
-
-  // The CameraActor is expected to look down the negative Z axis, towards the scene.
-  // Here we emulate the default direction of the camera in DALi.
-  Quaternion viewQuaternion(ANGLE_180, Vector3::YAXIS);
-  orientation *= viewQuaternion;
-}
-
-void CameraParameters::ConfigureCamera(CameraActor& camera) const
-{
-  SetActorCentered(camera);
-
-  if(isPerspective)
-  {
-    camera.SetProjectionMode(Camera::PERSPECTIVE_PROJECTION);
-    camera.SetNearClippingPlane(zNear);
-    camera.SetFarClippingPlane(zFar);
-    camera.SetFieldOfView(Radian(Degree(yFov)));
-  }
-  else
-  {
-    camera.SetProjectionMode(Camera::ORTHOGRAPHIC_PROJECTION);
-    camera.SetOrthographicProjection(orthographicSize.x,
-                                     orthographicSize.y,
-                                     orthographicSize.z,
-                                     orthographicSize.w,
-                                     zNear,
-                                     zFar);
-  }
-
-  // model
-  Vector3    camTranslation;
-  Vector3    camScale;
-  Quaternion camOrientation;
-  CalculateTransformComponents(camTranslation, camOrientation, camScale);
-
-  camera.SetInvertYAxis(true);
-  camera.SetProperty(Actor::Property::POSITION, camTranslation);
-  camera.SetProperty(Actor::Property::ORIENTATION, camOrientation);
-  camera.SetProperty(Actor::Property::SCALE, camScale);
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/camera-parameters.h b/dali-scene-loader/public-api/camera-parameters.h
deleted file mode 100644
index 06370fc..0000000
--- a/dali-scene-loader/public-api/camera-parameters.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef DALI_SCENE_LOADER_CAMERA_PARAMETERS_H
-#define DALI_SCENE_LOADER_CAMERA_PARAMETERS_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/view-projection.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/math/matrix.h"
-#include "dali/public-api/math/vector3.h"
-
-namespace Dali
-{
-class CameraActor;
-
-namespace SceneLoader
-{
-struct DALI_SCENE_LOADER_API CameraParameters
-{
-  Matrix  matrix           = Matrix::IDENTITY;
-  Vector4 orthographicSize = Vector4{-1.f, 1.f, 1.f, -1.f};
-  float   yFov             = 60.f;
-  float   zNear            = 0.1f;
-  float   zFar             = 1000.f;
-  bool    isPerspective    = true;
-
-  /**
-   * @return The view-projection matrix of the camera.
-   */
-  ViewProjection GetViewProjection() const;
-
-  /**
-   * @brief Calculates the @a position, @a orientation and @a scale that's defined
-   *        for this camera, and writes it into the respective variable.
-   */
-  void CalculateTransformComponents(Vector3& position, Quaternion& orientation, Vector3& scale) const;
-
-  /**
-   * @brief Configures the camera in the way that it is supposed to be used with
-   *        scene-loader scenes. This means inverted Y and a rotation of 180 degrees
-   *        along the Y axis, plus whatever the parameters define.
-   */
-  void ConfigureCamera(CameraActor& camera) const;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_CAMERA_PARAMETERS_H
diff --git a/dali-scene-loader/public-api/customization.cpp b/dali-scene-loader/public-api/customization.cpp
deleted file mode 100644
index ebf59c0..0000000
--- a/dali-scene-loader/public-api/customization.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/customization.h"
-#include "dali/devel-api/common/map-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-struct Customization::Map::Impl
-{
-  std::map<Tag, Customization> mCustomizations;
-};
-
-Customization::Map::Map()
-: mImpl{new Impl}
-{
-}
-
-Customization::Map::~Map() = default;
-
-Customization* Customization::Map::Set(Tag tag, Customization&& customization)
-{
-  auto& result = (mImpl->mCustomizations[tag] = customization);
-  return &result;
-}
-
-const Customization* Customization::Map::Get(Tag tag) const
-{
-  auto& customizations = mImpl->mCustomizations;
-  auto  iFind          = customizations.find(tag);
-  if(iFind != customizations.end())
-  {
-    return &iFind->second;
-  }
-  return nullptr;
-}
-
-Customization* Customization::Map::Get(Tag tag)
-{
-  auto& customizations = mImpl->mCustomizations;
-  auto  iFind          = customizations.find(tag);
-  if(iFind != customizations.end())
-  {
-    return &iFind->second;
-  }
-  return nullptr;
-}
-
-uint32_t Customization::Map::Size() const
-{
-  return mImpl->mCustomizations.size();
-}
-
-void Customization::Map::Clear()
-{
-  mImpl->mCustomizations.clear();
-}
-
-struct Customization::Choices::Impl
-{
-  std::map<Tag, OptionType> mOptions;
-};
-
-Customization::Choices::Choices()
-: mImpl{new Impl}
-{
-}
-
-Customization::Choices::~Choices() = default;
-
-void Customization::Choices::Set(Tag tag, OptionType option)
-{
-  mImpl->mOptions[tag] = option;
-}
-
-Customization::OptionType Customization::Choices::Get(Tag tag) const
-{
-  auto& options = mImpl->mOptions;
-  auto  iFind   = options.find(tag);
-  if(iFind != options.end())
-  {
-    return iFind->second;
-  }
-  return NONE;
-}
-
-uint32_t Customization::Choices::Size() const
-{
-  return mImpl->mOptions.size();
-}
-
-void Customization::Choices::Clear()
-{
-  mImpl->mOptions.clear();
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/customization.h b/dali-scene-loader/public-api/customization.h
deleted file mode 100644
index cdac2fc..0000000
--- a/dali-scene-loader/public-api/customization.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef DALI_SCENE_LOADER_CUSTOMIZATION_STATE_H_
-#define DALI_SCENE_LOADER_CUSTOMIZATION_STATE_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <memory>
-#include <string>
-#include "dali/public-api/common/vector-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Offers a description of an aspect of the scene that can be customized:
- *     the number of options, and the name of the nodes that are registered
- *     for the tag, whose children will be shown / hidden based on selection.
- */
-struct DALI_SCENE_LOADER_API Customization
-{
-  using Tag        = std::string;
-  using OptionType = uint32_t;
-
-  /**
-   * @brief A mapping of customizations to tags.
-   */
-  struct DALI_SCENE_LOADER_API Map
-  {
-    Map();
-    ~Map();
-
-    /**
-     * @brief Maps the given @a customization to the given @a tag, overwriting any previous mapping to the same tag.
-     * @return Pointer to the inserted (or pre-existing) Customization instance.
-     */
-    Customization* Set(Tag tag, Customization&& customization);
-
-    /**
-     * @brief Attempts to retrieve a const Customization based on the given @a tag.
-     */
-    const Customization* Get(Tag tag) const;
-
-    /**
-     * @brief Attempts to retrieve a Customization based on the given @a tag.
-     */
-    Customization* Get(Tag tag);
-
-    /**
-     * @brief Returns the number of elements.
-     */
-    uint32_t Size() const;
-
-    /*
-     * @brief Removes every element from the Map.
-     */
-    void Clear();
-
-  private:
-    struct Impl;
-    const std::unique_ptr<Impl> mImpl;
-  };
-
-  /**
-   * @brief A mapping of choices - indices of children of customization nodes to use - to tags.
-   */
-  struct DALI_SCENE_LOADER_API Choices
-  {
-    Choices();
-    ~Choices();
-
-    /**
-     * @brief Maps the given @a option to the given @a tag, overwriting any previous mapping to the same tag.
-     */
-    void Set(Tag tag, OptionType option);
-
-    /**
-     * @brief Attempts to retrieve a Customization based on the given @a tag. Returns NONE if @a tag is not known.
-     */
-    OptionType Get(Tag tag) const;
-
-    /**
-     * @brief Returns the number of elements.
-     */
-    uint32_t Size() const;
-
-    /*
-     * @brief Removes every element from the underlying map.
-     */
-    void Clear();
-
-  private:
-    struct Impl;
-    const std::unique_ptr<Impl> mImpl;
-  };
-
-  static const OptionType NONE = OptionType(-1);
-
-  OptionType               numOptions = 0;
-  std::vector<std::string> nodes; // to apply option to.
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_CUSTOMIZATION_STATE_H_
diff --git a/dali-scene-loader/public-api/dli-loader.cpp b/dali-scene-loader/public-api/dli-loader.cpp
deleted file mode 100644
index 18214dd..0000000
--- a/dali-scene-loader/public-api/dli-loader.cpp
+++ /dev/null
@@ -1,1802 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "dali-scene-loader/public-api/dli-loader.h"
-
-// EXTERNAL INCLUDES
-#include <algorithm>
-#include <cmath>
-#include <fstream>
-#include <limits>
-#include <memory>
-#include "dali-toolkit/devel-api/builder/json-parser.h"
-#include "dali/devel-api/common/map-wrapper.h"
-#include "dali/integration-api/debug.h"
-#include "dali/public-api/object/property-array.h"
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/internal/json-util.h"
-#include "dali-scene-loader/public-api/alpha-function-helper.h"
-#include "dali-scene-loader/public-api/animation-definition.h"
-#include "dali-scene-loader/public-api/blend-shape-details.h"
-#include "dali-scene-loader/public-api/camera-parameters.h"
-#include "dali-scene-loader/public-api/ktx-loader.h"
-#include "dali-scene-loader/public-api/light-parameters.h"
-#include "dali-scene-loader/public-api/load-result.h"
-#include "dali-scene-loader/public-api/parse-renderer-state.h"
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/skinning-details.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-#define DLI_0_1_COMPATIBILITY
-
-namespace Dali
-{
-using namespace Toolkit;
-
-namespace SceneLoader
-{
-namespace rs = RendererState;
-
-namespace
-{
-const std::string NODES         = "nodes";
-const std::string SCENES        = "scenes";
-const std::string NODE          = "node";
-const std::string URI           = "uri";
-const std::string URL           = "url";
-const std::string CUSTOMIZATION = "customization";
-const std::string HINTS         = "hints";
-const std::string NAME("name");
-const std::string BLEND_SHAPE_HEADER("blendShapeHeader");
-const std::string BLEND_SHAPES("blendShapes");
-const std::string BLEND_SHAPE_VERSION_1_0("1.0");
-const std::string BLEND_SHAPE_VERSION_2_0("2.0");
-const std::string VERSION("version");
-
-const char* const SHADOW_MAP_SIZE   = "shadowMapSize";
-const char* const ORTHOGRAPHIC_SIZE = "orthographicSize";
-const char* const PIXEL_UNITS       = "px";
-
-const char SLASH = '/';
-
-void ReadModelTransform(const TreeNode* node, Quaternion& orientation, Vector3& translation, Vector3& scale)
-{
-  float num[16u] = {.0f};
-
-  if(ReadVector(node->GetChild("matrix"), num, 16u))
-  {
-    Matrix mat(num);
-    mat.GetTransformComponents(translation, orientation, scale);
-  }
-  else
-  {
-    if(ReadVector(node->GetChild("angle"), num, 3u))
-    {
-      orientation = Quaternion(Radian(Degree(num[0u])), Radian(Degree(num[1u])), Radian(Degree(num[2u])));
-    }
-
-    if(ReadVector(node->GetChild("position"), num, 3u))
-    {
-      translation = Vector3(num);
-    }
-  }
-}
-
-bool ReadAttribBlob(const TreeNode* node, MeshDefinition::Blob& buffer)
-{
-  return ReadBlob(node, buffer.mOffset, buffer.mLength);
-}
-
-bool ReadAttribAccessor(const TreeNode* node, MeshDefinition::Accessor& accessor)
-{
-  return ReadBlob(node, accessor.mBlob.mOffset, accessor.mBlob.mLength);
-}
-
-bool ReadColorCode(const TreeNode* node, Vector4& color, DliLoader::ConvertColorCode convertColorCode)
-{
-  if(!node || !convertColorCode)
-  {
-    return false;
-  }
-
-  color = convertColorCode(node->GetString());
-
-  return true;
-}
-
-bool ReadColorCodeOrColor(const TreeNode* node, Vector4& color, DliLoader::ConvertColorCode convertColorCode)
-{
-  return ReadColorCode(node->GetChild("colorCode"), color, convertColorCode) ||
-         ReadColor(node->GetChild("color"), color);
-}
-
-RendererState::Type ReadRendererState(const TreeNode& tnRendererState)
-{
-  if(tnRendererState.GetType() == TreeNode::INTEGER)
-  {
-    return static_cast<RendererState::Type>(tnRendererState.GetInteger());
-  }
-  else if(tnRendererState.GetType() == TreeNode::STRING)
-  {
-    return RendererState::Parse(tnRendererState.GetString());
-  }
-  else
-  {
-    return -1;
-  }
-}
-
-///@brief Reads arc properties.
-void ReadArcField(const TreeNode* eArc, ArcNode& arc)
-{
-  ReadBool(eArc->GetChild("antiAliasing"), arc.mAntiAliasing);
-  ReadInt(eArc->GetChild("arcCaps"), arc.mArcCaps);
-  ReadFloat(eArc->GetChild("radius"), arc.mRadius);
-
-  arc.mStartAngleDegrees = .0f;
-  ReadFloat(eArc->GetChild("startAngle"), arc.mStartAngleDegrees);
-
-  arc.mEndAngleDegrees = .0f;
-  ReadFloat(eArc->GetChild("endAngle"), arc.mEndAngleDegrees);
-}
-
-const TreeNode* GetNthChild(const TreeNode* node, uint32_t index)
-{
-  uint32_t i = 0;
-  for(TreeNode::ConstIterator it = (*node).CBegin(); it != (*node).CEnd(); ++it, ++i)
-  {
-    if(i == index)
-    {
-      return &((*it).second);
-    }
-  }
-  return NULL;
-}
-
-const TreeNode* RequireChild(const TreeNode* node, const std::string& childName)
-{
-  auto child = node->GetChild(childName);
-  if(!child)
-  {
-    ExceptionFlinger flinger(ASSERT_LOCATION);
-    flinger << "Failed to find child node '" << childName << "'";
-    if(auto nodeName = node->GetName())
-    {
-      flinger << " on '" << nodeName << "'";
-    }
-    flinger << ".";
-  }
-  return child;
-}
-
-void ParseProperties(const Toolkit::TreeNode& node, Property::Array& array);
-
-void ParseProperties(const Toolkit::TreeNode& node, Property::Map& map)
-{
-  DALI_ASSERT_DEBUG(node.GetType() == TreeNode::OBJECT);
-  for(auto i0 = node.CBegin(), i1 = node.CEnd(); i0 != i1; ++i0)
-  {
-    auto kv = *i0;
-    switch(kv.second.GetType())
-    {
-      case TreeNode::ARRAY:
-      {
-        Property::Array array;
-        ParseProperties(kv.second, array);
-        map.Insert(kv.first, array);
-        break;
-      }
-
-      case TreeNode::OBJECT:
-      {
-        Property::Map innerMap;
-        ParseProperties(kv.second, innerMap);
-        map.Insert(kv.first, innerMap);
-        break;
-      }
-
-      case TreeNode::STRING:
-      {
-        map.Insert(kv.first, kv.second.GetString());
-        break;
-      }
-
-      case TreeNode::INTEGER:
-      {
-        map.Insert(kv.first, kv.second.GetInteger());
-        break;
-      }
-
-      case TreeNode::BOOLEAN:
-      {
-        map.Insert(kv.first, kv.second.GetBoolean());
-        break;
-      }
-
-      case TreeNode::FLOAT:
-      {
-        map.Insert(kv.first, kv.second.GetFloat());
-        break;
-      }
-
-      case TreeNode::IS_NULL:
-      {
-        break;
-      }
-    }
-  }
-}
-
-void ParseProperties(const Toolkit::TreeNode& node, Property::Array& array)
-{
-  DALI_ASSERT_DEBUG(node.GetType() == TreeNode::ARRAY);
-  for(auto i0 = node.CBegin(), i1 = node.CEnd(); i0 != i1; ++i0)
-  {
-    auto kv = *i0;
-    switch(kv.second.GetType())
-    {
-      case TreeNode::ARRAY:
-      {
-        Property::Array innerArray;
-        ParseProperties(kv.second, innerArray);
-        array.PushBack(innerArray);
-        break;
-      }
-
-      case TreeNode::OBJECT:
-      {
-        Property::Map map;
-        ParseProperties(kv.second, map);
-        array.PushBack(map);
-        break;
-      }
-
-      case TreeNode::STRING:
-      {
-        array.PushBack(kv.second.GetString());
-        break;
-      }
-
-      case TreeNode::INTEGER:
-      {
-        array.PushBack(kv.second.GetInteger());
-        break;
-      }
-
-      case TreeNode::BOOLEAN:
-      {
-        array.PushBack(kv.second.GetBoolean());
-        break;
-      }
-
-      case TreeNode::FLOAT:
-      {
-        array.PushBack(kv.second.GetFloat());
-        break;
-      }
-
-      case TreeNode::IS_NULL:
-      {
-        break;
-      }
-    }
-  }
-}
-
-} //namespace
-
-struct DliLoader::Impl
-{
-  StringCallback      mOnError = DefaultErrorCallback;
-  Toolkit::JsonParser mParser;
-
-  void ParseScene(LoadParams& params);
-
-private:
-  std::map<Index, Matrix> mInverseBindMatrices;
-
-  /**
-   * @brief Due to .dli nodes being processed in depth-first traversal with orphans being
-   *  ignored, features that rely on node indices (which is more compact and closer to
-   *  glTF) require a mapping from .dli node indices to those in the resulting SceneDefinition.
-   *  The index mapper is responsible for maintaing this mapping, and resolving node IDs
-   *  once the processing of the nodes has finished.
-   * @note The resolution requires the whole scene graph to finish parsing, therefore any
-   *  node extensions relying on node IDs will see the dli ID in their processor.
-   */
-  struct IIndexMapper
-  {
-    /**
-     * @brief Attempts to create a mapping from a node's @a dli index to its @a scene
-     *  index.
-     * @return Whether the operation was successful.
-     */
-    virtual bool Map(Index iDli, Index iScene) = 0;
-
-    /**
-     * @return The scene index for the node's @a dli index.
-     */
-    virtual Index Resolve(Index iDli) = 0;
-  };
-
-  /**
-   * @brief Traverses the DOM tree created by LoadDocument() in an attempt to create
-   *  an intermediate representation of resources and nodes.
-   */
-  void ParseSceneInternal(Index iScene, const Toolkit::TreeNode* tnScenes, const Toolkit::TreeNode* tnNodes, LoadParams& params);
-
-  void ParseSkeletons(const Toolkit::TreeNode* skeletons, SceneDefinition& scene, ResourceBundle& resources);
-  void ParseEnvironments(const Toolkit::TreeNode* environments, ResourceBundle& resources);
-  void ParseMaterials(const Toolkit::TreeNode* materials, ConvertColorCode convertColorCode, ResourceBundle& resources);
-
-  void ParseNodes(const Toolkit::TreeNode* nodes, Index index, LoadParams& params);
-  void ParseNodesInternal(const Toolkit::TreeNode* nodes, Index index, std::vector<Index>& inOutParentStack, LoadParams& params, IIndexMapper& indexMapper);
-
-  void ParseAnimations(const Toolkit::TreeNode* animations, LoadParams& params);
-  void ParseAnimationGroups(const Toolkit::TreeNode* animationGroups, LoadParams& params);
-
-  void ParseShaders(const Toolkit::TreeNode* shaders, ResourceBundle& resources);
-  void ParseMeshes(const Toolkit::TreeNode* meshes, ResourceBundle& resources);
-
-  void GetCameraParameters(std::vector<CameraParameters>& cameras) const;
-  void GetLightParameters(std::vector<LightParameters>& lights) const;
-};
-
-DliLoader::DliLoader()
-: mImpl{new Impl}
-{
-}
-
-DliLoader::~DliLoader() = default;
-
-void DliLoader::SetErrorCallback(StringCallback onError)
-{
-  mImpl->mOnError = onError;
-}
-
-bool DliLoader::LoadScene(const std::string& uri, LoadParams& params)
-{
-  std::string daliBuffer = LoadTextFile(uri.c_str());
-
-  auto& parser = mImpl->mParser;
-  parser       = JsonParser::New();
-  if(!parser.Parse(daliBuffer))
-  {
-    return false;
-  }
-
-  mImpl->ParseScene(params);
-  return true;
-}
-
-std::string DliLoader::GetParseError() const
-{
-  std::stringstream stream;
-
-  auto& parser = mImpl->mParser;
-  if(parser.ParseError())
-  {
-    stream << "position: " << parser.GetErrorPosition() << ", line: " << parser.GetErrorLineNumber() << ", column: " << parser.GetErrorColumn() << ", description: " << parser.GetErrorDescription() << ".";
-  }
-
-  return stream.str();
-}
-
-void DliLoader::Impl::ParseScene(LoadParams& params)
-{
-  auto& input  = params.input;
-  auto& output = params.output;
-
-  // get index of root node.
-  auto docRoot = mParser.GetRoot();
-
-  // Process resources first - these are shared
-  if(auto environments = docRoot->GetChild("environment"))
-  {
-    ParseEnvironments(environments, output.mResources); // NOTE: must precede parsing of materials
-  }
-
-  if(auto meshes = docRoot->GetChild("meshes"))
-  {
-    ParseMeshes(meshes, output.mResources);
-  }
-
-  if(auto shaders = docRoot->GetChild("shaders"))
-  {
-    ParseShaders(shaders, output.mResources);
-  }
-
-  if(auto materials = docRoot->GetChild("materials"))
-  {
-    ParseMaterials(materials, input.mConvertColorCode, output.mResources);
-  }
-
-  for(auto& c : input.mPreNodeCategoryProcessors)
-  {
-    if(auto node = docRoot->GetChild(c.first))
-    {
-      Property::Array array;
-      ParseProperties(*node, array);
-      c.second(std::move(array), mOnError);
-    }
-  }
-
-  // Process scenes
-  Index iScene = 0; // default scene
-  ReadIndex(docRoot->GetChild("scene"), iScene);
-
-  auto tnScenes = RequireChild(docRoot, "scenes");
-  auto tnNodes  = RequireChild(docRoot, "nodes");
-  ParseSceneInternal(iScene, tnScenes, tnNodes, params);
-
-  ParseSkeletons(docRoot->GetChild("skeletons"), output.mScene, output.mResources);
-
-  output.mScene.EnsureUniqueSkinningShaderInstances(output.mResources);
-  output.mScene.EnsureUniqueBlendShapeShaderInstances(output.mResources);
-
-  // Ger cameras and lights
-  GetCameraParameters(output.mCameraParameters);
-  GetLightParameters(output.mLightParameters);
-
-  // Post-node processors and animations last
-  for(auto& c : input.mPostNodeCategoryProcessors)
-  {
-    if(auto node = docRoot->GetChild(c.first))
-    {
-      Property::Array array;
-      ParseProperties(*node, array);
-      c.second(std::move(array), mOnError);
-    }
-  }
-
-  if(auto animations = docRoot->GetChild("animations"))
-  {
-    ParseAnimations(animations, params);
-  }
-
-  if(!output.mAnimationDefinitions.empty())
-  {
-    if(auto animationGroups = docRoot->GetChild("animationGroups"))
-    {
-      ParseAnimationGroups(animationGroups, params);
-    }
-  }
-}
-
-void DliLoader::Impl::ParseSceneInternal(Index iScene, const Toolkit::TreeNode* tnScenes, const Toolkit::TreeNode* tnNodes, LoadParams& params)
-{
-  auto getSceneRootIdx = [tnScenes, tnNodes](Index iScene) {
-    auto tn = GetNthChild(tnScenes, iScene); // now a "scene" object
-    if(!tn)
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << iScene << " is out of bounds access into " << SCENES << ".";
-    }
-
-    tn = RequireChild(tn, NODES); // now a "nodes" array
-    if(tn->GetType() != TreeNode::ARRAY)
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << SCENES << "[" << iScene << "]." << NODES << " has an invalid type; array required.";
-    }
-
-    if(tn->Size() < 1)
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << SCENES << "[" << iScene << "]." << NODES << " must define a node id.";
-    }
-
-    tn = GetNthChild(tn, 0); // now the first element of the array
-    Index iRootNode;
-    if(!ReadIndex(tn, iRootNode))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << SCENES << "[" << iScene << "]." << NODES << " has an invalid value for root node index: '" << iRootNode << "'.";
-    }
-
-    if(iRootNode >= tnNodes->Size())
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Root node index << " << iRootNode << " of scene " << iScene << " is out of bounds.";
-    }
-
-    tn = GetNthChild(tnNodes, iRootNode); // now a "node" object
-    if(tn->GetType() != TreeNode::OBJECT)
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Root node of scene " << iScene << " is of invalid JSON type; object required";
-    }
-
-    return iRootNode;
-  };
-
-  Index iRootNode = getSceneRootIdx(iScene);
-  ParseNodes(tnNodes, iRootNode, params);
-
-  auto& scene = params.output.mScene;
-  scene.AddRootNode(0);
-
-  for(Index i = 0; i < iScene; ++i)
-  {
-    Index       iRootNode = getSceneRootIdx(i);
-    const Index iRoot     = scene.GetNodeCount();
-    ParseNodes(tnNodes, iRootNode, params);
-    scene.AddRootNode(iRoot);
-  }
-
-  auto numScenes = tnScenes->Size();
-  for(Index i = iScene + 1; i < numScenes; ++i)
-  {
-    Index       iRootNode = getSceneRootIdx(i);
-    const Index iRoot     = scene.GetNodeCount();
-    ParseNodes(tnNodes, iRootNode, params);
-    scene.AddRootNode(iRoot);
-  }
-}
-
-void DliLoader::Impl::ParseSkeletons(const TreeNode* skeletons, SceneDefinition& scene, ResourceBundle& resources)
-{
-  if(skeletons)
-  {
-    auto iStart = skeletons->CBegin();
-    for(auto i0 = iStart, i1 = skeletons->CEnd(); i0 != i1; ++i0)
-    {
-      auto&       node = (*i0).second;
-      std::string skeletonRootName;
-      if(ReadString(node.GetChild(NODE), skeletonRootName))
-      {
-        SkeletonDefinition skeleton;
-        if(!scene.FindNode(skeletonRootName, &skeleton.mRootNodeIdx))
-        {
-          ExceptionFlinger(ASSERT_LOCATION) << FormatString("Skeleton %d: node '%s' not defined.", resources.mSkeletons.size(), skeletonRootName.c_str());
-        }
-
-        uint32_t                   jointCount = 0;
-        std::function<void(Index)> visitFn;
-        auto&                      ibms = mInverseBindMatrices;
-        visitFn                         = [&](Index id) {
-          auto node = scene.GetNode(id);
-          jointCount += ibms.find(id) != ibms.end();
-
-          for(auto i : node->mChildren)
-          {
-            visitFn(i);
-          }
-        };
-        visitFn(skeleton.mRootNodeIdx);
-
-        if(jointCount > Skinning::MAX_JOINTS)
-        {
-          mOnError(FormatString("Skeleton %d: joint count exceeds supported limit.", resources.mSkeletons.size()));
-          jointCount = Skinning::MAX_JOINTS;
-        }
-
-        skeleton.mJoints.reserve(jointCount);
-
-        visitFn = [&](Index id) {
-          auto iFind = ibms.find(id);
-          if(iFind != ibms.end() && skeleton.mJoints.size() < Skinning::MAX_JOINTS)
-          {
-            skeleton.mJoints.push_back({id, iFind->second});
-          }
-
-          auto node = scene.GetNode(id);
-          for(auto i : node->mChildren)
-          {
-            visitFn(i);
-          }
-        };
-        visitFn(skeleton.mRootNodeIdx);
-
-        resources.mSkeletons.push_back(std::move(skeleton));
-      }
-      else
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "skeleton " << std::distance(iStart, i0) << ": Missing required attribute '" << NODE << "'.";
-      }
-    }
-  }
-}
-
-void DliLoader::Impl::ParseEnvironments(const TreeNode* environments, ResourceBundle& resources)
-{
-  Matrix cubeOrientation(Matrix::IDENTITY);
-
-  for(auto i0 = environments->CBegin(), i1 = environments->CEnd(); i0 != i1; ++i0)
-  {
-    auto& node = (*i0).second;
-
-    EnvironmentDefinition envDef;
-    ReadString(node.GetChild("cubeSpecular"), envDef.mSpecularMapPath);
-    ReadString(node.GetChild("cubeDiffuse"), envDef.mDiffuseMapPath);
-    ToUnixFileSeparators(envDef.mSpecularMapPath);
-    ToUnixFileSeparators(envDef.mDiffuseMapPath);
-    envDef.mIblIntensity = 1.0f;
-    ReadFloat(node.GetChild("iblIntensity"), envDef.mIblIntensity);
-    if(ReadVector(node.GetChild("cubeInitialOrientation"), cubeOrientation.AsFloat(), 16u))
-    {
-      envDef.mCubeOrientation = Quaternion(cubeOrientation);
-    }
-
-    resources.mEnvironmentMaps.emplace_back(std::move(envDef), EnvironmentDefinition::Textures());
-  }
-
-  // NOTE: guarantees environmentMaps to have an empty environment.
-  if(resources.mEnvironmentMaps.empty())
-  {
-    resources.mEnvironmentMaps.emplace_back(EnvironmentDefinition(), EnvironmentDefinition::Textures());
-  }
-}
-
-void DliLoader::Impl::ParseShaders(const TreeNode* shaders, ResourceBundle& resources)
-{
-  uint32_t iShader = 0;
-  for(auto i0 = shaders->CBegin(), i1 = shaders->CEnd(); i0 != i1; ++i0, ++iShader)
-  {
-    auto&            node = (*i0).second;
-    ShaderDefinition shaderDef;
-    ReadStringVector(node.GetChild("defines"), shaderDef.mDefines);
-
-    // Read shader hints. Possible values are:
-    //                         Don't define for No hints.
-    // "OUTPUT_IS_TRANSPARENT" Might generate transparent alpha from opaque inputs.
-    //     "MODIFIES_GEOMETRY" Might change position of vertices, this option disables any culling optimizations.
-
-    ReadStringVector(node.GetChild(HINTS), shaderDef.mHints);
-
-    if(ReadString(node.GetChild("vertex"), shaderDef.mVertexShaderPath) &&
-       ReadString(node.GetChild("fragment"), shaderDef.mFragmentShaderPath))
-    {
-      ToUnixFileSeparators(shaderDef.mVertexShaderPath);
-      ToUnixFileSeparators(shaderDef.mFragmentShaderPath);
-
-      for(TreeNode::ConstIterator j0 = node.CBegin(), j1 = node.CEnd(); j0 != j1; ++j0)
-      {
-        const TreeNode::KeyNodePair& keyValue = *j0;
-        const std::string&           key      = keyValue.first;
-        const TreeNode&              value    = keyValue.second;
-
-        Property::Value uniformValue;
-        if(key.compare("vertex") == 0 || key.compare("fragment") == 0 || key.compare("defines") == 0 || key.compare(HINTS) == 0)
-        {
-          continue;
-        }
-        else if(key.compare("rendererState") == 0)
-        {
-          shaderDef.mRendererState = ReadRendererState(keyValue.second);
-        }
-        else if(value.GetType() == TreeNode::INTEGER || value.GetType() == TreeNode::FLOAT)
-        {
-          float f = 0.f;
-          ReadFloat(&value, f);
-          uniformValue = f;
-        }
-        else if(value.GetType() == TreeNode::BOOLEAN)
-        {
-          DALI_LOG_WARNING("\"bool\" uniforms are handled as floats in shader");
-          bool value = false;
-          if(ReadBool(&keyValue.second, value))
-          {
-            uniformValue = value ? 1.0f : 0.0f;
-          }
-        }
-        else
-          switch(auto size = GetNumericalArraySize(&value))
-          {
-            case 16:
-            {
-              Matrix m;
-              ReadVector(&value, m.AsFloat(), size);
-              uniformValue = m;
-              break;
-            }
-
-            case 9:
-            {
-              Matrix3 m;
-              ReadVector(&value, m.AsFloat(), size);
-              uniformValue = m;
-              break;
-            }
-
-            case 4:
-            {
-              Vector4 v;
-              ReadVector(&value, v.AsFloat(), size);
-              uniformValue = v;
-              break;
-            }
-
-            case 3:
-            {
-              Vector3 v;
-              ReadVector(&value, v.AsFloat(), size);
-              uniformValue = v;
-              break;
-            }
-
-            case 2:
-            {
-              Vector2 v;
-              ReadVector(&value, v.AsFloat(), size);
-              uniformValue = v;
-              break;
-            }
-
-            default:
-              mOnError(FormatString(
-                "shader %d: Ignoring uniform '%s': failed to infer type from %d elements.",
-                iShader,
-                key.c_str()));
-              break;
-          }
-
-        if(Property::NONE != uniformValue.GetType())
-        {
-          shaderDef.mUniforms.Insert(key, uniformValue);
-        }
-      }
-
-      resources.mShaders.emplace_back(std::move(shaderDef), Shader());
-    }
-    else
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "shader " << iShader << ": Missing vertex / fragment shader definition.";
-    }
-  }
-}
-
-void DliLoader::Impl::ParseMeshes(const TreeNode* meshes, ResourceBundle& resources)
-{
-  for(auto i0 = meshes->CBegin(), i1 = meshes->CEnd(); i0 != i1; ++i0)
-  {
-    auto& node = (*i0).second;
-
-    MeshDefinition meshDef;
-    if(!ReadString(node.GetChild(URI), meshDef.mUri))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "mesh " << resources.mMeshes.size() << ": Missing required attribute '" << URI << "'.";
-    }
-
-    ToUnixFileSeparators(meshDef.mUri);
-
-    std::string primitive;
-    if(ReadString(node.GetChild("primitive"), primitive))
-    {
-      if(primitive == "LINES")
-      {
-        meshDef.mPrimitiveType = Geometry::LINES;
-      }
-      else if(primitive == "POINTS")
-      {
-        meshDef.mPrimitiveType = Geometry::POINTS;
-      }
-      else if(primitive != "TRIANGLES")
-      {
-        mOnError(FormatString(
-          "mesh %d: Using TRIANGLES instead of unsupported primitive type '%s'.",
-          resources.mMeshes.size(),
-          primitive.c_str()));
-      }
-    }
-
-    int attributes;
-    if(ReadInt(node.GetChild("attributes"), attributes))
-    {
-      if(MaskMatch(attributes, MeshDefinition::INDICES) &&
-         !ReadAttribAccessor(node.GetChild("indices"), meshDef.mIndices))
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << FormatString("mesh %d: Failed to read %s.",
-                                                          resources.mMeshes.size(),
-                                                          "indices");
-      }
-
-      if(MaskMatch(attributes, MeshDefinition::POSITIONS) &&
-         !ReadAttribAccessor(node.GetChild("positions"), meshDef.mPositions))
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << FormatString("mesh %d: Failed to read %s.",
-                                                          resources.mMeshes.size(),
-                                                          "positions");
-      }
-
-      if(MaskMatch(attributes, MeshDefinition::NORMALS) &&
-         !ReadAttribAccessor(node.GetChild("normals"), meshDef.mNormals))
-      {
-        mOnError(FormatString("mesh %d: Failed to read %s.", resources.mMeshes.size(), "normals"));
-      }
-
-      if(MaskMatch(attributes, MeshDefinition::TEX_COORDS) &&
-         !ReadAttribAccessor(node.GetChild("textures"), meshDef.mTexCoords))
-      {
-        mOnError(FormatString("mesh %d: Failed to read %s.", resources.mMeshes.size(), "textures"));
-      }
-
-      if(MaskMatch(attributes, MeshDefinition::TANGENTS) &&
-         !ReadAttribAccessor(node.GetChild("tangents"), meshDef.mTangents))
-      {
-        mOnError(FormatString("mesh %d: Failed to read %s.", resources.mMeshes.size(), "tangents"));
-      }
-
-      // NOTE: we're no longer reading bitangents as these are calculated in the shaders.
-      if(ReadIndex(node.GetChild("skeleton"), meshDef.mSkeletonIdx))
-      {
-        if(!MaskMatch(attributes, MeshDefinition::JOINTS_0) &&
-           !MaskMatch(attributes, MeshDefinition::WEIGHTS_0))
-        {
-          mOnError(FormatString("mesh %d: Expected joints0 / weights0 attribute(s) missing.",
-                                resources.mMeshes.size()));
-        }
-        else if(!ReadAttribAccessor(node.GetChild("joints0"), meshDef.mJoints0) ||
-                !ReadAttribAccessor(node.GetChild("weights0"), meshDef.mWeights0))
-        {
-          mOnError(FormatString("mesh %d: Failed to read skinning information.",
-                                resources.mMeshes.size()));
-        }
-      }
-
-      if(auto blendshapeHeader = node.GetChild(BLEND_SHAPE_HEADER))
-      {
-        std::string blendShapeVersion;
-        ReadString(blendshapeHeader->GetChild(VERSION), blendShapeVersion);
-
-        if(0u == blendShapeVersion.compare(BLEND_SHAPE_VERSION_1_0))
-        {
-          meshDef.mBlendShapeVersion = BlendShapes::Version::VERSION_1_0;
-        }
-        else if(0u == blendShapeVersion.compare(BLEND_SHAPE_VERSION_2_0))
-        {
-          meshDef.mBlendShapeVersion = BlendShapes::Version::VERSION_2_0;
-        }
-
-        switch(meshDef.mBlendShapeVersion)
-        {
-          case BlendShapes::Version::VERSION_1_0:
-          case BlendShapes::Version::VERSION_2_0: // FALL THROUGH
-          {
-            ReadAttribBlob(blendshapeHeader, meshDef.mBlendShapeHeader);
-            break;
-          }
-          default:
-          {
-            // nothing to do
-            break;
-          }
-        }
-      }
-
-      if(auto blendShapes = node.GetChild(BLEND_SHAPES))
-      {
-        meshDef.mBlendShapes.resize(blendShapes->Size());
-
-        auto index = 0u;
-        for(auto it = blendShapes->CBegin(), endIt = blendShapes->CEnd(); it != endIt; ++it, ++index)
-        {
-          // Each blend shape is stored as the difference with the original mesh.
-
-          auto& blendShapeNode = (*it).second;
-
-          auto& blendShape = meshDef.mBlendShapes[index];
-          ReadString(blendShapeNode.GetChild("name"), blendShape.name);
-          if(auto position = blendShapeNode.GetChild("positions"))
-          {
-            ReadAttribAccessor(position, blendShape.deltas);
-          }
-          if(auto normals = blendShapeNode.GetChild("normals"))
-          {
-            ReadAttribAccessor(normals, blendShape.normals);
-          }
-          if(auto tangents = blendShapeNode.GetChild("tangents"))
-          {
-            ReadAttribAccessor(tangents, blendShape.tangents);
-          }
-          ReadFloat(blendShapeNode.GetChild("weight"), blendShape.weight);
-        }
-      }
-
-      bool flipV;
-      if(ReadBool(node.GetChild("flipV"), flipV))
-      {
-        meshDef.mFlags |= flipV * MeshDefinition::FLIP_UVS_VERTICAL;
-      }
-
-      resources.mMeshes.emplace_back(std::move(meshDef), MeshGeometry());
-    }
-  }
-}
-
-void DliLoader::Impl::ParseMaterials(const TreeNode* materials, ConvertColorCode convertColorCode, ResourceBundle& resources)
-{
-  for(auto i0 = materials->CBegin(), i1 = materials->CEnd(); i0 != i1; ++i0)
-  {
-    auto& node = (*i0).second;
-
-    MaterialDefinition materialDef;
-    if(auto eEnvironment = node.GetChild("environment"))
-    {
-      ReadIndex(eEnvironment, materialDef.mEnvironmentIdx);
-      if(static_cast<unsigned int>(materialDef.mEnvironmentIdx) >= resources.mEnvironmentMaps.size())
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "material " << resources.mMaterials.size() << ": Environment index " << materialDef.mEnvironmentIdx << " out of bounds (" << resources.mEnvironmentMaps.size() << ").";
-      }
-    }
-
-    //TODO : need to consider AGIF
-    std::vector<std::string> texturePaths;
-    std::string              texturePath;
-    if(ReadString(node.GetChild("albedoMap"), texturePath))
-    {
-      ToUnixFileSeparators(texturePath);
-      const auto semantic = MaterialDefinition::ALBEDO;
-      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
-      materialDef.mFlags |= semantic | MaterialDefinition::TRANSPARENCY; // NOTE: only in dli does single / separate ALBEDO texture mean TRANSPARENCY.
-    }
-    if(ReadString(node.GetChild("albedoMetallicMap"), texturePath))
-    {
-      ToUnixFileSeparators(texturePath);
-
-      if(MaskMatch(materialDef.mFlags, MaterialDefinition::ALBEDO))
-      {
-        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "albedo"));
-      }
-
-      const auto semantic = MaterialDefinition::ALBEDO | MaterialDefinition::METALLIC;
-      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
-      materialDef.mFlags |= semantic;
-    }
-
-    if(ReadString(node.GetChild("metallicRoughnessMap"), texturePath))
-    {
-      ToUnixFileSeparators(texturePath);
-
-      if(MaskMatch(materialDef.mFlags, MaterialDefinition::METALLIC))
-      {
-        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "metallic"));
-      }
-
-      const auto semantic = MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS;
-      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
-      materialDef.mFlags |= semantic |
-                            // We have a metallic-roughhness map and the first texture did not have albedo semantics - we're in the transparency workflow.
-                            (MaskMatch(materialDef.mFlags, MaterialDefinition::ALBEDO) * MaterialDefinition::TRANSPARENCY);
-    }
-
-    if(ReadString(node.GetChild("normalMap"), texturePath))
-    {
-      ToUnixFileSeparators(texturePath);
-
-      const auto semantic = MaterialDefinition::NORMAL;
-      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
-      materialDef.mFlags |= semantic |
-                            // We have a standalone normal map and the first texture did not have albedo semantics - we're in the transparency workflow.
-                            (MaskMatch(materialDef.mFlags, MaterialDefinition::ALBEDO) * MaterialDefinition::TRANSPARENCY);
-    }
-
-    if(ReadString(node.GetChild("normalRoughnessMap"), texturePath))
-    {
-      ToUnixFileSeparators(texturePath);
-
-      if(MaskMatch(materialDef.mFlags, MaterialDefinition::NORMAL))
-      {
-        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "normal"));
-      }
-
-      if(MaskMatch(materialDef.mFlags, MaterialDefinition::ROUGHNESS))
-      {
-        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "roughness"));
-      }
-
-      if(MaskMatch(materialDef.mFlags, MaterialDefinition::TRANSPARENCY))
-      {
-        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "transparency"));
-      }
-
-      const auto semantic = MaterialDefinition::NORMAL | MaterialDefinition::ROUGHNESS;
-      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
-      materialDef.mFlags |= semantic;
-    }
-
-    if(ReadString(node.GetChild("subsurfaceMap"), texturePath))
-    {
-      ToUnixFileSeparators(texturePath);
-
-      const auto semantic = MaterialDefinition::SUBSURFACE;
-      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
-      materialDef.mFlags |= semantic;
-    }
-
-    if(ReadColorCodeOrColor(&node, materialDef.mColor, convertColorCode) &&
-       materialDef.mColor.a < 1.0f)
-    {
-      materialDef.mFlags |= MaterialDefinition::TRANSPARENCY;
-    }
-
-    ReadFloat(node.GetChild("metallic"), materialDef.mMetallic);
-    ReadFloat(node.GetChild("roughness"), materialDef.mRoughness);
-
-    bool mipmaps;
-    if(ReadBool(node.GetChild("mipmap"), mipmaps) && mipmaps)
-    {
-      for(auto& ts : materialDef.mTextureStages)
-      {
-        ts.mTexture.mSamplerFlags |= SamplerFlags::FILTER_MIPMAP_LINEAR;
-      }
-    }
-
-    resources.mMaterials.emplace_back(std::move(materialDef), TextureSet());
-  }
-}
-
-void DliLoader::Impl::ParseNodes(const TreeNode* const nodes, Index index, LoadParams& params)
-{
-  std::vector<Index> parents;
-  parents.reserve(8);
-
-  struct IndexMapper : IIndexMapper
-  {
-    IndexMapper(size_t numNodes)
-    {
-      mIndices.reserve(numNodes);
-    }
-
-    virtual bool Map(Index iDli, Index iScene) override
-    {
-      Entry idx{iDli, iScene};
-      auto  iInsert = std::lower_bound(mIndices.begin(), mIndices.end(), idx);
-      if(iInsert == mIndices.end() || iInsert->iDli != iDli)
-      {
-        mIndices.insert(iInsert, idx);
-      }
-      else if(iInsert->iScene != iScene)
-      {
-        return false;
-      }
-      return true;
-    }
-
-    virtual unsigned int Resolve(Index iDli) override
-    {
-      auto iFind = std::lower_bound(mIndices.begin(), mIndices.end(), iDli, [](const Entry& idx, Index iDli) {
-        return idx.iDli < iDli;
-      });
-      DALI_ASSERT_ALWAYS(iFind != mIndices.end());
-      return iFind->iScene;
-    }
-
-  private:
-    struct Entry
-    {
-      unsigned int iDli;
-      unsigned int iScene;
-
-      bool operator<(const Entry& other) const
-      {
-        return iDli < other.iDli;
-      }
-    };
-    std::vector<Entry> mIndices;
-  } mapper(nodes->Size());
-  ParseNodesInternal(nodes, index, parents, params, mapper);
-
-  auto& scene = params.output.mScene;
-  for(size_t i0 = 0, i1 = scene.GetNodeCount(); i0 < i1; ++i0)
-  {
-    for(auto& c : scene.GetNode(i0)->mConstraints)
-    {
-      c.mSourceIdx = mapper.Resolve(c.mSourceIdx);
-    }
-  }
-}
-
-void DliLoader::Impl::ParseNodesInternal(const TreeNode* const nodes, Index index, std::vector<Index>& inOutParentStack, LoadParams& params, IIndexMapper& mapper)
-{
-  // Properties that may be resolved from a JSON value with ReadInt() -- or default to 0.
-  struct IndexProperty
-  {
-    ResourceType::Value type;
-    const TreeNode*     source;
-    Index&              target;
-  };
-  std::vector<IndexProperty> resourceIds;
-  resourceIds.reserve(4);
-
-  if(auto node = GetNthChild(nodes, index))
-  {
-    NodeDefinition nodeDef;
-    nodeDef.mParentIdx = inOutParentStack.empty() ? INVALID_INDEX : inOutParentStack.back();
-
-    // name
-    ReadString(node->GetChild(NAME), nodeDef.mName);
-
-    // transform
-    ReadModelTransform(node, nodeDef.mOrientation, nodeDef.mPosition, nodeDef.mScale);
-
-    // Reads the size of the node.
-    //
-    // * It can be given as 'size' or 'bounds'.
-    // * The sdk saves the 'size' as a vector2 in some cases.
-    // * To avoid size related issues the following code attemps
-    //   to read the 'size/bounds' as a vector3 first, if it's
-    //   not successful then reads it as a vector2.
-    ReadVector(node->GetChild("size"), nodeDef.mSize.AsFloat(), 3) ||
-      ReadVector(node->GetChild("size"), nodeDef.mSize.AsFloat(), 2) ||
-      ReadVector(node->GetChild("bounds"), nodeDef.mSize.AsFloat(), 3) ||
-      ReadVector(node->GetChild("bounds"), nodeDef.mSize.AsFloat(), 2);
-
-    // visibility
-    ReadBool(node->GetChild("visible"), nodeDef.mIsVisible);
-
-    // type classification
-    if(auto eCustomization = node->GetChild("customization")) // customization
-    {
-      std::string tag;
-      if(ReadString(eCustomization->GetChild("tag"), tag))
-      {
-        nodeDef.mCustomization.reset(new NodeDefinition::CustomizationDefinition{tag});
-      }
-    }
-    else // something renderable maybe
-    {
-      std::unique_ptr<NodeDefinition::Renderable> renderable;
-      ModelNode*                                  modelNode = nullptr; // no ownership, aliasing renderable for the right type.
-
-      const TreeNode* eRenderable = nullptr;
-      if((eRenderable = node->GetChild("model")))
-      {
-        // check for mesh before allocating - this can't be missing.
-        auto eMesh = eRenderable->GetChild("mesh");
-        if(!eMesh)
-        {
-          ExceptionFlinger(ASSERT_LOCATION) << "node " << nodeDef.mName << ": Missing mesh definition.";
-        }
-
-        modelNode = new ModelNode();
-        renderable.reset(modelNode);
-
-        resourceIds.push_back({ResourceType::Mesh, eMesh, modelNode->mMeshIdx});
-      }
-      else if((eRenderable = node->GetChild("arc")))
-      {
-        // check for mesh before allocating - this can't be missing.
-        auto eMesh = eRenderable->GetChild("mesh");
-        if(!eMesh)
-        {
-          ExceptionFlinger(ASSERT_LOCATION) << "node " << nodeDef.mName << ": Missing mesh definition.";
-        }
-
-        auto arcNode = new ArcNode;
-        renderable.reset(arcNode);
-        modelNode = arcNode;
-
-        resourceIds.push_back({ResourceType::Mesh, eMesh, arcNode->mMeshIdx});
-
-        ReadArcField(eRenderable, *arcNode);
-      }
-
-      if(renderable) // process common properties of all renderables + register payload
-      {
-        // shader
-        renderable->mShaderIdx = 0;
-        auto eShader           = eRenderable->GetChild("shader");
-        resourceIds.push_back({ResourceType::Shader, eShader, renderable->mShaderIdx});
-
-        // color
-        if(modelNode)
-        {
-          modelNode->mMaterialIdx = 0; // must offer default of 0
-          auto eMaterial          = eRenderable->GetChild("material");
-          resourceIds.push_back({ResourceType::Material, eMaterial, modelNode->mMaterialIdx});
-
-          if(!ReadColorCodeOrColor(eRenderable, modelNode->mColor, params.input.mConvertColorCode))
-          {
-            ReadColorCodeOrColor(node, modelNode->mColor, params.input.mConvertColorCode);
-          }
-        }
-
-        nodeDef.mRenderable = std::move(renderable);
-      }
-    }
-
-    // Resolve ints - default to 0 if undefined
-    auto& output = params.output;
-    for(auto& idRes : resourceIds)
-    {
-      Index iCheck = 0;
-      switch(idRes.type)
-      {
-        case ResourceType::Shader:
-          iCheck = output.mResources.mShaders.size();
-          break;
-
-        case ResourceType::Mesh:
-          iCheck = output.mResources.mMeshes.size();
-          break;
-
-        case ResourceType::Material:
-          iCheck = output.mResources.mMaterials.size();
-          break;
-
-        default:
-          ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ": Invalid resource type: " << idRes.type << " (Programmer error)";
-      }
-
-      if(!idRes.source)
-      {
-        idRes.target = 0;
-      }
-      else if(idRes.source->GetType() != TreeNode::INTEGER)
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ": Invalid " << GetResourceTypeName(idRes.type) << " index type.";
-      }
-      else
-      {
-        idRes.target = idRes.source->GetInteger();
-      }
-
-      if(idRes.target >= iCheck)
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ": " << GetResourceTypeName(idRes.type) << " index " << idRes.target << " out of bounds (" << iCheck << ").";
-      }
-    }
-    resourceIds.clear();
-
-    // Extra properties
-    if(auto eExtras = node->GetChild("extras"))
-    {
-      auto& extras = nodeDef.mExtras;
-      extras.reserve(eExtras->Size());
-
-      NodeDefinition::Extra e;
-      for(auto i0 = eExtras->CBegin(), i1 = eExtras->CEnd(); i0 != i1; ++i0)
-      {
-        auto eExtra = *i0;
-        e.mKey      = eExtra.first;
-        if(e.mKey.empty())
-        {
-          mOnError(FormatString("node %d: empty string is invalid for name of extra %d; ignored.",
-                                index,
-                                extras.size()));
-          continue;
-        }
-
-        e.mValue = ReadPropertyValue(eExtra.second);
-        if(e.mValue.GetType() == Property::Type::NONE)
-        {
-          mOnError(FormatString("node %d: failed to interpret value of extra '%s' : %s; ignored.",
-                                index,
-                                e.mKey.c_str(),
-                                eExtra.second.GetString()));
-        }
-        else
-        {
-          auto iInsert = std::lower_bound(extras.begin(), extras.end(), e);
-          if(iInsert != extras.end() && iInsert->mKey == e.mKey)
-          {
-            mOnError(FormatString("node %d: extra '%s' already defined; overriding with %s.",
-                                  index,
-                                  e.mKey.c_str(),
-                                  eExtra.second.GetString()));
-            *iInsert = std::move(e);
-          }
-          else
-          {
-            extras.insert(iInsert, e);
-          }
-        }
-      }
-    }
-
-    // Constraints
-    if(auto eConstraints = node->GetChild("constraints"))
-    {
-      auto& constraints = nodeDef.mConstraints;
-      constraints.reserve(eConstraints->Size());
-
-      ConstraintDefinition cDef;
-      for(auto i0 = eConstraints->CBegin(), i1 = eConstraints->CEnd(); i0 != i1; ++i0)
-      {
-        auto eConstraint = *i0;
-        if(!ReadIndex(&eConstraint.second, cDef.mSourceIdx))
-        {
-          mOnError(FormatString("node %d: node ID %s for constraint %d is invalid; ignored.",
-                                index,
-                                eConstraint.second.GetString(),
-                                constraints.size()));
-        }
-        else
-        {
-          cDef.mProperty = eConstraint.first;
-
-          auto iInsert = std::lower_bound(constraints.begin(), constraints.end(), cDef);
-          if(iInsert != constraints.end() && *iInsert == cDef)
-          {
-            mOnError(FormatString("node %d: constraint %s@%d already defined; ignoring.",
-                                  index,
-                                  cDef.mProperty.c_str(),
-                                  cDef.mSourceIdx));
-          }
-          else
-          {
-            constraints.insert(iInsert, cDef);
-          }
-        }
-      }
-    }
-
-    // Determine index for mapping
-    const unsigned int myIndex = output.mScene.GetNodeCount();
-    if(!mapper.Map(index, myIndex))
-    {
-      mOnError(FormatString("node %d: error mapping dli index %d: node has multiple parents. Ignoring subtree."));
-      return;
-    }
-
-    // if the node is a bone in a skeletal animation, it will have the inverse bind pose matrix.
-    Matrix invBindMatrix{false};
-    if(ReadVector(node->GetChild("inverseBindPoseMatrix"), invBindMatrix.AsFloat(), 16u)) // TODO: more robust error checking?
-    {
-      mInverseBindMatrices[myIndex] = invBindMatrix;
-    }
-
-    // Register nodeDef
-    auto rawDef = output.mScene.AddNode(std::make_unique<NodeDefinition>(std::move(nodeDef)));
-    if(rawDef) // NOTE: no ownership. Guaranteed to stay in scope.
-    {
-      // ...And only then parse children.
-      if(auto children = node->GetChild("children"))
-      {
-        inOutParentStack.push_back(myIndex);
-
-        rawDef->mChildren.reserve(children->Size());
-
-        uint32_t iChild = 0;
-        for(auto j0 = children->CBegin(), j1 = children->CEnd(); j0 != j1; ++j0, ++iChild)
-        {
-          auto& child = (*j0).second;
-          if(child.GetType() == TreeNode::INTEGER)
-          {
-            ParseNodesInternal(nodes, child.GetInteger(), inOutParentStack, params, mapper); // child object is created in scene definition.
-          }
-          else
-          {
-            ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ", child " << iChild << ": invalid index type.";
-          }
-        }
-
-        inOutParentStack.pop_back();
-      }
-      else if(rawDef->mCustomization)
-      {
-        mOnError(FormatString("node %d: not an actual customization without children.", index));
-      }
-
-      if(auto proc = params.input.mNodePropertyProcessor) // optional processing
-      {
-        // WARNING: constraint IDs are not resolved at this point.
-        Property::Map nodeData;
-        ParseProperties(*node, nodeData);
-        proc(*rawDef, std::move(nodeData), mOnError);
-      }
-    }
-    else
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Node " << index << ": name already used.";
-    }
-  }
-}
-
-void DliLoader::Impl::ParseAnimations(const TreeNode* tnAnimations, LoadParams& params)
-{
-  auto& definitions = params.output.mAnimationDefinitions;
-  definitions.reserve(definitions.size() + tnAnimations->Size());
-
-  for(TreeNode::ConstIterator iAnim = tnAnimations->CBegin(), iAnimEnd = tnAnimations->CEnd();
-      iAnim != iAnimEnd;
-      ++iAnim)
-  {
-    const TreeNode&     tnAnim = (*iAnim).second;
-    AnimationDefinition animDef;
-    ReadString(tnAnim.GetChild(NAME), animDef.mName);
-
-    auto       iFind     = std::lower_bound(definitions.begin(), definitions.end(), animDef, [](const AnimationDefinition& ad0, const AnimationDefinition& ad1) {
-      return ad0.mName < ad1.mName;
-    });
-    const bool overwrite = iFind != definitions.end() && iFind->mName == animDef.mName;
-    if(overwrite)
-    {
-      mOnError(FormatString("Pre-existing animation with name '%s' is being overwritten.", animDef.mName.c_str()));
-    }
-
-    // Duration -- We need something that animated properties' delay / duration can
-    // be expressed as a multiple of; 0 won't work. This is small enough (i.e. shorter
-    // than our frame delay) to not be restrictive WRT replaying. If anything needs
-    // to occur more frequently, then Animations are likely not your solution anyway.
-    animDef.mDuration = AnimationDefinition::MIN_DURATION_SECONDS;
-    if(!ReadFloat(tnAnim.GetChild("duration"), animDef.mDuration))
-    {
-      mOnError(FormatString("Animation '%s' fails to define '%s', defaulting to %f.",
-                            animDef.mName.c_str(),
-                            "duration",
-                            animDef.mDuration));
-    }
-
-    // Get loop count - # of playbacks. Default is once. 0 means repeat indefinitely.
-    animDef.mLoopCount = 1;
-    if(ReadInt(tnAnim.GetChild("loopCount"), animDef.mLoopCount) &&
-       animDef.mLoopCount < 0)
-    {
-      animDef.mLoopCount = 0;
-    }
-
-    std::string endAction;
-    if(ReadString(tnAnim.GetChild("endAction"), endAction))
-    {
-      if("BAKE" == endAction)
-      {
-        animDef.mEndAction = Animation::BAKE;
-      }
-      else if("DISCARD" == endAction)
-      {
-        animDef.mEndAction = Animation::DISCARD;
-      }
-      else if("BAKE_FINAL" == endAction)
-      {
-        animDef.mEndAction = Animation::BAKE_FINAL;
-      }
-    }
-
-    if(ReadString(tnAnim.GetChild("disconnectAction"), endAction))
-    {
-      if("BAKE" == endAction)
-      {
-        animDef.mDisconnectAction = Animation::BAKE;
-      }
-      else if("DISCARD" == endAction)
-      {
-        animDef.mDisconnectAction = Animation::DISCARD;
-      }
-      else if("BAKE_FINAL" == endAction)
-      {
-        animDef.mDisconnectAction = Animation::BAKE_FINAL;
-      }
-    }
-
-    if(const TreeNode* tnProperties = tnAnim.GetChild("properties"))
-    {
-      animDef.mProperties.reserve(tnProperties->Size());
-      for(TreeNode::ConstIterator iProperty = tnProperties->CBegin(), iPropertyEnd = tnProperties->CEnd();
-          iProperty != iPropertyEnd;
-          ++iProperty)
-      {
-        const TreeNode& tnProperty = (*iProperty).second;
-
-        AnimatedProperty animProp;
-        if(!ReadString(tnProperty.GetChild("node"), animProp.mNodeName))
-        {
-          mOnError(FormatString("Animation '%s': Failed to read the 'node' tag.", animDef.mName.c_str()));
-          continue;
-        }
-
-        if(!ReadString(tnProperty.GetChild("property"), animProp.mPropertyName))
-        {
-          mOnError(FormatString("Animation '%s': Failed to read the 'property' tag", animDef.mName.c_str()));
-          continue;
-        }
-
-        // these are the defaults
-        animProp.mTimePeriod.delaySeconds    = 0.f;
-        animProp.mTimePeriod.durationSeconds = animDef.mDuration;
-        if(!ReadTimePeriod(tnProperty.GetChild("timePeriod"), animProp.mTimePeriod))
-        {
-          mOnError(FormatString("Animation '%s': timePeriod missing in Property #%d: defaulting to %f.",
-                                animDef.mName.c_str(),
-                                animDef.mProperties.size(),
-                                animProp.mTimePeriod.durationSeconds));
-        }
-
-        std::string alphaFunctionValue;
-        if(ReadString(tnProperty.GetChild("alphaFunction"), alphaFunctionValue))
-        {
-          animProp.mAlphaFunction = GetAlphaFunction(alphaFunctionValue);
-        }
-
-        if(const TreeNode* tnKeyFramesBin = tnProperty.GetChild("keyFramesBin"))
-        {
-          DALI_ASSERT_ALWAYS(!animProp.mPropertyName.empty() && "Animation must specify a property name");
-
-          std::ifstream binAniFile;
-          std::string   animationFilename;
-          if(ReadString(tnKeyFramesBin->GetChild(URL), animationFilename))
-          {
-            std::string animationFullPath = params.input.mAnimationsPath + animationFilename;
-            binAniFile.open(animationFullPath, std::ios::binary);
-            if(binAniFile.fail())
-            {
-              ExceptionFlinger(ASSERT_LOCATION) << "Failed to open animation data '" << animationFullPath << "'";
-            }
-          }
-
-          int byteOffset = 0;
-          ReadInt(tnKeyFramesBin->GetChild("byteOffset"), byteOffset);
-          DALI_ASSERT_ALWAYS(byteOffset >= 0);
-
-          binAniFile.seekg(byteOffset, std::ios::beg);
-
-          int numKeys = 0;
-          ReadInt(tnKeyFramesBin->GetChild("numKeys"), numKeys);
-          DALI_ASSERT_ALWAYS(numKeys >= 0);
-
-          animProp.mKeyFrames = KeyFrames::New();
-
-          //In binary animation file only is saved the position, rotation, scale and blend shape weight keys.
-          //so, if it is vector3 we assume is position or scale keys, if it is vector4 we assume is rotation,
-          // otherwise are blend shape weight keys.
-          // TODO support for binary header with size information
-          Property::Type propType = Property::FLOAT; // assume blend shape weights
-          if(animProp.mPropertyName == "orientation")
-          {
-            propType = Property::VECTOR4;
-          }
-          else if((animProp.mPropertyName == "position") || (animProp.mPropertyName == "scale"))
-          {
-            propType = Property::VECTOR3;
-          }
-
-          //alphafunction is reserved for future implementation
-          // NOTE: right now we're just using AlphaFunction::LINEAR.
-          unsigned char dummyAlphaFunction;
-
-          float           progress;
-          Property::Value propValue;
-          for(int key = 0; key < numKeys; key++)
-          {
-            binAniFile.read(reinterpret_cast<char*>(&progress), sizeof(float));
-            if(propType == Property::VECTOR3)
-            {
-              Vector3 value;
-              binAniFile.read(reinterpret_cast<char*>(value.AsFloat()), sizeof(float) * 3);
-              propValue = Property::Value(value);
-            }
-            else if(propType == Property::VECTOR4)
-            {
-              Vector4 value;
-              binAniFile.read(reinterpret_cast<char*>(value.AsFloat()), sizeof(float) * 4);
-              propValue = Property::Value(Quaternion(value));
-            }
-            else
-            {
-              float value;
-              binAniFile.read(reinterpret_cast<char*>(&value), sizeof(float));
-              propValue = Property::Value(value);
-            }
-
-            binAniFile.read(reinterpret_cast<char*>(&dummyAlphaFunction), sizeof(unsigned char));
-
-            animProp.mKeyFrames.Add(progress, propValue, AlphaFunction::LINEAR);
-          }
-        }
-        else if(const TreeNode* tnKeyFrames = tnProperty.GetChild("keyFrames"))
-        {
-          DALI_ASSERT_ALWAYS(!animProp.mPropertyName.empty() && "Animation must specify a property name");
-          animProp.mKeyFrames = KeyFrames::New();
-
-          float progress = 0.0f;
-          for(auto i0 = tnKeyFrames->CBegin(), i1 = tnKeyFrames->CEnd(); i1 != i0; ++i0)
-          {
-            const TreeNode::KeyNodePair& kfKeyChild = *i0;
-            bool                         readResult = ReadFloat(kfKeyChild.second.GetChild("progress"), progress);
-            DALI_ASSERT_ALWAYS(readResult && "Key frame entry must have 'progress'");
-
-            const TreeNode* tnValue = kfKeyChild.second.GetChild("value");
-            DALI_ASSERT_ALWAYS(tnValue && "Key frame entry must have 'value'");
-
-            // For the "orientation" property, convert from Vector4 -> Rotation value
-            // This work-around is preferable to a null-pointer exception in the DALi update thread
-            Property::Value propValue(ReadPropertyValue(*tnValue));
-            if(propValue.GetType() == Property::VECTOR4 &&
-               animProp.mPropertyName == "orientation")
-            {
-              Vector4 v;
-              propValue.Get(v);
-              propValue = Property::Value(Quaternion(v.w, v.x, v.y, v.z));
-            }
-
-            AlphaFunction kfAlphaFunction(AlphaFunction::DEFAULT);
-            std::string   alphaFuncStr;
-            if(ReadString(kfKeyChild.second.GetChild("alphaFunction"), alphaFuncStr))
-            {
-              kfAlphaFunction = GetAlphaFunction(alphaFuncStr);
-            }
-
-            animProp.mKeyFrames.Add(progress, propValue, kfAlphaFunction);
-          }
-        }
-        else
-        {
-          const TreeNode* tnValue = tnProperty.GetChild("value");
-          if(tnValue)
-          {
-            animProp.mValue.reset(new AnimatedProperty::Value{ReadPropertyValue(*tnValue)});
-          }
-          else
-          {
-            mOnError(FormatString("Property '%s' fails to define target value.",
-                                  animProp.mPropertyName.c_str()));
-          }
-
-          ReadBool(tnProperty.GetChild("relative"), animProp.mValue->mIsRelative);
-        }
-
-        animDef.mProperties.push_back(std::move(animProp));
-      }
-    }
-
-    if(overwrite)
-    {
-      *iFind = std::move(animDef);
-    }
-    else
-    {
-      iFind = definitions.insert(iFind, std::move(animDef));
-    }
-
-    if(auto proc = params.input.mAnimationPropertyProcessor) // optional processing
-    {
-      Property::Map map;
-      ParseProperties(tnAnim, map);
-      proc(animDef, std::move(map), mOnError);
-    }
-  }
-}
-
-void DliLoader::Impl::ParseAnimationGroups(const Toolkit::TreeNode* tnAnimationGroups, LoadParams& params)
-{
-  auto& animGroups = params.output.mAnimationGroupDefinitions;
-
-  int numGroups = 0;
-  for(auto iGroups = tnAnimationGroups->CBegin(), iGroupsEnd = tnAnimationGroups->CEnd();
-      iGroups != iGroupsEnd;
-      ++iGroups, ++numGroups)
-  {
-    const auto& tnGroup = *iGroups;
-    auto        tnName  = tnGroup.second.GetChild(NAME);
-    std::string groupName;
-    if(!tnName || !ReadString(tnName, groupName))
-    {
-      mOnError(FormatString("Failed to get the name for the Animation group %d; ignoring.", numGroups));
-      continue;
-    }
-
-    auto iFind = std::lower_bound(animGroups.begin(), animGroups.end(), groupName, [](const AnimationGroupDefinition& group, const std::string& name) {
-      return group.mName < name;
-    });
-    if(iFind != animGroups.end() && iFind->mName == groupName)
-    {
-      mOnError(FormatString("Animation group with name '%s' already exists; new entries will be merged.", groupName.c_str()));
-    }
-    else
-    {
-      iFind = animGroups.insert(iFind, AnimationGroupDefinition{});
-    }
-
-    iFind->mName = groupName;
-
-    auto tnAnims = tnGroup.second.GetChild("animations");
-    if(tnAnims && tnAnims->Size() > 0)
-    {
-      auto& anims = iFind->mAnimations;
-      anims.reserve(anims.size() + tnAnims->Size());
-      for(auto iAnims = tnAnims->CBegin(), iAnimsEnd = tnAnims->CEnd(); iAnims != iAnimsEnd; ++iAnims)
-      {
-        anims.push_back((*iAnims).second.GetString());
-      }
-    }
-  }
-}
-
-void DliLoader::Impl::GetCameraParameters(std::vector<CameraParameters>& cameras) const
-{
-  if(const TreeNode* jsonCameras = mParser.GetRoot()->GetChild("cameras"))
-  {
-    cameras.resize(jsonCameras->Size());
-    auto iCamera = cameras.begin();
-    for(auto i0 = jsonCameras->CBegin(), i1 = jsonCameras->CEnd(); i0 != i1; ++i0)
-    {
-      auto& jsonCamera = (*i0).second;
-
-      ReadFloat(jsonCamera.GetChild("fov"), iCamera->yFov);
-      ReadFloat(jsonCamera.GetChild("near"), iCamera->zNear);
-      ReadFloat(jsonCamera.GetChild("far"), iCamera->zFar);
-      if(ReadVector(jsonCamera.GetChild("orthographic"), iCamera->orthographicSize.AsFloat(), 4u))
-      {
-        iCamera->isPerspective = false;
-      }
-
-      if(auto jsonMatrix = jsonCamera.GetChild("matrix"))
-      {
-        ReadVector(jsonMatrix, iCamera->matrix.AsFloat(), 16u);
-      }
-
-      ++iCamera;
-    }
-  }
-}
-
-void DliLoader::Impl::GetLightParameters(std::vector<LightParameters>& lights) const
-{
-  if(const TreeNode* jsonLights = mParser.GetRoot()->GetChild("lights"))
-  {
-    lights.resize(jsonLights->Size());
-    auto iLight = lights.begin();
-    for(auto i0 = jsonLights->CBegin(), i1 = jsonLights->CEnd(); i0 != i1; ++i0)
-    {
-      auto& jsonLight = (*i0).second;
-      if(!ReadVector(jsonLight.GetChild("matrix"), iLight->transform.AsFloat(), 16))
-      {
-        mOnError(
-          FormatString("Failed to parse light %d - \"matrix\" child with 16 floats expected.\n",
-                       std::distance(jsonLights->CBegin(), i0)));
-        continue;
-      }
-
-      int shadowMapSize = 0;
-      if(ReadInt(jsonLight.GetChild(SHADOW_MAP_SIZE), shadowMapSize) && shadowMapSize < 0)
-      {
-        mOnError(
-          FormatString("Failed to parse light %d - %s has an invalid value.",
-                       std::distance(jsonLights->CBegin(), i0),
-                       SHADOW_MAP_SIZE));
-        continue;
-      }
-      iLight->shadowMapSize = shadowMapSize;
-
-      float orthoSize = 0.f;
-      if(ReadFloat(jsonLight.GetChild(ORTHOGRAPHIC_SIZE), orthoSize) &&
-         (orthoSize < .0f || std::isnan(orthoSize) || std::isinf(orthoSize)))
-      {
-        mOnError(
-          FormatString("Failed to parse light %d - %s has an invalid value.",
-                       std::distance(jsonLights->CBegin(), i0),
-                       ORTHOGRAPHIC_SIZE));
-        continue;
-      }
-      iLight->orthographicSize = orthoSize;
-
-      if((iLight->shadowMapSize > 0) != (iLight->orthographicSize > .0f))
-      {
-        mOnError(FormatString(
-          "Light %d: Both shadow map size and orthographic size must be set for shadows to work.",
-          std::distance(jsonLights->CBegin(), i0)));
-      }
-
-      if(!ReadVector(jsonLight.GetChild("color"), iLight->color.AsFloat(), 3)) // color is optional
-      {
-        iLight->color = Vector3::ONE; // default to white
-      }
-
-      if(!ReadFloat(jsonLight.GetChild("intensity"), iLight->intensity)) // intensity is optional
-      {
-        iLight->intensity = 1.0f; // default to 1.0
-      }
-
-      if(!ReadFloat(jsonLight.GetChild("shadowIntensity"), iLight->shadowIntensity)) // intensity is optional
-      {
-        iLight->shadowIntensity = 1.0f; // default to 1.0
-      }
-
-      ++iLight;
-    }
-  }
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/dli-loader.h b/dali-scene-loader/public-api/dli-loader.h
deleted file mode 100644
index b46a7bf..0000000
--- a/dali-scene-loader/public-api/dli-loader.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef DALI_SCENE_LOADER_DLI_LOADER_H
-#define DALI_SCENE_LOADER_DLI_LOADER_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/animation-definition.h"
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/customization.h"
-#include "dali-scene-loader/public-api/index.h"
-#include "dali-scene-loader/public-api/string-callback.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/common/vector-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-typedef std::pair<std::string, std::string> Metadata;
-
-// Forward declarations
-struct LoadResult;
-struct CameraParameters;
-struct LightParameters;
-struct TextParameters;
-
-class ResourceBundle;
-struct NodeDefinition;
-class SceneDefinition;
-
-class DALI_SCENE_LOADER_API DliLoader
-{
-public:
-  using ConvertFontCode  = void (*)(const std::string& code, std::string& fontFamily, std::string& slant, std::string& weight, float& size);
-  using ConvertColorCode = Vector4 (*)(const std::string& code);
-
-  using CategoryProcessor       = std::function<void(Property::Array&& categoryData, StringCallback onError)>;
-  using CategoryProcessorVector = std::vector<std::pair<std::string /*name*/, CategoryProcessor>>;
-
-  using NodeProcessor = std::function<void(const NodeDefinition& nodeDef,
-                                           Property::Map&&       nodeData,
-                                           StringCallback        onError)>;
-
-  using AnimationProcessor = std::function<void(const AnimationDefinition& animDef,
-                                                Property::Map&&            animData,
-                                                StringCallback             onError)>;
-
-  struct InputParams
-  {
-    /**
-     * @brief The absolute path of animation binaries referenced in the .dli.
-     */
-    std::string mAnimationsPath;
-
-    /**
-     * @brief Provides a facility to determine a color from a code instead of RGB(A) values.
-     */
-    ConvertColorCode mConvertColorCode;
-
-    /**
-     * @brief A collection of handlers, mapped to the names of the top level (i.e. below
-     *  root) element, whom they will attempt to process. This will take place before
-     *  the parsing of scene Nodes and Animations, but after skeletons, environment, mesh,
-     *  shader and material resources.
-     */
-    CategoryProcessorVector mPreNodeCategoryProcessors;
-
-    /**
-     * @brief A collection of handlers, mapped to the names of the top level (i.e. below
-     *  root) element, whom they will attempt to process. This will take place after
-     *  the parsing of the scene Nodes and Animations.
-     */
-    CategoryProcessorVector mPostNodeCategoryProcessors;
-
-    /**
-     * @brief Provides an extension point to nodes. If provided, this function will be
-     *  called with each JSON element and definition, of a scene node.
-     * @note Constraints rely on ID resolution (from .dli to scene definition), which
-     *  takes place after the parsing of the nodes; therefore AT THIS POINT the node
-     *  IDs seen in constraints will still be the .dli IDs - NOT to be relied on for
-     *  indexing into mScene.
-     */
-    NodeProcessor mNodePropertyProcessor;
-
-    /**
-     * @brief Provides an extension point to animations. If provided, this function will be
-     *  called with each JSON element and fully processed definition, of an animation.
-     */
-    AnimationProcessor mAnimationPropertyProcessor;
-  };
-
-  struct LoadParams
-  {
-    InputParams const& input;
-    LoadResult&        output;
-  };
-
-  DliLoader();
-  ~DliLoader();
-
-  /**
-   * @brief Sets the callback that messages from non-fatal errors get posted to.
-   *  Uses DefaultErrorCallback by default.
-   */
-  void SetErrorCallback(StringCallback onError);
-
-  /**
-   * @brief Attempts to load and parse a .dli document into a DOM tree.
-   * @return Whether the operation was successful.
-   */
-  bool LoadScene(const std::string& uri, LoadParams& params);
-
-  /**
-   * @return The error string describing how the parse has failed, if any.
-   */
-  std::string GetParseError() const;
-
-private:
-  struct Impl;
-  const std::unique_ptr<Impl> mImpl;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_DLI_LOADER_H
diff --git a/dali-scene-loader/public-api/environment-definition.cpp b/dali-scene-loader/public-api/environment-definition.cpp
deleted file mode 100644
index c95883f..0000000
--- a/dali-scene-loader/public-api/environment-definition.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/environment-definition.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-EnvironmentDefinition::RawData
-EnvironmentDefinition::LoadRaw(const std::string& environmentsPath) const
-{
-  RawData raw;
-  auto    loadFn = [&environmentsPath](const std::string& path, CubeData& cd) {
-    if(path.empty())
-    {
-      cd.data.resize(6);
-      for(auto& face : cd.data)
-      {
-        face.push_back(PixelData::New(new uint8_t[3]{0xff, 0xff, 0xff}, 3, 1, 1, Pixel::RGB888, PixelData::DELETE_ARRAY));
-      }
-    }
-    else if(!LoadCubeMapData(environmentsPath + path, cd))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Failed to load cubemap texture from '" << path << "'.";
-    }
-  };
-
-  loadFn(mDiffuseMapPath, raw.mDiffuse);
-  loadFn(mSpecularMapPath, raw.mSpecular);
-  return raw;
-}
-
-EnvironmentDefinition::Textures EnvironmentDefinition::Load(RawData&& raw) const
-{
-  Textures textures;
-
-  // This texture should have 6 faces and only one mipmap
-  if(!raw.mDiffuse.data.empty())
-  {
-    textures.mDiffuse = raw.mDiffuse.CreateTexture();
-  }
-
-  // This texture should have 6 faces and 6 mipmaps
-  if(!raw.mSpecular.data.empty())
-  {
-    textures.mSpecular = raw.mSpecular.CreateTexture();
-  }
-  return textures;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/environment-definition.h b/dali-scene-loader/public-api/environment-definition.h
deleted file mode 100644
index 066f6fa..0000000
--- a/dali-scene-loader/public-api/environment-definition.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
-#define DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/ktx-loader.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/math/quaternion.h"
-#include "dali/public-api/rendering/texture.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Defines an environment map with either or both of radiance
- *  and irradiance maps.
- */
-struct DALI_SCENE_LOADER_API EnvironmentDefinition
-{
-  struct Textures
-  {
-    Texture mDiffuse;  // irradiance
-    Texture mSpecular; // radiance
-
-    bool IsLoaded() const
-    {
-      return mDiffuse || mSpecular;
-    }
-  };
-
-  struct RawData
-  {
-    CubeData mDiffuse;
-    CubeData mSpecular;
-  };
-
-  using EnvironmentData = std::pair<EnvironmentDefinition, Textures>;
-  using Vector          = std::vector<EnvironmentData>;
-
-  EnvironmentDefinition() = default;
-
-  EnvironmentDefinition(const EnvironmentDefinition&) = delete;
-  EnvironmentDefinition& operator=(const EnvironmentDefinition&) = delete;
-
-  EnvironmentDefinition(EnvironmentDefinition&&) = default;
-  EnvironmentDefinition& operator=(EnvironmentDefinition&&) = default;
-
-  /**
-   * @brief Loads raw pixel data for the given diffuse and specular maps.
-   * @note This can be done on any thread.
-   */
-  RawData LoadRaw(const std::string& environmentsPath) const;
-
-  /**
-   * @brief Creates DALi cubemap Textures from the pixel data in @a raw, then
-   *  returns them in a Textures object.
-   * @note This must only be called from the event thread.
-   */
-  Textures Load(RawData&& raw) const;
-
-public: // DATA
-  std::string mDiffuseMapPath;
-  std::string mSpecularMapPath;
-  Quaternion  mCubeOrientation = Quaternion::IDENTITY;
-  float       mIblIntensity    = 1.0f;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
diff --git a/dali-scene-loader/public-api/file.list b/dali-scene-loader/public-api/file.list
deleted file mode 100644
index 9c5fcbf..0000000
--- a/dali-scene-loader/public-api/file.list
+++ /dev/null
@@ -1,28 +0,0 @@
-set(scene_loader_public_api_dir "${scene_loader_dir}/public-api")
-
-set(scene_loader_src_files ${scene_loader_src_files}
-	${scene_loader_public_api_dir}/alpha-function-helper.cpp
-	${scene_loader_public_api_dir}/animated-property.cpp
-	${scene_loader_public_api_dir}/animation-definition.cpp
-	${scene_loader_public_api_dir}/blend-shape-details.cpp
-	${scene_loader_public_api_dir}/camera-parameters.cpp
-	${scene_loader_public_api_dir}/customization.cpp
-	${scene_loader_public_api_dir}/dli-loader.cpp
-	${scene_loader_public_api_dir}/environment-definition.cpp
-	${scene_loader_public_api_dir}/gltf2-loader.cpp
-	${scene_loader_public_api_dir}/ktx-loader.cpp
-	${scene_loader_public_api_dir}/material-definition.cpp
-	${scene_loader_public_api_dir}/matrix-stack.cpp
-	${scene_loader_public_api_dir}/mesh-definition.cpp
-	${scene_loader_public_api_dir}/node-definition.cpp
-	${scene_loader_public_api_dir}/parse-renderer-state.cpp
-	${scene_loader_public_api_dir}/renderer-state.cpp
-	${scene_loader_public_api_dir}/resource-bundle.cpp
-	${scene_loader_public_api_dir}/scene-definition.cpp
-	${scene_loader_public_api_dir}/shader-definition.cpp
-	${scene_loader_public_api_dir}/shader-definition-factory.cpp
-	${scene_loader_public_api_dir}/skinning-details.cpp
-	${scene_loader_public_api_dir}/string-callback.cpp
-	${scene_loader_public_api_dir}/utils.cpp
-	${scene_loader_public_api_dir}/view-projection.cpp
-)
diff --git a/dali-scene-loader/public-api/gltf2-loader.cpp b/dali-scene-loader/public-api/gltf2-loader.cpp
deleted file mode 100644
index 18923cf..0000000
--- a/dali-scene-loader/public-api/gltf2-loader.cpp
+++ /dev/null
@@ -1,1181 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/gltf2-loader.h"
-#include <fstream>
-#include "dali-scene-loader/internal/gltf2-asset.h"
-#include "dali-scene-loader/public-api/load-result.h"
-#include "dali-scene-loader/public-api/resource-bundle.h"
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/shader-definition-factory.h"
-#include "dali-scene-loader/public-api/utils.h"
-#include "dali/public-api/math/quaternion.h"
-
-#define ENUM_STRING_MAPPING(t, x) \
-  {                               \
-#x, t::x                      \
-  }
-
-namespace gt = gltf2;
-namespace js = json;
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-const std::string POSITION_PROPERTY("position");
-const std::string ORIENTATION_PROPERTY("orientation");
-const std::string SCALE_PROPERTY("scale");
-const std::string BLEND_SHAPE_WEIGHTS_UNIFORM("uBlendShapeWeight");
-
-const Geometry::Type GLTF2_TO_DALI_PRIMITIVES[]{
-  Geometry::POINTS,
-  Geometry::LINES,
-  Geometry::LINE_LOOP,
-  Geometry::LINE_STRIP,
-  Geometry::TRIANGLES,
-  Geometry::TRIANGLE_STRIP,
-  Geometry::TRIANGLE_FAN}; //...because Dali swaps the last two.
-
-struct AttributeMapping
-{
-  gt::Attribute::Type      mType;
-  MeshDefinition::Accessor MeshDefinition::*mAccessor;
-  uint16_t                                  mElementSizeRequired;
-} ATTRIBUTE_MAPPINGS[]{
-  {gt::Attribute::NORMAL, &MeshDefinition::mNormals, sizeof(Vector3)},
-  {gt::Attribute::TANGENT, &MeshDefinition::mTangents, sizeof(Vector3)},
-  {gt::Attribute::TEXCOORD_0, &MeshDefinition::mTexCoords, sizeof(Vector2)},
-  {gt::Attribute::JOINTS_0, &MeshDefinition::mJoints0, sizeof(Vector4)},
-  {gt::Attribute::WEIGHTS_0, &MeshDefinition::mWeights0, sizeof(Vector4)},
-};
-
-std::vector<gt::Animation> ReadAnimationArray(const json_value_s& j)
-{
-  gt::Animation proxy;
-  SetRefReaderObject(proxy);
-
-  auto results = js::Read::Array<gt::Animation, js::ObjectReader<gt::Animation>::Read>(j);
-
-  for(auto& animation : results)
-  {
-    for(auto& channel : animation.mChannels)
-    {
-      channel.mSampler.UpdateVector(animation.mSamplers);
-    }
-  }
-
-  return results;
-}
-
-void ApplyAccessorMinMax(const gt::Accessor& acc, float* values)
-{
-  DALI_ASSERT_ALWAYS(acc.mMax.empty() || gt::AccessorType::ElementCount(acc.mType) == acc.mMax.size());
-  DALI_ASSERT_ALWAYS(acc.mMin.empty() || gt::AccessorType::ElementCount(acc.mType) == acc.mMin.size());
-  MeshDefinition::Blob::ApplyMinMax(acc.mMin, acc.mMax, acc.mCount, values);
-}
-
-const auto BUFFER_READER = std::move(js::Reader<gt::Buffer>()
-                                       .Register(*js::MakeProperty("byteLength", js::Read::Number<uint32_t>, &gt::Buffer::mByteLength))
-                                       .Register(*js::MakeProperty("uri", js::Read::StringView, &gt::Buffer::mUri)));
-
-const auto BUFFER_VIEW_READER = std::move(js::Reader<gt::BufferView>()
-                                            .Register(*js::MakeProperty("buffer", gt::RefReader<gt::Document>::Read<gt::Buffer, &gt::Document::mBuffers>, &gt::BufferView::mBuffer))
-                                            .Register(*js::MakeProperty("byteOffset", js::Read::Number<uint32_t>, &gt::BufferView::mByteOffset))
-                                            .Register(*js::MakeProperty("byteLength", js::Read::Number<uint32_t>, &gt::BufferView::mByteLength))
-                                            .Register(*js::MakeProperty("byteStride", js::Read::Number<uint32_t>, &gt::BufferView::mByteStride))
-                                            .Register(*js::MakeProperty("target", js::Read::Number<uint32_t>, &gt::BufferView::mTarget)));
-
-const auto BUFFER_VIEW_CLIENT_READER = std::move(js::Reader<gt::BufferViewClient>()
-                                                   .Register(*js::MakeProperty("bufferView", gt::RefReader<gt::Document>::Read<gt::BufferView, &gt::Document::mBufferViews>, &gt::BufferViewClient::mBufferView))
-                                                   .Register(*js::MakeProperty("byteOffset", js::Read::Number<uint32_t>, &gt::BufferViewClient::mByteOffset)));
-
-const auto COMPONENT_TYPED_BUFFER_VIEW_CLIENT_READER = std::move(js::Reader<gt::ComponentTypedBufferViewClient>()
-                                                                   .Register(*new js::Property<gt::ComponentTypedBufferViewClient, gt::Ref<gt::BufferView>>("bufferView", gt::RefReader<gt::Document>::Read<gt::BufferView, &gt::Document::mBufferViews>, &gt::ComponentTypedBufferViewClient::mBufferView))
-                                                                   .Register(*new js::Property<gt::ComponentTypedBufferViewClient, uint32_t>("byteOffset", js::Read::Number<uint32_t>, &gt::ComponentTypedBufferViewClient::mByteOffset))
-                                                                   .Register(*js::MakeProperty("componentType", js::Read::Enum<gt::Component::Type>, &gt::ComponentTypedBufferViewClient::mComponentType)));
-
-const auto ACCESSOR_SPARSE_READER = std::move(js::Reader<gt::Accessor::Sparse>()
-                                                .Register(*js::MakeProperty("count", js::Read::Number<uint32_t>, &gt::Accessor::Sparse::mCount))
-                                                .Register(*js::MakeProperty("indices", js::ObjectReader<gt::ComponentTypedBufferViewClient>::Read, &gt::Accessor::Sparse::mIndices))
-                                                .Register(*js::MakeProperty("values", js::ObjectReader<gt::BufferViewClient>::Read, &gt::Accessor::Sparse::mValues)));
-
-const auto ACCESSOR_READER = std::move(js::Reader<gt::Accessor>()
-                                         .Register(*new js::Property<gt::Accessor, gt::Ref<gt::BufferView>>("bufferView",
-                                                                                                            gt::RefReader<gt::Document>::Read<gt::BufferView, &gt::Document::mBufferViews>,
-                                                                                                            &gt::Accessor::mBufferView))
-                                         .Register(*new js::Property<gt::Accessor, uint32_t>("byteOffset",
-                                                                                             js::Read::Number<uint32_t>,
-                                                                                             &gt::Accessor::mByteOffset))
-                                         .Register(*new js::Property<gt::Accessor, gt::Component::Type>("componentType",
-                                                                                                        js::Read::Enum<gt::Component::Type>,
-                                                                                                        &gt::Accessor::mComponentType))
-                                         .Register(*new js::Property<gt::Accessor, std::string_view>("name", js::Read::StringView, &gt::Accessor::mName))
-                                         .Register(*js::MakeProperty("count", js::Read::Number<uint32_t>, &gt::Accessor::mCount))
-                                         .Register(*js::MakeProperty("normalized", js::Read::Boolean, &gt::Accessor::mNormalized))
-                                         .Register(*js::MakeProperty("type", gt::ReadStringEnum<gt::AccessorType>, &gt::Accessor::mType))
-                                         .Register(*js::MakeProperty("min", js::Read::Array<float, js::Read::Number>, &gt::Accessor::mMin))
-                                         .Register(*js::MakeProperty("max", js::Read::Array<float, js::Read::Number>, &gt::Accessor::mMax))
-                                         .Register(*new js::Property<gt::Accessor, gt::Accessor::Sparse>("sparse", js::ObjectReader<gt::Accessor::Sparse>::Read, &gt::Accessor::SetSparse)));
-
-const auto IMAGE_READER = std::move(js::Reader<gt::Image>()
-                                      .Register(*new js::Property<gt::Image, std::string_view>("name", js::Read::StringView, &gt::Material::mName))
-                                      .Register(*js::MakeProperty("uri", js::Read::StringView, &gt::Image::mUri))
-                                      .Register(*js::MakeProperty("mimeType", js::Read::StringView, &gt::Image::mMimeType))
-                                      .Register(*js::MakeProperty("bufferView", gt::RefReader<gt::Document>::Read<gt::BufferView, &gt::Document::mBufferViews>, &gt::Image::mBufferView)));
-
-const auto SAMPLER_READER = std::move(js::Reader<gt::Sampler>()
-                                        .Register(*js::MakeProperty("minFilter", js::Read::Enum<gt::Filter::Type>, &gt::Sampler::mMinFilter))
-                                        .Register(*js::MakeProperty("magFilter", js::Read::Enum<gt::Filter::Type>, &gt::Sampler::mMagFilter))
-                                        .Register(*js::MakeProperty("wrapS", js::Read::Enum<gt::Wrap::Type>, &gt::Sampler::mWrapS))
-                                        .Register(*js::MakeProperty("wrapT", js::Read::Enum<gt::Wrap::Type>, &gt::Sampler::mWrapT)));
-
-const auto TEXURE_READER = std::move(js::Reader<gt::Texture>()
-                                       .Register(*js::MakeProperty("source", gt::RefReader<gt::Document>::Read<gt::Image, &gt::Document::mImages>, &gt::Texture::mSource))
-                                       .Register(*js::MakeProperty("sampler", gt::RefReader<gt::Document>::Read<gt::Sampler, &gt::Document::mSamplers>, &gt::Texture::mSampler)));
-
-const auto TEXURE_INFO_READER = std::move(js::Reader<gt::TextureInfo>()
-                                            .Register(*js::MakeProperty("index", gt::RefReader<gt::Document>::Read<gt::Texture, &gt::Document::mTextures>, &gt::TextureInfo::mTexture))
-                                            .Register(*js::MakeProperty("texCoord", js::Read::Number<uint32_t>, &gt::TextureInfo::mTexCoord))
-                                            .Register(*js::MakeProperty("scale", js::Read::Number<float>, &gt::TextureInfo::mScale)));
-
-const auto MATERIAL_PBR_READER = std::move(js::Reader<gt::Material::Pbr>()
-                                             .Register(*js::MakeProperty("baseColorFactor", gt::ReadDaliVector<Vector4>, &gt::Material::Pbr::mBaseColorFactor))
-                                             .Register(*js::MakeProperty("baseColorTexture", js::ObjectReader<gt::TextureInfo>::Read, &gt::Material::Pbr::mBaseColorTexture))
-                                             .Register(*js::MakeProperty("metallicFactor", js::Read::Number<float>, &gt::Material::Pbr::mMetallicFactor))
-                                             .Register(*js::MakeProperty("roughnessFactor", js::Read::Number<float>, &gt::Material::Pbr::mRoughnessFactor))
-                                             .Register(*js::MakeProperty("metallicRoughnessTexture", js::ObjectReader<gt::TextureInfo>::Read, &gt::Material::Pbr::mMetallicRoughnessTexture)));
-
-const auto MATERIAL_READER = std::move(js::Reader<gt::Material>()
-                                         .Register(*new js::Property<gt::Material, std::string_view>("name", js::Read::StringView, &gt::Material::mName))
-                                         .Register(*js::MakeProperty("pbrMetallicRoughness", js::ObjectReader<gt::Material::Pbr>::Read, &gt::Material::mPbrMetallicRoughness))
-                                         .Register(*js::MakeProperty("normalTexture", js::ObjectReader<gt::TextureInfo>::Read, &gt::Material::mNormalTexture))
-                                         .Register(*js::MakeProperty("occlusionTexture", js::ObjectReader<gt::TextureInfo>::Read, &gt::Material::mOcclusionTexture))
-                                         .Register(*js::MakeProperty("emissiveTexture", js::ObjectReader<gt::TextureInfo>::Read, &gt::Material::mEmissiveTexture))
-                                         .Register(*js::MakeProperty("emissiveFactor", gt::ReadDaliVector<Vector3>, &gt::Material::mEmissiveFactor))
-                                         .Register(*js::MakeProperty("alphaMode", gt::ReadStringEnum<gt::AlphaMode>, &gt::Material::mAlphaMode))
-                                         .Register(*js::MakeProperty("alphaCutoff", js::Read::Number<float>, &gt::Material::mAlphaCutoff)));
-
-std::map<gt::Attribute::Type, gt::Ref<gt::Accessor>> ReadMeshPrimitiveAttributes(const json_value_s& j)
-{
-  auto&                                                jo = js::Cast<json_object_s>(j);
-  std::map<gt::Attribute::Type, gt::Ref<gt::Accessor>> result;
-
-  auto i = jo.start;
-  while(i)
-  {
-    auto jstr                                                        = *i->name;
-    result[gt::Attribute::FromString(jstr.string, jstr.string_size)] = gt::RefReader<gt::Document>::Read<gt::Accessor, &gt::Document::mAccessors>(*i->value);
-    i                                                                = i->next;
-  }
-  return result;
-}
-
-std::vector<std::map<gt::Attribute::Type, gt::Ref<gt::Accessor>>> ReadMeshPrimitiveTargets(const json_value_s& j)
-{
-  auto&                                                             jo = js::Cast<json_array_s>(j);
-  std::vector<std::map<gt::Attribute::Type, gt::Ref<gt::Accessor>>> result;
-
-  result.reserve(jo.length);
-
-  auto i = jo.start;
-  while(i)
-  {
-    result.push_back(std::move(ReadMeshPrimitiveAttributes(*i->value)));
-    i = i->next;
-  }
-
-  return result;
-}
-
-const auto MESH_PRIMITIVE_READER = std::move(js::Reader<gt::Mesh::Primitive>()
-                                               .Register(*js::MakeProperty("attributes", ReadMeshPrimitiveAttributes, &gt::Mesh::Primitive::mAttributes))
-                                               .Register(*js::MakeProperty("indices", gt::RefReader<gt::Document>::Read<gt::Accessor, &gt::Document::mAccessors>, &gt::Mesh::Primitive::mIndices))
-                                               .Register(*js::MakeProperty("material", gt::RefReader<gt::Document>::Read<gt::Material, &gt::Document::mMaterials>, &gt::Mesh::Primitive::mMaterial))
-                                               .Register(*js::MakeProperty("mode", js::Read::Enum<gt::Mesh::Primitive::Mode>, &gt::Mesh::Primitive::mMode))
-                                               .Register(*js::MakeProperty("targets", ReadMeshPrimitiveTargets, &gt::Mesh::Primitive::mTargets)));
-
-const auto MESH_READER = std::move(js::Reader<gt::Mesh>()
-                                     .Register(*new js::Property<gt::Mesh, std::string_view>("name", js::Read::StringView, &gt::Mesh::mName))
-                                     .Register(*js::MakeProperty("primitives",
-                                                                 js::Read::Array<gt::Mesh::Primitive, js::ObjectReader<gt::Mesh::Primitive>::Read>,
-                                                                 &gt::Mesh::mPrimitives))
-                                     .Register(*js::MakeProperty("weights", js::Read::Array<float, js::Read::Number>, &gt::Mesh::mWeights)));
-
-const auto SKIN_READER = std::move(js::Reader<gt::Skin>()
-                                     .Register(*new js::Property<gt::Skin, std::string_view>("name", js::Read::StringView, &gt::Skin::mName))
-                                     .Register(*js::MakeProperty("inverseBindMatrices",
-                                                                 gt::RefReader<gt::Document>::Read<gt::Accessor, &gt::Document::mAccessors>,
-                                                                 &gt::Skin::mInverseBindMatrices))
-                                     .Register(*js::MakeProperty("skeleton",
-                                                                 gt::RefReader<gt::Document>::Read<gt::Node, &gt::Document::mNodes>,
-                                                                 &gt::Skin::mSkeleton))
-                                     .Register(*js::MakeProperty("joints",
-                                                                 js::Read::Array<gt::Ref<gt::Node>, gt::RefReader<gt::Document>::Read<gt::Node, &gt::Document::mNodes>>,
-                                                                 &gt::Skin::mJoints)));
-
-const auto CAMERA_PERSPECTIVE_READER = std::move(js::Reader<gt::Camera::Perspective>()
-                                                   .Register(*js::MakeProperty("aspectRatio", js::Read::Number<float>, &gt::Camera::Perspective::mAspectRatio))
-                                                   .Register(*js::MakeProperty("yfov", js::Read::Number<float>, &gt::Camera::Perspective::mYFov))
-                                                   .Register(*js::MakeProperty("zfar", js::Read::Number<float>, &gt::Camera::Perspective::mZFar))
-                                                   .Register(*js::MakeProperty("znear", js::Read::Number<float>, &gt::Camera::Perspective::mZNear))); // TODO: infinite perspective projection, where znear is omitted
-
-const auto CAMERA_ORTHOGRAPHIC_READER = std::move(js::Reader<gt::Camera::Orthographic>()
-                                                    .Register(*js::MakeProperty("xmag", js::Read::Number<float>, &gt::Camera::Orthographic::mXMag))
-                                                    .Register(*js::MakeProperty("ymag", js::Read::Number<float>, &gt::Camera::Orthographic::mXMag))
-                                                    .Register(*js::MakeProperty("zfar", js::Read::Number<float>, &gt::Camera::Orthographic::mZFar))
-                                                    .Register(*js::MakeProperty("znear", js::Read::Number<float>, &gt::Camera::Orthographic::mZNear)));
-
-const auto CAMERA_READER = std::move(js::Reader<gt::Camera>()
-                                       .Register(*new js::Property<gt::Camera, std::string_view>("name", js::Read::StringView, &gt::Camera::mName))
-                                       .Register(*js::MakeProperty("type", js::Read::StringView, &gt::Camera::mType))
-                                       .Register(*js::MakeProperty("perspective", js::ObjectReader<gt::Camera::Perspective>::Read, &gt::Camera::mPerspective))
-                                       .Register(*js::MakeProperty("orthographic", js::ObjectReader<gt::Camera::Orthographic>::Read, &gt::Camera::mOrthographic)));
-
-const auto NODE_READER = std::move(js::Reader<gt::Node>()
-                                     .Register(*new js::Property<gt::Node, std::string_view>("name", js::Read::StringView, &gt::Node::mName))
-                                     .Register(*js::MakeProperty("translation", gt::ReadDaliVector<Vector3>, &gt::Node::mTranslation))
-                                     .Register(*js::MakeProperty("rotation", gt::ReadQuaternion, &gt::Node::mRotation))
-                                     .Register(*js::MakeProperty("scale", gt::ReadDaliVector<Vector3>, &gt::Node::mScale))
-                                     .Register(*new js::Property<gt::Node, Matrix>("matrix", gt::ReadDaliVector<Matrix>, &gt::Node::SetMatrix))
-                                     .Register(*js::MakeProperty("camera", gt::RefReader<gt::Document>::Read<gt::Camera, &gt::Document::mCameras>, &gt::Node::mCamera))
-                                     .Register(*js::MakeProperty("children", js::Read::Array<gt::Ref<gt::Node>, gt::RefReader<gt::Document>::Read<gt::Node, &gt::Document::mNodes>>, &gt::Node::mChildren))
-                                     .Register(*js::MakeProperty("mesh", gt::RefReader<gt::Document>::Read<gt::Mesh, &gt::Document::mMeshes>, &gt::Node::mMesh))
-                                     .Register(*js::MakeProperty("skin", gt::RefReader<gt::Document>::Read<gt::Skin, &gt::Document::mSkins>, &gt::Node::mSkin)));
-
-const auto ANIMATION_SAMPLER_READER = std::move(js::Reader<gt::Animation::Sampler>()
-                                                  .Register(*js::MakeProperty("input", gt::RefReader<gt::Document>::Read<gt::Accessor, &gt::Document::mAccessors>, &gt::Animation::Sampler::mInput))
-                                                  .Register(*js::MakeProperty("output", gt::RefReader<gt::Document>::Read<gt::Accessor, &gt::Document::mAccessors>, &gt::Animation::Sampler::mOutput))
-                                                  .Register(*js::MakeProperty("interpolation", gt::ReadStringEnum<gt::Animation::Sampler::Interpolation>, &gt::Animation::Sampler::mInterpolation)));
-
-const auto ANIMATION_TARGET_READER = std::move(js::Reader<gt::Animation::Channel::Target>()
-                                                 .Register(*js::MakeProperty("node", gt::RefReader<gt::Document>::Read<gt::Node, &gt::Document::mNodes>, &gt::Animation::Channel::Target::mNode))
-                                                 .Register(*js::MakeProperty("path", gt::ReadStringEnum<gt::Animation::Channel::Target>, &gt::Animation::Channel::Target::mPath)));
-
-const auto ANIMATION_CHANNEL_READER = std::move(js::Reader<gt::Animation::Channel>()
-                                                  .Register(*js::MakeProperty("target", js::ObjectReader<gt::Animation::Channel::Target>::Read, &gt::Animation::Channel::mTarget))
-                                                  .Register(*js::MakeProperty("sampler", gt::RefReader<gt::Animation>::Read<gt::Animation::Sampler, &gt::Animation::mSamplers>, &gt::Animation::Channel::mSampler)));
-
-const auto ANIMATION_READER = std::move(js::Reader<gt::Animation>()
-                                          .Register(*new js::Property<gt::Animation, std::string_view>("name", js::Read::StringView, &gt::Animation::mName))
-                                          .Register(*js::MakeProperty("samplers",
-                                                                      js::Read::Array<gt::Animation::Sampler, js::ObjectReader<gt::Animation::Sampler>::Read>,
-                                                                      &gt::Animation::mSamplers))
-                                          .Register(*js::MakeProperty("channels",
-                                                                      js::Read::Array<gt::Animation::Channel, js::ObjectReader<gt::Animation::Channel>::Read>,
-                                                                      &gt::Animation::mChannels)));
-
-const auto SCENE_READER = std::move(js::Reader<gt::Scene>()
-                                      .Register(*new js::Property<gt::Scene, std::string_view>("name", js::Read::StringView, &gt::Scene::mName))
-                                      .Register(*js::MakeProperty("nodes",
-                                                                  js::Read::Array<gt::Ref<gt::Node>, gt::RefReader<gt::Document>::Read<gt::Node, &gt::Document::mNodes>>,
-                                                                  &gt::Scene::mNodes)));
-
-const auto DOCUMENT_READER = std::move(js::Reader<gt::Document>()
-                                         .Register(*js::MakeProperty("buffers",
-                                                                     js::Read::Array<gt::Buffer, js::ObjectReader<gt::Buffer>::Read>,
-                                                                     &gt::Document::mBuffers))
-                                         .Register(*js::MakeProperty("bufferViews",
-                                                                     js::Read::Array<gt::BufferView, js::ObjectReader<gt::BufferView>::Read>,
-                                                                     &gt::Document::mBufferViews))
-                                         .Register(*js::MakeProperty("accessors",
-                                                                     js::Read::Array<gt::Accessor, js::ObjectReader<gt::Accessor>::Read>,
-                                                                     &gt::Document::mAccessors))
-                                         .Register(*js::MakeProperty("images",
-                                                                     js::Read::Array<gt::Image, js::ObjectReader<gt::Image>::Read>,
-                                                                     &gt::Document::mImages))
-                                         .Register(*js::MakeProperty("samplers",
-                                                                     js::Read::Array<gt::Sampler, js::ObjectReader<gt::Sampler>::Read>,
-                                                                     &gt::Document::mSamplers))
-                                         .Register(*js::MakeProperty("textures",
-                                                                     js::Read::Array<gt::Texture, js::ObjectReader<gt::Texture>::Read>,
-                                                                     &gt::Document::mTextures))
-                                         .Register(*js::MakeProperty("materials",
-                                                                     js::Read::Array<gt::Material, js::ObjectReader<gt::Material>::Read>,
-                                                                     &gt::Document::mMaterials))
-                                         .Register(*js::MakeProperty("meshes",
-                                                                     js::Read::Array<gt::Mesh, js::ObjectReader<gt::Mesh>::Read>,
-                                                                     &gt::Document::mMeshes))
-                                         .Register(*js::MakeProperty("skins",
-                                                                     js::Read::Array<gt::Skin, js::ObjectReader<gt::Skin>::Read>,
-                                                                     &gt::Document::mSkins))
-                                         .Register(*js::MakeProperty("cameras",
-                                                                     js::Read::Array<gt::Camera, js::ObjectReader<gt::Camera>::Read>,
-                                                                     &gt::Document::mCameras))
-                                         .Register(*js::MakeProperty("nodes",
-                                                                     js::Read::Array<gt::Node, js::ObjectReader<gt::Node>::Read>,
-                                                                     &gt::Document::mNodes))
-                                         .Register(*js::MakeProperty("animations",
-                                                                     ReadAnimationArray,
-                                                                     &gt::Document::mAnimations))
-                                         .Register(*js::MakeProperty("scenes",
-                                                                     js::Read::Array<gt::Scene, js::ObjectReader<gt::Scene>::Read>,
-                                                                     &gt::Document::mScenes))
-                                         .Register(*js::MakeProperty("scene", gt::RefReader<gt::Document>::Read<gt::Scene, &gt::Document::mScenes>, &gt::Document::mScene)));
-
-struct NodeMapping
-{
-  Index gltfIdx;
-  Index runtimeIdx;
-};
-
-bool operator<(const NodeMapping& mapping, Index gltfIdx)
-{
-  return mapping.gltfIdx < gltfIdx;
-}
-
-class NodeIndexMapper
-{
-public:
-  NodeIndexMapper()                       = default;
-  NodeIndexMapper(const NodeIndexMapper&) = delete;
-  NodeIndexMapper& operator=(const NodeIndexMapper&) = delete;
-
-  ///@brief Registers a mapping of the @a gltfIdx of a node to its @a runtimeIdx .
-  ///@note If the indices are the same, the registration is omitted, in order to
-  /// save growing a vector.
-  void RegisterMapping(Index gltfIdx, Index runtimeIdx)
-  {
-    if(gltfIdx != runtimeIdx)
-    {
-      auto iInsert = std::lower_bound(mNodes.begin(), mNodes.end(), gltfIdx);
-      DALI_ASSERT_DEBUG(iInsert == mNodes.end() || iInsert->gltfIdx != gltfIdx);
-      mNodes.insert(iInsert, NodeMapping{gltfIdx, runtimeIdx});
-    }
-  }
-
-  ///@brief Retrieves the runtime index of a Node, mapped to the given @a gltfIdx.
-  Index GetRuntimeId(Index gltfIdx) const
-  {
-    auto iFind = std::lower_bound(mNodes.begin(), mNodes.end(), gltfIdx); // using custom operator<
-    return (iFind != mNodes.end() && iFind->gltfIdx == gltfIdx) ? iFind->runtimeIdx : gltfIdx;
-  }
-
-private:
-  std::vector<NodeMapping> mNodes;
-};
-
-struct ConversionContext
-{
-  LoadResult& mOutput;
-
-  std::string mPath;
-  Index       mDefaultMaterial;
-
-  std::vector<Index> mMeshIds;
-  NodeIndexMapper    mNodeIndices;
-};
-
-SamplerFlags::Type ConvertWrapMode(gt::Wrap::Type w)
-{
-  switch(w)
-  {
-    case gt::Wrap::REPEAT:
-      return SamplerFlags::WRAP_REPEAT;
-    case gt::Wrap::CLAMP_TO_EDGE:
-      return SamplerFlags::WRAP_CLAMP;
-    case gt::Wrap::MIRRORED_REPEAT:
-      return SamplerFlags::WRAP_MIRROR;
-    default:
-      throw std::runtime_error("Invalid wrap type.");
-  }
-}
-
-SamplerFlags::Type ConvertSampler(const gt::Ref<gt::Sampler>& s)
-{
-  if(s)
-  {
-    return (s->mMinFilter < gt::Filter::NEAREST_MIPMAP_NEAREST) ? (s->mMinFilter - gt::Filter::NEAREST) : ((s->mMinFilter - gt::Filter::NEAREST_MIPMAP_NEAREST) + 2) | ((s->mMagFilter - gt::Filter::NEAREST) << SamplerFlags::FILTER_MAG_SHIFT) | (ConvertWrapMode(s->mWrapS) << SamplerFlags::WRAP_S_SHIFT) | (ConvertWrapMode(s->mWrapT) << SamplerFlags::WRAP_T_SHIFT);
-  }
-  else
-  {
-    // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#texturesampler
-    // "The index of the sampler used by this texture. When undefined, a sampler with repeat wrapping and auto filtering should be used."
-    // "What is an auto filtering", I hear you ask. Since there's nothing else to determine mipmapping from - including glTF image
-    // properties, if not in some extension -, we will simply assume linear filtering.
-    return SamplerFlags::FILTER_LINEAR | (SamplerFlags::FILTER_LINEAR << SamplerFlags::FILTER_MAG_SHIFT) |
-           (SamplerFlags::WRAP_REPEAT << SamplerFlags::WRAP_S_SHIFT) | (SamplerFlags::WRAP_REPEAT << SamplerFlags::WRAP_T_SHIFT);
-  }
-}
-
-TextureDefinition ConvertTextureInfo(const gt::TextureInfo& mm)
-{
-  return TextureDefinition{std::string(mm.mTexture->mSource->mUri), ConvertSampler(mm.mTexture->mSampler)};
-}
-
-void ConvertMaterial(const gt::Material& m, decltype(ResourceBundle::mMaterials)& outMaterials)
-{
-  MaterialDefinition matDef;
-
-  auto& pbr = m.mPbrMetallicRoughness;
-  if(m.mAlphaMode != gt::AlphaMode::OPAQUE || pbr.mBaseColorFactor.a < 1.f)
-  {
-    matDef.mFlags |= MaterialDefinition::TRANSPARENCY;
-  }
-
-  if(m.mAlphaMode == gt::AlphaMode::MASK)
-  {
-    matDef.SetAlphaCutoff(std::min(1.f, std::max(0.f, m.mAlphaCutoff)));
-  }
-
-  matDef.mColor = pbr.mBaseColorFactor;
-
-  matDef.mTextureStages.reserve(!!pbr.mBaseColorTexture + !!pbr.mMetallicRoughnessTexture + !!m.mNormalTexture);
-  if(pbr.mBaseColorTexture)
-  {
-    const auto semantic = MaterialDefinition::ALBEDO;
-    matDef.mTextureStages.push_back({semantic, ConvertTextureInfo(pbr.mBaseColorTexture)});
-    // TODO: and there had better be one
-    matDef.mFlags |= semantic;
-  }
-
-  matDef.mMetallic  = pbr.mMetallicFactor;
-  matDef.mRoughness = pbr.mRoughnessFactor;
-
-  if(pbr.mMetallicRoughnessTexture)
-  {
-    const auto semantic = MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS |
-                          MaterialDefinition::GLTF_CHANNELS;
-    matDef.mTextureStages.push_back({semantic, ConvertTextureInfo(pbr.mMetallicRoughnessTexture)});
-    // TODO: and there had better be one
-    matDef.mFlags |= semantic;
-  }
-
-  if(m.mNormalTexture)
-  {
-    const auto semantic = MaterialDefinition::NORMAL;
-    matDef.mTextureStages.push_back({semantic, ConvertTextureInfo(m.mNormalTexture)});
-    // TODO: and there had better be one
-    matDef.mFlags |= semantic;
-  }
-
-  // TODO: handle doubleSided
-
-  outMaterials.emplace_back(std::move(matDef), TextureSet());
-}
-
-void ConvertMaterials(const gt::Document& doc, ConversionContext& cctx)
-{
-  auto& outMaterials = cctx.mOutput.mResources.mMaterials;
-  outMaterials.reserve(doc.mMaterials.size());
-
-  for(auto& m : doc.mMaterials)
-  {
-    ConvertMaterial(m, outMaterials);
-  }
-}
-
-MeshDefinition::Accessor ConvertMeshPrimitiveAccessor(const gt::Accessor& acc)
-{
-  DALI_ASSERT_ALWAYS((acc.mBufferView &&
-                      (acc.mBufferView->mByteStride < std::numeric_limits<uint16_t>::max())) ||
-                     (acc.mSparse && !acc.mBufferView));
-
-  DALI_ASSERT_ALWAYS(!acc.mSparse ||
-                     ((acc.mSparse->mIndices.mBufferView && (acc.mSparse->mIndices.mBufferView->mByteStride < std::numeric_limits<uint16_t>::max())) &&
-                      (acc.mSparse->mValues.mBufferView && (acc.mSparse->mValues.mBufferView->mByteStride < std::numeric_limits<uint16_t>::max()))));
-
-  MeshDefinition::SparseBlob sparseBlob;
-  if(acc.mSparse)
-  {
-    const gt::Accessor::Sparse&               sparse  = *acc.mSparse;
-    const gt::ComponentTypedBufferViewClient& indices = sparse.mIndices;
-    const gt::BufferViewClient&               values  = sparse.mValues;
-
-    MeshDefinition::Blob indicesBlob(
-      indices.mBufferView->mByteOffset + indices.mByteOffset,
-      sparse.mCount * indices.GetBytesPerComponent(),
-      static_cast<uint16_t>(indices.mBufferView->mByteStride),
-      static_cast<uint16_t>(indices.GetBytesPerComponent()),
-      {},
-      {});
-    MeshDefinition::Blob valuesBlob(
-      values.mBufferView->mByteOffset + values.mByteOffset,
-      sparse.mCount * acc.GetElementSizeBytes(),
-      static_cast<uint16_t>(values.mBufferView->mByteStride),
-      static_cast<uint16_t>(acc.GetElementSizeBytes()),
-      {},
-      {});
-
-    sparseBlob = std::move(MeshDefinition::SparseBlob(std::move(indicesBlob), std::move(valuesBlob), acc.mSparse->mCount));
-  }
-
-  uint32_t bufferViewOffset = 0u;
-  uint32_t bufferViewStride = 0u;
-  if(acc.mBufferView)
-  {
-    bufferViewOffset = acc.mBufferView->mByteOffset;
-    bufferViewStride = acc.mBufferView->mByteStride;
-  }
-
-  return MeshDefinition::Accessor{
-    std::move(MeshDefinition::Blob{bufferViewOffset + acc.mByteOffset,
-                                   acc.GetBytesLength(),
-                                   static_cast<uint16_t>(bufferViewStride),
-                                   static_cast<uint16_t>(acc.GetElementSizeBytes()),
-                                   acc.mMin,
-                                   acc.mMax}),
-    std::move(sparseBlob)};
-}
-
-void ConvertMeshes(const gt::Document& doc, ConversionContext& cctx)
-{
-  uint32_t meshCount = 0;
-  cctx.mMeshIds.reserve(doc.mMeshes.size());
-  for(auto& m : doc.mMeshes)
-  {
-    cctx.mMeshIds.push_back(meshCount);
-    meshCount += m.mPrimitives.size();
-  }
-
-  auto& outMeshes = cctx.mOutput.mResources.mMeshes;
-  outMeshes.reserve(meshCount);
-  for(auto& m : doc.mMeshes)
-  {
-    for(auto& p : m.mPrimitives)
-    {
-      MeshDefinition meshDef;
-
-      auto& attribs          = p.mAttributes;
-      meshDef.mUri           = attribs.begin()->second->mBufferView->mBuffer->mUri;
-      meshDef.mPrimitiveType = GLTF2_TO_DALI_PRIMITIVES[p.mMode];
-
-      auto& accPositions = *attribs.find(gt::Attribute::POSITION)->second;
-      meshDef.mPositions = ConvertMeshPrimitiveAccessor(accPositions);
-
-      const bool needNormalsTangents = accPositions.mType == gt::AccessorType::VEC3;
-      for(auto& am : ATTRIBUTE_MAPPINGS)
-      {
-        auto iFind = attribs.find(am.mType);
-        if(iFind != attribs.end())
-        {
-          DALI_ASSERT_DEBUG(iFind->second->mBufferView->mBuffer->mUri.compare(meshDef.mUri) == 0);
-          auto& accessor = meshDef.*(am.mAccessor);
-          accessor       = ConvertMeshPrimitiveAccessor(*iFind->second);
-
-          // Fixing up -- a few of glTF2 sample models have VEC4 tangents; we need VEC3s.
-          if(iFind->first == gt::Attribute::TANGENT && (accessor.mBlob.mElementSizeHint > am.mElementSizeRequired))
-          {
-            accessor.mBlob.mStride          = std::max(static_cast<uint16_t>(accessor.mBlob.mStride + accessor.mBlob.mElementSizeHint - am.mElementSizeRequired),
-                                              accessor.mBlob.mElementSizeHint);
-            accessor.mBlob.mElementSizeHint = am.mElementSizeRequired;
-          }
-
-          if(iFind->first == gt::Attribute::JOINTS_0)
-          {
-            meshDef.mFlags |= (iFind->second->mComponentType == gt::Component::UNSIGNED_SHORT) * MeshDefinition::U16_JOINT_IDS;
-            DALI_ASSERT_DEBUG(MaskMatch(meshDef.mFlags, MeshDefinition::U16_JOINT_IDS) || iFind->second->mComponentType == gt::Component::FLOAT);
-          }
-        }
-        else if(needNormalsTangents)
-        {
-          switch(am.mType)
-          {
-            case gt::Attribute::NORMAL:
-              meshDef.RequestNormals();
-              break;
-
-            case gt::Attribute::TANGENT:
-              meshDef.RequestTangents();
-              break;
-
-            default:
-              break;
-          }
-        }
-      }
-
-      if(p.mIndices)
-      {
-        meshDef.mIndices = ConvertMeshPrimitiveAccessor(*p.mIndices);
-        meshDef.mFlags |= (p.mIndices->mComponentType == gt::Component::UNSIGNED_INT) * MeshDefinition::U32_INDICES;
-        DALI_ASSERT_DEBUG(MaskMatch(meshDef.mFlags, MeshDefinition::U32_INDICES) || p.mIndices->mComponentType == gt::Component::UNSIGNED_SHORT);
-      }
-
-      if(!p.mTargets.empty())
-      {
-        meshDef.mBlendShapes.reserve(p.mTargets.size());
-        meshDef.mBlendShapeVersion = BlendShapes::Version::VERSION_2_0;
-        for(const auto& target : p.mTargets)
-        {
-          MeshDefinition::BlendShape blendShape;
-
-          auto endIt = target.end();
-          auto it    = target.find(gt::Attribute::POSITION);
-          if(it != endIt)
-          {
-            blendShape.deltas = ConvertMeshPrimitiveAccessor(*it->second);
-          }
-          it = target.find(gt::Attribute::NORMAL);
-          if(it != endIt)
-          {
-            blendShape.normals = ConvertMeshPrimitiveAccessor(*it->second);
-          }
-          it = target.find(gt::Attribute::TANGENT);
-          if(it != endIt)
-          {
-            blendShape.tangents = ConvertMeshPrimitiveAccessor(*it->second);
-          }
-
-          if(!m.mWeights.empty())
-          {
-            blendShape.weight = m.mWeights[meshDef.mBlendShapes.size()];
-          }
-
-          meshDef.mBlendShapes.push_back(std::move(blendShape));
-        }
-      }
-
-      outMeshes.push_back({std::move(meshDef), MeshGeometry{}});
-    }
-  }
-}
-
-ModelNode* MakeModelNode(const gt::Mesh::Primitive& prim, ConversionContext& cctx)
-{
-  auto modelNode = new ModelNode();
-
-  modelNode->mShaderIdx = 0; // TODO: further thought
-
-  auto materialIdx = prim.mMaterial.GetIndex();
-  if(INVALID_INDEX == materialIdx)
-  {
-    // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#default-material
-    if(INVALID_INDEX == cctx.mDefaultMaterial)
-    {
-      auto& outMaterials    = cctx.mOutput.mResources.mMaterials;
-      cctx.mDefaultMaterial = outMaterials.size();
-
-      ConvertMaterial(gt::Material{}, outMaterials);
-    }
-
-    materialIdx = cctx.mDefaultMaterial;
-  }
-
-  modelNode->mMaterialIdx = materialIdx;
-
-  return modelNode;
-}
-
-void ConvertCamera(const gt::Camera& camera, CameraParameters& camParams)
-{
-  camParams.isPerspective = camera.mType.compare("perspective") == 0;
-  if(camParams.isPerspective)
-  {
-    auto& perspective = camera.mPerspective;
-    camParams.yFov    = Degree(Radian(perspective.mYFov)).degree;
-    camParams.zNear   = perspective.mZNear;
-    camParams.zFar    = perspective.mZFar;
-    // TODO: yes, we seem to ignore aspectRatio in CameraParameters.
-  }
-  else
-  {
-    auto& ortho                = camera.mOrthographic;
-    camParams.orthographicSize = Vector4(-ortho.mXMag, ortho.mXMag, ortho.mYMag, -ortho.mYMag) * .5f;
-    camParams.zNear            = ortho.mZNear;
-    camParams.zFar             = ortho.mZFar;
-  }
-}
-
-void ConvertNode(gt::Node const& node, const Index gltfIdx, Index parentIdx, ConversionContext& cctx)
-{
-  auto& output    = cctx.mOutput;
-  auto& scene     = output.mScene;
-  auto& resources = output.mResources;
-
-  const auto idx      = scene.GetNodeCount();
-  auto       weakNode = scene.AddNode([&]() {
-    std::unique_ptr<NodeDefinition> nodeDef{new NodeDefinition()};
-
-    nodeDef->mParentIdx = parentIdx;
-    nodeDef->mName      = node.mName;
-    if(nodeDef->mName.empty())
-    {
-      // TODO: Production quality generation of unique names.
-      nodeDef->mName = std::to_string(reinterpret_cast<uintptr_t>(nodeDef.get()));
-    }
-
-    if(!node.mSkin) // Nodes with skinned meshes are not supposed to have local transforms.
-    {
-      nodeDef->mPosition    = node.mTranslation;
-      nodeDef->mOrientation = node.mRotation;
-      nodeDef->mScale       = node.mScale;
-    }
-
-    return nodeDef;
-  }());
-  if(!weakNode)
-  {
-    ExceptionFlinger(ASSERT_LOCATION) << "Node name '" << node.mName << "' is not unique; scene is invalid.";
-  }
-
-  cctx.mNodeIndices.RegisterMapping(gltfIdx, idx);
-
-  Index skeletonIdx = node.mSkin ? node.mSkin.GetIndex() : INVALID_INDEX;
-  if(node.mMesh && !node.mMesh->mPrimitives.empty())
-  {
-    auto& mesh = *node.mMesh;
-
-    auto iPrim          = mesh.mPrimitives.begin();
-    auto modelNode      = MakeModelNode(*iPrim, cctx);
-    auto meshIdx        = cctx.mMeshIds[node.mMesh.GetIndex()];
-    modelNode->mMeshIdx = meshIdx;
-
-    weakNode->mRenderable.reset(modelNode);
-
-    DALI_ASSERT_DEBUG(resources.mMeshes[meshIdx].first.mSkeletonIdx == INVALID_INDEX ||
-                      resources.mMeshes[meshIdx].first.mSkeletonIdx == skeletonIdx);
-    resources.mMeshes[meshIdx].first.mSkeletonIdx = skeletonIdx;
-
-    // As does model-exporter, we'll create anonymous child nodes for additional mesh( primitiv)es.
-    while(++iPrim != mesh.mPrimitives.end())
-    {
-      std::unique_ptr<NodeDefinition> child{new NodeDefinition};
-      child->mParentIdx = idx;
-
-      auto childModel = MakeModelNode(*iPrim, cctx);
-
-      ++meshIdx;
-      childModel->mMeshIdx = meshIdx;
-
-      child->mRenderable.reset(childModel);
-
-      scene.AddNode(std::move(child));
-
-      DALI_ASSERT_DEBUG(resources.mMeshes[meshIdx].first.mSkeletonIdx == INVALID_INDEX ||
-                        resources.mMeshes[meshIdx].first.mSkeletonIdx == skeletonIdx);
-      resources.mMeshes[meshIdx].first.mSkeletonIdx = skeletonIdx;
-    }
-  }
-
-  if(node.mCamera)
-  {
-    CameraParameters camParams;
-    ConvertCamera(*node.mCamera, camParams);
-
-    camParams.matrix.SetTransformComponents(node.mScale, node.mRotation, node.mTranslation);
-    output.mCameraParameters.push_back(camParams);
-  }
-
-  for(auto& n : node.mChildren)
-  {
-    ConvertNode(*n, n.GetIndex(), idx, cctx);
-  }
-}
-
-void ConvertSceneNodes(const gt::Scene& scene, ConversionContext& cctx)
-{
-  auto& outScene = cctx.mOutput.mScene;
-  Index rootIdx  = outScene.GetNodeCount();
-  switch(scene.mNodes.size())
-  {
-    case 0:
-      break;
-
-    case 1:
-      ConvertNode(*scene.mNodes[0], scene.mNodes[0].GetIndex(), INVALID_INDEX, cctx);
-      outScene.AddRootNode(rootIdx);
-      break;
-
-    default:
-    {
-      std::unique_ptr<NodeDefinition> sceneRoot{new NodeDefinition()};
-      sceneRoot->mName = "GLTF_LOADER_SCENE_ROOT_" + std::to_string(outScene.GetRoots().size());
-
-      outScene.AddNode(std::move(sceneRoot));
-      outScene.AddRootNode(rootIdx);
-
-      for(auto& n : scene.mNodes)
-      {
-        ConvertNode(*n, n.GetIndex(), rootIdx, cctx);
-      }
-      break;
-    }
-  }
-}
-
-void ConvertNodes(const gt::Document& doc, ConversionContext& cctx)
-{
-  ConvertSceneNodes(*doc.mScene, cctx);
-
-  for(uint32_t i = 0, i1 = doc.mScene.GetIndex(); i < i1; ++i)
-  {
-    ConvertSceneNodes(doc.mScenes[i], cctx);
-  }
-
-  for(uint32_t i = doc.mScene.GetIndex() + 1; i < doc.mScenes.size(); ++i)
-  {
-    ConvertSceneNodes(doc.mScenes[i], cctx);
-  }
-}
-
-template<typename T>
-void LoadDataFromAccessor(const std::string& path, Vector<T>& dataBuffer, uint32_t offset, uint32_t size)
-{
-  std::ifstream animationBinaryFile(path, std::ifstream::binary);
-
-  if(!animationBinaryFile.is_open())
-  {
-    throw std::runtime_error("Failed to load " + path);
-  }
-
-  animationBinaryFile.seekg(offset);
-  animationBinaryFile.read(reinterpret_cast<char*>(dataBuffer.Begin()), size);
-  animationBinaryFile.close();
-}
-
-template<typename T>
-float LoadDataFromAccessors(const std::string& path, const gltf2::Accessor& input, const gltf2::Accessor& output, Vector<float>& inputDataBuffer, Vector<T>& outputDataBuffer)
-{
-  inputDataBuffer.Resize(input.mCount);
-  outputDataBuffer.Resize(output.mCount);
-
-  const uint32_t inputDataBufferSize  = input.GetBytesLength();
-  const uint32_t outputDataBufferSize = output.GetBytesLength();
-
-  LoadDataFromAccessor<float>(path + std::string(input.mBufferView->mBuffer->mUri), inputDataBuffer, input.mBufferView->mByteOffset + input.mByteOffset, inputDataBufferSize);
-  LoadDataFromAccessor<T>(path + std::string(output.mBufferView->mBuffer->mUri), outputDataBuffer, output.mBufferView->mByteOffset + output.mByteOffset, outputDataBufferSize);
-  ApplyAccessorMinMax(output, reinterpret_cast<float*>(outputDataBuffer.begin()));
-
-  return inputDataBuffer[input.mCount - 1u];
-}
-
-template<typename T>
-float LoadKeyFrames(const std::string& path, const gt::Animation::Channel& channel, KeyFrames& keyFrames, gt::Animation::Channel::Target::Type type)
-{
-  const gltf2::Accessor& input  = *channel.mSampler->mInput;
-  const gltf2::Accessor& output = *channel.mSampler->mOutput;
-
-  Vector<float> inputDataBuffer;
-  Vector<T>     outputDataBuffer;
-
-  const float duration = LoadDataFromAccessors<T>(path, input, output, inputDataBuffer, outputDataBuffer);
-
-  for(uint32_t i = 0; i < input.mCount; ++i)
-  {
-    keyFrames.Add(inputDataBuffer[i] / duration, outputDataBuffer[i]);
-  }
-
-  return duration;
-}
-
-float LoadBlendShapeKeyFrames(const std::string& path, const gt::Animation::Channel& channel, const std::string& nodeName, uint32_t& propertyIndex, std::vector<SceneLoader::AnimatedProperty>& properties)
-{
-  const gltf2::Accessor& input  = *channel.mSampler->mInput;
-  const gltf2::Accessor& output = *channel.mSampler->mOutput;
-
-  Vector<float> inputDataBuffer;
-  Vector<float> outputDataBuffer;
-
-  const float duration = LoadDataFromAccessors<float>(path, input, output, inputDataBuffer, outputDataBuffer);
-
-  char        weightNameBuffer[32];
-  auto        prefixSize    = snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s[", BLEND_SHAPE_WEIGHTS_UNIFORM.c_str());
-  char* const pWeightName   = weightNameBuffer + prefixSize;
-  const auto  remainingSize = sizeof(weightNameBuffer) - prefixSize;
-  for(uint32_t weightIndex = 0u, endWeightIndex = channel.mSampler->mOutput->mCount / channel.mSampler->mInput->mCount; weightIndex < endWeightIndex; ++weightIndex)
-  {
-    AnimatedProperty& animatedProperty = properties[propertyIndex++];
-
-    animatedProperty.mNodeName = nodeName;
-    snprintf(pWeightName, remainingSize, "%d]", weightIndex);
-    animatedProperty.mPropertyName = std::string(weightNameBuffer);
-
-    animatedProperty.mKeyFrames = KeyFrames::New();
-    for(uint32_t i = 0; i < input.mCount; ++i)
-    {
-      animatedProperty.mKeyFrames.Add(inputDataBuffer[i] / duration, outputDataBuffer[i * endWeightIndex + weightIndex]);
-    }
-
-    animatedProperty.mTimePeriod = {0.f, duration};
-  }
-
-  return duration;
-}
-
-void ConvertAnimations(const gt::Document& doc, ConversionContext& cctx)
-{
-  auto& output = cctx.mOutput;
-
-  output.mAnimationDefinitions.reserve(output.mAnimationDefinitions.size() + doc.mAnimations.size());
-
-  for(const auto& animation : doc.mAnimations)
-  {
-    AnimationDefinition animationDef;
-
-    if(!animation.mName.empty())
-    {
-      animationDef.mName = animation.mName;
-    }
-
-    uint32_t numberOfProperties = 0u;
-
-    for(const auto& channel : animation.mChannels)
-    {
-      numberOfProperties += channel.mSampler->mOutput->mCount;
-    }
-    animationDef.mProperties.resize(numberOfProperties);
-
-    Index propertyIndex = 0u;
-    for(const auto& channel : animation.mChannels)
-    {
-      std::string nodeName;
-      if(!channel.mTarget.mNode->mName.empty())
-      {
-        nodeName = channel.mTarget.mNode->mName;
-      }
-      else
-      {
-        Index index = cctx.mNodeIndices.GetRuntimeId(channel.mTarget.mNode.GetIndex());
-        nodeName    = cctx.mOutput.mScene.GetNode(index)->mName;
-      }
-
-      float duration = 0.f;
-
-      switch(channel.mTarget.mPath)
-      {
-        case gt::Animation::Channel::Target::TRANSLATION:
-        {
-          AnimatedProperty& animatedProperty = animationDef.mProperties[propertyIndex];
-
-          animatedProperty.mNodeName     = nodeName;
-          animatedProperty.mPropertyName = POSITION_PROPERTY;
-
-          animatedProperty.mKeyFrames = KeyFrames::New();
-          duration                    = LoadKeyFrames<Vector3>(cctx.mPath, channel, animatedProperty.mKeyFrames, channel.mTarget.mPath);
-
-          animatedProperty.mTimePeriod = {0.f, duration};
-          break;
-        }
-        case gt::Animation::Channel::Target::ROTATION:
-        {
-          AnimatedProperty& animatedProperty = animationDef.mProperties[propertyIndex];
-
-          animatedProperty.mNodeName     = nodeName;
-          animatedProperty.mPropertyName = ORIENTATION_PROPERTY;
-
-          animatedProperty.mKeyFrames = KeyFrames::New();
-          duration                    = LoadKeyFrames<Quaternion>(cctx.mPath, channel, animatedProperty.mKeyFrames, channel.mTarget.mPath);
-
-          animatedProperty.mTimePeriod = {0.f, duration};
-          break;
-        }
-        case gt::Animation::Channel::Target::SCALE:
-        {
-          AnimatedProperty& animatedProperty = animationDef.mProperties[propertyIndex];
-
-          animatedProperty.mNodeName     = nodeName;
-          animatedProperty.mPropertyName = SCALE_PROPERTY;
-
-          animatedProperty.mKeyFrames = KeyFrames::New();
-          duration                    = LoadKeyFrames<Vector3>(cctx.mPath, channel, animatedProperty.mKeyFrames, channel.mTarget.mPath);
-
-          animatedProperty.mTimePeriod = {0.f, duration};
-          break;
-        }
-        case gt::Animation::Channel::Target::WEIGHTS:
-        {
-          duration = LoadBlendShapeKeyFrames(cctx.mPath, channel, nodeName, propertyIndex, animationDef.mProperties);
-
-          break;
-        }
-        default:
-        {
-          // nothing to animate.
-          break;
-        }
-      }
-
-      animationDef.mDuration = std::max(duration, animationDef.mDuration);
-
-      ++propertyIndex;
-    }
-
-    output.mAnimationDefinitions.push_back(std::move(animationDef));
-  }
-}
-
-void ProcessSkins(const gt::Document& doc, ConversionContext& cctx)
-{
-  // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#skininversebindmatrices
-  // If an inverseBindMatrices accessor was provided, we'll load the joint data from the buffer,
-  // otherwise we'll set identity matrices for inverse bind pose.
-  struct IInverseBindMatrixProvider
-  {
-    virtual ~IInverseBindMatrixProvider()
-    {
-    }
-    virtual void Provide(Matrix& ibm) = 0;
-  };
-
-  struct InverseBindMatrixAccessor : public IInverseBindMatrixProvider
-  {
-    std::ifstream  mStream;
-    const uint32_t mElementSizeBytes;
-
-    InverseBindMatrixAccessor(const gt::Accessor& accessor, const std::string& path)
-    : mStream(path + std::string(accessor.mBufferView->mBuffer->mUri), std::ios::binary),
-      mElementSizeBytes(accessor.GetElementSizeBytes())
-    {
-      DALI_ASSERT_ALWAYS(mStream);
-      DALI_ASSERT_DEBUG(accessor.mType == gt::AccessorType::MAT4 && accessor.mComponentType == gt::Component::FLOAT);
-
-      mStream.seekg(accessor.mBufferView->mByteOffset + accessor.mByteOffset);
-    }
-
-    virtual void Provide(Matrix& ibm) override
-    {
-      DALI_ASSERT_ALWAYS(mStream.read(reinterpret_cast<char*>(ibm.AsFloat()), mElementSizeBytes));
-    }
-  };
-
-  struct DefaultInverseBindMatrixProvider : public IInverseBindMatrixProvider
-  {
-    virtual void Provide(Matrix& ibm) override
-    {
-      ibm = Matrix::IDENTITY;
-    }
-  };
-
-  auto& resources = cctx.mOutput.mResources;
-  resources.mSkeletons.reserve(doc.mSkins.size());
-
-  for(auto& s : doc.mSkins)
-  {
-    std::unique_ptr<IInverseBindMatrixProvider> ibmProvider;
-    if(s.mInverseBindMatrices)
-    {
-      ibmProvider.reset(new InverseBindMatrixAccessor(*s.mInverseBindMatrices, cctx.mPath));
-    }
-    else
-    {
-      ibmProvider.reset(new DefaultInverseBindMatrixProvider());
-    }
-
-    SkeletonDefinition skeleton;
-    if(s.mSkeleton.GetIndex() != INVALID_INDEX)
-    {
-      skeleton.mRootNodeIdx = cctx.mNodeIndices.GetRuntimeId(s.mSkeleton.GetIndex());
-    }
-
-    skeleton.mJoints.resize(s.mJoints.size());
-    auto iJoint = skeleton.mJoints.begin();
-    for(auto& j : s.mJoints)
-    {
-      iJoint->mNodeIdx = cctx.mNodeIndices.GetRuntimeId(j.GetIndex());
-
-      ibmProvider->Provide(iJoint->mInverseBindMatrix);
-
-      ++iJoint;
-    }
-
-    resources.mSkeletons.push_back(std::move(skeleton));
-  }
-}
-
-void ProduceShaders(ShaderDefinitionFactory& shaderFactory, SceneDefinition& scene)
-{
-  for(size_t i0 = 0, i1 = scene.GetNodeCount(); i0 != i1; ++i0)
-  {
-    auto nodeDef = scene.GetNode(i0);
-    if(auto renderable = nodeDef->mRenderable.get())
-    {
-      renderable->mShaderIdx = shaderFactory.ProduceShader(*nodeDef);
-    }
-  }
-}
-
-void SetObjectReaders()
-{
-  js::SetObjectReader(BUFFER_READER);
-  js::SetObjectReader(BUFFER_VIEW_READER);
-  js::SetObjectReader(BUFFER_VIEW_CLIENT_READER);
-  js::SetObjectReader(COMPONENT_TYPED_BUFFER_VIEW_CLIENT_READER);
-  js::SetObjectReader(ACCESSOR_SPARSE_READER);
-  js::SetObjectReader(ACCESSOR_READER);
-  js::SetObjectReader(IMAGE_READER);
-  js::SetObjectReader(SAMPLER_READER);
-  js::SetObjectReader(TEXURE_READER);
-  js::SetObjectReader(TEXURE_INFO_READER);
-  js::SetObjectReader(MATERIAL_PBR_READER);
-  js::SetObjectReader(MATERIAL_READER);
-  js::SetObjectReader(MESH_PRIMITIVE_READER);
-  js::SetObjectReader(MESH_READER);
-  js::SetObjectReader(SKIN_READER);
-  js::SetObjectReader(CAMERA_PERSPECTIVE_READER);
-  js::SetObjectReader(CAMERA_ORTHOGRAPHIC_READER);
-  js::SetObjectReader(CAMERA_READER);
-  js::SetObjectReader(NODE_READER);
-  js::SetObjectReader(ANIMATION_SAMPLER_READER);
-  js::SetObjectReader(ANIMATION_TARGET_READER);
-  js::SetObjectReader(ANIMATION_CHANNEL_READER);
-  js::SetObjectReader(ANIMATION_READER);
-  js::SetObjectReader(SCENE_READER);
-}
-
-} // namespace
-
-void LoadGltfScene(const std::string& url, ShaderDefinitionFactory& shaderFactory, LoadResult& params)
-{
-  bool failed = false;
-  auto js     = LoadTextFile(url.c_str(), &failed);
-  if(failed)
-  {
-    throw std::runtime_error("Failed to load " + url);
-  }
-
-  json::unique_ptr root(json_parse(js.c_str(), js.size()));
-  if(!root)
-  {
-    throw std::runtime_error("Failed to parse " + url);
-  }
-
-  static bool setObjectReaders = true;
-  if(setObjectReaders)
-  {
-    // NOTE: only referencing own, anonymous namespace, const objects; the pointers will never need to change.
-    SetObjectReaders();
-    setObjectReaders = false;
-  }
-
-  gt::Document doc;
-
-  auto& rootObj        = js::Cast<json_object_s>(*root);
-  auto  jsAsset        = js::FindObjectChild("asset", rootObj);
-  auto  jsAssetVersion = js::FindObjectChild("version", js::Cast<json_object_s>(*jsAsset));
-  doc.mAsset.mVersion  = js::Read::StringView(*jsAssetVersion);
-
-  gt::SetRefReaderObject(doc);
-  DOCUMENT_READER.Read(rootObj, doc);
-
-  auto              path = url.substr(0, url.rfind('/') + 1);
-  ConversionContext cctx{params, path, INVALID_INDEX};
-
-  ConvertMaterials(doc, cctx);
-  ConvertMeshes(doc, cctx);
-  ConvertNodes(doc, cctx);
-  ConvertAnimations(doc, cctx);
-
-  ProcessSkins(doc, cctx);
-
-  ProduceShaders(shaderFactory, params.mScene);
-  params.mScene.EnsureUniqueSkinningShaderInstances(params.mResources);
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/gltf2-loader.h b/dali-scene-loader/public-api/gltf2-loader.h
deleted file mode 100644
index 9871ec0..0000000
--- a/dali-scene-loader/public-api/gltf2-loader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef DALI_SCENE_LOADER_GLTF2_LOADER_H
-#define DALI_SCENE_LOADER_GLTF2_LOADER_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <string>
-
-namespace Dali
-{
-namespace SceneLoader
-{
-struct CameraParameters;
-struct LoadResult;
-class ShaderDefinitionFactory;
-
-/**
- * @brief Loads the scene from the glTF file located at @a url, storing the results in @a params.
- * @note Will throw std::runtime_error for JSON entities with types mismatching expectations, carrying
- *  invalid values, or I/O errors.
- */
-DALI_SCENE_LOADER_API void LoadGltfScene(const std::string& url, ShaderDefinitionFactory& shaderFactory, LoadResult& params);
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_GLTF2_LOADER_H
diff --git a/dali-scene-loader/public-api/index.h b/dali-scene-loader/public-api/index.h
deleted file mode 100644
index 9ad5fc2..0000000
--- a/dali-scene-loader/public-api/index.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef DALI_SCENE_LOADER_INDEX_H_
-#define DALI_SCENE_LOADER_INDEX_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <cstdint>
-
-namespace Dali
-{
-namespace SceneLoader
-{
-using Index = uint32_t;
-
-constexpr Index INVALID_INDEX = static_cast<Index>(-1);
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_INDEX_H_
diff --git a/dali-scene-loader/public-api/ktx-loader.cpp b/dali-scene-loader/public-api/ktx-loader.cpp
deleted file mode 100644
index 857163d..0000000
--- a/dali-scene-loader/public-api/ktx-loader.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include "dali-scene-loader/public-api/ktx-loader.h"
-
-// EXTERNAL INCLUDES
-#include <fstream>
-#include <memory>
-#include "dali/public-api/rendering/texture.h"
-
-namespace Dali
-{
-namespace
-{
-// http://github.khronos.org/KTX-Specification/
-const uint8_t KTX_ID_HEAD[] = {0xAB, 0x4B, 0x54, 0x58, 0x20};
-const uint8_t KTX_ID_TAIL[] = {0xBB, 0x0D, 0x0A, 0x1A, 0x0A};
-
-const uint8_t KTX_VERSION_1_1[] = {0x31, 0x31};
-const uint8_t KTX_VERSION_2_0[] = {0x32, 0x30};
-
-static_assert(sizeof(KTX_ID_HEAD) + sizeof(KTX_ID_TAIL) == 10);
-static_assert(sizeof(KTX_VERSION_1_1) == 2);
-static_assert(sizeof(KTX_VERSION_2_0) == sizeof(KTX_VERSION_1_1));
-
-void FreeBuffer(uint8_t* buffer)
-{
-  delete[] buffer;
-}
-} // namespace
-
-namespace SceneLoader
-{
-struct KtxFileHeader
-{
-  uint8_t  identifier[12];
-  uint32_t endianness;
-  uint32_t glType; //(UNSIGNED_BYTE, UNSIGNED_SHORT_5_6_5, etc.)
-  uint32_t glTypeSize;
-  uint32_t glFormat;         //(RGB, RGBA, BGRA, etc.)
-  uint32_t glInternalFormat; //For uncompressed textures, specifies the internalformat parameter passed to glTexStorage*D or glTexImage*D
-  uint32_t glBaseInternalFormat;
-  uint32_t pixelWidth;
-  uint32_t pixelHeight;
-  uint32_t pixelDepth;
-  uint32_t numberOfArrayElements;
-  uint32_t numberOfFaces; //Cube map faces are stored in the order: +X, -X, +Y, -Y, +Z, -Z.
-  uint32_t numberOfMipmapLevels;
-  uint32_t bytesOfKeyValueData;
-
-  bool IsIdentifierValid() const
-  {
-    return std::equal(KTX_ID_HEAD, std::end(KTX_ID_HEAD), identifier) &&
-           (std::equal(KTX_VERSION_1_1, std::end(KTX_VERSION_1_1), identifier + sizeof(KTX_ID_HEAD)) ||
-            std::equal(KTX_VERSION_2_0, std::end(KTX_VERSION_2_0), identifier + sizeof(KTX_ID_HEAD))) &&
-           std::equal(KTX_ID_TAIL, std::end(KTX_ID_TAIL), identifier + (sizeof(KTX_ID_HEAD) + sizeof(KTX_VERSION_1_1)));
-  }
-};
-
-/**
- * Convert KTX format to Pixel::Format
- */
-bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Pixel::Format& format)
-{
-  switch(ktxPixelFormat)
-  {
-    case 0x93B0: // GL_COMPRESSED_RGBA_ASTC_4x4
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR;
-      break;
-    }
-    case 0x93B1: // GL_COMPRESSED_RGBA_ASTC_5x4
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR;
-      break;
-    }
-    case 0x93B2: // GL_COMPRESSED_RGBA_ASTC_5x5
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR;
-      break;
-    }
-    case 0x93B3: // GL_COMPRESSED_RGBA_ASTC_6x5
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR;
-      break;
-    }
-    case 0x93B4: // GL_COMPRESSED_RGBA_ASTC_6x6
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR;
-      break;
-    }
-    case 0x93B5: // GL_COMPRESSED_RGBA_ASTC_8x5
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR;
-      break;
-    }
-    case 0x93B6: // GL_COMPRESSED_RGBA_ASTC_8x6
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR;
-      break;
-    }
-    case 0x93B7: // GL_COMPRESSED_RGBA_ASTC_8x8
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR;
-      break;
-    }
-    case 0x93B8: // GL_COMPRESSED_RGBA_ASTC_10x5
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR;
-      break;
-    }
-    case 0x93B9: // GL_COMPRESSED_RGBA_ASTC_10x6
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR;
-      break;
-    }
-    case 0x93BA: // GL_COMPRESSED_RGBA_ASTC_10x8
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR;
-      break;
-    }
-    case 0x93BB: // GL_COMPRESSED_RGBA_ASTC_10x10
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR;
-      break;
-    }
-    case 0x93BC: // GL_COMPRESSED_RGBA_ASTC_12x10
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR;
-      break;
-    }
-    case 0x93BD: // GL_COMPRESSED_RGBA_ASTC_12x12
-    {
-      format = Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR;
-      break;
-    }
-    case 0x881B: // GL_RGB16F
-    {
-      format = Pixel::RGB16F;
-      break;
-    }
-    case 0x8815: // GL_RGB32F
-    {
-      format = Pixel::RGB32F;
-      break;
-    }
-    case 0x8C3A: // GL_R11F_G11F_B10F
-    {
-      format = Pixel::R11G11B10F;
-      break;
-    }
-    case 0x8D7C: // GL_RGBA8UI
-    {
-      format = Pixel::RGBA8888;
-      break;
-    }
-    case 0x8D7D: // GL_RGB8UI
-    {
-      format = Pixel::RGB888;
-      break;
-    }
-    default:
-    {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-Texture CubeData::CreateTexture() const
-{
-  Texture texture = Texture::New(TextureType::TEXTURE_CUBE, data[0][0].GetPixelFormat(), data[0][0].GetWidth(), data[0][0].GetHeight());
-  for(size_t iSide = 0u, iEndSize = data.size(); iSide < iEndSize; ++iSide)
-  {
-    auto& side = data[iSide];
-    for(size_t iMipLevel = 0u, iEndMipLevel = data[0].size(); iMipLevel < iEndMipLevel; ++iMipLevel)
-    {
-      texture.Upload(side[iMipLevel], CubeMapLayer::POSITIVE_X + iSide, iMipLevel, 0u, 0u, side[iMipLevel].GetWidth(), side[iMipLevel].GetHeight());
-    }
-  }
-
-  return texture;
-}
-
-bool LoadCubeMapData(const std::string& path, CubeData& cubedata)
-{
-  std::fstream fp(path, std::ios::in | std::ios::binary);
-  if(fp.is_open() == false)
-  {
-    return false;
-  }
-
-  KtxFileHeader header;
-  if(fp.read(reinterpret_cast<char*>(&header), sizeof(KtxFileHeader)).good() == false)
-  {
-    return false;
-  }
-
-  if(!header.IsIdentifierValid())
-  {
-    return false;
-  }
-
-  // Skip the key-values:
-  if(fp.seekg(header.bytesOfKeyValueData, fp.cur).good() == false)
-  {
-    return false;
-  }
-
-  header.numberOfMipmapLevels  = std::max(header.numberOfMipmapLevels, 1u);
-  header.numberOfArrayElements = std::max(header.numberOfArrayElements, 1u);
-  header.pixelDepth            = std::max(header.pixelDepth, 1u);
-  header.pixelHeight           = std::max(header.pixelHeight, 1u);
-
-  cubedata.data.resize(header.numberOfFaces);
-  for(uint32_t face = 0u; face < header.numberOfFaces; ++face)
-  {
-    cubedata.data[face].resize(header.numberOfMipmapLevels);
-  }
-
-  Pixel::Format daliformat = Pixel::RGB888;
-
-  ConvertPixelFormat(header.glInternalFormat, daliformat);
-
-  for(uint32_t mipmapLevel = 0u; mipmapLevel < header.numberOfMipmapLevels; ++mipmapLevel)
-  {
-    uint32_t byteSize = 0u;
-    if(fp.read(reinterpret_cast<char*>(&byteSize), sizeof(byteSize)).good() == false)
-    {
-      return false;
-    }
-
-    if(0u != byteSize % 4u)
-    {
-      byteSize += 4u - byteSize % 4u;
-    }
-
-    for(uint32_t arrayElement = 0u; arrayElement < header.numberOfArrayElements; ++arrayElement) //arrayElement must be 0 or 1
-    {
-      for(uint32_t face = 0u; face < header.numberOfFaces; ++face)
-      {
-        std::unique_ptr<uint8_t, void (*)(uint8_t*)> img(new uint8_t[byteSize], FreeBuffer);
-        if(fp.read(reinterpret_cast<char*>(img.get()), byteSize).good() == false)
-        {
-          return false;
-        }
-        cubedata.data[face][mipmapLevel] = PixelData::New(img.release(), byteSize, header.pixelWidth, header.pixelHeight, daliformat, PixelData::DELETE_ARRAY);
-      }
-    }
-
-    header.pixelHeight /= 2u;
-    header.pixelWidth /= 2u;
-  }
-
-  return true;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/ktx-loader.h b/dali-scene-loader/public-api/ktx-loader.h
deleted file mode 100644
index d94f4ca..0000000
--- a/dali-scene-loader/public-api/ktx-loader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef DALI_SCENE_LOADER_KTX_LOADER_H
-#define DALI_SCENE_LOADER_KTX_LOADER_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/images/pixel-data.h"
-#include "dali/public-api/rendering/texture.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Stores the pixel data objects for each face of the cube texture and their mipmaps.
- */
-struct DALI_SCENE_LOADER_API CubeData
-{
-  std::vector<std::vector<PixelData> > data;
-
-  Texture CreateTexture() const;
-};
-
-/**
- * @brief Loads cube map data texture from a ktx file.
- *
- * @param[in] path The file path.
- * @param[out] cubedata The data structure with all pixel data objects.
- */
-DALI_SCENE_LOADER_API bool LoadCubeMapData(const std::string& path, CubeData& cubedata);
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_KTX_LOADER_H
diff --git a/dali-scene-loader/public-api/light-parameters.h b/dali-scene-loader/public-api/light-parameters.h
deleted file mode 100644
index 11b014b..0000000
--- a/dali-scene-loader/public-api/light-parameters.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef DALI_SCENE_LOADER_LIGHT_PARAMETERS_H
-#define DALI_SCENE_LOADER_LIGHT_PARAMETERS_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <stdint.h>
-#include "dali/public-api/math/matrix.h"
-#include "dali/public-api/math/vector3.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-struct DALI_SCENE_LOADER_API LightParameters
-{
-  Matrix transform;
-
-  Vector3  color;
-  float    intensity;
-  float    shadowIntensity;
-  uint32_t shadowMapSize;
-  float    orthographicSize;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_LIGHT_PARAMETERS_H
diff --git a/dali-scene-loader/public-api/load-result.h b/dali-scene-loader/public-api/load-result.h
deleted file mode 100644
index 4ed3ff5..0000000
--- a/dali-scene-loader/public-api/load-result.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef DALI_SCENE_LOADER_OUTPUT_H
-#define DALI_SCENE_LOADER_OUTPUT_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/animation-definition.h"
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/camera-parameters.h"
-#include "dali-scene-loader/public-api/light-parameters.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-class ResourceBundle;
-class SceneDefinition;
-
-/**
- * @brief The outputs from loading and processing a scene.
- */
-struct DALI_SCENE_LOADER_API LoadResult
-{
-  /**
-   * @brief The bundle to store resources in.
-   */
-  ResourceBundle& mResources;
-
-  /**
-   * @brief The scene definition to populate.
-   */
-  SceneDefinition& mScene;
-
-  /**
-   * @brief The list of animation definitions, in lexicographical order of their names.
-   */
-  std::vector<AnimationDefinition>& mAnimationDefinitions;
-
-  /**
-   * @brief The list of animation group definitions, in lexicographical order of their names.
-   */
-  std::vector<AnimationGroupDefinition>& mAnimationGroupDefinitions;
-
-  /**
-   * @brief The camera parameters that were loaded from the scene.
-   */
-  std::vector<CameraParameters>& mCameraParameters;
-
-  /**
-   * @brief The light parameters that were loaded from the scene.
-   */
-  std::vector<LightParameters>& mLightParameters;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_OUTPUT_H
diff --git a/dali-scene-loader/public-api/material-definition.cpp b/dali-scene-loader/public-api/material-definition.cpp
deleted file mode 100644
index c0e816c..0000000
--- a/dali-scene-loader/public-api/material-definition.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/material-definition.h"
-
-// EXTERNAL INCLUDES
-#include "dali-toolkit/public-api/image-loader/sync-image-loader.h"
-
-namespace Dali
-{
-using namespace Toolkit;
-
-namespace SceneLoader
-{
-namespace
-{
-constexpr SamplerFlags::Type FILTER_MODES_FROM_DALI[]{
-  SamplerFlags::FILTER_LINEAR | SamplerFlags::FILTER_MIPMAP_NEAREST,
-  SamplerFlags::FILTER_LINEAR,
-  SamplerFlags::FILTER_NEAREST,
-  SamplerFlags::FILTER_LINEAR,
-  SamplerFlags::FILTER_NEAREST | SamplerFlags::FILTER_MIPMAP_NEAREST,
-  SamplerFlags::FILTER_LINEAR | SamplerFlags::FILTER_MIPMAP_NEAREST,
-  SamplerFlags::FILTER_NEAREST | SamplerFlags::FILTER_MIPMAP_LINEAR,
-  SamplerFlags::FILTER_LINEAR | SamplerFlags::FILTER_MIPMAP_LINEAR,
-};
-
-constexpr SamplerFlags::Type WRAP_MODES_FROM_DALI[]{
-  SamplerFlags::WRAP_CLAMP,
-  SamplerFlags::WRAP_CLAMP,
-  SamplerFlags::WRAP_REPEAT,
-  SamplerFlags::WRAP_MIRROR,
-};
-
-constexpr FilterMode::Type FILTER_MODES_TO_DALI[]{
-  FilterMode::NEAREST,
-  FilterMode::LINEAR,
-  FilterMode::NEAREST_MIPMAP_NEAREST,
-  FilterMode::LINEAR_MIPMAP_NEAREST,
-  FilterMode::NEAREST_MIPMAP_LINEAR,
-  FilterMode::LINEAR_MIPMAP_LINEAR,
-};
-
-constexpr WrapMode::Type WRAP_MODES_TO_DALI[]{
-  WrapMode::REPEAT,
-  WrapMode::CLAMP_TO_EDGE,
-  WrapMode::MIRRORED_REPEAT};
-
-const SamplerFlags::Type SINGLE_VALUE_SAMPLER = SamplerFlags::Encode(FilterMode::NEAREST, FilterMode::NEAREST, WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE);
-} // namespace
-
-SamplerFlags::Type SamplerFlags::Encode(FilterMode::Type minFilter, FilterMode::Type magFilter, WrapMode::Type wrapS, WrapMode::Type wrapT)
-{
-  return FILTER_MODES_FROM_DALI[minFilter] | ((FILTER_MODES_FROM_DALI[magFilter] & FILTER_MAG_BITS) << FILTER_MAG_SHIFT) |
-         (WRAP_MODES_FROM_DALI[wrapS] << WRAP_S_SHIFT) | (WRAP_MODES_FROM_DALI[wrapT] << WRAP_T_SHIFT);
-}
-
-FilterMode::Type SamplerFlags::GetMinFilter(Type flags)
-{
-  return FILTER_MODES_TO_DALI[flags & FILTER_MIN_MASK];
-}
-
-FilterMode::Type SamplerFlags::GetMagFilter(Type flags)
-{
-  return FILTER_MODES_TO_DALI[(flags >> FILTER_MAG_SHIFT) & FILTER_MAG_MASK];
-}
-
-WrapMode::Type SamplerFlags::GetWrapS(Type flags)
-{
-  return WRAP_MODES_TO_DALI[(flags >> WRAP_S_SHIFT) & WRAP_S_MASK];
-}
-
-WrapMode::Type SamplerFlags::GetWrapT(Type flags)
-{
-  return WRAP_MODES_TO_DALI[(flags >> WRAP_T_SHIFT) & WRAP_T_MASK];
-}
-
-Sampler SamplerFlags::MakeSampler(Type flags)
-{
-  auto sampler = Sampler::New();
-  sampler.SetFilterMode(GetMinFilter(flags), GetMagFilter(flags));
-  sampler.SetWrapMode(GetWrapS(flags), GetWrapT(flags));
-  return sampler;
-}
-
-TextureDefinition::TextureDefinition(const std::string& imageUri, SamplerFlags::Type samplerFlags)
-: mImageUri(imageUri),
-  mSamplerFlags(samplerFlags)
-{
-}
-
-MaterialDefinition::RawData
-MaterialDefinition::LoadRaw(const std::string& imagesPath) const
-{
-  RawData raw;
-
-  const bool hasTransparency = MaskMatch(mFlags, TRANSPARENCY);
-  uint32_t   numBuffers      = mTextureStages.size() + (hasTransparency ? !CheckTextures(ALBEDO) + !CheckTextures(METALLIC | ROUGHNESS) + !CheckTextures(NORMAL) : !CheckTextures(ALBEDO | METALLIC) + !CheckTextures(NORMAL | ROUGHNESS));
-  if(numBuffers == 0)
-  {
-    return raw;
-  }
-  raw.mTextures.reserve(numBuffers);
-
-  // Load textures
-  auto iTexture   = mTextureStages.cbegin();
-  auto checkStage = [&](uint32_t flags) {
-    return iTexture != mTextureStages.end() && MaskMatch(iTexture->mSemantic, flags);
-  };
-
-  // Check for compulsory textures: Albedo, Metallic, Roughness, Normal
-  if(checkStage(ALBEDO | METALLIC))
-  {
-    raw.mTextures.push_back({SyncImageLoader::Load(imagesPath + iTexture->mTexture.mImageUri), iTexture->mTexture.mSamplerFlags});
-    ++iTexture;
-
-    if(checkStage(NORMAL | ROUGHNESS))
-    {
-      raw.mTextures.push_back({SyncImageLoader::Load(imagesPath + iTexture->mTexture.mImageUri), iTexture->mTexture.mSamplerFlags});
-      ++iTexture;
-    }
-    else // single value normal-roughness
-    {
-      const auto bufferSize = 4;
-      uint8_t*   buffer     = new uint8_t[bufferSize]{0x7f, 0x7f, 0xff, 0xff}; // normal of (0, 0, 1), roughness of 1
-      raw.mTextures.push_back({PixelData::New(buffer, bufferSize, 1, 1, Pixel::RGBA8888, PixelData::DELETE_ARRAY), SINGLE_VALUE_SAMPLER});
-    }
-  }
-  else
-  {
-    if(checkStage(ALBEDO))
-    {
-      raw.mTextures.push_back({SyncImageLoader::Load(imagesPath + iTexture->mTexture.mImageUri), iTexture->mTexture.mSamplerFlags});
-      ++iTexture;
-    }
-    else // single value albedo, albedo-alpha or albedo-metallic
-    {
-      uint32_t bufferSize = 4;
-      uint8_t* buffer     = nullptr;
-      auto     format     = Pixel::Format::RGBA8888;
-      if(hasTransparency) // albedo-alpha
-      {
-        buffer    = new uint8_t[bufferSize];
-        buffer[3] = static_cast<uint8_t>(mColor.a * 255.f);
-      }
-      else if(!checkStage(METALLIC | ROUGHNESS)) // albedo-metallic
-      {
-        buffer    = new uint8_t[bufferSize];
-        buffer[3] = 0xff; // metallic of 1.0
-      }
-      else // albedo
-      {
-        bufferSize = 3;
-        buffer     = new uint8_t[bufferSize];
-        format     = Pixel::Format::RGB888;
-      }
-      buffer[0] = static_cast<uint8_t>(mColor.r * 255.f);
-      buffer[1] = static_cast<uint8_t>(mColor.g * 255.f);
-      buffer[2] = static_cast<uint8_t>(mColor.b * 255.f);
-      raw.mTextures.push_back({PixelData::New(buffer, bufferSize, 1, 1, format, PixelData::DELETE_ARRAY), SINGLE_VALUE_SAMPLER});
-    }
-
-    // If we have transparency, or an image based albedo map, we will have to continue with separate metallicRoughness + normal.
-    const bool createMetallicRoughnessAndNormal = hasTransparency || std::distance(mTextureStages.begin(), iTexture) > 0;
-    if(checkStage(METALLIC | ROUGHNESS))
-    {
-      raw.mTextures.push_back({SyncImageLoader::Load(imagesPath + iTexture->mTexture.mImageUri), iTexture->mTexture.mSamplerFlags});
-      ++iTexture;
-    }
-    else if(createMetallicRoughnessAndNormal)
-    {
-      // NOTE: we want to set both metallic and roughness to 1.0; dli uses the R & A channels,
-      // glTF2 uses B & G, so we might as well just set all components to 1.0.
-      const auto bufferSize = 4;
-      uint8_t*   buffer     = new uint8_t[bufferSize]{0xff, 0xff, 0xff, 0xff};
-      raw.mTextures.push_back({PixelData::New(buffer, bufferSize, 1, 1, Pixel::RGBA8888, PixelData::DELETE_ARRAY), SINGLE_VALUE_SAMPLER});
-    }
-
-    if(checkStage(NORMAL))
-    {
-      raw.mTextures.push_back({SyncImageLoader::Load(imagesPath + iTexture->mTexture.mImageUri), iTexture->mTexture.mSamplerFlags});
-      ++iTexture;
-    }
-    else if(createMetallicRoughnessAndNormal)
-    {
-      const auto bufferSize = 3;
-      uint8_t*   buffer     = new uint8_t[bufferSize]{0x7f, 0x7f, 0xff}; // normal of (0, 0, 1)
-      raw.mTextures.push_back({PixelData::New(buffer, bufferSize, 1, 1, Pixel::RGB888, PixelData::DELETE_ARRAY), SINGLE_VALUE_SAMPLER});
-    }
-    else // single-value normal-roughness
-    {
-      const auto bufferSize = 4;
-      uint8_t*   buffer     = new uint8_t[bufferSize]{0x7f, 0x7f, 0xff, 0xff}; // normal of (0, 0, 1), roughness of 1.0
-      raw.mTextures.push_back({PixelData::New(buffer, bufferSize, 1, 1, Pixel::RGBA8888, PixelData::DELETE_ARRAY), SINGLE_VALUE_SAMPLER});
-    }
-  }
-
-  // Extra textures. TODO: emissive, occlusion etc.
-  if(checkStage(SUBSURFACE))
-  {
-    raw.mTextures.push_back({SyncImageLoader::Load(imagesPath + iTexture->mTexture.mImageUri), iTexture->mTexture.mSamplerFlags});
-    ++iTexture;
-  }
-
-  return raw;
-}
-
-TextureSet MaterialDefinition::Load(const EnvironmentDefinition::Vector& environments, RawData&& raw) const
-{
-  auto textureSet = TextureSet::New();
-
-  uint32_t n = 0;
-  for(auto& tData : raw.mTextures)
-  {
-    auto& pixels  = tData.mPixels;
-    auto  texture = Texture::New(TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight());
-    texture.Upload(tData.mPixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight());
-    if(tData.mSamplerFlags & SamplerFlags::MIPMAP_MASK)
-    {
-      texture.GenerateMipmaps();
-    }
-
-    textureSet.SetTexture(n, texture);
-    textureSet.SetSampler(n, SamplerFlags::MakeSampler(tData.mSamplerFlags));
-
-    ++n;
-  }
-
-  // Assign textures to slots -- starting with 2D ones, then cubemaps, if any.
-  if(mEnvironmentIdx < environments.size())
-  {
-    auto& envTextures = environments[mEnvironmentIdx].second;
-    if(envTextures.mDiffuse)
-    {
-      textureSet.SetTexture(n, envTextures.mDiffuse);
-      ++n;
-    }
-
-    if(envTextures.mSpecular)
-    {
-      auto specularSampler = Sampler::New();
-      specularSampler.SetWrapMode(WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE);
-      specularSampler.SetFilterMode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR);
-
-      textureSet.SetTexture(n, envTextures.mSpecular);
-      textureSet.SetSampler(n, specularSampler);
-    }
-  }
-  else
-  {
-    ExceptionFlinger(ASSERT_LOCATION) << "Environment index (" << mEnvironmentIdx << ") out of bounds (" << environments.size() << ").";
-  }
-
-  return textureSet;
-}
-
-bool MaterialDefinition::CheckTextures(uint32_t flags) const
-{
-  return std::find_if(mTextureStages.begin(), mTextureStages.end(), [flags](const TextureStage& ts) {
-           return MaskMatch(ts.mSemantic, flags);
-         }) != mTextureStages.end();
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/material-definition.h b/dali-scene-loader/public-api/material-definition.h
deleted file mode 100644
index 80e93e7..0000000
--- a/dali-scene-loader/public-api/material-definition.h
+++ /dev/null
@@ -1,232 +0,0 @@
-#ifndef DALI_SCENE_LOADER_MATERIAL_DEFINITION_H
-#define DALI_SCENE_LOADER_MATERIAL_DEFINITION_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/environment-definition.h"
-#include "dali-scene-loader/public-api/index.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-// EXTERNAL INCLUDES
-#include <cmath>
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/math/vector4.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Helper enum for encoding and decoding sampler states.
- */
-struct DALI_SCENE_LOADER_API SamplerFlags
-{
-  using Type = uint8_t;
-
-  enum Values : Type
-  {
-    // Filter - 3 bits
-    FILTER_NEAREST        = 0,
-    FILTER_LINEAR         = NthBit(0),
-    FILTER_MIPMAP_NEAREST = NthBit(1),
-    FILTER_MIPMAP_LINEAR  = NthBit(2),
-
-    // Wrap - 2 bits
-    WRAP_REPEAT = 0,
-    WRAP_CLAMP  = NthBit(0),
-    WRAP_MIRROR = NthBit(1),
-
-    // Layout - apply shift, then mask
-    FILTER_MIN_BITS = 3,
-    FILTER_MIN_MASK = NthBit(FILTER_MIN_BITS) - 1,
-
-    FILTER_MAG_BITS  = 1,
-    FILTER_MAG_SHIFT = FILTER_MIN_BITS,
-    FILTER_MAG_MASK  = NthBit(FILTER_MAG_BITS) - 1,
-
-    WRAP_S_BITS  = 2,
-    WRAP_S_SHIFT = FILTER_MAG_SHIFT + FILTER_MAG_BITS,
-    WRAP_S_MASK  = NthBit(WRAP_S_BITS) - 1,
-
-    WRAP_T_BITS  = 2,
-    WRAP_T_SHIFT = WRAP_S_SHIFT + WRAP_S_BITS,
-    WRAP_T_MASK  = NthBit(WRAP_T_BITS) - 1,
-
-    // Diagnostics
-    MIPMAP_MASK = FILTER_MIPMAP_LINEAR | FILTER_MIPMAP_NEAREST,
-
-    // Default
-    DEFAULT = FILTER_LINEAR | (FILTER_LINEAR << FILTER_MAG_SHIFT) | (WRAP_REPEAT << WRAP_S_SHIFT) | (WRAP_REPEAT << WRAP_T_SHIFT), // LINEAR filters, REPEAT wraps
-  };
-
-  /**
-   * @return SamplerFlags bit pattern calculated from the given Dali Sampler settings.
-   */
-  static Type Encode(FilterMode::Type minFilter, FilterMode::Type magFilter, WrapMode::Type wrapS, WrapMode::Type wrapT);
-
-  /**
-   * @brief Decodes the minification filter patter of @a flags into the corresponding FilterMode.
-   */
-  static FilterMode::Type GetMinFilter(Type flags);
-
-  /**
-   * @brief Decodes the magnification filter patter of @a flags into the corresponding FilterMode.
-   */
-  static FilterMode::Type GetMagFilter(Type flags);
-
-  /**
-   * @brief Decodes the horizontal wrap pattern of @a flags into the corresponding WrapMode.
-   */
-  static WrapMode::Type GetWrapS(Type flags);
-
-  /**
-   * @brief Decodes the vertical wrap pattern of @a flags into the corresponding WrapMode.
-   */
-  static WrapMode::Type GetWrapT(Type flags);
-
-  /**
-   * @brief Creates a Sampler with the settings encoded in @a flags.
-   */
-  static Sampler MakeSampler(Type flags);
-};
-
-/**
- * @brief Defines a texture from a combination of an image URI and its sampler definition.
- */
-struct DALI_SCENE_LOADER_API TextureDefinition
-{
-  std::string        mImageUri;
-  SamplerFlags::Type mSamplerFlags;
-
-  TextureDefinition(const std::string& imageUri = "", SamplerFlags::Type samplerFlags = SamplerFlags::DEFAULT);
-};
-
-/**
- * @brief Defines a material with a number of texture stages, whether mipmappping
- *  is enabled, and an index of an environment (usually of all environments in a
- *  scene). Textures from the environment are added last when the DALi TextureSet
- *  is being created.
- */
-struct DALI_SCENE_LOADER_API MaterialDefinition
-{
-  enum Flags : uint32_t
-  {
-    // Texture semantics
-    ALBEDO     = NthBit(0),
-    METALLIC   = NthBit(1),
-    ROUGHNESS  = NthBit(2),
-    NORMAL     = NthBit(3),
-    EMISSIVE   = NthBit(4), // TODO: support
-    OCCLUSION  = NthBit(5), // TODO: support
-    SUBSURFACE = NthBit(6), // Note: dli-only
-
-    // Other binary options
-    TRANSPARENCY  = NthBit(20),
-    GLTF_CHANNELS = NthBit(21), // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#pbrmetallicroughnessmetallicroughnesstexture
-
-    // Alpha cutoff - reserved from the 24th bit
-    ALPHA_CUTOFF_BITS  = 8,
-    ALPHA_CUTOFF_SHIFT = sizeof(uint32_t) * 8 - ALPHA_CUTOFF_BITS,
-    ALPHA_CUTOFF_MASK  = (1 << ALPHA_CUTOFF_BITS) - 1,
-  };
-
-  /**
-   * @brief A(n image based) texture that's used in a material.
-   */
-  struct TextureStage
-  {
-    uint32_t          mSemantic;
-    TextureDefinition mTexture;
-  };
-
-  using Vector = std::vector<std::pair<MaterialDefinition, TextureSet>>;
-
-  struct RawData
-  {
-    struct TextureData
-    {
-      PixelData          mPixels;
-      SamplerFlags::Type mSamplerFlags;
-    };
-
-    std::vector<TextureData> mTextures;
-  };
-
-  MaterialDefinition() = default;
-
-  MaterialDefinition(const MaterialDefinition&) = delete;
-  MaterialDefinition& operator=(const MaterialDefinition&) = delete;
-
-  MaterialDefinition(MaterialDefinition&&) = default;
-  MaterialDefinition& operator=(MaterialDefinition&&) = default;
-
-  /**
-   * @brief Loads (or, in the case of solid color materials, creates) raw pixel data,
-   *  which is then returned.
-   * @note This may be called from any thread.
-   */
-  RawData LoadRaw(const std::string& imagesPath) const;
-
-  /**
-   * @brief Creates Textures from the pixel data in @a raw, gets the
-   *  the cube maps from the iEnvironment'th element of @a environments,
-   *  then creates a DALi TextureSet and returns it.
-   * @note This must be called from the event thread.
-   * @note The textures are added in the following order: 2D, cube maps.
-   */
-  TextureSet Load(const EnvironmentDefinition::Vector& environments, RawData&& raw) const;
-
-  /**
-   * @brief Checks if the given mask matches any of the textures defined.
-   */
-  bool CheckTextures(uint32_t flags) const;
-
-  /**
-   * @return The alpha test reference value.
-   * @note A value of 0.f means no alpha testing.
-   */
-  float GetAlphaCutoff() const
-  {
-    return ((mFlags >> ALPHA_CUTOFF_SHIFT) & ALPHA_CUTOFF_MASK) / 255.f;
-  }
-
-  /**
-   * @brief Encodes the alpha test reference @a value in flags.
-   * @note A value of 0.f means no alpha testing.
-   */
-  void SetAlphaCutoff(float value)
-  {
-    DALI_ASSERT_DEBUG(value >= 0.f && value <= 1.f);
-    mFlags |= static_cast<uint8_t>(std::round(value * 255.f)) << ALPHA_CUTOFF_SHIFT;
-  }
-
-public: // DATA
-  uint32_t mFlags = 0x0;
-
-  Index                     mEnvironmentIdx = 0;
-  Vector4                   mColor          = Color::WHITE;
-  float                     mMetallic       = 1.f;
-  float                     mRoughness      = 1.f;
-  std::vector<TextureStage> mTextureStages;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_MATERIAL_DEFINITION_H
diff --git a/dali-scene-loader/public-api/matrix-stack.cpp b/dali-scene-loader/public-api/matrix-stack.cpp
deleted file mode 100644
index eb2316e..0000000
--- a/dali-scene-loader/public-api/matrix-stack.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2021 Samsung Electronics Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*/
-#include "dali-scene-loader/public-api/matrix-stack.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-MatrixStack::MatrixStack()
-{
-  mStack.reserve(16);
-}
-
-bool MatrixStack::IsEmpty() const
-{
-  return mStack.empty();
-}
-
-void MatrixStack::Push(const Matrix& model)
-{
-  if(mStack.empty())
-  {
-    mStack.push_back(model);
-  }
-  else
-  {
-    Matrix m{false};
-    Matrix::Multiply(m, model, mStack.back());
-    mStack.push_back(m);
-  }
-}
-
-const Matrix& MatrixStack::Top() const
-{
-  return mStack.back();
-}
-
-void MatrixStack::Pop()
-{
-  DALI_ASSERT_ALWAYS(mStack.size() > 0);
-  mStack.pop_back();
-}
-
-void MatrixStack::PopAll()
-{
-  mStack.clear();
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/matrix-stack.h b/dali-scene-loader/public-api/matrix-stack.h
deleted file mode 100644
index 5c5c923..0000000
--- a/dali-scene-loader/public-api/matrix-stack.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef DALI_SCENE_LOADER_MATRIX_STACK_H_
-#define DALI_SCENE_LOADER_MATRIX_STACK_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/math/matrix.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief A stack of matrices whereby each newly pushed matrix is stored
- *  after being multiplied by the previous one (if any).
- * @note Current implementation reserves space for 16 matrices.
- */
-class DALI_SCENE_LOADER_API MatrixStack
-{
-public:
-  MatrixStack();
-
-  bool          IsEmpty() const;
-  void          Push(const Matrix& model);
-  const Matrix& Top() const;
-  void          Pop();
-  void          PopAll(); // clears the stack, but retains the storage.
-
-private:
-  std::vector<Matrix> mStack;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_MATRIX_STACK_H_
diff --git a/dali-scene-loader/public-api/mesh-definition.cpp b/dali-scene-loader/public-api/mesh-definition.cpp
deleted file mode 100644
index de37e30..0000000
--- a/dali-scene-loader/public-api/mesh-definition.cpp
+++ /dev/null
@@ -1,875 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/mesh-definition.h"
-
-// EXTERNAL INCLUDES
-#include <cstring>
-#include <fstream>
-#include "dali/devel-api/adaptor-framework/pixel-buffer.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-using Uint16Vector4 = uint16_t[4];
-
-class IndexProvider
-{
-public:
-  IndexProvider(const uint16_t* indices)
-  : mData(reinterpret_cast<uintptr_t>(indices)),
-    mFunc(indices ? IncrementPointer : Increment)
-  {
-  }
-
-  uint16_t operator()()
-  {
-    return mFunc(mData);
-  }
-
-private:
-  static uint16_t Increment(uintptr_t& data)
-  {
-    return static_cast<uint16_t>(data++);
-  }
-
-  static uint16_t IncrementPointer(uintptr_t& data)
-  {
-    auto iPtr   = reinterpret_cast<const uint16_t*>(data);
-    auto result = *iPtr;
-    data        = reinterpret_cast<uintptr_t>(++iPtr);
-    return result;
-  }
-
-  uintptr_t mData;
-  uint16_t (*mFunc)(uintptr_t&);
-};
-
-const std::string QUAD("quad");
-
-///@brief Reads a blob from the given stream @a source into @a target, which must have
-/// at least @a descriptor.length bytes.
-bool ReadBlob(const MeshDefinition::Blob& descriptor, std::istream& source, uint8_t* target)
-{
-  if(!source.seekg(descriptor.mOffset, std::istream::beg))
-  {
-    return false;
-  }
-
-  if(descriptor.IsConsecutive())
-  {
-    return !!source.read(reinterpret_cast<char*>(target), descriptor.mLength);
-  }
-  else
-  {
-    DALI_ASSERT_DEBUG(descriptor.mStride > descriptor.mElementSizeHint);
-    const uint32_t diff     = descriptor.mStride - descriptor.mElementSizeHint;
-    uint32_t       readSize = 0;
-    while(readSize < descriptor.mLength &&
-          source.read(reinterpret_cast<char*>(target), descriptor.mElementSizeHint) &&
-          source.seekg(diff, std::istream::cur))
-    {
-      readSize += descriptor.mStride;
-      target += descriptor.mElementSizeHint;
-    }
-    return readSize == descriptor.mLength;
-  }
-}
-
-template<typename T>
-void ReadValues(const std::vector<uint8_t>& valuesBuffer, const std::vector<uint8_t>& indicesBuffer, uint8_t* target, uint32_t count, uint32_t elementSizeHint)
-{
-  const T* const indicesPtr = reinterpret_cast<const T* const>(indicesBuffer.data());
-  for(uint32_t index = 0u; index < count; ++index)
-  {
-    uint32_t valuesIndex = indicesPtr[index] * elementSizeHint;
-    memcpy(target + valuesIndex, &valuesBuffer[index * elementSizeHint], elementSizeHint);
-  }
-}
-
-bool ReadAccessor(const MeshDefinition::Accessor& accessor, std::istream& source, uint8_t* target)
-{
-  bool success = false;
-
-  if(accessor.mBlob.IsDefined())
-  {
-    success = ReadBlob(accessor.mBlob, source, target);
-    if(!success)
-    {
-      return false;
-    }
-  }
-
-  if(accessor.mSparse)
-  {
-    const MeshDefinition::Blob& indices = accessor.mSparse->mIndices;
-    const MeshDefinition::Blob& values  = accessor.mSparse->mValues;
-
-    if(!indices.IsDefined() || !values.IsDefined())
-    {
-      return false;
-    }
-
-    const auto           indicesBufferSize = indices.GetBufferSize();
-    std::vector<uint8_t> indicesBuffer(indicesBufferSize);
-    success = ReadBlob(indices, source, indicesBuffer.data());
-    if(!success)
-    {
-      return false;
-    }
-
-    const auto           valuesBufferSize = values.GetBufferSize();
-    std::vector<uint8_t> valuesBuffer(valuesBufferSize);
-    success = ReadBlob(values, source, valuesBuffer.data());
-    if(!success)
-    {
-      return false;
-    }
-
-    switch(indices.mElementSizeHint)
-    {
-      case 1u:
-      {
-        ReadValues<uint8_t>(valuesBuffer, indicesBuffer, target, accessor.mSparse->mCount, values.mElementSizeHint);
-        break;
-      }
-      case 2u:
-      {
-        ReadValues<uint16_t>(valuesBuffer, indicesBuffer, target, accessor.mSparse->mCount, values.mElementSizeHint);
-        break;
-      }
-      case 4u:
-      {
-        ReadValues<uint32_t>(valuesBuffer, indicesBuffer, target, accessor.mSparse->mCount, values.mElementSizeHint);
-        break;
-      }
-      default:
-        DALI_ASSERT_DEBUG(!"Unsupported type for an index");
-    }
-  }
-
-  return success;
-}
-
-void GenerateNormals(MeshDefinition::RawData& raw)
-{
-  auto& attribs = raw.mAttribs;
-  DALI_ASSERT_DEBUG(attribs.size() > 0); // positions
-  IndexProvider getIndex(raw.mIndices.data());
-
-  const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : raw.mIndices.size();
-
-  auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
-
-  std::vector<uint8_t> buffer(attribs[0].mNumElements * sizeof(Vector3));
-  auto                 normals = reinterpret_cast<Vector3*>(buffer.data());
-
-  for(uint32_t i = 0; i < numIndices; i += 3)
-  {
-    uint16_t indices[]{getIndex(), getIndex(), getIndex()};
-    Vector3  pos[]{positions[indices[0]], positions[indices[1]], positions[indices[2]]};
-
-    Vector3 a = pos[1] - pos[0];
-    Vector3 b = pos[2] - pos[0];
-
-    Vector3 normal(a.Cross(b));
-    normals[indices[0]] += normal;
-    normals[indices[1]] += normal;
-    normals[indices[2]] += normal;
-  }
-
-  auto iEnd = normals + attribs[0].mNumElements;
-  while(normals != iEnd)
-  {
-    normals->Normalize();
-    ++normals;
-  }
-
-  attribs.push_back({"aNormal", Property::VECTOR3, attribs[0].mNumElements, std::move(buffer)});
-}
-
-void GenerateTangentsWithUvs(MeshDefinition::RawData& raw)
-{
-  auto& attribs = raw.mAttribs;
-  DALI_ASSERT_DEBUG(attribs.size() > 2); // positions, normals, uvs
-  IndexProvider getIndex(raw.mIndices.data());
-
-  const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : raw.mIndices.size();
-
-  auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
-  auto* uvs       = reinterpret_cast<const Vector2*>(attribs[2].mData.data());
-
-  std::vector<uint8_t> buffer(attribs[0].mNumElements * sizeof(Vector3));
-  auto                 tangents = reinterpret_cast<Vector3*>(buffer.data());
-
-  for(uint32_t i = 0; i < numIndices; i += 3)
-  {
-    uint16_t indices[]{getIndex(), getIndex(), getIndex()};
-    Vector3  pos[]{positions[indices[0]], positions[indices[1]], positions[indices[2]]};
-    Vector2  uv[]{uvs[indices[0]], uvs[indices[1]], uvs[indices[2]]};
-
-    float x0 = pos[1].x - pos[0].x;
-    float y0 = pos[1].y - pos[0].y;
-    float z0 = pos[1].z - pos[0].z;
-
-    float x1 = pos[2].x - pos[0].x;
-    float y1 = pos[2].y - pos[0].y;
-    float z1 = pos[2].z - pos[0].z;
-
-    float s0 = uv[1].x - uv[0].x;
-    float t0 = uv[1].y - uv[0].y;
-
-    float s1 = uv[2].x - uv[0].x;
-    float t1 = uv[2].y - uv[0].y;
-
-    float   r = 1.f / (s0 * t1 - t0 * s1);
-    Vector3 tangent((x0 * t1 - t0 * x1) * r, (y0 * t1 - t0 * y1) * r, (z0 * t1 - t0 * z1) * r);
-    tangents[indices[0]] += tangent;
-    tangents[indices[1]] += tangent;
-    tangents[indices[2]] += tangent;
-  }
-
-  auto* normals = reinterpret_cast<const Vector3*>(attribs[1].mData.data());
-  auto  iEnd    = normals + attribs[1].mNumElements;
-  while(normals != iEnd)
-  {
-    *tangents -= *normals * normals->Dot(*tangents);
-    tangents->Normalize();
-
-    ++tangents;
-    ++normals;
-  }
-  attribs.push_back({"aTangent", Property::VECTOR3, attribs[0].mNumElements, std::move(buffer)});
-}
-
-void GenerateTangents(MeshDefinition::RawData& raw)
-{
-  auto& attribs = raw.mAttribs;
-  DALI_ASSERT_DEBUG(attribs.size() > 1); // positions, normals
-
-  auto* normals = reinterpret_cast<const Vector3*>(attribs[1].mData.data());
-
-  std::vector<uint8_t> buffer(attribs[0].mNumElements * sizeof(Vector3));
-  auto                 tangents = reinterpret_cast<Vector3*>(buffer.data());
-
-  auto iEnd = normals + attribs[1].mNumElements;
-  while(normals != iEnd)
-  {
-    Vector3 t[]{normals->Cross(Vector3::XAXIS), normals->Cross(Vector3::YAXIS)};
-
-    *tangents = t[t[1].LengthSquared() > t[0].LengthSquared()];
-    *tangents -= *normals * normals->Dot(*tangents);
-    tangents->Normalize();
-
-    ++tangents;
-    ++normals;
-  }
-  attribs.push_back({"aTangent", Property::VECTOR3, attribs[0].mNumElements, std::move(buffer)});
-}
-
-void CalculateTextureSize(uint32_t totalTextureSize, uint32_t& textureWidth, uint32_t& textureHeight)
-{
-  DALI_ASSERT_DEBUG(0u != totalTextureSize && "totalTextureSize is zero.")
-
-  // Calculate the dimensions of the texture.
-  // The total size of the texture is the length of the blend shapes blob.
-
-  textureWidth  = 0u;
-  textureHeight = 0u;
-
-  if(0u == totalTextureSize)
-  {
-    // nothing to do.
-    return;
-  }
-
-  const uint32_t pow2      = static_cast<uint32_t>(ceil(log2(totalTextureSize)));
-  const uint32_t powWidth  = pow2 >> 1u;
-  const uint32_t powHeight = pow2 - powWidth;
-
-  textureWidth  = 1u << powWidth;
-  textureHeight = 1u << powHeight;
-}
-
-void CalculateGltf2BlendShapes(uint8_t* geometryBuffer, std::ifstream& binFile, const std::vector<MeshDefinition::BlendShape>& blendShapes, uint32_t numberOfVertices, float& blendShapeUnnormalizeFactor)
-{
-  uint32_t geometryBufferIndex = 0u;
-  float    maxDistance         = 0.f;
-  Vector3* geometryBufferV3    = reinterpret_cast<Vector3*>(geometryBuffer);
-  for(const auto& blendShape : blendShapes)
-  {
-    if(blendShape.deltas.IsDefined())
-    {
-      DALI_ASSERT_ALWAYS(((blendShape.deltas.mBlob.mLength % sizeof(Vector3) == 0u) ||
-                          blendShape.deltas.mBlob.mStride >= sizeof(Vector3)) &&
-                         "Blend Shape position buffer length not a multiple of element size");
-
-      const auto           bufferSize = blendShape.deltas.mBlob.GetBufferSize();
-      std::vector<uint8_t> buffer(bufferSize);
-      if(ReadAccessor(blendShape.deltas, binFile, buffer.data()))
-      {
-        blendShape.deltas.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
-        // Calculate the difference with the original mesh.
-        // Find the max distance to normalize the deltas.
-        const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
-
-        for(uint32_t index = 0u; index < numberOfVertices; ++index)
-        {
-          Vector3& delta = geometryBufferV3[geometryBufferIndex++];
-          delta          = deltasBuffer[index];
-
-          maxDistance = std::max(maxDistance, delta.LengthSquared());
-        }
-      }
-    }
-
-    if(blendShape.normals.IsDefined())
-    {
-      DALI_ASSERT_ALWAYS(((blendShape.normals.mBlob.mLength % sizeof(Vector3) == 0u) ||
-                          blendShape.normals.mBlob.mStride >= sizeof(Vector3)) &&
-                         "Blend Shape normals buffer length not a multiple of element size");
-
-      const auto           bufferSize = blendShape.normals.mBlob.GetBufferSize();
-      std::vector<uint8_t> buffer(bufferSize);
-      if(ReadAccessor(blendShape.normals, binFile, buffer.data()))
-      {
-        blendShape.normals.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
-
-        // Calculate the difference with the original mesh, and translate to make all values positive.
-        const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
-
-        for(uint32_t index = 0u; index < numberOfVertices; ++index)
-        {
-          Vector3& delta = geometryBufferV3[geometryBufferIndex++];
-          delta          = deltasBuffer[index];
-
-          delta.x *= 0.5f;
-          delta.y *= 0.5f;
-          delta.z *= 0.5f;
-
-          delta.x += 0.5f;
-          delta.y += 0.5f;
-          delta.z += 0.5f;
-        }
-      }
-    }
-
-    if(blendShape.tangents.IsDefined())
-    {
-      DALI_ASSERT_ALWAYS(((blendShape.tangents.mBlob.mLength % sizeof(Vector3) == 0u) ||
-                          blendShape.tangents.mBlob.mStride >= sizeof(Vector3)) &&
-                         "Blend Shape tangents buffer length not a multiple of element size");
-
-      const auto           bufferSize = blendShape.tangents.mBlob.GetBufferSize();
-      std::vector<uint8_t> buffer(bufferSize);
-      if(ReadAccessor(blendShape.tangents, binFile, buffer.data()))
-      {
-        blendShape.tangents.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
-
-        // Calculate the difference with the original mesh, and translate to make all values positive.
-        const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
-
-        for(uint32_t index = 0u; index < numberOfVertices; ++index)
-        {
-          Vector3& delta = geometryBufferV3[geometryBufferIndex++];
-          delta          = deltasBuffer[index];
-
-          delta.x *= 0.5f;
-          delta.y *= 0.5f;
-          delta.z *= 0.5f;
-
-          delta.x += 0.5f;
-          delta.y += 0.5f;
-          delta.z += 0.5f;
-        }
-      }
-    }
-  }
-
-  geometryBufferIndex = 0u;
-  for(const auto& blendShape : blendShapes)
-  {
-    // Normalize all the deltas and translate to a possitive value.
-    // Deltas are going to be passed to the shader in a color texture
-    // whose values that are less than zero are clamped.
-    if(blendShape.deltas.IsDefined())
-    {
-      const float normalizeFactor = (fabsf(maxDistance) < Math::MACHINE_EPSILON_1000) ? 1.f : (0.5f / sqrtf(maxDistance));
-
-      for(uint32_t index = 0u; index < numberOfVertices; ++index)
-      {
-        Vector3& delta = geometryBufferV3[geometryBufferIndex++];
-        delta.x        = Clamp(((delta.x * normalizeFactor) + 0.5f), 0.f, 1.f);
-        delta.y        = Clamp(((delta.y * normalizeFactor) + 0.5f), 0.f, 1.f);
-        delta.z        = Clamp(((delta.z * normalizeFactor) + 0.5f), 0.f, 1.f);
-      }
-
-      // Calculate and store the unnormalize factor.
-      blendShapeUnnormalizeFactor = 1.f / normalizeFactor;
-    }
-
-    if(blendShape.normals.IsDefined())
-    {
-      geometryBufferIndex += numberOfVertices;
-    }
-
-    if(blendShape.tangents.IsDefined())
-    {
-      geometryBufferIndex += numberOfVertices;
-    }
-  }
-}
-
-} // namespace
-
-MeshDefinition::SparseBlob::SparseBlob(const Blob& indices, const Blob& values, uint32_t count)
-: mIndices{indices},
-  mValues{values},
-  mCount{count}
-{
-}
-
-MeshDefinition::Accessor::Accessor(const MeshDefinition::Blob&       blob,
-                                   const MeshDefinition::SparseBlob& sparse)
-: mBlob{blob},
-  mSparse{(sparse.mIndices.IsDefined() && sparse.mValues.IsDefined()) ? new SparseBlob{sparse} : nullptr}
-{
-}
-
-void MeshDefinition::Blob::ApplyMinMax(const std::vector<float>& min, const std::vector<float>& max, uint32_t count, float* values)
-{
-  DALI_ASSERT_DEBUG(max.size() == min.size() || max.size() * min.size() == 0);
-  const auto numComponents = std::max(min.size(), max.size());
-
-  using ClampFn   = void (*)(const float*, const float*, uint32_t, float&);
-  ClampFn clampFn = min.empty() ? (max.empty() ? static_cast<ClampFn>(nullptr) : [](const float* min, const float* max, uint32_t i, float& value) {
-    value = std::min(max[i], value);
-  })
-                                : (max.empty() ? [](const float* min, const float* max, uint32_t i, float& value) {
-                                    value = std::max(min[i], value);
-                                  }
-                                               : static_cast<ClampFn>([](const float* min, const float* max, uint32_t i, float& value) {
-                                                   value = std::min(std::max(min[i], value), max[i]);
-                                                 }));
-
-  if(!clampFn)
-  {
-    return;
-  }
-
-  auto end = values + count * numComponents;
-  while(values != end)
-  {
-    auto     nextElement = values + numComponents;
-    uint32_t i           = 0;
-    while(values != nextElement)
-    {
-      clampFn(min.data(), max.data(), i, *values);
-      ++values;
-      ++i;
-    }
-  }
-}
-
-MeshDefinition::Blob::Blob(uint32_t offset, uint32_t length, uint16_t stride, uint16_t elementSizeHint, const std::vector<float>& min, const std::vector<float>& max)
-: mOffset(offset),
-  mLength(length),
-  mStride(stride),
-  mElementSizeHint(elementSizeHint),
-  mMin(min),
-  mMax(max)
-{
-}
-
-uint32_t MeshDefinition::Blob::GetBufferSize() const
-{
-  return IsConsecutive() ? mLength : (mLength * mElementSizeHint / mStride);
-}
-
-void MeshDefinition::Blob::ApplyMinMax(uint32_t count, float* values) const
-{
-  ApplyMinMax(mMin, mMax, count, values);
-}
-
-void MeshDefinition::RawData::Attrib::AttachBuffer(Geometry& g) const
-{
-  Property::Map attribMap;
-  attribMap[mName]          = mType;
-  VertexBuffer attribBuffer = VertexBuffer::New(attribMap);
-  attribBuffer.SetData(mData.data(), mNumElements);
-
-  g.AddVertexBuffer(attribBuffer);
-}
-
-bool MeshDefinition::IsQuad() const
-{
-  return CaseInsensitiveStringCompare(QUAD, mUri);
-}
-
-bool MeshDefinition::IsSkinned() const
-{
-  return mJoints0.IsDefined() && mWeights0.IsDefined();
-}
-
-bool MeshDefinition::HasBlendShapes() const
-{
-  return !mBlendShapes.empty();
-}
-
-void MeshDefinition::RequestNormals()
-{
-  mNormals.mBlob.mLength = mPositions.mBlob.GetBufferSize();
-}
-
-void MeshDefinition::RequestTangents()
-{
-  mTangents.mBlob.mLength = mNormals.mBlob.GetBufferSize();
-}
-
-MeshDefinition::RawData
-MeshDefinition::LoadRaw(const std::string& modelsPath) const
-{
-  RawData raw;
-  if(IsQuad())
-  {
-    return raw;
-  }
-
-  const std::string meshPath = modelsPath + mUri;
-  std::ifstream     binFile(meshPath, std::ios::binary);
-  if(!binFile)
-  {
-    ExceptionFlinger(ASSERT_LOCATION) << "Failed to read geometry data from '" << meshPath << "'";
-  }
-
-  if(mIndices.IsDefined())
-  {
-    if(MaskMatch(mFlags, U32_INDICES))
-    {
-      DALI_ASSERT_ALWAYS(((mIndices.mBlob.mLength % sizeof(uint32_t) == 0) ||
-                          mIndices.mBlob.mStride >= sizeof(uint32_t)) &&
-                         "Index buffer length not a multiple of element size");
-      const auto indexCount = mIndices.mBlob.GetBufferSize() / sizeof(uint32_t);
-      raw.mIndices.resize(indexCount * 2); // NOTE: we need space for uint32_ts initially.
-      if(!ReadAccessor(mIndices, binFile, reinterpret_cast<uint8_t*>(raw.mIndices.data())))
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read indices from '" << meshPath << "'.";
-      }
-
-      auto u16s = raw.mIndices.data();
-      auto u32s = reinterpret_cast<uint32_t*>(raw.mIndices.data());
-      auto end  = u32s + indexCount;
-      while(u32s != end)
-      {
-        *u16s = static_cast<uint16_t>(*u32s);
-        ++u16s;
-        ++u32s;
-      }
-
-      raw.mIndices.resize(indexCount);
-    }
-    else
-    {
-      DALI_ASSERT_ALWAYS(((mIndices.mBlob.mLength % sizeof(unsigned short) == 0) ||
-                          mIndices.mBlob.mStride >= sizeof(unsigned short)) &&
-                         "Index buffer length not a multiple of element size");
-      raw.mIndices.resize(mIndices.mBlob.mLength / sizeof(unsigned short));
-      if(!ReadAccessor(mIndices, binFile, reinterpret_cast<uint8_t*>(raw.mIndices.data())))
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read indices from '" << meshPath << "'.";
-      }
-    }
-  }
-
-  std::vector<Vector3> positions;
-  if(mPositions.IsDefined())
-  {
-    DALI_ASSERT_ALWAYS(((mPositions.mBlob.mLength % sizeof(Vector3) == 0) ||
-                        mPositions.mBlob.mStride >= sizeof(Vector3)) &&
-                       "Position buffer length not a multiple of element size");
-    const auto           bufferSize = mPositions.mBlob.GetBufferSize();
-    std::vector<uint8_t> buffer(bufferSize);
-    if(!ReadAccessor(mPositions, binFile, buffer.data()))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read positions from '" << meshPath << "'.";
-    }
-
-    uint32_t numVector3 = bufferSize / sizeof(Vector3);
-    mPositions.mBlob.ApplyMinMax(numVector3, reinterpret_cast<float*>(buffer.data()));
-
-    if(HasBlendShapes())
-    {
-      positions.resize(numVector3);
-      std::copy(buffer.data(), buffer.data() + buffer.size(), reinterpret_cast<uint8_t*>(positions.data()));
-    }
-
-    raw.mAttribs.push_back({"aPosition", Property::VECTOR3, numVector3, std::move(buffer)});
-  }
-
-  const auto isTriangles = mPrimitiveType == Geometry::TRIANGLES;
-  auto       hasNormals  = mNormals.IsDefined();
-  if(hasNormals)
-  {
-    DALI_ASSERT_ALWAYS(((mNormals.mBlob.mLength % sizeof(Vector3) == 0) ||
-                        mNormals.mBlob.mStride >= sizeof(Vector3)) &&
-                       "Normal buffer length not a multiple of element size");
-    const auto           bufferSize = mNormals.mBlob.GetBufferSize();
-    std::vector<uint8_t> buffer(bufferSize);
-    if(!ReadAccessor(mNormals, binFile, buffer.data()))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read normals from '" << meshPath << "'.";
-    }
-
-    mNormals.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
-
-    raw.mAttribs.push_back({"aNormal", Property::VECTOR3, static_cast<uint32_t>(bufferSize / sizeof(Vector3)), std::move(buffer)});
-  }
-  else if(mNormals.mBlob.mLength != 0 && isTriangles)
-  {
-    DALI_ASSERT_DEBUG(mNormals.mBlob.mLength == mPositions.mBlob.GetBufferSize());
-    GenerateNormals(raw);
-    hasNormals = true;
-  }
-
-  const auto hasUvs = mTexCoords.IsDefined();
-  if(hasUvs)
-  {
-    DALI_ASSERT_ALWAYS(((mTexCoords.mBlob.mLength % sizeof(Vector2) == 0) ||
-                        mTexCoords.mBlob.mStride >= sizeof(Vector2)) &&
-                       "Normal buffer length not a multiple of element size");
-    const auto           bufferSize = mTexCoords.mBlob.GetBufferSize();
-    std::vector<uint8_t> buffer(bufferSize);
-    if(!ReadAccessor(mTexCoords, binFile, buffer.data()))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read uv-s from '" << meshPath << "'.";
-    }
-
-    const auto uvCount = bufferSize / sizeof(Vector2);
-    if(MaskMatch(mFlags, FLIP_UVS_VERTICAL))
-    {
-      auto uv    = reinterpret_cast<Vector2*>(buffer.data());
-      auto uvEnd = uv + uvCount;
-      while(uv != uvEnd)
-      {
-        uv->y = 1.0f - uv->y;
-        ++uv;
-      }
-    }
-
-    mTexCoords.mBlob.ApplyMinMax(bufferSize / sizeof(Vector2), reinterpret_cast<float*>(buffer.data()));
-
-    raw.mAttribs.push_back({"aTexCoord", Property::VECTOR2, static_cast<uint32_t>(uvCount), std::move(buffer)});
-  }
-
-  if(mTangents.IsDefined())
-  {
-    DALI_ASSERT_ALWAYS(((mTangents.mBlob.mLength % sizeof(Vector3) == 0) ||
-                        mTangents.mBlob.mStride >= sizeof(Vector3)) &&
-                       "Tangents buffer length not a multiple of element size");
-    const auto           bufferSize = mTangents.mBlob.GetBufferSize();
-    std::vector<uint8_t> buffer(bufferSize);
-    if(!ReadAccessor(mTangents, binFile, buffer.data()))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read tangents from '" << meshPath << "'.";
-    }
-
-    mTangents.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
-
-    raw.mAttribs.push_back({"aTangent", Property::VECTOR3, static_cast<uint32_t>(bufferSize / sizeof(Vector3)), std::move(buffer)});
-  }
-  else if(mTangents.mBlob.mLength != 0 && hasNormals && isTriangles)
-  {
-    DALI_ASSERT_DEBUG(mTangents.mBlob.mLength == mNormals.mBlob.GetBufferSize());
-    hasUvs ? GenerateTangentsWithUvs(raw) : GenerateTangents(raw);
-  }
-
-  if(IsSkinned())
-  {
-    if(MaskMatch(mFlags, U16_JOINT_IDS))
-    {
-      DALI_ASSERT_ALWAYS(((mJoints0.mBlob.mLength % sizeof(Uint16Vector4) == 0) ||
-                          mJoints0.mBlob.mStride >= sizeof(Uint16Vector4)) &&
-                         "Joints buffer length not a multiple of element size");
-      const auto           inBufferSize = mJoints0.mBlob.GetBufferSize();
-      std::vector<uint8_t> buffer(inBufferSize * 2);
-      auto                 u16s = buffer.data() + inBufferSize;
-      if(!ReadAccessor(mJoints0, binFile, u16s))
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read joints from '" << meshPath << "'.";
-      }
-
-      auto floats = reinterpret_cast<float*>(buffer.data());
-      auto end    = u16s + inBufferSize;
-      while(u16s != end)
-      {
-        auto value = *reinterpret_cast<uint16_t*>(u16s);
-        *floats    = static_cast<float>(value);
-
-        u16s += sizeof(uint16_t);
-        ++floats;
-      }
-      raw.mAttribs.push_back({"aJoints", Property::VECTOR4, static_cast<uint32_t>(buffer.size() / sizeof(Vector4)), std::move(buffer)});
-    }
-    else
-    {
-      DALI_ASSERT_ALWAYS(((mJoints0.mBlob.mLength % sizeof(Vector4) == 0) ||
-                          mJoints0.mBlob.mStride >= sizeof(Vector4)) &&
-                         "Joints buffer length not a multiple of element size");
-      const auto           bufferSize = mJoints0.mBlob.GetBufferSize();
-      std::vector<uint8_t> buffer(bufferSize);
-      if(!ReadAccessor(mJoints0, binFile, buffer.data()))
-      {
-        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read joints from '" << meshPath << "'.";
-      }
-
-      raw.mAttribs.push_back({"aJoints", Property::VECTOR4, static_cast<uint32_t>(bufferSize / sizeof(Vector4)), std::move(buffer)});
-    }
-
-    DALI_ASSERT_ALWAYS(((mWeights0.mBlob.mLength % sizeof(Vector4) == 0) ||
-                        mWeights0.mBlob.mStride >= sizeof(Vector4)) &&
-                       "Weights buffer length not a multiple of element size");
-    const auto           bufferSize = mWeights0.mBlob.GetBufferSize();
-    std::vector<uint8_t> buffer(bufferSize);
-    if(!ReadAccessor(mWeights0, binFile, buffer.data()))
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read weights from '" << meshPath << "'.";
-    }
-
-    raw.mAttribs.push_back({"aWeights", Property::VECTOR4, static_cast<uint32_t>(bufferSize / sizeof(Vector4)), std::move(buffer)});
-  }
-
-  // Calculate the Blob for the blend shapes.
-  Blob blendShapesBlob;
-  blendShapesBlob.mOffset = std::numeric_limits<unsigned int>::max();
-  blendShapesBlob.mLength = 0u;
-
-  for(const auto& blendShape : mBlendShapes)
-  {
-    for(auto i : {&blendShape.deltas, &blendShape.normals, &blendShape.tangents})
-    {
-      if(i->IsDefined())
-      {
-        blendShapesBlob.mOffset = std::min(blendShapesBlob.mOffset, i->mBlob.mOffset);
-        blendShapesBlob.mLength += i->mBlob.mLength;
-      }
-    }
-  }
-
-  if(HasBlendShapes())
-  {
-    const uint32_t numberOfVertices = mPositions.mBlob.mLength / sizeof(Vector3);
-
-    // Calculate the size of one buffer inside the texture.
-    raw.mBlendShapeBufferOffset = numberOfVertices;
-
-    bool     calculateGltf2BlendShapes = false;
-    uint32_t textureWidth              = 0u;
-    uint32_t textureHeight             = 0u;
-
-    if(!mBlendShapeHeader.IsDefined())
-    {
-      CalculateTextureSize(blendShapesBlob.mLength / sizeof(Vector3), textureWidth, textureHeight);
-      calculateGltf2BlendShapes = true;
-    }
-    else
-    {
-      uint16_t header[2u];
-      ReadBlob(mBlendShapeHeader, binFile, reinterpret_cast<uint8_t*>(header));
-      textureWidth  = header[0u];
-      textureHeight = header[1u];
-    }
-
-    const uint32_t numberOfBlendShapes = mBlendShapes.size();
-    raw.mBlendShapeUnnormalizeFactor.Resize(numberOfBlendShapes);
-
-    Devel::PixelBuffer geometryPixelBuffer = Devel::PixelBuffer::New(textureWidth, textureHeight, Pixel::RGB32F);
-    uint8_t*           geometryBuffer      = geometryPixelBuffer.GetBuffer();
-
-    if(calculateGltf2BlendShapes)
-    {
-      CalculateGltf2BlendShapes(geometryBuffer, binFile, mBlendShapes, numberOfVertices, raw.mBlendShapeUnnormalizeFactor[0u]);
-    }
-    else
-    {
-      Blob unnormalizeFactorBlob;
-      unnormalizeFactorBlob.mLength = sizeof(float) * ((BlendShapes::Version::VERSION_2_0 == mBlendShapeVersion) ? 1u : numberOfBlendShapes);
-
-      if(blendShapesBlob.IsDefined())
-      {
-        if(ReadBlob(blendShapesBlob, binFile, geometryBuffer))
-        {
-          unnormalizeFactorBlob.mOffset = blendShapesBlob.mOffset + blendShapesBlob.mLength;
-        }
-      }
-
-      // Read the unnormalize factors.
-      if(unnormalizeFactorBlob.IsDefined())
-      {
-        ReadBlob(unnormalizeFactorBlob, binFile, reinterpret_cast<uint8_t*>(&raw.mBlendShapeUnnormalizeFactor[0u]));
-      }
-    }
-    raw.mBlendShapeData = Devel::PixelBuffer::Convert(geometryPixelBuffer);
-  }
-
-  return raw;
-}
-
-MeshGeometry MeshDefinition::Load(RawData&& raw) const
-{
-  MeshGeometry meshGeometry;
-  meshGeometry.geometry = Geometry::New();
-  meshGeometry.geometry.SetType(mPrimitiveType);
-
-  if(IsQuad()) // TODO: do this in raw data; provide MakeTexturedQuadGeometry() that only creates buffers.
-  {
-    auto options          = MaskMatch(mFlags, FLIP_UVS_VERTICAL) ? TexturedQuadOptions::FLIP_VERTICAL : 0;
-    meshGeometry.geometry = MakeTexturedQuadGeometry(options);
-  }
-  else
-  {
-    if(!raw.mIndices.empty())
-    {
-      meshGeometry.geometry.SetIndexBuffer(raw.mIndices.data(), raw.mIndices.size());
-    }
-
-    for(auto& a : raw.mAttribs)
-    {
-      a.AttachBuffer(meshGeometry.geometry);
-    }
-
-    if(HasBlendShapes())
-    {
-      meshGeometry.blendShapeBufferOffset      = raw.mBlendShapeBufferOffset;
-      meshGeometry.blendShapeUnnormalizeFactor = std::move(raw.mBlendShapeUnnormalizeFactor);
-
-      meshGeometry.blendShapeGeometry = Texture::New(TextureType::TEXTURE_2D,
-                                                     raw.mBlendShapeData.GetPixelFormat(),
-                                                     raw.mBlendShapeData.GetWidth(),
-                                                     raw.mBlendShapeData.GetHeight());
-      meshGeometry.blendShapeGeometry.Upload(raw.mBlendShapeData);
-    }
-  }
-
-  return meshGeometry;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/mesh-definition.h b/dali-scene-loader/public-api/mesh-definition.h
deleted file mode 100644
index d03fa0b..0000000
--- a/dali-scene-loader/public-api/mesh-definition.h
+++ /dev/null
@@ -1,260 +0,0 @@
-#ifndef DALI_SCENE_LOADER_MESH_DEFINITION_H
-#define DALI_SCENE_LOADER_MESH_DEFINITION_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/blend-shape-details.h"
-#include "dali-scene-loader/public-api/index.h"
-#include "dali-scene-loader/public-api/mesh-geometry.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-// EXTERNAL INCLUDES
-#include <memory>
-#include "dali/public-api/common/vector-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Defines a mesh with its attributes, the primitive type to render it as,
- *  and the file to load it from with the offset and length information for the
- *  individual attribute buffers.
- */
-struct DALI_SCENE_LOADER_API MeshDefinition
-{
-  using Vector = std::vector<std::pair<MeshDefinition, MeshGeometry>>;
-
-  enum : uint32_t
-  {
-    INVALID = std::numeric_limits<uint32_t>::max()
-  };
-
-  enum Flags : uint16_t
-  {
-    FLIP_UVS_VERTICAL = NthBit(0),
-    U32_INDICES       = NthBit(1), // default is unsigned short
-    U16_JOINT_IDS     = NthBit(2), // default is floats
-  };
-
-  enum Attributes
-  {
-    INDICES           = NthBit(0),
-    POSITIONS         = NthBit(1),
-    NORMALS           = NthBit(2),
-    TEX_COORDS        = NthBit(3),
-    TANGENTS          = NthBit(4),
-    LEGACY_BITANGENTS = NthBit(5), // these are ignored; we're calculating them in the (PBR) shader.
-    JOINTS_0          = NthBit(6),
-    WEIGHTS_0         = NthBit(7),
-  };
-
-  /**
-   * @brief Describes raw data in terms of its position and size in a buffer.
-   *  All units in bytes.
-   */
-  struct Blob
-  {
-    uint32_t           mOffset          = INVALID; // the default means that the blob is undefined.
-    uint32_t           mLength          = 0;       // if the blob is undefined, its data may still be generated. This is enabled by setting length to some non-0 value. Refer to MeshDefinition for details.
-    uint16_t           mStride          = 0;       // ignore if 0
-    uint16_t           mElementSizeHint = 0;       // ignore if 0 or stride == 0
-    std::vector<float> mMin;
-    std::vector<float> mMax;
-
-    static void ApplyMinMax(const std::vector<float>& min, const std::vector<float>& max, uint32_t count, float* values);
-
-    Blob() = default;
-
-    Blob(uint32_t offset, uint32_t length, uint16_t stride = 0, uint16_t elementSizeHint = 0, const std::vector<float>& min = {}, const std::vector<float>& max = {});
-
-    /**
-     * @brief Calculates the size of a tightly-packed buffer for the elements from the blob.
-     */
-    uint32_t GetBufferSize() const;
-
-    /**
-     * @brief Convenience method to tell whether a Blob has meaningful data.
-     */
-    bool IsDefined() const
-    {
-      return mOffset != INVALID;
-    }
-
-    /**
-     * @brief Convenience method to tell whether the elements stored in the blob follow each
-     *  other tightly. The opposite would be interleaving.
-     */
-    bool IsConsecutive() const
-    {
-      return mStride == 0 || mStride == mElementSizeHint;
-    }
-
-    /**
-     * @brief Applies the min / max values, if they're defined.
-     */
-    void ApplyMinMax(uint32_t count, float* values) const;
-  };
-
-  /**
-   * @brief A sparse blob describes a change in a reference Blob.
-   * @p indices describe what positions of the reference Blob change and
-   * @p values describe the new values.
-   */
-  struct SparseBlob
-  {
-    SparseBlob() = default;
-
-    SparseBlob(const Blob& indices, const Blob& values, uint32_t count);
-
-    Blob     mIndices;
-    Blob     mValues;
-    uint32_t mCount = 0u;
-  };
-
-  struct Accessor
-  {
-    Blob                        mBlob;
-    std::unique_ptr<SparseBlob> mSparse;
-
-    Accessor() = default;
-
-    Accessor(const Accessor&) = delete;
-    Accessor& operator=(const Accessor&) = delete;
-
-    Accessor(Accessor&&) = default;
-    Accessor& operator=(Accessor&&) = default;
-
-    Accessor(const MeshDefinition::Blob&       blob,
-             const MeshDefinition::SparseBlob& sparse);
-
-    bool IsDefined() const
-    {
-      return mBlob.IsDefined() || (mSparse && (mSparse->mIndices.IsDefined() && mSparse->mValues.IsDefined()));
-    }
-  };
-
-  /**
-   * @brief Stores a blend shape.
-   */
-  struct BlendShape
-  {
-    std::string name;
-    Accessor    deltas;
-    Accessor    normals;
-    Accessor    tangents;
-    float       weight = 0.f;
-  };
-
-  struct RawData
-  {
-    struct Attrib
-    {
-      std::string          mName;
-      Property::Type       mType;
-      uint32_t             mNumElements;
-      std::vector<uint8_t> mData;
-
-      void AttachBuffer(Geometry& g) const;
-    };
-
-    std::vector<uint16_t> mIndices;
-    std::vector<Attrib>   mAttribs;
-
-    unsigned int        mBlendShapeBufferOffset{0};
-    Dali::Vector<float> mBlendShapeUnnormalizeFactor;
-    PixelData           mBlendShapeData;
-  };
-
-  MeshDefinition() = default;
-
-  MeshDefinition(const MeshDefinition&) = delete;
-  MeshDefinition& operator=(const MeshDefinition&) = delete;
-
-  MeshDefinition(MeshDefinition&&) = default;
-  MeshDefinition& operator=(MeshDefinition&&) = default;
-
-  /**
-   * @brief Determines whether the mesh definition is that of a quad.
-   */
-  bool IsQuad() const;
-
-  /**
-   * @brief Determines whether the mesh is used for skeletal animation.
-   */
-  bool IsSkinned() const;
-
-  /**
-   * @brief Whether the mesh has blend shapes.
-   */
-  bool HasBlendShapes() const;
-
-  /**
-   * @brief Requests normals to be generated.
-   * @note Generation happens in LoadRaw().
-   * @note Must have Vector3 positions defined.
-   */
-  void RequestNormals();
-
-  /**
-   * @brief Requests tangents to be generated.
-   * @note Generation happens in LoadRaw().
-   * @note Must have Vector3 normals defined.
-   */
-  void RequestTangents();
-
-  /**
-   * @brief Loads raw geometry data, which includes index (optional) and
-   *  attribute buffers, as well as blend shape data. This is then returned.
-   * @note This can be done on any thread.
-   */
-  RawData LoadRaw(const std::string& modelsPath) const;
-
-  /**
-   * @brief Creates a MeshGeometry based firstly on the value of the uri member:
-   *  if it is "quad", a textured quad is created; otherwise it uses the
-   *  attribute (and index) buffers and blend shape information (if available)
-   *  from @a raw.
-   *  If mFlipVertical was set, the UVs are flipped in Y, i.e. v = 1.0 - v.
-   */
-  MeshGeometry Load(RawData&& raw) const;
-
-public: // DATA
-  uint32_t       mFlags         = 0x0;
-  Geometry::Type mPrimitiveType = Geometry::TRIANGLES;
-  std::string    mUri;
-  Accessor       mIndices;
-  Accessor       mPositions;
-  Accessor       mNormals; // data can be generated based on positions
-  Accessor       mTexCoords;
-  Accessor       mTangents; // data can be generated based on normals and texCoords (the latter isn't mandatory; the results will be better if available)
-  Accessor       mJoints0;
-  Accessor       mWeights0;
-
-  Blob                    mBlendShapeHeader;
-  std::vector<BlendShape> mBlendShapes;
-  BlendShapes::Version    mBlendShapeVersion = BlendShapes::Version::INVALID;
-
-  Index mSkeletonIdx = INVALID_INDEX;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_MESH_DEFINITION_H
diff --git a/dali-scene-loader/public-api/mesh-geometry.h b/dali-scene-loader/public-api/mesh-geometry.h
deleted file mode 100644
index 5b46e0f..0000000
--- a/dali-scene-loader/public-api/mesh-geometry.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef DALI_SCENE_LOADER_MESH_GEOMETRY_H
-#define DALI_SCENE_LOADER_MESH_GEOMETRY_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/rendering/geometry.h"
-#include "dali/public-api/rendering/texture.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-struct DALI_SCENE_LOADER_API MeshGeometry
-{
-  Geometry      geometry;                    ///< The array of vertices.
-  Texture       blendShapeGeometry;          ///< The array of vertices of the different blend shapes encoded inside a texture with power of two dimensions.
-  Vector<float> blendShapeUnnormalizeFactor; ///< Factor used to unnormalize the geometry of the blend shape.
-  unsigned int  blendShapeBufferOffset{0};   ///< Offset used to calculate the start of each blend shape.
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_MESH_GEOMETRY_H
diff --git a/dali-scene-loader/public-api/node-definition.cpp b/dali-scene-loader/public-api/node-definition.cpp
deleted file mode 100644
index 45e0b23..0000000
--- a/dali-scene-loader/public-api/node-definition.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL
-#include "dali-scene-loader/public-api/node-definition.h"
-#include "dali-scene-loader/public-api/renderer-state.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-void NodeDefinition::Renderable::RegisterResources(IResourceReceiver& receiver) const
-{
-  receiver.Register(ResourceType::Shader, mShaderIdx);
-}
-
-void NodeDefinition::Renderable::ReflectResources(IResourceReflector& reflector)
-{
-  reflector.Reflect(ResourceType::Shader, mShaderIdx);
-}
-
-void NodeDefinition::Renderable::OnCreate(const NodeDefinition& node, CreateParams& params, Actor& actor) const
-{
-  DALI_ASSERT_DEBUG(mShaderIdx != INVALID_INDEX);
-  auto&  resources = params.mResources;
-  Shader shader    = resources.mShaders[mShaderIdx].second;
-
-  static Geometry defaultGeometry = Geometry::New();
-  Renderer        renderer        = Renderer::New(defaultGeometry, shader);
-
-  RendererState::Apply(resources.mShaders[mShaderIdx].first.mRendererState, renderer);
-
-  actor.AddRenderer(renderer);
-}
-
-const std::string NodeDefinition::ORIGINAL_MATRIX_PROPERTY_NAME = "originalMatrix";
-
-Actor NodeDefinition::CreateActor(CreateParams& params) const
-{
-  Actor actor = Actor::New();
-  SetActorCentered(actor);
-
-  actor.SetProperty(Actor::Property::NAME, mName);
-  actor.SetProperty(Actor::Property::POSITION, mPosition);
-  actor.SetProperty(Actor::Property::ORIENTATION, mOrientation);
-  actor.SetProperty(Actor::Property::SCALE, mScale);
-  actor.SetProperty(Actor::Property::SIZE, mSize);
-  actor.SetProperty(Actor::Property::VISIBLE, mIsVisible);
-
-  actor.RegisterProperty(ORIGINAL_MATRIX_PROPERTY_NAME, GetLocalSpace(), Property::AccessMode::READ_ONLY);
-
-  if(mRenderable)
-  {
-    mRenderable->OnCreate(*this, params, actor);
-  }
-
-  for(auto& e : mExtras)
-  {
-    actor.RegisterProperty(e.mKey, e.mValue);
-  }
-
-  for(auto& c : mConstraints)
-  {
-    params.mConstrainables.push_back(ConstraintRequest{&c, actor});
-  }
-
-  return actor;
-}
-
-Matrix NodeDefinition::GetLocalSpace() const
-{
-  Matrix localSpace{false};
-  localSpace.SetTransformComponents(mScale, mOrientation, mPosition);
-  return localSpace;
-}
-
-void ModelNode::RegisterResources(IResourceReceiver& receiver) const
-{
-  Renderable::RegisterResources(receiver);
-  receiver.Register(ResourceType::Mesh, mMeshIdx);
-  receiver.Register(ResourceType::Material, mMaterialIdx);
-}
-
-void ModelNode::ReflectResources(IResourceReflector& reflector)
-{
-  Renderable::ReflectResources(reflector);
-  reflector.Reflect(ResourceType::Mesh, mMeshIdx);
-  reflector.Reflect(ResourceType::Material, mMaterialIdx);
-}
-
-void ModelNode::OnCreate(const NodeDefinition& node, NodeDefinition::CreateParams& params, Actor& actor) const
-{
-  DALI_ASSERT_DEBUG(mMeshIdx != INVALID_INDEX);
-  Renderable::OnCreate(node, params, actor);
-
-  auto& resources = params.mResources;
-  auto& mesh      = resources.mMeshes[mMeshIdx];
-
-  auto     renderer = actor.GetRendererAt(0);
-  Geometry geometry = mesh.second.geometry;
-  renderer.SetGeometry(geometry);
-
-  auto shader = renderer.GetShader();
-
-  if(mesh.first.IsSkinned())
-  {
-    params.mSkinnables.push_back(SkinningShaderConfigurationRequest{mesh.first.mSkeletonIdx, shader});
-  }
-
-  if(mesh.first.HasBlendShapes())
-  {
-    params.mBlendshapeRequests.push_back(BlendshapeShaderConfigurationRequest{node.mName, mMeshIdx, shader});
-  }
-
-  TextureSet textures = resources.mMaterials[mMaterialIdx].second;
-
-  // Set the blend shape texture.
-  if(mesh.second.blendShapeGeometry)
-  {
-    TextureSet newTextureSet = TextureSet::New();
-    newTextureSet.SetTexture(0u, mesh.second.blendShapeGeometry);
-
-    const unsigned int numberOfTextures = textures.GetTextureCount();
-    for(unsigned int index = 0u; index < numberOfTextures; ++index)
-    {
-      const unsigned int newIndex = index + 1u;
-      newTextureSet.SetTexture(newIndex, textures.GetTexture(index));
-      newTextureSet.SetSampler(newIndex, textures.GetSampler(index));
-    }
-
-    textures = newTextureSet;
-  }
-
-  renderer.SetTextures(textures);
-
-  actor.SetProperty(Actor::Property::COLOR, mColor);
-
-  auto& matDef = resources.mMaterials[mMaterialIdx].first;
-  actor.RegisterProperty("uMetallicFactor", matDef.mMetallic);
-  actor.RegisterProperty("uRoughnessFactor", matDef.mRoughness);
-
-  Index envIdx = matDef.mEnvironmentIdx;
-  actor.RegisterProperty("uIblIntensity", resources.mEnvironmentMaps[envIdx].first.mIblIntensity);
-
-  const auto alphaCutoff = matDef.GetAlphaCutoff();
-  if(alphaCutoff > 0.f)
-  {
-    actor.RegisterProperty("uAlphaThreshold", alphaCutoff);
-  }
-}
-
-void ArcNode::OnCreate(const NodeDefinition& node, NodeDefinition::CreateParams& params, Actor& actor) const
-{
-  ModelNode::OnCreate(node, params, actor);
-
-  actor.RegisterProperty("antiAliasing", mAntiAliasing ? 1 : 0);
-  actor.RegisterProperty("arcCaps", mArcCaps);
-  actor.RegisterProperty("radius", mRadius);
-
-  const float startAngleRadians = mStartAngleDegrees * Math::PI_OVER_180;
-  Vector2     startPolar{std::cos(startAngleRadians), std::sin(startAngleRadians)};
-  actor.RegisterProperty("startAngle", startPolar);
-
-  const float endAngleRadians = mEndAngleDegrees * Math::PI_OVER_180;
-  Vector2     endPolar{std::cos(endAngleRadians), std::sin(endAngleRadians)};
-  actor.RegisterProperty("endAngle", endPolar);
-}
-
-void ArcNode::GetEndVectorWithDiffAngle(float startAngle, float diffAngle, Vector2& endVector)
-{
-  float endAngle = 0.f;
-
-  if(diffAngle <= 0.001f)
-  {
-    //0.001 is used to ensure is empty arc when startAngle = endAngle + 360 * N
-    endAngle = startAngle + 0.001f;
-  }
-  else if(diffAngle >= 360.f)
-  {
-    endAngle = diffAngle + 359.99f;
-  }
-  else
-  {
-    endAngle = startAngle + 360.0f + diffAngle;
-  }
-  endVector.x = cosf(endAngle * Math::PI_OVER_180);
-  endVector.y = sinf(endAngle * Math::PI_OVER_180);
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/node-definition.h b/dali-scene-loader/public-api/node-definition.h
deleted file mode 100644
index b496cf7..0000000
--- a/dali-scene-loader/public-api/node-definition.h
+++ /dev/null
@@ -1,277 +0,0 @@
-#ifndef DALI_SCENE_LOADER_NODE_DEFINITION_H_
-#define DALI_SCENE_LOADER_NODE_DEFINITION_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/customization.h"
-#include "dali-scene-loader/public-api/matrix-stack.h"
-#include "dali-scene-loader/public-api/resource-bundle.h"
-
-// EXTERNAL INCLUDES
-#include <functional>
-#include <memory>
-#include <string>
-#include "dali/public-api/actors/actor.h"
-#include "dali/public-api/math/matrix.h"
-#include "dali/public-api/math/quaternion.h"
-#include "dali/public-api/math/vector4.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-class ViewProjection;
-
-/**
- * @brief Interface to report (const) resource ids to.
- */
-class DALI_SCENE_LOADER_API IResourceReceiver
-{
-public:
-  virtual ~IResourceReceiver() = default;
-
-  virtual void Register(ResourceType::Value type, Index id) = 0;
-};
-
-/**
- * @brief Interface to report modifiable resource ids to.
- * @note These are supposed to be transient. Obviously, the references collected
- *  this way must not outlive the objects that they came from.
- */
-class DALI_SCENE_LOADER_API IResourceReflector
-{
-public:
-  virtual ~IResourceReflector() = default;
-
-  virtual void Reflect(ResourceType::Value type, Index& id) = 0;
-};
-
-/**
- * @brief Intermediate representation for a constraint that shall be
- *  set up after the Actors were created. The target of the constraint
- *  is the node definition that carries it.
- */
-struct DALI_SCENE_LOADER_API ConstraintDefinition
-{
-  std::string mProperty;  ///< name of the property to constrain.
-  Index       mSourceIdx; ///< index of the node to serve as the source of the constraint.
-
-  bool operator<(const ConstraintDefinition& other) const
-  {
-    return mProperty < other.mProperty;
-  }
-
-  bool operator==(const ConstraintDefinition& other) const
-  {
-    return mSourceIdx == other.mSourceIdx && mProperty == other.mProperty;
-  }
-
-  bool operator!=(const ConstraintDefinition& other) const
-  {
-    return !operator==(other);
-  }
-};
-
-struct DALI_SCENE_LOADER_API Transforms
-{
-  MatrixStack           modelStack;
-  const ViewProjection& viewProjection;
-};
-
-/**
- * @brief Information about a skeleton and the shader that needs to be configured with it.
- * @note Multiple skeletons shalt not share the same shader.
- */
-struct DALI_SCENE_LOADER_API SkinningShaderConfigurationRequest
-{
-  Index  mSkeletonIdx;
-  Shader mShader;
-
-  bool operator<(const SkinningShaderConfigurationRequest& other) const
-  {
-    return mShader < other.mShader;
-  }
-};
-
-/**
- * @brief Needed to configure blend shape properties.
- */
-struct DALI_SCENE_LOADER_API BlendshapeShaderConfigurationRequest
-{
-  std::string mNodeName;
-  Index       mMeshIdx;
-  Shader      mShader;
-
-  bool operator<(const BlendshapeShaderConfigurationRequest& other) const
-  {
-    return mShader < other.mShader;
-  }
-};
-
-/**
- * @brief Request for creating a constraint, output from NodeDefinition::OnCreate.
- */
-struct DALI_SCENE_LOADER_API ConstraintRequest
-{
-  const ConstraintDefinition* const mConstraint; ///< Definition of the constraint to create.
-  Actor                             mTarget;     ///< Target of the constraint.
-};
-
-/**
- * @brief Defines a node, consisting of a name, a transform, a size, a list of child nodes,
- *  and slots for customization and rendering logic, which are mutually exclusive in the
- *  current implementation.
- */
-struct DALI_SCENE_LOADER_API NodeDefinition
-{
-public: // TYPES
-  using Vector = std::vector<NodeDefinition>;
-
-  struct CreateParams
-  {
-  public: // input
-    const ResourceBundle& mResources;
-    Transforms&           mXforms;
-
-  public: // output
-    std::vector<ConstraintRequest>                    mConstrainables;
-    std::vector<SkinningShaderConfigurationRequest>   mSkinnables;
-    std::vector<BlendshapeShaderConfigurationRequest> mBlendshapeRequests;
-  };
-
-  class DALI_SCENE_LOADER_API Renderable
-  {
-  public: // DATA
-    Index mShaderIdx = INVALID_INDEX;
-
-  public: // METHODS
-    virtual ~Renderable() = default;
-
-    virtual void RegisterResources(IResourceReceiver& receiver) const;
-    virtual void ReflectResources(IResourceReflector& reflector);
-    virtual void OnCreate(const NodeDefinition& node, CreateParams& params, Actor& actor) const;
-  };
-
-  struct CustomizationDefinition
-  {
-    std::string mTag;
-
-    Index GetChildId(const Customization::Choices& choices, const NodeDefinition& node)
-    {
-      auto choice = choices.Get(mTag);
-      return std::min(choice != Customization::NONE ? choice : 0,
-                      static_cast<Index>(node.mChildren.size() - 1));
-    }
-  };
-
-  class IVisitor
-  {
-  public:
-    virtual void Start(NodeDefinition& n)  = 0;
-    virtual void Finish(NodeDefinition& n) = 0;
-
-  protected:
-    ~IVisitor() = default; // deliberately non-virtual these are transient objects and we don't want to pay for the vtable.
-  };
-
-  class IConstVisitor
-  {
-  public:
-    virtual void Start(const NodeDefinition& n)  = 0;
-    virtual void Finish(const NodeDefinition& n) = 0;
-
-  protected:
-    ~IConstVisitor() = default; // deliberately non-virtual these are transient objects and we don't want to pay for the vtable.
-  };
-
-  struct Extra
-  {
-    std::string     mKey;
-    Property::Value mValue;
-
-    bool operator<(const Extra& other) const
-    {
-      return mKey < other.mKey;
-    }
-  };
-
-public: // METHODS
-  /**
-   * @brief Creates a DALi Actor from this definition only.
-   * @note Not recursive.
-   */
-  Actor CreateActor(CreateParams& params) const;
-
-  Matrix GetLocalSpace() const;
-
-public: // DATA
-  static const std::string ORIGINAL_MATRIX_PROPERTY_NAME;
-
-  std::string mName;
-
-  Vector3    mPosition    = Vector3::ZERO;
-  Quaternion mOrientation = Quaternion::IDENTITY;
-  Vector3    mScale       = Vector3::ONE;
-  Vector3    mSize        = Vector3::ONE;
-
-  bool mIsVisible = true;
-
-  std::unique_ptr<Renderable>              mRenderable;
-  std::unique_ptr<CustomizationDefinition> mCustomization;
-  std::vector<Extra>                       mExtras;
-  std::vector<ConstraintDefinition>        mConstraints;
-
-  std::vector<Index> mChildren;
-  Index              mParentIdx = INVALID_INDEX;
-};
-
-class DALI_SCENE_LOADER_API ModelNode : public NodeDefinition::Renderable
-{
-public: // DATA
-  Vector4 mColor       = Color::WHITE;
-  Index   mMeshIdx     = INVALID_INDEX;
-  Index   mMaterialIdx = INVALID_INDEX;
-
-public: // METHODS
-  void RegisterResources(IResourceReceiver& receiver) const override;
-  void ReflectResources(IResourceReflector& reflector) override;
-  void OnCreate(const NodeDefinition& node, NodeDefinition::CreateParams& params, Actor& actor) const override;
-};
-
-/**
- * @brief Parameters for an Arc node.
- */
-class DALI_SCENE_LOADER_API ArcNode : public ModelNode
-{
-public: // DATA
-  bool  mAntiAliasing      = true;
-  int   mArcCaps           = 0;
-  float mStartAngleDegrees = .0f;
-  float mEndAngleDegrees   = .0f;
-  float mRadius            = .0f;
-
-public: // METHODS
-  static void GetEndVectorWithDiffAngle(float startAngle, float endAngle, Vector2& endVector);
-
-  void OnCreate(const NodeDefinition& node, NodeDefinition::CreateParams& params, Actor& actor) const override;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_NODE_DEFINITION_H_
diff --git a/dali-scene-loader/public-api/parse-renderer-state.cpp b/dali-scene-loader/public-api/parse-renderer-state.cpp
deleted file mode 100644
index 815dfaf..0000000
--- a/dali-scene-loader/public-api/parse-renderer-state.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "dali-scene-loader/public-api/parse-renderer-state.h"
-#include <cstring>
-#include "dali/devel-api/common/map-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace RendererState
-{
-namespace
-{
-std::map<std::string_view, Type> COMPARISONS{
-#define DECL_COMPARISON(x) {#x, Comparison::x}
-  DECL_COMPARISON(NEVER),
-  DECL_COMPARISON(ALWAYS),
-  DECL_COMPARISON(LESS),
-  DECL_COMPARISON(GREATER),
-  DECL_COMPARISON(EQUAL),
-  DECL_COMPARISON(NOT_EQUAL),
-  DECL_COMPARISON(LESS_EQUAL),
-  DECL_COMPARISON(GREATER_EQUAL),
-#undef DECL_COMPARISON
-};
-
-Type InterpretComparison(const std::string_view& str)
-{
-  Type value = 0x0;
-  auto iFind = COMPARISONS.find(str);
-  if(iFind != COMPARISONS.end())
-  {
-    value = iFind->second;
-  }
-  return value;
-}
-
-std::map<std::string_view, Type> BLEND_FACTORS{
-#define DECL_BLEND_FACTOR(x) {#x, SceneLoader::BlendFactor::x}
-  DECL_BLEND_FACTOR(ZERO),
-  DECL_BLEND_FACTOR(ONE),
-  DECL_BLEND_FACTOR(SRC_COLOR),
-  DECL_BLEND_FACTOR(ONE_MINUS_SRC_COLOR),
-  DECL_BLEND_FACTOR(SRC_ALPHA),
-  DECL_BLEND_FACTOR(ONE_MINUS_SRC_ALPHA),
-  DECL_BLEND_FACTOR(DST_ALPHA),
-  DECL_BLEND_FACTOR(ONE_MINUS_DST_ALPHA),
-  DECL_BLEND_FACTOR(DST_COLOR),
-  DECL_BLEND_FACTOR(ONE_MINUS_DST_COLOR),
-  DECL_BLEND_FACTOR(SRC_ALPHA_SATURATE),
-  DECL_BLEND_FACTOR(CONSTANT_COLOR),
-  DECL_BLEND_FACTOR(ONE_MINUS_CONSTANT_COLOR),
-  DECL_BLEND_FACTOR(CONSTANT_ALPHA),
-  DECL_BLEND_FACTOR(ONE_MINUS_CONSTANT_ALPHA),
-#undef DECL_BLEND_FACTOR
-};
-
-Type InterpretBlendFactor(const std::string_view& str, uint8_t item)
-{
-  Type value = 0x0;
-  auto iFind = BLEND_FACTORS.find(str);
-  if(iFind != BLEND_FACTORS.end())
-  {
-    value = iFind->second << (BLEND_FACTOR_BASE_SHIFT + BLEND_FACTOR_ITEM_BITS * item);
-  }
-  return value;
-}
-
-std::map<std::string_view, Type> BUFFER_MODES{
-#define DECL_BUFFER_MODE(x) {#x, BufferMode::x}
-  DECL_BUFFER_MODE(NONE),
-  DECL_BUFFER_MODE(AUTO),
-  DECL_BUFFER_MODE(COLOR),
-  DECL_BUFFER_MODE(STENCIL),
-  DECL_BUFFER_MODE(COLOR_STENCIL),
-};
-
-Type InterpretBufferMode(const std::string_view& str)
-{
-  Type value = 0x0;
-  auto iFind = BUFFER_MODES.find(str);
-  if(iFind != BUFFER_MODES.end())
-  {
-    value = iFind->second << BUFFER_MODE_SHIFT;
-  }
-  return value;
-}
-
-std::map<std::string_view, Type (*)(const std::string_view&)> RENDERER_STATE_PROCESSORS{
-  {"DEPTH_WRITE", [](const std::string_view&) -> Type { return DEPTH_WRITE; }},
-  {"DEPTH_TEST", [](const std::string_view&) -> Type { return DEPTH_TEST; }},
-  {"CULL_FRONT", [](const std::string_view&) -> Type { return CULL_FRONT; }},
-  {"CULL_BACK", [](const std::string_view&) -> Type { return CULL_BACK; }},
-  {"ALPHA_BLEND", [](const std::string_view&) -> Type { return ALPHA_BLEND; }},
-  {"DEPTH_FUNC", [](const std::string_view& arg) -> Type {
-     Type value = (arg[0] == ':') ? (InterpretComparison(std::string_view(arg.data() + 1, arg.size() - 1)) << DEPTH_FUNCTION_SHIFT) : 0x0;
-     return value;
-   }},
-  {"BLEND_SRC_RGB", [](const std::string_view& arg) -> Type {
-     Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 0) : 0x0;
-     return value;
-   }},
-  {"BLEND_DST_RGB", [](const std::string_view& arg) -> Type {
-     Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 1) : 0x0;
-     return value;
-   }},
-  {"BLEND_SRC_ALPHA", [](const std::string_view& arg) -> Type {
-     Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 2) : 0x0;
-     return value;
-   }},
-  {"BLEND_DST_ALPHA", [](const std::string_view& arg) -> Type {
-     Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 3) : 0x0;
-     return value;
-   }},
-  {"BUFFER_MODE", [](const std::string_view& arg) -> Type {
-     Type value = (arg[0] == ':') ? InterpretBufferMode(std::string_view(arg.data() + 1, arg.size() - 1)) : 0x0;
-     return value;
-   }},
-};
-
-} // namespace
-
-Type Parse(const char* string, size_t length, StringCallback onError)
-{
-  if(length == 0)
-  {
-    length = strlen(string);
-  }
-
-  Type value = 0x0;
-  auto iEnd  = string + length;
-  while(string != iEnd)
-  {
-    auto iNextToken = std::find(string, iEnd, '|');
-    auto iColon     = std::find(string, iNextToken, ':');
-    auto i          = RENDERER_STATE_PROCESSORS.find(std::string_view(string, iColon - string));
-    if(i != RENDERER_STATE_PROCESSORS.end() && size_t(std::distance(string, iNextToken)) >= i->first.size())
-    {
-      value |= i->second(std::string_view(string + i->first.size(), iNextToken - iColon));
-    }
-    else
-    {
-      onError("Not a valid RendererState: " + std::string(string, iNextToken));
-    }
-
-    string = iNextToken + (iNextToken != iEnd);
-  }
-
-  return value;
-}
-
-} // namespace RendererState
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/parse-renderer-state.h b/dali-scene-loader/public-api/parse-renderer-state.h
deleted file mode 100644
index 38103d0..0000000
--- a/dali-scene-loader/public-api/parse-renderer-state.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef DALI_SCENE_LOADER_INTERPRET_RENDERER_STATE_H
-#define DALI_SCENE_LOADER_INTERPRET_RENDERER_STATE_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "dali-scene-loader/public-api/renderer-state.h"
-#include "dali-scene-loader/public-api/string-callback.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace RendererState
-{
-/*
- * @brief Attempts to interpret a string for renderer states, which can be a combination of the following
- *  (using '|' as a delimiter, if multiple specified):<br/>
- *  - one of Value, exc. for NONE or those with the _BITS, _SHIFT, _MASK or _ITEMS suffix;<br/>
- *  - DEPTH_FUNC:${one of Comparison::Type, exc. OMIT};<br/>
- *  - BLEND_(SRC_DST)_(RGB|ALPHA):${one of BlendFactor::Type, exc. OMIT};<br/>
- *  - BUFFER_MODE:${one of BufferMode::Type, exc. OMIT};
- * @param string The string to parse;
- * @param length The length of the string; If left at 0, strlen() will be called, which of
- *   course is only suitable i the string is null-terminated.
- * @param onError The callback to call when an error occurred.
- * @note No other characters are allowed.
- */
-DALI_SCENE_LOADER_API Type Parse(const char* string, size_t length = 0, StringCallback onError = DefaultErrorCallback);
-
-} // namespace RendererState
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_INTERPRET_RENDERER_STATE_H
diff --git a/dali-scene-loader/public-api/renderer-state.cpp b/dali-scene-loader/public-api/renderer-state.cpp
deleted file mode 100644
index 80178b5..0000000
--- a/dali-scene-loader/public-api/renderer-state.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/renderer-state.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-// NOTE: values for BlendFactor aren't contiguous, hence we need a mapping.
-const Dali::BlendFactor::Type kBlendFactors[] = {
-  Dali::BlendFactor::ZERO,
-  Dali::BlendFactor::ONE,
-  Dali::BlendFactor::SRC_COLOR,
-  Dali::BlendFactor::ONE_MINUS_SRC_COLOR,
-  Dali::BlendFactor::SRC_ALPHA,
-  Dali::BlendFactor::ONE_MINUS_SRC_ALPHA,
-  Dali::BlendFactor::DST_ALPHA,
-  Dali::BlendFactor::ONE_MINUS_DST_ALPHA,
-  Dali::BlendFactor::DST_COLOR,
-  Dali::BlendFactor::ONE_MINUS_DST_COLOR,
-  Dali::BlendFactor::SRC_ALPHA_SATURATE,
-  Dali::BlendFactor::CONSTANT_COLOR,
-  Dali::BlendFactor::ONE_MINUS_CONSTANT_COLOR,
-  Dali::BlendFactor::CONSTANT_ALPHA,
-  Dali::BlendFactor::ONE_MINUS_CONSTANT_ALPHA,
-};
-} // namespace
-
-namespace RendererState
-{
-#define RENDERER_SET_PROPERTY(name, value) renderer.SetProperty(Renderer::Property::name, (value))
-
-void Apply(Type rendererState, Renderer& renderer)
-{
-  RENDERER_SET_PROPERTY(DEPTH_WRITE_MODE, MaskMatch(rendererState, DEPTH_WRITE) ? DepthWriteMode::ON : DepthWriteMode::OFF);
-  RENDERER_SET_PROPERTY(DEPTH_TEST_MODE, MaskMatch(rendererState, DEPTH_TEST) ? DepthTestMode::ON : DepthTestMode::OFF);
-
-  RENDERER_SET_PROPERTY(BLEND_MODE, MaskMatch(rendererState, ALPHA_BLEND) ? BlendMode::ON : BlendMode::OFF);
-
-  const bool cullBack = MaskMatch(rendererState, CULL_BACK);
-  RENDERER_SET_PROPERTY(FACE_CULLING_MODE, MaskMatch(rendererState, CULL_FRONT) ? (cullBack ? FaceCullingMode::FRONT_AND_BACK : FaceCullingMode::FRONT) : (cullBack ? FaceCullingMode::BACK : FaceCullingMode::NONE));
-
-  if(auto depthFunc = (rendererState & DEPTH_FUNCTION_MASK) >> DEPTH_FUNCTION_SHIFT)
-  {
-    RENDERER_SET_PROPERTY(DEPTH_FUNCTION, static_cast<DepthFunction::Type>(depthFunc - 1));
-  }
-
-  if(auto blendFactors = (rendererState & BLEND_FACTOR_MASK) >> BLEND_FACTOR_BASE_SHIFT)
-  {
-    if(auto srcRgb = (blendFactors & BLEND_FACTOR_ITEM_MASK))
-    {
-      RENDERER_SET_PROPERTY(BLEND_FACTOR_SRC_RGB, kBlendFactors[static_cast<BlendFactor::Type>(srcRgb - 1)]);
-    }
-
-    blendFactors >>= BLEND_FACTOR_ITEM_BITS;
-    if(auto dstRgb = (blendFactors & BLEND_FACTOR_ITEM_MASK))
-    {
-      RENDERER_SET_PROPERTY(BLEND_FACTOR_DEST_RGB, kBlendFactors[static_cast<BlendFactor::Type>(dstRgb - 1)]);
-    }
-
-    blendFactors >>= BLEND_FACTOR_ITEM_BITS;
-    if(auto srcAlpha = (blendFactors & BLEND_FACTOR_ITEM_MASK))
-    {
-      RENDERER_SET_PROPERTY(BLEND_FACTOR_SRC_ALPHA, kBlendFactors[static_cast<BlendFactor::Type>(srcAlpha - 1)]);
-    }
-
-    blendFactors >>= BLEND_FACTOR_ITEM_BITS;
-    if(auto dstAlpha = (blendFactors & BLEND_FACTOR_ITEM_MASK))
-    {
-      RENDERER_SET_PROPERTY(BLEND_FACTOR_DEST_ALPHA, kBlendFactors[static_cast<BlendFactor::Type>(dstAlpha - 1)]);
-    }
-  }
-
-  if(auto bufferMode = (rendererState & BUFFER_MODE_MASK) >> BUFFER_MODE_SHIFT)
-  {
-    RENDERER_SET_PROPERTY(RENDER_MODE, static_cast<RenderMode::Type>(bufferMode - 1));
-  }
-}
-
-} // namespace RendererState
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/renderer-state.h b/dali-scene-loader/public-api/renderer-state.h
deleted file mode 100644
index f70100a..0000000
--- a/dali-scene-loader/public-api/renderer-state.h
+++ /dev/null
@@ -1,162 +0,0 @@
-#ifndef DALI_SCENE_LOADER_RENDERER_STATE_H
-#define DALI_SCENE_LOADER_RENDERER_STATE_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/rendering/renderer.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/*
- * @brief Contains values for comparison functions used in depth and stencil testing.
- * @note Relative order of members must match DepthFunction::Type and StencilFunction::Type.
- */
-struct DALI_SCENE_LOADER_API Comparison
-{
-  enum Type
-  {
-    OMIT, // not specified; will not be set.
-    NEVER,
-    ALWAYS,
-    LESS,
-    GREATER,
-    EQUAL,
-    NOT_EQUAL,
-    LESS_EQUAL,
-    GREATER_EQUAL
-  };
-
-  Comparison() = delete;
-};
-
-/*
- * @brief Determines the blend factor used.
- * @note Relative order of members must match BlendFactor::Type.
- */
-struct DALI_SCENE_LOADER_API BlendFactor
-{
-  enum Type
-  {
-    OMIT, // not specified - will not be updated
-    ZERO,
-    ONE, // default for source alpha
-    SRC_COLOR,
-    ONE_MINUS_SRC_COLOR,
-    SRC_ALPHA,           // default for source RGB
-    ONE_MINUS_SRC_ALPHA, // default for destination RGB and destination alpha
-    DST_ALPHA,
-    ONE_MINUS_DST_ALPHA,
-    DST_COLOR,
-    ONE_MINUS_DST_COLOR,
-    SRC_ALPHA_SATURATE,
-    CONSTANT_COLOR,
-    ONE_MINUS_CONSTANT_COLOR,
-    CONSTANT_ALPHA,
-    ONE_MINUS_CONSTANT_ALPHA,
-  };
-
-  BlendFactor() = delete;
-};
-
-/*
- * @brief Determines which buffers shall the Renderer write into.
- * @note Relative order of members must match RenderMode::Type.
- */
-struct DALI_SCENE_LOADER_API BufferMode
-{
-  enum Type
-  {
-    OMIT,         ///< not specified - will not be updated
-    NONE,         ///< Don’t write to either color or stencil buffer (But will potentially render to depth buffer).
-    AUTO,         ///< Writes are managed by the Actor Clipping API. This is DALi's default.
-    COLOR,        ///< Ignore stencil properties.  Write to the color buffer.
-    STENCIL,      ///< Use the stencil properties. Do not write to the color buffer.
-    COLOR_STENCIL ///< Use the stencil properties AND Write to the color buffer.
-  };
-
-  BufferMode() = delete;
-};
-
-/*
- * @brief Contains values and functionality for configuring Renderers.
- */
-namespace RendererState
-{
-using Type = uint32_t; // 8 bits reserved for flags, 4 * 4 bit for blend factors, 4 bits for depth function
-
-enum DALI_SCENE_LOADER_API Value : Type
-{
-  NONE = 0x0,
-
-  DEPTH_WRITE = 0x01,
-  DEPTH_TEST  = 0x02,
-
-  CULL_FRONT = 0x04,
-  CULL_BACK  = 0x08,
-
-  ALPHA_BLEND = 0x10,
-
-  DEPTH_FUNCTION_SHIFT = 6,
-  DEPTH_FUNCTION_BITS  = 4,
-  DEPTH_FUNCTION_MASK  = ((1 << DEPTH_FUNCTION_BITS) - 1) << DEPTH_FUNCTION_SHIFT,
-
-  BLEND_FACTOR_BASE_SHIFT = DEPTH_FUNCTION_SHIFT + DEPTH_FUNCTION_BITS,
-  BLEND_FACTOR_ITEM_BITS  = 4,
-  BLEND_FACTOR_ITEMS      = 4,
-  BLEND_FACTOR_BITS       = BLEND_FACTOR_ITEM_BITS * BLEND_FACTOR_ITEMS,
-  BLEND_FACTOR_MASK       = ((1 << BLEND_FACTOR_BITS) - 1) << BLEND_FACTOR_BASE_SHIFT,
-  BLEND_FACTOR_ITEM_MASK  = (1 << BLEND_FACTOR_ITEM_BITS) - 1, // after rshifting by BLEND_FACTOR_BASE_SHIFT
-
-  // Buffer mode is DALi's RenderMode, just to avoid too much conflation.
-  BUFFER_MODE_BITS  = 3u,
-  BUFFER_MODE_SHIFT = 32u - BUFFER_MODE_BITS, // from end
-  BUFFER_MODE_MASK  = ((1u << BUFFER_MODE_BITS) - 1u) << BUFFER_MODE_SHIFT,
-
-  DEFAULT = DEPTH_WRITE | DEPTH_TEST | CULL_BACK | (Comparison::LESS_EQUAL << DEPTH_FUNCTION_SHIFT),
-};
-
-/*
- * @brief Encodes the given blend factors into a RenderMode value, maskable into other options,
- *  passable into ApplyRenderMode().
- */
-inline DALI_SCENE_LOADER_API constexpr uint32_t FromBlendFactors(BlendFactor::Type srcRgb, BlendFactor::Type destRgb, BlendFactor::Type srcAlpha, BlendFactor::Type destAlpha)
-{
-  return (srcRgb | (destRgb << BLEND_FACTOR_ITEM_BITS) | (srcAlpha << (BLEND_FACTOR_ITEM_BITS * 2)) |
-          (destAlpha << (BLEND_FACTOR_ITEM_BITS * 3)))
-         << BLEND_FACTOR_BASE_SHIFT;
-}
-
-/*
- * @brief Applies the settings encoded in @a rendererState, to a @a renderer.
- * @note Depth function is only set if not Comparison::OMIT.
- * @note Blend factors are only set if not BlendFactor::OMIT.
- * @note Buffer mode is only set is not BufferMode::OMIT.
- */
-DALI_SCENE_LOADER_API void Apply(Type rendererState, Renderer& renderer);
-
-} // namespace RendererState
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_RENDERER_STATE_H
diff --git a/dali-scene-loader/public-api/resource-bundle.cpp b/dali-scene-loader/public-api/resource-bundle.cpp
deleted file mode 100644
index 98b08bb..0000000
--- a/dali-scene-loader/public-api/resource-bundle.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include "dali-scene-loader/public-api/resource-bundle.h"
-
-// EXTERNAL
-#include <cstring>
-#include <fstream>
-#include <istream>
-#include "dali-toolkit/public-api/image-loader/sync-image-loader.h"
-#include "dali/public-api/rendering/sampler.h"
-
-namespace Dali
-{
-using namespace Toolkit;
-
-namespace SceneLoader
-{
-namespace
-{
-const char* const RESOURCE_TYPE_NAMES[] = {
-  "Environment",
-  "Shader",
-  "Mesh",
-  "Material",
-};
-
-} // namespace
-
-const char* GetResourceTypeName(ResourceType::Value type)
-{
-  return RESOURCE_TYPE_NAMES[static_cast<int>(type)];
-}
-
-ResourceRefCounts ResourceBundle::CreateRefCounter() const
-{
-  ResourceRefCounts refCounts(4);
-  refCounts[ResourceType::Environment].Resize(mEnvironmentMaps.size(), 0u);
-  refCounts[ResourceType::Shader].Resize(mShaders.size(), 0u);
-  refCounts[ResourceType::Mesh].Resize(mMeshes.size(), 0u);
-  refCounts[ResourceType::Material].Resize(mMaterials.size(), 0u);
-  return refCounts;
-}
-
-void ResourceBundle::CountEnvironmentReferences(ResourceRefCounts& refCounts) const
-{
-  auto& environmentRefCounts = refCounts[ResourceType::Environment];
-
-  const auto& materialRefs = refCounts[ResourceType::Material];
-  for(uint32_t i = 0, iEnd = materialRefs.Size(); i != iEnd; ++i)
-  {
-    if(materialRefs[i] > 0)
-    {
-      ++environmentRefCounts[mMaterials[i].first.mEnvironmentIdx];
-    }
-  }
-}
-
-void ResourceBundle::LoadResources(const ResourceRefCounts& refCounts, PathProvider pathProvider, Options::Type options)
-{
-  const auto kForceLoad  = MaskMatch(options, Options::ForceReload);
-  const auto kKeepUnused = MaskMatch(options, Options::KeepUnused);
-
-  const auto& refCountEnvMaps  = refCounts[ResourceType::Environment];
-  auto        environmentsPath = pathProvider(ResourceType::Environment);
-  for(uint32_t i = 0, iEnd = refCountEnvMaps.Size(); i != iEnd; ++i)
-  {
-    auto  refCount = refCountEnvMaps[i];
-    auto& iEnvMap  = mEnvironmentMaps[i];
-    if(refCount > 0 && (kForceLoad || !iEnvMap.second.IsLoaded()))
-    {
-      auto raw       = iEnvMap.first.LoadRaw(environmentsPath);
-      iEnvMap.second = iEnvMap.first.Load(std::move(raw));
-    }
-    else if(!kKeepUnused && refCount == 0 && iEnvMap.second.IsLoaded())
-    {
-      iEnvMap.second.mDiffuse  = Texture();
-      iEnvMap.second.mSpecular = Texture();
-    }
-  }
-
-  const auto& refCountShaders = refCounts[ResourceType::Shader];
-  auto        shadersPath     = pathProvider(ResourceType::Shader);
-  for(uint32_t i = 0, iEnd = refCountShaders.Size(); i != iEnd; ++i)
-  {
-    auto  refCount = refCountShaders[i];
-    auto& iShader  = mShaders[i];
-    if(refCount > 0 && (kForceLoad || !iShader.second))
-    {
-      auto raw       = iShader.first.LoadRaw(shadersPath);
-      iShader.second = iShader.first.Load(std::move(raw));
-    }
-    else if(!kKeepUnused && refCount == 0 && iShader.second)
-    {
-      iShader.second = Shader();
-    }
-  }
-
-  const auto& refCountMeshes = refCounts[ResourceType::Mesh];
-  auto        modelsPath     = pathProvider(ResourceType::Mesh);
-  for(uint32_t i = 0, iEnd = refCountMeshes.Size(); i != iEnd; ++i)
-  {
-    auto  refCount = refCountMeshes[i];
-    auto& iMesh    = mMeshes[i];
-    if(refCount > 0 && (kForceLoad || !iMesh.second.geometry))
-    {
-      auto raw     = iMesh.first.LoadRaw(modelsPath);
-      iMesh.second = iMesh.first.Load(std::move(raw));
-    }
-    else if(!kKeepUnused && refCount == 0 && iMesh.second.geometry)
-    {
-      iMesh.second.geometry = Geometry();
-    }
-  }
-
-  const auto& refCountMaterials = refCounts[ResourceType::Material];
-  auto        imagesPath        = pathProvider(ResourceType::Material);
-  for(uint32_t i = 0, iEnd = refCountMaterials.Size(); i != iEnd; ++i)
-  {
-    auto  refCount  = refCountMaterials[i];
-    auto& iMaterial = mMaterials[i];
-    if(refCount > 0 && (kForceLoad || !iMaterial.second))
-    {
-      auto raw         = iMaterial.first.LoadRaw(imagesPath);
-      iMaterial.second = iMaterial.first.Load(mEnvironmentMaps, std::move(raw));
-    }
-    else if(!kKeepUnused && refCount == 0 && iMaterial.second)
-    {
-      iMaterial.second = TextureSet();
-    }
-  }
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/resource-bundle.h b/dali-scene-loader/public-api/resource-bundle.h
deleted file mode 100644
index b1e0936..0000000
--- a/dali-scene-loader/public-api/resource-bundle.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef DALI_SCENE_LOADER_RESOURCE_BUNDLE_H_
-#define DALI_SCENE_LOADER_RESOURCE_BUNDLE_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL
-#include "dali-scene-loader/public-api/environment-definition.h"
-#include "dali-scene-loader/public-api/material-definition.h"
-#include "dali-scene-loader/public-api/mesh-definition.h"
-#include "dali-scene-loader/public-api/shader-definition.h"
-#include "dali-scene-loader/public-api/skeleton-definition.h"
-
-// EXTERNAL
-#include <functional>
-#include <memory>
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/rendering/shader.h"
-#include "dali/public-api/rendering/texture-set.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/*
- * @brief The types of resources that .dli may define.
- */
-struct DALI_SCENE_LOADER_API ResourceType
-{
-  enum Value
-  {
-    Environment,
-    Shader,
-    Mesh,
-    Material,
-  };
-
-  ResourceType() = delete;
-};
-
-/*
- * @return The string value corresponding to the given resource @a type.
- */
-DALI_SCENE_LOADER_API const char* GetResourceTypeName(ResourceType::Value type);
-
-using ResourceRefCounts = std::vector<Vector<uint32_t>>;
-
-/*
- * @brief Stores all resource definitions along with the DALi resources that
- *  could be created from them, directly indexible into with values from a dli
- *  document.
- */
-class DALI_SCENE_LOADER_API ResourceBundle
-{
-public:
-  struct Options
-  {
-    using Type = uint8_t;
-
-    enum Value : Type
-    {
-      None        = 0,
-      ForceReload = NthBit(0), ///< Load resources [again] even if they were already loaded.
-      KeepUnused  = NthBit(1)  ///<s Don't reset handles to resources that had a 0 reference count.
-    };
-  };
-
-  using PathProvider = std::function<std::string(ResourceType::Value)>;
-
-  ResourceBundle() = default;
-
-  ResourceBundle(const ResourceBundle&) = delete;
-  ResourceBundle& operator=(const ResourceBundle&) = delete;
-
-  ResourceBundle(ResourceBundle&&) = default;
-  ResourceBundle& operator=(ResourceBundle&&) = default;
-
-  /*
-   * @return A ResourceRefCounts object with the correct number of entries for
-   *  all resource types (based on the various resource definition vectors),
-   *  with all reference counts set to 0.
-   */
-  ResourceRefCounts CreateRefCounter() const;
-
-  /*
-   * @brief Based on a ResourceRefCounts, and more specifically the reference
-   *  count of materials therein, it will calculate the reference count of
-   *  environment maps.
-   */
-  void CountEnvironmentReferences(ResourceRefCounts& refCounts) const;
-
-  /*
-   * @brief Performs the loading of all resources based on their respective
-   *  reference count in @a refCounts. Resources that had a non-zero ref count will be
-   *  loaded unless we already have a handle to them (OR the ForceReload option was specified).
-   *  Any handles we have to resources that come in with a zero ref count will be reset,
-   *  UNLESS the KeepUnused option was specified.
-   */
-  void LoadResources(const ResourceRefCounts& refCounts,
-                     PathProvider             pathProvider,
-                     Options::Type            options = Options::None);
-
-public: // DATA
-  EnvironmentDefinition::Vector mEnvironmentMaps;
-  ShaderDefinition::Vector      mShaders;
-  MeshDefinition::Vector        mMeshes;
-  MaterialDefinition::Vector    mMaterials;
-
-  SkeletonDefinition::Vector mSkeletons;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_RESOURCE_BUNDLE_H_
diff --git a/dali-scene-loader/public-api/scene-definition.cpp b/dali-scene-loader/public-api/scene-definition.cpp
deleted file mode 100644
index 9da16fc..0000000
--- a/dali-scene-loader/public-api/scene-definition.cpp
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL
-#include "dali/devel-api/common/map-wrapper.h"
-#include "dali/public-api/animation/constraints.h"
-
-// INTERNAL
-#include "dali-scene-loader/internal/graphics/builtin-shader-extern-gen.h"
-#include "dali-scene-loader/public-api/blend-shape-details.h"
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/skinning-details.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-//#define DEBUG_SCENE_DEFINITION
-//#define DEBUG_JOINTS
-
-#if defined(DEBUG_SCENE_DEFINITION) || defined(DEBUG_JOINTS)
-#define DEBUG_ONLY(x) x
-#else
-#define DEBUG_ONLY(x)
-#endif
-
-#define LOGD(x) DEBUG_ONLY(printf x; printf("\n"); fflush(stdout))
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-const std::string JOINT_MATRIX{"jointMatrix"};
-
-const std::map<Property::Type, Constraint (*)(Actor&, Property::Index)> sConstraintFactory = {
-  {Property::Type::BOOLEAN,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<bool>(a, i, [](bool& current, const PropertyInputContainer& inputs) {
-       current = inputs[0]->GetBoolean();
-     });
-   }},
-  {Property::Type::INTEGER,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<int>(a, i, [](int& current, const PropertyInputContainer& inputs) {
-       current = inputs[0]->GetInteger();
-     });
-   }},
-  {Property::Type::FLOAT,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<float>(a, i, EqualToConstraint());
-   }},
-  {Property::Type::VECTOR2,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<Vector2>(a, i, EqualToConstraint());
-   }},
-  {Property::Type::VECTOR3,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<Vector3>(a, i, EqualToConstraint());
-   }},
-  {Property::Type::VECTOR4,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<Vector4>(a, i, EqualToConstraint());
-   }},
-  {Property::Type::MATRIX,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<Matrix>(a, i, EqualToConstraint());
-   }},
-  {Property::Type::MATRIX3,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<Matrix3>(a, i, EqualToConstraint());
-   }},
-  {Property::Type::ROTATION,
-   [](Actor& a, Property::Index i) {
-     return Constraint::New<Quaternion>(a, i, EqualToConstraint());
-   }},
-};
-
-struct ResourceReflector : IResourceReflector
-{
-  Index* iMesh   = nullptr;
-  Index* iShader = nullptr;
-
-  void Reflect(ResourceType::Value type, Index& id)
-  {
-    switch(type)
-    {
-      case ResourceType::Shader:
-        DALI_ASSERT_ALWAYS(!iShader && "Shader index already assigned!");
-        iShader = &id;
-        break;
-
-      case ResourceType::Mesh:
-        DALI_ASSERT_ALWAYS(!iMesh && "Mesh index already assigned!");
-        iMesh = &id;
-        break;
-
-      default: // Other resource types are not relevant to the problem at hand.
-        break;
-    }
-  }
-};
-
-#ifdef DEBUG_JOINTS
-
-Shader sJointDebugShader;
-int    sNumScenes = 0;
-
-void EnsureJointDebugShaderCreated()
-{
-  if(0 == sNumScenes)
-  {
-    sJointDebugShader = Shader::New(SHADER_SCENE_LOADER_JOINT_DEBUG_VERT, SHADER_SCENE_LOADER_JOINT_DEBUG_FRAG);
-  }
-  ++sNumScenes;
-}
-
-void AddJointDebugVisual(Actor aJoint)
-{
-  Property::Map attribs;
-  attribs["aPosition"] = Property::Type::VECTOR3;
-  attribs["aColor"]    = Property::Type::FLOAT;
-
-  PropertyBuffer vbo = PropertyBuffer::New(attribs);
-
-  struct Vertex
-  {
-    Vector3 pos;
-    float   color;
-  } vertices[] = {
-    {Vector3::ZERO, .999f + .999f * 256.f + .999f * 256.f * 256.f},
-    {Vector3::XAXIS, .999f},
-    {Vector3::YAXIS, .999f * 256.f},
-    {Vector3::ZAXIS, .999f * 256.f * 256.f},
-  };
-
-  vbo.SetData(&vertices, std::extent<decltype(vertices)>::value);
-
-  uint16_t indices[] = {0, 1, 0, 2, 0, 3};
-
-  Geometry geo = Geometry::New();
-  geo.AddVertexBuffer(vbo);
-  geo.SetIndexBuffer(indices, std::extent<decltype(indices)>::value);
-  geo.SetType(Geometry::LINES);
-
-  Renderer r = Renderer::New(geo, sJointDebugShader);
-  aJoint.AddRenderer(r);
-
-  aJoint.SetVisible(true);
-}
-#endif //DEBUG_JOINTS
-
-class ActorCreatorVisitor : public NodeDefinition::IConstVisitor
-{
-public:
-  ActorCreatorVisitor(NodeDefinition::CreateParams& params)
-  : mCreationContext(params)
-  {
-  }
-
-  void Start(const NodeDefinition& n)
-  {
-    mCreationContext.mXforms.modelStack.Push(n.GetLocalSpace());
-
-    Actor a = n.CreateActor(mCreationContext);
-    if(!mActorStack.empty())
-    {
-      mActorStack.back().Add(a);
-    }
-    else
-    {
-      mRoot = a;
-    }
-    mActorStack.push_back(a);
-  }
-
-  void Finish(const NodeDefinition& n)
-  {
-    mActorStack.pop_back();
-    mCreationContext.mXforms.modelStack.Pop();
-  }
-
-  Actor GetRoot() const
-  {
-    return mRoot;
-  }
-
-private:
-  NodeDefinition::CreateParams& mCreationContext;
-  std::vector<Actor>            mActorStack;
-  Actor                         mRoot;
-};
-
-bool IsAncestor(const SceneDefinition& scene, Index ancestor, Index node, Index rootHint = INVALID_INDEX)
-{
-  bool isAncestor = false;
-  while(node != rootHint && !isAncestor)
-  {
-    node       = scene.GetNode(node)->mParentIdx;
-    isAncestor = ancestor == node;
-  }
-  return isAncestor;
-}
-
-void InsertUniqueSorted(std::vector<Index>& data, Index value)
-{
-  auto iInsert = std::lower_bound(data.begin(), data.end(), value);
-  if(iInsert == data.end() || *iInsert != value)
-  {
-    data.insert(iInsert, value);
-  }
-}
-
-void RemoveFromSorted(std::vector<Index>& data, Index value)
-{
-  auto iRemove = std::lower_bound(data.begin(), data.end(), value);
-  if(iRemove != data.end() && *iRemove == value)
-  {
-    data.erase(iRemove);
-  }
-}
-
-Property::Index ConfigureJointMatrix(Actor actor, Actor ancestor, Property::Index propJointMatrix)
-{
-  Actor parent = actor.GetParent();
-  if(parent != ancestor)
-  {
-    propJointMatrix = ConfigureJointMatrix(parent, ancestor, propJointMatrix);
-  }
-
-  auto myPropJointMatrix = actor.GetPropertyIndex(JOINT_MATRIX);
-  if(myPropJointMatrix == Property::INVALID_INDEX)
-  {
-    myPropJointMatrix     = actor.RegisterProperty(JOINT_MATRIX, Matrix{false});
-    Constraint constraint = Constraint::New<Matrix>(actor, propJointMatrix, [](Matrix& output, const PropertyInputContainer& inputs) {
-      Matrix jointMatrix{false};
-      jointMatrix.SetTransformComponents(Vector3::ONE, inputs[0]->GetQuaternion(), inputs[1]->GetVector3());
-
-      Matrix::Multiply(output, jointMatrix, inputs[2]->GetMatrix());
-    });
-    constraint.AddSource(Source{actor, Actor::Property::ORIENTATION});
-    constraint.AddSource(Source{actor, Actor::Property::POSITION});
-    constraint.AddSource(Source{parent, propJointMatrix});
-    constraint.Apply();
-  }
-
-  return myPropJointMatrix;
-}
-
-void SortAndDeduplicateSkinningRequests(std::vector<SkinningShaderConfigurationRequest>& requests)
-{
-  // Sort requests by shaders.
-  std::sort(requests.begin(), requests.end());
-
-  // Remove duplicates.
-  auto   i           = requests.begin();
-  auto   iEnd        = requests.end();
-  Shader s           = i->mShader;
-  Index  skeletonIdx = i->mSkeletonIdx;
-  ++i;
-  do
-  {
-    // Multiple identical shader instances are removed.
-    while(i != iEnd && i->mShader == s)
-    {
-      // Cannot have multiple skeletons input to the same shader.
-      // NOTE: DliModel now makes sure this doesn't happen.
-      DALI_ASSERT_ALWAYS(i->mSkeletonIdx == skeletonIdx &&
-                         "Skinning shader must not be shared between different skeletons.");
-
-      i->mShader = Shader();
-      ++i;
-    }
-
-    if(i == iEnd)
-    {
-      break;
-    }
-    s           = i->mShader;
-    skeletonIdx = i->mSkeletonIdx;
-    ++i;
-  } while(true);
-
-  requests.erase(std::remove_if(requests.begin(), requests.end(), [](const SkinningShaderConfigurationRequest& sscr) {
-                   return !sscr.mShader;
-                 }),
-                 requests.end());
-}
-
-void ConfigureBoneMatrix(const Matrix& ibm, Actor joint, Shader& shader, Index& boneIdx)
-{
-  // Register bone transform on shader.
-  char propertyNameBuffer[32];
-  snprintf(propertyNameBuffer, sizeof(propertyNameBuffer), "%s[%d]", Skinning::BONE_UNIFORM_NAME.c_str(), boneIdx);
-  DALI_ASSERT_DEBUG(shader.GetPropertyIndex(propertyNameBuffer) == Property::INVALID_INDEX);
-  auto propBoneXform = shader.RegisterProperty(propertyNameBuffer, Matrix{false});
-
-  // Constrain bone matrix to joint transform.
-  Constraint constraint = Constraint::New<Matrix>(shader, propBoneXform, [ibm](Matrix& output, const PropertyInputContainer& inputs) {
-    Matrix::Multiply(output, ibm, inputs[0]->GetMatrix());
-  });
-
-  auto propJointMatrix = joint.GetPropertyIndex(JOINT_MATRIX);
-  constraint.AddSource(Source{joint, propJointMatrix});
-  constraint.Apply();
-
-  ++boneIdx;
-}
-
-template<class Visitor, class SceneDefinition>
-void VisitInternal(Index iNode, const Customization::Choices& choices, Visitor& v, SceneDefinition& sd)
-{
-  auto& node = *sd.GetNode(iNode);
-  v.Start(node);
-
-  if(node.mCustomization)
-  {
-    if(!node.mChildren.empty())
-    {
-      auto  choice = choices.Get(node.mCustomization->mTag);
-      Index i      = std::min(choice != Customization::NONE ? choice : 0, static_cast<Index>(node.mChildren.size() - 1));
-      sd.Visit(node.mChildren[i], choices, v);
-    }
-  }
-  else
-  {
-    for(auto i : node.mChildren)
-    {
-      sd.Visit(i, choices, v);
-    }
-  }
-
-  v.Finish(node);
-}
-
-} // namespace
-
-SceneDefinition::SceneDefinition()
-{
-  mNodes.reserve(128);
-
-#ifdef DEBUG_JOINTS
-  EnsureJointDebugShaderCreated();
-#endif
-}
-
-SceneDefinition::SceneDefinition(SceneDefinition&& other)
-: mNodes(std::move(other.mNodes)),
-  mRootNodeIds(std::move(other.mRootNodeIds))
-{
-#ifdef DEBUG_JOINTS
-  EnsureJointDebugShaderCreated();
-#endif
-}
-
-SceneDefinition::~SceneDefinition()
-{
-#ifdef DEBUG_JOINTS
-  --sNumScenes;
-  if(sNumScenes == 0)
-  {
-    sJointDebugShader = Shader();
-  }
-#endif
-}
-
-uint32_t SceneLoader::SceneDefinition::AddRootNode(Index iNode)
-{
-  if(iNode < mNodes.size())
-  {
-    uint32_t result = mRootNodeIds.size();
-    mRootNodeIds.push_back(iNode);
-    return result;
-  }
-  else
-  {
-    ExceptionFlinger(ASSERT_LOCATION) << "Failed to add new root with node " << iNode << " -- index out of bounds.";
-    return -1;
-  }
-}
-
-const std::vector<Index>& SceneDefinition::GetRoots() const
-{
-  return mRootNodeIds;
-}
-
-void SceneDefinition::RemoveRootNode(Index iRoot)
-{
-  if(iRoot < mRootNodeIds.size())
-  {
-    mRootNodeIds.erase(mRootNodeIds.begin() + iRoot);
-  }
-  else
-  {
-    ExceptionFlinger(ASSERT_LOCATION) << "Failed to remove root " << iRoot << " -- index out of bounds.";
-  }
-}
-
-uint32_t SceneDefinition::GetNodeCount() const
-{
-  return mNodes.size();
-}
-
-const NodeDefinition* SceneDefinition::GetNode(Index iNode) const
-{
-  return mNodes[iNode].get();
-}
-
-NodeDefinition* SceneDefinition::GetNode(Index iNode)
-{
-  return mNodes[iNode].get();
-}
-
-void SceneDefinition::Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IVisitor& v)
-{
-  VisitInternal(iNode, choices, v, *this);
-}
-
-void SceneDefinition::Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IConstVisitor& v) const
-{
-  VisitInternal(iNode, choices, v, *this);
-}
-
-void SceneDefinition::CountResourceRefs(Index iNode, const Customization::Choices& choices, ResourceRefCounts& refCounts) const
-{
-  struct RefCounter : IResourceReceiver
-  {
-    ResourceRefCounts* refCounts;
-
-    void Register(ResourceType::Value type, Index id)
-    {
-      ++(*refCounts)[type][id];
-    }
-  };
-
-  struct : NodeDefinition::IConstVisitor
-  {
-    RefCounter counter;
-
-    void Start(const NodeDefinition& n)
-    {
-      if(n.mRenderable)
-      {
-        n.mRenderable->RegisterResources(counter);
-      }
-    }
-
-    void Finish(const NodeDefinition& n)
-    {
-    }
-
-  } refCounterVisitor;
-  refCounterVisitor.counter.refCounts = &refCounts;
-
-  Visit(iNode, choices, refCounterVisitor);
-}
-
-Actor SceneDefinition::CreateNodes(Index iNode, const Customization::Choices& choices, NodeDefinition::CreateParams& params) const
-{
-  ActorCreatorVisitor actorCreatorVisitor(params);
-
-  Visit(iNode, choices, actorCreatorVisitor);
-
-  return actorCreatorVisitor.GetRoot();
-}
-
-void SceneDefinition::GetCustomizationOptions(const Customization::Choices& choices,
-                                              Customization::Map&           outCustomizationOptions,
-                                              Customization::Choices*       outMissingChoices) const
-{
-  struct : NodeDefinition::IConstVisitor
-  {
-    const Customization::Choices* choices;        // choices that we know about.
-    Customization::Map*           options;        // tags are registered here. NO OWNERSHIP.
-    Customization::Choices*       missingChoices; // tags will be registered with the default 0. NO OWNERSHIP.
-
-    void Start(const NodeDefinition& n)
-    {
-      if(n.mCustomization)
-      {
-        const std::string& tag = n.mCustomization->mTag;
-        if(missingChoices != nullptr && choices->Get(tag) == Customization::NONE)
-        {
-          missingChoices->Set(tag, 0);
-        }
-
-        auto customization = options->Get(tag);
-        if(!customization)
-        {
-          customization = options->Set(tag, {});
-        }
-        customization->nodes.push_back(n.mName);
-        customization->numOptions = std::max(customization->numOptions,
-                                             static_cast<uint32_t>(n.mChildren.size()));
-      }
-    }
-
-    void Finish(const NodeDefinition& n)
-    {
-    }
-
-  } customizationRegistrationVisitor;
-  customizationRegistrationVisitor.choices        = &choices;
-  customizationRegistrationVisitor.options        = &outCustomizationOptions;
-  customizationRegistrationVisitor.missingChoices = outMissingChoices;
-
-  for(auto i : mRootNodeIds)
-  {
-    Visit(i, choices, customizationRegistrationVisitor);
-  }
-}
-
-NodeDefinition* SceneDefinition::AddNode(std::unique_ptr<NodeDefinition>&& nodeDef)
-{
-  if(FindNode(nodeDef->mName))
-  {
-    return nullptr;
-  }
-
-  // add next index (to which we're about to push) as a child to the designated parent, if any.
-  if(nodeDef->mParentIdx != INVALID_INDEX)
-  {
-    mNodes[nodeDef->mParentIdx]->mChildren.push_back(mNodes.size());
-  }
-
-  mNodes.push_back(std::move(nodeDef));
-
-  return mNodes.back().get();
-}
-
-bool SceneDefinition::ReparentNode(const std::string& name, const std::string& newParentName, Index siblingOrder)
-{
-  LOGD(("reparenting %s to %s @ %d", name.c_str(), newParentName.c_str(), siblingOrder));
-
-  std::unique_ptr<NodeDefinition>* nodePtr      = nullptr;
-  std::unique_ptr<NodeDefinition>* newParentPtr = nullptr;
-  if(!FindNode(name, &nodePtr) || !FindNode(newParentName, &newParentPtr))
-  {
-    return false;
-  }
-
-  auto& node  = *nodePtr;
-  auto  iNode = std::distance(mNodes.data(), nodePtr);
-
-  DEBUG_ONLY(auto dumpNode = [](NodeDefinition const& n) {
-    std::ostringstream stream;
-    stream << n.mName << " (" << n.mParentIdx << "):";
-    for(auto i : n.mChildren)
-    {
-      stream << i << ", ";
-    }
-    LOGD(("%s", stream.str().c_str()));
-  };)
-
-  // Remove node from children of previous parent (if any).
-  if(node->mParentIdx != INVALID_INDEX)
-  {
-    LOGD(("old parent:"));
-    DEBUG_ONLY(dumpNode(*mNodes[node->mParentIdx]);)
-
-    auto& children = mNodes[node->mParentIdx]->mChildren;
-    children.erase(std::remove(children.begin(), children.end(), iNode), children.end());
-
-    DEBUG_ONLY(dumpNode(*mNodes[node->mParentIdx]);)
-  }
-
-  // Register node to new parent.
-  LOGD(("new parent:"));
-  DEBUG_ONLY(dumpNode(**newParentPtr);)
-  auto& children = (*newParentPtr)->mChildren;
-  if(siblingOrder > children.size())
-  {
-    siblingOrder = children.size();
-  }
-  children.insert(children.begin() + siblingOrder, 1, iNode);
-  DEBUG_ONLY(dumpNode(**newParentPtr);)
-
-  // Update parent index.
-  LOGD(("node:"));
-  DEBUG_ONLY(dumpNode(*node);)
-  auto iParent     = std::distance(mNodes.data(), newParentPtr);
-  node->mParentIdx = iParent;
-  DEBUG_ONLY(dumpNode(*node);)
-  return true;
-}
-
-bool SceneDefinition::RemoveNode(const std::string& name)
-{
-  std::unique_ptr<NodeDefinition>* node = nullptr;
-  if(!FindNode(name, &node))
-  {
-    return false;
-  }
-
-  // Reset node def pointers recursively.
-  auto&                                                 thisNodes = mNodes;
-  unsigned int                                          numReset  = 0;
-  std::function<void(std::unique_ptr<NodeDefinition>&)> resetFn =
-    [&thisNodes, &resetFn, &numReset](std::unique_ptr<NodeDefinition>& nd) {
-      LOGD(("resetting %d", &nd - thisNodes.data()));
-      for(auto i : nd->mChildren)
-      {
-        resetFn(thisNodes[i]);
-      }
-      nd.reset();
-      ++numReset;
-    };
-
-  resetFn(*node);
-
-  // Gather indices of dead nodes into a vector which we sort on insertion.
-  std::vector<Index> offsets;
-  offsets.reserve(numReset);
-  for(auto& n : mNodes)
-  {
-    if(!n)
-    {
-      offsets.push_back(std::distance(mNodes.data(), &n));
-    }
-  }
-
-  // Erase dead nodes as they don't have to be processed anymore.
-  mNodes.erase(std::remove(mNodes.begin(), mNodes.end(), decltype(mNodes)::value_type()), mNodes.end());
-
-  // Offset all indices (parent and child) by the index they'd sort into in offsets.
-  enum
-  {
-    INDEX_FOR_REMOVAL = INVALID_INDEX
-  };
-  auto offsetter = [&offsets](Index& i) {
-    auto iFind = std::lower_bound(offsets.begin(), offsets.end(), i);
-    if(iFind != offsets.end() && *iFind == i)
-    {
-      LOGD(("marking %d for removal.", i));
-      i = INDEX_FOR_REMOVAL;
-      return false;
-    }
-    else
-    {
-      auto distance = std::distance(offsets.begin(), iFind);
-      if(distance > 0)
-      {
-        LOGD(("offsetting %d by %d.", i, distance));
-        i -= distance;
-      }
-      return true;
-    }
-  };
-
-  for(auto& nd : mNodes)
-  {
-    bool parentOffsetResult = offsetter(nd->mParentIdx);
-    DALI_ASSERT_ALWAYS(parentOffsetResult); // since nodes were recursively removed, we should not be finding invalid parents at this point.
-
-    auto& children = nd->mChildren;
-    for(auto i0 = children.begin(), i1 = children.end(); i0 != i1; ++i0)
-    {
-      offsetter(*i0);
-    }
-
-    children.erase(std::remove(children.begin(), children.end(), INDEX_FOR_REMOVAL), children.end());
-  }
-
-  return true;
-}
-
-void SceneDefinition::GetNodeModelStack(Index index, MatrixStack& model) const
-{
-  auto&                    thisNodes  = mNodes;
-  std::function<void(int)> buildStack = [&model, &thisNodes, &buildStack](int i) {
-    auto node = thisNodes[i].get();
-    if(node->mParentIdx != INVALID_INDEX)
-    {
-      buildStack(node->mParentIdx);
-    }
-    model.Push(node->GetLocalSpace());
-  };
-  buildStack(index);
-}
-
-NodeDefinition* SceneDefinition::FindNode(const std::string& name, Index* outIndex)
-{
-  auto iBegin = mNodes.begin();
-  auto iEnd   = mNodes.end();
-  auto iFind  = std::find_if(iBegin, iEnd, [&name](const std::unique_ptr<NodeDefinition>& nd) {
-    return nd->mName == name;
-  });
-
-  auto result = iFind != iEnd ? iFind->get() : nullptr;
-  if(result && outIndex)
-  {
-    *outIndex = std::distance(iBegin, iFind);
-  }
-  return result;
-}
-
-const NodeDefinition* SceneDefinition::FindNode(const std::string& name, Index* outIndex) const
-{
-  auto iBegin = mNodes.begin();
-  auto iEnd   = mNodes.end();
-  auto iFind  = std::find_if(iBegin, iEnd, [&name](const std::unique_ptr<NodeDefinition>& nd) {
-    return nd->mName == name;
-  });
-
-  auto result = iFind != iEnd ? iFind->get() : nullptr;
-  if(result && outIndex)
-  {
-    *outIndex = std::distance(iBegin, iFind);
-  }
-  return result;
-}
-
-Index SceneDefinition::FindNodeIndex(const NodeDefinition& node) const
-{
-  auto iBegin = mNodes.begin();
-  auto iEnd   = mNodes.end();
-  auto iFind  = std::find_if(iBegin, iEnd, [&node](const std::unique_ptr<NodeDefinition>& n) {
-    return n.get() == &node;
-  });
-  return iFind != iEnd ? std::distance(iBegin, iFind) : INVALID_INDEX;
-}
-
-void SceneDefinition::FindNodes(NodePredicate predicate, NodeConsumer consumer, unsigned int limit)
-{
-  unsigned int n = 0;
-  for(auto& defp : mNodes)
-  {
-    if(predicate(*defp))
-    {
-      consumer(*defp);
-      ++n;
-      if(n == limit)
-      {
-        break;
-      }
-    }
-  }
-}
-
-void SceneDefinition::FindNodes(NodePredicate predicate, ConstNodeConsumer consumer, unsigned int limit) const
-{
-  unsigned int n = 0;
-  for(auto& defp : mNodes)
-  {
-    if(predicate(*defp))
-    {
-      consumer(*defp);
-      ++n;
-      if(n == limit)
-      {
-        break;
-      }
-    }
-  }
-}
-
-void SceneDefinition::ApplyConstraints(Actor&                           root,
-                                       std::vector<ConstraintRequest>&& constrainables,
-                                       StringCallback                   onError) const
-{
-  for(auto& cr : constrainables)
-  {
-    auto&           nodeDef    = mNodes[cr.mConstraint->mSourceIdx];
-    auto            sourceName = nodeDef->mName.c_str();
-    Property::Index iTarget    = cr.mTarget.GetPropertyIndex(cr.mConstraint->mProperty);
-    if(iTarget != Property::INVALID_INDEX)
-    {
-      auto propertyType = cr.mTarget.GetPropertyType(iTarget);
-      auto iFind        = sConstraintFactory.find(propertyType);
-      if(iFind == sConstraintFactory.end())
-      {
-        onError(FormatString("node '%s': Property '%s' has unsupported type '%s'; ignored.",
-                             sourceName,
-                             cr.mConstraint->mProperty.c_str(),
-                             PropertyTypes::GetName(propertyType)));
-        continue;
-      }
-
-      Constraint constraint = iFind->second(cr.mTarget, iTarget);
-
-      Actor source = root.FindChildByName(nodeDef->mName);
-      if(!source)
-      {
-        auto targetName = cr.mTarget.GetProperty(Actor::Property::NAME).Get<std::string>();
-        onError(FormatString("node '%s': Failed to locate constraint source %s@%s; ignored.",
-                             sourceName,
-                             cr.mConstraint->mProperty.c_str(),
-                             targetName.c_str()));
-        continue;
-      }
-      else if(source == cr.mTarget)
-      {
-        onError(FormatString("node '%s': Cyclic constraint definition for property '%s'; ignored.",
-                             sourceName,
-                             cr.mConstraint->mProperty.c_str()));
-        continue;
-      }
-
-      Property::Index iSource = source.GetPropertyIndex(cr.mConstraint->mProperty);
-      constraint.AddSource(Source{source, iSource});
-      constraint.Apply();
-    }
-    else
-    {
-      auto targetName = cr.mTarget.GetProperty(Actor::Property::NAME).Get<std::string>();
-      onError(FormatString("node '%s': Failed to create constraint for property %s@%s; ignored.",
-                           sourceName,
-                           cr.mConstraint->mProperty.c_str(),
-                           targetName.c_str()));
-    }
-  }
-}
-
-void SceneDefinition::ConfigureSkeletonJoints(uint32_t iRoot, const SkeletonDefinition::Vector& skeletons, Actor root) const
-{
-  // 1, For each skeleton, for each joint, walk upwards until we reach mNodes[iRoot]. If we do, record +1
-  // to the refcount of each node we have visited, in our temporary registry. Those with refcount 1
-  // are the leaves, while the most descendant node with the highest refcount is the root of the skeleton.
-  std::map<Index, std::vector<Index>> rootsJoints;
-  std::vector<Index>                  path;
-  path.reserve(16);
-  for(auto& s : skeletons)
-  {
-    std::map<uint32_t, uint32_t> jointRefs;
-    for(auto& j : s.mJoints)
-    {
-      auto nodeIdx = j.mNodeIdx;
-      do // Traverse upwards and record each node we have visited until we reach the scene root.
-      {
-        path.push_back(nodeIdx);
-        if(nodeIdx == iRoot)
-        {
-          break;
-        }
-        auto node = GetNode(nodeIdx);
-        nodeIdx   = node->mParentIdx;
-      } while(nodeIdx != INVALID_INDEX);
-
-      if(nodeIdx == iRoot) // If the joint is in the correct scene, increment the reference count for all visited nodes.
-      {
-        for(auto i : path)
-        {
-          ++jointRefs[i];
-        }
-      }
-
-      path.clear();
-    }
-
-    // Only record the skeleton if we have encountered the root of the current scene.
-    if(jointRefs.empty())
-    {
-      continue;
-    }
-
-    Index    root   = s.mRootNodeIdx;
-    uint32_t maxRef = 0;
-    auto     iFind  = jointRefs.find(root);
-    if(iFind != jointRefs.end())
-    {
-      maxRef = iFind->second;
-    }
-
-    std::vector<Index> joints;
-    for(auto& j : jointRefs) // NOTE: jointRefs are sorted, so joints will also be.
-    {
-      // The most descendant node with the highest ref count is the root of the skeleton.
-      if(j.second > maxRef || (j.second == maxRef && IsAncestor(*this, root, j.first, iRoot)))
-      {
-        maxRef = j.second;
-
-        RemoveFromSorted(joints, root);
-        root = j.first;
-      }
-      else if(j.second == 1) // This one's a leaf.
-      {
-        InsertUniqueSorted(joints, j.first);
-      }
-    }
-
-    // Merge skeletons that share the same root.
-    auto& finalJoints = rootsJoints[root];
-    for(auto j : joints)
-    {
-      if(std::find_if(finalJoints.begin(), finalJoints.end(), [this, j, root](Index jj) {
-           return IsAncestor(*this, j, jj, root);
-         }) != finalJoints.end())
-      {
-        continue; // if the joint is found to be an ancestor of another joint already registered, move on.
-      }
-
-      auto i = j;
-      while(i != root) // See if the current joint is a better leaf, i.e. descended from another leaf - which we'll then remove.
-      {
-        auto node = GetNode(i);
-        i         = node->mParentIdx;
-
-        RemoveFromSorted(finalJoints, i);
-      }
-
-      InsertUniqueSorted(finalJoints, j);
-    }
-  }
-
-  // 2, Merge records where one root joint is descendant of another. Handle leaf node changes - remove previous
-  // leaf nodes that now have descendants, and add new ones.
-  auto iRoots    = rootsJoints.begin();
-  auto iRootsEnd = rootsJoints.end();
-  while(iRoots != iRootsEnd)
-  {
-    auto i      = iRoots->first;
-    bool merged = false;
-    while(i != iRoot) // Starting with the root joint of the skeleton, traverse upwards.
-    {
-      auto node = GetNode(i);
-      i         = node->mParentIdx;
-
-      auto iFind = rootsJoints.find(i);
-      if(iFind != rootsJoints.end()) // Check if we've reached the root of another skeleton.
-      {
-        // Now find out which leaf of iFind is an ancestor, if any.
-        auto iFindLeaf = std::find_if(iFind->second.begin(), iFind->second.end(), [this, iRoots, iFind](Index j) {
-          return IsAncestor(*this, j, iRoots->first, iFind->first);
-        });
-        if(iFindLeaf != iFind->second.end())
-        {
-          iFind->second.erase(iFindLeaf); // Will no longer be a leaf -- remove it.
-        }
-
-        // Merge iRoots with iFind
-        auto& targetJoints = iFind->second;
-        if(iRoots->second.empty()) // The root is a leaf.
-        {
-          InsertUniqueSorted(targetJoints, iRoots->first);
-        }
-        else
-          for(auto j : iRoots->second)
-          {
-            InsertUniqueSorted(targetJoints, j);
-          }
-
-        merged = true;
-        break; // Traverse no more
-      }
-    }
-
-    iRoots = merged ? rootsJoints.erase(iRoots) : std::next(iRoots);
-  }
-
-  // 3, For each root, register joint matrices and constraints
-  for(auto r : rootsJoints)
-  {
-    auto node      = GetNode(r.first);
-    auto rootJoint = root.FindChildByName(node->mName);
-    DALI_ASSERT_ALWAYS(!!rootJoint);
-
-    DALI_ASSERT_DEBUG(rootJoint.GetPropertyIndex(JOINT_MATRIX) == Property::INVALID_INDEX);
-    auto       propJointMatrix = rootJoint.RegisterProperty(JOINT_MATRIX, Matrix{false});
-    Constraint constraint      = Constraint::New<Matrix>(rootJoint, propJointMatrix, [](Matrix& output, const PropertyInputContainer& inputs) {
-      output.SetTransformComponents(Vector3::ONE, inputs[0]->GetQuaternion(), inputs[1]->GetVector3());
-    });
-    constraint.AddSource(Source(rootJoint, Actor::Property::ORIENTATION));
-    constraint.AddSource(Source(rootJoint, Actor::Property::POSITION));
-    constraint.Apply();
-
-    for(auto j : r.second)
-    {
-      node       = GetNode(j);
-      auto joint = rootJoint.FindChildByName(node->mName);
-      ConfigureJointMatrix(joint, rootJoint, propJointMatrix);
-    }
-  }
-}
-
-void SceneDefinition::EnsureUniqueSkinningShaderInstances(ResourceBundle& resources) const
-{
-  std::map<Index, std::map<Index, std::vector<Index*>>> skinningShaderUsers;
-  for(auto& node : mNodes)
-  {
-    if(node->mRenderable)
-    {
-      ResourceReflector reflector;
-      node->mRenderable->ReflectResources(reflector);
-
-      if(reflector.iMesh)
-      {
-        const auto& mesh = resources.mMeshes[*reflector.iMesh].first;
-        if(mesh.IsSkinned())
-        {
-          skinningShaderUsers[*reflector.iShader][mesh.mSkeletonIdx].push_back(reflector.iShader);
-        }
-      }
-    }
-  }
-
-  // For each shader, and each skeleton using the same shader as the first skeleton,
-  // update the shader references (from nodes with skinned meshes) with a new copy of
-  // the shader definition from the node using the first skeleton.
-  for(auto& users : skinningShaderUsers)
-  {
-    auto& skeletons    = users.second;
-    auto  iterSkeleton = skeletons.begin();
-    // skipping the first skeleton.
-    ++iterSkeleton;
-
-    resources.mShaders.reserve(resources.mShaders.size() + std::distance(iterSkeleton, skeletons.end()));
-    const ShaderDefinition& shaderDef = resources.mShaders[users.first].first;
-
-    while(iterSkeleton != skeletons.end())
-    {
-      Index iShader = resources.mShaders.size();
-      resources.mShaders.push_back({shaderDef, Shader()});
-
-      for(auto& i : iterSkeleton->second)
-      {
-        *i = iShader;
-      }
-      ++iterSkeleton;
-    }
-  }
-}
-
-void SceneDefinition::ConfigureSkinningShaders(const ResourceBundle&                             resources,
-                                               Actor                                             rootActor,
-                                               std::vector<SkinningShaderConfigurationRequest>&& requests) const
-{
-  if(requests.empty())
-  {
-    return;
-  }
-
-  SortAndDeduplicateSkinningRequests(requests);
-
-  for(auto& i : requests)
-  {
-    auto& skeleton = resources.mSkeletons[i.mSkeletonIdx];
-    if(skeleton.mJoints.empty())
-    {
-      LOGD(("Skeleton %d has no joints.", i.mSkeletonIdx));
-      continue;
-    }
-
-    Index boneIdx = 0;
-    for(auto& j : skeleton.mJoints)
-    {
-      auto  node  = GetNode(j.mNodeIdx);
-      Actor actor = rootActor.FindChildByName(node->mName);
-      ConfigureBoneMatrix(j.mInverseBindMatrix, actor, i.mShader, boneIdx);
-    }
-  }
-}
-
-bool SceneDefinition::ConfigureBlendshapeShaders(const ResourceBundle&                               resources,
-                                                 Actor                                               rootActor,
-                                                 std::vector<BlendshapeShaderConfigurationRequest>&& requests,
-                                                 StringCallback                                      onError) const
-{
-  if(requests.empty())
-  {
-    return true;
-  }
-
-  // Sort requests by shaders.
-  std::sort(requests.begin(), requests.end());
-
-  // Remove duplicates.
-  auto   i    = requests.begin();
-  auto   iEnd = requests.end();
-  Shader s    = i->mShader;
-  ++i;
-  do
-  {
-    // Multiple identical shader instances are removed.
-    while(i != iEnd && i->mShader == s)
-    {
-      i->mShader = Shader();
-      ++i;
-    }
-
-    if(i == iEnd)
-    {
-      break;
-    }
-    s = i->mShader;
-    ++i;
-  } while(true);
-
-  requests.erase(std::remove_if(requests.begin(), requests.end(), [](const BlendshapeShaderConfigurationRequest& bscr) {
-                   return !bscr.mShader;
-                 }),
-                 requests.end());
-
-  // Configure the rest.
-  bool ok = true;
-
-  for(auto& i : requests)
-  {
-    Index iNode;
-    if(FindNode(i.mNodeName, &iNode))
-    {
-      const auto& node = GetNode(iNode);
-
-      const auto& mesh = resources.mMeshes[i.mMeshIdx];
-
-      if(mesh.first.HasBlendShapes())
-      {
-        Actor actor = rootActor.FindChildByName(node->mName);
-
-        // Sets the property to be animated.
-        BlendShapes::ConfigureProperties(mesh, i.mShader, actor);
-      }
-    }
-  }
-
-  return ok;
-}
-
-void SceneDefinition::EnsureUniqueBlendShapeShaderInstances(ResourceBundle& resources) const
-{
-  std::map<Index, std::map<std::string, std::vector<Index*>>> blendShapeShaderUsers;
-  for(auto& node : mNodes)
-  {
-    if(node->mRenderable)
-    {
-      ResourceReflector reflector;
-      node->mRenderable->ReflectResources(reflector);
-
-      if(reflector.iMesh)
-      {
-        const auto& mesh = resources.mMeshes[*reflector.iMesh].first;
-        if(mesh.HasBlendShapes())
-        {
-          blendShapeShaderUsers[*reflector.iShader][node->mName].push_back(reflector.iShader);
-        }
-      }
-    }
-  }
-
-  for(auto& users : blendShapeShaderUsers)
-  {
-    resources.mShaders.reserve(resources.mShaders.size() + users.second.size() - 1u);
-    const ShaderDefinition& shaderDef = resources.mShaders[users.first].first;
-
-    auto nodesIt    = users.second.begin();
-    auto nodesEndIt = users.second.end();
-    // skipping the first node.
-    ++nodesIt;
-    while(nodesIt != nodesEndIt)
-    {
-      Index iShader = resources.mShaders.size();
-      resources.mShaders.push_back({shaderDef, Shader()});
-
-      auto& nodes = *nodesIt;
-      for(auto& shader : nodes.second)
-      {
-        *shader = iShader;
-      }
-      ++nodesIt;
-    }
-  }
-}
-
-SceneDefinition& SceneDefinition::operator=(SceneDefinition&& other)
-{
-  SceneDefinition temp(std::move(other));
-  std::swap(mNodes, temp.mNodes);
-  std::swap(mRootNodeIds, temp.mRootNodeIds);
-  return *this;
-}
-
-bool SceneDefinition::FindNode(const std::string& name, std::unique_ptr<NodeDefinition>** result)
-{
-  // We're searching from the end assuming a higher probability of operations targeting
-  // recently added nodes. (conf.: root, which is immovable, cannot be removed, and was
-  // the first to be added, is index 0.)
-  auto iFind = std::find_if(mNodes.rbegin(), mNodes.rend(), [&name](const std::unique_ptr<NodeDefinition>& nd) {
-                 return nd->mName == name;
-               }).base();
-
-  const bool success = iFind != mNodes.begin();
-  if(success && result)
-  {
-    --iFind;
-    *result = &*iFind;
-  }
-
-  return success;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/scene-definition.h b/dali-scene-loader/public-api/scene-definition.h
deleted file mode 100644
index 192d8d4..0000000
--- a/dali-scene-loader/public-api/scene-definition.h
+++ /dev/null
@@ -1,278 +0,0 @@
-#ifndef DALI_SCENE_LOADER_SCENE_DEFINITION_H_
-#define DALI_SCENE_LOADER_SCENE_DEFINITION_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/customization.h"
-#include "dali-scene-loader/public-api/node-definition.h"
-#include "dali-scene-loader/public-api/string-callback.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-// EXTERNAL INCLUDES
-#include <memory>
-#include <string>
-#include "dali/public-api/actors/actor.h"
-#include "dali/public-api/math/matrix.h"
-#include "dali/public-api/math/quaternion.h"
-#include "dali/public-api/math/vector4.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-class MatrixStack;
-
-/*
- * @brief Intermediate representation of a scene with functionality required to
- *  create DALi objects (Actors, Renderers) from it.
- */
-class DALI_SCENE_LOADER_API SceneDefinition
-{
-public: // TYPES
-  using NodePredicate     = std::function<bool(const NodeDefinition&)>;
-  using NodeConsumer      = std::function<void(NodeDefinition&)>;
-  using ConstNodeConsumer = std::function<void(const NodeDefinition&)>;
-
-public: // METHODS
-  SceneDefinition();
-  SceneDefinition(SceneDefinition&& other);
-  ~SceneDefinition();
-
-  /*
-   * @brief Registers a scene root node.
-   * @return The index of the scene root node *registration*.
-   */
-  Index AddRootNode(Index iNode);
-
-  /*
-   * @return the list of scene root node IDs in the order of their loading.
-   */
-  const std::vector<Index>& GetRoots() const;
-
-  /*
-   * @brief Removes scene root registration at the given index @a iRoot.
-   * @note @a iRoot is the index of the registration (i.e. into the vector returned by GetRoots()),
-   *  not of the node.
-   */
-  void RemoveRootNode(Index iRoot);
-
-  /*
-   * @return The number of node( definition)s in the scene.
-   */
-  uint32_t GetNodeCount() const;
-
-  /*
-   * @return Const pointer to the node (definition) at the given index.
-   */
-  const NodeDefinition* GetNode(Index iNode) const;
-
-  /*
-   * @return Pointer to the node (definition) at the given index.
-   */
-  NodeDefinition* GetNode(Index iNode);
-
-  /*
-   * @brief Traverses the scene starting from the node at the given index into
-   *  nodes, using the given customization @a choices and the visitor @a v.
-   */
-  void Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IVisitor& v);
-
-  /*
-   * @brief Traverses the scene starting from the node at the given index into
-   *  nodes, using the given customization @a choices and the visitor @a v.
-   */
-  void Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IConstVisitor& v) const;
-
-  /*
-   * @brief Counts the references to meshes, shaders, materials that nodes in
-   *  the scene are holding, writing the results into @a refCounts.
-   * @note @a refCounts' entries must have the correct size. Use ResourceBundle::GetRefCounter().
-   */
-  void CountResourceRefs(Index iNode, const Customization::Choices& choices, ResourceRefCounts& refCounts) const;
-
-  /*
-   * @brief Given a bundle of @a resources that are loaded, and customization
-   *  @a choices, this method traverses the scene, creating the actors and renderers
-   *  from node definitions.
-   * @return Handle to the root actor.
-   */
-  Actor CreateNodes(Index iNode, const Customization::Choices& choices, NodeDefinition::CreateParams& params) const;
-
-  /*
-   * @brief Creates / update a registry of mappings from customization tags to
-   *  a lists of names of customizable nodes under each tag, and the number of
-   *  options. If @a outMissingChoices was specified, each tag that it encounters
-   *  in the scene but not in @a choices, will be registered on it with the default
-   *  choice of 0.
-   */
-  void GetCustomizationOptions(const Customization::Choices& choices,
-                               Customization::Map&           outCustomizationOptions,
-                               Customization::Choices*       outMissingChoices) const;
-
-  /*
-   * @brief Attempts to add @a nodeDef to the end of nodes, and its index to the end of
-   *  its parent's list of children (if iParent != NodeDefinition::INVALID_PARENT).
-   * @return If the operation was successful - which requires nodeDef->name to be unique -
-   *  a pointer to the stored node definition; nullptr otherwise.
-   */
-  NodeDefinition* AddNode(std::unique_ptr<NodeDefinition>&& nodeDef);
-
-  /*
-   * @brief Moves the node to some other parent and / or to a different index.
-   * @return Whether the operation was successful.
-   * @note This is currently breaking an assumption of never having a child of a node at a lower
-   *  index as that of the node itself, due to the fact that we're only changing parent ids (and
-   *  entries into the vector of children of node definitions), to save the complication of having
-   *  to move about, and offset indices to, everything past the reparented node. This should be
-   *  sufficient AT LEAST AS LONG AS we recreate the SceneDefinition when loading the scene; if
-   *  we ever needed to serialize it, we should ensure correct ordering of nodes.
-   */
-  bool ReparentNode(const std::string& name, const std::string& newParentName, Index siblingOrder);
-
-  /*
-   * @brief Removes a node with the given name, including all of its children, and updating
-   *  the indices on all remaining node definitions.
-   * @return Whether the operation was successful.
-   */
-  bool RemoveNode(const std::string& name);
-
-  /*
-   * @brief Builds the model matrix stack for the node at the given @a index.
-   * @note It only pushes new matrices; does not require the stack to be empty (or cares if it was not).
-   */
-  void GetNodeModelStack(Index index, MatrixStack& model) const;
-
-  /*
-   * @brief Attempts to find the definition of a node with the given @a name. Only upon
-   *  success, and if @a outIndex is non-null, the index of the node is written to it.
-   * @return Pointer to the node definition; nullptr if not found.
-   * @note No ownership transfer.
-   */
-  NodeDefinition* FindNode(const std::string& name, Index* outIndex = nullptr);
-
-  /*
-   * @brief Attempts to find the definition of a node with the given @a name. Only upon
-   *  success, and if @a outIndex is non-null, the index of the node is written to it.
-   * @return Pointer to the node definition; nullptr if not found.
-   * @note No ownership transfer.
-   */
-  const NodeDefinition* FindNode(const std::string& name, Index* outIndex = nullptr) const;
-
-  /*
-   * @return The index of the given NodeDefinition@ a node, or -1 if the node definition
-   *  was not found.
-   */
-  Index FindNodeIndex(const NodeDefinition& node) const;
-
-  /*
-   * @brief Calls @a consumer with up to @a limit NodeDefinitions that evaluate to true
-   *  with @a predicate.
-   * @note A @a limit value of 0 means no limit.
-   */
-  void FindNodes(NodePredicate predicate, NodeConsumer consumer, unsigned int limit = 0);
-
-  /*
-   * @brief Calls @a consumer with up to @a limit NodeDefinitions that evaluate to true
-   *  with @a predicate.
-   * @note A @a limit value of 0 means no limit.
-   */
-  void FindNodes(NodePredicate predicate, ConstNodeConsumer consumer, unsigned int limit = 0) const;
-
-  /*
-   * @brief Applies constraints from the given requests.
-   */
-  void ApplyConstraints(Actor&                           root,
-                        std::vector<ConstraintRequest>&& constrainables,
-                        StringCallback                   onError = DefaultErrorCallback) const;
-
-  /*
-   * @brief Sets up joint matrix properties and constraints on actors that are involved in skeletal
-   *  animation (i.e. those that are between (inclusive) the lower and upper bounds of any skeleton),
-   *  to ensure the correct update of meshes skinned to these skeletons.
-   * @param iRoot The index of the scene root node. Skeletons that aren't descendants of this node
-   *  will be ignored.
-   * @param skeletons The list of skeletons that require setting up.
-   * @param rootActor The Actor corresponding to the root node, which will be used to locate
-   *  other actors.
-   */
-  void ConfigureSkeletonJoints(uint32_t iRoot, const SkeletonDefinition::Vector& skeletons, Actor rootActor) const;
-
-  /*
-   * @brief Ensures that there is no overlap between shaders used by nodes that have
-   *  meshes skinned to different skeletons.
-   */
-  void EnsureUniqueSkinningShaderInstances(ResourceBundle& resources) const;
-
-  /*
-   * @brief Performs the configuration of the given skinning shaders with the given skeleton
-   *   This means that the absolute transforms of the joints are calculated and set as one of
-   *   the uniforms in the mat4 @b uBone array (in depth first traversal). Further, the following
-   *   are created:<br />
-   *   - a @b jointMatrix property on each joint Actor;<br />
-   *   - constraint from the Actor's local position and rotation (and if it has a @e joint
-   *     parent, the jointMatrix of the parent) to its @b jointMatrix property;<br />
-   *   - a constraint from the the Actor's @b jointMatrix property to the related entry in
-   *     the shader's @b uBone property;<br />
-   *   This ensures the automatic update of the skeletal animation, should any of the joints'
-   *   transform changes, by whatever means.
-   * @return The success of the operations. Error messages will be posted to the optional
-   *   @a onError callback.
-   * @note A maximum of SkinningDetails::MAX_JOINTS joints per skeleton are supported at the moment.
-   * @note Even if multiple skinned meshes use the same skinning shader, the correct number
-   *   of separate instances need to be declared in the .dli to avoid clashing uniform
-   *   definitions and constraints.
-   */
-  void ConfigureSkinningShaders(const ResourceBundle&                             resources,
-                                Actor                                             root,
-                                std::vector<SkinningShaderConfigurationRequest>&& requests) const;
-
-  /*
-   * @brief Ensures there is no two meshes with blend shapes sharing the same shader.
-   */
-  void EnsureUniqueBlendShapeShaderInstances(ResourceBundle& resources) const;
-
-  /**
-   * @brief Performs the configuration of the given blend shapes.
-   *
-   * For each node with blend shapes it registers into the actor the weights properties for each morph target
-   * and some needed uniforms into the shader.
-   * 
-   * @param[in] root The root actor.
-   * @param[in] requests The requests to configure blend shapes.
-   * @param[in] resources The resources bundle. Meshes need to be accessed to configure the blend shapes.
-   * @param[in] onError The error callback.
-   */
-  bool ConfigureBlendshapeShaders(const ResourceBundle&                               resources,
-                                  Actor                                               root,
-                                  std::vector<BlendshapeShaderConfigurationRequest>&& requests,
-                                  StringCallback                                      onError = DefaultErrorCallback) const;
-
-  SceneDefinition& operator=(SceneDefinition&& other);
-
-private: // METHODS
-  bool FindNode(const std::string& name, std::unique_ptr<NodeDefinition>** result);
-
-private:                                               // DATA
-  std::vector<std::unique_ptr<NodeDefinition>> mNodes; // size unknown up front (may discard nodes).
-  std::vector<Index>                           mRootNodeIds;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_SCENE_DEFINITION_H_
diff --git a/dali-scene-loader/public-api/shader-definition-factory.cpp b/dali-scene-loader/public-api/shader-definition-factory.cpp
deleted file mode 100644
index 843fbcf..0000000
--- a/dali-scene-loader/public-api/shader-definition-factory.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/shader-definition-factory.h"
-#include <cstring>
-#include "dali-scene-loader/internal/hash.h"
-#include "dali-scene-loader/public-api/blend-shape-details.h"
-#include "dali-scene-loader/public-api/node-definition.h"
-#include "dali/devel-api/common/map-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-struct ResourceReceiver : IResourceReceiver
-{
-  const ResourceBundle&     mResources;
-  const MeshDefinition*     mMeshDef     = nullptr;
-  const MaterialDefinition* mMaterialDef = nullptr;
-
-  ResourceReceiver(const ResourceBundle& resources)
-  : mResources(resources)
-  {
-  }
-
-  void Register(ResourceType::Value type, Index id) override
-  {
-    switch(type)
-    {
-      case ResourceType::Mesh:
-        mMeshDef = &mResources.mMeshes[id].first;
-        break;
-
-      case ResourceType::Material:
-        mMaterialDef = &mResources.mMaterials[id].first;
-        break;
-
-      default:
-        break;
-    }
-  }
-};
-
-const std::string PBR_SHADER_NAME = "dli_pbr";
-
-void RetrieveBlendShapeComponents(const std::vector<MeshDefinition::BlendShape>& blendShapes, bool& hasPositions, bool& hasNormals, bool& hasTangents)
-{
-  for(const auto& blendShape : blendShapes)
-  {
-    hasPositions = hasPositions || blendShape.deltas.IsDefined();
-    hasNormals   = hasNormals || blendShape.normals.IsDefined();
-    hasTangents  = hasTangents || blendShape.tangents.IsDefined();
-  }
-}
-
-uint64_t HashNode(const NodeDefinition& nodeDef, const MaterialDefinition& materialDef, const MeshDefinition& meshDef)
-{
-  Hash hash;
-
-  // note: could be per vertex / fragment component - in WatchViewer, these have the same name.
-  hash.Add(PBR_SHADER_NAME);
-
-  const bool hasTransparency = MaskMatch(materialDef.mFlags, MaterialDefinition::TRANSPARENCY);
-  hash.Add(hasTransparency);
-
-  if(hasTransparency ||
-     materialDef.CheckTextures(MaterialDefinition::ALBEDO) ||
-     materialDef.CheckTextures(MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS) ||
-     materialDef.CheckTextures(MaterialDefinition::NORMAL))
-  {
-    hash.Add("3TEX");
-  }
-
-  if(materialDef.GetAlphaCutoff() > 0.f)
-  {
-    hash.Add("ALPH" /*A_TEST*/);
-  }
-
-  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SUBSURFACE))
-  {
-    hash.Add("SSS");
-  }
-
-  if(MaskMatch(materialDef.mFlags, MaterialDefinition::GLTF_CHANNELS))
-  {
-    hash.Add("GLTF" /*_CHANNELS*/);
-  }
-
-  if(meshDef.IsSkinned())
-  {
-    hash.Add("SKIN" /*NING*/);
-  }
-
-  if(MaskMatch(meshDef.mFlags, MeshDefinition::FLIP_UVS_VERTICAL))
-  {
-    hash.Add("FLIP" /*_V*/);
-  }
-
-  if(meshDef.HasBlendShapes())
-  {
-    bool hasPositions = false;
-    bool hasNormals   = false;
-    bool hasTangents  = false;
-    RetrieveBlendShapeComponents(meshDef.mBlendShapes, hasPositions, hasNormals, hasTangents);
-    if(hasPositions)
-    {
-      hash.Add("MORPHPOS");
-    }
-
-    if(hasNormals)
-    {
-      hash.Add("MORPHNOR");
-    }
-
-    if(hasTangents)
-    {
-      hash.Add("MORPHTAN");
-    }
-
-    if(hasPositions || hasNormals || hasTangents)
-    {
-      hash.Add("MORPH");
-
-      if(BlendShapes::Version::VERSION_2_0 == meshDef.mBlendShapeVersion)
-      {
-        hash.Add("MORPHV2");
-      }
-    }
-  }
-
-  return hash;
-}
-} // namespace
-
-struct ShaderDefinitionFactory::Impl
-{
-  ResourceBundle*           mResources; // no ownership
-  std::map<uint64_t, Index> mShaderMap;
-};
-
-ShaderDefinitionFactory::ShaderDefinitionFactory()
-: mImpl{new Impl()}
-{
-}
-
-ShaderDefinitionFactory::~ShaderDefinitionFactory() = default;
-
-void ShaderDefinitionFactory::SetResources(ResourceBundle& resources)
-{
-  mImpl->mResources = &resources;
-  mImpl->mShaderMap.clear();
-}
-
-Index ShaderDefinitionFactory::ProduceShader(const NodeDefinition& nodeDef)
-{
-  DALI_ASSERT_DEBUG(nodeDef.mRenderable);
-
-  auto&            resources = *mImpl->mResources;
-  ResourceReceiver receiver{resources};
-  nodeDef.mRenderable->RegisterResources(receiver);
-  if(!(receiver.mMeshDef && receiver.mMaterialDef))
-  {
-    return INVALID_INDEX;
-  }
-
-  auto&    shaderMap = mImpl->mShaderMap;
-  uint64_t hash      = HashNode(nodeDef, *receiver.mMaterialDef, *receiver.mMeshDef);
-  auto     iFind     = shaderMap.find(hash);
-  if(iFind != shaderMap.end())
-  {
-    return iFind->second;
-  }
-
-  ShaderDefinition shaderDef;
-  shaderDef.mVertexShaderPath   = PBR_SHADER_NAME + ".vsh";
-  shaderDef.mFragmentShaderPath = PBR_SHADER_NAME + ".fsh";
-  shaderDef.mRendererState      = RendererState::DEPTH_TEST | RendererState::DEPTH_WRITE | RendererState::CULL_BACK;
-
-  auto&      materialDef     = *receiver.mMaterialDef;
-  const bool hasTransparency = MaskMatch(materialDef.mFlags, MaterialDefinition::TRANSPARENCY);
-  if(hasTransparency)
-  {
-    // TODO: this requires more granularity
-    shaderDef.mRendererState = (shaderDef.mRendererState | RendererState::ALPHA_BLEND) & ~RendererState::DEPTH_WRITE;
-  }
-
-  if(hasTransparency ||
-     materialDef.CheckTextures(MaterialDefinition::ALBEDO) ||
-     materialDef.CheckTextures(MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS) ||
-     materialDef.CheckTextures(MaterialDefinition::NORMAL))
-  {
-    shaderDef.mDefines.push_back("THREE_TEX");
-  }
-
-  if(materialDef.GetAlphaCutoff() > 0.f)
-  {
-    shaderDef.mDefines.push_back("ALPHA_TEST");
-  }
-
-  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SUBSURFACE))
-  {
-    shaderDef.mDefines.push_back("SSS");
-  }
-
-  if(MaskMatch(receiver.mMaterialDef->mFlags, MaterialDefinition::GLTF_CHANNELS))
-  {
-    shaderDef.mDefines.push_back("GLTF_CHANNELS");
-  }
-
-  const auto& meshDef = *receiver.mMeshDef;
-  if(meshDef.IsSkinned())
-  {
-    shaderDef.mDefines.push_back("SKINNING");
-  }
-
-  if(MaskMatch(meshDef.mFlags, MeshDefinition::FLIP_UVS_VERTICAL))
-  {
-    shaderDef.mDefines.push_back("FLIP_V");
-  }
-
-  if(meshDef.HasBlendShapes())
-  {
-    bool hasPositions = false;
-    bool hasNormals   = false;
-    bool hasTangents  = false;
-    RetrieveBlendShapeComponents(meshDef.mBlendShapes, hasPositions, hasNormals, hasTangents);
-
-    if(hasPositions)
-    {
-      shaderDef.mDefines.push_back("MORPH_POSITION");
-    }
-
-    if(hasNormals)
-    {
-      shaderDef.mDefines.push_back("MORPH_NORMAL");
-    }
-
-    if(hasTangents)
-    {
-      shaderDef.mDefines.push_back("MORPH_TANGENT");
-    }
-
-    if(hasPositions || hasNormals || hasTangents)
-    {
-      shaderDef.mDefines.push_back("MORPH");
-
-      if(BlendShapes::Version::VERSION_2_0 == meshDef.mBlendShapeVersion)
-      {
-        shaderDef.mDefines.push_back("MORPH_VERSION_2_0");
-      }
-    }
-  }
-
-  shaderDef.mUniforms["uMaxLOD"]     = 6.f;
-  shaderDef.mUniforms["uCubeMatrix"] = Matrix::IDENTITY;
-
-  Index result    = resources.mShaders.size();
-  shaderMap[hash] = result;
-
-  resources.mShaders.emplace_back(std::move(shaderDef), Shader());
-
-  return result;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/shader-definition-factory.h b/dali-scene-loader/public-api/shader-definition-factory.h
deleted file mode 100644
index 387984d..0000000
--- a/dali-scene-loader/public-api/shader-definition-factory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef DALI_SCENE_LOADER_SHADER_DEFINITION_FACTORY_H_
-#define DALI_SCENE_LOADER_SHADER_DEFINITION_FACTORY_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/index.h"
-
-// EXTERNAL INCLUDER
-#include <memory>
-
-namespace Dali
-{
-namespace SceneLoader
-{
-struct NodeDefinition;
-class ResourceBundle;
-
-class DALI_SCENE_LOADER_API ShaderDefinitionFactory
-{
-public:
-  ShaderDefinitionFactory();
-  ~ShaderDefinitionFactory();
-
-  /*
-   * @brief Input for meshes and materials, output for shaders.
-   */
-  void SetResources(ResourceBundle& resources);
-
-  /*
-   * @brief Produces the index of a shader, which should be used to index into the shaders
-   *  vector of the ResourceBundle which was provided for the factory. This shader will be
-   *  created if one with the given settings hasn't been created by the factory yet (shaders
-   *  already existing in the ResourceBundle are ignored), otherwise the index of the previously
-   *  created shader will be returned.
-   */
-  Index ProduceShader(const NodeDefinition& nodeDef);
-
-private:
-  struct Impl;
-  const std::unique_ptr<Impl> mImpl;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_SHADER_DEFINITION_FACTORY_H_
diff --git a/dali-scene-loader/public-api/shader-definition.cpp b/dali-scene-loader/public-api/shader-definition.cpp
deleted file mode 100644
index 73c18ba..0000000
--- a/dali-scene-loader/public-api/shader-definition.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/shader-definition.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-const std::string SHADER_HINT_OUTPUT_IS_TRANSPARENT("OUTPUT_IS_TRANSPARENT"); ///< Might generate transparent alpha from opaque inputs.
-const std::string SHADER_HINT_MODIFIES_GEOMETRY("MODIFIES_GEOMETRY");         ///< Might change position of vertices, this option disables any culling optimizations.
-
-} // namespace
-
-ShaderDefinition::ShaderDefinition(const ShaderDefinition& other)
-: mRendererState(other.mRendererState),
-  mVertexShaderPath(other.mVertexShaderPath),
-  mFragmentShaderPath(other.mFragmentShaderPath),
-  mDefines(other.mDefines),
-  mHints(other.mHints),
-  mUniforms(other.mUniforms)
-{
-}
-
-void ShaderDefinition::ApplyDefine(std::string& shaderCode, const std::string& definevar)
-{
-  const std::string IF_1 = "#if 1";
-
-  std::size_t found = shaderCode.find(definevar);
-  while(found != std::string::npos)
-  {
-    // Greater then "@" character means is a letter,
-    // therefore is not has the definevar we looking for.
-    if((found + definevar.length()) < shaderCode.length() && shaderCode.at(found + definevar.length()) > '@')
-    {
-      found = shaderCode.find(definevar, found + definevar.length());
-      continue;
-    }
-    if(found > 0u && shaderCode.at(found - 1) > '@')
-    {
-      found = shaderCode.find(definevar, found + definevar.length());
-      continue;
-    }
-
-    std::size_t defidx     = shaderCode.rfind("#ifdef", found);
-    std::size_t newlineidx = shaderCode.rfind("\n", found);
-    if(newlineidx < defidx && defidx != std::string::npos)
-    {
-      shaderCode.replace(defidx, found - defidx + definevar.length(), IF_1);
-      found = defidx + IF_1.length();
-    }
-    else
-    {
-      found += definevar.length();
-    }
-    found = shaderCode.find(definevar, found);
-  }
-}
-
-ShaderDefinition::RawData
-ShaderDefinition::LoadRaw(const std::string& shadersPath) const
-{
-  RawData raw;
-
-  bool fail               = false;
-  raw.mVertexShaderSource = LoadTextFile((shadersPath + mVertexShaderPath).c_str(), &fail);
-  if(!fail)
-  {
-    raw.mFragmentShaderSource = LoadTextFile((shadersPath + mFragmentShaderPath).c_str(), &fail);
-    if(!fail)
-    {
-      for(auto definevar : mDefines)
-      {
-        ApplyDefine(raw.mVertexShaderSource, definevar);
-        ApplyDefine(raw.mFragmentShaderSource, definevar);
-      }
-    }
-    else
-    {
-      ExceptionFlinger(ASSERT_LOCATION) << "Failed to load shader source from '" << shadersPath + mFragmentShaderPath << "'.";
-    }
-  }
-  else
-  {
-    ExceptionFlinger(ASSERT_LOCATION) << "Failed to load shader source from '" << shadersPath + mVertexShaderPath << "'.";
-  }
-  return raw;
-}
-
-Shader ShaderDefinition::Load(RawData&& raw) const
-{
-  uint32_t hints = Shader::Hint::NONE;
-  for(const auto& hint : mHints)
-  {
-    if(hint == SHADER_HINT_OUTPUT_IS_TRANSPARENT)
-    {
-      hints |= Shader::Hint::OUTPUT_IS_TRANSPARENT;
-    }
-    else if(hint == SHADER_HINT_MODIFIES_GEOMETRY)
-    {
-      hints |= Shader::Hint::MODIFIES_GEOMETRY;
-    }
-  }
-
-  Shader shader = Shader::New(raw.mVertexShaderSource, raw.mFragmentShaderSource, static_cast<Shader::Hint::Value>(hints));
-  for(Property::Map::SizeType i0 = 0, i1 = mUniforms.Count(); i0 != i1; ++i0)
-  {
-    auto pair = mUniforms.GetKeyValue(i0);
-    DALI_ASSERT_ALWAYS(pair.first.type == Property::Key::STRING);
-    shader.RegisterProperty(pair.first.stringKey, pair.second);
-  }
-
-  return shader;
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/shader-definition.h b/dali-scene-loader/public-api/shader-definition.h
deleted file mode 100644
index d7f390b..0000000
--- a/dali-scene-loader/public-api/shader-definition.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef DALI_SCENE_LOADER_SHADER_DEFINITION_H
-#define DALI_SCENE_LOADER_SHADER_DEFINITION_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/renderer-state.h"
-
-// EXTERNAL INCLUDES
-#include <memory>
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/rendering/shader.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/*
- * @brief Defines a shader with paths to the files which define its
- *  vertex and fragment components, and a mapping of uniform names (which are
- *  used to refer to them in GLSL) to data.
- */
-struct DALI_SCENE_LOADER_API ShaderDefinition
-{
-  using Vector = std::vector<std::pair<ShaderDefinition, Shader>>;
-
-  struct RawData
-  {
-    std::string mVertexShaderSource;
-    std::string mFragmentShaderSource;
-  };
-
-  /*
-   * @brief Apply the defines values to shader.
-   */
-  static void ApplyDefine(std::string& shaderCode, const std::string& definevar);
-
-  ShaderDefinition() = default;
-
-  ShaderDefinition(const ShaderDefinition& other);
-  ShaderDefinition& operator=(const ShaderDefinition& other);
-
-  ShaderDefinition(ShaderDefinition&&) = default;
-  ShaderDefinition& operator=(ShaderDefinition&&) = default;
-
-  /*
-   * @brief Attempts to load the source of the vertex and fragment shaders,
-   *  then performs pre-processing of defines.
-   * @note This may be called from any thread.
-   */
-  RawData LoadRaw(const std::string& shadersPath) const;
-
-  /*
-   * @brief Creates a DALi Shader from the sources in @a raw, traverses
-   *  uniforms to get them to register their data against their name,
-   *  then returns the Shader.
-   * @note This must be called from the event thread.
-   */
-  Shader Load(RawData&& raw) const;
-
-public: // DATA
-  RendererState::Type mRendererState = RendererState::NONE;
-
-  std::string              mVertexShaderPath;
-  std::string              mFragmentShaderPath;
-  std::vector<std::string> mDefines;
-  std::vector<std::string> mHints;
-
-  Property::Map mUniforms;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_SHADER_DEFINITION_H
diff --git a/dali-scene-loader/public-api/skeleton-definition.h b/dali-scene-loader/public-api/skeleton-definition.h
deleted file mode 100644
index 9bd7133..0000000
--- a/dali-scene-loader/public-api/skeleton-definition.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef DALI_SCENE_LOADER_SKELETON_H
-#define DALI_SCENE_LOADER_SKELETON_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/index.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/common/vector-wrapper.h"
-#include "dali/public-api/math/matrix.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/*
- * @brief A set of joints (stored as node indices), and an optional root node index.
- * @note The list of joints must not be empty and must not contain INVALID_INDEX.
- * @note Client code should not change the order of joints, as they are indexed by mesh vertex data.
- * @note Client code should make no assumption about the relation of the joint IDs.
- */
-struct DALI_SCENE_LOADER_API SkeletonDefinition
-{
-  struct Joint
-  {
-    Index  mNodeIdx;
-    Matrix mInverseBindMatrix;
-  };
-
-  using Vector = std::vector<SkeletonDefinition>;
-
-  Index              mRootNodeIdx = INVALID_INDEX;
-  std::vector<Joint> mJoints;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_SKELETON_H
diff --git a/dali-scene-loader/public-api/skinning-details.cpp b/dali-scene-loader/public-api/skinning-details.cpp
deleted file mode 100644
index 0edb58b..0000000
--- a/dali-scene-loader/public-api/skinning-details.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/skinning-details.h"
-#include "dali/public-api/animation/constraints.h"
-#include "dali/public-api/object/property.h"
-#include "dali/public-api/rendering/shader.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-const unsigned int Skinning::MAX_JOINTS = 64;
-
-const std::string Skinning::BONE_UNIFORM_NAME = "uBone";
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/skinning-details.h b/dali-scene-loader/public-api/skinning-details.h
deleted file mode 100644
index 4ad1676..0000000
--- a/dali-scene-loader/public-api/skinning-details.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef DALI_SCENE_LOADER_SKINNING_DETAILS_H_
-#define DALI_SCENE_LOADER_SKINNING_DETAILS_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <string>
-#include "dali/public-api/rendering/shader.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-struct DALI_SCENE_LOADER_API Skinning
-{
-  /*
-   * @brief Upper limit on the number of joints supported.
-   */
-  static const uint32_t MAX_JOINTS;
-
-  /*
-   * @brief Name of bone matrix uniform (array).
-   */
-  static const std::string BONE_UNIFORM_NAME;
-
-  Skinning() = delete;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif // DALI_SCENE_LOADER_SKINNING_DETAILS_H_
diff --git a/dali-scene-loader/public-api/string-callback.cpp b/dali-scene-loader/public-api/string-callback.cpp
deleted file mode 100644
index 8bf02e6..0000000
--- a/dali-scene-loader/public-api/string-callback.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/string-callback.h"
-#include "dali/integration-api/debug.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-void DefaultErrorCallback(const std::string& message)
-{
-  DALI_LOG_ERROR("%s", message.c_str());
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/string-callback.h b/dali-scene-loader/public-api/string-callback.h
deleted file mode 100644
index 5a1d289..0000000
--- a/dali-scene-loader/public-api/string-callback.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef DALI_SCENE_LOADER_STRING_CALLBACK_H
-#define DALI_SCENE_LOADER_STRING_CALLBACK_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <functional>
-#include <string>
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/*
- * @brief A callback to post strings to.
- */
-using StringCallback = std::function<void(const std::string&)>;
-
-/*
- * @brief Simply passes the formatted message to LOGE().
- */
-DALI_SCENE_LOADER_API void DefaultErrorCallback(const std::string& message);
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_STRING_CALLBACK_H
diff --git a/dali-scene-loader/public-api/utils.cpp b/dali-scene-loader/public-api/utils.cpp
deleted file mode 100644
index 4d4396d..0000000
--- a/dali-scene-loader/public-api/utils.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL
-#include "dali-scene-loader/public-api/utils.h"
-
-// EXTERNAL
-#include <stdarg.h>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include "dali/public-api/animation/constraints.h"
-#include "dali/public-api/common/vector-wrapper.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-namespace
-{
-thread_local char sExceptionFlingerMessageBuffer[ExceptionFlinger::MESSAGE_BUFFER_SIZE]{};
-}
-
-StreamBuffer::StreamBuffer(char* buffer, size_t size) noexcept(true)
-{
-  setp(buffer, buffer + size);
-}
-
-ExceptionFlinger::Impl::~Impl() noexcept(false)
-{
-  throw DaliException(mLocation, GetMessageBuffer());
-}
-
-ExceptionFlinger::ExceptionFlinger(const char* location) noexcept(true)
-: mImpl{location},
-  mStreamBuffer(GetMessageBuffer(), MESSAGE_BUFFER_SIZE - 1),
-  mStream(&mStreamBuffer)
-{
-}
-
-ExceptionFlinger::~ExceptionFlinger() noexcept(false)
-{
-  operator<<('\0');
-}
-
-char* ExceptionFlinger::GetMessageBuffer() noexcept(true)
-{
-  return sExceptionFlingerMessageBuffer;
-}
-
-std::string FormatString(const char* format, ...)
-{
-  va_list vl;
-  va_start(vl, format);
-  va_list vl2;
-  va_copy(vl2, vl);
-
-  size_t sizeRequired = vsnprintf(nullptr, 0, format, vl);
-  va_end(vl);
-
-  ++sizeRequired;
-  std::string result(sizeRequired, '\0');
-  vsnprintf(&result[0], sizeRequired, format, vl2);
-  va_end(vl2);
-
-  return result;
-}
-
-std::string LoadTextFile(const char* path, bool* fail)
-{
-  std::ifstream inFile(path);
-  if(inFile)
-  {
-    std::istreambuf_iterator<char> eos;
-    std::istreambuf_iterator<char> i(inFile.rdbuf());
-    return std::string(i, eos);
-  }
-  else if(fail)
-  {
-    *fail = true;
-  }
-  return std::string();
-}
-
-Geometry MakeTexturedQuadGeometry(TexturedQuadOptions::Type options)
-{
-  Property::Map properties;
-  properties.Insert("aPosition", Property::VECTOR3);
-  properties.Insert("aTexCoord", Property::VECTOR2);
-
-  std::vector<uint8_t> bytes;
-  size_t               stride   = 0;
-  size_t               uvOffset = 0;
-  struct
-  {
-    Vector3 aPosition;
-    Vector2 aTexCoord;
-  } vertices[] = {
-    {Vector3(-0.5f, 0.5f, 0.0f), Vector2(0.0f, .0f)},
-    {Vector3(0.5f, 0.5f, 0.0f), Vector2(1.0f, .0f)},
-    {Vector3(-0.5f, -0.5f, 0.0f), Vector2(0.0f, 1.0f)},
-    {Vector3(0.5f, -0.5f, 0.0f), Vector2(1.0f, 1.0f)}};
-
-  bytes.resize(sizeof(vertices));
-  stride   = sizeof(vertices[0]);
-  uvOffset = reinterpret_cast<const uint8_t*>(&vertices[0].aTexCoord) - reinterpret_cast<const uint8_t*>(&vertices[0]);
-
-  std::memcpy(bytes.data(), vertices, sizeof(vertices));
-
-  if(MaskMatch(options, TexturedQuadOptions::FLIP_VERTICAL))
-  {
-    Vector2* uv = reinterpret_cast<Vector2*>(reinterpret_cast<uint8_t*>(bytes.data()) + uvOffset);
-    for(int i = 0; i < 4; ++i)
-    {
-      uv->y = 1.0f - uv->y;
-      uv    = reinterpret_cast<Vector2*>(reinterpret_cast<uint8_t*>(uv) + stride);
-    }
-  }
-
-  VertexBuffer vertexBuffer = VertexBuffer::New(properties);
-  vertexBuffer.SetData(bytes.data(), bytes.size() / stride);
-
-  Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer(vertexBuffer);
-  geometry.SetType(Geometry::TRIANGLE_STRIP);
-  return geometry;
-}
-
-void ToUnixFileSeparators(std::string& path)
-{
-  std::replace(path.begin(), path.end(), '\\', '/');
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/utils.h b/dali-scene-loader/public-api/utils.h
deleted file mode 100644
index f9213e1..0000000
--- a/dali-scene-loader/public-api/utils.h
+++ /dev/null
@@ -1,203 +0,0 @@
-#ifndef DALI_SCENE_LOADER_UTILS_H_
-#define DALI_SCENE_LOADER_UTILS_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include <cctype>
-#include <sstream>
-#include "dali/public-api/actors/actor.h"
-#include "dali/public-api/common/dali-common.h"
-#include "dali/public-api/rendering/renderer.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/*
- * @brief Fixed size backing buffer to use with std::ostreams where control over
- *  allocations (which this does not make), is required.
- * @note All stream insertions that would overflow the buffer that StreamBuffer
- *  was created with, will fail.
- */
-class DALI_SCENE_LOADER_API StreamBuffer : public std::basic_streambuf<char>
-{
-public:
-  StreamBuffer(char* buffer, size_t size) noexcept(true);
-};
-
-/*
- * @brief Wraps an ostream with a pre-allocated, fixed size backing buffer
- *  which a message can be formatted into. Upon destruction, it throws a
- *  DaliException with the message.
- */
-class DALI_SCENE_LOADER_API ExceptionFlinger
-{
-public:
-  enum
-  {
-    MESSAGE_BUFFER_SIZE = 512
-  };
-
-  ExceptionFlinger(const char* location) noexcept(true);
-
-  [[noreturn]] ~ExceptionFlinger() noexcept(false);
-
-  template<typename T>
-  ExceptionFlinger& operator<<(const T& rhs) noexcept(true)
-  {
-    mStream << rhs;
-    return *this;
-  }
-
-private:
-  struct Impl
-  {
-    const char* mLocation;
-
-    [[noreturn]] ~Impl() noexcept(false);
-  };
-
-  static char* GetMessageBuffer() noexcept(true);
-
-  Impl         mImpl;
-  StreamBuffer mStreamBuffer;
-  std::ostream mStream;
-};
-
-/*
- * @brief Formats the given printf-style varargs into a std::string.
- */
-DALI_SCENE_LOADER_API std::string FormatString(const char* format, ...);
-
-/*
- * @return The @n th bit in a bitmask.
- */
-DALI_SCENE_LOADER_API constexpr size_t NthBit(size_t n)
-{
-  return 1 << n;
-}
-
-/*
- * @return Whether all of @a mask 's bits are set on @a value.
- */
-inline DALI_SCENE_LOADER_API bool MaskMatch(uint32_t value, uint32_t mask)
-{
-  return (value & mask) == mask;
-}
-
-/*
- * @brief Convert a four-letter(, null-terminated) string literal into a uint32_t.
- */
-inline DALI_SCENE_LOADER_API constexpr uint32_t FourCC(const char (&fourCC)[5])
-{
-  return (fourCC[3] << 24) | (fourCC[2] << 16) | (fourCC[1] << 8) | fourCC[0];
-}
-
-/*
- * @brief Insensitive case compare function.
- * @param[in] a, compare string
- * @param[in] b, compare string
- * @return true if strings are equal
- */
-inline DALI_SCENE_LOADER_API bool CaseInsensitiveCharacterCompare(unsigned char a, unsigned char b)
-{
-  // Converts to lower case in the current locale.
-  return std::tolower(a) == std::tolower(b);
-}
-
-/*
- * @return true if the lower cased ASCII strings are equal.
- * @param[in] a, compare string
- * @param[in] b, compare string
- */
-inline DALI_SCENE_LOADER_API bool CaseInsensitiveStringCompare(const std::string& a, const std::string& b)
-{
-  bool result = false;
-  if(a.length() == b.length())
-  {
-    result = std::equal(a.begin(), a.end(), b.begin(), &CaseInsensitiveCharacterCompare);
-  }
-  return result;
-}
-
-/*
- * @brief Attempts to load the contents of a text file; returns empty string on
- *  failure. A pointer to a boolean may be passed in @a fail; this will be set
- *  to true in case of failure (should only be checked if the returned string
- *  was empty()).
- */
-DALI_SCENE_LOADER_API std::string LoadTextFile(const char* path, bool* fail = nullptr);
-
-/*
- * @brief Makes a number of calls to @a fn, passing to each one the given
- *  @a actor then each of its children, in depth-first traversal.
- * @note @a fn must not change the actor hierarchy during traversal.
- * @note Use of a @a fn that is itself recursing in @a is also discouraged
- *  for performance and stability reasons.
- */
-template<typename Func>
-inline DALI_SCENE_LOADER_API void VisitActor(Actor a, Func fn)
-{
-  fn(a);
-
-  unsigned int numChildren = a.GetChildCount();
-  for(unsigned int i = 0; i < numChildren; ++i)
-  {
-    VisitActor(a.GetChildAt(i), fn);
-  }
-}
-
-/*
- * @brief Convenience function to set the given actor @a 's anchor point
- *  and parent origin to center.
- */
-inline DALI_SCENE_LOADER_API void SetActorCentered(Actor a)
-{
-  a.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  a.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-}
-
-namespace TexturedQuadOptions
-{
-using Type = uint32_t;
-
-enum DALI_SCENE_LOADER_API Values : Type
-{
-  NONE          = 0x00,
-  FLIP_VERTICAL = 0x01,
-};
-} // namespace TexturedQuadOptions
-
-/*
- * @brief Makes... geometry for a textured quad.
- */
-DALI_SCENE_LOADER_API Geometry MakeTexturedQuadGeometry(TexturedQuadOptions::Type options = TexturedQuadOptions::NONE);
-
-/*
- * @brief Fixes the path of a file. Replaces the '\\' separator by the '/' one.
- * @param[in,out] path The path to be fixed.
- */
-DALI_SCENE_LOADER_API void ToUnixFileSeparators(std::string& path);
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif /* DALI_SCENE_LOADER_UTILS_H_ */
diff --git a/dali-scene-loader/public-api/view-projection.cpp b/dali-scene-loader/public-api/view-projection.cpp
deleted file mode 100644
index ce2e6b0..0000000
--- a/dali-scene-loader/public-api/view-projection.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "dali-scene-loader/public-api/view-projection.h"
-#include "dali-scene-loader/public-api/utils.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-void ViewProjection::Update()
-{
-  Matrix::Multiply(mViewProjection, mView, mProjection);
-
-  mInvProjection = mProjection;
-  if(!mInvProjection.Invert())
-  {
-    ExceptionFlinger(ASSERT_LOCATION) << "Failed to find inverse of projection matrix " << mProjection << ".";
-  }
-}
-
-} // namespace SceneLoader
-} // namespace Dali
diff --git a/dali-scene-loader/public-api/view-projection.h b/dali-scene-loader/public-api/view-projection.h
deleted file mode 100644
index 26ce908..0000000
--- a/dali-scene-loader/public-api/view-projection.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef DALI_SCENE_LOADER_VIEW_PROJECTION_H_
-#define DALI_SCENE_LOADER_VIEW_PROJECTION_H_
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-
-// EXTERNAL INCLUDES
-#include "dali/public-api/math/matrix.h"
-
-namespace Dali
-{
-namespace SceneLoader
-{
-/**
- * @brief Contains view and projection matrices, also caching the view-projection
- *      and inverse projection matrices.
- */
-class ViewProjection
-{
-public:
-  Matrix& GetView()
-  {
-    return mView;
-  }
-  Matrix& GetProjection()
-  {
-    return mProjection;
-  }
-
-  /*
-   * @brief Updates the cached view projection and inverse projection matrices.
-   */
-  void Update();
-
-  const Matrix& GetView() const
-  {
-    return mView;
-  }
-  const Matrix& GetProjection() const
-  {
-    return mProjection;
-  }
-  const Matrix& GetInverseProjection() const
-  {
-    return mInvProjection;
-  }
-  const Matrix& GetViewProjection() const
-  {
-    return mViewProjection;
-  }
-
-private:
-  Matrix mView;
-  Matrix mProjection;
-  Matrix mInvProjection;
-  Matrix mViewProjection;
-};
-
-} // namespace SceneLoader
-} // namespace Dali
-
-#endif //DALI_SCENE_LOADER_VIEW_PROJECTION_H_
diff --git a/dali-scene3d.manifest b/dali-scene3d.manifest
new file mode 100644
index 0000000..a76fdba
--- /dev/null
+++ b/dali-scene3d.manifest
@@ -0,0 +1,5 @@
+<manifest>
+	<request>
+		<domain name="_" />
+	</request>
+</manifest>
diff --git a/dali-scene3d.manifest-smack b/dali-scene3d.manifest-smack
new file mode 100644
index 0000000..08561d6
--- /dev/null
+++ b/dali-scene3d.manifest-smack
@@ -0,0 +1,8 @@
+<manifest>
+	<assign>
+		<filesystem path="/usr/lib/*" label="_" />
+	</assign>
+	<request>
+		<domain name="dali"/>
+	</request>
+</manifest>
diff --git a/dali-scene3d/README.md b/dali-scene3d/README.md
new file mode 100644
index 0000000..4174487
--- /dev/null
+++ b/dali-scene3d/README.md
@@ -0,0 +1,365 @@
+# Table of contents
+   * [Overview](#overview)
+   * [`scenes`](#scenes)
+   * [`nodes`](#nodes)
+      * [Transformations](#transformations)
+      * [Size](#size)
+      * [Visibility](#visibility)
+      * [`children`](#children)
+      * [`customization`](#customization)
+      * [Renderables](#renderables)
+         * [`model`](#model)
+         * [`arc`](#arc)
+      * [`inverseBindPoseMatrix`](#inversebindposematrix)
+   * [`materials`](#materials)
+   * [`meshes`](#meshes)
+   * [`shaders`](#shaders)
+      * [`rendererState`](#rendererState)
+      * [`defines`](#defines)
+      * [`hints`](#hints)
+      * [Uniforms](#uniforms)
+   * [`skeletons`](#skeletons)
+   * [`cameras`](#cameras)
+      * [Perspective cameras](#perspective-cameras)
+      * [Orthographic cameras](#orthographic-cameras)
+   * [`lights`](#lights)
+   * [`animations`](#animations)
+      * [`properties`](#properties)
+         * [`keyFramesBin`](#keyframesbin)
+         * [`keyFrames`](#keyFrames)
+         * [`value`](#value)
+   * [`animationGroups`](#animationGroups)
+
+# Overview
+DLI is a JSON based format for representing 3D scenes.
+   * Like glTF, the DLI document defines a set of scenes, which in turn define a hierarchical structure of nodes, and the additional data required to render them - meshes, geometry.
+   * Unlike glTF, it allows definitions of shaders, environment maps, and lighting parameters as well;
+   * Unlike glTF, DLI does not concern itself with buffers, buffer views and accessors;
+   * It supports customizations, which allow replacing parts of the scene based on customization tags and options, without reloading the whole scene.
+   * It supports the processing of custom categories, which can be scheduled to take place prior to or after the processing of the scene data, as well as custom node and animation processors.
+
+# `scenes`
+The "scenes" element is an array of JSON objects, each of which must define a `nodes` array with the index of the definition of the root node.
+
+:warning: The array must not be empty. Only the first element is used.
+An optional `scene` element with an integer value may be defined to specify the index of the first scene to be created.
+The rest of the scenes are created in the order of their definition (from index 0 to the highest, skipping the default - already created - scene).
+```js
+{
+    "scene": 0,
+    "scenes": [ { "nodes": [ 0 ] } ],
+    "nodes": [ {
+        "name": "some_unique_name"
+    } ]
+}
+```
+
+# `nodes`
+The 3D scene is built using a hierarchy of nodes, which are used to position the objects to render.
+
+:warning: Each node must have a `name` string that 1, is not an empty string and 2, is unique within the DLI document. The use of alpha-numeric characters and underscore only is highly recommeneded.
+
+## Transformations
+There are two ways to define the local transform of each nodes. Both are optional, defaulting to a position at the origin, a scale of one and no rotation.
+   * A `matrix` array of 16 numerical values defining a column-major 4x4 matrix;
+   * A `position` array of 3 numerical values defining a 3D vector and an `angle` array of 3 numerical values defining euler angles of rotation along the 3 axes.
+
+## Size
+The size of the bounding box of a node may be specified using either of the optional `size` or `bounds` properties, as arrays of 2 or 3 numerical values. Its default value is the unit vector.
+
+## Visibility
+The `visible` optional boolean property defines whether a node and its children are rendered (`true`) or not (`false`).
+
+## `children`
+An array of 0 or more indices into the top level `nodes` array, which shall inherit the transform and visibility of their parent node.
+
+:warning: Nodes are processed in the order they are encountered during the depth-first traversal of the hierarchy.
+```js
+  "nodes": [ {
+    "name": "hip",
+    "children": [ 3, 1, 2 ]
+  }, {
+    "name": "spine"
+  }, {
+    "name": "left leg"
+  }, {
+    "name": "right leg"
+  } ]
+```
+
+## `customization`
+Customizations may allow creating a different sub-tree of each node that define them, based on application specific configuration settings known at the time of creating the scene.
+The definition of a `customization` is a single string tag: 
+```js
+  "nodes": [ {
+    "name": "Soup du jour",
+    "customization": "flavor", // this one
+    "children": [ 1, 2, 3 ]
+  }, {
+    "name": "Broccoli and Stilton",
+  }, {
+    "name": "Butternut Squash",
+  }, {
+    "name": "Strawberry and Cream",
+  } ]
+```
+:warning: Customizations and renderables are mutually exclusive on the same node.
+
+## Renderables
+There is support for two types of nodes that define renderable content.
+The definition of these renderables come in sub-objects.
+All of them support a `color` property, which is an array of 3 or 4 numerical values for RGB or RGBA components. For the alpha value to take effect, alpha blending must be enabled; this is controlled by the [material](#materiaL).
+
+:warning: Customizations and renderables are mutually exclusive on the same node.
+
+### `model`
+Provides definition for a 3D object, which requires a `mesh`, `shader` and `material`.
+Each of these are provided in form of an integer index into the related top-level array of the DLI document.
+
+:warning: `mesh` must be provided; the rest are optional and default to 0.
+```js
+  "nodes": [ {
+    "name": "Sphere",
+    "model": {
+      "mesh": 0, // required
+      "shader": 0, // optional, defaults to 0
+      "material": 1 // optional, defaults to 0
+    }
+  } ]
+```
+
+### `arc`
+Arc is a specialisation of a model that allows the rendering of circular progress bars. As such, it also must provide a `mesh` ID.
+```js
+  "nodes": [ {
+    "name": "Any Name",
+    "arc": {
+      "mesh": 0, // required
+      "shader": 0, // optional, defaults to 0
+      "material": 1 // optional, defaults to 0
+      "antiAliasing": true,
+      "radius": -0.928,
+      "startAngle": -81.0,
+      "endAngle": 261
+    }
+  } ]
+```
+   * `startAngle` and `endAngle` are the angular positions where the arc starts and ends, in degrees.
+   * `radius` is the inner radius of the arc, the outer radius being defined by the [`size`](#size) of the node.
+   * `antiAliasing` defines whether the edges of the arc should be smoothed.
+   
+## `inverseBindPoseMatrix`
+Nodes that serve as joints of a [skeleton](#skeleton) must define this property as an array of 16 numerical values for a column major 4x4 matrix.
+```js
+  "nodes": [ {
+    "name" : "l_shoulder_JNT",
+    "inverseBindPoseMatrix" : [ 0.996081, -0.0407448, 0.0785079, 0.0, 0.0273643, 0.985992, 0.164531, 0.0, -0.0841121, -0.161738, 0.983242, 0.0, -0.0637747, -1.16091, -0.161038, 1.0 ]
+  } ]
+```
+
+# `environment`
+An array of environment map definitions, which have the following format:
+```js
+  "environment": [{
+    "cubeSpecular": "Studio_001/Radiance.ktx",
+    "cubeDiffuse": "Studio_001/Irradiance.ktx",
+    "cubeInitialOrientation": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] 
+  } ]
+```
+`cubeSpecular` and `cubeDiffuse` are the names of the respective cube map files that will be attempted to be located from the _environment_ path, which is up to the application. A 1x1x1 white RGB888 cubemap is created in place of either that was omitted.
+`cubeInitialOrientation` may be used to inform the (PBR) shader of a matrix which describes the initial orientation of the cube map. Defaults to the identity matrix.
+
+# `materials`
+Defines configurations of textures (and their samplers) that form materials. These can be created from single values or image files (in the formats that DALi supports).
+```js
+  "materials": [ {
+    "environment": 0,
+    "albedoMap": "A.png",
+    "normal": "N.png",
+    "metallicRoughnessMap": "MR.png",
+    "color": [ 1.0, 0.8, 0.7, 0.5 ]
+  } ]
+```
+   * `environment`: The index of the [environment map](#environments) to use. Single integer, defaults to `0`.
+   * `mipmap`: A boolean to speficy if the creation and sampling of mipmaps should be enabled. Off by default.
+   * `color`: Base color, which the color of the node gets multiplied by. Defaults to white.
+   * `metallic` and `roughness`: Properties for PBR materials; both are expected to be a single numerical value and default to `1.0`.
+
+## Texture maps
+`albedoMap` / `albedoMetallicMap` / `normalMap` / `normalRoughnessMap` / `metallicRoughnessMap` / `subsurfaceMap`: define various texture semantics, i.e. the role of the texture, which shall be loaded from an image _inside the materials path_, which is up to the application. All of them are optional.
+
+:warning: Semantics shall not overlap within the same material, e.g. multiple albedo definitions, or albedo and albedoMetallic.
+
+# `meshes`
+Defines an array of meshes which are used to access geometry data stored in a binary file. The `uri` property is used to locate each file _inside the mesh path_, which is up to the application; alternatively it can be set to `"quad"`, resulting in the creation of a unit quad.
+Those models loaded from a file may provide an accessor, and flag its presence in the `attributes` bitmask property. The following are supported:
+|Attribute Name|Bit|Decimal value|Type|Remarks|
+|-|-|-|-|-|
+|`indices`  |0|  1|unsigned short||
+|`positions`|1|  2|Vector3||
+|`normals`  |2|  4|Vector3||
+|`textures` |3|  8|Vector2|UVs|
+|`tangents` |4| 16|Vector3||
+|           |5| 32||Ignored, but reserved for bitangents|
+|`joints0`  |6| 64|Vector4|Joint IDs for skinned meshes|
+|`weights0` |7|128|Vector4|Joint weights for skinned meshes|
+
+E.g. if positions, normals and tangents are provided, the `attributes` property must have a value of 2 + 4 + 16 = 22.
+Each attribute must provide a `byteOffset` and `byteLength` property, which must be correctly sized for the type of the given attribute.
+Finally, to specify what primitives should the geometry be rendered as, a `primitive` property may be provided with one of the following values: `TRIANGLES` (default), `LINES`, `POINTS`.
+
+## Skinned meshes
+DLI supports meshes that allow deformation by skeletal animation. These must define a few additional properties:
+   * `joints0` and `weights0` attributes, as above.
+   * A [`skeleton`](#skeletons) ID, to specify which (joint) nodes' transformations affect the mesh.
+
+:warning: The maximum number of bones supported by DALi Scene3D is `64`.
+
+## Blend shapes
+Blend shapes provide alternate configurations of vertex `positions`, `normals` and/or `tangents` that may be blended with the same attributes of the base mesh, controlled by an animatable `weight`.
+```js
+  "meshes": [ {
+      "uri": "example.bin",
+      "attributes": 2,
+      "positions": {
+          "byteOffset": 0,
+          "byteLength": 12000
+      },
+      "blendShapesHeader": {
+          "version": "2.0",
+          "byteOffset": 12000,
+          "byteLEngth": 4
+      },
+      "blendShapes": [ {
+          "weight": 0.0,
+          "positions": {
+              byteOffset: 12004,
+              byteLength: 12000
+          }
+      } ]
+  } ]
+```
+A `blendShapesHeader`, if present, must define:
+   * the `version` of the blend shapes; supported values are `1.0` and `2.0`. The difference between the versions is that v1.0 requires a per-blend shape definition of an un-normalization factor.
+   * the `byteOffset` and `byteLength` of a buffer in the binary which defines the width (2 bytes) and height (2 bytes) of the texture that dali-scene3d creates for blend shape data.
+
+The `blendShapes` array then defines the shapes that are available to blend between, comprising of:
+   * An initial `weight` numerical, the default is 0;
+   * `position` / `normals` / `tangents` attributes, which must be also present in the base mesh and are the same format (`byteOffset` / `byteLength`);
+
+:warning: The size of the attributes of the blend shape must match that of the base mesh (and each other) - i.e. they must define the same number of vertices.
+
+# `shaders`
+Provides an array of shader programs that renderables may use for rendering.
+For each shader, `vertex` and `fragment` are required string properties pointing to the shader files _inside the shader path_, which is up to the application.
+   * `rendererState`: This string defines the options for configuring the settings of the renderer. Refer to public-api/renderer-state.h for details.
+   * `defines`: An optional array of strings which will be used to create #defines into the vertex and fragment shaders.
+   * `hints`: An optional array of strings that map to `Dali::Shader::Hint` values. Therefore two values are supported - `MODIFIES_GEOMETRY` and `OUTPUT_IS_TRANSPARENT`.
+
+## Uniforms
+Every property that is not one of the reserved keys above, will be attempted to be registered as a uniform of the same name.
+
+:warning: Boolean values will be converted to floating point 1.0 (for `true`) or 0.0 (for `false`).
+
+:warning: Integer values will be converted to floating point.
+
+:warning: Arrays of numerical values will be treated as one of the vec2 / vec3 / vec4 / mat3 / mat4 types, depending on what do they define sufficient components for.
+```js
+  "shaders": [ {
+    "vertex": "dli_pbr.vsh",
+    "fragment": "dli_pbr.fsh",
+    "defines": [ "HIGHP", SKINNING" ],
+    "rendererState": "DEPTH_WRITE|DEPTH_TEST|CULL_BACK",
+    "hints": 
+    "uMaxLOD": 6
+  } ]
+```
+
+# `skeletons`
+Skeletons in DLI simply define the name of a `node` that shall serve as the _root joint_ of the given skeleton.
+```js
+  "skeletons": [ {
+    "node": "hipJoint"
+  } ]
+```
+The Joint IDs in skinned mesh data relate to the descendants of the [node](#nodes) identified as the root joint that are joints, i.e. define [`inverseBindPoseMatrix`](#inversebindposematrix), in depth-first traversal order.
+
+# `cameras`
+Define the transformation of viewers and the projection used by them.
+All cameras may define:
+   * `matrix`: an array of 16 numerical values for the transform matrix
+   * `near` and `far` values for the position of the respective clipping planes. These default to `0.1` and `1000.0`, respectively.
+
+## Perspective cameras
+This projection type - and a vertical field of view of `60` degrees - is the default.
+The (V)FOV can be specified in the `fov` property, as a single numerical value.
+
+## Orthographic cameras
+If the `orthographic` is defined with an array of four numerical values for the left, right, bottom and top clipping planes (in this order), then orthographic projection is used, and `fov` is ignored.
+
+# `lights`
+Define parameters for a single light source - the implementation is up to the application. The following properties are supported.
+   * `transform`: matrix of 16 numerical values for the positioning / directing of the light;
+   * `color`: array of 3 components for RGB;
+   * `intensity`: single float;
+   * `shadowIntensity`: single float;
+   * `shadowMapSize`: unsigned integer size (same width & height) of shadow map.
+   * `orthographicSize`: single float to define the size (same width & height) of orthographic position.
+
+# `animations`
+Animations provide a way to change properties of nodes (and those of their renderables) over time.
+```js
+  "animations": [ {
+     "name": "Idle",
+     "loopCount": 0,
+     "duration": 4.0,
+     "endAction": "DISCARD",
+     "disconnectAction": "DISCARD",
+     "properties": []
+  } ]
+```
+   * `name`: the identifier to look the animation up by;
+   * `loopCount`: the number of times that the animation should be played. The default is `1`; `0` signifies infinity repetitions.
+   * `duration`: the duration of the animation in seconds. If not provided, it will be calculated from the properties.
+   * `endAction` and `disconnectAction`: the supported values, defaults and their meaning are described in the `Dali::Animation::EndAction` enum;
+
+## `properties`
+An array of animation property definitions.
+   * `node`: the name of the node whose property shall be animated;
+   * `property`: the name that the property was registered under.
+   * `alphaFunction`: the name of an alpha function which shall be used in animating a value, or between key frames;
+   * `timePeriod`: `delay` (defaults to `0.0`) and `duration` (defaults to the `duration` of the animation) of the property animation, in sceonds;
+
+The property may be animated using one of the following methods. They are listed in priority order; if e.g. a property defines `keyFramesBin` and `keyFrames`, then only `keyFramesBin` is used. 
+
+### `keyFramesBin`
+JSON object that defines a keyframe animation in a binary buffer, with the following properties:
+   * `url` the path to the file containing the buffer;
+   * `numKeys`: the number of keys.
+   * `byteOffset`: offset to the start of the buffer
+
+The size of the buffer depends on the property being animated, where  the property value for each frame follows a 4 byte floating point value determining progress (between 0 and 1).
+
+:warning: Only `position` (3D vector of floats, 12 bytes), `rotation` (Quaternion, 12 bytes), and `scale` (3D vector, 12 bytes) properties are supported.
+
+### `keyFrames`
+JSON array of keyframe objects defined with the following properties:
+   * `progress`: a scalar between `0` and `1` to apply to the duration to get the time stamp of the frame;
+   * `value`: array of 3 or 4 numerical values depending on which property is being animated;
+
+:warning: Only `position`, `rotation`, and `scale` properties are supported.
+
+### `value`
+Value animations animate a property using a single value that may be absolute or relative.
+The properties it supports are the following:
+   * `value`: the value to animate to (if absolute) or by (if `relative`);
+   * `relative`: whether `value` is a target, or an offset;
+
+# `animationGroups`
+Animation groups simply group animations together by name, under another name, which may be used to trigger them at the same time.
+```js
+  "animationGroups": [ {
+    "name": "Idle",
+    "animations": [ "IdleBody", "IdleFace" ]
+  } ]
+```
diff --git a/dali-scene3d/dali-scene3d.h b/dali-scene3d/dali-scene3d.h
new file mode 100644
index 0000000..df626ad
--- /dev/null
+++ b/dali-scene3d/dali-scene3d.h
@@ -0,0 +1,81 @@
+#ifndef DALI_SCENE3D_H
+#define DALI_SCENE3D_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali/dali.h>
+
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+#include <dali-scene3d/public-api/algorithm/path-finder-waypoint.h>
+#include <dali-scene3d/public-api/algorithm/path-finder.h>
+
+#include <dali-scene3d/public-api/common/environment-map.h>
+
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+
+#include <dali-scene3d/public-api/loader/alpha-function-helper.h>
+#include <dali-scene3d/public-api/loader/animated-property.h>
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+#include <dali-scene3d/public-api/loader/buffer-definition.h>
+#include <dali-scene3d/public-api/loader/bvh-loader.h>
+#include <dali-scene3d/public-api/loader/camera-parameters.h>
+#include <dali-scene3d/public-api/loader/customization.h>
+#include <dali-scene3d/public-api/loader/dli-input-parameter.h>
+#include <dali-scene3d/public-api/loader/environment-definition.h>
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
+#include <dali-scene3d/public-api/loader/environment-map-loader.h>
+#include <dali-scene3d/public-api/loader/facial-animation-loader.h>
+#include <dali-scene3d/public-api/loader/index.h>
+#include <dali-scene3d/public-api/loader/ktx-loader.h>
+#include <dali-scene3d/public-api/loader/light-parameters.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/load-scene-metadata.h>
+#include <dali-scene3d/public-api/loader/material-definition.h>
+#include <dali-scene3d/public-api/loader/matrix-stack.h>
+#include <dali-scene3d/public-api/loader/mesh-definition.h>
+#include <dali-scene3d/public-api/loader/mesh-geometry.h>
+#include <dali-scene3d/public-api/loader/model-loader.h>
+#include <dali-scene3d/public-api/loader/navigation-mesh-factory.h>
+#include <dali-scene3d/public-api/loader/node-definition.h>
+#include <dali-scene3d/public-api/loader/parse-renderer-state.h>
+#include <dali-scene3d/public-api/loader/renderer-state.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-scene3d/public-api/loader/shader-definition.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-scene3d/public-api/loader/skeleton-definition.h>
+#include <dali-scene3d/public-api/loader/skinning-details.h>
+#include <dali-scene3d/public-api/loader/string-callback.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+#include <dali-scene3d/public-api/loader/view-projection.h>
+
+#include <dali-scene3d/public-api/model-components/material.h>
+#include <dali-scene3d/public-api/model-components/model-node.h>
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+
+#include <dali-scene3d/public-api/model-motion/motion-data.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-value.h>
+
+#endif // DALI_SCENE3D_H
\ No newline at end of file
diff --git a/dali-scene3d/internal/algorithm/navigation-mesh-header.h b/dali-scene3d/internal/algorithm/navigation-mesh-header.h
new file mode 100644
index 0000000..812cdb1
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/navigation-mesh-header.h
@@ -0,0 +1,58 @@
+#ifndef DALI_SCENE3D_NAVIGATION_MESH_HEADER_H
+#define DALI_SCENE3D_NAVIGATION_MESH_HEADER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <inttypes.h>
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+/**
+ * @struct NavigationMeshHeader
+ *
+ * Base header structure contains only the version field. It will allow adding changes to the
+ * exporter while maintaining backward compatibility.
+ */
+struct NavigationMeshHeader
+{
+  uint32_t checksum; ///< Checksum (used to test for endianness, tested by reader )
+  uint32_t version;  ///< Version of the API
+};
+
+/**
+ * @struct NavigationMeshHeader_V10
+ *
+ * Extension of header for version 1.0 of NavigationMesh binary file
+ */
+struct NavigationMeshHeader_V10 : public NavigationMeshHeader
+{
+  uint32_t dataOffset; ///< Offset where data starts (depends on endianness)
+
+  uint32_t vertexCount;      ///< total count of vertices
+  uint32_t vertexDataOffset; ///< offset into data array where vertices start
+
+  uint32_t edgeCount;      ///< total count of edges
+  uint32_t edgeDataOffset; ///< offset into data array where edges are stored
+
+  uint32_t polyCount;      ///< total number of polys
+  uint32_t polyDataOffset; ///< offset into data array where edges are stored
+
+  float gravityVector[3]; /// Gravity vector for the data (down vector)
+};
+
+}
+#endif // DALI_SCENE3D_NAVIGATION_MESH_HEADER_H
diff --git a/dali-scene3d/internal/algorithm/navigation-mesh-impl.cpp b/dali-scene3d/internal/algorithm/navigation-mesh-impl.cpp
new file mode 100644
index 0000000..c5f4ed1
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/navigation-mesh-impl.cpp
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+#include <algorithm>
+#include <filesystem>
+
+using Dali::Vector3;
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+using Poly   = Dali::Scene3D::Algorithm::NavigationMesh::Face;
+using Edge   = Dali::Scene3D::Algorithm::NavigationMesh::Edge;
+using Vertex = Dali::Scene3D::Algorithm::NavigationMesh::Vertex;
+
+/**
+ * Helper function calculating intersection point between triangle and ray
+ */
+static bool RayTriangleIntersect(
+  const Vector3& origin, const Vector3& direction, const Vector3& vertex0, const Vector3& vertex1, const Vector3& vertex2, const Vector3& normal, float& outDistance, Vector3& position)
+{
+  auto N = normal;
+  N.Normalize();
+  // Step 1: finding P
+
+  // check if ray and plane are parallel ?
+  float NdotRayDirection = N.Dot(direction);
+  if(Dali::Equals(NdotRayDirection, 0.0f))
+  {
+    return false; // they are parallel so they don'outDistance intersect !
+  }
+
+  // compute d parameter using equation 2
+  float d = -N.Dot(vertex0);
+
+  // compute outDistance (equation 3)
+  outDistance = -(N.Dot(origin) + d) / NdotRayDirection;
+
+  // check if the triangle is in behind the ray
+  if(outDistance < 0) return false; // the triangle is behind
+
+  // compute the intersection point using equation 1
+  auto P = origin + (direction * outDistance);
+
+  position = P;
+
+  auto edge0 = vertex1 - vertex0;
+  auto edge1 = vertex2 - vertex1;
+  auto edge2 = vertex0 - vertex2;
+  auto C0    = P - vertex0;
+  auto C1    = P - vertex1;
+  auto C2    = P - vertex2;
+
+  auto r0 = N.Dot(edge0.Cross(C0));
+  auto r1 = N.Dot(edge1.Cross(C1));
+  auto r2 = N.Dot(edge2.Cross(C2));
+  if(r0 > 0 &&
+     r1 > 0 &&
+     r2 > 0) return true; // P is inside the triangle
+
+  return false; // this ray hits the triangle
+}
+
+NavigationMesh::NavigationMesh(const std::vector<uint8_t>& buffer)
+{
+  mBuffer.resize(buffer.size());
+  std::copy(buffer.begin(), buffer.end(), mBuffer.begin());
+
+  // Setup header from the buffer
+  mHeader      = *reinterpret_cast<NavigationMeshHeader_V10*>(mBuffer.data());
+  mCurrentFace = Scene3D::Algorithm::NavigationMesh::NULL_FACE;
+}
+
+[[nodiscard]] uint32_t NavigationMesh::GetFaceCount() const
+{
+  return mHeader.polyCount;
+}
+
+[[nodiscard]] uint32_t NavigationMesh::GetEdgeCount() const
+{
+  return mHeader.edgeCount;
+}
+
+[[nodiscard]] uint32_t NavigationMesh::GetVertexCount() const
+{
+  return mHeader.vertexCount;
+}
+
+bool NavigationMesh::FindFloorForFace(const Dali::Vector3& position, FaceIndex faceIndex, bool dontCheckNeighbours, Dali::Vector3& outPosition)
+{
+  if(faceIndex == ::Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+  {
+    faceIndex = mCurrentFace;
+  }
+
+  // No current face, do full check
+  if(mCurrentFace == ::Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+  {
+    return FindFloor(position, outPosition);
+  }
+
+  NavigationRay ray;
+  ray.origin = PointSceneToLocal(Dali::Vector3(position)); // origin is equal position
+
+  // Ray direction matches gravity direction
+  ray.direction = Vector3(mHeader.gravityVector);
+
+  IntersectResult result = NavigationRayFaceIntersection(ray, *GetFace(faceIndex));
+  if(result.result)
+  {
+    outPosition = PointLocalToScene(result.point);
+    return true;
+  }
+  else
+  {
+    if(dontCheckNeighbours)
+    {
+      return false;
+    }
+
+    // Test neighbouring by edges
+    const auto& poly = GetFace(faceIndex);
+
+    // collect faces sharing edges
+    std::vector<FaceIndex> neighbourFaces;
+
+    for(auto edgeIndex : poly->edge)
+    {
+      const auto& edge = *GetEdge(edgeIndex);
+
+      // store faces
+      for(auto edgeFaceIndex : edge.face)
+      {
+        if(edgeFaceIndex != ::Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE && edgeFaceIndex != faceIndex)
+        {
+          neighbourFaces.emplace_back(edgeFaceIndex);
+        }
+      }
+    }
+
+    if(neighbourFaces.empty())
+    {
+      return false;
+    }
+
+    for(const auto& neighbourFaceIndex : neighbourFaces)
+    {
+      if(FindFloorForFace(position, neighbourFaceIndex, true, outPosition))
+      {
+        mCurrentFace = neighbourFaceIndex;
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Drops observer onto the floor
+ *
+ * When dropping observer, the nearest floor face is found
+ */
+bool NavigationMesh::FindFloor(const Dali::Vector3& position, Dali::Vector3& outPosition)
+{
+  FaceIndex faceIndex = 0u;
+  return FindFloor(position, outPosition, faceIndex);
+}
+
+bool NavigationMesh::FindFloor(const Dali::Vector3& position, Dali::Vector3& outPosition, FaceIndex& outFaceIndex)
+{
+  [[maybe_unused]] auto newPos = PointSceneToLocal(Dali::Vector3(position));
+
+  NavigationRay ray;
+
+  ray.origin = PointSceneToLocal(Dali::Vector3(position)); // origin is equal position
+
+  // Ray direction matches gravity direction
+  ray.direction = Vector3(mHeader.gravityVector);
+
+  const auto                   POLY_COUNT = GetFaceCount();
+  std::vector<IntersectResult> results;
+  for(auto faceIndex = 0u; faceIndex < POLY_COUNT; ++faceIndex)
+  {
+    auto result = NavigationRayFaceIntersection(ray, *GetFace(faceIndex));
+    if(result.result)
+    {
+      result.faceIndex = faceIndex;
+      results.emplace_back(result);
+    }
+  }
+
+  // find minimal distance to the floor and return that position and distance
+  if(results.empty())
+  {
+    return false;
+  }
+
+  std::sort(results.begin(), results.end(), [](const IntersectResult& lhs, const IntersectResult& rhs) { return lhs.distance < rhs.distance; });
+
+  outPosition  = PointLocalToScene(results.front().point);
+  outFaceIndex = results.front().faceIndex;
+  mCurrentFace = outFaceIndex;
+
+  return true;
+}
+
+const Poly* NavigationMesh::GetFace(FaceIndex index) const
+{
+  auto* basePtr = reinterpret_cast<const Poly*>(mBuffer.data() + mHeader.dataOffset + mHeader.polyDataOffset);
+  return &basePtr[index];
+}
+
+const Edge* NavigationMesh::GetEdge(EdgeIndex index) const
+{
+  auto* basePtr = reinterpret_cast<const Edge*>(mBuffer.data() + mHeader.dataOffset + mHeader.edgeDataOffset);
+  return &basePtr[index];
+}
+
+const Vertex* NavigationMesh::GetVertex(VertexIndex index) const
+{
+  auto* basePtr = reinterpret_cast<const Vertex*>(mBuffer.data() + mHeader.dataOffset + mHeader.vertexDataOffset);
+  return &basePtr[index];
+}
+
+NavigationMesh::IntersectResult NavigationMesh::NavigationRayFaceIntersection(NavigationRay& ray, const Face& face) const
+{
+  auto vi0 = *GetVertex(face.vertex[0]);
+  auto vi1 = *GetVertex(face.vertex[1]);
+  auto vi2 = *GetVertex(face.vertex[2]);
+
+  IntersectResult result{Vector3::ZERO, 0.0f, 0u, false};
+
+  result.result = RayTriangleIntersect(ray.origin, ray.direction, Vector3(vi0.x, vi0.y, vi0.z), Vector3(vi1.x, vi1.y, vi1.z), Vector3(vi2.x, vi2.y, vi2.z), Vector3(face.normal), result.distance, result.point);
+  return result;
+}
+
+NavigationMesh::IntersectResult NavigationMesh::RayCastIntersect(NavigationRay& rayOrig) const
+{
+  auto                       faceCount = GetFaceCount();
+  std::list<IntersectResult> results;
+
+  NavigationRay ray;
+
+  ray.origin = PointSceneToLocal(rayOrig.origin); // origin is equal position
+
+  // Ray direction matches gravity direction
+  ray.direction = PointSceneToLocal(rayOrig.origin + rayOrig.direction) - ray.origin;
+  ray.direction.Normalize();
+  for(auto i = 0u; i < faceCount; ++i)
+  {
+    auto result = NavigationRayFaceIntersection(ray, *GetFace(i));
+    if(result.result)
+    {
+      result.faceIndex = i;
+      if(results.empty())
+      {
+        results.push_back(result);
+      }
+      else
+      {
+        for(auto it = results.begin(); it != results.end(); ++it)
+        {
+          if((*it).distance > result.distance)
+          {
+            results.insert(it, result);
+            break;
+          }
+        }
+      }
+    }
+  }
+  if(!results.empty())
+  {
+    return results.front();
+  }
+  else
+  {
+    return IntersectResult{Vector3::ZERO, 0.0f, 0u, false};
+  }
+}
+
+void NavigationMesh::SetTransform(const Dali::Matrix& transform)
+{
+  mTransform        = transform;
+  mTransformInverse = mTransform;
+  mTransformInverse.Invert();
+}
+
+Dali::Vector3 NavigationMesh::PointSceneToLocal(const Dali::Vector3& point) const
+{
+  Dali::Vector4 invNewPos = mTransformInverse * Dali::Vector4(point.x, point.y, point.z, 1.0f);
+
+  return Dali::Vector3(invNewPos.AsFloat());
+}
+
+Dali::Vector3 NavigationMesh::PointLocalToScene(const Dali::Vector3& point) const
+{
+  // Transform point into scene transform space
+  Dali::Vector4 newPos = mTransform * Dali::Vector4(point.x, point.y, point.z, 1.0f);
+
+  return Dali::Vector3(newPos.AsFloat());
+}
+
+Dali::Vector3 NavigationMesh::GetGravityVector() const
+{
+  return Dali::Vector3(mHeader.gravityVector);
+}
+
+} // namespace Dali::Scene3D::Internal::Algorithm
\ No newline at end of file
diff --git a/dali-scene3d/internal/algorithm/navigation-mesh-impl.h b/dali-scene3d/internal/algorithm/navigation-mesh-impl.h
new file mode 100644
index 0000000..e2ee0fc
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/navigation-mesh-impl.h
@@ -0,0 +1,197 @@
+#ifndef DALI_SCENE3D_INTERNAL_NAVIGATION_MESH_H
+#define DALI_SCENE3D_INTERNAL_NAVIGATION_MESH_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL EXTERNAL
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/math/vector4.h>
+
+#include <cinttypes>
+#include <cstdio>
+#include <mutex>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/navigation-mesh-header.h>
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+#include <dali-scene3d/public-api/algorithm/path-finder.h>
+
+namespace Dali::Scene3D::Loader
+{
+class NavigationMeshFactory;
+}
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+// Internal Navigation ray structure
+struct NavigationRay
+{
+  Dali::Vector3 origin;    // Origin of ray
+  Dali::Vector3 direction; // Direction of ray
+};
+
+// Make each to change each index value's type here.
+using VertexIndex = Dali::Scene3D::Algorithm::VertexIndex;
+using EdgeIndex   = Dali::Scene3D::Algorithm::EdgeIndex;
+using FaceIndex   = Dali::Scene3D::Algorithm::FaceIndex;
+
+/**
+ * @class NavigationMesh
+ */
+class NavigationMesh
+{
+public:
+  using Face   = Dali::Scene3D::Algorithm::NavigationMesh::Face;
+  using Edge   = Dali::Scene3D::Algorithm::NavigationMesh::Edge;
+  using Vertex = Dali::Scene3D::Algorithm::NavigationMesh::Vertex;
+
+private:
+  friend class Scene3D::Loader::NavigationMeshFactory;
+
+  /**
+   * Constructor
+   */
+  NavigationMesh(const std::vector<uint8_t>& buffer);
+
+public:
+  /**
+   * Destructor
+   */
+  ~NavigationMesh() = default;
+
+  /**
+   * Result of Ray/Polygon intersection
+   */
+  struct IntersectResult
+  {
+    Dali::Vector3 point;
+    float         distance;
+    FaceIndex     faceIndex;
+    bool          result;
+  };
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::GetFaceCount()
+   */
+  [[nodiscard]] uint32_t GetFaceCount() const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::GetEdgeCount()
+   */
+  [[nodiscard]] uint32_t GetEdgeCount() const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::GetVertexCount()
+   */
+  [[nodiscard]] uint32_t GetVertexCount() const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::FindFloorForFace()
+   */
+  bool FindFloorForFace(const Dali::Vector3& position, FaceIndex faceIndex, bool dontCheckNeighbours, Dali::Vector3& outPosition);
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::FindFloor()
+   */
+  bool FindFloor(const Dali::Vector3& position, Dali::Vector3& outPosition);
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::FindFloor()
+   */
+  bool FindFloor(const Dali::Vector3& position, Dali::Vector3& outPosition, FaceIndex& outFaceIndex);
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::GetFace()
+   */
+  [[nodiscard]] const Face* GetFace(FaceIndex index) const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::GetEdge()
+   */
+  [[nodiscard]] const Edge* GetEdge(EdgeIndex index) const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::GetVertex()
+   */
+  [[nodiscard]] const Vertex* GetVertex(VertexIndex index) const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::SetSceneTransform()
+   */
+  void SetTransform(const Dali::Matrix& transform);
+
+  /**
+   * Tests intersection between navigation ray and face
+   */
+  IntersectResult NavigationRayFaceIntersection(NavigationRay& ray, const Face& face) const;
+
+  /**
+   * @brief Test ray against the mesh and returns intersection result
+   * @param[in] rayOrig Input ray to test collision
+   *
+   * @return Valid IntersectResult structure
+   */
+  IntersectResult RayCastIntersect(NavigationRay& rayOrig) const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::PointSceneToLocal()
+   */
+  Dali::Vector3 PointSceneToLocal(const Dali::Vector3& point) const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::PointLocalToScene()
+   */
+  Dali::Vector3 PointLocalToScene(const Dali::Vector3& point) const;
+
+  /**
+   * @copydoc Dali::Scene3D::Algorithm::NavigationMesh::GetGravityVector()
+   */
+  [[nodiscard]] Dali::Vector3 GetGravityVector() const;
+
+  /**
+   * @brief Returns binary data of the mesh
+   * @return Reference to the binary buffer
+   */
+  [[nodiscard]] const std::vector<uint8_t>& GetData() const
+  {
+    return mBuffer;
+  }
+
+private:
+  std::vector<uint8_t>     mBuffer;           //< Data buffer
+  NavigationMeshHeader_V10 mHeader;           //< Navigation mesh header
+  FaceIndex                mCurrentFace;      //< Current face (last floor position)
+  Dali::Matrix             mTransform;        //< Transform matrix
+  Dali::Matrix             mTransformInverse; //< Inverse of the transform matrix
+};
+
+inline Internal::Algorithm::NavigationMesh& GetImplementation(Dali::Scene3D::Algorithm::NavigationMesh& navigationMesh)
+{
+  return *navigationMesh.mImpl;
+}
+
+inline const Internal::Algorithm::NavigationMesh& GetImplementation(const Dali::Scene3D::Algorithm::NavigationMesh& navigationMesh)
+{
+  return *navigationMesh.mImpl;
+}
+
+} // namespace Dali::Scene3D::Internal::Algorithm
+
+#endif // DALI_SCENE3D_INTERNAL_NAVIGATION_MESH_H
diff --git a/dali-scene3d/internal/algorithm/path-finder-dijkstra.cpp b/dali-scene3d/internal/algorithm/path-finder-dijkstra.cpp
new file mode 100644
index 0000000..ad64b96
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/path-finder-dijkstra.cpp
@@ -0,0 +1,336 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/algorithm/path-finder-dijkstra.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <limits>
+#include <algorithm> ///< for std::priority_queue
+#include <queue>     ///< for std::priority_queue
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/path-finder-waypoint-data.h>
+#include <dali-scene3d/public-api/algorithm/path-finder-waypoint.h>
+
+using WayPointList = Dali::Scene3D::Algorithm::WayPointList;
+
+namespace
+{
+struct DijkstraComparer
+{
+  float                               distance{-1.0f};
+  Dali::Scene3D::Algorithm::FaceIndex index{Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE};
+
+  /**
+   * @brief Custom operator for Dijkstra comparer.
+   *
+   * @param[in] rhs Target to be compared.
+   * @return True if this has less priority than rhs.
+   */
+  bool operator<(const DijkstraComparer& rhs) const
+  {
+    // Shorter distance have higher prioirty.
+    return distance > rhs.distance;
+  }
+};
+} // namespace
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+PathFinderAlgorithmDijkstra::PathFinderAlgorithmDijkstra(Dali::Scene3D::Algorithm::NavigationMesh& navMesh)
+: mNavigationMesh(&GetImplementation(navMesh))
+{
+  PrepareData();
+}
+
+PathFinderAlgorithmDijkstra::~PathFinderAlgorithmDijkstra() = default;
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmDijkstra::FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo)
+{
+  Dali::Vector3 outPosFrom;
+  FaceIndex     polyIndexFrom;
+  auto          result = mNavigationMesh->FindFloor(positionFrom, outPosFrom, polyIndexFrom);
+
+  Scene3D::Algorithm::WayPointList waypoints;
+
+  if(result)
+  {
+    Dali::Vector3 outPosTo;
+    FaceIndex     polyIndexTo;
+    result = mNavigationMesh->FindFloor(positionTo, outPosTo, polyIndexTo);
+
+    if(result)
+    {
+      // Get waypoints
+      waypoints = FindPath(polyIndexFrom, polyIndexTo);
+
+      if(!waypoints.empty())
+      {
+        // replace first and last waypoint
+        auto& wpFrom = static_cast<WayPointData&>(waypoints[0]);
+        auto& wpTo   = static_cast<WayPointData&>(waypoints.back());
+
+        Vector2 fromCenter(wpFrom.point3d.x, wpFrom.point3d.y);
+        wpFrom.point3d = outPosFrom;
+        wpFrom.point2d = fromCenter - Vector2(outPosFrom.x, outPosFrom.y);
+
+        Vector2 toCenter(wpTo.point3d.x, wpTo.point3d.y);
+        wpTo.point3d = outPosTo;
+        wpTo.point2d = toCenter - Vector2(outPosTo.x, outPosTo.y);
+      }
+    }
+  }
+
+  // Returns waypoints with non-zero size of empty vector in case of failure (no path to be found)
+  return waypoints;
+}
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmDijkstra::FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex)
+{
+  auto                   nodeCount = uint32_t(mNodes.size());
+  std::vector<float>     dist;
+  std::vector<FaceIndex> prev;
+  std::vector<bool>      faceVisited;
+
+  std::priority_queue<DijkstraComparer> priorityDistanceHeap;
+
+  dist.resize(mNodes.size());
+  prev.resize(mNodes.size());
+
+  faceVisited.resize(nodeCount);
+
+  for(auto i = 0u; i < nodeCount; ++i)
+  {
+    dist[i] = std::numeric_limits<float>::infinity();
+    prev[i] = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    faceVisited[i] = false;
+  }
+
+  // Set distance of source
+  dist[sourcePolyIndex] = 0.0f;
+
+  priorityDistanceHeap.push({dist[sourcePolyIndex], sourcePolyIndex});
+
+  while(!priorityDistanceHeap.empty())
+  {
+    // find minimum distance index
+    auto comparer = priorityDistanceHeap.top();
+    priorityDistanceHeap.pop();
+
+    auto  minDistanceIndex = comparer.index;
+
+    // Old item. just ignore.
+    if(faceVisited[minDistanceIndex])
+    {
+      continue;
+    }
+
+    faceVisited[minDistanceIndex] = true;
+
+    // Fast break if we found solution.
+    if(minDistanceIndex == targetPolyIndex)
+    {
+      break;
+    }
+
+    // check the neighbours
+    for(auto i = 0u; i < 3; ++i)
+    {
+      auto nIndex = mNodes[minDistanceIndex].faces[i];
+      if(nIndex != Scene3D::Algorithm::NavigationMesh::NULL_FACE && !faceVisited[nIndex])
+      {
+        auto alt = dist[minDistanceIndex] + mNodes[minDistanceIndex].weight[i];
+        if(alt < dist[nIndex])
+        {
+          dist[nIndex] = alt;
+          prev[nIndex] = minDistanceIndex;
+
+          priorityDistanceHeap.push({dist[nIndex], nIndex});
+        }
+      }
+    }
+  }
+
+  // Failed to find minimum distance
+  if(!faceVisited[targetPolyIndex])
+  {
+    // Return empty WayPointList
+    return {};
+  }
+
+  // Compute distances for each node back to the source
+  auto                 u = targetPolyIndex;
+  std::list<FaceIndex> q;
+  if(prev[u] != Scene3D::Algorithm::NavigationMesh::NULL_FACE || u == sourcePolyIndex)
+  {
+    while(u != Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+    {
+      q.push_front(u);
+      u = prev[u];
+    }
+  }
+
+  WayPointList waypoints;
+  waypoints.resize(q.size());
+
+  auto index = 0u;
+  auto prevN = 0u;
+  for(auto n : q)
+  {
+    auto& wp     = static_cast<WayPointData&>(waypoints[index]);
+    wp.face      = mNavigationMesh->GetFace(n);
+    wp.nodeIndex = n;
+
+    wp.edge = nullptr;
+    // set the common edge with previous node
+    if(index > 0)
+    {
+      const auto& node = mNodes[prevN];
+      for(auto i = 0u; i < 3; ++i)
+      {
+        if(node.faces[i] == wp.nodeIndex)
+        {
+          wp.edge = mNavigationMesh->GetEdge(node.edges[i]);
+          break;
+        }
+      }
+    }
+
+    prevN = n;
+    index++;
+  }
+
+  return OptimizeWaypoints(waypoints);
+}
+
+void PathFinderAlgorithmDijkstra::PrepareData()
+{
+  // Build the list structure connecting the nodes
+  auto faceCount = mNavigationMesh->GetFaceCount();
+
+  mNodes.resize(faceCount);
+
+  // for each face build the list
+  // TODO : Currently, we are assume that FaceNodeIndex is matched with FaceIndex 1:1. This might be changed in future.
+  for(auto i = 0u; i < faceCount; ++i)
+  {
+    auto&       node = mNodes[i];
+    const auto* face = mNavigationMesh->GetFace(i);
+    auto        c0   = Dali::Vector3(face->center);
+
+    // for each edge add neighbouring face and compute distance to set the weight of node
+    for(auto edgeIndex = 0u; edgeIndex < 3; ++edgeIndex)
+    {
+      const auto* edge = mNavigationMesh->GetEdge(face->edge[edgeIndex]);
+      auto        p1   = edge->face[0];
+      auto        p2   = edge->face[1];
+
+      // One of faces is current face so ignore it
+      auto p                = ((p1 != i) ? p1 : p2);
+      node.faces[edgeIndex] = p;
+      if(p != ::Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+      {
+        node.edges[edgeIndex]  = face->edge[edgeIndex];
+        auto c1                = Dali::Vector3(mNavigationMesh->GetFace(p)->center);
+        node.weight[edgeIndex] = (c1 - c0).Length();
+      }
+    }
+  }
+}
+
+[[maybe_unused]] static float ccw(const Dali::Vector2& A, const Dali::Vector2& B, const Dali::Vector2& C)
+{
+  return (C.y - A.y) * (B.x - A.x) > (B.y - A.y) * (C.x - A.x);
+}
+
+[[maybe_unused]] static bool intersect(const Dali::Vector2& A, const Dali::Vector2& B, const Dali::Vector2& C, const Dali::Vector2& D)
+{
+  return ccw(A, C, D) != ccw(B, C, D) && ccw(A, B, C) != ccw(A, B, D);
+}
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmDijkstra::OptimizeWaypoints(WayPointList& waypoints) const
+{
+  WayPointList optimizedWaypoints;
+  optimizedWaypoints.emplace_back(waypoints[0]);
+  optimizedWaypoints.reserve(waypoints.size());
+
+  auto startIndex = 1u;
+
+  bool finished = false;
+  for(auto j = 0; !finished; ++j)
+  {
+    auto&       startWaypoint     = optimizedWaypoints.back();
+    const auto& startWaypointData = static_cast<const WayPointData&>(startWaypoint);
+
+    // add new-last waypoint which will be overriden as long as intersection takes place
+    optimizedWaypoints.emplace_back();
+    for(auto wpIndex = startIndex; wpIndex < waypoints.size(); ++wpIndex)
+    {
+      if(wpIndex == waypoints.size() - 1)
+      {
+        optimizedWaypoints.back() = waypoints.back();
+        finished                  = true;
+        continue;
+      }
+      // Points between centres of faces
+
+      const auto& wpData = static_cast<const WayPointData&>(waypoints[wpIndex]);
+
+      auto Pa0 = Dali::Vector2(startWaypointData.face->center[0], startWaypointData.face->center[1]);
+      auto Pa1 = Dali::Vector2(wpData.face->center[0], wpData.face->center[1]);
+
+      bool doesIntersect = true;
+      for(auto i = startIndex; i < wpIndex; ++i)
+      {
+        const auto& wp = static_cast<WayPointData&>(waypoints[i]);
+        // Skip starting waypoint
+        if(wp.face == startWaypointData.face)
+        {
+          continue;
+        }
+        auto Pb0  = mNavigationMesh->GetVertex(wp.edge->vertex[0]);
+        auto Pb1  = mNavigationMesh->GetVertex(wp.edge->vertex[1]);
+        auto vPb0 = Dali::Vector2(Pb0->x, Pb0->y);
+        auto vPb1 = Dali::Vector2(Pb1->x, Pb1->y);
+
+        doesIntersect = intersect(Pa0, Pa1, vPb0, vPb1);
+        if(!doesIntersect)
+        {
+          break;
+        }
+      }
+
+      if(!doesIntersect)
+      {
+        optimizedWaypoints.back() = waypoints[wpIndex - 1];
+        startIndex                = wpIndex - 1;
+        break;
+      }
+    }
+  }
+
+  for(auto& wp : optimizedWaypoints)
+  {
+    auto& wpData   = static_cast<WayPointData&>(wp);
+    wpData.point3d = mNavigationMesh->PointLocalToScene(Dali::Vector3(wpData.face->center));
+    wpData.point2d = Vector2::ZERO;
+  }
+
+  return optimizedWaypoints;
+}
+} // namespace Dali::Scene3D::Internal::Algorithm
diff --git a/dali-scene3d/internal/algorithm/path-finder-dijkstra.h b/dali-scene3d/internal/algorithm/path-finder-dijkstra.h
new file mode 100644
index 0000000..237b1c9
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/path-finder-dijkstra.h
@@ -0,0 +1,88 @@
+#ifndef DALI_SCENE3D_INTERNAL_PATH_FINDER_DIJKSTRA_H
+#define DALI_SCENE3D_INTERNAL_PATH_FINDER_DIJKSTRA_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+#include <dali-scene3d/public-api/algorithm/path-finder.h>
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+class PathFinderAlgorithmDijkstra : public Dali::Scene3D::Algorithm::PathFinderBase
+{
+public:
+  /**
+   * @brief Constructor
+   *
+   * @param[in] navMesh Navigation mesh to associate with the algorithm
+   */
+  explicit PathFinderAlgorithmDijkstra(Dali::Scene3D::Algorithm::NavigationMesh& navMesh);
+
+  /**
+   * @brief Destructor
+   */
+  ~PathFinderAlgorithmDijkstra() override;
+
+  /**
+   * @brief Looks for a path from point A to point B.
+   *
+   * @param[in] positionFrom source position in NavigationMesh parent space
+   * @param[in] positionTo target position in NavigationMesh parent space
+   * @return List of waypoints for path
+   */
+  Scene3D::Algorithm::WayPointList FindPath(const Dali::Vector3& PositionFrom, const Dali::Vector3& PositionTo) override;
+
+  /**
+   * @brief Finds path between NavigationMesh faces
+   *
+   * @param[in] polyIndexFrom Index of start polygon
+   * @param[in] polyIndexTo Index of end polygon
+   * @return List of waypoints for path
+   */
+  Scene3D::Algorithm::WayPointList FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex) override;
+
+  [[nodiscard]] inline const NavigationMesh::Face* Face(FaceIndex faceIndex) const
+  {
+    return mNavigationMesh->GetFace(faceIndex);
+  }
+
+  /**
+   * Build the graph of nodes
+   * distance between nodes is weight of node
+   */
+  void PrepareData();
+
+  Scene3D::Algorithm::WayPointList OptimizeWaypoints(Scene3D::Algorithm::WayPointList& waypoints) const;
+
+  /**
+   * Structure describes single node of pathfinding algorithm
+   */
+  struct FaceNode
+  {
+    // neighbours
+    FaceIndex faces[3];  ///< List of neighbouring faces (max 3 for a triangle)
+    EdgeIndex edges[3];  ///< List of edges (max 3 for a triangle)
+    float     weight[3]; ///< List of weights (by distance) to each neighbour
+  };
+  using FaceNodeIndex = FaceIndex;
+
+  NavigationMesh*       mNavigationMesh; ///< Pointer to a valid NavigationMesh
+  std::vector<FaceNode> mNodes;          ///< List of nodes
+};
+} // namespace Dali::Scene3D::Internal::Algorithm
+#endif // DALI_SCENE3D_INTERNAL_PATH_FINDER_DIJKSTRA_H
diff --git a/dali-scene3d/internal/algorithm/path-finder-spfa-double-way.cpp b/dali-scene3d/internal/algorithm/path-finder-spfa-double-way.cpp
new file mode 100644
index 0000000..53ab038
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/path-finder-spfa-double-way.cpp
@@ -0,0 +1,482 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/algorithm/path-finder-spfa-double-way.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <limits>
+#include <unordered_set>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/path-finder-waypoint-data.h>
+#include <dali-scene3d/public-api/algorithm/path-finder-waypoint.h>
+
+using WayPointList  = Dali::Scene3D::Algorithm::WayPointList;
+using FaceNodeIndex = Dali::Scene3D::Internal::Algorithm::PathFinderAlgorithmSPFADoubleWay::FaceNodeIndex;
+
+namespace
+{
+constexpr float PRIORITY_SCALE_FACTOR = 0.7f; ///< The value of heuristic factor that how much will you consider
+                                              ///  direction of source --> target. If 0.0f, we will use only dist.
+
+/**
+ * @brief Get the Component Id object
+ *
+ * @param[in,out] components Container of components id stored.
+ * @param[in] index index what we want to get components's id.
+ * @return FaceIndex top-value of this components.
+ */
+FaceNodeIndex GetComponentId(std::vector<FaceNodeIndex>& components, FaceNodeIndex index)
+{
+  if(components[index] == index)
+  {
+    return index;
+  }
+  // Get my parent's components id, and update myself.
+  FaceNodeIndex ret        = GetComponentId(components, components[index]);
+  return components[index] = ret;
+}
+
+/**
+ * @brief Combine two elements by Union-Find algorithm.
+ *
+ * @param[in,out] components Container of components id stored.
+ * @param[in,out] componentsLevel Container of components level stored.
+ * @param[in] index0 index of components what we want to be combined.
+ * @param[in] index1 index of components what we want to be combined.
+ */
+void ComponentsCombine(std::vector<FaceNodeIndex>& components, std::vector<FaceNodeIndex>& componentsLevel, FaceNodeIndex index0, FaceNodeIndex index1)
+{
+  FaceNodeIndex ancestor0 = GetComponentId(components, index0);
+  FaceNodeIndex ancestor1 = GetComponentId(components, index1);
+  if(ancestor0 == ancestor1)
+  {
+    return;
+  }
+
+  if(componentsLevel[ancestor0] < componentsLevel[ancestor1])
+  {
+    components[ancestor0] = ancestor1;
+  }
+  else
+  {
+    components[ancestor1] = ancestor0;
+    if(componentsLevel[ancestor0] == componentsLevel[ancestor1])
+    {
+      ++componentsLevel[ancestor0];
+    }
+  }
+}
+} // namespace
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+PathFinderAlgorithmSPFADoubleWay::PathFinderAlgorithmSPFADoubleWay(Dali::Scene3D::Algorithm::NavigationMesh& navMesh)
+: mNavigationMesh(&GetImplementation(navMesh))
+{
+  PrepareData();
+}
+
+PathFinderAlgorithmSPFADoubleWay::~PathFinderAlgorithmSPFADoubleWay() = default;
+
+float PathFinderAlgorithmSPFADoubleWay::DistancePanaltyCalculate(FaceIndex index) const noexcept
+{
+  return dist[index] - priority[index] * PRIORITY_SCALE_FACTOR;
+}
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmSPFADoubleWay::FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo)
+{
+  Dali::Vector3 outPosFrom;
+  FaceIndex     polyIndexFrom;
+  auto          result = mNavigationMesh->FindFloor(positionFrom, outPosFrom, polyIndexFrom);
+
+  Scene3D::Algorithm::WayPointList waypoints;
+
+  if(result)
+  {
+    Dali::Vector3 outPosTo;
+    FaceIndex     polyIndexTo;
+    result = mNavigationMesh->FindFloor(positionTo, outPosTo, polyIndexTo);
+
+    if(result)
+    {
+      // Get waypoints
+      waypoints = FindPath(polyIndexFrom, polyIndexTo);
+
+      if(!waypoints.empty())
+      {
+        // replace first and last waypoint
+        auto& wpFrom = static_cast<WayPointData&>(waypoints[0]);
+        auto& wpTo   = static_cast<WayPointData&>(waypoints.back());
+
+        Vector2 fromCenter(wpFrom.point3d.x, wpFrom.point3d.y);
+        wpFrom.point3d = outPosFrom;
+        wpFrom.point2d = fromCenter - Vector2(outPosFrom.x, outPosFrom.y);
+
+        Vector2 toCenter(wpTo.point3d.x, wpTo.point3d.y);
+        wpTo.point3d = outPosTo;
+        wpTo.point2d = toCenter - Vector2(outPosTo.x, outPosTo.y);
+      }
+    }
+  }
+
+  // Returns waypoints with non-zero size of empty vector in case of failure (no path to be found)
+  return waypoints;
+}
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmSPFADoubleWay::FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex)
+{
+  // Fast return if source and target index is same.
+  if(sourcePolyIndex == targetPolyIndex)
+  {
+    WayPointList waypoints;
+    waypoints.resize(1);
+
+    auto& wp     = static_cast<WayPointData&>(waypoints[0]);
+    wp.face      = mNavigationMesh->GetFace(sourcePolyIndex);
+    wp.nodeIndex = sourcePolyIndex;
+    wp.edge      = nullptr;
+
+    return OptimizeWaypoints(waypoints);
+  }
+
+  // Fast return if source and target index is not in same components.
+  // That mean, there is no path. Return empty list.
+  if(GetComponentId(componentIds, sourcePolyIndex) != GetComponentId(componentIds, targetPolyIndex))
+  {
+    return WayPointList();
+  }
+
+  // pair<navimesh FaceIndex, is backward direction>
+  using queueItem = std::pair<FaceIndex, uint8_t>;
+
+  std::list<queueItem> nodeQueue;
+
+  std::unordered_set<FaceIndex> usedPolyIndexs[2];
+
+  // Set distance of source and target
+  dist[sourcePolyIndex]     = 0.0f;
+  dist[targetPolyIndex]     = 0.0f;
+  priority[sourcePolyIndex] = 0.0f;
+  priority[targetPolyIndex] = 0.0f;
+  queued[sourcePolyIndex]   = true;
+  queued[targetPolyIndex]   = true;
+  nodeQueue.push_back(std::make_pair(sourcePolyIndex, 0));
+  nodeQueue.push_back(std::make_pair(targetPolyIndex, 1));
+  usedPolyIndexs[0].insert(sourcePolyIndex);
+  usedPolyIndexs[1].insert(targetPolyIndex);
+
+  bool      foundPath          = false;
+  FaceIndex forwardEndIndex    = Scene3D::Algorithm::NavigationMesh::NULL_FACE;
+  FaceIndex backwardStartIndex = Scene3D::Algorithm::NavigationMesh::NULL_FACE;
+
+  const auto sourcePos = Dali::Vector3(Face(sourcePolyIndex)->center);
+  const auto targetPos = Dali::Vector3(Face(targetPolyIndex)->center);
+  Vector3    direction = targetPos - sourcePos;
+  direction.Normalize();
+
+  // Note : we always success to found path since source and target is in same components.
+  while(!foundPath)
+  {
+    // find minimum distance
+    auto minDistIndex = nodeQueue.front().first;
+    auto isBackward   = nodeQueue.front().second;
+    nodeQueue.pop_front();
+    queued[minDistIndex] = false;
+
+    // check the neighbours
+    for(auto i = 0u; i < 3 && !foundPath; ++i)
+    {
+      auto nIndex = mNodes[minDistIndex].faces[i];
+      if(nIndex != Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+      {
+        if(usedPolyIndexs[!isBackward].count(nIndex))
+        {
+          // We found path!
+          foundPath = true;
+          if(isBackward)
+          {
+            forwardEndIndex    = nIndex;
+            backwardStartIndex = minDistIndex;
+          }
+          else
+          {
+            forwardEndIndex    = minDistIndex;
+            backwardStartIndex = nIndex;
+          }
+          break;
+        }
+
+        usedPolyIndexs[isBackward].insert(nIndex);
+
+        auto alt = dist[minDistIndex] + mNodes[minDistIndex].weight[i];
+        if(alt < dist[nIndex])
+        {
+          dist[nIndex] = alt;
+
+          if(isBackward)
+          {
+            prevBackward[nIndex] = minDistIndex;
+            if(priority[nIndex] < 0.0f)
+            {
+              const auto currentPos = Dali::Vector3(Face(nIndex)->center);
+              Vector3    diff       = currentPos - targetPos;
+              priority[nIndex]      = std::max(0.0f, -direction.Dot(diff));
+            }
+          }
+          else
+          {
+            prevForward[nIndex] = minDistIndex;
+            if(priority[nIndex] < 0.0f)
+            {
+              const auto currentPos = Dali::Vector3(Face(nIndex)->center);
+              Vector3    diff       = currentPos - sourcePos;
+              priority[nIndex]      = std::max(0.0f, direction.Dot(diff));
+            }
+          }
+
+          if(!queued[nIndex])
+          {
+            queued[nIndex] = true;
+            if(!nodeQueue.empty() && DistancePanaltyCalculate(nIndex) < DistancePanaltyCalculate(nodeQueue.front().first))
+            {
+              nodeQueue.push_front(std::make_pair(nIndex, isBackward));
+            }
+            else
+            {
+              nodeQueue.push_back(std::make_pair(nIndex, isBackward));
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // Build path of face index
+  std::list<FaceIndex> q;
+  {
+    FaceIndex u = forwardEndIndex;
+    while(u != Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+    {
+      q.push_front(u);
+      u = prevForward[u];
+    }
+  }
+  {
+    FaceIndex u = backwardStartIndex;
+    while(u != Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+    {
+      q.push_back(u);
+      u = prevBackward[u];
+    }
+  }
+
+  WayPointList waypoints;
+  waypoints.resize(q.size());
+
+  auto index = 0u;
+  auto prevN = 0u;
+  for(auto n : q)
+  {
+    auto& wp     = static_cast<WayPointData&>(waypoints[index]);
+    wp.face      = mNavigationMesh->GetFace(n);
+    wp.nodeIndex = n;
+
+    wp.edge = nullptr;
+    // set the common edge with previous node
+    if(index > 0)
+    {
+      const auto& node = mNodes[prevN];
+      for(auto i = 0u; i < 3; ++i)
+      {
+        if(node.faces[i] == wp.nodeIndex)
+        {
+          wp.edge = mNavigationMesh->GetEdge(node.edges[i]);
+          break;
+        }
+      }
+    }
+
+    prevN = n;
+    index++;
+  }
+
+  // Reset informations what we used.
+  // Forward indexes
+  for(const auto& i : usedPolyIndexs[0])
+  {
+    dist[i]         = std::numeric_limits<float>::infinity();
+    priority[i]     = -1.0f;                                         // Initialize by negative value, that we didn't calculate yet.
+    prevForward[i]  = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    prevBackward[i] = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    queued[i]       = false;
+  }
+  // Backward indexes
+  for(const auto& i : usedPolyIndexs[1])
+  {
+    dist[i]         = std::numeric_limits<float>::infinity();
+    priority[i]     = -1.0f;                                         // Initialize by negative value, that we didn't calculate yet.
+    prevForward[i]  = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    prevBackward[i] = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    queued[i]       = false;
+  }
+
+  return OptimizeWaypoints(waypoints);
+}
+
+void PathFinderAlgorithmSPFADoubleWay::PrepareData()
+{
+  // Build the list structure connecting the nodes
+  auto faceCount = mNavigationMesh->GetFaceCount();
+
+  mNodes.resize(faceCount);
+  dist.resize(faceCount);
+  priority.resize(faceCount);
+  prevForward.resize(faceCount);
+  prevBackward.resize(faceCount);
+  componentIds.resize(faceCount);
+  queued.resize(faceCount);
+
+  // Temperal container for components level. It will be used for Union-Find algorithm.
+  std::vector<FaceNodeIndex> componentLevels(faceCount);
+
+  // Initialize path informations.
+  for(FaceNodeIndex i = 0u; i < faceCount; ++i)
+  {
+    dist[i]         = std::numeric_limits<float>::infinity();
+    priority[i]     = -1.0f;                                         // Initialize by negative value, that we didn't calculate yet.
+    prevForward[i]  = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    prevBackward[i] = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    queued[i]       = false;
+
+    componentIds[i]    = i; // Components id should be initialized by itself.
+    componentLevels[i] = 0u;
+  }
+
+  // for each face build the list
+  // TODO : Currently, we are assume that FaceNodeIndex is matched with FaceIndex 1:1. This might be changed in future.
+  for(FaceNodeIndex i = 0u; i < faceCount; ++i)
+  {
+    auto&       node = mNodes[i];
+    const auto* face = mNavigationMesh->GetFace(i);
+    auto        c0   = Dali::Vector3(face->center);
+
+    // for each edge add neighbouring face and compute distance to set the weight of node
+    for(auto edgeIndex = 0u; edgeIndex < 3; ++edgeIndex)
+    {
+      const auto* edge = mNavigationMesh->GetEdge(face->edge[edgeIndex]);
+      auto        p1   = edge->face[0];
+      auto        p2   = edge->face[1];
+
+      // One of faces is current face so ignore it
+      auto p                = ((p1 != i) ? p1 : p2);
+      node.faces[edgeIndex] = p;
+      if(p != ::Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+      {
+        node.edges[edgeIndex]  = face->edge[edgeIndex];
+        auto c1                = Dali::Vector3(mNavigationMesh->GetFace(p)->center);
+        node.weight[edgeIndex] = (c1 - c0).Length();
+
+        // Connect two components
+        ComponentsCombine(componentIds, componentLevels, i, p);
+      }
+    }
+  }
+}
+
+[[maybe_unused]] static float ccw(const Dali::Vector2& A, const Dali::Vector2& B, const Dali::Vector2& C)
+{
+  return (C.y - A.y) * (B.x - A.x) > (B.y - A.y) * (C.x - A.x);
+}
+
+[[maybe_unused]] static bool intersect(const Dali::Vector2& A, const Dali::Vector2& B, const Dali::Vector2& C, const Dali::Vector2& D)
+{
+  return ccw(A, C, D) != ccw(B, C, D) && ccw(A, B, C) != ccw(A, B, D);
+}
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmSPFADoubleWay::OptimizeWaypoints(WayPointList& waypoints) const
+{
+  WayPointList optimizedWaypoints;
+  optimizedWaypoints.emplace_back(waypoints[0]);
+  optimizedWaypoints.reserve(waypoints.size());
+
+  auto startIndex = 1u;
+
+  bool finished = false;
+  for(auto j = 0; !finished; ++j)
+  {
+    auto&       startWaypoint     = optimizedWaypoints.back();
+    const auto& startWaypointData = static_cast<const WayPointData&>(startWaypoint);
+
+    // add new-last waypoint which will be overriden as long as intersection takes place
+    optimizedWaypoints.emplace_back();
+    for(auto wpIndex = startIndex; wpIndex < waypoints.size(); ++wpIndex)
+    {
+      if(wpIndex == waypoints.size() - 1)
+      {
+        optimizedWaypoints.back() = waypoints.back();
+        finished                  = true;
+        continue;
+      }
+      // Points between centres of faces
+
+      const auto& wpData = static_cast<const WayPointData&>(waypoints[wpIndex]);
+
+      auto Pa0 = Dali::Vector2(startWaypointData.face->center[0], startWaypointData.face->center[1]);
+      auto Pa1 = Dali::Vector2(wpData.face->center[0], wpData.face->center[1]);
+
+      bool doesIntersect = true;
+      for(auto i = startIndex; i < wpIndex; ++i)
+      {
+        const auto& wp = static_cast<WayPointData&>(waypoints[i]);
+        // Skip starting waypoint
+        if(wp.face == startWaypointData.face)
+        {
+          continue;
+        }
+        auto Pb0  = mNavigationMesh->GetVertex(wp.edge->vertex[0]);
+        auto Pb1  = mNavigationMesh->GetVertex(wp.edge->vertex[1]);
+        auto vPb0 = Dali::Vector2(Pb0->x, Pb0->y);
+        auto vPb1 = Dali::Vector2(Pb1->x, Pb1->y);
+
+        doesIntersect = intersect(Pa0, Pa1, vPb0, vPb1);
+        if(!doesIntersect)
+        {
+          break;
+        }
+      }
+
+      if(!doesIntersect)
+      {
+        optimizedWaypoints.back() = waypoints[wpIndex - 1];
+        startIndex                = wpIndex - 1;
+        break;
+      }
+    }
+  }
+
+  for(auto& wp : optimizedWaypoints)
+  {
+    auto& wpData   = static_cast<WayPointData&>(wp);
+    wpData.point3d = mNavigationMesh->PointLocalToScene(Dali::Vector3(wpData.face->center));
+    wpData.point2d = Vector2::ZERO;
+  }
+
+  return optimizedWaypoints;
+}
+} // namespace Dali::Scene3D::Internal::Algorithm
diff --git a/dali-scene3d/internal/algorithm/path-finder-spfa-double-way.h b/dali-scene3d/internal/algorithm/path-finder-spfa-double-way.h
new file mode 100644
index 0000000..60b7469
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/path-finder-spfa-double-way.h
@@ -0,0 +1,104 @@
+#ifndef DALI_SCENE3D_INTERNAL_PATH_FINDER_SPFA_DOUBLE_WAY_H
+#define DALI_SCENE3D_INTERNAL_PATH_FINDER_SPFA_DOUBLE_WAY_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+#include <dali-scene3d/public-api/algorithm/path-finder.h>
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+class PathFinderAlgorithmSPFADoubleWay : public Dali::Scene3D::Algorithm::PathFinderBase
+{
+public:
+  /**
+   * @brief Constructor
+   *
+   * @param[in] navMesh Navigation mesh to associate with the algorithm
+   */
+  explicit PathFinderAlgorithmSPFADoubleWay(Dali::Scene3D::Algorithm::NavigationMesh& navMesh);
+
+  /**
+   * @brief Destructor
+   */
+  ~PathFinderAlgorithmSPFADoubleWay() override;
+
+  /**
+   * @brief Looks for a path from point A to point B.
+   *
+   * @param[in] positionFrom source position in NavigationMesh parent space
+   * @param[in] positionTo target position in NavigationMesh parent space
+   * @return List of waypoints for path
+   */
+  Scene3D::Algorithm::WayPointList FindPath(const Dali::Vector3& PositionFrom, const Dali::Vector3& PositionTo) override;
+
+  /**
+   * @brief Finds path between NavigationMesh faces
+   *
+   * @param[in] polyIndexFrom Index of start polygon
+   * @param[in] polyIndexTo Index of end polygon
+   * @return List of waypoints for path
+   */
+  Scene3D::Algorithm::WayPointList FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex) override;
+
+  [[nodiscard]] inline const NavigationMesh::Face* Face(FaceIndex faceIndex) const
+  {
+    return mNavigationMesh->GetFace(faceIndex);
+  }
+
+  /**
+   * Build the graph of nodes
+   * distance between nodes is weight of node
+   */
+  void PrepareData();
+
+  Scene3D::Algorithm::WayPointList OptimizeWaypoints(Scene3D::Algorithm::WayPointList& waypoints) const;
+
+  /**
+   * @brief Calculate the panalty of node index. Low panalty "might" be calculated earlier.
+   * @pre dist and priority should be calculated.
+   *
+   * @param[in] index index of node what we want to calculate panantly.
+   */
+  float DistancePanaltyCalculate(FaceIndex index) const noexcept;
+
+  /**
+   * Structure describes single node of pathfinding algorithm
+   */
+  struct FaceNode
+  {
+    // neighbours
+    FaceIndex faces[3];  ///< List of neighbouring faces (max 3 for a triangle)
+    EdgeIndex edges[3];  ///< List of edges (max 3 for a triangle)
+    float     weight[3]; ///< List of weights (by distance) to each neighbour
+  };
+  using FaceNodeIndex = FaceIndex;
+
+  NavigationMesh*       mNavigationMesh; ///< Pointer to a valid NavigationMesh
+  std::vector<FaceNode> mNodes;          ///< List of nodes
+
+private:
+  std::vector<float>         dist;
+  std::vector<float>         priority; ///< Cached priority value. It will be calculated by source & target poly index per every queries.
+  std::vector<FaceIndex>     prevForward;
+  std::vector<FaceIndex>     prevBackward;
+  std::vector<FaceNodeIndex> componentIds; ///< Id of connected components per each nodes. It should be one of node's index.
+  std::vector<bool>          queued;
+};
+} // namespace Dali::Scene3D::Internal::Algorithm
+#endif // DALI_SCENE3D_INTERNAL_PATH_FINDER_SPFA_DOUBLE_WAY_H
diff --git a/dali-scene3d/internal/algorithm/path-finder-spfa.cpp b/dali-scene3d/internal/algorithm/path-finder-spfa.cpp
new file mode 100644
index 0000000..02f308e
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/path-finder-spfa.cpp
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/algorithm/path-finder-spfa.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <limits>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/path-finder-waypoint-data.h>
+#include <dali-scene3d/public-api/algorithm/path-finder-waypoint.h>
+
+using WayPointList = Dali::Scene3D::Algorithm::WayPointList;
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+PathFinderAlgorithmSPFA::PathFinderAlgorithmSPFA(Dali::Scene3D::Algorithm::NavigationMesh& navMesh)
+: mNavigationMesh(&GetImplementation(navMesh))
+{
+  PrepareData();
+}
+
+PathFinderAlgorithmSPFA::~PathFinderAlgorithmSPFA() = default;
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmSPFA::FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo)
+{
+  Dali::Vector3 outPosFrom;
+  FaceIndex     polyIndexFrom;
+  auto          result = mNavigationMesh->FindFloor(positionFrom, outPosFrom, polyIndexFrom);
+
+  Scene3D::Algorithm::WayPointList waypoints;
+
+  if(result)
+  {
+    Dali::Vector3 outPosTo;
+    FaceIndex     polyIndexTo;
+    result = mNavigationMesh->FindFloor(positionTo, outPosTo, polyIndexTo);
+
+    if(result)
+    {
+      // Get waypoints
+      waypoints = FindPath(polyIndexFrom, polyIndexTo);
+
+      if(!waypoints.empty())
+      {
+        // replace first and last waypoint
+        auto& wpFrom = static_cast<WayPointData&>(waypoints[0]);
+        auto& wpTo   = static_cast<WayPointData&>(waypoints.back());
+
+        Vector2 fromCenter(wpFrom.point3d.x, wpFrom.point3d.y);
+        wpFrom.point3d = outPosFrom;
+        wpFrom.point2d = fromCenter - Vector2(outPosFrom.x, outPosFrom.y);
+
+        Vector2 toCenter(wpTo.point3d.x, wpTo.point3d.y);
+        wpTo.point3d = outPosTo;
+        wpTo.point2d = toCenter - Vector2(outPosTo.x, outPosTo.y);
+      }
+    }
+  }
+
+  // Returns waypoints with non-zero size of empty vector in case of failure (no path to be found)
+  return waypoints;
+}
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmSPFA::FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex)
+{
+  auto                   nodeCount = uint32_t(mNodes.size());
+  std::vector<float>     dist;
+  std::vector<FaceIndex> prev;
+  std::vector<bool>      queued;
+
+  dist.resize(mNodes.size());
+  prev.resize(mNodes.size());
+  queued.resize(mNodes.size());
+
+  std::list<FaceIndex> nodeQueue;
+
+  [[maybe_unused]] auto sourcePos = Dali::Vector3(Face(sourcePolyIndex)->center);
+
+  for(auto i = 0u; i < nodeCount; ++i)
+  {
+    dist[i]   = std::numeric_limits<float>::infinity();
+    prev[i]   = Scene3D::Algorithm::NavigationMesh::NULL_FACE; // set prev to null polygon
+    queued[i] = false;
+  }
+
+  // Set distance of source
+  dist[sourcePolyIndex]   = 0.0f;
+  queued[sourcePolyIndex] = true;
+  nodeQueue.push_back(sourcePolyIndex);
+
+  while(!nodeQueue.empty())
+  {
+    // find minimum distance
+    auto minDistIndex = nodeQueue.front();
+    nodeQueue.pop_front();
+    queued[minDistIndex] = false;
+
+    // Skip operator when minDistIndex is target
+    if(minDistIndex == targetPolyIndex)
+    {
+      continue;
+    }
+
+    // check the neighbours
+    for(auto i = 0u; i < 3; ++i)
+    {
+      auto nIndex = mNodes[minDistIndex].faces[i];
+      if(nIndex != Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+      {
+        auto alt = dist[minDistIndex] + mNodes[minDistIndex].weight[i];
+        if(alt < dist[nIndex])
+        {
+          dist[nIndex] = alt;
+          prev[nIndex] = minDistIndex;
+
+          if(!queued[nIndex])
+          {
+            queued[nIndex] = true;
+            if(!nodeQueue.empty() && dist[nIndex] < dist[nodeQueue.front()])
+            {
+              nodeQueue.push_front(nIndex);
+            }
+            else
+            {
+              nodeQueue.push_back(nIndex);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // Compute distances for each node back to the source
+  auto                 u = targetPolyIndex;
+  std::list<FaceIndex> q;
+  if(prev[u] != Scene3D::Algorithm::NavigationMesh::NULL_FACE || u == sourcePolyIndex)
+  {
+    while(u != Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+    {
+      q.push_front(u);
+      u = prev[u];
+    }
+  }
+
+  WayPointList waypoints;
+  waypoints.resize(q.size());
+
+  if(q.size() == 0)
+  {
+    // Fail to found path. Return empty list.
+    return waypoints;
+  }
+
+  auto index = 0u;
+  auto prevN = 0u;
+  for(auto n : q)
+  {
+    auto& wp     = static_cast<WayPointData&>(waypoints[index]);
+    wp.face      = mNavigationMesh->GetFace(n);
+    wp.nodeIndex = n;
+
+    wp.edge = nullptr;
+    // set the common edge with previous node
+    if(index > 0)
+    {
+      const auto& node = mNodes[prevN];
+      for(auto i = 0u; i < 3; ++i)
+      {
+        if(node.faces[i] == wp.nodeIndex)
+        {
+          wp.edge = mNavigationMesh->GetEdge(node.edges[i]);
+          break;
+        }
+      }
+    }
+
+    prevN = n;
+    index++;
+  }
+
+  return OptimizeWaypoints(waypoints);
+}
+
+void PathFinderAlgorithmSPFA::PrepareData()
+{
+  // Build the list structure connecting the nodes
+  auto faceCount = mNavigationMesh->GetFaceCount();
+
+  mNodes.resize(faceCount);
+
+  // for each face build the list
+  // TODO : Currently, we are assume that FaceNodeIndex is matched with FaceIndex 1:1. This might be changed in future.
+  for(FaceNodeIndex i = 0u; i < faceCount; ++i)
+  {
+    auto&       node = mNodes[i];
+    const auto* face = mNavigationMesh->GetFace(i);
+    auto        c0   = Dali::Vector3(face->center);
+
+    // for each edge add neighbouring face and compute distance to set the weight of node
+    for(auto edgeIndex = 0u; edgeIndex < 3; ++edgeIndex)
+    {
+      const auto* edge = mNavigationMesh->GetEdge(face->edge[edgeIndex]);
+      auto        p1   = edge->face[0];
+      auto        p2   = edge->face[1];
+
+      // One of faces is current face so ignore it
+      auto p                = ((p1 != i) ? p1 : p2);
+      node.faces[edgeIndex] = p;
+      if(p != ::Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+      {
+        node.edges[edgeIndex]  = face->edge[edgeIndex];
+        auto c1                = Dali::Vector3(mNavigationMesh->GetFace(p)->center);
+        node.weight[edgeIndex] = (c1 - c0).Length();
+      }
+    }
+  }
+}
+
+[[maybe_unused]] static float ccw(const Dali::Vector2& A, const Dali::Vector2& B, const Dali::Vector2& C)
+{
+  return (C.y - A.y) * (B.x - A.x) > (B.y - A.y) * (C.x - A.x);
+}
+
+[[maybe_unused]] static bool intersect(const Dali::Vector2& A, const Dali::Vector2& B, const Dali::Vector2& C, const Dali::Vector2& D)
+{
+  return ccw(A, C, D) != ccw(B, C, D) && ccw(A, B, C) != ccw(A, B, D);
+}
+
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmSPFA::OptimizeWaypoints(WayPointList& waypoints) const
+{
+  WayPointList optimizedWaypoints;
+  optimizedWaypoints.emplace_back(waypoints[0]);
+  optimizedWaypoints.reserve(waypoints.size());
+
+  auto startIndex = 1u;
+
+  bool finished = false;
+  for(auto j = 0; !finished; ++j)
+  {
+    auto&       startWaypoint     = optimizedWaypoints.back();
+    const auto& startWaypointData = static_cast<const WayPointData&>(startWaypoint);
+
+    // add new-last waypoint which will be overriden as long as intersection takes place
+    optimizedWaypoints.emplace_back();
+    for(auto wpIndex = startIndex; wpIndex < waypoints.size(); ++wpIndex)
+    {
+      if(wpIndex == waypoints.size() - 1)
+      {
+        optimizedWaypoints.back() = waypoints.back();
+        finished                  = true;
+        continue;
+      }
+      // Points between centres of faces
+
+      const auto& wpData = static_cast<const WayPointData&>(waypoints[wpIndex]);
+
+      auto Pa0 = Dali::Vector2(startWaypointData.face->center[0], startWaypointData.face->center[1]);
+      auto Pa1 = Dali::Vector2(wpData.face->center[0], wpData.face->center[1]);
+
+      bool doesIntersect = true;
+      for(auto i = startIndex; i < wpIndex; ++i)
+      {
+        const auto& wp = static_cast<WayPointData&>(waypoints[i]);
+        // Skip starting waypoint
+        if(wp.face == startWaypointData.face)
+        {
+          continue;
+        }
+        auto Pb0  = mNavigationMesh->GetVertex(wp.edge->vertex[0]);
+        auto Pb1  = mNavigationMesh->GetVertex(wp.edge->vertex[1]);
+        auto vPb0 = Dali::Vector2(Pb0->x, Pb0->y);
+        auto vPb1 = Dali::Vector2(Pb1->x, Pb1->y);
+
+        doesIntersect = intersect(Pa0, Pa1, vPb0, vPb1);
+        if(!doesIntersect)
+        {
+          break;
+        }
+      }
+
+      if(!doesIntersect)
+      {
+        optimizedWaypoints.back() = waypoints[wpIndex - 1];
+        startIndex                = wpIndex - 1;
+        break;
+      }
+    }
+  }
+
+  for(auto& wp : optimizedWaypoints)
+  {
+    auto& wpData   = static_cast<WayPointData&>(wp);
+    wpData.point3d = mNavigationMesh->PointLocalToScene(Dali::Vector3(wpData.face->center));
+    wpData.point2d = Vector2::ZERO;
+  }
+
+  return optimizedWaypoints;
+}
+} // namespace Dali::Scene3D::Internal::Algorithm
diff --git a/dali-scene3d/internal/algorithm/path-finder-spfa.h b/dali-scene3d/internal/algorithm/path-finder-spfa.h
new file mode 100644
index 0000000..8b62206
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/path-finder-spfa.h
@@ -0,0 +1,88 @@
+#ifndef DALI_SCENE3D_INTERNAL_PATH_FINDER_SPFA_H
+#define DALI_SCENE3D_INTERNAL_PATH_FINDER_SPFA_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+#include <dali-scene3d/public-api/algorithm/path-finder.h>
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+class PathFinderAlgorithmSPFA : public Dali::Scene3D::Algorithm::PathFinderBase
+{
+public:
+  /**
+   * @brief Constructor
+   *
+   * @param[in] navMesh Navigation mesh to associate with the algorithm
+   */
+  explicit PathFinderAlgorithmSPFA(Dali::Scene3D::Algorithm::NavigationMesh& navMesh);
+
+  /**
+   * @brief Destructor
+   */
+  ~PathFinderAlgorithmSPFA() override;
+
+  /**
+   * @brief Looks for a path from point A to point B.
+   *
+   * @param[in] positionFrom source position in NavigationMesh parent space
+   * @param[in] positionTo target position in NavigationMesh parent space
+   * @return List of waypoints for path
+   */
+  Scene3D::Algorithm::WayPointList FindPath(const Dali::Vector3& PositionFrom, const Dali::Vector3& PositionTo) override;
+
+  /**
+   * @brief Finds path between NavigationMesh faces
+   *
+   * @param[in] polyIndexFrom Index of start polygon
+   * @param[in] polyIndexTo Index of end polygon
+   * @return List of waypoints for path
+   */
+  Scene3D::Algorithm::WayPointList FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex) override;
+
+  [[nodiscard]] inline const NavigationMesh::Face* Face(FaceIndex faceIndex) const
+  {
+    return mNavigationMesh->GetFace(faceIndex);
+  }
+
+  /**
+   * Build the graph of nodes
+   * distance between nodes is weight of node
+   */
+  void PrepareData();
+
+  Scene3D::Algorithm::WayPointList OptimizeWaypoints(Scene3D::Algorithm::WayPointList& waypoints) const;
+
+  /**
+   * Structure describes single node of pathfinding algorithm
+   */
+  struct FaceNode
+  {
+    // neighbours
+    FaceIndex faces[3];  ///< List of neighbouring faces (max 3 for a triangle)
+    EdgeIndex edges[3];  ///< List of edges (max 3 for a triangle)
+    float     weight[3]; ///< List of weights (by distance) to each neighbour
+  };
+  using FaceNodeIndex = FaceIndex;
+
+  NavigationMesh*       mNavigationMesh; ///< Pointer to a valid NavigationMesh
+  std::vector<FaceNode> mNodes;          ///< List of nodes
+};
+} // namespace Dali::Scene3D::Internal::Algorithm
+#endif // DALI_SCENE3D_INTERNAL_PATH_FINDER_SPFA_H
diff --git a/dali-scene3d/internal/algorithm/path-finder-waypoint-data.h b/dali-scene3d/internal/algorithm/path-finder-waypoint-data.h
new file mode 100644
index 0000000..ab5c3b0
--- /dev/null
+++ b/dali-scene3d/internal/algorithm/path-finder-waypoint-data.h
@@ -0,0 +1,54 @@
+#ifndef DALI_SCENE3D_INTERNAL_PATH_FINDER_WAYPOINT_DATA_H
+#define DALI_SCENE3D_INTERNAL_PATH_FINDER_WAYPOINT_DATA_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+#include <dali-scene3d/public-api/algorithm/path-finder-waypoint.h>
+
+// EXTERNAL INCLUDES
+#include <cinttypes>
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+class NavigationMesh;
+
+/**
+ * Structure containing data describing single waypoint
+ *
+ * The structure stores:
+ * - node of NavigationMesh within which the waypoint is placed
+ * - a point within NavigationMesh face space (2D)
+ * - a point within NavigationMesh parent transform space (3D)
+ * Additionally, it stores data used by algorithm:
+ * - face - pointer to the face of NavigationMesh
+ * - edge - Edge between this waypoint and next on the path
+ */
+struct WayPointData
+{
+  uint32_t                    nodeIndex; ///< Index of the node/face
+  const NavigationMesh::Face* face;      ///< Polygon containing waypoint
+  Dali::Vector2               point2d;   ///< waypoint point in the polygon space, origin is a polygon centre
+  Dali::Vector3               point3d;   ///< point in the 3D space in the navmesh parent space
+
+  // internal data needed for processing
+  const NavigationMesh::Edge* edge; ///< Edge between this face and next face
+};
+} // namespace Dali::Scene3D::Internal::Algorithm
+
+#endif // DALI_SCENE3D_INTERNAL_PATH_FINDER_WAYPOINT_DATA_H
diff --git a/dali-scene3d/internal/common/environment-map-load-task.cpp b/dali-scene3d/internal/common/environment-map-load-task.cpp
new file mode 100644
index 0000000..385eb39
--- /dev/null
+++ b/dali-scene3d/internal/common/environment-map-load-task.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/common/environment-map-load-task.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/public-api/loader/environment-map-loader.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+EnvironmentMapLoadTask::EnvironmentMapLoadTask(const std::string& environmentMapUrl, Dali::Scene3D::EnvironmentMapType environmentMapType, CallbackBase* callback)
+: AsyncTask(callback),
+  mEnvironmentMapUrl(environmentMapUrl),
+  mIsReady(true),
+  mHasSucceeded(false)
+{
+  mEnvironmentMapData.SetEnvironmentMapType(environmentMapType);
+}
+
+EnvironmentMapLoadTask::~EnvironmentMapLoadTask()
+{
+}
+
+void EnvironmentMapLoadTask::Process()
+{
+  mHasSucceeded = Scene3D::Loader::LoadEnvironmentMap(mEnvironmentMapUrl, mEnvironmentMapData);
+}
+
+bool EnvironmentMapLoadTask::IsReady()
+{
+  return mIsReady;
+}
+
+bool EnvironmentMapLoadTask::HasSucceeded() const
+{
+  return mHasSucceeded;
+}
+
+Dali::Texture EnvironmentMapLoadTask::GetLoadedTexture()
+{
+  return (HasSucceeded()) ? mEnvironmentMapData.GetTexture() : Texture();
+}
+
+uint32_t EnvironmentMapLoadTask::GetMipmapLevels()
+{
+  return (HasSucceeded()) ? mEnvironmentMapData.GetMipmapLevels() : 1u;
+}
+
+Dali::Scene3D::EnvironmentMapType EnvironmentMapLoadTask::GetEnvironmentMapType()
+{
+  return mEnvironmentMapData.GetEnvironmentMapType();
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/internal/common/environment-map-load-task.h b/dali-scene3d/internal/common/environment-map-load-task.h
new file mode 100644
index 0000000..6ca315a
--- /dev/null
+++ b/dali-scene3d/internal/common/environment-map-load-task.h
@@ -0,0 +1,121 @@
+#ifndef DALI_SCENE3D_ENVIRONMENT_MAP_LOAD_TASK_H
+#define DALI_SCENE3D_ENVIRONMENT_MAP_LOAD_TASK_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/images/pixel-data.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/common/environment-map.h>
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+class EnvironmentMapLoadTask;
+typedef IntrusivePtr<EnvironmentMapLoadTask> EnvironmentMapLoadTaskPtr;
+
+class EnvironmentMapLoadTask : public AsyncTask
+{
+public:
+  /**
+   * Constructor
+   * @param[in] environmentMapUrl The url of the environment map image file.
+   * @param[in] callback The callback that is called when the operation is completed.
+   */
+  EnvironmentMapLoadTask(const std::string& environmentMapUrl, Dali::Scene3D::EnvironmentMapType environmentMapType, CallbackBase* callback);
+
+  /**
+   * Destructor.
+   */
+  ~EnvironmentMapLoadTask();
+
+  /**
+   * Whether the task has succeeded.
+   * @return True if the task has succeeded.
+   */
+  bool HasSucceeded() const;
+
+  /**
+   * Retrieves loaded Ibl Texture
+   * @return Texture that is loaded from url.
+   * @note Do not call this method in worker thread.
+   */
+  Dali::Texture GetLoadedTexture();
+
+  /**
+   * Retrieves Mipmap levels of loaded Ibl texture
+   * @return mipmap levels of loaded Ibl texture
+   */
+  uint32_t GetMipmapLevels();
+
+  /**
+   * Retrieves EnvironmentMap type of the loaded texture
+   * @return EnvironmentMap type of the loaded texture
+   */
+  Dali::Scene3D::EnvironmentMapType GetEnvironmentMapType();
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process();
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady();
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "EnvironmentMapLoadTask";
+  }
+
+private:
+  // Undefined
+  EnvironmentMapLoadTask(const EnvironmentMapLoadTask& task) = delete;
+
+  // Undefined
+  EnvironmentMapLoadTask& operator=(const EnvironmentMapLoadTask& task) = delete;
+
+private:
+  std::string                               mEnvironmentMapUrl;
+  Dali::Scene3D::Loader::EnvironmentMapData mEnvironmentMapData;
+
+  bool mIsReady;
+  bool mHasSucceeded;
+};
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_ENVIRONMENT_MAP_LOAD_TASK_H
diff --git a/dali-scene3d/internal/common/image-resource-loader.cpp b/dali-scene3d/internal/common/image-resource-loader.cpp
new file mode 100644
index 0000000..3d3ab93
--- /dev/null
+++ b/dali-scene3d/internal/common/image-resource-loader.cpp
@@ -0,0 +1,629 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/adaptor-framework/lifecycle-controller.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/devel-api/common/hash.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/pixel-data-integ.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/signals/connection-tracker.h>
+
+#include <functional> ///< for std::function
+#include <memory>     ///< for std::shared_ptr
+#include <mutex>
+#include <sstream>
+#include <string>
+#include <utility> ///< for std::pair
+
+// INTERNAL INCLUDES
+
+namespace
+{
+constexpr uint32_t MAXIMUM_COLLECTING_ITEM_COUNTS_PER_GC_CALL = 5u;
+constexpr uint32_t GC_PERIOD_MILLISECONDS                     = 1000u;
+
+#ifdef DEBUG_ENABLED
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_IMAGE_RESOURCE_LOADER");
+#endif
+
+bool IsDefaultPixelData(const Dali::PixelData& pixelData)
+{
+  if(pixelData == Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataWhiteRGB() ||
+     pixelData == Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataWhiteRGBA() ||
+     pixelData == Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataZAxisRGB() ||
+     pixelData == Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataZAxisAndAlphaRGBA())
+  {
+    return true;
+  }
+  return false;
+}
+
+bool SupportPixelDataCache(const Dali::PixelData& pixelData)
+{
+  // Check given pixelData support to release data after upload.
+  // This is cause we need to reduce CPU memory usage.
+  if(Dali::Integration::IsPixelDataReleaseAfterUpload(pixelData))
+  {
+    return true;
+  }
+
+  // Check given pixelData is default pixelData.
+  if(IsDefaultPixelData(pixelData))
+  {
+    return true;
+  }
+  return false;
+}
+
+struct ImageInformation
+{
+  ImageInformation(const std::string           url,
+                   const Dali::ImageDimensions dimensions,
+                   Dali::FittingMode::Type     fittingMode,
+                   Dali::SamplingMode::Type    samplingMode,
+                   bool                        orientationCorrection)
+  : mUrl(url),
+    mDimensions(dimensions),
+    mFittingMode(fittingMode),
+    mSamplingMode(samplingMode),
+    mOrientationCorrection(orientationCorrection)
+  {
+  }
+
+  bool operator==(const ImageInformation& rhs) const
+  {
+    // Check url and orientation correction is enough.
+    return (mUrl == rhs.mUrl) && (mOrientationCorrection == rhs.mOrientationCorrection);
+  }
+
+  std::string              mUrl;
+  Dali::ImageDimensions    mDimensions;
+  Dali::FittingMode::Type  mFittingMode;
+  Dali::SamplingMode::Type mSamplingMode;
+  bool                     mOrientationCorrection;
+};
+
+// Hash functor list
+std::size_t GenerateHash(const ImageInformation& info)
+{
+  std::vector<std::uint8_t> hashTarget;
+  const uint16_t            width  = info.mDimensions.GetWidth();
+  const uint16_t            height = info.mDimensions.GetHeight();
+
+  // If either the width or height has been specified, include the resizing options in the hash
+  if(width != 0 || height != 0)
+  {
+    // We are appending 5 bytes to the URL to form the hash input.
+    hashTarget.resize(5u);
+    std::uint8_t* hashTargetPtr = &(hashTarget[0u]);
+
+    // Pack the width and height (4 bytes total).
+    *hashTargetPtr++ = info.mDimensions.GetWidth() & 0xff;
+    *hashTargetPtr++ = (info.mDimensions.GetWidth() >> 8u) & 0xff;
+    *hashTargetPtr++ = info.mDimensions.GetHeight() & 0xff;
+    *hashTargetPtr++ = (info.mDimensions.GetHeight() >> 8u) & 0xff;
+
+    // Bit-pack the FittingMode, SamplingMode and orientation correction.
+    // FittingMode=2bits, SamplingMode=3bits, orientationCorrection=1bit
+    *hashTargetPtr = (info.mFittingMode << 4u) | (info.mSamplingMode << 1) | (info.mOrientationCorrection ? 1 : 0);
+  }
+  else
+  {
+    // We are not including sizing information, but we still need an extra byte for orientationCorrection.
+    hashTarget.resize(1u);
+    hashTarget[0u] = info.mOrientationCorrection ? 't' : 'f';
+  }
+
+  return Dali::CalculateHash(info.mUrl) ^ Dali::CalculateHash(hashTarget);
+}
+
+std::size_t GenerateHash(const Dali::PixelData& pixelData, bool mipmapRequired)
+{
+  return reinterpret_cast<std::size_t>(static_cast<void*>(pixelData.GetObjectPtr())) ^ (static_cast<std::size_t>(mipmapRequired) << (sizeof(std::size_t) * 4));
+}
+
+// Item Creation functor list
+
+Dali::PixelData CreatePixelDataFromImageInfo(const ImageInformation& info, bool releasePixelData)
+{
+  Dali::PixelData pixelData;
+
+  // Load the image synchronously (block the thread here).
+  Dali::Devel::PixelBuffer pixelBuffer = Dali::LoadImageFromFile(info.mUrl, info.mDimensions, info.mFittingMode, info.mSamplingMode, info.mOrientationCorrection);
+  if(pixelBuffer)
+  {
+    pixelData = Dali::Devel::PixelBuffer::Convert(pixelBuffer, releasePixelData);
+  }
+  return pixelData;
+}
+
+Dali::Texture CreateTextureFromPixelData(const Dali::PixelData& pixelData, bool mipmapRequired)
+{
+  Dali::Texture texture;
+  if(pixelData)
+  {
+    texture = Dali::Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+    texture.Upload(pixelData, 0, 0, 0, 0, pixelData.GetWidth(), pixelData.GetHeight());
+    if(mipmapRequired)
+    {
+      texture.GenerateMipmaps();
+    }
+  }
+  return texture;
+}
+
+// Check function whether we can collect given data as garbage, or not.
+bool PixelDataCacheCollectable(const ImageInformation& info, const Dali::PixelData& pixelData)
+{
+  return pixelData.GetBaseObject().ReferenceCount() <= 1;
+}
+
+bool TextureCacheCollectable(const Dali::PixelData& pixelData, const Dali::Texture& texture)
+{
+  return !IsDefaultPixelData(pixelData) &&                  ///< If key is not default pixelData
+         pixelData.GetBaseObject().ReferenceCount() <= 2 && ///< And it have reference count as 2 (1 is for the key of this container, and other is PixelData cache.)
+         texture.GetBaseObject().ReferenceCount() <= 1;     ///< And nobody use this texture, except this contianer.
+}
+
+// Forward declare, for signal connection.
+void DestroyCacheImpl();
+
+class CacheImpl : public Dali::ConnectionTracker
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  CacheImpl()
+  : mPixelDataCache{},
+    mTextureCache{},
+    mTimer{},
+    mLatestCollectedPixelDataIter{mPixelDataCache.begin()},
+    mLatestCollectedTextureIter{mTextureCache.begin()},
+    mDataMutex{},
+    mPixelDataContainerUpdated{false},
+    mTextureContainerUpdated{false},
+    mDestroyed{false},
+    mFullCollectRequested{false}
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Create CacheImpl\n");
+
+    // We should create CacheImpl at main thread, To ensure delete this cache impl
+    Dali::LifecycleController::Get().TerminateSignal().Connect(DestroyCacheImpl);
+  }
+
+  /**
+   * @brief Destructor
+   */
+  ~CacheImpl()
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destroy CacheImpl\n");
+    {
+      mDataMutex.lock();
+
+      mDestroyed                    = true;
+      mPixelDataContainerUpdated    = false;
+      mTextureContainerUpdated      = false;
+      mLatestCollectedPixelDataIter = decltype(mLatestCollectedPixelDataIter)(); // Invalidate iterator
+      mLatestCollectedTextureIter   = decltype(mLatestCollectedTextureIter)();   // Invalidate iterator
+
+      mPixelDataCache.clear();
+      mTextureCache.clear();
+
+      mDataMutex.unlock();
+    }
+
+    if(mTimer)
+    {
+      if(Dali::Adaptor::IsAvailable())
+      {
+        mTimer.Stop();
+      }
+    }
+  }
+
+private: // Unified API for this class
+  // Let compare with hash first. And then, check detail keys after.
+  using PixelDataCacheContainer = std::map<std::size_t, std::vector<std::pair<ImageInformation, Dali::PixelData>>>;
+  using TextureCacheContainer   = std::map<std::size_t, std::vector<std::pair<Dali::PixelData, Dali::Texture>>>;
+
+  /**
+   * @brief Try to get cached item, or create new handle if there is no item.
+   *
+   * @tparam needMutex Whether we need to lock the mutex during this operation, or not.
+   * @param[in] cacheContainer The container of key / item pair.
+   * @param[in] hashValue The hash value of key.
+   * @param[in] key The key of cache item.
+   * @param[in] keyFlag The additional flags when we need to create new item.
+   * @param[out] containerUpdate True whether container changed or not.
+   * @return Item that has been cached. Or newly created.
+   */
+  template<bool needMutex, typename KeyType, typename ItemType, ItemType (*ItemCreationFunction)(const KeyType&, bool), typename ContainerType>
+  ItemType GetOrCreateCachedItem(ContainerType& cacheContainer, std::size_t hashValue, const KeyType& key, bool keyFlag, bool& containerUpdated)
+  {
+    if constexpr(needMutex)
+    {
+      mDataMutex.lock();
+    }
+    ItemType returnItem;
+
+    if(DALI_LIKELY(!mDestroyed))
+    {
+      bool found = false;
+
+      auto iter = cacheContainer.lower_bound(hashValue);
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "HashValue : %zu\n", hashValue);
+      if((iter == cacheContainer.end()) || (hashValue != iter->first))
+      {
+        containerUpdated = true;
+
+        returnItem = ItemCreationFunction(key, keyFlag);
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Create new item\n");
+        cacheContainer.insert(iter, {hashValue, {{key, returnItem}}});
+      }
+      else
+      {
+        auto& cachePairList = iter->second;
+        for(auto jter = cachePairList.begin(), jterEnd = cachePairList.end(); jter != jterEnd; ++jter)
+        {
+          if(jter->first == key)
+          {
+            // We found that input pixelData already cached.
+            returnItem = jter->second;
+            DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Get cached item\n");
+            found = true;
+            break;
+          }
+        }
+
+        // If we fail to found same list, just append.
+        if(!found)
+        {
+          containerUpdated = true;
+
+          returnItem = ItemCreationFunction(key, keyFlag);
+          DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Create new item\n");
+          cachePairList.emplace_back(key, returnItem);
+        }
+      }
+    }
+
+    if constexpr(needMutex)
+    {
+      mDataMutex.unlock();
+    }
+
+    return returnItem;
+  }
+
+  /**
+   * @brief Try to collect garbages, which reference counts are 1.
+   *
+   * @tparam needMutex Whether we need to lock the mutex during this operation, or not.
+   * @param[in] cacheContainer The container of key / item pair.
+   * @param[in] fullCollect True if we need to collect whole container.
+   * @param[in, out] containerUpdated True if container information changed. lastIterator will be begin of container when we start collect garbages.
+   * @param[in, out] lastIterator The last iterator of container.
+   * @oaram[in, out] checkedCount The number of iteration checked total.
+   * @return True if we iterate whole container, so we don't need to check anymore. False otherwise
+   */
+  template<typename KeyType, typename ValueType, bool (*Collectable)(const KeyType&, const ValueType&), typename ContainerType, typename Iterator = typename ContainerType::iterator>
+  bool CollectGarbages(ContainerType& cacheContainer, bool fullCollect, bool& containerUpdated, Iterator& lastIterator, uint32_t& checkedCount, uint32_t& collectedCount)
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Collect Garbages : %zu (checkedCount : %d, fullCollect? %d)\n", cacheContainer.size(), checkedCount, fullCollect);
+    // Container changed. We should re-collect garbage from begin again.
+    if(fullCollect || containerUpdated)
+    {
+      lastIterator     = cacheContainer.begin();
+      containerUpdated = false;
+    }
+
+    for(; lastIterator != cacheContainer.end() && (fullCollect || ++checkedCount <= MAXIMUM_COLLECTING_ITEM_COUNTS_PER_GC_CALL);)
+    {
+      auto& cachePairList = lastIterator->second;
+
+      for(auto jter = cachePairList.begin(); jter != cachePairList.end();)
+      {
+        auto& item = jter->second;
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "item : %p, ref count : %u\n", item.GetObjectPtr(), (item ? item.GetBaseObject().ReferenceCount() : 0u));
+        if(!item || Collectable(jter->first, item))
+        {
+          DALI_LOG_INFO(gLogFilter, Debug::Verbose, "GC!!!\n");
+          // This item is garbage! just remove it.
+          ++collectedCount;
+          jter = cachePairList.erase(jter);
+        }
+        else
+        {
+          ++jter;
+        }
+      }
+
+      if(cachePairList.empty())
+      {
+        lastIterator = cacheContainer.erase(lastIterator);
+      }
+      else
+      {
+        ++lastIterator;
+      }
+    }
+
+    return (lastIterator != cacheContainer.end());
+  }
+
+public: // Called by main thread.
+  /**
+   * @brief Try to get cached texture, or newly create if there is no texture that already cached.
+   *
+   * @param[in] pixelData The pixelData of image.
+   * @param[in] mipmapRequired True if result texture need to generate mipmap.
+   * @return Texture that has been cached. Or empty handle if we fail to found cached item.
+   */
+  Dali::Texture GetOrCreateCachedTexture(const Dali::PixelData& pixelData, bool mipmapRequired)
+  {
+    auto hashValue = GenerateHash(pixelData, mipmapRequired);
+    return GetOrCreateCachedItem<false, Dali::PixelData, Dali::Texture, CreateTextureFromPixelData>(mTextureCache, hashValue, pixelData, mipmapRequired, mTextureContainerUpdated);
+  }
+
+  /**
+   * @brief Request incremental gargabe collect.
+   *
+   * @param[in] fullCollect True if we will collect whole items, or incrementally.
+   */
+  void RequestGarbageCollect(bool fullCollect)
+  {
+    if(DALI_LIKELY(Dali::Adaptor::IsAvailable()))
+    {
+      if(!mTimer)
+      {
+        mTimer = Dali::Timer::New(GC_PERIOD_MILLISECONDS);
+        mTimer.TickSignal().Connect(this, &CacheImpl::OnTick);
+      }
+
+      mFullCollectRequested |= fullCollect;
+
+      if(!mTimer.IsRunning())
+      {
+        // Restart container interating.
+        mDataMutex.lock();
+        mPixelDataContainerUpdated = true;
+        mDataMutex.unlock();
+        mTextureContainerUpdated = true;
+        mTimer.Start();
+      }
+    }
+  }
+
+public: // Can be called by worker thread
+  /**
+   * @brief Try to get cached pixel data, or newly create if there is no pixel data that already cached.
+   *
+   * @param[in] info The informations of image to load.
+   * @param[in] releasePixelData Whether we need to release pixel data after upload, or not.
+   * @return Texture that has been cached. Or empty handle if we fail to found cached item.
+   */
+  Dali::PixelData GetOrCreateCachedPixelData(const ImageInformation& info, bool releasePixelData)
+  {
+    auto hashValue = GenerateHash(info);
+    return GetOrCreateCachedItem<true, ImageInformation, Dali::PixelData, CreatePixelDataFromImageInfo>(mPixelDataCache, hashValue, info, releasePixelData, mPixelDataContainerUpdated);
+  }
+
+private: // Called by main thread
+  bool OnTick()
+  {
+    // Clear full GC flag
+    const bool fullCollect = mFullCollectRequested;
+    mFullCollectRequested  = false;
+
+    return IncrementalGarbageCollect(fullCollect);
+  }
+
+  /**
+   * @brief Remove unused cache item incrementally.
+   *
+   * @param[in] fullCollect True if we will collect whole items, or incrementally.
+   * @return True if there still exist what we need to check clean. False when whole cached items are using now.
+   */
+  bool IncrementalGarbageCollect(bool fullCollect)
+  {
+    bool continueTimer = false;
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "GC start\n");
+
+    // Try to collect Texture GC first, due to the reference count of pixelData who become key of textures.
+    // After all texture GC finished, then check PixelData cache.
+    uint32_t checkedCount   = 0u;
+    uint32_t collectedCount = 0u;
+
+    // We should lock mutex during GC pixelData.
+    mDataMutex.lock();
+
+    // GC Texture
+    continueTimer |= CollectGarbages<Dali::PixelData, Dali::Texture, TextureCacheCollectable>(mTextureCache, fullCollect, mTextureContainerUpdated, mLatestCollectedTextureIter, checkedCount, collectedCount);
+
+    // GC PixelData last. If there are some collected Texture before, we should full-collect.
+    // (Since most of PixelData use 'ReleaseAfterUpload' flags).
+    continueTimer |= CollectGarbages<ImageInformation, Dali::PixelData, PixelDataCacheCollectable>(mPixelDataCache, fullCollect || (collectedCount > 0u), mPixelDataContainerUpdated, mLatestCollectedPixelDataIter, checkedCount, collectedCount);
+
+    mDataMutex.unlock();
+
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "GC finished. checkedCount : %u, continueTimer : %d\n", checkedCount, continueTimer);
+
+    return continueTimer;
+  }
+
+private:
+  PixelDataCacheContainer mPixelDataCache;
+  TextureCacheContainer   mTextureCache;
+
+  Dali::Timer mTimer;
+
+  // Be used when we garbage collection.
+  PixelDataCacheContainer::iterator mLatestCollectedPixelDataIter;
+  TextureCacheContainer::iterator   mLatestCollectedTextureIter;
+
+  std::mutex mDataMutex;
+
+  bool mPixelDataContainerUpdated;
+  bool mTextureContainerUpdated;
+
+  bool mDestroyed : 1;
+  bool mFullCollectRequested : 1;
+};
+
+static std::shared_ptr<CacheImpl> gCacheImpl{nullptr};
+static Dali::Texture              gEmptyTextureWhiteRGB{};
+static Dali::Texture              gEmptyCubeTextureWhiteRGB{};
+
+std::shared_ptr<CacheImpl> GetCacheImpl()
+{
+  if(DALI_UNLIKELY(!gCacheImpl))
+  {
+    gCacheImpl = std::make_shared<CacheImpl>();
+  }
+  return gCacheImpl;
+}
+
+void DestroyCacheImpl()
+{
+  gCacheImpl.reset();
+
+  // Remove texture object when application stopped.
+  gEmptyTextureWhiteRGB.Reset();
+  gEmptyCubeTextureWhiteRGB.Reset();
+}
+
+} // namespace
+
+namespace Dali::Scene3D::Internal
+{
+namespace ImageResourceLoader
+{
+// Called by main thread..
+Dali::Texture GetEmptyTextureWhiteRGB()
+{
+  if(!gEmptyTextureWhiteRGB)
+  {
+    Dali::PixelData emptyPixelData = GetEmptyPixelDataWhiteRGB();
+    gEmptyTextureWhiteRGB          = Texture::New(TextureType::TEXTURE_2D, emptyPixelData.GetPixelFormat(), emptyPixelData.GetWidth(), emptyPixelData.GetHeight());
+    gEmptyTextureWhiteRGB.Upload(emptyPixelData, 0, 0, 0, 0, emptyPixelData.GetWidth(), emptyPixelData.GetHeight());
+  }
+  return gEmptyTextureWhiteRGB;
+}
+
+Dali::Texture GetEmptyCubeTextureWhiteRGB()
+{
+  if(!gEmptyCubeTextureWhiteRGB)
+  {
+    Dali::PixelData emptyPixelData = GetEmptyPixelDataWhiteRGB();
+    gEmptyCubeTextureWhiteRGB      = Texture::New(TextureType::TEXTURE_CUBE, emptyPixelData.GetPixelFormat(), emptyPixelData.GetWidth(), emptyPixelData.GetHeight());
+    for(size_t iSide = 0u; iSide < 6; ++iSide)
+    {
+      gEmptyCubeTextureWhiteRGB.Upload(emptyPixelData, CubeMapLayer::POSITIVE_X + iSide, 0u, 0u, 0u, emptyPixelData.GetWidth(), emptyPixelData.GetHeight());
+    }
+  }
+  return gEmptyCubeTextureWhiteRGB;
+}
+
+Dali::Texture GetCachedTexture(Dali::PixelData pixelData, bool mipmapRequired)
+{
+  if(Dali::Adaptor::IsAvailable() && SupportPixelDataCache(pixelData))
+  {
+    return GetCacheImpl()->GetOrCreateCachedTexture(pixelData, mipmapRequired);
+  }
+  else
+  {
+    return CreateTextureFromPixelData(pixelData, mipmapRequired);
+  }
+}
+
+void RequestGarbageCollect(bool fullCollect)
+{
+  if(DALI_LIKELY(Dali::Adaptor::IsAvailable()))
+  {
+    GetCacheImpl()->RequestGarbageCollect(fullCollect);
+  }
+}
+
+void EnsureResourceLoaderCreated()
+{
+  if(DALI_LIKELY(Dali::Adaptor::IsAvailable()))
+  {
+    GetCacheImpl();
+  }
+}
+
+// Can be called by worker thread.
+Dali::PixelData GetEmptyPixelDataWhiteRGB()
+{
+  static Dali::PixelData emptyPixelData = PixelData::New(new uint8_t[3]{0xff, 0xff, 0xff}, 3, 1, 1, Pixel::RGB888, PixelData::DELETE_ARRAY);
+  return emptyPixelData;
+}
+
+Dali::PixelData GetEmptyPixelDataWhiteRGBA()
+{
+  static Dali::PixelData emptyPixelData = PixelData::New(new uint8_t[4]{0xff, 0xff, 0xff, 0xff}, 4, 1, 1, Pixel::RGBA8888, PixelData::DELETE_ARRAY);
+  return emptyPixelData;
+}
+
+Dali::PixelData GetEmptyPixelDataZAxisRGB()
+{
+  static Dali::PixelData emptyPixelData = PixelData::New(new uint8_t[3]{0x7f, 0x7f, 0xff}, 3, 1, 1, Pixel::RGB888, PixelData::DELETE_ARRAY);
+  return emptyPixelData;
+}
+
+Dali::PixelData GetEmptyPixelDataZAxisAndAlphaRGBA()
+{
+  static Dali::PixelData emptyPixelData = PixelData::New(new uint8_t[4]{0x7f, 0x7f, 0xff, 0xff}, 4, 1, 1, Pixel::RGBA8888, PixelData::DELETE_ARRAY);
+  return emptyPixelData;
+}
+
+Dali::PixelData GetCachedPixelData(const std::string& url)
+{
+  return GetCachedPixelData(url, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true);
+}
+
+Dali::PixelData GetCachedPixelData(const std::string& url,
+                                   ImageDimensions    dimensions,
+                                   FittingMode::Type  fittingMode,
+                                   SamplingMode::Type samplingMode,
+                                   bool               orientationCorrection)
+{
+  ImageInformation info(url, dimensions, fittingMode, samplingMode, orientationCorrection);
+  if(gCacheImpl == nullptr)
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "CacheImpl not prepared! load PixelData without cache.\n");
+    return CreatePixelDataFromImageInfo(info, false);
+  }
+  else
+  {
+    return GetCacheImpl()->GetOrCreateCachedPixelData(info, true);
+  }
+}
+} // namespace ImageResourceLoader
+} // namespace Dali::Scene3D::Internal
diff --git a/dali-scene3d/internal/common/image-resource-loader.h b/dali-scene3d/internal/common/image-resource-loader.h
new file mode 100644
index 0000000..3957009
--- /dev/null
+++ b/dali-scene3d/internal/common/image-resource-loader.h
@@ -0,0 +1,132 @@
+#ifndef DALI_SCENE3D_IMAGE_RESOURCE_LOADER_H
+#define DALI_SCENE3D_IMAGE_RESOURCE_LOADER_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/images/image-operations.h>
+#include <dali/public-api/images/pixel-data.h>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+/**
+ * The namespace to load the images and cache raw PixelData.
+ * The cached resources will be reused when the same input parameter is loaded multiple times.
+ * @note This class can be called from worker threads.
+ */
+namespace ImageResourceLoader
+{
+// Called by main thread.
+/**
+ * @brief Get cached texture handle filled as white with RGB888 format.
+ * @return A Texture object containing the white RGB888 color.
+ */
+Dali::Texture GetEmptyTextureWhiteRGB();
+
+/**
+ * @brief Get cached cube texture handle filled as white with RGB888 format at 6 faces.
+ * @return A Texture object containing the white RGB888 color at 6 faces.
+ */
+Dali::Texture GetEmptyCubeTextureWhiteRGB();
+
+/**
+ * @brief Get cached texture handle, or create new texture and upload.
+ * @param[in] pixelData The PixelData of image to upload
+ * @param[in] mipmapRequired True if this texture need to generate mipmap
+ * @return A Texture object containing the pixelData, or an invalid object on failure
+ */
+Dali::Texture GetCachedTexture(Dali::PixelData pixelData, bool mipmapRequired);
+
+/**
+ * @brief Request to remove unused Texture and PixelData. We can choose the collect garbages incrementally or fully.
+ *
+ * @param[in] fullCollect True if we want to collect whole garbages. Default is false.
+ */
+void RequestGarbageCollect(bool fullCollect = false);
+
+/**
+ * @brief Let we ensure to create a ResourceLoader cache handler.
+ */
+void EnsureResourceLoaderCreated();
+
+// Can be called by worker thread.
+/**
+ * @brief Get cached pixelData handle filled as white with RGB888 format.
+ * @return A PixelData object containing the white RGB888 color.
+ */
+Dali::PixelData GetEmptyPixelDataWhiteRGB();
+
+/**
+ * @brief Get cached pixelData handle filled as white with RGBA8888 format.
+ * @return A PixelData object containing the white RGBA8888 color.
+ */
+Dali::PixelData GetEmptyPixelDataWhiteRGBA();
+
+/**
+ * @brief Get cached pixelData handle that will be used for Z-Axis with RGB8888 format.
+ * @return A PixelData object containing the Z-Axis RGB8888 color.
+ */
+Dali::PixelData GetEmptyPixelDataZAxisRGB();
+
+/**
+ * @brief Get cached pixelData handle that will be used for Z-Axis and 1.0 alpha with RGBA8888 format.
+ * @return A PixelData object containing the Z-Axis and 1.0 alpha RGBA8888 color.
+ */
+Dali::PixelData GetEmptyPixelDataZAxisAndAlphaRGBA();
+
+/**
+ * @brief Get cached image, or loads an image synchronously.
+ * @note If cache handler is not created yet, or destroyed due to app terminated, it will load image synchronously without cache.
+ * @param[in] url The URL of the image file to load
+ * @return A PixelData object containing the image, or an invalid object on failure
+ */
+Dali::PixelData GetCachedPixelData(const std::string& url);
+
+/**
+ * @brief Get cached image, or loads an image synchronously by specifying the target dimensions and options.
+ * @note If cache handler is not created yet, or destroyed due to app terminated, it will load image synchronously without cache.
+ * @param[in] url The URL of the image file to load
+ * @param[in] dimensions The width and height to fit the loaded image to
+ * @param[in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter
+ * @param[in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size
+ * @param[in] orientationCorrection Reorient the image to respect any orientation metadata in its header
+ * @return A PixelData object containing the image, or an invalid object on failure
+ */
+Dali::PixelData GetCachedPixelData(const std::string& url,
+                                   ImageDimensions    dimensions,
+                                   FittingMode::Type  fittingMode,
+                                   SamplingMode::Type samplingMode,
+                                   bool               orientationCorrection);
+} // namespace ImageResourceLoader
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_CACHE_MANAGER_H
diff --git a/dali-scene3d/internal/common/light-observer.h b/dali-scene3d/internal/common/light-observer.h
new file mode 100644
index 0000000..eb98c90
--- /dev/null
+++ b/dali-scene3d/internal/common/light-observer.h
@@ -0,0 +1,78 @@
+#ifndef DALI_SCENE3D_INTERNAL_LIGHT_OBSERVER_H
+#define DALI_SCENE3D_INTERNAL_LIGHT_OBSERVER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/light/light.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+class LightObserver
+{
+public:
+  /**
+   * @brief Constructor.
+   */
+  LightObserver() = default;
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~LightObserver() = default;
+
+  /**
+   * @brief Notifies Image Based Light Textures are changed by parent SceneView.
+   *
+   * @param[in] diffuseTexture cube map texture that can be used as a diffuse IBL source.
+   * @param[in] specularTexture cube map texture that can be used as a specular IBL source.
+   * @param[in] scaleFactor scale factor that controls light source intensity in [0.0f, 1.0f]. Default value is 1.0f.
+   * @param[in] specularMipmapLevels mipmap levels of specular texture
+   */
+  virtual void NotifyImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float scaleFactor, uint32_t specularMipmapLevels) = 0;
+
+  /**
+   * @brief Notifies Scale Factor of Image Based Light is changed by parent SceneView.
+   *
+   * @param[in] scaleFactor scale factor that controls light source intensity in [0.0f, 1.0f].
+   */
+  virtual void NotifyImageBasedLightScaleFactor(float scaleFactor) = 0;
+
+  /**
+   * @brief Notifies Shadow Map texture is changed by parent SceneView.
+   *
+   * @param[in] shadowMapTexture Shadow Map texture that will be used to compute shadow.
+   */
+  virtual void NotifyShadowMapTexture(Dali::Texture shadowMapTexture) = 0;
+};
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_INTERNAL_LIGHT_OBSERVER_H
diff --git a/dali-scene3d/internal/common/model-cache-manager.cpp b/dali-scene3d/internal/common/model-cache-manager.cpp
new file mode 100644
index 0000000..976a224
--- /dev/null
+++ b/dali-scene3d/internal/common/model-cache-manager.cpp
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/common/model-cache-manager.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/devel-api/common/singleton-service.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/public-api/object/base-object.h>
+
+#include <mutex>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+
+namespace Dali::Scene3D::Internal
+{
+class ModelCacheManager::Impl : public Dali::BaseObject
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  Impl()
+  {
+    // Try to create ResourceLoader here, to ensure that we create it on main thread.
+    Dali::Scene3D::Internal::ImageResourceLoader::EnsureResourceLoaderCreated();
+  }
+
+  Dali::Scene3D::Loader::LoadResult GetModelLoadResult(std::string modelUri)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    return Dali::Scene3D::Loader::LoadResult{cache.resources, cache.scene, cache.metaData, cache.animationDefinitions, cache.amimationGroupDefinitions, cache.cameraParameters, cache.lights};
+  }
+
+  void LockModelLoadScene(std::string modelUri)
+  {
+    // To avoid dead-lock, do not use mModelCacheMutex here
+    auto& modelMutex = GetLoadSceneMutexInstance(modelUri);
+    modelMutex.lock();
+  }
+
+  void UnlockModelLoadScene(std::string modelUri)
+  {
+    // To avoid dead-lock, do not use mModelCacheMutex here
+    auto& modelMutex = GetLoadSceneMutexInstance(modelUri);
+    modelMutex.unlock();
+  }
+
+  uint32_t GetModelCacheRefCount(std::string modelUri)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    return cache.refCount;
+  }
+
+  void ReferenceModelCache(std::string modelUri)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    cache.refCount++;
+  }
+
+  void UnreferenceModelCache(std::string modelUri)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    if(cache.refCount > 0)
+    {
+      cache.refCount--;
+    }
+
+    if(cache.refCount == 0)
+    {
+      mModelCache.erase(modelUri);
+
+      // Request image resource GC
+      Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+    }
+  }
+
+  bool IsSceneLoaded(std::string modelUri)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    return cache.isSceneLoaded;
+  }
+
+  void SetSceneLoaded(std::string modelUri, bool isSceneLoaded)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    cache.isSceneLoaded           = isSceneLoaded;
+  }
+
+  bool IsSceneLoading(std::string modelUri)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    return cache.isSceneLoading;
+  }
+
+  void SetSceneLoading(std::string modelUri, bool isSceneLoading)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    cache.isSceneLoading          = isSceneLoading;
+  }
+
+protected:
+  /**
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~Impl()
+  {
+  }
+
+private:
+  /**
+   * @brief Retrieves the mutex object to synchronize the scene loading of the model
+   * with the given URI between multiple threads.
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @return The mutex object.
+   */
+  std::mutex& GetLoadSceneMutexInstance(std::string modelUri)
+  {
+    Dali::Mutex::ScopedLock lock(mModelCacheMutex);
+    ModelCache&             cache = mModelCache[modelUri];
+    return cache.loadSceneMutex;
+  }
+
+private:
+  struct ModelCache
+  {
+    Dali::Scene3D::Loader::ResourceBundle  resources{}; ///< The bundle to store resources in.
+    Dali::Scene3D::Loader::SceneDefinition scene{};     ///< The scene definition to populate.
+    Dali::Scene3D::Loader::SceneMetadata   metaData{};  ///< The metadata of the scene.
+
+    std::vector<Dali::Scene3D::Loader::AnimationDefinition>      animationDefinitions{};      ///< The list of animation definitions, in lexicographical order of their names.
+    std::vector<Dali::Scene3D::Loader::AnimationGroupDefinition> amimationGroupDefinitions{}; ///< The list of animation group definitions, in lexicographical order of their names.
+    std::vector<Dali::Scene3D::Loader::CameraParameters>         cameraParameters{};          ///< The camera parameters that were loaded from the scene.
+    std::vector<Dali::Scene3D::Loader::LightParameters>          lights{};                    ///< The light parameters that were loaded from the scene.
+
+    uint32_t   refCount{0};      ///< The reference count of this model cache.
+    std::mutex loadSceneMutex{}; ///< The mutex instance used to synchronise the loading of the scene for the same model in different threads.
+
+    bool isSceneLoaded{false};  ///< Whether the scene of the model has been loaded.
+    bool isSceneLoading{false}; ///< Whether the scene loading of the model is in progress.
+  };
+
+  // Note : We should use some container that the element memory pointer is not changed due to LoadResult and loadSceneMutex validation.
+  using ModelResourceCache = std::map<std::string, ModelCache>;
+  ModelResourceCache mModelCache;
+
+  Dali::Mutex mModelCacheMutex;
+};
+
+ModelCacheManager::ModelCacheManager() = default;
+
+ModelCacheManager::~ModelCacheManager() = default;
+
+ModelCacheManager ModelCacheManager::Get()
+{
+  ModelCacheManager manager;
+
+  // Check whether the ModelCacheManager is already created
+  SingletonService singletonService(SingletonService::Get());
+  if(singletonService)
+  {
+    Dali::BaseHandle handle = singletonService.GetSingleton(typeid(ModelCacheManager));
+    if(handle)
+    {
+      // If so, downcast the handle of singleton to ModelCacheManager
+      manager = ModelCacheManager(dynamic_cast<ModelCacheManager::Impl*>(handle.GetObjectPtr()));
+    }
+
+    if(!manager)
+    {
+      // If not, create the ModelCacheManager and register it as a singleton
+      manager = ModelCacheManager(new ModelCacheManager::Impl());
+      singletonService.Register(typeid(manager), manager);
+    }
+  }
+
+  return manager;
+}
+
+ModelCacheManager::ModelCacheManager(ModelCacheManager::Impl* impl)
+: BaseHandle(impl)
+{
+}
+
+Dali::Scene3D::Loader::LoadResult ModelCacheManager::GetModelLoadResult(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  return impl.GetModelLoadResult(modelUri);
+}
+
+void ModelCacheManager::LockModelLoadScene(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  return impl.LockModelLoadScene(modelUri);
+}
+
+void ModelCacheManager::UnlockModelLoadScene(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  return impl.UnlockModelLoadScene(modelUri);
+}
+
+uint32_t ModelCacheManager::GetModelCacheRefCount(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  return impl.GetModelCacheRefCount(modelUri);
+}
+
+void ModelCacheManager::ReferenceModelCache(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  impl.ReferenceModelCache(modelUri);
+}
+
+void ModelCacheManager::UnreferenceModelCache(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  impl.UnreferenceModelCache(modelUri);
+}
+
+bool ModelCacheManager::IsSceneLoaded(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  return impl.IsSceneLoaded(modelUri);
+}
+
+void ModelCacheManager::SetSceneLoaded(std::string modelUri, bool isSceneLoaded)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  impl.SetSceneLoaded(modelUri, isSceneLoaded);
+}
+
+bool ModelCacheManager::IsSceneLoading(std::string modelUri)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  return impl.IsSceneLoading(modelUri);
+}
+
+void ModelCacheManager::SetSceneLoading(std::string modelUri, bool isSceneLoading)
+{
+  ModelCacheManager::Impl& impl = static_cast<ModelCacheManager::Impl&>(GetBaseObject());
+  impl.SetSceneLoading(modelUri, isSceneLoading);
+}
+
+} // namespace Dali::Scene3D::Internal
diff --git a/dali-scene3d/internal/common/model-cache-manager.h b/dali-scene3d/internal/common/model-cache-manager.h
new file mode 100644
index 0000000..47ac48c
--- /dev/null
+++ b/dali-scene3d/internal/common/model-cache-manager.h
@@ -0,0 +1,162 @@
+#ifndef DALI_SCENE3D_MODEL_CACHE_MANAGER_H
+#define DALI_SCENE3D_MODEL_CACHE_MANAGER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/load-result.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+class ModelCacheManager;
+
+/**
+ * A singleton class to manage the cache of 3D models so that the resources of the same model
+ * are only loaded once and kept in the cache. The cached resources will be reused when the
+ * same model is loaded multiple times.
+ */
+class ModelCacheManager : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Creates a ModelCacheManager handle.
+   *
+   * Calling member functions with an uninitialised handle is not allowed.
+   */
+  ModelCacheManager();
+
+  /**
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   */
+  ~ModelCacheManager();
+
+  /**
+   * @brief Create or retrieve the ModelCacheManager singleton.
+   *
+   * @return A handle to the ModelCacheManager.
+   */
+  static ModelCacheManager Get();
+
+  /**
+   * @brief Retrieves the load result for the model with the given URI.
+   * If there is no existing load result for the given model, a new one will be created.
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @return A reference to the model's load result.
+   */
+  Dali::Scene3D::Loader::LoadResult GetModelLoadResult(std::string modelUri);
+
+  /**
+   * @brief Lock the mutex object to synchronize the scene loading of the model
+   * with the given URI between multiple threads.
+   * It will be used when we need to avoid multiple threads access to same cache.
+   *
+   * @param[in] modelUri The unique model RUI with its absolute path.
+   * @post UnlockModelLoadScene() should be called before call this API.
+   */
+  void LockModelLoadScene(std::string modelUri);
+
+  /**
+   * @brief Unlock the mutex object to synchronize the scene loading of the model
+   * with the given URI between multiple threads.
+   * It will be used when we need to avoid multiple threads access to same cache.
+   *
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @pre LockModelLoadScene() should be called before call this API.
+   */
+  void UnlockModelLoadScene(std::string modelUri);
+
+  /**
+   * @brief Retrieves the reference count of the cache for the model with the given URI.
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @return The reference count of the cache.
+   */
+  uint32_t GetModelCacheRefCount(std::string modelUri);
+
+  /**
+   * @brief Reference the cache of the model with the given URI.
+   * This will increment the reference count of the load result by 1.
+   * @param[in] modelUri The model URI.
+   */
+  void ReferenceModelCache(std::string modelUri);
+
+  /**
+   * @brief Unreference the cache of the model with the given URI.
+   * This will decrement the reference count of the load result by 1.
+   * When the reference count becomes zero, the model will be removed from the cache and all
+   * its resources will be deleted.
+   * @param[in] modelUri The model URI.
+   */
+  void UnreferenceModelCache(std::string modelUri);
+
+  /**
+   * @brief Retrieves whether the scene of the model with the given URI has been loaded.
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @return whether the scene of the model has been loaded. This will be true if the scene
+   * has been loaded for once.
+   */
+  bool IsSceneLoaded(std::string modelUri);
+
+  /**
+   * @brief Sets whether the scene of the model with the given URI has been loaded.
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @param[in] isSceneLoaded Whether the scene of the model has been loaded.
+   */
+  void SetSceneLoaded(std::string modelUri, bool isSceneLoaded);
+
+  /**
+   * @brief Retrieves whether the scene loading of the model with the given URI is in progress.
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @return whether the scene loading of the model is in progress.
+   */
+  bool IsSceneLoading(std::string modelUri);
+
+  /**
+   * @brief Sets whether the scene loading of the model with the given URI is in progress.
+   * @param[in] modelUri The unique model URI with its absolute path.
+   * @param[in] isSceneLoading Whether the scene loading of the model is in progress.
+   */
+  void SetSceneLoading(std::string modelUri, bool isSceneLoading);
+
+public:
+  // Default copy and move operator
+  ModelCacheManager(const ModelCacheManager& rhs) = default;
+  ModelCacheManager(ModelCacheManager&& rhs)      = default;
+  ModelCacheManager& operator=(const ModelCacheManager& rhs) = default;
+  ModelCacheManager& operator=(ModelCacheManager&& rhs) noexcept = default;
+
+private:
+  class Impl;
+  explicit DALI_INTERNAL ModelCacheManager(ModelCacheManager::Impl* impl);
+};
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_CACHE_MANAGER_H
diff --git a/dali-scene3d/internal/common/model-load-task.cpp b/dali-scene3d/internal/common/model-load-task.cpp
new file mode 100644
index 0000000..10e0aba
--- /dev/null
+++ b/dali-scene3d/internal/common/model-load-task.cpp
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/common/model-load-task.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <filesystem>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+static constexpr Vector3 Y_DIRECTION(1.0f, -1.0f, 1.0f);
+} // namespace
+
+ModelLoadTask::ModelLoadTask(const std::string& modelUrl, const std::string& resourceDirectoryUrl, CallbackBase* callback)
+: AsyncTask(callback, AsyncTask::PriorityType::LOW),
+  mModelUrl(modelUrl),
+  mResourceDirectoryUrl(resourceDirectoryUrl),
+  mModelCacheManager(Scene3D::Internal::ModelCacheManager::Get()),
+  mLoadResult(mModelCacheManager.GetModelLoadResult(mModelUrl)),
+  mHasSucceeded(false)
+{
+  mModelCacheManager.ReferenceModelCache(mModelUrl);
+}
+
+ModelLoadTask::~ModelLoadTask()
+{
+  mModelCacheManager.UnreferenceModelCache(mModelUrl);
+}
+
+void ModelLoadTask::Process()
+{
+  if(mResourceDirectoryUrl.empty())
+  {
+    std::filesystem::path modelUrl(mModelUrl);
+    mResourceDirectoryUrl = std::string(modelUrl.parent_path()) + "/";
+  }
+
+  Dali::Scene3D::Loader::ResourceBundle::PathProvider pathProvider = [&](Dali::Scene3D::Loader::ResourceType::Value type) {
+    return mResourceDirectoryUrl;
+  };
+
+  mModelLoader = std::make_shared<Dali::Scene3D::Loader::ModelLoader>(mModelUrl, mResourceDirectoryUrl, mLoadResult);
+
+  bool loadSucceeded = false;
+  {
+    // Lock model url during process, so let we do not try to load same model multiple times.
+    mModelCacheManager.LockModelLoadScene(mModelUrl);
+    if(mModelCacheManager.IsSceneLoaded(mModelUrl))
+    {
+      loadSucceeded = true;
+    }
+    else
+    {
+      mModelCacheManager.SetSceneLoading(mModelUrl, true);
+
+      loadSucceeded = mModelLoader->LoadModel(pathProvider, true);
+
+      // Mesh of glTF and dli is defined in right hand coordinate system, with positive Y for Up direction.
+      // Because DALi uses left hand system, Y direciton will be flipped for environment map sampling.
+      for(auto&& env : GetResources().mEnvironmentMaps)
+      {
+        env.first.mYDirection = Y_DIRECTION;
+      }
+
+      mModelCacheManager.SetSceneLoading(mModelUrl, false);
+      mModelCacheManager.SetSceneLoaded(mModelUrl, loadSucceeded);
+    }
+    mModelCacheManager.UnlockModelLoadScene(mModelUrl);
+  }
+
+  if(!loadSucceeded)
+  {
+    DALI_LOG_ERROR("Failed to load scene from '%s'\n", mModelUrl.c_str());
+    return;
+  }
+
+  mHasSucceeded = true;
+}
+
+bool ModelLoadTask::IsReady()
+{
+  return true;
+}
+
+bool ModelLoadTask::HasSucceeded() const
+{
+  return mHasSucceeded;
+}
+
+Dali::Scene3D::Loader::SceneDefinition& ModelLoadTask::GetScene() const
+{
+  return mModelLoader->GetScene();
+}
+
+Dali::Scene3D::Loader::ResourceBundle& ModelLoadTask::GetResources() const
+{
+  return mModelLoader->GetResources();
+}
+
+std::vector<Dali::Scene3D::Loader::AnimationDefinition>& ModelLoadTask::GetAnimations() const
+{
+  return mModelLoader->GetAnimations();
+}
+
+std::vector<Dali::Scene3D::Loader::CameraParameters>& ModelLoadTask::GetCameras() const
+{
+  return mModelLoader->GetCameras();
+}
+
+Dali::Scene3D::Loader::Customization::Choices& ModelLoadTask::GetResourceChoices()
+{
+  return mModelLoader->GetResourceChoices();
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/internal/common/model-load-task.h b/dali-scene3d/internal/common/model-load-task.h
new file mode 100644
index 0000000..c2baead
--- /dev/null
+++ b/dali-scene3d/internal/common/model-load-task.h
@@ -0,0 +1,135 @@
+#ifndef DALI_SCENE3D_MODEL_LOAD_TASK_H
+#define DALI_SCENE3D_MODEL_LOAD_TASK_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/images/pixel-data.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/model-cache-manager.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/model-loader.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali/devel-api/threading/conditional-wait.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+class ModelLoadTask;
+typedef IntrusivePtr<ModelLoadTask> ModelLoadTaskPtr;
+
+class ModelLoadTask : public AsyncTask
+{
+public:
+  /**
+   * Constructor
+   * @param[in] modelUrl Model file path.(e.g., glTF, and DLI).
+   * @param[in] resourceDirectoryUrl Resource file path that includes binary, image etc.
+   * @param[in] callback The callback that is called when the operation is completed.
+   */
+  ModelLoadTask(const std::string& modelUrl, const std::string& resourceDirectoryUrl, CallbackBase* callback);
+
+  /**
+   * Destructor.
+   */
+  ~ModelLoadTask();
+
+  /**
+   * Whether the task has succeeded.
+   * @return True if the task has succeeded.
+   */
+  bool HasSucceeded() const;
+
+  /**
+   * @brief Retrieves loaded scene
+   * @return SceneDefinition that is loaded from file
+   */
+  Dali::Scene3D::Loader::SceneDefinition& GetScene() const;
+
+  /**
+   * @brief Retrieves resource bunder that includes resource information
+   * @return ResourceBundle for model resources
+   */
+  Dali::Scene3D::Loader::ResourceBundle& GetResources() const;
+
+  /**
+   * @brief Retrieves loaded AnimationDefinition
+   * @return AnimationDefinition that is loaded from file
+   */
+  std::vector<Dali::Scene3D::Loader::AnimationDefinition>& GetAnimations() const;
+
+  /**
+   * @brief Retrieves loaded CameraParameters
+   * @return CameraParameters list that is loaded from file
+   */
+  std::vector<Dali::Scene3D::Loader::CameraParameters>& GetCameras() const;
+
+  /**
+   * @brief Retrieves ResourceChoices
+   * @return Choices for loaded Resources
+   */
+  Dali::Scene3D::Loader::Customization::Choices& GetResourceChoices();
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process();
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady();
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "ModelLoadTask";
+  }
+
+private:
+  // Undefined
+  ModelLoadTask(const ModelLoadTask& task) = delete;
+
+  // Undefined
+  ModelLoadTask& operator=(const ModelLoadTask& task) = delete;
+
+  std::string                                         mModelUrl;
+  std::string                                         mResourceDirectoryUrl;
+  std::shared_ptr<Dali::Scene3D::Loader::ModelLoader> mModelLoader;
+  ModelCacheManager                                   mModelCacheManager;
+  Dali::Scene3D::Loader::LoadResult                   mLoadResult;
+  bool                                                mHasSucceeded;
+};
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_LOAD_TASK_H
diff --git a/dali-scene3d/internal/controls/model/model-impl.cpp b/dali-scene3d/internal/controls/model/model-impl.cpp
new file mode 100644
index 0000000..f012aa6
--- /dev/null
+++ b/dali-scene3d/internal/controls/model/model-impl.cpp
@@ -0,0 +1,1386 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/controls/model/model-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/math/math-utils.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+#include <filesystem>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/internal/common/model-cache-manager.h>
+#include <dali-scene3d/internal/controls/scene-view/scene-view-impl.h>
+#include <dali-scene3d/internal/event/collider-mesh-processor.h>
+#include <dali-scene3d/internal/light/light-impl.h>
+#include <dali-scene3d/internal/model-components/model-node-impl.h>
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/loader/camera-parameters.h>
+#include <dali-scene3d/public-api/loader/light-parameters.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/node-definition.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+using namespace Dali;
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::Model::New(std::string());
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::Model, Toolkit::Control, Create);
+DALI_TYPE_REGISTRATION_END()
+
+static constexpr Vector3 Y_DIRECTION(1.0f, -1.0f, 1.0f);
+static constexpr float   SIZE_STEP_CONDITION = 0.1f;
+
+static constexpr bool DEFAULT_MODEL_CHILDREN_SENSITIVE = false;
+static constexpr bool DEFAULT_MODEL_CHILDREN_FOCUSABLE = false;
+
+struct BoundingVolume
+{
+  void Init()
+  {
+    pointMin = Vector3(std::numeric_limits<float>::max(), std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
+    pointMax = Vector3(std::numeric_limits<float>::min(), std::numeric_limits<float>::min(), std::numeric_limits<float>::min());
+  }
+
+  void ConsiderNewPointInVolume(const Vector3& position)
+  {
+    pointMin.x = std::min(position.x, pointMin.x);
+    pointMin.y = std::min(position.y, pointMin.y);
+    pointMin.z = std::min(position.z, pointMin.z);
+
+    pointMax.x = std::max(position.x, pointMax.x);
+    pointMax.y = std::max(position.y, pointMax.y);
+    pointMax.z = std::max(position.z, pointMax.z);
+  }
+
+  Vector3 CalculateSize()
+  {
+    return pointMax - pointMin;
+  }
+
+  Vector3 CalculatePivot()
+  {
+    Vector3 pivot = pointMin / (pointMin - pointMax);
+    for(uint32_t i = 0; i < 3; ++i)
+    {
+      // To avoid divid by zero
+      if(Dali::Equals(pointMin[i], pointMax[i]))
+      {
+        pivot[i] = 0.5f;
+      }
+    }
+    return pivot;
+  }
+
+  Vector3 pointMin;
+  Vector3 pointMax;
+};
+
+void ConfigureBlendShapeShaders(
+  Dali::Scene3D::Loader::ResourceBundle& resources, const Dali::Scene3D::Loader::SceneDefinition& scene, Actor root, std::vector<Dali::Scene3D::Loader::BlendshapeShaderConfigurationRequest>&& requests)
+{
+  std::vector<std::string> errors;
+  auto                     onError = [&errors](const std::string& msg) { errors.push_back(msg); };
+  if(!scene.ConfigureBlendshapeShaders(resources, root, std::move(requests), onError))
+  {
+    Dali::Scene3D::Loader::ExceptionFlinger flinger(ASSERT_LOCATION);
+    for(auto& msg : errors)
+    {
+      flinger << msg << '\n';
+    }
+  }
+}
+
+void AddModelTreeToAABB(BoundingVolume& AABB, const Dali::Scene3D::Loader::SceneDefinition& scene, const Dali::Scene3D::Loader::Customization::Choices& choices, Dali::Scene3D::Loader::Index iNode, Dali::Scene3D::Loader::NodeDefinition::CreateParams& nodeParams, Matrix parentMatrix)
+{
+  static constexpr uint32_t BOX_POINT_COUNT             = 8;
+  static uint32_t           BBIndex[BOX_POINT_COUNT][3] = {{0, 0, 0}, {0, 1, 0}, {1, 0, 0}, {1, 1, 0}, {0, 0, 1}, {0, 1, 1}, {1, 0, 1}, {1, 1, 1}};
+
+  Matrix                                       nodeMatrix;
+  const Dali::Scene3D::Loader::NodeDefinition* node        = scene.GetNode(iNode);
+  Matrix                                       localMatrix = node->GetLocalSpace();
+  Matrix::Multiply(nodeMatrix, localMatrix, parentMatrix);
+
+  Vector3 volume[2];
+  if(node->GetExtents(nodeParams.mResources, volume[0], volume[1]))
+  {
+    for(uint32_t i = 0; i < BOX_POINT_COUNT; ++i)
+    {
+      Vector4 position       = Vector4(volume[BBIndex[i][0]].x, volume[BBIndex[i][1]].y, volume[BBIndex[i][2]].z, 1.0f);
+      Vector4 objectPosition = nodeMatrix * position;
+      objectPosition /= objectPosition.w;
+
+      AABB.ConsiderNewPointInVolume(Vector3(objectPosition));
+    }
+  }
+
+  if(node->mCustomization)
+  {
+    if(!node->mChildren.empty())
+    {
+      auto                         choice = choices.Get(node->mCustomization->mTag);
+      Dali::Scene3D::Loader::Index i      = std::min(choice != Dali::Scene3D::Loader::Customization::NONE ? choice : 0, static_cast<Dali::Scene3D::Loader::Index>(node->mChildren.size() - 1));
+
+      AddModelTreeToAABB(AABB, scene, choices, node->mChildren[i], nodeParams, nodeMatrix);
+    }
+  }
+  else
+  {
+    for(auto i : node->mChildren)
+    {
+      AddModelTreeToAABB(AABB, scene, choices, i, nodeParams, nodeMatrix);
+    }
+  }
+}
+
+void UpdateBlendShapeNodeMapRecursively(Model::BlendShapeModelNodeMap& resultMap, const Scene3D::ModelNode& node)
+{
+  if(!node)
+  {
+    return;
+  }
+  const auto childCount = node.GetChildCount();
+  for(auto i = 0u; i < childCount; ++i)
+  {
+    UpdateBlendShapeNodeMapRecursively(resultMap, Scene3D::ModelNode::DownCast(node.GetChildAt(i)));
+  }
+
+  std::vector<std::string> blendShapeNames;
+  node.RetrieveBlendShapeNames(blendShapeNames);
+  for(const auto& iter : blendShapeNames)
+  {
+    // Append or create new list.
+    resultMap[iter].push_back(node);
+  }
+}
+
+void UpdateShaderRecursively(Scene3D::ModelNode node, Scene3D::Loader::ShaderManagerPtr shaderManager)
+{
+  if(!node)
+  {
+    return;
+  }
+
+  GetImplementation(node).UpdateShader(shaderManager);
+
+  uint32_t childrenCount = node.GetChildCount();
+  for(uint32_t i = 0; i < childrenCount; ++i)
+  {
+    Scene3D::ModelNode childNode = Scene3D::ModelNode::DownCast(node.GetChildAt(i));
+    if(childNode)
+    {
+      UpdateShaderRecursively(childNode, shaderManager);
+    }
+  }
+}
+
+void UpdateShadowMapTextureRecursively(Scene3D::ModelNode node, Dali::Texture shadowMapTexture)
+{
+  if(!node)
+  {
+    return;
+  }
+
+  GetImplementation(node).SetShadowMapTexture(shadowMapTexture);
+
+  uint32_t childrenCount = node.GetChildCount();
+  for(uint32_t i = 0; i < childrenCount; ++i)
+  {
+    Scene3D::ModelNode childNode = Scene3D::ModelNode::DownCast(node.GetChildAt(i));
+    if(childNode)
+    {
+      UpdateShadowMapTextureRecursively(childNode, shadowMapTexture);
+    }
+  }
+}
+
+void ResetResourceTask(IntrusivePtr<AsyncTask>&& asyncTask)
+{
+  if(!asyncTask)
+  {
+    return;
+  }
+  Dali::AsyncTaskManager::Get().RemoveTask(asyncTask);
+  asyncTask.Reset();
+}
+
+} // anonymous namespace
+
+Model::Model(const std::string& modelUrl, const std::string& resourceDirectoryUrl)
+: Control(ControlBehaviour(DISABLE_SIZE_NEGOTIATION | DISABLE_STYLE_CHANGE_SIGNALS)),
+  mModelUrl(modelUrl),
+  mResourceDirectoryUrl(resourceDirectoryUrl),
+  mModelRoot(),
+  mShaderManager(new Scene3D::Loader::ShaderManager()),
+  mNaturalSize(Vector3::ZERO),
+  mModelPivot(AnchorPoint::CENTER),
+  mSceneIblScaleFactor(1.0f),
+  mIblScaleFactor(1.0f),
+  mSceneSpecularMipmapLevels(1u),
+  mSpecularMipmapLevels(1u),
+  mModelChildrenSensitive(DEFAULT_MODEL_CHILDREN_SENSITIVE),
+  mModelChildrenFocusable(DEFAULT_MODEL_CHILDREN_FOCUSABLE),
+  mModelResourceReady(false),
+  mIblDiffuseResourceReady(true),
+  mIblSpecularResourceReady(true),
+  mIblDiffuseDirty(false),
+  mIblSpecularDirty(false),
+  mIsShadowCasting(true),
+  mIsShadowReceiving(true)
+{
+}
+
+Model::~Model()
+{
+  ResetResourceTasks();
+
+  if(ModelCacheManager::Get() && !mModelUrl.empty())
+  {
+    ModelCacheManager::Get().UnreferenceModelCache(mModelUrl);
+  }
+}
+
+Dali::Scene3D::Model Model::New(const std::string& modelUrl, const std::string& resourceDirectoryUrl)
+{
+  Model* impl = new Model(modelUrl, resourceDirectoryUrl);
+
+  Dali::Scene3D::Model handle = Dali::Scene3D::Model(*impl);
+
+  // Second-phase init of the implementation
+  // This can only be done after the CustomActor connection has been made...
+  impl->Initialize();
+
+  return handle;
+}
+
+const Scene3D::ModelNode Model::GetModelRoot() const
+{
+  return mModelRoot;
+}
+
+void Model::AddModelNode(Scene3D::ModelNode modelNode)
+{
+  if(!mModelRoot)
+  {
+    CreateModelRoot();
+  }
+
+  mModelRoot.Add(modelNode);
+  if(mModelUrl.empty())
+  {
+    mModelResourceReady = true;
+  }
+
+  UpdateShaderRecursively(modelNode, mShaderManager);
+
+  if(mShadowMapTexture)
+  {
+    UpdateShadowMapTextureRecursively(modelNode, mShadowMapTexture);
+  }
+
+  if(mIblDiffuseResourceReady && mIblSpecularResourceReady)
+  {
+    UpdateImageBasedLightTexture();
+    UpdateImageBasedLightScaleFactor();
+  }
+
+  GetImplementation(modelNode).SetRootModel(this);
+
+  // If model has a collider mesh set, add it to the container
+  if(modelNode.HasColliderMesh())
+  {
+    RegisterColliderMesh(modelNode);
+    Scene3D::ColliderMeshProcessor::Get().ColliderMeshChanged(Scene3D::Model::DownCast(Self()));
+  }
+
+  if(Self().GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE))
+  {
+    NotifyResourceReady();
+  }
+}
+
+void Model::RegisterColliderMesh(Scene3D::ModelNode& modelNode)
+{
+  mColliderMeshes[modelNode.GetProperty<int>(Actor::Property::ID)] = modelNode;
+
+  // Add processor
+  Scene3D::ColliderMeshProcessor::Get().ColliderMeshChanged(Scene3D::Model::DownCast(Self()));
+}
+
+void Model::RemoveColliderMesh(Scene3D::ModelNode& node)
+{
+  auto id   = node.GetProperty<int>(Actor::Property::ID);
+  auto iter = std::find_if(mColliderMeshes.begin(), mColliderMeshes.end(), [id](auto& item) {
+    return item.first == id;
+  });
+  if(iter != mColliderMeshes.end())
+  {
+    mColliderMeshes.erase(iter);
+  }
+}
+
+void Model::RemoveModelNode(Scene3D::ModelNode modelNode)
+{
+  // remove collider mesh from the list if node is being removed
+  if(modelNode.HasColliderMesh())
+  {
+    RemoveColliderMesh(modelNode);
+    GetImplementation(modelNode).SetRootModel(nullptr);
+  }
+
+  if(mModelRoot)
+  {
+    UpdateShaderRecursively(modelNode, nullptr);
+    mModelRoot.Remove(modelNode);
+  }
+}
+
+void Model::SetChildrenSensitive(bool enable)
+{
+  if(mModelChildrenSensitive != enable)
+  {
+    mModelChildrenSensitive = enable;
+    if(mModelRoot)
+    {
+      mModelRoot.SetProperty(Dali::Actor::Property::SENSITIVE, mModelChildrenSensitive);
+    }
+  }
+}
+
+bool Model::GetChildrenSensitive() const
+{
+  return mModelChildrenSensitive;
+}
+
+void Model::SetChildrenFocusable(bool enable)
+{
+  if(mModelChildrenFocusable != enable)
+  {
+    mModelChildrenFocusable = enable;
+    if(mModelRoot)
+    {
+      mModelRoot.SetProperty(Dali::Actor::Property::KEYBOARD_FOCUSABLE, mModelChildrenFocusable);
+      mModelRoot.SetProperty(Dali::DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, mModelChildrenFocusable);
+    }
+  }
+}
+
+bool Model::GetChildrenFocusable() const
+{
+  return mModelChildrenFocusable;
+}
+
+void Model::SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor)
+{
+  bool needIblReset = false;
+  bool isOnScene    = Self().GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE);
+  if(mDiffuseIblUrl != diffuseUrl)
+  {
+    mDiffuseIblUrl = diffuseUrl;
+    if(mDiffuseIblUrl.empty())
+    {
+      needIblReset = true;
+    }
+    else
+    {
+      mIblDiffuseDirty         = true;
+      mIblDiffuseResourceReady = false;
+    }
+  }
+
+  if(mSpecularIblUrl != specularUrl)
+  {
+    mSpecularIblUrl = specularUrl;
+    if(mSpecularIblUrl.empty())
+    {
+      needIblReset = true;
+    }
+    else
+    {
+      mIblSpecularDirty         = true;
+      mIblSpecularResourceReady = false;
+    }
+  }
+
+  // If one or both of diffuse url and specular url are empty,
+  // we don't need to request to load texture.
+  if(needIblReset)
+  {
+    ResetResourceTask(mIblDiffuseLoadTask);
+    ResetResourceTask(mIblSpecularLoadTask);
+
+    mIblDiffuseDirty          = false;
+    mIblSpecularDirty         = false;
+    mIblDiffuseResourceReady  = true;
+    mIblSpecularResourceReady = true;
+
+    mDiffuseTexture.Reset();
+    mSpecularTexture.Reset();
+    UpdateImageBasedLightTexture();
+
+    // Request image resource GC
+    Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+  }
+  else
+  {
+    if(isOnScene && mIblDiffuseDirty)
+    {
+      ResetResourceTask(mIblDiffuseLoadTask);
+      mIblDiffuseLoadTask = new EnvironmentMapLoadTask(mDiffuseIblUrl, Scene3D::EnvironmentMapType::CUBEMAP, MakeCallback(this, &Model::OnIblDiffuseLoadComplete));
+      Dali::AsyncTaskManager::Get().AddTask(mIblDiffuseLoadTask);
+      mIblDiffuseDirty = false;
+
+      // Request image resource GC
+      Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+    }
+
+    if(isOnScene && mIblSpecularDirty)
+    {
+      ResetResourceTask(mIblSpecularLoadTask);
+      mIblSpecularLoadTask = new EnvironmentMapLoadTask(mSpecularIblUrl, Scene3D::EnvironmentMapType::CUBEMAP, MakeCallback(this, &Model::OnIblSpecularLoadComplete));
+      Dali::AsyncTaskManager::Get().AddTask(mIblSpecularLoadTask);
+      mIblSpecularDirty = false;
+
+      // Request image resource GC
+      Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+    }
+  }
+
+  if(!Dali::Equals(mIblScaleFactor, scaleFactor))
+  {
+    mIblScaleFactor = scaleFactor;
+    UpdateImageBasedLightScaleFactor();
+  }
+
+  // If diffuse and specular textures are already loaded, emits resource ready signal here.
+  NotifyResourceReady();
+}
+
+void Model::SetImageBasedLightScaleFactor(float scaleFactor)
+{
+  mIblScaleFactor = scaleFactor;
+  if(mDiffuseTexture && mSpecularTexture)
+  {
+    UpdateImageBasedLightScaleFactor();
+  }
+}
+
+float Model::GetImageBasedLightScaleFactor() const
+{
+  return mIblScaleFactor;
+}
+
+uint32_t Model::GetAnimationCount() const
+{
+  return mAnimations.size();
+}
+
+Dali::Animation Model::GetAnimation(uint32_t index) const
+{
+  Dali::Animation animation;
+  if(mAnimations.size() > index)
+  {
+    animation = mAnimations[index].second;
+  }
+  return animation;
+}
+
+Dali::Animation Model::GetAnimation(const std::string& name) const
+{
+  Dali::Animation animation;
+  if(!name.empty())
+  {
+    for(auto&& animationData : mAnimations)
+    {
+      if(animationData.first == name)
+      {
+        animation = animationData.second;
+        break;
+      }
+    }
+  }
+  return animation;
+}
+
+uint32_t Model::GetCameraCount() const
+{
+  return mCameraParameters.size();
+}
+
+Dali::CameraActor Model::GenerateCamera(uint32_t index) const
+{
+  Dali::CameraActor camera;
+  if(mCameraParameters.size() > index)
+  {
+    camera = Dali::CameraActor::New3DCamera();
+    if(!mCameraParameters[index].ConfigureCamera(camera, false))
+    {
+      DALI_LOG_ERROR("Fail to generate %u's camera actor : Some property was not defined. Please check model file.\n", index);
+      camera.Reset();
+      return camera;
+    }
+
+    ApplyCameraTransform(camera);
+  }
+  return camera;
+}
+
+bool Model::ApplyCamera(uint32_t index, Dali::CameraActor camera) const
+{
+  if(camera && mCameraParameters.size() > index)
+  {
+    if(!mCameraParameters[index].ConfigureCamera(camera, false))
+    {
+      DALI_LOG_ERROR("Fail to apply %u's camera actor : Some property was not defined. Please check model file.\n", index);
+      return false;
+    }
+
+    ApplyCameraTransform(camera);
+    return true;
+  }
+  return false;
+}
+
+Scene3D::ModelNode Model::FindChildModelNodeByName(std::string_view nodeName)
+{
+  Actor childActor = Self().FindChildByName(nodeName);
+  return Scene3D::ModelNode::DownCast(childActor);
+}
+
+void Model::RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const
+{
+  blendShapeNames.reserve(blendShapeNames.size() + mBlendShapeModelNodeMap.size());
+  for(const auto& iter : mBlendShapeModelNodeMap)
+  {
+    blendShapeNames.push_back(iter.first);
+  }
+}
+
+void Model::RetrieveModelNodesByBlendShapeName(std::string_view blendShapeName, std::vector<Scene3D::ModelNode>& modelNodes) const
+{
+  auto iter = mBlendShapeModelNodeMap.find(std::string(blendShapeName));
+  if(iter != mBlendShapeModelNodeMap.end())
+  {
+    const auto& modelNodeList = iter->second;
+    modelNodes.reserve(modelNodes.size() + modelNodeList.size());
+    for(const auto& nodeIter : modelNodeList)
+    {
+      modelNodes.push_back(nodeIter);
+    }
+  }
+}
+
+Dali::Animation Model::GenerateMotionDataAnimation(Scene3D::MotionData motionData)
+{
+  Dali::Animation animation;
+
+  // TODO : Need to collect duplicated codes with SetMotionData()
+
+  if(motionData)
+  {
+    const uint32_t motionCount = motionData.GetMotionCount();
+    for(uint32_t i = 0u; i < motionCount; ++i)
+    {
+      auto motionIndex = motionData.GetIndex(i);
+      auto motionValue = motionData.GetValue(i);
+      if(motionIndex && motionValue)
+      {
+        if(motionIndex.GetModelNodeId() != Property::INVALID_KEY)
+        {
+          Scene3D::ModelNode modelNode;
+          if(motionIndex.GetModelNodeId().type == Property::Key::Type::STRING)
+          {
+            modelNode = FindChildModelNodeByName(motionIndex.GetModelNodeId().stringKey);
+          }
+          else if(motionIndex.GetModelNodeId().type == Property::Key::Type::INDEX)
+          {
+            // TODO : Not implement yet.
+          }
+
+          if(modelNode)
+          {
+            KeyFrames keyFrames = motionValue.GetKeyFrames();
+
+            if(keyFrames)
+            {
+              // Try to use index first. If failed, try to use name
+              Property::Index animatedPropertyIndex = motionIndex.GetPropertyIndex(modelNode);
+              if(animatedPropertyIndex != Property::INVALID_INDEX)
+              {
+                if(DALI_UNLIKELY(!animation))
+                {
+                  animation = Animation::New(motionData.GetDuration());
+                }
+                animation.AnimateBetween(Dali::Property(modelNode, animatedPropertyIndex), keyFrames);
+              }
+              else
+              {
+                std::string    animatedPropertyName = motionIndex.GetPropertyName(modelNode);
+                Dali::Property property(modelNode, animatedPropertyName);
+                if(property.propertyIndex != Property::INVALID_INDEX)
+                {
+                  if(DALI_UNLIKELY(!animation))
+                  {
+                    animation = Animation::New(motionData.GetDuration());
+                  }
+                  animation.AnimateBetween(property, keyFrames);
+                }
+              }
+            }
+          }
+        }
+        else
+        {
+          Scene3D::BlendShapeIndex blendShapeIndex = Scene3D::BlendShapeIndex::DownCast(motionIndex);
+          if(blendShapeIndex && blendShapeIndex.GetBlendShapeId().type == Property::Key::Type::STRING)
+          {
+            // Special case : For BlendShapeIndex that doesn't have ModelNodeId and has string BlendShapeId,
+            // we need to animate all kind of blendshapes
+
+            KeyFrames keyFrames = motionValue.GetKeyFrames();
+
+            if(keyFrames)
+            {
+              std::vector<Scene3D::ModelNode> modelNodes;
+              RetrieveModelNodesByBlendShapeName(blendShapeIndex.GetBlendShapeId().stringKey, modelNodes);
+
+              for(auto& modelNode : modelNodes)
+              {
+                // Try to use index first. If failed, try to use name
+                Property::Index animatedPropertyIndex = motionIndex.GetPropertyIndex(modelNode);
+                if(animatedPropertyIndex != Property::INVALID_INDEX)
+                {
+                  if(DALI_UNLIKELY(!animation))
+                  {
+                    animation = Animation::New(motionData.GetDuration());
+                  }
+                  animation.AnimateBetween(Dali::Property(modelNode, animatedPropertyIndex), keyFrames);
+                }
+                else
+                {
+                  std::string    animatedPropertyName = motionIndex.GetPropertyName(modelNode);
+                  Dali::Property property(modelNode, animatedPropertyName);
+
+                  if(property.propertyIndex != Property::INVALID_INDEX)
+                  {
+                    if(DALI_UNLIKELY(!animation))
+                    {
+                      animation = Animation::New(motionData.GetDuration());
+                    }
+                    animation.AnimateBetween(property, keyFrames);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return animation;
+}
+
+void Model::SetMotionData(Scene3D::MotionData motionData)
+{
+  // TODO : Need to collect duplicated codes with GenerateMotionDataAnimation()
+
+  if(motionData)
+  {
+    const uint32_t motionCount = motionData.GetMotionCount();
+    for(uint32_t i = 0u; i < motionCount; ++i)
+    {
+      auto motionIndex = motionData.GetIndex(i);
+      auto motionValue = motionData.GetValue(i);
+      if(motionIndex && motionValue)
+      {
+        if(motionIndex.GetModelNodeId() != Property::INVALID_KEY)
+        {
+          Scene3D::ModelNode modelNode;
+          if(motionIndex.GetModelNodeId().type == Property::Key::Type::STRING)
+          {
+            modelNode = FindChildModelNodeByName(motionIndex.GetModelNodeId().stringKey);
+          }
+          else if(motionIndex.GetModelNodeId().type == Property::Key::Type::INDEX)
+          {
+            // TODO : Not implement yet.
+          }
+
+          if(modelNode)
+          {
+            Property::Value value = motionValue.GetPropertyValue();
+
+            if(value.GetType() != Property::Type::NONE)
+            {
+              // Try to use index first. If failed, try to use name
+              Property::Index propertyIndex = motionIndex.GetPropertyIndex(modelNode);
+              if(propertyIndex != Property::INVALID_INDEX)
+              {
+                modelNode.SetProperty(propertyIndex, value);
+              }
+              else
+              {
+                std::string    propertyName = motionIndex.GetPropertyName(modelNode);
+                Dali::Property property(modelNode, propertyName);
+                if(property.propertyIndex != Property::INVALID_INDEX)
+                {
+                  modelNode.SetProperty(property.propertyIndex, value);
+                }
+              }
+            }
+          }
+        }
+        else
+        {
+          Scene3D::BlendShapeIndex blendShapeIndex = Scene3D::BlendShapeIndex::DownCast(motionIndex);
+          if(blendShapeIndex && blendShapeIndex.GetBlendShapeId().type == Property::Key::Type::STRING)
+          {
+            // Special case : For BlendShapeIndex that doesn't have ModelNodeId and has string BlendShapeId,
+            // we need to animate all kind of blendshapes
+
+            Property::Value value = motionValue.GetPropertyValue();
+
+            if(value.GetType() != Property::Type::NONE)
+            {
+              std::vector<Scene3D::ModelNode> modelNodes;
+              RetrieveModelNodesByBlendShapeName(blendShapeIndex.GetBlendShapeId().stringKey, modelNodes);
+
+              for(auto& modelNode : modelNodes)
+              {
+                // Try to use index first. If failed, try to use name
+                Property::Index propertyIndex = motionIndex.GetPropertyIndex(modelNode);
+                if(propertyIndex != Property::INVALID_INDEX)
+                {
+                  modelNode.SetProperty(propertyIndex, value);
+                }
+                else
+                {
+                  std::string    propertyName = motionIndex.GetPropertyName(modelNode);
+                  Dali::Property property(modelNode, propertyName);
+                  if(property.propertyIndex != Property::INVALID_INDEX)
+                  {
+                    modelNode.SetProperty(property.propertyIndex, value);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void Model::CastShadow(bool castShadow)
+{
+  mIsShadowCasting = castShadow;
+  UpdateCastShadowRecursively(mModelRoot, mIsShadowCasting);
+}
+
+bool Model::IsShadowCasting() const
+{
+  return mIsShadowCasting;
+}
+
+void Model::ReceiveShadow(bool receiveShadow)
+{
+  mIsShadowReceiving = receiveShadow;
+  UpdateReceiveShadowRecursively(mModelRoot, mIsShadowReceiving);
+}
+
+bool Model::IsShadowReceiving() const
+{
+  return mIsShadowReceiving;
+}
+
+
+///////////////////////////////////////////////////////////
+//
+// Private methods
+//
+
+void Model::OnInitialize()
+{
+  // Make ParentOrigin as Center.
+  Self().SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  mDefaultDiffuseTexture  = ImageResourceLoader::GetEmptyTextureWhiteRGB();
+  mDefaultSpecularTexture = ImageResourceLoader::GetEmptyTextureWhiteRGB();
+}
+
+void Model::OnSceneConnection(int depth)
+{
+  Actor parent = Self().GetParent();
+  while(parent)
+  {
+    // If this Model has parent SceneView and the its ShaderManager is same with privious ShaderManager,
+    // this Model don't need to update shader.
+    Scene3D::SceneView sceneView = Scene3D::SceneView::DownCast(parent);
+    if(sceneView)
+    {
+      mParentSceneView = sceneView;
+      GetImpl(sceneView).RegisterSceneItem(this);
+      Scene3D::Loader::ShaderManagerPtr shaderManager = GetImpl(sceneView).GetShaderManager();
+      if(mShaderManager != shaderManager)
+      {
+        mShaderManager = shaderManager;
+        UpdateShaderRecursively(mModelRoot, mShaderManager);
+      }
+      break;
+    }
+    parent = parent.GetParent();
+  }
+
+  // Model can be added on Dali::Scene directly without SceneView.
+  // So, Model's mShaderManager and shaders of child ModelNodes are needed to be reset when this Model has not parent SceneView.
+  Scene3D::SceneView parentSceneView = mParentSceneView.GetHandle();
+  if(!parentSceneView)
+  {
+    mShaderManager = new Dali::Scene3D::Loader::ShaderManager();
+    UpdateShaderRecursively(mModelRoot, mShaderManager);
+  }
+
+  if(!mModelLoadTask && !mModelResourceReady && !mModelUrl.empty())
+  {
+    // Request model load only if we setup url.
+    if(ModelCacheManager::Get())
+    {
+      ModelCacheManager::Get().ReferenceModelCache(mModelUrl);
+    }
+    mModelLoadTask = new ModelLoadTask(mModelUrl, mResourceDirectoryUrl, MakeCallback(this, &Model::OnModelLoadComplete));
+    Dali::AsyncTaskManager::Get().AddTask(mModelLoadTask);
+  }
+
+  // If diffuse and specular url is not valid, IBL does not need to be loaded.
+  if(!mDiffuseIblUrl.empty() && !mSpecularIblUrl.empty())
+  {
+    SetImageBasedLightSource(mDiffuseIblUrl, mSpecularIblUrl, mIblScaleFactor);
+  }
+
+  NotifyResourceReady();
+
+  mSizeNotification = Self().AddPropertyNotification(Actor::Property::SIZE, StepCondition(SIZE_STEP_CONDITION));
+  mSizeNotification.NotifySignal().Connect(this, &Model::OnSizeNotification);
+  Control::OnSceneConnection(depth);
+}
+
+void Model::OnSceneDisconnection()
+{
+  // If mParentSceneView is still onScene, that means this model
+  // is disconnected from mParentSceneView's sub tree.
+  // So, Unregister this Model from SceneView.
+  Scene3D::SceneView sceneView = mParentSceneView.GetHandle();
+  if(sceneView && sceneView.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE))
+  {
+    GetImpl(sceneView).UnregisterSceneItem(this);
+    mParentSceneView.Reset();
+  }
+
+  mSizeNotification.NotifySignal().Disconnect(this, &Model::OnSizeNotification);
+  Self().RemovePropertyNotification(mSizeNotification);
+  mSizeNotification.Reset();
+
+  Control::OnSceneDisconnection();
+}
+
+void Model::OnSizeSet(const Vector3& size)
+{
+  ScaleModel(false);
+}
+
+Vector3 Model::GetNaturalSize()
+{
+  if(!mModelRoot)
+  {
+    DALI_LOG_ERROR("Model is still not loaded.\n");
+    return Vector3::ZERO;
+  }
+
+  return mNaturalSize;
+}
+
+float Model::GetHeightForWidth(float width)
+{
+  Extents padding;
+  padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
+  return Control::GetHeightForWidth(width) + padding.top + padding.bottom;
+}
+
+float Model::GetWidthForHeight(float height)
+{
+  Extents padding;
+  padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
+  return Control::GetWidthForHeight(height) + padding.start + padding.end;
+}
+
+void Model::OnRelayout(const Vector2& size, RelayoutContainer& container)
+{
+  Control::OnRelayout(size, container);
+  ScaleModel(false);
+}
+
+bool Model::IsResourceReady() const
+{
+  return mModelResourceReady && mIblDiffuseResourceReady && mIblSpecularResourceReady;
+}
+
+void Model::CreateModelRoot()
+{
+  mModelRoot = Scene3D::ModelNode::New();
+  mModelRoot.SetProperty(Actor::Property::COLOR_MODE, ColorMode::USE_OWN_MULTIPLY_PARENT_COLOR);
+  mModelRoot.SetProperty(Dali::Actor::Property::SCALE, Y_DIRECTION);
+  mModelRoot.SetProperty(Dali::Actor::Property::SENSITIVE, mModelChildrenSensitive);
+  mModelRoot.SetProperty(Dali::Actor::Property::KEYBOARD_FOCUSABLE, mModelChildrenFocusable);
+  mModelRoot.SetProperty(Dali::DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, mModelChildrenFocusable);
+  Self().Add(mModelRoot);
+}
+
+void Model::ScaleModel(bool useCurrentSize)
+{
+  if(!mModelRoot)
+  {
+    return;
+  }
+
+  float   scale = 1.0f;
+  Vector3 size  = (useCurrentSize) ? Self().GetCurrentProperty<Vector3>(Dali::Actor::Property::SIZE) : Self().GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+  if(size.x > 0.0f && size.y > 0.0f)
+  {
+    scale = MAXFLOAT;
+    scale = std::min(size.x / mNaturalSize.x, scale);
+    scale = std::min(size.y / mNaturalSize.y, scale);
+  }
+  // Models in glTF and dli are defined as right hand coordinate system.
+  // DALi uses left hand coordinate system. Scaling negative is for change winding order.
+  mModelRoot.SetProperty(Dali::Actor::Property::SCALE, Y_DIRECTION * scale);
+}
+
+void Model::FitModelPosition()
+{
+  if(!mModelRoot)
+  {
+    return;
+  }
+  // Loaded model pivot is not the model center.
+  mModelRoot.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  mModelRoot.SetProperty(Dali::Actor::Property::ANCHOR_POINT, Vector3::ONE - mModelPivot);
+}
+
+void Model::UpdateCastShadowRecursively(Scene3D::ModelNode node, bool castShadow)
+{
+  if(!node)
+  {
+    return;
+  }
+
+  GetImplementation(node).CastShadow(castShadow);
+  uint32_t childrenCount = node.GetChildCount();
+  for(uint32_t i = 0; i < childrenCount; ++i)
+  {
+    Scene3D::ModelNode childNode = Scene3D::ModelNode::DownCast(node.GetChildAt(i));
+    if(!childNode)
+    {
+      continue;
+    }
+    UpdateCastShadowRecursively(childNode, castShadow);
+  }
+}
+
+void Model::UpdateReceiveShadowRecursively(Scene3D::ModelNode node, bool receiveShadow)
+{
+  if(!node)
+  {
+    return;
+  }
+
+  GetImplementation(node).ReceiveShadow(receiveShadow);
+  uint32_t childrenCount = node.GetChildCount();
+  for(uint32_t i = 0; i < childrenCount; ++i)
+  {
+    Scene3D::ModelNode childNode = Scene3D::ModelNode::DownCast(node.GetChildAt(i));
+    if(!childNode)
+    {
+      continue;
+    }
+    UpdateReceiveShadowRecursively(childNode, receiveShadow);
+  }
+}
+
+void Model::UpdateImageBasedLightTextureRecursively(Scene3D::ModelNode node, Dali::Texture diffuseTexture, Dali::Texture specularTexture, float iblScaleFactor, uint32_t specularMipmapLevels)
+{
+  if(!node)
+  {
+    return;
+  }
+
+  GetImplementation(node).SetImageBasedLightTexture(diffuseTexture, specularTexture, iblScaleFactor, specularMipmapLevels);
+  uint32_t childrenCount = node.GetChildCount();
+  for(uint32_t i = 0; i < childrenCount; ++i)
+  {
+    Scene3D::ModelNode childNode = Scene3D::ModelNode::DownCast(node.GetChildAt(i));
+    if(!childNode)
+    {
+      continue;
+    }
+    UpdateImageBasedLightTextureRecursively(childNode, diffuseTexture, specularTexture, iblScaleFactor, specularMipmapLevels);
+  }
+}
+
+void Model::UpdateImageBasedLightScaleFactorRecursively(Scene3D::ModelNode node, float iblScaleFactor)
+{
+  if(!node)
+  {
+    return;
+  }
+
+  GetImplementation(node).SetImageBasedLightScaleFactor(iblScaleFactor);
+
+  uint32_t childrenCount = node.GetChildCount();
+  for(uint32_t i = 0; i < childrenCount; ++i)
+  {
+    Scene3D::ModelNode childNode = Scene3D::ModelNode::DownCast(node.GetChildAt(i));
+    if(!childNode)
+    {
+      continue;
+    }
+    UpdateImageBasedLightScaleFactorRecursively(childNode, iblScaleFactor);
+  }
+}
+
+void Model::UpdateImageBasedLightTexture()
+{
+  Dali::Texture currentDiffuseTexture          = (mDiffuseTexture && mSpecularTexture) ? mDiffuseTexture : mSceneDiffuseTexture;
+  Dali::Texture currentSpecularTexture         = (mDiffuseTexture && mSpecularTexture) ? mSpecularTexture : mSceneSpecularTexture;
+  float         currentIblScaleFactor          = (mDiffuseTexture && mSpecularTexture) ? mIblScaleFactor : mSceneIblScaleFactor;
+  uint32_t      currentIblSpecularMipmapLevels = (mDiffuseTexture && mSpecularTexture) ? mSpecularMipmapLevels : mSceneSpecularMipmapLevels;
+
+  if(!currentDiffuseTexture || !currentSpecularTexture)
+  {
+    currentDiffuseTexture          = mDefaultDiffuseTexture;
+    currentSpecularTexture         = mDefaultSpecularTexture;
+    currentIblScaleFactor          = Dali::Scene3D::Loader::EnvironmentDefinition::GetDefaultIntensity();
+    currentIblSpecularMipmapLevels = 1u;
+  }
+
+  UpdateImageBasedLightTextureRecursively(mModelRoot, currentDiffuseTexture, currentSpecularTexture, currentIblScaleFactor, currentIblSpecularMipmapLevels);
+}
+
+void Model::UpdateImageBasedLightScaleFactor()
+{
+  if((!mDiffuseTexture || !mSpecularTexture) &&
+     (!mSceneDiffuseTexture || !mSceneSpecularTexture))
+  {
+    return;
+  }
+
+  float currentIblScaleFactor = (mDiffuseTexture && mSpecularTexture) ? mIblScaleFactor : mSceneIblScaleFactor;
+  UpdateImageBasedLightScaleFactorRecursively(mModelRoot, currentIblScaleFactor);
+}
+
+void Model::ApplyCameraTransform(Dali::CameraActor camera) const
+{
+  Vector3    selfPosition    = Self().GetProperty<Vector3>(Actor::Property::POSITION);
+  Quaternion selfOrientation = Self().GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  Vector3    selfScale       = Self().GetProperty<Vector3>(Actor::Property::SCALE);
+
+  Vector3    cameraPosition    = camera.GetProperty<Vector3>(Actor::Property::POSITION);
+  Quaternion cameraOrientation = camera.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  Vector3    cameraScale       = camera.GetProperty<Vector3>(Actor::Property::SCALE);
+
+  // Models in glTF and dli are defined as right hand coordinate system.
+  // DALi uses left hand coordinate system. Scaling negative is for change winding order.
+  if(!Dali::Equals(Y_DIRECTION.Dot(Vector3::YAXIS), 1.0f))
+  {
+    // Reflect by XZ plane
+    cameraPosition.y = -cameraPosition.y;
+    Quaternion yDirectionQuaternion;
+    yDirectionQuaternion.mVector = Vector3::YAXIS;
+    // Reflect orientation
+    cameraOrientation = yDirectionQuaternion * cameraOrientation * yDirectionQuaternion;
+  }
+
+  Vector3    resultPosition;
+  Quaternion resultOrientation;
+  Vector3    resultScale;
+
+  Matrix selfMatrix(false);
+  Matrix cameraMatrix(false);
+  Matrix resultMatrix(false);
+  selfMatrix.SetTransformComponents(selfScale, selfOrientation, selfPosition);
+  cameraMatrix.SetTransformComponents(cameraScale, cameraOrientation, cameraPosition);
+  Matrix::Multiply(resultMatrix, cameraMatrix, selfMatrix);
+  resultMatrix.GetTransformComponents(resultPosition, resultOrientation, resultScale);
+
+  camera.SetProperty(Actor::Property::POSITION, resultPosition);
+  camera.SetProperty(Actor::Property::ORIENTATION, resultOrientation);
+  camera.SetProperty(Actor::Property::SCALE, resultScale);
+}
+
+void Model::NotifyShadowMapTexture(Dali::Texture shadowMapTexture)
+{
+  if(mShadowMapTexture != shadowMapTexture)
+  {
+    mShadowMapTexture = shadowMapTexture;
+    UpdateShadowMapTextureRecursively(mModelRoot, mShadowMapTexture);
+  }
+}
+
+void Model::NotifyImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float scaleFactor, uint32_t specularMipmapLevels)
+{
+  if(mSceneDiffuseTexture != diffuseTexture || mSceneSpecularTexture != specularTexture)
+  {
+    mSceneDiffuseTexture       = diffuseTexture;
+    mSceneSpecularTexture      = specularTexture;
+    mSceneIblScaleFactor       = scaleFactor;
+    mSceneSpecularMipmapLevels = specularMipmapLevels;
+    // If Model IBL is not set, use SceneView's IBL.
+    if(!mDiffuseTexture || !mSpecularTexture)
+    {
+      UpdateImageBasedLightTexture();
+    }
+  }
+}
+
+void Model::NotifyImageBasedLightScaleFactor(float scaleFactor)
+{
+  mSceneIblScaleFactor = scaleFactor;
+  if(mSceneDiffuseTexture && mSceneSpecularTexture)
+  {
+    UpdateImageBasedLightScaleFactor();
+  }
+}
+
+void Model::OnModelLoadComplete()
+{
+  IntrusivePtr<Model> self = this; // Keep reference until this API finished
+
+  if(!mModelLoadTask->HasSucceeded())
+  {
+    ResetResourceTasks();
+
+    if(ModelCacheManager::Get() && !mModelUrl.empty())
+    {
+      ModelCacheManager::Get().UnreferenceModelCache(mModelUrl);
+    }
+
+    return;
+  }
+
+  if(!mModelRoot)
+  {
+    CreateModelRoot();
+  }
+  CreateModel();
+
+  auto& resources = mModelLoadTask->GetResources();
+  auto& scene     = mModelLoadTask->GetScene();
+  CreateAnimations(scene);
+  ResetCameraParameters();
+  if(!resources.mEnvironmentMaps.empty())
+  {
+    if(resources.mEnvironmentMaps.front().second.mDiffuse)
+    {
+      mDefaultDiffuseTexture = resources.mEnvironmentMaps.front().second.mDiffuse;
+    }
+    if(resources.mEnvironmentMaps.front().second.mSpecular)
+    {
+      mDefaultSpecularTexture = resources.mEnvironmentMaps.front().second.mSpecular;
+    }
+  }
+
+  if(mShadowMapTexture)
+  {
+    UpdateShadowMapTextureRecursively(mModelRoot, mShadowMapTexture);
+  }
+  UpdateImageBasedLightTexture();
+  UpdateImageBasedLightScaleFactor();
+  Self().SetProperty(Dali::Actor::Property::ANCHOR_POINT, Vector3(mModelPivot.x, 1.0f - mModelPivot.y, mModelPivot.z));
+
+  mModelResourceReady = true;
+  ResetResourceTask(mModelLoadTask);
+  NotifyResourceReady();
+}
+
+void Model::OnIblDiffuseLoadComplete()
+{
+  mDiffuseTexture = mIblDiffuseLoadTask->GetLoadedTexture();
+  ResetResourceTask(mIblDiffuseLoadTask);
+  mIblDiffuseResourceReady = true;
+  if(mIblDiffuseResourceReady && mIblSpecularResourceReady)
+  {
+    OnIblLoadComplete();
+  }
+}
+
+void Model::OnIblSpecularLoadComplete()
+{
+  mSpecularTexture      = mIblSpecularLoadTask->GetLoadedTexture();
+  mSpecularMipmapLevels = mIblSpecularLoadTask->GetMipmapLevels();
+  ResetResourceTask(mIblSpecularLoadTask);
+  mIblSpecularResourceReady = true;
+  if(mIblDiffuseResourceReady && mIblSpecularResourceReady)
+  {
+    OnIblLoadComplete();
+  }
+}
+
+void Model::OnIblLoadComplete()
+{
+  UpdateImageBasedLightTexture();
+  NotifyResourceReady();
+}
+
+void Model::OnSizeNotification(Dali::PropertyNotification& source)
+{
+  ScaleModel(true);
+}
+
+void Model::ResetResourceTasks()
+{
+  if(!Dali::Adaptor::IsAvailable())
+  {
+    return;
+  }
+  ResetResourceTask(mModelLoadTask);
+  ResetResourceTask(mIblDiffuseLoadTask);
+  ResetResourceTask(mIblSpecularLoadTask);
+}
+
+void Model::NotifyResourceReady()
+{
+  if(!IsResourceReady())
+  {
+    return;
+  }
+  Control::SetResourceReady();
+}
+
+void Model::CreateModel()
+{
+  BoundingVolume                    AABB;
+  auto&                             resources       = mModelLoadTask->GetResources();
+  auto&                             scene           = mModelLoadTask->GetScene();
+  auto&                             resourceChoices = mModelLoadTask->GetResourceChoices();
+  Dali::Scene3D::Loader::Transforms xforms{Dali::Scene3D::Loader::MatrixStack{}, Dali::Scene3D::Loader::ViewProjection{}};
+
+  Dali::Scene3D::Loader::NodeDefinition::CreateParams nodeParams{resources, xforms, mShaderManager, {}, {}, {}};
+
+  // Generate Dali handles from resource bundle. Note that we generate all scene's resouce immediatly.
+  resources.GenerateResources();
+  for(auto iRoot : scene.GetRoots())
+  {
+    if(auto modelNode = scene.CreateNodes(iRoot, resourceChoices, nodeParams))
+    {
+      scene.ConfigureSkinningShaders(resources, modelNode, std::move(nodeParams.mSkinnables));
+      ConfigureBlendShapeShaders(resources, scene, modelNode, std::move(nodeParams.mBlendshapeRequests));
+
+      scene.ApplyConstraints(modelNode, std::move(nodeParams.mConstrainables));
+
+      mModelRoot.Add(modelNode);
+    }
+
+    AddModelTreeToAABB(AABB, scene, resourceChoices, iRoot, nodeParams, Matrix::IDENTITY);
+  }
+
+  UpdateBlendShapeNodeMap();
+
+  mNaturalSize = AABB.CalculateSize();
+  mModelPivot  = AABB.CalculatePivot();
+  mModelRoot.SetProperty(Dali::Actor::Property::SIZE, mNaturalSize);
+  Vector3 controlSize = Self().GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+  if(Dali::EqualsZero(controlSize.x) || Dali::EqualsZero(controlSize.y))
+  {
+    Self().SetProperty(Dali::Actor::Property::SIZE, mNaturalSize);
+  }
+  FitModelPosition();
+  ScaleModel(false);
+}
+
+void Model::CreateAnimations(Dali::Scene3D::Loader::SceneDefinition& scene)
+{
+  mAnimations.clear();
+  if(!mModelLoadTask->GetAnimations().empty())
+  {
+    auto getActor = [&](const Scene3D::Loader::AnimatedProperty& property) {
+      if(property.mNodeIndex == Scene3D::Loader::INVALID_INDEX)
+      {
+        return mModelRoot.FindChildByName(property.mNodeName);
+      }
+      auto* node = scene.GetNode(property.mNodeIndex);
+      if(node == nullptr)
+      {
+        return Dali::Actor();
+      }
+      return mModelRoot.FindChildById(node->mNodeId);
+    };
+
+    for(auto&& animation : mModelLoadTask->GetAnimations())
+    {
+      Dali::Animation anim = animation.ReAnimate(getActor);
+      mAnimations.push_back({animation.GetName(), anim});
+    }
+  }
+}
+
+void Model::ResetCameraParameters()
+{
+  mCameraParameters.clear();
+  if(!mModelLoadTask->GetCameras().empty())
+  {
+    // Copy camera parameters.
+    std::copy(mModelLoadTask->GetCameras().begin(), mModelLoadTask->GetCameras().end(), std::back_inserter(mCameraParameters));
+  }
+}
+
+void Model::UpdateBlendShapeNodeMap()
+{
+  // Remove privous node map
+  mBlendShapeModelNodeMap.clear();
+
+  UpdateBlendShapeNodeMapRecursively(mBlendShapeModelNodeMap, mModelRoot);
+}
+
+} // namespace Internal
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/internal/controls/model/model-impl.h b/dali-scene3d/internal/controls/model/model-impl.h
new file mode 100644
index 0000000..d82fa8f
--- /dev/null
+++ b/dali-scene3d/internal/controls/model/model-impl.h
@@ -0,0 +1,502 @@
+#ifndef DALI_SCENE3D_INTERNAL_MODEL_H
+#define DALI_SCENE3D_INTERNAL_MODEL_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/property-notification.h>
+#include <dali/public-api/object/weak-handle.h>
+#include <dali/public-api/rendering/texture.h>
+#include <unordered_map>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/environment-map-load-task.h>
+#include <dali-scene3d/internal/common/light-observer.h>
+#include <dali-scene3d/internal/common/model-load-task.h>
+#include <dali-scene3d/internal/model-components/model-node-impl.h>
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <dali-scene3d/public-api/light/light.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/model-components/model-node.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+class Model;
+
+namespace Internal
+{
+/**
+ * @brief Impl class for Model.
+ */
+class Model : public Dali::Toolkit::Internal::Control, public LightObserver
+{
+public:
+  using AnimationData          = std::pair<std::string, Dali::Animation>;
+  using CameraData             = Loader::CameraParameters;
+  using BlendShapeModelNodeMap = std::map<std::string, std::vector<Scene3D::ModelNode>>;
+
+  // ColliderMeshContainer doesn't hold actual collider meshes
+  // but pairs unique ModelNode id with ModelNode for lookup purposes.
+  // All model nodes in the container have collider mesh attached.
+  using ColliderMeshContainer = std::unordered_map<int, Scene3D::ModelNode>;
+
+  /**
+   * @copydoc Model::New()
+   */
+  static Dali::Scene3D::Model New(const std::string& modelUrl, const std::string& resourceDirectoryUrl);
+
+  /**
+   * @copydoc Model::GetModelRoot()
+   */
+  const Scene3D::ModelNode GetModelRoot() const;
+
+  /**
+   * @copydoc Model::AddModelNode()
+   */
+  void AddModelNode(Scene3D::ModelNode modelNode);
+
+  /**
+   * @copydoc Model::RemoveModelNode()
+   */
+  void RemoveModelNode(Scene3D::ModelNode modelNode);
+
+  /**
+   * @copydoc Model::SetChildrenSensitive()
+   */
+  void SetChildrenSensitive(bool enable);
+
+  /**
+   * @copydoc Model::GetChildrenSensitive()
+   */
+  bool GetChildrenSensitive() const;
+
+  /**
+   * @copydoc Model::SetChildrenFocusable()
+   */
+  void SetChildrenFocusable(bool enable);
+
+  /**
+   * @copydoc Model::GetChildrenFocusable()
+   */
+  bool GetChildrenFocusable() const;
+
+  /**
+   * @copydoc Model::SetImageBasedLightSource()
+   */
+  void SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor);
+
+  /**
+   * @copydoc Model::SetImageBasedLightScaleFactor()
+   */
+  void SetImageBasedLightScaleFactor(float scaleFactor);
+
+  /**
+   * @copydoc Model::GetImageBasedLightScaleFactor()
+   */
+  float GetImageBasedLightScaleFactor() const;
+
+  /**
+   * @copydoc Model::GetAnimationCount()
+   */
+  uint32_t GetAnimationCount() const;
+
+  /**
+   * @copydoc Model::GetAnimation()
+   */
+  Dali::Animation GetAnimation(uint32_t index) const;
+
+  /**
+   * @copydoc Model::GetAnimation()
+   */
+  Dali::Animation GetAnimation(const std::string& name) const;
+
+  /**
+   * @copydoc Model::GetCameraCount()
+   */
+  uint32_t GetCameraCount() const;
+
+  /**
+   * @copydoc Model::GenerateCamera()
+   */
+  Dali::CameraActor GenerateCamera(uint32_t index) const;
+
+  /**
+   * @copydoc Model::ApplyCamera()
+   */
+  bool ApplyCamera(uint32_t index, Dali::CameraActor camera) const;
+
+  /**
+   * @copydoc Model::FindChildModelNodeByName()
+   */
+  Scene3D::ModelNode FindChildModelNodeByName(std::string_view nodeName);
+
+  /**
+   * @copydoc Model::RetrieveBlendShapeNames()
+   */
+  void RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const;
+
+  /**
+   * @copydoc Model::RetrieveModelNodesByBlendShapeName()
+   */
+  void RetrieveModelNodesByBlendShapeName(std::string_view blendShapeName, std::vector<Scene3D::ModelNode>& modelNodes) const;
+
+  /**
+   * @copydoc Model::GenerateMotionDataAnimation()
+   */
+  Dali::Animation GenerateMotionDataAnimation(Scene3D::MotionData motionData);
+
+  /**
+   * @copydoc Model::SetMotionData()
+   */
+  void SetMotionData(Scene3D::MotionData motionData);
+
+  /**
+   * @copydoc Model::CastShadow()
+   */
+  void CastShadow(bool castShadow);
+
+  /**
+   * @copydoc Model::IsShadowCasting()
+   */
+  bool IsShadowCasting() const;
+
+  /**
+   * @copydoc Model::ReceiveShadow()
+   */
+  void ReceiveShadow(bool receiveShadow);
+
+  /**
+   * @copydoc Model::IsShadowReceiving()
+   */
+  bool IsShadowReceiving() const;
+
+  /**
+   * @copydoc Scene3D::Model::MeshHitSignal()
+   */
+  Scene3D::Model::MeshHitSignalType& MeshHitSignal()
+  {
+    return mMeshHitSignal;
+  }
+
+  /**
+   * @brief Emits MeshHitSignal
+   * @param[in] modelNode ModelNode that has been hit
+   * @return Result of hit handling.
+   */
+  bool EmitMeshHitSignal(Scene3D::ModelNode modelNode)
+  {
+    bool retVal = false;
+    if(!mMeshHitSignal.Empty())
+    {
+      Scene3D::Model handle(GetOwner());
+      retVal = mMeshHitSignal.Emit(handle, modelNode);
+    }
+    return retVal;
+  }
+
+  /**
+   * @brief Returns collider mesh container
+   * @return Returns valid container
+   */
+  const ColliderMeshContainer& GetNodeColliderMeshContainer() const
+  {
+    return mColliderMeshes;
+  }
+
+  /**
+   * @brief Registers child node with collidier mesh
+   *
+   * @param[in] node ModelNode to register
+   */
+  void RegisterColliderMesh(Scene3D::ModelNode& node);
+
+  /**
+   * @brief Removes node/collider mesh from the register
+   * @param[in] node Child node to remove from the register
+   */
+  void RemoveColliderMesh(Scene3D::ModelNode& node);
+
+protected:
+  /**
+   * @brief Constructs a new Model.
+   * @param[in] modelUrl model file path.(e.g., glTF, and DLI).
+   * @param[in] resourceDirectoryUrl resource file path that includes binary, image etc.
+   */
+  Model(const std::string& modelUrl, const std::string& resourceDirectoryUrl);
+
+  /**
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~Model();
+
+private:
+  /**
+   * @copydoc Toolkit::Control::OnInitialize
+   */
+  void OnInitialize();
+
+  /**
+   * @copydoc CustomActorImpl::OnSceneConnection()
+   */
+  void OnSceneConnection(int depth) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSceneDisconnection()
+   */
+  void OnSceneDisconnection() override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSizeSet( const Vector3& size )
+   */
+  void OnSizeSet(const Vector3& size) override;
+
+  /**
+   * @copydoc Toolkit::Control::GetNaturalSize
+   */
+  Vector3 GetNaturalSize() override;
+
+  /**
+   * @copydoc Toolkit::Control::GetHeightForWidth()
+   */
+  float GetHeightForWidth(float width) override;
+
+  /**
+   * @copydoc Toolkit::Control::GetWidthForHeight()
+   */
+  float GetWidthForHeight(float height) override;
+
+  /**
+   * @copydoc Toolkit::Control::OnRelayout()
+   */
+  void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
+
+  /**
+   * @copydoc Toolkit::Control::IsResourceReady()
+   */
+  bool IsResourceReady() const override;
+
+private:
+  /**
+   * @brief Create Model Root of this Model class.
+   */
+  void CreateModelRoot();
+
+  /**
+   * @brief Scales the model to fit the control or to return to original size.
+   */
+  void ScaleModel(bool useCurrentSize);
+
+  /**
+   * @brief Changes model anchor point to set the model at center or returns to the original model pivot.
+   */
+  void FitModelPosition();
+
+  /**
+   * @brief Makes the input node cast shadow or not.
+   */
+  void UpdateCastShadowRecursively(Scene3D::ModelNode node, bool castShadow);
+
+  /**
+   * @brief Makes the input node receive shadow or not.
+   */
+  void UpdateReceiveShadowRecursively(Scene3D::ModelNode node, bool receiveShadow);
+
+  /**
+   * @brief Changes IBL information of the input node.
+   */
+  void UpdateImageBasedLightTextureRecursively(Scene3D::ModelNode node, Dali::Texture diffuseTexture, Dali::Texture specularTexture, float iblScaleFactor, uint32_t specularMipmapLevels);
+
+  /**
+   * @brief Changes IBL factor of the input node.
+   */
+  void UpdateImageBasedLightScaleFactorRecursively(Scene3D::ModelNode node, float iblScaleFactor);
+
+  /**
+   * @brief Changes IBL textures of the input node.
+   */
+  void UpdateImageBasedLightTexture();
+
+  /**
+   * @brief Changes IBL scale factor of the input node.
+   */
+  void UpdateImageBasedLightScaleFactor();
+
+  /**
+   * @brief Apply self transform into inputed camera.
+   * Inputed camera must be configured by CameraParameter. Mean, inputed camera coordinate depend on Model.
+   * After this API finished, CameraActor coordinate system converted as DALi coordinate system.
+   *
+   * @param[in,out] camera CameraActor who need to apply model itself's transform
+   */
+  void ApplyCameraTransform(Dali::CameraActor camera) const;
+
+public: // Overrides LightObserver Methods.
+  /**
+   * @copydoc Dali::Scene3D::Internal::LightObserver::NotifyShadowMapTexture()
+   */
+  void NotifyShadowMapTexture(Dali::Texture shadowMapTexture) override;
+
+  /**
+   * @copydoc Dali::Scene3D::Internal::LightObserver::NotifyImageBasedLightTexture()
+   */
+  void NotifyImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float scaleFactor, uint32_t specularMipmapLevels) override;
+
+  /**
+   * @copydoc Dali::Scene3D::Internal::LightObserver::NotifyImageBasedLightScaleFactor()
+   */
+  void NotifyImageBasedLightScaleFactor(float scaleFactor) override;
+
+private:
+  /**
+   * @brief Asynchronously model loading finished.
+   */
+  void OnModelLoadComplete();
+
+  /**
+   * @brief Asynchronously ibl diffusel image loading finished.
+   */
+  void OnIblDiffuseLoadComplete();
+
+  /**
+   * @brief Asynchronously ibl specular image loading finished.
+   */
+  void OnIblSpecularLoadComplete();
+
+  /**
+   * @brief Asynchronously ibl loading finished.
+   */
+  void OnIblLoadComplete();
+
+  /**
+   * @brief Update model root scale when Model size property is updated.
+   */
+  void OnSizeNotification(Dali::PropertyNotification& source);
+
+  /**
+   * @brief Reset Resource loading tasks.
+   */
+  void ResetResourceTasks();
+
+  /**
+   * @brief Notify Resource Ready signal.
+   */
+  void NotifyResourceReady();
+
+  /**
+   * @brief Create Model from loaded SceneDefinition.
+   */
+  void CreateModel();
+
+  /**
+   * @brief Create Dali::Animation from loaded AnimationDefinitions.
+   */
+  void CreateAnimations(Dali::Scene3D::Loader::SceneDefinition& scene);
+
+  /**
+   * @brief Reset CameraData from loaded CameraParameters.
+   */
+  void ResetCameraParameters();
+
+  /**
+   * @brief Collect ModelNode list by blendshape name
+   */
+  void UpdateBlendShapeNodeMap();
+
+private:
+  std::string                    mModelUrl;
+  std::string                    mResourceDirectoryUrl;
+  Scene3D::ModelNode             mModelRoot;
+  std::vector<AnimationData>     mAnimations;
+  std::vector<CameraData>        mCameraParameters;
+  WeakHandle<Scene3D::SceneView> mParentSceneView;
+  Dali::PropertyNotification     mSizeNotification;
+
+  // Signals
+  Scene3D::Model::MeshHitSignalType mMeshHitSignal;
+
+  Dali::Scene3D::Loader::ShaderManagerPtr mShaderManager;
+
+  ColliderMeshContainer mColliderMeshes;
+
+  // List of ModelNode for name of blend shape.
+  BlendShapeModelNodeMap mBlendShapeModelNodeMap;
+
+  // Asynchronous loading variable
+  ModelLoadTaskPtr          mModelLoadTask;
+  EnvironmentMapLoadTaskPtr mIblDiffuseLoadTask;
+  EnvironmentMapLoadTaskPtr mIblSpecularLoadTask;
+
+  // Shadow
+  Dali::Texture mShadowMapTexture;
+
+  std::string mDiffuseIblUrl;
+  std::string mSpecularIblUrl;
+
+  Dali::Texture mDefaultSpecularTexture;
+  Dali::Texture mDefaultDiffuseTexture;
+  Dali::Texture mSceneSpecularTexture;
+  Dali::Texture mSceneDiffuseTexture;
+  Dali::Texture mSpecularTexture;
+  Dali::Texture mDiffuseTexture;
+  Vector3       mNaturalSize;
+  Vector3       mModelPivot;
+  float         mSceneIblScaleFactor;
+  float         mIblScaleFactor;
+  uint32_t      mSceneSpecularMipmapLevels;
+  uint32_t      mSpecularMipmapLevels;
+  bool          mModelChildrenSensitive;
+  bool          mModelChildrenFocusable;
+  bool          mModelResourceReady;
+  bool          mIblDiffuseResourceReady;
+  bool          mIblSpecularResourceReady;
+  bool          mIblDiffuseDirty;
+  bool          mIblSpecularDirty;
+  bool          mIsShadowCasting;
+  bool          mIsShadowReceiving;
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+inline Dali::Scene3D::Internal::Model& GetImpl(Dali::Scene3D::Model& obj)
+{
+  DALI_ASSERT_ALWAYS(obj);
+  Dali::RefObject& handle = obj.GetImplementation();
+  return static_cast<Dali::Scene3D::Internal::Model&>(handle);
+}
+
+inline const Dali::Scene3D::Internal::Model& GetImpl(const Dali::Scene3D::Model& obj)
+{
+  DALI_ASSERT_ALWAYS(obj);
+  const Dali::RefObject& handle = obj.GetImplementation();
+  return static_cast<const Dali::Scene3D::Internal::Model&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_INTERNAL_MODEL_H
diff --git a/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp b/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp
new file mode 100644
index 0000000..8c9b9b3
--- /dev/null
+++ b/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp
@@ -0,0 +1,1426 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/controls/scene-view/scene-view-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/public-api/image-loader/image-url.h>
+#include <dali-toolkit/public-api/image-loader/image.h>
+#include <dali/devel-api/actors/camera-actor-devel.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/devel-api/common/stage.h>
+#include <dali/devel-api/rendering/frame-buffer-devel.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/math/math-utils.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+#include <string_view>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/internal/controls/model/model-impl.h>
+#include <dali-scene3d/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-scene3d/internal/light/light-impl.h>
+
+#include <dali/integration-api/debug.h>
+
+using namespace Dali;
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+BaseHandle Create()
+{
+  return Scene3D::SceneView::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::SceneView, Toolkit::Control, Create);
+
+DALI_PROPERTY_REGISTRATION(Scene3D, SceneView, "AlphaMaskUrl", STRING, ALPHA_MASK_URL)
+DALI_PROPERTY_REGISTRATION(Scene3D, SceneView, "MaskContentScale", FLOAT, MASK_CONTENT_SCALE)
+DALI_PROPERTY_REGISTRATION(Scene3D, SceneView, "CropToMask", BOOLEAN, CROP_TO_MASK)
+DALI_TYPE_REGISTRATION_END()
+
+Property::Index    RENDERING_BUFFER        = Dali::Toolkit::Control::CONTROL_PROPERTY_END_INDEX + 1;
+constexpr int32_t  DEFAULT_ORIENTATION     = 0;
+constexpr int32_t  INVALID_INDEX           = -1;
+constexpr uint32_t MAXIMUM_SIZE_SHADOW_MAP = 2048;
+
+constexpr int32_t SCENE_ORDER_INDEX  = 100;
+constexpr int32_t SHADOW_ORDER_INDEX = 99;
+
+static constexpr std::string_view SKYBOX_INTENSITY_STRING = "uIntensity";
+static constexpr std::string_view Y_FLIP_MASK_TEXTURE     = "uYFlipMaskTexture";
+static constexpr float            FLIP_MASK_TEXTURE       = 1.0f;
+
+Dali::Actor CreateSkybox()
+{
+  struct Vertex
+  {
+    Vector3 aPosition;
+  };
+
+  Vertex skyboxVertices[] = {
+    // back
+    {Vector3(-1.0f, 1.0f, -1.0f)},
+    {Vector3(-1.0f, -1.0f, -1.0f)},
+    {Vector3(1.0f, -1.0f, -1.0f)},
+    {Vector3(1.0f, -1.0f, -1.0f)},
+    {Vector3(1.0f, 1.0f, -1.0f)},
+    {Vector3(-1.0f, 1.0f, -1.0f)},
+
+    // left
+    {Vector3(-1.0f, -1.0f, 1.0f)},
+    {Vector3(-1.0f, -1.0f, -1.0f)},
+    {Vector3(-1.0f, 1.0f, -1.0f)},
+    {Vector3(-1.0f, 1.0f, -1.0f)},
+    {Vector3(-1.0f, 1.0f, 1.0f)},
+    {Vector3(-1.0f, -1.0f, 1.0f)},
+
+    // right
+    {Vector3(1.0f, -1.0f, -1.0f)},
+    {Vector3(1.0f, -1.0f, 1.0f)},
+    {Vector3(1.0f, 1.0f, 1.0f)},
+    {Vector3(1.0f, 1.0f, 1.0f)},
+    {Vector3(1.0f, 1.0f, -1.0f)},
+    {Vector3(1.0f, -1.0f, -1.0f)},
+
+    // front
+    {Vector3(-1.0f, -1.0f, 1.0f)},
+    {Vector3(-1.0f, 1.0f, 1.0f)},
+    {Vector3(1.0f, 1.0f, 1.0f)},
+    {Vector3(1.0f, 1.0f, 1.0f)},
+    {Vector3(1.0f, -1.0f, 1.0f)},
+    {Vector3(-1.0f, -1.0f, 1.0f)},
+
+    // botton
+    {Vector3(-1.0f, 1.0f, -1.0f)},
+    {Vector3(1.0f, 1.0f, -1.0f)},
+    {Vector3(1.0f, 1.0f, 1.0f)},
+    {Vector3(1.0f, 1.0f, 1.0f)},
+    {Vector3(-1.0f, 1.0f, 1.0f)},
+    {Vector3(-1.0f, 1.0f, -1.0f)},
+
+    // top
+    {Vector3(-1.0f, -1.0f, -1.0f)},
+    {Vector3(-1.0f, -1.0f, 1.0f)},
+    {Vector3(1.0f, -1.0f, -1.0f)},
+    {Vector3(1.0f, -1.0f, -1.0f)},
+    {Vector3(-1.0f, -1.0f, 1.0f)},
+    {Vector3(1.0f, -1.0f, 1.0f)}};
+
+  Dali::VertexBuffer vertexBuffer = Dali::VertexBuffer::New(Property::Map().Add("aPosition", Property::VECTOR3));
+  vertexBuffer.SetData(skyboxVertices, sizeof(skyboxVertices) / sizeof(Vertex));
+
+  Dali::Geometry skyboxGeometry = Geometry::New();
+  skyboxGeometry.AddVertexBuffer(vertexBuffer);
+  skyboxGeometry.SetType(Geometry::TRIANGLES);
+
+  Dali::Shader   shaderSkybox = Shader::New(SHADER_SKYBOX_SHADER_VERT.data(), SHADER_SKYBOX_SHADER_FRAG.data(), Shader::Hint::NONE, "SCENE3D_SKYBOX_CUBE");
+  Dali::Renderer skyboxRenderer;
+  skyboxRenderer = Renderer::New(skyboxGeometry, shaderSkybox);
+  skyboxRenderer.SetProperty(Renderer::Property::DEPTH_INDEX, 2.0f);
+  // Enables the depth test.
+  skyboxRenderer.SetProperty(Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::ON);
+  // The fragment shader will run only is those pixels that have the max depth value.
+  skyboxRenderer.SetProperty(Renderer::Property::DEPTH_FUNCTION, DepthFunction::LESS_EQUAL);
+
+  Dali::Actor skyboxActor = Actor::New();
+  skyboxActor.SetProperty(Dali::Actor::Property::NAME, "SkyBox");
+  skyboxActor.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  skyboxActor.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  skyboxActor.AddRenderer(skyboxRenderer);
+  return skyboxActor;
+}
+
+void SetShadowLightConstraint(Dali::CameraActor selectedCamera, Dali::CameraActor shadowLightCamera)
+{
+  shadowLightCamera.SetProperty(Dali::CameraActor::Property::ASPECT_RATIO, 1.0f);
+  shadowLightCamera.SetProperty(Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE, 1.0f);
+  shadowLightCamera.SetProperty(Dali::CameraActor::Property::NEAR_PLANE_DISTANCE, 0.5f);
+  shadowLightCamera.SetProperty(Dali::CameraActor::Property::FAR_PLANE_DISTANCE, 3.5f);
+
+  //< Make constraint for above properties.
+  shadowLightCamera.RemoveConstraints();
+
+  // Compute ViewProjectionMatrix and store it to "tempViewProjectionMatrix" property
+  auto       tempViewProjectionMatrixIndex = shadowLightCamera.RegisterProperty("tempViewProjectionMatrix", Matrix::IDENTITY);
+  Constraint projectionMatrixConstraint    = Constraint::New<Matrix>(shadowLightCamera, tempViewProjectionMatrixIndex, [](Matrix& output, const PropertyInputContainer& inputs) {
+    Matrix worldMatrix  = inputs[0]->GetMatrix();
+    float  tangentFov_2 = tanf(inputs[4]->GetFloat());
+    float  nearDistance = inputs[5]->GetFloat();
+    float  farDistance  = inputs[6]->GetFloat();
+    float  aspectRatio  = inputs[7]->GetFloat();
+    float  nearY        = 0.0f;
+    float  nearX        = 0.0f;
+    float  farY         = 0.0f;
+    float  farX         = 0.0f;
+    if(inputs[1]->GetInteger() == Dali::Camera::ProjectionMode::PERSPECTIVE_PROJECTION)
+    {
+      if(inputs[2]->GetInteger() == Dali::DevelCameraActor::ProjectionDirection::VERTICAL)
+      {
+        nearY = tangentFov_2 * nearDistance;
+        nearX = nearY * aspectRatio;
+        farY  = tangentFov_2 * farDistance;
+        farX  = farY * aspectRatio;
+      }
+      else
+      {
+        nearX = tangentFov_2 * nearDistance;
+        nearY = nearX / aspectRatio;
+        farX  = tangentFov_2 * farDistance;
+        farY  = farX / aspectRatio;
+      }
+    }
+    else
+    {
+      if(inputs[2]->GetInteger() == Dali::DevelCameraActor::ProjectionDirection::VERTICAL)
+      {
+        nearY = inputs[3]->GetFloat();
+        nearX = nearY * aspectRatio;
+      }
+      else
+      {
+        nearX = inputs[3]->GetFloat();
+        nearY = nearX / aspectRatio;
+      }
+      farX = nearX;
+      farY = nearY;
+    }
+
+    std::vector<Vector4> points;
+    points.push_back(Vector4(nearX, nearY, nearDistance, 1.0f));
+    points.push_back(Vector4(-nearX, nearY, nearDistance, 1.0f));
+    points.push_back(Vector4(-nearX, -nearY, nearDistance, 1.0f));
+    points.push_back(Vector4(nearX, -nearY, nearDistance, 1.0f));
+    points.push_back(Vector4(farX, farY, farDistance, 1.0f));
+    points.push_back(Vector4(-farX, farY, farDistance, 1.0f));
+    points.push_back(Vector4(-farX, -farY, farDistance, 1.0f));
+    points.push_back(Vector4(farX, -farY, farDistance, 1.0f));
+
+    Matrix  shadowCameraWorldMatrix = inputs[8]->GetMatrix();
+    Vector4 worldCenter;
+    for(auto&& point : points)
+    {
+      point = worldMatrix * point;
+      worldCenter += point;
+    }
+    worldCenter /= 8.0f;
+    shadowCameraWorldMatrix.SetTranslation(Vector3(worldCenter));
+    Matrix shadowCameraViewMatrix = shadowCameraWorldMatrix;
+    shadowCameraViewMatrix.Invert();
+
+    Vector3 areaMin = Vector3::ONE * MAXFLOAT, areaMax = Vector3::ONE * -MAXFLOAT;
+    for(auto&& point : points)
+    {
+      Vector4 pointV = shadowCameraViewMatrix * point;
+      areaMin.x      = std::min(areaMin.x, pointV.x);
+      areaMin.y      = std::min(areaMin.y, pointV.y);
+      areaMin.z      = std::min(areaMin.z, pointV.z);
+      areaMax.x      = std::max(areaMax.x, pointV.x);
+      areaMax.y      = std::max(areaMax.y, pointV.y);
+      areaMax.z      = std::max(areaMax.z, pointV.z);
+    }
+
+    Vector2 center        = Vector2(areaMax + areaMin) * 0.5;
+    float   delta         = std::max(std::abs(areaMax.x - areaMin.x), std::abs(areaMax.y - areaMin.y));
+    float   delta_2       = delta * 0.5f;
+    Vector2 squareAreaMin = center - Vector2::ONE * delta_2;
+    Vector2 squareAreaMax = center + Vector2::ONE * delta_2;
+    float   deltaZ        = areaMax.z - areaMin.z;
+
+    float right  = -squareAreaMin.x;
+    float left   = -squareAreaMax.x;
+    float top    = squareAreaMin.y;
+    float bottom = squareAreaMax.y;
+    float near   = areaMin.z;
+    float far    = areaMax.z;
+
+    float* projMatrix = output.AsFloat();
+
+    projMatrix[0] = -2.0f / delta;
+    projMatrix[1] = 0.0f;
+    projMatrix[2] = 0.0f;
+    projMatrix[3] = 0.0f;
+
+    projMatrix[4] = 0.0f;
+    projMatrix[5] = -2.0f / delta;
+    projMatrix[6] = 0.0f;
+    projMatrix[7] = 0.0f;
+
+    projMatrix[8]  = 0.0f;
+    projMatrix[9]  = 0.0f;
+    projMatrix[10] = 2.0f / deltaZ;
+    projMatrix[11] = 0.0f;
+
+    projMatrix[12] = -(right + left) / delta;
+    projMatrix[13] = -(top + bottom) / delta;
+    projMatrix[14] = -(near + far) / deltaZ;
+    projMatrix[15] = 1.0f;
+
+    output = output * shadowCameraViewMatrix;
+  });
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::Actor::Property::WORLD_MATRIX});
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::CameraActor::Property::PROJECTION_MODE});
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::DevelCameraActor::Property::PROJECTION_DIRECTION});
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE});
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::CameraActor::Property::FIELD_OF_VIEW});
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::CameraActor::Property::NEAR_PLANE_DISTANCE});
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::CameraActor::Property::FAR_PLANE_DISTANCE});
+  projectionMatrixConstraint.AddSource(Source{selectedCamera, Dali::CameraActor::Property::ASPECT_RATIO});
+  projectionMatrixConstraint.AddSource(Source{shadowLightCamera, Dali::Actor::Property::WORLD_MATRIX});
+  projectionMatrixConstraint.ApplyPost();
+}
+
+} // anonymous namespace
+
+SceneView::SceneView()
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+  mWindowOrientation(DEFAULT_ORIENTATION),
+  mSkybox(),
+  mSkyboxOrientation(Quaternion()),
+  mSkyboxIntensity(1.0f),
+  mShaderManager(new Scene3D::Loader::ShaderManager())
+{
+}
+
+SceneView::~SceneView()
+{
+  if(Dali::Adaptor::IsAvailable())
+  {
+    if(mIblDiffuseLoadTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mIblDiffuseLoadTask);
+      mIblDiffuseLoadTask.Reset();
+    }
+    if(mIblSpecularLoadTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mIblSpecularLoadTask);
+      mIblSpecularLoadTask.Reset();
+    }
+    if(mSkyboxLoadTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mSkyboxLoadTask);
+      mSkyboxLoadTask.Reset();
+    }
+
+    // Request image resource GC
+    Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+  }
+}
+
+Dali::Scene3D::SceneView SceneView::New()
+{
+  SceneView* impl = new SceneView();
+
+  Dali::Scene3D::SceneView handle = Dali::Scene3D::SceneView(*impl);
+
+  // Second-phase init of the implementation
+  // This can only be done after the CustomActor connection has been made...
+  impl->Initialize();
+
+  return handle;
+}
+
+void SceneView::AddCamera(CameraActor camera)
+{
+  if(camera)
+  {
+    if(mCameras.empty())
+    {
+      UpdateCamera(camera);
+    }
+    mCameras.push_back(camera);
+  }
+}
+
+void SceneView::RemoveCamera(CameraActor camera)
+{
+  if(camera == mDefaultCamera)
+  {
+    DALI_LOG_ERROR("Default Camera cannot removed.\n");
+    return;
+  }
+
+  if(camera)
+  {
+    for(uint32_t i = 0; i < mCameras.size(); ++i)
+    {
+      if(mCameras[i] == camera)
+      {
+        mCameras.erase(mCameras.begin() + i);
+        break;
+      }
+    }
+
+    if(mSelectedCamera == camera)
+    {
+      CameraActor newCurrentCamera = *mCameras.begin();
+      UpdateCamera(newCurrentCamera);
+    }
+  }
+}
+
+uint32_t SceneView::GetCameraCount() const
+{
+  return mCameras.size();
+}
+
+CameraActor SceneView::GetSelectedCamera() const
+{
+  return mSelectedCamera;
+}
+
+CameraActor SceneView::GetCamera(uint32_t index) const
+{
+  if(index < mCameras.size())
+  {
+    return mCameras[index];
+  }
+  DALI_LOG_ERROR("Input index is out of bounds\n");
+  return CameraActor();
+}
+
+CameraActor SceneView::GetCamera(const std::string& name) const
+{
+  CameraActor returnCamera;
+  for(auto&& camera : mCameras)
+  {
+    if(camera.GetProperty<std::string>(Actor::Property::NAME) == name)
+    {
+      returnCamera = camera;
+      break;
+    }
+  }
+  return returnCamera;
+}
+
+void SceneView::SelectCamera(uint32_t index)
+{
+  UpdateCamera(GetCamera(index));
+}
+
+void SceneView::SelectCamera(const std::string& name)
+{
+  UpdateCamera(GetCamera(name));
+}
+
+void SceneView::RegisterSceneItem(Scene3D::Internal::LightObserver* item)
+{
+  if(item)
+  {
+    item->NotifyImageBasedLightTexture(mDiffuseTexture, mSpecularTexture, mIblScaleFactor, mSpecularMipmapLevels);
+    item->NotifyShadowMapTexture(mShadowTexture);
+    mItems.push_back(item);
+  }
+}
+
+void SceneView::UnregisterSceneItem(Scene3D::Internal::LightObserver* item)
+{
+  if(item)
+  {
+    for(uint32_t i = 0; i < mItems.size(); ++i)
+    {
+      if(mItems[i] == item)
+      {
+        mItems.erase(mItems.begin() + i);
+        break;
+      }
+    }
+  }
+}
+
+void SceneView::SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor)
+{
+  bool needIblReset = false;
+  bool isOnScene    = Self().GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE);
+  if(mDiffuseIblUrl != diffuseUrl)
+  {
+    mDiffuseIblUrl = diffuseUrl;
+    if(mDiffuseIblUrl.empty())
+    {
+      needIblReset = true;
+    }
+    else
+    {
+      mIblDiffuseDirty         = true;
+      mIblDiffuseResourceReady = false;
+    }
+  }
+
+  if(mSpecularIblUrl != specularUrl)
+  {
+    mSpecularIblUrl = specularUrl;
+    if(mSpecularIblUrl.empty())
+    {
+      needIblReset = true;
+    }
+    else
+    {
+      mIblSpecularDirty         = true;
+      mIblSpecularResourceReady = false;
+    }
+  }
+
+  // If one or both of diffuse url and specular url are empty,
+  // we don't need to request to load texture.
+  if(needIblReset)
+  {
+    if(mIblDiffuseLoadTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mIblDiffuseLoadTask);
+      mIblDiffuseLoadTask.Reset();
+    }
+
+    if(mIblSpecularLoadTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mIblSpecularLoadTask);
+      mIblSpecularLoadTask.Reset();
+    }
+
+    mIblDiffuseDirty          = false;
+    mIblSpecularDirty         = false;
+    mIblDiffuseResourceReady  = true;
+    mIblSpecularResourceReady = true;
+
+    mDiffuseTexture.Reset();
+    mSpecularTexture.Reset();
+
+    mSpecularMipmapLevels = 1u;
+    NotifyImageBasedLightTextureChange();
+
+    // Request image resource GC
+    Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+  }
+  else
+  {
+    if(isOnScene && mIblDiffuseDirty)
+    {
+      if(mIblDiffuseLoadTask)
+      {
+        Dali::AsyncTaskManager::Get().RemoveTask(mIblDiffuseLoadTask);
+        mIblDiffuseLoadTask.Reset();
+
+        // Request image resource GC
+        Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+      }
+      mIblDiffuseLoadTask = new EnvironmentMapLoadTask(mDiffuseIblUrl, Scene3D::EnvironmentMapType::CUBEMAP, MakeCallback(this, &SceneView::OnIblDiffuseLoadComplete));
+      Dali::AsyncTaskManager::Get().AddTask(mIblDiffuseLoadTask);
+      mIblDiffuseDirty = false;
+    }
+
+    if(isOnScene && mIblSpecularDirty)
+    {
+      if(mIblSpecularLoadTask)
+      {
+        Dali::AsyncTaskManager::Get().RemoveTask(mIblSpecularLoadTask);
+        mIblSpecularLoadTask.Reset();
+
+        // Request image resource GC
+        Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+      }
+      mIblSpecularLoadTask = new EnvironmentMapLoadTask(mSpecularIblUrl, Scene3D::EnvironmentMapType::CUBEMAP, MakeCallback(this, &SceneView::OnIblSpecularLoadComplete));
+      Dali::AsyncTaskManager::Get().AddTask(mIblSpecularLoadTask);
+      mIblSpecularDirty = false;
+    }
+  }
+
+  if(!Dali::Equals(mIblScaleFactor, scaleFactor))
+  {
+    SetImageBasedLightScaleFactor(scaleFactor);
+  }
+
+  // If diffuse and specular textures are already loaded, emits resource ready signal here.
+  if(IsResourceReady())
+  {
+    Control::SetResourceReady();
+  }
+}
+
+void SceneView::SetImageBasedLightScaleFactor(float scaleFactor)
+{
+  mIblScaleFactor = scaleFactor;
+  for(auto&& item : mItems)
+  {
+    if(item)
+    {
+      item->NotifyImageBasedLightScaleFactor(scaleFactor);
+    }
+  }
+}
+
+float SceneView::GetImageBasedLightScaleFactor() const
+{
+  return mIblScaleFactor;
+}
+
+void SceneView::AddLight(Scene3D::Light light)
+{
+  bool enabled = mShaderManager->AddLight(light);
+  mLights.push_back(std::make_pair(light, enabled));
+
+  if(light.IsShadowEnabled())
+  {
+    SetShadow(light);
+  }
+}
+
+void SceneView::RemoveLight(Scene3D::Light light)
+{
+  mShaderManager->RemoveLight(light);
+  for(uint32_t i = 0; i < mLights.size(); ++i)
+  {
+    if(mLights[i].first == light)
+    {
+      mLights.erase(mLights.begin() + i);
+      break;
+    }
+  }
+
+  if(mLights.size() > mShaderManager->GetLightCount())
+  {
+    for(auto&& waitingLight : mLights)
+    {
+      if(waitingLight.second)
+      {
+        continue;
+      }
+
+      waitingLight.second = mShaderManager->AddLight(waitingLight.first);
+      break;
+    }
+  }
+
+  if(light == mShadowLight)
+  {
+    RemoveShadow(light);
+  }
+
+  if(!mShadowLight)
+  {
+    for(auto&& lightEntity : mLights)
+    {
+      if(!lightEntity.second || !lightEntity.first.IsShadowEnabled())
+      {
+        continue;
+      }
+      SetShadow(lightEntity.first);
+      break;
+    }
+  }
+}
+
+void SceneView::SetShadow(Scene3D::Light light)
+{
+  if(!!mShadowLight)
+  {
+    return;
+  }
+
+  auto foundLight = std::find_if(mLights.begin(), mLights.end(), [light](std::pair<Scene3D::Light, bool> lightEntity) -> bool { return (lightEntity.second && lightEntity.first == light); });
+
+  if(foundLight == mLights.end())
+  {
+    return;
+  }
+
+  mShadowLight = light;
+
+  // Directional Light setting.
+  CameraActor lightCamera    = GetImplementation(light).GetCamera();
+  CameraActor selectedCamera = GetSelectedCamera();
+  SetShadowLightConstraint(selectedCamera, lightCamera);
+
+  // make framebuffer for depth map and set it to render task.
+  uint32_t shadowMapBufferSize = std::min(std::max(GetResolutionWidth(), GetResolutionHeight()), MAXIMUM_SIZE_SHADOW_MAP);
+  UpdateShadowMapBuffer(shadowMapBufferSize);
+
+  // use lightCamera as a camera of shadow render task.
+  if(mShadowMapRenderTask)
+  {
+    mShadowMapRenderTask.SetCameraActor(lightCamera);
+  }
+
+  mShaderManager->SetShadow(light);
+  UpdateShadowMapBuffer(shadowMapBufferSize);
+}
+
+void SceneView::RemoveShadow(Scene3D::Light light)
+{
+  if(mShadowLight != light)
+  {
+    return;
+  }
+
+  // remove all constraint from light camera
+  CameraActor lightCamera = GetImplementation(mShadowLight).GetCamera();
+  lightCamera.RemoveConstraints();
+
+  // reset framebuffer and remove it from render task.
+  mShadowFrameBuffer.Reset();
+  mShaderManager->RemoveShadow();
+  if(mShadowMapRenderTask)
+  {
+    mShadowMapRenderTask.SetCameraActor(CameraActor());
+  }
+
+  mShadowLight.Reset();
+
+  mShadowTexture.Reset();
+  for(auto&& item : mItems)
+  {
+    if(item)
+    {
+      item->NotifyShadowMapTexture(mShadowTexture);
+    }
+  }
+
+  for(auto&& lightEntity : mLights)
+  {
+    if(!lightEntity.second || !lightEntity.first.IsShadowEnabled())
+    {
+      continue;
+    }
+    SetShadow(lightEntity.first);
+    break;
+  }
+
+  if(mSceneHolder && mShadowMapRenderTask)
+  {
+    RenderTaskList taskList = mSceneHolder.GetRenderTaskList();
+    taskList.RemoveTask(mShadowMapRenderTask);
+    mShadowMapRenderTask.Reset();
+  }
+}
+
+uint32_t SceneView::GetActivatedLightCount() const
+{
+  return mShaderManager->GetLightCount();
+}
+
+void SceneView::UseFramebuffer(bool useFramebuffer)
+{
+  if(mUseFrameBuffer != useFramebuffer)
+  {
+    mUseFrameBuffer = useFramebuffer;
+    UpdateRenderTask();
+  }
+}
+
+bool SceneView::IsUsingFramebuffer() const
+{
+  return mUseFrameBuffer;
+}
+
+void SceneView::SetResolution(uint32_t width, uint32_t height)
+{
+  if(mWindowWidth != width || mWindowHeight != height)
+  {
+    mWindowWidth  = width;
+    mWindowHeight = height;
+    if(mUseFrameBuffer)
+    {
+      mWindowSizeChanged = true;
+      UpdateRenderTask();
+    }
+  }
+}
+
+uint32_t SceneView::GetResolutionWidth()
+{
+  if(!mUseFrameBuffer || mWindowWidth == 0u || mWindowHeight == 0u)
+  {
+    return static_cast<uint32_t>(Self().GetProperty<float>(Dali::Actor::Property::SIZE_WIDTH));
+  }
+  return mWindowWidth;
+}
+
+uint32_t SceneView::GetResolutionHeight()
+{
+  if(!mUseFrameBuffer || mWindowWidth == 0u || mWindowHeight == 0u)
+  {
+    return static_cast<uint32_t>(Self().GetProperty<float>(Dali::Actor::Property::SIZE_HEIGHT));
+  }
+  return mWindowHeight;
+}
+
+void SceneView::ResetResolution()
+{
+  SetResolution(0u, 0u);
+}
+
+void SceneView::SetFramebufferMultiSamplingLevel(uint8_t multiSamplingLevel)
+{
+  if(mFrameBufferMultiSamplingLevel != multiSamplingLevel)
+  {
+    mFrameBufferMultiSamplingLevel = multiSamplingLevel;
+
+    // Create new framebuffer with changed multiSamplingLevel.
+    if(mRenderTask && mFrameBuffer && mTexture)
+    {
+      mFrameBuffer = FrameBuffer::New(GetResolutionWidth(), GetResolutionHeight(), FrameBuffer::Attachment::DEPTH_STENCIL);
+      mFrameBuffer.AttachColorTexture(mTexture);
+      DevelFrameBuffer::SetMultiSamplingLevel(mFrameBuffer, mFrameBufferMultiSamplingLevel);
+      mRenderTask.SetFrameBuffer(mFrameBuffer);
+
+      // Note : we don't need to create new visual since visual's url is depend on mTexture.
+    }
+  }
+}
+
+uint8_t SceneView::GetFramebufferMultiSamplingLevel() const
+{
+  return mFrameBufferMultiSamplingLevel;
+}
+
+void SceneView::SetSkybox(const std::string& skyboxUrl)
+{
+  if(mSkyboxUrl != skyboxUrl)
+  {
+    UpdateSkybox(skyboxUrl, mSkyboxEnvironmentMapType);
+  }
+}
+
+void SceneView::SetSkyboxEnvironmentMapType(Scene3D::EnvironmentMapType skyboxEnvironmentMapType)
+{
+  if(mSkyboxEnvironmentMapType != skyboxEnvironmentMapType)
+  {
+    UpdateSkybox(mSkyboxUrl, skyboxEnvironmentMapType);
+  }
+}
+
+void SceneView::SetSkyboxIntensity(float intensity)
+{
+  mSkyboxIntensity = intensity;
+  if(intensity < 0)
+  {
+    DALI_LOG_ERROR("Intensity should be greater than or equal to 0.\n");
+    mSkyboxIntensity = 0.0f;
+  }
+
+  if(mSkybox)
+  {
+    mSkybox.RegisterProperty(SKYBOX_INTENSITY_STRING.data(), mSkyboxIntensity);
+  }
+}
+
+float SceneView::GetSkyboxIntensity() const
+{
+  return mSkyboxIntensity;
+}
+
+void SceneView::SetSkyboxOrientation(const Quaternion& orientation)
+{
+  mSkyboxOrientation = orientation;
+  if(mSkybox)
+  {
+    mSkybox.SetProperty(Dali::Actor::Property::ORIENTATION, orientation);
+  }
+}
+
+Quaternion SceneView::GetSkyboxOrientation() const
+{
+  return mSkyboxOrientation;
+}
+
+Dali::Scene3D::Loader::ShaderManagerPtr SceneView::GetShaderManager() const
+{
+  return mShaderManager;
+}
+
+void SceneView::UpdateShadowUniform(Scene3D::Light light)
+{
+  mShaderManager->UpdateShadowUniform(light);
+}
+
+void SceneView::SetAlphaMaskUrl(std::string& alphaMaskUrl)
+{
+  if(mAlphaMaskUrl != alphaMaskUrl)
+  {
+    mAlphaMaskUrl           = alphaMaskUrl;
+    mMaskingPropertyChanged = true;
+    UpdateRenderTask();
+  }
+}
+
+std::string SceneView::GetAlphaMaskUrl()
+{
+  return mAlphaMaskUrl;
+}
+
+void SceneView::SetMaskContentScaleFactor(float maskContentScaleFactor)
+{
+  if(mMaskContentScaleFactor != maskContentScaleFactor)
+  {
+    mMaskContentScaleFactor = maskContentScaleFactor;
+    mMaskingPropertyChanged = true;
+    UpdateRenderTask();
+  }
+}
+
+float SceneView::GetMaskContentScaleFactor()
+{
+  return mMaskContentScaleFactor;
+}
+
+void SceneView::EnableCropToMask(bool enableCropToMask)
+{
+  if(mCropToMask != enableCropToMask)
+  {
+    mCropToMask             = enableCropToMask;
+    mMaskingPropertyChanged = true;
+    UpdateRenderTask();
+  }
+}
+
+bool SceneView::IsEnabledCropToMask()
+{
+  return mCropToMask;
+}
+
+Dali::RenderTask SceneView::GetRenderTask()
+{
+  return mRenderTask;
+}
+
+void SceneView::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
+{
+  Scene3D::SceneView sceneView = Scene3D::SceneView::DownCast(Dali::BaseHandle(object));
+
+  if(sceneView)
+  {
+    SceneView& sceneViewImpl(GetImpl(sceneView));
+
+    switch(index)
+    {
+      case Scene3D::SceneView::Property::ALPHA_MASK_URL:
+      {
+        std::string alphaMaskUrl = value.Get<std::string>();
+        sceneViewImpl.SetAlphaMaskUrl(alphaMaskUrl);
+        break;
+      }
+      case Scene3D::SceneView::Property::MASK_CONTENT_SCALE:
+      {
+        sceneViewImpl.SetMaskContentScaleFactor(value.Get<float>());
+        break;
+      }
+      case Scene3D::SceneView::Property::CROP_TO_MASK:
+      {
+        sceneViewImpl.EnableCropToMask(value.Get<bool>());
+        break;
+      }
+    }
+  }
+}
+
+Property::Value SceneView::GetProperty(BaseObject* object, Property::Index index)
+{
+  Property::Value value;
+
+  Scene3D::SceneView sceneView = Scene3D::SceneView::DownCast(Dali::BaseHandle(object));
+
+  if(sceneView)
+  {
+    SceneView& sceneViewImpl(GetImpl(sceneView));
+
+    switch(index)
+    {
+      case Scene3D::SceneView::Property::ALPHA_MASK_URL:
+      {
+        value = sceneViewImpl.GetAlphaMaskUrl();
+        break;
+      }
+      case Scene3D::SceneView::Property::MASK_CONTENT_SCALE:
+      {
+        value = sceneViewImpl.GetMaskContentScaleFactor();
+        break;
+      }
+      case Scene3D::SceneView::Property::CROP_TO_MASK:
+      {
+        value = sceneViewImpl.IsEnabledCropToMask();
+        break;
+      }
+    }
+  }
+  return value;
+}
+
+///////////////////////////////////////////////////////////
+//
+// Private methods
+//
+
+void SceneView::OnSceneConnection(int depth)
+{
+  // If diffuse and specular url is not valid, IBL does not need to be loaded.
+  if(!mDiffuseIblUrl.empty() && !mSpecularIblUrl.empty())
+  {
+    SetImageBasedLightSource(mDiffuseIblUrl, mSpecularIblUrl, mIblScaleFactor);
+  }
+
+  if(!mSkyboxUrl.empty())
+  {
+    UpdateSkybox(mSkyboxUrl, mSkyboxEnvironmentMapType);
+  }
+
+  Window window = DevelWindow::Get(Self());
+  if(window)
+  {
+    // Only for on-screen window
+    window.ResizeSignal().Connect(this, &SceneView::OnWindowResized);
+
+    mWindow            = window;
+    mWindowOrientation = DevelWindow::GetPhysicalOrientation(window);
+  }
+
+  // On-screen / Off-screen window
+  mSceneHolder = Integration::SceneHolder::Get(Self());
+  if(mSceneHolder)
+  {
+    RenderTaskList taskList = mSceneHolder.GetRenderTaskList();
+    mRenderTask             = taskList.CreateTask();
+    mRenderTask.SetSourceActor(mRootLayer);
+    mRenderTask.SetExclusive(true);
+    mRenderTask.SetInputEnabled(true);
+    mRenderTask.SetCullMode(false);
+    mRenderTask.SetOrderIndex(SCENE_ORDER_INDEX);
+    mRenderTask.SetScreenToFrameBufferMappingActor(Self());
+
+    UpdateRenderTask();
+  }
+
+  Control::OnSceneConnection(depth);
+}
+
+void SceneView::OnSceneDisconnection()
+{
+  mItems.clear();
+
+  Window window = mWindow.GetHandle();
+  if(window)
+  {
+    window.ResizeSignal().Disconnect(this, &SceneView::OnWindowResized);
+  }
+  mWindow.Reset();
+
+  if(mSceneHolder)
+  {
+    if(mRenderTask)
+    {
+      RenderTaskList taskList = mSceneHolder.GetRenderTaskList();
+      taskList.RemoveTask(mRenderTask);
+      mRenderTask.Reset();
+    }
+    if(mShadowMapRenderTask)
+    {
+      RenderTaskList taskList = mSceneHolder.GetRenderTaskList();
+      taskList.RemoveTask(mShadowMapRenderTask);
+      mShadowMapRenderTask.Reset();
+    }
+    mSceneHolder.Reset();
+  }
+  mFrameBuffer.Reset();
+  mShadowFrameBuffer.Reset();
+
+  Control::OnSceneDisconnection();
+}
+
+void SceneView::OnInitialize()
+{
+  Actor self = Self();
+  mRootLayer = Layer::New();
+  mRootLayer.SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_3D);
+  mRootLayer.SetProperty(Layer::Property::DEPTH_TEST, true);
+  // The models in the SceneView should be have independent coordinate with DALi default coordinate.
+  mRootLayer.SetProperty(Dali::Actor::Property::INHERIT_POSITION, false);
+  mRootLayer.SetProperty(Dali::Actor::Property::INHERIT_ORIENTATION, false);
+  mRootLayer.SetProperty(Dali::Actor::Property::INHERIT_SCALE, false);
+  self.Add(mRootLayer);
+
+  mDefaultCamera = Dali::CameraActor::New3DCamera();
+  mDefaultCamera.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  mDefaultCamera.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  AddCamera(mDefaultCamera);
+  UpdateCamera(mDefaultCamera);
+}
+
+void SceneView::OnChildAdd(Actor& child)
+{
+  if(child != mRootLayer)
+  {
+    mRootLayer.Add(child);
+  }
+  Control::OnChildAdd(child);
+}
+
+void SceneView::OnChildRemove(Actor& child)
+{
+  mRootLayer.Remove(child);
+  Control::OnChildRemove(child);
+}
+
+float SceneView::GetHeightForWidth(float width)
+{
+  Extents padding;
+  padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
+  return Control::GetHeightForWidth(width) + padding.top + padding.bottom;
+}
+
+float SceneView::GetWidthForHeight(float height)
+{
+  Extents padding;
+  padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
+  return Control::GetWidthForHeight(height) + padding.start + padding.end;
+}
+
+void SceneView::OnRelayout(const Vector2& size, RelayoutContainer& container)
+{
+  Control::OnRelayout(size, container);
+  // Change canvas size of camera actor.
+  UpdateRenderTask();
+}
+
+bool SceneView::IsResourceReady() const
+{
+  return mIblDiffuseResourceReady && mIblSpecularResourceReady && mSkyboxResourceReady;
+}
+
+void SceneView::UpdateCamera(CameraActor camera)
+{
+  if(camera)
+  {
+    if(mSelectedCamera && mSelectedCamera.GetParent())
+    {
+      mSelectedCamera.Unparent();
+    }
+    mRootLayer.Add(camera);
+  }
+
+  mSelectedCamera = camera;
+  if(mShadowLight)
+  {
+    SetShadowLightConstraint(mSelectedCamera, GetImplementation(mShadowLight).GetCamera());
+  }
+  UpdateRenderTask();
+}
+
+void SceneView::UpdateRenderTask()
+{
+  if(mRenderTask)
+  {
+    if(mSelectedCamera != mRenderTask.GetCameraActor())
+    {
+      mRenderTask.SetCameraActor(mSelectedCamera);
+    }
+    uint32_t width  = GetResolutionWidth();
+    uint32_t height = GetResolutionHeight();
+
+    uint32_t shadowMapBufferSize = std::min(std::max(width, height), MAXIMUM_SIZE_SHADOW_MAP);
+    UpdateShadowMapBuffer(shadowMapBufferSize);
+
+    if(mUseFrameBuffer)
+    {
+      Dali::FrameBuffer currentFrameBuffer = mRenderTask.GetFrameBuffer();
+      if(!currentFrameBuffer ||
+         !Dali::Equals(currentFrameBuffer.GetColorTexture().GetWidth(), width) ||
+         !Dali::Equals(currentFrameBuffer.GetColorTexture().GetHeight(), height) ||
+         mMaskingPropertyChanged ||
+         mWindowSizeChanged)
+      {
+        mRootLayer.SetProperty(Dali::Actor::Property::COLOR_MODE, ColorMode::USE_OWN_COLOR);
+        mRenderTask.ResetViewportGuideActor();
+        mRenderTask.SetViewport(Dali::Viewport(Vector4::ZERO));
+
+        // create offscreen buffer of new size to render our child actors to
+        mTexture     = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
+        mFrameBuffer = FrameBuffer::New(width, height, FrameBuffer::Attachment::DEPTH_STENCIL);
+        mFrameBuffer.AttachColorTexture(mTexture);
+        DevelFrameBuffer::SetMultiSamplingLevel(mFrameBuffer, mFrameBufferMultiSamplingLevel);
+        Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::Image::GenerateUrl(mFrameBuffer, 0u);
+
+        Property::Map imagePropertyMap;
+        imagePropertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+        imagePropertyMap.Insert(Toolkit::ImageVisual::Property::URL, imageUrl.GetUrl());
+        // To flip rendered scene without CameraActor::SetInvertYAxis() to avoid backface culling.
+        imagePropertyMap.Insert(Toolkit::ImageVisual::Property::PIXEL_AREA, Vector4(0.0f, 1.0f, 1.0f, -1.0f));
+        if(!mAlphaMaskUrl.empty())
+        {
+          imagePropertyMap.Insert(Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mAlphaMaskUrl);
+          imagePropertyMap.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+          imagePropertyMap.Insert(Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, mMaskContentScaleFactor);
+          imagePropertyMap.Insert(Toolkit::ImageVisual::Property::CROP_TO_MASK, mCropToMask);
+          imagePropertyMap.Insert(Toolkit::DevelImageVisual::Property::MASKING_TYPE, Toolkit::DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+          Self().RegisterProperty(Y_FLIP_MASK_TEXTURE, FLIP_MASK_TEXTURE);
+        }
+
+        mVisual = Toolkit::VisualFactory::Get().CreateVisual(imagePropertyMap);
+        Toolkit::DevelControl::RegisterVisual(*this, RENDERING_BUFFER, mVisual);
+
+        mRenderTask.SetFrameBuffer(mFrameBuffer);
+        mRenderTask.SetClearEnabled(true);
+        mRenderTask.SetClearColor(Color::TRANSPARENT);
+
+        mMaskingPropertyChanged = false;
+        mWindowSizeChanged      = false;
+      }
+    }
+    else
+    {
+      mRenderTask.SetViewportGuideActor(Self());
+      if(mRenderTask.GetFrameBuffer())
+      {
+        mRootLayer.SetProperty(Dali::Actor::Property::COLOR_MODE, ColorMode::USE_OWN_MULTIPLY_PARENT_ALPHA);
+        FrameBuffer framebuffer;
+        mRenderTask.SetFrameBuffer(framebuffer);
+        mRenderTask.SetClearEnabled(false);
+
+        Toolkit::DevelControl::UnregisterVisual(*this, RENDERING_BUFFER);
+
+        mVisual.Reset();
+        mFrameBuffer.Reset();
+        mTexture.Reset();
+      }
+    }
+
+    if(width > 0u && height > 0u)
+    {
+      float aspectRatio = static_cast<float>(width) / static_cast<float>(height);
+      mSelectedCamera.SetAspectRatio(aspectRatio);
+    }
+
+    RotateCamera();
+  }
+}
+
+void SceneView::OnWindowResized(Window window, Window::WindowSize size)
+{
+  mWindowOrientation = DevelWindow::GetPhysicalOrientation(window);
+  RotateCamera();
+}
+
+void SceneView::RotateCamera()
+{
+  if(mUseFrameBuffer)
+  {
+    DevelCameraActor::RotateProjection(mSelectedCamera, DEFAULT_ORIENTATION);
+  }
+  else
+  {
+    DevelCameraActor::RotateProjection(mSelectedCamera, mWindowOrientation);
+  }
+}
+
+void SceneView::UpdateSkybox(const std::string& skyboxUrl, Scene3D::EnvironmentMapType skyboxEnvironmentMapType)
+{
+  bool isOnScene = Self().GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE);
+  if(mSkyboxUrl != skyboxUrl || mSkyboxEnvironmentMapType != skyboxEnvironmentMapType)
+  {
+    mSkyboxDirty              = true;
+    mSkyboxResourceReady      = false;
+    mSkyboxUrl                = skyboxUrl;
+    mSkyboxEnvironmentMapType = skyboxEnvironmentMapType;
+  }
+
+  if(mSkyboxUrl.empty())
+  {
+    if(mSkyboxLoadTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mSkyboxLoadTask);
+      mSkyboxLoadTask.Reset();
+    }
+
+    if(mSkybox)
+    {
+      mSkybox.Unparent();
+      mSkybox.Reset();
+      mSkyboxTexture.Reset();
+    }
+
+    mSkyboxDirty         = false;
+    mSkyboxResourceReady = true;
+
+    // Request image resource GC
+    Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+  }
+  else
+  {
+    if(isOnScene && mSkyboxDirty)
+    {
+      if(mSkyboxLoadTask)
+      {
+        Dali::AsyncTaskManager::Get().RemoveTask(mSkyboxLoadTask);
+        mSkyboxLoadTask.Reset();
+
+        // Request image resource GC
+        Dali::Scene3D::Internal::ImageResourceLoader::RequestGarbageCollect();
+      }
+
+      mSkyboxLoadTask = new EnvironmentMapLoadTask(mSkyboxUrl, mSkyboxEnvironmentMapType, MakeCallback(this, &SceneView::OnSkyboxLoadComplete));
+      Dali::AsyncTaskManager::Get().AddTask(mSkyboxLoadTask);
+      mSkyboxDirty = false;
+    }
+  }
+
+  if(IsResourceReady())
+  {
+    Control::SetResourceReady();
+  }
+}
+
+void SceneView::OnSkyboxLoadComplete()
+{
+  if(!mSkybox)
+  {
+    mSkybox = CreateSkybox();
+    SetSkyboxIntensity(mSkyboxIntensity);
+    SetSkyboxOrientation(mSkyboxOrientation);
+    if(mRootLayer)
+    {
+      mRootLayer.Add(mSkybox);
+    }
+  }
+
+  mSkyboxResourceReady = true;
+  mSkyboxTexture       = mSkyboxLoadTask->GetLoadedTexture();
+  Shader skyboxShader;
+  if(mSkyboxLoadTask->GetEnvironmentMapType() == Scene3D::EnvironmentMapType::CUBEMAP)
+  {
+    skyboxShader = Shader::New(SHADER_SKYBOX_SHADER_VERT.data(), SHADER_SKYBOX_SHADER_FRAG.data(), Shader::Hint::NONE, "SCENE3D_SKYBOX_CUBE");
+  }
+  else
+  {
+    skyboxShader = Shader::New(SHADER_SKYBOX_SHADER_VERT.data(), SHADER_SKYBOX_EQUIRECTANGULAR_SHADER_FRAG.data(), Shader::Hint::NONE, "SCENE3D_SKYBOX_EQUIRECTANGULAR");
+  }
+
+  Renderer skyboxRenderer = (mSkybox.GetRendererCount() > 0u) ? mSkybox.GetRendererAt(0u) : Renderer();
+  if(skyboxRenderer)
+  {
+    Dali::TextureSet skyboxTextures = TextureSet::New();
+    skyboxTextures.SetTexture(0, mSkyboxTexture);
+    skyboxRenderer.SetTextures(skyboxTextures);
+    skyboxRenderer.SetShader(skyboxShader);
+  }
+
+  mSkyboxLoadTask.Reset();
+
+  if(IsResourceReady())
+  {
+    Control::SetResourceReady();
+  }
+}
+
+void SceneView::OnIblDiffuseLoadComplete()
+{
+  mDiffuseTexture          = mIblDiffuseLoadTask->GetLoadedTexture();
+  mIblDiffuseResourceReady = true;
+  mIblDiffuseLoadTask.Reset();
+  if(mIblDiffuseResourceReady && mIblSpecularResourceReady)
+  {
+    OnIblLoadComplete();
+  }
+}
+
+void SceneView::OnIblSpecularLoadComplete()
+{
+  mSpecularTexture          = mIblSpecularLoadTask->GetLoadedTexture();
+  mSpecularMipmapLevels     = mIblSpecularLoadTask->GetMipmapLevels();
+  mIblSpecularResourceReady = true;
+  mIblSpecularLoadTask.Reset();
+  if(mIblDiffuseResourceReady && mIblSpecularResourceReady)
+  {
+    OnIblLoadComplete();
+  }
+}
+
+void SceneView::OnIblLoadComplete()
+{
+  NotifyImageBasedLightTextureChange();
+  if(IsResourceReady())
+  {
+    Control::SetResourceReady();
+  }
+}
+
+void SceneView::NotifyImageBasedLightTextureChange()
+{
+  for(auto&& item : mItems)
+  {
+    if(item)
+    {
+      item->NotifyImageBasedLightTexture(mDiffuseTexture, mSpecularTexture, mIblScaleFactor, mSpecularMipmapLevels);
+    }
+  }
+}
+
+void SceneView::UpdateShadowMapBuffer(uint32_t shadowMapSize)
+{
+  if(!mShadowLight || !mSceneHolder)
+  {
+    return;
+  }
+
+  if(!mShadowMapRenderTask)
+  {
+    RenderTaskList taskList = mSceneHolder.GetRenderTaskList();
+    mShadowMapRenderTask    = taskList.CreateTask();
+    mShadowMapRenderTask.SetSourceActor(mRootLayer);
+    mShadowMapRenderTask.SetExclusive(true);
+    mShadowMapRenderTask.SetInputEnabled(false);
+    mShadowMapRenderTask.SetCullMode(false);
+    mShadowMapRenderTask.SetClearEnabled(true);
+    mShadowMapRenderTask.SetClearColor(Color::WHITE);
+    mShadowMapRenderTask.SetRenderPassTag(10);
+    mShadowMapRenderTask.SetCameraActor(GetImplementation(mShadowLight).GetCamera());
+    mShadowMapRenderTask.SetOrderIndex(SHADOW_ORDER_INDEX);
+  }
+
+  Dali::FrameBuffer currentShadowFrameBuffer = mShadowMapRenderTask.GetFrameBuffer();
+  if(!currentShadowFrameBuffer ||
+     !mShadowTexture ||
+     !Dali::Equals(DevelFrameBuffer::GetDepthTexture(currentShadowFrameBuffer).GetWidth(), shadowMapSize))
+  {
+    mShadowFrameBuffer.Reset();
+    mShadowTexture     = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::DEPTH_UNSIGNED_INT, shadowMapSize, shadowMapSize);
+    mShadowFrameBuffer = FrameBuffer::New(shadowMapSize, shadowMapSize, FrameBuffer::Attachment::NONE);
+    DevelFrameBuffer::AttachDepthTexture(mShadowFrameBuffer, mShadowTexture);
+    mShadowMapRenderTask.SetFrameBuffer(mShadowFrameBuffer);
+
+    for(auto&& item : mItems)
+    {
+      if(item)
+      {
+        item->NotifyShadowMapTexture(mShadowTexture);
+      }
+    }
+  }
+}
+
+} // namespace Internal
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/internal/controls/scene-view/scene-view-impl.h b/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
new file mode 100644
index 0000000..3d8c639
--- /dev/null
+++ b/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
@@ -0,0 +1,517 @@
+#ifndef DALI_SCENE3D_INTERNAL_SCENE_VIEW_H
+#define DALI_SCENE3D_INTERNAL_SCENE_VIEW_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/image/image-visual.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/weak-handle.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/environment-map-load-task.h>
+#include <dali-scene3d/internal/common/light-observer.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+class SceneView;
+
+namespace Internal
+{
+/**
+ * @brief Impl class for SceneView.
+ */
+class SceneView : public Dali::Toolkit::Internal::Control
+{
+public:
+  /**
+   * @brief Creates a new SceneView.
+   *
+   * @return A public handle to the newly allocated SceneView.
+   */
+  static Dali::Scene3D::SceneView New();
+
+  /**
+   * @copydoc SceneView::AddCamera()
+   */
+  void AddCamera(Dali::CameraActor camera);
+
+  /**
+   * @copydoc SceneView::RemoveCamera()
+   */
+  void RemoveCamera(CameraActor camera);
+
+  /**
+   * @copydoc SceneView::GetCameraCount()
+   */
+  uint32_t GetCameraCount() const;
+
+  /**
+   * @copydoc SceneView::GetSelectedCamera()
+   */
+  CameraActor GetSelectedCamera() const;
+
+  /**
+   * @copydoc SceneView::GetCamera()
+   */
+  CameraActor GetCamera(uint32_t index) const;
+
+  /**
+   * @copydoc SceneView::GetCamera()
+   */
+  CameraActor GetCamera(const std::string& name) const;
+
+  /**
+   * @copydoc SceneView::SelectCamera()
+   */
+  void SelectCamera(uint32_t index);
+
+  /**
+   * @copydoc SceneView::SelectCamera()
+   */
+  void SelectCamera(const std::string& name);
+
+  /**
+   * @brief Register an item.
+   *
+   * Some works(e.g, lighting) of SceneView should be propagated to the child 3D items.
+   * SceneView can avoid unnecessary tree traversal to find 3D items by storing only 3D items as a list.
+   *
+   * @param[in] item scene observer to be registered.
+   */
+  void RegisterSceneItem(Scene3D::Internal::LightObserver* item);
+
+  /**
+   * @brief Unregister an item
+   *
+   * @param[in] item scene observer to be unregistered.
+   */
+  void UnregisterSceneItem(Scene3D::Internal::LightObserver* item);
+
+  /**
+   * @copydoc SceneView::SetImageBasedLightSource()
+   */
+  void SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor);
+
+  /**
+   * @copydoc SceneView::SetImageBasedLightScaleFactor()
+   */
+  void SetImageBasedLightScaleFactor(float scaleFactor);
+
+  /**
+   * @copydoc SceneView::GetImageBasedLightScaleFactor()
+   */
+  float GetImageBasedLightScaleFactor() const;
+
+  /**
+   * @brief Adds a Light object to this SceneView.
+   * Multiple light object can be added on this SceneView
+   * But the number of lights those actually turned on has limitation.
+   * Scene3D::Light::GetMaximumEnabledLightCount() method can be used to know the maximum namber.
+   *
+   * @param[in] light Light object to be added.
+   */
+  void AddLight(Scene3D::Light light);
+
+  /**
+   * @brief Removes a Light object to this SceneView.
+   * If the light is currently turned on, and SceneView has lights more than maximum number of enabled light.
+   * One of light in queue is turned on after this light is removed.
+   *
+   * @param[in] light Light object to be removed.
+   */
+  void RemoveLight(Scene3D::Light light);
+
+  /**
+   * @brief Set a shadow to this scene by input light.
+   * Currently, SceneView supports only one shadow.
+   *
+   * @param[in] light Light object to make shadow.
+   * @note The shadow will be drawn if the input light is turn on in current scene.
+   */
+  void SetShadow(Scene3D::Light light);
+
+  /**
+   * @brief Removes Shadow from this SceneView.
+   *
+   * @param[in] light Light object to be removed.
+   */
+  void RemoveShadow(Scene3D::Light light);
+
+  /**
+   * @copydoc SceneView::GetActivatedLightCount()
+   */
+  uint32_t GetActivatedLightCount() const;
+
+  /**
+   * @copydoc SceneView::UseFramebuffer()
+   */
+  void UseFramebuffer(bool useFramebuffer);
+
+  /**
+   * @copydoc SceneView::IsUsingFramebuffer()
+   */
+  bool IsUsingFramebuffer() const;
+
+  /**
+   * @copydoc SceneView::SetResolution()
+   */
+  void SetResolution(uint32_t width, uint32_t height);
+
+  /**
+   * @copydoc SceneView::GetResolutionWidth()
+   */
+  uint32_t GetResolutionWidth();
+
+  /**
+   * @copydoc SceneView::GetResolutionHeight()
+   */
+  uint32_t GetResolutionHeight();
+
+  /**
+   * @copydoc SceneView::ResetResolution()
+   */
+  void ResetResolution();
+
+  /**
+   * @copydoc SceneView::SetFramebufferMultiSamplingLevel()
+   */
+  void SetFramebufferMultiSamplingLevel(uint8_t multiSamplingLevel);
+
+  /**
+   * @copydoc SceneView::GetFramebufferMultiSamplingLevel()
+   */
+  uint8_t GetFramebufferMultiSamplingLevel() const;
+
+  /**
+   * @copydoc SceneView::SetSkybox()
+   */
+  void SetSkybox(const std::string& skyboxUrl);
+
+  /**
+   * @copydoc SceneView::SetSkyboxEnvironmentMapType()
+   */
+  void SetSkyboxEnvironmentMapType(Scene3D::EnvironmentMapType skyboxEnvironmentMapType);
+
+  /**
+   * @copydoc SceneView::SetSkyboxIntensity()
+   */
+  void SetSkyboxIntensity(float intensity);
+
+  /**
+   * @copydoc SceneView::GetSkyboxIntensity()
+   */
+  float GetSkyboxIntensity() const;
+
+  /**
+   * @copydoc SceneView::SetSkyboxOrientation()
+   */
+  void SetSkyboxOrientation(const Quaternion& orientation);
+
+  /**
+   * @copydoc SceneView::GetSkyboxOrientation()
+   */
+  Quaternion GetSkyboxOrientation() const;
+
+  /**
+   * @brief Retrieves ShaderManager of this SceneView.
+   * @return ShaderManager of this SceneView.
+   */
+  Dali::Scene3D::Loader::ShaderManagerPtr GetShaderManager() const;
+
+  /**
+   * @brief Updates shader uniforms about shadow.
+   * @param[in] light Light that makes shadow.
+   */
+  void UpdateShadowUniform(Scene3D::Light light);
+
+  /**
+   * @brief Sets alpha mask url
+   * @param[in] alphaMaskUrl Url for alpha mask.
+   */
+  void SetAlphaMaskUrl(std::string& alphaMaskUrl);
+
+  /**
+   * @brief Retrieves alpha mask url
+   * @return Alpha mask url.
+   */
+  std::string GetAlphaMaskUrl();
+
+  /**
+   * @brief Sets mask content scale factor
+   * @param[in] maskContentScaleFactor Scale factor for mask content.
+   */
+  void SetMaskContentScaleFactor(float maskContentScaleFactor);
+
+  /**
+   * @brief Retrieves mask content scale factor
+   * @return Scale factor for mask content.
+   */
+  float GetMaskContentScaleFactor();
+
+  /**
+   * @brief Sets whether the rendered result will be crop to mask or not.
+   * @param[in] enableCropToMask True for crop rendered result to mask.
+   */
+  void EnableCropToMask(bool enableCropToMask);
+
+  /**
+   * @brief Retrieves whether the crop to mask is enabled or not.
+   * @return True when rendered result is cropped to mask.
+   */
+  bool IsEnabledCropToMask();
+
+  /**
+   * @brief Gets current RenderTask
+   */
+  Dali::RenderTask GetRenderTask();
+
+  // Properties
+
+  /**
+   * Called when a property of an object of this type is set.
+   * @param[in] object The object whose property is set.
+   * @param[in] index The property index.
+   * @param[in] value The new property value.
+   */
+  static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value);
+
+  /**
+   * Called to retrieve a property of an object of this type.
+   * @param[in] object The object whose property is to be retrieved.
+   * @param[in] index The property index.
+   * @return The current value of the property.
+   */
+  static Property::Value GetProperty(BaseObject* object, Property::Index index);
+
+protected:
+  /**
+   * @brief Constructs a new SceneView.
+   */
+  SceneView();
+
+  /**
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~SceneView();
+
+private:
+  /**
+   * @copydoc CustomActorImpl::OnSceneConnection()
+   */
+  void OnSceneConnection(int depth) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSceneDisconnection()
+   */
+  void OnSceneDisconnection() override;
+
+  /**
+   * @copydoc Toolkit::Control::OnInitialize()
+   */
+  void OnInitialize() override;
+
+  /**
+   * @copydoc Toolkit::Control::OnChildAdd()
+   */
+  void OnChildAdd(Actor& child) override;
+
+  /**
+   * @copydoc Toolkit::Control::OnChildRemove()
+   */
+  void OnChildRemove(Actor& child) override;
+
+  /**
+   * @copydoc Toolkit::Control::GetHeightForWidth()
+   */
+  float GetHeightForWidth(float width) override;
+
+  /**
+   * @copydoc Toolkit::Control::GetWidthForHeight()
+   */
+  float GetWidthForHeight(float height) override;
+
+  /**
+   * @copydoc Toolkit::Control::OnRelayout()
+   */
+  void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
+
+  /**
+   * @copydoc Toolkit::Control::IsResourceReady()
+   */
+  bool IsResourceReady() const override;
+
+  /**
+   * @brief Changes main camera as a input camera
+   *
+   * @param camera CameraActor that will be a main camera of the SceneView
+   */
+  void UpdateCamera(CameraActor camera);
+
+  /**
+   * @brief Updates RenderTask to use selected camera and to make framebuffer
+   */
+  void UpdateRenderTask();
+
+  /**
+   * @brief Callback that will be called when window is resized.
+   */
+  void OnWindowResized(Window window, Window::WindowSize size);
+
+  /**
+   * @brief Updates camera's projection orientation according to the screen orientation.
+   */
+  void RotateCamera();
+
+  /**
+   * @brief UpdateSkybox with skybox url and skybox environment map type.
+   *
+   * @param[in] skyboxUrl image url for skybox.
+   * @param[in] skyboxEnvironmentMapType The environment type of skybox.
+   */
+  void UpdateSkybox(const std::string& skyboxUrl, Scene3D::EnvironmentMapType skyboxEnvironmentMapType);
+
+  /**
+   * @brief Asynchronously skybox loading finished.
+   */
+  void OnSkyboxLoadComplete();
+
+  /**
+   * @brief Asynchronously ibl diffusel image loading finished.
+   */
+  void OnIblDiffuseLoadComplete();
+
+  /**
+   * @brief Asynchronously ibl specular image loading finished.
+   */
+  void OnIblSpecularLoadComplete();
+
+  /**
+   * @brief Asynchronously ibl loading finished.
+   */
+  void OnIblLoadComplete();
+
+  /**
+   * @brief Notify the changes of Ibl textures to the child items.
+   */
+  void NotifyImageBasedLightTextureChange();
+
+  /**
+   * @brief Update shadowMap framebuffer when the size should be changed.
+   * @param[in] shadowMapSize The size of shadowMap texture. The texture's width and hight is equal.
+   */
+  void UpdateShadowMapBuffer(uint32_t shadowMapSize);
+
+private:
+  Toolkit::Visual::Base mVisual;
+
+  /////////////////////////////////////////////////////////////
+  // FrameBuffer and Rendertask to render child objects as a 3D Scene
+  Dali::WeakHandle<Dali::Window>                 mWindow;
+  Integration::SceneHolder                       mSceneHolder;
+  CameraActor                                    mDefaultCamera;
+  CameraActor                                    mSelectedCamera;
+  std::vector<CameraActor>                       mCameras;
+  std::vector<Scene3D::Internal::LightObserver*> mItems;
+  Dali::FrameBuffer                              mFrameBuffer;
+  Dali::Texture                                  mTexture;
+  Dali::RenderTask                               mRenderTask;
+  Layer                                          mRootLayer;
+  int32_t                                        mWindowOrientation;
+  Dali::Actor                                    mSkybox;
+  Quaternion                                     mSkyboxOrientation;
+  float                                          mSkyboxIntensity{1.0f};
+  uint8_t                                        mFrameBufferMultiSamplingLevel{0u};
+
+  bool     mWindowSizeChanged{false};
+  uint32_t mWindowWidth{0};
+  uint32_t mWindowHeight{0};
+
+  // Masking
+  std::string mAlphaMaskUrl;
+  float       mMaskContentScaleFactor{1.0f};
+  bool        mCropToMask{true};
+  bool        mMaskingPropertyChanged{false};
+
+  // Shader Factory
+  Dali::Scene3D::Loader::ShaderManagerPtr mShaderManager;
+
+  // Light
+  std::vector<std::pair<Scene3D::Light, bool>> mLights; // Pair of Light object and flag that denotes the light is currently activated or not.
+  Dali::FrameBuffer                            mShadowFrameBuffer;
+  Dali::RenderTask                             mShadowMapRenderTask;
+  Scene3D::Light                               mShadowLight;
+  Dali::Texture                                mShadowTexture;
+
+  // Asynchronous Loading.
+  EnvironmentMapLoadTaskPtr mSkyboxLoadTask;
+  EnvironmentMapLoadTaskPtr mIblDiffuseLoadTask;
+  EnvironmentMapLoadTaskPtr mIblSpecularLoadTask;
+  std::string               mSkyboxUrl;
+  std::string               mDiffuseIblUrl;
+  std::string               mSpecularIblUrl;
+
+  Scene3D::EnvironmentMapType mSkyboxEnvironmentMapType{Scene3D::EnvironmentMapType::AUTO};
+  Dali::Texture               mSkyboxTexture;
+  Dali::Texture               mDiffuseTexture;
+  Dali::Texture               mSpecularTexture;
+  float                       mIblScaleFactor{1.0f};
+  uint32_t                    mSpecularMipmapLevels{1u};
+  bool                        mUseFrameBuffer{false};
+  bool                        mSkyboxResourceReady{true};
+  bool                        mIblDiffuseResourceReady{true};
+  bool                        mIblSpecularResourceReady{true};
+  bool                        mSkyboxDirty{false};
+  bool                        mIblDiffuseDirty{false};
+  bool                        mIblSpecularDirty{false};
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+inline Dali::Scene3D::Internal::SceneView& GetImpl(Dali::Scene3D::SceneView& obj)
+{
+  DALI_ASSERT_ALWAYS(obj);
+  Dali::RefObject& handle = obj.GetImplementation();
+  return static_cast<Dali::Scene3D::Internal::SceneView&>(handle);
+}
+
+inline const Dali::Scene3D::Internal::SceneView& GetImpl(const Dali::Scene3D::SceneView& obj)
+{
+  DALI_ASSERT_ALWAYS(obj);
+  const Dali::RefObject& handle = obj.GetImplementation();
+  return static_cast<const Dali::Scene3D::Internal::SceneView&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_INTERNAL_SCENE_VIEW_H
diff --git a/dali-scene3d/internal/event/collider-mesh-processor-impl.cpp b/dali-scene3d/internal/event/collider-mesh-processor-impl.cpp
new file mode 100644
index 0000000..2ec0fed
--- /dev/null
+++ b/dali-scene3d/internal/event/collider-mesh-processor-impl.cpp
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/event/collider-mesh-processor-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/events/hit-test-algorithm.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <algorithm>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/controls/model/model-impl.h>
+#include <dali-scene3d/internal/controls/scene-view/scene-view-impl.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+
+namespace Dali::Scene3D::Internal
+{
+namespace
+{
+struct ColliderMeshData
+{
+  Scene3D::Model                                model;
+  Scene3D::ModelNode                            modelNode;
+  const Dali::Scene3D::Algorithm::ColliderMesh& colliderMesh;
+  Matrix                                        worldMatrix{false};
+};
+using ColliderMeshDataContainer = std::vector<ColliderMeshData>;
+
+void IterateThroughChildren(Actor actor, ColliderMeshDataContainer& meshData)
+{
+  if(actor)
+  {
+    const auto childCount = actor.GetChildCount();
+    for(auto i = 0u; i < childCount; ++i)
+    {
+      Actor          child = actor.GetChildAt(i);
+      Scene3D::Model model = Scene3D::Model::DownCast(child);
+      if(model)
+      {
+        const Model::ColliderMeshContainer& colliderMeshes = GetImpl(model).GetNodeColliderMeshContainer();
+        for(const auto& colliderMeshItem : colliderMeshes)
+        {
+          // If actor name is empty, then assume the mesh if for the model itself
+          [[maybe_unused]] int     actorId   = colliderMeshItem.first;
+          Dali::Scene3D::ModelNode modelNode = colliderMeshItem.second;
+          if(modelNode)
+          {
+            meshData.push_back({model, modelNode, GetImplementation(modelNode).GetColliderMesh(), DevelActor::GetWorldTransform(modelNode)});
+          }
+        }
+      }
+      IterateThroughChildren(child, meshData);
+    }
+  }
+}
+
+class SceneViewTouchHandler
+{
+public:
+  bool operator()(Actor actor, const TouchEvent& touchEvent)
+  {
+    Scene3D::SceneView sceneView = Scene3D::SceneView::DownCast(actor);
+    bool               retVal(false);
+    if(sceneView)
+    {
+      // Get nav-mesh information for the children
+      std::vector<ColliderMeshData> meshData;
+      IterateThroughChildren(sceneView, meshData);
+
+      auto renderTask  = touchEvent.GetRenderTask();
+      auto cameraActor = renderTask.GetCameraActor();
+
+      const auto& result = touchEvent.GetScreenPosition(0);
+      float       x = 0.0f, y = 0.0f;
+      Vector3     origin;
+      Vector3     direction;
+      cameraActor.ScreenToLocal(x, y, result.x, result.y);
+
+      auto sceneViewRenderTask = GetImpl(sceneView).GetRenderTask();
+
+      if(sceneViewRenderTask && HitTestAlgorithm::BuildPickingRay(sceneViewRenderTask, result, origin, direction))
+      {
+        for(auto& mesh : meshData)
+        {
+          // Set transform for the collider mesh
+          const_cast<Dali::Scene3D::Algorithm::ColliderMesh&>(mesh.colliderMesh).SetSceneTransform(mesh.worldMatrix);
+          auto res = mesh.colliderMesh.RayFaceIntersect(origin, direction);
+          if(res != Dali::Scene3D::Algorithm::NavigationMesh::NULL_FACE)
+          {
+            Scene3D::Model            model     = mesh.model;
+            Scene3D::Internal::Model& modelImpl = GetImpl(model);
+            retVal                              = modelImpl.EmitMeshHitSignal(mesh.modelNode);
+            break;
+          }
+        }
+      }
+    }
+    return retVal;
+  }
+};
+
+} // unnamed namespace
+
+ColliderMeshProcessor::ColliderMeshProcessor()
+{
+  Adaptor::Get().RegisterProcessor(*this, true);
+}
+
+ColliderMeshProcessor::~ColliderMeshProcessor()
+{
+  if(Adaptor::IsAvailable())
+  {
+    Adaptor::Get().UnregisterProcessor(*this, true);
+  }
+}
+
+void ColliderMeshProcessor::ColliderMeshChanged(Scene3D::Model model)
+{
+  if(model.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
+  {
+    AddSceneViewParentToProcessingQueue(model);
+  }
+  else
+  {
+    // TODO: Check if signal already connected
+    model.OnSceneSignal().Connect(this, &ColliderMeshProcessor::ModelOnScene);
+  }
+}
+
+void ColliderMeshProcessor::ModelOnScene(Actor actor)
+{
+  Scene3D::Model model = Scene3D::Model::DownCast(actor);
+  if(model)
+  {
+    AddSceneViewParentToProcessingQueue(model);
+  }
+  model.OnSceneSignal().Disconnect(this, &ColliderMeshProcessor::ModelOnScene);
+}
+
+void ColliderMeshProcessor::AddSceneViewParentToProcessingQueue(Scene3D::Model model)
+{
+  Actor actor = model;
+  do
+  {
+    actor = actor.GetParent();
+    Scene3D::SceneView sceneView(Scene3D::SceneView::DownCast(actor));
+    if(sceneView)
+    {
+      mSceneViewsToProcess.push_back(sceneView);
+      break;
+    }
+  } while(actor);
+}
+
+void ColliderMeshProcessor::Process(bool /* postProcess */)
+{
+  // Remove any duplicates
+  std::sort(mSceneViewsToProcess.begin(), mSceneViewsToProcess.end());
+  mSceneViewsToProcess.erase(std::unique(mSceneViewsToProcess.begin(), mSceneViewsToProcess.end()), mSceneViewsToProcess.end());
+
+  for(auto& sceneView : mSceneViewsToProcess)
+  {
+    std::vector<ColliderMeshData> meshData;
+    IterateThroughChildren(sceneView, meshData);
+
+    if(meshData.size())
+    {
+      // TODO: Get SceneView Camera parameters and calculate bounding box
+      // for now, it's a pass-thru algorthm
+      if(std::find(mConnectedSceneViews.begin(), mConnectedSceneViews.end(), sceneView) == mConnectedSceneViews.end())
+      {
+        mConnectedSceneViews.push_back(sceneView);
+        // TODO: Consider passing in camera parameters and meshData into SceneViewTouchHandler
+        sceneView.TouchedSignal().Connect(this, SceneViewTouchHandler());
+      }
+    }
+  }
+  mSceneViewsToProcess.clear();
+}
+
+} // namespace Dali::Scene3D::Internal
diff --git a/dali-scene3d/internal/event/collider-mesh-processor-impl.h b/dali-scene3d/internal/event/collider-mesh-processor-impl.h
new file mode 100644
index 0000000..fb34eb5
--- /dev/null
+++ b/dali-scene3d/internal/event/collider-mesh-processor-impl.h
@@ -0,0 +1,89 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/processor-interface.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/signals/connection-tracker.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/event/collider-mesh-processor.h>
+#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+
+namespace Dali::Scene3D
+{
+namespace Internal
+{
+class ColliderMeshProcessor : public BaseObject, public Dali::ConnectionTracker, public Integration::Processor
+{
+public:
+  ColliderMeshProcessor();
+
+  ~ColliderMeshProcessor();
+
+  void ColliderMeshChanged(Scene3D::Model model);
+
+private:
+  void ModelOnScene(Actor actor);
+
+  void AddSceneViewParentToProcessingQueue(Scene3D::Model model);
+
+protected: // Implementation of Processor
+  /**
+   * @copydoc Dali::Integration::Processor::Process()
+   */
+  void Process(bool /*postProcessor*/) override;
+
+  /**
+   * @copydoc Dali::Integration::Processor::GetProcessorName()
+   */
+  std::string_view GetProcessorName() const override
+  {
+    return "ColliderMeshProcessor";
+  }
+
+private:
+  std::vector<Scene3D::SceneView> mSceneViewsToProcess;
+  std::vector<Scene3D::SceneView> mConnectedSceneViews;
+};
+
+} // namespace Internal
+
+inline Internal::ColliderMeshProcessor& GetImpl(ColliderMeshProcessor& obj)
+{
+  DALI_ASSERT_ALWAYS(obj);
+
+  Dali::BaseObject& handle = obj.GetBaseObject();
+
+  return static_cast<Internal::ColliderMeshProcessor&>(handle);
+}
+
+inline const Internal::ColliderMeshProcessor& GetImpl(const ColliderMeshProcessor& obj)
+{
+  DALI_ASSERT_ALWAYS(obj);
+
+  const Dali::BaseObject& handle = obj.GetBaseObject();
+
+  return static_cast<const Internal::ColliderMeshProcessor&>(handle);
+}
+
+} // namespace Dali::Scene3D
diff --git a/dali-scene3d/internal/event/collider-mesh-processor.cpp b/dali-scene3d/internal/event/collider-mesh-processor.cpp
new file mode 100644
index 0000000..9f0ca0d
--- /dev/null
+++ b/dali-scene3d/internal/event/collider-mesh-processor.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/event/collider-mesh-processor.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/singleton-service.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/event/collider-mesh-processor-impl.h>
+
+namespace Dali::Scene3D
+{
+ColliderMeshProcessor ColliderMeshProcessor::Get()
+{
+  ColliderMeshProcessor processor;
+
+  // Check whether the processor has already created
+  SingletonService singletonService(SingletonService::Get());
+  if(singletonService)
+  {
+    Dali::BaseHandle handle = singletonService.GetSingleton(typeid(ColliderMeshProcessor));
+    if(handle)
+    {
+      // If so, downcast the handle of singleton to focus manager
+      processor = ColliderMeshProcessor(dynamic_cast<Internal::ColliderMeshProcessor*>(handle.GetObjectPtr()));
+    }
+
+    if(!processor)
+    {
+      // If not, create the focus manager and register it as a singleton
+      processor = ColliderMeshProcessor(new Internal::ColliderMeshProcessor());
+      singletonService.Register(typeid(processor), processor);
+    }
+  }
+
+  return processor;
+}
+
+void ColliderMeshProcessor::ColliderMeshChanged(Scene3D::Model model)
+{
+  GetImpl(*this).ColliderMeshChanged(model);
+}
+
+ColliderMeshProcessor::ColliderMeshProcessor(Internal::ColliderMeshProcessor* impl)
+: BaseHandle(impl)
+{
+}
+
+} // namespace Dali::Scene3D
diff --git a/dali-scene3d/internal/event/collider-mesh-processor.h b/dali-scene3d/internal/event/collider-mesh-processor.h
new file mode 100644
index 0000000..0d874ee
--- /dev/null
+++ b/dali-scene3d/internal/event/collider-mesh-processor.h
@@ -0,0 +1,47 @@
+#pragma once
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/controls/model/model.h>
+
+namespace Dali::Scene3D
+{
+namespace Internal
+{
+class ColliderMeshProcessor;
+}
+
+class ColliderMeshProcessor : public BaseHandle
+{
+public:
+  ColliderMeshProcessor()  = default;
+  ~ColliderMeshProcessor() = default;
+
+  static ColliderMeshProcessor Get();
+
+  void ColliderMeshChanged(Scene3D::Model model);
+
+private:
+  explicit ColliderMeshProcessor(Internal::ColliderMeshProcessor* impl);
+};
+
+} // namespace Dali::Scene3D
diff --git a/dali-scene3d/internal/file.list b/dali-scene3d/internal/file.list
new file mode 100644
index 0000000..1ca545c
--- /dev/null
+++ b/dali-scene3d/internal/file.list
@@ -0,0 +1,35 @@
+set(scene3d_internal_dir "${scene3d_dir}/internal")
+
+set(scene3d_src_files ${scene3d_src_files}
+	${scene3d_internal_dir}/algorithm/navigation-mesh-impl.cpp
+	${scene3d_internal_dir}/algorithm/path-finder-dijkstra.cpp
+	${scene3d_internal_dir}/algorithm/path-finder-spfa.cpp
+	${scene3d_internal_dir}/algorithm/path-finder-spfa-double-way.cpp
+	${scene3d_internal_dir}/common/environment-map-load-task.cpp
+	${scene3d_internal_dir}/common/image-resource-loader.cpp
+	${scene3d_internal_dir}/common/model-cache-manager.cpp
+	${scene3d_internal_dir}/common/model-load-task.cpp
+	${scene3d_internal_dir}/controls/model/model-impl.cpp
+	${scene3d_internal_dir}/controls/scene-view/scene-view-impl.cpp
+	${scene3d_internal_dir}/event/collider-mesh-processor.cpp
+	${scene3d_internal_dir}/event/collider-mesh-processor-impl.cpp
+	${scene3d_internal_dir}/light/light-impl.cpp
+	${scene3d_internal_dir}/loader/dli-loader-impl.cpp
+	${scene3d_internal_dir}/loader/gltf2-asset.cpp
+	${scene3d_internal_dir}/loader/gltf2-util.cpp
+	${scene3d_internal_dir}/loader/gltf2-loader-impl.cpp
+	${scene3d_internal_dir}/loader/glb-loader-impl.cpp
+	${scene3d_internal_dir}/loader/hash.cpp
+	${scene3d_internal_dir}/loader/json-reader.cpp
+	${scene3d_internal_dir}/loader/json-util.cpp
+	${scene3d_internal_dir}/model-components/material-impl.cpp
+	${scene3d_internal_dir}/model-components/model-node-impl.cpp
+	${scene3d_internal_dir}/model-components/model-primitive-impl.cpp
+	${scene3d_internal_dir}/model-motion/motion-data-impl.cpp
+	${scene3d_internal_dir}/model-motion/motion-data-load-task.cpp
+	${scene3d_internal_dir}/model-motion/motion-index/blend-shape-index-impl.cpp
+	${scene3d_internal_dir}/model-motion/motion-index/motion-index-impl.cpp
+	${scene3d_internal_dir}/model-motion/motion-index/motion-property-index-impl.cpp
+	${scene3d_internal_dir}/model-motion/motion-index/motion-transform-index-impl.cpp
+	${scene3d_internal_dir}/model-motion/motion-value-impl.cpp
+)
diff --git a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
new file mode 100644
index 0000000..47bb831
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
@@ -0,0 +1,348 @@
+
+// Original Code
+// https://github.com/KhronosGroup/glTF-Sample-Viewer/blob/glTF-WebGL-PBR/shaders/pbr-frag.glsl
+// Commit dc84b5e374fb3d23153d2248a338ef88173f9eb6
+//
+// This fragment shader defines a reference implementation for Physically Based Shading of
+// a microfacet surface material defined by a glTF model.For the DamagedHelmet.gltf and its Assets
+//
+// References:
+// [1] Real Shading in Unreal Engine 4
+//     http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf
+// [2] Physically Based Shading at Disney
+//     http://blog.selfshadow.com/publications/s2012-shading-course/burley/s2012_pbs_disney_brdf_notes_v3.pdf
+// [3] README.md - Environment Maps
+//     https://github.com/KhronosGroup/glTF-Sample-Viewer/#environment-maps
+// [4] \"An Inexpensive BRDF Model for Physically based Rendering\" by Christophe Schlick
+//     https://www.cs.virginia.edu/~jdl/bib/appearance/analytic%20models/schlick94b.pdf
+
+#ifdef HIGHP
+precision highp float;
+#else
+precision mediump float;
+#endif
+
+#ifdef GLTF_CHANNELS
+#define METALLIC b
+#define ROUGHNESS g
+#else //GLTF_CHANNELS
+#define METALLIC r
+#define ROUGHNESS a
+#endif //GLTF_CHANNELS
+
+uniform lowp vec4 uColor; // Color from SceneGraph
+uniform lowp vec4 uColorFactor; // Color from material
+uniform lowp float uMetallicFactor;
+uniform lowp float uRoughnessFactor;
+uniform lowp float uDielectricSpecular;
+
+#ifdef THREE_TEX
+#ifdef BASECOLOR_TEX
+uniform sampler2D sAlbedoAlpha;
+uniform float uBaseColorTextureTransformAvailable;
+uniform mat3 uBaseColorTextureTransform;
+#endif // BASECOLOR_TEX
+#ifdef METALLIC_ROUGHNESS_TEX
+uniform sampler2D sMetalRoughness;
+uniform float uMetalRoughnessTextureTransformAvailable;
+uniform mat3 uMetalRoughnessTextureTransform;
+#endif // METALLIC_ROUGHNESS_TEX
+#ifdef NORMAL_TEX
+uniform sampler2D sNormal;
+uniform float uNormalTextureTransformAvailable;
+uniform mat3 uNormalTextureTransform;
+uniform float uNormalScale;
+#endif // NORMAL_TEX
+#else // THREE_TEX
+uniform sampler2D sAlbedoMetal;
+uniform float uBaseColorTextureTransformAvailable;
+uniform mat3 uBaseColorTextureTransform;
+uniform sampler2D sNormalRoughness;
+uniform float uNormalRoughnessTextureTransformAvailable;
+uniform mat3 uNormalRoughnessTextureTransform;
+#endif
+
+
+
+#ifdef OCCLUSION
+uniform sampler2D sOcclusion;
+uniform float uOcclusionTextureTransformAvailable;
+uniform mat3 uOcclusionTextureTransform;
+uniform float uOcclusionStrength;
+#endif
+
+#ifdef EMISSIVE_TEXTURE
+uniform sampler2D sEmissive;
+uniform float uEmissiveTextureTransformAvailable;
+uniform mat3 uEmissiveTextureTransform;
+#endif
+uniform vec3 uEmissiveFactor;
+
+uniform float uSpecularFactor;
+uniform vec3  uSpecularColorFactor;
+#ifdef MATERIAL_SPECULAR_TEXTURE
+uniform sampler2D sSpecular;
+#endif
+#ifdef MATERIAL_SPECULAR_COLOR_TEXTURE
+uniform sampler2D sSpecularColor;
+#endif
+
+// For Light (Currently Directional Only)
+#define MAX_LIGHTS 5
+uniform mediump int uLightCount;
+uniform mediump vec3 uLightDirection[MAX_LIGHTS];
+uniform mediump vec3 uLightColor[MAX_LIGHTS];
+
+// For Shadow Map
+uniform lowp int uIsShadowEnabled;
+uniform sampler2D sShadowMap;
+uniform lowp int uIsShadowReceiving;
+#ifdef SL_VERSION_LOW
+uniform int uShadowMapWidth;
+uniform int uShadowMapHeight;
+#endif
+INPUT highp vec3 positionFromLightView;
+
+//// For IBL
+uniform sampler2D sbrdfLUT;
+uniform samplerCube sDiffuseEnvSampler;
+uniform samplerCube sSpecularEnvSampler;
+uniform float uIblIntensity;
+uniform mediump vec3 uYDirection;
+uniform float uMaxLOD;
+
+// For Alpha Mode.
+uniform lowp float uOpaque;
+uniform lowp float uMask;
+uniform lowp float uAlphaThreshold;
+
+// TODO: Multiple texture coordinate will be supported.
+INPUT mediump vec2 vUV;
+INPUT lowp mat3 vTBN;
+INPUT lowp vec4 vColor;
+INPUT highp vec3 vPositionToCamera;
+
+const float c_MinRoughness = 0.04;
+const float M_PI = 3.141592653589793;
+
+// These properties can be used for circular sampling for PCF
+
+// Percentage Closer Filtering to mitigate the banding artifacts.
+const int kPcfSampleCount = 9;
+
+const float kPi = 3.141592653589;
+const float kInvSampleCount = 1.0 / float(kPcfSampleCount);
+const float kPcfTheta = 2.0 * kPi * kInvSampleCount;
+const float kSinPcfTheta = sin(kPcfTheta);
+const float kCosPcfTheta = cos(kPcfTheta);
+
+uniform lowp int uEnableShadowSoftFiltering;
+uniform mediump float uShadowIntensity;
+uniform highp float uShadowBias;
+
+vec3 linear(vec3 color)
+{
+  return pow(color, vec3(2.2));
+}
+
+vec2 computeTextureTransform(vec2 texCoord, mat3 textureTransform)
+{
+    return vec2(textureTransform * vec3(texCoord, 1.0));
+}
+
+void main()
+{
+  // Metallic and Roughness material properties are packed together
+  // In glTF, these factors can be specified by fixed scalar values
+  // or from a metallic-roughness map
+  // Roughness is stored in the 'g' channel, metallic is stored in the 'b' channel.
+  // This layout intentionally reserves the 'r' channel for (optional) occlusion map data
+  lowp float metallic = uMetallicFactor;
+  lowp float perceptualRoughness = uRoughnessFactor;
+  // If there isn't normal texture, use surface normal
+  highp vec3 n = normalize(vTBN[2].xyz);
+
+#ifdef THREE_TEX
+  // The albedo may be defined from a base texture or a flat color
+#ifdef BASECOLOR_TEX
+  mediump vec2 baseColorTexCoords = mix(vUV, computeTextureTransform(vUV, uBaseColorTextureTransform), uBaseColorTextureTransformAvailable);
+  lowp vec4 baseColor = TEXTURE(sAlbedoAlpha, baseColorTexCoords);
+  baseColor = vColor * vec4(linear(baseColor.rgb), baseColor.w) * uColorFactor;
+#else // BASECOLOR_TEX
+  lowp vec4 baseColor = vColor * uColorFactor;
+#endif // BASECOLOR_TEX
+
+#ifdef METALLIC_ROUGHNESS_TEX
+  mediump vec2 metalRoughnessTexCoords = mix(vUV, computeTextureTransform(vUV, uMetalRoughnessTextureTransform), uMetalRoughnessTextureTransformAvailable);
+  lowp vec4 metrou = TEXTURE(sMetalRoughness, metalRoughnessTexCoords);
+  metallic = metrou.METALLIC * metallic;
+  perceptualRoughness = metrou.ROUGHNESS * perceptualRoughness;
+#endif // METALLIC_ROUGHNESS_TEX
+
+#ifdef NORMAL_TEX
+  mediump vec2 normalTexCoords = mix(vUV, computeTextureTransform(vUV, uNormalTextureTransform), uNormalTextureTransformAvailable);
+  n = TEXTURE(sNormal, normalTexCoords).rgb;
+  n = normalize(vTBN * ((2.0 * n - 1.0) * vec3(uNormalScale, uNormalScale, 1.0)));
+#endif // NORMAL_TEX
+#else // THREE_TEX
+  mediump vec2 baseColorTexCoords = mix(vUV, computeTextureTransform(vUV, uBaseColorTextureTransform), uBaseColorTextureTransformAvailable);
+  vec4 albedoMetal = TEXTURE(sAlbedoMetal, baseColorTexCoords);
+  lowp vec4 baseColor = vec4(linear(albedoMetal.rgb), 1.0) * vColor * uColorFactor;
+
+  metallic = albedoMetal.METALLIC * metallic;
+
+  mediump vec2 normalRoughnessTexCoords = mix(vUV, computeTextureTransform(vUV, uNormalRoughnessTextureTransform), uNormalRoughnessTextureTransformAvailable);
+  vec4 normalRoughness = TEXTURE(sNormalRoughness, normalRoughnessTexCoords);
+  perceptualRoughness = normalRoughness.ROUGHNESS * perceptualRoughness;
+
+  n = normalRoughness.rgb;
+  n = normalize(vTBN * ((2.0 * n - 1.0) * vec3(uNormalScale, uNormalScale, 1.0)));
+#endif // THREE_TEX
+
+  // The value of uOpaque and uMask can be 0.0 or 1.0.
+  // If uMask is 1.0, a Pixel that has bigger alpha than uAlphaThreashold becomes fully opaque,
+  // and, a pixel that has smaller alpha than uAlphaThreashold becomes fully transparent.
+  // If uOpaque is 1.0, alpha value of final color is 1.0;
+  // https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#_material_alphamode
+  if(uMask > 0.5 && baseColor.a < uAlphaThreshold)
+  {
+    discard;
+  }
+  baseColor.a = mix(baseColor.a, 1.0, uOpaque);
+
+  metallic = clamp(metallic, 0.0, 1.0);
+  // Roughness is authored as perceptual roughness; as is convention,
+  // convert to material roughness by squaring the perceptual roughness [2].
+  perceptualRoughness = clamp(perceptualRoughness, c_MinRoughness, 1.0);
+
+  // Material ior
+  lowp vec3 f0 = vec3(uDielectricSpecular);
+
+  // Material Specular
+  float specularWeight = 1.0;
+  vec4 materialSpecularTexture = vec4(1.0);
+#ifdef MATERIAL_SPECULAR_TEXTURE
+  materialSpecularTexture.a = TEXTURE(sSpecular, vUV).a;
+#endif
+#ifdef MATERIAL_SPECULAR_COLOR_TEXTURE
+  materialSpecularTexture.rgb = TEXTURE(sSpecularColor, vUV).rgb;
+#endif
+  specularWeight = uSpecularFactor * materialSpecularTexture.a;
+  f0 = min(f0 * uSpecularColorFactor * materialSpecularTexture.rgb, vec3(1.0));
+  f0 = mix(f0, baseColor.rgb, metallic);
+
+  mediump vec3 v = normalize(vPositionToCamera); // Vector from surface point to camera
+  mediump float NdotV = clamp(abs(dot(n, v)), 0.001, 1.0);
+  mediump vec3 reflection = -normalize(reflect(v, n));
+  lowp vec3 brdf = TEXTURE(sbrdfLUT, vec2(NdotV, 1.0 - perceptualRoughness)).rgb;
+  vec3 Fr = max(vec3(1.0 - perceptualRoughness), f0) - f0;
+  vec3 k_S = f0 + Fr * pow(1.0 - NdotV, 5.0);
+  vec3 FssEss = specularWeight * (k_S * brdf.x + brdf.y);
+
+  // Specular Light
+  // uMaxLOD that means mipmap level of specular texture is used for bluring of reflection of specular following roughness.
+  float lod = perceptualRoughness * (uMaxLOD - 1.0);
+#ifdef SL_VERSION_LOW
+  // glsl 1.0 doesn't support textureLod. Let we just use textureCube instead.
+  lowp vec3 specularLight = linear(textureCube(sSpecularEnvSampler, reflection * uYDirection).rgb);
+#else
+  lowp vec3 specularLight = linear(textureLod(sSpecularEnvSampler, reflection * uYDirection, lod).rgb);
+#endif
+  lowp vec3 specular = specularLight * FssEss;
+
+  // Diffuse Light
+  lowp vec3 diffuseColor = mix(baseColor.rgb, vec3(0), metallic);
+#ifdef SL_VERSION_LOW
+  lowp vec3 irradiance = linear(textureCube(sDiffuseEnvSampler, n * uYDirection).rgb);
+#else
+  lowp vec3 irradiance = linear(TEXTURE(sDiffuseEnvSampler, n * uYDirection).rgb);
+#endif
+  float Ems = (1.0 - (brdf.x + brdf.y));
+  vec3 F_avg = specularWeight * (f0 + (1.0 - f0) / 21.0);
+  vec3 FmsEms = Ems * FssEss * F_avg / (1.0 - F_avg * Ems);
+  vec3 k_D = diffuseColor * (1.0 - FssEss + FmsEms);
+  lowp vec3 diffuse = (FmsEms + k_D) * irradiance;
+
+  lowp vec3 color = (diffuse + specular) * uIblIntensity;
+
+  // Punctual Light
+  if(uLightCount > 0)
+  {
+    // Compute reflectance.
+    highp float reflectance = max(max(f0.r, f0.g), f0.b);
+    highp float reflectance90 = clamp(reflectance * 25.0, 0.0, 1.0);
+    highp float r = perceptualRoughness * perceptualRoughness;
+    highp float attenuationV = 2.0 * NdotV / (NdotV + sqrt(r * r + (1.0 - r * r) * (NdotV * NdotV)));
+    highp float roughnessSq = r * r;
+    highp vec3 diffuseColorPunctual = baseColor.rgb * (vec3(1.0) - f0);
+    diffuseColorPunctual *= ( 1.0 - metallic );
+
+    for(int i = 0; i < uLightCount; ++i)
+    {
+      highp vec3 l = normalize(-uLightDirection[i]); // Vector from surface point to light
+      highp vec3 h = normalize(l+v);               // Half vector between both l and v
+      highp float VdotH = dot(v, h);
+      highp vec3 specularReflection = f0 + (reflectance90 - f0) * pow(clamp(1.0 - VdotH, 0.0, 1.0), 5.0);
+
+      highp float NdotL = clamp(dot(n, l), 0.001, 1.0);
+      highp float attenuationL = 2.0 * NdotL / (NdotL + sqrt(r * r + (1.0 - r * r) * (NdotL * NdotL)));
+      highp float geometricOcclusion = attenuationL * attenuationV;
+
+      highp float NdotH = dot(n, h);
+      highp float f = (NdotH * roughnessSq - NdotH) * NdotH + 1.0;
+      highp float microfacetDistribution = roughnessSq / (M_PI * f * f);;
+
+      // Calculation of analytical lighting contribution
+      highp vec3 diffuseContrib = ( 1.0 - specularReflection ) * ( diffuseColorPunctual / M_PI );
+      highp vec3 specContrib = specularReflection * geometricOcclusion * microfacetDistribution / ( 4.0 * NdotL * NdotV );
+
+      // Obtain final intensity as reflectance (BRDF) scaled by the energy of the light (cosine law)
+      color += NdotL * uLightColor[i] * (diffuseContrib + specContrib);
+    }
+  }
+
+  if(float(uIsShadowReceiving) * float(uIsShadowEnabled) * uShadowIntensity > 0.0)
+  {
+    mediump float exposureFactor = 0.0;
+    if(uEnableShadowSoftFiltering > 0)
+    {
+#ifdef SL_VERSION_LOW
+      ivec2 texSize = ivec2(uShadowMapWidth, uShadowMapHeight);
+#else
+      ivec2 texSize = textureSize(sShadowMap, 0);
+#endif
+      mediump vec2 texelSize = vec2(1.0) / vec2(texSize.x, texSize.y);
+      mediump vec2 pcfSample = vec2(1.0, 0.0);
+      for (int i = 0; i < kPcfSampleCount; ++i)
+      {
+        pcfSample = vec2(kCosPcfTheta * pcfSample.x - kSinPcfTheta * pcfSample.y,
+                         kSinPcfTheta * pcfSample.x + kCosPcfTheta * pcfSample.y);
+        lowp float depthValue = TEXTURE(sShadowMap, positionFromLightView.xy + pcfSample * texelSize).r;
+        exposureFactor += (depthValue < positionFromLightView.z - uShadowBias) ? 0.0 : 1.0;
+      }
+      exposureFactor *= kInvSampleCount;
+    }
+    else
+    {
+      mediump float depthValue = TEXTURE(sShadowMap, positionFromLightView.xy).r;
+      exposureFactor           = (depthValue < positionFromLightView.z - uShadowBias) ? 0.0 : 1.0;
+    }
+    color *= (1.0 - (1.0 - exposureFactor) * uShadowIntensity);
+  }
+
+#ifdef OCCLUSION
+  mediump vec2 occlusionTexCoords = mix(vUV, computeTextureTransform(vUV, uOcclusionTextureTransform), uOcclusionTextureTransformAvailable);
+  lowp float ao = TEXTURE(sOcclusion, occlusionTexCoords).r;
+  color = mix(color, color * ao, uOcclusionStrength);
+#endif // OCCLUSION
+
+#ifdef EMISSIVE_TEXTURE
+  mediump vec2 emissiveTexCoords = mix(vUV, computeTextureTransform(vUV, uEmissiveTextureTransform), uEmissiveTextureTransformAvailable);
+  lowp vec3 emissive = linear(TEXTURE(sEmissive, emissiveTexCoords).rgb) * uEmissiveFactor;
+#else
+  lowp vec3 emissive = uEmissiveFactor;
+#endif // EMISSIVE_TEXTURE
+  color += emissive;
+
+  OUT_COLOR = vec4(pow(color, vec3(1.0 / 2.2)), baseColor.a) * uColor;
+}
diff --git a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.vert b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.vert
new file mode 100644
index 0000000..83be657
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.vert
@@ -0,0 +1,277 @@
+
+// Original Code
+// https://github.com/KhronosGroup/glTF-Sample-Viewer/blob/glTF-WebGL-PBR/shaders/pbr-vert.glsl
+// Commit dc84b5e374fb3d23153d2248a338ef88173f9eb6
+
+#define MORPH defined(MORPH_POSITION) || defined(MORPH_NORMAL) || defined(MORPH_TANGENT)
+
+// These lines in the shader may be replaced with actual definitions by the model loader,
+// if they are needed. Note, some shader compilers have problems with spurious ";", so
+// the macro invocations don't have a trailing ";". The replacement strings in the model
+// loader will provide it instead.
+#define ADD_EXTRA_SKINNING_ATTRIBUTES
+#define ADD_EXTRA_WEIGHTS
+
+#ifdef HIGHP
+  precision highp float;
+#else
+  precision mediump float;
+#endif
+
+INPUT vec3 aPosition;
+INPUT vec2 aTexCoord;
+INPUT vec3 aNormal;
+
+#ifdef VEC4_TANGENT
+INPUT vec4 aTangent;
+#else
+INPUT vec3 aTangent;
+#endif
+
+INPUT vec4 aVertexColor;
+
+#ifdef SL_VERSION_LOW
+INPUT float aVertexID;
+#endif
+
+#ifdef SKINNING
+INPUT vec4 aJoints0;
+INPUT vec4 aWeights0;
+ADD_EXTRA_SKINNING_ATTRIBUTES
+#endif
+
+#ifdef MORPH
+uniform highp sampler2D sBlendShapeGeometry;
+#ifdef SL_VERSION_LOW
+uniform int uBlendShapeGeometryWidth;
+uniform int uBlendShapeGeometryHeight;
+#endif
+#endif
+
+OUTPUT mediump vec2 vUV;
+OUTPUT lowp mat3 vTBN;
+OUTPUT lowp vec4 vColor;
+OUTPUT highp vec3 vPositionToCamera;
+
+uniform highp mat4 uViewMatrix;
+uniform mat3 uNormalMatrix;
+uniform mat4 uModelMatrix;
+uniform mat4 uProjection;
+
+#ifdef SKINNING
+
+#ifdef SL_VERSION_LOW
+#define MAX_BONES 80
+uniform mat4 uBone[MAX_BONES];
+#else
+#define MAX_BONES 256
+layout(std140) uniform Bones
+{
+  mat4 uBone[MAX_BONES];
+};
+#endif
+
+uniform mediump vec3 uYDirection;
+#endif
+
+#ifdef MORPH
+#define MAX_BLEND_SHAPE_NUMBER 256
+uniform int uNumberOfBlendShapes;                                         ///< Total number of blend shapes loaded.
+uniform highp float uBlendShapeWeight[MAX_BLEND_SHAPE_NUMBER];            ///< The weight of each blend shape.
+#ifdef MORPH_VERSION_2_0
+uniform highp float uBlendShapeUnnormalizeFactor;                         ///< Factor used to unnormalize the geometry of the blend shape.
+#else
+uniform highp float uBlendShapeUnnormalizeFactor[MAX_BLEND_SHAPE_NUMBER]; ///< Factor used to unnormalize the geometry of the blend shape.
+#endif
+uniform highp int uBlendShapeComponentSize;                               ///< The size in the texture of either the vertices, normals or tangents. Used to calculate the offset to address them.
+#endif
+
+// Shadow
+uniform lowp int uIsShadowEnabled;
+uniform highp mat4 uShadowLightViewProjectionMatrix;
+OUTPUT highp vec3 positionFromLightView;
+
+void main()
+{
+  highp vec4 position = vec4(aPosition, 1.0);
+  highp vec3 normal = aNormal;
+  highp vec3 tangent = aTangent.xyz;
+
+#ifdef MORPH
+#ifdef SL_VERSION_LOW
+  int width = uBlendShapeGeometryWidth;
+#else
+  int width = textureSize( sBlendShapeGeometry, 0 ).x;
+#endif
+
+  highp int blendShapeBufferOffset = 0;
+
+#ifdef SL_VERSION_LOW
+  highp float blendShapeWidth = float(uBlendShapeGeometryWidth);
+  highp float blendShapeHeight = float(uBlendShapeGeometryHeight);
+  highp float invertBlendShapeWidth = 1.0 / blendShapeWidth;
+  highp float invertBlendShapeHeight = 1.0 / blendShapeHeight;
+#endif
+
+  for( int index = 0; index < uNumberOfBlendShapes; ++index )
+  {
+    highp vec3 diff = vec3(0.0);
+    highp int vertexId = 0;
+    highp int x = 0;
+    highp int y = 0;
+    highp float weight = clamp(uBlendShapeWeight[index], 0.0, 1.0);
+
+#ifdef MORPH_POSITION
+    // Calculate the index to retrieve the geometry from the texture.
+#ifdef SL_VERSION_LOW
+    vertexId = int(floor(aVertexID + 0.5)) + blendShapeBufferOffset;
+    y = vertexId / width;
+    x = vertexId - y * width;
+#else
+    vertexId = gl_VertexID + blendShapeBufferOffset;
+    x = vertexId % width;
+    y = vertexId / width;
+#endif
+
+    // Retrieves the blend shape geometry from the texture, unnormalizes it and multiply by the weight.
+    if(0.0 != weight)
+    {
+#ifdef MORPH_VERSION_2_0
+       highp float unnormalizeFactor = uBlendShapeUnnormalizeFactor;
+#else
+       highp float unnormalizeFactor = uBlendShapeUnnormalizeFactor[index];
+#endif
+
+#ifdef SL_VERSION_LOW
+      highp float floatX = float(x) + 0.5;
+      highp float floatY = float(y) + 0.5;
+      diff = weight * unnormalizeFactor * ( texture2D( sBlendShapeGeometry, vec2(floatX * invertBlendShapeWidth, floatY * invertBlendShapeHeight) ).xyz - 0.5 );
+#else
+      diff = weight * unnormalizeFactor * ( texelFetch( sBlendShapeGeometry, ivec2(x, y), 0 ).xyz - 0.5 );
+#endif
+    }
+
+    position.xyz += diff;
+
+    blendShapeBufferOffset += uBlendShapeComponentSize;
+#endif
+
+#ifdef MORPH_NORMAL
+    // Calculate the index to retrieve the normal from the texture.
+#ifdef SL_VERSION_LOW
+    vertexId = int(floor(aVertexID + 0.5)) + blendShapeBufferOffset;
+    y = vertexId / width;
+    x = vertexId - y * width;
+#else
+    vertexId = gl_VertexID + blendShapeBufferOffset;
+    x = vertexId % width;
+    y = vertexId / width;
+#endif
+
+    // Retrieves the blend shape normal from the texture, unnormalizes it and multiply by the weight.
+    if(0.0 != weight)
+    {
+#ifdef SL_VERSION_LOW
+      highp float floatX = float(x) + 0.5;
+      highp float floatY = float(y) + 0.5;
+      diff = weight * 2.0 * ( texture2D( sBlendShapeGeometry, vec2(floatX * invertBlendShapeWidth, floatY * invertBlendShapeHeight) ).xyz - 0.5 );
+#else
+      diff = weight * 2.0 * ( texelFetch( sBlendShapeGeometry, ivec2(x, y), 0 ).xyz - 0.5 );
+#endif
+    }
+
+    normal += diff.xyz;
+
+    blendShapeBufferOffset += uBlendShapeComponentSize;
+#endif
+
+#ifdef MORPH_TANGENT
+    // Calculate the index to retrieve the tangent from the texture.
+#ifdef SL_VERSION_LOW
+    vertexId = int(floor(aVertexID + 0.5)) + blendShapeBufferOffset;
+    y = vertexId / width;
+    x = vertexId - y * width;
+#else
+    vertexId = gl_VertexID + blendShapeBufferOffset;
+    x = vertexId % width;
+    y = vertexId / width;
+#endif
+
+    // Retrieves the blend shape tangent from the texture, unnormalizes it and multiply by the weight.
+    if(0.0 != weight)
+    {
+#ifdef SL_VERSION_LOW
+      highp float floatX = float(x) + 0.5;
+      highp float floatY = float(y) + 0.5;
+      diff = weight * 2.0 * ( texture2D( sBlendShapeGeometry, vec2(floatX * invertBlendShapeWidth, floatY * invertBlendShapeHeight) ).xyz - 0.5 );
+#else
+      diff = weight * 2.0 * ( texelFetch( sBlendShapeGeometry, ivec2(x, y), 0 ).xyz - 0.5 );
+#endif
+    }
+
+    tangent += diff.xyz;
+
+    blendShapeBufferOffset += uBlendShapeComponentSize;
+#endif
+  }
+
+#endif
+
+
+
+
+#ifdef SKINNING
+  highp mat4 bone =
+    uBone[int(aJoints0.x)] * aWeights0.x +
+    uBone[int(aJoints0.y)] * aWeights0.y +
+    uBone[int(aJoints0.z)] * aWeights0.z +
+    uBone[int(aJoints0.w)] * aWeights0.w;
+
+  ADD_EXTRA_WEIGHTS
+
+  position = bone * position;
+  normal = uYDirection * (bone * vec4(normal, 0.0)).xyz;
+  tangent = uYDirection * (bone * vec4(tangent, 0.0)).xyz;
+
+  highp vec4 positionW = position;
+#else
+  highp vec4 positionW = uModelMatrix * position;
+#endif
+
+  highp vec4 positionV = uViewMatrix * positionW;
+
+#ifdef SL_VERSION_LOW
+  highp vec3 i0 = uViewMatrix[0].xyz;
+  highp vec3 i1 = uViewMatrix[1].xyz;
+  highp vec3 i2 = uViewMatrix[2].xyz;
+
+  vPositionToCamera = mat3(vec3(i0.x, i1.x, i2.x), vec3(i0.y, i1.y, i2.y), vec3(i0.z, i1.z, i2.z)) * -vec3(positionV.xyz / positionV.w);
+#else
+  vPositionToCamera = transpose(mat3(uViewMatrix)) * -vec3(positionV.xyz / positionV.w);
+#endif
+
+  normal = normalize(normal);
+  tangent = normalize(tangent);
+  vec3 bitangent = cross(normal, tangent);
+#ifdef VEC4_TANGENT
+  bitangent *= aTangent.w;
+#endif
+  vTBN = mat3(uModelMatrix) * mat3(tangent, bitangent, normal);
+
+#ifdef FLIP_V
+  vUV = vec2(aTexCoord.x, 1.0 - aTexCoord.y);
+#else
+  vUV = aTexCoord;
+#endif
+
+  vColor = aVertexColor;
+
+  positionFromLightView = vec3(1.0);
+  if(uIsShadowEnabled > 0)
+  {
+    highp vec4 positionInLightView = uShadowLightViewProjectionMatrix * positionW;
+    positionFromLightView = ((positionInLightView.xyz / positionInLightView.w) * 0.5) + vec3(0.5);
+  }
+
+  gl_Position = uProjection * positionV;
+}
diff --git a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
new file mode 100644
index 0000000..5e6f766
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
@@ -0,0 +1,10 @@
+
+precision mediump float;
+uniform lowp vec4 uColor;
+flat INPUT float vColor;
+
+void main()
+{
+  vec3 rgb = vec3(fract(vColor), fract(vColor * 0.00390625), fract(vColor * 0.00390625 * 0.00390625));
+  OUT_COLOR = vec4(rgb, 1.) * uColor;
+}
\ No newline at end of file
diff --git a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.vert b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.vert
new file mode 100644
index 0000000..5e9d965
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.vert
@@ -0,0 +1,12 @@
+
+precision mediump float;
+uniform mat4 uMvpMatrix;
+INPUT vec3 aPosition;
+INPUT float aColor;
+flat OUTPUT float vColor;
+
+void main()
+{
+  vColor = aColor;
+  gl_Position = uMvpMatrix * vec4(aPosition, 1.0);
+}
\ No newline at end of file
diff --git a/dali-scene3d/internal/graphics/shaders/shadow-map-shader.frag b/dali-scene3d/internal/graphics/shaders/shadow-map-shader.frag
new file mode 100644
index 0000000..7d72c36
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/shadow-map-shader.frag
@@ -0,0 +1,56 @@
+
+uniform lowp vec4 uColorFactor; // Color from material
+uniform lowp float uMask;
+uniform lowp float uAlphaThreshold;
+
+INPUT mediump vec2 vUV;
+INPUT lowp vec4 vColor;
+
+//INPUT highp float depth;
+//OUTPUT highp vec4 FragColor;
+
+#ifdef THREE_TEX
+#ifdef BASECOLOR_TEX
+uniform sampler2D sAlbedoAlpha;
+#endif // BASECOLOR_TEX
+#else // THREE_TEX
+uniform sampler2D sAlbedoMetal;
+#endif
+
+uniform int uIsShadowCasting;
+
+lowp vec3 linear(lowp vec3 color)
+{
+  return pow(color, vec3(2.2));
+}
+
+void main()
+{
+  if(uIsShadowCasting == 0)
+  {
+    discard;
+  }
+
+#ifdef THREE_TEX
+  // The albedo may be defined from a base texture or a flat color
+#ifdef BASECOLOR_TEX
+  lowp vec4 baseColor = TEXTURE(sAlbedoAlpha, vUV);
+  baseColor = vColor * vec4(linear(baseColor.rgb), baseColor.w) * uColorFactor;
+#else // BASECOLOR_TEX
+  lowp vec4 baseColor = vColor * uColorFactor;
+#endif // BASECOLOR_TEX
+#else // THREE_TEX
+  lowp vec4 albedoMetal = TEXTURE(sAlbedoMetal, vUV);
+  lowp vec4 baseColor = vec4(linear(albedoMetal.rgb), 1.0) * vColor * uColorFactor;
+#endif // THREE_TEX
+
+  // The value of uOpaque and uMask can be 0.0 or 1.0.
+  // If uMask is 1.0, a Pixel that has bigger alpha than uAlphaThreashold becomes fully opaque,
+  // and, a pixel that has smaller alpha than uAlphaThreashold becomes fully transparent.
+  // If uOpaque is 1.0, alpha value of final color is 1.0;
+  // https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#_material_alphamode
+  if(uMask > 0.5 && baseColor.a < uAlphaThreshold)
+  {
+    discard;
+  }
+}
\ No newline at end of file
diff --git a/dali-scene3d/internal/graphics/shaders/shadow-map-shader.vert b/dali-scene3d/internal/graphics/shaders/shadow-map-shader.vert
new file mode 100644
index 0000000..c0a873d
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/shadow-map-shader.vert
@@ -0,0 +1,165 @@
+
+#define ADD_EXTRA_SKINNING_ATTRIBUTES
+#define ADD_EXTRA_WEIGHTS
+
+precision highp float;
+
+INPUT vec3 aPosition;
+INPUT vec2 aTexCoord;
+INPUT vec4 aVertexColor;
+
+#ifdef SL_VERSION_LOW
+INPUT float aVertexID;
+#endif
+
+#ifdef SKINNING
+INPUT vec4 aJoints0;
+INPUT vec4 aWeights0;
+ADD_EXTRA_SKINNING_ATTRIBUTES;
+#endif
+
+#ifdef MORPH
+uniform highp sampler2D sBlendShapeGeometry;
+#ifdef SL_VERSION_LOW
+uniform int uBlendShapeGeometryWidth;
+uniform int uBlendShapeGeometryHeight;
+#endif
+#endif
+
+OUTPUT mediump vec2 vUV;
+OUTPUT lowp vec4 vColor;
+
+uniform highp mat4 uViewMatrix;
+uniform highp mat4 uModelMatrix;
+uniform highp mat4 uProjection;
+
+#ifdef SKINNING
+
+#ifdef SL_VERSION_LOW
+#define MAX_BONES 80
+uniform mat4 uBone[MAX_BONES];
+#else
+#define MAX_BONES 256
+layout(std140) uniform Bones
+{
+  mat4 uBone[MAX_BONES];
+};
+#endif
+
+uniform mediump vec3 uYDirection;
+#endif
+
+#ifdef MORPH
+#define MAX_BLEND_SHAPE_NUMBER 256
+uniform int uNumberOfBlendShapes;                                         ///< Total number of blend shapes loaded.
+uniform highp float uBlendShapeWeight[MAX_BLEND_SHAPE_NUMBER];            ///< The weight of each blend shape.
+#ifdef MORPH_VERSION_2_0
+uniform highp float uBlendShapeUnnormalizeFactor;                         ///< Factor used to unnormalize the geometry of the blend shape.
+#else
+uniform highp float uBlendShapeUnnormalizeFactor[MAX_BLEND_SHAPE_NUMBER]; ///< Factor used to unnormalize the geometry of the blend shape.
+#endif
+uniform highp int uBlendShapeComponentSize;                               ///< The size in the texture of either the vertices, normals or tangents. Used to calculate the offset to address them.
+#endif
+
+uniform highp mat4 uShadowLightViewProjectionMatrix;
+
+void main()
+{
+  highp vec4 position = vec4(aPosition, 1.0);
+
+#ifdef MORPH
+
+#ifdef SL_VERSION_LOW
+  int width = uBlendShapeGeometryWidth;
+#else
+  int width = textureSize( sBlendShapeGeometry, 0 ).x;
+#endif
+
+  highp int blendShapeBufferOffset = 0;
+
+#ifdef SL_VERSION_LOW
+  highp float blendShapeWidth = float(uBlendShapeGeometryWidth);
+  highp float blendShapeHeight = float(uBlendShapeGeometryHeight);
+  highp float invertBlendShapeWidth = 1.0 / blendShapeWidth;
+  highp float invertBlendShapeHeight = 1.0 / blendShapeHeight;
+#endif
+
+  for( int index = 0; index < uNumberOfBlendShapes; ++index )
+  {
+    highp vec3 diff = vec3(0.0);
+    highp int vertexId = 0;
+    highp int x = 0;
+    highp int y = 0;
+    highp float weight = clamp(uBlendShapeWeight[index], 0.0, 1.0);
+
+#ifdef MORPH_POSITION
+    // Calculate the index to retrieve the geometry from the texture.
+#ifdef SL_VERSION_LOW
+    vertexId = int(floor(aVertexID + 0.5)) + blendShapeBufferOffset;
+    y = vertexId / width;
+    x = vertexId - y * width;
+#else
+    vertexId = gl_VertexID + blendShapeBufferOffset;
+    x = vertexId % width;
+    y = vertexId / width;
+#endif
+
+    // Retrieves the blend shape geometry from the texture, unnormalizes it and multiply by the weight.
+    if( 0.0 != uBlendShapeWeight[index] )
+    {
+#ifdef MORPH_VERSION_2_0
+       highp float unnormalizeFactor = uBlendShapeUnnormalizeFactor;
+#else
+       highp float unnormalizeFactor = uBlendShapeUnnormalizeFactor[index];
+#endif
+
+#ifdef SL_VERSION_LOW
+      highp float floatX = float(x) + 0.5;
+      highp float floatY = float(y) + 0.5;
+      diff = weight * unnormalizeFactor * ( texture2D( sBlendShapeGeometry, vec2(floatX * invertBlendShapeWidth, floatY * invertBlendShapeHeight) ).xyz - 0.5 );
+#else
+      diff = weight * unnormalizeFactor * ( texelFetch( sBlendShapeGeometry, ivec2(x, y), 0 ).xyz - 0.5 );
+#endif
+    }
+
+    position.xyz += diff;
+
+    blendShapeBufferOffset += uBlendShapeComponentSize;
+#endif
+
+#ifdef MORPH_NORMAL
+    blendShapeBufferOffset += uBlendShapeComponentSize;
+#endif
+
+#ifdef MORPH_TANGENT
+    blendShapeBufferOffset += uBlendShapeComponentSize;
+#endif
+  }
+
+#endif
+
+#ifdef SKINNING
+  highp mat4 bone = uBone[int(aJoints0.x)] * aWeights0.x +
+    uBone[int(aJoints0.y)] * aWeights0.y +
+    uBone[int(aJoints0.z)] * aWeights0.z +
+    uBone[int(aJoints0.w)] * aWeights0.w;
+
+  ADD_EXTRA_WEIGHTS;
+
+  position = bone * position;
+  highp vec4 positionW = position;
+#else
+  highp vec4 positionW = uModelMatrix * position;
+#endif
+
+  // To synchronize View-Projection matrix with pbr shader
+  gl_Position = uShadowLightViewProjectionMatrix * positionW;
+
+#ifdef FLIP_V
+  vUV = vec2(aTexCoord.x, 1.0 - aTexCoord.y);
+#else
+  vUV = aTexCoord;
+#endif
+
+  vColor = aVertexColor;
+}
diff --git a/dali-scene3d/internal/graphics/shaders/skybox-equirectangular-shader.frag b/dali-scene3d/internal/graphics/shaders/skybox-equirectangular-shader.frag
new file mode 100644
index 0000000..c57c608
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/skybox-equirectangular-shader.frag
@@ -0,0 +1,38 @@
+// Fragment shader for a skybox in equirectangular projection
+precision mediump float;
+
+uniform sampler2D uSkyBoxEquirectangularTexture;
+
+uniform vec4  uColor;
+uniform float uIntensity;
+
+varying vec3 vTexCoord;
+
+// Take the sample direction as interpolated from the cube's local position,
+// and use this direction vector and the spherical to cartesian coordinate
+// conversion to sample the equirectangular map as if it's a cube map.
+
+const float M_1_PI = 0.3183; // The reciprocal of pi in radians
+const float M_1_2PI = 0.1591; // The reciprocal of 2*pi in radians
+
+const vec2 inverseAtan = vec2(M_1_2PI, M_1_PI);
+
+vec2 SampleEquirectangularMapAsCubeMap(vec3 v)
+{
+    vec2 uv = vec2(atan(v.z, v.x), asin(v.y));
+    uv *= inverseAtan;
+    uv += 0.5;
+    return uv;
+}
+
+void main()
+{
+  // Project the equirectangular map to a cube's faces
+  vec2 uv = SampleEquirectangularMapAsCubeMap(normalize(vTexCoord));
+
+  // Flip the texture UVs vertically
+  vec2 uvFlippped = vec2(uv.x, 1.0 - uv.y);
+
+  vec4 texColor = texture2D( uSkyBoxEquirectangularTexture, uvFlippped ) * uIntensity;
+  gl_FragColor = texColor * uColor;
+}
diff --git a/dali-scene3d/internal/graphics/shaders/skybox-shader.frag b/dali-scene3d/internal/graphics/shaders/skybox-shader.frag
new file mode 100644
index 0000000..7bf6e42
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/skybox-shader.frag
@@ -0,0 +1,10 @@
+uniform samplerCube   uSkyBoxTexture;
+uniform lowp    vec4  uColor;
+uniform mediump float uIntensity;
+varying mediump vec3  vTexCoord;
+
+void main()
+{
+  mediump vec4 texColor = textureCube(uSkyBoxTexture, vTexCoord) * uIntensity;
+  gl_FragColor = texColor * uColor;
+}
\ No newline at end of file
diff --git a/dali-scene3d/internal/graphics/shaders/skybox-shader.vert b/dali-scene3d/internal/graphics/shaders/skybox-shader.vert
new file mode 100644
index 0000000..944bbb0
--- /dev/null
+++ b/dali-scene3d/internal/graphics/shaders/skybox-shader.vert
@@ -0,0 +1,21 @@
+attribute mediump vec3 aPosition;
+uniform   mediump mat4 uModelView;
+uniform   mediump mat4 uModelMatrix;
+uniform   mediump mat4 uViewMatrix;
+uniform   mediump mat4 uProjection;
+uniform   mediump mat4 uMvpMatrix;
+varying   mediump vec3 vTexCoord;
+
+void main()
+{
+  vTexCoord.x = aPosition.x;
+  vTexCoord.y = -aPosition.y; // convert to GL coords
+  vTexCoord.z = aPosition.z;
+
+  mediump vec4 vertexPosition = vec4(aPosition, 1.0);
+  vec4 clipSpacePosition = uProjection * mat4(mat3(uModelView)) * vertexPosition;
+  // Writes 1.0, the maximum depth value, into the depth buffer.
+  // This is an optimization to avoid running the fragment shader
+  // for the pixels hidden by the scene's objects.
+  gl_Position = clipSpacePosition.xyww;
+}
\ No newline at end of file
diff --git a/dali-scene3d/internal/light/light-impl.cpp b/dali-scene3d/internal/light/light-impl.cpp
new file mode 100644
index 0000000..e43986c
--- /dev/null
+++ b/dali-scene3d/internal/light/light-impl.cpp
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/light/light-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/controls/scene-view/scene-view-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+static constexpr uint32_t         MAX_NUMBER_OF_LIGHT = 5;
+static constexpr std::string_view LIGHT_COUNT_STRING("uLightCount");
+static constexpr std::string_view LIGHT_DIRECTION_STRING("uLightDirection");
+static constexpr std::string_view LIGHT_COLOR_STRING("uLightColor");
+static constexpr std::string_view SHADOW_ENABLED_STRING("uIsShadowEnabled");
+static constexpr std::string_view SHADOW_VIEW_PROJECTION_MATRIX_STRING("uShadowLightViewProjectionMatrix");
+
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::Light::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::Light, Dali::CustomActor, Create);
+DALI_TYPE_REGISTRATION_END()
+} // unnamed namespace
+
+Dali::Scene3D::Light Light::New()
+{
+  // Create the implementation, temporarily owned on stack
+  IntrusivePtr<Light> nodeImpl = new Light();
+
+  // Pass ownership to handle
+  Scene3D::Light handle(*nodeImpl);
+
+  // Second-phase init of the implementation
+  // This can only be done after the CustomActor connection has been made...
+  nodeImpl->Initialize();
+
+  return handle;
+}
+
+Light::Light()
+: Control(static_cast<ControlBehaviour>(ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS | ActorFlags::DISABLE_SIZE_NEGOTIATION))
+{
+}
+
+Light::~Light()
+{
+}
+
+// From Internal::Control.
+
+void Light::OnInitialize()
+{
+  Actor self = Self();
+
+  // TODO : We need to check this is enough.
+  Toolkit::DevelControl::EnableCreateAccessible(Toolkit::Control::DownCast(self), false);
+
+  self.SetProperty(Dali::Actor::Property::COLOR, Color::WHITE);
+
+  // Directional Light setting
+  mLightSourceActor = Dali::CameraActor::New();
+  mLightSourceActor.SetProjectionMode(Dali::Camera::ORTHOGRAPHIC_PROJECTION);
+  mLightSourceActor.SetProperty(Dali::Actor::Property::POSITION, Vector3::ZERO);
+  mLightSourceActor.SetProperty(Dali::Actor::Property::ORIENTATION, Quaternion());
+  self.Add(mLightSourceActor);
+}
+
+// From CustomActorImpl.
+
+void Light::OnSceneConnection(int depth)
+{
+  Actor parent = Self().GetParent();
+  while(parent)
+  {
+    Scene3D::SceneView sceneView = Scene3D::SceneView::DownCast(parent);
+    if(sceneView)
+    {
+      mParentSceneView = sceneView;
+      if(mIsEnabled)
+      {
+        GetImpl(sceneView).AddLight(Scene3D::Light::DownCast(Self()));
+      }
+      if(mIsShadowEnabled)
+      {
+        GetImpl(sceneView).SetShadow(Scene3D::Light::DownCast(Self()));
+      }
+      break;
+    }
+    parent = parent.GetParent();
+  }
+}
+
+void Light::OnSceneDisconnection()
+{
+  Scene3D::SceneView sceneView = mParentSceneView.GetHandle();
+  if(sceneView)
+  {
+    mParentSceneView.Reset();
+    GetImpl(sceneView).RemoveLight(Scene3D::Light::DownCast(Self()));
+  }
+}
+
+void Light::OnChildAdd(Actor& child)
+{
+}
+
+void Light::OnChildRemove(Actor& child)
+{
+}
+
+void Light::OnSizeSet(const Vector3& targetSize)
+{
+}
+
+void Light::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
+{
+  // @todo size negotiate background to new size, animate as well?
+}
+
+void Light::OnRelayout(const Vector2& size, RelayoutContainer& container)
+{
+}
+
+void Light::OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension)
+{
+}
+
+Vector3 Light::GetNaturalSize()
+{
+  return Vector3::ZERO;
+}
+
+float Light::CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension)
+{
+  return 0.0f;
+}
+
+float Light::GetHeightForWidth(float width)
+{
+  return 0.0f;
+}
+
+float Light::GetWidthForHeight(float height)
+{
+  return 0.0f;
+}
+
+bool Light::RelayoutDependentOnChildren(Dimension::Type dimension)
+{
+  return false;
+}
+
+void Light::OnCalculateRelayoutSize(Dimension::Type dimension)
+{
+}
+
+void Light::OnLayoutNegotiated(float size, Dimension::Type dimension)
+{
+}
+
+Light& GetImplementation(Dali::Scene3D::Light& handle)
+{
+  CustomActorImpl& customInterface = handle.GetImplementation();
+  Light&           impl            = dynamic_cast<Internal::Light&>(customInterface);
+  return impl;
+}
+
+const Light& GetImplementation(const Dali::Scene3D::Light& handle)
+{
+  const CustomActorImpl& customInterface = handle.GetImplementation();
+  // downcast to control
+  const Light& impl = dynamic_cast<const Internal::Light&>(customInterface);
+  return impl;
+}
+
+// Public Method
+
+void Light::Enable(bool enable)
+{
+  if(enable == mIsEnabled)
+  {
+    return;
+  }
+  mIsEnabled = enable;
+
+  Scene3D::SceneView sceneView = mParentSceneView.GetHandle();
+  if(!sceneView)
+  {
+    return;
+  }
+
+  if(mIsEnabled)
+  {
+    GetImpl(sceneView).AddLight(Scene3D::Light::DownCast(Self()));
+  }
+  else
+  {
+    GetImpl(sceneView).RemoveLight(Scene3D::Light::DownCast(Self()));
+  }
+}
+
+bool Light::IsEnabled() const
+{
+  return mIsEnabled;
+}
+
+void Light::EnableShadow(bool enable)
+{
+  if(enable == mIsShadowEnabled)
+  {
+    return;
+  }
+  mIsShadowEnabled = enable;
+
+  Scene3D::SceneView sceneView = mParentSceneView.GetHandle();
+  if(!sceneView)
+  {
+    return;
+  }
+
+  if(mIsShadowEnabled)
+  {
+    GetImpl(sceneView).SetShadow(Scene3D::Light::DownCast(Self()));
+  }
+  else
+  {
+    GetImpl(sceneView).RemoveShadow(Scene3D::Light::DownCast(Self()));
+  }
+}
+
+bool Light::IsShadowEnabled() const
+{
+  return mIsShadowEnabled;
+}
+
+CameraActor Light::GetCamera() const
+{
+  return mLightSourceActor;
+}
+
+void Light::EnableShadowSoftFiltering(bool useSoftFiltering)
+{
+  mUseSoftFiltering = useSoftFiltering;
+  UpdateShadowUniforms();
+}
+
+bool Light::IsShadowSoftFilteringEnabled() const
+{
+  return mUseSoftFiltering;
+}
+
+void Light::SetShadowIntensity(float shadowIntensity)
+{
+  mShadowIntensity = shadowIntensity;
+  UpdateShadowUniforms();
+}
+
+float Light::GetShadowIntensity() const
+{
+  return mShadowIntensity;
+}
+
+void Light::SetShadowBias(float shadowBias)
+{
+  mShadowBias = shadowBias;
+  UpdateShadowUniforms();
+}
+
+float Light::GetShadowBias() const
+{
+  return mShadowBias;
+}
+
+// Public Static Method
+
+uint32_t Light::GetMaximumEnabledLightCount()
+{
+  return MAX_NUMBER_OF_LIGHT;
+}
+
+std::string_view Light::GetLightCountUniformName()
+{
+  return LIGHT_COUNT_STRING;
+}
+
+std::string_view Light::GetLightDirectionUniformName()
+{
+  return LIGHT_DIRECTION_STRING;
+}
+
+std::string_view Light::GetLightColorUniformName()
+{
+  return LIGHT_COLOR_STRING;
+}
+
+std::string_view Light::GetShadowEnabledUniformName()
+{
+  return SHADOW_ENABLED_STRING;
+}
+
+std::string_view Light::GetShadowViewProjectionMatrixUniformName()
+{
+  return SHADOW_VIEW_PROJECTION_MATRIX_STRING;
+}
+
+// Private Method
+
+void Light::UpdateShadowUniforms()
+{
+  Scene3D::SceneView sceneView = mParentSceneView.GetHandle();
+  if(!sceneView)
+  {
+    return;
+  }
+
+  if(mIsShadowEnabled)
+  {
+    GetImpl(sceneView).UpdateShadowUniform(Scene3D::Light::DownCast(Self()));
+  }
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/internal/light/light-impl.h b/dali-scene3d/internal/light/light-impl.h
new file mode 100644
index 0000000..6f0ff24
--- /dev/null
+++ b/dali-scene3d/internal/light/light-impl.h
@@ -0,0 +1,305 @@
+#ifndef DALI_SCENE3D_LIGHT_IMPL_H
+#define DALI_SCENE3D_LIGHT_IMPL_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/object/weak-handle.h>
+#include <string_view>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <dali-scene3d/public-api/light/light.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+/**
+ * @addtogroup dali_scene3d_light
+ * @{
+ */
+
+namespace Internal
+{
+/**
+ * @brief This is the internal base class for custom node of Light.
+ *
+ * @SINCE_2_2.32
+ */
+class DALI_SCENE3D_API Light : public Toolkit::Internal::Control
+{
+public:
+  // Creation & Destruction
+  /**
+   * @brief Creates a new LightImpl instance that does not require touch by default.
+   *
+   * If touch is required, then the user can connect to this class' touch signal.
+   * @SINCE_2_2.32
+   * @return A handle to the Light instance
+   */
+  static Scene3D::Light New();
+
+protected:
+  /**
+   * @brief Virtual destructor.
+   * @SINCE_2_2.32
+   */
+  virtual ~Light();
+
+public: // From Internal::Control.
+  /**
+   * @copydoc Dali::Toolkit::Internal::Control::OnInitialize()
+   */
+  void OnInitialize() override;
+
+protected: // From CustomActorImpl. Note that it will make we can ignore many codes what Internal::Control using now.
+  /**
+   * @copydoc CustomActorImpl::OnSceneConnection()
+   * @note If overridden, then an up-call to Light::OnSceneConnection MUST be made at the end.
+   */
+  void OnSceneConnection(int depth) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSceneDisconnection()
+   * @note If overridden, then an up-call to Light::OnSceneDisconnection MUST be made at the end.
+   */
+  void OnSceneDisconnection() override;
+
+  /**
+   * @copydoc CustomActorImpl::OnChildAdd()
+   * @note If overridden, then an up-call to Light::OnChildAdd MUST be made at the end.
+   */
+  void OnChildAdd(Actor& child) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnChildRemove()
+   * @note If overridden, then an up-call to Light::OnChildRemove MUST be made at the end.
+   */
+  void OnChildRemove(Actor& child) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSizeSet()
+   * @note If overridden, then an up-call to Light::OnSizeSet MUST be made at the end.
+   */
+  void OnSizeSet(const Vector3& targetSize) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSizeAnimation()
+   * @note If overridden, then an up-call to Light::OnSizeAnimation MUST be made at the end.
+   */
+  void OnSizeAnimation(Animation& animation, const Vector3& targetSize) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnRelayout()
+   */
+  void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSetResizePolicy()
+   */
+  void OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension) override;
+
+  /**
+   * @copydoc CustomActorImpl::GetNaturalSize()
+   */
+  Vector3 GetNaturalSize() override;
+
+  /**
+   * @copydoc CustomActorImpl::CalculateChildSize()
+   */
+  float CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension) override;
+
+  /**
+   * @copydoc CustomActorImpl::GetHeightForWidth()
+   */
+  float GetHeightForWidth(float width) override;
+
+  /**
+   * @copydoc CustomActorImpl::GetWidthForHeight()
+   */
+  float GetWidthForHeight(float height) override;
+
+  /**
+   * @copydoc CustomActorImpl::RelayoutDependentOnChildren()
+   */
+  bool RelayoutDependentOnChildren(Dimension::Type dimension = Dimension::ALL_DIMENSIONS) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnCalculateRelayoutSize()
+   */
+  void OnCalculateRelayoutSize(Dimension::Type dimension) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnLayoutNegotiated()
+   */
+  void OnLayoutNegotiated(float size, Dimension::Type dimension) override;
+
+protected:
+  // Construction
+
+  /**
+   * @brief Light constructor.
+   */
+  Light();
+
+public: // Public Method
+  /**
+   * @copydoc Scene3D::Light::Enable()
+   */
+  void Enable(bool enable);
+
+  /**
+   * @copydoc Scene3D::Light::IsEnabled()
+   */
+  bool IsEnabled() const;
+
+  /**
+   * @copydoc Scene3D::Light::EnableShadow()
+   */
+  void EnableShadow(bool enable);
+
+  /**
+   * @copydoc Scene3D::Light::IsShadowEnabled()
+   */
+  bool IsShadowEnabled() const;
+
+  /**
+   * @copydoc Scene3D::Light::GetCamera()
+   */
+  CameraActor GetCamera() const;
+
+  /**
+   * @copydoc Scene3D::Light::EnableShadowSoftFiltering()
+   */
+  void EnableShadowSoftFiltering(bool useSoftFiltering);
+
+  /**
+   * @copydoc Scene3D::Light::IsShadowSoftFilteringEnabled()
+   */
+  bool IsShadowSoftFilteringEnabled() const;
+
+  /**
+   * @copydoc Scene3D::Light::SetShadowIntensity()
+   */
+  void SetShadowIntensity(float shadowIntensity);
+
+  /**
+   * @copydoc Scene3D::Light::GetShadowIntensity()
+   */
+  float GetShadowIntensity() const;
+
+  /**
+   * @copydoc Scene3D::Light::SetShadowBias()
+   */
+  void SetShadowBias(float shadowBias);
+
+  /**
+   * @copydoc Scene3D::Light::GetShadowBias()
+   */
+  float GetShadowBias() const;
+
+public: // Public Static Method
+  /**
+   * @copydoc Scene3D::Light::GetMaximumEnabledLightCount()
+   */
+  static uint32_t GetMaximumEnabledLightCount();
+
+  /**
+   * @brief Retrieves Light Enabled Uniform Name for shader()
+   * @return string_view for LightEnabledUniformName
+   */
+  static std::string_view GetLightCountUniformName();
+
+  /**
+   * @brief Retrieves Light Direction Uniform Name for shader()
+   * @return string_view for LightDirectionUniformName
+   */
+  static std::string_view GetLightDirectionUniformName();
+
+  /**
+   * @brief Retrieves Light Color Uniform Name for shader()
+   * @return string_view for LightColorUniformName
+   */
+  static std::string_view GetLightColorUniformName();
+
+  /**
+   * @brief Retrieves Uniform Name to define shadow is enabled or not.
+   * @return string_view for ShadowEnabledUniformName
+   */
+  static std::string_view GetShadowEnabledUniformName();
+
+  /**
+   * @brief Retrieves Uniform Name for View/Projection matrix of the Shadow.
+   * @return string_view for ShadowViewProjectionMatrixUniformName
+   */
+  static std::string_view GetShadowViewProjectionMatrixUniformName();
+
+private:
+  void UpdateShadowUniforms();
+
+private:
+  /// @cond internal
+
+  // Not copyable or movable
+  DALI_INTERNAL Light(const Light&) = delete;            ///< Deleted copy constructor.
+  DALI_INTERNAL Light(Light&&)      = delete;            ///< Deleted move constructor.
+  DALI_INTERNAL Light& operator=(const Light&) = delete; ///< Deleted copy assignment operator.
+  DALI_INTERNAL Light& operator=(Light&&) = delete;      ///< Deleted move assignment operator.
+
+private:
+  Dali::CameraActor              mLightSourceActor;
+  WeakHandle<Scene3D::SceneView> mParentSceneView;
+  bool                           mIsEnabled{true};
+  bool                           mIsShadowEnabled{false};
+  bool                           mUseSoftFiltering{false};
+  float                          mShadowIntensity{0.5f};
+  float                          mShadowBias{0.001f};
+  /// @endcond
+};
+
+/**
+ * @brief Gets implementation from the handle.
+ *
+ * @param handle
+ * @return Implementation
+ * @pre handle is initialized and points to a node
+ */
+DALI_SCENE3D_API Internal::Light& GetImplementation(Dali::Scene3D::Light& handle);
+
+/**
+ * @brief Gets implementation from the handle.
+ *
+ * @param handle
+ * @return Implementation
+ * @pre Handle is initialized and points to a node.
+ */
+DALI_SCENE3D_API const Internal::Light& GetImplementation(const Dali::Scene3D::Light& handle);
+
+} // namespace Internal
+
+/**
+ * @}
+ */
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_LIGHT_IMPL_H
diff --git a/dali-scene3d/internal/loader/dli-loader-impl.cpp b/dali-scene3d/internal/loader/dli-loader-impl.cpp
new file mode 100644
index 0000000..6cdb1c4
--- /dev/null
+++ b/dali-scene3d/internal/loader/dli-loader-impl.cpp
@@ -0,0 +1,1868 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/loader/dli-loader-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/builder/json-parser.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/property-array.h>
+
+#include <algorithm>
+#include <cmath>
+#include <filesystem>
+#include <fstream>
+#include <limits>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/json-util.h>
+#include <dali-scene3d/public-api/loader/alpha-function-helper.h>
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+#include <dali-scene3d/public-api/loader/camera-parameters.h>
+#include <dali-scene3d/public-api/loader/ktx-loader.h>
+#include <dali-scene3d/public-api/loader/light-parameters.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/parse-renderer-state.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-scene3d/public-api/loader/skinning-details.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+#define DLI_0_1_COMPATIBILITY
+
+namespace Dali
+{
+using namespace Toolkit;
+
+namespace Scene3D
+{
+namespace Loader
+{
+namespace Internal
+{
+namespace rs = RendererState;
+
+namespace
+{
+const char* NODES  = "nodes";
+const char* SCENES = "scenes";
+const char* NODE   = "node";
+const char* URI    = "uri";
+const char* URL    = "url";
+const char* HINTS  = "hints";
+const char* NAME("name");
+const char* BLEND_SHAPE_HEADER("blendShapeHeader");
+const char* BLEND_SHAPES("blendShapes");
+const char* BLEND_SHAPE_VERSION_1_0("1.0");
+const char* BLEND_SHAPE_VERSION_2_0("2.0");
+const char* VERSION("version");
+
+const char* const SHADOW_MAP_SIZE   = "shadowMapSize";
+const char* const ORTHOGRAPHIC_SIZE = "orthographicSize";
+const char* const PIXEL_UNITS       = "px";
+
+const char SLASH = '/';
+
+void ReadModelTransform(const TreeNode* node, Quaternion& orientation, Vector3& translation, Vector3& scale)
+{
+  float num[16u] = {.0f};
+
+  if(ReadVector(node->GetChild("matrix"), num, 16u))
+  {
+    Matrix mat(num);
+    mat.GetTransformComponents(translation, orientation, scale);
+  }
+  else
+  {
+    if(ReadVector(node->GetChild("angle"), num, 3u))
+    {
+      orientation = Quaternion(Radian(Degree(num[0u])), Radian(Degree(num[1u])), Radian(Degree(num[2u])));
+    }
+
+    if(ReadVector(node->GetChild("position"), num, 3u))
+    {
+      translation = Vector3(num);
+    }
+  }
+}
+
+bool ReadAttribBlob(const TreeNode* node, MeshDefinition::Blob& buffer)
+{
+  return ReadBlob(node, buffer.mOffset, buffer.mLength);
+}
+
+bool ReadAttribAccessor(const TreeNode* node, MeshDefinition::Accessor& accessor)
+{
+  return ReadBlob(node, accessor.mBlob.mOffset, accessor.mBlob.mLength);
+}
+
+bool ReadColorCode(const TreeNode* node, Vector4& color, DliInputParameter::ConvertColorCode convertColorCode)
+{
+  if(!node || !convertColorCode)
+  {
+    return false;
+  }
+
+  color = convertColorCode(node->GetString());
+
+  return true;
+}
+
+bool ReadColorCodeOrColor(const TreeNode* node, Vector4& color, DliInputParameter::ConvertColorCode convertColorCode)
+{
+  return ReadColorCode(node->GetChild("colorCode"), color, convertColorCode) ||
+         ReadColor(node->GetChild("color"), color);
+}
+
+RendererState::Type ReadRendererState(const TreeNode& tnRendererState)
+{
+  if(tnRendererState.GetType() == TreeNode::INTEGER)
+  {
+    return static_cast<RendererState::Type>(tnRendererState.GetInteger());
+  }
+  else if(tnRendererState.GetType() == TreeNode::STRING)
+  {
+    return RendererState::Parse(tnRendererState.GetString());
+  }
+  else
+  {
+    return -1;
+  }
+}
+
+///@brief Reads arc properties.
+void ReadArcField(const TreeNode* eArc, ArcRenderable& arc)
+{
+  ReadBool(eArc->GetChild("antiAliasing"), arc.mAntiAliasing);
+  ReadInt(eArc->GetChild("arcCaps"), arc.mArcCaps);
+  ReadFloat(eArc->GetChild("radius"), arc.mRadius);
+
+  arc.mStartAngleDegrees = .0f;
+  ReadFloat(eArc->GetChild("startAngle"), arc.mStartAngleDegrees);
+
+  arc.mEndAngleDegrees = .0f;
+  ReadFloat(eArc->GetChild("endAngle"), arc.mEndAngleDegrees);
+}
+
+const TreeNode* GetNthChild(const TreeNode* node, uint32_t index)
+{
+  uint32_t i = 0;
+  for(TreeNode::ConstIterator it = (*node).CBegin(); it != (*node).CEnd(); ++it, ++i)
+  {
+    if(i == index)
+    {
+      return &((*it).second);
+    }
+  }
+  return NULL;
+}
+
+const TreeNode* RequireChild(const TreeNode* node, const std::string& childName)
+{
+  auto child = node->GetChild(childName);
+  if(!child)
+  {
+    ExceptionFlinger flinger(ASSERT_LOCATION);
+    flinger << "Failed to find child node '" << childName << "'";
+    if(auto nodeName = node->GetName())
+    {
+      flinger << " on '" << nodeName << "'";
+    }
+    flinger << ".";
+  }
+  return child;
+}
+
+void ParseProperties(const Toolkit::TreeNode& node, Property::Array& array);
+
+void ParseProperties(const Toolkit::TreeNode& node, Property::Map& map)
+{
+  DALI_ASSERT_DEBUG(node.GetType() == TreeNode::OBJECT);
+  for(auto i0 = node.CBegin(), i1 = node.CEnd(); i0 != i1; ++i0)
+  {
+    auto kv = *i0;
+    switch(kv.second.GetType())
+    {
+      case TreeNode::ARRAY:
+      {
+        Property::Array array;
+        ParseProperties(kv.second, array);
+        map.Insert(kv.first, array);
+        break;
+      }
+
+      case TreeNode::OBJECT:
+      {
+        Property::Map innerMap;
+        ParseProperties(kv.second, innerMap);
+        map.Insert(kv.first, innerMap);
+        break;
+      }
+
+      case TreeNode::STRING:
+      {
+        map.Insert(kv.first, kv.second.GetString());
+        break;
+      }
+
+      case TreeNode::INTEGER:
+      {
+        map.Insert(kv.first, kv.second.GetInteger());
+        break;
+      }
+
+      case TreeNode::BOOLEAN:
+      {
+        map.Insert(kv.first, kv.second.GetBoolean());
+        break;
+      }
+
+      case TreeNode::FLOAT:
+      {
+        map.Insert(kv.first, kv.second.GetFloat());
+        break;
+      }
+
+      case TreeNode::IS_NULL:
+      {
+        break;
+      }
+    }
+  }
+}
+
+void ParseProperties(const Toolkit::TreeNode& node, Property::Array& array)
+{
+  DALI_ASSERT_DEBUG(node.GetType() == TreeNode::ARRAY);
+  for(auto i0 = node.CBegin(), i1 = node.CEnd(); i0 != i1; ++i0)
+  {
+    auto kv = *i0;
+    switch(kv.second.GetType())
+    {
+      case TreeNode::ARRAY:
+      {
+        Property::Array innerArray;
+        ParseProperties(kv.second, innerArray);
+        array.PushBack(innerArray);
+        break;
+      }
+
+      case TreeNode::OBJECT:
+      {
+        Property::Map map;
+        ParseProperties(kv.second, map);
+        array.PushBack(map);
+        break;
+      }
+
+      case TreeNode::STRING:
+      {
+        array.PushBack(kv.second.GetString());
+        break;
+      }
+
+      case TreeNode::INTEGER:
+      {
+        array.PushBack(kv.second.GetInteger());
+        break;
+      }
+
+      case TreeNode::BOOLEAN:
+      {
+        array.PushBack(kv.second.GetBoolean());
+        break;
+      }
+
+      case TreeNode::FLOAT:
+      {
+        array.PushBack(kv.second.GetFloat());
+        break;
+      }
+
+      case TreeNode::IS_NULL:
+      {
+        break;
+      }
+    }
+  }
+}
+
+} // namespace
+
+struct DliLoaderImpl::Impl
+{
+  StringCallback      mOnError = DefaultErrorCallback;
+  Toolkit::JsonParser mParser;
+
+  void ParseScene(LoadParams& params);
+
+private:
+  std::map<Index, Matrix> mInverseBindMatrices;
+
+  /**
+   * @brief Due to .dli nodes being processed in depth-first traversal with orphans being
+   *  ignored, features that rely on node indices (which is more compact and closer to
+   *  glTF) require a mapping from .dli node indices to those in the resulting SceneDefinition.
+   *  The index mapper is responsible for maintaing this mapping, and resolving node IDs
+   *  once the processing of the nodes has finished.
+   * @note The resolution requires the whole scene graph to finish parsing, therefore any
+   *  node extensions relying on node IDs will see the dli ID in their processor.
+   */
+  struct IIndexMapper
+  {
+    /**
+     * @brief Attempts to create a mapping from a node's @a dli index to its @a scene
+     *  index.
+     * @return Whether the operation was successful.
+     */
+    virtual bool Map(Index iDli, Index iScene) = 0;
+
+    /**
+     * @return The scene index for the node's @a dli index.
+     */
+    virtual Index Resolve(Index iDli) = 0;
+  };
+
+  /**
+   * @brief Traverses the DOM tree created by LoadDocument() in an attempt to create
+   *  an intermediate representation of resources and nodes.
+   */
+  void ParseSceneInternal(Index iScene, const Toolkit::TreeNode* tnScenes, const Toolkit::TreeNode* tnNodes, LoadParams& params);
+
+  void ParseSkeletons(const Toolkit::TreeNode* skeletons, Dali::Scene3D::Loader::SceneDefinition& scene, Dali::Scene3D::Loader::ResourceBundle& resources);
+  void ParseEnvironments(const Toolkit::TreeNode* environments, Dali::Scene3D::Loader::ResourceBundle& resources);
+  void ParseMaterials(const Toolkit::TreeNode* materials, DliInputParameter::ConvertColorCode convertColorCode, Dali::Scene3D::Loader::ResourceBundle& resources);
+
+  void ParseNodes(const Toolkit::TreeNode* nodes, Index index, LoadParams& params);
+  void ParseNodesInternal(const Toolkit::TreeNode* nodes, Index index, std::vector<Index>& inOutParentStack, LoadParams& params, IIndexMapper& indexMapper);
+
+  void ParseAnimations(const Toolkit::TreeNode* animations, LoadParams& params);
+  void ParseAnimationGroups(const Toolkit::TreeNode* animationGroups, LoadParams& params);
+
+  void ParseShaders(const Toolkit::TreeNode* shaders, Dali::Scene3D::Loader::ResourceBundle& resources);
+  void ParseMeshes(const Toolkit::TreeNode* meshes, Dali::Scene3D::Loader::ResourceBundle& resources);
+
+  void GetCameraParameters(std::vector<Dali::Scene3D::Loader::CameraParameters>& cameras) const;
+  void GetLightParameters(std::vector<Dali::Scene3D::Loader::LightParameters>& lights) const;
+};
+
+DliLoaderImpl::DliLoaderImpl()
+: mImpl{new Impl}
+{
+}
+
+DliLoaderImpl::~DliLoaderImpl() = default;
+
+void DliLoaderImpl::SetErrorCallback(StringCallback onError)
+{
+  mImpl->mOnError = onError;
+}
+
+bool DliLoaderImpl::LoadModel(const std::string& uri, Dali::Scene3D::Loader::LoadResult& result)
+{
+  std::string daliBuffer = LoadTextFile(uri.c_str());
+
+  auto& parser = mImpl->mParser;
+  parser       = JsonParser::New();
+  if(!parser.Parse(daliBuffer))
+  {
+    return false;
+  }
+
+  std::filesystem::path                    modelPath(uri);
+  Dali::Scene3D::Loader::DliInputParameter input;
+  LoadParams                               loadParams;
+  if(mInputParameter)
+  {
+    loadParams.input = static_cast<DliInputParameter*>(mInputParameter);
+  }
+  else
+  {
+    input.mAnimationsPath = std::string(modelPath.parent_path()) + "/";
+    loadParams.input      = &input;
+  }
+  loadParams.output = &result;
+
+  mImpl->ParseScene(loadParams);
+  return true;
+}
+
+std::string DliLoaderImpl::GetParseError() const
+{
+  std::stringstream stream;
+
+  auto& parser = mImpl->mParser;
+  if(parser.ParseError())
+  {
+    stream << "position: " << parser.GetErrorPosition() << ", line: " << parser.GetErrorLineNumber() << ", column: " << parser.GetErrorColumn() << ", description: " << parser.GetErrorDescription() << ".";
+  }
+
+  return stream.str();
+}
+
+void DliLoaderImpl::Impl::ParseScene(LoadParams& params)
+{
+  auto& input  = *params.input;
+  auto& output = *params.output;
+
+  // get index of root node.
+  auto docRoot = mParser.GetRoot();
+  if(docRoot)
+  {
+    // Process resources first - these are shared
+    if(auto environments = docRoot->GetChild("environment"))
+    {
+      ParseEnvironments(environments, output.mResources); // NOTE: must precede parsing of materials
+    }
+
+    if(auto meshes = docRoot->GetChild("meshes"))
+    {
+      ParseMeshes(meshes, output.mResources);
+    }
+
+    if(auto shaders = docRoot->GetChild("shaders"))
+    {
+      ParseShaders(shaders, output.mResources);
+    }
+
+    if(auto materials = docRoot->GetChild("materials"))
+    {
+      ParseMaterials(materials, input.mConvertColorCode, output.mResources);
+    }
+
+    for(auto& c : input.mPreNodeCategoryProcessors)
+    {
+      if(auto node = docRoot->GetChild(c.first))
+      {
+        Property::Array array;
+        ParseProperties(*node, array);
+        c.second(std::move(array), mOnError);
+      }
+    }
+
+    // Process scenes
+    Index iScene = 0; // default scene
+    ReadIndex(docRoot->GetChild("scene"), iScene);
+
+    auto tnScenes = RequireChild(docRoot, "scenes");
+    auto tnNodes  = RequireChild(docRoot, "nodes");
+    ParseSceneInternal(iScene, tnScenes, tnNodes, params);
+
+    ParseSkeletons(docRoot->GetChild("skeletons"), output.mScene, output.mResources);
+
+    output.mScene.EnsureUniqueSkinningShaderInstances(output.mResources);
+    output.mScene.EnsureUniqueBlendShapeShaderInstances(output.mResources);
+
+    // Ger cameras and lights
+    GetCameraParameters(output.mCameraParameters);
+    GetLightParameters(output.mLightParameters);
+
+    // Post-node processors and animations last
+    for(auto& c : input.mPostNodeCategoryProcessors)
+    {
+      if(auto node = docRoot->GetChild(c.first))
+      {
+        Property::Array array;
+        ParseProperties(*node, array);
+        c.second(std::move(array), mOnError);
+      }
+    }
+
+    if(auto animations = docRoot->GetChild("animations"))
+    {
+      ParseAnimations(animations, params);
+    }
+
+    if(!output.mAnimationDefinitions.empty())
+    {
+      if(auto animationGroups = docRoot->GetChild("animationGroups"))
+      {
+        ParseAnimationGroups(animationGroups, params);
+      }
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::ParseSceneInternal(Index iScene, const Toolkit::TreeNode* tnScenes, const Toolkit::TreeNode* tnNodes, LoadParams& params)
+{
+  auto getSceneRootIdx = [tnScenes, tnNodes](Index iScene) {
+    auto tn = GetNthChild(tnScenes, iScene); // now a "scene" object
+    if(!tn)
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << iScene << " is out of bounds access into " << SCENES << ".";
+    }
+
+    tn = RequireChild(tn, NODES); // now a "nodes" array
+    if(tn->GetType() != TreeNode::ARRAY)
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << SCENES << "[" << iScene << "]." << NODES << " has an invalid type; array required.";
+    }
+
+    if(tn->Size() < 1)
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << SCENES << "[" << iScene << "]." << NODES << " must define a node id.";
+    }
+
+    tn = GetNthChild(tn, 0); // now the first element of the array
+    Index iRootNode;
+    if(!ReadIndex(tn, iRootNode))
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << SCENES << "[" << iScene << "]." << NODES << " has an invalid value for root node index: '" << iRootNode << "'.";
+    }
+
+    if(iRootNode >= tnNodes->Size())
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Root node index << " << iRootNode << " of scene " << iScene << " is out of bounds.";
+    }
+
+    tn = GetNthChild(tnNodes, iRootNode); // now a "node" object
+    if(tn->GetType() != TreeNode::OBJECT)
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Root node of scene " << iScene << " is of invalid JSON type; object required";
+    }
+
+    return iRootNode;
+  };
+
+  Index iRootNode = getSceneRootIdx(iScene);
+  ParseNodes(tnNodes, iRootNode, params);
+
+  auto& scene = params.output->mScene;
+  scene.AddRootNode(0);
+
+  for(Index i = 0; i < iScene; ++i)
+  {
+    Index       iRootNode = getSceneRootIdx(i);
+    const Index iRoot     = scene.GetNodeCount();
+    ParseNodes(tnNodes, iRootNode, params);
+    scene.AddRootNode(iRoot);
+  }
+
+  auto numScenes = tnScenes->Size();
+  for(Index i = iScene + 1; i < numScenes; ++i)
+  {
+    Index       iRootNode = getSceneRootIdx(i);
+    const Index iRoot     = scene.GetNodeCount();
+    ParseNodes(tnNodes, iRootNode, params);
+    scene.AddRootNode(iRoot);
+  }
+}
+
+void DliLoaderImpl::Impl::ParseSkeletons(const TreeNode* skeletons, Dali::Scene3D::Loader::SceneDefinition& scene, Dali::Scene3D::Loader::ResourceBundle& resources)
+{
+  if(skeletons)
+  {
+    auto iStart = skeletons->CBegin();
+    for(auto i0 = iStart, i1 = skeletons->CEnd(); i0 != i1; ++i0)
+    {
+      auto&       node = (*i0).second;
+      std::string skeletonRootName;
+      if(ReadString(node.GetChild(NODE), skeletonRootName))
+      {
+        SkeletonDefinition skeleton;
+        if(!scene.FindNode(skeletonRootName, &skeleton.mRootNodeIdx))
+        {
+          ExceptionFlinger(ASSERT_LOCATION) << FormatString("Skeleton %d: node '%s' not defined.", resources.mSkeletons.size(), skeletonRootName.c_str());
+        }
+
+        uint32_t                   jointCount = 0;
+        std::function<void(Index)> visitFn;
+        auto&                      ibms = mInverseBindMatrices;
+        visitFn                         = [&](Index id) {
+          auto node = scene.GetNode(id);
+          jointCount += ibms.find(id) != ibms.end();
+
+          for(auto i : node->mChildren)
+          {
+            visitFn(i);
+          }
+        };
+        visitFn(skeleton.mRootNodeIdx);
+
+        if(jointCount > Skinning::MAX_JOINTS)
+        {
+          mOnError(FormatString("Skeleton %d: joint count exceeds supported limit.", resources.mSkeletons.size()));
+          jointCount = Skinning::MAX_JOINTS;
+        }
+
+        skeleton.mJoints.reserve(jointCount);
+
+        visitFn = [&](Index id) {
+          auto iFind = ibms.find(id);
+          if(iFind != ibms.end() && skeleton.mJoints.size() < Skinning::MAX_JOINTS)
+          {
+            skeleton.mJoints.push_back({id, iFind->second});
+          }
+
+          auto node = scene.GetNode(id);
+          for(auto i : node->mChildren)
+          {
+            visitFn(i);
+          }
+        };
+        visitFn(skeleton.mRootNodeIdx);
+
+        resources.mSkeletons.push_back(std::move(skeleton));
+      }
+      else
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "skeleton " << std::distance(iStart, i0) << ": Missing required attribute '" << NODE << "'.";
+      }
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::ParseEnvironments(const TreeNode* environments, Dali::Scene3D::Loader::ResourceBundle& resources)
+{
+  Matrix cubeOrientation(Matrix::IDENTITY);
+
+  for(auto i0 = environments->CBegin(), i1 = environments->CEnd(); i0 != i1; ++i0)
+  {
+    auto& node = (*i0).second;
+
+    EnvironmentDefinition envDef;
+    ReadString(node.GetChild("cubeSpecular"), envDef.mSpecularMapPath);
+    ReadString(node.GetChild("cubeDiffuse"), envDef.mDiffuseMapPath);
+    ToUnixFileSeparators(envDef.mSpecularMapPath);
+    ToUnixFileSeparators(envDef.mDiffuseMapPath);
+    envDef.mIblIntensity = 1.0f;
+    ReadFloat(node.GetChild("iblIntensity"), envDef.mIblIntensity);
+    if(ReadVector(node.GetChild("cubeInitialOrientation"), cubeOrientation.AsFloat(), 16u))
+    {
+      envDef.mCubeOrientation = Quaternion(cubeOrientation);
+    }
+
+    resources.mEnvironmentMaps.emplace_back(std::move(envDef), EnvironmentDefinition::Textures());
+  }
+
+  // NOTE: guarantees environmentMaps to have an empty environment.
+  if(resources.mEnvironmentMaps.empty())
+  {
+    resources.mEnvironmentMaps.emplace_back(EnvironmentDefinition(), EnvironmentDefinition::Textures());
+  }
+}
+
+void DliLoaderImpl::Impl::ParseShaders(const TreeNode* shaders, Dali::Scene3D::Loader::ResourceBundle& resources)
+{
+  uint32_t iShader = 0;
+  for(auto i0 = shaders->CBegin(), i1 = shaders->CEnd(); i0 != i1; ++i0, ++iShader)
+  {
+    auto&            node = (*i0).second;
+    ShaderDefinition shaderDef;
+    ReadStringVector(node.GetChild("defines"), shaderDef.mDefines);
+    auto sssIter = std::find_if(shaderDef.mDefines.begin(), shaderDef.mDefines.end(), [](std::string& item) { return (item == "SSS"); });
+    if(sssIter != shaderDef.mDefines.end())
+    {
+      shaderDef.mDefines.erase(sssIter);
+    }
+
+    // Read shader hints. Possible values are:
+    //                         Don't define for No hints.
+    // "OUTPUT_IS_TRANSPARENT" Might generate transparent alpha from opaque inputs.
+    //     "MODIFIES_GEOMETRY" Might change position of vertices, this option disables any culling optimizations.
+
+    ReadStringVector(node.GetChild(HINTS), shaderDef.mHints);
+
+    if(ReadString(node.GetChild("vertex"), shaderDef.mVertexShaderPath) &&
+       ReadString(node.GetChild("fragment"), shaderDef.mFragmentShaderPath))
+    {
+      ToUnixFileSeparators(shaderDef.mVertexShaderPath);
+      ToUnixFileSeparators(shaderDef.mFragmentShaderPath);
+
+      for(TreeNode::ConstIterator j0 = node.CBegin(), j1 = node.CEnd(); j0 != j1; ++j0)
+      {
+        const TreeNode::KeyNodePair& keyValue = *j0;
+        const std::string&           key      = keyValue.first;
+        const TreeNode&              value    = keyValue.second;
+
+        Property::Value uniformValue;
+        if(key.compare("vertex") == 0 || key.compare("fragment") == 0 || key.compare("defines") == 0 || key.compare(HINTS) == 0)
+        {
+          continue;
+        }
+        else if(key.compare("rendererState") == 0)
+        {
+          shaderDef.mRendererState = ReadRendererState(keyValue.second);
+        }
+        else if(value.GetType() == TreeNode::INTEGER || value.GetType() == TreeNode::FLOAT)
+        {
+          float f = 0.f;
+          ReadFloat(&value, f);
+          uniformValue = f;
+        }
+        else if(value.GetType() == TreeNode::BOOLEAN)
+        {
+          DALI_LOG_WARNING("\"bool\" uniforms are handled as floats in shader");
+          bool value = false;
+          if(ReadBool(&keyValue.second, value))
+          {
+            uniformValue = value ? 1.0f : 0.0f;
+          }
+        }
+        else
+          switch(auto size = GetNumericalArraySize(&value))
+          {
+            case 16:
+            {
+              Matrix m;
+              ReadVector(&value, m.AsFloat(), size);
+              uniformValue = m;
+              break;
+            }
+
+            case 9:
+            {
+              Matrix3 m;
+              ReadVector(&value, m.AsFloat(), size);
+              uniformValue = m;
+              break;
+            }
+
+            case 4:
+            {
+              Vector4 v;
+              ReadVector(&value, v.AsFloat(), size);
+              uniformValue = v;
+              break;
+            }
+
+            case 3:
+            {
+              Vector3 v;
+              ReadVector(&value, v.AsFloat(), size);
+              uniformValue = v;
+              break;
+            }
+
+            case 2:
+            {
+              Vector2 v;
+              ReadVector(&value, v.AsFloat(), size);
+              uniformValue = v;
+              break;
+            }
+
+            default:
+              mOnError(FormatString(
+                "shader %u: Ignoring uniform '%s': failed to infer type from %zu elements.",
+                iShader,
+                key.c_str(),
+                size));
+              break;
+          }
+
+        if(Property::NONE != uniformValue.GetType())
+        {
+          shaderDef.mUniforms.Insert(key, uniformValue);
+        }
+      }
+
+      resources.mShaders.emplace_back(std::move(shaderDef), Shader());
+    }
+    else
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "shader " << iShader << ": Missing vertex / fragment shader definition.";
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::ParseMeshes(const TreeNode* meshes, Dali::Scene3D::Loader::ResourceBundle& resources)
+{
+  for(auto i0 = meshes->CBegin(), i1 = meshes->CEnd(); i0 != i1; ++i0)
+  {
+    auto& node = (*i0).second;
+
+    MeshDefinition meshDef;
+    if(!ReadString(node.GetChild(URI), meshDef.mUri))
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "mesh " << resources.mMeshes.size() << ": Missing required attribute '" << URI << "'.";
+    }
+
+    ToUnixFileSeparators(meshDef.mUri);
+
+    std::string primitive;
+    if(ReadString(node.GetChild("primitive"), primitive))
+    {
+      if(primitive == "LINES")
+      {
+        meshDef.mPrimitiveType = Geometry::LINES;
+      }
+      else if(primitive == "POINTS")
+      {
+        meshDef.mPrimitiveType = Geometry::POINTS;
+      }
+      else if(primitive != "TRIANGLES")
+      {
+        mOnError(FormatString(
+          "mesh %d: Using TRIANGLES instead of unsupported primitive type '%s'.",
+          resources.mMeshes.size(),
+          primitive.c_str()));
+      }
+    }
+
+    int attributes;
+    if(ReadInt(node.GetChild("attributes"), attributes))
+    {
+      if(MaskMatch(attributes, MeshDefinition::INDICES) &&
+         !ReadAttribAccessor(node.GetChild("indices"), meshDef.mIndices))
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << FormatString("mesh %d: Failed to read %s.",
+                                                          resources.mMeshes.size(),
+                                                          "indices");
+      }
+
+      if(MaskMatch(attributes, MeshDefinition::POSITIONS) &&
+         !ReadAttribAccessor(node.GetChild("positions"), meshDef.mPositions))
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << FormatString("mesh %d: Failed to read %s.",
+                                                          resources.mMeshes.size(),
+                                                          "positions");
+      }
+
+      if(MaskMatch(attributes, MeshDefinition::NORMALS) &&
+         !ReadAttribAccessor(node.GetChild("normals"), meshDef.mNormals))
+      {
+        mOnError(FormatString("mesh %d: Failed to read %s.", resources.mMeshes.size(), "normals"));
+      }
+
+      if(MaskMatch(attributes, MeshDefinition::TEX_COORDS))
+      {
+        meshDef.mTexCoords.emplace_back(MeshDefinition::Accessor{});
+        if(!ReadAttribAccessor(node.GetChild("textures"), meshDef.mTexCoords[0]))
+        {
+          mOnError(FormatString("mesh %d: Failed to read %s.", resources.mMeshes.size(), "textures"));
+        }
+      }
+
+      if(MaskMatch(attributes, MeshDefinition::TANGENTS) &&
+         !ReadAttribAccessor(node.GetChild("tangents"), meshDef.mTangents))
+      {
+        mOnError(FormatString("mesh %d: Failed to read %s.", resources.mMeshes.size(), "tangents"));
+      }
+
+      // NOTE: we're no longer reading bitangents as these are calculated in the shaders.
+      if(ReadIndex(node.GetChild("skeleton"), meshDef.mSkeletonIdx))
+      {
+        if(!MaskMatch(attributes, MeshDefinition::JOINTS_0) &&
+           !MaskMatch(attributes, MeshDefinition::WEIGHTS_0))
+        {
+          mOnError(FormatString("mesh %d: Expected joints0 / weights0 attribute(s) missing.",
+                                resources.mMeshes.size()));
+        }
+        else
+        {
+          meshDef.mJoints.emplace_back(MeshDefinition::Accessor{});
+          meshDef.mWeights.emplace_back(MeshDefinition::Accessor{});
+          if(!ReadAttribAccessor(node.GetChild("joints0"), meshDef.mJoints[0]) ||
+             !ReadAttribAccessor(node.GetChild("weights0"), meshDef.mWeights[0]))
+          {
+            mOnError(FormatString("mesh %d: Failed to read skinning information.",
+                                  resources.mMeshes.size()));
+          }
+        }
+      }
+
+      if(auto blendshapeHeader = node.GetChild(BLEND_SHAPE_HEADER))
+      {
+        std::string blendShapeVersion;
+        ReadString(blendshapeHeader->GetChild(VERSION), blendShapeVersion);
+
+        if(0u == blendShapeVersion.compare(BLEND_SHAPE_VERSION_1_0))
+        {
+          meshDef.mBlendShapeVersion = BlendShapes::Version::VERSION_1_0;
+        }
+        else if(0u == blendShapeVersion.compare(BLEND_SHAPE_VERSION_2_0))
+        {
+          meshDef.mBlendShapeVersion = BlendShapes::Version::VERSION_2_0;
+        }
+
+        switch(meshDef.mBlendShapeVersion)
+        {
+          case BlendShapes::Version::VERSION_1_0:
+          case BlendShapes::Version::VERSION_2_0: // FALL THROUGH
+          {
+            ReadAttribBlob(blendshapeHeader, meshDef.mBlendShapeHeader);
+            break;
+          }
+          default:
+          {
+            // nothing to do
+            break;
+          }
+        }
+      }
+
+      if(auto blendShapes = node.GetChild(BLEND_SHAPES))
+      {
+        meshDef.mBlendShapes.resize(blendShapes->Size());
+
+        auto index = 0u;
+        for(auto it = blendShapes->CBegin(), endIt = blendShapes->CEnd(); it != endIt; ++it, ++index)
+        {
+          // Each blend shape is stored as the difference with the original mesh.
+
+          auto& blendShapeNode = (*it).second;
+
+          auto& blendShape = meshDef.mBlendShapes[index];
+          ReadString(blendShapeNode.GetChild("name"), blendShape.name);
+          if(auto position = blendShapeNode.GetChild("positions"))
+          {
+            ReadAttribAccessor(position, blendShape.deltas);
+          }
+          if(auto normals = blendShapeNode.GetChild("normals"))
+          {
+            ReadAttribAccessor(normals, blendShape.normals);
+          }
+          if(auto tangents = blendShapeNode.GetChild("tangents"))
+          {
+            ReadAttribAccessor(tangents, blendShape.tangents);
+          }
+          ReadFloat(blendShapeNode.GetChild("weight"), blendShape.weight);
+        }
+      }
+
+      bool flipV;
+      if(ReadBool(node.GetChild("flipV"), flipV))
+      {
+        meshDef.mFlags |= flipV * MeshDefinition::FLIP_UVS_VERTICAL;
+      }
+
+      resources.mMeshes.emplace_back(std::move(meshDef), MeshGeometry());
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::ParseMaterials(const TreeNode* materials, DliInputParameter::ConvertColorCode convertColorCode, Dali::Scene3D::Loader::ResourceBundle& resources)
+{
+  for(auto i0 = materials->CBegin(), i1 = materials->CEnd(); i0 != i1; ++i0)
+  {
+    auto& node = (*i0).second;
+
+    MaterialDefinition materialDef;
+    if(auto eEnvironment = node.GetChild("environment"))
+    {
+      ReadIndex(eEnvironment, materialDef.mEnvironmentIdx);
+      if(static_cast<unsigned int>(materialDef.mEnvironmentIdx) >= resources.mEnvironmentMaps.size())
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "material " << resources.mMaterials.size() << ": Environment index " << materialDef.mEnvironmentIdx << " out of bounds (" << resources.mEnvironmentMaps.size() << ").";
+      }
+    }
+
+    // TODO : need to consider AGIF
+    std::vector<std::string> texturePaths;
+    std::string              texturePath;
+    if(ReadString(node.GetChild("albedoMap"), texturePath))
+    {
+      ToUnixFileSeparators(texturePath);
+      const auto semantic = MaterialDefinition::ALBEDO;
+      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
+      materialDef.mFlags |= semantic | MaterialDefinition::TRANSPARENCY; // NOTE: only in dli does single / separate ALBEDO texture mean TRANSPARENCY.
+    }
+    if(ReadString(node.GetChild("albedoMetallicMap"), texturePath))
+    {
+      ToUnixFileSeparators(texturePath);
+
+      if(MaskMatch(materialDef.mFlags, MaterialDefinition::ALBEDO))
+      {
+        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "albedo"));
+      }
+
+      const auto semantic = MaterialDefinition::ALBEDO | MaterialDefinition::METALLIC;
+      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
+      materialDef.mFlags |= semantic;
+    }
+
+    if(ReadString(node.GetChild("metallicRoughnessMap"), texturePath))
+    {
+      ToUnixFileSeparators(texturePath);
+
+      if(MaskMatch(materialDef.mFlags, MaterialDefinition::METALLIC))
+      {
+        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "metallic"));
+      }
+
+      const auto semantic = MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS;
+      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
+      materialDef.mFlags |= semantic |
+                            // We have a metallic-roughhness map and the first texture did not have albedo semantics - we're in the transparency workflow.
+                            (MaskMatch(materialDef.mFlags, MaterialDefinition::ALBEDO) * MaterialDefinition::TRANSPARENCY);
+    }
+
+    if(ReadString(node.GetChild("normalMap"), texturePath))
+    {
+      ToUnixFileSeparators(texturePath);
+
+      const auto semantic = MaterialDefinition::NORMAL;
+      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
+      materialDef.mFlags |= semantic |
+                            // We have a standalone normal map and the first texture did not have albedo semantics - we're in the transparency workflow.
+                            (MaskMatch(materialDef.mFlags, MaterialDefinition::ALBEDO) * MaterialDefinition::TRANSPARENCY);
+    }
+
+    if(ReadString(node.GetChild("normalRoughnessMap"), texturePath))
+    {
+      ToUnixFileSeparators(texturePath);
+
+      if(MaskMatch(materialDef.mFlags, MaterialDefinition::NORMAL))
+      {
+        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "normal"));
+      }
+
+      if(MaskMatch(materialDef.mFlags, MaterialDefinition::ROUGHNESS))
+      {
+        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "roughness"));
+      }
+
+      if(MaskMatch(materialDef.mFlags, MaterialDefinition::TRANSPARENCY))
+      {
+        mOnError(FormatString("material %d: conflicting semantics; already set %s.", resources.mMaterials.size(), "transparency"));
+      }
+
+      const auto semantic = MaterialDefinition::NORMAL | MaterialDefinition::ROUGHNESS;
+      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
+      materialDef.mFlags |= semantic;
+    }
+
+    /// @TODO : Some dli shader don't implement this subsurfaceMp usage.
+    ///         To make visual test pass, Skip subsurfaceMap texture using
+    ///         until dli shaders are support it.
+    //    if(ReadString(node.GetChild("subsurfaceMap"), texturePath))
+    //    {
+    //      ToUnixFileSeparators(texturePath);
+    //
+    //      const auto semantic = MaterialDefinition::SUBSURFACE;
+    //      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
+    //      materialDef.mFlags |= semantic;
+    //    }
+
+    if(ReadString(node.GetChild("occlusionMap"), texturePath))
+    {
+      ToUnixFileSeparators(texturePath);
+      const auto semantic = MaterialDefinition::OCCLUSION;
+      materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}});
+      materialDef.mFlags |= semantic;
+    }
+
+    if(ReadColorCodeOrColor(&node, materialDef.mColor, convertColorCode) &&
+       materialDef.mColor.a < 1.0f)
+    {
+      materialDef.mFlags |= MaterialDefinition::TRANSPARENCY;
+    }
+
+    ReadFloat(node.GetChild("metallic"), materialDef.mMetallic);
+    ReadFloat(node.GetChild("roughness"), materialDef.mRoughness);
+
+    bool mipmaps;
+    if(ReadBool(node.GetChild("mipmap"), mipmaps) && mipmaps)
+    {
+      for(auto& ts : materialDef.mTextureStages)
+      {
+        ts.mTexture.mSamplerFlags |= SamplerFlags::FILTER_MIPMAP_LINEAR;
+      }
+    }
+
+    resources.mMaterials.emplace_back(std::move(materialDef), TextureSet());
+  }
+}
+
+void DliLoaderImpl::Impl::ParseNodes(const TreeNode* const nodes, Index index, LoadParams& params)
+{
+  std::vector<Index> parents;
+  parents.reserve(8);
+
+  struct IndexMapper : IIndexMapper
+  {
+    IndexMapper(size_t numNodes)
+    {
+      mIndices.reserve(numNodes);
+    }
+
+    virtual bool Map(Index iDli, Index iScene) override
+    {
+      Entry idx{iDli, iScene};
+      auto  iInsert = std::lower_bound(mIndices.begin(), mIndices.end(), idx);
+      if(iInsert == mIndices.end() || iInsert->iDli != iDli)
+      {
+        mIndices.insert(iInsert, idx);
+      }
+      else if(iInsert->iScene != iScene)
+      {
+        return false;
+      }
+      return true;
+    }
+
+    virtual unsigned int Resolve(Index iDli) override
+    {
+      auto iFind = std::lower_bound(mIndices.begin(), mIndices.end(), iDli, [](const Entry& idx, Index iDli) { return idx.iDli < iDli; });
+      DALI_ASSERT_ALWAYS(iFind != mIndices.end());
+      return iFind->iScene;
+    }
+
+  private:
+    struct Entry
+    {
+      unsigned int iDli;
+      unsigned int iScene;
+
+      bool operator<(const Entry& other) const
+      {
+        return iDli < other.iDli;
+      }
+    };
+    std::vector<Entry> mIndices;
+  } mapper(nodes->Size());
+  ParseNodesInternal(nodes, index, parents, params, mapper);
+
+  auto& scene = params.output->mScene;
+  for(size_t i0 = 0, i1 = scene.GetNodeCount(); i0 < i1; ++i0)
+  {
+    for(auto& c : scene.GetNode(i0)->mConstraints)
+    {
+      c.mSourceIdx = mapper.Resolve(c.mSourceIdx);
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::ParseNodesInternal(const TreeNode* const nodes, Index index, std::vector<Index>& inOutParentStack, LoadParams& params, IIndexMapper& mapper)
+{
+  // Properties that may be resolved from a JSON value with ReadInt() -- or default to 0.
+  struct IndexProperty
+  {
+    ResourceType::Value type;
+    const TreeNode*     source;
+    Index&              target;
+  };
+  std::vector<IndexProperty> resourceIds;
+  resourceIds.reserve(4);
+
+  if(auto node = GetNthChild(nodes, index))
+  {
+    Dali::Scene3D::Loader::NodeDefinition nodeDef;
+    nodeDef.mParentIdx = inOutParentStack.empty() ? INVALID_INDEX : inOutParentStack.back();
+
+    // name
+    ReadString(node->GetChild(NAME), nodeDef.mName);
+
+    // transform
+    ReadModelTransform(node, nodeDef.mOrientation, nodeDef.mPosition, nodeDef.mScale);
+
+    // Reads the size of the node.
+    //
+    // * It can be given as 'size' or 'bounds'.
+    // * The sdk saves the 'size' as a vector2 in some cases.
+    // * To avoid size related issues the following code attemps
+    //   to read the 'size/bounds' as a vector3 first, if it's
+    //   not successful then reads it as a vector2.
+    ReadVector(node->GetChild("size"), nodeDef.mSize.AsFloat(), 3) ||
+      ReadVector(node->GetChild("size"), nodeDef.mSize.AsFloat(), 2) ||
+      ReadVector(node->GetChild("bounds"), nodeDef.mSize.AsFloat(), 3) ||
+      ReadVector(node->GetChild("bounds"), nodeDef.mSize.AsFloat(), 2);
+
+    // visibility
+    ReadBool(node->GetChild("visible"), nodeDef.mIsVisible);
+
+    // type classification
+    if(auto eCustomization = node->GetChild("customization")) // customization
+    {
+      std::string tag;
+      if(ReadString(eCustomization->GetChild("tag"), tag))
+      {
+        nodeDef.mCustomization.reset(new Dali::Scene3D::Loader::NodeDefinition::CustomizationDefinition{tag});
+      }
+    }
+    else // something renderable maybe
+    {
+      std::unique_ptr<Dali::Scene3D::Loader::NodeDefinition::Renderable> renderable;
+      ModelRenderable*                                                   modelRenderable = nullptr; // no ownership, aliasing renderable for the right type.
+
+      const TreeNode* eRenderable = nullptr;
+      if((eRenderable = node->GetChild("model")))
+      {
+        // check for mesh before allocating - this can't be missing.
+        auto eMesh = eRenderable->GetChild("mesh");
+        if(!eMesh)
+        {
+          ExceptionFlinger(ASSERT_LOCATION) << "node " << nodeDef.mName << ": Missing mesh definition.";
+        }
+
+        modelRenderable = new ModelRenderable();
+        renderable.reset(modelRenderable);
+
+        resourceIds.push_back({ResourceType::Mesh, eMesh, modelRenderable->mMeshIdx});
+      }
+      else if((eRenderable = node->GetChild("arc")))
+      {
+        // check for mesh before allocating - this can't be missing.
+        auto eMesh = eRenderable->GetChild("mesh");
+        if(!eMesh)
+        {
+          ExceptionFlinger(ASSERT_LOCATION) << "node " << nodeDef.mName << ": Missing mesh definition.";
+        }
+
+        auto arcRenderable = new ArcRenderable;
+        renderable.reset(arcRenderable);
+        modelRenderable = arcRenderable;
+
+        resourceIds.push_back({ResourceType::Mesh, eMesh, arcRenderable->mMeshIdx});
+
+        ReadArcField(eRenderable, *arcRenderable);
+      }
+
+      if(renderable && eRenderable != nullptr) // process common properties of all renderables + register payload
+      {
+        // shader
+        renderable->mShaderIdx = 0;
+        auto eShader           = eRenderable->GetChild("shader");
+        if(eShader)
+        {
+          resourceIds.push_back({ResourceType::Shader, eShader, renderable->mShaderIdx});
+        }
+
+        // color
+        if(modelRenderable)
+        {
+          modelRenderable->mMaterialIdx = 0; // must offer default of 0
+          auto eMaterial                = eRenderable->GetChild("material");
+          if(eMaterial)
+          {
+            resourceIds.push_back({ResourceType::Material, eMaterial, modelRenderable->mMaterialIdx});
+          }
+
+          if(!ReadColorCodeOrColor(eRenderable, modelRenderable->mColor, params.input->mConvertColorCode))
+          {
+            ReadColorCodeOrColor(node, modelRenderable->mColor, params.input->mConvertColorCode);
+          }
+        }
+
+        nodeDef.mRenderables.push_back(std::move(renderable));
+      }
+    }
+
+    // Resolve ints - default to 0 if undefined
+    auto& output = params.output;
+    for(auto& idRes : resourceIds)
+    {
+      Index iCheck = 0;
+      switch(idRes.type)
+      {
+        case ResourceType::Shader:
+          iCheck = output->mResources.mShaders.size();
+          break;
+
+        case ResourceType::Mesh:
+          iCheck = output->mResources.mMeshes.size();
+          break;
+
+        case ResourceType::Material:
+          iCheck = output->mResources.mMaterials.size();
+          break;
+
+        default:
+          ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ": Invalid resource type: " << idRes.type << " (Programmer error)";
+      }
+
+      if(!idRes.source)
+      {
+        idRes.target = 0;
+      }
+      else if(idRes.source->GetType() != TreeNode::INTEGER)
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ": Invalid " << GetResourceTypeName(idRes.type) << " index type.";
+      }
+      else
+      {
+        idRes.target = idRes.source->GetInteger();
+      }
+
+      if(idRes.target >= iCheck)
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ": " << GetResourceTypeName(idRes.type) << " index " << idRes.target << " out of bounds (" << iCheck << ").";
+      }
+    }
+    resourceIds.clear();
+
+    // Extra properties
+    if(auto eExtras = node->GetChild("extras"))
+    {
+      auto& extras = nodeDef.mExtras;
+      extras.reserve(eExtras->Size());
+
+      for(auto i0 = eExtras->CBegin(), i1 = eExtras->CEnd(); i0 != i1; ++i0)
+      {
+        Dali::Scene3D::Loader::NodeDefinition::Extra e;
+
+        auto eExtra = *i0;
+        e.mKey      = eExtra.first;
+        if(e.mKey.empty())
+        {
+          mOnError(FormatString("node %d: empty string is invalid for name of extra %d; ignored.",
+                                index,
+                                extras.size()));
+          continue;
+        }
+
+        e.mValue = ReadPropertyValue(eExtra.second);
+        if(e.mValue.GetType() == Property::Type::NONE)
+        {
+          mOnError(FormatString("node %d: failed to interpret value of extra '%s' : %s; ignored.",
+                                index,
+                                e.mKey.c_str(),
+                                eExtra.second.GetString()));
+        }
+        else
+        {
+          auto iInsert = std::lower_bound(extras.begin(), extras.end(), e);
+          if(iInsert != extras.end() && iInsert->mKey == e.mKey)
+          {
+            mOnError(FormatString("node %d: extra '%s' already defined; overriding with %s.",
+                                  index,
+                                  e.mKey.c_str(),
+                                  eExtra.second.GetString()));
+            *iInsert = std::move(e);
+          }
+          else
+          {
+            extras.insert(iInsert, e);
+          }
+        }
+      }
+    }
+
+    // Constraints
+    if(auto eConstraints = node->GetChild("constraints"))
+    {
+      auto& constraints = nodeDef.mConstraints;
+      constraints.reserve(eConstraints->Size());
+
+      ConstraintDefinition cDef;
+      for(auto i0 = eConstraints->CBegin(), i1 = eConstraints->CEnd(); i0 != i1; ++i0)
+      {
+        auto eConstraint = *i0;
+        if(!ReadIndex(&eConstraint.second, cDef.mSourceIdx))
+        {
+          mOnError(FormatString("node %d: node ID %s for constraint %d is invalid; ignored.",
+                                index,
+                                eConstraint.second.GetString(),
+                                constraints.size()));
+        }
+        else
+        {
+          cDef.mProperty = eConstraint.first;
+
+          auto iInsert = std::lower_bound(constraints.begin(), constraints.end(), cDef);
+          if(iInsert != constraints.end() && *iInsert == cDef)
+          {
+            mOnError(FormatString("node %d: constraint %s@%d already defined; ignoring.",
+                                  index,
+                                  cDef.mProperty.c_str(),
+                                  cDef.mSourceIdx));
+          }
+          else
+          {
+            constraints.insert(iInsert, cDef);
+          }
+        }
+      }
+    }
+
+    // Determine index for mapping
+    const unsigned int myIndex = output->mScene.GetNodeCount();
+    if(!mapper.Map(index, myIndex))
+    {
+      mOnError(FormatString("node %d: error mapping dli index %d: node has multiple parents. Ignoring subtree.", index, myIndex));
+      return;
+    }
+
+    // if the node is a bone in a skeletal animation, it will have the inverse bind pose matrix.
+    Matrix invBindMatrix{false};
+    if(ReadVector(node->GetChild("inverseBindPoseMatrix"), invBindMatrix.AsFloat(), 16u)) // TODO: more robust error checking?
+    {
+      mInverseBindMatrices[myIndex] = invBindMatrix;
+    }
+
+    // Register nodeDef
+    auto rawDef = output->mScene.AddNode(std::make_unique<Dali::Scene3D::Loader::NodeDefinition>(std::move(nodeDef)));
+    if(rawDef) // NOTE: no ownership. Guaranteed to stay in scope.
+    {
+      // ...And only then parse children.
+      if(auto children = node->GetChild("children"))
+      {
+        inOutParentStack.push_back(myIndex);
+
+        rawDef->mChildren.reserve(children->Size());
+
+        uint32_t iChild = 0;
+        for(auto j0 = children->CBegin(), j1 = children->CEnd(); j0 != j1; ++j0, ++iChild)
+        {
+          auto& child = (*j0).second;
+          if(child.GetType() == TreeNode::INTEGER)
+          {
+            ParseNodesInternal(nodes, child.GetInteger(), inOutParentStack, params, mapper); // child object is created in scene definition.
+          }
+          else
+          {
+            ExceptionFlinger(ASSERT_LOCATION) << "node " << index << ", child " << iChild << ": invalid index type.";
+          }
+        }
+
+        inOutParentStack.pop_back();
+      }
+      else if(rawDef->mCustomization)
+      {
+        mOnError(FormatString("node %d: not an actual customization without children.", index));
+      }
+
+      if(auto proc = params.input->mNodePropertyProcessor) // optional processing
+      {
+        // WARNING: constraint IDs are not resolved at this point.
+        Property::Map nodeData;
+        ParseProperties(*node, nodeData);
+        proc(*rawDef, std::move(nodeData), mOnError);
+      }
+    }
+    else
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Node " << index << ": name already used.";
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::ParseAnimations(const TreeNode* tnAnimations, LoadParams& params)
+{
+  auto& definitions = params.output->mAnimationDefinitions;
+  definitions.reserve(definitions.size() + tnAnimations->Size());
+
+  for(TreeNode::ConstIterator iAnim = tnAnimations->CBegin(), iAnimEnd = tnAnimations->CEnd();
+      iAnim != iAnimEnd;
+      ++iAnim)
+  {
+    const TreeNode&     tnAnim                 = (*iAnim).second;
+    uint32_t            animationPropertyIndex = 0;
+    AnimationDefinition animDef;
+    std::string         animationName;
+    ReadString(tnAnim.GetChild(NAME), animationName);
+    animDef.SetName(animationName);
+
+    auto       iFind     = std::lower_bound(definitions.begin(), definitions.end(), animDef, [](const AnimationDefinition& ad0, const AnimationDefinition& ad1) { return ad0.GetName() < ad1.GetName(); });
+    const bool overwrite = iFind != definitions.end() && iFind->GetName() == animDef.GetName();
+    if(overwrite)
+    {
+      mOnError(FormatString("Pre-existing animation with name '%s' is being overwritten.", animDef.GetName().c_str()));
+    }
+
+    // Duration -- We need something that animated properties' delay / duration can
+    // be expressed as a multiple of; 0 won't work. This is small enough (i.e. shorter
+    // than our frame delay) to not be restrictive WRT replaying. If anything needs
+    // to occur more frequently, then Animations are likely not your solution anyway.
+    float animationDuration = 0.0f;
+    if(!ReadFloat(tnAnim.GetChild("duration"), animationDuration))
+    {
+      mOnError(FormatString("Animation '%s' fails to define '%s'.",
+                            animDef.GetName().c_str(),
+                            "duration"));
+    }
+    if(animationDuration < AnimationDefinition::MIN_DURATION_SECONDS)
+    {
+      animationDuration = AnimationDefinition::MIN_DURATION_SECONDS;
+    }
+    animDef.SetDuration(animationDuration);
+
+    // Get loop count - # of playbacks. Default is once. 0 means repeat indefinitely.
+    int32_t animationLoopCount = 1;
+    if(ReadInt(tnAnim.GetChild("loopCount"), animationLoopCount) && animationLoopCount < 0)
+    {
+      animationLoopCount = 0;
+    }
+    animDef.SetLoopCount(animationLoopCount);
+
+    std::string endAction;
+    if(ReadString(tnAnim.GetChild("endAction"), endAction))
+    {
+      if("BAKE" == endAction)
+      {
+        animDef.SetEndAction(Animation::BAKE);
+      }
+      else if("DISCARD" == endAction)
+      {
+        animDef.SetEndAction(Animation::DISCARD);
+      }
+      else if("BAKE_FINAL" == endAction)
+      {
+        animDef.SetEndAction(Animation::BAKE_FINAL);
+      }
+    }
+
+    if(ReadString(tnAnim.GetChild("disconnectAction"), endAction))
+    {
+      if("BAKE" == endAction)
+      {
+        animDef.SetDisconnectAction(Animation::BAKE);
+      }
+      else if("DISCARD" == endAction)
+      {
+        animDef.SetDisconnectAction(Animation::DISCARD);
+      }
+      else if("BAKE_FINAL" == endAction)
+      {
+        animDef.SetDisconnectAction(Animation::BAKE_FINAL);
+      }
+    }
+
+    if(const TreeNode* tnProperties = tnAnim.GetChild("properties"))
+    {
+      animDef.ReserveSize(tnProperties->Size());
+      for(TreeNode::ConstIterator iProperty = tnProperties->CBegin(), iPropertyEnd = tnProperties->CEnd();
+          iProperty != iPropertyEnd;
+          ++iProperty)
+      {
+        const TreeNode& tnProperty = (*iProperty).second;
+
+        AnimatedProperty animProp;
+        if(!ReadString(tnProperty.GetChild("node"), animProp.mNodeName))
+        {
+          mOnError(FormatString("Animation '%s': Failed to read the 'node' tag.", animDef.GetName().c_str()));
+          continue;
+        }
+
+        if(!ReadString(tnProperty.GetChild("property"), animProp.mPropertyName))
+        {
+          mOnError(FormatString("Animation '%s': Failed to read the 'property' tag", animDef.GetName().c_str()));
+          continue;
+        }
+
+        // these are the defaults
+        animProp.mTimePeriod.delaySeconds    = 0.f;
+        animProp.mTimePeriod.durationSeconds = animDef.GetDuration();
+        if(!ReadTimePeriod(tnProperty.GetChild("timePeriod"), animProp.mTimePeriod))
+        {
+          mOnError(FormatString("Animation '%s': timePeriod missing in Property #%d: defaulting to %f.",
+                                animDef.GetName().c_str(),
+                                animDef.GetPropertyCount(),
+                                animProp.mTimePeriod.durationSeconds));
+        }
+
+        std::string alphaFunctionValue;
+        if(ReadString(tnProperty.GetChild("alphaFunction"), alphaFunctionValue))
+        {
+          animProp.mAlphaFunction = GetAlphaFunction(alphaFunctionValue);
+        }
+
+        if(const TreeNode* tnKeyFramesBin = tnProperty.GetChild("keyFramesBin"))
+        {
+          DALI_ASSERT_ALWAYS(!animProp.mPropertyName.empty() && "Animation must specify a property name");
+
+          std::ifstream binAniFile;
+          std::string   animationFilename;
+          if(ReadString(tnKeyFramesBin->GetChild(URL), animationFilename))
+          {
+            std::string animationFullPath = params.input->mAnimationsPath + animationFilename;
+            binAniFile.open(animationFullPath, std::ios::binary);
+            if(binAniFile.fail())
+            {
+              ExceptionFlinger(ASSERT_LOCATION) << "Failed to open animation data '" << animationFullPath << "'";
+            }
+          }
+
+          int byteOffset = 0;
+          ReadInt(tnKeyFramesBin->GetChild("byteOffset"), byteOffset);
+          DALI_ASSERT_ALWAYS(byteOffset >= 0);
+
+          binAniFile.seekg(static_cast<std::streamoff>(byteOffset), std::ios::beg);
+
+          int numKeys = 0;
+          ReadInt(tnKeyFramesBin->GetChild("numKeys"), numKeys);
+          DALI_ASSERT_ALWAYS(numKeys >= 0);
+
+          animProp.mKeyFrames = KeyFrames::New();
+
+          // In binary animation file only is saved the position, rotation, scale and blend shape weight keys.
+          // so, if it is vector3 we assume is position or scale keys, if it is vector4 we assume is rotation,
+          //  otherwise are blend shape weight keys.
+          //  TODO support for binary header with size information
+          Property::Type propType = Property::FLOAT; // assume blend shape weights
+          if(animProp.mPropertyName == "orientation")
+          {
+            propType = Property::VECTOR4;
+          }
+          else if((animProp.mPropertyName == "position") || (animProp.mPropertyName == "scale"))
+          {
+            propType = Property::VECTOR3;
+          }
+
+          // alphafunction is reserved for future implementation
+          //  NOTE: right now we're just using AlphaFunction::LINEAR.
+          unsigned char dummyAlphaFunction;
+
+          float           progress;
+          Property::Value propValue;
+          for(int key = 0; key < numKeys; key++)
+          {
+            binAniFile.read(reinterpret_cast<char*>(&progress), sizeof(float));
+            if(propType == Property::VECTOR3)
+            {
+              Vector3 value;
+              binAniFile.read(reinterpret_cast<char*>(value.AsFloat()), sizeof(float) * 3);
+              propValue = Property::Value(value);
+            }
+            else if(propType == Property::VECTOR4)
+            {
+              Vector4 value;
+              binAniFile.read(reinterpret_cast<char*>(value.AsFloat()), sizeof(float) * 4);
+              propValue = Property::Value(Quaternion(value));
+            }
+            else
+            {
+              float value;
+              binAniFile.read(reinterpret_cast<char*>(&value), sizeof(float));
+              propValue = Property::Value(value);
+            }
+
+            binAniFile.read(reinterpret_cast<char*>(&dummyAlphaFunction), sizeof(unsigned char));
+
+            animProp.mKeyFrames.Add(progress, propValue, AlphaFunction::LINEAR);
+          }
+        }
+        else if(const TreeNode* tnKeyFrames = tnProperty.GetChild("keyFrames"))
+        {
+          DALI_ASSERT_ALWAYS(!animProp.mPropertyName.empty() && "Animation must specify a property name");
+          animProp.mKeyFrames = KeyFrames::New();
+
+          float progress = 0.0f;
+          for(auto i0 = tnKeyFrames->CBegin(), i1 = tnKeyFrames->CEnd(); i1 != i0; ++i0)
+          {
+            const TreeNode::KeyNodePair& kfKeyChild = *i0;
+            bool                         readResult = ReadFloat(kfKeyChild.second.GetChild("progress"), progress);
+            DALI_ASSERT_ALWAYS(readResult && "Key frame entry must have 'progress'");
+
+            const TreeNode* tnValue = kfKeyChild.second.GetChild("value");
+            DALI_ASSERT_ALWAYS(tnValue && "Key frame entry must have 'value'");
+
+            // For the "orientation" property, convert from Vector4 -> Rotation value
+            // This work-around is preferable to a null-pointer exception in the DALi update thread
+            Property::Value propValue(ReadPropertyValue(*tnValue));
+            if(propValue.GetType() == Property::VECTOR4 &&
+               animProp.mPropertyName == "orientation")
+            {
+              Vector4 v;
+              propValue.Get(v);
+              propValue = Property::Value(Quaternion(v.w, v.x, v.y, v.z));
+            }
+
+            AlphaFunction kfAlphaFunction(AlphaFunction::DEFAULT);
+            std::string   alphaFuncStr;
+            if(ReadString(kfKeyChild.second.GetChild("alphaFunction"), alphaFuncStr))
+            {
+              kfAlphaFunction = GetAlphaFunction(alphaFuncStr);
+            }
+
+            animProp.mKeyFrames.Add(progress, propValue, kfAlphaFunction);
+          }
+        }
+        else
+        {
+          const TreeNode* tnValue = tnProperty.GetChild("value");
+          if(tnValue)
+          {
+            animProp.mValue.reset(new AnimatedProperty::Value{ReadPropertyValue(*tnValue)});
+            ReadBool(tnProperty.GetChild("relative"), animProp.mValue->mIsRelative);
+          }
+          else
+          {
+            mOnError(FormatString("Property '%s' fails to define target value.",
+                                  animProp.mPropertyName.c_str()));
+          }
+        }
+
+        animDef.SetProperty(animationPropertyIndex++, std::move(animProp));
+      }
+    }
+
+    if(auto proc = params.input->mAnimationPropertyProcessor) // optional processing
+    {
+      Property::Map map;
+      ParseProperties(tnAnim, map);
+      proc(animDef, std::move(map), mOnError);
+    }
+
+    if(overwrite)
+    {
+      *iFind = std::move(animDef);
+    }
+    else
+    {
+      iFind = definitions.insert(iFind, std::move(animDef));
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::ParseAnimationGroups(const Toolkit::TreeNode* tnAnimationGroups, LoadParams& params)
+{
+  auto& animGroups = params.output->mAnimationGroupDefinitions;
+
+  int numGroups = 0;
+  for(auto iGroups = tnAnimationGroups->CBegin(), iGroupsEnd = tnAnimationGroups->CEnd();
+      iGroups != iGroupsEnd;
+      ++iGroups, ++numGroups)
+  {
+    const auto& tnGroup = *iGroups;
+    auto        tnName  = tnGroup.second.GetChild(NAME);
+    std::string groupName;
+    if(!tnName || !ReadString(tnName, groupName))
+    {
+      mOnError(FormatString("Failed to get the name for the Animation group %d; ignoring.", numGroups));
+      continue;
+    }
+
+    auto iFind = std::lower_bound(animGroups.begin(), animGroups.end(), groupName, [](const AnimationGroupDefinition& group, const std::string& name) { return group.mName < name; });
+    if(iFind != animGroups.end() && iFind->mName == groupName)
+    {
+      mOnError(FormatString("Animation group with name '%s' already exists; new entries will be merged.", groupName.c_str()));
+    }
+    else
+    {
+      iFind = animGroups.insert(iFind, AnimationGroupDefinition{});
+    }
+
+    iFind->mName = groupName;
+
+    auto tnAnims = tnGroup.second.GetChild("animations");
+    if(tnAnims && tnAnims->Size() > 0)
+    {
+      auto& anims = iFind->mAnimations;
+      anims.reserve(anims.size() + tnAnims->Size());
+      for(auto iAnims = tnAnims->CBegin(), iAnimsEnd = tnAnims->CEnd(); iAnims != iAnimsEnd; ++iAnims)
+      {
+        anims.push_back((*iAnims).second.GetString());
+      }
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::GetCameraParameters(std::vector<Dali::Scene3D::Loader::CameraParameters>& cameras) const
+{
+  if(mParser.GetRoot())
+  {
+    if(const TreeNode* jsonCameras = mParser.GetRoot()->GetChild("cameras"))
+    {
+      float dummyFloatArray[4];
+
+      cameras.resize(jsonCameras->Size());
+      auto iCamera = cameras.begin();
+      for(auto i0 = jsonCameras->CBegin(), i1 = jsonCameras->CEnd(); i0 != i1; ++i0)
+      {
+        auto& jsonCamera = (*i0).second;
+
+        ReadFloat(jsonCamera.GetChild("fov"), iCamera->yFovDegree.degree);
+        ReadFloat(jsonCamera.GetChild("near"), iCamera->zNear);
+        ReadFloat(jsonCamera.GetChild("far"), iCamera->zFar);
+        if(ReadVector(jsonCamera.GetChild("orthographic"), dummyFloatArray, 4u))
+        {
+          iCamera->isPerspective = false;
+
+          iCamera->orthographicSize = dummyFloatArray[2] * 0.5f;
+          iCamera->aspectRatio      = dummyFloatArray[1] / dummyFloatArray[2];
+        }
+
+        if(auto jsonMatrix = jsonCamera.GetChild("matrix"))
+        {
+          ReadVector(jsonMatrix, iCamera->matrix.AsFloat(), 16u);
+        }
+
+        ++iCamera;
+      }
+    }
+  }
+}
+
+void DliLoaderImpl::Impl::GetLightParameters(std::vector<Dali::Scene3D::Loader::LightParameters>& lights) const
+{
+  if(mParser.GetRoot())
+  {
+    if(const TreeNode* jsonLights = mParser.GetRoot()->GetChild("lights"))
+    {
+      lights.resize(jsonLights->Size());
+      auto iLight = lights.begin();
+      for(auto i0 = jsonLights->CBegin(), i1 = jsonLights->CEnd(); i0 != i1; ++i0)
+      {
+        auto& jsonLight = (*i0).second;
+        if(!ReadVector(jsonLight.GetChild("matrix"), iLight->transform.AsFloat(), 16))
+        {
+          mOnError(
+            FormatString("Failed to parse light %d - \"matrix\" child with 16 floats expected.\n",
+                         std::distance(jsonLights->CBegin(), i0)));
+          continue;
+        }
+
+        int shadowMapSize = 0;
+        if(ReadInt(jsonLight.GetChild(SHADOW_MAP_SIZE), shadowMapSize) && shadowMapSize < 0)
+        {
+          mOnError(
+            FormatString("Failed to parse light %d - %s has an invalid value.",
+                         std::distance(jsonLights->CBegin(), i0),
+                         SHADOW_MAP_SIZE));
+          continue;
+        }
+        iLight->shadowMapSize = shadowMapSize;
+
+        float orthoSize = 0.f;
+        if(ReadFloat(jsonLight.GetChild(ORTHOGRAPHIC_SIZE), orthoSize) &&
+           (orthoSize < .0f || std::isnan(orthoSize) || std::isinf(orthoSize)))
+        {
+          mOnError(
+            FormatString("Failed to parse light %d - %s has an invalid value.",
+                         std::distance(jsonLights->CBegin(), i0),
+                         ORTHOGRAPHIC_SIZE));
+          continue;
+        }
+        iLight->orthographicSize = orthoSize;
+
+        if((iLight->shadowMapSize > 0) != (iLight->orthographicSize > .0f))
+        {
+          mOnError(FormatString(
+            "Light %d: Both shadow map size and orthographic size must be set for shadows to work.",
+            std::distance(jsonLights->CBegin(), i0)));
+        }
+
+        if(!ReadVector(jsonLight.GetChild("color"), iLight->color.AsFloat(), 3)) // color is optional
+        {
+          iLight->color = Vector3::ONE; // default to white
+        }
+
+        if(!ReadFloat(jsonLight.GetChild("intensity"), iLight->intensity)) // intensity is optional
+        {
+          iLight->intensity = 1.0f; // default to 1.0
+        }
+
+        if(!ReadFloat(jsonLight.GetChild("shadowIntensity"), iLight->shadowIntensity)) // intensity is optional
+        {
+          iLight->shadowIntensity = 1.0f; // default to 1.0
+        }
+
+        ++iLight;
+      }
+    }
+  }
+}
+
+} // namespace Internal
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/internal/loader/dli-loader-impl.h b/dali-scene3d/internal/loader/dli-loader-impl.h
new file mode 100644
index 0000000..ba6b117
--- /dev/null
+++ b/dali-scene3d/internal/loader/dli-loader-impl.h
@@ -0,0 +1,75 @@
+#ifndef DALI_SCENE3D_LOADER_DLI_LOADER_IMPL_H
+#define DALI_SCENE3D_LOADER_DLI_LOADER_IMPL_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/model-loader-impl.h>
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/loader/customization.h>
+#include <dali-scene3d/public-api/loader/dli-input-parameter.h>
+#include <dali-scene3d/public-api/loader/index.h>
+#include <dali-scene3d/public-api/loader/node-definition.h>
+#include <dali-scene3d/public-api/loader/string-callback.h>
+
+namespace Dali::Scene3D::Loader::Internal
+{
+typedef std::pair<std::string, std::string> Metadata;
+
+// Forward declarations
+struct LoadResult;
+
+class DliLoaderImpl : public ModelLoaderImpl
+{
+public:
+  struct LoadParams
+  {
+    Dali::Scene3D::Loader::DliInputParameter* input;
+    Dali::Scene3D::Loader::LoadResult*        output;
+  };
+
+  DliLoaderImpl();
+  ~DliLoaderImpl();
+
+  /**
+   * @brief Sets the callback that messages from non-fatal errors get posted to.
+   *  Uses DefaultErrorCallback by default.
+   */
+  void SetErrorCallback(StringCallback onError);
+
+  /**
+   * @copydoc Dali::Scene3D::Loader::Internal::ModelLoaderImpl::LoadMode()
+   */
+  bool LoadModel(const std::string& uri, Dali::Scene3D::Loader::LoadResult& result) override;
+
+  /**
+   * @return The error string describing how the parse has failed, if any.
+   */
+  std::string GetParseError() const;
+
+private:
+  struct Impl;
+  const std::unique_ptr<Impl> mImpl;
+};
+
+} // namespace Dali::Scene3D::Loader::Internal
+
+#endif // DALI_SCENE3D_LOADER_DLI_LOADER_IMPL_H
diff --git a/dali-scene3d/internal/loader/glb-loader-impl.cpp b/dali-scene3d/internal/loader/glb-loader-impl.cpp
new file mode 100644
index 0000000..deaa91e
--- /dev/null
+++ b/dali-scene3d/internal/loader/glb-loader-impl.cpp
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/internal/loader/glb-loader-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/file-stream.h>
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/gltf2-util.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace gt = gltf2;
+namespace js = json;
+
+namespace Dali::Scene3D::Loader::Internal
+{
+namespace
+{
+static constexpr uint32_t GLB_MAGIC       = 0x46546C67;
+static constexpr uint32_t JSON_CHUNK_TYPE = 0x4E4F534A;
+static constexpr uint32_t DATA_CHUNK_TYPE = 0x004E4942;
+
+struct GlbHeader
+{
+  uint32_t magic;
+  uint32_t version;
+  uint32_t length;
+};
+
+struct ChunkHeader
+{
+  uint32_t chunkLength;
+  uint32_t chunkType;
+};
+
+} // namespace
+
+bool GlbLoaderImpl::LoadModel(const std::string& url, Dali::Scene3D::Loader::LoadResult& result)
+{
+  Dali::FileStream fileStream(url, FileStream::READ | FileStream::BINARY);
+  auto&            stream = fileStream.GetStream();
+  if(!stream.rdbuf()->in_avail())
+  {
+    DALI_LOG_ERROR("Load Model file is failed, url : %s\n", url.c_str());
+    return false;
+  }
+
+  GlbHeader glbHeader;
+  stream.clear();
+  stream.seekg(0u, stream.beg);
+  stream.read(reinterpret_cast<char*>(&glbHeader), sizeof(GlbHeader));
+
+  if(glbHeader.magic != GLB_MAGIC)
+  {
+    DALI_LOG_ERROR("Wrong file format, url : %s\n", url.c_str());
+    return false;
+  }
+
+  ChunkHeader jsonChunkHeader;
+  stream.read(reinterpret_cast<char*>(&jsonChunkHeader), sizeof(ChunkHeader));
+
+  if(jsonChunkHeader.chunkType != JSON_CHUNK_TYPE)
+  {
+    DALI_LOG_ERROR("Glb files first chunk is not a json chunk.\n");
+    return false;
+  }
+
+  std::vector<uint8_t> jsonChunkData;
+  jsonChunkData.resize(jsonChunkHeader.chunkLength);
+  stream.read(reinterpret_cast<char*>(&jsonChunkData[0]), static_cast<std::streamsize>(static_cast<size_t>(jsonChunkHeader.chunkLength)));
+  std::string gltfText(jsonChunkData.begin(), jsonChunkData.end());
+
+  uint32_t             binaryChunkOffset = sizeof(GlbHeader) + sizeof(ChunkHeader) + jsonChunkHeader.chunkLength;
+  std::vector<uint8_t> binaryChunkData;
+  if(glbHeader.length > binaryChunkOffset)
+  {
+    ChunkHeader binaryChunkHeader;
+    stream.read(reinterpret_cast<char*>(&binaryChunkHeader), sizeof(ChunkHeader));
+
+    if(binaryChunkHeader.chunkType != DATA_CHUNK_TYPE)
+    {
+      DALI_LOG_ERROR("Glb files has wrong binary chunk data.\n");
+      return false;
+    }
+
+    binaryChunkData.resize(binaryChunkHeader.chunkLength);
+    stream.read(reinterpret_cast<char*>(&binaryChunkData[0]), static_cast<std::streamsize>(static_cast<size_t>(binaryChunkHeader.chunkLength)));
+  }
+
+  json::unique_ptr root(json_parse(gltfText.c_str(), gltfText.size()));
+  if(!root)
+  {
+    DALI_LOG_ERROR("Failed to parse %s\n", url.c_str());
+    return false;
+  }
+
+  gt::Document document;
+
+  bool isMRendererModel(false);
+  if(!Gltf2Util::GenerateDocument(root, document, isMRendererModel))
+  {
+    DALI_LOG_ERROR("Failed to parse %s\n", url.c_str());
+    return false;
+  }
+
+  auto                         path = url.substr(0, url.rfind('/') + 1);
+  Gltf2Util::ConversionContext context{result, path, INVALID_INDEX};
+
+  auto& outBuffers = context.mOutput.mResources.mBuffers;
+  outBuffers.reserve(document.mBuffers.size());
+  if(!binaryChunkData.empty())
+  {
+    BufferDefinition dataBuffer(binaryChunkData);
+    outBuffers.emplace_back(std::move(dataBuffer));
+  }
+
+  Gltf2Util::ConvertGltfToContext(document, context, isMRendererModel);
+
+  return true;
+}
+
+} // namespace Dali::Scene3D::Loader::Internal
diff --git a/dali-scene3d/internal/loader/glb-loader-impl.h b/dali-scene3d/internal/loader/glb-loader-impl.h
new file mode 100644
index 0000000..05c9d9c
--- /dev/null
+++ b/dali-scene3d/internal/loader/glb-loader-impl.h
@@ -0,0 +1,41 @@
+#ifndef DALI_SCENE3D_LOADER_GLB_LOADER_IMPL_H
+#define DALI_SCENE3D_LOADER_GLB_LOADER_IMPL_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/threading/mutex.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/model-loader-impl.h>
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader::Internal
+{
+class GlbLoaderImpl : public ModelLoaderImpl
+{
+public:
+  /**
+   * @copydoc Dali::Scene3D::Loader::Internal::ModelLoaderImpl::LoadMode()
+   */
+  bool LoadModel(const std::string& url, Dali::Scene3D::Loader::LoadResult& result) override;
+};
+
+} // namespace Dali::Scene3D::Loader::Internal
+
+#endif // DALI_SCENE3D_LOADER_GLB_LOADER_IMPL_H
diff --git a/dali-scene3d/internal/loader/gltf2-asset.cpp b/dali-scene3d/internal/loader/gltf2-asset.cpp
new file mode 100644
index 0000000..bbc092e
--- /dev/null
+++ b/dali-scene3d/internal/loader/gltf2-asset.cpp
@@ -0,0 +1,198 @@
+/*
+* Copyright (c) 2023 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/matrix.h>
+#include <algorithm>
+#include <map>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/gltf2-asset.h>
+
+using namespace Dali;
+
+namespace gltf2
+{
+namespace
+{
+constexpr uint32_t ACCESSOR_TYPE_ELEMENT_COUNT[]{
+  1,
+  2,
+  3,
+  4,
+  4,
+  9,
+  16,
+  static_cast<uint32_t>(-1)};
+
+const std::map<std::string_view, AccessorType::Type>& GetAccessorTypes()
+{
+  static const std::map<std::string_view, AccessorType::Type> ACCESSOR_TYPES{
+    ENUM_STRING_MAPPING(AccessorType, SCALAR),
+    ENUM_STRING_MAPPING(AccessorType, VEC2),
+    ENUM_STRING_MAPPING(AccessorType, VEC3),
+    ENUM_STRING_MAPPING(AccessorType, VEC4),
+    ENUM_STRING_MAPPING(AccessorType, MAT2),
+    ENUM_STRING_MAPPING(AccessorType, MAT3),
+    ENUM_STRING_MAPPING(AccessorType, MAT4),
+  };
+  return ACCESSOR_TYPES;
+}
+
+const std::map<std::string_view, AlphaMode::Type>& GetAlphaModeTypes()
+{
+  static const std::map<std::string_view, AlphaMode::Type> ALPHA_MODE_TYPES{
+    ENUM_STRING_MAPPING(AlphaMode::Type, OPAQUE),
+    ENUM_STRING_MAPPING(AlphaMode::Type, MASK),
+    ENUM_STRING_MAPPING(AlphaMode::Type, BLEND),
+  };
+  return ALPHA_MODE_TYPES;
+}
+
+const std::map<std::string_view, Animation::Sampler::Interpolation::Type>& GetAnimationSamplerInterpolation()
+{
+  static const std::map<std::string_view, Animation::Sampler::Interpolation::Type> ANIMATION_SAMPLER_INTERPOLATION{
+    ENUM_STRING_MAPPING(Animation::Sampler::Interpolation::Type, STEP),
+    ENUM_STRING_MAPPING(Animation::Sampler::Interpolation::Type, LINEAR),
+    ENUM_STRING_MAPPING(Animation::Sampler::Interpolation::Type, CUBICSPLINE),
+  };
+  return ANIMATION_SAMPLER_INTERPOLATION;
+}
+
+const std::map<std::string_view, Animation::Channel::Target::Type>& GetAnimationChannelTargetPathTypes()
+{
+  static const std::map<std::string_view, Animation::Channel::Target::Type> ANIMATION_CHANNEL_TARGET_PATH_TYPES{
+    ENUM_STRING_MAPPING(Animation::Channel::Target::Type, TRANSLATION),
+    ENUM_STRING_MAPPING(Animation::Channel::Target::Type, ROTATION),
+    ENUM_STRING_MAPPING(Animation::Channel::Target::Type, SCALE),
+    ENUM_STRING_MAPPING(Animation::Channel::Target::Type, WEIGHTS),
+  };
+  return ANIMATION_CHANNEL_TARGET_PATH_TYPES;
+}
+
+} // namespace
+
+ENUM_TYPE_FROM_STRING(AccessorType, GetAccessorTypes())
+ENUM_TYPE_FROM_STRING(AlphaMode, GetAlphaModeTypes())
+ENUM_TYPE_FROM_STRING(Animation::Sampler::Interpolation, GetAnimationSamplerInterpolation())
+ENUM_TYPE_FROM_STRING(Animation::Channel::Target, GetAnimationChannelTargetPathTypes())
+
+const std::map<std::string_view, Attribute::Type>& GetTargetTypes()
+{
+  static const std::map<std::string_view, Attribute::Type> TARGET_TYPES{
+    ENUM_STRING_MAPPING(Attribute::Type, POSITION),
+    ENUM_STRING_MAPPING(Attribute::Type, TANGENT),
+    ENUM_STRING_MAPPING(Attribute::Type, NORMAL),
+  };
+  return TARGET_TYPES;
+}
+
+const std::map<Attribute::Type, const char*>& GetAttributeSetTypes()
+{
+  static const std::map<Attribute::Type, const char*> ATTRIBUTE_SET_TYPES{
+    {Attribute::Type::TEXCOORD_N, "TEXCOORD_%u"},
+    {Attribute::Type::COLOR_N, "COLOR_%u"},
+    {Attribute::Type::JOINTS_N, "JOINTS_%u"},
+    {Attribute::Type::WEIGHTS_N, "WEIGHTS_%u"},
+  };
+  return ATTRIBUTE_SET_TYPES;
+}
+
+uint32_t Attribute::HashFromString(const char* token, size_t length)
+{
+  auto& table1 = GetTargetTypes();
+  auto& table2 = GetAttributeSetTypes();
+
+  std::string target(token, length);
+  std::transform(target.begin(), target.end(), target.begin(), ::toupper);
+
+  auto iFind = table1.find(std::string_view(target.c_str(), length));
+  if(iFind != table1.end())
+  {
+    return Attribute::ToHash(iFind->second, false, 0);
+  }
+
+  uint32_t hash = Attribute::ToHash(Attribute::INVALID, false, 0);
+  for(const auto& [key, match] : table2)
+  {
+    int setIndex;
+    if(sscanf(target.c_str(), match, &setIndex) > 0)
+    {
+      hash = Attribute::ToHash(key, true, setIndex);
+      break;
+    }
+  }
+  return hash;
+}
+
+Attribute::Type Attribute::TargetFromString(const char* token, size_t length)
+{
+  std::string target(token, length);
+  std::transform(target.begin(), target.end(), target.begin(), ::toupper);
+
+  auto iFind = GetTargetTypes().find(std::string_view(target.c_str(), length));
+  if(iFind != GetTargetTypes().end())
+  {
+    return iFind->second;
+  }
+  return Attribute::INVALID;
+}
+
+bool Component::IsUnsigned(Type t)
+{
+  return t == UNSIGNED_BYTE || t == UNSIGNED_SHORT || t == UNSIGNED_INT;
+}
+
+uint32_t Component::Size(Type t)
+{
+  switch(t)
+  {
+    case BYTE:
+    case UNSIGNED_BYTE:
+      return 1;
+    case SHORT:
+    case UNSIGNED_SHORT:
+      return 2;
+    case UNSIGNED_INT:
+    case FLOAT:
+      return 4;
+    default:
+      return -1;
+  }
+}
+
+uint32_t AccessorType::ElementCount(Type t)
+{
+  return ACCESSOR_TYPE_ELEMENT_COUNT[t];
+}
+
+uint32_t ComponentTypedBufferViewClient::GetBytesPerComponent() const
+{
+  return Component::Size(mComponentType);
+}
+
+void Node::SetMatrix(const Matrix& m)
+{
+  m.GetTransformComponents(mTranslation, mRotation, mScale);
+}
+
+Quaternion ReadQuaternion(const json_value_s& j)
+{
+  return Quaternion(ReadDaliVector<Vector4>(j));
+}
+
+} // namespace gltf2
diff --git a/dali-scene3d/internal/loader/gltf2-asset.h b/dali-scene3d/internal/loader/gltf2-asset.h
new file mode 100644
index 0000000..16c7cd8
--- /dev/null
+++ b/dali-scene3d/internal/loader/gltf2-asset.h
@@ -0,0 +1,757 @@
+#ifndef DALI_SCENE3D_LOADER_GLTF2_ASSET_H_
+#define DALI_SCENE3D_LOADER_GLTF2_ASSET_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/math/matrix3.h>
+#include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/math/vector2.h>
+#include <dali/public-api/math/vector4.h>
+#include <cstdint>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/json-reader.h>
+#include <dali-scene3d/public-api/loader/index.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+#define ENUM_STRING_MAPPING(t, x) \
+  {                               \
+#x, t::x                      \
+  }
+
+#define ENUM_TYPE_FROM_STRING(structName, table)                             \
+  structName::Type structName::FromString(const char* s, size_t len)         \
+  {                                                                          \
+    std::string target(s, len);                                              \
+    std::transform(target.begin(), target.end(), target.begin(), ::toupper); \
+                                                                             \
+    auto iFind = table.find(std::string_view(target.c_str(), len));          \
+    if(iFind != table.end())                                                 \
+    {                                                                        \
+      return iFind->second;                                                  \
+    }                                                                        \
+    return structName::INVALID;                                              \
+  }
+
+namespace gltf2
+{
+using Index                           = Dali::Scene3D::Loader::Index;
+constexpr float UNDEFINED_FLOAT_VALUE = -1.0f; ///< Special marker for some non-negative only float values.
+
+template<typename T>
+class Ref
+{
+public:
+  Ref() = default;
+  Ref(std::vector<T>& v, Index i)
+  : mVector(&v),
+    mIndex(i)
+  {
+  }
+
+  /**
+   * @return The index of the object into the vector.
+   * @note It is client code responsibility to ensure that the vector is unambiguous. It should be in
+   *  a glTF document, since there's one vector for each type.
+   */
+  Index GetIndex() const
+  {
+    return mIndex;
+  }
+
+  /**
+   * @brief There may be scenarios in which the object, whose vector we're populating, changes, e.g.
+   *  when we don't have a final one at the time of reading the references.
+   */
+  void UpdateVector(std::vector<T>& v)
+  {
+    mVector = &v;
+  }
+
+  operator bool() const
+  {
+    return mVector != nullptr;
+  }
+  T* operator->() const
+  {
+    return &(*mVector)[mIndex];
+  }
+  T& operator*() const
+  {
+    return (*mVector)[mIndex];
+  }
+
+  bool operator==(const Ref<T>& other) const
+  {
+    return mVector == other.mVector && mIndex == other.mIndex;
+  }
+
+  bool operator!=(const Ref<T>& other) const
+  {
+    return !operator==(other);
+  }
+
+private:
+  std::vector<T>* mVector = nullptr;
+  Index           mIndex  = Dali::Scene3D::Loader::INVALID_INDEX;
+};
+
+struct Asset
+{
+  std::string_view mGenerator;
+  std::string_view mVersion;
+};
+
+struct Component
+{
+  enum Type
+  {
+    BYTE           = 5120,
+    UNSIGNED_BYTE  = 5121,
+    SHORT          = 5122,
+    UNSIGNED_SHORT = 5123,
+    UNSIGNED_INT   = 5125,
+    FLOAT          = 5126,
+    INVALID        = -1
+  };
+
+  static bool     IsUnsigned(Type t);
+  static uint32_t Size(Type t);
+
+  Component() = delete;
+};
+
+struct AccessorType
+{
+  enum Type
+  {
+    SCALAR,
+    VEC2,
+    VEC3,
+    VEC4,
+    MAT2,
+    MAT3,
+    MAT4,
+    INVALID
+  };
+
+  static uint32_t ElementCount(Type t);
+
+  static Type FromString(const char* s, size_t len);
+
+  AccessorType() = delete;
+};
+
+struct AlphaMode
+{
+  enum Type
+  {
+    OPAQUE,
+    MASK,
+    BLEND,
+    INVALID
+  };
+
+  static Type FromString(const char* s, size_t len);
+
+  AlphaMode() = delete;
+};
+
+struct Attribute
+{
+  enum Type
+  {
+    POSITION,
+    NORMAL,
+    TANGENT,
+    TEXCOORD_N,
+    COLOR_N,
+    JOINTS_N,
+    WEIGHTS_N,
+    INVALID
+  };
+
+  using HashType = uint32_t;
+
+  // Hash bit layout
+  // +--+--+--+--+--+--+--+
+  // |31|30|29|28|27|..| 0| bit index
+  // +--+--+--+--+--+--+--+
+  //  \_/ - Set is used
+  //     \______/ - Type enum
+  //              \_______/ - Set ID
+  static const HashType SET_SHIFT{31};
+  static const HashType TYPE_SHIFT{28};
+  static const HashType SET_MASK{0x01u << SET_SHIFT};
+  static const HashType TYPE_MASK{0x07 << TYPE_SHIFT};
+  static const HashType SET_ID_MASK{0x0fffffff};
+
+  static HashType ToHash(Type type, bool set, HashType setIndex)
+  {
+    return ((set << SET_SHIFT) & SET_MASK) | ((static_cast<HashType>(type) << TYPE_SHIFT) & TYPE_MASK) | (setIndex & SET_ID_MASK);
+  }
+
+  static Attribute::Type TypeFromHash(HashType hash)
+  {
+    return static_cast<Type>((hash & TYPE_MASK) >> TYPE_SHIFT);
+  }
+
+  static bool SetFromHash(HashType hash)
+  {
+    return (hash & SET_SHIFT) != 0;
+  }
+
+  static HashType SetIdFromHash(HashType hash)
+  {
+    return (hash & SET_ID_MASK);
+  }
+
+  /**
+   * Convert to Type + setIndex, where setIndex is N for that attr, e.g. "JOINTS_1" => {JOINTS_N, 1}
+   */
+  static HashType HashFromString(const char* s, size_t len);
+
+  /**
+   * Convert to type only, there is no set for POSITION, NORMALS or TANGENT.
+   */
+  static Attribute::Type TargetFromString(const char* s, size_t len);
+
+  Attribute() = delete;
+};
+
+struct Buffer
+{
+  uint32_t         mByteLength;
+  std::string_view mUri;
+  //TODO: extensions
+  //TODO: extras
+};
+
+struct BufferView
+{
+  struct Target
+  {
+    enum Type
+    {
+      NONE,
+      ARRAY_BUFFER         = 34962,
+      ELEMENT_ARRAY_BUFFER = 34963
+    };
+
+    Target() = delete;
+  };
+
+  Ref<Buffer> mBuffer;
+  uint32_t    mByteOffset = 0;
+  uint32_t    mByteLength;
+  uint32_t    mByteStride = 0; // if 0 after reading, it needs to be calculated
+  uint32_t    mTarget;
+  //TODO: extensions
+  //TODO: extras
+};
+
+struct BufferViewClient
+{
+  Ref<BufferView> mBufferView;
+  uint32_t        mByteOffset = 0;
+};
+
+struct ComponentTypedBufferViewClient : BufferViewClient
+{
+  Component::Type mComponentType = Component::INVALID;
+
+  uint32_t GetBytesPerComponent() const;
+};
+
+struct Named
+{
+  std::string_view mName;
+
+protected:
+  Named() = default;
+};
+
+struct Accessor : ComponentTypedBufferViewClient, Named
+{
+  struct Sparse
+  {
+    uint32_t                       mCount;
+    ComponentTypedBufferViewClient mIndices;
+    BufferViewClient               mValues;
+    //TODO: extensions
+    //TODO: extras
+  };
+
+  uint32_t                mCount;
+  bool                    mNormalized = false;
+  AccessorType::Type      mType       = AccessorType::INVALID;
+  std::vector<float>      mMin;
+  std::vector<float>      mMax;
+  std::unique_ptr<Sparse> mSparse;
+  //TODO: extensions
+  //TODO: extras
+
+  uint32_t GetElementSizeBytes() const
+  {
+    return GetBytesPerComponent() * AccessorType::ElementCount(mType);
+  }
+
+  uint32_t GetBytesLength() const
+  {
+    return GetElementSizeBytes() * mCount;
+  }
+
+  void SetSparse(const Sparse& s)
+  {
+    mSparse.reset(new Sparse(s));
+  }
+};
+
+struct Image : Named
+{
+  std::string_view mUri;
+  std::string_view mMimeType;
+  Ref<BufferView>  mBufferView;
+  //TODO: extensions
+  //TODO: extras
+};
+
+struct Filter
+{
+  enum Type
+  {
+    NEAREST                = 9728,
+    LINEAR                 = 9729,
+    NEAREST_MIPMAP_NEAREST = 9984,
+    NEAREST_MIPMAP_LINEAR  = 9985,
+    LINEAR_MIPMAP_NEAREST  = 9986,
+    LINEAR_MIPMAP_LINEAR   = 9987,
+  };
+
+  Filter() = delete;
+};
+
+struct Wrap
+{
+  enum Type
+  {
+    REPEAT          = 10497,
+    CLAMP_TO_EDGE   = 33071,
+    MIRRORED_REPEAT = 33648,
+  };
+
+  Wrap() = delete;
+};
+
+struct Sampler
+{
+  Filter::Type mMinFilter = Filter::LINEAR;
+  Filter::Type mMagFilter = Filter::LINEAR;
+  Wrap::Type   mWrapS     = Wrap::REPEAT;
+  Wrap::Type   mWrapT     = Wrap::REPEAT;
+  //TODO: extensions
+  //TODO: extras
+};
+
+struct Texture
+{
+  Ref<Image>   mSource;
+  Ref<Sampler> mSampler;
+};
+
+struct TextureTransform
+{
+  float         mRotation = 0.0f;
+  Dali::Vector2 mUvOffset = Dali::Vector2::ZERO;
+  Dali::Vector2 mUvScale  = Dali::Vector2::ONE;
+  uint32_t      mTexCoord = 0u;
+
+  operator bool() const
+  {
+    return !Dali::EqualsZero(mRotation) || mUvOffset != Dali::Vector2::ZERO || mUvScale != Dali::Vector2::ONE || mTexCoord != 0u;
+  }
+
+  const Dali::Matrix3 GetTransform() const
+  {
+    // See: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_transform
+    Dali::Matrix3 translation = Dali::Matrix3(1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, mUvOffset.x, mUvOffset.y, 1.0f);
+    Dali::Matrix3 rotation    = Dali::Matrix3(cos(-mRotation), sin(-mRotation), 0.0f, -sin(-mRotation), cos(-mRotation), 0.0f, 0.0f, 0.0f, 1.0f);
+    Dali::Matrix3 scale       = Dali::Matrix3(mUvScale.x, 0.0f, 0.0f, 0.0f, mUvScale.y, 0.0f, 0.0f, 0.0f, 1.0f);
+
+    return translation * rotation * scale;
+  }
+};
+
+struct TextureExtensions
+{
+  TextureTransform mTextureTransform;
+
+  operator bool() const
+  {
+    return mTextureTransform;
+  }
+};
+
+struct TextureInfo
+{
+  Ref<gltf2::Texture> mTexture;
+  uint32_t            mTexCoord = 0;
+  float               mScale    = 1.f;
+  float               mStrength = 1.f;
+
+  TextureExtensions mTextureExtensions;
+
+  operator bool() const
+  {
+    return mTexture;
+  }
+};
+
+/**
+ * Material Ior is supported with KHR_materials_ior extension.
+ * https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_ior
+ */
+struct MaterialIor
+{
+  float mIor = UNDEFINED_FLOAT_VALUE;
+};
+
+/**
+ * Material Specular is supported with KHR_materials_ior extension.
+ * https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_specular
+ */
+struct MaterialSpecular
+{
+  float         mSpecularFactor = 1.0f;
+  TextureInfo   mSpecularTexture;
+  Dali::Vector3 mSpecularColorFactor = Dali::Vector3::ONE;
+  TextureInfo   mSpecularColorTexture;
+};
+
+struct MaterialExtensions
+{
+  MaterialSpecular mMaterialSpecular;
+  MaterialIor      mMaterialIor;
+};
+
+struct Material : Named
+{
+  struct Pbr // MetallicRoughness
+  {
+    Dali::Vector4 mBaseColorFactor = Dali::Vector4::ONE;
+    TextureInfo   mBaseColorTexture;
+    float         mMetallicFactor  = 1.f;
+    float         mRoughnessFactor = 1.f;
+    TextureInfo   mMetallicRoughnessTexture;
+    //TODO: extensions
+    //TODO: extras
+  };
+
+  Pbr             mPbrMetallicRoughness;
+  TextureInfo     mNormalTexture;
+  TextureInfo     mOcclusionTexture;
+  TextureInfo     mEmissiveTexture;
+  Dali::Vector3   mEmissiveFactor;
+  AlphaMode::Type mAlphaMode   = AlphaMode::OPAQUE;
+  float           mAlphaCutoff = .5f;
+  bool            mDoubleSided = false;
+
+  //extensions
+  MaterialExtensions mMaterialExtensions;
+  //TODO: extras
+};
+
+struct Mesh : Named
+{
+  struct Primitive
+  {
+    enum Mode
+    {
+      POINTS,
+      LINES,
+      LINE_LOOP,
+      LINE_STRIP,
+      TRIANGLES,
+      TRIANGLE_STRIP,
+      TRIANGLE_FAN,
+      INVALID
+    };
+
+    std::map<Attribute::HashType, Ref<Accessor>>          mAttributes;
+    std::vector<std::map<Attribute::Type, Ref<Accessor>>> mTargets;
+    Ref<Accessor>                                         mIndices;
+    Ref<Material>                                         mMaterial;
+    Mode                                                  mMode = TRIANGLES;
+
+    //TODO: [morph] targets
+    //TODO: extras
+    //TODO: extensions
+  };
+
+  struct Extras
+  {
+    std::vector<std::string_view> mTargetNames;
+
+    //TODO: extras
+  };
+
+  struct Extensions
+  {
+    std::vector<std::string_view> mSXRTargetsNames;
+    std::vector<std::string_view> mAvatarShapeNames;
+
+    //TODO: extensions
+  };
+
+  std::vector<Primitive> mPrimitives;
+  std::vector<float>     mWeights;
+  Extras                 mExtras;
+  Extensions             mExtensions;
+};
+
+struct Node;
+
+struct Skin : Named
+{
+  Ref<Accessor>          mInverseBindMatrices;
+  Ref<Node>              mSkeleton;
+  std::vector<Ref<Node>> mJoints;
+  //TODO: extras
+  //TODO: extensions
+};
+
+struct Camera : Named
+{
+  struct Perspective
+  {
+    float mAspectRatio = UNDEFINED_FLOAT_VALUE;
+    float mYFov        = UNDEFINED_FLOAT_VALUE;
+    float mZFar        = UNDEFINED_FLOAT_VALUE;
+    float mZNear       = UNDEFINED_FLOAT_VALUE;
+    //TODO: extras
+    //TODO: extensions
+  };
+
+  struct Orthographic
+  {
+    float mXMag  = UNDEFINED_FLOAT_VALUE;
+    float mYMag  = UNDEFINED_FLOAT_VALUE;
+    float mZFar  = UNDEFINED_FLOAT_VALUE;
+    float mZNear = UNDEFINED_FLOAT_VALUE;
+    //TODO: extras
+    //TODO: extensions
+  };
+
+  std::string_view mType;
+  Perspective      mPerspective;
+  Orthographic     mOrthographic;
+  //TODO: extras
+  //TODO: extensions
+};
+
+struct Node : Named
+{
+  Dali::Vector3    mTranslation = Dali::Vector3::ZERO;
+  Dali::Quaternion mRotation    = Dali::Quaternion::IDENTITY;
+  Dali::Vector3    mScale       = Dali::Vector3::ONE;
+
+  Ref<Camera>            mCamera;
+  std::vector<Ref<Node>> mChildren;
+  Ref<Mesh>              mMesh;
+
+  Ref<Skin> mSkin;
+  //TODO: [morph] weights
+  //TODO: extras
+  //TODO: extensions
+
+  void SetMatrix(const Dali::Matrix& m);
+};
+
+struct Animation : Named
+{
+  struct Sampler
+  {
+    struct Interpolation
+    {
+      enum Type
+      {
+        STEP,
+        LINEAR,
+        CUBICSPLINE,
+        INVALID
+      };
+      static Type FromString(const char* s, size_t len);
+    };
+
+    Ref<Accessor>       mInput;
+    Ref<Accessor>       mOutput;
+    Interpolation::Type mInterpolation;
+
+    //TODO: extras
+    //TODO: extensions
+  };
+
+  struct Channel
+  {
+    struct Target
+    {
+      enum Type
+      {
+        TRANSLATION,
+        ROTATION,
+        SCALE,
+        WEIGHTS,
+        INVALID
+      };
+
+      static Type FromString(const char* s, size_t len);
+
+      Ref<Node> mNode;
+      Type      mPath;
+    };
+
+    Ref<Sampler> mSampler;
+    Target       mTarget;
+    //TODO: extras
+    //TODO: extensions
+  };
+
+  std::vector<Sampler> mSamplers;
+  std::vector<Channel> mChannels;
+};
+
+struct Scene : Named
+{
+  std::vector<Ref<Node>> mNodes;
+};
+
+enum ExtensionFlags : uint32_t
+{
+  NONE                   = Dali::Scene3D::Loader::NthBit(0),
+  KHR_MESH_QUANTIZATION  = Dali::Scene3D::Loader::NthBit(1), // See https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_texture_transform
+  KHR_TEXTURE_TRANSFORM  = Dali::Scene3D::Loader::NthBit(2), // See https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_mesh_quantization
+  KHR_MATERIALS_IOR      = Dali::Scene3D::Loader::NthBit(3), // See https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_materials_ior
+  KHR_MATERIALS_SPECULAR = Dali::Scene3D::Loader::NthBit(4), // See https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_materials_specular
+
+};
+
+struct Document
+{
+  Asset mAsset;
+
+  std::vector<Buffer>     mBuffers;
+  std::vector<BufferView> mBufferViews;
+  std::vector<Accessor>   mAccessors;
+
+  std::vector<Image>    mImages;
+  std::vector<Sampler>  mSamplers;
+  std::vector<Texture>  mTextures;
+  std::vector<Material> mMaterials;
+
+  std::vector<Mesh> mMeshes;
+  std::vector<Skin> mSkins;
+
+  std::vector<Camera> mCameras;
+  std::vector<Node>   mNodes;
+
+  std::vector<Animation> mAnimations;
+
+  std::vector<std::string_view> mExtensionsUsed;
+  std::vector<std::string_view> mExtensionsRequired;
+
+  uint32_t mExtensionFlags{0};
+
+  std::vector<Scene> mScenes;
+  Ref<Scene>         mScene;
+
+  Document()                = default;
+  Document(const Document&) = delete;
+  Document(Document&&)      = default;
+
+  Document& operator=(const Document&) = delete;
+  Document& operator=(Document&&) = default;
+};
+
+/**
+ * @brief Provides a json::Property<T>::ReadFn for interpreting unsigned integers
+ *  as a Ref<U> into a std::vector<U> data member of a type T.
+ */
+template<typename T>
+struct RefReader
+{
+  static T* sObject;
+
+  template<typename U, std::vector<U> T::*V>
+  static Ref<U> Read(const json_value_s& j)
+  {
+    uint32_t index = json::Read::Number<uint32_t>(j);
+    return Ref<U>(sObject->*V, index);
+  }
+};
+
+template<typename T>
+T* RefReader<T>::sObject = nullptr;
+
+/**
+ * @brief Convenience method to set the object for RefReader.
+ */
+template<typename T>
+void SetRefReaderObject(T& object)
+{
+  RefReader<T>::sObject = &object;
+}
+
+/**
+ * @brief Reads a string and attempts to convert it to an enum.
+ * @note The enum must: 1, be called Type, nested to T, 2, provide a FromString static method taking a const char*
+ *  (string data) and a size_t (string length) and returning T::Type.
+ */
+template<typename T> // T must have a nested enum called Type and a static Type FromString(const char*) method.
+typename T::Type ReadStringEnum(const json_value_s& j)
+{
+  auto str = json::Read::StringView(j);
+
+  return T::FromString(str.data(), str.size());
+}
+
+/**
+ * @brief Convenience method to attempt to create a Dali vector type T from an array of floats.
+ * @note T must provide an AsFloat() member method returning the non-const array of its
+ *  float components.
+ */
+template<typename T>
+inline T ReadDaliVector(const json_value_s& j)
+{
+  std::vector<float> floats = json::Read::Array<float, json::Read::Number<float>>(j);
+  T                  result;
+  std::copy(floats.begin(), std::min(floats.end(), floats.begin() + sizeof(T) / sizeof(float)), result.AsFloat());
+  return result;
+}
+
+/**
+ * @brief Convenience method to attemt to read a Quaternion, which implicitly converts
+ *  to Vector4 but fails to provide an AsFloat() method.
+ */
+Dali::Quaternion ReadQuaternion(const json_value_s& j);
+
+} // namespace gltf2
+
+#endif //DALI_SCENE3D_LOADER_GLTF2_ASSET_H_
diff --git a/dali-scene3d/internal/loader/gltf2-loader-impl.cpp b/dali-scene3d/internal/loader/gltf2-loader-impl.cpp
new file mode 100644
index 0000000..d4e0614
--- /dev/null
+++ b/dali-scene3d/internal/loader/gltf2-loader-impl.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/internal/loader/gltf2-loader-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/gltf2-util.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace gt = gltf2;
+namespace js = json;
+
+namespace Dali::Scene3D::Loader::Internal
+{
+bool Gltf2LoaderImpl::LoadModel(const std::string& url, Dali::Scene3D::Loader::LoadResult& result)
+{
+  bool failed   = false;
+  auto gltfText = LoadTextFile(url.c_str(), &failed);
+  if(failed)
+  {
+    DALI_LOG_ERROR("Failed to load %s\n", url.c_str());
+    return false;
+  }
+
+  json::unique_ptr root(json_parse(gltfText.c_str(), gltfText.size()));
+  if(!root)
+  {
+    DALI_LOG_ERROR("Failed to parse %s\n", url.c_str());
+    return false;
+  }
+
+  gt::Document document;
+
+  bool isMRendererModel(false);
+  if(!Gltf2Util::GenerateDocument(root, document, isMRendererModel))
+  {
+    return false;
+  }
+
+  auto                         path = url.substr(0, url.rfind('/') + 1);
+  Gltf2Util::ConversionContext context{result, path, INVALID_INDEX};
+
+  Gltf2Util::ConvertGltfToContext(document, context, isMRendererModel);
+
+  return true;
+}
+
+} // namespace Dali::Scene3D::Loader::Internal
diff --git a/dali-scene3d/internal/loader/gltf2-loader-impl.h b/dali-scene3d/internal/loader/gltf2-loader-impl.h
new file mode 100644
index 0000000..a4dfc6e
--- /dev/null
+++ b/dali-scene3d/internal/loader/gltf2-loader-impl.h
@@ -0,0 +1,41 @@
+#ifndef DALI_SCENE3D_LOADER_GLTF2_LOADER_IMPL_H
+#define DALI_SCENE3D_LOADER_GLTF2_LOADER_IMPL_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/threading/mutex.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/model-loader-impl.h>
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader::Internal
+{
+class Gltf2LoaderImpl : public ModelLoaderImpl
+{
+public:
+  /**
+   * @copydoc Dali::Scene3D::Loader::Internal::ModelLoaderImpl::LoadMode()
+   */
+  bool LoadModel(const std::string& url, Dali::Scene3D::Loader::LoadResult& result) override;
+};
+
+} // namespace Dali::Scene3D::Loader::Internal
+
+#endif // DALI_SCENE3D_LOADER_GLTF2_LOADER_IMPL_H
diff --git a/dali-scene3d/internal/loader/gltf2-util.cpp b/dali-scene3d/internal/loader/gltf2-util.cpp
new file mode 100644
index 0000000..6e572b7
--- /dev/null
+++ b/dali-scene3d/internal/loader/gltf2-util.cpp
@@ -0,0 +1,1700 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/loader/gltf2-util.h>
+
+// EXTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/utils.h>
+#include <dali/devel-api/scripting/scripting.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/integration-api/debug.h>
+#include <limits> ///< for std::numeric_limits
+
+using namespace Dali::Scene3D::Loader;
+
+namespace Dali::Scene3D::Loader::Internal
+{
+namespace Gltf2Util
+{
+static constexpr std::string_view MRENDERER_MODEL_IDENTIFICATION = "M-Renderer";
+static constexpr std::string_view POSITION_PROPERTY              = "position";
+static constexpr std::string_view ORIENTATION_PROPERTY           = "orientation";
+static constexpr std::string_view SCALE_PROPERTY                 = "scale";
+static constexpr std::string_view BLEND_SHAPE_WEIGHTS_UNIFORM    = "uBlendShapeWeight";
+static constexpr std::string_view ROOT_NODE_NAME                 = "RootNode";
+static const Vector3              SCALE_TO_ADJUST(100.0f, 100.0f, 100.0f);
+
+static const Geometry::Type GLTF2_TO_DALI_PRIMITIVES[]{
+  Geometry::POINTS,
+  Geometry::LINES,
+  Geometry::LINE_LOOP,
+  Geometry::LINE_STRIP,
+  Geometry::TRIANGLES,
+  Geometry::TRIANGLE_STRIP,
+  Geometry::TRIANGLE_FAN}; //...because Dali swaps the last two.
+
+static const Dali::Scripting::StringEnum EXTENSION_STRING_TABLE[] =
+  {
+    {"NONE", gltf2::ExtensionFlags::NONE},
+    {"KHR_mesh_quantization", gltf2::ExtensionFlags::KHR_MESH_QUANTIZATION},
+    {"KHR_texture_transform", gltf2::ExtensionFlags::KHR_TEXTURE_TRANSFORM},
+    {"KHR_materials_ior", gltf2::ExtensionFlags::KHR_MATERIALS_IOR},
+    {"KHR_materials_specular", gltf2::ExtensionFlags::KHR_MATERIALS_SPECULAR},
+};
+static const unsigned int EXTENSION_STRING_TABLE_COUNT = sizeof(EXTENSION_STRING_TABLE) / sizeof(EXTENSION_STRING_TABLE[0]);
+
+std::vector<gltf2::Animation> ReadAnimationArray(const json_value_s& j)
+{
+  auto results = json::Read::Array<gltf2::Animation, json::ObjectReader<gltf2::Animation>::Read>(j);
+
+  for(auto& animation : results)
+  {
+    for(auto& channel : animation.mChannels)
+    {
+      channel.mSampler.UpdateVector(animation.mSamplers);
+    }
+  }
+
+  return results;
+}
+
+void ApplyAccessorMinMax(const gltf2::Accessor& accessor, float* values)
+{
+  DALI_ASSERT_ALWAYS(accessor.mMax.empty() || gltf2::AccessorType::ElementCount(accessor.mType) == accessor.mMax.size());
+  DALI_ASSERT_ALWAYS(accessor.mMin.empty() || gltf2::AccessorType::ElementCount(accessor.mType) == accessor.mMin.size());
+  MeshDefinition::Blob::ApplyMinMax(accessor.mMin, accessor.mMax, accessor.mCount, values);
+}
+
+const json::Reader<gltf2::Buffer>& GetBufferReader()
+{
+  static const auto BUFFER_READER = std::move(json::Reader<gltf2::Buffer>()
+                                                .Register(*json::MakeProperty("byteLength", json::Read::Number<uint32_t>, &gltf2::Buffer::mByteLength))
+                                                .Register(*json::MakeProperty("uri", json::Read::StringView, &gltf2::Buffer::mUri)));
+  return BUFFER_READER;
+}
+
+const json::Reader<gltf2::BufferView>& GetBufferViewReader()
+{
+  static const auto BUFFER_VIEW_READER = std::move(json::Reader<gltf2::BufferView>()
+                                                     .Register(*json::MakeProperty("buffer", gltf2::RefReader<gltf2::Document>::Read<gltf2::Buffer, &gltf2::Document::mBuffers>, &gltf2::BufferView::mBuffer))
+                                                     .Register(*json::MakeProperty("byteOffset", json::Read::Number<uint32_t>, &gltf2::BufferView::mByteOffset))
+                                                     .Register(*json::MakeProperty("byteLength", json::Read::Number<uint32_t>, &gltf2::BufferView::mByteLength))
+                                                     .Register(*json::MakeProperty("byteStride", json::Read::Number<uint32_t>, &gltf2::BufferView::mByteStride))
+                                                     .Register(*json::MakeProperty("target", json::Read::Number<uint32_t>, &gltf2::BufferView::mTarget)));
+  return BUFFER_VIEW_READER;
+}
+
+const json::Reader<gltf2::BufferViewClient>& GetBufferViewClientReader()
+{
+  static const auto BUFFER_VIEW_CLIENT_READER = std::move(json::Reader<gltf2::BufferViewClient>()
+                                                            .Register(*json::MakeProperty("bufferView", gltf2::RefReader<gltf2::Document>::Read<gltf2::BufferView, &gltf2::Document::mBufferViews>, &gltf2::BufferViewClient::mBufferView))
+                                                            .Register(*json::MakeProperty("byteOffset", json::Read::Number<uint32_t>, &gltf2::BufferViewClient::mByteOffset)));
+  return BUFFER_VIEW_CLIENT_READER;
+}
+
+const json::Reader<gltf2::ComponentTypedBufferViewClient>& GetComponentTypedBufferViewClientReader()
+{
+  static const auto COMPONENT_TYPED_BUFFER_VIEW_CLIENT_READER = std::move(json::Reader<gltf2::ComponentTypedBufferViewClient>()
+                                                                            .Register(*new json::Property<gltf2::ComponentTypedBufferViewClient, gltf2::Ref<gltf2::BufferView>>("bufferView", gltf2::RefReader<gltf2::Document>::Read<gltf2::BufferView, &gltf2::Document::mBufferViews>, &gltf2::ComponentTypedBufferViewClient::mBufferView))
+                                                                            .Register(*new json::Property<gltf2::ComponentTypedBufferViewClient, uint32_t>("byteOffset", json::Read::Number<uint32_t>, &gltf2::ComponentTypedBufferViewClient::mByteOffset))
+                                                                            .Register(*json::MakeProperty("componentType", json::Read::Enum<gltf2::Component::Type>, &gltf2::ComponentTypedBufferViewClient::mComponentType)));
+  return COMPONENT_TYPED_BUFFER_VIEW_CLIENT_READER;
+}
+
+const json::Reader<gltf2::Accessor::Sparse>& GetAccessorSparseReader()
+{
+  static const auto ACCESSOR_SPARSE_READER = std::move(json::Reader<gltf2::Accessor::Sparse>()
+                                                         .Register(*json::MakeProperty("count", json::Read::Number<uint32_t>, &gltf2::Accessor::Sparse::mCount))
+                                                         .Register(*json::MakeProperty("indices", json::ObjectReader<gltf2::ComponentTypedBufferViewClient>::Read, &gltf2::Accessor::Sparse::mIndices))
+                                                         .Register(*json::MakeProperty("values", json::ObjectReader<gltf2::BufferViewClient>::Read, &gltf2::Accessor::Sparse::mValues)));
+  return ACCESSOR_SPARSE_READER;
+}
+
+const json::Reader<gltf2::Accessor>& GetAccessorReader()
+{
+  static const auto ACCESSOR_READER = std::move(json::Reader<gltf2::Accessor>()
+                                                  .Register(*new json::Property<gltf2::Accessor, gltf2::Ref<gltf2::BufferView>>("bufferView",
+                                                                                                                                gltf2::RefReader<gltf2::Document>::Read<gltf2::BufferView, &gltf2::Document::mBufferViews>,
+                                                                                                                                &gltf2::Accessor::mBufferView))
+                                                  .Register(*new json::Property<gltf2::Accessor, uint32_t>("byteOffset", json::Read::Number<uint32_t>, &gltf2::Accessor::mByteOffset))
+                                                  .Register(*new json::Property<gltf2::Accessor, gltf2::Component::Type>("componentType",
+                                                                                                                         json::Read::Enum<gltf2::Component::Type>,
+                                                                                                                         &gltf2::Accessor::mComponentType))
+                                                  .Register(*new json::Property<gltf2::Accessor, std::string_view>("name", json::Read::StringView, &gltf2::Accessor::mName))
+                                                  .Register(*json::MakeProperty("count", json::Read::Number<uint32_t>, &gltf2::Accessor::mCount))
+                                                  .Register(*json::MakeProperty("normalized", json::Read::Boolean, &gltf2::Accessor::mNormalized))
+                                                  .Register(*json::MakeProperty("type", gltf2::ReadStringEnum<gltf2::AccessorType>, &gltf2::Accessor::mType))
+                                                  .Register(*json::MakeProperty("min", json::Read::Array<float, json::Read::Number>, &gltf2::Accessor::mMin))
+                                                  .Register(*json::MakeProperty("max", json::Read::Array<float, json::Read::Number>, &gltf2::Accessor::mMax))
+                                                  .Register(*new json::Property<gltf2::Accessor, gltf2::Accessor::Sparse>("sparse", json::ObjectReader<gltf2::Accessor::Sparse>::Read, &gltf2::Accessor::SetSparse)));
+  return ACCESSOR_READER;
+}
+
+const json::Reader<gltf2::Image>& GetImageReader()
+{
+  static const auto IMAGE_READER = std::move(json::Reader<gltf2::Image>()
+                                               .Register(*new json::Property<gltf2::Image, std::string_view>("name", json::Read::StringView, &gltf2::Material::mName))
+                                               .Register(*json::MakeProperty("uri", json::Read::StringView, &gltf2::Image::mUri))
+                                               .Register(*json::MakeProperty("mimeType", json::Read::StringView, &gltf2::Image::mMimeType))
+                                               .Register(*json::MakeProperty("bufferView", gltf2::RefReader<gltf2::Document>::Read<gltf2::BufferView, &gltf2::Document::mBufferViews>, &gltf2::Image::mBufferView)));
+  return IMAGE_READER;
+}
+
+const json::Reader<gltf2::Sampler>& GetSamplerReader()
+{
+  static const auto SAMPLER_READER = std::move(json::Reader<gltf2::Sampler>()
+                                                 .Register(*json::MakeProperty("minFilter", json::Read::Enum<gltf2::Filter::Type>, &gltf2::Sampler::mMinFilter))
+                                                 .Register(*json::MakeProperty("magFilter", json::Read::Enum<gltf2::Filter::Type>, &gltf2::Sampler::mMagFilter))
+                                                 .Register(*json::MakeProperty("wrapS", json::Read::Enum<gltf2::Wrap::Type>, &gltf2::Sampler::mWrapS))
+                                                 .Register(*json::MakeProperty("wrapT", json::Read::Enum<gltf2::Wrap::Type>, &gltf2::Sampler::mWrapT)));
+  return SAMPLER_READER;
+}
+
+const json::Reader<gltf2::Texture>& GetTextureReader()
+{
+  static const auto TEXURE_READER = std::move(json::Reader<gltf2::Texture>()
+                                                .Register(*json::MakeProperty("source", gltf2::RefReader<gltf2::Document>::Read<gltf2::Image, &gltf2::Document::mImages>, &gltf2::Texture::mSource))
+                                                .Register(*json::MakeProperty("sampler", gltf2::RefReader<gltf2::Document>::Read<gltf2::Sampler, &gltf2::Document::mSamplers>, &gltf2::Texture::mSampler)));
+  return TEXURE_READER;
+}
+
+const json::Reader<gltf2::TextureTransform>& GetTextureTransformReader()
+{
+  static const auto TEXURE_TRANSFORM_READER = std::move(json::Reader<gltf2::TextureTransform>()
+                                                          .Register(*json::MakeProperty("rotation", json::Read::Number<float>, &gltf2::TextureTransform::mRotation))
+                                                          .Register(*json::MakeProperty("offset", gltf2::ReadDaliVector<Vector2>, &gltf2::TextureTransform::mUvOffset))
+                                                          .Register(*json::MakeProperty("scale", gltf2::ReadDaliVector<Vector2>, &gltf2::TextureTransform::mUvScale))
+                                                          .Register(*json::MakeProperty("texCoord", json::Read::Number<uint32_t>, &gltf2::TextureTransform::mTexCoord)));
+  return TEXURE_TRANSFORM_READER;
+}
+
+const json::Reader<gltf2::TextureExtensions>& GetTextureExtensionsReader()
+{
+  static const auto TEXTURE_EXTENSION_READER = std::move(json::Reader<gltf2::TextureExtensions>()
+                                                           .Register(*json::MakeProperty("KHR_texture_transform", json::ObjectReader<gltf2::TextureTransform>::Read, &gltf2::TextureExtensions::mTextureTransform)));
+  return TEXTURE_EXTENSION_READER;
+}
+
+const json::Reader<gltf2::TextureInfo>& GetTextureInfoReader()
+{
+  static const auto TEXURE_INFO_READER = std::move(json::Reader<gltf2::TextureInfo>()
+                                                     .Register(*json::MakeProperty("index", gltf2::RefReader<gltf2::Document>::Read<gltf2::Texture, &gltf2::Document::mTextures>, &gltf2::TextureInfo::mTexture))
+                                                     .Register(*json::MakeProperty("texCoord", json::Read::Number<uint32_t>, &gltf2::TextureInfo::mTexCoord))
+                                                     .Register(*json::MakeProperty("scale", json::Read::Number<float>, &gltf2::TextureInfo::mScale))
+                                                     .Register(*json::MakeProperty("strength", json::Read::Number<float>, &gltf2::TextureInfo::mStrength))
+                                                     .Register(*json::MakeProperty("extensions", json::ObjectReader<gltf2::TextureExtensions>::Read, &gltf2::TextureInfo::mTextureExtensions)));
+  return TEXURE_INFO_READER;
+}
+
+const json::Reader<gltf2::Material::Pbr>& GetMaterialPbrReader()
+{
+  static const auto MATERIAL_PBR_READER = std::move(json::Reader<gltf2::Material::Pbr>()
+                                                      .Register(*json::MakeProperty("baseColorFactor", gltf2::ReadDaliVector<Vector4>, &gltf2::Material::Pbr::mBaseColorFactor))
+                                                      .Register(*json::MakeProperty("baseColorTexture", json::ObjectReader<gltf2::TextureInfo>::Read, &gltf2::Material::Pbr::mBaseColorTexture))
+                                                      .Register(*json::MakeProperty("metallicFactor", json::Read::Number<float>, &gltf2::Material::Pbr::mMetallicFactor))
+                                                      .Register(*json::MakeProperty("roughnessFactor", json::Read::Number<float>, &gltf2::Material::Pbr::mRoughnessFactor))
+                                                      .Register(*json::MakeProperty("metallicRoughnessTexture", json::ObjectReader<gltf2::TextureInfo>::Read, &gltf2::Material::Pbr::mMetallicRoughnessTexture)));
+  return MATERIAL_PBR_READER;
+}
+
+const json::Reader<gltf2::MaterialSpecular>& GetMaterialSpecularReader()
+{
+  static const auto MATERIAL_SPECULAR_READER = std::move(json::Reader<gltf2::MaterialSpecular>()
+                                                           .Register(*json::MakeProperty("specularFactor", json::Read::Number<float>, &gltf2::MaterialSpecular::mSpecularFactor))
+                                                           .Register(*json::MakeProperty("specularTexture", json::ObjectReader<gltf2::TextureInfo>::Read, &gltf2::MaterialSpecular::mSpecularTexture))
+                                                           .Register(*json::MakeProperty("specularColorFactor", gltf2::ReadDaliVector<Vector3>, &gltf2::MaterialSpecular::mSpecularColorFactor))
+                                                           .Register(*json::MakeProperty("specularColorTexture", json::ObjectReader<gltf2::TextureInfo>::Read, &gltf2::MaterialSpecular::mSpecularColorTexture)));
+  return MATERIAL_SPECULAR_READER;
+}
+
+const json::Reader<gltf2::MaterialIor>& GetMaterialIorReader()
+{
+  static const auto MATERIAL_IOR_READER = std::move(json::Reader<gltf2::MaterialIor>()
+                                                      .Register(*json::MakeProperty("ior", json::Read::Number<float>, &gltf2::MaterialIor::mIor)));
+  return MATERIAL_IOR_READER;
+}
+
+const json::Reader<gltf2::MaterialExtensions>& GetMaterialExtensionsReader()
+{
+  static const auto MATERIAL_EXTENSION_READER = std::move(json::Reader<gltf2::MaterialExtensions>()
+                                                            .Register(*json::MakeProperty("KHR_materials_ior", json::ObjectReader<gltf2::MaterialIor>::Read, &gltf2::MaterialExtensions::mMaterialIor))
+                                                            .Register(*json::MakeProperty("KHR_materials_specular", json::ObjectReader<gltf2::MaterialSpecular>::Read, &gltf2::MaterialExtensions::mMaterialSpecular)));
+  return MATERIAL_EXTENSION_READER;
+}
+
+const json::Reader<gltf2::Material>& GetMaterialReader()
+{
+  static const auto MATERIAL_READER = std::move(json::Reader<gltf2::Material>()
+                                                  .Register(*new json::Property<gltf2::Material, std::string_view>("name", json::Read::StringView, &gltf2::Material::mName))
+                                                  .Register(*json::MakeProperty("pbrMetallicRoughness", json::ObjectReader<gltf2::Material::Pbr>::Read, &gltf2::Material::mPbrMetallicRoughness))
+                                                  .Register(*json::MakeProperty("normalTexture", json::ObjectReader<gltf2::TextureInfo>::Read, &gltf2::Material::mNormalTexture))
+                                                  .Register(*json::MakeProperty("occlusionTexture", json::ObjectReader<gltf2::TextureInfo>::Read, &gltf2::Material::mOcclusionTexture))
+                                                  .Register(*json::MakeProperty("emissiveTexture", json::ObjectReader<gltf2::TextureInfo>::Read, &gltf2::Material::mEmissiveTexture))
+                                                  .Register(*json::MakeProperty("emissiveFactor", gltf2::ReadDaliVector<Vector3>, &gltf2::Material::mEmissiveFactor))
+                                                  .Register(*json::MakeProperty("alphaMode", gltf2::ReadStringEnum<gltf2::AlphaMode>, &gltf2::Material::mAlphaMode))
+                                                  .Register(*json::MakeProperty("alphaCutoff", json::Read::Number<float>, &gltf2::Material::mAlphaCutoff))
+                                                  .Register(*json::MakeProperty("doubleSided", json::Read::Boolean, &gltf2::Material::mDoubleSided))
+                                                  .Register(*json::MakeProperty("extensions", json::ObjectReader<gltf2::MaterialExtensions>::Read, &gltf2::Material::mMaterialExtensions)));
+  return MATERIAL_READER;
+}
+
+std::map<gltf2::Attribute::HashType, gltf2::Ref<gltf2::Accessor>> ReadMeshPrimitiveAttributes(const json_value_s& j)
+{
+  auto&                                                             jsonObject = json::Cast<json_object_s>(j);
+  std::map<gltf2::Attribute::HashType, gltf2::Ref<gltf2::Accessor>> result;
+
+  auto element = jsonObject.start;
+  while(element)
+  {
+    auto jsonString = *element->name;
+
+    gltf2::Attribute::HashType hash = gltf2::Attribute::HashFromString(jsonString.string, jsonString.string_size);
+
+    result[hash] =
+      gltf2::RefReader<gltf2::Document>::Read<gltf2::Accessor, &gltf2::Document::mAccessors>(*element->value);
+    element = element->next;
+  }
+  return result;
+}
+
+std::map<gltf2::Attribute::Type, gltf2::Ref<gltf2::Accessor>> ReadMeshPrimitiveAttributes2(const json_value_s& j)
+{
+  auto&                                                         jsonObject = json::Cast<json_object_s>(j);
+  std::map<gltf2::Attribute::Type, gltf2::Ref<gltf2::Accessor>> result;
+
+  auto element = jsonObject.start;
+  while(element)
+  {
+    auto jsonString = *element->name;
+
+    result[gltf2::Attribute::TargetFromString(jsonString.string, jsonString.string_size)] = gltf2::RefReader<gltf2::Document>::Read<gltf2::Accessor, &gltf2::Document::mAccessors>(*element->value);
+
+    element = element->next;
+  }
+  return result;
+}
+
+std::vector<std::map<gltf2::Attribute::Type, gltf2::Ref<gltf2::Accessor>>> ReadMeshPrimitiveTargets(const json_value_s& j)
+{
+  auto&                                                                      jsonObject = json::Cast<json_array_s>(j);
+  std::vector<std::map<gltf2::Attribute::Type, gltf2::Ref<gltf2::Accessor>>> result;
+
+  result.reserve(jsonObject.length);
+
+  auto element = jsonObject.start;
+  while(element)
+  {
+    result.push_back(std::move(ReadMeshPrimitiveAttributes2(*element->value)));
+    element = element->next;
+  }
+
+  return result;
+}
+
+const json::Reader<gltf2::Mesh::Primitive>& GetMeshPrimitiveReader()
+{
+  static const auto MESH_PRIMITIVE_READER = std::move(json::Reader<gltf2::Mesh::Primitive>()
+                                                        .Register(*json::MakeProperty("attributes", ReadMeshPrimitiveAttributes, &gltf2::Mesh::Primitive::mAttributes))
+                                                        .Register(*json::MakeProperty("indices", gltf2::RefReader<gltf2::Document>::Read<gltf2::Accessor, &gltf2::Document::mAccessors>, &gltf2::Mesh::Primitive::mIndices))
+                                                        .Register(*json::MakeProperty("material", gltf2::RefReader<gltf2::Document>::Read<gltf2::Material, &gltf2::Document::mMaterials>, &gltf2::Mesh::Primitive::mMaterial))
+                                                        .Register(*json::MakeProperty("mode", json::Read::Enum<gltf2::Mesh::Primitive::Mode>, &gltf2::Mesh::Primitive::mMode))
+                                                        .Register(*json::MakeProperty("targets", ReadMeshPrimitiveTargets, &gltf2::Mesh::Primitive::mTargets)));
+  return MESH_PRIMITIVE_READER;
+}
+
+const json::Reader<gltf2::Mesh::Extras>& GetMeshExtrasReader()
+{
+  static const auto MESH_EXTRAS_READER = std::move(json::Reader<gltf2::Mesh::Extras>()
+                                                     .Register(*json::MakeProperty("targetNames", json::Read::Array<std::string_view, json::Read::StringView>, &gltf2::Mesh::Extras::mTargetNames)));
+  return MESH_EXTRAS_READER;
+}
+
+std::vector<std::string_view> ReadMeshExtensionsTargetsName(const json_value_s& j)
+{
+  auto&                         jsonObject = json::Cast<json_object_s>(j);
+  std::vector<std::string_view> result;
+
+  auto element = jsonObject.start;
+  while(element)
+  {
+    auto     jsonString = *element->name;
+    uint32_t index      = json::Read::Number<uint32_t>(*element->value);
+
+    if(result.size() <= index)
+    {
+      DALI_ASSERT_ALWAYS(index < std::numeric_limits<uint32_t>::max());
+      result.resize(index + 1u);
+    }
+
+    result[index] = json::Read::StringView(jsonString);
+
+    element = element->next;
+  }
+  return result;
+}
+
+const json::Reader<gltf2::Mesh::Extensions>& GetMeshExtensionsReader()
+{
+  static const auto MESH_EXTENSIONS_READER = std::move(json::Reader<gltf2::Mesh::Extensions>()
+                                                         .Register(*json::MakeProperty("SXR_targets_names", ReadMeshExtensionsTargetsName, &gltf2::Mesh::Extensions::mSXRTargetsNames))
+                                                         .Register(*json::MakeProperty("avatar_shape_names", ReadMeshExtensionsTargetsName, &gltf2::Mesh::Extensions::mAvatarShapeNames)));
+  return MESH_EXTENSIONS_READER;
+}
+
+const json::Reader<gltf2::Mesh>& GetMeshReader()
+{
+  static const auto MESH_READER = std::move(json::Reader<gltf2::Mesh>()
+                                              .Register(*new json::Property<gltf2::Mesh, std::string_view>("name", json::Read::StringView, &gltf2::Mesh::mName))
+                                              .Register(*json::MakeProperty("primitives",
+                                                                            json::Read::Array<gltf2::Mesh::Primitive, json::ObjectReader<gltf2::Mesh::Primitive>::Read>,
+                                                                            &gltf2::Mesh::mPrimitives))
+                                              .Register(*json::MakeProperty("weights", json::Read::Array<float, json::Read::Number>, &gltf2::Mesh::mWeights))
+                                              .Register(*json::MakeProperty("extras", json::ObjectReader<gltf2::Mesh::Extras>::Read, &gltf2::Mesh::mExtras))
+                                              .Register(*json::MakeProperty("extensions", json::ObjectReader<gltf2::Mesh::Extensions>::Read, &gltf2::Mesh::mExtensions)));
+  return MESH_READER;
+}
+
+const json::Reader<gltf2::Skin>& GetSkinReader()
+{
+  static const auto SKIN_READER = std::move(json::Reader<gltf2::Skin>()
+                                              .Register(*new json::Property<gltf2::Skin, std::string_view>("name", json::Read::StringView, &gltf2::Skin::mName))
+                                              .Register(*json::MakeProperty("inverseBindMatrices",
+                                                                            gltf2::RefReader<gltf2::Document>::Read<gltf2::Accessor, &gltf2::Document::mAccessors>,
+                                                                            &gltf2::Skin::mInverseBindMatrices))
+                                              .Register(*json::MakeProperty("skeleton",
+                                                                            gltf2::RefReader<gltf2::Document>::Read<gltf2::Node, &gltf2::Document::mNodes>,
+                                                                            &gltf2::Skin::mSkeleton))
+                                              .Register(*json::MakeProperty("joints",
+                                                                            json::Read::Array<gltf2::Ref<gltf2::Node>, gltf2::RefReader<gltf2::Document>::Read<gltf2::Node, &gltf2::Document::mNodes>>,
+                                                                            &gltf2::Skin::mJoints)));
+  return SKIN_READER;
+}
+
+const json::Reader<gltf2::Camera::Perspective>& GetCameraPerspectiveReader()
+{
+  static const auto CAMERA_PERSPECTIVE_READER = std::move(json::Reader<gltf2::Camera::Perspective>()
+                                                            .Register(*json::MakeProperty("aspectRatio", json::Read::Number<float>, &gltf2::Camera::Perspective::mAspectRatio))
+                                                            .Register(*json::MakeProperty("yfov", json::Read::Number<float>, &gltf2::Camera::Perspective::mYFov))
+                                                            .Register(*json::MakeProperty("zfar", json::Read::Number<float>, &gltf2::Camera::Perspective::mZFar))
+                                                            .Register(*json::MakeProperty("znear", json::Read::Number<float>, &gltf2::Camera::Perspective::mZNear))); // TODO: infinite perspective projection, where znear is omitted
+  return CAMERA_PERSPECTIVE_READER;
+}
+
+const json::Reader<gltf2::Camera::Orthographic>& GetCameraOrthographicReader()
+{
+  static const auto CAMERA_ORTHOGRAPHIC_READER = std::move(json::Reader<gltf2::Camera::Orthographic>()
+                                                             .Register(*json::MakeProperty("xmag", json::Read::Number<float>, &gltf2::Camera::Orthographic::mXMag))
+                                                             .Register(*json::MakeProperty("ymag", json::Read::Number<float>, &gltf2::Camera::Orthographic::mYMag))
+                                                             .Register(*json::MakeProperty("zfar", json::Read::Number<float>, &gltf2::Camera::Orthographic::mZFar))
+                                                             .Register(*json::MakeProperty("znear", json::Read::Number<float>, &gltf2::Camera::Orthographic::mZNear)));
+  return CAMERA_ORTHOGRAPHIC_READER;
+}
+
+const json::Reader<gltf2::Camera>& GetCameraReader()
+{
+  static const auto CAMERA_READER = std::move(json::Reader<gltf2::Camera>()
+                                                .Register(*new json::Property<gltf2::Camera, std::string_view>("name", json::Read::StringView, &gltf2::Camera::mName))
+                                                .Register(*json::MakeProperty("type", json::Read::StringView, &gltf2::Camera::mType))
+                                                .Register(*json::MakeProperty("perspective", json::ObjectReader<gltf2::Camera::Perspective>::Read, &gltf2::Camera::mPerspective))
+                                                .Register(*json::MakeProperty("orthographic", json::ObjectReader<gltf2::Camera::Orthographic>::Read, &gltf2::Camera::mOrthographic)));
+  return CAMERA_READER;
+}
+
+const json::Reader<gltf2::Node>& GetNodeReader()
+{
+  static const auto NODE_READER = std::move(json::Reader<gltf2::Node>()
+                                              .Register(*new json::Property<gltf2::Node, std::string_view>("name", json::Read::StringView, &gltf2::Node::mName))
+                                              .Register(*json::MakeProperty("translation", gltf2::ReadDaliVector<Vector3>, &gltf2::Node::mTranslation))
+                                              .Register(*json::MakeProperty("rotation", gltf2::ReadQuaternion, &gltf2::Node::mRotation))
+                                              .Register(*json::MakeProperty("scale", gltf2::ReadDaliVector<Vector3>, &gltf2::Node::mScale))
+                                              .Register(*new json::Property<gltf2::Node, Matrix>("matrix", gltf2::ReadDaliVector<Matrix>, &gltf2::Node::SetMatrix))
+                                              .Register(*json::MakeProperty("camera", gltf2::RefReader<gltf2::Document>::Read<gltf2::Camera, &gltf2::Document::mCameras>, &gltf2::Node::mCamera))
+                                              .Register(*json::MakeProperty("children", json::Read::Array<gltf2::Ref<gltf2::Node>, gltf2::RefReader<gltf2::Document>::Read<gltf2::Node, &gltf2::Document::mNodes>>, &gltf2::Node::mChildren))
+                                              .Register(*json::MakeProperty("mesh", gltf2::RefReader<gltf2::Document>::Read<gltf2::Mesh, &gltf2::Document::mMeshes>, &gltf2::Node::mMesh))
+                                              .Register(*json::MakeProperty("skin", gltf2::RefReader<gltf2::Document>::Read<gltf2::Skin, &gltf2::Document::mSkins>, &gltf2::Node::mSkin)));
+  return NODE_READER;
+}
+
+const json::Reader<gltf2::Animation::Sampler>& GetAnimationSamplerReader()
+{
+  static const auto ANIMATION_SAMPLER_READER = std::move(json::Reader<gltf2::Animation::Sampler>()
+                                                           .Register(*json::MakeProperty("input", gltf2::RefReader<gltf2::Document>::Read<gltf2::Accessor, &gltf2::Document::mAccessors>, &gltf2::Animation::Sampler::mInput))
+                                                           .Register(*json::MakeProperty("output", gltf2::RefReader<gltf2::Document>::Read<gltf2::Accessor, &gltf2::Document::mAccessors>, &gltf2::Animation::Sampler::mOutput))
+                                                           .Register(*json::MakeProperty("interpolation", gltf2::ReadStringEnum<gltf2::Animation::Sampler::Interpolation>, &gltf2::Animation::Sampler::mInterpolation)));
+  return ANIMATION_SAMPLER_READER;
+}
+
+const json::Reader<gltf2::Animation::Channel::Target>& GetAnimationChannelTargetReader()
+{
+  static const auto ANIMATION_TARGET_READER = std::move(json::Reader<gltf2::Animation::Channel::Target>()
+                                                          .Register(*json::MakeProperty("node", gltf2::RefReader<gltf2::Document>::Read<gltf2::Node, &gltf2::Document::mNodes>, &gltf2::Animation::Channel::Target::mNode))
+                                                          .Register(*json::MakeProperty("path", gltf2::ReadStringEnum<gltf2::Animation::Channel::Target>, &gltf2::Animation::Channel::Target::mPath)));
+  return ANIMATION_TARGET_READER;
+}
+
+const json::Reader<gltf2::Animation::Channel>& GetAnimationChannelReader()
+{
+  static const auto ANIMATION_CHANNEL_READER = std::move(json::Reader<gltf2::Animation::Channel>()
+                                                           .Register(*json::MakeProperty("target", json::ObjectReader<gltf2::Animation::Channel::Target>::Read, &gltf2::Animation::Channel::mTarget))
+                                                           .Register(*json::MakeProperty("sampler", gltf2::RefReader<gltf2::Animation>::Read<gltf2::Animation::Sampler, &gltf2::Animation::mSamplers>, &gltf2::Animation::Channel::mSampler)));
+  return ANIMATION_CHANNEL_READER;
+}
+
+const json::Reader<gltf2::Animation>& GetAnimationReader()
+{
+  static const auto ANIMATION_READER = std::move(json::Reader<gltf2::Animation>()
+                                                   .Register(*new json::Property<gltf2::Animation, std::string_view>("name", json::Read::StringView, &gltf2::Animation::mName))
+                                                   .Register(*json::MakeProperty("samplers",
+                                                                                 json::Read::Array<gltf2::Animation::Sampler, json::ObjectReader<gltf2::Animation::Sampler>::Read>,
+                                                                                 &gltf2::Animation::mSamplers))
+                                                   .Register(*json::MakeProperty("channels",
+                                                                                 json::Read::Array<gltf2::Animation::Channel, json::ObjectReader<gltf2::Animation::Channel>::Read>,
+                                                                                 &gltf2::Animation::mChannels)));
+  return ANIMATION_READER;
+}
+
+const json::Reader<gltf2::Scene>& GetSceneReader()
+{
+  static const auto SCENE_READER = std::move(json::Reader<gltf2::Scene>()
+                                               .Register(*new json::Property<gltf2::Scene, std::string_view>("name", json::Read::StringView, &gltf2::Scene::mName))
+                                               .Register(*json::MakeProperty("nodes",
+                                                                             json::Read::Array<gltf2::Ref<gltf2::Node>, gltf2::RefReader<gltf2::Document>::Read<gltf2::Node, &gltf2::Document::mNodes>>,
+                                                                             &gltf2::Scene::mNodes)));
+  return SCENE_READER;
+}
+
+const json::Reader<gltf2::Document>& GetDocumentReader()
+{
+  static const auto DOCUMENT_READER = std::move(json::Reader<gltf2::Document>()
+                                                  .Register(*json::MakeProperty("buffers",
+                                                                                json::Read::Array<gltf2::Buffer, json::ObjectReader<gltf2::Buffer>::Read>,
+                                                                                &gltf2::Document::mBuffers))
+                                                  .Register(*json::MakeProperty("bufferViews",
+                                                                                json::Read::Array<gltf2::BufferView, json::ObjectReader<gltf2::BufferView>::Read>,
+                                                                                &gltf2::Document::mBufferViews))
+                                                  .Register(*json::MakeProperty("accessors",
+                                                                                json::Read::Array<gltf2::Accessor, json::ObjectReader<gltf2::Accessor>::Read>,
+                                                                                &gltf2::Document::mAccessors))
+                                                  .Register(*json::MakeProperty("images",
+                                                                                json::Read::Array<gltf2::Image, json::ObjectReader<gltf2::Image>::Read>,
+                                                                                &gltf2::Document::mImages))
+                                                  .Register(*json::MakeProperty("samplers",
+                                                                                json::Read::Array<gltf2::Sampler, json::ObjectReader<gltf2::Sampler>::Read>,
+                                                                                &gltf2::Document::mSamplers))
+                                                  .Register(*json::MakeProperty("textures",
+                                                                                json::Read::Array<gltf2::Texture, json::ObjectReader<gltf2::Texture>::Read>,
+                                                                                &gltf2::Document::mTextures))
+                                                  .Register(*json::MakeProperty("materials",
+                                                                                json::Read::Array<gltf2::Material, json::ObjectReader<gltf2::Material>::Read>,
+                                                                                &gltf2::Document::mMaterials))
+                                                  .Register(*json::MakeProperty("meshes",
+                                                                                json::Read::Array<gltf2::Mesh, json::ObjectReader<gltf2::Mesh>::Read>,
+                                                                                &gltf2::Document::mMeshes))
+                                                  .Register(*json::MakeProperty("skins",
+                                                                                json::Read::Array<gltf2::Skin, json::ObjectReader<gltf2::Skin>::Read>,
+                                                                                &gltf2::Document::mSkins))
+                                                  .Register(*json::MakeProperty("cameras",
+                                                                                json::Read::Array<gltf2::Camera, json::ObjectReader<gltf2::Camera>::Read>,
+                                                                                &gltf2::Document::mCameras))
+                                                  .Register(*json::MakeProperty("nodes",
+                                                                                json::Read::Array<gltf2::Node, json::ObjectReader<gltf2::Node>::Read>,
+                                                                                &gltf2::Document::mNodes))
+                                                  .Register(*json::MakeProperty("animations",
+                                                                                ReadAnimationArray,
+                                                                                &gltf2::Document::mAnimations))
+                                                  .Register(*json::MakeProperty("extensionsRequired",
+                                                                                json::Read::Array<std::string_view, json::Read::StringView>,
+                                                                                &gltf2::Document::mExtensionsRequired))
+                                                  .Register(*json::MakeProperty("extensionsUsed",
+                                                                                json::Read::Array<std::string_view, json::Read::StringView>,
+                                                                                &gltf2::Document::mExtensionsUsed))
+                                                  .Register(*json::MakeProperty("scenes",
+                                                                                json::Read::Array<gltf2::Scene, json::ObjectReader<gltf2::Scene>::Read>,
+                                                                                &gltf2::Document::mScenes))
+                                                  .Register(*json::MakeProperty("scene", gltf2::RefReader<gltf2::Document>::Read<gltf2::Scene, &gltf2::Document::mScenes>, &gltf2::Document::mScene)));
+  return DOCUMENT_READER;
+}
+
+void ConvertBuffer(const gltf2::Buffer& buffer, decltype(ResourceBundle::mBuffers)& outBuffers, const std::string& resourcePath)
+{
+  BufferDefinition bufferDefinition;
+
+  bufferDefinition.mResourcePath = resourcePath;
+  bufferDefinition.mUri          = buffer.mUri;
+  bufferDefinition.mByteLength   = buffer.mByteLength;
+
+  outBuffers.emplace_back(std::move(bufferDefinition));
+}
+
+void ConvertBuffers(const gltf2::Document& document, ConversionContext& context)
+{
+  auto& outBuffers = context.mOutput.mResources.mBuffers;
+  outBuffers.reserve(document.mBuffers.size());
+
+  for(auto& buffer : document.mBuffers)
+  {
+    if(buffer.mUri.empty())
+    {
+      continue;
+    }
+    ConvertBuffer(buffer, outBuffers, context.mPath);
+  }
+}
+
+SamplerFlags::Type ConvertWrapMode(gltf2::Wrap::Type wrapMode)
+{
+  switch(wrapMode)
+  {
+    case gltf2::Wrap::REPEAT:
+      return SamplerFlags::WRAP_REPEAT;
+    case gltf2::Wrap::CLAMP_TO_EDGE:
+      return SamplerFlags::WRAP_CLAMP;
+    case gltf2::Wrap::MIRRORED_REPEAT:
+      return SamplerFlags::WRAP_MIRROR;
+    default:
+      throw std::runtime_error("Invalid wrap type.");
+  }
+}
+
+SamplerFlags::Type ConvertSampler(const gltf2::Ref<gltf2::Sampler>& sampler)
+{
+  if(sampler)
+  {
+    return ((sampler->mMinFilter < gltf2::Filter::NEAREST_MIPMAP_NEAREST) ? (sampler->mMinFilter - gltf2::Filter::NEAREST) : ((sampler->mMinFilter - gltf2::Filter::NEAREST_MIPMAP_NEAREST) + 2)) |
+           ((sampler->mMagFilter - gltf2::Filter::NEAREST) << SamplerFlags::FILTER_MAG_SHIFT) |
+           (ConvertWrapMode(sampler->mWrapS) << SamplerFlags::WRAP_S_SHIFT) |
+           (ConvertWrapMode(sampler->mWrapT) << SamplerFlags::WRAP_T_SHIFT);
+  }
+  else
+  {
+    // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#texturesampler
+    // "The index of the sampler used by this texture. When undefined, a sampler with repeat wrapping and auto filtering should be used."
+    // "What is an auto filtering", I hear you ask. Since there's nothing else to determine mipmapping from - including glTF image
+    // properties, if not in some extension -, we will simply assume linear filtering.
+    return SamplerFlags::FILTER_LINEAR | (SamplerFlags::FILTER_LINEAR << SamplerFlags::FILTER_MAG_SHIFT) |
+           (SamplerFlags::WRAP_REPEAT << SamplerFlags::WRAP_S_SHIFT) | (SamplerFlags::WRAP_REPEAT << SamplerFlags::WRAP_T_SHIFT);
+  }
+}
+
+TextureDefinition ConvertTextureInfo(const gltf2::TextureInfo& textureInfo, ConversionContext& context, const ImageMetadata& metaData = ImageMetadata())
+{
+  TextureDefinition textureDefinition;
+  std::string       uri = std::string(textureInfo.mTexture->mSource->mUri);
+  if(uri.empty())
+  {
+    uint32_t bufferIndex = textureInfo.mTexture->mSource->mBufferView->mBuffer.GetIndex();
+    if(bufferIndex != INVALID_INDEX && context.mOutput.mResources.mBuffers[bufferIndex].IsAvailable())
+    {
+      auto& stream = context.mOutput.mResources.mBuffers[bufferIndex].GetBufferStream();
+      stream.clear();
+      stream.seekg(static_cast<std::streamoff>(static_cast<std::size_t>(textureInfo.mTexture->mSource->mBufferView->mByteOffset)), stream.beg);
+      std::vector<uint8_t> dataBuffer;
+      dataBuffer.resize(textureInfo.mTexture->mSource->mBufferView->mByteLength);
+      stream.read(reinterpret_cast<char*>(dataBuffer.data()), static_cast<std::streamsize>(static_cast<size_t>(textureInfo.mTexture->mSource->mBufferView->mByteLength)));
+      return TextureDefinition{std::move(dataBuffer), ConvertSampler(textureInfo.mTexture->mSampler), metaData.mMinSize, metaData.mSamplingMode, textureInfo.mTextureExtensions.mTextureTransform.GetTransform()};
+    }
+    return TextureDefinition();
+  }
+  else
+  {
+    return TextureDefinition{uri, ConvertSampler(textureInfo.mTexture->mSampler), metaData.mMinSize, metaData.mSamplingMode, textureInfo.mTextureExtensions.mTextureTransform.GetTransform()};
+  }
+}
+
+void AddTextureStage(uint32_t semantic, MaterialDefinition& materialDefinition, gltf2::TextureInfo textureInfo, const Dali::Scene3D::Loader::ImageMetadata& metaData, ConversionContext& context)
+{
+  // Overrides the textureInfo texCoord value if KHR_texture_transform extension is supported and texCoord value is supplied.
+  if(textureInfo.mTextureExtensions && textureInfo.mTexCoord != textureInfo.mTextureExtensions.mTextureTransform.mTexCoord && textureInfo.mTextureExtensions.mTextureTransform.mTexCoord != 0u)
+  {
+    textureInfo.mTexCoord = textureInfo.mTextureExtensions.mTextureTransform.mTexCoord;
+  }
+  materialDefinition.mTextureStages.push_back({semantic, ConvertTextureInfo(textureInfo, context, metaData)});
+  materialDefinition.mFlags |= semantic;
+}
+
+void ConvertMaterial(const gltf2::Material& material, const std::unordered_map<std::string, ImageMetadata>& imageMetaData, decltype(ResourceBundle::mMaterials)& outMaterials, ConversionContext& context)
+{
+  auto getTextureMetaData = [](const std::unordered_map<std::string, ImageMetadata>& metaData, const gltf2::TextureInfo& info) {
+    if(!info.mTexture->mSource->mUri.empty())
+    {
+      if(auto search = metaData.find(info.mTexture->mSource->mUri.data()); search != metaData.end())
+      {
+        return search->second;
+      }
+    }
+    return ImageMetadata();
+  };
+
+  MaterialDefinition materialDefinition;
+
+  materialDefinition.mFlags |= MaterialDefinition::GLTF_CHANNELS;
+  materialDefinition.mShadowAvailable = true;
+
+  auto& pbr = material.mPbrMetallicRoughness;
+  if(material.mAlphaMode == gltf2::AlphaMode::BLEND)
+  {
+    materialDefinition.mAlphaModeType = Scene3D::Material::AlphaModeType::BLEND;
+    materialDefinition.mIsOpaque      = false;
+    materialDefinition.mFlags |= MaterialDefinition::TRANSPARENCY;
+  }
+  else if(material.mAlphaMode == gltf2::AlphaMode::MASK)
+  {
+    materialDefinition.mAlphaModeType = Scene3D::Material::AlphaModeType::MASK;
+    materialDefinition.mIsMask        = true;
+    materialDefinition.SetAlphaCutoff(std::min(1.f, std::max(0.f, material.mAlphaCutoff)));
+  }
+
+  materialDefinition.mBaseColorFactor = pbr.mBaseColorFactor;
+
+  materialDefinition.mTextureStages.reserve(!!pbr.mBaseColorTexture + !!pbr.mMetallicRoughnessTexture + !!material.mNormalTexture + !!material.mOcclusionTexture + !!material.mEmissiveTexture);
+  if(pbr.mBaseColorTexture)
+  {
+    AddTextureStage(MaterialDefinition::ALBEDO, materialDefinition, pbr.mBaseColorTexture, getTextureMetaData(imageMetaData, pbr.mBaseColorTexture), context);
+  }
+  else
+  {
+    materialDefinition.mNeedAlbedoTexture = false;
+  }
+
+  materialDefinition.mMetallic  = pbr.mMetallicFactor;
+  materialDefinition.mRoughness = pbr.mRoughnessFactor;
+
+  if(pbr.mMetallicRoughnessTexture)
+  {
+    AddTextureStage(MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS,
+                    materialDefinition,
+                    pbr.mMetallicRoughnessTexture,
+                    getTextureMetaData(imageMetaData, pbr.mMetallicRoughnessTexture),
+                    context);
+  }
+  else
+  {
+    materialDefinition.mNeedMetallicRoughnessTexture = false;
+  }
+
+  materialDefinition.mNormalScale = material.mNormalTexture.mScale;
+  if(material.mNormalTexture)
+  {
+    AddTextureStage(MaterialDefinition::NORMAL, materialDefinition, material.mNormalTexture, getTextureMetaData(imageMetaData, material.mNormalTexture), context);
+  }
+  else
+  {
+    materialDefinition.mNeedNormalTexture = false;
+  }
+
+  if(material.mOcclusionTexture)
+  {
+    AddTextureStage(MaterialDefinition::OCCLUSION, materialDefinition, material.mOcclusionTexture, getTextureMetaData(imageMetaData, material.mOcclusionTexture), context);
+    materialDefinition.mOcclusionStrength = material.mOcclusionTexture.mStrength;
+  }
+
+  materialDefinition.mEmissiveFactor = material.mEmissiveFactor;
+  if(material.mEmissiveTexture)
+  {
+    AddTextureStage(MaterialDefinition::EMISSIVE, materialDefinition, material.mEmissiveTexture, getTextureMetaData(imageMetaData, material.mEmissiveTexture), context);
+  }
+
+  if(!Dali::Equals(material.mMaterialExtensions.mMaterialIor.mIor, gltf2::UNDEFINED_FLOAT_VALUE))
+  {
+    materialDefinition.mIor                = material.mMaterialExtensions.mMaterialIor.mIor;
+    materialDefinition.mDielectricSpecular = powf((materialDefinition.mIor - 1.0f) / (materialDefinition.mIor + 1.0f), 2.0f);
+  }
+  materialDefinition.mSpecularFactor      = material.mMaterialExtensions.mMaterialSpecular.mSpecularFactor;
+  materialDefinition.mSpecularColorFactor = material.mMaterialExtensions.mMaterialSpecular.mSpecularColorFactor;
+
+  if(material.mMaterialExtensions.mMaterialSpecular.mSpecularTexture)
+  {
+    AddTextureStage(MaterialDefinition::SPECULAR, materialDefinition, material.mMaterialExtensions.mMaterialSpecular.mSpecularTexture, getTextureMetaData(imageMetaData, material.mMaterialExtensions.mMaterialSpecular.mSpecularTexture), context);
+  }
+
+  if(material.mMaterialExtensions.mMaterialSpecular.mSpecularColorTexture)
+  {
+    AddTextureStage(MaterialDefinition::SPECULAR_COLOR, materialDefinition, material.mMaterialExtensions.mMaterialSpecular.mSpecularColorTexture, getTextureMetaData(imageMetaData, material.mMaterialExtensions.mMaterialSpecular.mSpecularColorTexture), context);
+  }
+
+  materialDefinition.mDoubleSided = material.mDoubleSided;
+
+  outMaterials.emplace_back(std::move(materialDefinition), TextureSet());
+}
+
+void ConvertMaterials(const gltf2::Document& document, ConversionContext& context)
+{
+  auto& imageMetaData = context.mOutput.mSceneMetadata.mImageMetadata;
+
+  auto& outMaterials = context.mOutput.mResources.mMaterials;
+  outMaterials.reserve(document.mMaterials.size());
+
+  for(auto& material : document.mMaterials)
+  {
+    ConvertMaterial(material, imageMetaData, outMaterials, context);
+  }
+}
+
+MeshDefinition::Accessor ConvertMeshPrimitiveAccessor(const gltf2::Accessor& accessor)
+{
+  DALI_ASSERT_ALWAYS((accessor.mBufferView &&
+                      (accessor.mBufferView->mByteStride < std::numeric_limits<uint16_t>::max())) ||
+                     (accessor.mSparse && !accessor.mBufferView));
+
+  DALI_ASSERT_ALWAYS(!accessor.mSparse ||
+                     ((accessor.mSparse->mIndices.mBufferView && (accessor.mSparse->mIndices.mBufferView->mByteStride < std::numeric_limits<uint16_t>::max())) &&
+                      (accessor.mSparse->mValues.mBufferView && (accessor.mSparse->mValues.mBufferView->mByteStride < std::numeric_limits<uint16_t>::max()))));
+
+  MeshDefinition::SparseBlob sparseBlob;
+  if(accessor.mSparse)
+  {
+    const gltf2::Accessor::Sparse&               sparse  = *accessor.mSparse;
+    const gltf2::ComponentTypedBufferViewClient& indices = sparse.mIndices;
+    const gltf2::BufferViewClient&               values  = sparse.mValues;
+
+    MeshDefinition::Blob indicesBlob(
+      indices.mBufferView->mByteOffset + indices.mByteOffset,
+      sparse.mCount * indices.GetBytesPerComponent(),
+      static_cast<uint16_t>(indices.mBufferView->mByteStride),
+      static_cast<uint16_t>(indices.GetBytesPerComponent()),
+      {},
+      {});
+    MeshDefinition::Blob valuesBlob(
+      values.mBufferView->mByteOffset + values.mByteOffset,
+      sparse.mCount * accessor.GetElementSizeBytes(),
+      static_cast<uint16_t>(values.mBufferView->mByteStride),
+      static_cast<uint16_t>(accessor.GetElementSizeBytes()),
+      {},
+      {});
+
+    sparseBlob = std::move(MeshDefinition::SparseBlob(std::move(indicesBlob), std::move(valuesBlob), accessor.mSparse->mCount));
+  }
+
+  uint32_t bufferViewOffset = 0u;
+  uint32_t bufferViewStride = 0u;
+  if(accessor.mBufferView)
+  {
+    bufferViewOffset = accessor.mBufferView->mByteOffset;
+    bufferViewStride = accessor.mBufferView->mByteStride;
+  }
+
+  return MeshDefinition::Accessor{
+    std::move(MeshDefinition::Blob{bufferViewOffset + accessor.mByteOffset,
+                                   accessor.GetBytesLength(),
+                                   static_cast<uint16_t>(bufferViewStride),
+                                   static_cast<uint16_t>(accessor.GetElementSizeBytes()),
+                                   accessor.mMin,
+                                   accessor.mMax}),
+    std::move(sparseBlob),
+    accessor.mBufferView ? accessor.mBufferView->mBuffer.GetIndex() : 0,
+    accessor.mNormalized};
+}
+
+MeshDefinition::Accessor* GetAccessorFromAttribute(gltf2::Attribute::HashType attributeHash,
+                                                   MeshDefinition&            meshDefinition,
+                                                   bool&                      needNormals,
+                                                   bool&                      needTangents)
+{
+  MeshDefinition::Accessor* accessorDest{nullptr};
+
+  switch(gltf2::Attribute::TypeFromHash(attributeHash))
+  {
+    case gltf2::Attribute::POSITION:
+    {
+      accessorDest = &meshDefinition.mPositions;
+      break;
+    }
+    case gltf2::Attribute::NORMAL:
+    {
+      accessorDest = &meshDefinition.mNormals;
+      needNormals  = false;
+      break;
+    }
+    case gltf2::Attribute::TANGENT:
+    {
+      accessorDest = &meshDefinition.mTangents;
+      needTangents = false;
+      break;
+    }
+    case gltf2::Attribute::TEXCOORD_N:
+    {
+      meshDefinition.mTexCoords.emplace_back(MeshDefinition::Accessor{});
+      accessorDest = &meshDefinition.mTexCoords.back();
+      break;
+    }
+    case gltf2::Attribute::COLOR_N:
+    {
+      meshDefinition.mColors.emplace_back(MeshDefinition::Accessor{});
+      accessorDest = &meshDefinition.mColors.back();
+      break;
+    }
+    case gltf2::Attribute::JOINTS_N:
+    {
+      if(meshDefinition.mJoints.size() < MeshDefinition::MAX_NUMBER_OF_JOINT_SETS)
+      {
+        meshDefinition.mJoints.emplace_back(MeshDefinition::Accessor{});
+        accessorDest = &meshDefinition.mJoints.back();
+      }
+      break;
+    }
+    case gltf2::Attribute::WEIGHTS_N:
+    {
+      if(meshDefinition.mWeights.size() < MeshDefinition::MAX_NUMBER_OF_JOINT_SETS)
+      {
+        meshDefinition.mWeights.emplace_back(MeshDefinition::Accessor{});
+        accessorDest = &meshDefinition.mWeights.back();
+      }
+      break;
+    }
+    case gltf2::Attribute::INVALID:
+    {
+      accessorDest = nullptr;
+      break;
+    }
+  }
+  return accessorDest;
+}
+
+void SetFlagsFromComponentType(const gltf2::Accessor&     accessor,
+                               gltf2::Attribute::HashType attributeHash,
+                               MeshDefinition&            meshDefinition,
+                               bool                       isQuantized)
+{
+  switch(gltf2::Attribute::TypeFromHash(attributeHash))
+  {
+    case gltf2::Attribute::POSITION:
+    {
+      if(isQuantized)
+      {
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::BYTE) * MeshDefinition::S8_POSITION;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_BYTE) * MeshDefinition::U8_POSITION;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::SHORT) * MeshDefinition::S16_POSITION;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_SHORT) * MeshDefinition::U16_POSITION;
+      }
+      DALI_ASSERT_DEBUG((isQuantized && (MaskMatch(meshDefinition.mFlags, MeshDefinition::S8_POSITION) || MaskMatch(meshDefinition.mFlags, MeshDefinition::U8_POSITION) || MaskMatch(meshDefinition.mFlags, MeshDefinition::S16_POSITION) || MaskMatch(meshDefinition.mFlags, MeshDefinition::U16_POSITION))) || accessor.mComponentType == gltf2::Component::FLOAT);
+      break;
+    }
+    case gltf2::Attribute::NORMAL:
+    {
+      if(isQuantized)
+      {
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::BYTE) * MeshDefinition::S8_NORMAL;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::SHORT) * MeshDefinition::S16_NORMAL;
+      }
+
+      DALI_ASSERT_DEBUG((isQuantized && (MaskMatch(meshDefinition.mFlags, MeshDefinition::S8_NORMAL) || MaskMatch(meshDefinition.mFlags, MeshDefinition::S16_NORMAL))) || accessor.mComponentType == gltf2::Component::FLOAT);
+      break;
+    }
+    case gltf2::Attribute::TANGENT:
+    {
+      if(isQuantized)
+      {
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::BYTE) * MeshDefinition::S8_TANGENT;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::SHORT) * MeshDefinition::S16_TANGENT;
+      }
+
+      DALI_ASSERT_DEBUG((isQuantized && (MaskMatch(meshDefinition.mFlags, MeshDefinition::S8_TANGENT) || MaskMatch(meshDefinition.mFlags, MeshDefinition::S16_TANGENT))) || accessor.mComponentType == gltf2::Component::FLOAT);
+      break;
+    }
+    case gltf2::Attribute::TEXCOORD_N:
+    {
+      if(isQuantized)
+      {
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::BYTE) * MeshDefinition::S8_TEXCOORD;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_BYTE) * MeshDefinition::U8_TEXCOORD;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::SHORT) * MeshDefinition::S16_TEXCOORD;
+        meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_SHORT) * MeshDefinition::U16_TEXCOORD;
+      }
+      DALI_ASSERT_DEBUG((isQuantized && (MaskMatch(meshDefinition.mFlags, MeshDefinition::S8_TEXCOORD) || MaskMatch(meshDefinition.mFlags, MeshDefinition::U8_TEXCOORD) || MaskMatch(meshDefinition.mFlags, MeshDefinition::S16_TEXCOORD) || MaskMatch(meshDefinition.mFlags, MeshDefinition::U16_TEXCOORD))) || accessor.mComponentType == gltf2::Component::FLOAT);
+      break;
+    }
+    case gltf2::Attribute::COLOR_N:
+    {
+      break;
+    }
+    case gltf2::Attribute::JOINTS_N:
+    {
+      meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_SHORT) * MeshDefinition::U16_JOINT_IDS;
+      meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_BYTE) * MeshDefinition::U8_JOINT_IDS;
+      DALI_ASSERT_DEBUG(MaskMatch(meshDefinition.mFlags, MeshDefinition::U16_JOINT_IDS) ||
+                        MaskMatch(meshDefinition.mFlags, MeshDefinition::U8_JOINT_IDS) ||
+                        accessor.mComponentType == gltf2::Component::FLOAT);
+      break;
+    }
+    case gltf2::Attribute::WEIGHTS_N:
+    {
+      meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_SHORT) * MeshDefinition::U16_WEIGHT;
+      meshDefinition.mFlags |= (accessor.mComponentType == gltf2::Component::UNSIGNED_BYTE) * MeshDefinition::U8_WEIGHT;
+      DALI_ASSERT_DEBUG(MaskMatch(meshDefinition.mFlags, MeshDefinition::U16_WEIGHT) ||
+                        MaskMatch(meshDefinition.mFlags, MeshDefinition::U8_WEIGHT) ||
+                        accessor.mComponentType == gltf2::Component::FLOAT);
+
+      break;
+    }
+    case gltf2::Attribute::INVALID:
+    {
+      break;
+    }
+  }
+}
+
+void ConvertMeshes(const gltf2::Document& document, ConversionContext& context)
+{
+  bool isQuantized = MaskMatch(document.mExtensionFlags, gltf2::ExtensionFlags::KHR_MESH_QUANTIZATION);
+
+  uint32_t meshCount = 0;
+  context.mMeshIds.reserve(document.mMeshes.size());
+  for(auto& mesh : document.mMeshes)
+  {
+    context.mMeshIds.push_back(meshCount);
+    meshCount += mesh.mPrimitives.size();
+  }
+
+  auto& outMeshes = context.mOutput.mResources.mMeshes;
+  outMeshes.reserve(meshCount);
+  for(auto& mesh : document.mMeshes)
+  {
+    for(auto& primitive : mesh.mPrimitives)
+    {
+      MeshDefinition meshDefinition;
+
+      auto& attribs                 = primitive.mAttributes;
+      meshDefinition.mPrimitiveType = GLTF2_TO_DALI_PRIMITIVES[primitive.mMode];
+
+      auto positionIter = attribs.find(gltf2::Attribute::ToHash(gltf2::Attribute::POSITION, false, 0));
+      if(positionIter == attribs.end())
+      {
+        DALI_LOG_ERROR("Primitive mesh dosn't have POSITION atrributes!");
+        continue;
+      }
+
+      auto& positionsAccessor = *positionIter->second;
+
+      // glTF2 support vector4 tangent for mesh.
+      // https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#meshes-overview
+      meshDefinition.mTangentType = Property::VECTOR4;
+
+      bool needNormals  = (positionsAccessor.mType == gltf2::AccessorType::VEC3);
+      bool needTangents = (positionsAccessor.mType == gltf2::AccessorType::VEC3);
+
+      for(const auto& [attributeHash, accessor] : attribs)
+      {
+        MeshDefinition::Accessor* accessorDest = GetAccessorFromAttribute(attributeHash, meshDefinition, needNormals, needTangents);
+        if(accessorDest == nullptr)
+        {
+          continue;
+        }
+        *accessorDest = ConvertMeshPrimitiveAccessor(*accessor);
+        SetFlagsFromComponentType(*accessor, attributeHash, meshDefinition, isQuantized);
+      }
+
+      if(needNormals)
+      {
+        meshDefinition.RequestNormals();
+      }
+      if(needTangents)
+      {
+        meshDefinition.RequestTangents();
+      }
+
+      if(primitive.mIndices)
+      {
+        meshDefinition.mIndices = ConvertMeshPrimitiveAccessor(*primitive.mIndices);
+        meshDefinition.mFlags |= (primitive.mIndices->mComponentType == gltf2::Component::UNSIGNED_INT) * MeshDefinition::U32_INDICES;
+        meshDefinition.mFlags |= (primitive.mIndices->mComponentType == gltf2::Component::UNSIGNED_BYTE) * MeshDefinition::U8_INDICES;
+        DALI_ASSERT_DEBUG(MaskMatch(meshDefinition.mFlags, MeshDefinition::U32_INDICES) || MaskMatch(meshDefinition.mFlags, MeshDefinition::U8_INDICES) || primitive.mIndices->mComponentType == gltf2::Component::UNSIGNED_SHORT);
+      }
+
+      if(!primitive.mTargets.empty())
+      {
+        meshDefinition.mBlendShapes.reserve(primitive.mTargets.size());
+        meshDefinition.mBlendShapeVersion = BlendShapes::Version::VERSION_2_0;
+        uint32_t blendShapeIndex          = 0u;
+        for(const auto& target : primitive.mTargets)
+        {
+          MeshDefinition::BlendShape blendShape;
+
+          auto endIt = target.end();
+          auto it    = target.find(gltf2::Attribute::POSITION);
+          if(it != endIt)
+          {
+            blendShape.deltas             = ConvertMeshPrimitiveAccessor(*it->second);
+            blendShape.deltas.mNormalized = it->second->mNormalized;
+
+            if(isQuantized)
+            {
+              blendShape.mFlags |= (it->second->mComponentType == gltf2::Component::BYTE) * MeshDefinition::S8_POSITION;
+              blendShape.mFlags |= (it->second->mComponentType == gltf2::Component::SHORT) * MeshDefinition::S16_POSITION;
+            }
+
+            DALI_ASSERT_DEBUG((isQuantized && (MaskMatch(blendShape.mFlags, MeshDefinition::S8_POSITION) || MaskMatch(blendShape.mFlags, MeshDefinition::U8_POSITION) || MaskMatch(blendShape.mFlags, MeshDefinition::S16_POSITION) || MaskMatch(blendShape.mFlags, MeshDefinition::U16_POSITION))) || it->second->mComponentType == gltf2::Component::FLOAT);
+          }
+          it = target.find(gltf2::Attribute::NORMAL);
+          if(it != endIt)
+          {
+            blendShape.normals             = ConvertMeshPrimitiveAccessor(*it->second);
+            blendShape.normals.mNormalized = it->second->mNormalized;
+
+            if(isQuantized)
+            {
+              blendShape.mFlags |= (it->second->mComponentType == gltf2::Component::BYTE) * MeshDefinition::S8_NORMAL;
+              blendShape.mFlags |= (it->second->mComponentType == gltf2::Component::SHORT) * MeshDefinition::S16_NORMAL;
+            }
+
+            DALI_ASSERT_DEBUG((isQuantized && (MaskMatch(blendShape.mFlags, MeshDefinition::S8_NORMAL) || MaskMatch(blendShape.mFlags, MeshDefinition::S16_NORMAL))) || it->second->mComponentType == gltf2::Component::FLOAT);
+          }
+          it = target.find(gltf2::Attribute::TANGENT);
+          if(it != endIt)
+          {
+            blendShape.tangents             = ConvertMeshPrimitiveAccessor(*it->second);
+            blendShape.tangents.mNormalized = it->second->mNormalized;
+
+            if(isQuantized)
+            {
+              blendShape.mFlags |= (it->second->mComponentType == gltf2::Component::BYTE) * MeshDefinition::S8_TANGENT;
+              blendShape.mFlags |= (it->second->mComponentType == gltf2::Component::SHORT) * MeshDefinition::S16_TANGENT;
+            }
+
+            DALI_ASSERT_DEBUG((isQuantized && (MaskMatch(blendShape.mFlags, MeshDefinition::S8_TANGENT) || MaskMatch(blendShape.mFlags, MeshDefinition::S16_TANGENT))) || it->second->mComponentType == gltf2::Component::FLOAT);
+          }
+
+          if(!mesh.mWeights.empty())
+          {
+            blendShape.weight = mesh.mWeights[meshDefinition.mBlendShapes.size()];
+          }
+
+          // Get blendshape name from extras / SXR_targets_names / avatar_shape_names.
+          if(blendShapeIndex < mesh.mExtras.mTargetNames.size())
+          {
+            blendShape.name = mesh.mExtras.mTargetNames[blendShapeIndex];
+          }
+          else if(blendShapeIndex < mesh.mExtensions.mSXRTargetsNames.size())
+          {
+            blendShape.name = mesh.mExtensions.mSXRTargetsNames[blendShapeIndex];
+          }
+          else if(blendShapeIndex < mesh.mExtensions.mAvatarShapeNames.size())
+          {
+            blendShape.name = mesh.mExtensions.mAvatarShapeNames[blendShapeIndex];
+          }
+
+          meshDefinition.mBlendShapes.push_back(std::move(blendShape));
+          ++blendShapeIndex;
+        }
+      }
+
+      outMeshes.push_back({std::move(meshDefinition), MeshGeometry{}});
+    }
+  }
+}
+
+ModelRenderable* MakeModelRenderable(const gltf2::Mesh::Primitive& primitive, ConversionContext& context)
+{
+  auto modelRenderable = new ModelRenderable();
+
+  auto materialIdx = primitive.mMaterial.GetIndex();
+  if(INVALID_INDEX == materialIdx)
+  {
+    // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#default-material
+    if(INVALID_INDEX == context.mDefaultMaterial)
+    {
+      auto& outMaterials       = context.mOutput.mResources.mMaterials;
+      context.mDefaultMaterial = outMaterials.size();
+
+      ConvertMaterial(gltf2::Material{}, context.mOutput.mSceneMetadata.mImageMetadata, outMaterials, context);
+    }
+
+    materialIdx = context.mDefaultMaterial;
+  }
+
+  modelRenderable->mMaterialIdx = materialIdx;
+
+  return modelRenderable;
+}
+
+void ConvertCamera(const gltf2::Camera& camera, CameraParameters& cameraParameters)
+{
+  cameraParameters.isPerspective = camera.mType.compare("perspective") == 0;
+  if(cameraParameters.isPerspective)
+  {
+    auto& perspective = camera.mPerspective;
+    if(!Dali::Equals(perspective.mYFov, gltf2::UNDEFINED_FLOAT_VALUE))
+    {
+      cameraParameters.yFovDegree = Degree(Radian(perspective.mYFov));
+    }
+    else
+    {
+      cameraParameters.yFovDegree = Degree(gltf2::UNDEFINED_FLOAT_VALUE);
+    }
+    cameraParameters.zNear = perspective.mZNear;
+    cameraParameters.zFar  = perspective.mZFar;
+    // TODO: yes, we seem to ignore aspectRatio in CameraParameters.
+  }
+  else
+  {
+    auto& ortho = camera.mOrthographic;
+    if(!Dali::Equals(ortho.mYMag, gltf2::UNDEFINED_FLOAT_VALUE) && !Dali::Equals(ortho.mXMag, gltf2::UNDEFINED_FLOAT_VALUE))
+    {
+      cameraParameters.orthographicSize = ortho.mYMag * .5f;
+      cameraParameters.aspectRatio      = ortho.mXMag / ortho.mYMag;
+    }
+    else
+    {
+      cameraParameters.orthographicSize = gltf2::UNDEFINED_FLOAT_VALUE;
+      cameraParameters.aspectRatio      = gltf2::UNDEFINED_FLOAT_VALUE;
+    }
+    cameraParameters.zNear = ortho.mZNear;
+    cameraParameters.zFar  = ortho.mZFar;
+  }
+
+  cameraParameters.name = std::string(camera.mName);
+}
+
+void ConvertNode(gltf2::Node const& node, const Index gltfIndex, Index parentIndex, ConversionContext& context, bool isMRendererModel)
+{
+  auto& output    = context.mOutput;
+  auto& scene     = output.mScene;
+  auto& resources = output.mResources;
+
+  const auto index    = scene.GetNodeCount();
+  auto       weakNode = scene.AddNode([&]() {
+    std::unique_ptr<NodeDefinition> nodeDefinition{new NodeDefinition()};
+
+    nodeDefinition->mParentIdx = parentIndex;
+    nodeDefinition->mName      = node.mName;
+    if(nodeDefinition->mName.empty())
+    {
+      // TODO: Production quality generation of unique names.
+      nodeDefinition->mName = std::to_string(reinterpret_cast<uintptr_t>(nodeDefinition.get()));
+    }
+
+    if(!node.mSkin) // Nodes with skinned meshes are not supposed to have local transforms.
+    {
+      nodeDefinition->mPosition    = node.mTranslation;
+      nodeDefinition->mOrientation = node.mRotation;
+      nodeDefinition->mScale       = node.mScale;
+
+      if(isMRendererModel && node.mName == ROOT_NODE_NAME && node.mScale == SCALE_TO_ADJUST)
+      {
+        nodeDefinition->mScale *= 0.01f;
+      }
+    }
+
+    return nodeDefinition; }());
+  if(!weakNode)
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Node name '" << node.mName << "' is not unique; scene is invalid.";
+  }
+
+  context.mNodeIndices.RegisterMapping(gltfIndex, index);
+
+  Index skeletonIdx = node.mSkin ? node.mSkin.GetIndex() : INVALID_INDEX;
+  if(node.mMesh)
+  {
+    auto&    mesh           = *node.mMesh;
+    uint32_t primitiveCount = mesh.mPrimitives.size();
+    auto     meshIndex      = context.mMeshIds[node.mMesh.GetIndex()];
+    weakNode->mRenderables.reserve(primitiveCount);
+    for(uint32_t i = 0; i < primitiveCount; ++i)
+    {
+      std::unique_ptr<NodeDefinition::Renderable> renderable;
+      auto                                        modelRenderable = MakeModelRenderable(mesh.mPrimitives[i], context);
+      modelRenderable->mMeshIdx                                   = meshIndex + i;
+
+      DALI_ASSERT_DEBUG(resources.mMeshes[modelRenderable->mMeshIdx].first.mSkeletonIdx == INVALID_INDEX ||
+                        resources.mMeshes[modelRenderable->mMeshIdx].first.mSkeletonIdx == skeletonIdx);
+      resources.mMeshes[modelRenderable->mMeshIdx].first.mSkeletonIdx = skeletonIdx;
+
+      renderable.reset(modelRenderable);
+      weakNode->mRenderables.push_back(std::move(renderable));
+    }
+  }
+
+  if(node.mCamera)
+  {
+    CameraParameters cameraParameters;
+    ConvertCamera(*node.mCamera, cameraParameters);
+
+    cameraParameters.matrix.SetTransformComponents(node.mScale, node.mRotation, node.mTranslation);
+    output.mCameraParameters.push_back(cameraParameters);
+  }
+
+  for(auto& child : node.mChildren)
+  {
+    ConvertNode(*child, child.GetIndex(), index, context, isMRendererModel);
+  }
+}
+
+void ConvertSceneNodes(const gltf2::Scene& scene, ConversionContext& context, bool isMRendererModel)
+{
+  auto& outScene  = context.mOutput.mScene;
+  Index rootIndex = outScene.GetNodeCount();
+  switch(scene.mNodes.size())
+  {
+    case 0:
+      break;
+
+    case 1:
+      ConvertNode(*scene.mNodes[0], scene.mNodes[0].GetIndex(), INVALID_INDEX, context, isMRendererModel);
+      outScene.AddRootNode(rootIndex);
+      break;
+
+    default:
+    {
+      std::unique_ptr<NodeDefinition> sceneRoot{new NodeDefinition()};
+      sceneRoot->mName = "GLTF_LOADER_SCENE_ROOT_" + std::to_string(outScene.GetRoots().size());
+
+      outScene.AddNode(std::move(sceneRoot));
+      outScene.AddRootNode(rootIndex);
+
+      for(auto& node : scene.mNodes)
+      {
+        ConvertNode(*node, node.GetIndex(), rootIndex, context, isMRendererModel);
+      }
+      break;
+    }
+  }
+}
+
+void ConvertNodes(const gltf2::Document& document, ConversionContext& context, bool isMRendererModel)
+{
+  if(!document.mScenes.empty())
+  {
+    uint32_t rootSceneIndex = 0u;
+    if(document.mScene)
+    {
+      rootSceneIndex = document.mScene.GetIndex();
+    }
+    ConvertSceneNodes(document.mScenes[rootSceneIndex], context, isMRendererModel);
+
+    for(uint32_t i = 0; i < rootSceneIndex; ++i)
+    {
+      ConvertSceneNodes(document.mScenes[i], context, isMRendererModel);
+    }
+
+    for(uint32_t i = rootSceneIndex + 1; i < document.mScenes.size(); ++i)
+    {
+      ConvertSceneNodes(document.mScenes[i], context, isMRendererModel);
+    }
+  }
+}
+
+template<typename T>
+void LoadDataFromAccessor(ConversionContext& context, uint32_t bufferIndex, Vector<T>& dataBuffer, uint32_t offset, uint32_t size)
+{
+  if(bufferIndex >= context.mOutput.mResources.mBuffers.size())
+  {
+    DALI_LOG_ERROR("Invailid buffer index\n");
+    return;
+  }
+
+  auto& buffer = context.mOutput.mResources.mBuffers[bufferIndex];
+  if(!buffer.IsAvailable())
+  {
+    DALI_LOG_ERROR("Failed to load from buffer stream.\n");
+  }
+  auto& stream = buffer.GetBufferStream();
+  stream.clear();
+  stream.seekg(static_cast<std::streamoff>(static_cast<std::size_t>(offset)), stream.beg);
+  stream.read(reinterpret_cast<char*>(dataBuffer.Begin()), static_cast<std::streamsize>(static_cast<size_t>(size)));
+}
+
+template<typename T>
+float LoadDataFromAccessors(ConversionContext& context, const gltf2::Accessor& input, const gltf2::Accessor& output, Vector<float>& inputDataBuffer, Vector<T>& outputDataBuffer)
+{
+  inputDataBuffer.Resize(input.mCount);
+  outputDataBuffer.Resize(output.mCount);
+
+  const uint32_t inputDataBufferSize  = input.GetBytesLength();
+  const uint32_t outputDataBufferSize = output.GetBytesLength();
+
+  LoadDataFromAccessor<float>(context, output.mBufferView->mBuffer.GetIndex(), inputDataBuffer, input.mBufferView->mByteOffset + input.mByteOffset, inputDataBufferSize);
+  LoadDataFromAccessor<T>(context, output.mBufferView->mBuffer.GetIndex(), outputDataBuffer, output.mBufferView->mByteOffset + output.mByteOffset, outputDataBufferSize);
+  ApplyAccessorMinMax(input, reinterpret_cast<float*>(inputDataBuffer.begin()));
+  ApplyAccessorMinMax(output, reinterpret_cast<float*>(outputDataBuffer.begin()));
+
+  return inputDataBuffer[input.mCount - 1u];
+}
+
+bool IsFirstFrameValueEmpty(const uint32_t inputCount, const Vector<float>& inputBuffer)
+{
+  return (inputCount > 0 && !Dali::EqualsZero(inputBuffer[0]));
+}
+
+template<typename T>
+float LoadKeyFrames(ConversionContext& context, const gltf2::Animation::Channel& channel, KeyFrames& keyFrames, gltf2::Animation::Channel::Target::Type type)
+{
+  const gltf2::Accessor& input  = *channel.mSampler->mInput;
+  const gltf2::Accessor& output = *channel.mSampler->mOutput;
+
+  Vector<float> inputDataBuffer;
+  Vector<T>     outputDataBuffer;
+
+  const float duration = std::max(LoadDataFromAccessors<T>(context, input, output, inputDataBuffer, outputDataBuffer), AnimationDefinition::MIN_DURATION_SECONDS);
+
+  if(IsFirstFrameValueEmpty(input.mCount, inputDataBuffer))
+  {
+    keyFrames.Add(0.0f, outputDataBuffer[0]);
+  }
+
+  for(uint32_t i = 0; i < input.mCount; ++i)
+  {
+    keyFrames.Add(inputDataBuffer[i] / duration, outputDataBuffer[i]);
+  }
+
+  return duration;
+}
+
+float LoadBlendShapeKeyFrames(ConversionContext& context, const gltf2::Animation::Channel& channel, Index nodeIndex, uint32_t& propertyIndex, AnimationDefinition& animationDefinition)
+{
+  const gltf2::Accessor& input  = *channel.mSampler->mInput;
+  const gltf2::Accessor& output = *channel.mSampler->mOutput;
+
+  Vector<float> inputDataBuffer;
+  Vector<float> outputDataBuffer;
+
+  const float duration = std::max(LoadDataFromAccessors<float>(context, input, output, inputDataBuffer, outputDataBuffer), AnimationDefinition::MIN_DURATION_SECONDS);
+
+  char        weightNameBuffer[32];
+  auto        prefixSize    = snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s[", BLEND_SHAPE_WEIGHTS_UNIFORM.data());
+  char* const pWeightName   = weightNameBuffer + prefixSize;
+  const auto  remainingSize = sizeof(weightNameBuffer) - prefixSize;
+  for(uint32_t weightIndex = 0u, endWeightIndex = channel.mSampler->mOutput->mCount / channel.mSampler->mInput->mCount; weightIndex < endWeightIndex; ++weightIndex)
+  {
+    AnimatedProperty animatedProperty;
+
+    animatedProperty.mNodeIndex = nodeIndex;
+    snprintf(pWeightName, remainingSize, "%d]", weightIndex);
+    animatedProperty.mPropertyName = std::string(weightNameBuffer);
+
+    animatedProperty.mKeyFrames = KeyFrames::New();
+
+    if(IsFirstFrameValueEmpty(input.mCount, inputDataBuffer))
+    {
+      animatedProperty.mKeyFrames.Add(0.0f, outputDataBuffer[weightIndex]);
+    }
+
+    for(uint32_t i = 0; i < input.mCount; ++i)
+    {
+      animatedProperty.mKeyFrames.Add(inputDataBuffer[i] / duration, outputDataBuffer[i * endWeightIndex + weightIndex]);
+    }
+
+    animatedProperty.mTimePeriod = {0.f, duration};
+
+    animationDefinition.SetProperty(propertyIndex++, std::move(animatedProperty));
+  }
+
+  return duration;
+}
+
+template<typename T>
+float LoadAnimation(AnimationDefinition& animationDefinition, Index nodeIndex, Index propertyIndex, const std::string& propertyName, const gltf2::Animation::Channel& channel, ConversionContext& context)
+{
+  AnimatedProperty animatedProperty;
+  animatedProperty.mNodeIndex    = nodeIndex;
+  animatedProperty.mPropertyName = propertyName;
+
+  animatedProperty.mKeyFrames  = KeyFrames::New();
+  float duration               = LoadKeyFrames<T>(context, channel, animatedProperty.mKeyFrames, channel.mTarget.mPath);
+  animatedProperty.mTimePeriod = {0.f, duration};
+
+  animationDefinition.SetProperty(propertyIndex, std::move(animatedProperty));
+  return duration;
+}
+
+void ConvertAnimations(const gltf2::Document& document, ConversionContext& context)
+{
+  auto& output = context.mOutput;
+
+  output.mAnimationDefinitions.reserve(output.mAnimationDefinitions.size() + document.mAnimations.size());
+
+  for(const auto& animation : document.mAnimations)
+  {
+    AnimationDefinition animationDefinition;
+
+    if(!animation.mName.empty())
+    {
+      animationDefinition.SetName(animation.mName.data());
+    }
+
+    uint32_t numberOfProperties = 0u;
+    for(const auto& channel : animation.mChannels)
+    {
+      if(channel.mTarget.mPath == gltf2::Animation::Channel::Target::WEIGHTS)
+      {
+        numberOfProperties += channel.mSampler->mOutput->mCount / channel.mSampler->mInput->mCount;
+      }
+      else
+      {
+        numberOfProperties++;
+      }
+    }
+    animationDefinition.ReserveSize(numberOfProperties);
+
+    Index propertyIndex = 0u;
+    for(const auto& channel : animation.mChannels)
+    {
+      Index nodeIndex = context.mNodeIndices.GetRuntimeId(channel.mTarget.mNode.GetIndex());
+      float duration  = 0.f;
+
+      switch(channel.mTarget.mPath)
+      {
+        case gltf2::Animation::Channel::Target::TRANSLATION:
+        {
+          duration = LoadAnimation<Vector3>(animationDefinition, nodeIndex, propertyIndex, POSITION_PROPERTY.data(), channel, context);
+          break;
+        }
+        case gltf2::Animation::Channel::Target::ROTATION:
+        {
+          duration = LoadAnimation<Quaternion>(animationDefinition, nodeIndex, propertyIndex, ORIENTATION_PROPERTY.data(), channel, context);
+          break;
+        }
+        case gltf2::Animation::Channel::Target::SCALE:
+        {
+          duration = LoadAnimation<Vector3>(animationDefinition, nodeIndex, propertyIndex, SCALE_PROPERTY.data(), channel, context);
+          break;
+        }
+        case gltf2::Animation::Channel::Target::WEIGHTS:
+        {
+          duration = LoadBlendShapeKeyFrames(context, channel, nodeIndex, propertyIndex, animationDefinition);
+
+          break;
+        }
+        default:
+        {
+          // nothing to animate.
+          break;
+        }
+      }
+
+      animationDefinition.SetDuration(std::max(duration, animationDefinition.GetDuration()));
+
+      ++propertyIndex;
+    }
+
+    output.mAnimationDefinitions.push_back(std::move(animationDefinition));
+  }
+}
+
+void ProcessSkins(const gltf2::Document& document, ConversionContext& context)
+{
+  // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#skininversebindmatrices
+  // If an inverseBindMatrices accessor was provided, we'll load the joint data from the buffer,
+  // otherwise we'll set identity matrices for inverse bind pose.
+  struct IInverseBindMatrixProvider
+  {
+    virtual ~IInverseBindMatrixProvider()
+    {
+    }
+    virtual void Provide(Matrix& inverseBindMatrix) = 0;
+  };
+
+  struct InverseBindMatrixAccessor : public IInverseBindMatrixProvider
+  {
+    std::istream&  mStream;
+    const uint32_t mElementSizeBytes;
+
+    InverseBindMatrixAccessor(const gltf2::Accessor& accessor, ConversionContext& context)
+    : mStream(context.mOutput.mResources.mBuffers[accessor.mBufferView->mBuffer.GetIndex()].GetBufferStream()),
+      mElementSizeBytes(accessor.GetElementSizeBytes())
+    {
+      DALI_ASSERT_DEBUG(accessor.mType == gltf2::AccessorType::MAT4 && accessor.mComponentType == gltf2::Component::FLOAT);
+
+      if(!mStream.rdbuf()->in_avail())
+      {
+        DALI_LOG_ERROR("Failed to load from stream\n");
+      }
+      mStream.clear();
+      mStream.seekg(static_cast<std::streamoff>(static_cast<std::size_t>(accessor.mBufferView->mByteOffset + accessor.mByteOffset)), mStream.beg);
+    }
+
+    virtual void Provide(Matrix& inverseBindMatrix) override
+    {
+      DALI_ASSERT_ALWAYS(mStream.read(reinterpret_cast<char*>(inverseBindMatrix.AsFloat()), static_cast<std::streamsize>(static_cast<size_t>(mElementSizeBytes))));
+    }
+  };
+
+  struct DefaultInverseBindMatrixProvider : public IInverseBindMatrixProvider
+  {
+    virtual void Provide(Matrix& inverseBindMatrix) override
+    {
+      inverseBindMatrix = Matrix::IDENTITY;
+    }
+  };
+
+  auto& resources = context.mOutput.mResources;
+  resources.mSkeletons.reserve(document.mSkins.size());
+
+  for(auto& skin : document.mSkins)
+  {
+    std::unique_ptr<IInverseBindMatrixProvider> inverseBindMatrixProvider;
+    if(skin.mInverseBindMatrices)
+    {
+      inverseBindMatrixProvider.reset(new InverseBindMatrixAccessor(*skin.mInverseBindMatrices, context));
+    }
+    else
+    {
+      inverseBindMatrixProvider.reset(new DefaultInverseBindMatrixProvider());
+    }
+
+    SkeletonDefinition skeleton;
+    if(skin.mSkeleton.GetIndex() != INVALID_INDEX)
+    {
+      skeleton.mRootNodeIdx = context.mNodeIndices.GetRuntimeId(skin.mSkeleton.GetIndex());
+    }
+
+    skeleton.mJoints.resize(skin.mJoints.size());
+    auto iJoint = skeleton.mJoints.begin();
+    for(auto& joint : skin.mJoints)
+    {
+      iJoint->mNodeIdx = context.mNodeIndices.GetRuntimeId(joint.GetIndex());
+
+      inverseBindMatrixProvider->Provide(iJoint->mInverseBindMatrix);
+
+      ++iJoint;
+    }
+
+    resources.mSkeletons.push_back(std::move(skeleton));
+  }
+}
+
+void SetObjectReaders()
+{
+  json::SetObjectReader(GetBufferReader());
+  json::SetObjectReader(GetBufferViewReader());
+  json::SetObjectReader(GetBufferViewClientReader());
+  json::SetObjectReader(GetComponentTypedBufferViewClientReader());
+  json::SetObjectReader(GetAccessorSparseReader());
+  json::SetObjectReader(GetAccessorReader());
+  json::SetObjectReader(GetImageReader());
+  json::SetObjectReader(GetSamplerReader());
+  json::SetObjectReader(GetTextureReader());
+  json::SetObjectReader(GetTextureTransformReader());
+  json::SetObjectReader(GetTextureExtensionsReader());
+  json::SetObjectReader(GetTextureInfoReader());
+  json::SetObjectReader(GetMaterialPbrReader());
+  json::SetObjectReader(GetMaterialSpecularReader());
+  json::SetObjectReader(GetMaterialIorReader());
+  json::SetObjectReader(GetMaterialExtensionsReader());
+  json::SetObjectReader(GetMaterialReader());
+  json::SetObjectReader(GetMeshPrimitiveReader());
+  json::SetObjectReader(GetMeshExtrasReader());
+  json::SetObjectReader(GetMeshExtensionsReader());
+  json::SetObjectReader(GetMeshReader());
+  json::SetObjectReader(GetSkinReader());
+  json::SetObjectReader(GetCameraPerspectiveReader());
+  json::SetObjectReader(GetCameraOrthographicReader());
+  json::SetObjectReader(GetCameraReader());
+  json::SetObjectReader(GetNodeReader());
+  json::SetObjectReader(GetAnimationSamplerReader());
+  json::SetObjectReader(GetAnimationChannelTargetReader());
+  json::SetObjectReader(GetAnimationChannelReader());
+  json::SetObjectReader(GetAnimationReader());
+  json::SetObjectReader(GetSceneReader());
+}
+
+void SetDefaultEnvironmentMap(const gltf2::Document& document, ConversionContext& context)
+{
+  EnvironmentDefinition environmentDefinition;
+  environmentDefinition.mUseBrdfTexture = true;
+  environmentDefinition.mIblIntensity   = Scene3D::Loader::EnvironmentDefinition::GetDefaultIntensity();
+  context.mOutput.mResources.mEnvironmentMaps.push_back({std::move(environmentDefinition), EnvironmentDefinition::Textures()});
+}
+
+void InitializeGltfLoader()
+{
+  static Dali::Mutex initializeMutex;
+  // Set ObjectReader only once (for all gltf loading).
+  static bool setObjectReadersRequired = true;
+  {
+    Mutex::ScopedLock lock(initializeMutex);
+    if(setObjectReadersRequired)
+    {
+      // NOTE: only referencing own, anonymous namespace, const objects; the pointers will never need to change.
+      SetObjectReaders();
+      setObjectReadersRequired = false;
+    }
+  }
+}
+
+const std::string_view GetRendererModelIdentification()
+{
+  return MRENDERER_MODEL_IDENTIFICATION;
+}
+
+void ReadDocument(const json_object_s& jsonObject, gltf2::Document& document)
+{
+  GetDocumentReader().Read(jsonObject, document);
+}
+
+void ReadDocumentFromParsedData(const json_object_s& jsonObject, gltf2::Document& document)
+{
+  static Dali::Mutex readMutex;
+  Mutex::ScopedLock  lock(readMutex);
+  gt::SetRefReaderObject(document);
+  Gltf2Util::ReadDocument(jsonObject, document);
+}
+
+bool GenerateDocument(json::unique_ptr& root, gt::Document& document, bool& isMRendererModel)
+{
+  auto& rootObject = js::Cast<json_object_s>(*root);
+  auto  jsonAsset  = js::FindObjectChild("asset", rootObject);
+
+  auto jsAssetVersion = js::FindObjectChild("version", js::Cast<json_object_s>(*jsonAsset));
+  if(jsAssetVersion)
+  {
+    document.mAsset.mVersion = js::Read::StringView(*jsAssetVersion);
+  }
+
+  auto jsAssetGenerator = js::FindObjectChild("generator", js::Cast<json_object_s>(*jsonAsset));
+  if(jsAssetGenerator)
+  {
+    document.mAsset.mGenerator = js::Read::StringView(*jsAssetGenerator);
+    isMRendererModel           = (document.mAsset.mGenerator.find(Gltf2Util::GetRendererModelIdentification().data()) != std::string_view::npos);
+  }
+
+  Gltf2Util::InitializeGltfLoader();
+  Gltf2Util::ReadDocumentFromParsedData(rootObject, document);
+
+  return true;
+}
+
+void ConvertGltfToContext(gt::Document& document, Gltf2Util::ConversionContext& context, bool isMRendererModel)
+{
+  for(auto& extension : document.mExtensionsRequired)
+  {
+    gltf2::ExtensionFlags flag;
+    if(Dali::Scripting::GetEnumeration<gltf2::ExtensionFlags>(extension.data(), EXTENSION_STRING_TABLE, EXTENSION_STRING_TABLE_COUNT, flag))
+    {
+      document.mExtensionFlags |= flag;
+    }
+    else
+    {
+      DALI_LOG_ERROR("Unsupported glTF extension required: %s\n", extension.data());
+      DALI_ASSERT_DEBUG(false && "Unsupported glTF extension required");
+    }
+  }
+
+  Gltf2Util::ConvertBuffers(document, context);
+  Gltf2Util::ConvertMaterials(document, context);
+  Gltf2Util::ConvertMeshes(document, context);
+  Gltf2Util::ConvertNodes(document, context, isMRendererModel);
+  Gltf2Util::ConvertAnimations(document, context);
+  Gltf2Util::ProcessSkins(document, context);
+
+  // Set Default Environment map
+  Gltf2Util::SetDefaultEnvironmentMap(document, context);
+}
+
+} // namespace Gltf2Util
+
+} // namespace Dali::Scene3D::Loader::Internal
diff --git a/dali-scene3d/internal/loader/gltf2-util.h b/dali-scene3d/internal/loader/gltf2-util.h
new file mode 100644
index 0000000..d12addd
--- /dev/null
+++ b/dali-scene3d/internal/loader/gltf2-util.h
@@ -0,0 +1,121 @@
+#ifndef DALI_SCENE3D_LOADER_GLTF2_UTIL_H
+#define DALI_SCENE3D_LOADER_GLTF2_UTIL_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/gltf2-asset.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+
+namespace gt = gltf2;
+namespace js = json;
+
+namespace Dali::Scene3D::Loader::Internal
+{
+namespace Gltf2Util
+{
+struct NodeMapping
+{
+  Index gltfIndex;
+  Index runtimeIndex;
+
+  bool operator<(Index gltfIndex) const
+  {
+    return this->gltfIndex < gltfIndex;
+  }
+};
+
+class NodeIndexMapper
+{
+public:
+  NodeIndexMapper()                                  = default;
+  NodeIndexMapper(const NodeIndexMapper&)            = delete;
+  NodeIndexMapper& operator=(const NodeIndexMapper&) = delete;
+
+  ///@brief Registers a mapping of the @a gltfIndex of a node to its @a runtimeIndex .
+  ///@note If the indices are the same, the registration is omitted, in order to
+  /// save growing a vector.
+  void RegisterMapping(Index gltfIndex, Index runtimeIndex)
+  {
+    if(gltfIndex != runtimeIndex)
+    {
+      auto iInsert = std::lower_bound(mNodes.begin(), mNodes.end(), gltfIndex);
+      DALI_ASSERT_DEBUG(iInsert == mNodes.end() || iInsert->gltfIndex != gltfIndex);
+      mNodes.insert(iInsert, NodeMapping{gltfIndex, runtimeIndex});
+    }
+  }
+
+  ///@brief Retrieves the runtime index of a Node, mapped to the given @a gltfIndex.
+  Index GetRuntimeId(Index gltfIndex) const
+  {
+    auto iFind = std::lower_bound(mNodes.begin(), mNodes.end(), gltfIndex); // using custom operator<
+    return (iFind != mNodes.end() && iFind->gltfIndex == gltfIndex) ? iFind->runtimeIndex : gltfIndex;
+  }
+
+private:
+  std::vector<NodeMapping> mNodes;
+};
+
+struct ConversionContext
+{
+  LoadResult& mOutput;
+
+  std::string mPath;
+  Index       mDefaultMaterial;
+
+  std::vector<Index> mMeshIds;
+  NodeIndexMapper    mNodeIndices;
+};
+
+void ConvertBuffers(const gt::Document& document, ConversionContext& context);
+
+void ConvertMaterials(const gt::Document& document, ConversionContext& context);
+
+void ConvertMeshes(const gt::Document& document, ConversionContext& context);
+
+void ConvertCamera(const gt::Camera& camera, CameraParameters& cameraParameters);
+
+void ConvertNodes(const gt::Document& document, ConversionContext& context, bool isMRendererModel);
+
+void ConvertAnimations(const gt::Document& document, ConversionContext& context);
+
+void ProcessSkins(const gt::Document& document, ConversionContext& context);
+
+void SetDefaultEnvironmentMap(const gt::Document& document, ConversionContext& context);
+
+const std::string_view GetRendererModelIdentification();
+
+void ReadDocument(const json_object_s& jsonObject, gt::Document& document);
+
+void InitializeGltfLoader();
+
+void ReadDocumentFromParsedData(const json_object_s& jsonObject, gltf2::Document& document);
+
+bool GenerateDocument(json::unique_ptr& root, gt::Document& document, bool& isMRendererModel);
+
+void ConvertGltfToContext(gt::Document& document, Gltf2Util::ConversionContext& context, bool isMRendererModel);
+
+} // namespace Gltf2Util
+
+} // namespace Dali::Scene3D::Loader::Internal
+
+#endif // DALI_SCENE3D_LOADER_GLTF2_UTIL_H
diff --git a/dali-scene3d/internal/loader/hash.cpp b/dali-scene3d/internal/loader/hash.cpp
new file mode 100644
index 0000000..7abb277
--- /dev/null
+++ b/dali-scene3d/internal/loader/hash.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/loader/hash.h>
+
+namespace Dali::Scene3D::Loader
+{
+Hash::Hash(uint64_t initial)
+: mValue(initial)
+{
+}
+
+Hash& Hash::Add(bool b)
+{
+  mValue = Concatenate(b ? 0 : 1);
+  return *this;
+}
+
+Hash& Hash::Add(int32_t i)
+{
+  mValue = Concatenate(i);
+  return *this;
+}
+
+Hash& Hash::Add(uint32_t i)
+{
+  mValue = Concatenate(i);
+  return *this;
+}
+
+Hash& Hash::Add(uint64_t i)
+{
+  mValue = Concatenate(i);
+  return *this;
+}
+
+Hash& Hash::Add(float f)
+{
+  return AddObjectBytes(f);
+}
+
+Hash& Hash::Add(const char* cStr)
+{
+  return Add(cStr, strlen(cStr));
+}
+
+Hash& Hash::Add(const char* cStr, size_t len)
+{
+  auto i0 = reinterpret_cast<const uint8_t*>(cStr);
+  return AddBytes(i0, i0 + len);
+}
+
+Hash& Hash::Add(const std::string& str)
+{
+  auto i0 = reinterpret_cast<const uint8_t*>(str.c_str());
+  return AddBytes(i0, i0 + str.size());
+}
+
+Hash& Hash::AddBytes(const uint8_t* i0, const uint8_t* i1)
+{
+  while(i0 != i1)
+  {
+    mValue = Concatenate(*i0);
+    ++i0;
+  }
+  return *this;
+}
+
+Hash::operator uint64_t() const
+{
+  return mValue;
+}
+
+uint64_t Hash::Concatenate(uint64_t value)
+{
+  return mValue * 31 + value;
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/internal/loader/hash.h b/dali-scene3d/internal/loader/hash.h
new file mode 100644
index 0000000..0f63c94
--- /dev/null
+++ b/dali-scene3d/internal/loader/hash.h
@@ -0,0 +1,121 @@
+#ifndef DALI_SCENE3D_LOADER_HASH_H_
+#define DALI_SCENE3D_LOADER_HASH_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <cstdint>
+#include <cstring>
+#include <string>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Rudimentary hash generator that follows a builder pattern.
+ */
+class Hash
+{
+public:
+  static constexpr uint64_t DEFAULT_SEED = 61081;
+
+  explicit Hash(uint64_t initial = DEFAULT_SEED);
+
+  /**
+   * @brief Applies a boolean to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(bool b);
+
+  /**
+   * @brief Applies a signed 32-bit integer to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(int32_t i);
+
+  /**
+   * @brief Applies an unsigned 32-bit integer to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(uint32_t i);
+
+  /**
+   * @brief Applies an unsigned 64-bit integer to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(uint64_t i);
+
+  /**
+   * @brief Applies a float to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(float f);
+
+  /**
+   * @brief Applies a c-string to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(const char* cStr);
+
+  /**
+   * @brief Applies a c-string @a cStr of @a len characters, to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(const char* cStr, size_t len);
+
+  /**
+   * @brief Applies a string to the hash.
+   * @return Its updated self.
+   */
+  Hash& Add(const std::string& str);
+
+  /**
+   * @brief Applies a series of bytes between @a i0 and @a i1 to the hash.
+   * @return Its updated self.
+   */
+  Hash& AddBytes(const uint8_t* i0, const uint8_t* i1);
+
+  /**
+   * @brief Applies the bytes of an object @a value, to the hash.
+   * @return Its updated self.
+   */
+  template<typename T>
+  Hash& AddObjectBytes(const T& value);
+
+  operator uint64_t() const;
+
+private:
+  uint64_t mValue;
+
+  uint64_t Concatenate(uint64_t value);
+};
+
+template<typename T>
+Hash& Hash::AddObjectBytes(const T& value)
+{
+  auto i0 = reinterpret_cast<const uint8_t*>(&value);
+  auto i1 = i0 + sizeof(T);
+  while(i0 != i1)
+  {
+    mValue = Concatenate(*i0);
+    ++i0;
+  }
+  return *this;
+}
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_HASH_H_
diff --git a/dali-scene3d/internal/loader/json-reader.cpp b/dali-scene3d/internal/loader/json-reader.cpp
new file mode 100644
index 0000000..2ea2925
--- /dev/null
+++ b/dali-scene3d/internal/loader/json-reader.cpp
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 2023 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+// CLASS HEADER
+#include <dali-scene3d/internal/loader/json-reader.h>
+
+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <cstring>
+
+namespace json
+{
+int StrCmp(const json_string_s& js, const char* s)
+{
+  auto sSize   = strlen(s);
+  auto shorter = std::min(js.string_size, sSize);
+  auto base    = strncmp(js.string, s, shorter);
+  return ((base != 0) || (sSize == js.string_size)) ? base : ((js.string_size < sSize) ? -s[shorter] : js.string[shorter]);
+}
+
+int StrCmp(const json_string_s& js, const std::string& s)
+{
+  auto sSize   = s.size();
+  auto shorter = std::min(js.string_size, sSize);
+  auto base    = strncmp(js.string, s.c_str(), shorter);
+  return ((base != 0) || (sSize == js.string_size)) ? base : ((js.string_size < sSize) ? -s[shorter] : js.string[shorter]);
+}
+
+void Validate(const json_value_s& jv, json_type_e type)
+{
+  if(jv.type != type)
+  {
+    throw std::runtime_error("Invalid type; expected: " + std::to_string(type) + ", got: " + std::to_string(jv.type));
+  }
+}
+
+json_value_s* FindObjectChild(const std::string& key, json_object_s& obj)
+{
+  auto i = obj.start;
+  while(i)
+  {
+    if(0 == StrCmp(*i->name, key))
+    {
+      return i->value;
+    }
+    i = i->next;
+  }
+  return nullptr;
+}
+
+} // namespace json
diff --git a/dali-scene3d/internal/loader/json-reader.h b/dali-scene3d/internal/loader/json-reader.h
new file mode 100644
index 0000000..45e4e42
--- /dev/null
+++ b/dali-scene3d/internal/loader/json-reader.h
@@ -0,0 +1,455 @@
+#ifndef DALI_SCENE3D_LOADER_JSON_READER_H_
+#define DALI_SCENE3D_LOADER_JSON_READER_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <algorithm>
+#include <cstring>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string_view>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/third-party/json.h> // TODO : Since license issue, We shoud replace this thing as <dali-toolkit/devel-api/builder/json-parser.h>
+
+namespace json
+{
+/**
+ * @brief Helper for freeing the memory allocated by json_parse()
+ */
+struct json_value_deleter
+{
+  void operator()(json_value_s* p) const
+  {
+    free(p);
+  }
+};
+typedef std::unique_ptr<json_value_s, json_value_deleter> unique_ptr;
+
+/**
+ * @brief Case sensitive comparison of json_string_s and c-string.
+ * @return difference in first different character, or 0 if the strings are identical.
+ */
+int StrCmp(const json_string_s& js, const char* s);
+
+/**
+ * @brief Case sensitive comparison of json_string_s and std::string.
+ * @return difference in first different character, or 0 if the strings are identical.
+ */
+int StrCmp(const json_string_s& js, const std::string& s);
+
+/**
+ * @brief Convenience function to compare json_string_s and other supported string type,
+ *  in swapped order.
+ */
+template<typename String>
+inline int StrCmp(String& s, const json_string_s& js)
+{
+  return -StrCmp(js, s);
+}
+
+/**
+ * @brief Checks @a jv to be the given @a type, otherwise a std::runtime_error is thrown.
+ */
+void Validate(const json_value_s& jv, json_type_e type);
+
+namespace detail
+{
+/**
+ * @brief Compile-time type-enum mapping.
+ */
+template<typename T>
+struct Type2Enum
+{
+};
+
+#define TYPE2ENUM(x)             \
+  template<>                     \
+  struct Type2Enum<json_##x##_s> \
+  {                              \
+    enum                         \
+    {                            \
+      VALUE = json_type_##x      \
+    };                           \
+  };
+
+TYPE2ENUM(object)
+TYPE2ENUM(array)
+TYPE2ENUM(string)
+TYPE2ENUM(number)
+#undef TYPE2ENUM
+} // namespace detail
+
+/**
+ * @brief Casts the payload of a json_value_s to the given type.
+ */
+template<typename Out>
+inline const Out& Cast(const json_value_s& j)
+{
+  Validate(j, static_cast<json_type_e>(detail::Type2Enum<typename std::decay<Out>::type>::VALUE));
+  return *static_cast<const Out*>(j.payload);
+}
+
+/**
+ * @brief Casts the payload of a json_value_s to the given type.
+ * @note std::runtime_error is thrown if the value is not the given type.
+ */
+template<typename Out>
+inline Out& Cast(json_value_s& j)
+{
+  Validate(j, static_cast<json_type_e>(detail::Type2Enum<typename std::decay<Out>::type>::VALUE));
+  return *static_cast<Out*>(j.payload);
+}
+
+/**
+ * @brief Helper function to find a child element of @a obj mapped to @a key.
+ * @return Pointer to the element, or nullptr if it could not be found.
+ */
+json_value_s* FindObjectChild(const std::string& key, json_object_s& obj);
+
+/**
+ * @brief Helper functions for reading various value types.
+ */
+struct Read
+{
+  static bool Boolean(const json_value_s& j)
+  {
+    if(j.type == json_type_true)
+    {
+      return true;
+    }
+    else if(j.type == json_type_false)
+    {
+      return false;
+    }
+    else // try to interpret a numeric value.
+    {
+      return Number<int>(j) != 0;
+    }
+  }
+
+  template<typename T>
+  static T Number(const json_value_s& j)
+  {
+    auto&             jn = Cast<const json_number_s>(j);
+    std::stringstream ss;
+    for(auto i0 = jn.number, i1 = i0 + jn.number_size; i0 != i1; ++i0)
+    {
+      ss.put(*i0);
+    }
+
+    T result;
+    if(ss >> result)
+    {
+      return result;
+    }
+    throw std::runtime_error("Failed to convert value to number");
+  }
+
+  template<typename E>
+  static E Enum(const json_value_s& j)
+  {
+    size_t number = Number<size_t>(j);
+    return static_cast<E>(number);
+  }
+
+  static std::string_view StringView(const json_string_s& js)
+  {
+    return std::string_view(js.string, js.string_size);
+  }
+
+  static std::string_view StringView(const json_value_s& j)
+  {
+    auto& js = Cast<json_string_s>(j);
+    return StringView(js);
+  }
+
+  static std::string String(const json_value_s& j)
+  {
+    auto& js = Cast<const json_string_s>(j);
+    return std::string(js.string, js.string_size);
+  }
+
+  template<typename T, T (*readElement)(const json_value_s&)>
+  static std::vector<T> Array(const json_value_s& j)
+  {
+    auto&          ja = Cast<const json_array_s>(j);
+    std::vector<T> result;
+    result.reserve(ja.length);
+    auto i = ja.start;
+    while(i)
+    {
+      result.push_back(std::move(readElement(*i->value)));
+      i = i->next;
+    }
+    return result;
+  }
+};
+
+/**
+ * @brief Core class for object properties.
+ */
+struct PropertyCore
+{
+protected:
+  explicit PropertyCore(const std::string& key)
+  : mKey(key)
+  {
+  }
+
+  const std::string& GetKey() const
+  {
+    return mKey;
+  }
+
+private:
+  std::string mKey;
+};
+
+/**
+ * @brief Base class for the properties of a type T.
+ */
+template<typename T>
+struct PropertyBase : PropertyCore
+{
+  using PropertyCore::GetKey;
+
+  explicit PropertyBase(const std::string& key)
+  : PropertyCore(key)
+  {
+  }
+
+  virtual ~PropertyBase()
+  {
+  }
+
+  virtual void Read(const json_value_s& j, T& obj) = 0;
+};
+
+/**
+ * @brief Concrete property of an object to read into from JSON with a given function.
+ */
+template<class T, typename U>
+struct Property : PropertyBase<T>
+{
+  using ReadFn        = U (*)(const json_value_s&);
+  using MemberPtr     = U T::*;
+  using SetterArgType = typename std::conditional<sizeof(U) <= sizeof(uintptr_t), U, const U&>::type;
+  using Setter        = void (T::*)(SetterArgType);
+
+  Property(const std::string& key, ReadFn read, MemberPtr ptr)
+  : PropertyBase<T>(key),
+    mRead(read),
+    mAccessor(new DirectAccessor(ptr))
+  {
+  }
+
+  Property(const std::string& key, ReadFn read, Setter setter)
+  : PropertyBase<T>(key),
+    mRead(read),
+    mAccessor(new SetterAccessor(setter))
+  {
+  }
+
+  ~Property()
+  {
+  }
+
+  void Read(const json_value_s& j, T& obj) override
+  {
+    mAccessor->Set(mRead(j), obj);
+  }
+
+private:
+  struct AccessorBase
+  {
+    virtual ~AccessorBase()
+    {
+    }
+
+    virtual void Set(U value, T& obj) const = 0;
+  };
+
+  struct DirectAccessor : AccessorBase
+  {
+    DirectAccessor(MemberPtr ptr)
+    : mPointer(ptr)
+    {
+    }
+
+    void Set(U value, T& obj) const override
+    {
+      obj.*mPointer = std::move(value);
+    }
+
+    MemberPtr mPointer;
+  };
+
+  struct SetterAccessor : AccessorBase
+  {
+    SetterAccessor(Setter setter)
+    : mSetter(setter)
+    {
+    }
+
+    void Set(U value, T& obj) const override
+    {
+      (obj.*mSetter)(value);
+    }
+
+    Setter mSetter;
+  };
+
+  ReadFn                        mRead;
+  std::unique_ptr<AccessorBase> mAccessor;
+};
+
+/**
+ * @brief Helper function to make a Property for a member of type U, of object of type T.
+ */
+template<class T, typename U>
+Property<T, U>* MakeProperty(const std::string& key, typename Property<T, U>::ReadFn readFn, U T::*ptr)
+{
+  return new Property<T, U>(key, readFn, ptr);
+}
+
+/**
+ * @brief Core class for an object Reader.
+ */
+struct ReaderCore
+{
+protected:
+  std::vector<void*> mProperties;
+
+  ReaderCore() = default;
+
+  ReaderCore(const ReaderCore& other) = delete;
+  ReaderCore& operator=(const ReaderCore& other) = delete;
+
+  ReaderCore(ReaderCore&& other) = default;
+  ReaderCore& operator=(ReaderCore&& other) = default;
+};
+
+/**
+ * @brief Object Reader template for reading into an object of a given type,
+ *  with properties registered for the various members.
+ */
+template<typename T>
+class Reader : protected ReaderCore
+{
+public:
+  Reader() = default;
+
+  Reader(const Reader<T>& other) = delete;
+  Reader<T>& operator=(const Reader<T>& other) = delete;
+
+  Reader(Reader<T>&& other) = default;
+  Reader<T>& operator=(Reader&& other) = default;
+
+  ~Reader()
+  {
+    for(auto& p : mProperties)
+    {
+      delete Cast(p);
+    }
+  }
+
+  Reader<T>& Register(PropertyBase<T>& prop)
+  {
+    auto iInsert = std::lower_bound(mProperties.begin(), mProperties.end(), &prop, SortPredicate);
+    if(iInsert == mProperties.end() || Cast(*iInsert)->GetKey() != prop.GetKey())
+    {
+      mProperties.insert(iInsert, &prop);
+    }
+    else
+    {
+      delete Cast(*iInsert);
+      *iInsert = &prop;
+    }
+    return *this;
+  }
+
+  void Read(const json_object_s& jo, T& obj) const
+  {
+    auto i = jo.start;
+    while(i)
+    {
+      auto iFind = std::lower_bound(mProperties.begin(), mProperties.end(), *i->name, FindPredicate);
+      if(iFind != mProperties.end())
+      {
+        auto prop = Cast(*iFind);
+        if(0 == StrCmp(*i->name, prop->GetKey()))
+        {
+          prop->Read(*i->value, obj);
+        }
+      }
+      i = i->next;
+    }
+  }
+
+private:
+  static inline PropertyBase<T>* Cast(void* p)
+  {
+    return static_cast<PropertyBase<T>*>(p);
+  }
+
+  static bool SortPredicate(void* p, PropertyBase<T>* prop)
+  {
+    const auto prop0 = Cast(p);
+    return prop0->GetKey().compare(prop->GetKey()) < 0;
+  }
+
+  static bool FindPredicate(void* p, const json_string_s& key)
+  {
+    const auto prop = Cast(p);
+    return StrCmp(prop->GetKey(), key) < 0;
+  }
+};
+
+/**
+ * @brief Wraps a Reader<T> in a function usable as a Property<T>::ReadFn, i.e. to facilitate
+ *  deserializing structures of nested objects.
+ */
+template<typename T>
+struct ObjectReader
+{
+  static const Reader<T>* sReader;
+
+  static T Read(const json_value_s& j)
+  {
+    T     result;
+    auto& jo = Cast<json_object_s>(j);
+    sReader->Read(jo, result);
+    return result;
+  }
+};
+
+template<typename T>
+const Reader<T>* ObjectReader<T>::sReader = nullptr;
+
+template<typename T>
+void SetObjectReader(const Reader<T>& r)
+{
+  ObjectReader<T>::sReader = &r;
+}
+
+} // namespace json
+
+#endif //DALI_SCENE3D_LOADER_JSON_READER_H_
diff --git a/dali-scene3d/internal/loader/json-util.cpp b/dali-scene3d/internal/loader/json-util.cpp
new file mode 100644
index 0000000..88cfad7
--- /dev/null
+++ b/dali-scene3d/internal/loader/json-util.cpp
@@ -0,0 +1,538 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/loader/json-util.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/public-api/common/extents.h>
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/matrix3.h>
+#include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/math/radian.h>
+#include <dali/public-api/math/vector2.h>
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/object/property-value.h>
+#include <array>
+
+namespace Dali
+{
+using namespace Toolkit;
+
+namespace Scene3D
+{
+namespace Loader
+{
+namespace
+{
+template<typename T>
+Property::Value ReadPrimitiveHelper(const TreeNode* tn, bool (*reader)(const TreeNode*, T&))
+{
+  T value;
+  if(reader(tn, value))
+  {
+    return Property::Value(value);
+  }
+  return Property::Value();
+}
+
+template<typename T>
+Property::Value ReadVectorHelper(const TreeNode* tn)
+{
+  static_assert(sizeof(T) % sizeof(float) == 0, "");
+  T value;
+  if(ReadVector(tn, value.AsFloat(), sizeof(T) / sizeof(float)))
+  {
+    return Property::Value(value);
+  }
+  return Property::Value();
+}
+
+Property::Value ReadVectorSingleFloatHelper(const TreeNode* tn)
+{
+  float value;
+  if(ReadVector(tn, &value, 1u))
+  {
+    return Property::Value(value);
+  }
+  return Property::Value();
+}
+
+Property::Value ReadRotationHelper(const TreeNode* tn)
+{
+  switch(tn->Size())
+  {
+    case 3:
+    {
+      // degrees as per spec
+      Vector3 rotation;
+      ReadVector(tn, rotation.AsFloat(), 3u);
+      return Property::Value(Quaternion(Radian(Degree(rotation.x)),
+                                        Radian(Degree(rotation.y)),
+                                        Radian(Degree(rotation.z))));
+    }
+    case 4:
+    {
+      Vector4 v;
+      ReadVector(tn, v.AsFloat(), 4u);
+      //Quaternion
+      return Property::Value(Quaternion(v));
+    }
+    default:
+      return Property::Value();
+  }
+}
+
+template<typename T>
+bool ReadQuadHelper(const TreeNode* tn, const std::array<T*, 4>& quad)
+{
+  auto i     = quad.begin();
+  auto iEnd  = quad.end();
+  auto iJson = tn->CBegin();
+  while(iJson != tn->CEnd() && i != iEnd)
+  {
+    int value;
+    if(ReadInt(&(*iJson).second, value) && value <= std::numeric_limits<T>::max())
+    {
+      **i = value;
+      ++i;
+      ++iJson;
+    }
+    else
+    {
+      return false;
+    }
+  }
+  return true;
+}
+
+const std::map<std::string_view, Property::Value (*)(const TreeNode*)>& GetTypeIds()
+{
+  static const std::map<std::string_view, Property::Value (*)(const TreeNode*)> kTypeIds{
+    // NONE
+    {"boolean", [](const TreeNode* tn) {
+       return ReadPrimitiveHelper<bool>(tn, ReadBool);
+     }},
+    {"float", [](const TreeNode* tn) {
+       return ReadPrimitiveHelper<float>(tn, ReadFloat);
+     }},
+    {"integer", [](const TreeNode* tn) {
+       return ReadPrimitiveHelper<int>(tn, ReadInt);
+     }},
+    {"vector2", ReadVectorHelper<Vector2>},
+    {"vector3", ReadVectorHelper<Vector3>},
+    {"vector4", ReadVectorHelper<Vector4>},
+    {"matrix3", ReadVectorHelper<Matrix3>},
+    {"matrix", ReadVectorHelper<Matrix>},
+    {"rectangle", [](const TreeNode* tn) {
+       Rect<int> value;
+       if(ReadQuadHelper<int>(tn, {&value.x, &value.y, &value.width, &value.height}))
+       {
+         return Property::Value(value);
+       }
+       return Property::Value();
+     }},
+    {"rotation", ReadRotationHelper},
+    // STRING - not particularly animatable
+    // ARRAY - not particularly animatable
+    // MAP - not particularly animatable
+    {"extents", [](const TreeNode* tn) {
+       Extents value;
+       if(ReadQuadHelper<uint16_t>(tn, {&value.start, &value.end, &value.top, &value.bottom}))
+       {
+         return Property::Value(value);
+       }
+       return Property::Value();
+     }},
+  };
+  return kTypeIds;
+}
+
+Property::Value (*const kArrayPropertyProcessors[])(const TreeNode*){
+  ReadVectorHelper<Matrix>,
+  ReadVectorHelper<Matrix3>,
+  ReadVectorHelper<Vector4>,
+  ReadVectorHelper<Vector3>,
+  ReadVectorHelper<Vector2>,
+  ReadVectorSingleFloatHelper};
+
+} // namespace
+
+bool ReadBool(const TreeNode* node, bool& num)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  bool returnValue = false;
+  if(node->GetType() == TreeNode::BOOLEAN)
+  {
+    num         = node->GetBoolean();
+    returnValue = true;
+  }
+
+  return returnValue;
+}
+
+bool ReadInt(const TreeNode* node, int& num)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  bool returnValue = false;
+  if(node->GetType() == TreeNode::INTEGER)
+  {
+    num         = node->GetInteger();
+    returnValue = true;
+  }
+  else if(node->GetType() == TreeNode::FLOAT)
+  {
+    num         = static_cast<int>(node->GetFloat());
+    returnValue = true;
+  }
+
+  return returnValue;
+}
+
+bool ReadFloat(const TreeNode* node, float& num)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  bool returnValue = false;
+  if(node->GetType() == TreeNode::FLOAT)
+  {
+    num         = node->GetFloat();
+    returnValue = true;
+  }
+  else if(node->GetType() == TreeNode::INTEGER)
+  {
+    num         = static_cast<float>(node->GetInteger());
+    returnValue = true;
+  }
+
+  return returnValue;
+}
+
+bool ReadIndex(const Toolkit::TreeNode* node, Index& num)
+{
+  bool returnValue = node && node->GetType() == TreeNode::INTEGER;
+  if(returnValue)
+  {
+    num = static_cast<Index>(node->GetInteger());
+  }
+
+  return returnValue;
+}
+
+bool ReadBlob(const Toolkit::TreeNode* node, unsigned int& offset, unsigned int& length)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  int  iOffset, iLength;
+  bool success = ReadInt(node->GetChild("byteOffset"), iOffset) &&
+                 ReadInt(node->GetChild("byteLength"), iLength) &&
+                 iOffset >= 0 && iLength >= 0; // 0 length might not be sensible, but is not an error at this stage.
+  if(success)
+  {
+    offset = static_cast<unsigned int>(iOffset);
+    length = static_cast<unsigned int>(iLength);
+  }
+  return success;
+}
+
+size_t GetNumericalArraySize(const TreeNode* node)
+{
+  size_t size = 0;
+  if(node->GetType() == TreeNode::ARRAY)
+  {
+    for(auto i0 = node->CBegin(), i1 = node->CEnd(); i0 != i1 &&
+                                                     ((*i0).second.GetType() == TreeNode::FLOAT || (*i0).second.GetType() == TreeNode::INTEGER);
+        ++i0)
+    {
+      ++size;
+    }
+  }
+  return size;
+}
+
+bool ReadVector(const TreeNode* node, float* num, unsigned int size)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  bool returnValue = false;
+  if((node->Size() >= size) && (node->GetType() == TreeNode::ARRAY))
+  {
+    unsigned int offset = 0u;
+    for(TreeNode::ConstIterator it = node->CBegin(); offset < size; ++it, ++offset)
+    {
+      const TreeNode& coord = (*it).second;
+      if(!ReadFloat(&coord, *(num + offset)))
+      {
+        return false;
+      }
+    }
+    returnValue = true;
+  }
+
+  return returnValue;
+}
+
+bool ReadVector(const Toolkit::TreeNode* node, int* num, unsigned int size)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  bool returnValue = false;
+  if((node->Size() >= size) && (node->GetType() == TreeNode::ARRAY))
+  {
+    unsigned int offset = 0u;
+    for(TreeNode::ConstIterator it = node->CBegin(); offset < size; ++it, ++offset)
+    {
+      const TreeNode& coord = (*it).second;
+      if(!ReadInt(&coord, *(num + offset)))
+      {
+        return false;
+      }
+    }
+    returnValue = true;
+  }
+
+  return returnValue;
+}
+
+bool ReadColor(const TreeNode* node, Vector4& color)
+{
+  if(nullptr == node)
+  {
+    return false;
+  }
+
+  if(!ReadVector(node, color.AsFloat(), 4))
+  {
+    if(!ReadVector(node, color.AsFloat(), 3))
+    {
+      return false;
+    }
+    color.a = 1.f;
+  }
+
+  return true;
+}
+
+bool ReadTimePeriod(const TreeNode* node, TimePeriod& timePeriod)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  if(!ReadFloat(node->GetChild("delay"), timePeriod.delaySeconds) || !ReadFloat(node->GetChild("duration"), timePeriod.durationSeconds))
+  {
+    return false;
+  }
+  return true;
+}
+
+bool ReadString(const TreeNode* node, std::string& strValue)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  bool returnValue = false;
+  if(node->GetType() == TreeNode::STRING)
+  {
+    strValue    = node->GetString();
+    returnValue = true;
+  }
+  return returnValue;
+}
+
+bool ReadStringVector(const TreeNode* node, std::vector<std::string>& strvector)
+{
+  if(!node)
+  {
+    return false;
+  }
+
+  bool returnValue = false;
+  if(node->GetType() == TreeNode::ARRAY)
+  {
+    for(TreeNode::ConstIterator it = node->CBegin(); it != node->CEnd(); ++it)
+    {
+      const TreeNode& strNode = (*it).second;
+      if(strNode.GetType() == TreeNode::STRING)
+      {
+        strvector.push_back(strNode.GetString());
+      }
+      else
+      {
+        return false;
+      }
+    }
+    returnValue = true;
+  }
+  return returnValue;
+}
+
+Property::Value ReadPropertyValue(const Property::Type& propType, const TreeNode& tn)
+{
+  switch(propType)
+  {
+    case Property::BOOLEAN:
+      return ReadPrimitiveHelper<bool>(&tn, ReadBool);
+
+    case Property::FLOAT:
+      return ReadPrimitiveHelper<float>(&tn, ReadFloat);
+
+    case Property::INTEGER:
+      return ReadPrimitiveHelper<int>(&tn, ReadInt);
+
+    case Property::VECTOR2:
+      return ReadVectorHelper<Vector2>(&tn);
+
+    case Property::VECTOR3:
+      return ReadVectorHelper<Vector3>(&tn);
+
+    case Property::VECTOR4:
+      return ReadVectorHelper<Vector4>(&tn);
+
+    case Property::MATRIX3:
+      return ReadVectorHelper<Matrix3>(&tn);
+
+    case Property::MATRIX:
+      return ReadVectorHelper<Matrix>(&tn);
+
+    case Property::RECTANGLE:
+    {
+      Rect<int> value;
+      if(ReadQuadHelper<int>(&tn, {&value.x, &value.y, &value.width, &value.height}))
+      {
+        return Property::Value(value);
+      }
+      break;
+    }
+
+    case Property::ROTATION:
+      return ReadRotationHelper(&tn);
+
+    case Property::EXTENTS:
+    {
+      Extents value;
+      if(ReadQuadHelper<uint16_t>(&tn, {&value.start, &value.end, &value.top, &value.bottom}))
+      {
+        return Property::Value(value);
+      }
+      break;
+    }
+
+    case Property::NONE: // fall
+    default:
+    {
+      DALI_ASSERT_ALWAYS(!"Property type incorrect");
+    }
+  }
+  return Property::Value();
+}
+
+Property::Value ReadPropertyValue(const Toolkit::TreeNode& tn)
+{
+  Property::Value propValue;
+  if(tn.GetType() == TreeNode::OBJECT) // attempt to disambiguate type.
+  {
+    auto jsonType = tn.GetChild("type");
+    if(jsonType && jsonType->GetType() == TreeNode::STRING)
+    {
+      auto iFind = GetTypeIds().find(jsonType->GetString());
+      if(iFind != GetTypeIds().end())
+      {
+        propValue = iFind->second(tn.GetChild("value"));
+      }
+    }
+  }
+
+  if(propValue.GetType() == Property::NONE)
+  {
+    if(tn.Size() == 0)
+    {
+      switch(tn.GetType())
+      {
+        case TreeNode::BOOLEAN:
+          propValue = ReadPrimitiveHelper<bool>(&tn, ReadBool);
+          break;
+
+        case TreeNode::INTEGER:
+          propValue = ReadPrimitiveHelper<int>(&tn, ReadInt);
+          break;
+
+        case TreeNode::FLOAT:
+          propValue = ReadPrimitiveHelper<float>(&tn, ReadFloat);
+          break;
+
+        default:
+          break;
+      }
+    }
+    else
+    {
+      bool allNumbers = true;
+      for(auto i0 = tn.CBegin(), i1 = tn.CEnd(); i0 != i1; ++i0)
+      {
+        auto type = (*i0).second.GetType();
+        if(!(type == TreeNode::FLOAT || type == TreeNode::INTEGER))
+        {
+          allNumbers = false;
+          break;
+        }
+      }
+
+      if(allNumbers)
+      {
+        // NOTE: rotations / rectangles / extents must be disambiguated in all circumstances.
+        for(auto& r : kArrayPropertyProcessors)
+        {
+          propValue = r(&tn);
+          if(propValue.GetType() != Property::NONE)
+          {
+            break;
+          }
+        }
+      }
+    }
+  }
+  return propValue;
+}
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/internal/loader/json-util.h b/dali-scene3d/internal/loader/json-util.h
new file mode 100644
index 0000000..e7c222d
--- /dev/null
+++ b/dali-scene3d/internal/loader/json-util.h
@@ -0,0 +1,91 @@
+#ifndef DALI_SCENE3D_LOADER_JSON_UTIL_H_
+#define DALI_SCENE3D_LOADER_JSON_UTIL_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/builder/tree-node.h>
+#include <dali/public-api/animation/time-period.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/math/vector4.h>
+#include <dali/public-api/object/property.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/index.h>
+
+namespace Dali::Scene3D::Loader
+{
+bool ReadBool(const Toolkit::TreeNode* node, bool& num);
+
+bool ReadInt(const Toolkit::TreeNode* node, int& num);
+
+bool ReadFloat(const Toolkit::TreeNode* node, float& num);
+
+bool ReadIndex(const Toolkit::TreeNode* node, Index& num);
+
+bool ReadBlob(const Toolkit::TreeNode* node, unsigned int& offset, unsigned int& length);
+
+/**
+ * @brief Gets the number of numerical element of a JSON array;
+ * @return 0 if not an array, otherwise the number of float or integer elements
+ *  at the front of the array.
+ */
+size_t GetNumericalArraySize(const Toolkit::TreeNode* node);
+
+bool ReadVector(const Toolkit::TreeNode* node, float* num, unsigned int size);
+
+bool ReadVector(const Toolkit::TreeNode* node, int* num, unsigned int size);
+
+/**
+ * @brief Reads a color.
+ * 
+ * The node contents could be a vector of 4 floats [r,g,b,a].
+ * 
+ * @param[in] node The tree node with the color.
+ * @param[out] color The RGBA color.
+ * 
+ * @return true if succedded to read the color.
+ */
+bool ReadColor(const Toolkit::TreeNode* node, Vector4& color);
+
+bool ReadTimePeriod(const Toolkit::TreeNode* node, TimePeriod& timePeriod);
+
+bool ReadString(const Toolkit::TreeNode* node, std::string& strValue);
+
+bool ReadStringVector(const Toolkit::TreeNode* node, std::vector<std::string>& strvector);
+
+/**
+ * @brief Attempts to read a property of the given type from the given JSON node.
+ * @return The property value that it could interpret. If unsuccessful, its type will be NONE.
+ * @note Currently only numerical types are supported (including boolean).
+ */
+Property::Value ReadPropertyValue(const Property::Type& propType, const Toolkit::TreeNode& tn);
+
+/**
+ * @brief Attempts to read a property, whose type it will attempt to determine from the given
+ *  JSON node.
+ * @return The property value that it could interpret. If unsuccessful, its type will be NONE.
+ * @note Currently only numerical types are supported (including boolean).
+ * @note Supports a disambiguation syntax, whereby the type can be specified explicitly:
+ *  { "type": "rotation", "value": [...] } .
+ * @note: rotation / rectangle / extents type properties must be disambiguated in all circumstances.
+ */
+Property::Value ReadPropertyValue(const Toolkit::TreeNode& tn);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_JSON_UTIL_H_
diff --git a/dali-scene3d/internal/loader/model-loader-impl.h b/dali-scene3d/internal/loader/model-loader-impl.h
new file mode 100644
index 0000000..619cacb
--- /dev/null
+++ b/dali-scene3d/internal/loader/model-loader-impl.h
@@ -0,0 +1,69 @@
+#ifndef DALI_SCENE3D_LOADER_MODEL_LOADER_IMPL_H
+#define DALI_SCENE3D_LOADER_MODEL_LOADER_IMPL_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/model-loader.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+
+// EXTERNAL INCLUDES
+#include <string>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Loader
+{
+namespace Internal
+{
+class ModelLoaderImpl
+{
+public:
+  ModelLoaderImpl() = default;
+
+  /**
+   * @brief Set InputParameter.
+   * Thie method store only a pointer of InputParameter.
+   * The object of InputParameter should not be deleted until it is no longer used.
+   * @param[in] inputParameter Input parameters those can be used for model loading.
+   */
+  void SetInputParameter(Dali::Scene3D::Loader::ModelLoader::InputParameter& inputParameter)
+  {
+    mInputParameter = &inputParameter;
+  }
+
+  /**
+   * @brief Request to load model from url.
+   * @param[in] url model file url.
+   * @param[out] result loaded model data.
+   * @return True if model loading is successfully finished.
+   */
+  virtual bool LoadModel(const std::string& url, Dali::Scene3D::Loader::LoadResult& result) = 0;
+
+protected:
+  Dali::Scene3D::Loader::ModelLoader::InputParameter* mInputParameter{nullptr};
+};
+} // namespace Internal
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
+
+#endif // DALI_SCENE3D_LOADER_MODEL_LOADER_IMPL_H
diff --git a/dali-scene3d/internal/model-components/material-impl.cpp b/dali-scene3d/internal/model-components/material-impl.cpp
new file mode 100644
index 0000000..baebb4a
--- /dev/null
+++ b/dali-scene3d/internal/model-components/material-impl.cpp
@@ -0,0 +1,870 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-components/material-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/rendering/sampler.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-scene3d/internal/light/light-impl.h>
+#include <dali-scene3d/internal/model-components/material-modify-observer.h>
+#include <dali-scene3d/public-api/loader/node-definition.h>
+#include <dali-scene3d/public-api/loader/renderer-state.h>
+#include <dali-scene3d/public-api/loader/shader-option.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates Material through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::Material::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::Material, Dali::BaseHandle, Create);
+DALI_TYPE_REGISTRATION_END()
+
+static constexpr uint32_t         OFFSET_FOR_SHADOW_MAP_TEXTURE    = 4u;
+static constexpr uint32_t         OFFSET_FOR_DIFFUSE_CUBE_TEXTURE  = 2u;
+static constexpr uint32_t         OFFSET_FOR_SPECULAR_CUBE_TEXTURE = 1u;
+static constexpr uint32_t         INVALID_INDEX                    = 0u;
+static constexpr uint32_t         ALPHA_CUTOFF_FLAG                = Scene3D::Loader::MaterialDefinition::Flags::SUBSURFACE << 1;
+static constexpr std::string_view THREE_TEX_KEYWORD                = "THREE_TEX";
+static constexpr std::string_view GLTF_CHANNELS_KEYWORD            = "GLTF_CHANNELS";
+
+static constexpr Vector3 IBL_BASIS(1.0f, -1.0f, 1.0f);
+
+enum TextureIndex
+{
+  BASE_COLOR,
+  METALLIC_ROUGHNESS,
+  NORMAL,
+  OCCLUSION,
+  EMISSIVE,
+  SPECULAR,
+  SPECULAR_COLOR,
+  TEXTURE_TYPE_NUMBER,
+};
+
+/**
+ * @brief Helper API to register uniform property only if don't register before.
+ *
+ * @tparam T Type of uniform value.
+ * @param[in] renderer The renderer what we want to check / register property.
+ * @param[in] uniformName The name of uniform.
+ * @param[in] defaultUniformValue The default value if renderer don't register given uniform before.
+ */
+template<typename T>
+void RegisterUniformIfNotDefinedBefore(Renderer renderer, const std::string_view& uniformName, const T& defaultUniformValue)
+{
+  if(renderer.GetPropertyIndex(uniformName.data()) == Property::INVALID_INDEX)
+  {
+    renderer.RegisterProperty(uniformName, defaultUniformValue);
+  }
+}
+
+} // unnamed namespace
+
+MaterialPtr Material::New()
+{
+  MaterialPtr material = new Material();
+
+  material->Initialize();
+
+  return material;
+}
+
+Material::Material()
+: mName(),
+  mModifyFlag(MaterialModifyObserver::ModifyFlag::NONE),
+  mObserverNotifying(false)
+{
+  mAsyncImageLoader = Dali::Toolkit::AsyncImageLoader::New();
+  mAsyncImageLoader.ImageLoadedSignal().Connect(this, &Material::TextureLoadComplete);
+  mTextureInformations.assign(TEXTURE_TYPE_NUMBER, TextureInformation());
+  mTextureInformations[BASE_COLOR].mSemantic = Scene3D::Loader::MaterialDefinition::ALBEDO;
+  // TODO : How we support dli manner
+  mTextureInformations[METALLIC_ROUGHNESS].mSemantic = Scene3D::Loader::MaterialDefinition::METALLIC | Scene3D::Loader::MaterialDefinition::ROUGHNESS |
+                                                       Scene3D::Loader::MaterialDefinition::GLTF_CHANNELS;
+  mTextureInformations[NORMAL].mSemantic         = Scene3D::Loader::MaterialDefinition::NORMAL;
+  mTextureInformations[OCCLUSION].mSemantic      = Scene3D::Loader::MaterialDefinition::OCCLUSION;
+  mTextureInformations[EMISSIVE].mSemantic       = Scene3D::Loader::MaterialDefinition::EMISSIVE;
+  mTextureInformations[SPECULAR].mSemantic       = Scene3D::Loader::MaterialDefinition::SPECULAR;
+  mTextureInformations[SPECULAR_COLOR].mSemantic = Scene3D::Loader::MaterialDefinition::SPECULAR_COLOR;
+
+  mTextureInformations[BASE_COLOR].mShaderOptionType         = Loader::ShaderOption::Type::BASE_COLOR_TEXTURE;
+  mTextureInformations[METALLIC_ROUGHNESS].mShaderOptionType = Loader::ShaderOption::Type::METALLIC_ROUGHNESS_TEXTURE;
+  mTextureInformations[NORMAL].mShaderOptionType             = Loader::ShaderOption::Type::NORMAL_TEXTURE;
+  mTextureInformations[OCCLUSION].mShaderOptionType          = Loader::ShaderOption::Type::OCCLUSION;
+  mTextureInformations[EMISSIVE].mShaderOptionType           = Loader::ShaderOption::Type::EMISSIVE;
+  mTextureInformations[SPECULAR].mShaderOptionType           = Loader::ShaderOption::Type::SPECULAR;
+  mTextureInformations[SPECULAR_COLOR].mShaderOptionType     = Loader::ShaderOption::Type::SPECULAR_COLOR;
+
+  mTextureInformations[TextureIndex::EMISSIVE].mFactor = Vector4::ZERO;
+}
+
+Material::~Material() = default;
+
+void Material::Initialize()
+{
+}
+
+void Material::SetProperty(Dali::Property::Index index, Dali::Property::Value propertyValue)
+{
+  bool needToApply = true;
+  switch(index)
+  {
+    case Dali::Scene3D::Material::Property::NAME:
+    {
+      std::string name;
+      if(propertyValue.Get(name))
+      {
+        mName = name;
+      }
+      needToApply = false;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::BASE_COLOR_URL:
+    {
+      std::string baseColorUrl;
+      if(propertyValue.Get(baseColorUrl))
+      {
+        RequestTextureLoad(mTextureInformations[TextureIndex::BASE_COLOR], baseColorUrl);
+        needToApply = false;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR:
+    {
+      Vector4 baseColorFactor;
+      if(propertyValue.Get(baseColorFactor))
+      {
+        mTextureInformations[TextureIndex::BASE_COLOR].mFactor = baseColorFactor;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::METALLIC_ROUGHNESS_URL:
+    {
+      std::string metallicRoughnessUrl;
+      if(propertyValue.Get(metallicRoughnessUrl))
+      {
+        RequestTextureLoad(mTextureInformations[TextureIndex::METALLIC_ROUGHNESS], metallicRoughnessUrl);
+        needToApply = false;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::METALLIC_FACTOR:
+    {
+      float metallicFactor;
+      if(propertyValue.Get(metallicFactor))
+      {
+        mTextureInformations[TextureIndex::METALLIC_ROUGHNESS].mFactor.x = metallicFactor;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::ROUGHNESS_FACTOR:
+    {
+      float roughnessFactor;
+      if(propertyValue.Get(roughnessFactor))
+      {
+        mTextureInformations[TextureIndex::METALLIC_ROUGHNESS].mFactor.y = roughnessFactor;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::NORMAL_URL:
+    {
+      std::string normalUrl;
+      if(propertyValue.Get(normalUrl))
+      {
+        RequestTextureLoad(mTextureInformations[TextureIndex::NORMAL], normalUrl);
+        needToApply = false;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::NORMAL_SCALE:
+    {
+      float normalScale;
+      if(propertyValue.Get(normalScale))
+      {
+        mTextureInformations[TextureIndex::NORMAL].mFactor.x = normalScale;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::OCCLUSION_URL:
+    {
+      std::string occlusionUrl;
+      if(propertyValue.Get(occlusionUrl))
+      {
+        RequestTextureLoad(mTextureInformations[TextureIndex::OCCLUSION], occlusionUrl);
+        needToApply = false;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::OCCLUSION_STRENGTH:
+    {
+      float occlusionStrength;
+      if(propertyValue.Get(occlusionStrength))
+      {
+        mTextureInformations[TextureIndex::OCCLUSION].mFactor.x = occlusionStrength;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::EMISSIVE_URL:
+    {
+      std::string emissiveUrl;
+      if(propertyValue.Get(emissiveUrl))
+      {
+        RequestTextureLoad(mTextureInformations[TextureIndex::EMISSIVE], emissiveUrl);
+        needToApply = false;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::EMISSIVE_FACTOR:
+    {
+      Vector3 emissiveFactor;
+      if(propertyValue.Get(emissiveFactor))
+      {
+        mTextureInformations[TextureIndex::EMISSIVE].mFactor = emissiveFactor;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::ALPHA_MODE:
+    {
+      Dali::Scene3D::Material::AlphaModeType alphaMode;
+      if(propertyValue.Get(alphaMode))
+      {
+        mAlphaMode = alphaMode;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::ALPHA_CUTOFF:
+    {
+      float alphaCutoff;
+      if(propertyValue.Get(alphaCutoff))
+      {
+        mAlphaCutoff = alphaCutoff;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::DOUBLE_SIDED:
+    {
+      bool doubleSided;
+      if(propertyValue.Get(doubleSided))
+      {
+        mDoubleSided = doubleSided;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::IOR:
+    {
+      float ior;
+      if(propertyValue.Get(ior))
+      {
+        mIor = ior;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_URL:
+    {
+      std::string specularUrl;
+      if(propertyValue.Get(specularUrl))
+      {
+        RequestTextureLoad(mTextureInformations[TextureIndex::SPECULAR], specularUrl);
+        needToApply = false;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_FACTOR:
+    {
+      float specularFactor;
+      if(propertyValue.Get(specularFactor))
+      {
+        mTextureInformations[TextureIndex::SPECULAR].mFactor.x = specularFactor;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_COLOR_URL:
+    {
+      std::string specularColorUrl;
+      if(propertyValue.Get(specularColorUrl))
+      {
+        RequestTextureLoad(mTextureInformations[TextureIndex::SPECULAR_COLOR], specularColorUrl);
+        needToApply = false;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_COLOR_FACTOR:
+    {
+      Vector3 specularColorFactor;
+      if(propertyValue.Get(specularColorFactor))
+      {
+        mTextureInformations[TextureIndex::SPECULAR_COLOR].mFactor = specularColorFactor;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::UNIFORM;
+      }
+      break;
+    }
+    case Dali::Scene3D::Material::Property::DEPTH_INDEX:
+    {
+      int32_t depthIndex = 0;
+      if(propertyValue.Get(depthIndex) && mDepthIndex != depthIndex)
+      {
+        mDepthIndex = depthIndex;
+        mModifyFlag |= MaterialModifyObserver::ModifyFlag::PROPERTY;
+      }
+      break;
+    }
+  }
+
+  if(needToApply)
+  {
+    Apply();
+  }
+}
+
+Dali::Property::Value Material::GetProperty(Dali::Property::Index index) const
+{
+  Dali::Property::Value value;
+  switch(index)
+  {
+    case Dali::Scene3D::Material::Property::NAME:
+    {
+      value = mName;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::BASE_COLOR_URL:
+    {
+      value = mTextureInformations[TextureIndex::BASE_COLOR].mUrl;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::BASE_COLOR_FACTOR:
+    {
+      value = mTextureInformations[TextureIndex::BASE_COLOR].mFactor;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::METALLIC_ROUGHNESS_URL:
+    {
+      value = mTextureInformations[TextureIndex::METALLIC_ROUGHNESS].mUrl;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::METALLIC_FACTOR:
+    {
+      value = mTextureInformations[TextureIndex::METALLIC_ROUGHNESS].mFactor.x;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::ROUGHNESS_FACTOR:
+    {
+      value = mTextureInformations[TextureIndex::METALLIC_ROUGHNESS].mFactor.y;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::NORMAL_URL:
+    {
+      value = mTextureInformations[TextureIndex::NORMAL].mUrl;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::NORMAL_SCALE:
+    {
+      value = mTextureInformations[TextureIndex::NORMAL].mFactor.x;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::OCCLUSION_URL:
+    {
+      value = mTextureInformations[TextureIndex::OCCLUSION].mUrl;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::OCCLUSION_STRENGTH:
+    {
+      value = mTextureInformations[TextureIndex::OCCLUSION].mFactor.x;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::EMISSIVE_URL:
+    {
+      value = mTextureInformations[TextureIndex::EMISSIVE].mUrl;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::EMISSIVE_FACTOR:
+    {
+      value = Vector3(mTextureInformations[TextureIndex::EMISSIVE].mFactor);
+      break;
+    }
+    case Dali::Scene3D::Material::Property::ALPHA_MODE:
+    {
+      value = mAlphaMode;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::ALPHA_CUTOFF:
+    {
+      value = mAlphaCutoff;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::DOUBLE_SIDED:
+    {
+      value = mDoubleSided;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::IOR:
+    {
+      value = mIor;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_URL:
+    {
+      value = mTextureInformations[TextureIndex::SPECULAR].mUrl;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_FACTOR:
+    {
+      value = mTextureInformations[TextureIndex::SPECULAR].mFactor.x;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_COLOR_URL:
+    {
+      value = mTextureInformations[TextureIndex::SPECULAR_COLOR].mUrl;
+      break;
+    }
+    case Dali::Scene3D::Material::Property::SPECULAR_COLOR_FACTOR:
+    {
+      value = Vector3(mTextureInformations[TextureIndex::SPECULAR_COLOR].mFactor);
+      break;
+    }
+    case Dali::Scene3D::Material::Property::DEPTH_INDEX:
+    {
+      value = mDepthIndex;
+      break;
+    }
+  }
+  return value;
+}
+
+void Material::SetTextureInformation(Scene3D::Material::TextureType index, TextureInformation&& textureInformation)
+{
+  mTextureInformations[index].mFactor  = textureInformation.mFactor;
+  mTextureInformations[index].mSampler = textureInformation.mSampler;
+  mTextureInformations[index].mTexture = textureInformation.mTexture;
+  mTextureInformations[index].mUrl     = std::move(textureInformation.mUrl);
+}
+
+void Material::SetTexture(Scene3D::Material::TextureType index, Dali::Texture texture)
+{
+  if(static_cast<uint32_t>(index) < static_cast<uint32_t>(TextureIndex::TEXTURE_TYPE_NUMBER))
+  {
+    if(mTextureInformations[index].mTexture != texture)
+    {
+      if(mTextureInformations[index].mLoadingTaskId != INVALID_INDEX)
+      {
+        mAsyncImageLoader.Cancel(mTextureInformations[index].mLoadingTaskId);
+        mTextureInformations[index].mLoadingTaskId = INVALID_INDEX;
+      }
+      mTextureInformations[index].mTexture = texture;
+      if(IsResourceReady())
+      {
+        ResourcesLoadComplete();
+      }
+    }
+  }
+}
+
+Dali::Texture Material::GetTexture(Scene3D::Material::TextureType index)
+{
+  if(static_cast<uint32_t>(index) < static_cast<uint32_t>(TextureIndex::TEXTURE_TYPE_NUMBER))
+  {
+    return mTextureInformations[index].mTexture;
+  }
+  return Dali::Texture();
+}
+
+TextureSet Material::GetTextureSet()
+{
+  TextureSet textures = TextureSet::New();
+  for(uint32_t i = 0, count = 0; i < TEXTURE_TYPE_NUMBER; ++i)
+  {
+    if(!mTextureInformations[i].mTexture)
+    {
+      continue;
+    }
+    textures.SetTexture(count, mTextureInformations[i].mTexture);
+    Sampler sampler = mTextureInformations[i].mSampler;
+    if(!sampler)
+    {
+      auto samplerFlag = Scene3D::Loader::SamplerFlags::FILTER_LINEAR | (Scene3D::Loader::SamplerFlags::FILTER_LINEAR << Scene3D::Loader::SamplerFlags::FILTER_MAG_SHIFT) |
+                         (Scene3D::Loader::SamplerFlags::WRAP_REPEAT << Scene3D::Loader::SamplerFlags::WRAP_S_SHIFT) | (Scene3D::Loader::SamplerFlags::WRAP_REPEAT << Scene3D::Loader::SamplerFlags::WRAP_T_SHIFT);
+      sampler = Scene3D::Loader::SamplerFlags::MakeSampler(samplerFlag);
+    }
+    textures.SetSampler(count, sampler);
+    count++;
+  }
+  return textures;
+}
+
+void Material::SetSampler(Scene3D::Material::TextureType index, Dali::Sampler sampler)
+{
+  if(static_cast<uint32_t>(index) < static_cast<uint32_t>(TextureIndex::TEXTURE_TYPE_NUMBER))
+  {
+    mTextureInformations[index].mSampler = sampler;
+  }
+}
+
+Dali::Sampler Material::GetSampler(Scene3D::Material::TextureType index)
+{
+  if(static_cast<uint32_t>(index) < static_cast<uint32_t>(TextureIndex::TEXTURE_TYPE_NUMBER))
+  {
+    return mTextureInformations[index].mSampler;
+  }
+  return Dali::Sampler();
+}
+
+Scene3D::Loader::ShaderOption Material::GetShaderOption() const
+{
+  return mShaderOption;
+}
+
+void Material::Apply()
+{
+  if(IsResourceReady())
+  {
+    UpdateMaterialData();
+    NotifyObserver();
+    return;
+  }
+  // The cases this material is applied to primitive are,
+  // 1. material is added on Primitive.
+  // When material is added on Primitive (1 case)
+  //   1-1. when IsResourceReady() returns true,
+  //     Primitive can takes information from Material
+  //   1-2. if false.
+  //     Material will noti to primitives when all resources are ready.
+  // 2. Some properties are changed
+  //   2-1. when IsResourceReady() returns true,
+  //     Call NotifyObserver directly.
+  //   2-2. if false.
+  //     Material will noti to primitives when all resources are ready.
+}
+
+void Material::AddObserver(MaterialModifyObserver* observer)
+{
+  for(auto& observerEntity : mObservers)
+  {
+    if(observerEntity.first == observer)
+    {
+      observerEntity.second = true;
+      return;
+    }
+  }
+  mObservers.push_back({observer, true});
+}
+
+void Material::RemoveObserver(MaterialModifyObserver* observer)
+{
+  // Block during notifying to observer
+  if(mObserverNotifying)
+  {
+    for(uint32_t i = 0; i < mObservers.size(); ++i)
+    {
+      if(mObservers[i].first == observer)
+      {
+        mObservers[i].second = false;
+        return;
+      }
+    }
+  }
+  else
+  {
+    for(uint32_t i = 0; i < mObservers.size(); ++i)
+    {
+      if(mObservers[i].first == observer)
+      {
+        mObservers.erase(mObservers.begin() + i);
+        return;
+      }
+    }
+  }
+}
+
+void Material::UpdateMaterialData()
+{
+  uint32_t materialFlag = 0u;
+  if(mAlphaMode == Dali::Scene3D::Material::AlphaModeType::BLEND)
+  {
+    mIsOpaque = false;
+    mIsMask   = false;
+    materialFlag |= Scene3D::Loader::MaterialDefinition::TRANSPARENCY;
+  }
+  else if(mAlphaMode == Dali::Scene3D::Material::AlphaModeType::MASK)
+  {
+    mIsOpaque = true;
+    mIsMask   = true;
+  }
+  const bool hasTransparency = MaskMatch(materialFlag, Scene3D::Loader::MaterialDefinition::TRANSPARENCY);
+
+  for(auto&& textureInformation : mTextureInformations)
+  {
+    if(!textureInformation.mTexture)
+    {
+      continue;
+    }
+    materialFlag |= textureInformation.mSemantic;
+  }
+
+  if(mMaterialFlag != materialFlag)
+  {
+    mModifyFlag |= MaterialModifyObserver::ModifyFlag::SHADER;
+
+    mMaterialFlag = materialFlag;
+
+    mShaderOption = Loader::ShaderOption();
+    for(auto&& textureInformation : mTextureInformations)
+    {
+      if(!textureInformation.mTexture)
+      {
+        continue;
+      }
+      mShaderOption.AddOption(textureInformation.mShaderOptionType);
+    }
+    mShaderOption.AddOption(Loader::ShaderOption::Type::THREE_TEXTURE);
+    mShaderOption.AddOption(Loader::ShaderOption::Type::GLTF_CHANNELS);
+    if(materialFlag & Scene3D::Loader::MaterialDefinition::TRANSPARENCY)
+    {
+      mShaderOption.SetTransparency();
+    }
+  }
+
+  // Finish to make all the material flag according to the gltf2-util.
+  // Then make defines as fallowing shader-manager.
+
+  // The renderer State below can be used in primitive to set renderer properties.
+
+  // for renderer setting
+  mRendererState = Scene3D::Loader::RendererState::DEPTH_TEST;
+  if(!mDoubleSided)
+  {
+    mRendererState |= Scene3D::Loader::RendererState::CULL_BACK;
+  }
+
+  if(hasTransparency)
+  {
+    mRendererState = (mRendererState | Scene3D::Loader::RendererState::ALPHA_BLEND);
+  }
+}
+
+bool Material::IsResourceReady()
+{
+  for(auto&& textureInformation : mTextureInformations)
+  {
+    if(!textureInformation.IsReady())
+    {
+      return false;
+    }
+  }
+  return true;
+}
+
+void Material::SetRendererUniform(Dali::Renderer renderer)
+{
+  renderer.RegisterProperty("uColorFactor", mTextureInformations[TextureIndex::BASE_COLOR].mFactor);
+  renderer.RegisterProperty("uMetallicFactor", mTextureInformations[TextureIndex::METALLIC_ROUGHNESS].mFactor.x);
+  renderer.RegisterProperty("uRoughnessFactor", mTextureInformations[TextureIndex::METALLIC_ROUGHNESS].mFactor.y);
+  renderer.RegisterProperty("uNormalScale", mTextureInformations[TextureIndex::NORMAL].mFactor.x);
+  if(mTextureInformations[TextureIndex::OCCLUSION].mTexture)
+  {
+    renderer.RegisterProperty("uOcclusionStrength", mTextureInformations[TextureIndex::OCCLUSION].mFactor.x);
+  }
+  renderer.RegisterProperty("uEmissiveFactor", Vector3(mTextureInformations[TextureIndex::EMISSIVE].mFactor));
+  float dielectricSpecular = (Dali::Equals(mIor, -1.0)) ? 0.04f : powf((mIor - 1.0f) / (mIor + 1.0f), 2.0f);
+  renderer.RegisterProperty("uDielectricSpecular", dielectricSpecular);
+  renderer.RegisterProperty("uSpecularFactor", mTextureInformations[TextureIndex::SPECULAR].mFactor.x);
+  renderer.RegisterProperty("uSpecularColorFactor", Vector3(mTextureInformations[TextureIndex::SPECULAR_COLOR].mFactor));
+
+  float opaque = mIsOpaque ? 1.0f : 0.0f;
+  float mask   = mIsMask ? 1.0f : 0.0f;
+  renderer.RegisterProperty("uOpaque", opaque);
+  renderer.RegisterProperty("uMask", mask);
+  renderer.RegisterProperty("uAlphaThreshold", mAlphaCutoff);
+
+  // Setup default uniform values what we might need.
+  RegisterUniformIfNotDefinedBefore(renderer, "uBaseColorTextureTransformAvailable", 0.0f);
+  RegisterUniformIfNotDefinedBefore(renderer, "uNormalTextureTransformAvailable", 0.0f);
+  RegisterUniformIfNotDefinedBefore(renderer, "uNormalRoughnessTextureTransformAvailable", 0.0f);
+  RegisterUniformIfNotDefinedBefore(renderer, "uMetalRoughnessTextureTransformAvailable", 0.0f);
+  RegisterUniformIfNotDefinedBefore(renderer, "uOcclusionTextureTransformAvailable", 0.0f);
+  RegisterUniformIfNotDefinedBefore(renderer, "uEmissiveTextureTransformAvailable", 0.0f);
+
+  RegisterUniformIfNotDefinedBefore(renderer, "uBaseColorTextureTransform", Matrix3::IDENTITY);
+  RegisterUniformIfNotDefinedBefore(renderer, "uNormalRoughnessTextureTransform", Matrix3::IDENTITY);
+  RegisterUniformIfNotDefinedBefore(renderer, "uNormalTextureTransform", Matrix3::IDENTITY);
+  RegisterUniformIfNotDefinedBefore(renderer, "uMetalRoughnessTextureTransform", Matrix3::IDENTITY);
+  RegisterUniformIfNotDefinedBefore(renderer, "uOcclusionTextureTransform", Matrix3::IDENTITY);
+  RegisterUniformIfNotDefinedBefore(renderer, "uEmissiveTextureTransform", Matrix3::IDENTITY);
+
+  RegisterUniformIfNotDefinedBefore(renderer, "uCubeMatrix", Matrix::IDENTITY);
+
+  RegisterUniformIfNotDefinedBefore(renderer, Scene3D::Loader::NodeDefinition::GetIblMaxLodUniformName(), 1.0f);
+  RegisterUniformIfNotDefinedBefore(renderer, Scene3D::Loader::NodeDefinition::GetIblScaleFactorUniformName(), 1.0f);
+  RegisterUniformIfNotDefinedBefore(renderer, Scene3D::Loader::NodeDefinition::GetIblYDirectionUniformName(), IBL_BASIS);
+
+  Scene3D::Loader::RendererState::Apply(mRendererState, renderer);
+}
+
+void Material::SetRendererProperty(Dali::Renderer renderer)
+{
+  renderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, mDepthIndex);
+}
+
+uint32_t Material::GetShadowMapTextureOffset()
+{
+  return OFFSET_FOR_SHADOW_MAP_TEXTURE;
+}
+
+uint32_t Material::GetSpecularImageBasedLightTextureOffset()
+{
+  return OFFSET_FOR_SPECULAR_CUBE_TEXTURE;
+}
+
+uint32_t Material::GetDiffuseImageBasedLightTextureOffset()
+{
+  return OFFSET_FOR_DIFFUSE_CUBE_TEXTURE;
+}
+
+std::string_view Material::GetImageBasedLightScaleFactorName()
+{
+  return Dali::Scene3D::Loader::NodeDefinition::GetIblScaleFactorUniformName();
+}
+
+std::string_view Material::GetImageBasedLightMaxLodUniformName()
+{
+  return Dali::Scene3D::Loader::NodeDefinition::GetIblMaxLodUniformName();
+}
+
+void Material::ResetFlag()
+{
+  mModifyFlag = MaterialModifyObserver::ModifyFlag::NONE;
+}
+
+void Material::NotifyObserver()
+{
+  if(mModifyFlag != MaterialModifyObserver::ModifyFlag::NONE && IsResourceReady())
+  {
+    if(mObserverNotifying)
+    {
+      DALI_LOG_ERROR("Notify during observing is not allowed.");
+      return;
+    }
+
+    Dali::Scene3D::Material handle(this); // Keep itself's life during notify
+
+    // Copy the flag due to the flag can be changed during observe.
+    MaterialModifyObserver::ModifyFlag copiedFlag = mModifyFlag;
+    mModifyFlag                                   = MaterialModifyObserver::ModifyFlag::NONE;
+
+    // Need to block mObserver container change during observe
+    mObserverNotifying = true;
+    for(uint32_t i = 0; i < mObservers.size(); ++i)
+    {
+      if(mObservers[i].second)
+      {
+        mObservers[i].first->OnMaterialModified(handle, copiedFlag);
+      }
+    }
+    mObserverNotifying = false;
+
+    // Resolve observer queue during notify
+    mObservers.erase(std::remove_if(mObservers.begin(), mObservers.end(), [](auto& e) { return !e.second; }),
+                     mObservers.end());
+  }
+}
+
+void Material::RequestTextureLoad(TextureInformation& textureInformation, const std::string& url)
+{
+  if(textureInformation.mUrl == url)
+  {
+    return;
+  }
+
+  textureInformation.mUrl = url;
+  if(textureInformation.mLoadingTaskId != INVALID_INDEX)
+  {
+    mAsyncImageLoader.Cancel(textureInformation.mLoadingTaskId);
+    textureInformation.mLoadingTaskId = INVALID_INDEX;
+  }
+
+  if(url.empty())
+  {
+    textureInformation.mTexture.Reset();
+    return;
+  }
+  textureInformation.mLoadingTaskId = mAsyncImageLoader.Load(url);
+}
+
+void Material::TextureLoadComplete(uint32_t loadedTaskId, PixelData pixelData)
+{
+  for(auto&& textureInformation : mTextureInformations)
+  {
+    if(textureInformation.mLoadingTaskId != loadedTaskId)
+    {
+      continue;
+    }
+
+    if(pixelData)
+    {
+      textureInformation.mTexture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+      textureInformation.mTexture.Upload(pixelData);
+    }
+    textureInformation.mLoadingTaskId = INVALID_INDEX;
+    break;
+  }
+
+  if(IsResourceReady())
+  {
+    ResourcesLoadComplete();
+  }
+}
+
+void Material::ResourcesLoadComplete()
+{
+  mModifyFlag |= MaterialModifyObserver::ModifyFlag::TEXTURE;
+  Apply();
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/internal/model-components/material-impl.h b/dali-scene3d/internal/model-components/material-impl.h
new file mode 100644
index 0000000..a4c605f
--- /dev/null
+++ b/dali-scene3d/internal/model-components/material-impl.h
@@ -0,0 +1,345 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_IMPL_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/object/property-value.h>
+#include <dali/public-api/object/property.h>
+#include <dali/public-api/rendering/texture.h>
+#include <set>
+#include <utility>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-components/material-modify-observer.h>
+#include <dali-scene3d/public-api/loader/material-definition.h>
+#include <dali-scene3d/public-api/loader/shader-definition.h>
+#include <dali-scene3d/public-api/loader/shader-option.h>
+#include <dali-scene3d/public-api/model-components/material.h>
+#include <dali-scene3d/public-api/common/scene-depth-index-ranges.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using MaterialPtr = IntrusivePtr<Material>;
+
+/**
+ * @brief This is the internal base class for Material of model.
+ *
+ * @SINCE_2_2.99
+ */
+class Material : public BaseObject, public ConnectionTracker
+{
+private:
+  using ObserverContainer = std::vector<std::pair<MaterialModifyObserver*, bool>>;
+
+public:
+  /**
+   * @brief Pair of texture handle and it's own scale factor. Texture handle can be empty
+   */
+  struct TextureInformation
+  {
+    bool IsReady()
+    {
+      return mLoadingTaskId == 0u;
+    }
+
+    std::string                         mUrl;
+    Dali::Texture                       mTexture;
+    Vector4                             mFactor{Vector4::ONE};
+    Dali::Sampler                       mSampler;
+    uint32_t                            mLoadingTaskId{0u};
+    uint32_t                            mSemantic;
+    Scene3D::Loader::ShaderOption::Type mShaderOptionType;
+    Matrix3                             mTransform{Scene3D::Loader::TextureDefinition::DEFAULT_TRANSFORM};
+  };
+
+  using TextureInformationContainer = std::vector<TextureInformation>;
+
+public:
+  // Creation & Destruction
+  /**
+   * @brief Create a new Material object.
+   * @return A smart-pointer to the newly allocated Material.
+   */
+  static MaterialPtr New();
+
+protected:
+  /**
+   * @brief Construct a new Material.
+   */
+  Material();
+
+  /**
+   * @brief Second-phase constructor.
+   */
+  void Initialize();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~Material();
+
+public:
+  /**
+   * @copydoc Dali::Scene3D::Material::SetProperty()
+   */
+  void SetProperty(Dali::Property::Index index, Dali::Property::Value propertyValue);
+
+  /**
+   * @copydoc Dali::Scene3D::Material::GetProperty()
+   */
+  Dali::Property::Value GetProperty(Dali::Property::Index index) const;
+
+  /**
+   * @brief Sets a texture information for the material.
+   *
+   * @param[in] index The index of the texture to set.
+   * @param[in] textureInformation The texture information to set.
+   *
+   * @note This function moves the value of textureInformation.
+   */
+  void SetTextureInformation(Scene3D::Material::TextureType index, TextureInformation&& textureInformation);
+
+  /**
+   * @brief Sets a texture for the material.
+   *
+   * @param[in] index The index of the texture to set.
+   * @param[in] texture The texture to set.
+   */
+  void SetTexture(Scene3D::Material::TextureType index, Dali::Texture texture);
+
+  /**
+   * @brief Retrieves texture for the material.
+   *
+   * @param[in] index The index of the texture to get.
+   *
+   * @return The texture at the given index.
+   */
+  Dali::Texture GetTexture(Scene3D::Material::TextureType index);
+
+  /**
+   * @brief Retrieves the texture set for this material.
+   *
+   * @return The texture set for this material.
+   */
+  TextureSet GetTextureSet();
+
+  /**
+   * @brief Sets a sampler for the material.
+   *
+   * @param[in] index The index of the sampler to set.
+   * @param[in] sampler The sampler to set.
+   */
+  void SetSampler(Scene3D::Material::TextureType index, Dali::Sampler sampler);
+
+  /**
+   * @brief Retrieves a sampler for the material.
+   *
+   * @param[in] index The index of the sampler to get.
+   * @return The sampler at the given index.
+   */
+  Dali::Sampler GetSampler(Scene3D::Material::TextureType index);
+
+  /**
+   * @brief Retrieves Shader Option of this Material.
+   *
+   * @return Shader Option of this Material.
+   */
+  Scene3D::Loader::ShaderOption GetShaderOption() const;
+
+public:
+  /**
+   * @brief Adds observer to this material.
+   *
+   * @param[in] observer Pointer of observer.
+   */
+  void AddObserver(MaterialModifyObserver* observer);
+
+  /**
+   * @brief Removes observer from this material.
+   *
+   * @param[in] observer Pointer of observer.
+   */
+  void RemoveObserver(MaterialModifyObserver* observer);
+
+  /**
+   * @brief Updates material data.
+   */
+  void UpdateMaterialData();
+
+  /**
+   * @brief Sets uniform value to the Renderer.
+   *
+   * @param[in] renderer Renderer object.
+   */
+  void SetRendererUniform(Dali::Renderer renderer);
+
+  /**
+   * @brief Sets property value to the Renderer.
+   *
+   * @param[in] renderer Renderer object.
+   */
+  void SetRendererProperty(Dali::Renderer renderer);
+
+  /**
+   * @brief Retrieves shadow map texture offset.
+   *
+   * @return shadow map texture offset.
+   */
+  uint32_t GetShadowMapTextureOffset();
+
+  /**
+   * @brief Retrieves specular image based light texture offset.
+   *
+   * @return Specular image based light texture offset.
+   */
+  uint32_t GetSpecularImageBasedLightTextureOffset();
+
+  /**
+   * @brief Retrieves diffuse image based light texture offset.
+   *
+   * @return Diffuse image based light texture offset.
+   */
+  uint32_t GetDiffuseImageBasedLightTextureOffset();
+
+  /**
+   * @brief Retrieves image based light scale factor name.
+   *
+   * @return Image based light scale factor name.
+   */
+  std::string_view GetImageBasedLightScaleFactorName();
+
+  /**
+   * @brief Retrieves image based light max lod uniform name.
+   *
+   * @return Image based light max lod uniform name.
+   */
+  std::string_view GetImageBasedLightMaxLodUniformName();
+
+  /**
+   * @brief Checks if resource is ready.
+   *
+   * @return True if resource is ready, false otherwise.
+   */
+  bool IsResourceReady();
+
+  /**
+   * @brief Resets dirty flag of this material.
+   */
+  void ResetFlag();
+
+private:
+  /**
+   * @brief Checks modify flag and send observers the material changeness.
+   * It will clean up modify flag
+   */
+  void NotifyObserver();
+
+  /**
+   * @brief Requests loading an image from a URL and store it in TextureInformation.
+   *
+   * @param[in] textureInformation TextureInformation object to store loaded texture information.
+   * @param[in] url URL of the image to load.
+   */
+  void RequestTextureLoad(TextureInformation& textureInformation, const std::string& url);
+
+  /**
+   * @brief Called when loading requested by RequestTextureLoad is complete.
+   *
+   * @param[in] loadedTaskId ID of the loaded texture.
+   * @param[in] pixelData PixelData of the loaded texture.
+   */
+  void TextureLoadComplete(uint32_t loadedTaskId, PixelData pixelData);
+
+  /**
+   * @brief Called when all requested textures are loaded.
+   */
+  void ResourcesLoadComplete();
+
+  /**
+   * @brief Updates the material using each attribute of this material and send a notification to the ModelPrimitive class.
+   */
+  void Apply();
+
+private:
+  // Delete copy & move operator
+  Material(const Material&) = delete;
+  Material(Material&&)      = delete;
+  Material& operator=(const Material& rhs) = delete;
+  Material& operator=(Material&& rhs) = delete;
+
+private:
+  ObserverContainer mObservers{}; ///< List of observers who need to be notified after some properties are changed.
+
+  TextureInformationContainer     mTextureInformations;
+  Dali::Toolkit::AsyncImageLoader mAsyncImageLoader;
+
+  std::string                            mName;                                                   ///< Material name
+  Dali::Scene3D::Material::AlphaModeType mAlphaMode   = Scene3D::Material::AlphaModeType::OPAQUE; ///< Alpha mode
+  float                                  mAlphaCutoff = 0.5f;                                     ///< Alpha cutoff value
+  bool                                   mDoubleSided = false;                                    ///< Whether to render both sides
+  float                                  mIor         = -1.0f;                                    ///< Index of refraction (TODO: Magic number)
+  MaterialModifyObserver::ModifyFlag     mModifyFlag  = MaterialModifyObserver::ModifyFlag::NONE; ///< Modified dirty flags
+
+  Scene3D::Loader::ShaderOption        mShaderOption;
+  uint32_t                             mMaterialFlag  = std::numeric_limits<uint32_t>::max();
+  Scene3D::Loader::RendererState::Type mRendererState = Scene3D::Loader::RendererState::NONE;
+
+  int32_t mDepthIndex{Scene3D::DepthIndex::Ranges::SCENE};
+
+  bool mIsOpaque = true;
+  bool mIsMask   = false;
+  bool mObserverNotifying; ///< True if observe is notify now. If then, we should not change the mObservers.
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::Material& GetImplementation(Dali::Scene3D::Material& material)
+{
+  DALI_ASSERT_ALWAYS(material && "Material handle is empty");
+
+  BaseObject& handle = material.GetBaseObject();
+
+  return static_cast<Internal::Material&>(handle);
+}
+
+inline const Internal::Material& GetImplementation(const Dali::Scene3D::Material& material)
+{
+  DALI_ASSERT_ALWAYS(material && "Material handle is empty");
+
+  const BaseObject& handle = material.GetBaseObject();
+
+  return static_cast<const Internal::Material&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_IMPL_H
diff --git a/dali-scene3d/internal/model-components/material-modify-observer.h b/dali-scene3d/internal/model-components/material-modify-observer.h
new file mode 100644
index 0000000..e5e3bbb
--- /dev/null
+++ b/dali-scene3d/internal/model-components/material-modify-observer.h
@@ -0,0 +1,73 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_MODIFY_OBSERVER_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_MODIFY_OBSERVER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/bitwise-enum.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-components/material.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+/**
+ * @brief MaterialModifyObserver is a class to notify that the material has changed.
+ */
+class MaterialModifyObserver
+{
+public:
+  /**
+   * @brief Flag which informations are changed.
+   */
+  enum ModifyFlag
+  {
+    NONE     = 0,
+    TEXTURE  = 1 << 0,
+    SHADER   = 1 << 1,
+    UNIFORM  = 1 << 2,
+    PROPERTY = 1 << 3,
+  };
+
+  /**
+    * @brief Notify to observers that texture is changed.
+    *
+    * @param[in] material The handle material itself. TODO : Are we need this?
+    * @param[in] flag Flag which informations are changed.
+    */
+  virtual void OnMaterialModified(Dali::Scene3D::Material material, ModifyFlag flag) = 0;
+};
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+// specialization has to be done in the same namespace
+template<>
+struct EnableBitMaskOperators<Scene3D::Internal::MaterialModifyObserver::ModifyFlag>
+{
+  static const bool ENABLE = true;
+};
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_MODIFY_OBSERVER_H
diff --git a/dali-scene3d/internal/model-components/model-node-impl.cpp b/dali-scene3d/internal/model-components/model-node-impl.cpp
new file mode 100644
index 0000000..2505c35
--- /dev/null
+++ b/dali-scene3d/internal/model-components/model-node-impl.cpp
@@ -0,0 +1,508 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-components/model-node-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/controls/model/model-impl.h>
+#include <dali-scene3d/internal/light/light-impl.h>
+#include <dali-scene3d/internal/model-components/model-primitive-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::ModelNode::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::ModelNode, Dali::CustomActor, Create);
+DALI_TYPE_REGISTRATION_END()
+} // unnamed namespace
+
+Dali::Scene3D::ModelNode ModelNode::New()
+{
+  // Create the implementation, temporarily owned on stack
+  IntrusivePtr<ModelNode> nodeImpl = new ModelNode();
+
+  // Pass ownership to handle
+  Scene3D::ModelNode handle(*nodeImpl);
+
+  // Second-phase init of the implementation
+  // This can only be done after the CustomActor connection has been made...
+  nodeImpl->Initialize();
+
+  return handle;
+}
+
+ModelNode::ModelNode()
+: Control(static_cast<ControlBehaviour>(ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS | ActorFlags::DISABLE_SIZE_NEGOTIATION))
+{
+}
+
+ModelNode::~ModelNode()
+{
+}
+
+// From Internal::Control.
+
+void ModelNode::OnInitialize()
+{
+  Actor self = Self();
+
+  // TODO : We need to check this is enough.
+  Toolkit::DevelControl::EnableCreateAccessible(Toolkit::Control::DownCast(self), false);
+
+  self.RegisterProperty("uIsShadowCasting", static_cast<int>(mIsShadowCasting));
+  self.RegisterProperty("uIsShadowReceiving", static_cast<int>(mIsShadowReceiving));
+}
+
+// From CustomActorImpl.
+
+void ModelNode::OnSceneConnection(int depth)
+{
+}
+
+void ModelNode::OnSceneDisconnection()
+{
+}
+
+void ModelNode::OnChildAdd(Actor& child)
+{
+}
+
+void ModelNode::OnChildRemove(Actor& child)
+{
+}
+
+void ModelNode::OnPropertySet(Property::Index index, const Property::Value& propertyValue)
+{
+}
+
+void ModelNode::OnSizeSet(const Vector3& targetSize)
+{
+}
+
+void ModelNode::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
+{
+  // @todo size negotiate background to new size, animate as well?
+}
+
+void ModelNode::OnRelayout(const Vector2& size, RelayoutContainer& container)
+{
+}
+
+void ModelNode::OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension)
+{
+}
+
+Vector3 ModelNode::GetNaturalSize()
+{
+  return Vector3::ZERO;
+}
+
+float ModelNode::CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension)
+{
+  return 0.0f;
+}
+
+float ModelNode::GetHeightForWidth(float width)
+{
+  return 0.0f;
+}
+
+float ModelNode::GetWidthForHeight(float height)
+{
+  return 0.0f;
+}
+
+bool ModelNode::RelayoutDependentOnChildren(Dimension::Type dimension)
+{
+  return false;
+}
+
+void ModelNode::OnCalculateRelayoutSize(Dimension::Type dimension)
+{
+}
+
+void ModelNode::OnLayoutNegotiated(float size, Dimension::Type dimension)
+{
+}
+
+ModelNode& GetImplementation(Dali::Scene3D::ModelNode& handle)
+{
+  CustomActorImpl& customInterface = handle.GetImplementation();
+  ModelNode&       impl            = dynamic_cast<Internal::ModelNode&>(customInterface);
+  return impl;
+}
+
+const ModelNode& GetImplementation(const Dali::Scene3D::ModelNode& handle)
+{
+  const CustomActorImpl& customInterface = handle.GetImplementation();
+  // downcast to control
+  const ModelNode& impl = dynamic_cast<const Internal::ModelNode&>(customInterface);
+  return impl;
+}
+
+// Public Method
+
+uint32_t ModelNode::GetModelPrimitiveCount() const
+{
+  return static_cast<uint32_t>(mModelPrimitiveContainer.size());
+}
+
+void ModelNode::AddModelPrimitive(Dali::Scene3D::ModelPrimitive modelPrimitive, Loader::ShaderOption::HashType hash)
+{
+  for(auto&& primitive : mModelPrimitiveContainer)
+  {
+    if(primitive == modelPrimitive)
+    {
+      return;
+    }
+  }
+
+  mModelPrimitiveContainer.push_back(modelPrimitive);
+
+  Actor self = Self();
+  GetImplementation(modelPrimitive).AddPrimitiveObserver(this);
+  if(mShadowMapTexture)
+  {
+    GetImplementation(modelPrimitive).SetShadowMapTexture(mShadowMapTexture);
+  }
+
+  if(mDiffuseTexture && mSpecularTexture)
+  {
+    GetImplementation(modelPrimitive).SetImageBasedLightTexture(mDiffuseTexture, mSpecularTexture, mIblScaleFactor, mSpecularMipmapLevels);
+  }
+
+  GetImplementation(modelPrimitive).UpdateShader(mShaderManager, hash);
+
+  Dali::Renderer renderer = GetImplementation(modelPrimitive).GetRenderer();
+  if(renderer)
+  {
+    uint32_t rendererCount = self.GetRendererCount();
+    bool     exist         = false;
+    for(uint32_t i = 0; i < rendererCount; ++i)
+    {
+      if(renderer == self.GetRendererAt(i))
+      {
+        exist = true;
+        break;
+      }
+    }
+    if(!exist)
+    {
+      self.AddRenderer(renderer);
+    }
+  }
+}
+
+void ModelNode::RemoveModelPrimitive(Dali::Scene3D::ModelPrimitive modelPrimitive)
+{
+  uint32_t primitiveCount = GetModelPrimitiveCount();
+  for(uint32_t i = 0; i < primitiveCount; ++i)
+  {
+    if(mModelPrimitiveContainer[i] != modelPrimitive)
+    {
+      continue;
+    }
+
+    RemoveModelPrimitive(i);
+    break;
+  }
+}
+
+void ModelNode::RemoveModelPrimitive(uint32_t index)
+{
+  if(index >= mModelPrimitiveContainer.size())
+  {
+    return;
+  }
+
+  GetImplementation(mModelPrimitiveContainer[index]).UpdateShader(nullptr, 0u);
+
+  Actor self = Self();
+  GetImplementation(mModelPrimitiveContainer[index]).RemovePrimitiveObserver(this);
+
+  Dali::Renderer renderer = GetImplementation(mModelPrimitiveContainer[index]).GetRenderer();
+  if(renderer)
+  {
+    self.RemoveRenderer(renderer);
+  }
+
+  mModelPrimitiveContainer.erase(mModelPrimitiveContainer.begin() + index);
+}
+
+Dali::Scene3D::ModelPrimitive ModelNode::GetModelPrimitive(uint32_t index) const
+{
+  if(index < mModelPrimitiveContainer.size())
+  {
+    return mModelPrimitiveContainer[index];
+  }
+  return Scene3D::ModelPrimitive();
+}
+
+Scene3D::ModelNode ModelNode::FindChildModelNodeByName(std::string_view nodeName)
+{
+  Actor childActor = Self().FindChildByName(nodeName);
+  return Scene3D::ModelNode::DownCast(childActor);
+}
+
+void ModelNode::RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const
+{
+  blendShapeNames.reserve(blendShapeNames.size() + mBlendShapeIndexMap.size());
+  for(const auto& iter : mBlendShapeIndexMap)
+  {
+    blendShapeNames.push_back(iter.first);
+  }
+}
+
+Loader::BlendShapes::Index ModelNode::GetBlendShapeIndexByName(std::string_view blendShapeName) const
+{
+  auto iter = mBlendShapeIndexMap.find(std::string(blendShapeName));
+  if(iter != mBlendShapeIndexMap.end())
+  {
+    return iter->second;
+  }
+  return Loader::BlendShapes::INVALID_INDEX;
+}
+
+void ModelNode::SetShadowMapTexture(Dali::Texture shadowMapTexture)
+{
+  mShadowMapTexture = shadowMapTexture;
+  for(auto&& primitive : mModelPrimitiveContainer)
+  {
+    GetImplementation(primitive).SetShadowMapTexture(mShadowMapTexture);
+  }
+}
+
+void ModelNode::CastShadow(bool castShadow)
+{
+  if(mIsShadowCasting == castShadow)
+  {
+    return;
+  }
+
+  mIsShadowCasting = castShadow;
+
+  Actor self = Self();
+  self.RegisterProperty("uIsShadowCasting", static_cast<int>(mIsShadowCasting));
+}
+
+bool ModelNode::IsShadowCasting() const
+{
+  return mIsShadowCasting;
+}
+
+void ModelNode::ReceiveShadow(bool receiveShadow)
+{
+  if(mIsShadowReceiving == receiveShadow)
+  {
+    return;
+  }
+
+  mIsShadowReceiving = receiveShadow;
+
+  Actor self = Self();
+  self.RegisterProperty("uIsShadowReceiving", static_cast<int>(mIsShadowReceiving));
+}
+
+bool ModelNode::IsShadowReceiving() const
+{
+  return mIsShadowReceiving;
+}
+
+void ModelNode::SetImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float iblScaleFactor, uint32_t specularMipmapLevels)
+{
+  mDiffuseTexture       = diffuseTexture;
+  mSpecularTexture      = specularTexture;
+  mIblScaleFactor       = iblScaleFactor;
+  mSpecularMipmapLevels = specularMipmapLevels;
+  for(auto&& primitive : mModelPrimitiveContainer)
+  {
+    GetImplementation(primitive).SetImageBasedLightTexture(diffuseTexture, specularTexture, iblScaleFactor, specularMipmapLevels);
+  }
+}
+
+void ModelNode::SetImageBasedLightScaleFactor(float iblScaleFactor)
+{
+  mIblScaleFactor = iblScaleFactor;
+  for(auto&& primitive : mModelPrimitiveContainer)
+  {
+    GetImplementation(primitive).SetImageBasedLightScaleFactor(iblScaleFactor);
+  }
+}
+
+void ModelNode::UpdateShader(Scene3D::Loader::ShaderManagerPtr shaderManager)
+{
+  if(mShaderManager != shaderManager)
+  {
+    mShaderManager = shaderManager;
+    for(auto&& primitive : mModelPrimitiveContainer)
+    {
+      GetImplementation(primitive).UpdateShader(mShaderManager, 0u);
+    }
+  }
+}
+
+void ModelNode::SetBlendShapeData(Scene3D::Loader::BlendShapes::BlendShapeData& data, Scene3D::ModelPrimitive primitive)
+{
+  // Update mBlendShapeIndexMap
+  mBlendShapeIndexMap.clear();
+  const auto blendShapeCount = data.names.size();
+  for(Loader::BlendShapes::Index index = 0u; index < blendShapeCount; ++index)
+  {
+    auto& name = data.names[index];
+    if(!name.empty())
+    {
+      mBlendShapeIndexMap[name] = index;
+    }
+  }
+
+  GetImplementation(primitive).SetBlendShapeData(data);
+}
+
+void ModelNode::SetBoneMatrix(const Matrix& inverseMatrix, Scene3D::ModelPrimitive primitive, Scene3D::Loader::Index& boneIndex)
+{
+  Dali::Scene3D::Loader::Skinning::BoneData boneData;
+  boneData.primitive = primitive;
+  boneData.boneIndex = boneIndex;
+  char propertyNameBuffer[32];
+  snprintf(propertyNameBuffer, sizeof(propertyNameBuffer), "%s[%d]", Dali::Scene3D::Loader::Skinning::BONE_UNIFORM_NAME, boneIndex);
+  boneData.propertyName  = propertyNameBuffer;
+  boneData.inverseMatrix = inverseMatrix;
+  mBoneDataContainer.push_back(std::move(boneData));
+
+  UpdateBoneMatrix(primitive);
+}
+
+void ModelNode::OnRendererCreated(Renderer renderer)
+{
+  Self().AddRenderer(renderer);
+}
+
+void ModelNode::UpdateBoneMatrix(Scene3D::ModelPrimitive primitive)
+{
+  for(auto&& boneData : mBoneDataContainer)
+  {
+    if(boneData.primitive != primitive)
+    {
+      continue;
+    }
+
+    Dali::Renderer renderer = GetImplementation(primitive).GetRenderer();
+    if(!renderer)
+    {
+      continue;
+    }
+
+    if(boneData.constraint)
+    {
+      boneData.constraint.Remove();
+      boneData.constraint.Reset();
+    }
+
+    auto propBoneXform = renderer.GetPropertyIndex(boneData.propertyName);
+    if(propBoneXform == Property::INVALID_INDEX)
+    {
+      propBoneXform = renderer.RegisterProperty(boneData.propertyName, Matrix{false});
+    }
+
+    Matrix inverseMatrix = boneData.inverseMatrix;
+    // Constrain bone matrix to joint transform.
+    boneData.constraint = Constraint::New<Matrix>(renderer, propBoneXform, [inverseMatrix](Matrix& output, const PropertyInputContainer& inputs) { Matrix::Multiply(output, inverseMatrix, inputs[0]->GetMatrix()); });
+
+    Actor joint = Self();
+    boneData.constraint.AddSource(Source{joint, Actor::Property::WORLD_MATRIX});
+    boneData.constraint.ApplyPost();
+    break;
+  }
+}
+
+void ModelNode::SetColliderMesh(ColliderMeshUniquePtr&& colliderMesh)
+{
+  if(!colliderMesh && !mColliderMesh)
+  {
+    return;
+  }
+
+  if(!mParentModel) // find parent model if not set
+  {
+    auto parent = Self().GetParent();
+    while(parent)
+    {
+      auto modelHandle = Scene3D::Model::DownCast(parent);
+      if(modelHandle)
+      {
+        mParentModel = &GetImpl(modelHandle);
+        break;
+      }
+      parent = parent.GetParent();
+    }
+  }
+
+  // Resetting collider mesh if argument is nullptr
+  auto handle = Scene3D::ModelNode::DownCast(Self());
+  if(mParentModel)
+  {
+    if(mColliderMesh)
+    {
+      mParentModel->RemoveColliderMesh(handle);
+    }
+
+    // If collider mesh is to be set then register it with the parent model.
+    // If nullptr, ignore.
+    if(colliderMesh)
+    {
+      mParentModel->RegisterColliderMesh(handle);
+    }
+  }
+
+  mColliderMesh = std::move(colliderMesh);
+}
+
+bool ModelNode::HasColliderMesh() const
+{
+  return mColliderMesh != nullptr;
+}
+
+const Scene3D::Algorithm::ColliderMesh& ModelNode::GetColliderMesh() const
+{
+  return *mColliderMesh;
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/internal/model-components/model-node-impl.h b/dali-scene3d/internal/model-components/model-node-impl.h
new file mode 100644
index 0000000..a357180
--- /dev/null
+++ b/dali-scene3d/internal/model-components/model-node-impl.h
@@ -0,0 +1,391 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_IMPL_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_IMPL_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/public-api/common/dali-common.h>
+#include <memory> // for std::unique_ptr
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-components/model-primitive-modify-observer.h>
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+#include <dali-scene3d/public-api/light/light.h>
+#include <dali-scene3d/public-api/loader/mesh-definition.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-scene3d/public-api/loader/shader-option.h>
+#include <dali-scene3d/public-api/loader/skinning-details.h>
+#include <dali-scene3d/public-api/model-components/model-node.h>
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+#include "dali-scene3d/public-api/controls/model/model.h"
+
+namespace Dali
+{
+namespace Scene3D
+{
+/**
+ * @addtogroup dali_toolkit_controls_model
+ * @{
+ */
+
+namespace Internal
+{
+using ColliderMeshUniquePtr = std::unique_ptr<Dali::Scene3D::Algorithm::ColliderMesh>;
+/**
+ * @brief This is the internal base class for custom node of model.
+ *
+ * @SINCE_2_2.99
+ */
+class DALI_SCENE3D_API ModelNode : public Toolkit::Internal::Control, public ModelPrimitiveModifyObserver
+{
+public:
+  using ModelPrimitiveContainer = std::vector<Scene3D::ModelPrimitive>;
+  using BoneDataContainer       = std::vector<Dali::Scene3D::Loader::Skinning::BoneData>;
+  using BlendShapeIndexMap      = std::map<std::string, Loader::BlendShapes::Index>;
+
+  // Creation & Destruction
+  /**
+   * @brief Creates a new ModelNodeImpl instance that does not require touch by default.
+   *
+   * If touch is required, then the user can connect to this class' touch signal.
+   * @SINCE_2_2.99
+   * @return A handle to the ModelNode instance
+   */
+  static Scene3D::ModelNode New();
+
+protected:
+  /**
+   * @brief Virtual destructor.
+   * @SINCE_2_2.99
+   */
+  virtual ~ModelNode();
+
+public: // From Internal::Control.
+  /**
+   * @copydoc Dali::Toolkit::Internal::Control::OnInitialize()
+   */
+  void OnInitialize() override;
+
+protected: // From CustomActorImpl. Note that it will make we can ignore many codes what Internal::Control using now.
+  /**
+   * @copydoc CustomActorImpl::OnSceneConnection()
+   * @note If overridden, then an up-call to ModelNode::OnSceneConnection MUST be made at the end.
+   */
+  void OnSceneConnection(int depth) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSceneDisconnection()
+   * @note If overridden, then an up-call to ModelNode::OnSceneDisconnection MUST be made at the end.
+   */
+  void OnSceneDisconnection() override;
+
+  /**
+   * @copydoc CustomActorImpl::OnChildAdd()
+   * @note If overridden, then an up-call to ModelNode::OnChildAdd MUST be made at the end.
+   */
+  void OnChildAdd(Actor& child) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnChildRemove()
+   * @note If overridden, then an up-call to ModelNode::OnChildRemove MUST be made at the end.
+   */
+  void OnChildRemove(Actor& child) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnPropertySet()
+   * @note If overridden, then an up-call to ModelNode::OnChildRemove MUST be made at the end.
+   */
+  void OnPropertySet(Property::Index index, const Property::Value& propertyValue) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSizeSet()
+   * @note If overridden, then an up-call to ModelNode::OnSizeSet MUST be made at the end.
+   */
+  void OnSizeSet(const Vector3& targetSize) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSizeAnimation()
+   * @note If overridden, then an up-call to ModelNode::OnSizeAnimation MUST be made at the end.
+   */
+  void OnSizeAnimation(Animation& animation, const Vector3& targetSize) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnRelayout()
+   */
+  void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnSetResizePolicy()
+   */
+  void OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension) override;
+
+  /**
+   * @copydoc CustomActorImpl::GetNaturalSize()
+   */
+  Vector3 GetNaturalSize() override;
+
+  /**
+   * @copydoc CustomActorImpl::CalculateChildSize()
+   */
+  float CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension) override;
+
+  /**
+   * @copydoc CustomActorImpl::GetHeightForWidth()
+   */
+  float GetHeightForWidth(float width) override;
+
+  /**
+   * @copydoc CustomActorImpl::GetWidthForHeight()
+   */
+  float GetWidthForHeight(float height) override;
+
+  /**
+   * @copydoc CustomActorImpl::RelayoutDependentOnChildren()
+   */
+  bool RelayoutDependentOnChildren(Dimension::Type dimension = Dimension::ALL_DIMENSIONS) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnCalculateRelayoutSize()
+   */
+  void OnCalculateRelayoutSize(Dimension::Type dimension) override;
+
+  /**
+   * @copydoc CustomActorImpl::OnLayoutNegotiated()
+   */
+  void OnLayoutNegotiated(float size, Dimension::Type dimension) override;
+
+protected:
+  // Construction
+
+  /**
+   * @brief ModelNode constructor.
+   *
+   * @SINCE_2_2.99
+   */
+  ModelNode();
+
+public: // Public Method
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::GetModelPrimitiveCount()
+   */
+  uint32_t GetModelPrimitiveCount() const;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::AddModelPrimitive()
+   */
+  void AddModelPrimitive(Dali::Scene3D::ModelPrimitive modelPrimitive, Loader::ShaderOption::HashType hash);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::RemoveModelPrimitive(Dali::Scene3D::ModelPrimitive modelPrimitive)
+   */
+  void RemoveModelPrimitive(Dali::Scene3D::ModelPrimitive modelPrimitive);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::RemoveModelPrimitive(uint32_t index)
+   */
+  void RemoveModelPrimitive(uint32_t index);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::GetModelPrimitive()
+   */
+  Dali::Scene3D::ModelPrimitive GetModelPrimitive(uint32_t index) const;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::FindChildModelNodeByName()
+   */
+  Scene3D::ModelNode FindChildModelNodeByName(std::string_view nodeName);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::RetrieveBlendShapeNames()
+   */
+  void RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::GetBlendShapeIndexByName()
+   */
+  Loader::BlendShapes::Index GetBlendShapeIndexByName(std::string_view blendShapeName) const;
+
+  /**
+   * @brief Sets the shadow map textures for a ModelNode.
+   *
+   * @param[in] shadowMapTexture The shadow map texture.
+   */
+  void SetShadowMapTexture(Dali::Texture shadowMapTexture);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::CastShadow()
+   */
+  void CastShadow(bool castShadow);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::IsShadowCasting()
+   */
+  bool IsShadowCasting() const;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::ReceiveShadow()
+   */
+  void ReceiveShadow(bool receiveShadow);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::IsShadowReceiving()
+   */
+  bool IsShadowReceiving() const;
+
+  /**
+   * @brief Sets the diffuse and specular image-based lighting textures for a ModelNode.
+   *
+   * @param[in] diffuseTexture The diffuse texture.
+   * @param[in] specularTexture The specular texture.
+   * @param[in] iblScaleFactor The scale factor for the image-based lighting.
+   * @param[in] specularMipmapLevels The number of mipmap levels for the specular texture.
+   */
+  void SetImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float iblScaleFactor, uint32_t specularMipmapLevels);
+
+  /**
+   * @brief Sets the scale factor for image-based lighting.
+   *
+   * @param[in] iblScaleFactor The scale factor for image-based lighting.
+   */
+  void SetImageBasedLightScaleFactor(float iblScaleFactor);
+
+  /**
+   * @brief Updates shaders by using current material
+   *
+   * @param[in] shaderManager Shader manager to create shader.
+   */
+  void UpdateShader(Scene3D::Loader::ShaderManagerPtr shaderManager);
+
+  /**
+   * @brief Sets the blend shape data for a ModelPrimitive.
+   *
+   * @param[in] data The blend shape data.
+   * @param[in] primitive The ModelPrimitive to set the blend shape data for.
+   */
+  void SetBlendShapeData(Scene3D::Loader::BlendShapes::BlendShapeData& data, Scene3D::ModelPrimitive primitive);
+
+  /**
+   * @brief Sets the bone matrix for a ModelPrimitive and bone index.
+   *
+   * @param[in] inverseMatrix The inverse matrix of the bone.
+   * @param[in] primitive The ModelPrimitive to set the bone matrix for.
+   * @param[in] boneIndex The index of the bone to set the matrix for.
+   */
+  void SetBoneMatrix(const Matrix& inverseMatrix, Scene3D::ModelPrimitive primitive, Scene3D::Loader::Index& boneIndex);
+
+  /**
+   * @brief Called when a Renderer of ModelPrimitive is created.
+   *
+   * @param[in] renderer The Renderer that is created.
+   */
+  void OnRendererCreated(Renderer renderer) override;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::SetColliderMesh()
+   */
+  void SetColliderMesh(ColliderMeshUniquePtr&& colliderMesh);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::HasColliderMesh()
+   */
+  [[nodiscard]] bool HasColliderMesh() const;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelNode::GetColliderMesh()
+   */
+  [[nodiscard]] const Scene3D::Algorithm::ColliderMesh& GetColliderMesh() const;
+
+  /**
+  * @brief Sets a root model for the ModelNode
+  * @param[in] model Valid Model or nullptr to disconnect node from tree
+  */
+  void SetRootModel(Dali::Scene3D::Internal::Model* model)
+  {
+    mParentModel = model;
+  }
+
+private:
+  /**
+   * @brief Updates the bone matrix for a ModelPrimitive.
+   *
+   * @param[in] primitive The ModelPrimitive to set the bone matrix for.
+   */
+  void UpdateBoneMatrix(Scene3D::ModelPrimitive primitive);
+
+  /// @cond internal
+
+  // Not copyable or movable
+  DALI_INTERNAL ModelNode(const ModelNode&) = delete;            ///< Deleted copy constructor.
+  DALI_INTERNAL ModelNode(ModelNode&&)      = delete;            ///< Deleted move constructor.
+  DALI_INTERNAL ModelNode& operator=(const ModelNode&) = delete; ///< Deleted copy assignment operator.
+  DALI_INTERNAL ModelNode& operator=(ModelNode&&) = delete;      ///< Deleted move assignment operator.
+
+private:
+  Scene3D::Loader::ShaderManagerPtr mShaderManager;
+  ModelPrimitiveContainer           mModelPrimitiveContainer; ///< List of model primitives
+  BoneDataContainer                 mBoneDataContainer;
+  BlendShapeIndexMap                mBlendShapeIndexMap; ///< Index of blend shape by name
+  Dali::Texture                     mShadowMapTexture;
+  Dali::Texture                     mSpecularTexture;
+  Dali::Texture                     mDiffuseTexture;
+
+  Internal::Model* mParentModel{nullptr};
+
+  // Collider mesh
+  std::unique_ptr<Dali::Scene3D::Algorithm::ColliderMesh> mColliderMesh;
+
+  float    mIblScaleFactor{1.0f};
+  uint32_t mSpecularMipmapLevels{1u};
+  bool     mIsShadowCasting{true};
+  bool     mIsShadowReceiving{true};
+  /// @endcond
+};
+
+/**
+ * @brief Gets implementation from the handle.
+ *
+ * @SINCE_2_2.99
+ * @param handle
+ * @return Implementation
+ * @pre handle is initialized and points to a node
+ */
+DALI_SCENE3D_API Internal::ModelNode& GetImplementation(Dali::Scene3D::ModelNode& handle);
+
+/**
+ * @brief Gets implementation from the handle.
+ *
+ * @SINCE_2_2.99
+ * @param handle
+ * @return Implementation
+ * @pre Handle is initialized and points to a node.
+ */
+DALI_SCENE3D_API const Internal::ModelNode& GetImplementation(const Dali::Scene3D::ModelNode& handle);
+
+} // namespace Internal
+
+/**
+ * @}
+ */
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_IMPL_H
diff --git a/dali-scene3d/internal/model-components/model-primitive-impl.cpp b/dali-scene3d/internal/model-components/model-primitive-impl.cpp
new file mode 100644
index 0000000..844f0b9
--- /dev/null
+++ b/dali-scene3d/internal/model-components/model-primitive-impl.cpp
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-components/model-primitive-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/internal/light/light-impl.h>
+#include <dali-scene3d/internal/model-components/material-impl.h>
+#include <dali-scene3d/public-api/loader/environment-definition.h>
+
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/property-array.h>
+#include <dali/public-api/object/property-map.h>
+
+#if defined(DEBUG_ENABLED)
+#include <sys/types.h>
+#include <unistd.h>
+#include <filesystem>
+namespace fs = std::filesystem;
+#endif
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_SCENE3D_MODEL_PRIMITIVE");
+
+std::string tmpFilename(std::string prefix, std::string suffix)
+{
+  static int id = 0;
+  id++;
+  std::ostringstream oss;
+  oss << prefix << getpid() << "_" << std::setfill('0') << std::setw(4) << id << suffix;
+  return oss.str();
+}
+
+#define DALI_LOG_WRITE_FILE(filename, stream) \
+  {                                           \
+    fs::path tmp = fs::temp_directory_path(); \
+    tmp /= filename;                          \
+    std::ofstream ostrm(tmp, std::ios::out);  \
+    ostrm << stream;                          \
+    ostrm.flush();                            \
+  }
+
+inline Property::Map GetMap(Shader shader)
+{
+  Property::Value program = shader[Shader::Property::PROGRAM];
+  Property::Map*  map{nullptr};
+  if(program.GetType() == Property::ARRAY)
+  {
+    Property::Array* array = program.GetArray();
+    if(array)
+    {
+      Property::Value& value = array->GetElementAt(0);
+      if(value.GetType() == Property::MAP)
+      {
+        map = value.GetMap();
+      }
+    }
+  }
+  else if(program.GetType() == Property::MAP)
+  {
+    map = program.GetMap();
+  }
+  if(map)
+  {
+    return *map;
+  }
+  return Property::Map();
+}
+
+#endif
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::ModelPrimitive::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::ModelPrimitive, Dali::BaseHandle, Create);
+DALI_TYPE_REGISTRATION_END()
+
+static constexpr uint32_t INDEX_FOR_LIGHT_CONSTRAINT_TAG = 10;
+
+constexpr uint32_t MINIMUM_SHADER_VERSION_SUPPORT_TEXTURE_TEXEL_AND_SIZE = 300;
+
+} // unnamed namespace
+
+ModelPrimitivePtr ModelPrimitive::New()
+{
+  ModelPrimitivePtr primitive = new ModelPrimitive();
+
+  primitive->Initialize();
+
+  return primitive;
+}
+
+ModelPrimitive::ModelPrimitive()
+: mShaderManager(new Scene3D::Loader::ShaderManager())
+{
+}
+
+ModelPrimitive::~ModelPrimitive()
+{
+  if(mMaterial)
+  {
+    GetImplementation(mMaterial).RemoveObserver(this);
+  }
+  mMaterial.Reset();
+}
+
+void ModelPrimitive::Initialize()
+{
+}
+
+void ModelPrimitive::SetRenderer(Dali::Renderer renderer)
+{
+  mRenderer   = renderer;
+  mGeometry   = renderer.GetGeometry();
+  mTextureSet = renderer.GetTextures();
+  mShader     = renderer.GetShader();
+}
+
+Dali::Renderer ModelPrimitive::GetRenderer() const
+{
+  return mRenderer;
+}
+
+void ModelPrimitive::SetGeometry(Dali::Geometry geometry)
+{
+  mGeometry = geometry;
+  CreateRenderer();
+}
+
+Dali::Geometry ModelPrimitive::GetGeometry() const
+{
+  return mGeometry;
+}
+
+void ModelPrimitive::SetMaterial(Dali::Scene3D::Material material, bool updateRenderer)
+{
+  if(!material)
+  {
+    return;
+  }
+
+  if(mMaterial != material)
+  {
+    // Stop observe from previous material.
+    if(mMaterial)
+    {
+      GetImplementation(mMaterial).RemoveObserver(this);
+    }
+
+    mMaterial = material;
+
+    // Start observe from new material.
+
+    if(mMaterial)
+    {
+      GetImplementation(mMaterial).AddObserver(this);
+    }
+
+    if(updateRenderer)
+    {
+      mIsMaterialChanged = true;
+      if(GetImplementation(mMaterial).IsResourceReady())
+      {
+        GetImplementation(mMaterial).UpdateMaterialData();
+        ApplyMaterialToRenderer();
+      }
+    }
+    UpdateShadowMapTexture();
+    UpdateImageBasedLightTexture();
+  }
+}
+
+Dali::Scene3D::Material ModelPrimitive::GetMaterial() const
+{
+  return mMaterial;
+}
+
+void ModelPrimitive::AddPrimitiveObserver(ModelPrimitiveModifyObserver* observer)
+{
+  mObservers.insert(observer);
+}
+
+void ModelPrimitive::RemovePrimitiveObserver(ModelPrimitiveModifyObserver* observer)
+{
+  mObservers.erase(observer);
+}
+
+void ModelPrimitive::SetShadowMapTexture(Dali::Texture shadowMapTexture)
+{
+  mShadowMapTexture = shadowMapTexture;
+  UpdateShadowMapTexture();
+}
+
+void ModelPrimitive::SetImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float iblScaleFactor, uint32_t specularMipmapLevels)
+{
+  mDiffuseTexture       = diffuseTexture;
+  mSpecularTexture      = specularTexture;
+  mIblScaleFactor       = iblScaleFactor;
+  mSpecularMipmapLevels = specularMipmapLevels;
+
+  UpdateImageBasedLightTexture();
+}
+
+void ModelPrimitive::SetImageBasedLightScaleFactor(float iblScaleFactor)
+{
+  mIblScaleFactor = iblScaleFactor;
+  if(mRenderer && mMaterial)
+  {
+    mRenderer.RegisterProperty(GetImplementation(mMaterial).GetImageBasedLightScaleFactorName().data(), iblScaleFactor);
+  }
+}
+
+void ModelPrimitive::UpdateShader(Scene3D::Loader::ShaderManagerPtr shaderManager, Loader::ShaderOption::HashType hash)
+{
+  if(mShaderManager != shaderManager)
+  {
+    mShaderManager = (shaderManager) ? shaderManager : new Scene3D::Loader::ShaderManager();
+    if(mMaterial && GetImplementation(mMaterial).IsResourceReady())
+    {
+      ApplyMaterialToRenderer(MaterialModifyObserver::ModifyFlag::SHADER, hash);
+    }
+  }
+}
+
+void ModelPrimitive::SetBlendShapeData(Scene3D::Loader::BlendShapes::BlendShapeData& data)
+{
+  mBlendShapeData = std::move(data);
+  Scene3D::Loader::BlendShapes::ConfigureProperties(mBlendShapeData, mRenderer);
+}
+
+void ModelPrimitive::SetBlendShapeGeometry(Dali::Texture blendShapeGeometry)
+{
+  mBlendShapeGeometry = blendShapeGeometry;
+  if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_TEXTURE_TEXEL_AND_SIZE))
+  {
+    if(mRenderer && mBlendShapeGeometry)
+    {
+      mRenderer.RegisterProperty("uBlendShapeGeometryWidth", static_cast<int>(mBlendShapeGeometry.GetWidth()));
+      mRenderer.RegisterProperty("uBlendShapeGeometryHeight", static_cast<int>(mBlendShapeGeometry.GetHeight()));
+    }
+  }
+}
+
+void ModelPrimitive::SetBlendShapeOptions(bool hasPositions, bool hasNormals, bool hasTangents, Scene3D::Loader::BlendShapes::Version version)
+{
+  mHasPositions      = hasPositions;
+  mHasNormals        = hasNormals;
+  mHasTangents       = hasTangents;
+  mBlendShapeVersion = version;
+}
+
+void ModelPrimitive::SetSkinned(bool isSkinned, uint32_t numberOfJointSets)
+{
+  mHasSkinning       = isSkinned;
+  mNumberOfJointSets = numberOfJointSets;
+}
+
+void ModelPrimitive::SetVertexColor(bool hasVertexColor)
+{
+  mHasVertexColor = hasVertexColor;
+}
+
+// From MaterialModifyObserver
+
+void ModelPrimitive::OnMaterialModified(Dali::Scene3D::Material material, MaterialModifyObserver::ModifyFlag flag)
+{
+  ApplyMaterialToRenderer(flag);
+}
+
+void ModelPrimitive::ApplyMaterialToRenderer(MaterialModifyObserver::ModifyFlag flag, Loader::ShaderOption::HashType oldHash)
+{
+  if(!mMaterial)
+  {
+    return;
+  }
+
+  uint32_t shaderFlag = (flag & static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::SHADER));
+  if(mIsMaterialChanged || shaderFlag == static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::SHADER))
+  {
+    Scene3D::Loader::ShaderOption shaderOption = GetImplementation(mMaterial).GetShaderOption();
+
+    shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::VEC4_TANGENT);
+    if(mHasSkinning)
+    {
+      shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::SKINNING);
+      shaderOption.AddJointMacros(mNumberOfJointSets);
+    }
+    else
+    {
+      shaderOption.AddJointMacros(0);
+    }
+    if(mHasVertexColor)
+    {
+      shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::COLOR_ATTRIBUTE);
+    }
+    if(mHasPositions || mHasNormals || mHasTangents)
+    {
+      if(mHasPositions)
+      {
+        shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::MORPH_POSITION);
+      }
+      if(mHasNormals)
+      {
+        shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::MORPH_NORMAL);
+      }
+      if(mHasTangents)
+      {
+        shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::MORPH_TANGENT);
+      }
+      if(mBlendShapeVersion == Scene3D::Loader::BlendShapes::Version::VERSION_2_0)
+      {
+        shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::MORPH_VERSION_2_0);
+      }
+    }
+    if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_TEXTURE_TEXEL_AND_SIZE))
+    {
+      shaderOption.AddOption(Scene3D::Loader::ShaderOption::Type::SL_VERSION_LOW);
+    }
+
+    Shader newShader = mShaderManager->ProduceShader(shaderOption);
+    if(mShader != newShader)
+    {
+      DALI_LOG_INFO(gLogFilter, Debug::General, "Warning!  Model primitive shader changed: OldHash:%x NewHash:%x\n", oldHash, shaderOption.GetOptionHash());
+
+#if defined(DEBUG_ENABLED)
+      if(mShader)
+      {
+        Property::Map oldMap = GetMap(mShader);
+        DALI_LOG_WRITE_FILE(tmpFilename("oldShader", ".txt"), "Vertex Shader:\n"
+                                                                << oldMap["vertex"] << "\n\nFragmentShader: " << oldMap["fragment"] << "\n");
+      }
+      if(newShader)
+      {
+        Property::Map newMap = GetMap(newShader);
+        DALI_LOG_WRITE_FILE(tmpFilename("newShader", ".txt"), "Vertex Shader:\n"
+                                                                << newMap["vertex"] << "\n\nFragmentShader: " << newMap["fragment"] << "\n");
+      }
+#endif
+    }
+    mShader = newShader;
+
+    if(!mRenderer)
+    {
+      CreateRenderer();
+    }
+    else
+    {
+      mRenderer.SetShader(mShader);
+    }
+  }
+
+  uint32_t textureFlag = (flag & static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::TEXTURE));
+  if(mIsMaterialChanged || textureFlag == static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::TEXTURE))
+  {
+    mTextureSet = GetImplementation(mMaterial).GetTextureSet();
+
+    if(mBlendShapeGeometry)
+    {
+      TextureSet newTextureSet = TextureSet::New();
+      newTextureSet.SetTexture(0u, mBlendShapeGeometry);
+
+      Sampler blendShapeSampler = Sampler::New();
+      blendShapeSampler.SetFilterMode(Dali::FilterMode::NEAREST, Dali::FilterMode::NEAREST);
+      newTextureSet.SetSampler(0u, blendShapeSampler);
+
+      const unsigned int numberOfTextures = mTextureSet.GetTextureCount();
+      for(unsigned int index = 0u; index < numberOfTextures; ++index)
+      {
+        const unsigned int newIndex = index + 1u;
+        newTextureSet.SetTexture(newIndex, mTextureSet.GetTexture(index));
+        newTextureSet.SetSampler(newIndex, mTextureSet.GetSampler(index));
+      }
+
+      mTextureSet = newTextureSet;
+    }
+
+    uint32_t textureCount = mTextureSet.GetTextureCount();
+
+    if(!mShadowMapTexture)
+    {
+      mShadowMapTexture = Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyTextureWhiteRGB();
+    }
+    mTextureSet.SetTexture(textureCount++, mShadowMapTexture);
+
+    Texture brdfTexture = Scene3D::Loader::EnvironmentDefinition::GetBrdfTexture();
+    if(!mSpecularTexture || !mDiffuseTexture)
+    {
+      Texture iblTexture = Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyCubeTextureWhiteRGB();
+      mDiffuseTexture    = iblTexture;
+      mSpecularTexture   = iblTexture;
+    }
+
+    mTextureSet.SetTexture(textureCount++, brdfTexture);
+    mTextureSet.SetTexture(textureCount++, mDiffuseTexture);
+    mTextureSet.SetTexture(textureCount, mSpecularTexture);
+
+    auto specularSampler = Sampler::New();
+    specularSampler.SetWrapMode(WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE);
+    specularSampler.SetFilterMode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR);
+    mTextureSet.SetSampler(textureCount, specularSampler);
+
+    if(!mRenderer)
+    {
+      CreateRenderer();
+    }
+    else
+    {
+      mRenderer.SetTextures(mTextureSet);
+    }
+  }
+
+  uint32_t uniformFlag = (flag & static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::UNIFORM));
+  if(mIsMaterialChanged || uniformFlag == static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::UNIFORM))
+  {
+    if(mRenderer)
+    {
+      UpdateRendererUniform();
+    }
+  }
+
+  uint32_t propertyFlag = (flag & static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::PROPERTY));
+  if(mIsMaterialChanged || propertyFlag == static_cast<uint32_t>(MaterialModifyObserver::ModifyFlag::PROPERTY))
+  {
+    if(mRenderer)
+    {
+      UpdateRendererProperty();
+    }
+  }
+  mIsMaterialChanged = false;
+}
+
+void ModelPrimitive::CreateRenderer()
+{
+  if(!mShader || !mGeometry || !mTextureSet || mRenderer)
+  {
+    return;
+  }
+
+  mRenderer = Renderer::New(mGeometry, mShader);
+  mRenderer.SetTextures(mTextureSet);
+  UpdateRendererUniform();
+  UpdateRendererProperty();
+
+  for(auto* observer : mObservers)
+  {
+    observer->OnRendererCreated(mRenderer);
+  }
+}
+
+void ModelPrimitive::UpdateShadowMapTexture()
+{
+  if(mRenderer && mMaterial)
+  {
+    Dali::TextureSet textures = mRenderer.GetTextures();
+    if(!textures)
+    {
+      return;
+    }
+
+    uint32_t textureCount = textures.GetTextureCount();
+    if(mShadowMapTexture &&
+       textureCount >= GetImplementation(mMaterial).GetShadowMapTextureOffset() &&
+       textures.GetTexture(textureCount - GetImplementation(mMaterial).GetShadowMapTextureOffset()) != mShadowMapTexture)
+    {
+      Dali::TextureSet newTextures = Dali::TextureSet::New();
+
+      for(uint32_t index = 0u; index < textureCount; ++index)
+      {
+        Dali::Texture texture = textures.GetTexture(index);
+        if(index == textureCount - GetImplementation(mMaterial).GetShadowMapTextureOffset())
+        {
+          texture = (!!mShadowMapTexture) ? mShadowMapTexture : Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyTextureWhiteRGB();
+          if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_TEXTURE_TEXEL_AND_SIZE))
+          {
+            mRenderer.RegisterProperty("uShadowMapWidth", static_cast<int>(texture.GetWidth()));
+            mRenderer.RegisterProperty("uShadowMapHeight", static_cast<int>(texture.GetHeight()));
+          }
+        }
+
+        newTextures.SetTexture(index, texture);
+        newTextures.SetSampler(index, textures.GetSampler(index));
+      }
+
+      mRenderer.SetTextures(newTextures);
+    }
+  }
+}
+
+void ModelPrimitive::UpdateImageBasedLightTexture()
+{
+  if(mRenderer && mMaterial)
+  {
+    Dali::TextureSet textures = mRenderer.GetTextures();
+    if(!textures)
+    {
+      return;
+    }
+
+    uint32_t textureCount = textures.GetTextureCount();
+    if(textureCount > 2u &&
+       (textures.GetTexture(textureCount - GetImplementation(mMaterial).GetDiffuseImageBasedLightTextureOffset()) != mDiffuseTexture ||
+        textures.GetTexture(textureCount - GetImplementation(mMaterial).GetSpecularImageBasedLightTextureOffset()) != mSpecularTexture))
+    {
+      Dali::TextureSet newTextures = Dali::TextureSet::New();
+
+      for(uint32_t index = 0u; index < textureCount; ++index)
+      {
+        Dali::Texture texture = textures.GetTexture(index);
+        if(index == textureCount - GetImplementation(mMaterial).GetDiffuseImageBasedLightTextureOffset())
+        {
+          texture = mDiffuseTexture;
+        }
+        else if(index == textureCount - GetImplementation(mMaterial).GetSpecularImageBasedLightTextureOffset())
+        {
+          texture = mSpecularTexture;
+        }
+
+        newTextures.SetTexture(index, texture);
+        newTextures.SetSampler(index, textures.GetSampler(index));
+      }
+
+      mRenderer.SetTextures(newTextures);
+    }
+    mRenderer.RegisterProperty(GetImplementation(mMaterial).GetImageBasedLightScaleFactorName().data(), mIblScaleFactor);
+    mRenderer.RegisterProperty(GetImplementation(mMaterial).GetImageBasedLightMaxLodUniformName().data(), static_cast<float>(mSpecularMipmapLevels));
+  }
+}
+
+void ModelPrimitive::UpdateRendererUniform()
+{
+  if(mMaterial)
+  {
+    GetImplementation(mMaterial).SetRendererUniform(mRenderer);
+    mRenderer.RegisterProperty(GetImplementation(mMaterial).GetImageBasedLightScaleFactorName().data(), mIblScaleFactor);
+    mRenderer.RegisterProperty(GetImplementation(mMaterial).GetImageBasedLightMaxLodUniformName().data(), static_cast<float>(mSpecularMipmapLevels));
+
+    if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_TEXTURE_TEXEL_AND_SIZE))
+    {
+      if(mShadowMapTexture)
+      {
+        mRenderer.RegisterProperty("uShadowMapWidth", static_cast<int>(mShadowMapTexture.GetWidth()));
+        mRenderer.RegisterProperty("uShadowMapHeight", static_cast<int>(mShadowMapTexture.GetHeight()));
+      }
+      if(mBlendShapeGeometry)
+      {
+        mRenderer.RegisterProperty("uBlendShapeGeometryWidth", static_cast<int>(mBlendShapeGeometry.GetWidth()));
+        mRenderer.RegisterProperty("uBlendShapeGeometryHeight", static_cast<int>(mBlendShapeGeometry.GetHeight()));
+      }
+    }
+  }
+}
+
+void ModelPrimitive::UpdateRendererProperty()
+{
+  if(mMaterial)
+  {
+    GetImplementation(mMaterial).SetRendererProperty(mRenderer);
+  }
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/internal/model-components/model-primitive-impl.h b/dali-scene3d/internal/model-components/model-primitive-impl.h
new file mode 100644
index 0000000..6725e1a
--- /dev/null
+++ b/dali-scene3d/internal/model-components/model-primitive-impl.h
@@ -0,0 +1,302 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_IMPL_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/object/property-value.h>
+#include <dali/public-api/object/property.h>
+#include <set>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-components/material-modify-observer.h>
+#include <dali-scene3d/internal/model-components/model-primitive-modify-observer.h>
+#include <dali-scene3d/public-api/light/light.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+#include <dali-scene3d/public-api/loader/mesh-definition.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-scene3d/public-api/model-components/material.h>
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using ModelPrimitivePtr = IntrusivePtr<ModelPrimitive>;
+
+/**
+ * @brief TODO : Explain me.
+ * Use Vector4 Tangent data
+ * Same ModelPrimitive all shares IBL
+ */
+class ModelPrimitive : public BaseObject, public MaterialModifyObserver
+{
+private:
+  using ModelPrimitiveModifyObserverContainer = std::set<ModelPrimitiveModifyObserver*>;
+
+public:
+  // Creation & Destruction
+  /**
+   * @brief Create a new ModelPrimitive object.
+   * @return A smart-pointer to the newly allocated ModelPrimitive.
+   */
+  static ModelPrimitivePtr New();
+
+protected:
+  /**
+   * @brief Construct a new ModelPrimitive.
+   */
+  ModelPrimitive();
+
+  /**
+   * @brief Second-phase constructor.
+   */
+  void Initialize();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~ModelPrimitive();
+
+public:
+  /**
+   * @brief Set Renderer that is created by Scene3D::Loader internally.
+   */
+  void SetRenderer(Dali::Renderer renderer);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelPrimitive::GetRenderer()
+   */
+  Dali::Renderer GetRenderer() const;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelPrimitive::SetGeometry()
+   */
+  void SetGeometry(Dali::Geometry geometry);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelPrimitive::GetGeometry()
+   */
+  Dali::Geometry GetGeometry() const;
+
+  /**
+   * @copydoc Dali::Scene3D::ModelPrimitive::SetMaterial()
+   */
+  void SetMaterial(Dali::Scene3D::Material material, bool updateRenderer = true);
+
+  /**
+   * @copydoc Dali::Scene3D::ModelPrimitive::GetMaterial()
+   */
+  Dali::Scene3D::Material GetMaterial() const;
+
+  /**
+   * @brief Adds a primitive observer to this model primitive.
+   *
+   * @param[in] observer The observer to add.
+   */
+  void AddPrimitiveObserver(ModelPrimitiveModifyObserver* observer);
+
+  /**
+   * @brief Removes a primitive observer from this model primitive.
+   *
+   * @param[in] observer The observer to remove.
+   */
+  void RemovePrimitiveObserver(ModelPrimitiveModifyObserver* observer);
+
+  /**
+   * @brief Sets shadow map texture for this model primitive.
+   *
+   * @param[in] shadowMapTexture The shadow map texture.
+   */
+  void SetShadowMapTexture(Dali::Texture shadowMapTexture);
+
+  /**
+   * @brief Sets the image-based lighting texture for this model primitive.
+   *
+   * @param[in] diffuseTexture The diffuse texture.
+   * @param[in] specularTexture The specular texture.
+   * @param[in] iblScaleFactor The scale factor to set for image-based lighting.
+   * @param[in] specularMipmapLevels The number of mipmap levels of specular texture.
+   */
+  void SetImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float iblScaleFactor, uint32_t specularMipmapLevels);
+
+  /**
+   * @brief Sets the scale factor for image-based lighting for this model primitive.
+   *
+   * @param[in] iblScaleFactor The scale factor to set for image-based lighting.
+   */
+  void SetImageBasedLightScaleFactor(float iblScaleFactor);
+
+  /**
+   * @brief Updates shaders by using current material
+   *
+   * @param[in] shaderManager Shader manager to create shader.
+   * @param[in] hash of old shader option
+   */
+  void UpdateShader(Scene3D::Loader::ShaderManagerPtr shaderManager, Loader::ShaderOption::HashType hash);
+
+  /**
+   * @brief Sets the blend shape data for this model primitive.
+   *
+   * @param[in] data The blend shape data to set.
+   */
+  void SetBlendShapeData(Scene3D::Loader::BlendShapes::BlendShapeData& data);
+
+  /**
+   * @brief Sets the blend shape geometry for this model primitive.
+   *
+   * @param[in] blendShapeGeometry The blend shape geometry to set.
+   */
+  void SetBlendShapeGeometry(Dali::Texture blendShapeGeometry);
+
+  /**
+   * @brief Sets the blend shape options for this model primitive.
+   *
+   * @param[in] hasPositions Whether or not this model primitive has positions for blend shapes.
+   * @param[in] hasNormals Whether or not this model primitive has normals for blend shapes.
+   * @param[in] hasTangents Whether or not this model primitive has tangents for blend shapes.
+   * @param[in] version blendShape version.
+   */
+  void SetBlendShapeOptions(bool hasPositions, bool hasNormals, bool hasTangents, Scene3D::Loader::BlendShapes::Version version);
+
+  /**
+   * @brief Sets whether or not this model primitive is skinned.
+   *
+   * @param[in] isSkinned Whether or not this model primitive is skinned.
+   * @param[in] numberOfJointSets How many joint sets the mesh expects in the shader
+   */
+  void SetSkinned(bool isSkinned, uint32_t numberOfJointSets);
+
+  /**
+   * @brief Set whether this model primitve has vertex color attributes
+   *
+   * @param[in] hasVertexColor Whether or not this model primitive has vertex color attributes
+   */
+  void SetVertexColor(bool hasVertexColor);
+
+private: // From MaterialModifyObserver
+  /**
+   * @copydoc Dali::Scene3D::Internal::Material::MaterialModifyObserver::OnMaterialModified()
+   */
+  void OnMaterialModified(Dali::Scene3D::Material material, MaterialModifyObserver::ModifyFlag flag) override;
+
+private:
+  /**
+   * @brief Apply materials data into renderer.
+   */
+  void ApplyMaterialToRenderer(MaterialModifyObserver::ModifyFlag flag    = MaterialModifyObserver::ModifyFlag::NONE,
+                               Loader::ShaderOption::HashType     oldHash = 0u);
+
+  /**
+   * @brief Updates the uniform of renderer.
+   */
+  void UpdateRendererUniform();
+
+  /**
+   * @brief Updates the property of renderer.
+   */
+  void UpdateRendererProperty();
+
+  /**
+   * @brief Creates a renderer.
+   */
+  void CreateRenderer();
+
+  void UpdateShadowMapTexture();
+
+  /**
+   * @brief Updates the image-based lighting texture.
+   */
+  void UpdateImageBasedLightTexture();
+
+private:
+  // Delete copy & move operator
+  ModelPrimitive(const ModelPrimitive&) = delete;
+  ModelPrimitive(ModelPrimitive&&)      = delete;
+  ModelPrimitive& operator=(const ModelPrimitive& rhs) = delete;
+  ModelPrimitive& operator=(ModelPrimitive&& rhs) noexcept = delete;
+
+private:
+  ModelPrimitiveModifyObserverContainer mObservers{};
+
+  // For Renderer
+  Dali::Renderer          mRenderer;
+  Dali::Geometry          mGeometry;
+  Dali::Shader            mShader;
+  Dali::TextureSet        mTextureSet;
+  Dali::Scene3D::Material mMaterial;
+
+  Scene3D::Loader::ShaderManagerPtr mShaderManager;
+
+  // For Shadow
+  Dali::Texture mShadowMapTexture;
+
+  // For IBL
+  Dali::Texture mSpecularTexture;
+  Dali::Texture mDiffuseTexture;
+  float         mIblScaleFactor{1.0f};
+  uint32_t      mSpecularMipmapLevels{1u};
+
+  // For skinning
+  uint32_t mNumberOfJointSets{0};
+
+  // For blend shape
+  Scene3D::Loader::BlendShapes::BlendShapeData mBlendShapeData;
+  Dali::Texture                                mBlendShapeGeometry;
+  bool                                         mHasSkinning       = false;
+  bool                                         mHasVertexColor    = false;
+  bool                                         mHasPositions      = false;
+  bool                                         mHasNormals        = false;
+  bool                                         mHasTangents       = false;
+  Scene3D::Loader::BlendShapes::Version        mBlendShapeVersion = Scene3D::Loader::BlendShapes::Version::INVALID;
+
+  bool mIsMaterialChanged        = false;
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::ModelPrimitive& GetImplementation(Dali::Scene3D::ModelPrimitive& modelPrimitive)
+{
+  DALI_ASSERT_ALWAYS(modelPrimitive && "ModelPrimitive handle is empty");
+
+  BaseObject& handle = modelPrimitive.GetBaseObject();
+
+  return static_cast<Internal::ModelPrimitive&>(handle);
+}
+
+inline const Internal::ModelPrimitive& GetImplementation(const Dali::Scene3D::ModelPrimitive& modelPrimitive)
+{
+  DALI_ASSERT_ALWAYS(modelPrimitive && "ModelPrimitive handle is empty");
+
+  const BaseObject& handle = modelPrimitive.GetBaseObject();
+
+  return static_cast<const Internal::ModelPrimitive&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_IMPL_H
diff --git a/dali-scene3d/internal/model-components/model-primitive-modify-observer.h b/dali-scene3d/internal/model-components/model-primitive-modify-observer.h
new file mode 100644
index 0000000..a576792
--- /dev/null
+++ b/dali-scene3d/internal/model-components/model-primitive-modify-observer.h
@@ -0,0 +1,50 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_MODIFY_OBSERVER_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_MODIFY_OBSERVER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+/**
+ * @brief Observer class that notifies ModelNode when a Renderer of ModelPrimitive is created.
+ */
+class ModelPrimitiveModifyObserver
+{
+public:
+  /**
+   * @brief Called when a Renderer of ModelPrimitive is created.
+   *
+   * @param[in] renderer The Renderer that is created.
+   */
+  virtual void OnRendererCreated(Renderer renderer) = 0;
+};
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_MODIFY_OBSERVER_H
diff --git a/dali-scene3d/internal/model-motion/motion-data-impl.cpp b/dali-scene3d/internal/model-motion/motion-data-impl.cpp
new file mode 100644
index 0000000..f2f4b84
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-data-impl.cpp
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-motion/motion-data-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::MotionData::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::MotionData, Dali::BaseHandle, Create);
+DALI_TYPE_REGISTRATION_END()
+
+} // unnamed namespace
+
+MotionDataPtr MotionData::New()
+{
+  MotionDataPtr motionData = new MotionData();
+
+  motionData->Initialize();
+
+  return motionData;
+}
+
+MotionData::MotionData()
+{
+}
+
+MotionData::~MotionData()
+{
+  if(Dali::Adaptor::IsAvailable())
+  {
+    CancelMotionDataLoad();
+  }
+}
+
+void MotionData::Initialize()
+{
+}
+
+uint32_t MotionData::GetMotionCount() const
+{
+  return static_cast<uint32_t>(mMotions.size());
+}
+
+Scene3D::MotionIndex MotionData::GetIndex(uint32_t index) const
+{
+  if(index < mMotions.size())
+  {
+    return mMotions[index].first;
+  }
+  return Scene3D::MotionIndex();
+}
+
+Scene3D::MotionValue MotionData::GetValue(uint32_t index) const
+{
+  if(index < mMotions.size())
+  {
+    return mMotions[index].second;
+  }
+  return Scene3D::MotionValue();
+}
+
+void MotionData::Add(Scene3D::MotionIndex index, Scene3D::MotionValue value)
+{
+  mMotions.emplace_back(index, value);
+}
+
+void MotionData::Clear()
+{
+  mMotions.clear();
+}
+
+void MotionData::SetDuration(float durationSeconds)
+{
+  mDurationSeconds = durationSeconds;
+}
+
+float MotionData::GetDuration() const
+{
+  return mDurationSeconds;
+}
+
+void MotionData::LoadBvh(const std::string& path, bool useRootTranslationOnly, const Vector3& scale, bool synchronousLoad)
+{
+  CancelMotionDataLoad();
+  mMotionDataLoadTask = new MotionDataLoadTask(path, useRootTranslationOnly, scale, MakeCallback(this, &MotionData::OnLoadCompleted));
+  RequestMotionDataLoad(synchronousLoad);
+}
+
+void MotionData::LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool useRootTranslationOnly, const Vector3& scale, bool synchronousLoad)
+{
+  CancelMotionDataLoad();
+  mMotionDataLoadTask = new MotionDataLoadTask(rawBuffer, rawBufferLength, useRootTranslationOnly, scale, MakeCallback(this, &MotionData::OnLoadCompleted));
+  RequestMotionDataLoad(synchronousLoad);
+}
+
+void MotionData::LoadFacialAnimation(const std::string& url, bool synchronousLoad)
+{
+  CancelMotionDataLoad();
+  mMotionDataLoadTask = new MotionDataLoadTask(url, MakeCallback(this, &MotionData::OnLoadCompleted));
+  RequestMotionDataLoad(synchronousLoad);
+}
+
+void MotionData::LoadFacialAnimationFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool synchronousLoad)
+{
+  CancelMotionDataLoad();
+  mMotionDataLoadTask = new MotionDataLoadTask(rawBuffer, rawBufferLength, MakeCallback(this, &MotionData::OnLoadCompleted));
+  RequestMotionDataLoad(synchronousLoad);
+}
+
+// Private method
+void MotionData::RequestMotionDataLoad(bool synchronousLoad)
+{
+  if(mMotionDataLoadTask)
+  {
+    if(synchronousLoad)
+    {
+      mMotionDataLoadTask->Process();
+      OnLoadCompleted(mMotionDataLoadTask);
+    }
+    else
+    {
+      Dali::AsyncTaskManager::Get().AddTask(mMotionDataLoadTask);
+    }
+  }
+}
+
+void MotionData::CancelMotionDataLoad()
+{
+  if(mMotionDataLoadTask)
+  {
+    Dali::AsyncTaskManager::Get().RemoveTask(mMotionDataLoadTask);
+    mMotionDataLoadTask.Reset();
+  }
+}
+
+// Called from MotionDataLoadTask
+void MotionData::OnLoadCompleted(MotionDataLoadTaskPtr task)
+{
+  if(mMotionDataLoadTask == task)
+  {
+    const Scene3D::Loader::AnimationDefinition& animationDefinition = mMotionDataLoadTask->GetAnimationDefinition();
+
+    mDurationSeconds = animationDefinition.GetDuration();
+
+    auto animatedPropertyCount = animationDefinition.GetPropertyCount();
+
+    mMotions.clear();
+    mMotions.reserve(animatedPropertyCount);
+
+    for(uint32_t i = 0u; i < animatedPropertyCount; ++i)
+    {
+      const auto& animatedProperty = animationDefinition.GetPropertyAt(i);
+
+      // TODO : Currently, we only support KeyFrames without alpha function and time period now.
+      if(animatedProperty.mKeyFrames)
+      {
+        Add(Scene3D::MotionPropertyIndex::New(animatedProperty.mNodeName, animatedProperty.mPropertyName), Scene3D::MotionValue::New(animatedProperty.mKeyFrames));
+      }
+    }
+
+    // Reset task before emit load competed signal.
+    mMotionDataLoadTask.Reset();
+    {
+      Scene3D::MotionData handle(this); ///< Keep handle for lifecycle.
+      LoadCompletedSignal().Emit(handle);
+    }
+  }
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-data-impl.h b/dali-scene3d/internal/model-motion/motion-data-impl.h
new file mode 100644
index 0000000..02b0e7e
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-data-impl.h
@@ -0,0 +1,192 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_IMPL_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/base-object.h>
+
+#include <dali/public-api/common/vector-wrapper.h>
+#include <utility> ///< for std::pair
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-data-load-task.h>
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/model-motion/motion-data.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using MotionDataPtr = IntrusivePtr<MotionData>;
+
+/**
+ * @brief Internal data for Scene3D::MotionData.
+ */
+class MotionData : public BaseObject
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create a new MotionData object.
+   * @return A smart-pointer to the newly allocated MotionData.
+   */
+  static MotionDataPtr New();
+
+protected:
+  /**
+   * @brief Construct a new MotionData.
+   */
+  MotionData();
+
+  /**
+   * @brief Second-phase constructor.
+   */
+  void Initialize();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~MotionData();
+
+public: // Public Method
+  /**
+   * @copydoc Dali::Scene3D::MotionData::GetMotionCount()
+   */
+  uint32_t GetMotionCount() const;
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::GetIndex()
+   */
+  Scene3D::MotionIndex GetIndex(uint32_t index) const;
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::GetValue()
+   */
+  Scene3D::MotionValue GetValue(uint32_t index) const;
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::Add()
+   */
+  void Add(Scene3D::MotionIndex index, Scene3D::MotionValue value);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::Clear()
+   */
+  void Clear();
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::SetDuration()
+   */
+  void SetDuration(float durationSeconds);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::GetDuration()
+   */
+  float GetDuration() const;
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::LoadBvh()
+   */
+  void LoadBvh(const std::string& path, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE, bool synchronousLoad = false);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::LoadBvhFromBuffer()
+   */
+  void LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE, bool synchronousLoad = false);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::LoadFacialAnimation()
+   */
+  void LoadFacialAnimation(const std::string& url, bool synchronousLoad = false);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionData::LoadFacialAnimationFromBuffer()
+   */
+  void LoadFacialAnimationFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool synchronousLoad = false);
+
+public:
+  /**
+   * @copydoc Dali::Scene3D::MotionData::LoadCompletedSignal()
+   */
+  Scene3D::MotionData::LoadCompletedSignalType& LoadCompletedSignal()
+  {
+    return mLoadCompletedSignal;
+  }
+
+private:
+  /**
+   * @brief Request motion data load task process.
+   *
+   * @param[in] synchronousLoad True if we want to load result synchronously.
+   */
+  void RequestMotionDataLoad(bool synchronousLoad);
+
+  /**
+   * @brief Cancel requested motion data load task process.
+   */
+  void CancelMotionDataLoad();
+
+private:
+  /**
+   * @brief Called when async load task completed.
+   *
+   * @param[in] task Completed tasks
+   */
+  void OnLoadCompleted(MotionDataLoadTaskPtr task);
+
+private:
+  // Asynchronous loading variable
+  MotionDataLoadTaskPtr                        mMotionDataLoadTask{nullptr};
+  Scene3D::MotionData::LoadCompletedSignalType mLoadCompletedSignal;
+
+  std::vector<std::pair<Scene3D::MotionIndex, Scene3D::MotionValue>> mMotions{};
+
+  float mDurationSeconds{0.0f}; ///< Duration of animation if we generate this motion data as Dali::Animation.
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::MotionData& GetImplementation(Dali::Scene3D::MotionData& motionData)
+{
+  DALI_ASSERT_ALWAYS(motionData && "MotionData handle is empty");
+
+  BaseObject& handle = motionData.GetBaseObject();
+
+  return static_cast<Internal::MotionData&>(handle);
+}
+
+inline const Internal::MotionData& GetImplementation(const Dali::Scene3D::MotionData& motionData)
+{
+  DALI_ASSERT_ALWAYS(motionData && "MotionData handle is empty");
+
+  const BaseObject& handle = motionData.GetBaseObject();
+
+  return static_cast<const Internal::MotionData&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_IMPL_H
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-data-load-task.cpp b/dali-scene3d/internal/model-motion/motion-data-load-task.cpp
new file mode 100644
index 0000000..f780eb9
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-data-load-task.cpp
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-motion/motion-data-load-task.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/bvh-loader.h>
+#include <dali-scene3d/public-api/loader/facial-animation-loader.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+MotionDataLoadTask::MotionDataLoadTask(const std::string& path, bool useRootTranslationOnly, const Vector3& scale, CallbackBase* callback)
+: AsyncTask(callback),
+  mFileUrl(path),
+  mRawBuffer(nullptr),
+  mRawBufferLength(0),
+  mScale(scale),
+  mUseRootTranslationOnly(useRootTranslationOnly),
+  mAnimationDefinition{},
+  mLoadMethod(MotionDataLoadTask::LoadMethod::BVH_FILE)
+{
+}
+
+MotionDataLoadTask::MotionDataLoadTask(const uint8_t* rawBuffer, int rawBufferLength, bool useRootTranslationOnly, const Vector3& scale, CallbackBase* callback)
+: AsyncTask(callback),
+  mFileUrl(),
+  mRawBuffer(nullptr),
+  mRawBufferLength(rawBufferLength),
+  mScale(scale),
+  mUseRootTranslationOnly(useRootTranslationOnly),
+  mAnimationDefinition{},
+  mLoadMethod(MotionDataLoadTask::LoadMethod::BVH_BUFFER)
+{
+  // To keep life of raw buffer, let us copy data now.
+  mRawBuffer = new uint8_t[mRawBufferLength];
+  memcpy(mRawBuffer, rawBuffer, sizeof(uint8_t) * mRawBufferLength);
+}
+
+MotionDataLoadTask::MotionDataLoadTask(const std::string& url, CallbackBase* callback)
+: AsyncTask(callback),
+  mFileUrl(url),
+  mRawBuffer(nullptr),
+  mRawBufferLength(0),
+  mScale(),
+  mUseRootTranslationOnly(false),
+  mAnimationDefinition{},
+  mLoadMethod(MotionDataLoadTask::LoadMethod::FACIAL_FILE)
+{
+}
+
+MotionDataLoadTask::MotionDataLoadTask(const uint8_t* rawBuffer, int rawBufferLength, CallbackBase* callback)
+: AsyncTask(callback),
+  mFileUrl(),
+  mRawBuffer(nullptr),
+  mRawBufferLength(rawBufferLength),
+  mScale(),
+  mUseRootTranslationOnly(false),
+  mAnimationDefinition{},
+  mLoadMethod(MotionDataLoadTask::LoadMethod::FACIAL_BUFFER)
+{
+  // To keep life of raw buffer, let us copy data now.
+  mRawBuffer = new uint8_t[mRawBufferLength];
+  memcpy(mRawBuffer, rawBuffer, sizeof(uint8_t) * mRawBufferLength);
+}
+
+MotionDataLoadTask::~MotionDataLoadTask()
+{
+  if(mRawBuffer)
+  {
+    delete[] mRawBuffer;
+  }
+}
+
+void MotionDataLoadTask::Process()
+{
+  switch(mLoadMethod)
+  {
+    case LoadMethod::BVH_FILE:
+    {
+      mAnimationDefinition = std::move(Loader::LoadBvh(mFileUrl, "LoadedBvhMotionData", mUseRootTranslationOnly, mScale));
+      break;
+    }
+    case LoadMethod::BVH_BUFFER:
+    {
+      mAnimationDefinition = std::move(Loader::LoadBvhFromBuffer(mRawBuffer, mRawBufferLength, "LoadedBvhMotionData", mUseRootTranslationOnly, mScale));
+      break;
+    }
+    case LoadMethod::FACIAL_FILE:
+    {
+      mAnimationDefinition = std::move(Loader::LoadFacialAnimation(mFileUrl));
+      break;
+    }
+    case LoadMethod::FACIAL_BUFFER:
+    {
+      mAnimationDefinition = std::move(Loader::LoadFacialAnimationFromBuffer(mRawBuffer, mRawBufferLength));
+      break;
+    }
+  }
+}
+
+bool MotionDataLoadTask::IsReady()
+{
+  return true;
+}
+
+const Scene3D::Loader::AnimationDefinition& MotionDataLoadTask::GetAnimationDefinition() const
+{
+  return mAnimationDefinition;
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-data-load-task.h b/dali-scene3d/internal/model-motion/motion-data-load-task.h
new file mode 100644
index 0000000..df601c4
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-data-load-task.h
@@ -0,0 +1,124 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_LOAD_TASK_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_LOAD_TASK_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/model-motion/motion-data.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+class MotionDataLoadTask;
+typedef IntrusivePtr<MotionDataLoadTask> MotionDataLoadTaskPtr;
+
+/**
+ * @brief AsyncTask for load MotionData from various type.
+ * After load finished, it will keep result as Loader::AnimationDefinition.
+ */
+class MotionDataLoadTask : public AsyncTask
+{
+public:
+  enum class LoadMethod
+  {
+    BVH_FILE,
+    BVH_BUFFER,
+    FACIAL_FILE,
+    FACIAL_BUFFER,
+  };
+
+public:
+  /**
+   * Constructor for load bvh from file.
+   */
+  MotionDataLoadTask(const std::string& path, bool useRootTranslationOnly, const Vector3& scale, CallbackBase* callback);
+
+  /**
+   * Constructor for load bvh from buffer.
+   */
+  MotionDataLoadTask(const uint8_t* rawBuffer, int rawBufferLength, bool useRootTranslationOnly, const Vector3& scale, CallbackBase* callback);
+
+  /**
+   * Constructor for load facial from file.
+   */
+  MotionDataLoadTask(const std::string& url, CallbackBase* callback);
+
+  /**
+   * Constructor for load facial from buffer.
+   */
+  MotionDataLoadTask(const uint8_t* rawBuffer, int rawBufferLength, CallbackBase* callback);
+
+  /**
+   * Destructor.
+   */
+  ~MotionDataLoadTask();
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process();
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady();
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "MotionDataLoadTask";
+  }
+
+public:
+  const Scene3D::Loader::AnimationDefinition& GetAnimationDefinition() const;
+
+private:
+  // Undefined
+  MotionDataLoadTask(const MotionDataLoadTask& task) = delete;
+
+  // Undefined
+  MotionDataLoadTask& operator=(const MotionDataLoadTask& task) = delete;
+
+private:
+  std::string mFileUrl;
+  uint8_t*    mRawBuffer;
+  int         mRawBufferLength;
+  Vector3     mScale;
+  bool        mUseRootTranslationOnly;
+
+  Scene3D::Loader::AnimationDefinition mAnimationDefinition;
+  LoadMethod                           mLoadMethod;
+};
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_LOAD_TASK_H
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.cpp b/dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.cpp
new file mode 100644
index 0000000..3848d04
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.cpp
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/blend-shape-details.h> ///< For BlendShapes::WEIGHTS_UNIFORM
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::BlendShapeIndex::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::BlendShapeIndex, Dali::BaseHandle, Create);
+DALI_TYPE_REGISTRATION_END()
+
+std::string GetBlendShapePropertyNameFromIndex(int index)
+{
+  if(index >= 0)
+  {
+    char weightNameBuffer[32];
+
+    // Get return value of snprintf to avoid SVACE.
+    [[maybe_unused]] auto prefixSize = snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s[%d]", Loader::BlendShapes::WEIGHTS_UNIFORM, index);
+
+    return weightNameBuffer;
+  }
+  return "";
+}
+
+} // namespace
+
+BlendShapeIndexPtr BlendShapeIndex::New()
+{
+  BlendShapeIndexPtr blendShapeIndex = new BlendShapeIndex();
+
+  blendShapeIndex->Initialize();
+
+  return blendShapeIndex;
+}
+
+BlendShapeIndex::BlendShapeIndex()
+{
+}
+
+BlendShapeIndex::~BlendShapeIndex()
+{
+}
+
+void BlendShapeIndex::Initialize()
+{
+}
+
+void BlendShapeIndex::SetBlendShapeId(Property::Key blendShapeId)
+{
+  mBlendShapeId = blendShapeId;
+}
+
+Property::Key BlendShapeIndex::GetBlendShapeId() const
+{
+  return mBlendShapeId;
+}
+
+std::string BlendShapeIndex::GetPropertyName(Scene3D::ModelNode node)
+{
+  if(mBlendShapeId.type == Property::Key::Type::INDEX)
+  {
+    if(mBlendShapeId.indexKey != Property::INVALID_INDEX)
+    {
+      return GetBlendShapePropertyNameFromIndex(mBlendShapeId.indexKey);
+    }
+  }
+  else if(mBlendShapeId.type == Property::Key::Type::STRING)
+  {
+    if(node)
+    {
+      auto index = node.GetBlendShapeIndexByName(mBlendShapeId.stringKey);
+      if(index != Scene3D::Loader::BlendShapes::INVALID_INDEX)
+      {
+        return GetBlendShapePropertyNameFromIndex(index);
+      }
+    }
+  }
+  return "";
+}
+
+Property::Index BlendShapeIndex::GetPropertyIndex(Scene3D::ModelNode node)
+{
+  // Not surport now
+  return Property::INVALID_INDEX;
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.h b/dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.h
new file mode 100644
index 0000000..42a3b35
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.h
@@ -0,0 +1,118 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_BLEND_SHAPE_INDEX_IMPL_H
+#define DALI_SCENE3D_MODEL_MOTION_BLEND_SHAPE_INDEX_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using BlendShapeIndexPtr = IntrusivePtr<BlendShapeIndex>;
+
+/**
+ * @brief Internal data for Scene3D::BlendShapeIndex.
+ */
+class BlendShapeIndex : public MotionIndex
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create a new BlendShapeIndex object.
+   * @return A smart-pointer to the newly allocated BlendShapeIndex.
+   */
+  static BlendShapeIndexPtr New();
+
+protected:
+  /**
+   * @brief Construct a new BlendShapeIndex.
+   */
+  BlendShapeIndex();
+
+  /**
+   * @brief Second-phase constructor.
+   */
+  void Initialize();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~BlendShapeIndex();
+
+public: // Public Method
+  /**
+   * @copydoc Dali::Scene3D::BlendShapeIndex::SetBlendShapeId()
+   */
+  void SetBlendShapeId(Property::Key blendShapeId);
+
+  /**
+   * @copydoc Dali::Scene3D::BlendShapeIndex::GetBlendShapeId()
+   */
+  Property::Key GetBlendShapeId() const;
+
+public: // MotionIndex Override Method
+  /**
+   * @copydoc Dali::Scene3D::Internal::MotionIndex::GetPropertyName()
+   */
+  std::string GetPropertyName(Scene3D::ModelNode node = Scene3D::ModelNode()) override;
+
+  /**
+   * @copydoc Dali::Scene3D::Internal::MotionIndex::GetPropertyIndex()
+   */
+  Property::Index GetPropertyIndex(Scene3D::ModelNode node = Scene3D::ModelNode()) override;
+
+protected:
+  Property::Key mBlendShapeId{Property::INVALID_KEY}; ///< The id of blend shape
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::BlendShapeIndex& GetImplementation(Dali::Scene3D::BlendShapeIndex& blendShapeIndex)
+{
+  DALI_ASSERT_ALWAYS(blendShapeIndex && "BlendShapeIndex handle is empty");
+
+  BaseObject& handle = blendShapeIndex.GetBaseObject();
+
+  return static_cast<Internal::BlendShapeIndex&>(handle);
+}
+
+inline const Internal::BlendShapeIndex& GetImplementation(const Dali::Scene3D::BlendShapeIndex& blendShapeIndex)
+{
+  DALI_ASSERT_ALWAYS(blendShapeIndex && "BlendShapeIndex handle is empty");
+
+  const BaseObject& handle = blendShapeIndex.GetBaseObject();
+
+  return static_cast<const Internal::BlendShapeIndex&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_BLEND_SHAPE_INDEX_IMPL_H
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/motion-index-impl.cpp b/dali-scene3d/internal/model-motion/motion-index/motion-index-impl.cpp
new file mode 100644
index 0000000..2482c30
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/motion-index-impl.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h>
+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+} // unnamed namespace
+
+MotionIndex::MotionIndex()
+{
+}
+
+MotionIndex::~MotionIndex()
+{
+}
+
+void MotionIndex::SetModelNodeId(Property::Key modelNodeId)
+{
+  mModelNodeId = modelNodeId;
+}
+
+Property::Key MotionIndex::GetModelNodeId() const
+{
+  return mModelNodeId;
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h b/dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h
new file mode 100644
index 0000000..8ca93a6
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h
@@ -0,0 +1,106 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_INDEX_IMPL_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_INDEX_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using MotionIndexPtr = IntrusivePtr<MotionIndex>;
+
+/**
+ * @brief Internal abstract data for Scene3D::MotionIndex.
+ * The drived class can implemet there own GetPropertyIndex() and GetPropertyName() API.
+ */
+class MotionIndex : public BaseObject
+{
+protected:
+  /**
+   * @brief Construct a new MotionIndex.
+   */
+  MotionIndex();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~MotionIndex();
+
+public: // Public Method
+  /**
+   * @copydoc Dali::Scene3D::MotionIndex::SetModelNodeId()
+   */
+  void SetModelNodeId(Property::Key modelNodeId);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionIndex::GetModelNodeId()
+   */
+  Property::Key GetModelNodeId() const;
+
+public: // Virtual Method
+  /**
+   * @copydoc Dali::Scene3D::MotionIndex::GetPropertyName()
+   */
+  virtual std::string GetPropertyName(Scene3D::ModelNode node = Scene3D::ModelNode()) = 0;
+
+  /**
+   * @copydoc Dali::Scene3D::MotionIndex::GetPropertyIndex()
+   */
+  virtual Property::Index GetPropertyIndex(Scene3D::ModelNode node = Scene3D::ModelNode()) = 0;
+
+protected:
+  Property::Key mModelNodeId{Property::INVALID_KEY}; ///< The id of model node
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::MotionIndex& GetImplementation(Dali::Scene3D::MotionIndex& motionIndex)
+{
+  DALI_ASSERT_ALWAYS(motionIndex && "MotionIndex handle is empty");
+
+  BaseObject& handle = motionIndex.GetBaseObject();
+
+  return static_cast<Internal::MotionIndex&>(handle);
+}
+
+inline const Internal::MotionIndex& GetImplementation(const Dali::Scene3D::MotionIndex& motionIndex)
+{
+  DALI_ASSERT_ALWAYS(motionIndex && "MotionIndex handle is empty");
+
+  const BaseObject& handle = motionIndex.GetBaseObject();
+
+  return static_cast<const Internal::MotionIndex&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_INDEX_IMPL_H
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.cpp b/dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.cpp
new file mode 100644
index 0000000..3bfe3a5
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.cpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::MotionPropertyIndex::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::MotionPropertyIndex, Dali::BaseHandle, Create);
+DALI_TYPE_REGISTRATION_END()
+
+} // namespace
+
+MotionPropertyIndexPtr MotionPropertyIndex::New()
+{
+  MotionPropertyIndexPtr motionPropertyIndex = new MotionPropertyIndex();
+
+  motionPropertyIndex->Initialize();
+
+  return motionPropertyIndex;
+}
+
+MotionPropertyIndex::MotionPropertyIndex()
+{
+}
+
+MotionPropertyIndex::~MotionPropertyIndex()
+{
+}
+
+void MotionPropertyIndex::Initialize()
+{
+}
+
+void MotionPropertyIndex::SetPropertyId(Property::Key propertyId)
+{
+  mPropertyId = propertyId;
+}
+
+Property::Key MotionPropertyIndex::GetPropertyId() const
+{
+  return mPropertyId;
+}
+
+std::string MotionPropertyIndex::GetPropertyName(Scene3D::ModelNode node)
+{
+  if(mPropertyId.type == Property::Key::Type::STRING)
+  {
+    return mPropertyId.stringKey;
+  }
+  return "";
+}
+
+Property::Index MotionPropertyIndex::GetPropertyIndex(Scene3D::ModelNode node)
+{
+  if(mPropertyId.type == Property::Key::Type::INDEX)
+  {
+    return mPropertyId.indexKey;
+  }
+  return Property::INVALID_INDEX;
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.h b/dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.h
new file mode 100644
index 0000000..081dd97
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.h
@@ -0,0 +1,118 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_PROPERTY_INDEX_IMPL_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_PROPERTY_INDEX_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using MotionPropertyIndexPtr = IntrusivePtr<MotionPropertyIndex>;
+
+/**
+ * @brief Internal data for Scene3D::MotionPropertyIndex.
+ */
+class MotionPropertyIndex : public MotionIndex
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create a new MotionPropertyIndex object.
+   * @return A smart-pointer to the newly allocated MotionPropertyIndex.
+   */
+  static MotionPropertyIndexPtr New();
+
+protected:
+  /**
+   * @brief Construct a new MotionPropertyIndex.
+   */
+  MotionPropertyIndex();
+
+  /**
+   * @brief Second-phase constructor.
+   */
+  void Initialize();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~MotionPropertyIndex();
+
+public: // Public Method
+  /**
+   * @copydoc Dali::Scene3D::MotionPropertyIndex::SetPropertyId()
+   */
+  void SetPropertyId(Property::Key propertyId);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionPropertyIndex::GetPropertyId()
+   */
+  Property::Key GetPropertyId() const;
+
+public: // MotionIndex Override Method
+  /**
+   * @copydoc Dali::Scene3D::Internal::MotionIndex::GetPropertyName()
+   */
+  std::string GetPropertyName(Scene3D::ModelNode node = Scene3D::ModelNode()) override;
+
+  /**
+   * @copydoc Dali::Scene3D::Internal::MotionIndex::GetPropertyIndex()
+   */
+  Property::Index GetPropertyIndex(Scene3D::ModelNode node = Scene3D::ModelNode()) override;
+
+protected:
+  Property::Key mPropertyId{Property::INVALID_KEY}; ///< The id of blend shape
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::MotionPropertyIndex& GetImplementation(Dali::Scene3D::MotionPropertyIndex& motionPropertyIndex)
+{
+  DALI_ASSERT_ALWAYS(motionPropertyIndex && "MotionPropertyIndex handle is empty");
+
+  BaseObject& handle = motionPropertyIndex.GetBaseObject();
+
+  return static_cast<Internal::MotionPropertyIndex&>(handle);
+}
+
+inline const Internal::MotionPropertyIndex& GetImplementation(const Dali::Scene3D::MotionPropertyIndex& motionPropertyIndex)
+{
+  DALI_ASSERT_ALWAYS(motionPropertyIndex && "MotionPropertyIndex handle is empty");
+
+  const BaseObject& handle = motionPropertyIndex.GetBaseObject();
+
+  return static_cast<const Internal::MotionPropertyIndex&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_PROPERTY_INDEX_IMPL_H
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.cpp b/dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.cpp
new file mode 100644
index 0000000..e3babc8
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.cpp
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::MotionTransformIndex::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::MotionTransformIndex, Dali::BaseHandle, Create);
+DALI_TYPE_REGISTRATION_END()
+} // namespace
+
+MotionTransformIndexPtr MotionTransformIndex::New()
+{
+  MotionTransformIndexPtr motionTransformIndex = new MotionTransformIndex();
+
+  motionTransformIndex->Initialize();
+
+  return motionTransformIndex;
+}
+
+MotionTransformIndex::MotionTransformIndex()
+{
+}
+
+MotionTransformIndex::~MotionTransformIndex()
+{
+}
+
+void MotionTransformIndex::Initialize()
+{
+}
+
+void MotionTransformIndex::SetTransformType(Scene3D::MotionTransformIndex::TransformType type)
+{
+  mTransformType = type;
+}
+
+Scene3D::MotionTransformIndex::TransformType MotionTransformIndex::GetTransformType() const
+{
+  return mTransformType;
+}
+
+std::string MotionTransformIndex::GetPropertyName(Scene3D::ModelNode node)
+{
+  using TransformType = Scene3D::MotionTransformIndex::TransformType;
+
+  switch(mTransformType)
+  {
+    case TransformType::POSITION:
+    {
+      return "position";
+    }
+    case TransformType::POSITION_X:
+    {
+      return "positionX";
+    }
+    case TransformType::POSITION_Y:
+    {
+      return "positionY";
+    }
+    case TransformType::POSITION_Z:
+    {
+      return "positionZ";
+    }
+    case TransformType::ORIENTATION:
+    {
+      return "orientation";
+    }
+    case TransformType::SCALE:
+    {
+      return "scale";
+    }
+    case TransformType::SCALE_X:
+    {
+      return "scaleX";
+    }
+    case TransformType::SCALE_Y:
+    {
+      return "scaleY";
+    }
+    case TransformType::SCALE_Z:
+    {
+      return "scaleZ";
+    }
+    default:
+    {
+      DALI_LOG_ERROR("Invalid transform type used\n");
+      return "";
+    }
+  }
+}
+
+Property::Index MotionTransformIndex::GetPropertyIndex(Scene3D::ModelNode node)
+{
+  using TransformType = Scene3D::MotionTransformIndex::TransformType;
+
+  switch(mTransformType)
+  {
+    case TransformType::POSITION:
+    {
+      return Dali::Actor::Property::POSITION;
+    }
+    case TransformType::POSITION_X:
+    {
+      return Dali::Actor::Property::POSITION_X;
+    }
+    case TransformType::POSITION_Y:
+    {
+      return Dali::Actor::Property::POSITION_Y;
+    }
+    case TransformType::POSITION_Z:
+    {
+      return Dali::Actor::Property::POSITION_Z;
+    }
+    case TransformType::ORIENTATION:
+    {
+      return Dali::Actor::Property::ORIENTATION;
+    }
+    case TransformType::SCALE:
+    {
+      return Dali::Actor::Property::SCALE;
+    }
+    case TransformType::SCALE_X:
+    {
+      return Dali::Actor::Property::SCALE_X;
+    }
+    case TransformType::SCALE_Y:
+    {
+      return Dali::Actor::Property::SCALE_Y;
+    }
+    case TransformType::SCALE_Z:
+    {
+      return Dali::Actor::Property::SCALE_Z;
+    }
+    default:
+    {
+      DALI_LOG_ERROR("Invalid transform type used\n");
+      return Property::INVALID_INDEX;
+    }
+  }
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.h b/dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.h
new file mode 100644
index 0000000..72dc345
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.h
@@ -0,0 +1,118 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_TRANSFORM_INDEX_IMPL_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_TRANSFORM_INDEX_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using MotionTransformIndexPtr = IntrusivePtr<MotionTransformIndex>;
+
+/**
+ * @brief Internal data for Scene3D::MotionTransformIndex.
+ */
+class MotionTransformIndex : public MotionIndex
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create a new MotionTransformIndex object.
+   * @return A smart-pointer to the newly allocated MotionTransformIndex.
+   */
+  static MotionTransformIndexPtr New();
+
+protected:
+  /**
+   * @brief Construct a new MotionTransformIndex.
+   */
+  MotionTransformIndex();
+
+  /**
+   * @brief Second-phase constructor.
+   */
+  void Initialize();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~MotionTransformIndex();
+
+public: // Public Method
+  /**
+   * @copydoc Dali::Scene3D::MotionTransformIndex::SetTransformType()
+   */
+  void SetTransformType(Scene3D::MotionTransformIndex::TransformType type);
+
+  /**
+   * @copydoc Dali::Scene3D::BlendShapeIndex::GetTransformType()
+   */
+  Scene3D::MotionTransformIndex::TransformType GetTransformType() const;
+
+public: // MotionIndex Override Method
+  /**
+   * @copydoc Dali::Scene3D::Internal::MotionIndex::GetPropertyName()
+   */
+  std::string GetPropertyName(Scene3D::ModelNode node = Scene3D::ModelNode()) override;
+
+  /**
+   * @copydoc Dali::Scene3D::Internal::MotionIndex::GetPropertyIndex()
+   */
+  Property::Index GetPropertyIndex(Scene3D::ModelNode node = Scene3D::ModelNode()) override;
+
+protected:
+  Scene3D::MotionTransformIndex::TransformType mTransformType{Scene3D::MotionTransformIndex::TransformType::INVALID}; ///< The type of transform
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::MotionTransformIndex& GetImplementation(Dali::Scene3D::MotionTransformIndex& motionTransformIndex)
+{
+  DALI_ASSERT_ALWAYS(motionTransformIndex && "MotionTransformIndex handle is empty");
+
+  BaseObject& handle = motionTransformIndex.GetBaseObject();
+
+  return static_cast<Internal::MotionTransformIndex&>(handle);
+}
+
+inline const Internal::MotionTransformIndex& GetImplementation(const Dali::Scene3D::MotionTransformIndex& motionTransformIndex)
+{
+  DALI_ASSERT_ALWAYS(motionTransformIndex && "MotionTransformIndex handle is empty");
+
+  const BaseObject& handle = motionTransformIndex.GetBaseObject();
+
+  return static_cast<const Internal::MotionTransformIndex&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_TRANSFORM_INDEX_IMPL_H
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-value-impl.cpp b/dali-scene3d/internal/model-motion/motion-value-impl.cpp
new file mode 100644
index 0000000..62d0580
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-value-impl.cpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/internal/model-motion/motion-value-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/animation/key-frames-devel.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+namespace
+{
+/**
+ * Creates control through type registry
+ */
+BaseHandle Create()
+{
+  return Scene3D::MotionValue::New();
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Scene3D::MotionValue, Dali::BaseHandle, Create);
+DALI_TYPE_REGISTRATION_END()
+
+} // unnamed namespace
+
+MotionValuePtr MotionValue::New()
+{
+  MotionValuePtr motionValue = new MotionValue();
+
+  motionValue->Initialize();
+
+  return motionValue;
+}
+
+MotionValue::MotionValue()
+{
+}
+
+MotionValue::~MotionValue()
+{
+}
+
+void MotionValue::Initialize()
+{
+}
+
+// Public Method
+
+Scene3D::MotionValue::ValueType MotionValue::GetValueType() const
+{
+  return mType;
+}
+
+void MotionValue::SetValue(Property::Value propertyValue)
+{
+  mType = Scene3D::MotionValue::ValueType::PROPERTY_VALUE;
+
+  mKeyFrames.Reset();
+  mPropertyValue = propertyValue;
+}
+
+void MotionValue::SetValue(Dali::KeyFrames keyFrames)
+{
+  mType = Scene3D::MotionValue::ValueType::KEY_FRAMES;
+
+  mKeyFrames     = keyFrames;
+  mPropertyValue = Property::Value();
+}
+
+void MotionValue::Clear()
+{
+  mType = Scene3D::MotionValue::ValueType::INVALID;
+
+  mKeyFrames.Reset();
+  mPropertyValue = Property::Value();
+}
+
+Property::Value MotionValue::GetPropertyValue() const
+{
+  if(mType == Scene3D::MotionValue::ValueType::PROPERTY_VALUE)
+  {
+    return mPropertyValue;
+  }
+  else if(mType == Scene3D::MotionValue::ValueType::KEY_FRAMES)
+  {
+    // Get last value of keyframes
+    auto keyFrameCount = DevelKeyFrames::GetKeyFrameCount(mKeyFrames);
+    if(keyFrameCount > 0u)
+    {
+      float           dummyProgress;
+      Property::Value propertyValue;
+      DevelKeyFrames::GetKeyFrame(mKeyFrames, keyFrameCount - 1u, dummyProgress, propertyValue);
+
+      return propertyValue;
+    }
+  }
+  return Property::Value();
+}
+
+KeyFrames MotionValue::GetKeyFrames() const
+{
+  if(mType == Scene3D::MotionValue::ValueType::KEY_FRAMES)
+  {
+    return mKeyFrames;
+  }
+  else if(mType == Scene3D::MotionValue::ValueType::PROPERTY_VALUE)
+  {
+    // Generate stable keyframe animation here.
+    // TODO : Should we check property value is animatable type or not?
+    KeyFrames keyFrames = KeyFrames::New();
+    keyFrames.Add(0.0f, mPropertyValue);
+    keyFrames.Add(1.0f, mPropertyValue);
+    return keyFrames;
+  }
+  return Dali::KeyFrames();
+}
+
+} // namespace Internal
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/internal/model-motion/motion-value-impl.h b/dali-scene3d/internal/model-motion/motion-value-impl.h
new file mode 100644
index 0000000..b5bf343
--- /dev/null
+++ b/dali-scene3d/internal/model-motion/motion-value-impl.h
@@ -0,0 +1,129 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_VALUE_IMPL_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_VALUE_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-motion/motion-value.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal
+{
+using MotionValuePtr = IntrusivePtr<MotionValue>;
+
+/**
+ * @brief Internal data for Scene3D::MotionValue.
+ */
+class MotionValue : public BaseObject
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create a new MotionValue object.
+   * @return A smart-pointer to the newly allocated MotionValue.
+   */
+  static MotionValuePtr New();
+
+protected:
+  /**
+   * @brief Construct a new MotionValue.
+   */
+  MotionValue();
+
+  /**
+   * @brief Second-phase constructor.
+   */
+  void Initialize();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~MotionValue();
+
+public: // Public Method
+  /**
+   * @copydoc Dali::Scene3D::MotionValue::GetValueType()
+   */
+  Scene3D::MotionValue::ValueType GetValueType() const;
+
+  /**
+   * @copydoc Dali::Scene3D::MotionValue::SetValue()
+   */
+  void SetValue(Property::Value propertyValue);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionValue::SetValue()
+   */
+  void SetValue(Dali::KeyFrames keyFrames);
+
+  /**
+   * @copydoc Dali::Scene3D::MotionValue::Clear()
+   */
+  void Clear();
+
+  /**
+   * @copydoc Dali::Scene3D::MotionValue::GetPropertyValue()
+   */
+  Property::Value GetPropertyValue() const;
+
+  /**
+   * @copydoc Dali::Scene3D::MotionValue::GetKeyFrames()
+   */
+  KeyFrames GetKeyFrames() const;
+
+private:
+  Scene3D::MotionValue::ValueType mType{Scene3D::MotionValue::ValueType::INVALID};
+
+  Property::Value mPropertyValue{};
+  Dali::KeyFrames mKeyFrames{};
+};
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::MotionValue& GetImplementation(Dali::Scene3D::MotionValue& motionValue)
+{
+  DALI_ASSERT_ALWAYS(motionValue && "MotionValue handle is empty");
+
+  BaseObject& handle = motionValue.GetBaseObject();
+
+  return static_cast<Internal::MotionValue&>(handle);
+}
+
+inline const Internal::MotionValue& GetImplementation(const Dali::Scene3D::MotionValue& motionValue)
+{
+  DALI_ASSERT_ALWAYS(motionValue && "MotionValue handle is empty");
+
+  const BaseObject& handle = motionValue.GetBaseObject();
+
+  return static_cast<const Internal::MotionValue&>(handle);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_VALUE_IMPL_H
\ No newline at end of file
diff --git a/dali-scene3d/public-api/algorithm/navigation-mesh.cpp b/dali-scene3d/public-api/algorithm/navigation-mesh.cpp
new file mode 100644
index 0000000..1d7f90c
--- /dev/null
+++ b/dali-scene3d/public-api/algorithm/navigation-mesh.cpp
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+
+// INTERNAL HEADERS
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+
+using Dali::Vector3;
+
+namespace Dali::Scene3D::Algorithm
+{
+NavigationMesh::NavigationMesh(NavigationMeshImpl* impl)
+{
+  mImpl.reset(impl);
+}
+
+NavigationMesh::~NavigationMesh() = default;
+
+[[nodiscard]] uint32_t NavigationMesh::GetFaceCount() const
+{
+  return mImpl->GetFaceCount();
+}
+
+[[nodiscard]] uint32_t NavigationMesh::GetEdgeCount() const
+{
+  return mImpl->GetEdgeCount();
+}
+
+[[nodiscard]] uint32_t NavigationMesh::GetVertexCount() const
+{
+  return mImpl->GetVertexCount();
+}
+
+bool NavigationMesh::FindFloor(const Dali::Vector3& position, Dali::Vector3& outPosition, FaceIndex& outFaceIndex)
+{
+  return mImpl->FindFloor(position, outPosition, outFaceIndex);
+}
+
+bool NavigationMesh::FindFloorForFace(const Dali::Vector3& position, FaceIndex faceIndex, bool dontCheckNeighbours, Dali::Vector3& outPosition)
+{
+  return mImpl->FindFloorForFace(position, faceIndex, dontCheckNeighbours, outPosition);
+}
+
+[[nodiscard]] const NavigationMesh::Face* NavigationMesh::GetFace(FaceIndex index) const
+{
+  return mImpl->GetFace(index);
+}
+
+[[nodiscard]] const NavigationMesh::Edge* NavigationMesh::GetEdge(EdgeIndex index) const
+{
+  return mImpl->GetEdge(index);
+}
+
+[[nodiscard]] const NavigationMesh::Vertex* NavigationMesh::GetVertex(VertexIndex index) const
+{
+  return mImpl->GetVertex(index);
+}
+
+void NavigationMesh::SetSceneTransform(const Dali::Matrix& transform)
+{
+  mImpl->SetTransform(transform);
+}
+
+Dali::Vector3 NavigationMesh::PointSceneToLocal(const Dali::Vector3& point) const
+{
+  return mImpl->PointSceneToLocal(point);
+}
+
+Dali::Vector3 NavigationMesh::PointLocalToScene(const Dali::Vector3& point) const
+{
+  return mImpl->PointLocalToScene(point);
+}
+
+Dali::Vector3 NavigationMesh::GetGravityVector() const
+{
+  return mImpl->GetGravityVector();
+}
+
+FaceIndex NavigationMesh::RayFaceIntersect(const Vector3& origin, const Vector3& direction) const
+{
+  Internal::Algorithm::NavigationRay ray;
+  ray.origin    = origin;
+  ray.direction = direction;
+
+  auto result = mImpl->RayCastIntersect(ray);
+  if(result.result)
+  {
+    return result.faceIndex;
+  }
+  return NULL_FACE;
+}
+
+} // namespace Dali::Scene3D::Algorithm
\ No newline at end of file
diff --git a/dali-scene3d/public-api/algorithm/navigation-mesh.h b/dali-scene3d/public-api/algorithm/navigation-mesh.h
new file mode 100644
index 0000000..34088dd
--- /dev/null
+++ b/dali-scene3d/public-api/algorithm/navigation-mesh.h
@@ -0,0 +1,282 @@
+#ifndef DALI_SCENE3D_NAVIGATION_MESH_H
+#define DALI_SCENE3D_NAVIGATION_MESH_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/math/vector4.h>
+
+#include <cinttypes>
+#include <cstdio>
+#include <limits>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+class NavigationMesh;
+}
+
+namespace Dali::Scene3D::Loader
+{
+class NavigationMeshFactory;
+}
+
+constexpr auto NAVIGATION_MESH_MAX_VERTICES_PER_FACE = 3u;
+constexpr auto NAVIGATION_MESH_MAX_EDGES_PER_FACE    = 3u;
+constexpr auto NAVIGATION_MESH_MAX_COMPONENTS_3D     = 3u;
+constexpr auto NAVIGATION_MESH_MAX_COMPONENTS_2D     = 2u;
+
+namespace Dali::Scene3D::Algorithm
+{
+// Using PImpling but not usual DALi handles as this object isn't supposed to be refcounted
+using NavigationMeshImpl = Dali::Scene3D::Internal::Algorithm::NavigationMesh;
+
+// Make each to change each index value's type here.
+using VertexIndex = uint16_t;
+using EdgeIndex   = uint16_t;
+using FaceIndex   = uint16_t;
+
+/**
+ * @class NavigationMesh
+ *
+ * NavigationMesh is a set of connected faces. The data contains
+ * Polygons (Polys), Edges and Vertices and describes relations
+ * between (for example, edge knows which polys are on each side).
+ *
+ * NavigationMesh uses any coordinate system that it has been exported with.
+ *
+ * The mesh is exported with gravity direction. This is because various editors
+ * may define UP vector differently. Note, the Gravity vector points DOWN.
+ *
+ * - All calculation take place in the navigation mesh local space
+ * - The NavigationMesh should use a correct transformation matrix (SetSceneTransform())
+ * - Without transform, the NavigationMesh space stays local (compatible with exporter tool)
+ * - The NavigationMesh defines Gravity vector (down)
+ * - The finding floor results are returned back into the scene space (set with SetSceneTransform()).
+ *
+ */
+class DALI_SCENE3D_API NavigationMesh
+{
+public:
+  /**
+   * @struct Face
+   *
+   * Describes a single polygon's face
+   */
+  struct Face
+  {
+    VertexIndex vertex[NAVIGATION_MESH_MAX_VERTICES_PER_FACE]; ///< Vertices per face
+    EdgeIndex   edge[NAVIGATION_MESH_MAX_EDGES_PER_FACE];      ///< Edges per face
+    float       normal[NAVIGATION_MESH_MAX_COMPONENTS_3D];     ///< Normal vector
+    float       center[NAVIGATION_MESH_MAX_COMPONENTS_3D];     ///< Barycentric coordinates
+  };
+
+  /**
+   * @struct Edge
+   *
+   * Describes a single edge
+   */
+  struct Edge
+  {
+    VertexIndex vertex[NAVIGATION_MESH_MAX_COMPONENTS_2D]; ///< Vertices making the edge
+    FaceIndex   face[NAVIGATION_MESH_MAX_COMPONENTS_2D];   ///< Faces on both sides of edge
+  };
+
+  /**
+   * @struct Vertex
+   *
+   * Describes a single Vertex
+   *
+   */
+  struct Vertex
+  {
+    union
+    {
+      float coordinates[NAVIGATION_MESH_MAX_COMPONENTS_3D]; ///< Coordinates of vertex
+      struct
+      {
+        float x, y, z;
+      };
+    };
+  };
+
+  NavigationMesh() = delete;
+
+public:
+  /**
+   * @brief Destructor
+   */
+  ~NavigationMesh();
+
+  /**
+   * @brief Returns total number of faces
+   *
+   * @return number of faces
+   */
+  [[nodiscard]] uint32_t GetFaceCount() const;
+
+  /**
+   * @brief Returns total number of edges
+   *
+   * @return number of edges
+   */
+  [[nodiscard]] uint32_t GetEdgeCount() const;
+
+  /**
+   * @brief Returns total number of vertices
+   *
+   * @return number of vertices
+   */
+  [[nodiscard]] uint32_t GetVertexCount() const;
+
+  /**
+   * @brief Looks for the floor under specified position
+   * @param[in] position Position to investigate
+   * @param[out] outPosition Position on the floor in found
+   * @param[out] outFaceIndex Index of NavigationMesh face associated with floor
+   *
+   * @return True if floor has been found, False otherwise
+   */
+  bool FindFloor(const Dali::Vector3& position, Dali::Vector3& outPosition, FaceIndex& outFaceIndex);
+
+  /**
+   * @brief Looks for a floor starting from specified face
+   *
+   * The function performs lookup starting from the specified face. If 'dontCheckNeighbours' is 'true'
+   * then function will fail if 'position' falls outside boundries of face. If 'dontCheckNeighbours'
+   * is 'false' the function will continue search expanding onto neighbouring faces.
+   *
+   * @param[in] position Position to investigate
+   * @param[in] faceIndex Face index to start lookup
+   * @param[in] dontCheckNeighbours If true, the neighbouring faces won't be tested
+   * @param[out] outPosition Result of lookup
+   *
+   * @return True on success, false otherwise
+   */
+  bool FindFloorForFace(const Dali::Vector3& position, FaceIndex faceIndex, bool dontCheckNeighbours, Dali::Vector3& outPosition);
+
+  /**
+   * @brief Returns pointer to Face structure
+   * @param[in] index Index of face to retrieve
+   * @return Pointer to valid Face structure or nullptr
+   */
+  [[nodiscard]] const Face* GetFace(FaceIndex index) const;
+
+  /**
+   * @brief Returns edge structure
+   * @param[in] index Index of edge to retrieve
+   * @return Pointer to valid Edge structure or nullptr
+   */
+  [[nodiscard]] const Edge* GetEdge(EdgeIndex index) const;
+
+  /**
+   * @brief Returns vertex structure
+   * @param[in] index Index of vertex to retrieve
+   * @return Pointer to valid Vertex structure or nullptr
+   */
+  [[nodiscard]] const Vertex* GetVertex(VertexIndex index) const;
+
+  /**
+   * @brief Sets static transform for the navigation mesh object
+   *
+   * The NavigationMesh may require to be transformed into the coordinates
+   * of the scene object. The exporter exports navigation geometry in a local
+   * space. The transform must be set in order to use the navigation mesh
+   * in the scene space (most likely DALi coordinate space).
+   *
+   * The scene transform matrix can be set in the DALi event thread using
+   * Dali::DevelActor::GetWorldTransform(sceneActor)
+   *
+   * For example:
+   * @code
+   * Actor parentActorOfNavigationMesh; // non-null object
+   * Dali::DevelActor::GetWorldTransform(parentActorOfNavigationMesh);
+   * navigationMesh->SetSceneTransform(parentActorOfNavigationMesh);
+   * @endcode
+   *
+   * The transform remains static until changed by calling SetSceneTransform() again.
+   * It means that if the matrix is obtained from the actor and actor transform will
+   * change the navigation mesh won't be aligned anymore.
+   *
+   * @param[in] transform Valid transform 4x4 matrix
+   */
+  void SetSceneTransform(const Dali::Matrix& transform);
+
+  /**
+   * @brief transforms point into the NavigationMesh local space
+   *
+   * Transforms a 3D point into navigation mesh space (space used when
+   * NavigationMesh has been created, most likely 3D editor space).
+   *
+   * @param[in] point Point to transform
+   * @return Point transformed to the local space
+   */
+  Dali::Vector3 PointSceneToLocal(const Dali::Vector3& point) const;
+
+  /**
+   * @brief Transforms point into the parent transform space
+   *
+   * Transforms the given point into the parent space (set with SetSceneTransform()).
+   *
+   * @param[in] point Point to transform
+   * @return Point transformed into the parent space
+   */
+  Dali::Vector3 PointLocalToScene(const Dali::Vector3& point) const;
+
+  /**
+   * @brief Returns direction of the gravity vector
+   *
+   * Gravity vector points down.
+   *
+   * @return Gravity vector 3D
+   */
+  Dali::Vector3 GetGravityVector() const;
+
+  /**
+   * @brief Performs ray/face intersect test
+   * @param[in] origin Origin of ray
+   * @param[in] direction Direction of ray
+   *
+   * @SINCE_2_2.53
+   * @return Valid FaceIndex on hit or NULL_FACE on miss
+   */
+  [[nodiscard]] FaceIndex RayFaceIntersect(const Vector3& origin, const Vector3& direction) const;
+
+  static constexpr FaceIndex NULL_FACE{std::numeric_limits<FaceIndex>::max()}; ///< Represents null face
+  static constexpr EdgeIndex NULL_EDGE{std::numeric_limits<EdgeIndex>::max()}; ///< Represents null edge
+
+public:
+  DALI_INTERNAL explicit NavigationMesh(NavigationMeshImpl* impl);
+
+  std::unique_ptr<NavigationMeshImpl> mImpl;
+};
+
+// Alias name for collider mesh
+// TODO: currently ColliderMesh is NavigationMesh however
+//       there should be separation from data and algorithms.
+//       Both, NavigationMesh and ColliderMesh use the same
+//       data structures but differ in the way they use data.
+using ColliderMesh = NavigationMesh;
+
+} // namespace Dali::Scene3D::Algorithm
+#endif // DALI_SCENE3D_NAVIGATION_MESH_H
diff --git a/dali-scene3d/public-api/algorithm/path-finder-waypoint.cpp b/dali-scene3d/public-api/algorithm/path-finder-waypoint.cpp
new file mode 100644
index 0000000..edaf1e1
--- /dev/null
+++ b/dali-scene3d/public-api/algorithm/path-finder-waypoint.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/algorithm/path-finder-waypoint.h>
+
+// EXTERNAL INCLUDES
+#include <cinttypes>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+#include <dali-scene3d/internal/algorithm/path-finder-waypoint-data.h>
+
+namespace Dali::Scene3D::Algorithm
+{
+WayPoint::WayPoint()
+{
+  mImpl = std::make_unique<Scene3D::Internal::Algorithm::WayPointData>();
+}
+
+WayPoint::~WayPoint() = default;
+
+uint32_t WayPoint::GetNavigationMeshFaceIndex() const
+{
+  return mImpl->nodeIndex;
+}
+
+Dali::Vector2 WayPoint::GetFaceLocalSpacePosition() const
+{
+  return mImpl->point2d;
+}
+
+Dali::Vector3 WayPoint::GetScenePosition() const
+{
+  return mImpl->point3d;
+}
+
+WayPoint::WayPoint(const WayPoint& wp)
+{
+  mImpl  = std::make_unique<Internal::Algorithm::WayPointData>();
+  *mImpl = *wp.mImpl;
+}
+
+WayPoint& WayPoint::operator=(const WayPoint& wp)
+{
+  mImpl  = std::make_unique<Internal::Algorithm::WayPointData>();
+  *mImpl = *wp.mImpl;
+  return *this;
+}
+
+WayPoint::operator Internal::Algorithm::WayPointData&()
+{
+  return *mImpl;
+}
+
+} // namespace Dali::Scene3D::Algorithm
diff --git a/dali-scene3d/public-api/algorithm/path-finder-waypoint.h b/dali-scene3d/public-api/algorithm/path-finder-waypoint.h
new file mode 100644
index 0000000..dd14e59
--- /dev/null
+++ b/dali-scene3d/public-api/algorithm/path-finder-waypoint.h
@@ -0,0 +1,118 @@
+#ifndef DALI_SCENE3D_PATH_FINDER_WAYPOINT_H
+#define DALI_SCENE3D_PATH_FINDER_WAYPOINT_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector2.h>
+#include <dali/public-api/math/vector3.h>
+
+#include <cinttypes>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Internal::Algorithm
+{
+struct WayPointData;
+}
+
+namespace Dali::Scene3D::Algorithm
+{
+/**
+ * @class WayPoint
+ *
+ * The class represents a public interface to the WayPoint object
+ * @SINCE_2_2.12
+ */
+class DALI_SCENE3D_API WayPoint
+{
+public:
+  /**
+   * @brief Constructor
+   * @SINCE_2_2.12
+   */
+  WayPoint();
+
+  /**
+   * @brief Destructor
+   * @SINCE_2_2.12
+   */
+  ~WayPoint();
+
+  /**
+   * @brief Returns index of bounding face within the NavigationMesh
+   *
+   * Function returns index of face withing the NavigationMesh
+   * that the waypoint is associated with.
+   *
+   * @SINCE_2_2.12
+   * @return Valid index of the face
+   */
+  [[nodiscard]] uint32_t GetNavigationMeshFaceIndex() const;
+
+  /**
+   * @brief Returns local 2D position in face space
+   *
+   * The face space uses the face barycentre as an origin. The x-axis is
+   * aligned with x-axis of the NavigationMesh.
+   *
+   * @SINCE_2_2.12
+   * @return Valid 2D location vector
+   */
+  [[nodiscard]] Dali::Vector2 GetFaceLocalSpacePosition() const;
+
+  /**
+   * @brief Returns waypoint 3D position in scene space
+   *
+   * Returns the 3D position of the waypoint in the scene space
+   * of associated NavigationMesh object (using transformation set with
+   * NavigationMesh::SetSceneTransform()).
+   *
+   * @SINCE_2_2.12
+   * @return Valid 3D location vector
+   */
+  [[nodiscard]] Dali::Vector3 GetScenePosition() const;
+
+  /**
+   * @brief Copy constructor
+   *
+   * Only copy semantics is allowed on the WayPoint object
+   * @SINCE_2_2.12
+   */
+  WayPoint(const WayPoint&);
+
+  /**
+   * @brief Copy assignment operator
+   *
+   * Only copy semantics is allowed on the WayPoint object
+   *
+   * @SINCE_2_2.12
+   * @return Copy of source object
+   */
+  WayPoint& operator=(const WayPoint&);
+
+private:
+  std::unique_ptr<Internal::Algorithm::WayPointData> mImpl;
+
+public:
+  DALI_INTERNAL operator Internal::Algorithm::WayPointData&();
+};
+} // namespace Dali::Scene3D::Algorithm
+
+#endif // DALI_SCENE3D_PATH_FINDER_WAYPOINT_H
diff --git a/dali-scene3d/public-api/algorithm/path-finder.cpp b/dali-scene3d/public-api/algorithm/path-finder.cpp
new file mode 100644
index 0000000..2f89e5d
--- /dev/null
+++ b/dali-scene3d/public-api/algorithm/path-finder.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/algorithm/path-finder.h>
+
+// INTERNAL INCLUDES
+// default algorithm
+#include <dali-scene3d/internal/algorithm/path-finder-dijkstra.h>
+#include <dali-scene3d/internal/algorithm/path-finder-spfa-double-way.h>
+#include <dali-scene3d/internal/algorithm/path-finder-spfa.h>
+
+namespace Dali::Scene3D::Algorithm
+{
+std::unique_ptr<PathFinder> PathFinder::New(NavigationMesh& navigationMesh, PathFinderAlgorithm algorithm)
+{
+  PathFinderBase* impl = nullptr;
+
+  switch(algorithm)
+  {
+    case PathFinderAlgorithm::DIJKSTRA_SHORTEST_PATH:
+    {
+      impl = new Dali::Scene3D::Internal::Algorithm::PathFinderAlgorithmDijkstra(navigationMesh);
+      break;
+    }
+    case PathFinderAlgorithm::SPFA:
+    {
+      impl = new Dali::Scene3D::Internal::Algorithm::PathFinderAlgorithmSPFA(navigationMesh);
+      break;
+    }
+    case PathFinderAlgorithm::SPFA_DOUBLE_WAY:
+    {
+      impl = new Dali::Scene3D::Internal::Algorithm::PathFinderAlgorithmSPFADoubleWay(navigationMesh);
+      break;
+    }
+  }
+
+  if(!impl)
+  {
+    return {};
+  }
+
+  auto retval = std::unique_ptr<PathFinderBase>();
+  retval.reset(impl);
+  return std::unique_ptr<Algorithm::PathFinder>(new Algorithm::PathFinder(std::move(retval)));
+}
+
+WayPointList PathFinder::FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo)
+{
+  return mImpl->FindPath(positionFrom, positionTo);
+}
+
+WayPointList PathFinder::FindPath(FaceIndex polyIndexFrom, FaceIndex polyIndexTo)
+{
+  return mImpl->FindPath(polyIndexFrom, polyIndexTo);
+}
+
+PathFinder::PathFinder(std::unique_ptr<PathFinderBase>&& baseImpl)
+{
+  mImpl = std::move(baseImpl);
+}
+
+} // namespace Dali::Scene3D::Algorithm
diff --git a/dali-scene3d/public-api/algorithm/path-finder.h b/dali-scene3d/public-api/algorithm/path-finder.h
new file mode 100644
index 0000000..5ff9fe4
--- /dev/null
+++ b/dali-scene3d/public-api/algorithm/path-finder.h
@@ -0,0 +1,142 @@
+#ifndef DALI_SCENE3D_PATH_FINDER_H
+#define DALI_SCENE3D_PATH_FINDER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+#include <dali-scene3d/public-api/algorithm/path-finder-waypoint.h>
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Algorithm
+{
+using WayPointList = std::vector<Scene3D::Algorithm::WayPoint>;
+
+/**
+ * List of enums to be used when not using custom implementation
+ * of path finding.
+ */
+enum class PathFinderAlgorithm
+{
+  DIJKSTRA_SHORTEST_PATH, ///< Using A* variant (Dijkstra) finding a shortest path. @SINCE_2_2.12
+  SPFA,                   ///< Using SPFA-SLF (Shortest Path Fast Algorithm with Short Label First) finding a shortest path. @SINCE_2_2.12
+  SPFA_DOUBLE_WAY,        ///< Using SPFA-SLF double way. It might not find shortest, but will use less memory. @SINCE_2_2.12
+
+  DEFAULT = DIJKSTRA_SHORTEST_PATH, ///< Default algorithm to use
+};
+
+/**
+ * @class PathFinderBase
+ *
+ * Base class for implementation of pathfinding algorithms.
+ * @SINCE_2_2.12
+ */
+class DALI_SCENE3D_API PathFinderBase
+{
+public:
+  /**
+   * @brief Destructor
+   * @SINCE_2_2.12
+   */
+  virtual ~PathFinderBase() = default;
+
+  /**
+   * @brief Looks for a path from point A to point B.
+   *
+   * @SINCE_2_2.12
+   * @param[in] positionFrom source position in NavigationMesh parent space
+   * @param[in] positionTo target position in NavigationMesh parent space
+   * @return List of waypoints for path or empty vector if no success
+   */
+  virtual WayPointList FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo) = 0;
+
+  /**
+   * @brief Finds path between NavigationMesh faces
+   *
+   * @SINCE_2_2.12
+   * @param[in] polyIndexFrom Index of start polygon
+   * @param[in] polyIndexTo Index of end polygon
+   * @return List of waypoints for path or empty vector if no success
+   */
+  virtual WayPointList FindPath(FaceIndex polyIndexFrom, FaceIndex polyIndexTo) = 0;
+};
+
+/**
+ * @class PathFinder
+ *
+ * PathFinder runs path finding algorithm on associated NavigationMesh
+ * and returns a list of waypoints.
+ * @SINCE_2_2.12
+ */
+class DALI_SCENE3D_API PathFinder
+{
+public:
+  /**
+   * @brief Creates new instance of path finder
+   * @SINCE_2_2.12
+   * @param[in] navigationMesh Navigation mesh to associate with
+   * @param[in] algorithm algorithm to use
+   * @return Valid pointer to PathFinder object or nullptr
+   */
+  static std::unique_ptr<PathFinder> New(NavigationMesh& navigationMesh, PathFinderAlgorithm algorithm);
+
+  /**
+   * @brief Looks for a path from point A to point B.
+   *
+   * The function looks for the path between point A (positionFrom) and B (positionTo). It runs
+   * the algorithm on the associated NavigationMesh and automatically looks for the floor point.
+   *
+   * It will fail if:
+   * - Any point is outside the navigation mesh
+   * - The path doesn't exist
+   *
+   * Both points should be defined in the same space as is used by the NavigationMesh.
+   *
+   * @SINCE_2_2.12
+   * @param[in] positionFrom Source position
+   * @param[in] positionTo Target position
+   * @return List of waypoints for path or empty list on failure
+   */
+  WayPointList FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo);
+
+  /**
+   * @brief Looks for a path between specified NavigationMesh faces
+   *
+   * The function looks for the path between given faces (provided as indices).
+   *
+   * It will fail if:
+   * - index < 0 or index > NavigationMesh::GetFaceCount()
+   * - The path doesn't exist
+   *
+   * @SINCE_2_2.12
+   * @param[in] faceIndexFrom Source face index
+   * @param[in] faceIndexTo Target face index
+   * @return List of waypoints for path or empty list on failure
+   */
+  WayPointList FindPath(FaceIndex faceIndexFrom, FaceIndex faceIndexTo);
+
+private:
+  PathFinder() = delete;
+
+  DALI_INTERNAL explicit PathFinder(std::unique_ptr<PathFinderBase>&& baseImpl);
+
+  std::unique_ptr<PathFinderBase> mImpl;
+};
+
+} // namespace Dali::Scene3D::Algorithm
+
+#endif // DALI_SCENE3D_PATH_FINDER_H
diff --git a/dali-scene3d/public-api/api.h b/dali-scene3d/public-api/api.h
new file mode 100644
index 0000000..47ee583
--- /dev/null
+++ b/dali-scene3d/public-api/api.h
@@ -0,0 +1,32 @@
+#ifndef DALI_SCENE3D_API_H
+#define DALI_SCENE3D_API_H
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#if __GNUC__ >= 4
+#define DALI_SCENE3D_API __attribute__((visibility("default")))
+
+#elif defined(WIN32)
+#ifdef BUILDING_DALI_SCENE3D
+#define DALI_SCENE3D_API __declspec(dllexport)
+#else
+#define DALI_SCENE3D_API __declspec(dllimport)
+#endif // BUILDING_DALI_SCENE3D
+
+#endif
+
+#endif //DALI_SCENE3D_API_H
diff --git a/dali-scene3d/public-api/common/environment-map.h b/dali-scene3d/public-api/common/environment-map.h
new file mode 100644
index 0000000..a07139e
--- /dev/null
+++ b/dali-scene3d/public-api/common/environment-map.h
@@ -0,0 +1,43 @@
+#ifndef DALI_SCENE3D_COMMON_ENVIRONMENT_MAP_H
+#define DALI_SCENE3D_COMMON_ENVIRONMENT_MAP_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Scene3D
+{
+
+/**
+ * @brief The Environment Map types
+ * @SINCE_2_2.11
+ */
+enum class EnvironmentMapType
+{
+  AUTO,           ///< Automatically detects the type of input environment map.
+                  ///  DALi finds the closest aspect ratio of the input texture to guess the environment map type.
+  CUBEMAP,        ///< Environment map in cubemap
+                  ///  DALi supports cross and array type of cube map for the vertical and horizontal direction.
+                  ///  For example, if the aspect ratio of a texture is 4x3, the texture is classified as a horizontal cross type.
+                  ///  On the other hand, if the aspect ratio is 6x1, it can be sorted as a horizontal array.
+  EQUIRECTANGULAR ///< Environment map in equirectangular projection. Usually equirectangular image has 2x1 aspect ratio.
+};
+
+} // namespace Scene3D
+} // namespace Dali
+
+#endif // DALI_SCENE3D_COMMON_ENVIRONMENT_MAP_H
diff --git a/dali-scene3d/public-api/common/scene-depth-index-ranges.h b/dali-scene3d/public-api/common/scene-depth-index-ranges.h
new file mode 100644
index 0000000..5b3a0c9
--- /dev/null
+++ b/dali-scene3d/public-api/common/scene-depth-index-ranges.h
@@ -0,0 +1,58 @@
+#ifndef DALI_SCENE3D_SCENE_DEPTH_INDEX_RANGES_H
+#define DALI_SCENE3D_SCENE_DEPTH_INDEX_RANGES_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace DepthIndex
+{
+
+/**
+ * @brief Depth index ranges to define rendering order.
+ * @SINCE_2_3.3
+ */
+enum Ranges
+{
+  /**
+   * @brief Depth index range for 3D scene content.
+   * @details The range of the scene content is between [SCENE, SCENE + 999]
+   * @SINCE_2_3.3
+   */
+  SCENE = -2000,
+
+  /**
+   * @brief Depth index range for UI scene content.
+   * @details The range of the UI content is between [UI, UI + 999].
+   * Some of internally created Renderer of Toolkit::Control already has
+   * default depth index value.
+   * Developer can fix the default values for their design.
+   * @SINCE_2_3.3
+   */
+  UI = 0
+};
+
+} // namespace DepthIndex
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_SCENE_DEPTH_INDEX_RANGES_H
diff --git a/dali-scene3d/public-api/controls/model/model.cpp b/dali-scene3d/public-api/controls/model/model.cpp
new file mode 100644
index 0000000..eda0041
--- /dev/null
+++ b/dali-scene3d/public-api/controls/model/model.cpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/controls/model/model.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/controls/model/model-impl.h>
+#include <dali-scene3d/public-api/model-components/model-node.h>
+
+namespace Dali::Scene3D
+{
+Model::Model() = default;
+
+Model::Model(const Model& model) = default;
+
+Model::Model(Model&& rhs) noexcept = default;
+
+Model& Model::operator=(const Model& model) = default;
+
+Model& Model::operator=(Model&& rhs) noexcept = default;
+
+Model::~Model() = default;
+
+Model Model::New(const std::string& modelUrl, const std::string& resourceDirectoryUrl)
+{
+  return Internal::Model::New(modelUrl, resourceDirectoryUrl);
+}
+
+Model Model::DownCast(BaseHandle handle)
+{
+  return Control::DownCast<Model, Internal::Model>(handle);
+}
+
+Model::Model(Internal::Model& implementation)
+: Control(implementation)
+{
+}
+
+Model::Model(Dali::Internal::CustomActor* internal)
+: Control(internal)
+{
+  VerifyCustomActorPointer<Internal::Model>(internal);
+}
+
+const ModelNode Model::GetModelRoot() const
+{
+  return GetImpl(*this).GetModelRoot();
+}
+
+void Model::AddModelNode(ModelNode modelNode)
+{
+  return GetImpl(*this).AddModelNode(modelNode);
+}
+
+void Model::RemoveModelNode(ModelNode modelNode)
+{
+  return GetImpl(*this).RemoveModelNode(modelNode);
+}
+
+void Model::SetChildrenSensitive(bool enable)
+{
+  GetImpl(*this).SetChildrenSensitive(enable);
+}
+
+bool Model::GetChildrenSensitive() const
+{
+  return GetImpl(*this).GetChildrenSensitive();
+}
+
+void Model::SetChildrenFocusable(bool enable)
+{
+  GetImpl(*this).SetChildrenFocusable(enable);
+}
+
+bool Model::GetChildrenFocusable() const
+{
+  return GetImpl(*this).GetChildrenFocusable();
+}
+
+void Model::SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor)
+{
+  GetImpl(*this).SetImageBasedLightSource(diffuseUrl, specularUrl, scaleFactor);
+}
+
+void Model::SetImageBasedLightScaleFactor(float scaleFactor)
+{
+  GetImpl(*this).SetImageBasedLightScaleFactor(scaleFactor);
+}
+
+float Model::GetImageBasedLightScaleFactor() const
+{
+  return GetImpl(*this).GetImageBasedLightScaleFactor();
+}
+
+uint32_t Model::GetAnimationCount() const
+{
+  return GetImpl(*this).GetAnimationCount();
+}
+
+Dali::Animation Model::GetAnimation(uint32_t index) const
+{
+  return GetImpl(*this).GetAnimation(index);
+}
+
+Dali::Animation Model::GetAnimation(const std::string& name) const
+{
+  return GetImpl(*this).GetAnimation(name);
+}
+
+uint32_t Model::GetCameraCount() const
+{
+  return GetImpl(*this).GetCameraCount();
+}
+
+Dali::CameraActor Model::GenerateCamera(uint32_t index) const
+{
+  return GetImpl(*this).GenerateCamera(index);
+}
+
+bool Model::ApplyCamera(uint32_t index, Dali::CameraActor camera) const
+{
+  return GetImpl(*this).ApplyCamera(index, camera);
+}
+
+ModelNode Model::FindChildModelNodeByName(std::string_view nodeName)
+{
+  return GetImpl(*this).FindChildModelNodeByName(nodeName);
+}
+
+void Model::RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const
+{
+  GetImpl(*this).RetrieveBlendShapeNames(blendShapeNames);
+}
+
+void Model::RetrieveModelNodesByBlendShapeName(std::string_view blendShapeName, std::vector<ModelNode>& modelNodes) const
+{
+  GetImpl(*this).RetrieveModelNodesByBlendShapeName(blendShapeName, modelNodes);
+}
+
+Dali::Animation Model::GenerateMotionDataAnimation(MotionData motionData)
+{
+  return GetImpl(*this).GenerateMotionDataAnimation(motionData);
+}
+
+void Model::SetMotionData(MotionData motionData)
+{
+  GetImpl(*this).SetMotionData(motionData);
+}
+
+void Model::CastShadow(bool castShadow)
+{
+  GetImpl(*this).CastShadow(castShadow);
+}
+
+bool Model::IsShadowCasting() const
+{
+  return GetImpl(*this).IsShadowCasting();
+}
+
+void Model::ReceiveShadow(bool receiveShadow)
+{
+  GetImpl(*this).ReceiveShadow(receiveShadow);
+}
+
+bool Model::IsShadowReceiving() const
+{
+  return GetImpl(*this).IsShadowReceiving();
+}
+
+Model::MeshHitSignalType& Model::MeshHitSignal()
+{
+  return GetImpl(*this).MeshHitSignal();
+}
+
+} // namespace Dali::Scene3D
diff --git a/dali-scene3d/public-api/controls/model/model.h b/dali-scene3d/public-api/controls/model/model.h
new file mode 100644
index 0000000..88bc524
--- /dev/null
+++ b/dali-scene3d/public-api/controls/model/model.h
@@ -0,0 +1,459 @@
+#ifndef DALI_SCENE3D_MODEL_H
+#define DALI_SCENE3D_MODEL_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <memory>
+
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/model-components/model-node.h>
+#include <dali-scene3d/public-api/model-motion/motion-data.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal DALI_INTERNAL
+{
+class Model;
+}
+
+/**
+ * @addtogroup dali_toolkit_controls_model
+ * @{
+ */
+
+/**
+ * @brief Model is a control to show 3D model objects.
+ * Model supports to load glTF 2.0 and DLI models for the input format
+ * and also supports Physically Based Rendering with Image Based Lighting.
+ *
+ * The Animations defined in the glTF or DLI models are also loaded and can be retrieved by using GetAnimation() method.
+ * The number of animation is also retrieved by GetAnimationCount() method.
+ *
+ * By default, The loaded model has its own position and size which are defined in vertex buffer regardless of the Control size.
+ *
+ * @note We support to render model well only if glsl version is higher than 300.
+ *
+ * @SINCE_2_1.41
+ * @code
+ *
+ * Model model = Model::New(modelUrl);
+ * model.SetProperty(Dali::Actor::Property::SIZE, Vector2(width, height));
+ * model.SetProperty(Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+ * model.SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+ * model.SetImageBasedLightSource(diffuseUrl, specularUrl, scaleFactor);
+ * window.Add(model);
+ * uint32_t animationCount = model.GetAnimationCount();
+ * Dali::Animation animation = model.GetAnimation(0);
+ * animation.Play();
+ *
+ * @endcode
+ */
+class DALI_SCENE3D_API Model : public Dali::Toolkit::Control
+{
+public:
+  // Typedefs
+  using MeshHitSignalType = Signal<bool(Model, Scene3D::ModelNode)>; ///< Mesh hit signal type @SINCE_2_2.53
+  using ColliderMeshPtr   = std::unique_ptr<Algorithm::NavigationMesh>;
+
+  /**
+   * @brief Create an initialized Model.
+   *
+   * @SINCE_2_1.41
+   * @param[in] modelUrl model file path.(e.g., glTF, and DLI).
+   * @param[in] resourceDirectoryUrl resource file path that includes binary, image etc.
+   * @note If modelUrl is empty, it will not load resouces. Only ModelRoot will be created.
+   * @note If resourceDirectoryUrl is empty, the parent directory path of modelUrl is used for resource path.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static Model New(const std::string& modelUrl = std::string(), const std::string& resourceDirectoryUrl = std::string());
+
+  /**
+   * @brief Creates an uninitialized Model.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_1.41
+   */
+  Model();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_1.41
+   */
+  ~Model();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_1.41
+   * @param[in] model Handle to an object
+   */
+  Model(const Model& model);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_1.41
+   * @param[in] rhs A reference to the moved handle
+   */
+  Model(Model&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_1.41
+   * @param[in] model Handle to an object
+   * @return reference to this
+   */
+  Model& operator=(const Model& model);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_1.41
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  Model& operator=(Model&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to Model.
+   *
+   * If handle points to a Model, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_1.41
+   * @param[in] handle Handle to an object
+   * @return Handle to a Model or an uninitialized handle
+   */
+  static Model DownCast(BaseHandle handle);
+
+  /**
+   * @brief Retrieves model root Node.
+   *
+   * @SINCE_2_1.41
+   * @return Root Node of the model.
+   */
+  const ModelNode GetModelRoot() const;
+
+  /**
+   * @brief Add new ModelNode to this Model.
+   * This modelNode will become child of ModelRoot.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelNode the root of ModelNode tree to be added.
+   */
+  void AddModelNode(ModelNode modelNode);
+
+  /**
+   * @brief Remove ModelNode from this Model.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelNode the root of ModelNode tree to be removed.
+   */
+  void RemoveModelNode(ModelNode modelNode);
+
+  /**
+   * @brief Whether allow this model's children actor to use events.
+   *
+   * Usually, 3D Model might have a lot of actors. And most of them don't need to check events.
+   * To optimize traversal, we need to setup some flag that this model don't allow (or allow) to traversal
+   * children so that child can use events.
+   *
+   * @SINCE_2_1.43
+   * @note Even if we set children sensitive as false, model itself's sensitive
+   * is depend on it's property.
+   * @note If we don't call this API, default is false. (Don't allow to traversal model's children during hit-test)
+   *
+   * @param[in] enable True to enable model's children can use events.
+   */
+  void SetChildrenSensitive(bool enable);
+
+  /**
+   * @brief Gets whether this Model allow model's children actor to use events or not.
+   *
+   * @SINCE_2_1.43
+   * @return bool True if this Model allow model children sensitive.
+   */
+  bool GetChildrenSensitive() const;
+
+  /**
+   * @brief Whether allow this model's children actor to be keyboard focusable.
+   *
+   * Usually, 3D Model might have a lot of actors. And most of them don't need to check focusable.
+   * To optimize traversal, we need to setup some flag that this model don't allow (or allow) to traversal
+   * children so that child can be keyboard focusable.
+   *
+   * @SINCE_2_2.2
+   * @note Even if we set children focusable as false, model itself's focusable
+   * is depend on it's property.
+   * @note If we don't call this API, default is false. (Don't allow to traversal model's children during focusable test)
+   *
+   * @param[in] enable True to enable model's children can be focusable.
+   */
+  void SetChildrenFocusable(bool enable);
+
+  /**
+   * @brief Gets whether this Model allow model's children actor to be keyboard focusable or not.
+   *
+   * @SINCE_2_2.2
+   * @return bool True if this Model allow model children are focusable.
+   */
+  bool GetChildrenFocusable() const;
+
+  /**
+   * @brief Changes Image Based Light as the input textures.
+   *
+   * @SINCE_2_1.41
+   * @param[in] diffuseUrl cube map that can be used as a diffuse IBL source.
+   * @param[in] specularUrl cube map that can be used as a specular IBL source.
+   * @param[in] scaleFactor scale factor that controls light source intensity in [0.0f, 1.0f]. Default value is 1.0f.
+   */
+  void SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor = 1.0f);
+
+  /**
+   * @brief Sets Scale Factor of Image Based Light Source.
+   *
+   * @SINCE_2_1.41
+   * @note If SetImageBasedLightSource() method is called after this method, scaleFactor is overrided.
+   *
+   * @param[in] scaleFactor scale factor that controls light source intensity in [0.0f, 1.0f].
+   */
+  void SetImageBasedLightScaleFactor(float scaleFactor);
+
+  /**
+   * @brief Gets Scale Factor of Image Based Light Source.
+   * Default value is 1.0f.
+   *
+   * @SINCE_2_1.41
+   * @return scale factor that controls light source intensity.
+   */
+  float GetImageBasedLightScaleFactor() const;
+
+  /**
+   * @brief Gets number of animations those loaded from model file.
+   *
+   * @SINCE_2_1.41
+   * @return The number of loaded animations.
+   * @note This method should be called after Model load finished.
+   */
+  uint32_t GetAnimationCount() const;
+
+  /**
+   * @brief Gets animation at the index.
+   *
+   * @SINCE_2_1.41
+   * @param[in] index Index of animation to be retrieved.
+   * @return Animation at the index.
+   * @note This method should be called after Model load finished.
+   */
+  Dali::Animation GetAnimation(uint32_t index) const;
+
+  /**
+   * @brief Retrieves animation with the given name.
+   *
+   * @SINCE_2_1.41
+   * @param[in] name string name of animation to be retrieved.
+   * @return Animation that has the given name.
+   * @note This method should be called after Model load finished.
+   */
+  Dali::Animation GetAnimation(const std::string& name) const;
+
+  /**
+   * @brief Gets number of camera parameters those loaded from model file.
+   *
+   * @SINCE_2_2.15
+   * @return The number of loaded camera parameters.
+   * @note This method should be called after Model load finished.
+   */
+  uint32_t GetCameraCount() const;
+
+  /**
+   * @brief Generate camera actor using camera parameters at the index.
+   * If camera parameter is valid, create new CameraActor.
+   * Camera parameter decide at initialized time and
+   * didn't apply model node's current position (like Animation).
+   *
+   * @SINCE_2_2.15
+   * @param[in] index Index of camera to be used for generation camera.
+   * @return Generated CameraActor by the index, or empty Handle if generation failed.
+   * @note This method should be called after Model load finished.
+   */
+  Dali::CameraActor GenerateCamera(uint32_t index) const;
+
+  /**
+   * @brief Apply camera parameters at the index to inputed camera actor.
+   * If camera parameter is valid and camera actor is not empty, apply parameters.
+   * It will change camera's transform and near / far / fov or orthographic size / aspect ratio (if defined)
+   * Camera parameter decide at initialized time and
+   * didn't apply model node's current position (like Animation).
+   *
+   * @SINCE_2_2.15
+   * @param[in] index Index of camera to be used for generation camera.
+   * @param[in,out] camera Index of camera to be used for generation camera.
+   * @return True if apply successed. False otherwise.
+   * @note This method should be called after Model load finished.
+   */
+  bool ApplyCamera(uint32_t index, Dali::CameraActor camera) const;
+
+  /**
+   * @brief Returns a child ModelNode object with a name that matches nodeName.
+   *
+   * @SINCE_2_2.34
+   * @param[in] nodeName The name of the child ModelNode object you want to find.
+   * @return Returns a child ModelNode object with a name that matches nodeName. If there is no corresponding child ModelNode object, it returns an empty ModelNode object.
+   */
+  ModelNode FindChildModelNodeByName(std::string_view nodeName);
+
+  /**
+   * @brief Retrieves the list of blendshape name that current Model hold.
+   * The name will be appended end of input list.
+   *
+   * @SINCE_2_2.34
+   * @param[in, out] blendShapeNames The name of blendShape list collected.
+   * @note This method should be called after Model load finished.
+   */
+  void RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const;
+
+  /**
+   * @brief Retrieves the list of ModelNode that contains given blend shape name.
+   * The ModelNode will be appended end of input list.
+   *
+   * @SINCE_2_2.34
+   * @param[in] blendShapeName The name of blendShape that want to collect.
+   * @param[in, out] modelNodes The ModelNode list collected.
+   * @note This method should be called after Model load finished.
+   */
+  void RetrieveModelNodesByBlendShapeName(std::string_view blendShapeName, std::vector<ModelNode>& modelNodes) const;
+
+  /**
+   * @brief Generates specific animation of this Model by inputed MotionData.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionData the data of motion animation.
+   * @return Animation that be generated by MotionData. Or empty handle if there is no valid animation generated.
+   * @note This method should be called after Model load finished.
+   */
+  Dali::Animation GenerateMotionDataAnimation(MotionData motionData);
+
+  /**
+   * @brief Sets specific values of this Model by inputed MotionData.
+   * @note If MotionValue's ValueType is ValueType::KEY_FRAMES, the last value will be set.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionData the data of motion to be set.
+   * @note This method should be called after Model load finished.
+   */
+  void SetMotionData(Scene3D::MotionData motionData);
+
+  /**
+   * @brief Sets whether this Model casts shadow or not.
+   * If it is true, this model is drawn on Shadow Map.
+   *
+   * @SINCE_2_3.99
+   * @param[in] castShadow Whether this Model casts shadow or not.
+   * @note This method affects all of the child ModelNode.
+   * However, same property of each child ModelNode can be changed respectively and it not changes parent's property.
+   */
+  void CastShadow(bool castShadow);
+
+  /**
+   * @brief Retrieves whether the Model casts shadow or not for Light.
+   *
+   * @SINCE_2_3.99
+   * @return True if this model casts shadow.
+   * @note IBL does not cast any shadow.
+   */
+  bool IsShadowCasting() const;
+
+  /**
+   * @brief Sets whether this Model receives shadow or not.
+   * If it is true, shadows are drawn on this model.
+   *
+   * @SINCE_2_3.99
+   * @param[in] receiveShadow Whether this Model receives shadow or not.
+   * @note This method affects all of the child ModelNode.
+   * However, same property of each child ModelNode can be changed respectively and it not changes parent's property.
+   */
+  void ReceiveShadow(bool receiveShadow);
+
+  /**
+   * @brief Retrieves whether the Model receives shadow or not for Light.
+   *
+   * @SINCE_2_3.99
+   * @return True if this model receives shadow.
+   */
+  bool IsShadowReceiving() const;
+
+  /**
+   * @brief This signal is emitted when the collider mesh is touched/hit.
+   *
+   * A callback of the following type may be connected:
+   * @code
+   *   bool YourCallbackName(Model model, ModelNode modelNode);
+   * @endcode
+   * Here the model is the model that is hit and the ModelNode containing the collider mesh
+   * was applied to.
+   * The return value of True, indicates that the hover event should be consumed.
+   * Otherwise the signal will be emitted on the next sensitive parent of the actor.
+   *
+   * @SINCE_2_2.53
+   * @return The signal to connect to
+   */
+  MeshHitSignalType& MeshHitSignal();
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Toolkit::Internal implementation.
+   *
+   * @param[in] implementation The Control implementation
+   */
+  DALI_INTERNAL Model(Internal::Model& implementation);
+
+  /**
+   * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
+   *
+   * @param[in] internal A pointer to the internal CustomActor
+   */
+  DALI_INTERNAL Model(Dali::Internal::CustomActor* internal);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_H
diff --git a/dali-scene3d/public-api/controls/scene-view/scene-view.cpp b/dali-scene3d/public-api/controls/scene-view/scene-view.cpp
new file mode 100644
index 0000000..8a1efb9
--- /dev/null
+++ b/dali-scene3d/public-api/controls/scene-view/scene-view.cpp
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/controls/scene-view/scene-view-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+SceneView::SceneView()
+{
+}
+
+SceneView::SceneView(const SceneView& sceneView) = default;
+
+SceneView::SceneView(SceneView&& rhs) noexcept = default;
+
+SceneView& SceneView::operator=(const SceneView& sceneView) = default;
+
+SceneView& SceneView::operator=(SceneView&& rhs) noexcept = default;
+
+SceneView::~SceneView()
+{
+}
+
+SceneView SceneView::New()
+{
+  return Internal::SceneView::New();
+}
+
+SceneView SceneView::DownCast(BaseHandle handle)
+{
+  return Control::DownCast<SceneView, Internal::SceneView>(handle);
+}
+
+SceneView::SceneView(Internal::SceneView& implementation)
+: Control(implementation)
+{
+}
+
+SceneView::SceneView(Dali::Internal::CustomActor* internal)
+: Control(internal)
+{
+  VerifyCustomActorPointer<Internal::SceneView>(internal);
+}
+
+void SceneView::AddCamera(Dali::CameraActor camera)
+{
+  GetImpl(*this).AddCamera(camera);
+}
+
+void SceneView::RemoveCamera(CameraActor camera)
+{
+  GetImpl(*this).RemoveCamera(camera);
+}
+
+uint32_t SceneView::GetCameraCount() const
+{
+  return GetImpl(*this).GetCameraCount();
+}
+
+CameraActor SceneView::GetSelectedCamera() const
+{
+  return GetImpl(*this).GetSelectedCamera();
+}
+
+CameraActor SceneView::GetCamera(uint32_t index) const
+{
+  return GetImpl(*this).GetCamera(index);
+}
+
+CameraActor SceneView::GetCamera(const std::string& name) const
+{
+  return GetImpl(*this).GetCamera(name);
+}
+
+void SceneView::SelectCamera(uint32_t index)
+{
+  GetImpl(*this).SelectCamera(index);
+}
+
+void SceneView::SelectCamera(const std::string& name)
+{
+  GetImpl(*this).SelectCamera(name);
+}
+
+void SceneView::SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor)
+{
+  GetImpl(*this).SetImageBasedLightSource(diffuseUrl, specularUrl, scaleFactor);
+}
+
+void SceneView::SetImageBasedLightScaleFactor(float scaleFactor)
+{
+  GetImpl(*this).SetImageBasedLightScaleFactor(scaleFactor);
+}
+
+float SceneView::GetImageBasedLightScaleFactor() const
+{
+  return GetImpl(*this).GetImageBasedLightScaleFactor();
+}
+
+uint32_t SceneView::GetActivatedLightCount() const
+{
+  return GetImpl(*this).GetActivatedLightCount();
+}
+
+void SceneView::UseFramebuffer(bool useFramebuffer)
+{
+  GetImpl(*this).UseFramebuffer(useFramebuffer);
+}
+
+bool SceneView::IsUsingFramebuffer() const
+{
+  return GetImpl(*this).IsUsingFramebuffer();
+}
+
+void SceneView::SetResolution(uint32_t width, uint32_t height)
+{
+  GetImpl(*this).SetResolution(width, height);
+}
+
+uint32_t SceneView::GetResolutionWidth()
+{
+  return GetImpl(*this).GetResolutionWidth();
+}
+
+uint32_t SceneView::GetResolutionHeight()
+{
+  return GetImpl(*this).GetResolutionHeight();
+}
+
+void SceneView::ResetResolution()
+{
+  GetImpl(*this).ResetResolution();
+}
+
+void SceneView::SetFramebufferMultiSamplingLevel(uint8_t multiSamplingLevel)
+{
+  GetImpl(*this).SetFramebufferMultiSamplingLevel(multiSamplingLevel);
+}
+
+uint8_t SceneView::GetFramebufferMultiSamplingLevel() const
+{
+  return GetImpl(*this).GetFramebufferMultiSamplingLevel();
+}
+
+void SceneView::SetSkybox(const std::string& skyboxUrl)
+{
+  GetImpl(*this).SetSkybox(skyboxUrl);
+}
+
+void SceneView::SetSkyboxEnvironmentMapType(Scene3D::EnvironmentMapType skyboxEnvironmentMapType)
+{
+  GetImpl(*this).SetSkyboxEnvironmentMapType(skyboxEnvironmentMapType);
+}
+
+void SceneView::SetSkyboxIntensity(float intensity)
+{
+  GetImpl(*this).SetSkyboxIntensity(intensity);
+}
+
+float SceneView::GetSkyboxIntensity() const
+{
+  return GetImpl(*this).GetSkyboxIntensity();
+}
+
+void SceneView::SetSkyboxOrientation(const Quaternion& orientation)
+{
+  GetImpl(*this).SetSkyboxOrientation(orientation);
+}
+
+Quaternion SceneView::GetSkyboxOrientation() const
+{
+  return GetImpl(*this).GetSkyboxOrientation();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/public-api/controls/scene-view/scene-view.h b/dali-scene3d/public-api/controls/scene-view/scene-view.h
new file mode 100644
index 0000000..ff3d1c2
--- /dev/null
+++ b/dali-scene3d/public-api/controls/scene-view/scene-view.h
@@ -0,0 +1,512 @@
+#ifndef DALI_SCENE3D_SCENE_VIEW_H
+#define DALI_SCENE3D_SCENE_VIEW_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/common/dali-common.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/common/environment-map.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal DALI_INTERNAL
+{
+class SceneView;
+}
+
+/**
+ * @addtogroup dali_toolkit_controls_scene_view
+ * @{
+ */
+
+/**
+ * @brief SceneView is a Dali::Toolkit::Control to show multiple 3D objects in a single 3D scene.
+ * Each SceneView has its own 3D space, and 3D objects added to SceneView are positioned in the space.
+ * SceneView has a 3D root layer internally to trigger the depth test in the rendering process.
+ * When an Actor is added to the SceneView with Add() method,
+ * the Actor and its children are actually become child of the 3D layer automatically.
+ *
+ *  SceneView
+ *      |
+ * Dali::Layer(Layer::LAYER_3D)
+ *      |
+ *    Actor
+ *
+ * The children of the 3D root layer will be rendered with the SceneView's own CameraActor.
+ *
+ * SceneView can have multiple CameraActor and one of them is used to render the multiple objects as a Scene.
+ * AddCamera(), RemoveCamera(), GetCamera(), and SelectCamera() are methods to manage CameraActors of the SceneView.
+ * Users can place multiple cameras in a scene, either to show the entire scene or to show individual objects.
+ * And the user can select the currently needed camera by using the SelectCamera() method.
+ *
+ * SceneView makes one built-in CameraActor by default.
+ * The default CameraActor has index 0 and is not removed by using RemoveCamera() method.
+ * Therefore, the minimum value returned by GetCameraCount() method is 1.
+ *
+ * If the size of SceneView is changed, Some properties of CameraActor that depend on the size can be changed too.
+ * The changing properties are as follows: projectionMode, aspectRatio, leftPlaneDistance, rightPlaneDistance, topPlaneDistance, and bottomPlaneDistance.
+ * Position, near/farPlaneDistance, and FieldOfView are maintained even if the size of the SceneView is changed.
+ * The FieldOfView of Dali::CameraActor is for vertical fov. The horizontal fov is internally updated according to the SceneView size.
+ *
+ * The same light source is set for all Models added to SceneView, if SceneView has light source.
+ * The SetImageBasedLightSource() method sets the same IBL to all Models added to the SceneView.
+ * If any Model already has an IBL, it is replaced with the SceneView's IBL.
+ *
+ * SceneView provides an option to use FBO for rendering result with UseFramebuffer() method.
+ * If it is false, SceneView is always drawn in the form of a rectangle on the default window surface directly.
+ * It improves performance, but the SceneView is always drawn on top of other 2D objects regardless of Actor tree order.
+ * And it will show wrong result in case the window's default CameraActor is transformed.
+ * So, it is recommended not to change window's CameraActor.
+ *
+ * If FBO is used, the rendering result of SceneView is drawn on the FBO and it is mapped on the plane of the SceneView.
+ * It decreases performance, but it is useful to show SceneView according to the rendering order with other Actors.
+ * And it can be used in case window's CameraActor is transformed.
+ *
+ * And since SceneView is a Control, it can be placed together with other 2D UI components in the DALi window.
+ *
+ * @note We support to render model well only if glsl version is higher than 300.
+ *
+ * @SINCE_2_1.38
+ * @code
+ *
+ * Dali::Scene3D::SceneView sceneView = Dali::Scene3D::SceneView::New();
+ * sceneView.SetProperty(Dali::Actor::Property::SIZE, Vector2(400, 400));
+ * mWindow.Add(sceneView);
+ *
+ * Dali::Scene3D::Model model = Dali::Scene3D::Model::New(...);
+ * sceneView.Add(model);
+ *
+ * CameraActor cameraActor = CameraActor::New();
+ * sceneView.AddCamera(cameraActor);
+ *
+ * @endcode
+ */
+class DALI_SCENE3D_API SceneView : public Dali::Toolkit::Control
+{
+public:
+  /**
+   * @brief The start and end property ranges for this control.
+   * @SINCE_2_3.1
+   */
+  enum PropertyRange
+  {
+    PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
+    PROPERTY_END_INDEX   = PROPERTY_START_INDEX + 1000
+  };
+
+  struct Property
+  {
+    enum
+    {
+      /**
+       * @brief URL of a masking image
+       * @details Name "alphaMaskUrl", type Property::STRING, URL of image to apply as
+       * a mask after SceneView is drawn.
+       * @note Alpha masking is only available when framebuffer is used.
+       * @note Optional.
+       */
+      ALPHA_MASK_URL = PROPERTY_START_INDEX,
+
+      /**
+       * @brief The scale factor to apply to the content image before masking
+       * @details Name "maskContentScale", type Property::FLOAT, The scale factor
+       * to apply to the content before masking. Note, scaled result is cropped to
+       * the same size as the alpha mask.
+       * @note Optional.
+       */
+      MASK_CONTENT_SCALE,
+
+      /**
+       * @brief Whether to crop rendered result to mask or scale mask to fit result
+       * @details Name "cropToMask", type Property::BOOLEAN, True if the rendered result should
+       * be cropped to match the mask size, or false if the result should remain the same size.
+       * @note Optional, Default true
+       * @note If this is false, then the mask is scaled to fit the rendered result before being applied.
+       */
+      CROP_TO_MASK,
+    };
+  };
+
+public:
+  /**
+   * @brief Create an initialized SceneView.
+   *
+   * @SINCE_2_1.38
+   * @return A handle to a newly allocated Dali resource
+   */
+  static SceneView New();
+
+  /**
+   * @brief Creates an uninitialized SceneView.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_1.38
+   */
+  SceneView();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_1.38
+   */
+  ~SceneView();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_1.38
+   * @param[in] sceneView Handle to an object
+   */
+  SceneView(const SceneView& sceneView);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_1.38
+   * @param[in] rhs A reference to the moved handle
+   */
+  SceneView(SceneView&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_1.38
+   * @param[in] sceneView Handle to an object
+   * @return reference to this
+   */
+  SceneView& operator=(const SceneView& sceneView);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_1.38
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  SceneView& operator=(SceneView&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to SceneView.
+   *
+   * If handle points to a SceneView, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_1.38
+   * @param[in] handle Handle to an object
+   * @return Handle to a SceneView or an uninitialized handle
+   */
+  static SceneView DownCast(BaseHandle handle);
+
+  /**
+   * @brief Adds a CameraActor to the SceneView
+   * The CameraActor can be used as a selected camera to render the scene by using SelectCamera(uint32_t) or SelectCamera(std::string)
+   *
+   * @SINCE_2_1.38
+   * @note
+   * AspectRatio property of CameraActor will be changed depending on the Size of this SceneView.
+   *
+   * For Perspective camera
+   * The FieldOfView of Dali::CameraActor is for vertical fov.
+   * When the size of the SceneView is changed, the vertical fov is maintained
+   * and the horizontal fov is automatically calculated according to the SceneView's aspect ratio.
+   *
+   * For Orthographic camera
+   * leftPlaneDistance, rightPlaneDistance, and bottomPlaneDistance properties are defined according to the topPlaneDistance and aspectRatio.
+   *
+   * @param[in] camera CameraActor added on this scene view.
+   */
+  void AddCamera(Dali::CameraActor camera);
+
+  /**
+   * @brief Removes a CameraActor from this SceneView.
+   *
+   * @SINCE_2_1.38
+   * @note If removed CameraActor is selected CameraActor,
+   * first camera in the list is set to selected CameraActor.
+   *
+   * @param[in] camera CameraActor to be removed from this SceneView
+   */
+  void RemoveCamera(CameraActor camera);
+
+  /**
+   * @brief Retrieves the number of cameras.
+   *
+   * @SINCE_2_1.38
+   * @return Number of cameras those currently the SceneView contains.
+   */
+  uint32_t GetCameraCount() const;
+
+  /**
+   * @brief Retrieves selected CameraActor.
+   *
+   * @SINCE_2_1.38
+   * @return CameraActor currently used in SceneView as a selected CameraActor
+   */
+  CameraActor GetSelectedCamera() const;
+
+  /**
+   * @brief Retrieves a CameraActor of the index.
+   *
+   * @SINCE_2_1.38
+   * @param[in] index Index of CameraActor to be retrieved.
+   *
+   * @return CameraActor of the index
+   */
+  CameraActor GetCamera(uint32_t index) const;
+
+  /**
+   * @brief Retrieves a CameraActor of the name.
+   *
+   * @SINCE_2_1.38
+   * @param[in] name string keyword of CameraActor to be retrieved.
+   *
+   * @return CameraActor that has the name as a Dali::Actor::Property::NAME
+   */
+  CameraActor GetCamera(const std::string& name) const;
+
+  /**
+   * @brief Makes SceneView use a CameraActor of index as a selected camera.
+   *
+   * @SINCE_2_1.38
+   * @param[in] index Index of CameraActor to be used as a selected camera.
+   */
+  void SelectCamera(uint32_t index);
+
+  /**
+   * @brief Makes SceneView use a CameraActor of a name as a selected camera.
+   *
+   * @SINCE_2_1.38
+   * @param[in] name string keyword of CameraActor to be used as a selected camera.
+   */
+  void SelectCamera(const std::string& name);
+
+  /**
+   * @brief Sets Image Based Light Source to apply it on the all Models those added on this SceneView.
+   *
+   * @SINCE_2_1.38
+   * @note If any Models already have IBL, they are batch-overridden with the SceneView's IBL.
+   * If SceneView has IBL, IBL of newly added Model is also overridden.
+   * To set indivisual IBL for each Model, the Model's IBL should be set after the SceneView's IBL.
+   *
+   * @param[in] diffuseUrl cube map that can be used as a diffuse IBL source.
+   * @param[in] specularUrl cube map that can be used as a specular IBL source.
+   * @param[in] scaleFactor scale factor that controls light source intensity in [0.0f, 1.0f]. Default value is 1.0f.
+   */
+  void SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor = 1.0f);
+
+  /**
+   * @brief Sets Scale Factor of Image Based Light Source.
+   *
+   * @SINCE_2_1.41
+   * @note If SetImageBasedLightSource() method is called after this method, scaleFactor is overriden.
+   * @note Default value is 1.0f.
+   *
+   * @param[in] scaleFactor scale factor that controls light source intensity in [0.0f, 1.0f].
+   */
+  void SetImageBasedLightScaleFactor(float scaleFactor);
+
+  /**
+   * @brief Gets Scale Factor of Image Based Light Source.
+   * Default value is 1.0f.
+   *
+   * @SINCE_2_1.41
+   * @return scale factor that controls light source intensity.
+   */
+  float GetImageBasedLightScaleFactor() const;
+
+  /**
+   * @brief Gets Enabled Light Count of this SceneView
+   *
+   * @SINCE_2_2.32
+   * @return The number of enabled light count;
+   */
+  uint32_t GetActivatedLightCount() const;
+
+  /**
+   * @brief Sets whether to use FBO or not for the SceneView.
+   * If useFramebuffer is true, rendering result of SceneView is drawn on FBO and it is mapping on this SceneView plane.
+   * If useFramebuffer is false, each item in SceneView is rendered on window directly.
+   * Default is false.
+   *
+   * @SINCE_2_1.38
+   * @note If useFramebuffer is true, it could decrease performance but entire rendering order is satisfied.
+   * If useFramebuffer is false, performance is become better but SceneView is rendered on top of the other 2D Actors regardless tree order.
+   *
+   * @param[in] useFramebuffer True to use FBO for SceneView.
+   */
+  void UseFramebuffer(bool useFramebuffer);
+
+  /**
+   * @brief Gets whether this SceneView uses Framebuffer or not.
+   *
+   * @SINCE_2_1.38
+   * @return bool True if this SceneView uses Framebuffer.
+   */
+  bool IsUsingFramebuffer() const;
+
+  /**
+   * @brief Sets SceneView's resolution manually.
+   * @note This manual resolution is only available when the SceneView uses FBO for rendering by using UseFrameBuffer(true).
+   * @note If the aspect ratio of input width/height is different with SceneView's aspect ratio, the rendered result is stretched to fill SceneView's area.
+   *
+   * @SINCE_2_3.2
+   * @param[in] width The input width.
+   * @param[in] height The input height.
+   */
+  void SetResolution(uint32_t width, uint32_t height);
+
+  /**
+   * @brief Retrieves width of resolution of the SceneView.
+   * @note If the SceneView not uses FBO, this method returns SceneView's width.
+   *
+   * @SINCE_2_3.2
+   * @return Width value of resolution of the SceneView.
+   */
+  uint32_t GetResolutionWidth();
+
+  /**
+   * @brief Retrieves height of resolution of the SceneView.
+   * @note If the SceneView not uses FBO, this method returns SceneView's height.
+   *
+   * @SINCE_2_3.2
+   * @return Height value of resolution of the SceneView.
+   */
+  uint32_t GetResolutionHeight();
+
+  /**
+   * @brief Resets SceneView's resolution to the current size of SceneView.
+   *
+   * @SINCE_2_3.2
+   */
+  void ResetResolution();
+
+  /**
+   * @brief Sets Multisampling level when we use Framebuffer.
+   * Default is 0.
+   *
+   * @SINCE_2_2.12
+   * @note Only applied if SceneView is using Framebuffer and Framebuffer Multisampling extension is supported.
+   *
+   * @param[in] multiSamplingLevel Level of multisampling if we use Framebuffer.
+   */
+  void SetFramebufferMultiSamplingLevel(uint8_t multiSamplingLevel);
+
+  /**
+   * @brief Gets Multisampling level that user set.
+   * Default is 0.
+   *
+   * @SINCE_2_2.12
+   * @note This API doesn't check whether Multisampling extension is supported or not.
+   *
+   * @return MultisamplingLevel that user set.
+   */
+  uint8_t GetFramebufferMultiSamplingLevel() const;
+
+  /**
+   * @brief Sets Skybox for this scene.
+   * Skybox texture starts to be loaded when SceneView is onScene.
+   * And Skybox texture is asynchronously loaded. When loading is finished, ResourceReady is emitted.
+   *
+   * @SINCE_2_2.0
+   * @param[in] skyboxUrl image url for skybox.
+   * @note Default SkyboxEnvironmentMapType is Cube Map. Use SetSkyboxEnvironmentMapType method to set type explicitly.
+   */
+  void SetSkybox(const std::string& skyboxUrl);
+
+  /**
+   * @brief Sets Skybox environment map type for this skybox.
+   * If skybox texture already starts to be loaded, when the type is changed, the load request is canceled and re-starts to load with new type.
+   *
+   * @SINCE_2_2.11
+   * @param[in] skyboxEnvironmentMapType The environment type of skybox (by default it is cubemap).
+   */
+  void SetSkyboxEnvironmentMapType(Scene3D::EnvironmentMapType skyboxEnvironmentMapType);
+
+  /**
+   * @brief Sets Skybox intensity.
+   * The skybox intensity is multiplied to the color of skybox texture.
+   * Default value is 1.0f.
+   *
+   * @SINCE_2_2.0
+   * @note Intensity should be positive value.
+   * @param[in] intensity Intensity value to be multiplied to the cube map color
+   */
+  void SetSkyboxIntensity(float intensity);
+
+  /**
+   * @brief Gets Skybox intensity.
+   * Default value is 1.0f.
+   *
+   * @SINCE_2_2.0
+   * @return skybox intensity
+   */
+  float GetSkyboxIntensity() const;
+
+  /**
+   * @brief Sets Orientation of Skybox.
+   *
+   * @SINCE_2_2.0
+   * @param[in] orientation Quaternion for orientation of Skybox.
+   */
+  void SetSkyboxOrientation(const Quaternion& orientation);
+
+  /**
+   * @brief Gets Skybox orientation.
+   *
+   * @SINCE_2_2.0
+   * @return skybox orientation
+   */
+  Quaternion GetSkyboxOrientation() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Toolkit::Internal implementation.
+   *
+   * @param[in] implementation The Control implementation
+   */
+  DALI_INTERNAL SceneView(Internal::SceneView& implementation);
+
+  /**
+   * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
+   *
+   * @param[in] internal A pointer to the internal CustomActor
+   */
+  DALI_INTERNAL SceneView(Dali::Internal::CustomActor* internal);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_SCENE_VIEW_H
diff --git a/dali-scene3d/public-api/file.list b/dali-scene3d/public-api/file.list
new file mode 100644
index 0000000..0c394df
--- /dev/null
+++ b/dali-scene3d/public-api/file.list
@@ -0,0 +1,50 @@
+set(scene3d_public_api_dir "${scene3d_dir}/public-api")
+
+set(scene3d_src_files ${scene3d_src_files}
+	${scene3d_public_api_dir}/algorithm/navigation-mesh.cpp
+	${scene3d_public_api_dir}/algorithm/path-finder.cpp
+	${scene3d_public_api_dir}/algorithm/path-finder-waypoint.cpp
+	${scene3d_public_api_dir}/controls/model/model.cpp
+	${scene3d_public_api_dir}/controls/scene-view/scene-view.cpp
+	${scene3d_public_api_dir}/light/light.cpp
+	${scene3d_public_api_dir}/loader/alpha-function-helper.cpp
+	${scene3d_public_api_dir}/loader/animated-property.cpp
+	${scene3d_public_api_dir}/loader/animation-definition.cpp
+	${scene3d_public_api_dir}/loader/blend-shape-details.cpp
+	${scene3d_public_api_dir}/loader/buffer-definition.cpp
+	${scene3d_public_api_dir}/loader/bvh-loader.cpp
+	${scene3d_public_api_dir}/loader/camera-parameters.cpp
+	${scene3d_public_api_dir}/loader/environment-map-data.cpp
+	${scene3d_public_api_dir}/loader/environment-map-loader.cpp
+	${scene3d_public_api_dir}/loader/customization.cpp
+	${scene3d_public_api_dir}/loader/environment-definition.cpp
+	${scene3d_public_api_dir}/loader/facial-animation-loader.cpp
+	${scene3d_public_api_dir}/loader/ktx-loader.cpp
+	${scene3d_public_api_dir}/loader/load-scene-metadata.cpp
+	${scene3d_public_api_dir}/loader/material-definition.cpp
+	${scene3d_public_api_dir}/loader/matrix-stack.cpp
+	${scene3d_public_api_dir}/loader/mesh-definition.cpp
+	${scene3d_public_api_dir}/loader/model-loader.cpp
+	${scene3d_public_api_dir}/loader/navigation-mesh-factory.cpp
+	${scene3d_public_api_dir}/loader/node-definition.cpp
+	${scene3d_public_api_dir}/loader/parse-renderer-state.cpp
+	${scene3d_public_api_dir}/loader/renderer-state.cpp
+	${scene3d_public_api_dir}/loader/resource-bundle.cpp
+	${scene3d_public_api_dir}/loader/scene-definition.cpp
+	${scene3d_public_api_dir}/loader/shader-definition.cpp
+	${scene3d_public_api_dir}/loader/shader-manager.cpp
+	${scene3d_public_api_dir}/loader/shader-option.cpp
+	${scene3d_public_api_dir}/loader/skinning-details.cpp
+	${scene3d_public_api_dir}/loader/string-callback.cpp
+	${scene3d_public_api_dir}/loader/utils.cpp
+	${scene3d_public_api_dir}/loader/view-projection.cpp
+	${scene3d_public_api_dir}/model-components/material.cpp
+	${scene3d_public_api_dir}/model-components/model-node.cpp
+	${scene3d_public_api_dir}/model-components/model-primitive.cpp
+	${scene3d_public_api_dir}/model-motion/motion-data.cpp
+	${scene3d_public_api_dir}/model-motion/motion-index/blend-shape-index.cpp
+	${scene3d_public_api_dir}/model-motion/motion-index/motion-index.cpp
+	${scene3d_public_api_dir}/model-motion/motion-index/motion-property-index.cpp
+	${scene3d_public_api_dir}/model-motion/motion-index/motion-transform-index.cpp
+	${scene3d_public_api_dir}/model-motion/motion-value.cpp
+)
\ No newline at end of file
diff --git a/dali-scene3d/public-api/light/light.cpp b/dali-scene3d/public-api/light/light.cpp
new file mode 100644
index 0000000..0086c1f
--- /dev/null
+++ b/dali-scene3d/public-api/light/light.cpp
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/light/light.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/light/light-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+Light::Light()
+{
+}
+
+Light::Light(const Light& light) = default;
+
+Light::Light(Light&& rhs) noexcept = default;
+
+Light& Light::operator=(const Light& light) = default;
+
+Light& Light::operator=(Light&& rhs) noexcept = default;
+
+Light::~Light()
+{
+}
+
+Light Light::New()
+{
+  return Internal::Light::New();
+}
+
+Light Light::DownCast(BaseHandle handle)
+{
+  Light result;
+
+  CustomActor custom = Dali::CustomActor::DownCast(handle);
+  if(custom)
+  {
+    CustomActorImpl& customImpl = custom.GetImplementation();
+
+    Internal::Light* impl = dynamic_cast<Internal::Light*>(&customImpl);
+
+    if(impl)
+    {
+      result = Light(customImpl.GetOwner());
+    }
+  }
+
+  return result;
+}
+
+void Light::Enable(bool enable)
+{
+  Internal::GetImplementation(*this).Enable(enable);
+}
+
+bool Light::IsEnabled() const
+{
+  return Internal::GetImplementation(*this).IsEnabled();
+}
+
+uint32_t Light::GetMaximumEnabledLightCount()
+{
+  return Internal::Light::GetMaximumEnabledLightCount();
+}
+
+void Light::EnableShadow(bool enable)
+{
+  Internal::GetImplementation(*this).EnableShadow(enable);
+}
+
+bool Light::IsShadowEnabled() const
+{
+  return Internal::GetImplementation(*this).IsShadowEnabled();
+}
+
+void Light::EnableShadowSoftFiltering(bool useSoftFiltering)
+{
+  Internal::GetImplementation(*this).EnableShadowSoftFiltering(useSoftFiltering);
+}
+
+bool Light::IsShadowSoftFilteringEnabled() const
+{
+  return Internal::GetImplementation(*this).IsShadowSoftFilteringEnabled();
+}
+
+void Light::SetShadowIntensity(float shadowIntensity)
+{
+  Internal::GetImplementation(*this).SetShadowIntensity(shadowIntensity);
+}
+
+float Light::GetShadowIntensity() const
+{
+  return Internal::GetImplementation(*this).GetShadowIntensity();
+}
+
+void Light::SetShadowBias(float shadowBias)
+{
+  Internal::GetImplementation(*this).SetShadowBias(shadowBias);
+}
+
+float Light::GetShadowBias() const
+{
+  return Internal::GetImplementation(*this).GetShadowBias();
+}
+
+Light::Light(Internal::Light& implementation)
+: Control(implementation)
+{
+}
+
+Light::Light(Dali::Internal::CustomActor* internal)
+: Control(internal)
+{
+  // Can have a NULL pointer so we only need to check if the internal implementation is our class
+  // when there is a value.
+  if(internal)
+  {
+    DALI_ASSERT_DEBUG(dynamic_cast<Internal::Light*>(&CustomActor(internal).GetImplementation()));
+  }
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/public-api/light/light.h b/dali-scene3d/public-api/light/light.h
new file mode 100644
index 0000000..3d8d763
--- /dev/null
+++ b/dali-scene3d/public-api/light/light.h
@@ -0,0 +1,260 @@
+#ifndef DALI_SCENE3D_LIGHT_H
+#define DALI_SCENE3D_LIGHT_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali/public-api/common/dali-common.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Internal DALI_INTERNAL
+{
+class Light;
+}
+
+/**
+ * @addtogroup dali_toolkit_controls_light
+ * @{
+ */
+
+/**
+ * @brief This class is to define 3D Light source.
+ * Currently this Light class supports Directional Light that lits every position from the same direction. (e.g, Sun light)
+ * If a Light object is added on SceneView, the 3D objects in the SceneView are shined the Light.
+ * DALi Scene3D limits the maximum enabled light count per each SceneView.
+ * Currently the maximum number is set to 5, and it can be retrieved by using GetMaximumEnabledLightCount().
+ * If more than 5 enabled Light objects are added on SceneView, SceneView turns on only 5 lights in the order the lights were added.
+ * This Light can be added to SceneView directly but also it can be added on other Actor.
+ * When a parent actor is added to a SceneView, its Light behaves in the SceneView the same as if it were added directly to the SceneView.
+ * @note Light inherits Actor, so Light color and direction can be controlled by setting Actor's COLOR and ORIENTATION Property.
+ * Dali::DevelActor::LookAt() method can be used to set light direction easily.
+ * @note Default light direction is to Z-axis
+ * @code
+ * Scene3D::SceneView sceneView = Scene3D::SceneView::New();
+ * Scene3D::Lightlight = Scene3D::Light::New();
+ * light.SetProperty(Dali::Actor::Property::COLOR, Color::BROWN);
+ * Dali::DevelActor::LookAt(light, Vector3(1.0f, 1.0f, 1.0f));
+ * sceneView.Add(light);
+ * @endcode
+ * @SINCE_2_2.32
+ */
+class DALI_SCENE3D_API Light : public Dali::Toolkit::Control
+{
+public:
+  /**
+   * @brief Create an initialized Light.
+   *
+   * @SINCE_2_2.32
+   * @return A handle to a newly allocated Dali resource
+   */
+  static Light New();
+
+  /**
+   * @brief Creates an uninitialized Light.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.32
+   */
+  Light();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.32
+   */
+  ~Light();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.32
+   * @param[in] light Handle to an object
+   */
+  Light(const Light& light);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.32
+   * @param[in] rhs A reference to the moved handle
+   */
+  Light(Light&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.32
+   * @param[in] light Handle to an object
+   * @return reference to this
+   */
+  Light& operator=(const Light& light);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.32
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  Light& operator=(Light&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to Light.
+   *
+   * If handle points to a Light, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.32
+   * @param[in] handle Handle to an object
+   * @return Handle to a Light or an uninitialized handle
+   */
+  static Light DownCast(BaseHandle handle);
+
+  /**
+   * @brief Enables this light.
+   * The Light is turned on when the Light object is added on SceneView and enabled.
+   * @SINCE_2_2.32
+   * @note SceneView can turn on only up to maximum enabled light count that can be retrieved by GetMaximumEnabledLightCount().
+   * @param[in] enable True to make this Light enable.
+   */
+  void Enable(bool enable);
+
+  /**
+   * @brief Checks whether this light is enabled or not.
+   * @SINCE_2_2.32
+   * @return True if this light is enabled.
+   */
+  bool IsEnabled() const;
+
+  /**
+   * @brief Retrieves maximum enabled light count.
+   * @SINCE_2_2.32
+   * @return The number of maximum enabled light count.
+   */
+  static uint32_t GetMaximumEnabledLightCount();
+
+  /**
+   * @brief Enables shadow for this light.
+   * Dali::Scene3D generates shadow by using shadow map.
+   * For the Directional Light, the shadow map is created to cover view frustum of current selected camera.
+   * This means that if the distance between the near and far planes is too large,
+   * the shadow map has to cover an unnecessarily large area. This results in lower shadow quality.
+   * @SINCE_2_2.43
+   * @note This light should be already turned on in the SceneView.
+   * @note (When enable is true) If there is previous light already enabled shadow in the SceneView, this function call is ignored.
+   * @note (When enable is false, and this light is currently used for shader)
+   * If there are other lights those are turned on and shadow enabled, one of the light will be used for shadow automatically.
+   * @param[in] enable True to make this Light's shadow enable.
+   */
+  void EnableShadow(bool enable);
+
+  /**
+   * @brief Checks whether the shadow of this light is enabled or not.
+   * @SINCE_2_2.43
+   * @return True if the shadow of this light is enabled.
+   */
+  bool IsShadowEnabled() const;
+
+  /**
+   * @brief Enables filtering to soften the edge of shadow.
+   * Basically the shadow is hard shadow that has sharp edge.
+   * This method enables soft filtering to make the sharp edge to smoothing.
+   * @SINCE_2_2.43
+   * @note This soft filtering requires expensive computation power.
+   * @param[in] useSoftFiltering True to soften the shadow edge.
+   */
+  void EnableShadowSoftFiltering(bool useSoftFiltering);
+
+  /**
+   * @brief Checks whether the shadow uses soft filtering.
+   * @SINCE_2_2.43
+   * @return True if the shadow edge is soften.
+   */
+  bool IsShadowSoftFilteringEnabled() const;
+
+  /**
+   * @brief Sets shadow intensity.
+   * If the intensity is larger, the shadow area will be darker.
+   * The intensity value is between [0, 1].
+   * Default value is 0.5
+   * @SINCE_2_2.43
+   * @param[in] shadowIntensity Shadow intensity value
+   */
+  void SetShadowIntensity(float shadowIntensity);
+
+  /**
+   * @brief Retrieve shadow intensity.
+   * @SINCE_2_2.43
+   * @return Current shadow intensity value.
+   */
+  float GetShadowIntensity() const;
+
+  /**
+   * @brief Sets shadow bias.
+   * Shadow bias is an offset value to remove shadow acne that is a visual artifact can be shown on the Shadow
+   * Default value is 0.001
+   * @SINCE_2_2.43
+   * @param[in] shadowBias bias value to remove shadow acne.
+   * @note If the shadow bias is too large, the object will appear detached from the shadow.
+   */
+  void SetShadowBias(float shadowBias);
+
+  /**
+   * @brief Retrieves shadow bias value.
+   * @SINCE_2_2.43
+   * @return Shadow bias value.
+   */
+  float GetShadowBias() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Toolkit::Internal implementation.
+   *
+   * @param[in] implementation The Control implementation
+   */
+  DALI_INTERNAL Light(Internal::Light& implementation);
+
+  /**
+   * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
+   *
+   * @param[in] internal A pointer to the internal CustomActor
+   */
+  DALI_INTERNAL Light(Dali::Internal::CustomActor* internal);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_LIGHT_H
diff --git a/dali-scene3d/public-api/loader/alpha-function-helper.cpp b/dali-scene3d/public-api/loader/alpha-function-helper.cpp
new file mode 100644
index 0000000..9c82704
--- /dev/null
+++ b/dali-scene3d/public-api/loader/alpha-function-helper.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/alpha-function-helper.h>
+
+// EXTERNAL INCLUDES
+#include <unordered_map>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+// clang-format off
+#define DALI_ALPHA_FUNCTION_ENTRY(x) { #x, AlphaFunction::x }
+// clang-format on
+
+std::unordered_map<std::string, AlphaFunction>& GetFunctions()
+{
+  static std::unordered_map<std::string, AlphaFunction> sFunctions{
+    DALI_ALPHA_FUNCTION_ENTRY(DEFAULT),
+    DALI_ALPHA_FUNCTION_ENTRY(LINEAR),
+    DALI_ALPHA_FUNCTION_ENTRY(REVERSE),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_SQUARE),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT_SQUARE),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_IN),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_OUT),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_SINE),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT_SINE),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_IN_OUT_SINE),
+    DALI_ALPHA_FUNCTION_ENTRY(BOUNCE),
+    DALI_ALPHA_FUNCTION_ENTRY(SIN),
+    DALI_ALPHA_FUNCTION_ENTRY(EASE_OUT_BACK),
+  };
+  return sFunctions;
+}
+
+#undef DALI_ALPHA_FUNCTION_ENTRY
+
+} // namespace
+
+AlphaFunction GetAlphaFunction(const std::string& name, bool* found)
+{
+  auto iFind   = GetFunctions().find(name);
+  bool success = iFind != GetFunctions().end();
+  if(found)
+  {
+    *found = success;
+  }
+  return success ? iFind->second : AlphaFunction(AlphaFunction::DEFAULT);
+}
+
+void RegisterAlphaFunction(const std::string& name, AlphaFunction alphaFn)
+{
+  DALI_ASSERT_ALWAYS(GetFunctions().insert({name, alphaFn}).second &&
+                     "Function with given key already exists.");
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/alpha-function-helper.h b/dali-scene3d/public-api/loader/alpha-function-helper.h
new file mode 100644
index 0000000..a3235f3
--- /dev/null
+++ b/dali-scene3d/public-api/loader/alpha-function-helper.h
@@ -0,0 +1,46 @@
+#ifndef DALI_SCENE3D_LOADER_ALPHA_FUNCTION_HELPER_H_
+#define DALI_SCENE3D_LOADER_ALPHA_FUNCTION_HELPER_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/alpha-function.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Given a name, provides an AlphaFunction.
+ * @SINCE_2_0.7
+ * @return The AlphaFunction
+ * @note If the name was not recognised, the default one is returned
+ */
+AlphaFunction DALI_SCENE3D_API GetAlphaFunction(const std::string& name, bool* found = nullptr);
+
+/**
+ * @brief Registers an alpha function only if one with the same @a name has not yet been registered.
+ * @SINCE_2_0.7
+ * @note Throws an exception if the name is not unique
+ */
+void DALI_SCENE3D_API RegisterAlphaFunction(const std::string& name, AlphaFunction alphaFn) noexcept(false);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_ALPHA_FUNCTION_HELPER_H_
diff --git a/dali-scene3d/public-api/loader/animated-property.cpp b/dali-scene3d/public-api/loader/animated-property.cpp
new file mode 100644
index 0000000..e357516
--- /dev/null
+++ b/dali-scene3d/public-api/loader/animated-property.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/animated-property.h>
+
+namespace Dali::Scene3D::Loader
+{
+void AnimatedProperty::Animate(Animation& anim, GetActor getActor) const
+{
+  if(Actor actor = getActor(*this))
+  {
+    Property prop = GetProperty(actor);
+    if(prop.propertyIndex != Property::INVALID_INDEX)
+    {
+      if(mKeyFrames)
+      {
+        anim.AnimateBetween(prop, mKeyFrames, mAlphaFunction, mTimePeriod);
+      }
+      else if(mValue)
+      {
+        if(mValue->mIsRelative)
+        {
+          anim.AnimateBy(prop, mValue->mValue, mAlphaFunction, mTimePeriod);
+        }
+        else
+        {
+          anim.AnimateTo(prop, mValue->mValue, mAlphaFunction, mTimePeriod);
+        }
+      }
+    }
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
\ No newline at end of file
diff --git a/dali-scene3d/public-api/loader/animated-property.h b/dali-scene3d/public-api/loader/animated-property.h
new file mode 100644
index 0000000..1ba4ad2
--- /dev/null
+++ b/dali-scene3d/public-api/loader/animated-property.h
@@ -0,0 +1,101 @@
+#ifndef DALI_SCENE3D_LOADER_ANIMATED_PROPERTY_H
+#define DALI_SCENE3D_LOADER_ANIMATED_PROPERTY_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/property.h>
+#include <functional>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/index.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Intermediate representation for a property that's given to a Animation to animate.
+ *
+ * Since there is no getting an animated property back from the Animation (i.e. past AnimateBetween/By/To()),
+ * changing properties (e.g. from the SDK) requires the whole Animation object to be recreated with all of
+ * its properties (incl. modifications).
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API AnimatedProperty
+{
+public: // METHODS
+  /**
+   * @brief Function to obtain an Actor based on its property. Its processing will ignore empty handles returned by it.
+   * @SINCE_2_0.7
+   */
+  using GetActor = std::function<Actor(const AnimatedProperty&)>;
+
+  /**
+   * @brief Get the property object of the given actor.
+   * @SINCE_2_0.7
+   * @return The Property object (of the given @a actor) whose value is being animated.
+   */
+  Property GetProperty(Actor& actor) const
+  {
+    auto idx = actor.GetPropertyIndex(mPropertyName);
+    return Property(actor, idx);
+  }
+
+  /**
+   * @brief The type of the Property (of the given @a actor) that is being animated.
+   * @SINCE_2_0.7
+   */
+  Property::Type GetPropertyType(Actor& actor) const
+  {
+    auto idx = actor.GetPropertyIndex(mPropertyName);
+    return actor.GetPropertyType(idx);
+  }
+
+  /**
+   * @brief Registers the animation of this property against the given @a anim.
+   *
+   * @a getActor will be used to obtain the Actor named by this property.
+   * Failing to find the actor purely means that this property will not be
+   * animated.
+   * @SINCE_2_0.7
+   */
+  void Animate(Animation& anim, GetActor getActor) const;
+
+public: // DATA
+  struct Value
+  {
+    Property::Value mValue;
+    bool            mIsRelative;
+  };
+
+  Index       mNodeIndex = INVALID_INDEX;
+  std::string mNodeName;
+  std::string mPropertyName;
+
+  KeyFrames              mKeyFrames;
+  std::unique_ptr<Value> mValue;
+
+  AlphaFunction mAlphaFunction = AlphaFunction::DEFAULT;
+  TimePeriod    mTimePeriod    = TimePeriod(0.f);
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_ANIMATED_PROPERTY_H
diff --git a/dali-scene3d/public-api/loader/animation-definition.cpp b/dali-scene3d/public-api/loader/animation-definition.cpp
new file mode 100644
index 0000000..d9ee5dd
--- /dev/null
+++ b/dali-scene3d/public-api/loader/animation-definition.cpp
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+
+namespace Dali::Scene3D::Loader
+{
+const float AnimationDefinition::DEFAULT_DURATION_SECONDS = 1.f;
+const float AnimationDefinition::MIN_DURATION_SECONDS     = 1e-2f;
+
+Animation::EndAction AnimationDefinition::StopForModification(Animation& anim)
+{
+  const auto endAction = anim.GetEndAction();
+  anim.SetEndAction(Animation::DISCARD);
+  anim.Stop();
+  return endAction;
+}
+
+AnimationDefinition::AnimationDefinition() = default;
+
+AnimationDefinition::AnimationDefinition(AnimationDefinition&& other)
+: mName(std::move(other.mName)),
+  mDuration(other.mDuration),
+  mLoopCount(other.mLoopCount),
+  mDisconnectAction(other.mDisconnectAction),
+  mEndAction(other.mEndAction),
+  mSpeedFactor(other.mSpeedFactor),
+  mPlayRange(other.mPlayRange),
+  mProperties(std::move(other.mProperties))
+{
+}
+
+AnimationDefinition& AnimationDefinition::operator=(AnimationDefinition&& other)
+{
+  AnimationDefinition tmp(std::move(other));
+  mName             = std::move(tmp.mName);
+  mDuration         = tmp.mDuration;
+  mLoopCount        = tmp.mLoopCount;
+  mDisconnectAction = tmp.mDisconnectAction;
+  mEndAction        = tmp.mEndAction;
+  mSpeedFactor      = tmp.mSpeedFactor;
+  mPlayRange        = tmp.mPlayRange;
+  mProperties.swap(tmp.mProperties);
+  return *this;
+}
+
+void AnimationDefinition::Animate(Animation& animation, AnimatedProperty::GetActor getActor)
+{
+  DALI_ASSERT_ALWAYS(animation);
+  for(auto& property : mProperties)
+  {
+    property.Animate(animation, getActor);
+  }
+}
+
+Animation AnimationDefinition::ReAnimate(AnimatedProperty::GetActor getActor)
+{
+  // Create and configure new animation.
+  Animation animation = Animation::New(mDuration);
+  animation.SetLoopCount(mLoopCount);
+  animation.SetDisconnectAction(mDisconnectAction);
+  animation.SetEndAction(mEndAction);
+
+  animation.SetSpeedFactor(mSpeedFactor);
+  animation.SetPlayRange(mPlayRange);
+
+  Animate(animation, getActor);
+  return animation;
+}
+
+void AnimationDefinition::SetName(const std::string& name)
+{
+  mName = name;
+}
+
+const std::string& AnimationDefinition::GetName() const
+{
+  return mName;
+}
+
+void AnimationDefinition::SetDuration(float duration)
+{
+  mDuration = duration;
+}
+
+float AnimationDefinition::GetDuration() const
+{
+  return mDuration;
+}
+
+void AnimationDefinition::SetLoopCount(int32_t loopCount)
+{
+  mLoopCount = loopCount;
+}
+
+int AnimationDefinition::GetLoopCount() const
+{
+  return mLoopCount;
+}
+
+void AnimationDefinition::SetDisconnectAction(Animation::EndAction disconnectAction)
+{
+  mDisconnectAction = disconnectAction;
+}
+
+Animation::EndAction AnimationDefinition::GetDisconnectAction() const
+{
+  return mDisconnectAction;
+}
+
+void AnimationDefinition::SetEndAction(Animation::EndAction endAction)
+{
+  mEndAction = endAction;
+}
+
+Animation::EndAction AnimationDefinition::GetEndAction() const
+{
+  return mEndAction;
+}
+
+void AnimationDefinition::SetSpeedFactor(float speedFactor)
+{
+  mSpeedFactor = speedFactor;
+}
+
+float AnimationDefinition::GetSpeedFactor() const
+{
+  return mSpeedFactor;
+}
+
+void AnimationDefinition::SetPlayRange(const Vector2& playRange)
+{
+  mPlayRange = playRange;
+}
+
+Vector2 AnimationDefinition::GetPlayRange() const
+{
+  return mPlayRange;
+}
+
+void AnimationDefinition::ReserveSize(uint32_t size)
+{
+  mProperties.reserve(size);
+}
+
+uint32_t AnimationDefinition::GetPropertyCount() const
+{
+  return static_cast<uint32_t>(mProperties.size());
+}
+
+void AnimationDefinition::SetProperty(uint32_t index, AnimatedProperty&& property)
+{
+  if(mProperties.size() <= index)
+  {
+    mProperties.resize(index + 1);
+  }
+  mProperties[index] = std::move(property);
+}
+
+AnimatedProperty& AnimationDefinition::GetPropertyAt(uint32_t index)
+{
+  return mProperties[index];
+}
+
+const AnimatedProperty& AnimationDefinition::GetPropertyAt(uint32_t index) const
+{
+  return mProperties[index];
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/animation-definition.h b/dali-scene3d/public-api/loader/animation-definition.h
new file mode 100644
index 0000000..78e59a1
--- /dev/null
+++ b/dali-scene3d/public-api/loader/animation-definition.h
@@ -0,0 +1,246 @@
+#ifndef DALI_SCENE3D_LOADER_ANIMATION_DEFINITION_H
+#define DALI_SCENE3D_LOADER_ANIMATION_DEFINITION_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/animated-property.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Animation handle + name + definition of properties.
+ * @SINCE_2_0.7
+ */
+class DALI_SCENE3D_API AnimationDefinition
+{
+public: // STATIC
+  // For Animations created in the SDK.
+  static const float DEFAULT_DURATION_SECONDS;
+
+  // For parsing Animations from dli, when duration was not defined.
+  static const float MIN_DURATION_SECONDS;
+
+  /**
+   * @brief Saves the original end action of @a anim, sets the end action to Discard, then stops
+   * the animation and returns the end action.
+   * @SINCE_2_0.7
+   */
+  static Animation::EndAction StopForModification(Animation& anim);
+
+public: // METHODS
+  AnimationDefinition();
+
+  AnimationDefinition(AnimationDefinition&& other);
+
+  AnimationDefinition& operator=(AnimationDefinition&& other);
+
+  /**
+   * @brief Registers the properties against the given @a animation.
+   *
+   * @a getActor will be used to obtain the Actors for each AnimatedProperty.
+   * @SINCE_2_0.7
+   */
+  void Animate(Animation& animation, AnimatedProperty::GetActor getActor);
+
+  /**
+   * @brief Creates a new Animation and Animates() its properties.
+   *
+   * @a getActor will be used to obtain the Actors for each AnimatedProperty.
+   * @SINCE_2_0.7
+   */
+  Animation ReAnimate(AnimatedProperty::GetActor getActor);
+
+  /**
+   * @brief Set the name of the animation.
+   *
+   * @SINCE_2_2.22
+   * @param[in] name The name of the animation.
+   */
+  void SetName(const std::string& name);
+
+  /**
+   * @brief Get the name of the animation.
+   *
+   * @SINCE_2_2.22
+   * @return The name of the animation.
+   */
+  const std::string& GetName() const;
+
+  /**
+   * @brief Set the duration of the animation in seconds.
+   *
+   * @SINCE_2_2.22
+   * @param[in] duration The duration of the animation in seconds.
+   */
+  void SetDuration(float duration);
+
+  /**
+   * @brief Get the duration of the animation in seconds.
+   *
+   * @SINCE_2_2.22
+   * @return The duration of the animation in seconds.
+   */
+  float GetDuration() const;
+
+  /**
+   * @brief Set the number of times to loop the animation.
+   *
+   * @SINCE_2_2.22
+   * @param[in] loopCount The number of times to loop the animation. Use -1 for infinite looping.
+   */
+  void SetLoopCount(int32_t loopCount);
+
+  /**
+   * @brief Get the number of times to loop the animation.
+   *
+   * @SINCE_2_2.22
+   * @return The number of times to loop the animation. Use -1 for infinite looping.
+   */
+  int GetLoopCount() const;
+
+  /**
+   * @brief Set what should happen when an animation is disconnected from an object.
+   *
+   * @SINCE_2_2.22
+   * @param[in] disconnectAction What should happen when an animation is disconnected from an object.
+   */
+  void SetDisconnectAction(Animation::EndAction disconnectAction);
+
+  /**
+   * @brief Get what should happen when an animation is disconnected from an object.
+   *
+   * @SINCE_2_2.22
+   * @return What should happen when an animation is disconnected from an object.
+   */
+  Animation::EndAction GetDisconnectAction() const;
+
+  /**
+   * @brief Set what should happen when an animation reaches its end.
+   *
+   * @SINCE_2_2.22
+   * @param[in] endAction What should happen when an animation reaches its end.
+   */
+  void SetEndAction(Animation::EndAction endAction);
+
+  /**
+   * @brief Get what should happen when an animation reaches its end.
+   *
+   * @SINCE_2_2.22
+   * @return What should happen when an animation reaches its end.
+   */
+  Animation::EndAction GetEndAction() const;
+
+  /**
+   * @brief Set a speed factor for this animation. This can be used to speed up or slow down playback of this animation relative to other animations in a scene.
+   *
+   * @SINCE_2_2.22
+   * @param[in] speedFactor The speed factor for this animation. 1.0 is normal speed, 2.0 is double speed, 0.5 is half speed, etc.
+   */
+  void SetSpeedFactor(float speedFactor);
+
+  /**
+   * @brief Get a speed factor for this animation. This can be used to speed up or slow down playback of this animation relative to other animations in a scene.
+   *
+   * @SINCE_2_2.22
+   * @return The speed factor for this animation. 1.0 is normal speed, 2.0 is double speed, 0.5 is half speed, etc.
+   */
+  float GetSpeedFactor() const;
+
+  /**
+   * @brief Set a range within which to play this animation. This can be used to play only part of an animation or to play it backwards by setting playRange.y < playRange.x
+   *
+   * @SINCE_2_2.22
+   * @param[in] playRange A range within which to play this animation. x = start time in seconds, y = end time in seconds
+   */
+  void SetPlayRange(const Vector2& playRange);
+
+  /**
+   * @brief Get a range within which to play this animation. This can be used to play only part of an animation or to play it backwards by setting playRange.y < playRange.x
+   *
+   * @SINCE_2_2.22
+   * @return A range within which to play this animation. x = start time in seconds, y = end time in seconds
+   */
+  Vector2 GetPlayRange() const;
+
+  /**
+   * @brief Reserves Animated property vector's size
+   *
+   * @SINCE_2_2.22
+   * @param[in] size The size to reserve property
+   */
+  void ReserveSize(uint32_t size);
+
+  /**
+   * @brief Retrieves the number of animated properties' count
+   *
+   * @SINCE_2_2.22
+   * @return The count of animated properties.
+   */
+  uint32_t GetPropertyCount() const;
+
+  /**
+   * @brief Add a property that will be animated by this AnimationDefinition
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The index the property will be stored.
+   * @param[in] property The property that will be animated by this AnimationDefinition
+   */
+  void SetProperty(uint32_t index, AnimatedProperty&& property);
+
+  /**
+   * @brief Retrieves animated property at the index
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The index of property to be retrieved.
+   */
+  AnimatedProperty& GetPropertyAt(uint32_t index);
+
+  /**
+   * @brief Retrieves animated property at the index
+   *
+   * @SINCE_2_2.34
+   * @param[in] index The index of property to be retrieved.
+   */
+  const AnimatedProperty& GetPropertyAt(uint32_t index) const;
+
+private: // DATA
+  std::string mName;
+
+  float                mDuration         = DEFAULT_DURATION_SECONDS;
+  int32_t              mLoopCount        = 1;
+  Animation::EndAction mDisconnectAction = Animation::BAKE_FINAL;
+  Animation::EndAction mEndAction        = Animation::BAKE;
+  float                mSpeedFactor      = 1.f;
+  Vector2              mPlayRange        = Vector2{0.f, 1.f};
+
+  std::vector<AnimatedProperty> mProperties;
+};
+
+struct AnimationGroupDefinition
+{
+  std::string              mName;
+  std::vector<std::string> mAnimations;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_ANIMATION_DEFINITION_H
diff --git a/dali-scene3d/public-api/loader/blend-shape-details.cpp b/dali-scene3d/public-api/loader/blend-shape-details.cpp
new file mode 100644
index 0000000..7c947f8
--- /dev/null
+++ b/dali-scene3d/public-api/loader/blend-shape-details.cpp
@@ -0,0 +1,82 @@
+
+/*
+* Copyright (c) 2023 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/property.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+
+namespace Dali::Scene3D::Loader
+{
+const char* BlendShapes::NUMBER_OF_BLEND_SHAPES("uNumberOfBlendShapes");
+const char* BlendShapes::UNNORMALIZE_FACTOR("uBlendShapeUnnormalizeFactor");
+const char* BlendShapes::COMPONENT_SIZE("uBlendShapeComponentSize");
+
+const char* BlendShapes::COMPONENTS("blendShapeComponents");
+
+const char* BlendShapes::WEIGHTS_UNIFORM("uBlendShapeWeight");
+
+void BlendShapes::ConfigureProperties(const BlendShapeData& data, Renderer renderer)
+{
+  uint32_t index = 0u;
+
+  char        weightNameBuffer[32];
+  char        unnormalizeFactorNameBuffer[64];
+  char* const pWeightName = weightNameBuffer + snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s", WEIGHTS_UNIFORM);
+  char* const pFactorName = unnormalizeFactorNameBuffer + snprintf(unnormalizeFactorNameBuffer, sizeof(unnormalizeFactorNameBuffer), "%s", UNNORMALIZE_FACTOR);
+  for(const auto& weight : data.weights)
+  {
+    snprintf(pWeightName, sizeof(weightNameBuffer) - (pWeightName - weightNameBuffer), "[%d]", index);
+    std::string weightName{weightNameBuffer};
+    Dali::Actor actor = data.mActor.GetHandle();
+    if(actor)
+    {
+      actor.RegisterProperty(weightName, weight);
+    }
+
+    if(renderer && data.version == Version::VERSION_1_0)
+    {
+      snprintf(pFactorName, sizeof(unnormalizeFactorNameBuffer) - (pFactorName - unnormalizeFactorNameBuffer), "[%d]", index);
+      std::string factorName{unnormalizeFactorNameBuffer};
+      renderer.RegisterProperty(factorName, data.unnormalizeFactors[index]);
+    }
+
+    ++index;
+  }
+
+  if(renderer)
+  {
+    if(Version::VERSION_2_0 == data.version)
+    {
+      renderer.RegisterProperty(UNNORMALIZE_FACTOR, data.unnormalizeFactors[0u]);
+    }
+
+    renderer.RegisterProperty(NUMBER_OF_BLEND_SHAPES, Property::Value(static_cast<int32_t>(index)));
+    renderer.RegisterProperty(COMPONENT_SIZE, Property::Value(static_cast<int32_t>(data.bufferOffset)));
+
+    // Create a read only property to preserve the components of the blend shape.
+    renderer.RegisterProperty(COMPONENTS, data.components, Property::AccessMode::READ_ONLY);
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/blend-shape-details.h b/dali-scene3d/public-api/loader/blend-shape-details.h
new file mode 100644
index 0000000..7788532
--- /dev/null
+++ b/dali-scene3d/public-api/loader/blend-shape-details.h
@@ -0,0 +1,92 @@
+#ifndef DALI_SCENE3D_LOADER_BLEND_SHAPE_DETAILS_H
+#define DALI_SCENE3D_LOADER_BLEND_SHAPE_DETAILS_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/object/weak-handle.h>
+#include <dali/public-api/rendering/shader.h>
+#include <limits> ///< for std::numeric_limits
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+struct MeshDefinition;
+struct MeshGeometry;
+
+struct DALI_SCENE3D_API BlendShapes
+{
+  using Index                          = uint32_t;
+  static constexpr Index INVALID_INDEX = std::numeric_limits<Index>::max();
+
+  enum class Version
+  {
+    VERSION_1_0,
+    VERSION_2_0,
+    INVALID
+  };
+
+  struct Component
+  {
+    enum
+    {
+      POSITIONS = 0x1,
+      NORMALS   = 0x2,
+      TANGENTS  = 0x4
+    };
+  };
+
+  struct BlendShapeData
+  {
+    std::vector<std::string> names;
+    std::vector<float>       weights;
+    std::vector<float>       unnormalizeFactors;
+    Version                  version{Scene3D::Loader::BlendShapes::Version::INVALID};
+    uint32_t                 bufferOffset{0};
+    int32_t                  components{0x0};
+    Dali::WeakHandle<Actor>  mActor;
+  };
+
+  // shader properties - animatable (uniforms)
+  static const char* NUMBER_OF_BLEND_SHAPES; ///< Integer number of blend shapes loaded.
+  static const char* UNNORMALIZE_FACTOR;     ///< Scalar(s) for position components of blend shapes; Version 1.0: float array (1 per blend shape); Version 2.0: single float.
+  static const char* COMPONENT_SIZE;         ///< Integer offset from one component (positions / normals / tangents) of a blend shape to the next.
+
+  // shader properties - read-only (not available as uniforms)
+  static const char* COMPONENTS; ///< Integer bitmask of the blend shape components that the shader uses; refer to the Components enum.
+
+  // actor property (instance) - animatable (uniforms)
+  static const char* WEIGHTS_UNIFORM; ///< The weight of each blend shape in a float array
+
+  /**
+   * @brief Registers properties based on the mesh definition (and geometry) and identified by the above string constants,
+   *  on the given @a renderer and @a actor.
+   * @SINCE_2_0.7
+   */
+  static void ConfigureProperties(const BlendShapeData& data, Renderer renderer);
+
+  BlendShapes() = delete;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_BLEND_SHAPE_DETAILS_H
diff --git a/dali-scene3d/public-api/loader/buffer-definition.cpp b/dali-scene3d/public-api/loader/buffer-definition.cpp
new file mode 100644
index 0000000..8f2bc57
--- /dev/null
+++ b/dali-scene3d/public-api/loader/buffer-definition.cpp
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/buffer-definition.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/builder/base64-encoding.h>
+#include <dali/devel-api/adaptor-framework/file-stream.h>
+#include <dali/integration-api/debug.h>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+static constexpr std::string_view EMBEDDED_DATA_PREFIX                 = "data:";
+static constexpr std::string_view EMBEDDED_DATA_APPLICATION_MEDIA_TYPE = "application/";
+static constexpr std::string_view EMBEDDED_DATA_BASE64_ENCODING_TYPE   = "base64,";
+} // namespace
+
+struct BufferDefinition::Impl
+{
+  std::vector<uint8_t>              buffer;
+  std::shared_ptr<Dali::FileStream> stream;
+};
+
+BufferDefinition::BufferDefinition(std::vector<uint8_t>& buffer)
+: mImpl{new BufferDefinition::Impl}
+{
+  mImpl.get()->buffer = std::move(buffer);
+  mImpl.get()->stream = std::make_shared<Dali::FileStream>(reinterpret_cast<uint8_t*>(mImpl.get()->buffer.data()), mImpl.get()->buffer.size(), FileStream::READ | FileStream::BINARY);
+  mIsEmbedded         = true;
+}
+
+BufferDefinition::BufferDefinition()
+: mImpl{new BufferDefinition::Impl}
+{
+}
+
+BufferDefinition::~BufferDefinition() = default;
+
+BufferDefinition::BufferDefinition(BufferDefinition&& other)
+: mResourcePath(std::move(other.mResourcePath)),
+  mUri(std::move(other.mUri)),
+  mByteLength(std::move(other.mByteLength)),
+  mName(std::move(other.mName)),
+  mImpl(std::move(other.mImpl))
+{
+}
+
+std::iostream& BufferDefinition::GetBufferStream()
+{
+  LoadBuffer();
+  return mImpl.get()->stream.get()->GetStream();
+}
+
+std::string BufferDefinition::GetUri()
+{
+  return mResourcePath + ((mIsEmbedded) ? std::string() : mUri);
+}
+
+bool BufferDefinition::IsAvailable()
+{
+  LoadBuffer();
+  return mImpl.get()->stream != nullptr;
+}
+
+void BufferDefinition::LoadBuffer()
+{
+  if(mImpl.get()->stream == nullptr)
+  {
+    if(mUri.find(EMBEDDED_DATA_PREFIX.data()) == 0 && mUri.find(EMBEDDED_DATA_APPLICATION_MEDIA_TYPE.data(), EMBEDDED_DATA_PREFIX.length()) == EMBEDDED_DATA_PREFIX.length())
+    {
+      uint32_t position = mUri.find(EMBEDDED_DATA_BASE64_ENCODING_TYPE.data(), EMBEDDED_DATA_PREFIX.length() + EMBEDDED_DATA_APPLICATION_MEDIA_TYPE.length());
+      if(position != std::string::npos)
+      {
+        position += EMBEDDED_DATA_BASE64_ENCODING_TYPE.length();
+        std::string_view data = std::string_view(mUri).substr(position);
+        mImpl.get()->buffer.clear();
+        Dali::Toolkit::DecodeBase64FromString(data, mImpl.get()->buffer);
+        mImpl.get()->stream = std::make_shared<Dali::FileStream>(reinterpret_cast<uint8_t*>(mImpl.get()->buffer.data()), mByteLength, FileStream::READ | FileStream::BINARY);
+        mIsEmbedded         = true;
+      }
+    }
+    else
+    {
+      mImpl.get()->stream = std::make_shared<Dali::FileStream>(mResourcePath + mUri, FileStream::READ | FileStream::BINARY);
+      if(mImpl.get()->stream == nullptr)
+      {
+        DALI_LOG_ERROR("Failed to load %s\n", (mResourcePath + mUri).c_str());
+      }
+    }
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/buffer-definition.h b/dali-scene3d/public-api/loader/buffer-definition.h
new file mode 100644
index 0000000..a59d330
--- /dev/null
+++ b/dali-scene3d/public-api/loader/buffer-definition.h
@@ -0,0 +1,98 @@
+#ifndef DALI_SCENE3D_LOADER_BUFFER_DEFINITION_H
+#define DALI_SCENE3D_LOADER_BUFFER_DEFINITION_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <fstream>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Defines a buffer that is loaded from input uri.
+ *
+ * The buffer can contain 3D resource data such as mesh, animation, and texture.
+ * @SINCE_2_2.12
+ */
+struct DALI_SCENE3D_API BufferDefinition
+{
+  using Vector = std::vector<BufferDefinition>;
+
+  BufferDefinition();
+  BufferDefinition(std::vector<uint8_t>& buffer);
+
+  ~BufferDefinition();
+
+  BufferDefinition(const BufferDefinition& other) = default;
+  BufferDefinition& operator=(const BufferDefinition& other) = default;
+
+  BufferDefinition(BufferDefinition&& other);
+  BufferDefinition& operator=(BufferDefinition&&) = default;
+
+  /**
+   * @brief Retrieves data stream of this buffer.
+   * @SINCE_2_2.12
+   * @return iostream of this buffer
+   */
+  std::iostream& GetBufferStream();
+
+  /**
+   * @brief Retrieves uri of this buffer
+   * @SINCE_2_2.12
+   * @return uri of the buffer
+   */
+  std::string GetUri();
+
+  /**
+   * @brief Checks whether the buffer is available or not.
+   *
+   * It is available, if the buffer is successfully loaded from file or base64 stream.
+   * @SINCE_2_2.12
+   * @return True if it is available.
+   */
+  bool IsAvailable();
+
+private:
+  /// @cond internal
+  /**
+   * @brief Loads buffer from file or encoded stream.
+   */
+  void LoadBuffer();
+  /// @endcond
+
+public: // DATA
+  std::string mResourcePath;
+  std::string mUri;
+  uint32_t    mByteLength{0};
+  std::string mName;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl;
+
+  bool mIsEmbedded{false};
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_BUFFER_DEFINITION_H
diff --git a/dali-scene3d/public-api/loader/bvh-loader.cpp b/dali-scene3d/public-api/loader/bvh-loader.cpp
new file mode 100644
index 0000000..d9bc6f2
--- /dev/null
+++ b/dali-scene3d/public-api/loader/bvh-loader.cpp
@@ -0,0 +1,472 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/bvh-loader.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/file-stream.h>
+#include <dali/devel-api/animation/key-frames-devel.h>
+#include <dali/integration-api/debug.h>
+
+#include <fstream>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <string_view>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+static constexpr std::string_view TOKEN_OFFSET              = "OFFSET";
+static constexpr std::string_view TOKEN_CHANNELS            = "CHANNELS";
+static constexpr std::string_view TOKEN_XPOSITION           = "Xposition";
+static constexpr std::string_view TOKEN_YPOSITION           = "Yposition";
+static constexpr std::string_view TOKEN_ZPOSITION           = "Zposition";
+static constexpr std::string_view TOKEN_XROTATION           = "Xrotation";
+static constexpr std::string_view TOKEN_YROTATION           = "Yrotation";
+static constexpr std::string_view TOKEN_ZROTATION           = "Zrotation";
+static constexpr std::string_view TOKEN_JOINT               = "JOINT";
+static constexpr std::string_view TOKEN_END_SITE            = "End Site";
+static constexpr std::string_view TOKEN_FRAMES              = "Frames";
+static constexpr std::string_view TOKEN_FRAME_TIME          = "Frame Time";
+static constexpr std::string_view TOKEN_HIERARCHY           = "HIERARCHY";
+static constexpr std::string_view TOKEN_ROOT                = "ROOT";
+static constexpr std::string_view TOKEN_MOTION              = "MOTION";
+static constexpr std::string_view PROPERTY_NAME_POSITION    = "position";
+static constexpr std::string_view PROPERTY_NAME_ORIENTATION = "orientation";
+static constexpr std::string_view TOKEN_OPENING_BRACE       = "{";
+static constexpr std::string_view TOKEN_CLOSING_BRACE       = "}";
+
+enum class Channel
+{
+  XPOSITION = 0,
+  YPOSITION,
+  ZPOSITION,
+  XROTATION,
+  YROTATION,
+  ZROTATION
+};
+
+struct Frame
+{
+  std::vector<float> values;
+};
+
+struct Joint
+{
+  std::string                         name;
+  Vector3                             offset;
+  std::vector<Vector3>                translations;
+  std::vector<Quaternion>             rotations;
+  std::vector<Channel>                channels;
+  std::vector<std::shared_ptr<Joint>> children;
+};
+
+void trim(std::string& s)
+{
+  s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int ch) {
+            return !std::isspace(ch);
+          }));
+  s.erase(std::find_if(s.rbegin(), s.rend(), [](int ch) {
+            return !std::isspace(ch);
+          }).base(),
+          s.end());
+}
+
+bool ParseHierarchy(std::istream& file, std::shared_ptr<Joint>& joint)
+{
+  std::string line;
+  bool        braceExist = false;
+  while(std::getline(file, line))
+  {
+    trim(line);
+    std::istringstream stream(line);
+    std::string        token;
+    std::getline(stream, token, ' ');
+
+    if(token == TOKEN_OFFSET.data())
+    {
+      stream >> joint->offset.x >> joint->offset.y >> joint->offset.z;
+    }
+    else if(token == TOKEN_CHANNELS.data())
+    {
+      uint32_t channelCount = 0;
+      std::getline(stream, token, ' ');
+      channelCount = static_cast<uint32_t>(std::atoi(token.c_str()));
+      for(uint32_t i = 0; i < channelCount; ++i)
+      {
+        std::getline(stream, token, ' ');
+        trim(token);
+        if(token == TOKEN_XPOSITION.data())
+        {
+          joint->channels.push_back(Channel::XPOSITION);
+        }
+        else if(token == TOKEN_YPOSITION.data())
+        {
+          joint->channels.push_back(Channel::YPOSITION);
+        }
+        else if(token == TOKEN_ZPOSITION.data())
+        {
+          joint->channels.push_back(Channel::ZPOSITION);
+        }
+        else if(token == TOKEN_XROTATION.data())
+        {
+          joint->channels.push_back(Channel::XROTATION);
+        }
+        else if(token == TOKEN_YROTATION.data())
+        {
+          joint->channels.push_back(Channel::YROTATION);
+        }
+        else if(token == TOKEN_ZROTATION.data())
+        {
+          joint->channels.push_back(Channel::ZROTATION);
+        }
+      }
+    }
+    else if(token == TOKEN_JOINT.data())
+    {
+      std::shared_ptr<Joint> child(new Joint);
+      joint->children.push_back(child);
+      std::getline(stream, token, ' ');
+      child->name = token;
+
+      if(DALI_UNLIKELY(!ParseHierarchy(file, child)))
+      {
+        return false;
+      }
+    }
+    else if(line == TOKEN_END_SITE.data())
+    {
+      bool braceExistEndSite = false;
+      while(std::getline(file, line))
+      {
+        trim(line);
+        if(line == TOKEN_OPENING_BRACE.data())
+        {
+          if(DALI_UNLIKELY(braceExistEndSite))
+          {
+            DALI_LOG_ERROR("Parsing error : Joint[%s] End Site opening brace not matched\n", joint->name.c_str());
+            return false;
+          }
+          braceExistEndSite = true;
+        }
+        else if(line == TOKEN_CLOSING_BRACE.data())
+        {
+          if(DALI_UNLIKELY(!braceExistEndSite))
+          {
+            DALI_LOG_ERROR("Parsing error : Joint[%s] End Site closing brace not matched\n", joint->name.c_str());
+            return false;
+          }
+          break;
+        }
+      }
+      if(DALI_UNLIKELY(!braceExistEndSite))
+      {
+        DALI_LOG_ERROR("Parsing error : Joint[%s] End Site opening brace not exist\n", joint->name.c_str());
+        return false;
+      }
+    }
+    else if(token == TOKEN_OPENING_BRACE.data())
+    {
+      if(DALI_UNLIKELY(braceExist))
+      {
+        DALI_LOG_ERROR("Parsing error : Joint[%s] opening brace not matched\n", joint->name.c_str());
+        return false;
+      }
+      braceExist = true;
+    }
+    else if(token == TOKEN_CLOSING_BRACE.data())
+    {
+      if(DALI_UNLIKELY(!braceExist))
+      {
+        DALI_LOG_ERROR("Parsing error : Joint[%s] closing brace not matched\n", joint->name.c_str());
+        return false;
+      }
+      break;
+    }
+  }
+  if(DALI_UNLIKELY(!braceExist))
+  {
+    DALI_LOG_ERROR("Parsing error : Joint[%s] opening brace not exist\n", joint->name.c_str());
+    return false;
+  }
+  return true;
+}
+
+void MakeList(std::shared_ptr<Joint>& joint, std::vector<std::shared_ptr<Joint>>& jointList)
+{
+  jointList.push_back(joint);
+  for(uint32_t i = 0; i < joint->children.size(); ++i)
+  {
+    MakeList(joint->children[i], jointList);
+  }
+}
+
+bool ParseMotion(std::istream& file, std::shared_ptr<Joint>& hierarchy, uint32_t& frameCount, float& frameTime)
+{
+  std::vector<std::shared_ptr<Joint>> jointList;
+  MakeList(hierarchy, jointList);
+
+  bool        frameCountLoaded = false;
+  bool        frameTimeLoaded  = false;
+  std::string line;
+  while((!frameCountLoaded || !frameTimeLoaded) && std::getline(file, line))
+  {
+    trim(line);
+    std::istringstream stream(line);
+    std::string        token;
+    std::getline(stream, token, ':');
+    trim(token);
+    if(token == TOKEN_FRAMES.data())
+    {
+      stream >> frameCount;
+      frameCountLoaded = true;
+    }
+    else if(token == TOKEN_FRAME_TIME.data())
+    {
+      stream >> frameTime;
+      frameTimeLoaded = true;
+    }
+  }
+
+  if(DALI_UNLIKELY(!frameCountLoaded))
+  {
+    DALI_LOG_ERROR("Parsing error : Frames not exist!\n");
+    return false;
+  }
+  if(DALI_UNLIKELY(!frameTimeLoaded))
+  {
+    DALI_LOG_ERROR("Parsing error : Frame Time not exist!\n");
+    return false;
+  }
+
+  uint32_t loadedFrameCount = 0u;
+
+  while(std::getline(file, line))
+  {
+    trim(line);
+    if(DALI_UNLIKELY(line.empty()))
+    {
+      continue;
+    }
+    std::istringstream stream(line);
+    if(DALI_UNLIKELY(++loadedFrameCount > frameCount))
+    {
+      // Parse failed. Just skip decoding, and get the number of line for debug.
+      continue;
+    }
+
+    for(auto&& joint : jointList)
+    {
+      Vector3    translation;
+      Quaternion rotation[3];
+      for(uint32_t i = 0; i < joint->channels.size(); ++i)
+      {
+        if(joint->channels[i] == Channel::XPOSITION)
+        {
+          stream >> translation.x;
+        }
+        else if(joint->channels[i] == Channel::YPOSITION)
+        {
+          stream >> translation.y;
+        }
+        else if(joint->channels[i] == Channel::ZPOSITION)
+        {
+          stream >> translation.z;
+        }
+        else if(joint->channels[i] == Channel::XROTATION)
+        {
+          float radian;
+          stream >> radian;
+          rotation[0] = Quaternion(Radian(Degree(radian)), Vector3::XAXIS);
+        }
+        else if(joint->channels[i] == Channel::YROTATION)
+        {
+          float radian;
+          stream >> radian;
+          rotation[1] = Quaternion(Radian(Degree(radian)), Vector3::YAXIS);
+        }
+        else if(joint->channels[i] == Channel::ZROTATION)
+        {
+          float radian;
+          stream >> radian;
+          rotation[2] = Quaternion(Radian(Degree(radian)), Vector3::ZAXIS);
+        }
+      }
+      joint->translations.push_back(translation);
+      joint->rotations.push_back(rotation[2] * rotation[0] * rotation[1]);
+    }
+  }
+
+  if(DALI_UNLIKELY(loadedFrameCount != frameCount))
+  {
+    DALI_LOG_ERROR("Parsing error : Motion frame count not matched! expect : %u, loaded : %u\n", frameCount, loadedFrameCount);
+    return false;
+  }
+
+  return true;
+}
+
+bool ParseBvh(std::istream& file, uint32_t& frameCount, float& frameTime, std::shared_ptr<Joint>& rootJoint)
+{
+  std::string line;
+  bool        parseHierarchy = false;
+  bool        parseMotion    = false;
+  while(std::getline(file, line))
+  {
+    trim(line);
+    std::istringstream stream(line);
+    std::string        token;
+    std::getline(stream, token, ' ');
+    if(token == TOKEN_HIERARCHY.data())
+    {
+      std::string line;
+      while(std::getline(file, line))
+      {
+        trim(line);
+        std::istringstream stream(line);
+        std::string        token;
+        std::getline(stream, token, ' ');
+        if(token == TOKEN_ROOT.data())
+        {
+          std::getline(stream, token, ' ');
+          rootJoint->name = token;
+          parseHierarchy  = ParseHierarchy(file, rootJoint);
+          break;
+        }
+      }
+    }
+    if(token == TOKEN_MOTION.data())
+    {
+      parseMotion = ParseMotion(file, rootJoint, frameCount, frameTime);
+    }
+  }
+  return parseHierarchy && parseMotion;
+}
+
+AnimationDefinition GenerateAnimation(const std::string& animationName, std::shared_ptr<Joint>& hierarchy, uint32_t frameCount, float frameTime, bool useRootTranslationOnly, const Vector3& scale)
+{
+  AnimationDefinition animationDefinition;
+
+  animationDefinition.SetName(animationName);
+  animationDefinition.SetDuration(frameTime * (frameCount - 1));
+  float keyFrameInterval = (frameCount > 1u) ? 1.0f / static_cast<float>(frameCount - 1u) : Dali::Math::MACHINE_EPSILON_10;
+
+  std::vector<std::shared_ptr<Joint>> jointList;
+  MakeList(hierarchy, jointList);
+
+  if(!jointList.empty())
+  {
+    uint32_t animationSize = jointList.size();
+    animationSize          = (useRootTranslationOnly) ? (animationSize + 1u) : (animationSize * 2u);
+    animationDefinition.ReserveSize(animationSize);
+    uint32_t animationIndex = 0u;
+    for(uint32_t i = 0; i < jointList.size(); ++i)
+    {
+      AnimatedProperty translationProperty;
+      if(!useRootTranslationOnly || i == 0)
+      {
+        translationProperty.mTimePeriod   = Dali::TimePeriod(animationDefinition.GetDuration());
+        translationProperty.mNodeName     = jointList[i]->name;
+        translationProperty.mPropertyName = PROPERTY_NAME_POSITION.data();
+      }
+
+      AnimatedProperty rotationProperty;
+      rotationProperty.mTimePeriod   = Dali::TimePeriod(animationDefinition.GetDuration());
+      rotationProperty.mNodeName     = jointList[i]->name;
+      rotationProperty.mPropertyName = PROPERTY_NAME_ORIENTATION.data();
+
+      translationProperty.mKeyFrames = Dali::KeyFrames::New();
+      rotationProperty.mKeyFrames    = Dali::KeyFrames::New();
+      for(uint32_t j = 0; j < frameCount; ++j)
+      {
+        if(!useRootTranslationOnly || i == 0)
+        {
+          translationProperty.mKeyFrames.Add(static_cast<float>(j) * keyFrameInterval, (jointList[i]->translations[j] * scale));
+        }
+        rotationProperty.mKeyFrames.Add(static_cast<float>(j) * keyFrameInterval, jointList[i]->rotations[j]);
+      }
+      if(!useRootTranslationOnly || i == 0)
+      {
+        // Optimize keyframes, for heuristic!
+        DevelKeyFrames::OptimizeKeyFramesLinear(translationProperty.mKeyFrames);
+        animationDefinition.SetProperty(animationIndex++, std::move(translationProperty));
+      }
+      // Optimize keyframes, for heuristic!
+      DevelKeyFrames::OptimizeKeyFramesLinear(rotationProperty.mKeyFrames);
+      animationDefinition.SetProperty(animationIndex++, std::move(rotationProperty));
+    }
+  }
+
+  return animationDefinition;
+}
+
+AnimationDefinition LoadBvhInternal(std::istream& stream, const std::string& animationName, bool useRootTranslationOnly, const Vector3& scale)
+{
+  uint32_t               frameCount = 0;
+  float                  frameTime  = 0.0f;
+  std::shared_ptr<Joint> rootJoint(new Joint);
+
+  if(!ParseBvh(stream, frameCount, frameTime, rootJoint))
+  {
+    AnimationDefinition animationDefinition;
+    return animationDefinition;
+  }
+
+  return GenerateAnimation(animationName, rootJoint, frameCount, frameTime, useRootTranslationOnly, scale);
+}
+} // namespace
+
+AnimationDefinition LoadBvh(const std::string& path, const std::string& animationName, bool useRootTranslationOnly, const Vector3& scale)
+{
+  Dali::FileStream fileStream(path);
+  std::iostream&   stream = fileStream.GetStream();
+
+  if(stream.fail())
+  {
+    DALI_LOG_ERROR("Fail to load bvh file : %s\n", path.c_str());
+    AnimationDefinition animationDefinition;
+    return animationDefinition;
+  }
+
+  return LoadBvhInternal(stream, animationName, useRootTranslationOnly, scale);
+}
+
+AnimationDefinition LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, const std::string& animationName, bool useRootTranslationOnly, const Vector3& scale)
+{
+  if(rawBuffer == nullptr || rawBufferLength == 0)
+  {
+    DALI_LOG_ERROR("Fail to load bvh buffer : buffer is empty!\n");
+    AnimationDefinition animationDefinition;
+    return animationDefinition;
+  }
+
+  Dali::FileStream fileStream(const_cast<uint8_t*>(rawBuffer), static_cast<size_t>(static_cast<uint32_t>(rawBufferLength)));
+  std::iostream&   stream = fileStream.GetStream();
+
+  if(stream.fail())
+  {
+    DALI_LOG_ERROR("Fail to load bvh buffer : buffer length : %d\n", rawBufferLength);
+    AnimationDefinition animationDefinition;
+    return animationDefinition;
+  }
+
+  return LoadBvhInternal(stream, animationName, useRootTranslationOnly, scale);
+}
+} // namespace Dali::Scene3D::Loader
\ No newline at end of file
diff --git a/dali-scene3d/public-api/loader/bvh-loader.h b/dali-scene3d/public-api/loader/bvh-loader.h
new file mode 100644
index 0000000..58cab5b
--- /dev/null
+++ b/dali-scene3d/public-api/loader/bvh-loader.h
@@ -0,0 +1,53 @@
+#ifndef DALI_SCENE3D_LOADER_BVH_LOADER_H
+#define DALI_SCENE3D_LOADER_BVH_LOADER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Loads motion capture data from bvh file format.
+ *
+ * @SINCE_2_1.32
+ * @param[in] path The file path.
+ * @param[in] animationName Name of the motion capture animation
+ * @param[in] useRootTranslationOnly True to use only root translation with rotation animation.
+ * @param[in] scale The scale factor to set on the position property manually.
+ * @return AnimationDefinition that includes joint animation information.
+ */
+DALI_SCENE3D_API AnimationDefinition LoadBvh(const std::string& path, const std::string& animationName, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE);
+
+/**
+ * @brief Loads motion capture data from bvh data stream.
+ *
+ * @SINCE_2_2.23
+ * @param[in] rawBuffer The bvh buffer.
+ * @param[in] rawBufferLength The length of buffer.
+ * @param[in] animationName Name of the motion capture animation
+ * @param[in] useRootTranslationOnly True to use only root translation with rotation animation.
+ * @param[in] scale The scale factor to set on the position property manually.
+ * @return AnimationDefinition that includes joint animation information.
+ */
+DALI_SCENE3D_API AnimationDefinition LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, const std::string& animationName, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_BVH_LOADER_H
\ No newline at end of file
diff --git a/dali-scene3d/public-api/loader/camera-parameters.cpp b/dali-scene3d/public-api/loader/camera-parameters.cpp
new file mode 100644
index 0000000..cf7e498
--- /dev/null
+++ b/dali-scene3d/public-api/loader/camera-parameters.cpp
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/camera-parameters.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/actors/camera-actor-devel.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/math/quaternion.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/gltf2-asset.h> // for gltf2::UNDEFINED_FLOAT_VALUE
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+/**
+ * @brief Creates a perspective matrix.
+ *
+ * @param[out] result The perspective matrix.
+ * @param[in] left The coordinate for the left vertical clipping plane.
+ * @param[in] right The coordinate for the right vertical clipping plane.
+ * @param[in] bottom The coordinate for the bottom horizontal clipping plane.
+ * @param[in] top The coordinate for the top horizontal clipping plane.
+ * @param[in] near The distance to the near depth clipping plane.
+ * @param[in] far The distance to the far depth clipping plane.
+ * @param[in] invertYAxis Whether to invert the 'Y' axis.
+ */
+void Frustum(Matrix& result, float left, float right, float bottom, float top, float nearPlane, float farPlane, bool invertYAxis)
+{
+  float deltaZ = farPlane - nearPlane;
+  if((nearPlane <= 0.0f) || (farPlane <= 0.0f) || Equals(right, left) || Equals(bottom, top) || (deltaZ <= 0.0f))
+  {
+    DALI_LOG_ERROR("Invalid parameters passed into Frustum!\n");
+    DALI_ASSERT_DEBUG("Invalid parameters passed into Frustum!");
+    return;
+  }
+
+  float deltaX = right - left;
+  float deltaY = invertYAxis ? bottom - top : top - bottom;
+
+  result.SetIdentity();
+
+  float* m = result.AsFloat();
+  m[0]     = -2.0f * nearPlane / deltaX;
+  m[1] = m[2] = m[3] = 0.0f;
+
+  m[5] = -2.0f * nearPlane / deltaY;
+  m[4] = m[6] = m[7] = 0.0f;
+
+  m[8]  = (right + left) / deltaX;
+  m[9]  = (top + bottom) / deltaY;
+  m[10] = (nearPlane + farPlane) / deltaZ;
+  m[11] = 1.0f;
+
+  m[14] = -2.0f * nearPlane * farPlane / deltaZ;
+  m[12] = m[13] = m[15] = 0.0f;
+}
+
+/**
+ * @brief Creates a perspective projection matrix.
+ *
+ * It calls Frustum()
+ *
+ * @param[out] result The perspective projection matrix.
+ * @param[in] fovy The vertical field of view.
+ * @param[in] aspect The aspect ratio.
+ * @param[in] nearPlane The distance to the near depth clipping plane.
+ * @param[in] farPlane The distance to the far depth clipping plane.
+ * @param[in] invertYAxis Whether to invert the 'Y' axis.
+ */
+void Perspective(Matrix& result, float fovy, float aspect, float nearPlane, float farPlane, bool invertYAxis)
+{
+  float frustumH = tanf(fovy * 0.5f) * nearPlane;
+  float frustumW = frustumH * aspect;
+
+  Frustum(result, -frustumW, frustumW, -frustumH, frustumH, nearPlane, farPlane, invertYAxis);
+}
+
+/**
+* @brief Creates an orthographic projection matrix.
+*
+* @param[out] result The orthographic projection matrix.
+* @param[in] left The coordinate for the left vertical clipping plane.
+* @param[in] right The coordinate for the right vertical clipping plane.
+* @param[in] bottom The coordinate for the bottom horizontal clipping plane.
+* @param[in] top The coordinate for the top horizontal clipping plane.
+* @param[in] nearPlane The distance to the near depth clipping plane.
+* @param[in] farPlane The distance to the far depth clipping plane.
+* @param[in] invertYAxis Whether to invert the 'Y' axis.
+*/
+void Orthographic(Matrix& result, float left, float right, float bottom, float top, float nearPlane, float farPlane, bool invertYAxis)
+{
+  if(Equals(right, left) || Equals(top, bottom) || Equals(farPlane, nearPlane))
+  {
+    DALI_LOG_ERROR("Cannot create orthographic projection matrix with a zero dimension.\n");
+    DALI_ASSERT_DEBUG("Cannot create orthographic projection matrix with a zero dimension.");
+    return;
+  }
+
+  float deltaX = right - left;
+  float deltaY = invertYAxis ? bottom - top : top - bottom;
+  float deltaZ = farPlane - nearPlane;
+
+  float* m = result.AsFloat();
+  m[0]     = -2.0f / deltaX;
+  m[1]     = 0.0f;
+  m[2]     = 0.0f;
+  m[3]     = 0.0f;
+
+  m[4] = 0.0f;
+  m[5] = -2.0f / deltaY;
+  m[6] = 0.0f;
+  m[7] = 0.0f;
+
+  m[8]  = 0.0f;
+  m[9]  = 0.0f;
+  m[10] = 2.0f / deltaZ;
+  m[11] = 0.0f;
+  m[12] = -(right + left) / deltaX;
+  m[13] = -(top + bottom) / deltaY;
+  m[14] = -(nearPlane + farPlane) / deltaZ;
+  m[15] = 1.0f;
+}
+
+} // namespace
+
+ViewProjection CameraParameters::GetViewProjection() const
+{
+  ViewProjection viewProjection;
+
+  // The projection matrix.
+  if(isPerspective)
+  {
+    Perspective(viewProjection.GetProjection(),
+                Radian(yFovDegree),
+                1.f,
+                zNear,
+                zFar,
+                true);
+  }
+  else
+  {
+    Orthographic(viewProjection.GetProjection(),
+                 -orthographicSize * aspectRatio,
+                 orthographicSize * aspectRatio,
+                 orthographicSize,
+                 -orthographicSize,
+                 zNear,
+                 zFar,
+                 true);
+  }
+
+  // The view matrix.
+  const Quaternion viewQuaternion(ANGLE_180, Vector3::YAXIS);
+  Vector3          translation;
+  Quaternion       cameraOrientation;
+  Vector3          scale;
+  matrix.GetTransformComponents(translation, cameraOrientation, scale);
+  cameraOrientation *= viewQuaternion;
+
+  viewProjection.GetView().SetInverseTransformComponents(scale,
+                                                         cameraOrientation,
+                                                         translation);
+
+  viewProjection.Update();
+  return viewProjection;
+}
+
+void CameraParameters::CalculateTransformComponents(Vector3& position, Quaternion& orientation, Vector3& scale) const
+{
+  matrix.GetTransformComponents(position, orientation, scale);
+
+  // The CameraActor is expected to look down the negative Z axis, towards the scene.
+  // Here we emulate the default direction of the camera in DALi.
+  Quaternion viewQuaternion(ANGLE_180, Vector3::YAXIS);
+  orientation *= viewQuaternion;
+}
+
+bool CameraParameters::ConfigureCamera(CameraActor& camera, bool invertY) const
+{
+  camera[Actor::Property::NAME] = name;
+
+  if(isPerspective)
+  {
+    if(Dali::Equals(zNear, gltf2::UNDEFINED_FLOAT_VALUE) ||
+       Dali::Equals(yFovDegree.degree, gltf2::UNDEFINED_FLOAT_VALUE))
+    {
+      return false;
+    }
+
+    camera.SetProjectionMode(Camera::PERSPECTIVE_PROJECTION);
+    camera.SetNearClippingPlane(zNear);
+    camera.SetFieldOfView(Radian(yFovDegree));
+
+    if(!Dali::Equals(zFar, gltf2::UNDEFINED_FLOAT_VALUE))
+    {
+      camera.SetFarClippingPlane(zFar);
+    }
+    else
+    {
+      // TODO : Infinite perspective projection didn't support yet. Just set big enough value now
+      camera.SetFarClippingPlane(1000.0f);
+    }
+
+    if(!Dali::Equals(aspectRatio, gltf2::UNDEFINED_FLOAT_VALUE))
+    {
+      // TODO: By gltf 2.0 spec, we should not 'crop' and 'non-uniform scaling' by viewport.
+      // If we skip to setup this value, 'non-uniform scaling' problem fixed.
+      // But we need to resolve 'crop' case in future.
+      //camera.SetAspectRatio(aspectRatio);
+    }
+  }
+  else
+  {
+    if(Dali::Equals(zNear, gltf2::UNDEFINED_FLOAT_VALUE) ||
+       Dali::Equals(zFar, gltf2::UNDEFINED_FLOAT_VALUE) ||
+       Dali::Equals(orthographicSize, gltf2::UNDEFINED_FLOAT_VALUE))
+    {
+      return false;
+    }
+
+    camera.SetProjectionMode(Camera::ORTHOGRAPHIC_PROJECTION);
+    camera.SetNearClippingPlane(zNear);
+    camera.SetFarClippingPlane(zFar);
+    camera.SetProperty(Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE, orthographicSize);
+
+    if(!Dali::Equals(aspectRatio, gltf2::UNDEFINED_FLOAT_VALUE))
+    {
+      // TODO: By gltf 2.0 spec, we should not 'crop' and 'non-uniform scaling' by viewport.
+      // If we skip to setup this value, 'non-uniform scaling' problem fixed.
+      // But we need to resolve 'crop' case in future.
+      //camera.SetAspectRatio(aspectRatio);
+    }
+  }
+
+  SetActorCentered(camera);
+
+  // model
+  Vector3    camTranslation;
+  Vector3    camScale;
+  Quaternion camOrientation;
+  CalculateTransformComponents(camTranslation, camOrientation, camScale);
+
+  camera.SetInvertYAxis(invertY);
+  camera.SetProperty(Actor::Property::POSITION, camTranslation);
+  camera.SetProperty(Actor::Property::ORIENTATION, camOrientation);
+  camera.SetProperty(Actor::Property::SCALE, camScale);
+
+  return true;
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/camera-parameters.h b/dali-scene3d/public-api/loader/camera-parameters.h
new file mode 100644
index 0000000..17b3ea1
--- /dev/null
+++ b/dali-scene3d/public-api/loader/camera-parameters.h
@@ -0,0 +1,79 @@
+#ifndef DALI_SCENE3D_LOADER_CAMERA_PARAMETERS_H
+#define DALI_SCENE3D_LOADER_CAMERA_PARAMETERS_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/view-projection.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/degree.h>
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/vector3.h>
+#include <string>
+
+namespace Dali
+{
+class CameraActor;
+
+namespace Scene3D
+{
+namespace Loader
+{
+struct DALI_SCENE3D_API CameraParameters
+{
+  std::string name;
+
+  // TODO : Is these default value has is meaning?
+  Matrix matrix           = Matrix::IDENTITY;
+  float  orthographicSize = 1.f;
+  float  aspectRatio      = 1.f;
+  Degree yFovDegree       = Degree(60.f);
+  float  zNear            = 0.1f;
+  float  zFar             = 1000.f;
+  bool   isPerspective    = true;
+
+  /**
+   * @brief Retrieves the view-projection of the camera.
+   * @SINCE_2_0.7
+   * @return The view-projection matrix of the camera
+   */
+  ViewProjection GetViewProjection() const;
+
+  /**
+   * @brief Calculates the @a position, @a orientation and @a scale that's defined for this camera,
+   * and writes it into the respective variable.
+   * @SINCE_2_0.7
+   */
+  void CalculateTransformComponents(Vector3& position, Quaternion& orientation, Vector3& scale) const;
+
+  /**
+   * @brief Configures the camera in the way that it is supposed to be used with scene3d scenes.
+   *
+   * This means inverted Y and a rotation of 180 degrees along the Y axis, plus whatever the parameters define.
+   * @SINCE_2_0.7
+   * @return True if success to generate camera. False otherwise.
+   */
+  bool ConfigureCamera(CameraActor& camera, bool invertY = true) const;
+};
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
+
+#endif // DALI_SCENE3D_LOADER_CAMERA_PARAMETERS_H
diff --git a/dali-scene3d/public-api/loader/customization.cpp b/dali-scene3d/public-api/loader/customization.cpp
new file mode 100644
index 0000000..7922400
--- /dev/null
+++ b/dali-scene3d/public-api/loader/customization.cpp
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/customization.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+
+namespace Dali::Scene3D::Loader
+{
+struct Customization::Map::Impl
+{
+  std::map<Tag, Customization> mCustomizations;
+};
+
+Customization::Map::Map()
+: mImpl{new Impl}
+{
+}
+
+Customization::Map::~Map() = default;
+
+Customization* Customization::Map::Set(Tag tag, Customization&& customization)
+{
+  auto& result = (mImpl->mCustomizations[tag] = customization);
+  return &result;
+}
+
+const Customization* Customization::Map::Get(Tag tag) const
+{
+  auto& customizations = mImpl->mCustomizations;
+  auto  iFind          = customizations.find(tag);
+  if(iFind != customizations.end())
+  {
+    return &iFind->second;
+  }
+  return nullptr;
+}
+
+Customization* Customization::Map::Get(Tag tag)
+{
+  auto& customizations = mImpl->mCustomizations;
+  auto  iFind          = customizations.find(tag);
+  if(iFind != customizations.end())
+  {
+    return &iFind->second;
+  }
+  return nullptr;
+}
+
+uint32_t Customization::Map::Size() const
+{
+  return mImpl->mCustomizations.size();
+}
+
+void Customization::Map::Clear()
+{
+  mImpl->mCustomizations.clear();
+}
+
+struct Customization::Choices::Impl
+{
+  std::map<Tag, OptionType> mOptions;
+};
+
+Customization::Choices::Choices()
+: mImpl{new Impl}
+{
+}
+
+Customization::Choices::~Choices() = default;
+
+void Customization::Choices::Set(Tag tag, OptionType option)
+{
+  mImpl->mOptions[tag] = option;
+}
+
+Customization::OptionType Customization::Choices::Get(Tag tag) const
+{
+  auto& options = mImpl->mOptions;
+  auto  iFind   = options.find(tag);
+  if(iFind != options.end())
+  {
+    return iFind->second;
+  }
+  return NONE;
+}
+
+uint32_t Customization::Choices::Size() const
+{
+  return mImpl->mOptions.size();
+}
+
+void Customization::Choices::Clear()
+{
+  mImpl->mOptions.clear();
+}
+
+} // namespace Dali::Scene3D::Loader
\ No newline at end of file
diff --git a/dali-scene3d/public-api/loader/customization.h b/dali-scene3d/public-api/loader/customization.h
new file mode 100644
index 0000000..00f3082
--- /dev/null
+++ b/dali-scene3d/public-api/loader/customization.h
@@ -0,0 +1,135 @@
+#ifndef DALI_SCENE3D_LOADER_CUSTOMIZATION_STATE_H_
+#define DALI_SCENE3D_LOADER_CUSTOMIZATION_STATE_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <memory>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Offers a description of an aspect of the scene that can be customized:
+ *     the number of options, and the name of the nodes that are registered
+ *     for the tag, whose children will be shown / hidden based on selection.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API Customization
+{
+  using Tag        = std::string;
+  using OptionType = uint32_t;
+
+  /**
+   * @brief A mapping of customizations to tags.
+   * @SINCE_2_0.7
+   */
+  struct DALI_SCENE3D_API Map
+  {
+    Map();
+    ~Map();
+
+    /**
+     * @brief Maps the given @a customization to the given @a tag, overwriting any previous mapping to the same tag.
+     * @SINCE_2_0.7
+     * @return Pointer to the inserted (or pre-existing) Customization instance.
+     */
+    Customization* Set(Tag tag, Customization&& customization);
+
+    /**
+     * @brief Attempts to retrieve a const Customization based on the given @a tag.
+     * @SINCE_2_0.7
+     */
+    const Customization* Get(Tag tag) const;
+
+    /**
+     * @brief Attempts to retrieve a Customization based on the given @a tag.
+     * @SINCE_2_0.7
+     */
+    Customization* Get(Tag tag);
+
+    /**
+     * @brief Returns the number of elements.
+     * @SINCE_2_0.7
+     */
+    uint32_t Size() const;
+
+    /**
+     * @brief Removes every element from the Map.
+     * @SINCE_2_0.7
+     */
+    void Clear();
+
+  private:
+    struct Impl;
+    const std::unique_ptr<Impl> mImpl;
+  };
+
+  /**
+   * @brief A mapping of choices - indices of children of customization nodes to use - to tags.
+   * @SINCE_2_0.7
+   */
+  struct DALI_SCENE3D_API Choices
+  {
+    Choices();
+    ~Choices();
+
+    /**
+     * @brief Maps the given @a option to the given @a tag, overwriting any previous mapping to the same tag.
+     * @SINCE_2_0.7
+     */
+    void Set(Tag tag, OptionType option);
+
+    /**
+     * @brief Attempts to retrieve a Customization based on the given @a tag.
+     * @SINCE_2_0.7
+     * @return A Customization based on the given @a tag.
+     * @note Returns NONE if @a tag is not known.
+     */
+    OptionType Get(Tag tag) const;
+
+    /**
+     * @brief Returns the number of elements.
+     * @SINCE_2_0.7
+     * @return The number of elements.
+     */
+    uint32_t Size() const;
+
+    /**
+     * @brief Removes every element from the underlying map.
+     * @SINCE_2_0.7
+     */
+    void Clear();
+
+  private:
+    struct Impl;
+    const std::unique_ptr<Impl> mImpl;
+  };
+
+  static const OptionType NONE = OptionType(-1);
+
+  OptionType               numOptions = 0;
+  std::vector<std::string> nodes; // to apply option to.
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_CUSTOMIZATION_STATE_H_
diff --git a/dali-scene3d/public-api/loader/dli-input-parameter.h b/dali-scene3d/public-api/loader/dli-input-parameter.h
new file mode 100644
index 0000000..a161b75
--- /dev/null
+++ b/dali-scene3d/public-api/loader/dli-input-parameter.h
@@ -0,0 +1,94 @@
+#ifndef DALI_SCENE3D_LOADER_DLI_INPUT_PARAMETER_H
+#define DALI_SCENE3D_LOADER_DLI_INPUT_PARAMETER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/model-loader.h>
+
+namespace Dali::Scene3D::Loader
+{
+class DliInputParameter : public ModelLoader::InputParameter
+{
+public:
+  using ConvertFontCode         = void (*)(const std::string& code, std::string& fontFamily, std::string& slant, std::string& weight, float& size);
+  using ConvertColorCode        = Vector4 (*)(const std::string& code);
+  using CategoryProcessor       = std::function<void(Property::Array&& categoryData, StringCallback onError)>;
+  using CategoryProcessorVector = std::vector<std::pair<std::string /*name*/, CategoryProcessor>>;
+  using NodeProcessor           = std::function<void(const Dali::Scene3D::Loader::NodeDefinition& nodeDef,
+                                           Property::Map&&                              nodeData,
+                                           StringCallback                               onError)>;
+  using AnimationProcessor      = std::function<void(const AnimationDefinition& animDef,
+                                                Property::Map&&            animData,
+                                                StringCallback             onError)>;
+
+public:
+  /**
+   * @brief The absolute path of animation binaries referenced in the .dli.
+   * @SINCE_2_2.17
+   */
+  std::string mAnimationsPath;
+
+  /**
+   * @brief Provides a facility to determine a color from a code instead of RGB(A) values.
+   * @SINCE_2_2.17
+   */
+  ConvertColorCode mConvertColorCode{nullptr};
+
+  /**
+   * @brief A collection of handlers, mapped to the names of the top level (i.e. below
+   *  root) element, whom they will attempt to process. This will take place before
+   *  the parsing of scene Nodes and Animations, but after skeletons, environment, mesh,
+   *  shader and material resources.
+   * @SINCE_2_2.17
+   */
+  CategoryProcessorVector mPreNodeCategoryProcessors;
+
+  /**
+   * @brief A collection of handlers, mapped to the names of the top level (i.e. below
+   *  root) element, whom they will attempt to process. This will take place after
+   *  the parsing of the scene Nodes and Animations.
+   * @SINCE_2_2.17
+   */
+  CategoryProcessorVector mPostNodeCategoryProcessors;
+
+  /**
+   * @brief Provides an extension point to nodes. If provided, this function will be
+   *  called with each JSON element and definition, of a scene node.
+   * @SINCE_2_2.17
+   * @note Constraints rely on ID resolution (from .dli to scene definition), which
+   *  takes place after the parsing of the nodes; therefore AT THIS POINT the node
+   *  IDs seen in constraints will still be the .dli IDs - NOT to be relied on for
+   *  indexing into mScene.
+   */
+  NodeProcessor mNodePropertyProcessor{nullptr};
+
+  /**
+   * @brief Provides an extension point to animations. If provided, this function will be
+   *  called with each JSON element and fully processed definition, of an animation.
+   * @SINCE_2_2.17
+   */
+  AnimationProcessor mAnimationPropertyProcessor;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_DLI_INPUT_PARAMETER_H
diff --git a/dali-scene3d/public-api/loader/environment-definition.cpp b/dali-scene3d/public-api/loader/environment-definition.cpp
new file mode 100644
index 0000000..9c74f23
--- /dev/null
+++ b/dali-scene3d/public-api/loader/environment-definition.cpp
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/environment-definition.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/environment-variable.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/threading/mutex.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/public-api/loader/environment-map-loader.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace
+{
+#define TOKEN_STRING(x) #x
+std::string GetDaliImagePath()
+{
+  return (nullptr == DALI_IMAGE_DIR) ? Dali::EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_IMAGE_DIR)) : DALI_IMAGE_DIR;
+}
+
+static constexpr float DEFAULT_INTENSITY = 1.0f;
+
+} // unnamed namespace
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+const char* PRE_COMPUTED_BRDF_TEXTURE_FILE_NAME = "brdfLUT.png";
+}
+PixelData EnvironmentDefinition::mBrdfPixelData;
+Texture   EnvironmentDefinition::mBrdfTexture;
+bool      EnvironmentDefinition::mIsBrdfLoaded = false;
+
+Dali::Texture EnvironmentDefinition::GetBrdfTexture()
+{
+  if(!mBrdfTexture)
+  {
+    if(!mIsBrdfLoaded)
+    {
+      LoadBrdfTexture();
+    }
+    mBrdfTexture = Texture::New(TextureType::TEXTURE_2D, mBrdfPixelData.GetPixelFormat(), mBrdfPixelData.GetWidth(), mBrdfPixelData.GetHeight());
+    mBrdfTexture.Upload(mBrdfPixelData);
+  }
+  return mBrdfTexture;
+}
+
+EnvironmentDefinition::RawData
+EnvironmentDefinition::LoadRaw(const std::string& environmentsPath)
+{
+  RawData raw;
+  auto    loadFn = [&environmentsPath](const std::string& path, EnvironmentMapData& environmentMapData) {
+    if(path.empty())
+    {
+      environmentMapData.mPixelData.resize(6);
+      for(auto& face : environmentMapData.mPixelData)
+      {
+        face.push_back(Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataWhiteRGB());
+      }
+      environmentMapData.SetEnvironmentMapType(Dali::Scene3D::EnvironmentMapType::CUBEMAP);
+    }
+    else if(!LoadEnvironmentMap(environmentsPath + path, environmentMapData))
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Failed to load cubemap texture from '" << path << "'.";
+    }
+  };
+
+  loadFn(mDiffuseMapPath, raw.mDiffuse);
+  loadFn(mSpecularMapPath, raw.mSpecular);
+
+  if(mUseBrdfTexture)
+  {
+    LoadBrdfTexture();
+  }
+  return raw;
+}
+
+EnvironmentDefinition::Textures EnvironmentDefinition::Load(RawData&& raw)
+{
+  Textures textures;
+
+  // This texture should have 6 faces and only one mipmap
+  if(!raw.mDiffuse.mPixelData.empty())
+  {
+    textures.mDiffuse = raw.mDiffuse.GetTexture();
+  }
+
+  // This texture should have 6 faces and 6 mipmaps
+  if(!raw.mSpecular.mPixelData.empty())
+  {
+    textures.mSpecular             = raw.mSpecular.GetTexture();
+    textures.mSpecularMipmapLevels = raw.mSpecular.GetMipmapLevels();
+  }
+
+  if(mUseBrdfTexture)
+  {
+    textures.mBrdf = GetBrdfTexture();
+  }
+  return textures;
+}
+
+float EnvironmentDefinition::GetDefaultIntensity()
+{
+  return DEFAULT_INTENSITY;
+}
+
+void EnvironmentDefinition::LoadBrdfTexture()
+{
+  static Dali::Mutex mutex;
+  {
+    Mutex::ScopedLock lock(mutex);
+    if(!mIsBrdfLoaded)
+    {
+      Devel::PixelBuffer pixelBuffer = LoadImageFromFile(GetDaliImagePath() + PRE_COMPUTED_BRDF_TEXTURE_FILE_NAME);
+      if(pixelBuffer)
+      {
+        mBrdfPixelData = Devel::PixelBuffer::Convert(pixelBuffer);
+        mIsBrdfLoaded  = true;
+      }
+    }
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
\ No newline at end of file
diff --git a/dali-scene3d/public-api/loader/environment-definition.h b/dali-scene3d/public-api/loader/environment-definition.h
new file mode 100644
index 0000000..39aa53a
--- /dev/null
+++ b/dali-scene3d/public-api/loader/environment-definition.h
@@ -0,0 +1,115 @@
+#ifndef DALI_SCENE3D_LOADER_ENVIRONMENT_DEFINITION_H
+#define DALI_SCENE3D_LOADER_ENVIRONMENT_DEFINITION_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/rendering/texture.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Defines an environment map with either or both of radiance and irradiance maps.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API EnvironmentDefinition
+{
+  struct Textures
+  {
+    Texture  mDiffuse;  // irradiance
+    Texture  mSpecular; // radiance
+    Texture  mBrdf;     // pre-computed brdf
+    uint32_t mSpecularMipmapLevels{1u};
+
+    bool IsLoaded() const
+    {
+      return mDiffuse || mSpecular;
+    }
+  };
+
+  struct RawData
+  {
+    EnvironmentMapData mDiffuse;
+    EnvironmentMapData mSpecular;
+    PixelData          mBrdf;
+  };
+
+  using EnvironmentData = std::pair<EnvironmentDefinition, Textures>;
+  using Vector          = std::vector<EnvironmentData>;
+
+  EnvironmentDefinition() = default;
+
+  EnvironmentDefinition(const EnvironmentDefinition&) = delete;
+  EnvironmentDefinition& operator=(const EnvironmentDefinition&) = delete;
+
+  EnvironmentDefinition(EnvironmentDefinition&&) = default;
+  EnvironmentDefinition& operator=(EnvironmentDefinition&&) = default;
+
+  static Dali::Texture GetBrdfTexture();
+
+  /**
+   * @brief Loads raw pixel data for the given diffuse and specular maps.
+   * @SINCE_2_0.7
+   * @return The raw data for the given diffuse and specular maps
+   * @note This can be done on any thread.
+   */
+  RawData LoadRaw(const std::string& environmentsPath);
+
+  /**
+   * @brief Creates DALi cubemap Textures from the pixel data in @a raw, then returns them in a Textures object.
+   * @SINCE_2_0.7
+   * @return DALi cubemap Textures
+   * @note This must only be called from the event thread.
+   */
+  Textures Load(RawData&& raw);
+
+  /**
+   * @brief Get default intensity value.
+   * @SINCE_2_2.1
+   * @return Default intensity. (1.0f)
+   */
+  static float GetDefaultIntensity();
+
+private:
+  /// @cond internal
+  static void LoadBrdfTexture();
+  /// @endcond internal
+
+public: // DATA
+  std::string              mDiffuseMapPath;
+  std::string              mSpecularMapPath;
+  std::shared_ptr<RawData> mRawData;
+  Quaternion               mCubeOrientation = Quaternion::IDENTITY;
+  Vector3                  mYDirection      = Vector3::ONE;
+  float                    mIblIntensity    = 1.0f;
+  bool                     mUseBrdfTexture  = false;
+
+private:
+  static PixelData mBrdfPixelData;
+  static Texture   mBrdfTexture;
+  static bool      mIsBrdfLoaded;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_ENVIRONMENT_DEFINITION_H
diff --git a/dali-scene3d/public-api/loader/environment-map-data.cpp b/dali-scene3d/public-api/loader/environment-map-data.cpp
new file mode 100644
index 0000000..3b7f878
--- /dev/null
+++ b/dali-scene3d/public-api/loader/environment-map-data.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/internal/graphics/builtin-shader-extern-gen.h>
+
+namespace Dali::Scene3D::Loader
+{
+Texture EnvironmentMapData::GetTexture()
+{
+  if(mEnvironmentMapTexture)
+  {
+    return mEnvironmentMapTexture;
+  }
+
+  if(!mPixelData.empty())
+  {
+    if(mEnvironmentMapType == Scene3D::EnvironmentMapType::CUBEMAP)
+    {
+      // Check for the default case, that we might share the graphic resources
+      if(mPixelData[0].size() > 0u)
+      {
+        if(mPixelData[0][0] == Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataWhiteRGB())
+        {
+          mEnvironmentMapTexture = Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyCubeTextureWhiteRGB();
+        }
+        else
+        {
+          mEnvironmentMapTexture = Texture::New(TextureType::TEXTURE_CUBE, mPixelData[0][0].GetPixelFormat(), mPixelData[0][0].GetWidth(), mPixelData[0][0].GetHeight());
+          for(size_t iSide = 0u, iEndSize = mPixelData.size(); iSide < iEndSize; ++iSide)
+          {
+            auto& side = mPixelData[iSide];
+            for(size_t iMipLevel = 0u, iEndMipLevel = mPixelData[0].size(); iMipLevel < iEndMipLevel; ++iMipLevel)
+            {
+              mEnvironmentMapTexture.Upload(side[iMipLevel], CubeMapLayer::POSITIVE_X + iSide, iMipLevel, 0u, 0u, side[iMipLevel].GetWidth(), side[iMipLevel].GetHeight());
+            }
+          }
+        }
+      }
+    }
+    else
+    {
+      mEnvironmentMapTexture = Texture::New(TextureType::TEXTURE_2D, mPixelData[0][0].GetPixelFormat(), mPixelData[0][0].GetWidth(), mPixelData[0][0].GetHeight());
+      mEnvironmentMapTexture.Upload(mPixelData[0][0], 0, 0, 0, 0, mPixelData[0][0].GetWidth(), mPixelData[0][0].GetHeight());
+    }
+
+    // If mipmap is not defined explicitly, use GenerateMipmaps.
+    // TODO: Maybe we can use better way to know it already has mipmap or not.
+    if(mPixelData.size() > 0u && mPixelData[0].size() == 1u)
+    {
+      mEnvironmentMapTexture.GenerateMipmaps();
+    }
+  }
+  return mEnvironmentMapTexture;
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/environment-map-data.h b/dali-scene3d/public-api/loader/environment-map-data.h
new file mode 100644
index 0000000..e09beef
--- /dev/null
+++ b/dali-scene3d/public-api/loader/environment-map-data.h
@@ -0,0 +1,105 @@
+#ifndef DALI_SCENE3D_LOADER_ENVIRONMENT_MAP_DATA_H
+#define DALI_SCENE3D_LOADER_ENVIRONMENT_MAP_DATA_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/images/pixel-data.h>
+#include <dali/public-api/rendering/shader.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/common/environment-map.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Stores the pixel data objects for environment map texture.
+ *
+ * EnvironmentMapData supports cube map that contains textures for 6 faces, or
+ * an equirectangular image.
+ * @SINCE_2_2.11
+ */
+class DALI_SCENE3D_API EnvironmentMapData
+{
+public:
+  /**
+   * @brief Retrieves environment map texture from image file
+   * @SINCE_2_2.11
+   * @return texture for loaded environment map.
+   */
+  Texture GetTexture();
+
+  /**
+   * @brief Sets environment map type
+   * @SINCE_2_2.11
+   * @param[in] environmentMapType environment map type
+   */
+  void SetEnvironmentMapType(Dali::Scene3D::EnvironmentMapType environmentMapType)
+  {
+    if(mEnvironmentMapType != environmentMapType)
+    {
+      mEnvironmentMapTexture.Reset();
+      mEnvironmentMapType = environmentMapType;
+    }
+  }
+
+  /**
+   * @brief Retrieves environment map type.
+   * @SINCE_2_2.11
+   * @return environment map type
+   */
+  Dali::Scene3D::EnvironmentMapType GetEnvironmentMapType() const
+  {
+    return mEnvironmentMapType;
+  }
+
+  /**
+   * @brief Sets the mipmap levels
+   * @SINCE_2_2.19
+   * @param[in] mipmapLevels No. of mipmap levels
+   */
+  void SetMipmapLevels(uint32_t mipmapLevels)
+  {
+    mMipmapLevels = mipmapLevels;
+  }
+
+  /**
+   * @brief Retrieves the number of mipmap levels
+   * @SINCE_2_2.19
+   * @return No. of mipmap levels
+   */
+  uint32_t GetMipmapLevels() const
+  {
+    return mMipmapLevels;
+  }
+
+public:
+  std::vector<std::vector<PixelData> > mPixelData;
+
+private:
+  Dali::Texture                     mEnvironmentMapTexture;
+  Dali::Shader                      mEnvironmentMapShader;
+  Dali::Scene3D::EnvironmentMapType mEnvironmentMapType{Dali::Scene3D::EnvironmentMapType::AUTO};
+  uint32_t                          mMipmapLevels{1u};
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_ENVIRONMENT_MAP_DATA_H
diff --git a/dali-scene3d/public-api/loader/environment-map-loader.cpp b/dali-scene3d/public-api/loader/environment-map-loader.cpp
new file mode 100644
index 0000000..619732d
--- /dev/null
+++ b/dali-scene3d/public-api/loader/environment-map-loader.cpp
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/environment-map-loader.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/pixel-data-integ.h>
+#include <string.h>
+#include <cmath>
+#include <filesystem>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-scene3d/public-api/loader/ktx-loader.h>
+
+#include <dali/integration-api/debug.h>
+
+namespace Dali
+{
+namespace
+{
+const std::string_view KTX_EXTENSION = ".ktx";
+
+static constexpr uint32_t NUMBER_OF_ENVIRONMENT_MAP_TYPE = 5;
+static constexpr uint32_t NUMBER_OF_CUBE_MAP_TYPE        = 4;
+
+/**
+ * @brief cube map face index
+ * Cube map layer order is as fallows:
+ * POSITIVE_X, NEGATIVE_X, POSITIVE_Y, NEGATIVE_Y, POSITIVE_Z, NEGATIVE_Z. @see CubeMapLayer
+ * The indices are for 4 kind of environment cube map. Cross_horizontal, Array_horizontal, Cross_vertical, and Array_vertical.
+ */
+static constexpr uint32_t CUBEMAP_INDEX_X[NUMBER_OF_CUBE_MAP_TYPE][6] = {{2, 0, 1, 1, 1, 3}, {0, 1, 2, 3, 4, 5}, {1, 1, 1, 1, 0, 2}, {0, 0, 0, 0, 0, 0}};
+static constexpr uint32_t CUBEMAP_INDEX_Y[NUMBER_OF_CUBE_MAP_TYPE][6] = {{1, 1, 0, 2, 1, 1}, {0, 0, 0, 0, 0, 0}, {1, 3, 0, 2, 1, 1}, {0, 1, 2, 3, 4, 5}};
+
+static constexpr Vector2 NUMBER_OF_CUBE_FACE[NUMBER_OF_CUBE_MAP_TYPE] =
+  {
+    Vector2(4, 3),
+    Vector2(6, 1),
+    Vector2(3, 4),
+    Vector2(1, 6)};
+
+static constexpr float expectedAspectRatios[NUMBER_OF_ENVIRONMENT_MAP_TYPE] =
+  {
+    4.0f / 3.0f,
+    6.0f / 1.0f,
+    3.0f / 4.0f,
+    1.0f / 6.0f,
+    2.0f / 1.0f};
+
+enum CubeType
+{
+  CROSS_HORIZONTAL = 0, // Cross horizontal style cube map
+  ARRAY_HORIZONTAL,     // array horizontal style cube map
+  CROSS_VERTICAL,       // Cross vertical style cube map
+  ARRAY_VERTICAL,       // array vertical style cube map
+  NONE
+};
+
+uint8_t* GetCroppedBuffer(uint8_t* sourceBuffer, uint32_t bytesPerPixel, uint32_t width, uint32_t height, uint32_t xOffset, uint32_t yOffset, uint32_t xFaceSize, uint32_t yFaceSize)
+{
+  uint32_t byteSize   = bytesPerPixel * xFaceSize * yFaceSize;
+  uint8_t* destBuffer = reinterpret_cast<uint8_t*>(malloc(byteSize + 4u));
+
+  if(DALI_LIKELY(destBuffer))
+  {
+    int32_t srcStride  = width * bytesPerPixel;
+    int32_t destStride = xFaceSize * bytesPerPixel;
+    int32_t srcOffset  = xOffset * bytesPerPixel + yOffset * srcStride;
+    int32_t destOffset = 0;
+    for(uint16_t row = yOffset; row < yOffset + yFaceSize; ++row)
+    {
+      memcpy(destBuffer + destOffset, sourceBuffer + srcOffset, destStride);
+      srcOffset += srcStride;
+      destOffset += destStride;
+    }
+  }
+  else
+  {
+    DALI_LOG_ERROR("malloc is failed. request malloc size : %u\n", byteSize + 4u);
+  }
+
+  return destBuffer;
+}
+
+PixelData GetCubeFace(Dali::PixelData cubePixelData, uint32_t faceIndex, CubeType cubeType, float faceWidth, float faceHeight)
+{
+  PixelData cubeFacePixelData;
+  if(cubeType != NONE)
+  {
+    auto imagePixelFormat = cubePixelData.GetPixelFormat();
+    if(!Dali::Pixel::IsCompressed(imagePixelFormat))
+    {
+      uint8_t* imageBuffer   = Dali::Integration::GetPixelDataBuffer(cubePixelData).buffer;
+      uint32_t bytesPerPixel = Pixel::GetBytesPerPixel(imagePixelFormat);
+      uint32_t imageWidth    = cubePixelData.GetWidth();
+      uint32_t imageHeight   = cubePixelData.GetHeight();
+
+      uint32_t xOffset = CUBEMAP_INDEX_X[cubeType][faceIndex] * static_cast<uint32_t>(faceWidth);
+      uint32_t yOffset = CUBEMAP_INDEX_Y[cubeType][faceIndex] * static_cast<uint32_t>(faceHeight);
+
+      uint32_t finalFaceWidth  = (xOffset + static_cast<uint32_t>(faceWidth) < imageWidth) ? static_cast<uint32_t>(faceWidth) : imageWidth - xOffset;
+      uint32_t finalFaceHeight = (yOffset + static_cast<uint32_t>(faceHeight) < imageHeight) ? static_cast<uint32_t>(faceHeight) : imageHeight - yOffset;
+      uint8_t* tempImageBuffer = GetCroppedBuffer(imageBuffer, bytesPerPixel, imageWidth, imageHeight, xOffset, yOffset, finalFaceWidth, finalFaceHeight);
+
+      if(DALI_LIKELY(tempImageBuffer))
+      {
+        cubeFacePixelData = Dali::Integration::NewPixelDataWithReleaseAfterUpload(tempImageBuffer, finalFaceWidth * finalFaceHeight * bytesPerPixel, finalFaceWidth, finalFaceHeight, 0u, imagePixelFormat, PixelData::FREE);
+      }
+    }
+  }
+  return cubeFacePixelData;
+}
+
+/**
+ * @brief Loads environment map data texture from an image url.
+ *
+ * @param[in] environmentMapUrl The environment map file url.
+ * @param[out] environmentMapData The data structure with all pixel data objects.
+ * @return bool True if the loading is succeded.
+ */
+bool LoadEnvironmentMapData(const std::string& environmentMapUrl, Scene3D::Loader::EnvironmentMapData& environmentMapData)
+{
+  // Diffuse Environment Map
+  if(environmentMapUrl.empty())
+  {
+    return false;
+  }
+
+  Dali::PixelData pixelData = Dali::Scene3D::Internal::ImageResourceLoader::GetCachedPixelData(environmentMapUrl);
+  if(pixelData)
+  {
+    CubeType cubeType    = NONE;
+    uint32_t imageWidth  = pixelData.GetWidth();
+    uint32_t imageHeight = pixelData.GetHeight();
+    /**
+     * If the environment map type is not EQUIRECTANGULAR,
+     * The type should be defined internally.
+     * DALi checkes aspect ratio of input image and find the closest type.
+     * If the environment map type is CUBEMAP, DALi determines which of the following styles is closest:
+     * cross horizontal, cross vertical, array horizontal, and array vertical.
+     * When the environment map type is AUTO, it finds the closest type, including the Equirectangular type.
+     */
+    if(environmentMapData.GetEnvironmentMapType() != Scene3D::EnvironmentMapType::EQUIRECTANGULAR)
+    {
+      float aspectRatio = (float)imageWidth / (float)imageHeight;
+
+      float    minDistance = FLT_MAX;
+      uint32_t typeCount   = (environmentMapData.GetEnvironmentMapType() == Scene3D::EnvironmentMapType::CUBEMAP) ? NUMBER_OF_CUBE_MAP_TYPE : NUMBER_OF_ENVIRONMENT_MAP_TYPE;
+      for(uint32_t i = 0; i < typeCount; ++i)
+      {
+        float distance = fabs(aspectRatio - expectedAspectRatios[i]);
+        if(distance < minDistance)
+        {
+          minDistance = distance;
+          cubeType    = static_cast<CubeType>(i);
+        }
+      }
+    }
+
+    if(cubeType != NONE)
+    {
+      float faceWidth = imageWidth, faceHeight = imageHeight;
+      faceWidth /= NUMBER_OF_CUBE_FACE[static_cast<uint32_t>(cubeType)].x;
+      faceHeight /= NUMBER_OF_CUBE_FACE[static_cast<uint32_t>(cubeType)].y;
+      environmentMapData.mPixelData.resize(6);
+      for(uint32_t i = 0; i < 6; ++i)
+      {
+        environmentMapData.mPixelData[i].resize(1);
+      }
+      for(uint32_t i = 0; i < 6; ++i)
+      {
+        environmentMapData.mPixelData[i][0] = GetCubeFace(pixelData, i, cubeType, faceWidth, faceHeight);
+      }
+      environmentMapData.SetEnvironmentMapType(Scene3D::EnvironmentMapType::CUBEMAP);
+    }
+    else
+    {
+      environmentMapData.mPixelData.resize(1);
+      environmentMapData.mPixelData[0].resize(1);
+      environmentMapData.mPixelData[0][0] = pixelData;
+      environmentMapData.SetEnvironmentMapType(Scene3D::EnvironmentMapType::EQUIRECTANGULAR);
+    }
+
+    if(!environmentMapData.mPixelData.empty() && !environmentMapData.mPixelData[0].empty() && environmentMapData.mPixelData[0][0])
+    {
+      const uint32_t pixelDataWidth  = environmentMapData.mPixelData[0][0].GetWidth();
+      const uint32_t pixelDataHeight = environmentMapData.mPixelData[0][0].GetHeight();
+
+      if(pixelDataWidth > 0u && pixelDataHeight > 0u)
+      {
+        uint32_t mipmap = static_cast<uint32_t>(1 + std::floor(std::log2(std::min(pixelDataWidth, pixelDataHeight))));
+        environmentMapData.SetMipmapLevels(mipmap);
+      }
+    }
+    return true;
+  }
+  return false;
+}
+} // namespace
+
+namespace Scene3D
+{
+namespace Loader
+{
+bool LoadEnvironmentMap(const std::string& environmentMapUrl, EnvironmentMapData& environmentMapData)
+{
+  std::filesystem::path modelPath(environmentMapUrl);
+  std::string           extension = modelPath.extension();
+  std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
+
+  bool successed = (extension == KTX_EXTENSION) ? Dali::Scene3D::Loader::LoadKtxData(environmentMapUrl, environmentMapData) : LoadEnvironmentMapData(environmentMapUrl, environmentMapData);
+  return successed;
+}
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/public-api/loader/environment-map-loader.h b/dali-scene3d/public-api/loader/environment-map-loader.h
new file mode 100644
index 0000000..ddbf86c
--- /dev/null
+++ b/dali-scene3d/public-api/loader/environment-map-loader.h
@@ -0,0 +1,39 @@
+#ifndef DALI_SCENE3D_LOADER_ENVIRONMENT_MAP_LOADER_H
+#define DALI_SCENE3D_LOADER_ENVIRONMENT_MAP_LOADER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/common/environment-map.h>
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Loads environment map data from a environment map file.
+ *
+ * @SINCE_2_1.32
+ * @param[in] environmentMapUrl The environment map file url.
+ * @param[out] environmentMapData The data structure with all pixel data objects.
+ * @return bool True if the loading is succeded.
+ */
+bool DALI_SCENE3D_API LoadEnvironmentMap(const std::string& environmentMapUrl, EnvironmentMapData& environmentMapData);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_ENVIRONMENT_MAP_LOADER_H
diff --git a/dali-scene3d/public-api/loader/facial-animation-loader.cpp b/dali-scene3d/public-api/loader/facial-animation-loader.cpp
new file mode 100644
index 0000000..4f1d5e1
--- /dev/null
+++ b/dali-scene3d/public-api/loader/facial-animation-loader.cpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/facial-animation-loader.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/animation/key-frames-devel.h>
+#include <sstream>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/json-reader.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace js = json;
+
+namespace Dali
+{
+namespace
+{
+const float MILLISECONDS_TO_SECONDS = 0.001f;
+
+struct BlendShape
+{
+  std::vector<std::vector<float>> mKeys;
+  std::string_view                mNodeName;
+  uint32_t                        mNumberOfMorphTarget;
+  std::string_view                mVersion;
+  std::string_view                mFullName;
+  std::vector<std::string_view>   mMorphNames;
+};
+
+struct FacialAnimation
+{
+  std::string_view        mName;
+  std::vector<BlendShape> mBlendShapes;
+  std::string_view        mVersion;
+  uint32_t                mNumberOfShapes;
+  std::vector<uint32_t>   mTime;
+  uint32_t                mNumberOfFrames;
+};
+
+std::vector<std::vector<float>> ReadBlendShapeKeys(const json_value_s& j)
+{
+  auto&                           jo = js::Cast<json_array_s>(j);
+  std::vector<std::vector<float>> result;
+
+  result.reserve(jo.length);
+
+  auto i = jo.start;
+  while(i)
+  {
+    result.push_back(std::move(js::Read::Array<float, js::Read::Number>(*i->value)));
+    i = i->next;
+  }
+
+  return result;
+}
+
+const js::Reader<BlendShape>& GetBlendShapeReader()
+{
+  static const auto BLEND_SHAPE_READER = std::move(js::Reader<BlendShape>()
+                                                     .Register(*js::MakeProperty("key", ReadBlendShapeKeys, &BlendShape::mKeys))
+                                                     .Register(*new js::Property<BlendShape, std::string_view>("name", js::Read::StringView, &BlendShape::mNodeName))
+                                                     .Register(*js::MakeProperty("morphtarget", js::Read::Number<uint32_t>, &BlendShape::mNumberOfMorphTarget))
+                                                     .Register(*new js::Property<BlendShape, std::string_view>("blendShapeVersion", js::Read::StringView, &BlendShape::mVersion))
+                                                     .Register(*new js::Property<BlendShape, std::string_view>("fullName", js::Read::StringView, &BlendShape::mFullName))
+                                                     .Register(*js::MakeProperty("morphname", js::Read::Array<std::string_view, js::Read::StringView>, &BlendShape::mMorphNames)));
+  return BLEND_SHAPE_READER;
+}
+
+const js::Reader<FacialAnimation>& GetFacialAnimationReader()
+{
+  static const auto FACIAL_ANIMATION_READER = std::move(js::Reader<FacialAnimation>()
+                                                          .Register(*new js::Property<FacialAnimation, std::string_view>("name", js::Read::StringView, &FacialAnimation::mName))
+                                                          .Register(*js::MakeProperty("blendShapes", js::Read::Array<BlendShape, js::ObjectReader<BlendShape>::Read>, &FacialAnimation::mBlendShapes))
+                                                          .Register(*new js::Property<FacialAnimation, std::string_view>("version", js::Read::StringView, &FacialAnimation::mVersion))
+                                                          .Register(*js::MakeProperty("shapesAmount", js::Read::Number<uint32_t>, &FacialAnimation::mNumberOfShapes))
+                                                          .Register(*js::MakeProperty("time", js::Read::Array<uint32_t, js::Read::Number>, &FacialAnimation::mTime))
+                                                          .Register(*js::MakeProperty("frames", js::Read::Number<uint32_t>, &FacialAnimation::mNumberOfFrames)));
+  return FACIAL_ANIMATION_READER;
+}
+
+Dali::Scene3D::Loader::AnimationDefinition LoadFacialAnimationInternal(json::unique_ptr& root)
+{
+  static bool setObjectReaders = true;
+  if(setObjectReaders)
+  {
+    // NOTE: only referencing own, anonymous namespace, const objects; the pointers will never need to change.
+    js::SetObjectReader(GetBlendShapeReader());
+    setObjectReaders = false;
+  }
+
+  auto& rootObj = js::Cast<json_object_s>(*root);
+
+  FacialAnimation facialAnimation;
+  GetFacialAnimationReader().Read(rootObj, facialAnimation);
+
+  Dali::Scene3D::Loader::AnimationDefinition animationDefinition;
+  animationDefinition.SetName(facialAnimation.mName.data());
+  animationDefinition.SetDuration(MILLISECONDS_TO_SECONDS * static_cast<float>(facialAnimation.mTime[facialAnimation.mNumberOfFrames - 1u]));
+
+  // Calculate the number of animated properties.
+  uint32_t numberOfAnimatedProperties = 0u;
+  for(const auto& blendShape : facialAnimation.mBlendShapes)
+  {
+    numberOfAnimatedProperties += blendShape.mNumberOfMorphTarget;
+  }
+  animationDefinition.ReserveSize(numberOfAnimatedProperties);
+
+  uint32_t targets = 0u;
+  for(const auto& blendShape : facialAnimation.mBlendShapes)
+  {
+    for(uint32_t morphTargetIndex = 0u; morphTargetIndex < blendShape.mNumberOfMorphTarget; ++morphTargetIndex)
+    {
+      Dali::Scene3D::Loader::AnimatedProperty animatedProperty;
+      animatedProperty.mTimePeriod = Dali::TimePeriod(animationDefinition.GetDuration());
+      animatedProperty.mNodeName   = blendShape.mNodeName;
+      std::stringstream weightPropertyStream;
+      weightPropertyStream << Dali::Scene3D::Loader::BlendShapes::WEIGHTS_UNIFORM << "[" << morphTargetIndex << "]";
+      animatedProperty.mPropertyName = weightPropertyStream.str();
+
+      animatedProperty.mKeyFrames = Dali::KeyFrames::New();
+      for(uint32_t timeIndex = 0u; timeIndex < facialAnimation.mNumberOfFrames; ++timeIndex)
+      {
+        const float progress = MILLISECONDS_TO_SECONDS * static_cast<float>(facialAnimation.mTime[timeIndex]) / animationDefinition.GetDuration();
+        animatedProperty.mKeyFrames.Add(progress, blendShape.mKeys[timeIndex][morphTargetIndex]);
+      }
+      // Optimize keyframes, for heuristic!
+      DevelKeyFrames::OptimizeKeyFramesLinear(animatedProperty.mKeyFrames);
+      animationDefinition.SetProperty(targets + morphTargetIndex, std::move(animatedProperty));
+    }
+
+    targets += blendShape.mNumberOfMorphTarget;
+  }
+
+  return animationDefinition;
+}
+} // unnamed namespace
+
+namespace Scene3D
+{
+namespace Loader
+{
+AnimationDefinition LoadFacialAnimation(const std::string& url)
+{
+  bool failed   = false;
+  auto jsonData = LoadTextFile(url.c_str(), &failed);
+  if(failed)
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Failed to load " << url << ".";
+  }
+
+  json::unique_ptr root(json_parse(jsonData.c_str(), jsonData.size()));
+  if(!root)
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Failed to parse json " << url << ".";
+  }
+
+  return LoadFacialAnimationInternal(root);
+}
+
+AnimationDefinition LoadFacialAnimationFromBuffer(const uint8_t* rawBuffer, int rawBufferLength)
+{
+  json::unique_ptr root(json_parse(rawBuffer, static_cast<size_t>(static_cast<uint32_t>(rawBufferLength))));
+  if(!root)
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Failed to parse json from buffer.";
+  }
+
+  return LoadFacialAnimationInternal(root);
+}
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/public-api/loader/facial-animation-loader.h b/dali-scene3d/public-api/loader/facial-animation-loader.h
new file mode 100644
index 0000000..fb96446
--- /dev/null
+++ b/dali-scene3d/public-api/loader/facial-animation-loader.h
@@ -0,0 +1,52 @@
+#ifndef DALI_SCENE3D_LOADER_FACIAL_ANIMATION_LOADER_H
+#define DALI_SCENE3D_LOADER_FACIAL_ANIMATION_LOADER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Loads a facial animation encoded in a json file in the given @p url.
+ *
+ * Throws a DaliException on error.
+ *
+ * @SINCE_2_1.30
+ * @param[in] url The url of the file containing the facial animation.
+ *
+ * @return An animation definition.
+ */
+DALI_SCENE3D_API AnimationDefinition LoadFacialAnimation(const std::string& url);
+
+/**
+ * @brief Loads a facial animation encoded in a json file in the given data stream.
+ *
+ * Throws a DaliException on error.
+ *
+ * @SINCE_2_2.23
+ * @param[in] rawBuffer The raw buffer containing the facial animation.
+ * @param[in] rawBufferLength The length of raw buffer.
+ *
+ * @return An animation definition.
+ */
+DALI_SCENE3D_API AnimationDefinition LoadFacialAnimationFromBuffer(const uint8_t* rawBuffer, int rawBufferLength);
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_FACIAL_ANIMATION_LOADER_H
diff --git a/dali-scene3d/public-api/loader/index.h b/dali-scene3d/public-api/loader/index.h
new file mode 100644
index 0000000..cbf09a2
--- /dev/null
+++ b/dali-scene3d/public-api/loader/index.h
@@ -0,0 +1,34 @@
+#ifndef DALI_SCENE3D_LOADER_INDEX_H_
+#define DALI_SCENE3D_LOADER_INDEX_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <cstdint>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+using Index = uint32_t;
+
+constexpr Index INVALID_INDEX = static_cast<Index>(-1);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_INDEX_H_
diff --git a/dali-scene3d/public-api/loader/ktx-loader.cpp b/dali-scene3d/public-api/loader/ktx-loader.cpp
new file mode 100644
index 0000000..4d33ef5
--- /dev/null
+++ b/dali-scene3d/public-api/loader/ktx-loader.cpp
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/ktx-loader.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/pixel-data-integ.h>
+#include <dali/public-api/rendering/texture.h>
+#include <fstream>
+#include <memory>
+
+namespace Dali
+{
+namespace
+{
+// http://github.khronos.org/KTX-Specification/
+const uint8_t KTX_ID_HEAD[] = {0xAB, 0x4B, 0x54, 0x58, 0x20};
+const uint8_t KTX_ID_TAIL[] = {0xBB, 0x0D, 0x0A, 0x1A, 0x0A};
+
+const uint8_t KTX_VERSION_1_1[] = {0x31, 0x31};
+const uint8_t KTX_VERSION_2_0[] = {0x32, 0x30};
+
+static_assert(sizeof(KTX_ID_HEAD) + sizeof(KTX_ID_TAIL) == 10);
+static_assert(sizeof(KTX_VERSION_1_1) == 2);
+static_assert(sizeof(KTX_VERSION_2_0) == sizeof(KTX_VERSION_1_1));
+
+void FreeBuffer(uint8_t* buffer)
+{
+  delete[] buffer;
+}
+} // namespace
+
+namespace Scene3D
+{
+namespace Loader
+{
+struct KtxFileHeader
+{
+  uint8_t  identifier[12];
+  uint32_t endianness;
+  uint32_t glType; //(UNSIGNED_BYTE, UNSIGNED_SHORT_5_6_5, etc.)
+  uint32_t glTypeSize;
+  uint32_t glFormat;         //(RGB, RGBA, BGRA, etc.)
+  uint32_t glInternalFormat; //For uncompressed textures, specifies the internalformat parameter passed to glTexStorage*D or glTexImage*D
+  uint32_t glBaseInternalFormat;
+  uint32_t pixelWidth;
+  uint32_t pixelHeight;
+  uint32_t pixelDepth;
+  uint32_t numberOfArrayElements;
+  uint32_t numberOfFaces; //Cube map faces are stored in the order: +X, -X, +Y, -Y, +Z, -Z.
+  uint32_t numberOfMipmapLevels;
+  uint32_t bytesOfKeyValueData;
+
+  bool IsIdentifierValid() const
+  {
+    return std::equal(KTX_ID_HEAD, std::end(KTX_ID_HEAD), identifier) &&
+           (std::equal(KTX_VERSION_1_1, std::end(KTX_VERSION_1_1), identifier + sizeof(KTX_ID_HEAD)) ||
+            std::equal(KTX_VERSION_2_0, std::end(KTX_VERSION_2_0), identifier + sizeof(KTX_ID_HEAD))) &&
+           std::equal(KTX_ID_TAIL, std::end(KTX_ID_TAIL), identifier + (sizeof(KTX_ID_HEAD) + sizeof(KTX_VERSION_1_1)));
+  }
+};
+
+/**
+ * Convert KTX format to Pixel::Format
+ */
+bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Pixel::Format& format)
+{
+  switch(ktxPixelFormat)
+  {
+    case 0x93B0: // GL_COMPRESSED_RGBA_ASTC_4x4
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR;
+      break;
+    }
+    case 0x93B1: // GL_COMPRESSED_RGBA_ASTC_5x4
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR;
+      break;
+    }
+    case 0x93B2: // GL_COMPRESSED_RGBA_ASTC_5x5
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR;
+      break;
+    }
+    case 0x93B3: // GL_COMPRESSED_RGBA_ASTC_6x5
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR;
+      break;
+    }
+    case 0x93B4: // GL_COMPRESSED_RGBA_ASTC_6x6
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR;
+      break;
+    }
+    case 0x93B5: // GL_COMPRESSED_RGBA_ASTC_8x5
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR;
+      break;
+    }
+    case 0x93B6: // GL_COMPRESSED_RGBA_ASTC_8x6
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR;
+      break;
+    }
+    case 0x93B7: // GL_COMPRESSED_RGBA_ASTC_8x8
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR;
+      break;
+    }
+    case 0x93B8: // GL_COMPRESSED_RGBA_ASTC_10x5
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR;
+      break;
+    }
+    case 0x93B9: // GL_COMPRESSED_RGBA_ASTC_10x6
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR;
+      break;
+    }
+    case 0x93BA: // GL_COMPRESSED_RGBA_ASTC_10x8
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR;
+      break;
+    }
+    case 0x93BB: // GL_COMPRESSED_RGBA_ASTC_10x10
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR;
+      break;
+    }
+    case 0x93BC: // GL_COMPRESSED_RGBA_ASTC_12x10
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR;
+      break;
+    }
+    case 0x93BD: // GL_COMPRESSED_RGBA_ASTC_12x12
+    {
+      format = Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR;
+      break;
+    }
+    case 0x881B: // GL_RGB16F
+    {
+      format = Pixel::RGB16F;
+      break;
+    }
+    case 0x8815: // GL_RGB32F
+    {
+      format = Pixel::RGB32F;
+      break;
+    }
+    case 0x8C3A: // GL_R11F_G11F_B10F
+    {
+      format = Pixel::R11G11B10F;
+      break;
+    }
+    case 0x8D7C: // GL_RGBA8UI
+    {
+      format = Pixel::RGBA8888;
+      break;
+    }
+    case 0x8D7D: // GL_RGB8UI
+    {
+      format = Pixel::RGB888;
+      break;
+    }
+    default:
+    {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool LoadKtxData(const std::string& path, EnvironmentMapData& environmentMapData)
+{
+  std::fstream fp(path, std::ios::in | std::ios::binary);
+  if(fp.is_open() == false)
+  {
+    return false;
+  }
+
+  KtxFileHeader header;
+  if(fp.read(reinterpret_cast<char*>(&header), sizeof(KtxFileHeader)).good() == false)
+  {
+    return false;
+  }
+
+  if(!header.IsIdentifierValid())
+  {
+    return false;
+  }
+
+  // Skip the key-values:
+  if(fp.seekg(static_cast<std::streamoff>(static_cast<std::size_t>(header.bytesOfKeyValueData)), fp.cur).good() == false)
+  {
+    return false;
+  }
+
+  header.numberOfMipmapLevels  = std::max(header.numberOfMipmapLevels, 1u);
+  header.numberOfArrayElements = std::max(header.numberOfArrayElements, 1u);
+  header.pixelDepth            = std::max(header.pixelDepth, 1u);
+  header.pixelHeight           = std::max(header.pixelHeight, 1u);
+  environmentMapData.SetMipmapLevels(header.numberOfMipmapLevels);
+
+  environmentMapData.mPixelData.resize(header.numberOfFaces);
+  for(uint32_t face = 0u; face < header.numberOfFaces; ++face)
+  {
+    environmentMapData.mPixelData[face].resize(header.numberOfMipmapLevels);
+  }
+
+  Pixel::Format daliformat = Pixel::RGB888;
+
+  ConvertPixelFormat(header.glInternalFormat, daliformat);
+
+  for(uint32_t mipmapLevel = 0u; mipmapLevel < header.numberOfMipmapLevels; ++mipmapLevel)
+  {
+    uint32_t byteSize = 0u;
+    if(fp.read(reinterpret_cast<char*>(&byteSize), sizeof(byteSize)).good() == false)
+    {
+      return false;
+    }
+
+    if(0u != byteSize % 4u)
+    {
+      byteSize += 4u - byteSize % 4u;
+    }
+
+    for(uint32_t arrayElement = 0u; arrayElement < header.numberOfArrayElements; ++arrayElement) //arrayElement must be 0 or 1
+    {
+      for(uint32_t face = 0u; face < header.numberOfFaces; ++face)
+      {
+        std::unique_ptr<uint8_t, void (*)(uint8_t*)> img(new uint8_t[byteSize], FreeBuffer);
+        if(fp.read(reinterpret_cast<char*>(img.get()), static_cast<std::streamsize>(static_cast<size_t>(byteSize))).good() == false)
+        {
+          return false;
+        }
+        environmentMapData.mPixelData[face][mipmapLevel] = Dali::Integration::NewPixelDataWithReleaseAfterUpload(img.release(), byteSize, header.pixelWidth, header.pixelHeight, 0u, daliformat, PixelData::DELETE_ARRAY);
+      }
+    }
+
+    header.pixelHeight /= 2u;
+    header.pixelWidth /= 2u;
+  }
+  environmentMapData.SetEnvironmentMapType(Scene3D::EnvironmentMapType::CUBEMAP);
+
+  return true;
+}
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/public-api/loader/ktx-loader.h b/dali-scene3d/public-api/loader/ktx-loader.h
new file mode 100644
index 0000000..6c6b4de
--- /dev/null
+++ b/dali-scene3d/public-api/loader/ktx-loader.h
@@ -0,0 +1,38 @@
+#ifndef DALI_SCENE3D_LOADER_KTX_LOADER_H
+#define DALI_SCENE3D_LOADER_KTX_LOADER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Loads cube map data texture from a ktx file.
+ *
+ * @SINCE_2_0.7
+ * @param[in] path The file path.
+ * @param[out] environmentMapData The data structure with all pixel data objects.
+ * @return bool True if the loading is succeded.
+ */
+bool LoadKtxData(const std::string& path, EnvironmentMapData& environmentMapData);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_KTX_LOADER_H
diff --git a/dali-scene3d/public-api/loader/light-parameters.h b/dali-scene3d/public-api/loader/light-parameters.h
new file mode 100644
index 0000000..e148413
--- /dev/null
+++ b/dali-scene3d/public-api/loader/light-parameters.h
@@ -0,0 +1,43 @@
+#ifndef DALI_SCENE3D_LOADER_LIGHT_PARAMETERS_H
+#define DALI_SCENE3D_LOADER_LIGHT_PARAMETERS_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/vector3.h>
+#include <stdint.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+struct DALI_SCENE3D_API LightParameters
+{
+  Matrix transform;
+
+  Vector3  color;
+  float    intensity;
+  float    shadowIntensity;
+  uint32_t shadowMapSize;
+  float    orthographicSize;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_LIGHT_PARAMETERS_H
diff --git a/dali-scene3d/public-api/loader/load-result.h b/dali-scene3d/public-api/loader/load-result.h
new file mode 100644
index 0000000..b849279
--- /dev/null
+++ b/dali-scene3d/public-api/loader/load-result.h
@@ -0,0 +1,83 @@
+#ifndef DALI_SCENE3D_LOADER_OUTPUT_H
+#define DALI_SCENE3D_LOADER_OUTPUT_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/loader/camera-parameters.h>
+#include <dali-scene3d/public-api/loader/light-parameters.h>
+#include <dali-scene3d/public-api/loader/load-scene-metadata.h>
+
+namespace Dali::Scene3D::Loader
+{
+class ResourceBundle;
+class SceneDefinition;
+
+/**
+ * @brief The outputs from loading and processing a scene.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API LoadResult
+{
+  /**
+   * @brief The bundle to store resources in.
+   * @SINCE_2_0.7
+   */
+  ResourceBundle& mResources;
+
+  /**
+   * @brief The scene definition to populate.
+   * @SINCE_2_0.7
+   */
+  SceneDefinition& mScene;
+
+  /**
+   * @brief The metadata of the scene.
+   * @SINCE_2_2.5
+   */
+  SceneMetadata& mSceneMetadata;
+
+  /**
+   * @brief The list of animation definitions, in lexicographical order of their names.
+   * @SINCE_2_0.7
+   */
+  std::vector<AnimationDefinition>& mAnimationDefinitions;
+
+  /**
+   * @brief The list of animation group definitions, in lexicographical order of their names.
+   * @SINCE_2_0.7
+   */
+  std::vector<AnimationGroupDefinition>& mAnimationGroupDefinitions;
+
+  /**
+   * @brief The camera parameters that were loaded from the scene.
+   * @SINCE_2_0.7
+   */
+  std::vector<CameraParameters>& mCameraParameters;
+
+  /**
+   * @brief The light parameters that were loaded from the scene.
+   * @SINCE_2_0.7
+   */
+  std::vector<LightParameters>& mLightParameters;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_OUTPUT_H
diff --git a/dali-scene3d/public-api/loader/load-scene-metadata.cpp b/dali-scene3d/public-api/loader/load-scene-metadata.cpp
new file mode 100644
index 0000000..826e713
--- /dev/null
+++ b/dali-scene3d/public-api/loader/load-scene-metadata.cpp
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/gltf2-asset.h>
+#include <dali-scene3d/internal/loader/json-reader.h>
+#include <dali-scene3d/public-api/loader/load-scene-metadata.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace js = json;
+namespace gt = gltf2;
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+struct ImageData
+{
+  struct SamplingMode
+  {
+    enum Type
+    {
+      INVALID          = -1,
+      BOX              = Dali::SamplingMode::BOX,
+      NEAREST          = Dali::SamplingMode::NEAREST,
+      LINEAR           = Dali::SamplingMode::LINEAR,
+      BOX_THEN_NEAREST = Dali::SamplingMode::BOX_THEN_NEAREST,
+      BOX_THEN_LINEAR  = Dali::SamplingMode::BOX_THEN_LINEAR,
+      NO_FILTER        = Dali::SamplingMode::NO_FILTER,
+      DONT_CARE        = Dali::SamplingMode::DONT_CARE
+    };
+
+    static Type FromString(const char* s, size_t len);
+  };
+
+  std::string mImageUri{};  ///< The URI of the image
+  uint16_t    mMinWidth{};  ///< The minimum width of the image
+  uint16_t    mMinHeight{}; ///< The mimimum height of the image
+
+  ImageData::SamplingMode::Type mSamplingMode{ImageData::SamplingMode::BOX_THEN_LINEAR}; ///< The sampling mode used to resize the image.
+};
+
+const std::map<std::string_view, ImageData::SamplingMode::Type>& GetStringSamplingModeTable()
+{
+  static const std::map<std::string_view, ImageData::SamplingMode::Type> SAMPLING_MODE_TYPES{
+    ENUM_STRING_MAPPING(ImageData::SamplingMode, BOX),
+    ENUM_STRING_MAPPING(ImageData::SamplingMode, NEAREST),
+    ENUM_STRING_MAPPING(ImageData::SamplingMode, LINEAR),
+    ENUM_STRING_MAPPING(ImageData::SamplingMode, BOX_THEN_NEAREST),
+    ENUM_STRING_MAPPING(ImageData::SamplingMode, BOX_THEN_LINEAR),
+    ENUM_STRING_MAPPING(ImageData::SamplingMode, NO_FILTER),
+    ENUM_STRING_MAPPING(ImageData::SamplingMode, DONT_CARE),
+  };
+  return SAMPLING_MODE_TYPES;
+}
+
+ENUM_TYPE_FROM_STRING(ImageData::SamplingMode, GetStringSamplingModeTable())
+
+struct MetaData
+{
+  std::vector<ImageData> mImageData;
+};
+
+const js::Reader<ImageData>& GetImageMetaDataReader()
+{
+  static const auto IMAGE_METADATA_READER = std::move(js::Reader<ImageData>()
+                                                         .Register(*js::MakeProperty("uri", js::Read::String, &ImageData::mImageUri))
+                                                         .Register(*js::MakeProperty("minWidth", js::Read::Number, &ImageData::mMinWidth))
+                                                         .Register(*js::MakeProperty("minHeight", js::Read::Number, &ImageData::mMinHeight))
+                                                         .Register(*js::MakeProperty("samplingMode", gt::ReadStringEnum<ImageData::SamplingMode>, &ImageData::mSamplingMode)));
+  return IMAGE_METADATA_READER;
+}
+
+const js::Reader<MetaData>& GetMetaDataReader()
+{
+  static const auto METADATA_READER = std::move(js::Reader<MetaData>()
+                                                   .Register(*js::MakeProperty("images", js::Read::Array<ImageData, js::ObjectReader<ImageData>::Read>, &MetaData::mImageData)));
+  return METADATA_READER;
+}
+} // namespace
+
+void LoadSceneMetadata(const std::string& url, SceneMetadata& sceneMetadata)
+{
+  bool failed = false;
+  auto js     = LoadTextFile(url.c_str(), &failed);
+  if(failed)
+  {
+    return;
+  }
+
+  json::unique_ptr root(json_parse(js.c_str(), js.size()));
+  if(!root)
+  {
+    throw std::runtime_error("Failed to parse " + url);
+  }
+  auto& rootObj = js::Cast<json_object_s>(*root);
+
+  static bool setObjectReaders = true;
+  if(setObjectReaders)
+  {
+    js::SetObjectReader(GetImageMetaDataReader());
+
+    setObjectReaders = false;
+  }
+
+  MetaData metaData;
+  GetMetaDataReader().Read(rootObj, metaData);
+
+  sceneMetadata.mImageMetadata.reserve(metaData.mImageData.size() + metaData.mImageData.size());
+  for(auto&& data : metaData.mImageData)
+  {
+    if(data.mSamplingMode == ImageData::SamplingMode::INVALID)
+    {
+      throw std::runtime_error("Sampling mode type unsupported.");
+    }
+    else
+    {
+      sceneMetadata.mImageMetadata.insert({data.mImageUri, ImageMetadata{ImageDimensions(data.mMinWidth, data.mMinHeight), static_cast<Dali::SamplingMode::Type>(data.mSamplingMode)}});
+    }
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/load-scene-metadata.h b/dali-scene3d/public-api/loader/load-scene-metadata.h
new file mode 100644
index 0000000..6056b1e
--- /dev/null
+++ b/dali-scene3d/public-api/loader/load-scene-metadata.h
@@ -0,0 +1,70 @@
+#ifndef DALI_SCENE3D_LOADER_LOAD_SCENE_METADATA_H_
+#define DALI_SCENE3D_LOADER_LOAD_SCENE_METADATA_H_
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/images/image-operations.h>
+#include <string>
+#include <unordered_map>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Defines the matadata for an image.
+ * @SINCE_2_2.5
+ */
+struct ImageMetadata
+{
+  ImageDimensions    mMinSize{};                                   ///< The minimum required image size for rendering. @SINCE_2_2.5
+  SamplingMode::Type mSamplingMode{SamplingMode::BOX_THEN_LINEAR}; ///< The sampling mode used to resize the image. @SINCE_2_2.5
+};
+
+/**
+ * @brief Stores the metadata for a scene.
+ *
+ * @SINCE_2_2.5
+ * @note The supported format is the following:
+ *  {
+ *    "images": (optional) [ {
+ *      "uri": name of the image file,
+ *      "minWidth": minimum width required for rendering,
+ *      "minHeight": minimum height required for rendering.
+ *      "samplingMode": sampling mode used to resize the image (@see Dali::SamplingMode). (optional)
+ *    } ]
+ *  }
+ */
+struct SceneMetadata
+{
+  std::unordered_map<std::string, ImageMetadata> mImageMetadata{}; ///< The container of image metadata (i.e. the pairs of image URI and image metadata)
+};
+
+/**
+ * @brief Attempts to load and process a json file specifying scene metadata for pre-processing the scene resources.
+ *
+ * e.g. the minimum size required for rendering images, etc.
+ * @SINCE_2_2.5
+ * @note Will fail quietly if the file is not present.
+ */
+DALI_SCENE3D_API void LoadSceneMetadata(const std::string& url, SceneMetadata& sceneMetadata);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_LOAD_SCENE_METADATA_H_
diff --git a/dali-scene3d/public-api/loader/material-definition.cpp b/dali-scene3d/public-api/loader/material-definition.cpp
new file mode 100644
index 0000000..52028bf
--- /dev/null
+++ b/dali-scene3d/public-api/loader/material-definition.cpp
@@ -0,0 +1,392 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/material-definition.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/builder/base64-encoding.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/integration-api/pixel-data-integ.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+
+namespace Dali
+{
+using namespace Toolkit;
+
+namespace Scene3D
+{
+namespace Loader
+{
+const Matrix3 TextureDefinition::DEFAULT_TRANSFORM = Matrix3::IDENTITY;
+
+namespace
+{
+constexpr SamplerFlags::Type FILTER_MODES_FROM_DALI[]{
+  SamplerFlags::FILTER_LINEAR | SamplerFlags::FILTER_MIPMAP_NEAREST,
+  SamplerFlags::FILTER_LINEAR,
+  SamplerFlags::FILTER_NEAREST,
+  SamplerFlags::FILTER_LINEAR,
+  SamplerFlags::FILTER_NEAREST | SamplerFlags::FILTER_MIPMAP_NEAREST,
+  SamplerFlags::FILTER_LINEAR | SamplerFlags::FILTER_MIPMAP_NEAREST,
+  SamplerFlags::FILTER_NEAREST | SamplerFlags::FILTER_MIPMAP_LINEAR,
+  SamplerFlags::FILTER_LINEAR | SamplerFlags::FILTER_MIPMAP_LINEAR,
+};
+
+constexpr SamplerFlags::Type WRAP_MODES_FROM_DALI[]{
+  SamplerFlags::WRAP_CLAMP,
+  SamplerFlags::WRAP_CLAMP,
+  SamplerFlags::WRAP_REPEAT,
+  SamplerFlags::WRAP_MIRROR,
+};
+
+constexpr FilterMode::Type FILTER_MODES_TO_DALI[]{
+  FilterMode::NEAREST,
+  FilterMode::LINEAR,
+  FilterMode::NEAREST_MIPMAP_NEAREST,
+  FilterMode::LINEAR_MIPMAP_NEAREST,
+  FilterMode::NEAREST_MIPMAP_LINEAR,
+  FilterMode::LINEAR_MIPMAP_LINEAR,
+};
+
+constexpr WrapMode::Type WRAP_MODES_TO_DALI[]{
+  WrapMode::REPEAT,
+  WrapMode::CLAMP_TO_EDGE,
+  WrapMode::MIRRORED_REPEAT};
+
+const SamplerFlags::Type GetSingleValueSampler()
+{
+  static const SamplerFlags::Type SINGLE_VALUE_SAMPLER = SamplerFlags::Encode(FilterMode::NEAREST, FilterMode::NEAREST, WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE);
+  return SINGLE_VALUE_SAMPLER;
+}
+
+static constexpr std::string_view EMBEDDED_DATA_PREFIX               = "data:";
+static constexpr std::string_view EMBEDDED_DATA_IMAGE_MEDIA_TYPE     = "image/";
+static constexpr std::string_view EMBEDDED_DATA_BASE64_ENCODING_TYPE = "base64,";
+
+Dali::PixelData LoadImageResource(const std::string& resourcePath,
+                                  TextureDefinition& textureDefinition,
+                                  FittingMode::Type  fittingMode,
+                                  bool               orientationCorrection)
+{
+  Dali::PixelData pixelData;
+  if(!textureDefinition.mTextureBuffer.empty())
+  {
+    Dali::Devel::PixelBuffer pixelBuffer = Dali::LoadImageFromBuffer(textureDefinition.mTextureBuffer.data(), textureDefinition.mTextureBuffer.size(), textureDefinition.mMinImageDimensions, fittingMode, textureDefinition.mSamplingMode, orientationCorrection);
+    if(pixelBuffer)
+    {
+      pixelData = Devel::PixelBuffer::Convert(pixelBuffer);
+    }
+  }
+  else if(textureDefinition.mImageUri.find(EMBEDDED_DATA_PREFIX.data()) == 0 && textureDefinition.mImageUri.find(EMBEDDED_DATA_IMAGE_MEDIA_TYPE.data(), EMBEDDED_DATA_PREFIX.length()) == EMBEDDED_DATA_PREFIX.length())
+  {
+    uint32_t position = textureDefinition.mImageUri.find(EMBEDDED_DATA_BASE64_ENCODING_TYPE.data(), EMBEDDED_DATA_PREFIX.length() + EMBEDDED_DATA_IMAGE_MEDIA_TYPE.length());
+    if(position != std::string::npos)
+    {
+      position += EMBEDDED_DATA_BASE64_ENCODING_TYPE.length();
+      std::string_view     data = std::string_view(textureDefinition.mImageUri).substr(position);
+      std::vector<uint8_t> buffer;
+      Dali::Toolkit::DecodeBase64FromString(data, buffer);
+      uint32_t bufferSize = buffer.size();
+
+      Dali::Devel::PixelBuffer pixelBuffer = Dali::LoadImageFromBuffer(reinterpret_cast<uint8_t*>(buffer.data()), bufferSize, textureDefinition.mMinImageDimensions, fittingMode, textureDefinition.mSamplingMode, orientationCorrection);
+      if(pixelBuffer)
+      {
+        pixelData = Dali::Devel::PixelBuffer::Convert(pixelBuffer, true);
+      }
+    }
+  }
+  else
+  {
+    textureDefinition.mDirectoryPath = resourcePath;
+    pixelData                        = Internal::ImageResourceLoader::GetCachedPixelData(resourcePath + textureDefinition.mImageUri, textureDefinition.mMinImageDimensions, fittingMode, textureDefinition.mSamplingMode, orientationCorrection);
+  }
+  return pixelData;
+}
+} // namespace
+
+SamplerFlags::Type SamplerFlags::Encode(FilterMode::Type minFilter, FilterMode::Type magFilter, WrapMode::Type wrapS, WrapMode::Type wrapT)
+{
+  return FILTER_MODES_FROM_DALI[minFilter] | ((FILTER_MODES_FROM_DALI[magFilter] & FILTER_MAG_BITS) << FILTER_MAG_SHIFT) |
+         (WRAP_MODES_FROM_DALI[wrapS] << WRAP_S_SHIFT) | (WRAP_MODES_FROM_DALI[wrapT] << WRAP_T_SHIFT);
+}
+
+FilterMode::Type SamplerFlags::GetMinFilter(Type flags)
+{
+  return FILTER_MODES_TO_DALI[flags & FILTER_MIN_MASK];
+}
+
+FilterMode::Type SamplerFlags::GetMagFilter(Type flags)
+{
+  return FILTER_MODES_TO_DALI[(flags >> FILTER_MAG_SHIFT) & FILTER_MAG_MASK];
+}
+
+WrapMode::Type SamplerFlags::GetWrapS(Type flags)
+{
+  return WRAP_MODES_TO_DALI[(flags >> WRAP_S_SHIFT) & WRAP_S_MASK];
+}
+
+WrapMode::Type SamplerFlags::GetWrapT(Type flags)
+{
+  return WRAP_MODES_TO_DALI[(flags >> WRAP_T_SHIFT) & WRAP_T_MASK];
+}
+
+Sampler SamplerFlags::MakeSampler(Type flags)
+{
+  auto sampler = Sampler::New();
+  sampler.SetFilterMode(GetMinFilter(flags), GetMagFilter(flags));
+  sampler.SetWrapMode(GetWrapS(flags), GetWrapT(flags));
+  return sampler;
+}
+
+TextureDefinition::TextureDefinition(const std::string& imageUri, SamplerFlags::Type samplerFlags, ImageDimensions minImageDimensions, SamplingMode::Type samplingMode, Matrix3 transform)
+: mImageUri(imageUri),
+  mSamplerFlags(samplerFlags),
+  mMinImageDimensions(minImageDimensions),
+  mSamplingMode(samplingMode),
+  mTransform(transform)
+{
+}
+
+TextureDefinition::TextureDefinition(std::string&& imageUri, SamplerFlags::Type samplerFlags, ImageDimensions minImageDimensions, SamplingMode::Type samplingMode, Matrix3 transform)
+: mImageUri(std::move(imageUri)),
+  mSamplerFlags(samplerFlags),
+  mMinImageDimensions(minImageDimensions),
+  mSamplingMode(samplingMode),
+  mTransform(transform)
+{
+}
+
+TextureDefinition::TextureDefinition(std::vector<uint8_t>&& textureBuffer, SamplerFlags::Type samplerFlags, ImageDimensions minImageDimensions, SamplingMode::Type samplingMode, Matrix3 transform)
+: mImageUri(),
+  mSamplerFlags(samplerFlags),
+  mMinImageDimensions(minImageDimensions),
+  mSamplingMode(samplingMode),
+  mTransform(transform),
+  mTextureBuffer(std::move(textureBuffer))
+{
+}
+
+MaterialDefinition::RawData
+MaterialDefinition::LoadRaw(const std::string& imagesPath)
+{
+  RawData raw;
+
+  const bool hasTransparency = MaskMatch(mFlags, TRANSPARENCY);
+  // Why we add additional count here?
+  uint32_t numBuffers = static_cast<uint32_t>(mTextureStages.size()) + (hasTransparency ? !CheckTextures(ALBEDO) + !CheckTextures(METALLIC | ROUGHNESS) + !CheckTextures(NORMAL)
+                                                                                        : !CheckTextures(ALBEDO | METALLIC) + !CheckTextures(NORMAL | ROUGHNESS));
+  if(numBuffers == 0)
+  {
+    return raw;
+  }
+  raw.mTextures.reserve(numBuffers);
+
+  // Load textures
+  auto iTexture   = mTextureStages.begin();
+  auto checkStage = [&](uint32_t flags) {
+    return iTexture != mTextureStages.end() && MaskMatch(iTexture->mSemantic, flags);
+  };
+
+  // Check for compulsory textures: Albedo, Metallic, Roughness, Normal
+  if(checkStage(ALBEDO | METALLIC))
+  {
+    raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+    ++iTexture;
+
+    if(checkStage(NORMAL | ROUGHNESS))
+    {
+      raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+      ++iTexture;
+    }
+    else // single value normal-roughness
+    {
+      raw.mTextures.push_back({Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataZAxisAndAlphaRGBA(), GetSingleValueSampler()});
+    }
+  }
+  else
+  {
+    if(checkStage(ALBEDO))
+    {
+      raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+      ++iTexture;
+    }
+    else if(mNeedAlbedoTexture) // single value albedo, albedo-alpha or albedo-metallic
+    {
+      uint32_t bufferSize = 4;
+      uint8_t* buffer     = nullptr;
+      auto     format     = Pixel::Format::RGBA8888;
+      if(hasTransparency) // albedo-alpha
+      {
+        buffer    = new uint8_t[bufferSize];
+        buffer[3] = static_cast<uint8_t>(mColor.a * 255.f);
+      }
+      else if(!checkStage(METALLIC | ROUGHNESS)) // albedo-metallic
+      {
+        buffer    = new uint8_t[bufferSize];
+        buffer[3] = 0xff; // metallic of 1.0
+      }
+      else // albedo
+      {
+        bufferSize = 3;
+        buffer     = new uint8_t[bufferSize];
+        format     = Pixel::Format::RGB888;
+      }
+      buffer[0] = static_cast<uint8_t>(mColor.r * 255.f);
+      buffer[1] = static_cast<uint8_t>(mColor.g * 255.f);
+      buffer[2] = static_cast<uint8_t>(mColor.b * 255.f);
+      raw.mTextures.push_back({Dali::Integration::NewPixelDataWithReleaseAfterUpload(buffer, bufferSize, 1, 1, 0, format, PixelData::DELETE_ARRAY), GetSingleValueSampler()});
+    }
+
+    // If we have transparency, or an image based albedo map, we will have to continue with separate metallicRoughness + normal.
+    const bool createMetallicRoughnessAndNormal = hasTransparency || std::distance(mTextureStages.begin(), iTexture) > 0;
+    if(checkStage(METALLIC | ROUGHNESS))
+    {
+      raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+      ++iTexture;
+    }
+    else if(createMetallicRoughnessAndNormal && mNeedMetallicRoughnessTexture)
+    {
+      // NOTE: we want to set both metallic and roughness to 1.0; dli uses the R & A channels,
+      // glTF2 uses B & G, so we might as well just set all components to 1.0.
+      raw.mTextures.push_back({Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataWhiteRGBA(), GetSingleValueSampler()});
+    }
+
+    if(checkStage(NORMAL))
+    {
+      raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+      ++iTexture;
+    }
+    else if(mNeedNormalTexture)
+    {
+      if(createMetallicRoughnessAndNormal)
+      {
+        raw.mTextures.push_back({Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataZAxisRGB(), GetSingleValueSampler()});
+      }
+      else // single-value normal-roughness
+      {
+        raw.mTextures.push_back({Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyPixelDataZAxisAndAlphaRGBA(), GetSingleValueSampler()});
+      }
+    }
+  }
+
+  // Extra textures.
+  if(checkStage(SUBSURFACE))
+  {
+    raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+    ++iTexture;
+  }
+
+  if(checkStage(OCCLUSION))
+  {
+    raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+    ++iTexture;
+  }
+
+  if(checkStage(EMISSIVE))
+  {
+    raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+    ++iTexture;
+  }
+
+  if(checkStage(SPECULAR))
+  {
+    raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+    ++iTexture;
+  }
+
+  if(checkStage(SPECULAR_COLOR))
+  {
+    raw.mTextures.push_back({LoadImageResource(imagesPath, iTexture->mTexture, FittingMode::DEFAULT, true), iTexture->mTexture.mSamplerFlags});
+    ++iTexture;
+  }
+
+  return raw;
+}
+
+TextureSet MaterialDefinition::Load(const EnvironmentDefinition::Vector& environments, RawData&& raw) const
+{
+  auto textureSet = TextureSet::New();
+
+  uint32_t n = 0;
+  for(auto& tData : raw.mTextures)
+  {
+    auto&   pixels = tData.mPixels;
+    Texture texture;
+    if(pixels)
+    {
+      texture = Dali::Scene3D::Internal::ImageResourceLoader::GetCachedTexture(pixels, tData.mSamplerFlags & SamplerFlags::MIPMAP_MASK);
+    }
+
+    textureSet.SetTexture(n, texture);
+    textureSet.SetSampler(n, SamplerFlags::MakeSampler(tData.mSamplerFlags));
+
+    ++n;
+  }
+
+  if(mShadowAvailable)
+  {
+    textureSet.SetTexture(n++, Dali::Scene3D::Internal::ImageResourceLoader::GetEmptyTextureWhiteRGB());
+  }
+
+  // Assign textures to slots -- starting with 2D ones, then cubemaps, if any.
+  if(mEnvironmentIdx < static_cast<Index>(environments.size()))
+  {
+    auto& envTextures = environments[mEnvironmentIdx].second;
+    // If pre-computed brdf texture is defined, set the texture.
+    if(envTextures.mBrdf)
+    {
+      textureSet.SetTexture(n, envTextures.mBrdf);
+      ++n;
+    }
+
+    if(envTextures.mDiffuse)
+    {
+      textureSet.SetTexture(n, envTextures.mDiffuse);
+      ++n;
+    }
+
+    if(envTextures.mSpecular)
+    {
+      auto specularSampler = Sampler::New();
+      specularSampler.SetWrapMode(WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE, WrapMode::CLAMP_TO_EDGE);
+      specularSampler.SetFilterMode(FilterMode::LINEAR_MIPMAP_LINEAR, FilterMode::LINEAR);
+
+      textureSet.SetTexture(n, envTextures.mSpecular);
+      textureSet.SetSampler(n, specularSampler);
+      ++n;
+    }
+  }
+  else
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Environment index (" << mEnvironmentIdx << ") out of bounds (" << environments.size() << ").";
+  }
+
+  return textureSet;
+}
+
+bool MaterialDefinition::CheckTextures(uint32_t flags) const
+{
+  return std::find_if(mTextureStages.begin(), mTextureStages.end(), [flags](const TextureStage& ts) { return MaskMatch(ts.mSemantic, flags); }) != mTextureStages.end();
+}
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/public-api/loader/material-definition.h b/dali-scene3d/public-api/loader/material-definition.h
new file mode 100644
index 0000000..fcd942d
--- /dev/null
+++ b/dali-scene3d/public-api/loader/material-definition.h
@@ -0,0 +1,281 @@
+#ifndef DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H
+#define DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/images/image-operations.h>
+#include <dali/public-api/math/vector4.h>
+#include <cmath>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/environment-definition.h>
+#include <dali-scene3d/public-api/loader/index.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+#include <dali-scene3d/public-api/model-components/material.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Helper enum for encoding and decoding sampler states.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API SamplerFlags
+{
+  using Type = uint8_t;
+
+  enum Values : Type
+  {
+    // Filter - 3 bits
+    FILTER_NEAREST        = 0,
+    FILTER_LINEAR         = NthBit(0),
+    FILTER_MIPMAP_NEAREST = NthBit(1),
+    FILTER_MIPMAP_LINEAR  = NthBit(2),
+
+    // Wrap - 2 bits
+    WRAP_REPEAT = 0,
+    WRAP_CLAMP  = NthBit(0),
+    WRAP_MIRROR = NthBit(1),
+
+    // Layout - apply shift, then mask
+    FILTER_MIN_BITS = 3,
+    FILTER_MIN_MASK = NthBit(FILTER_MIN_BITS) - 1,
+
+    FILTER_MAG_BITS  = 1,
+    FILTER_MAG_SHIFT = FILTER_MIN_BITS,
+    FILTER_MAG_MASK  = NthBit(FILTER_MAG_BITS) - 1,
+
+    WRAP_S_BITS  = 2,
+    WRAP_S_SHIFT = FILTER_MAG_SHIFT + FILTER_MAG_BITS,
+    WRAP_S_MASK  = NthBit(WRAP_S_BITS) - 1,
+
+    WRAP_T_BITS  = 2,
+    WRAP_T_SHIFT = WRAP_S_SHIFT + WRAP_S_BITS,
+    WRAP_T_MASK  = NthBit(WRAP_T_BITS) - 1,
+
+    // Diagnostics
+    MIPMAP_MASK = FILTER_MIPMAP_LINEAR | FILTER_MIPMAP_NEAREST,
+
+    // Default
+    DEFAULT = FILTER_LINEAR | (FILTER_LINEAR << FILTER_MAG_SHIFT) | (WRAP_REPEAT << WRAP_S_SHIFT) | (WRAP_REPEAT << WRAP_T_SHIFT), // LINEAR filters, REPEAT wraps
+  };
+
+  /**
+   * @brief Retrieves the bit pattern calculated from the given Dali Sampler settings.
+   * @SINCE_2_0.7
+   * @return SamplerFlags bit pattern.
+   */
+  static Type Encode(FilterMode::Type minFilter, FilterMode::Type magFilter, WrapMode::Type wrapS, WrapMode::Type wrapT);
+
+  /**
+   * @brief Decodes the minification filter patter of @a flags into the corresponding FilterMode.
+   * @SINCE_2_0.7
+   */
+  static FilterMode::Type GetMinFilter(Type flags);
+
+  /**
+   * @brief Decodes the magnification filter patter of @a flags into the corresponding FilterMode.
+   * @SINCE_2_0.7
+   */
+  static FilterMode::Type GetMagFilter(Type flags);
+
+  /**
+   * @brief Decodes the horizontal wrap pattern of @a flags into the corresponding WrapMode.
+   * @SINCE_2_0.7
+   */
+  static WrapMode::Type GetWrapS(Type flags);
+
+  /**
+   * @brief Decodes the vertical wrap pattern of @a flags into the corresponding WrapMode.
+   * @SINCE_2_0.7
+   */
+  static WrapMode::Type GetWrapT(Type flags);
+
+  /**
+   * @brief Creates a Sampler with the settings encoded in @a flags.
+   * @SINCE_2_0.7
+   */
+  static Sampler MakeSampler(Type flags);
+};
+
+/**
+ * @brief Defines a texture from a combination of an image URI and its sampler definition.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API TextureDefinition
+{
+  static const Matrix3 DEFAULT_TRANSFORM;
+
+  std::string          mImageUri; // When the texture is loaded from embedded resources, this URI is used as a data stream.
+  std::string          mDirectoryPath;
+  SamplerFlags::Type   mSamplerFlags;
+  ImageDimensions      mMinImageDimensions;
+  SamplingMode::Type   mSamplingMode;
+  Matrix3              mTransform{DEFAULT_TRANSFORM}; // Texture transform
+  std::vector<uint8_t> mTextureBuffer;
+
+  TextureDefinition(const std::string& imageUri = "", SamplerFlags::Type samplerFlags = SamplerFlags::DEFAULT, ImageDimensions minImageDimensions = ImageDimensions(), SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR, Matrix3 transform = DEFAULT_TRANSFORM);
+  TextureDefinition(std::string&& imageUri, SamplerFlags::Type samplerFlags = SamplerFlags::DEFAULT, ImageDimensions minImageDimensions = ImageDimensions(), SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR, Matrix3 transform = DEFAULT_TRANSFORM);
+  TextureDefinition(std::vector<uint8_t>&& textureBuffer, SamplerFlags::Type samplerFlags = SamplerFlags::DEFAULT, ImageDimensions minImageDimensions = ImageDimensions(), SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR, Matrix3 transform = DEFAULT_TRANSFORM);
+};
+
+/**
+ * @brief Defines a material with a number of texture stages, whether mipmappping
+ *  is enabled, and an index of an environment (usually of all environments in a
+ *  scene). Textures from the environment are added last when the DALi TextureSet
+ *  is being created.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API MaterialDefinition
+{
+  enum Flags : uint32_t
+  {
+    // Texture semantics
+    ALBEDO         = NthBit(0),
+    METALLIC       = NthBit(1),
+    ROUGHNESS      = NthBit(2),
+    NORMAL         = NthBit(3),
+    EMISSIVE       = NthBit(4),
+    OCCLUSION      = NthBit(5),
+    SPECULAR       = NthBit(6),
+    SPECULAR_COLOR = NthBit(7),
+    SUBSURFACE     = NthBit(8), // Note: dli-only
+
+    // Other binary options
+    TRANSPARENCY  = NthBit(20),
+    GLTF_CHANNELS = NthBit(21), // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#pbrmetallicroughnessmetallicroughnesstexture
+
+    // Alpha cutoff - reserved from the 24th bit
+    ALPHA_CUTOFF_BITS  = 8,
+    ALPHA_CUTOFF_SHIFT = sizeof(uint32_t) * 8 - ALPHA_CUTOFF_BITS,
+    ALPHA_CUTOFF_MASK  = (1 << ALPHA_CUTOFF_BITS) - 1,
+  };
+
+  /**
+   * @brief A(n image based) texture that's used in a material.
+   * @SINCE_2_0.7
+   */
+  struct TextureStage
+  {
+    uint32_t          mSemantic;
+    TextureDefinition mTexture;
+  };
+
+  using Vector = std::vector<std::pair<MaterialDefinition, TextureSet>>;
+
+  struct RawData
+  {
+    struct TextureData
+    {
+      PixelData          mPixels;
+      SamplerFlags::Type mSamplerFlags;
+    };
+
+    std::vector<TextureData> mTextures;
+  };
+
+  MaterialDefinition() = default;
+
+  MaterialDefinition(const MaterialDefinition&) = delete;
+  MaterialDefinition& operator=(const MaterialDefinition&) = delete;
+
+  MaterialDefinition(MaterialDefinition&&) = default;
+  MaterialDefinition& operator=(MaterialDefinition&&) = default;
+
+  /**
+   * @brief Loads (or, in the case of solid color materials, creates) raw pixel data,
+   *  which is then returned.
+   * @SINCE_2_0.7
+   * @note This may be called from any thread.
+   */
+  RawData LoadRaw(const std::string& imagesPath);
+
+  /**
+   * @brief Creates Textures from the pixel data in @a raw, gets the
+   *  the cube maps from the iEnvironment'th element of @a environments,
+   *  then creates a DALi TextureSet and returns it.
+   * @SINCE_2_0.7
+   * @note This must be called from the event thread.
+   * @note The textures are added in the following order: 2D, cube maps.
+   */
+  TextureSet Load(const EnvironmentDefinition::Vector& environments, RawData&& raw) const;
+
+  /**
+   * @brief Checks if the given mask matches any of the textures defined.
+   * @SINCE_2_0.7
+   */
+  bool CheckTextures(uint32_t flags) const;
+
+  /**
+   * @return The alpha test reference value.
+   * @SINCE_2_0.7
+   * @note A value of 0.f means no alpha testing.
+   */
+  float GetAlphaCutoff() const
+  {
+    return ((mFlags >> ALPHA_CUTOFF_SHIFT) & ALPHA_CUTOFF_MASK) / 255.f;
+  }
+
+  /**
+   * @brief Encodes the alpha test reference @a value in flags.
+   * @SINCE_2_0.7
+   * @note A value of 0.f means no alpha testing.
+   */
+  void SetAlphaCutoff(float value)
+  {
+    DALI_ASSERT_DEBUG(value >= 0.f && value <= 1.f);
+    mFlags |= static_cast<uint8_t>(std::round(value * 255.f)) << ALPHA_CUTOFF_SHIFT;
+  }
+
+public: // DATA
+  std::shared_ptr<RawData> mRawData;
+  uint32_t                 mFlags = 0x0;
+
+  Index   mEnvironmentIdx      = 0;
+  Vector4 mColor               = Color::WHITE;
+  float   mMetallic            = 1.f;
+  float   mRoughness           = 1.f;
+  Vector4 mBaseColorFactor     = Vector4::ONE;
+  float   mNormalScale         = 1.f;
+  float   mOcclusionStrength   = 1.f;
+  Vector3 mEmissiveFactor      = Vector3::ZERO;
+  float   mIor                 = -1.0f;
+  float   mDielectricSpecular  = 0.04f;
+  float   mSpecularFactor      = 1.0f;
+  Vector3 mSpecularColorFactor = Vector3::ONE;
+
+  // For the glTF, each of albedo, metallicRoughness, normal textures are not essential.
+  bool mNeedAlbedoTexture            = true;
+  bool mNeedMetallicRoughnessTexture = true;
+  bool mNeedNormalTexture            = true;
+  bool mDoubleSided                  = false;
+
+  Scene3D::Material::AlphaModeType mAlphaModeType = Scene3D::Material::AlphaModeType::OPAQUE;
+  bool                             mIsOpaque      = true;
+  bool                             mIsMask        = false;
+
+  bool mShadowAvailable = false;
+
+  std::vector<TextureStage> mTextureStages;
+  Material                  mMaterial;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H
diff --git a/dali-scene3d/public-api/loader/matrix-stack.cpp b/dali-scene3d/public-api/loader/matrix-stack.cpp
new file mode 100644
index 0000000..146e4ed
--- /dev/null
+++ b/dali-scene3d/public-api/loader/matrix-stack.cpp
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2023 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/matrix-stack.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali::Scene3D::Loader
+{
+MatrixStack::MatrixStack()
+{
+  mStack.reserve(16);
+}
+
+bool MatrixStack::IsEmpty() const
+{
+  return mStack.empty();
+}
+
+void MatrixStack::Push(const Matrix& model)
+{
+  if(mStack.empty())
+  {
+    mStack.push_back(model);
+  }
+  else
+  {
+    Matrix m{false};
+    Matrix::Multiply(m, model, mStack.back());
+    mStack.push_back(m);
+  }
+}
+
+const Matrix& MatrixStack::Top() const
+{
+  return mStack.back();
+}
+
+void MatrixStack::Pop()
+{
+  DALI_ASSERT_ALWAYS(mStack.size() > 0);
+  mStack.pop_back();
+}
+
+void MatrixStack::PopAll()
+{
+  mStack.clear();
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/matrix-stack.h b/dali-scene3d/public-api/loader/matrix-stack.h
new file mode 100644
index 0000000..1889e09
--- /dev/null
+++ b/dali-scene3d/public-api/loader/matrix-stack.h
@@ -0,0 +1,52 @@
+#ifndef DALI_SCENE3D_LOADER_MATRIX_STACK_H_
+#define DALI_SCENE3D_LOADER_MATRIX_STACK_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/math/matrix.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief A stack of matrices whereby each newly pushed matrix is stored
+ *  after being multiplied by the previous one (if any).
+ * @SINCE_2_0.7
+ * @note Current implementation reserves space for 16 matrices.
+ */
+class DALI_SCENE3D_API MatrixStack
+{
+public:
+  MatrixStack();
+
+  bool          IsEmpty() const;
+  void          Push(const Matrix& model);
+  const Matrix& Top() const;
+  void          Pop();
+  void          PopAll(); // clears the stack, but retains the storage.
+
+private:
+  std::vector<Matrix> mStack;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_MATRIX_STACK_H_
diff --git a/dali-scene3d/public-api/loader/mesh-definition.cpp b/dali-scene3d/public-api/loader/mesh-definition.cpp
new file mode 100644
index 0000000..6728790
--- /dev/null
+++ b/dali-scene3d/public-api/loader/mesh-definition.cpp
@@ -0,0 +1,1608 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/mesh-definition.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/file-stream.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/math/compile-time-math.h>
+#include <cstring>
+#include <fstream>
+#include <functional>
+#include <type_traits>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+enum class LoadDataType
+{
+  UNSIGNED_BYTE = 0,
+  UNSIGNED_SHORT,
+  FLOAT
+};
+
+struct LoadAccessorInputs
+{
+  MeshDefinition::RawData&  rawData;
+  MeshDefinition::Accessor& accessor;
+  uint32_t                  flags;
+  std::fstream&             fileStream;
+  std::string&              meshPath;
+  BufferDefinition::Vector& buffers;
+};
+
+struct LoadAccessorListInputs
+{
+  MeshDefinition::RawData&               rawData;
+  std::vector<MeshDefinition::Accessor>& accessors;
+  uint32_t                               flags;
+  std::fstream&                          fileStream;
+  std::string&                           meshPath;
+  BufferDefinition::Vector&              buffers;
+};
+
+template<bool use32BitIndices>
+class IndexProvider
+{
+public:
+  using IndexType = typename std::conditional_t<use32BitIndices, uint32_t, uint16_t>;
+  IndexProvider(const uint16_t* indices)
+  : mData(reinterpret_cast<uintptr_t>(indices)),
+    mFunc(indices ? IncrementPointer : Increment)
+  {
+  }
+
+  IndexType operator()()
+  {
+    return mFunc(mData);
+  }
+
+private:
+  static IndexType Increment(uintptr_t& data)
+  {
+    // mData was 'zero' at construct time. Just simply return counter start with 0.
+    return static_cast<IndexType>(data++);
+  }
+
+  static IndexType IncrementPointer(uintptr_t& data)
+  {
+    auto iPtr   = reinterpret_cast<const IndexType*>(data);
+    auto result = *iPtr;
+    data        = reinterpret_cast<uintptr_t>(++iPtr);
+    return result;
+  }
+
+  uintptr_t mData;
+  IndexType (*mFunc)(uintptr_t&);
+};
+
+const char* QUAD("quad");
+
+///@brief Reads a blob from the given stream @a source into @a target, which must have
+/// at least @a descriptor.length bytes.
+bool ReadBlob(const MeshDefinition::Blob& descriptor, std::istream& source, uint8_t* target)
+{
+  source.clear();
+  if(!source.seekg(static_cast<std::streamoff>(static_cast<std::size_t>(descriptor.mOffset)), std::istream::beg))
+  {
+    return false;
+  }
+
+  if(descriptor.IsConsecutive())
+  {
+    return !!source.read(reinterpret_cast<char*>(target), static_cast<std::streamsize>(static_cast<size_t>(descriptor.mLength)));
+  }
+  else
+  {
+    if(descriptor.mStride > descriptor.mElementSizeHint)
+    {
+      const uint32_t diff      = descriptor.mStride - descriptor.mElementSizeHint;
+      uint32_t       readSize  = 0;
+      uint32_t       totalSize = (descriptor.mLength / descriptor.mElementSizeHint) * descriptor.mStride;
+      while(readSize < totalSize &&
+            source.read(reinterpret_cast<char*>(target), descriptor.mElementSizeHint))
+      {
+        readSize += descriptor.mStride;
+        target += descriptor.mElementSizeHint;
+        source.seekg(static_cast<std::streamoff>(static_cast<std::size_t>(diff)), std::istream::cur);
+      }
+      return readSize == totalSize;
+    }
+  }
+  return false;
+}
+
+template<typename T>
+void ReadValues(const std::vector<uint8_t>& valuesBuffer, const std::vector<uint8_t>& indicesBuffer, uint8_t* target, uint32_t count, uint32_t elementSizeHint)
+{
+  const T* const indicesPtr = reinterpret_cast<const T* const>(indicesBuffer.data());
+  for(uint32_t index = 0u; index < count; ++index)
+  {
+    uint32_t valuesIndex = indicesPtr[index] * elementSizeHint;
+    memcpy(target + valuesIndex, &valuesBuffer[index * elementSizeHint], elementSizeHint);
+  }
+}
+
+bool ReadAccessor(const MeshDefinition::Accessor& accessor, std::istream& source, uint8_t* target, std::vector<uint32_t>* sparseIndices)
+{
+  bool success = false;
+
+  if(accessor.mBlob.IsDefined())
+  {
+    success = ReadBlob(accessor.mBlob, source, target);
+    if(!success)
+    {
+      return false;
+    }
+  }
+
+  if(accessor.mSparse)
+  {
+    const MeshDefinition::Blob& indices = accessor.mSparse->mIndices;
+    const MeshDefinition::Blob& values  = accessor.mSparse->mValues;
+
+    if(!indices.IsDefined() || !values.IsDefined())
+    {
+      return false;
+    }
+
+    const auto           indicesBufferSize = indices.GetBufferSize();
+    std::vector<uint8_t> indicesBuffer(indicesBufferSize);
+    success = ReadBlob(indices, source, indicesBuffer.data());
+    if(!success)
+    {
+      return false;
+    }
+
+    const auto           valuesBufferSize = values.GetBufferSize();
+    std::vector<uint8_t> valuesBuffer(valuesBufferSize);
+    success = ReadBlob(values, source, valuesBuffer.data());
+    if(!success)
+    {
+      return false;
+    }
+
+    // If non-null sparse indices vector, prepare it for output
+    if(sparseIndices)
+    {
+      sparseIndices->resize(accessor.mSparse->mCount);
+    }
+
+    switch(indices.mElementSizeHint)
+    {
+      case 1u:
+      {
+        ReadValues<uint8_t>(valuesBuffer, indicesBuffer, target, accessor.mSparse->mCount, values.mElementSizeHint);
+        if(sparseIndices)
+        {
+          // convert 8-bit indices into 32-bit
+          std::transform(indicesBuffer.begin(), indicesBuffer.end(), sparseIndices->begin(), [](const uint8_t& value) { return uint32_t(value); });
+        }
+        break;
+      }
+      case 2u:
+      {
+        ReadValues<uint16_t>(valuesBuffer, indicesBuffer, target, accessor.mSparse->mCount, values.mElementSizeHint);
+        if(sparseIndices)
+        {
+          // convert 16-bit indices into 32-bit
+          std::transform(reinterpret_cast<uint16_t*>(indicesBuffer.data()),
+                         reinterpret_cast<uint16_t*>(indicesBuffer.data()) + accessor.mSparse->mCount,
+                         sparseIndices->begin(),
+                         [](const uint16_t& value) {
+                           return uint32_t(value);
+                         });
+        }
+        break;
+      }
+      case 4u:
+      {
+        ReadValues<uint32_t>(valuesBuffer, indicesBuffer, target, accessor.mSparse->mCount, values.mElementSizeHint);
+        if(sparseIndices)
+        {
+          std::copy(indicesBuffer.begin(), indicesBuffer.end(), reinterpret_cast<uint8_t*>(sparseIndices->data()));
+        }
+        break;
+      }
+      default:
+      {
+        DALI_ASSERT_DEBUG(!"Unsupported type for an index");
+      }
+    }
+  }
+
+  return success;
+}
+
+bool ReadAccessor(const MeshDefinition::Accessor& accessor, std::istream& source, uint8_t* target)
+{
+  return ReadAccessor(accessor, source, target, nullptr);
+}
+
+template<typename T, bool needsNormalize>
+void ReadVectorAccessor(const MeshDefinition::Accessor& accessor, std::istream& source, std::vector<uint8_t>& buffer)
+{
+  constexpr auto sizeofBlobUnit = sizeof(T) * 4;
+
+  DALI_ASSERT_ALWAYS(((accessor.mBlob.mLength % sizeofBlobUnit == 0) ||
+                      accessor.mBlob.mStride >= sizeofBlobUnit) &&
+                     "Buffer length not a multiple of element size");
+  const auto inBufferSize  = accessor.mBlob.GetBufferSize();
+  const auto outBufferSize = (sizeof(Vector4) / sizeofBlobUnit) * inBufferSize;
+
+  buffer.resize(outBufferSize);
+  auto inBuffer = buffer.data() + outBufferSize - inBufferSize;
+  if(!ReadAccessor(accessor, source, inBuffer))
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Failed to read vector data from Accessor.";
+  }
+
+  if(sizeofBlobUnit != sizeof(Vector4))
+  {
+    auto       floats = reinterpret_cast<float*>(buffer.data());
+    const auto end    = inBuffer + inBufferSize;
+    while(inBuffer != end)
+    {
+      const auto value = *reinterpret_cast<T*>(inBuffer);
+      *floats          = (needsNormalize) ? static_cast<float>(value) / static_cast<float>((1 << (sizeof(T) * 8)) - 1) : static_cast<float>(value);
+
+      inBuffer += sizeof(T);
+      ++floats;
+    }
+  }
+}
+
+template<bool needsNormalize>
+void ReadTypedVectorAccessor(LoadDataType loadDataType, MeshDefinition::Accessor& accessor, std::iostream& stream, std::vector<uint8_t>& buffer)
+{
+  switch(loadDataType)
+  {
+    case LoadDataType::UNSIGNED_SHORT:
+    {
+      ReadVectorAccessor<uint16_t, needsNormalize>(accessor, stream, buffer);
+      break;
+    }
+    case LoadDataType::UNSIGNED_BYTE:
+    {
+      ReadVectorAccessor<uint8_t, needsNormalize>(accessor, stream, buffer);
+      break;
+    }
+    default:
+    {
+      ReadVectorAccessor<float, needsNormalize>(accessor, stream, buffer);
+      break;
+    }
+  }
+}
+
+template<bool use32BitsIndices, typename IndexProviderType = IndexProvider<use32BitsIndices>>
+bool GenerateNormals(MeshDefinition::RawData& raw)
+{
+  using IndexType = typename IndexProviderType::IndexType;
+
+  // mIndicies size must be even if we use 32bit indices.
+  if(DALI_UNLIKELY(use32BitsIndices && !raw.mIndices.empty() && !(raw.mIndices.size() % (sizeof(IndexType) / sizeof(uint16_t)) == 0)))
+  {
+    return false;
+  }
+
+  auto& attribs = raw.mAttribs;
+  DALI_ASSERT_DEBUG(attribs.size() > 0); // positions
+
+  IndexProviderType getIndex(raw.mIndices.data());
+
+  const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : static_cast<uint32_t>(raw.mIndices.size() / (sizeof(IndexType) / sizeof(uint16_t)));
+
+  auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
+
+  std::vector<uint8_t> buffer(attribs[0].mNumElements * sizeof(Vector3));
+  auto                 normals = reinterpret_cast<Vector3*>(buffer.data());
+
+  for(uint32_t i = 0; i < numIndices; i += 3)
+  {
+    IndexType indices[]{getIndex(), getIndex(), getIndex()};
+    Vector3   pos[]{positions[indices[0]], positions[indices[1]], positions[indices[2]]};
+
+    Vector3 a = pos[1] - pos[0];
+    Vector3 b = pos[2] - pos[0];
+
+    Vector3 normal(a.Cross(b));
+    normals[indices[0]] += normal;
+    normals[indices[1]] += normal;
+    normals[indices[2]] += normal;
+  }
+
+  auto iEnd = normals + attribs[0].mNumElements;
+  while(normals != iEnd)
+  {
+    normals->Normalize();
+    ++normals;
+  }
+
+  attribs.push_back({"aNormal", Property::VECTOR3, attribs[0].mNumElements, std::move(buffer)});
+
+  return true;
+}
+
+template<bool use32BitsIndices, bool useVec3, bool hasUvs, typename T = std::conditional_t<useVec3, Vector3, Vector4>, typename = std::enable_if_t<(std::is_same<T, Vector3>::value || std::is_same<T, Vector4>::value)>, typename IndexProviderType = IndexProvider<use32BitsIndices>>
+bool GenerateTangents(MeshDefinition::RawData& raw)
+{
+  using IndexType = typename IndexProviderType::IndexType;
+
+  // mIndicies size must be even if we use 32bit indices.
+  if(DALI_UNLIKELY(use32BitsIndices && !raw.mIndices.empty() && !(raw.mIndices.size() % (sizeof(IndexType) / sizeof(uint16_t)) == 0)))
+  {
+    return false;
+  }
+
+  auto& attribs = raw.mAttribs;
+  // Required positions, normals, uvs (if we have). If not, skip generation
+  if(DALI_UNLIKELY(attribs.size() < (2 + static_cast<size_t>(hasUvs))))
+  {
+    return false;
+  }
+
+  std::vector<uint8_t> buffer(attribs[0].mNumElements * sizeof(T));
+  auto                 tangents = reinterpret_cast<T*>(buffer.data());
+
+  if constexpr(hasUvs)
+  {
+    IndexProviderType getIndex(raw.mIndices.data());
+
+    const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : static_cast<uint32_t>(raw.mIndices.size() / (sizeof(IndexType) / sizeof(uint16_t)));
+
+    auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
+    auto* uvs       = reinterpret_cast<const Vector2*>(attribs[2].mData.data());
+
+    for(uint32_t i = 0; i < numIndices; i += 3)
+    {
+      IndexType indices[]{getIndex(), getIndex(), getIndex()};
+      Vector3   pos[]{positions[indices[0]], positions[indices[1]], positions[indices[2]]};
+      Vector2   uv[]{uvs[indices[0]], uvs[indices[1]], uvs[indices[2]]};
+
+      float x0 = pos[1].x - pos[0].x;
+      float y0 = pos[1].y - pos[0].y;
+      float z0 = pos[1].z - pos[0].z;
+
+      float x1 = pos[2].x - pos[0].x;
+      float y1 = pos[2].y - pos[0].y;
+      float z1 = pos[2].z - pos[0].z;
+
+      float s0 = uv[1].x - uv[0].x;
+      float t0 = uv[1].y - uv[0].y;
+
+      float s1 = uv[2].x - uv[0].x;
+      float t1 = uv[2].y - uv[0].y;
+
+      float   det = (s0 * t1 - t0 * s1);
+      float   r   = 1.f / ((std::abs(det) < Dali::Epsilon<1000>::value) ? (Dali::Epsilon<1000>::value * (det > 0.0f ? 1.f : -1.f)) : det);
+      Vector3 tangent((x0 * t1 - t0 * x1) * r, (y0 * t1 - t0 * y1) * r, (z0 * t1 - t0 * z1) * r);
+      tangents[indices[0]] += T(tangent);
+      tangents[indices[1]] += T(tangent);
+      tangents[indices[2]] += T(tangent);
+    }
+  }
+
+  auto* normals = reinterpret_cast<const Vector3*>(attribs[1].mData.data());
+  auto  iEnd    = normals + attribs[1].mNumElements;
+  while(normals != iEnd)
+  {
+    Vector3 tangentVec3;
+    if constexpr(hasUvs)
+    {
+      // Calculated by indexs
+      tangentVec3 = Vector3((*tangents).x, (*tangents).y, (*tangents).z);
+    }
+    else
+    {
+      // Only choiced by normal vector. by indexs
+      Vector3 t[]{normals->Cross(Vector3::XAXIS), normals->Cross(Vector3::YAXIS)};
+      tangentVec3 = t[t[1].LengthSquared() > t[0].LengthSquared()];
+    }
+
+    tangentVec3 -= *normals * normals->Dot(tangentVec3);
+    tangentVec3.Normalize();
+    if constexpr(useVec3)
+    {
+      *tangents = tangentVec3;
+    }
+    else
+    {
+      *tangents = Vector4(tangentVec3.x, tangentVec3.y, tangentVec3.z, 1.0f);
+    }
+
+    ++tangents;
+    ++normals;
+  }
+  attribs.push_back({"aTangent", useVec3 ? Property::VECTOR3 : Property::VECTOR4, attribs[0].mNumElements, std::move(buffer)});
+
+  return true;
+}
+
+void CalculateTextureSize(uint32_t totalTextureSize, uint32_t& textureWidth, uint32_t& textureHeight)
+{
+  DALI_ASSERT_DEBUG(0u != totalTextureSize && "totalTextureSize is zero.")
+
+  // Calculate the dimensions of the texture.
+  // The total size of the texture is the length of the blend shapes blob.
+
+  textureWidth  = 0u;
+  textureHeight = 0u;
+
+  if(0u == totalTextureSize)
+  {
+    // nothing to do.
+    return;
+  }
+
+  const uint32_t pow2      = static_cast<uint32_t>(ceil(log2(totalTextureSize)));
+  const uint32_t powWidth  = pow2 >> 1u;
+  const uint32_t powHeight = pow2 - powWidth;
+
+  textureWidth  = 1u << powWidth;
+  textureHeight = 1u << powHeight;
+}
+
+template<typename T>
+float GetNormalizedScale()
+{
+  return 1.0f / (std::numeric_limits<T>::max());
+}
+
+template<typename T>
+void DequantizeData(std::vector<uint8_t>& buffer, float* dequantizedValues, uint32_t numValues, bool normalized)
+{
+  // see https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_mesh_quantization#encoding-quantized-data
+
+  T* values = reinterpret_cast<T*>(buffer.data());
+
+  for(uint32_t i = 0; i < numValues; ++i)
+  {
+    *dequantizedValues = normalized ? std::max((*values) * GetNormalizedScale<T>(), -1.0f) : *values;
+
+    values++;
+    dequantizedValues++;
+  }
+}
+
+void GetDequantizedData(std::vector<uint8_t>& buffer, uint32_t numComponents, uint32_t count, uint32_t flags, bool normalized)
+{
+  bool dequantized = false;
+
+  std::vector<uint8_t> dequantizedBuffer(count * numComponents * sizeof(float));
+  float*               dequantizedValues = reinterpret_cast<float*>(dequantizedBuffer.data());
+
+  if(MaskMatch(flags, MeshDefinition::Flags::S8_POSITION) || MaskMatch(flags, MeshDefinition::Flags::S8_NORMAL) || MaskMatch(flags, MeshDefinition::Flags::S8_TANGENT) || MaskMatch(flags, MeshDefinition::Flags::S8_TEXCOORD))
+  {
+    DequantizeData<int8_t>(buffer, dequantizedValues, numComponents * count, normalized);
+    dequantized = true;
+  }
+  else if(MaskMatch(flags, MeshDefinition::Flags::U8_POSITION) || MaskMatch(flags, MeshDefinition::Flags::U8_TEXCOORD))
+  {
+    DequantizeData<uint8_t>(buffer, dequantizedValues, numComponents * count, normalized);
+    dequantized = true;
+  }
+  else if(MaskMatch(flags, MeshDefinition::Flags::S16_POSITION) || MaskMatch(flags, MeshDefinition::Flags::S16_NORMAL) || MaskMatch(flags, MeshDefinition::Flags::S16_TANGENT) || MaskMatch(flags, MeshDefinition::Flags::S16_TEXCOORD))
+  {
+    DequantizeData<int16_t>(buffer, dequantizedValues, numComponents * count, normalized);
+    dequantized = true;
+  }
+  else if(MaskMatch(flags, MeshDefinition::Flags::U16_POSITION) || MaskMatch(flags, MeshDefinition::Flags::U16_TEXCOORD))
+  {
+    DequantizeData<uint16_t>(buffer, dequantizedValues, numComponents * count, normalized);
+    dequantized = true;
+  }
+
+  if(dequantized)
+  {
+    buffer = std::move(dequantizedBuffer);
+  }
+}
+
+void GetDequantizedMinMax(std::vector<float>& min, std::vector<float>& max, uint32_t flags)
+{
+  float scale = 1.0f;
+
+  if(MaskMatch(flags, MeshDefinition::Flags::S8_POSITION) || MaskMatch(flags, MeshDefinition::Flags::S8_NORMAL) || MaskMatch(flags, MeshDefinition::Flags::S8_TANGENT) || MaskMatch(flags, MeshDefinition::Flags::S8_TEXCOORD))
+  {
+    scale = GetNormalizedScale<int8_t>();
+  }
+  else if(MaskMatch(flags, MeshDefinition::Flags::U8_POSITION) || MaskMatch(flags, MeshDefinition::Flags::U8_TEXCOORD))
+  {
+    scale = GetNormalizedScale<uint8_t>();
+  }
+  else if(MaskMatch(flags, MeshDefinition::Flags::S16_POSITION) || MaskMatch(flags, MeshDefinition::Flags::S16_NORMAL) || MaskMatch(flags, MeshDefinition::Flags::S16_TANGENT) || MaskMatch(flags, MeshDefinition::Flags::S16_TEXCOORD))
+  {
+    scale = GetNormalizedScale<int16_t>();
+  }
+  else if(MaskMatch(flags, MeshDefinition::Flags::U16_POSITION) || MaskMatch(flags, MeshDefinition::Flags::U16_TEXCOORD))
+  {
+    scale = GetNormalizedScale<uint16_t>();
+  }
+
+  if(scale != 1.0f)
+  {
+    for(float& value : min)
+    {
+      value = std::max(value * scale, -1.0f);
+    }
+
+    for(float& value : max)
+    {
+      value = std::min(value * scale, 1.0f);
+    }
+  }
+}
+
+void CalculateGltf2BlendShapes(uint8_t* geometryBuffer, std::vector<MeshDefinition::BlendShape>& blendShapes, uint32_t numberOfVertices, float& blendShapeUnnormalizeFactor, BufferDefinition::Vector& buffers)
+{
+  uint32_t geometryBufferIndex = 0u;
+  float    maxDistanceSquared  = 0.f;
+  Vector3* geometryBufferV3    = reinterpret_cast<Vector3*>(geometryBuffer);
+  for(auto& blendShape : blendShapes)
+  {
+    if(blendShape.deltas.IsDefined())
+    {
+      const auto bufferSize = blendShape.deltas.mBlob.GetBufferSize();
+      uint32_t   numVector3;
+
+      if(MaskMatch(blendShape.mFlags, MeshDefinition::S8_POSITION))
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.deltas.mBlob.mLength % (sizeof(uint8_t) * 3) == 0) ||
+                            blendShape.deltas.mBlob.mStride >= (sizeof(uint8_t) * 3)) &&
+                           "Blend Shape position buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(uint8_t) * 3));
+      }
+      else if(MaskMatch(blendShape.mFlags, MeshDefinition::S16_POSITION))
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.deltas.mBlob.mLength % (sizeof(uint16_t) * 3) == 0) ||
+                            blendShape.deltas.mBlob.mStride >= (sizeof(uint16_t) * 3)) &&
+                           "Blend Shape position buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(uint16_t) * 3));
+      }
+      else
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.deltas.mBlob.mLength % sizeof(Vector3) == 0) ||
+                            blendShape.deltas.mBlob.mStride >= sizeof(Vector3)) &&
+                           "Blend Shape position buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / sizeof(Vector3));
+      }
+
+      std::vector<uint8_t>  buffer(bufferSize);
+      std::vector<uint32_t> sparseIndices{};
+
+      if(ReadAccessor(blendShape.deltas, buffers[blendShape.deltas.mBufferIdx].GetBufferStream(), buffer.data(), &sparseIndices))
+      {
+        GetDequantizedData(buffer, 3u, numVector3, blendShape.mFlags & MeshDefinition::POSITIONS_MASK, blendShape.deltas.mNormalized);
+
+        if(blendShape.deltas.mNormalized)
+        {
+          GetDequantizedMinMax(blendShape.deltas.mBlob.mMin, blendShape.deltas.mBlob.mMax, blendShape.mFlags & MeshDefinition::POSITIONS_MASK);
+        }
+
+        blendShape.deltas.mBlob.ApplyMinMax(numVector3, reinterpret_cast<float*>(buffer.data()), &sparseIndices);
+
+        // Calculate the difference with the original mesh.
+        // Find the max distance to normalize the deltas.
+        const auto* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
+
+        auto ProcessVertex = [&geometryBufferV3, &deltasBuffer, &maxDistanceSquared](uint32_t geometryBufferIndex, uint32_t deltaIndex) {
+          Vector3& delta = geometryBufferV3[geometryBufferIndex] = deltasBuffer[deltaIndex];
+          delta                                                  = deltasBuffer[deltaIndex];
+          return std::max(maxDistanceSquared, delta.LengthSquared());
+        };
+
+        if(sparseIndices.empty())
+        {
+          for(uint32_t index = 0u; index < numberOfVertices; ++index)
+          {
+            maxDistanceSquared = ProcessVertex(geometryBufferIndex++, index);
+          }
+        }
+        else
+        {
+          // initialize blendshape texture
+          // TODO: there may be a case when sparse accessor uses a base buffer view for initial values.
+          std::fill(geometryBufferV3 + geometryBufferIndex, geometryBufferV3 + geometryBufferIndex + numberOfVertices, Vector3::ZERO);
+          for(auto index : sparseIndices)
+          {
+            maxDistanceSquared = ProcessVertex(geometryBufferIndex + index, index);
+          }
+          geometryBufferIndex += numberOfVertices;
+        }
+      }
+    }
+
+    if(blendShape.normals.IsDefined())
+    {
+      const auto bufferSize = blendShape.normals.mBlob.GetBufferSize();
+      uint32_t   numVector3;
+
+      if(MaskMatch(blendShape.mFlags, MeshDefinition::S8_NORMAL))
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.normals.mBlob.mLength % (sizeof(int8_t) * 3) == 0) ||
+                            blendShape.normals.mBlob.mStride >= (sizeof(int8_t) * 3)) &&
+                           "Blend Shape normals buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(int8_t) * 3));
+      }
+      else if(MaskMatch(blendShape.mFlags, MeshDefinition::S16_NORMAL))
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.normals.mBlob.mLength % (sizeof(int16_t) * 3) == 0) ||
+                            blendShape.normals.mBlob.mStride >= (sizeof(int16_t) * 3)) &&
+                           "Blend Shape normals buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(int16_t) * 3));
+      }
+      else
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.normals.mBlob.mLength % sizeof(Vector3) == 0) ||
+                            blendShape.normals.mBlob.mStride >= sizeof(Vector3)) &&
+                           "Blend Shape normals buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / sizeof(Vector3));
+      }
+
+      std::vector<uint8_t>  buffer(bufferSize);
+      std::vector<uint32_t> sparseIndices;
+
+      if(ReadAccessor(blendShape.normals, buffers[blendShape.normals.mBufferIdx].GetBufferStream(), buffer.data(), &sparseIndices))
+      {
+        GetDequantizedData(buffer, 3u, numVector3, blendShape.mFlags & MeshDefinition::NORMALS_MASK, blendShape.normals.mNormalized);
+
+        if(blendShape.normals.mNormalized)
+        {
+          GetDequantizedMinMax(blendShape.normals.mBlob.mMin, blendShape.normals.mBlob.mMax, blendShape.mFlags & MeshDefinition::NORMALS_MASK);
+        }
+
+        blendShape.normals.mBlob.ApplyMinMax(numVector3, reinterpret_cast<float*>(buffer.data()), &sparseIndices);
+
+        // Calculate the difference with the original mesh, and translate to make all values positive.
+        const Vector3* const deltasBuffer  = reinterpret_cast<const Vector3* const>(buffer.data());
+        auto                 ProcessVertex = [&geometryBufferV3, &deltasBuffer, &maxDistanceSquared](uint32_t geometryBufferIndex, uint32_t deltaIndex) {
+          Vector3& delta = geometryBufferV3[geometryBufferIndex] = deltasBuffer[deltaIndex];
+          delta.x *= 0.5f;
+          delta.y *= 0.5f;
+          delta.z *= 0.5f;
+
+          delta.x += 0.5f;
+          delta.y += 0.5f;
+          delta.z += 0.5f;
+        };
+
+        if(sparseIndices.empty())
+        {
+          for(uint32_t index = 0u; index < numberOfVertices; ++index)
+          {
+            ProcessVertex(geometryBufferIndex++, index);
+          }
+        }
+        else
+        {
+          std::fill(geometryBufferV3 + geometryBufferIndex, geometryBufferV3 + geometryBufferIndex + numberOfVertices, Vector3(0.5, 0.5, 0.5));
+          for(auto index : sparseIndices)
+          {
+            ProcessVertex(geometryBufferIndex + index, index);
+          }
+          geometryBufferIndex += numberOfVertices;
+        }
+      }
+    }
+
+    if(blendShape.tangents.IsDefined())
+    {
+      const auto bufferSize = blendShape.tangents.mBlob.GetBufferSize();
+
+      uint32_t numVector3;
+
+      if(MaskMatch(blendShape.mFlags, MeshDefinition::S8_TANGENT))
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.tangents.mBlob.mLength % (sizeof(int8_t) * 3) == 0) ||
+                            blendShape.tangents.mBlob.mStride >= (sizeof(int8_t) * 3)) &&
+                           "Blend Shape tangents buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(int8_t) * 3));
+      }
+      else if(MaskMatch(blendShape.mFlags, MeshDefinition::S16_TANGENT))
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.tangents.mBlob.mLength % (sizeof(int16_t) * 3) == 0) ||
+                            blendShape.tangents.mBlob.mStride >= (sizeof(int16_t) * 3)) &&
+                           "Blend Shape tangents buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(int16_t) * 3));
+      }
+      else
+      {
+        DALI_ASSERT_ALWAYS(((blendShape.tangents.mBlob.mLength % sizeof(Vector3) == 0) ||
+                            blendShape.tangents.mBlob.mStride >= sizeof(Vector3)) &&
+                           "Blend Shape tangents buffer length not a multiple of element size");
+        numVector3 = static_cast<uint32_t>(bufferSize / sizeof(Vector3));
+      }
+
+      std::vector<uint8_t>  buffer(bufferSize);
+      std::vector<uint32_t> sparseIndices;
+
+      if(ReadAccessor(blendShape.tangents, buffers[blendShape.tangents.mBufferIdx].GetBufferStream(), buffer.data(), &sparseIndices))
+      {
+        GetDequantizedData(buffer, 3u, numVector3, blendShape.mFlags & MeshDefinition::TANGENTS_MASK, blendShape.tangents.mNormalized);
+
+        if(blendShape.tangents.mNormalized)
+        {
+          GetDequantizedMinMax(blendShape.tangents.mBlob.mMin, blendShape.tangents.mBlob.mMax, blendShape.mFlags & MeshDefinition::TANGENTS_MASK);
+        }
+
+        blendShape.tangents.mBlob.ApplyMinMax(numVector3, reinterpret_cast<float*>(buffer.data()), &sparseIndices);
+
+        // Calculate the difference with the original mesh, and translate to make all values positive.
+        const Vector3* const deltasBuffer  = reinterpret_cast<const Vector3* const>(buffer.data());
+        auto                 ProcessVertex = [&geometryBufferV3, &deltasBuffer, &maxDistanceSquared](uint32_t geometryBufferIndex, uint32_t deltaIndex) {
+          Vector3& delta = geometryBufferV3[geometryBufferIndex] = deltasBuffer[deltaIndex];
+          delta.x *= 0.5f;
+          delta.y *= 0.5f;
+          delta.z *= 0.5f;
+
+          delta.x += 0.5f;
+          delta.y += 0.5f;
+          delta.z += 0.5f;
+        };
+
+        if(sparseIndices.empty())
+        {
+          for(uint32_t index = 0u; index < numberOfVertices; ++index)
+          {
+            ProcessVertex(geometryBufferIndex++, index);
+          }
+        }
+        else
+        {
+          std::fill(geometryBufferV3 + geometryBufferIndex, geometryBufferV3 + geometryBufferIndex + numberOfVertices, Vector3(0.5, 0.5, 0.5));
+          for(auto index : sparseIndices)
+          {
+            ProcessVertex(geometryBufferIndex + index, index);
+          }
+          geometryBufferIndex += numberOfVertices;
+        }
+      }
+    }
+  }
+
+  geometryBufferIndex = 0u;
+
+  const float maxDistance = sqrtf(maxDistanceSquared);
+
+  const float normalizeFactor = (maxDistanceSquared < Math::MACHINE_EPSILON_100) ? 1.f : (0.5f / maxDistance);
+
+  // Calculate and store the unnormalize factor.
+  blendShapeUnnormalizeFactor = maxDistance * 2.0f;
+
+  for(const auto& blendShape : blendShapes)
+  {
+    // Normalize all the deltas and translate to a possitive value.
+    // Deltas are going to be passed to the shader in a color texture
+    // whose values that are less than zero are clamped.
+    if(blendShape.deltas.IsDefined())
+    {
+      for(uint32_t index = 0u; index < numberOfVertices; ++index)
+      {
+        Vector3& delta = geometryBufferV3[geometryBufferIndex++];
+        delta.x        = Clamp(((delta.x * normalizeFactor) + 0.5f), 0.f, 1.f);
+        delta.y        = Clamp(((delta.y * normalizeFactor) + 0.5f), 0.f, 1.f);
+        delta.z        = Clamp(((delta.z * normalizeFactor) + 0.5f), 0.f, 1.f);
+      }
+    }
+
+    if(blendShape.normals.IsDefined())
+    {
+      geometryBufferIndex += numberOfVertices;
+    }
+
+    if(blendShape.tangents.IsDefined())
+    {
+      geometryBufferIndex += numberOfVertices;
+    }
+  }
+}
+
+std::iostream& GetAvailableData(std::fstream& meshStream, const std::string& meshPath, BufferDefinition& buffer, std::string& availablePath)
+{
+  auto& stream  = (meshStream.is_open()) ? meshStream : buffer.GetBufferStream();
+  availablePath = (meshStream.is_open()) ? meshPath : buffer.GetUri();
+  return stream;
+}
+
+template<bool needsNormalize>
+void ReadTypedVectorAccessors(LoadAccessorListInputs loadAccessorListInputs, LoadDataType loadDataType, std::string attributeName)
+{
+  int setIndex = 0;
+  for(auto& accessor : loadAccessorListInputs.accessors)
+  {
+    std::string        pathJoint;
+    auto&              dataStream = GetAvailableData(loadAccessorListInputs.fileStream, loadAccessorListInputs.meshPath, loadAccessorListInputs.buffers[accessor.mBufferIdx], pathJoint);
+    std::ostringstream name;
+    name << attributeName << setIndex++;
+    std::vector<uint8_t> buffer;
+    ReadTypedVectorAccessor<needsNormalize>(loadDataType, accessor, dataStream, buffer);
+    loadAccessorListInputs.rawData.mAttribs.push_back({name.str(), Property::VECTOR4, static_cast<uint32_t>(buffer.size() / sizeof(Vector4)), std::move(buffer)});
+  }
+}
+
+void LoadIndices(LoadAccessorInputs indicesInput)
+{
+  if(indicesInput.accessor.IsDefined())
+  {
+    if(MaskMatch(indicesInput.flags, MeshDefinition::Flags::U32_INDICES))
+    {
+      DALI_ASSERT_ALWAYS(((indicesInput.accessor.mBlob.mLength % sizeof(uint32_t) == 0) ||
+                          indicesInput.accessor.mBlob.mStride >= sizeof(uint32_t)) &&
+                         "Index buffer length not a multiple of element size");
+      const auto indexCount = indicesInput.accessor.mBlob.GetBufferSize() / sizeof(uint32_t);
+      indicesInput.rawData.mIndices.resize(indexCount * 2); // NOTE: we need space for uint32_ts initially.
+
+      std::string path;
+      auto&       stream = GetAvailableData(indicesInput.fileStream, indicesInput.meshPath, indicesInput.buffers[indicesInput.accessor.mBufferIdx], path);
+      if(!ReadAccessor(indicesInput.accessor, stream, reinterpret_cast<uint8_t*>(indicesInput.rawData.mIndices.data())))
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read indices from '" << path << "'.";
+      }
+    }
+    else if(MaskMatch(indicesInput.flags, MeshDefinition::Flags::U8_INDICES))
+    {
+      DALI_ASSERT_ALWAYS(((indicesInput.accessor.mBlob.mLength % sizeof(uint8_t) == 0) ||
+                          indicesInput.accessor.mBlob.mStride >= sizeof(uint8_t)) &&
+                         "Index buffer length not a multiple of element size");
+      const auto indexCount = indicesInput.accessor.mBlob.GetBufferSize() / sizeof(uint8_t);
+      indicesInput.rawData.mIndices.resize(indexCount); // NOTE: we need space for uint16_ts initially.
+
+      std::string path;
+      auto        u8s    = reinterpret_cast<uint8_t*>(indicesInput.rawData.mIndices.data()) + indexCount;
+      auto&       stream = GetAvailableData(indicesInput.fileStream, indicesInput.meshPath, indicesInput.buffers[indicesInput.accessor.mBufferIdx], path);
+      if(!ReadAccessor(indicesInput.accessor, stream, u8s))
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read indices from '" << path << "'.";
+      }
+
+      auto u16s = indicesInput.rawData.mIndices.data();
+      auto end  = u8s + indexCount;
+      while(u8s != end)
+      {
+        *u16s = static_cast<uint16_t>(*u8s);
+        ++u16s;
+        ++u8s;
+      }
+    }
+    else
+    {
+      DALI_ASSERT_ALWAYS(((indicesInput.accessor.mBlob.mLength % sizeof(unsigned short) == 0) ||
+                          indicesInput.accessor.mBlob.mStride >= sizeof(unsigned short)) &&
+                         "Index buffer length not a multiple of element size");
+      indicesInput.rawData.mIndices.resize(indicesInput.accessor.mBlob.mLength / sizeof(unsigned short));
+
+      std::string path;
+      auto&       stream = GetAvailableData(indicesInput.fileStream, indicesInput.meshPath, indicesInput.buffers[indicesInput.accessor.mBufferIdx], path);
+      if(!ReadAccessor(indicesInput.accessor, stream, reinterpret_cast<uint8_t*>(indicesInput.rawData.mIndices.data())))
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read indicesInput.accessor from '" << path << "'.";
+      }
+    }
+  }
+}
+
+uint32_t LoadPositions(LoadAccessorInputs positionsInput, bool hasBlendShape)
+{
+  uint32_t             numVector3 = 0u;
+  std::vector<Vector3> positions;
+  if(positionsInput.accessor.IsDefined())
+  {
+    const auto bufferSize = positionsInput.accessor.mBlob.GetBufferSize();
+
+    if(MaskMatch(positionsInput.flags, MeshDefinition::Flags::S8_POSITION) || MaskMatch(positionsInput.flags, MeshDefinition::Flags::U8_POSITION))
+    {
+      DALI_ASSERT_ALWAYS(((positionsInput.accessor.mBlob.mLength % (sizeof(uint8_t) * 3) == 0) ||
+                          positionsInput.accessor.mBlob.mStride >= (sizeof(uint8_t) * 3)) &&
+                         "Position buffer length not a multiple of element size");
+      numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(uint8_t) * 3));
+    }
+    else if(MaskMatch(positionsInput.flags, MeshDefinition::Flags::S16_POSITION) || MaskMatch(positionsInput.flags, MeshDefinition::Flags::U16_POSITION))
+    {
+      DALI_ASSERT_ALWAYS(((positionsInput.accessor.mBlob.mLength % (sizeof(uint16_t) * 3) == 0) ||
+                          positionsInput.accessor.mBlob.mStride >= (sizeof(uint16_t) * 3)) &&
+                         "Position buffer length not a multiple of element size");
+      numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(uint16_t) * 3));
+    }
+    else
+    {
+      DALI_ASSERT_ALWAYS(((positionsInput.accessor.mBlob.mLength % sizeof(Vector3) == 0) ||
+                          positionsInput.accessor.mBlob.mStride >= sizeof(Vector3)) &&
+                         "Position buffer length not a multiple of element size");
+      numVector3 = static_cast<uint32_t>(bufferSize / sizeof(Vector3));
+    }
+
+    std::vector<uint8_t> buffer(bufferSize);
+
+    std::string path;
+    auto&       stream = GetAvailableData(positionsInput.fileStream, positionsInput.meshPath, positionsInput.buffers[positionsInput.accessor.mBufferIdx], path);
+    if(!ReadAccessor(positionsInput.accessor, stream, buffer.data()))
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read positions from '" << path << "'.";
+    }
+
+    GetDequantizedData(buffer, 3u, numVector3, positionsInput.flags & MeshDefinition::FlagMasks::POSITIONS_MASK, positionsInput.accessor.mNormalized);
+
+    if(positionsInput.accessor.mNormalized)
+    {
+      GetDequantizedMinMax(positionsInput.accessor.mBlob.mMin, positionsInput.accessor.mBlob.mMax, positionsInput.flags & MeshDefinition::FlagMasks::POSITIONS_MASK);
+    }
+
+    if(positionsInput.accessor.mBlob.mMin.size() != 3u || positionsInput.accessor.mBlob.mMax.size() != 3u)
+    {
+      positionsInput.accessor.mBlob.ComputeMinMax(3u, numVector3, reinterpret_cast<float*>(buffer.data()));
+    }
+    else
+    {
+      positionsInput.accessor.mBlob.ApplyMinMax(numVector3, reinterpret_cast<float*>(buffer.data()));
+    }
+
+    if(hasBlendShape)
+    {
+      positions.resize(numVector3);
+      std::copy(buffer.data(), buffer.data() + buffer.size(), reinterpret_cast<uint8_t*>(positions.data()));
+    }
+
+    positionsInput.rawData.mAttribs.push_back({"aPosition", Property::VECTOR3, numVector3, std::move(buffer)});
+  }
+  return numVector3;
+}
+
+bool LoadNormals(LoadAccessorInputs normalsInput, bool isTriangles, uint32_t positionBufferSize)
+{
+  auto hasNormals = normalsInput.accessor.IsDefined();
+  if(hasNormals)
+  {
+    const auto bufferSize = normalsInput.accessor.mBlob.GetBufferSize();
+    uint32_t   numVector3;
+
+    if(MaskMatch(normalsInput.flags, MeshDefinition::Flags::S8_NORMAL))
+    {
+      DALI_ASSERT_ALWAYS(((normalsInput.accessor.mBlob.mLength % (sizeof(int8_t) * 3) == 0) ||
+                          normalsInput.accessor.mBlob.mStride >= (sizeof(int8_t) * 3)) &&
+                         "Normal buffer length not a multiple of element size");
+      numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(int8_t) * 3));
+    }
+    else if(MaskMatch(normalsInput.flags, MeshDefinition::Flags::S16_NORMAL))
+    {
+      DALI_ASSERT_ALWAYS(((normalsInput.accessor.mBlob.mLength % (sizeof(int16_t) * 3) == 0) ||
+                          normalsInput.accessor.mBlob.mStride >= (sizeof(int16_t) * 3)) &&
+                         "Normal buffer length not a multiple of element size");
+      numVector3 = static_cast<uint32_t>(bufferSize / (sizeof(int16_t) * 3));
+    }
+    else
+    {
+      DALI_ASSERT_ALWAYS(((normalsInput.accessor.mBlob.mLength % sizeof(Vector3) == 0) ||
+                          normalsInput.accessor.mBlob.mStride >= sizeof(Vector3)) &&
+                         "Normal buffer length not a multiple of element size");
+      numVector3 = static_cast<uint32_t>(bufferSize / sizeof(Vector3));
+    }
+
+    std::vector<uint8_t> buffer(bufferSize);
+
+    std::string path;
+    auto&       stream = GetAvailableData(normalsInput.fileStream, normalsInput.meshPath, normalsInput.buffers[normalsInput.accessor.mBufferIdx], path);
+    if(!ReadAccessor(normalsInput.accessor, stream, buffer.data()))
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read normals from '" << path << "'.";
+    }
+
+    GetDequantizedData(buffer, 3u, numVector3, normalsInput.flags & MeshDefinition::FlagMasks::NORMALS_MASK, normalsInput.accessor.mNormalized);
+
+    if(normalsInput.accessor.mNormalized)
+    {
+      GetDequantizedMinMax(normalsInput.accessor.mBlob.mMin, normalsInput.accessor.mBlob.mMax, normalsInput.flags & MeshDefinition::FlagMasks::NORMALS_MASK);
+    }
+
+    normalsInput.accessor.mBlob.ApplyMinMax(numVector3, reinterpret_cast<float*>(buffer.data()));
+
+    normalsInput.rawData.mAttribs.push_back({"aNormal", Property::VECTOR3, numVector3, std::move(buffer)});
+  }
+  else if(normalsInput.accessor.mBlob.mLength != 0 && isTriangles)
+  {
+    DALI_ASSERT_DEBUG(normalsInput.accessor.mBlob.mLength == positionBufferSize);
+    static const std::function<bool(MeshDefinition::RawData&)> GenerateNormalsFunction[2] =
+      {
+        GenerateNormals<false>,
+        GenerateNormals<true>,
+      };
+    const bool generateSuccessed = GenerateNormalsFunction[MaskMatch(normalsInput.flags, MeshDefinition::Flags::U32_INDICES)](normalsInput.rawData);
+    if(!generateSuccessed)
+    {
+      DALI_LOG_ERROR("Failed to generate normal\n");
+    }
+    else
+    {
+      hasNormals = true;
+    }
+  }
+  return hasNormals;
+}
+
+void LoadTextureCoordinates(LoadAccessorListInputs textureCoordinatesInput)
+{
+  if(!textureCoordinatesInput.accessors.empty() && textureCoordinatesInput.accessors[0].IsDefined())
+  {
+    auto&      texCoords  = textureCoordinatesInput.accessors[0];
+    const auto bufferSize = texCoords.mBlob.GetBufferSize();
+    uint32_t   uvCount;
+
+    if(MaskMatch(textureCoordinatesInput.flags, MeshDefinition::Flags::S8_TEXCOORD) || MaskMatch(textureCoordinatesInput.flags, MeshDefinition::Flags::U8_TEXCOORD))
+    {
+      DALI_ASSERT_ALWAYS(((texCoords.mBlob.mLength % (sizeof(uint8_t) * 2) == 0) ||
+                          texCoords.mBlob.mStride >= (sizeof(uint8_t) * 2)) &&
+                         "TexCoords buffer length not a multiple of element size");
+      uvCount = static_cast<uint32_t>(bufferSize / (sizeof(uint8_t) * 2));
+    }
+    else if(MaskMatch(textureCoordinatesInput.flags, MeshDefinition::Flags::S16_TEXCOORD) || MaskMatch(textureCoordinatesInput.flags, MeshDefinition::Flags::U16_TEXCOORD))
+    {
+      DALI_ASSERT_ALWAYS(((texCoords.mBlob.mLength % (sizeof(uint16_t) * 2) == 0) ||
+                          texCoords.mBlob.mStride >= (sizeof(uint16_t) * 2)) &&
+                         "TexCoords buffer length not a multiple of element size");
+      uvCount = static_cast<uint32_t>(bufferSize / (sizeof(uint16_t) * 2));
+    }
+    else
+    {
+      DALI_ASSERT_ALWAYS(((texCoords.mBlob.mLength % sizeof(Vector2) == 0) ||
+                          texCoords.mBlob.mStride >= sizeof(Vector2)) &&
+                         "TexCoords buffer length not a multiple of element size");
+      uvCount = static_cast<uint32_t>(bufferSize / sizeof(Vector2));
+    }
+
+    std::vector<uint8_t> buffer(bufferSize);
+
+    std::string path;
+    auto&       stream = GetAvailableData(textureCoordinatesInput.fileStream, textureCoordinatesInput.meshPath, textureCoordinatesInput.buffers[texCoords.mBufferIdx], path);
+    if(!ReadAccessor(texCoords, stream, buffer.data()))
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read uv-s from '" << path << "'.";
+    }
+
+    GetDequantizedData(buffer, 2u, uvCount, textureCoordinatesInput.flags & MeshDefinition::FlagMasks::TEXCOORDS_MASK, texCoords.mNormalized);
+
+    if(MaskMatch(textureCoordinatesInput.flags, MeshDefinition::Flags::FLIP_UVS_VERTICAL))
+    {
+      auto uv    = reinterpret_cast<Vector2*>(buffer.data());
+      auto uvEnd = uv + uvCount;
+      while(uv != uvEnd)
+      {
+        uv->y = 1.0f - uv->y;
+        ++uv;
+      }
+    }
+
+    if(texCoords.mNormalized)
+    {
+      GetDequantizedMinMax(texCoords.mBlob.mMin, texCoords.mBlob.mMax, textureCoordinatesInput.flags & MeshDefinition::FlagMasks::TEXCOORDS_MASK);
+    }
+
+    texCoords.mBlob.ApplyMinMax(static_cast<uint32_t>(uvCount), reinterpret_cast<float*>(buffer.data()));
+    textureCoordinatesInput.rawData.mAttribs.push_back({"aTexCoord", Property::VECTOR2, static_cast<uint32_t>(uvCount), std::move(buffer)});
+  }
+}
+
+void LoadTangents(LoadAccessorInputs tangentsInput, bool hasNormals, bool hasUvs, bool isTriangles, Property::Type tangentType, uint32_t normalBufferSize)
+{
+  if(tangentsInput.accessor.IsDefined())
+  {
+    const auto bufferSize = tangentsInput.accessor.mBlob.GetBufferSize();
+
+    uint32_t propertySize   = static_cast<uint32_t>((tangentType == Property::VECTOR4) ? sizeof(Vector4) : sizeof(Vector3));
+    uint32_t componentCount = static_cast<uint32_t>(propertySize / sizeof(float));
+
+    uint32_t numTangents;
+
+    if(MaskMatch(tangentsInput.flags, MeshDefinition::Flags::S8_TANGENT))
+    {
+      DALI_ASSERT_ALWAYS(((tangentsInput.accessor.mBlob.mLength % (sizeof(int8_t) * componentCount) == 0) ||
+                          tangentsInput.accessor.mBlob.mStride >= (sizeof(int8_t) * componentCount)) &&
+                         "Tangents buffer length not a multiple of element size");
+      numTangents = static_cast<uint32_t>(bufferSize / (sizeof(int8_t) * componentCount));
+    }
+    else if(MaskMatch(tangentsInput.flags, MeshDefinition::Flags::S16_TANGENT))
+    {
+      DALI_ASSERT_ALWAYS(((tangentsInput.accessor.mBlob.mLength % (sizeof(int16_t) * componentCount) == 0) ||
+                          tangentsInput.accessor.mBlob.mStride >= (sizeof(int16_t) * componentCount)) &&
+                         "Tangents buffer length not a multiple of element size");
+      numTangents = static_cast<uint32_t>(bufferSize / (sizeof(int16_t) * componentCount));
+    }
+    else
+    {
+      DALI_ASSERT_ALWAYS(((tangentsInput.accessor.mBlob.mLength % propertySize == 0) ||
+                          tangentsInput.accessor.mBlob.mStride >= propertySize) &&
+                         "Tangents buffer length not a multiple of element size");
+      numTangents = static_cast<uint32_t>(bufferSize / propertySize);
+    }
+
+    std::vector<uint8_t> buffer(bufferSize);
+
+    std::string path;
+    auto&       stream = GetAvailableData(tangentsInput.fileStream, tangentsInput.meshPath, tangentsInput.buffers[tangentsInput.accessor.mBufferIdx], path);
+    if(!ReadAccessor(tangentsInput.accessor, stream, buffer.data()))
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Failed to read tangents from '" << path << "'.";
+    }
+
+    GetDequantizedData(buffer, componentCount, numTangents, tangentsInput.flags & MeshDefinition::FlagMasks::TANGENTS_MASK, tangentsInput.accessor.mNormalized);
+
+    if(tangentsInput.accessor.mNormalized)
+    {
+      GetDequantizedMinMax(tangentsInput.accessor.mBlob.mMin, tangentsInput.accessor.mBlob.mMax, tangentsInput.flags & MeshDefinition::FlagMasks::TANGENTS_MASK);
+    }
+
+    tangentsInput.accessor.mBlob.ApplyMinMax(numTangents, reinterpret_cast<float*>(buffer.data()));
+
+    tangentsInput.rawData.mAttribs.push_back({"aTangent", tangentType, static_cast<uint32_t>(numTangents), std::move(buffer)});
+  }
+  else if(tangentsInput.accessor.mBlob.mLength != 0 && hasNormals && isTriangles)
+  {
+    DALI_ASSERT_DEBUG(tangentsInput.accessor.mBlob.mLength == normalBufferSize);
+    static const std::function<bool(MeshDefinition::RawData&)> GenerateTangentsFunction[2][2][2] =
+      {
+        {
+          {
+            GenerateTangents<false, false, false>,
+            GenerateTangents<false, false, true>,
+          },
+          {
+            GenerateTangents<false, true, false>,
+            GenerateTangents<false, true, true>,
+          },
+        },
+        {
+          {
+            GenerateTangents<true, false, false>,
+            GenerateTangents<true, false, true>,
+          },
+          {
+            GenerateTangents<true, true, false>,
+            GenerateTangents<true, true, true>,
+          },
+        }};
+    const bool generateSuccessed = GenerateTangentsFunction[MaskMatch(tangentsInput.flags, MeshDefinition::Flags::U32_INDICES)][tangentType == Property::VECTOR3][hasUvs](tangentsInput.rawData);
+    if(!generateSuccessed)
+    {
+      DALI_LOG_ERROR("Failed to generate tangents\n");
+    }
+  }
+}
+
+void LoadColors(LoadAccessorListInputs colorsInput)
+{
+  // Only support 1 vertex color
+  if(!colorsInput.accessors.empty() && colorsInput.accessors[0].IsDefined())
+  {
+    uint32_t       propertySize = colorsInput.accessors[0].mBlob.mElementSizeHint;
+    Property::Type propertyType = (propertySize == sizeof(Vector4)) ? Property::VECTOR4 : ((propertySize == sizeof(Vector3)) ? Property::VECTOR3 : Property::NONE);
+    if(propertyType != Property::NONE)
+    {
+      DALI_ASSERT_ALWAYS(((colorsInput.accessors[0].mBlob.mLength % propertySize == 0) ||
+                          colorsInput.accessors[0].mBlob.mStride >= propertySize) &&
+                         "Colors buffer length not a multiple of element size");
+      const auto           bufferSize = colorsInput.accessors[0].mBlob.GetBufferSize();
+      std::vector<uint8_t> buffer(bufferSize);
+
+      std::string path;
+      auto&       stream = GetAvailableData(colorsInput.fileStream, colorsInput.meshPath, colorsInput.buffers[colorsInput.accessors[0].mBufferIdx], path);
+      if(!ReadAccessor(colorsInput.accessors[0], stream, buffer.data()))
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "Failed to read colors from '" << path << "'.";
+      }
+      colorsInput.accessors[0].mBlob.ApplyMinMax(bufferSize / propertySize, reinterpret_cast<float*>(buffer.data()));
+
+      colorsInput.rawData.mAttribs.push_back({"aVertexColor", propertyType, static_cast<uint32_t>(bufferSize / propertySize), std::move(buffer)});
+    }
+  }
+  else
+  {
+    std::vector<uint8_t> buffer(colorsInput.rawData.mAttribs[0].mNumElements * sizeof(Vector4));
+    auto                 colors = reinterpret_cast<Vector4*>(buffer.data());
+
+    for(uint32_t i = 0; i < colorsInput.rawData.mAttribs[0].mNumElements; i++)
+    {
+      colors[i] = Vector4::ONE;
+    }
+
+    colorsInput.rawData.mAttribs.push_back({"aVertexColor", Property::VECTOR4, colorsInput.rawData.mAttribs[0].mNumElements, std::move(buffer)});
+  }
+}
+
+void LoadBlendShapes(MeshDefinition::RawData& rawData, std::vector<MeshDefinition::BlendShape>& blendShapes, MeshDefinition::Blob& blendShapeHeader, BlendShapes::Version blendShapeVersion, uint32_t numberOfVertices, std::fstream& fileStream, BufferDefinition::Vector& buffers)
+{
+  // Calculate the Blob for the blend shapes.
+  MeshDefinition::Blob blendShapesBlob;
+  blendShapesBlob.mOffset = std::numeric_limits<unsigned int>::max();
+  blendShapesBlob.mLength = 0u;
+
+  uint32_t totalTextureSize(0u);
+
+  auto processAccessor = [&](const MeshDefinition::Accessor& accessor, uint32_t vector3Size) {
+    if(accessor.IsDefined())
+    {
+      blendShapesBlob.mOffset = std::min(blendShapesBlob.mOffset, accessor.mBlob.mOffset);
+      blendShapesBlob.mLength += accessor.mBlob.mLength;
+
+      totalTextureSize += accessor.mBlob.mLength / vector3Size;
+    }
+  };
+
+  for(const auto& blendShape : blendShapes)
+  {
+    const auto positionMask = blendShape.mFlags & MeshDefinition::FlagMasks::POSITIONS_MASK;
+    const auto normalMask   = blendShape.mFlags & MeshDefinition::FlagMasks::NORMALS_MASK;
+    const auto tangentMask  = blendShape.mFlags & MeshDefinition::FlagMasks::TANGENTS_MASK;
+
+    processAccessor(blendShape.deltas, MaskMatch(positionMask, MeshDefinition::S8_POSITION) ? sizeof(uint8_t) * 3 : (MaskMatch(positionMask, MeshDefinition::S16_POSITION) ? sizeof(uint16_t) * 3 : sizeof(Vector3)));
+    processAccessor(blendShape.normals, MaskMatch(normalMask, MeshDefinition::S8_NORMAL) ? sizeof(uint8_t) * 3 : (MaskMatch(normalMask, MeshDefinition::S16_NORMAL) ? sizeof(uint16_t) * 3 : sizeof(Vector3)));
+    processAccessor(blendShape.tangents, MaskMatch(tangentMask, MeshDefinition::S8_TANGENT) ? sizeof(uint8_t) * 3 : (MaskMatch(tangentMask, MeshDefinition::S16_TANGENT) ? sizeof(uint16_t) * 3 : sizeof(Vector3)));
+  }
+
+  if(!blendShapes.empty())
+  {
+    // Calculate the size of one buffer inside the texture.
+    rawData.mBlendShapeBufferOffset = numberOfVertices;
+
+    bool     calculateGltf2BlendShapes = false;
+    uint32_t textureWidth              = 0u;
+    uint32_t textureHeight             = 0u;
+
+    if(!blendShapeHeader.IsDefined())
+    {
+      CalculateTextureSize(totalTextureSize, textureWidth, textureHeight);
+      calculateGltf2BlendShapes = true;
+    }
+    else
+    {
+      uint16_t header[2u];
+      ReadBlob(blendShapeHeader, fileStream, reinterpret_cast<uint8_t*>(header));
+      textureWidth  = header[0u];
+      textureHeight = header[1u];
+    }
+
+    const uint32_t numberOfBlendShapes = blendShapes.size();
+    rawData.mBlendShapeUnnormalizeFactor.Resize(numberOfBlendShapes);
+
+    Devel::PixelBuffer geometryPixelBuffer = Devel::PixelBuffer::New(textureWidth, textureHeight, Pixel::RGB32F);
+    uint8_t*           geometryBuffer      = geometryPixelBuffer.GetBuffer();
+
+    if(calculateGltf2BlendShapes)
+    {
+      CalculateGltf2BlendShapes(geometryBuffer, blendShapes, numberOfVertices, rawData.mBlendShapeUnnormalizeFactor[0u], buffers);
+    }
+    else
+    {
+      MeshDefinition::Blob unnormalizeFactorBlob;
+      unnormalizeFactorBlob.mLength = static_cast<uint32_t>(sizeof(float) * ((BlendShapes::Version::VERSION_2_0 == blendShapeVersion) ? 1u : numberOfBlendShapes));
+
+      if(blendShapesBlob.IsDefined())
+      {
+        if(ReadBlob(blendShapesBlob, fileStream, geometryBuffer))
+        {
+          unnormalizeFactorBlob.mOffset = blendShapesBlob.mOffset + blendShapesBlob.mLength;
+        }
+      }
+
+      // Read the unnormalize factors.
+      if(unnormalizeFactorBlob.IsDefined())
+      {
+        ReadBlob(unnormalizeFactorBlob, fileStream, reinterpret_cast<uint8_t*>(&rawData.mBlendShapeUnnormalizeFactor[0u]));
+      }
+    }
+    rawData.mBlendShapeData = Devel::PixelBuffer::Convert(geometryPixelBuffer);
+  }
+}
+
+constexpr uint32_t MINIMUM_SHADER_VERSION_SUPPORT_VERTEX_ID = 300;
+
+} // namespace
+
+MeshDefinition::SparseBlob::SparseBlob(const Blob& indices, const Blob& values, uint32_t count)
+: mIndices{indices},
+  mValues{values},
+  mCount{count}
+{
+}
+
+MeshDefinition::SparseBlob::SparseBlob(Blob&& indices, Blob&& values, uint32_t count)
+: mIndices(std::move(indices)),
+  mValues(std::move(values)),
+  mCount{count}
+{
+}
+
+MeshDefinition::Accessor::Accessor(const MeshDefinition::Blob&       blob,
+                                   const MeshDefinition::SparseBlob& sparse,
+                                   Index                             bufferIndex,
+                                   bool                              normalized)
+: mBlob{blob},
+  mSparse{(sparse.mIndices.IsDefined() && sparse.mValues.IsDefined()) ? new SparseBlob{sparse} : nullptr},
+  mBufferIdx(bufferIndex),
+  mNormalized(normalized)
+{
+}
+
+MeshDefinition::Accessor::Accessor(MeshDefinition::Blob&&       blob,
+                                   MeshDefinition::SparseBlob&& sparse,
+                                   Index                        bufferIndex,
+                                   bool                         normalized)
+: mBlob{std::move(blob)},
+  mSparse{(sparse.mIndices.IsDefined() && sparse.mValues.IsDefined()) ? new SparseBlob{std::move(sparse)} : nullptr},
+  mBufferIdx(bufferIndex),
+  mNormalized(normalized)
+{
+}
+
+void MeshDefinition::Blob::ComputeMinMax(std::vector<float>& min, std::vector<float>& max, uint32_t numComponents, uint32_t count, const float* values)
+{
+  min.assign(numComponents, MAXFLOAT);
+  max.assign(numComponents, -MAXFLOAT);
+  for(uint32_t i = 0; i < count; ++i)
+  {
+    for(uint32_t j = 0; j < numComponents; ++j)
+    {
+      min[j] = std::min(min[j], *values);
+      max[j] = std::max(max[j], *values);
+      values++;
+    }
+  }
+}
+
+void MeshDefinition::Blob::ApplyMinMax(const std::vector<float>& min, const std::vector<float>& max, uint32_t count, float* values, std::vector<uint32_t>* sparseIndices)
+{
+  DALI_ASSERT_DEBUG(max.size() == min.size() || max.size() * min.size() == 0);
+  const auto numComponents = std::max(min.size(), max.size());
+
+  using ClampFn   = void (*)(const float*, const float*, uint32_t, float&);
+  ClampFn clampFn = min.empty() ? (max.empty() ? static_cast<ClampFn>(nullptr) : [](const float* min, const float* max, uint32_t i, float& value) { value = std::min(max[i], value); })
+                                : (max.empty() ? [](const float* min, const float* max, uint32_t i, float& value) { value = std::max(min[i], value); }
+                                               : static_cast<ClampFn>([](const float* min, const float* max, uint32_t i, float& value) { value = std::min(std::max(min[i], value), max[i]); }));
+
+  if(!clampFn)
+  {
+    return;
+  }
+
+  auto end = values + count * numComponents;
+  while(values != end)
+  {
+    auto     nextElement = values + numComponents;
+    uint32_t i           = 0;
+    while(values != nextElement)
+    {
+      clampFn(min.data(), max.data(), i, *values);
+      ++values;
+      ++i;
+    }
+  }
+}
+
+MeshDefinition::Blob::Blob(uint32_t offset, uint32_t length, uint16_t stride, uint16_t elementSizeHint, const std::vector<float>& min, const std::vector<float>& max)
+: mOffset(offset),
+  mLength(length),
+  mStride(stride),
+  mElementSizeHint(elementSizeHint),
+  mMin(min),
+  mMax(max)
+{
+}
+
+uint32_t MeshDefinition::Blob::GetBufferSize() const
+{
+  return mLength;
+}
+
+void MeshDefinition::Blob::ComputeMinMax(uint32_t numComponents, uint32_t count, float* values)
+{
+  ComputeMinMax(mMin, mMax, numComponents, count, values);
+}
+
+void MeshDefinition::Blob::ApplyMinMax(uint32_t count, float* values, std::vector<uint32_t>* sparseIndices) const
+{
+  ApplyMinMax(mMin, mMax, count, values, sparseIndices);
+}
+
+void MeshDefinition::RawData::Attrib::AttachBuffer(Geometry& g) const
+{
+  Property::Map attribMap;
+  attribMap[mName]          = mType;
+  VertexBuffer attribBuffer = VertexBuffer::New(attribMap);
+  attribBuffer.SetData(mData.data(), mNumElements);
+
+  g.AddVertexBuffer(attribBuffer);
+}
+
+bool MeshDefinition::IsQuad() const
+{
+  return CaseInsensitiveStringCompare(QUAD, mUri);
+}
+
+bool MeshDefinition::IsSkinned() const
+{
+  return !mJoints.empty() && !mWeights.empty();
+}
+
+bool MeshDefinition::HasVertexColor() const
+{
+  return !mColors.empty();
+}
+
+uint32_t MeshDefinition::GetNumberOfJointSets() const
+{
+  uint32_t number = static_cast<uint32_t>(mJoints.size());
+  if(number > MeshDefinition::MAX_NUMBER_OF_JOINT_SETS)
+  {
+    number = MeshDefinition::MAX_NUMBER_OF_JOINT_SETS;
+  }
+  return number;
+}
+
+bool MeshDefinition::HasBlendShapes() const
+{
+  return !mBlendShapes.empty();
+}
+
+void MeshDefinition::RequestNormals()
+{
+  mNormals.mBlob.mLength = mPositions.mBlob.GetBufferSize();
+}
+
+void MeshDefinition::RequestTangents()
+{
+  mTangents.mBlob.mLength = mNormals.mBlob.GetBufferSize();
+}
+
+MeshDefinition::RawData
+MeshDefinition::LoadRaw(const std::string& modelsPath, BufferDefinition::Vector& buffers)
+{
+  RawData raw;
+  if(IsQuad())
+  {
+    return raw;
+  }
+
+  std::string meshPath;
+  meshPath = modelsPath + mUri;
+  std::fstream fileStream;
+  if(!mUri.empty())
+  {
+    fileStream.open(meshPath, std::ios::in | std::ios::binary);
+    if(!fileStream.is_open())
+    {
+      DALI_LOG_ERROR("Fail to open buffer from %s.\n", meshPath.c_str());
+    }
+  }
+
+  LoadAccessorInputs indicesInput = {raw, mIndices, mFlags, fileStream, meshPath, buffers};
+  LoadIndices(indicesInput);
+
+  LoadAccessorInputs positionsInput   = {raw, mPositions, mFlags, fileStream, meshPath, buffers};
+  uint32_t           numberOfVertices = LoadPositions(positionsInput, HasBlendShapes());
+
+  const auto         isTriangles  = mPrimitiveType == Geometry::TRIANGLES;
+  LoadAccessorInputs normalsInput = {raw, mNormals, mFlags, fileStream, meshPath, buffers};
+  auto               hasNormals   = LoadNormals(normalsInput, isTriangles, mPositions.mBlob.GetBufferSize());
+
+  LoadAccessorListInputs textureCoordinatesInput = {raw, mTexCoords, mFlags, fileStream, meshPath, buffers};
+  LoadTextureCoordinates(textureCoordinatesInput);
+
+  const bool         hasUvs        = !mTexCoords.empty() && mTexCoords[0].IsDefined();
+  LoadAccessorInputs tangentsInput = {raw, mTangents, mFlags, fileStream, meshPath, buffers};
+  LoadTangents(tangentsInput, hasNormals, hasUvs, isTriangles, mTangentType, mNormals.mBlob.GetBufferSize());
+
+  LoadAccessorListInputs colorsInput = {raw, mColors, mFlags, fileStream, meshPath, buffers};
+  LoadColors(colorsInput);
+
+  if(IsSkinned())
+  {
+    LoadDataType           loadDataType = (MaskMatch(mFlags, MeshDefinition::U16_JOINT_IDS)) ? LoadDataType::UNSIGNED_SHORT : (MaskMatch(mFlags, MeshDefinition::U8_JOINT_IDS) ? LoadDataType::UNSIGNED_BYTE : LoadDataType::FLOAT);
+    LoadAccessorListInputs jointsInput  = {raw, mJoints, mFlags, fileStream, meshPath, buffers};
+    ReadTypedVectorAccessors<false>(jointsInput, loadDataType, "aJoints");
+
+    loadDataType                        = (MaskMatch(mFlags, MeshDefinition::U16_WEIGHT)) ? LoadDataType::UNSIGNED_SHORT : (MaskMatch(mFlags, MeshDefinition::U8_WEIGHT) ? LoadDataType::UNSIGNED_BYTE : LoadDataType::FLOAT);
+    LoadAccessorListInputs weightsInput = {raw, mWeights, mFlags, fileStream, meshPath, buffers};
+    ReadTypedVectorAccessors<true>(weightsInput, loadDataType, "aWeights");
+  }
+
+  LoadBlendShapes(raw, mBlendShapes, mBlendShapeHeader, mBlendShapeVersion, numberOfVertices, fileStream, buffers);
+  return raw;
+}
+
+MeshGeometry MeshDefinition::Load(RawData&& raw) const
+{
+  MeshGeometry meshGeometry;
+  meshGeometry.geometry = Geometry::New();
+  meshGeometry.geometry.SetType(mPrimitiveType);
+
+  if(IsQuad()) // TODO: do this in raw data; provide MakeTexturedQuadGeometry() that only creates buffers.
+  {
+    auto options          = MaskMatch(mFlags, FLIP_UVS_VERTICAL) ? TexturedQuadOptions::FLIP_VERTICAL : 0;
+    meshGeometry.geometry = MakeTexturedQuadGeometry(options);
+  }
+  else
+  {
+    if(!raw.mIndices.empty())
+    {
+      if(MaskMatch(mFlags, U32_INDICES))
+      {
+        // TODO : We can only store indeces as uint16_type. Send Dali::Geometry that we use it as uint32_t actual.
+        meshGeometry.geometry.SetIndexBuffer(reinterpret_cast<const uint32_t*>(raw.mIndices.data()), raw.mIndices.size() / 2);
+      }
+      else
+      {
+        meshGeometry.geometry.SetIndexBuffer(raw.mIndices.data(), raw.mIndices.size());
+      }
+    }
+
+    if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_VERTEX_ID && !raw.mAttribs.empty()))
+    {
+      auto numElements = raw.mAttribs[0].mNumElements;
+
+      // gl_VertexID not support. We should add buffer hard.
+      Property::Map attribMap;
+      attribMap["aVertexID"] = Property::FLOAT;
+
+      VertexBuffer attribBuffer = VertexBuffer::New(attribMap);
+
+      std::vector<uint8_t> buffer(numElements * sizeof(float));
+      auto                 ids = reinterpret_cast<float*>(buffer.data());
+
+      for(uint32_t i = 0; i < numElements; i++)
+      {
+        ids[i] = static_cast<float>(i);
+      }
+
+      attribBuffer.SetData(buffer.data(), numElements);
+
+      meshGeometry.geometry.AddVertexBuffer(attribBuffer);
+    }
+
+    for(auto& a : raw.mAttribs)
+    {
+      a.AttachBuffer(meshGeometry.geometry);
+    }
+
+    if(HasBlendShapes())
+    {
+      meshGeometry.blendShapeBufferOffset      = raw.mBlendShapeBufferOffset;
+      meshGeometry.blendShapeUnnormalizeFactor = std::move(raw.mBlendShapeUnnormalizeFactor);
+
+      meshGeometry.blendShapeGeometry = Texture::New(TextureType::TEXTURE_2D,
+                                                     raw.mBlendShapeData.GetPixelFormat(),
+                                                     raw.mBlendShapeData.GetWidth(),
+                                                     raw.mBlendShapeData.GetHeight());
+      meshGeometry.blendShapeGeometry.Upload(raw.mBlendShapeData);
+    }
+  }
+
+  return meshGeometry;
+}
+
+void MeshDefinition::RetrieveBlendShapeComponents(bool& hasPositions, bool& hasNormals, bool& hasTangents) const
+{
+  for(const auto& blendShape : mBlendShapes)
+  {
+    hasPositions = hasPositions || blendShape.deltas.IsDefined();
+    hasNormals   = hasNormals || blendShape.normals.IsDefined();
+    hasTangents  = hasTangents || blendShape.tangents.IsDefined();
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/mesh-definition.h b/dali-scene3d/public-api/loader/mesh-definition.h
new file mode 100644
index 0000000..911359c
--- /dev/null
+++ b/dali-scene3d/public-api/loader/mesh-definition.h
@@ -0,0 +1,372 @@
+#ifndef DALI_SCENE3D_LOADER_MESH_DEFINITION_H
+#define DALI_SCENE3D_LOADER_MESH_DEFINITION_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+#include <dali-scene3d/public-api/loader/buffer-definition.h>
+#include <dali-scene3d/public-api/loader/index.h>
+#include <dali-scene3d/public-api/loader/mesh-geometry.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Defines a mesh with its attributes, the primitive type to render it as,
+ *  and the file to load it from with the offset and length information for the
+ *  individual attribute buffers.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API MeshDefinition
+{
+  using Vector = std::vector<std::pair<MeshDefinition, MeshGeometry>>;
+
+  enum : uint32_t
+  {
+    INVALID = std::numeric_limits<uint32_t>::max()
+  };
+
+  enum : uint32_t
+  {
+    MAX_NUMBER_OF_JOINT_SETS = 4
+  };
+
+  enum Flags : uint32_t
+  {
+    FLIP_UVS_VERTICAL = NthBit(0),
+    U32_INDICES       = NthBit(1), // default is unsigned short
+    U8_INDICES        = NthBit(2), // default is unsigned short
+    U16_JOINT_IDS     = NthBit(3), // default is floats
+    U8_JOINT_IDS      = NthBit(4),
+    U16_WEIGHT        = NthBit(5), // default is floats
+    U8_WEIGHT         = NthBit(6),
+    S8_POSITION       = NthBit(7),  // default is floats
+    U8_POSITION       = NthBit(8),  // default is floats
+    S16_POSITION      = NthBit(9),  // default is floats
+    U16_POSITION      = NthBit(10), // default is floats
+    S8_NORMAL         = NthBit(11), // default is floats
+    S16_NORMAL        = NthBit(12), // default is floats
+    S8_TANGENT        = NthBit(13), // default is floats
+    S16_TANGENT       = NthBit(14), // default is floats
+    S8_TEXCOORD       = NthBit(15), // default is floats
+    U8_TEXCOORD       = NthBit(16), // default is floats
+    S16_TEXCOORD      = NthBit(17), // default is floats
+    U16_TEXCOORD      = NthBit(18), // default is floats
+  };
+
+  enum FlagMasks : uint32_t
+  {
+    POSITIONS_MASK = 0x780,
+    NORMALS_MASK   = 0x1800,
+    TANGENTS_MASK  = 0x6000,
+    TEXCOORDS_MASK = 0x78000,
+  };
+
+  enum Attributes
+  {
+    INDICES           = NthBit(0),
+    POSITIONS         = NthBit(1),
+    NORMALS           = NthBit(2),
+    TEX_COORDS        = NthBit(3),
+    TANGENTS          = NthBit(4),
+    LEGACY_BITANGENTS = NthBit(5), // these are ignored; we're calculating them in the (PBR) shader.
+    JOINTS_0          = NthBit(6),
+    WEIGHTS_0         = NthBit(7),
+  };
+
+  /**
+   * @brief Describes raw data in terms of its position and size in a buffer.
+   *
+   * All units in bytes.
+   * @SINCE_2_0.7
+   */
+  struct Blob
+  {
+    uint32_t           mOffset          = INVALID; // the default means that the blob is undefined.
+    uint32_t           mLength          = 0;       // if the blob is undefined, its data may still be generated. This is enabled by setting length to some non-0 value. Refer to MeshDefinition for details.
+    uint16_t           mStride          = 0;       // ignore if 0
+    uint16_t           mElementSizeHint = 0;       // ignore if 0 or stride == 0
+    std::vector<float> mMin;
+    std::vector<float> mMax;
+
+    static void ComputeMinMax(std::vector<float>& min, std::vector<float>& max, uint32_t numComponents, uint32_t count, const float* values);
+
+    static void ApplyMinMax(const std::vector<float>& min, const std::vector<float>& max, uint32_t count, float* values, std::vector<uint32_t>* sparseIndices = nullptr);
+
+    Blob() = default;
+
+    Blob(const Blob&) = default;
+    Blob& operator=(const Blob&) = default;
+
+    Blob(Blob&&)  = default;
+    Blob& operator=(Blob&&) = default;
+
+    Blob(uint32_t offset, uint32_t length, uint16_t stride = 0, uint16_t elementSizeHint = 0, const std::vector<float>& min = {}, const std::vector<float>& max = {});
+
+    /**
+     * @brief Calculates the size of a tightly-packed buffer for the elements from the blob.
+     * @SINCE_2_0.7
+     */
+    uint32_t GetBufferSize() const;
+
+    /**
+     * @brief Convenience method to tell whether a Blob has meaningful data.
+     * @SINCE_2_0.7
+     */
+    bool IsDefined() const
+    {
+      return mOffset != INVALID;
+    }
+
+    /**
+     * @brief Convenience method to tell whether the elements stored in the blob follow each other tightly.
+     *
+     * The opposite would be interleaving.
+     * @SINCE_2_0.7
+     */
+    bool IsConsecutive() const
+    {
+      return mStride == 0 || mStride == mElementSizeHint;
+    }
+
+    /**
+     * @brief Computes the min / max of the input value data.
+     *
+     * The min and max are stored in mMin and mMax.
+     * @SINCE_2_0.7
+     * @param[in] numComponents number of components of data type. e.g., 3 for Vector3.
+     * @param[in] count The number of data.
+     * @param[in] values Data for the mesh.
+     */
+    void ComputeMinMax(uint32_t numComponents, uint32_t count, float* values);
+
+    /**
+     * @brief Applies the min / max values, if they're defined in the model
+     *
+     * @SINCE_2_0.7
+     * @param[in] count The number of data.
+     * @param[in] values Data for the mesh that min / max values will be applied.
+     * @param[in] sparseIndices Pointer to array of sparse indices (or nullptr if not provided)
+     */
+    void ApplyMinMax(uint32_t count, float* values, std::vector<uint32_t>* sparseIndices = nullptr) const;
+  };
+
+  /**
+   * @brief A sparse blob describes a change in a reference Blob.
+   * @p indices describe what positions of the reference Blob change and
+   * @p values describe the new values.
+   * @SINCE_2_0.7
+   */
+  struct SparseBlob
+  {
+    SparseBlob() = default;
+
+    SparseBlob(const SparseBlob&) = default;
+    SparseBlob& operator=(const SparseBlob&) = default;
+
+    SparseBlob(SparseBlob&&) = default;
+    SparseBlob& operator=(SparseBlob&&) = default;
+
+    SparseBlob(const Blob& indices, const Blob& values, uint32_t count);
+    SparseBlob(Blob&& indices, Blob&& values, uint32_t count);
+
+    Blob     mIndices;
+    Blob     mValues;
+    uint32_t mCount = 0u;
+  };
+
+  struct Accessor
+  {
+    Blob                        mBlob;
+    std::unique_ptr<SparseBlob> mSparse;
+    Index                       mBufferIdx = INVALID_INDEX;
+    bool                        mNormalized{false};
+
+    Accessor() = default;
+
+    Accessor(const Accessor&) = delete;
+    Accessor& operator=(const Accessor&) = delete;
+
+    Accessor(Accessor&&) = default;
+    Accessor& operator=(Accessor&&) = default;
+
+    Accessor(const MeshDefinition::Blob&       blob,
+             const MeshDefinition::SparseBlob& sparse,
+             Index                             bufferIndex = INVALID_INDEX,
+             bool                              normalized = false);
+
+    Accessor(MeshDefinition::Blob&&       blob,
+             MeshDefinition::SparseBlob&& sparse,
+             Index                        bufferIndex = INVALID_INDEX,
+             bool                         normalized = false);
+
+    bool IsDefined() const
+    {
+      return mBlob.IsDefined() || (mSparse && (mSparse->mIndices.IsDefined() && mSparse->mValues.IsDefined()));
+    }
+  };
+
+  /**
+   * @brief Stores a blend shape.
+   * @SINCE_2_0.7
+   */
+  struct BlendShape
+  {
+    std::string name;
+    Accessor    deltas;
+    Accessor    normals;
+    Accessor    tangents;
+    float       weight = 0.f;
+    uint32_t    mFlags = 0x0;
+  };
+
+  struct RawData
+  {
+    struct Attrib
+    {
+      std::string          mName;
+      Property::Type       mType;
+      uint32_t             mNumElements;
+      std::vector<uint8_t> mData;
+
+      void AttachBuffer(Geometry& g) const;
+    };
+
+    std::vector<uint16_t> mIndices;
+    std::vector<Attrib>   mAttribs;
+
+    unsigned int        mBlendShapeBufferOffset{0};
+    Dali::Vector<float> mBlendShapeUnnormalizeFactor;
+    PixelData           mBlendShapeData;
+  };
+
+  MeshDefinition() = default;
+
+  MeshDefinition(const MeshDefinition&) = delete;
+  MeshDefinition& operator=(const MeshDefinition&) = delete;
+
+  MeshDefinition(MeshDefinition&&) = default;
+  MeshDefinition& operator=(MeshDefinition&&) = default;
+
+  /**
+   * @brief Determines whether the mesh definition is that of a quad.
+   * @SINCE_2_0.7
+   */
+  bool IsQuad() const;
+
+  /**
+   * @brief Determines whether the mesh is used for skeletal animation.
+   * @SINCE_2_0.7
+   */
+  bool IsSkinned() const;
+
+  /**
+   * @brief Determines if the mesh has any vertex colors
+   */
+  bool HasVertexColor() const;
+
+  /**
+   * @brief Returns the number of joint sets defined by the mesh
+   *
+   * @SINCE_2_2.52
+   * @note Clamped to 4 to minimise GPU attrs.
+   */
+  uint32_t GetNumberOfJointSets() const;
+
+  /**
+   * @brief Whether the mesh has blend shapes.
+   * @SINCE_2_0.7
+   */
+  bool HasBlendShapes() const;
+
+  /**
+   * @brief Requests normals to be generated.
+   * @SINCE_2_0.7
+   * @note Generation happens in LoadRaw().
+   * @note Must have Vector3 positions defined.
+   */
+  void RequestNormals();
+
+  /**
+   * @brief Requests tangents to be generated.
+   * @SINCE_2_0.7
+   * @note Generation happens in LoadRaw().
+   * @note Must have Vector3 normals defined.
+   */
+  void RequestTangents();
+
+  /**
+   * @brief Loads raw geometry data, which includes index (optional) and attribute buffers, as well as blend shape data.
+   *
+   * This is then returned.
+   * @SINCE_2_0.7
+   * @note This can be done on any thread.
+   */
+  RawData LoadRaw(const std::string& modelsPath, BufferDefinition::Vector& buffers);
+
+  /**
+   * @brief Creates a MeshGeometry based firstly on the value of the uri member:
+   *  if it is "quad", a textured quad is created; otherwise it uses the
+   *  attribute (and index) buffers and blend shape information (if available)
+   *  from @a raw.
+   *  If mFlipVertical was set, the UVs are flipped in Y, i.e. v = 1.0 - v.
+   * @SINCE_2_0.7
+   */
+  MeshGeometry Load(RawData&& raw) const;
+
+  /**
+   * @brief Retrieves what Components information is in this mesh's BlendShape.
+   *
+   * @SINCE_2_2.21
+   * @param[out] hasPositions True if the BlendShape has position components
+   * @param[out] hasNormals True if the BlendShape has normal components
+   * @param[out] hasTangents True if the BlendShape has tangent components
+   */
+  void RetrieveBlendShapeComponents(bool& hasPositions, bool& hasNormals, bool& hasTangents) const;
+
+public: // DATA
+  std::shared_ptr<RawData> mRawData;
+  uint32_t                 mFlags         = 0x0;
+  Geometry::Type           mPrimitiveType = Geometry::TRIANGLES;
+  std::string              mUri; // When the mesh data is loaded from embedded resources, this URI is used as a data stream.
+  Accessor                 mIndices;
+  Accessor                 mPositions;
+  Accessor                 mNormals;  // data can be generated based on positions
+  Accessor                 mTangents; // data can be generated based on normals and texCoords (the latter isn't mandatory; the results will be better if available)
+  std::vector<Accessor>    mTexCoords;
+  std::vector<Accessor>    mColors;
+  std::vector<Accessor>    mJoints;
+  std::vector<Accessor>    mWeights;
+  Property::Type           mTangentType{Property::VECTOR3};
+
+  Blob                    mBlendShapeHeader;
+  std::vector<BlendShape> mBlendShapes;
+  BlendShapes::Version    mBlendShapeVersion = BlendShapes::Version::INVALID;
+
+  Index          mSkeletonIdx = INVALID_INDEX;
+  ModelPrimitive mModelPrimitive;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_MESH_DEFINITION_H
diff --git a/dali-scene3d/public-api/loader/mesh-geometry.h b/dali-scene3d/public-api/loader/mesh-geometry.h
new file mode 100644
index 0000000..2e1b71e
--- /dev/null
+++ b/dali-scene3d/public-api/loader/mesh-geometry.h
@@ -0,0 +1,40 @@
+#ifndef DALI_SCENE3D_LOADER_MESH_GEOMETRY_H
+#define DALI_SCENE3D_LOADER_MESH_GEOMETRY_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+
+namespace Dali::Scene3D::Loader
+{
+struct DALI_SCENE3D_API MeshGeometry
+{
+  Geometry       geometry;                    ///< The array of vertices. @SINCE_2_0.7
+  Texture        blendShapeGeometry;          ///< The array of vertices of the different blend shapes encoded inside a texture with power of two dimensions. @SINCE_2_0.7
+  Vector<float>  blendShapeUnnormalizeFactor; ///< Factor used to unnormalize the geometry of the blend shape. @SINCE_2_0.7
+  unsigned int   blendShapeBufferOffset{0};   ///< Offset used to calculate the start of each blend shape. @SINCE_2_0.20
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_MESH_GEOMETRY_H
diff --git a/dali-scene3d/public-api/loader/model-loader.cpp b/dali-scene3d/public-api/loader/model-loader.cpp
new file mode 100644
index 0000000..211b0e0
--- /dev/null
+++ b/dali-scene3d/public-api/loader/model-loader.cpp
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/model-loader.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <filesystem>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/loader/dli-loader-impl.h>
+#include <dali-scene3d/internal/loader/glb-loader-impl.h>
+#include <dali-scene3d/internal/loader/gltf2-loader-impl.h>
+#include <dali-scene3d/internal/loader/model-loader-impl.h>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+static constexpr std::string_view OBJ_EXTENSION      = ".obj";
+static constexpr std::string_view GLTF_EXTENSION     = ".gltf";
+static constexpr std::string_view GLB_EXTENSION      = ".glb";
+static constexpr std::string_view DLI_EXTENSION      = ".dli";
+static constexpr std::string_view METADATA_EXTENSION = "metadata";
+} // namespace
+
+ModelLoader::ModelLoader(const std::string& modelUrl, const std::string& resourceDirectoryUrl, Dali::Scene3D::Loader::LoadResult& loadResult)
+: mModelUrl(modelUrl),
+  mResourceDirectoryUrl(resourceDirectoryUrl),
+  mLoadResult(loadResult)
+{
+  CreateModelLoader();
+}
+
+bool ModelLoader::LoadModel(Dali::Scene3D::Loader::ResourceBundle::PathProvider& pathProvider, bool loadOnlyRawResource)
+{
+  if(!mImpl)
+  {
+    return false;
+  }
+
+  bool loadSucceeded = false;
+
+  mLoadResult.mAnimationDefinitions.clear();
+  std::filesystem::path metaDataUrl(mModelUrl);
+  metaDataUrl.replace_extension(METADATA_EXTENSION.data());
+
+  Dali::Scene3D::Loader::LoadSceneMetadata(metaDataUrl.c_str(), mLoadResult.mSceneMetadata);
+  loadSucceeded = mImpl->LoadModel(mModelUrl, mLoadResult);
+  LoadResource(pathProvider, loadOnlyRawResource);
+
+  return loadSucceeded;
+}
+
+void ModelLoader::SetInputParameter(InputParameter& inputParameter)
+{
+  mImpl->SetInputParameter(inputParameter);
+}
+
+Dali::Scene3D::Loader::SceneDefinition& ModelLoader::GetScene()
+{
+  return mLoadResult.mScene;
+}
+
+Dali::Scene3D::Loader::ResourceBundle& ModelLoader::GetResources()
+{
+  return mLoadResult.mResources;
+}
+
+std::vector<Dali::Scene3D::Loader::AnimationDefinition>& ModelLoader::GetAnimations()
+{
+  return mLoadResult.mAnimationDefinitions;
+}
+
+std::vector<Dali::Scene3D::Loader::CameraParameters>& ModelLoader::GetCameras()
+{
+  return mLoadResult.mCameraParameters;
+}
+
+Dali::Scene3D::Loader::Customization::Choices& ModelLoader::GetResourceChoices()
+{
+  return mResourceChoices;
+}
+
+void ModelLoader::CreateModelLoader()
+{
+  std::filesystem::path modelPath(mModelUrl);
+  if(mResourceDirectoryUrl.empty())
+  {
+    mResourceDirectoryUrl = std::string(modelPath.parent_path()) + "/";
+  }
+  std::string extension = modelPath.extension();
+  std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
+
+  if(extension == DLI_EXTENSION)
+  {
+    mImpl = std::make_shared<Dali::Scene3D::Loader::Internal::DliLoaderImpl>();
+  }
+  else if(extension == GLTF_EXTENSION)
+  {
+    mImpl = std::make_shared<Dali::Scene3D::Loader::Internal::Gltf2LoaderImpl>();
+  }
+  else if(extension == GLB_EXTENSION)
+  {
+    mImpl = std::make_shared<Dali::Scene3D::Loader::Internal::GlbLoaderImpl>();
+  }
+  else
+  {
+    DALI_LOG_ERROR("Not supported model format : %s\n", extension.c_str());
+  }
+}
+
+void ModelLoader::LoadResource(Dali::Scene3D::Loader::ResourceBundle::PathProvider& pathProvider, bool loadOnlyRawResource)
+{
+  if(GetResources().mRawResourcesLoaded && loadOnlyRawResource)
+  {
+    return;
+  }
+
+  Dali::Scene3D::Loader::ResourceRefCounts resourceRefCount = mLoadResult.mResources.CreateRefCounter();
+  for(auto iRoot : GetScene().GetRoots())
+  {
+    GetScene().CountResourceRefs(iRoot, mResourceChoices, resourceRefCount);
+  }
+
+  GetResources().mReferenceCounts = std::move(resourceRefCount);
+  GetResources().CountEnvironmentReferences();
+
+  if(loadOnlyRawResource)
+  {
+    GetResources().LoadRawResources(pathProvider);
+  }
+  else
+  {
+    GetResources().LoadResources(pathProvider);
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/model-loader.h b/dali-scene3d/public-api/loader/model-loader.h
new file mode 100644
index 0000000..8a660de
--- /dev/null
+++ b/dali-scene3d/public-api/loader/model-loader.h
@@ -0,0 +1,131 @@
+#ifndef DALI_SCENE3D_LOADER_MODEL_LOADER_H
+#define DALI_SCENE3D_LOADER_MODEL_LOADER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+
+// EXTERNAL INCLUDES
+#include <string>
+
+namespace Dali::Scene3D::Loader
+{
+namespace Internal
+{
+class ModelLoaderImpl;
+}
+
+class DALI_SCENE3D_API ModelLoader
+{
+public:
+  class InputParameter
+  {
+  };
+
+  /**
+   * @brief ModelLoader Constructor.
+   * @SINCE_2_2.17
+   * @param[in] modelUrl Url of the model file to be loaded
+   * @param[in] resourceDirectoryUrl Url of directory that contains resources.
+   * @param[out] loadResult Loaded result that includes scene tree and resources.
+   */
+  ModelLoader(const std::string& modelUrl, const std::string& resourceDirectoryUrl, Dali::Scene3D::Loader::LoadResult& loadResult);
+
+  /**
+   * @brief Request to load model from model url.
+   * @SINCE_2_2.17
+   * @param[in] pathProvider Path provider that defines resource paths.
+   * @param[in] loadOnlyRawResource If true, load Raw resource only, and do not create Dali::Handle
+   * If false, this loader load Raw resource and create Dali::Handle too.
+   * Default value is false;
+   * @return True if model loading is successfully finished.
+   */
+  bool LoadModel(Dali::Scene3D::Loader::ResourceBundle::PathProvider& pathProvider, bool loadOnlyRawResource = false);
+
+  /**
+   * @brief Set InputParameter.
+   *
+   * This method store only a pointer of InputParameter.
+   * The object of InputParameter should not be deleted until it is no longer used.
+   * @SINCE_2_2.17
+   * @param[in] inputParameter Input parameters that can be used in loading time.
+   */
+  void SetInputParameter(InputParameter& inputParameter);
+
+  /**
+   * @brief Retrieves loaded scene.
+   * @SINCE_2_2.17
+   * @return SceneDefinition that is loaded from file
+   */
+  Dali::Scene3D::Loader::SceneDefinition& GetScene();
+
+  /**
+   * @brief Retrieves resource bundle that includes resource information.
+   * @SINCE_2_2.17
+   * @return ResourceBundle for model resources
+   */
+  Dali::Scene3D::Loader::ResourceBundle& GetResources();
+
+  /**
+   * @brief Retrieves loaded AnimationDefinition.
+   * @SINCE_2_2.17
+   * @return AnimationDefinition that is loaded from file
+   */
+  std::vector<Dali::Scene3D::Loader::AnimationDefinition>& GetAnimations();
+
+  /**
+   * @brief Retrieves loaded CameraParameters.
+   * @SINCE_2_2.17
+   * @return CameraParameters list that is loaded from file
+   */
+  std::vector<Dali::Scene3D::Loader::CameraParameters>& GetCameras();
+
+  /**
+   * @brief Retrieves ResourceChoices.
+   * @SINCE_2_2.17
+   * @return Choices for loaded Resources
+   */
+  Dali::Scene3D::Loader::Customization::Choices& GetResourceChoices();
+
+private:
+  /**
+   * @brief Create model loader for each file format.
+   * @SINCE_2_2.17
+   */
+  void CreateModelLoader();
+
+  /**
+   * @brief Load resource of the model.
+   * @SINCE_2_2.17
+   */
+  void LoadResource(Dali::Scene3D::Loader::ResourceBundle::PathProvider& pathProvider, bool loadOnlyRawResource);
+
+private:
+  std::string mModelUrl;
+  std::string mResourceDirectoryUrl;
+
+  Dali::Scene3D::Loader::LoadResult             mLoadResult;
+  Dali::Scene3D::Loader::Customization::Choices mResourceChoices;
+
+  std::shared_ptr<Internal::ModelLoaderImpl> mImpl;
+};
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_MODEL_LOADER_H
diff --git a/dali-scene3d/public-api/loader/navigation-mesh-factory.cpp b/dali-scene3d/public-api/loader/navigation-mesh-factory.cpp
new file mode 100644
index 0000000..8fafe8a
--- /dev/null
+++ b/dali-scene3d/public-api/loader/navigation-mesh-factory.cpp
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/navigation-mesh-factory.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/algorithm/navigation-mesh-impl.h>
+#include <dali/devel-api/adaptor-framework/file-stream.h>
+#include <stdlib.h>
+#include <memory>
+
+namespace Dali::Scene3D::Loader
+{
+std::unique_ptr<Algorithm::NavigationMesh> NavigationMeshFactory::CreateFromFile(std::string filename)
+{
+  std::vector<uint8_t> buffer;
+
+  Dali::FileStream fileStream(filename, Dali::FileStream::READ | Dali::FileStream::BINARY);
+  auto             fin = fileStream.GetFile();
+
+  if(DALI_UNLIKELY(!fin))
+  {
+    const int bufferLength = 128;
+    char      buffer[bufferLength];
+
+    // Return type of stderror_r is different between system type. We should not use return value.
+    [[maybe_unused]] auto ret = strerror_r(errno, buffer, bufferLength - 1);
+
+    DALI_LOG_ERROR("NavigationMesh: Can't open %s for reading: %s", filename.c_str(), buffer);
+    return nullptr;
+  }
+
+  if(DALI_UNLIKELY(fseek(fin, 0, SEEK_END)))
+  {
+    DALI_LOG_ERROR("NavigationMesh: Error reading file: %s\n", filename.c_str());
+    return nullptr;
+  }
+
+  auto size = ftell(fin);
+  if(DALI_UNLIKELY(size < 0))
+  {
+    DALI_LOG_ERROR("NavigationMesh: Error reading file: %s\n", filename.c_str());
+    return nullptr;
+  }
+
+  auto fileSize = size_t(size);
+  if(DALI_UNLIKELY(fseek(fin, 0, SEEK_SET)))
+  {
+    DALI_LOG_ERROR("NavigationMesh: Error reading file: %s\n", filename.c_str());
+    return nullptr;
+  }
+
+  buffer.resize(size);
+  auto count = fread(buffer.data(), 1, fileSize, fin);
+  if(DALI_UNLIKELY(count != fileSize))
+  {
+    DALI_LOG_ERROR("NavigationMesh: Error reading file: %s\n", filename.c_str());
+    return nullptr;
+  }
+  return CreateFromBuffer(buffer);
+}
+
+std::unique_ptr<Algorithm::NavigationMesh> NavigationMeshFactory::CreateFromBuffer(const std::vector<uint8_t>& buffer)
+{
+  auto impl = new Scene3D::Internal::Algorithm::NavigationMesh(buffer);
+  return std::make_unique<Algorithm::NavigationMesh>(impl);
+}
+
+std::unique_ptr<Algorithm::NavigationMesh> NavigationMeshFactory::CreateFromVertexFaceList(const Vector3* vertices, const Vector3* vertexNormals, uint32_t vertexCount, const uint32_t* faceIndices, uint32_t indexCount)
+{
+  // The function takes the data and creates a binary buffer out of it
+  using namespace Dali::Scene3D::Algorithm;
+  auto header = Internal::Algorithm::NavigationMeshHeader_V10();
+
+  // create header
+  header.checksum = *reinterpret_cast<const uint32_t*>("NAVM");
+  header.version  = 0; // latest version
+
+  // Copy given vertices
+  std::vector<NavigationMesh::Vertex> meshVertices;
+  meshVertices.reserve(vertexCount);
+  for(auto i = 0u; i < vertexCount; ++i)
+  {
+    meshVertices.emplace_back();
+    meshVertices.back().x = vertices[i].x;
+    meshVertices.back().y = vertices[i].y;
+    meshVertices.back().z = vertices[i].z;
+  }
+
+  // copy faces and edges
+  std::vector<NavigationMesh::Face> meshFaces;
+  meshFaces.resize(indexCount / 3);
+  auto i              = 0u;
+  bool computeNormals = (vertexNormals == nullptr);
+  for(auto& f : meshFaces)
+  {
+    f.vertex[0] = faceIndices[i];
+    f.vertex[1] = faceIndices[i + 1];
+    f.vertex[2] = faceIndices[i + 2];
+
+    // compute normals (if not supplied)
+    if(computeNormals)
+    {
+      auto v01 = Vector3(meshVertices[f.vertex[1]].coordinates) - Vector3(meshVertices[f.vertex[0]].coordinates);
+      auto v02 = Vector3(meshVertices[f.vertex[2]].coordinates) - Vector3(meshVertices[f.vertex[0]].coordinates);
+      auto n   = v01.Cross(v02);
+      n.Normalize();
+      f.normal[0] = n.x;
+      f.normal[1] = n.y;
+      f.normal[2] = n.z;
+    }
+    else
+    {
+      auto& n0 = vertexNormals[faceIndices[i]];
+      auto& n1 = vertexNormals[faceIndices[i + 1]];
+      auto& n2 = vertexNormals[faceIndices[i + 2]];
+
+      auto faceNormal = (n0 + n1 + n2) / 3.0f;
+      faceNormal.Normalize();
+      f.normal[0] = faceNormal.x;
+      f.normal[1] = -faceNormal.y;
+      f.normal[2] = faceNormal.z;
+    }
+    i += 3;
+  }
+
+  // Create edges, in this case we don't care about duplicates
+  // This mesh cannot be used for navigation
+  std::vector<NavigationMesh::Edge> meshEdges;
+  meshEdges.reserve(meshFaces.size() * 3);
+  i = 0;
+  for(auto& f : meshFaces)
+  {
+    for(auto k = 0u; k < 3; ++k)
+    {
+      meshEdges.emplace_back();
+      auto& edge     = meshEdges.back();
+      edge.face[0]   = i;
+      edge.face[1]   = NavigationMesh::NULL_FACE;
+      edge.vertex[0] = f.vertex[k];
+      edge.vertex[1] = f.vertex[(k + 1) % 3];
+    }
+    ++i;
+  }
+
+  std::vector<uint8_t> navigationMeshBinary;
+
+  // Build navigationMeshBinary binary
+  navigationMeshBinary.insert(navigationMeshBinary.end(),
+              reinterpret_cast<uint8_t*>(&header),
+              reinterpret_cast<uint8_t*>(&header) + sizeof(Internal::Algorithm::NavigationMeshHeader_V10));
+
+  auto& h = *reinterpret_cast<decltype(header)*>(navigationMeshBinary.data());
+
+  h.dataOffset       = sizeof(header);
+  h.edgeCount        = meshEdges.size();
+  h.polyCount        = meshFaces.size();
+  h.vertexCount      = meshVertices.size();
+  h.gravityVector[0] = 0.0f;
+  h.gravityVector[1] = -1.0f;
+  h.gravityVector[2] = 0.0f;
+  h.version          = 0;
+  h.vertexDataOffset = 0;
+  h.edgeDataOffset   = meshVertices.size() * sizeof(NavigationMesh::Vertex);
+  h.polyDataOffset   = h.edgeDataOffset + meshEdges.size() * sizeof(NavigationMesh::Edge);
+
+  // Copy data
+  navigationMeshBinary.insert(navigationMeshBinary.end(),
+              reinterpret_cast<uint8_t*>(meshVertices.data()),
+              reinterpret_cast<uint8_t*>(meshVertices.data()) + (meshVertices.size() * sizeof(NavigationMesh::Vertex)));
+  navigationMeshBinary.insert(navigationMeshBinary.end(),
+              reinterpret_cast<uint8_t*>(meshEdges.data()),
+              reinterpret_cast<uint8_t*>(meshEdges.data()) + (meshEdges.size() * sizeof(NavigationMesh::Edge)));
+  navigationMeshBinary.insert(navigationMeshBinary.end(),
+              reinterpret_cast<uint8_t*>(meshFaces.data()),
+              reinterpret_cast<uint8_t*>(meshFaces.data()) + (meshFaces.size() * sizeof(NavigationMesh::Face)));
+
+  return NavigationMeshFactory::CreateFromBuffer(navigationMeshBinary);
+}
+
+std::unique_ptr<Algorithm::NavigationMesh> NavigationMeshFactory::CreateFromVertexFaceList(const std::vector<Vector3>& vertices, const std::vector<Vector3>& normals, const std::vector<uint32_t>& faceIndices)
+{
+  return CreateFromVertexFaceList(vertices.data(), normals.data(), vertices.size(), faceIndices.data(), faceIndices.size());
+}
+
+std::vector<uint8_t> NavigationMeshFactory::GetMeshBinary(const Dali::Scene3D::Algorithm::NavigationMesh& navigationMesh)
+{
+  auto& meshImpl = Internal::Algorithm::GetImplementation(navigationMesh);
+
+  // Return as mutable copy
+  return meshImpl.GetData();
+}
+
+} // namespace Dali::Scene3D::Loader
\ No newline at end of file
diff --git a/dali-scene3d/public-api/loader/navigation-mesh-factory.h b/dali-scene3d/public-api/loader/navigation-mesh-factory.h
new file mode 100644
index 0000000..148a07f
--- /dev/null
+++ b/dali-scene3d/public-api/loader/navigation-mesh-factory.h
@@ -0,0 +1,99 @@
+#ifndef DALI_SCENE3D_LOADER_NAVIGATION_MESH_FACTORY_H
+#define DALI_SCENE3D_LOADER_NAVIGATION_MESH_FACTORY_H
+
+/*
+* Copyright (c) 2023 Samsung Electronics Co., Ltd.
+
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Factory to create a NavigationMesh from various sources.
+ * @SINCE_2_2.12
+ */
+struct DALI_SCENE3D_API NavigationMeshFactory
+{
+public:
+  /**
+   * @brief Creates NavigationMesh object from file
+   *
+   * @SINCE_2_2.12
+   * @param[in] filename file to load
+   * @return Valid NavigationMesh or nullptr
+   */
+  static std::unique_ptr<Algorithm::NavigationMesh> CreateFromFile(std::string filename);
+
+  /**
+   * @brief Creates NavigationMesh object from binary buffer
+   *
+   * @SINCE_2_2.12
+   * @param[in] buffer buffer with data
+   * @return Valid NavigationMesh or nullptr
+   */
+  static std::unique_ptr<Algorithm::NavigationMesh> CreateFromBuffer(const std::vector<uint8_t>& buffer);
+
+  /**
+   * @brief Creates new mesh from lists of vertices and faces
+   *
+   * List of faces contains indices into the vertex list
+   *
+   * @SINCE_2_2.53
+   * @param[in] vertices List of Vector3 vertices
+   * @param[in] vertexNormals List of Vector3 vertices
+   * @param[in] faceIndices List of faces
+   * @return Valid NavigationMesh or nullptr
+   */
+  static std::unique_ptr<Algorithm::NavigationMesh> CreateFromVertexFaceList(const std::vector<Vector3>& vertices, const std::vector<Vector3>& vertexNormals, const std::vector<uint32_t>& faceIndices);
+
+  /**
+   * @brief Creates new mesh from lists of vertices and faces
+   *
+   * List of faces contains indices into the vertex list
+   *
+   * This function reduces number of array copys when called from NUI.
+   *
+   * @SINCE_2_2.53
+   * @param[in] vertices Pointer to C-style array of vertices
+   * @param[in] vertexCount Number of vertices
+   * @param[in] vertexNormals to C-style array of vertex normals
+   * @param[in] faceIndices Pointer to C-style array of face elements indices
+   * @param[in] indexCount Number of indices
+   * @return Valid NavigationMesh or nullptr
+   */
+  static std::unique_ptr<Algorithm::NavigationMesh> CreateFromVertexFaceList(const Vector3* vertices, const Vector3* vertexNormals, uint32_t vertexCount, const uint32_t* faceIndices, uint32_t indexCount);
+
+  /**
+   * @brief Serializes mesh data to the binary format.
+   *
+   * The binary data returned by the function can be used
+   * as an input for NavigationMeshFactory::CreateFromBuffer()
+   *
+   * @SINCE_2_2.53
+   * @param[in] navigationMesh Navigation mesh to serialize
+   * @return Buffer containing serialized mesh data
+   */
+  static std::vector<uint8_t> GetMeshBinary(const Dali::Scene3D::Algorithm::NavigationMesh& navigationMesh);
+};
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_INTERNAL_LOADER_NAVIGATION_MESH_FACTORY_H
diff --git a/dali-scene3d/public-api/loader/node-definition.cpp b/dali-scene3d/public-api/loader/node-definition.cpp
new file mode 100644
index 0000000..013b4f3
--- /dev/null
+++ b/dali-scene3d/public-api/loader/node-definition.cpp
@@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/node-definition.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/light/light-impl.h>
+#include <dali-scene3d/internal/model-components/material-impl.h>
+#include <dali-scene3d/internal/model-components/model-node-impl.h>
+#include <dali-scene3d/internal/model-components/model-primitive-impl.h>
+#include <dali-scene3d/public-api/loader/renderer-state.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali
+{
+namespace
+{
+static constexpr std::string_view IBL_INTENSITY_STRING("uIblIntensity");
+static constexpr std::string_view IBL_Y_DIRECTION("uYDirection");
+static constexpr std::string_view IBL_MAXLOD("uMaxLOD");
+
+static constexpr uint32_t MAX_NUMBER_OF_MATERIAL_TEXTURE = 7;
+static constexpr uint32_t SEMANTICS[MAX_NUMBER_OF_MATERIAL_TEXTURE] =
+  {
+    Scene3D::Loader::MaterialDefinition::ALBEDO,
+    Scene3D::Loader::MaterialDefinition::METALLIC | Scene3D::Loader::MaterialDefinition::ROUGHNESS,
+    Scene3D::Loader::MaterialDefinition::NORMAL,
+    Scene3D::Loader::MaterialDefinition::OCCLUSION,
+    Scene3D::Loader::MaterialDefinition::EMISSIVE,
+    Scene3D::Loader::MaterialDefinition::SPECULAR,
+    Scene3D::Loader::MaterialDefinition::SPECULAR_COLOR,
+};
+
+static constexpr Scene3D::Material::TextureType TEXTURE_TYPES[MAX_NUMBER_OF_MATERIAL_TEXTURE] =
+  {
+    Scene3D::Material::TextureType::BASE_COLOR,
+    Scene3D::Material::TextureType::METALLIC_ROUGHNESS,
+    Scene3D::Material::TextureType::NORMAL,
+    Scene3D::Material::TextureType::OCCLUSION,
+    Scene3D::Material::TextureType::EMISSIVE,
+    Scene3D::Material::TextureType::SPECULAR,
+    Scene3D::Material::TextureType::SPECULAR_COLOR,
+};
+
+Vector4 GetTextureFactor(Scene3D::Loader::MaterialDefinition& materialDefinition, uint32_t semantic)
+{
+  Vector4 factor = Vector4::ONE;
+  switch(semantic)
+  {
+    case Scene3D::Loader::MaterialDefinition::ALBEDO:
+      factor = materialDefinition.mBaseColorFactor;
+      break;
+    case Scene3D::Loader::MaterialDefinition::METALLIC | Scene3D::Loader::MaterialDefinition::ROUGHNESS:
+      factor = Vector4(materialDefinition.mMetallic, materialDefinition.mRoughness, 0.0f, 0.0f);
+      break;
+    case Scene3D::Loader::MaterialDefinition::NORMAL:
+      factor.x = materialDefinition.mNormalScale;
+      break;
+    case Scene3D::Loader::MaterialDefinition::OCCLUSION:
+      factor.x = materialDefinition.mOcclusionStrength;
+      break;
+    case Scene3D::Loader::MaterialDefinition::EMISSIVE:
+      factor = materialDefinition.mEmissiveFactor;
+      break;
+    case Scene3D::Loader::MaterialDefinition::SPECULAR:
+      factor.x = materialDefinition.mSpecularFactor;
+      break;
+    case Scene3D::Loader::MaterialDefinition::SPECULAR_COLOR:
+      factor = materialDefinition.mSpecularColorFactor;
+      break;
+    default:
+      break;
+  }
+  return factor;
+}
+
+} // namespace
+
+namespace Scene3D
+{
+namespace Loader
+{
+bool NodeDefinition::Renderable::GetExtents(const ResourceBundle& resources, Vector3& min, Vector3& max) const
+{
+  return false;
+}
+
+void NodeDefinition::Renderable::RegisterResources(IResourceReceiver& receiver) const
+{
+  receiver.Register(ResourceType::Shader, mShaderIdx);
+}
+
+void NodeDefinition::Renderable::ReflectResources(IResourceReflector& reflector)
+{
+  reflector.Reflect(ResourceType::Shader, mShaderIdx);
+}
+
+void NodeDefinition::Renderable::OnCreate(const NodeDefinition& nodeDefinition, CreateParams& params, ModelNode& node) const
+{
+  DALI_ASSERT_DEBUG(mShaderIdx != INVALID_INDEX);
+  auto&  resources = params.mResources;
+  Shader shader    = resources.mShaders[mShaderIdx].second;
+
+  static Geometry defaultGeometry = Geometry::New();
+  Renderer        renderer        = Renderer::New(defaultGeometry, shader);
+
+  RendererState::Apply(resources.mShaders[mShaderIdx].first.mRendererState, renderer);
+
+  node.AddRenderer(renderer);
+}
+
+const char* NodeDefinition::ORIGINAL_MATRIX_PROPERTY_NAME = "originalMatrix";
+
+ModelNode NodeDefinition::CreateModelNode(CreateParams& params)
+{
+  ModelNode node = ModelNode::New();
+  mNodeId        = node.GetProperty<int32_t>(Dali::Actor::Property::ID);
+
+  SetActorCentered(node);
+
+  node.SetProperty(Actor::Property::NAME, mName);
+  node.SetProperty(Actor::Property::POSITION, mPosition);
+  node.SetProperty(Actor::Property::ORIENTATION, mOrientation);
+  node.SetProperty(Actor::Property::SCALE, mScale);
+  node.SetProperty(Actor::Property::SIZE, mSize);
+  node.SetProperty(Actor::Property::VISIBLE, mIsVisible);
+
+  node.RegisterProperty(ORIGINAL_MATRIX_PROPERTY_NAME, GetLocalSpace(), Property::AccessMode::READ_ONLY);
+
+  node.SetProperty(Actor::Property::COLOR_MODE, ColorMode::USE_OWN_MULTIPLY_PARENT_COLOR);
+
+  for(auto& renderable : mRenderables)
+  {
+    renderable->OnCreate(*this, params, node);
+  }
+
+  for(auto& e : mExtras)
+  {
+    node.RegisterProperty(e.mKey, e.mValue);
+  }
+
+  for(auto& c : mConstraints)
+  {
+    params.mConstrainables.push_back(ConstraintRequest{&c, node});
+  }
+
+  return node;
+}
+
+Matrix NodeDefinition::GetLocalSpace() const
+{
+  Matrix localSpace{false};
+  localSpace.SetTransformComponents(mScale, mOrientation, mPosition);
+  return localSpace;
+}
+
+std::string_view NodeDefinition::GetIblScaleFactorUniformName()
+{
+  return IBL_INTENSITY_STRING;
+}
+
+std::string_view NodeDefinition::GetIblYDirectionUniformName()
+{
+  return IBL_Y_DIRECTION;
+}
+
+std::string_view NodeDefinition::GetIblMaxLodUniformName()
+{
+  return IBL_MAXLOD;
+}
+
+bool NodeDefinition::GetExtents(const ResourceBundle& resources, Vector3& min, Vector3& max) const
+{
+  if(mRenderables.empty())
+  {
+    return false;
+  }
+
+  bool useModelExtents = false;
+  for(auto& renderable : mRenderables)
+  {
+    Vector3 renderableMin(Vector3::ONE * MAXFLOAT), renderableMax(-Vector3::ONE * MAXFLOAT);
+    if(!renderable->GetExtents(resources, renderableMin, renderableMax))
+    {
+      useModelExtents = false;
+      break;
+    }
+    useModelExtents = true;
+    min.x           = std::min(min.x, renderableMin.x);
+    min.y           = std::min(min.y, renderableMin.y);
+    min.z           = std::min(min.z, renderableMin.z);
+    max.x           = std::max(max.x, renderableMax.x);
+    max.y           = std::max(max.y, renderableMax.y);
+    max.z           = std::max(max.z, renderableMax.z);
+  }
+  if(!useModelExtents)
+  {
+    // If the renderable node don't have mesh accessor, use size to compute extents.
+    min = -mSize / 2.0f;
+    max = mSize / 2.0f;
+  }
+  return true;
+}
+
+bool ModelRenderable::GetExtents(const ResourceBundle& resources, Vector3& min, Vector3& max) const
+{
+  auto&    mesh    = resources.mMeshes[mMeshIdx];
+  uint32_t minSize = mesh.first.mPositions.mBlob.mMin.size();
+  uint32_t maxSize = mesh.first.mPositions.mBlob.mMax.size();
+  if(minSize == maxSize && minSize >= 2u && maxSize >= 2u)
+  {
+    min = Vector3(mesh.first.mPositions.mBlob.mMin[0], mesh.first.mPositions.mBlob.mMin[1], 0.0f);
+    max = Vector3(mesh.first.mPositions.mBlob.mMax[0], mesh.first.mPositions.mBlob.mMax[1], 0.0f);
+    if(minSize == 3u)
+    {
+      min.z = mesh.first.mPositions.mBlob.mMin[2];
+      max.z = mesh.first.mPositions.mBlob.mMax[2];
+    }
+    return true;
+  }
+  return false;
+}
+
+void ModelRenderable::RegisterResources(IResourceReceiver& receiver) const
+{
+  Renderable::RegisterResources(receiver);
+  receiver.Register(ResourceType::Mesh, mMeshIdx);
+  receiver.Register(ResourceType::Material, mMaterialIdx);
+}
+
+void ModelRenderable::ReflectResources(IResourceReflector& reflector)
+{
+  Renderable::ReflectResources(reflector);
+  reflector.Reflect(ResourceType::Mesh, mMeshIdx);
+  reflector.Reflect(ResourceType::Material, mMaterialIdx);
+}
+
+// How many shader managers are there?!
+void ModelRenderable::OnCreate(const NodeDefinition& nodeDefinition, NodeDefinition::CreateParams& params, ModelNode& node) const
+{
+  DALI_ASSERT_DEBUG(mMeshIdx != INVALID_INDEX);
+  ShaderOption::HashType shaderOptionHash{0u};
+  if(mShaderIdx == INVALID_INDEX)
+  {
+    ShaderOption option = params.mShaderManager->ProduceShaderOption(params.mResources.mMaterials[mMaterialIdx].first,
+                                                                     params.mResources.mMeshes[mMeshIdx].first);
+    shaderOptionHash    = option.GetOptionHash();
+    Shader shader       = params.mShaderManager->ProduceShader(option);
+
+    static Geometry defaultGeometry = Geometry::New();
+    Renderer        renderer        = Renderer::New(defaultGeometry, shader);
+
+    RendererState::Apply(params.mShaderManager->GetRendererState(params.mResources.mMaterials[mMaterialIdx].first), renderer);
+    Internal::GetImplementation(node).UpdateShader(params.mShaderManager);
+    node.AddRenderer(renderer);
+  }
+  else
+  {
+    Renderable::OnCreate(nodeDefinition, params, node);
+  }
+
+  auto& resources = params.mResources;
+  auto& mesh      = resources.mMeshes[mMeshIdx];
+
+  auto     renderer = node.GetRendererAt(node.GetRendererCount() - 1u);
+  Geometry geometry = mesh.second.geometry;
+  renderer.SetGeometry(geometry);
+
+  TextureSet textures = resources.mMaterials[mMaterialIdx].second;
+  // Set the blend shape texture.
+  if(mesh.second.blendShapeGeometry)
+  {
+    TextureSet newTextureSet = TextureSet::New();
+    newTextureSet.SetTexture(0u, mesh.second.blendShapeGeometry);
+
+    const unsigned int numberOfTextures = textures.GetTextureCount();
+    for(unsigned int index = 0u; index < numberOfTextures; ++index)
+    {
+      const unsigned int newIndex = index + 1u;
+      newTextureSet.SetTexture(newIndex, textures.GetTexture(index));
+      newTextureSet.SetSampler(newIndex, textures.GetSampler(index));
+    }
+
+    textures = newTextureSet;
+  }
+  renderer.SetTextures(textures);
+
+  {
+    mesh.first.mModelPrimitive = ModelPrimitive::New();
+    auto& primitive            = GetImplementation(mesh.first.mModelPrimitive);
+    primitive.SetRenderer(renderer);
+
+    Index    envIndex       = resources.mMaterials[mMaterialIdx].first.mEnvironmentIdx;
+    uint32_t specularMipmap = resources.mEnvironmentMaps[envIndex].second.mSpecularMipmapLevels;
+    primitive.SetImageBasedLightTexture(resources.mEnvironmentMaps[envIndex].second.mDiffuse,
+                                        resources.mEnvironmentMaps[envIndex].second.mSpecular,
+                                        resources.mEnvironmentMaps[envIndex].first.mIblIntensity,
+                                        specularMipmap);
+
+    bool hasPositions = false;
+    bool hasNormals   = false;
+    bool hasTangents  = false;
+    mesh.first.RetrieveBlendShapeComponents(hasPositions, hasNormals, hasTangents);
+    primitive.SetBlendShapeOptions(hasPositions, hasNormals, hasTangents, mesh.first.mBlendShapeVersion);
+    primitive.SetBlendShapeGeometry(mesh.second.blendShapeGeometry);
+    primitive.SetSkinned(mesh.first.IsSkinned(), mesh.first.GetNumberOfJointSets());
+    primitive.SetVertexColor(mesh.first.HasVertexColor());
+  }
+
+  auto shader = renderer.GetShader();
+  if(mesh.first.IsSkinned())
+  {
+    params.mSkinnables.push_back(SkinningShaderConfigurationRequest{mesh.first.mSkeletonIdx, shader, mesh.first.mModelPrimitive});
+  }
+
+  if(mesh.first.HasBlendShapes())
+  {
+    params.mBlendshapeRequests.push_back(BlendshapeShaderConfigurationRequest{nodeDefinition.mName, mMeshIdx, shader, mesh.first.mModelPrimitive});
+  }
+
+  auto& matDef = resources.mMaterials[mMaterialIdx].first;
+  renderer.RegisterProperty("uColorFactor", matDef.mBaseColorFactor);
+  renderer.RegisterProperty("uMetallicFactor", matDef.mMetallic);
+  renderer.RegisterProperty("uRoughnessFactor", matDef.mRoughness);
+  renderer.RegisterProperty("uDielectricSpecular", matDef.mDielectricSpecular);
+  renderer.RegisterProperty("uSpecularFactor", matDef.mSpecularFactor);
+  renderer.RegisterProperty("uSpecularColorFactor", matDef.mSpecularColorFactor);
+  renderer.RegisterProperty("uNormalScale", matDef.mNormalScale);
+  renderer.RegisterProperty("uEmissiveFactor", matDef.mEmissiveFactor);
+  if(matDef.mFlags & MaterialDefinition::OCCLUSION)
+  {
+    renderer.RegisterProperty("uOcclusionStrength", matDef.mOcclusionStrength);
+  }
+
+  renderer.RegisterProperty("uBaseColorTextureTransformAvailable", 0.0f);
+  renderer.RegisterProperty("uNormalTextureTransformAvailable", 0.0f);
+  renderer.RegisterProperty("uNormalRoughnessTextureTransformAvailable", 0.0f);
+  renderer.RegisterProperty("uMetalRoughnessTextureTransformAvailable", 0.0f);
+  renderer.RegisterProperty("uOcclusionTextureTransformAvailable", 0.0f);
+  renderer.RegisterProperty("uEmissiveTextureTransformAvailable", 0.0f);
+
+  renderer.RegisterProperty("uBaseColorTextureTransform", Matrix3::IDENTITY);
+  renderer.RegisterProperty("uNormalRoughnessTextureTransform", Matrix3::IDENTITY);
+  renderer.RegisterProperty("uNormalTextureTransform", Matrix3::IDENTITY);
+  renderer.RegisterProperty("uMetalRoughnessTextureTransform", Matrix3::IDENTITY);
+  renderer.RegisterProperty("uOcclusionTextureTransform", Matrix3::IDENTITY);
+  renderer.RegisterProperty("uEmissiveTextureTransform", Matrix3::IDENTITY);
+
+  auto iTexture   = matDef.mTextureStages.begin();
+  auto checkStage = [&](uint32_t flags) {
+    return iTexture != matDef.mTextureStages.end() && MaskMatch(iTexture->mSemantic, flags);
+  };
+
+  if(checkStage(MaterialDefinition::ALBEDO | MaterialDefinition::METALLIC))
+  {
+    renderer.RegisterProperty("uBaseColorTextureTransformAvailable", iTexture->mTexture.mTransform != Matrix3::IDENTITY);
+    renderer.RegisterProperty("uBaseColorTextureTransform", iTexture->mTexture.mTransform);
+    ++iTexture;
+
+    if(checkStage(MaterialDefinition::NORMAL | MaterialDefinition::ROUGHNESS))
+    {
+      renderer.RegisterProperty("uNormalRoughnessTextureTransformAvailable", iTexture->mTexture.mTransform != Matrix3::IDENTITY);
+      renderer.RegisterProperty("uNormalRoughnessTextureTransform", iTexture->mTexture.mTransform);
+      ++iTexture;
+    }
+  }
+  else if(checkStage(MaterialDefinition::ALBEDO))
+  {
+    renderer.RegisterProperty("uBaseColorTextureTransformAvailable", iTexture->mTexture.mTransform != Matrix3::IDENTITY);
+    renderer.RegisterProperty("uBaseColorTextureTransform", iTexture->mTexture.mTransform);
+    ++iTexture;
+  }
+
+  if(checkStage(MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS))
+  {
+    renderer.RegisterProperty("uMetalRoughnessTextureTransformAvailable", iTexture->mTexture.mTransform != Matrix3::IDENTITY);
+    renderer.RegisterProperty("uMetalRoughnessTextureTransform", iTexture->mTexture.mTransform);
+    ++iTexture;
+  }
+
+  if(checkStage(MaterialDefinition::NORMAL))
+  {
+    renderer.RegisterProperty("uNormalTextureTransformAvailable", iTexture->mTexture.mTransform != Matrix3::IDENTITY);
+    renderer.RegisterProperty("uNormalTextureTransform", iTexture->mTexture.mTransform);
+    ++iTexture;
+  }
+
+  if(checkStage(MaterialDefinition::OCCLUSION))
+  {
+    renderer.RegisterProperty("uOcclusionTextureTransformAvailable", iTexture->mTexture.mTransform != Matrix3::IDENTITY);
+    renderer.RegisterProperty("uOcclusionTextureTransform", iTexture->mTexture.mTransform);
+    ++iTexture;
+  }
+
+  if(checkStage(MaterialDefinition::EMISSIVE))
+  {
+    renderer.RegisterProperty("uEmissiveTextureTransformAvailable", iTexture->mTexture.mTransform != Matrix3::IDENTITY);
+    renderer.RegisterProperty("uEmissiveTextureTransform", iTexture->mTexture.mTransform);
+    ++iTexture;
+  }
+
+  float opaque      = matDef.mIsOpaque ? 1.0f : 0.0f;
+  float mask        = matDef.mIsMask ? 1.0f : 0.0f;
+  float alphaCutoff = matDef.GetAlphaCutoff();
+
+  renderer.RegisterProperty("uOpaque", opaque);
+  renderer.RegisterProperty("uMask", mask);
+  renderer.RegisterProperty("uAlphaThreshold", alphaCutoff);
+
+  Index    envIndex       = matDef.mEnvironmentIdx;
+  uint32_t specularMipmap = resources.mEnvironmentMaps[envIndex].second.mSpecularMipmapLevels;
+  renderer.RegisterProperty(IBL_MAXLOD.data(), static_cast<float>(specularMipmap));
+  renderer.RegisterProperty(IBL_INTENSITY_STRING.data(), resources.mEnvironmentMaps[envIndex].first.mIblIntensity);
+  renderer.RegisterProperty(IBL_Y_DIRECTION.data(), resources.mEnvironmentMaps[envIndex].first.mYDirection);
+
+  node.SetProperty(Actor::Property::COLOR, mColor);
+
+  // If user uses customshader, the properties of the shader could not be changed by Material.
+  if(mShaderIdx == INVALID_INDEX)
+  {
+    matDef.mMaterial            = Material::New();
+    auto     material           = matDef.mMaterial;
+    uint32_t textureIndexOffset = (mesh.second.blendShapeGeometry) ? 1 : 0;
+    uint32_t textureIndex       = 0;
+    for(uint32_t i = 0; i < MAX_NUMBER_OF_MATERIAL_TEXTURE; ++i)
+    {
+      Internal::Material::TextureInformation textureInformation;
+      if(matDef.CheckTextures(SEMANTICS[i]))
+      {
+        textureInformation.mTexture   = textures.GetTexture(textureIndex + textureIndexOffset);
+        textureInformation.mSampler   = textures.GetSampler(textureIndex + textureIndexOffset);
+        textureInformation.mUrl       = matDef.mTextureStages[textureIndex].mTexture.mDirectoryPath + matDef.mTextureStages[textureIndex].mTexture.mImageUri;
+        textureInformation.mTransform = matDef.mTextureStages[textureIndex].mTexture.mTransform;
+        textureIndex++;
+      }
+      textureInformation.mFactor = GetTextureFactor(matDef, SEMANTICS[i]);
+      GetImplementation(material).SetTextureInformation(TEXTURE_TYPES[i], std::move(textureInformation));
+    }
+    material.SetProperty(Scene3D::Material::Property::ALPHA_MODE, matDef.mAlphaModeType);
+    material.SetProperty(Scene3D::Material::Property::ALPHA_CUTOFF, matDef.GetAlphaCutoff());
+    material.SetProperty(Scene3D::Material::Property::DOUBLE_SIDED, matDef.mDoubleSided);
+    material.SetProperty(Scene3D::Material::Property::IOR, matDef.mIor);
+
+    // This _should_ keep the same shader as generated at the top of the method.
+    GetImplementation(mesh.first.mModelPrimitive).SetMaterial(material, false);
+    GetImplementation(material).ResetFlag();
+  }
+
+  Internal::GetImplementation(node).AddModelPrimitive(mesh.first.mModelPrimitive, shaderOptionHash);
+}
+
+void ArcRenderable::OnCreate(const NodeDefinition& nodeDefinition, NodeDefinition::CreateParams& params, ModelNode& node) const
+{
+  ModelRenderable::OnCreate(nodeDefinition, params, node);
+
+  node.RegisterProperty("antiAliasing", mAntiAliasing ? 1 : 0);
+  node.RegisterProperty("arcCaps", mArcCaps);
+  node.RegisterProperty("radius", mRadius);
+
+  const float startAngleRadians = mStartAngleDegrees * Math::PI_OVER_180;
+  Vector2     startPolar{std::cos(startAngleRadians), std::sin(startAngleRadians)};
+  node.RegisterProperty("startAngle", startPolar);
+
+  const float endAngleRadians = mEndAngleDegrees * Math::PI_OVER_180;
+  Vector2     endPolar{std::cos(endAngleRadians), std::sin(endAngleRadians)};
+  node.RegisterProperty("endAngle", endPolar);
+}
+
+void ArcRenderable::GetEndVectorWithDiffAngle(float startAngle, float diffAngle, Vector2& endVector)
+{
+  float endAngle = 0.f;
+
+  if(diffAngle <= 0.001f)
+  {
+    // 0.001 is used to ensure is empty arc when startAngle = endAngle + 360 * N
+    endAngle = startAngle + 0.001f;
+  }
+  else if(diffAngle >= 360.f)
+  {
+    endAngle = diffAngle + 359.99f;
+  }
+  else
+  {
+    endAngle = startAngle + 360.0f + diffAngle;
+  }
+  endVector.x = cosf(endAngle * Math::PI_OVER_180);
+  endVector.y = sinf(endAngle * Math::PI_OVER_180);
+}
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/public-api/loader/node-definition.h b/dali-scene3d/public-api/loader/node-definition.h
new file mode 100644
index 0000000..c1cea09
--- /dev/null
+++ b/dali-scene3d/public-api/loader/node-definition.h
@@ -0,0 +1,339 @@
+#ifndef DALI_SCENE3D_LOADER_NODE_DEFINITION_H_
+#define DALI_SCENE3D_LOADER_NODE_DEFINITION_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/math/vector4.h>
+#include <functional>
+#include <memory>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/customization.h>
+#include <dali-scene3d/public-api/loader/matrix-stack.h>
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+#include <dali-scene3d/public-api/model-components/model-node.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+namespace Loader
+{
+class ViewProjection;
+
+/**
+ * @brief Interface to report (const) resource ids to.
+ * @SINCE_2_0.7
+ */
+class DALI_SCENE3D_API IResourceReceiver
+{
+public:
+  virtual ~IResourceReceiver() = default;
+
+  virtual void Register(ResourceType::Value type, Index id) = 0;
+};
+
+/**
+ * @brief Interface to report modifiable resource ids to.
+ * @SINCE_2_0.7
+ * @note These are supposed to be transient. Obviously, the references collected
+ *  this way must not outlive the objects that they came from.
+ */
+class DALI_SCENE3D_API IResourceReflector
+{
+public:
+  virtual ~IResourceReflector() = default;
+
+  virtual void Reflect(ResourceType::Value type, Index& id) = 0;
+};
+
+/**
+ * @brief Intermediate representation for a constraint that shall be
+ *  set up after the Actors were created. The target of the constraint
+ *  is the node definition that carries it.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API ConstraintDefinition
+{
+  std::string mProperty;  ///< name of the property to constrain.
+  Index       mSourceIdx; ///< index of the node to serve as the source of the constraint.
+
+  bool operator<(const ConstraintDefinition& other) const
+  {
+    return mProperty < other.mProperty;
+  }
+
+  bool operator==(const ConstraintDefinition& other) const
+  {
+    return mSourceIdx == other.mSourceIdx && mProperty == other.mProperty;
+  }
+
+  bool operator!=(const ConstraintDefinition& other) const
+  {
+    return !operator==(other);
+  }
+};
+
+struct DALI_SCENE3D_API Transforms
+{
+  MatrixStack           modelStack;
+  const ViewProjection& viewProjection;
+};
+
+/**
+ * @brief Information about a skeleton and the shader that needs to be configured with it.
+ * @SINCE_2_0.7
+ * @note Multiple skeletons shalt not share the same shader.
+ */
+struct DALI_SCENE3D_API SkinningShaderConfigurationRequest
+{
+  Index          mSkeletonIdx;
+  Shader         mShader;
+  ModelPrimitive mPrimitive;
+
+  bool operator<(const SkinningShaderConfigurationRequest& other) const
+  {
+    return mShader < other.mShader || (mShader == other.mShader && mPrimitive < other.mPrimitive);
+  }
+};
+
+/**
+ * @brief Needed to configure blend shape properties.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API BlendshapeShaderConfigurationRequest
+{
+  std::string    mNodeName;
+  Index          mMeshIdx;
+  Shader         mShader;
+  ModelPrimitive mPrimitive;
+
+  bool operator<(const BlendshapeShaderConfigurationRequest& other) const
+  {
+    return mShader < other.mShader || (mShader == other.mShader && mPrimitive < other.mPrimitive);
+  }
+};
+
+/**
+ * @brief Request for creating a constraint, output from NodeDefinition::OnCreate.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API ConstraintRequest
+{
+  const ConstraintDefinition* const mConstraint; ///< Definition of the constraint to create.
+  Actor                             mTarget;     ///< Target of the constraint.
+};
+
+/**
+ * @brief Defines a node, consisting of a name, a transform, a size, a list of child nodes,
+ *  and slots for customization and rendering logic, which are mutually exclusive in the
+ *  current implementation.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API NodeDefinition
+{
+public: // TYPES
+  using Vector = std::vector<NodeDefinition>;
+
+  struct CreateParams
+  {
+  public: // input
+    ResourceBundle&                         mResources;
+    Transforms&                             mXforms;
+    Dali::Scene3D::Loader::ShaderManagerPtr mShaderManager;
+
+  public: // output
+    std::vector<ConstraintRequest>                    mConstrainables;
+    std::vector<SkinningShaderConfigurationRequest>   mSkinnables;
+    std::vector<BlendshapeShaderConfigurationRequest> mBlendshapeRequests;
+  };
+
+  class DALI_SCENE3D_API Renderable
+  {
+  public: // DATA
+    Index mShaderIdx = INVALID_INDEX;
+
+  public: // METHODS
+    virtual ~Renderable() = default;
+
+    virtual bool GetExtents(const ResourceBundle& resources, Vector3& min, Vector3& max) const;
+    virtual void RegisterResources(IResourceReceiver& receiver) const;
+    virtual void ReflectResources(IResourceReflector& reflector);
+    virtual void OnCreate(const NodeDefinition& nodeDefinition, CreateParams& params, ModelNode& node) const;
+  };
+
+  struct CustomizationDefinition
+  {
+    std::string mTag;
+
+    Index GetChildId(const Customization::Choices& choices, const NodeDefinition& node)
+    {
+      auto choice = choices.Get(mTag);
+      return std::min(choice != Customization::NONE ? choice : 0,
+                      static_cast<Index>(node.mChildren.size() - 1));
+    }
+  };
+
+  class IVisitor
+  {
+  public:
+    virtual void Start(NodeDefinition& n)  = 0;
+    virtual void Finish(NodeDefinition& n) = 0;
+
+  protected:
+    ~IVisitor() = default; // deliberately non-virtual these are transient objects and we don't want to pay for the vtable.
+  };
+
+  class IConstVisitor
+  {
+  public:
+    virtual void Start(const NodeDefinition& n)  = 0;
+    virtual void Finish(const NodeDefinition& n) = 0;
+
+  protected:
+    ~IConstVisitor() = default; // deliberately non-virtual these are transient objects and we don't want to pay for the vtable.
+  };
+
+  struct Extra
+  {
+    std::string     mKey;
+    Property::Value mValue;
+
+    bool operator<(const Extra& other) const
+    {
+      return mKey < other.mKey;
+    }
+  };
+
+public: // METHODS
+  /**
+   * @brief Creates a ModelNode from this definition only.
+   * @SINCE_2_0.7
+   * @note Not recursive.
+   */
+  ModelNode CreateModelNode(CreateParams& params);
+
+  /**
+   * @brief Gets local space matrix of this node
+   * @SINCE_2_1.32
+   * @return Matrix of local space.
+   */
+  Matrix GetLocalSpace() const;
+
+  /**
+   * @brief Retrieves minimum and maximum position of this node in local space.
+   * @SINCE_2_1.32
+   * @param[in] resources ResourceBundle that contains mesh information of this node.
+   * @param[out] min Minimum position of the mesh of this node.
+   * @param[out] max Maximum position of the mesh of this node.
+   * @return true If the node has mesh.
+   */
+  bool GetExtents(const ResourceBundle& resources, Vector3& min, Vector3& max) const;
+
+  /**
+   * @brief Retrieves Scale Factor uniform name.
+   *
+   * This uniform name can be used to change scale factor for ibl.
+   * @SINCE_2_1.32
+   * @return std::string_view of the scale factor uniform name.
+   */
+  static std::string_view GetIblScaleFactorUniformName();
+
+  /**
+   * @brief Retrieves ibl Ydirection uniform name.
+   *
+   * This uniform name can be used to flip y direction of ibl in shader.
+   * @SINCE_2_1.32
+   * @return std::string_view of the YDirection uniform name.
+   */
+  static std::string_view GetIblYDirectionUniformName();
+
+  /**
+   * @brief Retrieves ibl MaxLod uniform name.
+   *
+   * This uniform name can be used to set max lod of ibl in shader.
+   * @SINCE_2_2.19
+   * @return std::string_view of the Max Lod uniform name.
+   */
+  static std::string_view GetIblMaxLodUniformName();
+
+public: // DATA
+  static const char* ORIGINAL_MATRIX_PROPERTY_NAME;
+
+  std::string mName;
+  uint32_t    mNodeId = INVALID_INDEX;
+
+  Vector3    mPosition    = Vector3::ZERO;
+  Quaternion mOrientation = Quaternion::IDENTITY;
+  Vector3    mScale       = Vector3::ONE;
+  Vector3    mSize        = Vector3::ONE;
+
+  bool mIsVisible = true;
+
+  std::vector<std::unique_ptr<Renderable>> mRenderables;
+  std::unique_ptr<CustomizationDefinition> mCustomization;
+  std::vector<Extra>                       mExtras;
+  std::vector<ConstraintDefinition>        mConstraints;
+
+  std::vector<Index> mChildren;
+  Index              mParentIdx = INVALID_INDEX;
+};
+
+class DALI_SCENE3D_API ModelRenderable : public NodeDefinition::Renderable
+{
+public: // DATA
+  Vector4 mColor       = Color::WHITE;
+  Index   mMeshIdx     = INVALID_INDEX;
+  Index   mMaterialIdx = INVALID_INDEX;
+
+public: // METHODS
+  bool GetExtents(const ResourceBundle& resources, Vector3& min, Vector3& max) const override;
+  void RegisterResources(IResourceReceiver& receiver) const override;
+  void ReflectResources(IResourceReflector& reflector) override;
+  void OnCreate(const NodeDefinition& nodeDefinition, NodeDefinition::CreateParams& params, ModelNode& node) const override;
+};
+
+/**
+ * @brief Parameters for an Arc node.
+ * @SINCE_2_0.7
+ */
+class DALI_SCENE3D_API ArcRenderable : public ModelRenderable
+{
+public: // DATA
+  bool  mAntiAliasing      = true;
+  int   mArcCaps           = 0;
+  float mStartAngleDegrees = .0f;
+  float mEndAngleDegrees   = .0f;
+  float mRadius            = .0f;
+
+public: // METHODS
+  static void GetEndVectorWithDiffAngle(float startAngle, float endAngle, Vector2& endVector);
+
+  void OnCreate(const NodeDefinition& nodeDefinition, NodeDefinition::CreateParams& params, ModelNode& node) const override;
+};
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
+
+#endif // DALI_SCENE3D_LOADER_NODE_DEFINITION_H_
diff --git a/dali-scene3d/public-api/loader/parse-renderer-state.cpp b/dali-scene3d/public-api/loader/parse-renderer-state.cpp
new file mode 100644
index 0000000..63b7d58
--- /dev/null
+++ b/dali-scene3d/public-api/loader/parse-renderer-state.cpp
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/parse-renderer-state.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+#include <cstring>
+
+namespace Dali::Scene3D::Loader
+{
+namespace RendererState
+{
+namespace
+{
+const std::map<std::string_view, Type>& GetComparisons()
+{
+  static const std::map<std::string_view, Type> COMPARISONS{
+  #define DECL_COMPARISON(x) {#x, Comparison::x}
+    DECL_COMPARISON(NEVER),
+    DECL_COMPARISON(ALWAYS),
+    DECL_COMPARISON(LESS),
+    DECL_COMPARISON(GREATER),
+    DECL_COMPARISON(EQUAL),
+    DECL_COMPARISON(NOT_EQUAL),
+    DECL_COMPARISON(LESS_EQUAL),
+    DECL_COMPARISON(GREATER_EQUAL),
+  #undef DECL_COMPARISON
+  };
+  return COMPARISONS;
+}
+
+Type InterpretComparison(const std::string_view& str)
+{
+  Type value = 0x0;
+  auto iFind = GetComparisons().find(str);
+  if(iFind != GetComparisons().end())
+  {
+    value = iFind->second;
+  }
+  return value;
+}
+
+const std::map<std::string_view, Type>& GetBlendFactors()
+{
+  static const std::map<std::string_view, Type> BLEND_FACTORS{
+  #define DECL_BLEND_FACTOR(x) {#x, Dali::Scene3D::Loader::BlendFactor::x}
+    DECL_BLEND_FACTOR(ZERO),
+    DECL_BLEND_FACTOR(ONE),
+    DECL_BLEND_FACTOR(SRC_COLOR),
+    DECL_BLEND_FACTOR(ONE_MINUS_SRC_COLOR),
+    DECL_BLEND_FACTOR(SRC_ALPHA),
+    DECL_BLEND_FACTOR(ONE_MINUS_SRC_ALPHA),
+    DECL_BLEND_FACTOR(DST_ALPHA),
+    DECL_BLEND_FACTOR(ONE_MINUS_DST_ALPHA),
+    DECL_BLEND_FACTOR(DST_COLOR),
+    DECL_BLEND_FACTOR(ONE_MINUS_DST_COLOR),
+    DECL_BLEND_FACTOR(SRC_ALPHA_SATURATE),
+    DECL_BLEND_FACTOR(CONSTANT_COLOR),
+    DECL_BLEND_FACTOR(ONE_MINUS_CONSTANT_COLOR),
+    DECL_BLEND_FACTOR(CONSTANT_ALPHA),
+    DECL_BLEND_FACTOR(ONE_MINUS_CONSTANT_ALPHA),
+  #undef DECL_BLEND_FACTOR
+  };
+  return BLEND_FACTORS;
+}
+
+Type InterpretBlendFactor(const std::string_view& str, uint8_t item)
+{
+  Type value = 0x0;
+  auto iFind = GetBlendFactors().find(str);
+  if(iFind != GetBlendFactors().end())
+  {
+    value = iFind->second << (BLEND_FACTOR_BASE_SHIFT + BLEND_FACTOR_ITEM_BITS * item);
+  }
+  return value;
+}
+
+const std::map<std::string_view, Type>& GetBufferModes()
+{
+  static const std::map<std::string_view, Type> BUFFER_MODES{
+  #define DECL_BUFFER_MODE(x) {#x, BufferMode::x}
+    DECL_BUFFER_MODE(NONE),
+    DECL_BUFFER_MODE(AUTO),
+    DECL_BUFFER_MODE(COLOR),
+    DECL_BUFFER_MODE(STENCIL),
+    DECL_BUFFER_MODE(COLOR_STENCIL),
+  #undef DECL_BUFFER_MODE
+  };
+  return BUFFER_MODES;
+}
+
+Type InterpretBufferMode(const std::string_view& str)
+{
+  Type value = 0x0;
+  auto iFind = GetBufferModes().find(str);
+  if(iFind != GetBufferModes().end())
+  {
+    value = iFind->second << BUFFER_MODE_SHIFT;
+  }
+  return value;
+}
+
+const std::map<std::string_view, Type (*)(const std::string_view&)>& GetRendererStateProcessors()
+{
+  static const std::map<std::string_view, Type (*)(const std::string_view&)> RENDERER_STATE_PROCESSORS{
+    {"DEPTH_WRITE", [](const std::string_view&) -> Type { return DEPTH_WRITE; }},
+    {"DEPTH_TEST", [](const std::string_view&) -> Type { return DEPTH_TEST; }},
+    {"CULL_FRONT", [](const std::string_view&) -> Type { return CULL_FRONT; }},
+    {"CULL_BACK", [](const std::string_view&) -> Type { return CULL_BACK; }},
+    {"ALPHA_BLEND", [](const std::string_view&) -> Type { return ALPHA_BLEND; }},
+    {"DEPTH_FUNC", [](const std::string_view& arg) -> Type {
+       Type value = (arg[0] == ':') ? (InterpretComparison(std::string_view(arg.data() + 1, arg.size() - 1)) << DEPTH_FUNCTION_SHIFT) : 0x0;
+       return value;
+     }},
+    {"BLEND_SRC_RGB", [](const std::string_view& arg) -> Type {
+       Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 0) : 0x0;
+       return value;
+     }},
+    {"BLEND_DST_RGB", [](const std::string_view& arg) -> Type {
+       Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 1) : 0x0;
+       return value;
+     }},
+    {"BLEND_SRC_ALPHA", [](const std::string_view& arg) -> Type {
+       Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 2) : 0x0;
+       return value;
+     }},
+    {"BLEND_DST_ALPHA", [](const std::string_view& arg) -> Type {
+       Type value = (arg[0] == ':') ? InterpretBlendFactor(std::string_view(arg.data() + 1, arg.size() - 1), 3) : 0x0;
+       return value;
+     }},
+    {"BUFFER_MODE", [](const std::string_view& arg) -> Type {
+       Type value = (arg[0] == ':') ? InterpretBufferMode(std::string_view(arg.data() + 1, arg.size() - 1)) : 0x0;
+       return value;
+     }},
+  };
+  return RENDERER_STATE_PROCESSORS;
+}
+
+} // namespace
+
+Type Parse(const char* string, size_t length, StringCallback onError)
+{
+  if(length == 0)
+  {
+    length = strlen(string);
+  }
+
+  Type value = 0x0;
+  auto iEnd  = string + length;
+  while(string != iEnd)
+  {
+    auto iNextToken = std::find(string, iEnd, '|');
+    auto iColon     = std::find(string, iNextToken, ':');
+    auto i          = GetRendererStateProcessors().find(std::string_view(string, iColon - string));
+    if(i != GetRendererStateProcessors().end() && size_t(std::distance(string, iNextToken)) >= i->first.size())
+    {
+      value |= i->second(std::string_view(string + i->first.size(), iNextToken - iColon));
+    }
+    else
+    {
+      onError("Not a valid RendererState: " + std::string(string, iNextToken));
+    }
+
+    string = iNextToken + (iNextToken != iEnd);
+  }
+
+  return value;
+}
+
+} // namespace RendererState
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/parse-renderer-state.h b/dali-scene3d/public-api/loader/parse-renderer-state.h
new file mode 100644
index 0000000..3b558ee
--- /dev/null
+++ b/dali-scene3d/public-api/loader/parse-renderer-state.h
@@ -0,0 +1,49 @@
+#ifndef DALI_SCENE3D_LOADERER_INTERPRET_RENDERER_STATE_H
+#define DALI_SCENE3D_LOADERER_INTERPRET_RENDERER_STATE_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/renderer-state.h>
+#include <dali-scene3d/public-api/loader/string-callback.h>
+
+namespace Dali::Scene3D::Loader
+{
+namespace RendererState
+{
+/**
+ * @brief Attempts to interpret a string for renderer states.
+ *
+ * Wwhich can be a combination of the following:
+ *  (using '|' as a delimiter, if multiple specified):<br/>
+ *  - one of Value, exc. for NONE or those with the _BITS, _SHIFT, _MASK or _ITEMS suffix;<br/>
+ *  - DEPTH_FUNC:${one of Comparison::Type, exc. OMIT};<br/>
+ *  - BLEND_(SRC_DST)_(RGB|ALPHA):${one of BlendFactor::Type, exc. OMIT};<br/>
+ *  - BUFFER_MODE:${one of BufferMode::Type, exc. OMIT};
+ * @SINCE_2_0.7
+ * @param string The string to parse;
+ * @param length The length of the string; If left at 0, strlen() will be called, which of
+ *   course is only suitable i the string is null-terminated.
+ * @param onError The callback to call when an error occurred.
+ * @note No other characters are allowed.
+ */
+DALI_SCENE3D_API Type Parse(const char* string, size_t length = 0, StringCallback onError = DefaultErrorCallback);
+
+} // namespace RendererState
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADERER_INTERPRET_RENDERER_STATE_H
diff --git a/dali-scene3d/public-api/loader/renderer-state.cpp b/dali-scene3d/public-api/loader/renderer-state.cpp
new file mode 100644
index 0000000..c14d8a6
--- /dev/null
+++ b/dali-scene3d/public-api/loader/renderer-state.cpp
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/renderer-state.h>
+
+// INTENRAL INCLUDES
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+// NOTE: values for BlendFactor aren't contiguous, hence we need a mapping.
+const Dali::BlendFactor::Type kBlendFactors[] = {
+  Dali::BlendFactor::ZERO,
+  Dali::BlendFactor::ONE,
+  Dali::BlendFactor::SRC_COLOR,
+  Dali::BlendFactor::ONE_MINUS_SRC_COLOR,
+  Dali::BlendFactor::SRC_ALPHA,
+  Dali::BlendFactor::ONE_MINUS_SRC_ALPHA,
+  Dali::BlendFactor::DST_ALPHA,
+  Dali::BlendFactor::ONE_MINUS_DST_ALPHA,
+  Dali::BlendFactor::DST_COLOR,
+  Dali::BlendFactor::ONE_MINUS_DST_COLOR,
+  Dali::BlendFactor::SRC_ALPHA_SATURATE,
+  Dali::BlendFactor::CONSTANT_COLOR,
+  Dali::BlendFactor::ONE_MINUS_CONSTANT_COLOR,
+  Dali::BlendFactor::CONSTANT_ALPHA,
+  Dali::BlendFactor::ONE_MINUS_CONSTANT_ALPHA,
+};
+} // namespace
+
+namespace RendererState
+{
+#define RENDERER_SET_PROPERTY(name, value) renderer.SetProperty(Renderer::Property::name, (value))
+
+void Apply(Type rendererState, Renderer& renderer)
+{
+  RENDERER_SET_PROPERTY(DEPTH_TEST_MODE, MaskMatch(rendererState, DEPTH_TEST) ? DepthTestMode::ON : DepthTestMode::OFF);
+
+  RENDERER_SET_PROPERTY(BLEND_MODE, MaskMatch(rendererState, ALPHA_BLEND) ? BlendMode::ON : BlendMode::USE_ACTOR_OPACITY);
+
+  const bool cullBack = MaskMatch(rendererState, CULL_BACK);
+  RENDERER_SET_PROPERTY(FACE_CULLING_MODE, MaskMatch(rendererState, CULL_FRONT) ? (cullBack ? FaceCullingMode::FRONT_AND_BACK : FaceCullingMode::FRONT) : (cullBack ? FaceCullingMode::BACK : FaceCullingMode::NONE));
+
+  if(auto depthFunc = (rendererState & DEPTH_FUNCTION_MASK) >> DEPTH_FUNCTION_SHIFT)
+  {
+    RENDERER_SET_PROPERTY(DEPTH_FUNCTION, static_cast<DepthFunction::Type>(depthFunc - 1));
+  }
+
+  if(auto blendFactors = (rendererState & BLEND_FACTOR_MASK) >> BLEND_FACTOR_BASE_SHIFT)
+  {
+    if(auto srcRgb = (blendFactors & BLEND_FACTOR_ITEM_MASK))
+    {
+      RENDERER_SET_PROPERTY(BLEND_FACTOR_SRC_RGB, kBlendFactors[static_cast<BlendFactor::Type>(srcRgb - 1)]);
+    }
+
+    blendFactors >>= BLEND_FACTOR_ITEM_BITS;
+    if(auto dstRgb = (blendFactors & BLEND_FACTOR_ITEM_MASK))
+    {
+      RENDERER_SET_PROPERTY(BLEND_FACTOR_DEST_RGB, kBlendFactors[static_cast<BlendFactor::Type>(dstRgb - 1)]);
+    }
+
+    blendFactors >>= BLEND_FACTOR_ITEM_BITS;
+    if(auto srcAlpha = (blendFactors & BLEND_FACTOR_ITEM_MASK))
+    {
+      RENDERER_SET_PROPERTY(BLEND_FACTOR_SRC_ALPHA, kBlendFactors[static_cast<BlendFactor::Type>(srcAlpha - 1)]);
+    }
+
+    blendFactors >>= BLEND_FACTOR_ITEM_BITS;
+    if(auto dstAlpha = (blendFactors & BLEND_FACTOR_ITEM_MASK))
+    {
+      RENDERER_SET_PROPERTY(BLEND_FACTOR_DEST_ALPHA, kBlendFactors[static_cast<BlendFactor::Type>(dstAlpha - 1)]);
+    }
+  }
+
+  if(auto bufferMode = (rendererState & BUFFER_MODE_MASK) >> BUFFER_MODE_SHIFT)
+  {
+    RENDERER_SET_PROPERTY(RENDER_MODE, static_cast<RenderMode::Type>(bufferMode - 1));
+  }
+}
+
+} // namespace RendererState
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/renderer-state.h b/dali-scene3d/public-api/loader/renderer-state.h
new file mode 100644
index 0000000..25365e9
--- /dev/null
+++ b/dali-scene3d/public-api/loader/renderer-state.h
@@ -0,0 +1,165 @@
+#ifndef DALI_SCENE3D_LOADER_RENDERER_STATE_H
+#define DALI_SCENE3D_LOADER_RENDERER_STATE_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/renderer.h>
+
+// INTERAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Contains values for comparison functions used in depth and stencil testing.
+ * @SINCE_2_0.7
+ * @note Relative order of members must match DepthFunction::Type and StencilFunction::Type.
+ */
+struct DALI_SCENE3D_API Comparison
+{
+  enum Type
+  {
+    OMIT, // not specified; will not be set.
+    NEVER,
+    ALWAYS,
+    LESS,
+    GREATER,
+    EQUAL,
+    NOT_EQUAL,
+    LESS_EQUAL,
+    GREATER_EQUAL
+  };
+
+  Comparison() = delete;
+};
+
+/**
+ * @brief Determines the blend factor used.
+ * @SINCE_2_0.7
+ * @note Relative order of members must match BlendFactor::Type.
+ */
+struct DALI_SCENE3D_API BlendFactor
+{
+  enum Type
+  {
+    OMIT, // not specified - will not be updated
+    ZERO,
+    ONE, // default for source alpha
+    SRC_COLOR,
+    ONE_MINUS_SRC_COLOR,
+    SRC_ALPHA,           // default for source RGB
+    ONE_MINUS_SRC_ALPHA, // default for destination RGB and destination alpha
+    DST_ALPHA,
+    ONE_MINUS_DST_ALPHA,
+    DST_COLOR,
+    ONE_MINUS_DST_COLOR,
+    SRC_ALPHA_SATURATE,
+    CONSTANT_COLOR,
+    ONE_MINUS_CONSTANT_COLOR,
+    CONSTANT_ALPHA,
+    ONE_MINUS_CONSTANT_ALPHA,
+  };
+
+  BlendFactor() = delete;
+};
+
+/**
+ * @brief Determines which buffers shall the Renderer write into.
+ * @SINCE_2_0.7
+ * @note Relative order of members must match RenderMode::Type.
+ */
+struct DALI_SCENE3D_API BufferMode
+{
+  enum Type
+  {
+    OMIT,         ///< not specified - will not be updated. @SINCE_2_0.7
+    NONE,         ///< Don’t write to either color or stencil buffer (But will potentially render to depth buffer). @SINCE_2_0.7
+    AUTO,         ///< Writes are managed by the Actor Clipping API. This is DALi's default. @SINCE_2_0.7
+    COLOR,        ///< Ignore stencil properties.  Write to the color buffer. @SINCE_2_0.7
+    STENCIL,      ///< Use the stencil properties. Do not write to the color buffer. @SINCE_2_0.7
+    COLOR_STENCIL ///< Use the stencil properties AND Write to the color buffer. @SINCE_2_0.7
+  };
+
+  BufferMode() = delete;
+};
+
+/**
+ * @brief Contains values and functionality for configuring Renderers.
+ * @SINCE_2_0.7
+ */
+namespace RendererState
+{
+using Type = uint32_t; // 8 bits reserved for flags, 4 * 4 bit for blend factors, 4 bits for depth function
+
+enum DALI_SCENE3D_API Value : Type
+{
+  NONE = 0x0,
+
+  DEPTH_WRITE = 0x01,
+  DEPTH_TEST  = 0x02,
+
+  CULL_FRONT = 0x04,
+  CULL_BACK  = 0x08,
+
+  ALPHA_BLEND = 0x10,
+
+  DEPTH_FUNCTION_SHIFT = 6,
+  DEPTH_FUNCTION_BITS  = 4,
+  DEPTH_FUNCTION_MASK  = ((1 << DEPTH_FUNCTION_BITS) - 1) << DEPTH_FUNCTION_SHIFT,
+
+  BLEND_FACTOR_BASE_SHIFT = DEPTH_FUNCTION_SHIFT + DEPTH_FUNCTION_BITS,
+  BLEND_FACTOR_ITEM_BITS  = 4,
+  BLEND_FACTOR_ITEMS      = 4,
+  BLEND_FACTOR_BITS       = BLEND_FACTOR_ITEM_BITS * BLEND_FACTOR_ITEMS,
+  BLEND_FACTOR_MASK       = ((1 << BLEND_FACTOR_BITS) - 1) << BLEND_FACTOR_BASE_SHIFT,
+  BLEND_FACTOR_ITEM_MASK  = (1 << BLEND_FACTOR_ITEM_BITS) - 1, // after rshifting by BLEND_FACTOR_BASE_SHIFT
+
+  // Buffer mode is DALi's RenderMode, just to avoid too much conflation.
+  BUFFER_MODE_BITS  = 3u,
+  BUFFER_MODE_SHIFT = 32u - BUFFER_MODE_BITS, // from end
+  BUFFER_MODE_MASK  = ((1u << BUFFER_MODE_BITS) - 1u) << BUFFER_MODE_SHIFT,
+
+  DEFAULT = DEPTH_WRITE | DEPTH_TEST | CULL_BACK | (Comparison::LESS_EQUAL << DEPTH_FUNCTION_SHIFT),
+};
+
+/**
+ * @brief Encodes the given blend factors into a RenderMode value, maskable into other options,
+ * passable into ApplyRenderMode().
+ * @SINCE_2_0.7
+ */
+inline DALI_SCENE3D_API constexpr uint32_t FromBlendFactors(BlendFactor::Type srcRgb, BlendFactor::Type destRgb, BlendFactor::Type srcAlpha, BlendFactor::Type destAlpha)
+{
+  return (srcRgb | (destRgb << BLEND_FACTOR_ITEM_BITS) | (srcAlpha << (BLEND_FACTOR_ITEM_BITS * 2)) |
+          (destAlpha << (BLEND_FACTOR_ITEM_BITS * 3)))
+         << BLEND_FACTOR_BASE_SHIFT;
+}
+
+/**
+ * @brief Applies the settings encoded in @a rendererState, to a @a renderer.
+ * @SINCE_2_0.7
+ * @note Depth function is only set if not Comparison::OMIT.
+ * @note Blend factors are only set if not BlendFactor::OMIT.
+ * @note Buffer mode is only set is not BufferMode::OMIT.
+ */
+DALI_SCENE3D_API void Apply(Type rendererState, Renderer& renderer);
+
+} // namespace RendererState
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_RENDERER_STATE_H
diff --git a/dali-scene3d/public-api/loader/resource-bundle.cpp b/dali-scene3d/public-api/loader/resource-bundle.cpp
new file mode 100644
index 0000000..2af4da4
--- /dev/null
+++ b/dali-scene3d/public-api/loader/resource-bundle.cpp
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-scene3d/public-api/loader/resource-bundle.h>
+
+// EXTERNAL INCLUDES
+#include <dali-scene3d/internal/common/image-resource-loader.h>
+#include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
+#include <dali/public-api/rendering/sampler.h>
+#include <cstring>
+#include <fstream>
+#include <istream>
+
+namespace Dali
+{
+using namespace Toolkit;
+
+namespace Scene3D
+{
+namespace Loader
+{
+namespace
+{
+const char* const RESOURCE_TYPE_NAMES[] = {
+  "Environment",
+  "Shader",
+  "Mesh",
+  "Material",
+};
+
+} // namespace
+
+const char* GetResourceTypeName(ResourceType::Value type)
+{
+  return RESOURCE_TYPE_NAMES[static_cast<int>(type)];
+}
+
+ResourceBundle::ResourceBundle()
+: mRawResourcesLoading(false),
+  mResourcesGenerating(false),
+  mRawResourcesLoaded(false),
+  mResourcesGenerated(false){};
+
+ResourceRefCounts ResourceBundle::CreateRefCounter() const
+{
+  ResourceRefCounts refCounts(4);
+  refCounts[ResourceType::Environment].Resize(mEnvironmentMaps.size(), 0u);
+  refCounts[ResourceType::Shader].Resize(mShaders.size(), 0u);
+  refCounts[ResourceType::Mesh].Resize(mMeshes.size(), 0u);
+  refCounts[ResourceType::Material].Resize(mMaterials.size(), 0u);
+  return refCounts;
+}
+
+void ResourceBundle::CountEnvironmentReferences()
+{
+  auto& environmentRefCounts = mReferenceCounts[ResourceType::Environment];
+
+  const auto& materialRefs = mReferenceCounts[ResourceType::Material];
+  for(uint32_t i = 0, iEnd = materialRefs.Size(); i != iEnd; ++i)
+  {
+    if(materialRefs[i] > 0)
+    {
+      ++environmentRefCounts[mMaterials[i].first.mEnvironmentIdx];
+    }
+  }
+}
+
+void ResourceBundle::LoadResources(PathProvider pathProvider, Options::Type options)
+{
+  mRawResourcesLoading = true;
+  mResourcesGenerating = true;
+
+  const auto kForceLoad  = MaskMatch(options, Options::ForceReload);
+  const auto kKeepUnused = MaskMatch(options, Options::KeepUnused);
+
+  const auto& refCountEnvMaps  = mReferenceCounts[ResourceType::Environment];
+  auto        environmentsPath = pathProvider(ResourceType::Environment);
+  for(uint32_t i = 0, iEnd = refCountEnvMaps.Size(); i != iEnd; ++i)
+  {
+    auto  refCount = refCountEnvMaps[i];
+    auto& iEnvMap  = mEnvironmentMaps[i];
+    if(refCount > 0 && (kForceLoad || !iEnvMap.second.IsLoaded()))
+    {
+      auto raw       = iEnvMap.first.LoadRaw(environmentsPath);
+      iEnvMap.second = iEnvMap.first.Load(std::move(raw));
+    }
+    else if(!kKeepUnused && refCount == 0 && iEnvMap.second.IsLoaded())
+    {
+      iEnvMap.second.mDiffuse  = Texture();
+      iEnvMap.second.mSpecular = Texture();
+    }
+  }
+
+  const auto& refCountShaders = mReferenceCounts[ResourceType::Shader];
+  auto        shadersPath     = pathProvider(ResourceType::Shader);
+  for(uint32_t i = 0, iEnd = refCountShaders.Size(); i != iEnd; ++i)
+  {
+    auto  refCount = refCountShaders[i];
+    auto& iShader  = mShaders[i];
+    if(refCount > 0 && (kForceLoad || !iShader.second))
+    {
+      auto raw       = iShader.first.LoadRaw(shadersPath);
+      iShader.second = iShader.first.Load(std::move(raw));
+    }
+    else if(!kKeepUnused && refCount == 0 && iShader.second)
+    {
+      iShader.second = Shader();
+    }
+  }
+
+  const auto& refCountMeshes = mReferenceCounts[ResourceType::Mesh];
+  auto        modelsPath     = pathProvider(ResourceType::Mesh);
+  for(uint32_t i = 0, iEnd = refCountMeshes.Size(); i != iEnd; ++i)
+  {
+    auto  refCount = refCountMeshes[i];
+    auto& iMesh    = mMeshes[i];
+    if(refCount > 0 && (kForceLoad || !iMesh.second.geometry))
+    {
+      auto raw     = iMesh.first.LoadRaw(modelsPath, mBuffers);
+      iMesh.second = iMesh.first.Load(std::move(raw));
+    }
+    else if(!kKeepUnused && refCount == 0 && iMesh.second.geometry)
+    {
+      iMesh.second.geometry = Geometry();
+    }
+  }
+
+  const auto& refCountMaterials = mReferenceCounts[ResourceType::Material];
+  auto        imagesPath        = pathProvider(ResourceType::Material);
+  for(uint32_t i = 0, iEnd = refCountMaterials.Size(); i != iEnd; ++i)
+  {
+    auto  refCount  = refCountMaterials[i];
+    auto& iMaterial = mMaterials[i];
+    if(refCount > 0 && (kForceLoad || !iMaterial.second))
+    {
+      auto raw         = iMaterial.first.LoadRaw(imagesPath);
+      iMaterial.second = iMaterial.first.Load(mEnvironmentMaps, std::move(raw));
+    }
+    else if(!kKeepUnused && refCount == 0 && iMaterial.second)
+    {
+      iMaterial.second = TextureSet();
+    }
+  }
+
+  mRawResourcesLoading = false;
+  mResourcesGenerating = false;
+
+  mRawResourcesLoaded = true;
+  mResourcesGenerated = true;
+}
+
+void ResourceBundle::LoadRawResources(PathProvider pathProvider, Options::Type options)
+{
+  const auto kForceLoad = MaskMatch(options, Options::ForceReload);
+
+  if(kForceLoad || (!mRawResourcesLoaded && !mRawResourcesLoading))
+  {
+    mRawResourcesLoading = true;
+
+    const auto& refCountEnvMaps  = mReferenceCounts[ResourceType::Environment];
+    auto        environmentsPath = pathProvider(ResourceType::Environment);
+    for(uint32_t i = 0, iEnd = refCountEnvMaps.Size(); i != iEnd; ++i)
+    {
+      auto  refCount = refCountEnvMaps[i];
+      auto& iEnvMap  = mEnvironmentMaps[i];
+      if(refCount > 0 && (kForceLoad || (!iEnvMap.first.mRawData && !iEnvMap.second.IsLoaded())))
+      {
+        iEnvMap.first.mRawData = std::make_shared<EnvironmentDefinition::RawData>(iEnvMap.first.LoadRaw(environmentsPath));
+      }
+    }
+
+    const auto& refCountShaders = mReferenceCounts[ResourceType::Shader];
+    auto        shadersPath     = pathProvider(ResourceType::Shader);
+    for(uint32_t i = 0, iEnd = refCountShaders.Size(); i != iEnd; ++i)
+    {
+      auto  refCount = refCountShaders[i];
+      auto& iShader  = mShaders[i];
+      if(refCount > 0 && (kForceLoad || !iShader.second))
+      {
+        iShader.first.mRawData = std::make_shared<ShaderDefinition::RawData>(iShader.first.LoadRaw(shadersPath));
+      }
+    }
+
+    const auto& refCountMeshes = mReferenceCounts[ResourceType::Mesh];
+    auto        modelsPath     = pathProvider(ResourceType::Mesh);
+    for(uint32_t i = 0, iEnd = refCountMeshes.Size(); i != iEnd; ++i)
+    {
+      auto  refCount = refCountMeshes[i];
+      auto& iMesh    = mMeshes[i];
+      if(refCount > 0 && (kForceLoad || (!iMesh.first.mRawData && !iMesh.second.geometry)))
+      {
+        iMesh.first.mRawData = std::make_shared<MeshDefinition::RawData>(iMesh.first.LoadRaw(modelsPath, mBuffers));
+      }
+    }
+
+    const auto& refCountMaterials = mReferenceCounts[ResourceType::Material];
+    auto        imagesPath        = pathProvider(ResourceType::Material);
+    for(uint32_t i = 0, iEnd = refCountMaterials.Size(); i != iEnd; ++i)
+    {
+      auto  refCount  = refCountMaterials[i];
+      auto& iMaterial = mMaterials[i];
+      if(refCount > 0 && (kForceLoad || (!iMaterial.first.mRawData && !iMaterial.second)))
+      {
+        iMaterial.first.mRawData = std::make_shared<MaterialDefinition::RawData>(iMaterial.first.LoadRaw(imagesPath));
+      }
+    }
+
+    mRawResourcesLoading = false;
+    mRawResourcesLoaded  = true;
+  }
+}
+
+void ResourceBundle::GenerateResources(Options::Type options)
+{
+  const auto kForceLoad = MaskMatch(options, Options::ForceReload);
+
+  if(mRawResourcesLoaded)
+  {
+    if(kForceLoad || (!mResourcesGenerated && !mResourcesGenerating))
+    {
+      mResourcesGenerating = true;
+
+      const auto& refCountEnvMaps = mReferenceCounts[ResourceType::Environment];
+      for(uint32_t i = 0, iEnd = refCountEnvMaps.Size(); i != iEnd; ++i)
+      {
+        auto  refCount = refCountEnvMaps[i];
+        auto& iEnvMap  = mEnvironmentMaps[i];
+        if(refCount > 0 && (kForceLoad || !iEnvMap.second.IsLoaded()))
+        {
+          if(iEnvMap.first.mRawData)
+          {
+            iEnvMap.second = iEnvMap.first.Load(std::move(*(iEnvMap.first.mRawData)));
+          }
+          else
+          {
+            iEnvMap.second.mDiffuse  = Texture();
+            iEnvMap.second.mSpecular = Texture();
+          }
+        }
+      }
+
+      const auto& refCountShaders = mReferenceCounts[ResourceType::Shader];
+      for(uint32_t i = 0, iEnd = refCountShaders.Size(); i != iEnd; ++i)
+      {
+        auto  refCount = refCountShaders[i];
+        auto& iShader  = mShaders[i];
+        if(refCount > 0 && (kForceLoad || !iShader.second))
+        {
+          if(iShader.first.mRawData)
+          {
+            iShader.second = iShader.first.Load(std::move(*(iShader.first.mRawData)));
+          }
+          else
+          {
+            iShader.second = Shader();
+          }
+        }
+      }
+
+      const auto& refCountMeshes = mReferenceCounts[ResourceType::Mesh];
+      for(uint32_t i = 0, iEnd = refCountMeshes.Size(); i != iEnd; ++i)
+      {
+        auto  refCount = refCountMeshes[i];
+        auto& iMesh    = mMeshes[i];
+        if(refCount > 0 && (kForceLoad || !iMesh.second.geometry))
+        {
+          if(iMesh.first.mRawData)
+          {
+            iMesh.second = iMesh.first.Load(std::move(*(iMesh.first.mRawData)));
+          }
+          else
+          {
+            iMesh.second.geometry = Geometry();
+          }
+        }
+      }
+
+      const auto& refCountMaterials = mReferenceCounts[ResourceType::Material];
+      for(uint32_t i = 0, iEnd = refCountMaterials.Size(); i != iEnd; ++i)
+      {
+        auto  refCount  = refCountMaterials[i];
+        auto& iMaterial = mMaterials[i];
+        if(refCount > 0 && (kForceLoad || !iMaterial.second))
+        {
+          if(iMaterial.first.mRawData)
+          {
+            iMaterial.second = iMaterial.first.Load(mEnvironmentMaps, std::move(*(iMaterial.first.mRawData)));
+          }
+          else
+          {
+            iMaterial.second = TextureSet();
+          }
+        }
+      }
+
+      mResourcesGenerating = false;
+      mResourcesGenerated  = true;
+    }
+    else if(mResourcesGenerated && !mResourcesGenerating)
+    {
+      mResourcesGenerating = true;
+
+      const auto& refCountShaders = mReferenceCounts[ResourceType::Shader];
+      for(uint32_t i = 0, iEnd = refCountShaders.Size(); i != iEnd; ++i)
+      {
+        auto  refCount = refCountShaders[i];
+        auto& iShader  = mShaders[i];
+
+        // Always regenerating the Shader objects as they can't be shared between multiple models.
+        if(refCount > 0 || kForceLoad)
+        {
+          if(iShader.first.mRawData)
+          {
+            iShader.second = iShader.first.Load(std::move(*(iShader.first.mRawData)));
+          }
+          else
+          {
+            iShader.second = Shader();
+          }
+        }
+      }
+
+      mResourcesGenerating = false;
+    }
+  }
+}
+
+} // namespace Loader
+} // namespace Scene3D
+} // namespace Dali
diff --git a/dali-scene3d/public-api/loader/resource-bundle.h b/dali-scene3d/public-api/loader/resource-bundle.h
new file mode 100644
index 0000000..c701112
--- /dev/null
+++ b/dali-scene3d/public-api/loader/resource-bundle.h
@@ -0,0 +1,175 @@
+#ifndef DALI_SCENE3D_LOADERERERER_RESOURCE_BUNDLE_H_
+#define DALI_SCENE3D_LOADERERERER_RESOURCE_BUNDLE_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/rendering/shader.h>
+#include <dali/public-api/rendering/texture-set.h>
+#include <functional>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/buffer-definition.h>
+#include <dali-scene3d/public-api/loader/environment-definition.h>
+#include <dali-scene3d/public-api/loader/material-definition.h>
+#include <dali-scene3d/public-api/loader/mesh-definition.h>
+#include <dali-scene3d/public-api/loader/shader-definition.h>
+#include <dali-scene3d/public-api/loader/skeleton-definition.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief The types of resources that .dli may define.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API ResourceType
+{
+  enum Value
+  {
+    Environment,
+    Shader,
+    Mesh,
+    Material,
+  };
+
+  ResourceType() = delete;
+};
+
+/**
+ * @brief The string value corresponding to the given resource @a type.
+ * @SINCE_2_0.7
+ * @return The string value for type.
+ */
+DALI_SCENE3D_API const char* GetResourceTypeName(ResourceType::Value type);
+
+using ResourceRefCounts = std::vector<Vector<uint32_t>>;
+
+/**
+ * @brief Stores all resource definitions along with the DALi resources that
+ *  could be created from them, directly indexible into with values from a dli
+ *  document.
+ * @SINCE_2_0.7
+ */
+class DALI_SCENE3D_API ResourceBundle
+{
+public:
+  struct Options
+  {
+    using Type = uint8_t;
+
+    enum Value : Type
+    {
+      None        = 0,
+      ForceReload = NthBit(0), ///< Load resources [again] even if they were already loaded.
+      KeepUnused  = NthBit(1)  ///<s Don't reset handles to resources that had a 0 reference count.
+    };
+  };
+
+  using PathProvider = std::function<std::string(ResourceType::Value)>;
+
+  ResourceBundle();
+
+  ResourceBundle(const ResourceBundle&) = delete;
+  ResourceBundle& operator=(const ResourceBundle&) = delete;
+
+  ResourceBundle(ResourceBundle&&) = default;
+  ResourceBundle& operator=(ResourceBundle&&) = default;
+
+  /**
+   * @brief A ResourceRefCounts object with the correct number of entries for
+   *  all resource types (based on the various resource definition vectors),
+   *  with all reference counts set to 0.
+   * @SINCE_2_0.7
+   * @return A ResourceRefCounts object.
+   */
+  ResourceRefCounts CreateRefCounter() const;
+
+  /**
+   * @brief Based on a ResourceRefCounts, and more specifically the reference
+   *  count of materials therein, it will calculate the reference count of
+   *  environment maps.
+   * @SINCE_2_0.7
+   */
+  void CountEnvironmentReferences();
+
+  /**
+   * @brief Performs the loading of all resources based on their respective reference count in @a refCounts.
+   *
+   * Resources that had a non-zero ref count will be loaded unless we already have a handle to them
+   * (OR the ForceReload option was specified).
+   * Any handles we have to resources that come in with a zero ref count will be reset,
+   * UNLESS the KeepUnused option was specified.
+   *
+   * @SINCE_2_0.7
+   * @param[in] pathProvider path provider for resource data.
+   * @param[in] options Option to load resource
+   * @note This method creates DALi objects like Dali::Texture, Dali::Geometry, etc.
+   */
+  void LoadResources(PathProvider  pathProvider,
+                     Options::Type options = Options::None);
+
+  /**
+   * @brief Loads of all resources based on their respective reference count in @a refCounts.
+   *
+   * Resources that had a non-zero ref count will be loaded unless we already have a handle to them
+   * (OR the ForceReload option was specified).
+   * Any handles we have to resources that come in with a zero ref count will be reset,
+   * UNLESS the KeepUnused option was specified.
+   *
+   * @SINCE_2_2.9
+   * @note This method don't create any of DALi objects.
+   * @param[in] pathProvider path provider for resource data.
+   * @param[in] options Option to load resource
+   * @note This method only loads raw data from resource file, and
+   * doesn't create any of DALi objects. GenerateResources() method is required to be called
+   * after this method to create DALi objects.
+   */
+  void LoadRawResources(PathProvider  pathProvider,
+                        Options::Type options = Options::None);
+
+  /**
+   * @brief Generates DALi objects from already loaded Raw Resources.
+   * @SINCE_2_2.9
+   * @param[in] options Option to load resource
+   * @note This method generates DALi objects from raw data that is already
+   * loaded by LoadRawResources method. Therefore, LoadRawResources should be called first
+   * before this method is called.
+   */
+  void GenerateResources(Options::Type options = Options::None);
+
+public: // DATA
+  ResourceRefCounts             mReferenceCounts;
+  EnvironmentDefinition::Vector mEnvironmentMaps;
+  ShaderDefinition::Vector      mShaders;
+  MeshDefinition::Vector        mMeshes;
+  MaterialDefinition::Vector    mMaterials;
+
+  SkeletonDefinition::Vector mSkeletons;
+  BufferDefinition::Vector   mBuffers;
+
+  bool mRawResourcesLoading;
+  bool mResourcesGenerating;
+
+  bool mRawResourcesLoaded;
+  bool mResourcesGenerated;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADERERERER_RESOURCE_BUNDLE_H_
diff --git a/dali-scene3d/public-api/loader/scene-definition.cpp b/dali-scene3d/public-api/loader/scene-definition.cpp
new file mode 100644
index 0000000..7d28053
--- /dev/null
+++ b/dali-scene3d/public-api/loader/scene-definition.cpp
@@ -0,0 +1,956 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/scene-definition.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/public-api/animation/constraints.h>
+
+// INTERNAL
+#include <dali-scene3d/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-scene3d/internal/model-components/model-node-impl.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+#include <dali-scene3d/public-api/loader/skinning-details.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+// #define DEBUG_SCENE_DEFINITION
+// #define DEBUG_JOINTS
+
+#if defined(DEBUG_SCENE_DEFINITION) || defined(DEBUG_JOINTS)
+#define DEBUG_ONLY(x) x
+#else
+#define DEBUG_ONLY(x)
+#endif
+
+#define LOGD(x) DEBUG_ONLY(printf x; printf("\n"); fflush(stdout))
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+const std::map<Property::Type, Constraint (*)(Actor&, Property::Index)>& GetConstraintFactory()
+{
+  static const std::map<Property::Type, Constraint (*)(Actor&, Property::Index)> sConstraintFactory = {
+    {Property::Type::BOOLEAN,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<bool>(a, i, [](bool& current, const PropertyInputContainer& inputs) { current = inputs[0]->GetBoolean(); });
+     }},
+    {Property::Type::INTEGER,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<int>(a, i, [](int& current, const PropertyInputContainer& inputs) { current = inputs[0]->GetInteger(); });
+     }},
+    {Property::Type::FLOAT,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<float>(a, i, EqualToConstraint());
+     }},
+    {Property::Type::VECTOR2,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<Vector2>(a, i, EqualToConstraint());
+     }},
+    {Property::Type::VECTOR3,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<Vector3>(a, i, EqualToConstraint());
+     }},
+    {Property::Type::VECTOR4,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<Vector4>(a, i, EqualToConstraint());
+     }},
+    {Property::Type::MATRIX,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<Matrix>(a, i, EqualToConstraint());
+     }},
+    {Property::Type::MATRIX3,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<Matrix3>(a, i, EqualToConstraint());
+     }},
+    {Property::Type::ROTATION,
+     [](Actor& a, Property::Index i) {
+       return Constraint::New<Quaternion>(a, i, EqualToConstraint());
+     }},
+  };
+  return sConstraintFactory;
+}
+
+struct ResourceReflector : IResourceReflector
+{
+  Index* iMesh   = nullptr;
+  Index* iShader = nullptr;
+
+  void Reflect(ResourceType::Value type, Index& id)
+  {
+    switch(type)
+    {
+      case ResourceType::Shader:
+        DALI_ASSERT_ALWAYS(!iShader && "Shader index already assigned!");
+        iShader = &id;
+        break;
+
+      case ResourceType::Mesh:
+        DALI_ASSERT_ALWAYS(!iMesh && "Mesh index already assigned!");
+        iMesh = &id;
+        break;
+
+      default: // Other resource types are not relevant to the problem at hand.
+        break;
+    }
+  }
+};
+
+#ifdef DEBUG_JOINTS
+
+Shader sJointDebugShader;
+int    sNumScenes = 0;
+
+void EnsureJointDebugShaderCreated()
+{
+  if(0 == sNumScenes)
+  {
+    sJointDebugShader = Shader::New(SHADER_SCENE3D_JOINT_DEBUG_VERT, SHADER_SCENE3D_JOINT_DEBUG_FRAG, Shader::Hint::NONE, "SCENE3D_JOINT_DEBUG");
+  }
+  ++sNumScenes;
+}
+
+void AddJointDebugVisual(Actor aJoint)
+{
+  Property::Map attribs;
+  attribs["aPosition"] = Property::Type::VECTOR3;
+  attribs["aColor"]    = Property::Type::FLOAT;
+
+  PropertyBuffer vbo = PropertyBuffer::New(attribs);
+
+  struct Vertex
+  {
+    Vector3 pos;
+    float   color;
+  } vertices[] = {
+    {Vector3::ZERO, .999f + .999f * 256.f + .999f * 256.f * 256.f},
+    {Vector3::XAXIS, .999f},
+    {Vector3::YAXIS, .999f * 256.f},
+    {Vector3::ZAXIS, .999f * 256.f * 256.f},
+  };
+
+  vbo.SetData(&vertices, std::extent<decltype(vertices)>::value);
+
+  uint16_t indices[] = {0, 1, 0, 2, 0, 3};
+
+  Geometry geo = Geometry::New();
+  geo.AddVertexBuffer(vbo);
+  geo.SetIndexBuffer(indices, std::extent<decltype(indices)>::value);
+  geo.SetType(Geometry::LINES);
+
+  Renderer r = Renderer::New(geo, sJointDebugShader);
+  aJoint.AddRenderer(r);
+
+  aJoint.SetVisible(true);
+}
+#endif // DEBUG_JOINTS
+
+class ActorCreatorVisitor : public NodeDefinition::IVisitor
+{
+public:
+  ActorCreatorVisitor(NodeDefinition::CreateParams& params)
+  : mCreationContext(params)
+  {
+  }
+
+  void Start(NodeDefinition& n)
+  {
+    mCreationContext.mXforms.modelStack.Push(n.GetLocalSpace());
+
+    ModelNode a = n.CreateModelNode(mCreationContext);
+    if(!mActorStack.empty())
+    {
+      mActorStack.back().Add(a);
+    }
+    else
+    {
+      mRoot = a;
+    }
+    mActorStack.push_back(a);
+  }
+
+  void Finish(NodeDefinition& n)
+  {
+    mActorStack.pop_back();
+    mCreationContext.mXforms.modelStack.Pop();
+  }
+
+  ModelNode GetRoot() const
+  {
+    return mRoot;
+  }
+
+private:
+  NodeDefinition::CreateParams& mCreationContext;
+  std::vector<ModelNode>        mActorStack;
+  ModelNode                     mRoot;
+};
+
+template<typename RequestType>
+void SortAndDeduplicateRequests(std::vector<RequestType>& requests)
+{
+  // Sort requests by shaders and primitives.
+  std::sort(requests.begin(), requests.end());
+
+  // Remove duplicates.
+  auto iter    = requests.begin();
+  auto iterEnd = requests.end();
+
+  Shader         shader         = iter->mShader;
+  ModelPrimitive modelPrimitive = iter->mPrimitive;
+  ++iter;
+  do
+  {
+    // Multiple identical shader and primitive instances are removed.
+    while(iter != iterEnd && iter->mShader == shader && iter->mPrimitive == modelPrimitive)
+    {
+      // Mark as removed
+      iter->mShader = Shader();
+      ++iter;
+    }
+
+    if(iter == iterEnd)
+    {
+      break;
+    }
+    shader         = iter->mShader;
+    modelPrimitive = iter->mPrimitive;
+    ++iter;
+  } while(true);
+
+  requests.erase(std::remove_if(requests.begin(), requests.end(), [](const RequestType& sscr) { return !sscr.mShader; }),
+                 requests.end());
+}
+
+void ConfigureBoneMatrix(const Matrix& ibm, ModelNode joint, ModelPrimitive primitive, Index& boneIdx)
+{
+  // Register bone transform on shader.
+  Internal::GetImplementation(joint).SetBoneMatrix(ibm, primitive, boneIdx);
+  ++boneIdx;
+}
+
+template<class Visitor, class SceneDefinition>
+void VisitInternal(Index iNode, const Customization::Choices& choices, Visitor& v, SceneDefinition& sd)
+{
+  auto& node = *sd.GetNode(iNode);
+  v.Start(node);
+
+  if(node.mCustomization)
+  {
+    if(!node.mChildren.empty())
+    {
+      auto  choice = choices.Get(node.mCustomization->mTag);
+      Index i      = std::min(choice != Customization::NONE ? choice : 0, static_cast<Index>(node.mChildren.size() - 1));
+      sd.Visit(node.mChildren[i], choices, v);
+    }
+  }
+  else
+  {
+    for(auto i : node.mChildren)
+    {
+      sd.Visit(i, choices, v);
+    }
+  }
+
+  v.Finish(node);
+}
+
+} // namespace
+
+SceneDefinition::SceneDefinition()
+{
+  mNodes.reserve(128);
+
+#ifdef DEBUG_JOINTS
+  EnsureJointDebugShaderCreated();
+#endif
+}
+
+SceneDefinition::SceneDefinition(SceneDefinition&& other)
+: mNodes(std::move(other.mNodes)),
+  mRootNodeIds(std::move(other.mRootNodeIds))
+{
+#ifdef DEBUG_JOINTS
+  EnsureJointDebugShaderCreated();
+#endif
+}
+
+SceneDefinition::~SceneDefinition()
+{
+#ifdef DEBUG_JOINTS
+  --sNumScenes;
+  if(sNumScenes == 0)
+  {
+    sJointDebugShader = Shader();
+  }
+#endif
+}
+
+uint32_t Dali::Scene3D::Loader::SceneDefinition::AddRootNode(Index iNode)
+{
+  if(iNode < mNodes.size())
+  {
+    uint32_t result = mRootNodeIds.size();
+    mRootNodeIds.push_back(iNode);
+    return result;
+  }
+  else
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Failed to add new root with node " << iNode << " -- index out of bounds.";
+    return -1;
+  }
+}
+
+const std::vector<Index>& SceneDefinition::GetRoots() const
+{
+  return mRootNodeIds;
+}
+
+void SceneDefinition::RemoveRootNode(Index iRoot)
+{
+  if(iRoot < mRootNodeIds.size())
+  {
+    mRootNodeIds.erase(mRootNodeIds.begin() + iRoot);
+  }
+  else
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Failed to remove root " << iRoot << " -- index out of bounds.";
+  }
+}
+
+uint32_t SceneDefinition::GetNodeCount() const
+{
+  return mNodes.size();
+}
+
+const NodeDefinition* SceneDefinition::GetNode(Index iNode) const
+{
+  return mNodes[iNode].get();
+}
+
+NodeDefinition* SceneDefinition::GetNode(Index iNode)
+{
+  if(iNode != Scene3D::Loader::INVALID_INDEX && iNode < mNodes.size())
+  {
+    return mNodes[iNode].get();
+  }
+  return nullptr;
+}
+
+void SceneDefinition::Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IVisitor& v)
+{
+  VisitInternal(iNode, choices, v, *this);
+}
+
+void SceneDefinition::Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IConstVisitor& v) const
+{
+  VisitInternal(iNode, choices, v, *this);
+}
+
+void SceneDefinition::CountResourceRefs(Index iNode, const Customization::Choices& choices, ResourceRefCounts& refCounts) const
+{
+  struct RefCounter : IResourceReceiver
+  {
+    ResourceRefCounts* refCounts;
+
+    void Register(ResourceType::Value type, Index id)
+    {
+      if((!(*refCounts)[type].Empty()) && ((*refCounts)[type].Size() > id))
+      {
+        ++(*refCounts)[type][id];
+      }
+    }
+  };
+
+  struct : NodeDefinition::IConstVisitor
+  {
+    RefCounter counter;
+
+    void Start(const NodeDefinition& n)
+    {
+      for(auto& renderable : n.mRenderables)
+      {
+        renderable->RegisterResources(counter);
+      }
+    }
+
+    void Finish(const NodeDefinition& n)
+    {
+    }
+
+  } refCounterVisitor;
+  refCounterVisitor.counter.refCounts = &refCounts;
+
+  Visit(iNode, choices, refCounterVisitor);
+}
+
+ModelNode SceneDefinition::CreateNodes(Index iNode, const Customization::Choices& choices, NodeDefinition::CreateParams& params)
+{
+  ActorCreatorVisitor actorCreatorVisitor(params);
+
+  Visit(iNode, choices, actorCreatorVisitor);
+
+  return actorCreatorVisitor.GetRoot();
+}
+
+void SceneDefinition::GetCustomizationOptions(const Customization::Choices& choices,
+                                              Customization::Map&           outCustomizationOptions,
+                                              Customization::Choices*       outMissingChoices) const
+{
+  struct : NodeDefinition::IConstVisitor
+  {
+    const Customization::Choices* choices;        // choices that we know about.
+    Customization::Map*           options;        // tags are registered here. NO OWNERSHIP.
+    Customization::Choices*       missingChoices; // tags will be registered with the default 0. NO OWNERSHIP.
+
+    void Start(const NodeDefinition& n)
+    {
+      if(n.mCustomization)
+      {
+        const std::string& tag = n.mCustomization->mTag;
+        if(missingChoices != nullptr && choices->Get(tag) == Customization::NONE)
+        {
+          missingChoices->Set(tag, 0);
+        }
+
+        auto customization = options->Get(tag);
+        if(!customization)
+        {
+          customization = options->Set(tag, {});
+        }
+        customization->nodes.push_back(n.mName);
+        customization->numOptions = std::max(customization->numOptions,
+                                             static_cast<uint32_t>(n.mChildren.size()));
+      }
+    }
+
+    void Finish(const NodeDefinition& n)
+    {
+    }
+
+  } customizationRegistrationVisitor;
+  customizationRegistrationVisitor.choices        = &choices;
+  customizationRegistrationVisitor.options        = &outCustomizationOptions;
+  customizationRegistrationVisitor.missingChoices = outMissingChoices;
+
+  for(auto i : mRootNodeIds)
+  {
+    Visit(i, choices, customizationRegistrationVisitor);
+  }
+}
+
+NodeDefinition* SceneDefinition::AddNode(std::unique_ptr<NodeDefinition>&& nodeDef)
+{
+  // add next index (to which we're about to push) as a child to the designated parent, if any.
+  if(nodeDef->mParentIdx != INVALID_INDEX)
+  {
+    mNodes[nodeDef->mParentIdx]->mChildren.push_back(mNodes.size());
+  }
+
+  mNodes.push_back(std::move(nodeDef));
+
+  return mNodes.back().get();
+}
+
+bool SceneDefinition::ReparentNode(const std::string& name, const std::string& newParentName, Index siblingOrder)
+{
+  LOGD(("reparenting %s to %s @ %d", name.c_str(), newParentName.c_str(), siblingOrder));
+
+  std::unique_ptr<NodeDefinition>* nodePtr      = nullptr;
+  std::unique_ptr<NodeDefinition>* newParentPtr = nullptr;
+  if(!FindNode(name, &nodePtr) || !FindNode(newParentName, &newParentPtr))
+  {
+    return false;
+  }
+
+  auto& node  = *nodePtr;
+  auto  iNode = std::distance(mNodes.data(), nodePtr);
+
+  DEBUG_ONLY(auto dumpNode = [](NodeDefinition const& n) {
+    std::ostringstream stream;
+    stream << n.mName << " (" << n.mParentIdx << "):";
+    for(auto i : n.mChildren)
+    {
+      stream << i << ", ";
+    }
+    LOGD(("%s", stream.str().c_str())); };)
+
+  // Remove node from children of previous parent (if any).
+  if(node->mParentIdx != INVALID_INDEX)
+  {
+    LOGD(("old parent:"));
+    DEBUG_ONLY(dumpNode(*mNodes[node->mParentIdx]);)
+
+    auto& children = mNodes[node->mParentIdx]->mChildren;
+    children.erase(std::remove(children.begin(), children.end(), iNode), children.end());
+
+    DEBUG_ONLY(dumpNode(*mNodes[node->mParentIdx]);)
+  }
+
+  // Register node to new parent.
+  LOGD(("new parent:"));
+  DEBUG_ONLY(dumpNode(**newParentPtr);)
+  auto& children = (*newParentPtr)->mChildren;
+  if(siblingOrder > children.size())
+  {
+    siblingOrder = children.size();
+  }
+  children.insert(children.begin() + siblingOrder, 1, iNode);
+  DEBUG_ONLY(dumpNode(**newParentPtr);)
+
+  // Update parent index.
+  LOGD(("node:"));
+  DEBUG_ONLY(dumpNode(*node);)
+  auto iParent     = std::distance(mNodes.data(), newParentPtr);
+  node->mParentIdx = iParent;
+  DEBUG_ONLY(dumpNode(*node);)
+  return true;
+}
+
+bool SceneDefinition::RemoveNode(const std::string& name)
+{
+  std::unique_ptr<NodeDefinition>* node = nullptr;
+  if(!FindNode(name, &node))
+  {
+    return false;
+  }
+
+  // Reset node def pointers recursively.
+  auto&                                                 thisNodes = mNodes;
+  unsigned int                                          numReset  = 0;
+  std::function<void(std::unique_ptr<NodeDefinition>&)> resetFn =
+    [&thisNodes, &resetFn, &numReset](std::unique_ptr<NodeDefinition>& nd) {
+      LOGD(("resetting %d", &nd - thisNodes.data()));
+      for(auto i : nd->mChildren)
+      {
+        resetFn(thisNodes[i]);
+      }
+      nd.reset();
+      ++numReset;
+    };
+
+  resetFn(*node);
+
+  // Gather indices of dead nodes into a vector which we sort on insertion.
+  std::vector<Index> offsets;
+  offsets.reserve(numReset);
+  for(auto& n : mNodes)
+  {
+    if(!n)
+    {
+      offsets.push_back(std::distance(mNodes.data(), &n));
+    }
+  }
+
+  // Erase dead nodes as they don't have to be processed anymore.
+  mNodes.erase(std::remove(mNodes.begin(), mNodes.end(), decltype(mNodes)::value_type()), mNodes.end());
+
+  // Offset all indices (parent and child) by the index they'd sort into in offsets.
+  enum
+  {
+    INDEX_FOR_REMOVAL = INVALID_INDEX
+  };
+  auto offsetter = [&offsets](Index& i) {
+    auto iFind = std::lower_bound(offsets.begin(), offsets.end(), i);
+    if(iFind != offsets.end() && *iFind == i)
+    {
+      LOGD(("marking %d for removal.", i));
+      i = INDEX_FOR_REMOVAL;
+      return false;
+    }
+    else
+    {
+      auto distance = std::distance(offsets.begin(), iFind);
+      if(distance > 0)
+      {
+        LOGD(("offsetting %d by %d.", i, distance));
+        i -= distance;
+      }
+      return true;
+    }
+  };
+
+  for(auto& nd : mNodes)
+  {
+    bool parentOffsetResult = offsetter(nd->mParentIdx);
+    DALI_ASSERT_ALWAYS(parentOffsetResult); // since nodes were recursively removed, we should not be finding invalid parents at this point.
+
+    auto& children = nd->mChildren;
+    for(auto i0 = children.begin(), i1 = children.end(); i0 != i1; ++i0)
+    {
+      offsetter(*i0);
+    }
+
+    children.erase(std::remove(children.begin(), children.end(), INDEX_FOR_REMOVAL), children.end());
+  }
+
+  return true;
+}
+
+void SceneDefinition::GetNodeModelStack(Index index, MatrixStack& model) const
+{
+  auto&                    thisNodes  = mNodes;
+  std::function<void(int)> buildStack = [&model, &thisNodes, &buildStack](int i) {
+    auto node = thisNodes[i].get();
+    if(node->mParentIdx != INVALID_INDEX)
+    {
+      buildStack(node->mParentIdx);
+    }
+    model.Push(node->GetLocalSpace());
+  };
+  buildStack(index);
+}
+
+NodeDefinition* SceneDefinition::FindNode(const std::string& name, Index* outIndex)
+{
+  auto iBegin = mNodes.begin();
+  auto iEnd   = mNodes.end();
+  auto iFind  = std::find_if(iBegin, iEnd, [&name](const std::unique_ptr<NodeDefinition>& nd) { return nd->mName == name; });
+
+  auto result = iFind != iEnd ? iFind->get() : nullptr;
+  if(result && outIndex)
+  {
+    *outIndex = std::distance(iBegin, iFind);
+  }
+  return result;
+}
+
+const NodeDefinition* SceneDefinition::FindNode(const std::string& name, Index* outIndex) const
+{
+  auto iBegin = mNodes.begin();
+  auto iEnd   = mNodes.end();
+  auto iFind  = std::find_if(iBegin, iEnd, [&name](const std::unique_ptr<NodeDefinition>& nd) { return nd->mName == name; });
+
+  auto result = iFind != iEnd ? iFind->get() : nullptr;
+  if(result && outIndex)
+  {
+    *outIndex = std::distance(iBegin, iFind);
+  }
+  return result;
+}
+
+Index SceneDefinition::FindNodeIndex(const NodeDefinition& node) const
+{
+  auto iBegin = mNodes.begin();
+  auto iEnd   = mNodes.end();
+  auto iFind  = std::find_if(iBegin, iEnd, [&node](const std::unique_ptr<NodeDefinition>& n) { return n.get() == &node; });
+  return iFind != iEnd ? std::distance(iBegin, iFind) : INVALID_INDEX;
+}
+
+void SceneDefinition::FindNodes(NodePredicate predicate, NodeConsumer consumer, unsigned int limit)
+{
+  unsigned int n = 0;
+  for(auto& defp : mNodes)
+  {
+    if(predicate(*defp))
+    {
+      consumer(*defp);
+      ++n;
+      if(n == limit)
+      {
+        break;
+      }
+    }
+  }
+}
+
+void SceneDefinition::FindNodes(NodePredicate predicate, ConstNodeConsumer consumer, unsigned int limit) const
+{
+  unsigned int n = 0;
+  for(auto& defp : mNodes)
+  {
+    if(predicate(*defp))
+    {
+      consumer(*defp);
+      ++n;
+      if(n == limit)
+      {
+        break;
+      }
+    }
+  }
+}
+
+void SceneDefinition::ApplyConstraints(Actor&                           root,
+                                       std::vector<ConstraintRequest>&& constrainables,
+                                       StringCallback                   onError) const
+{
+  for(auto& cr : constrainables)
+  {
+    auto&           nodeDef    = mNodes[cr.mConstraint->mSourceIdx];
+    auto            sourceName = nodeDef->mName.c_str();
+    Property::Index iTarget    = cr.mTarget.GetPropertyIndex(cr.mConstraint->mProperty);
+    if(iTarget != Property::INVALID_INDEX)
+    {
+      auto propertyType = cr.mTarget.GetPropertyType(iTarget);
+      auto iFind        = GetConstraintFactory().find(propertyType);
+      if(iFind == GetConstraintFactory().end())
+      {
+        onError(FormatString("node '%s': Property '%s' has unsupported type '%s'; ignored.",
+                             sourceName,
+                             cr.mConstraint->mProperty.c_str(),
+                             PropertyTypes::GetName(propertyType)));
+        continue;
+      }
+
+      Constraint constraint = iFind->second(cr.mTarget, iTarget);
+
+      Actor source = root.FindChildByName(nodeDef->mName);
+      if(!source)
+      {
+        auto targetName = cr.mTarget.GetProperty(Actor::Property::NAME).Get<std::string>();
+        onError(FormatString("node '%s': Failed to locate constraint source %s@%s; ignored.",
+                             sourceName,
+                             cr.mConstraint->mProperty.c_str(),
+                             targetName.c_str()));
+        continue;
+      }
+      else if(source == cr.mTarget)
+      {
+        onError(FormatString("node '%s': Cyclic constraint definition for property '%s'; ignored.",
+                             sourceName,
+                             cr.mConstraint->mProperty.c_str()));
+        continue;
+      }
+
+      Property::Index iSource = source.GetPropertyIndex(cr.mConstraint->mProperty);
+      constraint.AddSource(Source{source, iSource});
+      constraint.Apply();
+    }
+    else
+    {
+      auto targetName = cr.mTarget.GetProperty(Actor::Property::NAME).Get<std::string>();
+      onError(FormatString("node '%s': Failed to create constraint for property %s@%s; ignored.",
+                           sourceName,
+                           cr.mConstraint->mProperty.c_str(),
+                           targetName.c_str()));
+    }
+  }
+}
+
+void SceneDefinition::EnsureUniqueSkinningShaderInstances(ResourceBundle& resources) const
+{
+  std::map<Index, std::map<Index, std::vector<Index*>>> skinningShaderUsers;
+  for(auto& node : mNodes)
+  {
+    for(auto& renderable : node->mRenderables)
+    {
+      ResourceReflector reflector;
+      renderable->ReflectResources(reflector);
+
+      if(reflector.iMesh)
+      {
+        const auto& mesh = resources.mMeshes[*reflector.iMesh].first;
+        if(mesh.IsSkinned())
+        {
+          skinningShaderUsers[*reflector.iShader][mesh.mSkeletonIdx].push_back(reflector.iShader);
+        }
+      }
+    }
+  }
+
+  // For each shader, and each skeleton using the same shader as the first skeleton,
+  // update the shader references (from nodes with skinned meshes) with a new copy of
+  // the shader definition from the node using the first skeleton.
+  for(auto& users : skinningShaderUsers)
+  {
+    auto& skeletons    = users.second;
+    auto  iterSkeleton = skeletons.begin();
+    // skipping the first skeleton.
+    ++iterSkeleton;
+
+    resources.mShaders.reserve(resources.mShaders.size() + std::distance(iterSkeleton, skeletons.end()));
+    const ShaderDefinition& shaderDef = resources.mShaders[users.first].first;
+
+    while(iterSkeleton != skeletons.end())
+    {
+      Index iShader = resources.mShaders.size();
+      resources.mShaders.push_back({shaderDef, Shader()});
+
+      for(auto& i : iterSkeleton->second)
+      {
+        *i = iShader;
+      }
+      ++iterSkeleton;
+    }
+  }
+}
+
+void SceneDefinition::ConfigureSkinningShaders(const ResourceBundle&                             resources,
+                                               Actor                                             rootActor,
+                                               std::vector<SkinningShaderConfigurationRequest>&& requests) const
+{
+  if(requests.empty())
+  {
+    return;
+  }
+
+  SortAndDeduplicateRequests(requests);
+
+  for(auto& request : requests)
+  {
+    auto& skeleton = resources.mSkeletons[request.mSkeletonIdx];
+    if(skeleton.mJoints.empty())
+    {
+      LOGD(("Skeleton %d has no joints.", request.mSkeletonIdx));
+      continue;
+    }
+
+    Index boneIdx = 0;
+    for(auto& joint : skeleton.mJoints)
+    {
+      auto      node      = GetNode(joint.mNodeIdx);
+      ModelNode modelNode = ModelNode::DownCast(rootActor.FindChildByName(node->mName));
+      if(!modelNode)
+      {
+        continue;
+      }
+      ConfigureBoneMatrix(joint.mInverseBindMatrix, modelNode, request.mPrimitive, boneIdx);
+    }
+  }
+}
+
+bool SceneDefinition::ConfigureBlendshapeShaders(const ResourceBundle&                               resources,
+                                                 Actor                                               rootActor,
+                                                 std::vector<BlendshapeShaderConfigurationRequest>&& requests,
+                                                 StringCallback                                      onError) const
+{
+  if(requests.empty())
+  {
+    return true;
+  }
+
+  SortAndDeduplicateRequests(requests);
+
+  // Configure the rest.
+  bool ok = true;
+
+  for(auto& request : requests)
+  {
+    Index iNode;
+    if(FindNode(request.mNodeName, &iNode))
+    {
+      const auto& node = GetNode(iNode);
+
+      const auto& mesh = resources.mMeshes[request.mMeshIdx];
+
+      if(mesh.first.HasBlendShapes())
+      {
+        Actor              actor = rootActor.FindChildByName(node->mName);
+        Scene3D::ModelNode node  = Scene3D::ModelNode::DownCast(actor);
+        if(!node)
+        {
+          continue;
+        }
+        BlendShapes::BlendShapeData data;
+        data.components = 0x0;
+        for(auto&& blendShape : mesh.first.mBlendShapes)
+        {
+          data.names.push_back(blendShape.name);
+          data.weights.push_back(blendShape.weight);
+          data.components |= (blendShape.deltas.IsDefined() * BlendShapes::Component::POSITIONS) |
+                             (blendShape.normals.IsDefined() * BlendShapes::Component::NORMALS) | (blendShape.tangents.IsDefined() * BlendShapes::Component::TANGENTS);
+        }
+        for(auto&& factor : mesh.second.blendShapeUnnormalizeFactor)
+        {
+          data.unnormalizeFactors.push_back(factor);
+        }
+        data.version      = mesh.first.mBlendShapeVersion;
+        data.bufferOffset = mesh.second.blendShapeBufferOffset;
+        data.mActor       = actor;
+        Internal::GetImplementation(node).SetBlendShapeData(data, request.mPrimitive);
+      }
+    }
+  }
+
+  return ok;
+}
+
+void SceneDefinition::EnsureUniqueBlendShapeShaderInstances(ResourceBundle& resources) const
+{
+  std::map<Index, std::map<std::string, std::vector<Index*>>> blendShapeShaderUsers;
+  for(auto& node : mNodes)
+  {
+    for(auto& renderable : node->mRenderables)
+    {
+      ResourceReflector reflector;
+      renderable->ReflectResources(reflector);
+
+      if(reflector.iMesh)
+      {
+        const auto& mesh = resources.mMeshes[*reflector.iMesh].first;
+        if(mesh.HasBlendShapes())
+        {
+          blendShapeShaderUsers[*reflector.iShader][node->mName].push_back(reflector.iShader);
+        }
+      }
+    }
+  }
+
+  for(auto& users : blendShapeShaderUsers)
+  {
+    resources.mShaders.reserve(resources.mShaders.size() + users.second.size() - 1u);
+    const ShaderDefinition& shaderDef = resources.mShaders[users.first].first;
+
+    auto nodesIt    = users.second.begin();
+    auto nodesEndIt = users.second.end();
+    // skipping the first node.
+    ++nodesIt;
+    while(nodesIt != nodesEndIt)
+    {
+      Index iShader = resources.mShaders.size();
+      resources.mShaders.push_back({shaderDef, Shader()});
+
+      auto& nodes = *nodesIt;
+      for(auto& shader : nodes.second)
+      {
+        *shader = iShader;
+      }
+      ++nodesIt;
+    }
+  }
+}
+
+SceneDefinition& SceneDefinition::operator=(SceneDefinition&& other)
+{
+  SceneDefinition temp(std::move(other));
+  std::swap(mNodes, temp.mNodes);
+  std::swap(mRootNodeIds, temp.mRootNodeIds);
+  return *this;
+}
+
+bool SceneDefinition::FindNode(const std::string& name, std::unique_ptr<NodeDefinition>** result)
+{
+  // We're searching from the end assuming a higher probability of operations targeting
+  // recently added nodes. (conf.: root, which is immovable, cannot be removed, and was
+  // the first to be added, is index 0.)
+  auto iFind = std::find_if(mNodes.rbegin(), mNodes.rend(), [&name](const std::unique_ptr<NodeDefinition>& nd) { return nd->mName == name; })
+                 .base();
+
+  const bool success = iFind != mNodes.begin();
+  if(success && result)
+  {
+    --iFind;
+    *result = &*iFind;
+  }
+
+  return success;
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/scene-definition.h b/dali-scene3d/public-api/loader/scene-definition.h
new file mode 100644
index 0000000..776d161
--- /dev/null
+++ b/dali-scene3d/public-api/loader/scene-definition.h
@@ -0,0 +1,289 @@
+#ifndef DALI_SCENE3D_LOADER_SCENE_DEFINITION_H_
+#define DALI_SCENE3D_LOADER_SCENE_DEFINITION_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/math/vector4.h>
+#include <memory>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/customization.h>
+#include <dali-scene3d/public-api/loader/node-definition.h>
+#include <dali-scene3d/public-api/loader/string-callback.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali::Scene3D::Loader
+{
+class MatrixStack;
+
+/**
+ * @brief Intermediate representation of a scene with functionality required to
+ * create DALi objects (Actors, Renderers) from it.
+ * @SINCE_2_0.7
+ */
+class DALI_SCENE3D_API SceneDefinition
+{
+public: // TYPES
+  using NodePredicate     = std::function<bool(const NodeDefinition&)>;
+  using NodeConsumer      = std::function<void(NodeDefinition&)>;
+  using ConstNodeConsumer = std::function<void(const NodeDefinition&)>;
+
+public: // METHODS
+  SceneDefinition();
+  SceneDefinition(SceneDefinition&& other);
+  ~SceneDefinition();
+
+  /**
+   * @brief Registers a scene root node.
+   * @SINCE_2_0.7
+   * @return The index of the scene root node *registration*.
+   */
+  Index AddRootNode(Index iNode);
+
+  /**
+   * @brief Retrieves a list of scene root node IDs in the order of loading.
+   * @SINCE_2_0.7
+   * @return List of scene root node IDs in the order of loading
+   */
+  const std::vector<Index>& GetRoots() const;
+
+  /**
+   * @brief Removes scene root registration at the given index @a iRoot.
+   * @SINCE_2_0.7
+   * @note @a iRoot is the index of the registration (i.e. into the vector returned by GetRoots()), not of the node.
+   */
+  void RemoveRootNode(Index iRoot);
+
+  /**
+   * @brief Retrieve the number of node(definition)s in the scene.
+   * @SINCE_2_0.7
+   * @return The number of node(definition)s in the scene
+   */
+  uint32_t GetNodeCount() const;
+
+  /**
+   * @brief Retrieve a const pointer to the node (definition) at the given index.
+   * @SINCE_2_0.7
+   * @return Const pointer to the node (definition).
+   */
+  const NodeDefinition* GetNode(Index iNode) const;
+
+  /**
+   * @brief Retrive a pointer to the node (definition) at the given index.
+   * @SINCE_2_0.7
+   * @return Pointer to the node (definition).
+   */
+  NodeDefinition* GetNode(Index iNode);
+
+  /**
+   * @brief Traverses the scene starting from the node at the given index into nodes,
+   * using the given customization @a choices and the visitor @a v.
+   * @SINCE_2_0.7
+   */
+  void Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IVisitor& v);
+
+  /**
+   * @brief Traverses the scene starting from the node at the given index into nodes,
+   * using the given customization @a choices and the visitor @a v.
+   * @SINCE_2_0.7
+   */
+  void Visit(Index iNode, const Customization::Choices& choices, NodeDefinition::IConstVisitor& v) const;
+
+  /**
+   * @brief Counts the references to meshes, shaders, materials that nodes in the scene are holding,
+   * writing the results into @a refCounts.
+   * @SINCE_2_0.7
+   * @note @a refCounts' entries must have the correct size. Use ResourceBundle::GetRefCounter().
+   */
+  void CountResourceRefs(Index iNode, const Customization::Choices& choices, ResourceRefCounts& refCounts) const;
+
+  /**
+   * @brief Given a bundle of @a resources that are loaded, and customization @a choices,
+   * this method traverses the scene, creating the ModelNodes and renderers from node definitions.
+   * @SINCE_2_0.7
+   * @return Handle to the root node.
+   */
+  ModelNode CreateNodes(Index iNode, const Customization::Choices& choices, NodeDefinition::CreateParams& params);
+
+  /**
+   * @brief Creates / update a registry of mappings from customization tags to a lists of names of
+   * customizable nodes under each tag, and the number of options.
+   *
+   * If @a outMissingChoices was specified, each tag that it encounters in the scene but not in @a choices,
+   * will be registered on it with the default choice of 0.
+   * @SINCE_2_0.7
+   */
+  void GetCustomizationOptions(const Customization::Choices& choices,
+                               Customization::Map&           outCustomizationOptions,
+                               Customization::Choices*       outMissingChoices) const;
+
+  /**
+   * @brief Attempts to add @a nodeDef to the end of nodes, and its index to the end of its parent's
+   * list of children (if iParent != NodeDefinition::INVALID_PARENT).
+   * @SINCE_2_0.7
+   * @return If the operation was successful - which requires nodeDef->name to be unique -
+   *  a pointer to the stored node definition; nullptr otherwise.
+   */
+  NodeDefinition* AddNode(std::unique_ptr<NodeDefinition>&& nodeDef);
+
+  /**
+   * @brief Moves the node to some other parent and / or to a different index.
+   * @SINCE_2_0.7
+   * @return Whether the operation was successful.
+   * @note This is currently breaking an assumption of never having a child of a node at a lower
+   *  index as that of the node itself, due to the fact that we're only changing parent ids (and
+   *  entries into the vector of children of node definitions), to save the complication of having
+   *  to move about, and offset indices to, everything past the reparented node. This should be
+   *  sufficient AT LEAST AS LONG AS we recreate the SceneDefinition when loading the scene; if
+   *  we ever needed to serialize it, we should ensure correct ordering of nodes.
+   */
+  bool ReparentNode(const std::string& name, const std::string& newParentName, Index siblingOrder);
+
+  /**
+   * @brief Removes a node with the given name, including all of its children, and updating
+   *  the indices on all remaining node definitions.
+   * @SINCE_2_0.7
+   * @return Whether the operation was successful.
+   */
+  bool RemoveNode(const std::string& name);
+
+  /**
+   * @brief Builds the model matrix stack for the node at the given @a index.
+   * @SINCE_2_0.7
+   * @note It only pushes new matrices; does not require the stack to be empty (or cares if it was not).
+   */
+  void GetNodeModelStack(Index index, MatrixStack& model) const;
+
+  /**
+   * @brief Attempts to find the definition of a node with the given @a name. Only upon
+   *  success, and if @a outIndex is non-null, the index of the node is written to it.
+   * @SINCE_2_0.7
+   * @return Pointer to the node definition; nullptr if not found.
+   * @note No ownership transfer.
+   */
+  NodeDefinition* FindNode(const std::string& name, Index* outIndex = nullptr);
+
+  /**
+   * @brief Attempts to find the definition of a node with the given @a name. Only upon
+   *  success, and if @a outIndex is non-null, the index of the node is written to it.
+   * @SINCE_2_0.7
+   * @return Pointer to the node definition; nullptr if not found.
+   * @note No ownership transfer.
+   */
+  const NodeDefinition* FindNode(const std::string& name, Index* outIndex = nullptr) const;
+
+  /**
+   * @brief The index of the given NodeDefinition @a node, or -1 if the node definition was not found.
+   * @SINCE_2_0.7
+   * @return The index of the given NodeDefinition @a node, or -1 if the node definition was not found
+   */
+  Index FindNodeIndex(const NodeDefinition& node) const;
+
+  /**
+   * @brief Calls @a consumer with up to @a limit NodeDefinitions that evaluate to true
+   *  with @a predicate.
+   * @SINCE_2_0.7
+   * @note A @a limit value of 0 means no limit.
+   */
+  void FindNodes(NodePredicate predicate, NodeConsumer consumer, unsigned int limit = 0);
+
+  /**
+   * @brief Calls @a consumer with up to @a limit NodeDefinitions that evaluate to true with @a predicate.
+   * @SINCE_2_0.7
+   * @note A @a limit value of 0 means no limit.
+   */
+  void FindNodes(NodePredicate predicate, ConstNodeConsumer consumer, unsigned int limit = 0) const;
+
+  /**
+   * @brief Applies constraints from the given requests.
+   * @SINCE_2_0.7
+   */
+  void ApplyConstraints(Actor&                           root,
+                        std::vector<ConstraintRequest>&& constrainables,
+                        StringCallback                   onError = DefaultErrorCallback) const;
+
+  /**
+   * @brief Ensures that there is no overlap between shaders used by nodes that have meshes skinned to different skeletons.
+   * @SINCE_2_0.7
+   */
+  void EnsureUniqueSkinningShaderInstances(ResourceBundle& resources) const;
+
+  /**
+   * @brief Performs the configuration of the given skinning shaders with the given skeleton.
+   *
+   * This means that the absolute transforms of the joints are calculated and set as one of
+   * the uniforms in the mat4 @b uBone array (in depth first traversal). Further, the following
+   * are created:<br />
+   *  - a @b jointMatrix property on each joint Actor;<br />
+   *  - constraint from the Actor's local position and rotation (and if it has a @e joint
+   *    parent, the jointMatrix of the parent) to its @b jointMatrix property;<br />
+   *  - a constraint from the the Actor's @b jointMatrix property to the related entry in
+   *    the shader's @b uBone property;<br />
+   * This ensures the automatic update of the skeletal animation, should any of the joints' transform changes,
+   * by whatever means.
+   * @SINCE_2_0.7
+   * @note Error messages will be posted to the optional @a onError callback.
+   * @note A maximum of SkinningDetails::MAX_JOINTS joints per skeleton are supported at the moment.
+   * @note Even if multiple skinned meshes use the same skinning shader, the correct number
+   *   of separate instances need to be declared in the .dli to avoid clashing uniform
+   *   definitions and constraints.
+   */
+  void ConfigureSkinningShaders(const ResourceBundle&                             resources,
+                                Actor                                             root,
+                                std::vector<SkinningShaderConfigurationRequest>&& requests) const;
+
+  /**
+   * @brief Ensures there is no two meshes with blend shapes sharing the same shader.
+   * @SINCE_2_0.7
+   */
+  void EnsureUniqueBlendShapeShaderInstances(ResourceBundle& resources) const;
+
+  /**
+   * @brief Performs the configuration of the given blend shapes.
+   *
+   * For each node with blend shapes it registers into the actor the weights properties for each morph target
+   * and some needed uniforms into the shader.
+   *
+   * @SINCE_2_0.7
+   * @param[in] root The root actor.
+   * @param[in] requests The requests to configure blend shapes.
+   * @param[in] resources The resources bundle. Meshes need to be accessed to configure the blend shapes.
+   * @param[in] onError The error callback.
+   */
+  bool ConfigureBlendshapeShaders(const ResourceBundle&                               resources,
+                                  Actor                                               root,
+                                  std::vector<BlendshapeShaderConfigurationRequest>&& requests,
+                                  StringCallback                                      onError = DefaultErrorCallback) const;
+
+  SceneDefinition& operator=(SceneDefinition&& other);
+
+private: // METHODS
+  bool FindNode(const std::string& name, std::unique_ptr<NodeDefinition>** result);
+
+private:                                               // DATA
+  std::vector<std::unique_ptr<NodeDefinition>> mNodes; // size unknown up front (may discard nodes).
+  std::vector<Index>                           mRootNodeIds;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_SCENE_DEFINITION_H_
diff --git a/dali-scene3d/public-api/loader/shader-definition.cpp b/dali-scene3d/public-api/loader/shader-definition.cpp
new file mode 100644
index 0000000..8cd505e
--- /dev/null
+++ b/dali-scene3d/public-api/loader/shader-definition.cpp
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/shader-definition.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/property-array.h>
+#include <regex>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-scene3d/public-api/loader/utils.h>
+
+#include <dali/integration-api/debug.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_MODEL_SHADER_DEFINITION");
+#endif
+} // namespace
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+const char* SHADER_HINT_OUTPUT_IS_TRANSPARENT("OUTPUT_IS_TRANSPARENT"); ///< Might generate transparent alpha from opaque inputs.
+const char* SHADER_HINT_MODIFIES_GEOMETRY("MODIFIES_GEOMETRY");         ///< Might change position of vertices, this option disables any culling optimizations.
+} // namespace
+
+ShaderDefinition::ShaderDefinition(const ShaderDefinition& other)
+: mRendererState(other.mRendererState),
+  mVertexShaderPath(other.mVertexShaderPath),
+  mFragmentShaderPath(other.mFragmentShaderPath),
+  mDefines(other.mDefines),
+  mHints(other.mHints),
+  mUniforms(other.mUniforms),
+  mUseBuiltInShader(other.mUseBuiltInShader)
+{
+}
+
+void ApplyDefine(std::string& shaderCode, const std::string& definevar)
+{
+  const std::string IF_1 = "#if 1";
+
+  std::size_t found = shaderCode.find(definevar);
+  while(found != std::string::npos)
+  {
+    // Greater then "@" character means is a letter,
+    // therefore is not has the definevar we looking for.
+    if((found + definevar.length()) < shaderCode.length() && shaderCode.at(found + definevar.length()) > '@')
+    {
+      found = shaderCode.find(definevar, found + definevar.length());
+      continue;
+    }
+    if(found > 0u && shaderCode.at(found - 1) > '@')
+    {
+      found = shaderCode.find(definevar, found + definevar.length());
+      continue;
+    }
+
+    std::size_t defidx     = shaderCode.rfind("#ifdef", found);
+    std::size_t newlineidx = shaderCode.rfind("\n", found);
+    if(newlineidx < defidx && defidx != std::string::npos)
+    {
+      shaderCode.replace(defidx, found - defidx + definevar.length(), IF_1);
+      found = defidx + IF_1.length();
+    }
+    else
+    {
+      found += definevar.length();
+    }
+    found = shaderCode.find(definevar, found);
+  }
+}
+
+void RedefineMacro(std::string& shaderCode, const std::string& macro, const std::string& value)
+{
+  if(!value.empty())
+  {
+    std::string definition = "#define " + macro;
+    std::size_t found      = shaderCode.find(definition);
+    if(found != std::string::npos)
+    {
+      std::size_t insertionPoint = found + definition.length();
+
+      // Automatically insert line-continuation character into value
+      std::regex                 re("\n");
+      std::sregex_token_iterator first{value.begin(), value.end(), re, -1}, last;
+      for(auto i = first; i != last; ++i)
+      {
+        std::string line = std::string(" \\\n") + (*i).str();
+        shaderCode.insert(insertionPoint, line);
+        insertionPoint += line.length();
+      }
+    }
+  }
+  else
+  {
+    std::size_t invocation = shaderCode.rfind(macro);
+    if(invocation != std::string::npos)
+    {
+      std::size_t start = shaderCode.rfind("\n", invocation);
+      std::size_t end   = shaderCode.find("\n", invocation);
+      shaderCode.erase(start, end - start);
+    }
+  }
+}
+
+ShaderDefinition::RawData
+ShaderDefinition::LoadRaw(const std::string& shadersPath) const
+{
+  RawData raw;
+
+  bool fail = false;
+  if(!mUseBuiltInShader)
+  {
+    raw.mVertexShaderSource = LoadTextFile((shadersPath + mVertexShaderPath).c_str(), &fail);
+    if(!fail)
+    {
+      raw.mFragmentShaderSource = LoadTextFile((shadersPath + mFragmentShaderPath).c_str(), &fail);
+      if(fail)
+      {
+        ExceptionFlinger(ASSERT_LOCATION) << "Failed to load shader source from '" << shadersPath + mFragmentShaderPath << "'.";
+      }
+    }
+    else
+    {
+      ExceptionFlinger(ASSERT_LOCATION) << "Failed to load shader source from '" << shadersPath + mVertexShaderPath << "'.";
+    }
+  }
+  else
+  {
+    raw.mVertexShaderSource         = Dali::Shader::GetVertexShaderPrefix() + SHADER_DEFAULT_PHYSICALLY_BASED_SHADER_VERT.data();
+    raw.mFragmentShaderSource       = Dali::Shader::GetFragmentShaderPrefix() + SHADER_DEFAULT_PHYSICALLY_BASED_SHADER_FRAG.data();
+    raw.mShadowVertexShaderSource   = Dali::Shader::GetVertexShaderPrefix() + SHADER_SHADOW_MAP_SHADER_VERT.data();
+    raw.mShadowFragmentShaderSource = Dali::Shader::GetFragmentShaderPrefix() + SHADER_SHADOW_MAP_SHADER_FRAG.data();
+  }
+
+  if(!fail)
+  {
+    for(const auto& definevar : mDefines)
+    {
+      ApplyDefine(raw.mVertexShaderSource, definevar);
+      ApplyDefine(raw.mFragmentShaderSource, definevar);
+      ApplyDefine(raw.mShadowVertexShaderSource, definevar);
+      ApplyDefine(raw.mShadowFragmentShaderSource, definevar);
+    }
+    for(const auto& macroDef : mMacros)
+    {
+      RedefineMacro(raw.mVertexShaderSource, macroDef.macro, macroDef.definition);
+      RedefineMacro(raw.mFragmentShaderSource, macroDef.macro, macroDef.definition);
+      RedefineMacro(raw.mShadowVertexShaderSource, macroDef.macro, macroDef.definition);
+      RedefineMacro(raw.mShadowFragmentShaderSource, macroDef.macro, macroDef.definition);
+    }
+  }
+
+  return raw;
+}
+
+Shader ShaderDefinition::Load(RawData&& raw) const
+{
+  uint32_t hints = Shader::Hint::NONE;
+  for(const auto& hint : mHints)
+  {
+    if(hint == SHADER_HINT_OUTPUT_IS_TRANSPARENT)
+    {
+      hints |= Shader::Hint::OUTPUT_IS_TRANSPARENT;
+    }
+    else if(hint == SHADER_HINT_MODIFIES_GEOMETRY)
+    {
+      hints |= Shader::Hint::MODIFIES_GEOMETRY;
+    }
+  }
+
+  Property::Map map[2];
+  map[0]["vertex"]        = raw.mVertexShaderSource;
+  map[0]["fragment"]      = raw.mFragmentShaderSource;
+  map[0]["renderPassTag"] = 0;
+  map[0]["hints"]         = static_cast<Shader::Hint::Value>(hints);
+  map[0]["name"]          = "SCENE3D_PBR";
+
+  map[1]["vertex"]        = raw.mShadowVertexShaderSource;
+  map[1]["fragment"]      = raw.mShadowFragmentShaderSource;
+  map[1]["renderPassTag"] = 10;
+  map[1]["name"]          = "SCENE3D_SHADOW_MAP";
+
+  Property::Array array;
+  array.PushBack(map[0]);
+  array.PushBack(map[1]);
+
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Vert Shader src: \n%s\n", raw.mVertexShaderSource.c_str());
+  Shader shader = Shader::New(array);
+  for(Property::Map::SizeType i0 = 0, i1 = mUniforms.Count(); i0 != i1; ++i0)
+  {
+    auto pair = mUniforms.GetKeyValue(i0);
+    DALI_ASSERT_ALWAYS(pair.first.type == Property::Key::STRING);
+    shader.RegisterProperty(pair.first.stringKey, pair.second);
+  }
+
+  return shader;
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/shader-definition.h b/dali-scene3d/public-api/loader/shader-definition.h
new file mode 100644
index 0000000..743d343
--- /dev/null
+++ b/dali-scene3d/public-api/loader/shader-definition.h
@@ -0,0 +1,89 @@
+#ifndef DALI_SCENE3D_LOADER_SHADER_DEFINITION_H
+#define DALI_SCENE3D_LOADER_SHADER_DEFINITION_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/rendering/shader.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/renderer-state.h>
+#include <dali-scene3d/public-api/loader/shader-option.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Defines a shader with paths to the files which define its
+ *  vertex and fragment components, and a mapping of uniform names (which are
+ *  used to refer to them in GLSL) to data.
+ * @SINCE_2_0.7
+ */
+struct DALI_SCENE3D_API ShaderDefinition
+{
+  using Vector = std::vector<std::pair<ShaderDefinition, Shader>>;
+
+  struct RawData
+  {
+    std::string mVertexShaderSource;
+    std::string mFragmentShaderSource;
+    std::string mShadowVertexShaderSource;
+    std::string mShadowFragmentShaderSource;
+  };
+
+  ShaderDefinition() = default;
+
+  ShaderDefinition(const ShaderDefinition& other);
+  ShaderDefinition& operator=(const ShaderDefinition& other) = delete;
+
+  ShaderDefinition(ShaderDefinition&&) = default;
+  ShaderDefinition& operator=(ShaderDefinition&&) = default;
+
+  /**
+   * @brief Attempts to load the source of the vertex and fragment shaders,
+   *  then performs pre-processing of defines.
+   * @SINCE_2_0.7
+   * @note This may be called from any thread.
+   */
+  RawData LoadRaw(const std::string& shadersPath) const;
+
+  /**
+   * @brief Creates a DALi Shader from the sources in @a raw, traverses
+   *  uniforms to get them to register their data against their name,
+   *  then returns the Shader.
+   * @SINCE_2_0.7
+   * @note This must be called from the event thread.
+   */
+  Shader Load(RawData&& raw) const;
+
+public: // DATA
+  std::shared_ptr<RawData> mRawData;
+  RendererState::Type      mRendererState = RendererState::NONE;
+
+  std::string                                mVertexShaderPath;
+  std::string                                mFragmentShaderPath;
+  std::vector<std::string>                   mDefines;
+  std::vector<ShaderOption::MacroDefinition> mMacros;
+  std::vector<std::string>                   mHints;
+  Property::Map                              mUniforms;
+  bool                                       mUseBuiltInShader{false};
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_SHADER_DEFINITION_H
diff --git a/dali-scene3d/public-api/loader/shader-manager.cpp b/dali-scene3d/public-api/loader/shader-manager.cpp
new file mode 100644
index 0000000..776092c
--- /dev/null
+++ b/dali-scene3d/public-api/loader/shader-manager.cpp
@@ -0,0 +1,450 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/shader-manager.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/public-api/animation/constraint.h>
+#include <cstring>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/light/light-impl.h>
+#include <dali-scene3d/internal/loader/hash.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h>
+#include <dali-scene3d/public-api/loader/node-definition.h>
+
+#include <dali/integration-api/debug.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_MODEL_SHADER_MANAGER");
+#endif
+} // namespace
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+static constexpr uint32_t INDEX_FOR_LIGHT_CONSTRAINT_TAG  = 10;
+static constexpr uint32_t INDEX_FOR_SHADOW_CONSTRAINT_TAG = 100;
+
+constexpr uint32_t MINIMUM_SHADER_VERSION_SUPPORT_TEXTURE_TEXEL_AND_SIZE = 300;
+
+ShaderOption MakeOption(const MaterialDefinition& materialDef, const MeshDefinition& meshDef)
+{
+  ShaderOption option;
+
+  const bool hasTransparency = MaskMatch(materialDef.mFlags, MaterialDefinition::TRANSPARENCY);
+  if(hasTransparency)
+  {
+    option.SetTransparency();
+  }
+
+  if(hasTransparency ||
+     !materialDef.CheckTextures(MaterialDefinition::ALBEDO | MaterialDefinition::METALLIC) ||
+     !materialDef.CheckTextures(MaterialDefinition::NORMAL | MaterialDefinition::ROUGHNESS))
+  {
+    option.AddOption(ShaderOption::Type::THREE_TEXTURE);
+
+    // For the glTF, each of basecolor, metallic_roughness, normal texture is not essential.
+    if(MaskMatch(materialDef.mFlags, MaterialDefinition::ALBEDO))
+    {
+      option.AddOption(ShaderOption::Type::BASE_COLOR_TEXTURE);
+    }
+
+    if(materialDef.CheckTextures(MaterialDefinition::METALLIC | MaterialDefinition::ROUGHNESS))
+    {
+      option.AddOption(ShaderOption::Type::METALLIC_ROUGHNESS_TEXTURE);
+    }
+
+    if(MaskMatch(materialDef.mFlags, MaterialDefinition::NORMAL))
+    {
+      option.AddOption(ShaderOption::Type::NORMAL_TEXTURE);
+    }
+  }
+
+  if(materialDef.GetAlphaCutoff() > 0.f)
+  {
+    option.AddOption(ShaderOption::Type::ALPHA_TEST);
+  }
+
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SUBSURFACE))
+  {
+    option.AddOption(ShaderOption::Type::SUBSURFACE);
+  }
+
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::OCCLUSION))
+  {
+    option.AddOption(ShaderOption::Type::OCCLUSION);
+  }
+
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::EMISSIVE))
+  {
+    option.AddOption(ShaderOption::Type::EMISSIVE);
+  }
+
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR))
+  {
+    option.AddOption(ShaderOption::Type::SPECULAR);
+  }
+
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR_COLOR))
+  {
+    option.AddOption(ShaderOption::Type::SPECULAR_COLOR);
+  }
+
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::GLTF_CHANNELS))
+  {
+    option.AddOption(ShaderOption::Type::GLTF_CHANNELS);
+  }
+
+  if(meshDef.IsSkinned())
+  {
+    option.AddOption(ShaderOption::Type::SKINNING);
+    option.AddJointMacros(meshDef.mJoints.size());
+  }
+  else
+  {
+    option.AddJointMacros(0);
+  }
+
+  if(MaskMatch(meshDef.mFlags, MeshDefinition::FLIP_UVS_VERTICAL))
+  {
+    option.AddOption(ShaderOption::Type::FLIP_UVS_VERTICAL);
+  }
+
+  if(!meshDef.mColors.empty() && meshDef.mColors[0].IsDefined())
+  {
+    option.AddOption(ShaderOption::Type::COLOR_ATTRIBUTE);
+  }
+
+  if(meshDef.mTangentType == Property::VECTOR4)
+  {
+    option.AddOption(ShaderOption::Type::VEC4_TANGENT);
+  }
+
+  if(meshDef.HasBlendShapes())
+  {
+    bool hasPositions = false;
+    bool hasNormals   = false;
+    bool hasTangents  = false;
+    meshDef.RetrieveBlendShapeComponents(hasPositions, hasNormals, hasTangents);
+    if(hasPositions)
+    {
+      option.AddOption(ShaderOption::Type::MORPH_POSITION);
+    }
+
+    if(hasNormals)
+    {
+      option.AddOption(ShaderOption::Type::MORPH_NORMAL);
+    }
+
+    if(hasTangents)
+    {
+      option.AddOption(ShaderOption::Type::MORPH_TANGENT);
+    }
+
+    if(hasPositions || hasNormals || hasTangents)
+    {
+      if(BlendShapes::Version::VERSION_2_0 == meshDef.mBlendShapeVersion)
+      {
+        option.AddOption(ShaderOption::Type::MORPH_VERSION_2_0);
+      }
+    }
+  }
+  if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_TEXTURE_TEXEL_AND_SIZE))
+  {
+    option.AddOption(ShaderOption::Type::SL_VERSION_LOW);
+  }
+
+  return option;
+}
+} // namespace
+
+struct ShaderManager::Impl
+{
+  std::map<uint64_t, Index>   mShaderMap;
+  std::vector<Dali::Shader>   mShaders;
+  std::vector<Scene3D::Light> mLights;
+
+  Scene3D::Light mShadowLight;
+};
+
+ShaderManager::ShaderManager()
+: mImpl{new Impl()}
+{
+}
+
+ShaderManager::~ShaderManager() = default;
+
+ShaderOption ShaderManager::ProduceShaderOption(const MaterialDefinition& materialDefinition, const MeshDefinition& meshDefinition)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Concise, "Defining shader from mat/mesh definitions\n");
+  return MakeOption(materialDefinition, meshDefinition);
+}
+
+Dali::Shader ShaderManager::ProduceShader(const ShaderOption& shaderOption)
+{
+  Dali::Shader result;
+
+  auto&    shaderMap = mImpl->mShaderMap;
+  uint64_t hash      = shaderOption.GetOptionHash();
+
+#if defined(DEBUG_ENABLED)
+  std::ostringstream oss;
+  oss << "  ShaderOption defines:";
+  std::vector<std::string> defines;
+  shaderOption.GetDefines(defines);
+  for(auto& def : defines)
+  {
+    oss << def << ", ";
+  }
+  oss << std::endl
+      << "  ShaderOption macro definitions:" << std::endl;
+  for(auto& macro : shaderOption.GetMacroDefinitions())
+  {
+    oss << macro.macro << " : " << macro.definition << std::endl;
+  }
+  DALI_LOG_INFO(gLogFilter, Debug::Concise, "ShaderOption:\n%s\n", oss.str().c_str());
+#endif
+
+  auto iFind = shaderMap.find(hash);
+  if(iFind != shaderMap.end())
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Concise, "Defining Shader found: hash: %lx", hash);
+    result = mImpl->mShaders[iFind->second];
+  }
+  else
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Concise, "Creating new shader: hash: %lx\n", hash);
+    ShaderDefinition shaderDef;
+    shaderDef.mUseBuiltInShader = true;
+
+    shaderOption.GetDefines(shaderDef.mDefines);
+    shaderDef.mMacros                  = shaderOption.GetMacroDefinitions();
+    shaderDef.mUniforms["uCubeMatrix"] = Matrix::IDENTITY;
+
+    shaderMap[hash] = mImpl->mShaders.size();
+
+    auto raw = shaderDef.LoadRaw("");
+    mImpl->mShaders.emplace_back(shaderDef.Load(std::move(raw)));
+    result = mImpl->mShaders.back();
+
+    std::string lightCountPropertyName(Scene3D::Internal::Light::GetLightCountUniformName());
+    result.RegisterProperty(lightCountPropertyName, static_cast<int32_t>(mImpl->mLights.size()));
+
+    for(uint32_t index = 0; index < mImpl->mLights.size(); ++index)
+    {
+      SetLightConstraintToShader(index, result);
+    }
+
+    result.RegisterProperty("uIsShadowEnabled", static_cast<int32_t>(!!mImpl->mShadowLight));
+    if(!!mImpl->mShadowLight)
+    {
+      SetShadowConstraintToShader(result);
+      SetShadowUniformToShader(result);
+    }
+  }
+
+  return result;
+}
+
+RendererState::Type ShaderManager::GetRendererState(const MaterialDefinition& materialDefinition)
+{
+  RendererState::Type rendererState = RendererState::DEPTH_TEST;
+
+  if(!materialDefinition.mDoubleSided)
+  {
+    rendererState |= RendererState::CULL_BACK;
+  }
+
+  const bool hasTransparency = MaskMatch(materialDefinition.mFlags, MaterialDefinition::TRANSPARENCY);
+  if(hasTransparency)
+  {
+    // TODO: this requires more granularity
+    rendererState = (rendererState | RendererState::ALPHA_BLEND);
+  }
+  return rendererState;
+}
+
+bool ShaderManager::AddLight(Scene3D::Light light)
+{
+  if(!light || mImpl->mLights.size() >= Scene3D::Internal::Light::GetMaximumEnabledLightCount())
+  {
+    return false;
+  }
+
+  uint32_t lightIndex = mImpl->mLights.size();
+  mImpl->mLights.push_back(light);
+
+  for(auto&& shader : mImpl->mShaders)
+  {
+    std::string lightCountPropertyName(Scene3D::Internal::Light::GetLightCountUniformName());
+    shader.RegisterProperty(lightCountPropertyName, static_cast<int32_t>(mImpl->mLights.size()));
+  }
+
+  SetLightConstraint(lightIndex);
+
+  return true;
+}
+
+void ShaderManager::RemoveLight(Scene3D::Light light)
+{
+  uint32_t lightCount = mImpl->mLights.size();
+  for(uint32_t index = 0; index < lightCount; ++index)
+  {
+    if(mImpl->mLights[index] != light)
+    {
+      continue;
+    }
+
+    RemoveLightConstraint(index);
+
+    if(!mImpl->mLights.empty() && light != mImpl->mLights.back())
+    {
+      RemoveLightConstraint(mImpl->mLights.size() - 1);
+      mImpl->mLights[index] = mImpl->mLights.back();
+      SetLightConstraint(index);
+    }
+
+    mImpl->mLights.pop_back();
+
+    for(auto&& shader : mImpl->mShaders)
+    {
+      std::string lightCountPropertyName(Scene3D::Internal::Light::GetLightCountUniformName());
+      shader.RegisterProperty(lightCountPropertyName, static_cast<int32_t>(mImpl->mLights.size()));
+    }
+    break;
+  }
+}
+
+uint32_t ShaderManager::GetLightCount() const
+{
+  return mImpl->mLights.size();
+}
+
+void ShaderManager::SetShadow(Scene3D::Light light)
+{
+  mImpl->mShadowLight = light;
+  for(auto&& shader : mImpl->mShaders)
+  {
+    std::string shadowEnabledPropertyName(Scene3D::Internal::Light::GetShadowEnabledUniformName());
+    shader.RegisterProperty(shadowEnabledPropertyName, static_cast<int32_t>(true));
+  }
+
+  SetShadowProperty();
+}
+
+void ShaderManager::RemoveShadow()
+{
+  for(auto&& shader : mImpl->mShaders)
+  {
+    std::string shadowEnabledPropertyName(Scene3D::Internal::Light::GetShadowEnabledUniformName());
+    shader.RegisterProperty(shadowEnabledPropertyName, static_cast<int32_t>(false));
+    shader.RemoveConstraints(INDEX_FOR_SHADOW_CONSTRAINT_TAG);
+  }
+  mImpl->mShadowLight.Reset();
+}
+
+void ShaderManager::UpdateShadowUniform(Scene3D::Light light)
+{
+  if(light != mImpl->mShadowLight)
+  {
+    return;
+  }
+
+  for(auto&& shader : mImpl->mShaders)
+  {
+    SetShadowUniformToShader(shader);
+  }
+}
+
+void ShaderManager::SetLightConstraint(uint32_t lightIndex)
+{
+  for(auto&& shader : mImpl->mShaders)
+  {
+    SetLightConstraintToShader(lightIndex, shader);
+  }
+}
+
+void ShaderManager::SetLightConstraintToShader(uint32_t lightIndex, Dali::Shader shader)
+{
+  std::string lightDirectionPropertyName(Scene3D::Internal::Light::GetLightDirectionUniformName());
+  lightDirectionPropertyName += "[" + std::to_string(lightIndex) + "]";
+  auto             lightDirectionPropertyIndex = shader.RegisterProperty(lightDirectionPropertyName, Vector3::ZAXIS);
+  Dali::Constraint lightDirectionConstraint    = Dali::Constraint::New<Vector3>(shader, lightDirectionPropertyIndex, [](Vector3& output, const PropertyInputContainer& inputs) { output = inputs[0]->GetQuaternion().Rotate(Vector3::ZAXIS); });
+  lightDirectionConstraint.AddSource(Source{mImpl->mLights[lightIndex], Dali::Actor::Property::WORLD_ORIENTATION});
+  lightDirectionConstraint.ApplyPost();
+  lightDirectionConstraint.SetTag(INDEX_FOR_LIGHT_CONSTRAINT_TAG + lightIndex);
+
+  std::string lightColorPropertyName(Scene3D::Internal::Light::GetLightColorUniformName());
+  lightColorPropertyName += "[" + std::to_string(lightIndex) + "]";
+  auto             lightColorPropertyIndex = shader.RegisterProperty(lightColorPropertyName, Vector3(Color::WHITE));
+  Dali::Constraint lightColorConstraint    = Dali::Constraint::New<Vector3>(shader, lightColorPropertyIndex, [](Vector3& output, const PropertyInputContainer& inputs) { output = Vector3(inputs[0]->GetVector4()); });
+  lightColorConstraint.AddSource(Source{mImpl->mLights[lightIndex], Dali::Actor::Property::COLOR});
+  lightColorConstraint.ApplyPost();
+  lightColorConstraint.SetTag(INDEX_FOR_LIGHT_CONSTRAINT_TAG + lightIndex);
+}
+
+void ShaderManager::RemoveLightConstraint(uint32_t lightIndex)
+{
+  for(auto&& shader : mImpl->mShaders)
+  {
+    shader.RemoveConstraints(INDEX_FOR_LIGHT_CONSTRAINT_TAG + lightIndex);
+  }
+}
+
+void ShaderManager::SetShadowUniformToShader(Dali::Shader shader)
+{
+  shader.RegisterProperty("uShadowIntensity", mImpl->mShadowLight.GetShadowIntensity());
+  shader.RegisterProperty("uShadowBias", mImpl->mShadowLight.GetShadowBias());
+  shader.RegisterProperty("uEnableShadowSoftFiltering", static_cast<int>(mImpl->mShadowLight.IsShadowSoftFilteringEnabled()));
+}
+
+void ShaderManager::SetShadowProperty()
+{
+  for(auto&& shader : mImpl->mShaders)
+  {
+    SetShadowUniformToShader(shader);
+    SetShadowConstraintToShader(shader);
+  }
+}
+
+void ShaderManager::SetShadowConstraintToShader(Dali::Shader shader)
+{
+  // Constraint is applied before View/Projection Matrix is computed in update thread.
+  // So, it could show not plausible result if camera properties are changed discontinuesly.
+  // If we want to make it be synchronized, View/Projection matrix are needed to be conputed in below constraint.
+
+  std::string       shadowViewProjectionPropertyName(Scene3D::Internal::Light::GetShadowViewProjectionMatrixUniformName());
+  auto              shadowViewProjectionPropertyIndex = shader.RegisterProperty(shadowViewProjectionPropertyName, Matrix::IDENTITY);
+  Dali::CameraActor shadowLightCamera                 = Dali::Scene3D::Internal::GetImplementation(mImpl->mShadowLight).GetCamera();
+  auto              tempViewProjectionMatrixIndex     = shadowLightCamera.GetPropertyIndex("tempViewProjectionMatrix");
+  if(tempViewProjectionMatrixIndex != Dali::Property::INVALID_INDEX)
+  {
+    tempViewProjectionMatrixIndex = shadowLightCamera.RegisterProperty("tempViewProjectionMatrix", Matrix::IDENTITY);
+  }
+  Dali::Constraint shadowViewProjectionConstraint = Dali::Constraint::New<Matrix>(shader, shadowViewProjectionPropertyIndex, [](Matrix& output, const PropertyInputContainer& inputs) { output = inputs[0]->GetMatrix(); });
+  shadowViewProjectionConstraint.AddSource(Source{shadowLightCamera, tempViewProjectionMatrixIndex});
+  shadowViewProjectionConstraint.ApplyPost();
+  shadowViewProjectionConstraint.SetTag(INDEX_FOR_SHADOW_CONSTRAINT_TAG);
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/shader-manager.h b/dali-scene3d/public-api/loader/shader-manager.h
new file mode 100644
index 0000000..2ef95ce
--- /dev/null
+++ b/dali-scene3d/public-api/loader/shader-manager.h
@@ -0,0 +1,172 @@
+#ifndef DALI_SCENE3D_LOADER_SHADER_MANAGER_H_
+#define DALI_SCENE3D_LOADER_SHADER_MANAGER_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDER
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/rendering/shader.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/light/light.h>
+#include <dali-scene3d/public-api/loader/index.h>
+#include <dali-scene3d/public-api/loader/material-definition.h>
+#include <dali-scene3d/public-api/loader/mesh-definition.h>
+#include <dali-scene3d/public-api/loader/renderer-state.h>
+#include <dali-scene3d/public-api/loader/shader-option.h>
+
+namespace Dali::Scene3D::Loader
+{
+struct NodeDefinition;
+class ResourceBundle;
+class ShaderManager;
+typedef IntrusivePtr<ShaderManager> ShaderManagerPtr;
+
+/**
+ * @brief This class is to manage Shaders.
+ *
+ * This class could be used as factory class to create Dali::Shader.
+ * And once created Dali::Shader is kept in this manager and will be returned when the same Dali::Shader is requested to be created.
+ * @SINCE_2_2.34
+ */
+class DALI_SCENE3D_API ShaderManager : public RefObject
+{
+public:
+  ShaderManager();
+  ~ShaderManager();
+
+  /**
+   * @brief Produces a Dali::Shader for the input materialDefinition and meshDefinition.
+   *
+   * Returns a cached Dali::Shader if the requested Dali::Shader has already been created once.
+   * (Although the input materialDefinition and meshDefinition are not identical to those used to create the cached Dali::Shader, they share the cached one.)
+   * @SINCE_2_2.34
+   * @param[in] materialDefinition MaterialDefinition that includes information of material to create Shader.
+   * @param[in] meshDefinition meshDefinition that includes information of mesh to create Shader.
+   * @return ShaderOption for the materialDefinition and meshDefinition.
+   */
+  ShaderOption ProduceShaderOption(const MaterialDefinition& materialDefinition, const MeshDefinition& meshDefinition);
+
+  /**
+   * @brief Produces a Dali::Shader for the input ShaderOption.
+   *
+   * Returns a cached Dali::Shader if the requested Dali::Shader has already been created once.
+   * @SINCE_2_2.34
+   * @param[in] shaderOption shader option to create Shader.
+   * @return Dali::Shader of the shader option
+   */
+  Dali::Shader ProduceShader(const ShaderOption& shaderOption);
+
+  /**
+   * @brief Returns RendererState of the input materialDefinition.
+   * @SINCE_2_2.34
+   * @param[in] materialDefinition MaterialDefinition to get RendererState
+   * @return RendererState of the materialDefinition.
+   */
+  RendererState::Type GetRendererState(const MaterialDefinition& materialDefinition);
+
+  /**
+   * @brief Adds new lights for each of shaders.
+   * @SINCE_2_2.34
+   * @param[in] light Light object to be newly added.
+   * @return True when the new light object is added successfully.
+   */
+  bool AddLight(Scene3D::Light light);
+
+  /**
+   * @brief Removes light from each of shaders.
+   * @SINCE_2_2.34
+   * @param[in] light Light object to be removed.
+   */
+  void RemoveLight(Scene3D::Light light);
+
+  /**
+   * @brief Retrieves added light counts.
+   * @SINCE_2_2.34
+   * @return The number of added light count.
+   */
+  uint32_t GetLightCount() const;
+
+  /**
+   * @brief Set a shadow to this scene by input light.
+   * @SINCE_2_2.34
+   * @param[in] light Light object to make shadow.
+   */
+  void SetShadow(Scene3D::Light light);
+
+  /**
+   * @brief Removes Shadow from this SceneView.
+   * @SINCE_2_2.34
+   */
+  void RemoveShadow();
+
+  /**
+   * @brief Update uniform properties of shadow for the input light.
+   * @SINCE_2_2.34
+   * @param[in] light Light object to update shadow uniform.
+   */
+  void UpdateShadowUniform(Scene3D::Light light);
+
+private:
+  /// @cond internal
+  /**
+   * @brief Sets constraint to the shaders with light of light index.
+   * @param[in] lightIndex index of light that will be connected with shaders by constraint.
+   */
+  DALI_INTERNAL void SetLightConstraint(uint32_t lightIndex);
+
+  /**
+   * @brief Sets constraint to a shader with light of light index.
+   * @param[in] lightIndex index of light that will be connected with input shader by constraint.
+   * @param[in] shader Shader that the constraint will be applied.
+   */
+  DALI_INTERNAL void SetLightConstraintToShader(uint32_t lightIndex, Dali::Shader shader);
+
+  /**
+   * @brief Removes constraint of shaders and light of light index.
+   * @param[in] lightIndex index of light that will be disconnected with shaders.
+   */
+  DALI_INTERNAL void RemoveLightConstraint(uint32_t lightIndex);
+
+  /**
+   * @brief Sets uniform about the shadow.
+   * @param[in] shader Shader that the constraint will be applied.
+   */
+  DALI_INTERNAL void SetShadowUniformToShader(Dali::Shader shader);
+
+  /**
+   * @brief Sets properties and constraint to the shaders.
+   */
+  DALI_INTERNAL void SetShadowProperty();
+
+  /**
+   * @brief Sets constraint to a shader about shadow
+   * @param[in] shader Shader that the constraint will be applied.
+   */
+  DALI_INTERNAL void SetShadowConstraintToShader(Dali::Shader shader);
+
+  /// @endcond
+private:
+  struct Impl;
+  const std::unique_ptr<Impl> mImpl;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_SHADER_MANAGER_H_
diff --git a/dali-scene3d/public-api/loader/shader-option.cpp b/dali-scene3d/public-api/loader/shader-option.cpp
new file mode 100644
index 0000000..79cac28
--- /dev/null
+++ b/dali-scene3d/public-api/loader/shader-option.cpp
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/shader-option.h>
+
+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <ostream>
+#include <sstream>
+#include <string>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+static constexpr std::string_view OPTION_KEYWORD[] =
+  {
+    "GLTF_CHANNELS",
+    "THREE_TEX",
+    "BASECOLOR_TEX",
+    "METALLIC_ROUGHNESS_TEX",
+    "NORMAL_TEX",
+    "OCCLUSION",
+    "EMISSIVE_TEXTURE",
+    "ALPHA_TEST",
+    "SSS",
+    "MATERIAL_SPECULAR_TEXTURE",
+    "MATERIAL_SPECULAR_COLOR_TEXTURE",
+    "SKINNING",
+    "FLIP_V",
+    "COLOR_ATTRIBUTE",
+    "VEC4_TANGENT",
+    "MORPH_POSITION",
+    "MORPH_NORMAL",
+    "MORPH_TANGENT",
+    "MORPH_VERSION_2_0",
+    "SL_VERSION_LOW",
+};
+static constexpr uint32_t NUMBER_OF_OPTIONS = sizeof(OPTION_KEYWORD) / sizeof(OPTION_KEYWORD[0]);
+static const char*        ADD_EXTRA_SKINNING_ATTRIBUTES{"ADD_EXTRA_SKINNING_ATTRIBUTES"};
+static const char*        ADD_EXTRA_WEIGHTS{"ADD_EXTRA_WEIGHTS"};
+
+inline void HashString(uint64_t& hash, const char* string)
+{
+  char c;
+  while((c = *string++))
+  {
+    hash = hash * 33 + c;
+  }
+}
+} // namespace
+
+ShaderOption::ShaderOption(const ShaderOption& rhs)
+{
+  mOptionHash = rhs.mOptionHash;
+  for(auto& macroDef : rhs.mMacros)
+  {
+    mMacros.emplace_back(macroDef);
+  }
+}
+
+ShaderOption& ShaderOption::operator=(const ShaderOption& rhs)
+{
+  if(this != &rhs)
+  {
+    mOptionHash = rhs.mOptionHash;
+    for(auto& macroDef : rhs.mMacros)
+    {
+      mMacros.emplace_back(macroDef);
+    }
+  }
+  return *this;
+}
+
+void ShaderOption::SetTransparency()
+{
+  mOptionHash |= (1 << NUMBER_OF_OPTIONS);
+}
+
+void ShaderOption::AddOption(Type shaderOptionType)
+{
+  mOptionHash |= (1 << static_cast<uint32_t>(shaderOptionType));
+}
+
+void ShaderOption::AddJointMacros(size_t numberOfJointSets)
+{
+  // Add options for ADD_EXTRA_SKINNING_ATTRIBUTES and ADD_EXTRA_WEIGHTS:
+  if(numberOfJointSets > 1)
+  {
+    std::ostringstream attributes;
+    std::ostringstream weights;
+    for(size_t i = 1; i < numberOfJointSets; ++i)
+    {
+      attributes << "INPUT vec4 aJoints" << i << ";\n";
+      attributes << "INPUT vec4 aWeights" << i << ";\n";
+
+      weights << "bone +=\n"
+              << "uBone[int(aJoints" << i << ".x)] * aWeights" << i << ".x +\n"
+              << "uBone[int(aJoints" << i << ".y)] * aWeights" << i << ".y +\n"
+              << "uBone[int(aJoints" << i << ".z)] * aWeights" << i << ".z +\n"
+              << "uBone[int(aJoints" << i << ".w)] * aWeights" << i << ".w;\n";
+    }
+    AddMacroDefinition(ADD_EXTRA_SKINNING_ATTRIBUTES, attributes.str());
+    AddMacroDefinition(ADD_EXTRA_WEIGHTS, weights.str());
+  }
+  else
+  {
+    AddMacroDefinition(ADD_EXTRA_SKINNING_ATTRIBUTES, std::string{});
+    AddMacroDefinition(ADD_EXTRA_WEIGHTS, std::string{});
+  }
+}
+
+void ShaderOption::AddMacroDefinition(std::string macro, std::string definition)
+{
+  auto iter = std::find_if(mMacros.begin(), mMacros.end(), [macro](ShaderOption::MacroDefinition& md) { return md.macro == macro; });
+  if(iter != mMacros.end())
+  {
+    iter->definition = definition;
+  }
+  else
+  {
+    mMacros.emplace_back(MacroDefinition{macro, definition});
+  }
+}
+
+const std::vector<ShaderOption::MacroDefinition>& ShaderOption::GetMacroDefinitions() const
+{
+  return mMacros;
+}
+
+uint64_t ShaderOption::GetOptionHash() const
+{
+  uint64_t optionHash = mOptionHash;
+  if(!mMacros.empty())
+  {
+    uint64_t hash = 5381;
+    for(auto& macroDef : mMacros)
+    {
+      HashString(hash, macroDef.macro.c_str());
+      HashString(hash, macroDef.definition.c_str());
+    }
+    optionHash |= ((hash << 32) & 0xFFFFFFFF00000000);
+  }
+  return optionHash;
+}
+
+void ShaderOption::GetDefines(std::vector<std::string>& defines) const
+{
+  defines.clear();
+  for(uint32_t i = 0; i < NUMBER_OF_OPTIONS; ++i)
+  {
+    if(mOptionHash & (1 << i))
+    {
+      defines.push_back(OPTION_KEYWORD[i].data());
+    }
+  }
+}
+
+std::string_view ShaderOption::GetDefineKeyword(Type shaderOptionType)
+{
+  return OPTION_KEYWORD[static_cast<uint32_t>(shaderOptionType)];
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/shader-option.h b/dali-scene3d/public-api/loader/shader-option.h
new file mode 100644
index 0000000..47be344
--- /dev/null
+++ b/dali-scene3d/public-api/loader/shader-option.h
@@ -0,0 +1,137 @@
+#ifndef DALI_SCENE3D_LOADER_SHADER_OPTION_H_
+#define DALI_SCENE3D_LOADER_SHADER_OPTION_H_
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDER
+#include <dali/public-api/common/vector-wrapper.h>
+#include <memory>
+#include <string>
+#include <string_view>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+class DALI_SCENE3D_API ShaderOption
+{
+public:
+  enum class Type
+  {
+    GLTF_CHANNELS = 0,          // 00001
+    THREE_TEXTURE,              // 00002
+    BASE_COLOR_TEXTURE,         // 00004
+    METALLIC_ROUGHNESS_TEXTURE, // 00008
+    NORMAL_TEXTURE,             // 00010
+    OCCLUSION,                  // 00020
+    EMISSIVE,                   // 00040
+    ALPHA_TEST,                 // 00080
+    SUBSURFACE,                 // 00100
+    SPECULAR,                   // 00200
+    SPECULAR_COLOR,             // 00400
+    SKINNING,                   // 00800
+    FLIP_UVS_VERTICAL,          // 01000
+    COLOR_ATTRIBUTE,            // 02000
+    VEC4_TANGENT,               // 04000
+    MORPH_POSITION,             // 08000
+    MORPH_NORMAL,               // 10000
+    MORPH_TANGENT,              // 20000
+    MORPH_VERSION_2_0,          // 40000
+    SL_VERSION_LOW,             // 80000
+  };
+
+  struct MacroDefinition
+  {
+    std::string macro;
+    std::string definition;
+  };
+
+  ShaderOption() = default;
+  ShaderOption(const ShaderOption& rhs);
+  ShaderOption& operator=(const ShaderOption& rhs);
+
+  using HashType = uint64_t;
+
+public:
+  /**
+   * @brief Sets transparency option.
+   * @SINCE_2_2.33
+   */
+  void SetTransparency();
+
+  /**
+   * @brief Adds new shader definition option.
+   *
+   * If the option is already added, nothin is changed.
+   * @SINCE_2_2.33
+   * @param[in] shaderOptionType Option to be added,
+   */
+  void AddOption(Type shaderOptionType);
+
+  /**
+   * @brief Adds macro definitions for joints based on the number of joint sets.
+   * @SINCE_2_2.52
+   */
+  void AddJointMacros(size_t numberOfJointSets);
+
+  /**
+   * @brief Enables empty preprocessor definitions to be defined to a value.
+   * @SINCE_2_2.52
+   */
+  void AddMacroDefinition(std::string macro, std::string definition);
+
+  /**
+   * @brief Retrieves current shader option hash
+   *
+   * @SINCE_2_2.33
+   * @return Hash value of currently added options.
+   */
+  HashType GetOptionHash() const;
+
+  /**
+   * @brief Retrieves a list of define keywords.
+   *
+   * @SINCE_2_2.33
+   * @param[out] defines A list of define keywords those are used in this option.
+   */
+  void GetDefines(std::vector<std::string>& defines) const;
+
+  /**
+   * @brief Retrieves a single shader define keyword of input type.
+   *
+   * @SINCE_2_2.33
+   * @param[in] shaderOptionType Shader definition option type to know its keyword.
+   * @return string keyword of shader define.
+   */
+  static std::string_view GetDefineKeyword(Type shaderOptionType);
+
+  /**
+   * @brief Get any macro definitions.
+   * @SINCE_2_2.52
+   */
+  const std::vector<MacroDefinition>& GetMacroDefinitions() const;
+
+private:
+  HashType mOptionHash{0u};
+
+  std::vector<MacroDefinition> mMacros;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_SHADER_OPTION_H_
diff --git a/dali-scene3d/public-api/loader/skeleton-definition.h b/dali-scene3d/public-api/loader/skeleton-definition.h
new file mode 100644
index 0000000..4db02ff
--- /dev/null
+++ b/dali-scene3d/public-api/loader/skeleton-definition.h
@@ -0,0 +1,52 @@
+#ifndef DALI_SCENE3D_LOADER_SKELETON_H
+#define DALI_SCENE3D_LOADER_SKELETON_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/loader/index.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/math/matrix.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief A set of joints (stored as node indices), and an optional root node index.
+ * @SINCE_2_0.7
+ * @note The list of joints must not be empty and must not contain INVALID_INDEX.
+ * @note Client code should not change the order of joints, as they are indexed by mesh vertex data.
+ * @note Client code should make no assumption about the relation of the joint IDs.
+ */
+struct DALI_SCENE3D_API SkeletonDefinition
+{
+  struct Joint
+  {
+    Index  mNodeIdx;
+    Matrix mInverseBindMatrix;
+  };
+
+  using Vector = std::vector<SkeletonDefinition>;
+
+  Index              mRootNodeIdx = INVALID_INDEX;
+  std::vector<Joint> mJoints;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_SKELETON_H
diff --git a/dali-scene3d/public-api/loader/skinning-details.cpp b/dali-scene3d/public-api/loader/skinning-details.cpp
new file mode 100644
index 0000000..d857bb1
--- /dev/null
+++ b/dali-scene3d/public-api/loader/skinning-details.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/skinning-details.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/property.h>
+#include <dali/public-api/rendering/shader.h>
+
+namespace Dali::Scene3D::Loader
+{
+const unsigned int Skinning::MAX_JOINTS = 256;
+
+const char* Skinning::BONE_UNIFORM_NAME = "uBone";
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/skinning-details.h b/dali-scene3d/public-api/loader/skinning-details.h
new file mode 100644
index 0000000..7752219
--- /dev/null
+++ b/dali-scene3d/public-api/loader/skinning-details.h
@@ -0,0 +1,61 @@
+#ifndef DALI_SCENE3D_LOADER_SKINNING_DETAILS_H_
+#define DALI_SCENE3D_LOADER_SKINNING_DETAILS_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/rendering/shader.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/index.h>
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+
+namespace Dali::Scene3D::Loader
+{
+struct DALI_SCENE3D_API Skinning
+{
+public:
+  struct BoneData
+  {
+    Dali::Scene3D::ModelPrimitive primitive;
+    Dali::Constraint              constraint;
+    Scene3D::Loader::Index        boneIndex;
+    std::string                   propertyName;
+    Matrix                        inverseMatrix;
+  };
+
+  /**
+   * @brief Upper limit on the number of joints supported.
+   * @SINCE_2_0.7
+   */
+  static const uint32_t MAX_JOINTS;
+
+  /**
+   * @brief Name of bone matrix uniform (array).
+   * @SINCE_2_0.7
+   */
+  static const char* BONE_UNIFORM_NAME;
+
+  Skinning() = delete;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif // DALI_SCENE3D_LOADER_SKINNING_DETAILS_H_
diff --git a/dali-scene3d/public-api/loader/string-callback.cpp b/dali-scene3d/public-api/loader/string-callback.cpp
new file mode 100644
index 0000000..eb85bad
--- /dev/null
+++ b/dali-scene3d/public-api/loader/string-callback.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/string-callback.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+namespace Dali::Scene3D::Loader
+{
+void DefaultErrorCallback(const std::string& message)
+{
+  DALI_LOG_ERROR("%s", message.c_str());
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/string-callback.h b/dali-scene3d/public-api/loader/string-callback.h
new file mode 100644
index 0000000..10a8c4c
--- /dev/null
+++ b/dali-scene3d/public-api/loader/string-callback.h
@@ -0,0 +1,43 @@
+#ifndef DALI_SCENE3D_LOADER_STRING_CALLBACK_H
+#define DALI_SCENE3D_LOADER_STRING_CALLBACK_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <functional>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief A callback to post strings to.
+ * @SINCE_2_0.7
+ */
+using StringCallback = std::function<void(const std::string&)>;
+
+/**
+ * @brief Simply passes the formatted message to LOGE().
+ * @SINCE_2_0.7
+ */
+DALI_SCENE3D_API void DefaultErrorCallback(const std::string& message);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_STRING_CALLBACK_H
diff --git a/dali-scene3d/public-api/loader/utils.cpp b/dali-scene3d/public-api/loader/utils.cpp
new file mode 100644
index 0000000..9120b65
--- /dev/null
+++ b/dali-scene3d/public-api/loader/utils.cpp
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/utils.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <stdarg.h>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+
+namespace Dali::Scene3D::Loader
+{
+namespace
+{
+thread_local char sExceptionFlingerMessageBuffer[ExceptionFlinger::MESSAGE_BUFFER_SIZE]{};
+}
+
+StreamBuffer::StreamBuffer(char* buffer, size_t size) noexcept(true)
+{
+  setp(buffer, buffer + size);
+}
+
+ExceptionFlinger::Impl::~Impl() noexcept(false)
+{
+  throw DaliException(mLocation, GetMessageBuffer());
+}
+
+ExceptionFlinger::ExceptionFlinger(const char* location) noexcept(true)
+: mImpl{location},
+  mStreamBuffer(GetMessageBuffer(), MESSAGE_BUFFER_SIZE - 1),
+  mStream(&mStreamBuffer)
+{
+}
+
+ExceptionFlinger::~ExceptionFlinger() noexcept(false)
+{
+  operator<<('\0');
+}
+
+char* ExceptionFlinger::GetMessageBuffer() noexcept(true)
+{
+  return sExceptionFlingerMessageBuffer;
+}
+
+std::string FormatString(const char* format, ...)
+{
+  va_list vl;
+  va_start(vl, format);
+  va_list vl2;
+  va_copy(vl2, vl);
+
+  std::string result;
+  int32_t     length = vsnprintf(nullptr, 0, format, vl);
+  va_end(vl);
+
+  if(length >= 0)
+  {
+    size_t sizeRequired = static_cast<size_t>(length);
+    ++sizeRequired;
+    std::string formatString(sizeRequired, '\0');
+    vsnprintf(&formatString[0], sizeRequired, format, vl2);
+    result = formatString;
+  }
+  va_end(vl2);
+  return result;
+}
+
+std::string LoadTextFile(const char* path, bool* fail)
+{
+  std::ifstream inFile(path);
+  if(inFile)
+  {
+    std::istreambuf_iterator<char> eos;
+    std::istreambuf_iterator<char> i(inFile.rdbuf());
+    return std::string(i, eos);
+  }
+  else if(fail)
+  {
+    *fail = true;
+  }
+  return std::string();
+}
+
+Geometry MakeTexturedQuadGeometry(TexturedQuadOptions::Type options)
+{
+  Property::Map properties;
+  properties.Insert("aPosition", Property::VECTOR3);
+  properties.Insert("aTexCoord", Property::VECTOR2);
+
+  std::vector<uint8_t> bytes;
+  size_t               stride   = 0;
+  size_t               uvOffset = 0;
+  struct
+  {
+    Vector3 aPosition;
+    Vector2 aTexCoord;
+  } vertices[] = {
+    {Vector3(-0.5f, 0.5f, 0.0f), Vector2(0.0f, .0f)},
+    {Vector3(0.5f, 0.5f, 0.0f), Vector2(1.0f, .0f)},
+    {Vector3(-0.5f, -0.5f, 0.0f), Vector2(0.0f, 1.0f)},
+    {Vector3(0.5f, -0.5f, 0.0f), Vector2(1.0f, 1.0f)}};
+
+  bytes.resize(sizeof(vertices));
+  stride   = sizeof(vertices[0]);
+  uvOffset = reinterpret_cast<const uint8_t*>(&vertices[0].aTexCoord) - reinterpret_cast<const uint8_t*>(&vertices[0]);
+
+  std::memcpy(bytes.data(), vertices, sizeof(vertices));
+
+  if(MaskMatch(options, TexturedQuadOptions::FLIP_VERTICAL))
+  {
+    Vector2* uv = reinterpret_cast<Vector2*>(reinterpret_cast<uint8_t*>(bytes.data()) + uvOffset);
+    for(int i = 0; i < 4; ++i)
+    {
+      uv->y = 1.0f - uv->y;
+      uv    = reinterpret_cast<Vector2*>(reinterpret_cast<uint8_t*>(uv) + stride);
+    }
+  }
+
+  VertexBuffer vertexBuffer = VertexBuffer::New(properties);
+  vertexBuffer.SetData(bytes.data(), bytes.size() / stride);
+
+  Geometry geometry = Geometry::New();
+  geometry.AddVertexBuffer(vertexBuffer);
+  geometry.SetType(Geometry::TRIANGLE_STRIP);
+  return geometry;
+}
+
+void ToUnixFileSeparators(std::string& path)
+{
+  std::replace(path.begin(), path.end(), '\\', '/');
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/utils.h b/dali-scene3d/public-api/loader/utils.h
new file mode 100644
index 0000000..8add8d5
--- /dev/null
+++ b/dali-scene3d/public-api/loader/utils.h
@@ -0,0 +1,212 @@
+#ifndef DALI_SCENE3D_LOADER_UTILS_H_
+#define DALI_SCENE3D_LOADER_UTILS_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/rendering/renderer.h>
+#include <cctype>
+#include <sstream>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Fixed size backing buffer to use with std::ostreams where control over allocations (which this does not make), is required.
+ * @SINCE_2_0.7
+ * @note All stream insertions that would overflow the buffer that StreamBuffer was created with, will fail.
+ */
+class DALI_SCENE3D_API StreamBuffer : public std::basic_streambuf<char>
+{
+public:
+  StreamBuffer(char* buffer, size_t size) noexcept(true);
+};
+
+/**
+ * @brief Wraps an ostream with a pre-allocated, fixed size backing buffer which a message can be formatted into.
+ *
+ * Upon destruction, it throws a DaliException with the message.
+ * @SINCE_2_0.7
+ */
+class DALI_SCENE3D_API ExceptionFlinger
+{
+public:
+  enum
+  {
+    MESSAGE_BUFFER_SIZE = 512
+  };
+
+  ExceptionFlinger(const char* location) noexcept(true);
+
+  [[noreturn]] ~ExceptionFlinger() noexcept(false);
+
+  template<typename T>
+  ExceptionFlinger& operator<<(const T& rhs) noexcept(true)
+  {
+    mStream << rhs;
+    return *this;
+  }
+
+private:
+  struct Impl
+  {
+    const char* mLocation;
+
+    [[noreturn]] ~Impl() noexcept(false);
+  };
+
+  static char* GetMessageBuffer() noexcept(true);
+
+  Impl         mImpl;
+  StreamBuffer mStreamBuffer;
+  std::ostream mStream;
+};
+
+/**
+ * @brief Formats the given printf-style varargs into a std::string.
+ * @SINCE_2_0.7
+ */
+DALI_SCENE3D_API std::string FormatString(const char* format, ...);
+
+/**
+ * @brief The @n th bit in a bitmask.
+ * @SINCE_2_0.7
+ * @return The @n th bit in a bitmask
+ */
+DALI_SCENE3D_API constexpr size_t NthBit(size_t n)
+{
+  return 1u << n;
+}
+
+/**
+ * @brief Whether all of @a mask 's bits are set on @a value.
+ * @SINCE_2_0.7
+ * @return Whether all of @a mask 's bits are set on @a value
+ */
+inline DALI_SCENE3D_API bool MaskMatch(uint32_t value, uint32_t mask)
+{
+  return (value & mask) == mask;
+}
+
+/**
+ * @brief Convert a four-letter(, null-terminated) string literal into a uint32_t.
+ * @SINCE_2_0.7
+ */
+inline DALI_SCENE3D_API constexpr uint32_t FourCC(const char (&fourCC)[5])
+{
+  return (fourCC[3] << 24) | (fourCC[2] << 16) | (fourCC[1] << 8) | fourCC[0];
+}
+
+/**
+ * @brief Insensitive case compare function.
+ * @SINCE_2_0.7
+ * @param[in] a compare string
+ * @param[in] b compare string
+ * @return true if strings are equal
+ */
+inline DALI_SCENE3D_API bool CaseInsensitiveCharacterCompare(unsigned char a, unsigned char b)
+{
+  // Converts to lower case in the current locale.
+  return std::tolower(a) == std::tolower(b);
+}
+
+/**
+ * @return true if the lower cased ASCII strings are equal.
+ * @SINCE_2_0.7
+ * @param[in] a compare string
+ * @param[in] b compare string
+ */
+inline DALI_SCENE3D_API bool CaseInsensitiveStringCompare(const std::string& a, const std::string& b)
+{
+  bool result = false;
+  if(a.length() == b.length())
+  {
+    result = std::equal(a.begin(), a.end(), b.begin(), &CaseInsensitiveCharacterCompare);
+  }
+  return result;
+}
+
+/**
+ * @brief Attempts to load the contents of a text file; returns empty string on failure.
+ *
+ * A pointer to a boolean may be passed in @a fail; this will be set to true in case of failure
+ * (should only be checked if the returned string was empty()).
+ * @SINCE_2_0.7
+ */
+DALI_SCENE3D_API std::string LoadTextFile(const char* path, bool* fail = nullptr);
+
+/**
+ * @brief Makes a number of calls to @a fn, passing to each one the given @a actor then each of its children, in depth-first traversal.
+ *
+ * @SINCE_2_0.7
+ * @note @a fn must not change the actor hierarchy during traversal.
+ * @note Use of a @a fn that is itself recursing in @a is also discouraged
+ *  for performance and stability reasons.
+ */
+template<typename Func>
+inline DALI_SCENE3D_API void VisitActor(Actor a, Func fn)
+{
+  fn(a);
+
+  unsigned int numChildren = a.GetChildCount();
+  for(unsigned int i = 0; i < numChildren; ++i)
+  {
+    VisitActor(a.GetChildAt(i), fn);
+  }
+}
+
+/**
+ * @brief Convenience function to set the given actor @a 's anchor point and parent origin to center.
+ * @SINCE_2_0.7
+ */
+inline DALI_SCENE3D_API void SetActorCentered(Actor a)
+{
+  a.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  a.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+}
+
+namespace TexturedQuadOptions
+{
+using Type = uint32_t;
+
+enum DALI_SCENE3D_API Values : Type
+{
+  NONE          = 0x00,
+  FLIP_VERTICAL = 0x01,
+};
+} // namespace TexturedQuadOptions
+
+/**
+ * @brief Makes... geometry for a textured quad.
+ * @SINCE_2_0.7
+ */
+DALI_SCENE3D_API Geometry MakeTexturedQuadGeometry(TexturedQuadOptions::Type options = TexturedQuadOptions::NONE);
+
+/**
+ * @brief Fixes the path of a file. Replaces the '\\' separator by the '/' one.
+ * @SINCE_2_0.7
+ * @param[in,out] path The path to be fixed.
+ */
+DALI_SCENE3D_API void ToUnixFileSeparators(std::string& path);
+
+} // namespace Dali::Scene3D::Loader
+
+#endif /* DALI_SCENE3D_LOADER_UTILS_H_ */
diff --git a/dali-scene3d/public-api/loader/view-projection.cpp b/dali-scene3d/public-api/loader/view-projection.cpp
new file mode 100644
index 0000000..259892f
--- /dev/null
+++ b/dali-scene3d/public-api/loader/view-projection.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/loader/view-projection.h>
+
+// INTERNAL INCLDUES
+#include <dali-scene3d/public-api/loader/utils.h>
+
+namespace Dali::Scene3D::Loader
+{
+void ViewProjection::Update()
+{
+  Matrix::Multiply(mViewProjection, mView, mProjection);
+
+  mInvProjection = mProjection;
+  if(!mInvProjection.Invert())
+  {
+    ExceptionFlinger(ASSERT_LOCATION) << "Failed to find inverse of projection matrix " << mProjection << ".";
+  }
+}
+
+} // namespace Dali::Scene3D::Loader
diff --git a/dali-scene3d/public-api/loader/view-projection.h b/dali-scene3d/public-api/loader/view-projection.h
new file mode 100644
index 0000000..3516a33
--- /dev/null
+++ b/dali-scene3d/public-api/loader/view-projection.h
@@ -0,0 +1,76 @@
+#ifndef DALI_SCENE3D_LOADER_VIEW_PROJECTION_H_
+#define DALI_SCENE3D_LOADER_VIEW_PROJECTION_H_
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/matrix.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali::Scene3D::Loader
+{
+/**
+ * @brief Contains view and projection matrices, also caching the view-projection and inverse projection matrices.
+ * @SINCE_2_0.7
+ */
+class ViewProjection
+{
+public:
+  Matrix& GetView()
+  {
+    return mView;
+  }
+  Matrix& GetProjection()
+  {
+    return mProjection;
+  }
+
+  /**
+   * @brief Updates the cached view projection and inverse projection matrices.
+   * @SINCE_2_0.7
+   */
+  void Update();
+
+  const Matrix& GetView() const
+  {
+    return mView;
+  }
+  const Matrix& GetProjection() const
+  {
+    return mProjection;
+  }
+  const Matrix& GetInverseProjection() const
+  {
+    return mInvProjection;
+  }
+  const Matrix& GetViewProjection() const
+  {
+    return mViewProjection;
+  }
+
+private:
+  Matrix mView;
+  Matrix mProjection;
+  Matrix mInvProjection;
+  Matrix mViewProjection;
+};
+
+} // namespace Dali::Scene3D::Loader
+
+#endif //DALI_SCENE3D_LOADER_VIEW_PROJECTION_H_
diff --git a/dali-scene3d/public-api/model-components/material.cpp b/dali-scene3d/public-api/model-components/material.cpp
new file mode 100644
index 0000000..99c1098
--- /dev/null
+++ b/dali-scene3d/public-api/model-components/material.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-components/material.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/rendering/sampler.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-components/material-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+Material Material::New()
+{
+  Internal::MaterialPtr internal = Internal::Material::New();
+
+  return Material(internal.Get());
+}
+
+Material::Material()
+{
+}
+
+Material::Material(const Material& mateiral) = default;
+
+Material::Material(Material&& rhs) noexcept = default;
+
+Material::~Material()
+{
+}
+
+Material& Material::operator=(const Material& handle) = default;
+
+Material& Material::operator=(Material&& rhs) noexcept = default;
+
+Material Material::DownCast(BaseHandle handle)
+{
+  return Material(dynamic_cast<Dali::Scene3D::Internal::Material*>(handle.GetObjectPtr()));
+}
+
+Material::Material(Dali::Scene3D::Internal::Material* internal)
+: BaseHandle(internal)
+{
+}
+
+// Public Method
+
+void Material::SetProperty(Dali::Property::Index index, Dali::Property::Value propertyValue)
+{
+  GetImplementation(*this).SetProperty(index, propertyValue);
+}
+
+Dali::Property::Value Material::GetProperty(Dali::Property::Index index) const
+{
+  return GetImplementation(*this).GetProperty(index);
+}
+
+void Material::SetTexture(Scene3D::Material::TextureType index, Dali::Texture texture)
+{
+  GetImplementation(*this).SetTexture(index, texture);
+}
+
+Dali::Texture Material::GetTexture(Scene3D::Material::TextureType index)
+{
+  return GetImplementation(*this).GetTexture(index);
+}
+
+void Material::SetSampler(Scene3D::Material::TextureType index, Dali::Sampler sampler)
+{
+  GetImplementation(*this).SetSampler(index, sampler);
+}
+
+Dali::Sampler Material::GetSampler(Scene3D::Material::TextureType index)
+{
+  return GetImplementation(*this).GetSampler(index);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/public-api/model-components/material.h b/dali-scene3d/public-api/model-components/material.h
new file mode 100644
index 0000000..7687307
--- /dev/null
+++ b/dali-scene3d/public-api/model-components/material.h
@@ -0,0 +1,497 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/object/property-index-ranges.h>
+#include <dali/public-api/object/property-value.h>
+#include <dali/public-api/object/property.h>
+#include <dali/public-api/rendering/sampler.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+// Forward declarations.
+namespace Internal
+{
+class Material;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_components_material
+ * @{
+ */
+
+/**
+ * @brief Class for setting Material properties of 3D models
+ *
+ * @SINCE_2_2.22
+ *
+ * @note This Material class is for setting Material properties of 3D models.
+ * This Material supports properties and textures for PBR.
+ * Also, Material can be shared with multiple ModelPrimitives and if the value is modified,
+ * the rendering results of all ModelPrimitives using this Material will be changed.
+ *
+ * @code
+ * Material material = Material::New();
+ * ModelPrimitive modelPrimitive = ModelPrimitive::New();
+ * modelPrimitive.SetMaterial(material);
+ * material.SetProperty(PropertyIndex, PropertyValue);
+ * @endcode
+ */
+class DALI_SCENE3D_API Material : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Enumeration for the start and end property ranges for material.
+   * @SINCE_2_2.22
+   */
+  enum PropertyRange
+  {
+    PROPERTY_START_INDEX          = PROPERTY_REGISTRATION_START_INDEX,    ///< Start index is used by the property registration macro. @SINCE_2_2.22
+    MATERIAL_PROPERTY_START_INDEX = PROPERTY_START_INDEX,                 ///< Start index of Control properties. @SINCE_2_2.22
+    MATERIAL_PROPERTY_END_INDEX   = MATERIAL_PROPERTY_START_INDEX + 1000, ///< Reserving 1000 property indices. @SINCE_2_2.22
+
+    ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,        ///< @SINCE_2_2.22
+    ANIMATABLE_PROPERTY_END_INDEX   = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000, ///< Reserve animatable property indices, @SINCE_2_2.22
+  };
+
+  /**
+   * @brief Enumeration for the instance of properties belonging to the Material class.
+   * @SINCE_2_2.22
+   */
+  struct Property
+  {
+    enum
+    {
+      /**
+       * @brief Name of material.
+       * @details type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      NAME = MATERIAL_PROPERTY_START_INDEX,
+
+      /**
+       * @brief Property for the URL of the base color texture.
+       * @details Type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      BASE_COLOR_URL,
+
+      /**
+       * @brief Property for the base color factor of the material surface.
+       * @details Type Property::VECTOR4.
+       * @SINCE_2_2.22
+       */
+      BASE_COLOR_FACTOR,
+
+      /**
+       * @brief Property for the URL of the metallic-roughness texture.
+       * @details Type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      METALLIC_ROUGHNESS_URL,
+
+      /**
+       * @brief Property for the metallic factor of the material surface.
+       * @details Type Property::FLOAT.
+       * @SINCE_2_2.22
+       */
+      METALLIC_FACTOR,
+
+      /**
+       * @brief Property for the roughness factor of the material surface.
+       * @details Type Property::FLOAT.
+       * @SINCE_2_2.22
+       */
+      ROUGHNESS_FACTOR,
+
+      /**
+       * @brief Property for the URL of the normal texture.
+       * @details Type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      NORMAL_URL,
+
+      /**
+       * @brief Property for the scale factor applied to normal vectors.
+       * @details Type Property::FLOAT.
+       * @SINCE_2_2.22
+       */
+      NORMAL_SCALE,
+
+      /**
+       * @brief Property for the URL of the occlusion texture.
+       * @details Type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      OCCLUSION_URL,
+
+      /**
+       * @brief Property for the occlusion strength of the material surface.
+       * @details Type Property::FLOAT.
+       * @SINCE_2_2.22
+       */
+      OCCLUSION_STRENGTH,
+
+      /**
+       * @brief Property for the URL of the emissive texture.
+       * @details Type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      EMISSIVE_URL,
+
+      /**
+       * @brief Emissive factor Property.
+       * @details type Property::VECTOR3.
+       * @SINCE_2_2.22
+       */
+      EMISSIVE_FACTOR,
+
+      /**
+       * @brief Alpha mode Property.
+       * @details type Property::INTEGER.
+       * @SINCE_2_2.22
+       */
+      ALPHA_MODE,
+
+      /**
+       * @brief Alpha cutoff Property.
+       * @details type Property::FLOAT.
+       * @SINCE_2_2.22
+       */
+      ALPHA_CUTOFF,
+
+      /**
+       * @brief Double sided Property.
+       * @details type Property::BOOLEAN.
+       * @SINCE_2_2.22
+       */
+      DOUBLE_SIDED,
+
+      /**
+       * @brief Index of refraction (IOR) of the material surface
+       * @details type Property::FLOAT
+       * @SINCE_2_2.22
+       */
+      IOR,
+
+      /**
+       * @brief Property for the URL of the specular texture.
+       * @details Type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      SPECULAR_URL,
+
+      /**
+       * @brief Property for the specular factor of the material surface.
+       * @details Type Property::FLOAT.
+       * @SINCE_2_2.22
+       */
+      SPECULAR_FACTOR,
+
+      /**
+       * @brief Property for the URL of the specular color texture.
+       * @details Type Property::STRING.
+       * @SINCE_2_2.22
+       */
+      SPECULAR_COLOR_URL,
+
+      /**
+       * @brief Property for the specular color factor of the material surface.
+       * @details Type Property::VECTOR3.
+       * @SINCE_2_2.22
+       */
+      SPECULAR_COLOR_FACTOR,
+
+      /**
+       * @brief Property to define rendering order.
+       * @details Depth index is used to define rendering order. This property
+       * is compatible with Dali::Renderer::Property::DepthIndex. Basically,
+       * a Renderer that has smaller depth index is rendered earlier.
+       * In the ordinary DALI UI components has 0 as depth index by default.
+       * (For the case of Toolkit::Control, its renderer has depth index
+       * value between [-20, 20] as fallowing the renderer's purpose)
+       *
+       * In the Scene3D cases, the rendering order of each Renderer may need
+       * to be manually defined to match scene developer's intent.
+       * Scene3D::DepthIndex::Ranges could be used to adjust rendering order
+       * between 3D Scene content.
+       * Or it also could be used to manage UI component in 3D Scene independently.
+       *
+       * Changing the depth index only affects the rendering order, and does not
+       * mean that objects drawn later will be drawn on top. To compute final
+       * rendering order, whether the object is opaque or non-opaque takes precedence
+       * over the depth index. Changing the rendering order among translucent objects
+       * has a significant impact on the rendering results.
+       * @SINCE_2_3.3
+       */
+      DEPTH_INDEX,
+    };
+  };
+
+  enum TextureType
+  {
+    /**
+     * @brief Base Color Texture Property.
+     * @SINCE_2_2.22
+     * @note This texture represents the base color of the material. In most cases, this will be the diffuse color of the material.
+     */
+    BASE_COLOR,
+
+    /**
+     * @brief Metallic Roughness Texture Property.
+     * @SINCE_2_2.22
+     * @note This texture represents the metallicness and roughness of the material. This texture can be used to make the material look more metallic or rough.
+     */
+    METALLIC_ROUGHNESS,
+
+    /**
+     * @brief Normal Texture Property.
+     * @SINCE_2_2.22
+     * @note This texture represents the surface of the material. This texture can be used to make the surface of the material look smooth or rough.
+     */
+    NORMAL,
+
+    /**
+     * @brief Occlusion Texture Property.
+     * @SINCE_2_2.22
+     * @note This texture represents the depth of the material. This texture can be used to make the material look more three-dimensional.
+     */
+    OCCLUSION,
+
+    /**
+     * @brief Emissive Texture Property.
+     * @SINCE_2_2.22
+     * @note This texture makes the material look like it's emitting light. This texture can be used to make the material look like it's glowing.
+     */
+    EMISSIVE,
+
+    /**
+     * @brief Specular Texture Property.
+     * @SINCE_2_2.22
+     * @note This texture represents the specular reflection of the material. This texture can be used to make the material look more reflective.
+     */
+    SPECULAR,
+
+    /**
+     * @brief Specular Color Texture Property.
+     * @SINCE_2_2.22
+     * @note This texture represents the color of the specular reflection of the material. This texture can be used to set the color of the specular reflection of the material.
+     */
+    SPECULAR_COLOR,
+  };
+
+  enum AlphaModeType
+  {
+    /**
+     * @brief This indicates that the material is fully opaque and that the alpha value should be ignored.
+     * @SINCE_2_2.22
+     */
+    OPAQUE,
+
+    /**
+     * @brief This indicates that the material is either fully opaque or fully transparent depending on the alpha value. The alpha value is used to mask out areas of the material that should be transparent.
+     * @SINCE_2_2.22
+     */
+    MASK,
+
+    /**
+     * @brief This indicates that the material is transparent and that the alpha value should be used to blend the material with the background.
+     * @SINCE_2_2.22
+     */
+    BLEND,
+  };
+
+public: // Creation & Destruction
+  /**
+   * @brief Create an initialized Material.
+   *
+   * @SINCE_2_2.22
+   * @return A handle to a newly allocated Dali resource
+   */
+  static Material New();
+
+  /**
+   * @brief Creates an uninitialized Material.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.22
+   */
+  Material();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.22
+   */
+  ~Material();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.22
+   * @param[in] material Handle to an object
+   */
+  Material(const Material& material);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.22
+   * @param[in] rhs A reference to the moved handle
+   */
+  Material(Material&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.22
+   * @param[in] material Handle to an object
+   * @return reference to this
+   */
+  Material& operator=(const Material& material);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.22
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  Material& operator=(Material&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to Material.
+   *
+   * If handle points to a Material, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.22
+   * @param[in] handle Handle to an object
+   * @return Handle to a Material or an uninitialized handle
+   */
+  static Material DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Sets the value of an existing property.
+   * @note BaseHandle is not subclass of Handle. So this API is not use Handle.SetProperty
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The index of the property
+   * @param[in] propertyValue The new value of the property
+   */
+  void SetProperty(Dali::Property::Index index, Dali::Property::Value propertyValue);
+
+  /**
+   * @brief Retrieves a property value.
+   * @note BaseHandle is not subclass of Handle. So this API is not use Handle.SetProperty
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The index of the property
+   * @return The property value
+   * @note This returns the value set by SetProperty() or the animation target value if it is being animated.
+   */
+  Dali::Property::Value GetProperty(Dali::Property::Index index) const;
+
+  /**
+   * @brief Convenience function for obtaining a property of a known type.
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The index of the property
+   * @return The property value
+   * @pre The property types match i.e. PropertyTypes::Get<T>() is equal to GetPropertyType(index).
+   * @see GetProperty()
+   */
+  template<typename T>
+  T GetProperty(Dali::Property::Index index) const
+  {
+    Dali::Property::Value value = GetProperty(index);
+
+    return T(value.Get<T>());
+  }
+
+  /**
+   * @brief Sets the texture for a given texture type.
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The texture type index
+   * @param[in] texture The texture to set.
+   */
+  void SetTexture(Scene3D::Material::TextureType index, Dali::Texture texture);
+
+  /**
+   * @brief Gets the texture for a given texture type.
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The texture type index
+   * @return The texture at the given index.
+   */
+  Dali::Texture GetTexture(Scene3D::Material::TextureType index);
+
+  /**
+   * @brief Sets the sampler for a given texture type.
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The texture type index
+   * @param[in] sampler The sampler to use for this texture type
+   */
+  void SetSampler(Scene3D::Material::TextureType index, Dali::Sampler sampler);
+
+  /**
+   * @brief Gets the sampler for a given texture type.
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The texture type index
+   * @return The sampler used for this texture type
+   */
+  Dali::Sampler GetSampler(Scene3D::Material::TextureType index);
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The Material implementation
+   */
+  DALI_INTERNAL Material(Dali::Scene3D::Internal::Material* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MATERIAL_H
diff --git a/dali-scene3d/public-api/model-components/model-node.cpp b/dali-scene3d/public-api/model-components/model-node.cpp
new file mode 100644
index 0000000..b1bfa45
--- /dev/null
+++ b/dali-scene3d/public-api/model-components/model-node.cpp
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-components/model-node.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/custom-actor.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-components/model-node-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+ModelNode ModelNode::New()
+{
+  return Scene3D::Internal::ModelNode::New();
+}
+
+ModelNode::ModelNode()
+{
+}
+
+ModelNode::ModelNode(const ModelNode& modelNode) = default;
+
+ModelNode::ModelNode(ModelNode&& rhs) noexcept = default;
+
+ModelNode::~ModelNode()
+{
+}
+
+ModelNode& ModelNode::operator=(const ModelNode& handle) = default;
+
+ModelNode& ModelNode::operator=(ModelNode&& rhs) noexcept = default;
+
+ModelNode ModelNode::DownCast(BaseHandle handle)
+{
+  ModelNode result;
+
+  CustomActor custom = Dali::CustomActor::DownCast(handle);
+  if(custom)
+  {
+    CustomActorImpl& customImpl = custom.GetImplementation();
+
+    Internal::ModelNode* impl = dynamic_cast<Internal::ModelNode*>(&customImpl);
+
+    if(impl)
+    {
+      result = ModelNode(customImpl.GetOwner());
+    }
+  }
+
+  return result;
+}
+
+ModelNode::ModelNode(Internal::ModelNode& implementation)
+: Control(implementation)
+{
+}
+
+ModelNode::ModelNode(Dali::Internal::CustomActor* internal)
+: Control(internal)
+{
+  // Can have a NULL pointer so we only need to check if the internal implementation is our class
+  // when there is a value.
+  if(internal)
+  {
+    DALI_ASSERT_DEBUG(dynamic_cast<Internal::ModelNode*>(&CustomActor(internal).GetImplementation()));
+  }
+}
+
+// Public Method
+
+uint32_t ModelNode::GetModelPrimitiveCount() const
+{
+  return Internal::GetImplementation(*this).GetModelPrimitiveCount();
+}
+
+void ModelNode::AddModelPrimitive(ModelPrimitive modelPrimitive)
+{
+  Internal::GetImplementation(*this).AddModelPrimitive(modelPrimitive, 0u);
+}
+
+void ModelNode::RemoveModelPrimitive(Dali::Scene3D::ModelPrimitive modelPrimitive)
+{
+  Internal::GetImplementation(*this).RemoveModelPrimitive(modelPrimitive);
+}
+
+void ModelNode::RemoveModelPrimitive(uint32_t index)
+{
+  Internal::GetImplementation(*this).RemoveModelPrimitive(index);
+}
+
+ModelPrimitive ModelNode::GetModelPrimitive(uint32_t index) const
+{
+  return Internal::GetImplementation(*this).GetModelPrimitive(index);
+}
+
+ModelNode ModelNode::FindChildModelNodeByName(std::string_view nodeName)
+{
+  return Internal::GetImplementation(*this).FindChildModelNodeByName(nodeName);
+}
+
+void ModelNode::RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const
+{
+  return Internal::GetImplementation(*this).RetrieveBlendShapeNames(blendShapeNames);
+}
+
+Loader::BlendShapes::Index ModelNode::GetBlendShapeIndexByName(std::string_view blendShapeName) const
+{
+  return Internal::GetImplementation(*this).GetBlendShapeIndexByName(blendShapeName);
+}
+
+void ModelNode::SetColliderMesh(std::unique_ptr<Algorithm::ColliderMesh>&& colliderMesh)
+{
+  Internal::GetImplementation(*this).SetColliderMesh(std::move(colliderMesh));
+}
+
+const Algorithm::ColliderMesh& ModelNode::GetColliderMesh()
+{
+  return Internal::GetImplementation(*this).GetColliderMesh();
+}
+
+bool ModelNode::HasColliderMesh() const
+{
+  return Internal::GetImplementation(*this).HasColliderMesh();
+}
+
+void ModelNode::CastShadow(bool castShadow)
+{
+  Internal::GetImplementation(*this).CastShadow(castShadow);
+}
+
+bool ModelNode::IsShadowCasting() const
+{
+  return Internal::GetImplementation(*this).IsShadowCasting();
+}
+
+void ModelNode::ReceiveShadow(bool receiveShadow)
+{
+  Internal::GetImplementation(*this).ReceiveShadow(receiveShadow);
+}
+
+bool ModelNode::IsShadowReceiving() const
+{
+  return Internal::GetImplementation(*this).IsShadowReceiving();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/public-api/model-components/model-node.h b/dali-scene3d/public-api/model-components/model-node.h
new file mode 100644
index 0000000..ab8856e
--- /dev/null
+++ b/dali-scene3d/public-api/model-components/model-node.h
@@ -0,0 +1,304 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali/public-api/common/dali-common.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/algorithm/navigation-mesh.h>
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/blend-shape-details.h> ///< For Loader::BlendShapes::Index
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+namespace Dali
+{
+namespace Scene3D
+{
+// Forward declarations.
+
+namespace Internal
+{
+class ModelNode;
+}
+/**
+ * @addtogroup dali_scene3d_model_components_model_node
+ * @{
+ */
+
+/**
+ * @brief ModelNode is a class for representing the Node of Model in Scene3D.
+ * ModelNode contains multiple ModelPrimitives and allows easy access and modification of Material information that ModelPrimitive has.
+ * If a 3D format file is loaded by Model, ModelNode is created internally to construct the model.
+ * In addition, you can create a Custom ModelNode using ModelPrimitive and Material directly and add it to Model.
+ *
+ * @SINCE_2_2.22
+ *
+ * @code
+ * ModelNode modelNode = ModelNode::New();
+ * ModelPrimitive modelPrimitive = ModelPrimitive::New();
+ * modelNode.AddModelPrimitive(modelPrimitive);
+ *
+ * Material material = Material::New();
+ * modelPrimitive.SetMaterial(material);
+ * material.SetProperty(PropertyIndex, PropertyValue);
+ * @endcode
+ */
+class DALI_SCENE3D_API ModelNode : public Dali::Toolkit::Control
+{
+public:
+  /**
+   * @brief Create an initialized ModelNode.
+   *
+   * @SINCE_2_2.22
+   * @return A handle to a newly allocated Dali resource
+   */
+  static ModelNode New();
+
+  /**
+   * @brief Creates an uninitialized ModelNode.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.22
+   */
+  ModelNode();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.22
+   */
+  ~ModelNode();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelNode Handle to an object
+   */
+  ModelNode(const ModelNode& modelNode);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.22
+   * @param[in] rhs A reference to the moved handle
+   */
+  ModelNode(ModelNode&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelNode Handle to an object
+   * @return reference to this
+   */
+  ModelNode& operator=(const ModelNode& modelNode);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.22
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  ModelNode& operator=(ModelNode&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to ModelNode.
+   *
+   * If handle points to a ModelNode, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.22
+   * @param[in] handle Handle to an object
+   * @return Handle to a ModelNode or an uninitialized handle
+   */
+  static ModelNode DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Gets the number of ModelPrimitives this node has.
+   *
+   * @SINCE_2_2.22
+   * @return The number of ModelPrimitives this node has.
+   */
+  uint32_t GetModelPrimitiveCount() const;
+
+  /**
+   * @brief Appends a ModelPrimitive to this node.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelPrimitive The ModelPrimitive to append.
+   */
+  void AddModelPrimitive(ModelPrimitive modelPrimitive);
+
+  /**
+   * @brief Removes a ModelPrimitive from this node.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelPrimitive The ModelPrimitive to remove.
+   */
+  void RemoveModelPrimitive(ModelPrimitive modelPrimitive);
+
+  /**
+   * @brief Removes a ModelPrimitive from this node by index.
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The index of the ModelPrimitive to remove.
+   */
+  void RemoveModelPrimitive(uint32_t index);
+
+  /**
+   * @brief Gets a ModelPrimitive by index.
+   *
+   * @SINCE_2_2.22
+   * @param[in] index The index of the ModelPrimitive to get.
+   * @return The ModelPrimitive at the given index, or an empty handle if the index is out of range.
+   */
+  ModelPrimitive GetModelPrimitive(uint32_t index) const;
+
+  /**
+   * @brief Returns a child ModelNode object with a name that matches nodeName.
+   *
+   * @SINCE_2_2.34
+   * @param[in] nodeName The name of the child ModelNode object you want to find.
+   * @return Returns a child ModelNode object with a name that matches nodeName. If there is no corresponding child ModelNode object, it returns an empty ModelNode object.
+   */
+  ModelNode FindChildModelNodeByName(std::string_view nodeName);
+
+  /**
+   * @brief Retrieve the list of blendshape name that current ModelNode hold.
+   * The name will be appended end of input list.
+   *
+   * @SINCE_2_2.34
+   * @param[in, out] blendShapeNames The name of blendShape list collected.
+   */
+  void RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const;
+
+  /**
+   * @brief Get the index of blend shape by given name.
+   *
+   * @SINCE_2_2.34
+   * @param[in] blendShapeName The name of blendshape that is not empty.
+   * @return Index of blendshape, or return invalid if there is no blendshape with given name.
+   */
+  Loader::BlendShapes::Index GetBlendShapeIndexByName(std::string_view blendShapeName) const;
+
+  /**
+   * @brief Sets collider mesh on the ModelNode
+   *
+   * The ownership of a collider mesh is taken over by the ModelNode.
+   *
+   * If there was a collider mesh set previously it will be erased.
+   *
+   * To remove collider mesh empty unique_ptr must be passed.
+   *
+   * @SINCE_2_2.53
+   * @param[in] colliderMesh r-value to unique pointer of ColliderMesh
+   */
+  void SetColliderMesh(std::unique_ptr<Algorithm::ColliderMesh>&& colliderMesh);
+
+  /**
+   * @brief Returns associated collider mesh
+   *
+   * HasColliderMesh() must be called to determine whether a valid
+   * collider mesh is associated. Calling GetColliderMesh() without
+   * previous check may produce undefined behaviour.
+   *
+   * @SINCE_2_2.53
+   * @return Associated collider mesh
+   */
+  const Algorithm::ColliderMesh& GetColliderMesh();
+
+  /**
+   * @brief Determines whether there is a valid collider mesh set
+   *
+   * @SINCE_2_2.53
+   * @return True if collider mesh is set, False otherwise
+   */
+  [[nodiscard]] bool HasColliderMesh() const;
+
+  /**
+   * @brief Sets whether this ModelNode casts shadow or not.
+   * If it is true, this ModelNode is drawn on Shadow Map.
+   *
+   * @SINCE_2_3.99
+   * @param[in] castShadow Whether this ModelNode casts shadow or not.
+   * @note This method affects only for this ModelNode.
+   */
+  void CastShadow(bool castShadow);
+
+  /**
+   * @brief Retrieves whether the ModelNode cast shadow or not for Light.
+   *
+   * @SINCE_2_3.99
+   * @return True if this ModelNode cast shadow.
+   * @note IBL does not cast any shadow.
+   */
+  bool IsShadowCasting() const;
+
+  /**
+   * @brief Sets whether this ModelNode receives shadow or not.
+   * If it is true, shadows are drawn on this ModelNode.
+   *
+   * @SINCE_2_3.99
+   * @param[in] receiveShadow Whether this ModelNode receives shadow or not.
+   * @note This method affects only for this ModelNode.
+   */
+  void ReceiveShadow(bool receiveShadow);
+
+  /**
+   * @brief Retrieves whether the ModelNode receives shadow or not for Light.
+   *
+   * @SINCE_2_3.99
+   * @return True if this ModelNode receives shadow.
+   */
+  bool IsShadowReceiving() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The ModelNodel implementation
+   */
+  DALI_INTERNAL ModelNode(Internal::ModelNode& implementation);
+
+  /**
+   * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
+   *
+   * @param[in] internal A pointer to the internal CustomActor
+   */
+  DALI_INTERNAL ModelNode(Dali::Internal::CustomActor* internal);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_H
diff --git a/dali-scene3d/public-api/model-components/model-primitive.cpp b/dali-scene3d/public-api/model-components/model-primitive.cpp
new file mode 100644
index 0000000..eaadc0f
--- /dev/null
+++ b/dali-scene3d/public-api/model-components/model-primitive.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-components/model-primitive.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-components/model-primitive-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+ModelPrimitive ModelPrimitive::New()
+{
+  Internal::ModelPrimitivePtr internal = Internal::ModelPrimitive::New();
+
+  return ModelPrimitive(internal.Get());
+}
+
+ModelPrimitive::ModelPrimitive()
+{
+}
+
+ModelPrimitive::ModelPrimitive(const ModelPrimitive& modelPrimitive) = default;
+
+ModelPrimitive::ModelPrimitive(ModelPrimitive&& rhs) noexcept = default;
+
+ModelPrimitive::~ModelPrimitive()
+{
+}
+
+ModelPrimitive& ModelPrimitive::operator=(const ModelPrimitive& handle) = default;
+
+ModelPrimitive& ModelPrimitive::operator=(ModelPrimitive&& rhs) noexcept = default;
+
+ModelPrimitive ModelPrimitive::DownCast(BaseHandle handle)
+{
+  return ModelPrimitive(dynamic_cast<Dali::Scene3D::Internal::ModelPrimitive*>(handle.GetObjectPtr()));
+}
+
+ModelPrimitive::ModelPrimitive(Dali::Scene3D::Internal::ModelPrimitive* internal)
+: BaseHandle(internal)
+{
+}
+
+// Public Method
+void ModelPrimitive::SetGeometry(Dali::Geometry geometry)
+{
+  GetImplementation(*this).SetGeometry(geometry);
+}
+
+Dali::Geometry ModelPrimitive::GetGeometry() const
+{
+  return GetImplementation(*this).GetGeometry();
+}
+
+void ModelPrimitive::SetMaterial(Dali::Scene3D::Material material)
+{
+  GetImplementation(*this).SetMaterial(material);
+}
+
+Dali::Scene3D::Material ModelPrimitive::GetMaterial() const
+{
+  return GetImplementation(*this).GetMaterial();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
diff --git a/dali-scene3d/public-api/model-components/model-primitive.h b/dali-scene3d/public-api/model-components/model-primitive.h
new file mode 100644
index 0000000..22074e7
--- /dev/null
+++ b/dali-scene3d/public-api/model-components/model-primitive.h
@@ -0,0 +1,184 @@
+#ifndef DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_H
+#define DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/rendering/renderer.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/model-components/material.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+//Forward declarations.
+namespace Internal
+{
+class ModelPrimitive;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_components_model_primitive
+ * @{
+ */
+
+/**
+ * @brief This ModelPrimitive class is required to draw the mesh geometry defined by the user.
+ * Users can set Dali::Geometry and Material to ModelPrimitive using SetGeometry and SetMaterial methods respectively.
+ * When ModelPrimitive added to ModelNode using ModelNode::AddModelPrimitive() method, the Geometry is rendered on the screen according to the Material settings.
+ *
+ * @SINCE_2_2.22
+ *
+ * If you load resources from 3D format files such as glTF using Model class, ModelPrimitive is also created internally.
+ * In this case, blendShape morphing or skeletal animation defined in the format can be used.
+ * However, for the custom ModelPrimitive that is created by user, blendShape morphing or skeletal animation is not supported.
+ */
+class DALI_SCENE3D_API ModelPrimitive : public Dali::BaseHandle
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create an initialized ModelPrimitive.
+   *
+   * @SINCE_2_2.22
+   * @return A handle to a newly allocated Dali resource
+   */
+  static ModelPrimitive New();
+
+  /**
+   * @brief Creates an uninitialized ModelPrimitive.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.22
+   */
+  ModelPrimitive();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.22
+   */
+  ~ModelPrimitive();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelPrimtive Handle to an object
+   */
+  ModelPrimitive(const ModelPrimitive& modelPrimtive);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.22
+   * @param[in] rhs A reference to the moved handle
+   */
+  ModelPrimitive(ModelPrimitive&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.22
+   * @param[in] modelPrimitive Handle to an object
+   * @return reference to this
+   */
+  ModelPrimitive& operator=(const ModelPrimitive& modelPrimitive);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.22
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  ModelPrimitive& operator=(ModelPrimitive&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to ModelPrimitive.
+   *
+   * If handle points to a ModelPrimitive, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.22
+   * @param[in] handle Handle to an object
+   * @return Handle to a ModelPrimitive or an uninitialized handle
+   */
+  static ModelPrimitive DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Set the geometry for this renderer.
+   *
+   * @SINCE_2_2.22
+   * @param[in] geometry The geometry to set.
+   */
+  void SetGeometry(Dali::Geometry geometry);
+
+  /**
+   * @brief Get the geometry for this renderer.
+   *
+   * @SINCE_2_2.22
+   * @return The geometry for this renderer.
+   */
+  Dali::Geometry GetGeometry() const;
+
+  /**
+   * @brief Sets the material for this primitive.
+   *
+   * @SINCE_2_2.22
+   * @param[in] material The material
+   */
+  void SetMaterial(Material material);
+
+  /**
+   * @brief Retrieves a material.
+   *
+   * @SINCE_2_2.22
+   * @return The material handle
+   */
+  Material GetMaterial() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The ModelPrimitive implementation
+   */
+  DALI_INTERNAL ModelPrimitive(Dali::Scene3D::Internal::ModelPrimitive* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_COMPONENTS_MODEL_PRIMITIVE_H
diff --git a/dali-scene3d/public-api/model-motion/motion-data.cpp b/dali-scene3d/public-api/model-motion/motion-data.cpp
new file mode 100644
index 0000000..ee3c246
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-data.cpp
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-motion/motion-data.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-data-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+MotionData MotionData::New()
+{
+  Internal::MotionDataPtr internal = Internal::MotionData::New();
+
+  return MotionData(internal.Get());
+}
+
+MotionData MotionData::New(float durationSeconds)
+{
+  Internal::MotionDataPtr internal = Internal::MotionData::New();
+
+  internal->SetDuration(durationSeconds);
+
+  return MotionData(internal.Get());
+}
+
+MotionData::MotionData()
+{
+}
+
+MotionData::MotionData(const MotionData& motionData) = default;
+
+MotionData::MotionData(MotionData&& rhs) noexcept = default;
+
+MotionData::~MotionData()
+{
+}
+
+MotionData& MotionData::operator=(const MotionData& handle) = default;
+
+MotionData& MotionData::operator=(MotionData&& rhs) noexcept = default;
+
+MotionData MotionData::DownCast(BaseHandle handle)
+{
+  return MotionData(dynamic_cast<Dali::Scene3D::Internal::MotionData*>(handle.GetObjectPtr()));
+}
+
+MotionData::MotionData(Dali::Scene3D::Internal::MotionData* internal)
+: BaseHandle(internal)
+{
+}
+
+// Public Method
+
+uint32_t MotionData::GetMotionCount() const
+{
+  return GetImplementation(*this).GetMotionCount();
+}
+
+MotionIndex MotionData::GetIndex(uint32_t index) const
+{
+  return GetImplementation(*this).GetIndex(index);
+}
+
+MotionValue MotionData::GetValue(uint32_t index) const
+{
+  return GetImplementation(*this).GetValue(index);
+}
+
+void MotionData::Add(MotionIndex index, MotionValue value)
+{
+  GetImplementation(*this).Add(index, value);
+}
+
+void MotionData::Clear()
+{
+  GetImplementation(*this).Clear();
+}
+
+void MotionData::SetDuration(float durationSeconds)
+{
+  GetImplementation(*this).SetDuration(durationSeconds);
+}
+
+float MotionData::GetDuration() const
+{
+  return GetImplementation(*this).GetDuration();
+}
+
+void MotionData::LoadBvh(const std::string& path, const Vector3& scale, bool synchronousLoad)
+{
+  GetImplementation(*this).LoadBvh(path, false, scale, synchronousLoad);
+}
+
+void MotionData::LoadBvh(const std::string& path, bool useRootTranslationOnly, const Vector3& scale, bool synchronousLoad)
+{
+  GetImplementation(*this).LoadBvh(path, useRootTranslationOnly, scale, synchronousLoad);
+}
+
+void MotionData::LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, const Vector3& scale, bool synchronousLoad)
+{
+  GetImplementation(*this).LoadBvhFromBuffer(rawBuffer, rawBufferLength, false, scale, synchronousLoad);
+}
+
+void MotionData::LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool useRootTranslationOnly, const Vector3& scale, bool synchronousLoad)
+{
+  GetImplementation(*this).LoadBvhFromBuffer(rawBuffer, rawBufferLength, useRootTranslationOnly, scale, synchronousLoad);
+}
+
+void MotionData::LoadFacialAnimation(const std::string& url, bool synchronousLoad)
+{
+  GetImplementation(*this).LoadFacialAnimation(url, synchronousLoad);
+}
+
+void MotionData::LoadFacialAnimationFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool synchronousLoad)
+{
+  GetImplementation(*this).LoadFacialAnimationFromBuffer(rawBuffer, rawBufferLength, synchronousLoad);
+}
+
+MotionData::LoadCompletedSignalType& MotionData::LoadCompletedSignal()
+{
+  return GetImplementation(*this).LoadCompletedSignal();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-data.h b/dali-scene3d/public-api/model-motion/motion-data.h
new file mode 100644
index 0000000..cf4e2e6
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-data.h
@@ -0,0 +1,360 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/object/base-handle.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+#include <dali-scene3d/public-api/model-motion/motion-value.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+//Forward declarations.
+namespace Internal
+{
+class MotionData;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_motion_motion_data
+ * @{
+ */
+
+/**
+ * @brief List of model motion definitions.
+ * Each motion has pair of MotionIndex and MotionValue.
+ * MotionIndex is abstract class that specify the target of motion.
+ * MotionValue is target value of motion. It can be KeyFrames.
+ *
+ * We can generate list of motions by MotionIndex and MotionValue classes.
+ *
+ * @code
+ *
+ * MotionData motionData = MotionData::New(3.0f);
+ *
+ * // Make MotionIndex with MotionPropertyIndex
+ * // Make MotionValue with Dali::Property::Value
+ * motionData.Add(MotionPropertyIndex::New("nodeName", "color"), MotionValue::New(Color::RED));
+ *
+ * // Make MotionIndex with MotionTransformIndex
+ * // Make MotionValue with Dali::KeyFrames
+ * KeyFrames keyFrames = KeyFrames::New();
+ * keyFrames.Add(0.0f, 0.0f);
+ * keyFrames.Add(0.0f, 1.0f);
+ * motionData.Add(MotionTransformIndex::New("nodeName", MotionTransformIndex::TransformType::POSITION_X), MotionValue::New(keyFrames));
+ *
+ * // Make MotionIndex with BlendShapeIndex
+ * motionData.Add(BlendShapeIndex::New("nodeName", 0u), motionData.GetValue(1u));
+ *
+ * @endcode
+ *
+ * We can request to load MotionData from file or buffer asynchronously.
+ * If load completed, LoadCompletedSignal will be emitted.
+ * If we try to load before LoadCompletedSignal emitted, previous load request cancel and only latest request loaded.
+ *
+ * @code
+ *
+ * MotionData motionData = MotionData::New();
+ * motionData.LoadCompletedSignal().Connect(&OnLoadCompleted);
+ * motionData.LoadBvh("bvhFilename.bvh", Vector3::ONE);
+ *
+ * @endcode
+ *
+ * We can generate animation of Scene3D::Model from MotionData class.
+ * Or, just set values.
+ *
+ * @code
+ *
+ * // Generate animation from loaded Model
+ * Dali::Animation animation = model.GenerateMotionDataAnimation(motionData);
+ * animation.Play();
+ *
+ * // Set values from loaded Model.
+ * model2.SetMotionData(motionData);
+ *
+ * @endcode
+ * @note We don't check duplicated MotionIndex internally.
+ * @note We don't check MotionValue type is matched with MotionIndex.
+ * @SINCE_2_2.34
+ */
+class DALI_SCENE3D_API MotionData : public Dali::BaseHandle
+{
+public:
+  /// @brief LoadCompleted signal type. @SINCE_2_2.34
+  typedef Signal<void(MotionData)> LoadCompletedSignalType;
+
+public: // Creation & Destruction
+  /**
+   * @brief Create an initialized MotionData.
+   *
+   * @SINCE_2_2.34
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionData New();
+
+  /**
+   * @brief Create an initialized MotionData with duration.
+   *
+   * @SINCE_2_2.34
+   * @param[in] durationSeconds Duration of animation as seconds.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionData New(float durationSeconds);
+
+  /**
+   * @brief Creates an uninitialized MotionData.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.34
+   */
+  MotionData();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.34
+   */
+  ~MotionData();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionData Handle to an object
+   */
+  MotionData(const MotionData& motionData);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   */
+  MotionData(MotionData&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionData Handle to an object
+   * @return reference to this
+   */
+  MotionData& operator=(const MotionData& motionData);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  MotionData& operator=(MotionData&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to MotionData.
+   *
+   * If handle points to a MotionData, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.34
+   * @param[in] handle Handle to an object
+   * @return Handle to a MotionData or an uninitialized handle
+   */
+  static MotionData DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Get the number of motions what we added
+   *
+   * @SINCE_2_2.34
+   * @return The number of motions
+   */
+  uint32_t GetMotionCount() const;
+
+  /**
+   * @brief Get MotionIndex from given index'th.
+   *
+   * @SINCE_2_2.34
+   * @param[in] index The index of motion list.
+   * @return Index of motion, or empty handle if invalid index inputed.
+   */
+  MotionIndex GetIndex(uint32_t index) const;
+
+  /**
+   * @brief Get MotionValue from given index'th.
+   *
+   * @SINCE_2_2.34
+   * @param[in] index The index of motion list.
+   * @return Value of motion, or empty handle if invalid index inputed.
+   */
+  MotionValue GetValue(uint32_t index) const;
+
+  /**
+   * @brief Append new motion.
+   * @note We don't check duplicated MotionIndex internally.
+   *
+   * @SINCE_2_2.34
+   * @param[in] index index of motion.
+   * @param[in] value value of motion.
+   */
+  void Add(MotionIndex index, MotionValue value);
+
+  /**
+   * @brief Clear all stored motion data.
+   *
+   * @SINCE_2_2.34
+   */
+  void Clear();
+
+  /**
+   * @brief Set the duration of this motion data if it be generated as Dali::Animation.
+   *
+   * @SINCE_2_2.34
+   * @param[in] durationSeconds Duration of animation as seconds.
+   */
+  void SetDuration(float durationSeconds);
+
+  /**
+   * @brief Get the duration of this motion data if it be generated as Dali::Animation.
+   *
+   * @SINCE_2_2.34
+   * @return The duration of this motion data seconds. Default is 0.0f
+   */
+  float GetDuration() const;
+
+  /**
+   * @brief Load MotionData from bvh file.
+   * It will use Dali::Scene3D::Loader::LoadBvh() internally.
+   * LoadCompleteSignal() will be emitted after load completed.
+   *
+   * @SINCE_2_2.34
+   * @param[in] path The file path.
+   * @param[in] scale The scale factor to set on the position property manually.
+   * @param[in] synchronousLoad True if we want to load result synchronously. Default is false.
+   */
+  void LoadBvh(const std::string& path, const Vector3& scale = Vector3::ONE, bool synchronousLoad = false);
+
+  /**
+   * @brief Load MotionData from bvh file.
+   * It will use Dali::Scene3D::Loader::LoadBvh() internally.
+   * LoadCompleteSignal() will be emitted after load completed.
+   *
+   * @SINCE_2_2.34
+   * @param[in] path The file path.
+   * @param[in] scale The scale factor to set on the position property manually.
+   * @param[in] useRootTranslationOnly True to use only root translation with rotation animation.
+   * @param[in] synchronousLoad True if we want to load result synchronously. Default is false.
+   */
+  void LoadBvh(const std::string& path, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE, bool synchronousLoad = false);
+
+  /**
+   * @brief Load MotionData from bvh buffer.
+   * It will use Dali::Scene3D::Loader::LoadBvhFromBuffer() internally.
+   * LoadCompleteSignal() will be emitted after load completed.
+   *
+   * @SINCE_2_2.34
+   * @param[in] rawBuffer The bvh buffer containing the facial animation as bvh format string.
+   * @param[in] rawBufferLength The length of buffer.
+   * @param[in] scale The scale factor to set on the position property manually.
+   * @param[in] synchronousLoad True if we want to load result synchronously. Default is false.
+   */
+  void LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, const Vector3& scale = Vector3::ONE, bool synchronousLoad = false);
+
+  /**
+   * @brief Load MotionData from bvh buffer.
+   * It will use Dali::Scene3D::Loader::LoadBvhFromBuffer() internally.
+   * LoadCompleteSignal() will be emitted after load completed.
+   *
+   * @SINCE_2_2.34
+   * @param[in] rawBuffer The bvh buffer containing the facial animation as bvh format string.
+   * @param[in] rawBufferLength The length of buffer.
+   * @param[in] useRootTranslationOnly True to use only root translation with rotation animation.
+   * @param[in] scale The scale factor to set on the position property manually.
+   * @param[in] synchronousLoad True if we want to load result synchronously. Default is false.
+   */
+  void LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE, bool synchronousLoad = false);
+
+  /**
+   * @brief Load MotionData from facial defined json file.
+   * It will use Dali::Scene3D::Loader::LoadFacialAnimation() internally.
+   * LoadCompleteSignal() will be emitted after load completed.
+   *
+   * @SINCE_2_2.34
+   * @param[in] url The file path.
+   * @param[in] synchronousLoad True if we want to load result synchronously. Default is false.
+   */
+  void LoadFacialAnimation(const std::string& url, bool synchronousLoad = false);
+
+  /**
+   * @brief Load MotionData from facial defined json file.
+   * It will use Dali::Scene3D::Loader::LoadFacialAnimationFromBuffer() internally.
+   * LoadCompleteSignal() will be emitted after load completed.
+   *
+   * @SINCE_2_2.34
+   * @param[in] rawBuffer The raw buffer containing the facial animation as json format string.
+   * @param[in] rawBufferLength The length of raw buffer.
+   * @param[in] synchronousLoad True if we want to load result synchronously. Default is false.
+   */
+  void LoadFacialAnimationFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, bool synchronousLoad = false);
+
+public:
+  /**
+   * @brief This signal is emitted after motion data are loaded completed.
+   * @note Signal will be emitted even if we request load synchronously.
+   *
+   * A callback of the following type may be connected:
+   * @code
+   *   void YourCallbackName(MotionData motionData);
+   * @endcode
+   *
+   * @SINCE_2_2.34
+   * @return The signal to connect to.
+   */
+  LoadCompletedSignalType& LoadCompletedSignal();
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The MotionData implementation
+   */
+  DALI_INTERNAL MotionData(Dali::Scene3D::Internal::MotionData* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_DATA_H
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.cpp b/dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.cpp
new file mode 100644
index 0000000..549c80a
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-index/blend-shape-index-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+BlendShapeIndex BlendShapeIndex::New()
+{
+  Internal::BlendShapeIndexPtr internal = Internal::BlendShapeIndex::New();
+
+  return BlendShapeIndex(internal.Get());
+}
+
+BlendShapeIndex BlendShapeIndex::New(Property::Key blendShapeId)
+{
+  Internal::BlendShapeIndexPtr internal = Internal::BlendShapeIndex::New();
+
+  internal->SetBlendShapeId(blendShapeId);
+
+  return BlendShapeIndex(internal.Get());
+}
+
+BlendShapeIndex BlendShapeIndex::New(Property::Key modelNodeId, Property::Key blendShapeId)
+{
+  Internal::BlendShapeIndexPtr internal = Internal::BlendShapeIndex::New();
+
+  internal->SetModelNodeId(modelNodeId);
+  internal->SetBlendShapeId(blendShapeId);
+
+  return BlendShapeIndex(internal.Get());
+}
+
+BlendShapeIndex::BlendShapeIndex()
+{
+}
+
+BlendShapeIndex::BlendShapeIndex(const BlendShapeIndex& blendShapeIndex) = default;
+
+BlendShapeIndex::BlendShapeIndex(BlendShapeIndex&& rhs) noexcept = default;
+
+BlendShapeIndex::~BlendShapeIndex()
+{
+}
+
+BlendShapeIndex& BlendShapeIndex::operator=(const BlendShapeIndex& handle) = default;
+
+BlendShapeIndex& BlendShapeIndex::operator=(BlendShapeIndex&& rhs) noexcept = default;
+
+BlendShapeIndex BlendShapeIndex::DownCast(BaseHandle handle)
+{
+  return BlendShapeIndex(dynamic_cast<Dali::Scene3D::Internal::BlendShapeIndex*>(handle.GetObjectPtr()));
+}
+
+BlendShapeIndex::BlendShapeIndex(Dali::Scene3D::Internal::BlendShapeIndex* internal)
+: MotionIndex(internal)
+{
+}
+
+// Public Method
+
+void BlendShapeIndex::SetBlendShapeId(Property::Key blendShapeId)
+{
+  GetImplementation(*this).SetBlendShapeId(blendShapeId);
+}
+
+Property::Key BlendShapeIndex::GetBlendShapeId() const
+{
+  return GetImplementation(*this).GetBlendShapeId();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h b/dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h
new file mode 100644
index 0000000..4ad77ad
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/blend-shape-index.h
@@ -0,0 +1,207 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_BLEND_SHAPE_INDEX_H
+#define DALI_SCENE3D_MODEL_MOTION_BLEND_SHAPE_INDEX_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+//Forward declarations.
+namespace Internal
+{
+class BlendShapeIndex;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_motion_blend_shape_index
+ * @{
+ */
+
+/**
+ * @brief Specialized MotionIndex to control blend shape.
+ * We can control the blend shape by index (when we set BlendShapeId as IndexKey),
+ * or by name (when we set BlendShapeId as StringKey).
+ *
+ * MotionValue should be float type.
+ *
+ * @code
+ *
+ * BlendShapeIndex blendShapeIndex0 = BlendShapeIndex::New("nodeName", 0u);
+ * BlendShapeIndex blendShapeIndex1 = BlendShapeIndex::New("nodeName", "Target_1");
+ *
+ * // We can change the property later.
+ * BlendShapeIndex blendShapeIndex2 = BlendShapeIndex::New();
+ * blendShapeIndex2.SetModelNodeId("nodeName");
+ * blendShapeIndex2.SetBlendShapeId("Target_2");
+ *
+ * @endcode
+ *
+ * Specially, if ModelNodeId is Property::INVALID_KEY and BlendShapeId is StringKey,
+ * It will control all ModelNode that has the inputed BlendShape name.
+ *
+ * @code
+ *
+ * // If "node0" and "node1" has same BlendShape named "Smile",
+ * // blendShapeIndexAll will control both nodes.
+ * BlendShapeIndex blendShapeIndexAll = BlendShapeIndex::New("Smile");
+ *
+ * BlendShapeIndex blendShapeIndex0 = BlendShapeIndex::New("node0", "Smile");
+ * BlendShapeIndex blendShapeIndex1 = BlendShapeIndex::New("node1", "Smile");
+ *
+ * @endcode
+ *
+ * @SINCE_2_2.34
+ */
+class DALI_SCENE3D_API BlendShapeIndex : public MotionIndex
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create an initialized BlendShapeIndex.
+   *
+   * @SINCE_2_2.34
+   * @return A handle to a newly allocated Dali resource
+   */
+  static BlendShapeIndex New();
+
+  /**
+   * @brief Create an initialized BlendShapeIndex with values. It will hold invalid ModelNodeId.
+   *
+   * @SINCE_2_2.34
+   * @param[in] blendShapeId The id of blend shape what this motion index looks.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static BlendShapeIndex New(Property::Key blendShapeId);
+
+  /**
+   * @brief Create an initialized BlendShapeIndex with values.
+   *
+   * @SINCE_2_2.34
+   * @param[in] modelNodeId The id of model node what this motion index looks.
+   * @param[in] blendShapeId The id of blend shape what this motion index looks.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static BlendShapeIndex New(Property::Key modelNodeId, Property::Key blendShapeId);
+
+  /**
+   * @brief Creates an uninitialized BlendShapeIndex.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.34
+   */
+  BlendShapeIndex();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.34
+   */
+  ~BlendShapeIndex();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.34
+   * @param[in] blendShapeIndex Handle to an object
+   */
+  BlendShapeIndex(const BlendShapeIndex& blendShapeIndex);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   */
+  BlendShapeIndex(BlendShapeIndex&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.34
+   * @param[in] blendShapeIndex Handle to an object
+   * @return reference to this
+   */
+  BlendShapeIndex& operator=(const BlendShapeIndex& blendShapeIndex);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  BlendShapeIndex& operator=(BlendShapeIndex&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to BlendShapeIndex.
+   *
+   * If handle points to a BlendShapeIndex, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.34
+   * @param[in] handle Handle to an object
+   * @return Handle to a BlendShapeIndex or an uninitialized handle
+   */
+  static BlendShapeIndex DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Set the id of BlendShape what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @param[in] blendShapeId The blend shape id.
+   */
+  void SetBlendShapeId(Property::Key blendShapeId);
+
+  /**
+   * @brief Get the id of BlendShape what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @return The blend shape id.
+   */
+  Property::Key GetBlendShapeId() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The BlendShapeIndex implementation
+   */
+  DALI_INTERNAL BlendShapeIndex(Dali::Scene3D::Internal::BlendShapeIndex* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_BLEND_SHAPE_INDEX_H
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/motion-index.cpp b/dali-scene3d/public-api/model-motion/motion-index/motion-index.cpp
new file mode 100644
index 0000000..eaa3ad9
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/motion-index.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-index/motion-index-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+MotionIndex::MotionIndex()
+{
+}
+
+MotionIndex::MotionIndex(const MotionIndex& motionIndex) = default;
+
+MotionIndex::MotionIndex(MotionIndex&& rhs) noexcept = default;
+
+MotionIndex::~MotionIndex()
+{
+}
+
+MotionIndex& MotionIndex::operator=(const MotionIndex& handle) = default;
+
+MotionIndex& MotionIndex::operator=(MotionIndex&& rhs) noexcept = default;
+
+MotionIndex MotionIndex::DownCast(BaseHandle handle)
+{
+  return MotionIndex(dynamic_cast<Dali::Scene3D::Internal::MotionIndex*>(handle.GetObjectPtr()));
+}
+
+MotionIndex::MotionIndex(Dali::Scene3D::Internal::MotionIndex* internal)
+: BaseHandle(internal)
+{
+}
+
+// Public Method
+
+void MotionIndex::SetModelNodeId(Property::Key modelNodeId)
+{
+  GetImplementation(*this).SetModelNodeId(modelNodeId);
+}
+
+Property::Key MotionIndex::GetModelNodeId() const
+{
+  return GetImplementation(*this).GetModelNodeId();
+}
+
+std::string MotionIndex::GetPropertyName(ModelNode node)
+{
+  return GetImplementation(*this).GetPropertyName(node);
+}
+
+Property::Index MotionIndex::GetPropertyIndex(ModelNode node)
+{
+  return GetImplementation(*this).GetPropertyIndex(node);
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/motion-index.h b/dali-scene3d/public-api/model-motion/motion-index/motion-index.h
new file mode 100644
index 0000000..207fe9f
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/motion-index.h
@@ -0,0 +1,176 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_INDEX_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_INDEX_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/property-key.h>
+#include <dali/public-api/object/property.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-components/model-node.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+//Forward declarations.
+namespace Internal
+{
+class MotionIndex;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_motion_motion_index
+ * @{
+ */
+
+/**
+ * @brief Key of motion data to specify what ModelNode's property will be moved.
+ * MotionIndex itself is abstract classes. We need to create New from one of below classes.
+ * - BlendShapeIndex : To control blendshape.
+ * - MotionPropertyIndex : To control the property by Dali::Property.
+ * - MotionTransfromIndex : To control the transform property. Usually be used on CSharp binded API who cannot use Dali::Property directly.
+ * @todo Need to implement ModelNodeId as IndexKey. Currently, StringKey only works well.
+ *
+ * @SINCE_2_2.34
+ */
+class DALI_SCENE3D_API MotionIndex : public Dali::BaseHandle
+{
+public: // Creation & Destruction
+  /**
+   * @brief Creates an uninitialized MotionIndex.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.34
+   */
+  MotionIndex();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.34
+   */
+  ~MotionIndex();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionIndex Handle to an object
+   */
+  MotionIndex(const MotionIndex& motionIndex);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   */
+  MotionIndex(MotionIndex&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionIndex Handle to an object
+   * @return reference to this
+   */
+  MotionIndex& operator=(const MotionIndex& motionIndex);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  MotionIndex& operator=(MotionIndex&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to MotionIndex.
+   *
+   * If handle points to a MotionIndex, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.34
+   * @param[in] handle Handle to an object
+   * @return Handle to a MotionIndex or an uninitialized handle
+   */
+  static MotionIndex DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Set the id of ModelNode what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @param[in] modelNodeId The model node id.
+   */
+  void SetModelNodeId(Property::Key modelNodeId);
+
+  /**
+   * @brief Get the id of ModelNode what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @return The model node id.
+   */
+  Property::Key GetModelNodeId() const;
+
+  /**
+   * @brief Get the property name of this MotionIndex from given ModelNode.
+   *
+   * @SINCE_2_2.34
+   * @param[in] node The model node to get the property name.
+   * @return The name of current property.
+   */
+  std::string GetPropertyName(ModelNode node = ModelNode());
+
+  /**
+   * @brief Get the property index of this MotionIndex from given ModelNode.
+   *
+   * @SINCE_2_2.34
+   * @param[in] node The model node to get the property index.
+   * @return The index of current property.
+   */
+  Property::Index GetPropertyIndex(ModelNode node = ModelNode());
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The MotionIndex implementation
+   */
+  DALI_INTERNAL MotionIndex(Dali::Scene3D::Internal::MotionIndex* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_INDEX_H
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/motion-property-index.cpp b/dali-scene3d/public-api/model-motion/motion-index/motion-property-index.cpp
new file mode 100644
index 0000000..3dc7d76
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/motion-property-index.cpp
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-index/motion-property-index-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+MotionPropertyIndex MotionPropertyIndex::New()
+{
+  Internal::MotionPropertyIndexPtr internal = Internal::MotionPropertyIndex::New();
+
+  return MotionPropertyIndex(internal.Get());
+}
+
+MotionPropertyIndex MotionPropertyIndex::New(Property::Key modelNodeId, Property::Key propertyId)
+{
+  Internal::MotionPropertyIndexPtr internal = Internal::MotionPropertyIndex::New();
+
+  internal->SetModelNodeId(modelNodeId);
+  internal->SetPropertyId(propertyId);
+
+  return MotionPropertyIndex(internal.Get());
+}
+
+MotionPropertyIndex::MotionPropertyIndex()
+{
+}
+
+MotionPropertyIndex::MotionPropertyIndex(const MotionPropertyIndex& motionPropertyIndex) = default;
+
+MotionPropertyIndex::MotionPropertyIndex(MotionPropertyIndex&& rhs) noexcept = default;
+
+MotionPropertyIndex::~MotionPropertyIndex()
+{
+}
+
+MotionPropertyIndex& MotionPropertyIndex::operator=(const MotionPropertyIndex& handle) = default;
+
+MotionPropertyIndex& MotionPropertyIndex::operator=(MotionPropertyIndex&& rhs) noexcept = default;
+
+MotionPropertyIndex MotionPropertyIndex::DownCast(BaseHandle handle)
+{
+  return MotionPropertyIndex(dynamic_cast<Dali::Scene3D::Internal::MotionPropertyIndex*>(handle.GetObjectPtr()));
+}
+
+MotionPropertyIndex::MotionPropertyIndex(Dali::Scene3D::Internal::MotionPropertyIndex* internal)
+: MotionIndex(internal)
+{
+}
+
+// Public Method
+
+void MotionPropertyIndex::SetPropertyId(Property::Key blendShapeId)
+{
+  GetImplementation(*this).SetPropertyId(blendShapeId);
+}
+
+Property::Key MotionPropertyIndex::GetPropertyId() const
+{
+  return GetImplementation(*this).GetPropertyId();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h b/dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h
new file mode 100644
index 0000000..8601a9c
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/motion-property-index.h
@@ -0,0 +1,185 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_PROPERTY_INDEX_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_PROPERTY_INDEX_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+//Forward declarations.
+namespace Internal
+{
+class MotionPropertyIndex;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_motion_motion_property_index
+ * @{
+ */
+
+/**
+ * @brief Basic MotionIndex to control Dali::Property.
+ * It can control more general case.
+ *
+ * @code
+ *
+ * MotionPropertyIndex color = MotionPropertyIndex::New("nodeName", Dali::Actor::Property::COLOR);
+ *
+ * // We can change the property later.
+ * MotionPropertyIndex custom = MotionPropertyIndex::New();
+ * orientation.SetModelNodeId("nodeName");
+ * orientation.SetPropertyId("some_custom_property");
+ *
+ * // Note that all cases of MotionTransformIndex can be controled by MotionPropertyIndex
+ * // Both position0 and position1 can control the node's Position.
+ * MotionTransformIndex position0 = MotionTransformIndex::New("nodeName", MotionTransformIndex::TransformType::POSITION);
+ * MotionPropertyIndex  position1 = MotionPropertyIndex::New("nodeName", Dali::Actor::Property::POSITION);
+ *
+ * @endcode
+ *
+ * @SINCE_2_2.34
+ */
+class DALI_SCENE3D_API MotionPropertyIndex : public MotionIndex
+{
+public: // Creation & Destruction
+  /**
+   * @brief Create an initialized MotionPropertyIndex.
+   *
+   * @SINCE_2_2.34
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionPropertyIndex New();
+
+  /**
+   * @brief Create an initialized MotionPropertyIndex with values.
+   *
+   * @SINCE_2_2.34
+   * @param[in] modelNodeId The id of model node what this motion index looks.
+   * @param[in] propertyId The id of property what this motion index looks.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionPropertyIndex New(Property::Key modelNodeId, Property::Key propertyId);
+
+  /**
+   * @brief Creates an uninitialized MotionPropertyIndex.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.34
+   */
+  MotionPropertyIndex();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.34
+   */
+  ~MotionPropertyIndex();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionPropertyIndex Handle to an object
+   */
+  MotionPropertyIndex(const MotionPropertyIndex& motionPropertyIndex);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   */
+  MotionPropertyIndex(MotionPropertyIndex&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionPropertyIndex Handle to an object
+   * @return reference to this
+   */
+  MotionPropertyIndex& operator=(const MotionPropertyIndex& motionPropertyIndex);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  MotionPropertyIndex& operator=(MotionPropertyIndex&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to MotionPropertyIndex.
+   *
+   * If handle points to a MotionPropertyIndex, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.34
+   * @param[in] handle Handle to an object
+   * @return Handle to a MotionPropertyIndex or an uninitialized handle
+   */
+  static MotionPropertyIndex DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Set the id of property what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @param[in] propertyId The property id.
+   */
+  void SetPropertyId(Property::Key propertyId);
+
+  /**
+   * @brief Get the id of property what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @return The blend shape id.
+   */
+  Property::Key GetPropertyId() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The MotionPropertyIndex implementation
+   */
+  DALI_INTERNAL MotionPropertyIndex(Dali::Scene3D::Internal::MotionPropertyIndex* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_PROPERTY_INDEX_H
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.cpp b/dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.cpp
new file mode 100644
index 0000000..5ea483f
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.cpp
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-index/motion-transform-index-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+MotionTransformIndex MotionTransformIndex::New()
+{
+  Internal::MotionTransformIndexPtr internal = Internal::MotionTransformIndex::New();
+
+  return MotionTransformIndex(internal.Get());
+}
+
+MotionTransformIndex MotionTransformIndex::New(Property::Key modelNodeId, TransformType type)
+{
+  Internal::MotionTransformIndexPtr internal = Internal::MotionTransformIndex::New();
+
+  internal->SetModelNodeId(modelNodeId);
+  internal->SetTransformType(type);
+
+  return MotionTransformIndex(internal.Get());
+}
+
+MotionTransformIndex::MotionTransformIndex()
+{
+}
+
+MotionTransformIndex::MotionTransformIndex(const MotionTransformIndex& motionTransformIndex) = default;
+
+MotionTransformIndex::MotionTransformIndex(MotionTransformIndex&& rhs) noexcept = default;
+
+MotionTransformIndex::~MotionTransformIndex()
+{
+}
+
+MotionTransformIndex& MotionTransformIndex::operator=(const MotionTransformIndex& handle) = default;
+
+MotionTransformIndex& MotionTransformIndex::operator=(MotionTransformIndex&& rhs) noexcept = default;
+
+MotionTransformIndex MotionTransformIndex::DownCast(BaseHandle handle)
+{
+  return MotionTransformIndex(dynamic_cast<Dali::Scene3D::Internal::MotionTransformIndex*>(handle.GetObjectPtr()));
+}
+
+MotionTransformIndex::MotionTransformIndex(Dali::Scene3D::Internal::MotionTransformIndex* internal)
+: MotionIndex(internal)
+{
+}
+
+// Public Method
+
+void MotionTransformIndex::SetTransformType(MotionTransformIndex::TransformType type)
+{
+  GetImplementation(*this).SetTransformType(type);
+}
+
+MotionTransformIndex::TransformType MotionTransformIndex::GetTransformType() const
+{
+  return GetImplementation(*this).GetTransformType();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h b/dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h
new file mode 100644
index 0000000..8dff8f1
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-index/motion-transform-index.h
@@ -0,0 +1,205 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_TRANSFORM_INDEX_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_TRANSFORM_INDEX_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/model-motion/motion-index/motion-index.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+//Forward declarations.
+namespace Internal
+{
+class MotionTransformIndex;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_motion_motion_transform_index
+ * @{
+ */
+
+/**
+ * @brief Specialized MotionIndex to control transform.
+ * It will be used when app developer don't care about Dali::Actor::Property list,
+ * but want to change the transform properties anyway fast enough.
+ *
+ * Each TransformType has their own matched MotionValue type.
+ *
+ * @code
+ *
+ * MotionTransformIndex position = MotionTransformIndex::New("nodeName", MotionTransformIndex::TransformType::POSITION);
+ *
+ * // We can change the property later.
+ * MotionTransformIndex orientation = MotionTransformIndex::New();
+ * orientation.SetModelNodeId("nodeName");
+ * orientation.SetTransformType(MotionTransformIndex::TransformType::ORIENTATION);
+ *
+ * @endcode
+ *
+ * @SINCE_2_2.34
+ */
+class DALI_SCENE3D_API MotionTransformIndex : public MotionIndex
+{
+public:
+  /**
+   * @brief The type of Transform
+   * @SINCE_2_2.34
+   */
+  enum class TransformType
+  {
+    INVALID = -1,
+
+    POSITION = 0, ///< The position of ModelNode. MotionValue should be Vector3.
+    POSITION_X,   ///< The x position of ModelNode. MotionValue should be float.
+    POSITION_Y,   ///< The y position of ModelNode. MotionValue should be float.
+    POSITION_Z,   ///< The z position of ModelNode. MotionValue should be float.
+
+    ORIENTATION, ///< The orientation of ModelNode. MotionValue should be Quaternion.
+
+    SCALE,   ///< The scale of ModelNode. MotionValue should be Vector3.
+    SCALE_X, ///< The x scale of ModelNode. MotionValue should be float.
+    SCALE_Y, ///< The y scale of ModelNode. MotionValue should be float.
+    SCALE_Z, ///< The z scale of ModelNode. MotionValue should be float.
+  };
+
+public: // Creation & Destruction
+  /**
+   * @brief Create an initialized MotionTransformIndex.
+   *
+   * @SINCE_2_2.34
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionTransformIndex New();
+
+  /**
+   * @brief Create an initialized MotionTransformIndex with values.
+   *
+   * @SINCE_2_2.34
+   * @param[in] modelNodeId The id of model node what this motion index looks.
+   * @param[in] type The type of transform what this motion index looks.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionTransformIndex New(Property::Key modelNodeId, TransformType type);
+
+  /**
+   * @brief Creates an uninitialized MotionTransformIndex.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.34
+   */
+  MotionTransformIndex();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.34
+   */
+  ~MotionTransformIndex();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionTransformIndex Handle to an object
+   */
+  MotionTransformIndex(const MotionTransformIndex& motionTransformIndex);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   */
+  MotionTransformIndex(MotionTransformIndex&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionTransformIndex Handle to an object
+   * @return reference to this
+   */
+  MotionTransformIndex& operator=(const MotionTransformIndex& motionTransformIndex);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  MotionTransformIndex& operator=(MotionTransformIndex&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to MotionTransformIndex.
+   *
+   * If handle points to a MotionTransformIndex, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.34
+   * @param[in] handle Handle to an object
+   * @return Handle to a MotionTransformIndex or an uninitialized handle
+   */
+  static MotionTransformIndex DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Set the type of transform what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @param[in] type The type of transform.
+   */
+  void SetTransformType(TransformType type);
+
+  /**
+   * @brief Get the type of transform what this motion index looks.
+   *
+   * @SINCE_2_2.34
+   * @return The type of transform.
+   */
+  TransformType GetTransformType() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The MotionTransformIndex implementation
+   */
+  DALI_INTERNAL MotionTransformIndex(Dali::Scene3D::Internal::MotionTransformIndex* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_TRANSFORM_INDEX_H
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-value.cpp b/dali-scene3d/public-api/model-motion/motion-value.cpp
new file mode 100644
index 0000000..4641a9c
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-value.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-scene3d/public-api/model-motion/motion-value.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/internal/model-motion/motion-value-impl.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+MotionValue MotionValue::New()
+{
+  Internal::MotionValuePtr internal = Internal::MotionValue::New();
+
+  return MotionValue(internal.Get());
+}
+
+MotionValue MotionValue::New(Property::Value propertyValue)
+{
+  Internal::MotionValuePtr internal = Internal::MotionValue::New();
+
+  internal->SetValue(propertyValue);
+
+  return MotionValue(internal.Get());
+}
+
+MotionValue MotionValue::New(KeyFrames keyFrames)
+{
+  Internal::MotionValuePtr internal = Internal::MotionValue::New();
+
+  internal->SetValue(keyFrames);
+
+  return MotionValue(internal.Get());
+}
+
+MotionValue::MotionValue()
+{
+}
+
+MotionValue::MotionValue(const MotionValue& motionValue) = default;
+
+MotionValue::MotionValue(MotionValue&& rhs) noexcept = default;
+
+MotionValue::~MotionValue()
+{
+}
+
+MotionValue& MotionValue::operator=(const MotionValue& handle) = default;
+
+MotionValue& MotionValue::operator=(MotionValue&& rhs) noexcept = default;
+
+MotionValue MotionValue::DownCast(BaseHandle handle)
+{
+  return MotionValue(dynamic_cast<Dali::Scene3D::Internal::MotionValue*>(handle.GetObjectPtr()));
+}
+
+MotionValue::MotionValue(Dali::Scene3D::Internal::MotionValue* internal)
+: BaseHandle(internal)
+{
+}
+
+// Public Method
+
+MotionValue::ValueType MotionValue::GetValueType() const
+{
+  return GetImplementation(*this).GetValueType();
+}
+
+void MotionValue::SetValue(Property::Value propertyValue)
+{
+  GetImplementation(*this).SetValue(propertyValue);
+}
+
+void MotionValue::SetValue(KeyFrames keyFrames)
+{
+  GetImplementation(*this).SetValue(keyFrames);
+}
+
+void MotionValue::Invalidate()
+{
+  Clear();
+}
+
+void MotionValue::Clear()
+{
+  GetImplementation(*this).Clear();
+}
+
+Property::Value MotionValue::GetPropertyValue() const
+{
+  return GetImplementation(*this).GetPropertyValue();
+}
+
+KeyFrames MotionValue::GetKeyFrames() const
+{
+  return GetImplementation(*this).GetKeyFrames();
+}
+
+} // namespace Scene3D
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-scene3d/public-api/model-motion/motion-value.h b/dali-scene3d/public-api/model-motion/motion-value.h
new file mode 100644
index 0000000..39ccbd7
--- /dev/null
+++ b/dali-scene3d/public-api/model-motion/motion-value.h
@@ -0,0 +1,240 @@
+#ifndef DALI_SCENE3D_MODEL_MOTION_MOTION_VALUE_H
+#define DALI_SCENE3D_MODEL_MOTION_MOTION_VALUE_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/key-frames.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/object/property-value.h>
+
+// INTERNAL INCLUDES
+#include <dali-scene3d/public-api/api.h>
+
+namespace Dali
+{
+namespace Scene3D
+{
+//Forward declarations.
+namespace Internal
+{
+class MotionValue;
+} // namespace Internal
+
+/**
+ * @addtogroup dali_scene3d_model_motion_motion_value
+ * @{
+ */
+
+/**
+ * @brief This MotionValue be used for target value of each MotionIndex.
+ * We can get and set MotionValue as 2 types : Property::Value and KeyFrames.
+ *
+ * Each types will be cross-converted internally.
+ * For example, when we set Property::Value, we can get KeyFrames with 2 frames, and target value is setted.
+ *
+ * @note The type of property should be matched with MotionIndex required.
+ * @SINCE_2_2.34
+ */
+class DALI_SCENE3D_API MotionValue : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Determine whether current stored value is PropertyValue, or KeyFrames.
+   * @SINCE_2_2.34
+   */
+  enum class ValueType
+  {
+    INVALID = -1, ///< Value is null, or invalid.
+
+    PROPERTY_VALUE = 0, ///< Value is PropertyValue.
+    KEY_FRAMES,         ///< Value is KeyFrames.
+  };
+
+public: // Creation & Destruction
+  /**
+   * @brief Create an initialized MotionValue.
+   *
+   * @SINCE_2_2.34
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionValue New();
+
+  /**
+   * @brief Create an initialized MotionValue with Property::Value.
+   *
+   * @SINCE_2_2.34
+   * @param[in] propertyValue The static value.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionValue New(Property::Value propertyValue);
+
+  /**
+   * @brief Create an initialized MotionValue with KeyFrames.
+   *
+   * @SINCE_2_2.34
+   * @param[in] keyFrames The keyframes value.
+   * @return A handle to a newly allocated Dali resource
+   */
+  static MotionValue New(KeyFrames keyFrames);
+
+  /**
+   * @brief Creates an uninitialized MotionValue.
+   *
+   * Only derived versions can be instantiated. Calling member
+   * functions with an uninitialized Dali::Object is not allowed.
+   *
+   * @SINCE_2_2.34
+   */
+  MotionValue();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_2.34
+   */
+  ~MotionValue();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionValue Handle to an object
+   */
+  MotionValue(const MotionValue& motionValue);
+
+  /**
+   * @brief Move constructor
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   */
+  MotionValue(MotionValue&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @SINCE_2_2.34
+   * @param[in] motionValue Handle to an object
+   * @return reference to this
+   */
+  MotionValue& operator=(const MotionValue& motionValue);
+
+  /**
+   * @brief Move assignment
+   *
+   * @SINCE_2_2.34
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  MotionValue& operator=(MotionValue&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts an Object handle to MotionValue.
+   *
+   * If handle points to a MotionValue, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @SINCE_2_2.34
+   * @param[in] handle Handle to an object
+   * @return Handle to a MotionValue or an uninitialized handle
+   */
+  static MotionValue DownCast(BaseHandle handle);
+
+public: // Public Method
+  /**
+   * @brief Get the type of value this MotionValue hold.
+   * The type of value will be changed what we set.
+   *
+   * @SINCE_2_2.34
+   * @return Type of value.
+   */
+  ValueType GetValueType() const;
+
+  /**
+   * @brief Set the value as Property::Value type.
+   *
+   * @SINCE_2_2.34
+   * @param[in] propertyValue The static value.
+   */
+  void SetValue(Property::Value propertyValue);
+
+  /**
+   * @brief Set the value as KeyFrames type.
+   *
+   * @SINCE_2_2.34
+   * @param[in] keyFrames The keyframes value.
+   */
+  void SetValue(KeyFrames keyFrames);
+
+  /**
+   * @brief Make value as Invalid type.
+   *
+   * @SINCE_2_2.34
+   */
+  void Invalidate();
+
+  /**
+   * @brief Make value as Invalid type.
+   * @see Dali::Scene3D::MotionValue::Invalidate()
+   *
+   * @SINCE_2_2.34
+   */
+  void Clear();
+
+  /**
+   * @brief Get the value as Property::Value.
+   * If ValueType is KEY_FRAMES, it will return last value of stored KeyFrames.
+   *
+   * @SINCE_2_2.34
+   * @return Property value, or empty if it is invalid.
+   */
+  Property::Value GetPropertyValue() const;
+
+  /**
+   * @brief Get the value as KeyFrames
+   * If ValueType is PROPERTY_VALUE, it will create new KeyFrames by stored Property::Value.
+   *
+   * @SINCE_2_2.34
+   * @return Keyframes handle, or empty if it is invalid.
+   */
+  KeyFrames GetKeyFrames() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Scene3D::Internal implementation.
+   *
+   * @param[in] implementation The MotionValue implementation
+   */
+  DALI_INTERNAL MotionValue(Dali::Scene3D::Internal::MotionValue* implementation);
+  /// @endcond
+};
+
+/**
+ * @}
+ */
+
+} // namespace Scene3D
+
+} // namespace Dali
+
+#endif // DALI_SCENE3D_MODEL_MOTION_MOTION_VALUE_H
\ No newline at end of file
diff --git a/automated-tests/.clang-format b/dali-scene3d/third-party/.clang-format
similarity index 100%
rename from automated-tests/.clang-format
rename to dali-scene3d/third-party/.clang-format
diff --git a/dali-scene-loader/third-party/json.h b/dali-scene3d/third-party/json.h
similarity index 100%
rename from dali-scene-loader/third-party/json.h
rename to dali-scene3d/third-party/json.h
diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h
index 1ec7fa3..edee27e 100644
--- a/dali-toolkit/dali-toolkit.h
+++ b/dali-toolkit/dali-toolkit.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/flex-container/flex-container.h>
+#include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 #include <dali-toolkit/public-api/controls/model3d-view/model3d-view.h>
 #include <dali-toolkit/public-api/controls/progress-bar/progress-bar.h>
@@ -51,20 +52,22 @@
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 #include <dali-toolkit/public-api/controls/video-view/video-view.h>
 
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
+
 #include <dali-toolkit/public-api/image-loader/async-image-loader.h>
+#include <dali-toolkit/public-api/image-loader/image-url.h>
+#include <dali-toolkit/public-api/image-loader/image.h>
 #include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
 
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-
 #include <dali-toolkit/public-api/styling/style-manager.h>
 
 #include <dali-toolkit/public-api/text/text-enumerations.h>
 
 #include <dali-toolkit/public-api/transition/fade-transition.h>
-#include <dali-toolkit/public-api/transition/slide-transition.h>
 #include <dali-toolkit/public-api/transition/scale-transition.h>
-#include <dali-toolkit/public-api/transition/transition.h>
+#include <dali-toolkit/public-api/transition/slide-transition.h>
 #include <dali-toolkit/public-api/transition/transition-set.h>
+#include <dali-toolkit/public-api/transition/transition.h>
 
 #include <dali-toolkit/public-api/visuals/border-visual-properties.h>
 #include <dali-toolkit/public-api/visuals/color-visual-properties.h>
diff --git a/dali-toolkit/devel-api/builder/base64-encoding.cpp b/dali-toolkit/devel-api/builder/base64-encoding.cpp
index 024c1b5..17b823a 100644
--- a/dali-toolkit/devel-api/builder/base64-encoding.cpp
+++ b/dali-toolkit/devel-api/builder/base64-encoding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,12 +75,14 @@ bool DecodeBase64PropertyData(const Property::Value& value, std::vector<uint32_t
 
   if(GetStringFromProperty(value, encodedString))
   {
-    std::vector<unsigned char> outputTmpData;
-    outputTmpData.reserve(ceil(encodedString.size() * 0.75f));
+    std::vector<uint8_t> outputTmpData;
+    // Output required at least ceil(length * 3 / 4)
+    outputData.reserve((encodedString.size() * 3 + 3) / 4);
     bn::decode_b64(encodedString.begin(), encodedString.end(), std::back_inserter(outputTmpData));
 
     outputData.clear();
-    outputData.resize(outputTmpData.size() / sizeof(uint32_t));
+    uint32_t outputSize = (outputTmpData.size() + sizeof(uint32_t) - 1) / sizeof(uint32_t);
+    outputData.resize(outputSize);
     // Treat as a block of data
     memcpy(&outputData[0], &outputTmpData[0], outputTmpData.size());
 
@@ -89,6 +91,31 @@ bool DecodeBase64PropertyData(const Property::Value& value, std::vector<uint32_t
   return decoded;
 }
 
+bool DecodeBase64PropertyData(const Property::Value& value, std::vector<uint8_t>& outputData)
+{
+  bool        decoded = false;
+  std::string encodedString;
+
+  if(GetStringFromProperty(value, encodedString))
+  {
+    // Output required at least ceil(length * 3 / 4)
+    outputData.reserve((encodedString.size() * 3 + 3) / 4);
+    bn::decode_b64(encodedString.begin(), encodedString.end(), std::back_inserter(outputData));
+
+    decoded = true;
+  }
+  return decoded;
+}
+
+bool DecodeBase64FromString(const std::string_view& encodedString, std::vector<uint8_t>& outputData)
+{
+  // Output required at least ceil(length * 3 / 4)
+  outputData.reserve((encodedString.size() * 3 + 3) >> 2);
+  bn::decode_b64(encodedString.begin(), encodedString.end(), std::back_inserter(outputData));
+
+  return true; // Always success.
+}
+
 void EncodeBase64PropertyData(Property::Value& value, const std::vector<uint32_t>& inputData)
 {
   std::ostringstream oss;
@@ -98,11 +125,61 @@ void EncodeBase64PropertyData(Property::Value& value, const std::vector<uint32_t
                  std::ostream_iterator<unsigned char>(oss, ""));
 
   std::string encodedString = oss.str();
+
+  // Add padding
+  int paddingLength = (4 - (encodedString.length() % 4)) % 4;
+  if(paddingLength > 0)
+  {
+    while(paddingLength--)
+    {
+      oss << '=';
+    }
+    encodedString = oss.str();
+  }
+
+  if(encodedString.length() > MAX_PROPERTY_STRING_LENGTH)
+  {
+    // cut string up into blocks of MAX_PROPERTY_STRING_LENGTH and store to an array
+    auto numStrings = (encodedString.length() + MAX_PROPERTY_STRING_LENGTH - 1) / MAX_PROPERTY_STRING_LENGTH;
+
+    Property::Array array;
+    for(auto i = 0u; i < numStrings; ++i)
+    {
+      array.PushBack(encodedString.substr(i * MAX_PROPERTY_STRING_LENGTH, MAX_PROPERTY_STRING_LENGTH));
+    }
+    value = array;
+  }
+  else
+  {
+    value = encodedString;
+  }
+}
+
+void EncodeBase64PropertyData(Property::Value& value, const std::vector<uint8_t>& inputData)
+{
+  std::ostringstream oss;
+
+  bn::encode_b64(reinterpret_cast<const uint8_t*>(&inputData[0]),
+                 reinterpret_cast<const uint8_t*>(&inputData[0] + inputData.size()),
+                 std::ostream_iterator<char>(oss, ""));
+
+  std::string encodedString = oss.str();
+
+  // Add padding
+  int paddingLength = (4 - (encodedString.length() % 4)) % 4;
+  if(paddingLength > 0)
+  {
+    while(paddingLength--)
+    {
+      oss << '=';
+    }
+    encodedString = oss.str();
+  }
+
   if(encodedString.length() > MAX_PROPERTY_STRING_LENGTH)
   {
     // cut string up into blocks of MAX_PROPERTY_STRING_LENGTH and store to an array
-    auto numStrings = encodedString.length() / MAX_PROPERTY_STRING_LENGTH +
-                      ((encodedString.length() % MAX_PROPERTY_STRING_LENGTH) != 0);
+    auto numStrings = (encodedString.length() + MAX_PROPERTY_STRING_LENGTH - 1) / MAX_PROPERTY_STRING_LENGTH;
 
     Property::Array array;
     for(auto i = 0u; i < numStrings; ++i)
diff --git a/dali-toolkit/devel-api/builder/base64-encoding.h b/dali-toolkit/devel-api/builder/base64-encoding.h
index c436c54..566bded 100644
--- a/dali-toolkit/devel-api/builder/base64-encoding.h
+++ b/dali-toolkit/devel-api/builder/base64-encoding.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_BASE64_ENCODING_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,10 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/property.h>
+#include <string_view>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -37,7 +41,32 @@ namespace Toolkit
  * @param[out] outputData The output data block
  * @return True if a data block was decoded successfully.
  */
-bool DecodeBase64PropertyData(const Property::Value& value, std::vector<uint32_t>& outputData);
+DALI_TOOLKIT_API bool DecodeBase64PropertyData(const Property::Value& value, std::vector<uint32_t>& outputData);
+
+/**
+ * @brief Parses a Property::STRING or Property::ARRAY of STRINGS to
+ * retrieve an array of uint8_t data.
+ *
+ * Data can be encoded using the base64 encoding scheme to allow it to be used
+ * in JSON (The property system maps to JSON types).
+ *
+ * @param[in] value The property value to decode
+ * @param[out] outputData The output data block
+ * @return True if a data block was decoded successfully.
+ */
+DALI_TOOLKIT_API bool DecodeBase64PropertyData(const Property::Value& value, std::vector<uint8_t>& outputData);
+
+/**
+ * @brief Parses a std::string_view to retrieve an array of uint8_t data.
+ *
+ * Data can be encoded using the base64 encoding scheme to allow it to be used
+ * in JSON (The property system maps to JSON types).
+ *
+ * @param[in] encodedString The input string to decode
+ * @param[out] outputData The output data block
+ * @return True if a data block was decoded successfully.
+ */
+DALI_TOOLKIT_API bool DecodeBase64FromString(const std::string_view& encodedString, std::vector<uint8_t>& outputData);
 
 /**
  * @brief Convert a block of uint32_t data into a Property::STRING or ARRAY of STRINGs
@@ -46,7 +75,16 @@ bool DecodeBase64PropertyData(const Property::Value& value, std::vector<uint32_t
  * @param[out] value The value to write data into (to avoid copying).
  * @param[in] inputData The input
  */
-void EncodeBase64PropertyData(Property::Value& value, const std::vector<uint32_t>& inputData);
+DALI_TOOLKIT_API void EncodeBase64PropertyData(Property::Value& value, const std::vector<uint32_t>& inputData);
+
+/**
+ * @brief Convert a block of uint8_t data into a Property::STRING or ARRAY of STRINGs
+ * encoded using base64. This allows the data to be mapped to JSON easily.
+ *
+ * @param[out] value The value to write data into (to avoid copying).
+ * @param[in] inputData The input
+ */
+DALI_TOOLKIT_API void EncodeBase64PropertyData(Property::Value& value, const std::vector<uint8_t>& inputData);
 
 } // namespace Toolkit
 
diff --git a/dali-toolkit/devel-api/controls/accessible-impl.cpp b/dali-toolkit/devel-api/controls/accessible-impl.cpp
deleted file mode 100644
index 9f1c78e..0000000
--- a/dali-toolkit/devel-api/controls/accessible-impl.cpp
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "accessible-impl.h"
-
-// EXTERNAL INCLUDES
-#ifdef DGETTEXT_ENABLED
-#include <libintl.h>
-#endif
-
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/devel-api/adaptor-framework/window-devel.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
-#include <dali-toolkit/internal/controls/control/control-data-impl.h>
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-
-namespace Dali::Toolkit::DevelControl
-{
-
-static std::string GetLocaleText(std::string string, const char *domain = "dali-toolkit")
-{
-#ifdef DGETTEXT_ENABLED
-    /*TODO: currently non-localized string is used as a key for translation lookup. In case the lookup key formatting is forced
-          consider calling utility function for converting non-localized string into well-formatted key before lookup. */
-    return dgettext(domain, string.c_str());
-#else
-    return string;
-#endif
-}
-
-AccessibleImpl::AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, bool modal)
-: mSelf(self),
-  mIsModal(modal)
-{
-  auto control = Dali::Toolkit::Control::DownCast(Self());
-
-  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
-  if(controlImpl.mAccessibilityRole == Dali::Accessibility::Role::UNKNOWN)
-  {
-    controlImpl.mAccessibilityRole = role;
-  }
-
-  Self().PropertySetSignal().Connect(&controlImpl, [this, &controlImpl](Dali::Handle& handle, Dali::Property::Index index, Dali::Property::Value value) {
-    if(this->Self() != Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor())
-    {
-      return;
-    }
-
-    if(index == DevelControl::Property::ACCESSIBILITY_NAME || (index == GetNamePropertyIndex() && !controlImpl.mAccessibilityNameSet))
-    {
-      if(controlImpl.mAccessibilityGetNameSignal.Empty())
-      {
-        Emit(Dali::Accessibility::ObjectPropertyChangeEvent::NAME);
-      }
-    }
-
-    if(index == DevelControl::Property::ACCESSIBILITY_DESCRIPTION || (index == GetDescriptionPropertyIndex() && !controlImpl.mAccessibilityDescriptionSet))
-    {
-      if(controlImpl.mAccessibilityGetDescriptionSignal.Empty())
-      {
-        Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION);
-      }
-    }
-  });
-}
-
-std::string AccessibleImpl::GetName()
-{
-  auto control = Dali::Toolkit::Control::DownCast(Self());
-
-  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
-  std::string name;
-
-  if(!controlImpl.mAccessibilityGetNameSignal.Empty())
-  {
-    controlImpl.mAccessibilityGetNameSignal.Emit(name);
-  }
-  else if(controlImpl.mAccessibilityNameSet)
-  {
-    name = controlImpl.mAccessibilityName;
-  }
-  else if(auto raw = GetNameRaw(); !raw.empty())
-  {
-    name = raw;
-  }
-  else
-  {
-    name = Self().GetProperty<std::string>(Actor::Property::NAME);
-  }
-
-  if(controlImpl.mAccessibilityTranslationDomainSet)
-  {
-    return GetLocaleText(name, controlImpl.mAccessibilityTranslationDomain.c_str());
-  }
-
-  return GetLocaleText(name);
-}
-
-std::string AccessibleImpl::GetNameRaw()
-{
-  return {};
-}
-
-std::string AccessibleImpl::GetDescription()
-{
-  auto control = Dali::Toolkit::Control::DownCast(Self());
-
-  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
-  std::string description;
-
-  if(!controlImpl.mAccessibilityGetDescriptionSignal.Empty())
-  {
-    controlImpl.mAccessibilityGetDescriptionSignal.Emit(description);
-  }
-  else if(controlImpl.mAccessibilityDescriptionSet)
-  {
-    description = controlImpl.mAccessibilityDescription;
-  }
-  else
-  {
-    description = GetDescriptionRaw();
-  }
-  if(controlImpl.mAccessibilityTranslationDomainSet)
-  {
-    return GetLocaleText(description, controlImpl.mAccessibilityTranslationDomain.c_str());
-  }
-
-  return GetLocaleText(description);
-}
-
-std::string AccessibleImpl::GetDescriptionRaw()
-{
-  return {};
-}
-
-Dali::Accessibility::Accessible* AccessibleImpl::GetParent()
-{
-  return Dali::Accessibility::Accessible::Get(Self().GetParent());
-}
-
-size_t AccessibleImpl::GetChildCount()
-{
-  return Self().GetChildCount();
-}
-
-Dali::Accessibility::Accessible* AccessibleImpl::GetChildAtIndex(size_t index)
-{
-  return Dali::Accessibility::Accessible::Get(Self().GetChildAt(static_cast<unsigned int>(index)));
-}
-
-size_t AccessibleImpl::GetIndexInParent()
-{
-  auto self = Self();
-  auto parent = self.GetParent();
-  DALI_ASSERT_ALWAYS(parent && "can't call GetIndexInParent on object without parent");
-
-  auto count = parent.GetChildCount();
-  for(auto i = 0u; i < count; ++i)
-  {
-    auto child = parent.GetChildAt(i);
-    if(child == self)
-    {
-      return i;
-    }
-  }
-  DALI_ASSERT_ALWAYS(false && "object isn't child of it's parent");
-  return static_cast<size_t>(-1);
-}
-
-Dali::Accessibility::Role AccessibleImpl::GetRole()
-{
-  return Self().GetProperty<Dali::Accessibility::Role>(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE);
-}
-
-std::string AccessibleImpl::GetLocalizedRoleName()
-{
-  return GetLocaleText(GetRoleName());
-}
-
-bool AccessibleImpl::IsShowing()
-{
-  Dali::Actor self = Self();
-  if(self.GetProperty(Dali::DevelActor::Property::CULLED).Get<bool>() || !self.GetCurrentProperty<bool>(Actor::Property::VISIBLE))
-  {
-    return false;
-  }
-
-  auto* child  = this;
-  auto* parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(child->GetParent());
-  if(!parent)
-  {
-    return true;
-  }
-
-  auto childExtent = child->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
-  while(parent)
-  {
-    auto control      = Dali::Toolkit::Control::DownCast(parent->Self());
-    auto clipMode     = control.GetProperty(Actor::Property::CLIPPING_MODE).Get<bool>();
-    auto parentExtent = parent->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
-    if ((clipMode != ClippingMode::DISABLED) && !parentExtent.Intersects(childExtent))
-    {
-      return false;
-    }
-    parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(parent->GetParent());
-  }
-
-  return true;
-}
-
-Dali::Accessibility::States AccessibleImpl::CalculateStates()
-{
-  Dali::Actor self = Self();
-  Dali::Accessibility::States state;
-  state[Dali::Accessibility::State::FOCUSABLE] = self.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE);
-  state[Dali::Accessibility::State::FOCUSED]   = Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor() == self;
-
-  if(self.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE).GetType() == Dali::Property::NONE)
-  {
-    state[Dali::Accessibility::State::HIGHLIGHTABLE] = false;
-  }
-  else
-  {
-    state[Dali::Accessibility::State::HIGHLIGHTABLE] = self.GetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE).Get<bool>();
-  }
-
-  state[Dali::Accessibility::State::HIGHLIGHTED] = GetCurrentlyHighlightedActor() == self;
-  state[Dali::Accessibility::State::ENABLED]     = true;
-  state[Dali::Accessibility::State::SENSITIVE]   = true;
-  state[Dali::Accessibility::State::VISIBLE]     = true;
-
-  if(mIsModal)
-  {
-    state[Dali::Accessibility::State::MODAL] = true;
-  }
-  state[Dali::Accessibility::State::SHOWING] = IsShowing();
-  state[Dali::Accessibility::State::DEFUNCT] = !self.GetProperty(Dali::DevelActor::Property::CONNECTED_TO_SCENE).Get<bool>();
-  return state;
-}
-
-Dali::Accessibility::States AccessibleImpl::GetStates()
-{
-  return CalculateStates();
-}
-
-Dali::Accessibility::Attributes AccessibleImpl::GetAttributes()
-{
-  std::unordered_map<std::string, std::string> attributeMap;
-  auto control = Dali::Toolkit::Control::DownCast(Self());
-  auto attribute = control.GetProperty(Dali::Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
-  auto map = attribute.GetMap();
-
-  if(map)
-  {
-    auto mapSize = map->Count();
-
-    for(unsigned int i = 0; i < mapSize; i++)
-    {
-      auto mapKey = map->GetKeyAt(i);
-      if(mapKey.type == Dali::Property::Key::STRING)
-      {
-        std::string mapValue;
-        if(map->GetValue(i).Get(mapValue))
-        {
-          attributeMap.emplace(std::move(mapKey.stringKey), std::move(mapValue));
-        }
-      }
-    }
-  }
-
-  return attributeMap;
-}
-
-Dali::Accessibility::ComponentLayer AccessibleImpl::GetLayer()
-{
-  return Dali::Accessibility::ComponentLayer::WINDOW;
-}
-
-Dali::Rect<> AccessibleImpl::GetExtents(Dali::Accessibility::CoordinateType type)
-{
-  Dali::Actor self = Self();
-
-  Vector2 screenPosition = self.GetProperty(Dali::DevelActor::Property::SCREEN_POSITION).Get<Vector2>();
-  auto size = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE) * self.GetCurrentProperty<Vector3>(Actor::Property::WORLD_SCALE);
-  bool positionUsesAnchorPoint = self.GetProperty(Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT).Get<bool>();
-  Vector3 anchorPointOffSet = size * (positionUsesAnchorPoint ? self.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
-  Vector2 position = Vector2((screenPosition.x - anchorPointOffSet.x), (screenPosition.y - anchorPointOffSet.y));
-
-  if(type == Dali::Accessibility::CoordinateType::WINDOW)
-  {
-    return {position.x, position.y, size.x, size.y};
-  }
-  else // Dali::Accessibility::CoordinateType::SCREEN
-  {
-    auto window = Dali::DevelWindow::Get(self);
-    auto windowPosition = window.GetPosition();
-    return {position.x + windowPosition.GetX(), position.y + windowPosition.GetY(), size.x, size.y};
-  }
-}
-
-int16_t AccessibleImpl::GetMdiZOrder()
-{
-  return 0;
-}
-double AccessibleImpl::GetAlpha()
-{
-  return 0;
-}
-
-bool AccessibleImpl::GrabFocus()
-{
-  return Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor(Self());
-}
-
-static Dali::Actor CreateHighlightIndicatorActor()
-{
-  std::string focusBorderImagePath(AssetManager::GetDaliImagePath());
-  focusBorderImagePath += "/keyboard_focus.9.png";
-
-  // Create the default if it hasn't been set and one that's shared by all the
-  // keyboard focusable actors
-  auto actor = Toolkit::ImageView::New(focusBorderImagePath);
-  actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-
-  DevelControl::AppendAccessibilityAttribute(actor, "highlight", std::string());
-  actor.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, false);
-
-  return actor;
-}
-
-void AccessibleImpl::ScrollToSelf()
-{
-  auto* child = this;
-  auto* parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(child->GetParent());
-
-  while (parent)
-  {
-    if (parent->IsScrollable())
-    {
-      parent->ScrollToChild(child->Self());
-    }
-
-    child = parent;
-    parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(parent->GetParent());
-  }
-}
-
-void AccessibleImpl::RegisterPositionPropertyNotification()
-{
-  auto                     control         = Dali::Toolkit::Control::DownCast(Self());
-  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
-  controlImpl.RegisterAccessibilityPositionPropertyNotification();
-}
-
-void AccessibleImpl::UnregisterPositionPropertyNotification()
-{
-  auto                     control         = Dali::Toolkit::Control::DownCast(Self());
-  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
-  controlImpl.UnregisterAccessibilityPositionPropertyNotification();
-}
-
-bool AccessibleImpl::GrabHighlight()
-{
-  Dali::Actor self = Self();
-  auto oldHighlightedActor = GetCurrentlyHighlightedActor();
-
-  if(!Dali::Accessibility::IsUp())
-  {
-    return false;
-  }
-
-  if(self == oldHighlightedActor)
-  {
-    return true;
-  }
-
-  // Clear the old highlight.
-  if(oldHighlightedActor)
-  {
-    auto oldHighlightObject = dynamic_cast<Dali::Accessibility::Component*>(Internal::Control::Impl::GetAccessibilityObject(oldHighlightedActor));
-    if(oldHighlightObject)
-    {
-      oldHighlightObject->ClearHighlight();
-    }
-  }
-
-  auto highlight = GetHighlightActor();
-  if(!highlight)
-  {
-    highlight = CreateHighlightIndicatorActor();
-    SetHighlightActor(highlight);
-  }
-
-  highlight.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  highlight.SetProperty(Actor::Property::POSITION_Z, 1.0f);
-  highlight.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
-
-  // Need to set resize policy again, to update SIZE property which is set by
-  // AccessibleImpl_NUI. The highlight could move from AccessibleImpl_NUI to
-  // AccessibleImpl. In this case, highlight has incorrect size.
-  highlight.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-
-  // Remember the highlight actor, so that when the default is changed with
-  // SetHighlightActor(), the currently displayed highlight can still be cleared.
-  mCurrentHighlightActor = highlight;
-  ScrollToSelf();
-  self.Add(highlight);
-  SetCurrentlyHighlightedActor(self);
-  EmitHighlighted(true);
-  RegisterPositionPropertyNotification();
-
-  return true;
-}
-
-bool AccessibleImpl::ClearHighlight()
-{
-  Dali::Actor self = Self();
-
-  if(!Dali::Accessibility::IsUp())
-  {
-    return false;
-  }
-
-  if(GetCurrentlyHighlightedActor() == self)
-  {
-    UnregisterPositionPropertyNotification();
-    self.Remove(mCurrentHighlightActor.GetHandle());
-    mCurrentHighlightActor = {};
-    SetCurrentlyHighlightedActor({});
-    EmitHighlighted(false);
-    return true;
-  }
-  return false;
-}
-
-std::string AccessibleImpl::GetActionName(size_t index)
-{
-  if(index >= GetActionCount())
-  {
-    return {};
-  }
-
-  Dali::TypeInfo type;
-  Self().GetTypeInfo(type);
-  DALI_ASSERT_ALWAYS(type && "no TypeInfo object");
-  return type.GetActionName(index);
-}
-
-std::string AccessibleImpl::GetLocalizedActionName(size_t index)
-{
-  return GetLocaleText(GetActionName(index));
-}
-
-std::string AccessibleImpl::GetActionDescription(size_t index)
-{
-  return {};
-}
-
-size_t AccessibleImpl::GetActionCount()
-{
-  Dali::TypeInfo type;
-  Self().GetTypeInfo(type);
-  DALI_ASSERT_ALWAYS(type && "no TypeInfo object");
-  return type.GetActionCount();
-}
-
-std::string AccessibleImpl::GetActionKeyBinding(size_t index)
-{
-  return {};
-}
-
-bool AccessibleImpl::DoAction(size_t index)
-{
-  std::string actionName = GetActionName(index);
-  return Self().DoAction(actionName, {});
-}
-
-bool AccessibleImpl::DoAction(const std::string& name)
-{
-  return Self().DoAction(name, {});
-}
-
-bool AccessibleImpl::DoGesture(const Dali::Accessibility::GestureInfo& gestureInfo)
-{
-  auto control = Dali::Toolkit::Control::DownCast(Self());
-
-  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
-
-  if(!controlImpl.mAccessibilityDoGestureSignal.Empty())
-  {
-    auto ret = std::make_pair(gestureInfo, false);
-    controlImpl.mAccessibilityDoGestureSignal.Emit(ret);
-    return ret.second;
-  }
-
-  return false;
-}
-
-std::vector<Dali::Accessibility::Relation> AccessibleImpl::GetRelationSet()
-{
-  auto control = Dali::Toolkit::Control::DownCast(Self());
-
-  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
-
-  std::vector<Dali::Accessibility::Relation> ret;
-
-  auto& relation = controlImpl.mAccessibilityRelations;
-  for(auto i = 0u; i < relation.size(); ++i)
-  {
-    if(relation[i].empty()) continue;
-
-    ret.emplace_back(Accessibility::Relation{static_cast<Accessibility::RelationType>(i), relation[i]});
-  }
-
-  return ret;
-}
-
-bool AccessibleImpl::ScrollToChild(Actor child)
-{
-  return false;
-}
-
-Dali::Property::Index AccessibleImpl::GetNamePropertyIndex()
-{
-  return Actor::Property::NAME;
-}
-
-Dali::Property::Index AccessibleImpl::GetDescriptionPropertyIndex()
-{
-  return Dali::Property::INVALID_INDEX;
-}
-
-void AccessibleImpl::SetLastPosition(Vector2 position)
-{
-  mLastPosition = position;
-}
-
-Vector2 AccessibleImpl::GetLastPosition() const
-{
-  return mLastPosition;
-}
-
-} // namespace Dali::Toolkit::DevelControl
diff --git a/dali-toolkit/devel-api/controls/accessible-impl.h b/dali-toolkit/devel-api/controls/accessible-impl.h
deleted file mode 100644
index aa5084a..0000000
--- a/dali-toolkit/devel-api/controls/accessible-impl.h
+++ /dev/null
@@ -1,264 +0,0 @@
-#ifndef DALI_TOOLKIT_ACCESSIBLE_IMPL_H
-#define DALI_TOOLKIT_ACCESSIBLE_IMPL_H
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
-#include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/public-api/object/weak-handle.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
-
-namespace Dali::Toolkit::DevelControl {
-
-/**
- * @brief Represents the Accessible object for Dali::Toolkit::Control and derived classes
- *
- * You can create a derived class (and register it using SetAccessibilityConstructor)
- * in order to customize Accessibility for a given control.
- *
- * @see Dali::Toolkit::DevelControl::SetAccessibilityConstructor
- * @see Dali::Accessibility::Accessible
- * @see Dali::Accessibility::Component
- * @see Dali::Accessibility::Collection
- * @see Dali::Accessibility::Action
- * @see Dali::Accessibility::Value
- * @see Dali::Accessibility::Text
- * @see Dali::Accessibility::EditableText
- */
-struct DALI_TOOLKIT_API AccessibleImpl : public virtual Dali::Accessibility::Accessible,
-                                         public virtual Dali::Accessibility::Component,
-                                         public virtual Dali::Accessibility::Collection,
-                                         public virtual Dali::Accessibility::Action
-{
-protected:
-  Vector2                       mLastPosition{0.0f, 0.0f};
-  Dali::WeakHandle<Dali::Actor> mSelf;
-  Dali::WeakHandle<Dali::Actor> mCurrentHighlightActor;
-  bool mIsModal = false;
-  bool mIsRoot = false;
-
-  Dali::Actor Self()
-  {
-    auto handle = mSelf.GetHandle();
-
-    // Control::Impl holds a std::unique_ptr to the Accessible object,
-    // so that one does not outlive the other.
-    DALI_ASSERT_ALWAYS(handle);
-
-    return handle;
-  }
-
-  void ScrollToSelf();
-
-  /**
-   * @brief Register property notification to check highlighted object position
-   */
-  void RegisterPositionPropertyNotification();
-
-  /**
-   * @brief Remove property notification added by RegisterPropertyNotification
-   */
-  void UnregisterPositionPropertyNotification();
-
-  /**
-   * @brief Check if the actor is showing
-   * @return True if the actor is showing
-   */
-  bool IsShowing();
-
-public:
-  AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, bool modal = false);
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetName()
-   */
-  std::string GetName() override;
-
-  /**
-   * @brief Returns the actor's name in the absence of ACCESSIBILITY_NAME property
-   */
-  virtual std::string GetNameRaw();
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetDescription()
-   */
-  std::string GetDescription() override;
-
-  /**
-   * @brief Returns the actor's description in the absence of ACCESSIBILITY_DESCRIPTION property
-   */
-  virtual std::string GetDescriptionRaw();
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetParent()
-   */
-  Dali::Accessibility::Accessible* GetParent() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetChildCount()
-   */
-  size_t GetChildCount() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetChildAtIndex()
-   */
-  Dali::Accessibility::Accessible* GetChildAtIndex(size_t index) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetIndexInParent()
-   */
-  size_t GetIndexInParent() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetRole()
-   */
-  Dali::Accessibility::Role GetRole() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetLocalizedRoleName()
-   */
-  std::string GetLocalizedRoleName() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetStates()
-   */
-  Dali::Accessibility::States GetStates() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetAttributes()
-   */
-  Dali::Accessibility::Attributes GetAttributes() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Component::GetExtents()
-   */
-  Dali::Rect<> GetExtents(Accessibility::CoordinateType type) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Component::GetLayer()
-   */
-  Dali::Accessibility::ComponentLayer GetLayer() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Component::GetMdiZOrder()
-   */
-  int16_t GetMdiZOrder() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Component::GrabFocus()
-   */
-  bool GrabFocus() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Component::GetAlpha()
-   */
-  double GetAlpha() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Component::GrabHighlight()
-   */
-  bool GrabHighlight() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Component::ClearHighlight()
-   */
-  bool ClearHighlight() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Action::GetActionName()
-   */
-  std::string GetActionName(size_t index) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Action::GetLocalizedActionName()
-   */
-  std::string GetLocalizedActionName(size_t index) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Action::GetActionDescription()
-   */
-  std::string GetActionDescription(size_t index) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Action::GetActionCount()
-   */
-  size_t GetActionCount() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Action::GetActionKeyBinding()
-   */
-  std::string GetActionKeyBinding(size_t index) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Action::DoAction(size_t)
-   */
-  bool DoAction(size_t index) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Action::DoAction(const std::string&)
-   */
-  bool DoAction(const std::string& name) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::DoGesture()
-   */
-  bool DoGesture(const Dali::Accessibility::GestureInfo& gestureInfo) override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetRelationSet()
-   */
-  std::vector<Dali::Accessibility::Relation> GetRelationSet() override;
-
-  /**
-   * @copydoc Dali::Accessibility::Accessible::GetStates()
-   */
-  virtual Dali::Accessibility::States CalculateStates();
-
-  /**
-   * @brief Makes sure that a given child of this container (e.g. ItemView) is visible
-   * @return false if scrolling is not supported or child is already visible
-   */
-  virtual bool ScrollToChild(Actor child);
-
-  /**
-   * @brief Returns the index of the property that represents this actor's name
-   */
-  virtual Dali::Property::Index GetNamePropertyIndex();
-
-  /**
-   * @brief Returns the index of the property that represents this actor's description
-   */
-  virtual Dali::Property::Index GetDescriptionPropertyIndex();
-
-  /**
-   * @brief Sets last object position
-   * @param[in] position Last object position
-   */
-  void SetLastPosition(Vector2 position);
-
-  /**
-   * @brief Gets last object position
-   * @return The Last object position
-   */
-  Vector2 GetLastPosition() const;
-};
-
-} // namespace Dali::Toolkit::DevelControl
-
-#endif // DALI_TOOLKIT_ACCESSIBLE_IMPL_H
diff --git a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp
index 4c2a099..89e8c16 100644
--- a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp
+++ b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,19 +33,13 @@ BloomView::~BloomView()
 {
 }
 
-BloomView::BloomView(const BloomView& handle)
-: Control(handle)
-{
-}
+BloomView::BloomView(const BloomView& handle) = default;
 
-BloomView& BloomView::operator=(const BloomView& rhs)
-{
-  if(&rhs != this)
-  {
-    Control::operator=(rhs);
-  }
-  return *this;
-}
+BloomView& BloomView::operator=(const BloomView& rhs) = default;
+
+BloomView::BloomView(BloomView&& handle) = default;
+
+BloomView& BloomView::operator=(BloomView&& rhs) = default;
 
 BloomView BloomView::New()
 {
diff --git a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h
index 1ea7ee4..1356d28 100644
--- a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h
+++ b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_BLOOM_VIEW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,13 +98,29 @@ public:
 
   /**
    * Copy constructor. Creates another handle that points to the same real object
+   * @param[in] handle The handle to copy from.
    */
   BloomView(const BloomView& handle);
 
   /**
    * Assignment operator. Changes this handle to point to another real object
+   * @param[in] handle The handle to copy from.
+   * @return reference to this
    */
-  BloomView& operator=(const BloomView& ZoomView);
+  BloomView& operator=(const BloomView& handle);
+
+  /**
+   * Move constructor. Creates another handle that points to the same real object
+   * @param[in] handle The handle to move from.
+   */
+  BloomView(BloomView&& handle);
+
+  /**
+   * Move assignment operator. Changes this handle to point to another real object
+   * @param[in] handle The handle to move from.
+   * @return reference to this
+   */
+  BloomView& operator=(BloomView&& handle);
 
   /**
    * @brief Destructor
diff --git a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp
index 530ff29..56568fc 100644
--- a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp
+++ b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,19 +52,13 @@ BubbleEmitter BubbleEmitter::New(const Vector2& winSize,
   return Internal::BubbleEmitter::New(winSize, shapeTexture, maximumNumberOfBubble, bubbleSizeRange);
 }
 
-BubbleEmitter::BubbleEmitter(const BubbleEmitter& handle)
-: Control(handle)
-{
-}
+BubbleEmitter::BubbleEmitter(const BubbleEmitter& handle) = default;
 
-BubbleEmitter& BubbleEmitter::operator=(const BubbleEmitter& rhs)
-{
-  if(&rhs != this)
-  {
-    Control::operator=(rhs);
-  }
-  return *this;
-}
+BubbleEmitter& BubbleEmitter::operator=(const BubbleEmitter& rhs) = default;
+
+BubbleEmitter::BubbleEmitter(BubbleEmitter&& handle) = default;
+
+BubbleEmitter& BubbleEmitter::operator=(BubbleEmitter&& rhs) = default;
 
 BubbleEmitter BubbleEmitter::DownCast(BaseHandle handle)
 {
diff --git a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h
index d4381fa..7a12d1e 100644
--- a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h
+++ b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_BUBBLE_EMMITER_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,6 +84,23 @@ public:
   BubbleEmitter& operator=(const BubbleEmitter& rhs);
 
   /**
+   * @brief Move constructor.
+   *
+   * Creates another handle that points to the same real object
+   * @param[in] handle The handle to move
+   */
+  BubbleEmitter(BubbleEmitter&& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * Changes this handle to point to another real object
+   * @param[in] rhs The object to point at
+   * @return A reference to this
+   */
+  BubbleEmitter& operator=(BubbleEmitter&& rhs);
+
+  /**
    * @brief Downcast an Object handle to SuperBlurView.
    *
    * If handle points to a BubbleEmitter, the downcast produces valid handle.
diff --git a/dali-toolkit/devel-api/controls/canvas-view/canvas-view.h b/dali-toolkit/devel-api/controls/canvas-view/canvas-view.h
index 64e1397..026d3fa 100644
--- a/dali-toolkit/devel-api/controls/canvas-view/canvas-view.h
+++ b/dali-toolkit/devel-api/controls/canvas-view/canvas-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CANVAS_VIEW_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 #include <dali-toolkit/public-api/controls/control.h>
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
 
 namespace Dali
 {
@@ -83,6 +83,12 @@ public:
        * @details Name "viewBox", type Property::VECTOR2.
        */
       VIEW_BOX = PROPERTY_START_INDEX,
+
+      /**
+       * @brief Whether to load the canvas synchronously.
+       * @details Name "synchronousLoading", type Property::BOOLEAN.
+       */
+      SYNCHRONOUS_LOADING,
     };
   };
 public:
diff --git a/dali-toolkit/devel-api/controls/control-accessible.cpp b/dali-toolkit/devel-api/controls/control-accessible.cpp
new file mode 100644
index 0000000..8788ade
--- /dev/null
+++ b/dali-toolkit/devel-api/controls/control-accessible.cpp
@@ -0,0 +1,492 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include "control-accessible.h"
+
+// EXTERNAL INCLUDES
+#ifdef DGETTEXT_ENABLED
+#include <libintl.h>
+#endif
+
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/public-api/object/type-info.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
+
+namespace Dali::Toolkit::DevelControl
+{
+namespace
+{
+static std::string GetLocaleText(std::string string, const char* domain = "dali-toolkit")
+{
+#ifdef DGETTEXT_ENABLED
+  /*TODO: currently non-localized string is used as a key for translation lookup. In case the lookup key formatting is forced
+          consider calling utility function for converting non-localized string into well-formatted key before lookup. */
+  return dgettext(domain, string.c_str());
+#else
+  return string;
+#endif
+}
+
+static Dali::Actor CreateHighlightIndicatorActor()
+{
+  std::string focusBorderImagePath(AssetManager::GetDaliImagePath());
+  focusBorderImagePath += "/keyboard_focus.9.png";
+
+  // Create the default if it hasn't been set and one that's shared by all the
+  // keyboard focusable actors
+  auto actor = Toolkit::ImageView::New(focusBorderImagePath);
+  actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  DevelControl::AppendAccessibilityAttribute(actor, "highlight", std::string());
+  actor.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, false);
+
+  return actor;
+}
+} // unnamed namespace
+
+ControlAccessible::ControlAccessible(Dali::Actor self)
+: ActorAccessible(self)
+{
+}
+
+std::string ControlAccessible::GetName() const
+{
+  auto control = Dali::Toolkit::Control::DownCast(Self());
+
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  std::string              name;
+
+  if(!controlImpl.mAccessibilityGetNameSignal.Empty())
+  {
+    controlImpl.mAccessibilityGetNameSignal.Emit(name);
+  }
+  else if(!controlImpl.mAccessibilityName.empty())
+  {
+    name = controlImpl.mAccessibilityName;
+  }
+  else if(auto raw = GetNameRaw(); !raw.empty())
+  {
+    name = raw;
+  }
+  else
+  {
+    name = Self().GetProperty<std::string>(Actor::Property::NAME);
+  }
+
+  if(!controlImpl.mAccessibilityTranslationDomain.empty())
+  {
+    return GetLocaleText(name, controlImpl.mAccessibilityTranslationDomain.c_str());
+  }
+
+  return GetLocaleText(name);
+}
+
+std::string ControlAccessible::GetNameRaw() const
+{
+  return {};
+}
+
+std::string ControlAccessible::GetDescription() const
+{
+  auto control = Dali::Toolkit::Control::DownCast(Self());
+
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  std::string              description;
+
+  if(!controlImpl.mAccessibilityGetDescriptionSignal.Empty())
+  {
+    controlImpl.mAccessibilityGetDescriptionSignal.Emit(description);
+  }
+  else if(!controlImpl.mAccessibilityDescription.empty())
+  {
+    description = controlImpl.mAccessibilityDescription;
+  }
+  else
+  {
+    description = GetDescriptionRaw();
+  }
+
+  if(!controlImpl.mAccessibilityTranslationDomain.empty())
+  {
+    return GetLocaleText(description, controlImpl.mAccessibilityTranslationDomain.c_str());
+  }
+
+  return GetLocaleText(description);
+}
+
+std::string ControlAccessible::GetDescriptionRaw() const
+{
+  return {};
+}
+
+Dali::Accessibility::Role ControlAccessible::GetRole() const
+{
+  return Self().GetProperty<Dali::Accessibility::Role>(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE);
+}
+
+std::string ControlAccessible::GetLocalizedRoleName() const
+{
+  return GetLocaleText(GetRoleName());
+}
+
+bool ControlAccessible::IsShowing()
+{
+  Dali::Actor self = Self();
+  if(!self.GetProperty<bool>(Actor::Property::VISIBLE) || Dali::EqualsZero(self.GetProperty<Vector4>(Actor::Property::WORLD_COLOR).a) || self.GetProperty<bool>(Dali::DevelActor::Property::CULLED))
+  {
+    return false;
+  }
+
+  auto* child  = this;
+  auto* parent = dynamic_cast<Toolkit::DevelControl::ControlAccessible*>(child->GetParent());
+  if(!parent)
+  {
+    return true;
+  }
+
+  while(parent)
+  {
+    auto control = Dali::Toolkit::Control::DownCast(parent->Self());
+    if(!control.GetProperty<bool>(Actor::Property::VISIBLE))
+    {
+      return false;
+    }
+    parent = dynamic_cast<Toolkit::DevelControl::ControlAccessible*>(parent->GetParent());
+  }
+
+  return true;
+}
+
+Dali::Accessibility::States ControlAccessible::CalculateStates()
+{
+  using Dali::Accessibility::State;
+
+  Dali::Actor                 self = Self();
+  Dali::Accessibility::States states;
+
+  states[State::FOCUSABLE]     = self.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE);
+  states[State::FOCUSED]       = Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor() == self;
+  states[State::HIGHLIGHTABLE] = self.GetProperty<bool>(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE);
+  states[State::HIGHLIGHTED]   = GetCurrentlyHighlightedActor() == self;
+  states[State::ENABLED]       = true;
+  states[State::SENSITIVE]     = (Dali::DevelActor::IsHittable(self) && Dali::DevelActor::GetTouchRequired(self));
+  states[State::VISIBLE]       = self.GetProperty<bool>(Actor::Property::VISIBLE);
+  states[State::SHOWING]       = IsShowing();
+  states[State::DEFUNCT]       = !self.GetProperty(Dali::DevelActor::Property::CONNECTED_TO_SCENE).Get<bool>();
+
+  return states;
+}
+
+Dali::Accessibility::States ControlAccessible::GetStates()
+{
+  return CalculateStates();
+}
+
+Dali::Accessibility::Attributes ControlAccessible::GetAttributes() const
+{
+  static const std::string automationIdKey = "automationId";
+  static const std::string classKey        = "class";
+
+  Accessibility::Attributes result;
+  Toolkit::Control          control        = Toolkit::Control::DownCast(Self());
+  Dali::Property::Value     property       = control.GetProperty(DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
+  Dali::Property::Map*      attributeMap   = property.GetMap();
+  std::size_t               attributeCount = attributeMap ? attributeMap->Count() : 0U;
+
+  for(std::size_t i = 0; i < attributeCount; i++)
+  {
+    Dali::Property::Key mapKey = attributeMap->GetKeyAt(i);
+    std::string         mapValue;
+
+    if(mapKey.type == Dali::Property::Key::STRING && attributeMap->GetValue(i).Get(mapValue))
+    {
+      result.emplace(std::move(mapKey.stringKey), std::move(mapValue));
+    }
+  }
+
+  auto automationId = control.GetProperty<std::string>(DevelControl::Property::AUTOMATION_ID);
+  if(!automationId.empty())
+  {
+    result.emplace(automationIdKey, std::move(automationId));
+  }
+
+  // Add "class" if not present already
+  if(result.find(classKey) == result.end())
+  {
+    Dali::TypeInfo typeInfo;
+    Self().GetTypeInfo(typeInfo);
+    if(typeInfo)
+    {
+      const std::string& typeName = typeInfo.GetName();
+
+      result.emplace(classKey, typeName);
+
+      // Save the 'typeName' so we don't have to calculate it again
+      DevelControl::AppendAccessibilityAttribute(control, classKey, typeName);
+    }
+  }
+
+  return result;
+}
+
+bool ControlAccessible::IsHidden() const
+{
+  auto control = Dali::Toolkit::Control::DownCast(Self());
+
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+
+  return controlImpl.mAccessibilityHidden;
+}
+
+bool ControlAccessible::GrabFocus()
+{
+  return Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor(Self());
+}
+
+void ControlAccessible::ScrollToSelf()
+{
+  auto* child  = this;
+  auto* parent = dynamic_cast<Toolkit::DevelControl::ControlAccessible*>(child->GetParent());
+
+  while(parent)
+  {
+    if(parent->IsScrollable())
+    {
+      parent->ScrollToChild(child->Self());
+    }
+
+    parent = dynamic_cast<Toolkit::DevelControl::ControlAccessible*>(parent->GetParent());
+  }
+}
+
+void ControlAccessible::RegisterPositionPropertyNotification()
+{
+  auto                     control         = Dali::Toolkit::Control::DownCast(Self());
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  controlImpl.RegisterAccessibilityPositionPropertyNotification();
+}
+
+void ControlAccessible::UnregisterPositionPropertyNotification()
+{
+  auto                     control         = Dali::Toolkit::Control::DownCast(Self());
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  controlImpl.UnregisterAccessibilityPositionPropertyNotification();
+}
+
+void ControlAccessible::RegisterPropertySetSignal()
+{
+  auto                     control         = Dali::Toolkit::Control::DownCast(Self());
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  controlImpl.RegisterAccessibilityPropertySetSignal();
+}
+
+void ControlAccessible::UnregisterPropertySetSignal()
+{
+  auto                     control         = Dali::Toolkit::Control::DownCast(Self());
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+  controlImpl.UnregisterAccessibilityPropertySetSignal();
+}
+
+bool ControlAccessible::GrabHighlight()
+{
+  Dali::Actor self                = Self();
+  auto        oldHighlightedActor = GetCurrentlyHighlightedActor();
+
+  if(!Dali::Accessibility::IsUp())
+  {
+    return false;
+  }
+
+  if(self == oldHighlightedActor)
+  {
+    return true;
+  }
+
+  // Clear the old highlight.
+  if(oldHighlightedActor)
+  {
+    auto oldHighlightedObject = Dali::Accessibility::Component::DownCast(Accessible::Get(oldHighlightedActor));
+    if(oldHighlightedObject)
+    {
+      oldHighlightedObject->ClearHighlight();
+    }
+  }
+
+  auto highlight = GetHighlightActor();
+  if(!highlight)
+  {
+    highlight = CreateHighlightIndicatorActor();
+    SetHighlightActor(highlight);
+  }
+
+  highlight.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  highlight.SetProperty(Actor::Property::POSITION_Z, 1.0f);
+  highlight.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+
+  // Need to set resize policy again, to update SIZE property which is set by
+  // NUIViewAccessible. The highlight could move from NUIViewAccessible to
+  // ControlAccessible. In this case, highlight has incorrect size.
+  highlight.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Remember the highlight actor, so that when the default is changed with
+  // SetHighlightActor(), the currently displayed highlight can still be cleared.
+  mCurrentHighlightActor = highlight;
+  ScrollToSelf();
+  self.Add(highlight);
+  SetCurrentlyHighlightedActor(self);
+  EmitHighlighted(true);
+  RegisterPositionPropertyNotification();
+  RegisterPropertySetSignal();
+
+  return true;
+}
+
+bool ControlAccessible::ClearHighlight()
+{
+  Dali::Actor self = Self();
+
+  if(!Dali::Accessibility::IsUp())
+  {
+    return false;
+  }
+
+  if(GetCurrentlyHighlightedActor() == self)
+  {
+    UnregisterPropertySetSignal();
+    UnregisterPositionPropertyNotification();
+    self.Remove(mCurrentHighlightActor.GetHandle());
+    mCurrentHighlightActor = {};
+    SetCurrentlyHighlightedActor({});
+    EmitHighlighted(false);
+    return true;
+  }
+  return false;
+}
+
+std::string ControlAccessible::GetActionName(size_t index) const
+{
+  if(index >= GetActionCount())
+  {
+    return {};
+  }
+
+  Dali::TypeInfo type;
+  Self().GetTypeInfo(type);
+  DALI_ASSERT_ALWAYS(type && "no TypeInfo object");
+  return type.GetActionName(index);
+}
+
+std::string ControlAccessible::GetLocalizedActionName(size_t index) const
+{
+  return GetLocaleText(GetActionName(index));
+}
+
+std::string ControlAccessible::GetActionDescription(size_t index) const
+{
+  return {};
+}
+
+size_t ControlAccessible::GetActionCount() const
+{
+  Dali::TypeInfo type;
+  Self().GetTypeInfo(type);
+  DALI_ASSERT_ALWAYS(type && "no TypeInfo object");
+  return type.GetActionCount();
+}
+
+std::string ControlAccessible::GetActionKeyBinding(size_t index) const
+{
+  return {};
+}
+
+bool ControlAccessible::DoAction(size_t index)
+{
+  std::string actionName = GetActionName(index);
+  return Self().DoAction(actionName, {});
+}
+
+bool ControlAccessible::DoAction(const std::string& name)
+{
+  return Self().DoAction(name, {});
+}
+
+bool ControlAccessible::DoGesture(const Dali::Accessibility::GestureInfo& gestureInfo)
+{
+  auto control = Dali::Toolkit::Control::DownCast(Self());
+
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlImpl     = Internal::Control::Impl::Get(internalControl);
+
+  if(!controlImpl.mAccessibilityDoGestureSignal.Empty())
+  {
+    auto ret = std::make_pair(gestureInfo, false);
+    controlImpl.mAccessibilityDoGestureSignal.Emit(ret);
+    return ret.second;
+  }
+
+  return false;
+}
+
+std::vector<Dali::Accessibility::Relation> ControlAccessible::GetRelationSet()
+{
+  auto control = Dali::Toolkit::Control::DownCast(Self());
+
+  return DevelControl::GetAccessibilityRelations(control);
+}
+
+bool ControlAccessible::ScrollToChild(Actor child)
+{
+  return false;
+}
+
+Dali::Property::Index ControlAccessible::GetNamePropertyIndex()
+{
+  return Actor::Property::NAME;
+}
+
+Dali::Property::Index ControlAccessible::GetDescriptionPropertyIndex()
+{
+  return Dali::Property::INVALID_INDEX;
+}
+
+void ControlAccessible::SetLastPosition(Vector2 position)
+{
+  mLastPosition = position;
+}
+
+Vector2 ControlAccessible::GetLastPosition() const
+{
+  return mLastPosition;
+}
+
+} // namespace Dali::Toolkit::DevelControl
diff --git a/dali-toolkit/devel-api/controls/control-accessible.h b/dali-toolkit/devel-api/controls/control-accessible.h
new file mode 100644
index 0000000..4b3d3d6
--- /dev/null
+++ b/dali-toolkit/devel-api/controls/control-accessible.h
@@ -0,0 +1,228 @@
+#ifndef DALI_TOOLKIT_CONTROL_ACCESSIBLE_H
+#define DALI_TOOLKIT_CONTROL_ACCESSIBLE_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/adaptor-framework/accessibility.h>
+#include <dali/devel-api/adaptor-framework/actor-accessible.h>
+#include <dali/devel-api/atspi-interfaces/action.h>
+#include <dali/public-api/object/weak-handle.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali::Toolkit::DevelControl
+{
+/**
+ * @brief Represents the Accessible object for Dali::Toolkit::Control and derived classes
+ *
+ * You can create a derived class (and override Control::CreateAccessibleObject)
+ * in order to customize Accessibility for a given control.
+ *
+ * @see Dali::Accessibility::Accessible
+ * @see Dali::Accessibility::Component
+ * @see Dali::Accessibility::Collection
+ * @see Dali::Accessibility::Action
+ * @see Dali::Accessibility::Value
+ * @see Dali::Accessibility::Text
+ * @see Dali::Accessibility::EditableText
+ */
+struct DALI_TOOLKIT_API ControlAccessible : public Dali::Accessibility::ActorAccessible,
+                                            public virtual Dali::Accessibility::Action
+{
+protected:
+  Vector2                       mLastPosition{0.0f, 0.0f};
+  Dali::WeakHandle<Dali::Actor> mCurrentHighlightActor;
+
+  void ScrollToSelf();
+
+  /**
+   * @brief Register property notification to check highlighted object position
+   */
+  void RegisterPositionPropertyNotification();
+
+  /**
+   * @brief Remove property notification added by RegisterPropertyNotification
+   */
+  void UnregisterPositionPropertyNotification();
+
+  /**
+   * @brief Registers PropertySet signal to notify when ACCESSIBILITY_NAME or ACCESSIBILITY_DESCRIPTION is changed.
+   * Note that those two signals only need for highlighted control. So, let us ensure to connect PropertySet signal
+   * only if control has been grabbed.
+   */
+  void RegisterPropertySetSignal();
+
+  /**
+   * @brief Unregisters PropertySet signal to notify when ACCESSIBILITY_NAME or ACCESSIBILITY_DESCRIPTION is changed.
+   */
+  void UnregisterPropertySetSignal();
+
+  /**
+   * @brief Check if the actor is showing
+   * @return True if the actor is showing
+   */
+  bool IsShowing();
+
+public:
+  ControlAccessible(Dali::Actor self);
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetName()
+   */
+  std::string GetName() const override;
+
+  /**
+   * @brief Returns the actor's name in the absence of ACCESSIBILITY_NAME property
+   */
+  virtual std::string GetNameRaw() const;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetDescription()
+   */
+  std::string GetDescription() const override;
+
+  /**
+   * @brief Returns the actor's description in the absence of ACCESSIBILITY_DESCRIPTION property
+   */
+  virtual std::string GetDescriptionRaw() const;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetRole()
+   */
+  Dali::Accessibility::Role GetRole() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetLocalizedRoleName()
+   */
+  std::string GetLocalizedRoleName() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetStates()
+   */
+  Dali::Accessibility::States GetStates() override;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetAttributes()
+   */
+  Dali::Accessibility::Attributes GetAttributes() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::IsHidden()
+   */
+  bool IsHidden() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Component::GrabFocus()
+   */
+  bool GrabFocus() override;
+
+  /**
+   * @copydoc Dali::Accessibility::Component::GrabHighlight()
+   */
+  bool GrabHighlight() override;
+
+  /**
+   * @copydoc Dali::Accessibility::Component::ClearHighlight()
+   */
+  bool ClearHighlight() override;
+
+  /**
+   * @copydoc Dali::Accessibility::Action::GetActionName()
+   */
+  std::string GetActionName(size_t index) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Action::GetLocalizedActionName()
+   */
+  std::string GetLocalizedActionName(size_t index) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Action::GetActionDescription()
+   */
+  std::string GetActionDescription(size_t index) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Action::GetActionCount()
+   */
+  size_t GetActionCount() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Action::GetActionKeyBinding()
+   */
+  std::string GetActionKeyBinding(size_t index) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Action::DoAction(std::size_t)
+   */
+  bool DoAction(size_t index) override;
+
+  /**
+   * @copydoc Dali::Accessibility::Action::DoAction(const std::string&)
+   */
+  bool DoAction(const std::string& name) override;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::DoGesture()
+   */
+  bool DoGesture(const Dali::Accessibility::GestureInfo& gestureInfo) override;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetRelationSet()
+   */
+  std::vector<Dali::Accessibility::Relation> GetRelationSet() override;
+
+  /**
+   * @copydoc Dali::Accessibility::Accessible::GetStates()
+   */
+  virtual Dali::Accessibility::States CalculateStates();
+
+  /**
+   * @brief Makes sure that a given child (descendant) of this container (e.g. ItemView) is visible
+   * @return false if scrolling is not supported or child is already visible
+   */
+  virtual bool ScrollToChild(Actor child);
+
+  /**
+   * @brief Returns the index of the property that represents this actor's name
+   */
+  virtual Dali::Property::Index GetNamePropertyIndex();
+
+  /**
+   * @brief Returns the index of the property that represents this actor's description
+   */
+  virtual Dali::Property::Index GetDescriptionPropertyIndex();
+
+  /**
+   * @brief Sets last object position
+   * @param[in] position Last object position
+   */
+  void SetLastPosition(Vector2 position);
+
+  /**
+   * @brief Gets last object position
+   * @return The Last object position
+   */
+  Vector2 GetLastPosition() const;
+};
+
+} // namespace Dali::Toolkit::DevelControl
+
+#endif // DALI_TOOLKIT_CONTROL_ACCESSIBLE_H
diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp
index 55becb3..1de25f4 100644
--- a/dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/dali-toolkit/devel-api/controls/control-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,17 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/control.h>
 
+namespace
+{
+Dali::Toolkit::Internal::Control::Impl& GetControlImplementation(Dali::Toolkit::Control control)
+{
+  auto& internalControl = Dali::Toolkit::Internal::GetImplementation(control);
+
+  return Dali::Toolkit::Internal::Control::Impl::Get(internalControl);
+}
+
+} // unnamed namespace
+
 namespace Dali
 {
 namespace Toolkit
@@ -103,6 +114,13 @@ void DoAction(Control& control, Dali::Property::Index visualIndex, Dali::Propert
   controlDataImpl.DoAction(visualIndex, actionId, attributes);
 }
 
+void DoActionExtension(Control& control, Dali::Property::Index visualIndex, Dali::Property::Index actionId, Dali::Any attributes)
+{
+  Internal::Control&       controlInternal = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(controlInternal);
+  controlDataImpl.DoActionExtension(visualIndex, actionId, attributes);
+}
+
 void SetInputMethodContext(Internal::Control& control, InputMethodContext& inputMethodContext)
 {
   Internal::Control::Impl::Get(control).SetInputMethodContext(inputMethodContext);
@@ -122,245 +140,172 @@ Dali::Property GetVisualProperty(Control control, Dali::Property::Index index, D
   return controlDataImpl.GetVisualProperty(index, visualPropertyKey);
 }
 
-void CreateTransitions(Control control, Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod)
-{
-  if(animation)
-  {
-    // make visual transition of control visual.
-    Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
-    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(internalControl);
-    controlDataImpl.MakeVisualTransition(animation, source, Toolkit::Control::Property::BACKGROUND, alphaFunction, timePeriod);
-    controlDataImpl.MakeVisualTransition(animation, source, Toolkit::DevelControl::Property::SHADOW, alphaFunction, timePeriod);
-    internalControl.OnCreateTransitions(animation, source, alphaFunction, timePeriod);
-  }
-}
-
-static Toolkit::Internal::Control::Impl* GetControlImplementation(Dali::Actor actor)
-{
-  Dali::Toolkit::Control control = Toolkit::Control::DownCast(actor);
-  if(control)
-  {
-    auto& internalControl = Toolkit::Internal::GetImplementation(control);
-    auto& controlDataImpl = Toolkit::Internal::Control::Impl::Get(internalControl);
-    return &controlDataImpl;
-  }
-  return nullptr;
-}
-
 Toolkit::DevelControl::AccessibilityActivateSignalType& AccessibilityActivateSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityActivateSignal;
+  return GetControlImplementation(control).mAccessibilityActivateSignal;
 }
 
 Toolkit::DevelControl::AccessibilityReadingSkippedSignalType& AccessibilityReadingSkippedSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityReadingSkippedSignal;
+  return GetControlImplementation(control).mAccessibilityReadingSkippedSignal;
 }
 
 Toolkit::DevelControl::AccessibilityReadingPausedSignalType& AccessibilityReadingPausedSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityReadingPausedSignal;
+  return GetControlImplementation(control).mAccessibilityReadingPausedSignal;
 }
 
 Toolkit::DevelControl::AccessibilityReadingResumedSignalType& AccessibilityReadingResumedSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityReadingResumedSignal;
+  return GetControlImplementation(control).mAccessibilityReadingResumedSignal;
 }
 
 Toolkit::DevelControl::AccessibilityReadingCancelledSignalType& AccessibilityReadingCancelledSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityReadingCancelledSignal;
+  return GetControlImplementation(control).mAccessibilityReadingCancelledSignal;
 }
 
 Toolkit::DevelControl::AccessibilityReadingStoppedSignalType& AccessibilityReadingStoppedSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityReadingStoppedSignal;
+  return GetControlImplementation(control).mAccessibilityReadingStoppedSignal;
 }
 
 Toolkit::DevelControl::AccessibilityGetNameSignalType& AccessibilityGetNameSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityGetNameSignal;
+  return GetControlImplementation(control).mAccessibilityGetNameSignal;
 }
 
 Toolkit::DevelControl::AccessibilityGetDescriptionSignalType& AccessibilityGetDescriptionSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityGetDescriptionSignal;
+  return GetControlImplementation(control).mAccessibilityGetDescriptionSignal;
 }
 
 Toolkit::DevelControl::AccessibilityDoGestureSignalType& AccessibilityDoGestureSignal(Toolkit::Control control)
 {
-  return GetControlImplementation(control)->mAccessibilityDoGestureSignal;
+  return GetControlImplementation(control).mAccessibilityDoGestureSignal;
 }
 
-void AppendAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation)
+void AppendAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
+  if(auto destinationAccessible = Accessibility::Accessible::Get(destination))
   {
-    auto index = static_cast<Dali::Property::Array::SizeType>(relation);
-    if(index >= controlDataImpl->mAccessibilityRelations.size())
-    {
-      DALI_LOG_ERROR("Relation index exceeds vector size.");
-      return;
-    }
-
-    auto object = controlDataImpl->GetAccessibilityObject(destination);
-    if(object)
-    {
-      controlDataImpl->mAccessibilityRelations[index].push_back(object->GetAddress());
-    }
+    GetControlImplementation(control).mAccessibilityRelations[relation].insert(destinationAccessible);
   }
 }
 
-void RemoveAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation)
+void RemoveAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
+  if(auto destinationAccessible = Accessibility::Accessible::Get(destination))
   {
-    auto index = static_cast<Dali::Property::Array::SizeType>(relation);
-    if(index >= controlDataImpl->mAccessibilityRelations.size())
-    {
-      DALI_LOG_ERROR("Relation index exceeds vector size.");
-      return;
-    }
-
-    auto object = controlDataImpl->GetAccessibilityObject(destination);
-    if(!object)
-    {
-      return;
-    }
+    auto& relations = GetControlImplementation(control).mAccessibilityRelations;
 
-    auto address = object->GetAddress();
+    relations[relation].erase(destinationAccessible);
 
-    auto& targets = controlDataImpl->mAccessibilityRelations[index];
-    for(auto i = 0u; i < targets.size(); ++i)
+    if(relations[relation].empty())
     {
-      if(targets[i].ToString() == address.ToString())
-      {
-        targets[i] = targets.back();
-        targets.erase(targets.end() - 1);
-      }
+      relations.erase(relation);
     }
   }
 }
 
-std::vector<std::vector<Accessibility::Address>> GetAccessibilityRelations(Dali::Actor control)
+std::vector<Accessibility::Relation> GetAccessibilityRelations(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
+  const auto&                          relations = GetControlImplementation(control).mAccessibilityRelations;
+  std::vector<Accessibility::Relation> result;
+
+  for(auto& relation : relations)
   {
-    return controlDataImpl->mAccessibilityRelations;
+    auto& targets = relation.second;
+
+    result.emplace_back(Accessibility::Relation{relation.first, {}});
+    std::copy(targets.begin(), targets.end(), std::back_inserter(result.back().mTargets));
   }
-  return {};
+
+  return result;
 }
 
-void ClearAccessibilityRelations(Dali::Actor control)
+void ClearAccessibilityRelations(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
-  {
-    for(auto& it : controlDataImpl->mAccessibilityRelations)
-    {
-      it.clear();
-    }
-  }
+  GetControlImplementation(control).mAccessibilityRelations.clear();
 }
 
-void SetAccessibilityConstructor(Dali::Actor control, std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Dali::Actor)> constructor)
+void AppendAccessibilityAttribute(Toolkit::Control control, const std::string& key, const std::string& value)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
-  {
-    controlDataImpl->mAccessibilityConstructor = constructor;
-  }
+  GetControlImplementation(control).AppendAccessibilityAttribute(key, value);
 }
 
-void AppendAccessibilityAttribute(Dali::Actor control, const std::string& key, const std::string value)
+void RemoveAccessibilityAttribute(Toolkit::Control control, const std::string& key)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
-  {
-    controlDataImpl->AppendAccessibilityAttribute(key, value);
-  }
+  GetControlImplementation(control).RemoveAccessibilityAttribute(key);
 }
 
-void RemoveAccessibilityAttribute(Dali::Actor control, const std::string& key)
+void ClearAccessibilityAttributes(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
-  {
-    controlDataImpl->RemoveAccessibilityAttribute(key);
-  }
+  GetControlImplementation(control).ClearAccessibilityAttributes();
 }
 
-void ClearAccessibilityAttributes(Dali::Actor control)
+void SetAccessibilityReadingInfoType(Toolkit::Control control, const Dali::Accessibility::ReadingInfoTypes types)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
-  {
-    controlDataImpl->ClearAccessibilityAttributes();
-  }
+  GetControlImplementation(control).SetAccessibilityReadingInfoType(types);
 }
 
-void SetAccessibilityReadingInfoType(Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types)
+Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
-  {
-    controlDataImpl->SetAccessibilityReadingInfoType(types);
-  }
+  return GetControlImplementation(control).GetAccessibilityReadingInfoType();
 }
 
-Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control)
+bool ClearAccessibilityHighlight(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
+  auto* controlAccessible = GetControlImplementation(control).GetAccessibleObject();
+  if(DALI_LIKELY(controlAccessible))
   {
-    return controlDataImpl->GetAccessibilityReadingInfoType();
+    return controlAccessible->ClearHighlight();
   }
-  return {};
+  return false;
 }
 
-bool ClearAccessibilityHighlight(Dali::Actor control)
+bool GrabAccessibilityHighlight(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
+  auto* controlAccessible = GetControlImplementation(control).GetAccessibleObject();
+  if(DALI_LIKELY(controlAccessible))
   {
-    auto object = dynamic_cast<Dali::Accessibility::Component*>(controlDataImpl->GetAccessibilityObject());
-    if(object)
-    {
-      return object->ClearHighlight();
-    }
+    return controlAccessible->GrabHighlight();
   }
   return false;
 }
 
-bool GrabAccessibilityHighlight(Dali::Actor control)
+Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
+  auto* controlAccessible = GetControlImplementation(control).GetAccessibleObject();
+  if(DALI_LIKELY(controlAccessible))
   {
-    auto object = dynamic_cast<Dali::Accessibility::Component*>(controlDataImpl->GetAccessibilityObject());
-    if(object)
-    {
-      return object->GrabHighlight();
-    }
+    return controlAccessible->GetStates();
   }
-  return false;
+  return Dali::Accessibility::States{};
 }
 
-Dali::Accessibility::States GetAccessibilityStates(Dali::Actor control)
+void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
+  auto* controlAccessible = GetControlImplementation(control).GetAccessibleObject();
+  if(DALI_LIKELY(controlAccessible))
   {
-    auto object = dynamic_cast<Dali::Accessibility::Component*>(controlDataImpl->GetAccessibilityObject());
-    if(object)
-    {
-      return object->GetStates();
-    }
+    controlAccessible->NotifyAccessibilityStateChange(std::move(states), recurse);
   }
-  return {};
 }
 
-void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool isRecursive)
+bool IsAccessibleCreated(Toolkit::Control control)
 {
-  if(auto controlDataImpl = GetControlImplementation(control))
-  {
-    controlDataImpl->GetAccessibilityObject()->NotifyAccessibilityStateChange(std::move(states), isRecursive);
-  }
+  return GetControlImplementation(control).IsAccessibleCreated();
+}
+
+void EnableCreateAccessible(Toolkit::Control control, bool enable)
+{
+  GetControlImplementation(control).EnableCreateAccessible(enable);
 }
 
-Dali::Accessibility::Accessible* GetBoundAccessibilityObject(Dali::Actor control)
+bool IsCreateAccessibleEnabled(Toolkit::Control control)
 {
-  return Dali::Accessibility::Accessible::Get(control);
+  return GetControlImplementation(control).IsCreateAccessibleEnabled();
 }
 
 } // namespace DevelControl
diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h
index 51cf1cc..fe2548f 100644
--- a/dali-toolkit/devel-api/controls/control-devel.h
+++ b/dali-toolkit/devel-api/controls/control-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_DEVEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,13 @@
  *
  */
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
 #include <dali/devel-api/adaptor-framework/input-method-context.h>
 #include <dali/public-api/animation/alpha-function.h>
 #include <dali/public-api/animation/time-period.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/accessible-impl.h>
+#include <dali-toolkit/devel-api/controls/control-accessible.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/public-api/controls/control.h>
 
@@ -175,16 +175,54 @@ enum
    * @see Dali::Accessibility::Role
    */
   ACCESSIBILITY_ROLE,
+
   /**
    * @brief Mark of able to highlight object.
    * @details Name "accessibilityHighlightable", type Property::BOOLEAN.
    */
   ACCESSIBILITY_HIGHLIGHTABLE,
+
   /**
    * @brief Set of accessibility attributes describing object in accessibility hierarchy
    * @details Name "accessibilityAttributes", type Property::MAP
    */
-  ACCESSIBILITY_ATTRIBUTES
+  ACCESSIBILITY_ATTRIBUTES,
+
+  /**
+   * @brief Whether a Control and its descendants can emit key signals.
+   * @details Name "dispatchKeyEvents", type Property::BOOLEAN
+   * @note If a control's dispatchKeyEvents is set to false, then it's children will not emit a key event signal either.
+   */
+  DISPATCH_KEY_EVENTS,
+
+  /**
+   * @brief Marks the object as invisible to AT-SPI clients.
+   * @details Name "accessibilityHidden", type Property::BOOLEAN.
+   * @note The representative Accessible object will not appear in the AT-SPI tree.
+   */
+  ACCESSIBILITY_HIDDEN,
+
+  /**
+   * @brief The actor ID of the clockwise focusable control.
+   * @details Name "clockwiseFocusableActorId", type Property::INTEGER.
+   *
+   */
+  CLOCKWISE_FOCUSABLE_ACTOR_ID,
+
+  /**
+   * @brief The actor ID of the conter-clockwise focusable control.
+   * @details Name "counterClockwiseFocusableActorId", type Property::INTEGER.
+   *
+   */
+  COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID,
+
+  /**
+   * @brief Identifier that allows the automation framework to find and interact with this element.
+   * @details Name "automationId", type Property::STRING.
+   * @note This is a string identifier (compared to @c Actor::Property::ID which is an integer).
+   * It will also appear in the AT-SPI tree under the key "automationId".
+   */
+  AUTOMATION_ID,
 };
 
 } // namespace Property
@@ -330,6 +368,18 @@ DALI_TOOLKIT_API Dali::Animation CreateTransition(Internal::Control&
 DALI_TOOLKIT_API void DoAction(Control& control, Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes);
 
 /**
+ * @brief Perform an action on a visual registered to this control.
+ *
+ * Visuals will have actions, this API is used to perform one of these actions with the given attributes.
+ *
+ * @param[in] control The control.
+ * @param[in] visualIndex The Property index of the visual.
+ * @param[in] actionId The action to perform.  See Visual to find supported actions.
+ * @param[in] attributes Optional attributes for the action.
+ */
+DALI_TOOLKIT_API void DoActionExtension(Control& control, Dali::Property::Index visualIndex, Dali::Property::Index actionId, Dali::Any attributes);
+
+/**
  * @brief Set input method context.
  *
  * @param[in] control The control.
@@ -364,20 +414,6 @@ DALI_TOOLKIT_API VisualEventSignalType& VisualEventSignal(Control control);
 DALI_TOOLKIT_API Dali::Property GetVisualProperty(Control control, Dali::Property::Index index, Dali::Property::Key visualPropertyKey);
 
 /**
- * @brief Retrieve visual/renderer property animation between this Control and source control.
- * Input animation must be created before this method called.
- * And the animations between this method created are added the input animation.
- * This method generates visual/renderer property animation but not creates Actor property animation.
- *
- * @param[in] control The control
- * @param[in] animation generated animation
- * @param[in] source source control of the animation.
- * @param[in] alphaFunction AlphaFunction of the animation
- * @param[in] timePeriod TimePeriod of the animation
- */
-DALI_TOOLKIT_API void CreateTransitions(Control control, Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod);
-
-/**
  * @brief The signal is emmited as a succession of "activate" signal send by accessibility client.
  * @return The signal to connect to
  */
@@ -460,7 +496,7 @@ DALI_TOOLKIT_API AccessibilityDoGestureSignalType& AccessibilityDoGestureSignal(
  * @param destination Actor object
  * @param relation    enumerated value describing relation
  */
-DALI_TOOLKIT_API void AppendAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation);
+DALI_TOOLKIT_API void AppendAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation);
 
 /**
  * @brief The method allows removing relation
@@ -469,22 +505,24 @@ DALI_TOOLKIT_API void AppendAccessibilityRelation(Dali::Actor control, Actor des
  * @param destination Actor object
  * @param relation    enumerated value describing relation
  */
-DALI_TOOLKIT_API void RemoveAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation);
+DALI_TOOLKIT_API void RemoveAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation);
 
 /**
- * @brief The method returns collection accessibility addresses representing objects connected with current object
+ * @brief Returns a collection of Accessible objects related to current object and grouped by relation type.
  *
- * @param control object to append attribute to
- * @return std::vector, where index is casted value of Accessibility::RelationType and value is std::vector of type Accessibility::Address
+ * @param control object to query
+ * @return collection of relations
+ *
+ * @see Dali::Accessibility::Accessible::GetRelationSet()
  */
-DALI_TOOLKIT_API std::vector<std::vector<Accessibility::Address>> GetAccessibilityRelations(Dali::Actor control);
+DALI_TOOLKIT_API std::vector<Accessibility::Relation> GetAccessibilityRelations(Toolkit::Control control);
 
 /**
  * @brief The method removes all previously appended relations
  *
  * @param control object to append attribute to
  */
-DALI_TOOLKIT_API void ClearAccessibilityRelations(Dali::Actor control);
+DALI_TOOLKIT_API void ClearAccessibilityRelations(Toolkit::Control control);
 
 /**
  * @brief The method allows to add or modify value matched with given key.
@@ -494,21 +532,21 @@ DALI_TOOLKIT_API void ClearAccessibilityRelations(Dali::Actor control);
  * @param key   std::string value
  * @param value std::string value
  */
-DALI_TOOLKIT_API void AppendAccessibilityAttribute(Dali::Actor control, const std::string& key, const std::string value);
+DALI_TOOLKIT_API void AppendAccessibilityAttribute(Toolkit::Control control, const std::string& key, const std::string& value);
 
 /**
  * @brief The method erases key with its value from accessibility attributes
  * @param control object to append attribute to
  * @param key std::string value
  */
-DALI_TOOLKIT_API void RemoveAccessibilityAttribute(Dali::Actor control, const std::string& key);
+DALI_TOOLKIT_API void RemoveAccessibilityAttribute(Toolkit::Control control, const std::string& key);
 
 /**
  * @brief The method clears accessibility attributes
  *
  * @param control object to append attribute to
  */
-DALI_TOOLKIT_API void ClearAccessibilityAttributes(Dali::Actor control);
+DALI_TOOLKIT_API void ClearAccessibilityAttributes(Toolkit::Control control);
 
 /**
  * @brief The method inserts reading information of an accessible object into attributes
@@ -516,7 +554,7 @@ DALI_TOOLKIT_API void ClearAccessibilityAttributes(Dali::Actor control);
  * @param control object to append attribute to
  * @param types Reading information types
  */
-DALI_TOOLKIT_API void SetAccessibilityReadingInfoType(Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types);
+DALI_TOOLKIT_API void SetAccessibilityReadingInfoType(Toolkit::Control control, const Dali::Accessibility::ReadingInfoTypes types);
 
 /**
  * @brief The method returns reading information of an accessible object
@@ -524,7 +562,7 @@ DALI_TOOLKIT_API void SetAccessibilityReadingInfoType(Dali::Actor control, const
  * @param control object to append attribute to
  * @return Reading information types
  */
-DALI_TOOLKIT_API Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control);
+DALI_TOOLKIT_API Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Toolkit::Control control);
 
 /**
  * @brief The method erases highlight.
@@ -532,7 +570,7 @@ DALI_TOOLKIT_API Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingIn
  * @param control object to append attribute to
  * @return bool value, false when it is not possible or something went wrong, at the other way true.
  */
-DALI_TOOLKIT_API bool ClearAccessibilityHighlight(Dali::Actor control);
+DALI_TOOLKIT_API bool ClearAccessibilityHighlight(Toolkit::Control control);
 
 /**
  * @brief The method grabs highlight.
@@ -540,7 +578,7 @@ DALI_TOOLKIT_API bool ClearAccessibilityHighlight(Dali::Actor control);
  * @param control object to append attribute to
  * @return bool value, false when it is not possible or something went wrong, at the other way true.
  */
-DALI_TOOLKIT_API bool GrabAccessibilityHighlight(Dali::Actor control);
+DALI_TOOLKIT_API bool GrabAccessibilityHighlight(Toolkit::Control control);
 
 /**
  * @brief The metod presents bitset of control's states.
@@ -548,42 +586,41 @@ DALI_TOOLKIT_API bool GrabAccessibilityHighlight(Dali::Actor control);
  * @param control object to append attribute to
  * @return Dali::Accessibility::States is vector of enumerated State.
  */
-DALI_TOOLKIT_API Dali::Accessibility::States GetAccessibilityStates(Dali::Actor control);
+DALI_TOOLKIT_API Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control);
 
 /**
  * @brief The method force sending notifications about current states to accessibility clients
  *
  * @param control object to append attribute to
- * @param states      mask with states expected to broadcast
- * @param isRecursive flag pointing if notifications of children's state would be sent
+ * @param states  mask with states expected to broadcast
+ * @param recurse flag pointing if notifications of children's state would be sent
  */
-DALI_TOOLKIT_API void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool isRecursive);
+DALI_TOOLKIT_API void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse);
 
 /**
- * The method allows to set specific constructor for creating accessibility structure
+ * @brief The method to get the control's accessibility created or not.
  *
- * Thank to this method hierarchy of accessibility objects can be based on internal hierarchy of Actors.
- * It prevents from necessity of keeping two trees synchronized.
- * The method should be called inside OnInitialize method of all classes inheriting from Control.
+ * @param[in] control object to append attribute to
+ * @return True if accessible were created. False otherwise.
+ */
+DALI_TOOLKIT_API bool IsAccessibleCreated(Toolkit::Control control);
+
+/**
+ * @brief The method to set creatable of control's accessibility.
+ * @note This method doesn't remove that already created accessible.
  *
- * Possible usage can be as follows:
- * @code
- *   SetAccessibilityConstructor( []( Dali::Actor actor ) {
-       return std::unique_ptr< Dali::Accessibility::Accessible >(
-       new AccessibleImpl( actor, Dali::Accessibility::Role::DIALOG, true ) );
-      } );
-  * @endcode
-  *
-  * param constructor callback creating Accessible object
-  */
-DALI_TOOLKIT_API void SetAccessibilityConstructor(Dali::Actor control, std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Dali::Actor)> constructor);
+ * @param[in] control object to append attribute to
+ * @param[in] enable True if we allow to create accessible. False otherwise.
+ */
+DALI_TOOLKIT_API void EnableCreateAccessible(Toolkit::Control control, bool enable);
 
 /**
- * Returns accessibility object bound to actor, if any
+ * @brief The method to get creatable of control's accessibility.
  *
- * This method won't bound new accessibility object. Use Dali::Accessibility::Accessible::Get in that case.
+ * @param[in] control object to append attribute to
+ * @return True if we allow to create accessible. False otherwise.
  */
-DALI_TOOLKIT_API Dali::Accessibility::Accessible* GetBoundAccessibilityObject(Dali::Actor control);
+DALI_TOOLKIT_API bool IsCreateAccessibleEnabled(Toolkit::Control control);
 
 } // namespace DevelControl
 
diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
index 2056d66..78e4428 100644
--- a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
+++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ Dali::Toolkit::ControlWrapper ControlWrapper::New(const std::string& typeName, C
 }
 
 ControlWrapper::ControlWrapper(CustomControlBehaviour behaviourFlags)
-: Control(static_cast<ControlBehaviour>(behaviourFlags))
+: Control(static_cast<ControlBehaviour>(behaviourFlags | DISABLE_STYLE_CHANGE_SIGNALS))
 {
 }
 
diff --git a/dali-toolkit/devel-api/controls/effects-view/effects-view.cpp b/dali-toolkit/devel-api/controls/effects-view/effects-view.cpp
index 4cad313..fa4f268 100644
--- a/dali-toolkit/devel-api/controls/effects-view/effects-view.cpp
+++ b/dali-toolkit/devel-api/controls/effects-view/effects-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,19 +36,13 @@ EffectsView::EffectsView()
 {
 }
 
-EffectsView::EffectsView(const EffectsView& handle)
-: Control(handle)
-{
-}
+EffectsView::EffectsView(const EffectsView& handle) = default;
 
-EffectsView& EffectsView::operator=(const EffectsView& rhs)
-{
-  if(&rhs != this)
-  {
-    Control::operator=(rhs);
-  }
-  return *this;
-}
+EffectsView& EffectsView::operator=(const EffectsView& handle) = default;
+
+EffectsView::EffectsView(EffectsView&& handle) = default;
+
+EffectsView& EffectsView::operator=(EffectsView&& handle) = default;
 
 EffectsView EffectsView::DownCast(BaseHandle handle)
 {
diff --git a/dali-toolkit/devel-api/controls/effects-view/effects-view.h b/dali-toolkit/devel-api/controls/effects-view/effects-view.h
index 60df473..1b1147b 100644
--- a/dali-toolkit/devel-api/controls/effects-view/effects-view.h
+++ b/dali-toolkit/devel-api/controls/effects-view/effects-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_EFFECTS_VIEW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,13 +111,29 @@ public:
 
   /**
    * Copy constructor.
+   * @param[in] handle to copy from
    */
   EffectsView(const EffectsView& handle);
 
   /**
    * Assignment operator.
+   * @param[in] handle to copy from
+   * @return reference to this
    */
-  EffectsView& operator=(const EffectsView& rhs);
+  EffectsView& operator=(const EffectsView& handle);
+
+  /**
+   * Move constructor.
+   * @param[in] rhs to move from
+   */
+  EffectsView(EffectsView&& rhs);
+
+  /**
+   * Move assignment operator.
+   * @param[in] rhs to move from
+   * @return reference to this
+   */
+  EffectsView& operator=(EffectsView&& rhs);
 
   /**
    * Downcast an Object handle to EffectsView. If handle points to a EffectsView the
diff --git a/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp b/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp
index 8c5ec81..b9d86d3 100644
--- a/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp
+++ b/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,19 +37,13 @@ Magnifier::Magnifier()
 {
 }
 
-Magnifier::Magnifier(const Magnifier& handle)
-: Control(handle)
-{
-}
+Magnifier::Magnifier(const Magnifier& handle) = default;
 
-Magnifier& Magnifier::operator=(const Magnifier& handle)
-{
-  if(&handle != this)
-  {
-    Control::operator=(handle);
-  }
-  return *this;
-}
+Magnifier& Magnifier::operator=(const Magnifier& handle) = default;
+
+Magnifier::Magnifier(Magnifier&& rhs) = default;
+
+Magnifier& Magnifier::operator=(Magnifier&& rhs) = default;
 
 Magnifier::Magnifier(Internal::Magnifier& implementation)
 : Control(implementation)
diff --git a/dali-toolkit/devel-api/controls/magnifier/magnifier.h b/dali-toolkit/devel-api/controls/magnifier/magnifier.h
index bf0ca8e..15429e8 100644
--- a/dali-toolkit/devel-api/controls/magnifier/magnifier.h
+++ b/dali-toolkit/devel-api/controls/magnifier/magnifier.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_MAGNIFIER_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,16 +78,31 @@ public:
 
   /**
    * Copy constructor. Creates another handle that points to the same real object
-   * @param handle to copy from
+   * @param[in] handle to copy from
    */
   Magnifier(const Magnifier& handle);
 
   /**
    * Assignment operator. Changes this handle to point to another real object
+   * @param[in] handle to copy from
+   * @return reference to this
    */
   Magnifier& operator=(const Magnifier& handle);
 
   /**
+   * Move constructor. Creates another handle that points to the same real object
+   * @param[in] rhs to move from
+   */
+  Magnifier(Magnifier&& rhs);
+
+  /**
+   * Move assignment operator. Changes this handle to point to another real object
+   * @param[in] rhs to move from
+   * @return reference to this
+   */
+  Magnifier& operator=(Magnifier&& rhs);
+
+  /**
    * @brief Destructor
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
diff --git a/dali-toolkit/devel-api/controls/navigation-view/navigation-view.cpp b/dali-toolkit/devel-api/controls/navigation-view/navigation-view.cpp
index 3e9b94c..96852f2 100644
--- a/dali-toolkit/devel-api/controls/navigation-view/navigation-view.cpp
+++ b/dali-toolkit/devel-api/controls/navigation-view/navigation-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,19 +31,13 @@ NavigationView::NavigationView()
 {
 }
 
-NavigationView::NavigationView(const NavigationView& handle)
-: Control(handle)
-{
-}
+NavigationView::NavigationView(const NavigationView& handle) = default;
 
-NavigationView& NavigationView::operator=(const NavigationView& handle)
-{
-  if(&handle != this)
-  {
-    Control::operator=(handle);
-  }
-  return *this;
-}
+NavigationView& NavigationView::operator=(const NavigationView& handle) = default;
+
+NavigationView::NavigationView(NavigationView&& handle) = default;
+
+NavigationView& NavigationView::operator=(NavigationView&& handle) = default;
 
 NavigationView::~NavigationView()
 {
diff --git a/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h b/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h
index 49bc4fd..0624f6b 100644
--- a/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h
+++ b/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_NAVIGATION_VIEW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,13 +57,26 @@ public:
   NavigationView(const NavigationView& handle);
 
   /**
-  * @brief Assignment operator.
-  * @param handle The handle to copy from.
-  * @return reference to this
-  */
+   * @brief Assignment operator.
+   * @param[in] handle The handle to copy from.
+   * @return reference to this
+   */
   NavigationView& operator=(const NavigationView& handle);
 
   /**
+   * @brief Move Constructor.
+   * @param[in] handle Handle to move.
+   */
+  NavigationView(NavigationView&& handle);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] handle The handle to move from.
+   * @return reference to this
+   */
+  NavigationView& operator=(NavigationView&& handle);
+
+  /**
    * @brief Destructor
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
diff --git a/dali-toolkit/devel-api/controls/popup/confirmation-popup.cpp b/dali-toolkit/devel-api/controls/popup/confirmation-popup.cpp
index f8c2ba4..ad13686 100644
--- a/dali-toolkit/devel-api/controls/popup/confirmation-popup.cpp
+++ b/dali-toolkit/devel-api/controls/popup/confirmation-popup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,19 +39,13 @@ ConfirmationPopup::ConfirmationPopup(Internal::ConfirmationPopup& implementation
 {
 }
 
-ConfirmationPopup::ConfirmationPopup(const ConfirmationPopup& confirmationPopup)
-: Popup(confirmationPopup)
-{
-}
+ConfirmationPopup::ConfirmationPopup(const ConfirmationPopup& confirmationPopup) = default;
 
-ConfirmationPopup& ConfirmationPopup::operator=(const ConfirmationPopup& confirmationPopup)
-{
-  if(&confirmationPopup != this)
-  {
-    Popup::operator=(confirmationPopup);
-  }
-  return *this;
-}
+ConfirmationPopup& ConfirmationPopup::operator=(const ConfirmationPopup& confirmationPopup) = default;
+
+ConfirmationPopup::ConfirmationPopup(ConfirmationPopup&& confirmationPopup) = default;
+
+ConfirmationPopup& ConfirmationPopup::operator=(ConfirmationPopup&& confirmationPopup) = default;
 
 ConfirmationPopup::ConfirmationPopup(Dali::Internal::CustomActor* internal)
 : Popup(internal)
diff --git a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h
index 43bdae1..ebf6a65 100644
--- a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h
+++ b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONFIRMATION_POPUP_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,15 +88,31 @@ public:
 
   /**
    * @brief Copy constructor.
+   * @param[in] confirmationPopup The handle to copy from.
    */
   ConfirmationPopup(const ConfirmationPopup& confirmationPopup);
 
   /**
    * @brief Assignment operator.
+   * @param[in] confirmationPopup The handle to copy from.
+   * @return reference to this
    */
   ConfirmationPopup& operator=(const ConfirmationPopup& confirmationPopup);
 
   /**
+   * @brief Move constructor.
+   * @param[in] confirmationPopup The handle to move from.
+   */
+  ConfirmationPopup(ConfirmationPopup&& confirmationPopup);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] confirmationPopup The handle to move from.
+   * @return reference to this
+   */
+  ConfirmationPopup& operator=(ConfirmationPopup&& confirmationPopup);
+
+  /**
    * @brief Destructor.
    *
    * This is non-virtual since derived types must not contain data or virtual methods.
diff --git a/dali-toolkit/devel-api/controls/popup/popup.cpp b/dali-toolkit/devel-api/controls/popup/popup.cpp
index 73ceaea..5cb4670 100644
--- a/dali-toolkit/devel-api/controls/popup/popup.cpp
+++ b/dali-toolkit/devel-api/controls/popup/popup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,19 +35,13 @@ Popup::Popup()
 {
 }
 
-Popup::Popup(const Popup& handle)
-: Control(handle)
-{
-}
+Popup::Popup(const Popup& handle) = default;
 
-Popup& Popup::operator=(const Popup& handle)
-{
-  if(&handle != this)
-  {
-    Control::operator=(handle);
-  }
-  return *this;
-}
+Popup& Popup::operator=(const Popup& handle) = default;
+
+Popup::Popup(Popup&& handle) = default;
+
+Popup& Popup::operator=(Popup&& handle) = default;
 
 Popup::Popup(Internal::Popup& implementation)
 : Control(implementation)
diff --git a/dali-toolkit/devel-api/controls/popup/popup.h b/dali-toolkit/devel-api/controls/popup/popup.h
index 9a81bb8..ec3b7bc 100644
--- a/dali-toolkit/devel-api/controls/popup/popup.h
+++ b/dali-toolkit/devel-api/controls/popup/popup.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_POPUP_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -168,6 +168,23 @@ public:
   Popup& operator=(const Popup& handle);
 
   /**
+   * @brief Move constructor.
+   *
+   * Creates another handle that points to the same real object
+   * @param[in] handle Handle to the moved object
+   */
+  Popup(Popup&& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * Changes this handle to point to another real object
+   * @param[in] handle Handle to the object
+   * @return A reference to this
+   */
+  Popup& operator=(Popup&& handle);
+
+  /**
    * @brief Downcast an Object handle to Popup.
    *
    * If handle points to a Popup the
diff --git a/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.cpp b/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.cpp
index 85e1162..3474006 100644
--- a/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.cpp
+++ b/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,16 +33,13 @@ Scene3dView::~Scene3dView()
 {
 }
 
-Scene3dView::Scene3dView(const Scene3dView& handle)
-: Control(handle)
-{
-}
+Scene3dView::Scene3dView(const Scene3dView& handle) = default;
 
-Scene3dView& Scene3dView::operator=(const Scene3dView& handle)
-{
-  BaseHandle::operator=(handle);
-  return *this;
-}
+Scene3dView& Scene3dView::operator=(const Scene3dView& handle) = default;
+
+Scene3dView::Scene3dView(Scene3dView&& rhs) = default;
+
+Scene3dView& Scene3dView::operator=(Scene3dView&& rhs) = default;
 
 Scene3dView Scene3dView::New(const std::string& filePath)
 {
diff --git a/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h b/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h
index 1f0effb..573c221 100644
--- a/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h
+++ b/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_SCENE3D_VIEW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,15 +80,9 @@ public:
     // Scene doesn't use both of point and directional light
     NONE = 0,
     // Scene use point light
-    POINT_LIGHT,
+    POINT_LIGHT = 1,
     // Scene use directional light
-    DIRECTIONAL_LIGHT,
-    // Scene use Image Based Lighting
-    IMAGE_BASED_LIGHT,
-    // Scene use Image Based Lighting and point light
-    IMAGE_BASED_LIGHT_AND_POINT_LIGHT,
-    // Scene use Image Based Lighting and directional light
-    IMAGE_BASED_LIGHT_AND_DIRECTIONAL_LIGHT
+    DIRECTIONAL_LIGHT = 2
   };
 
   /**
@@ -99,15 +93,31 @@ public:
 
   /**
    * @brief Copy constructor. Creates another handle that points to the same real object
+   * @param[in] handle to copy from
    */
   Scene3dView(const Scene3dView& handle);
 
   /**
    * @brief Assignment operator. Changes this handle to point to another real object
+   * @param[in] handle to copy from
+   * @return reference to this
    */
   Scene3dView& operator=(const Scene3dView& handle);
 
   /**
+   * @brief Move constructor. Creates another handle that points to the same real object
+   * @param[in] rhs to move from
+   */
+  Scene3dView(Scene3dView&& rhs);
+
+  /**
+   * @brief Move assignment operator. Changes this handle to point to another real object
+   * @param[in] rhs to move from
+   * @return reference to this
+   */
+  Scene3dView& operator=(Scene3dView&& rhs);
+
+  /**
    * @brief Destructor
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
diff --git a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.cpp b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.cpp
index c568fb8..5d6b75e 100644
--- a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.cpp
+++ b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,19 +40,13 @@ ShadowView::~ShadowView()
 {
 }
 
-ShadowView::ShadowView(const ShadowView& handle)
-: Control(handle)
-{
-}
+ShadowView::ShadowView(const ShadowView& handle) = default;
 
-ShadowView& ShadowView::operator=(const ShadowView& rhs)
-{
-  if(&rhs != this)
-  {
-    Control::operator=(rhs);
-  }
-  return *this;
-}
+ShadowView& ShadowView::operator=(const ShadowView& handle) = default;
+
+ShadowView::ShadowView(ShadowView&& rhs) = default;
+
+ShadowView& ShadowView::operator=(ShadowView&& rhs) = default;
 
 ShadowView ShadowView::New()
 {
diff --git a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h
index 9667fa9..07e5ee5 100644
--- a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h
+++ b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_SHADOW_VIEW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,13 +107,29 @@ public:
 
   /**
    * Copy constructor. Creates another handle that points to the same real object
+   * @param[in] handle to copy from
    */
   ShadowView(const ShadowView& handle);
 
   /**
    * Assignment operator. Changes this handle to point to another real object
+   * @param[in] handle to copy from
+   * @return reference to this
    */
-  ShadowView& operator=(const ShadowView& view);
+  ShadowView& operator=(const ShadowView& handle);
+
+  /**
+   * Move constructor. Creates another handle that points to the same real object
+   * @param[in] rhs to move from
+   */
+  ShadowView(ShadowView&& rhs);
+
+  /**
+   * Move assignment operator. Changes this handle to point to another real object
+   * @param[in] rhs to move from
+   * @return reference to this
+   */
+  ShadowView& operator=(ShadowView&& rhs);
 
   /**
    * @brief Destructor
diff --git a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp
index d19ff68..9e65519 100644
--- a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp
+++ b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,19 +34,13 @@ SuperBlurView SuperBlurView::New(unsigned int blurLevels)
   return Internal::SuperBlurView::New(blurLevels);
 }
 
-SuperBlurView::SuperBlurView(const SuperBlurView& handle)
-: Control(handle)
-{
-}
+SuperBlurView::SuperBlurView(const SuperBlurView& handle) = default;
 
-SuperBlurView& SuperBlurView::operator=(const SuperBlurView& rhs)
-{
-  if(&rhs != this)
-  {
-    Control::operator=(rhs);
-  }
-  return *this;
-}
+SuperBlurView& SuperBlurView::operator=(const SuperBlurView& rhs) = default;
+
+SuperBlurView::SuperBlurView(SuperBlurView&& handle) = default;
+
+SuperBlurView& SuperBlurView::operator=(SuperBlurView&& rhs) = default;
 
 SuperBlurView::~SuperBlurView()
 {
diff --git a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h
index 67ac339..c7b29be 100644
--- a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h
+++ b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_SUPER_BLUR_VIEW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,6 +109,23 @@ public:
   SuperBlurView& operator=(const SuperBlurView& rhs);
 
   /**
+   * @brief Move constructor.
+   *
+   * Creates another handle that points to the same real object.
+   * @param[in] handle the handle to move from
+   */
+  SuperBlurView(SuperBlurView&& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * Changes this handle to point to another real object.
+   * @param[in] rhs the handle to move from
+   * @return a reference to this
+   */
+  SuperBlurView& operator=(SuperBlurView&& rhs);
+
+  /**
    * @brief Destructor
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.cpp
new file mode 100644
index 0000000..1d4ad58
--- /dev/null
+++ b/dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-controls/text-anchor-impl.h>
+
+using namespace Dali;
+
+namespace Dali
+{
+namespace Toolkit
+{
+TextAnchor TextAnchor::New()
+{
+  return Internal::TextAnchor::New();
+}
+
+TextAnchor::TextAnchor()
+{
+}
+
+TextAnchor::TextAnchor(const TextAnchor& handle) = default;
+
+TextAnchor& TextAnchor::operator=(const TextAnchor& handle) = default;
+
+TextAnchor::TextAnchor(TextAnchor&& handle) = default;
+
+TextAnchor& TextAnchor::operator=(TextAnchor&& handle) = default;
+
+TextAnchor::~TextAnchor()
+{
+}
+
+TextAnchor TextAnchor::DownCast(BaseHandle handle)
+{
+  return Control::DownCast<TextAnchor, Internal::TextAnchor>(handle);
+}
+
+TextAnchor::TextAnchor(Internal::TextAnchor& implementation)
+: Control(implementation)
+{
+}
+
+TextAnchor::TextAnchor(Dali::Internal::CustomActor* internal)
+: Control(internal)
+{
+  VerifyCustomActorPointer<Internal::TextAnchor>(internal);
+}
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h
new file mode 100644
index 0000000..62b021f
--- /dev/null
+++ b/dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h
@@ -0,0 +1,155 @@
+#ifndef DALI_TOOLKIT_TEXT_ANCHOR_DEVEL_H
+#define DALI_TOOLKIT_TEXT_ANCHOR_DEVEL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal DALI_INTERNAL
+{
+class TextAnchor;
+}
+
+/**
+ * @brief A control which renders anchor (hyperlink) in hypertext.
+ */
+class DALI_TOOLKIT_API TextAnchor : public Control
+{
+public:
+  /**
+   * @brief The start and end property ranges for this control.
+   */
+  enum PropertyRange
+  {
+    PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
+    PROPERTY_END_INDEX   = PROPERTY_START_INDEX + 1000 ///< Reserve property indices
+  };
+
+  /**
+   * @brief An enumeration of properties belonging to the TextAnchor class.
+   */
+  struct Property
+  {
+    enum
+    {
+      /**
+       * @brief The index of a character in text at which an anchor starts.
+       * @details Name "startCharacterIndex", type INTEGER.
+       */
+      START_CHARACTER_INDEX = PROPERTY_START_INDEX,
+
+      /**
+       * @brief The index of a character in text that stands one position after the anchor's last character.
+       * @details Name "endCharacterIndex", type INTEGER.
+       */
+      END_CHARACTER_INDEX,
+
+      /**
+       * @brief The URI associated with an anchor.
+       * @details Name "uri", type STRING.
+       */
+      URI
+    };
+  };
+
+  /**
+   * @brief Creates the TextAnchor control.
+   * @return A handle to the TextAnchor control.
+   */
+  static TextAnchor New();
+
+  /**
+   * @brief Creates an empty handle.
+   */
+  TextAnchor();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] handle The handle to copy from.
+   */
+  TextAnchor(const TextAnchor& handle);
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle The handle to copy from.
+   * @return A reference to this.
+   */
+  TextAnchor& operator=(const TextAnchor& handle);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] handle The handle to move from.
+   */
+  TextAnchor(TextAnchor&& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] handle The handle to move from.
+   * @return A reference to this.
+   */
+  TextAnchor& operator=(TextAnchor&& handle);
+
+  /**
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   */
+  ~TextAnchor();
+
+  /**
+   * @brief Downcast a handle to TextAnchor.
+   *
+   * If the BaseHandle points is a TextAnchor the downcast returns a valid handle.
+   * If not the returned handle is left empty.
+   *
+   * @param[in] handle Handle to an object
+   * @return handle to a TextAnchor or an empty handle
+   */
+  static TextAnchor DownCast(BaseHandle handle);
+
+public: // Not intended for application developers
+  /**
+   * @brief Creates a handle using the Toolkit::Internal implementation.
+   *
+   * @param[in] implementation The Control implementation.
+   */
+  DALI_INTERNAL TextAnchor(Internal::TextAnchor& implementation);
+
+  /**
+   * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
+   *
+   * @param[in]  internal  A pointer to the internal CustomActor.
+   */
+  explicit DALI_INTERNAL TextAnchor(Dali::Internal::CustomActor* internal);
+
+}; // Class TextAnchor
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_ANCHOR_DEVEL_H
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp
index f3f073b..eeef11f 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp
+++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,11 @@ SelectionClearedSignalType& SelectionClearedSignal(TextEditor textEditor)
   return GetImpl(textEditor).SelectionClearedSignal();
 }
 
+SelectionStartedSignalType& SelectionStartedSignal(TextEditor textEditor)
+{
+  return GetImpl(textEditor).SelectionStartedSignal();
+}
+
 void SelectWholeText(TextEditor textEditor)
 {
   GetImpl(textEditor).SelectWholeText();
@@ -80,6 +85,21 @@ void ScrollBy(TextEditor textEditor, Vector2 scroll)
   GetImpl(textEditor).ScrollBy(scroll);
 }
 
+Vector<Vector2> GetTextSize(TextEditor textEditor, const uint32_t startIndex, const uint32_t endIndex)
+{
+  return GetImpl(textEditor).GetTextSize(startIndex, endIndex);
+}
+
+Vector<Vector2> GetTextPosition(TextEditor textEditor, const uint32_t startIndex, const uint32_t endIndex)
+{
+  return GetImpl(textEditor).GetTextPosition(startIndex, endIndex);
+}
+
+Rect<> GetTextBoundingRectangle(TextEditor textEditor, uint32_t startIndex, uint32_t endIndex)
+{
+  return GetImpl(textEditor).GetTextBoundingRectangle(startIndex, endIndex);
+}
+
 string CopyText(TextEditor textEditor)
 {
   return GetImpl(textEditor).CopyText();
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
index 177be64..9aab35f 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -178,6 +178,14 @@ enum Type
   FONT_SIZE_SCALE,
 
   /**
+   * @brief True to enable the font size scale or false to disable.
+   * @details Name "enableFontSizeScale", type Property::BOOLEAN.
+   * @note The default value is true.
+   * If false, font size scale is not apppied.
+   */
+  ENABLE_FONT_SIZE_SCALE,
+
+  /**
    * @brief The position for primary cursor.
    * @details Name "primaryCursorPosition", type Property::INTEGER.
    */
@@ -274,6 +282,49 @@ enum Type
    * @note If the font size is larger than the line size, it works with the font size.
    */
   MIN_LINE_SIZE,
+
+  /**
+   * @brief A horizontal line through the text center.
+   * @details Name "strikethrough", type Property::MAP.
+   */
+  STRIKETHROUGH,
+
+  /**
+   * @brief The strikethrough parameters of the new input text.
+   * @details Name "inputStrikethrough", type Property::MAP.
+   */
+  INPUT_STRIKETHROUGH,
+
+  /**
+  * @brief The spaces between characters in Pixels.
+  * @details Name "characterSpacing", type Property::FLOAT.
+  * @note
+  *   A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+  *   The default value is 0.f which does nothing.
+  */
+  CHARACTER_SPACING,
+
+  /**
+   * @brief the relative height of the line (a factor that will be multiplied by text height).
+   * @details Name "relativeLineSize", type Property::FLOAT.
+   * @note If the value is less than 1, the lines could to be overlapped.
+   */
+  RELATIVE_LINE_SIZE,
+
+  /**
+   * @brief The line vertical alignment.
+   * @details Name "verticalAlignment", type Property::STRING or type VerticalAlignment::Type (Property::INTEGER).
+   *          Values "TOP", "CENTER", "BOTTOM", default TOP.
+   * @note Return type is Property::STRING
+   */
+  VERTICAL_ALIGNMENT,
+
+  /**
+   * @brief Sets the selection popup style
+   * @details Name "selectionPopupStyle", type Property::MAP.
+   * @see Dali::Toolkit::TextSelectionPopup::Property
+   */
+  SELECTION_POPUP_STYLE,
 };
 
 } // namespace Property
@@ -414,6 +465,23 @@ using SelectionClearedSignalType = Signal<void(TextEditor)>;
 DALI_TOOLKIT_API SelectionClearedSignalType& SelectionClearedSignal(TextEditor textEditor);
 
 /**
+ * @brief selection start signal type.
+ */
+using SelectionStartedSignalType = Signal<void(TextEditor)>;
+
+/**
+ * @brief This signal is emitted when the selection start.
+ *
+ * A callback of the following type may be connected:
+ * @code
+ *   void YourCallbackName( TextEditor textEditor);
+ * @endcode
+ * @param[in] textEditor The instance of TextEditor.
+ * @return The signal to connect to
+ */
+DALI_TOOLKIT_API SelectionStartedSignalType& SelectionStartedSignal(TextEditor textEditor);
+
+/**
  * @brief Select the whole text of TextEditor.
  *
  * @param[in] textEditor The instance of TextEditor.
@@ -451,6 +519,40 @@ DALI_TOOLKIT_API void SelectText(TextEditor textEditor, const uint32_t start, co
 DALI_TOOLKIT_API void ScrollBy(TextEditor textEditor, Vector2 scroll);
 
 /**
+ * @brief Get the rendered size of a specific text range.
+ * if the requested text is at multilines, multiple sizes will be returned for each text located in a separate line.
+ * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+ *
+ * @param[in] textEditor The instance of TextEditor.
+ * @param[in] startIndex start index of the text requested to calculate size for.
+ * @param[in] endIndex end index(included) of the text requested to calculate size for.
+ * @return list of sizes of the reuested text.
+ */
+DALI_TOOLKIT_API Vector<Vector2> GetTextSize(TextEditor textEditor, const uint32_t startIndex, const uint32_t endIndex);
+
+/**
+ * @brief Get the top/left rendered position of a specific text range.
+ * if the requested text is at multilines, multiple positions will be returned for each text located in a separate line.
+ * if a line contains characters with different directions, multiple positions will be returned for each block of contiguous characters with the same direction.
+ *
+ * @param[in] textEditor The instance of TextEditor.
+ * @param[in] startIndex start index of the text requested to get position to.
+ * @param[in] endIndex end index(included) of the text requested to get position to.
+ * @return list of positions of the requested text.
+ */
+DALI_TOOLKIT_API Vector<Vector2> GetTextPosition(TextEditor textEditor, const uint32_t startIndex, const uint32_t endIndex);
+
+/**
+ * @brief Gets the bounding box of a specific text range.
+ *
+ * @param[in] textEditor The instance of textEditor.
+ * @param[in] startIndex start index of the text requested to get bounding box to.
+ * @param[in] endIndex end index(included) of the text requested to get bounding box to.
+ * @return bounding box of the requested text.
+ */
+DALI_TOOLKIT_API Rect<> GetTextBoundingRectangle(TextEditor textEditor, uint32_t startIndex, uint32_t endIndex);
+
+/**
  * @brief Copy and return the selected text of TextEditor.
  *
  * @param[in] textEditor The instance of TextEditor.
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp
index e5abdfa..2105756 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp
+++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,11 @@ SelectionClearedSignalType& SelectionClearedSignal(TextField textField)
   return GetImpl(textField).SelectionClearedSignal();
 }
 
+SelectionStartedSignalType& SelectionStartedSignal(TextField textField)
+{
+  return GetImpl(textField).SelectionStartedSignal();
+}
+
 void SelectWholeText(TextField textField)
 {
   GetImpl(textField).SelectWholeText();
@@ -70,6 +75,21 @@ void SelectText(TextField textField, const uint32_t start, const uint32_t end)
   GetImpl(textField).SelectText(start, end);
 }
 
+Vector<Vector2> GetTextSize(TextField textField, const uint32_t startIndex, const uint32_t endIndex)
+{
+  return GetImpl(textField).GetTextSize(startIndex, endIndex);
+}
+
+Vector<Vector2> GetTextPosition(TextField textField, const uint32_t startIndex, const uint32_t endIndex)
+{
+  return GetImpl(textField).GetTextPosition(startIndex, endIndex);
+}
+
+Rect<> GetTextBoundingRectangle(TextField textField, uint32_t startIndex, uint32_t endIndex)
+{
+  return GetImpl(textField).GetTextBoundingRectangle(startIndex, endIndex);
+}
+
 string CopyText(TextField textField)
 {
   return GetImpl(textField).CopyText();
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
index 10d79e8..a061819 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_FIELD_DEVEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -163,6 +163,14 @@ enum
   FONT_SIZE_SCALE,
 
   /**
+   * @brief True to enable the font size scale or false to disable.
+   * @details Name "enableFontSizeScale", type Property::BOOLEAN.
+   * @note The default value is true.
+   * If false, font size scale is not apppied.
+   */
+  ENABLE_FONT_SIZE_SCALE,
+
+  /**
    * @brief The position for primary cursor.
    * @details Name "primaryCursorPosition", type Property::INTEGER.
    */
@@ -213,6 +221,34 @@ enum
   * @see DevelText::EllipsisPosition
   */
   ELLIPSIS_POSITION,
+
+  /**
+   * @brief A horizontal line through the text center.
+   * @details Name "strikethrough", type Property::MAP.
+   */
+  STRIKETHROUGH,
+
+  /**
+   * @brief The strikethrough parameters of the new input text.
+   * @details Name "inputStrikethrough", type Property::MAP.
+   */
+  INPUT_STRIKETHROUGH,
+
+  /**
+  * @brief The spaces between characters in Pixels.
+  * @details Name "characterSpacing", type Property::FLOAT.
+  * @note
+  *   A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+  *   The default value is 0.f which does nothing.
+  */
+  CHARACTER_SPACING,
+
+  /**
+   * @brief Sets the selection popup style
+   * @details Name "selectionPopupStyle", type Property::MAP.
+   * @see Dali::Toolkit::TextSelectionPopup::Property
+   */
+  SELECTION_POPUP_STYLE,
 };
 
 } // namespace Property
@@ -336,6 +372,57 @@ using SelectionClearedSignalType = Signal<void(TextField)>;
 DALI_TOOLKIT_API SelectionClearedSignalType& SelectionClearedSignal(TextField textField);
 
 /**
+ * @brief selection start signal type.
+ */
+using SelectionStartedSignalType = Signal<void(TextField)>;
+
+/**
+ * @brief This signal is emitted when the selection start.
+ *
+ * A callback of the following type may be connected:
+ * @code
+ *   void YourCallbackName( TextField textField);
+ * @endcode
+ * @param[in] textField The instance of TextField.
+ * @return The signal to connect to
+ */
+DALI_TOOLKIT_API SelectionStartedSignalType& SelectionStartedSignal(TextField textField);
+
+/**
+ * @brief Get the rendered size of a specific text range.
+ * if the requested text is at multilines, multiple sizes will be returned for each text located in a separate line.
+ * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+ *
+ * @param[in] textField The instance of TextField.
+ * @param[in] startIndex start index of the text requested to calculate size for.
+ * @param[in] endIndex end index(included) of the text requested to calculate size for.
+ * @return list of sizes of the reuested text.
+ */
+DALI_TOOLKIT_API Vector<Vector2> GetTextSize(TextField textField, const uint32_t startIndex, const uint32_t endIndex);
+
+/**
+ * @brief Get the top/left rendered position of a specific text range.
+ * if the requested text is at multilines, multiple positions will be returned for each text located in a separate line.
+ * if a line contains characters with different directions, multiple positions will be returned for each block of contiguous characters with the same direction.
+ *
+ * @param[in] textField The instance of TextField.
+ * @param[in] startIndex start index of the text requested to get position to.
+ * @param[in] endIndex end index(included) of the text requested to get position to.
+ * @return list of positions of the requested text.
+ */
+DALI_TOOLKIT_API Vector<Vector2> GetTextPosition(TextField textField, const uint32_t startIndex, const uint32_t endIndex);
+
+/**
+ * @brief Gets the bounding box of a specific text range.
+ *
+ * @param[in] textField The instance of textField.
+ * @param[in] startIndex start index of the text requested to get bounding box to.
+ * @param[in] endIndex end index(included) of the text requested to get bounding box to.
+ * @return bounding box of the requested text.
+ */
+DALI_TOOLKIT_API Rect<> GetTextBoundingRectangle(TextField textField, uint32_t startIndex, uint32_t endIndex);
+
+/**
  * @brief Select the whole text of TextField.
  *
  * @param[in] textField The instance of TextField.
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.cpp
index 0d6cd0b..48a4567 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.cpp
+++ b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.cpp
@@ -30,6 +30,61 @@ AnchorClickedSignalType& AnchorClickedSignal(TextLabel textLabel)
   return GetImpl(textLabel).AnchorClickedSignal();
 }
 
+TextFitChangedSignalType& TextFitChangedSignal(TextLabel textLabel)
+{
+  return GetImpl(textLabel).TextFitChangedSignal();
+}
+
+Vector<Vector2> GetTextSize(TextLabel textLabel, const uint32_t startIndex, const uint32_t endIndex)
+{
+  return GetImpl(textLabel).GetTextSize(startIndex, endIndex);
+}
+
+Vector<Vector2> GetTextPosition(TextLabel textLabel, const uint32_t startIndex, const uint32_t endIndex)
+{
+  return GetImpl(textLabel).GetTextPosition(startIndex, endIndex);
+}
+
+Rect<> GetTextBoundingRectangle(TextLabel textLabel, uint32_t startIndex, uint32_t endIndex)
+{
+  return GetImpl(textLabel).GetTextBoundingRectangle(startIndex, endIndex);
+}
+
+void SetTextFitArray(TextLabel textLabel, const bool enable, std::vector<FitOption>& fitOptions)
+{
+  GetImpl(textLabel).SetTextFitArray(enable, fitOptions);
+}
+
+std::vector<FitOption>& GetTextFitArray(TextLabel textLabel)
+{
+  return GetImpl(textLabel).GetTextFitArray();
+}
+
+bool IsTextFitArrayEnabled(TextLabel textLabel)
+{
+  return GetImpl(textLabel).IsTextFitArrayEnabled();
+}
+
+void SetRemoveFrontInset(TextLabel textLabel, const bool remove)
+{
+  GetImpl(textLabel).SetRemoveFrontInset(remove);
+}
+
+bool IsRemoveFrontInset(TextLabel textLabel)
+{
+  return GetImpl(textLabel).IsRemoveFrontInset();
+}
+
+void SetRemoveBackInset(TextLabel textLabel, const bool remove)
+{
+  GetImpl(textLabel).SetRemoveBackInset(remove);
+}
+
+bool IsRemoveBackInset(TextLabel textLabel)
+{
+  return GetImpl(textLabel).IsRemoveBackInset();
+}
+
 } // namespace DevelTextLabel
 
 } // namespace Toolkit
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
index ac0f30c..ed2e5d9 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_LABEL_DEVEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 
@@ -156,16 +159,198 @@ enum Type
   FONT_SIZE_SCALE,
 
   /**
+   * @brief True to enable the font size scale or false to disable.
+   * @details Name "enableFontSizeScale", type Property::BOOLEAN.
+   * @note The default value is true.
+   * If false, font size scale is not apppied.
+   */
+  ENABLE_FONT_SIZE_SCALE,
+
+  /**
   * @brief The enumerations used to specify whether to position the ellipsis at the END, START or MIDDLE of the text.
   * @details Name "EllipsisPosition", type [Type](@ref Dali::Toolkit::DevelText::EllipsisPosition::Type) (Property::INTEGER), or Property::STRING. Read/Write
   * @note Default is EllipsisPosition::END.
   * @see DevelText::EllipsisPosition
   */
   ELLIPSIS_POSITION,
+
+  /**
+   * @brief The default strikethrough parameters.
+   * @details Name "strikethrough", type Property::MAP.
+   *
+   * The strikethrough map contains the following keys:
+   *
+   * | %Property Name       | Type     | Required | Description                                                                                                        |
+   * |----------------------|----------|----------|--------------------------------------------------------------------------------------------------------------------|
+   * | enable               | BOOLEAN  | No       | True to enable the strikethrough or false to disable (the default value is false)                                  |
+   * | color                | VECTOR4  | No       | The color of the strikethrough (the default value is Color::BLACK)                                                 |
+   * | height               | FLOAT    | No       | The height of the strikethrough (the default value is 0)                                                               |
+   *
+   */
+  STRIKETHROUGH,
+
+  /**
+  * @brief The spaces between characters in Pixels.
+  * @details Name "characterSpacing", type Property::FLOAT.
+  * @note
+  *   A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+  *   The default value is 0.f which does nothing.
+  */
+  CHARACTER_SPACING,
+
+  /**
+   * @brief the relative height of the line (a factor that will be multiplied by text height).
+   * @details Name "relativeLineSize", type Property::FLOAT.
+   * @note If the value is less than 1, the lines could to be overlapped.
+   */
+  RELATIVE_LINE_SIZE,
+
+  /**
+   * @brief The anchor color that will be used by default in markup processing.
+   * @details Name "anchorColor", type Property::VECTOR4.
+   * @note If there is a color attribute in the anchor tag, the markup attribute takes precedence.
+   */
+  ANCHOR_COLOR,
+
+  /**
+   * @brief The anchor clicked color that will be used by default in markup processing.
+   * @details Name "anchorClickedColor", type Property::VECTOR4.
+   * @note If there is a color attribute in the anchor tag, the markup attribute takes precedence.
+   */
+  ANCHOR_CLICKED_COLOR,
+
+  /**
+   * @brief Whether to trim the xBearing of first glyph of the text.
+   * @details Name "removeFrontInset", type Property::BOOLEAN.
+   */
+  REMOVE_FRONT_INSET,
+
+  /**
+   * @brief Whether to trim the advance of last glyph of the text.
+   * @details Name "removeBackInset", type Property::BOOLEAN.
+   */
+  REMOVE_BACK_INSET,
 };
 
 } // namespace Property
 
+struct FitOption
+{
+  FitOption(float pointSize = 0.0f, float minLineSize = 0.0f)
+  : mPointSize(pointSize), mMinLineSize(minLineSize) {}
+
+  float GetPointSize() const
+  {
+    return mPointSize;
+  }
+  float GetMinLineSize() const
+  {
+    return mMinLineSize;
+  }
+  void SetPointSize(float pointSize)
+  {
+    mPointSize = pointSize;
+  }
+  void SetMinLineSize(float minLineSize)
+  {
+    mMinLineSize = minLineSize;
+  }
+
+private:
+  float mPointSize   = 0.0f;
+  float mMinLineSize = 0.0f;
+};
+
+/**
+ * @brief Get the rendered size of a specific text range.
+ * if the requested text is at multilines, multiple sizes will be returned for each text located in a separate line.
+ * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] startIndex start index of the text requested to calculate size for.
+ * @param[in] endIndex end index(included) of the text requested to calculate size for.
+ * @return list of sizes of the reuested text.
+ */
+DALI_TOOLKIT_API Vector<Vector2> GetTextSize(TextLabel textLabel, const uint32_t startIndex, const uint32_t endIndex);
+
+/**
+ * @brief Get the top/left rendered position of a specific text range.
+ * if the requested text is at multilines, multiple positions will be returned for each text located in a separate line.
+ * if a line contains characters with different directions, multiple positions will be returned for each block of contiguous characters with the same direction.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] startIndex start index of the text requested to get position to.
+ * @param[in] endIndex end index(included) of the text requested to get position to.
+ * @return list of positions of the requested text.
+ */
+DALI_TOOLKIT_API Vector<Vector2> GetTextPosition(TextLabel textLabel, const uint32_t startIndex, const uint32_t endIndex);
+
+/**
+ * @brief Gets the bounding box of a specific text range.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] startIndex start index of the text requested to get bounding box to.
+ * @param[in] endIndex end index(included) of the text requested to get bounding box to.
+ * @return bounding box of the requested text.
+ */
+DALI_TOOLKIT_API Rect<> GetTextBoundingRectangle(TextLabel textLabel, uint32_t startIndex, uint32_t endIndex);
+
+/**
+ * @brief Set text fit array to text label.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] enable Whether the text fit array is enabled or not.
+ * @param[in] fitOptions list of the fit options.
+ */
+DALI_TOOLKIT_API void SetTextFitArray(TextLabel textLabel, const bool enable, std::vector<FitOption>& fitOptions);
+
+/**
+ * @brief Get the text fit array of text label.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @return list of the fit options.
+ */
+DALI_TOOLKIT_API std::vector<FitOption>& GetTextFitArray(TextLabel textLabel);
+
+/**
+ * @brief Whether the text fit array is enabled or not.
+ *
+ * @return True if the text fit array is enabled.
+ */
+DALI_TOOLKIT_API bool IsTextFitArrayEnabled(TextLabel textLabel);
+
+/**
+ * @brief Set removing front inset to text label.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] remove Whether front inset of text label has to be removed or not.
+ */
+DALI_TOOLKIT_API void SetRemoveFrontInset(TextLabel textLabel, const bool remove);
+
+/**
+ * @brief Whether front inset of text label is removed or not.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @return True if the front inset of text label is removed.
+ */
+DALI_TOOLKIT_API bool IsRemoveFrontInset(TextLabel textLabel);
+
+/**
+ * @brief Set removing back inset to text label.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] remove Whether back inset of text label has to be removed or not.
+ */
+DALI_TOOLKIT_API void SetRemoveBackInset(TextLabel textLabel, const bool remove);
+
+/**
+ * @brief Whether back inset of text label is removed or not.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @return True if the back inset of text label is removed.
+ */
+DALI_TOOLKIT_API bool IsRemoveBackInset(TextLabel textLabel);
+
 /**
  * @brief Anchor clicked signal type.
  *
@@ -176,6 +361,11 @@ enum Type
 using AnchorClickedSignalType = Signal<void(TextLabel, const char*, uint32_t)>;
 
 /**
+ * @brief TextFit property changed signal type.
+ */
+using TextFitChangedSignalType = Signal<void(TextLabel)>;
+
+/**
  * @brief This signal is emitted when the anchor is clicked.
  *
  * A callback of the following type may be connected:
@@ -187,6 +377,18 @@ using AnchorClickedSignalType = Signal<void(TextLabel, const char*, uint32_t)>;
  */
 DALI_TOOLKIT_API AnchorClickedSignalType& AnchorClickedSignal(TextLabel textLabel);
 
+/**
+ * @brief This signal is emitted when the textfit property is changed.
+ *
+ * A callback of the following type may be connected:
+ * @code
+ *   void YourCallbackName(TextLabel textLabel);
+ * @endcode
+ * @param[in] textLabel The instance of TextLabel.
+ * @return The signal to connect to.
+ */
+DALI_TOOLKIT_API TextFitChangedSignalType& TextFitChangedSignal(TextLabel textLabel);
+
 } // namespace DevelTextLabel
 
 } // namespace Toolkit
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
index 9f92518..2f03c72 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
+++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,19 +36,13 @@ TextSelectionPopup::TextSelectionPopup()
 {
 }
 
-TextSelectionPopup::TextSelectionPopup(const TextSelectionPopup& handle)
-: Control(handle)
-{
-}
+TextSelectionPopup::TextSelectionPopup(const TextSelectionPopup& handle) = default;
 
-TextSelectionPopup& TextSelectionPopup::operator=(const TextSelectionPopup& handle)
-{
-  if(&handle != this)
-  {
-    Control::operator=(handle);
-  }
-  return *this;
-}
+TextSelectionPopup& TextSelectionPopup::operator=(const TextSelectionPopup& handle) = default;
+
+TextSelectionPopup::TextSelectionPopup(TextSelectionPopup&& handle) = default;
+
+TextSelectionPopup& TextSelectionPopup::operator=(TextSelectionPopup&& handle) = default;
 
 TextSelectionPopup::~TextSelectionPopup()
 {
@@ -79,6 +73,16 @@ void TextSelectionPopup::HidePopup()
   GetImpl(*this).HidePopup();
 }
 
+void TextSelectionPopup::SetProperties(const Dali::Property::Map& properties)
+{
+  GetImpl(*this).SetProperties(properties);
+}
+
+void TextSelectionPopup::GetProperties(Dali::Property::Map& properties)
+{
+  GetImpl(*this).GetProperties(properties);
+}
+
 TextSelectionPopup::TextSelectionPopup(Internal::TextSelectionPopup& implementation)
 : Control(implementation)
 {
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
index 4080c90..720b37c 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_SELECTION_POPUP_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
+#include <dali/public-api/object/property-map.h>
 
 namespace Dali
 {
@@ -163,6 +164,12 @@ public:
       POPUP_PRESSED_COLOR,
 
       /**
+       * @brief The corner radius of the option when pressed.
+       * @details Name "popupPressedCornerRadius", type float.
+       */
+      POPUP_PRESSED_CORNER_RADIUS,
+
+      /**
        * @brief The image to use for the option when pressed.
        * @details Name "popupPressedImage", type string.
        */
@@ -185,7 +192,42 @@ public:
        * @details Name "backgroundBorder", type Property::Map.
        * @note Optional.
        */
-      BACKGROUND_BORDER
+      BACKGROUND_BORDER,
+
+      /**
+       * @brief The popup background.
+       * @details Name "background", type Property::Map.
+       * @note Optional.
+       */
+      BACKGROUND,
+
+      /**
+       * @brief The minimum size of popup label.
+       * @details Name "labelMinimumSize", type Vector2.
+       * @note Optional.
+       */
+      LABEL_MINIMUM_SIZE,
+
+      /**
+       * @brief The padding of popup label.
+       * @details Name "labelPadding", type Vector4.
+       * @note Optional.
+       */
+      LABEL_PADDING,
+
+      /**
+       * @brief The text visual map of popup label.
+       * @details Name "labelTextVisual", type Property::Map.
+       * @note Optional.
+       */
+      LABEL_TEXT_VISUAL,
+
+      /**
+       * @brief Whether the scroll-bar is enabled.
+       * @details Name "enableScrollBar", type Property::BOOLEAN.
+       * @note Optional.
+       */
+      ENABLE_SCROLL_BAR
     };
   };
 
@@ -217,6 +259,21 @@ public:
   TextSelectionPopup& operator=(const TextSelectionPopup& handle);
 
   /**
+   * @brief Move constructor.
+   *
+   * @param[in] handle The handle to move from.
+   */
+  TextSelectionPopup(TextSelectionPopup&& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] handle The handle to move from.
+   * @return A reference to this.
+   */
+  TextSelectionPopup& operator=(TextSelectionPopup&& handle);
+
+  /**
    * @brief Destructor
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
@@ -257,6 +314,20 @@ public:
    */
   void HidePopup();
 
+  /**
+   * @brief Used to set options of text selection popup
+   *
+   * @param[in] properties The text selection popup options
+   */
+  void SetProperties(const Dali::Property::Map& properties);
+
+  /**
+   * @brief Retrieve property map of text selection popup options
+   *
+   * @param[out] properties The text selection popup options
+   */
+  void GetProperties(Dali::Property::Map& properties);
+
 public: // Not intended for application developers
   /**
    * @brief Creates a handle using the Toolkit::Internal implementation.
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.cpp b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.cpp
index 64515fc..deb9fe3 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.cpp
+++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,19 +36,13 @@ TextSelectionToolbar::TextSelectionToolbar()
 {
 }
 
-TextSelectionToolbar::TextSelectionToolbar(const TextSelectionToolbar& handle)
-: Control(handle)
-{
-}
+TextSelectionToolbar::TextSelectionToolbar(const TextSelectionToolbar& handle) = default;
 
-TextSelectionToolbar& TextSelectionToolbar::operator=(const TextSelectionToolbar& handle)
-{
-  if(&handle != this)
-  {
-    Control::operator=(handle);
-  }
-  return *this;
-}
+TextSelectionToolbar& TextSelectionToolbar::operator=(const TextSelectionToolbar& handle) = default;
+
+TextSelectionToolbar::TextSelectionToolbar(TextSelectionToolbar&& handle) = default;
+
+TextSelectionToolbar& TextSelectionToolbar::operator=(TextSelectionToolbar&& handle) = default;
 
 TextSelectionToolbar::~TextSelectionToolbar()
 {
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
index 98b4e7d..7858539 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,6 +94,21 @@ public:
   TextSelectionToolbar& operator=(const TextSelectionToolbar& handle);
 
   /**
+   * @brief Move constructor.
+   *
+   * @param[in] handle The handle to move from.
+   */
+  TextSelectionToolbar(TextSelectionToolbar&& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] handle The handle to move from.
+   * @return A reference to this.
+   */
+  TextSelectionToolbar& operator=(TextSelectionToolbar&& handle);
+
+  /**
    * @brief Destructor
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-spannable.cpp b/dali-toolkit/devel-api/controls/text-controls/text-spannable.cpp
new file mode 100644
index 0000000..a542718
--- /dev/null
+++ b/dali-toolkit/devel-api/controls/text-controls/text-spannable.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/controls/text-controls/text-spannable.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-field-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
+#include <dali-toolkit/internal/controls/text-controls/text-editor-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/text-label-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void SetSpannedText(TextLabel textLabel, const Spanned& spannedText)
+{
+  return GetImpl(textLabel).SetSpannedText(spannedText);
+}
+
+void SetSpannedText(TextField textField, const Spanned& spannedText)
+{
+  return GetImpl(textField).SetSpannedText(spannedText);
+}
+
+void SetSpannedText(TextEditor textEditor, const Spanned& spannedText)
+{
+  return GetImpl(textEditor).SetSpannedText(spannedText);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-spannable.h b/dali-toolkit/devel-api/controls/text-controls/text-spannable.h
new file mode 100644
index 0000000..ef4fa40
--- /dev/null
+++ b/dali-toolkit/devel-api/controls/text-controls/text-spannable.h
@@ -0,0 +1,84 @@
+#ifndef DALI_TOOLKIT_TEXT_TEXT_SPANNABLE_H
+#define DALI_TOOLKIT_TEXT_TEXT_SPANNABLE_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spanned.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-field.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Set the @p spannedText into @p textLabel
+ * the spanned text contains content (text) and format (spans with ranges)
+ * the text is copied into text-controller and the spans are applied on ranges
+ *
+ * @note the TEXT in @p textLabel will be replaced with text from @p spannedText
+ * and all the applied styles @p textLabel will be replaced the styles from @p spannedText
+ * in-case there are styles were applied from markup-processor will be removed
+ *
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] spannedText the text with spans.
+ */
+DALI_TOOLKIT_API void SetSpannedText(TextLabel textLabel, const Spanned& spannedText);
+
+/**
+ * @brief Set the @p spannedText into @p textField
+ * the spanned text contains content (text) and format (spans with ranges)
+ * the text is copied into text-controller and the spans are applied on ranges
+ *
+ * @note the TEXT in @p textField will be replaced with text from @p spannedText
+ * and all the applied styles @p textField will be replaced the styles from @p spannedText
+ * in-case there are styles were applied from markup-processor will be removed
+ *
+ *
+ * @param[in] textField The instance of TextField.
+ * @param[in] spannedText the text with spans.
+ */
+DALI_TOOLKIT_API void SetSpannedText(TextField textField, const Spanned& spannedText);
+
+/**
+ * @brief Set the @p spannedText into @p textEditor
+ * the spanned text contains content (text) and format (spans with ranges)
+ * the text is copied into text-controller and the spans are applied on ranges
+ *
+ * @note the TEXT in @p textEditor will be replaced with text from @p spannedText
+ * and all the applied styles @p textEditor will be replaced the styles from @p spannedText
+ * in-case there are styles were applied from markup-processor will be removed
+ *
+ *
+ * @param[in] textEditor The instance of TextEditor.
+ * @param[in] spannedText the text with spans.
+ */
+DALI_TOOLKIT_API void SetSpannedText(TextEditor textEditor, const Spanned& spannedText);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_TEXT_SPANNABLE_H
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h
index bd6450c..e3641f6 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h
@@ -90,7 +90,29 @@ enum
    * @details Name "height", type Property::STRING or Property::FLOAT. i.e. "1.0" or 1.f
    * @note Optional. If not provided then the default height is used (1 pixel).
    */
-  HEIGHT
+  HEIGHT,
+
+  /**
+   * @brief The type of the underline.
+   * @details Name "type", type Property::STRING or type Text::Underline::Type. i.e "dashed" or Text::Underline::DASHED
+   *          Values "SOLID", "DASHED", "DOUBLE" , default SOLID.
+   * @note Optional. If not provided then the default type is used (solid underline).
+   */
+  TYPE,
+
+  /**
+   * @brief The width in pixels of the dashes of the dashed underline. Only valid when "DASHED" underline type is used.
+   * @details Name "dashWidth", type Property::STRING or Property::FLOAT. e.g. "1.0" or 1.f
+   * @note Optional. If not provided then the default width is used (2 pixel).
+   */
+  DASH_WIDTH,
+
+  /**
+   * @brief The gap in pixels between the dashes of the dashed underline. Only valid when "DASHED" underline type is used.
+   * @details Name "dashGap", type Property::STRING or Property::FLOAT. e.g. "1.0" or 1.f
+   * @note Optional. If not provided then the default gap is used (1 pixel).
+   */
+  DASH_GAP
 };
 
 } // namespace Property
@@ -147,6 +169,38 @@ enum
 
 } // namespace Background
 
+namespace Strikethrough
+{
+namespace Property
+{
+enum
+{
+  /**
+   * @brief Whether the strikethrough is enabled.
+   * @details Name "enable", type Property::STRING or Property::BOOLEAN. i.e. "true", "false", true or false
+   * @note Optional. By default is disabled.
+   */
+  ENABLE,
+
+  /**
+   * @brief The color of the strikethrough.
+   * @details Name "color", type Property::STRING or Property::VECTOR4
+   * @note Optional. If not provided then the default color is black.
+   */
+  COLOR,
+
+  /**
+   * @brief The height in pixels of the strikethrough.
+   * @details Name "height", type Property::STRING or Property::FLOAT. i.e. "1.0" or 1.f
+   * @note Optional. If not provided then the default height is used (1 pixel).
+   */
+  HEIGHT
+};
+
+} // namespace Property
+
+} // namespace Strikethrough
+
 } // namespace DevelText
 
 /**
diff --git a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.cpp b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.cpp
index d700652..b84b5ed 100644
--- a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.cpp
+++ b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,19 +36,13 @@ ToolBar::ToolBar()
 {
 }
 
-ToolBar::ToolBar(const ToolBar& handle)
-: Control(handle)
-{
-}
+ToolBar::ToolBar(const ToolBar& handle) = default;
 
-ToolBar& ToolBar::operator=(const ToolBar& handle)
-{
-  if(&handle != this)
-  {
-    Control::operator=(handle);
-  }
-  return *this;
-}
+ToolBar& ToolBar::operator=(const ToolBar& handle) = default;
+
+ToolBar::ToolBar(ToolBar&& handle) = default;
+
+ToolBar& ToolBar::operator=(ToolBar&& handle) = default;
 
 ToolBar::~ToolBar()
 {
diff --git a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
index 36f4c34..43e6681 100644
--- a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
+++ b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TOOL_BAR_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,16 +55,31 @@ public:
 
   /**
    * Copy constructor. Creates another handle that points to the same real object
-   * @param handle to copy from
+   * @param[in] handle Handle to copy.
    */
   ToolBar(const ToolBar& handle);
 
   /**
    * Assignment operator. Changes this handle to point to another real object
+   * @param[in] handle The handle to copy from.
+   * @return reference to this
    */
   ToolBar& operator=(const ToolBar& handle);
 
   /**
+   * Move constructor. Creates another handle that points to the same real object
+   * @param[in] handle Handle to move.
+   */
+  ToolBar(ToolBar&& handle);
+
+  /**
+   * Move assignment operator. Changes this handle to point to another real object
+   * @param[in] handle The handle to move from.
+   * @return reference to this
+   */
+  ToolBar& operator=(ToolBar&& handle);
+
+  /**
    * @brief Destructor
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
diff --git a/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.cpp b/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.cpp
index 8b3d8e1..9881636 100755
--- a/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.cpp
+++ b/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h b/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h
index 0b015bc..1c0ca6e 100755
--- a/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h
+++ b/dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_WEB_BACK_FORWARD_LIST_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list-item.h>
 #include <vector>
 #include <memory>
 
diff --git a/dali-toolkit/devel-api/controls/web-view/web-context.cpp b/dali-toolkit/devel-api/controls/web-view/web-context.cpp
deleted file mode 100755
index bba91c6..0000000
--- a/dali-toolkit/devel-api/controls/web-view/web-context.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/devel-api/controls/web-view/web-context.h>
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-security-origin.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-WebContext::WebContext(Dali::WebEngineContext& context)
-: mWebEngineContext(context)
-{
-}
-
-WebContext::~WebContext()
-{
-}
-
-Dali::WebEngineContext::CacheModel WebContext::GetCacheModel() const
-{
-  return mWebEngineContext.GetCacheModel();
-}
-
-void WebContext::SetCacheModel(Dali::WebEngineContext::CacheModel cacheModel)
-{
-  mWebEngineContext.SetCacheModel(cacheModel);
-}
-
-void WebContext::SetProxyUri(const std::string& uri)
-{
-  mWebEngineContext.SetProxyUri(uri);
-}
-
-std::string WebContext::GetProxyUri() const
-{
-  return mWebEngineContext.GetProxyUri();
-}
-
-void WebContext::SetProxyBypassRule(const std::string& proxy, const std::string& bypass)
-{
-  mWebEngineContext.SetProxyBypassRule(proxy, bypass);
-}
-
-std::string WebContext::GetProxyBypassRule() const
-{
-  return mWebEngineContext.GetProxyBypassRule();
-}
-
-void WebContext::SetCertificateFilePath(const std::string& certificatePath)
-{
-  mWebEngineContext.SetCertificateFilePath(certificatePath);
-}
-
-std::string WebContext::GetCertificateFilePath() const
-{
-  return mWebEngineContext.GetCertificateFilePath();
-}
-
-void WebContext::SetDefaultProxyAuth(const std::string& username, const std::string& password)
-{
-  mWebEngineContext.SetDefaultProxyAuth(username, password);
-}
-
-void WebContext::DeleteAllWebDatabase()
-{
-  mWebEngineContext.DeleteAllWebDatabase();
-}
-
-bool WebContext::GetWebDatabaseOrigins(Dali::WebEngineContext::WebEngineSecurityOriginAcquiredCallback callback)
-{
-  return mWebEngineContext.GetWebDatabaseOrigins(callback);
-}
-
-bool WebContext::DeleteWebDatabase(Dali::WebEngineSecurityOrigin& origin)
-{
-  return mWebEngineContext.DeleteWebDatabase(origin);
-}
-
-bool WebContext::GetWebStorageOrigins(Dali::WebEngineContext::WebEngineSecurityOriginAcquiredCallback callback)
-{
-  return mWebEngineContext.GetWebStorageOrigins(callback);
-}
-
-bool WebContext::GetWebStorageUsageForOrigin(Dali::WebEngineSecurityOrigin& origin, Dali::WebEngineContext::WebEngineStorageUsageAcquiredCallback callback)
-{
-  return mWebEngineContext.GetWebStorageUsageForOrigin(origin, callback);
-}
-
-void WebContext::DeleteAllWebStorage()
-{
-  mWebEngineContext.DeleteAllWebStorage();
-}
-
-bool WebContext::DeleteWebStorage(Dali::WebEngineSecurityOrigin& origin)
-{
-  return mWebEngineContext.DeleteWebStorage(origin);
-}
-
-void WebContext::DeleteLocalFileSystem()
-{
-  mWebEngineContext.DeleteLocalFileSystem();
-}
-
-void WebContext::ClearCache()
-{
-  mWebEngineContext.ClearCache();
-}
-
-bool WebContext::DeleteApplicationCache(Dali::WebEngineSecurityOrigin& origin)
-{
-  return mWebEngineContext.DeleteApplicationCache(origin);
-}
-
-void WebContext::GetFormPasswordList(Dali::WebEngineContext::WebEngineFormPasswordAcquiredCallback callback)
-{
-  mWebEngineContext.GetFormPasswordList(callback);
-}
-
-void WebContext::RegisterDownloadStartedCallback(Dali::WebEngineContext::WebEngineDownloadStartedCallback callback)
-{
-  mWebEngineContext.RegisterDownloadStartedCallback(callback);
-}
-
-void WebContext::RegisterMimeOverriddenCallback(Dali::WebEngineContext::WebEngineMimeOverriddenCallback callback)
-{
-  mWebEngineContext.RegisterMimeOverriddenCallback(callback);
-}
-
-void WebContext::RegisterRequestInterceptedCallback(Dali::WebEngineContext::WebEngineRequestInterceptedCallback callback)
-{
-  mWebEngineContext.RegisterRequestInterceptedCallback(callback);
-}
-
-void WebContext::EnableCache(bool cacheEnabled)
-{
-  mWebEngineContext.EnableCache(cacheEnabled);
-}
-
-bool WebContext::IsCacheEnabled() const
-{
-  return mWebEngineContext.IsCacheEnabled();
-}
-
-void WebContext::SetAppId(const std::string& appId)
-{
-  mWebEngineContext.SetAppId(appId);
-}
-
-bool WebContext::SetAppVersion(const std::string& appVersion)
-{
-  return mWebEngineContext.SetAppVersion(appVersion);
-}
-
-void WebContext::SetApplicationType(const Dali::WebEngineContext::ApplicationType applicationType)
-{
-  mWebEngineContext.SetApplicationType(applicationType);
-}
-
-void WebContext::SetTimeOffset(float timeOffset)
-{
-  mWebEngineContext.SetTimeOffset(timeOffset);
-}
-
-void WebContext::SetTimeZoneOffset(float timeZoneOffset, float daylightSavingTime)
-{
-  mWebEngineContext.SetTimeZoneOffset(timeZoneOffset, daylightSavingTime);
-}
-
-void WebContext::SetDefaultZoomFactor(float zoomFactor)
-{
-  mWebEngineContext.SetDefaultZoomFactor(zoomFactor);
-}
-
-float WebContext::GetDefaultZoomFactor() const
-{
-  return mWebEngineContext.GetDefaultZoomFactor();
-}
-
-void WebContext::RegisterUrlSchemesAsCorsEnabled(const std::vector<std::string>& schemes)
-{
-  mWebEngineContext.RegisterUrlSchemesAsCorsEnabled(schemes);
-}
-
-void WebContext::RegisterJsPluginMimeTypes(const std::vector<std::string>& mimeTypes)
-{
-  mWebEngineContext.RegisterJsPluginMimeTypes(mimeTypes);
-}
-
-bool WebContext::DeleteAllApplicationCache()
-{
-  return mWebEngineContext.DeleteAllApplicationCache();
-}
-
-bool WebContext::DeleteAllWebIndexedDatabase()
-{
-  return mWebEngineContext.DeleteAllWebIndexedDatabase();
-}
-
-void WebContext::DeleteFormPasswordDataList(const std::vector<std::string>& list)
-{
-  mWebEngineContext.DeleteFormPasswordDataList(list);
-}
-
-void WebContext::DeleteAllFormPasswordData()
-{
-  mWebEngineContext.DeleteAllFormPasswordData();
-}
-
-void WebContext::DeleteAllFormCandidateData()
-{
-  mWebEngineContext.DeleteAllFormCandidateData();
-}
-
-bool WebContext::FreeUnusedMemory()
-{
-  return mWebEngineContext.FreeUnusedMemory();
-}
-
-} // namespace Toolkit
-} // namespace Dali
diff --git a/dali-toolkit/devel-api/controls/web-view/web-context.h b/dali-toolkit/devel-api/controls/web-view/web-context.h
deleted file mode 100755
index 69e723b..0000000
--- a/dali-toolkit/devel-api/controls/web-view/web-context.h
+++ /dev/null
@@ -1,373 +0,0 @@
-#ifndef DALI_TOOLKIT_WEB_CONTEXT_H
-#define DALI_TOOLKIT_WEB_CONTEXT_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-context.h>
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
-
-namespace Dali
-{
-class WebEngineSecurityOrigin;
-
-namespace Toolkit
-{
-/**
- * @addtogroup dali_toolkit_controls_web_view
- * @{
- */
-
-/**
- * @brief WebContext is a control for context of WebView.
- *
- * For working WebContext, a WebEngineContext should be provided.
- *
- */
-class DALI_TOOLKIT_API WebContext
-{
-public:
-  /**
-   * @brief Create a WebContext.
-   *
-   * @param[in] context The context of web engine.
-   */
-  WebContext(Dali::WebEngineContext& context);
-
-  /**
-   * @brief Destructor.
-   */
-  virtual ~WebContext() final;
-
-  /**
-   * @brief Return the cache model type.
-   *
-   * @return #Dali::WebEngineContext::CacheModel
-   */
-  Dali::WebEngineContext::CacheModel GetCacheModel() const;
-
-  /**
-   * @brief Request to set the cache model.
-   *
-   * @param[in] cacheModel The cache model
-   */
-  void SetCacheModel(Dali::WebEngineContext::CacheModel cacheModel);
-
-  /**
-   * @brief Set the given proxy URI to network backend of specific context.
-   *
-   * @param[in] uri The proxy URI to set
-   */
-  void SetProxyUri(const std::string& uri);
-
-  /**
-   * @brief Get the proxy URI from the network backend of specific context.
-   *
-   * @return current proxy URI or null string if it's not set
-   */
-  std::string GetProxyUri() const;
-
-  /**
-   * @brief Set the given proxy to network backend of specific context.
-   *
-   * @param[in] proxy URI to set
-   * @param[in] bypass rule to set
-   */
-  void SetProxyBypassRule(const std::string& proxy, const std::string& bypass);
-
-  /**
-   * @brief Get the proxy bypass rule from the network backend of specific context.
-   *
-   * @return current proxy bypass rule or null string if it's not set
-   */
-  std::string GetProxyBypassRule() const;
-
-  /**
-   * @brief Add CA certificates to persistent NSS certificate database
-   *
-   * Function accepts a path to a CA certificate file, a path to a directory
-   * containing CA certificate files, or a colon-seprarated list of those.
-   * Certificate files should have *.crt extension.
-   * Directories are traversed recursively.
-   *
-   * @param[in] certificatePath path to a CA certificate file(s), see above for details
-   */
-  void SetCertificateFilePath(const std::string& certificatePath);
-
-  /**
-   * @brief Get CA certifcate file path
-   *
-   * It returns an internal string and should not be modified.
-   *
-   * @return certificate_file path which is set during ewk_context_certificate_file_set or null string otherwise
-   */
-  std::string GetCertificateFilePath() const;
-
-  /**
-   * @brief Set a proxy auth credential to network backend of specific context.
-   *
-   * @param[in] username username to set
-   * @param[in] password password to set
-   */
-  void SetDefaultProxyAuth(const std::string& username, const std::string& password);
-
-  /**
-   * @brief Requests for deleting all web databases.
-   */
-  void DeleteAllWebDatabase();
-
-  /**
-   * @brief Request for getting web database origins.
-   *
-   * @param[in] callback callback called after getting web database origins
-   *
-   * @return true if succeeded, false otherwise
-   */
-  bool GetWebDatabaseOrigins(Dali::WebEngineContext::WebEngineSecurityOriginAcquiredCallback callback);
-
-  /**
-   * @brief Request for deleting web databases for origin.
-   *
-   * @param[in] origin database origin
-   *
-   * @return true if succeeded, false otherwise
-   */
-  bool DeleteWebDatabase(Dali::WebEngineSecurityOrigin& origin);
-
-  /**
-   * @brief Gets list of origins that is stored in web storage db.
-   *
-   * @param[in] callback callback called after getting web storage origins
-   *
-   * @return true if succeeded, false otherwise
-   */
-  bool GetWebStorageOrigins(Dali::WebEngineContext::WebEngineSecurityOriginAcquiredCallback callback);
-
-  /**
-   * @brief Get list of origins that is stored in web storage db.
-   *
-   * @param[in] origin storage origin
-   * @param[in] callback callback called after getting web storage origins
-   *
-   * @return true if succeeded, false otherwise
-   */
-  bool GetWebStorageUsageForOrigin(Dali::WebEngineSecurityOrigin& origin, Dali::WebEngineContext::WebEngineStorageUsageAcquiredCallback callback);
-
-  /**
-   * @brief Delete all web storage.
-   *
-   * @details This function does not ensure that all data will be removed.
-   *          Should be used to extend free physical memory.
-   */
-  void DeleteAllWebStorage();
-
-  /**
-   * @brief Delete web storage db.
-   *
-   * @param[in] origin origin of db
-   *
-   * @return true if succeeded, false otherwise
-   */
-  bool DeleteWebStorage(Dali::WebEngineSecurityOrigin& origin);
-
-  /**
-   * @brief Request for deleting all local file systems.
-   */
-  void DeleteLocalFileSystem();
-
-  /**
-   * @brief Requests to clear cache
-   */
-  void ClearCache();
-
-  /**
-   * @brief Request for deleting web application cache for origin.
-   *
-   * @param[in] origin application cache origin
-   *
-   * @return true if succeeded, false otherwise
-   */
-  bool DeleteApplicationCache(Dali::WebEngineSecurityOrigin& origin);
-
-  /**
-   * @brief Asynchronous request to get list of all password data.
-   *
-   * @param[in] callback callback called after getting form password
-   */
-  void GetFormPasswordList(Dali::WebEngineContext::WebEngineFormPasswordAcquiredCallback callback);
-
-  /**
-   * @brief Register callback for download started.
-   *
-   * @param[in] callback callback for download started
-   */
-  void RegisterDownloadStartedCallback(Dali::WebEngineContext::WebEngineDownloadStartedCallback callback);
-
-  /**
-   * @brief Register callback for mime overridden.
-   *
-   * @param[in] callback callback for mime overridden
-   */
-  void RegisterMimeOverriddenCallback(Dali::WebEngineContext::WebEngineMimeOverriddenCallback callback);
-
-  /**
-   * @brief Callback to be called when http request need be intercepted.
-   *
-   * @param[in] callback
-   */
-  void RegisterRequestInterceptedCallback(Dali::WebEngineContext::WebEngineRequestInterceptedCallback callback);
-
-  /**
-   * @brief Toggle the cache to be enabled or disabled
-   *
-   * @param[in] cacheEnabled enable or disable cache
-   */
-  void EnableCache(bool cacheEnabled);
-
-  /**
-   * @brief Query if the cache is enabled
-   *
-   * @return true is cache is enabled or false otherwise
-   */
-  bool IsCacheEnabled() const;
-
-  /**
-   * @brief Set application id for context.
-   *
-   * @param[in] appId application id
-   */
-  void SetAppId(const std::string& appId);
-
-  /**
-   * @brief Set application version for context.
-   *
-   * @param[in] appVersion application version
-   *
-   * @return true if successful, false otherwise
-   */
-  bool SetAppVersion(const std::string& appVersion);
-
-  /**
-   * @brief To declare application type
-   *
-   * @param[in] applicationType The Application_Type enum
-   *
-   */
-  void SetApplicationType(const Dali::WebEngineContext::ApplicationType applicationType);
-
-  /**
-   * @brief Set time offset
-   *
-   * @param[in] timeOffset The value will be added to system time as offset
-   */
-  void SetTimeOffset(float timeOffset);
-
-  /**
-   * @brief Set timezone offset
-   *
-   * @param[in] timeZoneOffset offset for time zone.
-   * @param[in] daylightSavingTime The value is for daylight saving time use.
-   */
-  void SetTimeZoneOffset(float timeZoneOffset, float daylightSavingTime);
-
-  /**
-   * @brief Set default zoom factor
-   *
-   * @param[in] zoomFactor default zoom factor
-   */
-  void SetDefaultZoomFactor(float zoomFactor);
-
-  /**
-   * @brief Get default zoom factor
-   *
-   * Gets default zoom factor for all pages opened with this context.
-   *
-   * @return default zoom factor or negative value on error
-   */
-  float GetDefaultZoomFactor() const;
-
-  /**
-   * @brief Register url schemes as CORS enabled
-   *
-   * @param[in] schemes The URL schemes list which will be added to web security policy
-   *
-   */
-  void RegisterUrlSchemesAsCorsEnabled(const std::vector<std::string>& schemes);
-
-  /**
-   * @brief Register JS plugin mime types.
-   *
-   * @param[in] mimeTypes The MIME types will be checked by the renderer frame loader
-   * to skip creating default frame for the object tags with the registered MIME type.
-   */
-  void RegisterJsPluginMimeTypes(const std::vector<std::string>& mimeTypes);
-
-  /**
-   * @brief Request for deleting all web application caches.
-   *
-   * @return @c true on success, otherwise @c false
-   */
-  bool DeleteAllApplicationCache();
-
-  /**
-   * @brief Request for deleting all web indexed databases.
-   *
-   * @return @c true on success, otherwise @c false
-   */
-  bool DeleteAllWebIndexedDatabase();
-
-  /**
-   * @brief Delete a given password data list
-   *
-   * @param[in] list List with Ewk_Password_Data
-   */
-  void DeleteFormPasswordDataList(const std::vector<std::string>& list);
-
-  /**
-   * @brief Delete whole password data from DB
-   */
-  void DeleteAllFormPasswordData();
-
-  /**
-   * @brief Delete all candidate form data from DB
-   */
-  void DeleteAllFormCandidateData();
-
-  /**
-   * @brief Notify low memory to free unused memory.
-   *
-   * @return @c true on success or @c false otherwise.
-   */
-  bool FreeUnusedMemory();
-
-private:
-  Dali::WebEngineContext& mWebEngineContext;
-};
-
-/**
- * @}
- */
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_WEB_CONTEXT_H
diff --git a/dali-toolkit/devel-api/controls/web-view/web-cookie-manager.cpp b/dali-toolkit/devel-api/controls/web-view/web-cookie-manager.cpp
deleted file mode 100755
index 61529a8..0000000
--- a/dali-toolkit/devel-api/controls/web-view/web-cookie-manager.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-WebCookieManager::WebCookieManager(Dali::WebEngineCookieManager& manager)
-: mWebEngineCookieManager(manager)
-{
-}
-
-WebCookieManager::~WebCookieManager()
-{
-}
-
-void WebCookieManager::SetCookieAcceptPolicy(Dali::WebEngineCookieManager::CookieAcceptPolicy cookieAcceptPolicy)
-{
-  mWebEngineCookieManager.SetCookieAcceptPolicy(cookieAcceptPolicy);
-}
-
-Dali::WebEngineCookieManager::CookieAcceptPolicy WebCookieManager::GetCookieAcceptPolicy() const
-{
-  return mWebEngineCookieManager.GetCookieAcceptPolicy();
-}
-
-void WebCookieManager::ClearCookies()
-{
-  mWebEngineCookieManager.ClearCookies();
-}
-
-void WebCookieManager::SetPersistentStorage(const std::string& path, Dali::WebEngineCookieManager::CookiePersistentStorage storage)
-{
-  mWebEngineCookieManager.SetPersistentStorage(path, storage);
-}
-
-void WebCookieManager::ChangesWatch(Dali::WebEngineCookieManager::WebEngineCookieManagerChangesWatchCallback callback)
-{
-  mWebEngineCookieManager.ChangesWatch(callback);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h b/dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h
deleted file mode 100755
index 421db32..0000000
--- a/dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#ifndef DALI_TOOLKIT_WEB_COOKIE_MANAGER_H
-#define DALI_TOOLKIT_WEB_COOKIE_MANAGER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-cookie-manager.h>
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
-
-namespace Dali
-{
-class WebEngineCookieManager;
-
-namespace Toolkit
-{
-/**
- * @addtogroup dali_toolkit_controls_web_view
- * @{
- */
-
-/**
- * @brief WebCookieManager is a control for cookie manager of WebView.
- *
- *
- * For working WebCookieManager, a WebView should be provided.
- *
- */
-class DALI_TOOLKIT_API WebCookieManager
-{
-public:
-  /**
-   * @brief Creates a WebCookieManager.
-   * @param[in] manager A #Dali::WebEngineCookieManager
-   */
-  WebCookieManager(Dali::WebEngineCookieManager& manager);
-
-  /**
-   * @brief Destructor.
-   */
-  virtual ~WebCookieManager() final;
-
-  /**
-   * @brief Sets @a policy as the cookie acceptance policy for @a manager.
-   *
-   * @details By default, only cookies set by the main document loaded are
-   *          accepted.
-   *
-   * @param[in] policy A #Dali::WebEngineCookieManager::CookieAcceptPolicy
-   */
-  void SetCookieAcceptPolicy(Dali::WebEngineCookieManager::CookieAcceptPolicy policy);
-
-  /**
-   * @brief Gets the cookie acceptance policy. The default is Toolkit::WebCookieManager::CookieAcceptPolicy::NO_THIRD_PARTY.
-   * @see Dali::WebEngineCookieManager::CookieAcceptPolicy
-   */
-  Dali::WebEngineCookieManager::CookieAcceptPolicy GetCookieAcceptPolicy() const;
-
-  /**
-   * @brief Deletes all the cookies of @a manager.
-   */
-  void ClearCookies();
-
-  /**
-   * @brief Sets the @a path where non-session cookies are stored persistently using
-   *        @a storage as the format to read/write the cookies.
-   *
-   * @details Cookies are initially read from @a path/Cookies to create an initial
-   *          set of cookies. Then, non-session cookies will be written to @a path/Cookies.
-   *          By default, @a manager doesn't store the cookies persistently, so you need to
-   *          call this method to keep cookies saved across sessions.
-   *          If @a path does not exist it will be created.
-   *
-   * @param[in] path The path where to read/write Cookies
-   * @param[in] storage The type of storage
-   */
-  void SetPersistentStorage(const std::string& path, Dali::WebEngineCookieManager::CookiePersistentStorage storage);
-
-  /**
-   * @brief Watch for cookies' changes in @a manager.
-   *
-   * @param[in] callback cookies are added, removed or modified.
-   */
-  void ChangesWatch(Dali::WebEngineCookieManager::WebEngineCookieManagerChangesWatchCallback callback);
-
-private:
-  Dali::WebEngineCookieManager& mWebEngineCookieManager;
-};
-
-/**
- * @}
- */
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_WEB_COOKIE_MANAGER_H
diff --git a/dali-toolkit/devel-api/controls/web-view/web-settings.cpp b/dali-toolkit/devel-api/controls/web-view/web-settings.cpp
index b17f48d..385ecc6 100755
--- a/dali-toolkit/devel-api/controls/web-view/web-settings.cpp
+++ b/dali-toolkit/devel-api/controls/web-view/web-settings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-settings.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/devel-api/controls/web-view/web-view.cpp b/dali-toolkit/devel-api/controls/web-view/web-view.cpp
index 8412273..63d9cca 100755
--- a/dali-toolkit/devel-api/controls/web-view/web-view.cpp
+++ b/dali-toolkit/devel-api/controls/web-view/web-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,24 +64,29 @@ WebView WebView::New(uint32_t argc, char** argv)
   return Internal::WebView::New(argc, argv);
 }
 
-WebView WebView::DownCast(BaseHandle handle)
+Toolkit::WebView WebView::FindWebView(Dali::WebEnginePlugin* plugin)
 {
-  return Control::DownCast<WebView, Internal::WebView>(handle);
+  return Internal::WebView::FindWebView(plugin);
 }
 
-Dali::Toolkit::WebSettings* WebView::GetSettings() const
+Dali::WebEngineContext* WebView::GetContext()
 {
-  return Dali::Toolkit::GetImpl(*this).GetSettings();
+  return Internal::WebView::GetContext();
+}
+
+Dali::WebEngineCookieManager* WebView::GetCookieManager()
+{
+  return Internal::WebView::GetCookieManager();
 }
 
-Dali::Toolkit::WebContext* WebView::GetContext() const
+WebView WebView::DownCast(BaseHandle handle)
 {
-  return Dali::Toolkit::GetImpl(*this).GetContext();
+  return Control::DownCast<WebView, Internal::WebView>(handle);
 }
 
-Dali::Toolkit::WebCookieManager* WebView::GetCookieManager() const
+Dali::Toolkit::WebSettings* WebView::GetSettings() const
 {
-  return Dali::Toolkit::GetImpl(*this).GetCookieManager();
+  return Dali::Toolkit::GetImpl(*this).GetSettings();
 }
 
 Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
@@ -89,6 +94,11 @@ Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
   return Dali::Toolkit::GetImpl(*this).GetBackForwardList();
 }
 
+Dali::WebEnginePlugin* WebView::GetPlugin() const
+{
+  return Dali::Toolkit::GetImpl(*this).GetPlugin();
+}
+
 Dali::Toolkit::ImageView WebView::GetFavicon() const
 {
   return Dali::Toolkit::GetImpl(*this).GetFavicon();
@@ -109,7 +119,7 @@ bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const
   return Dali::Toolkit::GetImpl(*this).LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
 }
 
-bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
+bool WebView::LoadContents(const int8_t* contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
 {
   return Dali::Toolkit::GetImpl(*this).LoadContents(contents, contentSize, mimeType, encoding, baseUri);
 }
@@ -364,6 +374,16 @@ void WebView::RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEn
   Dali::Toolkit::GetImpl(*this).RegisterResponsePolicyDecidedCallback(callback);
 }
 
+void WebView::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback)
+{
+  Dali::Toolkit::GetImpl(*this).RegisterNavigationPolicyDecidedCallback(callback);
+}
+
+void WebView::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
+{
+  Dali::Toolkit::GetImpl(*this).RegisterNewWindowCreatedCallback(callback);
+}
+
 void WebView::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback)
 {
   Dali::Toolkit::GetImpl(*this).RegisterCertificateConfirmedCallback(callback);
diff --git a/dali-toolkit/devel-api/controls/web-view/web-view.h b/dali-toolkit/devel-api/controls/web-view/web-view.h
index 6b373df..0ee8af7 100755
--- a/dali-toolkit/devel-api/controls/web-view/web-view.h
+++ b/dali-toolkit/devel-api/controls/web-view/web-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_WEB_VIEW_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,16 +24,17 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
-#include <dali/devel-api/adaptor-framework/web-engine-plugin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h>
 
 namespace Dali
 {
+class WebEngineContext;
+class WebEngineCookieManager;
+
 namespace Toolkit
 {
 class ImageView;
 class WebBackForwardList;
-class WebContext;
-class WebCookieManager;
 class WebSettings;
 
 namespace Internal DALI_INTERNAL
@@ -216,6 +217,21 @@ public:
   static WebView New(uint32_t argc, char** argv);
 
   /**
+   * @brief Find web view by web engine plugin.
+   */
+  static Toolkit::WebView FindWebView(Dali::WebEnginePlugin* plugin);
+
+  /**
+   * @brief Get context of web engine.
+   */
+  static Dali::WebEngineContext* GetContext();
+
+  /**
+   * @brief Get cookie manager of web engine.
+   */
+  static Dali::WebEngineCookieManager* GetCookieManager();
+
+  /**
    * @brief Create an uninitialized WebView.
    */
   WebView();
@@ -259,19 +275,14 @@ public:
   Dali::Toolkit::WebSettings* GetSettings() const;
 
   /**
-   * @brief Get WebContext of WebEngine.
-   */
-  Dali::Toolkit::WebContext* GetContext() const;
-
-  /**
-   * @brief Get CookieManager of WebEngine.
+   * @brief Get WebBackForwardList of WebEngine.
    */
-  Dali::Toolkit::WebCookieManager* GetCookieManager() const;
+  Dali::Toolkit::WebBackForwardList* GetBackForwardList() const;
 
   /**
-   * @brief Get WebBackForwardList of WebEngine.
+   * @brief Gets web engine plugin.
    */
-  Dali::Toolkit::WebBackForwardList* GetBackForwardList() const;
+  Dali::WebEnginePlugin* GetPlugin() const;
 
   /**
    * @brief Get favicon of web page.
@@ -316,7 +327,7 @@ public:
    *
    * @return true if successfully request, false otherwise
    */
-  bool LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri);
+  bool LoadContents(const int8_t* contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri);
 
   /**
    * @brief Reload the Web.
@@ -692,6 +703,20 @@ public:
   void RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback);
 
   /**
+   * @brief Callback to be called when navigation policy would be decided.
+   *
+   * @param[in] callback
+   */
+  void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback);
+
+  /**
+   * @brief Callback to be called when a new window would be created.
+   *
+   * @param[in] callback
+   */
+  void RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback);
+
+  /**
    * @brief Callback to be called when certificate need be confirmed.
    *
    * @param[in] callback
diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list
index e94f60b..43d805b 100755
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@ -9,8 +9,8 @@ SET( devel_api_src_files
   ${devel_api_src_dir}/builder/builder.cpp
   ${devel_api_src_dir}/builder/json-parser.cpp
   ${devel_api_src_dir}/builder/tree-node.cpp
-  ${devel_api_src_dir}/controls/accessible-impl.cpp
   ${devel_api_src_dir}/controls/canvas-view/canvas-view.cpp
+  ${devel_api_src_dir}/controls/control-accessible.cpp
   ${devel_api_src_dir}/controls/control-devel.cpp
   ${devel_api_src_dir}/controls/control-wrapper.cpp
   ${devel_api_src_dir}/controls/control-wrapper-impl.cpp
@@ -32,16 +32,16 @@ SET( devel_api_src_files
   ${devel_api_src_dir}/controls/shadow-view/shadow-view.cpp
   ${devel_api_src_dir}/controls/super-blur-view/super-blur-view.cpp
   ${devel_api_src_dir}/controls/table-view/table-view.cpp
+  ${devel_api_src_dir}/controls/text-controls/text-anchor-devel.cpp
   ${devel_api_src_dir}/controls/text-controls/text-editor-devel.cpp
   ${devel_api_src_dir}/controls/text-controls/text-field-devel.cpp
   ${devel_api_src_dir}/controls/text-controls/text-label-devel.cpp
+  ${devel_api_src_dir}/controls/text-controls/text-spannable.cpp
   ${devel_api_src_dir}/controls/text-controls/text-selection-popup.cpp
   ${devel_api_src_dir}/controls/text-controls/text-selection-toolbar.cpp
   ${devel_api_src_dir}/controls/tool-bar/tool-bar.cpp
   ${devel_api_src_dir}/controls/video-view/video-view-devel.cpp
   ${devel_api_src_dir}/controls/web-view/web-back-forward-list.cpp
-  ${devel_api_src_dir}/controls/web-view/web-context.cpp
-  ${devel_api_src_dir}/controls/web-view/web-cookie-manager.cpp
   ${devel_api_src_dir}/controls/web-view/web-settings.cpp
   ${devel_api_src_dir}/controls/web-view/web-view.cpp
   ${devel_api_src_dir}/focus-manager/keyinput-focus-manager.cpp
@@ -61,22 +61,39 @@ SET( devel_api_src_files
   ${devel_api_src_dir}/styling/style-manager-devel.cpp
   ${devel_api_src_dir}/text/bitmap-font.cpp
   ${devel_api_src_dir}/text/text-utils-devel.cpp
+  ${devel_api_src_dir}/text/character-sequence.cpp
+  ${devel_api_src_dir}/text/range.cpp
+  ${devel_api_src_dir}/text/spanned.cpp
+  ${devel_api_src_dir}/text/spannable.cpp
+  ${devel_api_src_dir}/text/spannable-string.cpp
+  ${devel_api_src_dir}/text/spans/base-span.cpp
+  ${devel_api_src_dir}/text/spans/foreground-color-span.cpp
+  ${devel_api_src_dir}/text/spans/character-spacing-span.cpp
+  ${devel_api_src_dir}/text/spans/strikethrough-span.cpp
+  ${devel_api_src_dir}/text/spans/font-span.cpp
+  ${devel_api_src_dir}/text/spans/underline-span.cpp
+  ${devel_api_src_dir}/text/spans/bold-span.cpp
+  ${devel_api_src_dir}/text/spans/italic-span.cpp
+  ${devel_api_src_dir}/text/spans/background-color-span.cpp
   ${devel_api_src_dir}/transition-effects/cube-transition-cross-effect.cpp
   ${devel_api_src_dir}/transition-effects/cube-transition-effect.cpp
   ${devel_api_src_dir}/transition-effects/cube-transition-fold-effect.cpp
   ${devel_api_src_dir}/transition-effects/cube-transition-wave-effect.cpp
   ${devel_api_src_dir}/utility/npatch-utilities.cpp
+  ${devel_api_src_dir}/utility/npatch-helper.cpp
   ${devel_api_src_dir}/visual-factory/transition-data.cpp
   ${devel_api_src_dir}/visual-factory/visual-factory.cpp
   ${devel_api_src_dir}/visual-factory/visual-base.cpp
   ${devel_api_src_dir}/controls/gaussian-blur-view/gaussian-blur-view.cpp
   ${devel_api_src_dir}/drag-drop-detector/drag-and-drop-detector.cpp
+  ${devel_api_src_dir}/text/text-geometry-devel.cpp
 )
 
 # Add devel header files here
 SET( devel_api_header_files
   ${devel_api_src_dir}/direction-enums.h
   ${devel_api_src_dir}/toolkit-property-index-ranges.h
+  ${devel_api_src_dir}/toolkit-action-index-ranges.h
 )
 
 SET( devel_api_accessibility-manager_header_files
@@ -84,8 +101,8 @@ SET( devel_api_accessibility-manager_header_files
 )
 
 SET( devel_api_controls_header_files
-  ${devel_api_src_dir}/controls/accessible-impl.h
   ${devel_api_src_dir}/controls/canvas-view/canvas-view.h
+  ${devel_api_src_dir}/controls/control-accessible.h
   ${devel_api_src_dir}/controls/control-depth-index-ranges.h
   ${devel_api_src_dir}/controls/control-devel.h
   ${devel_api_src_dir}/controls/control-wrapper.h
@@ -168,13 +185,12 @@ SET( devel_api_visuals_header_files
   ${devel_api_src_dir}/visuals/animated-image-visual-actions-devel.h
   ${devel_api_src_dir}/visuals/animated-vector-image-visual-actions-devel.h
   ${devel_api_src_dir}/visuals/animated-vector-image-visual-signals-devel.h
-  ${devel_api_src_dir}/visuals/arc-visual-actions-devel.h
   ${devel_api_src_dir}/visuals/arc-visual-properties-devel.h
-  ${devel_api_src_dir}/visuals/color-visual-actions-devel.h
   ${devel_api_src_dir}/visuals/color-visual-properties-devel.h
   ${devel_api_src_dir}/visuals/image-visual-properties-devel.h
   ${devel_api_src_dir}/visuals/image-visual-actions-devel.h
   ${devel_api_src_dir}/visuals/text-visual-properties-devel.h
+  ${devel_api_src_dir}/visuals/visual-actions-devel.h
   ${devel_api_src_dir}/visuals/visual-properties-devel.h
 )
 
@@ -217,9 +233,11 @@ SET( devel_api_super_blur_view_header_files
 )
 
 SET( devel_api_text_controls_header_files
+  ${devel_api_src_dir}/controls/text-controls/text-anchor-devel.h
   ${devel_api_src_dir}/controls/text-controls/text-editor-devel.h
   ${devel_api_src_dir}/controls/text-controls/text-field-devel.h
   ${devel_api_src_dir}/controls/text-controls/text-label-devel.h
+  ${devel_api_src_dir}/controls/text-controls/text-spannable.h
   ${devel_api_src_dir}/controls/text-controls/text-selection-popup.h
   ${devel_api_src_dir}/controls/text-controls/text-selection-toolbar.h
   ${devel_api_src_dir}/controls/text-controls/text-style-properties-devel.h
@@ -230,6 +248,22 @@ SET( devel_api_text_header_files
   ${devel_api_src_dir}/text/bitmap-font.h
   ${devel_api_src_dir}/text/text-utils-devel.h
   ${devel_api_src_dir}/text/rendering-backend.h
+  ${devel_api_src_dir}/text/text-geometry-devel.h
+  ${devel_api_src_dir}/text/character-sequence.h
+  ${devel_api_src_dir}/text/range.h
+  ${devel_api_src_dir}/text/spanned.h
+  ${devel_api_src_dir}/text/spannable.h
+  ${devel_api_src_dir}/text/spannable-string.h
+  ${devel_api_src_dir}/text/spans/base-span.h
+  ${devel_api_src_dir}/text/spans/foreground-color-span.h
+  ${devel_api_src_dir}/text/spans/character-spacing-span.h
+  ${devel_api_src_dir}/text/spans/strikethrough-span.h
+  ${devel_api_src_dir}/text/spans/font-span.h
+  ${devel_api_src_dir}/text/spans/underline-span.h
+  ${devel_api_src_dir}/text/spans/bold-span.h
+  ${devel_api_src_dir}/text/spans/italic-span.h
+  ${devel_api_src_dir}/text/spans/background-color-span.h
+  ${devel_api_src_dir}/text/spans/span-enumerations.h
 )
 
 SET( devel_api_tool_bar_header_files
@@ -257,8 +291,6 @@ SET( devel_api_video_view_header_files
 
 SET( devel_api_web_view_header_files
   ${devel_api_src_dir}/controls/web-view/web-back-forward-list.h
-  ${devel_api_src_dir}/controls/web-view/web-context.h
-  ${devel_api_src_dir}/controls/web-view/web-cookie-manager.h
   ${devel_api_src_dir}/controls/web-view/web-settings.h
   ${devel_api_src_dir}/controls/web-view/web-view.h
 )
@@ -269,6 +301,7 @@ SET( devel_api_drag_and_drop_detector_header_files
 
 SET( devel_api_utility_header_files
   ${devel_api_src_dir}/utility/npatch-utilities.h
+  ${devel_api_src_dir}/utility/npatch-helper.h
 )
 
 SET( SOURCES ${SOURCES}
diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
index ddd0360..c007888 100644
--- a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
+++ b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
@@ -152,9 +152,9 @@ static int MinorAxisDistance(Dali::Toolkit::Control::KeyboardFocus::Direction di
  * @param minorAxisDistance The minorAxisDistance
  * @return The distance
  */
-static int GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance)
+static uint64_t GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance)
 {
-  return 13 * majorAxisDistance * majorAxisDistance + minorAxisDistance * minorAxisDistance;
+  return 13 * static_cast<int64_t>(majorAxisDistance) * static_cast<int64_t>(majorAxisDistance) + static_cast<int64_t>(minorAxisDistance) * static_cast<int64_t>(minorAxisDistance);
 }
 
 /**
@@ -343,6 +343,7 @@ bool IsBetterCandidate(Toolkit::Control::KeyboardFocus::Direction direction, Rec
 bool IsFocusable(Actor& actor)
 {
   return (actor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) &&
+          actor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED) &&
           actor.GetProperty<bool>(Actor::Property::VISIBLE) &&
           actor.GetProperty<Vector4>(Actor::Property::WORLD_COLOR).a > FULLY_TRANSPARENT);
 }
@@ -354,12 +355,12 @@ Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect,
   {
     // Recursively children
     const auto childCount = actor.GetChildCount();
-    for(auto i = 0u; i < childCount; ++i)
+    for(auto i = childCount; i > 0u; --i)
     {
-      Dali::Actor child = actor.GetChildAt(i);
+      Dali::Actor child = actor.GetChildAt(i-1);
       if(child && child != focusedActor && IsFocusable(child))
       {
-        Rect<float> candidateRect = DevelActor::CalculateScreenExtents(child);
+        Rect<float> candidateRect = DevelActor::CalculateCurrentScreenExtents(child);
 
         // convert x, y, width, height -> left, right, bottom, top
         ConvertCoordinate(candidateRect);
@@ -382,15 +383,26 @@ Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect,
 
 } // unnamed namespace
 
-Actor GetNearestFocusableActor(Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction)
+Actor GetNearestFocusableActor(Actor rootActor, Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction)
 {
   Actor nearestActor;
-  if(!focusedActor)
+  if(!rootActor)
   {
     return nearestActor;
   }
 
-  Rect<float> focusedRect = DevelActor::CalculateScreenExtents(focusedActor);
+  Rect<float> focusedRect;
+  if (!focusedActor)
+  {
+    // If there is no currently focused actor, it is searched based on the upper left corner of the current window.
+    Rect<float> rootRect = DevelActor::CalculateCurrentScreenExtents(rootActor);
+    focusedRect = Rect<float>(rootRect.x, rootRect.y, 0.f, 0.f);
+  }
+  else
+  {
+    focusedRect = DevelActor::CalculateCurrentScreenExtents(focusedActor);
+  }
+
 
   // initialize the best candidate to something impossible
   // (so the first plausible actor will become the best choice)
@@ -426,13 +438,7 @@ Actor GetNearestFocusableActor(Actor focusedActor, Toolkit::Control::KeyboardFoc
   ConvertCoordinate(bestCandidateRect);
 
   ConvertCoordinate(focusedRect);
-
-  Integration::SceneHolder window = Integration::SceneHolder::Get(focusedActor);
-  if(window)
-  {
-    Actor rootActor = window.GetRootLayer();
-    nearestActor    = FindNextFocus(rootActor, focusedActor, focusedRect, bestCandidateRect, direction);
-  }
+  nearestActor = FindNextFocus(rootActor, focusedActor, focusedRect, bestCandidateRect, direction);
   return nearestActor;
 }
 
diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.h b/dali-toolkit/devel-api/focus-manager/focus-finder.h
index 47f313d..69708b3 100644
--- a/dali-toolkit/devel-api/focus-manager/focus-finder.h
+++ b/dali-toolkit/devel-api/focus-manager/focus-finder.h
@@ -27,13 +27,15 @@ namespace Toolkit
 {
 namespace FocusFinder
 {
+
 /**
  * Get the nearest focusable actor.
+ * @param [in] rootActor The root actor.
  * @param [in] focusedActor The current focused actor.
  * @param [in] direction The direction.
  * @return The nearest focusable actor, or an empty handle if none exists.
  */
-DALI_TOOLKIT_API Actor GetNearestFocusableActor(Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction);
+DALI_TOOLKIT_API Actor GetNearestFocusableActor(Actor rootActor, Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction);
 
 } // namespace FocusFinder
 
diff --git a/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.cpp b/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.cpp
index f320269..20fc10e 100644
--- a/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.cpp
+++ b/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.cpp
@@ -50,6 +50,21 @@ bool IsDefaultAlgorithmEnabled(KeyboardFocusManager keyboardFocusManager)
   return GetImpl(keyboardFocusManager).IsDefaultAlgorithmEnabled();
 }
 
+bool MoveFocus(KeyboardFocusManager keyboardFocusManager, Control::KeyboardFocus::Direction direction, const std::string& deviceName)
+{
+  return GetImpl(keyboardFocusManager).MoveFocus(direction, deviceName);
+}
+
+void SetFocusFinderRootActor(KeyboardFocusManager keyboardFocusManager, Actor actor)
+{
+  GetImpl(keyboardFocusManager).SetFocusFinderRootActor(actor);
+}
+
+void ResetFocusFinderRootActor(KeyboardFocusManager keyboardFocusManager)
+{
+  GetImpl(keyboardFocusManager).ResetFocusFinderRootActor();
+}
+
 } // namespace DevelKeyboardFocusManager
 
 } // namespace Toolkit
diff --git a/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h b/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h
index 192c296..98faca9 100644
--- a/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h
+++ b/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h
@@ -54,9 +54,11 @@ public:
    * @param[in] current The current focused actor
    * @param[in] proposed The proposed focused actor
    * @param[in] direction The direction of focus movement
+   * @param[in] deviceName The name of the device where the key event occurred.
    * @return A handle to the next focusable actor
    */
-  virtual Actor GetNextFocusableActor(Actor current, Actor proposed, Control::KeyboardFocus::Direction direction) = 0;
+  virtual Actor GetNextFocusableActor(Actor current, Actor proposed, Control::KeyboardFocus::Direction direction, const std::string& deviceName = "") = 0;
+
 };
 
 /**
@@ -100,6 +102,35 @@ DALI_TOOLKIT_API void EnableDefaultAlgorithm(KeyboardFocusManager keyboardFocusM
  */
 DALI_TOOLKIT_API bool IsDefaultAlgorithmEnabled(KeyboardFocusManager keyboardFocusManager);
 
+/**
+ * @brief Moves the focus to the next focusable actor in the focus
+ * chain in the given direction (according to the focus traversal
+ * order).
+ *
+ * @param[in] keyboardFocusManager The instance of KeyboardFocusManager
+ * @param direction The direction of focus movement
+ * @param deviceName The device name
+ * @return true if the movement was successful
+ * @pre The KeyboardFocusManager has been initialized.
+ */
+DALI_TOOLKIT_API bool MoveFocus(KeyboardFocusManager keyboardFocusManager, Control::KeyboardFocus::Direction direction, const std::string& deviceName);
+
+/**
+ * @brief Sets the root actor to start moving focus when DefaultAlgorithm is enabled.
+ *
+ * @param[in] keyboardFocusManager The instance of KeyboardFocusManager
+ * @param[in] actor The root actor
+ */
+DALI_TOOLKIT_API void SetFocusFinderRootActor(KeyboardFocusManager keyboardFocusManager, Actor actor);
+
+/**
+ * @brief Resets the root actor that starts moving focus when DefaultAlgorithm is enabled.
+ * When reset, the window becomes root.
+ *
+ * @param[in] keyboardFocusManager The instance of KeyboardFocusManager
+ */
+DALI_TOOLKIT_API void ResetFocusFinderRootActor(KeyboardFocusManager keyboardFocusManager);
+
 } // namespace DevelKeyboardFocusManager
 
 } // namespace Toolkit
diff --git a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp
index df9499e..cf47c70 100644
--- a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp
+++ b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,12 @@ namespace Toolkit
 {
 namespace DevelAsyncImageLoader
 {
-uint32_t LoadAnimatedImage(AsyncImageLoader           asyncImageLoader,
-                           Dali::AnimatedImageLoading animatedImageLoading,
-                           uint32_t                   frameIndex)
+uint32_t LoadAnimatedImage(AsyncImageLoader                         asyncImageLoader,
+                           Dali::AnimatedImageLoading               animatedImageLoading,
+                           uint32_t                                 frameIndex,
+                           DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
 {
-  return GetImplementation(asyncImageLoader).LoadAnimatedImage(animatedImageLoading, frameIndex);
+  return GetImplementation(asyncImageLoader).LoadAnimatedImage(animatedImageLoading, frameIndex, preMultiplyOnLoad);
 }
 
 uint32_t Load(AsyncImageLoader                         asyncImageLoader,
@@ -38,7 +39,7 @@ uint32_t Load(AsyncImageLoader                         asyncImageLoader,
               bool                                     orientationCorrection,
               DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
 {
-  return GetImplementation(asyncImageLoader).Load(Toolkit::Internal::VisualUrl(url), dimensions, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad);
+  return GetImplementation(asyncImageLoader).Load(Toolkit::Internal::VisualUrl(url), dimensions, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad, false);
 }
 
 uint32_t ApplyMask(AsyncImageLoader                         asyncImageLoader,
diff --git a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h
index 9cf1589..9073da7 100644
--- a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h
+++ b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_DEVEL_API_IMAGE_LOADER_ASYNC_IMAGE_LOADER_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ namespace Toolkit
 {
 namespace DevelAsyncImageLoader
 {
-typedef Signal<void(uint32_t, Devel::PixelBuffer)> PixelBufferLoadedSignalType;
+typedef Signal<void(uint32_t, std::vector<Devel::PixelBuffer>&)> PixelBufferLoadedSignalType;
 
 /**
  * @brief Whether to multiply alpha into color channels on load
@@ -49,11 +49,13 @@ enum class PreMultiplyOnLoad
  * @param[in] asyncImageLoader The ayncImageLoader
  * @param[in] animatedImageLoading The AnimatedImageLoading to load animated image
  * @param[in] frameIndex The frame index of a frame to be loaded frame
+ * @param[in] preMultiplyOnLoad ON if the image color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
  * @return The loading task id
  */
-DALI_TOOLKIT_API uint32_t LoadAnimatedImage(AsyncImageLoader           asyncImageLoader,
-                                            Dali::AnimatedImageLoading animatedImageLoading,
-                                            uint32_t                   frameIndex);
+DALI_TOOLKIT_API uint32_t LoadAnimatedImage(AsyncImageLoader                         asyncImageLoader,
+                                            Dali::AnimatedImageLoading               animatedImageLoading,
+                                            uint32_t                                 frameIndex,
+                                            DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
 
 /**
  * @brief Starts an image loading task.
diff --git a/dali-toolkit/devel-api/image-loader/texture-manager.cpp b/dali-toolkit/devel-api/image-loader/texture-manager.cpp
index cff4718..ace107e 100644
--- a/dali-toolkit/devel-api/image-loader/texture-manager.cpp
+++ b/dali-toolkit/devel-api/image-loader/texture-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,18 +26,18 @@ namespace Toolkit
 {
 namespace TextureManager
 {
-std::string AddTexture(Texture& texture)
+std::string AddTexture(Texture& texture, bool preMultiplied)
 {
   TextureSet set = TextureSet::New();
   set.SetTexture(0u, texture);
-  return AddTexture(set);
+  return AddTexture(set, preMultiplied);
 }
 
-std::string AddTexture(TextureSet& textureSet)
+std::string AddTexture(TextureSet& textureSet, bool preMultiplied)
 {
   auto  visualFactory = Toolkit::VisualFactory::Get();
   auto& textureMgr    = GetImplementation(visualFactory).GetTextureManager();
-  return textureMgr.AddExternalTexture(textureSet);
+  return textureMgr.AddExternalTexture(textureSet, preMultiplied);
 }
 
 TextureSet RemoveTexture(const std::string& textureUrl)
diff --git a/dali-toolkit/devel-api/image-loader/texture-manager.h b/dali-toolkit/devel-api/image-loader/texture-manager.h
index f18ed14..ff61916 100644
--- a/dali-toolkit/devel-api/image-loader/texture-manager.h
+++ b/dali-toolkit/devel-api/image-loader/texture-manager.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_DEVEL_API_TEXTURE_MANAGER_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,9 +39,10 @@ namespace TextureManager
  * @note this method does not check for duplicates,
  *       if same Texture is added multiple times, a different URL is returned each time
  * @param[in] texture the Texture to add
+ * @param[in] preMultiplied Whether this external texture preMultiplied or not. Default as false.
  * @return the Url string representing this texture
  */
-DALI_TOOLKIT_API std::string AddTexture(Texture& texture);
+DALI_TOOLKIT_API std::string AddTexture(Texture& texture, bool preMultiplied = false);
 
 /**
  * @brief Add a TextureSet to texture manager
@@ -49,9 +50,10 @@ DALI_TOOLKIT_API std::string AddTexture(Texture& texture);
  * @note this method does not check for duplicates,
  *       if same TextureSet is added multiple times, a different URL is returned each time
  * @param[in] textureSet the TextureSet to add
+ * @param[in] preMultiplied Whether this external texture preMultiplied or not. Default as false.
  * @return the Url string representing this texture
  */
-DALI_TOOLKIT_API std::string AddTexture(TextureSet& textureSet);
+DALI_TOOLKIT_API std::string AddTexture(TextureSet& textureSet, bool preMultiplied = false);
 
 /**
  * @brief Removes a TextureSet from toolkit
diff --git a/dali-toolkit/devel-api/layouting/flex-node.cpp b/dali-toolkit/devel-api/layouting/flex-node.cpp
index c3636dc..8a7dae6 100644
--- a/dali-toolkit/devel-api/layouting/flex-node.cpp
+++ b/dali-toolkit/devel-api/layouting/flex-node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,9 +93,12 @@ Node::Node()
 Node::~Node()
 {
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() >> \n");
+  // Destruct child Flex::Node first
+  mImpl->mChildNodes.clear();
+
   if(mImpl->mYogaNode)
   {
-    YGNodeFreeRecursive(mImpl->mYogaNode);
+    YGNodeFree(mImpl->mYogaNode);
     mImpl->mYogaNode = nullptr;
   }
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() <<\n");
diff --git a/dali-toolkit/devel-api/layouting/flex-node.h b/dali-toolkit/devel-api/layouting/flex-node.h
index a7349fe..44ddfc2 100644
--- a/dali-toolkit/devel-api/layouting/flex-node.h
+++ b/dali-toolkit/devel-api/layouting/flex-node.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_LAYOUTING_FLEX_NODE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -340,7 +340,6 @@ public:
 private:
   struct Impl;
   std::unique_ptr<Impl> mImpl;
-
 }; // Node
 
 } // namespace Flex
diff --git a/dali-toolkit/devel-api/styling/style-manager-devel.cpp b/dali-toolkit/devel-api/styling/style-manager-devel.cpp
index 29f0e8b..d7778d8 100644
--- a/dali-toolkit/devel-api/styling/style-manager-devel.cpp
+++ b/dali-toolkit/devel-api/styling/style-manager-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,31 @@ namespace Toolkit
 {
 namespace DevelStyleManager
 {
-const Property::Map GetConfigurations(StyleManager styleManager)
+const Property::Map& GetConfigurations(StyleManager styleManager)
 {
   return GetImpl(styleManager).GetConfigurations();
 }
 
+void SetBrokenImageUrl(StyleManager styleManager, DevelStyleManager::BrokenImageType brokenImageType, const std::string& brokenImageUrl)
+{
+  return GetImpl(styleManager).SetBrokenImageUrl(brokenImageType, brokenImageUrl);
+}
+
+std::string GetBrokenImageUrl(StyleManager styleManager, DevelStyleManager::BrokenImageType brokenImageType)
+{
+  return GetImpl(styleManager).GetBrokenImageUrl(brokenImageType);
+}
+
+std::vector<std::string> GetBrokenImageUrlList(StyleManager styleManager)
+{
+  return GetImpl(styleManager).GetBrokenImageUrlList();
+}
+
+BrokenImageChangedSignalType& BrokenImageChangedSignal(StyleManager styleManager)
+{
+  return GetImpl(styleManager).BrokenImageChangedSignal();
+}
+
 } // namespace DevelStyleManager
 
 } // namespace Toolkit
diff --git a/dali-toolkit/devel-api/styling/style-manager-devel.h b/dali-toolkit/devel-api/styling/style-manager-devel.h
index efcff7d..42a614e 100644
--- a/dali-toolkit/devel-api/styling/style-manager-devel.h
+++ b/dali-toolkit/devel-api/styling/style-manager-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_STYLE_MANAGER_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/styling/style-manager.h>
 
@@ -28,13 +31,62 @@ namespace Toolkit
 namespace DevelStyleManager
 {
 /**
+ * @brief The Type of BrokenImage
+ */
+enum class BrokenImageType
+{
+  SMALL,
+  NORMAL,
+  LARGE
+};
+
+using BrokenImageChangedSignalType = Signal<void(StyleManager)>;
+
+/**
  * @brief Gets all currently defined configurations.
  *
  * @pre The Builder has been initialized.
  * @param[in] styleManager The instance of StyleManager
  * @return A property map to the currently defined configurations
 **/
-DALI_TOOLKIT_API const Property::Map GetConfigurations(StyleManager styleManager);
+DALI_TOOLKIT_API const Property::Map& GetConfigurations(StyleManager styleManager);
+
+/**
+   * @brief Sets an image to be used when a visual has failed to correctly render
+   * @param[in] styleManager The instance of StyleManager
+   * @param[in] brokenImageType The type of broken image
+   * @param[in] brokenImageUrl The broken image url
+   */
+DALI_TOOLKIT_API void SetBrokenImageUrl(StyleManager styleManager, DevelStyleManager::BrokenImageType brokenImageType, const std::string& brokenImageUrl);
+
+/**
+   * @brief Gets an image to be used when a visual has failed to correctly render
+   * @param[in] styleManager The instance of StyleManager
+   * @param[in] brokenImageType BrokenImage type
+   */
+DALI_TOOLKIT_API std::string GetBrokenImageUrl(StyleManager styleManager, DevelStyleManager::BrokenImageType brokenImageType);
+
+/**
+ * @brief Get the Broken Image Url List
+ *
+ * This list is broken images stored in order of SMALL, NORMAL, and LARGE values except if the value is empty.
+ * This API just makes the list without comparing size, so the application must set a value that matches the size.
+ * @param styleManager The instance of StyleManager
+ * @return A List of Broken Image Url
+ */
+DALI_TOOLKIT_API std::vector<std::string> GetBrokenImageUrlList(StyleManager styleManager);
+
+/**
+ * @brief This signal is emitted when the URL of the broken image is set
+ *
+ * A callback of the following type may be connected:
+ * @code
+ *   void YourCallbackName(StyleManager styleManager)
+ * @endcode
+ * @param styleManager The instance of StyleManager
+ * @return The signal to connect to
+ */
+DALI_TOOLKIT_API BrokenImageChangedSignalType& BrokenImageChangedSignal(StyleManager styleManager);
 
 } // namespace DevelStyleManager
 
diff --git a/dali-toolkit/devel-api/text/bitmap-font.cpp b/dali-toolkit/devel-api/text/bitmap-font.cpp
index c42eed8..5b1adaf 100644
--- a/dali-toolkit/devel-api/text/bitmap-font.cpp
+++ b/dali-toolkit/devel-api/text/bitmap-font.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,9 +45,12 @@ Glyph::Glyph(const std::string& url, const std::string utf8Character, float asce
   ascender{ascender},
   descender{descender}
 {
-  DALI_ASSERT_DEBUG(utf8Character.size() <= 4u);
+  DALI_ASSERT_DEBUG(utf8Character.size() <= 6u);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
   std::copy(utf8Character.begin(), utf8Character.end(), utf8);
+#pragma GCC diagnostic pop
 }
 
 Glyph::~Glyph()
diff --git a/dali-toolkit/devel-api/text/bitmap-font.h b/dali-toolkit/devel-api/text/bitmap-font.h
index 33b9775..ca22694 100644
--- a/dali-toolkit/devel-api/text/bitmap-font.h
+++ b/dali-toolkit/devel-api/text/bitmap-font.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_FONT_BITMAP_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali/public-api/common/vector-wrapper.h>
+#include <cstdint>
 #include <string>
 
 namespace Dali
@@ -66,7 +67,7 @@ struct DALI_TOOLKIT_API Glyph
   ~Glyph();
 
   std::string url;       ///< The url of the glyph.
-  uint8_t     utf8[4];   ///< the glyph encoded in utf8
+  uint8_t     utf8[6];   ///< the glyph encoded in utf8
   float       ascender;  ///< The ascender. The distance from the base line to the top of the glyph.
   float       descender; ///< The descender. The distance from the base line to the bottom of the glyph.
 };
diff --git a/dali-toolkit/devel-api/text/character-sequence.cpp b/dali-toolkit/devel-api/text/character-sequence.cpp
new file mode 100644
index 0000000..4d25658
--- /dev/null
+++ b/dali-toolkit/devel-api/text/character-sequence.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/character-sequence.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/string-text/character-sequence-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+CharacterSequence::CharacterSequence() = default;
+
+CharacterSequence::CharacterSequence(Internal::CharacterSequence* internal)
+: BaseHandle(internal)
+{
+}
+
+CharacterSequence::CharacterSequence(const CharacterSequence& rhs) = default;
+
+CharacterSequence::CharacterSequence(CharacterSequence&& rhs) = default;
+
+CharacterSequence& CharacterSequence::operator=(const CharacterSequence& rhs) = default;
+
+CharacterSequence& CharacterSequence::operator=(CharacterSequence&& rhs) = default;
+
+CharacterSequence::~CharacterSequence() = default;
+
+//Methods
+
+Vector<uint32_t> CharacterSequence::GetCharacters() const
+{
+  return GetImplementation(*this).GetCharacters();
+}
+
+uint32_t CharacterSequence::GetNumberOfCharacters() const
+{
+  return GetImplementation(*this).GetNumberOfCharacters();
+}
+
+std::string CharacterSequence::ToString() const
+{
+  return GetImplementation(*this).ToString();
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/character-sequence.h b/dali-toolkit/devel-api/text/character-sequence.h
new file mode 100644
index 0000000..af996f8
--- /dev/null
+++ b/dali-toolkit/devel-api/text/character-sequence.h
@@ -0,0 +1,139 @@
+#ifndef DALI_TOOLKIT_TEXT_CHARACTER_SEQUENCE_H
+#define DALI_TOOLKIT_TEXT_CHARACTER_SEQUENCE_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
+#include <dali/public-api/object/base-handle.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class CharacterSequence;
+}
+
+/**
+ * @brief Interface for readable character sequence.
+ * It provides uniform APIs for read-only access to many different kinds of character sequences.
+ *
+ * @note An instance of this class cannot be created.
+ *
+ */
+class DALI_TOOLKIT_API CharacterSequence : public BaseHandle
+{
+public:
+  /**
+   * @brief Creates an uninitialized CharacterSequence handle.
+   *
+   * Calling member functions with an uninitialized CharacterSequence handle is not allowed.
+   */
+  CharacterSequence();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] rhs A reference to the copied handle
+   */
+  CharacterSequence(const CharacterSequence& rhs);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] rhs A reference to the handle to move
+   */
+  CharacterSequence(CharacterSequence&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle A reference to the copied handle
+   * @return A reference to this
+   */
+  CharacterSequence& operator=(const CharacterSequence& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] rhs A reference to the handle to move
+   * @return A reference to this handle
+   */
+  CharacterSequence& operator=(CharacterSequence&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~CharacterSequence();
+
+protected:
+  /**
+   * @brief Downcasts to a CharacterSequence handle.
+   * If handle is not a CharacterSequence, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return CharacterSequence handle or an uninitialized handle
+   */
+  static CharacterSequence DownCast(BaseHandle handle);
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Internal constructor.
+   *
+   * @param[in] characterSequence Pointer to internal CharacterSequence
+   */
+  explicit DALI_INTERNAL CharacterSequence(Internal::CharacterSequence* characterSequence);
+  /// @endcond
+
+public: //Methods
+  /**
+  * @brief Retrive the characters
+  *
+  * @return the utf32 characters.
+  */
+  Vector<uint32_t> GetCharacters() const;
+
+  /**
+  * @brief Retrive number of characters in container
+  *
+  * @return the number of characters.
+  */
+  uint32_t GetNumberOfCharacters() const;
+
+  /**
+  * @brief Retrieve constructed string form Character Sequence.
+  * Copy the characters from container to string
+  *
+  * @return the std string.
+  */
+  std::string ToString() const;
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CHARACTER_SEQUENCE_H
diff --git a/dali-toolkit/devel-api/text/range.cpp b/dali-toolkit/devel-api/text/range.cpp
new file mode 100644
index 0000000..faf453f
--- /dev/null
+++ b/dali-toolkit/devel-api/text/range.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/range.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/string-text/range-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+Range Range::New(u_int32_t startIndex, u_int32_t endIndex)
+{
+  return Internal::Range::New(startIndex, endIndex);
+}
+
+Range::Range() = default;
+
+Range::Range(Internal::Range* internal)
+: BaseHandle(internal)
+{
+}
+
+Range::Range(const Range& rhs) = default;
+
+Range::Range(Range&& rhs) = default;
+
+Range& Range::operator=(const Range& rhs) = default;
+
+Range& Range::operator=(Range&& rhs) = default;
+
+Range::~Range() = default;
+
+//Methods
+u_int32_t Range::GetStartIndex() const
+{
+  return GetImplementation(*this).GetStartIndex();
+}
+
+u_int32_t Range::GetEndIndex() const
+{
+  return GetImplementation(*this).GetEndIndex();
+}
+
+u_int32_t Range::GetNumberOfIndices() const
+{
+  return GetImplementation(*this).GetNumberOfIndices();
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/range.h b/dali-toolkit/devel-api/text/range.h
new file mode 100644
index 0000000..14538fd
--- /dev/null
+++ b/dali-toolkit/devel-api/text/range.h
@@ -0,0 +1,159 @@
+#ifndef DALI_TOOLKIT_TEXT_RANGE_H
+#define DALI_TOOLKIT_TEXT_RANGE_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/public-api/object/base-handle.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class Range;
+}
+
+/**
+ * @brief Base structure for different text-spans.
+ * The application can attach and detach spans on range of text for text-controller.
+ * Used to modify text style dynamically at runtime on character level.
+ *
+ * A text-span contains set of attributes of specific style for text.
+ *
+ * To receive a particular text-span, the application has to create span through its builder.
+ *
+ * @note An instance of this class cannot be created.
+ *
+ */
+class DALI_TOOLKIT_API Range : public BaseHandle
+{
+public:
+  /**
+   * @brief Create an initialized range.
+   *
+   * @param[in] startIndex the start index of range (included)
+   * @param[in] endIndex the end index of range (included)
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static Range New(u_int32_t startIndex, u_int32_t endIndex);
+
+  /**
+   * @brief Creates an uninitialized Range handle.
+   *
+   * Calling member functions with an uninitialized Range handle is not allowed.
+   */
+  Range();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] rhs A reference to the copied handle
+   */
+  Range(const Range& rhs);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] rhs A reference to the handle to move
+   */
+  Range(Range&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle A reference to the copied handle
+   * @return A reference to this
+   */
+  Range& operator=(const Range& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] rhs A reference to the handle to move
+   * @return A reference to this handle
+   */
+  Range& operator=(Range&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~Range();
+
+protected:
+  /**
+   * @brief Downcasts to a Range handle.
+   * If handle is not a Range, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return Range handle or an uninitialized handle
+   */
+  static Range DownCast(BaseHandle handle);
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Internal constructor.
+   *
+   * @param[in] range Pointer to internal Range
+   */
+  explicit DALI_INTERNAL Range(Internal::Range* range);
+  /// @endcond
+
+public: //Methods
+        /**
+  * @brief Retrive the start index of range
+  * @return the 32-bit unsigned int.
+  */
+  u_int32_t GetStartIndex() const;
+
+  /**
+  * @brief Retrive the end index of range
+  * @return the 32-bit unsigned int.
+  */
+  u_int32_t GetEndIndex() const;
+
+  /**
+  * @brief Retrive the number of indices of range (endIndex - startIndex +1)
+  * @return the 32-bit unsigned int.
+  */
+  u_int32_t GetNumberOfIndices() const;
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow Range to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Range> : public BasicTypes<Dali::Toolkit::Text::Range>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_RANGE_H
diff --git a/dali-toolkit/devel-api/text/spannable-string.cpp b/dali-toolkit/devel-api/text/spannable-string.cpp
new file mode 100644
index 0000000..da85d68
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spannable-string.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spannable-string.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spannable-string-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+SpannableString SpannableString::New(const std::string& text)
+{
+  return Internal::SpannableString::New(text);
+}
+
+SpannableString::SpannableString(Internal::SpannableString* internal)
+: Spannable(internal)
+{
+}
+
+SpannableString::SpannableString(const SpannableString& rhs) = default;
+
+SpannableString::SpannableString(SpannableString&& rhs) = default;
+
+SpannableString& SpannableString::operator=(const SpannableString& rhs) = default;
+
+SpannableString& SpannableString::operator=(SpannableString&& rhs) = default;
+
+SpannableString::~SpannableString() = default;
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spannable-string.h b/dali-toolkit/devel-api/text/spannable-string.h
new file mode 100644
index 0000000..29facdb
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spannable-string.h
@@ -0,0 +1,124 @@
+#ifndef DALI_TOOLKIT_TEXT_SPANNABLE_STRING_H
+#define DALI_TOOLKIT_TEXT_SPANNABLE_STRING_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spannable.h>
+#include <string>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class SpannableString;
+}
+
+/**
+ * @brief Interface for text that has spans objects attached to ranges of it.
+ * It provides uniform APIs for read-only access to many different kinds of formatted character sequences.
+ *
+ * @note An instance of this class cannot be created.
+ *
+ */
+class DALI_TOOLKIT_API SpannableString : public Spannable
+{
+public:
+  /**
+   * @brief Create an initialized SpannableString.
+   *
+   * @param[in] text the text to be formatted
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static SpannableString New(const std::string& text);
+
+  /**
+   * @brief Creates an uninitialized SpannableString handle.
+   *
+   * Calling member functions with an uninitialized SpannableString handle is not allowed.
+   */
+  SpannableString();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] rhs A reference to the copied handle
+   */
+  SpannableString(const SpannableString& rhs);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] rhs A reference to the handle to move
+   */
+  SpannableString(SpannableString&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle A reference to the copied handle
+   * @return A reference to this
+   */
+  SpannableString& operator=(const SpannableString& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] rhs A reference to the handle to move
+   * @return A reference to this handle
+   */
+  SpannableString& operator=(SpannableString&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~SpannableString();
+
+protected:
+  /**
+   * @brief Downcasts to a SpannableString handle.
+   * If handle is not a SpannableString, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return SpannableString handle or an uninitialized handle
+   */
+  static SpannableString DownCast(BaseHandle handle);
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Internal constructor.
+   *
+   * @param[in] spannableString Pointer to internal SpannableString
+   */
+  explicit DALI_INTERNAL SpannableString(Internal::SpannableString* spannableString);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_SPANNABLE_STRING_H
diff --git a/dali-toolkit/devel-api/text/spannable.cpp b/dali-toolkit/devel-api/text/spannable.cpp
new file mode 100644
index 0000000..67228a3
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spannable.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spannable.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spannable-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+Spannable::Spannable() = default;
+
+Spannable::Spannable(Internal::Spannable* internal)
+: Spanned(internal)
+{
+}
+
+bool Spannable::AttachSpan(BaseSpan styleSpan, Range range)
+{
+  return GetImplementation(*this).AttachSpan(styleSpan, range);
+}
+
+bool Spannable::DetachSpan(const BaseSpan& styleSpan)
+{
+  return GetImplementation(*this).DetachSpan(styleSpan);
+}
+
+Spannable::Spannable(const Spannable& rhs) = default;
+
+Spannable::Spannable(Spannable&& rhs) = default;
+
+Spannable& Spannable::operator=(const Spannable& rhs) = default;
+
+Spannable& Spannable::operator=(Spannable&& rhs) = default;
+
+Spannable::~Spannable() = default;
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spannable.h b/dali-toolkit/devel-api/text/spannable.h
new file mode 100644
index 0000000..f1e11dd
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spannable.h
@@ -0,0 +1,137 @@
+#ifndef DALI_TOOLKIT_TEXT_SPANNABLE_H
+#define DALI_TOOLKIT_TEXT_SPANNABLE_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/range.h>
+#include <dali-toolkit/devel-api/text/spanned.h>
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class Spannable;
+}
+
+/**
+ * @brief Interface for text to which spans objects can be attached and detached.
+ * It provides uniform APIs for mutable formatted character sequences.
+ *
+ * @note An instance of this class cannot be created.
+ *
+ */
+class DALI_TOOLKIT_API Spannable : public Spanned
+{
+public:
+  /**
+   * @brief Creates an uninitialized Spannable handle.
+   *
+   * Calling member functions with an uninitialized Spannable handle is not allowed.
+   */
+  Spannable();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] rhs A reference to the copied handle
+   */
+  Spannable(const Spannable& rhs);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] rhs A reference to the handle to move
+   */
+  Spannable(Spannable&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle A reference to the copied handle
+   * @return A reference to this
+   */
+  Spannable& operator=(const Spannable& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] rhs A reference to the handle to move
+   * @return A reference to this handle
+   */
+  Spannable& operator=(Spannable&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~Spannable();
+
+public:
+  /**
+   * @brief Add the given style span on the given range of text.
+   *
+   * @param[in] styleSpan The span of style to apply it on range @p range
+   * @param[in] range The range.
+   *
+   * @return true if the @p range is valid on text. Otherwise false
+   */
+  bool AttachSpan(BaseSpan styleSpan, Range range);
+
+  /**
+   * @brief Remove the given style span on all ranges of text.
+   * checks if @p styleSpan exists, and if it does, it's to be removed.
+   *
+   * @param[in] styleSpan The span of style to remove with ranges.
+   *
+   * @return true if the @p styleSpan was exist and removed. Otherwise false
+   */
+  bool DetachSpan(const BaseSpan& styleSpan);
+
+protected:
+  /**
+   * @brief Downcasts to a Spannable handle.
+   * If handle is not a Spannable, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return Spannable handle or an uninitialized handle
+   */
+  static Spannable DownCast(BaseHandle handle);
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Internal constructor.
+   *
+   * @param[in] spannable Pointer to internal Spannable
+   */
+  explicit DALI_INTERNAL Spannable(Internal::Spannable* spannable);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_SPANNABLE_H
diff --git a/dali-toolkit/devel-api/text/spanned.cpp b/dali-toolkit/devel-api/text/spanned.cpp
new file mode 100644
index 0000000..4ad29de
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spanned.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spanned.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spanned-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+Spanned::Spanned() = default;
+
+Spanned::Spanned(Internal::Spanned* internal)
+: CharacterSequence(internal)
+{
+}
+
+std::vector<BaseSpan> Spanned::GetAllSpans() const
+{
+  return GetImplementation(*this).GetAllSpans();
+}
+
+void Spanned::RetrieveAllSpansAndRanges(std::vector<BaseSpan>& spans, std::vector<Range>& ranges) const
+{
+  GetImplementation(*this).RetrieveAllSpansAndRanges(spans, ranges);
+}
+
+Spanned::Spanned(const Spanned& rhs) = default;
+
+Spanned::Spanned(Spanned&& rhs) = default;
+
+Spanned& Spanned::operator=(const Spanned& rhs) = default;
+
+Spanned& Spanned::operator=(Spanned&& rhs) = default;
+
+Spanned::~Spanned() = default;
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spanned.h b/dali-toolkit/devel-api/text/spanned.h
new file mode 100644
index 0000000..3baedd8
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spanned.h
@@ -0,0 +1,134 @@
+#ifndef DALI_TOOLKIT_TEXT_SPANNED_H
+#define DALI_TOOLKIT_TEXT_SPANNED_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/character-sequence.h>
+#include <dali-toolkit/devel-api/text/range.h>
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/common/vector-wrapper.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class Spanned;
+}
+
+/**
+ * @brief Interface for text that has spans objects attached to ranges of it.
+ * It provides uniform APIs for read-only access to many different kinds of formatted character sequences.
+ *
+ * @note An instance of this class cannot be created.
+ *
+ */
+class DALI_TOOLKIT_API Spanned : public CharacterSequence
+{
+public:
+  /**
+   * @brief Creates an uninitialized Spanned handle.
+   *
+   * Calling member functions with an uninitialized Spanned handle is not allowed.
+   */
+  Spanned();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] rhs A reference to the copied handle
+   */
+  Spanned(const Spanned& rhs);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] rhs A reference to the handle to move
+   */
+  Spanned(Spanned&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle A reference to the copied handle
+   * @return A reference to this
+   */
+  Spanned& operator=(const Spanned& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] rhs A reference to the handle to move
+   * @return A reference to this handle
+   */
+  Spanned& operator=(Spanned&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~Spanned();
+
+protected:
+  /**
+   * @brief Downcasts to a Spanned handle.
+   * If handle is not a Spanned, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return Spanned handle or an uninitialized handle
+   */
+  static Spanned DownCast(BaseHandle handle);
+
+public:
+  /**
+   * @brief Retrieve all spans.
+   *
+   * @return list of spans
+   */
+  std::vector<BaseSpan> GetAllSpans() const;
+
+  /**
+   * @brief Retrieve all spans and ranges. Two lists are mapped by index.
+   *
+   * @param[out] spans container to clone spans
+   * @param[out] ranges container to clone ranges
+   */
+  void RetrieveAllSpansAndRanges(std::vector<BaseSpan>& spans, std::vector<Range>& ranges) const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Internal constructor.
+   *
+   * @param[in] spanned Pointer to internal Spanned
+   */
+  explicit DALI_INTERNAL Spanned(Internal::Spanned* spanned);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_SPANNED_H
diff --git a/dali-toolkit/devel-api/text/spans/background-color-span.cpp b/dali-toolkit/devel-api/text/spans/background-color-span.cpp
new file mode 100644
index 0000000..c7a5d04
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/background-color-span.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/background-color-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+BackgroundColorSpan BackgroundColorSpan::New(const Vector4 &color)
+{
+  return Internal::BackgroundColorSpan::New(color);
+}
+
+BackgroundColorSpan::BackgroundColorSpan(Internal::BackgroundColorSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+BackgroundColorSpan::BackgroundColorSpan() = default;
+
+BackgroundColorSpan::BackgroundColorSpan(const BackgroundColorSpan& rhs) = default;
+
+BackgroundColorSpan::BackgroundColorSpan(BackgroundColorSpan&& rhs) = default;
+
+BackgroundColorSpan& BackgroundColorSpan::operator=(const BackgroundColorSpan& rhs) = default;
+
+BackgroundColorSpan& BackgroundColorSpan::operator=(BackgroundColorSpan&& rhs) = default;
+
+BackgroundColorSpan::~BackgroundColorSpan() = default;
+
+//Methods
+Vector4 BackgroundColorSpan::GetBackgroundColor() const
+{
+  return GetImplementation(*this).GetBackgroundColor();
+}
+
+bool BackgroundColorSpan::IsBackgroundColorDefined() const
+{
+  return GetImplementation(*this).IsBackgroundColorDefined();
+}
+
+BackgroundColorSpan BackgroundColorSpan::DownCast(BaseHandle handle)
+{
+  return BackgroundColorSpan(dynamic_cast<Dali::Toolkit::Text::Internal::BackgroundColorSpan*>(handle.GetObjectPtr()));
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/background-color-span.h b/dali-toolkit/devel-api/text/spans/background-color-span.h
new file mode 100644
index 0000000..10c56dd
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/background-color-span.h
@@ -0,0 +1,130 @@
+#ifndef DALI_TOOLKIT_TEXT_BACKGROUND_COLOR_SPAN_H
+#define DALI_TOOLKIT_TEXT_BACKGROUND_COLOR_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class BackgroundColorSpan;
+}
+
+/**
+ * @brief BackgroundColorSpan is a handle to an object that specifies the background-color for range of characters.
+ */
+class DALI_TOOLKIT_API BackgroundColorSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an initialized BackgroundColorSpan.
+   *
+   * @param[in] color The background color.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static BackgroundColorSpan New(const Vector4 &color);
+
+  /**
+   * @brief Creates an uninitialized BackgroundColorSpan handle.
+   *
+   * Calling member functions with an uninitialized BackgroundColorSpan handle is not allowed.
+   */
+  BackgroundColorSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A reference to the copied handle
+   */
+  BackgroundColorSpan(const BackgroundColorSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   * @param[in] rhs A reference to the handle to move
+   */
+  BackgroundColorSpan(BackgroundColorSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle
+   * @return A reference to this
+   */
+  BackgroundColorSpan& operator=(const BackgroundColorSpan& rhs);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  BackgroundColorSpan& operator=(BackgroundColorSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~BackgroundColorSpan();
+
+  /**
+   * @brief Downcasts to a BackgroundColorSpan handle.
+   * If handle is not a BackgroundColorSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return BackgroundColorSpan handle or an uninitialized handle
+   */
+  static BackgroundColorSpan DownCast(BaseHandle handle);
+
+public: //Methods
+  /**
+   * @brief Retrive the background-color.
+   *
+   * @return A background-color value.
+   */
+  Vector4 GetBackgroundColor() const;
+
+  /**
+   * @brief Retrieve whether the background-color is defined.
+   *
+   * @return The return is true if background-color is defined, otherwise false.
+   */
+  bool IsBackgroundColorDefined() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief This constructor is used internally to Create an initialized BackgroundColorSpan handle.
+   *
+   * @param[in] colorSpan Pointer to internal BackgroundColorSpan
+   */
+  explicit DALI_INTERNAL BackgroundColorSpan(Internal::BackgroundColorSpan* colorSpan);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_BACKGROUND_COLOR_SPAN_H
diff --git a/dali-toolkit/devel-api/text/spans/base-span.cpp b/dali-toolkit/devel-api/text/spans/base-span.cpp
new file mode 100644
index 0000000..0781390
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/base-span.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+BaseSpan::BaseSpan() = default;
+
+BaseSpan::BaseSpan(Internal::BaseSpan* internal)
+: BaseHandle(internal)
+{
+}
+
+BaseSpan::BaseSpan(const BaseSpan& rhs) = default;
+
+BaseSpan::BaseSpan(BaseSpan&& rhs) = default;
+
+BaseSpan& BaseSpan::operator=(const BaseSpan& rhs) = default;
+
+BaseSpan& BaseSpan::operator=(BaseSpan&& rhs) = default;
+
+BaseSpan::~BaseSpan() = default;
+
+BaseSpan BaseSpan::DownCast(BaseHandle handle)
+{
+  return BaseSpan(dynamic_cast<Dali::Toolkit::Text::Internal::BaseSpan*>(handle.GetObjectPtr()));
+}
+
+Dali::Toolkit::Text::SpanType::Value BaseSpan::GetSpanType() const
+{
+  return GetImplementation(*this).GetSpanType();
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/base-span.h b/dali-toolkit/devel-api/text/spans/base-span.h
new file mode 100644
index 0000000..e3f7f29
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/base-span.h
@@ -0,0 +1,137 @@
+#ifndef DALI_TOOLKIT_TEXT_BASE_SPAN_H
+#define DALI_TOOLKIT_TEXT_BASE_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/span-enumerations.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/public-api/object/base-handle.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class BaseSpan;
+}
+
+/**
+ * @brief Base structure for different text-spans.
+ * The application can attach and detach spans on range of text for text-controller.
+ * Used to modify text style dynamically at runtime on character level.
+ *
+ * A text-span contains set of attributes of specific style for text.
+ *
+ * To receive a particular text-span, the application has to create span through its builder.
+ *
+ * @note An instance of this class cannot be created.
+ *
+ */
+class DALI_TOOLKIT_API BaseSpan : public BaseHandle
+{
+public:
+  /**
+   * @brief Creates an uninitialized BaseSpan handle.
+   *
+   * Calling member functions with an uninitialized BaseSpan handle is not allowed.
+   */
+  BaseSpan();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] rhs A reference to the copied handle
+   */
+  BaseSpan(const BaseSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] rhs A reference to the handle to move
+   */
+  BaseSpan(BaseSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle A reference to the copied handle
+   * @return A reference to this
+   */
+  BaseSpan& operator=(const BaseSpan& handle);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @param[in] rhs A reference to the handle to move
+   * @return A reference to this handle
+   */
+  BaseSpan& operator=(BaseSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~BaseSpan();
+
+  /**
+   * @brief Retrive the span type.
+   *
+   * @return A span type value.
+   */
+  Dali::Toolkit::Text::SpanType::Value GetSpanType() const;
+
+  /**
+   * @brief Downcasts to a BaseSpan handle.
+   * If handle is not a BaseSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return BaseSpan handle or an uninitialized handle
+   */
+  static BaseSpan DownCast(BaseHandle handle);
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Internal constructor.
+   *
+   * @param[in] baseSpan Pointer to internal BaseSpan
+   */
+  explicit DALI_INTERNAL BaseSpan(Internal::BaseSpan* baseSpan);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow BaseSpan to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::BaseSpan> : public BasicTypes<Dali::Toolkit::Text::BaseSpan>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_BASE_SPAN_H
diff --git a/dali-toolkit/devel-api/text/spans/bold-span.cpp b/dali-toolkit/devel-api/text/spans/bold-span.cpp
new file mode 100644
index 0000000..74e9d2a
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/bold-span.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/bold-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/bold-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+
+BoldSpan BoldSpan::New()
+{
+  return Internal::BoldSpan::New();
+}
+
+BoldSpan::BoldSpan() = default;
+
+BoldSpan::BoldSpan(const BoldSpan& rhs) = default;
+
+BoldSpan::BoldSpan(BoldSpan&& rhs) = default;
+
+BoldSpan& BoldSpan::operator=(const BoldSpan& rhs) = default;
+
+BoldSpan& BoldSpan::operator=(BoldSpan&& rhs) = default;
+
+BoldSpan::~BoldSpan() = default;
+
+BoldSpan::BoldSpan(Internal::BoldSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+BoldSpan BoldSpan::DownCast(BaseHandle handle)
+{
+  return BoldSpan(dynamic_cast<Dali::Toolkit::Text::Internal::BoldSpan*>(handle.GetObjectPtr()));
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/bold-span.h b/dali-toolkit/devel-api/text/spans/bold-span.h
new file mode 100644
index 0000000..9520bb6
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/bold-span.h
@@ -0,0 +1,111 @@
+#ifndef DALI_TOOLKIT_TEXT_BOLD_SPAN_H
+#define DALI_TOOLKIT_TEXT_BOLD_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class BoldSpan;
+}
+
+/**
+ * @brief BoldSpan is a handle to an object that specifies the Bold for range of characters.
+ */
+class DALI_TOOLKIT_API BoldSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an initialized BoldSpan.
+   *
+   * @return A handle to newly allocated Dali resource.
+   */
+  static BoldSpan New();
+
+  /**
+   * @brief Creates an uninitialized BoldSpan handle.
+   *
+   * Calling member functions with an uninitialized BoldSpan handle is not allowed.
+   */
+  BoldSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A refrence to the copied handle.
+   */
+  BoldSpan(const BoldSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @param[in] rhs A refrence to the move handle.
+   */
+  BoldSpan(BoldSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle.
+   * @return A refrence to this.
+   */
+  BoldSpan& operator=(const BoldSpan& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs rhs A reference to the move handle.
+   * @return A refrence to this.
+   */
+  BoldSpan& operator=(BoldSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   *
+   */
+  ~BoldSpan();
+
+  /**
+   * @brief Downcasts to a BoldSpan handle.
+   * If handle is not a BoldSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object.
+   * @return BoldSpan handle or an uninitialized handle
+   */
+  static BoldSpan DownCast(BaseHandle handle);
+
+  // Not intended for application developers
+  /**
+   * @brief This constructor is used internally to create an initialized BoldSpan handle.
+   * @param[in] boldSpan Pointer to internal BoldSpan.
+   */
+  explicit DALI_INTERNAL BoldSpan(Internal::BoldSpan* boldSpan);
+};
+
+}// namespace Text
+
+}// namespace Toolkit
+
+}// namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_BOLDSPAN_H
diff --git a/dali-toolkit/devel-api/text/spans/character-spacing-span.cpp b/dali-toolkit/devel-api/text/spans/character-spacing-span.cpp
new file mode 100644
index 0000000..1e8b306
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/character-spacing-span.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/character-spacing-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+CharacterSpacingSpan CharacterSpacingSpan::New(const float value)
+{
+  return Internal::CharacterSpacingSpan::New(value);
+}
+
+CharacterSpacingSpan::CharacterSpacingSpan(Internal::CharacterSpacingSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+CharacterSpacingSpan::CharacterSpacingSpan() = default;
+
+CharacterSpacingSpan::CharacterSpacingSpan(const CharacterSpacingSpan& rhs) = default;
+
+CharacterSpacingSpan::CharacterSpacingSpan(CharacterSpacingSpan&& rhs) = default;
+
+CharacterSpacingSpan& CharacterSpacingSpan::operator=(const CharacterSpacingSpan& rhs) = default;
+
+CharacterSpacingSpan& CharacterSpacingSpan::operator=(CharacterSpacingSpan&& rhs) = default;
+
+CharacterSpacingSpan::~CharacterSpacingSpan() = default;
+
+//Methods
+float CharacterSpacingSpan::GetCharacterSpacing() const
+{
+  return GetImplementation(*this).GetCharacterSpacing();
+}
+
+bool CharacterSpacingSpan::IsCharacterSpacingDefined() const
+{
+  return GetImplementation(*this).IsCharacterSpacingDefined();
+}
+
+CharacterSpacingSpan CharacterSpacingSpan::DownCast(BaseHandle handle)
+{
+  return CharacterSpacingSpan(dynamic_cast<Dali::Toolkit::Text::Internal::CharacterSpacingSpan*>(handle.GetObjectPtr()));
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/character-spacing-span.h b/dali-toolkit/devel-api/text/spans/character-spacing-span.h
new file mode 100644
index 0000000..768f0cf
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/character-spacing-span.h
@@ -0,0 +1,129 @@
+#ifndef DALI_TOOLKIT_TEXT_CHARACTER_SPACING_SPAN_H
+#define DALI_TOOLKIT_TEXT_CHARACTER_SPACING_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class CharacterSpacingSpan;
+}
+
+/**
+ * @brief CharacterSpacingSpan is a handle to an object that specifies the CharacterSpacing for range of characters.
+ */
+class DALI_TOOLKIT_API CharacterSpacingSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an initialized CharacterSpacingSpan.
+   *
+   * @param[in] value The CharacterSpacing value.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static CharacterSpacingSpan New(const float value);
+
+  /**
+   * @brief Creates an uninitialized CharacterSpacingSpan handle.
+   *
+   * Calling member functions with an uninitialized CharacterSpacingSpan handle is not allowed.
+   */
+  CharacterSpacingSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A reference to the copied handle
+   */
+  CharacterSpacingSpan(const CharacterSpacingSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   * @param[in] rhs A reference to the handle to move
+   */
+  CharacterSpacingSpan(CharacterSpacingSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle
+   * @return A reference to this
+   */
+  CharacterSpacingSpan& operator=(const CharacterSpacingSpan& rhs);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  CharacterSpacingSpan& operator=(CharacterSpacingSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~CharacterSpacingSpan();
+
+  /**
+   * @brief Downcasts to a CharacterSpacingSpan handle.
+   * If handle is not a CharacterSpacingSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return CharacterSpacingSpan handle or an uninitialized handle
+   */
+  static CharacterSpacingSpan DownCast(BaseHandle handle);
+
+public: //Methods
+  /**
+   * @brief Retrive the CharacterSpacing.
+   *
+   * @return A CharacterSpacing value.
+   */
+  float GetCharacterSpacing() const;
+
+  /**
+   * @brief Retrieve whether the CharacterSpacing is defined.
+   *
+   * @return The return is true if CharacterSpacing is defined, otherwise false.
+   */
+  bool IsCharacterSpacingDefined() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief This constructor is used internally to Create an initialized CharacterSpacingSpan handle.
+   *
+   * @param[in] charSpacingSpan Pointer to internal CharacterSpacingSpan
+   */
+  explicit DALI_INTERNAL CharacterSpacingSpan(Internal::CharacterSpacingSpan* charSpacingSpan);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CHARACTER_SPACING_SPAN_H
diff --git a/dali-toolkit/devel-api/text/spans/font-span.cpp b/dali-toolkit/devel-api/text/spans/font-span.cpp
new file mode 100644
index 0000000..6300224
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/font-span.cpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/font-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/font-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+FontSpan FontSpan::New(const std::string                             familyName,
+                       const float                                   sizeInPoints,
+                       const Dali::TextAbstraction::FontWeight::Type weight,
+                       const Dali::TextAbstraction::FontWidth::Type  width,
+                       const Dali::TextAbstraction::FontSlant::Type  slant)
+{
+  return Internal::FontSpan::New(familyName, sizeInPoints, weight, width, slant);
+}
+
+FontSpan::FontSpan(Internal::FontSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+FontSpan::FontSpan() = default;
+
+FontSpan::FontSpan(const FontSpan& rhs) = default;
+
+FontSpan::FontSpan(FontSpan&& rhs) = default;
+
+FontSpan& FontSpan::operator=(const FontSpan& rhs) = default;
+
+FontSpan& FontSpan::operator=(FontSpan&& rhs) = default;
+
+FontSpan::~FontSpan() = default;
+
+//Methods
+const std::string FontSpan::GetFamilyName() const
+{
+  return GetImplementation(*this).GetFamilyName();
+}
+
+bool FontSpan::IsFamilyNameDefined() const
+{
+  return GetImplementation(*this).IsFamilyNameDefined();
+}
+
+Dali::TextAbstraction::FontWeight::Type FontSpan::GetWeight() const
+{
+  return GetImplementation(*this).GetWeight();
+}
+
+bool FontSpan::IsWeightDefined() const
+{
+  return GetImplementation(*this).IsWeightDefined();
+}
+
+Dali::TextAbstraction::FontWidth::Type FontSpan::GetWidth() const
+{
+  return GetImplementation(*this).GetWidth();
+}
+
+bool FontSpan::IsWidthDefined() const
+{
+  return GetImplementation(*this).IsWidthDefined();
+}
+
+Dali::TextAbstraction::FontSlant::Type FontSpan::GetSlant() const
+{
+  return GetImplementation(*this).GetSlant();
+}
+
+bool FontSpan::IsSlantDefined() const
+{
+  return GetImplementation(*this).IsSlantDefined();
+}
+
+float FontSpan::GetSize() const
+{
+  return GetImplementation(*this).GetSize();
+}
+
+bool FontSpan::IsSizeDefined() const
+{
+  return GetImplementation(*this).IsSizeDefined();
+}
+
+FontSpan FontSpan::DownCast(BaseHandle handle)
+{
+  return FontSpan(dynamic_cast<Dali::Toolkit::Text::Internal::FontSpan*>(handle.GetObjectPtr()));
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/font-span.h b/dali-toolkit/devel-api/text/spans/font-span.h
new file mode 100644
index 0000000..7b241ed
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/font-span.h
@@ -0,0 +1,197 @@
+#ifndef DALI_TOOLKIT_TEXT_FONT_SPAN_H
+#define DALI_TOOLKIT_TEXT_FONT_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/font-list.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class FontSpan;
+}
+
+/**
+ * @brief FontSpan is a handle to an object that specifies the font properties for range of characters.
+ */
+class DALI_TOOLKIT_API FontSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an initialized FontSpan.
+   *
+   * @param[in] familyName The font family name.
+   * @param[in] sizeInPoints The font size.
+   * @param[in] weight The font weight.
+   * @param[in] width The font width.
+   * @param[in] slant The font slant.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static FontSpan New(const std::string                             familyName,
+                      const float                                   sizeInPoints,
+                      const Dali::TextAbstraction::FontWeight::Type weight,
+                      const Dali::TextAbstraction::FontWidth::Type  width,
+                      const Dali::TextAbstraction::FontSlant::Type  slant);
+
+  /**
+   * @brief Creates an uninitialized FontSpan handle.
+   *
+   * Calling member functions with an uninitialized FontSpan handle is not allowed.
+   */
+  FontSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A reference to the copied handle
+   */
+  FontSpan(const FontSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   * @param[in] rhs A reference to the handle to move
+   */
+  FontSpan(FontSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle
+   * @return A reference to this
+   */
+  FontSpan& operator=(const FontSpan& rhs);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  FontSpan& operator=(FontSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~FontSpan();
+
+  /**
+   * @brief Downcasts to a FontSpan handle.
+   * If handle is not a FontSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return FontSpan handle or an uninitialized handle
+   */
+  static FontSpan DownCast(BaseHandle handle);
+
+public: //Methods
+  /**
+   * @brief Retrive the font family name.
+   *
+   * @return A family name value.
+   */
+  const std::string GetFamilyName() const;
+
+  /**
+   * @brief Retrive the font weight.
+   *
+   * @return A font weight value.
+   */
+  Dali::TextAbstraction::FontWeight::Type GetWeight() const;
+
+  /**
+   * @brief Retrive the font width.
+   *
+   * @return A font width value.
+   */
+  Dali::TextAbstraction::FontWidth::Type GetWidth() const;
+
+  /**
+   * @brief Retrive the font slant.
+   *
+   * @return A font slant value.
+   */
+  Dali::TextAbstraction::FontSlant::Type GetSlant() const;
+
+  /**
+   * @brief Retrive the font size.
+   *
+   * @return A font size value.
+   */
+  float GetSize() const;
+
+  /**
+   * @brief Retrieve whether the font family name is defined.
+   *
+   * @return The return is true if font family name is defined, otherwise false.
+   */
+  bool IsFamilyNameDefined() const;
+
+  /**
+   * @brief Retrieve whether the font weight is defined.
+   *
+   * @return The return is true if font weight is defined, otherwise false.
+   */
+  bool IsWeightDefined() const;
+
+  /**
+   * @brief Retrieve whether the font width is defined.
+   *
+   * @return The return is true if font width is defined, otherwise false.
+   */
+  bool IsWidthDefined() const;
+
+  /**
+   * @brief Retrieve whether the font slant is defined.
+   *
+   * @return The return is true if font slant is defined, otherwise false.
+   */
+  bool IsSlantDefined() const;
+
+  /**
+   * @brief Retrieve whether the font size is defined.
+   *
+   * @return The return is true if font size is defined, otherwise false.
+   */
+
+  bool IsSizeDefined() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief This constructor is used internally to Create an initialized FontSpan handle.
+   *
+   * @param[in] fontSpan Pointer to internal FontSpan
+   */
+  explicit DALI_INTERNAL FontSpan(Internal::FontSpan* fontSpan);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_FONT_SPAN_H
diff --git a/dali-toolkit/devel-api/text/spans/foreground-color-span.cpp b/dali-toolkit/devel-api/text/spans/foreground-color-span.cpp
new file mode 100644
index 0000000..8c2b395
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/foreground-color-span.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/foreground-color-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+ForegroundColorSpan ForegroundColorSpan::New(Vector4 color)
+{
+  return Internal::ForegroundColorSpan::New(color);
+}
+
+ForegroundColorSpan::ForegroundColorSpan(Internal::ForegroundColorSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+ForegroundColorSpan::ForegroundColorSpan() = default;
+
+ForegroundColorSpan::ForegroundColorSpan(const ForegroundColorSpan& rhs) = default;
+
+ForegroundColorSpan::ForegroundColorSpan(ForegroundColorSpan&& rhs) = default;
+
+ForegroundColorSpan& ForegroundColorSpan::operator=(const ForegroundColorSpan& rhs) = default;
+
+ForegroundColorSpan& ForegroundColorSpan::operator=(ForegroundColorSpan&& rhs) = default;
+
+ForegroundColorSpan::~ForegroundColorSpan() = default;
+
+//Methods
+Vector4 ForegroundColorSpan::GetForegroundColor() const
+{
+  return GetImplementation(*this).GetForegroundColor();
+}
+
+bool ForegroundColorSpan::IsForegroundColorDefined() const
+{
+  return GetImplementation(*this).IsForegroundColorDefined();
+}
+
+ForegroundColorSpan ForegroundColorSpan::DownCast(BaseHandle handle)
+{
+  return ForegroundColorSpan(dynamic_cast<Dali::Toolkit::Text::Internal::ForegroundColorSpan*>(handle.GetObjectPtr()));
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/foreground-color-span.h b/dali-toolkit/devel-api/text/spans/foreground-color-span.h
new file mode 100644
index 0000000..f1e042b
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/foreground-color-span.h
@@ -0,0 +1,130 @@
+#ifndef DALI_TOOLKIT_TEXT_FOREGROUND_COLOR_SPAN_H
+#define DALI_TOOLKIT_TEXT_FOREGROUND_COLOR_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class ForegroundColorSpan;
+}
+
+/**
+ * @brief ForegroundColorSpan is a handle to an object that specifies the foreground-color for range of characters.
+ */
+class DALI_TOOLKIT_API ForegroundColorSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an initialized ForegroundColorSpan.
+   *
+   * @param[in] color The foreground color.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static ForegroundColorSpan New(Vector4 color);
+
+  /**
+   * @brief Creates an uninitialized ForegroundColorSpan handle.
+   *
+   * Calling member functions with an uninitialized ForegroundColorSpan handle is not allowed.
+   */
+  ForegroundColorSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A reference to the copied handle
+   */
+  ForegroundColorSpan(const ForegroundColorSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   * @param[in] rhs A reference to the handle to move
+   */
+  ForegroundColorSpan(ForegroundColorSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle
+   * @return A reference to this
+   */
+  ForegroundColorSpan& operator=(const ForegroundColorSpan& rhs);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  ForegroundColorSpan& operator=(ForegroundColorSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~ForegroundColorSpan();
+
+  /**
+   * @brief Downcasts to a ForegroundColorSpan handle.
+   * If handle is not a ForegroundColorSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return ForegroundColorSpan handle or an uninitialized handle
+   */
+  static ForegroundColorSpan DownCast(BaseHandle handle);
+
+public: //Methods
+  /**
+   * @brief Retrive the foreground-color.
+   *
+   * @return A foreground-color value.
+   */
+  Vector4 GetForegroundColor() const;
+
+  /**
+   * @brief Retrieve whether the foreground-color is defined.
+   *
+   * @return The return is true if foreground-color is defined, otherwise false.
+   */
+  bool IsForegroundColorDefined() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief This constructor is used internally to Create an initialized ForegroundColorSpan handle.
+   *
+   * @param[in] colorSpan Pointer to internal ForegroundColorSpan
+   */
+  explicit DALI_INTERNAL ForegroundColorSpan(Internal::ForegroundColorSpan* colorSpan);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_FOREGROUND_COLOR_SPAN_H
diff --git a/dali-toolkit/devel-api/text/spans/italic-span.cpp b/dali-toolkit/devel-api/text/spans/italic-span.cpp
new file mode 100644
index 0000000..5685684
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/italic-span.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/italic-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/italic-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+ItalicSpan ItalicSpan::New()
+{
+  return Internal::ItalicSpan::New();
+}
+
+ItalicSpan::ItalicSpan() = default;
+
+ItalicSpan::ItalicSpan(const ItalicSpan& rhs) = default;
+
+ItalicSpan::ItalicSpan(ItalicSpan&& rhs) = default;
+
+ItalicSpan& ItalicSpan::operator=(const ItalicSpan& rhs) = default;
+
+ItalicSpan& ItalicSpan::operator=(ItalicSpan&& rhs) = default;
+
+ItalicSpan::~ItalicSpan() = default;
+
+
+ItalicSpan ItalicSpan::DownCast(BaseHandle handle)
+{
+  return ItalicSpan(dynamic_cast<Dali::Toolkit::Text::Internal::ItalicSpan*>(handle.GetObjectPtr()));
+}
+
+ItalicSpan::ItalicSpan(Internal::ItalicSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/italic-span.h b/dali-toolkit/devel-api/text/spans/italic-span.h
new file mode 100644
index 0000000..010eb4e
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/italic-span.h
@@ -0,0 +1,111 @@
+#ifndef DALI_TOOLKIT_TEXT_ITALICSPAN_H
+#define DALI_TOOLKIT_TEXT_ITALICSPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class ItalicSpan;
+}
+
+/**
+ * @brief ItalicSpan is a handle to an object that specifies the Italic font for range of characters.
+ */
+class DALI_TOOLKIT_API ItalicSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an Initialized ItalicSpan.
+   *
+   * @return A handle to a newly allocated Dali resource.
+   */
+  static ItalicSpan New();
+
+  /**
+   * @brief Creates an uninitialized ItalicSpan handle.
+   *
+   * Calling member functions with an uninitialized ItalicSpan handle is not allowed.
+   */
+  ItalicSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A reference to the copied handle.
+   */
+  ItalicSpan(const ItalicSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   * @param rhs A reference to the handle to move.
+   */
+  ItalicSpan(ItalicSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle
+   * @return A reference to this
+   */
+  ItalicSpan& operator=(const ItalicSpan& rhs);
+
+   /**
+   * @brief Move assignment operator.
+   * @param[in] rhs A reference to the moved handle.
+   * @return A reference to this.
+   */
+  ItalicSpan& operator=(ItalicSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~ItalicSpan();
+
+  /**
+   * @brief Downcasts to a ItalicSpan handle.
+   * If handle is not a ItalicSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle  Handle to an object.
+   * @return ItalicSpan handle or an uninitialized handle.
+   */
+  static ItalicSpan DownCast(BaseHandle handle);
+
+  // Not intended for application developers.
+  /**
+   * @brief This constructor is used internally to Create an initialized ItalicSpan handle.
+   *
+   * @param[in] italicSpan Pointer to internal ItalicSpan.
+   */
+  explicit DALI_INTERNAL ItalicSpan(Internal::ItalicSpan* italicSpan);
+
+};
+
+}// namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif //DALI_TOOLKIT_TEXT_ITALICSPAN_H
\ No newline at end of file
diff --git a/dali-toolkit/devel-api/text/spans/span-enumerations.h b/dali-toolkit/devel-api/text/spans/span-enumerations.h
new file mode 100644
index 0000000..d77c265
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/span-enumerations.h
@@ -0,0 +1,55 @@
+#ifndef DALI_SPAN_ENUMERATIONS_H
+#define DALI_SPAN_ENUMERATIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <cstdint>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace SpanType
+{
+/**
+ * @brief Enumeration for type of the span.
+ */
+enum Value : uint8_t
+{
+  BASE = 0,
+  FOREGROUND_COLOR,
+  BACKGROUND_COLOR,
+  FONT,
+  BOLD,
+  ITALIC,
+  UNDERLINE,
+  STRIKETHROUGH,
+  CHARACTER_SPACING
+};
+} // namespace SpanType
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_SPAN_ENUMERATIONS_H
diff --git a/dali-toolkit/devel-api/text/spans/strikethrough-span.cpp b/dali-toolkit/devel-api/text/spans/strikethrough-span.cpp
new file mode 100644
index 0000000..ab43367
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/strikethrough-span.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/strikethrough-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+StrikethroughSpan StrikethroughSpan::New()
+{
+  return Internal::StrikethroughSpan::New();
+}
+
+StrikethroughSpan StrikethroughSpan::New(Vector4 color, float height)
+{
+  return Internal::StrikethroughSpan::New(color, height);
+}
+
+StrikethroughSpan::StrikethroughSpan(Internal::StrikethroughSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+StrikethroughSpan::StrikethroughSpan()                             = default;
+StrikethroughSpan::StrikethroughSpan(const StrikethroughSpan& rhs) = default;
+StrikethroughSpan::StrikethroughSpan(StrikethroughSpan&& rhs)      = default;
+StrikethroughSpan& StrikethroughSpan::operator=(const StrikethroughSpan& rhs) = default;
+StrikethroughSpan& StrikethroughSpan::operator=(StrikethroughSpan&& rhs) = default;
+StrikethroughSpan::~StrikethroughSpan()                                  = default;
+
+//Methods
+Vector4 StrikethroughSpan::GetColor() const
+{
+  return GetImplementation(*this).GetColor();
+}
+
+bool StrikethroughSpan::IsColorDefined() const
+{
+  return GetImplementation(*this).IsColorDefined();
+}
+
+float StrikethroughSpan::GetHeight() const
+{
+  return GetImplementation(*this).GetHeight();
+}
+
+bool StrikethroughSpan::IsHeightDefined() const
+{
+  return GetImplementation(*this).IsHeightDefined();
+}
+
+StrikethroughSpan StrikethroughSpan::DownCast(BaseHandle handle)
+{
+  return StrikethroughSpan(dynamic_cast<Dali::Toolkit::Text::Internal::StrikethroughSpan*>(handle.GetObjectPtr()));
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/devel-api/text/spans/strikethrough-span.h b/dali-toolkit/devel-api/text/spans/strikethrough-span.h
new file mode 100644
index 0000000..b5f9b7f
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/strikethrough-span.h
@@ -0,0 +1,158 @@
+#ifndef DALI_TOOLKIT_TEXT_STRIKETHROUGH_SPAN_H
+#define DALI_TOOLKIT_TEXT_STRIKETHROUGH_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+#include <dali/public-api/common/constants.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class StrikethroughSpan;
+}
+
+/**
+ * @brief StrikethroughSpan is a handle to an object that specifies the strikethrough properties for range of characters.
+ */
+
+class DALI_TOOLKIT_API StrikethroughSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an initialized StrikethroughSpan.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+
+  static StrikethroughSpan New();
+  /**
+   * @brief Create an initialized StrikethroughSpan.
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static StrikethroughSpan New(Vector4 color, float height);
+
+  /**
+   * @brief Creates an uninitialized StrikethroughSpan handle.
+   *
+   * Calling member functions with an uninitialized StrikethroughSpan handle is not allowed.
+   */
+  StrikethroughSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A reference to the copied handle
+   */
+  StrikethroughSpan(const StrikethroughSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   * @param[in] rhs A reference to the handle to move
+   */
+  StrikethroughSpan(StrikethroughSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle
+   * @return A reference to this
+   */
+  StrikethroughSpan& operator=(const StrikethroughSpan& rhs);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  StrikethroughSpan& operator=(StrikethroughSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~StrikethroughSpan();
+
+  /**
+   * @brief Downcasts to a StrikethroughSpan handle.
+   * If handle is not a StrikethroughSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return StrikethroughSpan handle or an uninitialized handle
+   */
+  static StrikethroughSpan DownCast(BaseHandle handle);
+
+public: //Methods
+  /**
+   * @brief Retrive the color of line.
+   *
+   * @return A color value.
+   */
+  Vector4 GetColor() const;
+
+  /**
+   * @brief Retrieve whether the color is defined.
+   *
+   * @return The return is true if color is defined, otherwise false.
+   */
+  bool IsColorDefined() const;
+
+  /**
+   * @brief Retrive the height of line.
+   *
+   * @return A height value.
+   */
+  float GetHeight() const;
+
+  /**
+   * @brief Retrieve whether the height is defined.
+   *
+   * @return The return is true if height is defined, otherwise false.
+   */
+  bool IsHeightDefined() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+
+  /**
+   * @brief This constructor is used internally to Create an initialized StrikethroughSpan handle.
+   *
+   * @param[in] strikethroughSpan Pointer to internal StrikethroughSpan
+   */
+  explicit DALI_INTERNAL StrikethroughSpan(Internal::StrikethroughSpan* strikethroughSpan);
+
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_STRIKETHROUGH_SPAN_H
\ No newline at end of file
diff --git a/dali-toolkit/devel-api/text/spans/underline-span.cpp b/dali-toolkit/devel-api/text/spans/underline-span.cpp
new file mode 100644
index 0000000..4eed79e
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/underline-span.cpp
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/spans/underline-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/underline-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+UnderlineSpan UnderlineSpan::New()
+{
+  return Internal::UnderlineSpan::New();
+}
+
+UnderlineSpan UnderlineSpan::NewSolid(Vector4 color, float height)
+{
+  return Internal::UnderlineSpan::NewSolid(color, height);
+}
+
+UnderlineSpan UnderlineSpan::NewDashed(Vector4 color, float height, float dashGap, float dashWidth)
+{
+  return Internal::UnderlineSpan::NewDashed(color, height, dashGap, dashWidth);
+}
+
+UnderlineSpan UnderlineSpan::NewDouble(Vector4 color, float height)
+{
+  return Internal::UnderlineSpan::NewDouble(color, height);
+}
+
+UnderlineSpan::UnderlineSpan(Internal::UnderlineSpan* internal)
+: BaseSpan(internal)
+{
+}
+
+UnderlineSpan::UnderlineSpan() = default;
+
+UnderlineSpan::UnderlineSpan(const UnderlineSpan& rhs) = default;
+
+UnderlineSpan::UnderlineSpan(UnderlineSpan&& rhs) = default;
+
+UnderlineSpan& UnderlineSpan::operator=(const UnderlineSpan& rhs) = default;
+
+UnderlineSpan& UnderlineSpan::operator=(UnderlineSpan&& rhs) = default;
+
+UnderlineSpan::~UnderlineSpan() = default;
+
+//Methods
+
+Text::Underline::Type UnderlineSpan::GetType() const
+{
+  return GetImplementation(*this).GetType();
+}
+
+bool UnderlineSpan::IsTypeDefined() const
+{
+  return GetImplementation(*this).IsTypeDefined();
+}
+
+Vector4 UnderlineSpan::GetColor() const
+{
+  return GetImplementation(*this).GetColor();
+}
+
+bool UnderlineSpan::IsColorDefined() const
+{
+  return GetImplementation(*this).IsColorDefined();
+}
+
+float UnderlineSpan::GetHeight() const
+{
+  return GetImplementation(*this).GetHeight();
+}
+
+bool UnderlineSpan::IsHeightDefined() const
+{
+  return GetImplementation(*this).IsHeightDefined();
+}
+
+float UnderlineSpan::GetDashGap() const
+{
+  return GetImplementation(*this).GetDashGap();
+}
+
+bool UnderlineSpan::IsDashGapDefined() const
+{
+  return GetImplementation(*this).IsDashGapDefined();
+}
+
+float UnderlineSpan::GetDashWidth() const
+{
+  return GetImplementation(*this).GetDashWidth();
+}
+
+bool UnderlineSpan::IsDashWidthDefined() const
+{
+  return GetImplementation(*this).IsDashWidthDefined();
+}
+
+UnderlineSpan UnderlineSpan::DownCast(BaseHandle handle)
+{
+  return UnderlineSpan(dynamic_cast<Dali::Toolkit::Text::Internal::UnderlineSpan*>(handle.GetObjectPtr()));
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/spans/underline-span.h b/dali-toolkit/devel-api/text/spans/underline-span.h
new file mode 100644
index 0000000..4c504d9
--- /dev/null
+++ b/dali-toolkit/devel-api/text/spans/underline-span.h
@@ -0,0 +1,218 @@
+#ifndef DALI_TOOLKIT_TEXT_UNDERLINE_SPAN_H
+#define DALI_TOOLKIT_TEXT_UNDERLINE_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+#include <dali/public-api/common/constants.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal DALI_INTERNAL
+{
+class UnderlineSpan;
+}
+
+/**
+ * @brief UnderlineSpan is a handle to an object that specifies the underline properties for range of characters.
+ */
+class DALI_TOOLKIT_API UnderlineSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Create an initialized UnderlineSpan.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static UnderlineSpan New();
+
+  /**
+   * @brief Create an initialized UnderlineSpan.
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static UnderlineSpan NewSolid(Vector4 color, float height);
+
+  /**
+   * @brief Create an initialized UnderlineSpan.
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   * @param[in] dashGap The dash-gap of line.
+   * @param[in] dashWidth The dash-width of line.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static UnderlineSpan NewDashed(Vector4 color, float height, float dashGap, float dashWidth);
+
+  /**
+   * @brief Create an initialized UnderlineSpan.
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   *
+   * @return A handle to a newly allocated Dali resource
+   */
+  static UnderlineSpan NewDouble(Vector4 color, float height);
+
+  /**
+   * @brief Creates an uninitialized UnderlineSpan handle.
+   *
+   * Calling member functions with an uninitialized UnderlineSpan handle is not allowed.
+   */
+  UnderlineSpan();
+
+  /**
+   * @brief Copy constructor.
+   * @param[in] rhs A reference to the copied handle
+   */
+  UnderlineSpan(const UnderlineSpan& rhs);
+
+  /**
+   * @brief Move constructor.
+   * @param[in] rhs A reference to the handle to move
+   */
+  UnderlineSpan(UnderlineSpan&& rhs);
+
+  /**
+   * @brief Assignment operator.
+   * @param[in] rhs A reference to the copied handle
+   * @return A reference to this
+   */
+  UnderlineSpan& operator=(const UnderlineSpan& rhs);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  UnderlineSpan& operator=(UnderlineSpan&& rhs);
+
+  /**
+   * @brief Non virtual destructor.
+   */
+  ~UnderlineSpan();
+
+  /**
+   * @brief Downcasts to a UnderlineSpan handle.
+   * If handle is not a UnderlineSpan, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return UnderlineSpan handle or an uninitialized handle
+   */
+  static UnderlineSpan DownCast(BaseHandle handle);
+
+public: //Methods
+  /**
+   * @brief Retrive the type of line.
+   *
+   * @return A type value.
+   */
+  Text::Underline::Type GetType() const;
+
+  /**
+   * @brief Retrieve whether the type is defined.
+   *
+   * @return The return is true if type is defined, otherwise false.
+   */
+  bool IsTypeDefined() const;
+
+  /**
+   * @brief Retrive the color of line.
+   *
+   * @return A color value.
+   */
+  Vector4 GetColor() const;
+
+  /**
+   * @brief Retrieve whether the color is defined.
+   *
+   * @return The return is true if color is defined, otherwise false.
+   */
+  bool IsColorDefined() const;
+
+  /**
+   * @brief Retrive the height of line.
+   *
+   * @return A height value.
+   */
+  float GetHeight() const;
+
+  /**
+   * @brief Retrieve whether the height is defined.
+   *
+   * @return The return is true if height is defined, otherwise false.
+   */
+  bool IsHeightDefined() const;
+
+  /**
+   * @brief Retrive the dash-gap of line.
+   *
+   * @return A dash-gap value.
+   */
+  float GetDashGap() const;
+
+  /**
+   * @brief Retrieve whether the dash-gap is defined.
+   *
+   * @return The return is true if dash-gap is defined, otherwise false.
+   */
+  bool IsDashGapDefined() const;
+
+  /**
+   * @brief Retrive the dash-width of line.
+   *
+   * @return A dash-width value.
+   */
+  float GetDashWidth() const;
+
+  /**
+   * @brief Retrieve whether the dash-width is defined.
+   *
+   * @return The return is true if dash-width is defined, otherwise false.
+   */
+  bool IsDashWidthDefined() const;
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief This constructor is used internally to Create an initialized UnderlineSpan handle.
+   *
+   * @param[in] underlineSpan Pointer to internal UnderlineSpan
+   */
+  explicit DALI_INTERNAL UnderlineSpan(Internal::UnderlineSpan* underlineSpan);
+  /// @endcond
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_UNDERLINE_SPAN_H
diff --git a/dali-toolkit/devel-api/text/text-geometry-devel.cpp b/dali-toolkit/devel-api/text/text-geometry-devel.cpp
new file mode 100644
index 0000000..aaecc89
--- /dev/null
+++ b/dali-toolkit/devel-api/text/text-geometry-devel.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/text/text-geometry-devel.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-controls/text-editor-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/text-label-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace TextGeometry
+{
+
+Rect<float> GetLineBoundingRectangle(TextEditor editor, const uint32_t lineIndex)
+{
+  return GetImpl(editor).GetLineBoundingRectangle(lineIndex);
+}
+
+Rect<float> GetLineBoundingRectangle(TextLabel label, const uint32_t lineIndex)
+{
+  return GetImpl(label).GetLineBoundingRectangle(lineIndex);
+}
+
+Rect<float> GetLineBoundingRectangle(TextField field, const uint32_t lineIndex)
+{
+  return GetImpl(field).GetLineBoundingRectangle(lineIndex);
+}
+
+Rect<float> GetCharacterBoundingRectangle(TextLabel label, const uint32_t charIndex)
+{
+  return GetImpl(label).GetCharacterBoundingRectangle(charIndex);
+}
+
+Rect<float> GetCharacterBoundingRectangle(TextEditor editor, const uint32_t charIndex)
+{
+  return GetImpl(editor).GetCharacterBoundingRectangle(charIndex);
+}
+
+Rect<float> GetCharacterBoundingRectangle(TextField field, const uint32_t charIndex)
+{
+  return GetImpl(field).GetCharacterBoundingRectangle(charIndex);
+}
+
+int GetCharacterIndexAtPosition(TextLabel label, float visualX, float visualY)
+{
+  return GetImpl(label).GetCharacterIndexAtPosition(visualX, visualY);
+}
+
+int GetCharacterIndexAtPosition(TextField field, float visualX, float visualY)
+{
+  return GetImpl(field).GetCharacterIndexAtPosition(visualX, visualY);
+}
+
+int GetCharacterIndexAtPosition(TextEditor editor, float visualX, float visualY)
+{
+  return GetImpl(editor).GetCharacterIndexAtPosition(visualX, visualY);
+}
+
+} //namespace TextGeometry
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/text/text-geometry-devel.h b/dali-toolkit/devel-api/text/text-geometry-devel.h
new file mode 100644
index 0000000..8872cfe
--- /dev/null
+++ b/dali-toolkit/devel-api/text/text-geometry-devel.h
@@ -0,0 +1,137 @@
+#ifndef DALI_TOOLKIT_TEXT_GEOMETRY_DEVEL_H
+#define DALI_TOOLKIT_TEXT_GEOMETRY_DEVEL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+//INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-field.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace TextGeometry
+{
+
+  /**
+   * @brief Get the line bounding rectangle.
+   * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] editor the editor controller that contains the line.
+   * @param[in] lineIndex line index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+   DALI_TOOLKIT_API Rect<float> GetLineBoundingRectangle(TextEditor editor, const uint32_t lineIndex);
+
+  /**
+   * @brief Get the line bounding rectangle.
+   * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] label the label controller that contains the line.
+   * @param[in] lineIndex line index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+   DALI_TOOLKIT_API Rect<float> GetLineBoundingRectangle(TextLabel label, const uint32_t lineIndex);
+
+  /**
+   * @brief Get the line bounding rectangle.
+   * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] field the field controller that contains the line.
+   * @param[in] lineIndex line index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+   DALI_TOOLKIT_API Rect<float> GetLineBoundingRectangle(TextField field, const uint32_t lineIndex);
+
+  /**
+   * @brief Get the character bounding rectangle.
+   * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] label text model containing text info.
+   * @param[in] charIndex character index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+   DALI_TOOLKIT_API Rect<float> GetCharacterBoundingRectangle(TextLabel label, const uint32_t charIndex);
+
+  /**
+   * @brief Get the character bounding rectangle.
+   * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] field text model containing text info.
+   * @param[in] charIndex character index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+   DALI_TOOLKIT_API Rect<float> GetCharacterBoundingRectangle(TextField field, const uint32_t charIndex);
+
+  /**
+   * @brief Get the character bounding rectangle.
+   * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] editor text model containing text info.
+   * @param[in] charIndex character index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+   DALI_TOOLKIT_API Rect<float> GetCharacterBoundingRectangle(TextEditor editor, const uint32_t charIndex);
+
+  /**
+   * @brief Get the character index.
+   * If the text is not yet rendered or the text is empty, -1 is returned.
+   *
+   * @param[in] label text model containing text info.
+   * @param[in] visualX visual x position.
+   * @param[in] visualY visual y position.
+   * @return character index.
+   */
+   DALI_TOOLKIT_API int GetCharacterIndexAtPosition(TextLabel label, float visualX, float visualY);
+
+  /**
+   * @brief Get the character index.
+   * If the text is not yet rendered or the text is empty, -1 is returned.
+   *
+   * @param[in] field text model containing text info.
+   * @param[in] visualX visual x position.
+   * @param[in] visualY visual y position.
+   * @return character index.
+   */
+  DALI_TOOLKIT_API int GetCharacterIndexAtPosition(TextField field, float visualX, float visualY);
+
+  /**
+   * @brief Get the character index.
+   * If the text is not yet rendered or the text is empty, -1 is returned.
+   *
+   * @param[in] editor text model containing text info.
+   * @param[in] visualX visual x position.
+   * @param[in] visualY visual y position.
+   * @return character index.
+   */
+  DALI_TOOLKIT_API int GetCharacterIndexAtPosition(TextEditor editor, float visualX, float visualY);
+
+
+} // namespace TextGeometry
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif //DALI_TOOLKIT_TEXT_GEOMETRY_DEVEL_H
diff --git a/dali-toolkit/devel-api/text/text-utils-devel.cpp b/dali-toolkit/devel-api/text/text-utils-devel.cpp
index 41d7126..98c37ab 100644
--- a/dali-toolkit/devel-api/text/text-utils-devel.cpp
+++ b/dali-toolkit/devel-api/text/text-utils-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,10 +31,12 @@
 #include <dali-toolkit/internal/text/bidirectional-support.h>
 #include <dali-toolkit/internal/text/character-set-conversion.h>
 #include <dali-toolkit/internal/text/color-segmentation.h>
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 #include <dali-toolkit/internal/text/layouts/layout-engine.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
 #include <dali-toolkit/internal/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
 #include <dali-toolkit/internal/text/segmentation.h>
 #include <dali-toolkit/internal/text/shaper.h>
 #include <dali-toolkit/internal/text/text-enumerations-impl.h>
@@ -175,11 +177,16 @@ void ShapeTextPreprocess(const RendererParameters& textParameters, TextAbstracti
                                       textModel->mLogicalModel->mEmbeddedItems,
                                       textModel->mLogicalModel->mAnchors,
                                       textModel->mLogicalModel->mUnderlinedCharacterRuns,
-                                      textModel->mLogicalModel->mBackgroundColorRuns);
+                                      textModel->mLogicalModel->mBackgroundColorRuns,
+                                      textModel->mLogicalModel->mStrikethroughCharacterRuns,
+                                      textModel->mLogicalModel->mBoundedParagraphRuns,
+                                      textModel->mLogicalModel->mCharacterSpacingCharacterRuns);
 
   if(textParameters.markupEnabled)
   {
-    ProcessMarkupString(textParameters.text, markupProcessData);
+    MarkupPropertyData markupPropertyData(Color::MEDIUM_BLUE, Color::DARK_MAGENTA);
+
+    ProcessMarkupString(textParameters.text, markupPropertyData, markupProcessData);
     textSize = markupProcessData.markupProcessedText.size();
 
     // This is a bit horrible but std::string returns a (signed) char*
@@ -288,6 +295,7 @@ void ShapeTextPreprocess(const RendererParameters& textParameters, TextAbstracti
                                      fontDescriptionRuns,
                                      defaultFontDescription,
                                      defaultPointSize,
+                                     1.0f,
                                      0u,
                                      numberOfCharacters,
                                      validFonts);
@@ -813,9 +821,17 @@ void Ellipsis(const RendererParameters& textParameters, TextAbstraction::TextRen
   Text::ModelPtr& textModel  = internalDataModel.textModel;
   FontClient&     fontClient = internalDataModel.fontClient;
 
-  Vector<LineRun>& lines          = textModel->mVisualModel->mLines; // The laid out lines.
-  Vector<bool>&    isEmoji        = internalDataModel.isEmoji;
-  const Size       textLayoutArea = internalDataModel.textLayoutArea;
+  Vector<LineRun>&        lines                     = textModel->mVisualModel->mLines; // The laid out lines.
+  Vector<bool>&           isEmoji                   = internalDataModel.isEmoji;
+  const Size              textLayoutArea            = internalDataModel.textLayoutArea;
+  const float             modelCharacterSpacing     = textModel->mVisualModel->GetCharacterSpacing();
+  float                   calculatedAdvance         = 0.f;
+  Vector<CharacterIndex>& glyphToCharacterMap       = textModel->mVisualModel->mGlyphsToCharacters;
+  const CharacterIndex*   glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
+
+  // Get the character-spacing runs.
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = textModel->mVisualModel->GetCharacterSpacingGlyphRuns();
+
   ////////////////////////////////////////////////////////////////////////////////
   // Ellipsis the text.
   ////////////////////////////////////////////////////////////////////////////////
@@ -828,7 +844,7 @@ void Ellipsis(const RendererParameters& textParameters, TextAbstraction::TextRen
     {
       Length finalNumberOfGlyphs = 0u;
 
-      if((GetLineHeight(line)) > textLayoutArea.height)
+      if((GetLineHeight(line, (lines.Size() == 1))) > textLayoutArea.height)
       {
         // The height of the line is bigger than the height of the text area.
         // Show the ellipsis glyph even if it doesn't fit in the text area.
@@ -901,7 +917,9 @@ void Ellipsis(const RendererParameters& textParameters, TextAbstraction::TextRen
                 firstPenSet = true;
               }
 
-              removedGlypsWidth += std::min(glyphToRemove.advance, (glyphToRemove.xBearing + glyphToRemove.width));
+              const float characterSpacing = GetGlyphCharacterSpacing(index, characterSpacingGlyphRuns, modelCharacterSpacing);
+              calculatedAdvance            = GetCalculatedAdvance(*(textModel->mLogicalModel->mText.Begin() + (*(glyphToCharacterMapBuffer + index))), characterSpacing, glyphToRemove.advance);
+              removedGlypsWidth += std::min(calculatedAdvance, (glyphToRemove.xBearing + glyphToRemove.width));
 
               // Calculate the width of the ellipsis glyph and check if it fits.
               const float ellipsisGlyphWidth = ellipsisGlyph.width + ellipsisGlyph.xBearing;
@@ -1050,11 +1068,16 @@ Size LayoutText(const RendererParameters& textParameters, TextAbstraction::TextR
 
   // Update the visual model.
   Size newLayoutSize;
-  bool isAutoScrollEnabled = false;
+  bool isAutoScrollEnabled            = false;
+  bool isAutoScrollMaxTextureExceeded = false;
+  bool isHiddenInputEnabled           = false;
+
   layoutEngine.LayoutText(layoutParameters,
                           newLayoutSize,
                           textParameters.ellipsisEnabled,
                           isAutoScrollEnabled,
+                          isAutoScrollMaxTextureExceeded,
+                          isHiddenInputEnabled,
                           ellipsisPosition);
 
   return newLayoutSize;
@@ -1388,7 +1411,8 @@ void UpdateBuffer(Devel::PixelBuffer src, Devel::PixelBuffer dst, unsigned int x
   }
 
   const unsigned int bytesPerPixel = Dali::Pixel::GetBytesPerPixel(pixelFormat);
-  if(bytesPerPixel == 0u || bytesPerPixel == 12u || bytesPerPixel == 24u)
+  // Ignore when pixelFormat is invalid or contain float
+  if(bytesPerPixel == 0u || bytesPerPixel == 6u || bytesPerPixel == 12u)
   {
     return;
   }
@@ -1519,12 +1543,14 @@ Dali::Property::Array RenderForLastIndex(RendererParameters& textParameters)
   float            penY               = 0.f;
   float            lineSize           = internalData.layoutEngine.GetDefaultLineSize();
   float            lineOffset         = 0.f;
+  bool             isLastLine;
   for(unsigned int index = 0u; index < numberOfLines; ++index)
   {
     const LineRun& line = *(lines.Begin() + index);
     numberOfCharacters += line.characterRun.numberOfCharacters;
+    isLastLine = (index == numberOfLines - 1);
 
-    lineOffset = lineSize > 0.f ? lineSize : GetLineHeight(line);
+    lineOffset = lineSize > 0.f ? lineSize : GetLineHeight(line, isLastLine);
     penY += lineOffset;
     if((penY + lineOffset) > boundingBox)
     {
diff --git a/dali-toolkit/devel-api/toolkit-action-index-ranges.h b/dali-toolkit/devel-api/toolkit-action-index-ranges.h
new file mode 100644
index 0000000..8e5dbc4
--- /dev/null
+++ b/dali-toolkit/devel-api/toolkit-action-index-ranges.h
@@ -0,0 +1,51 @@
+#ifndef DALI_TOOLKIT_ACTION_INDEX_RANGES_H
+#define DALI_TOOLKIT_ACTION_INDEX_RANGES_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/property-index-ranges.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+/**
+ * @addtogroup dali_toolkit_controls
+ * @{
+ */
+
+/**
+ * @brief Enumeration for the start and end action ranges.
+ */
+enum ActionRanges
+{
+  VISUAL_ACTION_BASE_START_INDEX = 0,                                    ///< Visual Action Base Start Index.
+  VISUAL_ACTION_BASE_END_INDEX   = VISUAL_ACTION_BASE_START_INDEX + 100, ///< Visual Action Base End Index.
+  VISUAL_ACTION_START_INDEX      = VISUAL_ACTION_BASE_END_INDEX + 1,     ///< Visual Action Start Index.
+  VISUAL_ACTION_END_INDEX        = VISUAL_ACTION_START_INDEX + 100000,   ///< Visual Action End Index.
+};
+
+/**
+ * @}
+ */
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_ACTION_INDEX_RANGES_H
diff --git a/dali-toolkit/devel-api/utility/npatch-helper.cpp b/dali-toolkit/devel-api/utility/npatch-helper.cpp
new file mode 100644
index 0000000..fed5316
--- /dev/null
+++ b/dali-toolkit/devel-api/utility/npatch-helper.cpp
@@ -0,0 +1,289 @@
+/*
+* Copyright (c) 2023 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/utility/npatch-helper.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/npatch-data.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace NPatchHelper
+{
+namespace
+{
+/**
+ * @brief Creates the geometry formed from the vertices and indices
+ *
+ * @param[in]  vertices             The vertices to generate the geometry from
+ * @param[in]  indices              The indices to generate the geometry from
+ * @return The geometry formed from the vertices and indices
+ */
+Geometry GenerateGeometry(const Vector<Vector2>& vertices, const Vector<uint16_t>& indices)
+{
+  Property::Map vertexFormat;
+  vertexFormat["aPosition"] = Property::VECTOR2;
+  VertexBuffer vertexBuffer = VertexBuffer::New(vertexFormat);
+  if(vertices.Size() > 0)
+  {
+    vertexBuffer.SetData(&vertices[0], vertices.Size());
+  }
+
+  // Create the geometry object
+  Geometry geometry = Geometry::New();
+  geometry.AddVertexBuffer(vertexBuffer);
+  if(indices.Size() > 0)
+  {
+    geometry.SetIndexBuffer(&indices[0], indices.Size());
+  }
+
+  return geometry;
+}
+
+/**
+ * @brief Adds the indices to form a quad composed off two triangles where the indices are organised in a grid
+ *
+ * @param[out] indices     The indices to add to
+ * @param[in]  rowIdx      The row index to start the quad
+ * @param[in]  nextRowIdx  The index to the next row
+ */
+void AddQuadIndices(Vector<uint16_t>& indices, uint32_t rowIdx, uint32_t nextRowIdx)
+{
+  indices.PushBack(rowIdx);
+  indices.PushBack(nextRowIdx + 1);
+  indices.PushBack(rowIdx + 1);
+
+  indices.PushBack(rowIdx);
+  indices.PushBack(nextRowIdx);
+  indices.PushBack(nextRowIdx + 1);
+}
+
+/**
+ * @brief Adds the vertices to create for npatch
+ * @param[out] vertices The vertices to add to
+ * @param[in]  x        The x value of vector
+ * @param[in]  y        The y value of vector
+ */
+void AddVertex(Vector<Vector2>& vertices, uint32_t x, uint32_t y)
+{
+  vertices.PushBack(Vector2(x, y));
+}
+
+} // unnamed namespace
+
+Geometry CreateGridGeometry(Uint16Pair gridSize)
+{
+  uint16_t gridWidth  = gridSize.GetWidth();
+  uint16_t gridHeight = gridSize.GetHeight();
+
+  // Create vertices
+  Vector<Vector2> vertices;
+  vertices.Reserve((gridWidth + 1u) * (gridHeight + 1u));
+
+  for(uint32_t y = 0u; y < gridHeight + 1u; ++y)
+  {
+    for(uint32_t x = 0u; x < gridWidth + 1u; ++x)
+    {
+      AddVertex(vertices, x, y);
+    }
+  }
+
+  // Create indices
+  Vector<uint16_t> indices;
+  indices.Reserve(gridWidth * gridHeight * 6u);
+
+  uint32_t rowIdx     = 0u;
+  uint32_t nextRowIdx = gridWidth + 1u;
+  for(uint32_t y = 0u; y < gridHeight; ++y, ++nextRowIdx, ++rowIdx)
+  {
+    for(uint32_t x = 0u; x < gridWidth; ++x, ++nextRowIdx, ++rowIdx)
+    {
+      AddQuadIndices(indices, rowIdx, nextRowIdx);
+    }
+  }
+
+  return GenerateGeometry(vertices, indices);
+}
+
+Geometry CreateBorderGeometry(Uint16Pair gridSize)
+{
+  uint16_t gridWidth  = gridSize.GetWidth();
+  uint16_t gridHeight = gridSize.GetHeight();
+
+  // Create vertices
+  Vector<Vector2> vertices;
+  vertices.Reserve((gridWidth + 1u) * (gridHeight + 1u));
+
+  //top
+  uint16_t y = 0u;
+  for(; y < 2u; ++y)
+  {
+    for(uint16_t x = 0; x < gridWidth + 1u; ++x)
+    {
+      AddVertex(vertices, x, y);
+    }
+  }
+
+  for(; y < gridHeight - 1u; ++y)
+  {
+    //left
+    AddVertex(vertices, 0u, y);
+    AddVertex(vertices, 1u, y);
+
+    //right
+    AddVertex(vertices, gridWidth - 1u, y);
+    AddVertex(vertices, gridWidth, y);
+  }
+
+  //bottom
+  for(; y < gridHeight + 1u; ++y)
+  {
+    for(uint16_t x = 0; x < gridWidth + 1u; ++x)
+    {
+      AddVertex(vertices, x, y);
+    }
+  }
+
+  // Create indices
+  Vector<uint16_t> indices;
+  indices.Reserve(gridWidth * gridHeight * 6u);
+
+  //top
+  uint32_t rowIdx     = 0u;
+  uint32_t nextRowIdx = gridWidth + 1u;
+  for(uint16_t x = 0; x < gridWidth; ++x, ++nextRowIdx, ++rowIdx)
+  {
+    AddQuadIndices(indices, rowIdx, nextRowIdx);
+  }
+
+  if(gridHeight > 2u)
+  {
+    rowIdx     = gridWidth + 1u;
+    nextRowIdx = (gridWidth + 1u) * 2u;
+
+    uint16_t increment = gridWidth - 1u;
+    if(gridHeight > 3u)
+    {
+      increment = 2u;
+      //second row left
+      AddQuadIndices(indices, rowIdx, nextRowIdx);
+
+      rowIdx     = gridWidth * 2u;
+      nextRowIdx = (gridWidth + 1u) * 2u + 2u;
+      //second row right
+      AddQuadIndices(indices, rowIdx, nextRowIdx);
+
+      //left and right
+      rowIdx     = nextRowIdx - 2u;
+      nextRowIdx = rowIdx + 4u;
+      for(uint16_t y = 2u; y < 2u * (gridHeight - 3u); ++y, rowIdx += 2u, nextRowIdx += 2u)
+      {
+        AddQuadIndices(indices, rowIdx, nextRowIdx);
+      }
+    }
+
+    //second row left
+    AddQuadIndices(indices, rowIdx, nextRowIdx);
+
+    rowIdx += increment;
+    nextRowIdx += gridWidth - 1u;
+    //second row right
+    AddQuadIndices(indices, rowIdx, nextRowIdx);
+  }
+
+  //bottom
+  rowIdx     = nextRowIdx - gridWidth + 1u;
+  nextRowIdx = rowIdx + gridWidth + 1u;
+  for(uint16_t x = 0u; x < gridWidth; ++x, ++nextRowIdx, ++rowIdx)
+  {
+    AddQuadIndices(indices, rowIdx, nextRowIdx);
+  }
+
+  return GenerateGeometry(vertices, indices);
+}
+
+void RegisterStretchProperties(Renderer& renderer, const char* uniformName, const NPatchUtility::StretchRanges& stretchPixels, uint16_t imageExtent)
+{
+  uint16_t prevEnd     = 0;
+  uint16_t prevFix     = 0;
+  uint16_t prevStretch = 0;
+  uint32_t i           = 1;
+  for(NPatchUtility::StretchRanges::ConstIterator it = stretchPixels.Begin(); it != stretchPixels.End(); ++it, ++i)
+  {
+    uint16_t start = it->GetX();
+    uint16_t end   = it->GetY();
+
+    uint16_t fix     = prevFix + start - prevEnd;
+    uint16_t stretch = prevStretch + end - start;
+
+    std::stringstream uniform;
+    uniform << uniformName << "[" << i << "]";
+    renderer.RegisterProperty(uniform.str(), Vector2(fix, stretch));
+
+    prevEnd     = end;
+    prevFix     = fix;
+    prevStretch = stretch;
+  }
+
+  {
+    prevFix += imageExtent - prevEnd;
+    std::stringstream uniform;
+    uniform << uniformName << "[" << i << "]";
+    renderer.RegisterProperty(uniform.str(), Vector2(prevFix, prevStretch));
+  }
+}
+
+void ApplyTextureAndUniforms(Renderer& renderer, const Internal::NPatchData* data)
+{
+  TextureSet textureSet;
+  textureSet = data->GetTextures();
+
+  if(data->GetStretchPixelsX().Size() == 1u && data->GetStretchPixelsY().Size() == 1u)
+  {
+    //special case for 9 patch
+    Uint16Pair stretchX = data->GetStretchPixelsX()[0];
+    Uint16Pair stretchY = data->GetStretchPixelsY()[0];
+
+    uint16_t stretchWidth  = (stretchX.GetY() >= stretchX.GetX()) ? stretchX.GetY() - stretchX.GetX() : 0u;
+    uint16_t stretchHeight = (stretchY.GetY() >= stretchY.GetX()) ? stretchY.GetY() - stretchY.GetX() : 0u;
+
+    renderer.RegisterProperty("uFixed[0]", Vector2::ZERO);
+    renderer.RegisterProperty("uFixed[1]", Vector2(stretchX.GetX(), stretchY.GetX()));
+    renderer.RegisterProperty("uFixed[2]", Vector2(data->GetCroppedWidth() - stretchWidth, data->GetCroppedHeight() - stretchHeight));
+    renderer.RegisterProperty("uStretchTotal", Vector2(stretchWidth, stretchHeight));
+  }
+  else
+  {
+    renderer.RegisterProperty("uNinePatchFactorsX[0]", Vector2::ZERO);
+    renderer.RegisterProperty("uNinePatchFactorsY[0]", Vector2::ZERO);
+
+    RegisterStretchProperties(renderer, "uNinePatchFactorsX", data->GetStretchPixelsX(), data->GetCroppedWidth());
+    RegisterStretchProperties(renderer, "uNinePatchFactorsY", data->GetStretchPixelsY(), data->GetCroppedHeight());
+  }
+}
+
+} // namespace NPatchHelper
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/utility/npatch-helper.h b/dali-toolkit/devel-api/utility/npatch-helper.h
new file mode 100644
index 0000000..da1f55a
--- /dev/null
+++ b/dali-toolkit/devel-api/utility/npatch-helper.h
@@ -0,0 +1,96 @@
+#ifndef DALI_TOOLKIT_NPATCH_HELPER_H
+#define DALI_TOOLKIT_NPATCH_HELPER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali/public-api/math/uint-16-pair.h>
+#include <dali/public-api/rendering/geometry.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+class NPatchData;
+}
+
+namespace NPatchHelper
+{
+/**
+ * @brief Creates a Npatch Geometry object
+ *
+ * @param[in] gridSize The gridSize for creating a geometry
+ * @return The Geometry for NPatch
+ */
+DALI_TOOLKIT_API Geometry CreateGridGeometry(Uint16Pair gridSize);
+
+/**
+ * @brief Creates a geometry with the border only for the grid size to be used by this visuals' shaders
+ * e.g. a 5x4 grid would create a geometry that would look like:
+ *
+ *   ---------------------
+ *   |  /|  /|  /|  /|  /|
+ *   |/  |/  |/  |/  |/  |
+ *   ---------------------
+ *   |  /|           |  /|
+ *   |/  |           |/  |
+ *   -----           -----
+ *   |  /|           |  /|
+ *   |/  |           |/  |
+ *   ---------------------
+ *   |  /|  /|  /|  /|  /|
+ *   |/  |/  |/  |/  |/  |
+ *   ---------------------
+ *
+ * @param[in] gridSize The grid size of the solid geometry to create
+ * @return Returns the created geometry for the grid size
+ */
+DALI_TOOLKIT_API Geometry CreateBorderGeometry(Uint16Pair gridSize);
+
+/**
+ * @brief Registers a properties for Stretch Ranges
+ *
+ * @param[in,out] renderer The renderer for broken image
+ * @param[in] uniformName The name of the uniform
+ * @param[in] stretchPixels The stretchable pixels in the cropped image space
+ * @param[in] imageExtent The imageExtent
+ */
+void RegisterStretchProperties(Renderer& renderer, const char* uniformName, const NPatchUtility::StretchRanges& stretchPixels, uint16_t imageExtent);
+
+/**
+ * @brief Apply a texture and uniforms
+ *
+ * @param[in,out] renderer The renderer for broken image
+ * @param[in] data The pointer of npatch-data
+ */
+void ApplyTextureAndUniforms(Renderer& renderer, const Internal::NPatchData* data);
+
+} // namespace NPatchHelper
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_NPATCH_HELPER_H
diff --git a/dali-toolkit/devel-api/utility/npatch-utilities.cpp b/dali-toolkit/devel-api/utility/npatch-utilities.cpp
index 78a6268..aead2a5 100644
--- a/dali-toolkit/devel-api/utility/npatch-utilities.cpp
+++ b/dali-toolkit/devel-api/utility/npatch-utilities.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021 Samsung Electronics Co., Ltd.
+* Copyright (c) 2022 Samsung Electronics Co., Ltd.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -176,6 +176,8 @@ void GetRedOffsetAndMask(Dali::Pixel::Format pixelFormat, int32_t& byteOffset, i
     case Dali::Pixel::DEPTH_FLOAT:
     case Dali::Pixel::DEPTH_STENCIL:
     case Dali::Pixel::R11G11B10F:
+    case Dali::Pixel::CHROMINANCE_U:
+    case Dali::Pixel::CHROMINANCE_V:
     {
       DALI_LOG_ERROR("Pixel format not compatible.\n");
       byteOffset = 0;
diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
index 6575c7d..368f8d5 100644
--- a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
+++ b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,6 +111,16 @@ bool VisualFactory::GetPreMultiplyOnLoad() const
   return GetImplementation(*this).GetPreMultiplyOnLoad();
 }
 
+void VisualFactory::DiscardVisual(Visual::Base visual)
+{
+  GetImplementation(*this).DiscardVisual(visual);
+}
+
+void VisualFactory::UsePreCompiledShader()
+{
+  GetImplementation(*this).UsePreCompiledShader();
+}
+
 } // namespace Toolkit
 
 } // namespace Dali
diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.h b/dali-toolkit/devel-api/visual-factory/visual-factory.h
index 1d6be15..cc62c2b 100644
--- a/dali-toolkit/devel-api/visual-factory/visual-factory.h
+++ b/dali-toolkit/devel-api/visual-factory/visual-factory.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VISUAL_FACTORY_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,6 +126,24 @@ public:
    */
   bool GetPreMultiplyOnLoad() const;
 
+  /**
+   * @brief Discard visual base. It will keep reference of visual until idle callback called.
+   *
+   * @param[in] visual Discarded visual base.
+   */
+  void DiscardVisual(Visual::Base visual);
+
+  /**
+   * @brief Compile the visual shader in advance. Afterwards,
+   * when a visual using a new shader is requested, the pre-compiled shader is used.
+   *
+   * @note It is recommended that this method be called at the top of the application code.
+   * @note Using precompiled shaders is helpful when the application is complex and uses
+   * many different styles of visual options. On the other hand,if most visuals are the same
+   * and the application is simple, it may use memory unnecessarily or slow down the application launching speed.
+   */
+  void UsePreCompiledShader();
+
 private:
   explicit DALI_INTERNAL VisualFactory(Internal::VisualFactory* impl);
 };
diff --git a/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h
index dbe9631..7436b85 100644
--- a/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h
+++ b/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_DEVEL_API_VISUALS_ANIMATED_IMAGE_VISUAL_ACTIONS_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
  * limitations under the License.
  *
  */
+#include <dali-toolkit/devel-api/toolkit-action-index-ranges.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
 
 namespace Dali
 {
@@ -34,10 +36,12 @@ namespace Action
  */
 enum Type
 {
-  PLAY,   ///< Play the animated GIF. This is also Default playback mode.
-  PAUSE,  ///< Pause the animated GIF.
-  STOP,   ///< Stop the animated GIF.
-  JUMP_TO ///< Jump to the specified frame. Property::INTEGER value should be passed.
+  PLAY = DevelImageVisual::Action::IMAGE_VISUAL_ACTION_END_INDEX, ///< Play the animated GIF. This is also Default playback mode.
+  PAUSE,                                                          ///< Pause the animated GIF.
+  STOP,                                                           ///< Stop the animated GIF.
+  JUMP_TO,                                                        ///< Jump to the specified frame. Property::INTEGER value should be passed.
+
+  ANIMATED_IMAGE_VISUAL_ACTION_END_INDEX = DevelImageVisual::Action::IMAGE_VISUAL_ACTION_END_INDEX + 1000  ///< End of animated image visual action index.
 };
 
 } // namespace Action
diff --git a/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h
index 2955d17..b17e79d 100644
--- a/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h
+++ b/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_DEVEL_API_VISUALS_ANIMATED_VECTOR_IMAGE_VISUAL_ACTIONS_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,13 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/toolkit-action-index-ranges.h>
+#include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
+#include <dali/public-api/signals/callback.h>
+#include <string>
+
 namespace Dali
 {
 namespace Toolkit
@@ -34,15 +41,44 @@ namespace Action
  */
 enum Type
 {
-  PLAY,           ///< Play the animated vector image.
-  PAUSE,          ///< Pause the animated vector image.
-  STOP,           ///< Stop the animated vector image. This is also Default playback mode.
-  JUMP_TO,        ///< Jump to the specified frame. Property::INTEGER value should be passed.
-  UPDATE_PROPERTY ///< Update the properties of the animated vector image.
+  // Shared actions with AnimatedImageVisual
+  PLAY    = DevelAnimatedImageVisual::Action::PLAY,    ///< Play the animated vector image.
+  PAUSE   = DevelAnimatedImageVisual::Action::PAUSE,   ///< Pause the animated vector image.
+  STOP    = DevelAnimatedImageVisual::Action::STOP,    ///< Stop the animated vector image. This is also Default playback mode.
+  JUMP_TO = DevelAnimatedImageVisual::Action::JUMP_TO, ///< Jump to the specified frame. Property::INTEGER value should be passed.
+
+  // AnimatedVectorImageVisual only actions
+  SET_DYNAMIC_PROPERTY = DevelAnimatedImageVisual::Action::ANIMATED_IMAGE_VISUAL_ACTION_END_INDEX, ///< Set the dynamic property.
+
+  FLUSH, ///< Flush animation data. It will make ensure that changeness of animated vector image properties flushed.
 };
 
 } // namespace Action
 
+/**
+ * @brief The dynamic property info
+ *
+ * @note A callback of the following type may be used:
+ * @code
+ *   Property::Value MyFunction(int32_t id, VectorAnimationRenderer::VectorProperty property, uint32_t frameNumber);
+ * @endcode
+ *
+ * id  The id to specify the callback.
+ * property The property that represent what you are trying to change.
+ * frameNumber The current frame number.
+ * It returns a Property::Value to set according to the property type.
+ *
+ * The callback will be called on the worker thread. You MUST not call other DALi methods in the callback.
+ * And the object must still be alive when the callback occurs if you make the callback from a class member function.
+ */
+struct DynamicPropertyInfo
+{
+  int32_t       id;       ///< The Id to specify the callback. It should be unique and will be passed when the callback is called.
+  std::string   keyPath;  ///< The key path used to target a specific content or a set of contents that will be updated.
+  int32_t       property; ///< The property to set.
+  CallbackBase* callback; ///< The callback that gets called every time the animation is rendered. Ownership of the callback is passed onto the visual.
+};
+
 } // namespace DevelAnimatedVectorImageVisual
 
 } // namespace Toolkit
diff --git a/dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h
deleted file mode 100644
index 9657084..0000000
--- a/dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef DALI_TOOLKIT_DEVEL_API_VISUALS_ARC_VISUAL_ACTIONS_DEVEL_H
-#define DALI_TOOLKIT_DEVEL_API_VISUALS_ARC_VISUAL_ACTIONS_DEVEL_H
-
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace DevelArcVisual
-{
-/**
- * @brief Actions that the arc visual can perform.  These actions are called through the Visual::Base::DoAction API.
- */
-namespace Action
-{
-/**
- * @brief The available actions for this visual
- */
-enum Type
-{
-  /**
-   * @brief Update the properties of the visual.
-   * @note DevelArcVisual::Property::THICKNESS, DevelArcVisual::Property::START_ANGLE and DevelArcVisual::Property::SWEEP_ANGLE can be updated.
-   */
-  UPDATE_PROPERTY = 0
-};
-
-} // namespace Action
-
-} // namespace DevelArcVisual
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_DEVEL_API_VISUALS_ARC_VISUAL_ACTIONS_DEVEL_H
diff --git a/dali-toolkit/devel-api/visuals/color-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/color-visual-actions-devel.h
deleted file mode 100644
index 16e599a..0000000
--- a/dali-toolkit/devel-api/visuals/color-visual-actions-devel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef DALI_TOOLKIT_DEVEL_API_VISUALS_COLOR_VISUAL_ACTIONS_DEVEL_H
-#define DALI_TOOLKIT_DEVEL_API_VISUALS_COLOR_VISUAL_ACTIONS_DEVEL_H
-
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace DevelColorVisual
-{
-/**
- * @brief Actions that the color visual can perform. These actions are called through the Visual::Base::DoAction API.
- */
-namespace Action
-{
-/**
- * @brief The available actions for this visual
- */
-enum Type
-{
-  /**
-   * @brief Update the properties of the visual.
-   */
-  UPDATE_PROPERTY = 0
-};
-
-} // namespace Action
-
-} // namespace DevelColorVisual
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_DEVEL_API_VISUALS_COLOR_VISUAL_ACTIONS_DEVEL_H
diff --git a/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h
index 89ea2d6..f49c2ff 100644
--- a/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h
+++ b/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_DEVEL_API_VISUALS_IMAGE_VISUAL_ACTIONS_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
  * limitations under the License.
  *
  */
+#include <dali-toolkit/devel-api/toolkit-action-index-ranges.h>
 
 namespace Dali
 {
@@ -34,7 +35,9 @@ namespace Action
  */
 enum Type
 {
-  RELOAD = 0 ///< Force reloading of the image, all visuals using this image will get the latest one.
+  RELOAD = VISUAL_ACTION_START_INDEX, ///< Force reloading of the image, all visuals using this image will get the latest one.
+
+  IMAGE_VISUAL_ACTION_END_INDEX = VISUAL_ACTION_START_INDEX + 10000 ///< End of image visual action index.
 };
 
 } // namespace Action
diff --git a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h
index 413b556..a5e135c 100644
--- a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h
+++ b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_DEVEL_API_VISUALS_IMAGE_VISUAL_PROPERTIES_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ enum Type
    * Animation will play between the start frame and the end frame of the marker if one marker is specified.
    * Or animation will play between the start frame of the first marker and the end frame of the second marker if two markers are specified.
    *
-   * @details Name "playRange", Type Property::ARRAY of Property::INTEGER or Property::ARRAY of Property::STRING.
+   * @details Name "playRange", Type Property::ARRAY of Property::INTEGER or Property::ARRAY of Property::STRING or Property::STRING (one marker).
    * @note Default 0 and the total frame number.
    */
   PLAY_RANGE = ORIENTATION_CORRECTION + 4,
@@ -133,7 +133,7 @@ enum Type
 
   /**
    * @brief The content information the AnimatedVectorImageVisual will use.
-   * @details Name "contentInfo", Type Property::MAP.
+   * @details Type Property::MAP.
    * The map contains the layer name as a key and Property::Array as a value.
    * And the array contains 2 integer values which are the frame numbers, the start frame number and the end frame number of the layer.
    * @note This property is read-only.
@@ -145,7 +145,61 @@ enum Type
    * @details Name "redrawInScalingDown", type Property::BOOLEAN.
    * @note It is used in the AnimatedVectorImageVisual. The default is true.
    */
-  REDRAW_IN_SCALING_DOWN
+  REDRAW_IN_SCALING_DOWN = ORIENTATION_CORRECTION + 11,
+
+  /**
+   * @brief Whether to apply mask in loading time or rendering time.
+   * @details Name "maskingType", type PlayState::Type (Property::INTEGER).
+   * In general, MASKING_ON_LOADING is the default behavior.
+   * However, if the visual uses an external texture, only MASKING_ON_RENDERING is possible.
+   * So we change its value to MASKING_ON_RENDERING even if the visual sets the MASKING_TYPE as MASKING_ON_LOADING when it uses external texture.
+   * @note It is used in the ImageVisual and AnimatedImageVisual. The default is MASKING_ON_LOADING.
+   */
+  MASKING_TYPE = ORIENTATION_CORRECTION + 12,
+
+  /**
+   * @brief If true, uploads texture before ResourceReady signal is emitted. Otherwise uploads after texture load is completed.
+   * @details Name "fastTrackUploading", type Property::BOOLEAN
+   * If true, the upload happens without event-thread dependency, but the following need to be considered:
+   *  - Texture size is not valid until upload is fully complete.
+   *  - Texture cannot be cached (a new image is uploaded every time).
+   *  - Seamless visual change is not supported.
+   *  - The following, if set are also not supported and will be ignored:
+   *    - Alpha masking
+   *    - Synchronous loading
+   *    - Reload action
+   *    - Atlas loading
+   *    - Custom shader
+   * @note Used by the ImageVisual. The default is false.
+   */
+  FAST_TRACK_UPLOADING = ORIENTATION_CORRECTION + 13,
+
+  /**
+   * @brief Whether to enable broken image in image visual.
+   * Some of visual don't need to show broken image(ex. placeholder)
+   * Disable broken image for these visuals.
+   * default is true.
+   */
+  ENABLE_BROKEN_IMAGE = ORIENTATION_CORRECTION + 14,
+
+  /**
+   * @brief The marker information the AnimatedVectorImageVisual will use.
+   * @details Type Property::MAP.
+   * The map contains the marker name as a key and Property::Array as a value.
+   * And the array contains 2 integer values which are the frame numbers, the start frame number and the end frame number of the marker.
+   * @note This property is read-only.
+   */
+  MARKER_INFO = ORIENTATION_CORRECTION + 15,
+
+  /**
+   * @brief Whether to AnimatedVectorImageVisual fixed cache or not.
+   * @details Name "EnableFrameCache", type Property::BOOLEAN.
+   * If this property is true, AnimatedVectorImageVisual enable frame cache for loading and keeps loaded frame
+   * until the visual is removed. It reduces CPU cost when the animated image will be looping.
+   * But it can spend a lot of memory if the resource has high resolution image or many frame count.
+   * @note It is used in the AnimatedImageVisual. The default is false
+   */
+  ENABLE_FRAME_CACHE = ORIENTATION_CORRECTION + 16
 };
 
 } //namespace Property
@@ -191,6 +245,19 @@ enum Type
 
 } // namespace LoopingMode
 
+/**
+ * @brief Enumeration for what masking type is in.
+ */
+namespace MaskingType
+{
+enum Type
+{
+  MASKING_ON_RENDERING, ///< Alpha masking is applied for each rendering time. (On GPU)
+  MASKING_ON_LOADING    ///< Alpha masking is applied when the image is loading. (On CPU)
+};
+
+}
+
 } // namespace DevelImageVisual
 
 } // namespace Toolkit
diff --git a/dali-toolkit/devel-api/visuals/text-visual-properties-devel.h b/dali-toolkit/devel-api/visuals/text-visual-properties-devel.h
index 062094f..2966b95 100644
--- a/dali-toolkit/devel-api/visuals/text-visual-properties-devel.h
+++ b/dali-toolkit/devel-api/visuals/text-visual-properties-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_DEVEL_API_VISUALS_TEXT_VISUAL_PROPERTIES_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,16 @@ enum
    * @copydoc Dali::Toolkit::DevelTextLabel::Property::BACKGROUND
    */
   BACKGROUND = UNDERLINE + 2,
+
+  /**
+   * @copydoc Dali::Toolkit::DevelTextLabel::Property::STRIKETHROUGH
+   */
+  STRIKETHROUGH = UNDERLINE + 3,
+
+  /**
+   * @copydoc Dali::Toolkit::DevelTextLabel::Property::CHARACTER_SPACING
+   */
+  CHARACTER_SPACING = UNDERLINE + 4,
 };
 
 } // namespace Property
diff --git a/dali-toolkit/devel-api/visuals/visual-actions-devel.h b/dali-toolkit/devel-api/visuals/visual-actions-devel.h
new file mode 100644
index 0000000..cf74766
--- /dev/null
+++ b/dali-toolkit/devel-api/visuals/visual-actions-devel.h
@@ -0,0 +1,55 @@
+#ifndef DALI_TOOLKIT_DEVEL_API_VISUALS_VISUAL_ACTIONS_DEVEL_H
+#define DALI_TOOLKIT_DEVEL_API_VISUALS_VISUAL_ACTIONS_DEVEL_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/toolkit-action-index-ranges.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace DevelVisual
+{
+
+/**
+ * @brief Actions that the visual can perform. These actions are called through the Visual::Base::DoAction API.
+ */
+namespace Action
+{
+/**
+ * @brief The available actions for this visual
+ */
+enum Type
+{
+  /**
+   * @brief Update the properties of the visual.
+   */
+  UPDATE_PROPERTY = VISUAL_ACTION_BASE_START_INDEX
+};
+
+} // namespace Action
+
+} // namespace DevelVisual
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_DEVEL_API_VISUALS_VISUAL_ACTIONS_DEVEL_H
diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
index 3a20928..adc2fa0 100644
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
@@ -19,8 +19,8 @@
 #include "accessibility-manager-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
 #include <dali/devel-api/adaptor-framework/accessibility.h>
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
@@ -80,27 +80,37 @@ std::string AccessibilityManager::GetAccessibilityAttribute(Actor actor, Toolkit
 
 void AccessibilityManager::SetFocusOrder(Actor actor, const unsigned int order)
 {
-  if(order == 0)
+  auto control = Toolkit::Control::DownCast(actor);
+
+  if(!control || order == 0)
+  {
     return;
+  }
 
   if(order >= mFocusOrder.size())
+  {
     mFocusOrder.resize(order + 1);
+  }
 
   auto it = mFocusOrder.begin() + order;
-  mFocusOrder.insert(it, actor);
+  mFocusOrder.insert(it, control);
 
   if(order > 0)
   {
-    Actor prev = mFocusOrder[order - 1];
-    DevelControl::AppendAccessibilityRelation(prev, actor, Accessibility::RelationType::FLOWS_TO);
-    DevelControl::AppendAccessibilityRelation(actor, prev, Accessibility::RelationType::FLOWS_FROM);
+    if(auto prev = mFocusOrder[order - 1])
+    {
+      DevelControl::AppendAccessibilityRelation(prev, control, Accessibility::RelationType::FLOWS_TO);
+      DevelControl::AppendAccessibilityRelation(control, prev, Accessibility::RelationType::FLOWS_FROM);
+    }
   }
 
   if(order + 1 < mFocusOrder.size())
   {
-    Actor next = mFocusOrder[order + 1];
-    DevelControl::AppendAccessibilityRelation(actor, next, Accessibility::RelationType::FLOWS_TO);
-    DevelControl::AppendAccessibilityRelation(next, actor, Accessibility::RelationType::FLOWS_FROM);
+    if(auto next = mFocusOrder[order + 1])
+    {
+      DevelControl::AppendAccessibilityRelation(control, next, Accessibility::RelationType::FLOWS_TO);
+      DevelControl::AppendAccessibilityRelation(next, control, Accessibility::RelationType::FLOWS_FROM);
+    }
   }
 }
 
@@ -132,7 +142,13 @@ Actor AccessibilityManager::GetActorByFocusOrder(const unsigned int order)
 
 bool AccessibilityManager::SetCurrentFocusActor(Actor actor)
 {
-  return Toolkit::DevelControl::GrabAccessibilityHighlight(actor);
+  auto control = Toolkit::Control::DownCast(actor);
+  if(!control)
+  {
+    return false;
+  }
+
+  return Toolkit::DevelControl::GrabAccessibilityHighlight(control);
 }
 
 Actor AccessibilityManager::GetCurrentFocusActor()
@@ -178,8 +194,13 @@ bool AccessibilityManager::MoveFocusBackward()
 
 void AccessibilityManager::ClearFocus()
 {
-  auto actor = GetCurrentFocusActor();
-  Toolkit::DevelControl::ClearAccessibilityHighlight(actor);
+  auto control = Toolkit::Control::DownCast(GetCurrentFocusActor());
+  if(!control)
+  {
+    return;
+  }
+
+  Toolkit::DevelControl::ClearAccessibilityHighlight(control);
 }
 
 void AccessibilityManager::Reset()
@@ -188,11 +209,14 @@ void AccessibilityManager::Reset()
 
   for(std::size_t i = 2; i < mFocusOrder.size(); ++i)
   {
-    Actor prev = mFocusOrder[i - 1];
-    Actor next = mFocusOrder[i];
-
-    DevelControl::RemoveAccessibilityRelation(prev, next, Accessibility::RelationType::FLOWS_TO);
-    DevelControl::RemoveAccessibilityRelation(next, prev, Accessibility::RelationType::FLOWS_FROM);
+    auto prev = mFocusOrder[i - 1];
+    auto next = mFocusOrder[i];
+
+    if(prev && next)
+    {
+      DevelControl::RemoveAccessibilityRelation(prev, next, Accessibility::RelationType::FLOWS_TO);
+      DevelControl::RemoveAccessibilityRelation(next, prev, Accessibility::RelationType::FLOWS_FROM);
+    }
   }
 
   mFocusOrder.clear();
diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
index 97da737..9470d05 100644
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@ -25,6 +25,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
+#include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali
 {
@@ -406,7 +407,7 @@ private:
   AccessibilityManager& operator=(const AccessibilityManager& rhs);
 
 private:
-  std::vector<Actor> mFocusOrder;
+  std::vector<Toolkit::Control> mFocusOrder;
 
   Toolkit::AccessibilityManager::FocusChangedSignalType          mFocusChangedSignal;          ///< The signal to notify the focus change
   Toolkit::AccessibilityManager::FocusOvershotSignalType         mFocusOvershotSignal;         ///< The signal to notify the focus overshooted
diff --git a/dali-toolkit/internal/builder/builder-get-is.inl.h b/dali-toolkit/internal/builder/builder-get-is.inl.h
index 0a7f6d5..3074a57 100644
--- a/dali-toolkit/internal/builder/builder-get-is.inl.h
+++ b/dali-toolkit/internal/builder/builder-get-is.inl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,6 +159,30 @@ inline bool CopyNumbers(TreeNode::ConstIterator iter, int N, T& vector)
   return true;
 }
 
+// copy N Numbers
+template<typename T, int N>
+inline bool CopyNumbers(TreeNode::ConstIterator iter, T (&vector)[N])
+{
+  for(int i = 0; i < N; ++i)
+  {
+    if((*iter).second.GetType() == TreeNode::FLOAT)
+    {
+      vector[i] = (*iter).second.GetFloat();
+    }
+    else if((*iter).second.GetType() == TreeNode::INTEGER)
+    {
+      vector[i] = static_cast<float>((*iter).second.GetInteger());
+    }
+    else
+    {
+      return false;
+    }
+    iter++;
+  }
+
+  return true;
+}
+
 inline OptionalVector4 IsVector4(const OptionalChild& node)
 {
   OptionalVector4 ret;
@@ -214,7 +238,7 @@ inline OptionalMatrix IsMatrix(const OptionalChild& node)
   if(node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 16)
   {
     float v[16];
-    if(CopyNumbers((*node).CBegin(), 16, v))
+    if(CopyNumbers((*node).CBegin(), v))
     {
       ret = OptionalMatrix(Dali::Matrix(v));
     }
@@ -230,7 +254,7 @@ inline OptionalMatrix3 IsMatrix3(const OptionalChild& node)
   if(node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 9)
   {
     float v[9];
-    if(CopyNumbers((*node).CBegin(), 9, v))
+    if(CopyNumbers((*node).CBegin(), v))
     {
       ret = OptionalMatrix3(Dali::Matrix3(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8]));
     }
@@ -247,10 +271,10 @@ inline OptionalRect IsRect(const OptionalChild& node)
     if((*node).Size() >= 4)
     {
       TreeNode::ConstIterator iter((*node).CBegin());
-      int                     v[4];
-      if(CopyNumbers((*node).CBegin(), 4, v))
+      float                   v[4];
+      if(CopyNumbers((*node).CBegin(), v))
       {
-        ret = OptionalRect(Dali::Rect<int>(v[0], v[1], v[2], v[3]));
+        ret = OptionalRect(Dali::Rect<int>(static_cast<int>(v[0]), static_cast<int>(v[1]), static_cast<int>(v[2]), static_cast<int>(v[3])));
       }
     }
   }
@@ -265,10 +289,10 @@ inline OptionalExtents IsExtents(const OptionalChild& node)
     if((*node).Size() >= 4)
     {
       TreeNode::ConstIterator iter((*node).CBegin());
-      int                     v[4];
-      if(CopyNumbers((*node).CBegin(), 4, v))
+      float                   v[4];
+      if(CopyNumbers((*node).CBegin(), v))
       {
-        extents = OptionalExtents(Dali::Extents(v[0], v[1], v[2], v[3]));
+        extents = OptionalExtents(Dali::Extents(static_cast<uint16_t>(v[0]), static_cast<uint16_t>(v[1]), static_cast<uint16_t>(v[2]), static_cast<uint16_t>(v[3])));
       }
     }
   }
diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index 9ddab28..08c8bb9 100644
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,23 +70,22 @@ namespace
 {
 #define TOKEN_STRING(x) #x
 
-const std::string KEYNAME_ACTORS           = "actors";
-const std::string KEYNAME_ENTRY_TRANSITION = "entryTransition";
-const std::string KEYNAME_EXIT_TRANSITION  = "exitTransition";
-const std::string KEYNAME_INCLUDES         = "includes";
-const std::string KEYNAME_INHERIT          = "inherit";
-const std::string KEYNAME_MAPPINGS         = "mappings";
-const std::string KEYNAME_NAME             = "name";
-const std::string KEYNAME_SIGNALS          = "signals";
-const std::string KEYNAME_STATES           = "states";
-const std::string KEYNAME_STYLES           = "styles";
-const std::string KEYNAME_TEMPLATES        = "templates";
-const std::string KEYNAME_TRANSITIONS      = "transitions";
-const std::string KEYNAME_TYPE             = "type";
-const std::string KEYNAME_VISUALS          = "visuals";
-
-const std::string PROPERTIES            = "properties";
-const std::string ANIMATABLE_PROPERTIES = "animatableProperties";
+const char* KEYNAME_ACTORS           = "actors";
+const char* KEYNAME_ENTRY_TRANSITION = "entryTransition";
+const char* KEYNAME_EXIT_TRANSITION  = "exitTransition";
+const char* KEYNAME_INCLUDES         = "includes";
+const char* KEYNAME_INHERIT          = "inherit";
+const char* KEYNAME_MAPPINGS         = "mappings";
+const char* KEYNAME_SIGNALS          = "signals";
+const char* KEYNAME_STATES           = "states";
+const char* KEYNAME_STYLES           = "styles";
+const char* KEYNAME_TEMPLATES        = "templates";
+const char* KEYNAME_TRANSITIONS      = "transitions";
+const char* KEYNAME_TYPE             = "type";
+const char* KEYNAME_VISUALS          = "visuals";
+
+const char* PROPERTIES            = "properties";
+const char* ANIMATABLE_PROPERTIES = "animatableProperties";
 
 typedef std::vector<const TreeNode*> TreeNodeList;
 
@@ -774,7 +773,7 @@ void Builder::LoadConfiguration(const TreeNode& root, Property::Map& intoMap)
                 {
                   // If we find "{","}" pair but can't find matched constant
                   // try to find other "{","}" pair after current left position.
-                  pos = leftPos + 1;
+                  pos = rightPos + 1;
 
                   for(uint32_t i = 0; i < mReplacementMap.Count(); i++)
                   {
@@ -785,11 +784,12 @@ void Builder::LoadConfiguration(const TreeNode& root, Property::Map& intoMap)
                     if(0 == stringConfigValue.compare(leftPos + 1, rightPos - leftPos - 1, constant.stringKey))
                     {
                       std::string replaceString;
-                      mReplacementMap.GetValue(i).Get(replaceString);
-
-                      stringConfigValue.replace(leftPos, rightPos - leftPos + 1, replaceString);
-                      pos = leftPos + replaceString.size();
-                      break;
+                      if(DALI_LIKELY(mReplacementMap.GetValue(i).Get(replaceString)))
+                      {
+                        stringConfigValue.replace(leftPos, rightPos - leftPos + 1, replaceString);
+                        pos = leftPos + replaceString.size();
+                        break;
+                      }
                     }
                   }
                 }
@@ -1210,8 +1210,8 @@ void Builder::RecordStyle(StylePtr           style,
         StylePtr* stylePtr = style->subStates.Find(stateName);
         if(stylePtr)
         {
-          StylePtr style(*stylePtr);
-          RecordStyle(style, stateNode, handle, replacements);
+          StylePtr subState(*stylePtr);
+          RecordStyle(subState, stateNode, handle, replacements);
         }
         else
         {
@@ -1577,8 +1577,8 @@ bool Builder::ConvertChildValue(const TreeNode& mappingRoot, KeyStack& keyStack,
       {
         for(Property::Map::SizeType i = 0; i < map->Count(); ++i)
         {
-          Property::Value& child = map->GetValue(i);
-          ConvertChildValue(mappingRoot, keyStack, child);
+          Property::Value& currentChild = map->GetValue(i);
+          ConvertChildValue(mappingRoot, keyStack, currentChild);
         }
       }
       break;
@@ -1591,8 +1591,8 @@ bool Builder::ConvertChildValue(const TreeNode& mappingRoot, KeyStack& keyStack,
       {
         for(Property::Array::SizeType i = 0; i < array->Count(); ++i)
         {
-          Property::Value& child = array->GetElementAt(i);
-          ConvertChildValue(mappingRoot, keyStack, child);
+          Property::Value& currentChild = array->GetElementAt(i);
+          ConvertChildValue(mappingRoot, keyStack, currentChild);
         }
       }
       break;
diff --git a/dali-toolkit/internal/builder/optional-value.h b/dali-toolkit/internal/builder/optional-value.h
index 7251ad2..7a1d9f4 100644
--- a/dali-toolkit/internal/builder/optional-value.h
+++ b/dali-toolkit/internal/builder/optional-value.h
@@ -79,7 +79,6 @@ template<typename T>
 class OptionalValue
 {
 public:
-  typedef void (OptionalValue::*bool_type)() const;
   typedef typename OptionalTypes<T>::ReturnType ReturnType;
   typedef typename OptionalTypes<T>::ValueType  ValueType;
 
@@ -104,18 +103,14 @@ public:
     return OptionalTypes<T>::Get(mValue);
   }
 
-  // safe bool idiom
-  operator bool_type() const
+  explicit operator bool() const
   {
-    return mOk == true ? &OptionalValue::this_type_does_not_support_comparisons : 0;
+    return mOk;
   }
 
 private:
   bool      mOk;
   ValueType mValue;
-  void      this_type_does_not_support_comparisons() const
-  {
-  }
 };
 
 template<typename T, typename U>
diff --git a/dali-toolkit/internal/builder/replacement.cpp b/dali-toolkit/internal/builder/replacement.cpp
index 5825da5..4d59ee7 100644
--- a/dali-toolkit/internal/builder/replacement.cpp
+++ b/dali-toolkit/internal/builder/replacement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,6 +112,8 @@ bool ResolvePartialReplacement(const std::string& initialValue, Property::Value&
     }
     else
     {
+      DALI_ASSERT_ALWAYS((startPos > 0u && size > 0u) && "Replacement keyword getter have some problem!\n");
+
       const std::string str(initialValue.substr(startPos, size));
 
       Property::Value* value = FindReplacement(str, overrideMap, defaultMap);
diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.cpp b/dali-toolkit/internal/builder/tree-node-manipulator.cpp
index f7679fd..aa23c76 100644
--- a/dali-toolkit/internal/builder/tree-node-manipulator.cpp
+++ b/dali-toolkit/internal/builder/tree-node-manipulator.cpp
@@ -162,17 +162,9 @@ void TreeNodeManipulator::RemoveChildren()
 {
   DALI_ASSERT_DEBUG(mNode && "Operation on NULL JSON node");
 
-  CollectNodes collector;
+  DeleteNodesWithoutSelf otherDeletor(mNode);
 
-  DepthFirst(mNode, collector);
-
-  for(CollectNodes::iterator iter = collector.nodes.begin(); iter != collector.nodes.end(); ++iter)
-  {
-    if(*iter != mNode)
-    {
-      delete *iter;
-    }
-  }
+  DepthFirst(mNode, otherDeletor);
 
   mNode->mFirstChild = NULL;
   mNode->mLastChild  = NULL;
@@ -290,9 +282,9 @@ void TreeNodeManipulator::SetType(TreeNode::NodeType type)
   {
     if(mNode->mFirstChild != NULL)
     {
-      TreeNode::NodeType type = mNode->mFirstChild->GetType();
+      TreeNode::NodeType firstChildType = mNode->mFirstChild->GetType();
 
-      if(TreeNode::FLOAT == type || TreeNode::INTEGER == type)
+      if(TreeNode::FLOAT == firstChildType || TreeNode::INTEGER == firstChildType)
       {
         // Arrays of numbers should be replaced, not appended to.
         RemoveChildren();
diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h
index 0852497..24599a5 100644
--- a/dali-toolkit/internal/builder/tree-node-manipulator.h
+++ b/dali-toolkit/internal/builder/tree-node-manipulator.h
@@ -2,7 +2,7 @@
 #define DALI_SCRIPT_TREE_NODE_MANIPULATOR_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -215,6 +215,29 @@ struct CollectNodes
 };
 
 /*
+ * Delete nodes immediately, instead of self
+ */
+struct DeleteNodesWithoutSelf
+{
+  DeleteNodesWithoutSelf(TreeNode* self)
+  : mSelf(self){};
+
+  /*
+   * Call operator to delete object if given node is not self
+   */
+  void operator()(TreeNode*& n)
+  {
+    DALI_ASSERT_DEBUG(n && "Operation on NULL JSON node");
+    if(mSelf != n)
+    {
+      delete n;
+    }
+  }
+
+  const TreeNode* mSelf; ///< self node what we should not remove.
+};
+
+/*
  * Depth first walk of nodes applying given operation (unary_function)
  */
 template<typename Operation>
diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index 1c2271c..002ab93 100644
--- a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -187,10 +187,7 @@ const Toolkit::Alignment::Padding& Alignment::GetPadding() const
 
 void Alignment::OnInitialize()
 {
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 void Alignment::OnRelayout(const Vector2& size, RelayoutContainer& container)
diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
index 55259db..d7e474f 100644
--- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
+++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
@@ -217,10 +217,7 @@ void BloomView::OnInitialize()
   // bind properties for / set shader constants to defaults
   SetupProperties();
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::ANIMATION));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::ANIMATION);
 }
 
 void BloomView::OnSizeSet(const Vector3& targetSize)
diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
index 2c15531..ece5d1f 100644
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_BUBBLE_EFFECT_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ inline Shader CreateBubbleShader(unsigned int numBubble)
   std::ostringstream vertexShaderStringStream;
   vertexShaderStringStream << "#define NUMBER_OF_BUBBLE " << numBubble << "\n"
                            << SHADER_BUBBLE_EFFECT_VERT;
-  Shader shader = Shader::New(vertexShaderStringStream.str(), SHADER_BUBBLE_EFFECT_FRAG);
+  Shader shader = Shader::New(vertexShaderStringStream.str(), SHADER_BUBBLE_EFFECT_FRAG, Shader::Hint::NONE, "BUBBLE_EFFECT");
 
   return shader;
 }
diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index dde8253..12b7a13 100644
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,7 +131,7 @@ BubbleEmitter::BubbleEmitter(const Vector2& movementArea,
     mNumRenderer          = 1;
   }
 
-  mRandomSeed = time(NULL);
+  mRandomSeed = static_cast<uint32_t>(time(NULL));
 }
 
 BubbleEmitter::~BubbleEmitter()
@@ -213,7 +213,7 @@ void BubbleEmitter::SetBackground(Texture bgTexture, const Vector3& hsvDelta)
 
   //Create renderer
   Dali::Geometry geometry   = CreateTexturedQuad();
-  Shader         shader     = Shader::New(SHADER_BUBBLE_EMITTER_VERT, SHADER_BUBBLE_EMITTER_FRAG);
+  Shader         shader     = Shader::New(SHADER_BUBBLE_EMITTER_VERT, SHADER_BUBBLE_EMITTER_FRAG, Shader::Hint::NONE, "BUBBLE_EMITTER");
   Renderer       renderer   = Renderer::New(geometry, shader);
   TextureSet     textureSet = TextureSet::New();
   textureSet.SetTexture(0u, bgTexture);
@@ -351,11 +351,14 @@ void BubbleEmitter::SetBubbleParameter(BubbleRenderer& bubbleRenderer, unsigned
 {
   Vector2 dir(direction);
 
-  int halfRange = displacement.x / 2;
+  int rangeX = std::max(static_cast<int>(displacement.x), 1); // To avoid divide by zero issue.
+  int rangeY = std::max(static_cast<int>(displacement.y), 1); // To avoid divide by zero issue.
+
+  int halfRangeX = displacement.x / 2;
   // for the y coordinate, always negative, so bubbles always go upwards
-  Vector2 randomVec(rand_r(&mRandomSeed) % static_cast<int>(displacement.x) - halfRange, -rand_r(&mRandomSeed) % static_cast<int>(displacement.y));
+  Vector2 randomVec(rand_r(&mRandomSeed) % rangeX - halfRangeX, -rand_r(&mRandomSeed) % rangeY);
   dir.Normalize();
-  randomVec.x -= dir.x * halfRange;
+  randomVec.x -= dir.x * halfRangeX;
   randomVec.y *= 1.0f - fabsf(dir.x) * 0.33f;
 
   if(randomVec.y > 0.0f)
diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp
index b3ef299..33c5eef 100644
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,25 +53,25 @@ void BubbleRenderer::Initialize(unsigned int numberOfBubble, const Vector2& move
   mRenderer.SetTextures(textureSet);
 
   // register uniforms
-  mIndexGravity      = mRenderer.RegisterProperty("uGravity", 50.f);
-  mIndexDynamicScale = mRenderer.RegisterProperty("uDynamicScale", 1.f);
+  mIndexGravity      = mRenderer.RegisterUniqueProperty("uGravity", 50.f);
+  mIndexDynamicScale = mRenderer.RegisterUniqueProperty("uDynamicScale", 1.f);
 
-  mIndexInvertedMovementArea = mRenderer.RegisterProperty("uInvertedMovementArea", Vector2(1.f, 1.f) / movementArea);
+  mIndexInvertedMovementArea = mRenderer.RegisterUniqueProperty("uInvertedMovementArea", Vector2(1.f, 1.f) / movementArea);
 
   mIndicesOffset.resize(9);
-  int offset = movementArea.Length() / 10.f;
+  int offset = std::max(static_cast<int>(movementArea.Length() / 10.f), 1); // To avoid divide by zero issue.
 
-  unsigned int seed = time(NULL);
+  uint32_t seed = static_cast<uint32_t>(time(NULL));
 
-  mIndicesOffset[0] = mRenderer.RegisterProperty("uOffset[0]", Vector2(0.f, 0.f));
-  mIndicesOffset[1] = mRenderer.RegisterProperty("uOffset[1]", Vector2(rand_r(&seed) % offset, rand_r(&seed) % offset));
-  mIndicesOffset[2] = mRenderer.RegisterProperty("uOffset[2]", Vector2(rand_r(&seed) % offset, -rand_r(&seed) % offset));
-  mIndicesOffset[3] = mRenderer.RegisterProperty("uOffset[3]", Vector2(-rand_r(&seed) % offset, rand_r(&seed) % offset));
-  mIndicesOffset[4] = mRenderer.RegisterProperty("uOffset[4]", Vector2(-rand_r(&seed) % offset, -rand_r(&seed) % offset));
-  mIndicesOffset[5] = mRenderer.RegisterProperty("uOffset[5]", Vector2(rand_r(&seed) % offset, 0.f));
-  mIndicesOffset[6] = mRenderer.RegisterProperty("uOffset[6]", Vector2(-rand_r(&seed) % offset, 0.f));
-  mIndicesOffset[7] = mRenderer.RegisterProperty("uOffset[7]", Vector2(0.f, rand_r(&seed) % offset));
-  mIndicesOffset[8] = mRenderer.RegisterProperty("uOffset[8]", Vector2(0.f, -rand_r(&seed) % offset));
+  mIndicesOffset[0] = mRenderer.RegisterUniqueProperty("uOffset[0]", Vector2(0.f, 0.f));
+  mIndicesOffset[1] = mRenderer.RegisterUniqueProperty("uOffset[1]", Vector2(rand_r(&seed) % offset, rand_r(&seed) % offset));
+  mIndicesOffset[2] = mRenderer.RegisterUniqueProperty("uOffset[2]", Vector2(rand_r(&seed) % offset, -rand_r(&seed) % offset));
+  mIndicesOffset[3] = mRenderer.RegisterUniqueProperty("uOffset[3]", Vector2(-rand_r(&seed) % offset, rand_r(&seed) % offset));
+  mIndicesOffset[4] = mRenderer.RegisterUniqueProperty("uOffset[4]", Vector2(-rand_r(&seed) % offset, -rand_r(&seed) % offset));
+  mIndicesOffset[5] = mRenderer.RegisterUniqueProperty("uOffset[5]", Vector2(rand_r(&seed) % offset, 0.f));
+  mIndicesOffset[6] = mRenderer.RegisterUniqueProperty("uOffset[6]", Vector2(-rand_r(&seed) % offset, 0.f));
+  mIndicesOffset[7] = mRenderer.RegisterUniqueProperty("uOffset[7]", Vector2(0.f, rand_r(&seed) % offset));
+  mIndicesOffset[8] = mRenderer.RegisterUniqueProperty("uOffset[8]", Vector2(0.f, -rand_r(&seed) % offset));
 
   Vector4 zeroVector;
   mIndiceStartEndPos.resize(numberOfBubble);
@@ -80,11 +80,11 @@ void BubbleRenderer::Initialize(unsigned int numberOfBubble, const Vector2& move
   {
     std::ostringstream ossProperty;
     ossProperty << "uStartEndPosition[" << i << "]";
-    mIndiceStartEndPos[i] = mRenderer.RegisterProperty(ossProperty.str(), zeroVector);
+    mIndiceStartEndPos[i] = mRenderer.RegisterUniqueProperty(ossProperty.str(), zeroVector);
 
     ossProperty.str("");
     ossProperty << "uPercentage[" << i << "]";
-    mIndicesPercentage[i] = mRenderer.RegisterProperty(ossProperty.str(), 0.f);
+    mIndicesPercentage[i] = mRenderer.RegisterUniqueProperty(ossProperty.str(), 0.f);
   }
 }
 
diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 70e9c76..6c33e19 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -111,7 +111,7 @@ const Scripting::StringEnum ALIGNMENT_STRING_TABLE[] =
 
 const unsigned int ALIGNMENT_STRING_TABLE_COUNT = sizeof(ALIGNMENT_STRING_TABLE) / sizeof(ALIGNMENT_STRING_TABLE[0]);
 
-const Property::Index VISUAL_INDEX_FOR_STATE[][Button::STATE_COUNT] =
+const Property::Index VISUAL_INDEX_FOR_STATE[Button::STATE_COUNT][Button::VISUAL_STATE_COUNT] =
   {
     {Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::UNSELECTED_VISUAL},
     {Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::SELECTED_VISUAL},
@@ -620,6 +620,11 @@ bool Button::OnAccessibilityActivated()
   return OnKeyboardEnter();
 }
 
+DevelControl::ControlAccessible* Button::CreateAccessibleObject()
+{
+  return new ButtonAccessible(Self());
+}
+
 bool Button::OnTouch(Actor actor, const TouchEvent& touch)
 {
   if(!IsDisabled() && (actor == touch.GetHitActor(0)))
@@ -1303,7 +1308,7 @@ Padding Button::GetForegroundPadding()
   return mForegroundPadding;
 }
 
-std::string Button::AccessibleImpl::GetNameRaw()
+std::string Button::ButtonAccessible::GetNameRaw() const
 {
   std::string   labelText;
   auto          slf      = Toolkit::Button::DownCast(Self());
@@ -1318,7 +1323,7 @@ std::string Button::AccessibleImpl::GetNameRaw()
   return labelText;
 }
 
-Property::Index Button::AccessibleImpl::GetNamePropertyIndex()
+Property::Index Button::ButtonAccessible::GetNamePropertyIndex()
 {
   Property::Index label    = Toolkit::Button::Property::LABEL;
   Property::Map   labelMap = Self().GetProperty<Property::Map>(label);
@@ -1333,9 +1338,9 @@ Property::Index Button::AccessibleImpl::GetNamePropertyIndex()
   }
 }
 
-Dali::Accessibility::States Button::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States Button::ButtonAccessible::CalculateStates()
 {
-  auto tmp                                    = DevelControl::AccessibleImpl::CalculateStates();
+  auto tmp                                    = DevelControl::ControlAccessible::CalculateStates();
   tmp[Dali::Accessibility::State::SELECTABLE] = true;
   auto slf                                    = Toolkit::Button::DownCast(Self());
   tmp[Dali::Accessibility::State::ENABLED]    = !slf.GetProperty<bool>(Toolkit::Button::Property::DISABLED);
diff --git a/dali-toolkit/internal/controls/buttons/button-impl.h b/dali-toolkit/internal/controls/buttons/button-impl.h
index ced51fd..0701d3c 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/button-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_BUTTON_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -322,6 +322,11 @@ protected: // From Control
   bool OnAccessibilityActivated() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Toolkit::Control::OnKeyboardEnter()
    */
   bool OnKeyboardEnter() override;
@@ -372,6 +377,11 @@ private:
   void OnTap(Actor actor, const TapGesture& tap);
 
   /**
+   * @copydoc Control::OnTap
+   */
+  using Control::OnTap;
+
+  /**
    * Sets up the autorepeating timer.
    * @param[in] delay The delay time in seconds.
    */
@@ -535,13 +545,25 @@ private:
   bool mClickActionPerforming; ///< Used to manage signal emissions during action
 
 protected:
-  struct AccessibleImpl : public DevelControl::AccessibleImpl
+  class ButtonAccessible : public DevelControl::ControlAccessible
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
 
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+     */
     Dali::Accessibility::States CalculateStates() override;
-    std::string                 GetNameRaw() override;
-    Property::Index             GetNamePropertyIndex() override;
+
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetNameRaw()
+     */
+    std::string GetNameRaw() const override;
+
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetNamePropertyIndex()
+     */
+    Property::Index GetNamePropertyIndex() override;
   };
 };
 
diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index 98733ea..574ef08 100644
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,16 +77,18 @@ void CheckBoxButton::OnInitialize()
 {
   Button::OnInitialize();
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::CHECK_BOX));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::CHECK_BOX);
 }
 
-Dali::Accessibility::States CheckBoxButton::AccessibleImpl::CalculateStates()
+DevelControl::ControlAccessible* CheckBoxButton::CreateAccessibleObject()
 {
-  auto state = Button::AccessibleImpl::CalculateStates();
-  auto self = Toolkit::Button::DownCast(Self());
+  return new CheckBoxButton::CheckBoxButtonAccessible(Self());
+}
+
+Dali::Accessibility::States CheckBoxButton::CheckBoxButtonAccessible::CalculateStates()
+{
+  auto state = Button::ButtonAccessible::CalculateStates();
+  auto self  = Toolkit::Button::DownCast(Self());
   if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
   {
     state[Dali::Accessibility::State::CHECKED] = true;
@@ -97,10 +99,13 @@ Dali::Accessibility::States CheckBoxButton::AccessibleImpl::CalculateStates()
 void CheckBoxButton::OnStateChange(State newState)
 {
   // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used
-  if(Dali::Accessibility::IsUp() && (Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self())
-     && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
+  if((Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
   {
-    Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
+    auto* accessible = GetAccessibleObject();
+    if(DALI_LIKELY(accessible))
+    {
+      accessible->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
+    }
   }
 }
 
diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
index ffae507..c542143 100644
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -63,6 +63,11 @@ private: // From Button
    */
   void OnInitialize() override;
 
+  /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
 private:
   // Undefined
   CheckBoxButton(const CheckBoxButton&);
@@ -71,12 +76,17 @@ private:
   CheckBoxButton& operator=(const CheckBoxButton&);
 
 protected:
-  struct AccessibleImpl : public Button::AccessibleImpl
+  class CheckBoxButtonAccessible : public Button::ButtonAccessible
   {
-    using Button::AccessibleImpl::AccessibleImpl;
+  public:
+    using Button::ButtonAccessible::ButtonAccessible;
 
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+     */
     Dali::Accessibility::States CalculateStates() override;
   };
+
   void OnStateChange(State newState) override;
 };
 
diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index 2958766..dea0ee0 100644
--- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,10 +95,12 @@ void PushButton::OnInitialize()
   Actor self = Self();
   self.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::PUSH_BUTTON));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::PUSH_BUTTON);
+}
+
+DevelControl::ControlAccessible* PushButton::CreateAccessibleObject()
+{
+  return new PushButtonAccessible(Self());
 }
 
 void PushButton::SetIconAlignment(const PushButton::IconAlignment iconAlignment)
@@ -194,10 +196,10 @@ Property::Value PushButton::GetProperty(BaseObject* object, Property::Index prop
   return value;
 }
 
-Dali::Accessibility::States PushButton::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States PushButton::PushButtonAccessible::CalculateStates()
 {
-  auto state = Button::AccessibleImpl::CalculateStates();
-  auto self = Toolkit::Button::DownCast(Self());
+  auto state                                 = Button::ButtonAccessible::CalculateStates();
+  auto self                                  = Toolkit::Button::DownCast(Self());
   state[Dali::Accessibility::State::PRESSED] = self.GetProperty<bool>(Toolkit::Button::Property::SELECTED);
   return state;
 }
@@ -205,14 +207,17 @@ Dali::Accessibility::States PushButton::AccessibleImpl::CalculateStates()
 void PushButton::OnStateChange(State newState)
 {
   // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used
-  if(Dali::Accessibility::IsUp() && (Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self())
-     && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
+  if((Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
   {
-    Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::PRESSED, newState == SELECTED_STATE ? 1 : 0, 0);
-
-    if(Self().GetProperty<bool>(Toolkit::Button::Property::TOGGLABLE))
+    auto* accessible = GetAccessibleObject();
+    if(DALI_LIKELY(accessible))
     {
-      Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
+      accessible->EmitStateChanged(Dali::Accessibility::State::PRESSED, newState == SELECTED_STATE ? 1 : 0, 0);
+
+      if(Self().GetProperty<bool>(Toolkit::Button::Property::TOGGLABLE))
+      {
+        accessible->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
+      }
     }
   }
 }
diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h
index 6300fe2..21a4d01 100644
--- a/dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/push-button-impl.h
@@ -93,6 +93,11 @@ private: // From Button
    */
   void OnInitialize() override;
 
+  /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
 private:
   /**
    * @brief Sets the alignment mode to use to align the icon to the label.
@@ -119,12 +124,17 @@ private:
   IconAlignment mIconAlignment; ///< The alignment of the icon against the label.
 
 protected:
-  struct AccessibleImpl : public Button::AccessibleImpl
+  class PushButtonAccessible : public Button::ButtonAccessible
   {
-    using Button::AccessibleImpl::AccessibleImpl;
+  public:
+    using Button::ButtonAccessible::ButtonAccessible;
 
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+     */
     Dali::Accessibility::States CalculateStates() override;
   };
+
   void OnStateChange(State newState) override;
 };
 
diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index 4b4e070..9aace1a 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -71,10 +71,12 @@ void RadioButton::OnInitialize()
 {
   Button::OnInitialize();
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::RADIO_BUTTON));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::RADIO_BUTTON);
+}
+
+DevelControl::ControlAccessible* RadioButton::CreateAccessibleObject()
+{
+  return new RadioButtonAccessible(Self());
 }
 
 bool RadioButton::OnToggleReleased()
@@ -105,17 +107,20 @@ void RadioButton::OnStateChange(State newState)
   }
 
   // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used
-  if(Dali::Accessibility::IsUp() && (Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self())
-     && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
+  if((Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
   {
-    Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
+    auto* accessible = GetAccessibleObject();
+    if(DALI_LIKELY(accessible))
+    {
+      accessible->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
+    }
   }
 }
 
-Dali::Accessibility::States RadioButton::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States RadioButton::RadioButtonAccessible::CalculateStates()
 {
-  auto state = Button::AccessibleImpl::CalculateStates();
-  auto self = Toolkit::Button::DownCast(Self());
+  auto state = Button::ButtonAccessible::CalculateStates();
+  auto self  = Toolkit::Button::DownCast(Self());
 
   if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
   {
diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index b172750..dbe2d35 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -65,6 +65,11 @@ private: // From Button
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Toolkit::Internal::Button::OnStateChange
    */
   void OnStateChange(State newState) override;
@@ -82,10 +87,14 @@ private:
   RadioButton& operator=(const RadioButton& origin);
 
 protected:
-  struct AccessibleImpl : public Button::AccessibleImpl
+  class RadioButtonAccessible : public Button::ButtonAccessible
   {
-    using Button::AccessibleImpl::AccessibleImpl;
+  public:
+    using Button::ButtonAccessible::ButtonAccessible;
 
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+     */
     Dali::Accessibility::States CalculateStates() override;
   };
 };
diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
index 1697b20..deab292 100644
--- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,10 +106,12 @@ void ToggleButton::OnInitialize()
   Actor self = Self();
   self.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::TOGGLE_BUTTON));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::TOGGLE_BUTTON);
+}
+
+DevelControl::ControlAccessible* ToggleButton::CreateAccessibleObject()
+{
+  return new ToggleButtonAccessible(Self());
 }
 
 void ToggleButton::SetProperty(BaseObject* object, Property::Index propertyIndex, const Property::Value& value)
@@ -142,11 +144,22 @@ void ToggleButton::SetProperty(BaseObject* object, Property::Index propertyIndex
           std::vector<std::string> tips;
           size_t                   tipsCount = tipArray->Count();
           tips.resize(tipsCount);
+
+          bool valid = true;
           for(size_t i = 0; i != tipsCount; ++i)
           {
-            tipArray->GetElementAt(i).Get(tips[i]);
+            if(DALI_UNLIKELY(!tipArray->GetElementAt(i).Get(tips[i])))
+            {
+              // Given array is invalid. Fast out.
+              valid = false;
+              break;
+            }
+          }
+
+          if(DALI_LIKELY(valid))
+          {
+            toggleButtonImpl.SetToggleTooltips(tips);
           }
-          toggleButtonImpl.SetToggleTooltips(tips);
         }
         break;
       }
@@ -174,8 +187,7 @@ Property::Value ToggleButton::GetProperty(BaseObject* object, Property::Index pr
     {
       case Toolkit::ToggleButton::Property::STATE_VISUALS:
       {
-        Property::Array array = toggleButtonImpl.GetToggleStates();
-        value                 = Property::Value(array);
+        value = toggleButtonImpl.GetToggleStates();
         break;
       }
       case Toolkit::ToggleButton::Property::TOOLTIPS:
@@ -355,7 +367,7 @@ void ToggleButton::OnPressed()
 {
   DALI_LOG_INFO(gLogButtonFilter, Debug::General, "ToggleButton::OnPressed\n");
   // State index will add 1 only when button is pressed.
-  mCurrentToggleIndex = (mCurrentToggleIndex + 1) % mToggleVisuals.size();
+  mCurrentToggleIndex = (mCurrentToggleIndex + 1) % static_cast<uint32_t>(mToggleVisuals.size());
 
   // Both create SelectedVisual and UnselectedVisual
   PrepareVisual(Toolkit::Button::Property::UNSELECTED_VISUAL, mToggleVisuals[mCurrentToggleIndex]);
@@ -372,9 +384,9 @@ void ToggleButton::OnPressed()
   RelayoutRequest();
 }
 
-Dali::Accessibility::States ToggleButton::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States ToggleButton::ToggleButtonAccessible::CalculateStates()
 {
-  auto states = Button::AccessibleImpl::CalculateStates();
+  auto states = Button::ButtonAccessible::CalculateStates();
   auto button = Toolkit::ToggleButton::DownCast(Self());
   if(button.GetProperty<int>(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX))
   {
@@ -383,7 +395,7 @@ Dali::Accessibility::States ToggleButton::AccessibleImpl::CalculateStates()
   return states;
 }
 
-std::string ToggleButton::AccessibleImpl::GetDescriptionRaw()
+std::string ToggleButton::ToggleButtonAccessible::GetDescriptionRaw() const
 {
   auto button   = Toolkit::ToggleButton::DownCast(Self());
   auto index    = button.GetProperty<int>(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX);
@@ -392,7 +404,7 @@ std::string ToggleButton::AccessibleImpl::GetDescriptionRaw()
   return tooltips[index].Get<std::string>();
 }
 
-Property::Index ToggleButton::AccessibleImpl::GetDescriptionPropertyIndex()
+Property::Index ToggleButton::ToggleButtonAccessible::GetDescriptionPropertyIndex()
 {
   return Toolkit::ToggleButton::Property::TOOLTIPS;
 }
@@ -400,11 +412,14 @@ Property::Index ToggleButton::AccessibleImpl::GetDescriptionPropertyIndex()
 void ToggleButton::OnStateChange(State newState)
 {
   // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used
-  if(Dali::Accessibility::IsUp() && (Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor())
-     && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
+  if((Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
   {
-    Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, mCurrentToggleIndex ? 1 : 0, 0);
-    Dali::Accessibility::Accessible::Get(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION);
+    auto* accessible = GetAccessibleObject();
+    if(DALI_LIKELY(accessible))
+    {
+      accessible->EmitStateChanged(Dali::Accessibility::State::CHECKED, mCurrentToggleIndex ? 1 : 0, 0);
+      accessible->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION);
+    }
   }
 }
 
diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.h b/dali-toolkit/internal/controls/buttons/toggle-button-impl.h
index 322285b..c6652a5 100644
--- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.h
@@ -128,6 +128,11 @@ private: // From Button
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Toolkit::Internal::Button::OnRelayout
    */
   void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
@@ -152,15 +157,29 @@ private:
   std::vector<Toolkit::Visual::Base> mToggleDisabledSelectedVisuals; ///< Save all disabled selected visuals.
   std::vector<std::string>           mToggleTooltips;                ///< Toggle tooltips.
   unsigned int                       mCurrentToggleIndex;            ///< The index of state.
+
 protected:
-  struct AccessibleImpl : public Button::AccessibleImpl
+  class ToggleButtonAccessible : public Button::ButtonAccessible
   {
-    using Button::AccessibleImpl::AccessibleImpl;
+  public:
+    using Button::ButtonAccessible::ButtonAccessible;
 
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+     */
     Dali::Accessibility::States CalculateStates() override;
-    std::string                 GetDescriptionRaw() override;
-    Property::Index             GetDescriptionPropertyIndex() override;
+
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetDescriptionRaw()
+     */
+    std::string GetDescriptionRaw() const override;
+
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetDescriptionPropertyIndex()
+     */
+    Property::Index GetDescriptionPropertyIndex() override;
   };
+
   void OnStateChange(State newState) override;
 };
 
diff --git a/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp b/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp
index 772c1a0..1cc292d 100644
--- a/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp
+++ b/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,7 @@ void CameraView::SetWindowSurfaceTarget()
 
   // For underlay rendering mode, camera display area have to be transparent.
   Geometry geometry = VisualFactoryCache::CreateQuadGeometry();
-  Shader   shader   = Shader::New(SHADER_VIDEO_VIEW_VERT, SHADER_VIDEO_VIEW_FRAG);
+  Shader   shader   = Shader::New(SHADER_VIDEO_VIEW_VERT, SHADER_VIDEO_VIEW_FRAG, Shader::Hint::NONE, "CAMERA_VIEW_OVERLAY");
   mOverlayRenderer  = Renderer::New(geometry, shader);
   mOverlayRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::OFF);
 
@@ -183,12 +183,12 @@ void CameraView::UpdateDisplayArea(Dali::PropertyNotification& source)
 
 Dali::Shader CameraView::CreateShader(Dali::NativeImageSourcePtr nativeImageSourcePtr)
 {
-  std::string vertexShader = SHADER_VIDEO_VIEW_TEXTURE_VERT.data();
+  std::string vertexShader   = SHADER_VIDEO_VIEW_TEXTURE_VERT.data();
   std::string fragmentShader = SHADER_VIDEO_VIEW_TEXTURE_FRAG.data();
 
   nativeImageSourcePtr->ApplyNativeFragmentShader(fragmentShader);
 
-  return Dali::Shader::New(vertexShader, fragmentShader);
+  return Dali::Shader::New(vertexShader, fragmentShader, Shader::Hint::NONE, "CAMERA_VIEW");
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
index 5741a42..282ebb4 100644
--- a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
+++ b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include "canvas-view-impl.h"
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/rendering/texture-devel.h>
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/public-api/object/type-registry-helper.h>
@@ -26,7 +27,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
@@ -46,6 +46,7 @@ BaseHandle Create()
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN(Toolkit::CanvasView, Toolkit::Control, Create);
 DALI_PROPERTY_REGISTRATION(Toolkit, CanvasView, "viewBox", VECTOR2, VIEW_BOX)
+DALI_PROPERTY_REGISTRATION(Toolkit, CanvasView, "synchronousLoading", BOOLEAN, SYNCHRONOUS_LOADING)
 DALI_TYPE_REGISTRATION_END()
 } // anonymous namespace
 
@@ -57,22 +58,17 @@ CanvasView::CanvasView(const Vector2& viewBox)
   mTexture(),
   mTextureSet(),
   mSize(viewBox),
-  mCanvasViewRasterizeThread(nullptr)
+  mIsSynchronous(true)
 {
 }
 
 CanvasView::~CanvasView()
 {
-  if(mCanvasViewRasterizeThread)
-  {
-    mCanvasViewRasterizeThread->RemoveTask(this);
-
-    CanvasViewRasterizeThread::TerminateThread(mCanvasViewRasterizeThread);
-  }
-
   if(Adaptor::IsAvailable())
   {
-    Adaptor::Get().UnregisterProcessor(*this);
+    Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask);
+    mRasterizingTask.Reset();
+    Adaptor::Get().UnregisterProcessor(*this, true);
   }
 }
 
@@ -96,10 +92,7 @@ void CanvasView::OnInitialize()
   // CanvasView can relayout in the OnImageReady, alternative to a signal would be to have a upcall from the Control to CanvasView
   Dali::Toolkit::Control handle(GetOwner());
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::IMAGE));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::IMAGE);
 
   Adaptor::Get().RegisterProcessor(*this, true);
 }
@@ -145,6 +138,15 @@ void CanvasView::SetProperty(BaseObject* object, Property::Index propertyIndex,
         }
         break;
       }
+      case Toolkit::CanvasView::Property::SYNCHRONOUS_LOADING:
+      {
+        bool isSynchronous;
+        if(value.Get(isSynchronous))
+        {
+          canvasViewImpl.SetSynchronous(isSynchronous);
+        }
+        break;
+      }
     }
   }
 }
@@ -166,6 +168,11 @@ Property::Value CanvasView::GetProperty(BaseObject* object, Property::Index prop
         value = canvasViewImpl.GetViewBox();
         break;
       }
+      case Toolkit::CanvasView::Property::SYNCHRONOUS_LOADING:
+      {
+        value = canvasViewImpl.IsSynchronous();
+        break;
+      }
     }
   }
   return value;
@@ -181,62 +188,52 @@ void CanvasView::Process(bool postProcessor)
 
 void CanvasView::AddRasterizationTask()
 {
-  CanvasRendererRasterizingTaskPtr newTask = new CanvasRendererRasterizingTask(this, mCanvasRenderer);
-
-  if(!mCanvasViewRasterizeThread)
-  {
-    mCanvasViewRasterizeThread = new CanvasViewRasterizeThread();
-    mCanvasViewRasterizeThread->RasterizationCompletedSignal().Connect(this, &CanvasView::ApplyRasterizedImage);
-    mCanvasViewRasterizeThread->Start();
-  }
+  mRasterizingTask = new CanvasRendererRasterizingTask(mCanvasRenderer, MakeCallback(this, &CanvasView::ApplyRasterizedImage));
 
   if(mCanvasRenderer.Commit())
   {
-    mCanvasViewRasterizeThread->AddTask(newTask);
+    if(mIsSynchronous)
+    {
+      mRasterizingTask->Process();
+      ApplyRasterizedImage(mRasterizingTask);
+      mRasterizingTask.Reset(); // We don't need it anymore.
+    }
+    else
+    {
+      AsyncTaskManager::Get().AddTask(mRasterizingTask);
+    }
   }
 }
 
-void CanvasView::ApplyRasterizedImage(PixelData rasterizedPixelData)
+void CanvasView::ApplyRasterizedImage(CanvasRendererRasterizingTaskPtr task)
 {
-  if(rasterizedPixelData)
+  if(task->IsRasterized())
   {
-    auto rasterizedPixelDataWidth  = rasterizedPixelData.GetWidth();
-    auto rasterizedPixelDataHeight = rasterizedPixelData.GetHeight();
-
-    if(rasterizedPixelDataWidth > 0 && rasterizedPixelDataHeight > 0)
+    Texture rasterizedTexture = task->GetRasterizedTexture();
+    if(rasterizedTexture && rasterizedTexture.GetWidth() != 0 && rasterizedTexture.GetHeight() != 0)
     {
-      if(!mTexture || mTexture.GetWidth() != rasterizedPixelDataWidth || mTexture.GetHeight() != rasterizedPixelDataHeight)
+      if(!mTextureSet)
       {
-        mTexture = Texture::New(TextureType::TEXTURE_2D, rasterizedPixelData.GetPixelFormat(), rasterizedPixelDataWidth, rasterizedPixelDataHeight);
-        mTexture.Upload(rasterizedPixelData);
+        std::string fragmentShader = SHADER_CANVAS_VIEW_FRAG.data();
+        DevelTexture::ApplyNativeFragmentShader(rasterizedTexture, fragmentShader);
 
-        if(!mTextureSet)
-        {
-          mTextureSet       = TextureSet::New();
-          Geometry geometry = VisualFactoryCache::CreateQuadGeometry();
-          Shader   shader   = Shader::New(SHADER_CANVAS_VIEW_VERT, SHADER_CANVAS_VIEW_FRAG);
-          Renderer renderer = Renderer::New(geometry, shader);
-          renderer.SetTextures(mTextureSet);
-          renderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, true);
-
-          Actor actor = Self();
-          if(actor)
-          {
-            actor.AddRenderer(renderer);
-          }
-        }
-        mTextureSet.SetTexture(0, mTexture);
-      }
-      else
-      {
-        //Update texture
-        mTexture.Upload(rasterizedPixelData);
+        mTextureSet       = TextureSet::New();
+        Geometry geometry = VisualFactoryCache::CreateQuadGeometry();
+        Shader   shader   = Shader::New(SHADER_CANVAS_VIEW_VERT, fragmentShader, Shader::Hint::NONE, "CANVAS_VIEW");
+        Renderer renderer = Renderer::New(geometry, shader);
+
+        renderer.SetTextures(mTextureSet);
+        renderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, true);
+        Self().AddRenderer(renderer);
       }
+      mTextureSet.SetTexture(0, rasterizedTexture);
     }
   }
 
+  mRasterizingTask.Reset(); // We don't need it anymore
+
   //If there are accumulated changes to CanvasRenderer during Rasterize, Rasterize once again.
-  if(mCanvasRenderer && mCanvasRenderer.IsCanvasChanged())
+  if(!mIsSynchronous && mCanvasRenderer && mCanvasRenderer.IsCanvasChanged())
   {
     AddRasterizationTask();
   }
@@ -286,6 +283,17 @@ const Vector2& CanvasView::GetViewBox()
   }
   return Vector2::ZERO;
 }
+
+void CanvasView::SetSynchronous(const bool isSynchronous)
+{
+  mIsSynchronous = isSynchronous;
+}
+
+const bool CanvasView::IsSynchronous()
+{
+  return mIsSynchronous;
+}
+
 } // namespace Internal
 } // namespace Toolkit
 } // namespace Dali
diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
index 6b6cf93..6f0fa11 100644
--- a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
+++ b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_CANVAS_VIEW_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,15 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/devel-api/rendering/renderer-devel.h>
 #include <dali/integration-api/processor-interface.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/canvas-view/canvas-view.h>
+#include <dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 namespace Dali
@@ -119,6 +120,20 @@ private: // From Control
   const Vector2& GetViewBox();
 
   /**
+   * @brief Set to load the canvas synchronously.
+   *
+   * @param isSynchronous The synchronous
+   */
+  void SetSynchronous(const bool isSynchronous);
+
+  /**
+   * @brief Whether to load the canvas synchronously.
+   *
+   * @return Returns true if synchronously.
+   */
+  const bool IsSynchronous();
+
+  /**
    * @bried Rasterize the canvas, and add it to the view.
    *
    * @param[in] size The target size of the canvas view rasterization.
@@ -131,24 +146,33 @@ protected:
    */
   void Process(bool postProcessor) override;
 
+  /**
+   * @copydoc Dali::Integration::Processor::GetProcessorName()
+   */
+  std::string_view GetProcessorName() const override
+  {
+    return "CanvasView";
+  }
+
 public:
   /**
    * @bried Apply the rasterized image to the canvas view
    *
-   * @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
+   * @param[in] task CanvasRendererRasterizingTaskPtr
    */
-  void ApplyRasterizedImage(PixelData rasterizedPixelData);
+  void ApplyRasterizedImage(CanvasRendererRasterizingTaskPtr task);
 
 private:
   CanvasView(const CanvasView&) = delete;
   CanvasView& operator=(const CanvasView&) = delete;
 
 private:
-  CanvasRenderer             mCanvasRenderer;
-  Dali::Texture              mTexture;
-  TextureSet                 mTextureSet;
-  Vector2                    mSize;
-  CanvasViewRasterizeThread* mCanvasViewRasterizeThread;
+  CanvasRenderer                   mCanvasRenderer;
+  Dali::Texture                    mTexture;
+  TextureSet                       mTextureSet;
+  Vector2                          mSize;
+  CanvasRendererRasterizingTaskPtr mRasterizingTask;
+  bool                             mIsSynchronous;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.cpp b/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.cpp
new file mode 100644
index 0000000..21b4205
--- /dev/null
+++ b/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include "canvas-view-rasterize-task.h"
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+CanvasRendererRasterizingTask::CanvasRendererRasterizingTask(CanvasRenderer canvasRenderer, CallbackBase* callback)
+: AsyncTask(callback),
+  mCanvasRenderer(canvasRenderer),
+  mRasterizedSuccessed(false)
+{
+}
+
+void CanvasRendererRasterizingTask::Process()
+{
+  mRasterizedSuccessed = Rasterize();
+}
+
+bool CanvasRendererRasterizingTask::IsReady()
+{
+  return true;
+}
+
+bool CanvasRendererRasterizingTask::IsRasterized()
+{
+  return mRasterizedSuccessed;
+}
+
+bool CanvasRendererRasterizingTask::Rasterize()
+{
+  if(mCanvasRenderer && mCanvasRenderer.Rasterize())
+  {
+    return true;
+  }
+  return false;
+}
+
+Texture CanvasRendererRasterizingTask::GetRasterizedTexture()
+{
+  return mCanvasRenderer.GetRasterizedTexture();
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.h b/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.h
new file mode 100644
index 0000000..6187ccf
--- /dev/null
+++ b/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-task.h
@@ -0,0 +1,122 @@
+#ifndef DALI_TOOLKIT_CANVAS_VIEW_RASTERIZE_TASK_H
+#define DALI_TOOLKIT_CANVAS_VIEW_RASTERIZE_TASK_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
+#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/devel-api/threading/thread.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/object/ref-object.h>
+#include <dali/public-api/rendering/texture-set.h>
+#include <memory>
+#include <vector>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+class CanvasRendererRasterizingTask;
+using CanvasRendererRasterizingTaskPtr = IntrusivePtr<CanvasRendererRasterizingTask>;
+
+/**
+ * The canvasview rasterizing tasks to be processed in the worker thread.
+ *
+ * Life cycle of a rasterizing task is as follows:
+ * 1. Created by CanvasView in the main thread
+ * 2. Queued in the worked thread waiting to be processed.
+ * 3. If this task gets its turn to do the rasterization, it triggers main thread to apply the rasterized image to material then been deleted in main thread call back.
+ *    Or if this task is been removed before its turn to be processed, it then been deleted in the worker thread.
+ */
+class CanvasRendererRasterizingTask : public AsyncTask
+{
+public:
+  /**
+   * Constructor
+   * @param[in] canvasRenderer The renderer which the rasterized canvas to be applied.
+   * @param[in] callback The callback that is called when the operation is completed.
+   */
+  CanvasRendererRasterizingTask(CanvasRenderer canvasRenderer, CallbackBase* callback);
+
+  /**
+   * Destructor.
+   */
+  ~CanvasRendererRasterizingTask() = default;
+
+  /**
+   * Do the rasterization with the mRasterizer.
+   * @return Returns True when it's successful. False otherwise.
+   */
+  bool Rasterize();
+
+  /**
+   * Whether the rasterize is completed
+   * @return Returns True when it's completed
+   */
+  bool IsRasterized();
+
+  /**
+   * Get the rasterization result.
+   * @return The texture with the rasterized pixels.
+   */
+  Texture GetRasterizedTexture();
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "CanvasRendererRasterizingTask";
+  }
+
+private:
+  // Undefined
+  CanvasRendererRasterizingTask(const CanvasRendererRasterizingTask& task);
+
+  // Undefined
+  CanvasRendererRasterizingTask& operator=(const CanvasRendererRasterizingTask& task);
+
+private:
+  CanvasRenderer mCanvasRenderer;
+  bool           mRasterizedSuccessed;
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_CANVAS_VIEW_RASTERIZE_TASK_H
diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.cpp b/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.cpp
deleted file mode 100644
index 97835c5..0000000
--- a/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "canvas-view-rasterize-thread.h"
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/thread-settings.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-CanvasRendererRasterizingTask::CanvasRendererRasterizingTask(CanvasView* canvasView, CanvasRenderer canvasRenderer)
-: mCanvasView(canvasView),
-  mCanvasRenderer(canvasRenderer),
-  mPixelData(PixelData()),
-  mBufferSize(0, 0)
-{
-}
-
-bool CanvasRendererRasterizingTask::Rasterize()
-{
-  if(mCanvasRenderer && mCanvasRenderer.Rasterize())
-  {
-    Devel::PixelBuffer pixbuf = mCanvasRenderer.GetPixelBuffer();
-    auto               width  = pixbuf.GetWidth();
-    auto               height = pixbuf.GetHeight();
-    if(width > 0 && height > 0)
-    {
-      mBufferSize.width  = width;
-      mBufferSize.height = height;
-
-      mPixelData = Devel::PixelBuffer::Convert(pixbuf);
-      return true;
-    }
-  }
-  return false;
-}
-
-CanvasView* CanvasRendererRasterizingTask::GetCanvasView() const
-{
-  return mCanvasView.Get();
-}
-
-PixelData CanvasRendererRasterizingTask::GetPixelData() const
-{
-  return mPixelData;
-}
-
-Vector2 CanvasRendererRasterizingTask::GetBufferSize() const
-{
-  return mBufferSize;
-}
-
-CanvasViewRasterizeThread::CanvasViewRasterizeThread()
-: mTrigger(new EventThreadCallback(MakeCallback(this, &CanvasViewRasterizeThread::ApplyRasterized))),
-  mLogFactory(Dali::Adaptor::Get().GetLogFactory()),
-  mProcessorRegistered(false),
-  mRasterizationCompletedSignal()
-{
-}
-
-CanvasViewRasterizeThread::~CanvasViewRasterizeThread()
-{
-  if(mProcessorRegistered && Adaptor::IsAvailable())
-  {
-    Adaptor::Get().UnregisterProcessor(*this);
-  }
-}
-
-void CanvasViewRasterizeThread::TerminateThread(CanvasViewRasterizeThread*& thread)
-{
-  if(thread)
-  {
-    // add an empty task would stop the thread from conditional wait.
-    thread->AddTask(CanvasRendererRasterizingTaskPtr());
-    // stop the thread
-    thread->Join();
-    // delete the thread
-    delete thread;
-    thread = NULL;
-  }
-}
-
-void CanvasViewRasterizeThread::AddTask(CanvasRendererRasterizingTaskPtr task)
-{
-  bool wasEmpty = false;
-
-  {
-    // Lock while adding task to the queue
-    ConditionalWait::ScopedLock lock(mConditionalWait);
-    wasEmpty = mRasterizeTasks.empty();
-    if(!wasEmpty && task != NULL)
-    {
-      // Remove the tasks with the same renderer.
-      // Older task which waiting to rasterize and apply the svg to the same renderer is expired.
-      for(std::vector<CanvasRendererRasterizingTaskPtr>::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it)
-      {
-        if((*it) && (*it)->GetCanvasView() == task->GetCanvasView()) //Need
-        {
-          mRasterizeTasks.erase(it);
-          break;
-        }
-      }
-    }
-    mRasterizeTasks.push_back(task);
-
-    if(!mProcessorRegistered && Adaptor::IsAvailable())
-    {
-      Adaptor::Get().RegisterProcessor(*this);
-      mProcessorRegistered = true;
-    }
-  }
-
-  if(wasEmpty)
-  {
-    // wake up the image loading thread
-    mConditionalWait.Notify();
-  }
-}
-
-CanvasRendererRasterizingTaskPtr CanvasViewRasterizeThread::NextCompletedTask()
-{
-  // Lock while popping task out from the queue
-  Mutex::ScopedLock lock(mMutex);
-
-  if(mCompletedTasks.empty())
-  {
-    return CanvasRendererRasterizingTaskPtr();
-  }
-
-  std::vector<CanvasRendererRasterizingTaskPtr>::iterator next     = mCompletedTasks.begin();
-  CanvasRendererRasterizingTaskPtr                        nextTask = *next;
-  mCompletedTasks.erase(next);
-
-  return nextTask;
-}
-
-void CanvasViewRasterizeThread::RemoveTask(CanvasView* canvasView)
-{
-  // Lock while remove task from the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-  if(!mRasterizeTasks.empty())
-  {
-    for(std::vector<CanvasRendererRasterizingTaskPtr>::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it)
-    {
-      if((*it) && (*it)->GetCanvasView() == canvasView)
-      {
-        mRasterizeTasks.erase(it);
-        break;
-      }
-    }
-  }
-
-  UnregisterProcessor();
-}
-
-CanvasRendererRasterizingTaskPtr CanvasViewRasterizeThread::NextTaskToProcess()
-{
-  // Lock while popping task out from the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
-  // conditional wait
-  while(mRasterizeTasks.empty())
-  {
-    mConditionalWait.Wait(lock);
-  }
-
-  // pop out the next task from the queue
-  std::vector<CanvasRendererRasterizingTaskPtr>::iterator next     = mRasterizeTasks.begin();
-  CanvasRendererRasterizingTaskPtr                        nextTask = *next;
-  mRasterizeTasks.erase(next);
-
-  return nextTask;
-}
-
-void CanvasViewRasterizeThread::AddCompletedTask(CanvasRendererRasterizingTaskPtr task)
-{
-  // Lock while adding task to the queue
-  Mutex::ScopedLock lock(mMutex);
-  mCompletedTasks.push_back(task);
-
-  // wake up the main thread
-  mTrigger->Trigger();
-}
-
-void CanvasViewRasterizeThread::Run()
-{
-  SetThreadName("CanvasViewThread");
-  mLogFactory.InstallLogFunction();
-
-  while(CanvasRendererRasterizingTaskPtr task = NextTaskToProcess())
-  {
-    if(task->Rasterize())
-    {
-      AddCompletedTask(task);
-    }
-  }
-}
-
-void CanvasViewRasterizeThread::ApplyRasterized()
-{
-  while(CanvasRendererRasterizingTaskPtr task = NextCompletedTask())
-  {
-    RasterizationCompletedSignal().Emit(task->GetPixelData());
-  }
-
-  UnregisterProcessor();
-}
-
-void CanvasViewRasterizeThread::Process(bool postProcessor)
-{
-  ApplyRasterized();
-}
-
-CanvasViewRasterizeThread::RasterizationCompletedSignalType& CanvasViewRasterizeThread::RasterizationCompletedSignal()
-{
-  return mRasterizationCompletedSignal;
-}
-
-void CanvasViewRasterizeThread::UnregisterProcessor()
-{
-  if(mProcessorRegistered)
-  {
-    if(mRasterizeTasks.empty() && mCompletedTasks.empty() && Adaptor::IsAvailable())
-    {
-      Adaptor::Get().UnregisterProcessor(*this);
-      mProcessorRegistered = false;
-    }
-  }
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.h b/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.h
deleted file mode 100644
index 0c16fd9..0000000
--- a/dali-toolkit/internal/controls/canvas-view/canvas-view-rasterize-thread.h
+++ /dev/null
@@ -1,230 +0,0 @@
-#ifndef DALI_TOOLKIT_CANVAS_VIEW_RASTERIZE_THREAD_H
-#define DALI_TOOLKIT_CANVAS_VIEW_RASTERIZE_THREAD_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
-#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
-#include <dali/devel-api/threading/conditional-wait.h>
-#include <dali/devel-api/threading/mutex.h>
-#include <dali/devel-api/threading/thread.h>
-#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
-#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/public-api/images/pixel-data.h>
-#include <dali/public-api/object/ref-object.h>
-#include <dali/public-api/rendering/texture-set.h>
-#include <memory>
-#include <vector>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-using CanvasViewPtr = IntrusivePtr<CanvasView>;
-class CanvasRendererRasterizingTask;
-using CanvasRendererRasterizingTaskPtr = IntrusivePtr<CanvasRendererRasterizingTask>;
-
-/**
- * The canvasview rasterizing tasks to be processed in the worker thread.
- *
- * Life cycle of a rasterizing task is as follows:
- * 1. Created by CanvasView in the main thread
- * 2. Queued in the worked thread waiting to be processed.
- * 3. If this task gets its turn to do the rasterization, it triggers main thread to apply the rasterized image to material then been deleted in main thread call back.
- *    Or if this task is been removed before its turn to be processed, it then been deleted in the worker thread.
- */
-class CanvasRendererRasterizingTask : public RefObject
-{
-public:
-  /**
-   * Constructor
-   * @param[in] canvasRenderer The renderer which the rasterized canvas to be applied.
-   */
-  CanvasRendererRasterizingTask(CanvasView* canvasView, CanvasRenderer canvasRenderer);
-
-  /**
-   * Destructor.
-   */
-  ~CanvasRendererRasterizingTask() = default;
-
-  /**
-   * Do the rasterization with the mRasterizer.
-   * @return Returns True when it's successful. False otherwise.
-   */
-  bool Rasterize();
-
-  /**
-   * Get the CanvasView
-   * @return The CanvasView pointer.
-   */
-  CanvasView* GetCanvasView() const;
-
-  /**
-   * Get the rasterization result.
-   * @return The pixel data with the rasterized pixels.
-   */
-  PixelData GetPixelData() const;
-
-  /**
-   * Get size of rasterization result.
-   * @return The size of the pixel data.
-   */
-  Vector2 GetBufferSize() const;
-
-private:
-  // Undefined
-  CanvasRendererRasterizingTask(const CanvasRendererRasterizingTask& task);
-
-  // Undefined
-  CanvasRendererRasterizingTask& operator=(const CanvasRendererRasterizingTask& task);
-
-private:
-  CanvasViewPtr  mCanvasView;
-  CanvasRenderer mCanvasRenderer;
-  PixelData      mPixelData;
-  Vector2        mBufferSize;
-};
-
-/**
- * The worker thread for CanvasView rasterization.
- */
-class CanvasViewRasterizeThread : public Thread, Integration::Processor
-{
-public:
-  /// @brief ApplyRasterizedImage Event signal type
-  using RasterizationCompletedSignalType = Signal<void(PixelData)>;
-
-public:
-  /**
-   * Constructor.
-   *
-   * @param[in] trigger The trigger to wake up the main thread.
-   */
-  CanvasViewRasterizeThread();
-
-  /**
-   * Terminate the CanvasView rasterize thread, join and delete.
-   *
-   * @param[in] thread The rasterize thread.
-   */
-  static void TerminateThread(CanvasViewRasterizeThread*& thread);
-
-  /**
-   * Add a rasterization task into the waiting queue, called by main thread.
-   *
-   * @param[in] task The task added to the queue.
-   */
-  void AddTask(CanvasRendererRasterizingTaskPtr task);
-
-  /**
-   * Remove the task with the given CanvasView from the waiting queue, called by main thread.
-   *
-   * Typically called when the actor is put off stage, so the renderer is not needed anymore.
-   *
-   * @param[in] canvasView The CanvasView pointer.
-   */
-  void RemoveTask(CanvasView* canvasView);
-
-  /**
-   * Applies the rasterized image to material
-   */
-  void ApplyRasterized();
-
-  /**
-   * @copydoc Dali::Integration::Processor::Process()
-   */
-  void Process(bool postProcessor) override;
-
-  /**
-   * @brief This signal is emitted when rasterized image is applied.
-   *
-   * @return The signal to connect to
-   */
-  RasterizationCompletedSignalType& RasterizationCompletedSignal();
-
-private:
-  /**
-   * Pop the next task out from the queue.
-   *
-   * @return The next task to be processed.
-   */
-  CanvasRendererRasterizingTaskPtr NextTaskToProcess();
-
-  /**
-   * Pop the next task out from the completed queue, called by main thread.
-   *
-   * @return The next task in the completed queue.
-   */
-  CanvasRendererRasterizingTaskPtr NextCompletedTask();
-
-  /**
-   * Add a task in to the queue
-   *
-   * @param[in] task The task added to the queue.
-   */
-  void AddCompletedTask(CanvasRendererRasterizingTaskPtr task);
-
-  /**
-   * @brief Unregister a previously registered processor
-   *
-   */
-  void UnregisterProcessor();
-
-protected:
-  /**
-   * Destructor.
-   */
-  ~CanvasViewRasterizeThread() override;
-
-  /**
-   * The entry function of the worker thread.
-   * It fetches task from the Queue, rasterizes the image and apply to the renderer.
-   */
-  void Run() override;
-
-private:
-  // Undefined
-  CanvasViewRasterizeThread(const CanvasViewRasterizeThread& thread);
-
-  // Undefined
-  CanvasViewRasterizeThread& operator=(const CanvasViewRasterizeThread& thread);
-
-private:
-  std::vector<CanvasRendererRasterizingTaskPtr> mRasterizeTasks; //The queue of the tasks waiting to rasterize the CanvasView.
-  std::vector<CanvasRendererRasterizingTaskPtr> mCompletedTasks; //The queue of the tasks with the SVG rasterization completed
-
-  ConditionalWait                      mConditionalWait;
-  Dali::Mutex                          mMutex;
-  std::unique_ptr<EventThreadCallback> mTrigger;
-  const Dali::LogFactoryInterface&     mLogFactory;
-  bool                                 mProcessorRegistered;
-  RasterizationCompletedSignalType     mRasterizationCompletedSignal;
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_CANVAS_VIEW_RASTERIZE_THREAD_H
diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp
index ced845a..e67be8e 100644
--- a/dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/object/object-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <cstring>
@@ -40,6 +41,7 @@
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/control-wrapper-impl.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
@@ -50,12 +52,12 @@
 
 namespace
 {
-const std::string READING_INFO_TYPE_NAME           = "name";
-const std::string READING_INFO_TYPE_ROLE           = "role";
-const std::string READING_INFO_TYPE_DESCRIPTION    = "description";
-const std::string READING_INFO_TYPE_STATE          = "state";
-const std::string READING_INFO_TYPE_ATTRIBUTE_NAME = "reading_info_type";
-const std::string READING_INFO_TYPE_SEPARATOR      = "|";
+const char* READING_INFO_TYPE_NAME           = "name";
+const char* READING_INFO_TYPE_ROLE           = "role";
+const char* READING_INFO_TYPE_DESCRIPTION    = "description";
+const char* READING_INFO_TYPE_STATE          = "state";
+const char* READING_INFO_TYPE_ATTRIBUTE_NAME = "reading_info_type";
+const char* READING_INFO_TYPE_SEPARATOR      = "|";
 } // namespace
 
 namespace Dali
@@ -127,6 +129,38 @@ bool FindVisual(std::string visualName, const RegisteredVisualContainer& visuals
   return false;
 }
 
+/**
+ *  Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter
+ */
+bool FindVisual(const Toolkit::Visual::Base findVisual, const RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter)
+{
+  for(iter = visuals.Begin(); iter != visuals.End(); iter++)
+  {
+    Toolkit::Visual::Base visual = (*iter)->visual;
+    if(visual && visual == findVisual)
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ *  Finds internal visual in given array, returning true if found along with the iterator for that visual as a out parameter
+ */
+bool FindVisual(const Visual::Base& findInternalVisual, const RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter)
+{
+  for(iter = visuals.Begin(); iter != visuals.End(); iter++)
+  {
+    Visual::Base& visual = Toolkit::GetImplementation((*iter)->visual);
+    if((&visual == &findInternalVisual))
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
 void FindChangableVisuals(Dictionary<Property::Map>& stateVisualsToAdd,
                           Dictionary<Property::Map>& stateVisualsToChange,
                           DictionaryKeys&            stateVisualsToRemove)
@@ -199,6 +233,23 @@ void MoveVisual(RegisteredVisualContainer::Iterator sourceIter, RegisteredVisual
 }
 
 /**
+ * Discard visual from source to visual factory.
+ */
+void DiscardVisual(RegisteredVisualContainer::Iterator sourceIter, RegisteredVisualContainer& source)
+{
+  Toolkit::Visual::Base visual = (*sourceIter)->visual;
+  if(visual)
+  {
+    if(Stage::IsInstalled())
+    {
+      Toolkit::VisualFactory::Get().DiscardVisual(visual);
+    }
+  }
+
+  source.Erase(sourceIter);
+}
+
+/**
  * Performs actions as requested using the action name.
  * @param[in] object The object on which to perform the action.
  * @param[in] actionName The action to perform.
@@ -410,11 +461,11 @@ void SetVisualsOffScene(const RegisteredVisualContainer& container, Actor parent
   }
 }
 
-Dali::Rect<> GetShowingGeometry(Dali::Rect<> rect, Dali::Toolkit::DevelControl::AccessibleImpl* accessibleImpl)
+Dali::Rect<> GetShowingGeometry(Dali::Rect<> rect, Dali::Toolkit::DevelControl::ControlAccessible* accessible)
 {
   Rect<>  parentRect;
   Vector2 currentPosition;
-  auto    parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(accessibleImpl->GetParent());
+  auto    parent = dynamic_cast<Toolkit::DevelControl::ControlAccessible*>(accessible->GetParent());
 
   while(parent)
   {
@@ -433,7 +484,7 @@ Dali::Rect<> GetShowingGeometry(Dali::Rect<> rect, Dali::Toolkit::DevelControl::
       return rect;
     }
 
-    parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(parent->GetParent());
+    parent = dynamic_cast<Toolkit::DevelControl::ControlAccessible*>(parent->GetParent());
   }
 
   return rect;
@@ -444,6 +495,19 @@ static bool IsShowingGeometryOnScreen(Dali::Rect<> rect)
   return rect.width > 0 && rect.height > 0;
 }
 
+Dali::Accessibility::Accessible* ExternalAccessibleGetter(Dali::Actor actor)
+{
+  auto control = Toolkit::Control::DownCast(actor);
+  if(!control)
+  {
+    return nullptr;
+  }
+
+  auto& controlImpl = Toolkit::Internal::GetImplementation(control);
+
+  return controlImpl.GetAccessibleObject();
+}
+
 } // unnamed namespace
 
 // clang-format off
@@ -467,6 +531,12 @@ const PropertyRegistration Control::Impl::PROPERTY_18(typeRegistration, "accessi
 const PropertyRegistration Control::Impl::PROPERTY_19(typeRegistration, "accessibilityRole",              Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE,               Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
 const PropertyRegistration Control::Impl::PROPERTY_20(typeRegistration, "accessibilityHighlightable",     Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE,      Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
 const PropertyRegistration Control::Impl::PROPERTY_21(typeRegistration, "accessibilityAttributes",        Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES,         Property::MAP,     &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_22(typeRegistration, "dispatchKeyEvents",              Toolkit::DevelControl::Property::DISPATCH_KEY_EVENTS,              Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_23(typeRegistration, "accessibilityHidden",            Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN,             Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_24(typeRegistration, "clockwiseFocusableActorId",      Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID,     Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_25(typeRegistration, "counterClockwiseFocusableActorId", Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const PropertyRegistration Control::Impl::PROPERTY_26(typeRegistration, "automationId",                   Toolkit::DevelControl::Property::AUTOMATION_ID,                    Property::STRING,  &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+
 // clang-format on
 
 Control::Impl::Impl(Control& controlImpl)
@@ -477,6 +547,8 @@ Control::Impl::Impl(Control& controlImpl)
   mRightFocusableActorId(-1),
   mUpFocusableActorId(-1),
   mDownFocusableActorId(-1),
+  mClockwiseFocusableActorId(-1),
+  mCounterClockwiseFocusableActorId(-1),
   mStyleName(""),
   mBackgroundColor(Color::TRANSPARENT),
   mStartingPinchScale(nullptr),
@@ -501,23 +573,10 @@ Control::Impl::Impl(Control& controlImpl)
   mIsKeyboardNavigationSupported(false),
   mIsKeyboardFocusGroup(false),
   mIsEmittingResourceReadySignal(false),
-  mNeedToEmitResourceReady(false)
+  mIdleCallbackRegistered(false),
+  mDispatchKeyEvents(true)
 {
-  Dali::Accessibility::Accessible::RegisterControlAccessibilityGetter(
-    [](Dali::Actor actor) -> Dali::Accessibility::Accessible* {
-      return Control::Impl::GetAccessibilityObject(actor);
-    });
-
-  mAccessibilityConstructor = [](Dali::Actor actor) -> std::unique_ptr<Dali::Accessibility::Accessible> {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::UNKNOWN));
-  };
-
-  size_t length = static_cast<size_t>(Dali::Accessibility::RelationType::MAX_COUNT);
-  mAccessibilityRelations.reserve(length);
-  for(auto i = 0u; i < length; ++i)
-  {
-    mAccessibilityRelations.push_back({});
-  }
+  Dali::Accessibility::Accessible::RegisterExternalAccessibleGetter(&ExternalAccessibleGetter);
 }
 
 Control::Impl::~Impl()
@@ -544,74 +603,75 @@ Control::Impl::~Impl()
 
 Control::Impl& Control::Impl::Get(Internal::Control& internalControl)
 {
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
   return *internalControl.mImpl;
 }
 
 const Control::Impl& Control::Impl::Get(const Internal::Control& internalControl)
 {
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
   return *internalControl.mImpl;
 }
 
 void Control::Impl::CheckHighlightedObjectGeometry()
 {
-  auto accessibleImpl = dynamic_cast<Dali::Toolkit::DevelControl::AccessibleImpl*>(mAccessibilityObject.get());
-  if(!accessibleImpl)
+  auto accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
   {
-    DALI_LOG_ERROR("accessibleImpl is not a pointer to a DevelControl::AccessibleImpl type");
-    return;
-  }
-
-  auto lastPosition   = accessibleImpl->GetLastPosition();
-  auto accessibleRect = accessibleImpl->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
-  auto rect = GetShowingGeometry(accessibleRect, accessibleImpl);
+    auto lastPosition   = accessible->GetLastPosition();
+    auto accessibleRect = accessible->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
+    auto rect           = GetShowingGeometry(accessibleRect, accessible);
 
-  switch(mAccessibilityLastScreenRelativeMoveType)
-  {
-    case Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE:
-    {
-      if(IsShowingGeometryOnScreen(rect))
-      {
-        mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::INSIDE;
-      }
-      break;
-    }
-    case Dali::Accessibility::ScreenRelativeMoveType::INSIDE:
+    switch(mAccessibilityLastScreenRelativeMoveType)
     {
-      if(rect.width < 0 && accessibleRect.x != lastPosition.x)
-      {
-        mAccessibilityLastScreenRelativeMoveType = (accessibleRect.x < lastPosition.x) ? Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT : Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT;
-      }
-      if(rect.height < 0 && accessibleRect.y != lastPosition.y)
+      case Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE:
       {
-        mAccessibilityLastScreenRelativeMoveType = (accessibleRect.y < lastPosition.y) ? Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT : Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT;
+        if(IsShowingGeometryOnScreen(rect))
+        {
+          mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::INSIDE;
+        }
+        break;
       }
-      // notify AT-clients on outgoing moves only
-      if(mAccessibilityLastScreenRelativeMoveType != Dali::Accessibility::ScreenRelativeMoveType::INSIDE)
+      case Dali::Accessibility::ScreenRelativeMoveType::INSIDE:
       {
-        mAccessibilityObject.get()->EmitMovedOutOfScreen(mAccessibilityLastScreenRelativeMoveType);
+        if(rect.width < 0 && !Dali::Equals(accessibleRect.x, lastPosition.x))
+        {
+          mAccessibilityLastScreenRelativeMoveType = (accessibleRect.x < lastPosition.x) ? Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT : Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT;
+        }
+        if(rect.height < 0 && !Dali::Equals(accessibleRect.y, lastPosition.y))
+        {
+          mAccessibilityLastScreenRelativeMoveType = (accessibleRect.y < lastPosition.y) ? Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT : Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT;
+        }
+        // notify AT-clients on outgoing moves only
+        if(mAccessibilityLastScreenRelativeMoveType != Dali::Accessibility::ScreenRelativeMoveType::INSIDE)
+        {
+          accessible->EmitMovedOutOfScreen(mAccessibilityLastScreenRelativeMoveType);
+        }
+        break;
       }
-      break;
-    }
-    case Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT:
-    case Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT:
-    {
-      if(IsShowingGeometryOnScreen(rect))
+      case Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_TOP_LEFT:
+      case Dali::Accessibility::ScreenRelativeMoveType::OUTGOING_BOTTOM_RIGHT:
       {
-        mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::INSIDE;
+        if(IsShowingGeometryOnScreen(rect))
+        {
+          mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::INSIDE;
+        }
+        else
+        {
+          mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE;
+        }
+        break;
       }
-      else
+      default:
       {
-        mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE;
+        break;
       }
-      break;
-    }
-    default:
-    {
-      break;
     }
-  }
 
-  accessibleImpl->SetLastPosition(Vector2(accessibleRect.x, accessibleRect.y));
+    accessible->SetLastPosition(Vector2(accessibleRect.x, accessibleRect.y));
+  }
 }
 
 void Control::Impl::RegisterAccessibilityPositionPropertyNotification()
@@ -624,9 +684,9 @@ void Control::Impl::RegisterAccessibilityPositionPropertyNotification()
   mAccessibilityLastScreenRelativeMoveType = Dali::Accessibility::ScreenRelativeMoveType::OUTSIDE;
   // recalculate mAccessibilityLastScreenRelativeMoveType accordingly to the initial position
   CheckHighlightedObjectGeometry();
-  mAccessibilityPositionNotification       = mControlImpl.Self().AddPropertyNotification(Actor::Property::WORLD_POSITION, StepCondition(1.0f, 1.0f));
+  mAccessibilityPositionNotification = mControlImpl.Self().AddPropertyNotification(Actor::Property::WORLD_POSITION, StepCondition(1.0f, 1.0f));
   mAccessibilityPositionNotification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED);
-  mAccessibilityPositionNotification.NotifySignal().Connect(this, [this](PropertyNotification&){ CheckHighlightedObjectGeometry(); });
+  mAccessibilityPositionNotification.NotifySignal().Connect(this, [this](PropertyNotification&) { CheckHighlightedObjectGeometry(); });
   mIsAccessibilityPositionPropertyNotificationSet = true;
 }
 
@@ -636,6 +696,49 @@ void Control::Impl::UnregisterAccessibilityPositionPropertyNotification()
   mIsAccessibilityPositionPropertyNotificationSet = false;
 }
 
+void Control::Impl::RegisterAccessibilityPropertySetSignal()
+{
+  if(mIsAccessibilityPropertySetSignalRegistered)
+  {
+    return;
+  }
+  mControlImpl.Self().PropertySetSignal().Connect(this, &Control::Impl::OnAccessibilityPropertySet);
+  mIsAccessibilityPropertySetSignalRegistered = true;
+}
+
+void Control::Impl::UnregisterAccessibilityPropertySetSignal()
+{
+  if(!mIsAccessibilityPropertySetSignalRegistered)
+  {
+    return;
+  }
+  mControlImpl.Self().PropertySetSignal().Disconnect(this, &Control::Impl::OnAccessibilityPropertySet);
+  mIsAccessibilityPropertySetSignalRegistered = false;
+}
+
+void Control::Impl::OnAccessibilityPropertySet(Dali::Handle& handle, Dali::Property::Index index, const Dali::Property::Value& value)
+{
+  auto* accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
+  {
+    if(mAccessibilityGetNameSignal.Empty())
+    {
+      if(index == DevelControl::Property::ACCESSIBILITY_NAME || (mAccessibilityName.empty() && index == accessible->GetNamePropertyIndex()))
+      {
+        accessible->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::NAME);
+      }
+    }
+
+    if(mAccessibilityGetDescriptionSignal.Empty())
+    {
+      if(index == DevelControl::Property::ACCESSIBILITY_DESCRIPTION || (mAccessibilityDescription.empty() && index == accessible->GetDescriptionPropertyIndex()))
+      {
+        accessible->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION);
+      }
+    }
+  }
+}
+
 // Gesture Detection Methods
 void Control::Impl::PinchDetected(Actor actor, const PinchGesture& pinch)
 {
@@ -679,6 +782,8 @@ void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base&
 
 void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual, VisualState::Type enabled, DepthIndexValue::Type depthIndexValueSet, int depthIndex)
 {
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
   DALI_LOG_INFO(gLogFilter, Debug::Concise, "RegisterVisual:%d \n", index);
 
   bool  visualReplaced(false);
@@ -801,7 +906,7 @@ void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base&
     {
       visualImpl.SetOnScene(self);
     }
-    else if(visualImpl.IsResourceReady()) // When not being staged, check if visual already 'ResourceReady' before it was Registered. ( Resource may have been loaded already )
+    else if(enabled && visualImpl.IsResourceReady()) // When not being staged, check if visual already 'ResourceReady' before it was Registered. ( Resource may have been loaded already )
     {
       ResourceReady(visualImpl);
     }
@@ -812,6 +917,8 @@ void Control::Impl::RegisterVisual(Property::Index index, Toolkit::Visual::Base&
 
 void Control::Impl::UnregisterVisual(Property::Index index)
 {
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
   RegisteredVisualContainer::Iterator iter;
   if(FindVisual(index, mVisuals, iter))
   {
@@ -829,8 +936,9 @@ void Control::Impl::UnregisterVisual(Property::Index index)
     Actor self(mControlImpl.Self());
     Toolkit::GetImplementation((*iter)->visual).SetOffScene(self);
     (*iter)->pending = false;
-    (*iter)->visual.Reset();
-    mRemoveVisuals.Erase(iter);
+
+    // Discard removed visual. It will be destroyed at next Idle time.
+    DiscardVisual(iter, mRemoveVisuals);
   }
 }
 
@@ -890,6 +998,23 @@ bool Control::Impl::IsVisualEnabled(Property::Index index) const
   return false;
 }
 
+void Control::Impl::EnableReadyTransitionOverriden(Toolkit::Visual::Base& visual, bool enable)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::General, "Control::EnableReadyTransitionOverriden(%p, %s)\n", visual, enable ? "T" : "F");
+
+  RegisteredVisualContainer::Iterator iter;
+  if(FindVisual(visual, mVisuals, iter))
+  {
+    if((*iter)->overideReadyTransition == enable)
+    {
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::EnableReadyTransitionOverriden Visual %s(%p) already %s\n", (*iter)->visual.GetName().c_str(), visual, enable ? "enabled" : "disabled");
+      return;
+    }
+
+    (*iter)->overideReadyTransition = enable;
+  }
+}
+
 void Control::Impl::StopObservingVisual(Toolkit::Visual::Base& visual)
 {
   Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
@@ -906,6 +1031,17 @@ void Control::Impl::StartObservingVisual(Toolkit::Visual::Base& visual)
   visualImpl.AddEventObserver(*this);
 }
 
+void Control::Impl::ResourceReady()
+{
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
+  // Emit signal if all enabled visuals registered by the control are ready or there are no visuals.
+  if(IsResourceReady())
+  {
+    EmitResourceReadySignal();
+  }
+}
+
 // Called by a Visual when it's resource is ready
 void Control::Impl::ResourceReady(Visual::Base& object)
 {
@@ -913,41 +1049,38 @@ void Control::Impl::ResourceReady(Visual::Base& object)
 
   Actor self = mControlImpl.Self();
 
+  RegisteredVisualContainer::Iterator registeredIter;
+
   // A resource is ready, find resource in the registered visuals container and get its index
-  for(auto registeredIter = mVisuals.Begin(), end = mVisuals.End(); registeredIter != end; ++registeredIter)
+  if(!FindVisual(object, mVisuals, registeredIter))
   {
-    Internal::Visual::Base& registeredVisualImpl = Toolkit::GetImplementation((*registeredIter)->visual);
+    return;
+  }
 
-    if(&object == &registeredVisualImpl)
+  RegisteredVisualContainer::Iterator visualToRemoveIter;
+  // Find visual with the same index in the removal container
+  // Set if off stage as it's replacement is now ready.
+  // Remove if from removal list as now removed from stage.
+  // Set Pending flag on the ready visual to false as now ready.
+  if(FindVisual((*registeredIter)->index, mRemoveVisuals, visualToRemoveIter))
+  {
+    (*registeredIter)->pending = false;
+    if(!((*visualToRemoveIter)->overideReadyTransition))
     {
-      RegisteredVisualContainer::Iterator visualToRemoveIter;
-      // Find visual with the same index in the removal container
-      // Set if off stage as it's replacement is now ready.
-      // Remove if from removal list as now removed from stage.
-      // Set Pending flag on the ready visual to false as now ready.
-      if(FindVisual((*registeredIter)->index, mRemoveVisuals, visualToRemoveIter))
-      {
-        (*registeredIter)->pending = false;
-        Toolkit::GetImplementation((*visualToRemoveIter)->visual).SetOffScene(self);
-        mRemoveVisuals.Erase(visualToRemoveIter);
-      }
-      break;
+      Toolkit::GetImplementation((*visualToRemoveIter)->visual).SetOffScene(self);
     }
+
+    // Discard removed visual. It will be destroyed at next Idle time.
+    DiscardVisual(visualToRemoveIter, mRemoveVisuals);
   }
 
   // A visual is ready so control may need relayouting if staged
-  if(self.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
-  {
-    mControlImpl.RelayoutRequest();
-  }
+  RelayoutRequest(object);
 
-  // Emit signal if all enabled visuals registered by the control are ready.
-  if(IsResourceReady())
+  // Called by a Visual when it's resource is ready
+  if(((*registeredIter)->enabled))
   {
-    // Reset the flag
-    mNeedToEmitResourceReady = false;
-
-    EmitResourceReadySignal();
+    ResourceReady();
   }
 }
 
@@ -965,6 +1098,14 @@ void Control::Impl::NotifyVisualEvent(Visual::Base& object, Property::Index sign
   }
 }
 
+void Control::Impl::RelayoutRequest(Visual::Base& object)
+{
+  if(mControlImpl.Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
+  {
+    mControlImpl.RelayoutRequest();
+  }
+}
+
 bool Control::Impl::IsResourceReady() const
 {
   // Iterate through and check all the enabled visuals are ready
@@ -1088,6 +1229,15 @@ void Control::Impl::DoAction(Dali::Property::Index visualIndex, Dali::Property::
   }
 }
 
+void Control::Impl::DoActionExtension(Dali::Property::Index visualIndex, Dali::Property::Index actionId, Dali::Any attributes)
+{
+  RegisteredVisualContainer::Iterator iter;
+  if(FindVisual(visualIndex, mVisuals, iter))
+  {
+    Toolkit::GetImplementation((*iter)->visual).DoActionExtension(actionId, attributes);
+  }
+}
+
 void Control::Impl::AppendAccessibilityAttribute(const std::string& key, const std::string value)
 {
   Property::Value* checkedValue = mAccessibilityAttributes.Find(key);
@@ -1103,6 +1253,8 @@ void Control::Impl::AppendAccessibilityAttribute(const std::string& key, const s
 
 void Control::Impl::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
 {
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
   Toolkit::Control control = Toolkit::Control::DownCast(BaseHandle(object));
 
   if(control)
@@ -1288,45 +1440,30 @@ void Control::Impl::SetProperty(BaseObject* object, Property::Index index, const
         std::string name;
         if(value.Get(name))
         {
-          controlImpl.mImpl->mAccessibilityName    = name;
-          controlImpl.mImpl->mAccessibilityNameSet = true;
-        }
-        else
-        {
-          controlImpl.mImpl->mAccessibilityNameSet = false;
+          controlImpl.mImpl->mAccessibilityName = name;
         }
+        break;
       }
-      break;
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_DESCRIPTION:
       {
         std::string text;
         if(value.Get(text))
         {
-          controlImpl.mImpl->mAccessibilityDescription    = text;
-          controlImpl.mImpl->mAccessibilityDescriptionSet = true;
-        }
-        else
-        {
-          controlImpl.mImpl->mAccessibilityDescriptionSet = false;
+          controlImpl.mImpl->mAccessibilityDescription = text;
         }
+        break;
       }
-      break;
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_TRANSLATION_DOMAIN:
       {
         std::string text;
         if(value.Get(text))
         {
-          controlImpl.mImpl->mAccessibilityTranslationDomain    = text;
-          controlImpl.mImpl->mAccessibilityTranslationDomainSet = true;
-        }
-        else
-        {
-          controlImpl.mImpl->mAccessibilityTranslationDomainSet = false;
+          controlImpl.mImpl->mAccessibilityTranslationDomain = text;
         }
+        break;
       }
-      break;
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE:
       {
@@ -1335,23 +1472,18 @@ void Control::Impl::SetProperty(BaseObject* object, Property::Index index, const
         {
           controlImpl.mImpl->mAccessibilityRole = role;
         }
+        break;
       }
-      break;
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE:
       {
         bool highlightable;
         if(value.Get(highlightable))
         {
-          controlImpl.mImpl->mAccessibilityHighlightable    = highlightable;
-          controlImpl.mImpl->mAccessibilityHighlightableSet = true;
-        }
-        else
-        {
-          controlImpl.mImpl->mAccessibilityHighlightableSet = false;
+          controlImpl.mImpl->mAccessibilityHighlightable = highlightable;
         }
+        break;
       }
-      break;
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES:
       {
@@ -1362,12 +1494,72 @@ void Control::Impl::SetProperty(BaseObject* object, Property::Index index, const
         }
         break;
       }
+
+      case Toolkit::DevelControl::Property::DISPATCH_KEY_EVENTS:
+      {
+        bool dispatch;
+        if(value.Get(dispatch))
+        {
+          controlImpl.mImpl->mDispatchKeyEvents = dispatch;
+        }
+        break;
+      }
+
+      case Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN:
+      {
+        bool hidden;
+        if(value.Get(hidden))
+        {
+          controlImpl.mImpl->mAccessibilityHidden = hidden;
+
+          auto* accessible = controlImpl.GetAccessibleObject();
+          if(DALI_LIKELY(accessible))
+          {
+            auto* parent = dynamic_cast<Dali::Accessibility::ActorAccessible*>(accessible->GetParent());
+            if(parent)
+            {
+              parent->OnChildrenChanged();
+            }
+          }
+        }
+        break;
+      }
+      case Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID:
+      {
+        int focusId;
+        if(value.Get(focusId))
+        {
+          controlImpl.mImpl->mClockwiseFocusableActorId = focusId;
+        }
+        break;
+      }
+      case Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID:
+      {
+        int focusId;
+        if(value.Get(focusId))
+        {
+          controlImpl.mImpl->mCounterClockwiseFocusableActorId = focusId;
+        }
+        break;
+      }
+
+      case Toolkit::DevelControl::Property::AUTOMATION_ID:
+      {
+        std::string automationId;
+        if(value.Get(automationId))
+        {
+          controlImpl.mImpl->mAutomationId = automationId;
+        }
+        break;
+      }
     }
   }
 }
 
 Property::Value Control::Impl::GetProperty(BaseObject* object, Property::Index index)
 {
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
   Property::Value value;
 
   Toolkit::Control control = Toolkit::Control::DownCast(BaseHandle(object));
@@ -1477,28 +1669,19 @@ Property::Value Control::Impl::GetProperty(BaseObject* object, Property::Index i
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_NAME:
       {
-        if(controlImpl.mImpl->mAccessibilityNameSet)
-        {
-          value = controlImpl.mImpl->mAccessibilityName;
-        }
+        value = controlImpl.mImpl->mAccessibilityName;
         break;
       }
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_DESCRIPTION:
       {
-        if(controlImpl.mImpl->mAccessibilityDescriptionSet)
-        {
-          value = controlImpl.mImpl->mAccessibilityDescription;
-        }
+        value = controlImpl.mImpl->mAccessibilityDescription;
         break;
       }
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_TRANSLATION_DOMAIN:
       {
-        if(controlImpl.mImpl->mAccessibilityTranslationDomainSet)
-        {
-          value = controlImpl.mImpl->mAccessibilityTranslationDomain;
-        }
+        value = controlImpl.mImpl->mAccessibilityTranslationDomain;
         break;
       }
 
@@ -1510,10 +1693,7 @@ Property::Value Control::Impl::GetProperty(BaseObject* object, Property::Index i
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE:
       {
-        if(controlImpl.mImpl->mAccessibilityHighlightableSet)
-        {
-          value = controlImpl.mImpl->mAccessibilityHighlightable;
-        }
+        value = controlImpl.mImpl->mAccessibilityHighlightable;
         break;
       }
 
@@ -1522,6 +1702,36 @@ Property::Value Control::Impl::GetProperty(BaseObject* object, Property::Index i
         value = controlImpl.mImpl->mAccessibilityAttributes;
         break;
       }
+
+      case Toolkit::DevelControl::Property::DISPATCH_KEY_EVENTS:
+      {
+        value = controlImpl.mImpl->mDispatchKeyEvents;
+        break;
+      }
+
+      case Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN:
+      {
+        value = controlImpl.mImpl->mAccessibilityHidden;
+        break;
+      }
+
+      case Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID:
+      {
+        value = controlImpl.mImpl->mClockwiseFocusableActorId;
+        break;
+      }
+
+      case Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID:
+      {
+        value = controlImpl.mImpl->mCounterClockwiseFocusableActorId;
+        break;
+      }
+
+      case Toolkit::DevelControl::Property::AUTOMATION_ID:
+      {
+        value = controlImpl.mImpl->mAutomationId;
+        break;
+      }
     }
   }
 
@@ -1721,6 +1931,8 @@ void Control::Impl::RecreateChangedVisuals(Dictionary<Property::Map>& stateVisua
 
 void Control::Impl::ReplaceStateVisualsAndProperties(const StylePtr oldState, const StylePtr newState, const std::string& subState)
 {
+  DALI_ASSERT_ALWAYS(Stage::IsCoreThread() && "Core is not installed. Might call this API from worker thread?");
+
   // Collect all old visual names
   DictionaryKeys stateVisualsToRemove;
   if(oldState)
@@ -1858,17 +2070,25 @@ void Control::Impl::OnSceneDisconnection()
 
   // Visuals pending replacement can now be taken out of the removal list and set off scene
   // Iterate through all replacement visuals and add to a move queue then set off scene
-  for(auto removalIter = mRemoveVisuals.Begin(), end = mRemoveVisuals.End(); removalIter != end; removalIter++)
+
+  if(!mRemoveVisuals.Empty())
   {
-    Toolkit::GetImplementation((*removalIter)->visual).SetOffScene(self);
+    std::reverse(mRemoveVisuals.Begin(), mRemoveVisuals.End());
+
+    while(!mRemoveVisuals.Empty())
+    {
+      auto removalIter = mRemoveVisuals.End() - 1u;
+      Toolkit::GetImplementation((*removalIter)->visual).SetOffScene(self);
+
+      // Discard removed visual. It will be destroyed at next Idle time.
+      DiscardVisual(removalIter, mRemoveVisuals);
+    }
   }
 
   for(auto replacedIter = mVisuals.Begin(), end = mVisuals.End(); replacedIter != end; replacedIter++)
   {
     (*replacedIter)->pending = false;
   }
-
-  mRemoveVisuals.Clear();
 }
 
 void Control::Impl::SetMargin(Extents margin)
@@ -1945,122 +2165,54 @@ Dali::Property Control::Impl::GetVisualProperty(Dali::Property::Index index, Dal
   if(visual)
   {
     Internal::Visual::Base& visualImpl = Toolkit::GetImplementation(visual);
-    return visualImpl.GetPropertyObject(visualPropertyKey);
+    return visualImpl.GetPropertyObject(std::move(visualPropertyKey));
   }
 
   Handle handle;
   return Dali::Property(handle, Property::INVALID_INDEX);
 }
 
-void Control::Impl::MakeVisualTransition(Dali::Animation& animation, Dali::Toolkit::Control source, Dali::Property::Index visualIndex, AlphaFunction alphaFunction, TimePeriod timePeriod)
+void Control::Impl::CreateTransitions(std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& sourceProperties,
+                                      std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& destinationProperties,
+                                      Dali::Toolkit::Control                                              source,
+                                      Dali::Toolkit::Control                                              destination)
 {
-  Dali::Toolkit::Control sourceHandle      = Dali::Toolkit::Control::DownCast(source);
-  Property::Map          sourceMap         = sourceHandle.GetProperty<Property::Map>(visualIndex);
-  Dali::Toolkit::Control destinationHandle = Dali::Toolkit::Control::DownCast(mControlImpl.Self());
-  Property::Map          destinationMap    = destinationHandle.GetProperty<Property::Map>(visualIndex);
-
-  Vector4 mixColor(1.0f, 1.0f, 1.0f, 1.0f);
-  Vector4 cornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
-  float   borderlineWidth(0.0f);
-  Vector4 borderlineColor(0.0f, 0.0f, 0.0f, 1.0f);
-  float   borderlineOffset(0.0f);
-
-  if(!destinationMap.Empty())
+  // Retrieves background properties to be transitioned.
+  Dali::Property::Map backgroundSourcePropertyMap, backgroundDestinationPropertyMap;
+  mControlImpl.MakeVisualTransition(backgroundSourcePropertyMap, backgroundDestinationPropertyMap, source, destination, Toolkit::Control::Property::BACKGROUND);
+  if(backgroundSourcePropertyMap.Count() > 0)
   {
-    static auto findValueVector4 = [](const Property::Map& map, Property::Index index, const Vector4& defaultValue = Vector4()) -> Vector4 {
-      Property::Value* propertyValue = map.Find(index);
-      if(propertyValue)
-      {
-        return propertyValue->Get<Vector4>();
-      }
-      return defaultValue;
-    };
-
-    static auto findValueFloat = [](const Property::Map& map, Property::Index index, const float& defaultValue = 0.0f) -> float {
-      Property::Value* propertyValue = map.Find(index);
-      if(propertyValue)
-      {
-        return propertyValue->Get<float>();
-      }
-      return defaultValue;
-    };
-
-    mixColor         = findValueVector4(destinationMap, Dali::Toolkit::Visual::Property::MIX_COLOR, mixColor);
-    cornerRadius     = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, cornerRadius);
-    borderlineWidth  = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
-    borderlineColor  = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, borderlineColor);
-    borderlineOffset = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset);
-
-    if(sourceMap.Empty())
-    {
-      sourceMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-      sourceMap.Insert(Dali::Toolkit::Visual::Property::MIX_COLOR, Color::TRANSPARENT);
-      sourceMap.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, cornerRadius);
-      sourceMap.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
-      sourceMap.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, borderlineColor);
-      sourceMap.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset);
-    }
-
-    Vector4 sourceMixColor         = findValueVector4(sourceMap, Dali::Toolkit::Visual::Property::MIX_COLOR, mixColor);
-    Vector4 sourceCornerRadius     = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, cornerRadius);
-    float   sourceBorderlineWidth  = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth);
-    Vector4 sourceBorderlineColor  = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, borderlineColor);
-    float   sourceBorderlineOffset = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset);
-
-    std::vector<Dali::Property>                              properties;
-    std::vector<std::pair<Property::Value, Property::Value>> values;
-
-    if(Vector3(sourceMixColor) != Vector3(mixColor))
-    {
-      properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::Visual::Property::MIX_COLOR));
-      values.push_back(std::make_pair(Vector3(sourceMixColor), Vector3(mixColor)));
-    }
-
-    if(std::abs(sourceMixColor.a - mixColor.a) > Math::MACHINE_EPSILON_1)
-    {
-      properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::Visual::Property::OPACITY));
-      values.push_back(std::make_pair(sourceMixColor.a, mixColor.a));
-    }
-
-    if(sourceCornerRadius != cornerRadius)
-    {
-      properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS));
-      values.push_back(std::make_pair(sourceCornerRadius, cornerRadius));
-    }
+    sourceProperties.push_back(std::pair<Dali::Property::Index, Dali::Property::Map>(Toolkit::Control::Property::BACKGROUND, backgroundSourcePropertyMap));
+    destinationProperties.push_back(std::pair<Dali::Property::Index, Dali::Property::Map>(Toolkit::Control::Property::BACKGROUND, backgroundDestinationPropertyMap));
+  }
 
-    if(sourceBorderlineWidth != borderlineWidth)
-    {
-      properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH));
-      values.push_back(std::make_pair(sourceBorderlineWidth, borderlineWidth));
-    }
+  // Retrieves shadow properties to be transitioned.
+  Dali::Property::Map shadowSourcePropertyMap, shadowDestinationPropertyMap;
+  mControlImpl.MakeVisualTransition(shadowSourcePropertyMap, shadowDestinationPropertyMap, source, destination, Toolkit::DevelControl::Property::SHADOW);
+  if(shadowSourcePropertyMap.Count() > 0)
+  {
+    sourceProperties.push_back(std::pair<Dali::Property::Index, Dali::Property::Map>(Toolkit::DevelControl::Property::SHADOW, shadowSourcePropertyMap));
+    destinationProperties.push_back(std::pair<Dali::Property::Index, Dali::Property::Map>(Toolkit::DevelControl::Property::SHADOW, shadowDestinationPropertyMap));
+  }
 
-    if(sourceBorderlineColor != borderlineColor)
-    {
-      properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR));
-      values.push_back(std::make_pair(sourceBorderlineColor, borderlineColor));
-    }
+  // Retrieves transition from inherited class.
+  mControlImpl.OnCreateTransitions(sourceProperties, destinationProperties, source, destination);
+}
 
-    if(sourceBorderlineOffset != borderlineOffset)
+void Control::Impl::UpdateVisualProperties(const std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& properties)
+{
+  for(auto&& data : properties)
+  {
+    if(data.first == Toolkit::Control::Property::BACKGROUND)
     {
-      properties.push_back(GetVisualProperty(visualIndex, Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET));
-      values.push_back(std::make_pair(sourceBorderlineOffset, borderlineOffset));
+      DoAction(Toolkit::Control::Property::BACKGROUND, DevelVisual::Action::UPDATE_PROPERTY, data.second);
     }
-
-    for(uint32_t i = 0; i < properties.size(); ++i)
+    else if(data.first == Toolkit::DevelControl::Property::SHADOW)
     {
-      if(timePeriod.delaySeconds > 0.0f)
-      {
-        Dali::KeyFrames initialKeyframes = Dali::KeyFrames::New();
-        initialKeyframes.Add(0.0f, values[i].first);
-        initialKeyframes.Add(1.0f, values[i].first);
-        animation.AnimateBetween(properties[i], initialKeyframes, TimePeriod(timePeriod.delaySeconds));
-      }
-      Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-      keyframes.Add(0.0f, values[i].first);
-      keyframes.Add(1.0f, values[i].second);
-      animation.AnimateBetween(properties[i], keyframes, alphaFunction, timePeriod);
+      DoAction(Toolkit::DevelControl::Property::SHADOW, DevelVisual::Action::UPDATE_PROPERTY, data.second);
     }
   }
+  mControlImpl.OnUpdateVisualProperties(properties);
 }
 
 void Control::Impl::EmitResourceReadySignal()
@@ -2071,71 +2223,81 @@ void Control::Impl::EmitResourceReadySignal()
     mIsEmittingResourceReadySignal = true;
 
     // If the signal handler changes visual, it may become ready during this call & therefore this method will
-    // get called again recursively. If so, mNeedToEmitResourceReady is set below, and we act on it after that secondary
+    // get called again recursively. If so, mIdleCallbackRegistered is set below, and we act on it after that secondary
     // invocation has completed by notifying in an Idle callback to prevent further recursion.
     Dali::Toolkit::Control handle(mControlImpl.GetOwner());
     mResourceReadySignal.Emit(handle);
 
-    if(mNeedToEmitResourceReady)
+    mIsEmittingResourceReadySignal = false;
+  }
+  else
+  {
+    if(!mIdleCallbackRegistered)
     {
+      mIdleCallbackRegistered = true;
+
       // Add idler to emit the signal again
       if(!mIdleCallback)
       {
         // The callback manager takes the ownership of the callback object.
         mIdleCallback = MakeCallback(this, &Control::Impl::OnIdleCallback);
-        Adaptor::Get().AddIdle(mIdleCallback, false);
+        if(DALI_UNLIKELY(!Adaptor::Get().AddIdle(mIdleCallback, true)))
+        {
+          DALI_LOG_ERROR("Fail to add idle callback for control resource ready. Skip this callback.\n");
+          mIdleCallback           = nullptr;
+          mIdleCallbackRegistered = false;
+        }
       }
     }
-
-    mIsEmittingResourceReadySignal = false;
-  }
-  else
-  {
-    mNeedToEmitResourceReady = true;
   }
 }
 
-void Control::Impl::OnIdleCallback()
+bool Control::Impl::OnIdleCallback()
 {
-  if(mNeedToEmitResourceReady)
+  // Reset the flag
+  mIdleCallbackRegistered = false;
+
+  // A visual is ready so control may need relayouting if staged
+  if(mControlImpl.Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
   {
-    // Reset the flag
-    mNeedToEmitResourceReady = false;
+    mControlImpl.RelayoutRequest();
+  }
 
-    // A visual is ready so control may need relayouting if staged
-    if(mControlImpl.Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
-    {
-      mControlImpl.RelayoutRequest();
-    }
+  EmitResourceReadySignal();
 
-    EmitResourceReadySignal();
+  if(!mIdleCallbackRegistered)
+  {
+    // Set the pointer to null as the callback manager deletes the callback after execute it.
+    mIdleCallback = nullptr;
   }
 
-  // Set the pointer to null as the callback manager deletes the callback after execute it.
-  mIdleCallback = nullptr;
+  // Repeat idle if mIdleCallbackRegistered become true one more time.
+  return mIdleCallbackRegistered;
 }
 
-Dali::Accessibility::Accessible* Control::Impl::GetAccessibilityObject()
+Toolkit::DevelControl::ControlAccessible* Control::Impl::GetAccessibleObject()
 {
-  if(!mAccessibilityObject)
+  if(mAccessibleCreatable && !mAccessibleObject)
   {
-    mAccessibilityObject = mAccessibilityConstructor(mControlImpl.Self());
+    mAccessibleObject.reset(mControlImpl.CreateAccessibleObject());
   }
-  return mAccessibilityObject.get();
+
+  return mAccessibleObject.get();
 }
 
-Dali::Accessibility::Accessible* Control::Impl::GetAccessibilityObject(Dali::Actor actor)
+bool Control::Impl::IsAccessibleCreated() const
 {
-  if(actor)
-  {
-    auto control = Dali::Toolkit::Control::DownCast(actor);
-    if(control)
-    {
-      auto controlImpl = static_cast<Internal::Control*>(&control.GetImplementation());
-      return controlImpl->mImpl->GetAccessibilityObject();
-    }
-  }
-  return nullptr;
+  return !!mAccessibleObject;
+}
+
+void Control::Impl::EnableCreateAccessible(bool enable)
+{
+  mAccessibleCreatable = enable;
+}
+
+bool Control::Impl::IsCreateAccessibleEnabled() const
+{
+  return mAccessibleCreatable;
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h
index 73b12e0..b2109ee 100644
--- a/dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/dali-toolkit/internal/controls/control/control-data-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_DATA_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,9 @@
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali/devel-api/common/owner-container.h>
 #include <dali/integration-api/debug.h>
+#include <map>
 #include <memory>
+#include <set>
 
 namespace Dali
 {
@@ -52,12 +54,14 @@ struct RegisteredVisual
   Toolkit::Visual::Base visual;
   bool                  enabled : 1;
   bool                  pending : 1;
+  bool                  overideReadyTransition : 1;
 
   RegisteredVisual(Property::Index aIndex, Toolkit::Visual::Base& aVisual, bool aEnabled, bool aPendingReplacement)
   : index(aIndex),
     visual(aVisual),
     enabled(aEnabled),
-    pending(aPendingReplacement)
+    pending(aPendingReplacement),
+    overideReadyTransition(false)
   {
   }
 };
@@ -69,7 +73,7 @@ typedef Dali::OwnerContainer<RegisteredVisual*> RegisteredVisualContainer;
  */
 class Control::Impl : public ConnectionTracker, public Visual::EventObserver
 {
-  friend class Toolkit::DevelControl::AccessibleImpl;
+  friend class Toolkit::DevelControl::ControlAccessible;
 
 public:
   /**
@@ -124,6 +128,11 @@ public:
   void LongPressDetected(Actor actor, const LongPressGesture& longPress);
 
   /**
+   * @brief Called when resources of control are ready.
+   */
+  void ResourceReady();
+
+  /**
    * @brief Called when a resource is ready.
    * @param[in] object The visual whose resources are ready
    * @note Overriding method in Visual::EventObserver.
@@ -139,6 +148,12 @@ public:
   void NotifyVisualEvent(Visual::Base& object, Property::Index signalId) override;
 
   /**
+   * @brief Called when the visual needs relayout request.
+   * @param[in] object The visual who requests relayout
+   */
+  void RelayoutRequest(Visual::Base& object) override;
+
+  /**
    * @copydoc Dali::Toolkit::DevelControl::RegisterVisual()
    */
   void RegisterVisual(Property::Index index, Toolkit::Visual::Base& visual);
@@ -179,6 +194,15 @@ public:
   bool IsVisualEnabled(Property::Index index) const;
 
   /**
+   * @brief Sets the given visual to be ready transition
+   *
+   * @param[in] control The control
+   * @param[in] visual The visual to ready transition overriden
+   * @param[in] enable flag to set enabled or disabled.
+   */
+  void EnableReadyTransitionOverriden(Toolkit::Visual::Base& visual, bool enable);
+
+  /**
    * @brief Stops observing the given visual.
    * @param[in] visual The visual to stop observing
    */
@@ -216,6 +240,11 @@ public:
   void DoAction(Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes);
 
   /**
+   * @copydoc Dali::Toolkit::DevelControl::DoActionExtension()
+   */
+  void DoActionExtension(Dali::Property::Index visualIndex, Dali::Property::Index actionId, Dali::Any attributes);
+
+  /**
    * @brief Function used to set control properties.
    * @param[in] object The object whose property to set
    * @param[in] index The index of the property to set
@@ -393,32 +422,53 @@ public:
   Dali::Property GetVisualProperty(Dali::Property::Index index, Dali::Property::Key visualPropertyKey);
 
   /**
-   * @brief Make visual transition from source control to this control about specific Property::Index
-   * If both of source and this control have Property::Index property, than create animation between them.
+   * @brief Retrieves source and destination visual properties for the Transition of this Control.
+   * The properties of this Control will be transitioned from the propeties of source Control to that of destination control.
+   * If a property value is different between source and destination Control,
+   * the property information of each Control will be included in sourceProperties and destinationProperties.
+   *
+   * @param[out] sourceProperties Source property list to be applied on this Control.
+   * @param[out] destinationProperties Destination property list to be applied on this Control.
+   * @param[in] source Source control of the animation.
+   * @param[in] destination Destination control of the animation.
    *
-   * @param[in] animation Return animation from source to this control.
-   * @param[in] source Source control to be used property animation.
-   * @param[in] visualIndex Property::Index to make animation.
-   * @param[in] alphaFunction alpha function of the animation.
-   * @param[in] timePeriod time period of the animation.
+   * @note This method do not handle Actor properties.
+   * And the size and order of the sourceProperties and destinationProperties must be synchronized.
+   *
+   * This method triggers Control::OnCreateTransition().
    */
-  void MakeVisualTransition(Dali::Animation& animation, Dali::Toolkit::Control source, Dali::Property::Index visualIndex, AlphaFunction alphaFunction, TimePeriod timePeriod);
+  void CreateTransitions(std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& sourceProperties,
+                         std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& destinationProperties,
+                         Dali::Toolkit::Control                                              source,
+                         Dali::Toolkit::Control                                              destination);
 
   /**
-   * @brief Gets the current control's accessible object.
+   * @brief Update visual properties.
+   * @param[in] properties Property list to be used to update visual properties of this Control.
    *
-   * @return The handle to Accessible object
+   * @note This method triggers Control::OnUpdateVisualProperties().
    */
-  Dali::Accessibility::Accessible* GetAccessibilityObject();
+  void UpdateVisualProperties(const std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& properties);
 
   /**
-   * @brief Gets Accessible object handle.
-   *
-   * The method acquires Accessible handle from Actor object
-   * @param  actor Actor object
-   * @return The handle to Accessible object
+   * @copydoc Dali::Toolkit::Internal::Control::GetAccessibleObject()
+   */
+  Toolkit::DevelControl::ControlAccessible* GetAccessibleObject();
+
+  /**
+   * @copydoc Dali::Toolkit::DevelControl::IsAccessibleCreated()
    */
-  static Dali::Accessibility::Accessible* GetAccessibilityObject(Dali::Actor actor);
+  bool IsAccessibleCreated() const;
+
+  /**
+   * @copydoc Dali::Toolkit::DevelControl::EnableCreateAccessible()
+   */
+  void EnableCreateAccessible(bool enable);
+
+  /**
+   * @copydoc Dali::Toolkit::DevelControl::IsCreateAccessibleEnabled()
+   */
+  bool IsCreateAccessibleEnabled() const;
 
 private:
   /**
@@ -465,8 +515,10 @@ private:
 
   /**
    * @brief Callbacks called on idle.
+   *
+   * @return True if we need to call this idle callback one more time.
    */
-  void OnIdleCallback();
+  bool OnIdleCallback();
 
   /**
    * @brief Checks highlighted object geometry if it is showing or not
@@ -479,20 +531,41 @@ private:
   void RegisterAccessibilityPositionPropertyNotification();
 
   /**
-   * @brief Remove property notification added by RegisterPropertyNotification
+   * @brief Remove property notification added by RegisterAccessibilityPositionPropertyNotification
    */
   void UnregisterAccessibilityPositionPropertyNotification();
 
+  /**
+   * @brief Register PropertySet signal to check highlighted object name and description
+   */
+  void RegisterAccessibilityPropertySetSignal();
+
+  /**
+   * @brief Remove PropertySet signal added by RegisterAccessibilityPropertySetSignal
+   */
+  void UnregisterAccessibilityPropertySetSignal();
+
+  /**
+   * @brief Signal callback of PropertySet when this object is become highlighted, so RegisterAccessibilityPropertySetSignal called.
+   *
+   * @param[in] handle Handle of the control.
+   * @param[in] index The index of property.
+   * @param[in] value The value of property.
+   */
+  void OnAccessibilityPropertySet(Dali::Handle& handle, Dali::Property::Index index, const Dali::Property::Value& value);
+
 public:
   Control&            mControlImpl;
   DevelControl::State mState;
   std::string         mSubStateName;
   Property::Map       mAccessibilityAttributes;
 
-  int mLeftFocusableActorId;  ///< Actor ID of Left focusable control.
-  int mRightFocusableActorId; ///< Actor ID of Right focusable control.
-  int mUpFocusableActorId;    ///< Actor ID of Up focusable control.
-  int mDownFocusableActorId;  ///< Actor ID of Down focusable control.
+  int mLeftFocusableActorId;             ///< Actor ID of Left focusable control.
+  int mRightFocusableActorId;            ///< Actor ID of Right focusable control.
+  int mUpFocusableActorId;               ///< Actor ID of Up focusable control.
+  int mDownFocusableActorId;             ///< Actor ID of Down focusable control.
+  int mClockwiseFocusableActorId;        ///< Actor ID of Clockwise focusable control.
+  int mCounterClockwiseFocusableActorId; ///< Actor ID of Counter clockwise focusable control.
 
   RegisteredVisualContainer                 mVisuals; ///< Stores visuals needed by the control, non trivial type so std::vector used.
   std::string                               mStyleName;
@@ -521,18 +594,16 @@ public:
   std::string mAccessibilityName;
   std::string mAccessibilityDescription;
   std::string mAccessibilityTranslationDomain;
-  bool        mAccessibilityNameSet              = false;
-  bool        mAccessibilityDescriptionSet       = false;
-  bool        mAccessibilityTranslationDomainSet = false;
+  std::string mAutomationId;
 
-  bool mAccessibilityHighlightable    = false;
-  bool mAccessibilityHighlightableSet = false;
+  bool mAccessibilityHighlightable = false;
+  bool mAccessibilityHidden        = false;
+  bool mAccessibleCreatable        = true;
 
   Dali::Accessibility::Role mAccessibilityRole = Dali::Accessibility::Role::UNKNOWN;
 
-  std::vector<std::vector<Accessibility::Address>>                       mAccessibilityRelations;
-  std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Actor)> mAccessibilityConstructor;
-  std::unique_ptr<Dali::Accessibility::Accessible>                       mAccessibilityObject;
+  std::map<Dali::Accessibility::RelationType, std::set<Accessibility::Accessible*>> mAccessibilityRelations;
+  std::unique_ptr<Toolkit::DevelControl::ControlAccessible>                         mAccessibleObject;
 
   // Gesture Detection
   PinchGestureDetector     mPinchGestureDetector;
@@ -550,7 +621,8 @@ public:
   bool             mIsKeyboardNavigationSupported : 1;    ///< Stores whether keyboard navigation is supported by the control.
   bool             mIsKeyboardFocusGroup : 1;             ///< Stores whether the control is a focus group.
   bool             mIsEmittingResourceReadySignal : 1;    ///< True during ResourceReady().
-  bool             mNeedToEmitResourceReady : 1;          ///< True if need to emit the resource ready signal again.
+  bool             mIdleCallbackRegistered : 1;           ///< True if need to emit the resource ready signal again.
+  bool             mDispatchKeyEvents : 1;                ///< Whether the actor emits key event signals
 
   RegisteredVisualContainer mRemoveVisuals; ///< List of visuals that are being replaced by another visual once ready
 
@@ -577,10 +649,15 @@ public:
   static const PropertyRegistration PROPERTY_20;
   static const PropertyRegistration PROPERTY_21;
   static const PropertyRegistration PROPERTY_22;
+  static const PropertyRegistration PROPERTY_23;
+  static const PropertyRegistration PROPERTY_24;
+  static const PropertyRegistration PROPERTY_25;
+  static const PropertyRegistration PROPERTY_26;
 
 private:
   // Accessibility - notification for highlighted object to check if it is showing.
   bool                                        mIsAccessibilityPositionPropertyNotificationSet{false};
+  bool                                        mIsAccessibilityPropertySetSignalRegistered{false};
   Dali::PropertyNotification                  mAccessibilityPositionNotification;
   Dali::Accessibility::ScreenRelativeMoveType mAccessibilityLastScreenRelativeMoveType{Accessibility::ScreenRelativeMoveType::OUTSIDE};
 };
diff --git a/dali-toolkit/internal/controls/control/control-renderers.cpp b/dali-toolkit/internal/controls/control/control-renderers.cpp
index a947599..b499aaa 100644
--- a/dali-toolkit/internal/controls/control/control-renderers.cpp
+++ b/dali-toolkit/internal/controls/control/control-renderers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,11 +30,11 @@ Geometry CreateGridGeometry(Uint16Pair gridSize)
 
   // Create vertices
   Vector<Vector2> vertices;
-  vertices.Reserve((gridWidth + 1) * (gridHeight + 1));
+  vertices.Reserve((gridWidth + 1u) * (gridHeight + 1u));
 
-  for(int y = 0; y < gridHeight + 1; ++y)
+  for(uint16_t y = 0u; y < gridHeight + 1u; ++y)
   {
-    for(int x = 0; x < gridWidth + 1; ++x)
+    for(uint16_t x = 0u; x < gridWidth + 1u; ++x)
     {
       vertices.PushBack(Vector2((float)x / gridWidth - 0.5f, (float)y / gridHeight - 0.5f));
     }
@@ -42,12 +42,12 @@ Geometry CreateGridGeometry(Uint16Pair gridSize)
 
   // Create indices
   Vector<unsigned short> indices;
-  indices.Reserve((gridWidth + 2) * gridHeight * 2 - 2);
+  indices.Reserve((gridWidth + 2u) * gridHeight * 2u - 2u);
 
-  for(unsigned int row = 0u; row < gridHeight; ++row)
+  for(uint16_t row = 0u; row < gridHeight; ++row)
   {
-    unsigned int rowStartIndex     = row * (gridWidth + 1u);
-    unsigned int nextRowStartIndex = rowStartIndex + gridWidth + 1u;
+    uint32_t rowStartIndex     = row * (gridWidth + 1u);
+    uint32_t nextRowStartIndex = rowStartIndex + gridWidth + 1u;
 
     if(row != 0u) // degenerate index on non-first row
     {
diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
index 88fa83f..5f132c7 100644
--- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
+++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
@@ -234,10 +234,7 @@ void EffectsView::OnInitialize()
   mChildrenRoot.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   self.Add(mChildrenRoot);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 void EffectsView::OnSizeSet(const Vector3& targetSize)
diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
index a3c092d..51b9be2 100644
--- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
+++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ namespace
 // currently not called from code so compiler will optimize these away, kept here for future debugging
 
 #define FLEX_CONTAINER_TAG "DALI Toolkit::FlexContainer "
-#define FC_LOG(fmt, args, ...) Debug::LogMessage(Debug::DebugInfo, FLEX_CONTAINER_TAG fmt, ##args)
+#define FC_LOG(fmt, args, ...) Debug::LogMessageWithFunctionLine(Debug::INFO, FLEX_CONTAINER_TAG fmt, ##args)
 // #define FLEX_CONTAINER_DEBUG 1
 
 #if defined(FLEX_CONTAINER_DEBUG)
@@ -835,10 +835,7 @@ void FlexContainer::OnInitialize()
   self.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   SetAsKeyboardFocusGroup(true);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
index 29d36b1..31b7c61 100644
--- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
@@ -295,10 +295,7 @@ void GaussianBlurView::OnInitialize()
   mInternalRoot.Add(mVertBlurActor);
   mInternalRoot.Add(mRenderDownsampledCamera);
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 void GaussianBlurView::OnSizeSet(const Vector3& targetSize)
diff --git a/dali-toolkit/internal/controls/gl-view/drawable-view-impl.cpp b/dali-toolkit/internal/controls/gl-view/drawable-view-impl.cpp
new file mode 100644
index 0000000..01b84f7
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/drawable-view-impl.cpp
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/controls/gl-view/drawable-view-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/lifecycle-controller.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/rendering/renderer.h>
+#include <dali/public-api/signals/render-callback.h>
+
+namespace Dali::Toolkit::Internal
+{
+Dali::Toolkit::GlView DrawableView::New(GlView::BackendMode backendMode)
+{
+  auto*                 impl   = new DrawableView(backendMode);
+  Dali::Toolkit::GlView handle = Dali::Toolkit::GlView(*impl);
+  impl->Initialize();
+  return handle;
+}
+
+DrawableView::DrawableView(GlView::BackendMode backendMode)
+: Dali::Toolkit::Internal::GlViewImpl(backendMode),
+  mRenderingMode(Toolkit::GlView::RenderingMode::CONTINUOUS),
+  mDepth(false),
+  mStencil(false),
+  mMSAA(0)
+{
+  // Create NativeRenderer
+  Dali::Internal::NativeRendererCreateInfo createInfo;
+  createInfo.maxOffscreenBuffers = 2u;
+  createInfo.threadEnabled       = (backendMode == GlView::BackendMode::DIRECT_RENDERING_THREADED);
+  createInfo.directExecution     = (backendMode == GlView::BackendMode::UNSAFE_DIRECT_RENDERING);
+  createInfo.presentationMode    = Dali::Internal::NativeRendererCreateInfo::PresentationMode::FIFO;
+
+  mRenderCallback = RenderCallback::New(this, &DrawableView::OnRenderCallback, createInfo.directExecution ? RenderCallback::ExecutionMode::UNSAFE : RenderCallback::ExecutionMode::ISOLATED);
+
+  mNativeRenderer = std::make_unique<Dali::Internal::DrawableViewNativeRenderer>(createInfo);
+}
+
+DrawableView::~DrawableView() = default;
+
+void DrawableView::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+{
+  mNativeRenderer->RegisterGlCallbacks(initCallback, renderFrameCallback, terminateCallback);
+}
+
+void DrawableView::SetResizeCallback(CallbackBase* resizeCallback)
+{
+  mOnResizeCallback.reset(resizeCallback);
+}
+
+bool DrawableView::SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::Toolkit::GlView::GraphicsApiVersion version)
+{
+  // Currently, the settings are not relevant for the DirectRendering feature as all the
+  // setup is inherited from DALi graphics backend.
+  return true;
+}
+
+void DrawableView::SetRenderingMode(Dali::Toolkit::GlView::RenderingMode mode)
+{
+  mRenderingMode    = mode;
+  Renderer renderer = Self().GetRendererAt(0);
+
+  if(mRenderingMode == Dali::Toolkit::GlView::RenderingMode::ON_DEMAND)
+  {
+    renderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED);
+  }
+  else
+  {
+    renderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY);
+  }
+}
+
+Dali::Toolkit::GlView::RenderingMode DrawableView::GetRenderingMode() const
+{
+  return mRenderingMode;
+}
+
+void DrawableView::RenderOnce()
+{
+  // Ignored.
+  // TODO: without rendering on the separate thread the RenderOnce won't
+  // work as expected. Potential implementation of threading may enable that
+  // feature.
+}
+
+void DrawableView::BindTextureResources(std::vector<Dali::Texture> textures)
+{
+  mRenderCallback->BindTextureResources(std::move(textures));
+}
+
+void DrawableView::OnInitialize()
+{
+  AddRenderer();
+
+  // Adding VisibilityChange Signal.
+  Actor self = Self();
+  Dali::DevelActor::VisibilityChangedSignal(self).Connect(this, &DrawableView::OnControlVisibilityChanged);
+}
+
+void DrawableView::OnSizeSet(const Vector3& targetSize)
+{
+  Control::OnSizeSet(targetSize);
+
+  mSurfaceSize = targetSize;
+
+  // If the callbacks are set then schedule execution of resize callback
+  if(mRenderCallback && mNativeRenderer)
+  {
+    mNativeRenderer->Resize(uint32_t(targetSize.width), uint32_t(targetSize.height));
+    mSurfaceResized = true;
+  }
+}
+
+void DrawableView::OnControlVisibilityChanged(Dali::Actor actor, bool visible, Dali::DevelActor::VisibilityChange::Type type)
+{
+  // Ignored due to lack dedicated rendering thread
+}
+
+void DrawableView::OnWindowVisibilityChanged(Window window, bool visible)
+{
+  // Ignored due to lack dedicated rendering thread
+}
+
+void DrawableView::OnSceneConnection(int depth)
+{
+  Control::OnSceneConnection(depth);
+
+  Actor  self   = Self();
+  Window window = DevelWindow::Get(self);
+
+  // Despite OnWindowVisibilityChanged() is ignored it still should follow
+  // the designed behaviour of GlView so signal is connected regardless
+  if(window)
+  {
+    DevelWindow::VisibilityChangedSignal(window).Connect(this, &DrawableView::OnWindowVisibilityChanged);
+  }
+}
+
+void DrawableView::OnSceneDisconnection()
+{
+  Control::OnSceneDisconnection();
+
+  mNativeRenderer->Terminate();
+}
+
+void DrawableView::AddRenderer()
+{
+  Actor    self     = Self();
+  Renderer renderer = Renderer::New(*mRenderCallback);
+  self.AddRenderer(renderer);
+}
+
+bool DrawableView::OnRenderCallback(const RenderCallbackInput& renderCallbackInput)
+{
+  if(mNativeRenderer)
+  {
+    mNativeRenderer->PushRenderCallbackInputData(renderCallbackInput);
+  }
+
+  // Init state
+  if(mCurrentViewState == ViewState::INIT)
+  {
+    mNativeRenderer->InvokeGlInitCallback(renderCallbackInput);
+    mCurrentViewState = ViewState::RENDER;
+  }
+
+  if(mSurfaceResized)
+  {
+    mNativeRenderer->Resize(uint32_t(mSurfaceSize.width), uint32_t(mSurfaceSize.height));
+    mSurfaceResized = false;
+  }
+
+  if(mCurrentViewState == ViewState::RENDER)
+  {
+    // The mSurfaceResized is set by another thread so atomic check must be provided
+    bool expected{true};
+    if(mSurfaceResized.compare_exchange_weak(expected, false, std::memory_order_release, std::memory_order_relaxed) && mOnResizeCallback)
+    {
+      CallbackBase::Execute(*mOnResizeCallback, static_cast<int>(mSurfaceSize.x), static_cast<int>(mSurfaceSize.y));
+    }
+
+    mNativeRenderer->InvokeGlRenderCallback(renderCallbackInput);
+  }
+
+  // The terminate callback isn't easy to implement for DR. The NativeImage backend
+  // calls it when the GlView is being destroyed. For DrawableView it means that
+  // the RenderCallback won't be executed (as it is a part of graphics pipeline).
+  // We don't have currently have any way to know whether the View will be destroyed and
+  // to execute last native draw command in the pipeline.
+  //
+  // else if( mCurrentViewState == ViewState::TERMINATE )
+  // {
+  //    CallbackBase::Execute(*mOnTerminateCallback);
+  // }
+
+  return true;
+}
+
+} // namespace Dali::Toolkit::Internal
diff --git a/dali-toolkit/internal/controls/gl-view/drawable-view-impl.h b/dali-toolkit/internal/controls/gl-view/drawable-view-impl.h
new file mode 100644
index 0000000..57611cc
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/drawable-view-impl.h
@@ -0,0 +1,178 @@
+#ifndef DALI_TOOLKIT_INTERNAL_DRAWABLE_VIEW_H
+#define DALI_TOOLKIT_INTERNAL_DRAWABLE_VIEW_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/shader.h>
+#include <dali/public-api/signals/render-callback.h>
+#include "gl-view-interface-impl.h"
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/gl-view/drawable-view-native-renderer.h>
+#include <dali-toolkit/internal/controls/gl-view/gl-view-interface-impl.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
+
+namespace Dali::Toolkit
+{
+class GlView;
+
+namespace Internal
+{
+class DrawableView : public Dali::Toolkit::Internal::GlViewImpl
+{
+protected:
+  virtual ~DrawableView();
+
+public:
+  /**
+   * @brief Creates GlView interface object using DrawableView implementation
+   *
+   * @param[in] backendMode Backend mode to be used. Only DIRECT_RENDERING and DIRECT_RENDERING_THREADED
+   *                        are accepted.
+   * @return Valid GlView object or nullptr on error
+   */
+  static Dali::Toolkit::GlView New(GlView::BackendMode backendMode);
+
+  /**
+   * @brief Constructor creates GlView interface object using DrawableView implementation
+   *
+   * @param[in] backendMode Backend mode to be used. Only DIRECT_RENDERING and DIRECT_RENDERING_THREADED
+   *                        are accepted.
+   */
+  explicit DrawableView(GlView::BackendMode backendMode);
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::RegisterGlCallbacks()
+   */
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetResizeCallback()
+   */
+  void SetResizeCallback(CallbackBase* resizeCallback) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetGraphicsConfig()
+   */
+  bool SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::Toolkit::GlView::GraphicsApiVersion version) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetRenderingMode()
+   */
+  void SetRenderingMode(Dali::Toolkit::GlView::RenderingMode mode) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::GetRenderingMode()
+   */
+  Dali::Toolkit::GlView::RenderingMode GetRenderingMode() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::RenderOnce()
+   */
+  void RenderOnce() override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::BindTextureResources()
+   */
+  void BindTextureResources(std::vector<Dali::Texture> textures) override;
+
+private: // From Control
+  /**
+   * @copydoc Toolkit::Control::OnInitialize()
+   */
+  virtual void OnInitialize() override;
+
+  /**
+   * @copydoc Toolkit::Control::OnSceneConnection()
+   */
+  void OnSceneConnection(int depth) override;
+
+  /**
+   * @copydoc Toolkit::Control::OnSceneDisconnection()
+   */
+  void OnSceneDisconnection() override;
+
+  /**
+   * @copydoc Toolkit::Control::OnSizeSet()
+   */
+  void OnSizeSet(const Vector3& targetSize) override;
+
+private:
+  // Undefined copy constructor and assignment operators
+  DrawableView(const DrawableView& GlView);
+  DrawableView& operator=(const DrawableView& GlView);
+
+  /**
+   * Callback when the visibility of the GlView is changed
+   */
+  void OnControlVisibilityChanged(Dali::Actor actor, bool visible, Dali::DevelActor::VisibilityChange::Type type);
+
+  /**
+   * Callback when the visibility of the window is changed
+   */
+  void OnWindowVisibilityChanged(Dali::Window window, bool visible);
+
+  /**
+   * Adds renderer to Actor.
+   */
+  void AddRenderer();
+
+private:
+  bool OnRenderCallback(const RenderCallbackInput& renderCallbackInput);
+
+private:
+  Dali::Toolkit::GlView::RenderingMode mRenderingMode;
+
+  bool mDepth;
+  bool mStencil;
+  int  mMSAA;
+
+  std::unique_ptr<RenderCallback> mRenderCallback;
+
+  /*
+   * Used within RenderCallback to handle the current render state
+   */
+  enum class ViewState
+  {
+    INIT,
+    RENDER,
+    TERMINATE
+  };
+
+  ViewState mCurrentViewState{ViewState::INIT}; ///< state within RenderCallback
+
+  std::unique_ptr<CallbackBase> mOnResizeCallback; ///< Resize callback called when surface size changes
+
+  std::atomic_bool mSurfaceResized{false}; ///< Flag to invoke surface resize callback
+
+  Size mSurfaceSize{}; ///< Surface size
+
+  std::unique_ptr<Dali::Internal::DrawableViewNativeRenderer> mNativeRenderer; ///< Pointer to the native renderer
+};
+
+} // namespace Internal
+
+} // namespace Dali::Toolkit
+
+#endif // DALI_TOOLKIT_INTERNAL_DRAWABLE_VIEW_H
diff --git a/dali-toolkit/internal/controls/gl-view/drawable-view-native-renderer.cpp b/dali-toolkit/internal/controls/gl-view/drawable-view-native-renderer.cpp
new file mode 100644
index 0000000..7e8c15d
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/drawable-view-native-renderer.cpp
@@ -0,0 +1,823 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "drawable-view-native-renderer.h"
+#include <dali/public-api/signals/render-callback.h>
+#include <atomic>
+#include <deque>
+#include <mutex>
+#include <thread>
+#include <vector>
+
+// GLES3+ is required for this to work!
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES3/gl3.h>
+
+#include <unistd.h>
+#include <any>
+
+#define GL(x)                                                   \
+  {                                                             \
+    glGetError();                                               \
+    {                                                           \
+      x;                                                        \
+    };                                                          \
+    auto err = glGetError();                                    \
+    if(err)                                                     \
+    {                                                           \
+      printf("%p:%d: ERROR: 0x%X\n", this, __LINE__, int(err)); \
+    }                                                           \
+  }
+
+namespace
+{
+/**
+ * Vertices of quad to display when using offscreen rendering
+ */
+// clang-format off
+constexpr float QUAD_VERTS[] = {
+  1.0f,  1.0f,
+  1.0f, -1.0f,
+  -1.0f, -1.0f,
+  -1.0f,  1.0f,
+};
+
+/**
+ * Indices of quad for offscreen rendering
+ */
+constexpr unsigned short QUAD_INDICES[] = {
+  0, 1, 2,
+  3, 0, 2
+};
+
+/**
+ * UV coords of quad for offscreen rendering
+ */
+constexpr float QUAD_UV[] = {
+  1.0f, 1.0f,   // top right
+  1.0f, 0.0f,   // bottom right
+  0.0f, 0.0f,   // bottom left
+  0.0f, 1.0f    // top left
+};
+// clang-format on
+} // namespace
+
+namespace Dali::Internal
+{
+struct DrawableViewNativeRenderer::Impl
+{
+  /**
+   * This structure associates framebuffer with texture and fence object
+   */
+  struct FrameBufferTexture
+  {
+    uint32_t textureId{0u};
+    uint32_t framebufferId{0u};
+    GLsync   fence{nullptr};
+  };
+
+  // Queues management
+  bool DequeueTextureDrawBuffer(uint32_t& outIndex)
+  {
+    std::scoped_lock<std::recursive_mutex> lock(mTextureQueueMutex);
+    if(mTextureDrawQueue.empty())
+    {
+      // TODO: probably add textures if necessary
+      return false;
+    }
+
+    auto retval = mTextureDrawQueue.front();
+    mTextureDrawQueue.pop_front();
+    outIndex = retval;
+    return true;
+  }
+
+  /**
+   * Enqueues framebuffer for the Read queue to be used by
+   * the CONSUMER.
+   */
+  void EnqueueTextureReadBuffer(uint32_t fbId)
+  {
+    // push ready texture to front of 'read' queue
+    std::scoped_lock<std::recursive_mutex> lock(mTextureQueueMutex);
+
+    auto& fb = mFramebufferTexture[fbId];
+
+    // Check state of fence whether the texture can be passed to the CONSUMER
+    if(fb.fence)
+    {
+      auto checkFenceState = glClientWaitSync(fb.fence, GL_SYNC_FLUSH_COMMANDS_BIT, 0);
+      if(checkFenceState == GL_ALREADY_SIGNALED || checkFenceState == GL_CONDITION_SATISFIED)
+      {
+        // Ready so push directly to Read queue
+        mTextureReadQueue.push_back(fbId);
+      }
+      else
+      {
+        // Still busy so push to Stage queue
+        mTextureStageQueue.push_back(fbId);
+      }
+    }
+  }
+
+  void EnqueueTextureDrawBuffer(uint32_t fbId)
+  {
+    // push ready texture to front of 'read' queue
+    std::scoped_lock<std::recursive_mutex> lock(mTextureQueueMutex);
+    mTextureDrawQueue.push_back(fbId);
+  }
+
+  int32_t DequeueTextureReadBuffer(FrameBufferTexture& framebufferTexture)
+  {
+    // executed by DALi RenderThread!
+    std::deque<uint32_t>                   backTextures;
+    std::scoped_lock<std::recursive_mutex> lock(mTextureQueueMutex);
+
+    if(mTextureReadQueue.empty())
+    {
+      EnqueueStagedTexture();
+    }
+    else
+    {
+      while(!mTextureStageQueue.empty())
+      {
+        // we have something to render, so discard
+        auto stagedId = mTextureStageQueue.back();
+        EnqueueTextureDrawBuffer(stagedId);
+        mTextureStageQueue.pop_back();
+      }
+    }
+
+    if(mTextureReadQueue.empty())
+    {
+      return -1;
+    }
+
+    auto retval = mTextureReadQueue.back();
+    mTextureReadQueue.pop_back();
+
+    // drain all back images and return them to the 'draw' queue
+    // and remove old images
+    while(!mTextureReadQueue.empty())
+    {
+      auto texId = mTextureReadQueue.back();
+      if(framebufferTexture.fence)
+      {
+        glDeleteSync(framebufferTexture.fence);
+        framebufferTexture.fence = nullptr;
+      }
+      mTextureDrawQueue.push_front(texId);
+      mTextureReadQueue.pop_back();
+    }
+
+    return int32_t(retval);
+  }
+
+  /**
+   * Enqueues previously staged texture
+   */
+  uint32_t EnqueueStagedTexture()
+  {
+    // test stage queue
+    std::deque<uint32_t> stagedQueue;
+    bool                 found  = false;
+    uint32_t             retval = 0;
+    while(!mTextureStageQueue.empty())
+    {
+      auto  stagedId = mTextureStageQueue.front();
+      auto& fb       = mFramebufferTexture[stagedId];
+      if(!found)
+      {
+        auto syncResult = glClientWaitSync(fb.fence, GL_SYNC_FLUSH_COMMANDS_BIT, 0);
+        if(syncResult == GL_CONDITION_SATISFIED || syncResult == GL_ALREADY_SIGNALED)
+        {
+          // push texture into the queue
+          mTextureReadQueue.push_back(stagedId);
+          retval = stagedId;
+          found  = true;
+        }
+        else
+        {
+          stagedQueue.push_back(stagedId);
+        }
+      }
+      else
+      {
+        stagedQueue.push_back(stagedId);
+      }
+      mTextureStageQueue.pop_front();
+    }
+    mTextureStageQueue = std::move(stagedQueue);
+    return retval;
+  }
+
+  uint32_t CreateFramebuffer(uint32_t index, uint32_t width, uint32_t height)
+  {
+    auto& fb = mFramebufferTexture[index];
+    if(!fb.framebufferId)
+    {
+      GLuint offscreenFramebuffer, renderBuffer;
+      GL(glGenFramebuffers(1, &offscreenFramebuffer))
+      GL(glBindFramebuffer(GL_FRAMEBUFFER, offscreenFramebuffer));
+      GL(glGenRenderbuffers(1, &renderBuffer));
+      GL(glBindRenderbuffer(GL_RENDERBUFFER, renderBuffer));
+      GL(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.textureId, 0));
+      GL(glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height))
+      GL(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, renderBuffer));
+      fb.framebufferId = offscreenFramebuffer;
+
+      [[maybe_unused]] auto result = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+      DALI_ASSERT_ALWAYS(result == GL_FRAMEBUFFER_COMPLETE && "Framebuffer incomplete!");
+      return offscreenFramebuffer;
+    }
+    return 0u;
+  }
+
+  /**
+   * Constructor
+   */
+  explicit Impl(const NativeRendererCreateInfo& renderCreateInfo)
+  : mCreateInfo(renderCreateInfo)
+  {
+  }
+
+  /**
+   * Destructor
+   */
+  ~Impl()
+  {
+    Terminate();
+    if(mThread)
+    {
+      mThread->join();
+    }
+  }
+
+  /**
+   * Initializes renderer thread for offscreen rendering
+   */
+  void InitializeThread()
+  {
+    // Make mRunning true first
+    // Terminate() may be called before StartThread()
+    mRunning = true;
+
+    mThread = std::make_unique<std::thread>(&Impl::StartThread, this);
+  }
+
+  void PushRenderCallbackInputData(const Dali::RenderCallbackInput& renderCallbackInput)
+  {
+    std::scoped_lock<std::mutex> lock(mRenderCallbackInputDataMutex);
+    mRenderCallbackInputData = renderCallbackInput;
+  }
+
+  void PopRenderCallbackInputData(Dali::RenderCallbackInput& renderCallbackInput)
+  {
+    std::scoped_lock<std::mutex> lock(mRenderCallbackInputDataMutex);
+    renderCallbackInput = mRenderCallbackInputData;
+  }
+
+  void Terminate()
+  {
+    mRunning = false;
+  }
+
+  /**
+   * Function initializes thread for parallel rendering.
+   *
+   * The internal loop runs until the private EGL context has been
+   * initialized.
+   */
+  void StartThread()
+  {
+    // We need to acquire shared context, while this is not done
+    // it's necessary to wait for context to be bound.
+    while(mRunning && !mEglContextBound)
+    {
+      // Wait for context to be given
+      if(!mEglContext)
+      {
+        continue;
+      }
+      if(!eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, mEglContext))
+      {
+        [[maybe_unused]] auto err = eglGetError();
+        printf("%d\n", int(err));
+      }
+      mEglContextBound = true;
+    }
+
+    InitializeOffscreenFramebuffers();
+
+    PrepareBlitShader();
+
+    ThreadRunRender();
+  }
+
+  /**
+   * Reinitializes offscreen framebuffers and textures in case
+   * the resize has been requested.
+   */
+  void ReinitializeFramebuffers()
+  {
+    int index = 0;
+    for(auto& fb : mFramebufferTexture)
+    {
+      if(fb.fence)
+      {
+        GL(glDeleteSync(fb.fence));
+      }
+      if(fb.framebufferId)
+      {
+        GL(glDeleteFramebuffers(1, &fb.framebufferId))
+        fb.framebufferId = 0u;
+      }
+      if(fb.textureId)
+      {
+        GL(glDeleteTextures(1, &fb.textureId))
+        fb.textureId = 0u;
+      }
+      fb.textureId     = CreateOffscreenTexture(mWidth, mHeight);
+      fb.framebufferId = CreateFramebuffer(index, mWidth, mHeight);
+      index++;
+    }
+  }
+
+  void ThreadRunRender()
+  {
+    while(mRunning)
+    {
+      // If there is a resize request waiting, then recreate all framebuffers
+      if(mResizeRequest)
+      {
+        ReinitializeFramebuffers();
+        mResizeRequest = false;
+      }
+
+      Dali::RenderCallbackInput input;
+
+      PopRenderCallbackInputData(input);
+
+      uint32_t index{0u};
+      auto     result = DequeueTextureDrawBuffer(index);
+      if(!result)
+      {
+        continue;
+      }
+
+      auto& fb = mFramebufferTexture[index];
+      GL(glBindFramebuffer(GL_FRAMEBUFFER, fb.framebufferId))
+      GL(glClear(0));
+
+      // Invoke callback
+      if(mOnRenderCallback)
+      {
+        CallbackBase::ExecuteReturn<int>(*mOnRenderCallback);
+      }
+
+      // If the framebuffer is guarded with fence object then
+      // delete it as at this point it is no longer valid.
+      if(fb.fence)
+      {
+        // Make sure GPU finished
+        glDeleteSync(fb.fence);
+        fb.fence = nullptr;
+      }
+
+      // Inject sync object into the GL commands stream
+      fb.fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+      EnqueueTextureReadBuffer(index);
+      glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    }
+  }
+
+  void Resize(uint32_t width, uint32_t height)
+  {
+    mWidth         = width;
+    mHeight        = height;
+    mResizeRequest = true;
+  }
+
+  uint32_t         mWidth{0u};
+  uint32_t         mHeight{0u};
+  std::atomic_bool mResizeRequest{false};
+
+  /**
+   * Clones current EGL context, this function must be called from the render callback
+   * and be executed on the DALi RenderThread
+   */
+  void CloneEglContext()
+  {
+    // extract shared context (void*)
+    auto context = eglGetCurrentContext();
+
+    // Obtain configs
+    EGLint configId{0u};
+    EGLint size{0u};
+    eglGetConfigs(mEglDisplay, nullptr, 0, &size);
+    std::vector<EGLConfig> configs;
+    configs.resize(size);
+    eglGetConfigs(mEglDisplay, configs.data(), EGLint(configs.size()), &size);
+
+    // Find out which config is used by current context
+    eglQueryContext(mEglDisplay, context, EGL_CONFIG_ID, &configId);
+
+    // Setup EGL version
+    auto                version = int(30); // TODO: get context version and select the same one
+    std::vector<EGLint> attribs;
+    attribs.push_back(EGL_CONTEXT_MAJOR_VERSION_KHR);
+    attribs.push_back(version / 10);
+    attribs.push_back(EGL_CONTEXT_MINOR_VERSION_KHR);
+    attribs.push_back(version % 10);
+    attribs.push_back(EGL_NONE);
+
+    // Create cloned context with shared context
+    mEglContext = eglCreateContext(mEglDisplay, configs[configId], mEglSharedContext, attribs.data());
+  }
+
+  // Pre-, Post- functions are being called from the callbacks
+  void GlViewPreInit(const Dali::RenderCallbackInput& input)
+  {
+    // This runs on DALi RenderThread!!!
+
+    // Bind the shared context in case of threaded rendering
+    if(mThread && !mEglContextBound)
+    {
+      // Store the shared context just once
+      if(!mEglSharedContext)
+      {
+        // Store the shared context returned by the drawable callback
+        mEglSharedContext = std::any_cast<EGLContext>(input.eglContext);
+      }
+      // Setup the EGL context
+      mEglDisplay = eglGetCurrentDisplay();
+
+      // switch to shared context in order to create shared GL resources
+      auto currentContext = eglGetCurrentContext();
+
+      // Retrieve current surfaces (read and draw)
+      mDrawSurface = eglGetCurrentSurface(EGL_DRAW);
+      mReadSurface = eglGetCurrentSurface(EGL_READ);
+
+      eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, mEglSharedContext);
+
+      [[maybe_unused]] auto eglError = eglGetError();
+
+      // Now clone it to create compatible context for our threaded rendering
+      CloneEglContext();
+
+      // Bring back current context
+      eglMakeCurrent(mEglDisplay, mDrawSurface, mReadSurface, currentContext);
+    }
+  }
+
+  GLuint CreateProgram(const char* vertexSource, const char* fragmentSource)
+  {
+    GLuint vertexShader = LoadShader(GL_VERTEX_SHADER, vertexSource);
+    if(!vertexShader)
+    {
+      return 0;
+    }
+    GLuint fragmentShader = LoadShader(GL_FRAGMENT_SHADER, fragmentSource);
+    if(!fragmentShader)
+    {
+      return 0;
+    }
+    GLuint program = glCreateProgram();
+    if(program)
+    {
+      GL(glAttachShader(program, vertexShader));
+      GL(glAttachShader(program, fragmentShader));
+      GL(glLinkProgram(program));
+      GLint linkStatus = GL_FALSE;
+      GL(glGetProgramiv(program, GL_LINK_STATUS, &linkStatus));
+      if(linkStatus != GL_TRUE)
+      {
+        GLint bufLength = 0;
+        glGetProgramiv(program, GL_INFO_LOG_LENGTH, &bufLength);
+        if(bufLength)
+        {
+          char* buf = (char*)malloc(bufLength);
+          if(buf)
+          {
+            glGetProgramInfoLog(program, bufLength, NULL, buf);
+            free(buf);
+          }
+        }
+        glDeleteProgram(program);
+        program = 0;
+      }
+    }
+    return program;
+  }
+
+  GLuint LoadShader(GLenum shaderType, const char* shaderSource)
+  {
+    GLuint shader = glCreateShader(shaderType);
+    if(shader != 0)
+    {
+      GL(glShaderSource(shader, 1, &shaderSource, NULL));
+      GL(glCompileShader(shader));
+      GLint compiled = 0;
+      glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+      if(compiled != GL_TRUE)
+      {
+        GLint infoLen = 0;
+        glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
+
+        if(infoLen > 0)
+        {
+          char* logBuffer = (char*)malloc(infoLen);
+
+          if(logBuffer != NULL)
+          {
+            glGetShaderInfoLog(shader, infoLen, NULL, logBuffer);
+
+            DALI_ASSERT_ALWAYS(true && logBuffer);
+
+            free(logBuffer);
+            logBuffer = NULL;
+          }
+
+          glDeleteShader(shader);
+          shader = 0;
+        }
+      }
+    }
+    return shader;
+  }
+
+  void PrepareBlitShader()
+  {
+    static const char glVertexShader[] =
+      "attribute vec2 vertexPosition;\n"
+      "attribute vec2 texCoords;\n"
+      "varying vec2 vTexCoords ;\n"
+      "void main()\n"
+      "{\n"
+      "    gl_Position = vec4(vertexPosition, 0.0, 1.0);\n"
+      "    vTexCoords = texCoords;\n"
+      "}\n";
+
+    static const char glFragmentShader[] =
+      "precision mediump float;\n"
+      "varying vec2 vTexCoords;\n"
+      "uniform sampler2D tex;\n"
+      "void main()\n"
+      "{\n"
+      "    gl_FragColor = texture2D(tex, vTexCoords);\n"
+      "}\n";
+
+    mBlitProgram        = CreateProgram(glVertexShader, glFragmentShader);
+    mBlitVertexLocation = glGetAttribLocation(mBlitProgram, "vertexPosition");
+    mBlitTexCoord       = glGetAttribLocation(mBlitProgram, "texCoords");
+  }
+
+  GLuint mBlitProgram{0u};
+  GLuint mBlitVertexLocation{0u};
+  GLuint mBlitTexCoord{0u};
+
+  /**
+   * Initializes FBO textures
+   */
+  void InitializeOffscreenFramebuffers()
+  {
+    std::scoped_lock<std::recursive_mutex> lock(mTextureQueueMutex);
+    for(auto i = 0u; i < mCreateInfo.maxOffscreenBuffers; ++i)
+    {
+      mFramebufferTexture.emplace_back();
+      mFramebufferTexture.back().textureId = CreateOffscreenTexture(mWidth, mHeight);
+
+      // Populate Draw queue entries
+      mTextureDrawQueue.push_back(i);
+
+      // Create framebuffers
+      CreateFramebuffer(i, mWidth, mHeight);
+    }
+  }
+
+  /**
+   * Creates an offscreen texture for threaded renderer
+   */
+  uint32_t CreateOffscreenTexture(uint32_t width, uint32_t height)
+  {
+    GLuint offscreenTexture{0u};
+    GL(glGenTextures(1, &offscreenTexture));
+    GL(glBindTexture(GL_TEXTURE_2D, offscreenTexture));
+    GL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr));
+    GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+    GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+    return offscreenTexture;
+  }
+
+  void GlViewInit(const Dali::RenderCallbackInput& input)
+  {
+    if(mOnInitCallback)
+    {
+      GlViewPreInit(input);
+      CallbackBase::Execute(*mOnInitCallback, input);
+    }
+  }
+
+  int GlViewRender(const Dali::RenderCallbackInput& input)
+  {
+    // Non-threaded solution invokes callback directly
+    int retval = 0;
+    if(!mCreateInfo.threadEnabled)
+    {
+      if(mOnRenderCallback)
+      {
+        retval = CallbackBase::ExecuteReturn<int>(*mOnRenderCallback, input);
+      }
+    }
+    else
+    {
+      BlitTexture();
+    }
+    return retval;
+  }
+
+  void GlViewTerminate(const Dali::RenderCallbackInput& input)
+  {
+    // Non-threaded solution invokes callback directly
+    if(!mCreateInfo.threadEnabled)
+    {
+      if(mOnTerminateCallback)
+      {
+        CallbackBase::Execute(*mOnTerminateCallback, input);
+      }
+    }
+  }
+
+  void BlitTexture()
+  {
+    // If no threaded mode, return
+    if(!mCreateInfo.threadEnabled)
+    {
+      return;
+    }
+
+    // Read input
+    auto x = 0;
+    auto y = 0;
+    auto w = mWidth;
+    auto h = mHeight;
+
+    // Deqeueue texture, there should be always something waiting to be drawn, if not, ignore
+    FrameBufferTexture fb;
+    auto               textureBufferIndex = DequeueTextureReadBuffer(fb);
+
+    // Do nothing if frame not ready
+    if(textureBufferIndex < 0)
+    {
+      if(mLastTextureBufferIndex >= 0)
+      {
+        textureBufferIndex = mLastTextureBufferIndex;
+      }
+      else
+      {
+        return;
+      }
+    }
+    else
+    {
+      // return last texture to the pull
+      if(mLastTextureBufferIndex >= 0)
+      {
+        // return it to the queue
+        EnqueueTextureDrawBuffer(mLastTextureBufferIndex);
+      }
+    }
+
+    GL(glViewport(x, y, w, h));
+    if(!mBlitStateDone)
+    {
+      mBlitStateDone = true;
+      GL(glUseProgram(mBlitProgram));
+      GL(glVertexAttribPointer(mBlitVertexLocation, 2, GL_FLOAT, GL_FALSE, 0, QUAD_VERTS));
+      GL(glEnableVertexAttribArray(mBlitVertexLocation));
+      GL(glVertexAttribPointer(mBlitTexCoord, 2, GL_FLOAT, GL_FALSE, 0, QUAD_UV));
+      GL(glEnableVertexAttribArray(mBlitTexCoord));
+      GL(glActiveTexture(GL_TEXTURE0));
+    }
+    GL(glBindTexture(GL_TEXTURE_2D, mFramebufferTexture[textureBufferIndex].textureId));
+
+    GL(glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, QUAD_INDICES))
+
+    mLastTextureBufferIndex = textureBufferIndex;
+  }
+
+  // List of offscreen framebuffers
+  std::vector<FrameBufferTexture> mFramebufferTexture{};
+
+  /**
+   * Rendering pipeline uses 3 queues:
+   * Draw - the producer queue (NativeRenderer thread writes to it)
+   * Read - the consumer queue (RenderThread reads from it)
+   * Stage - Already written but not ready to be read (not signaled)
+   *
+   * // Rendering offscreen
+   * 1. PRODUCER pops framebuffer from Draw queue
+   * 2. PRODUCER renders into the framebuffer
+   * 3. PRODUCER pushes framebuffer into Stage queue
+   *
+   * // Rendering onscreen
+   * 1. CONSUMER checks Stage queue for signaled (ready) framebuffers
+   * 2. If framebuffers are ready, pushes them into the Read queue
+   * 3. If MAILBOX mode, CONSUMER discards all 'outdated' framebuffers and displays the most recent
+   * 4. If FIFO mode, CONSUMER displays all the images in order of being produced.
+   */
+  std::deque<uint32_t> mTextureDrawQueue;
+  std::deque<uint32_t> mTextureStageQueue;
+  std::deque<uint32_t> mTextureReadQueue;
+
+  // Mutex guarding the queues reads/writes
+  std::recursive_mutex         mTextureQueueMutex;
+  std::unique_ptr<std::thread> mThread;              ///< Thread for parallel mode
+  bool                         mRunning{false};      ///< Thread running flag
+  EGLContext                   mEglContext{nullptr}; ///< EGL context associated with the thread
+  EGLContext                   mEglSharedContext{nullptr};
+
+  EGLDisplay       mEglDisplay{nullptr};         ///< Current EGL display
+  std::atomic_bool mEglContextBound{false};      ///< Flag indicating whether EGL context is bound
+  EGLSurface       mDrawSurface{EGL_NO_SURFACE}; ///< Current EGL draw surface
+  EGLSurface       mReadSurface{EGL_NO_SURFACE}; ///< Current EGL read surface
+
+  // Callbacks associated with GlView interface
+  std::unique_ptr<CallbackBase> mOnInitCallback{nullptr};
+  std::unique_ptr<CallbackBase> mOnRenderCallback{nullptr};
+  std::unique_ptr<CallbackBase> mOnTerminateCallback{nullptr};
+
+  int32_t mLastTextureBufferIndex{-1};
+  bool    mBlitStateDone{false};
+
+  std::mutex                mRenderCallbackInputDataMutex{};
+  Dali::RenderCallbackInput mRenderCallbackInputData{};
+
+  NativeRendererCreateInfo mCreateInfo{};
+};
+
+DrawableViewNativeRenderer::DrawableViewNativeRenderer(const NativeRendererCreateInfo& createInfo)
+: mImpl(new Impl(createInfo))
+{
+  if(createInfo.threadEnabled)
+  {
+    mImpl->InitializeThread();
+  }
+}
+
+DrawableViewNativeRenderer::~DrawableViewNativeRenderer() = default;
+
+void DrawableViewNativeRenderer::RegisterGlCallbacks(Dali::CallbackBase* onInitCallback, Dali::CallbackBase* onRenderCallback, Dali::CallbackBase* onTerminateCallback)
+{
+  mImpl->mOnInitCallback.reset(onInitCallback);
+  mImpl->mOnRenderCallback.reset(onRenderCallback);
+  mImpl->mOnTerminateCallback.reset(onTerminateCallback);
+}
+
+void DrawableViewNativeRenderer::InvokeGlInitCallback(const RenderCallbackInput& renderCallbackInput)
+{
+  mImpl->GlViewInit(renderCallbackInput);
+}
+
+void DrawableViewNativeRenderer::InvokeGlRenderCallback(const RenderCallbackInput& renderCallbackInput)
+{
+  mImpl->GlViewRender(renderCallbackInput);
+}
+
+void DrawableViewNativeRenderer::InvokeGlTerminateCallback(const RenderCallbackInput& renderCallbackInput)
+{
+  mImpl->GlViewTerminate(renderCallbackInput);
+}
+
+void DrawableViewNativeRenderer::Resize(uint32_t width, uint32_t height)
+{
+  mImpl->Resize(width, height);
+}
+
+void DrawableViewNativeRenderer::PushRenderCallbackInputData(const Dali::RenderCallbackInput& renderCallbackInput)
+{
+  mImpl->PushRenderCallbackInputData(renderCallbackInput);
+}
+
+void DrawableViewNativeRenderer::Terminate()
+{
+  mImpl->Terminate();
+}
+
+} // namespace Dali::Internal
diff --git a/dali-toolkit/internal/controls/gl-view/drawable-view-native-renderer.h b/dali-toolkit/internal/controls/gl-view/drawable-view-native-renderer.h
new file mode 100644
index 0000000..bc13c58
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/drawable-view-native-renderer.h
@@ -0,0 +1,116 @@
+#ifndef DALI_PROJECT_DRAWABLE_VIEW_NATIVE_RENDERER_H
+#define DALI_PROJECT_DRAWABLE_VIEW_NATIVE_RENDERER_H
+
+/*
+* Copyright (c) 2024 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+ */
+
+#include <dali/public-api/signals/callback.h>
+#include <dali/public-api/signals/render-callback.h>
+#include <memory>
+
+
+namespace Dali::Internal
+{
+/**
+ * The structure containing the initialization data for the
+ * DrawableViewNativeRenderer instance.
+ */
+struct NativeRendererCreateInfo
+{
+  /**
+   * Presentation mode is used only for threaded renderer
+   */
+  enum class PresentationMode
+  {
+    FIFO, // First-in first-out
+    MAILBOX // Only most recent out
+  };
+
+  bool threadEnabled { false };
+  bool directExecution { false };
+
+  uint32_t maxOffscreenBuffers { 3u };
+  PresentationMode presentationMode {PresentationMode::FIFO};
+};
+
+/**
+ * The DrawableViewNativeRenderer is responsible for delegating rendering
+ * either to the own thread (in parallel mode) or calling the GlView render callbacks
+ * directly.
+ *
+ * The parallel mode creates the thread that invokes GLView callbacks directly.
+ * The actual render callback will only pass the input data and blit the result.
+ *
+ * Parallel mode renders always to the offscreen framebuffer.
+ */
+class DrawableViewNativeRenderer
+{
+public:
+  explicit DrawableViewNativeRenderer( const NativeRendererCreateInfo& createInfo );
+  ~DrawableViewNativeRenderer();
+
+  /**
+   * Registers GlView callbacks
+   */
+  void RegisterGlCallbacks( Dali::CallbackBase* onInitCallback,Dali::CallbackBase* onRenderCallback, Dali::CallbackBase* onTerminateCallback );
+
+  /**
+   * Dispatches the GlView init callback
+   * @param renderCallbackInput
+   */
+  void InvokeGlInitCallback( const RenderCallbackInput& renderCallbackInput );
+
+  /**
+   * Dispatches the GlView render callback
+   * @param renderCallbackInput
+   */
+  void InvokeGlRenderCallback(  const RenderCallbackInput& renderCallbackInput  );
+
+  /**
+   * Dispatches the GlView terminate callback
+   * @param[in] renderCallbackInput
+   */
+  void InvokeGlTerminateCallback(  const RenderCallbackInput& renderCallbackInput );
+
+  /**
+   * @brief Resizes the render surface
+   *
+   * @param[in] width Width of surface
+   * @param[in] height Height of surface
+   */
+  void Resize( uint32_t width, uint32_t height );
+
+  /**
+   * @brief Pushes render callback input data into the native renderer thread
+   *
+   * @param[in] renderCallbackInput Valid RenderCallbackInput object
+   */
+  void PushRenderCallbackInputData( const Dali::RenderCallbackInput& renderCallbackInput );
+
+  /**
+   * @brief Terminates thread in parallel mode
+   */
+  void Terminate();
+
+private:
+
+  struct Impl;
+  std::unique_ptr<Impl> mImpl;
+};
+}
+
+#endif // DALI_PROJECT_DRAWABLE_VIEW_NATIVE_RENDERER_H
diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp b/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
new file mode 100644
index 0000000..61ab62e
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/controls/gl-view/gl-view-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/lifecycle-controller.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/rendering/renderer.h>
+#include <dali/public-api/rendering/texture-set.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+Dali::Toolkit::GlView GlView::New(Dali::Toolkit::GlView::ColorFormat colorFormat)
+{
+  auto*                 impl   = new Dali::Toolkit::Internal::GlView(colorFormat);
+  Dali::Toolkit::GlView handle = Dali::Toolkit::GlView(*impl);
+  impl->Initialize();
+  return handle;
+}
+
+GlView::GlView(Dali::Toolkit::GlView::ColorFormat colorFormat)
+: Dali::Toolkit::Internal::GlViewImpl(Toolkit::GlView::BackendMode::EGL_IMAGE_OFFSCREEN_RENDERING),
+  mRenderThread(nullptr),
+  mNativeImageQueue(nullptr),
+  mRenderingMode(Toolkit::GlView::RenderingMode::CONTINUOUS),
+  mColorFormat(colorFormat),
+  mDepth(false),
+  mStencil(false),
+  mMSAA(0)
+{
+}
+
+GlView::~GlView()
+{
+  if(mRenderThread)
+  {
+    mRenderThread->Stop();
+    mRenderThread->Join();
+  }
+}
+
+void GlView::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+{
+  if(mRenderThread)
+  {
+    mRenderThread->RegisterGlCallbacks(initCallback, renderFrameCallback, terminateCallback);
+  }
+}
+
+void GlView::SetResizeCallback(CallbackBase* resizeCallback)
+{
+  if(mRenderThread)
+  {
+    mRenderThread->SetResizeCallback(resizeCallback);
+  }
+}
+
+bool GlView::SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::Toolkit::GlView::GraphicsApiVersion version)
+{
+  // Init Graphics
+  mDepth   = depth;
+  mStencil = stencil;
+  mMSAA    = msaa;
+
+  int rVersion;
+
+  if(version == Dali::Toolkit::GlView::GraphicsApiVersion::GLES_VERSION_2_0)
+  {
+    rVersion = 20;
+  }
+  else
+  {
+    rVersion = 30;
+  }
+
+  if(mRenderThread)
+  {
+    return mRenderThread->SetGraphicsConfig(depth, stencil, msaa, rVersion);
+  }
+
+  return false;
+}
+
+void GlView::SetRenderingMode(Dali::Toolkit::GlView::RenderingMode mode)
+{
+  mRenderingMode    = mode;
+  Renderer renderer = Self().GetRendererAt(0);
+
+  if(mRenderingMode == Dali::Toolkit::GlView::RenderingMode::ON_DEMAND)
+  {
+    renderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED);
+
+    if(mRenderThread)
+    {
+      mRenderThread->SetOnDemandRenderMode(true);
+    }
+  }
+  else
+  {
+    renderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY);
+
+    if(mRenderThread)
+    {
+      mRenderThread->SetOnDemandRenderMode(false);
+    }
+  }
+}
+
+Dali::Toolkit::GlView::RenderingMode GlView::GetRenderingMode() const
+{
+  return mRenderingMode;
+}
+
+void GlView::RenderOnce()
+{
+  if(mRenderThread)
+  {
+    mRenderThread->RenderOnce();
+  }
+}
+
+void GlView::BindTextureResources(std::vector<Dali::Texture> textures)
+{
+  // Not supported in the indirect mode
+}
+
+void GlView::OnInitialize()
+{
+  //Create NativeImageSourceQueue with the size of 1,1
+  mNativeImageQueue = Dali::NativeImageSourceQueue::New(1, 1, GetColorFormat(mColorFormat));
+
+  if(!mNativeImageQueue)
+  {
+    DALI_LOG_ERROR("NativeImageSourceQueue is NULL");
+    return;
+  }
+
+  AddRenderer();
+
+  Actor self = Self();
+
+  //Create a RenderThread
+  mRenderThread = std::unique_ptr<GlViewRenderThread>(new GlViewRenderThread(mNativeImageQueue));
+  if(!mRenderThread)
+  {
+    DALI_LOG_ERROR("Fail to create GlView Render Thread!!!!\n");
+    return;
+  }
+
+  //Adding VisibilityChange Signal.
+  Dali::DevelActor::VisibilityChangedSignal(self).Connect(this, &GlView::OnControlVisibilityChanged);
+}
+
+void GlView::OnSizeSet(const Vector3& targetSize)
+{
+  Control::OnSizeSet(targetSize);
+
+  if(mRenderThread)
+  {
+    if(mNativeImageQueue)
+    {
+      mRenderThread->AcquireSurface();
+      mNativeImageQueue->SetSize(static_cast<uint32_t>(targetSize.x), static_cast<uint32_t>(targetSize.y));
+      mRenderThread->SetSurfaceSize(Vector2(targetSize.x, targetSize.y));
+      mRenderThread->ReleaseSurface();
+    }
+  }
+}
+
+Shader GlView::CreateShader()
+{
+  std::string fragmentShader = std::string(SHADER_GL_VIEW_FRAG);
+
+  if(mNativeImageQueue)
+  {
+    mNativeImageQueue->ApplyNativeFragmentShader(fragmentShader);
+  }
+
+  return Shader::New(SHADER_GL_VIEW_VERT, fragmentShader, Shader::Hint::NONE, "GL_VIEW");
+}
+
+void GlView::OnControlVisibilityChanged(Dali::Actor actor, bool visible, Dali::DevelActor::VisibilityChange::Type type)
+{
+  Actor self = Self();
+  if(self.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
+  {
+    if(mRenderThread)
+    {
+      if(visible && DevelWindow::Get(self).IsVisible())
+      {
+        mRenderThread->Resume();
+      }
+      else
+      {
+        mRenderThread->Pause();
+      }
+    }
+  }
+}
+
+void GlView::OnWindowVisibilityChanged(Window window, bool visible)
+{
+  if(mRenderThread)
+  {
+    if(visible && Self().GetProperty<bool>(Actor::Property::VISIBLE))
+    {
+      mRenderThread->Resume();
+    }
+    else
+    {
+      mRenderThread->Pause();
+    }
+  }
+}
+
+void GlView::OnSceneConnection(int depth)
+{
+  Control::OnSceneConnection(depth);
+
+  Actor  self   = Self();
+  Window window = DevelWindow::Get(self);
+
+  if(window)
+  {
+    DevelWindow::VisibilityChangedSignal(window).Connect(this, &GlView::OnWindowVisibilityChanged);
+  }
+
+  if(mRenderThread)
+  {
+    if(self.GetProperty<bool>(Actor::Property::VISIBLE) && window.IsVisible())
+    {
+      mRenderThread->Resume();
+    }
+  }
+}
+
+void GlView::OnSceneDisconnection()
+{
+  Control::OnSceneDisconnection();
+  if(mRenderThread)
+  {
+    mRenderThread->Pause();
+  }
+}
+
+Dali::Geometry GlView::CreateTexturedQuad()
+{
+  struct Vertex
+  {
+    Dali::Vector2 position;
+  };
+
+  static const Vertex data[] = {{Dali::Vector2(-0.5f, -0.5f)},
+                                {Dali::Vector2(0.5f, -0.5f)},
+                                {Dali::Vector2(-0.5f, 0.5f)},
+                                {Dali::Vector2(0.5f, 0.5f)}};
+
+  uint32_t numberOfVertices = sizeof(data) / sizeof(Vertex);
+
+  Dali::VertexBuffer  vertexBuffer;
+  Dali::Property::Map vertexFormat;
+  vertexFormat["aPosition"] = Dali::Property::VECTOR2;
+
+  //Create a vertex buffer for vertex positions and texture coordinates
+  vertexBuffer = Dali::VertexBuffer::New(vertexFormat);
+  vertexBuffer.SetData(data, numberOfVertices);
+
+  //Create the geometry
+  Dali::Geometry geometry = Dali::Geometry::New();
+  geometry.AddVertexBuffer(vertexBuffer);
+  geometry.SetType(Dali::Geometry::TRIANGLE_STRIP);
+
+  return geometry;
+}
+
+void GlView::AddRenderer()
+{
+  if(!mNativeImageQueue)
+  {
+    DALI_LOG_ERROR("Target Surface is NULL");
+    return;
+  }
+
+  Actor    self     = Self();
+  Geometry geometry = CreateTexturedQuad();
+  Shader   shader   = CreateShader();
+  Renderer renderer = Renderer::New(geometry, shader);
+
+  Texture    nativeTexture = Texture::New(*mNativeImageQueue);
+  TextureSet textureSet    = TextureSet::New();
+  textureSet.SetTexture(0u, nativeTexture);
+
+  renderer.SetTextures(textureSet);
+
+  self.AddRenderer(renderer);
+}
+
+Dali::NativeImageSourceQueue::ColorFormat GlView::GetColorFormat(Dali::Toolkit::GlView::ColorFormat format)
+{
+  switch(format)
+  {
+    case Toolkit::GlView::ColorFormat::RGBA8888:
+    {
+      return Dali::NativeImageSourceQueue::ColorFormat::RGBA8888;
+    }
+
+    case Toolkit::GlView::ColorFormat::RGB888:
+    default:
+    {
+      return Dali::NativeImageSourceQueue::ColorFormat::RGBX8888;
+    }
+  }
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-impl.h b/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
new file mode 100644
index 0000000..e70cd99
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
@@ -0,0 +1,164 @@
+#ifndef DALI_TOOLKIT_INTERNAL_GL_VIEW_H
+#define DALI_TOOLKIT_INTERNAL_GL_VIEW_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/shader.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/gl-view/gl-view-interface-impl.h>
+#include <dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
+
+namespace Dali::Toolkit
+{
+class GlView;
+
+namespace Internal
+{
+class GlView : public Dali::Toolkit::Internal::GlViewImpl
+{
+protected:
+  virtual ~GlView();
+
+public:
+  /**
+   * @copydoc Dali::Toolkit::GlView::New()
+   */
+  static Dali::Toolkit::GlView New(Dali::Toolkit::GlView::ColorFormat colorFormat);
+
+  /**
+   * Construct a new GlView.
+   */
+  GlView(Dali::Toolkit::GlView::ColorFormat colorFormat);
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::RegisterGlCallbacks()
+   */
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetResizeCallback()
+   */
+  void SetResizeCallback(CallbackBase* resizeCallback) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetGraphicsConfig()
+   */
+  bool SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::Toolkit::GlView::GraphicsApiVersion version) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetRenderingMode()
+   */
+  void SetRenderingMode(Dali::Toolkit::GlView::RenderingMode mode) override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::GetRenderingMode()
+   */
+  Dali::Toolkit::GlView::RenderingMode GetRenderingMode() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::RenderOnce()
+   */
+  void RenderOnce() override;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::BindTextureResources()
+   */
+  void BindTextureResources(std::vector<Dali::Texture> textures) override;
+
+private: // From Control
+  /**
+   * @copydoc Toolkit::Control::OnInitialize()
+   */
+  virtual void OnInitialize() override;
+
+  /**
+   * @copydoc Toolkit::Control::OnSceneConnection()
+   */
+  void OnSceneConnection(int depth) override;
+
+  /**
+   * @copydoc Toolkit::Control::OnSceneDisconnection()
+   */
+  void OnSceneDisconnection() override;
+
+  /**
+   * @copydoc Toolkit::Control::OnSizeSet()
+   */
+  void OnSizeSet(const Vector3& targetSize) override;
+
+private:
+  // Undefined copy constructor and assignment operators
+  GlView(const GlView& GlView);
+  GlView& operator=(const GlView& GlView);
+
+  /**
+   * Callback when the visibility of the GlView is changed
+   */
+  void OnControlVisibilityChanged(Dali::Actor actor, bool visible, Dali::DevelActor::VisibilityChange::Type type);
+
+  /**
+   * Callback when the visibility of the window is changed
+   */
+  void OnWindowVisibilityChanged(Dali::Window window, bool visible);
+
+  /**
+   * Creates the geometry for texturing.
+   */
+  Dali::Geometry CreateTexturedQuad();
+
+  /**
+   * Adds renderer to Actor.
+   */
+  void AddRenderer();
+
+  /**
+   * Creates shader for rendering.
+   */
+  Dali::Shader CreateShader();
+
+  /**
+   * @brief Gets the NativeImageSourceQueue's ColorFormat with the GlView's ColorFormat.
+   * @param[in] colorFormat the color format of the GlView.
+   * @return The color format of NativeImageSourceQueue
+   */
+  Dali::NativeImageSourceQueue::ColorFormat GetColorFormat(Dali::Toolkit::GlView::ColorFormat format);
+
+private:
+  std::unique_ptr<GlViewRenderThread>  mRenderThread;
+  Dali::NativeImageSourceQueuePtr      mNativeImageQueue;
+  Dali::Toolkit::GlView::RenderingMode mRenderingMode;
+  Dali::Toolkit::GlView::ColorFormat   mColorFormat;
+
+  bool mDepth;
+  bool mStencil;
+  int  mMSAA;
+};
+
+} // namespace Internal
+
+} // namespace Dali::Toolkit
+
+#endif // DALI_TOOLKIT_INTERNAL_GL_VIEW_H
diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-interface-impl.h b/dali-toolkit/internal/controls/gl-view/gl-view-interface-impl.h
new file mode 100644
index 0000000..9b9ffa7
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-interface-impl.h
@@ -0,0 +1,135 @@
+#ifndef DALI_TOOLKIT_INTERNAL_GL_VIEW_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_GL_VIEW_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/shader.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
+
+namespace Dali::Toolkit
+{
+class GlView;
+
+namespace Internal
+{
+class GlViewImpl : public Dali::Toolkit::Internal::Control
+{
+protected:
+  virtual ~GlViewImpl() = default;
+
+public:
+  /**
+   * Construct a new GlView.
+   */
+  explicit GlViewImpl(GlView::BackendMode backendMode)
+  : Control(ControlBehaviour(0u | ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS)),
+    mBackendMode(backendMode)
+  {
+  }
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::RegisterGlCallbacks()
+   */
+  virtual void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetResizeCallback()
+   */
+  virtual void SetResizeCallback(CallbackBase* resizeCallback) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetGraphisConfig()
+   */
+  virtual bool SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::Toolkit::GlView::GraphicsApiVersion version) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetRenderingMode()
+   */
+  virtual void SetRenderingMode(Dali::Toolkit::GlView::RenderingMode mode) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::GetRenderingMode()
+   */
+  virtual Dali::Toolkit::GlView::RenderingMode GetRenderingMode() const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::GetBackendMode()
+   */
+  [[nodiscard]] Dali::Toolkit::GlView::BackendMode GetBackendMode() const
+  {
+    return mBackendMode;
+  }
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::RenderOnce()
+   */
+  virtual void RenderOnce() = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::BindTextureResources()
+   */
+  virtual void BindTextureResources(std::vector<Dali::Texture> textures) = 0;
+
+private: // From Control
+  /**
+   * @copydoc Toolkit::Control::OnInitialize()
+   */
+  virtual void OnInitialize() override = 0;
+
+  /**
+   * @copydoc Toolkit::Control::OnSceneConnection()
+   */
+  virtual void OnSceneConnection(int depth) override = 0;
+
+  /**
+   * @copydoc Toolkit::Control::OnSceneDisconnection()
+   */
+  virtual void OnSceneDisconnection() override = 0;
+
+protected:
+  GlView::BackendMode mBackendMode{GlView::BackendMode::DEFAULT}; ///< Implementation backend mode (DirectRendering, EGL image)
+};
+
+} // namespace Internal
+
+inline Dali::Toolkit::Internal::GlViewImpl& GetImpl(Dali::Toolkit::GlView& handle)
+{
+  DALI_ASSERT_ALWAYS(handle);
+  Dali::RefObject& impl = handle.GetImplementation();
+  return static_cast<Dali::Toolkit::Internal::GlViewImpl&>(impl);
+}
+
+inline const Dali::Toolkit::Internal::GlViewImpl& GetImpl(const Dali::Toolkit::GlView& handle)
+{
+  DALI_ASSERT_ALWAYS(handle);
+  const Dali::RefObject& impl = handle.GetImplementation();
+  return static_cast<const Dali::Toolkit::Internal::GlViewImpl&>(impl);
+}
+
+} // namespace Dali::Toolkit
+
+#endif // DALI_TOOLKIT_INTERNAL_GL_VIEW_IMPL_H
diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.cpp b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.cpp
new file mode 100644
index 0000000..391dd34
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.cpp
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h>
+
+//EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/thread-settings.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <chrono>
+#include <thread>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+constexpr unsigned int NANOSECONDS_PER_SECOND(1e+9);
+
+// The following values will get calculated at compile time
+constexpr float    DEFAULT_FRAME_DURATION_IN_SECONDS(1.0f / 60.0f);
+constexpr uint64_t DEFAULT_FRAME_DURATION_IN_NANOSECONDS(DEFAULT_FRAME_DURATION_IN_SECONDS* NANOSECONDS_PER_SECOND);
+
+} // namespace
+
+GlViewRenderThread::GlViewRenderThread(Dali::NativeImageSourceQueuePtr queue)
+: mLogFactory(Dali::Adaptor::Get().GetLogFactory()),
+  mTraceFactory(Dali::Adaptor::Get().GetTraceFactory()),
+  mSurfaceSize(1, 1),
+  mNativeImageSurface(),
+  mNativeImageQueue(queue),
+  mSurfaceSemaphore(1),
+  mGlInitCallback(nullptr),
+  mGlRenderFrameCallback(nullptr),
+  mGlTerminateCallback(nullptr),
+  mResizeCallback(nullptr),
+  mDepth(false),
+  mStencil(false),
+  mMSAA(0),
+  mGraphicsApiVersion(20),
+  mConditionalWait(),
+  mIsThreadStarted(0),
+  mIsThreadStopped(0),
+  mIsThreadPaused(0),
+  mIsRenderRequested(0),
+  mRenderingMode(0),
+  mIsSurfaceResized(0),
+  mDefaultFrameDurationNanoseconds(DEFAULT_FRAME_DURATION_IN_NANOSECONDS)
+{
+  mNativeImageSurface = Dali::NativeImageSurface::New(mNativeImageQueue);
+
+  if(!mNativeImageSurface)
+  {
+    DALI_LOG_ERROR("Creating NativeImageSurface Failed, Could not start GlView Render Thread");
+  }
+}
+
+void GlViewRenderThread::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+{
+  if(!mGlInitCallback && !mGlRenderFrameCallback && !mGlTerminateCallback)
+  {
+    mGlInitCallback        = std::unique_ptr<CallbackBase>(initCallback);
+    mGlRenderFrameCallback = std::unique_ptr<CallbackBase>(renderFrameCallback);
+    mGlTerminateCallback   = std::unique_ptr<CallbackBase>(terminateCallback);
+  }
+}
+
+void GlViewRenderThread::SetResizeCallback(CallbackBase* resizeCallback)
+{
+  if(!mResizeCallback)
+  {
+    mResizeCallback = std::unique_ptr<CallbackBase>(resizeCallback);
+  }
+}
+
+bool GlViewRenderThread::SetGraphicsConfig(bool depth, bool stencil, int msaa, int version)
+{
+  mDepth              = depth;
+  mStencil            = stencil;
+  mMSAA               = msaa;
+  mGraphicsApiVersion = version;
+
+  if(mNativeImageSurface)
+  {
+    return mNativeImageSurface->SetGraphicsConfig(mDepth, mStencil, mMSAA, mGraphicsApiVersion);
+  }
+
+  return false;
+}
+
+void GlViewRenderThread::SetOnDemandRenderMode(bool onDemand)
+{
+  ConditionalWait::ScopedLock lock(mConditionalWait);
+  mRenderingMode = static_cast<unsigned int>(onDemand);
+  DALI_LOG_RELEASE_INFO("GlViewRenderThread::SetOnDemandRenderMode(): mRenderingMode: %d\n", mRenderingMode);
+  if(!onDemand && !mIsThreadPaused)
+  {
+    mConditionalWait.Notify(lock);
+  }
+}
+
+void GlViewRenderThread::SetSurfaceSize(Dali::Vector2 size)
+{
+  //GlViewRenderThread::Run was already blocked in Internal::GlView::OnSizeSet
+  mSurfaceSize      = size;
+  mIsSurfaceResized = 1;
+}
+
+void GlViewRenderThread::RenderOnce()
+{
+  //Notify GLRender thread.
+  Dali::ConditionalWait::ScopedLock lock(mConditionalWait);
+  mIsRenderRequested = 1;
+  mConditionalWait.Notify(lock);
+}
+
+void GlViewRenderThread::GetNanoSeconds(uint64_t& timeInNanoseconds)
+{
+  // Get the time of a monotonic clock since its epoch.
+  auto epoch        = std::chrono::steady_clock::now().time_since_epoch();
+  auto duration     = std::chrono::duration_cast<std::chrono::nanoseconds>(epoch);
+  timeInNanoseconds = static_cast<uint64_t>(duration.count());
+}
+
+void GlViewRenderThread::SleepUntil(uint64_t timeInNanoseconds)
+{
+  using Clock     = std::chrono::steady_clock;
+  using TimePoint = std::chrono::time_point<Clock>;
+
+  const Clock::duration duration = std::chrono::nanoseconds(timeInNanoseconds);
+  const TimePoint       timePoint(duration);
+
+  std::this_thread::sleep_until(timePoint);
+}
+
+void GlViewRenderThread::Run()
+{
+  Dali::SetThreadName("GlViewRenderer");
+  mLogFactory.InstallLogFunction();
+  mTraceFactory.InstallTraceFunction();
+
+  int renderFrameResult = 0;
+
+  if(!mNativeImageSurface)
+  {
+    DALI_LOG_ERROR("NativeImageSurface is null, Could not start GlView Render Thread");
+    return;
+  }
+
+  AcquireSurface();
+  mNativeImageSurface->InitializeGraphics();
+  ReleaseSurface();
+
+  mNativeImageSurface->PreRender();
+  if(mGlInitCallback)
+  {
+    CallbackBase::Execute(*mGlInitCallback);
+  }
+
+  uint64_t timeToSleepUntil = 0;
+
+  while(RenderReady(timeToSleepUntil))
+  {
+    uint64_t currentFrameStartTime = 0;
+    GetNanoSeconds(currentFrameStartTime);
+
+    AcquireSurface();
+    mNativeImageSurface->PreRender();
+    if(mIsSurfaceResized)
+    {
+      if(mResizeCallback)
+      {
+        CallbackBase::Execute(*mResizeCallback, static_cast<int>(mSurfaceSize.x), static_cast<int>(mSurfaceSize.y));
+      }
+      mIsSurfaceResized = 0;
+    }
+
+    if(mNativeImageSurface->CanRender())
+    {
+      if(mGlRenderFrameCallback)
+      {
+        renderFrameResult = CallbackBase::ExecuteReturn<int>(*mGlRenderFrameCallback);
+        if(renderFrameResult)
+        {
+          mNativeImageSurface->PostRender();
+        }
+      }
+    }
+
+    ReleaseSurface();
+
+    if(timeToSleepUntil == 0)
+    {
+      timeToSleepUntil = currentFrameStartTime + mDefaultFrameDurationNanoseconds;
+    }
+    else
+    {
+      timeToSleepUntil += mDefaultFrameDurationNanoseconds;
+      uint64_t currentFrameEndTime = 0;
+      GetNanoSeconds(currentFrameEndTime);
+      while(currentFrameEndTime > timeToSleepUntil + mDefaultFrameDurationNanoseconds)
+      {
+        timeToSleepUntil += mDefaultFrameDurationNanoseconds;
+      }
+    }
+
+    SleepUntil(timeToSleepUntil);
+  }
+
+  if(mGlTerminateCallback)
+  {
+    CallbackBase::Execute(*mGlTerminateCallback);
+  }
+
+  mNativeImageSurface->TerminateGraphics();
+
+  return;
+}
+
+void GlViewRenderThread::Stop()
+{
+  // Set to come out Render Thread out of waiting condition.
+  Dali::ConditionalWait::ScopedLock lock(mConditionalWait);
+  mIsThreadStopped = 1;
+  mIsThreadPaused  = 0;
+  mConditionalWait.Notify(lock);
+}
+
+void GlViewRenderThread::Pause()
+{
+  //Notify GLRender thread, If actor visibility is change
+  Dali::ConditionalWait::ScopedLock lock(mConditionalWait);
+  mIsThreadPaused = 1;
+  mConditionalWait.Notify(lock);
+}
+
+void GlViewRenderThread::Resume()
+{
+  Dali::ConditionalWait::ScopedLock lock(mConditionalWait);
+  if(!mIsThreadStarted)
+  {
+    Start();
+    mIsThreadStarted = 1;
+  }
+  mIsThreadPaused = 0;
+  mConditionalWait.Notify(lock);
+}
+
+bool GlViewRenderThread::RenderReady(uint64_t& timeToSleepUntil)
+{
+  ConditionalWait::ScopedLock lock(mConditionalWait);
+  while((!mIsThreadStopped && mRenderingMode && !mIsRenderRequested) || mIsThreadPaused)
+  {
+    timeToSleepUntil = 0;
+    mConditionalWait.Wait(lock);
+  }
+
+  mIsRenderRequested = 0;
+  // Keep the update-render thread alive if this thread is NOT to be destroyed
+  return !mIsThreadStopped;
+}
+
+void GlViewRenderThread::AcquireSurface()
+{
+  mSurfaceSemaphore.Acquire();
+}
+
+void GlViewRenderThread::ReleaseSurface()
+{
+  mSurfaceSemaphore.Release(1);
+}
+
+GlViewRenderThread::~GlViewRenderThread()
+{
+}
+
+} // namespace Internal
+} // namespace Toolkit
+} // namespace Dali
diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h
new file mode 100644
index 0000000..cc5f45a
--- /dev/null
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h
@@ -0,0 +1,182 @@
+#ifndef DALI_TOOLKIT_INTERNAL_GL_VIEW_THREAD_H
+#define DALI_TOOLKIT_INTERNAL_GL_VIEW_THREAD_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/devel-api/threading/semaphore.h>
+#include <dali/devel-api/threading/thread.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/native-image-surface.h>
+#include <dali/integration-api/adaptor-framework/trace-factory-interface.h>
+#include <dali/public-api/math/vector2.h>
+#include <dali/public-api/signals/callback.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+/**
+ * @brief GlViewRenderThread is a render thread for GlView.
+ * This invokes user's callbacks.
+ */
+class GlViewRenderThread : public Dali::Thread
+{
+public:
+  /**
+   * Constructor
+   *
+   * @param[in] queue The NativeImageSourceQueue that GL renders onto
+   */
+  GlViewRenderThread(Dali::NativeImageSourceQueuePtr queue);
+
+  /**
+   * destructor.
+   */
+  virtual ~GlViewRenderThread();
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::RegisterGlCallbacks()
+   */
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetResizeCallback()
+   */
+  void SetResizeCallback(CallbackBase* resizeCallback);
+
+  /**
+   * @copydoc Dali::Toolkit::GlView::SetGraphicsConfig()
+   */
+  bool SetGraphicsConfig(bool depth, bool stencil, int msaa, int version);
+
+  /**
+   * Enable OnDemand Rendering Mode
+   *
+   * @param[in] onDemand the flag of OnDemand Rendering Mode. If the flag is true, the rendering mode is set OnDemand,
+   * otherwise the flag is false, rendering mode is set continuous mode.
+   */
+  void SetOnDemandRenderMode(bool onDemand);
+
+  /**
+   * Sets the surface size
+   *
+   * @param[in] size the size of the NaitveImageSurface
+   */
+  void SetSurfaceSize(Dali::Vector2 size);
+
+  /**
+   * @copydoc Dali::Toolkit::RenderOnce()
+   */
+  void RenderOnce();
+
+  /**
+   * Pauses the render thread.
+   */
+  void Pause();
+
+  /**
+   * Resumes the render thread.
+   */
+  void Resume();
+
+  /**
+   * Stops the render thread.
+   * @note Should only be called in Stop as calling this will kill the render thread.
+   */
+  void Stop();
+
+  /**
+   * Acquires the surface resource
+   */
+  void AcquireSurface();
+
+  /**
+   * Releases the surface resource
+   */
+  void ReleaseSurface();
+
+protected:
+  /**
+   * The routine that the thread will execute once it is started.
+   */
+  void Run() override;
+
+private:
+  GlViewRenderThread(const GlViewRenderThread& obj) = delete;
+  GlViewRenderThread operator=(const GlViewRenderThread& obj) = delete;
+
+  /**
+   * Called by the Render Thread which ensures a wait if required.
+   *
+   * @param[out] timeToSleepUntil  The time remaining in nanoseconds to keep the thread sleeping before resuming.
+   * @return false, if the thread should stop.
+   */
+  bool RenderReady(uint64_t& timeToSleepUntil);
+
+  /**
+   * @brief Get the monotonic time since the clock's epoch.
+   * @param[out]  timeInNanoseconds  The time in nanoseconds since the reference point.
+   */
+  void GetNanoSeconds(uint64_t& timeInNanoseconds);
+
+  /**
+   * Blocks the execution of the current thread until specified sleep_time
+   * @param[in] timeInNanoseconds  The time blocking for
+   */
+  void SleepUntil(uint64_t timeInNanoseconds);
+
+private:
+  const Dali::LogFactoryInterface&   mLogFactory;
+  const Dali::TraceFactoryInterface& mTraceFactory;
+
+  Dali::Vector2                   mSurfaceSize; ///< The size of mNativeImageQueue
+  Dali::NativeImageSurfacePtr     mNativeImageSurface;
+  Dali::NativeImageSourceQueuePtr mNativeImageQueue;
+  Semaphore<>                     mSurfaceSemaphore; ///< The semaphore to avoid race condition to the render target
+
+  std::unique_ptr<CallbackBase> mGlInitCallback;
+  std::unique_ptr<CallbackBase> mGlRenderFrameCallback;
+  std::unique_ptr<CallbackBase> mGlTerminateCallback;
+  std::unique_ptr<CallbackBase> mResizeCallback;
+
+  bool mDepth : 1;
+  bool mStencil : 1;
+  int  mMSAA;
+  int  mGraphicsApiVersion;
+
+  Dali::ConditionalWait mConditionalWait;
+  volatile unsigned int mIsThreadStarted;   ///< Whether this thread has been started.
+  volatile unsigned int mIsThreadStopped;   ///< Stop render thread. It means this render thread will be destroyed.
+  volatile unsigned int mIsThreadPaused;    ///< Sleep render thread by pause.
+  volatile unsigned int mIsRenderRequested; ///< Request rendering once
+  volatile unsigned int mRenderingMode;     ///< Rendering Mode, 0: Continuous, 1:OnDemand
+  volatile unsigned int mIsSurfaceResized;  ///< Invoke ResizeCallback when NativeImageSurface is resized.
+
+  uint64_t mDefaultFrameDurationNanoseconds; ///< Default duration of a frame (used for sleeping if not enough time elapsed). Not protected by lock, but written to rarely so not worth adding a lock when reading.
+};
+
+} // namespace Internal
+} // namespace Toolkit
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_GL_SURFACE_VIEW_THREAD_H
diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index e3701ec..7f11261 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,14 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/scripting/scripting.h>
+#include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
@@ -43,6 +45,14 @@ namespace
 {
 const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
+constexpr float FULL_OPACITY = 1.0f;
+constexpr float LOW_OPACITY  = 0.2f;
+constexpr float TRANSITION_EFFECT_SPEED = 0.3f;
+
+constexpr int PLACEHOLDER_DEPTH_INDEX = -2;
+constexpr int PREVIOUS_VISUAL_DEPTH_INDEX  = -1;
+constexpr int CURRENT_VISUAL_DEPTH_INDEX = 0;
+
 BaseHandle Create()
 {
   return Toolkit::ImageView::New();
@@ -52,7 +62,8 @@ BaseHandle Create()
 DALI_TYPE_REGISTRATION_BEGIN(Toolkit::ImageView, Toolkit::Control, Create);
 DALI_PROPERTY_REGISTRATION(Toolkit, ImageView, "image", MAP, IMAGE)
 DALI_PROPERTY_REGISTRATION(Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, PRE_MULTIPLIED_ALPHA)
-
+DALI_PROPERTY_REGISTRATION(Toolkit, ImageView, "placeholderImage", STRING, PLACEHOLDER_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, ImageView, "enableTransitionEffect", BOOLEAN, ENABLE_TRANSITION_EFFECT)
 DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT(Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA)
 DALI_TYPE_REGISTRATION_END()
 
@@ -60,11 +71,15 @@ DALI_TYPE_REGISTRATION_END()
 
 using namespace Dali;
 
-ImageView::ImageView()
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+ImageView::ImageView(ControlBehaviour additionalBehaviour)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)),
   mImageSize(),
+  mTransitionTargetAlpha(FULL_OPACITY),
   mImageVisualPaddingSetByTransform(false),
-  mImageViewPixelAreaSetByFittingMode(false)
+  mImageViewPixelAreaSetByFittingMode(false),
+  mTransitionEffect(false),
+  mNeedLazyFittingMode(false),
+  mImageReplaced(false)
 {
 }
 
@@ -72,9 +87,9 @@ ImageView::~ImageView()
 {
 }
 
-Toolkit::ImageView ImageView::New()
+Toolkit::ImageView ImageView::New(ControlBehaviour additionalBehaviour)
 {
-  ImageView* impl = new ImageView();
+  ImageView* impl = new ImageView(additionalBehaviour);
 
   Toolkit::ImageView handle = Toolkit::ImageView(*impl);
 
@@ -93,18 +108,56 @@ void ImageView::OnInitialize()
   Dali::Toolkit::Control handle(GetOwner());
   handle.ResourceReadySignal().Connect(this, &ImageView::OnResourceReady);
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::IMAGE));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::IMAGE);
 }
 
 void ImageView::SetImage(const Property::Map& map)
 {
+  if(mTransitionEffect && mVisual)
+  {
+    // Clear previous transition effect if it is playing
+    if(mPreviousVisual)
+    {
+      if(mTransitionAnimation)
+      {
+        if(mTransitionAnimation.GetState() == Animation::PLAYING)
+        {
+          // Hide placeholder
+          HidePlaceholderImage();
+          ClearTransitionAnimation();
+        }
+      }
+    }
+
+    // Enable transition effect for previous visual.
+    // This previous visual will be deleted when transition effect is done.
+    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+    controlDataImpl.EnableReadyTransitionOverriden(mVisual, true);
+    mPreviousVisual = mVisual;
+  }
+
   // Comparing a property map is too expensive so just creating a new visual
   mPropertyMap = map;
   mUrl.clear();
 
+  mImageReplaced = true;
+
+  // keep alpha for transition effect
+  if(mTransitionEffect)
+  {
+    float            alpha      = FULL_OPACITY;
+    Property::Value* alphaValue = map.Find(Toolkit::Visual::Property::OPACITY);
+    if(alphaValue && alphaValue->Get(alpha))
+    {
+      mTransitionTargetAlpha = alpha;
+    }
+  }
+
+  if(!mVisual)
+  {
+    ShowPlaceholderImage();
+  }
+
   Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(mPropertyMap);
   if(visual)
   {
@@ -130,17 +183,47 @@ void ImageView::SetImage(const Property::Map& map)
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }
-
   // Signal that a Relayout may be needed
 }
 
 void ImageView::SetImage(const std::string& url, ImageDimensions size)
 {
+  if(mTransitionEffect && mVisual)
+  {
+    // Clear previous transition effect if it is playing
+    if(mPreviousVisual)
+    {
+      if(mTransitionAnimation)
+      {
+        if(mTransitionAnimation.GetState() == Animation::PLAYING)
+        {
+          HidePlaceholderImage();
+          ClearTransitionAnimation();
+        }
+      }
+    }
+
+    // Enable transition effect for previous visual.
+    // This previous visual will be deleted when transition effect is done.
+    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+    controlDataImpl.EnableReadyTransitionOverriden(mVisual, true);
+    mPreviousVisual = mVisual;
+  }
+
+  
+
   // Don't bother comparing if we had a visual previously, just drop old visual and create new one
   mUrl       = url;
   mImageSize = size;
   mPropertyMap.Clear();
 
+  mImageReplaced = true;
+
+  if(!mVisual)
+  {
+    ShowPlaceholderImage();
+  }
+
   // Don't set mVisual until it is ready and shown. Getters will still use current visual.
   Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(url, size);
   if(visual)
@@ -166,10 +249,23 @@ void ImageView::SetImage(const std::string& url, ImageDimensions size)
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }
-
   // Signal that a Relayout may be needed
 }
 
+void ImageView::ClearImageVisual()
+{
+  // Clear cached properties
+  mPropertyMap.Clear();
+  mUrl.clear();
+  mVisual.Reset();
+
+  // Unregister the exsiting visual
+  DevelControl::UnregisterVisual(*this, Toolkit::ImageView::Property::IMAGE);
+
+  // Trigger a size negotiation request that may be needed when unregistering a visual.
+  RelayoutRequest();
+}
+
 void ImageView::EnablePreMultipliedAlpha(bool preMultipled)
 {
   if(mVisual)
@@ -195,6 +291,43 @@ void ImageView::SetDepthIndex(int depthIndex)
   }
 }
 
+void ImageView::SetPlaceholderUrl(const std::string& url)
+{
+  mPlaceholderUrl = url;
+  if(!url.empty())
+  {
+    mPlaceholderVisual.Reset();
+    CreatePlaceholderImage();
+  }
+  else
+  {
+    // Clear current placeholder image
+    Toolkit::Visual::Base visual = DevelControl::GetVisual(*this, Toolkit::ImageView::Property::PLACEHOLDER_IMAGE);
+    if(visual)
+    {
+      DevelControl::UnregisterVisual(*this, Toolkit::ImageView::Property::PLACEHOLDER_IMAGE);
+    }
+
+    mPlaceholderVisual.Reset();
+    mPlaceholderUrl = url;
+  }
+}
+
+std::string ImageView::GetPlaceholderUrl() const
+{
+  return mPlaceholderUrl;
+}
+
+void ImageView::EnableTransitionEffect(bool effectEnable)
+{
+  mTransitionEffect = effectEnable;
+}
+
+bool ImageView::IsTransitionEffectEnabled() const
+{
+  return mTransitionEffect;
+}
+
 Vector3 ImageView::GetNaturalSize()
 {
   if(mVisual)
@@ -249,29 +382,15 @@ void ImageView::OnRelayout(const Vector2& size, RelayoutContainer& container)
   Control::OnRelayout(size, container);
   if(mVisual)
   {
-    Property::Map transformMap = Property::Map();
-
-    Extents padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
-
-    bool zeroPadding = (padding == Extents());
-
-    Vector2 naturalSize;
-    mVisual.GetNaturalSize(naturalSize);
-
-    Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(
-      Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
-    if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
+    // If Resource is not ready, fittingMode is not working well.
+    // in this case, imageview set the flag for working applyFittingMode again when the resource is ready
+    if(!IsResourceReady())
     {
-      std::swap(padding.start, padding.end);
+      mNeedLazyFittingMode = true;
     }
 
-    // remove padding from the size to know how much is left for the visual
-    Vector2 finalSize   = size - Vector2(padding.start + padding.end, padding.top + padding.bottom);
-    Vector2 finalOffset = Vector2(padding.start, padding.top);
-
-    ApplyFittingMode(finalSize, naturalSize, finalOffset, zeroPadding, transformMap);
-
-    mVisual.SetTransformAndSize(transformMap, size);
+    // Apply FittingMode using actor's size
+    ApplyFittingMode(size);
 
     // mVisual is not updated util the resource is ready in the case of visual replacement.
     // in this case, the Property Map must be initialized so that the previous value is not reused.
@@ -281,124 +400,80 @@ void ImageView::OnRelayout(const Vector2& size, RelayoutContainer& container)
     {
       visual.SetTransformAndSize(Property::Map(), size);
     }
+
+    if(!mTransitionEffect)
+    {
+      // we don't need placeholder anymore because visual is replaced. so hide placeholder.
+      HidePlaceholderImage();
+    }
   }
 }
 
-void ImageView::OnCreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod)
+void ImageView::OnCreateTransitions(std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& sourceProperties,
+                                    std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& destinationProperties,
+                                    Dali::Toolkit::Control                                              source,
+                                    Dali::Toolkit::Control                                              destination)
 {
-  Dali::Toolkit::ImageView destinationHandle = Toolkit::ImageView(GetOwner());
-  Toolkit::Visual::Base    destinationVisual = DevelControl::GetVisual(GetImplementation(destinationHandle), Toolkit::ImageView::Property::IMAGE);
-  Property::Map            destinationMap;
-
-  if(!destinationVisual)
+  // Retrieves image properties to be transitioned.
+  Dali::Property::Map imageSourcePropertyMap, imageDestinationPropertyMap;
+  MakeVisualTransition(imageSourcePropertyMap, imageDestinationPropertyMap, source, destination, Toolkit::ImageView::Property::IMAGE);
+  if(imageSourcePropertyMap.Count() > 0)
   {
-    return;
+    sourceProperties.push_back(std::pair<Dali::Property::Index, Dali::Property::Map>(Toolkit::ImageView::Property::IMAGE, imageSourcePropertyMap));
+    destinationProperties.push_back(std::pair<Dali::Property::Index, Dali::Property::Map>(Toolkit::ImageView::Property::IMAGE, imageDestinationPropertyMap));
   }
+}
 
-  destinationVisual.CreatePropertyMap(destinationMap);
-
-  static auto findValueVector4 = [](const Property::Map& map, Property::Index index, const Vector4& defaultValue = Vector4()) -> Vector4 {
-    Property::Value* propertyValue = map.Find(index);
-    if(propertyValue)
-    {
-      return propertyValue->Get<Vector4>();
-    }
-    return defaultValue;
-  };
+void ImageView::OnUpdateVisualProperties(const std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& properties)
+{
+  Toolkit::Visual::Base visual = DevelControl::GetVisual(*this, Toolkit::ImageView::Property::IMAGE);
+  if(visual)
+  {
+    Dali::Toolkit::Control handle(GetOwner());
 
-  static auto findValueFloat = [](const Property::Map& map, Property::Index index, const float& defaultValue = 0.0f) -> float {
-    Property::Value* propertyValue = map.Find(index);
-    if(propertyValue)
+    for(auto&& data : properties)
     {
-      return propertyValue->Get<float>();
+      if(data.first == Toolkit::ImageView::Property::IMAGE)
+      {
+        DevelControl::DoAction(handle, Toolkit::ImageView::Property::IMAGE, DevelVisual::Action::UPDATE_PROPERTY, data.second);
+        break;
+      }
     }
-    return defaultValue;
-  };
-
-  Vector4 sourceMixColor(0.0f, 0.0f, 0.0f, 0.0f);
-  Vector4 sourceCornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
-  float   sourceBorderlineWidth(0.0f);
-  Vector4 sourceBorderlineColor(0.0f, 0.0f, 0.0f, 1.0f);
-  float   sourceBorderlineOffset(0.0f);
-  Vector4 destinationMixColor         = findValueVector4(destinationMap, Dali::Toolkit::Visual::Property::MIX_COLOR, sourceMixColor);
-  Vector4 destinationCornerRadius     = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, sourceCornerRadius);
-  float   destinationBorderlineWidth  = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, sourceBorderlineWidth);
-  Vector4 destinationBorderlineColor  = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, sourceBorderlineColor);
-  float   destinationBorderlineOffset = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, sourceBorderlineOffset);
-
-  Dali::Toolkit::ImageView sourceHandle = Dali::Toolkit::ImageView::DownCast(source);
-  Toolkit::Visual::Base    sourceVisual;
-  Property::Map            sourceMap;
-
-  if(sourceHandle)
-  {
-    sourceVisual = DevelControl::GetVisual(GetImplementation(sourceHandle), Toolkit::ImageView::Property::IMAGE);
-  }
-
-  if(sourceVisual)
-  {
-    sourceVisual.CreatePropertyMap(sourceMap);
-    sourceMixColor         = findValueVector4(sourceMap, Dali::Toolkit::Visual::Property::MIX_COLOR, sourceMixColor);
-    sourceCornerRadius     = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, sourceCornerRadius);
-    sourceBorderlineWidth  = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, sourceBorderlineWidth);
-    sourceBorderlineColor  = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, sourceBorderlineColor);
-    sourceBorderlineOffset = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, sourceBorderlineOffset);
   }
+}
 
-  std::vector<Dali::Property>                              properties;
-  std::vector<std::pair<Property::Value, Property::Value>> values;
-
-  if(Vector3(sourceMixColor) != Vector3(destinationMixColor))
-  {
-    properties.push_back(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::Visual::Property::MIX_COLOR));
-    values.push_back(std::make_pair(Vector3(sourceMixColor), Vector3(destinationMixColor)));
-  }
-  if(std::abs(sourceMixColor.a - destinationMixColor.a) > Math::MACHINE_EPSILON_1)
-  {
-    properties.push_back(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::Visual::Property::OPACITY));
-    values.push_back(std::make_pair(sourceMixColor.a, destinationMixColor.a));
-  }
-  if(sourceCornerRadius != destinationCornerRadius)
-  {
-    properties.push_back(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::DevelVisual::Property::CORNER_RADIUS));
-    values.push_back(std::make_pair(sourceCornerRadius, destinationCornerRadius));
-  }
-  if(sourceBorderlineWidth != destinationBorderlineWidth)
-  {
-    properties.push_back(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH));
-    values.push_back(std::make_pair(sourceBorderlineWidth, destinationBorderlineWidth));
-  }
-  if(sourceBorderlineColor != destinationBorderlineColor)
-  {
-    properties.push_back(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::DevelVisual::Property::BORDERLINE_COLOR));
-    values.push_back(std::make_pair(sourceBorderlineColor, destinationBorderlineColor));
-  }
-  if(sourceBorderlineOffset != destinationBorderlineOffset)
+void ImageView::OnResourceReady(Toolkit::Control control)
+{
+  // In case of placeholder, we need to skip this call.
+  // TODO: In case of placeholder, it needs to be modified not to call OnResourceReady()
+  if(control.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE) != Toolkit::Visual::ResourceStatus::READY)
   {
-    properties.push_back(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET));
-    values.push_back(std::make_pair(sourceBorderlineOffset, destinationBorderlineOffset));
+    return;
   }
 
-  for(uint32_t i = 0; i < properties.size(); ++i)
+  // Do transition effect if need.
+  if(mTransitionEffect)
   {
-    if(timePeriod.delaySeconds > 0.0f)
+    // TODO: Consider about placeholder image is loaded failed
+    Toolkit::Visual::Base placeholderVisual = DevelControl::GetVisual(*this, Toolkit::ImageView::Property::PLACEHOLDER_IMAGE);
+    if(!placeholderVisual || control.GetVisualResourceStatus(Toolkit::ImageView::Property::PLACEHOLDER_IMAGE) == Toolkit::Visual::ResourceStatus::READY)
     {
-      Dali::KeyFrames initialKeyframes = Dali::KeyFrames::New();
-      initialKeyframes.Add(0.0f, values[i].first);
-      initialKeyframes.Add(1.0f, values[i].first);
-      animation.AnimateBetween(properties[i], initialKeyframes, TimePeriod(timePeriod.delaySeconds));
+      // when placeholder is disabled or ready placeholder and image, we need to transition effect
+      TransitionImageWithEffect();
     }
-    Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-    keyframes.Add(0.0f, values[i].first);
-    keyframes.Add(1.0f, values[i].second);
-    animation.AnimateBetween(properties[i], keyframes, alphaFunction, timePeriod);
   }
-}
 
-void ImageView::OnResourceReady(Toolkit::Control control)
-{
   // Visual ready so update visual attached to this ImageView, following call to RelayoutRequest will use this visual.
   mVisual = DevelControl::GetVisual(*this, Toolkit::ImageView::Property::IMAGE);
+
+  // Applying FittingMode again if it is not working well on OnRelayout().
+  if(mNeedLazyFittingMode)
+  {
+    const Vector2& size = Self().GetProperty(Dali::Actor::Property::SIZE).Get<Vector2>();
+    ApplyFittingMode(size);
+    mNeedLazyFittingMode = false;
+  }
+
   // Signal that a Relayout may be needed
 }
 
@@ -411,8 +486,8 @@ void ImageView::SetTransformMapForFittingMode(Vector2 finalSize, Vector2 natural
       auto availableVisualSize = finalSize;
 
       // scale to fit the padded area
-      finalSize = naturalSize * std::min((naturalSize.width ? (availableVisualSize.width / naturalSize.width) : 0),
-                                         (naturalSize.height ? (availableVisualSize.height / naturalSize.height) : 0));
+      finalSize = naturalSize * std::min((!Dali::EqualsZero(naturalSize.width) ? (availableVisualSize.width / naturalSize.width) : 0),
+                                         (!Dali::EqualsZero(naturalSize.height) ? (availableVisualSize.height / naturalSize.height) : 0));
 
       // calculate final offset within the padded area
       finalOffset += (availableVisualSize - finalSize) * .5f;
@@ -426,8 +501,8 @@ void ImageView::SetTransformMapForFittingMode(Vector2 finalSize, Vector2 natural
     {
       mImageViewPixelAreaSetByFittingMode = true;
       auto availableVisualSize            = finalSize;
-      finalSize                           = naturalSize * std::max((naturalSize.width ? (availableVisualSize.width / naturalSize.width) : 0),
-                                         (naturalSize.height ? (availableVisualSize.height / naturalSize.height) : 0));
+      finalSize                           = naturalSize * std::max((!Dali::EqualsZero(naturalSize.width) ? (availableVisualSize.width / naturalSize.width) : 0.0f),
+                                         (!Dali::EqualsZero(naturalSize.height) ? (availableVisualSize.height / naturalSize.height) : 0.0f));
 
       auto originalOffset = finalOffset;
       finalOffset += (availableVisualSize - finalSize) * .5f;
@@ -453,8 +528,8 @@ void ImageView::SetTransformMapForFittingMode(Vector2 finalSize, Vector2 natural
       }
       else
       {
-        finalSize = naturalSize * std::min((naturalSize.width ? (availableVisualSize.width / naturalSize.width) : 0),
-                                           (naturalSize.height ? (availableVisualSize.height / naturalSize.height) : 0));
+        finalSize = naturalSize * std::min((!Dali::EqualsZero(naturalSize.width) ? (availableVisualSize.width / naturalSize.width) : 0.0f),
+                                           (!Dali::EqualsZero(naturalSize.height) ? (availableVisualSize.height / naturalSize.height) : 0.0f));
       }
 
       finalOffset += (availableVisualSize - finalSize) * .5f;
@@ -479,8 +554,25 @@ void ImageView::SetTransformMapForFittingMode(Vector2 finalSize, Vector2 natural
   }
 }
 
-void ImageView::ApplyFittingMode(Vector2 finalSize, Vector2 naturalSize, Vector2 finalOffset, bool zeroPadding, Property::Map& transformMap)
+void ImageView::ApplyFittingMode(const Vector2& size)
 {
+  Property::Map transformMap = Property::Map();
+
+  Extents padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
+
+  bool zeroPadding = (padding == Extents());
+
+  Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(
+  Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
+  if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
+  {
+    std::swap(padding.start, padding.end);
+  }
+
+  // remove padding from the size to know how much is left for the visual
+  Vector2 finalSize   = size - Vector2(padding.start + padding.end, padding.top + padding.bottom);
+  Vector2 finalOffset = Vector2(padding.start, padding.top);
+
   Visual::FittingMode fittingMode = Toolkit::GetImplementation(mVisual).GetFittingMode();
 
   // Reset PIXEL_AREA after using OVER_FIT_KEEP_ASPECT_RATIO
@@ -495,6 +587,14 @@ void ImageView::ApplyFittingMode(Vector2 finalSize, Vector2 naturalSize, Vector2
   {
     mImageVisualPaddingSetByTransform = true;
 
+    Vector2 naturalSize;
+    // NaturalSize will not be used for FILL fitting mode, which is default.
+    // Skip GetNaturalSize
+    if(fittingMode != Visual::FittingMode::FILL)
+    {
+      mVisual.GetNaturalSize(naturalSize);
+    }
+
     // If FittingMode use FIT_WIDTH or FIT_HEIGTH, it need to change proper fittingMode
     if(fittingMode == Visual::FittingMode::FIT_WIDTH)
     {
@@ -526,6 +626,122 @@ void ImageView::ApplyFittingMode(Vector2 finalSize, Vector2 naturalSize, Vector2
       .Add(Toolkit::Visual::Transform::Property::SIZE_POLICY,
            Vector2(Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE));
   }
+
+  mVisual.SetTransformAndSize(transformMap, size);
+}
+
+void ImageView::CreatePlaceholderImage()
+{
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
+  propertyMap.Insert(Toolkit::ImageVisual::Property::URL, mPlaceholderUrl);
+  //propertyMap.Insert(Toolkit::ImageVisual::Property::LOAD_POLICY, Toolkit::ImageVisual::LoadPolicy::IMMEDIATE); // TODO: need to enable this property
+  propertyMap.Insert(Toolkit::ImageVisual::Property::RELEASE_POLICY, Toolkit::ImageVisual::ReleasePolicy::DESTROYED);
+  propertyMap.Insert(Toolkit::DevelImageVisual::Property::ENABLE_BROKEN_IMAGE, false);
+  mPlaceholderVisual = Toolkit::VisualFactory::Get().CreateVisual(propertyMap);
+  if(mPlaceholderVisual)
+  {
+    mPlaceholderVisual.SetName("placeholder");
+    mPlaceholderVisual.SetDepthIndex(mPlaceholderVisual.GetDepthIndex() + PLACEHOLDER_DEPTH_INDEX);
+  }
+  else
+  {
+    DevelControl::UnregisterVisual(*this, Toolkit::ImageView::Property::PLACEHOLDER_IMAGE);
+    mPlaceholderVisual.Reset();
+  }
+}
+
+void ImageView::ShowPlaceholderImage()
+{
+  if(mPlaceholderVisual)
+  {
+    DevelControl::RegisterVisual(*this, Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, mPlaceholderVisual, false);
+    Actor self = Self();
+    Toolkit::GetImplementation(mPlaceholderVisual).SetOnScene(self);
+  }
+}
+
+void ImageView::HidePlaceholderImage()
+{
+  if(mPlaceholderVisual)
+  {
+    DevelControl::UnregisterVisual(*this, Toolkit::ImageView::Property::PLACEHOLDER_IMAGE);
+
+    // Hide placeholder
+    Actor self = Self();
+    Toolkit::GetImplementation(mPlaceholderVisual).SetOffScene(self);
+  }
+}
+
+void ImageView::TransitionImageWithEffect()
+{
+  Toolkit::ImageView handle = Toolkit::ImageView(GetOwner());
+
+  if(handle)
+  {
+    if(!mImageReplaced)
+    {
+      // If the image is not replaced, the transition effect is not required.
+      return;
+    }
+
+    if(mTransitionAnimation)
+    {
+      ClearTransitionAnimation();
+    }
+
+    // Control visual's depth for transition effect
+    if(mPreviousVisual)
+    {
+      mPreviousVisual.SetDepthIndex(mPreviousVisual.GetDepthIndex() + PREVIOUS_VISUAL_DEPTH_INDEX);
+    }
+
+    mTransitionAnimation = Animation::New(TRANSITION_EFFECT_SPEED);
+    mTransitionAnimation.SetEndAction(Animation::EndAction::DISCARD);
+    float destinationAlpha = (mTransitionTargetAlpha > LOW_OPACITY) ? mTransitionTargetAlpha : LOW_OPACITY;
+
+    // Transition current image
+    Toolkit::Visual::Base imageVisual = DevelControl::GetVisual(*this, Toolkit::ImageView::Property::IMAGE);
+    if(imageVisual)
+    {
+      Dali::KeyFrames fadeinKeyFrames = Dali::KeyFrames::New();
+      fadeinKeyFrames.Add(0.0f, LOW_OPACITY);
+      fadeinKeyFrames.Add(1.0f, destinationAlpha);
+      mTransitionAnimation.AnimateBetween(DevelControl::GetVisualProperty(handle, Toolkit::ImageView::Property::IMAGE, Toolkit::Visual::Property::OPACITY), fadeinKeyFrames,  AlphaFunction::EASE_IN_OUT);
+      imageVisual.SetDepthIndex(imageVisual.GetDepthIndex() + CURRENT_VISUAL_DEPTH_INDEX);
+    }
+
+    // Play transition animation
+    mTransitionAnimation.FinishedSignal().Connect(this, &ImageView::OnTransitionAnimationFinishedCallback);
+    mTransitionAnimation.Play();
+  }
+}
+
+void ImageView::ClearTransitionAnimation()
+{
+  // Clear PreviousVisual
+  if(mPreviousVisual)
+  {
+    Actor                    self            = Self();
+    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+    controlDataImpl.EnableReadyTransitionOverriden(mVisual, false);
+    Toolkit::GetImplementation(mPreviousVisual).SetOffScene(self);
+    mPreviousVisual.Reset();
+  }
+
+  if(mTransitionAnimation)
+  {
+    if(mTransitionAnimation.GetState() == Animation::PLAYING)
+    {
+      mTransitionAnimation.Stop();
+    }
+    mTransitionAnimation.FinishedSignal().Disconnect(this, &ImageView::OnTransitionAnimationFinishedCallback);
+    mTransitionAnimation.Clear();
+    mTransitionAnimation.Reset();
+
+    // After transition effect is cleared, we don't need transition effect until image is replaced.
+    mImageReplaced = false;
+  }
 }
 
 ///////////////////////////////////////////////////////////
@@ -554,33 +770,46 @@ void ImageView::SetProperty(BaseObject* object, Property::Index index, const Pro
         else
         {
           map = value.GetMap();
-          if(map)
+          if(DALI_LIKELY(map))
           {
-            Property::Value* shaderValue = map->Find(Toolkit::Visual::Property::SHADER, CUSTOM_SHADER);
-            // set image only if property map contains image information other than custom shader
-            if(map->Count() > 1u || !shaderValue)
+            // the property map is emtpy map. Unregister visual.
+            if(DALI_UNLIKELY(map->Count() == 0u))
             {
-              impl.SetImage(*map);
+              impl.ClearImageVisual();
             }
-            // the property map contains only the custom shader
-            else if((map->Count() == 1u) && (shaderValue))
+            else
             {
-              Property::Map* shaderMap = shaderValue->GetMap();
-              if(shaderMap)
+              Property::Value* shaderValue = map->Find(Toolkit::Visual::Property::SHADER, CUSTOM_SHADER);
+              // set image only if property map contains image information other than custom shader
+              if(map->Count() > 1u || !shaderValue)
               {
-                impl.mShaderMap = *shaderMap;
-
-                if(!impl.mUrl.empty())
-                {
-                  impl.SetImage(impl.mUrl, impl.mImageSize);
-                }
-                else if(!impl.mPropertyMap.Empty())
+                impl.SetImage(*map);
+              }
+              // the property map contains only the custom shader
+              else if((map->Count() == 1u) && (shaderValue))
+              {
+                Property::Map* shaderMap = shaderValue->GetMap();
+                if(shaderMap)
                 {
-                  impl.SetImage(impl.mPropertyMap);
+                  impl.mShaderMap = *shaderMap;
+
+                  if(!impl.mUrl.empty())
+                  {
+                    impl.SetImage(impl.mUrl, impl.mImageSize);
+                  }
+                  else if(!impl.mPropertyMap.Empty())
+                  {
+                    impl.SetImage(impl.mPropertyMap);
+                  }
                 }
               }
             }
           }
+          else
+          {
+            // invalid property value comes. Unregister visual.
+            impl.ClearImageVisual();
+          }
         }
         break;
       }
@@ -594,6 +823,26 @@ void ImageView::SetProperty(BaseObject* object, Property::Index index, const Pro
         }
         break;
       }
+
+      case Toolkit::ImageView::Property::PLACEHOLDER_IMAGE:
+      {
+        std::string placeholderUrl;
+        if(value.Get(placeholderUrl))
+        {
+          impl.SetPlaceholderUrl(placeholderUrl);
+        }
+        break;
+      }
+
+      case Toolkit::ImageView::Property::ENABLE_TRANSITION_EFFECT:
+      {
+        bool transitionEffect;
+        if(value.Get(transitionEffect))
+        {
+          impl.EnableTransitionEffect(transitionEffect);
+        }
+        break;
+      }
     }
   }
 }
@@ -633,12 +882,31 @@ Property::Value ImageView::GetProperty(BaseObject* object, Property::Index prope
         value = impl.IsPreMultipliedAlphaEnabled();
         break;
       }
+
+      case Toolkit::ImageView::Property::PLACEHOLDER_IMAGE:
+      {
+        value = impl.GetPlaceholderUrl();
+        break;
+      }
+
+      case Toolkit::ImageView::Property::ENABLE_TRANSITION_EFFECT:
+      {
+        value = impl.IsTransitionEffectEnabled();
+        break;
+      }
     }
   }
 
   return value;
 }
 
+void ImageView::OnTransitionAnimationFinishedCallback(Animation& animation)
+{
+  // Hide placeholder
+  HidePlaceholderImage();
+  ClearTransitionAnimation();
+}
+
 } // namespace Internal
 } // namespace Toolkit
 } // namespace Dali
diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index 023930e..8cf8d3a 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,8 +39,10 @@ class ImageView : public Control
 protected:
   /**
    * Construct a new ImageView.
+   *
+   * @param[in] additionalBehaviour additional behaviour flags for this ImageView
    */
-  ImageView();
+  ImageView(ControlBehaviour additionalBehaviour);
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
@@ -50,9 +52,11 @@ protected:
 public:
   /**
    * Create a new ImageView.
+   *
+   * @param[in] additionalBehaviour custom behavior flags for this ImageView. Default is CONTROL_BEHAVIOUR_DEFAULT
    * @return A smart-pointer to the newly allocated ImageView.
    */
-  static Toolkit::ImageView New();
+  static Toolkit::ImageView New(ControlBehaviour additionalBehaviour = ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
 
   /**
    * @brief Sets this ImageView from an Dali::Property::Map
@@ -68,6 +72,13 @@ public:
   void SetImage(const std::string& imageUrl, ImageDimensions size);
 
   /**
+   * @brief Unregister ImageView IMAGE visual
+   *
+   * ImageView will display nothing
+   */
+  void ClearImageVisual();
+
+  /**
    * @brief Set whether the Pre-multiplied Alpha Blending is required
    *
    * @param[in] preMultipled whether alpha is pre-multiplied.
@@ -107,6 +118,31 @@ public:
    */
   void SetDepthIndex(int depthIndex);
 
+  /**
+   * @brief Set the placeholder url
+   */
+  void SetPlaceholderUrl(const std::string& url);
+
+  /**
+   * @brief Get the placeholder url
+   */
+  std::string GetPlaceholderUrl() const;
+
+  /**
+   * @brief Enable the transition effect
+   */
+  void EnableTransitionEffect(bool effectEnable);
+
+  /**
+   * @brief Query whether transition effect is enabled
+   */
+  bool IsTransitionEffectEnabled() const;
+
+  /**
+   * @brief callback when animation for placeholder or previous visual transition effect is finished
+   */
+  void OnTransitionAnimationFinishedCallback(Animation& animation);
+
 private: // From Control
   /**
    * @copydoc Toolkit::Control::OnInitialize
@@ -136,7 +172,15 @@ private: // From Control
   /**
    * @copydoc Toolkit::Control::OnCreateTransitions()
    */
-  virtual void OnCreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod) override;
+  virtual void OnCreateTransitions(std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& sourceProperties,
+                                   std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& destinationProperties,
+                                   Dali::Toolkit::Control                                              source,
+                                   Dali::Toolkit::Control                                              destination) override;
+
+  /**
+   * @copydoc Toolkit::Control::OnUpdateVisualProperties()
+   */
+  virtual void OnUpdateVisualProperties(const std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& properties) override;
 
 private:
   /**
@@ -157,13 +201,33 @@ private:
 
   /**
    * @brief Apply fittingMode
-   * param[in] finalSize The size for fittingMode
-   * param[in] textureSize The size of texture
-   * param[in] offset The offset for fittingMode
-   * param[in] zeroPadding whether padding is zero
-   * param[in] transformMap  The map for fitting image
    */
-  void ApplyFittingMode(Vector2 finalSize, Vector2 textureSize, Vector2 offset, bool zeroPadding, Property::Map& transformMap);
+  void ApplyFittingMode(const Vector2& size);
+
+   /**
+   * @brief Create placeholder image if it set. placeholder image is shown when image view is waiting for the image to load.
+   */
+  void CreatePlaceholderImage();
+
+  /**
+   * @brief Show placeholder image if it set. placeholder image is shown when image view is waiting for the image to load.
+   */
+  void ShowPlaceholderImage();
+
+  /**
+   * @brief Hide placeholder image if it set.
+   */
+  void HidePlaceholderImage();
+
+  /**
+   * @brief Transition image with effect when image is replaced.
+   */
+  void TransitionImageWithEffect();
+
+  /**
+   * @brief Clear the transition animation
+   */
+  void ClearTransitionAnimation();
 
 private:
   // Undefined
@@ -172,14 +236,22 @@ private:
 
 private:
   Toolkit::Visual::Base mVisual;
-
-  std::string     mUrl;         ///< the url for the image if the image came from a URL, empty otherwise
-  Property::Map   mPropertyMap; ///< the Property::Map if the image came from a Property::Map, empty otherwise
-  Property::Map   mShaderMap;   ///< the Property::Map if the custom shader is set, empty otherwise
-  ImageDimensions mImageSize;   ///< the image size
-
-  bool mImageVisualPaddingSetByTransform : 1;   //< Flag to indicate Padding was set using a transform.
-  bool mImageViewPixelAreaSetByFittingMode : 1; //< Flag to indicate pixel area was set by fitting Mode
+  Toolkit::Visual::Base mPreviousVisual;
+  Toolkit::Visual::Base mPlaceholderVisual;
+
+  std::string     mUrl;                                    ///< the url for the image if the image came from a URL, empty otherwise
+  std::string     mPlaceholderUrl;                         ///< the url for the placeholder image if the image came from a PLACEHOLDER_IMAGE, empty otherwise
+  Property::Map   mPropertyMap;                            ///< the Property::Map if the image came from a Property::Map, empty otherwise
+  Property::Map   mShaderMap;                              ///< the Property::Map if the custom shader is set, empty otherwise
+  ImageDimensions mImageSize;                              ///< the image size
+
+  Animation       mTransitionAnimation;                    ///< the animation for transition effect
+  float           mTransitionTargetAlpha;                  ///< Keep image's alpha value
+  bool            mImageVisualPaddingSetByTransform : 1;   ///< Flag to indicate Padding was set using a transform.
+  bool            mImageViewPixelAreaSetByFittingMode : 1; ///< Flag to indicate pixel area was set by fitting Mode
+  bool            mTransitionEffect :1;                    ///< Flag to indicate TransitionEffect is enabled
+  bool            mNeedLazyFittingMode:1;                  ///< Flag to indicate FittingMode will be applying lazy
+  bool            mImageReplaced:1;                        ///< Flag to indicate image is replaced
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
index e37a534..671551b 100644
--- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
+++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
@@ -218,10 +218,7 @@ void Magnifier::Initialize()
   constraint.AddSource(Source(self, Actor::Property::WORLD_SCALE));
   constraint.Apply();
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 Magnifier::~Magnifier()
@@ -250,7 +247,7 @@ void Magnifier::InitializeRenderTask()
 
 bool Magnifier::GetFrameVisibility() const
 {
-  return mFrame;
+  return static_cast<bool>(mFrame);
 }
 
 void Magnifier::SetFrameVisibility(bool visible)
diff --git a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
index f9bf491..4fedb5f 100644
--- a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
+++ b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -277,13 +277,10 @@ void Model3dView::OnInitialize()
 {
   //Create empty versions of the geometry and material so we always have a Renderer
   Geometry mesh   = Geometry::New();
-  Shader   shader = Shader::New(SHADER_MODEL3D_VIEW_SIMPLE_SHADER_VERT, SHADER_MODEL3D_VIEW_SIMPLE_SHADER_FRAG);
+  Shader   shader = Shader::New(SHADER_MODEL3D_VIEW_SIMPLE_SHADER_VERT, SHADER_MODEL3D_VIEW_SIMPLE_SHADER_FRAG, Shader::Hint::NONE, "MODEL3D_VIEW_SIMPLE");
   mRenderer       = Renderer::New(mesh, shader);
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::IMAGE));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::IMAGE);
 }
 
 void Model3dView::LoadGeometry()
@@ -390,21 +387,21 @@ void Model3dView::CreateMaterial()
   {
     if((mTexture2Url != "") && (mTexture1Url != "") && (mIlluminationType == Toolkit::Model3dView::DIFFUSE_WITH_NORMAL_MAP))
     {
-      mShader = Shader::New(SHADER_MODEL3D_VIEW_NRMMAP_SHADER_VERT, SHADER_MODEL3D_VIEW_NRMMAP_SHADER_FRAG);
+      mShader = Shader::New(SHADER_MODEL3D_VIEW_NRMMAP_SHADER_VERT, SHADER_MODEL3D_VIEW_NRMMAP_SHADER_FRAG, Shader::Hint::NONE, "MODEL3D_VIEW_NRMMAP");
     }
     else if(mIlluminationType == Toolkit::Model3dView::DIFFUSE_WITH_TEXTURE ||
             mIlluminationType == Toolkit::Model3dView::DIFFUSE_WITH_NORMAL_MAP)
     {
-      mShader = Shader::New(SHADER_MODEL3D_VIEW_SHADER_VERT, SHADER_MODEL3D_VIEW_SHADER_FRAG);
+      mShader = Shader::New(SHADER_MODEL3D_VIEW_SHADER_VERT, SHADER_MODEL3D_VIEW_SHADER_FRAG, Shader::Hint::NONE, "MODEL3D_VIEW");
     }
     else
     {
-      mShader = Shader::New(SHADER_MODEL3D_VIEW_SIMPLE_SHADER_VERT, SHADER_MODEL3D_VIEW_SIMPLE_SHADER_FRAG);
+      mShader = Shader::New(SHADER_MODEL3D_VIEW_SIMPLE_SHADER_VERT, SHADER_MODEL3D_VIEW_SIMPLE_SHADER_FRAG, Shader::Hint::NONE, "MODEL3D_VIEW_SIMPLE");
     }
   }
   else
   {
-    mShader = Shader::New(SHADER_MODEL3D_VIEW_SIMPLE_SHADER_VERT, SHADER_MODEL3D_VIEW_SIMPLE_SHADER_FRAG);
+    mShader = Shader::New(SHADER_MODEL3D_VIEW_SIMPLE_SHADER_VERT, SHADER_MODEL3D_VIEW_SIMPLE_SHADER_FRAG, Shader::Hint::NONE, "MODEL3D_VIEW_NRMMAP");
   }
 
   mTextureSet = TextureSet::New();
diff --git a/dali-toolkit/internal/controls/model3d-view/obj-loader.h b/dali-toolkit/internal/controls/model3d-view/obj-loader.h
index 0f7019f..8d284ef 100644
--- a/dali-toolkit/internal/controls/model3d-view/obj-loader.h
+++ b/dali-toolkit/internal/controls/model3d-view/obj-loader.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_OBJ_LOADER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@ namespace Dali
 {
 namespace Toolkit
 {
-class ObjLoader;
-
 namespace Internal
 {
 class ObjLoader
diff --git a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
index 3dd6909..f140e3e 100644
--- a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
+++ b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
@@ -70,10 +70,7 @@ Toolkit::NavigationView NavigationView::New()
 
 void NavigationView::OnInitialize()
 {
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 void NavigationView::OnSceneConnection(int depth)
diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index d74574c..a5e9e95 100644
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@ -414,10 +414,7 @@ void PageTurnView::OnInitialize()
   // enable the pan gesture which is attached to the control
   EnableGestureDetection(GestureType::Value(GestureType::PAN));
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::PAGE_TAB_LIST));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::PAGE_TAB_LIST);
 }
 
 Shader PageTurnView::CreateShader(const Property::Map& shaderMap)
diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index cc65de9..9c9a1f2 100644
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -343,11 +343,12 @@ void Popup::OnInitialize()
 
   SetupTouch();
 
-  DevelControl::AppendAccessibilityAttribute(self, "sub-role", "Alert");
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::DIALOG);
+}
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(new AccessibleImpl(actor, Dali::Accessibility::Role::DIALOG, true));
-  });
+DevelControl::ControlAccessible* Popup::CreateAccessibleObject()
+{
+  return new PopupAccessible(Self());
 }
 
 Popup::~Popup()
@@ -726,25 +727,16 @@ void Popup::SetDisplayState(Toolkit::Popup::DisplayState displayState)
     return;
   }
 
-  auto* accessible = Dali::Accessibility::Accessible::Get(Self());
-  if(display)
-  {
-    Dali::Accessibility::Bridge::GetCurrentBridge()->AddPopup(accessible);
-    accessible->EmitStateChanged(Dali::Accessibility::State::SHOWING, 1, 0);
-  }
-  else
-  {
-    accessible->EmitStateChanged(Dali::Accessibility::State::SHOWING, 0, 0);
-    Dali::Accessibility::Bridge::GetCurrentBridge()->RemovePopup(accessible);
-  }
-
   // Convert the bool state to the actual display state to use.
-  mDisplayState = display ? Toolkit::Popup::SHOWING : Toolkit::Popup::HIDING;
+  mDisplayState    = display ? Toolkit::Popup::SHOWING : Toolkit::Popup::HIDING;
+  auto* accessible = Dali::Accessibility::Accessible::Get(Self());
 
   if(display)
   {
     // Update the state to indicate the current intent.
     mDisplayState = Toolkit::Popup::SHOWING;
+    Dali::Accessibility::Bridge::GetCurrentBridge()->RegisterDefaultLabel(accessible);
+    accessible->EmitShowing(true);
 
     // We want the popup to have key input focus when it is displayed
     SetKeyInputFocus();
@@ -798,8 +790,9 @@ void Popup::SetDisplayState(Toolkit::Popup::DisplayState displayState)
   else // Not visible.
   {
     mDisplayState = Toolkit::Popup::HIDING;
+    Dali::Accessibility::Bridge::GetCurrentBridge()->UnregisterDefaultLabel(accessible);
     ClearKeyInputFocus();
-
+    accessible->EmitShowing(false);
     // Restore the keyboard focus when popup is hidden.
     if(mPreviousFocusedActor && mPreviousFocusedActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
     {
@@ -994,7 +987,7 @@ void Popup::SetTailVisibility(bool visible)
   mLayoutDirty = true;
 }
 
-const bool Popup::IsTailVisible() const
+bool Popup::IsTailVisible() const
 {
   return mTailVisible;
 }
@@ -1072,7 +1065,7 @@ void Popup::SetBackingEnabled(bool enabled)
   mLayoutDirty    = true;
 }
 
-const bool Popup::IsBackingEnabled() const
+bool Popup::IsBackingEnabled() const
 {
   return mBackingEnabled;
 }
@@ -1091,7 +1084,7 @@ const Vector4& Popup::GetBackingColor() const
 
 void Popup::SetTailUpImage(std::string image)
 {
-  mTailUpImage = image;
+  mTailUpImage = std::move(image);
   mLayoutDirty = true;
   LayoutTail();
 }
@@ -1103,7 +1096,7 @@ const std::string& Popup::GetTailUpImage() const
 
 void Popup::SetTailDownImage(std::string image)
 {
-  mTailDownImage = image;
+  mTailDownImage = std::move(image);
   mLayoutDirty   = true;
   LayoutTail();
 }
@@ -1115,7 +1108,7 @@ const std::string& Popup::GetTailDownImage() const
 
 void Popup::SetTailLeftImage(std::string image)
 {
-  mTailLeftImage = image;
+  mTailLeftImage = std::move(image);
   mLayoutDirty   = true;
   LayoutTail();
 }
@@ -1127,7 +1120,7 @@ const std::string& Popup::GetTailLeftImage() const
 
 void Popup::SetTailRightImage(std::string image)
 {
-  mTailRightImage = image;
+  mTailRightImage = std::move(image);
   mLayoutDirty    = true;
   LayoutTail();
 }
@@ -1146,7 +1139,7 @@ void Popup::SetTouchTransparent(bool enabled)
   }
 }
 
-const bool Popup::IsTouchTransparent() const
+bool Popup::IsTouchTransparent() const
 {
   return mTouchTransparent;
 }
@@ -1313,7 +1306,7 @@ void Popup::SetProperty(BaseObject* object, Property::Index propertyIndex, const
         std::string valueString;
         if(value.Get(valueString))
         {
-          Toolkit::ImageView actor = Toolkit::ImageView::New(valueString);
+          Toolkit::ImageView actor = Toolkit::ImageView::New(std::move(valueString));
           popupImpl.SetPopupBackgroundImage(actor);
         }
         break;
@@ -1348,7 +1341,7 @@ void Popup::SetProperty(BaseObject* object, Property::Index propertyIndex, const
         std::string valueString;
         if(value.Get(valueString))
         {
-          popupImpl.SetTailUpImage(valueString);
+          popupImpl.SetTailUpImage(std::move(valueString));
         }
         break;
       }
@@ -1357,7 +1350,7 @@ void Popup::SetProperty(BaseObject* object, Property::Index propertyIndex, const
         std::string valueString;
         if(value.Get(valueString))
         {
-          popupImpl.SetTailDownImage(valueString);
+          popupImpl.SetTailDownImage(std::move(valueString));
         }
         break;
       }
@@ -1366,7 +1359,7 @@ void Popup::SetProperty(BaseObject* object, Property::Index propertyIndex, const
         std::string valueString;
         if(value.Get(valueString))
         {
-          popupImpl.SetTailLeftImage(valueString);
+          popupImpl.SetTailLeftImage(std::move(valueString));
         }
         break;
       }
@@ -1375,7 +1368,7 @@ void Popup::SetProperty(BaseObject* object, Property::Index propertyIndex, const
         std::string valueString;
         if(value.Get(valueString))
         {
-          popupImpl.SetTailRightImage(valueString);
+          popupImpl.SetTailRightImage(std::move(valueString));
         }
         break;
       }
@@ -1399,21 +1392,21 @@ Property::Value Popup::GetProperty(BaseObject* object, Property::Index propertyI
       {
         Property::Map map;
         Scripting::CreatePropertyMap(popupImpl.GetTitle(), map);
-        value = map;
+        value = std::move(map);
         break;
       }
       case Toolkit::Popup::Property::CONTENT:
       {
         Property::Map map;
         Scripting::CreatePropertyMap(popupImpl.GetContent(), map);
-        value = map;
+        value = std::move(map);
         break;
       }
       case Toolkit::Popup::Property::FOOTER:
       {
         Property::Map map;
         Scripting::CreatePropertyMap(popupImpl.GetFooter(), map);
-        value = map;
+        value = std::move(map);
         break;
       }
       case Toolkit::Popup::Property::DISPLAY_STATE:
@@ -1455,14 +1448,14 @@ Property::Value Popup::GetProperty(BaseObject* object, Property::Index propertyI
       {
         // Note: Cannot retrieve property map from animation.
         Property::Map map;
-        value = map;
+        value = std::move(map);
         break;
       }
       case Toolkit::Popup::Property::EXIT_ANIMATION:
       {
         // Note: Cannot retrieve property map from animation.
         Property::Map map;
-        value = map;
+        value = std::move(map);
         break;
       }
       case Toolkit::Popup::Property::AUTO_HIDE_DELAY:
@@ -2002,7 +1995,7 @@ void Popup::SetupTouch()
   }
 }
 
-std::string Popup::AccessibleImpl::GetNameRaw()
+std::string Popup::PopupAccessible::GetNameRaw() const
 {
   auto        popup = Toolkit::Popup::DownCast(Self());
   std::string title;
@@ -2010,7 +2003,7 @@ std::string Popup::AccessibleImpl::GetNameRaw()
   if(popupTitle)
   {
     std::string titleText = popupTitle.GetProperty<std::string>(Toolkit::TextLabel::Property::TEXT);
-    title                 = titleText;
+    title                 = std::move(titleText);
   }
   else
   {
@@ -2018,19 +2011,20 @@ std::string Popup::AccessibleImpl::GetNameRaw()
     if(popupContent)
     {
       std::string contentText = popupContent.GetProperty<std::string>(Toolkit::TextLabel::Property::TEXT);
-      title                   = contentText;
+      title                   = std::move(contentText);
     }
   }
   return title;
 }
 
-Dali::Accessibility::States Popup::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States Popup::PopupAccessible::CalculateStates()
 {
-  auto states       = DevelControl::AccessibleImpl::CalculateStates();
+  auto states       = DevelControl::ControlAccessible::CalculateStates();
   auto popup        = Toolkit::Popup::DownCast(Self());
   auto displayState = popup.GetProperty<std::string>(Toolkit::Popup::Property::DISPLAY_STATE);
 
   states[Dali::Accessibility::State::SHOWING] = (displayState == "SHOWN" || displayState == "SHOWING");
+  states[Dali::Accessibility::State::MODAL]   = true;
 
   return states;
 }
diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h
index 630caa8..0efba18 100644
--- a/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_POPUP_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@ public:
   /**
    * @copydoc Toolkit::Popup::IsTailVisible
    */
-  const bool IsTailVisible() const;
+  bool IsTailVisible() const;
 
   /**
    * @copydoc Toolkit::Popup::SetTailPosition
@@ -172,7 +172,7 @@ public:
   /**
    * @copydoc Toolkit::Popup::IsBackingEnabled
    */
-  const bool IsBackingEnabled() const;
+  bool IsBackingEnabled() const;
 
   /**
    * @copydoc Toolkit::Popup::SetBackingColor
@@ -241,11 +241,19 @@ public:
   static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
 
 protected:
-  struct AccessibleImpl : public DevelControl::AccessibleImpl
+  class PopupAccessible : public DevelControl::ControlAccessible
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
 
-    std::string                 GetNameRaw() override;
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetNameRaw()
+     */
+    std::string GetNameRaw() const override;
+
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+     */
     Dali::Accessibility::States CalculateStates() override;
   };
 
@@ -332,7 +340,7 @@ private:
    *
    * @return True if the popup is touch-transparent.
    */
-  const bool IsTouchTransparent() const;
+  bool IsTouchTransparent() const;
 
   /**
    * @brief Allows the popup entry animation to be setup from a Property::Map that could
@@ -429,6 +437,11 @@ private:
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * Called whenever the popup layout is re-set up.
    * Normally due to a change in contents.
    * Note: This is only done when the popup is shown.
diff --git a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
index 1006307..2432fb1 100644
--- a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,12 +165,14 @@ ProgressBar::~ProgressBar()
 
 void ProgressBar::OnInitialize()
 {
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::PROGRESS_BAR));
-  });
-  //Enable highightability
-  Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+  // Accessibility
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::PROGRESS_BAR);
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+}
+
+DevelControl::ControlAccessible* ProgressBar::CreateAccessibleObject()
+{
+  return new ProgressBarAccessible(Self());
 }
 
 void ProgressBar::OnRelayout(const Vector2& size, RelayoutContainer& container)
@@ -259,7 +261,7 @@ void ProgressBar::SetProgressValue(float value)
 {
   // update the progress bar value (taking float precision errors into account)
   // TODO : it seems 0.0f cannot into this statement.
-  if((mProgressValue != value) &&
+  if((!Equals(mProgressValue, value)) &&
      ((value >= DEFAULT_LOWER_BOUND) || (Equals(value, DEFAULT_LOWER_BOUND))) &&
      ((value <= DEFAULT_UPPER_BOUND) || (Equals(value, DEFAULT_UPPER_BOUND))))
   {
@@ -271,7 +273,11 @@ void ProgressBar::SetProgressValue(float value)
     mValueChangedSignal.Emit(self, mProgressValue, mSecondaryProgressValue);
     if(Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor())
     {
-      Control::Impl::GetAccessibilityObject(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::VALUE);
+      auto accessible = GetAccessibleObject();
+      if(DALI_LIKELY(accessible))
+      {
+        accessible->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::VALUE);
+      }
     }
     RelayoutRequest();
   }
@@ -286,7 +292,7 @@ void ProgressBar::SetSecondaryProgressValue(float value)
 {
   // update the progress bar value (taking float precision errors into account)
   // TODO : it seems 0.0f cannot into this statement.
-  if((mSecondaryProgressValue != value) &&
+  if((!Equals(mSecondaryProgressValue, value)) &&
      ((value >= DEFAULT_LOWER_BOUND) || (Equals(value, DEFAULT_LOWER_BOUND))) &&
      ((value <= DEFAULT_UPPER_BOUND) || (Equals(value, DEFAULT_UPPER_BOUND))))
   {
@@ -676,23 +682,28 @@ void ProgressBar::OnSceneConnection(int depth)
   }
 }
 
-double ProgressBar::AccessibleImpl::GetMinimum()
+double ProgressBar::ProgressBarAccessible::GetMinimum() const
 {
   return DEFAULT_LOWER_BOUND;
 }
 
-double ProgressBar::AccessibleImpl::GetCurrent()
+double ProgressBar::ProgressBarAccessible::GetCurrent() const
 {
   auto self = Toolkit::ProgressBar::DownCast(Self());
   return self.GetProperty(Toolkit::ProgressBar::Property::PROGRESS_VALUE).Get<float>();
 }
 
-double ProgressBar::AccessibleImpl::GetMaximum()
+std::string ProgressBar::ProgressBarAccessible::GetValueText() const
+{
+  return {}; // Text mode is not used at the moment
+}
+
+double ProgressBar::ProgressBarAccessible::GetMaximum() const
 {
   return DEFAULT_UPPER_BOUND;
 }
 
-bool ProgressBar::AccessibleImpl::SetCurrent(double current)
+bool ProgressBar::ProgressBarAccessible::SetCurrent(double current)
 {
   if(current < GetMinimum() || current > GetMaximum())
   {
@@ -704,7 +715,7 @@ bool ProgressBar::AccessibleImpl::SetCurrent(double current)
   return true;
 }
 
-double ProgressBar::AccessibleImpl::GetMinimumIncrement()
+double ProgressBar::ProgressBarAccessible::GetMinimumIncrement() const
 {
   return 0.0;
 }
diff --git a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
index 9ff203a..f128859 100644
--- a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
+++ b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/devel-api/atspi-interfaces/value.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/progress-bar/progress-bar-devel.h>
@@ -198,6 +201,11 @@ private:
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * Get the range of the valid values the ProgressBar handle can move between
    *
    * @param[in] currentSize The current size of the ProgressBar
@@ -262,15 +270,41 @@ private:
   Property::Map           mSecondaryProgressVisualMap;    ///< To backup visual properties when switching determinate/indeterminate.
 
 protected:
-  struct AccessibleImpl : public DevelControl::AccessibleImpl,
-                          public virtual Dali::Accessibility::Value
+  class ProgressBarAccessible : public DevelControl::ControlAccessible,
+                                public virtual Dali::Accessibility::Value
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
-    double GetMinimum() override;
-    double GetCurrent() override;
-    double GetMaximum() override;
-    bool   SetCurrent(double) override;
-    double GetMinimumIncrement() override;
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMinimum()
+     */
+    double GetMinimum() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetCurrent()
+     */
+    double GetCurrent() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetValueText()
+     */
+    std::string GetValueText() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMaximum()
+     */
+    double GetMaximum() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::SetCurrent()
+     */
+    bool SetCurrent(double) override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMinimumIncrement()
+     */
+    double GetMinimumIncrement() const override;
   };
 };
 
diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp
index 2c8de12..b1cd70d 100644
--- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp
+++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,14 @@
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali/devel-api/actors/camera-actor-devel.h>
 #include <dali/devel-api/adaptor-framework/file-stream.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/integration-api/debug.h>
 
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.h>
+
 namespace Dali
 {
 namespace Toolkit
@@ -34,6 +38,8 @@ namespace Gltf
 {
 namespace
 {
+constexpr float MIN_DURATION_SECONDS = 1e-2f;
+
 // Utility functions
 const TreeNode* Tidx(const TreeNode* node, uint32_t index)
 {
@@ -231,7 +237,7 @@ void FitBuffer(Dali::Vector<Vector4>& bufferDestination, Dali::Vector<T>& buffer
 template<typename T>
 bool ReadBinFile(Vector<T>& dataBuffer, std::string url, int32_t offset, int32_t count)
 {
-  size_t readCount = 0;
+  size_t           readCount = 0;
   Dali::FileStream fileStream(url, FileStream::READ | FileStream::BINARY);
   FILE*            fp = fileStream.GetFile();
   if(fp)
@@ -392,10 +398,10 @@ void SetVertexBufferData(MeshInfo& meshInfo, std::string path, std::vector<Acces
   if(accessorIdx >= 0)
   {
     Dali::Vector<Vector3> bufferData;
-    LoadDataFromAccessor(accessorIdx, bufferData, path, accessorArray, bufferViewArray, bufferArray);
+    LoadDataFromAccessor(accessorIdx, bufferData, std::move(path), accessorArray, bufferViewArray, bufferArray);
     SetMeshInfoAndCanonize(meshInfo, bufferData);
 
-    VertexBuffer vertexBuffer = CreateVertexBuffer<Vector3>(bufferData, map, type);
+    VertexBuffer vertexBuffer = CreateVertexBuffer<Vector3>(bufferData, std::move(map), type);
     meshInfo.geometry.AddVertexBuffer(vertexBuffer);
   }
 }
@@ -406,9 +412,9 @@ void SetAttributeBufferData(MeshInfo& meshInfo, std::string path, std::vector<Ac
   if(accessorIdx >= 0)
   {
     Dali::Vector<T> bufferData;
-    LoadDataFromAccessor(accessorIdx, bufferData, path, accessorArray, bufferViewArray, bufferArray);
+    LoadDataFromAccessor(accessorIdx, bufferData, std::move(path), accessorArray, bufferViewArray, bufferArray);
 
-    VertexBuffer vertexBuffer = CreateVertexBuffer<T>(bufferData, map, type);
+    VertexBuffer vertexBuffer = CreateVertexBuffer<T>(bufferData, std::move(map), type);
     meshInfo.geometry.AddVertexBuffer(vertexBuffer);
   }
 }
@@ -416,7 +422,7 @@ void SetAttributeBufferData(MeshInfo& meshInfo, std::string path, std::vector<Ac
 void SetIndexBuffersData(MeshInfo& meshInfo, std::string path, std::vector<AccessorInfo>& accessorArray, std::vector<BufferViewInfo>& bufferViewArray, std::vector<BufferInfo>& bufferArray, int32_t indexIdx)
 {
   Dali::Vector<uint16_t> indexBufferData;
-  LoadDataFromAccessor(indexIdx, indexBufferData, path, accessorArray, bufferViewArray, bufferArray);
+  LoadDataFromAccessor(indexIdx, indexBufferData, std::move(path), accessorArray, bufferViewArray, bufferArray);
   meshInfo.geometry.SetIndexBuffer(&indexBufferData[0], indexBufferData.Size());
 }
 
@@ -430,7 +436,7 @@ float LoadKeyFrames(const AnimationSamplerInfo& currentSampler, const Property::
   LoadDataFromAccessor<T>(currentSampler.output, outputBufferData, path, accessorArray, bufferViewArray, bufferArray);
 
   uint32_t keyframeNum     = inputBufferData.Size();
-  float    lengthAnimation = inputBufferData[inputBufferData.Size() - 1];
+  float    lengthAnimation = std::max((inputBufferData.Size() > 0u ? inputBufferData[inputBufferData.Size() - 1] : MIN_DURATION_SECONDS), MIN_DURATION_SECONDS);
   for(uint32_t i = 0; i < keyframeNum; i++)
   {
     if(propIndex == Dali::Actor::Property::ORIENTATION)
@@ -1300,9 +1306,22 @@ void Loader::LoadCamera(Scene3dView& scene3dView)
     if(cameraInfo.type == "orthographic")
     {
       LoadOrthoGraphic((*cameraIter).second, cameraInfo);
-      float xMag_2 = cameraInfo.orthographic.xmag / 2.0;
-      float yMag_2 = cameraInfo.orthographic.ymag / 2.0;
-      cameraActor.SetOrthographicProjection(-xMag_2, xMag_2, yMag_2, -yMag_2, cameraInfo.orthographic.znear, cameraInfo.orthographic.zfar);
+      float       xMag_2 = cameraInfo.orthographic.xmag / 2.0;
+      float       yMag_2 = cameraInfo.orthographic.ymag / 2.0;
+      const float aspect = xMag_2 / yMag_2;
+
+      cameraActor.SetProjectionMode(Dali::Camera::ORTHOGRAPHIC_PROJECTION);
+      cameraActor.SetProperty(Dali::DevelCameraActor::Property::ORTHOGRAPHIC_SIZE, yMag_2);
+
+      cameraActor.SetNearClippingPlane(cameraInfo.orthographic.znear);
+      if(cameraInfo.orthographic.zfar > 0.0)
+      {
+        cameraActor.SetFarClippingPlane(cameraInfo.orthographic.zfar);
+      }
+      if(aspect > 0.0f) // Avoid divide-by-zero logic
+      {
+        cameraActor.SetAspectRatio(aspect);
+      }
     }
     else if(cameraInfo.type == "perspective")
     {
@@ -1509,7 +1528,7 @@ Actor Loader::AddNode(Scene3dView& scene3dView, uint32_t index)
     VERTEX_SHADER += SHADER_GLTF_PHYSICALLY_BASED_SHADER_VERT.data();
     FRAGMENT_SHADER = SHADER_GLTF_GLES_VERSION_300_DEF.data();
 
-    bool useIBL = (scene3dView.GetLightType() >= Toolkit::Scene3dView::LightType::IMAGE_BASED_LIGHT);
+    bool useIBL = scene3dView.HasImageBasedLighting();
     if(isMaterial)
     {
       MaterialInfo materialInfo = mMaterialArray[meshInfo.materialsIdx];
@@ -1572,7 +1591,9 @@ Actor Loader::AddNode(Scene3dView& scene3dView, uint32_t index)
     FRAGMENT_SHADER += SHADER_GLTF_PHYSICALLY_BASED_SHADER_FRAG.data();
     if(!mShaderCache[shaderTypeIndex])
     {
-      mShaderCache[shaderTypeIndex] = Shader::New(VERTEX_SHADER, FRAGMENT_SHADER);
+      std::ostringstream oss;
+      oss << "GLTF_VIEW_" << shaderTypeIndex;
+      mShaderCache[shaderTypeIndex] = Shader::New(VERTEX_SHADER, FRAGMENT_SHADER, Shader::Hint::NONE, oss.str());
       scene3dView.AddShader(mShaderCache[shaderTypeIndex]);
     }
     Shader shader = mShaderCache[shaderTypeIndex];
@@ -1592,11 +1613,14 @@ Actor Loader::AddNode(Scene3dView& scene3dView, uint32_t index)
     actor.RotateBy(orientation);
     actor.SetProperty(Actor::Property::POSITION, translation);
 
-    shader.RegisterProperty("uLightType", (scene3dView.GetLightType() & ~Toolkit::Scene3dView::LightType::IMAGE_BASED_LIGHT));
+    float hasLightSource = static_cast<float>(!!(scene3dView.GetLightType() & (Toolkit::Scene3dView::LightType::POINT_LIGHT | Toolkit::Scene3dView::LightType::DIRECTIONAL_LIGHT)));
+    float isPointLight   = static_cast<float>(!!(scene3dView.GetLightType() & Toolkit::Scene3dView::LightType::POINT_LIGHT));
+    shader.RegisterProperty("uHasLightSource", hasLightSource);
+    shader.RegisterProperty("uIsPointLight", isPointLight);
     shader.RegisterProperty("uLightVector", scene3dView.GetLightVector());
     shader.RegisterProperty("uLightColor", scene3dView.GetLightColor());
 
-    actor.RegisterProperty("uIsColor", meshInfo.attribute.COLOR.size() > 0);
+    actor.RegisterProperty("uHasVertexColor", meshInfo.attribute.COLOR.size() > 0 ? 1.0f : 0.0f);
     if(isMaterial)
     {
       MaterialInfo materialInfo = mMaterialArray[meshInfo.materialsIdx];
@@ -1605,15 +1629,15 @@ Actor Loader::AddNode(Scene3dView& scene3dView, uint32_t index)
 
       if(materialInfo.alphaMode == "OPAQUE")
       {
-        actor.RegisterProperty("alphaMode", 0);
+        actor.RegisterProperty("uAlphaMode", 0.0f);
       }
       else if(materialInfo.alphaMode == "MASK")
       {
-        actor.RegisterProperty("alphaMode", 1);
+        actor.RegisterProperty("uAlphaMode", 1.0f);
       }
       else
       {
-        actor.RegisterProperty("alphaMode", 2);
+        actor.RegisterProperty("uAlphaMode", 2.0f);
       }
       actor.RegisterProperty("alphaCutoff", materialInfo.alphaCutoff);
 
diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
index 7303324..5793116 100644
--- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
+++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_GLTF_LOADER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/animation/animation.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/rendering/renderer.h>
 #include <dali/public-api/rendering/shader.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/builder/json-parser.h>
-#include <dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.h>
 
 using namespace Dali;
 
@@ -36,6 +36,8 @@ namespace Toolkit
 {
 namespace Internal
 {
+class Scene3dView;
+
 namespace Gltf
 {
 enum ShaderType
diff --git a/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp b/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp
index aa8438a..a23c03e 100644
--- a/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/internal/controls/scene3d-view/gltf-loader.h>
 
 namespace Dali
 {
@@ -35,7 +36,7 @@ namespace
 const char* const IMAGE_BRDF_FILE_NAME = "brdfLUT.png";
 
 // glTF file extension
-const std::string GLTF_EXT(".gltf");
+const char* GLTF_EXT(".gltf");
 
 /**
  * cube map face index
@@ -54,7 +55,8 @@ Scene3dView::Scene3dView()
   mAnimationArray(),
   mLightType(Toolkit::Scene3dView::LightType::NONE),
   mLightVector(Vector3::ONE),
-  mLightColor(Vector3::ONE)
+  mLightColor(Vector3::ONE),
+  mUseIBL(false)
 {
 }
 
@@ -130,20 +132,16 @@ bool Scene3dView::PlayAnimations()
 
 bool Scene3dView::SetLight(Toolkit::Scene3dView::LightType type, Vector3 lightVector, Vector3 lightColor)
 {
-  if(type > Toolkit::Scene3dView::LightType::DIRECTIONAL_LIGHT)
-  {
-    return false;
-  }
-
-  mLightType = static_cast<Toolkit::Scene3dView::LightType>(
-    (mLightType >= Toolkit::Scene3dView::LightType::IMAGE_BASED_LIGHT) ? Toolkit::Scene3dView::LightType::IMAGE_BASED_LIGHT + type : type);
-
+  mLightType   = type;
   mLightVector = lightVector;
   mLightColor  = lightColor;
 
   for(auto&& shader : mShaderArray)
   {
-    shader.RegisterProperty("uLightType", (GetLightType() & ~Toolkit::Scene3dView::LightType::IMAGE_BASED_LIGHT));
+    float hasLightSource = static_cast<float>(!!(GetLightType() & (Toolkit::Scene3dView::LightType::POINT_LIGHT | Toolkit::Scene3dView::LightType::DIRECTIONAL_LIGHT)));
+    float isPointLight   = static_cast<float>(!!(GetLightType() & Toolkit::Scene3dView::LightType::POINT_LIGHT));
+    shader.RegisterProperty("uHasLightSource", hasLightSource);
+    shader.RegisterProperty("uIsPointLight", isPointLight);
     shader.RegisterProperty("uLightVector", lightVector);
     shader.RegisterProperty("uLightColor", lightColor);
   }
@@ -156,15 +154,22 @@ uint8_t* Scene3dView::GetCroppedBuffer(uint8_t* sourceBuffer, uint32_t bytesPerP
   uint32_t byteSize   = bytesPerPixel * xFaceSize * yFaceSize;
   uint8_t* destBuffer = reinterpret_cast<uint8_t*>(malloc(byteSize + 4u));
 
-  int32_t srcStride  = width * bytesPerPixel;
-  int32_t destStride = xFaceSize * bytesPerPixel;
-  int32_t srcOffset  = xOffset * bytesPerPixel + yOffset * srcStride;
-  int32_t destOffset = 0;
-  for(uint16_t row = yOffset; row < yOffset + yFaceSize; ++row)
+  if(DALI_LIKELY(destBuffer))
+  {
+    int32_t srcStride  = width * bytesPerPixel;
+    int32_t destStride = xFaceSize * bytesPerPixel;
+    int32_t srcOffset  = xOffset * bytesPerPixel + yOffset * srcStride;
+    int32_t destOffset = 0;
+    for(uint16_t row = yOffset; row < yOffset + yFaceSize; ++row)
+    {
+      memcpy(destBuffer + destOffset, sourceBuffer + srcOffset, destStride);
+      srcOffset += srcStride;
+      destOffset += destStride;
+    }
+  }
+  else
   {
-    memcpy(destBuffer + destOffset, sourceBuffer + srcOffset, destStride);
-    srcOffset += srcStride;
-    destOffset += destStride;
+    DALI_LOG_ERROR("malloc is failed. request malloc size : %u\n", byteSize + 4u);
   }
 
   return destBuffer;
@@ -196,15 +201,16 @@ void Scene3dView::UploadTextureFace(Texture& texture, Devel::PixelBuffer pixelBu
   uint32_t xOffset = CUBEMAP_INDEX_X[cubeType][faceIndex] * faceSize;
   uint32_t yOffset = CUBEMAP_INDEX_Y[cubeType][faceIndex] * faceSize;
 
-  uint8_t*  tempImageBuffer = GetCroppedBuffer(imageBuffer, bytesPerPixel, imageWidth, imageHeight, xOffset, yOffset, faceSize, faceSize);
-  PixelData pixelData       = PixelData::New(tempImageBuffer, faceSize * faceSize * bytesPerPixel, faceSize, faceSize, pixelBuffer.GetPixelFormat(), PixelData::FREE);
-  texture.Upload(pixelData, CubeMapLayer::POSITIVE_X + faceIndex, 0, 0, 0, faceSize, faceSize);
+  uint8_t* tempImageBuffer = GetCroppedBuffer(imageBuffer, bytesPerPixel, imageWidth, imageHeight, xOffset, yOffset, faceSize, faceSize);
+  if(DALI_LIKELY(tempImageBuffer))
+  {
+    PixelData pixelData = PixelData::New(tempImageBuffer, faceSize * faceSize * bytesPerPixel, faceSize, faceSize, pixelBuffer.GetPixelFormat(), PixelData::FREE);
+    texture.Upload(pixelData, CubeMapLayer::POSITIVE_X + faceIndex, 0, 0, 0, faceSize, faceSize);
+  }
 }
 
 void Scene3dView::SetCubeMap(const std::string& diffuseTexturePath, const std::string& specularTexturePath, Vector4 scaleFactor)
 {
-  mLightType = Toolkit::Scene3dView::LightType::IMAGE_BASED_LIGHT;
-
   // BRDF texture
   const std::string imageDirPath = AssetManager::GetDaliImagePath();
   const std::string imageBrdfUrl = imageDirPath + IMAGE_BRDF_FILE_NAME;
@@ -235,6 +241,7 @@ void Scene3dView::SetCubeMap(const std::string& diffuseTexturePath, const std::s
   mSpecularTexture.GenerateMipmaps();
 
   mIBLScaleFactor = scaleFactor;
+  mUseIBL         = true;
 }
 
 bool Scene3dView::SetDefaultCamera(const Dali::Camera::Type type, const float nearPlane, const Vector3 cameraPosition)
@@ -318,6 +325,11 @@ Texture Scene3dView::GetSpecularTexture()
   return mSpecularTexture;
 }
 
+bool Scene3dView::HasImageBasedLighting()
+{
+  return mUseIBL;
+}
+
 Texture Scene3dView::GetDiffuseTexture()
 {
   return mDiffuseTexture;
diff --git a/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.h b/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.h
index 6dbe859..6aec3d4 100644
--- a/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.h
+++ b/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_SCENE3D_VIEW_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,11 @@
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/rendering/shader.h>
+#include <dali/public-api/rendering/texture.h>
 #include <cstring>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h>
-#include <dali-toolkit/internal/controls/scene3d-view/gltf-loader.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 namespace Dali
@@ -185,6 +185,11 @@ public:
    */
   Texture GetSpecularTexture();
 
+  /**
+   * @brief Get whether the scene has image based rendering or not.
+   */
+  bool HasImageBasedLighting();
+
 private:
   /**
    * @brief Get Cropped image buffer.
@@ -232,6 +237,7 @@ private:
   Texture mBRDFTexture;     // BRDF texture for the PBR rendering
   Texture mSpecularTexture; // Specular cube map texture
   Texture mDiffuseTexture;  // Diffuse cube map texture
+  bool    mUseIBL;
 
 private:
   // Undefined copy constructor.
diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index 1da4297..bf177fa 100644
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/object/property-array.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/object/type-registry.h>
@@ -209,13 +210,17 @@ ScrollBar::~ScrollBar()
 
 void ScrollBar::OnInitialize()
 {
+  auto self = Self();
+
   CreateDefaultIndicatorActor();
-  Self().SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
+  self.SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
+
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::SCROLL_BAR);
+}
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_BAR));
-  });
+DevelControl::ControlAccessible* ScrollBar::CreateAccessibleObject()
+{
+  return new ScrollBarAccessible(Self());
 }
 
 void ScrollBar::SetScrollPropertySource(Handle handle, Property::Index propertyScrollPosition, Property::Index propertyMinScrollPosition, Property::Index propertyMaxScrollPosition, Property::Index propertyScrollContentSize)
@@ -360,7 +365,11 @@ void ScrollBar::OnScrollPositionIntervalReached(PropertyNotification& source)
     mScrollPositionIntervalReachedSignal.Emit(scrollableHandle.GetCurrentProperty<float>(mPropertyScrollPosition));
     if(Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor())
     {
-      Control::Impl::GetAccessibilityObject(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::VALUE);
+      auto accessible = GetAccessibleObject();
+      if(DALI_LIKELY(accessible))
+      {
+        accessible->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::VALUE);
+      }
     }
   }
 }
@@ -698,12 +707,22 @@ void ScrollBar::SetProperty(BaseObject* object, Property::Index index, const Pro
           Dali::Vector<float> positions;
           size_t              positionCount = array->Count();
           positions.Resize(positionCount);
+
+          bool valid = true;
           for(size_t i = 0; i != positionCount; ++i)
           {
-            array->GetElementAt(i).Get(positions[i]);
+            if(DALI_UNLIKELY(!array->GetElementAt(i).Get(positions[i])))
+            {
+              // Given array is invalid. Fast out.
+              valid = false;
+              break;
+            }
           }
 
-          scrollBarImpl.SetScrollPositionIntervals(positions);
+          if(DALI_LIKELY(valid))
+          {
+            scrollBarImpl.SetScrollPositionIntervals(positions);
+          }
         }
         break;
       }
@@ -861,28 +880,33 @@ Toolkit::ScrollBar ScrollBar::New(Toolkit::ScrollBar::Direction direction)
   return handle;
 }
 
-double ScrollBar::AccessibleImpl::GetMinimum()
+double ScrollBar::ScrollBarAccessible::GetMinimum() const
 {
-  auto self = Toolkit::ScrollBar::DownCast(Self());
+  auto   self             = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
   return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyMinScrollPosition) : 0.0f;
 }
 
-double ScrollBar::AccessibleImpl::GetCurrent()
+double ScrollBar::ScrollBarAccessible::GetCurrent() const
 {
-  auto self = Toolkit::ScrollBar::DownCast(Self());
+  auto   self             = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
   return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyScrollPosition) : 0.0f;
 }
 
-double ScrollBar::AccessibleImpl::GetMaximum()
+std::string ScrollBar::ScrollBarAccessible::GetValueText() const
+{
+  return {}; // Text mode is not used at the moment
+}
+
+double ScrollBar::ScrollBarAccessible::GetMaximum() const
 {
-  auto self = Toolkit::ScrollBar::DownCast(Self());
+  auto   self             = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
   return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyMaxScrollPosition) : 1.0f;
 }
 
-bool ScrollBar::AccessibleImpl::SetCurrent(double current)
+bool ScrollBar::ScrollBarAccessible::SetCurrent(double current)
 {
   if(current < GetMinimum() || current > GetMaximum())
   {
@@ -891,7 +915,7 @@ bool ScrollBar::AccessibleImpl::SetCurrent(double current)
 
   auto valueBefore = GetCurrent();
 
-  auto self = Toolkit::ScrollBar::DownCast(Self());
+  auto   self             = Toolkit::ScrollBar::DownCast(Self());
   Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
   if(!scrollableHandle)
   {
@@ -902,7 +926,7 @@ bool ScrollBar::AccessibleImpl::SetCurrent(double current)
 
   auto valueAfter = GetCurrent();
 
-  if((current != valueBefore) && (valueBefore == valueAfter))
+  if(!Dali::Equals(current, valueBefore) && Dali::Equals(valueBefore, valueAfter))
   {
     return false;
   }
@@ -910,7 +934,7 @@ bool ScrollBar::AccessibleImpl::SetCurrent(double current)
   return true;
 }
 
-double ScrollBar::AccessibleImpl::GetMinimumIncrement()
+double ScrollBar::ScrollBarAccessible::GetMinimumIncrement() const
 {
   return 1.0;
 }
diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index abb5200..f0a5b6f 100644
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/atspi-interfaces/value.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/constraint.h>
@@ -210,6 +211,11 @@ private: // from Control
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Toolkit::Control::OnPan
    */
   void OnPan(const PanGesture& gesture) override;
@@ -313,15 +319,41 @@ private:
   bool mIndicatorFirstShow : 1; ///< True if the indicator has never been shown
 
 protected:
-  struct AccessibleImpl : public DevelControl::AccessibleImpl,
-                          public virtual Dali::Accessibility::Value
+  class ScrollBarAccessible : public DevelControl::ControlAccessible,
+                              public virtual Dali::Accessibility::Value
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
-    double GetMinimum() override;
-    double GetCurrent() override;
-    double GetMaximum() override;
-    bool   SetCurrent(double) override;
-    double GetMinimumIncrement() override;
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMinimum()
+     */
+    double GetMinimum() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetCurrent()
+     */
+    double GetCurrent() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetValueText()
+     */
+    std::string GetValueText() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMaximum()
+     */
+    double GetMaximum() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::SetCurrent()
+     */
+    bool SetCurrent(double) override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMinimumIncrement()
+     */
+    double GetMinimumIncrement() const override;
   };
 };
 
diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
index 2d61cfa..1cfbe5a 100644
--- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ Actor CreateBouncingEffectActor(Property::Index& bouncePropertyIndex)
   meshGeometry.SetIndexBuffer(indexData, sizeof(indexData) / sizeof(indexData[0]));
 
   // Create the shader
-  Shader shader = Shader::New(SHADER_BOUNCING_EFFECT_MESH_SHADER_VERT, SHADER_BOUNCING_EFFECT_MESH_SHADER_FRAG);
+  Shader shader = Shader::New(SHADER_BOUNCING_EFFECT_MESH_SHADER_VERT, SHADER_BOUNCING_EFFECT_MESH_SHADER_FRAG, Shader::Hint::NONE, "BOUNCING_EFFECT");
 
   // Create renderer
   Renderer renderer = Renderer::New(meshGeometry, shader);
diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index e9b58c8..fbf63f6 100644
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -367,9 +367,12 @@ void ItemView::OnInitialize()
   // Connect wheel event
   self.WheelEventSignal().Connect(this, &ItemView::OnWheelEvent);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_PANE));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::SCROLL_PANE);
+}
+
+DevelControl::ControlAccessible* ItemView::CreateAccessibleObject()
+{
+  return new ItemViewAccessible(Self());
 }
 
 ItemView::~ItemView()
@@ -1345,7 +1348,7 @@ void ItemView::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)
   }
 }
 
-bool ItemView::AccessibleImpl::ScrollToChild(Actor child)
+bool ItemView::ItemViewAccessible::ScrollToChild(Actor child)
 {
   auto itemView = Dali::Toolkit::ItemView::DownCast(Self());
   Toolkit::GetImpl(itemView).OnKeyboardFocusChangeCommitted(child);
@@ -1917,8 +1920,7 @@ Property::Value ItemView::GetProperty(BaseObject* object, Property::Index index)
 
       case Toolkit::ItemView::Property::LAYOUT:
       {
-        Property::Array layouts = itemViewImpl.GetLayoutArray();
-        value                   = layouts;
+        value = itemViewImpl.GetLayoutArray();
         break;
       }
     }
diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
index 7e3d8c1..b388e22 100644
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
@@ -419,6 +419,11 @@ private: // From Control
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Toolkit::Control::OnAccessibilityPan()
    */
   bool OnAccessibilityPan(PanGesture gesture) override;
@@ -434,10 +439,14 @@ private: // From Control
   void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) override;
 
 protected:
-  struct AccessibleImpl : public Scrollable::AccessibleImpl
+  class ItemViewAccessible : public Scrollable::ScrollableAccessible
   {
-    using Scrollable::AccessibleImpl::AccessibleImpl;
+  public:
+    using Scrollable::ScrollableAccessible::ScrollableAccessible;
 
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::ScrollToChild()
+     */
     bool ScrollToChild(Actor child) override;
   };
 
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.cpp
new file mode 100644
index 0000000..24827dd
--- /dev/null
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.cpp
@@ -0,0 +1,552 @@
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+
+float FinalDefaultAlphaFunction(float offset)
+{
+  return offset * 0.5f;
+}
+
+/**
+ * Internal Relative position Constraint
+ * Generates the relative position value of the scroll view
+ * based on the absolute position, and it's relation to the
+ * scroll domain. This is a value from 0.0f to 1.0f in each
+ * scroll position axis.
+ */
+void InternalRelativePositionConstraint(Vector2& relativePosition, const PropertyInputContainer& inputs)
+{
+  Vector2        position = -inputs[0]->GetVector2();
+  const Vector2& min      = inputs[1]->GetVector2();
+  const Vector2& max      = inputs[2]->GetVector2();
+  const Vector3& size     = inputs[3]->GetVector3();
+
+  position.x = WrapInDomain(position.x, min.x, max.x);
+  position.y = WrapInDomain(position.y, min.y, max.y);
+
+  Vector2 domainSize = (max - min) - size.GetVectorXY();
+
+  relativePosition.x = domainSize.x > Math::MACHINE_EPSILON_1 ? fabsf((position.x - min.x) / domainSize.x) : 0.0f;
+  relativePosition.y = domainSize.y > Math::MACHINE_EPSILON_1 ? fabsf((position.y - min.y) / domainSize.y) : 0.0f;
+}
+
+/**
+ * Internal scroll domain Constraint
+ * Generates the scroll domain of the scroll view.
+ */
+void InternalScrollDomainConstraint(Vector2& scrollDomain, const PropertyInputContainer& inputs)
+{
+  const Vector2& min  = inputs[0]->GetVector2();
+  const Vector2& max  = inputs[1]->GetVector2();
+  const Vector3& size = inputs[2]->GetVector3();
+
+  scrollDomain = (max - min) - size.GetVectorXY();
+}
+
+/**
+ * Internal maximum scroll position Constraint
+ * Generates the maximum scroll position of the scroll view.
+ */
+void InternalPrePositionMaxConstraint(Vector2& scrollMax, const PropertyInputContainer& inputs)
+{
+  const Vector2& max  = inputs[0]->GetVector2();
+  const Vector3& size = inputs[1]->GetVector3();
+
+  scrollMax = max - size.GetVectorXY();
+}
+
+/**
+ * Internal Pre-Position Property Constraint.
+ *
+ * Generates position property based on current position + gesture displacement.
+ * Or generates position property based on positionX/Y.
+ * Note: This is the position prior to any clamping at scroll boundaries.
+ */
+struct InternalPrePositionConstraint
+{
+  InternalPrePositionConstraint(const Vector2&       initialPanPosition,
+                                const Vector2&       initialPanMask,
+                                bool                 axisAutoLock,
+                                float                axisAutoLockGradient,
+                                ScrollView::LockAxis initialLockAxis,
+                                const Vector2&       maxOvershoot,
+                                const RulerPtr&      rulerX,
+                                const RulerPtr&      rulerY)
+  : mLocalStart(initialPanPosition),
+    mInitialPanMask(initialPanMask),
+    mMaxOvershoot(maxOvershoot),
+    mAxisAutoLockGradient(axisAutoLockGradient),
+    mLockAxis(initialLockAxis),
+    mAxisAutoLock(axisAutoLock),
+    mWasPanning(false)
+  {
+    const RulerDomain& rulerDomainX = rulerX->GetDomain();
+    const RulerDomain& rulerDomainY = rulerY->GetDomain();
+    mDomainMin                      = Vector2(rulerDomainX.min, -rulerDomainY.min);
+    mDomainMax                      = Vector2(-rulerDomainX.max, -rulerDomainY.max);
+    mClampX                         = rulerDomainX.enabled;
+    mClampY                         = rulerDomainY.enabled;
+    mFixedRulerX                    = rulerX->GetType() == Ruler::FIXED;
+    mFixedRulerY                    = rulerY->GetType() == Ruler::FIXED;
+  }
+
+  void operator()(Vector2& scrollPostPosition, const PropertyInputContainer& inputs)
+  {
+    const Vector2& panPosition = inputs[0]->GetVector2();
+    const bool&    inGesture   = inputs[1]->GetBoolean();
+
+    // First check if we are within a gesture.
+    // The ScrollView may have received a start gesture from ::OnPan()
+    // while the finish gesture is received now in this constraint.
+    // This gesture must then be rejected as the value will be "old".
+    // Typically the last value from the end of the last gesture.
+    // If we are rejecting the gesture, we simply don't modify the constraint target.
+    if(inGesture)
+    {
+      if(!mWasPanning)
+      {
+        mPrePosition    = scrollPostPosition;
+        mStartPosition  = mPrePosition;
+        mCurrentPanMask = mInitialPanMask;
+        mWasPanning     = true;
+      }
+
+      // Calculate Deltas...
+      const Vector2& currentPosition = panPosition;
+      Vector2        panDelta(currentPosition - mLocalStart);
+
+      // Axis Auto Lock - locks the panning to the horizontal or vertical axis if the pan
+      // appears mostly horizontal or mostly vertical respectively...
+      if(mAxisAutoLock)
+      {
+        mLockAxis = GetLockAxis(panDelta, mLockAxis, mAxisAutoLockGradient);
+        if(mLockAxis == ScrollView::LockVertical)
+        {
+          mCurrentPanMask.y = 0.0f;
+        }
+        else if(mLockAxis == ScrollView::LockHorizontal)
+        {
+          mCurrentPanMask.x = 0.0f;
+        }
+      }
+
+      // Restrict deltas based on ruler enable/disable and axis-lock state...
+      panDelta *= mCurrentPanMask;
+
+      // Perform Position transform based on input deltas...
+      scrollPostPosition = mPrePosition;
+      scrollPostPosition += panDelta;
+
+      // if no wrapping then clamp preposition to maximum overshoot amount
+      const Vector3& size = inputs[2]->GetVector3();
+      if(mClampX)
+      {
+        float newXPosition = Clamp(scrollPostPosition.x, (mDomainMax.x + size.x) - mMaxOvershoot.x, mDomainMin.x + mMaxOvershoot.x);
+        if((newXPosition < scrollPostPosition.x - Math::MACHINE_EPSILON_1) || (newXPosition > scrollPostPosition.x + Math::MACHINE_EPSILON_1))
+        {
+          mPrePosition.x = newXPosition;
+          mLocalStart.x  = panPosition.x;
+        }
+        scrollPostPosition.x = newXPosition;
+      }
+      if(mClampY)
+      {
+        float newYPosition = Clamp(scrollPostPosition.y, (mDomainMax.y + size.y) - mMaxOvershoot.y, mDomainMin.y + mMaxOvershoot.y);
+        if((newYPosition < scrollPostPosition.y - Math::MACHINE_EPSILON_1) || (newYPosition > scrollPostPosition.y + Math::MACHINE_EPSILON_1))
+        {
+          mPrePosition.y = newYPosition;
+          mLocalStart.y  = panPosition.y;
+        }
+        scrollPostPosition.y = newYPosition;
+      }
+
+      // If we are using a fixed ruler in a particular axis, limit the maximum pages scrolled on that axis.
+      if(mFixedRulerX || mFixedRulerY)
+      {
+        // Here we limit the maximum amount that can be moved from the starting position of the gesture to one page.
+        // We do this only if we have a fixed ruler (on that axis) and the mode is enabled.
+        // Note: 1.0f is subtracted to keep the value within one page size (otherwise we stray on to the page after).
+        // Note: A further 1.0f is subtracted to handle a compensation that happens later within the flick handling code in SnapWithVelocity().
+        //       When a flick is completed, an adjustment of 1.0f is sometimes made to allow for the scenario where:
+        //       A flick finishes before the update thread has advanced the scroll position past the previous snap point.
+        Vector2 viewPageSizeLimit(size.x - (1.0f + 1.0f), size.y - (1.0f - 1.0f));
+        Vector2 minPosition(mStartPosition.x - viewPageSizeLimit.x, mStartPosition.y - viewPageSizeLimit.y);
+        Vector2 maxPosition(mStartPosition.x + viewPageSizeLimit.x, mStartPosition.y + viewPageSizeLimit.y);
+
+        if(mFixedRulerX)
+        {
+          scrollPostPosition.x = Clamp(scrollPostPosition.x, minPosition.x, maxPosition.x);
+        }
+        if(mFixedRulerY)
+        {
+          scrollPostPosition.y = Clamp(scrollPostPosition.y, minPosition.y, maxPosition.y);
+        }
+      }
+    }
+  }
+
+  Vector2 mPrePosition;
+  Vector2 mLocalStart;
+  Vector2 mStartPosition;  ///< The start position of the gesture - used to limit scroll amount (not modified by clamping).
+  Vector2 mInitialPanMask; ///< Initial pan mask (based on ruler settings).
+  Vector2 mCurrentPanMask; ///< Current pan mask that can be altered by axis lock mode.
+  Vector2 mDomainMin;
+  Vector2 mDomainMax;
+  Vector2 mMaxOvershoot;
+
+  float                mAxisAutoLockGradient; ///< Set by ScrollView
+  ScrollView::LockAxis mLockAxis;
+
+  bool mAxisAutoLock : 1; ///< Set by ScrollView
+  bool mWasPanning : 1;
+  bool mClampX : 1;
+  bool mClampY : 1;
+  bool mFixedRulerX : 1;
+  bool mFixedRulerY : 1;
+};
+
+/**
+ * Internal Position Property Constraint.
+ *
+ * Generates position property based on pre-position
+ * Note: This is the position after clamping.
+ * (uses result of InternalPrePositionConstraint)
+ */
+struct InternalPositionConstraint
+{
+  InternalPositionConstraint(const RulerDomain& domainX, const RulerDomain& domainY, bool wrap)
+  : mDomainMin(-domainX.min, -domainY.min),
+    mDomainMax(-domainX.max, -domainY.max),
+    mClampX(domainX.enabled),
+    mClampY(domainY.enabled),
+    mWrap(wrap)
+  {
+  }
+
+  void operator()(Vector2& position, const PropertyInputContainer& inputs)
+  {
+    position            = inputs[0]->GetVector2();
+    const Vector2& size = inputs[3]->GetVector3().GetVectorXY();
+    const Vector2& min  = inputs[1]->GetVector2();
+    const Vector2& max  = inputs[2]->GetVector2();
+
+    if(mWrap)
+    {
+      position.x = -WrapInDomain(-position.x, min.x, max.x);
+      position.y = -WrapInDomain(-position.y, min.y, max.y);
+    }
+    else
+    {
+      // clamp post position to domain
+      position.x = mClampX ? Clamp(position.x, mDomainMax.x + size.x, mDomainMin.x) : position.x;
+      position.y = mClampY ? Clamp(position.y, mDomainMax.y + size.y, mDomainMin.y) : position.y;
+    }
+  }
+
+  Vector2 mDomainMin;
+  Vector2 mDomainMax;
+  bool    mClampX;
+  bool    mClampY;
+  bool    mWrap;
+};
+
+/**
+ * This constraint updates the X overshoot property using the difference
+ * SCROLL_PRE_POSITION.x and SCROLL_POSITION.x, returning a relative value between 0.0f and 1.0f
+ */
+struct OvershootXConstraint
+{
+  OvershootXConstraint(float maxOvershoot)
+  : mMaxOvershoot(maxOvershoot)
+  {
+  }
+
+  void operator()(float& current, const PropertyInputContainer& inputs)
+  {
+    if(inputs[2]->GetBoolean())
+    {
+      const Vector2& scrollPrePosition  = inputs[0]->GetVector2();
+      const Vector2& scrollPostPosition = inputs[1]->GetVector2();
+      float          newOvershoot       = scrollPrePosition.x - scrollPostPosition.x;
+      current                           = (newOvershoot > 0.0f ? std::min(newOvershoot, mMaxOvershoot) : std::max(newOvershoot, -mMaxOvershoot)) / mMaxOvershoot;
+    }
+    else
+    {
+      current = 0.0f;
+    }
+  }
+
+  float mMaxOvershoot;
+};
+
+/**
+ * This constraint updates the Y overshoot property using the difference
+ * SCROLL_PRE_POSITION.y and SCROLL_POSITION.y, returning a relative value between 0.0f and 1.0f
+ */
+struct OvershootYConstraint
+{
+  OvershootYConstraint(float maxOvershoot)
+  : mMaxOvershoot(maxOvershoot)
+  {
+  }
+
+  void operator()(float& current, const PropertyInputContainer& inputs)
+  {
+    if(inputs[2]->GetBoolean())
+    {
+      const Vector2& scrollPrePosition  = inputs[0]->GetVector2();
+      const Vector2& scrollPostPosition = inputs[1]->GetVector2();
+      float          newOvershoot       = scrollPrePosition.y - scrollPostPosition.y;
+      current                           = (newOvershoot > 0.0f ? std::min(newOvershoot, mMaxOvershoot) : std::max(newOvershoot, -mMaxOvershoot)) / mMaxOvershoot;
+    }
+    else
+    {
+      current = 0.0f;
+    }
+  }
+
+  float mMaxOvershoot;
+};
+
+/**
+ * Internal Position-Delta Property Constraint.
+ *
+ * Generates position-delta property based on scroll-position + scroll-offset properties.
+ */
+void InternalPositionDeltaConstraint(Vector2& current, const PropertyInputContainer& inputs)
+{
+  const Vector2& scrollPosition = inputs[0]->GetVector2();
+  const Vector2& scrollOffset   = inputs[1]->GetVector2();
+
+  current = scrollPosition + scrollOffset;
+}
+
+/**
+ * Internal Final Position Constraint
+ * The position of content is:
+ * of scroll-position + f(scroll-overshoot)
+ * where f(...) function defines how overshoot
+ * should affect final-position.
+ */
+struct InternalFinalConstraint
+{
+  InternalFinalConstraint(AlphaFunctionPrototype functionX,
+                          AlphaFunctionPrototype functionY)
+  : mFunctionX(functionX),
+    mFunctionY(functionY)
+  {
+  }
+
+  void operator()(Vector2& current, const PropertyInputContainer& inputs)
+  {
+    const float& overshootx = inputs[1]->GetFloat();
+    const float& overshooty = inputs[2]->GetFloat();
+    Vector2      offset(mFunctionX(overshootx),
+                   mFunctionY(overshooty));
+
+    current = inputs[0]->GetVector2() - offset;
+  }
+
+  AlphaFunctionPrototype mFunctionX;
+  AlphaFunctionPrototype mFunctionY;
+};
+
+} // namespace
+
+void ScrollViewConstraints::UpdateMainInternalConstraint(ScrollView& scrollView)
+{
+  // TODO: Only update the constraints which have changed, rather than remove all and add all again.
+  // Requires a dali-core ApplyConstraintAt, or a ReplaceConstraint. The former is probably more flexible.
+  Actor              scrollViewActor = scrollView.Self();
+  PanGestureDetector detector(scrollView.GetPanGestureDetector());
+
+  if(mScrollMainInternalPositionConstraint)
+  {
+    mScrollMainInternalPositionConstraint.Remove();
+    mScrollMainInternalDeltaConstraint.Remove();
+    mScrollMainInternalFinalConstraint.Remove();
+    mScrollMainInternalRelativeConstraint.Remove();
+    mScrollMainInternalDomainConstraint.Remove();
+    mScrollMainInternalPrePositionMaxConstraint.Remove();
+  }
+  if(mScrollMainInternalPrePositionConstraint)
+  {
+    mScrollMainInternalPrePositionConstraint.Remove();
+  }
+
+  // TODO: It's probably better to use a local displacement value as this will give a displacement when scrolling just commences
+  // but we need to make sure than the gesture system gives displacement since last frame (60Hz), not displacement since last touch event (90Hz).
+
+  // 1. First calculate the pre-position (this is the scroll position if no clamping has taken place)
+  Vector2 initialPanMask = Vector2(scrollView.mRulerX->IsEnabled() ? 1.0f : 0.0f, scrollView.mRulerY->IsEnabled() ? 1.0f : 0.0f);
+
+  if(scrollView.mLockAxis == ScrollView::LockVertical)
+  {
+    initialPanMask.y = 0.0f;
+  }
+  else if(scrollView.mLockAxis == ScrollView::LockHorizontal)
+  {
+    initialPanMask.x = 0.0f;
+  }
+
+  if(scrollView.mPanning)
+  {
+    mScrollMainInternalPrePositionConstraint = Constraint::New<Vector2>(scrollViewActor,
+                                                                        Toolkit::ScrollView::Property::SCROLL_PRE_POSITION,
+                                                                        InternalPrePositionConstraint(scrollView.mPanStartPosition,
+                                                                                                      initialPanMask,
+                                                                                                      scrollView.mAxisAutoLock,
+                                                                                                      scrollView.mAxisAutoLockGradient,
+                                                                                                      scrollView.mLockAxis,
+                                                                                                      scrollView.mMaxOvershoot,
+                                                                                                      scrollView.mRulerX,
+                                                                                                      scrollView.mRulerY));
+    mScrollMainInternalPrePositionConstraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+    mScrollMainInternalPrePositionConstraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
+    mScrollMainInternalPrePositionConstraint.AddSource(Source(scrollViewActor, Actor::Property::SIZE));
+    mScrollMainInternalPrePositionConstraint.Apply();
+  }
+
+  // 2. Second calculate the clamped position (actual position)
+  mScrollMainInternalPositionConstraint = Constraint::New<Vector2>(scrollViewActor,
+                                                                   Toolkit::ScrollView::Property::SCROLL_POSITION,
+                                                                   InternalPositionConstraint(scrollView.mRulerX->GetDomain(),
+                                                                                              scrollView.mRulerY->GetDomain(),
+                                                                                              scrollView.mWrapMode));
+  mScrollMainInternalPositionConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION));
+  mScrollMainInternalPositionConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
+  mScrollMainInternalPositionConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
+  mScrollMainInternalPositionConstraint.AddSource(Source(scrollViewActor, Actor::Property::SIZE));
+  mScrollMainInternalPositionConstraint.Apply();
+
+  mScrollMainInternalDeltaConstraint = Constraint::New<Vector2>(scrollViewActor, Toolkit::ScrollView::Property::SCROLL_POSITION_DELTA, InternalPositionDeltaConstraint);
+  mScrollMainInternalDeltaConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
+  mScrollMainInternalDeltaConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_DOMAIN_OFFSET));
+  mScrollMainInternalDeltaConstraint.Apply();
+
+  mScrollMainInternalFinalConstraint = Constraint::New<Vector2>(scrollViewActor, Toolkit::ScrollView::Property::SCROLL_FINAL, InternalFinalConstraint(FinalDefaultAlphaFunction, FinalDefaultAlphaFunction));
+  mScrollMainInternalFinalConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
+  mScrollMainInternalFinalConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::OVERSHOOT_X));
+  mScrollMainInternalFinalConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::OVERSHOOT_Y));
+  mScrollMainInternalFinalConstraint.Apply();
+
+  mScrollMainInternalRelativeConstraint = Constraint::New<Vector2>(scrollViewActor, Toolkit::Scrollable::Property::SCROLL_RELATIVE_POSITION, InternalRelativePositionConstraint);
+  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
+  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
+  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
+  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Actor::Property::SIZE));
+  mScrollMainInternalRelativeConstraint.Apply();
+
+  mScrollMainInternalDomainConstraint = Constraint::New<Vector2>(scrollViewActor, Toolkit::ScrollView::Property::SCROLL_DOMAIN_SIZE, InternalScrollDomainConstraint);
+  mScrollMainInternalDomainConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
+  mScrollMainInternalDomainConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
+  mScrollMainInternalDomainConstraint.AddSource(LocalSource(Actor::Property::SIZE));
+  mScrollMainInternalDomainConstraint.Apply();
+
+  mScrollMainInternalPrePositionMaxConstraint = Constraint::New<Vector2>(scrollViewActor, Toolkit::ScrollView::Property::SCROLL_PRE_POSITION_MAX, InternalPrePositionMaxConstraint);
+  mScrollMainInternalPrePositionMaxConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
+  mScrollMainInternalPrePositionMaxConstraint.AddSource(LocalSource(Actor::Property::SIZE));
+  mScrollMainInternalPrePositionMaxConstraint.Apply();
+
+  // When panning we want to make sure overshoot values are affected by pre position and post position
+  SetOvershootConstraintsEnabled(scrollView, !scrollView.mWrapMode);
+}
+
+void ScrollViewConstraints::SetOvershootConstraintsEnabled(ScrollView& scrollView, bool enabled)
+{
+  Actor scrollViewActor(scrollView.Self());
+  // remove and reset, it may now be in wrong order with the main internal constraints
+  if(mScrollMainInternalOvershootXConstraint)
+  {
+    mScrollMainInternalOvershootXConstraint.Remove();
+    mScrollMainInternalOvershootXConstraint.Reset();
+    mScrollMainInternalOvershootYConstraint.Remove();
+    mScrollMainInternalOvershootYConstraint.Reset();
+  }
+  if(enabled)
+  {
+    mScrollMainInternalOvershootXConstraint = Constraint::New<float>(scrollViewActor, Toolkit::ScrollView::Property::OVERSHOOT_X, OvershootXConstraint(scrollView.mMaxOvershoot.x));
+    mScrollMainInternalOvershootXConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION));
+    mScrollMainInternalOvershootXConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
+    mScrollMainInternalOvershootXConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::CAN_SCROLL_HORIZONTAL));
+    mScrollMainInternalOvershootXConstraint.Apply();
+
+    mScrollMainInternalOvershootYConstraint = Constraint::New<float>(scrollViewActor, Toolkit::ScrollView::Property::OVERSHOOT_Y, OvershootYConstraint(scrollView.mMaxOvershoot.y));
+    mScrollMainInternalOvershootYConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION));
+    mScrollMainInternalOvershootYConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
+    mScrollMainInternalOvershootYConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::CAN_SCROLL_VERTICAL));
+    mScrollMainInternalOvershootYConstraint.Apply();
+  }
+  else
+  {
+    scrollViewActor.SetProperty(Toolkit::ScrollView::Property::OVERSHOOT_X, 0.0f);
+    scrollViewActor.SetProperty(Toolkit::ScrollView::Property::OVERSHOOT_Y, 0.0f);
+  }
+}
+
+void ScrollViewConstraints::SetInternalConstraints(ScrollView& scrollView)
+{
+  // Internal constraints (applied to target ScrollBase Actor itself) /////////
+  UpdateMainInternalConstraint(scrollView);
+
+  // User definable constraints to apply to all child actors //////////////////
+  Actor scrollViewActor = scrollView.Self();
+
+  // Apply some default constraints to ScrollView & its bound actors
+  // Movement + Wrap function
+
+  Constraint constraint;
+
+  // MoveActor (scrolling)
+  constraint = Constraint::New<Vector3>(scrollViewActor, Actor::Property::POSITION, MoveActorConstraint);
+  constraint.AddSource(Source(scrollViewActor, Toolkit::ScrollView::Property::SCROLL_POSITION));
+  constraint.SetRemoveAction(Constraint::DISCARD);
+  scrollView.ApplyConstraintToBoundActors(constraint);
+
+  // WrapActor (wrap functionality)
+  constraint = Constraint::New<Vector3>(scrollViewActor, Actor::Property::POSITION, WrapActorConstraint);
+  constraint.AddSource(LocalSource(Actor::Property::SCALE));
+  constraint.AddSource(LocalSource(Actor::Property::ANCHOR_POINT));
+  constraint.AddSource(LocalSource(Actor::Property::SIZE));
+  constraint.AddSource(Source(scrollViewActor, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
+  constraint.AddSource(Source(scrollViewActor, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
+  constraint.AddSource(Source(scrollViewActor, Toolkit::ScrollView::Property::WRAP));
+  constraint.SetRemoveAction(Constraint::DISCARD);
+  scrollView.ApplyConstraintToBoundActors(constraint);
+}
+
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.h
new file mode 100644
index 0000000..540a3fd
--- /dev/null
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.h
@@ -0,0 +1,89 @@
+#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_CONSTRAINTS_H
+#define DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_CONSTRAINTS_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraint.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+
+class ScrollView;
+
+/// Sets up and owns the Constraints used by the ScrollView class
+class ScrollViewConstraints
+{
+public:
+
+  ScrollViewConstraints() = default;  ///< Default Constructor
+  ~ScrollViewConstraints() = default; ///< Default Non-Virtual Destructor
+
+  // Not copyable or moveable
+  ScrollViewConstraints(const ScrollViewConstraints&) = delete;
+  ScrollViewConstraints(ScrollViewConstraints&&) = delete;
+  ScrollViewConstraints& operator=(const ScrollViewConstraints&) = delete;
+  ScrollViewConstraints& operator=(ScrollViewConstraints&&) = delete;
+
+  /**
+   * Updates the main internal scroll constraints with new ruler and domain values
+   *
+   * @param[in] scrollView A reference to the scroll view object
+   */
+  void UpdateMainInternalConstraint(Internal::ScrollView& scrollView);
+
+  /**
+   * Enables/disables the overshoot constraints
+   *
+   * @param[in] scrollView A reference to the scroll view object
+   * @param[in] enabled whether to enable or disable the overshoot constraints
+   */
+  void SetOvershootConstraintsEnabled(ScrollView& scrollView, bool enabled);
+
+  /**
+   * Sets internal constraints for this ScrollView.
+   * Many of these internal constraints are based on properties within ScrollView.
+   *
+   * @param[in] scrollView A reference to the scroll view object
+   */
+  void SetInternalConstraints(ScrollView& scrollView);
+
+public:
+
+  Constraint mScrollMainInternalPrePositionConstraint;
+  Constraint mScrollMainInternalPositionConstraint;
+  Constraint mScrollMainInternalOvershootXConstraint;
+  Constraint mScrollMainInternalOvershootYConstraint;
+  Constraint mScrollMainInternalDeltaConstraint;
+  Constraint mScrollMainInternalFinalConstraint;
+  Constraint mScrollMainInternalRelativeConstraint;
+  Constraint mScrollMainInternalDomainConstraint;
+  Constraint mScrollMainInternalPrePositionMaxConstraint;
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_CONSTRAINTS_H
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.cpp
new file mode 100644
index 0000000..9c1272c
--- /dev/null
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.cpp
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-mode.h>
+
+namespace Dali::Toolkit::Internal
+{
+
+void ScrollViewPropertyHandler::Set(BaseObject* object, Property::Index index, const Property::Value& value)
+{
+  Toolkit::ScrollView scrollView = Toolkit::ScrollView::DownCast(Dali::BaseHandle(object));
+
+  if(scrollView)
+  {
+    ScrollView& scrollViewImpl(GetImpl(scrollView));
+    switch(index)
+    {
+      case Toolkit::ScrollView::Property::WRAP_ENABLED:
+      {
+        scrollViewImpl.SetWrapMode(value.Get<bool>());
+        break;
+      }
+      case Toolkit::ScrollView::Property::PANNING_ENABLED:
+      {
+        scrollViewImpl.SetScrollSensitive(value.Get<bool>());
+        break;
+      }
+      case Toolkit::ScrollView::Property::AXIS_AUTO_LOCK_ENABLED:
+      {
+        scrollViewImpl.SetAxisAutoLock(value.Get<bool>());
+        break;
+      }
+      case Toolkit::ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP:
+      {
+        scrollViewImpl.SetWheelScrollDistanceStep(value.Get<Vector2>());
+        break;
+      }
+      case Toolkit::ScrollView::Property::SCROLL_MODE:
+      {
+        const Property::Map* map = value.GetMap();
+        if(map)
+        {
+          SetScrollMode(scrollViewImpl, *map);
+        }
+      }
+    }
+  }
+}
+
+Property::Value ScrollViewPropertyHandler::Get(BaseObject* object, Property::Index index)
+{
+  Property::Value value;
+
+  Toolkit::ScrollView scrollView = Toolkit::ScrollView::DownCast(Dali::BaseHandle(object));
+
+  if(scrollView)
+  {
+    ScrollView& scrollViewImpl(GetImpl(scrollView));
+    switch(index)
+    {
+      case Toolkit::ScrollView::Property::WRAP_ENABLED:
+      {
+        value = scrollViewImpl.GetWrapMode();
+        break;
+      }
+      case Toolkit::ScrollView::Property::PANNING_ENABLED:
+      {
+        value = scrollViewImpl.GetScrollSensitive();
+        break;
+      }
+      case Toolkit::ScrollView::Property::AXIS_AUTO_LOCK_ENABLED:
+      {
+        value = scrollViewImpl.GetAxisAutoLock();
+        break;
+      }
+      case Toolkit::ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP:
+      {
+        value = scrollViewImpl.GetWheelScrollDistanceStep();
+        break;
+      }
+    }
+  }
+
+  return value;
+}
+
+void ScrollViewPropertyHandler::SetScrollMode(ScrollView& scrollView, const Property::Map& scrollModeMap)
+{
+  Toolkit::RulerPtr rulerX, rulerY;
+
+  // Check the scroll mode in the X axis
+  bool             xAxisScrollEnabled = true;
+  Property::Value* valuePtr           = scrollModeMap.Find(Toolkit::ScrollMode::X_AXIS_SCROLL_ENABLED, "xAxisScrollEnabled");
+  if(valuePtr && valuePtr->GetType() == Property::BOOLEAN)
+  {
+    valuePtr->Get(xAxisScrollEnabled);
+  }
+
+  if(!xAxisScrollEnabled)
+  {
+    // Default ruler and disabled
+    rulerX = new Toolkit::DefaultRuler();
+    rulerX->Disable();
+  }
+  else
+  {
+    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::X_AXIS_SNAP_TO_INTERVAL, "xAxisSnapToInterval");
+    float xAxisSnapToInterval = 0.0f;
+    if(valuePtr && valuePtr->Get(xAxisSnapToInterval))
+    {
+      // Fixed ruler and enabled
+      rulerX = new Toolkit::FixedRuler(xAxisSnapToInterval);
+    }
+    else
+    {
+      // Default ruler and enabled
+      rulerX = new Toolkit::DefaultRuler();
+    }
+
+    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::X_AXIS_SCROLL_BOUNDARY, "xAxisScrollBoundary");
+    float xAxisScrollBoundary = 0.0f;
+    if(valuePtr && valuePtr->Get(xAxisScrollBoundary))
+    {
+      // By default ruler domain is disabled unless set
+      rulerX->SetDomain(Toolkit::RulerDomain(0, xAxisScrollBoundary, true));
+    }
+  }
+
+  // Check the scroll mode in the Y axis
+  bool yAxisScrollEnabled = true;
+  valuePtr                = scrollModeMap.Find(Toolkit::ScrollMode::Y_AXIS_SCROLL_ENABLED, "yAxisScrollEnabled");
+  if(valuePtr && valuePtr->GetType() == Property::BOOLEAN)
+  {
+    valuePtr->Get(yAxisScrollEnabled);
+  }
+
+  if(!yAxisScrollEnabled)
+  {
+    // Default ruler and disabled
+    rulerY = new Toolkit::DefaultRuler();
+    rulerY->Disable();
+  }
+  else
+  {
+    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, "yAxisSnapToInterval");
+    float yAxisSnapToInterval = 0.0f;
+    if(valuePtr && valuePtr->Get(yAxisSnapToInterval))
+    {
+      // Fixed ruler and enabled
+      rulerY = new Toolkit::FixedRuler(yAxisSnapToInterval);
+    }
+    else
+    {
+      // Default ruler and enabled
+      rulerY = new Toolkit::DefaultRuler();
+    }
+
+    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::Y_AXIS_SCROLL_BOUNDARY, "yAxisScrollBoundary");
+    float yAxisScrollBoundary = 0.0f;
+    if(valuePtr && valuePtr->Get(yAxisScrollBoundary))
+    {
+      // By default ruler domain is disabled unless set
+      rulerY->SetDomain(Toolkit::RulerDomain(0, yAxisScrollBoundary, true));
+    }
+  }
+
+  scrollView.SetRulerX(rulerX);
+  scrollView.SetRulerY(rulerY);
+}
+
+void ScrollViewPropertyHandler::UpdatePropertyDomain(ScrollView& scrollView)
+{
+  Actor   self                  = scrollView.Self();
+  Vector3 size                  = self.GetTargetSize();
+  Vector2 min                   = scrollView.mMinScroll;
+  Vector2 max                   = scrollView.mMaxScroll;
+  bool    scrollPositionChanged = false;
+  bool    domainChanged         = false;
+
+  bool canScrollVertical   = false;
+  bool canScrollHorizontal = false;
+  scrollView.UpdateLocalScrollProperties();
+  if(scrollView.mRulerX->IsEnabled())
+  {
+    const Toolkit::RulerDomain& rulerDomain = scrollView.mRulerX->GetDomain();
+    if(fabsf(min.x - rulerDomain.min) > Math::MACHINE_EPSILON_100 || fabsf(max.x - rulerDomain.max) > Math::MACHINE_EPSILON_100)
+    {
+      domainChanged = true;
+      min.x         = rulerDomain.min;
+      max.x         = rulerDomain.max;
+
+      // make sure new scroll value is within new domain
+      if(scrollView.mScrollPrePosition.x < min.x || scrollView.mScrollPrePosition.x > max.x)
+      {
+        scrollPositionChanged = true;
+        scrollView.mScrollPrePosition.x  = Clamp(scrollView.mScrollPrePosition.x, -(max.x - size.x), -min.x);
+      }
+    }
+    if((fabsf(rulerDomain.max - rulerDomain.min) - size.x) > Math::MACHINE_EPSILON_100)
+    {
+      canScrollHorizontal = true;
+    }
+  }
+  else if(fabs(min.x) > Math::MACHINE_EPSILON_100 || fabs(max.x) > Math::MACHINE_EPSILON_100)
+  {
+    // need to reset to 0
+    domainChanged       = true;
+    min.x               = 0.0f;
+    max.x               = 0.0f;
+    canScrollHorizontal = false;
+  }
+
+  if(scrollView.mRulerY->IsEnabled())
+  {
+    const Toolkit::RulerDomain& rulerDomain = scrollView.mRulerY->GetDomain();
+    if(fabsf(min.y - rulerDomain.min) > Math::MACHINE_EPSILON_100 || fabsf(max.y - rulerDomain.max) > Math::MACHINE_EPSILON_100)
+    {
+      domainChanged = true;
+      min.y         = rulerDomain.min;
+      max.y         = rulerDomain.max;
+
+      // make sure new scroll value is within new domain
+      if(scrollView.mScrollPrePosition.y < min.y || scrollView.mScrollPrePosition.y > max.y)
+      {
+        scrollPositionChanged = true;
+        scrollView.mScrollPrePosition.y  = Clamp(scrollView.mScrollPrePosition.y, -(max.y - size.y), -min.y);
+      }
+    }
+    if((fabsf(rulerDomain.max - rulerDomain.min) - size.y) > Math::MACHINE_EPSILON_100)
+    {
+      canScrollVertical = true;
+    }
+  }
+  else if(fabs(min.y) > Math::MACHINE_EPSILON_100 || fabs(max.y) > Math::MACHINE_EPSILON_100)
+  {
+    // need to reset to 0
+    domainChanged     = true;
+    min.y             = 0.0f;
+    max.y             = 0.0f;
+    canScrollVertical = false;
+  }
+
+  // avoid setting properties if possible, otherwise this will cause an entire update as well as triggering constraints using each property we update
+  if(scrollView.mCanScrollVertical != canScrollVertical)
+  {
+    scrollView.mCanScrollVertical = canScrollVertical;
+    self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_VERTICAL, canScrollVertical);
+  }
+  if(scrollView.mCanScrollHorizontal != canScrollHorizontal)
+  {
+    scrollView.mCanScrollHorizontal = canScrollHorizontal;
+    self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_HORIZONTAL, canScrollHorizontal);
+  }
+  if(scrollPositionChanged)
+  {
+    self.SetProperty(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION, scrollView.mScrollPrePosition);
+  }
+  if(domainChanged)
+  {
+    scrollView.mMinScroll = min;
+    scrollView.mMaxScroll = max;
+    self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN, scrollView.mMinScroll);
+    self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX, scrollView.mMaxScroll);
+  }
+}
+
+} // namespace Dali::Toolkit::Internal
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.h
new file mode 100644
index 0000000..1923cfc
--- /dev/null
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.h
@@ -0,0 +1,69 @@
+#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_IMPL_PROPERTY_HANDLER_H
+#define DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_IMPL_PROPERTY_HANDLER_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/object/property.h>
+
+namespace Dali::Toolkit::Internal
+{
+class ScrollView;
+
+/// Handles the properties in scroll view calling the appropriate scroll view methods
+struct ScrollViewPropertyHandler
+{
+  /**
+   * @brief Sets the property on the given scroll-view object.
+   *
+   * @param object The scrollview object
+   * @param index The index to set
+   * @param value The value to set
+   */
+  static void Set(BaseObject* object, Property::Index index, const Property::Value& value);
+
+  /**
+   * @brief Retrieves the value of a scroll-view property.
+   *
+   * @param object The scrollview object
+   * @param index The index whose value is to be retrieved
+   * @return
+   */
+  static Property::Value Get(BaseObject* object, Property::Index index);
+
+  /**
+   * Set up default rulers using a property map
+   * @param[in] scrollView    The scroll view to apply this on
+   * @param[in] scrollModeMap A map defining the characteristics of X and Y scrolling
+   * using either FixedRuler or DefaultRuler.
+   */
+  static void SetScrollMode(ScrollView& scrollView, const Property::Map& scrollModeMap);
+
+  /**
+   * This is called whenever the Scroll Rulers are modified.
+   *
+   * This will update the properties: 'scrollPositionMin' * and 'scrollPositionMax' to reflect the changes.
+   * @param scrollView The Scroll View to modify
+   */
+  static void UpdatePropertyDomain(ScrollView& scrollView);
+};
+
+} // namespace Dali::Toolkit::Internal
+
+#endif // DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_IMPL_PROPERTY_HANDLER_H
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index 8ca6855..986040b 100644
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
 #include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-property-handler.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-mode.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
@@ -43,7 +44,7 @@
 //#define ENABLED_SCROLL_STATE_LOGGING
 
 #ifdef ENABLED_SCROLL_STATE_LOGGING
-#define DALI_LOG_SCROLL_STATE(format, ...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#define DALI_LOG_SCROLL_STATE(format, ...) Dali::Integration::Log::LogMessageWithFunctionLine(Dali::Integration::Log::INFO, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
 #else
 #define DALI_LOG_SCROLL_STATE(format, ...)
 #endif
@@ -55,29 +56,32 @@
 // TODO: Orientation.
 // TODO: upgrade Vector2/3 to support returning Unit vectors, normals, & cross product (dot product is already provided)
 
-using namespace Dali;
-
 namespace
 {
-const float DEFAULT_SLOW_SNAP_ANIMATION_DURATION(0.5f);  ///< Default Drag-Release animation time.
-const float DEFAULT_FAST_SNAP_ANIMATION_DURATION(0.25f); ///< Default Drag-Flick animation time.
-const float DEFAULT_SNAP_OVERSHOOT_DURATION(0.5f);       ///< Default Overshoot snapping animation time.
-const float DEFAULT_MAX_OVERSHOOT(100.0f);               ///< Default maximum allowed overshoot in pixels
-
-const float DEFAULT_AXIS_AUTO_LOCK_GRADIENT(0.36f); ///< Default Axis-AutoLock gradient threshold. default is 0.36:1 (20 degrees)
-const float DEFAULT_FRICTION_COEFFICIENT(1.0f);     ///< Default Friction Co-efficient. (in stage diagonals per second)
-const float DEFAULT_FLICK_SPEED_COEFFICIENT(1.0f);  ///< Default Flick speed coefficient (multiples input touch velocity)
-const float DEFAULT_MAX_FLICK_SPEED(3.0f);          ///< Default Maximum flick speed. (in stage diagonals per second)
-
-const Vector2       DEFAULT_MIN_FLICK_DISTANCE(30.0f, 30.0f);                             ///< minimum distance for pan before flick allowed
-const float         DEFAULT_MIN_FLICK_SPEED_THRESHOLD(500.0f);                            ///< Minimum pan speed required for flick in pixels/s
-const float         FREE_FLICK_SPEED_THRESHOLD                    = 200.0f;               ///< Free-Flick threshold in pixels/ms
-const float         AUTOLOCK_AXIS_MINIMUM_DISTANCE2               = 100.0f;               ///< Auto-lock axis after minimum distance squared.
-const float         FLICK_ORTHO_ANGLE_RANGE                       = 75.0f;                ///< degrees. (if >45, then supports diagonal flicking)
-const Vector2       DEFAULT_WHEEL_SCROLL_DISTANCE_STEP_PROPORTION = Vector2(0.17f, 0.1f); ///< The step of horizontal scroll distance in the proportion of stage size for each wheel event received.
-const unsigned long MINIMUM_TIME_BETWEEN_DOWN_AND_UP_FOR_RESET(150u);
-const float         TOUCH_DOWN_TIMER_INTERVAL = 100.0f;
-const float         DEFAULT_SCROLL_UPDATE_DISTANCE(30.0f); ///< Default distance to travel in pixels for scroll update signal
+using namespace Dali;
+
+constexpr float DEFAULT_SLOW_SNAP_ANIMATION_DURATION(0.5f);  ///< Default Drag-Release animation time.
+constexpr float DEFAULT_FAST_SNAP_ANIMATION_DURATION(0.25f); ///< Default Drag-Flick animation time.
+constexpr float DEFAULT_SNAP_OVERSHOOT_DURATION(0.5f);       ///< Default Overshoot snapping animation time.
+constexpr float DEFAULT_MAX_OVERSHOOT(100.0f);               ///< Default maximum allowed overshoot in pixels
+
+constexpr float DEFAULT_AXIS_AUTO_LOCK_GRADIENT(0.36f); ///< Default Axis-AutoLock gradient threshold. default is 0.36:1 (20 degrees)
+constexpr float DEFAULT_FRICTION_COEFFICIENT(1.0f);     ///< Default Friction Co-efficient. (in stage diagonals per second)
+constexpr float DEFAULT_FLICK_SPEED_COEFFICIENT(1.0f);  ///< Default Flick speed coefficient (multiples input touch velocity)
+constexpr float DEFAULT_MAX_FLICK_SPEED(3.0f);          ///< Default Maximum flick speed. (in stage diagonals per second)
+
+constexpr Dali::Vector2 DEFAULT_MIN_FLICK_DISTANCE(30.0f, 30.0f);  ///< minimum distance for pan before flick allowed
+constexpr float         DEFAULT_MIN_FLICK_SPEED_THRESHOLD(500.0f); ///< Minimum pan speed required for flick in pixels/s
+
+constexpr float FREE_FLICK_SPEED_THRESHOLD      = 200.0f; ///< Free-Flick threshold in pixels/ms
+constexpr float AUTOLOCK_AXIS_MINIMUM_DISTANCE2 = 100.0f; ///< Auto-lock axis after minimum distance squared.
+constexpr float FLICK_ORTHO_ANGLE_RANGE         = 75.0f;  ///< degrees. (if >45, then supports diagonal flicking)
+
+constexpr Dali::Vector2 DEFAULT_WHEEL_SCROLL_DISTANCE_STEP_PROPORTION(0.17f, 0.1f); ///< The step of horizontal scroll distance in the proportion of stage size for each wheel event received.
+
+constexpr unsigned long MINIMUM_TIME_BETWEEN_DOWN_AND_UP_FOR_RESET(150u);
+constexpr float         TOUCH_DOWN_TIMER_INTERVAL = 100.0f;
+constexpr float         DEFAULT_SCROLL_UPDATE_DISTANCE(30.0f); ///< Default distance to travel in pixels for scroll update signal
 
 const std::string INTERNAL_MAX_POSITION_PROPERTY_NAME("internalMaxPosition");
 
@@ -104,7 +108,7 @@ float VectorInDomain(float a, float b, float start, float end, Dali::Toolkit::Di
 {
   if(bias == Dali::Toolkit::DIRECTION_BIAS_NONE)
   {
-    return ShortestDistanceInDomain(a, b, start, end);
+    return Dali::ShortestDistanceInDomain(a, b, start, end);
   }
   //  (a-start + end-b)
   float size = end - start;
@@ -145,22 +149,118 @@ float VectorInDomain(float a, float b, float start, float end, Dali::Toolkit::Di
  * @param anchor The Anchor point of interest.
  * @return The position of the Anchor
  */
-Vector3 GetPositionOfAnchor(Actor& actor, const Vector3& anchor)
+Dali::Vector3 GetPositionOfAnchor(Dali::Actor& actor, const Dali::Vector3& anchor)
 {
-  Vector3 childPosition = actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
-  Vector3 childAnchor   = -actor.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) + anchor;
-  Vector3 childSize     = actor.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
+  Dali::Vector3 childPosition = actor.GetCurrentProperty<Dali::Vector3>(Dali::Actor::Property::POSITION);
+  Dali::Vector3 childAnchor   = -actor.GetCurrentProperty<Dali::Vector3>(Dali::Actor::Property::ANCHOR_POINT) + anchor;
+  Dali::Vector3 childSize     = actor.GetCurrentProperty<Dali::Vector3>(Dali::Actor::Property::SIZE);
 
   return childPosition + childAnchor * childSize;
 }
 
-// AlphaFunctions /////////////////////////////////////////////////////////////////////////////////
+/**
+ * Returns the closest actor to the given position
+ * @param[in] actor The scrollview actor
+ * @param[in] internalActor The internal actor (to ignore)
+ * @param[in] position The given position
+ * @param[in] dirX Direction to search in
+ * @param[in] dirY Direction to search in
+ * @param[in] dirZ Direction to search in
+ * @return the closest child actor
+ */
+using FindDirection = Dali::Toolkit::Internal::ScrollView::FindDirection;
 
-float FinalDefaultAlphaFunction(float offset)
+Actor FindClosestActorToPosition(
+  CustomActor actor, Actor internalActor, const Vector3& position, FindDirection dirX, FindDirection dirY, FindDirection dirZ)
 {
-  return offset * 0.5f;
+  Actor   closestChild;
+  float   closestDistance2 = 0.0f;
+  Vector3 actualPosition   = position;
+
+  unsigned int numChildren = actor.GetChildCount();
+
+  for(unsigned int i = 0; i < numChildren; ++i)
+  {
+    Actor child = actor.GetChildAt(i);
+
+    if(internalActor == child) // ignore internal actor.
+    {
+      continue;
+    }
+
+    Vector3 childPosition = GetPositionOfAnchor(child, AnchorPoint::CENTER);
+
+    Vector3 delta = childPosition - actualPosition;
+
+    // X-axis checking (only find Actors to the [dirX] of actualPosition)
+    if(dirX > FindDirection::All) // != All,None
+    {
+      FindDirection deltaH = delta.x > 0 ? FindDirection::Right : FindDirection::Left;
+      if(dirX != deltaH)
+      {
+        continue;
+      }
+    }
+
+    // Y-axis checking (only find Actors to the [dirY] of actualPosition)
+    if(dirY > FindDirection::All) // != All,None
+    {
+      FindDirection deltaV = delta.y > 0 ? FindDirection::Down : FindDirection::Up;
+      if(dirY != deltaV)
+      {
+        continue;
+      }
+    }
+
+    // Z-axis checking (only find Actors to the [dirZ] of actualPosition)
+    if(dirZ > FindDirection::All) // != All,None
+    {
+      FindDirection deltaV = delta.y > 0 ? FindDirection::In : FindDirection::Out;
+      if(dirZ != deltaV)
+      {
+        continue;
+      }
+    }
+
+    // compare child to closest child in terms of distance.
+    float distance2 = 0.0f;
+
+    // distance2 = the Square of the relevant dimensions of delta
+    if(dirX != FindDirection::None)
+    {
+      distance2 += delta.x * delta.x;
+    }
+
+    if(dirY != FindDirection::None)
+    {
+      distance2 += delta.y * delta.y;
+    }
+
+    if(dirZ != FindDirection::None)
+    {
+      distance2 += delta.z * delta.z;
+    }
+
+    if(closestChild) // Next time.
+    {
+      if(distance2 < closestDistance2)
+      {
+        closestChild     = child;
+        closestDistance2 = distance2;
+      }
+    }
+    else // First time.
+    {
+      closestChild     = child;
+      closestDistance2 = distance2;
+    }
+  }
+
+  return closestChild;
 }
 
+// AlphaFunctions /////////////////////////////////////////////////////////////////////////////////
+
 /**
  * ConstantDecelerationAlphaFunction
  * Newtoninan distance for constant deceleration
@@ -177,54 +277,268 @@ float ConstantDecelerationAlphaFunction(float progress)
   return progress * 2.0f - progress * progress;
 }
 
-// Internal Constraints ///////////////////////////////////////////////////////////////////////////
-
 /**
- * Internal Relative position Constraint
- * Generates the relative position value of the scroll view
- * based on the absolute position, and it's relation to the
- * scroll domain. This is a value from 0.0f to 1.0f in each
- * scroll position axis.
+ * Clamp a position
+ * @param[in] size The size to clamp to
+ * @param[in] rulerX The horizontal ruler
+ * @param[in] rulerY The vertical ruler
+ * @param[in,out] position The position to clamp
+ * @param[out] clamped the clamped state
  */
-void InternalRelativePositionConstraint(Vector2& relativePosition, const PropertyInputContainer& inputs)
+void ClampPosition(const Vector3& size, Dali::Toolkit::RulerPtr rulerX, Dali::Toolkit::RulerPtr rulerY, Vector2& position, Dali::Toolkit::ClampState2D& clamped)
 {
-  Vector2        position = -inputs[0]->GetVector2();
-  const Vector2& min      = inputs[1]->GetVector2();
-  const Vector2& max      = inputs[2]->GetVector2();
-  const Vector3& size     = inputs[3]->GetVector3();
-
-  position.x = WrapInDomain(position.x, min.x, max.x);
-  position.y = WrapInDomain(position.y, min.y, max.y);
-
-  Vector2 domainSize = (max - min) - size.GetVectorXY();
-
-  relativePosition.x = domainSize.x > Math::MACHINE_EPSILON_1 ? fabsf((position.x - min.x) / domainSize.x) : 0.0f;
-  relativePosition.y = domainSize.y > Math::MACHINE_EPSILON_1 ? fabsf((position.y - min.y) / domainSize.y) : 0.0f;
+  position.x = -rulerX->Clamp(-position.x, size.width, 1.0f, clamped.x);  // NOTE: X & Y rulers think in -ve coordinate system.
+  position.y = -rulerY->Clamp(-position.y, size.height, 1.0f, clamped.y); // That is scrolling RIGHT (e.g. 100.0, 0.0) means moving LEFT.
 }
 
 /**
- * Internal scroll domain Constraint
- * Generates the scroll domain of the scroll view.
+ * TODO: In situations where axes are different (X snap, Y free)
+ * Each axis should really have their own independent animation (time and equation)
+ * Consider, X axis snapping to nearest grid point (EaseOut over fixed time)
+ * Consider, Y axis simulating physics to arrive at a point (Physics equation over variable time)
+ * Currently, the axes have been split however, they both use the same EaseOut equation.
+ *
+ * @param[in] scrollView The main scrollview
+ * @param[in] rulerX The X ruler
+ * @param[in] rulerY The Y ruler
+ * @param[in] lockAxis Which axis (if any) is locked.
+ * @param[in] velocity Current pan velocity
+ * @param[in] maxOvershoot Maximum overshoot
+ * @param[in] inAcessibilityPan True if we are currently panning with accessibility
+ * @param[out] positionSnap The target position of snap animation
+ * @param[out] positionDuration The duration of the snap animation
+ * @param[out] alphaFunction The snap animation alpha function
+ * @param[out] isFlick if we are flicking or not
+ * @param[out] isFreeFlick if we are free flicking or not
  */
-void InternalScrollDomainConstraint(Vector2& scrollDomain, const PropertyInputContainer& inputs)
+void SnapWithVelocity(
+  Dali::Toolkit::Internal::ScrollView&          scrollView,
+  Dali::Toolkit::RulerPtr                       rulerX,
+  Dali::Toolkit::RulerPtr                       rulerY,
+  Dali::Toolkit::Internal::ScrollView::LockAxis lockAxis,
+  Vector2                                       velocity,
+  Vector2                                       maxOvershoot,
+  Vector2&                                      positionSnap,
+  Vector2&                                      positionDuration,
+  AlphaFunction&                                alphaFunction,
+  bool                                          inAccessibilityPan,
+  bool&                                         isFlick,
+  bool&                                         isFreeFlick)
 {
-  const Vector2& min  = inputs[0]->GetVector2();
-  const Vector2& max  = inputs[1]->GetVector2();
-  const Vector3& size = inputs[2]->GetVector3();
+  // Animator takes over now, touches are assumed not to interfere.
+  // And if touches do interfere, then we'll stop animation, update PrePosition
+  // to current mScroll's properties, and then resume.
+  // Note: For Flicking this may work a bit different...
+
+  float         angle      = atan2(velocity.y, velocity.x);
+  float         speed2     = velocity.LengthSquared();
+  float         biasX      = 0.5f;
+  float         biasY      = 0.5f;
+  FindDirection horizontal = FindDirection::None;
+  FindDirection vertical   = FindDirection::None;
+
+  using LockAxis = Dali::Toolkit::Internal::ScrollView::LockAxis;
+
+  // orthoAngleRange = Angle tolerance within the Exact N,E,S,W direction
+  // that will be accepted as a general N,E,S,W flick direction.
+
+  const float orthoAngleRange      = FLICK_ORTHO_ANGLE_RANGE * M_PI / 180.0f;
+  const float flickSpeedThreshold2 = scrollView.GetMinimumSpeedForFlick() * scrollView.GetMinimumSpeedForFlick();
+
+  // Flick logic X Axis
+
+  if(rulerX->IsEnabled() && lockAxis != LockAxis::LockHorizontal)
+  {
+    horizontal = FindDirection::All;
+
+    if(speed2 > flickSpeedThreshold2 || // exceeds flick threshold
+       inAccessibilityPan)              // With AccessibilityPan its easier to move between snap positions
+    {
+      if((angle >= -orthoAngleRange) && (angle < orthoAngleRange)) // Swiping East
+      {
+        biasX = 0.0f, horizontal = FindDirection::Left;
+
+        // This guards against an error where no movement occurs, due to the flick finishing
+        // before the update-thread has advanced mScrollPostPosition past the the previous snap point.
+        positionSnap.x += 1.0f;
+      }
+      else if((angle >= M_PI - orthoAngleRange) || (angle < -M_PI + orthoAngleRange)) // Swiping West
+      {
+        biasX = 1.0f, horizontal = FindDirection::Right;
+
+        // This guards against an error where no movement occurs, due to the flick finishing
+        // before the update-thread has advanced mScrollPostPosition past the the previous snap point.
+        positionSnap.x -= 1.0f;
+      }
+    }
+  }
+
+  // Flick logic Y Axis
+
+  if(rulerY->IsEnabled() && lockAxis != LockAxis::LockVertical)
+  {
+    vertical = FindDirection::All;
+
+    if(speed2 > flickSpeedThreshold2 || // exceeds flick threshold
+       inAccessibilityPan)              // With AccessibilityPan its easier to move between snap positions
+    {
+      if((angle >= M_PI_2 - orthoAngleRange) && (angle < M_PI_2 + orthoAngleRange)) // Swiping South
+      {
+        biasY = 0.0f, vertical = FindDirection::Up;
+      }
+      else if((angle >= -M_PI_2 - orthoAngleRange) && (angle < -M_PI_2 + orthoAngleRange)) // Swiping North
+      {
+        biasY = 1.0f, vertical = FindDirection::Down;
+      }
+    }
+  }
+
+  // isFlick: Whether this gesture is a flick or not.
+  isFlick = (horizontal != FindDirection::All || vertical != FindDirection::All);
+  // isFreeFlick: Whether this gesture is a flick under free panning criteria.
+  isFreeFlick = velocity.LengthSquared() > (FREE_FLICK_SPEED_THRESHOLD * FREE_FLICK_SPEED_THRESHOLD);
+
+  if(isFlick || isFreeFlick)
+  {
+    positionDuration = Vector2::ONE * scrollView.GetScrollFlickDuration();
+    alphaFunction    = scrollView.GetScrollFlickAlphaFunction();
+  }
+
+  // Calculate next positionSnap ////////////////////////////////////////////////////////////
+
+  if(scrollView.GetActorAutoSnap())
+  {
+    Vector3 size = scrollView.Self().GetCurrentProperty<Vector3>(Actor::Property::SIZE);
+
+    Actor child = scrollView.FindClosestActorToPosition(Vector3(size.width * 0.5f, size.height * 0.5f, 0.0f), horizontal, vertical);
+
+    if(!child && isFlick)
+    {
+      // If we conducted a direction limited search and found no actor, then just snap to the closest actor.
+      child = scrollView.FindClosestActorToPosition(Vector3(size.width * 0.5f, size.height * 0.5f, 0.0f));
+    }
+
+    if(child)
+    {
+      Vector2 position = scrollView.Self().GetCurrentProperty<Vector2>(Toolkit::ScrollView::Property::SCROLL_POSITION);
+
+      // Get center-point of the Actor.
+      Vector3 childPosition = GetPositionOfAnchor(child, AnchorPoint::CENTER);
+
+      if(rulerX->IsEnabled())
+      {
+        positionSnap.x = position.x - childPosition.x + size.width * 0.5f;
+      }
+      if(rulerY->IsEnabled())
+      {
+        positionSnap.y = position.y - childPosition.y + size.height * 0.5f;
+      }
+    }
+  }
+
+  Vector2 startPosition = positionSnap;
+  positionSnap.x        = -rulerX->Snap(-positionSnap.x, biasX); // NOTE: X & Y rulers think in -ve coordinate system.
+  positionSnap.y        = -rulerY->Snap(-positionSnap.y, biasY); // That is scrolling RIGHT (e.g. 100.0, 0.0) means moving LEFT.
+
+  Dali::Toolkit::ClampState2D clamped;
+  Vector3                     size = scrollView.Self().GetCurrentProperty<Vector3>(Actor::Property::SIZE);
+  Vector2                     clampDelta(Vector2::ZERO);
+  ClampPosition(size, rulerX, rulerY, positionSnap, clamped);
+
+  if((rulerX->GetType() == Dali::Toolkit::Ruler::FREE || rulerY->GetType() == Dali::Toolkit::Ruler::FREE) &&
+     isFreeFlick && !scrollView.GetActorAutoSnap())
+  {
+    // Calculate target position based on velocity of flick.
+
+    // a = Deceleration (Set to diagonal stage length * friction coefficient)
+    // u = Initial Velocity (Flick velocity)
+    // v = 0 (Final Velocity)
+    // t = Time (Velocity / Deceleration)
+    Vector2 stageSize   = Stage::GetCurrent().GetSize();
+    float   stageLength = Vector3(stageSize.x, stageSize.y, 0.0f).Length();
+    float   a           = (stageLength * scrollView.GetFrictionCoefficient());
+    Vector3 u           = Vector3(velocity.x, velocity.y, 0.0f) * scrollView.GetFlickSpeedCoefficient();
+    float   speed       = u.Length();
+    u /= speed;
+
+    // TODO: Change this to a decay function. (faster you flick, the slower it should be)
+    speed = std::min(speed, stageLength * scrollView.GetMaxFlickSpeed());
+    u *= speed;
+    alphaFunction = ConstantDecelerationAlphaFunction;
+
+    float t = speed / a;
+
+    if(rulerX->IsEnabled() && rulerX->GetType() == Dali::Toolkit::Ruler::FREE)
+    {
+      positionSnap.x += t * u.x * 0.5f;
+    }
+
+    if(rulerY->IsEnabled() && rulerY->GetType() == Dali::Toolkit::Ruler::FREE)
+    {
+      positionSnap.y += t * u.y * 0.5f;
+    }
+
+    clampDelta = positionSnap;
+    ClampPosition(size, rulerX, rulerY, positionSnap, clamped);
+
+    if((positionSnap - startPosition).LengthSquared() > Math::MACHINE_EPSILON_0)
+    {
+      clampDelta -= positionSnap;
+      clampDelta.x = clampDelta.x > 0.0f ? std::min(clampDelta.x, maxOvershoot.x) : std::max(clampDelta.x, -maxOvershoot.x);
+      clampDelta.y = clampDelta.y > 0.0f ? std::min(clampDelta.y, maxOvershoot.y) : std::max(clampDelta.y, -maxOvershoot.y);
+    }
+    else
+    {
+      clampDelta = Vector2::ZERO;
+    }
+
+    // If Axis is Free and has velocity, then calculate time taken
+    // to reach target based on velocity in axis.
+    if(rulerX->IsEnabled() && rulerX->GetType() == Dali::Toolkit::Ruler::FREE)
+    {
+      float deltaX = fabsf(startPosition.x - positionSnap.x);
+
+      if(fabsf(u.x) > Math::MACHINE_EPSILON_1)
+      {
+        positionDuration.x = fabsf(deltaX / u.x);
+      }
+      else
+      {
+        positionDuration.x = 0;
+      }
+    }
+
+    if(rulerY->IsEnabled() && rulerY->GetType() == Dali::Toolkit::Ruler::FREE)
+    {
+      float deltaY = fabsf(startPosition.y - positionSnap.y);
+
+      if(fabsf(u.y) > Math::MACHINE_EPSILON_1)
+      {
+        positionDuration.y = fabsf(deltaY / u.y);
+      }
+      else
+      {
+        positionDuration.y = 0;
+      }
+    }
+  }
 
-  scrollDomain = (max - min) - size.GetVectorXY();
+  if(scrollView.IsOvershootEnabled())
+  {
+    // Scroll to the end of the overshoot only when overshoot is enabled.
+    positionSnap += clampDelta;
+  }
 }
 
-/**
- * Internal maximum scroll position Constraint
- * Generates the maximum scroll position of the scroll view.
- */
-void InternalPrePositionMaxConstraint(Vector2& scrollMax, const PropertyInputContainer& inputs)
+Dali::Vector2 GetPosition(Dali::Actor actor)
 {
-  const Vector2& max  = inputs[0]->GetVector2();
-  const Vector3& size = inputs[1]->GetVector3();
+  Vector2 screenPosition          = actor.GetProperty<Vector2>(Actor::Property::SCREEN_POSITION);
+  Vector3 size                    = actor.GetCurrentProperty<Vector3>(Actor::Property::SIZE) * actor.GetCurrentProperty<Vector3>(Actor::Property::WORLD_SCALE);
+  bool    positionUsesAnchorPoint = actor.GetProperty<bool>(Actor::Property::POSITION_USES_ANCHOR_POINT);
+  Vector3 anchorPointOffSet       = size * (positionUsesAnchorPoint ? actor.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
+  Vector2 position                = Vector2(screenPosition.x - anchorPointOffSet.x, screenPosition.y - anchorPointOffSet.y);
 
-  scrollMax = max - size.GetVectorXY();
+  return position;
 }
 
 } // unnamed namespace
@@ -277,336 +591,6 @@ DALI_SIGNAL_REGISTRATION(Toolkit, ScrollView, "valueChanged", SIGNAL_SNAP_STARTE
 
 DALI_TYPE_REGISTRATION_END()
 
-/**
- * Returns whether to lock scrolling to a particular axis
- *
- * @param[in] panDelta Distance panned since gesture started
- * @param[in] currentLockAxis The current lock axis value
- * @param[in] lockGradient How quickly to lock to a particular axis
- *
- * @return The new axis lock state
- */
-ScrollView::LockAxis GetLockAxis(const Vector2& panDelta, ScrollView::LockAxis currentLockAxis, float lockGradient)
-{
-  if(panDelta.LengthSquared() > AUTOLOCK_AXIS_MINIMUM_DISTANCE2 &&
-     currentLockAxis == ScrollView::LockPossible)
-  {
-    float dx = fabsf(panDelta.x);
-    float dy = fabsf(panDelta.y);
-    if(dx * lockGradient >= dy)
-    {
-      // 0.36:1 gradient to the horizontal (deviate < 20 degrees)
-      currentLockAxis = ScrollView::LockVertical;
-    }
-    else if(dy * lockGradient > dx)
-    {
-      // 0.36:1 gradient to the vertical (deviate < 20 degrees)
-      currentLockAxis = ScrollView::LockHorizontal;
-    }
-    else
-    {
-      currentLockAxis = ScrollView::LockNone;
-    }
-  }
-  return currentLockAxis;
-}
-
-/**
- * Internal Pre-Position Property Constraint.
- *
- * Generates position property based on current position + gesture displacement.
- * Or generates position property based on positionX/Y.
- * Note: This is the position prior to any clamping at scroll boundaries.
- */
-struct InternalPrePositionConstraint
-{
-  InternalPrePositionConstraint(const Vector2&       initialPanPosition,
-                                const Vector2&       initialPanMask,
-                                bool                 axisAutoLock,
-                                float                axisAutoLockGradient,
-                                ScrollView::LockAxis initialLockAxis,
-                                const Vector2&       maxOvershoot,
-                                const RulerPtr&      rulerX,
-                                const RulerPtr&      rulerY)
-  : mLocalStart(initialPanPosition),
-    mInitialPanMask(initialPanMask),
-    mMaxOvershoot(maxOvershoot),
-    mAxisAutoLockGradient(axisAutoLockGradient),
-    mLockAxis(initialLockAxis),
-    mAxisAutoLock(axisAutoLock),
-    mWasPanning(false)
-  {
-    const RulerDomain& rulerDomainX = rulerX->GetDomain();
-    const RulerDomain& rulerDomainY = rulerY->GetDomain();
-    mDomainMin                      = Vector2(rulerDomainX.min, -rulerDomainY.min);
-    mDomainMax                      = Vector2(-rulerDomainX.max, -rulerDomainY.max);
-    mClampX                         = rulerDomainX.enabled;
-    mClampY                         = rulerDomainY.enabled;
-    mFixedRulerX                    = rulerX->GetType() == Ruler::FIXED;
-    mFixedRulerY                    = rulerY->GetType() == Ruler::FIXED;
-  }
-
-  void operator()(Vector2& scrollPostPosition, const PropertyInputContainer& inputs)
-  {
-    const Vector2& panPosition = inputs[0]->GetVector2();
-    const bool&    inGesture   = inputs[1]->GetBoolean();
-
-    // First check if we are within a gesture.
-    // The ScrollView may have received a start gesture from ::OnPan()
-    // while the finish gesture is received now in this constraint.
-    // This gesture must then be rejected as the value will be "old".
-    // Typically the last value from the end of the last gesture.
-    // If we are rejecting the gesture, we simply don't modify the constraint target.
-    if(inGesture)
-    {
-      if(!mWasPanning)
-      {
-        mPrePosition    = scrollPostPosition;
-        mStartPosition  = mPrePosition;
-        mCurrentPanMask = mInitialPanMask;
-        mWasPanning     = true;
-      }
-
-      // Calculate Deltas...
-      const Vector2& currentPosition = panPosition;
-      Vector2        panDelta(currentPosition - mLocalStart);
-
-      // Axis Auto Lock - locks the panning to the horizontal or vertical axis if the pan
-      // appears mostly horizontal or mostly vertical respectively...
-      if(mAxisAutoLock)
-      {
-        mLockAxis = GetLockAxis(panDelta, mLockAxis, mAxisAutoLockGradient);
-        if(mLockAxis == ScrollView::LockVertical)
-        {
-          mCurrentPanMask.y = 0.0f;
-        }
-        else if(mLockAxis == ScrollView::LockHorizontal)
-        {
-          mCurrentPanMask.x = 0.0f;
-        }
-      }
-
-      // Restrict deltas based on ruler enable/disable and axis-lock state...
-      panDelta *= mCurrentPanMask;
-
-      // Perform Position transform based on input deltas...
-      scrollPostPosition = mPrePosition;
-      scrollPostPosition += panDelta;
-
-      // if no wrapping then clamp preposition to maximum overshoot amount
-      const Vector3& size = inputs[2]->GetVector3();
-      if(mClampX)
-      {
-        float newXPosition = Clamp(scrollPostPosition.x, (mDomainMax.x + size.x) - mMaxOvershoot.x, mDomainMin.x + mMaxOvershoot.x);
-        if((newXPosition < scrollPostPosition.x - Math::MACHINE_EPSILON_1) || (newXPosition > scrollPostPosition.x + Math::MACHINE_EPSILON_1))
-        {
-          mPrePosition.x = newXPosition;
-          mLocalStart.x  = panPosition.x;
-        }
-        scrollPostPosition.x = newXPosition;
-      }
-      if(mClampY)
-      {
-        float newYPosition = Clamp(scrollPostPosition.y, (mDomainMax.y + size.y) - mMaxOvershoot.y, mDomainMin.y + mMaxOvershoot.y);
-        if((newYPosition < scrollPostPosition.y - Math::MACHINE_EPSILON_1) || (newYPosition > scrollPostPosition.y + Math::MACHINE_EPSILON_1))
-        {
-          mPrePosition.y = newYPosition;
-          mLocalStart.y  = panPosition.y;
-        }
-        scrollPostPosition.y = newYPosition;
-      }
-
-      // If we are using a fixed ruler in a particular axis, limit the maximum pages scrolled on that axis.
-      if(mFixedRulerX || mFixedRulerY)
-      {
-        // Here we limit the maximum amount that can be moved from the starting position of the gesture to one page.
-        // We do this only if we have a fixed ruler (on that axis) and the mode is enabled.
-        // Note: 1.0f is subtracted to keep the value within one page size (otherwise we stray on to the page after).
-        // Note: A further 1.0f is subtracted to handle a compensation that happens later within the flick handling code in SnapWithVelocity().
-        //       When a flick is completed, an adjustment of 1.0f is sometimes made to allow for the scenario where:
-        //       A flick finishes before the update thread has advanced the scroll position past the previous snap point.
-        Vector2 viewPageSizeLimit(size.x - (1.0f + 1.0f), size.y - (1.0f - 1.0f));
-        Vector2 minPosition(mStartPosition.x - viewPageSizeLimit.x, mStartPosition.y - viewPageSizeLimit.y);
-        Vector2 maxPosition(mStartPosition.x + viewPageSizeLimit.x, mStartPosition.y + viewPageSizeLimit.y);
-
-        if(mFixedRulerX)
-        {
-          scrollPostPosition.x = Clamp(scrollPostPosition.x, minPosition.x, maxPosition.x);
-        }
-        if(mFixedRulerY)
-        {
-          scrollPostPosition.y = Clamp(scrollPostPosition.y, minPosition.y, maxPosition.y);
-        }
-      }
-    }
-  }
-
-  Vector2 mPrePosition;
-  Vector2 mLocalStart;
-  Vector2 mStartPosition;  ///< The start position of the gesture - used to limit scroll amount (not modified by clamping).
-  Vector2 mInitialPanMask; ///< Initial pan mask (based on ruler settings).
-  Vector2 mCurrentPanMask; ///< Current pan mask that can be altered by axis lock mode.
-  Vector2 mDomainMin;
-  Vector2 mDomainMax;
-  Vector2 mMaxOvershoot;
-
-  float                mAxisAutoLockGradient; ///< Set by ScrollView
-  ScrollView::LockAxis mLockAxis;
-
-  bool mAxisAutoLock : 1; ///< Set by ScrollView
-  bool mWasPanning : 1;
-  bool mClampX : 1;
-  bool mClampY : 1;
-  bool mFixedRulerX : 1;
-  bool mFixedRulerY : 1;
-};
-
-/**
- * Internal Position Property Constraint.
- *
- * Generates position property based on pre-position
- * Note: This is the position after clamping.
- * (uses result of InternalPrePositionConstraint)
- */
-struct InternalPositionConstraint
-{
-  InternalPositionConstraint(const RulerDomain& domainX, const RulerDomain& domainY, bool wrap)
-  : mDomainMin(-domainX.min, -domainY.min),
-    mDomainMax(-domainX.max, -domainY.max),
-    mClampX(domainX.enabled),
-    mClampY(domainY.enabled),
-    mWrap(wrap)
-  {
-  }
-
-  void operator()(Vector2& position, const PropertyInputContainer& inputs)
-  {
-    position            = inputs[0]->GetVector2();
-    const Vector2& size = inputs[3]->GetVector3().GetVectorXY();
-    const Vector2& min  = inputs[1]->GetVector2();
-    const Vector2& max  = inputs[2]->GetVector2();
-
-    if(mWrap)
-    {
-      position.x = -WrapInDomain(-position.x, min.x, max.x);
-      position.y = -WrapInDomain(-position.y, min.y, max.y);
-    }
-    else
-    {
-      // clamp post position to domain
-      position.x = mClampX ? Clamp(position.x, mDomainMax.x + size.x, mDomainMin.x) : position.x;
-      position.y = mClampY ? Clamp(position.y, mDomainMax.y + size.y, mDomainMin.y) : position.y;
-    }
-  }
-
-  Vector2 mDomainMin;
-  Vector2 mDomainMax;
-  bool    mClampX;
-  bool    mClampY;
-  bool    mWrap;
-};
-
-/**
- * This constraint updates the X overshoot property using the difference
- * SCROLL_PRE_POSITION.x and SCROLL_POSITION.x, returning a relative value between 0.0f and 1.0f
- */
-struct OvershootXConstraint
-{
-  OvershootXConstraint(float maxOvershoot)
-  : mMaxOvershoot(maxOvershoot)
-  {
-  }
-
-  void operator()(float& current, const PropertyInputContainer& inputs)
-  {
-    if(inputs[2]->GetBoolean())
-    {
-      const Vector2& scrollPrePosition  = inputs[0]->GetVector2();
-      const Vector2& scrollPostPosition = inputs[1]->GetVector2();
-      float          newOvershoot       = scrollPrePosition.x - scrollPostPosition.x;
-      current                           = (newOvershoot > 0.0f ? std::min(newOvershoot, mMaxOvershoot) : std::max(newOvershoot, -mMaxOvershoot)) / mMaxOvershoot;
-    }
-    else
-    {
-      current = 0.0f;
-    }
-  }
-
-  float mMaxOvershoot;
-};
-
-/**
- * This constraint updates the Y overshoot property using the difference
- * SCROLL_PRE_POSITION.y and SCROLL_POSITION.y, returning a relative value between 0.0f and 1.0f
- */
-struct OvershootYConstraint
-{
-  OvershootYConstraint(float maxOvershoot)
-  : mMaxOvershoot(maxOvershoot)
-  {
-  }
-
-  void operator()(float& current, const PropertyInputContainer& inputs)
-  {
-    if(inputs[2]->GetBoolean())
-    {
-      const Vector2& scrollPrePosition  = inputs[0]->GetVector2();
-      const Vector2& scrollPostPosition = inputs[1]->GetVector2();
-      float          newOvershoot       = scrollPrePosition.y - scrollPostPosition.y;
-      current                           = (newOvershoot > 0.0f ? std::min(newOvershoot, mMaxOvershoot) : std::max(newOvershoot, -mMaxOvershoot)) / mMaxOvershoot;
-    }
-    else
-    {
-      current = 0.0f;
-    }
-  }
-
-  float mMaxOvershoot;
-};
-
-/**
- * Internal Position-Delta Property Constraint.
- *
- * Generates position-delta property based on scroll-position + scroll-offset properties.
- */
-void InternalPositionDeltaConstraint(Vector2& current, const PropertyInputContainer& inputs)
-{
-  const Vector2& scrollPosition = inputs[0]->GetVector2();
-  const Vector2& scrollOffset   = inputs[1]->GetVector2();
-
-  current = scrollPosition + scrollOffset;
-}
-
-/**
- * Internal Final Position Constraint
- * The position of content is:
- * of scroll-position + f(scroll-overshoot)
- * where f(...) function defines how overshoot
- * should affect final-position.
- */
-struct InternalFinalConstraint
-{
-  InternalFinalConstraint(AlphaFunctionPrototype functionX,
-                          AlphaFunctionPrototype functionY)
-  : mFunctionX(functionX),
-    mFunctionY(functionY)
-  {
-  }
-
-  void operator()(Vector2& current, const PropertyInputContainer& inputs)
-  {
-    const float& overshootx = inputs[1]->GetFloat();
-    const float& overshooty = inputs[2]->GetFloat();
-    Vector2      offset(mFunctionX(overshootx),
-                   mFunctionY(overshooty));
-
-    current = inputs[0]->GetVector2() - offset;
-  }
-
-  AlphaFunctionPrototype mFunctionX;
-  AlphaFunctionPrototype mFunctionY;
-};
-
 } // namespace
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -701,16 +685,18 @@ void ScrollView::OnInitialize()
   self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_VERTICAL, mCanScrollVertical);
   self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_HORIZONTAL, mCanScrollHorizontal);
 
-  UpdatePropertyDomain();
-  SetInternalConstraints();
+  ScrollViewPropertyHandler::UpdatePropertyDomain(*this);
+  mConstraints.SetInternalConstraints(*this);
 
   // Connect wheel event
   self.WheelEventSignal().Connect(this, &ScrollView::OnWheelEvent);
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_PANE));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::SCROLL_PANE);
+}
+
+DevelControl::ControlAccessible* ScrollView::CreateAccessibleObject()
+{
+  return new ScrollViewAccessible(Self());
 }
 
 void ScrollView::OnSceneConnection(int depth)
@@ -746,46 +732,6 @@ ScrollView::~ScrollView()
   DALI_LOG_SCROLL_STATE("[0x%X]", this);
 }
 
-AlphaFunction ScrollView::GetScrollSnapAlphaFunction() const
-{
-  return mSnapAlphaFunction;
-}
-
-void ScrollView::SetScrollSnapAlphaFunction(AlphaFunction alpha)
-{
-  mSnapAlphaFunction = alpha;
-}
-
-AlphaFunction ScrollView::GetScrollFlickAlphaFunction() const
-{
-  return mFlickAlphaFunction;
-}
-
-void ScrollView::SetScrollFlickAlphaFunction(AlphaFunction alpha)
-{
-  mFlickAlphaFunction = alpha;
-}
-
-float ScrollView::GetScrollSnapDuration() const
-{
-  return mSnapDuration;
-}
-
-void ScrollView::SetScrollSnapDuration(float time)
-{
-  mSnapDuration = time;
-}
-
-float ScrollView::GetScrollFlickDuration() const
-{
-  return mFlickDuration;
-}
-
-void ScrollView::SetScrollFlickDuration(float time)
-{
-  mFlickDuration = time;
-}
-
 void ScrollView::ApplyEffect(Toolkit::ScrollViewEffect effect)
 {
   Dali::Toolkit::ScrollView self = Dali::Toolkit::ScrollView::DownCast(Self());
@@ -858,132 +804,20 @@ void ScrollView::RemoveConstraintsFromChildren()
   RemoveConstraintsFromBoundActors();
 }
 
-const RulerPtr ScrollView::GetRulerX() const
-{
-  return mRulerX;
-}
-
-const RulerPtr ScrollView::GetRulerY() const
-{
-  return mRulerY;
-}
-
 void ScrollView::SetRulerX(RulerPtr ruler)
 {
   mRulerX = ruler;
 
-  UpdatePropertyDomain();
-  UpdateMainInternalConstraint();
+  ScrollViewPropertyHandler::UpdatePropertyDomain(*this);
+  mConstraints.UpdateMainInternalConstraint(*this);
 }
 
 void ScrollView::SetRulerY(RulerPtr ruler)
 {
   mRulerY = ruler;
 
-  UpdatePropertyDomain();
-  UpdateMainInternalConstraint();
-}
-
-void ScrollView::UpdatePropertyDomain()
-{
-  Actor   self                  = Self();
-  Vector3 size                  = self.GetTargetSize();
-  Vector2 min                   = mMinScroll;
-  Vector2 max                   = mMaxScroll;
-  bool    scrollPositionChanged = false;
-  bool    domainChanged         = false;
-
-  bool canScrollVertical   = false;
-  bool canScrollHorizontal = false;
-  UpdateLocalScrollProperties();
-  if(mRulerX->IsEnabled())
-  {
-    const Toolkit::RulerDomain& rulerDomain = mRulerX->GetDomain();
-    if(fabsf(min.x - rulerDomain.min) > Math::MACHINE_EPSILON_100 || fabsf(max.x - rulerDomain.max) > Math::MACHINE_EPSILON_100)
-    {
-      domainChanged = true;
-      min.x         = rulerDomain.min;
-      max.x         = rulerDomain.max;
-
-      // make sure new scroll value is within new domain
-      if(mScrollPrePosition.x < min.x || mScrollPrePosition.x > max.x)
-      {
-        scrollPositionChanged = true;
-        mScrollPrePosition.x  = Clamp(mScrollPrePosition.x, -(max.x - size.x), -min.x);
-      }
-    }
-    if((fabsf(rulerDomain.max - rulerDomain.min) - size.x) > Math::MACHINE_EPSILON_100)
-    {
-      canScrollHorizontal = true;
-    }
-  }
-  else if(fabs(min.x) > Math::MACHINE_EPSILON_100 || fabs(max.x) > Math::MACHINE_EPSILON_100)
-  {
-    // need to reset to 0
-    domainChanged       = true;
-    min.x               = 0.0f;
-    max.x               = 0.0f;
-    canScrollHorizontal = false;
-  }
-
-  if(mRulerY->IsEnabled())
-  {
-    const Toolkit::RulerDomain& rulerDomain = mRulerY->GetDomain();
-    if(fabsf(min.y - rulerDomain.min) > Math::MACHINE_EPSILON_100 || fabsf(max.y - rulerDomain.max) > Math::MACHINE_EPSILON_100)
-    {
-      domainChanged = true;
-      min.y         = rulerDomain.min;
-      max.y         = rulerDomain.max;
-
-      // make sure new scroll value is within new domain
-      if(mScrollPrePosition.y < min.y || mScrollPrePosition.y > max.y)
-      {
-        scrollPositionChanged = true;
-        mScrollPrePosition.y  = Clamp(mScrollPrePosition.y, -(max.y - size.y), -min.y);
-      }
-    }
-    if((fabsf(rulerDomain.max - rulerDomain.min) - size.y) > Math::MACHINE_EPSILON_100)
-    {
-      canScrollVertical = true;
-    }
-  }
-  else if(fabs(min.y) > Math::MACHINE_EPSILON_100 || fabs(max.y) > Math::MACHINE_EPSILON_100)
-  {
-    // need to reset to 0
-    domainChanged     = true;
-    min.y             = 0.0f;
-    max.y             = 0.0f;
-    canScrollVertical = false;
-  }
-
-  // avoid setting properties if possible, otherwise this will cause an entire update as well as triggering constraints using each property we update
-  if(mCanScrollVertical != canScrollVertical)
-  {
-    mCanScrollVertical = canScrollVertical;
-    self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_VERTICAL, canScrollVertical);
-  }
-  if(mCanScrollHorizontal != canScrollHorizontal)
-  {
-    mCanScrollHorizontal = canScrollHorizontal;
-    self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_HORIZONTAL, canScrollHorizontal);
-  }
-  if(scrollPositionChanged)
-  {
-    DALI_LOG_SCROLL_STATE("[0x%X] Domain Changed, setting SCROLL_PRE_POSITION To[%.2f, %.2f]", this, mScrollPrePosition.x, mScrollPrePosition.y);
-    self.SetProperty(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION, mScrollPrePosition);
-  }
-  if(domainChanged)
-  {
-    mMinScroll = min;
-    mMaxScroll = max;
-    self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN, mMinScroll);
-    self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX, mMaxScroll);
-  }
-}
-
-bool ScrollView::GetScrollSensitive()
-{
-  return mSensitive;
+  ScrollViewPropertyHandler::UpdatePropertyDomain(*this);
+  mConstraints.UpdateMainInternalConstraint(*this);
 }
 
 void ScrollView::SetScrollSensitive(bool sensitive)
@@ -1023,22 +857,7 @@ void ScrollView::SetMaxOvershoot(float overshootX, float overshootY)
   mMaxOvershoot.y      = overshootY;
   mUserMaxOvershoot    = mMaxOvershoot;
   mDefaultMaxOvershoot = false;
-  UpdateMainInternalConstraint();
-}
-
-void ScrollView::SetSnapOvershootAlphaFunction(AlphaFunction alpha)
-{
-  mSnapOvershootAlphaFunction = alpha;
-}
-
-float ScrollView::GetSnapOvershootDuration()
-{
-  return mSnapOvershootDuration;
-}
-
-void ScrollView::SetSnapOvershootDuration(float duration)
-{
-  mSnapOvershootDuration = duration;
+  mConstraints.UpdateMainInternalConstraint(*this);
 }
 
 bool ScrollView::GetActorAutoSnap()
@@ -1046,64 +865,29 @@ bool ScrollView::GetActorAutoSnap()
   return mActorAutoSnapEnabled;
 }
 
-void ScrollView::SetActorAutoSnap(bool enable)
-{
-  mActorAutoSnapEnabled = enable;
-}
-
 void ScrollView::SetAutoResize(bool enable)
 {
   mAutoResizeContainerEnabled = enable;
   // TODO: This needs a lot of issues to be addressed before working.
 }
 
-bool ScrollView::GetWrapMode() const
-{
-  return mWrapMode;
-}
-
 void ScrollView::SetWrapMode(bool enable)
 {
   mWrapMode = enable;
   Self().SetProperty(Toolkit::ScrollView::Property::WRAP, enable);
 }
 
-int ScrollView::GetScrollUpdateDistance() const
-{
-  return mScrollUpdateDistance;
-}
-
-void ScrollView::SetScrollUpdateDistance(int distance)
-{
-  mScrollUpdateDistance = distance;
-}
-
-bool ScrollView::GetAxisAutoLock() const
-{
-  return mAxisAutoLock;
-}
-
 void ScrollView::SetAxisAutoLock(bool enable)
 {
   mAxisAutoLock = enable;
-  UpdateMainInternalConstraint();
-}
-
-float ScrollView::GetAxisAutoLockGradient() const
-{
-  return mAxisAutoLockGradient;
+  mConstraints.UpdateMainInternalConstraint(*this);
 }
 
 void ScrollView::SetAxisAutoLockGradient(float gradient)
 {
   DALI_ASSERT_DEBUG(gradient >= 0.0f && gradient <= 1.0f);
   mAxisAutoLockGradient = gradient;
-  UpdateMainInternalConstraint();
-}
-
-float ScrollView::GetFrictionCoefficient() const
-{
-  return mFrictionCoefficient;
+  mConstraints.UpdateMainInternalConstraint(*this);
 }
 
 void ScrollView::SetFrictionCoefficient(float friction)
@@ -1112,56 +896,6 @@ void ScrollView::SetFrictionCoefficient(float friction)
   mFrictionCoefficient = friction;
 }
 
-float ScrollView::GetFlickSpeedCoefficient() const
-{
-  return mFlickSpeedCoefficient;
-}
-
-void ScrollView::SetFlickSpeedCoefficient(float speed)
-{
-  mFlickSpeedCoefficient = speed;
-}
-
-Vector2 ScrollView::GetMinimumDistanceForFlick() const
-{
-  return mMinFlickDistance;
-}
-
-void ScrollView::SetMinimumDistanceForFlick(const Vector2& distance)
-{
-  mMinFlickDistance = distance;
-}
-
-float ScrollView::GetMinimumSpeedForFlick() const
-{
-  return mFlickSpeedThreshold;
-}
-
-void ScrollView::SetMinimumSpeedForFlick(float speed)
-{
-  mFlickSpeedThreshold = speed;
-}
-
-float ScrollView::GetMaxFlickSpeed() const
-{
-  return mMaxFlickSpeed;
-}
-
-void ScrollView::SetMaxFlickSpeed(float speed)
-{
-  mMaxFlickSpeed = speed;
-}
-
-void ScrollView::SetWheelScrollDistanceStep(Vector2 step)
-{
-  mWheelScrollDistanceStep = step;
-}
-
-Vector2 ScrollView::GetWheelScrollDistanceStep() const
-{
-  return mWheelScrollDistanceStep;
-}
-
 unsigned int ScrollView::GetCurrentPage() const
 {
   // in case animation is currently taking place.
@@ -1229,9 +963,9 @@ void ScrollView::TransformTo(const Vector2& position, float duration, AlphaFunct
     mGestureStackDepth = 0;
     self.SetProperty(Toolkit::ScrollView::Property::PANNING, false);
 
-    if(mScrollMainInternalPrePositionConstraint)
+    if(mConstraints.mScrollMainInternalPrePositionConstraint)
     {
-      mScrollMainInternalPrePositionConstraint.Remove();
+      mConstraints.mScrollMainInternalPrePositionConstraint.Remove();
     }
   }
 
@@ -1291,361 +1025,79 @@ void ScrollView::ScrollTo(const Vector2& position, float duration, DirectionBias
 void ScrollView::ScrollTo(const Vector2& position, float duration, AlphaFunction alpha, DirectionBias horizontalBias, DirectionBias verticalBias)
 {
   DALI_LOG_SCROLL_STATE("[0x%X] position[%.2f, %.2f] duration[%.2f], bias[%d, %d]", this, position.x, position.y, duration, int(horizontalBias), int(verticalBias));
-  TransformTo(position, duration, alpha, horizontalBias, verticalBias);
-}
-
-void ScrollView::ScrollTo(unsigned int page)
-{
-  ScrollTo(page, mSnapDuration);
-}
-
-void ScrollView::ScrollTo(unsigned int page, float duration, DirectionBias bias)
-{
-  Vector2      position;
-  unsigned int volume;
-  unsigned int libraries;
-
-  // The position to scroll to is continuous and linear
-  // unless a domain has been enabled on the X axis.
-  // or if WrapMode has been enabled.
-  bool carryX = mRulerX->GetDomain().enabled | mWrapMode;
-  bool carryY = mRulerY->GetDomain().enabled | mWrapMode;
-
-  position.x = mRulerX->GetPositionFromPage(page, volume, carryX);
-  position.y = mRulerY->GetPositionFromPage(volume, libraries, carryY);
-
-  ScrollTo(position, duration, bias, bias);
-}
-
-void ScrollView::ScrollTo(Actor& actor)
-{
-  ScrollTo(actor, mSnapDuration);
-}
-
-void ScrollView::ScrollTo(Actor& actor, float duration)
-{
-  DALI_ASSERT_ALWAYS(actor.GetParent() == Self());
-
-  Actor   self        = Self();
-  Vector3 size        = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
-  Vector3 position    = actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
-  Vector2 prePosition = GetPropertyPrePosition();
-  position.GetVectorXY() -= prePosition;
-
-  ScrollTo(Vector2(position.x - size.width * 0.5f, position.y - size.height * 0.5f), duration);
-}
-
-Actor ScrollView::FindClosestActor()
-{
-  Actor   self = Self();
-  Vector3 size = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
-
-  return FindClosestActorToPosition(Vector3(size.width * 0.5f, size.height * 0.5f, 0.0f));
-}
-
-Actor ScrollView::FindClosestActorToPosition(const Vector3& position, FindDirection dirX, FindDirection dirY, FindDirection dirZ)
-{
-  Actor   closestChild;
-  float   closestDistance2 = 0.0f;
-  Vector3 actualPosition   = position;
-
-  unsigned int numChildren = Self().GetChildCount();
-
-  for(unsigned int i = 0; i < numChildren; ++i)
-  {
-    Actor child = Self().GetChildAt(i);
-
-    if(mInternalActor == child) // ignore internal actor.
-    {
-      continue;
-    }
-
-    Vector3 childPosition = GetPositionOfAnchor(child, AnchorPoint::CENTER);
-
-    Vector3 delta = childPosition - actualPosition;
-
-    // X-axis checking (only find Actors to the [dirX] of actualPosition)
-    if(dirX > All) // != All,None
-    {
-      FindDirection deltaH = delta.x > 0 ? Right : Left;
-      if(dirX != deltaH)
-      {
-        continue;
-      }
-    }
-
-    // Y-axis checking (only find Actors to the [dirY] of actualPosition)
-    if(dirY > All) // != All,None
-    {
-      FindDirection deltaV = delta.y > 0 ? Down : Up;
-      if(dirY != deltaV)
-      {
-        continue;
-      }
-    }
-
-    // Z-axis checking (only find Actors to the [dirZ] of actualPosition)
-    if(dirZ > All) // != All,None
-    {
-      FindDirection deltaV = delta.y > 0 ? In : Out;
-      if(dirZ != deltaV)
-      {
-        continue;
-      }
-    }
-
-    // compare child to closest child in terms of distance.
-    float distance2 = 0.0f;
-
-    // distance2 = the Square of the relevant dimensions of delta
-    if(dirX != None)
-    {
-      distance2 += delta.x * delta.x;
-    }
-
-    if(dirY != None)
-    {
-      distance2 += delta.y * delta.y;
-    }
-
-    if(dirZ != None)
-    {
-      distance2 += delta.z * delta.z;
-    }
-
-    if(closestChild) // Next time.
-    {
-      if(distance2 < closestDistance2)
-      {
-        closestChild     = child;
-        closestDistance2 = distance2;
-      }
-    }
-    else // First time.
-    {
-      closestChild     = child;
-      closestDistance2 = distance2;
-    }
-  }
-
-  return closestChild;
-}
-
-bool ScrollView::ScrollToSnapPoint()
-{
-  DALI_LOG_SCROLL_STATE("[0x%X]", this);
-  Vector2 stationaryVelocity = Vector2(0.0f, 0.0f);
-  return SnapWithVelocity(stationaryVelocity);
-}
-
-// TODO: In situations where axes are different (X snap, Y free)
-// Each axis should really have their own independent animation (time and equation)
-// Consider, X axis snapping to nearest grid point (EaseOut over fixed time)
-// Consider, Y axis simulating physics to arrive at a point (Physics equation over variable time)
-// Currently, the axes have been split however, they both use the same EaseOut equation.
-bool ScrollView::SnapWithVelocity(Vector2 velocity)
-{
-  // Animator takes over now, touches are assumed not to interfere.
-  // And if touches do interfere, then we'll stop animation, update PrePosition
-  // to current mScroll's properties, and then resume.
-  // Note: For Flicking this may work a bit different...
-
-  float         angle            = atan2(velocity.y, velocity.x);
-  float         speed2           = velocity.LengthSquared();
-  AlphaFunction alphaFunction    = mSnapAlphaFunction;
-  Vector2       positionDuration = Vector2::ONE * mSnapDuration;
-  float         biasX            = 0.5f;
-  float         biasY            = 0.5f;
-  FindDirection horizontal       = None;
-  FindDirection vertical         = None;
-
-  // orthoAngleRange = Angle tolerance within the Exact N,E,S,W direction
-  // that will be accepted as a general N,E,S,W flick direction.
-
-  const float orthoAngleRange      = FLICK_ORTHO_ANGLE_RANGE * M_PI / 180.0f;
-  const float flickSpeedThreshold2 = mFlickSpeedThreshold * mFlickSpeedThreshold;
-
-  Vector2 positionSnap = mScrollPrePosition;
-
-  // Flick logic X Axis
-
-  if(mRulerX->IsEnabled() && mLockAxis != LockHorizontal)
-  {
-    horizontal = All;
-
-    if(speed2 > flickSpeedThreshold2 || // exceeds flick threshold
-       mInAccessibilityPan)             // With AccessibilityPan its easier to move between snap positions
-    {
-      if((angle >= -orthoAngleRange) && (angle < orthoAngleRange)) // Swiping East
-      {
-        biasX = 0.0f, horizontal = Left;
-
-        // This guards against an error where no movement occurs, due to the flick finishing
-        // before the update-thread has advanced mScrollPostPosition past the the previous snap point.
-        positionSnap.x += 1.0f;
-      }
-      else if((angle >= M_PI - orthoAngleRange) || (angle < -M_PI + orthoAngleRange)) // Swiping West
-      {
-        biasX = 1.0f, horizontal = Right;
-
-        // This guards against an error where no movement occurs, due to the flick finishing
-        // before the update-thread has advanced mScrollPostPosition past the the previous snap point.
-        positionSnap.x -= 1.0f;
-      }
-    }
-  }
-
-  // Flick logic Y Axis
-
-  if(mRulerY->IsEnabled() && mLockAxis != LockVertical)
-  {
-    vertical = All;
-
-    if(speed2 > flickSpeedThreshold2 || // exceeds flick threshold
-       mInAccessibilityPan)             // With AccessibilityPan its easier to move between snap positions
-    {
-      if((angle >= M_PI_2 - orthoAngleRange) && (angle < M_PI_2 + orthoAngleRange)) // Swiping South
-      {
-        biasY = 0.0f, vertical = Up;
-      }
-      else if((angle >= -M_PI_2 - orthoAngleRange) && (angle < -M_PI_2 + orthoAngleRange)) // Swiping North
-      {
-        biasY = 1.0f, vertical = Down;
-      }
-    }
-  }
-
-  // isFlick: Whether this gesture is a flick or not.
-  bool isFlick = (horizontal != All || vertical != All);
-  // isFreeFlick: Whether this gesture is a flick under free panning criteria.
-  bool isFreeFlick = velocity.LengthSquared() > (FREE_FLICK_SPEED_THRESHOLD * FREE_FLICK_SPEED_THRESHOLD);
-
-  if(isFlick || isFreeFlick)
-  {
-    positionDuration = Vector2::ONE * mFlickDuration;
-    alphaFunction    = mFlickAlphaFunction;
-  }
-
-  // Calculate next positionSnap ////////////////////////////////////////////////////////////
-
-  if(mActorAutoSnapEnabled)
-  {
-    Vector3 size = Self().GetCurrentProperty<Vector3>(Actor::Property::SIZE);
-
-    Actor child = FindClosestActorToPosition(Vector3(size.width * 0.5f, size.height * 0.5f, 0.0f), horizontal, vertical);
-
-    if(!child && isFlick)
-    {
-      // If we conducted a direction limited search and found no actor, then just snap to the closest actor.
-      child = FindClosestActorToPosition(Vector3(size.width * 0.5f, size.height * 0.5f, 0.0f));
-    }
-
-    if(child)
-    {
-      Vector2 position = Self().GetCurrentProperty<Vector2>(Toolkit::ScrollView::Property::SCROLL_POSITION);
-
-      // Get center-point of the Actor.
-      Vector3 childPosition = GetPositionOfAnchor(child, AnchorPoint::CENTER);
-
-      if(mRulerX->IsEnabled())
-      {
-        positionSnap.x = position.x - childPosition.x + size.width * 0.5f;
-      }
-      if(mRulerY->IsEnabled())
-      {
-        positionSnap.y = position.y - childPosition.y + size.height * 0.5f;
-      }
-    }
-  }
+  TransformTo(position, duration, alpha, horizontalBias, verticalBias);
+}
 
-  Vector2 startPosition = positionSnap;
-  positionSnap.x        = -mRulerX->Snap(-positionSnap.x, biasX); // NOTE: X & Y rulers think in -ve coordinate system.
-  positionSnap.y        = -mRulerY->Snap(-positionSnap.y, biasY); // That is scrolling RIGHT (e.g. 100.0, 0.0) means moving LEFT.
+void ScrollView::ScrollTo(unsigned int page)
+{
+  ScrollTo(page, mSnapDuration);
+}
 
-  Vector2 clampDelta(Vector2::ZERO);
-  ClampPosition(positionSnap);
+void ScrollView::ScrollTo(unsigned int page, float duration, DirectionBias bias)
+{
+  Vector2      position;
+  unsigned int volume;
+  unsigned int libraries;
 
-  if((mRulerX->GetType() == Ruler::FREE || mRulerY->GetType() == Ruler::FREE) && isFreeFlick && !mActorAutoSnapEnabled)
-  {
-    // Calculate target position based on velocity of flick.
+  // The position to scroll to is continuous and linear
+  // unless a domain has been enabled on the X axis.
+  // or if WrapMode has been enabled.
+  bool carryX = mRulerX->GetDomain().enabled | mWrapMode;
+  bool carryY = mRulerY->GetDomain().enabled | mWrapMode;
 
-    // a = Deceleration (Set to diagonal stage length * friction coefficient)
-    // u = Initial Velocity (Flick velocity)
-    // v = 0 (Final Velocity)
-    // t = Time (Velocity / Deceleration)
-    Vector2 stageSize   = Stage::GetCurrent().GetSize();
-    float   stageLength = Vector3(stageSize.x, stageSize.y, 0.0f).Length();
-    float   a           = (stageLength * mFrictionCoefficient);
-    Vector3 u           = Vector3(velocity.x, velocity.y, 0.0f) * mFlickSpeedCoefficient;
-    float   speed       = u.Length();
-    u /= speed;
+  position.x = mRulerX->GetPositionFromPage(page, volume, carryX);
+  position.y = mRulerY->GetPositionFromPage(volume, libraries, carryY);
 
-    // TODO: Change this to a decay function. (faster you flick, the slower it should be)
-    speed = std::min(speed, stageLength * mMaxFlickSpeed);
-    u *= speed;
-    alphaFunction = ConstantDecelerationAlphaFunction;
+  ScrollTo(position, duration, bias, bias);
+}
 
-    float t = speed / a;
+void ScrollView::ScrollTo(Actor& actor)
+{
+  ScrollTo(actor, mSnapDuration);
+}
 
-    if(mRulerX->IsEnabled() && mRulerX->GetType() == Ruler::FREE)
-    {
-      positionSnap.x += t * u.x * 0.5f;
-    }
+void ScrollView::ScrollTo(Actor& actor, float duration)
+{
+  DALI_ASSERT_ALWAYS(actor.GetParent() == Self());
 
-    if(mRulerY->IsEnabled() && mRulerY->GetType() == Ruler::FREE)
-    {
-      positionSnap.y += t * u.y * 0.5f;
-    }
+  Actor   self        = Self();
+  Vector3 size        = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
+  Vector3 position    = actor.GetCurrentProperty<Vector3>(Actor::Property::POSITION);
+  Vector2 prePosition = GetPropertyPrePosition();
+  position.GetVectorXY() -= prePosition;
 
-    clampDelta = positionSnap;
-    ClampPosition(positionSnap);
-    if((positionSnap - startPosition).LengthSquared() > Math::MACHINE_EPSILON_0)
-    {
-      clampDelta -= positionSnap;
-      clampDelta.x = clampDelta.x > 0.0f ? std::min(clampDelta.x, mMaxOvershoot.x) : std::max(clampDelta.x, -mMaxOvershoot.x);
-      clampDelta.y = clampDelta.y > 0.0f ? std::min(clampDelta.y, mMaxOvershoot.y) : std::max(clampDelta.y, -mMaxOvershoot.y);
-    }
-    else
-    {
-      clampDelta = Vector2::ZERO;
-    }
+  ScrollTo(Vector2(position.x - size.width * 0.5f, position.y - size.height * 0.5f), duration);
+}
 
-    // If Axis is Free and has velocity, then calculate time taken
-    // to reach target based on velocity in axis.
-    if(mRulerX->IsEnabled() && mRulerX->GetType() == Ruler::FREE)
-    {
-      float deltaX = fabsf(startPosition.x - positionSnap.x);
+Actor ScrollView::FindClosestActor()
+{
+  Actor   self = Self();
+  Vector3 size = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
 
-      if(fabsf(u.x) > Math::MACHINE_EPSILON_1)
-      {
-        positionDuration.x = fabsf(deltaX / u.x);
-      }
-      else
-      {
-        positionDuration.x = 0;
-      }
-    }
+  return FindClosestActorToPosition(Vector3(size.width * 0.5f, size.height * 0.5f, 0.0f));
+}
 
-    if(mRulerY->IsEnabled() && mRulerY->GetType() == Ruler::FREE)
-    {
-      float deltaY = fabsf(startPosition.y - positionSnap.y);
+Actor ScrollView::FindClosestActorToPosition(const Vector3& position, FindDirection dirX, FindDirection dirY, FindDirection dirZ)
+{
+  return ::FindClosestActorToPosition(Self(), mInternalActor, position, dirX, dirY, dirZ);
+}
 
-      if(fabsf(u.y) > Math::MACHINE_EPSILON_1)
-      {
-        positionDuration.y = fabsf(deltaY / u.y);
-      }
-      else
-      {
-        positionDuration.y = 0;
-      }
-    }
-  }
+bool ScrollView::ScrollToSnapPoint()
+{
+  DALI_LOG_SCROLL_STATE("[0x%X]", this);
+  Vector2 stationaryVelocity = Vector2(0.0f, 0.0f);
+  return SnapWithVelocity(stationaryVelocity);
+}
 
-  if(IsOvershootEnabled())
-  {
-    // Scroll to the end of the overshoot only when overshoot is enabled.
-    positionSnap += clampDelta;
-  }
+bool ScrollView::SnapWithVelocity(Vector2 velocity)
+{
+  Vector2       positionSnap     = mScrollPrePosition;
+  Vector2       positionDuration = Vector2::ONE * mSnapDuration;
+  AlphaFunction alphaFunction    = mSnapAlphaFunction;
+  bool          isFlick;
+  bool          isFreeFlick;
+
+  ::SnapWithVelocity(*this, mRulerX, mRulerY, mLockAxis, velocity, mMaxOvershoot, positionSnap, positionDuration, alphaFunction, mInAccessibilityPan, isFlick, isFreeFlick);
 
   bool animating = AnimateTo(positionSnap, positionDuration, alphaFunction, false, DIRECTION_BIAS_NONE, DIRECTION_BIAS_NONE, isFlick || isFreeFlick ? FLICK : SNAP);
 
@@ -1698,7 +1150,7 @@ bool ScrollView::AnimateTo(const Vector2& position, const Vector2& positionDurat
   // Position Delta ///////////////////////////////////////////////////////
   if(positionChanged)
   {
-    UpdateMainInternalConstraint();
+    mConstraints.UpdateMainInternalConstraint(*this);
     if(mWrapMode && findShortcuts)
     {
       // In Wrap Mode, the shortest distance is a little less intuitive...
@@ -1771,7 +1223,7 @@ void ScrollView::EnableScrollOvershoot(bool enable)
     }
   }
 
-  UpdateMainInternalConstraint();
+  mConstraints.UpdateMainInternalConstraint(*this);
 }
 
 void ScrollView::AddOverlay(Actor actor)
@@ -1823,16 +1275,19 @@ Toolkit::ScrollView::SnapStartedSignalType& ScrollView::SnapStartedSignal()
   return mSnapStartedSignal;
 }
 
-bool ScrollView::AccessibleImpl::ScrollToChild(Actor child)
+bool ScrollView::ScrollViewAccessible::ScrollToChild(Actor child)
 {
   auto scrollView = Dali::Toolkit::ScrollView::DownCast(Self());
-  if (Toolkit::GetImpl(scrollView).FindClosestActor() == child)
+  if(Toolkit::GetImpl(scrollView).FindClosestActor() == child)
   {
     return false;
   }
 
-  // FIXME: ScrollTo does not work (snaps back to original position)
-  scrollView.ScrollTo(child, scrollView.GetScrollFlickDuration());
+  auto childPosition = GetPosition(child);
+  auto selfPosition  = GetPosition(Self());
+
+  scrollView.ScrollTo(childPosition - selfPosition, scrollView.GetScrollFlickDuration());
+
   return true;
 }
 
@@ -1947,7 +1402,7 @@ bool ScrollView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface*
 void ScrollView::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
 {
   // need to update domain properties for new size
-  UpdatePropertyDomain();
+  ScrollViewPropertyHandler::UpdatePropertyDomain(*this);
 }
 
 void ScrollView::OnSizeSet(const Vector3& size)
@@ -1962,8 +1417,8 @@ void ScrollView::OnSizeSet(const Vector3& size)
       mMaxOvershoot = mUserMaxOvershoot;
     }
   }
-  UpdatePropertyDomain();
-  UpdateMainInternalConstraint();
+  ScrollViewPropertyHandler::UpdatePropertyDomain(*this);
+  mConstraints.UpdateMainInternalConstraint(*this);
   if(IsOvershootEnabled())
   {
     mOvershootIndicator->Reset();
@@ -2503,7 +1958,7 @@ void ScrollView::OnPan(const PanGesture& gesture)
       self.SetProperty(Toolkit::ScrollView::Property::PANNING, true);
       self.SetProperty(Toolkit::ScrollView::Property::START_PAGE_POSITION, Vector3(position.x, position.y, 0.0f));
 
-      UpdateMainInternalConstraint();
+      mConstraints.UpdateMainInternalConstraint(*this);
       Toolkit::ScrollBar scrollBar = mScrollBar.GetHandle();
       if(scrollBar && mTransientScrollBar)
       {
@@ -2546,9 +2001,9 @@ void ScrollView::OnPan(const PanGesture& gesture)
         mPanning      = false;
         self.SetProperty(Toolkit::ScrollView::Property::PANNING, false);
 
-        if(mScrollMainInternalPrePositionConstraint)
+        if(mConstraints.mScrollMainInternalPrePositionConstraint)
         {
-          mScrollMainInternalPrePositionConstraint.Remove();
+          mConstraints.mScrollMainInternalPrePositionConstraint.Remove();
         }
 
         Toolkit::ScrollBar scrollBar = mScrollBar.GetHandle();
@@ -2645,45 +2100,6 @@ void ScrollView::FinishTransform()
   }
 }
 
-Vector2 ScrollView::GetOvershoot(Vector2& position) const
-{
-  Vector3 size = Self().GetCurrentProperty<Vector3>(Actor::Property::SIZE);
-  Vector2 overshoot;
-
-  const RulerDomain rulerDomainX = mRulerX->GetDomain();
-  const RulerDomain rulerDomainY = mRulerY->GetDomain();
-
-  if(mRulerX->IsEnabled() && rulerDomainX.enabled)
-  {
-    const float left  = rulerDomainX.min - position.x;
-    const float right = size.width - rulerDomainX.max - position.x;
-    if(left < 0)
-    {
-      overshoot.x = left;
-    }
-    else if(right > 0)
-    {
-      overshoot.x = right;
-    }
-  }
-
-  if(mRulerY->IsEnabled() && rulerDomainY.enabled)
-  {
-    const float top    = rulerDomainY.min - position.y;
-    const float bottom = size.height - rulerDomainY.max - position.y;
-    if(top < 0)
-    {
-      overshoot.y = top;
-    }
-    else if(bottom > 0)
-    {
-      overshoot.y = bottom;
-    }
-  }
-
-  return overshoot;
-}
-
 bool ScrollView::OnAccessibilityPan(PanGesture gesture)
 {
   // Keep track of whether this is an AccessibilityPan
@@ -2704,8 +2120,7 @@ void ScrollView::ClampPosition(Vector2& position, ClampState2D& clamped) const
 {
   Vector3 size = Self().GetCurrentProperty<Vector3>(Actor::Property::SIZE);
 
-  position.x = -mRulerX->Clamp(-position.x, size.width, 1.0f, clamped.x);  // NOTE: X & Y rulers think in -ve coordinate system.
-  position.y = -mRulerY->Clamp(-position.y, size.height, 1.0f, clamped.y); // That is scrolling RIGHT (e.g. 100.0, 0.0) means moving LEFT.
+  ::ClampPosition(size, mRulerX, mRulerY, position, clamped);
 }
 
 void ScrollView::WrapPosition(Vector2& position) const
@@ -2727,328 +2142,39 @@ void ScrollView::WrapPosition(Vector2& position) const
   }
 }
 
-void ScrollView::UpdateMainInternalConstraint()
-{
-  // TODO: Only update the constraints which have changed, rather than remove all and add all again.
-  // Requires a dali-core ApplyConstraintAt, or a ReplaceConstraint. The former is probably more flexible.
-  Actor              self = Self();
-  PanGestureDetector detector(GetPanGestureDetector());
-
-  if(mScrollMainInternalPositionConstraint)
-  {
-    mScrollMainInternalPositionConstraint.Remove();
-    mScrollMainInternalDeltaConstraint.Remove();
-    mScrollMainInternalFinalConstraint.Remove();
-    mScrollMainInternalRelativeConstraint.Remove();
-    mScrollMainInternalDomainConstraint.Remove();
-    mScrollMainInternalPrePositionMaxConstraint.Remove();
-  }
-  if(mScrollMainInternalPrePositionConstraint)
-  {
-    mScrollMainInternalPrePositionConstraint.Remove();
-  }
-
-  // TODO: It's probably better to use a local displacement value as this will give a displacement when scrolling just commences
-  // but we need to make sure than the gesture system gives displacement since last frame (60Hz), not displacement since last touch event (90Hz).
-
-  // 1. First calculate the pre-position (this is the scroll position if no clamping has taken place)
-  Vector2 initialPanMask = Vector2(mRulerX->IsEnabled() ? 1.0f : 0.0f, mRulerY->IsEnabled() ? 1.0f : 0.0f);
-
-  if(mLockAxis == LockVertical)
-  {
-    initialPanMask.y = 0.0f;
-  }
-  else if(mLockAxis == LockHorizontal)
-  {
-    initialPanMask.x = 0.0f;
-  }
-
-  if(mPanning)
-  {
-    mScrollMainInternalPrePositionConstraint = Constraint::New<Vector2>(self,
-                                                                        Toolkit::ScrollView::Property::SCROLL_PRE_POSITION,
-                                                                        InternalPrePositionConstraint(mPanStartPosition,
-                                                                                                      initialPanMask,
-                                                                                                      mAxisAutoLock,
-                                                                                                      mAxisAutoLockGradient,
-                                                                                                      mLockAxis,
-                                                                                                      mMaxOvershoot,
-                                                                                                      mRulerX,
-                                                                                                      mRulerY));
-    mScrollMainInternalPrePositionConstraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
-    mScrollMainInternalPrePositionConstraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
-    mScrollMainInternalPrePositionConstraint.AddSource(Source(self, Actor::Property::SIZE));
-    mScrollMainInternalPrePositionConstraint.Apply();
-  }
-
-  // 2. Second calculate the clamped position (actual position)
-  mScrollMainInternalPositionConstraint = Constraint::New<Vector2>(self,
-                                                                   Toolkit::ScrollView::Property::SCROLL_POSITION,
-                                                                   InternalPositionConstraint(mRulerX->GetDomain(),
-                                                                                              mRulerY->GetDomain(),
-                                                                                              mWrapMode));
-  mScrollMainInternalPositionConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION));
-  mScrollMainInternalPositionConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
-  mScrollMainInternalPositionConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
-  mScrollMainInternalPositionConstraint.AddSource(Source(self, Actor::Property::SIZE));
-  mScrollMainInternalPositionConstraint.Apply();
-
-  mScrollMainInternalDeltaConstraint = Constraint::New<Vector2>(self, Toolkit::ScrollView::Property::SCROLL_POSITION_DELTA, InternalPositionDeltaConstraint);
-  mScrollMainInternalDeltaConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
-  mScrollMainInternalDeltaConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_DOMAIN_OFFSET));
-  mScrollMainInternalDeltaConstraint.Apply();
-
-  mScrollMainInternalFinalConstraint = Constraint::New<Vector2>(self, Toolkit::ScrollView::Property::SCROLL_FINAL, InternalFinalConstraint(FinalDefaultAlphaFunction, FinalDefaultAlphaFunction));
-  mScrollMainInternalFinalConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
-  mScrollMainInternalFinalConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::OVERSHOOT_X));
-  mScrollMainInternalFinalConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::OVERSHOOT_Y));
-  mScrollMainInternalFinalConstraint.Apply();
-
-  mScrollMainInternalRelativeConstraint = Constraint::New<Vector2>(self, Toolkit::Scrollable::Property::SCROLL_RELATIVE_POSITION, InternalRelativePositionConstraint);
-  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
-  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
-  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
-  mScrollMainInternalRelativeConstraint.AddSource(LocalSource(Actor::Property::SIZE));
-  mScrollMainInternalRelativeConstraint.Apply();
-
-  mScrollMainInternalDomainConstraint = Constraint::New<Vector2>(self, Toolkit::ScrollView::Property::SCROLL_DOMAIN_SIZE, InternalScrollDomainConstraint);
-  mScrollMainInternalDomainConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
-  mScrollMainInternalDomainConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
-  mScrollMainInternalDomainConstraint.AddSource(LocalSource(Actor::Property::SIZE));
-  mScrollMainInternalDomainConstraint.Apply();
-
-  mScrollMainInternalPrePositionMaxConstraint = Constraint::New<Vector2>(self, Toolkit::ScrollView::Property::SCROLL_PRE_POSITION_MAX, InternalPrePositionMaxConstraint);
-  mScrollMainInternalPrePositionMaxConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
-  mScrollMainInternalPrePositionMaxConstraint.AddSource(LocalSource(Actor::Property::SIZE));
-  mScrollMainInternalPrePositionMaxConstraint.Apply();
-
-  // When panning we want to make sure overshoot values are affected by pre position and post position
-  SetOvershootConstraintsEnabled(!mWrapMode);
-}
-
-void ScrollView::SetOvershootConstraintsEnabled(bool enabled)
-{
-  Actor self(Self());
-  // remove and reset, it may now be in wrong order with the main internal constraints
-  if(mScrollMainInternalOvershootXConstraint)
-  {
-    mScrollMainInternalOvershootXConstraint.Remove();
-    mScrollMainInternalOvershootXConstraint.Reset();
-    mScrollMainInternalOvershootYConstraint.Remove();
-    mScrollMainInternalOvershootYConstraint.Reset();
-  }
-  if(enabled)
-  {
-    mScrollMainInternalOvershootXConstraint = Constraint::New<float>(self, Toolkit::ScrollView::Property::OVERSHOOT_X, OvershootXConstraint(mMaxOvershoot.x));
-    mScrollMainInternalOvershootXConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION));
-    mScrollMainInternalOvershootXConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
-    mScrollMainInternalOvershootXConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::CAN_SCROLL_HORIZONTAL));
-    mScrollMainInternalOvershootXConstraint.Apply();
-
-    mScrollMainInternalOvershootYConstraint = Constraint::New<float>(self, Toolkit::ScrollView::Property::OVERSHOOT_Y, OvershootYConstraint(mMaxOvershoot.y));
-    mScrollMainInternalOvershootYConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_PRE_POSITION));
-    mScrollMainInternalOvershootYConstraint.AddSource(LocalSource(Toolkit::ScrollView::Property::SCROLL_POSITION));
-    mScrollMainInternalOvershootYConstraint.AddSource(LocalSource(Toolkit::Scrollable::Property::CAN_SCROLL_VERTICAL));
-    mScrollMainInternalOvershootYConstraint.Apply();
-  }
-  else
-  {
-    self.SetProperty(Toolkit::ScrollView::Property::OVERSHOOT_X, 0.0f);
-    self.SetProperty(Toolkit::ScrollView::Property::OVERSHOOT_Y, 0.0f);
-  }
-}
-
-void ScrollView::SetInternalConstraints()
-{
-  // Internal constraints (applied to target ScrollBase Actor itself) /////////
-  UpdateMainInternalConstraint();
-
-  // User definable constraints to apply to all child actors //////////////////
-  Actor self = Self();
-
-  // Apply some default constraints to ScrollView & its bound actors
-  // Movement + Wrap function
-
-  Constraint constraint;
-
-  // MoveActor (scrolling)
-  constraint = Constraint::New<Vector3>(self, Actor::Property::POSITION, MoveActorConstraint);
-  constraint.AddSource(Source(self, Toolkit::ScrollView::Property::SCROLL_POSITION));
-  constraint.SetRemoveAction(Constraint::DISCARD);
-  ApplyConstraintToBoundActors(constraint);
-
-  // WrapActor (wrap functionality)
-  constraint = Constraint::New<Vector3>(self, Actor::Property::POSITION, WrapActorConstraint);
-  constraint.AddSource(LocalSource(Actor::Property::SCALE));
-  constraint.AddSource(LocalSource(Actor::Property::ANCHOR_POINT));
-  constraint.AddSource(LocalSource(Actor::Property::SIZE));
-  constraint.AddSource(Source(self, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN));
-  constraint.AddSource(Source(self, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX));
-  constraint.AddSource(Source(self, Toolkit::ScrollView::Property::WRAP));
-  constraint.SetRemoveAction(Constraint::DISCARD);
-  ApplyConstraintToBoundActors(constraint);
-}
-
 void ScrollView::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
 {
-  Toolkit::ScrollView scrollView = Toolkit::ScrollView::DownCast(Dali::BaseHandle(object));
-
-  if(scrollView)
-  {
-    ScrollView& scrollViewImpl(GetImpl(scrollView));
-    switch(index)
-    {
-      case Toolkit::ScrollView::Property::WRAP_ENABLED:
-      {
-        scrollViewImpl.SetWrapMode(value.Get<bool>());
-        break;
-      }
-      case Toolkit::ScrollView::Property::PANNING_ENABLED:
-      {
-        scrollViewImpl.SetScrollSensitive(value.Get<bool>());
-        break;
-      }
-      case Toolkit::ScrollView::Property::AXIS_AUTO_LOCK_ENABLED:
-      {
-        scrollViewImpl.SetAxisAutoLock(value.Get<bool>());
-        break;
-      }
-      case Toolkit::ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP:
-      {
-        scrollViewImpl.SetWheelScrollDistanceStep(value.Get<Vector2>());
-        break;
-      }
-      case Toolkit::ScrollView::Property::SCROLL_MODE:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          scrollViewImpl.SetScrollMode(*map);
-        }
-      }
-    }
-  }
+  ScrollViewPropertyHandler::Set(object, index, value);
 }
 
 Property::Value ScrollView::GetProperty(BaseObject* object, Property::Index index)
 {
-  Property::Value value;
-
-  Toolkit::ScrollView scrollView = Toolkit::ScrollView::DownCast(Dali::BaseHandle(object));
-
-  if(scrollView)
-  {
-    ScrollView& scrollViewImpl(GetImpl(scrollView));
-    switch(index)
-    {
-      case Toolkit::ScrollView::Property::WRAP_ENABLED:
-      {
-        value = scrollViewImpl.GetWrapMode();
-        break;
-      }
-      case Toolkit::ScrollView::Property::PANNING_ENABLED:
-      {
-        value = scrollViewImpl.GetScrollSensitive();
-        break;
-      }
-      case Toolkit::ScrollView::Property::AXIS_AUTO_LOCK_ENABLED:
-      {
-        value = scrollViewImpl.GetAxisAutoLock();
-        break;
-      }
-      case Toolkit::ScrollView::Property::WHEEL_SCROLL_DISTANCE_STEP:
-      {
-        value = scrollViewImpl.GetWheelScrollDistanceStep();
-        break;
-      }
-    }
-  }
-
-  return value;
+  return ScrollViewPropertyHandler::Get(object, index);
 }
 
-void ScrollView::SetScrollMode(const Property::Map& scrollModeMap)
+ScrollView::LockAxis GetLockAxis(const Vector2& panDelta, ScrollView::LockAxis currentLockAxis, float lockGradient)
 {
-  Toolkit::RulerPtr rulerX, rulerY;
-
-  // Check the scroll mode in the X axis
-  bool             xAxisScrollEnabled = true;
-  Property::Value* valuePtr           = scrollModeMap.Find(Toolkit::ScrollMode::X_AXIS_SCROLL_ENABLED, "xAxisScrollEnabled");
-  if(valuePtr && valuePtr->GetType() == Property::BOOLEAN)
-  {
-    valuePtr->Get(xAxisScrollEnabled);
-  }
-
-  if(!xAxisScrollEnabled)
-  {
-    // Default ruler and disabled
-    rulerX = new Toolkit::DefaultRuler();
-    rulerX->Disable();
-  }
-  else
+  if(panDelta.LengthSquared() > AUTOLOCK_AXIS_MINIMUM_DISTANCE2 &&
+     currentLockAxis == ScrollView::LockPossible)
   {
-    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::X_AXIS_SNAP_TO_INTERVAL, "xAxisSnapToInterval");
-    float xAxisSnapToInterval = 0.0f;
-    if(valuePtr && valuePtr->Get(xAxisSnapToInterval))
-    {
-      // Fixed ruler and enabled
-      rulerX = new Toolkit::FixedRuler(xAxisSnapToInterval);
-    }
-    else
-    {
-      // Default ruler and enabled
-      rulerX = new Toolkit::DefaultRuler();
-    }
-
-    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::X_AXIS_SCROLL_BOUNDARY, "xAxisScrollBoundary");
-    float xAxisScrollBoundary = 0.0f;
-    if(valuePtr && valuePtr->Get(xAxisScrollBoundary))
+    float dx = fabsf(panDelta.x);
+    float dy = fabsf(panDelta.y);
+    if(dx * lockGradient >= dy)
     {
-      // By default ruler domain is disabled unless set
-      rulerX->SetDomain(Toolkit::RulerDomain(0, xAxisScrollBoundary, true));
+      // 0.36:1 gradient to the horizontal (deviate < 20 degrees)
+      currentLockAxis = ScrollView::LockVertical;
     }
-  }
-
-  // Check the scroll mode in the Y axis
-  bool yAxisScrollEnabled = true;
-  valuePtr                = scrollModeMap.Find(Toolkit::ScrollMode::Y_AXIS_SCROLL_ENABLED, "yAxisScrollEnabled");
-  if(valuePtr && valuePtr->GetType() == Property::BOOLEAN)
-  {
-    valuePtr->Get(yAxisScrollEnabled);
-  }
-
-  if(!yAxisScrollEnabled)
-  {
-    // Default ruler and disabled
-    rulerY = new Toolkit::DefaultRuler();
-    rulerY->Disable();
-  }
-  else
-  {
-    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, "yAxisSnapToInterval");
-    float yAxisSnapToInterval = 0.0f;
-    if(valuePtr && valuePtr->Get(yAxisSnapToInterval))
+    else if(dy * lockGradient > dx)
     {
-      // Fixed ruler and enabled
-      rulerY = new Toolkit::FixedRuler(yAxisSnapToInterval);
+      // 0.36:1 gradient to the vertical (deviate < 20 degrees)
+      currentLockAxis = ScrollView::LockHorizontal;
     }
     else
     {
-      // Default ruler and enabled
-      rulerY = new Toolkit::DefaultRuler();
-    }
-
-    valuePtr                  = scrollModeMap.Find(Toolkit::ScrollMode::Y_AXIS_SCROLL_BOUNDARY, "yAxisScrollBoundary");
-    float yAxisScrollBoundary = 0.0f;
-    if(valuePtr && valuePtr->Get(yAxisScrollBoundary))
-    {
-      // By default ruler domain is disabled unless set
-      rulerY->SetDomain(Toolkit::RulerDomain(0, yAxisScrollBoundary, true));
+      currentLockAxis = ScrollView::LockNone;
     }
   }
-
-  SetRulerX(rulerX);
-  SetRulerY(rulerY);
+  return currentLockAxis;
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index aee050e..d9dddfc 100644
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@ -30,6 +30,7 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl-constraints.h>
 
 namespace Dali
 {
@@ -46,6 +47,8 @@ typedef IntrusivePtr<ScrollInternalConstraints> ScrollInternalConstraintsPtr;
 class ScrollOvershootIndicator;
 typedef IntrusivePtr<ScrollOvershootIndicator> ScrollOvershootIndicatorPtr;
 
+class ScrollViewPropertyHandler;
+
 /**
  * @copydoc Toolkit::ScrollView
  */
@@ -103,42 +106,66 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::GetScrollSnapAlphaFunction
    */
-  AlphaFunction GetScrollSnapAlphaFunction() const;
+  AlphaFunction GetScrollSnapAlphaFunction() const
+  {
+    return mSnapAlphaFunction;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetScrollSnapAlphaFunction
    */
-  void SetScrollSnapAlphaFunction(AlphaFunction alpha);
+  void SetScrollSnapAlphaFunction(AlphaFunction alpha)
+  {
+    mSnapAlphaFunction = alpha;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetScrollFlickAlphaFunction
    */
-  AlphaFunction GetScrollFlickAlphaFunction() const;
+  AlphaFunction GetScrollFlickAlphaFunction() const
+  {
+    return mFlickAlphaFunction;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetScrollFlickAlphaFunction
    */
-  void SetScrollFlickAlphaFunction(AlphaFunction alpha);
+  void SetScrollFlickAlphaFunction(AlphaFunction alpha)
+  {
+    mFlickAlphaFunction = alpha;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetScrollSnapDuration
    */
-  float GetScrollSnapDuration() const;
+  float GetScrollSnapDuration() const
+  {
+    return mSnapDuration;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetScrollSnapDuration
    */
-  void SetScrollSnapDuration(float time);
+  void SetScrollSnapDuration(float time)
+  {
+    mSnapDuration = time;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetScrollFlickDuration
    */
-  float GetScrollFlickDuration() const;
+  float GetScrollFlickDuration() const
+  {
+    return mFlickDuration;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetScrollFlickDuration
    */
-  void SetScrollFlickDuration(float time);
+  void SetScrollFlickDuration(float time)
+  {
+    mFlickDuration = time;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::ApplyEffect
@@ -168,12 +195,18 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::GetRulerX
    */
-  const RulerPtr GetRulerX() const;
+  const RulerPtr GetRulerX() const
+  {
+    return mRulerX;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetRulerY
    */
-  const RulerPtr GetRulerY() const;
+  const RulerPtr GetRulerY() const
+  {
+    return mRulerY;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetRulerX
@@ -190,7 +223,10 @@ public:
    *
    * @return whether the touch sensitivity is true or false.
    */
-  bool GetScrollSensitive();
+  bool GetScrollSensitive()
+  {
+    return mSensitive;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetScrollSensitive
@@ -205,19 +241,28 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::SetSnapOvershootAlphaFunction
    */
-  void SetSnapOvershootAlphaFunction(AlphaFunction alpha);
+  void SetSnapOvershootAlphaFunction(AlphaFunction alpha)
+  {
+    mSnapOvershootAlphaFunction = alpha;
+  }
 
   /**
    * Retrieve the duartion of Snap Overshoot animation
    *
    * @return the duration.
    */
-  float GetSnapOvershootDuration();
+  float GetSnapOvershootDuration()
+  {
+    return mSnapOvershootDuration;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetSnapOvershootDuration
    */
-  void SetSnapOvershootDuration(float duration);
+  void SetSnapOvershootDuration(float duration)
+  {
+    mSnapOvershootDuration = duration;
+  }
 
   /**
    * Retrieve whether Actor Auto-Snap mode is enabled or not.
@@ -229,7 +274,10 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::SetActorAutoSnap
    */
-  void SetActorAutoSnap(bool enable);
+  void SetActorAutoSnap(bool enable)
+  {
+    mActorAutoSnapEnabled = enable;
+  }
 
   /**
    * Enables or Disables Auto Resizing mode for ScrollView contents.
@@ -251,7 +299,10 @@ public:
    *
    * @return Wrap Mode Enabled flag.
    */
-  bool GetWrapMode() const;
+  bool GetWrapMode() const
+  {
+    return mWrapMode;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetWrapMode
@@ -261,17 +312,26 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::GetScrollupdateDistance
    */
-  int GetScrollUpdateDistance() const;
+  int GetScrollUpdateDistance() const
+  {
+    return mScrollUpdateDistance;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetScrollUpdateDistance
    */
-  void SetScrollUpdateDistance(int distance);
+  void SetScrollUpdateDistance(int distance)
+  {
+    mScrollUpdateDistance = distance;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetAxisAutoLock
    */
-  bool GetAxisAutoLock() const;
+  bool GetAxisAutoLock() const
+  {
+    return mAxisAutoLock;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetAxisAutoLock
@@ -281,7 +341,10 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::GetAxisAutoLockGradient
    */
-  float GetAxisAutoLockGradient() const;
+  float GetAxisAutoLockGradient() const
+  {
+    return mAxisAutoLockGradient;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetAxisAutoLockGradient
@@ -291,7 +354,10 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::GetFrictionCoefficient
    */
-  float GetFrictionCoefficient() const;
+  float GetFrictionCoefficient() const
+  {
+    return mFrictionCoefficient;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetFrictionCoefficient
@@ -301,52 +367,82 @@ public:
   /**
    * @copydoc Toolkit::ScrollView::GetFlickSpeedCoefficient
    */
-  float GetFlickSpeedCoefficient() const;
+  float GetFlickSpeedCoefficient() const
+  {
+    return mFlickSpeedCoefficient;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetFlickSpeedCoefficient
    */
-  void SetFlickSpeedCoefficient(float speed);
+  void SetFlickSpeedCoefficient(float speed)
+  {
+    mFlickSpeedCoefficient = speed;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetMinimumDistanceForFlick
    */
-  Vector2 GetMinimumDistanceForFlick() const;
+  Vector2 GetMinimumDistanceForFlick() const
+  {
+    return mMinFlickDistance;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetMinimumDistanceForFlick
    */
-  void SetMinimumDistanceForFlick(const Vector2& distance);
+  void SetMinimumDistanceForFlick(const Vector2& distance)
+  {
+    mMinFlickDistance = distance;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetMinimumSpeedForFlick
    */
-  float GetMinimumSpeedForFlick() const;
+  float GetMinimumSpeedForFlick() const
+  {
+    return mFlickSpeedThreshold;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetMinimumSpeedForFlick
    */
-  void SetMinimumSpeedForFlick(float speed);
+  void SetMinimumSpeedForFlick(float speed)
+  {
+    mFlickSpeedThreshold = speed;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetMaxFlickSpeed
    */
-  float GetMaxFlickSpeed() const;
+  float GetMaxFlickSpeed() const
+  {
+    return mMaxFlickSpeed;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetMaxFlickSpeed
    */
-  void SetMaxFlickSpeed(float speed);
+  void SetMaxFlickSpeed(float speed)
+  {
+    mMaxFlickSpeed = speed;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetWheelScrollDistanceStep
    */
-  Vector2 GetWheelScrollDistanceStep() const;
+  Vector2 GetWheelScrollDistanceStep() const
+  {
+    return mWheelScrollDistanceStep;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::SetWheelScrollDistanceStep
    */
-  void SetWheelScrollDistanceStep(Vector2 step);
+  void SetWheelScrollDistanceStep(Vector2 step)
+  {
+    mWheelScrollDistanceStep = step;
+  }
 
   /**
    * @copydoc Toolkit::ScrollView::GetCurrentPage
@@ -565,6 +661,11 @@ private: // private overridden functions from CustomActorImpl and Controls
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc CustomActorImpl::OnSceneConnection()
    */
   void OnSceneConnection(int depth) override;
@@ -680,13 +781,6 @@ private:
   void SnapInternalYTo(float position);
 
   /**
-   * This is called internally whenever the Scroll Rulers are
-   * modified. This will update the properties: 'scrollPositionMin'
-   * and 'scrollPositionMax' to reflect the changes.
-   */
-  void UpdatePropertyDomain();
-
-  /**
    * Called when the gesture starts.
    */
   void GestureStarted();
@@ -727,20 +821,6 @@ private:
   void FinishTransform();
 
   /**
-   * Returns overshoot vector based on current position
-   *
-   * Overshoot vector is defined as how far outside of bounds
-   * the viewport is trying to view (prior to being clamped).
-   *
-   * an overshoot of (100,50), means user is in bottom right corner,
-   * trying to pan +100 to the right, and +50 below. This can be used
-   * to determine an effect, such as stretching.
-   *
-   * @param[in] position The position for which you wish to obtain overshoot vector
-   */
-  Vector2 GetOvershoot(Vector2& position) const;
-
-  /**
    * Clamps position within the domain set up by X/Y Rulers
    *
    * @param[in,out] position The position you wish to clamp
@@ -765,31 +845,15 @@ private:
    */
   void WrapPosition(Vector2& position) const;
 
-  /**
-   * Updates the main internal scroll constraints with new ruler and domain
-   * values
-   */
-  void UpdateMainInternalConstraint();
-
-  /**
-   * Enables/disables the overshoot constraints
-   *
-   * @param[in] enabled whether to enable or disable the overshoot constraints
-   */
-  void SetOvershootConstraintsEnabled(bool enabled);
-
-  /**
-   * Sets internal constraints for this ScrollView.
-   * Many of these internal constraints are based on properties within
-   * ScrollView.
-   */
-  void SetInternalConstraints();
-
 protected:
-  struct AccessibleImpl : public Scrollable::AccessibleImpl
+  class ScrollViewAccessible : public Scrollable::ScrollableAccessible
   {
-    using Scrollable::AccessibleImpl::AccessibleImpl;
+  public:
+    using Scrollable::ScrollableAccessible::ScrollableAccessible;
 
+    /**
+     * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::ScrollToChild()
+     */
     bool ScrollToChild(Actor child) override;
   };
 
@@ -850,13 +914,6 @@ private:
    */
   void OnScrollUpdateNotification(Dali::PropertyNotification& source);
 
-  /**
-   * Set up default rulers using a property map
-   * @param[in] scrollModeMap A map defining the characteristics of X and Y scrolling
-   * using either FixedRuler or DefaultRuler.
-   */
-  void SetScrollMode(const Property::Map& scrollModeMap);
-
 private:
   // Undefined
   ScrollView(const ScrollView&);
@@ -865,6 +922,8 @@ private:
   ScrollView& operator=(const ScrollView& rhs);
 
 private:
+  ScrollViewConstraints mConstraints;
+
   unsigned long mTouchDownTime; ///< The touch down time
 
   int     mGestureStackDepth; ///< How many gestures are currently occuring.
@@ -922,17 +981,6 @@ private:
 
   Vector2 mWheelScrollDistanceStep; ///< The step of scroll distance in actor coordinates in X and Y axes for each wheel event received.
 
-  //ScrollInternalConstraintsPtr mScrollInternalConstraints;
-  Constraint mScrollMainInternalPrePositionConstraint;
-  Constraint mScrollMainInternalPositionConstraint;
-  Constraint mScrollMainInternalOvershootXConstraint;
-  Constraint mScrollMainInternalOvershootYConstraint;
-  Constraint mScrollMainInternalDeltaConstraint;
-  Constraint mScrollMainInternalFinalConstraint;
-  Constraint mScrollMainInternalRelativeConstraint;
-  Constraint mScrollMainInternalDomainConstraint;
-  Constraint mScrollMainInternalPrePositionMaxConstraint;
-
   ScrollOvershootIndicatorPtr    mOvershootIndicator;
   WeakHandle<Toolkit::ScrollBar> mScrollBar;
 
@@ -953,8 +1001,22 @@ private:
   bool mCanScrollHorizontal : 1;        ///< Local value of our property to check against
   bool mCanScrollVertical : 1;          ///< Local value of our property to check against
   bool mTransientScrollBar : 1;         ///< True if scroll-bar should be automatically show/hidden during/after panning
+
+  friend ScrollViewConstraints;
+  friend ScrollViewPropertyHandler;
 };
 
+/**
+ * Returns whether to lock scrolling to a particular axis
+ *
+ * @param[in] panDelta Distance panned since gesture started
+ * @param[in] currentLockAxis The current lock axis value
+ * @param[in] lockGradient How quickly to lock to a particular axis
+ *
+ * @return The new axis lock state
+ */
+ScrollView::LockAxis GetLockAxis(const Vector2& panDelta, ScrollView::LockAxis currentLockAxis, float lockGradient);
+
 } // namespace Internal
 
 // Helpers for public-api forwarding methods
diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index 609476a..7c12348 100644
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@ -92,17 +92,19 @@ Scrollable::~Scrollable()
 {
 }
 
-bool Scrollable::AccessibleImpl::IsScrollable()
+bool Scrollable::ScrollableAccessible::IsScrollable() const
 {
   return true;
 }
 
 void Scrollable::OnInitialize()
 {
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_PANE));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::SCROLL_PANE);
+}
+
+DevelControl::ControlAccessible* Scrollable::CreateAccessibleObject()
+{
+  return new ScrollableAccessible(Self());
 }
 
 bool Scrollable::IsOvershootEnabled() const
diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index 4240a1e..5e30b86 100644
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@ -117,11 +117,15 @@ public:
   virtual void SetOvershootSize(const Vector2& size) = 0;
 
 protected: // From Control
-  struct AccessibleImpl : public DevelControl::AccessibleImpl
+  class ScrollableAccessible : public DevelControl::ControlAccessible
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
 
-    bool IsScrollable() override;
+    /**
+     * @copydoc Dali::Accessibility::Component::IsScrollable()
+     */
+    bool IsScrollable() const override;
   };
 
   /**
@@ -129,6 +133,11 @@ protected: // From Control
    */
   virtual void OnInitialize() override;
 
+  /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
 private:
   /**
    * Temporary function to override EnableScrollOvershoot functionality for overshoot
diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
index 612a9a4..9140b97 100644
--- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
+++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
@@ -256,10 +256,7 @@ void ShadowView::OnInitialize()
   blurStrengthConstraint.AddSource(Source(self, mBlurStrengthPropertyIndex));
   blurStrengthConstraint.Apply();
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 void ShadowView::OnChildAdd(Actor& child)
diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
index 8cac5ed..5de904f 100644
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -202,16 +202,17 @@ void Slider::OnInitialize()
   // Size the Slider actor to a default
   self.SetProperty(Actor::Property::SIZE, Vector2(DEFAULT_HIT_REGION.x, DEFAULT_HIT_REGION.y));
 
-  // Set the Slider to be highlightable in Screen Reader mode
-  self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
-
   // Connect to the touch signal
   self.TouchedSignal().Connect(this, &Slider::OnTouch);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::SLIDER));
-  });
+  // Accessibility
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::SLIDER);
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+}
+
+DevelControl::ControlAccessible* Slider::CreateAccessibleObject()
+{
+  return new SliderAccessible(Self());
 }
 
 void Slider::OnRelayout(const Vector2& size, RelayoutContainer& container)
@@ -861,14 +862,16 @@ float Slider::SnapToMark(float value)
   for(MarkList::SizeType i = 0; i < mMarks.Count(); ++i)
   {
     const Property::Value& propertyValue = mMarks[i];
-    propertyValue.Get(mark);
-    mark = MapValuePercentage(mark);
-
-    float dist = fabsf(mark - value);
-    if(dist < closestDist)
+    if(propertyValue.Get(mark))
     {
-      closestDist = dist;
-      closestMark = mark;
+      mark = MapValuePercentage(mark);
+
+      float dist = fabsf(mark - value);
+      if(dist < closestDist)
+      {
+        closestDist = dist;
+        closestMark = mark;
+      }
     }
   }
 
@@ -890,22 +893,24 @@ bool Slider::MarkReached(float value, int& outIndex)
     current = head + (tail - head) / 2;
 
     const Property::Value& propertyValue = mMarks[current];
-    propertyValue.Get(mark);
-    mark = MapValuePercentage(mark);
-
-    if(fabsf(mark - value) < MARK_TOLERANCE)
+    if(propertyValue.Get(mark))
     {
-      outIndex = current;
-      return true;
-    }
+      mark = MapValuePercentage(mark);
 
-    if(value < mark)
-    {
-      tail = current - 1;
-    }
-    else
-    {
-      head = current + 1;
+      if(fabsf(mark - value) < MARK_TOLERANCE)
+      {
+        outIndex = current;
+        return true;
+      }
+
+      if(value < mark)
+      {
+        tail = current - 1;
+      }
+      else
+      {
+        head = current + 1;
+      }
     }
   }
 
@@ -950,7 +955,11 @@ void Slider::SetValue(float value)
   DisplayValue(mValue, true);
   if(Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor())
   {
-    Control::Impl::GetAccessibilityObject(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::VALUE);
+    auto accessible = GetAccessibleObject();
+    if(DALI_LIKELY(accessible))
+    {
+      accessible->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::VALUE);
+    }
   }
 }
 
@@ -1411,30 +1420,35 @@ Property::Value Slider::GetProperty(BaseObject* object, Property::Index property
   return value;
 }
 
-double Slider::AccessibleImpl::GetMinimum()
+double Slider::SliderAccessible::GetMinimum() const
 {
   auto self = Toolkit::Slider::DownCast(Self());
   return self.GetProperty(Toolkit::Slider::Property::LOWER_BOUND).Get<float>();
 }
 
-double Slider::AccessibleImpl::GetCurrent()
+double Slider::SliderAccessible::GetCurrent() const
 {
   auto self = Toolkit::Slider::DownCast(Self());
   return self.GetProperty(Toolkit::Slider::Property::VALUE).Get<float>();
 }
 
-double Slider::AccessibleImpl::GetMaximum()
+std::string Slider::SliderAccessible::GetValueText() const
+{
+  return {}; // Text mode is not used at the moment
+}
+
+double Slider::SliderAccessible::GetMaximum() const
 {
   auto self = Toolkit::Slider::DownCast(Self());
   return self.GetProperty(Toolkit::Slider::Property::UPPER_BOUND).Get<float>();
 }
 
-bool Slider::AccessibleImpl::SetCurrent(double current)
+bool Slider::SliderAccessible::SetCurrent(double current)
 {
   if(current < GetMinimum() || current > GetMaximum())
     return false;
 
-  auto self = Toolkit::Slider::DownCast(Self());
+  auto  self = Toolkit::Slider::DownCast(Self());
   auto& impl = Toolkit::GetImpl(self);
 
   const float prev = self.GetProperty<float>(Toolkit::Slider::Property::VALUE);
@@ -1477,7 +1491,7 @@ bool Slider::AccessibleImpl::SetCurrent(double current)
   return true;
 }
 
-double Slider::AccessibleImpl::GetMinimumIncrement()
+double Slider::SliderAccessible::GetMinimumIncrement() const
 {
   auto self = Toolkit::Slider::DownCast(Self());
 
diff --git a/dali-toolkit/internal/controls/slider/slider-impl.h b/dali-toolkit/internal/controls/slider/slider-impl.h
index 134b9f2..799bd2c 100644
--- a/dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/dali-toolkit/internal/controls/slider/slider-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_SLIDER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/atspi-interfaces/value.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/object/property-array.h>
 #include <dali/public-api/object/property-map.h>
@@ -318,6 +319,11 @@ private:
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * Hit region touch
    *
    * @param[in] actor The actor the event is raised for
@@ -335,6 +341,11 @@ private:
   void OnPan(Actor actor, const PanGesture& gesture);
 
   /**
+   * @copydoc Control::OnPan
+   */
+  using Control::OnPan;
+
+  /**
    * Map a position onto a domain and return the result as a percentage
    *
    * @param[in] point The point to map onto the domain
@@ -748,15 +759,41 @@ private:
     mSnapToMarks : 1;  ///< Turn on or off snapping to marks
 
 protected:
-  struct AccessibleImpl : public DevelControl::AccessibleImpl,
-                          public virtual Dali::Accessibility::Value
+  class SliderAccessible : public DevelControl::ControlAccessible,
+                           public virtual Dali::Accessibility::Value
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
-    double GetMinimum() override;
-    double GetCurrent() override;
-    double GetMaximum() override;
-    bool   SetCurrent(double) override;
-    double GetMinimumIncrement() override;
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMinimum()
+     */
+    double GetMinimum() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetCurrent()
+     */
+    double GetCurrent() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetValueText()
+     */
+    std::string GetValueText() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMaximum()
+     */
+    double GetMaximum() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::SetCurrent()
+     */
+    bool SetCurrent(double) override;
+
+    /**
+     * @copydoc Dali::Accessibility::Value::GetMinimumIncrement()
+     */
+    double GetMinimumIncrement() const override;
   };
 };
 
diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 6325e62..4aedfc0 100644
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -147,12 +147,9 @@ void SuperBlurView::OnInitialize()
 {
   Actor self(Self());
 
-  mBlurStrengthPropertyIndex = self.RegisterProperty("blurStrength", 0.f);
+  mBlurStrengthPropertyIndex = self.RegisterUniqueProperty("blurStrength", 0.f);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
 void SuperBlurView::SetTexture(Texture texture)
@@ -195,7 +192,7 @@ void SuperBlurView::SetBlurStrength(float blurStrength)
 
 float SuperBlurView::GetCurrentBlurStrength() const
 {
-  float blurStrength;
+  float blurStrength = 0.0f;
   (Self().GetProperty(mBlurStrengthPropertyIndex)).Get(blurStrength);
 
   return blurStrength;
@@ -307,7 +304,7 @@ void SuperBlurView::OnSceneConnection(int depth)
     if(i > 0)
     {
       Renderer        renderer   = mRenderers[i];
-      Property::Index index      = renderer.RegisterProperty(ALPHA_UNIFORM_NAME, 0.f);
+      Property::Index index      = renderer.RegisterUniqueProperty(ALPHA_UNIFORM_NAME, 0.f);
       Constraint      constraint = Constraint::New<float>(renderer, index, ActorOpacityConstraint(mBlurLevels, i - 1));
       constraint.AddSource(Source(self, mBlurStrengthPropertyIndex));
       constraint.Apply();
@@ -356,20 +353,21 @@ void SuperBlurView::SetProperty(BaseObject* object, Property::Index propertyInde
 
     if(propertyIndex == Toolkit::SuperBlurView::Property::IMAGE_URL)
     {
-      value.Get(superBlurViewImpl.mUrl);
-
-      PixelData pixels = SyncImageLoader::Load(superBlurViewImpl.mUrl);
-
-      if(pixels)
-      {
-        Texture texture = Texture::New(TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight());
-        texture.Upload(pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight());
-
-        superBlurViewImpl.SetTexture(texture);
-      }
-      else
+      if(DALI_LIKELY(value.Get(superBlurViewImpl.mUrl)))
       {
-        DALI_LOG_ERROR("Cannot create image from property value\n");
+        PixelData pixels = SyncImageLoader::Load(superBlurViewImpl.mUrl);
+
+        if(pixels)
+        {
+          Texture texture = Texture::New(TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight());
+          texture.Upload(pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight());
+
+          superBlurViewImpl.SetTexture(texture);
+        }
+        else
+        {
+          DALI_LOG_ERROR("Cannot create image from property value\n");
+        }
       }
     }
   }
diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index 4b3e019..686c1ca 100644
--- a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ bool FitToChild(Actor actor, Dimension::Type dimension)
 // currently not called from code so compiler will optimize these away, kept here for future debugging
 
 #define TABLEVIEW_TAG "DALI Toolkit::TableView "
-#define TV_LOG(fmt, args, ...) Debug::LogMessage(Debug::DebugInfo, TABLEVIEW_TAG fmt, ##args)
+#define TV_LOG(fmt, args, ...) Debug::LogMessageWithFunctionLine(Debug::INFO, TABLEVIEW_TAG fmt, ##args)
 //#define TABLEVIEW_DEBUG 1
 
 #if defined(TABLEVIEW_DEBUG)
@@ -1119,10 +1119,7 @@ void TableView::OnInitialize()
   self.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
   SetAsKeyboardFocusGroup(true);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::TABLE));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::TABLE);
 }
 
 void TableView::ResizeContainers(unsigned int rows, unsigned int columns)
@@ -1227,31 +1224,50 @@ void TableView::SetHeightOrWidthProperty(TableView& tableViewImpl,
       std::istringstream(map->GetKey(i)) >> index;
       if(childMap)
       {
-        Property::Value* policy        = childMap->Find("policy");
-        Property::Value* childMapValue = childMap->Find("value");
-        if(policy && childMapValue)
+        Property::Value* policy = childMap->Find("policy");
+        if(policy)
         {
           std::string policyValue;
-          policy->Get(policyValue);
-          Toolkit::TableView::LayoutPolicy policy;
-          if(Scripting::GetEnumeration<Toolkit::TableView::LayoutPolicy>(policyValue.c_str(),
-                                                                         LAYOUT_POLICY_STRING_TABLE,
-                                                                         LAYOUT_POLICY_STRING_TABLE_COUNT,
-                                                                         policy))
+          if(DALI_LIKELY(policy->Get(policyValue)))
           {
-            if(policy == Toolkit::TableView::FIXED)
+            Toolkit::TableView::LayoutPolicy policy;
+            if(Scripting::GetEnumeration<Toolkit::TableView::LayoutPolicy>(policyValue.c_str(),
+                                                                           LAYOUT_POLICY_STRING_TABLE,
+                                                                           LAYOUT_POLICY_STRING_TABLE_COUNT,
+                                                                           policy))
             {
-              (tableViewImpl.*funcFixed)(index, childMapValue->Get<float>());
-            }
-            else if(policy == Toolkit::TableView::RELATIVE)
-            {
-              (tableViewImpl.*funcRelative)(index, childMapValue->Get<float>());
-            }
-            else if(policy == Toolkit::TableView::FIT)
-            {
-              (tableViewImpl.*funcFit)(index);
+              switch(policy)
+              {
+                case Toolkit::TableView::FIXED:
+                case Toolkit::TableView::RELATIVE:
+                {
+                  Property::Value* childMapValue = childMap->Find("value");
+                  float            childValue    = 0.0f;
+                  if(DALI_LIKELY(childMapValue && childMapValue->Get(childValue)))
+                  {
+                    if(policy == Toolkit::TableView::FIXED)
+                    {
+                      (tableViewImpl.*funcFixed)(index, childValue);
+                    }
+                    else // if(policy == Toolkit::TableView::RELATIVE)
+                    {
+                      (tableViewImpl.*funcRelative)(index, childValue);
+                    }
+                  }
+                  break;
+                }
+                case Toolkit::TableView::FIT:
+                {
+                  (tableViewImpl.*funcFit)(index);
+                  break;
+                }
+                default:
+                {
+                  // do nothing for FILL policy
+                  break;
+                }
+              }
             }
-            // do nothing for FILL policy
           }
         }
       }
diff --git a/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp b/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
new file mode 100644
index 0000000..b18cb98
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/segmentation.h>
+#include <dali/public-api/actors/layer.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/hidden-text.h>
+#include <dali-toolkit/internal/text/text-view.h>
+
+namespace Dali::Toolkit::Internal
+{
+void CommonTextUtils::SynchronizeTextAnchorsInParent(
+  Actor                             parent,
+  Text::ControllerPtr               controller,
+  std::vector<Toolkit::TextAnchor>& anchorActors)
+{
+  for(auto& anchorActor : anchorActors)
+  {
+    parent.Remove(anchorActor);
+  }
+  if(Dali::Accessibility::IsUp())
+  {
+    controller->GetAnchorActors(anchorActors);
+    for(auto& anchorActor : anchorActors)
+    {
+      parent.Add(anchorActor);
+    }
+  }
+}
+
+void CommonTextUtils::RenderText(
+  Actor                             textActor,
+  Text::RendererPtr                 renderer,
+  Text::ControllerPtr               controller,
+  Text::DecoratorPtr                decorator,
+  float&                            alignmentOffset,
+  Actor&                            renderableActor,
+  Actor&                            backgroundActor,
+  Actor&                            cursorLayerActor,
+  Toolkit::Control&                 stencil,
+  std::vector<Actor>&               clippingDecorationActors,
+  std::vector<Toolkit::TextAnchor>& anchorActors,
+  Text::Controller::UpdateTextType  updateTextType)
+{
+  Actor newRenderableActor;
+
+  if(Text::Controller::NONE_UPDATED != (Text::Controller::MODEL_UPDATED & updateTextType))
+  {
+    if(renderer)
+    {
+      newRenderableActor = renderer->Render(controller->GetView(),
+                                            textActor,
+                                            Property::INVALID_INDEX, // Animatable property not supported
+                                            alignmentOffset,
+                                            DepthIndex::CONTENT);
+    }
+
+    if(renderableActor != newRenderableActor)
+    {
+      UnparentAndReset(backgroundActor);
+      UnparentAndReset(renderableActor);
+      renderableActor = newRenderableActor;
+
+      if(renderableActor)
+      {
+        backgroundActor = controller->CreateBackgroundActor();
+      }
+    }
+  }
+
+  if(renderableActor)
+  {
+    const Vector2& scrollOffset = controller->GetTextModel()->GetScrollPosition();
+
+    float renderableActorPositionX, renderableActorPositionY;
+
+    if(stencil)
+    {
+      renderableActorPositionX = scrollOffset.x + alignmentOffset;
+      renderableActorPositionY = scrollOffset.y;
+    }
+    else
+    {
+      Extents padding;
+      padding = textActor.GetProperty<Extents>(Toolkit::Control::Property::PADDING);
+
+      // Support Right-To-Left of padding
+      Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(textActor.GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
+      if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
+      {
+        std::swap(padding.start, padding.end);
+      }
+
+      renderableActorPositionX = scrollOffset.x + alignmentOffset + padding.start;
+      renderableActorPositionY = scrollOffset.y + padding.top;
+    }
+
+    renderableActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY));
+
+    // Make sure the actors are parented correctly with/without clipping
+    Actor self = stencil ? stencil : textActor;
+
+    Actor highlightActor;
+
+    for(std::vector<Actor>::iterator it    = clippingDecorationActors.begin(),
+                                     endIt = clippingDecorationActors.end();
+        it != endIt;
+        ++it)
+    {
+      self.Add(*it);
+      it->LowerToBottom();
+
+      if(it->GetProperty<std::string>(Dali::Actor::Property::NAME) == "HighlightActor")
+      {
+        highlightActor = *it;
+      }
+    }
+    clippingDecorationActors.clear();
+
+    self.Add(renderableActor);
+
+    if(backgroundActor)
+    {
+      if(decorator && decorator->IsHighlightVisible())
+      {
+        self.Add(backgroundActor);
+        backgroundActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY)); // In text field's coords.
+        backgroundActor.LowerBelow(highlightActor);
+      }
+      else
+      {
+        renderableActor.Add(backgroundActor);
+        backgroundActor.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); // In renderable actor's coords.
+        backgroundActor.LowerToBottom();
+      }
+    }
+
+    if(cursorLayerActor)
+    {
+      cursorLayerActor.RaiseToTop();
+    }
+
+    SynchronizeTextAnchorsInParent(textActor, controller, anchorActors);
+  }
+}
+
+std::size_t TextControlAccessible::GetCharacterCount() const
+{
+  return GetWholeText().size();
+}
+
+std::size_t TextControlAccessible::GetCursorOffset() const
+{
+  return 0u;
+}
+
+Rect<> TextControlAccessible::GetRangeExtents(std::size_t startOffset, std::size_t endOffset, Accessibility::CoordinateType type)
+{
+  if(!ValidateRange(GetWholeText(), startOffset, endOffset))
+  {
+    return {0, 0, 0, 0};
+  }
+
+  auto rect    = GetTextController()->GetTextBoundingRectangle(startOffset, endOffset - 1);
+  auto extents = GetExtents(type);
+
+  rect.x += extents.x;
+  rect.y += extents.y;
+
+  return rect;
+}
+
+Accessibility::Range TextControlAccessible::GetRangeOfSelection(std::size_t selectionIndex) const
+{
+  // Since DALi supports only one selection, indices other than 0 are ignored
+  if(selectionIndex > 0)
+  {
+    return {};
+  }
+
+  auto indices     = GetTextController()->GetSelectionIndexes();
+  auto startOffset = static_cast<std::size_t>(indices.first);
+  auto endOffset   = static_cast<std::size_t>(indices.second);
+  auto text        = GetText(startOffset, endOffset);
+
+  return {startOffset, endOffset, std::move(text)};
+}
+
+std::string TextControlAccessible::GetText(std::size_t startOffset, std::size_t endOffset) const
+{
+  auto text = GetWholeText();
+
+  if(!ValidateRange(text, startOffset, endOffset))
+  {
+    return {};
+  }
+
+  if(IsHiddenInput())
+  {
+    std::uint32_t substituteCharacterUtf32 = GetSubstituteCharacter();
+    std::string   substituteCharacterUtf8;
+    std::string   substituteText;
+
+    Toolkit::Text::Utf32ToUtf8(&substituteCharacterUtf32, 1, substituteCharacterUtf8);
+
+    while(substituteText.length() < endOffset - startOffset)
+    {
+      substituteText.append(substituteCharacterUtf8);
+    }
+
+    return substituteText;
+  }
+
+  return text.substr(startOffset, endOffset - startOffset);
+}
+
+Accessibility::Range TextControlAccessible::GetTextAtOffset(std::size_t offset, Accessibility::TextBoundary boundary) const
+{
+  Accessibility::Range range{};
+
+  if(IsHiddenInput())
+  {
+    // Returning empty object, as there is no possibility to parse the textfield
+    // when its content is hidden.
+    return range;
+  }
+
+  auto text     = GetWholeText();
+  auto textSize = text.size();
+
+  switch(boundary)
+  {
+    case Dali::Accessibility::TextBoundary::CHARACTER:
+    {
+      if(offset < textSize)
+      {
+        range.content     = text[offset];
+        range.startOffset = offset;
+        range.endOffset   = offset + 1;
+      }
+      break;
+    }
+
+    case Dali::Accessibility::TextBoundary::WORD:
+    case Dali::Accessibility::TextBoundary::LINE:
+    {
+      std::vector<char> breaks(textSize, '\0');
+
+      if(boundary == Dali::Accessibility::TextBoundary::WORD)
+      {
+        TextAbstraction::Segmentation::Get().GetWordBreakPositionsUtf8(reinterpret_cast<const uint8_t*>(text.c_str()), textSize, breaks.data());
+      }
+      else
+      {
+        TextAbstraction::Segmentation::Get().GetLineBreakPositionsUtf8(reinterpret_cast<const uint8_t*>(text.c_str()), textSize, breaks.data());
+      }
+
+      std::size_t index   = 0u;
+      std::size_t counter = 0u;
+
+      while(index < textSize && counter <= offset)
+      {
+        auto start = index;
+        if(breaks[index])
+        {
+          while(breaks[index])
+          {
+            index++;
+          }
+          counter++;
+        }
+        else
+        {
+          if(boundary == Dali::Accessibility::TextBoundary::WORD)
+          {
+            index++;
+          }
+          if(boundary == Dali::Accessibility::TextBoundary::LINE)
+          {
+            counter++;
+          }
+        }
+
+        if((counter > 0) && ((counter - 1) == offset))
+        {
+          range.content     = text.substr(start, index - start + 1);
+          range.startOffset = start;
+          range.endOffset   = index + 1;
+        }
+
+        if(boundary == Dali::Accessibility::TextBoundary::LINE)
+        {
+          index++;
+        }
+      }
+      break;
+    }
+
+    case Dali::Accessibility::TextBoundary::SENTENCE:  // Not supported by default
+    case Dali::Accessibility::TextBoundary::PARAGRAPH: // Not supported by libunibreak library
+    default:
+    {
+      break;
+    }
+  }
+
+  return range;
+}
+
+bool TextControlAccessible::RemoveSelection(std::size_t selectionIndex)
+{
+  // Since DALi supports only one selection, indices other than 0 are ignored
+  if(selectionIndex > 0)
+  {
+    return false;
+  }
+
+  GetTextController()->SetSelection(0, 0);
+
+  return true;
+}
+
+bool TextControlAccessible::SetCursorOffset(std::size_t offset)
+{
+  return false;
+}
+
+bool TextControlAccessible::SetRangeOfSelection(std::size_t selectionIndex, std::size_t startOffset, std::size_t endOffset)
+{
+  // Since DALi supports only one selection, indices other than 0 are ignored
+  if(selectionIndex > 0)
+  {
+    return false;
+  }
+
+  // Lack of ValidateRange() is intentional
+
+  GetTextController()->SetSelection(startOffset, endOffset);
+
+  return true;
+}
+
+Accessibility::Hyperlink* TextControlAccessible::GetLink(std::int32_t linkIndex) const
+{
+  if(linkIndex < 0 || linkIndex >= GetLinkCount())
+  {
+    return nullptr;
+  }
+
+  auto anchor = GetTextAnchors()[linkIndex];
+
+  return Accessibility::Hyperlink::DownCast(Accessibility::Accessible::Get(anchor));
+}
+
+std::int32_t TextControlAccessible::GetLinkCount() const
+{
+  return static_cast<std::int32_t>(GetTextAnchors().size());
+}
+
+std::int32_t TextControlAccessible::GetLinkIndex(std::int32_t characterOffset) const
+{
+  return GetTextController()->GetAnchorIndex(static_cast<std::size_t>(characterOffset));
+}
+
+std::string TextControlAccessible::GetWholeText() const
+{
+  std::string text;
+
+  GetTextController()->GetText(text);
+
+  return text;
+}
+
+std::uint32_t TextControlAccessible::GetSubstituteCharacter() const
+{
+  return Toolkit::Text::STAR;
+}
+
+bool TextControlAccessible::IsHiddenInput() const
+{
+  return false;
+}
+
+bool TextControlAccessible::ValidateRange(const std::string& string, std::size_t begin, std::size_t end)
+{
+  auto size = string.size();
+
+  if(end <= begin || begin >= size || end > size)
+  {
+    return false;
+  }
+
+  // TODO: Check whether the range [begin, end) describes a valid substring:
+  // 1. It does not break multi-byte UTF-8 sequences.
+  // 2. It does not break graphemes (compound emojis, glyphs with combining characters etc.).
+
+  return true;
+}
+
+Accessibility::States EditableTextControlAccessible::CalculateStates()
+{
+  using Dali::Accessibility::State;
+
+  auto states       = DevelControl::ControlAccessible::CalculateStates();
+  auto focusControl = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
+
+  states[State::EDITABLE]  = true;
+  states[State::FOCUSABLE] = true;
+  states[State::FOCUSED]   = (Self() == focusControl);
+
+  return states;
+}
+
+std::size_t EditableTextControlAccessible::GetCursorOffset() const
+{
+  return GetTextController()->GetCursorPosition();
+}
+
+bool EditableTextControlAccessible::SetCursorOffset(std::size_t offset)
+{
+  if(offset > GetCharacterCount())
+  {
+    return false;
+  }
+
+  GetTextController()->ResetCursorPosition(offset);
+  RequestTextRelayout();
+
+  return true;
+}
+
+bool EditableTextControlAccessible::CopyText(std::size_t startPosition, std::size_t endPosition)
+{
+  auto text = GetWholeText();
+
+  if(!ValidateRange(text, startPosition, endPosition))
+  {
+    return false;
+  }
+
+  GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition));
+
+  return true;
+}
+
+bool EditableTextControlAccessible::CutText(std::size_t startPosition, std::size_t endPosition)
+{
+  if(!CopyText(startPosition, endPosition))
+  {
+    return false;
+  }
+
+  return DeleteText(startPosition, endPosition);
+}
+
+bool EditableTextControlAccessible::DeleteText(std::size_t startPosition, std::size_t endPosition)
+{
+  auto text = GetWholeText();
+
+  if(!ValidateRange(text, startPosition, endPosition))
+  {
+    return false;
+  }
+
+  return SetTextContents(std::move(text.erase(startPosition, endPosition - startPosition)));
+}
+
+bool EditableTextControlAccessible::InsertText(std::size_t startPosition, std::string newText)
+{
+  auto text = GetWholeText();
+
+  if(!ValidateRange(text, startPosition, startPosition + 1) && !(startPosition == text.size()))
+  {
+    return false;
+  }
+
+  return SetTextContents(std::move(text.insert(startPosition, newText)));
+}
+
+bool EditableTextControlAccessible::SetTextContents(std::string newContents)
+{
+  GetTextController()->SetText(std::move(newContents));
+
+  return true;
+}
+
+} // namespace Dali::Toolkit::Internal
diff --git a/dali-toolkit/internal/controls/text-controls/common-text-utils.h b/dali-toolkit/internal/controls/text-controls/common-text-utils.h
new file mode 100644
index 0000000..a21dc86
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/common-text-utils.h
@@ -0,0 +1,258 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_CONTROLS_COMMON_TEXT_UTILS_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_CONTROLS_COMMON_TEXT_UTILS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/atspi-interfaces/editable-text.h>
+#include <dali/devel-api/atspi-interfaces/hypertext.h>
+#include <dali/devel-api/atspi-interfaces/text.h>
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/common/vector-wrapper.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-accessible.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h>
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
+
+namespace Dali::Toolkit::Internal
+{
+class CommonTextUtils
+{
+public:
+  /**
+   * Common method to render text, setting up background, foreground actors with decorators/stencil.
+   * @param[in] textActor The TextEditor or TextField
+   * @param[in] renderer pointer to the text renderer
+   * @param[in] controller pointer to the text controller
+   * @param[in] decorator pointer to the text decorator
+   * @param[in,out] alignmentOffset Alignment offset
+   * @param[in,out] renderableActor Actor for rendering text
+   * @param[in,out] backgroundActor Actor for rendering background
+   * @param[in,out] stencil Clipping actor
+   * @param[in,out] clippingDecorationActors Clipping decoration actors
+   * @param[in,out] anchorActors Anchor actors
+   * @param[in] updateTextType How the text has been updated
+   */
+  static void RenderText(
+    Actor                            textActor,
+    Text::RendererPtr                renderer,
+    Text::ControllerPtr              controller,
+    Text::DecoratorPtr               decorator,
+    float&                           alignmentOffset,
+    Actor&                           renderableActor,
+    Actor&                           backgroundActor,
+    Actor&                           cursorLayerActor,
+    Toolkit::Control&                stencil,
+    std::vector<Actor>&              clippingDecorationActors,
+    std::vector<Toolkit::TextAnchor>& anchorActors,
+    Text::Controller::UpdateTextType updateTextType);
+
+  /**
+   * Common method to synchronize TextAnchor actors with Anchor objects in text's logical model.
+   * @param[in] parent The actor that is a parent of anchor actors
+   * @param[in] controller pointer to the text controller
+   * @param[in,out] anchorActors Anchor actors
+   */
+  static void SynchronizeTextAnchorsInParent(
+    Actor                             parent,
+    Text::ControllerPtr               controller,
+    std::vector<Toolkit::TextAnchor>& anchorActors);
+};
+
+class TextControlAccessible : public DevelControl::ControlAccessible,
+                              public virtual Dali::Accessibility::Text,
+                              public virtual Dali::Accessibility::Hypertext
+{
+public:
+  using DevelControl::ControlAccessible::ControlAccessible;
+
+  // Text
+
+  /**
+   * @copydoc Dali::Accessibility::Text::GetCharacterCount()
+   */
+  std::size_t GetCharacterCount() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::GetCursorOffset()
+   */
+  std::size_t GetCursorOffset() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::GetRangeExtents()
+   */
+  Rect<> GetRangeExtents(std::size_t startOffset, std::size_t endOffset, Accessibility::CoordinateType type) override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::GetRangeOfSelection()
+   */
+  Accessibility::Range GetRangeOfSelection(std::size_t selectionIndex) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::GetText()
+   */
+  std::string GetText(std::size_t startOffset, std::size_t endOffset) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::GetTextAtOffset()
+   */
+  Accessibility::Range GetTextAtOffset(std::size_t offset, Accessibility::TextBoundary boundary) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::RemoveSelection()
+   */
+  bool RemoveSelection(std::size_t selectionIndex) override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::SetCursorOffset()
+   */
+  bool SetCursorOffset(std::size_t offset) override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::SetRangeOfSelection()
+   */
+  bool SetRangeOfSelection(std::size_t selectionIndex, std::size_t startOffset, std::size_t endOffset) override;
+
+  // Hypertext
+
+  /**
+   * @copydoc Dali::Accessibility::Hypertext::GetLink()
+   */
+  Accessibility::Hyperlink* GetLink(std::int32_t linkIndex) const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Hypertext::GetLinkCount()
+   */
+  std::int32_t GetLinkCount() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Hypertext::GetLinkIndex()
+   */
+  std::int32_t GetLinkIndex(std::int32_t characterOffset) const override;
+
+protected:
+  /**
+   * @brief Gets whole text.
+   *
+   * @return The text
+   */
+  std::string GetWholeText() const;
+
+  /**
+   * @brief Gets text anchors.
+   *
+   * @return Text anchors
+   */
+  virtual const std::vector<Toolkit::TextAnchor>& GetTextAnchors() const = 0;
+
+  /**
+   * @brief Gets text controller.
+   *
+   * @return The text controller
+   */
+  virtual Toolkit::Text::ControllerPtr GetTextController() const = 0;
+
+  /**
+   * @brief Get substitute character for hidden text.
+   *
+   * @return The substitute character (Unicode codepoint)
+   */
+  virtual std::uint32_t GetSubstituteCharacter() const;
+
+  /**
+   * @brief Checks whether text should be hidden (replaced with substitute characters).
+   *
+   * @return True if text should be hidden, false otherwise
+   */
+  virtual bool IsHiddenInput() const;
+
+  /**
+   * @brief Checks whether [startPosition, endPosition) is a valid, non-empty range within a given string.
+   *
+   * @param string Source string
+   * @param begin Start index (inclusive)
+   * @param end End index (exclusive)
+   * @return true if the range is valid, false otherwise
+   */
+  static bool ValidateRange(const std::string& string, std::size_t begin, std::size_t end);
+};
+
+class EditableTextControlAccessible : public TextControlAccessible,
+                                      public virtual Dali::Accessibility::EditableText
+{
+public:
+  using TextControlAccessible::TextControlAccessible;
+
+  /**
+   * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+   */
+  Accessibility::States CalculateStates() override;
+
+  // Text
+
+  /**
+   * @copydoc Dali::Accessibility::Text::GetCursorOffset()
+   */
+  std::size_t GetCursorOffset() const override;
+
+  /**
+   * @copydoc Dali::Accessibility::Text::SetCursorOffset()
+   */
+  bool SetCursorOffset(std::size_t offset) override;
+
+  // EditableText
+
+  /**
+   * @copydoc Dali::Accessibility::EditableText::CopyText()
+   */
+  bool CopyText(size_t startPosition, size_t endPosition) override;
+
+  /**
+   * @copydoc Dali::Accessibility::EditableText::CutText()
+   */
+  bool CutText(size_t startPosition, size_t endPosition) override;
+
+  /**
+   * @copydoc Dali::Accessibility::EditableText::DeleteText()
+   */
+  bool DeleteText(size_t startPosition, size_t endPosition) override;
+
+  /**
+   * @copydoc Dali::Accessibility::EditableText::InsertText()
+   */
+  bool InsertText(size_t startPosition, std::string text) override;
+
+  /**
+   * @copydoc Dali::Accessibility::EditableText::SetTextContents()
+   */
+  bool SetTextContents(std::string newContents) override;
+
+protected:
+  /**
+   * @brief Requests text relayout.
+   */
+  virtual void RequestTextRelayout() = 0;
+};
+
+} // namespace Dali::Toolkit::Internal
+
+#endif //DALI_TOOLKIT_INTERNAL_TEXT_CONTROLS_COMMON_TEXT_UTILS_H
diff --git a/dali-toolkit/internal/controls/text-controls/text-anchor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-anchor-impl.cpp
new file mode 100644
index 0000000..8abb0ae
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-anchor-impl.cpp
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/controls/text-controls/text-anchor-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/object/property-helper-devel.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/object/type-registry-helper.h>
+
+// INTERNAL INCLUDES
+
+// DEVEL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+
+using namespace Dali::Toolkit::Text;
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+// Type registration
+BaseHandle Create()
+{
+  return Toolkit::TextAnchor::New();
+}
+
+// clang-format off
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN(Toolkit::TextAnchor, Toolkit::Control, Create);
+
+DALI_PROPERTY_REGISTRATION(Toolkit, TextAnchor, "startCharacterIndex", INTEGER, START_CHARACTER_INDEX)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextAnchor, "endCharacterIndex",   INTEGER, END_CHARACTER_INDEX  )
+DALI_PROPERTY_REGISTRATION(Toolkit, TextAnchor, "uri",                 STRING,  URI        )
+
+DALI_TYPE_REGISTRATION_END()
+// clang-format on
+
+} // namespace
+
+Toolkit::TextAnchor TextAnchor::New()
+{
+  // Create the implementation, temporarily owned by this handle on stack
+  IntrusivePtr<TextAnchor> impl = new TextAnchor();
+
+  // Pass ownership to CustomActor handle
+  Toolkit::TextAnchor handle(*impl);
+
+  // Second-phase init of the implementation
+  // This can only be done after the CustomActor connection has been made...
+  impl->Initialize();
+
+  return handle;
+}
+
+Property::Value TextAnchor::GetProperty(BaseObject* object, Property::Index index)
+{
+  Property::Value value;
+
+  Toolkit::TextAnchor anchor = Toolkit::TextAnchor::DownCast(Dali::BaseHandle(object));
+
+  if(anchor)
+  {
+    TextAnchor& impl(GetImpl(anchor));
+
+    switch(index)
+    {
+      case Toolkit::TextAnchor::Property::START_CHARACTER_INDEX:
+      {
+        value = impl.mStartCharacterIndex;
+        break;
+      }
+      case Toolkit::TextAnchor::Property::END_CHARACTER_INDEX:
+      {
+        value = impl.mEndCharacterIndex;
+        break;
+      }
+      case Toolkit::TextAnchor::Property::URI:
+      {
+        value = impl.mUri;
+        break;
+      }
+    }
+  }
+
+  return value;
+}
+
+void TextAnchor::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
+{
+  Toolkit::TextAnchor anchor = Toolkit::TextAnchor::DownCast(Dali::BaseHandle(object));
+
+  if(anchor)
+  {
+    TextAnchor& impl(GetImpl(anchor));
+    switch(index)
+    {
+      case Toolkit::TextAnchor::Property::START_CHARACTER_INDEX:
+      {
+        value.Get(impl.mStartCharacterIndex);
+        break;
+      }
+
+      case Toolkit::TextAnchor::Property::END_CHARACTER_INDEX:
+      {
+        value.Get(impl.mEndCharacterIndex);
+        break;
+      }
+
+      case Toolkit::TextAnchor::Property::URI:
+      {
+        value.Get(impl.mUri);
+        break;
+      }
+    }
+  }
+}
+
+void TextAnchor::OnInitialize()
+{
+  Actor self = Self();
+
+  // Accessibility
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::LINK);
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+}
+
+DevelControl::ControlAccessible* TextAnchor::CreateAccessibleObject()
+{
+  return new TextAnchorAccessible(Self());
+}
+
+TextAnchor::TextAnchor()
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+  mStartCharacterIndex(0),
+  mEndCharacterIndex(0),
+  mUri()
+{
+}
+
+TextAnchor::~TextAnchor()
+{
+}
+
+int32_t TextAnchor::TextAnchorAccessible::GetEndIndex() const
+{
+  auto self = Toolkit::TextAnchor::DownCast(Self());
+  return self.GetProperty(Toolkit::TextAnchor::Property::END_CHARACTER_INDEX).Get<int>();
+}
+
+int32_t TextAnchor::TextAnchorAccessible::GetStartIndex() const
+{
+  auto self = Toolkit::TextAnchor::DownCast(Self());
+  return self.GetProperty(Toolkit::TextAnchor::Property::START_CHARACTER_INDEX).Get<int>();
+}
+
+int32_t TextAnchor::TextAnchorAccessible::GetAnchorCount() const
+{
+  return 1;
+}
+
+Dali::Accessibility::Accessible* TextAnchor::TextAnchorAccessible::GetAnchorAccessible(int32_t anchorIndex) const
+{
+  return const_cast<TextAnchorAccessible*>(this);
+}
+
+std::string TextAnchor::TextAnchorAccessible::GetAnchorUri(int32_t anchorIndex) const
+{
+  auto self = Toolkit::TextAnchor::DownCast(Self());
+  return self.GetProperty(Toolkit::TextAnchor::Property::URI).Get<std::string>();
+}
+
+bool TextAnchor::TextAnchorAccessible::IsValid() const
+{
+  return !GetAnchorUri(0).empty();
+}
+
+bool TextAnchor::OnAccessibilityActivated()
+{
+  auto uri = Self().GetProperty(Toolkit::TextAnchor::Property::URI).Get<std::string>();
+  if(!uri.empty())
+  {
+    Dali::Actor                                  current                             = Self();
+    Dali::Toolkit::Text::AnchorControlInterface* parentImplementationAnchorInterface = nullptr;
+    while(!current.GetProperty<bool>(Actor::Property::IS_ROOT) && !parentImplementationAnchorInterface)
+    {
+      Dali::Actor            parentAsActor        = current.GetParent();
+      Dali::CustomActor      parentAsCustomActor  = Dali::CustomActor::DownCast(parentAsActor);
+      Dali::CustomActorImpl& parentImplementation = parentAsCustomActor.GetImplementation();
+      parentImplementationAnchorInterface         = dynamic_cast<Dali::Toolkit::Text::AnchorControlInterface*>(&parentImplementation);
+      current                                     = parentAsActor;
+    }
+    if(parentImplementationAnchorInterface)
+    {
+      parentImplementationAnchorInterface->AnchorClicked(uri);
+      return true;
+    }
+    else
+    {
+      DALI_LOG_ERROR("TextAnchor::OnAccessibilityActivate cannot find ancestor actor implementing Dali::Toolkit::Text::AnchorControlInterface.\n");
+    }
+  }
+  return false;
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/controls/text-controls/text-anchor-impl.h b/dali-toolkit/internal/controls/text-controls/text-anchor-impl.h
new file mode 100644
index 0000000..8b32bdd
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-anchor-impl.h
@@ -0,0 +1,175 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_ANCHOR_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_ANCHOR_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/atspi-interfaces/hyperlink.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/text/text-anchor-control-interface.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+/**
+ * @brief A control which renders anchor (hyperlink) in hypertext.
+ */
+class TextAnchor : public Control
+{
+public:
+  /**
+   * @copydoc Dali::Toollkit::TextAnchor::New()
+   */
+  static Toolkit::TextAnchor New();
+
+  // Properties
+
+  /**
+   * @brief Called when a property of an object of this type is set.
+   *
+   * @param[in] object The object whose property is set.
+   * @param[in] index The property index.
+   * @param[in] value The new property value.
+   */
+  static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value);
+
+  /**
+   * @brief Called to retrieve a property of an object of this type.
+   *
+   * @param[in] object The object whose property is to be retrieved.
+   * @param[in] index The property index.
+   * @return The current value of the property.
+   */
+  static Property::Value GetProperty(BaseObject* object, Property::Index index);
+
+private: // From Control
+  /**
+   * @copydoc Control::OnInitialize()
+   */
+  void OnInitialize() override;
+
+  /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
+   * @copydoc Control::OnPropertySet()
+   */
+  // void OnPropertySet(Property::Index index, const Property::Value& propertyValue) override;
+
+  /**
+   * @copydoc Control::OnAccessibilityActivated()
+   */
+  bool OnAccessibilityActivated() override;
+
+private: // Implementation
+  /**
+   * Construct a new TextAnchor.
+   */
+  TextAnchor();
+
+  /**
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~TextAnchor();
+
+private:
+  // Undefined copy constructor and assignment operators
+  TextAnchor(const TextAnchor&);
+  TextAnchor& operator=(const TextAnchor& rhs);
+
+  //Data
+  int         mStartCharacterIndex;
+  int         mEndCharacterIndex;
+  std::string mUri;
+
+protected:
+  /**
+   * @brief This structure is to connect TextAnchor with Accessible functions.
+   */
+  class TextAnchorAccessible : public DevelControl::ControlAccessible,
+                               public virtual Dali::Accessibility::Hyperlink
+  {
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
+
+    /**
+     * @copydoc Dali::Accessibility::Hyperlink::GetEndIndex()
+     */
+    int32_t GetEndIndex() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Hyperlink::GetStartIndex()
+     */
+    int32_t GetStartIndex() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Hyperlink::GetAnchorCount()
+     */
+    int32_t GetAnchorCount() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Hyperlink::GetAnchorAccessible()
+     */
+    Accessible* GetAnchorAccessible(int32_t anchorIndex) const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Hyperlink::GetAnchorUri()
+     */
+    std::string GetAnchorUri(int32_t anchorIndex) const override;
+
+    /**
+     * @copydoc Dali::Accessibility::Hyperlink::IsValid()
+     */
+    bool IsValid() const override;
+  };
+};
+
+inline Toolkit::Internal::TextAnchor& GetImpl(Toolkit::TextAnchor& textAnchor)
+{
+  DALI_ASSERT_ALWAYS(textAnchor);
+
+  Dali::RefObject& handle = textAnchor.GetImplementation();
+
+  return static_cast<Toolkit::Internal::TextAnchor&>(handle);
+}
+
+inline const Toolkit::Internal::TextAnchor& GetImpl(const Toolkit::TextAnchor& textAnchor)
+{
+  DALI_ASSERT_ALWAYS(textAnchor);
+
+  const Dali::RefObject& handle = textAnchor.GetImplementation();
+
+  return static_cast<const Toolkit::Internal::TextAnchor&>(handle);
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_ANCHOR_H
diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index 0bdc8c1..a3dde6b 100644
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,18 +24,21 @@
 #include <dali/devel-api/object/property-helper-devel.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/key.h>
 #include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <cstring>
 #include <limits>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/controls/text-controls/text-editor-property-handler.h>
+#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/text/rendering/text-backend.h>
 #include <dali-toolkit/internal/text/text-effects-style.h>
@@ -48,6 +51,10 @@
 
 using namespace Dali::Toolkit::Text;
 
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gTextEditorLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS");
+#endif
+
 namespace Dali
 {
 namespace Toolkit
@@ -56,10 +63,6 @@ namespace Internal
 {
 namespace // unnamed namespace
 {
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS");
-#endif
-
 const unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::DevelText::DEFAULT_RENDERING_BACKEND;
 const float        DEFAULT_SCROLL_SPEED      = 1200.f; ///< The default scroll speed for the text editor in pixels/second.
 } // unnamed namespace
@@ -144,6 +147,7 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "verticalScrollP
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "enableEditing",                        BOOLEAN,   ENABLE_EDITING                      )
 DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY(Toolkit, TextEditor, "selectedText",                         STRING,    SELECTED_TEXT                       )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "fontSizeScale",                        FLOAT,     FONT_SIZE_SCALE                     )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "enableFontSizeScale",                  BOOLEAN,   ENABLE_FONT_SIZE_SCALE              )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "primaryCursorPosition",                INTEGER,   PRIMARY_CURSOR_POSITION             )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "grabHandleColor",                      VECTOR4,   GRAB_HANDLE_COLOR                   )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "enableGrabHandlePopup",                BOOLEAN,   ENABLE_GRAB_HANDLE_POPUP            )
@@ -152,6 +156,12 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "inputFilter",
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "ellipsis",                             BOOLEAN,   ELLIPSIS                            )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "ellipsisPosition",                     INTEGER,   ELLIPSIS_POSITION                   )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "minLineSize",                          FLOAT,     MIN_LINE_SIZE                       )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "strikethrough",                        MAP,       STRIKETHROUGH                       )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "inputStrikethrough",                   MAP,       INPUT_STRIKETHROUGH                 )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "characterSpacing",                     FLOAT,     CHARACTER_SPACING                   )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "relativeLineSize",                     FLOAT,     RELATIVE_LINE_SIZE                  )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "verticalAlignment",                    STRING,    VERTICAL_ALIGNMENT                  )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextEditor, "selectionPopupStyle",                  MAP,       SELECTION_POPUP_STYLE               )
 
 DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "textChanged",           SIGNAL_TEXT_CHANGED           )
 DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "inputStyleChanged",     SIGNAL_INPUT_STYLE_CHANGED    )
@@ -161,34 +171,73 @@ DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "inputFiltered",         SIGNAL_IN
 DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "cursorPositionChanged", SIGNAL_CURSOR_POSITION_CHANGED)
 DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "selectionChanged",      SIGNAL_SELECTION_CHANGED      )
 DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "selectionCleared",      SIGNAL_SELECTION_CLEARED      )
+DALI_SIGNAL_REGISTRATION(Toolkit, TextEditor, "selectionStarted",      SIGNAL_SELECTION_STARTED      )
 
 DALI_TYPE_REGISTRATION_END()
 // clang-format on
 
-const char* const IMAGE_MAP_FILENAME_STRING = "filename";
-
-/// Retrieves a filename from a value that is a Property::Map
-std::string GetImageFileNameFromPropertyValue(const Property::Value& value)
+Toolkit::TextEditor::InputStyle::Mask ConvertInputStyle(Text::InputStyle::Mask inputStyleMask)
 {
-  std::string          filename;
-  const Property::Map* map = value.GetMap();
-  if(map)
+  Toolkit::TextEditor::InputStyle::Mask editorInputStyleMask = Toolkit::TextEditor::InputStyle::NONE;
+
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_COLOR))
   {
-    const Property::Value* filenameValue = map->Find(IMAGE_MAP_FILENAME_STRING);
-    if(filenameValue)
-    {
-      filenameValue->Get(filename);
-    }
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::COLOR);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_FAMILY))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_FAMILY);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_POINT_SIZE))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::POINT_SIZE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WIDTH))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_SLANT))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_LINE_SPACING))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::LINE_SPACING);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_UNDERLINE))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::UNDERLINE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_SHADOW))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::SHADOW);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_EMBOSS))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::EMBOSS);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_OUTLINE))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::OUTLINE);
   }
-  return filename;
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_STRIKETHROUGH))
+  {
+    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::STRIKETHROUGH);
+  }
+
+  return editorInputStyleMask;
 }
 
 } // namespace
 
-Toolkit::TextEditor TextEditor::New()
+Toolkit::TextEditor TextEditor::New(ControlBehaviour additionalBehaviour)
 {
   // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr<TextEditor> impl = new TextEditor();
+  IntrusivePtr<TextEditor> impl = new TextEditor(additionalBehaviour);
 
   // Pass ownership to CustomActor handle
   Toolkit::TextEditor handle(*impl);
@@ -204,643 +253,12 @@ void TextEditor::SetProperty(BaseObject* object, Property::Index index, const Pr
 {
   Toolkit::TextEditor textEditor = Toolkit::TextEditor::DownCast(Dali::BaseHandle(object));
 
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor SetProperty\n");
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor SetProperty\n");
 
   if(textEditor)
   {
-    TextEditor& impl(GetImpl(textEditor));
-    DALI_ASSERT_DEBUG(impl.mController && "No text contoller");
-    DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
-
-    switch(index)
-    {
-      case Toolkit::DevelTextEditor::Property::RENDERING_BACKEND:
-      {
-        int backend = value.Get<int>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend);
-
-        if(impl.mRenderingBackend != backend)
-        {
-          impl.mRenderingBackend = backend;
-          impl.mRenderer.Reset();
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::TEXT:
-      {
-        const std::string& text = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p TEXT %s\n", impl.mController.Get(), text.c_str());
-
-        impl.mController->SetText(text);
-        break;
-      }
-      case Toolkit::TextEditor::Property::TEXT_COLOR:
-      {
-        const Vector4& textColor = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
-
-        if(impl.mController->GetDefaultColor() != textColor)
-        {
-          impl.mController->SetDefaultColor(textColor);
-          impl.mController->SetInputColor(textColor);
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::FONT_FAMILY:
-      {
-        const std::string& fontFamily = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
-        impl.mController->SetDefaultFontFamily(fontFamily);
-        break;
-      }
-      case Toolkit::TextEditor::Property::FONT_STYLE:
-      {
-        SetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::POINT_SIZE:
-      {
-        const float pointSize = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p POINT_SIZE %f\n", impl.mController.Get(), pointSize);
-
-        if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE), pointSize))
-        {
-          impl.mController->SetDefaultFontSize(pointSize, Text::Controller::POINT_SIZE);
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::HORIZONTAL_ALIGNMENT:
-      {
-        Text::HorizontalAlignment::Type alignment(static_cast<Text::HorizontalAlignment::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
-        if(Text::GetHorizontalAlignmentEnumeration(value, alignment))
-        {
-          DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment);
-          impl.mController->SetHorizontalAlignment(alignment);
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_THRESHOLD:
-      {
-        const float threshold = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold);
-
-        impl.mDecorator->SetScrollThreshold(threshold);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_SPEED:
-      {
-        const float speed = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p SCROLL_SPEED %f\n", impl.mController.Get(), speed);
-
-        impl.mDecorator->SetScrollSpeed(speed);
-        break;
-      }
-      case Toolkit::TextEditor::Property::PRIMARY_CURSOR_COLOR:
-      {
-        const Vector4& color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetCursorColor(PRIMARY_CURSOR, color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextEditor::Property::SECONDARY_CURSOR_COLOR:
-      {
-        const Vector4& color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetCursorColor(SECONDARY_CURSOR, color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_CURSOR_BLINK:
-      {
-        const bool enable = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable);
-
-        impl.mController->SetEnableCursorBlink(enable);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextEditor::Property::CURSOR_BLINK_INTERVAL:
-      {
-        const float interval = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval);
-
-        impl.mDecorator->SetCursorBlinkInterval(interval);
-        break;
-      }
-      case Toolkit::TextEditor::Property::CURSOR_BLINK_DURATION:
-      {
-        const float duration = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration);
-
-        impl.mDecorator->SetCursorBlinkDuration(duration);
-        break;
-      }
-      case Toolkit::TextEditor::Property::CURSOR_WIDTH:
-      {
-        const int width = value.Get<int>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p CURSOR_WIDTH %d\n", impl.mController.Get(), width);
-
-        impl.mDecorator->SetCursorWidth(width);
-        impl.mController->GetLayoutEngine().SetCursorWidth(width);
-        break;
-      }
-      case Toolkit::TextEditor::Property::GRAB_HANDLE_IMAGE:
-      {
-        const std::string imageFileName = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
-
-        if(imageFileName.size())
-        {
-          impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED, imageFileName);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE:
-      {
-        const std::string imageFileName = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
-
-        if(imageFileName.size())
-        {
-          impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED, imageFileName);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HIGHLIGHT_COLOR:
-      {
-        const Vector4 color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetHighlightColor(color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextEditor::Property::DECORATION_BOUNDING_BOX:
-      {
-        const Rect<int>& box = value.Get<Rect<int> >();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height);
-
-        impl.mDecorator->SetBoundingBox(box);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_MARKUP:
-      {
-        const bool enableMarkup = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup);
-
-        impl.mController->SetMarkupProcessorEnabled(enableMarkup);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_COLOR:
-      {
-        const Vector4& inputColor = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a);
-
-        impl.mController->SetInputColor(inputColor);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_FONT_FAMILY:
-      {
-        const std::string& fontFamily = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
-        impl.mController->SetInputFontFamily(fontFamily);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_FONT_STYLE:
-      {
-        SetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_POINT_SIZE:
-      {
-        const float pointSize = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize);
-        impl.mController->SetInputFontPointSize(pointSize);
-        break;
-      }
-      case Toolkit::TextEditor::Property::LINE_SPACING:
-      {
-        const float lineSpacing = value.Get<float>();
-        impl.mController->SetDefaultLineSpacing(lineSpacing);
-        impl.mRenderer.Reset();
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_LINE_SPACING:
-      {
-        const float lineSpacing = value.Get<float>();
-        impl.mController->SetInputLineSpacing(lineSpacing);
-        impl.mRenderer.Reset();
-        break;
-      }
-      case Toolkit::TextEditor::Property::UNDERLINE:
-      {
-        const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_UNDERLINE:
-      {
-        const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SHADOW:
-      {
-        const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_SHADOW:
-      {
-        const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::EMBOSS:
-      {
-        const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_EMBOSS:
-      {
-        const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::OUTLINE:
-      {
-        const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_OUTLINE:
-      {
-        const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SMOOTH_SCROLL:
-      {
-        const bool enable = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor SMOOTH_SCROLL %d\n", enable);
-
-        impl.mScrollAnimationEnabled = enable;
-        break;
-      }
-      case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION:
-      {
-        const float duration = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor SMOOTH_SCROLL_DURATION %f\n", duration);
-
-        impl.mScrollAnimationDuration = duration;
-        if(impl.mTextVerticalScroller)
-        {
-          impl.mTextVerticalScroller->SetDuration(duration);
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR:
-      {
-        const bool enable = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor SHOW_SCROLL_BAR %d\n", enable);
-
-        impl.mScrollBarEnabled = enable;
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION:
-      {
-        const float duration = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor SCROLL_BAR_SHOW_DURATION %f\n", duration);
-
-        impl.mAnimationPeriod.delaySeconds = duration;
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION:
-      {
-        const float duration = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor SCROLL_BAR_FADE_DURATION %f\n", duration);
-
-        impl.mAnimationPeriod.durationSeconds = duration;
-        break;
-      }
-      case Toolkit::TextEditor::Property::PIXEL_SIZE:
-      {
-        const float pixelSize = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize);
-
-        if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE), pixelSize))
-        {
-          impl.mController->SetDefaultFontSize(pixelSize, Text::Controller::PIXEL_SIZE);
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT:
-      {
-        const std::string& text = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor::OnPropertySet %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str());
-
-        impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR:
-      {
-        const Vector4& textColor = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
-
-        if(impl.mController->GetPlaceholderTextColor() != textColor)
-        {
-          impl.mController->SetPlaceholderTextColor(textColor);
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_SELECTION:
-      {
-        const bool enableSelection = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection);
-        impl.mController->SetSelectionEnabled(enableSelection);
-        break;
-      }
-      case Toolkit::TextEditor::Property::PLACEHOLDER:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          impl.mController->SetPlaceholderProperty(*map);
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::LINE_WRAP_MODE:
-      {
-        Text::LineWrap::Mode lineWrapMode(static_cast<Text::LineWrap::Mode>(-1)); // Set to invalid value to ensure a valid mode does get set
-        if(GetLineWrapModeEnumeration(value, lineWrapMode))
-        {
-          DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p LineWrap::MODE %d\n", impl.mController.Get(), lineWrapMode);
-          impl.mController->SetLineWrapMode(lineWrapMode);
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_SHIFT_SELECTION:
-      {
-        const bool shiftSelection = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection);
-
-        impl.mController->SetShiftSelectionEnabled(shiftSelection);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE:
-      {
-        const bool grabHandleEnabled = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled);
-
-        impl.mController->SetGrabHandleEnabled(grabHandleEnabled);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
-      {
-        impl.mController->SetMatchLayoutDirection(value.Get<bool>() ? DevelText::MatchLayoutDirection::LOCALE : DevelText::MatchLayoutDirection::CONTENTS);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::MAX_LENGTH:
-      {
-        const int max = value.Get<int>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p MAX_LENGTH %d\n", impl.mController.Get(), max);
-
-        impl.mController->SetMaximumNumberOfCharacters(max);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_START:
-      {
-        uint32_t start = static_cast<uint32_t>(value.Get<int>());
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start);
-        impl.SetTextSelectionRange(&start, nullptr);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_END:
-      {
-        uint32_t end = static_cast<uint32_t>(value.Get<int>());
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end);
-        impl.SetTextSelectionRange(nullptr, &end);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_EDITING:
-      {
-        const bool editable = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_EDITING %d\n", impl.mController.Get(), editable);
-        impl.SetEditable(editable);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION:
-      {
-        float horizontalScroll = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p HORIZONTAL_SCROLL_POSITION %d\n", impl.mController.Get(), horizontalScroll);
-        if(horizontalScroll >= 0.0f)
-        {
-          impl.ScrollBy(Vector2(horizontalScroll - impl.GetHorizontalScrollPosition(), 0));
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::VERTICAL_SCROLL_POSITION:
-      {
-        float verticalScroll = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p VERTICAL_SCROLL_POSITION %d\n", impl.mController.Get(), verticalScroll);
-        if(verticalScroll >= 0.0f)
-        {
-          impl.ScrollBy(Vector2(0, verticalScroll - impl.GetVerticalScrollPosition()));
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE:
-      {
-        const float scale = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p FONT_SIZE_SCALE %f\n", impl.mController.Get(), scale);
-
-        if(!Equals(impl.mController->GetFontSizeScale(), scale))
-        {
-          impl.mController->SetFontSizeScale(scale);
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::PRIMARY_CURSOR_POSITION:
-      {
-        uint32_t position = static_cast<uint32_t>(value.Get<int>());
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p PRIMARY_CURSOR_POSITION %d\n", impl.mController.Get(), position);
-        if(impl.mController->SetPrimaryCursorPosition(position, impl.HasKeyInputFocus()))
-        {
-          impl.SetKeyInputFocus();
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::GRAB_HANDLE_COLOR:
-      {
-        const Vector4 color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p GRAB_HANDLE_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetHandleColor(color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP:
-      {
-        const bool grabHandlePopupEnabled = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE_POPUP %d\n", impl.mController.Get(), grabHandlePopupEnabled);
-
-        impl.mController->SetGrabHandlePopupEnabled(grabHandlePopupEnabled);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::INPUT_METHOD_SETTINGS:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          impl.mInputMethodOptions.ApplyProperty(*map);
-        }
-        impl.mController->SetInputModePassword(impl.mInputMethodOptions.IsPassword());
-
-        Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
-        if(control == textEditor)
-        {
-          impl.mInputMethodContext.ApplyOptions(impl.mInputMethodOptions);
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::INPUT_FILTER:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          impl.mController->SetInputFilterOption(*map);
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ELLIPSIS:
-      {
-        const bool ellipsis = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p ELLIPSIS %d\n", impl.mController.Get(), ellipsis);
-
-        impl.mController->SetTextElideEnabled(ellipsis);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ELLIPSIS_POSITION:
-      {
-        DevelText::EllipsisPosition::Type ellipsisPositionType(static_cast<DevelText::EllipsisPosition::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
-        if(GetEllipsisPositionTypeEnumeration(value, ellipsisPositionType))
-        {
-          DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p EllipsisPosition::Type %d\n", impl.mController.Get(), ellipsisPositionType);
-          impl.mController->SetEllipsisPosition(ellipsisPositionType);
-        }
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::MIN_LINE_SIZE:
-      {
-        const float minLineSize = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor %p MIN_LINE_SIZE %f\n", impl.mController.Get(), minLineSize);
-
-        impl.mController->SetDefaultLineSize(minLineSize);
-        impl.mRenderer.Reset();
-        break;
-      }
-    } // switch
-  }   // texteditor
+    PropertyHandler::SetProperty(textEditor, index, value);
+  }
 }
 
 Property::Value TextEditor::GetProperty(BaseObject* object, Property::Index index)
@@ -851,390 +269,8 @@ Property::Value TextEditor::GetProperty(BaseObject* object, Property::Index inde
 
   if(textEditor)
   {
-    TextEditor& impl(GetImpl(textEditor));
-    DALI_ASSERT_DEBUG(impl.mController && "No text contoller");
-    DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
-
-    switch(index)
-    {
-      case Toolkit::DevelTextEditor::Property::RENDERING_BACKEND:
-      {
-        value = impl.mRenderingBackend;
-        break;
-      }
-      case Toolkit::TextEditor::Property::TEXT:
-      {
-        std::string text;
-        impl.mController->GetText(text);
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextEditor %p returning text: %s\n", impl.mController.Get(), text.c_str());
-        value = text;
-        break;
-      }
-      case Toolkit::TextEditor::Property::TEXT_COLOR:
-      {
-        value = impl.mController->GetDefaultColor();
-        break;
-      }
-      case Toolkit::TextEditor::Property::FONT_FAMILY:
-      {
-        value = impl.mController->GetDefaultFontFamily();
-        break;
-      }
-      case Toolkit::TextEditor::Property::FONT_STYLE:
-      {
-        GetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::POINT_SIZE:
-      {
-        value = impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE);
-        break;
-      }
-      case Toolkit::TextEditor::Property::HORIZONTAL_ALIGNMENT:
-      {
-        const char* name = GetHorizontalAlignmentString(impl.mController->GetHorizontalAlignment());
-        if(name)
-        {
-          value = std::string(name);
-        }
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_THRESHOLD:
-      {
-        value = impl.mDecorator->GetScrollThreshold();
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_SPEED:
-      {
-        value = impl.mDecorator->GetScrollSpeed();
-        break;
-      }
-      case Toolkit::TextEditor::Property::PRIMARY_CURSOR_COLOR:
-      {
-        value = impl.mDecorator->GetColor(PRIMARY_CURSOR);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SECONDARY_CURSOR_COLOR:
-      {
-        value = impl.mDecorator->GetColor(SECONDARY_CURSOR);
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_CURSOR_BLINK:
-      {
-        value = impl.mController->GetEnableCursorBlink();
-        break;
-      }
-      case Toolkit::TextEditor::Property::CURSOR_BLINK_INTERVAL:
-      {
-        value = impl.mDecorator->GetCursorBlinkInterval();
-        break;
-      }
-      case Toolkit::TextEditor::Property::CURSOR_BLINK_DURATION:
-      {
-        value = impl.mDecorator->GetCursorBlinkDuration();
-        break;
-      }
-      case Toolkit::TextEditor::Property::CURSOR_WIDTH:
-      {
-        value = impl.mDecorator->GetCursorWidth();
-        break;
-      }
-      case Toolkit::TextEditor::Property::GRAB_HANDLE_IMAGE:
-      {
-        value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE:
-      {
-        value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT:
-      {
-        impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT:
-      {
-        impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
-      {
-        impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
-      {
-        impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
-      {
-        impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
-      {
-        impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SELECTION_HIGHLIGHT_COLOR:
-      {
-        value = impl.mDecorator->GetHighlightColor();
-        break;
-      }
-      case Toolkit::TextEditor::Property::DECORATION_BOUNDING_BOX:
-      {
-        Rect<int> boundingBox;
-        impl.mDecorator->GetBoundingBox(boundingBox);
-        value = boundingBox;
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_MARKUP:
-      {
-        value = impl.mController->IsMarkupProcessorEnabled();
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_COLOR:
-      {
-        value = impl.mController->GetInputColor();
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_FONT_FAMILY:
-      {
-        value = impl.mController->GetInputFontFamily();
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_FONT_STYLE:
-      {
-        GetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_POINT_SIZE:
-      {
-        value = impl.mController->GetInputFontPointSize();
-        break;
-      }
-      case Toolkit::TextEditor::Property::LINE_SPACING:
-      {
-        value = impl.mController->GetDefaultLineSpacing();
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_LINE_SPACING:
-      {
-        value = impl.mController->GetInputLineSpacing();
-        break;
-      }
-      case Toolkit::TextEditor::Property::UNDERLINE:
-      {
-        GetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_UNDERLINE:
-      {
-        GetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SHADOW:
-      {
-        GetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_SHADOW:
-      {
-        GetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::EMBOSS:
-      {
-        GetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_EMBOSS:
-      {
-        GetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::OUTLINE:
-      {
-        GetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::INPUT_OUTLINE:
-      {
-        GetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextEditor::Property::SMOOTH_SCROLL:
-      {
-        value = impl.mScrollAnimationEnabled;
-        break;
-      }
-      case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION:
-      {
-        value = impl.mScrollAnimationDuration;
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR:
-      {
-        value = impl.mScrollBarEnabled;
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION:
-      {
-        value = impl.mAnimationPeriod.delaySeconds;
-        break;
-      }
-      case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION:
-      {
-        value = impl.mAnimationPeriod.durationSeconds;
-        break;
-      }
-      case Toolkit::TextEditor::Property::PIXEL_SIZE:
-      {
-        value = impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE);
-        break;
-      }
-      case Toolkit::TextEditor::Property::LINE_COUNT:
-      {
-        float width = textEditor.GetProperty(Actor::Property::SIZE_WIDTH).Get<float>();
-        value       = impl.mController->GetLineCount(width);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT:
-      {
-        std::string text;
-        impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text);
-        value = text;
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR:
-      {
-        value = impl.mController->GetPlaceholderTextColor();
-        break;
-      }
-      case Toolkit::TextEditor::Property::ENABLE_SELECTION:
-      {
-        value = impl.mController->IsSelectionEnabled();
-        break;
-      }
-      case Toolkit::TextEditor::Property::PLACEHOLDER:
-      {
-        Property::Map map;
-        impl.mController->GetPlaceholderProperty(map);
-        value = map;
-        break;
-      }
-      case Toolkit::TextEditor::Property::LINE_WRAP_MODE:
-      {
-        value = impl.mController->GetLineWrapMode();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_SHIFT_SELECTION:
-      {
-        value = impl.mController->IsShiftSelectionEnabled();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE:
-      {
-        value = impl.mController->IsGrabHandleEnabled();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
-      {
-        value = impl.mController->GetMatchLayoutDirection() != DevelText::MatchLayoutDirection::CONTENTS;
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::MAX_LENGTH:
-      {
-        value = impl.mController->GetMaximumNumberOfCharacters();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::SELECTED_TEXT:
-      {
-        value = impl.mController->GetSelectedText();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_START:
-      {
-        Uint32Pair range = impl.GetTextSelectionRange();
-        value            = static_cast<int>(range.first);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_END:
-      {
-        Uint32Pair range = impl.GetTextSelectionRange();
-        value            = static_cast<int>(range.second);
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_EDITING:
-      {
-        value = impl.IsEditable();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION:
-      {
-        value = impl.GetHorizontalScrollPosition();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::VERTICAL_SCROLL_POSITION:
-      {
-        value = impl.GetVerticalScrollPosition();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE:
-      {
-        value = impl.mController->GetFontSizeScale();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::PRIMARY_CURSOR_POSITION:
-      {
-        value = static_cast<int>(impl.mController->GetPrimaryCursorPosition());
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::GRAB_HANDLE_COLOR:
-      {
-        value = impl.mDecorator->GetHandleColor();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP:
-      {
-        value = impl.mController->IsGrabHandlePopupEnabled();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::INPUT_METHOD_SETTINGS:
-      {
-        Property::Map map;
-        impl.mInputMethodOptions.RetrieveProperty(map);
-        value = map;
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::INPUT_FILTER:
-      {
-        Property::Map map;
-        impl.mController->GetInputFilterOption(map);
-        value = map;
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ELLIPSIS:
-      {
-        value = impl.mController->IsTextElideEnabled();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::ELLIPSIS_POSITION:
-      {
-        value = impl.mController->GetEllipsisPosition();
-        break;
-      }
-      case Toolkit::DevelTextEditor::Property::MIN_LINE_SIZE:
-      {
-        value = impl.mController->GetDefaultLineSize();
-        break;
-      }
-    } //switch
+    value = PropertyHandler::GetProperty(textEditor, index);
   }
-
   return value;
 }
 
@@ -1319,6 +355,41 @@ float TextEditor::GetVerticalScrollPosition()
   return 0;
 }
 
+Vector<Vector2> TextEditor::GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const
+{
+  return mController->GetTextSize(startIndex, endIndex);
+}
+
+Vector<Vector2> TextEditor::GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const
+{
+  return mController->GetTextPosition(startIndex, endIndex);
+}
+
+Rect<float> TextEditor::GetLineBoundingRectangle(const uint32_t lineIndex) const
+{
+  return mController->GetLineBoundingRectangle(lineIndex);
+}
+
+Rect<float> TextEditor::GetCharacterBoundingRectangle(const uint32_t charIndex) const
+{
+  return mController->GetCharacterBoundingRectangle(charIndex);
+}
+
+int TextEditor::GetCharacterIndexAtPosition(float visualX, float visualY) const
+{
+  return mController->GetCharacterIndexAtPosition(visualX, visualY);
+}
+
+Rect<> TextEditor::GetTextBoundingRectangle(uint32_t startIndex, uint32_t endIndex) const
+{
+  return mController->GetTextBoundingRectangle(startIndex, endIndex);
+}
+
+void TextEditor::SetSpannedText(const Text::Spanned& spannedText)
+{
+  mController->SetSpannedText(spannedText);
+}
+
 string TextEditor::GetSelectedText() const
 {
   string selectedText = "";
@@ -1364,6 +435,11 @@ DevelTextEditor::SelectionClearedSignalType& TextEditor::SelectionClearedSignal(
   return mSelectionClearedSignal;
 }
 
+DevelTextEditor::SelectionStartedSignalType& TextEditor::SelectionStartedSignal()
+{
+  return mSelectionStartedSignal;
+}
+
 Text::ControllerPtr TextEditor::GetTextController()
 {
   return mController;
@@ -1432,6 +508,14 @@ bool TextEditor::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface*
       editorImpl.SelectionClearedSignal().Connect(tracker, functor);
     }
   }
+  else if(0 == strcmp(signalName.c_str(), SIGNAL_SELECTION_STARTED))
+  {
+    if(editor)
+    {
+      Internal::TextEditor& editorImpl(GetImpl(editor));
+      editorImpl.SelectionStartedSignal().Connect(tracker, functor);
+    }
+  }
   else
   {
     // signalName does not match any signal
@@ -1456,6 +540,11 @@ Toolkit::TextEditor::ScrollStateChangedSignalType& TextEditor::ScrollStateChange
   return mScrollStateChangedSignal;
 }
 
+void TextEditor::OnAccessibilityStatusChanged()
+{
+  CommonTextUtils::SynchronizeTextAnchorsInParent(Self(), mController, mAnchorActors);
+}
+
 void TextEditor::OnInitialize()
 {
   Actor self = Self();
@@ -1522,15 +611,13 @@ void TextEditor::OnInitialize()
   self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT);
   self.OnSceneSignal().Connect(this, &TextEditor::OnSceneConnect);
 
-  //Enable highightability
-  self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
-
   DevelControl::SetInputMethodContext(*this, mInputMethodContext);
 
   // Creates an extra control to be used as stencil buffer.
   mStencil = Control::New();
   mStencil.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   mStencil.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  mStencil.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN, true);
 
   // Creates a background visual. Even if the color is transparent it updates the stencil.
   mStencil.SetProperty(Toolkit::Control::Property::BACKGROUND,
@@ -1542,21 +629,28 @@ void TextEditor::OnInitialize()
 
   self.Add(mStencil);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::ENTRY));
-  });
+  // Accessibility
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::ENTRY);
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+
+  Accessibility::Bridge::EnabledSignal().Connect(this, &TextEditor::OnAccessibilityStatusChanged);
+  Accessibility::Bridge::DisabledSignal().Connect(this, &TextEditor::OnAccessibilityStatusChanged);
+}
+
+DevelControl::ControlAccessible* TextEditor::CreateAccessibleObject()
+{
+  return new TextEditorAccessible(Self());
 }
 
 void TextEditor::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnStyleChange\n");
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnStyleChange\n");
 
   switch(change)
   {
     case StyleChange::DEFAULT_FONT_CHANGE:
     {
-      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnStyleChange DEFAULT_FONT_CHANGE\n");
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnStyleChange DEFAULT_FONT_CHANGE\n");
       const std::string& newFont = GetImpl(styleManager).GetDefaultFontFamily();
       // Property system did not set the font so should update it.
       mController->UpdateAfterFontChange(newFont);
@@ -1608,9 +702,34 @@ void TextEditor::ResizeActor(Actor& actor, const Vector2& size)
   }
 }
 
+void TextEditor::OnPropertySet(Property::Index index, const Property::Value& propertyValue)
+{
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnPropertySet index[%d]\n", index);
+
+  switch(index)
+  {
+    case DevelActor::Property::USER_INTERACTION_ENABLED:
+    {
+      const bool enabled = propertyValue.Get<bool>();
+      mController->SetUserInteractionEnabled(enabled);
+      if(mStencil)
+      {
+        float opacity = enabled ? 1.0f : mController->GetDisabledColorOpacity();
+        mStencil.SetProperty(Actor::Property::OPACITY, opacity);
+      }
+      break;
+    }
+    default:
+    {
+      Control::OnPropertySet(index, propertyValue); // up call to control for non-handled properties
+      break;
+    }
+  }
+}
+
 void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor OnRelayout\n");
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor OnRelayout\n");
 
   Actor self = Self();
 
@@ -1637,6 +756,13 @@ void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container)
     mActiveLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top));
     ResizeActor(mActiveLayer, contentSize);
   }
+  if(mCursorLayer)
+  {
+    // The cursor layer is added to the stencil in RenderText.
+    // Do not calculate the position because the stencil has already been resized excluding the padding size.
+    // There is no case where the text editor does not have a stencil.
+    ResizeActor(mCursorLayer, contentSize);
+  }
 
   // If there is text changed, callback is called.
   if(mTextChanged)
@@ -1649,12 +775,12 @@ void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container)
   if((Text::Controller::NONE_UPDATED != updateTextType) ||
      !mRenderer)
   {
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnRelayout %p Displaying new contents\n", mController.Get());
+    DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnRelayout %p Displaying new contents\n", mController.Get());
 
     if(mDecorator &&
        (Text::Controller::NONE_UPDATED != (Text::Controller::DECORATOR_UPDATED & updateTextType)))
     {
-      mDecorator->Relayout(contentSize);
+      mDecorator->Relayout(contentSize, container);
     }
 
     if(!mRenderer)
@@ -1670,6 +796,11 @@ void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container)
     EmitCursorPositionChangedSignal();
   }
 
+  if(mSelectionStarted)
+  {
+    EmitSelectionStartedSignal();
+  }
+
   if(mSelectionChanged)
   {
     EmitSelectionChangedSignal();
@@ -1686,116 +817,15 @@ void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container)
   // The text-editor adds an idle callback to the adaptor to emit the signals after the size negotiation.
   if(!mController->IsInputStyleChangedSignalsQueueEmpty())
   {
-    if(Adaptor::IsAvailable())
-    {
-      Adaptor& adaptor = Adaptor::Get();
-
-      if(NULL == mIdleCallback)
-      {
-        // @note: The callback manager takes the ownership of the callback object.
-        mIdleCallback = MakeCallback(this, &TextEditor::OnIdleSignal);
-        adaptor.AddIdle(mIdleCallback, false);
-      }
-    }
+    mController->RequestProcessInputStyleChangedSignals();
   }
 }
 
 void TextEditor::RenderText(Text::Controller::UpdateTextType updateTextType)
 {
-  Actor renderableActor;
-
-  if(Text::Controller::NONE_UPDATED != (Text::Controller::MODEL_UPDATED & updateTextType))
-  {
-    if(mRenderer)
-    {
-      Dali::Toolkit::TextEditor handle = Dali::Toolkit::TextEditor(GetOwner());
-
-      renderableActor = mRenderer->Render(mController->GetView(),
-                                          handle,
-                                          Property::INVALID_INDEX, // Animatable property not supported
-                                          mAlignmentOffset,
-                                          DepthIndex::CONTENT);
-    }
-
-    if(renderableActor != mRenderableActor)
-    {
-      UnparentAndReset(mBackgroundActor);
-      UnparentAndReset(mRenderableActor);
-      mRenderableActor = renderableActor;
-
-      if(mRenderableActor)
-      {
-        mBackgroundActor = mController->CreateBackgroundActor();
-      }
-    }
-  }
-
+  CommonTextUtils::RenderText(Self(), mRenderer, mController, mDecorator, mAlignmentOffset, mRenderableActor, mBackgroundActor, mCursorLayer, mStencil, mClippingDecorationActors, mAnchorActors, updateTextType);
   if(mRenderableActor)
   {
-    const Vector2& scrollOffset = mController->GetTextModel()->GetScrollPosition();
-
-    float renderableActorPositionX, renderableActorPositionY;
-
-    if(mStencil)
-    {
-      renderableActorPositionX = scrollOffset.x + mAlignmentOffset;
-      renderableActorPositionY = scrollOffset.y;
-    }
-    else
-    {
-      Extents padding;
-      padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
-
-      // Support Right-To-Left of padding
-      Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
-      if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
-      {
-        std::swap(padding.start, padding.end);
-      }
-
-      renderableActorPositionX = scrollOffset.x + mAlignmentOffset + padding.start;
-      renderableActorPositionY = scrollOffset.y + padding.top;
-    }
-
-    mRenderableActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY));
-    // Make sure the actors are parented correctly with/without clipping
-    Actor self = mStencil ? mStencil : Self();
-
-    Actor highlightActor;
-
-    for(std::vector<Actor>::iterator it    = mClippingDecorationActors.begin(),
-                                     endIt = mClippingDecorationActors.end();
-        it != endIt;
-        ++it)
-    {
-      self.Add(*it);
-      it->LowerToBottom();
-
-      if(it->GetProperty<std::string>(Dali::Actor::Property::NAME) == "HighlightActor")
-      {
-        highlightActor = *it;
-      }
-    }
-    mClippingDecorationActors.clear();
-
-    self.Add(mRenderableActor);
-
-    if(mBackgroundActor)
-    {
-      if(mDecorator && mDecorator->IsHighlightVisible())
-      {
-        self.Add(mBackgroundActor);
-        mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY)); // In text field's coords.
-        mBackgroundActor.LowerBelow(highlightActor);
-      }
-      else
-      {
-        mRenderableActor.Add(mBackgroundActor);
-        mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); // In renderable actor's coords.
-        mBackgroundActor.LowerToBottom();
-      }
-    }
-
     ApplyScrollPosition();
   }
   UpdateScrollBar();
@@ -1803,7 +833,7 @@ void TextEditor::RenderText(Text::Controller::UpdateTextType updateTextType)
 
 void TextEditor::OnKeyInputFocusGained()
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnKeyInputFocusGained %p\n", mController.Get());
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnKeyInputFocusGained %p\n", mController.Get());
   if(mInputMethodContext && IsEditable())
   {
     // All input panel properties, such as layout, return key type, and input hint, should be set before input panel activates (or shows).
@@ -1820,21 +850,18 @@ void TextEditor::OnKeyInputFocusGained()
     // When window gain lost focus, the InputMethodContext is deactivated. Thus when window gain focus again, the InputMethodContext must be activated.
     mInputMethodContext.SetRestoreAfterFocusLost(true);
   }
-  ClipboardEventNotifier notifier(ClipboardEventNotifier::Get());
 
-  if(notifier)
+  if(IsEditable() && mController->IsUserInteractionEnabled())
   {
-    notifier.ContentSelectedSignal().Connect(this, &TextEditor::OnClipboardTextSelected);
+    mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event
   }
 
-  mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event
-
   EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last.
 }
 
 void TextEditor::OnKeyInputFocusLost()
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor:OnKeyInputFocusLost %p\n", mController.Get());
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor:OnKeyInputFocusLost %p\n", mController.Get());
   if(mInputMethodContext)
   {
     mInputMethodContext.StatusChangedSignal().Disconnect(this, &TextEditor::KeyboardStatusChanged);
@@ -1847,12 +874,6 @@ void TextEditor::OnKeyInputFocusLost()
 
     mInputMethodContext.EventReceivedSignal().Disconnect(this, &TextEditor::OnInputMethodContextEvent);
   }
-  ClipboardEventNotifier notifier(ClipboardEventNotifier::Get());
-
-  if(notifier)
-  {
-    notifier.ContentSelectedSignal().Disconnect(this, &TextEditor::OnClipboardTextSelected);
-  }
 
   mController->KeyboardFocusLostEvent();
 
@@ -1867,7 +888,7 @@ bool TextEditor::OnAccessibilityActivated()
 
 void TextEditor::OnTap(const TapGesture& gesture)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnTap %p\n", mController.Get());
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnTap %p\n", mController.Get());
   if(mInputMethodContext && IsEditable())
   {
     mInputMethodContext.Activate();
@@ -1879,12 +900,21 @@ void TextEditor::OnTap(const TapGesture& gesture)
   mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top);
   mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top);
 
+  Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+  if(keyboardFocusManager)
+  {
+    keyboardFocusManager.SetCurrentFocusActor(Self());
+  }
   SetKeyInputFocus();
 }
 
 void TextEditor::OnPan(const PanGesture& gesture)
 {
   mController->PanEvent(gesture.GetState(), gesture.GetDisplacement());
+  if(gesture.GetState() == GestureState::STARTED && !mController->IsScrollable(gesture.GetDisplacement()))
+  {
+    Dali::DevelActor::SetNeedGesturePropagation(Self(), true);
+  }
 }
 
 void TextEditor::OnLongPress(const LongPressGesture& gesture)
@@ -1903,13 +933,18 @@ void TextEditor::OnLongPress(const LongPressGesture& gesture)
 
 bool TextEditor::OnKeyEvent(const KeyEvent& event)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode());
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode());
 
   if(Dali::DALI_KEY_ESCAPE == event.GetKeyCode() && mController->ShouldClearFocusOnEscape())
   {
     // Make sure ClearKeyInputFocus when only key is up
     if(event.GetState() == KeyEvent::UP)
     {
+      Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+      if(keyboardFocusManager)
+      {
+        keyboardFocusManager.ClearFocus();
+      }
       ClearKeyInputFocus();
     }
 
@@ -1926,25 +961,28 @@ void TextEditor::RequestTextRelayout()
 
 void TextEditor::TextInserted(unsigned int position, unsigned int length, const std::string& content)
 {
-  if(Accessibility::IsUp())
+  auto accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
   {
-    Control::Impl::GetAccessibilityObject(Self())->EmitTextInserted(position, length, content);
+    accessible->EmitTextInserted(position, length, content);
   }
 }
 
 void TextEditor::TextDeleted(unsigned int position, unsigned int length, const std::string& content)
 {
-  if(Accessibility::IsUp())
+  auto accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
   {
-    Control::Impl::GetAccessibilityObject(Self())->EmitTextDeleted(position, length, content);
+    accessible->EmitTextDeleted(position, length, content);
   }
 }
 
 void TextEditor::CursorPositionChanged(unsigned int oldPosition, unsigned int newPosition)
 {
-  if(Accessibility::IsUp())
+  auto accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
   {
-    Control::Impl::GetAccessibilityObject(Self())->EmitTextCursorMoved(newPosition);
+    accessible->EmitTextCursorMoved(newPosition);
   }
 
   if((oldPosition != newPosition) && !mCursorPositionChanged)
@@ -1982,55 +1020,7 @@ void TextEditor::MaxLengthReached()
 void TextEditor::InputStyleChanged(Text::InputStyle::Mask inputStyleMask)
 {
   Dali::Toolkit::TextEditor handle(GetOwner());
-
-  Toolkit::TextEditor::InputStyle::Mask editorInputStyleMask = Toolkit::TextEditor::InputStyle::NONE;
-
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_COLOR))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::COLOR);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_FAMILY))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_FAMILY);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_POINT_SIZE))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::POINT_SIZE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WIDTH))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_SLANT))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_LINE_SPACING))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::LINE_SPACING);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_UNDERLINE))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::UNDERLINE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_SHADOW))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::SHADOW);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_EMBOSS))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::EMBOSS);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_OUTLINE))
-  {
-    editorInputStyleMask = static_cast<Toolkit::TextEditor::InputStyle::Mask>(editorInputStyleMask | Toolkit::TextEditor::InputStyle::OUTLINE);
-  }
-
-  mInputStyleChangedSignal.Emit(handle, editorInputStyleMask);
+  mInputStyleChangedSignal.Emit(handle, ConvertInputStyle(inputStyleMask));
 }
 
 void TextEditor::AnchorClicked(const std::string& href)
@@ -2066,6 +1056,13 @@ void TextEditor::EmitSelectionClearedSignal()
   mSelectionCleared = false;
 }
 
+void TextEditor::EmitSelectionStartedSignal()
+{
+  Dali::Toolkit::TextEditor handle(GetOwner());
+  mSelectionStartedSignal.Emit(handle);
+  mSelectionStarted = false;
+}
+
 void TextEditor::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t newStart, uint32_t newEnd)
 {
   if(((oldStart != newStart) || (oldEnd != newEnd)) && !mSelectionChanged)
@@ -2074,6 +1071,13 @@ void TextEditor::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t n
     {
       mSelectionCleared = true;
     }
+    else
+    {
+      if(oldStart == oldEnd)
+      {
+        mSelectionStarted = true;
+      }
+    }
 
     mSelectionChanged  = true;
     mOldSelectionStart = oldStart;
@@ -2089,7 +1093,7 @@ void TextEditor::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t n
   }
 }
 
-void TextEditor::AddDecoration(Actor& actor, bool needsClipping)
+void TextEditor::AddDecoration(Actor& actor, DecorationType type, bool needsClipping)
 {
   if(actor)
   {
@@ -2097,16 +1101,27 @@ void TextEditor::AddDecoration(Actor& actor, bool needsClipping)
     {
       mClippingDecorationActors.push_back(actor);
     }
-    else
+
+    // If the actor is a layer type, add it.
+    if(type == DecorationType::ACTIVE_LAYER)
+    {
+      AddLayer(mActiveLayer, actor);
+    }
+    else if(type == DecorationType::CURSOR_LAYER)
     {
-      actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-      actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-      Self().Add(actor);
-      mActiveLayer = actor;
+      AddLayer(mCursorLayer, actor);
     }
   }
 }
 
+void TextEditor::AddLayer(Actor& layer, Actor& actor)
+{
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  Self().Add(actor);
+  layer = actor;
+}
+
 void TextEditor::SetTextSelectionRange(const uint32_t* start, const uint32_t* end)
 {
   if(mController && mController->IsShowingRealText())
@@ -2226,7 +1241,7 @@ void TextEditor::UpdateScrollBar()
 void TextEditor::OnScrollIndicatorAnimationFinished(Animation& animation)
 {
   // If animation is successfully ended, then emit ScrollStateChangedSignal
-  if(animation.GetCurrentProgress() == 0.0f)
+  if(Dali::EqualsZero(animation.GetCurrentProgress()))
   {
     mScrollStarted = false;
     Dali::Toolkit::TextEditor handle(GetOwner());
@@ -2248,7 +1263,7 @@ void TextEditor::OnSceneConnect(Dali::Actor actor)
 
 InputMethodContext::CallbackData TextEditor::OnInputMethodContextEvent(Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName);
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName);
   return mController->OnInputMethodContextEvent(inputMethodContext, inputMethodContextEvent);
 }
 
@@ -2257,19 +1272,15 @@ void TextEditor::GetHandleImagePropertyValue(Property::Value& value, Text::Handl
   if(mDecorator)
   {
     Property::Map map;
-    map[IMAGE_MAP_FILENAME_STRING] = mDecorator->GetHandleImage(handleType, handleImageType);
-    value                          = map;
-  }
-}
+    map[TextEditor::PropertyHandler::IMAGE_MAP_FILENAME_STRING] = mDecorator->GetHandleImage(handleType, handleImageType);
 
-void TextEditor::OnClipboardTextSelected(ClipboardEventNotifier& clipboard)
-{
-  mController->PasteClipboardItemEvent();
+    value = map;
+  }
 }
 
 void TextEditor::KeyboardStatusChanged(bool keyboardShown)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextEditor::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown);
+  DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown);
 
   // Just hide the grab handle when keyboard is hidden.
   if(!keyboardShown)
@@ -2298,15 +1309,6 @@ bool TextEditor::OnTouched(Actor actor, const TouchEvent& touch)
   return false;
 }
 
-void TextEditor::OnIdleSignal()
-{
-  // Emits the change of input style signals.
-  mController->ProcessInputStyleChangedSignals();
-
-  // Set the pointer to null as the callback manager deletes the callback after execute it.
-  mIdleCallback = NULL;
-}
-
 void TextEditor::ApplyScrollPosition()
 {
   const Vector2& scrollOffset = mController->GetTextModel()->GetScrollPosition();
@@ -2354,10 +1356,9 @@ void TextEditor::OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type typ
   mController->ChangedLayoutDirection();
 }
 
-TextEditor::TextEditor()
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+TextEditor::TextEditor(ControlBehaviour additionalBehaviour)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)),
   mAnimationPeriod(0.0f, 0.0f),
-  mIdleCallback(NULL),
   mAlignmentOffset(0.f),
   mScrollAnimationDuration(0.f),
   mLineSpacing(0.f),
@@ -2372,288 +1373,41 @@ TextEditor::TextEditor()
   mSelectionCleared(false),
   mOldPosition(0u),
   mOldSelectionStart(0u),
-  mOldSelectionEnd(0u)
+  mOldSelectionEnd(0u),
+  mSelectionStarted(false)
 {
 }
 
 TextEditor::~TextEditor()
 {
   UnparentAndReset(mStencil);
-
-  if((NULL != mIdleCallback) && Adaptor::IsAvailable())
-  {
-    // Removes the callback from the callback manager in case the text-editor is destroyed before the callback is executed.
-    Adaptor::Get().RemoveIdle(mIdleCallback);
-  }
-}
-
-std::string TextEditor::AccessibleImpl::GetName()
-{
-  auto self = Toolkit::TextEditor::DownCast(Self());
-  return self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-}
-
-std::string TextEditor::AccessibleImpl::GetText(size_t startOffset, size_t endOffset)
-{
-  if(endOffset <= startOffset)
-  {
-    return {};
-  }
-
-  auto self = Toolkit::TextEditor::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-
-  if(startOffset > text.size() || endOffset > text.size())
-  {
-    return {};
-  }
-
-  return text.substr(startOffset, endOffset - startOffset);
-}
-
-size_t TextEditor::AccessibleImpl::GetCharacterCount()
-{
-  auto self = Toolkit::TextEditor::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-
-  return text.size();
-}
-
-size_t TextEditor::AccessibleImpl::GetCursorOffset()
-{
-  auto slf = Toolkit::TextEditor::DownCast(Self());
-  return Dali::Toolkit::GetImpl(slf).GetTextController()->GetCursorPosition();
-}
-
-bool TextEditor::AccessibleImpl::SetCursorOffset(size_t offset)
-{
-  auto slf = Toolkit::TextEditor::DownCast(Self());
-  auto txt = slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-  if(offset > txt.size())
-  {
-    return false;
-  }
-
-  auto& slfImpl = Dali::Toolkit::GetImpl(slf);
-  slfImpl.GetTextController()->ResetCursorPosition(offset);
-  slfImpl.RequestTextRelayout();
-
-  return true;
-}
-
-Dali::Accessibility::Range TextEditor::AccessibleImpl::GetTextAtOffset(size_t offset, Dali::Accessibility::TextBoundary boundary)
-{
-  auto self     = Toolkit::TextEditor::DownCast(Self());
-  auto text     = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-  auto textSize = text.size();
-
-  auto range = Dali::Accessibility::Range{};
-
-  switch(boundary)
-  {
-    case Dali::Accessibility::TextBoundary::CHARACTER:
-    {
-      if(offset < textSize)
-      {
-        range.content     = text[offset];
-        range.startOffset = offset;
-        range.endOffset   = offset + 1;
-      }
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::WORD:
-    case Dali::Accessibility::TextBoundary::LINE:
-    {
-      auto textString = text.c_str();
-      auto breaks     = std::vector<char>(textSize, 0);
-
-      if(boundary == Dali::Accessibility::TextBoundary::WORD)
-      {
-        Accessibility::Accessible::FindWordSeparationsUtf8(reinterpret_cast<const utf8_t*>(textString), textSize, "", breaks.data());
-      }
-      else
-      {
-        Accessibility::Accessible::FindLineSeparationsUtf8(reinterpret_cast<const utf8_t*>(textString), textSize, "", breaks.data());
-      }
-
-      auto index   = 0u;
-      auto counter = 0u;
-      while(index < textSize && counter <= offset)
-      {
-        auto start = index;
-        if(breaks[index])
-        {
-          while(breaks[index])
-          {
-            index++;
-          }
-          counter++;
-        }
-        else
-        {
-          if(boundary == Dali::Accessibility::TextBoundary::WORD)
-          {
-            index++;
-          }
-          if(boundary == Dali::Accessibility::TextBoundary::LINE)
-          {
-            counter++;
-          }
-        }
-
-        if((counter > 0) && ((counter - 1) == offset))
-        {
-          range.content     = text.substr(start, index - start + 1);
-          range.startOffset = start;
-          range.endOffset   = index + 1;
-        }
-
-        if(boundary == Dali::Accessibility::TextBoundary::LINE)
-        {
-          index++;
-        }
-      }
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::SENTENCE:
-    {
-      /* not supported by default */
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::PARAGRAPH:
-    {
-      /* Paragraph is not supported by libunibreak library */
-      break;
-    }
-    default:
-      break;
-  }
-
-  return range;
-}
-
-Dali::Accessibility::Range TextEditor::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex)
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return {};
-  }
-
-  auto        self       = Toolkit::TextEditor::DownCast(Self());
-  auto        controller = Dali::Toolkit::GetImpl(self).GetTextController();
-  std::string value{};
-  controller->RetrieveSelection(value);
-  auto indices = controller->GetSelectionIndexes();
-
-  return {static_cast<size_t>(indices.first), static_cast<size_t>(indices.second), value};
-}
-
-bool TextEditor::AccessibleImpl::RemoveSelection(size_t selectionIndex)
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return false;
-  }
-
-  auto self = Toolkit::TextEditor::DownCast(Self());
-  Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(0, 0);
-  return true;
-}
-
-bool TextEditor::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return false;
-  }
-
-  auto self = Toolkit::TextEditor::DownCast(Self());
-  Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(startOffset, endOffset);
-  return true;
 }
 
-bool TextEditor::AccessibleImpl::CopyText(size_t startPosition, size_t endPosition)
+std::string TextEditor::TextEditorAccessible::GetName() const
 {
-  if(endPosition <= startPosition)
-  {
-    return false;
-  }
-
-  auto self = Toolkit::TextEditor::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-  Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition));
-
-  return true;
+  return GetWholeText();
 }
 
-bool TextEditor::AccessibleImpl::CutText(size_t startPosition, size_t endPosition)
+const std::vector<Toolkit::TextAnchor>& TextEditor::TextEditorAccessible::GetTextAnchors() const
 {
-  if(endPosition <= startPosition)
-  {
-    return false;
-  }
-
   auto self = Toolkit::TextEditor::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-  Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition));
-
-  self.SetProperty(Toolkit::TextEditor::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition));
 
-  return true;
+  return Toolkit::GetImpl(self).mAnchorActors;
 }
 
-bool TextEditor::AccessibleImpl::DeleteText(size_t startPosition, size_t endPosition)
+Toolkit::Text::ControllerPtr TextEditor::TextEditorAccessible::GetTextController() const
 {
-  if(endPosition <= startPosition)
-  {
-    return false;
-  }
-
   auto self = Toolkit::TextEditor::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-
-  self.SetProperty(Toolkit::TextEditor::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition));
-
-  return true;
-}
-
-Dali::Accessibility::States TextEditor::AccessibleImpl::CalculateStates()
-{
-  using namespace Dali::Accessibility;
-
-  auto states              = DevelControl::AccessibleImpl::CalculateStates();
-  states[State::EDITABLE]  = true;
-  states[State::FOCUSABLE] = true;
-
-  Toolkit::Control focusControl = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
-  if(mSelf == focusControl)
-  {
-    states[State::FOCUSED] = true;
-  }
 
-  return states;
+  return Toolkit::GetImpl(self).GetTextController();
 }
 
-bool TextEditor::AccessibleImpl::InsertText(size_t startPosition, std::string text)
+void TextEditor::TextEditorAccessible::RequestTextRelayout()
 {
-  auto self         = Toolkit::TextEditor::DownCast(Self());
-  auto insertedText = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
+  auto  self     = Toolkit::TextEditor::DownCast(Self());
+  auto& selfImpl = Toolkit::GetImpl(self);
 
-  insertedText.insert(startPosition, text);
-
-  self.SetProperty(Toolkit::TextEditor::Property::TEXT, std::move(insertedText));
-
-  return true;
-}
-
-bool TextEditor::AccessibleImpl::SetTextContents(std::string newContents)
-{
-  auto self = Toolkit::TextEditor::DownCast(Self());
-  self.SetProperty(Toolkit::TextEditor::Property::TEXT, std::move(newContents));
-  return true;
+  selfImpl.RequestTextRelayout();
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index bc28781..0eb9f6f 100644
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,10 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
 #include <dali/devel-api/adaptor-framework/input-method-context.h>
+#include <dali/devel-api/atspi-interfaces/editable-text.h>
+#include <dali/devel-api/atspi-interfaces/hypertext.h>
+#include <dali/devel-api/atspi-interfaces/text.h>
 #include <dali/public-api/animation/animation.h>
 
 // INTERNAL INCLUDES
@@ -29,11 +31,12 @@
 #include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-anchor-control-interface.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-selectable-control-interface.h>
 #include <dali-toolkit/internal/text/text-vertical-scroller.h>
@@ -54,8 +57,9 @@ class TextEditor : public Control, public Text::ControlInterface, public Text::E
 public:
   /**
    * @copydoc Dali::Toollkit::TextEditor::New()
+   * @param[in] additionalBehaviour custom behavior flags for this TextEditor. Default is CONTROL_BEHAVIOUR_DEFAULT
    */
-  static Toolkit::TextEditor New();
+  static Toolkit::TextEditor New(ControlBehaviour additionalBehaviour = ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
 
   // Properties
 
@@ -113,6 +117,11 @@ public:
   DevelTextEditor::SelectionClearedSignalType& SelectionClearedSignal();
 
   /**
+   * @copydoc Dali::Toollkit::TextEditor::SelectionStartedSignal()
+   */
+  DevelTextEditor::SelectionStartedSignalType& SelectionStartedSignal();
+
+  /**
    * Connects a callback function with the object's signals.
    * @param[in] object The object providing the signal.
    * @param[in] tracker Used to disconnect the signal.
@@ -152,6 +161,11 @@ private: // From Control
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Control::OnStyleChange()
    */
   void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) override;
@@ -207,6 +221,11 @@ private: // From Control
   void OnSceneConnection(int depth) override;
 
   /**
+   * @copydoc Control::OnPropertySet()
+   */
+  void OnPropertySet(Property::Index index, const Property::Value& propertyValue) override;
+
+  /**
    * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
    */
   bool OnKeyEvent(const KeyEvent& event) override;
@@ -258,7 +277,7 @@ private: // From Control
   /**
    * @copydoc Text::EditableControlInterface::AddDecoration()
    */
-  void AddDecoration(Actor& actor, bool needsClipping) override;
+  void AddDecoration(Actor& actor, Toolkit::Text::DecorationType type, bool needsClipping) override;
 
   /**
    * @copydoc Text::EditableControlInterface::InputFiltered()
@@ -317,6 +336,74 @@ public:
   float GetVerticalScrollPosition();
 
   /**
+   * @brief Get the rendered size of a specific text range.
+   * if the requested text is at multilines, multiple sizes will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to calculate size for.
+   * @param[in] endIndex end index(included) of the text requested to calculate size for.
+   * @return list of sizes of the reuested text.
+   */
+  Vector<Vector2> GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const;
+
+  /**
+   * @brief Get the top/left rendered position of a specific text range.
+   * if the requested text is at multilines, multiple positions will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple positions will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to get position to.
+   * @param[in] endIndex end index(included) of the text requested to get position to.
+   * @return list of positions of the requested text.
+   */
+  Vector<Vector2> GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const;
+
+  /**
+   * @brief Get the line bounding rectangle.
+   * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] lineIndex line index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+  Rect<float> GetLineBoundingRectangle(const uint32_t lineIndex) const;
+
+  /**
+   * @brief Get the character bounding rectangle.
+   * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] charIndex character index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+  Rect<float> GetCharacterBoundingRectangle(const uint32_t charIndex) const;
+
+  /**
+   * @brief Get the character index.
+   * If the text is not yet rendered or the text is empty, -1 is returned.
+   *
+   * @param[in] visualX visual x position.
+   * @param[in] visualY visual y position.
+   * @return character index.
+   */
+  int GetCharacterIndexAtPosition(float visualX, float visualY) const;
+
+  /**
+   * @brief Gets the bounding box of a specific text range.
+   *
+   * @param[in] startIndex start index of the text requested to get bounding box to.
+   * @param[in] endIndex end index(included) of the text requested to get bounding box to.
+   * @return bounding box of the requested text.
+   */
+  Rect<> GetTextBoundingRectangle(uint32_t startIndex, uint32_t endIndex) const;
+
+  /**
+   * @brief Set the @p spannedText into current textEditor
+   * the spanned text contains content (text) and  format (spans with ranges)
+   * the text is copied into text-controller and the spans are applied on ranges
+   *
+   * @param[in] spannedText the text with spans.
+   */
+  void SetSpannedText(const Text::Spanned& spannedText);
+
+  /**
    * @copydoc Text::SelectableControlInterface::GetSelectedText()
    */
   string GetSelectedText() const override;
@@ -360,12 +447,6 @@ private: // Implementation
   InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent);
 
   /**
-   * @brief Callback when Clipboard signals an item should be pasted
-   * @param[in] clipboard handle to Clipboard Event Notifier
-   */
-  void OnClipboardTextSelected(ClipboardEventNotifier& clipboard);
-
-  /**
    * @brief Get a Property Map for the image used for the required Handle Image
    * @param[out] value the returned image property
    * @param[in] handleType the type of handle
@@ -423,6 +504,11 @@ private: // Implementation
   void EmitSelectionClearedSignal();
 
   /**
+   * @brief Emits SelectionStarted signal.
+   */
+  void EmitSelectionStartedSignal();
+
+  /**
    * @brief set RenderActor's position with new scrollPosition
    *
    * Apply updated scroll position or start scroll animation if VerticalScrollAnimation is enabled
@@ -444,9 +530,18 @@ private: // Implementation
   void OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type);
 
   /**
+  * @brief Add a layer for active or cursor.
+  * @param[in] layer The actor in which to store the layer.
+  * @param[in] actor The new layer to add.
+  */
+  void AddLayer(Actor& layer, Actor& actor);
+
+  /**
    * Construct a new TextEditor.
+   *
+   * @param[in] additionalBehaviour additional behaviour flags for this TextEditor
    */
-  TextEditor();
+  TextEditor(ControlBehaviour additionalBehaviour);
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
@@ -473,6 +568,9 @@ private: // Implementation
   // Connection needed to re-render text, when a text editor returns to the scene.
   void OnSceneConnect(Dali::Actor actor);
 
+  // Needed to synchronize TextAnchor actors with Anchor objects in text's logical model
+  void OnAccessibilityStatusChanged();
+
 private: // Data
   // Signals
   Toolkit::TextEditor::TextChangedSignalType                mTextChangedSignal;
@@ -484,23 +582,25 @@ private: // Data
   Toolkit::DevelTextEditor::CursorPositionChangedSignalType mCursorPositionChangedSignal;
   Toolkit::DevelTextEditor::SelectionChangedSignalType      mSelectionChangedSignal;
   Toolkit::DevelTextEditor::SelectionClearedSignalType      mSelectionClearedSignal;
-
-  InputMethodContext            mInputMethodContext;
-  Text::ControllerPtr           mController;
-  Text::RendererPtr             mRenderer;
-  Text::DecoratorPtr            mDecorator;
-  Text::TextVerticalScrollerPtr mTextVerticalScroller;
-  Toolkit::Control              mStencil;
-  Toolkit::ScrollBar            mScrollBar;
-  Dali::Animation               mAnimation; ///< Scroll indicator Show/Hide Animation.
-  Dali::TimePeriod              mAnimationPeriod;
-  std::vector<Actor>            mClippingDecorationActors; ///< Decoration actors which need clipping.
-  Dali::InputMethodOptions      mInputMethodOptions;
-
-  Actor         mRenderableActor;
-  Actor         mActiveLayer;
-  Actor         mBackgroundActor;
-  CallbackBase* mIdleCallback;
+  Toolkit::DevelTextEditor::SelectionStartedSignalType      mSelectionStartedSignal;
+
+  InputMethodContext               mInputMethodContext;
+  Text::ControllerPtr              mController;
+  Text::RendererPtr                mRenderer;
+  Text::DecoratorPtr               mDecorator;
+  Text::TextVerticalScrollerPtr    mTextVerticalScroller;
+  Toolkit::Control                 mStencil;
+  Toolkit::ScrollBar               mScrollBar;
+  Dali::Animation                  mAnimation; ///< Scroll indicator Show/Hide Animation.
+  Dali::TimePeriod                 mAnimationPeriod;
+  std::vector<Actor>               mClippingDecorationActors; ///< Decoration actors which need clipping.
+  std::vector<Toolkit::TextAnchor> mAnchorActors;
+  Dali::InputMethodOptions         mInputMethodOptions;
+
+  Actor mRenderableActor;
+  Actor mActiveLayer;
+  Actor mCursorLayer;
+  Actor mBackgroundActor;
 
   float mAlignmentOffset;
   float mScrollAnimationDuration;
@@ -522,89 +622,38 @@ private: // Data
   uint32_t mOldSelectionStart;
   uint32_t mOldSelectionEnd;
 
+  bool mSelectionStarted : 1; ///< If true, emits SelectionStartedSignal at the end of OnRelayout().
+
+  struct PropertyHandler;
+
   /**
    * @brief This structure is to connect TextEditor with Accessible functions.
    */
-  struct AccessibleImpl : public DevelControl::AccessibleImpl,
-                          public virtual Dali::Accessibility::Text,
-                          public virtual Dali::Accessibility::EditableText
+  class TextEditorAccessible : public EditableTextControlAccessible
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
+  public:
+    using EditableTextControlAccessible::EditableTextControlAccessible;
 
     /**
      * @copydoc Dali::Accessibility::Accessible::GetName()
      */
-    std::string GetName() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetText()
-     */
-    std::string GetText(size_t startOffset, size_t endOffset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetCharacterCount()
-     */
-    size_t GetCharacterCount() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetCursorOffset()
-     */
-    size_t GetCursorOffset() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::SetCursorOffset()
-     */
-    bool SetCursorOffset(size_t offset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetTextAtOffset()
-     */
-    Accessibility::Range GetTextAtOffset(size_t offset, Accessibility::TextBoundary boundary) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetRangeOfSelection()
-     */
-    Accessibility::Range GetRangeOfSelection(size_t selectionIndex) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::RemoveSelection()
-     */
-    bool RemoveSelection(size_t selectionIndex) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::SetRangeOfSelection()
-     */
-    bool SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::EditableText::CopyText()
-     */
-    bool CopyText(size_t startPosition, size_t endPosition) override;
-
-    /**
-     * @copydoc Dali::Accessibility::EditableText::CutText()
-     */
-    bool CutText(size_t startPosition, size_t endPosition) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Accessible::GetStates()
-     */
-    Accessibility::States CalculateStates() override;
+    std::string GetName() const override;
 
+  protected:
     /**
-     * @copydoc Dali::Accessibility::EditableText::InsertText()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextAnchors()
      */
-    bool InsertText(size_t startPosition, std::string text) override;
+    const std::vector<Toolkit::TextAnchor>& GetTextAnchors() const override;
 
     /**
-     * @copydoc Dali::Accessibility::EditableText::SetTextContents()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextController()
      */
-    bool SetTextContents(std::string newContents) override;
+    Toolkit::Text::ControllerPtr GetTextController() const override;
 
     /**
-     * @copydoc Dali::Accessibility::EditableText::DeleteText()
+     * @copydoc Dali::Toolkit::Internal::EditableTextControlAccessible::RequestTextRelayout()
      */
-    bool DeleteText(size_t startPosition, size_t endPosition) override;
+    void RequestTextRelayout() override;
   };
 };
 
diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp
new file mode 100644
index 0000000..067023a
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp
@@ -0,0 +1,1187 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/controls/text-controls/text-editor-property-handler.h>
+
+#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/text-effects-style.h>
+#include <dali-toolkit/internal/text/text-enumerations-impl.h>
+#include <dali-toolkit/internal/text/text-font-style.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+#include <dali/integration-api/debug.h>
+
+#if defined(DEBUG_ENABLED)
+extern Debug::Filter* gTextEditorLogFilter;
+#endif
+
+namespace Dali::Toolkit::Internal
+{
+const char* const TextEditor::PropertyHandler::IMAGE_MAP_FILENAME_STRING{"filename"};
+
+/// Retrieves a filename from a value that is a Property::Map
+std::string TextEditor::PropertyHandler::GetImageFileNameFromPropertyValue(const Property::Value& value)
+{
+  std::string          filename;
+  const Property::Map* map = value.GetMap();
+  if(map)
+  {
+    const Property::Value* filenameValue = map->Find(TextEditor::PropertyHandler::IMAGE_MAP_FILENAME_STRING);
+    if(filenameValue)
+    {
+      filenameValue->Get(filename);
+    }
+  }
+  return filename;
+}
+
+void TextEditor::PropertyHandler::SetProperty(Toolkit::TextEditor textEditor, Property::Index index, const Property::Value& value)
+{
+  TextEditor& impl(GetImpl(textEditor));
+  DALI_ASSERT_DEBUG(impl.mController && "No text controller");
+  DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
+
+  switch(index)
+  {
+    case Toolkit::DevelTextEditor::Property::RENDERING_BACKEND:
+    {
+      int backend = value.Get<int>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend);
+
+      if(impl.mRenderingBackend != backend)
+      {
+        impl.mRenderingBackend = backend;
+        impl.mRenderer.Reset();
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::TEXT:
+    {
+      const std::string& text = value.Get<std::string>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p TEXT %s\n", impl.mController.Get(), text.c_str());
+
+      impl.mController->SetText(text);
+      break;
+    }
+    case Toolkit::TextEditor::Property::TEXT_COLOR:
+    {
+      const Vector4& textColor = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
+
+      if(impl.mController->GetDefaultColor() != textColor)
+      {
+        impl.mController->SetDefaultColor(textColor);
+        impl.mController->SetInputColor(textColor);
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::FONT_FAMILY:
+    {
+      const std::string& fontFamily = value.Get<std::string>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
+      impl.mController->SetDefaultFontFamily(fontFamily);
+      break;
+    }
+    case Toolkit::TextEditor::Property::FONT_STYLE:
+    {
+      SetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::POINT_SIZE:
+    {
+      const float pointSize = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p POINT_SIZE %f\n", impl.mController.Get(), pointSize);
+
+      if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE), pointSize))
+      {
+        impl.mController->SetDefaultFontSize(pointSize, Text::Controller::POINT_SIZE);
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::HORIZONTAL_ALIGNMENT:
+    {
+      Text::HorizontalAlignment::Type alignment(static_cast<Text::HorizontalAlignment::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
+      if(Text::GetHorizontalAlignmentEnumeration(value, alignment))
+      {
+        DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment);
+        impl.mController->SetHorizontalAlignment(alignment);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::VERTICAL_ALIGNMENT:
+    {
+      Toolkit::Text::VerticalAlignment::Type alignment(static_cast<Text::VerticalAlignment::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
+      if(Text::GetVerticalAlignmentEnumeration(value, alignment))
+      {
+        impl.mController->SetVerticalAlignment(alignment);
+        DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p VERTICAL_ALIGNMENT %d\n", impl.mController.Get(), alignment);
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_THRESHOLD:
+    {
+      const float threshold = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold);
+
+      impl.mDecorator->SetScrollThreshold(threshold);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_SPEED:
+    {
+      const float speed = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p SCROLL_SPEED %f\n", impl.mController.Get(), speed);
+
+      impl.mDecorator->SetScrollSpeed(speed);
+      break;
+    }
+    case Toolkit::TextEditor::Property::PRIMARY_CURSOR_COLOR:
+    {
+      const Vector4& color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetCursorColor(Toolkit::Text::PRIMARY_CURSOR, color);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextEditor::Property::SECONDARY_CURSOR_COLOR:
+    {
+      const Vector4& color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetCursorColor(Toolkit::Text::SECONDARY_CURSOR, color);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_CURSOR_BLINK:
+    {
+      const bool enable = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable);
+
+      impl.mController->SetEnableCursorBlink(enable);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextEditor::Property::CURSOR_BLINK_INTERVAL:
+    {
+      const float interval = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval);
+
+      impl.mDecorator->SetCursorBlinkInterval(interval);
+      break;
+    }
+    case Toolkit::TextEditor::Property::CURSOR_BLINK_DURATION:
+    {
+      const float duration = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration);
+
+      impl.mDecorator->SetCursorBlinkDuration(duration);
+      break;
+    }
+    case Toolkit::TextEditor::Property::CURSOR_WIDTH:
+    {
+      const int width = value.Get<int>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p CURSOR_WIDTH %d\n", impl.mController.Get(), width);
+
+      impl.mDecorator->SetCursorWidth(width);
+      impl.mController->GetLayoutEngine().SetCursorWidth(width);
+      break;
+    }
+    case Toolkit::TextEditor::Property::GRAB_HANDLE_IMAGE:
+    {
+      const std::string imageFileName = value.Get<std::string>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
+
+      if(imageFileName.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::GRAB_HANDLE, Toolkit::Text::HANDLE_IMAGE_RELEASED, imageFileName);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE:
+    {
+      const std::string imageFileName = value.Get<std::string>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
+
+      if(imageFileName.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::GRAB_HANDLE, Toolkit::Text::HANDLE_IMAGE_PRESSED, imageFileName);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::LEFT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_RELEASED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::RIGHT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_RELEASED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::LEFT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_PRESSED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::RIGHT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_PRESSED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::LEFT_SELECTION_HANDLE_MARKER,
+                                        Toolkit::Text::HANDLE_IMAGE_RELEASED,
+                                        filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::RIGHT_SELECTION_HANDLE_MARKER,
+                                        Toolkit::Text::HANDLE_IMAGE_RELEASED,
+                                        filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HIGHLIGHT_COLOR:
+    {
+      const Vector4 color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetHighlightColor(color);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextEditor::Property::DECORATION_BOUNDING_BOX:
+    {
+      const Rect<int>& box = value.Get<Rect<int> >();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height);
+
+      impl.mDecorator->SetBoundingBox(box);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_MARKUP:
+    {
+      const bool enableMarkup = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup);
+
+      impl.mController->SetMarkupProcessorEnabled(enableMarkup);
+      CommonTextUtils::SynchronizeTextAnchorsInParent(textEditor, impl.mController, impl.mAnchorActors);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_COLOR:
+    {
+      const Vector4& inputColor = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a);
+
+      impl.mController->SetInputColor(inputColor);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_FONT_FAMILY:
+    {
+      const std::string& fontFamily = value.Get<std::string>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
+      impl.mController->SetInputFontFamily(fontFamily);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_FONT_STYLE:
+    {
+      SetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_POINT_SIZE:
+    {
+      const float pointSize = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize);
+      impl.mController->SetInputFontPointSize(pointSize);
+      break;
+    }
+    case Toolkit::TextEditor::Property::LINE_SPACING:
+    {
+      const float lineSpacing = value.Get<float>();
+      impl.mController->SetDefaultLineSpacing(lineSpacing);
+      impl.mRenderer.Reset();
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_LINE_SPACING:
+    {
+      const float lineSpacing = value.Get<float>();
+      impl.mController->SetInputLineSpacing(lineSpacing);
+      impl.mRenderer.Reset();
+      break;
+    }
+    case Toolkit::TextEditor::Property::UNDERLINE:
+    {
+      const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_UNDERLINE:
+    {
+      const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SHADOW:
+    {
+      const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_SHADOW:
+    {
+      const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::EMBOSS:
+    {
+      const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_EMBOSS:
+    {
+      const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::OUTLINE:
+    {
+      const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_OUTLINE:
+    {
+      const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SMOOTH_SCROLL:
+    {
+      const bool enable = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor SMOOTH_SCROLL %d\n", enable);
+
+      impl.mScrollAnimationEnabled = enable;
+      break;
+    }
+    case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION:
+    {
+      const float duration = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor SMOOTH_SCROLL_DURATION %f\n", duration);
+
+      impl.mScrollAnimationDuration = duration;
+      if(impl.mTextVerticalScroller)
+      {
+        impl.mTextVerticalScroller->SetDuration(duration);
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR:
+    {
+      const bool enable = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor SHOW_SCROLL_BAR %d\n", enable);
+
+      impl.mScrollBarEnabled = enable;
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION:
+    {
+      const float duration = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor SCROLL_BAR_SHOW_DURATION %f\n", duration);
+
+      impl.mAnimationPeriod.delaySeconds = duration;
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION:
+    {
+      const float duration = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor SCROLL_BAR_FADE_DURATION %f\n", duration);
+
+      impl.mAnimationPeriod.durationSeconds = duration;
+      break;
+    }
+    case Toolkit::TextEditor::Property::PIXEL_SIZE:
+    {
+      const float pixelSize = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize);
+
+      if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE), pixelSize))
+      {
+        impl.mController->SetDefaultFontSize(pixelSize, Text::Controller::PIXEL_SIZE);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT:
+    {
+      const std::string& text = value.Get<std::string>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor::OnPropertySet %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str());
+
+      impl.mController->SetPlaceholderText(Text::Controller::PLACEHOLDER_TYPE_INACTIVE, text);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR:
+    {
+      const Vector4& textColor = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
+
+      if(impl.mController->GetPlaceholderTextColor() != textColor)
+      {
+        impl.mController->SetPlaceholderTextColor(textColor);
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_SELECTION:
+    {
+      const bool enableSelection = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection);
+      impl.mController->SetSelectionEnabled(enableSelection);
+      break;
+    }
+    case Toolkit::TextEditor::Property::PLACEHOLDER:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mController->SetPlaceholderProperty(*map);
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::LINE_WRAP_MODE:
+    {
+      Text::LineWrap::Mode lineWrapMode(static_cast<Text::LineWrap::Mode>(-1)); // Set to invalid value to ensure a valid mode does get set
+      if(Toolkit::Text::GetLineWrapModeEnumeration(value, lineWrapMode))
+      {
+        DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p LineWrap::MODE %d\n", impl.mController.Get(), lineWrapMode);
+        impl.mController->SetLineWrapMode(lineWrapMode);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_SHIFT_SELECTION:
+    {
+      const bool shiftSelection = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection);
+
+      impl.mController->SetShiftSelectionEnabled(shiftSelection);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE:
+    {
+      const bool grabHandleEnabled = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled);
+
+      impl.mController->SetGrabHandleEnabled(grabHandleEnabled);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
+    {
+      impl.mController->SetMatchLayoutDirection(value.Get<bool>() ? DevelText::MatchLayoutDirection::LOCALE : DevelText::MatchLayoutDirection::CONTENTS);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::MAX_LENGTH:
+    {
+      const int max = value.Get<int>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p MAX_LENGTH %d\n", impl.mController.Get(), max);
+
+      impl.mController->SetMaximumNumberOfCharacters(max);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_START:
+    {
+      uint32_t start = static_cast<uint32_t>(value.Get<int>());
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start);
+      impl.SetTextSelectionRange(&start, nullptr);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_END:
+    {
+      uint32_t end = static_cast<uint32_t>(value.Get<int>());
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end);
+      impl.SetTextSelectionRange(nullptr, &end);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_EDITING:
+    {
+      const bool editable = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p ENABLE_EDITING %d\n", impl.mController.Get(), editable);
+      impl.SetEditable(editable);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION:
+    {
+      float horizontalScroll = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p HORIZONTAL_SCROLL_POSITION %d\n", impl.mController.Get(), horizontalScroll);
+      if(horizontalScroll >= 0.0f)
+      {
+        impl.ScrollBy(Vector2(horizontalScroll - impl.GetHorizontalScrollPosition(), 0));
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::VERTICAL_SCROLL_POSITION:
+    {
+      float verticalScroll = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p VERTICAL_SCROLL_POSITION %d\n", impl.mController.Get(), verticalScroll);
+      if(verticalScroll >= 0.0f)
+      {
+        impl.ScrollBy(Vector2(0, verticalScroll - impl.GetVerticalScrollPosition()));
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE:
+    {
+      const float scale = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p FONT_SIZE_SCALE %f\n", impl.mController.Get(), scale);
+
+      if(!Equals(impl.mController->GetFontSizeScale(), scale))
+      {
+        impl.mController->SetFontSizeScale(scale);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_FONT_SIZE_SCALE:
+    {
+      const bool enableFontSizeScale = value.Get<bool>();
+      if(!Equals(impl.mController->IsFontSizeScaleEnabled(), enableFontSizeScale))
+      {
+        impl.mController->SetFontSizeScaleEnabled(enableFontSizeScale);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::PRIMARY_CURSOR_POSITION:
+    {
+      uint32_t position = static_cast<uint32_t>(value.Get<int>());
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p PRIMARY_CURSOR_POSITION %d\n", impl.mController.Get(), position);
+      if(impl.mController->SetPrimaryCursorPosition(position, impl.HasKeyInputFocus()))
+      {
+        impl.SetKeyInputFocus();
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::GRAB_HANDLE_COLOR:
+    {
+      const Vector4 color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p GRAB_HANDLE_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetHandleColor(color);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP:
+    {
+      const bool grabHandlePopupEnabled = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p ENABLE_GRAB_HANDLE_POPUP %d\n", impl.mController.Get(), grabHandlePopupEnabled);
+
+      impl.mController->SetGrabHandlePopupEnabled(grabHandlePopupEnabled);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::INPUT_METHOD_SETTINGS:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mInputMethodOptions.ApplyProperty(*map);
+      }
+      impl.mController->SetInputModePassword(impl.mInputMethodOptions.IsPassword());
+
+      Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
+      if(control == textEditor)
+      {
+        impl.mInputMethodContext.ApplyOptions(impl.mInputMethodOptions);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::INPUT_FILTER:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mController->SetInputFilterOption(*map);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ELLIPSIS:
+    {
+      const bool ellipsis = value.Get<bool>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p ELLIPSIS %d\n", impl.mController.Get(), ellipsis);
+
+      impl.mController->SetTextElideEnabled(ellipsis);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ELLIPSIS_POSITION:
+    {
+      DevelText::EllipsisPosition::Type ellipsisPositionType(static_cast<DevelText::EllipsisPosition::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
+      if(Text::GetEllipsisPositionTypeEnumeration(value, ellipsisPositionType))
+      {
+        DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p EllipsisPosition::Type %d\n", impl.mController.Get(), ellipsisPositionType);
+        impl.mController->SetEllipsisPosition(ellipsisPositionType);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::MIN_LINE_SIZE:
+    {
+      const float minLineSize = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p MIN_LINE_SIZE %f\n", impl.mController.Get(), minLineSize);
+
+      impl.mController->SetDefaultLineSize(minLineSize);
+      impl.mRenderer.Reset();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::STRIKETHROUGH:
+    {
+      const bool update = SetStrikethroughProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::INPUT_STRIKETHROUGH:
+    {
+      const bool update = SetStrikethroughProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::CHARACTER_SPACING:
+    {
+      const float characterSpacing = value.Get<float>();
+      impl.mController->SetCharacterSpacing(characterSpacing);
+      impl.mRenderer.Reset();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::RELATIVE_LINE_SIZE:
+    {
+      const float relativeLineSize = value.Get<float>();
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::Verbose, "TextEditor %p RELATIVE_LINE_SIZE %f\n", impl.mController.Get(), relativeLineSize);
+
+      impl.mController->SetRelativeLineSize(relativeLineSize);
+      impl.mRenderer.Reset();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::SELECTION_POPUP_STYLE:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mDecorator->SetSelectionPopupStyle(*map);
+      }
+      break;
+    }
+  }
+}
+
+Property::Value TextEditor::PropertyHandler::GetProperty(Toolkit::TextEditor textEditor, Property::Index index)
+{
+  Property::Value value;
+  TextEditor&     impl(GetImpl(textEditor));
+  DALI_ASSERT_DEBUG(impl.mController && "No text controller");
+  DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
+
+  switch(index)
+  {
+    case Toolkit::DevelTextEditor::Property::RENDERING_BACKEND:
+    {
+      value = impl.mRenderingBackend;
+      break;
+    }
+    case Toolkit::TextEditor::Property::TEXT:
+    {
+      std::string text;
+      impl.mController->GetText(text);
+      DALI_LOG_INFO(gTextEditorLogFilter, Debug::General, "TextEditor %p returning text: %s\n", impl.mController.Get(), text.c_str());
+      value = text;
+      break;
+    }
+    case Toolkit::TextEditor::Property::TEXT_COLOR:
+    {
+      value = impl.mController->GetDefaultColor();
+      break;
+    }
+    case Toolkit::TextEditor::Property::FONT_FAMILY:
+    {
+      value = impl.mController->GetDefaultFontFamily();
+      break;
+    }
+    case Toolkit::TextEditor::Property::FONT_STYLE:
+    {
+      GetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::POINT_SIZE:
+    {
+      value = impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE);
+      break;
+    }
+    case Toolkit::TextEditor::Property::HORIZONTAL_ALIGNMENT:
+    {
+      const char* name = Text::GetHorizontalAlignmentString(impl.mController->GetHorizontalAlignment());
+      if(name)
+      {
+        value = std::string(name);
+      }
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::VERTICAL_ALIGNMENT:
+    {
+      const char* name = Text::GetVerticalAlignmentString(impl.mController->GetVerticalAlignment());
+
+      if(name)
+      {
+        value = std::string(name);
+      }
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_THRESHOLD:
+    {
+      value = impl.mDecorator->GetScrollThreshold();
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_SPEED:
+    {
+      value = impl.mDecorator->GetScrollSpeed();
+      break;
+    }
+    case Toolkit::TextEditor::Property::PRIMARY_CURSOR_COLOR:
+    {
+      value = impl.mDecorator->GetColor(Text::PRIMARY_CURSOR);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SECONDARY_CURSOR_COLOR:
+    {
+      value = impl.mDecorator->GetColor(Text::SECONDARY_CURSOR);
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_CURSOR_BLINK:
+    {
+      value = impl.mController->GetEnableCursorBlink();
+      break;
+    }
+    case Toolkit::TextEditor::Property::CURSOR_BLINK_INTERVAL:
+    {
+      value = impl.mDecorator->GetCursorBlinkInterval();
+      break;
+    }
+    case Toolkit::TextEditor::Property::CURSOR_BLINK_DURATION:
+    {
+      value = impl.mDecorator->GetCursorBlinkDuration();
+      break;
+    }
+    case Toolkit::TextEditor::Property::CURSOR_WIDTH:
+    {
+      value = impl.mDecorator->GetCursorWidth();
+      break;
+    }
+    case Toolkit::TextEditor::Property::GRAB_HANDLE_IMAGE:
+    {
+      value = impl.mDecorator->GetHandleImage(Text::GRAB_HANDLE, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE:
+    {
+      value = impl.mDecorator->GetHandleImage(Text::GRAB_HANDLE, Text::HANDLE_IMAGE_PRESSED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_LEFT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::LEFT_SELECTION_HANDLE, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_IMAGE_RIGHT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::RIGHT_SELECTION_HANDLE, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::LEFT_SELECTION_HANDLE, Text::HANDLE_IMAGE_PRESSED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::RIGHT_SELECTION_HANDLE, Text::HANDLE_IMAGE_PRESSED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::LEFT_SELECTION_HANDLE_MARKER, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::RIGHT_SELECTION_HANDLE_MARKER, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SELECTION_HIGHLIGHT_COLOR:
+    {
+      value = impl.mDecorator->GetHighlightColor();
+      break;
+    }
+    case Toolkit::TextEditor::Property::DECORATION_BOUNDING_BOX:
+    {
+      Rect<int> boundingBox;
+      impl.mDecorator->GetBoundingBox(boundingBox);
+      value = boundingBox;
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_MARKUP:
+    {
+      value = impl.mController->IsMarkupProcessorEnabled();
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_COLOR:
+    {
+      value = impl.mController->GetInputColor();
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_FONT_FAMILY:
+    {
+      value = impl.mController->GetInputFontFamily();
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_FONT_STYLE:
+    {
+      GetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_POINT_SIZE:
+    {
+      value = impl.mController->GetInputFontPointSize();
+      break;
+    }
+    case Toolkit::TextEditor::Property::LINE_SPACING:
+    {
+      value = impl.mController->GetDefaultLineSpacing();
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_LINE_SPACING:
+    {
+      value = impl.mController->GetInputLineSpacing();
+      break;
+    }
+    case Toolkit::TextEditor::Property::UNDERLINE:
+    {
+      GetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_UNDERLINE:
+    {
+      GetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SHADOW:
+    {
+      GetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_SHADOW:
+    {
+      GetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::EMBOSS:
+    {
+      GetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_EMBOSS:
+    {
+      GetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::OUTLINE:
+    {
+      GetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::INPUT_OUTLINE:
+    {
+      GetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextEditor::Property::SMOOTH_SCROLL:
+    {
+      value = impl.mScrollAnimationEnabled;
+      break;
+    }
+    case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION:
+    {
+      value = impl.mScrollAnimationDuration;
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR:
+    {
+      value = impl.mScrollBarEnabled;
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION:
+    {
+      value = impl.mAnimationPeriod.delaySeconds;
+      break;
+    }
+    case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION:
+    {
+      value = impl.mAnimationPeriod.durationSeconds;
+      break;
+    }
+    case Toolkit::TextEditor::Property::PIXEL_SIZE:
+    {
+      value = impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE);
+      break;
+    }
+    case Toolkit::TextEditor::Property::LINE_COUNT:
+    {
+      float width = textEditor.GetProperty(Actor::Property::SIZE_WIDTH).Get<float>();
+      value       = impl.mController->GetLineCount(width);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT:
+    {
+      std::string text;
+      impl.mController->GetPlaceholderText(Text::Controller::PLACEHOLDER_TYPE_INACTIVE, text);
+      value = text;
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR:
+    {
+      value = impl.mController->GetPlaceholderTextColor();
+      break;
+    }
+    case Toolkit::TextEditor::Property::ENABLE_SELECTION:
+    {
+      value = impl.mController->IsSelectionEnabled();
+      break;
+    }
+    case Toolkit::TextEditor::Property::PLACEHOLDER:
+    {
+      Property::Map map;
+      impl.mController->GetPlaceholderProperty(map);
+      value = map;
+      break;
+    }
+    case Toolkit::TextEditor::Property::LINE_WRAP_MODE:
+    {
+      value = impl.mController->GetLineWrapMode();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::STRIKETHROUGH:
+    {
+      GetStrikethroughProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::INPUT_STRIKETHROUGH:
+    {
+      GetStrikethroughProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_SHIFT_SELECTION:
+    {
+      value = impl.mController->IsShiftSelectionEnabled();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE:
+    {
+      value = impl.mController->IsGrabHandleEnabled();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
+    {
+      value = impl.mController->GetMatchLayoutDirection() != DevelText::MatchLayoutDirection::CONTENTS;
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::MAX_LENGTH:
+    {
+      value = impl.mController->GetMaximumNumberOfCharacters();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::SELECTED_TEXT:
+    {
+      value = impl.mController->GetSelectedText();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_START:
+    {
+      Uint32Pair range = impl.GetTextSelectionRange();
+      value            = static_cast<int>(range.first);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::SELECTED_TEXT_END:
+    {
+      Uint32Pair range = impl.GetTextSelectionRange();
+      value            = static_cast<int>(range.second);
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_EDITING:
+    {
+      value = impl.IsEditable();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::HORIZONTAL_SCROLL_POSITION:
+    {
+      value = impl.GetHorizontalScrollPosition();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::VERTICAL_SCROLL_POSITION:
+    {
+      value = impl.GetVerticalScrollPosition();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::FONT_SIZE_SCALE:
+    {
+      value = impl.mController->GetFontSizeScale();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_FONT_SIZE_SCALE:
+    {
+      value = impl.mController->IsFontSizeScaleEnabled();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::PRIMARY_CURSOR_POSITION:
+    {
+      value = static_cast<int>(impl.mController->GetPrimaryCursorPosition());
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::GRAB_HANDLE_COLOR:
+    {
+      value = impl.mDecorator->GetHandleColor();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ENABLE_GRAB_HANDLE_POPUP:
+    {
+      value = impl.mController->IsGrabHandlePopupEnabled();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::INPUT_METHOD_SETTINGS:
+    {
+      Property::Map map;
+      impl.mInputMethodOptions.RetrieveProperty(map);
+      value = map;
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::INPUT_FILTER:
+    {
+      Property::Map map;
+      impl.mController->GetInputFilterOption(map);
+      value = map;
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ELLIPSIS:
+    {
+      value = impl.mController->IsTextElideEnabled();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::ELLIPSIS_POSITION:
+    {
+      value = impl.mController->GetEllipsisPosition();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::MIN_LINE_SIZE:
+    {
+      value = impl.mController->GetDefaultLineSize();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::CHARACTER_SPACING:
+    {
+      value = impl.mController->GetCharacterSpacing();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::RELATIVE_LINE_SIZE:
+    {
+      value = impl.mController->GetRelativeLineSize();
+      break;
+    }
+    case Toolkit::DevelTextEditor::Property::SELECTION_POPUP_STYLE:
+    {
+      Property::Map map;
+      impl.mDecorator->GetSelectionPopupStyle(map);
+      value = map;
+      break;
+    }
+  } //switch
+  return value;
+}
+
+} // namespace Dali::Toolkit::Internal
diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.h b/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.h
new file mode 100644
index 0000000..2664f4d
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-property-handler.h
@@ -0,0 +1,61 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_PROPERTY_HANDLER_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_PROPERTY_HANDLER_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-toolkit/internal/controls/text-controls/text-editor-impl.h>
+
+namespace Dali::Toolkit::Internal
+{
+/**
+ * Class to manage properties for the TextEditor
+ */
+struct TextEditor::PropertyHandler
+{
+  static const char* const IMAGE_MAP_FILENAME_STRING; //<<< "filename" key for image map
+
+  /**
+   * Set properties on the text editor / controller / decorator
+   *
+   * @param[in] textEditor The handle for the text editor
+   * @param[in] index The property index of the property to set
+   * @param[in] value The value to set
+   */
+  static void SetProperty(Toolkit::TextEditor textEditor, Property::Index index, const Property::Value& value);
+
+  /**
+   * Get properties from the text editor / controller / decorator
+   *
+   * @param[in] textEditor The handle for the text editor
+   * @param[in] index The property index of the property to set
+   * @return the value
+   */
+  static Property::Value GetProperty(Toolkit::TextEditor textEditor, Property::Index index);
+
+private:
+  /**
+   * Method to extract "filename" value from a Property::Map
+   *
+   * @param[in] The property value containing the Property::Map
+   * @return The resulting "filename" value if present
+   */
+  static std::string GetImageFileNameFromPropertyValue(const Property::Value& value);
+};
+
+} // namespace Dali::Toolkit::Internal
+
+#endif //DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_PROPERTY_HANDLER_H
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index 32beca1..4d68826 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,17 +24,19 @@
 #include <dali/devel-api/common/stage.h>
 #include <dali/devel-api/object/property-helper-devel.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/key.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <cstring>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-field-devel.h>
-#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/controls/text-controls/text-field-property-handler.h>
+#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/text/rendering/text-backend.h>
 #include <dali-toolkit/internal/text/text-effects-style.h>
@@ -48,6 +50,10 @@
 
 using namespace Dali::Toolkit::Text;
 
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gTextFieldLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS");
+#endif
+
 namespace Dali
 {
 namespace Toolkit
@@ -56,11 +62,8 @@ namespace Internal
 {
 namespace // unnamed namespace
 {
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS");
-#endif
-
 const unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::DevelText::DEFAULT_RENDERING_BACKEND;
+const char*        KEY_RETURN_NAME           = "Return";
 } // unnamed namespace
 
 namespace
@@ -135,10 +138,15 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "selectedTextStar
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "selectedTextEnd",                  INTEGER,   SELECTED_TEXT_END                   )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "enableEditing",                    BOOLEAN,   ENABLE_EDITING                      )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "fontSizeScale",                    FLOAT,     FONT_SIZE_SCALE                     )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "enableFontSizeScale",              BOOLEAN,   ENABLE_FONT_SIZE_SCALE              )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "primaryCursorPosition",            INTEGER,   PRIMARY_CURSOR_POSITION             )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "grabHandleColor",                  VECTOR4,   GRAB_HANDLE_COLOR                   )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "inputFilter",                      MAP,       INPUT_FILTER                        )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "ellipsisPosition",                 INTEGER,   ELLIPSIS_POSITION                   )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "strikethrough",                    MAP,       STRIKETHROUGH                       )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "inputStrikethrough",               MAP,       INPUT_STRIKETHROUGH                 )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "characterSpacing",                 FLOAT,     CHARACTER_SPACING                   )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextField, "selectionPopupStyle",              MAP,       SELECTION_POPUP_STYLE               )
 
 DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "textChanged",           SIGNAL_TEXT_CHANGED           )
 DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "maxLengthReached",      SIGNAL_MAX_LENGTH_REACHED     )
@@ -148,34 +156,64 @@ DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "inputFiltered",         SIGNAL_INP
 DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "cursorPositionChanged", SIGNAL_CURSOR_POSITION_CHANGED)
 DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "selectionChanged",      SIGNAL_SELECTION_CHANGED      )
 DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "selectionCleared",      SIGNAL_SELECTION_CLEARED      )
+DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "selectionStarted",      SIGNAL_SELECTION_STARTED      )
 
 DALI_TYPE_REGISTRATION_END()
 // clang-format on
 
-const char* const IMAGE_MAP_FILENAME_STRING = "filename";
-
-/// Retrieves a filename from a value that is a Property::Map
-std::string GetImageFileNameFromPropertyValue(const Property::Value& value)
+Toolkit::TextField::InputStyle::Mask ConvertInputStyle(Text::InputStyle::Mask inputStyleMask)
 {
-  std::string          filename;
-  const Property::Map* map = value.GetMap();
-  if(map)
+  Toolkit::TextField::InputStyle::Mask fieldInputStyleMask = Toolkit::TextField::InputStyle::NONE;
+
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_COLOR))
   {
-    const Property::Value* filenameValue = map->Find(IMAGE_MAP_FILENAME_STRING);
-    if(filenameValue)
-    {
-      filenameValue->Get(filename);
-    }
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::COLOR);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_FAMILY))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_FAMILY);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_POINT_SIZE))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::POINT_SIZE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WIDTH))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_SLANT))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_UNDERLINE))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::UNDERLINE);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_SHADOW))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::SHADOW);
+  }
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_EMBOSS))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::EMBOSS);
   }
-  return filename;
+  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_OUTLINE))
+  {
+    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::OUTLINE);
+  }
+  return fieldInputStyleMask;
 }
 
 } // namespace
 
-Toolkit::TextField TextField::New()
+Toolkit::TextField TextField::New(ControlBehaviour additionalBehaviour)
 {
   // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr<TextField> impl = new TextField();
+  IntrusivePtr<TextField> impl = new TextField(additionalBehaviour);
 
   // Pass ownership to CustomActor handle
   Toolkit::TextField handle(*impl);
@@ -191,606 +229,12 @@ void TextField::SetProperty(BaseObject* object, Property::Index index, const Pro
 {
   Toolkit::TextField textField = Toolkit::TextField::DownCast(Dali::BaseHandle(object));
 
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField SetProperty\n");
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField SetProperty\n");
 
   if(textField)
   {
-    TextField& impl(GetImpl(textField));
-    DALI_ASSERT_DEBUG(impl.mController && "No text contoller");
-    DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
-
-    switch(index)
-    {
-      case Toolkit::DevelTextField::Property::RENDERING_BACKEND:
-      {
-        int backend = value.Get<int>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend);
-
-#ifndef ENABLE_VECTOR_BASED_TEXT_RENDERING
-        if(DevelText::RENDERING_VECTOR_BASED == backend)
-        {
-          backend = TextAbstraction::BITMAP_GLYPH; // Fallback to bitmap-based rendering
-        }
-#endif
-        if(impl.mRenderingBackend != backend)
-        {
-          impl.mRenderingBackend = backend;
-          impl.mRenderer.Reset();
-
-          // When using the vector-based rendering, the size of the GLyphs are different
-          TextAbstraction::GlyphType glyphType = (DevelText::RENDERING_VECTOR_BASED == impl.mRenderingBackend) ? TextAbstraction::VECTOR_GLYPH : TextAbstraction::BITMAP_GLYPH;
-          impl.mController->SetGlyphType(glyphType);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::TEXT:
-      {
-        const std::string& text = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p TEXT %s\n", impl.mController.Get(), text.c_str());
-
-        impl.mController->SetText(text);
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER_TEXT:
-      {
-        const std::string& text = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str());
-
-        impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text);
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED:
-      {
-        const std::string& text = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_FOCUSED %s\n", impl.mController.Get(), text.c_str());
-
-        impl.mController->SetPlaceholderText(Controller::PLACEHOLDER_TYPE_ACTIVE, text);
-        break;
-      }
-      case Toolkit::TextField::Property::FONT_FAMILY:
-      {
-        const std::string& fontFamily = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
-        impl.mController->SetDefaultFontFamily(fontFamily);
-        break;
-      }
-      case Toolkit::TextField::Property::FONT_STYLE:
-      {
-        SetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextField::Property::POINT_SIZE:
-      {
-        const float pointSize = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p POINT_SIZE %f\n", impl.mController.Get(), pointSize);
-
-        if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE), pointSize))
-        {
-          impl.mController->SetDefaultFontSize(pointSize, Text::Controller::POINT_SIZE);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::MAX_LENGTH:
-      {
-        const int max = value.Get<int>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p MAX_LENGTH %d\n", impl.mController.Get(), max);
-
-        impl.mController->SetMaximumNumberOfCharacters(max);
-        break;
-      }
-      case Toolkit::TextField::Property::EXCEED_POLICY:
-      {
-        impl.mExceedPolicy = value.Get<int>();
-
-        if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == impl.mExceedPolicy)
-        {
-          impl.EnableClipping();
-        }
-        else
-        {
-          UnparentAndReset(impl.mStencil);
-        }
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT:
-      {
-        Text::HorizontalAlignment::Type alignment(static_cast<Text::HorizontalAlignment::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
-        if(GetHorizontalAlignmentEnumeration(value, alignment))
-        {
-          DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment);
-          impl.mController->SetHorizontalAlignment(alignment);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::VERTICAL_ALIGNMENT:
-      {
-        Toolkit::Text::VerticalAlignment::Type alignment(static_cast<Text::VerticalAlignment::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
-        if(GetVerticalAlignmentEnumeration(value, alignment))
-        {
-          impl.mController->SetVerticalAlignment(alignment);
-          DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p VERTICAL_ALIGNMENT %d\n", impl.mController.Get(), alignment);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::TEXT_COLOR:
-      {
-        const Vector4& textColor = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
-
-        if(impl.mController->GetDefaultColor() != textColor)
-        {
-          impl.mController->SetDefaultColor(textColor);
-          impl.mController->SetInputColor(textColor);
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR:
-      {
-        const Vector4& textColor = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
-
-        if(impl.mController->GetPlaceholderTextColor() != textColor)
-        {
-          impl.mController->SetPlaceholderTextColor(textColor);
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR:
-      {
-        const Vector4& color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetCursorColor(PRIMARY_CURSOR, color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR:
-      {
-        const Vector4& color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetCursorColor(SECONDARY_CURSOR, color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK:
-      {
-        const bool enable = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable);
-
-        impl.mController->SetEnableCursorBlink(enable);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL:
-      {
-        const float interval = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval);
-
-        impl.mDecorator->SetCursorBlinkInterval(interval);
-        break;
-      }
-      case Toolkit::TextField::Property::CURSOR_BLINK_DURATION:
-      {
-        const float duration = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration);
-
-        impl.mDecorator->SetCursorBlinkDuration(duration);
-        break;
-      }
-      case Toolkit::TextField::Property::CURSOR_WIDTH:
-      {
-        const int width = value.Get<int>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p CURSOR_WIDTH %d\n", impl.mController.Get(), width);
-
-        impl.mDecorator->SetCursorWidth(width);
-        impl.mController->GetLayoutEngine().SetCursorWidth(width);
-        break;
-      }
-      case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE:
-      {
-        const std::string imageFileName = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
-
-        if(imageFileName.size())
-        {
-          impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED, imageFileName);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE:
-      {
-        const std::string imageFileName = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
-
-        if(imageFileName.size())
-        {
-          impl.mDecorator->SetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED, imageFileName);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SCROLL_THRESHOLD:
-      {
-        const float threshold = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold);
-
-        impl.mDecorator->SetScrollThreshold(threshold);
-        break;
-      }
-      case Toolkit::TextField::Property::SCROLL_SPEED:
-      {
-        const float speed = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField %p SCROLL_SPEED %f\n", impl.mController.Get(), speed);
-
-        impl.mDecorator->SetScrollSpeed(speed);
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
-      {
-        const std::string filename = GetImageFileNameFromPropertyValue(value);
-
-        if(filename.size())
-        {
-          impl.mDecorator->SetHandleImage(RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED, filename);
-          impl.RequestTextRelayout();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR:
-      {
-        const Vector4 color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetHighlightColor(color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX:
-      {
-        const Rect<int> box = value.Get<Rect<int> >();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height);
-
-        impl.mDecorator->SetBoundingBox(box);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          impl.mInputMethodOptions.ApplyProperty(*map);
-        }
-        impl.mController->SetInputModePassword(impl.mInputMethodOptions.IsPassword());
-
-        Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
-        if(control == textField)
-        {
-          impl.mInputMethodContext.ApplyOptions(impl.mInputMethodOptions);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_COLOR:
-      {
-        const Vector4 inputColor = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a);
-
-        impl.mController->SetInputColor(inputColor);
-        break;
-      }
-      case Toolkit::TextField::Property::ENABLE_MARKUP:
-      {
-        const bool enableMarkup = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup);
-
-        impl.mController->SetMarkupProcessorEnabled(enableMarkup);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_FONT_FAMILY:
-      {
-        const std::string& fontFamily = value.Get<std::string>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
-        impl.mController->SetInputFontFamily(fontFamily);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_FONT_STYLE:
-      {
-        SetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_POINT_SIZE:
-      {
-        const float pointSize = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize);
-        impl.mController->SetInputFontPointSize(pointSize);
-        break;
-      }
-      case Toolkit::TextField::Property::UNDERLINE:
-      {
-        const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_UNDERLINE:
-      {
-        const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::SHADOW:
-      {
-        const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_SHADOW:
-      {
-        const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::EMBOSS:
-      {
-        const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_EMBOSS:
-      {
-        const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::OUTLINE:
-      {
-        const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_OUTLINE:
-      {
-        const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        if(update)
-        {
-          impl.mRenderer.Reset();
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          impl.mController->SetHiddenInputOption(*map);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::PIXEL_SIZE:
-      {
-        const float pixelSize = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize);
-
-        if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE), pixelSize))
-        {
-          impl.mController->SetDefaultFontSize(pixelSize, Text::Controller::PIXEL_SIZE);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::ENABLE_SELECTION:
-      {
-        const bool enableSelection = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection);
-        impl.mController->SetSelectionEnabled(enableSelection);
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          impl.mController->SetPlaceholderProperty(*map);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::ELLIPSIS:
-      {
-        const bool ellipsis = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ELLIPSIS %d\n", impl.mController.Get(), ellipsis);
-
-        impl.mController->SetTextElideEnabled(ellipsis);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_SHIFT_SELECTION:
-      {
-        const bool shiftSelection = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection);
-
-        impl.mController->SetShiftSelectionEnabled(shiftSelection);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE:
-      {
-        const bool grabHandleEnabled = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled);
-
-        impl.mController->SetGrabHandleEnabled(grabHandleEnabled);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
-      {
-        impl.mController->SetMatchLayoutDirection(value.Get<bool>() ? DevelText::MatchLayoutDirection::LOCALE : DevelText::MatchLayoutDirection::CONTENTS);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP:
-      {
-        const bool grabHandlePopupEnabled = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE_POPUP %d\n", impl.mController.Get(), grabHandlePopupEnabled);
-
-        impl.mController->SetGrabHandlePopupEnabled(grabHandlePopupEnabled);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::BACKGROUND:
-      {
-        const Vector4 backgroundColor = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p BACKGROUND %f,%f,%f,%f\n", impl.mController.Get(), backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a);
-
-        impl.mController->SetBackgroundEnabled(true);
-        impl.mController->SetBackgroundColor(backgroundColor);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::SELECTED_TEXT_START:
-      {
-        uint32_t start = static_cast<uint32_t>(value.Get<int>());
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start);
-        impl.SetTextSelectionRange(&start, nullptr);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::SELECTED_TEXT_END:
-      {
-        uint32_t end = static_cast<uint32_t>(value.Get<int>());
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end);
-        impl.SetTextSelectionRange(nullptr, &end);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_EDITING:
-      {
-        const bool editable = value.Get<bool>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p ENABLE_EDITING %d\n", impl.mController.Get(), editable);
-        impl.SetEditable(editable);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::FONT_SIZE_SCALE:
-      {
-        const float scale = value.Get<float>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p FONT_SIZE_SCALE %f\n", impl.mController.Get(), scale);
-
-        if(!Equals(impl.mController->GetFontSizeScale(), scale))
-        {
-          impl.mController->SetFontSizeScale(scale);
-        }
-        break;
-      }
-      case Toolkit::DevelTextField::Property::PRIMARY_CURSOR_POSITION:
-      {
-        uint32_t position = static_cast<uint32_t>(value.Get<int>());
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_POSITION %d\n", impl.mController.Get(), position);
-        if(impl.mController->SetPrimaryCursorPosition(position, impl.HasKeyInputFocus()))
-        {
-          impl.SetKeyInputFocus();
-        }
-        break;
-      }
-      case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR:
-      {
-        const Vector4 color = value.Get<Vector4>();
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p GRAB_HANDLE_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
-
-        impl.mDecorator->SetHandleColor(color);
-        impl.RequestTextRelayout();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::INPUT_FILTER:
-      {
-        const Property::Map* map = value.GetMap();
-        if(map)
-        {
-          impl.mController->SetInputFilterOption(*map);
-        }
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ELLIPSIS_POSITION:
-      {
-        DevelText::EllipsisPosition::Type ellipsisPositionType(static_cast<DevelText::EllipsisPosition::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
-        if(GetEllipsisPositionTypeEnumeration(value, ellipsisPositionType))
-        {
-          DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p EllipsisPosition::Type %d\n", impl.mController.Get(), ellipsisPositionType);
-          impl.mController->SetEllipsisPosition(ellipsisPositionType);
-        }
-        break;
-      }
-    } // switch
-  }   // textfield
+    PropertyHandler::SetProperty(textField, index, value);
+  }
 }
 
 Property::Value TextField::GetProperty(BaseObject* object, Property::Index index)
@@ -801,362 +245,7 @@ Property::Value TextField::GetProperty(BaseObject* object, Property::Index index
 
   if(textField)
   {
-    TextField& impl(GetImpl(textField));
-    DALI_ASSERT_DEBUG(impl.mController && "No text contoller");
-    DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
-
-    switch(index)
-    {
-      case Toolkit::DevelTextField::Property::RENDERING_BACKEND:
-      {
-        value = impl.mRenderingBackend;
-        break;
-      }
-      case Toolkit::TextField::Property::TEXT:
-      {
-        std::string text;
-        impl.mController->GetText(text);
-        DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p returning text: %s\n", impl.mController.Get(), text.c_str());
-        value = text;
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER_TEXT:
-      {
-        std::string text;
-        impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_INACTIVE, text);
-        value = text;
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED:
-      {
-        std::string text;
-        impl.mController->GetPlaceholderText(Controller::PLACEHOLDER_TYPE_ACTIVE, text);
-        value = text;
-        break;
-      }
-      case Toolkit::TextField::Property::FONT_FAMILY:
-      {
-        value = impl.mController->GetDefaultFontFamily();
-        break;
-      }
-      case Toolkit::TextField::Property::FONT_STYLE:
-      {
-        GetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextField::Property::POINT_SIZE:
-      {
-        value = impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE);
-        break;
-      }
-      case Toolkit::TextField::Property::MAX_LENGTH:
-      {
-        value = impl.mController->GetMaximumNumberOfCharacters();
-        break;
-      }
-      case Toolkit::TextField::Property::EXCEED_POLICY:
-      {
-        value = impl.mExceedPolicy;
-        break;
-      }
-      case Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT:
-      {
-        const char* name = Text::GetHorizontalAlignmentString(impl.mController->GetHorizontalAlignment());
-
-        if(name)
-        {
-          value = std::string(name);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::VERTICAL_ALIGNMENT:
-      {
-        const char* name = Text::GetVerticalAlignmentString(impl.mController->GetVerticalAlignment());
-
-        if(name)
-        {
-          value = std::string(name);
-        }
-        break;
-      }
-      case Toolkit::TextField::Property::TEXT_COLOR:
-      {
-        value = impl.mController->GetDefaultColor();
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR:
-      {
-        value = impl.mController->GetPlaceholderTextColor();
-        break;
-      }
-      case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR:
-      {
-        value = impl.mDecorator->GetColor(PRIMARY_CURSOR);
-        break;
-      }
-      case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR:
-      {
-        value = impl.mDecorator->GetColor(SECONDARY_CURSOR);
-        break;
-      }
-      case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK:
-      {
-        value = impl.mController->GetEnableCursorBlink();
-        break;
-      }
-      case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL:
-      {
-        value = impl.mDecorator->GetCursorBlinkInterval();
-        break;
-      }
-      case Toolkit::TextField::Property::CURSOR_BLINK_DURATION:
-      {
-        value = impl.mDecorator->GetCursorBlinkDuration();
-        break;
-      }
-      case Toolkit::TextField::Property::CURSOR_WIDTH:
-      {
-        value = impl.mDecorator->GetCursorWidth();
-        break;
-      }
-      case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE:
-      {
-        value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE:
-      {
-        value = impl.mDecorator->GetHandleImage(GRAB_HANDLE, HANDLE_IMAGE_PRESSED);
-        break;
-      }
-      case Toolkit::TextField::Property::SCROLL_THRESHOLD:
-      {
-        value = impl.mDecorator->GetScrollThreshold();
-        break;
-      }
-      case Toolkit::TextField::Property::SCROLL_SPEED:
-      {
-        value = impl.mDecorator->GetScrollSpeed();
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT:
-      {
-        impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT:
-      {
-        impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
-      {
-        impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED);
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
-      {
-        impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE, HANDLE_IMAGE_PRESSED);
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
-      {
-        impl.GetHandleImagePropertyValue(value, LEFT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
-      {
-        impl.GetHandleImagePropertyValue(value, RIGHT_SELECTION_HANDLE_MARKER, HANDLE_IMAGE_RELEASED);
-        break;
-      }
-      case Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR:
-      {
-        value = impl.mDecorator->GetHighlightColor();
-        break;
-      }
-      case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX:
-      {
-        Rect<int> boundingBox;
-        impl.mDecorator->GetBoundingBox(boundingBox);
-        value = boundingBox;
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS:
-      {
-        Property::Map map;
-        impl.mInputMethodOptions.RetrieveProperty(map);
-        value = map;
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_COLOR:
-      {
-        value = impl.mController->GetInputColor();
-        break;
-      }
-      case Toolkit::TextField::Property::ENABLE_MARKUP:
-      {
-        value = impl.mController->IsMarkupProcessorEnabled();
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_FONT_FAMILY:
-      {
-        value = impl.mController->GetInputFontFamily();
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_FONT_STYLE:
-      {
-        GetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_POINT_SIZE:
-      {
-        value = impl.mController->GetInputFontPointSize();
-        break;
-      }
-      case Toolkit::TextField::Property::UNDERLINE:
-      {
-        GetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_UNDERLINE:
-      {
-        GetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextField::Property::SHADOW:
-      {
-        GetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_SHADOW:
-      {
-        GetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextField::Property::EMBOSS:
-      {
-        GetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_EMBOSS:
-      {
-        GetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextField::Property::OUTLINE:
-      {
-        GetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
-        break;
-      }
-      case Toolkit::TextField::Property::INPUT_OUTLINE:
-      {
-        GetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
-        break;
-      }
-      case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS:
-      {
-        Property::Map map;
-        impl.mController->GetHiddenInputOption(map);
-        value = map;
-        break;
-      }
-      case Toolkit::TextField::Property::PIXEL_SIZE:
-      {
-        value = impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE);
-        break;
-      }
-      case Toolkit::TextField::Property::ENABLE_SELECTION:
-      {
-        value = impl.mController->IsSelectionEnabled();
-        break;
-      }
-      case Toolkit::TextField::Property::PLACEHOLDER:
-      {
-        Property::Map map;
-        impl.mController->GetPlaceholderProperty(map);
-        value = map;
-        break;
-      }
-      case Toolkit::TextField::Property::ELLIPSIS:
-      {
-        value = impl.mController->IsTextElideEnabled();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_SHIFT_SELECTION:
-      {
-        value = impl.mController->IsShiftSelectionEnabled();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE:
-      {
-        value = impl.mController->IsGrabHandleEnabled();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
-      {
-        value = impl.mController->GetMatchLayoutDirection() != DevelText::MatchLayoutDirection::CONTENTS;
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP:
-      {
-        value = impl.mController->IsGrabHandlePopupEnabled();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::BACKGROUND:
-      {
-        value = impl.mController->GetBackgroundColor();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::SELECTED_TEXT:
-      {
-        value = impl.mController->GetSelectedText();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::SELECTED_TEXT_START:
-      {
-        Uint32Pair range = impl.GetTextSelectionRange();
-        value            = static_cast<int>(range.first);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::SELECTED_TEXT_END:
-      {
-        Uint32Pair range = impl.GetTextSelectionRange();
-        value            = static_cast<int>(range.second);
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ENABLE_EDITING:
-      {
-        value = impl.IsEditable();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::FONT_SIZE_SCALE:
-      {
-        value = impl.mController->GetFontSizeScale();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::PRIMARY_CURSOR_POSITION:
-      {
-        value = static_cast<int>(impl.mController->GetPrimaryCursorPosition());
-        break;
-      }
-      case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR:
-      {
-        value = impl.mDecorator->GetHandleColor();
-        break;
-      }
-      case Toolkit::DevelTextField::Property::INPUT_FILTER:
-      {
-        Property::Map map;
-        impl.mController->GetInputFilterOption(map);
-        value = map;
-        break;
-      }
-      case Toolkit::DevelTextField::Property::ELLIPSIS_POSITION:
-      {
-        value = impl.mController->GetEllipsisPosition();
-        break;
-      }
-    } //switch
+    value = PropertyHandler::GetProperty(textField, index);
   }
 
   return value;
@@ -1310,6 +399,14 @@ bool TextField::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface*
       fieldImpl.SelectionClearedSignal().Connect(tracker, functor);
     }
   }
+  else if(0 == strcmp(signalName.c_str(), SIGNAL_SELECTION_STARTED))
+  {
+    if(field)
+    {
+      Internal::TextField& fieldImpl(GetImpl(field));
+      fieldImpl.SelectionStartedSignal().Connect(tracker, functor);
+    }
+  }
   else
   {
     // signalName does not match any signal
@@ -1359,6 +456,16 @@ DevelTextField::SelectionClearedSignalType& TextField::SelectionClearedSignal()
   return mSelectionClearedSignal;
 }
 
+DevelTextField::SelectionStartedSignalType& TextField::SelectionStartedSignal()
+{
+  return mSelectionStartedSignal;
+}
+
+void TextField::OnAccessibilityStatusChanged()
+{
+  CommonTextUtils::SynchronizeTextAnchorsInParent(Self(), mController, mAnchorActors);
+}
+
 void TextField::OnInitialize()
 {
   Actor self = Self();
@@ -1423,9 +530,6 @@ void TextField::OnInitialize()
   self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT);
   self.OnSceneSignal().Connect(this, &TextField::OnSceneConnect);
 
-  //Enable highightability
-  self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
-
   DevelControl::SetInputMethodContext(*this, mInputMethodContext);
 
   if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy)
@@ -1433,21 +537,28 @@ void TextField::OnInitialize()
     EnableClipping();
   }
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::ENTRY));
-  });
+  // Accessibility
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::ENTRY);
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+
+  Accessibility::Bridge::EnabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged);
+  Accessibility::Bridge::DisabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged);
+}
+
+DevelControl::ControlAccessible* TextField::CreateAccessibleObject()
+{
+  return new TextFieldAccessible(Self());
 }
 
 void TextField::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnStyleChange\n");
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnStyleChange\n");
 
   switch(change)
   {
     case StyleChange::DEFAULT_FONT_CHANGE:
     {
-      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnStyleChange DEFAULT_FONT_CHANGE\n");
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnStyleChange DEFAULT_FONT_CHANGE\n");
       const std::string& newFont = GetImpl(styleManager).GetDefaultFontFamily();
       // Property system did not set the font so should update it.
       mController->UpdateAfterFontChange(newFont);
@@ -1491,17 +602,42 @@ float TextField::GetHeightForWidth(float width)
   return mController->GetHeightForWidth(width) + padding.top + padding.bottom;
 }
 
-void TextField::ResizeActor(Actor& actor, const Vector2& size)
+void TextField::ResizeActor(Actor& actor, const Vector2& size)
+{
+  if(actor.GetProperty<Vector3>(Dali::Actor::Property::SIZE).GetVectorXY() != size)
+  {
+    actor.SetProperty(Actor::Property::SIZE, size);
+  }
+}
+
+void TextField::OnPropertySet(Property::Index index, const Property::Value& propertyValue)
 {
-  if(actor.GetProperty<Vector3>(Dali::Actor::Property::SIZE).GetVectorXY() != size)
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnPropertySet index[%d]\n", index);
+
+  switch(index)
   {
-    actor.SetProperty(Actor::Property::SIZE, size);
+    case DevelActor::Property::USER_INTERACTION_ENABLED:
+    {
+      const bool enabled = propertyValue.Get<bool>();
+      mController->SetUserInteractionEnabled(enabled);
+      if(mStencil)
+      {
+        float opacity = enabled ? 1.0f : mController->GetDisabledColorOpacity();
+        mStencil.SetProperty(Actor::Property::OPACITY, opacity);
+      }
+      break;
+    }
+    default:
+    {
+      Control::OnPropertySet(index, propertyValue); // up call to control for non-handled properties
+      break;
+    }
   }
 }
 
 void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField OnRelayout\n");
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField OnRelayout\n");
 
   Actor self = Self();
 
@@ -1528,6 +664,16 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container)
     mActiveLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top));
     ResizeActor(mActiveLayer, contentSize);
   }
+  if(mCursorLayer)
+  {
+    if(!mStencil)
+    {
+      // If there is a stencil, the cursor layer is added to the stencil in RenderText.
+      // Do not calculate the position because the stencil has already been resized excluding the padding size.
+      mCursorLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top));
+    }
+    ResizeActor(mCursorLayer, contentSize);
+  }
 
   // If there is text changed, callback is called.
   if(mTextChanged)
@@ -1540,12 +686,12 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container)
   if((Text::Controller::NONE_UPDATED != updateTextType) ||
      !mRenderer)
   {
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnRelayout %p Displaying new contents\n", mController.Get());
+    DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnRelayout %p Displaying new contents\n", mController.Get());
 
     if(mDecorator &&
        (Text::Controller::NONE_UPDATED != (Text::Controller::DECORATOR_UPDATED & updateTextType)))
     {
-      mDecorator->Relayout(contentSize);
+      mDecorator->Relayout(contentSize, container);
     }
 
     if(!mRenderer)
@@ -1561,6 +707,11 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container)
     EmitCursorPositionChangedSignal();
   }
 
+  if(mSelectionStarted)
+  {
+    EmitSelectionStartedSignal();
+  }
+
   if(mSelectionChanged)
   {
     EmitSelectionChangedSignal();
@@ -1577,17 +728,7 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container)
   // The text-field adds an idle callback to the adaptor to emit the signals after the size negotiation.
   if(!mController->IsInputStyleChangedSignalsQueueEmpty())
   {
-    if(Adaptor::IsAvailable())
-    {
-      Adaptor& adaptor = Adaptor::Get();
-
-      if(NULL == mIdleCallback)
-      {
-        // @note: The callback manager takes the ownership of the callback object.
-        mIdleCallback = MakeCallback(this, &TextField::OnIdleSignal);
-        adaptor.AddIdle(mIdleCallback, false);
-      }
-    }
+    mController->RequestProcessInputStyleChangedSignals();
   }
 }
 
@@ -1598,106 +739,12 @@ Text::ControllerPtr TextField::GetTextController()
 
 void TextField::RenderText(Text::Controller::UpdateTextType updateTextType)
 {
-  Actor renderableActor;
-
-  if(Text::Controller::NONE_UPDATED != (Text::Controller::MODEL_UPDATED & updateTextType))
-  {
-    if(mRenderer)
-    {
-      Dali::Toolkit::TextField handle = Dali::Toolkit::TextField(GetOwner());
-
-      renderableActor = mRenderer->Render(mController->GetView(),
-                                          handle,
-                                          Property::INVALID_INDEX, // Animatable property not supported
-                                          mAlignmentOffset,
-                                          DepthIndex::CONTENT);
-    }
-
-    if(renderableActor != mRenderableActor)
-    {
-      UnparentAndReset(mBackgroundActor);
-      UnparentAndReset(mRenderableActor);
-      mRenderableActor = renderableActor;
-
-      if(mRenderableActor)
-      {
-        mBackgroundActor = mController->CreateBackgroundActor();
-      }
-    }
-  }
-
-  if(mRenderableActor)
-  {
-    const Vector2& scrollOffset = mController->GetTextModel()->GetScrollPosition();
-
-    float renderableActorPositionX, renderableActorPositionY;
-
-    if(mStencil)
-    {
-      renderableActorPositionX = scrollOffset.x + mAlignmentOffset;
-      renderableActorPositionY = scrollOffset.y;
-    }
-    else
-    {
-      Extents padding;
-      padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
-
-      // Support Right-To-Left of padding
-      Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
-      if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
-      {
-        std::swap(padding.start, padding.end);
-      }
-
-      renderableActorPositionX = scrollOffset.x + mAlignmentOffset + padding.start;
-      renderableActorPositionY = scrollOffset.y + padding.top;
-    }
-
-    mRenderableActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY));
-
-    // Make sure the actors are parented correctly with/without clipping
-    Actor self = mStencil ? mStencil : Self();
-
-    Actor highlightActor;
-
-    for(std::vector<Actor>::iterator it    = mClippingDecorationActors.begin(),
-                                     endIt = mClippingDecorationActors.end();
-        it != endIt;
-        ++it)
-    {
-      self.Add(*it);
-      it->LowerToBottom();
-
-      if(it->GetProperty<std::string>(Dali::Actor::Property::NAME) == "HighlightActor")
-      {
-        highlightActor = *it;
-      }
-    }
-    mClippingDecorationActors.clear();
-
-    self.Add(mRenderableActor);
-
-    if(mBackgroundActor)
-    {
-      if(mDecorator && mDecorator->IsHighlightVisible())
-      {
-        self.Add(mBackgroundActor);
-        mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(renderableActorPositionX, renderableActorPositionY)); // In text field's coords.
-        mBackgroundActor.LowerBelow(highlightActor);
-      }
-      else
-      {
-        mRenderableActor.Add(mBackgroundActor);
-        mBackgroundActor.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); // In renderable actor's coords.
-        mBackgroundActor.LowerToBottom();
-      }
-    }
-  }
+  CommonTextUtils::RenderText(Self(), mRenderer, mController, mDecorator, mAlignmentOffset, mRenderableActor, mBackgroundActor, mCursorLayer, mStencil, mClippingDecorationActors, mAnchorActors, updateTextType);
 }
 
 void TextField::OnKeyInputFocusGained()
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get());
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get());
   if(mInputMethodContext && IsEditable())
   {
     // All input panel properties, such as layout, return key type, and input hint, should be set before input panel activates (or shows).
@@ -1714,21 +761,18 @@ void TextField::OnKeyInputFocusGained()
     // When window gain lost focus, the inputMethodContext is deactivated. Thus when window gain focus again, the inputMethodContext must be activated.
     mInputMethodContext.SetRestoreAfterFocusLost(true);
   }
-  ClipboardEventNotifier notifier(ClipboardEventNotifier::Get());
 
-  if(notifier)
+  if(IsEditable() && mController->IsUserInteractionEnabled())
   {
-    notifier.ContentSelectedSignal().Connect(this, &TextField::OnClipboardTextSelected);
+    mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event
   }
 
-  mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event
-
   EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last.
 }
 
 void TextField::OnKeyInputFocusLost()
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get());
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField:OnKeyInputFocusLost %p\n", mController.Get());
   if(mInputMethodContext)
   {
     mInputMethodContext.StatusChangedSignal().Disconnect(this, &TextField::KeyboardStatusChanged);
@@ -1740,12 +784,6 @@ void TextField::OnKeyInputFocusLost()
 
     mInputMethodContext.EventReceivedSignal().Disconnect(this, &TextField::OnInputMethodContextEvent);
   }
-  ClipboardEventNotifier notifier(ClipboardEventNotifier::Get());
-
-  if(notifier)
-  {
-    notifier.ContentSelectedSignal().Disconnect(this, &TextField::OnClipboardTextSelected);
-  }
 
   mController->KeyboardFocusLostEvent();
 
@@ -1760,11 +798,8 @@ bool TextField::OnAccessibilityActivated()
 
 void TextField::OnTap(const TapGesture& gesture)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get());
-  if(mInputMethodContext && IsEditable())
-  {
-    mInputMethodContext.Activate();
-  }
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get());
+
   // Deliver the tap before the focus event to controller; this allows us to detect when focus is gained due to tap-gestures
   Extents padding;
   padding                   = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
@@ -1772,12 +807,21 @@ void TextField::OnTap(const TapGesture& gesture)
   mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top);
   mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top);
 
+  Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+  if(keyboardFocusManager)
+  {
+    keyboardFocusManager.SetCurrentFocusActor(Self());
+  }
   SetKeyInputFocus();
 }
 
 void TextField::OnPan(const PanGesture& gesture)
 {
   mController->PanEvent(gesture.GetState(), gesture.GetDisplacement());
+  if(gesture.GetState() == GestureState::STARTED && !mController->IsScrollable(gesture.GetDisplacement()))
+  {
+    Dali::DevelActor::SetNeedGesturePropagation(Self(), true);
+  }
 }
 
 void TextField::OnLongPress(const LongPressGesture& gesture)
@@ -1796,19 +840,24 @@ void TextField::OnLongPress(const LongPressGesture& gesture)
 
 bool TextField::OnKeyEvent(const KeyEvent& event)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode());
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnKeyEvent %p keyCode %d\n", mController.Get(), event.GetKeyCode());
 
   if(Dali::DALI_KEY_ESCAPE == event.GetKeyCode() && mController->ShouldClearFocusOnEscape())
   {
     // Make sure ClearKeyInputFocus when only key is up
     if(event.GetState() == KeyEvent::UP)
     {
+      Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+      if(keyboardFocusManager)
+      {
+        keyboardFocusManager.ClearFocus();
+      }
       ClearKeyInputFocus();
     }
 
     return true;
   }
-  else if(Dali::DevelKey::DALI_KEY_RETURN == event.GetKeyCode())
+  else if(Dali::DevelKey::DALI_KEY_RETURN == event.GetKeyCode() && KEY_RETURN_NAME == event.GetKeyName())
   {
     // Do nothing when enter is comming.
     return false;
@@ -1838,25 +887,28 @@ void TextField::SetEditable(bool editable)
 
 void TextField::TextInserted(unsigned int position, unsigned int length, const std::string& content)
 {
-  if(Accessibility::IsUp())
+  auto accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
   {
-    Control::Impl::GetAccessibilityObject(Self())->EmitTextInserted(position, length, content);
+    accessible->EmitTextInserted(position, length, content);
   }
 }
 
 void TextField::TextDeleted(unsigned int position, unsigned int length, const std::string& content)
 {
-  if(Accessibility::IsUp())
+  auto accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
   {
-    Control::Impl::GetAccessibilityObject(Self())->EmitTextDeleted(position, length, content);
+    accessible->EmitTextDeleted(position, length, content);
   }
 }
 
 void TextField::CursorPositionChanged(unsigned int oldPosition, unsigned int newPosition)
 {
-  if(Accessibility::IsUp())
+  auto accessible = GetAccessibleObject();
+  if(DALI_LIKELY(accessible))
   {
-    Control::Impl::GetAccessibilityObject(Self())->EmitTextCursorMoved(newPosition);
+    accessible->EmitTextCursorMoved(newPosition);
   }
 
   if((oldPosition != newPosition) && !mCursorPositionChanged)
@@ -1894,51 +946,7 @@ void TextField::MaxLengthReached()
 void TextField::InputStyleChanged(Text::InputStyle::Mask inputStyleMask)
 {
   Dali::Toolkit::TextField handle(GetOwner());
-
-  Toolkit::TextField::InputStyle::Mask fieldInputStyleMask = Toolkit::TextField::InputStyle::NONE;
-
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_COLOR))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::COLOR);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_FAMILY))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_FAMILY);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_POINT_SIZE))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::POINT_SIZE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WEIGHT))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_WIDTH))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_FONT_SLANT))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::FONT_STYLE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_UNDERLINE))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::UNDERLINE);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_SHADOW))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::SHADOW);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_EMBOSS))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::EMBOSS);
-  }
-  if(InputStyle::NONE != static_cast<InputStyle::Mask>(inputStyleMask & InputStyle::INPUT_OUTLINE))
-  {
-    fieldInputStyleMask = static_cast<Toolkit::TextField::InputStyle::Mask>(fieldInputStyleMask | Toolkit::TextField::InputStyle::OUTLINE);
-  }
-
-  mInputStyleChangedSignal.Emit(handle, fieldInputStyleMask);
+  mInputStyleChangedSignal.Emit(handle, ConvertInputStyle(inputStyleMask));
 }
 
 void TextField::AnchorClicked(const std::string& href)
@@ -1974,6 +982,13 @@ void TextField::EmitSelectionClearedSignal()
   mSelectionCleared = false;
 }
 
+void TextField::EmitSelectionStartedSignal()
+{
+  Dali::Toolkit::TextField handle(GetOwner());
+  mSelectionStartedSignal.Emit(handle);
+  mSelectionStarted = false;
+}
+
 void TextField::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t newStart, uint32_t newEnd)
 {
   if(((oldStart != newStart) || (oldEnd != newEnd)) && !mSelectionChanged)
@@ -1982,6 +997,13 @@ void TextField::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t ne
     {
       mSelectionCleared = true;
     }
+    else
+    {
+      if(oldStart == oldEnd)
+      {
+        mSelectionStarted = true;
+      }
+    }
 
     mSelectionChanged  = true;
     mOldSelectionStart = oldStart;
@@ -1997,7 +1019,7 @@ void TextField::SelectionChanged(uint32_t oldStart, uint32_t oldEnd, uint32_t ne
   }
 }
 
-void TextField::AddDecoration(Actor& actor, bool needsClipping)
+void TextField::AddDecoration(Actor& actor, DecorationType type, bool needsClipping)
 {
   if(actor)
   {
@@ -2005,16 +1027,27 @@ void TextField::AddDecoration(Actor& actor, bool needsClipping)
     {
       mClippingDecorationActors.push_back(actor);
     }
-    else
+
+    // If the actor is a layer type, add it.
+    if(type == DecorationType::ACTIVE_LAYER)
+    {
+      AddLayer(mActiveLayer, actor);
+    }
+    else if(type == DecorationType::CURSOR_LAYER)
     {
-      actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-      actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-      Self().Add(actor);
-      mActiveLayer = actor;
+      AddLayer(mCursorLayer, actor);
     }
   }
 }
 
+void TextField::AddLayer(Actor& layer, Actor& actor)
+{
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  Self().Add(actor);
+  layer = actor;
+}
+
 void TextField::GetControlBackgroundColor(Vector4& color) const
 {
   Property::Value propValue = Self().GetProperty(Toolkit::Control::Property::BACKGROUND);
@@ -2041,7 +1074,7 @@ void TextField::OnSceneConnect(Dali::Actor actor)
 
 InputMethodContext::CallbackData TextField::OnInputMethodContextEvent(Dali::InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName);
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnInputMethodContextEvent %p eventName %d\n", mController.Get(), inputMethodContextEvent.eventName);
   return mController->OnInputMethodContextEvent(inputMethodContext, inputMethodContextEvent);
 }
 
@@ -2050,8 +1083,9 @@ void TextField::GetHandleImagePropertyValue(Property::Value& value, Text::Handle
   if(mDecorator)
   {
     Property::Map map;
-    map[IMAGE_MAP_FILENAME_STRING] = mDecorator->GetHandleImage(handleType, handleImageType);
-    value                          = map;
+    map[PropertyHandler::IMAGE_MAP_FILENAME_STRING] = mDecorator->GetHandleImage(handleType, handleImageType);
+
+    value = map;
   }
 }
 
@@ -2063,6 +1097,7 @@ void TextField::EnableClipping()
     mStencil = Control::New();
     mStencil.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
     mStencil.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+    mStencil.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN, true);
 
     // Creates a background visual. Even if the color is transparent it updates the stencil.
     mStencil.SetProperty(Toolkit::Control::Property::BACKGROUND,
@@ -2076,14 +1111,9 @@ void TextField::EnableClipping()
   }
 }
 
-void TextField::OnClipboardTextSelected(ClipboardEventNotifier& clipboard)
-{
-  mController->PasteClipboardItemEvent();
-}
-
 void TextField::KeyboardStatusChanged(bool keyboardShown)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown);
+  DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown);
 
   // Just hide the grab handle when keyboard is hidden.
   if(!keyboardShown)
@@ -2117,18 +1147,8 @@ void TextField::OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type
   mController->ChangedLayoutDirection();
 }
 
-void TextField::OnIdleSignal()
-{
-  // Emits the change of input style signals.
-  mController->ProcessInputStyleChangedSignals();
-
-  // Set the pointer to null as the callback manager deletes the callback after execute it.
-  mIdleCallback = NULL;
-}
-
-TextField::TextField()
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
-  mIdleCallback(NULL),
+TextField::TextField(ControlBehaviour additionalBehaviour)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)),
   mAlignmentOffset(0.f),
   mRenderingBackend(DEFAULT_RENDERING_BACKEND),
   mExceedPolicy(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP),
@@ -2139,289 +1159,104 @@ TextField::TextField()
   mSelectionCleared(false),
   mOldPosition(0u),
   mOldSelectionStart(0u),
-  mOldSelectionEnd(0u)
+  mOldSelectionEnd(0u),
+  mSelectionStarted(false)
 {
 }
 
 TextField::~TextField()
 {
   UnparentAndReset(mStencil);
-
-  if((NULL != mIdleCallback) && Adaptor::IsAvailable())
-  {
-    Adaptor::Get().RemoveIdle(mIdleCallback);
-  }
-}
-
-std::string TextField::AccessibleImpl::GetName()
-{
-  auto self = Toolkit::TextField::DownCast(Self());
-  return self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-}
-
-std::string TextField::AccessibleImpl::GetText(size_t startOffset, size_t endOffset)
-{
-  if(endOffset <= startOffset)
-  {
-    return {};
-  }
-
-  auto self = Toolkit::TextField::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-
-  if(startOffset > text.size() || endOffset > text.size())
-  {
-    return {};
-  }
-
-  return text.substr(startOffset, endOffset - startOffset);
 }
 
-size_t TextField::AccessibleImpl::GetCharacterCount()
+Vector<Vector2> TextField::GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const
 {
-  auto self = Toolkit::TextField::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-
-  return text.size();
+  return mController->GetTextSize(startIndex, endIndex);
 }
 
-size_t TextField::AccessibleImpl::GetCursorOffset()
+Vector<Vector2> TextField::GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const
 {
-  auto self = Toolkit::TextField::DownCast(Self());
-  return Dali::Toolkit::GetImpl(self).GetTextController()->GetCursorPosition();
+  return mController->GetTextPosition(startIndex, endIndex);
 }
 
-bool TextField::AccessibleImpl::SetCursorOffset(size_t offset)
+Rect<float> TextField::GetLineBoundingRectangle(const uint32_t lineIndex) const
 {
-  auto self = Toolkit::TextField::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-  if(offset > text.size())
-  {
-    return false;
-  }
-
-  auto& selfImpl = Dali::Toolkit::GetImpl(self);
-  selfImpl.GetTextController()->ResetCursorPosition(offset);
-  selfImpl.RequestTextRelayout();
-
-  return true;
+  return mController->GetLineBoundingRectangle(lineIndex);
 }
 
-Dali::Accessibility::Range TextField::AccessibleImpl::GetTextAtOffset(
-  size_t offset, Dali::Accessibility::TextBoundary boundary)
+Rect<float> TextField::GetCharacterBoundingRectangle(const uint32_t charIndex) const
 {
-  auto self     = Toolkit::TextField::DownCast(Self());
-  auto text     = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-  auto textSize = text.size();
-
-  auto range = Dali::Accessibility::Range{};
-
-  switch(boundary)
-  {
-    case Dali::Accessibility::TextBoundary::CHARACTER:
-    {
-      if(offset < textSize)
-      {
-        range.content     = text[offset];
-        range.startOffset = offset;
-        range.endOffset   = offset + 1;
-      }
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::WORD:
-    case Dali::Accessibility::TextBoundary::LINE:
-    {
-      auto textString = text.c_str();
-      auto breaks     = std::vector<char>(textSize, 0);
-
-      if(boundary == Dali::Accessibility::TextBoundary::WORD)
-      {
-        Accessibility::Accessible::FindWordSeparationsUtf8(reinterpret_cast<const utf8_t*>(textString), textSize, "", breaks.data());
-      }
-      else
-      {
-        Accessibility::Accessible::FindLineSeparationsUtf8(reinterpret_cast<const utf8_t*>(textString), textSize, "", breaks.data());
-      }
-
-      auto index   = 0u;
-      auto counter = 0u;
-      while(index < textSize && counter <= offset)
-      {
-        auto start = index;
-        if(breaks[index])
-        {
-          while(breaks[index])
-          {
-            index++;
-          }
-          counter++;
-        }
-        else
-        {
-          if(boundary == Dali::Accessibility::TextBoundary::WORD)
-          {
-            index++;
-          }
-          if(boundary == Dali::Accessibility::TextBoundary::LINE)
-          {
-            counter++;
-          }
-        }
-
-        if((counter > 0) && ((counter - 1) == offset))
-        {
-          range.content     = text.substr(start, index - start + 1);
-          range.startOffset = start;
-          range.endOffset   = index + 1;
-        }
-
-        if(boundary == Dali::Accessibility::TextBoundary::LINE)
-        {
-          index++;
-        }
-      }
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::SENTENCE:
-    {
-      /* not supported by default */
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::PARAGRAPH:
-    {
-      /* Paragraph is not supported by libunibreak library */
-      break;
-    }
-    default:
-      break;
-  }
-
-  return range;
+  return mController->GetCharacterBoundingRectangle(charIndex);
 }
 
-Dali::Accessibility::Range TextField::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex)
+int TextField::GetCharacterIndexAtPosition(float visualX, float visualY) const
 {
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return {};
-  }
-
-  auto        self       = Toolkit::TextField::DownCast(Self());
-  auto        controller = Dali::Toolkit::GetImpl(self).GetTextController();
-  std::string value{};
-  controller->RetrieveSelection(value);
-  auto indices = controller->GetSelectionIndexes();
-
-  return {static_cast<size_t>(indices.first), static_cast<size_t>(indices.second), value};
+  return mController->GetCharacterIndexAtPosition(visualX, visualY);
 }
 
-bool TextField::AccessibleImpl::RemoveSelection(size_t selectionIndex)
+Rect<> TextField::GetTextBoundingRectangle(uint32_t startIndex, uint32_t endIndex) const
 {
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return false;
-  }
-
-  auto self = Toolkit::TextField::DownCast(Self());
-  Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(0, 0);
-  return true;
+  return mController->GetTextBoundingRectangle(startIndex, endIndex);
 }
 
-bool TextField::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
+void TextField::SetSpannedText(const Text::Spanned& spannedText)
 {
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return false;
-  }
-
-  auto self = Toolkit::TextField::DownCast(Self());
-  Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(startOffset, endOffset);
-  return true;
+  mController->SetSpannedText(spannedText);
 }
 
-bool TextField::AccessibleImpl::CopyText(size_t startPosition, size_t endPosition)
+std::string TextField::TextFieldAccessible::GetName() const
 {
-  if(endPosition <= startPosition)
+  if(IsHiddenInput())
   {
-    return false;
+    return {};
   }
 
-  auto self = Toolkit::TextField::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-  Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition));
-
-  return true;
+  return GetWholeText();
 }
 
-bool TextField::AccessibleImpl::CutText(size_t startPosition, size_t endPosition)
+const std::vector<Toolkit::TextAnchor>& TextField::TextFieldAccessible::GetTextAnchors() const
 {
-  if(endPosition <= startPosition)
-  {
-    return false;
-  }
-
   auto self = Toolkit::TextField::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-  Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition));
-
-  self.SetProperty(Toolkit::TextField::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition));
 
-  return true;
+  return Toolkit::GetImpl(self).mAnchorActors;
 }
 
-bool TextField::AccessibleImpl::DeleteText(size_t startPosition, size_t endPosition)
+Toolkit::Text::ControllerPtr TextField::TextFieldAccessible::GetTextController() const
 {
-  if(endPosition <= startPosition)
-  {
-    return false;
-  }
-
   auto self = Toolkit::TextField::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-
-  self.SetProperty(Toolkit::TextField::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition));
 
-  return true;
+  return Toolkit::GetImpl(self).GetTextController();
 }
 
-Dali::Accessibility::States TextField::AccessibleImpl::CalculateStates()
+std::uint32_t TextField::TextFieldAccessible::GetSubstituteCharacter() const
 {
-  using namespace Dali::Accessibility;
-
-  auto states = DevelControl::AccessibleImpl::CalculateStates();
+  auto self                = Toolkit::TextField::DownCast(Self());
+  auto hiddenInputSettings = self.GetProperty<Property::Map>(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS);
+  auto substChar           = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER);
 
-  states[State::EDITABLE]  = true;
-  states[State::FOCUSABLE] = true;
-
-  Toolkit::Control focusControl = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
-  if(mSelf == focusControl)
+  if(substChar)
   {
-    states[State::FOCUSED] = true;
+    return static_cast<std::uint32_t>(substChar->Get<int>());
   }
 
-  return states;
+  return TextControlAccessible::GetSubstituteCharacter();
 }
 
-bool TextField::AccessibleImpl::InsertText(size_t startPosition, std::string text)
+bool TextField::TextFieldAccessible::IsHiddenInput() const
 {
-  auto self         = Toolkit::TextField::DownCast(Self());
-  auto insertedText = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-
-  insertedText.insert(startPosition, text);
+  auto self                = Toolkit::TextField::DownCast(Self());
+  auto hiddenInputSettings = self.GetProperty<Property::Map>(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS);
+  auto mode                = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::MODE);
 
-  self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(insertedText));
-
-  return true;
+  return (mode && (mode->Get<int>() != Toolkit::HiddenInput::Mode::HIDE_NONE));
 }
 
-bool TextField::AccessibleImpl::SetTextContents(std::string newContents)
+void TextField::TextFieldAccessible::RequestTextRelayout()
 {
-  auto self = Toolkit::TextField::DownCast(Self());
-  self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(newContents));
-  return true;
+  auto  self     = Toolkit::TextField::DownCast(Self());
+  auto& selfImpl = Toolkit::GetImpl(self);
+
+  selfImpl.RequestTextRelayout();
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index 0472aa8..215fd10 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,21 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
 #include <dali/devel-api/adaptor-framework/input-method-context.h>
+#include <dali/devel-api/atspi-interfaces/editable-text.h>
+#include <dali/devel-api/atspi-interfaces/hypertext.h>
+#include <dali/devel-api/atspi-interfaces/text.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-field-devel.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-anchor-control-interface.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-selectable-control-interface.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -50,8 +53,9 @@ class TextField : public Control, public Text::ControlInterface, public Text::Ed
 public:
   /**
    * @copydoc Dali::Toollkit::TextField::New()
+   * @param[in] additionalBehaviour custom behavior flags for this TextField. Default is CONTROL_BEHAVIOUR_DEFAULT
    */
-  static Toolkit::TextField New();
+  static Toolkit::TextField New(ControlBehaviour additionalBehaviour = ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
 
   // Properties
 
@@ -136,6 +140,11 @@ public:
    */
   DevelTextField::SelectionClearedSignalType& SelectionClearedSignal();
 
+  /**
+   * @copydoc TextField::SelectionStartedSignal()
+   */
+  DevelTextField::SelectionStartedSignalType& SelectionStartedSignal();
+
 private: // From Control
   /**
    * @copydoc Control::OnInitialize()
@@ -143,6 +152,11 @@ private: // From Control
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Control::OnStyleChange()
    */
   void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) override;
@@ -198,6 +212,11 @@ private: // From Control
   void OnSceneConnection(int depth) override;
 
   /**
+   * @copydoc Control::OnPropertySet()
+   */
+  void OnPropertySet(Property::Index index, const Property::Value& propertyValue) override;
+
+  /**
    * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
    */
   bool OnKeyEvent(const KeyEvent& event) override;
@@ -249,7 +268,7 @@ private: // From Control
   /**
    * @copydoc Text::EditableControlInterface::AddDecoration()
    */
-  void AddDecoration(Actor& actor, bool needsClipping) override;
+  void AddDecoration(Actor& actor, Toolkit::Text::DecorationType type, bool needsClipping) override;
 
   /**
    * @copydoc Text::EditableControlInterface::InputFiltered()
@@ -325,17 +344,79 @@ public:
    */
   void AnchorClicked(const std::string& href) override;
 
-private: // Implementation
   /**
-   * @copydoc Dali::Toolkit::Text::Controller::(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
+   * @brief Get the rendered size of a specific text range.
+   * if the requested text is at multilines, multiple sizes will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to calculate size for.
+   * @param[in] endIndex end index(included) of the text requested to calculate size for.
+   * @return list of sizes of the reuested text.
    */
-  InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent);
+  Vector<Vector2> GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const;
+
+  /**
+   * @brief Get the top/left rendered position of a specific text range.
+   * if the requested text is at multilines, multiple positions will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple positions will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to get position to.
+   * @param[in] endIndex end index(included) of the text requested to get position to.
+   * @return list of positions of the requested text.
+   */
+  Vector<Vector2> GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const;
 
   /**
-   * @brief Callback when Clipboard signals an item should be pasted
-   * @param[in] clipboard handle to Clipboard Event Notifier
+   * @brief Get the line bounding rectangle.
+   * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] lineIndex line index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
    */
-  void OnClipboardTextSelected(ClipboardEventNotifier& clipboard);
+  Rect<float> GetLineBoundingRectangle(const uint32_t lineIndex) const;
+
+  /**
+   * @brief Get the character bounding rectangle.
+   * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] charIndex character index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+  Rect<float> GetCharacterBoundingRectangle(const uint32_t charIndex) const;
+
+  /**
+   * @brief Get the character index.
+   * If the text is not yet rendered or the text is empty, -1 is returned.
+   *
+   * @param[in] visualX visual x position.
+   * @param[in] visualY visual y position.
+   * @return character index.
+   */
+  int GetCharacterIndexAtPosition(float visualX, float visualY) const;
+
+  /**
+   * @brief Gets the bounding box of a specific text range.
+   *
+   * @param[in] startIndex start index of the text requested to get bounding box to.
+   * @param[in] endIndex end index(included) of the text requested to get bounding box to.
+   * @return bounding box of the requested text.
+   */
+  Rect<> GetTextBoundingRectangle(uint32_t startIndex, uint32_t endIndex) const;
+
+  /**
+   * @brief Set the @p spannedText into current textField
+   * the spanned text contains content (text) and  format (spans with ranges)
+   * the text is copied into text-controller and the spans are applied on ranges
+   *
+   * @param[in] spannedText the text with spans.
+   */
+  void SetSpannedText(const Text::Spanned& spannedText);
+
+private: // Implementation
+  /**
+   * @copydoc Dali::Toolkit::Text::Controller::(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
+   */
+  InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent);
 
   /**
    * @brief Get a Property Map for the image used for the required Handle Image
@@ -366,13 +447,6 @@ private: // Implementation
   bool OnTouched(Actor actor, const TouchEvent& touch);
 
   /**
-   * @brief Callbacks called on idle.
-   *
-   * If there are notifications of change of input style on the queue, Toolkit::TextField::InputStyleChangedSignal() are emitted.
-   */
-  void OnIdleSignal();
-
-  /**
    * @brief Emits TextChanged signal.
    */
   void EmitTextChangedSignal();
@@ -393,6 +467,11 @@ private: // Implementation
   void EmitSelectionClearedSignal();
 
   /**
+   * @brief Emits SelectionStarted signal.
+   */
+  void EmitSelectionStartedSignal();
+
+  /**
    * @brief Callback function for when the layout is changed.
    * @param[in] actor The actor whose layoutDirection is changed.
    * @param[in] type  The layoutDirection.
@@ -400,9 +479,18 @@ private: // Implementation
   void OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type);
 
   /**
+  * @brief Add a layer for active or cursor.
+  * @param[in] layer The actor in which to store the layer.
+  * @param[in] actor The new layer to add.
+  */
+  void AddLayer(Actor& layer, Actor& actor);
+
+  /**
    * Construct a new TextField.
+   *
+   * @param[in] additionalBehaviour additional behaviour flags for this TextField
    */
-  TextField();
+  TextField(ControlBehaviour additionalBehaviour);
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
@@ -429,6 +517,9 @@ private: // Implementation
   // Connection needed to re-render text, when a Text Field returns to the scene.
   void OnSceneConnect(Dali::Actor actor);
 
+  // Needed to synchronize TextAnchor actors with Anchor objects in text's logical model
+  void OnAccessibilityStatusChanged();
+
 private: // Data
   // Signals
   Toolkit::TextField::TextChangedSignalType                mTextChangedSignal;
@@ -439,19 +530,21 @@ private: // Data
   Toolkit::DevelTextField::CursorPositionChangedSignalType mCursorPositionChangedSignal;
   Toolkit::DevelTextField::SelectionChangedSignalType      mSelectionChangedSignal;
   Toolkit::DevelTextField::SelectionClearedSignalType      mSelectionClearedSignal;
-
-  InputMethodContext       mInputMethodContext;
-  Text::ControllerPtr      mController;
-  Text::RendererPtr        mRenderer;
-  Text::DecoratorPtr       mDecorator;
-  Toolkit::Control         mStencil;                  ///< For EXCEED_POLICY_CLIP
-  std::vector<Actor>       mClippingDecorationActors; ///< Decoration actors which need clipping.
-  Dali::InputMethodOptions mInputMethodOptions;
-
-  Actor         mRenderableActor;
-  Actor         mActiveLayer;
-  Actor         mBackgroundActor;
-  CallbackBase* mIdleCallback;
+  Toolkit::DevelTextField::SelectionStartedSignalType      mSelectionStartedSignal;
+
+  InputMethodContext               mInputMethodContext;
+  Text::ControllerPtr              mController;
+  Text::RendererPtr                mRenderer;
+  Text::DecoratorPtr               mDecorator;
+  Toolkit::Control                 mStencil;                  ///< For EXCEED_POLICY_CLIP
+  std::vector<Actor>               mClippingDecorationActors; ///< Decoration actors which need clipping.
+  std::vector<Toolkit::TextAnchor> mAnchorActors;
+  Dali::InputMethodOptions         mInputMethodOptions;
+
+  Actor mRenderableActor;
+  Actor mActiveLayer;
+  Actor mCursorLayer;
+  Actor mBackgroundActor;
 
   float mAlignmentOffset;
   int   mRenderingBackend;
@@ -469,90 +562,49 @@ private: // Data
   uint32_t mOldSelectionStart;
   uint32_t mOldSelectionEnd;
 
+  bool mSelectionStarted : 1; ///< If true, emits SelectionStartedSignal at the end of OnRelayout().
+
 protected:
+  struct PropertyHandler;
+
   /**
    * @brief This structure is to connect TextField with Accessible functions.
    */
-  struct AccessibleImpl : public DevelControl::AccessibleImpl,
-                          public virtual Dali::Accessibility::Text,
-                          public virtual Dali::Accessibility::EditableText
+  class TextFieldAccessible : public EditableTextControlAccessible
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
+  public:
+    using EditableTextControlAccessible::EditableTextControlAccessible;
 
     /**
      * @copydoc Dali::Accessibility::Accessible::GetName()
      */
-    std::string GetName() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetText()
-     */
-    std::string GetText(size_t startOffset, size_t endOffset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetCharacterCount()
-     */
-    size_t GetCharacterCount() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetCursorOffset()
-     */
-    size_t GetCursorOffset() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::SetCursorOffset()
-     */
-    bool SetCursorOffset(size_t offset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetTextAtOffset()
-     */
-    Accessibility::Range GetTextAtOffset(size_t offset, Accessibility::TextBoundary boundary) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetRangeOfSelection()
-     */
-    Accessibility::Range GetRangeOfSelection(size_t selectionIndex) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::RemoveSelection()
-     */
-    bool RemoveSelection(size_t selectionIndex) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::SetRangeOfSelection()
-     */
-    bool SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::EditableText::CopyText()
-     */
-    bool CopyText(size_t startPosition, size_t endPosition) override;
+    std::string GetName() const override;
 
+  protected:
     /**
-     * @copydoc Dali::Accessibility::EditableText::CutText()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextAnchors()
      */
-    bool CutText(size_t startPosition, size_t endPosition) override;
+    const std::vector<Toolkit::TextAnchor>& GetTextAnchors() const override;
 
     /**
-     * @copydoc Dali::Accessibility::Accessible::GetStates()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextController()
      */
-    Accessibility::States CalculateStates() override;
+    Toolkit::Text::ControllerPtr GetTextController() const override;
 
     /**
-     * @copydoc Dali::Accessibility::EditableText::InsertText()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetSubstituteCharacter()
      */
-    bool InsertText(size_t startPosition, std::string text) override;
+    std::uint32_t GetSubstituteCharacter() const override;
 
     /**
-     * @copydoc Dali::Accessibility::EditableText::SetTextContents()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::IsHiddenInput()
      */
-    bool SetTextContents(std::string newContents) override;
+    bool IsHiddenInput() const override;
 
     /**
-     * @copydoc Dali::Accessibility::EditableText::DeleteText()
+     * @copydoc Dali::Toolkit::Internal::EditableTextControlAccessible::RequestTextRelayout()
      */
-    bool DeleteText(size_t startPosition, size_t endPosition) override;
+    void RequestTextRelayout() override;
   };
 };
 
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
new file mode 100644
index 0000000..45af9b7
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
@@ -0,0 +1,1103 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/controls/text-controls/text-field-property-handler.h>
+
+#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/devel-api/text/rendering-backend.h>
+
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/text-effects-style.h>
+#include <dali-toolkit/internal/text/text-enumerations-impl.h>
+#include <dali-toolkit/internal/text/text-font-style.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+#include <dali/integration-api/debug.h>
+
+#if defined(DEBUG_ENABLED)
+extern Debug::Filter* gTextFieldLogFilter;
+#endif
+
+namespace Dali::Toolkit::Internal
+{
+const char* const TextField::PropertyHandler::IMAGE_MAP_FILENAME_STRING{"filename"};
+
+/// Retrieves a filename from a value that is a Property::Map
+std::string TextField::PropertyHandler::GetImageFileNameFromPropertyValue(const Property::Value& value)
+{
+  std::string          filename;
+  const Property::Map* map = value.GetMap();
+  if(map)
+  {
+    const Property::Value* filenameValue = map->Find(TextField::PropertyHandler::IMAGE_MAP_FILENAME_STRING);
+    if(filenameValue)
+    {
+      filenameValue->Get(filename);
+    }
+  }
+  return filename;
+}
+
+void TextField::PropertyHandler::SetProperty(Toolkit::TextField textField, Property::Index index, const Property::Value& value)
+{
+  TextField& impl(GetImpl(textField));
+  DALI_ASSERT_DEBUG(impl.mController && "No text controller");
+  DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
+
+  switch(index)
+  {
+    case Toolkit::DevelTextField::Property::RENDERING_BACKEND:
+    {
+      int backend = value.Get<int>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p RENDERING_BACKEND %d\n", impl.mController.Get(), backend);
+
+#ifndef ENABLE_VECTOR_BASED_TEXT_RENDERING
+      if(DevelText::RENDERING_VECTOR_BASED == backend)
+      {
+        backend = TextAbstraction::BITMAP_GLYPH; // Fallback to bitmap-based rendering
+      }
+#endif
+      if(impl.mRenderingBackend != backend)
+      {
+        impl.mRenderingBackend = backend;
+        impl.mRenderer.Reset();
+
+        // When using the vector-based rendering, the size of the GLyphs are different
+        TextAbstraction::GlyphType glyphType = (DevelText::RENDERING_VECTOR_BASED == impl.mRenderingBackend) ? TextAbstraction::VECTOR_GLYPH : TextAbstraction::BITMAP_GLYPH;
+        impl.mController->SetGlyphType(glyphType);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::TEXT:
+    {
+      const std::string& text = value.Get<std::string>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p TEXT %s\n", impl.mController.Get(), text.c_str());
+
+      impl.mController->SetText(text);
+      break;
+    }
+
+    case Toolkit::TextField::Property::PLACEHOLDER_TEXT:
+    {
+      const std::string& text = value.Get<std::string>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str());
+
+      impl.mController->SetPlaceholderText(Text::Controller::PLACEHOLDER_TYPE_INACTIVE, text);
+      break;
+    }
+    case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED:
+    {
+      const std::string& text = value.Get<std::string>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_FOCUSED %s\n", impl.mController.Get(), text.c_str());
+
+      impl.mController->SetPlaceholderText(Text::Controller::PLACEHOLDER_TYPE_ACTIVE, text);
+      break;
+    }
+    case Toolkit::TextField::Property::FONT_FAMILY:
+    {
+      const std::string& fontFamily = value.Get<std::string>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
+      impl.mController->SetDefaultFontFamily(fontFamily);
+      break;
+    }
+    case Toolkit::TextField::Property::FONT_STYLE:
+    {
+      SetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextField::Property::POINT_SIZE:
+    {
+      const float pointSize = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p POINT_SIZE %f\n", impl.mController.Get(), pointSize);
+
+      if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE), pointSize))
+      {
+        impl.mController->SetDefaultFontSize(pointSize, Text::Controller::POINT_SIZE);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::MAX_LENGTH:
+    {
+      const int max = value.Get<int>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p MAX_LENGTH %d\n", impl.mController.Get(), max);
+
+      impl.mController->SetMaximumNumberOfCharacters(max);
+      break;
+    }
+    case Toolkit::TextField::Property::EXCEED_POLICY:
+    {
+      impl.mExceedPolicy = value.Get<int>();
+
+      if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == impl.mExceedPolicy)
+      {
+        impl.EnableClipping();
+      }
+      else
+      {
+        UnparentAndReset(impl.mStencil);
+      }
+      impl.RequestTextRelayout();
+      break;
+    }
+
+    case Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT:
+    {
+      Text::HorizontalAlignment::Type alignment(static_cast<Text::HorizontalAlignment::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
+      if(Text::GetHorizontalAlignmentEnumeration(value, alignment))
+      {
+        DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p HORIZONTAL_ALIGNMENT %d\n", impl.mController.Get(), alignment);
+        impl.mController->SetHorizontalAlignment(alignment);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::VERTICAL_ALIGNMENT:
+    {
+      Toolkit::Text::VerticalAlignment::Type alignment(static_cast<Text::VerticalAlignment::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
+      if(Text::GetVerticalAlignmentEnumeration(value, alignment))
+      {
+        impl.mController->SetVerticalAlignment(alignment);
+        DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p VERTICAL_ALIGNMENT %d\n", impl.mController.Get(), alignment);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::TEXT_COLOR:
+    {
+      const Vector4& textColor = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
+
+      if(impl.mController->GetDefaultColor() != textColor)
+      {
+        impl.mController->SetDefaultColor(textColor);
+        impl.mController->SetInputColor(textColor);
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR:
+    {
+      const Vector4& textColor = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a);
+
+      if(impl.mController->GetPlaceholderTextColor() != textColor)
+      {
+        impl.mController->SetPlaceholderTextColor(textColor);
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR:
+    {
+      const Vector4& color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetCursorColor(Toolkit::Text::PRIMARY_CURSOR, color);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR:
+    {
+      const Vector4& color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p SECONDARY_CURSOR_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetCursorColor(Toolkit::Text::SECONDARY_CURSOR, color);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK:
+    {
+      const bool enable = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p ENABLE_CURSOR_BLINK %d\n", impl.mController.Get(), enable);
+
+      impl.mController->SetEnableCursorBlink(enable);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL:
+    {
+      const float interval = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_INTERVAL %f\n", impl.mController.Get(), interval);
+
+      impl.mDecorator->SetCursorBlinkInterval(interval);
+      break;
+    }
+    case Toolkit::TextField::Property::CURSOR_BLINK_DURATION:
+    {
+      const float duration = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p CURSOR_BLINK_DURATION %f\n", impl.mController.Get(), duration);
+
+      impl.mDecorator->SetCursorBlinkDuration(duration);
+      break;
+    }
+    case Toolkit::TextField::Property::CURSOR_WIDTH:
+    {
+      const int width = value.Get<int>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p CURSOR_WIDTH %d\n", impl.mController.Get(), width);
+
+      impl.mDecorator->SetCursorWidth(width);
+      impl.mController->GetLayoutEngine().SetCursorWidth(width);
+      break;
+    }
+    case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE:
+    {
+      const std::string imageFileName = value.Get<std::string>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
+
+      if(imageFileName.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::GRAB_HANDLE, Toolkit::Text::HANDLE_IMAGE_RELEASED, imageFileName);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE:
+    {
+      const std::string imageFileName = value.Get<std::string>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str());
+
+      if(imageFileName.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::GRAB_HANDLE, Toolkit::Text::HANDLE_IMAGE_PRESSED, imageFileName);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SCROLL_THRESHOLD:
+    {
+      const float threshold = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p SCROLL_THRESHOLD %f\n", impl.mController.Get(), threshold);
+
+      impl.mDecorator->SetScrollThreshold(threshold);
+      break;
+    }
+    case Toolkit::TextField::Property::SCROLL_SPEED:
+    {
+      const float speed = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField %p SCROLL_SPEED %f\n", impl.mController.Get(), speed);
+
+      impl.mDecorator->SetScrollSpeed(speed);
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::LEFT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_RELEASED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::RIGHT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_RELEASED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::LEFT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_PRESSED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::RIGHT_SELECTION_HANDLE, Toolkit::Text::HANDLE_IMAGE_PRESSED, filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::LEFT_SELECTION_HANDLE_MARKER,
+                                        Toolkit::Text::HANDLE_IMAGE_RELEASED,
+                                        filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
+    {
+      const std::string filename = GetImageFileNameFromPropertyValue(value);
+
+      if(filename.size())
+      {
+        impl.mDecorator->SetHandleImage(Toolkit::Text::RIGHT_SELECTION_HANDLE_MARKER,
+                                        Toolkit::Text::HANDLE_IMAGE_RELEASED,
+                                        filename);
+        impl.RequestTextRelayout();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR:
+    {
+      const Vector4 color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p SELECTION_HIGHLIGHT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetHighlightColor(color);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX:
+    {
+      const Rect<int>& box = value.Get<Rect<int> >();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p DECORATION_BOUNDING_BOX %d,%d %dx%d\n", impl.mController.Get(), box.x, box.y, box.width, box.height);
+
+      impl.mDecorator->SetBoundingBox(box);
+      impl.RequestTextRelayout();
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mInputMethodOptions.ApplyProperty(*map);
+      }
+      impl.mController->SetInputModePassword(impl.mInputMethodOptions.IsPassword());
+
+      Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
+      if(control == textField)
+      {
+        impl.mInputMethodContext.ApplyOptions(impl.mInputMethodOptions);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_COLOR:
+    {
+      const Vector4& inputColor = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p INPUT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), inputColor.r, inputColor.g, inputColor.b, inputColor.a);
+
+      impl.mController->SetInputColor(inputColor);
+      break;
+    }
+    case Toolkit::TextField::Property::ENABLE_MARKUP:
+    {
+      const bool enableMarkup = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ENABLE_MARKUP %d\n", impl.mController.Get(), enableMarkup);
+
+      impl.mController->SetMarkupProcessorEnabled(enableMarkup);
+      CommonTextUtils::SynchronizeTextAnchorsInParent(textField, impl.mController, impl.mAnchorActors);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_FONT_FAMILY:
+    {
+      const std::string& fontFamily = value.Get<std::string>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p INPUT_FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str());
+      impl.mController->SetInputFontFamily(fontFamily);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_FONT_STYLE:
+    {
+      SetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_POINT_SIZE:
+    {
+      const float pointSize = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p INPUT_POINT_SIZE %f\n", impl.mController.Get(), pointSize);
+      impl.mController->SetInputFontPointSize(pointSize);
+      break;
+    }
+    case Toolkit::TextField::Property::UNDERLINE:
+    {
+      const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_UNDERLINE:
+    {
+      const bool update = SetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::SHADOW:
+    {
+      const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_SHADOW:
+    {
+      const bool update = SetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::EMBOSS:
+    {
+      const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_EMBOSS:
+    {
+      const bool update = SetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::OUTLINE:
+    {
+      const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_OUTLINE:
+    {
+      const bool update = SetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mController->SetHiddenInputOption(*map);
+        auto mode = map->Find(Toolkit::HiddenInput::Property::MODE);
+        if(mode && (mode->Get<int>() != Toolkit::HiddenInput::Mode::HIDE_NONE))
+        {
+          textField.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE, Accessibility::Role::PASSWORD_TEXT);
+        }
+        else
+        {
+          textField.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE, Accessibility::Role::ENTRY);
+        }
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::PIXEL_SIZE:
+    {
+      const float pixelSize = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p PIXEL_SIZE %f\n", impl.mController.Get(), pixelSize);
+
+      if(!Equals(impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE), pixelSize))
+      {
+        impl.mController->SetDefaultFontSize(pixelSize, Text::Controller::PIXEL_SIZE);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::ENABLE_SELECTION:
+    {
+      const bool enableSelection = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ENABLE_SELECTION %d\n", impl.mController.Get(), enableSelection);
+      impl.mController->SetSelectionEnabled(enableSelection);
+      break;
+    }
+    case Toolkit::TextField::Property::PLACEHOLDER:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mController->SetPlaceholderProperty(*map);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::ELLIPSIS:
+    {
+      const bool ellipsis = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ELLIPSIS %d\n", impl.mController.Get(), ellipsis);
+
+      impl.mController->SetTextElideEnabled(ellipsis);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_SHIFT_SELECTION:
+    {
+      const bool shiftSelection = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ENABLE_SHIFT_SELECTION %d\n", impl.mController.Get(), shiftSelection);
+
+      impl.mController->SetShiftSelectionEnabled(shiftSelection);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE:
+    {
+      const bool grabHandleEnabled = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE %d\n", impl.mController.Get(), grabHandleEnabled);
+
+      impl.mController->SetGrabHandleEnabled(grabHandleEnabled);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
+    {
+      impl.mController->SetMatchLayoutDirection(value.Get<bool>() ? DevelText::MatchLayoutDirection::LOCALE : DevelText::MatchLayoutDirection::CONTENTS);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP:
+    {
+      const bool grabHandlePopupEnabled = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ENABLE_GRAB_HANDLE_POPUP %d\n", impl.mController.Get(), grabHandlePopupEnabled);
+
+      impl.mController->SetGrabHandlePopupEnabled(grabHandlePopupEnabled);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::BACKGROUND:
+    {
+      const Vector4 backgroundColor = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p BACKGROUND %f,%f,%f,%f\n", impl.mController.Get(), backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a);
+
+      impl.mController->SetBackgroundEnabled(true);
+      impl.mController->SetBackgroundColor(backgroundColor);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::SELECTED_TEXT_START:
+    {
+      uint32_t start = static_cast<uint32_t>(value.Get<int>());
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p SELECTED_TEXT_START %d\n", impl.mController.Get(), start);
+      impl.SetTextSelectionRange(&start, nullptr);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::SELECTED_TEXT_END:
+    {
+      uint32_t end = static_cast<uint32_t>(value.Get<int>());
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p SELECTED_TEXT_END %d\n", impl.mController.Get(), end);
+      impl.SetTextSelectionRange(nullptr, &end);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_EDITING:
+    {
+      const bool editable = value.Get<bool>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p ENABLE_EDITING %d\n", impl.mController.Get(), editable);
+      impl.SetEditable(editable);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::FONT_SIZE_SCALE:
+    {
+      const float scale = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p FONT_SIZE_SCALE %f\n", impl.mController.Get(), scale);
+
+      if(!Equals(impl.mController->GetFontSizeScale(), scale))
+      {
+        impl.mController->SetFontSizeScale(scale);
+      }
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_FONT_SIZE_SCALE:
+    {
+      const bool enableFontSizeScale = value.Get<bool>();
+      if(!Equals(impl.mController->IsFontSizeScaleEnabled(), enableFontSizeScale))
+      {
+        impl.mController->SetFontSizeScaleEnabled(enableFontSizeScale);
+      }
+      break;
+    }
+    case Toolkit::DevelTextField::Property::PRIMARY_CURSOR_POSITION:
+    {
+      uint32_t position = static_cast<uint32_t>(value.Get<int>());
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_POSITION %d\n", impl.mController.Get(), position);
+      if(impl.mController->SetPrimaryCursorPosition(position, impl.HasKeyInputFocus()))
+      {
+        impl.SetKeyInputFocus();
+      }
+      break;
+    }
+    case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR:
+    {
+      const Vector4 color = value.Get<Vector4>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p GRAB_HANDLE_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a);
+
+      impl.mDecorator->SetHandleColor(color);
+      impl.RequestTextRelayout();
+      break;
+    }
+
+    case Toolkit::DevelTextField::Property::INPUT_FILTER:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mController->SetInputFilterOption(*map);
+      }
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ELLIPSIS_POSITION:
+    {
+      DevelText::EllipsisPosition::Type ellipsisPositionType(static_cast<DevelText::EllipsisPosition::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
+      if(Text::GetEllipsisPositionTypeEnumeration(value, ellipsisPositionType))
+      {
+        DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p EllipsisPosition::Type %d\n", impl.mController.Get(), ellipsisPositionType);
+        impl.mController->SetEllipsisPosition(ellipsisPositionType);
+      }
+      break;
+    }
+    case Toolkit::DevelTextField::Property::STRIKETHROUGH:
+    {
+      const bool update = SetStrikethroughProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::DevelTextField::Property::INPUT_STRIKETHROUGH:
+    {
+      const bool update = SetStrikethroughProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      if(update)
+      {
+        impl.mRenderer.Reset();
+      }
+      break;
+    }
+    case Toolkit::DevelTextField::Property::CHARACTER_SPACING:
+    {
+      const float characterSpacing = value.Get<float>();
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p CHARACTER_SPACING %d\n", impl.mController.Get(), characterSpacing);
+
+      impl.mController->SetCharacterSpacing(characterSpacing);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::SELECTION_POPUP_STYLE:
+    {
+      const Property::Map* map = value.GetMap();
+      if(map)
+      {
+        impl.mDecorator->SetSelectionPopupStyle(*map);
+      }
+      break;
+    }
+  }
+}
+
+Property::Value TextField::PropertyHandler::GetProperty(Toolkit::TextField textField, Property::Index index)
+{
+  Property::Value value;
+  TextField&      impl(GetImpl(textField));
+  DALI_ASSERT_DEBUG(impl.mController && "No text controller");
+  DALI_ASSERT_DEBUG(impl.mDecorator && "No text decorator");
+
+  switch(index)
+  {
+    case Toolkit::DevelTextField::Property::RENDERING_BACKEND:
+    {
+      value = impl.mRenderingBackend;
+      break;
+    }
+    case Toolkit::TextField::Property::TEXT:
+    {
+      std::string text;
+      impl.mController->GetText(text);
+      DALI_LOG_INFO(gTextFieldLogFilter, Debug::General, "TextField %p returning text: %s\n", impl.mController.Get(), text.c_str());
+      value = text;
+      break;
+    }
+    case Toolkit::TextField::Property::PLACEHOLDER_TEXT:
+    {
+      std::string text;
+      impl.mController->GetPlaceholderText(Text::Controller::PLACEHOLDER_TYPE_INACTIVE, text);
+      value = text;
+      break;
+    }
+    case Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED:
+    {
+      std::string text;
+      impl.mController->GetPlaceholderText(Text::Controller::PLACEHOLDER_TYPE_ACTIVE, text);
+      value = text;
+      break;
+    }
+    case Toolkit::TextField::Property::FONT_FAMILY:
+    {
+      value = impl.mController->GetDefaultFontFamily();
+      break;
+    }
+    case Toolkit::TextField::Property::FONT_STYLE:
+    {
+      GetFontStyleProperty(impl.mController, value, Text::FontStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextField::Property::POINT_SIZE:
+    {
+      value = impl.mController->GetDefaultFontSize(Text::Controller::POINT_SIZE);
+      break;
+    }
+    case Toolkit::TextField::Property::MAX_LENGTH:
+    {
+      value = impl.mController->GetMaximumNumberOfCharacters();
+      break;
+    }
+    case Toolkit::TextField::Property::EXCEED_POLICY:
+    {
+      value = impl.mExceedPolicy;
+      break;
+    }
+    case Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT:
+    {
+      const char* name = Text::GetHorizontalAlignmentString(impl.mController->GetHorizontalAlignment());
+      if(name)
+      {
+        value = std::string(name);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::VERTICAL_ALIGNMENT:
+    {
+      const char* name = Text::GetVerticalAlignmentString(impl.mController->GetVerticalAlignment());
+
+      if(name)
+      {
+        value = std::string(name);
+      }
+      break;
+    }
+    case Toolkit::TextField::Property::TEXT_COLOR:
+    {
+      value = impl.mController->GetDefaultColor();
+      break;
+    }
+    case Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR:
+    {
+      value = impl.mController->GetPlaceholderTextColor();
+      break;
+    }
+    case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR:
+    {
+      value = impl.mDecorator->GetColor(Text::PRIMARY_CURSOR);
+      break;
+    }
+    case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR:
+    {
+      value = impl.mDecorator->GetColor(Text::SECONDARY_CURSOR);
+      break;
+    }
+    case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK:
+    {
+      value = impl.mController->GetEnableCursorBlink();
+      break;
+    }
+    case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL:
+    {
+      value = impl.mDecorator->GetCursorBlinkInterval();
+      break;
+    }
+    case Toolkit::TextField::Property::CURSOR_BLINK_DURATION:
+    {
+      value = impl.mDecorator->GetCursorBlinkDuration();
+      break;
+    }
+    case Toolkit::TextField::Property::CURSOR_WIDTH:
+    {
+      value = impl.mDecorator->GetCursorWidth();
+      break;
+    }
+    case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE:
+    {
+      value = impl.mDecorator->GetHandleImage(Text::GRAB_HANDLE, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE:
+    {
+      value = impl.mDecorator->GetHandleImage(Text::GRAB_HANDLE, Text::HANDLE_IMAGE_PRESSED);
+      break;
+    }
+    case Toolkit::TextField::Property::SCROLL_THRESHOLD:
+    {
+      value = impl.mDecorator->GetScrollThreshold();
+      break;
+    }
+    case Toolkit::TextField::Property::SCROLL_SPEED:
+    {
+      value = impl.mDecorator->GetScrollSpeed();
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::LEFT_SELECTION_HANDLE, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::RIGHT_SELECTION_HANDLE, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::LEFT_SELECTION_HANDLE, Text::HANDLE_IMAGE_PRESSED);
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::RIGHT_SELECTION_HANDLE, Text::HANDLE_IMAGE_PRESSED);
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::LEFT_SELECTION_HANDLE_MARKER, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT:
+    {
+      impl.GetHandleImagePropertyValue(value, Text::RIGHT_SELECTION_HANDLE_MARKER, Text::HANDLE_IMAGE_RELEASED);
+      break;
+    }
+    case Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR:
+    {
+      value = impl.mDecorator->GetHighlightColor();
+      break;
+    }
+    case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX:
+    {
+      Rect<int> boundingBox;
+      impl.mDecorator->GetBoundingBox(boundingBox);
+      value = boundingBox;
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_METHOD_SETTINGS:
+    {
+      Property::Map map;
+      impl.mInputMethodOptions.RetrieveProperty(map);
+      value = map;
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_COLOR:
+    {
+      value = impl.mController->GetInputColor();
+      break;
+    }
+    case Toolkit::TextField::Property::ENABLE_MARKUP:
+    {
+      value = impl.mController->IsMarkupProcessorEnabled();
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_FONT_FAMILY:
+    {
+      value = impl.mController->GetInputFontFamily();
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_FONT_STYLE:
+    {
+      GetFontStyleProperty(impl.mController, value, Text::FontStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_POINT_SIZE:
+    {
+      value = impl.mController->GetInputFontPointSize();
+      break;
+    }
+    case Toolkit::TextField::Property::UNDERLINE:
+    {
+      GetUnderlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_UNDERLINE:
+    {
+      GetUnderlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextField::Property::SHADOW:
+    {
+      GetShadowProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_SHADOW:
+    {
+      GetShadowProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextField::Property::EMBOSS:
+    {
+      GetEmbossProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_EMBOSS:
+    {
+      GetEmbossProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextField::Property::OUTLINE:
+    {
+      GetOutlineProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::TextField::Property::INPUT_OUTLINE:
+    {
+      GetOutlineProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS:
+    {
+      Property::Map map;
+      impl.mController->GetHiddenInputOption(map);
+      value = map;
+      break;
+    }
+    case Toolkit::TextField::Property::PIXEL_SIZE:
+    {
+      value = impl.mController->GetDefaultFontSize(Text::Controller::PIXEL_SIZE);
+      break;
+    }
+    case Toolkit::TextField::Property::ENABLE_SELECTION:
+    {
+      value = impl.mController->IsSelectionEnabled();
+      break;
+    }
+    case Toolkit::TextField::Property::PLACEHOLDER:
+    {
+      Property::Map map;
+      impl.mController->GetPlaceholderProperty(map);
+      value = map;
+      break;
+    }
+    case Toolkit::TextField::Property::ELLIPSIS:
+    {
+      value = impl.mController->IsTextElideEnabled();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_SHIFT_SELECTION:
+    {
+      value = impl.mController->IsShiftSelectionEnabled();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE:
+    {
+      value = impl.mController->IsGrabHandleEnabled();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION:
+    {
+      value = impl.mController->GetMatchLayoutDirection() != DevelText::MatchLayoutDirection::CONTENTS;
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_GRAB_HANDLE_POPUP:
+    {
+      value = impl.mController->IsGrabHandlePopupEnabled();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::BACKGROUND:
+    {
+      value = impl.mController->GetBackgroundColor();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::SELECTED_TEXT:
+    {
+      value = impl.mController->GetSelectedText();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::SELECTED_TEXT_START:
+    {
+      Uint32Pair range = impl.GetTextSelectionRange();
+      value            = static_cast<int>(range.first);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::SELECTED_TEXT_END:
+    {
+      Uint32Pair range = impl.GetTextSelectionRange();
+      value            = static_cast<int>(range.second);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_EDITING:
+    {
+      value = impl.IsEditable();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::FONT_SIZE_SCALE:
+    {
+      value = impl.mController->GetFontSizeScale();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ENABLE_FONT_SIZE_SCALE:
+    {
+      value = impl.mController->IsFontSizeScaleEnabled();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::PRIMARY_CURSOR_POSITION:
+    {
+      value = static_cast<int>(impl.mController->GetPrimaryCursorPosition());
+      break;
+    }
+    case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR:
+    {
+      value = impl.mDecorator->GetHandleColor();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::INPUT_FILTER:
+    {
+      Property::Map map;
+      impl.mController->GetInputFilterOption(map);
+      value = map;
+      break;
+    }
+    case Toolkit::DevelTextField::Property::ELLIPSIS_POSITION:
+    {
+      value = impl.mController->GetEllipsisPosition();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::STRIKETHROUGH:
+    {
+      GetStrikethroughProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::INPUT_STRIKETHROUGH:
+    {
+      GetStrikethroughProperties(impl.mController, value, Text::EffectStyle::INPUT);
+      break;
+    }
+    case Toolkit::DevelTextField::Property::CHARACTER_SPACING:
+    {
+      value = impl.mController->GetCharacterSpacing();
+      break;
+    }
+    case Toolkit::DevelTextField::Property::SELECTION_POPUP_STYLE:
+    {
+      Property::Map map;
+      impl.mDecorator->GetSelectionPopupStyle(map);
+      value = map;
+      break;
+    }
+  } //switch
+  return value;
+}
+
+} // namespace Dali::Toolkit::Internal
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-property-handler.h b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.h
new file mode 100644
index 0000000..f7b5c53
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.h
@@ -0,0 +1,61 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_FIELD_PROPERTY_HANDLER_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_FIELD_PROPERTY_HANDLER_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-toolkit/internal/controls/text-controls/text-field-impl.h>
+
+namespace Dali::Toolkit::Internal
+{
+/**
+ * Class to manage properties for the TextField
+ */
+struct TextField::PropertyHandler
+{
+  static const char* const IMAGE_MAP_FILENAME_STRING; //<<< "filename" key for image map
+
+  /**
+   * Set properties on the text field / controller / decorator
+   *
+   * @param[in] textField The handle for the text field
+   * @param[in] index The property index of the property to set
+   * @param[in] value The value to set
+   */
+  static void SetProperty(Toolkit::TextField textField, Property::Index index, const Property::Value& value);
+
+  /**
+   * Get properties from the text field / controller / decorator
+   *
+   * @param[in] textField The handle for the text field
+   * @param[in] index The property index of the property to set
+   * @return the value
+   */
+  static Property::Value GetProperty(Toolkit::TextField textField, Property::Index index);
+
+private:
+  /**
+   * Method to extract "filename" value from a Property::Map
+   *
+   * @param[in] The property value containing the Property::Map
+   * @return The resulting "filename" value if present
+   */
+  static std::string GetImageFileNameFromPropertyValue(const Property::Value& value);
+};
+
+} // namespace Dali::Toolkit::Internal
+
+#endif //DALI_TOOLKIT_INTERNAL_TEXT_FIELD_PROPERTY_HANDLER_H
diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index 21e13c8..5309e89 100644
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/devel-api/common/stage.h>
 #include <dali/devel-api/object/property-helper-devel.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/type-registry-helper.h>
@@ -30,6 +31,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/text/property-string-parser.h>
 #include <dali-toolkit/internal/text/rendering/text-backend.h>
@@ -69,24 +71,25 @@ const unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::DevelText::DEFAULT
  * The alignment depends on the alignment value of the text label (Use Text::VerticalAlignment enumerations).
  */
 const float VERTICAL_ALIGNMENT_TABLE[Text::VerticalAlignment::BOTTOM + 1] =
-  {
+{
     0.0f, // VerticalAlignment::TOP
     0.5f, // VerticalAlignment::CENTER
     1.0f  // VerticalAlignment::BOTTOM
 };
 
-const std::string TEXT_FIT_ENABLE_KEY("enable");
-const std::string TEXT_FIT_MIN_SIZE_KEY("minSize");
-const std::string TEXT_FIT_MAX_SIZE_KEY("maxSize");
-const std::string TEXT_FIT_STEP_SIZE_KEY("stepSize");
-const std::string TEXT_FIT_FONT_SIZE_TYPE_KEY("fontSizeType");
+const char* TEXT_FIT_ENABLE_KEY("enable");
+const char* TEXT_FIT_MIN_SIZE_KEY("minSize");
+const char* TEXT_FIT_MAX_SIZE_KEY("maxSize");
+const char* TEXT_FIT_STEP_SIZE_KEY("stepSize");
+const char* TEXT_FIT_FONT_SIZE_KEY("fontSize");
+const char* TEXT_FIT_FONT_SIZE_TYPE_KEY("fontSizeType");
 
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
 #endif
 
 const Scripting::StringEnum AUTO_SCROLL_STOP_MODE_TABLE[] =
-  {
+{
     {"IMMEDIATE", Toolkit::TextLabel::AutoScrollStopMode::IMMEDIATE},
     {"FINISH_LOOP", Toolkit::TextLabel::AutoScrollStopMode::FINISH_LOOP},
 };
@@ -134,7 +137,15 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "textFit",
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "minLineSize",                  FLOAT,   MIN_LINE_SIZE                  )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "renderingBackend",             INTEGER, RENDERING_BACKEND              )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "fontSizeScale",                FLOAT,   FONT_SIZE_SCALE                )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "enableFontSizeScale",          BOOLEAN, ENABLE_FONT_SIZE_SCALE         )
 DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "ellipsisPosition",             INTEGER, ELLIPSIS_POSITION              )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "strikethrough",                MAP,     STRIKETHROUGH                  )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "characterSpacing",             FLOAT,   CHARACTER_SPACING              )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "relativeLineSize",             FLOAT,   RELATIVE_LINE_SIZE             )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "anchorColor",                  VECTOR4, ANCHOR_COLOR                   )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "anchorClickedColor",           VECTOR4, ANCHOR_CLICKED_COLOR           )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "removeFrontInset",             BOOLEAN, REMOVE_FRONT_INSET             )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "removeBackInset",              BOOLEAN, REMOVE_BACK_INSET              )
 
 DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT(Toolkit, TextLabel, "textColor",      Color::BLACK,     TEXT_COLOR   )
 DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION(Toolkit,    TextLabel, "textColorRed",   TEXT_COLOR_RED,   TEXT_COLOR, 0)
@@ -143,6 +154,7 @@ DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION(Toolkit,    TextLabel, "textColo
 DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION(Toolkit,    TextLabel, "textColorAlpha", TEXT_COLOR_ALPHA, TEXT_COLOR, 3)
 
 DALI_SIGNAL_REGISTRATION(Toolkit, TextLabel, "anchorClicked", SIGNAL_ANCHOR_CLICKED)
+DALI_SIGNAL_REGISTRATION(Toolkit, TextLabel, "textFitChanged", SIGNAL_TEXT_FIT_CHANGED)
 
 DALI_TYPE_REGISTRATION_END()
 // clang-format on
@@ -199,6 +211,10 @@ void ParseTextFitProperty(Text::ControllerPtr& controller, const Property::Map*
     }
 
     controller->SetTextFitEnabled(enabled);
+    // The TextFit operation is performed based on the MinLineSize set in the TextLabel at the moment when the TextFit property is set.
+    // So, if you change the TextLabel's MinLineSize after setting the TextFit property, it does not affect the operation of TextFit.
+    // This may require a new LineSize item in TextFit.
+    controller->SetTextFitLineSize(controller->GetDefaultLineSize());
     if(isMinSizeSet)
     {
       controller->SetTextFitMinSize(minSize, type);
@@ -216,10 +232,10 @@ void ParseTextFitProperty(Text::ControllerPtr& controller, const Property::Map*
 
 } // namespace
 
-Toolkit::TextLabel TextLabel::New()
+Toolkit::TextLabel TextLabel::New(ControlBehaviour additionalBehaviour)
 {
   // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr<TextLabel> impl = new TextLabel();
+  IntrusivePtr<TextLabel> impl = new TextLabel(additionalBehaviour);
 
   // Pass ownership to CustomActor handle
   Toolkit::TextLabel handle(*impl);
@@ -344,6 +360,7 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro
       case Toolkit::TextLabel::Property::ENABLE_AUTO_SCROLL:
       {
         const bool enableAutoScroll = value.Get<bool>();
+        impl.mLastAutoScrollEnabled = enableAutoScroll;
         // If request to auto scroll is the same as current state then do nothing.
         if(enableAutoScroll != impl.mController->IsAutoScrollEnabled())
         {
@@ -484,13 +501,26 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro
       }
       case Toolkit::DevelTextLabel::Property::TEXT_FIT:
       {
+        // If TextFitArray is enabled, this should be disabled.
+        if(impl.mController->IsTextFitArrayEnabled())
+        {
+          impl.mController->SetDefaultLineSize(impl.mController->GetCurrentLineSize());
+          impl.mController->SetTextFitArrayEnabled(false);
+        }
+
         ParseTextFitProperty(impl.mController, value.GetMap());
+        impl.mController->SetTextFitChanged(true);
         break;
       }
       case Toolkit::DevelTextLabel::Property::MIN_LINE_SIZE:
       {
-        const float lineSize   = value.Get<float>();
-        impl.mTextUpdateNeeded = impl.mController->SetDefaultLineSize(lineSize) || impl.mTextUpdateNeeded;
+        const float lineSize = value.Get<float>();
+        // If TextFitArray is enabled, do not update the default line size.
+        if(!impl.mController->IsTextFitArrayEnabled())
+        {
+          impl.mTextUpdateNeeded = impl.mController->SetDefaultLineSize(lineSize) || impl.mTextUpdateNeeded;
+        }
+        impl.mController->SetCurrentLineSize(lineSize);
         break;
       }
       case Toolkit::DevelTextLabel::Property::FONT_SIZE_SCALE:
@@ -504,6 +534,15 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro
         }
         break;
       }
+      case Toolkit::DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE:
+      {
+        const bool enableFontSizeScale = value.Get<bool>();
+        if(!Equals(impl.mController->IsFontSizeScaleEnabled(), enableFontSizeScale))
+        {
+          impl.mController->SetFontSizeScaleEnabled(enableFontSizeScale);
+        }
+        break;
+      }
       case Toolkit::DevelTextLabel::Property::ELLIPSIS_POSITION:
       {
         DevelText::EllipsisPosition::Type ellipsisPositionType(static_cast<DevelText::EllipsisPosition::Type>(-1)); // Set to invalid value to ensure a valid mode does get set
@@ -514,6 +553,57 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro
         }
         break;
       }
+      case Toolkit::DevelTextLabel::Property::STRIKETHROUGH:
+      {
+        impl.mTextUpdateNeeded = SetStrikethroughProperties(impl.mController, value, Text::EffectStyle::DEFAULT) || impl.mTextUpdateNeeded;
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::CHARACTER_SPACING:
+      {
+        const float characterSpacing = value.Get<float>();
+        impl.mController->SetCharacterSpacing(characterSpacing);
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::RELATIVE_LINE_SIZE:
+      {
+        const float relativeLineSize = value.Get<float>();
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextLabel %p RELATIVE_LINE_SIZE %f\n", impl.mController.Get(), relativeLineSize);
+
+        impl.mController->SetRelativeLineSize(relativeLineSize);
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::ANCHOR_COLOR:
+      {
+        const Vector4& anchorColor = value.Get<Vector4>();
+        if(impl.mController->GetAnchorColor() != anchorColor)
+        {
+          impl.mController->SetAnchorColor(anchorColor);
+          impl.mTextUpdateNeeded = true;
+        }
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::ANCHOR_CLICKED_COLOR:
+      {
+        const Vector4& anchorClickedColor = value.Get<Vector4>();
+        if(impl.mController->GetAnchorClickedColor() != anchorClickedColor)
+        {
+          impl.mController->SetAnchorClickedColor(anchorClickedColor);
+          impl.mTextUpdateNeeded = true;
+        }
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::REMOVE_FRONT_INSET:
+      {
+        const bool remove = value.Get<bool>();
+        impl.mController->SetRemoveFrontInset(remove);
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::REMOVE_BACK_INSET:
+      {
+        const bool remove = value.Get<bool>();
+        impl.mController->SetRemoveBackInset(remove);
+        break;
+      }
     }
 
     // Request relayout when text update is needed. It's necessary to call it
@@ -725,16 +815,18 @@ Property::Value TextLabel::GetProperty(BaseObject* object, Property::Index index
       }
       case Toolkit::DevelTextLabel::Property::TEXT_FIT:
       {
-        const bool  enabled  = impl.mController->IsTextFitEnabled();
-        const float minSize  = impl.mController->GetTextFitMinSize();
-        const float maxSize  = impl.mController->GetTextFitMaxSize();
-        const float stepSize = impl.mController->GetTextFitStepSize();
+        const bool  enabled   = impl.mController->IsTextFitEnabled();
+        const float minSize   = impl.mController->GetTextFitMinSize();
+        const float maxSize   = impl.mController->GetTextFitMaxSize();
+        const float stepSize  = impl.mController->GetTextFitStepSize();
+        const float pointSize = impl.mController->GetTextFitPointSize();
 
         Property::Map map;
         map.Insert(TEXT_FIT_ENABLE_KEY, enabled);
         map.Insert(TEXT_FIT_MIN_SIZE_KEY, minSize);
         map.Insert(TEXT_FIT_MAX_SIZE_KEY, maxSize);
         map.Insert(TEXT_FIT_STEP_SIZE_KEY, stepSize);
+        map.Insert(TEXT_FIT_FONT_SIZE_KEY, pointSize);
         map.Insert(TEXT_FIT_FONT_SIZE_TYPE_KEY, "pointSize");
 
         value = map;
@@ -742,7 +834,8 @@ Property::Value TextLabel::GetProperty(BaseObject* object, Property::Index index
       }
       case Toolkit::DevelTextLabel::Property::MIN_LINE_SIZE:
       {
-        value = impl.mController->GetDefaultLineSize();
+        // If TextFitArray is enabled, the stored value (MIN_LINE_SIZE set by the user) is retrun.
+        value = impl.mController->IsTextFitArrayEnabled() ? impl.mController->GetCurrentLineSize() : impl.mController->GetDefaultLineSize();
         break;
       }
       case Toolkit::DevelTextLabel::Property::FONT_SIZE_SCALE:
@@ -750,11 +843,51 @@ Property::Value TextLabel::GetProperty(BaseObject* object, Property::Index index
         value = impl.mController->GetFontSizeScale();
         break;
       }
+      case Toolkit::DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE:
+      {
+        value = impl.mController->IsFontSizeScaleEnabled();
+        break;
+      }
       case Toolkit::DevelTextLabel::Property::ELLIPSIS_POSITION:
       {
         value = impl.mController->GetEllipsisPosition();
         break;
       }
+      case Toolkit::DevelTextLabel::Property::STRIKETHROUGH:
+      {
+        GetStrikethroughProperties(impl.mController, value, Text::EffectStyle::DEFAULT);
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::CHARACTER_SPACING:
+      {
+        value = impl.mController->GetCharacterSpacing();
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::RELATIVE_LINE_SIZE:
+      {
+        value = impl.mController->GetRelativeLineSize();
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::ANCHOR_COLOR:
+      {
+        value = impl.mController->GetAnchorColor();
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::ANCHOR_CLICKED_COLOR:
+      {
+        value = impl.mController->GetAnchorClickedColor();
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::REMOVE_FRONT_INSET:
+      {
+        value = impl.mController->IsRemoveFrontInset();
+        break;
+      }
+      case Toolkit::DevelTextLabel::Property::REMOVE_BACK_INSET:
+      {
+        value = impl.mController->IsRemoveBackInset();
+        break;
+      }
     }
   }
 
@@ -776,6 +909,14 @@ bool TextLabel::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface*
       labelImpl.AnchorClickedSignal().Connect(tracker, functor);
     }
   }
+  else if(0 == strcmp(signalName.c_str(), SIGNAL_TEXT_FIT_CHANGED))
+  {
+    if(label)
+    {
+      Internal::TextLabel& labelImpl(GetImpl(label));
+      labelImpl.TextFitChangedSignal().Connect(tracker, functor);
+    }
+  }
   else
   {
     // signalName does not match any signal
@@ -790,6 +931,11 @@ DevelTextLabel::AnchorClickedSignalType& TextLabel::AnchorClickedSignal()
   return mAnchorClickedSignal;
 }
 
+DevelTextLabel::TextFitChangedSignalType& TextLabel::TextFitChangedSignal()
+{
+  return mTextFitChangedSignal;
+}
+
 void TextLabel::OnInitialize()
 {
   Actor self = Self();
@@ -812,9 +958,6 @@ void TextLabel::OnInitialize()
   self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH);
   self.SetResizePolicy(ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT);
 
-  // Enable highlightability
-  self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
-
   // Enable the text ellipsis.
   mController->SetTextElideEnabled(true); // If false then text larger than control will overflow
 
@@ -825,13 +968,25 @@ void TextLabel::OnInitialize()
 
   self.LayoutDirectionChangedSignal().Connect(this, &TextLabel::OnLayoutDirectionChanged);
 
+  if(Dali::Adaptor::IsAvailable())
+  {
+    Dali::Adaptor::Get().LocaleChangedSignal().Connect(this, &TextLabel::OnLocaleChanged);
+  }
+
   Layout::Engine& engine = mController->GetLayoutEngine();
   engine.SetCursorWidth(0u); // Do not layout space for the cursor.
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new AccessibleImpl(actor, Dali::Accessibility::Role::LABEL));
-  });
+  // Accessibility
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::LABEL);
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+
+  Accessibility::Bridge::EnabledSignal().Connect(this, &TextLabel::OnAccessibilityStatusChanged);
+  Accessibility::Bridge::DisabledSignal().Connect(this, &TextLabel::OnAccessibilityStatusChanged);
+}
+
+DevelControl::ControlAccessible* TextLabel::CreateAccessibleObject()
+{
+  return new TextLabelAccessible(Self());
 }
 
 void TextLabel::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change)
@@ -919,6 +1074,12 @@ void TextLabel::OnPropertySet(Property::Index index, const Property::Value& prop
       }
       break;
     }
+    case Toolkit::TextLabel::Property::TEXT:
+    case Toolkit::TextLabel::Property::ENABLE_MARKUP:
+    {
+      CommonTextUtils::SynchronizeTextAnchorsInParent(Self(), mController, mAnchorActors);
+      break;
+    }
     default:
     {
       Control::OnPropertySet(index, propertyValue); // up call to control for non-handled properties
@@ -927,6 +1088,32 @@ void TextLabel::OnPropertySet(Property::Index index, const Property::Value& prop
   }
 }
 
+void TextLabel::OnSceneConnection(int depth)
+{
+  if(mController->IsAutoScrollEnabled() || mLastAutoScrollEnabled)
+  {
+    mController->SetAutoScrollEnabled(true);
+  }
+  Control::OnSceneConnection(depth);
+}
+
+void TextLabel::OnSceneDisconnection()
+{
+  if(mTextScroller)
+  {
+    if(mLastAutoScrollEnabled && !mController->IsAutoScrollEnabled())
+    {
+      mLastAutoScrollEnabled = false;
+    }
+
+    const Toolkit::TextLabel::AutoScrollStopMode::Type stopMode = mTextScroller->GetStopMode();
+    mTextScroller->SetStopMode(Toolkit::TextLabel::AutoScrollStopMode::IMMEDIATE);
+    mTextScroller->StopScrolling();
+    mTextScroller->SetStopMode(stopMode);
+  }
+  Control::OnSceneDisconnection();
+}
+
 void TextLabel::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
   DALI_LOG_INFO(gLogFilter, Debug::General, "TextLabel::OnRelayout\n");
@@ -938,7 +1125,12 @@ void TextLabel::OnRelayout(const Vector2& size, RelayoutContainer& container)
 
   Vector2 contentSize(size.x - (padding.start + padding.end), size.y - (padding.top + padding.bottom));
 
-  if(mController->IsTextFitEnabled())
+  if(mController->IsTextFitArrayEnabled())
+  {
+    mController->FitArrayPointSizeforLayout(contentSize);
+    mController->SetTextFitContentSize(contentSize);
+  }
+  else if(mController->IsTextFitEnabled())
   {
     mController->FitPointSizeforLayout(contentSize);
     mController->SetTextFitContentSize(contentSize);
@@ -981,10 +1173,25 @@ void TextLabel::OnRelayout(const Vector2& size, RelayoutContainer& container)
     alignmentOffset.x = 0.0f;
     alignmentOffset.y = (contentSize.y - layoutSize.y) * VERTICAL_ALIGNMENT_TABLE[mController->GetVerticalAlignment()];
 
+    const int maxTextureSize = Dali::GetMaxTextureSize();
+    if(layoutSize.width > maxTextureSize)
+    {
+      DALI_LOG_WARNING("layoutSize(%f) > maxTextureSize(%d): To guarantee the behavior of Texture::New, layoutSize must not be bigger than maxTextureSize\n", layoutSize.width, maxTextureSize);
+      layoutSize.width = maxTextureSize;
+    }
+
+    // This affects font rendering quality.
+    // It need to be integerized.
+    Vector2 visualTransformOffset;
+    visualTransformOffset.x = roundf(padding.start + alignmentOffset.x);
+    visualTransformOffset.y = roundf(padding.top + alignmentOffset.y);
+
+    mController->SetVisualTransformOffset(visualTransformOffset);
+
     Property::Map visualTransform;
     visualTransform.Add(Toolkit::Visual::Transform::Property::SIZE, layoutSize)
       .Add(Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE))
-      .Add(Toolkit::Visual::Transform::Property::OFFSET, Vector2(padding.start, padding.top) + alignmentOffset)
+      .Add(Toolkit::Visual::Transform::Property::OFFSET, visualTransformOffset)
       .Add(Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE))
       .Add(Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN)
       .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN);
@@ -997,6 +1204,12 @@ void TextLabel::OnRelayout(const Vector2& size, RelayoutContainer& container)
 
     mTextUpdateNeeded = false;
   }
+
+  if(mController->IsTextFitChanged())
+  {
+    EmitTextFitChangedSignal();
+    mController->SetTextFitChanged(false);
+  }
 }
 
 void TextLabel::RequestTextRelayout()
@@ -1038,6 +1251,7 @@ void TextLabel::SetUpAutoScrolling()
     if(textNaturalSize.width > maxTextureSize)
     {
       mController->SetTextElideEnabled(true);
+      mController->SetAutoScrollMaxTextureExceeded(true);
     }
     GetHeightForWidth(maxTextureSize);
     wrapGap = std::max(maxTextureSize - textNaturalSize.width, 0.0f);
@@ -1065,14 +1279,19 @@ void TextLabel::SetUpAutoScrolling()
   Renderer renderer = static_cast<Internal::Visual::Base&>(GetImplementation(mVisual)).GetRenderer();
   mTextScroller->SetParameters(Self(), renderer, textureSet, controlSize, verifiedSize, wrapGap, direction, mController->GetHorizontalAlignment(), mController->GetVerticalAlignment());
   mController->SetTextElideEnabled(actualellipsis);
+  mController->SetAutoScrollMaxTextureExceeded(false);
 }
 
 void TextLabel::ScrollingFinished()
 {
   // Pure Virtual from TextScroller Interface
   DALI_LOG_INFO(gLogFilter, Debug::General, "TextLabel::ScrollingFinished\n");
-  mController->SetAutoScrollEnabled(false);
-  RequestTextRelayout();
+
+  if(mController->IsAutoScrollEnabled() || !mController->IsMultiLineEnabled())
+  {
+    mController->SetAutoScrollEnabled(false);
+    RequestTextRelayout();
+  }
 }
 
 void TextLabel::OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type)
@@ -1080,196 +1299,142 @@ void TextLabel::OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type
   mController->ChangedLayoutDirection();
 }
 
-TextLabel::TextLabel()
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
-  mRenderingBackend(DEFAULT_RENDERING_BACKEND),
-  mTextUpdateNeeded(false)
+void TextLabel::OnLocaleChanged(std::string locale)
 {
+  if(mLocale != locale)
+  {
+    mLocale = locale;
+    mController->ResetFontAndStyleData();
+  }
 }
 
-TextLabel::~TextLabel()
+std::string TextLabel::GetLocale()
 {
+  return mLocale;
 }
 
-std::string TextLabel::AccessibleImpl::GetNameRaw()
+void TextLabel::EmitTextFitChangedSignal()
 {
-  auto self = Toolkit::TextLabel::DownCast(Self());
-  return self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
+  Dali::Toolkit::TextLabel handle(GetOwner());
+  mTextFitChangedSignal.Emit(handle);
 }
 
-Property::Index TextLabel::AccessibleImpl::GetNamePropertyIndex()
+void TextLabel::OnAccessibilityStatusChanged()
 {
-  return Toolkit::TextLabel::Property::TEXT;
+  CommonTextUtils::SynchronizeTextAnchorsInParent(Self(), mController, mAnchorActors);
 }
 
-std::string TextLabel::AccessibleImpl::GetText(size_t startOffset, size_t endOffset)
+TextLabel::TextLabel(ControlBehaviour additionalBehaviour)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)),
+  mLocale(std::string()),
+  mRenderingBackend(DEFAULT_RENDERING_BACKEND),
+  mTextUpdateNeeded(false),
+  mLastAutoScrollEnabled(false)
 {
-  if(endOffset <= startOffset)
-  {
-    return {};
-  }
-
-  auto self = Toolkit::TextLabel::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
+}
 
-  if(startOffset > text.size() || endOffset > text.size())
-  {
-    return {};
-  }
+TextLabel::~TextLabel()
+{
+}
 
-  return text.substr(startOffset, endOffset - startOffset);
+Vector<Vector2> TextLabel::GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const
+{
+  return mController->GetTextSize(startIndex, endIndex);
 }
 
-size_t TextLabel::AccessibleImpl::GetCharacterCount()
+Vector<Vector2> TextLabel::GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const
 {
-  auto self = Toolkit::TextLabel::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
+  return mController->GetTextPosition(startIndex, endIndex);
+}
 
-  return text.size();
+Rect<float> TextLabel::GetLineBoundingRectangle(const uint32_t lineIndex) const
+{
+  return mController->GetLineBoundingRectangle(lineIndex);
 }
 
-size_t TextLabel::AccessibleImpl::GetCursorOffset()
+Rect<float> TextLabel::GetCharacterBoundingRectangle(const uint32_t charIndex) const
 {
-  return {};
+  return mController->GetCharacterBoundingRectangle(charIndex);
 }
 
-bool TextLabel::AccessibleImpl::SetCursorOffset(size_t offset)
+int TextLabel::GetCharacterIndexAtPosition(float visualX, float visualY) const
 {
-  return {};
+  return mController->GetCharacterIndexAtPosition(visualX, visualY);
 }
 
-Dali::Accessibility::Range TextLabel::AccessibleImpl::GetTextAtOffset(size_t offset, Dali::Accessibility::TextBoundary boundary)
+Rect<> TextLabel::GetTextBoundingRectangle(uint32_t startIndex, uint32_t endIndex) const
 {
-  auto self = Toolkit::TextLabel::DownCast(Self());
-  auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
-  auto textSize = text.size();
+  return mController->GetTextBoundingRectangle(startIndex, endIndex);
+}
 
-  auto range = Dali::Accessibility::Range{};
+void TextLabel::SetSpannedText(const Text::Spanned& spannedText)
+{
+  mController->SetSpannedText(spannedText);
+}
 
-  switch(boundary)
+void TextLabel::SetTextFitArray(const bool enable, std::vector<Toolkit::DevelTextLabel::FitOption>& fitOptions)
+{
+  if(!enable)
   {
-    case Dali::Accessibility::TextBoundary::CHARACTER:
-    {
-      if(offset < textSize)
-      {
-        range.content     = text[offset];
-        range.startOffset = offset;
-        range.endOffset   = offset + 1;
-      }
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::WORD:
-    case Dali::Accessibility::TextBoundary::LINE:
-    {
-      auto textString = text.c_str();
-      auto breaks = std::vector<char>(textSize, 0);
-
-      if(boundary == Dali::Accessibility::TextBoundary::WORD)
-      {
-        Accessibility::Accessible::FindWordSeparationsUtf8(reinterpret_cast<const utf8_t*>(textString), textSize, "", breaks.data());
-      }
-      else
-      {
-        Accessibility::Accessible::FindLineSeparationsUtf8(reinterpret_cast<const utf8_t*>(textString), textSize, "", breaks.data());
-      }
+    // If TextFitArray is disabled, MinLineSize shoud be restored to its original size.
+    mController->SetDefaultLineSize(mController->GetCurrentLineSize());
+  }
+  mController->SetTextFitArrayEnabled(enable);
+  mController->SetTextFitArray(fitOptions);
+}
 
-      auto index = 0u;
-      auto counter = 0u;
-      while(index < textSize && counter <= offset)
-      {
-        auto start = index;
-        if(breaks[index])
-        {
-          while(breaks[index])
-          {
-            index++;
-          }
-          counter++;
-        }
-        else
-        {
-          if(boundary == Dali::Accessibility::TextBoundary::WORD)
-          {
-            index++;
-          }
-          if(boundary == Dali::Accessibility::TextBoundary::LINE)
-          {
-            counter++;
-          }
-        }
+std::vector<Toolkit::DevelTextLabel::FitOption>& TextLabel::GetTextFitArray()
+{
+  return mController->GetTextFitArray();
+}
 
-        if((counter > 0) && ((counter - 1) == offset))
-        {
-          range.content     = text.substr(start, index - start + 1);
-          range.startOffset = start;
-          range.endOffset   = index + 1;
-        }
+bool TextLabel::IsTextFitArrayEnabled() const
+{
+  return mController->IsTextFitArrayEnabled();
+}
 
-        if(boundary == Dali::Accessibility::TextBoundary::LINE)
-        {
-          index++;
-        }
-      }
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::SENTENCE:
-    {
-      /* not supported by default */
-      break;
-    }
-    case Dali::Accessibility::TextBoundary::PARAGRAPH:
-    {
-      /* Paragraph is not supported by libunibreak library */
-      break;
-    }
-    default:
-      break;
-  }
+void TextLabel::SetRemoveFrontInset(bool remove)
+{
+  mController->SetRemoveFrontInset(remove);
+}
 
-  return range;
+bool TextLabel::IsRemoveFrontInset() const
+{
+  return mController->IsRemoveFrontInset();
 }
 
-Dali::Accessibility::Range TextLabel::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex)
+void TextLabel::SetRemoveBackInset(bool remove)
 {
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return {};
-  }
+  mController->SetRemoveBackInset(remove);
+}
 
-  auto self  = Toolkit::TextLabel::DownCast(Self());
-  auto controller = Dali::Toolkit::GetImpl(self).GetTextController();
-  std::string value{};
-  controller->RetrieveSelection(value);
-  auto indices = controller->GetSelectionIndexes();
+bool TextLabel::IsRemoveBackInset() const
+{
+  return mController->IsRemoveBackInset();
+}
 
-  return {static_cast<size_t>(indices.first), static_cast<size_t>(indices.second), value};
+std::string TextLabel::TextLabelAccessible::GetNameRaw() const
+{
+  return GetWholeText();
 }
 
-bool TextLabel::AccessibleImpl::RemoveSelection(size_t selectionIndex)
+Property::Index TextLabel::TextLabelAccessible::GetNamePropertyIndex()
 {
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return false;
-  }
+  return Toolkit::TextLabel::Property::TEXT;
+}
 
+const std::vector<Toolkit::TextAnchor>& TextLabel::TextLabelAccessible::GetTextAnchors() const
+{
   auto self = Toolkit::TextLabel::DownCast(Self());
-  Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(0, 0);
-  return true;
+
+  return Toolkit::GetImpl(self).mAnchorActors;
 }
 
-bool TextLabel::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
+Toolkit::Text::ControllerPtr TextLabel::TextLabelAccessible::GetTextController() const
 {
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if(selectionIndex > 0)
-  {
-    return false;
-  }
-
   auto self = Toolkit::TextLabel::DownCast(Self());
-  Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(startOffset, endOffset);
-  return true;
+
+  return Toolkit::GetImpl(self).GetTextController();
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index 01e003b..5730cc5 100644
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,20 +19,24 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/atspi-interfaces/hypertext.h>
+#include <dali/devel-api/atspi-interfaces/text.h>
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spanned.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-anchor-control-interface.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller.h>
 #include <dali-toolkit/internal/text/text-scroller-interface.h>
 #include <dali-toolkit/internal/text/text-scroller.h>
 #include <dali-toolkit/internal/visuals/text/text-visual.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-
 namespace Dali
 {
 namespace Toolkit
@@ -47,8 +51,9 @@ class TextLabel : public Control, public Text::ControlInterface, public Text::Sc
 public:
   /**
    * @copydoc Dali::Toollkit::TextLabel::New()
+   * @param[in] additionalBehaviour custom behavior flags for this TextLabel. Default is CONTROL_BEHAVIOUR_DEFAULT
    */
-  static Toolkit::TextLabel New();
+  static Toolkit::TextLabel New(ControlBehaviour additionalBehaviour = ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
 
   // Properties
 
@@ -76,6 +81,11 @@ public:
   DevelTextLabel::AnchorClickedSignalType& AnchorClickedSignal();
 
   /**
+   * @copydoc Dali::Toollkit::TextLabel::TextFitChangedSignal()
+   */
+  DevelTextLabel::TextFitChangedSignalType& TextFitChangedSignal();
+
+  /**
    * Connects a callback function with the object's signals.
    * @param[in] object The object providing the signal.
    * @param[in] tracker Used to disconnect the signal.
@@ -93,6 +103,129 @@ public:
    */
   Text::ControllerPtr GetTextController();
 
+  /**
+   * @brief Get the rendered size of a specific text range.
+   * if the requested text is at multilines, multiple sizes will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to calculate size for.
+   * @param[in] endIndex end index(included) of the text requested to calculate size for.
+   * @return list of sizes of the reuested text.
+   */
+  Vector<Vector2> GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const;
+
+  /**
+   * @brief Get the top/left rendered position of a specific text range.
+   * if the requested text is at multilines, multiple positions will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple positions will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to get position to.
+   * @param[in] endIndex end index(included) of the text requested to get position to.
+   * @return list of positions of the requested text.
+   */
+  Vector<Vector2> GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const;
+
+  /**
+   * @brief Get the line bounding rectangle.
+   * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] lineIndex line index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+  Rect<float> GetLineBoundingRectangle(const uint32_t lineIndex) const;
+
+  /**
+   * @brief Get the character bounding rectangle.
+   * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] charIndex character index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+  Rect<float> GetCharacterBoundingRectangle(const uint32_t charIndex) const;
+
+  /**
+   * @brief Get the character index.
+   * If the text is not yet rendered or the textis empty, -1 is returned.
+   *
+   * @param[in] visualX visual x position.
+   * @param[in] visualY visual y position.
+   * @return character index.
+   */
+  int GetCharacterIndexAtPosition(float visualX, float visualY) const;
+
+  /**
+   * @brief Gets the bounding box of a specific text range.
+   *
+   * @param[in] startIndex start index of the text requested to get bounding box to.
+   * @param[in] endIndex end index(included) of the text requested to get bounding box to.
+   * @return bounding box of the requested text.
+   */
+  Rect<> GetTextBoundingRectangle(uint32_t startIndex, uint32_t endIndex) const;
+
+  /**
+   * @brief Set the @p spannedText into current textLabel
+   * the spanned text contains content (text) and  format (spans with ranges)
+   * the text is copied into text-controller and the spans are applied on ranges
+   *
+   * @param[in] spannedText the text with spans.
+   */
+  void SetSpannedText(const Text::Spanned& spannedText);
+
+  /**
+   * @brief Set text fit array to text label.
+   *
+   * @param[in] enable Whether the text fit array is enabled or not.
+   * @param[in] fitOptions list of the fit options.
+   */
+  void SetTextFitArray(const bool enable, std::vector<Toolkit::DevelTextLabel::FitOption>& fitOptions);
+
+  /**
+   * @brief Get the text fit array of text label.
+   *
+   * @return list of the fit options.
+   */
+  std::vector<Toolkit::DevelTextLabel::FitOption>& GetTextFitArray();
+
+  /**
+   * @brief Whether the text fit array is enabled or not.
+   *
+   * @return True if the text fit array is enabled.
+   */
+  bool IsTextFitArrayEnabled() const;
+
+  /**
+   * @brief Gets the locale.
+   */
+  std::string GetLocale();
+
+  /**
+   * @brief Set removing front inset to text label.
+   *
+   * @param[in] remove Whether front inset of text label has to be removed or not.
+   */
+  void SetRemoveFrontInset(const bool remove);
+
+  /**
+   * @brief Whether front inset of text label is removed or not.
+   *
+   * @return True if the front inset of text label is removed.
+   */
+  bool IsRemoveFrontInset() const;
+
+  /**
+   * @brief Set removing back inset to text label.
+   *
+   * @param[in] remove Whether back inset of text label has to be removed or not.
+   */
+  void SetRemoveBackInset(const bool remove);
+
+  /**
+   * @brief Whether back inset of text label is removed or not.
+   *
+   * @return True if the back inset of text label is removed.
+   */
+  bool IsRemoveBackInset() const;
+
 private: // From Control
   /**
    * @copydoc Control::OnInitialize()
@@ -100,6 +233,11 @@ private: // From Control
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
    * @copydoc Control::OnStyleChange()
    */
   void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) override;
@@ -129,6 +267,16 @@ private: // From Control
    */
   void OnPropertySet(Property::Index index, const Property::Value& propertyValue) override;
 
+  /**
+   * @copydoc Control::OnSceneConnection()
+   */
+  void OnSceneConnection(int depth) override;
+
+  /**
+   * @copydoc Control::OnSceneDisconnection()
+   */
+  void OnSceneDisconnection() override;
+
   // From ControlInterface
 
   /**
@@ -151,8 +299,10 @@ public: // From AnchorControlInterface
 private: // Implementation
   /**
    * Construct a new TextLabel.
+   *
+   * @param[in] additionalBehaviour additional behaviour flags for this TextLabel
    */
-  TextLabel();
+  TextLabel(ControlBehaviour additionalBehaviour);
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
@@ -189,76 +339,65 @@ private:
    */
   void OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type);
 
+  /**
+   * @brief Callback function for when the locale is changed.
+   * @param[in] locale The new system locale.
+   */
+  void OnLocaleChanged(std::string locale);
+
+  /**
+   * @brief Emits TextFitChanged signal.
+   */
+  void EmitTextFitChangedSignal();
+  void OnAccessibilityStatusChanged();
+
 private: // Data
   Text::ControllerPtr   mController;
   Text::TextScrollerPtr mTextScroller;
 
   Toolkit::Visual::Base mVisual;
 
+  std::vector<Toolkit::TextAnchor> mAnchorActors;
+
   // Signals
-  Toolkit::DevelTextLabel::AnchorClickedSignalType mAnchorClickedSignal;
+  Toolkit::DevelTextLabel::AnchorClickedSignalType  mAnchorClickedSignal;
+  Toolkit::DevelTextLabel::TextFitChangedSignalType mTextFitChangedSignal;
+
+  std::string mLocale;
 
   int  mRenderingBackend;
   bool mTextUpdateNeeded : 1;
+  bool mLastAutoScrollEnabled : 1;
 
 protected:
   /**
    * @brief This structure is to connect TextLabel with Accessible functions.
    */
-  struct AccessibleImpl : public DevelControl::AccessibleImpl,
-                          public virtual Dali::Accessibility::Text
+  class TextLabelAccessible : public TextControlAccessible
   {
-    using DevelControl::AccessibleImpl::AccessibleImpl;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetText()
-     */
-    std::string GetText(size_t startOffset, size_t endOffset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetCharacterCount()
-     */
-    size_t GetCharacterCount() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetCursorOffset()
-     */
-    size_t GetCursorOffset() override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::SetCursorOffset()
-     */
-    bool SetCursorOffset(size_t offset) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetTextAtOffset()
-     */
-    Accessibility::Range GetTextAtOffset(size_t offset, Accessibility::TextBoundary boundary) override;
-
-    /**
-     * @copydoc Dali::Accessibility::Text::GetRangeOfSelection()
-     */
-    Accessibility::Range GetRangeOfSelection(size_t selectionIndex) override;
+  public:
+    using TextControlAccessible::TextControlAccessible;
 
     /**
-     * @copydoc Dali::Accessibility::Text::RemoveSelection()
+     * @copydoc Dali::Accessibility::Text::GetNameRaw()
      */
-    bool RemoveSelection(size_t selectionIndex) override;
+    std::string GetNameRaw() const override;
 
     /**
-     * @copydoc Dali::Accessibility::Text::SetRangeOfSelection()
+     * @copydoc Dali::Accessibility::Text::GetNamePropertyIndex()
      */
-    bool SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset) override;
+    Property::Index GetNamePropertyIndex() override;
 
+  protected:
     /**
-     * @copydoc Dali::Accessibility::Text::GetNameRaw()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextAnchors()
      */
-    std::string GetNameRaw() override;
+    const std::vector<Toolkit::TextAnchor>& GetTextAnchors() const override;
 
     /**
-     * @copydoc Dali::Accessibility::Text::GetNamePropertyIndex()
+     * @copydoc Dali::Toolkit::Internal::TextControlAccessible::GetTextController()
      */
-    Property::Index GetNamePropertyIndex() override;
+    Toolkit::Text::ControllerPtr GetTextController() const override;
   };
 };
 
diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
index e2d9f91..50d7d3d 100644
--- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
@@ -26,7 +26,6 @@
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/math/vector4.h>
-#include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <string.h>
 #include <cfloat>
@@ -37,7 +36,9 @@
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.h>
 #include <dali-toolkit/internal/helpers/color-conversion.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 #include <dali-toolkit/public-api/visuals/color-visual-properties.h>
@@ -56,8 +57,10 @@ namespace
 #define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
 #endif
 
-const std::string   TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME("TextSelectionPopupButton");
+const char*   TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME("TextSelectionPopupButton");
 const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR(Dali::Vector4(0.24f, 0.72f, 0.8f, 1.0f));
+const float         DEFAULT_OPTION_PRESSED_CORNER_RADIUS = 0.0f;
+const Dali::Vector4 DEFAULT_LABEL_PADDING(Dali::Vector4(24.0f, 24.0f, 14.0f, 14.0f));
 
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
@@ -90,8 +93,8 @@ const char* const OPTION_COPY("optionCopy");                 // "Copy" popup opt
 const char* const OPTION_PASTE("optionPaste");               // "Paste" popup option.
 const char* const OPTION_CLIPBOARD("optionClipboard");       // "Clipboard" popup option.
 
-const std::string IDS_LTR("IDS_LTR");
-const std::string RTL_DIRECTION("RTL");
+const char* IDS_LTR("IDS_LTR");
+const char* RTL_DIRECTION("RTL");
 
 BaseHandle Create()
 {
@@ -102,25 +105,31 @@ BaseHandle Create()
 
 DALI_TYPE_REGISTRATION_BEGIN(Toolkit::TextSelectionPopup, Toolkit::Control, Create);
 
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupMaxSize", VECTOR2, POPUP_MAX_SIZE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupMinSize", VECTOR2, POPUP_MIN_SIZE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionMaxSize", VECTOR2, OPTION_MAX_SIZE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionMinSize", VECTOR2, OPTION_MIN_SIZE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionDividerSize", VECTOR2, OPTION_DIVIDER_SIZE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionDividerPadding", VECTOR4, OPTION_DIVIDER_PADDING)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupClipboardButtonImage", STRING, POPUP_CLIPBOARD_BUTTON_ICON_IMAGE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupCutButtonImage", STRING, POPUP_CUT_BUTTON_ICON_IMAGE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupCopyButtonImage", STRING, POPUP_COPY_BUTTON_ICON_IMAGE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPasteButtonImage", STRING, POPUP_PASTE_BUTTON_ICON_IMAGE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupSelectButtonImage", STRING, POPUP_SELECT_BUTTON_ICON_IMAGE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupSelectAllButtonImage", STRING, POPUP_SELECT_ALL_BUTTON_ICON_IMAGE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupDividerColor", VECTOR4, POPUP_DIVIDER_COLOR)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupIconColor", VECTOR4, POPUP_ICON_COLOR)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPressedColor", VECTOR4, POPUP_PRESSED_COLOR)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPressedImage", STRING, POPUP_PRESSED_IMAGE)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupFadeInDuration", FLOAT, POPUP_FADE_IN_DURATION)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupFadeOutDuration", FLOAT, POPUP_FADE_OUT_DURATION)
-DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "backgroundBorder", MAP, BACKGROUND_BORDER)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupMaxSize",              VECTOR2, POPUP_MAX_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupMinSize",              VECTOR2, POPUP_MIN_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionMaxSize",             VECTOR2, OPTION_MAX_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionMinSize",             VECTOR2, OPTION_MIN_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionDividerSize",         VECTOR2, OPTION_DIVIDER_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionDividerPadding",      VECTOR4, OPTION_DIVIDER_PADDING)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupClipboardButtonImage", STRING,  POPUP_CLIPBOARD_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupCutButtonImage",       STRING,  POPUP_CUT_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupCopyButtonImage",      STRING,  POPUP_COPY_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPasteButtonImage",     STRING,  POPUP_PASTE_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupSelectButtonImage",    STRING,  POPUP_SELECT_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupSelectAllButtonImage", STRING,  POPUP_SELECT_ALL_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupDividerColor",         VECTOR4, POPUP_DIVIDER_COLOR)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupIconColor",            VECTOR4, POPUP_ICON_COLOR)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPressedColor",         VECTOR4, POPUP_PRESSED_COLOR)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPressedCornerRadius",  FLOAT,   POPUP_PRESSED_CORNER_RADIUS)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPressedImage",         STRING,  POPUP_PRESSED_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupFadeInDuration",       FLOAT,   POPUP_FADE_IN_DURATION)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupFadeOutDuration",      FLOAT,   POPUP_FADE_OUT_DURATION)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "backgroundBorder",          MAP,     BACKGROUND_BORDER)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "background",                MAP,     BACKGROUND)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "labelMinimumSize",          VECTOR2, LABEL_MINIMUM_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "labelPadding",              VECTOR4, LABEL_PADDING)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "labelTextVisual",           MAP,     LABEL_TEXT_VISUAL)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "enableScrollBar",           BOOLEAN, ENABLE_SCROLL_BAR)
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -149,203 +158,73 @@ void TextSelectionPopup::SetProperty(BaseObject* object, Property::Index index,
 
   if(selectionPopup)
   {
-    TextSelectionPopup& impl(GetImpl(selectionPopup));
-
-    switch(index)
-    {
-      case Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE:
-      {
-        impl.SetDimensionToCustomise(POPUP_MAXIMUM_SIZE, value.Get<Vector2>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE:
-      {
-        impl.SetDimensionToCustomise(OPTION_MAXIMUM_SIZE, value.Get<Vector2>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE:
-      {
-        impl.SetDimensionToCustomise(OPTION_MINIMUM_SIZE, value.Get<Vector2>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE:
-      {
-        impl.SetDimensionToCustomise(OPTION_DIVIDER_SIZE, value.Get<Vector2>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_PADDING:
-      {
-        Vector4 padding(value.Get<Vector4>());
-        impl.SetOptionDividerPadding(Padding(padding.x, padding.y, padding.z, padding.w));
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
-      {
-        impl.SetButtonImage(Toolkit::TextSelectionPopup::CLIPBOARD, value.Get<std::string>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE:
-      {
-        impl.SetButtonImage(Toolkit::TextSelectionPopup::CUT, value.Get<std::string>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE:
-      {
-        impl.SetButtonImage(Toolkit::TextSelectionPopup::COPY, value.Get<std::string>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE:
-      {
-        impl.SetButtonImage(Toolkit::TextSelectionPopup::PASTE, value.Get<std::string>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE:
-      {
-        impl.SetButtonImage(Toolkit::TextSelectionPopup::SELECT, value.Get<std::string>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE:
-      {
-        impl.SetButtonImage(Toolkit::TextSelectionPopup::SELECT_ALL, value.Get<std::string>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_DIVIDER_COLOR:
-      {
-        impl.mDividerColor = value.Get<Vector4>();
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_ICON_COLOR:
-      {
-        impl.mIconColor = value.Get<Vector4>();
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_COLOR:
-      {
-        impl.mPressedColor = value.Get<Vector4>();
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE:
-      {
-        impl.SetPressedImage(value.Get<std::string>());
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION:
-      {
-        impl.mFadeInDuration = value.Get<float>();
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION:
-      {
-        impl.mFadeOutDuration = value.Get<float>();
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
-      {
-        Property::Map map = value.Get<Property::Map>();
-        impl.CreateBackgroundBorder(map);
-        break;
-      }
-    } // switch
-  }   // TextSelectionPopup
+    PropertyHandler::SetProperty(selectionPopup, index, value);
+  }
 }
 
 Property::Value TextSelectionPopup::GetProperty(BaseObject* object, Property::Index index)
 {
   Property::Value value;
-
   Toolkit::TextSelectionPopup selectionPopup = Toolkit::TextSelectionPopup::DownCast(Dali::BaseHandle(object));
 
   if(selectionPopup)
   {
-    TextSelectionPopup& impl(GetImpl(selectionPopup));
+    value = PropertyHandler::GetProperty(selectionPopup, index);
+  }
+  return value;
+}
+
+void TextSelectionPopup::SetProperties(const Property::Map& properties)
+{
+  Toolkit::TextSelectionPopup selectionPopup = Toolkit::TextSelectionPopup::DownCast(Self());
 
-    switch(index)
+  if(selectionPopup)
+  {
+    const Property::Map::SizeType count = properties.Count();
+    for(Property::Map::SizeType position = 0; position < count; ++position)
     {
-      case Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE:
-      {
-        value = impl.GetDimensionToCustomise(POPUP_MAXIMUM_SIZE);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE:
-      {
-        value = impl.GetDimensionToCustomise(OPTION_MAXIMUM_SIZE);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE:
-      {
-        value = impl.GetDimensionToCustomise(OPTION_MINIMUM_SIZE);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE:
-      {
-        value = impl.GetDimensionToCustomise(OPTION_DIVIDER_SIZE);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_PADDING:
-      {
-        Padding padding = impl.GetOptionDividerPadding();
-        value           = Vector4(padding.left, padding.right, padding.top, padding.bottom);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
-      {
-        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::CLIPBOARD);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE:
-      {
-        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::CUT);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE:
-      {
-        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::COPY);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE:
-      {
-        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::PASTE);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE:
-      {
-        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::SELECT);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE:
-      {
-        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::SELECT_ALL);
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE:
-      {
-        value = impl.GetPressedImage();
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION:
-      {
-        value = impl.mFadeInDuration;
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION:
-      {
-        value = impl.mFadeOutDuration;
-        break;
-      }
-      case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
-      {
-        Property::Map         map;
-        Toolkit::Visual::Base visual = DevelControl::GetVisual(impl, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER);
-        if(visual)
-        {
-          visual.CreatePropertyMap(map);
-        }
-        value = map;
-        break;
-      }
-    } // switch
+      KeyValuePair     keyValue = properties.GetKeyValue(position);
+      Property::Key&   key      = keyValue.first;
+      Property::Value& value    = keyValue.second;
+      PropertyHandler::SetProperty(selectionPopup, key.indexKey, value);
+    }
   }
-  return value;
+}
+
+void TextSelectionPopup::GetProperties(Property::Map& properties)
+{
+  Property::Map map;
+
+  map.Insert(Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE, GetDimensionToCustomise(POPUP_MAXIMUM_SIZE));
+  map.Insert(Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE, GetDimensionToCustomise(OPTION_DIVIDER_SIZE));
+  map.Insert(Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_PADDING, Vector4(mOptionDividerPadding.left, mOptionDividerPadding.right, mOptionDividerPadding.top, mOptionDividerPadding.bottom));
+  map.Insert(Toolkit::TextSelectionPopup::Property::LABEL_MINIMUM_SIZE, mLabelMinimumSize);
+  map.Insert(Toolkit::TextSelectionPopup::Property::LABEL_PADDING, Vector4(mLabelPadding.left, mLabelPadding.right, mLabelPadding.top, mLabelPadding.bottom));
+  map.Insert(Toolkit::TextSelectionPopup::Property::LABEL_TEXT_VISUAL, mLabelTextVisual);
+  map.Insert(Toolkit::TextSelectionPopup::Property::ENABLE_SCROLL_BAR, mEnableScrollBar);
+  map.Insert(Toolkit::TextSelectionPopup::Property::POPUP_DIVIDER_COLOR, mDividerColor);
+  map.Insert(Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION, mFadeInDuration);
+  map.Insert(Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION, mFadeOutDuration);
+  map.Insert(Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_COLOR, mPressedColor);
+  map.Insert(Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_CORNER_RADIUS, mPressedCornerRadius);
+
+  Property::Map backgroundMap;
+  Toolkit::Visual::Base backgroundVisual = DevelControl::GetVisual(*this, Toolkit::Control::Property::BACKGROUND);
+  if(backgroundVisual)
+  {
+    backgroundVisual.CreatePropertyMap(backgroundMap);
+  }
+  map.Insert(Toolkit::TextSelectionPopup::Property::BACKGROUND, backgroundMap);
+
+  Property::Map borderMap;
+  Toolkit::Visual::Base borderVisual = DevelControl::GetVisual(*this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER);
+  if(borderVisual)
+  {
+    borderVisual.CreatePropertyMap(borderMap);
+  }
+  map.Insert(Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, borderMap);
+
+  properties = map;
 }
 
 void TextSelectionPopup::EnableButtons(Toolkit::TextSelectionPopup::Buttons buttonsToEnable)
@@ -397,13 +276,23 @@ void TextSelectionPopup::OnInitialize()
   self.SetResizePolicy(ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS);
   self.SetProperty(Actor::Property::COLOR_ALPHA, 0.0f);
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::DIALOG, true));
-  });
-
-  //Enable highightability
+  // Accessibility
   self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+  self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::DIALOG);
+}
+
+DevelControl::ControlAccessible* TextSelectionPopup::CreateAccessibleObject()
+{
+  return new TextSelectionPopupAccessible(Self());
+}
+
+Dali::Accessibility::States TextSelectionPopup::TextSelectionPopupAccessible::CalculateStates()
+{
+  auto states = ControlAccessible::CalculateStates();
+
+  states[Dali::Accessibility::State::MODAL] = true;
+
+  return states;
 }
 
 void TextSelectionPopup::HideAnimationFinished(Animation& animation)
@@ -652,6 +541,17 @@ Padding TextSelectionPopup::GetOptionDividerPadding() const
   return mOptionDividerPadding;
 }
 
+void TextSelectionPopup::SetLabelPadding(const Padding& padding)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextSelectionPopup::SetLabelPadding padding(%f,%f,%f,%f)\n", padding.left, padding.right, padding.top, padding.bottom);
+  mLabelPadding = Padding(padding.left, padding.right, padding.top, padding.bottom);
+}
+
+Padding TextSelectionPopup::GetLabelPadding() const
+{
+  return mLabelPadding;
+}
+
 void TextSelectionPopup::CreateOrderedListOfPopupOptions()
 {
   mOrderListOfButtons.clear();
@@ -677,6 +577,7 @@ void TextSelectionPopup::AddOption(const ButtonRequirement& button, bool showDiv
   Toolkit::PushButton option = Toolkit::PushButton::New();
   option.SetProperty(Dali::Actor::Property::NAME, button.name);
   option.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
+  option.SetProperty(Actor::Property::MINIMUM_SIZE, mLabelMinimumSize);
 
   switch(button.id)
   {
@@ -721,11 +622,14 @@ void TextSelectionPopup::AddOption(const ButtonRequirement& button, bool showDiv
   if(showCaption)
   {
     // PushButton layout properties.
-    option.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, Vector4(24.0f, 24.0f, 14.0f, 14.0f));
+    const Padding padding(mLabelPadding);
+    option.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, padding);
 
     // Label properties.
     Property::Map buttonLabelProperties;
     buttonLabelProperties.Insert(Toolkit::TextVisual::Property::TEXT, button.caption);
+    buttonLabelProperties.Merge(mLabelTextVisual);
+
     option.SetProperty(Toolkit::Button::Property::LABEL, buttonLabelProperties);
   }
   if(showIcons)
@@ -747,10 +651,16 @@ void TextSelectionPopup::AddOption(const ButtonRequirement& button, bool showDiv
   {
     // The image can be blank, the color can be used in that case.
     selectedBackgroundValue = Property::Value{{Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR},
-                                              {Toolkit::ColorVisual::Property::MIX_COLOR, mPressedColor}};
+                                              {Toolkit::ColorVisual::Property::MIX_COLOR, mPressedColor},
+                                              {Toolkit::DevelVisual::Property::CORNER_RADIUS, mPressedCornerRadius},
+                                              {Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, Toolkit::Visual::Transform::Policy::RELATIVE}};
   }
   option.SetProperty(Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, selectedBackgroundValue);
-  option.SetProperty(Toolkit::Control::Property::STYLE_NAME, TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME);
+  // The value set by user takes precedence over the theme value.
+  if(mLabelTextVisual.Count() == 0)
+  {
+    option.SetProperty(Toolkit::Control::Property::STYLE_NAME, TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME);
+  }
 
   // 5 Add option to tool bar
   mToolbar.AddOption(option);
@@ -809,16 +719,17 @@ void TextSelectionPopup::AddPopupOptionsToToolbar(bool showIcons, bool showCapti
 #ifdef DECORATOR_DEBUG
     mToolbar.SetProperty(Dali::Actor::Property::NAME, "TextSelectionToolbar");
 #endif
+    mToolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::ENABLE_SCROLL_BAR, mEnableScrollBar);
     self.Add(mToolbar);
   }
 
   // Whether to mirror the list of buttons (for right to left languages)
   bool mirror = false;
 #if defined(__GLIBC__)
-  char* idsLtr = GET_LOCALE_TEXT(IDS_LTR.c_str());
+  char* idsLtr = GET_LOCALE_TEXT(IDS_LTR);
   if(NULL != idsLtr)
   {
-    mirror = (0 == strcmp(idsLtr, RTL_DIRECTION.c_str()));
+    mirror = (0 == strcmp(idsLtr, RTL_DIRECTION));
 
     if(mirror)
     {
@@ -862,6 +773,22 @@ void TextSelectionPopup::CreateBackgroundBorder(Property::Map& propertyMap)
   }
 }
 
+void TextSelectionPopup::CreateBackground(Property::Map& propertyMap)
+{
+  // Removes previous image if necessary
+  DevelControl::UnregisterVisual(*this, Toolkit::Control::Property::BACKGROUND);
+
+  if(!propertyMap.Empty())
+  {
+    Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(propertyMap);
+
+    if(visual)
+    {
+      DevelControl::RegisterVisual(*this, Toolkit::Control::Property::BACKGROUND, visual, DepthIndex::BACKGROUND);
+    }
+  }
+}
+
 TextSelectionPopup::TextSelectionPopup(TextSelectionPopupCallbackInterface* callbackInterface)
 : Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
   mToolbar(),
@@ -870,9 +797,14 @@ TextSelectionPopup::TextSelectionPopup(TextSelectionPopupCallbackInterface* call
   mOptionMinSize(),
   mOptionDividerSize(),
   mOptionDividerPadding(),
+  mLabelMinimumSize(),
+  mLabelPadding(DEFAULT_LABEL_PADDING),
+  mLabelTextVisual(),
+  mEnableScrollBar(true),
   mEnabledButtons(Toolkit::TextSelectionPopup::NONE),
   mCallbackInterface(callbackInterface),
   mPressedColor(DEFAULT_OPTION_PRESSED_COLOR),
+  mPressedCornerRadius(DEFAULT_OPTION_PRESSED_CORNER_RADIUS),
   mDividerColor(Color::WHITE),
   mIconColor(Color::WHITE),
   mSelectOptionPriority(1),
diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
index 64130e1..b3739d6 100644
--- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
@@ -24,6 +24,7 @@
 #include <string>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h>
@@ -114,6 +115,16 @@ public:
   static Property::Value GetProperty(BaseObject* object, Property::Index index);
 
   /**
+   * @brief Toolkit::TextSelectionPopup::SetProperties()
+   */
+  void SetProperties(const Property::Map& properties);
+
+  /**
+   * @brief Toolkit::TextSelectionPopup::GetProperties()
+   */
+  void GetProperties(Property::Map& properties);
+
+  /**
    * @copydoc Toolkit::EnableButtons
    */
   void EnableButtons(Toolkit::TextSelectionPopup::Buttons buttonsToEnable);
@@ -139,6 +150,11 @@ private: // From Control
    */
   void OnInitialize() override;
 
+  /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
 private: // Implementation
   void HideAnimationFinished(Animation& animation);
 
@@ -241,6 +257,18 @@ private: // Implementation
    */
   Padding GetOptionDividerPadding() const;
 
+  /**
+   * Set label padding
+   * @param[in] padding BEGIN END BOTTOM TOP
+   */
+  void SetLabelPadding(const Padding& padding);
+
+  /**
+   * Get label padding
+   * @return Padding
+   */
+  Padding GetLabelPadding() const;
+
   void CreateOrderedListOfPopupOptions();
 
   void AddOption(const ButtonRequirement& button, bool showDivider, bool showIcons, bool showCaption);
@@ -257,6 +285,14 @@ private: // Implementation
   void CreateBackgroundBorder(Property::Map& propertyMap);
 
   /**
+   * Creates the background image
+   *
+   * @param[in] propertyMap The properties describing the background
+   */
+  void CreateBackground(Property::Map& propertyMap);
+
+
+  /**
    * Construct a new TextField.
    */
   TextSelectionPopup(TextSelectionPopupCallbackInterface* callbackInterface);
@@ -266,6 +302,20 @@ private: // Implementation
    */
   virtual ~TextSelectionPopup();
 
+protected:
+  struct PropertyHandler;
+
+  class TextSelectionPopupAccessible : public DevelControl::ControlAccessible
+  {
+  public:
+    using DevelControl::ControlAccessible::ControlAccessible;
+
+    /**
+     * @copydoc DevelControl::ControlAccessible::CalculateStates()
+     */
+    Dali::Accessibility::States CalculateStates() override;
+  };
+
 private:
   // Undefined copy constructor and assignment operators
   TextSelectionPopup(const TextSelectionPopup&);
@@ -290,15 +340,21 @@ private: // Data
   Size    mOptionDividerSize;    // Size of divider line
   Padding mOptionDividerPadding; // Padding of divider line
 
+  Vector2       mLabelMinimumSize; // Minimum size of label
+  Padding       mLabelPadding;     // Padding of label
+  Property::Map mLabelTextVisual;  // Text visual map of label
+  bool          mEnableScrollBar;  // Enable scrollbar
+
   std::vector<ButtonRequirement> mOrderListOfButtons; // List of buttons in the order to be displayed and a flag to indicate if needed.
 
   Toolkit::TextSelectionPopup::Buttons          mEnabledButtons; // stores enabled buttons
   Toolkit::TextSelectionPopupCallbackInterface* mCallbackInterface;
 
-  std::string mPressedImage; // Image used for the popup option when pressed.
-  Vector4     mPressedColor; // Color of the popup option when pressed.
-  Vector4     mDividerColor; // Color of the divider between buttons
-  Vector4     mIconColor;    // Color of the popup icon.
+  std::string mPressedImage;        // Image used for the popup option when pressed.
+  Vector4     mPressedColor;        // Color of the popup option when pressed.
+  float       mPressedCornerRadius; // Corner radius of the popup option when pressed.
+  Vector4     mDividerColor;        // Color of the divider between buttons
+  Vector4     mIconColor;           // Color of the popup icon.
 
   // Priority of Options/Buttons in the Cut and Paste pop-up, higher priority buttons are displayed first, left to right.
   std::size_t mSelectOptionPriority;    // Position of Select Button
diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.cpp
new file mode 100644
index 0000000..424cb9c
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.cpp
@@ -0,0 +1,305 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.h>
+#include <dali/integration-api/debug.h>
+
+#if defined(DEBUG_ENABLED)
+extern Debug::Filter* gLogFilter;
+#endif
+
+namespace Dali::Toolkit::Internal
+{
+void TextSelectionPopup::PropertyHandler::SetProperty(Toolkit::TextSelectionPopup selectionPopup, Property::Index index, const Property::Value& value)
+{
+  TextSelectionPopup& impl(GetImpl(selectionPopup));
+
+  switch(index)
+  {
+    case Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE:
+    {
+      impl.SetDimensionToCustomise(POPUP_MAXIMUM_SIZE, value.Get<Vector2>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE:
+    {
+      impl.SetDimensionToCustomise(OPTION_MAXIMUM_SIZE, value.Get<Vector2>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE:
+    {
+      impl.SetDimensionToCustomise(OPTION_MINIMUM_SIZE, value.Get<Vector2>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE:
+    {
+      impl.SetDimensionToCustomise(OPTION_DIVIDER_SIZE, value.Get<Vector2>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_PADDING:
+    {
+      Vector4 padding(value.Get<Vector4>());
+      impl.SetOptionDividerPadding(Padding(padding.x, padding.y, padding.z, padding.w));
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
+    {
+      impl.SetButtonImage(Toolkit::TextSelectionPopup::CLIPBOARD, value.Get<std::string>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE:
+    {
+      impl.SetButtonImage(Toolkit::TextSelectionPopup::CUT, value.Get<std::string>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE:
+    {
+      impl.SetButtonImage(Toolkit::TextSelectionPopup::COPY, value.Get<std::string>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE:
+    {
+      impl.SetButtonImage(Toolkit::TextSelectionPopup::PASTE, value.Get<std::string>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE:
+    {
+      impl.SetButtonImage(Toolkit::TextSelectionPopup::SELECT, value.Get<std::string>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE:
+    {
+      impl.SetButtonImage(Toolkit::TextSelectionPopup::SELECT_ALL, value.Get<std::string>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_DIVIDER_COLOR:
+    {
+      impl.mDividerColor = value.Get<Vector4>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_ICON_COLOR:
+    {
+      impl.mIconColor = value.Get<Vector4>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_COLOR:
+    {
+      impl.mPressedColor = value.Get<Vector4>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_CORNER_RADIUS:
+    {
+      impl.mPressedCornerRadius = value.Get<float>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE:
+    {
+      impl.SetPressedImage(value.Get<std::string>());
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION:
+    {
+      impl.mFadeInDuration = value.Get<float>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION:
+    {
+      impl.mFadeOutDuration = value.Get<float>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
+    {
+      Property::Map map = value.Get<Property::Map>();
+      impl.CreateBackgroundBorder(map);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::BACKGROUND:
+    {
+      Property::Map map = value.Get<Property::Map>();
+      impl.CreateBackground(map);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::LABEL_MINIMUM_SIZE:
+    {
+      impl.mLabelMinimumSize = value.Get<Vector2>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::LABEL_PADDING:
+    {
+      Vector4 padding(value.Get<Vector4>());
+      impl.SetLabelPadding(Padding(padding.x, padding.y, padding.z, padding.w));
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::LABEL_TEXT_VISUAL:
+    {
+      impl.mLabelTextVisual = value.Get<Property::Map>();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::ENABLE_SCROLL_BAR:
+    {
+      impl.mEnableScrollBar = value.Get<bool>();
+      break;
+    }
+  }
+}
+
+Property::Value TextSelectionPopup::PropertyHandler::GetProperty(Toolkit::TextSelectionPopup selectionPopup, Property::Index index)
+{
+  Property::Value value;
+  TextSelectionPopup& impl(GetImpl(selectionPopup));
+
+  switch(index)
+  {
+    case Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE:
+    {
+      value = impl.GetDimensionToCustomise(POPUP_MAXIMUM_SIZE);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE:
+    {
+      value = impl.GetDimensionToCustomise(OPTION_MAXIMUM_SIZE);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE:
+    {
+      value = impl.GetDimensionToCustomise(OPTION_MINIMUM_SIZE);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE:
+    {
+      value = impl.GetDimensionToCustomise(OPTION_DIVIDER_SIZE);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_PADDING:
+    {
+      Padding padding = impl.GetOptionDividerPadding();
+      value           = Vector4(padding.left, padding.right, padding.top, padding.bottom);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
+    {
+      value = impl.GetButtonImage(Toolkit::TextSelectionPopup::CLIPBOARD);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE:
+    {
+      value = impl.GetButtonImage(Toolkit::TextSelectionPopup::CUT);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE:
+    {
+      value = impl.GetButtonImage(Toolkit::TextSelectionPopup::COPY);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE:
+    {
+      value = impl.GetButtonImage(Toolkit::TextSelectionPopup::PASTE);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE:
+    {
+      value = impl.GetButtonImage(Toolkit::TextSelectionPopup::SELECT);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE:
+    {
+      value = impl.GetButtonImage(Toolkit::TextSelectionPopup::SELECT_ALL);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_DIVIDER_COLOR:
+    {
+      value = impl.mDividerColor;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_ICON_COLOR:
+    {
+      value = impl.mIconColor;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_COLOR:
+    {
+      value = impl.mPressedColor;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_CORNER_RADIUS:
+    {
+      value = impl.mPressedCornerRadius;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE:
+    {
+      value = impl.GetPressedImage();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION:
+    {
+      value = impl.mFadeInDuration;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION:
+    {
+      value = impl.mFadeOutDuration;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
+    {
+      Property::Map         map;
+      Toolkit::Visual::Base visual = DevelControl::GetVisual(impl, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER);
+      if(visual)
+      {
+        visual.CreatePropertyMap(map);
+      }
+      value = map;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::BACKGROUND:
+    {
+      Property::Map         map;
+      Toolkit::Visual::Base visual = DevelControl::GetVisual(impl, Toolkit::Control::Property::BACKGROUND);
+      if(visual)
+      {
+        visual.CreatePropertyMap(map);
+      }
+      value = map;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::LABEL_MINIMUM_SIZE:
+    {
+      value = impl.mLabelMinimumSize;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::LABEL_PADDING:
+    {
+      Padding padding = impl.GetLabelPadding();
+      value           = Vector4(padding.left, padding.right, padding.top, padding.bottom);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::LABEL_TEXT_VISUAL:
+    {
+      value = impl.mLabelTextVisual;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::Property::ENABLE_SCROLL_BAR:
+    {
+      value = impl.mEnableScrollBar;
+      break;
+    }
+  }
+
+  return value;
+}
+
+} // namespace Dali::Toolkit::Internal
diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.h b/dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.h
new file mode 100644
index 0000000..805e3d8
--- /dev/null
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-property-handler.h
@@ -0,0 +1,50 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_PROPERTY_HANDLER_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_PROPERTY_HANDLER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
+
+namespace Dali::Toolkit::Internal
+{
+/**
+ * Class to manage properties for the TextSelectionPopup
+ */
+struct TextSelectionPopup::PropertyHandler
+{
+  /**
+   * Set properties on the text selection popup
+   *
+   * @param[in] selectionPopup The handle for the text selection popup
+   * @param[in] index The property index of the property to set
+   * @param[in] value The value to set
+   */
+  static void SetProperty(Toolkit::TextSelectionPopup selectionPopup, Property::Index index, const Property::Value& value);
+
+  /**
+   * Get properties from the text selection popup
+   *
+   * @param[in] selectionPopup The handle for the text selection popup
+   * @param[in] index The property index of the property to set
+   * @return the value
+   */
+  static Property::Value GetProperty(Toolkit::TextSelectionPopup selectionPopup, Property::Index index);
+};
+
+} // namespace Dali::Toolkit::Internal
+
+#endif //DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_PROPERTY_HANDLER_H
diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
index ba2b8d5..f28f92b 100644
--- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
@@ -164,10 +164,7 @@ void TextSelectionToolbar::OnInitialize()
 {
   SetUp();
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::TOOL_BAR));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::TOOL_BAR);
 }
 
 void TextSelectionToolbar::OnRelayout(const Vector2& size, RelayoutContainer& container)
diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
index 2aefaaf..19cb548 100644
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@ -311,10 +311,7 @@ void ToolBar::OnInitialize()
   mLayout.SetRelativeWidth(0, mLeftRelativeSpace);
   mLayout.SetRelativeWidth(1, mRightRelativeSpace);
 
-  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::TOOL_BAR));
-  });
+  Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::TOOL_BAR);
 }
 
 void ToolBar::OnChildAdd(Actor& child)
diff --git a/dali-toolkit/internal/controls/tooltip/tooltip.cpp b/dali-toolkit/internal/controls/tooltip/tooltip.cpp
index e8274d1..687d3ef 100644
--- a/dali-toolkit/internal/controls/tooltip/tooltip.cpp
+++ b/dali-toolkit/internal/controls/tooltip/tooltip.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,12 +148,12 @@ void Tooltip::CreatePropertyMap(Property::Map& map) const
   if(!mContentTextVisual.Empty())
   {
     Property::Map content = mContentTextVisual; // Need this copy as there's no Value constructor which takes in a 'const Property::Map&'.
-    map.Insert(Toolkit::Tooltip::Property::CONTENT, content);
+    map.Insert(Toolkit::Tooltip::Property::CONTENT, std::move(content));
   }
   else if(!mContentArray.Empty())
   {
     Property::Array content = mContentArray; // Need this copy as there's no Value constructor which takes in a 'const Property::Array&'.
-    map.Insert(Toolkit::Tooltip::Property::CONTENT, content);
+    map.Insert(Toolkit::Tooltip::Property::CONTENT, std::move(content));
   }
 
   map.Insert(Toolkit::Tooltip::Property::LAYOUT, mLayout);
@@ -289,8 +289,10 @@ void Tooltip::SetBackground(const Property::Value& value)
 
   if(type == Property::STRING)
   {
-    value.Get(mBackgroundImage);
-    mBackgroundBorder.Set(0, 0, 0, 0);
+    if(DALI_LIKELY(value.Get(mBackgroundImage)))
+    {
+      mBackgroundBorder.Set(0, 0, 0, 0);
+    }
   }
   else if(type == Property::MAP)
   {
diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
index 181a47e..5fa13de 100644
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,13 +118,9 @@ void VideoView::OnInitialize()
   Actor self = Self();
   mVideoPlayer.FinishedSignal().Connect(this, &VideoView::EmitSignalFinish);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(
-      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::VIDEO));
-  });
-
-  //Enable highightability
-  Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
+  // Accessibility
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::VIDEO);
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
 
   //update self property
   self.RegisterProperty(IS_VIDEO_VIEW_PROPERTY_NAME, true, Property::READ_WRITE);
@@ -608,30 +604,6 @@ Vector3 VideoView::GetNaturalSize()
   }
 }
 
-float VideoView::GetHeightForWidth(float width)
-{
-  if(mVideoSize.GetWidth() > 0 && mVideoSize.GetHeight() > 0)
-  {
-    return GetHeightForWidthBase(width);
-  }
-  else
-  {
-    return Control::GetHeightForWidthBase(width);
-  }
-}
-
-float VideoView::GetWidthForHeight(float height)
-{
-  if(mVideoSize.GetWidth() > 0 && mVideoSize.GetHeight() > 0)
-  {
-    return GetWidthForHeightBase(height);
-  }
-  else
-  {
-    return Control::GetWidthForHeightBase(height);
-  }
-}
-
 void VideoView::SetWindowSurfaceTarget()
 {
   Actor self = Self();
@@ -673,7 +645,7 @@ void VideoView::SetWindowSurfaceTarget()
   {
     // For underlay rendering mode, video display area have to be transparent.
     Geometry geometry = VisualFactoryCache::CreateQuadGeometry();
-    Shader   shader   = Shader::New(SHADER_VIDEO_VIEW_VERT, SHADER_VIDEO_VIEW_FRAG);
+    Shader   shader   = Shader::New(SHADER_VIDEO_VIEW_VERT, SHADER_VIDEO_VIEW_FRAG, Shader::Hint::NONE, "VIDEO_VIEW_OVERLAY");
     mOverlayRenderer  = Renderer::New(geometry, shader);
     mOverlayRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::OFF);
   }
@@ -915,7 +887,7 @@ Dali::Shader VideoView::CreateShader()
     DevelTexture::ApplyNativeFragmentShader(mNativeTexture, fragmentShader);
   }
 
-  return Dali::Shader::New(vertexShader, fragmentShader);
+  return Dali::Shader::New(vertexShader, fragmentShader, Shader::Hint::NONE, "VIDEO_VIEW");
 }
 
 bool VideoView::GetStringFromProperty(const Dali::Property::Value& value, std::string& output)
diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h
index d1605ce..c8b2a83 100644
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.h
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h
@@ -304,16 +304,6 @@ private: // From Control
    */
   Vector3 GetNaturalSize() override;
 
-  /**
-   * @copydoc Toolkit::Control::GetHeightForWidth()
-   */
-  float GetHeightForWidth(float width) override;
-
-  /**
-   * @copydoc Toolkit::Control::GetWidthForHeight()
-   */
-  float GetWidthForHeight(float height) override;
-
 private:
   /**
    * @brief Construct a new VideoView.
diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
old mode 100755
new mode 100644
index 77b29ca..c121cc7
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,42 +16,44 @@
  */
 
 // CLASS HEADER
-#include "web-view-impl.h"
+#include <dali-toolkit/internal/controls/web-view/web-view-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list.h>
-#include <dali/devel-api/adaptor-framework/web-engine-certificate.h>
-#include <dali/devel-api/adaptor-framework/web-engine-console-message.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu-item.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context-menu.h>
-#include <dali/devel-api/adaptor-framework/web-engine-context.h>
-#include <dali/devel-api/adaptor-framework/web-engine-cookie-manager.h>
-#include <dali/devel-api/adaptor-framework/web-engine-form-repost-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-hit-test.h>
-#include <dali/devel-api/adaptor-framework/web-engine-http-auth-handler.h>
-#include <dali/devel-api/adaptor-framework/web-engine-load-error.h>
-#include <dali/devel-api/adaptor-framework/web-engine-policy-decision.h>
-#include <dali/devel-api/adaptor-framework/web-engine-settings.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-back-forward-list.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-http-auth-handler.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-load-error.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-policy-decision.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/devel-api/common/stage.h>
 #include <dali/devel-api/scripting/enum-helper.h>
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/object/type-registry.h>
-#include <cstring>
-#include <memory>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-context.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
-#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/public-api/image-loader/image-url.h>
 #include <dali-toolkit/public-api/image-loader/image.h>
 #include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/public-api/image-loader/image-url.h>
+
+#include <functional>
+#include <memory>
+#include <unordered_map>
 
 namespace Dali
 {
@@ -90,24 +92,78 @@ DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "loadProgressPercentage",  FLOAT,
 DALI_TYPE_REGISTRATION_END()
 // clang-format on
 
-} // namespace
+std::unordered_map<Dali::WebEnginePlugin*, Dali::WeakHandle<Toolkit::WebView>>& GetPluginWebViewTable()
+{
+  static std::unordered_map<Dali::WebEnginePlugin*, Dali::WeakHandle<Toolkit::WebView>> pluginWebViewMap;
+  return pluginWebViewMap;
+}
+
+enum class DisplayAreaCalculateOption
+{
+  PROPERTY         = 0, ///< Calculate display update area by property
+  CURRENT_PROPERTY = 1, ///< Calculate display update area by current property
+};
+
+/**
+ * @brief Helper function to calculate exact display area, offset and size.
+ * It will be useful when view size is not integer value, or view size is not matched with texture size.
+ *
+ * @param[in] self The view itself.
+ * @param[in] option Option of this calculation. Let we decide what kind of property will be used.
+ * @return DisplayArea for this view.
+ */
+Rect<int32_t> CalculateDisplayArea(Dali::Actor self, DisplayAreaCalculateOption option)
+{
+  bool    positionUsesAnchorPoint = self.GetProperty<bool>(Actor::Property::POSITION_USES_ANCHOR_POINT);
+  Vector3 actorSize               = (option == DisplayAreaCalculateOption::CURRENT_PROPERTY) ? self.GetCurrentProperty<Vector3>(Actor::Property::SIZE) * self.GetCurrentProperty<Vector3>(Actor::Property::SCALE)
+                                                                                             : self.GetProperty<Vector3>(Actor::Property::SIZE) * self.GetProperty<Vector3>(Actor::Property::SCALE);
+  Vector3 anchorPointOffSet       = actorSize * (positionUsesAnchorPoint ? self.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
+  Vector2 screenPosition          = (option == DisplayAreaCalculateOption::CURRENT_PROPERTY) ? self.GetProperty<Vector2>(Actor::Property::SCREEN_POSITION)
+                                                                                             : Dali::DevelActor::CalculateScreenPosition(self);
+
+  Dali::Rect<int32_t> displayArea;
+  displayArea.x      = screenPosition.x - anchorPointOffSet.x;
+  displayArea.y      = screenPosition.y - anchorPointOffSet.y;
+  displayArea.width  = actorSize.x;
+  displayArea.height = actorSize.y;
+
+  return displayArea;
+}
+
+constexpr Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
-#define GET_ENUM_STRING(structName, inputExp) \
-  Scripting::GetLinearEnumerationName<Toolkit::WebView::structName::Type>(static_cast<Toolkit::WebView::structName::Type>(inputExp), structName##_TABLE, structName##_TABLE_COUNT)
+/**
+ * @brief Helper function to calculate exact pixel area value by view and texture size.
+ * It will be useful when view size is not integer value, or view size is not matched with texture size.
+ *
+ * @param[in] viewSize The size of view.
+ * @param[in] textureWidth The width of texture, that must be integer type.
+ * @param[in] textureHeight The height of texture, that must be integer type.
+ * @return PixelArea value that image visual can use.
+ */
+Vector4 CalculatePixelArea(const Size& viewSize, const uint32_t textureWidth, const uint32_t textureHeight)
+{
+  float widthRatio  = textureWidth == 0u ? 1.0f : viewSize.width / static_cast<float>(textureWidth);
+  float heightRatio = textureHeight == 0u ? 1.0f : viewSize.height / static_cast<float>(textureHeight);
+  return Vector4(0.0f, 0.0f, widthRatio, heightRatio);
+}
 
-#define GET_ENUM_VALUE(structName, inputExp, outputExp) \
-  Scripting::GetEnumerationProperty<Toolkit::WebView::structName::Type>(inputExp, structName##_TABLE, structName##_TABLE_COUNT, outputExp)
+} // namespace
 
 WebView::WebView(const std::string& locale, const std::string& timezoneId)
 : Control(ControlBehaviour(ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS)),
   mVisual(),
   mWebViewSize(Stage::GetCurrent().GetSize()),
   mWebEngine(),
+  mLastRenderedNativeImageWidth(0u),
+  mLastRenderedNativeImageHeight(0u),
   mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height),
   mVideoHoleEnabled(false),
   mMouseEventsEnabled(true),
   mKeyEventsEnabled(true),
-  mScreenshotCapturedCallback(nullptr)
+  mVisualChangeRequired(false),
+  mScreenshotCapturedCallback{nullptr},
+  mFrameRenderedCallback{nullptr}
 {
   mWebEngine = Dali::WebEngine::New();
 
@@ -123,11 +179,15 @@ WebView::WebView(uint32_t argc, char** argv)
   mVisual(),
   mWebViewSize(Stage::GetCurrent().GetSize()),
   mWebEngine(),
+  mLastRenderedNativeImageWidth(0u),
+  mLastRenderedNativeImageHeight(0u),
   mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height),
   mVideoHoleEnabled(false),
   mMouseEventsEnabled(true),
   mKeyEventsEnabled(true),
-  mScreenshotCapturedCallback(nullptr)
+  mVisualChangeRequired(false),
+  mScreenshotCapturedCallback{nullptr},
+  mFrameRenderedCallback{nullptr}
 {
   mWebEngine = Dali::WebEngine::New();
 
@@ -147,7 +207,11 @@ WebView::~WebView()
 {
   if(mWebEngine)
   {
-    mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnFrameRendered);
+    auto iter = GetPluginWebViewTable().find(mWebEngine.GetPlugin());
+    if(iter != GetPluginWebViewTable().end())
+    {
+      GetPluginWebViewTable().erase(iter);
+    }
     mWebEngine.Destroy();
   }
 }
@@ -156,7 +220,10 @@ Toolkit::WebView WebView::New()
 {
   WebView*         impl   = new WebView();
   Toolkit::WebView handle = Toolkit::WebView(*impl);
-
+  if(impl->GetPlugin())
+  {
+    GetPluginWebViewTable()[impl->GetPlugin()] = handle;
+  }
   impl->Initialize();
   return handle;
 }
@@ -165,7 +232,10 @@ Toolkit::WebView WebView::New(const std::string& locale, const std::string& time
 {
   WebView*         impl   = new WebView(locale, timezoneId);
   Toolkit::WebView handle = Toolkit::WebView(*impl);
-
+  if(impl->GetPlugin())
+  {
+    GetPluginWebViewTable()[impl->GetPlugin()] = handle;
+  }
   impl->Initialize();
   return handle;
 }
@@ -174,51 +244,84 @@ Toolkit::WebView WebView::New(uint32_t argc, char** argv)
 {
   WebView*         impl   = new WebView(argc, argv);
   Toolkit::WebView handle = Toolkit::WebView(*impl);
-
+  if(impl->GetPlugin())
+  {
+    GetPluginWebViewTable()[impl->GetPlugin()] = handle;
+  }
   impl->Initialize();
   return handle;
 }
 
+Toolkit::WebView WebView::FindWebView(Dali::WebEnginePlugin* plugin)
+{
+  auto iter = GetPluginWebViewTable().find(plugin);
+  if(iter != GetPluginWebViewTable().end())
+  {
+    return iter->second.GetHandle();
+  }
+  return Toolkit::WebView();
+}
+
+Dali::WebEngineContext* WebView::GetContext()
+{
+  return Dali::WebEngine::GetContext();
+}
+
+Dali::WebEngineCookieManager* WebView::GetCookieManager()
+{
+  return Dali::WebEngine::GetCookieManager();
+}
+
 void WebView::OnInitialize()
 {
   Actor self = Self();
 
   self.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+  self.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE, true);
   self.TouchedSignal().Connect(this, &WebView::OnTouchEvent);
   self.HoveredSignal().Connect(this, &WebView::OnHoverEvent);
   self.WheelEventSignal().Connect(this, &WebView::OnWheelEvent);
   Dali::DevelActor::VisibilityChangedSignal(self).Connect(this, &WebView::OnVisibilityChanged);
 
+  mWebViewVisibleState |= WebViewVisibleStateFlag::SELF_SHOW;
+
   mPositionUpdateNotification = self.AddPropertyNotification(Actor::Property::WORLD_POSITION, StepCondition(1.0f, 1.0f));
   mSizeUpdateNotification     = self.AddPropertyNotification(Actor::Property::SIZE, StepCondition(1.0f, 1.0f));
   mScaleUpdateNotification    = self.AddPropertyNotification(Actor::Property::WORLD_SCALE, StepCondition(0.1f, 1.0f));
-  mPositionUpdateNotification.NotifySignal().Connect(this, &WebView::UpdateDisplayArea);
-  mSizeUpdateNotification.NotifySignal().Connect(this, &WebView::UpdateDisplayArea);
-  mScaleUpdateNotification.NotifySignal().Connect(this, &WebView::UpdateDisplayArea);
+  mPositionUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated);
+  mSizeUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated);
+  mScaleUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated);
 
   if(mWebEngine)
   {
-    mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnFrameRendered);
-    mWebContext         = std::unique_ptr<Dali::Toolkit::WebContext>(new WebContext(mWebEngine.GetContext()));
-    mWebCookieManager   = std::unique_ptr<Dali::Toolkit::WebCookieManager>(new WebCookieManager(mWebEngine.GetCookieManager()));
+    mWebEngine.RegisterFrameRenderedCallback(std::bind(&WebView::OnFrameRendered, this));
     mWebSettings        = std::unique_ptr<Dali::Toolkit::WebSettings>(new WebSettings(mWebEngine.GetSettings()));
     mWebBackForwardList = std::unique_ptr<Dali::Toolkit::WebBackForwardList>(new WebBackForwardList(mWebEngine.GetBackForwardList()));
   }
+
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
 }
 
-Dali::Toolkit::WebSettings* WebView::GetSettings() const
+DevelControl::ControlAccessible* WebView::CreateAccessibleObject()
 {
-  return mWebSettings.get();
+  return new WebViewAccessible(Self(), mWebEngine);
 }
 
-Dali::Toolkit::WebContext* WebView::GetContext() const
+void WebView::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
-  return mWebContext.get();
+  if(!mWebEngine)
+  {
+    return;
+  }
+
+  auto displayArea = CalculateDisplayArea(Self(), DisplayAreaCalculateOption::PROPERTY);
+
+  SetDisplayArea(displayArea);
 }
 
-Dali::Toolkit::WebCookieManager* WebView::GetCookieManager() const
+Dali::Toolkit::WebSettings* WebView::GetSettings() const
 {
-  return mWebCookieManager.get();
+  return mWebSettings.get();
 }
 
 Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
@@ -226,6 +329,11 @@ Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
   return mWebBackForwardList.get();
 }
 
+Dali::WebEnginePlugin* WebView::GetPlugin() const
+{
+  return mWebEngine ? mWebEngine.GetPlugin() : nullptr;
+}
+
 Dali::Toolkit::ImageView WebView::GetFavicon() const
 {
   Dali::Toolkit::ImageView faviconView;
@@ -241,11 +349,6 @@ void WebView::LoadUrl(const std::string& url)
 {
   if(mWebEngine)
   {
-    if(!mVisual)
-    {
-      mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
-    }
-
     mWebEngine.LoadUrl(url);
   }
 }
@@ -254,11 +357,6 @@ void WebView::LoadHtmlString(const std::string& htmlString)
 {
   if(mWebEngine)
   {
-    if(!mVisual)
-    {
-      mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
-    }
-
     mWebEngine.LoadHtmlString(htmlString);
   }
 }
@@ -268,24 +366,14 @@ bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const
   if(!mWebEngine)
     return false;
 
-  if(!mVisual)
-  {
-    mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
-  }
-
   return mWebEngine.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
 }
 
-bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
+bool WebView::LoadContents(const int8_t* contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
 {
   if(!mWebEngine)
     return false;
 
-  if(!mVisual)
-  {
-    mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered);
-  }
-
   return mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri);
 }
 
@@ -405,7 +493,7 @@ void WebView::EvaluateJavaScript(const std::string& script, std::function<void(c
 {
   if(mWebEngine)
   {
-    mWebEngine.EvaluateJavaScript(script, resultHandler);
+    mWebEngine.EvaluateJavaScript(script, std::move(resultHandler));
   }
 }
 
@@ -413,7 +501,7 @@ void WebView::AddJavaScriptMessageHandler(const std::string& exposedObjectName,
 {
   if(mWebEngine)
   {
-    mWebEngine.AddJavaScriptMessageHandler(exposedObjectName, handler);
+    mWebEngine.AddJavaScriptMessageHandler(exposedObjectName, std::move(handler));
   }
 }
 
@@ -421,7 +509,7 @@ void WebView::RegisterJavaScriptAlertCallback(Dali::WebEnginePlugin::JavaScriptA
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterJavaScriptAlertCallback(callback);
+    mWebEngine.RegisterJavaScriptAlertCallback(std::move(callback));
   }
 }
 
@@ -437,7 +525,7 @@ void WebView::RegisterJavaScriptConfirmCallback(Dali::WebEnginePlugin::JavaScrip
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterJavaScriptConfirmCallback(callback);
+    mWebEngine.RegisterJavaScriptConfirmCallback(std::move(callback));
   }
 }
 
@@ -453,7 +541,7 @@ void WebView::RegisterJavaScriptPromptCallback(Dali::WebEnginePlugin::JavaScript
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterJavaScriptPromptCallback(callback);
+    mWebEngine.RegisterJavaScriptPromptCallback(std::move(callback));
   }
 }
 
@@ -481,7 +569,7 @@ bool WebView::CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineH
   bool result = false;
   if(mWebEngine)
   {
-    result = mWebEngine.CreateHitTestAsynchronously(x, y, mode, callback);
+    result = mWebEngine.CreateHitTestAsynchronously(x, y, mode, std::move(callback));
   }
   return result;
 }
@@ -549,20 +637,20 @@ Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect<int32_t> viewArea, fl
 
 bool WebView::GetScreenshotAsynchronously(Dali::Rect<int32_t> viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback)
 {
-  mScreenshotCapturedCallback = callback;
+  mScreenshotCapturedCallback = std::move(callback);
   return mWebEngine ? mWebEngine.GetScreenshotAsynchronously(viewArea, scaleFactor, std::bind(&WebView::OnScreenshotCaptured, this, std::placeholders::_1)) : false;
 }
 
 bool WebView::CheckVideoPlayingAsynchronously(Dali::WebEnginePlugin::VideoPlayingCallback callback)
 {
-  return mWebEngine ? mWebEngine.CheckVideoPlayingAsynchronously(callback) : false;
+  return mWebEngine ? mWebEngine.CheckVideoPlayingAsynchronously(std::move(callback)) : false;
 }
 
 void WebView::RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback)
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterGeolocationPermissionCallback(callback);
+    mWebEngine.RegisterGeolocationPermissionCallback(std::move(callback));
   }
 }
 
@@ -574,37 +662,6 @@ void WebView::SetTtsFocus(bool focused)
   }
 }
 
-void WebView::UpdateDisplayArea(Dali::PropertyNotification& /*source*/)
-{
-  if(!mWebEngine)
-    return;
-
-  Actor self(Self());
-
-  bool    positionUsesAnchorPoint = self.GetProperty<bool>(Actor::Property::POSITION_USES_ANCHOR_POINT);
-  Vector3 actorSize               = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE) * self.GetCurrentProperty<Vector3>(Actor::Property::SCALE);
-  Vector3 anchorPointOffSet       = actorSize * (positionUsesAnchorPoint ? self.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
-  Vector2 screenPosition          = self.GetProperty<Vector2>(Actor::Property::SCREEN_POSITION);
-
-  Dali::Rect<int32_t> displayArea;
-  displayArea.x      = screenPosition.x - anchorPointOffSet.x;
-  displayArea.y      = screenPosition.y - anchorPointOffSet.y;
-  displayArea.width  = actorSize.x;
-  displayArea.height = actorSize.y;
-
-  Size displaySize = Size(displayArea.width, displayArea.height);
-  if(mWebViewSize != displaySize)
-  {
-    mWebViewSize = displaySize;
-  }
-
-  if(mWebViewArea != displayArea)
-  {
-    mWebViewArea = displayArea;
-    mWebEngine.UpdateDisplayArea(mWebViewArea);
-  }
-}
-
 void WebView::EnableVideoHole(bool enabled)
 {
   mVideoHoleEnabled = enabled;
@@ -634,7 +691,7 @@ Dali::Toolkit::ImageView WebView::CreateImageView(Dali::PixelData pixel) const
     return Dali::Toolkit::ImageView();
   }
 
-  Dali::Toolkit::ImageUrl url       = Dali::Toolkit::Image::GenerateUrl(pixel);
+  Dali::Toolkit::ImageUrl  url       = Dali::Toolkit::Image::GenerateUrl(pixel);
   Dali::Toolkit::ImageView imageView = Dali::Toolkit::ImageView::New(url.GetUrl());
   imageView.SetProperty(Dali::Actor::Property::SIZE, Vector2(pixel.GetWidth(), pixel.GetHeight()));
   return imageView;
@@ -644,7 +701,7 @@ void WebView::RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePa
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterPageLoadStartedCallback(callback);
+    mWebEngine.RegisterPageLoadStartedCallback(std::move(callback));
   }
 }
 
@@ -652,7 +709,7 @@ void WebView::RegisterPageLoadInProgressCallback(Dali::WebEnginePlugin::WebEngin
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterPageLoadInProgressCallback(callback);
+    mWebEngine.RegisterPageLoadInProgressCallback(std::move(callback));
   }
 }
 
@@ -660,7 +717,7 @@ void WebView::RegisterPageLoadFinishedCallback(Dali::WebEnginePlugin::WebEngineP
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterPageLoadFinishedCallback(callback);
+    mWebEngine.RegisterPageLoadFinishedCallback(std::move(callback));
   }
 }
 
@@ -668,7 +725,7 @@ void WebView::RegisterPageLoadErrorCallback(Dali::WebEnginePlugin::WebEnginePage
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterPageLoadErrorCallback(callback);
+    mWebEngine.RegisterPageLoadErrorCallback(std::move(callback));
   }
 }
 
@@ -676,7 +733,7 @@ void WebView::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngine
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterScrollEdgeReachedCallback(callback);
+    mWebEngine.RegisterScrollEdgeReachedCallback(std::move(callback));
   }
 }
 
@@ -684,7 +741,7 @@ void WebView::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChan
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterUrlChangedCallback(callback);
+    mWebEngine.RegisterUrlChangedCallback(std::move(callback));
   }
 }
 
@@ -692,20 +749,20 @@ void WebView::RegisterFormRepostDecidedCallback(Dali::WebEnginePlugin::WebEngine
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterFormRepostDecidedCallback(callback);
+    mWebEngine.RegisterFormRepostDecidedCallback(std::move(callback));
   }
 }
 
 void WebView::RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback)
 {
-  mFrameRenderedCallback = callback;
+  mFrameRenderedCallback = std::move(callback);
 }
 
 void WebView::RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback)
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterConsoleMessageReceivedCallback(callback);
+    mWebEngine.RegisterConsoleMessageReceivedCallback(std::move(callback));
   }
 }
 
@@ -713,7 +770,23 @@ void WebView::RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEn
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterResponsePolicyDecidedCallback(callback);
+    mWebEngine.RegisterResponsePolicyDecidedCallback(std::move(callback));
+  }
+}
+
+void WebView::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback)
+{
+  if(mWebEngine)
+  {
+    mWebEngine.RegisterNavigationPolicyDecidedCallback(std::move(callback));
+  }
+}
+
+void WebView::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
+{
+  if(mWebEngine)
+  {
+    mWebEngine.RegisterNewWindowCreatedCallback(std::move(callback));
   }
 }
 
@@ -721,7 +794,7 @@ void WebView::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEng
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterCertificateConfirmedCallback(callback);
+    mWebEngine.RegisterCertificateConfirmedCallback(std::move(callback));
   }
 }
 
@@ -729,7 +802,7 @@ void WebView::RegisterSslCertificateChangedCallback(Dali::WebEnginePlugin::WebEn
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterSslCertificateChangedCallback(callback);
+    mWebEngine.RegisterSslCertificateChangedCallback(std::move(callback));
   }
 }
 
@@ -737,7 +810,7 @@ void WebView::RegisterHttpAuthHandlerCallback(Dali::WebEnginePlugin::WebEngineHt
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterHttpAuthHandlerCallback(callback);
+    mWebEngine.RegisterHttpAuthHandlerCallback(std::move(callback));
   }
 }
 
@@ -745,7 +818,7 @@ void WebView::RegisterContextMenuShownCallback(Dali::WebEnginePlugin::WebEngineC
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterContextMenuShownCallback(callback);
+    mWebEngine.RegisterContextMenuShownCallback(std::move(callback));
   }
 }
 
@@ -753,7 +826,7 @@ void WebView::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngine
 {
   if(mWebEngine)
   {
-    mWebEngine.RegisterContextMenuHiddenCallback(callback);
+    mWebEngine.RegisterContextMenuHiddenCallback(std::move(callback));
   }
 }
 
@@ -761,7 +834,7 @@ void WebView::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceive
 {
   if(mWebEngine)
   {
-    mWebEngine.GetPlainTextAsynchronously(callback);
+    mWebEngine.GetPlainTextAsynchronously(std::move(callback));
   }
 }
 
@@ -771,29 +844,86 @@ void WebView::OnFrameRendered()
   {
     mFrameRenderedCallback();
   }
-}
 
-void WebView::OnInitialFrameRendered()
-{
-  mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnInitialFrameRendered);
+  // Make sure that mVisual is created only if required.
+  if(mVisualChangeRequired || !mVisual)
+  {
+    // Reset flag
+    mVisualChangeRequired = false;
 
-  Texture           texture        = Dali::Texture::New(*mWebEngine.GetNativeImageSource());
-  const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture);
-  mVisual                          = Toolkit::VisualFactory::Get().CreateVisual({{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, {Toolkit::ImageVisual::Property::URL, nativeImageUrl}});
+    auto nativeImageSourcePtr = mWebEngine.GetNativeImageSource();
 
-  if(mVisual)
+    mLastRenderedNativeImageWidth  = nativeImageSourcePtr->GetWidth();
+    mLastRenderedNativeImageHeight = nativeImageSourcePtr->GetHeight();
+
+    Dali::Toolkit::ImageUrl nativeImageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSourcePtr);
+
+    mVisual = Toolkit::VisualFactory::Get().CreateVisual(
+      {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE},
+       {Toolkit::ImageVisual::Property::URL, nativeImageUrl.GetUrl()},
+       {Toolkit::ImageVisual::Property::PIXEL_AREA, FULL_TEXTURE_RECT},
+       {Toolkit::ImageVisual::Property::WRAP_MODE_U, Dali::WrapMode::CLAMP_TO_EDGE},
+       {Toolkit::ImageVisual::Property::WRAP_MODE_V, Dali::WrapMode::CLAMP_TO_EDGE}});
+
+    if(mVisual)
+    {
+      DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
+      EnableBlendMode(!mVideoHoleEnabled);
+    }
+  }
+}
+
+void WebView::OnDisplayAreaUpdated(Dali::PropertyNotification& /*source*/)
+{
+  if(!mWebEngine)
   {
-    DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
-    EnableBlendMode(!mVideoHoleEnabled);
+    return;
   }
+
+  auto displayArea = CalculateDisplayArea(Self(), DisplayAreaCalculateOption::CURRENT_PROPERTY);
+
+  SetDisplayArea(displayArea);
 }
 
 void WebView::OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type)
 {
   if(type == Dali::DevelActor::VisibilityChange::Type::SELF)
   {
-    SetVisibility(isVisible);
+    if(isVisible)
+    {
+      mWebViewVisibleState |= WebViewVisibleStateFlag::SELF_SHOW;
+    }
+    else
+    {
+      mWebViewVisibleState &= ~WebViewVisibleStateFlag::SELF_SHOW;
+    }
+  }
+  else if(type == Dali::DevelActor::VisibilityChange::Type::PARENT)
+  {
+    if(isVisible)
+    {
+      mWebViewVisibleState |= WebViewVisibleStateFlag::PARENT_SHOW;
+      // TODO : We should consider double-hide called from parent
+    }
+    else
+    {
+      mWebViewVisibleState &= ~WebViewVisibleStateFlag::PARENT_SHOW;
+    }
+  }
+  ApplyVisibilityCheck();
+}
+
+void WebView::OnWindowVisibilityChanged(Window window, bool visible)
+{
+  if(visible)
+  {
+    mWebViewVisibleState |= WebViewVisibleStateFlag::WINDOW_SHOW;
   }
+  else
+  {
+    mWebViewVisibleState &= ~WebViewVisibleStateFlag::WINDOW_SHOW;
+  }
+  ApplyVisibilityCheck();
 }
 
 void WebView::OnScreenshotCaptured(Dali::PixelData pixel)
@@ -805,12 +935,71 @@ void WebView::OnScreenshotCaptured(Dali::PixelData pixel)
   }
 }
 
+void WebView::SetDisplayArea(const Dali::Rect<int32_t>& displayArea)
+{
+  Size displaySize = Size(displayArea.width, displayArea.height);
+  if(mWebViewSize != displaySize)
+  {
+    mWebViewSize = displaySize;
+  }
+
+  if(mWebViewArea != displayArea)
+  {
+    // WebEngine visual size changed. we have to re-create visual.
+    mVisualChangeRequired = true;
+
+    // Change old visual's pixel area matched as changed web view size
+    if(mVisual)
+    {
+      auto pixelArea = CalculatePixelArea(mWebViewSize, mLastRenderedNativeImageWidth, mLastRenderedNativeImageHeight);
+      Toolkit::GetImplementation(mVisual).DoAction(Toolkit::DevelVisual::Action::UPDATE_PROPERTY, {{Toolkit::ImageVisual::Property::PIXEL_AREA, pixelArea}});
+    }
+
+    mWebViewArea = displayArea;
+    mWebEngine.UpdateDisplayArea(mWebViewArea);
+  }
+}
+
 void WebView::OnSceneConnection(int depth)
 {
+  mWebViewVisibleState |= WebViewVisibleStateFlag::SCENE_ON;
+  mWebViewVisibleState |= WebViewVisibleStateFlag::PARENT_SHOW;
+  // TODO : We should consider already hided parent
+  Window window = DevelWindow::Get(Self());
+  if(window)
+  {
+    // Hold the weak handle of the placement window.
+    mPlacementWindow = window;
+    if(window.IsVisible())
+    {
+      mWebViewVisibleState |= WebViewVisibleStateFlag::WINDOW_SHOW;
+    }
+    else
+    {
+      mWebViewVisibleState &= ~WebViewVisibleStateFlag::WINDOW_SHOW;
+    }
+    DevelWindow::VisibilityChangedSignal(window).Connect(this, &WebView::OnWindowVisibilityChanged);
+  }
+  ApplyVisibilityCheck();
   Control::OnSceneConnection(depth);
   EnableBlendMode(!mVideoHoleEnabled);
 }
 
+void WebView::OnSceneDisconnection()
+{
+  mWebViewVisibleState &= ~WebViewVisibleStateFlag::SCENE_ON;
+  mWebViewVisibleState &= ~WebViewVisibleStateFlag::WINDOW_SHOW;
+  mWebViewVisibleState &= ~WebViewVisibleStateFlag::PARENT_SHOW;
+  Window window = mPlacementWindow.GetHandle();
+  if(window)
+  {
+    DevelWindow::VisibilityChangedSignal(window).Disconnect(this, &WebView::OnWindowVisibilityChanged);
+    mPlacementWindow.Reset();
+  }
+  ApplyVisibilityCheck();
+  Control::OnSceneDisconnection();
+}
+
 bool WebView::OnTouchEvent(Actor actor, const Dali::TouchEvent& touch)
 {
   bool result = false;
@@ -1229,8 +1418,81 @@ bool WebView::SetVisibility(bool visible)
   return mWebEngine ? mWebEngine.SetVisibility(visible) : false;
 }
 
-#undef GET_ENUM_STRING
-#undef GET_ENUM_VALUE
+void WebView::ApplyVisibilityCheck()
+{
+  SetVisibility(mWebViewVisibleState == WebViewVisibleStateFlag::VISIBLE);
+}
+
+WebView::WebViewAccessible::WebViewAccessible(Dali::Actor self, Dali::WebEngine& webEngine)
+: ControlAccessible(self),
+  mRemoteChild{},
+  mWebEngine{webEngine}
+{
+  mRemoteChild.SetParent(this);
+
+  Dali::Accessibility::Bridge::EnabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityEnabled);
+  Dali::Accessibility::Bridge::DisabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityDisabled);
+
+  if(Dali::Accessibility::IsUp())
+  {
+    OnAccessibilityEnabled();
+  }
+  else
+  {
+    OnAccessibilityDisabled();
+  }
+}
+
+Dali::Accessibility::Attributes WebView::WebViewAccessible::GetAttributes() const
+{
+  auto attributes = DevelControl::ControlAccessible::GetAttributes();
+
+  if(mRemoteChild.GetAddress())
+  {
+    attributes.insert_or_assign("child_bus", mRemoteChild.GetAddress().GetBus());
+  }
+
+  return attributes;
+}
+
+void WebView::WebViewAccessible::DoGetChildren(std::vector<Dali::Accessibility::Accessible*>& children)
+{
+  if(mRemoteChild.GetAddress())
+  {
+    // DoGetChildren is called at most once per every OnChildrenChanged.
+    // We have only one OnChildrenChanged in this case, so EmbedAtkSocket will be called only once.
+    Accessibility::Bridge::GetCurrentBridge()->EmbedAtkSocket(GetAddress(), mRemoteChild.GetAddress());
+    children.push_back(&mRemoteChild);
+  }
+}
+
+void WebView::WebViewAccessible::OnAccessibilityEnabled()
+{
+  if(!mWebEngine)
+  {
+    return;
+  }
+
+  mWebEngine.ActivateAccessibility(true);
+  SetRemoteChildAddress(mWebEngine.GetAccessibilityAddress());
+}
+
+void WebView::WebViewAccessible::OnAccessibilityDisabled()
+{
+  if(!mWebEngine)
+  {
+    return;
+  }
+
+  SetRemoteChildAddress({});
+  mWebEngine.ActivateAccessibility(false);
+}
+
+void WebView::WebViewAccessible::SetRemoteChildAddress(Dali::Accessibility::Address address)
+{
+  mRemoteChild.SetAddress(address);
+  OnChildrenChanged();
+}
 
 } // namespace Internal
 
diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.h b/dali-toolkit/internal/controls/web-view/web-view-impl.h
old mode 100755
new mode 100644
index ca1ec27..6415a8b
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.h
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_WEB_VIEW_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,14 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/actors/actor-devel.h>
-#include <dali/devel-api/adaptor-framework/web-engine.h>
+#include <dali/devel-api/adaptor-framework/proxy-accessible.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine.h>
 #include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/object/property-notification.h>
 #include <memory>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-accessible.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-view.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -38,8 +40,6 @@ namespace Toolkit
 class KeyEvent;
 class TouchEvent;
 class WebBackForwardList;
-class WebContext;
-class WebCookieManager;
 class WebSettings;
 class WebView;
 
@@ -73,19 +73,24 @@ public:
   static Toolkit::WebView New(uint32_t argc, char** argv);
 
   /**
-   * @copydoc Dali::Toolkit::WebView::GetSettings()
+   * @copydoc Dali::Toolkit::WebView::FindWebView()
    */
-  Dali::Toolkit::WebSettings* GetSettings() const;
+  static Toolkit::WebView FindWebView(Dali::WebEnginePlugin* plugin);
 
   /**
    * @copydoc Dali::Toolkit::WebView::GetContext()
    */
-  Dali::Toolkit::WebContext* GetContext() const;
+  static Dali::WebEngineContext* GetContext();
 
   /**
    * @copydoc Dali::Toolkit::WebView::GetCookieManager()
    */
-  Dali::Toolkit::WebCookieManager* GetCookieManager() const;
+  static Dali::WebEngineCookieManager* GetCookieManager();
+
+  /**
+   * @copydoc Dali::Toolkit::WebView::GetSettings()
+   */
+  Dali::Toolkit::WebSettings* GetSettings() const;
 
   /**
    * @copydoc Dali::Toolkit::WebView::GetBackForwardList()
@@ -93,6 +98,11 @@ public:
   Dali::Toolkit::WebBackForwardList* GetBackForwardList() const;
 
   /**
+   * @copydoc Dali::Toolkit::WebView::GetPlugin()
+   */
+  Dali::WebEnginePlugin* GetPlugin() const;
+
+  /**
    * @copydoc Dali::Toolkit::WebView::GetFavicon()
    */
   Dali::Toolkit::ImageView GetFavicon() const;
@@ -115,7 +125,7 @@ public:
   /**
    * @copydoc Dali::WebEngine::LoadContents()
    */
-  bool LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri);
+  bool LoadContents(const int8_t* contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri);
 
   /**
    * @copydoc Dali::Toolkit::WebView::Reload()
@@ -363,6 +373,16 @@ public:
   void RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback);
 
   /**
+   * @copydoc Dali::Toolkit::WebView::RegisterNavigationPolicyDecidedCallback()
+   */
+  void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback);
+
+  /**
+   * @copydoc Dali::Toolkit::WebView::RegisterNewWindowCreatedCallback()
+   */
+  void RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback);
+
+  /**
    * @copydoc Dali::Toolkit::WebView::RegisterCertificateConfirmedCallback()
    */
   void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback);
@@ -418,6 +438,16 @@ private: // From Control
   void OnInitialize() override;
 
   /**
+   * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+   */
+  DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+  /**
+   * @copydoc Toolkit::Internal::Control::OnRelayout()
+   */
+  void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
+
+  /**
    * @copydoc Toolkit::Control::GetNaturalSize
    */
   Vector3 GetNaturalSize() override;
@@ -442,6 +472,11 @@ private: // From Control
    */
   void OnSceneConnection(int depth) override;
 
+  /**
+   * @copydoc Toolkit::Control::OnSceneDisconnection()
+   */
+  void OnSceneDisconnection() override;
+
 private:
   // Undefined
   WebView(const WebView& webView);
@@ -572,12 +607,6 @@ private:
   bool SetVisibility(bool visible);
 
   /**
-   * @brief Update display area of web view.
-   * @param[in] source The soource triggers Notification.
-   */
-  void UpdateDisplayArea(Dali::PropertyNotification& source);
-
-  /**
    * @brief Enable/Disable video hole for video playing.
    * @param[in] enabled True if video hole is enabled, false otherwise.
    */
@@ -640,9 +669,10 @@ private:
   void OnFrameRendered();
 
   /**
-   * @brief Callback function to be called when frame is rendered. This is to check initial buffer is ready.
+   * @brief Callback for updating display area of web view.
+   * @param[in] source The soource triggers Notification.
    */
-  void OnInitialFrameRendered();
+  void OnDisplayAreaUpdated(Dali::PropertyNotification& source);
 
   /**
    * @brief Callback function to be called when visibility is changed.
@@ -653,18 +683,80 @@ private:
   void OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type);
 
   /**
+   * @brief Callback when the visibility of the window is changed.
+   * @param[in] window The window whose visibility has changed
+   * @param[in] visible Whether the window is now visible or not
+   */
+  void OnWindowVisibilityChanged(Window window, bool visible);
+
+  /**
    * @brief callback for screen shot captured.
    * @param[in] pixel Pixel data of screen shot.
    */
   void OnScreenshotCaptured(Dali::PixelData pixel);
 
+  /**
+   * @brief Set DisplayArea by input value.
+   * It will send changes area infomations to webengine internally.
+   *
+   * @param[in] displayArea The display area for current webview want to show.
+   */
+  void SetDisplayArea(const Dali::Rect<int32_t>& displayArea);
+
+  /**
+   * @brief Apply self visibility state and send visibility chagend to web engine.
+   */
+  void ApplyVisibilityCheck();
+
+protected:
+  class WebViewAccessible : public DevelControl::ControlAccessible
+  {
+  public:
+    WebViewAccessible() = delete;
+
+    WebViewAccessible(Dali::Actor self, Dali::WebEngine& webEngine);
+
+  protected:
+    /**
+     * @copydoc Dali::Accessibility::Accessible::GetAttributes()
+     */
+    Dali::Accessibility::Attributes GetAttributes() const override;
+
+    /**
+     * @copydoc Dali::Accessibility::ActorAccessible::DoGetChildren()
+     */
+    void DoGetChildren(std::vector<Dali::Accessibility::Accessible*>& children) override;
+
+  private:
+    void OnAccessibilityEnabled();
+    void OnAccessibilityDisabled();
+    void SetRemoteChildAddress(Dali::Accessibility::Address address);
+
+    Dali::Accessibility::ProxyAccessible mRemoteChild;
+    Dali::WebEngine&                     mWebEngine;
+  };
+
 private:
   Dali::Toolkit::Visual::Base mVisual;
   Dali::Size                  mWebViewSize;
   Dali::WebEngine             mWebEngine;
 
-  std::unique_ptr<Dali::Toolkit::WebContext>         mWebContext;
-  std::unique_ptr<Dali::Toolkit::WebCookieManager>   mWebCookieManager;
+  uint32_t mLastRenderedNativeImageWidth;
+  uint32_t mLastRenderedNativeImageHeight;
+
+  enum WebViewVisibleStateFlag
+  {
+    NONE        = 0,
+    SCENE_ON    = 1 << 0,
+    WINDOW_SHOW = 1 << 1,
+    SELF_SHOW   = 1 << 2,
+    PARENT_SHOW = 1 << 3,
+
+    VISIBLE = SCENE_ON | WINDOW_SHOW | SELF_SHOW | PARENT_SHOW,
+  };
+  uint32_t           mWebViewVisibleState{WebViewVisibleStateFlag::NONE}; /// Flag of web view visible.
+  WeakHandle<Window> mPlacementWindow;
+
   std::unique_ptr<Dali::Toolkit::WebSettings>        mWebSettings;
   std::unique_ptr<Dali::Toolkit::WebBackForwardList> mWebBackForwardList;
 
@@ -676,6 +768,8 @@ private:
   bool                       mMouseEventsEnabled;
   bool                       mKeyEventsEnabled;
 
+  bool mVisualChangeRequired;
+
   Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback mScreenshotCapturedCallback;
   Dali::WebEnginePlugin::WebEngineFrameRenderedCallback     mFrameRenderedCallback;
 };
diff --git a/dali-toolkit/internal/feedback/feedback-style.cpp b/dali-toolkit/internal/feedback/feedback-style.cpp
index 1e8607e..a5ed3b1 100644
--- a/dali-toolkit/internal/feedback/feedback-style.cpp
+++ b/dali-toolkit/internal/feedback/feedback-style.cpp
@@ -94,8 +94,6 @@ struct FeedbackStyleInfo
   SignalFeedbackInfoContainer mSignalFeedbackInfoList;
 };
 
-static const FeedbackStyleInfo DEFAULT_FEEDBACK_STYLE_INFO;
-
 FeedbackStyle::FeedbackStyle()
 {
   mFeedback = Dali::FeedbackPlayer::Get();
@@ -180,6 +178,7 @@ const FeedbackStyleInfo& FeedbackStyle::GetStyleInfo(const std::string& type) co
   }
   else
   {
+    static const FeedbackStyleInfo DEFAULT_FEEDBACK_STYLE_INFO;
     return DEFAULT_FEEDBACK_STYLE_INFO;
   }
 }
diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index 7f02340..e9ae5b7 100644
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -13,6 +13,17 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/builder/style.cpp
    ${toolkit_src_dir}/builder/tree-node-manipulator.cpp
    ${toolkit_src_dir}/builder/replacement.cpp
+   ${toolkit_src_dir}/particle-system/particle-impl.cpp
+   ${toolkit_src_dir}/particle-system/particle-domain-impl.cpp
+   ${toolkit_src_dir}/particle-system/particle-emitter-impl.cpp
+   ${toolkit_src_dir}/particle-system/particle-list-impl.cpp
+   ${toolkit_src_dir}/particle-system/particle-modifier-impl.cpp
+   ${toolkit_src_dir}/particle-system/particle-renderer-impl.cpp
+   ${toolkit_src_dir}/particle-system/particle-source-impl.cpp
+   ${toolkit_src_dir}/texture-manager/texture-async-loading-helper.cpp
+   ${toolkit_src_dir}/texture-manager/texture-cache-manager.cpp
+   ${toolkit_src_dir}/texture-manager/texture-manager-impl.cpp
+   ${toolkit_src_dir}/texture-manager/texture-upload-observer.cpp
    ${toolkit_src_dir}/visuals/animated-image/animated-image-visual.cpp
    ${toolkit_src_dir}/visuals/animated-image/image-cache.cpp
    ${toolkit_src_dir}/visuals/animated-image/fixed-image-cache.cpp
@@ -22,7 +33,6 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/visuals/animated-vector-image/vector-animation-manager.cpp
    ${toolkit_src_dir}/visuals/animated-vector-image/vector-animation-task.cpp
    ${toolkit_src_dir}/visuals/animated-vector-image/vector-animation-thread.cpp
-   ${toolkit_src_dir}/visuals/animated-vector-image/vector-rasterize-thread.cpp
    ${toolkit_src_dir}/visuals/arc/arc-visual.cpp
    ${toolkit_src_dir}/visuals/border/border-visual.cpp
    ${toolkit_src_dir}/visuals/color/color-visual.cpp
@@ -38,13 +48,14 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/visuals/npatch-loader.cpp
    ${toolkit_src_dir}/visuals/npatch/npatch-visual.cpp
    ${toolkit_src_dir}/visuals/primitive/primitive-visual.cpp
-   ${toolkit_src_dir}/visuals/svg/svg-rasterize-thread.cpp
+   ${toolkit_src_dir}/visuals/svg/svg-task.cpp
    ${toolkit_src_dir}/visuals/svg/svg-visual.cpp
+   ${toolkit_src_dir}/visuals/text-visual-shader-factory.cpp
    ${toolkit_src_dir}/visuals/text/text-visual.cpp
    ${toolkit_src_dir}/visuals/transition-data-impl.cpp
-   ${toolkit_src_dir}/visuals/texture-manager-impl.cpp
-   ${toolkit_src_dir}/visuals/texture-upload-observer.cpp
+   ${toolkit_src_dir}/visuals/image-visual-shader-debug.cpp
    ${toolkit_src_dir}/visuals/image-visual-shader-factory.cpp
+   ${toolkit_src_dir}/visuals/image-visual-shader-feature-builder.cpp
    ${toolkit_src_dir}/visuals/visual-base-data-impl.cpp
    ${toolkit_src_dir}/visuals/visual-base-impl.cpp
    ${toolkit_src_dir}/visuals/visual-factory-cache.cpp
@@ -62,7 +73,7 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/controls/buttons/radio-button-impl.cpp
    ${toolkit_src_dir}/controls/buttons/toggle-button-impl.cpp
    ${toolkit_src_dir}/controls/canvas-view/canvas-view-impl.cpp
-   ${toolkit_src_dir}/controls/canvas-view/canvas-view-rasterize-thread.cpp
+   ${toolkit_src_dir}/controls/canvas-view/canvas-view-rasterize-task.cpp
    ${toolkit_src_dir}/controls/control/control-data-impl.cpp
    ${toolkit_src_dir}/controls/control/control-debug.cpp
    ${toolkit_src_dir}/controls/control/control-renderers.cpp
@@ -92,6 +103,8 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp
    ${toolkit_src_dir}/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp
    ${toolkit_src_dir}/controls/scrollable/scroll-view/scroll-view-impl.cpp
+   ${toolkit_src_dir}/controls/scrollable/scroll-view/scroll-view-impl-constraints.cpp
+   ${toolkit_src_dir}/controls/scrollable/scroll-view/scroll-view-impl-property-handler.cpp
    ${toolkit_src_dir}/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.cpp
    ${toolkit_src_dir}/controls/scene3d-view/scene3d-view-impl.cpp
    ${toolkit_src_dir}/controls/scene3d-view/gltf-loader.cpp
@@ -99,20 +112,27 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/controls/slider/slider-impl.cpp
    ${toolkit_src_dir}/controls/super-blur-view/super-blur-view-impl.cpp
    ${toolkit_src_dir}/controls/table-view/table-view-impl.cpp
+   ${toolkit_src_dir}/controls/text-controls/common-text-utils.cpp
+   ${toolkit_src_dir}/controls/text-controls/text-anchor-impl.cpp
    ${toolkit_src_dir}/controls/text-controls/text-editor-impl.cpp
+   ${toolkit_src_dir}/controls/text-controls/text-editor-property-handler.cpp
    ${toolkit_src_dir}/controls/text-controls/text-field-impl.cpp
+   ${toolkit_src_dir}/controls/text-controls/text-field-property-handler.cpp
    ${toolkit_src_dir}/controls/text-controls/text-label-impl.cpp
    ${toolkit_src_dir}/controls/text-controls/text-selection-popup-impl.cpp
+   ${toolkit_src_dir}/controls/text-controls/text-selection-popup-property-handler.cpp
    ${toolkit_src_dir}/controls/text-controls/text-selection-toolbar-impl.cpp
    ${toolkit_src_dir}/controls/tool-bar/tool-bar-impl.cpp
    ${toolkit_src_dir}/controls/tooltip/tooltip.cpp
    ${toolkit_src_dir}/controls/video-view/video-view-impl.cpp
    ${toolkit_src_dir}/controls/web-view/web-view-impl.cpp
    ${toolkit_src_dir}/controls/camera-view/camera-view-impl.cpp
+   ${toolkit_src_dir}/controls/gl-view/drawable-view-impl.cpp
+   ${toolkit_src_dir}/controls/gl-view/drawable-view-native-renderer.cpp
+   ${toolkit_src_dir}/controls/gl-view/gl-view-impl.cpp
+   ${toolkit_src_dir}/controls/gl-view/gl-view-render-thread.cpp
    ${toolkit_src_dir}/accessibility-manager/accessibility-manager-impl.cpp
-
    ${toolkit_src_dir}/feedback/feedback-style.cpp
-
    ${toolkit_src_dir}/focus-manager/keyboard-focus-manager-impl.cpp
    ${toolkit_src_dir}/focus-manager/keyinput-focus-manager-impl.cpp
    ${toolkit_src_dir}/helpers/color-conversion.cpp
@@ -123,40 +143,44 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/filters/spread-filter.cpp
    ${toolkit_src_dir}/image-loader/async-image-loader-impl.cpp
    ${toolkit_src_dir}/image-loader/atlas-packer.cpp
+   ${toolkit_src_dir}/image-loader/fast-track-loading-task.cpp
    ${toolkit_src_dir}/image-loader/image-atlas-impl.cpp
-   ${toolkit_src_dir}/image-loader/image-load-thread.cpp
+   ${toolkit_src_dir}/image-loader/loading-task.cpp
    ${toolkit_src_dir}/image-loader/image-url-impl.cpp
    ${toolkit_src_dir}/styling/style-manager-impl.cpp
+   ${toolkit_src_dir}/text/abstract-style-character-run.cpp
    ${toolkit_src_dir}/text/bidirectional-support.cpp
+   ${toolkit_src_dir}/text/bounded-paragraph-helper-functions.cpp
    ${toolkit_src_dir}/text/character-set-conversion.cpp
+   ${toolkit_src_dir}/text/characters-helper-functions.cpp
    ${toolkit_src_dir}/text/color-segmentation.cpp
    ${toolkit_src_dir}/text/cursor-helper-functions.cpp
    ${toolkit_src_dir}/text/glyph-metrics-helper.cpp
    ${toolkit_src_dir}/text/logical-model-impl.cpp
-   ${toolkit_src_dir}/text/markup-processor.cpp
-   ${toolkit_src_dir}/text/markup-processor-color.cpp
-   ${toolkit_src_dir}/text/markup-processor-embedded-item.cpp
-   ${toolkit_src_dir}/text/markup-processor-anchor.cpp
-   ${toolkit_src_dir}/text/markup-processor-font.cpp
-   ${toolkit_src_dir}/text/markup-processor-background.cpp
-   ${toolkit_src_dir}/text/markup-processor-span.cpp
-   ${toolkit_src_dir}/text/markup-processor-helper-functions.cpp
    ${toolkit_src_dir}/text/multi-language-support.cpp
    ${toolkit_src_dir}/text/hidden-text.cpp
    ${toolkit_src_dir}/text/input-filter.cpp
+   ${toolkit_src_dir}/text/line-helper-functions.cpp
    ${toolkit_src_dir}/text/property-string-parser.cpp
    ${toolkit_src_dir}/text/segmentation.cpp
    ${toolkit_src_dir}/text/shaper.cpp
+   ${toolkit_src_dir}/text/string-text/character-sequence-impl.cpp
+   ${toolkit_src_dir}/text/string-text/range-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spanned-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spannable-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spannable-string-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/base-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/foreground-color-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/character-spacing-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/strikethrough-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/font-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/underline-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/bold-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/italic-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/spans/background-color-span-impl.cpp
+   ${toolkit_src_dir}/text/spannable/span-ranges-container-impl.cpp
    ${toolkit_src_dir}/text/hyphenator.cpp
    ${toolkit_src_dir}/text/text-enumerations-impl.cpp
-   ${toolkit_src_dir}/text/text-controller.cpp
-   ${toolkit_src_dir}/text/text-controller-event-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-impl.cpp
-   ${toolkit_src_dir}/text/text-controller-impl-event-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-input-font-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-placeholder-handler.cpp
-   ${toolkit_src_dir}/text/text-controller-relayouter.cpp
-   ${toolkit_src_dir}/text/text-controller-text-updater.cpp
    ${toolkit_src_dir}/text/text-effects-style.cpp
    ${toolkit_src_dir}/text/text-font-style.cpp
    ${toolkit_src_dir}/text/text-io.cpp
@@ -168,7 +192,34 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/text/text-view-interface.cpp
    ${toolkit_src_dir}/text/visual-model-impl.cpp
    ${toolkit_src_dir}/text/decorator/text-decorator.cpp
+   ${toolkit_src_dir}/text/controller/text-controller.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-background-actor.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-event-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl-data-clearer.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl-event-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-impl-model-updater.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-input-font-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-input-properties.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-placeholder-handler.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-relayouter.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-text-updater.cpp
+   ${toolkit_src_dir}/text/controller/text-controller-spannable-handler.cpp
+   ${toolkit_src_dir}/text/layouts/layout-engine-helper-functions.cpp
    ${toolkit_src_dir}/text/layouts/layout-engine.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-color.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-embedded-item.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-anchor.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-font.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-background.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-paragraph.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-span.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-strikethrough.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-underline.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-character-spacing.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-helper-functions.cpp
+   ${toolkit_src_dir}/text/markup-processor/markup-processor-attribute-helper-functions.cpp
    ${toolkit_src_dir}/text/multi-language-helper-functions.cpp
    ${toolkit_src_dir}/text/multi-language-support-impl.cpp
    ${toolkit_src_dir}/text/rendering/text-backend.cpp
@@ -182,6 +233,9 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/text/rendering/text-backend-impl.cpp
    ${toolkit_src_dir}/text/rendering/text-typesetter.cpp
    ${toolkit_src_dir}/text/rendering/view-model.cpp
+   ${toolkit_src_dir}/text/rendering/styles/underline-helper-functions.cpp
+   ${toolkit_src_dir}/text/rendering/styles/strikethrough-helper-functions.cpp
+   ${toolkit_src_dir}/text/rendering/styles/character-spacing-helper-functions.cpp
    ${toolkit_src_dir}/transition/fade-transition-impl.cpp
    ${toolkit_src_dir}/transition/slide-transition-impl.cpp
    ${toolkit_src_dir}/transition/scale-transition-impl.cpp
@@ -195,6 +249,8 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/transition-effects/cube-transition-wave-effect-impl.cpp
    ${toolkit_src_dir}/text/xhtml-entities.cpp
    ${toolkit_src_dir}/drag-drop-detector/drag-and-drop-detector-impl.cpp
+   ${toolkit_src_dir}/text/emoji-helper.cpp
+   ${toolkit_src_dir}/text/text-geometry.cpp
 )
 
 SET( SOURCES ${SOURCES}
diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 745da15..e8a990f 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/events/wheel-event.h>
 #include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/object/type-registry.h>
@@ -118,6 +119,7 @@ KeyboardFocusManager::KeyboardFocusManager()
   mFocusedActorEnterKeySignal(),
   mCurrentFocusActor(),
   mFocusIndicatorActor(),
+  mFocusFinderRootActor(),
   mFocusHistory(),
   mSlotDelegate(this),
   mCustomAlgorithmInterface(NULL),
@@ -128,7 +130,8 @@ KeyboardFocusManager::KeyboardFocusManager()
   mFocusGroupLoopEnabled(false),
   mIsWaitingKeyboardFocusChangeCommit(false),
   mClearFocusOnTouch(true),
-  mEnableDefaultAlgorithm(false)
+  mEnableDefaultAlgorithm(false),
+  mCurrentWindowId(0)
 {
   // TODO: Get FocusIndicatorEnable constant from stylesheet to set mIsFocusIndicatorShown.
 
@@ -145,7 +148,9 @@ void KeyboardFocusManager::OnAdaptorInit()
     {
       (*iter).KeyEventSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnKeyEvent);
       (*iter).TouchedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnTouch);
-      Dali::Window window = DevelWindow::DownCast(*iter);
+      (*iter).WheelEventGeneratedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnCustomWheelEvent);
+      (*iter).WheelEventSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWheelEvent);
+      Window window = Window::DownCast(*iter);
       if(window)
       {
         window.FocusChangeSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged);
@@ -161,7 +166,9 @@ void KeyboardFocusManager::OnSceneHolderCreated(Dali::Integration::SceneHolder&
 {
   sceneHolder.KeyEventSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnKeyEvent);
   sceneHolder.TouchedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnTouch);
-  Dali::Window window = DevelWindow::DownCast(sceneHolder);
+  sceneHolder.WheelEventGeneratedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnCustomWheelEvent);
+  sceneHolder.WheelEventSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWheelEvent);
+  Window window = Window::DownCast(sceneHolder);
   if(window)
   {
     window.FocusChangeSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged);
@@ -177,8 +184,9 @@ void KeyboardFocusManager::GetConfigurationFromStyleManger()
   Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
   if(styleManager)
   {
-    Property::Map config   = Toolkit::DevelStyleManager::GetConfigurations(styleManager);
-    mAlwaysShowIndicator   = config["alwaysShowFocus"].Get<bool>() ? ALWAYS_SHOW : NONE;
+    const auto alwaysShowFocusValue = Toolkit::DevelStyleManager::GetConfigurations(styleManager).Find("alwaysShowFocus", Property::Type::BOOLEAN);
+
+    mAlwaysShowIndicator   = (alwaysShowFocusValue && alwaysShowFocusValue->Get<bool>()) ? ALWAYS_SHOW : NONE;
     mIsFocusIndicatorShown = (mAlwaysShowIndicator == ALWAYS_SHOW) ? SHOW : HIDE;
     mClearFocusOnTouch     = (mIsFocusIndicatorShown == SHOW) ? false : true;
   }
@@ -200,68 +208,45 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor)
 {
   bool success = false;
 
-  // If the parent's KEYBOARD_FOCUSABLE_CHILDREN is false, it cannot have focus.
-  if(actor)
+  // Check whether the actor is in the stage and is keyboard focusable.
+  if(actor &&
+     actor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) &&
+     actor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED) &&
+     actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
   {
+    // If the parent's KEYBOARD_FOCUSABLE_CHILDREN is false, it cannot have focus.
     Actor parent = actor.GetParent();
     while(parent)
     {
       if(!parent.GetProperty<bool>(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN))
       {
-        DALI_LOG_INFO(gLogFilter, Debug::General, "[%s:%d] Parent Actor has KEYBOARD_FOCUSABLE_CHILDREN false,\n", __FUNCTION__, __LINE__);
+        DALI_LOG_DEBUG_INFO("Parent Actor has KEYBOARD_FOCUSABLE_CHILDREN false\n");
         return false;
       }
       parent = parent.GetParent();
     }
-  }
 
-  if(actor && actor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) && actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
-  {
-    Integration::SceneHolder currentWindow = Integration::SceneHolder::Get(actor);
+    // If developer set focus on same actor, doing nothing
+    Actor currentFocusedActor = GetCurrentFocusActor();
+    DALI_LOG_DEBUG_INFO("current focused actor : [%p] new focused actor : [%p]\n", currentFocusedActor.GetObjectPtr(), actor.GetObjectPtr());
+    if(actor == currentFocusedActor)
+    {
+      return true;
+    }
 
+    Integration::SceneHolder currentWindow = Integration::SceneHolder::Get(actor);
     if(currentWindow.GetRootLayer() != mCurrentFocusedWindow.GetHandle())
     {
       Layer rootLayer       = currentWindow.GetRootLayer();
       mCurrentFocusedWindow = rootLayer;
+      mCurrentWindowId = static_cast<uint32_t>(currentWindow.GetNativeId());
     }
-  }
-
-  Actor currentFocusedActor = GetCurrentFocusActor();
-
-  // If developer set focus on same actor, doing nothing
-  if(actor == currentFocusedActor)
-  {
-    if(!actor)
-    {
-      return false;
-    }
-    return true;
-  }
 
-  // Check whether the actor is in the stage and is keyboard focusable.
-  if(actor && actor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) && actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
-  {
     if((mIsFocusIndicatorShown == SHOW) && (mEnableFocusIndicator == ENABLE))
     {
       actor.Add(GetFocusIndicatorActor());
     }
 
-    // Send notification for the change of focus actor
-    if(!mFocusChangedSignal.Empty())
-    {
-      mFocusChangedSignal.Emit(currentFocusedActor, actor);
-    }
-
-    Toolkit::Control currentlyFocusedControl = Toolkit::Control::DownCast(currentFocusedActor);
-    if(currentlyFocusedControl)
-    {
-      // Do we need it to remember if it was previously DISABLED?
-      currentlyFocusedControl.SetProperty(DevelControl::Property::STATE, DevelControl::NORMAL);
-      currentlyFocusedControl.ClearKeyInputFocus();
-    }
-
-    DALI_LOG_INFO(gLogFilter, Debug::General, "[%s:%d] Focus Changed\n", __FUNCTION__, __LINE__);
-
     // Save the current focused actor
     mCurrentFocusActor = actor;
 
@@ -281,6 +266,20 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor)
       mCurrentFocusActors.push_back(std::pair<WeakHandle<Layer>, WeakHandle<Actor> >(mCurrentFocusedWindow, actor));
     }
 
+    // Send notification for the change of focus actor
+    if(!mFocusChangedSignal.Empty())
+    {
+      mFocusChangedSignal.Emit(currentFocusedActor, actor);
+    }
+
+    Toolkit::Control currentlyFocusedControl = Toolkit::Control::DownCast(currentFocusedActor);
+    if(currentlyFocusedControl)
+    {
+      // Do we need it to remember if it was previously DISABLED?
+      currentlyFocusedControl.SetProperty(DevelControl::Property::STATE, DevelControl::NORMAL);
+      currentlyFocusedControl.ClearKeyInputFocus();
+    }
+
     Toolkit::Control newlyFocusedControl = Toolkit::Control::DownCast(actor);
     if(newlyFocusedControl)
     {
@@ -418,18 +417,18 @@ Toolkit::Control KeyboardFocusManager::GetParentLayoutControl(Actor actor) const
   return Toolkit::Control::DownCast(parent);
 }
 
-bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction direction)
+bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction direction, const std::string& deviceName)
 {
   Actor currentFocusActor = GetCurrentFocusActor();
 
   bool succeed = false;
 
   // Go through the actor's hierarchy until we find a layout control that knows how to move the focus
-  Toolkit::Control parentLayoutControl = GetParentLayoutControl(currentFocusActor);
-  while(parentLayoutControl && !succeed)
+  Toolkit::Control layoutControl = IsLayoutControl(currentFocusActor) ? Toolkit::Control::DownCast(currentFocusActor) : GetParentLayoutControl(currentFocusActor);
+  while(layoutControl && !succeed)
   {
-    succeed             = DoMoveFocusWithinLayoutControl(parentLayoutControl, currentFocusActor, direction);
-    parentLayoutControl = GetParentLayoutControl(parentLayoutControl);
+    succeed       = DoMoveFocusWithinLayoutControl(layoutControl, currentFocusActor, direction);
+    layoutControl = GetParentLayoutControl(layoutControl);
   }
 
   if(!succeed)
@@ -468,6 +467,16 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction
           index = Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID;
           break;
         }
+        case Toolkit::Control::KeyboardFocus::CLOCKWISE:
+        {
+          index = Toolkit::DevelControl::Property::CLOCKWISE_FOCUSABLE_ACTOR_ID;
+          break;
+        }
+        case Toolkit::Control::KeyboardFocus::COUNTER_CLOCKWISE:
+        {
+          index = Toolkit::DevelControl::Property::COUNTER_CLOCKWISE_FOCUSABLE_ACTOR_ID;
+          break;
+        }
         default:
           break;
       }
@@ -504,7 +513,7 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction
       if(mCustomAlgorithmInterface)
       {
         mIsWaitingKeyboardFocusChangeCommit = true;
-        nextFocusableActor                  = mCustomAlgorithmInterface->GetNextFocusableActor(currentFocusActor, Actor(), direction);
+        nextFocusableActor                  = mCustomAlgorithmInterface->GetNextFocusableActor(currentFocusActor, Actor(), direction, deviceName);
         mIsWaitingKeyboardFocusChangeCommit = false;
       }
       else if(!mPreFocusChangeSignal.Empty())
@@ -516,12 +525,33 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction
       }
       else if(mEnableDefaultAlgorithm)
       {
-        // We should find it among the actors nearby.
-        nextFocusableActor = Toolkit::FocusFinder::GetNearestFocusableActor(currentFocusActor, direction);
+        Actor rootActor = mFocusFinderRootActor.GetHandle();
+        if(!rootActor)
+        {
+          if(currentFocusActor)
+          {
+            // Find the window of the focused actor.
+            Integration::SceneHolder window = Integration::SceneHolder::Get(currentFocusActor);
+            if(window)
+            {
+              rootActor = window.GetRootLayer();
+            }
+          }
+          else
+          {
+            // Searches from the currently focused window.
+            rootActor = mCurrentFocusedWindow.GetHandle();
+          }
+        }
+        if(rootActor)
+        {
+          // We should find it among the actors nearby.
+          nextFocusableActor = Toolkit::FocusFinder::GetNearestFocusableActor(rootActor, currentFocusActor, direction);
+        }
       }
     }
 
-    if(nextFocusableActor && nextFocusableActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
+    if(nextFocusableActor && nextFocusableActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) && nextFocusableActor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED))
     {
       // Whether the next focusable actor is a layout control
       if(IsLayoutControl(nextFocusableActor))
@@ -530,9 +560,9 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction
         Toolkit::Control layoutControl = Toolkit::Control::DownCast(nextFocusableActor);
         succeed                        = DoMoveFocusWithinLayoutControl(layoutControl, currentFocusActor, direction);
       }
-      else
+      if(!succeed)
       {
-        // Otherwise, just set focus to the next focusable actor
+        // Just set focus to the next focusable actor
         succeed = SetCurrentFocusActor(nextFocusableActor);
       }
     }
@@ -547,7 +577,7 @@ bool KeyboardFocusManager::DoMoveFocusWithinLayoutControl(Toolkit::Control contr
   Actor nextFocusableActor = GetImplementation(control).GetNextKeyboardFocusableActor(actor, direction, mFocusGroupLoopEnabled);
   if(nextFocusableActor)
   {
-    if(!nextFocusableActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
+    if(!(nextFocusableActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) || nextFocusableActor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED)))
     {
       // If the actor is not focusable, ask the same layout control for the next actor to focus
       return DoMoveFocusWithinLayoutControl(control, nextFocusableActor, direction);
@@ -566,10 +596,10 @@ bool KeyboardFocusManager::DoMoveFocusWithinLayoutControl(Toolkit::Control contr
         mIsWaitingKeyboardFocusChangeCommit = false;
       }
 
-      if(committedFocusActor && committedFocusActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
+      if(committedFocusActor && committedFocusActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) && committedFocusActor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED))
       {
         // Whether the commited focusable actor is a layout control
-        if(IsLayoutControl(committedFocusActor))
+        if(IsLayoutControl(committedFocusActor) && committedFocusActor != control)
         {
           // If so, move the focus inside it.
           Toolkit::Control layoutControl = Toolkit::Control::DownCast(committedFocusActor);
@@ -648,14 +678,11 @@ void KeyboardFocusManager::DoKeyboardEnter(Actor actor)
 
 void KeyboardFocusManager::ClearFocus()
 {
+  ClearFocusIndicator();
   Actor actor = GetCurrentFocusActor();
   if(actor)
   {
-    if(mFocusIndicatorActor)
-    {
-      actor.Remove(mFocusIndicatorActor);
-    }
-
+    DALI_LOG_RELEASE_INFO("ClearFocus id:(%d)\n",  actor.GetProperty<int32_t>(Dali::Actor::Property::ID));
     // Send notification for the change of focus actor
     if(!mFocusChangedSignal.Empty())
     {
@@ -669,8 +696,19 @@ void KeyboardFocusManager::ClearFocus()
       currentlyFocusedControl.ClearKeyInputFocus();
     }
   }
-
   mCurrentFocusActor.Reset();
+}
+
+void KeyboardFocusManager::ClearFocusIndicator()
+{
+  Actor actor = GetCurrentFocusActor();
+  if(actor)
+  {
+    if(mFocusIndicatorActor)
+    {
+      actor.Remove(mFocusIndicatorActor);
+    }
+  }
   mIsFocusIndicatorShown = (mAlwaysShowIndicator == ALWAYS_SHOW) ? SHOW : HIDE;
 }
 
@@ -763,9 +801,26 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor()
   return mFocusIndicatorActor;
 }
 
+uint32_t KeyboardFocusManager::GetCurrentWindowId() const
+{
+  return mCurrentWindowId;
+}
+
 void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 {
-  std::string keyName = event.GetKeyName();
+  if(mCurrentFocusedWindow.GetHandle())
+  {
+    // If it is a key event that occurred in another window, it returns.
+    uint32_t eventWindowId = event.GetWindowId();
+    if(eventWindowId > 0 && GetCurrentWindowId() != eventWindowId)
+    {
+      DALI_LOG_RELEASE_INFO("CurrentFocusedWindow id %d, window ID where key event occurred %d : key event skip\n", GetCurrentWindowId(), eventWindowId);
+      return;
+    }
+  }
+
+  const std::string& keyName    = event.GetKeyName();
+  const std::string& deviceName = event.GetDeviceName();
 
   if(mIsFocusIndicatorShown == UNKNOWN)
   {
@@ -778,48 +833,30 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
   {
     if(keyName == "Left")
     {
-      if(!mIsFocusIndicatorShown)
+      if(mIsFocusIndicatorShown == HIDE)
       {
-        if(mIsFocusIndicatorShown == HIDE)
-        {
-          // Show focus indicator
-          mIsFocusIndicatorShown = SHOW;
-        }
-        else
-        {
-          // Move the focus towards left
-          MoveFocus(Toolkit::Control::KeyboardFocus::LEFT);
-        }
-
-        isFocusStartableKey = true;
+        // Show focus indicator
+        mIsFocusIndicatorShown = SHOW;
       }
       else
       {
         // Move the focus towards left
-        MoveFocus(Toolkit::Control::KeyboardFocus::LEFT);
+        MoveFocus(Toolkit::Control::KeyboardFocus::LEFT, deviceName);
       }
 
       isFocusStartableKey = true;
     }
     else if(keyName == "Right")
     {
-      if(!mIsFocusIndicatorShown)
+      if(mIsFocusIndicatorShown == HIDE)
       {
-        if(mIsFocusIndicatorShown == HIDE)
-        {
-          // Show focus indicator
-          mIsFocusIndicatorShown = SHOW;
-        }
-        else
-        {
-          // Move the focus towards right
-          MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT);
-        }
+        // Show focus indicator
+        mIsFocusIndicatorShown = SHOW;
       }
       else
       {
         // Move the focus towards right
-        MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT);
+        MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT, deviceName);
       }
 
       isFocusStartableKey = true;
@@ -834,7 +871,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       else
       {
         // Move the focus towards up
-        MoveFocus(Toolkit::Control::KeyboardFocus::UP);
+        MoveFocus(Toolkit::Control::KeyboardFocus::UP, deviceName);
       }
 
       isFocusStartableKey = true;
@@ -849,7 +886,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       else
       {
         // Move the focus towards down
-        MoveFocus(Toolkit::Control::KeyboardFocus::DOWN);
+        MoveFocus(Toolkit::Control::KeyboardFocus::DOWN, deviceName);
       }
 
       isFocusStartableKey = true;
@@ -864,7 +901,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       else
       {
         // Move the focus towards the previous page
-        MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_UP);
+        MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_UP, deviceName);
       }
 
       isFocusStartableKey = true;
@@ -879,7 +916,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       else
       {
         // Move the focus towards the next page
-        MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_DOWN);
+        MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_DOWN, deviceName);
       }
 
       isFocusStartableKey = true;
@@ -897,12 +934,8 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
         // "Shift-Tab" key changes it in the backward direction.
         if(!DoMoveFocusToNextFocusGroup(!event.IsShiftModifier()))
         {
-          // If the focus group is not changed, Move the focus towards right, "Shift-Tap" key moves the focus towards left.
-          if(!MoveFocus(event.IsShiftModifier() ? Toolkit::Control::KeyboardFocus::LEFT : Toolkit::Control::KeyboardFocus::RIGHT))
-          {
-            // If the focus is not moved, Move the focus towards down, "Shift-Tap" key moves the focus towards up.
-            MoveFocus(event.IsShiftModifier() ? Toolkit::Control::KeyboardFocus::UP : Toolkit::Control::KeyboardFocus::DOWN);
-          }
+          // If the focus group is not changed, Move the focus towards forward, "Shift-Tap" key moves the focus towards backward.
+          MoveFocus(event.IsShiftModifier() ? Toolkit::Control::KeyboardFocus::BACKWARD : Toolkit::Control::KeyboardFocus::FORWARD, deviceName);
         }
       }
 
@@ -971,11 +1004,11 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
         actor.Add(GetFocusIndicatorActor());
       }
     }
-    else
+    else if(!mEnableDefaultAlgorithm)
     {
       // No actor is focused but keyboard focus is activated by the key press
       // Let's try to move the initial focus
-      MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT);
+      MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT, deviceName);
     }
   }
 }
@@ -993,14 +1026,19 @@ void KeyboardFocusManager::OnTouch(const TouchEvent& touch)
   // We only do this on a Down event, otherwise the clear action may override a manually focused actor.
   if(((touch.GetPointCount() < 1) || (touch.GetState(0) == PointState::DOWN)))
   {
-    // If mClearFocusOnTouch is false, do not clear the focus even if user touch the screen.
+    // If you touch the currently focused actor again, you don't need to do SetCurrentFocusActor again.
+    Actor hitActor = touch.GetHitActor(0);
+    if(hitActor && hitActor == GetCurrentFocusActor())
+    {
+      return;
+    }
+    // If mClearFocusOnTouch is false, do not clear the focus indicator even if user touch the screen.
     if(mClearFocusOnTouch)
     {
-      ClearFocus();
+      ClearFocusIndicator();
     }
 
     // If KEYBOARD_FOCUSABLE and TOUCH_FOCUSABLE is true, set focus actor
-    Actor hitActor = touch.GetHitActor(0);
     if(hitActor && hitActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) && hitActor.GetProperty<bool>(DevelActor::Property::TOUCH_FOCUSABLE))
     {
       SetCurrentFocusActor(hitActor);
@@ -1008,6 +1046,59 @@ void KeyboardFocusManager::OnTouch(const TouchEvent& touch)
   }
 }
 
+void KeyboardFocusManager::OnWheelEvent(const WheelEvent& event)
+{
+  if(event.GetType() == Dali::WheelEvent::CUSTOM_WHEEL)
+  {
+    Toolkit::Control::KeyboardFocus::Direction direction = (event.GetDelta() > 0) ? Toolkit::Control::KeyboardFocus::CLOCKWISE : Toolkit::Control::KeyboardFocus::COUNTER_CLOCKWISE;
+    // Move the focus
+    MoveFocus(direction);
+  }
+}
+
+bool KeyboardFocusManager::OnCustomWheelEvent(const WheelEvent& event)
+{
+  bool  consumed = false;
+  Actor actor    = GetCurrentFocusActor();
+  if(actor)
+  {
+    // Notify the actor about the wheel event
+    consumed = EmitCustomWheelSignals(actor, event);
+  }
+  return consumed;
+}
+
+bool KeyboardFocusManager::EmitCustomWheelSignals(Actor actor, const WheelEvent& event)
+{
+  bool consumed = false;
+
+  if(actor)
+  {
+    Dali::Actor oldParent(actor.GetParent());
+
+    // Only do the conversion and emit the signal if the actor's wheel signal has connections.
+    if(!actor.WheelEventSignal().Empty())
+    {
+      // Emit the signal to the parent
+      consumed = actor.WheelEventSignal().Emit(actor, event);
+    }
+    // if actor doesn't consume WheelEvent, give WheelEvent to its parent.
+    if(!consumed)
+    {
+      // The actor may have been removed/reparented during the signal callbacks.
+      Dali::Actor parent = actor.GetParent();
+
+      if(parent &&
+         (parent == oldParent))
+      {
+        consumed = EmitCustomWheelSignals(parent, event);
+      }
+    }
+  }
+
+  return consumed;
+}
+
 void KeyboardFocusManager::OnWindowFocusChanged(Window window, bool focusIn)
 {
   if(focusIn && mCurrentFocusedWindow.GetHandle() != window.GetRootLayer())
@@ -1015,16 +1106,20 @@ void KeyboardFocusManager::OnWindowFocusChanged(Window window, bool focusIn)
     // Change Current Focused Window
     Layer rootLayer       = window.GetRootLayer();
     mCurrentFocusedWindow = rootLayer;
+    mCurrentWindowId = static_cast<uint32_t>(Integration::SceneHolder::Get(rootLayer).GetNativeId());
 
     // Get Current Focused Actor from window
     Actor currentFocusedActor = GetFocusActorFromCurrentWindow();
-    SetCurrentFocusActor(currentFocusedActor);
-
-    if(currentFocusedActor && (mEnableFocusIndicator == ENABLE))
+    if(currentFocusedActor)
     {
-      // Make sure the focused actor is highlighted
-      currentFocusedActor.Add(GetFocusIndicatorActor());
-      mIsFocusIndicatorShown = SHOW;
+      SetCurrentFocusActor(currentFocusedActor);
+
+      if(mEnableFocusIndicator == ENABLE)
+      {
+        // Make sure the focused actor is highlighted
+        currentFocusedActor.Add(GetFocusIndicatorActor());
+        mIsFocusIndicatorShown = SHOW;
+      }
     }
   }
 }
@@ -1111,6 +1206,16 @@ bool KeyboardFocusManager::IsDefaultAlgorithmEnabled() const
   return mEnableDefaultAlgorithm;
 }
 
+void KeyboardFocusManager::SetFocusFinderRootActor(Actor actor)
+{
+  mFocusFinderRootActor = actor;
+}
+
+void KeyboardFocusManager::ResetFocusFinderRootActor()
+{
+  mFocusFinderRootActor.Reset();
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
index 8212a79..87e73f8 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
@@ -90,7 +90,7 @@ public:
   /**
    * @copydoc Toolkit::KeyboardFocusManager::MoveFocus
    */
-  bool MoveFocus(Toolkit::Control::KeyboardFocus::Direction direction);
+  bool MoveFocus(Toolkit::Control::KeyboardFocus::Direction direction, const std::string& deviceName = "");
 
   /**
    * @copydoc Toolkit::KeyboardFocusManager::ClearFocus
@@ -162,6 +162,16 @@ public:
    */
   bool IsDefaultAlgorithmEnabled() const;
 
+  /**
+   * @copydoc Toolkit::DevelKeyboardFocusManager::SetFocusFinderRootActor
+   */
+  void SetFocusFinderRootActor(Actor actor);
+
+  /**
+   * @copydoc Toolkit::DevelKeyboardFocusManager::ResetFocusFinderRootActor
+   */
+  void ResetFocusFinderRootActor();
+
 public:
   /**
    * @copydoc Toolkit::KeyboardFocusManager::PreFocusChangeSignal()
@@ -292,6 +302,18 @@ private:
   void OnTouch(const TouchEvent& touch);
 
   /**
+   * Callback for the wheel event when the custom wheel event occurs.
+   * @param[in] wheel The WheelEvent information
+   */
+  bool OnCustomWheelEvent(const WheelEvent& wheel);
+
+  /**
+   * Callback for the wheel event when the wheel event occurs.
+   * @param[in] wheel The WheelEvent information
+   */
+  void OnWheelEvent(const WheelEvent& wheel);
+
+  /**
    * Called when the window focus is changed.
    * @param[in] window The window whose focus is changed
    * @param[in] focusIn Whether the focus is in/out
@@ -303,6 +325,24 @@ private:
    */
   Actor GetFocusActorFromCurrentWindow();
 
+  /**
+   * Recursively deliver events to the control and its parents, until the event is consumed or the stage is reached.
+   * @param[in]  actor  The actor got WheelEvent.
+   * @param[in]  event  The WheelEvent.
+   * @return True if WheelEvent is consumed.
+   */
+  bool EmitCustomWheelSignals(Actor actor, const WheelEvent& event);
+
+  /**
+   * Clear the focus indicator actor.
+   */
+  void ClearFocusIndicator();
+
+  /**
+   * Gets the current native window id
+   */
+  uint32_t GetCurrentWindowId() const;
+
 private:
   // Undefined
   KeyboardFocusManager(const KeyboardFocusManager&);
@@ -319,6 +359,8 @@ private:
 
   Actor mFocusIndicatorActor; ///< The focus indicator actor shared by all the keyboard focusable actors for highlight
 
+  WeakHandle<Actor> mFocusFinderRootActor; ///<The root actor from which the focus finder is started.
+
   FocusStack mFocusHistory; ///< Stack to contain pre-focused actor's BaseObject*
 
   SlotDelegate<KeyboardFocusManager> mSlotDelegate;
@@ -344,6 +386,9 @@ private:
   bool mClearFocusOnTouch : 1; ///< Whether clear focus on touch.
 
   bool mEnableDefaultAlgorithm : 1; ///< Whether use default algorithm focus
+
+  uint32_t mCurrentWindowId; ///< The current native window id
+
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index ad87ac3..2b64a0c 100644
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -23,9 +23,12 @@
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/adaptor-framework/scene-holder.h>
 #include <dali/integration-api/debug.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/public-api/actors/layer.h>
 #include <cstring> // for strcmp
 
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 namespace Dali
 {
 namespace Toolkit
@@ -42,7 +45,8 @@ const char* const SIGNAL_KEY_INPUT_FOCUS_CHANGED = "keyInputFocusChanged";
 
 KeyInputFocusManager::KeyInputFocusManager()
 : mSlotDelegate(this),
-  mCurrentFocusControl()
+  mCurrentFocusControl(),
+  mCurrentWindowId(0)
 {
   // Retrieve all the existing widnows
   Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders();
@@ -81,15 +85,17 @@ void KeyInputFocusManager::SetFocus(Toolkit::Control control)
   control.OffSceneSignal().Connect(mSlotDelegate, &KeyInputFocusManager::OnFocusControlSceneDisconnection);
 
   Dali::Toolkit::Control previousFocusControl = GetCurrentFocusControl();
+
+  // Set control to currentFocusControl
+  mCurrentFocusControl = control;
+  mCurrentWindowId = static_cast<uint32_t>(Integration::SceneHolder::Get(control).GetNativeId());
+
   if(previousFocusControl)
   {
     // Notify the control that it has lost key input focus
     GetImplementation(previousFocusControl).OnKeyInputFocusLost();
   }
 
-  // Set control to currentFocusControl
-  mCurrentFocusControl = control;
-
   // Tell the new actor that it has gained focus.
   GetImplementation(control).OnKeyInputFocusGained();
 
@@ -102,14 +108,16 @@ void KeyInputFocusManager::SetFocus(Toolkit::Control control)
 
 void KeyInputFocusManager::RemoveFocus(Toolkit::Control control)
 {
-  if(control == mCurrentFocusControl)
+  if(control && control == mCurrentFocusControl)
   {
+    DALI_LOG_RELEASE_INFO("RemoveFocus id:(%d)\n", control.GetProperty<int32_t>(Dali::Actor::Property::ID));
     control.OffSceneSignal().Disconnect(mSlotDelegate, &KeyInputFocusManager::OnFocusControlSceneDisconnection);
 
+    mCurrentFocusControl.Reset();
+    mCurrentWindowId = 0;
+
     // Notify the control that it has lost key input focus
     GetImplementation(control).OnKeyInputFocusLost();
-
-    mCurrentFocusControl.Reset();
   }
 }
 
@@ -118,6 +126,11 @@ Toolkit::Control KeyInputFocusManager::GetCurrentFocusControl() const
   return mCurrentFocusControl;
 }
 
+uint32_t KeyInputFocusManager::GetCurrentWindowId() const
+{
+  return mCurrentWindowId;
+}
+
 Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusManager::KeyInputFocusChangedSignal()
 {
   return mKeyInputFocusChangedSignal;
@@ -130,6 +143,26 @@ bool KeyInputFocusManager::OnKeyEvent(const KeyEvent& event)
   Toolkit::Control control = GetCurrentFocusControl();
   if(control)
   {
+    // Key events that occur in windows other than the currently focused control are skipped.
+    uint32_t eventWindowId = event.GetWindowId();
+    if(eventWindowId > 0 && GetCurrentWindowId() != eventWindowId)
+    {
+      DALI_LOG_RELEASE_INFO("Current control window id %d, window ID where key event occurred %d : key event skip\n", GetCurrentWindowId(), eventWindowId);
+      return consumed;
+    }
+
+    Dali::Actor dispatch = control;
+    while(dispatch)
+    {
+      // If the DISPATCH_KEY_EVENTS is false, it cannot emit key event.
+      Toolkit::Control dispatchControl = Toolkit::Control::DownCast(dispatch);
+      if(dispatchControl && !dispatchControl.GetProperty<bool>(Toolkit::DevelControl::Property::DISPATCH_KEY_EVENTS))
+      {
+        return true;
+      }
+      dispatch = dispatch.GetParent();
+    }
+
     // Notify the control about the key event
     consumed = EmitKeyEventSignal(control, event);
   }
diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
index 5974b88..f668901 100644
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
@@ -117,6 +117,11 @@ private:
     */
   bool EmitKeyEventSignal(Toolkit::Control control, const KeyEvent& event);
 
+  /**
+   * Gets the current native window id
+   */
+  uint32_t GetCurrentWindowId() const;
+
 private:
   // Undefined
   KeyInputFocusManager(const KeyInputFocusManager&);
@@ -130,6 +135,7 @@ private:
   SlotDelegate<KeyInputFocusManager> mSlotDelegate;
 
   Toolkit::Control mCurrentFocusControl; ///< The current focused control
+  uint32_t mCurrentWindowId; ///< The native window id of current focused control
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/graphics/shaders/animated-gradient-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/animated-gradient-visual-shader.vert
index e5cbaa7..5faf423 100644
--- a/dali-toolkit/internal/graphics/shaders/animated-gradient-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/animated-gradient-visual-shader.vert
@@ -36,9 +36,9 @@ uniform mediump vec2 anchorPoint;
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix( uSize.xy*size, size, offsetSizeMode.zw );
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy );
-  return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw );
+  vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy );
+  return vec4( (aPosition + anchorPoint)*visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0 );
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/arc-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/arc-visual-shader.vert
index e063d81..4f6dab5 100644
--- a/dali-toolkit/internal/graphics/shaders/arc-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/arc-visual-shader.vert
@@ -13,10 +13,10 @@ uniform mediump vec2 anchorPoint;
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw );
+  vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
   vPosition = aPosition* visualSize;
-  return vec4( vPosition + anchorPoint*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );
+  return vec4( vPosition + anchorPoint*visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0 );
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/border-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/border-visual-shader.vert
index 6dc0721..6bf08fa 100644
--- a/dali-toolkit/internal/graphics/shaders/border-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/border-visual-shader.vert
@@ -14,9 +14,9 @@ uniform mediump vec2 anchorPoint;
 
 vec2 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
-  return (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy;
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw );
+  vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
+  return (aPosition + anchorPoint)*visualSize + visualOffset + origin * uSize.xy;
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
index 74e8f58..735f96b 100644
--- a/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
@@ -1,59 +1,49 @@
-#ifndef IS_REQUIRED_ROUNDED_CORNER
-#define IS_REQUIRED_ROUNDED_CORNER 0
-#endif
-#ifndef IS_REQUIRED_BORDERLINE
-#define IS_REQUIRED_BORDERLINE 0
-#endif
-#ifndef IS_REQUIRED_BLUR
-#define IS_REQUIRED_BLUR 0
-#endif
-
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE || IS_REQUIRED_BLUR
-INPUT mediump vec2 vPosition;
-INPUT mediump vec2 vRectSize;
-INPUT mediump vec2 vOptRectSize;
-#if IS_REQUIRED_ROUNDED_CORNER
-INPUT mediump vec4 vCornerRadius;
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) || defined(IS_REQUIRED_BLUR)
+INPUT highp vec2 vPosition;
+INPUT highp vec2 vRectSize;
+INPUT highp vec2 vOptRectSize;
+INPUT highp float vAliasMargin;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+INPUT highp vec4 vCornerRadius;
 #endif
 #endif
 
 uniform lowp vec4 uColor;
 uniform lowp vec3 mixColor;
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
-uniform mediump float borderlineWidth;
-uniform mediump float borderlineOffset;
+#ifdef IS_REQUIRED_BLUR
+uniform highp float blurRadius;
+#elif defined(IS_REQUIRED_BORDERLINE)
+uniform highp float borderlineWidth;
+uniform highp float borderlineOffset;
 uniform lowp vec4 borderlineColor;
+uniform lowp vec4 uActorColor;
 #endif
-#if IS_REQUIRED_BLUR
-uniform mediump float blurRadius;
-#endif
-
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE || IS_REQUIRED_BLUR
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) || defined(IS_REQUIRED_BLUR)
 // Global values both rounded corner and borderline use
 
 // radius of rounded corner on this quadrant
-mediump float gRadius = 0.0;
+highp float gRadius = 0.0;
 
 // fragment coordinate. NOTE : vec2(0.0, 0.0) is vRectSize, the corner of visual
-mediump vec2 gFragmentPosition = vec2(0.0, 0.0);
+highp vec2 gFragmentPosition = vec2(0.0, 0.0);
 // center coordinate of rounded corner circle. vec2(gCenterPosition, gCenterPosition).
-mediump float gCenterPosition = 0.0;
+highp float gCenterPosition = 0.0;
 // relative coordinate of gFragmentPosition from gCenterPosition.
-mediump vec2 gDiff = vec2(0.0, 0.0);
+highp vec2 gDiff = vec2(0.0, 0.0);
 // potential value what our algorithm use.
-mediump float gPotential = 0.0;
+highp float gPotential = 0.0;
 
 // threshold of potential
-mediump float gPotentialRange = 0.0;
-mediump float gMaxOutlinePotential = 0.0;
-mediump float gMinOutlinePotential = 0.0;
-mediump float gMaxInlinePotential = 0.0;
-mediump float gMinInlinePotential = 0.0;
+highp float gPotentialRange = 0.0;
+highp float gMaxOutlinePotential = 0.0;
+highp float gMinOutlinePotential = 0.0;
+highp float gMaxInlinePotential = 0.0;
+highp float gMinInlinePotential = 0.0;
 
 void calculateCornerRadius()
 {
-#if IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_ROUNDED_CORNER
   gRadius =
   mix(
     mix(vCornerRadius.x, vCornerRadius.y, sign(vPosition.x) * 0.5 + 0.5),
@@ -67,7 +57,8 @@ void calculatePosition()
 {
   gFragmentPosition = abs(vPosition) - vRectSize;
   gCenterPosition = -gRadius;
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BLUR
+#elif defined(IS_REQUIRED_BORDERLINE)
   gCenterPosition += borderlineWidth * (clamp(borderlineOffset, -1.0, 1.0) + 1.0) * 0.5;
 #endif
   gDiff = gFragmentPosition - gCenterPosition;
@@ -80,12 +71,15 @@ void calculatePotential()
 
 void setupMinMaxPotential()
 {
-  gPotentialRange = 1.0;
+  gPotentialRange = vAliasMargin;
 
   gMaxOutlinePotential = gRadius + gPotentialRange;
   gMinOutlinePotential = gRadius - gPotentialRange;
 
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BLUR
+  gMaxInlinePotential = gMaxOutlinePotential;
+  gMinInlinePotential = gMinOutlinePotential;
+#elif defined(IS_REQUIRED_BORDERLINE)
   gMaxInlinePotential = gMaxOutlinePotential - borderlineWidth;
   gMinInlinePotential = gMinOutlinePotential - borderlineWidth;
 #else
@@ -94,8 +88,8 @@ void setupMinMaxPotential()
 #endif
 
   // reduce defect near edge of rounded corner.
-  gMaxOutlinePotential += clamp(-min(gDiff.x, gDiff.y)/ max(1.0, gRadius) , 0.0, 1.0);
-  gMinOutlinePotential += clamp(-min(gDiff.x, gDiff.y)/ max(1.0, gRadius) , 0.0, 1.0);
+  gMaxOutlinePotential += clamp(-min(gDiff.x, gDiff.y) / max(1.0, gRadius), 0.0, 1.0);
+  gMinOutlinePotential += clamp(-min(gDiff.x, gDiff.y) / max(1.0, gRadius), 0.0, 1.0);
 }
 
 void PreprocessPotential()
@@ -108,10 +102,11 @@ void PreprocessPotential()
 }
 #endif
 
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BLUR
+#elif defined(IS_REQUIRED_BORDERLINE)
 lowp vec4 convertBorderlineColor(lowp vec4 textureColor)
 {
-  mediump float potential = gPotential;
+  highp float potential = gPotential;
 
   // default opacity of borderline is 0.0
   mediump float borderlineOpacity = 0.0;
@@ -121,35 +116,62 @@ lowp vec4 convertBorderlineColor(lowp vec4 textureColor)
   {
     // potential is inside borderline range.
     borderlineOpacity = smoothstep(gMinInlinePotential, gMaxInlinePotential, potential);
+
+    // Muliply borderlineWidth to resolve very thin borderline
+    borderlineOpacity *= min(1.0, borderlineWidth / gPotentialRange);
   }
 
-  //calculate inside of borderline when outilneColor.a < 1.0
-  if(borderlineColor.a < 1.0)
+  lowp vec3  borderlineColorRGB   = borderlineColor.rgb * uActorColor.rgb;
+  lowp float borderlineColorAlpha = borderlineColor.a * uActorColor.a;
+  // NOTE : color-visual is always not preMultiplied.
+
+  // Calculate inside of borderline when alpha is between (0.0  1.0). So we need to apply texture color.
+  // If borderlineOpacity is exactly 0.0, we always use whole texture color. In this case, we don't need to run below code.
+  // But if borderlineOpacity > 0.0 and borderlineColor.a == 0.0, we need to apply tCornerRadius.
+  if(borderlineOpacity > 0.0 && borderlineColor.a * borderlineOpacity < 1.0)
   {
-    mediump float tCornerRadius = -gCenterPosition;
-    mediump float MaxTexturelinePotential = tCornerRadius + gPotentialRange;
-    mediump float MinTexturelinePotential = tCornerRadius - gPotentialRange;
+    highp float tCornerRadius = -gCenterPosition + gPotentialRange;
+    highp float MaxTexturelinePotential = tCornerRadius + gPotentialRange;
+    highp float MinTexturelinePotential = tCornerRadius - gPotentialRange;
     if(potential > MaxTexturelinePotential)
     {
-      // potential is out of texture range. use borderline color instead of texture
-      textureColor = vec4(borderlineColor.xyz, 0.0);
+      // potential is out of texture range.
+      textureColor = vec4(0.0);
     }
-    else if(potential > MinTexturelinePotential)
+    else
     {
-      // potential is in texture range
-      textureColor = mix(textureColor, vec4(borderlineColor.xyz, 0.0), smoothstep(MinTexturelinePotential, MaxTexturelinePotential, potential));
+      // potential is in texture range.
+      lowp float textureAlphaScale = mix(1.0, 0.0, smoothstep(MinTexturelinePotential, MaxTexturelinePotential, potential));
+      textureColor.a *= textureAlphaScale;
+      textureColor.rgb *= textureColor.a;
     }
-    borderlineOpacity *= borderlineColor.a;
-    return mix(textureColor, vec4(borderlineColor.xyz, 1.0), borderlineOpacity);
+
+    // NOTE : color-visual is always not preMultiplied.
+    borderlineColorAlpha *= borderlineOpacity;
+    borderlineColorRGB *= borderlineColorAlpha;
+    // We use pre-multiplied color to reduce operations.
+    // In here, textureColor and borderlineColorRGB is pre-multiplied color now.
+
+    // Manual blend operation with premultiplied colors.
+    // Final alpha = borderlineColorAlpha + (1.0 - borderlineColorAlpha) * textureColor.a.
+    // (Final rgb * alpha) =  borderlineColorRGB + (1.0 - borderlineColorAlpha) * textureColor.rgb
+    // If preMultipliedAlpha == 1.0, just return vec4(rgb*alpha, alpha)
+    // Else, return vec4((rgb*alpha) / alpha, alpha)
+
+    lowp float finalAlpha = mix(textureColor.a, 1.0, borderlineColorAlpha);
+    lowp vec3  finalMultipliedRGB = borderlineColorRGB + (1.0 - borderlineColorAlpha) * textureColor.rgb;
+    // TODO : Need to find some way without division
+    return vec4(finalMultipliedRGB / finalAlpha, finalAlpha);
   }
-  return mix(textureColor, borderlineColor, borderlineOpacity);
+  return mix(textureColor, vec4(borderlineColorRGB, borderlineColorAlpha), borderlineOpacity);
 }
 #endif
 
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_BLUR
+#elif defined(IS_REQUIRED_ROUNDED_CORNER)
 mediump float calculateCornerOpacity()
 {
-  mediump float potential = gPotential;
+  highp float potential = gPotential;
 
   // default opacity is 1.0
   mediump float opacity = 1.0;
@@ -168,32 +190,45 @@ mediump float calculateCornerOpacity()
 }
 #endif
 
-#if IS_REQUIRED_BLUR
+#ifdef IS_REQUIRED_BLUR
+#ifdef SL_VERSION_LOW
+// Legacy code for low version glsl
+mediump float calculateBlurOpacity()
+{
+  highp float potential = gPotential;
+
+  highp float alias = min(gRadius, vAliasMargin);
+  highp float potentialMin = gMinOutlinePotential - blurRadius - alias;
+  highp float potentialMax = gMaxOutlinePotential + blurRadius + alias;
+
+  return 1.0 - smoothstep(potentialMin, potentialMax, potential);
+}
+#else
 mediump float calculateBlurOpacity()
 {
 // Don't use borderline!
-  mediump vec2 v = gDiff;
-  mediump float cy = gRadius + blurRadius;
-  mediump float cr = gRadius + blurRadius;
+  highp vec2 v = gDiff;
+  highp float cy = gRadius + blurRadius;
+  highp float cr = gRadius + blurRadius;
 
-#if IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_ROUNDED_CORNER
   // This routine make perfect circle. If corner radius is not exist, we don't consider prefect circle.
   cy = min(cy, min(vRectSize.x, vRectSize.y) - gRadius);
 #endif
   v = vec2(min(v.x, v.y), max(v.x, v.y));
   v = v + cy;
 
-  mediump float potential = 0.0;
-  mediump float alias = min(gRadius, 1.0);
-  mediump float potentialMin = cy + gRadius - blurRadius - alias;
-  mediump float potentialMax = cy + gRadius + blurRadius + alias;
+  highp float potential = 0.0;
+  highp float alias = min(gRadius, vAliasMargin);
+  highp float potentialMin = cy + gRadius - blurRadius - alias;
+  highp float potentialMax = cy + gRadius + blurRadius + alias;
 
   // move center of circles for reduce defact
-  mediump float cyDiff = min(cy, 0.2 * blurRadius);
+  highp float cyDiff = min(cy, 0.2 * blurRadius);
   cy -= cyDiff;
   cr += cyDiff;
 
-  mediump float diffFromBaseline = cy * v.y - (cy + cr) * v.x;
+  highp float diffFromBaseline = cy * v.y - (cy + cr) * v.x;
 
   if(diffFromBaseline > 0.0)
   {
@@ -201,8 +236,8 @@ mediump float calculateBlurOpacity()
     potential = v.y;
 
     // for anti-alias when blurRaidus = 0.0
-    mediump float heuristicBaselineScale = max(1.0 , cr * (cr + cy));
-    mediump float potentialDiff = min(alias, diffFromBaseline / heuristicBaselineScale);
+    highp float heuristicBaselineScale = max(vAliasMargin , cr * (cr + cy));
+    highp float potentialDiff = min(alias, diffFromBaseline / heuristicBaselineScale);
     potentialMin += potentialDiff;
     potentialMax -= potentialDiff;
   }
@@ -213,22 +248,22 @@ mediump float calculateBlurOpacity()
     // highest point of that circle is (x, x + r) and potential is x + r
 
     // solve (v.x - x)^2 + (v.y - x)^2 = (cr / cy * x)^2
-#if IS_REQUIRED_ROUNDED_CORNER
-    // NOTE : lowspec HW cannot calculate here. need to reduce numeric error
-    mediump float A = (cr * cr - 2.0 * cy * cy);
-    mediump float B = cy * (v.x + v.y);
-    mediump float V = dot(v,v);
-    mediump float D = B * B + A * V;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+    // Note : lowspec HW cannot calculate here. need to reduce numeric error
+    highp float A = (cr * cr - 2.0 * cy * cy);
+    highp float B = cy * (v.x + v.y);
+    highp float V = dot(v,v);
+    highp float D = B * B + A * V;
     potential = V * (cr + cy) / (sqrt(D) + B);
 #else
     // We can simplify this value cause cy = 0.8 * blurRadius, cr = 1.2 * blurRadius
     // potential = 5.0*(sqrt(4.0*(v.x+v.y)^2 + dot(v,v)) - 2.0*(v.x+v.y));
     //           = 10.0*(v.x+v.y) * (sqrt(1.0 + (length(v) / (2.0*(v.x+v.y)))^2) - 1.0);
     //           = 10.0*(v.x+v.y) * (sqrt(1.25 - x + x^2) - 1.0);
-    //          ~= 10.0*(v.x+v.y) * (0.11803399 - 0.44721360x + 0.35777088x^2 - 0.14310x^3 + O(x^4)) (Taylor series)
+    //          ~= 10.0*(v.x+v.y) * (0.11803399 - 0.44721360x + 0.35777088x^2 - 0.14310x^3 + O(x^5)) (Taylor series)
     //          ~= -1.0557281 * (v.x + v.y) + 2.236068 * length(v) - ~~~ (here, x <= 0.5 * (1.0 - sqrt(0.5)) < 0.1464467)
     // Note : This simplify need cause we should use it on lowspec HW.
-    mediump float x = 0.5 * (1.0 - length(v) / (v.x + v.y));
+    highp float x = 0.5 * (1.0 - length(v) / (v.x + v.y));
     potential = -1.0557281 * (v.x + v.y) + 2.236068 * length(v) + 10.0 * (v.x + v.y) * (0.35777088 - 0.14310 * x) * x * x;
 #endif
   }
@@ -236,31 +271,38 @@ mediump float calculateBlurOpacity()
   return 1.0 - smoothstep(potentialMin, potentialMax, potential);
 }
 #endif
+#endif
 
 void main()
 {
-  lowp vec4 targetColor = vec4(mixColor, 1.0);
+  lowp vec4 targetColor = vec4(mixColor, 1.0) * uColor;
 
-#if IS_REQUIRED_BLUR || IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+#if defined(IS_REQUIRED_BLUR) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
   // skip most potential calculate for performance
   if(abs(vPosition.x) < vOptRectSize.x && abs(vPosition.y) < vOptRectSize.y)
   {
-    OUT_COLOR = targetColor * uColor;
-    return;
+    OUT_COLOR = targetColor;
   }
-  PreprocessPotential();
+  else
+  {
+    PreprocessPotential();
 #endif
 
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
-  targetColor = convertBorderlineColor(targetColor);
+#ifdef IS_REQUIRED_BLUR
+#elif defined(IS_REQUIRED_BORDERLINE)
+    targetColor = convertBorderlineColor(targetColor);
 #endif
-  OUT_COLOR = targetColor * uColor;
-
-#if IS_REQUIRED_BLUR
-  mediump float opacity = calculateBlurOpacity();
-  OUT_COLOR.a *= opacity;
-#elif IS_REQUIRED_ROUNDED_CORNER
-  mediump float opacity = calculateCornerOpacity();
-  OUT_COLOR.a *= opacity;
+    OUT_COLOR = targetColor;
+
+#ifdef IS_REQUIRED_BLUR
+    mediump float opacity = calculateBlurOpacity();
+    OUT_COLOR.a *= opacity;
+#elif defined(IS_REQUIRED_ROUNDED_CORNER)
+    mediump float opacity = calculateCornerOpacity();
+    OUT_COLOR.a *= opacity;
+#endif
+
+#if defined(IS_REQUIRED_BLUR) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+  }
 #endif
 }
diff --git a/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
index 2798185..29b7442 100644
--- a/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
@@ -1,80 +1,98 @@
-#ifndef IS_REQUIRED_ROUNDED_CORNER
-#define IS_REQUIRED_ROUNDED_CORNER 0
-#endif
-#ifndef IS_REQUIRED_BORDERLINE
-#define IS_REQUIRED_BORDERLINE 0
-#endif
-#ifndef IS_REQUIRED_BLUR
-#define IS_REQUIRED_BLUR 0
-#endif
-
 INPUT mediump vec2 aPosition;
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE || IS_REQUIRED_BLUR
-OUTPUT mediump vec2 vPosition;
-OUTPUT mediump vec2 vRectSize;
-OUTPUT mediump vec2 vOptRectSize;
-#if IS_REQUIRED_ROUNDED_CORNER
-OUTPUT mediump vec4 vCornerRadius;
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) || defined(IS_REQUIRED_BLUR)
+OUTPUT highp vec2 vPosition;
+OUTPUT highp vec2 vRectSize;
+OUTPUT highp vec2 vOptRectSize;
+OUTPUT highp float vAliasMargin;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+OUTPUT highp vec4 vCornerRadius;
 #endif
 #endif
 
 uniform highp mat4 uMvpMatrix;
 uniform highp vec3 uSize;
 
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) || defined(IS_REQUIRED_BLUR)
+// Be used when we calculate anti-alias range near 1 pixel.
+uniform highp vec3 uScale;
+#endif
+
 //Visual size and offset
-uniform mediump vec2 offset;
+uniform highp vec2 offset;
 uniform highp vec2 size;
 uniform mediump vec4 offsetSizeMode;
 uniform mediump vec2 origin;
 uniform mediump vec2 anchorPoint;
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
-uniform mediump float borderlineWidth;
-uniform mediump float borderlineOffset;
+#ifdef IS_REQUIRED_BLUR
+uniform highp float blurRadius;
+#elif defined(IS_REQUIRED_BORDERLINE)
+uniform highp float borderlineWidth;
+uniform highp float borderlineOffset;
 #endif
-#if IS_REQUIRED_BLUR
-uniform mediump float blurRadius;
-#endif
-#if IS_REQUIRED_ROUNDED_CORNER
-uniform mediump vec4 cornerRadius;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+uniform highp vec4 cornerRadius;
 uniform mediump float cornerRadiusPolicy;
 #endif
-uniform mediump vec2 extraSize;
+uniform highp vec2 extraSize;
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;
-  vec2 visualOffset = mix(offset, offset/uSize.xy, offsetSizeMode.xy);
+  highp vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw ) + extraSize;
+  highp vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE || IS_REQUIRED_BLUR
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) || defined(IS_REQUIRED_BLUR)
   vRectSize = visualSize * 0.5;
   vOptRectSize = vRectSize;
+
+  // Set soft anti-alias range at most 10% of visual size.
+  // The range should be inverse proportion with scale of view.
+  // To avoid divid-by-zero, let we allow minimum scale value is 0.001 (0.1%)
+  vAliasMargin = min(1.0, max(visualSize.x, visualSize.y) * 0.1) / max(0.001, max(uScale.x, uScale.y));
+
+  highp float vertexMargin = 0.0;
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER
-#if !IS_REQUIRED_BLUR && IS_REQUIRED_BORDERLINE
-  mediump float minSize = min(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_BLUR
+  highp float maxSize = max(visualSize.x, visualSize.y);
+  highp float minSize = min(visualSize.x, visualSize.y);
+#elif defined(IS_REQUIRED_BORDERLINE)
+  highp float maxSize = max(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
+  highp float minSize = min(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
 #else
-  mediump float minSize = min(visualSize.x, visualSize.y);
+  highp float maxSize = max(visualSize.x, visualSize.y);
+  highp float minSize = min(visualSize.x, visualSize.y);
 #endif
   vCornerRadius = mix(cornerRadius * minSize, cornerRadius, cornerRadiusPolicy);
   vCornerRadius = min(vCornerRadius, minSize * 0.5);
   // Optimize fragment shader. 0.2929 ~= 1.0 - sqrt(0.5)
-  mediump float maxRadius = max(max(vCornerRadius.x, vCornerRadius.y), max(vCornerRadius.z, vCornerRadius.w));
+  highp float maxRadius = max(max(vCornerRadius.x, vCornerRadius.y), max(vCornerRadius.z, vCornerRadius.w));
+  highp float minRadius = min(min(vCornerRadius.x, vCornerRadius.y), min(vCornerRadius.z, vCornerRadius.w));
   vOptRectSize -= 0.2929 * maxRadius + 1.0;
+
+  // Set vertex margin as vAliasMargin if we need to make some more fragments for alias.
+#ifdef IS_REQUIRED_BLUR
+  // Let we always increase alias margin for blur case
+  vertexMargin = 2.0 * vAliasMargin;
+#else
+  // Do not increase margin if the minRadius is small enough rather than maxSize.
+  // TODO : We should change the magic parameter, 0.49
+  vertexMargin = 2.0 * vAliasMargin * smoothstep(maxSize * 0.49, maxSize * 0.5, minRadius);
+#endif
 #endif
 
-#if IS_REQUIRED_BLUR
-  vPosition = aPosition * (visualSize + 2.0 * blurRadius);
+#ifdef IS_REQUIRED_BLUR
+  vPosition = aPosition * (visualSize + 2.0 * blurRadius + vertexMargin);
   vOptRectSize -= blurRadius + 1.0;
-#elif IS_REQUIRED_BORDERLINE
-  vPosition = aPosition * (visualSize + (1.0 + clamp(borderlineOffset, -1.0, 1.0))* borderlineWidth);
+#elif defined(IS_REQUIRED_BORDERLINE)
+  vPosition = aPosition * (visualSize + (1.0 + clamp(borderlineOffset, -1.0, 1.0))* borderlineWidth + vertexMargin);
   vOptRectSize -= (1.0 - clamp(borderlineOffset, -1.0, 1.0)) * 0.5 * borderlineWidth + 1.0;
-#elif IS_REQUIRED_ROUNDED_CORNER
-  vPosition = aPosition * visualSize;
+#elif defined(IS_REQUIRED_ROUNDED_CORNER)
+  vPosition = aPosition * (visualSize + vertexMargin);
 #else
-  mediump vec2 vPosition = aPosition * visualSize;
+  highp vec2 vPosition = aPosition * visualSize;
 #endif
-  return vec4(vPosition + anchorPoint * visualSize + (visualOffset + origin) * uSize.xy, 0.0, 1.0);
+  return vec4(vPosition + anchorPoint * visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0);
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/gl-view.frag b/dali-toolkit/internal/graphics/shaders/gl-view.frag
new file mode 100644
index 0000000..9b0b917
--- /dev/null
+++ b/dali-toolkit/internal/graphics/shaders/gl-view.frag
@@ -0,0 +1,8 @@
+uniform lowp vec4          uColor;
+varying mediump vec2       vTexCoord;
+uniform samplerExternalOES sTexture;
+
+void main()
+{
+  gl_FragColor = texture2D(sTexture, vTexCoord) * uColor;
+}
\ No newline at end of file
diff --git a/dali-toolkit/internal/graphics/shaders/gl-view.vert b/dali-toolkit/internal/graphics/shaders/gl-view.vert
new file mode 100644
index 0000000..eeec383
--- /dev/null
+++ b/dali-toolkit/internal/graphics/shaders/gl-view.vert
@@ -0,0 +1,11 @@
+attribute mediump vec2 aPosition;
+uniform mediump mat4   uMvpMatrix;
+uniform mediump vec3   uSize;
+varying mediump vec2   vTexCoord;
+
+void main()
+{
+  vec4 position = vec4(aPosition, 0.0, 1.0) * vec4(uSize, 1.0);
+  vTexCoord     = aPosition + vec2(0.5);
+  gl_Position   = uMvpMatrix * position;
+}
\ No newline at end of file
diff --git a/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.frag b/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.frag
index cefd19e..9477e40 100644
--- a/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.frag
@@ -1,13 +1,13 @@
 uniform lowp vec3 uLightColor;
 uniform lowp vec4 uBaseColorFactor;
 uniform lowp vec2 uMetallicRoughnessFactors;
-uniform lowp int alphaMode;
 uniform lowp float alphaCutoff;
+uniform lowp float uAlphaMode;
+uniform lowp float uHasLightSource;
 
 in lowp vec2 vUV[2];
 in lowp mat3 vTBN;
 in lowp vec4 vColor;
-flat in int visLight;
 in highp vec3 vLightDirection;
 in highp vec3 vPositionToCamera;
 
@@ -30,20 +30,20 @@ const float c_MinRoughness = 0.04;
 vec3 getNormal()
 {
 #ifdef TEXTURE_NORMAL
-  lowp vec3 n = texture( uNormalSampler, vUV[uNormalTexCoordIndex] ).rgb;
-  n = normalize( vTBN * ( ( 2.0 * n - 1.0 ) * vec3( uNormalScale, uNormalScale, 1.0 ) ) );
+  lowp vec3 n = texture(uNormalSampler, vUV[uNormalTexCoordIndex]).rgb;
+  n = normalize(vTBN * ((2.0 * n - 1.0) * vec3(uNormalScale, uNormalScale, 1.0)));
 #else
   lowp vec3 n = normalize( vTBN[2].xyz );
 #endif
   return n;
 }
 
-vec3 specularReflection( PBRInfo pbrInputs )
+vec3 specularReflection(PBRInfo pbrInputs)
 {
-  return pbrInputs.reflectance0 + ( pbrInputs.reflectance90 - pbrInputs.reflectance0 ) * pow( clamp( 1.0 - pbrInputs.VdotH, 0.0, 1.0 ), 5.0 );
+  return pbrInputs.reflectance0 + (pbrInputs.reflectance90 - pbrInputs.reflectance0) * pow(clamp(1.0 - pbrInputs.VdotH, 0.0, 1.0), 5.0);
 }
 
-float geometricOcclusion( PBRInfo pbrInputs )
+float geometricOcclusion(PBRInfo pbrInputs)
 {
   mediump float NdotL = pbrInputs.NdotL;
   mediump float NdotV = pbrInputs.NdotV;
@@ -61,7 +61,7 @@ float microfacetDistribution(PBRInfo pbrInputs)
   return roughnessSq / (M_PI * f * f);
 }
 
-vec3 linear( vec3 color )
+vec3 linear(vec3 color)
 {
   return pow(color,vec3(2.2));
 }
@@ -96,13 +96,13 @@ void main()
   lowp vec4 baseColor = vColor * uBaseColorFactor;
 #endif
 
-  if( alphaMode == 0 )
+  if(uAlphaMode < 0.5f)
   {
     baseColor.w = 1.0;
   }
-  else if( alphaMode == 1 )
+  else if(uAlphaMode < 1.5f)
   {
-    if( baseColor.w >= alphaCutoff )
+    if(baseColor.w >= alphaCutoff)
     {
       baseColor.w = 1.0;
     }
@@ -150,7 +150,7 @@ void main()
 
   // Calculate the shading terms for the microfacet specular shading model
   lowp vec3 color = vec3(0.0);
-  if( visLight == 1 )
+  if( uHasLightSource > 0.5f )
   {
     lowp vec3 F = specularReflection( pbrInputs );
     lowp float G = geometricOcclusion( pbrInputs );
diff --git a/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.vert b/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.vert
index 6628865..095e839 100644
--- a/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/gltf-physically-based-shader.vert
@@ -9,51 +9,34 @@ uniform mediump vec3 uSize;
 uniform mediump mat4 uModelMatrix;
 uniform mediump mat4 uViewMatrix;
 uniform mediump mat4 uProjection;
-uniform lowp int uLightType;
 uniform mediump vec3 uLightVector;
-uniform lowp int uIsColor;
+uniform lowp float uIsPointLight;
+uniform lowp float uHasVertexColor;
 
 out lowp vec2 vUV[2];
 out lowp mat3 vTBN;
 out lowp vec4 vColor;
-flat out int visLight;
 out highp vec3 vLightDirection;
 out highp vec3 vPositionToCamera;
 
 void main()
 {
   highp vec4 invY = vec4(1.0, -1.0, 1.0, 1.0);
-  highp vec4 positionW = uModelMatrix * vec4( aPosition * uSize, 1.0 );
-  highp vec4 positionV = uViewMatrix * ( invY * positionW );
+  highp vec4 positionW = uModelMatrix * vec4(aPosition * uSize, 1.0);
+  highp vec4 positionV = uViewMatrix * (invY * positionW);
 
-  vPositionToCamera = transpose( mat3( uViewMatrix ) ) * ( -vec3( positionV.xyz / positionV.w ) );
+  vPositionToCamera = transpose(mat3(uViewMatrix)) * (-vec3(positionV.xyz / positionV.w));
   vPositionToCamera *= invY.xyz;
 
   lowp vec3 bitangent = cross(aNormal, aTangent.xyz) * aTangent.w;
-  vTBN = mat3( uModelMatrix ) * mat3(aTangent.xyz, bitangent, aNormal);
+  vTBN = mat3(uModelMatrix) * mat3(aTangent.xyz, bitangent, aNormal);
 
   vUV[0] = aTexCoord0;
   vUV[1] = aTexCoord1;
 
-  visLight = 1;
-  if( uLightType == 1 )
-  {
-    vLightDirection = ( invY.xyz * uLightVector ) - ( positionW.xyz / positionW.w );
-  }
-  else if( uLightType == 2 )
-  {
-    vLightDirection = -( invY.xyz * uLightVector );
-  }
-  else
-  {
-    visLight = 0;
-  }
-
-  vColor = vec4( 1.0 );
-  if( uIsColor == 1 )
-  {
-    vColor = aVertexColor;
-  }
+  vLightDirection = mix(-(invY.xyz * uLightVector), (invY.xyz * uLightVector) - (positionW.xyz / positionW.w), uIsPointLight);
+
+  vColor = mix(vec4(1.0f), aVertexColor, uHasVertexColor);
 
   gl_Position = uProjection * positionV; // needs w for proper perspective correction
   gl_Position = gl_Position/gl_Position.w;
diff --git a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag
index cb72c67..0a574ce 100644
--- a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag
@@ -1,57 +1,52 @@
-#ifndef IS_REQUIRED_ROUNDED_CORNER
-#define IS_REQUIRED_ROUNDED_CORNER 0
-#endif
-#ifndef IS_REQUIRED_BORDERLINE
-#define IS_REQUIRED_BORDERLINE 0
-#endif
-#ifndef RADIAL
-#define RADIAL 0
-#endif
-
 INPUT mediump vec2 vTexCoord;
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
-INPUT mediump vec2 vPosition;
-INPUT mediump vec2 vRectSize;
-INPUT mediump vec2 vOptRectSize;
-#if IS_REQUIRED_ROUNDED_CORNER
-INPUT mediump vec4 vCornerRadius;
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+INPUT highp vec2 vPosition;
+INPUT highp vec2 vRectSize;
+INPUT highp vec2 vOptRectSize;
+INPUT highp float vAliasMargin;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+INPUT highp vec4 vCornerRadius;
 #endif
 #endif
 
+// scale factor to fit start and end position of gradient.
+uniform mediump float uTextureCoordinateScaleFactor;
+
 uniform sampler2D sTexture; // sampler1D?
 uniform lowp vec4 uColor;
 uniform lowp vec3 mixColor;
-#if IS_REQUIRED_BORDERLINE
-uniform mediump float borderlineWidth;
-uniform mediump float borderlineOffset;
+#ifdef IS_REQUIRED_BORDERLINE
+uniform highp float borderlineWidth;
+uniform highp float borderlineOffset;
 uniform lowp vec4 borderlineColor;
+uniform lowp vec4 uActorColor;
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
 // Global values both rounded corner and borderline use
 
 // radius of rounded corner on this quadrant
-mediump float gRadius = 0.0;
+highp float gRadius = 0.0;
 
 // fragment coordinate. NOTE : vec2(0.0, 0.0) is vRectSize, the corner of visual
-mediump vec2 gFragmentPosition = vec2(0.0, 0.0);
+highp vec2 gFragmentPosition = vec2(0.0, 0.0);
 // center coordinate of rounded corner circle. vec2(gCenterPosition, gCenterPosition).
-mediump float gCenterPosition = 0.0;
+highp float gCenterPosition = 0.0;
 // relative coordinate of gFragmentPosition from gCenterPosition.
-mediump vec2 gDiff = vec2(0.0, 0.0);
+highp vec2 gDiff = vec2(0.0, 0.0);
 // potential value what our algorithm use.
-mediump float gPotential = 0.0;
+highp float gPotential = 0.0;
 
 // threshold of potential
-mediump float gPotentialRange = 0.0;
-mediump float gMaxOutlinePotential = 0.0;
-mediump float gMinOutlinePotential = 0.0;
-mediump float gMaxInlinePotential = 0.0;
-mediump float gMinInlinePotential = 0.0;
+highp float gPotentialRange = 0.0;
+highp float gMaxOutlinePotential = 0.0;
+highp float gMinOutlinePotential = 0.0;
+highp float gMaxInlinePotential = 0.0;
+highp float gMinInlinePotential = 0.0;
 
 void calculateCornerRadius()
 {
-#if IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_ROUNDED_CORNER
   gRadius =
   mix(
     mix(vCornerRadius.x, vCornerRadius.y, sign(vPosition.x) * 0.5 + 0.5),
@@ -65,7 +60,7 @@ void calculatePosition()
 {
   gFragmentPosition = abs(vPosition) - vRectSize;
   gCenterPosition = -gRadius;
-#if IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BORDERLINE
   gCenterPosition += borderlineWidth * (clamp(borderlineOffset, -1.0, 1.0) + 1.0) * 0.5;
 #endif
   gDiff = gFragmentPosition - gCenterPosition;
@@ -78,12 +73,12 @@ void calculatePotential()
 
 void setupMinMaxPotential()
 {
-  gPotentialRange = 1.0;
+  gPotentialRange = vAliasMargin;
 
   gMaxOutlinePotential = gRadius + gPotentialRange;
   gMinOutlinePotential = gRadius - gPotentialRange;
 
-#if IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BORDERLINE
   gMaxInlinePotential = gMaxOutlinePotential - borderlineWidth;
   gMinInlinePotential = gMinOutlinePotential - borderlineWidth;
 #else
@@ -92,8 +87,8 @@ void setupMinMaxPotential()
 #endif
 
   // reduce defect near edge of rounded corner.
-  gMaxOutlinePotential += clamp(-min(gDiff.x, gDiff.y)/ max(1.0, gRadius) , 0.0, 1.0);
-  gMinOutlinePotential += clamp(-min(gDiff.x, gDiff.y)/ max(1.0, gRadius) , 0.0, 1.0);
+  gMaxOutlinePotential += clamp(-min(gDiff.x, gDiff.y) / max(1.0, gRadius), 0.0, 1.0);
+  gMinOutlinePotential += clamp(-min(gDiff.x, gDiff.y) / max(1.0, gRadius), 0.0, 1.0);
 }
 
 void PreprocessPotential()
@@ -107,10 +102,10 @@ void PreprocessPotential()
 #endif
 
 
-#if IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BORDERLINE
 lowp vec4 convertBorderlineColor(lowp vec4 textureColor)
 {
-  mediump float potential = gPotential;
+  highp float potential = gPotential;
 
   // default opacity of borderline is 0.0
   mediump float borderlineOpacity = 0.0;
@@ -120,36 +115,61 @@ lowp vec4 convertBorderlineColor(lowp vec4 textureColor)
   {
     // potential is inside borderline range.
     borderlineOpacity = smoothstep(gMinInlinePotential, gMaxInlinePotential, potential);
+
+    // Muliply borderlineWidth to resolve very thin borderline
+    borderlineOpacity *= min(1.0, borderlineWidth / gPotentialRange);
   }
 
-  //calculate inside of borderline when outilneColor.a < 1.0
-  if(borderlineColor.a < 1.0)
+  lowp vec3  borderlineColorRGB   = borderlineColor.rgb * uActorColor.rgb;
+  lowp float borderlineColorAlpha = borderlineColor.a * uActorColor.a;
+  // NOTE : gradient-visual is always preMultiplied.
+  borderlineColorRGB *= borderlineColorAlpha;
+
+  // Calculate inside of borderline when alpha is between (0.0  1.0). So we need to apply texture color.
+  // If borderlineOpacity is exactly 0.0, we always use whole texture color. In this case, we don't need to run below code.
+  // But if borderlineOpacity > 0.0 and borderlineColor.a == 0.0, we need to apply tCornerRadius.
+  if(borderlineOpacity > 0.0 && borderlineColor.a * borderlineOpacity < 1.0)
   {
-    mediump float tCornerRadius = -gCenterPosition;
-    mediump float MaxTexturelinePotential = tCornerRadius + gPotentialRange;
-    mediump float MinTexturelinePotential = tCornerRadius - gPotentialRange;
-    lowp vec3 BorderlineColorRGB = borderlineColor.xyz * borderlineColor.a;
+    highp float tCornerRadius = -gCenterPosition + gPotentialRange;
+    highp float MaxTexturelinePotential = tCornerRadius + gPotentialRange;
+    highp float MinTexturelinePotential = tCornerRadius - gPotentialRange;
     if(potential > MaxTexturelinePotential)
     {
-      // potential is out of texture range. use borderline color instead of texture
-      textureColor = vec4(BorderlineColorRGB, 0.0);
+      // potential is out of texture range.
+      textureColor = vec4(0.0);
     }
-    else if(potential > MinTexturelinePotential)
+    else
     {
-      // potential is in texture range
-      textureColor = mix(textureColor, vec4(BorderlineColorRGB, 0.0), smoothstep(MinTexturelinePotential, MaxTexturelinePotential, potential));
+      // potential is in texture range.
+      lowp float textureAlphaScale = mix(1.0, 0.0, smoothstep(MinTexturelinePotential, MaxTexturelinePotential, potential));
+      textureColor.a *= textureAlphaScale;
+      textureColor.rgb *= textureAlphaScale;
     }
-    borderlineOpacity *= borderlineColor.a;
-    return mix(textureColor, vec4(BorderlineColorRGB, 1.0), borderlineOpacity);
+
+    // NOTE : gradient-visual is always preMultiplied.
+    borderlineColorAlpha *= borderlineOpacity;
+    borderlineColorRGB *= borderlineOpacity;
+    // We use pre-multiplied color to reduce operations.
+    // In here, textureColor and borderlineColorRGB is pre-multiplied color now.
+
+    // Manual blend operation with premultiplied colors.
+    // Final alpha = borderlineColorAlpha + (1.0 - borderlineColorAlpha) * textureColor.a.
+    // (Final rgb * alpha) =  borderlineColorRGB + (1.0 - borderlineColorAlpha) * textureColor.rgb
+    // If preMultipliedAlpha == 1.0, just return vec4(rgb*alpha, alpha)
+    // Else, return vec4((rgb*alpha) / alpha, alpha)
+
+    lowp float finalAlpha = mix(textureColor.a, 1.0, borderlineColorAlpha);
+    lowp vec3  finalMultipliedRGB = borderlineColorRGB + (1.0 - borderlineColorAlpha) * textureColor.rgb;
+    return vec4(finalMultipliedRGB, finalAlpha);
   }
-  return mix(textureColor, borderlineColor, borderlineOpacity);
+  return mix(textureColor, vec4(borderlineColorRGB, borderlineColorAlpha), borderlineOpacity);
 }
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_ROUNDED_CORNER
 mediump float calculateCornerOpacity()
 {
-  mediump float potential = gPotential;
+  highp float potential = gPotential;
 
   // default opacity is 1.0
   mediump float opacity = 1.0;
@@ -170,29 +190,35 @@ mediump float calculateCornerOpacity()
 
 void main()
 {
-#if RADIAL
-  lowp vec4 textureColor = TEXTURE(sTexture, vec2(length(vTexCoord), 0.5)) * vec4(mixColor, 1.0);
+#ifdef RADIAL
+  mediump float radialTexCoord = ((length(vTexCoord) - 0.5) * uTextureCoordinateScaleFactor) + 0.5;
+  lowp vec4 textureColor = TEXTURE(sTexture, vec2(radialTexCoord, 0.5)) * vec4(mixColor, 1.0) * uColor;
 #else
-  lowp vec4 textureColor = TEXTURE(sTexture, vec2(vTexCoord.y, 0.5)) * vec4(mixColor, 1.0);
+  lowp vec4 textureColor = TEXTURE(sTexture, vec2(vTexCoord.y, 0.5)) * vec4(mixColor, 1.0) * uColor;
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
   // skip most potential calculate for performance
   if(abs(vPosition.x) < vOptRectSize.x && abs(vPosition.y) < vOptRectSize.y)
   {
-    OUT_COLOR = textureColor * uColor;
-    return;
+    OUT_COLOR = textureColor;
   }
-  PreprocessPotential();
+  else
+  {
+    PreprocessPotential();
 #endif
 
-#if IS_REQUIRED_BORDERLINE
-  textureColor = convertBorderlineColor(textureColor);
+#ifdef IS_REQUIRED_BORDERLINE
+    textureColor = convertBorderlineColor(textureColor);
 #endif
-  OUT_COLOR = textureColor * uColor;
+    OUT_COLOR = textureColor;
 
-#if IS_REQUIRED_ROUNDED_CORNER
-  mediump float opacity = calculateCornerOpacity();
-  OUT_COLOR *= opacity;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+    mediump float opacity = calculateCornerOpacity();
+    OUT_COLOR *= opacity;
+#endif
+
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+  }
 #endif
 }
diff --git a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert
index f9e80fe..54f042b 100644
--- a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert
@@ -1,21 +1,12 @@
-#ifndef IS_REQUIRED_ROUNDED_CORNER
-#define IS_REQUIRED_ROUNDED_CORNER 0
-#endif
-#ifndef IS_REQUIRED_BORDERLINE
-#define IS_REQUIRED_BORDERLINE 0
-#endif
-#ifndef USER_SPACE
-#define USER_SPACE 0
-#endif
-
 INPUT mediump vec2 aPosition;
 OUTPUT mediump vec2 vTexCoord;
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
-OUTPUT mediump vec2 vPosition;
-OUTPUT mediump vec2 vRectSize;
-OUTPUT mediump vec2 vOptRectSize;
-#if IS_REQUIRED_ROUNDED_CORNER
-OUTPUT mediump vec4 vCornerRadius;
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+OUTPUT highp vec2 vPosition;
+OUTPUT highp vec2 vRectSize;
+OUTPUT highp vec2 vOptRectSize;
+OUTPUT highp float vAliasMargin;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+OUTPUT highp vec4 vCornerRadius;
 #endif
 #endif
 
@@ -23,62 +14,85 @@ uniform highp mat4 uMvpMatrix;
 uniform highp vec3 uSize;
 uniform mediump mat3 uAlignmentMatrix;
 
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+// Be used when we calculate anti-alias range near 1 pixel.
+uniform highp vec3 uScale;
+#endif
+
 //Visual size and offset
-uniform mediump vec2 offset;
+uniform highp vec2 offset;
 uniform highp vec2 size;
 uniform mediump vec4 offsetSizeMode;
 uniform mediump vec2 origin;
 uniform mediump vec2 anchorPoint;
-#if IS_REQUIRED_BORDERLINE
-uniform mediump float borderlineWidth;
-uniform mediump float borderlineOffset;
+#ifdef IS_REQUIRED_BORDERLINE
+uniform highp float borderlineWidth;
+uniform highp float borderlineOffset;
 #endif
-#if IS_REQUIRED_ROUNDED_CORNER
-uniform mediump vec4 cornerRadius;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+uniform highp vec4 cornerRadius;
 uniform mediump float cornerRadiusPolicy;
 #endif
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
+  highp vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw );
+  highp vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
   vRectSize = visualSize * 0.5;
   vOptRectSize = vRectSize;
+
+  // Set soft anti-alias range at most 10% of visual size.
+  // The range should be inverse proportion with scale of view.
+  // To avoid divid-by-zero, let we allow minimum scale value is 0.001 (0.1%)
+  vAliasMargin = min(1.0, max(visualSize.x, visualSize.y) * 0.1) / max(0.001, max(uScale.x, uScale.y));
+
+  highp float vertexMargin = 0.0;
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER
-#if IS_REQUIRED_BORDERLINE
-  mediump float minSize = min(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_BORDERLINE
+  highp float maxSize = max(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
+  highp float minSize = min(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
 #else
-  mediump float minSize = min(visualSize.x, visualSize.y);
+  highp float maxSize = max(visualSize.x, visualSize.y);
+  highp float minSize = min(visualSize.x, visualSize.y);
 #endif
   vCornerRadius = mix(cornerRadius * minSize, cornerRadius, cornerRadiusPolicy);
   vCornerRadius = min(vCornerRadius, minSize * 0.5);
   // Optimize fragment shader. 0.2929 ~= 1.0 - sqrt(0.5)
-  mediump float maxRadius = max(max(vCornerRadius.x, vCornerRadius.y), max(vCornerRadius.z, vCornerRadius.w));
+  highp float maxRadius = max(max(vCornerRadius.x, vCornerRadius.y), max(vCornerRadius.z, vCornerRadius.w));
+  highp float minRadius = min(min(vCornerRadius.x, vCornerRadius.y), min(vCornerRadius.z, vCornerRadius.w));
   vOptRectSize -= 0.2929 * maxRadius + 1.0;
+
+  // Set vertex margin as vAliasMargin if we need to make some more fragments for alias.
+  // Do not increase margin if the minRadius is small enough rather than maxSize.
+  // TODO : We should change the magic parameter, 0.49
+  vertexMargin = 2.0 * vAliasMargin * smoothstep(maxSize * 0.49, maxSize * 0.5, minRadius);
 #endif
 
-#if IS_REQUIRED_BORDERLINE
-  vPosition = aPosition * (visualSize + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth);
+  highp vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);
+#ifdef IS_REQUIRED_BORDERLINE
+  vPosition = aPosition * (visualSize + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth + vertexMargin);
+  vertexPosition.xy *= (1.0 + ((1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth + vertexMargin) / visualSize);
   vOptRectSize -= (1.0 - clamp(borderlineOffset, -1.0, 1.0)) * 0.5 * borderlineWidth + 1.0;
-#elif IS_REQUIRED_ROUNDED_CORNER
-  vPosition = aPosition * visualSize;
+#elif defined(IS_REQUIRED_ROUNDED_CORNER)
+  vPosition = aPosition * (visualSize + vertexMargin);
 #else
-  mediump vec2 vPosition = aPosition * visualSize;
+  highp vec2 vPosition = aPosition * visualSize;
 #endif
 
-  return vec4(vPosition + anchorPoint * visualSize + (visualOffset + origin) * uSize.xy, 0.0, 1.0);
+#ifdef USER_SPACE
+  vertexPosition.xyz *= uSize;
+#endif
+
+  vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy;
+
+  return vec4(vPosition + anchorPoint * visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0);
 }
 
 void main()
 {
-  mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);
   gl_Position = uMvpMatrix * ComputeVertexPosition();
-#if USER_SPACE
-  vertexPosition.xyz *= uSize;
-#endif
-  vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy;
 }
diff --git a/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag
index 0bba311..bf9f787 100644
--- a/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag
@@ -1,44 +1,53 @@
-#ifndef IS_REQUIRED_ROUNDED_CORNER
-#define IS_REQUIRED_ROUNDED_CORNER 0
-#endif
-#ifndef IS_REQUIRED_BORDERLINE
-#define IS_REQUIRED_BORDERLINE 0
+INPUT mediump vec2 vTexCoord;
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+INPUT highp vec2 vPosition;
+INPUT highp vec2 vRectSize;
+INPUT highp vec2 vOptRectSize;
+INPUT highp float vAliasMargin;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+INPUT highp vec4 vCornerRadius;
 #endif
-#ifndef ATLAS_DEFAULT_WARP
-#define ATLAS_DEFAULT_WARP 0
 #endif
-#ifndef ATLAS_CUSTOM_WARP
-#define ATLAS_CUSTOM_WARP 0
+#ifdef IS_REQUIRED_DEBUG_VISUAL_SHADER
+#define DEBUG_EXTRA_VARYINGS
+DEBUG_EXTRA_VARYINGS
 #endif
 
-INPUT mediump vec2 vTexCoord;
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
-INPUT mediump vec2 vPosition;
-INPUT mediump vec2 vRectSize;
-INPUT mediump vec2 vOptRectSize;
-#if IS_REQUIRED_ROUNDED_CORNER
-INPUT mediump vec4 vCornerRadius;
+uniform sampler2D sTexture;
+#if defined(IS_REQUIRED_YUV_TO_RGB) || defined(IS_REQUIRED_UNIFIED_YUV_AND_RGB)
+uniform sampler2D sTextureU;
+uniform sampler2D sTextureV;
 #endif
+
+#ifdef IS_REQUIRED_ALPHA_MASKING
+uniform sampler2D sMaskTexture;
+uniform lowp float uYFlipMaskTexture;
+INPUT mediump vec2 vMaskTexCoord;
 #endif
 
-uniform sampler2D sTexture;
-#if ATLAS_DEFAULT_WARP
+#ifdef ATLAS_DEFAULT_WARP
 uniform mediump vec4 uAtlasRect;
-#elif ATLAS_CUSTOM_WARP
+#elif defined(ATLAS_CUSTOM_WARP)
 // WrapMode -- 0: CLAMP; 1: REPEAT; 2: REFLECT;
 uniform lowp vec2 wrapMode;
 #endif
 
+
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER)
+uniform highp vec3 uScale;
+#endif
+
 uniform lowp vec4 uColor;
 uniform lowp vec3 mixColor;
 uniform lowp float preMultipliedAlpha;
-#if IS_REQUIRED_BORDERLINE
-uniform mediump float borderlineWidth;
-uniform mediump float borderlineOffset;
+#ifdef IS_REQUIRED_BORDERLINE
+uniform highp float borderlineWidth;
+uniform highp float borderlineOffset;
 uniform lowp vec4 borderlineColor;
+uniform lowp vec4 uActorColor;
 #endif
 
-#if ATLAS_CUSTOM_WARP
+#ifdef ATLAS_CUSTOM_WARP
 mediump float wrapCoordinate( mediump vec2 range, mediump float coordinate, lowp float wrap )
 {
   mediump float coord;
@@ -50,31 +59,31 @@ mediump float wrapCoordinate( mediump vec2 range, mediump float coordinate, lowp
 }
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
 // Global values both rounded corner and borderline use
 
 // radius of rounded corner on this quadrant
-mediump float gRadius = 0.0;
+highp float gRadius = 0.0;
 
 // fragment coordinate. NOTE : vec2(0.0, 0.0) is vRectSize, the corner of visual
-mediump vec2 gFragmentPosition = vec2(0.0, 0.0);
+highp vec2 gFragmentPosition = vec2(0.0, 0.0);
 // center coordinate of rounded corner circle. vec2(gCenterPosition, gCenterPosition).
-mediump float gCenterPosition = 0.0;
+highp float gCenterPosition = 0.0;
 // relative coordinate of gFragmentPosition from gCenterPosition.
-mediump vec2 gDiff = vec2(0.0, 0.0);
+highp vec2 gDiff = vec2(0.0, 0.0);
 // potential value what our algorithm use.
-mediump float gPotential = 0.0;
+highp float gPotential = 0.0;
 
 // threshold of potential
-mediump float gPotentialRange = 0.0;
-mediump float gMaxOutlinePotential = 0.0;
-mediump float gMinOutlinePotential = 0.0;
-mediump float gMaxInlinePotential = 0.0;
-mediump float gMinInlinePotential = 0.0;
+highp float gPotentialRange = 0.0;
+highp float gMaxOutlinePotential = 0.0;
+highp float gMinOutlinePotential = 0.0;
+highp float gMaxInlinePotential = 0.0;
+highp float gMinInlinePotential = 0.0;
 
 void calculateCornerRadius()
 {
-#if IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_ROUNDED_CORNER
   gRadius =
   mix(
     mix(vCornerRadius.x, vCornerRadius.y, sign(vPosition.x) * 0.5 + 0.5),
@@ -88,7 +97,7 @@ void calculatePosition()
 {
   gFragmentPosition = abs(vPosition) - vRectSize;
   gCenterPosition = -gRadius;
-#if IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BORDERLINE
   gCenterPosition += borderlineWidth * (clamp(borderlineOffset, -1.0, 1.0) + 1.0) * 0.5;
 #endif
   gDiff = gFragmentPosition - gCenterPosition;
@@ -101,12 +110,12 @@ void calculatePotential()
 
 void setupMinMaxPotential()
 {
-  gPotentialRange = 1.0;
+  gPotentialRange = vAliasMargin;
 
   gMaxOutlinePotential = gRadius + gPotentialRange;
   gMinOutlinePotential = gRadius - gPotentialRange;
 
-#if IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BORDERLINE
   gMaxInlinePotential = gMaxOutlinePotential - borderlineWidth;
   gMinInlinePotential = gMinOutlinePotential - borderlineWidth;
 #else
@@ -115,8 +124,8 @@ void setupMinMaxPotential()
 #endif
 
   // reduce defect near edge of rounded corner.
-  gMaxOutlinePotential += clamp(-min(gDiff.x, gDiff.y)/ max(1.0, gRadius) , 0.0, 1.0);
-  gMinOutlinePotential += clamp(-min(gDiff.x, gDiff.y)/ max(1.0, gRadius) , 0.0, 1.0);
+  gMaxOutlinePotential += clamp(-min(gDiff.x, gDiff.y) / max(1.0, gRadius), 0.0, 1.0);
+  gMinOutlinePotential += clamp(-min(gDiff.x, gDiff.y) / max(1.0, gRadius), 0.0, 1.0);
 }
 
 void PreprocessPotential()
@@ -129,10 +138,10 @@ void PreprocessPotential()
 }
 #endif
 
-#if IS_REQUIRED_BORDERLINE
+#ifdef IS_REQUIRED_BORDERLINE
 lowp vec4 convertBorderlineColor(lowp vec4 textureColor)
 {
-  mediump float potential = gPotential;
+  highp float potential = gPotential;
 
   // default opacity of borderline is 0.0
   mediump float borderlineOpacity = 0.0;
@@ -142,37 +151,60 @@ lowp vec4 convertBorderlineColor(lowp vec4 textureColor)
   {
     // potential is inside borderline range.
     borderlineOpacity = smoothstep(gMinInlinePotential, gMaxInlinePotential, potential);
+
+    // Muliply borderlineWidth to resolve very thin borderline
+    borderlineOpacity *= min(1.0, borderlineWidth / gPotentialRange);
   }
 
-  //calculate inside of borderline when outilneColor.a < 1.0
-  if(borderlineColor.a < 1.0)
+  lowp vec3  borderlineColorRGB   = borderlineColor.rgb * uActorColor.rgb;
+  lowp float borderlineColorAlpha = borderlineColor.a * uActorColor.a;
+  borderlineColorRGB *= mix(1.0, borderlineColorAlpha, preMultipliedAlpha);
+
+  // Calculate inside of borderline when alpha is between (0.0  1.0). So we need to apply texture color.
+  // If borderlineOpacity is exactly 0.0, we always use whole texture color. In this case, we don't need to run below code.
+  // But if borderlineOpacity > 0.0 and borderlineColor.a == 0.0, we need to apply tCornerRadius.
+  if(borderlineOpacity > 0.0 && borderlineColor.a * borderlineOpacity < 1.0)
   {
-    mediump float tCornerRadius = -gCenterPosition;
-    mediump float MaxTexturelinePotential = tCornerRadius + gPotentialRange;
-    mediump float MinTexturelinePotential = tCornerRadius - gPotentialRange;
-    lowp vec3 BorderlineColorRGB = borderlineColor.xyz;
-    BorderlineColorRGB *= mix(1.0, borderlineColor.a, preMultipliedAlpha);
+    highp float tCornerRadius = -gCenterPosition + gPotentialRange;
+    highp float MaxTexturelinePotential = tCornerRadius + gPotentialRange;
+    highp float MinTexturelinePotential = tCornerRadius - gPotentialRange;
     if(potential > MaxTexturelinePotential)
     {
-      // potential is out of texture range. use borderline color instead of texture
-      textureColor = vec4(BorderlineColorRGB, 0.0);
+      // potential is out of texture range.
+      textureColor = vec4(0.0);
     }
-    else if(potential > MinTexturelinePotential)
+    else
     {
-      // potential is in texture range
-      textureColor = mix(textureColor, vec4(BorderlineColorRGB, 0.0), smoothstep(MinTexturelinePotential, MaxTexturelinePotential, potential));
+      // potential is in texture range.
+      lowp float textureAlphaScale = mix(1.0, 0.0, smoothstep(MinTexturelinePotential, MaxTexturelinePotential, potential));
+      textureColor.a *= textureAlphaScale;
+      textureColor.rgb *= mix(textureColor.a, textureAlphaScale, preMultipliedAlpha);
     }
-    borderlineOpacity *= borderlineColor.a;
-    return mix(textureColor, vec4(BorderlineColorRGB, 1.0), borderlineOpacity);
+
+    borderlineColorAlpha *= borderlineOpacity;
+    borderlineColorRGB *= mix(borderlineColorAlpha, borderlineOpacity, preMultipliedAlpha);
+    // We use pre-multiplied color to reduce operations.
+    // In here, textureColor and borderlineColorRGB is pre-multiplied color now.
+
+    // Manual blend operation with premultiplied colors.
+    // Final alpha = borderlineColorAlpha + (1.0 - borderlineColorAlpha) * textureColor.a.
+    // (Final rgb * alpha) =  borderlineColorRGB + (1.0 - borderlineColorAlpha) * textureColor.rgb
+    // If preMultipliedAlpha == 1.0, just return vec4(rgb*alpha, alpha)
+    // Else, return vec4((rgb*alpha) / alpha, alpha)
+
+    lowp float finalAlpha = mix(textureColor.a, 1.0, borderlineColorAlpha);
+    lowp vec3  finalMultipliedRGB = borderlineColorRGB + (1.0 - borderlineColorAlpha) * textureColor.rgb;
+    // TODO : Need to find some way without division
+    return vec4(finalMultipliedRGB * mix(1.0 / finalAlpha, 1.0, preMultipliedAlpha), finalAlpha);
   }
-  return mix(textureColor, borderlineColor, borderlineOpacity);
+  return mix(textureColor, vec4(borderlineColorRGB, borderlineColorAlpha), borderlineOpacity);
 }
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_ROUNDED_CORNER
 mediump float calculateCornerOpacity()
 {
-  mediump float potential = gPotential;
+  highp float potential = gPotential;
 
   // default opacity is 1.0
   mediump float opacity = 1.0;
@@ -191,37 +223,203 @@ mediump float calculateCornerOpacity()
 }
 #endif
 
+#if defined(IS_REQUIRED_YUV_TO_RGB) || defined(IS_REQUIRED_UNIFIED_YUV_AND_RGB)
+lowp vec4 ConvertYuvToRgba(mediump vec2 texCoord)
+{
+#ifdef IS_REQUIRED_UNIFIED_YUV_AND_RGB
+  // Special case when shader use YUV but actual textures are not YUV format.
+  // In this case, just resturn sTexture.
+  if(textureSize(sTextureU, 0) != textureSize(sTextureV, 0))
+  {
+    return texture(sTexture, texCoord);
+  }
+#endif
+
+  lowp float y = texture(sTexture, texCoord).r;
+  lowp float u = texture(sTextureU, texCoord).r - 0.5;
+  lowp float v = texture(sTextureV, texCoord).r - 0.5;
+  lowp vec4 rgba;
+  rgba.r = y + (1.403 * v);
+  rgba.g = y - (0.344 * u) - (0.714 * v);
+  rgba.b = y + (1.770 * u);
+  rgba.a = 1.0;
+  return rgba;
+}
+#endif
+
+#ifdef IS_REQUIRED_DEBUG_VISUAL_SHADER
+
+// Predefined values whether some macro defined or not.
+// Since we make debug codes replace by macro,
+// sharp if keyword cannot be used.
+// Instead, let we use bool values so we can use define checked in script
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+const bool IS_REQUIRED_ROUNDED_CORNER_BOOL = true;
+#else
+const bool IS_REQUIRED_ROUNDED_CORNER_BOOL = false;
+#endif
+#ifdef IS_REQUIRED_BORDERLINE
+const bool IS_REQUIRED_BORDERLINE_BOOL = true;
+#else
+const bool IS_REQUIRED_BORDERLINE_BOOL = false;
+#endif
+#ifdef IS_REQUIRED_YUV_TO_RGB
+const bool IS_REQUIRED_YUV_TO_RGB_BOOL = true;
+#else
+const bool IS_REQUIRED_YUV_TO_RGB_BOOL = false;
+#endif
+#ifdef IS_REQUIRED_UNIFIED_YUV_AND_RGB
+const bool IS_REQUIRED_UNIFIED_YUV_AND_RGB_BOOL = true;
+#else
+const bool IS_REQUIRED_UNIFIED_YUV_AND_RGB_BOOL = false;
+#endif
+#ifdef IS_REQUIRED_ALPHA_MASKING
+const bool IS_REQUIRED_ALPHA_MASKING_BOOL = true;
+#else
+const bool IS_REQUIRED_ALPHA_MASKING_BOOL = false;
+#endif
+#ifdef ATLAS_DEFAULT_WARP
+const bool ATLAS_DEFAULT_WARP_BOOL = true;
+#else
+const bool ATLAS_DEFAULT_WARP_BOOL = false;
+#endif
+#ifdef ATLAS_CUSTOM_WARP
+const bool ATLAS_CUSTOM_WARP_BOOL = true;
+#else
+const bool ATLAS_CUSTOM_WARP_BOOL = false;
+#endif
+
+// These lines in the shader may be replaced with actual definitions by the debug-image-visual-shader-script.json.
+// DEBUG_TRIGGER_CODE return bool type, and DEBUG_RATIO_CODE return float value which will be clamped between 0.0 and 1.0
+// If DEBUG_TRIGGER_CODE return true, it mean we will change final color's channel value.
+// If ratio is 0.0, debug color rate become MINIMUM_DEBUG_COLOR_RATE, and 1.0 than MAXIMUM_DEBUG_COLOR_RATE.
+#define MINIMUM_DEBUG_COLOR_RATE
+#define MAXIMUM_DEBUG_COLOR_RATE
+#define DEBUG_TRIGGER_RED_CODE
+#define DEBUG_TRIGGER_GREEN_CODE
+#define DEBUG_TRIGGER_BLUE_CODE
+#define DEBUG_RATIO_RED_CODE
+#define DEBUG_RATIO_GREEN_CODE
+#define DEBUG_RATIO_BLUE_CODE
+#define DEBUG_EXTRA_UNIFORMS
+
+DEBUG_EXTRA_UNIFORMS
+
+const mediump float gMinDebugColorRate = MINIMUM_DEBUG_COLOR_RATE;
+const mediump float gMaxDebugColorRate = MAXIMUM_DEBUG_COLOR_RATE;
+
+bool DebugTriggerRed(mediump vec4 originColor)
+{
+  DEBUG_TRIGGER_RED_CODE
+}
+
+bool DebugTriggerGreen(mediump vec4 originColor)
+{
+  DEBUG_TRIGGER_GREEN_CODE
+}
+
+bool DebugTriggerBlue(mediump vec4 originColor)
+{
+  DEBUG_TRIGGER_BLUE_CODE
+}
+
+mediump float DebugRatioRed(mediump vec4 originColor)
+{
+  DEBUG_RATIO_RED_CODE
+}
+
+mediump float DebugRatioGreen(mediump vec4 originColor)
+{
+  DEBUG_RATIO_GREEN_CODE
+}
+
+mediump float DebugRatioBlue(mediump vec4 originColor)
+{
+  DEBUG_RATIO_BLUE_CODE
+}
+
+mediump vec3 ApplyDebugMixColor(mediump vec4 originColor)
+{
+  mediump float debugColorRateRed = 0.0;
+  mediump float debugColorRateGreen = 0.0;
+  mediump float debugColorRateBlue = 0.0;
+
+  if(DebugTriggerRed(originColor))
+  {
+    debugColorRateRed = mix(gMinDebugColorRate, gMaxDebugColorRate, smoothstep(0.0, 1.0, DebugRatioRed(originColor)));
+  }
+  if(DebugTriggerGreen(originColor))
+  {
+    debugColorRateGreen = mix(gMinDebugColorRate, gMaxDebugColorRate, smoothstep(0.0, 1.0, DebugRatioGreen(originColor)));
+  }
+  if(DebugTriggerBlue(originColor))
+  {
+    debugColorRateBlue = mix(gMinDebugColorRate, gMaxDebugColorRate, smoothstep(0.0, 1.0, DebugRatioBlue(originColor)));
+  }
+
+  mediump float colorRate = max(debugColorRateRed, max(debugColorRateGreen, debugColorRateBlue));
+  mediump vec3 debugColor = vec3(debugColorRateRed, debugColorRateGreen, debugColorRateBlue);
+
+  debugColor *= mix(1.0, originColor.a, preMultipliedAlpha);
+
+  return originColor.rgb * (1.0 - colorRate) + debugColor;
+}
+#endif
+
 void main()
 {
-#if ATLAS_DEFAULT_WARP
+#ifdef ATLAS_DEFAULT_WARP
   mediump vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-#elif ATLAS_CUSTOM_WARP
+#elif defined(ATLAS_CUSTOM_WARP)
   mediump vec2 texCoord = vec2( wrapCoordinate( uAtlasRect.xz, vTexCoord.x, wrapMode.x ),
                                 wrapCoordinate( uAtlasRect.yw, vTexCoord.y, wrapMode.y ) );
 #else
   mediump vec2 texCoord = vTexCoord;
 #endif
 
-  lowp vec4 textureColor = TEXTURE( sTexture, texCoord ) * vec4( mixColor, 1.0 );
+#if defined(IS_REQUIRED_YUV_TO_RGB) || defined(IS_REQUIRED_UNIFIED_YUV_AND_RGB)
+  lowp vec4 textureColor = ConvertYuvToRgba(texCoord) * vec4( mixColor, 1.0 ) * uColor;
+#else
+  lowp vec4 textureColor = TEXTURE( sTexture, texCoord ) * vec4( mixColor, 1.0 ) * uColor;
+#endif
+
+#ifdef IS_REQUIRED_ALPHA_MASKING
+  mediump vec2 maskTexCoord = vMaskTexCoord;
+  maskTexCoord.y = mix(maskTexCoord.y, 1.0-maskTexCoord.y, uYFlipMaskTexture);
+  mediump float maskAlpha = TEXTURE(sMaskTexture, maskTexCoord).a;
+  textureColor.a *= maskAlpha;
+  textureColor.rgb *= mix(1.0, maskAlpha, preMultipliedAlpha);
+#endif
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+#ifndef IS_REQUIRED_DEBUG_VISUAL_SHADER
   // skip most potential calculate for performance
   if(abs(vPosition.x) < vOptRectSize.x && abs(vPosition.y) < vOptRectSize.y)
   {
-    OUT_COLOR = textureColor * uColor;
-    return;
+    OUT_COLOR = textureColor;
   }
-  PreprocessPotential();
+  else
+#endif
+  {
+    PreprocessPotential();
 #endif
 
-#if IS_REQUIRED_BORDERLINE
-  textureColor = convertBorderlineColor(textureColor);
+#ifdef IS_REQUIRED_BORDERLINE
+    textureColor = convertBorderlineColor(textureColor);
+#endif
+    OUT_COLOR = textureColor;
+
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+    mediump float opacity = calculateCornerOpacity();
+    OUT_COLOR.a *= opacity;
+    OUT_COLOR.rgb *= mix(1.0, opacity, preMultipliedAlpha);
+#endif
+
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+  }
 #endif
-  OUT_COLOR = textureColor * uColor;
 
-#if IS_REQUIRED_ROUNDED_CORNER
-  mediump float opacity = calculateCornerOpacity();
-  OUT_COLOR.a *= opacity;
-  OUT_COLOR.rgb *= mix(1.0, opacity, preMultipliedAlpha);
+#ifdef IS_REQUIRED_DEBUG_VISUAL_SHADER
+  OUT_COLOR.rgb = ApplyDebugMixColor(OUT_COLOR);
 #endif
 }
diff --git a/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert
index 21d4084..187b6dd 100644
--- a/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert
@@ -1,78 +1,149 @@
-#ifndef IS_REQUIRED_ROUNDED_CORNER
-#define IS_REQUIRED_ROUNDED_CORNER 0
-#endif
-#ifndef IS_REQUIRED_BORDERLINE
-#define IS_REQUIRED_BORDERLINE 0
-#endif
-
 INPUT mediump vec2 aPosition;
 OUTPUT mediump vec2 vTexCoord;
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
-OUTPUT mediump vec2 vPosition;
-OUTPUT mediump vec2 vRectSize;
-OUTPUT mediump vec2 vOptRectSize;
-#if IS_REQUIRED_ROUNDED_CORNER
-OUTPUT mediump vec4 vCornerRadius;
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+OUTPUT highp vec2 vPosition;
+OUTPUT highp vec2 vRectSize;
+OUTPUT highp vec2 vOptRectSize;
+OUTPUT highp float vAliasMargin;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+OUTPUT highp vec4 vCornerRadius;
 #endif
 #endif
 
+#ifdef IS_REQUIRED_DEBUG_VISUAL_SHADER
+#define DEBUG_EXTRA_ATTRIBUTES
+#define DEBUG_EXTRA_VARYINGS
+
+DEBUG_EXTRA_ATTRIBUTES
+DEBUG_EXTRA_VARYINGS
+#endif
+
 uniform highp mat4 uMvpMatrix;
 uniform highp vec3 uSize;
-uniform mediump vec4 pixelArea;
+uniform highp vec4 pixelArea;
+
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
+// Be used when we calculate anti-alias range near 1 pixel.
+uniform highp vec3 uScale;
+#endif
 
 //Visual size and offset
-uniform mediump vec2 offset;
+uniform highp vec2 offset;
 uniform highp vec2 size;
 uniform mediump vec4 offsetSizeMode;
 uniform mediump vec2 origin;
 uniform mediump vec2 anchorPoint;
-#if IS_REQUIRED_BORDERLINE
-uniform mediump float borderlineWidth;
-uniform mediump float borderlineOffset;
+#ifdef IS_REQUIRED_BORDERLINE
+uniform highp float borderlineWidth;
+uniform highp float borderlineOffset;
 #endif
-#if IS_REQUIRED_ROUNDED_CORNER
-uniform mediump vec4 cornerRadius;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+uniform highp vec4 cornerRadius;
 uniform mediump float cornerRadiusPolicy;
 #endif
-uniform mediump vec2 extraSize;
+#ifdef IS_REQUIRED_ALPHA_MASKING
+OUTPUT  mediump vec2  vMaskTexCoord;
+uniform lowp    float cropToMask;
+uniform mediump vec2  maskTextureRatio;
+#endif
+uniform highp vec2 extraSize;
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy * size, size, offsetSizeMode.zw) + extraSize;
-  vec2 visualOffset = mix(offset, offset/uSize.xy, offsetSizeMode.xy);
+  highp vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw) + extraSize;
+  highp vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
 
-#if IS_REQUIRED_ROUNDED_CORNER || IS_REQUIRED_BORDERLINE
+#if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
   vRectSize = visualSize * 0.5;
   vOptRectSize = vRectSize;
+
+  // Set soft anti-alias range at most 10% of visual size.
+  // The range should be inverse proportion with scale of view.
+  // To avoid divid-by-zero, let we allow minimum scale value is 0.001 (0.1%)
+  vAliasMargin = min(1.0, max(visualSize.x, visualSize.y) * 0.1) / max(0.001, max(uScale.x, uScale.y));
+
+  highp float vertexMargin = 0.0;
+#endif
+
+#ifdef IS_REQUIRED_BORDERLINE
+  // Extend size of visual by borderline.
+  highp float outerBorderlineSize = (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
 #endif
 
-#if IS_REQUIRED_ROUNDED_CORNER
-#if IS_REQUIRED_BORDERLINE
-  mediump float minSize = min(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
+#ifdef IS_REQUIRED_ROUNDED_CORNER
+#ifdef IS_REQUIRED_BORDERLINE
+  highp float maxSize = max(visualSize.x, visualSize.y) + outerBorderlineSize;
+  highp float minSize = min(visualSize.x, visualSize.y) + outerBorderlineSize;
 #else
-  mediump float minSize = min(visualSize.x, visualSize.y);
+  highp float maxSize = max(visualSize.x, visualSize.y);
+  highp float minSize = min(visualSize.x, visualSize.y);
 #endif
   vCornerRadius = mix(cornerRadius * minSize, cornerRadius, cornerRadiusPolicy);
   vCornerRadius = min(vCornerRadius, minSize * 0.5);
   // Optimize fragment shader. 0.2929 ~= 1.0 - sqrt(0.5)
-  mediump float maxRadius = max(max(vCornerRadius.x, vCornerRadius.y), max(vCornerRadius.z, vCornerRadius.w));
+  highp float maxRadius = max(max(vCornerRadius.x, vCornerRadius.y), max(vCornerRadius.z, vCornerRadius.w));
+  highp float minRadius = min(min(vCornerRadius.x, vCornerRadius.y), min(vCornerRadius.z, vCornerRadius.w));
   vOptRectSize -= 0.2929 * maxRadius + 1.0;
+
+  // Set vertex margin as vAliasMargin if we need to make some more fragments for alias.
+  // Do not increase margin if the minRadius is small enough rather than maxSize.
+  // TODO : We should change the magic parameter, 0.49
+  vertexMargin = 2.0 * vAliasMargin * smoothstep(maxSize * 0.49, maxSize * 0.5, minRadius);
 #endif
 
-#if IS_REQUIRED_BORDERLINE
-  vPosition = aPosition * (visualSize + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth);
-  vOptRectSize -= (1.0 - clamp(borderlineOffset, -1.0, 1.0)) * 0.5 * borderlineWidth + 1.0;
-#elif IS_REQUIRED_ROUNDED_CORNER
-  vPosition = aPosition * visualSize;
+#ifdef IS_REQUIRED_BORDERLINE
+  vPosition = aPosition * (visualSize + outerBorderlineSize + vertexMargin);
+  vOptRectSize -= (borderlineWidth - outerBorderlineSize * 0.5) + 1.0;
+#elif defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER)
+  vPosition = aPosition * (visualSize + vertexMargin);
 #else
-  mediump vec2 vPosition = aPosition * visualSize;
+  highp vec2 vPosition = aPosition * visualSize;
+#endif
+
+  highp vec4 finalPixelArea = pixelArea;
+#ifdef IS_REQUIRED_ALPHA_MASKING
+  finalPixelArea = mix(pixelArea,
+                       vec4(
+                            vec2(0.5) + (pixelArea.xy - vec2(0.5)) * maskTextureRatio,
+                            pixelArea.zw * maskTextureRatio
+                       ),
+                       cropToMask);
+  vMaskTexCoord = pixelArea.xy + pixelArea.zw * (vec2(0.5) + aPosition.xy
+#ifdef IS_REQUIRED_BORDERLINE
+                                                  * (1.0 + (outerBorderlineSize + vertexMargin) / visualSize)
+#elif defined(IS_REQUIRED_ROUNDED_CORNER)
+                                                  * (1.0 + vertexMargin / visualSize)
 #endif
+                                                );
+#endif
+  vTexCoord = finalPixelArea.xy + finalPixelArea.zw * (vec2(0.5) + aPosition.xy
+#ifdef IS_REQUIRED_BORDERLINE
+                                                        * (1.0 + (outerBorderlineSize + vertexMargin) / visualSize)
+#elif defined(IS_REQUIRED_ROUNDED_CORNER)
+                                                        * (1.0 + vertexMargin / visualSize)
+#endif
+                                                      );
 
-  vTexCoord = pixelArea.xy + pixelArea.zw * (vPosition.xy / max(vec2(1.0), visualSize) + vec2(0.5));
-  return vec4(vPosition + anchorPoint * visualSize + (visualOffset + origin) * uSize.xy, 0.0, 1.0);
+  return vec4(vPosition + anchorPoint * visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0);
 }
 
+#ifdef IS_REQUIRED_DEBUG_VISUAL_SHADER
+// These lines in the shader may be replaced with actual definitions by the debug-image-visual-shader-script.json.
+#define DEBUG_APPLY_VARYING_CODE
+#define DEBUG_EXTRA_UNIFORMS
+
+DEBUG_EXTRA_UNIFORMS
+
+void ApplyDebugVarying()
+{
+  DEBUG_APPLY_VARYING_CODE
+}
+#endif
 void main()
 {
   gl_Position = uMvpMatrix * ComputeVertexPosition();
+
+#ifdef IS_REQUIRED_DEBUG_VISUAL_SHADER
+  ApplyDebugVarying();
+#endif
 }
diff --git a/dali-toolkit/internal/graphics/shaders/mesh-visual-normal-map-shader.vert b/dali-toolkit/internal/graphics/shaders/mesh-visual-normal-map-shader.vert
index c25a1bb..bc9ac8a 100644
--- a/dali-toolkit/internal/graphics/shaders/mesh-visual-normal-map-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/mesh-visual-normal-map-shader.vert
@@ -24,12 +24,12 @@ uniform mediump vec2 anchorPoint;
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw );
   float scaleFactor = min( visualSize.x, visualSize.y );
   vec3 originFlipY =vec3(origin.x, -origin.y, 0.0);
   vec3 anchorPointFlipY = vec3( anchorPoint.x, -anchorPoint.y, 0.0);
-  vec3 offset = vec3( ( offset / uSize.xy ) * offsetSizeMode.xy + offset * (1.0-offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
-  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + (offset + originFlipY)*uSize, 1.0 );
+  vec3 visualOffset = vec3( offset * offsetSizeMode.xy + offset * uSize.xy * (1.0 - offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
+  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + visualOffset + originFlipY * uSize, 1.0 );
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/mesh-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/mesh-visual-shader.vert
index 05b90ce..858c92d 100644
--- a/dali-toolkit/internal/graphics/shaders/mesh-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/mesh-visual-shader.vert
@@ -26,8 +26,8 @@ vec4 ComputeVertexPosition()
   float scaleFactor = min( visualSize.x, visualSize.y );
   vec3 originFlipY =vec3(origin.x, -origin.y, 0.0);
   vec3 anchorPointFlipY = vec3( anchorPoint.x, -anchorPoint.y, 0.0);
-  vec3 offset = vec3( ( offset / uSize.xy ) * offsetSizeMode.xy + offset * (1.0-offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
-  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + (offset + originFlipY)*uSize, 1.0 );
+  vec3 visualOffset = vec3( offset * offsetSizeMode.xy + offset * uSize.xy * (1.0-offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
+  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + visualOffset + originFlipY * uSize, 1.0 );
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/mesh-visual-simple-shader.vert b/dali-toolkit/internal/graphics/shaders/mesh-visual-simple-shader.vert
index 2a4b704..0541a16 100644
--- a/dali-toolkit/internal/graphics/shaders/mesh-visual-simple-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/mesh-visual-simple-shader.vert
@@ -23,8 +23,8 @@ vec4 ComputeVertexPosition()
   float scaleFactor = min( visualSize.x, visualSize.y );
   vec3 originFlipY =vec3(origin.x, -origin.y, 0.0);
   vec3 anchorPointFlipY = vec3( anchorPoint.x, -anchorPoint.y, 0.0);
-  vec3 offset = vec3( ( offset / uSize.xy ) * offsetSizeMode.xy + offset * (1.0-offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
-  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + (offset + originFlipY)*uSize, 1.0 );
+  vec3 visualOffset = vec3( offset * offsetSizeMode.xy + offset * uSize.xy * (1.0-offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
+  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + visualOffset + originFlipY * uSize, 1.0 );
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/npatch-visual-3x3-shader.vert b/dali-toolkit/internal/graphics/shaders/npatch-visual-3x3-shader.vert
index 1586312..4625b3c 100644
--- a/dali-toolkit/internal/graphics/shaders/npatch-visual-3x3-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/npatch-visual-3x3-shader.vert
@@ -16,8 +16,8 @@ uniform mediump vec2 extraSize;
 
 void main()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw ) + extraSize;
+  vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
 
   mediump vec2 size = visualSize.xy;
 
@@ -25,10 +25,13 @@ void main()
   mediump vec2 stretch  = floor( aPosition * 0.5 );
   mediump vec2 fixedTotal   = uFixed[ 2 ];
 
-  mediump vec4 gridPosition = vec4( fixedFactor + ( size - fixedTotal ) * stretch, 0.0, 1.0 );
+  // Scale down if fixedTotal is bigger than visualSize
+  mediump float fixedScaleDownRate = min(1.0, min(size.x / fixedTotal.x, size.y / fixedTotal.y));
+
+  mediump vec4 gridPosition = vec4( fixedFactor * fixedScaleDownRate + ( size - fixedTotal * fixedScaleDownRate ) * stretch, 0.0, 1.0 );
   mediump vec4 vertexPosition = gridPosition;
   vertexPosition.xy -= size * vec2( 0.5, 0.5 );
-  vertexPosition.xy += anchorPoint*size + (visualOffset + origin)*uSize.xy;
+  vertexPosition.xy += anchorPoint*size + visualOffset + origin * uSize.xy;
 
   vertexPosition = uMvpMatrix * vertexPosition;
 
diff --git a/dali-toolkit/internal/graphics/shaders/npatch-visual-mask-shader.frag b/dali-toolkit/internal/graphics/shaders/npatch-visual-mask-shader.frag
index 6b85462..626a3ff 100644
--- a/dali-toolkit/internal/graphics/shaders/npatch-visual-mask-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/npatch-visual-mask-shader.frag
@@ -14,10 +14,24 @@ void main()
   // where mask is translucent, less of background should be shown.
   // auxiliaryImageAlpha controls how much of mask is visible
 
-  mediump vec4 color = texture2D( sTexture, vTexCoord );
-  mediump vec4 mask= texture2D( sMask, vMaskTexCoord );
+  mediump vec4 color = texture2D(sTexture, vTexCoord);
+  mediump vec4 mask = texture2D(sMask, vMaskTexCoord);
 
-  mediump vec3 mixedColor = color.rgb * mix( 1.0-mask.a, 1.0, 1.0-auxiliaryImageAlpha)
-                            + mask.rgb*mask.a * auxiliaryImageAlpha;
-  gl_FragColor = vec4(mixedColor,1.0) * uColor * vec4( mixColor, 1.0 );
+  mediump float maskAlpha = mask.a * auxiliaryImageAlpha;
+
+  lowp vec3 preMultipliedMaskRGB = mask.rgb * mix(mask.a, 1.0, preMultipliedAlpha) * auxiliaryImageAlpha;
+  lowp vec3 preMultipliedTextureRGB = color.rgb * mix(color.a, 1.0, preMultipliedAlpha);
+
+  // Manual blend operation with premultiplied colors.
+  // Final alpha = maskAlpha + (1.0 - maskAlpha) * color.a.
+  // (Final rgb * alpha) =  preMultipliedMaskRGB + (1.0 - maskAlpha) * preMultipliedTextureRGB
+  // If preMultipliedAlpha == 1.0, just return vec4(rgb*alpha, alpha)
+  // Else, return vec4((rgb*alpha) / alpha, alpha)
+
+  lowp float finalAlpha = mix(color.a, 1.0, maskAlpha);
+  lowp vec3  finalMultipliedRGB = preMultipliedMaskRGB + (1.0 - maskAlpha) * preMultipliedTextureRGB;
+
+  // TODO : Need to find some way without division
+  lowp vec4 finalColor = vec4(finalMultipliedRGB * mix(1.0 / finalAlpha, 1.0, preMultipliedAlpha), finalAlpha);
+  gl_FragColor = finalColor * uColor * vec4(mixColor, 1.0);
 }
diff --git a/dali-toolkit/internal/graphics/shaders/npatch-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/npatch-visual-shader.vert
index 07f645b..01f6138 100644
--- a/dali-toolkit/internal/graphics/shaders/npatch-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/npatch-visual-shader.vert
@@ -22,13 +22,16 @@ void main()
   mediump vec2 fixedTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].x, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].x );
   mediump vec2 stretchTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].y, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].y );
 
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw ) + extraSize;
+  vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
 
-  mediump vec4 gridPosition = vec4( fixedFactor + ( visualSize.xy - fixedTotal ) * stretch / stretchTotal, 0.0, 1.0 );
+  // Scale down if fixedTotal is bigger than visualSize
+  mediump float fixedScaleDownRate = min(1.0, min(visualSize.x / fixedTotal.x, visualSize.y / fixedTotal.y));
+
+  mediump vec4 gridPosition = vec4( fixedFactor * fixedScaleDownRate + ( visualSize.xy - fixedTotal * fixedScaleDownRate ) * stretch / stretchTotal, 0.0, 1.0 );
   mediump vec4 vertexPosition = gridPosition;
   vertexPosition.xy -= visualSize.xy * vec2( 0.5, 0.5 );
-  vertexPosition.xy += anchorPoint*visualSize + (visualOffset + origin)*uSize.xy;
+  vertexPosition.xy += anchorPoint*visualSize + visualOffset + origin * uSize.xy;
   vertexPosition = uMvpMatrix * vertexPosition;
 
   vTexCoord = ( fixedFactor + stretch ) / ( fixedTotal + stretchTotal );
diff --git a/dali-toolkit/internal/graphics/shaders/primitive-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/primitive-visual-shader.vert
index 6a1b758..1200294 100644
--- a/dali-toolkit/internal/graphics/shaders/primitive-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/primitive-visual-shader.vert
@@ -27,9 +27,9 @@ vec4 ComputeVertexPosition()
   float scaleFactor = min( visualSize.x / uObjectDimensions.x, visualSize.y / uObjectDimensions.y );
   vec3 originFlipY =vec3(origin.x, -origin.y, 0.0);
   vec3 anchorPointFlipY = vec3( anchorPoint.x, -anchorPoint.y, 0.0);
-  vec3 offset = vec3( ( offset / uSize.xy ) * offsetSizeMode.xy + offset * (1.0-offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
+  vec3 visualOffset = vec3( offset * offsetSizeMode.xy + offset * uSize.xy * (1.0-offsetSizeMode.xy), 0.0) * vec3(1.0,-1.0,1.0);
 
-  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + (offset + originFlipY)*uSize, 1.0 );
+  return vec4( (aPosition + anchorPointFlipY)*scaleFactor + visualOffset + originFlipY * uSize, 1.0 );
 }
 
 void main()
diff --git a/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert b/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert
index 6c2cd05..c152b5e 100644
--- a/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert
@@ -1,9 +1,9 @@
 attribute mediump vec2 aPosition;
 varying highp vec2 vTexCoord;
 uniform highp vec3 uSize;
-uniform mediump float uDelta;
+uniform highp float uDelta;
 uniform mediump vec2 uTextureSize;
-uniform mediump float uGap;
+uniform highp float uGap;
 uniform mediump float uHorizontalAlign;
 uniform mediump float uVerticalAlign;
 
@@ -18,13 +18,13 @@ uniform mediump vec2 anchorPoint;
 
 void main()
 {
-  mediump vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy );
-  mediump vec2 visualSize = mix( uSize.xy * size, size, offsetSizeMode.zw );
+  highp vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw);
+  highp vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
 
-  vTexCoord.x = ( uDelta + uHorizontalAlign * ( uTextureSize.x - visualSize.x - uGap ) + floor( aPosition.x * visualSize.x ) + 0.5 - uGap * 0.5 ) / uTextureSize.x + 0.5;
-  vTexCoord.y = ( uVerticalAlign * ( uTextureSize.y - visualSize.y ) + floor( aPosition.y * visualSize.y ) + 0.5 ) / ( uTextureSize.y ) + 0.5;
+  vTexCoord.x = ( uDelta + uHorizontalAlign * ( uTextureSize.x - visualSize.x - uGap ) + aPosition.x * visualSize.x - uGap * 0.5 ) / uTextureSize.x + 0.5;
+  vTexCoord.y = ( uVerticalAlign * ( uTextureSize.y - visualSize.y ) + aPosition.y * visualSize.y ) / ( uTextureSize.y ) + 0.5;
 
-  mediump vec4 vertexPosition = vec4( floor( ( aPosition + anchorPoint ) * visualSize + ( visualOffset + origin ) * uSize.xy ), 0.0, 1.0 );
+  highp vec4 vertexPosition = vec4( ( aPosition + anchorPoint ) * visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0 );
 
   gl_Position = uMvpMatrix * vertexPosition;
 }
\ No newline at end of file
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-shader.frag
deleted file mode 100644
index e9e1069..0000000
--- a/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-shader.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-varying mediump vec2 vTexCoord;
-uniform sampler2D sTexture;
-uniform lowp vec4 uColor;
-uniform lowp vec3 mixColor;
-
-void main()
-{
-  mediump vec4 textTexture = texture2D( sTexture, vTexCoord );
-
-  gl_FragColor = textTexture * uColor * vec4( mixColor, 1.0 );
-}
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-with-style-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-with-style-shader.frag
deleted file mode 100644
index d8506cb..0000000
--- a/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-with-style-shader.frag
+++ /dev/null
@@ -1,14 +0,0 @@
-varying mediump vec2 vTexCoord;
-uniform sampler2D sTexture;
-uniform sampler2D sStyle;
-uniform lowp vec4 uColor;
-uniform lowp vec3 mixColor;
-
-void main()
-{
-  mediump vec4 textTexture = texture2D( sTexture, vTexCoord );
-  mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );
-
-  // Draw the text as overlay above the style
-  gl_FragColor = ( textTexture + styleTexture * ( 1.0 - textTexture.a ) ) * uColor * vec4( mixColor, 1.0 );
-}
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-shader.frag
new file mode 100644
index 0000000..0fc642e
--- /dev/null
+++ b/dali-toolkit/internal/graphics/shaders/text-visual-shader.frag
@@ -0,0 +1,63 @@
+INPUT mediump vec2 vTexCoord;
+uniform sampler2D sTexture;
+#ifdef IS_REQUIRED_STYLE
+uniform sampler2D sStyle;
+#endif
+#ifdef IS_REQUIRED_OVERLAY
+uniform sampler2D sOverlayStyle;
+#endif
+#ifdef IS_REQUIRED_MULTI_COLOR
+#elif defined(IS_REQUIRED_EMOJI)
+// Single color with emoji.
+uniform sampler2D sMask;
+uniform lowp float uHasMultipleTextColors;
+#endif
+uniform lowp vec4 uTextColorAnimatable;
+uniform lowp vec4 uColor;
+uniform lowp vec3 mixColor;
+
+void main()
+{
+#ifdef IS_REQUIRED_STYLE
+  mediump vec4 styleTexture = TEXTURE( sStyle, vTexCoord );
+#endif
+
+#ifdef IS_REQUIRED_OVERLAY
+  mediump vec4 overlayStyleTexture = TEXTURE( sOverlayStyle, vTexCoord );
+#endif
+
+#if defined(IS_REQUIRED_MULTI_COLOR) || defined(IS_REQUIRED_EMOJI)
+  // Multiple color or use emoji.
+  mediump vec4 textColor = TEXTURE(sTexture, vTexCoord);
+
+#ifdef IS_REQUIRED_MULTI_COLOR
+#elif defined(IS_REQUIRED_EMOJI)
+  // Single color with emoji.
+  mediump float maskTexture = TEXTURE(sMask, vTexCoord).r;
+
+  // Set the color of non-transparent pixel in text to what it is animated to.
+  // Markup text with multiple text colors are not animated (but can be supported later on if required).
+  // Emoji color are not animated.
+  mediump float vstep = step( 0.0001, textColor.a );
+  textColor.rgb = mix(textColor.rgb, uTextColorAnimatable.rgb, vstep * maskTexture * (1.0 - uHasMultipleTextColors));
+#endif
+#else
+  // Single color without emoji.
+  mediump float textTexture = TEXTURE(sTexture, vTexCoord).r;
+  mediump vec4 textColor = uTextColorAnimatable * textTexture;
+#endif
+
+  // Draw the text as overlay above the style
+  OUT_COLOR = uColor * vec4(mixColor, 1.0) * (
+#ifdef IS_REQUIRED_OVERLAY
+                   (
+#endif
+                     textColor
+#ifdef IS_REQUIRED_STYLE
+                     + styleTexture * (1.0 - textColor.a)
+#endif
+#ifdef IS_REQUIRED_OVERLAY
+                   ) * (1.0 - overlayStyleTexture.a) + overlayStyleTexture
+#endif
+                 );
+}
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert
index 893d075..68503a9 100644
--- a/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert
@@ -1,9 +1,8 @@
-attribute mediump vec2 aPosition;
+INPUT mediump vec2 aPosition;
 uniform highp mat4 uMvpMatrix;
 uniform highp vec3 uSize;
-uniform mediump vec4 pixelArea;
 
-varying mediump vec2 vTexCoord;
+OUTPUT mediump vec2 vTexCoord;
 
 //Visual size and offset
 uniform mediump vec2 offset;
@@ -14,13 +13,13 @@ uniform mediump vec2 anchorPoint;
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
-  return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw );
+  vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
+  return vec4( (aPosition + anchorPoint) * visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0 );
 }
 
 void main()
 {
+  vTexCoord = aPosition + vec2(0.5);
   gl_Position = uMvpMatrix * ComputeVertexPosition();
-  vTexCoord = pixelArea.xy+pixelArea.zw*(aPosition + vec2(0.5) );
 }
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-shader.frag
deleted file mode 100644
index ab44460..0000000
--- a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-shader.frag
+++ /dev/null
@@ -1,13 +0,0 @@
-varying mediump vec2 vTexCoord;
-uniform sampler2D sTexture;
-uniform lowp vec4 uTextColorAnimatable;
-uniform lowp vec4 uColor;
-uniform lowp vec3 mixColor;
-
-void main()
-{
-  mediump float textTexture = texture2D( sTexture, vTexCoord ).r;
-
-  // Set the color of the text to what it is animated to.
-  gl_FragColor = uTextColorAnimatable * textTexture * uColor * vec4( mixColor, 1.0 );
-}
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-emoji-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-emoji-shader.frag
deleted file mode 100644
index 544f0be..0000000
--- a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-emoji-shader.frag
+++ /dev/null
@@ -1,21 +0,0 @@
-varying mediump vec2 vTexCoord;
-uniform sampler2D sTexture;
-uniform sampler2D sMask;
-uniform lowp vec4 uTextColorAnimatable;
-uniform lowp vec4 uColor;
-uniform lowp vec3 mixColor;
-
-void main()
-{
-  mediump vec4 textTexture = texture2D( sTexture, vTexCoord );
-  mediump float maskTexture = texture2D( sMask, vTexCoord ).r;
-
-  // Set the color of non-transparent pixel in text to what it is animated to.
-  // Markup text with multiple text colors are not animated (but can be supported later on if required).
-  // Emoji color are not animated.
-  mediump float vstep = step( 0.0001, textTexture.a );
-  textTexture.rgb = mix( textTexture.rgb, uTextColorAnimatable.rgb, vstep * maskTexture );
-
-  // Draw the text as overlay above the style
-  gl_FragColor = textTexture * uColor * vec4( mixColor, 1.0 );
-}
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag
deleted file mode 100644
index b892a17..0000000
--- a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag
+++ /dev/null
@@ -1,24 +0,0 @@
-varying mediump vec2 vTexCoord;
-uniform sampler2D sTexture;
-uniform sampler2D sStyle;
-uniform sampler2D sMask;
-uniform lowp float uHasMultipleTextColors;
-uniform lowp vec4 uTextColorAnimatable;
-uniform lowp vec4 uColor;
-uniform lowp vec3 mixColor;
-
-void main()
-{
-  mediump vec4 textTexture = texture2D( sTexture, vTexCoord );
-  mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );
-  mediump float maskTexture = texture2D( sMask, vTexCoord ).r;
-
-  // Set the color of non-transparent pixel in text to what it is animated to.
-  // Markup text with multiple text colors are not animated (but can be supported later on if required).
-  // Emoji color are not animated.
-  mediump float vstep = step( 0.0001, textTexture.a );
-  textTexture.rgb = mix( textTexture.rgb, uTextColorAnimatable.rgb, vstep * maskTexture * ( 1.0 - uHasMultipleTextColors ) );
-
-  // Draw the text as overlay above the style
-  gl_FragColor = ( textTexture + styleTexture * ( 1.0 - textTexture.a ) ) * uColor * vec4( mixColor, 1.0 );
-}
diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-shader.frag
deleted file mode 100644
index f5d8b1c..0000000
--- a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-shader.frag
+++ /dev/null
@@ -1,15 +0,0 @@
-varying mediump vec2 vTexCoord;
-uniform sampler2D sTexture;
-uniform sampler2D sStyle;
-uniform lowp vec4 uTextColorAnimatable;
-uniform lowp vec4 uColor;
-uniform lowp vec3 mixColor;
-
-void main()
-{
-  mediump float textTexture = texture2D( sTexture, vTexCoord ).r;
-  mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );
-
-  // Draw the text as overlay above the style
-  gl_FragColor = ( uTextColorAnimatable * textTexture + styleTexture * ( 1.0 - uTextColorAnimatable.a * textTexture ) ) * uColor * vec4( mixColor, 1.0 );
-}
diff --git a/dali-toolkit/internal/graphics/shaders/wireframe-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/wireframe-visual-shader.vert
index 5e0bfb0..9a9975c 100644
--- a/dali-toolkit/internal/graphics/shaders/wireframe-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/wireframe-visual-shader.vert
@@ -11,9 +11,9 @@ uniform mediump vec2 anchorPoint;
 
 vec4 ComputeVertexPosition()
 {
-  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
-  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
-  return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );
+  vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw );
+  vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy);
+  return vec4( (aPosition + anchorPoint)*visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0 );
 }
 
 void main()
diff --git a/dali-toolkit/internal/helpers/round-robin-container-view.h b/dali-toolkit/internal/helpers/round-robin-container-view.h
deleted file mode 100644
index b5f97df..0000000
--- a/dali-toolkit/internal/helpers/round-robin-container-view.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-#ifndef DALI_TOOLKIT_INTERNAL_ROUND_ROBIN_CONTAINER_VIEW_H
-#define DALI_TOOLKIT_INTERNAL_ROUND_ROBIN_CONTAINER_VIEW_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <cstddef>
-#include <vector>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-/**
- * @brief RoundRobinContainerView is a view to a container that allows iterating through the elements cyclically.
- */
-template<typename T>
-class RoundRobinContainerView
-{
-public:
-  using ContainerType = std::vector<T>;
-
-  /**
-   * @brief Constructs a new RoundRobinControlView with the given number elements using the provided factory.
-   * @param[in] numberOfElements The number of elements in the container
-   * @param[in] factory          Factory function of functor that will be used to create instances of the elements
-   */
-  template<typename FactoryType>
-  RoundRobinContainerView(size_t numberOfElements, const FactoryType& factory)
-  : mElements(),
-    mNextIndex{}
-  {
-    mElements.reserve(numberOfElements);
-    for(unsigned i = {}; i < numberOfElements; ++i)
-    {
-      mElements.push_back(factory());
-    }
-  }
-
-  /**
-   * @brief Reset the position of the iterator returned by GetNext() to the first element.
-   */
-  void Reset()
-  {
-    mNextIndex = 0u;
-  }
-
-  /**
-   * @brief Returns the next element on the container.
-   * @return Iterator for the next element
-   */
-  typename ContainerType::iterator GetNext()
-  {
-    SetValidNextIndex();
-
-    return mElements.begin() + mNextIndex++;
-  }
-
-  /**
-   * @brief Returns the iterator to the end of the container.
-   *
-   * Can be used to compare against GetNext() to check if the container is empty.
-   *
-   * @return The container end() element
-   */
-  typename ContainerType::const_iterator End() const
-  {
-    return mElements.cend();
-  }
-
-  // default members
-  ~RoundRobinContainerView() = default;
-
-  RoundRobinContainerView(const RoundRobinContainerView&) = delete;
-  RoundRobinContainerView& operator=(const RoundRobinContainerView&) = delete;
-  RoundRobinContainerView(RoundRobinContainerView&&)                 = default;
-  RoundRobinContainerView& operator=(RoundRobinContainerView&&) = default;
-
-private:
-  /**
-   * @brief Check the current index and reset if necessary.
-   */
-  void SetValidNextIndex()
-  {
-    if(mNextIndex >= mElements.size())
-    {
-      Reset();
-    }
-  }
-
-private:
-  ContainerType mElements;  //< container of elements
-  size_t        mNextIndex; //< index to the next element to be viewed
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_INTERNAL_ROUND_ROBIN_CONTAINER_VIEW_H
diff --git a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
index 64639b5..11801fc 100644
--- a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
+++ b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
 
 namespace Dali
 {
@@ -29,15 +30,13 @@ namespace Internal
 {
 AsyncImageLoader::AsyncImageLoader()
 : mLoadedSignal(),
-  mLoadThread(new EventThreadCallback(MakeCallback(this, &AsyncImageLoader::ProcessLoadedImage))),
-  mLoadTaskId(0u),
-  mIsLoadThreadStarted(false)
+  mLoadTaskId(0u)
 {
 }
 
 AsyncImageLoader::~AsyncImageLoader()
 {
-  mLoadThread.CancelAll();
+  CancelAll();
 }
 
 IntrusivePtr<AsyncImageLoader> AsyncImageLoader::New()
@@ -46,16 +45,24 @@ IntrusivePtr<AsyncImageLoader> AsyncImageLoader::New()
   return internal;
 }
 
-uint32_t AsyncImageLoader::LoadAnimatedImage(Dali::AnimatedImageLoading animatedImageLoading,
-                                             uint32_t                   frameIndex)
+uint32_t AsyncImageLoader::LoadAnimatedImage(Dali::AnimatedImageLoading               animatedImageLoading,
+                                             uint32_t                                 frameIndex,
+                                             DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
 {
-  if(!mIsLoadThreadStarted)
-  {
-    mLoadThread.Start();
-    mIsLoadThreadStarted = true;
-  }
-  mLoadThread.AddTask(new LoadingTask(++mLoadTaskId, animatedImageLoading, frameIndex));
+  LoadingTaskPtr loadingTask = new LoadingTask(++mLoadTaskId, animatedImageLoading, frameIndex, preMultiplyOnLoad, MakeCallback(this, &AsyncImageLoader::ProcessLoadedImage));
+  Dali::AsyncTaskManager::Get().AddTask(loadingTask);
+  return mLoadTaskId;
+}
 
+uint32_t AsyncImageLoader::LoadAnimatedImage(Dali::AnimatedImageLoading               animatedImageLoading,
+                                             uint32_t                                 frameIndex,
+                                             Dali::ImageDimensions                    desiredSize,
+                                             Dali::FittingMode::Type                  fittingMode,
+                                             Dali::SamplingMode::Type                 samplingMode,
+                                             DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
+{
+  LoadingTaskPtr loadingTask = new LoadingTask(++mLoadTaskId, animatedImageLoading, frameIndex, desiredSize, fittingMode, samplingMode, preMultiplyOnLoad, MakeCallback(this, &AsyncImageLoader::ProcessLoadedImage));
+  Dali::AsyncTaskManager::Get().AddTask(loadingTask);
   return mLoadTaskId;
 }
 
@@ -64,15 +71,12 @@ uint32_t AsyncImageLoader::Load(const VisualUrl&                         url,
                                 FittingMode::Type                        fittingMode,
                                 SamplingMode::Type                       samplingMode,
                                 bool                                     orientationCorrection,
-                                DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
+                                DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+                                bool                                     loadPlanes)
 {
-  if(!mIsLoadThreadStarted)
-  {
-    mLoadThread.Start();
-    mIsLoadThreadStarted = true;
-  }
-  mLoadThread.AddTask(new LoadingTask(++mLoadTaskId, url, dimensions, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad));
-
+  LoadingTaskPtr loadingTask = new LoadingTask(++mLoadTaskId, url, dimensions, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad, loadPlanes, MakeCallback(this, &AsyncImageLoader::ProcessLoadedImage));
+  AsyncTaskManager::Get().AddTask(loadingTask);
+  mLoadingTasks.push_back(AsyncImageLoadingInfo(loadingTask, mLoadTaskId));
   return mLoadTaskId;
 }
 
@@ -83,13 +87,9 @@ uint32_t AsyncImageLoader::LoadEncodedImageBuffer(const EncodedImageBuffer&
                                                   bool                                     orientationCorrection,
                                                   DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
 {
-  if(!mIsLoadThreadStarted)
-  {
-    mLoadThread.Start();
-    mIsLoadThreadStarted = true;
-  }
-  mLoadThread.AddTask(new LoadingTask(++mLoadTaskId, encodedImageBuffer, dimensions, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad));
-
+  LoadingTaskPtr loadingTask = new LoadingTask(++mLoadTaskId, encodedImageBuffer, dimensions, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad, MakeCallback(this, &AsyncImageLoader::ProcessLoadedImage));
+  Dali::AsyncTaskManager::Get().AddTask(loadingTask);
+  mLoadingTasks.push_back(AsyncImageLoadingInfo(loadingTask, mLoadTaskId));
   return mLoadTaskId;
 }
 
@@ -99,13 +99,9 @@ uint32_t AsyncImageLoader::ApplyMask(Devel::PixelBuffer                       pi
                                      bool                                     cropToMask,
                                      DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
 {
-  if(!mIsLoadThreadStarted)
-  {
-    mLoadThread.Start();
-    mIsLoadThreadStarted = true;
-  }
-  mLoadThread.AddTask(new LoadingTask(++mLoadTaskId, pixelBuffer, maskPixelBuffer, contentScale, cropToMask, preMultiplyOnLoad));
-
+  LoadingTaskPtr loadingTask = new LoadingTask(++mLoadTaskId, pixelBuffer, maskPixelBuffer, contentScale, cropToMask, preMultiplyOnLoad, MakeCallback(this, &AsyncImageLoader::ProcessLoadedImage));
+  Dali::AsyncTaskManager::Get().AddTask(loadingTask);
+  mLoadingTasks.push_back(AsyncImageLoadingInfo(loadingTask, mLoadTaskId));
   return mLoadTaskId;
 }
 
@@ -121,34 +117,79 @@ Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType& AsyncImageLoader::P
 
 bool AsyncImageLoader::Cancel(uint32_t loadingTaskId)
 {
-  return mLoadThread.CancelTask(loadingTaskId);
+  // Remove already completed tasks
+  RemoveCompletedTask();
+
+  auto end = mLoadingTasks.end();
+  for(std::vector<AsyncImageLoadingInfo>::iterator iter = mLoadingTasks.begin(); iter != end; ++iter)
+  {
+    if((*iter).loadId == loadingTaskId)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask((*iter).loadingTask);
+      mLoadingTasks.erase(iter);
+      return true;
+    }
+  }
+
+  return false;
 }
 
 void AsyncImageLoader::CancelAll()
 {
-  mLoadThread.CancelAll();
+  // Remove already completed tasks
+  RemoveCompletedTask();
+
+  auto end = mLoadingTasks.end();
+  for(std::vector<AsyncImageLoadingInfo>::iterator iter = mLoadingTasks.begin(); iter != end; ++iter)
+  {
+    if((*iter).loadingTask && Dali::AsyncTaskManager::Get())
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(((*iter).loadingTask));
+    }
+  }
+  mLoadingTasks.clear();
 }
 
-void AsyncImageLoader::ProcessLoadedImage()
+void AsyncImageLoader::ProcessLoadedImage(LoadingTaskPtr task)
 {
-  while(LoadingTask* next = mLoadThread.NextCompletedTask())
+  if(mPixelBufferLoadedSignal.GetConnectionCount() > 0)
+  {
+    mPixelBufferLoadedSignal.Emit(task->id, task->pixelBuffers);
+  }
+  else if(mLoadedSignal.GetConnectionCount() > 0)
   {
-    if(mPixelBufferLoadedSignal.GetConnectionCount() > 0)
+    PixelData pixelData;
+    if(!task->pixelBuffers.empty())
     {
-      mPixelBufferLoadedSignal.Emit(next->id, next->pixelBuffer);
+      pixelData = Devel::PixelBuffer::Convert(task->pixelBuffers[0]);
     }
-    else if(mLoadedSignal.GetConnectionCount() > 0)
+    mLoadedSignal.Emit(task->id, pixelData);
+  }
+
+  mCompletedTaskIds.push_back(task->id);
+}
+
+void AsyncImageLoader::RemoveCompletedTask()
+{
+  std::uint32_t loadingTaskId;
+  auto          end              = mLoadingTasks.end();
+  auto          endCompletedIter = mCompletedTaskIds.end();
+  for(auto iterCompleted = mCompletedTaskIds.begin(); iterCompleted != endCompletedIter; ++iterCompleted)
+  {
+    loadingTaskId = (*iterCompleted);
+    for(std::vector<AsyncImageLoadingInfo>::iterator iter = mLoadingTasks.begin(); iter != end; ++iter)
     {
-      PixelData pixelData;
-      if(next->pixelBuffer)
+      if((*iter).loadId == loadingTaskId)
       {
-        pixelData = Devel::PixelBuffer::Convert(next->pixelBuffer);
+        mLoadingTasks.erase(iter);
+        end = mLoadingTasks.end();
+        break;
       }
-      mLoadedSignal.Emit(next->id, pixelData);
     }
-
-    delete next;
   }
+
+  // Remove cached completed tasks
+  mCompletedTaskIds.clear();
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/image-loader/async-image-loader-impl.h b/dali-toolkit/internal/image-loader/async-image-loader-impl.h
index 39e4690..c23b102 100644
--- a/dali-toolkit/internal/image-loader/async-image-loader-impl.h
+++ b/dali-toolkit/internal/image-loader/async-image-loader-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
-#include <dali-toolkit/internal/image-loader/image-load-thread.h>
+#include <dali-toolkit/internal/image-loader/loading-task.h>
 #include <dali-toolkit/public-api/image-loader/async-image-loader.h>
 
 namespace Dali
@@ -32,7 +32,21 @@ namespace Toolkit
 {
 namespace Internal
 {
-class AsyncImageLoader : public BaseObject
+using LoadingTaskPtr = IntrusivePtr<LoadingTask>;
+
+struct AsyncImageLoadingInfo
+{
+  AsyncImageLoadingInfo(LoadingTaskPtr loadingTask, std::uint32_t loadId)
+  : loadingTask(loadingTask),
+    loadId(loadId)
+  {
+  }
+
+  LoadingTaskPtr loadingTask;
+  std::uint32_t  loadId;
+};
+
+class AsyncImageLoader : public BaseObject, public ConnectionTracker
 {
 public:
   /**
@@ -46,20 +60,48 @@ public:
   static IntrusivePtr<AsyncImageLoader> New();
 
   /**
-   * @copydoc Toolkit::AsyncImageLoader::LoadAnimatedImage( Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex )
+   * @copydoc Toolkit::AsyncImageLoader::LoadAnimatedImage( Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
    */
-  uint32_t LoadAnimatedImage(Dali::AnimatedImageLoading animatedImageLoading,
-                             uint32_t                   frameIndex);
+  uint32_t LoadAnimatedImage(Dali::AnimatedImageLoading               animatedImageLoading,
+                             uint32_t                                 frameIndex,
+                             DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
 
   /**
-   * @copydoc Toolkit::AsyncImageLoader::Load( const std::string&, ImageDimensions, FittingMode::Type, SamplingMode::Type, bool , DevelAsyncImageLoader::PreMultiplyOnLoad )
+   * @brief Starts an animated image loading task.
+   * @param[in] asyncImageLoader The ayncImageLoader
+   * @param[in] animatedImageLoading The AnimatedImageLoading to load animated image
+   * @param[in] frameIndex The frame index of a frame to be loaded frame
+   * @param[in] dimensions The width and height to fit the loaded image to
+   * @param[in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter
+   * @param[in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size
+   * @param[in] preMultiplyOnLoad ON if the image color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   * @return The loading task id
+   */
+  uint32_t LoadAnimatedImage(Dali::AnimatedImageLoading               animatedImageLoading,
+                             uint32_t                                 frameIndex,
+                             Dali::ImageDimensions                    desiredSize,
+                             Dali::FittingMode::Type                  fittingMode,
+                             Dali::SamplingMode::Type                 samplingMode,
+                             DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
+
+  /**
+   * @brief Starts an image loading task.
+   * @param[in] url The URL of the image file to load
+   * @param[in] dimensions The width and height to fit the loaded image to
+   * @param[in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter
+   * @param[in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size
+   * @param[in] orientationCorrection Reorient the image to respect any orientation metadata in its header
+   * @param[in] preMultiplyOnLoad ON if the image color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   * @param[in] loadPlanes true to load image planes or false to load bitmap image.
+   * @return The loading task id
    */
   uint32_t Load(const VisualUrl&                         url,
                 ImageDimensions                          dimensions,
                 FittingMode::Type                        fittingMode,
                 SamplingMode::Type                       samplingMode,
                 bool                                     orientationCorrection,
-                DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
+                DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+                bool                                     loadPlanes);
 
   /**
    * @brief Starts an image loading task by encoded image buffer.
@@ -116,7 +158,7 @@ public:
   /**
    * Process the completed loading task from the worker thread.
    */
-  void ProcessLoadedImage();
+  void ProcessLoadedImage(LoadingTaskPtr task);
 
 protected:
   /**
@@ -125,12 +167,17 @@ protected:
   ~AsyncImageLoader() override;
 
 private:
+  /**
+   * Remove already completed tasks
+   */
+  void RemoveCompletedTask();
+
+private:
   Toolkit::AsyncImageLoader::ImageLoadedSignalType            mLoadedSignal;
   Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType mPixelBufferLoadedSignal;
-
-  ImageLoadThread mLoadThread;
-  uint32_t        mLoadTaskId;
-  bool            mIsLoadThreadStarted;
+  std::vector<AsyncImageLoadingInfo>                          mLoadingTasks;
+  std::vector<uint32_t>                                       mCompletedTaskIds;
+  uint32_t                                                    mLoadTaskId;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/image-loader/fast-track-loading-task.cpp b/dali-toolkit/internal/image-loader/fast-track-loading-task.cpp
new file mode 100644
index 0000000..1845ff7
--- /dev/null
+++ b/dali-toolkit/internal/image-loader/fast-track-loading-task.cpp
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/image-loader/fast-track-loading-task.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/adaptor-framework/texture-upload-manager.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/texture-integ.h>
+#include <dali/integration-api/trace.h>
+#include <dali/public-api/common/vector-wrapper.h>
+
+#ifdef TRACE_ENABLED
+#include <chrono>
+#include <iomanip>
+#include <sstream>
+#include <thread>
+#endif
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
+
+#ifdef TRACE_ENABLED
+uint64_t GetNanoseconds()
+{
+  // Get the time of a monotonic clock since its epoch.
+  auto epoch    = std::chrono::steady_clock::now().time_since_epoch();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(epoch);
+  return static_cast<uint64_t>(duration.count());
+}
+#endif
+
+constexpr uint32_t CHROMINANCE_U_INDEX = 1u;
+constexpr uint32_t CHROMINANCE_V_INDEX = 2u;
+
+Dali::PixelData GetDummyChrominanceUPixelData()
+{
+  static Dali::PixelData pixelDataU = PixelData::New(new uint8_t[2]{0x00, 0x00}, 2, 1, 2, Pixel::L8, PixelData::DELETE_ARRAY);
+  return pixelDataU;
+}
+
+Dali::PixelData GetDummyChrominanceVPixelData()
+{
+  static Dali::PixelData pixelDataV = PixelData::New(new uint8_t[2]{0x00, 0x00}, 2, 2, 1, Pixel::L8, PixelData::DELETE_ARRAY);
+  return pixelDataV;
+}
+
+} // namespace
+
+FastTrackLoadingTask::FastTrackLoadingTask(const VisualUrl& url, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad, bool loadPlanes, CallbackBase* callback)
+: AsyncTask(MakeCallback(this, &FastTrackLoadingTask::OnComplete), url.GetProtocolType() == VisualUrl::ProtocolType::REMOTE ? AsyncTask::PriorityType::LOW : AsyncTask::PriorityType::HIGH),
+  mUrl(url),
+  mTextures(),
+  mDimensions(dimensions),
+  mFittingMode(fittingMode),
+  mSamplingMode(samplingMode),
+  mPreMultiplyOnLoad(preMultiplyOnLoad),
+  mCallback(),
+  mTextureUploadManager(Dali::Devel::TextureUploadManager::Get()),
+  mImageInformations(),
+  mPixelData(),
+  mOrientationCorrection(orientationCorrection),
+  mLoadSuccess(false),
+  mLoadPlanesAvaliable(loadPlanes),
+  mPremultiplied(false),
+  mPlanesLoaded(false)
+{
+  mCallback = std::unique_ptr<CallbackBase>(callback);
+  PrepareTexture();
+}
+
+FastTrackLoadingTask::~FastTrackLoadingTask()
+{
+}
+
+void FastTrackLoadingTask::PrepareTexture()
+{
+  const uint32_t requiredTexturesCount = mLoadPlanesAvaliable ? 3u : 1u;
+
+  mTextures.resize(requiredTexturesCount);
+  mImageInformations.resize(requiredTexturesCount);
+  for(uint32_t index = 0u; index < requiredTexturesCount; ++index)
+  {
+    mTextures[index] = mTextureUploadManager.GenerateTexture2D();
+
+    mImageInformations[index].resourceId = Integration::GetTextureResourceId(mTextures[index]);
+  }
+
+  if(mLoadPlanesAvaliable)
+  {
+    // Create static dummy chrominance pixel data now, for thread safety.
+    [[maybe_unused]] auto pixelDataU = GetDummyChrominanceUPixelData();
+    [[maybe_unused]] auto pixelDataV = GetDummyChrominanceVPixelData();
+  }
+}
+
+void FastTrackLoadingTask::OnComplete(AsyncTaskPtr task)
+{
+  if(mLoadSuccess)
+  {
+    for(uint32_t index = 0u; index < mImageInformations.size(); ++index)
+    {
+      Dali::Integration::SetTextureSize(mTextures[index], Dali::ImageDimensions(mImageInformations[index].width, mImageInformations[index].height));
+      Dali::Integration::SetTexturePixelFormat(mTextures[index], mImageInformations[index].format);
+    }
+    if(mLoadPlanesAvaliable && !mPlanesLoaded)
+    {
+      // We will not use ChrominanceU and ChrominanceV texture anymore.
+      mTextures.resize(1u);
+    }
+  }
+  else
+  {
+    mTextures.clear();
+  }
+
+  if(mCallback)
+  {
+    CallbackBase::Execute(*mCallback, FastTrackLoadingTaskPtr(reinterpret_cast<FastTrackLoadingTask*>(task.Get())));
+  }
+}
+
+// Called by worker thread
+
+void FastTrackLoadingTask::Process()
+{
+  Load();
+  UploadToTexture();
+}
+
+bool FastTrackLoadingTask::IsReady()
+{
+  return true;
+}
+
+void FastTrackLoadingTask::Load()
+{
+#ifdef TRACE_ENABLED
+  uint64_t mStartTimeNanoSceonds = 0;
+  uint64_t mEndTimeNanoSceonds   = 0;
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mStartTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << "[u:" << mUrl.GetEllipsedUrl() << "]";
+    // DALI_TRACE_BEGIN(gTraceFilter, "DALI_IMAGE_FAST_TRACK_UPLOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("BEGIN: DALI_IMAGE_FAST_TRACK_UPLOADING_TASK %s", oss.str().c_str());
+  }
+#endif
+
+  Devel::PixelBuffer              pixelBuffer;
+  std::vector<Devel::PixelBuffer> pixelBuffers;
+
+  if(mUrl.IsValid() && mUrl.IsLocalResource())
+  {
+    if(mLoadPlanesAvaliable)
+    {
+      Dali::LoadImagePlanesFromFile(mUrl.GetUrl(), pixelBuffers, mDimensions, mFittingMode, mSamplingMode, mOrientationCorrection);
+    }
+    else
+    {
+      pixelBuffer = Dali::LoadImageFromFile(mUrl.GetUrl(), mDimensions, mFittingMode, mSamplingMode, mOrientationCorrection);
+    }
+  }
+  else if(mUrl.IsValid())
+  {
+    pixelBuffer = Dali::DownloadImageSynchronously(mUrl.GetUrl(), mDimensions, mFittingMode, mSamplingMode, mOrientationCorrection);
+  }
+
+  if(pixelBuffer)
+  {
+    pixelBuffers.emplace_back(std::move(pixelBuffer));
+  }
+
+  if(pixelBuffers.empty())
+  {
+    mLoadSuccess = false;
+    DALI_LOG_ERROR("FastTrackLoadingTask::Load: Loading is failed: ResourceId : %d url : [%s]\n", mImageInformations[0u].resourceId, mUrl.GetUrl().c_str());
+  }
+  else
+  {
+    mPixelData.resize(pixelBuffers.size());
+
+    mLoadSuccess = true;
+    MultiplyAlpha(pixelBuffers[0]);
+    uint32_t index = 0u;
+    for(auto&& pixelBuffer : pixelBuffers)
+    {
+      mPixelData[index++] = Dali::Devel::PixelBuffer::Convert(pixelBuffer);
+    }
+
+    if(pixelBuffers.size() > 1u)
+    {
+      mPlanesLoaded = true;
+    }
+    else if(mLoadPlanesAvaliable && pixelBuffers.size() == 1u && mTextures.size() == 3u) ///< Case when we prepare three textures to render YUV, but loaded image is not YUV.
+    {
+      // Dummy pixel data for fake shader that we don't use actual YUV format.
+      // To fake shader, let we use indivisual sizes of texture for U and V.
+      mPixelData.resize(3u);
+      mPixelData[CHROMINANCE_U_INDEX] = GetDummyChrominanceUPixelData();
+      mPixelData[CHROMINANCE_V_INDEX] = GetDummyChrominanceVPixelData();
+    }
+
+    if(DALI_UNLIKELY(mPixelData.size() != mImageInformations.size()))
+    {
+      DALI_LOG_ERROR("FastTrackLoadingTask::Load: Undefined case. pixelBuffers.size() : %zu, image size : %zu, ResourceId : %d, url : [%s]\n", pixelBuffers.size(), mImageInformations.size(), mImageInformations[0u].resourceId, mUrl.GetUrl().c_str());
+      mLoadSuccess = false;
+    }
+  }
+
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mEndTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << std::fixed << std::setprecision(3);
+    oss << "[";
+    oss << "d:" << static_cast<float>(mEndTimeNanoSceonds - mStartTimeNanoSceonds) / 1000000.0f << "ms ";
+    oss << "b:" << pixelBuffers.size() << " ";
+    if(!mPixelData.empty())
+    {
+      oss << "s:" << mPixelData[0].GetWidth() << "x" << mPixelData[0].GetHeight() << " ";
+      oss << "p:" << mPremultiplied << " ";
+    }
+    oss << "u:" << mUrl.GetEllipsedUrl() << "]";
+    // DALI_TRACE_END(gTraceFilter, "DALI_IMAGE_FAST_TRACK_UPLOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("END: DALI_IMAGE_FAST_TRACK_UPLOADING_TASK %s", oss.str().c_str());
+  }
+#endif
+}
+
+void FastTrackLoadingTask::MultiplyAlpha(Dali::Devel::PixelBuffer pixelBuffer)
+{
+  if(mPreMultiplyOnLoad == DevelAsyncImageLoader::PreMultiplyOnLoad::ON && Pixel::HasAlpha(pixelBuffer.GetPixelFormat()))
+  {
+    pixelBuffer.MultiplyColorByAlpha();
+    mPremultiplied = pixelBuffer.IsAlphaPreMultiplied();
+  }
+}
+
+void FastTrackLoadingTask::UploadToTexture()
+{
+  if(mLoadSuccess)
+  {
+    DALI_ASSERT_DEBUG(mPixelData.size() == mImageInformations.size());
+
+    uint32_t index = 0u;
+    for(auto&& pixelData : mPixelData)
+    {
+      mImageInformations[index].width  = pixelData.GetWidth();
+      mImageInformations[index].height = pixelData.GetHeight();
+      mImageInformations[index].format = pixelData.GetPixelFormat();
+
+      mTextureUploadManager.RequestUpload(mImageInformations[index].resourceId, pixelData);
+
+      pixelData.Reset();
+
+      ++index;
+    }
+  }
+
+  mPixelData.clear();
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/image-loader/fast-track-loading-task.h b/dali-toolkit/internal/image-loader/fast-track-loading-task.h
new file mode 100644
index 0000000..9bde308
--- /dev/null
+++ b/dali-toolkit/internal/image-loader/fast-track-loading-task.h
@@ -0,0 +1,163 @@
+#ifndef DALI_TOOLKIT_FAST_TRACK_IMAGE_LOADING_TASK_H
+#define DALI_TOOLKIT_FAST_TRACK_IMAGE_LOADING_TASK_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/devel-api/adaptor-framework/texture-upload-manager.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-type.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+class FastTrackLoadingTask;
+using FastTrackLoadingTaskPtr = IntrusivePtr<FastTrackLoadingTask>;
+
+/**
+ * @brief The task of loading image and uploading texture on fast track.
+ * It is available that upload the loaded image data on texture at image loader threads.
+ */
+class FastTrackLoadingTask : public AsyncTask
+{
+public:
+  /**
+   * @brief Constructor.
+   */
+  FastTrackLoadingTask(const VisualUrl&                         url,
+                       ImageDimensions                          dimensions,
+                       FittingMode::Type                        fittingMode,
+                       SamplingMode::Type                       samplingMode,
+                       bool                                     orientationCorrection,
+                       DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+                       bool                                     loadPlanes,
+                       CallbackBase*                            callback);
+
+  /**
+   * @brief Destructor.
+   */
+  ~FastTrackLoadingTask() override;
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "FastTrackLoadingTask";
+  }
+
+private:
+  // Undefined
+  FastTrackLoadingTask(const FastTrackLoadingTask& queue) = delete;
+  FastTrackLoadingTask& operator=(const FastTrackLoadingTask& queue) = delete;
+
+  /**
+   * @brief Create textures for this task.
+   * @note This should be called in construct timing.
+   */
+  void PrepareTexture();
+
+  /**
+   * @brief Load the image.
+   */
+  void Load();
+
+  /**
+   * @brief Multiply alpha if required.
+   *
+   * @param[in,out] pixelBuffer target pixel buffer that need to be multiplied alpha.
+   */
+  void MultiplyAlpha(Dali::Devel::PixelBuffer pixelBuffer);
+
+  /**
+   * @brief Upload loaded pixelBuffer into texture
+   */
+  void UploadToTexture();
+
+private:
+  /**
+   * @brief Complete callback.
+   *
+   * @param[in] task The pointer of task who call this callback.
+   */
+  void OnComplete(AsyncTaskPtr task);
+
+public:
+  VisualUrl                  mUrl;      ///< url of the image to load.
+  std::vector<Dali::Texture> mTextures; ///< textures for regular image.
+
+private:
+  ImageDimensions                          mDimensions;   ///< dimensions to load
+  FittingMode::Type                        mFittingMode;  ///< fitting options
+  SamplingMode::Type                       mSamplingMode; ///< sampling options
+  DevelAsyncImageLoader::PreMultiplyOnLoad mPreMultiplyOnLoad;
+  std::unique_ptr<CallbackBase>            mCallback;
+
+  // Texture Upload relative API
+  Dali::Devel::TextureUploadManager mTextureUploadManager;
+
+  // Note : mPixelData is invalid after upload requested. We should keep image size informations.
+  struct ImageInformation
+  {
+    uint32_t resourceId;
+
+    uint32_t      width;
+    uint32_t      height;
+    Pixel::Format format;
+  };
+  std::vector<ImageInformation> mImageInformations;
+
+  std::vector<Dali::PixelData> mPixelData;
+
+  bool mOrientationCorrection : 1; ///< If orientation correction is needed
+
+public:
+  bool mLoadSuccess : 1;         ///< Whether image load successed or not.
+  bool mLoadPlanesAvaliable : 1; ///< If image valid to load as planes or not.
+  bool mPremultiplied : 1;       ///< True if the image's color was multiplied by it's alpha
+  bool mPlanesLoaded : 1;        ///< True if the image load as planes.
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_FAST_TRACK_IMAGE_LOADING_TASK_H
diff --git a/dali-toolkit/internal/image-loader/image-atlas-impl.cpp b/dali-toolkit/internal/image-loader/image-atlas-impl.cpp
index 31c3351..2e86294 100644
--- a/dali-toolkit/internal/image-loader/image-atlas-impl.cpp
+++ b/dali-toolkit/internal/image-loader/image-atlas-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,6 @@ namespace Toolkit
 {
 namespace Internal
 {
-typedef unsigned char PixelBuffer;
-
 Texture ImageAtlas::PackToAtlas(const std::vector<PixelData>& pixelData, Dali::Vector<Vector4>& textureRects)
 {
   // Record each block size
@@ -68,7 +66,7 @@ Texture ImageAtlas::PackToAtlas(const std::vector<PixelData>& pixelData, Dali::V
 
     // Apply the half pixel correction to avoid the color bleeding between neighbour blocks
     textureRects[index].x = (static_cast<float>(packPositionX) + 0.5f) / atlasWidth;                                 // left
-    textureRects[index].y = (static_cast<float>(packPositionY) + 0.5f) / atlasHeight;                                // right
+    textureRects[index].y = (static_cast<float>(packPositionY) + 0.5f) / atlasHeight;                                // top
     textureRects[index].z = (static_cast<float>(packPositionX + pixelData[index].GetWidth()) - 0.5f) / atlasWidth;   // right
     textureRects[index].w = (static_cast<float>(packPositionY + pixelData[index].GetHeight()) - 0.5f) / atlasHeight; // bottom
   }
@@ -91,6 +89,12 @@ ImageAtlas::ImageAtlas(SizeType width, SizeType height, Pixel::Format pixelForma
 
 ImageAtlas::~ImageAtlas()
 {
+  if(mAsyncLoader)
+  {
+    mAsyncLoader.CancelAll();
+    mAsyncLoader.ImageLoadedSignal().Disconnect(this, &ImageAtlas::UploadToAtlas);
+  }
+
   const std::size_t count = mLoadingTaskInfoContainer.Count();
   for(std::size_t i = 0; i < count; ++i)
   {
@@ -158,15 +162,15 @@ bool ImageAtlas::Upload(Vector4&             textureRect,
     }
   }
 
-  unsigned int packPositionX = 0;
-  unsigned int packPositionY = 0;
+  uint32_t packPositionX = 0;
+  uint32_t packPositionY = 0;
   if(mPacker.Pack(dimensions.GetWidth(), dimensions.GetHeight(), packPositionX, packPositionY))
   {
-    unsigned short loadId = GetImplementation(mAsyncLoader).Load(url, size, fittingMode, SamplingMode::BOX_THEN_LINEAR, orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF);
+    uint32_t loadId = GetImplementation(mAsyncLoader).Load(url, size, fittingMode, SamplingMode::BOX_THEN_LINEAR, orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, false);
     mLoadingTaskInfoContainer.PushBack(new LoadingTaskInfo(loadId, packPositionX, packPositionY, dimensions.GetWidth(), dimensions.GetHeight(), atlasUploadObserver));
     // apply the half pixel correction
     textureRect.x = (static_cast<float>(packPositionX) + 0.5f) / mWidth;                      // left
-    textureRect.y = (static_cast<float>(packPositionY) + 0.5f) / mHeight;                     // right
+    textureRect.y = (static_cast<float>(packPositionY) + 0.5f) / mHeight;                     // top
     textureRect.z = (static_cast<float>(packPositionX + dimensions.GetX()) - 0.5f) / mWidth;  // right
     textureRect.w = (static_cast<float>(packPositionY + dimensions.GetY()) - 0.5f) / mHeight; // bottom
 
@@ -183,17 +187,67 @@ bool ImageAtlas::Upload(Vector4&             textureRect,
   return false;
 }
 
+bool ImageAtlas::Upload(Vector4&                  textureRect,
+                        const EncodedImageBuffer& encodedImageBuffer,
+                        ImageDimensions           size,
+                        FittingMode::Type         fittingMode,
+                        bool                      orientationCorrection,
+                        AtlasUploadObserver*      atlasUploadObserver)
+{
+  ImageDimensions zero;
+  if(size == zero) // image size not provided
+  {
+    DALI_LOG_ERROR("Desired size is zero! We need to setup desired size for Atlas.\n");
+    // EncodedImageBuffer didn't support to get closest image size.
+    // Just draw broken image.
+    if(!mBrokenImageUrl.empty())
+    {
+      return Upload(textureRect, mBrokenImageUrl, mBrokenImageSize, FittingMode::DEFAULT, true, atlasUploadObserver);
+    }
+    else
+    {
+      textureRect = Vector4::ZERO;
+      return true;
+    }
+  }
+
+  uint32_t packPositionX = 0;
+  uint32_t packPositionY = 0;
+  if(mPacker.Pack(size.GetWidth(), size.GetHeight(), packPositionX, packPositionY))
+  {
+    uint32_t loadId = GetImplementation(mAsyncLoader).LoadEncodedImageBuffer(encodedImageBuffer, size, fittingMode, SamplingMode::BOX_THEN_LINEAR, orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF);
+    mLoadingTaskInfoContainer.PushBack(new LoadingTaskInfo(loadId, packPositionX, packPositionY, size.GetWidth(), size.GetHeight(), atlasUploadObserver));
+
+    // apply the half pixel correction
+    textureRect.x = (static_cast<float>(packPositionX) + 0.5f) / mWidth;                // left
+    textureRect.y = (static_cast<float>(packPositionY) + 0.5f) / mHeight;               // top
+    textureRect.z = (static_cast<float>(packPositionX + size.GetX()) - 0.5f) / mWidth;  // right
+    textureRect.w = (static_cast<float>(packPositionY + size.GetY()) - 0.5f) / mHeight; // bottom
+
+    if(atlasUploadObserver)
+    {
+      // register to the observer,
+      // Not that a matching unregister call should be invoked in UploadToAtlas if the observer is still alive by then.
+      atlasUploadObserver->Register(*this);
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
 bool ImageAtlas::Upload(Vector4& textureRect, PixelData pixelData)
 {
-  unsigned int packPositionX = 0;
-  unsigned int packPositionY = 0;
+  uint32_t packPositionX = 0;
+  uint32_t packPositionY = 0;
   if(mPacker.Pack(pixelData.GetWidth(), pixelData.GetHeight(), packPositionX, packPositionY))
   {
     mAtlas.Upload(pixelData, 0u, 0u, packPositionX, packPositionY, pixelData.GetWidth(), pixelData.GetHeight());
 
     // apply the half pixel correction
     textureRect.x = (static_cast<float>(packPositionX) + 0.5f) / mWidth;                          // left
-    textureRect.y = (static_cast<float>(packPositionY) + 0.5f) / mHeight;                         // right
+    textureRect.y = (static_cast<float>(packPositionY) + 0.5f) / mHeight;                         // top
     textureRect.z = (static_cast<float>(packPositionX + pixelData.GetWidth()) - 0.5f) / mWidth;   // right
     textureRect.w = (static_cast<float>(packPositionY + pixelData.GetHeight()) - 0.5f) / mHeight; // bottom
 
@@ -226,41 +280,46 @@ void ImageAtlas::ObserverDestroyed(AtlasUploadObserver* observer)
 
 void ImageAtlas::UploadToAtlas(uint32_t id, PixelData pixelData)
 {
-  if(mLoadingTaskInfoContainer[0]->loadTaskId == id)
+  auto end = mLoadingTaskInfoContainer.End();
+  for(auto loadingTaskIterator = mLoadingTaskInfoContainer.Begin(); loadingTaskIterator != end; ++loadingTaskIterator)
   {
-    Rect<unsigned int> packRect(mLoadingTaskInfoContainer[0]->packRect);
-    if(!pixelData || (pixelData.GetWidth() == 0 && pixelData.GetHeight() == 0))
+    if((*loadingTaskIterator) && (*loadingTaskIterator)->loadTaskId == id)
     {
-      if(!mBrokenImageUrl.empty()) // replace with the broken image
+      Rect<uint32_t> packRect((*loadingTaskIterator)->packRect);
+      if(!pixelData || (pixelData.GetWidth() == 0 && pixelData.GetHeight() == 0))
       {
-        UploadBrokenImage(packRect);
+        if(!mBrokenImageUrl.empty()) // replace with the broken image
+        {
+          UploadBrokenImage(packRect);
+        }
       }
-    }
-    else
-    {
-      if(pixelData.GetWidth() < packRect.width || pixelData.GetHeight() < packRect.height)
+      else
       {
-        DALI_LOG_ERROR("Can not upscale the image from actual loaded size [ %d, %d ] to specified size [ %d, %d ]\n",
-                       pixelData.GetWidth(),
-                       pixelData.GetHeight(),
-                       packRect.width,
-                       packRect.height);
+        if(pixelData.GetWidth() < packRect.width || pixelData.GetHeight() < packRect.height)
+        {
+          DALI_LOG_ERROR("Can not upscale the image from actual loaded size [ %d, %d ] to specified size [ %d, %d ]\n",
+                        pixelData.GetWidth(),
+                        pixelData.GetHeight(),
+                        packRect.width,
+                        packRect.height);
+        }
+
+        mAtlas.Upload(pixelData, 0u, 0u, packRect.x, packRect.y, packRect.width, packRect.height);
       }
 
-      mAtlas.Upload(pixelData, 0u, 0u, packRect.x, packRect.y, packRect.width, packRect.height);
-    }
+      if((*loadingTaskIterator)->observer)
+      {
+        (*loadingTaskIterator)->observer->UploadCompleted();
+        (*loadingTaskIterator)->observer->Unregister(*this);
+      }
 
-    if(mLoadingTaskInfoContainer[0]->observer)
-    {
-      mLoadingTaskInfoContainer[0]->observer->UploadCompleted();
-      mLoadingTaskInfoContainer[0]->observer->Unregister(*this);
+      mLoadingTaskInfoContainer.Erase(loadingTaskIterator);
+      break;
     }
-
-    mLoadingTaskInfoContainer.Erase(mLoadingTaskInfoContainer.Begin());
   }
 }
 
-void ImageAtlas::UploadBrokenImage(const Rect<unsigned int>& area)
+void ImageAtlas::UploadBrokenImage(const Rect<uint32_t>& area)
 {
   Devel::PixelBuffer brokenBuffer = LoadImageFromFile(mBrokenImageUrl, ImageDimensions(area.width, area.height));
   SizeType           loadedWidth  = brokenBuffer.GetWidth();
diff --git a/dali-toolkit/internal/image-loader/image-atlas-impl.h b/dali-toolkit/internal/image-loader/image-atlas-impl.h
index eab1551..e302d92 100644
--- a/dali-toolkit/internal/image-loader/image-atlas-impl.h
+++ b/dali-toolkit/internal/image-loader/image-atlas-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/common/owner-container.h>
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/signals/connection-tracker.h>
@@ -26,8 +27,8 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/image-loader/image-atlas.h>
 #include <dali-toolkit/internal/image-loader/atlas-packer.h>
-#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
+#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
 
 namespace Dali
 {
@@ -86,6 +87,32 @@ public:
               AtlasUploadObserver* atlasUploadObserver);
 
   /**
+   * @brief Upload a resource image to the atlas by encoded buffer.
+   *
+   * @note To make the atlasing efficient, a valid size should be provided.
+   *       If size is not provided, then SegFault occured.
+   *       Do not set a size that is bigger than the actual image size, as the up-scaling is not available,
+   *       the content of the area not covered by actual image is undefined, it will not be cleared.
+   *
+   * SamplingMode::BOX_THEN_LINEAR is used to sampling pixels from the input image while fitting it to desired size.
+   *
+   * @param [out] textureRect The texture area of the resource image in the atlas.
+   * @param [in] encodedImageBuffer The encoded raw buffer of the resource image file to use.
+   * @param [in] size The width and height to fit the loaded image to.
+   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
+   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
+   * @param [in] atlasUploadObserver The observer to observe the upload state inside the ImageAtlas.
+   * @return True if there is enough space to fit this image in,false otherwise.
+   * @note The valid callback function here is required to have the signature of void( void ).
+   */
+  bool Upload(Vector4&                  textureRect,
+              const EncodedImageBuffer& encodedImageBuffer,
+              ImageDimensions           size,
+              FittingMode::Type         fittingMode,
+              bool                      orientationCorrection,
+              AtlasUploadObserver*      atlasUploadObserver);
+
+  /**
    * @copydoc Toolkit::ImageAtlas::Upload( Vector4&, PixelData )
    */
   bool Upload(Vector4& textureRect, PixelData pixelData);
@@ -117,7 +144,7 @@ private:
    *
    * @param[in] area The pixel area for uploading.
    */
-  void UploadBrokenImage(const Rect<unsigned int>& area);
+  void UploadBrokenImage(const Rect<uint32_t>& area);
 
   // Undefined
   ImageAtlas(const ImageAtlas& imageAtlas);
@@ -132,11 +159,11 @@ private:
    */
   struct LoadingTaskInfo
   {
-    LoadingTaskInfo(unsigned short       loadTaskId,
-                    unsigned int         packPositionX,
-                    unsigned int         packPositionY,
-                    unsigned int         width,
-                    unsigned int         height,
+    LoadingTaskInfo(uint32_t             loadTaskId,
+                    uint32_t             packPositionX,
+                    uint32_t             packPositionY,
+                    uint32_t             width,
+                    uint32_t             height,
                     AtlasUploadObserver* observer)
     : loadTaskId(loadTaskId),
       packRect(packPositionX, packPositionY, width, height),
@@ -144,8 +171,8 @@ private:
     {
     }
 
-    unsigned short       loadTaskId;
-    Rect<unsigned int>   packRect;
+    uint32_t             loadTaskId;
+    Rect<uint32_t>       packRect;
     AtlasUploadObserver* observer;
   };
 
diff --git a/dali-toolkit/internal/image-loader/image-load-thread.cpp b/dali-toolkit/internal/image-loader/image-load-thread.cpp
deleted file mode 100644
index 43b0707..0000000
--- a/dali-toolkit/internal/image-loader/image-load-thread.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "image-load-thread.h"
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
-#include <dali/devel-api/adaptor-framework/image-loading.h>
-#include <dali/devel-api/adaptor-framework/thread-settings.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-#include <dali/integration-api/debug.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-LoadingTask::LoadingTask(uint32_t id, Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex)
-: pixelBuffer(),
-  url(),
-  encodedImageBuffer(),
-  id(id),
-  dimensions(),
-  fittingMode(),
-  samplingMode(),
-  orientationCorrection(),
-  preMultiplyOnLoad(DevelAsyncImageLoader::PreMultiplyOnLoad::OFF),
-  isMaskTask(false),
-  maskPixelBuffer(),
-  contentScale(1.0f),
-  cropToMask(false),
-  animatedImageLoading(animatedImageLoading),
-  frameIndex(frameIndex)
-{
-}
-
-LoadingTask::LoadingTask(uint32_t id, const VisualUrl& url, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
-: pixelBuffer(),
-  url(url),
-  encodedImageBuffer(),
-  id(id),
-  dimensions(dimensions),
-  fittingMode(fittingMode),
-  samplingMode(samplingMode),
-  orientationCorrection(orientationCorrection),
-  preMultiplyOnLoad(preMultiplyOnLoad),
-  isMaskTask(false),
-  maskPixelBuffer(),
-  contentScale(1.0f),
-  cropToMask(false),
-  animatedImageLoading(),
-  frameIndex(0u)
-{
-}
-
-LoadingTask::LoadingTask(uint32_t id, const EncodedImageBuffer& encodedImageBuffer, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
-: pixelBuffer(),
-  url(),
-  encodedImageBuffer(encodedImageBuffer),
-  id(id),
-  dimensions(dimensions),
-  fittingMode(fittingMode),
-  samplingMode(samplingMode),
-  orientationCorrection(orientationCorrection),
-  preMultiplyOnLoad(preMultiplyOnLoad),
-  isMaskTask(false),
-  maskPixelBuffer(),
-  contentScale(1.0f),
-  cropToMask(false),
-  animatedImageLoading(),
-  frameIndex(0u)
-{
-}
-
-LoadingTask::LoadingTask(uint32_t id, Devel::PixelBuffer pixelBuffer, Devel::PixelBuffer maskPixelBuffer, float contentScale, bool cropToMask, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
-: pixelBuffer(pixelBuffer),
-  url(""),
-  encodedImageBuffer(),
-  id(id),
-  dimensions(),
-  fittingMode(),
-  samplingMode(),
-  orientationCorrection(),
-  preMultiplyOnLoad(preMultiplyOnLoad),
-  isMaskTask(true),
-  maskPixelBuffer(maskPixelBuffer),
-  contentScale(contentScale),
-  cropToMask(cropToMask),
-  animatedImageLoading(),
-  frameIndex(0u)
-{
-}
-
-void LoadingTask::Load()
-{
-  if(animatedImageLoading)
-  {
-    pixelBuffer = animatedImageLoading.LoadFrame(frameIndex);
-  }
-  else if(encodedImageBuffer)
-  {
-    pixelBuffer = Dali::LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), dimensions, fittingMode, samplingMode, orientationCorrection);
-  }
-  else if(url.IsValid() && url.IsLocalResource())
-  {
-    pixelBuffer = Dali::LoadImageFromFile(url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection);
-  }
-  else if(url.IsValid())
-  {
-    pixelBuffer = Dali::DownloadImageSynchronously(url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection);
-  }
-
-  if(!pixelBuffer)
-  {
-    DALI_LOG_ERROR("LoadingTask::Load: Loading is failed: %s\n", url.GetUrl().c_str());
-  }
-}
-
-void LoadingTask::ApplyMask()
-{
-  pixelBuffer.ApplyMask(maskPixelBuffer, contentScale, cropToMask);
-}
-
-void LoadingTask::MultiplyAlpha()
-{
-  if(pixelBuffer && Pixel::HasAlpha(pixelBuffer.GetPixelFormat()))
-  {
-    if(preMultiplyOnLoad == DevelAsyncImageLoader::PreMultiplyOnLoad::ON)
-    {
-      pixelBuffer.MultiplyColorByAlpha();
-    }
-  }
-}
-
-ImageLoadThread::ImageLoadThread(EventThreadCallback* trigger)
-: mTrigger(trigger),
-  mLogFactory(Dali::Adaptor::Get().GetLogFactory())
-{
-}
-
-ImageLoadThread::~ImageLoadThread()
-{
-  // add an empty task would stop the thread from conditional wait.
-  AddTask(NULL);
-  // stop the thread
-  Join();
-
-  delete mTrigger;
-
-  for(auto&& iter : mLoadQueue)
-  {
-    delete iter;
-  }
-  mLoadQueue.Clear();
-
-  for(auto&& iter : mCompleteQueue)
-  {
-    delete iter;
-  }
-  mCompleteQueue.Clear();
-}
-
-void ImageLoadThread::Run()
-{
-  SetThreadName("ImageLoadThread");
-  mLogFactory.InstallLogFunction();
-
-  while(LoadingTask* task = NextTaskToProcess())
-  {
-    if(!task->isMaskTask)
-    {
-      task->Load();
-    }
-    else
-    {
-      task->ApplyMask();
-    }
-    task->MultiplyAlpha();
-
-    AddCompletedTask(task);
-  }
-}
-
-void ImageLoadThread::AddTask(LoadingTask* task)
-{
-  bool wasEmpty = false;
-  {
-    // Lock while adding task to the queue
-    ConditionalWait::ScopedLock lock(mConditionalWait);
-    wasEmpty = mLoadQueue.Empty();
-    mLoadQueue.PushBack(task);
-  }
-
-  if(wasEmpty)
-  {
-    // wake up the image loading thread
-    mConditionalWait.Notify();
-  }
-}
-
-LoadingTask* ImageLoadThread::NextCompletedTask()
-{
-  // Lock while popping task out from the queue
-  Mutex::ScopedLock lock(mMutex);
-
-  if(mCompleteQueue.Empty())
-  {
-    return NULL;
-  }
-
-  Vector<LoadingTask*>::Iterator next     = mCompleteQueue.Begin();
-  LoadingTask*                   nextTask = *next;
-  mCompleteQueue.Erase(next);
-
-  return nextTask;
-}
-
-bool ImageLoadThread::CancelTask(uint32_t loadingTaskId)
-{
-  // Lock while remove task from the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
-  for(Vector<LoadingTask*>::Iterator iter = mLoadQueue.Begin(); iter != mLoadQueue.End(); ++iter)
-  {
-    if((*iter)->id == loadingTaskId)
-    {
-      delete(*iter);
-      mLoadQueue.Erase(iter);
-      return true;
-    }
-  }
-
-  return false;
-}
-
-void ImageLoadThread::CancelAll()
-{
-  // Lock while remove task from the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
-  for(Vector<LoadingTask*>::Iterator iter = mLoadQueue.Begin(); iter != mLoadQueue.End(); ++iter)
-  {
-    delete(*iter);
-  }
-  mLoadQueue.Clear();
-}
-
-LoadingTask* ImageLoadThread::NextTaskToProcess()
-{
-  // Lock while popping task out from the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
-  while(mLoadQueue.Empty())
-  {
-    mConditionalWait.Wait(lock);
-  }
-
-  Vector<LoadingTask*>::Iterator next     = mLoadQueue.Begin();
-  LoadingTask*                   nextTask = *next;
-  mLoadQueue.Erase(next);
-
-  return nextTask;
-}
-
-void ImageLoadThread::AddCompletedTask(LoadingTask* task)
-{
-  // Lock while adding task to the queue
-  Mutex::ScopedLock lock(mMutex);
-  mCompleteQueue.PushBack(task);
-
-  // wake up the main thread
-  mTrigger->Trigger();
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/image-loader/image-load-thread.h b/dali-toolkit/internal/image-loader/image-load-thread.h
deleted file mode 100644
index 95ec260..0000000
--- a/dali-toolkit/internal/image-loader/image-load-thread.h
+++ /dev/null
@@ -1,238 +0,0 @@
-#ifndef DALI_TOOLKIT_IMAGE_LOAD_THREAD_H
-#define DALI_TOOLKIT_IMAGE_LOAD_THREAD_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
-#include <dali-toolkit/internal/visuals/visual-url.h>
-#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <dali/devel-api/threading/conditional-wait.h>
-#include <dali/devel-api/threading/mutex.h>
-#include <dali/devel-api/threading/thread.h>
-#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
-#include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/images/image-operations.h>
-#include <dali/public-api/object/ref-object.h>
-#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-/**
- * The task of loading and packing an image into the atlas.
- */
-struct LoadingTask
-{
-  /**
-   * Constructor.
-   * @param [in] id of the task
-   * @param [in] animatedImageLoading The AnimatedImageLoading to load animated image
-   * @param [in] frameIndex The frame index of a frame to be loaded frame
-   */
-  LoadingTask(uint32_t                   id,
-              Dali::AnimatedImageLoading animatedImageLoading,
-              uint32_t                   frameIndex);
-
-  /**
-   * Constructor.
-   * @param [in] id of the task
-   * @param [in] url The URL of the image file to load.
-   * @param [in] size The width and height to fit the loaded image to, 0.0 means whole image
-   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
-   * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
-   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
-   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
-   */
-  LoadingTask(uint32_t                                 id,
-              const VisualUrl&                         url,
-              ImageDimensions                          dimensions,
-              FittingMode::Type                        fittingMode,
-              SamplingMode::Type                       samplingMode,
-              bool                                     orientationCorrection,
-              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
-
-  /**
-   * Constructor.
-   * @param [in] id of the task
-   * @param [in] encodedImageBuffer The encoded buffer of the image to load.
-   * @param [in] size The width and height to fit the loaded image to, 0.0 means whole image
-   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
-   * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
-   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
-   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
-   */
-  LoadingTask(uint32_t                                 id,
-              const EncodedImageBuffer&                encodedImageBuffer,
-              ImageDimensions                          dimensions,
-              FittingMode::Type                        fittingMode,
-              SamplingMode::Type                       samplingMode,
-              bool                                     orientationCorrection,
-              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
-
-  /**
-   * Constructor.
-   * @param [in] id of the task
-   * @param [in] pixelBuffer of the to be masked image
-   * @param [in] maskPixelBuffer of the mask image
-   * @param [in] contentScale The factor to scale the content
-   * @param [in] cropToMask Whether to crop the content to the mask size
-   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha.
-   */
-  LoadingTask(uint32_t                                 id,
-              Devel::PixelBuffer                       pixelBuffer,
-              Devel::PixelBuffer                       maskPixelBuffer,
-              float                                    contentScale,
-              bool                                     cropToMask,
-              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
-
-  /**
-   * Load the image
-   */
-  void Load();
-
-  /**
-   * Apply mask
-   */
-  void ApplyMask();
-
-  /**
-   * Multiply alpha
-   */
-  void MultiplyAlpha();
-
-private:
-  // Undefined
-  LoadingTask(const LoadingTask& queue);
-
-  // Undefined
-  LoadingTask& operator=(const LoadingTask& queue);
-
-public:
-  Devel::PixelBuffer pixelBuffer;                                     ///< pixelBuffer handle after successful load
-                                                                      ///< or pixelBuffer to be masked image in the mask task
-  VisualUrl                                url;                       ///< url of the image to load
-  EncodedImageBuffer                       encodedImageBuffer;        ///< encoded buffer of the image to load
-  uint32_t                                 id;                        ///< The unique id associated with this task.
-  ImageDimensions                          dimensions;                ///< dimensions to load
-  FittingMode::Type                        fittingMode;               ///< fitting options
-  SamplingMode::Type                       samplingMode;              ///< sampling options
-  bool                                     orientationCorrection : 1; ///< if orientation correction is needed
-  DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad;         //< if the image's color should be multiplied by it's alpha
-
-  bool                       isMaskTask;      ///< whether this task is for mask or not
-  Devel::PixelBuffer         maskPixelBuffer; ///< pixelBuffer of mask image
-  float                      contentScale;    ///< The factor to scale the content
-  bool                       cropToMask;      ///< Whether to crop the content to the mask size
-  Dali::AnimatedImageLoading animatedImageLoading;
-  uint32_t                   frameIndex;
-};
-
-/**
- * The worker thread for image loading.
- */
-class ImageLoadThread : public Thread
-{
-public:
-  /**
-   * Constructor.
-   *
-   * @param[in] mTrigger The trigger to wake up the main thread.
-   */
-  ImageLoadThread(EventThreadCallback* mTrigger);
-
-  /**
-   * Destructor.
-   */
-  ~ImageLoadThread() override;
-
-  /**
-   * Add a task in to the loading queue
-   *
-   * @param[in] task The task added to the queue.
-   *
-   * @note This class takes ownership of the task object
-   */
-  void AddTask(LoadingTask* task);
-
-  /**
-   * Pop the next task out from the completed queue.
-   *
-   * @return The next task to be processed.
-   */
-  LoadingTask* NextCompletedTask();
-
-  /**
-   * Remove the loading task from the waiting queue.
-   */
-  bool CancelTask(uint32_t loadingTaskId);
-
-  /**
-   * Remove all the loading tasks in the waiting queue.
-   */
-  void CancelAll();
-
-private:
-  /**
-   * Pop the next loading task out from the queue to process.
-   *
-   * @return The next task to be processed.
-   */
-  LoadingTask* NextTaskToProcess();
-
-  /**
-   * Add a task in to the loading queue
-   *
-   * @param[in] task The task added to the queue.
-   */
-  void AddCompletedTask(LoadingTask* task);
-
-protected:
-  /**
-   * The entry function of the worker thread.
-   * It fetches loading task from the loadQueue, loads the image and adds to the completeQueue.
-   */
-  void Run() override;
-
-private:
-  // Undefined
-  ImageLoadThread(const ImageLoadThread& thread);
-
-  // Undefined
-  ImageLoadThread& operator=(const ImageLoadThread& thread);
-
-private:
-  Vector<LoadingTask*>             mLoadQueue;     ///<The task queue with images for loading.
-  Vector<LoadingTask*>             mCompleteQueue; ///<The task queue with images loaded.
-  EventThreadCallback*             mTrigger;
-  const Dali::LogFactoryInterface& mLogFactory; ///< The log factory
-
-  ConditionalWait mConditionalWait;
-  Dali::Mutex     mMutex;
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_IMAGE_LOAD_THREAD_H
diff --git a/dali-toolkit/internal/image-loader/image-url-impl.cpp b/dali-toolkit/internal/image-loader/image-url-impl.cpp
index 52ba6c4..31dc6fc 100644
--- a/dali-toolkit/internal/image-loader/image-url-impl.cpp
+++ b/dali-toolkit/internal/image-loader/image-url-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali
@@ -30,9 +30,9 @@ namespace Toolkit
 {
 namespace Internal
 {
-ImageUrl::ImageUrl(Texture& texture)
+ImageUrl::ImageUrl(Texture& texture, bool preMultiplied)
 {
-  mUrl = Dali::Toolkit::TextureManager::AddTexture(texture);
+  mUrl = Dali::Toolkit::TextureManager::AddTexture(texture, preMultiplied);
 }
 
 ImageUrl::ImageUrl(const EncodedImageBuffer& encodedImageBuffer)
@@ -42,7 +42,7 @@ ImageUrl::ImageUrl(const EncodedImageBuffer& encodedImageBuffer)
   if(visualFactory)
   {
     auto& textureManager = GetImplementation(visualFactory).GetTextureManager();
-    mUrl = textureManager.AddExternalEncodedImageBuffer(encodedImageBuffer);
+    mUrl                 = textureManager.AddEncodedImageBuffer(encodedImageBuffer);
   }
 }
 
@@ -60,15 +60,15 @@ ImageUrl::~ImageUrl()
       }
       else if(VisualUrl::BUFFER == VisualUrl::GetProtocolType(mUrl))
       {
-        textureManager.RemoveExternalEncodedImageBuffer(mUrl);
+        textureManager.RemoveEncodedImageBuffer(mUrl);
       }
     }
   }
 }
 
-ImageUrlPtr ImageUrl::New(Texture& texture)
+ImageUrlPtr ImageUrl::New(Texture& texture, bool preMultiplied)
 {
-  ImageUrlPtr imageUrlPtr = new ImageUrl(texture);
+  ImageUrlPtr imageUrlPtr = new ImageUrl(texture, preMultiplied);
   return imageUrlPtr;
 }
 
diff --git a/dali-toolkit/internal/image-loader/image-url-impl.h b/dali-toolkit/internal/image-loader/image-url-impl.h
index 99616bf..f7ae8ef 100644
--- a/dali-toolkit/internal/image-loader/image-url-impl.h
+++ b/dali-toolkit/internal/image-loader/image-url-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_IMAGE_URL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public:
   /**
    * @brief Constructor.
    */
-  ImageUrl(Texture& texture);
+  ImageUrl(Texture& texture, bool preMultiplied);
 
   /**
    * @brief Constructor.
@@ -51,7 +51,7 @@ public:
   /**
    * @copydoc Dali::Toolkit::ImageUrl::New
    */
-  static ImageUrlPtr New(Texture& texture);
+  static ImageUrlPtr New(Texture& texture, bool preMultiplied);
 
   /**
    * @copydoc Dali::Toolkit::ImageUrl::New
diff --git a/dali-toolkit/internal/image-loader/loading-task.cpp b/dali-toolkit/internal/image-loader/loading-task.cpp
new file mode 100644
index 0000000..5cbd16b
--- /dev/null
+++ b/dali-toolkit/internal/image-loader/loading-task.cpp
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/image-loader/loading-task.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/adaptor-framework/thread-settings.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
+
+#ifdef TRACE_ENABLED
+#include <chrono>
+#include <iomanip>
+#include <sstream>
+#include <thread>
+#endif
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
+
+#ifdef TRACE_ENABLED
+uint64_t GetNanoseconds()
+{
+  // Get the time of a monotonic clock since its epoch.
+  auto epoch    = std::chrono::steady_clock::now().time_since_epoch();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(epoch);
+  return static_cast<uint64_t>(duration.count());
+}
+#endif
+} // namespace
+
+LoadingTask::LoadingTask(uint32_t id, Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad, CallbackBase* callback)
+: AsyncTask(callback),
+  url(),
+  encodedImageBuffer(),
+  id(id),
+  textureId(TextureManagerType::INVALID_TEXTURE_ID),
+  dimensions(),
+  fittingMode(FittingMode::SCALE_TO_FILL),
+  samplingMode(SamplingMode::BOX_THEN_LINEAR),
+  preMultiplyOnLoad(preMultiplyOnLoad),
+  maskPixelBuffer(),
+  contentScale(1.0f),
+  animatedImageLoading(animatedImageLoading),
+  frameIndex(frameIndex),
+  orientationCorrection(),
+  isMaskTask(false),
+  cropToMask(false),
+  loadPlanes(false),
+  isReady(true)
+{
+}
+
+LoadingTask::LoadingTask(uint32_t id, Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad, CallbackBase* callback)
+: AsyncTask(callback),
+  url(),
+  encodedImageBuffer(),
+  id(id),
+  textureId(TextureManagerType::INVALID_TEXTURE_ID),
+  dimensions(dimensions),
+  fittingMode(fittingMode),
+  samplingMode(samplingMode),
+  preMultiplyOnLoad(preMultiplyOnLoad),
+  maskPixelBuffer(),
+  contentScale(1.0f),
+  animatedImageLoading(animatedImageLoading),
+  frameIndex(frameIndex),
+  orientationCorrection(),
+  isMaskTask(false),
+  cropToMask(false),
+  loadPlanes(false),
+  isReady(true)
+{
+}
+
+LoadingTask::LoadingTask(uint32_t id, const VisualUrl& url, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad, bool loadPlanes, CallbackBase* callback)
+: AsyncTask(callback, url.GetProtocolType() == VisualUrl::ProtocolType::REMOTE ? AsyncTask::PriorityType::LOW : AsyncTask::PriorityType::HIGH),
+  url(url),
+  encodedImageBuffer(),
+  id(id),
+  textureId(TextureManagerType::INVALID_TEXTURE_ID),
+  dimensions(dimensions),
+  fittingMode(fittingMode),
+  samplingMode(samplingMode),
+  preMultiplyOnLoad(preMultiplyOnLoad),
+  maskPixelBuffer(),
+  contentScale(1.0f),
+  animatedImageLoading(),
+  frameIndex(0u),
+  orientationCorrection(orientationCorrection),
+  isMaskTask(false),
+  cropToMask(false),
+  loadPlanes(loadPlanes),
+  isReady(true)
+{
+}
+
+LoadingTask::LoadingTask(uint32_t id, const EncodedImageBuffer& encodedImageBuffer, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad, CallbackBase* callback)
+: AsyncTask(callback),
+  url(),
+  encodedImageBuffer(encodedImageBuffer),
+  id(id),
+  textureId(TextureManagerType::INVALID_TEXTURE_ID),
+  dimensions(dimensions),
+  fittingMode(fittingMode),
+  samplingMode(samplingMode),
+  preMultiplyOnLoad(preMultiplyOnLoad),
+  maskPixelBuffer(),
+  contentScale(1.0f),
+  animatedImageLoading(),
+  frameIndex(0u),
+  orientationCorrection(orientationCorrection),
+  isMaskTask(false),
+  cropToMask(false),
+  loadPlanes(false),
+  isReady(true)
+{
+}
+
+LoadingTask::LoadingTask(uint32_t id, Devel::PixelBuffer pixelBuffer, Devel::PixelBuffer maskPixelBuffer, float contentScale, bool cropToMask, DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad, CallbackBase* callback)
+: AsyncTask(callback),
+  url(""),
+  encodedImageBuffer(),
+  id(id),
+  textureId(TextureManagerType::INVALID_TEXTURE_ID),
+  dimensions(),
+  fittingMode(),
+  samplingMode(),
+  preMultiplyOnLoad(preMultiplyOnLoad),
+  maskPixelBuffer(maskPixelBuffer),
+  contentScale(contentScale),
+  animatedImageLoading(),
+  frameIndex(0u),
+  orientationCorrection(),
+  isMaskTask(true),
+  cropToMask(cropToMask),
+  loadPlanes(false),
+  isReady(true)
+{
+  pixelBuffers.push_back(pixelBuffer);
+}
+
+LoadingTask::~LoadingTask()
+{
+}
+
+void LoadingTask::Process()
+{
+#ifdef TRACE_ENABLED
+  uint64_t mStartTimeNanoSceonds = 0;
+  uint64_t mEndTimeNanoSceonds   = 0;
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mStartTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << "[u:" << (!!(animatedImageLoading) ? animatedImageLoading.GetUrl() : url.GetEllipsedUrl()) << "]";
+    // DALI_TRACE_BEGIN(gTraceFilter, "DALI_IMAGE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("BEGIN: DALI_IMAGE_LOADING_TASK %s", oss.str().c_str());
+  }
+#endif
+
+  isReady = false;
+  if(!isMaskTask)
+  {
+    Load();
+  }
+  else
+  {
+    ApplyMask();
+  }
+  MultiplyAlpha();
+  isReady = true;
+
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mEndTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << std::fixed << std::setprecision(3);
+    oss << "[";
+    oss << "d:" << static_cast<float>(mEndTimeNanoSceonds - mStartTimeNanoSceonds) / 1000000.0f << "ms ";
+    oss << "m:" << isMaskTask << " ";
+    oss << "i:" << frameIndex << " ";
+    oss << "b:" << pixelBuffers.size() << " ";
+    if(!pixelBuffers.empty())
+    {
+      oss << "s:" << pixelBuffers[0].GetWidth() << "x" << pixelBuffers[0].GetHeight() << " ";
+      oss << "p:" << pixelBuffers[0].IsAlphaPreMultiplied() << " ";
+    }
+    oss << "u:" << (!!(animatedImageLoading) ? animatedImageLoading.GetUrl() : url.GetEllipsedUrl()) << "]";
+    // DALI_TRACE_END(gTraceFilter, "DALI_IMAGE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("END: DALI_IMAGE_LOADING_TASK %s", oss.str().c_str());
+  }
+#endif
+}
+
+bool LoadingTask::IsReady()
+{
+  return isReady;
+}
+
+void LoadingTask::Load()
+{
+  Devel::PixelBuffer pixelBuffer;
+  if(animatedImageLoading)
+  {
+    pixelBuffer = animatedImageLoading.LoadFrame(frameIndex, dimensions, fittingMode, samplingMode);
+  }
+  else if(encodedImageBuffer)
+  {
+    pixelBuffer = Dali::LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), dimensions, fittingMode, samplingMode, orientationCorrection);
+
+    // We don't need to hold image buffer anymore.
+    encodedImageBuffer.Reset();
+  }
+  else if(url.IsValid() && url.IsLocalResource())
+  {
+    if(loadPlanes)
+    {
+      Dali::LoadImagePlanesFromFile(url.GetUrl(), pixelBuffers, dimensions, fittingMode, samplingMode, orientationCorrection);
+    }
+    else
+    {
+      pixelBuffer = Dali::LoadImageFromFile(url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection);
+    }
+  }
+  else if(url.IsValid())
+  {
+    pixelBuffer = Dali::DownloadImageSynchronously(url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection);
+  }
+
+  if(pixelBuffer)
+  {
+    pixelBuffers.push_back(pixelBuffer);
+  }
+
+  if(pixelBuffers.empty())
+  {
+    DALI_LOG_ERROR("LoadingTask::Load: Loading is failed: %s\n", url.GetUrl().c_str());
+  }
+}
+
+void LoadingTask::ApplyMask()
+{
+  if(!pixelBuffers.empty())
+  {
+    pixelBuffers[0].ApplyMask(maskPixelBuffer, contentScale, cropToMask);
+  }
+}
+
+void LoadingTask::MultiplyAlpha()
+{
+  if(!pixelBuffers.empty() && Pixel::HasAlpha(pixelBuffers[0].GetPixelFormat()))
+  {
+    if(preMultiplyOnLoad == DevelAsyncImageLoader::PreMultiplyOnLoad::ON)
+    {
+      pixelBuffers[0].MultiplyColorByAlpha();
+    }
+  }
+}
+
+void LoadingTask::SetTextureId(TextureManagerType::TextureId id)
+{
+  textureId = id;
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/image-loader/loading-task.h b/dali-toolkit/internal/image-loader/loading-task.h
new file mode 100644
index 0000000..8554e6c
--- /dev/null
+++ b/dali-toolkit/internal/image-loader/loading-task.h
@@ -0,0 +1,226 @@
+#ifndef DALI_TOOLKIT_IMAGE_LOADING_TASK_H
+#define DALI_TOOLKIT_IMAGE_LOADING_TASK_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-type.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
+#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/devel-api/threading/thread.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/images/image-operations.h>
+#include <dali/public-api/object/ref-object.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+class LoadingTask;
+using LoadingTaskPtr = IntrusivePtr<LoadingTask>;
+
+/**
+ * The task of loading and packing an image into the atlas
+ */
+class LoadingTask : public AsyncTask
+{
+public:
+  /**
+   * Constructor.
+   * @param [in] id of the task
+   * @param [in] animatedImageLoading The AnimatedImageLoading to load animated image
+   * @param [in] frameIndex The frame index of a frame to be loaded frame
+   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   * @param [in] callback The callback that is called when the operation is completed.
+   */
+  LoadingTask(uint32_t                                 id,
+              Dali::AnimatedImageLoading               animatedImageLoading,
+              uint32_t                                 frameIndex,
+              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+              CallbackBase*                            callback);
+
+  /**
+   * Constructor.
+   * @param [in] id of the task
+   * @param [in] animatedImageLoading The AnimatedImageLoading to load animated image
+   * @param [in] frameIndex The frame index of a frame to be loaded frame
+   * @param [in] dimensions The width and height to fit the loaded image to
+   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter
+   * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size
+   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   * @param [in] callback The callback that is called when the operation is completed.
+   */
+  LoadingTask(uint32_t                                 id,
+              Dali::AnimatedImageLoading               animatedImageLoading,
+              uint32_t                                 frameIndex,
+              Dali::ImageDimensions                    dimensions,
+              Dali::FittingMode::Type                  fittingMode,
+              Dali::SamplingMode::Type                 samplingMode,
+              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+              CallbackBase*                            callback);
+
+  /**
+   * Constructor.
+   * @param [in] id of the task
+   * @param [in] url The URL of the image file to load.
+   * @param [in] size The width and height to fit the loaded image to, 0.0 means whole image
+   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
+   * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
+   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
+   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   * @param [in] loadPlanes true to load image planes or false to load bitmap image.
+   * @param [in] callback The callback that is called when the operation is completed.
+   */
+  LoadingTask(uint32_t                                 id,
+              const VisualUrl&                         url,
+              ImageDimensions                          dimensions,
+              FittingMode::Type                        fittingMode,
+              SamplingMode::Type                       samplingMode,
+              bool                                     orientationCorrection,
+              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+              bool                                     loadPlanes,
+              CallbackBase*                            callback);
+
+  /**
+   * Constructor.
+   * @param [in] id of the task
+   * @param [in] encodedImageBuffer The encoded buffer of the image to load.
+   * @param [in] size The width and height to fit the loaded image to, 0.0 means whole image
+   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
+   * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
+   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
+   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   * @param [in] callback The callback that is called when the operation is completed.
+   */
+  LoadingTask(uint32_t                                 id,
+              const EncodedImageBuffer&                encodedImageBuffer,
+              ImageDimensions                          dimensions,
+              FittingMode::Type                        fittingMode,
+              SamplingMode::Type                       samplingMode,
+              bool                                     orientationCorrection,
+              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+              CallbackBase*                            callback);
+
+  /**
+   * Constructor.
+   * @param [in] id of the task
+   * @param [in] pixelBuffer of the to be masked image
+   * @param [in] maskPixelBuffer of the mask image
+   * @param [in] contentScale The factor to scale the content
+   * @param [in] cropToMask Whether to crop the content to the mask size
+   * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha.
+   * @param [in] callback The callback that is called when the operation is completed.
+   */
+  LoadingTask(uint32_t                                 id,
+              Devel::PixelBuffer                       pixelBuffer,
+              Devel::PixelBuffer                       maskPixelBuffer,
+              float                                    contentScale,
+              bool                                     cropToMask,
+              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+              CallbackBase*                            callback);
+
+  /**
+   * Destructor.
+   */
+  ~LoadingTask() override;
+
+  /**
+   * @brief Set the Texture Id
+   */
+  void SetTextureId(TextureManagerType::TextureId id);
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "LoadingTask";
+  }
+
+private:
+  // Undefined
+  LoadingTask(const LoadingTask& queue);
+
+  // Undefined
+  LoadingTask& operator=(const LoadingTask& queue);
+
+  /**
+   * Load the image
+   */
+  void Load();
+
+  /**
+   * Apply mask
+   */
+  void ApplyMask();
+
+  /**
+   * Multiply alpha
+   */
+  void MultiplyAlpha();
+
+public:
+  std::vector<Devel::PixelBuffer> pixelBuffers{};              ///< pixelBuffer handle after successful load
+                                                               ///< or pixelBuffer to be masked image in the mask task
+  VisualUrl                                url;                ///< url of the image to load
+  EncodedImageBuffer                       encodedImageBuffer; ///< encoded buffer of the image to load
+  uint32_t                                 id;                 ///< The unique id associated with this task.
+  TextureManagerType::TextureId            textureId;          ///< textureId for loading
+  ImageDimensions                          dimensions;         ///< dimensions to load
+  FittingMode::Type                        fittingMode;        ///< fitting options
+  SamplingMode::Type                       samplingMode;       ///< sampling options
+  DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad;  ///< if the image's color should be multiplied by it's alpha
+
+  Devel::PixelBuffer         maskPixelBuffer; ///< pixelBuffer of mask image
+  float                      contentScale;    ///< The factor to scale the content
+  Dali::AnimatedImageLoading animatedImageLoading;
+  uint32_t                   frameIndex;
+
+  bool orientationCorrection : 1; ///< if orientation correction is needed
+  bool isMaskTask : 1;            ///< whether this task is for mask or not
+  bool cropToMask : 1;            ///< Whether to crop the content to the mask size
+  bool loadPlanes : 1;            ///< Whether to load image planes
+  bool isReady : 1;               ///< Whether this task ready to run
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_IMAGE_LOAD_THREAD_H
diff --git a/dali-toolkit/internal/particle-system/particle-domain-impl.cpp b/dali-toolkit/internal/particle-system/particle-domain-impl.cpp
new file mode 100644
index 0000000..cbdee9b
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-domain-impl.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/particle-system/particle-domain-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-domain.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+// TODO: This needs physics modifier to be implemented (no use-case yet)
+}
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-domain-impl.h b/dali-toolkit/internal/particle-system/particle-domain-impl.h
new file mode 100644
index 0000000..5e3e1ea
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-domain-impl.h
@@ -0,0 +1,57 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_DOMAIN_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_DOMAIN_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-domain.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-object.h>
+#include <memory>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleDomain : public Dali::BaseObject
+{
+};
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+
+namespace Dali::Toolkit::ParticleSystem
+{
+inline Internal::ParticleDomain& GetImplementation(ParticleSystem::ParticleDomain& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleDomain handle is empty");
+
+  BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<Internal::ParticleDomain&>(handle);
+}
+
+inline const Internal::ParticleDomain& GetImplementation(const ParticleSystem::ParticleDomain& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleDomain handle is empty");
+
+  const BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<const Internal::ParticleDomain&>(handle);
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_DOMAIN_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-emitter-impl.cpp b/dali-toolkit/internal/particle-system/particle-emitter-impl.cpp
new file mode 100644
index 0000000..150d857
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-emitter-impl.cpp
@@ -0,0 +1,458 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/particle-system/particle-emitter-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/particle-system/particle-list-impl.h>
+#include <dali-toolkit/internal/particle-system/particle-modifier-impl.h>
+#include <dali-toolkit/internal/particle-system/particle-renderer-impl.h>
+#include <dali-toolkit/internal/particle-system/particle-source-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/stage-devel.h>
+#include <dali/devel-api/update/frame-callback-interface.h>
+#include <memory>
+#include <utility>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+constexpr uint32_t DEFAULT_PARTICLE_COUNT = 100u; ///< Default number of particles in system if not set by user
+
+/**
+ * Particle system frame callback to run modifiers and sources
+ */
+class FrameCallback : public Dali::FrameCallbackInterface
+{
+public:
+  /**
+   * @brief Constructor.
+   */
+  FrameCallback(Internal::ParticleEmitter* emitter)
+  : mEmitter(emitter)
+  {
+  }
+
+  ~FrameCallback() = default;
+
+private:
+  bool Update(Dali::UpdateProxy& updateProxy, float elapsedSeconds) override
+  {
+    mEmitter->Update();
+    return true;
+  }
+
+  Internal::ParticleEmitter* mEmitter;
+};
+
+ParticleSystem::ParticleSource ParticleEmitter::GetSource() const
+{
+  return mParticleSource;
+}
+
+void ParticleEmitter::SetSource(const ParticleSystem::ParticleSource& source)
+{
+  mParticleStatusBits |= SOURCE_SET_STATUS_BIT;
+  mParticleSource = source;
+
+  // call the init function of source
+  GetImplementation(mParticleSource).GetUpdater().Init();
+}
+
+void ParticleEmitter::SetDomain(const ParticleSystem::ParticleDomain& domain)
+{
+  mParticleStatusBits |= DOMAIN_SET_STATUS_BIT;
+  mParticleDomain = domain;
+}
+
+void ParticleEmitter::SetRenderer(const ParticleSystem::ParticleRenderer& renderer)
+{
+  mParticleStatusBits |= RENDERER_SET_STATUS_BIT;
+  mParticleRenderer = renderer;
+  GetImplementation(mParticleRenderer).SetEmitter(this);
+}
+
+void ParticleEmitter::SetParticleCount(uint32_t maxParticleCount)
+{
+  if(!mParticleList || maxParticleCount != GetImplementation(mParticleList).GetParticleCount())
+  {
+    // Default particle list has no data streams, it will replace old list
+    mParticleList = ParticleSystem::ParticleList::New(maxParticleCount,
+                                                      ParticleStream::POSITION_STREAM_BIT |
+                                                        ParticleStream::COLOR_STREAM_BIT |
+                                                        ParticleStream::VELOCITY_STREAM_BIT |
+                                                        ParticleStream::SCALE_STREAM_BIT |
+                                                        ParticleStream::LIFETIME_STREAM_BIT);
+  }
+}
+
+uint32_t ParticleEmitter::GetParticleCount()
+{
+  return GetImplementation(mParticleList).GetParticleCount();
+}
+
+ParticleSystem::ParticleList& ParticleEmitter::GetParticleList()
+{
+  return mParticleList;
+}
+
+uint32_t ParticleEmitter::AddModifier(const ParticleSystem::ParticleModifier& modifier)
+{
+  mModifiers.emplace_back(modifier);
+  return mModifiers.size() - 1;
+}
+
+ParticleSystem::ParticleDomain ParticleEmitter::GetDomain() const
+{
+  return mParticleDomain;
+}
+
+ParticleSystem::ParticleRenderer ParticleEmitter::GetRenderer() const
+{
+  return mParticleRenderer;
+}
+
+ParticleSystem::ParticleModifier ParticleEmitter::GetModifierAt(uint32_t index)
+{
+  return index < mModifiers.size() ? mModifiers[index] : ParticleSystem::ParticleModifier();
+}
+
+void ParticleEmitter::RemoveModifierAt(uint32_t index)
+{
+  mModifiers.erase(mModifiers.begin() + index);
+}
+
+void ParticleEmitter::Start()
+{
+  if(mActor && IsComplete() && !(mParticleStatusBits & SIMULATION_STARTED_STATUS_BIT))
+  {
+    if(mFrameCallback)
+    {
+      Stop();
+    }
+
+    GetImplementation(mParticleRenderer).Initialize();
+
+    mSystemStarted = true;
+    mParticleStatusBits &= ~(SIMULATION_STOPPED_STATUS_BIT | SIMULATION_PAUSED_STATUS_BIT);
+    mParticleStatusBits |= SIMULATION_STARTED_STATUS_BIT;
+    mFrameCallback = std::make_unique<FrameCallback>(this);
+
+    // Attach renderer to an actor
+    auto renderer = GetImplementation(mParticleRenderer).GetRenderer();
+    mActor.AddRenderer(renderer);
+    DevelStage::AddFrameCallback(Stage::GetCurrent(), *mFrameCallback, mActor);
+  }
+}
+
+void ParticleEmitter::Stop()
+{
+  if(mActor && IsComplete() && (mParticleStatusBits & SIMULATION_STARTED_STATUS_BIT))
+  {
+    mSystemStarted = false;
+    mParticleStatusBits &= ~(SIMULATION_STARTED_STATUS_BIT | SIMULATION_PAUSED_STATUS_BIT);
+    mParticleStatusBits |= SIMULATION_STOPPED_STATUS_BIT;
+    auto renderer = GetImplementation(mParticleRenderer).GetRenderer();
+    mActor.RemoveRenderer(renderer);
+    DevelStage::RemoveFrameCallback(Stage::GetCurrent(), *mFrameCallback);
+  }
+}
+
+std::chrono::milliseconds ParticleEmitter::GetCurrentTimeMillis() const
+{
+  std::chrono::milliseconds ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+    std::chrono::system_clock::now().time_since_epoch());
+  return ms;
+}
+
+void ParticleEmitter::Update()
+{
+  // Do not update if emitter setup isn't complete
+  if(!IsComplete())
+  {
+    return;
+  }
+
+  auto ms = GetCurrentTimeMillis();
+
+  if(mCurrentMilliseconds.count() == 0)
+  {
+    mCurrentMilliseconds = ms;
+  }
+
+  if(mLastUpdateMs.count() == 0)
+  {
+    mLastUpdateMs = ms;
+  }
+
+  float emissionDelta = 1.0f / float(mEmissionRatePerSecond); // time per one particle emission (TODO: add some randomness to it)
+
+  auto diffTime = double((ms - mCurrentMilliseconds).count()) / 1000.0;
+
+  uint32_t emissionCount = 0u;
+  if(diffTime >= emissionDelta)
+  {
+    emissionCount        = round(diffTime / emissionDelta);
+    mCurrentMilliseconds = ms;
+  }
+
+  // Update lifetimes and discard dead particles
+  auto& particles = mParticleList.GetActiveParticles();
+  auto  dt        = ms - mLastUpdateMs;
+  if(dt.count())
+  {
+    std::vector<int> toErase;
+    int              n = 0;
+    for(auto& p : particles)
+    {
+      auto& lifetime = p.Get<float>(ParticleStream::LIFETIME_STREAM_BIT);
+      lifetime -= (float(dt.count()) / 1000.0f);
+      if(lifetime <= 0.0f)
+      {
+        toErase.emplace_back(n);
+      }
+      ++n;
+    }
+
+    if(!toErase.empty())
+    {
+      int indexShift = 0;
+      for(auto& v : toErase)
+      {
+        GetImplementation(mParticleList).ReleaseParticle(v - indexShift);
+        ++indexShift;
+      }
+    }
+  }
+  mLastUpdateMs = ms;
+
+  // apply initial emission count
+  if(mSystemStarted)
+  {
+    emissionCount  = mEmissionCountOnStart;
+    mSystemStarted = false;
+  }
+
+  // Update source if there are any particles to be emitted
+  if(emissionCount)
+  {
+    // Apply active particles limiter
+    if(mActiveParticlesLimit && mParticleList.GetActiveParticleCount() + emissionCount > mActiveParticlesLimit)
+    {
+      emissionCount = mActiveParticlesLimit - mParticleList.GetActiveParticleCount();
+    }
+    UpdateSource(emissionCount);
+  }
+
+  // Update modifier stack
+  for(auto& modifier : mModifiers)
+  {
+    if(modifier)
+    {
+      // Parallel processing must be enabled in order to use MT mode
+      bool mt = GetImplementation(modifier).GetUpdater().IsMultiThreaded() && mParallelProcessing;
+
+      if(!mt) // single-threaded, update all particles in one go
+      {
+        GetImplementation(modifier).Update(mParticleList, 0, mParticleList.GetActiveParticleCount());
+      }
+      else
+      {
+        UpdateModifierMT(modifier);
+      }
+    }
+  }
+
+  UpdateDomain();
+}
+
+void ParticleEmitter::AttachTo(Actor actor)
+{
+  mActor = std::move(actor);
+}
+
+Actor ParticleEmitter::GetActor() const
+{
+  return mActor;
+}
+
+void ParticleEmitter::UpdateSource(uint32_t count)
+{
+  GetImplementation(mParticleSource).Update(mParticleList, count);
+}
+
+void ParticleEmitter::UpdateModifierMT(Dali::Toolkit::ParticleSystem::ParticleModifier& modifier)
+{
+  auto& threadPool    = GetThreadPool();
+  auto  workerThreads = threadPool.GetWorkerCount();
+  auto  activeCount   = mParticleList.GetActiveParticleCount();
+
+  // at least 10 particles per worker thread (should be parametrized)
+  // If less, continue ST
+  if(activeCount < workerThreads * 10)
+  {
+    GetImplementation(modifier).Update(mParticleList, 0, activeCount);
+    return;
+  }
+
+  auto partial = mParticleList.GetActiveParticleCount() / workerThreads;
+
+  // make tasks
+  struct UpdateTask
+  {
+    UpdateTask(Internal::ParticleModifier& modifier, ParticleSystem::ParticleList& list, uint32_t first, uint32_t count)
+    : mModifier(modifier),
+      mList(list),
+      mFirst(first),
+      mCount(count)
+    {
+    }
+
+    Internal::ParticleModifier&   mModifier;
+    ParticleSystem::ParticleList& mList;
+    uint32_t                      mFirst;
+    uint32_t                      mCount;
+
+    void Update()
+    {
+      mModifier.Update(mList, mFirst, mCount);
+    }
+  };
+
+  std::vector<UpdateTask> updateTasks;
+  updateTasks.reserve(workerThreads);
+  std::vector<Task> tasks;
+
+  for(auto i = 0u; i < workerThreads; ++i)
+  {
+    auto index = i * partial;
+    auto count = partial;
+    if(i == workerThreads - 1 && index + count < activeCount)
+    {
+      count = activeCount - index;
+    }
+
+    updateTasks.emplace_back(GetImplementation(modifier), mParticleList, index, count);
+    tasks.emplace_back([&task = updateTasks.back()](uint32_t n) { task.Update(); });
+  }
+
+  auto future = threadPool.SubmitTasks(tasks, 0);
+  future->Wait();
+}
+
+void ParticleEmitter::UpdateDomain()
+{
+  // TODO
+}
+
+void ParticleEmitter::SetEmissionRate(uint32_t ratePerSecond)
+{
+  mEmissionRatePerSecond = ratePerSecond;
+}
+
+uint32_t ParticleEmitter::GetEmissionRate() const
+{
+  return mEmissionRatePerSecond;
+}
+
+void ParticleEmitter::EnableParallelProcessing(bool enabled)
+{
+  mParallelProcessing = enabled;
+}
+
+bool ParticleEmitter::IsParallelProcessingEnabled() const
+{
+  return mParallelProcessing;
+}
+
+void ParticleEmitter::SetInitialParticleCount(uint32_t count)
+{
+  mEmissionCountOnStart = count;
+}
+
+uint32_t ParticleEmitter::GetInitialParticleCount() const
+{
+  return mEmissionCountOnStart;
+}
+
+void ParticleEmitter::SetActiveParticlesLimit(uint32_t count)
+{
+  mActiveParticlesLimit = count;
+}
+
+uint32_t ParticleEmitter::GetActiveParticlesLimit() const
+{
+  return mActiveParticlesLimit;
+}
+
+ParticleSystem::ParticleEmitter::Status ParticleEmitter::GetStatus() const
+{
+  auto statusMask = SIMULATION_STARTED_STATUS_BIT | SIMULATION_PAUSED_STATUS_BIT | SIMULATION_STOPPED_STATUS_BIT;
+  auto status     = (mParticleStatusBits & statusMask);
+
+  if(status & SIMULATION_PAUSED_STATUS_BIT)
+  {
+    return ParticleSystem::ParticleEmitter::Status::PAUSED;
+  }
+  else if(status & SIMULATION_STOPPED_STATUS_BIT)
+  {
+    return ParticleSystem::ParticleEmitter::Status::STOPPED;
+  }
+  else if(status & SIMULATION_STARTED_STATUS_BIT)
+  {
+    return ParticleSystem::ParticleEmitter::Status::STARTED;
+  }
+  else
+  {
+    return !IsComplete() ? ParticleSystem::ParticleEmitter::Status::INCOMPLETE : ParticleSystem::ParticleEmitter::Status::READY;
+  }
+}
+
+ParticleEmitter::ParticleEmitter()
+{
+  // Necessary to be called to initialize internal ParticleList
+  SetParticleCount(DEFAULT_PARTICLE_COUNT);
+}
+
+ParticleEmitter::~ParticleEmitter()
+{
+  if(mParticleRenderer)
+  {
+    GetImplementation(mParticleRenderer).PrepareToDie();
+  }
+}
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+namespace Dali::Toolkit::ParticleSystem
+{
+Dali::ThreadPool& GetThreadPool()
+{
+  static std::unique_ptr<Dali::ThreadPool> gThreadPool{nullptr};
+  static std::once_flag                    onceFlag;
+
+  // Intialize thread pool if not there yet, make sure it happens once and it's synchronized!,
+  // NOTE: this function shouldn't be called from multiple thread anyway
+  if(!gThreadPool)
+  {
+    std::call_once(onceFlag, [&threadPool = gThreadPool] { threadPool = std::make_unique<Dali::ThreadPool>();
+                     threadPool->Initialize(4u); });
+  }
+
+  return *gThreadPool;
+}
+} // namespace Dali::Toolkit::ParticleSystem
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-emitter-impl.h b/dali-toolkit/internal/particle-system/particle-emitter-impl.h
new file mode 100644
index 0000000..8b2459e
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-emitter-impl.h
@@ -0,0 +1,188 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_EMITTER_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_EMITTER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/object/base-object.h>
+#include <chrono>
+#include <ctime>
+#include <memory>
+
+// For multithreading update
+#include <dali/devel-api/threading/thread-pool.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-domain.h>
+#include <dali-toolkit/public-api/particle-system/particle-emitter.h>
+#include <dali-toolkit/public-api/particle-system/particle-list.h>
+#include <dali-toolkit/public-api/particle-system/particle-modifier.h>
+#include <dali-toolkit/public-api/particle-system/particle-renderer.h>
+#include <dali-toolkit/public-api/particle-system/particle-source.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class FrameCallback;
+class ParticleEmitter : public Dali::BaseObject, public Dali::ConnectionTracker
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  ParticleEmitter();
+
+  /**
+   * @brief Destructor
+   */
+  ~ParticleEmitter() override;
+
+  /**
+   * @brief Tests whether emitter is complete (ready for simulation)
+   *
+   * @return True if emitter is complete, false otherwise
+   */
+  [[nodiscard]] bool IsComplete() const
+  {
+    return (mParticleStatusBits & STATUS_COMPLETE_BITS) == STATUS_COMPLETE_BITS;
+  }
+
+  [[nodiscard]] ParticleSystem::ParticleSource GetSource() const;
+
+  void SetSource(const ParticleSystem::ParticleSource& source);
+
+  [[nodiscard]] ParticleSystem::ParticleDomain GetDomain() const;
+
+  void SetDomain(const ParticleSystem::ParticleDomain& domain);
+
+  [[nodiscard]] ParticleSystem::ParticleRenderer GetRenderer() const;
+
+  [[nodiscard]] ParticleSystem::ParticleModifier GetModifierAt(uint32_t index);
+
+  void RemoveModifierAt(uint32_t index);
+
+  void SetRenderer(const ParticleSystem::ParticleRenderer& renderer);
+
+  void SetParticleCount(uint32_t maxParticleCount);
+
+  uint32_t GetParticleCount();
+
+  ParticleSystem::ParticleList& GetParticleList();
+
+  uint32_t AddModifier(const ParticleSystem::ParticleModifier& modifier);
+
+  void AttachTo(Actor actor);
+
+  [[nodiscard]] Actor GetActor() const;
+
+  void Update();
+
+  void UpdateSource(uint32_t count);
+
+  void UpdateModifierMT(Dali::Toolkit::ParticleSystem::ParticleModifier& modifier);
+
+  void UpdateDomain();
+
+  void SetEmissionRate(uint32_t ratePerSecond);
+
+  [[nodiscard]] uint32_t GetEmissionRate() const;
+
+  void SetInitialParticleCount(uint32_t count);
+
+  [[nodiscard]] uint32_t GetInitialParticleCount() const;
+
+  void Start();
+
+  void Stop();
+
+  void EnableParallelProcessing(bool enabled);
+
+  [[nodiscard]] bool IsParallelProcessingEnabled() const;
+
+  void SetActiveParticlesLimit(uint32_t count);
+
+  [[nodiscard]] uint32_t GetActiveParticlesLimit() const;
+
+  [[nodiscard]] ParticleSystem::ParticleEmitter::Status GetStatus() const;
+
+  [[nodiscard]] std::chrono::milliseconds GetCurrentTimeMillis() const;
+
+  // All these bits must be set in order to consider emitter COMPLETE
+  const uint32_t SOURCE_SET_STATUS_BIT   = 1 << 0;
+  const uint32_t RENDERER_SET_STATUS_BIT = 1 << 1;
+  const uint32_t DOMAIN_SET_STATUS_BIT   = 1 << 2;
+
+  // 1. Only one of these flags can be set at a time
+  // 2. They are invalid as long as emitter is INCOMPLETE
+  const uint32_t SIMULATION_STARTED_STATUS_BIT = 1 << 3;
+  const uint32_t SIMULATION_PAUSED_STATUS_BIT  = 1 << 4;
+  const uint32_t SIMULATION_STOPPED_STATUS_BIT = 1 << 5;
+
+  const uint32_t STATUS_COMPLETE_BITS = SOURCE_SET_STATUS_BIT | RENDERER_SET_STATUS_BIT | DOMAIN_SET_STATUS_BIT;
+
+  ParticleSystem::ParticleSource mParticleSource; ///< Current particle source object
+  ParticleSystem::ParticleDomain mParticleDomain; ///< Current particle domain object
+
+  uint8_t mParticleStatusBits{0u}; ///< Current status of the emitter
+
+  // List of particles
+  ParticleSystem::ParticleList mParticleList;
+
+  std::vector<ParticleSystem::ParticleModifier> mModifiers;
+
+  ParticleSystem::ParticleRenderer mParticleRenderer;
+
+  Actor mActor;
+
+  uint32_t                  mEmissionRatePerSecond{1u};
+  std::atomic<uint32_t>     mEmissionCountOnStart{0u};
+  std::atomic<uint32_t>     mActiveParticlesLimit{0u}; ///< 0 - unlimited
+  std::atomic<bool>         mSystemStarted{false};
+  std::chrono::milliseconds mCurrentMilliseconds{0};
+  std::chrono::milliseconds mLastUpdateMs{0};
+
+  bool                           mParallelProcessing{false};
+  std::unique_ptr<FrameCallback> mFrameCallback;
+};
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+
+namespace Dali::Toolkit::ParticleSystem
+{
+// Returns thread pool shared by whole particle system
+Dali::ThreadPool& GetThreadPool();
+
+inline Internal::ParticleEmitter& GetImplementation(ParticleSystem::ParticleEmitter& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleEmitter handle is empty");
+
+  BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<Internal::ParticleEmitter&>(handle);
+}
+
+inline const Internal::ParticleEmitter& GetImplementation(const ParticleSystem::ParticleEmitter& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleEmitter handle is empty");
+
+  const BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<const Internal::ParticleEmitter&>(handle);
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_EMITTER_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-impl.cpp b/dali-toolkit/internal/particle-system/particle-impl.cpp
new file mode 100644
index 0000000..2a5ed3b
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-impl.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/particle-system/particle-impl.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+
+Particle::Particle(Internal::ParticleList& ownerList, uint32_t index)
+: mOwnerList(ownerList),
+  mIndex(index)
+{
+}
+
+void* Particle::Get(ParticleStreamTypeFlagBit streamBit)
+{
+  auto streamIndex = mOwnerList.GetDefaultStreamIndex(streamBit);
+  auto dataSize    = mOwnerList.GetStreamDataTypeSize(streamIndex);
+  return reinterpret_cast<uint8_t*>(mOwnerList.GetDefaultStream(streamBit)) + (mIndex * dataSize);
+}
+
+void* Particle::GetByIndex(uint32_t streamIndex)
+{
+  auto  dataSize = mOwnerList.GetStreamDataTypeSize(streamIndex);
+  auto* ptr      = reinterpret_cast<uint8_t*>(mOwnerList.GetRawStream(streamIndex));
+  return reinterpret_cast<uint8_t*>(ptr + (mIndex * dataSize));
+}
+
+uint32_t Particle::GetIndex() const
+{
+  return mIndex;
+}
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-impl.h b/dali-toolkit/internal/particle-system/particle-impl.h
new file mode 100644
index 0000000..db46db4
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-impl.h
@@ -0,0 +1,74 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/particle-system/particle-list-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-list.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class Particle : public Dali::BaseObject
+{
+public:
+  ~Particle() = default;
+
+  Particle(Internal::ParticleList& ownerList, uint32_t index);
+
+  void* Get(ParticleStreamTypeFlagBit streamBit);
+
+  void* GetByIndex(uint32_t streamIndex);
+
+  [[nodiscard]] uint32_t GetIndex() const;
+
+private:
+  Internal::ParticleList& mOwnerList;
+  uint32_t                mIndex;
+};
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+
+namespace Dali::Toolkit::ParticleSystem
+{
+inline Internal::Particle& GetImplementation(ParticleSystem::Particle& particle)
+{
+  DALI_ASSERT_ALWAYS(particle && "Particle handle is empty");
+
+  BaseObject& handle = particle.GetBaseObject();
+
+  return static_cast<Internal::Particle&>(handle);
+}
+
+inline const Internal::Particle& GetImplementation(const ParticleSystem::Particle& particle)
+{
+  DALI_ASSERT_ALWAYS(particle && "Particle handle is empty");
+
+  const BaseObject& handle = particle.GetBaseObject();
+
+  return static_cast<const Internal::Particle&>(handle);
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-list-impl.cpp b/dali-toolkit/internal/particle-system/particle-list-impl.cpp
new file mode 100644
index 0000000..2115a36
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-list-impl.cpp
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/particle-system/particle-list-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/particle-system/particle-impl.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<Vector3>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT3;
+}
+
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<Vector4>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT4;
+}
+
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<Vector2>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT2;
+}
+
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<float>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT;
+}
+
+ParticleList::ParticleList(uint32_t capacity, ParticleSystem::ParticleList::ParticleStreamTypeFlags streamFlags)
+{
+  // capacity makes for max immutable particle count
+  mMaxParticleCount = capacity;
+
+  // initialize built-in streams and build map (to optimize later)
+  if(streamFlags & ParticleStream::POSITION_STREAM_BIT)
+  {
+    AddStream(Vector3::ZERO, "aStreamPosition", false);
+    mBuiltInStreamMap[uint32_t(ParticleStream::POSITION_STREAM_BIT)] = mDataStreams.size() - 1;
+  }
+  if(streamFlags & ParticleStream::ROTATION_STREAM_BIT)
+  {
+    AddStream(Vector4::ZERO, "aStreamRotation", false);
+    mBuiltInStreamMap[uint32_t(ParticleStream::ROTATION_STREAM_BIT)] = mDataStreams.size() - 1;
+  }
+  if(streamFlags & ParticleStream::SCALE_STREAM_BIT)
+  {
+    AddStream(Vector3::ONE, "aStreamScale", false);
+    mBuiltInStreamMap[uint32_t(ParticleStream::SCALE_STREAM_BIT)] = mDataStreams.size() - 1;
+  }
+  if(streamFlags & ParticleStream::VELOCITY_STREAM_BIT)
+  {
+    AddStream(Vector3::ZERO, "aStreamVelocity", false);
+    mBuiltInStreamMap[uint32_t(ParticleStream::VELOCITY_STREAM_BIT)] = mDataStreams.size() - 1;
+  }
+  if(streamFlags & ParticleStream::COLOR_STREAM_BIT)
+  {
+    AddStream(Color::YELLOW, "aStreamColor", false);
+    mBuiltInStreamMap[uint32_t(ParticleStream::COLOR_STREAM_BIT)] = mDataStreams.size() - 1;
+  }
+  if(streamFlags & ParticleStream::OPACITY_STREAM_BIT)
+  {
+    AddStream(0.0f, "aStreamOpacity", false);
+    mBuiltInStreamMap[uint32_t(ParticleStream::OPACITY_STREAM_BIT)] = mDataStreams.size() - 1;
+  }
+  if(streamFlags & ParticleStream::LIFETIME_STREAM_BIT)
+  {
+    AddStream(0.0f, "aStreamLifetime", true);
+    mBuiltInStreamMap[uint32_t(ParticleStream::LIFETIME_STREAM_BIT)] = mDataStreams.size() - 1;
+    AddStream(0.0f, "aStreamLifetimeBase", true);
+    mBuiltInStreamMap[uint32_t(ParticleStream::LIFETIME_BASE_STREAM_BIT)] = mDataStreams.size() - 1;
+  }
+
+  // create free chain
+  mFreeChain.resize(capacity);
+  for(auto i = 0u; i < mFreeChain.size(); ++i)
+  {
+    mFreeChain[i] = i + 1;
+  }
+  mFreeChain[mFreeChain.size() - 1] = 0;
+  mFreeIndex                        = 0;
+}
+
+ParticleList::~ParticleList() = default;
+
+uint32_t ParticleList::AddStream(uint32_t sizeOfDataType, const void* defaultValue, ParticleStream::StreamDataType dataType, const char* streamName, bool localStream)
+{
+  mDataStreams.emplace_back(new ParticleDataStream(mMaxParticleCount, sizeOfDataType, defaultValue, dataType));
+  if(streamName)
+  {
+    mDataStreams.back()->SetStreamName(streamName);
+  }
+
+  mDataStreams.back()->SetStreamLocal(localStream);
+
+  // Update element size
+  mParticleStreamElementSize          = 0;
+  mParticleStreamElementSizeWithLocal = 0;
+  for(auto& ds : mDataStreams)
+  {
+    if(!ds->localStream)
+    {
+      mParticleStreamElementSize += ds->dataSize;
+    }
+    mParticleStreamElementSizeWithLocal += ds->dataSize;
+  }
+
+  return mDataStreams.size() - 1;
+}
+
+void* ParticleList::GetRawStream(uint32_t index)
+{
+  if(index < mDataStreams.size() && mDataStreams[index])
+  {
+    return mDataStreams[index]->data.data();
+  }
+  return nullptr;
+}
+
+uint32_t ParticleList::GetStreamCount() const
+{
+  return mDataStreams.size();
+}
+
+uint32_t ParticleList::GetParticleCount() const
+{
+  return mMaxParticleCount;
+}
+
+uint32_t ParticleList::GetActiveParticleCount() const
+{
+  return mParticles.size();
+}
+
+ParticleStream::StreamDataType ParticleList::GetStreamDataType(uint32_t streamIndex)
+{
+  return mDataStreams[streamIndex]->type;
+}
+
+const std::string& ParticleList::GetStreamName(uint32_t streamIndex) const
+{
+  return mDataStreams[streamIndex]->streamName;
+}
+
+bool ParticleList::IsStreamLocal(uint32_t streamIndex) const
+{
+  return mDataStreams[streamIndex]->localStream;
+}
+
+uint32_t ParticleList::GetStreamDataTypeSize(uint32_t streamIndex) const
+{
+  return mDataStreams[streamIndex]->dataSize;
+}
+
+ParticleSystem::Particle ParticleList::NewParticle(float lifetime)
+{
+  if(mParticles.size() < mMaxParticleCount)
+  {
+    auto newIndex = int32_t(mFreeIndex);
+    mFreeIndex    = int32_t(mFreeChain[mFreeIndex]);
+    mAliveParticleCount++;
+
+    // Add particle
+    mParticles.emplace_back(new Internal::Particle(*this, newIndex));
+
+    // Set particle lifetime
+    auto& particle = mParticles.back();
+
+    particle.Get<float>(ParticleStream::LIFETIME_STREAM_BIT) = lifetime;
+
+    // Store initial lifetime
+    particle.Get<float>(ParticleStream::LIFETIME_BASE_STREAM_BIT) = lifetime;
+
+    return mParticles.back();
+  }
+  return {nullptr};
+}
+
+uint32_t ParticleList::GetStreamElementSize(bool includeLocalStream)
+{
+  if(includeLocalStream)
+  {
+    return mParticleStreamElementSizeWithLocal;
+  }
+  else
+  {
+    return mParticleStreamElementSize;
+  }
+}
+
+void ParticleList::ReleaseParticle(uint32_t particleIndex)
+{
+  auto it = mParticles.begin();
+  std::advance(it, particleIndex);
+
+  // Point at this slot of memory as next free slot
+  auto& p = *it;
+  if(mFreeIndex > -1)
+  {
+    mFreeChain[p.GetIndex()] = mFreeIndex;
+  }
+  mFreeIndex = p.GetIndex();
+
+  // Remove particle from the list
+  mParticles.erase(it);
+  mAliveParticleCount--;
+}
+
+void* ParticleList::GetDefaultStream(ParticleStreamTypeFlagBit streamBit)
+{
+  return GetRawStream(mBuiltInStreamMap[streamBit]);
+}
+
+uint32_t ParticleList::GetDefaultStreamIndex(ParticleStreamTypeFlagBit streamBit)
+{
+  return mBuiltInStreamMap[uint32_t(streamBit)];
+}
+
+std::list<ParticleSystem::Particle>& ParticleList::GetParticles()
+{
+  return mParticles;
+}
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
diff --git a/dali-toolkit/internal/particle-system/particle-list-impl.h b/dali-toolkit/internal/particle-system/particle-list-impl.h
new file mode 100644
index 0000000..6f1ddea
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-list-impl.h
@@ -0,0 +1,231 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_LIST_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_LIST_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-list.h>
+#include <dali-toolkit/public-api/particle-system/particle.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/common/list-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <algorithm>
+#include <memory>
+
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+template<class T>
+struct StreamDataTypeWrapper
+{
+  static ParticleStream::StreamDataType GetType()
+  {
+    return {};
+  }
+};
+
+struct ParticleDataStream
+{
+  ~ParticleDataStream() = default;
+  template<class T>
+  ParticleDataStream(uint32_t capacity, const T& defaultValue, ParticleStream::StreamDataType dataType)
+  : ParticleDataStream(capacity, sizeof(T), &defaultValue, dataType)
+  {
+  }
+
+  /**
+   * Creates new stream of requested capacity and (optionally) fills with default data
+   */
+  ParticleDataStream(uint32_t capacity, uint32_t dataSize, const void* defaultValue, ParticleStream::StreamDataType dataType)
+  {
+    this->capacity = capacity;
+    data.resize(capacity * dataSize);
+    if(defaultValue)
+    {
+      for(auto i = 0u; i < capacity; ++i)
+      {
+        auto dstPtr = data.data() + (i * dataSize);
+        std::copy(reinterpret_cast<const uint8_t*>(defaultValue), reinterpret_cast<const uint8_t*>(defaultValue) + dataSize, dstPtr);
+      }
+    }
+    type           = dataType;
+    alive          = 0u;
+    this->dataSize = dataSize;
+  }
+
+  void SetStreamName(const char* name)
+  {
+    streamName = name;
+  }
+
+  void SetStreamLocal(bool local)
+  {
+    localStream = local;
+  }
+
+  /**
+   * Converts raw data into requested type (does not guarantee compatibility)
+   */
+  template<class T>
+  T* GetAs()
+  {
+    return reinterpret_cast<T*>(data.data());
+  }
+
+  ParticleStream::StreamDataType type;
+  std::vector<uint8_t>           data;
+  std::string                    streamName;
+  uint32_t                       alive{0u};
+  uint32_t                       capacity;
+  uint32_t                       dataSize;
+  bool                           localStream{true};
+};
+
+/**
+ * Particle list stores particle-specific data and manages the particles memory
+ * It can return a sub-list.
+ *
+ * ParticleList manages the storage memory.
+ *
+ *
+ */
+class ParticleList : public Dali::BaseObject
+{
+public:
+
+  ParticleList(uint32_t capacity, ParticleSystem::ParticleList::ParticleStreamTypeFlags streamFlags);
+
+  ~ParticleList();
+
+  /**
+   * Returns raw pointer to the stream data
+   */
+  void* GetRawStream(uint32_t index);
+
+  /**
+   * Returns number of available data streams
+   * @return
+   */
+  uint32_t GetStreamCount() const;
+
+  /**
+   * Returns number of particles per list
+   * @return
+   */
+  uint32_t GetParticleCount() const;
+
+  /**
+   * Returns number of currently active particles
+   * @return
+   */
+  uint32_t GetActiveParticleCount() const;
+
+  /**
+   * Returns stream data-type
+   * @param streamIndex
+   * @return
+   */
+  ParticleStream::StreamDataType GetStreamDataType(uint32_t streamIndex);
+
+  /**
+   * Returns stream data type size
+   * @param streamIndex
+   * @return
+   */
+  [[nodiscard]] uint32_t GetStreamDataTypeSize(uint32_t streamIndex) const;
+
+  [[nodiscard]] const std::string& GetStreamName(uint32_t streamIndex) const;
+
+  [[nodiscard]] bool IsStreamLocal(uint32_t streamIndex) const;
+
+  /**
+   * Allocates new particle in the streams
+   * @param lifetime
+   * @return
+   */
+  ParticleSystem::Particle NewParticle(float lifetime);
+
+  void* GetDefaultStream(ParticleStreamTypeFlagBit streamBit);
+
+  uint32_t GetDefaultStreamIndex(ParticleStreamTypeFlagBit streamBit);
+
+  std::list<ParticleSystem::Particle>& GetParticles();
+
+  void ReleaseParticle(uint32_t particleIndex);
+
+  uint32_t GetStreamElementSize(bool includeLocalStream);
+
+private:
+  template<class T>
+  uint32_t AddStream(const T& defaultValue, const char* streamName, bool localStream)
+  {
+    return AddStream(sizeof(T), &defaultValue, StreamDataTypeWrapper<T>::GetType(), streamName, localStream);
+  }
+
+public:
+  /**
+   * Adds new stream and returns index
+   */
+  uint32_t AddStream(uint32_t sizeOfDataType, const void* defaultValue, ParticleStream::StreamDataType dataType, const char* streamName, bool localStream);
+
+private:
+  std::vector<char> mBuffer[2];
+
+  uint32_t mAliveParticleCount{0u};
+  uint32_t mMaxParticleCount;
+
+  // Data storage
+  std::vector<std::unique_ptr<ParticleDataStream>> mDataStreams;
+
+  std::vector<uint32_t> mFreeChain;
+  int32_t               mFreeIndex{0u};
+
+  std::map<uint32_t, uint32_t> mBuiltInStreamMap;
+
+  std::list<ParticleSystem::Particle> mParticles;
+
+  uint32_t mParticleStreamElementSizeWithLocal{0u};
+  uint32_t mParticleStreamElementSize{0u};
+};
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+namespace Dali::Toolkit::ParticleSystem
+{
+inline Internal::ParticleList& GetImplementation(ParticleSystem::ParticleList& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleList handle is empty");
+
+  BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<Internal::ParticleList&>(handle);
+}
+
+inline const Internal::ParticleList& GetImplementation(const ParticleSystem::ParticleList& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleList handle is empty");
+
+  const BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<const Internal::ParticleList&>(handle);
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_LIST_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-modifier-impl.cpp b/dali-toolkit/internal/particle-system/particle-modifier-impl.cpp
new file mode 100644
index 0000000..c00d71c
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-modifier-impl.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/internal/particle-system/particle-modifier-impl.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+ParticleModifier::ParticleModifier(std::unique_ptr<ParticleModifierInterface>&& updater)
+{
+  mUpdater = std::move(updater);
+}
+
+void ParticleModifier::Update(ParticleSystem::ParticleList& list, uint32_t first, uint32_t count)
+{
+  mUpdater->Update(list, first, count);
+}
+
+ParticleModifierInterface& ParticleModifier::GetUpdater()
+{
+  return *mUpdater;
+}
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
diff --git a/dali-toolkit/internal/particle-system/particle-modifier-impl.h b/dali-toolkit/internal/particle-system/particle-modifier-impl.h
new file mode 100644
index 0000000..75cbf5f
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-modifier-impl.h
@@ -0,0 +1,64 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_MODIFIER_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_MODIFIER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/public-api/particle-system/particle-modifier.h>
+#include <dali/public-api/object/base-object.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleList;
+class ParticleEmitter;
+class ParticleModifier : public Dali::BaseObject
+{
+public:
+  ParticleModifier(std::unique_ptr<ParticleModifierInterface>&& updater);
+
+  void Update(ParticleSystem::ParticleList& list, uint32_t first, uint32_t count);
+
+  ParticleModifierInterface& GetUpdater();
+
+private:
+  std::unique_ptr<ParticleModifierInterface> mUpdater;
+};
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+
+namespace Dali::Toolkit::ParticleSystem
+{
+inline Internal::ParticleModifier& GetImplementation(ParticleSystem::ParticleModifier& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleModifier handle is empty");
+
+  BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<Internal::ParticleModifier&>(handle);
+}
+
+inline const Internal::ParticleModifier& GetImplementation(const ParticleSystem::ParticleModifier& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleModifier handle is empty");
+
+  const BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<const Internal::ParticleModifier&>(handle);
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_MODIFIER_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp b/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
new file mode 100644
index 0000000..123fa66
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
@@ -0,0 +1,470 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/internal/particle-system/particle-emitter-impl.h>
+#include <dali-toolkit/internal/particle-system/particle-list-impl.h>
+#include <dali-toolkit/internal/particle-system/particle-renderer-impl.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
+
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/common/capabilities.h>
+#include <dali/graphics-api/graphics-buffer.h>
+#include <dali/graphics-api/graphics-controller.h>
+#include <dali/graphics-api/graphics-program.h>
+#include <dali/graphics-api/graphics-shader.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+ParticleRenderer::ParticleRenderer()
+{
+  mStreamBufferUpdateCallback = Dali::VertexBufferUpdateCallback::New(this, &ParticleRenderer::OnStreamBufferUpdate);
+}
+
+void ParticleRenderer::SetEmitter(ParticleSystem::Internal::ParticleEmitter* emitter)
+{
+  mEmitter = emitter;
+}
+
+void ParticleRenderer::SetTexture(const Dali::Texture& texture)
+{
+  mTexture = texture;
+}
+
+void ParticleRenderer::SetBlendingMode(BlendingMode blendingMode)
+{
+  mBlendingMode = blendingMode;
+}
+
+BlendingMode ParticleRenderer::GetBlendingMode() const
+{
+  return mBlendingMode;
+}
+
+void ParticleRenderer::CreateShader()
+{
+  // Create shader dynamically
+  auto& list        = GetImplementation(mEmitter->GetParticleList());
+  auto  streamCount = list.GetStreamCount();
+
+  static const char* ATTR_GLSL_TYPES[] =
+    {
+      "float", "vec2", "vec3", "vec4", "int", "ivec2", "ivec3", "ivec4"};
+
+  static const Property::Type ATTR_TYPES[] =
+    {
+      Property::Type::FLOAT,
+      Property::Type::VECTOR2,
+      Property::Type::VECTOR3,
+      Property::Type::VECTOR4,
+      Property::Type::INTEGER,
+      Property::Type::VECTOR2, // This represents floats but by binary write it shouldn't matter (?)
+      Property::Type::VECTOR3,
+      Property::Type::VECTOR4,
+    };
+
+  struct Vertex2D
+  {
+    Vertex2D(const Vector2& _co, const Vector2& _uv)
+    : co(_co),
+      uv(_uv)
+    {
+    }
+    Dali::Vector2 co{};
+    Dali::Vector2 uv{};
+  };
+
+  uint32_t      streamElementSize = 0u;
+  Property::Map streamAtttributes;
+
+  std::stringstream ss;
+  for(auto i = 0u; i < streamCount; ++i)
+  {
+    // Don't add local streams to the shader
+    if(!list.IsStreamLocal(i))
+    {
+      uint32_t    dataTypeSize  = list.GetStreamDataTypeSize(i);
+      auto        dataTypeIndex = uint32_t(list.GetStreamDataType(i));
+      const auto& streamName    = list.GetStreamName(i);
+      streamElementSize += dataTypeSize;
+      char key[256];
+      if(streamName.empty())
+      {
+        snprintf(key, sizeof(key), "aStreamAttr_%d", i);
+      }
+      else
+      {
+        snprintf(key, sizeof(key), "%s", streamName.c_str());
+      }
+      streamAtttributes.Add(key, ATTR_TYPES[dataTypeIndex]);
+
+      // Add shader attribute line
+      ss << "INPUT mediump " << ATTR_GLSL_TYPES[dataTypeIndex] << " " << key << ";\n";
+    }
+  }
+
+  auto streamAttributesStr = ss.str();
+
+  /**
+   * - The MVP comes from the Actor that the particle renderer is attached to
+   * - Attributes are added dynamically based on the particle system properties
+   * - There are two buffers bound
+   *   * Geometry buffer (in this instance, a quad)
+   *   * ParticleSystem stream buffer with interleaved data
+   * - ParticleSystem buffer is being updated every frame
+   */
+  std::string vertexShaderCode = streamAttributesStr + std::string(
+
+                                                         "INPUT mediump vec2 aPosition;\n\
+      INPUT mediump vec2 aTexCoords;\n\
+      \n\
+      uniform mediump mat4   uMvpMatrix;\n\
+      uniform mediump vec3   uSize;\n\
+      uniform lowp vec4      uColor;\n\
+      \
+      OUTPUT mediump vec2   vTexCoord;\n\
+      OUTPUT mediump vec4 vColor;\n\
+      \n\
+      void main()\n\
+      {\n\
+        vec4 pos = vec4(aPosition, 0.0, 1.0) * vec4(aStreamScale, 1.0);\n\
+        vec4 position =  pos + vec4(aStreamPosition, 0.0);\n\
+        vTexCoord     = aTexCoords;\n\
+        vColor = uColor * aStreamColor;\n\
+        gl_Position   = uMvpMatrix * position ;\n\
+      }\n");
+
+  std::string fragmentShaderCode =
+    {
+      "INPUT mediump vec2       vTexCoord;\n\
+    INPUT mediump vec4       vColor;\n\
+    uniform sampler2D sTexture;\n\
+    \n\
+    void main()\n\
+    {\n\
+      lowp vec4 col = TEXTURE(sTexture, vTexCoord) * vColor;\n\
+      if(col.a < 0.1) { discard; }\
+      fragColor = col;\n\
+    }\n"};
+
+  mShader   = Shader::New(Dali::Shader::GetVertexShaderPrefix() + vertexShaderCode, Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderCode);
+  mGeometry = Geometry::New();
+
+  // Configure geometry attributes
+  Property::Map geometryMap;
+  geometryMap.Add("aPosition", Dali::Property::VECTOR2);
+  geometryMap.Add("aTexCoords", Dali::Property::VECTOR2);
+
+  // One vertex buffer with geometry
+  VertexBuffer vertexBuffer0 = VertexBuffer::New(geometryMap);
+
+  // fill the buffer entirely
+  // 2D quad
+  const static Vector2 C(0.5f, 0.5f);
+  struct Quad2D
+  {
+    Vertex2D a0{Vector2(0.0f, 0.0f) - C, Vector2(0.0f, 0.0f)};
+    Vertex2D a1{Vector2(1.0f, 0.0f) - C, Vector2(1.0f, 0.0f)};
+    Vertex2D a2{Vector2(1.0f, 1.0f) - C, Vector2(1.0f, 1.0f)};
+    Vertex2D a3{Vector2(0.0f, 0.0f) - C, Vector2(0.0f, 0.0f)};
+    Vertex2D a4{Vector2(1.0f, 1.0f) - C, Vector2(1.0f, 1.0f)};
+    Vertex2D a5{Vector2(0.0f, 1.0f) - C, Vector2(0.0f, 1.0f)};
+  } QUAD;
+
+  std::vector<Quad2D> quads;
+  quads.resize(mEmitter->GetParticleList().GetCapacity());
+  std::fill(quads.begin(), quads.end(), QUAD);
+  vertexBuffer0.SetData(quads.data(), 6u * quads.size());
+
+  // Second vertex buffer with stream data
+  VertexBuffer vertexBuffer1 = VertexBuffer::New(streamAtttributes);
+
+  /**
+   * For more efficient stream management we need to support glVertexAttribDivisor() function.
+   * This will allow step 1 attribute per 4 vertices (GLES3+). Problem: DALi doesn't support instancing
+   *
+   * For older GLES2 we need to duplicate stream data (4x more memory in case of using a quad geometry)
+   *
+   * Point-sprites may be of use in the future (problem: point sprites use screen space)
+   */
+
+  // Based on the particle system, populate buffer
+  mGeometry.AddVertexBuffer(vertexBuffer0);
+  mGeometry.AddVertexBuffer(vertexBuffer1);
+
+  mGeometry.SetType(Geometry::TRIANGLES);
+
+  mVertexBuffer = vertexBuffer0;
+  mStreamBuffer = vertexBuffer1;
+
+  // Set some initial data for streambuffer to force initialization
+  std::vector<uint8_t> data;
+  // Resize using only-non local streams
+  auto elementSize = mEmitter->GetParticleList().GetParticleDataSize(false);
+  data.resize(elementSize *
+              mEmitter->GetParticleList().GetCapacity() * 6u);
+  mStreamBuffer.SetData(data.data(), mEmitter->GetParticleList().GetCapacity() * 6u); // needed to initialize
+
+  // Sets up callback
+  mStreamBuffer.SetVertexBufferUpdateCallback(std::move(mStreamBufferUpdateCallback));
+
+  mRenderer = Renderer::New(mGeometry, mShader);
+
+  mRenderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY);
+  // If no texture created, the substitute rect 2x2 texture will be used
+  if(!mTexture)
+  {
+    mTexture         = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 2u, 2u);
+    auto* pixelArray = new uint32_t[4]{
+      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF};
+
+    auto pixelData = PixelData::New(reinterpret_cast<uint8_t*>(pixelArray), 16, 2, 2, Pixel::Format::RGBA8888, PixelData::DELETE_ARRAY);
+    mTexture.Upload(pixelData);
+  }
+  mTextureSet = TextureSet::New();
+  mTextureSet.SetTexture(0, mTexture);
+  mRenderer.SetTextures(mTextureSet);
+  mTextureSet.SetSampler(0, Sampler());
+
+  if(mBlendingMode == BlendingMode::SCREEN)
+  {
+    if(Dali::Capabilities::IsBlendEquationSupported(Dali::DevelBlendEquation::SCREEN))
+    {
+      mEmitter->GetActor().SetProperty(Dali::DevelActor::Property::BLEND_EQUATION, Dali::DevelBlendEquation::SCREEN);
+    }
+    else // Fallback to default
+    {
+      mRenderer.SetProperty(Renderer::Property::BLEND_EQUATION_RGB, BlendEquation::ADD);
+    }
+  }
+  else
+  {
+    mRenderer.SetProperty(Renderer::Property::BLEND_EQUATION_RGB, BlendEquation::ADD);
+  }
+}
+
+uint32_t ParticleRenderer::OnStreamBufferUpdate(void* streamData, size_t size)
+{
+  auto& list = GetImplementation(mEmitter->GetParticleList());
+
+  auto particleCount    = list.GetActiveParticleCount(); // active particle count
+  auto particleMaxCount = list.GetParticleCount();
+  if(!particleCount)
+  {
+    return 0;
+  }
+
+  auto streamCount = list.GetStreamCount();
+
+  auto elementSize = 0u; // elements size should be cached (it's also stride of buffer) (in bytes)
+  for(auto i = 0u; i < streamCount; ++i)
+  {
+    if(!list.IsStreamLocal(i))
+    {
+      elementSize += list.GetStreamDataTypeSize(i);
+    }
+  }
+
+  // Prepare source buffer (MUST BE OPTIMIZED TO AVOID ALLOCATING AND COPYING!!)
+  auto totalSize = particleMaxCount * elementSize * 6u;
+
+  // buffer sizes must match
+  if(totalSize != size)
+  {
+    // ASSERT here ?
+    return 0;
+  }
+
+  auto* dst = reinterpret_cast<uint8_t*>(streamData);
+
+  auto& particles = list.GetParticles();
+
+  // prepare worker threads
+  auto workerCount = GetThreadPool().GetWorkerCount();
+
+  // divide particles if over the threshold
+
+  [[maybe_unused]] bool runParallel = true;
+  if(!mEmitter->IsParallelProcessingEnabled() || particleCount < workerCount * 10) // don't run parallel if only a few particles to update
+  {
+    runParallel = false;
+  }
+  else
+  {
+    // Partial to handle
+    auto partialSize = (particleCount / workerCount);
+
+    struct UpdateTask
+    {
+      UpdateTask(Internal::ParticleRenderer& renderer, Internal::ParticleList& list, uint32_t particleStartIndex, uint32_t particleCount, void* basePtr)
+      : owner(renderer),
+        particleList(list),
+        startIndex(particleStartIndex),
+        count(particleCount),
+        ptr(reinterpret_cast<uint8_t*>(basePtr))
+      {
+      }
+
+      void Update()
+      {
+        // execute task
+        owner.UpdateParticlesTask(particleList, startIndex, count, ptr);
+      }
+
+      Internal::ParticleRenderer& owner;
+      Internal::ParticleList&     particleList;
+      uint32_t                    startIndex;
+      uint32_t                    count;
+      uint8_t*                    ptr;
+    };
+
+    std::vector<UpdateTask> tasks;
+    tasks.reserve(workerCount);
+    std::vector<Task> taskQueue;
+    auto              count = partialSize;
+
+    for(auto i = 0u; i < workerCount; ++i)
+    {
+      auto index = i * partialSize;
+      count      = partialSize;
+
+      // make sure there's no leftover particles!
+      if(i == workerCount - 1 && index + count < particleCount)
+      {
+        count = particleCount - index;
+      }
+
+      tasks.emplace_back(*this, list, index, count, streamData);
+      taskQueue.emplace_back([&t = tasks.back()](uint32_t threadId) { t.Update(); });
+    }
+
+    // Execute worker tasks
+    auto future = GetThreadPool().SubmitTasks(taskQueue, 0);
+    // wait to finish
+    future->Wait();
+  }
+
+  // less particles so run on a single thread
+  if(!runParallel)
+  {
+    for(auto& p : particles)
+    {
+      // without instancing we need to duplicate data 4 times per each quad
+      auto* particleDst = dst;
+      for(auto s = 0u; s < streamCount; ++s)
+      {
+        if(!list.IsStreamLocal(s))
+        {
+          // Pointer to stream value
+          auto* valuePtr = &p.GetByIndex<uint8_t*>(s);
+
+          // Size of data
+          auto dataSize = list.GetStreamDataTypeSize(s);
+
+          memcpy(dst, valuePtr, dataSize);
+          dst += dataSize;
+        }
+      }
+      // Replicate data 5 more times for each vertex (GLES2)
+      memcpy(dst, particleDst, elementSize);
+      dst += elementSize;
+      memcpy(dst, particleDst, elementSize);
+      dst += elementSize;
+      memcpy(dst, particleDst, elementSize);
+      dst += elementSize;
+      memcpy(dst, particleDst, elementSize);
+      dst += elementSize;
+      memcpy(dst, particleDst, elementSize);
+      dst += elementSize;
+    }
+  }
+  return particleCount * 6u; // return number of elements to render
+}
+
+Renderer ParticleRenderer::GetRenderer() const
+{
+  return mRenderer;
+}
+
+void ParticleRenderer::UpdateParticlesTask(Internal::ParticleList& list,
+                                           uint32_t                particleStartIndex,
+                                           uint32_t                particleCount,
+                                           uint8_t*                basePtr)
+{
+  auto& particles   = list.GetParticles();
+  auto  streamCount = list.GetStreamCount();
+  auto  elementSize = list.GetStreamElementSize(false);
+
+  // calculate begin of buffer
+  uint8_t* dst = (basePtr + (elementSize * 6u) * particleStartIndex);
+
+  auto it = particles.begin();
+  std::advance(it, particleStartIndex);
+
+  for(; particleCount; particleCount--, it++)
+  {
+    ParticleSystem::Particle& p = *it;
+    // without instancing we need to duplicate data 4 times per each quad
+    auto* particleDst = dst;
+    for(auto s = 0u; s < streamCount; ++s)
+    {
+      if(!list.IsStreamLocal(s))
+      {
+        // Pointer to stream value
+        auto* valuePtr = &p.GetByIndex<uint8_t*>(s);
+
+        // Size of data
+        auto dataSize = list.GetStreamDataTypeSize(s);
+
+        memcpy(dst, valuePtr, dataSize);
+        dst += dataSize;
+      }
+    }
+    // Replicate data 5 more times for each vertex (GLES2)
+    memcpy(dst, particleDst, elementSize);
+    dst += elementSize;
+    memcpy(dst, particleDst, elementSize);
+    dst += elementSize;
+    memcpy(dst, particleDst, elementSize);
+    dst += elementSize;
+    memcpy(dst, particleDst, elementSize);
+    dst += elementSize;
+    memcpy(dst, particleDst, elementSize);
+    dst += elementSize;
+  }
+}
+
+bool ParticleRenderer::Initialize()
+{
+  if(!mInitialized)
+  {
+    CreateShader();
+    mInitialized = true;
+    return true;
+  }
+
+  return false;
+}
+
+void ParticleRenderer::PrepareToDie()
+{
+  if(mStreamBuffer)
+  {
+    mStreamBuffer.ClearVertexBufferUpdateCallback();
+  }
+}
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
diff --git a/dali-toolkit/internal/particle-system/particle-renderer-impl.h b/dali-toolkit/internal/particle-system/particle-renderer-impl.h
new file mode 100644
index 0000000..bad792c
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-renderer-impl.h
@@ -0,0 +1,120 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_RENDERER_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_RENDERER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <memory>
+
+#include <dali-toolkit/public-api/particle-system/particle-emitter.h>
+#include <dali-toolkit/public-api/particle-system/particle-renderer.h>
+#include <dali-toolkit/public-api/particle-system/particle.h>
+
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/rendering/renderer.h>
+#include <dali/public-api/rendering/vertex-buffer.h>
+#include <dali/public-api/signals/render-callback.h>
+
+namespace Dali::Graphics
+{
+class Controller;
+class Shader;
+} // namespace Dali::Graphics
+
+namespace Dali::Toolkit::ParticleSystem
+{
+class ParticleEmitter;
+}
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleEmitter;
+class ParticleRenderer;
+class ParticleList;
+
+class ParticleRenderer : public Dali::BaseObject
+{
+public:
+  ParticleRenderer();
+
+  /**
+   * Create shader
+   */
+  void CreateShader();
+
+  void SetTexture(const Dali::Texture& texture);
+
+  void SetBlendingMode(BlendingMode blendingMode);
+
+  BlendingMode GetBlendingMode() const;
+
+  bool Initialize();
+
+  void PrepareToDie();
+
+  void SetEmitter(ParticleSystem::Internal::ParticleEmitter* emitter);
+
+  void UpdateParticlesTask(Internal::ParticleList& list,
+                           uint32_t                particleStartIndex,
+                           uint32_t                particleCount,
+                           uint8_t*                dst);
+
+  [[nodiscard]] Renderer GetRenderer() const;
+
+  uint32_t OnStreamBufferUpdate(void* data, size_t size);
+
+  bool mUsingStreamDivisor{true}; ///< If attribute divisor is supported, it's going to be used
+
+  Internal::ParticleEmitter* mEmitter{nullptr}; ///< Emitter implementation that uses the renderer
+
+  Dali::Texture      mTexture;
+  Dali::TextureSet   mTextureSet;
+  Dali::Renderer     mRenderer;
+  Dali::Shader       mShader;
+  Dali::Geometry     mGeometry;
+  Dali::VertexBuffer mVertexBuffer;
+  Dali::VertexBuffer mStreamBuffer;
+  BlendingMode       mBlendingMode{BlendingMode::DEFAULT};
+
+  std::unique_ptr<Dali::VertexBufferUpdateCallback> mStreamBufferUpdateCallback;
+
+  bool mInitialized{false};
+};
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+namespace Dali
+{
+inline Toolkit::ParticleSystem::Internal::ParticleRenderer& GetImplementation(Toolkit::ParticleSystem::ParticleRenderer& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleRenderer handle is empty");
+
+  BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<Toolkit::ParticleSystem::Internal::ParticleRenderer&>(handle);
+}
+
+inline const Toolkit::ParticleSystem::Internal::ParticleRenderer& GetImplementation(const Toolkit::ParticleSystem::ParticleRenderer& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleRenderer handle is empty");
+
+  const BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<const Toolkit::ParticleSystem::Internal::ParticleRenderer&>(handle);
+}
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_RENDERER_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-source-impl.cpp b/dali-toolkit/internal/particle-system/particle-source-impl.cpp
new file mode 100644
index 0000000..3d5c0a3
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-source-impl.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/internal/particle-system/particle-emitter-impl.h>
+#include <dali-toolkit/internal/particle-system/particle-list-impl.h>
+#include <dali-toolkit/internal/particle-system/particle-source-impl.h>
+#include <memory>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+ParticleSource::ParticleSource(std::unique_ptr<ParticleSourceInterface>&& sourceUpdater)
+: mUpdater(std::move(sourceUpdater))
+{
+}
+
+void ParticleSource::Update(ParticleSystem::ParticleList& list, uint32_t count)
+{
+  // updating the source
+  mUpdater->Update(list, count);
+}
+
+ParticleSourceInterface& ParticleSource::GetUpdater() const
+{
+  return *mUpdater;
+}
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
\ No newline at end of file
diff --git a/dali-toolkit/internal/particle-system/particle-source-impl.h b/dali-toolkit/internal/particle-system/particle-source-impl.h
new file mode 100644
index 0000000..21692ac
--- /dev/null
+++ b/dali-toolkit/internal/particle-system/particle-source-impl.h
@@ -0,0 +1,67 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_SOURCE_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_SOURCE_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/public-api/particle-system/particle-source.h>
+#include <dali/public-api/object/base-object.h>
+#include <memory>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleList;
+class ParticleEmitter;
+class ParticleSource : public Dali::BaseObject
+{
+public:
+  ~ParticleSource() override = default;
+
+  explicit ParticleSource(std::unique_ptr<ParticleSourceInterface>&& sourceUpdater);
+
+  void Update(ParticleSystem::ParticleList& list, uint32_t count);
+
+  [[nodiscard]] ParticleSourceInterface& GetUpdater() const;
+
+private:
+  std::unique_ptr<ParticleSourceInterface> mUpdater;
+};
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal
+
+namespace Dali::Toolkit::ParticleSystem
+{
+inline Internal::ParticleSource& GetImplementation(ParticleSystem::ParticleSource& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleSource handle is empty");
+
+  BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<Internal::ParticleSource&>(handle);
+}
+
+inline const Internal::ParticleSource& GetImplementation(const ParticleSystem::ParticleSource& source)
+{
+  DALI_ASSERT_ALWAYS(source && "ParticleSource handle is empty");
+
+  const BaseObject& handle = source.GetBaseObject();
+
+  return static_cast<const Internal::ParticleSource&>(handle);
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_INTERNAL_PARTICLE_SOURCE_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp
index 0968081..8cd7ba5 100644
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,8 @@ const char* APPLICATION_RESOURCE_PATH_KEY = "APPLICATION_RESOURCE_PATH";
 
 const char* DEFAULT_TOOLKIT_PACKAGE_PATH = "/toolkit/";
 
+static constexpr int32_t COUNT_BROKEN_IMAGE_MAX = 3;
+
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_STYLE");
 #endif
@@ -116,7 +118,6 @@ StyleManager::StyleManager()
   if(mStyleMonitor)
   {
     mStyleMonitor.StyleChangeSignal().Connect(this, &StyleManager::StyleMonitorChange);
-    mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
   }
 
   // Set the full path for the default style theme.
@@ -125,6 +126,9 @@ StyleManager::StyleManager()
 
   // Sound & haptic style
   mFeedbackStyle = new FeedbackStyle();
+
+  // Initialize BrokenImages
+  mBrokenImageUrls.assign(COUNT_BROKEN_IMAGE_MAX, "");
 }
 
 StyleManager::~StyleManager()
@@ -230,6 +234,11 @@ Toolkit::StyleManager::StyleChangedSignalType& StyleManager::ControlStyleChangeS
   return mControlStyleChangeSignal;
 }
 
+Toolkit::DevelStyleManager::BrokenImageChangedSignalType& StyleManager::BrokenImageChangedSignal()
+{
+  return mBrokenImageChangedSignal;
+}
+
 void StyleManager::SetTheme(const std::string& themeFile)
 {
   bool themeLoaded = false;
@@ -275,38 +284,62 @@ void StyleManager::SetTheme(const std::string& themeFile)
   }
 }
 
-const Property::Map StyleManager::GetConfigurations()
+const Property::Map& StyleManager::GetConfigurations()
 {
   DALI_LOG_STREAM(gLogFilter, Debug::Concise, "GetConfigurations()\n On entry, mThemeBuilder: " << (bool(mThemeBuilder) ? "Created" : "Empty") << "  mThemeFile: " << mThemeFile);
 
-  Property::Map result;
-  if(mThemeBuilder)
-  {
-    result = mThemeBuilder.GetConfigurations();
-  }
-  else
+  if(!mThemeBuilder)
   {
     DALI_LOG_STREAM(gLogFilter, Debug::Concise, "GetConfigurations()  Loading default theme");
 
-    bool themeLoaded = false;
-
     mThemeBuilder = CreateBuilder(mThemeBuilderConstants);
 
     // Load default theme because this is first try to load stylesheet.
-    themeLoaded = LoadJSON(mThemeBuilder, mDefaultThemeFilePath);
-    mThemeFile  = mDefaultThemeFilePath;
-
-    if(themeLoaded)
-    {
-      result = mThemeBuilder.GetConfigurations();
-    }
+#if defined(DEBUG_ENABLED)
+    bool themeLoaded = LoadJSON(mThemeBuilder, mDefaultThemeFilePath);
     DALI_LOG_STREAM(gLogFilter, Debug::Concise, "  themeLoaded" << (themeLoaded ? "success" : "failure"));
+#else
+    LoadJSON(mThemeBuilder, mDefaultThemeFilePath);
+#endif
+
+    mThemeFile = mDefaultThemeFilePath;
   }
 
+#if defined(DEBUG_ENABLED)
+  Property::Map result = mThemeBuilder.GetConfigurations();
   DALI_LOG_STREAM(gLogFilter, Debug::Concise, "GetConfigurations()\n On exit, result Count: " << (result.Count() != 0));
   DALI_LOG_STREAM(gLogFilter, Debug::Verbose, "          result: " << result);
+#endif
+
+  return mThemeBuilder.GetConfigurations();
+}
+
+void StyleManager::SetBrokenImageUrl(DevelStyleManager::BrokenImageType brokenImageType, const std::string& brokenImageUrl)
+{
+  int brokenType                     = static_cast<int>(brokenImageType);
+  mBrokenImageUrls[brokenType]       = brokenImageUrl;
+  Toolkit::StyleManager styleManager = StyleManager::Get();
+  mBrokenImageChangedSignal.Emit(styleManager);
+}
 
-  return result;
+std::string StyleManager::GetBrokenImageUrl(DevelStyleManager::BrokenImageType brokenImageType)
+{
+  int brokenType = static_cast<int>(brokenImageType);
+  return mBrokenImageUrls[brokenType];
+}
+
+std::vector<std::string> StyleManager::GetBrokenImageUrlList()
+{
+  // create a list for brokenImage
+  std::vector<std::string> brokenImageUrlList;
+  for(int i = 0; i < COUNT_BROKEN_IMAGE_MAX; i++)
+  {
+    if(!mBrokenImageUrls[i].empty())
+    {
+      brokenImageUrlList.push_back(mBrokenImageUrls[i]);
+    }
+  }
+  return brokenImageUrlList;
 }
 
 bool StyleManager::LoadFile(const std::string& filename, std::string& stringOut)
@@ -437,6 +470,11 @@ void StyleManager::ApplyStyle(Toolkit::Builder builder, Toolkit::Control control
     builder.ApplyStyle(styleName, control);
   }
 
+  if(mDefaultFontSize == -1 && mStyleMonitor.EnsureFontClientCreated())
+  {
+    mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
+  }
+
   if(mDefaultFontSize >= 0)
   {
     // Apply the style for logical font size
diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h
index b6eaff5..3aacf79 100644
--- a/dali-toolkit/internal/styling/style-manager-impl.h
+++ b/dali-toolkit/internal/styling/style-manager-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/builder/builder.h>
+#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 #include <dali-toolkit/internal/builder/style.h>
 #include <dali-toolkit/public-api/styling/style-manager.h>
 
@@ -92,7 +93,22 @@ public: // Public API
   /**
    * @copydoc Toolkit::StyleManager::GetConfigurations
    */
-  const Property::Map GetConfigurations();
+  const Property::Map& GetConfigurations();
+
+  /**
+   * @copydoc Toolkit::DevelStyleManager::SetBrokenImageUrl
+   */
+  void SetBrokenImageUrl(DevelStyleManager::BrokenImageType brokenImageType, const std::string& brokenImageUrl);
+
+  /**
+   * @copydoc Toolkit::DevelStyleManager::GetBrokenImageUrl
+   */
+  std::string GetBrokenImageUrl(DevelStyleManager::BrokenImageType brokenImageType);
+
+  /**
+   * @copydoc Toolkit::DevelStyleManager::GetBrokenImageUrlList
+   */
+  std::vector<std::string> GetBrokenImageUrlList();
 
   /**
    * @brief Apply the theme style to a control.
@@ -136,6 +152,12 @@ public:
    */
   Toolkit::StyleManager::StyleChangedSignalType& ControlStyleChangeSignal();
 
+  /**
+   * This signal is sent to the visual factory following a broken image change.
+   * It should not be exposed in the public API
+   */
+  Toolkit::DevelStyleManager::BrokenImageChangedSignalType& BrokenImageChangedSignal();
+
 private:
   typedef std::vector<std::string> StringList;
 
@@ -233,9 +255,12 @@ private:
 
   Toolkit::Internal::FeedbackStyle* mFeedbackStyle; ///< Feedback style
 
+  std::vector<std::string> mBrokenImageUrls; ///< Broken Image Urls received from user
+
   // Signals
-  Toolkit::StyleManager::StyleChangedSignalType mControlStyleChangeSignal; ///< Emitted when the style( theme/font ) changes for the controls to style themselves
-  Toolkit::StyleManager::StyleChangedSignalType mStyleChangedSignal;       ///< Emitted after the controls have been styled
+  Toolkit::StyleManager::StyleChangedSignalType            mControlStyleChangeSignal; ///< Emitted when the style( theme/font ) changes for the controls to style themselves
+  Toolkit::StyleManager::StyleChangedSignalType            mStyleChangedSignal;       ///< Emitted after the controls have been styled
+  Toolkit::DevelStyleManager::BrokenImageChangedSignalType mBrokenImageChangedSignal; ///< Emitted after brokenImageChangedSignal
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/text/abstract-style-character-run.cpp b/dali-toolkit/internal/text/abstract-style-character-run.cpp
new file mode 100644
index 0000000..60b7a8a
--- /dev/null
+++ b/dali-toolkit/internal/text/abstract-style-character-run.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+CharacterIndex AbstractStyleCharacterRun::GetStartCharacterIndex() const
+{
+  return characterRun.characterIndex;
+}
+
+Length AbstractStyleCharacterRun::GetNumberOfCharacters() const
+{
+  return characterRun.numberOfCharacters;
+}
+
+CharacterIndex AbstractStyleCharacterRun::GetEndCharacterIndex() const
+{
+  return characterRun.GetEndCharacterIndex();
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/abstract-style-character-run.h b/dali-toolkit/internal/text/abstract-style-character-run.h
new file mode 100644
index 0000000..7822679
--- /dev/null
+++ b/dali-toolkit/internal/text/abstract-style-character-run.h
@@ -0,0 +1,117 @@
+#ifndef DALI_TOOLKIT_TEXT_ABSTRACT_STYLE_CHARACTER_RUN_H
+#define DALI_TOOLKIT_TEXT_ABSTRACT_STYLE_CHARACTER_RUN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/type-traits.h>
+#include <dali/public-api/math/vector4.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Run of characters with the same style.
+ */
+struct AbstractStyleCharacterRun
+{
+  CharacterRun characterRun; ///< The initial character index and the number of characters of the run.
+
+  // Constructors
+
+protected:
+  /**
+   * @brief Constructor.
+   * Default constructor to set the default values
+   */
+  AbstractStyleCharacterRun()
+  : characterRun{}
+  {
+  }
+
+  /**
+   * @brief Constructor.
+   * Default constructor to set the default values
+   *
+   * @param[in] characterRun the character run
+   */
+  AbstractStyleCharacterRun(const CharacterRun& characterRun)
+  : characterRun{characterRun}
+  {
+  }
+
+public:
+  AbstractStyleCharacterRun(const AbstractStyleCharacterRun&) = default;
+
+  AbstractStyleCharacterRun(AbstractStyleCharacterRun&&) noexcept = default;
+
+  // Operators
+
+  AbstractStyleCharacterRun& operator=(const AbstractStyleCharacterRun&) = default;
+
+  AbstractStyleCharacterRun& operator=(AbstractStyleCharacterRun&&) noexcept = default;
+
+  /**
+   * @brief Destructor.
+   */
+  virtual ~AbstractStyleCharacterRun() = default;
+
+  //Methods
+
+  /**
+  * @brief Retrive the first index in run.
+  * @return the end character index in run.
+  */
+  CharacterIndex GetStartCharacterIndex() const;
+
+  /**
+  * @brief Retrive the number of characters in the run.
+  * @return the the number of characters in run.
+  */
+  Length GetNumberOfCharacters() const;
+
+  /**
+  * @brief Calculate the end index in run.
+  * @return the end character index in run.
+  */
+  CharacterIndex GetEndCharacterIndex() const;
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow AbstractStyleCharacterRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::AbstractStyleCharacterRun> : public Dali::BasicTypes<Dali::Toolkit::Text::AbstractStyleCharacterRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_ABSTRACT_STYLE_CHARACTER_RUN_H
diff --git a/dali-toolkit/internal/text/anchor.h b/dali-toolkit/internal/text/anchor.h
index d2c7384..0538f44 100644
--- a/dali-toolkit/internal/text/anchor.h
+++ b/dali-toolkit/internal/text/anchor.h
@@ -35,6 +35,15 @@ struct Anchor
   CharacterIndex startIndex; ///< The character's start index of the anchor within the string.
   CharacterIndex endIndex;   ///< The character's end index of the anchor within the string.
   char*          href;       ///< The url path
+
+  uint32_t colorRunIndex;               ///< RunIndex of color run, used to change color when property updated or clicked.
+  uint32_t underlinedCharacterRunIndex; ///< RunIndex of underline run, used to change color when property updated or clicked.
+
+  Vector4 markupClickedColor; ///< The markup color of the anchor when clicked. if there is no markup attribute, the default color stored in the controller is used.
+
+  bool     isClicked               = false; ///< Whether the anchor is clicked or not.
+  bool     isMarkupColorSet        = false; ///< Whether the markup color has been set or not.
+  bool     isMarkupClickedColorSet = false; ///< Whether the markup clicked color has been set or not.
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/bidirectional-support.cpp b/dali-toolkit/internal/text/bidirectional-support.cpp
index 9bf27f8..b158e7c 100644
--- a/dali-toolkit/internal/text/bidirectional-support.cpp
+++ b/dali-toolkit/internal/text/bidirectional-support.cpp
@@ -313,12 +313,12 @@ void GetCharactersDirection(const Vector<BidirectionalParagraphInfoRun>& bidirec
     const Length numberOfLeftToRightCharacters = paragraph.characterRun.characterIndex - index;
     if(numberOfLeftToRightCharacters > 0u)
     {
-      memset(directionsBuffer + index - startIndex, false, numberOfLeftToRightCharacters * sizeof(bool));
+      memset(directionsBuffer + static_cast<std::size_t>(index - startIndex), false, static_cast<std::size_t>(numberOfLeftToRightCharacters) * sizeof(bool));
     }
 
     // Set the directions of the bidirectional text.
     bidirectionalSupport.GetCharactersDirection(paragraph.bidirectionalInfoIndex,
-                                                directionsBuffer + paragraph.characterRun.characterIndex - startIndex,
+                                                directionsBuffer + static_cast<std::size_t>(paragraph.characterRun.characterIndex - startIndex),
                                                 paragraph.characterRun.numberOfCharacters);
 
     // Update the index.
@@ -326,7 +326,7 @@ void GetCharactersDirection(const Vector<BidirectionalParagraphInfoRun>& bidirec
   }
 
   // Fills with left to right those paragraphs without right to left characters.
-  memset(directionsBuffer + index - startIndex, false, (lastCharacter - index) * sizeof(bool));
+  memset(directionsBuffer + static_cast<std::size_t>(index - startIndex), false, static_cast<std::size_t>(lastCharacter - index) * sizeof(bool));
 
   // If the direction info is updated, it needs to be inserted in the model.
   if(updateCurrentBuffer)
diff --git a/dali-toolkit/internal/text/bounded-paragraph-helper-functions.cpp b/dali-toolkit/internal/text/bounded-paragraph-helper-functions.cpp
new file mode 100644
index 0000000..219f7bf
--- /dev/null
+++ b/dali-toolkit/internal/text/bounded-paragraph-helper-functions.cpp
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/bounded-paragraph-helper-functions.h>
+
+// INTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/script.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void MergeBoundedParagraphRunsWhenRemoveCharacters(const Vector<Character>&     text,
+                                                   const CharacterIndex&        index,
+                                                   const int&                   numberOfCharacters,
+                                                   Vector<BoundedParagraphRun>& boundedParagraphRuns)
+{
+  // This works on boundedParagraphRuns before applying on them the changes of the removed characters.
+  // Update to merge only when characters have been removed.
+  if(numberOfCharacters >= 0)
+  {
+    return;
+  }
+
+  //No runs to merge
+  if(boundedParagraphRuns.Count() == 0u)
+  {
+    return;
+  }
+
+  const Length          numberOfRemovedCharacters     = (Length)(-1 * numberOfCharacters);
+  const Length          totalNumberOfCharacters       = text.Count();
+  const CharacterIndex& firstIndexOfRemovedCharacters = index;
+  const CharacterIndex  lastIndexOfRemovedCharacters  = ((firstIndexOfRemovedCharacters + numberOfRemovedCharacters) > 0u) ? (firstIndexOfRemovedCharacters + numberOfRemovedCharacters - 1u) : firstIndexOfRemovedCharacters; // Note: Length is uint32. Extra validation to avoid  a potential defects.
+
+  Length numberOfRuns          = boundedParagraphRuns.Count();
+  Length firstRunIndexToUpdate = 0;
+  Length lastRunIndexToUpdate  = 0;
+  bool   noNeedToMerge         = false;
+
+  // Find the first boundedParagraphRuns that is possible to be updated.
+  while(firstRunIndexToUpdate < numberOfRuns)
+  {
+    const CharacterIndex startCharIndex = boundedParagraphRuns[firstRunIndexToUpdate].characterRun.characterIndex;
+    const CharacterIndex endCharIndex   = boundedParagraphRuns[firstRunIndexToUpdate].characterRun.GetEndCharacterIndex();
+
+    // In-case the paragraph separator of the plain text (before the current bounded paragraph) is removed.
+    // In-case the start index of the current bounded paragraph is between start and end indices of removed characters.
+    // In-case the end index of the current bounded paragraph is between start and end indices of removed characters.
+    if((startCharIndex == lastIndexOfRemovedCharacters + 1u) ||
+       ((firstIndexOfRemovedCharacters <= startCharIndex) && (startCharIndex <= lastIndexOfRemovedCharacters)) ||
+       ((firstIndexOfRemovedCharacters <= endCharIndex) && (endCharIndex <= lastIndexOfRemovedCharacters)))
+    {
+      break;
+    }
+    else if(lastIndexOfRemovedCharacters + 1u < startCharIndex)
+    { // The whole removed characters are exist before the remaining bounded paragraphs.
+      noNeedToMerge = true;
+      break;
+    }
+    firstRunIndexToUpdate++;
+  }
+
+  // There is no run was affected by the removed characters.
+  if(noNeedToMerge || (firstRunIndexToUpdate == numberOfRuns))
+  {
+    return;
+  }
+
+  // Find the last boundedParagraphRuns that is possible to be updated.
+  lastRunIndexToUpdate = firstRunIndexToUpdate;
+  while(lastRunIndexToUpdate < numberOfRuns - 1u)
+  {
+    const CharacterIndex startCharIndex = boundedParagraphRuns[lastRunIndexToUpdate].characterRun.characterIndex;
+    const CharacterIndex endCharIndex   = boundedParagraphRuns[lastRunIndexToUpdate].characterRun.GetEndCharacterIndex();
+
+    if((lastIndexOfRemovedCharacters < endCharIndex) ||
+       (lastIndexOfRemovedCharacters + 1u <= startCharIndex))
+    {
+      break;
+    }
+
+    lastRunIndexToUpdate++;
+  }
+
+  // Remove all boundedParagraphRun between firstRunIndexToUpdate and lastRunIndexToUpdate
+  // At least one boundedParagraphRun between firstRunIndexToUpdate and lastRunIndexToUpdate
+  if(firstRunIndexToUpdate + 1u < lastRunIndexToUpdate)
+  {
+    Length runIndexToDelete = firstRunIndexToUpdate + 1u;
+
+    while(runIndexToDelete < lastRunIndexToUpdate)
+    {
+      Dali::Vector<BoundedParagraphRun>::Iterator paragraphToDelete = boundedParagraphRuns.Begin() + (runIndexToDelete);
+      boundedParagraphRuns.Remove(paragraphToDelete);
+
+      lastRunIndexToUpdate--;
+      numberOfRuns--;
+    }
+  }
+
+  CharacterIndex endCharIndexFirstRun = boundedParagraphRuns[firstRunIndexToUpdate].characterRun.GetEndCharacterIndex();
+  ;
+  if(firstRunIndexToUpdate == lastRunIndexToUpdate)
+  {
+    if(endCharIndexFirstRun < lastIndexOfRemovedCharacters)
+    {
+      boundedParagraphRuns[firstRunIndexToUpdate].characterRun.numberOfCharacters += (lastIndexOfRemovedCharacters - endCharIndexFirstRun);
+    }
+  }
+  else
+  {
+    CharacterIndex startCharIndexLastRun = boundedParagraphRuns[lastRunIndexToUpdate].characterRun.characterIndex;
+    boundedParagraphRuns[firstRunIndexToUpdate].characterRun.numberOfCharacters += ((startCharIndexLastRun - endCharIndexFirstRun) > 0u) ? (startCharIndexLastRun - endCharIndexFirstRun - 1u) : 0u; // Note: Length is uint32. Extra validation to avoid  a potential defects.
+
+    CharacterIndex endCharIndexLastRun = boundedParagraphRuns[lastRunIndexToUpdate].characterRun.GetEndCharacterIndex();
+
+    if(endCharIndexLastRun < lastIndexOfRemovedCharacters)
+    {
+      boundedParagraphRuns[lastRunIndexToUpdate].characterRun.numberOfCharacters += (lastIndexOfRemovedCharacters - endCharIndexLastRun);
+    }
+  }
+
+  // Each endCharIndex for boundedParagraphRun is a paragraph separator.
+  // If not then keep adding characters until find paragraph separator.
+  Length runIndex = firstRunIndexToUpdate;
+  while(runIndex <= lastRunIndexToUpdate)
+  {
+    CharacterIndex endCharIndex = boundedParagraphRuns[runIndex].characterRun.GetEndCharacterIndex();
+
+    // The remaining text was not affected.
+    if(endCharIndex > lastIndexOfRemovedCharacters)
+    {
+      break;
+    }
+
+    // Reference for numberOfCharacters in current run to update it
+    CharacterIndex& numberOfCharactersInRun = boundedParagraphRuns[runIndex].characterRun.numberOfCharacters;
+
+    // In-case arrived to the start of the next run and there is no paragraph separator.
+    // Merging the next run with the current run. Removing the next run.
+    if((runIndex + 1u < numberOfRuns) &&
+       (endCharIndex <= lastIndexOfRemovedCharacters) &&
+       ((lastIndexOfRemovedCharacters + 1u) < totalNumberOfCharacters) &&
+       (!TextAbstraction::IsNewParagraph(*(text.Begin() + lastIndexOfRemovedCharacters + 1u))))
+    {
+      numberOfCharactersInRun += boundedParagraphRuns[runIndex + 1u].characterRun.numberOfCharacters;
+
+      Dali::Vector<BoundedParagraphRun>::Iterator paragraphToDelete = boundedParagraphRuns.Begin() + (runIndex + 1u);
+      boundedParagraphRuns.Remove(paragraphToDelete);
+
+      numberOfRuns--;
+      if(lastRunIndexToUpdate == 0u)
+      {
+        break;
+      }
+      lastRunIndexToUpdate--;
+
+      continue;
+    }
+
+    runIndex++;
+  }
+
+  // Each startCharIndex-1u for boundedParagraphRun is a paragraph separator.
+  // If not then remove boundedParagraphRun.
+  if(numberOfRuns > 0u &&
+     firstIndexOfRemovedCharacters > 0u &&
+     boundedParagraphRuns[firstRunIndexToUpdate].characterRun.characterIndex > 0u)
+  {
+    const CharacterIndex startCharIndex = boundedParagraphRuns[firstRunIndexToUpdate].characterRun.characterIndex;
+
+    if(firstIndexOfRemovedCharacters <= startCharIndex && startCharIndex <= lastIndexOfRemovedCharacters + 1u)
+    {
+      // Verify the paragraph separator before the first run to update
+      // In-case the paragraph separator is removed before the boundedParagraphRun.
+      // Remove the boundedParagraphRun.
+      if((!TextAbstraction::IsNewParagraph(*(text.Begin() + firstIndexOfRemovedCharacters - 1u))) &&
+         (!TextAbstraction::IsNewParagraph(*(text.Begin() + startCharIndex))))
+      {
+        Dali::Vector<BoundedParagraphRun>::Iterator paragraphToDelete = boundedParagraphRuns.Begin() + (firstRunIndexToUpdate);
+        boundedParagraphRuns.Remove(paragraphToDelete);
+      }
+    }
+  }
+}
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/bounded-paragraph-helper-functions.h b/dali-toolkit/internal/text/bounded-paragraph-helper-functions.h
new file mode 100644
index 0000000..cdcbc69
--- /dev/null
+++ b/dali-toolkit/internal/text/bounded-paragraph-helper-functions.h
@@ -0,0 +1,54 @@
+#ifndef DALI_TOOLKIT_TEXT_BOUNDED_PARAGRAPH_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_BOUNDED_PARAGRAPH_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Merge BoundedParagraphRun when the paragraph separator has been removed.
+ * Adding the next characters until arrived to a paragraph separator.
+ * Or merging with the next BoundedParagraphRun and removing the next BoundedParagraphRun.
+ *
+ * @param[in] text Vector of UTF-32 characters.
+ * @param[in] index Index to the first character updated.
+ * @param[in] numberOfCharacters The number of the removed characters.
+ * @param[inout] boundedParagraphRuns The bounded paragraph runs.
+ *
+ */
+void MergeBoundedParagraphRunsWhenRemoveCharacters(const Vector<Character>&     text,
+                                                   const CharacterIndex&        index,
+                                                   const int&                   numberOfCharacters,
+                                                   Vector<BoundedParagraphRun>& boundedParagraphRuns);
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_BOUNDED_PARAGRAPH_HELPER_FUNCTIONS_H
diff --git a/dali-toolkit/internal/text/bounded-paragraph-run.h b/dali-toolkit/internal/text/bounded-paragraph-run.h
new file mode 100644
index 0000000..3547095
--- /dev/null
+++ b/dali-toolkit/internal/text/bounded-paragraph-run.h
@@ -0,0 +1,79 @@
+#ifndef DALI_TOOLKIT_TEXT_BOUNDED_PARAGRAPH_RUN_H
+#define DALI_TOOLKIT_TEXT_BOUNDED_PARAGRAPH_RUN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector2.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief BoundedParagraphRun
+ *
+ * In terms of the bidirectional algorithm, a 'paragraph' is understood as a run of characters between Paragraph Separators or appropriate Newline Functions.
+ * A 'paragraph' may also be determined by higher-level protocols like a mark-up tag.
+ * Bounded-paragraph is a pragraph that have been bounded by explicit tags like a mark-up tag.
+ * Bounded-paragraph could contain multi paragraphs that have been breaked by Paragraph Separators or appropriate Newline Functions.
+ * This will be used to handle information for the attributes of markup tag. Like TextAlign, TextDirection, TextIndent, LineHeight, etc.
+ */
+struct BoundedParagraphRun : public AbstractStyleCharacterRun
+{
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  BoundedParagraphRun()
+  : AbstractStyleCharacterRun(),
+    horizontalAlignment(Text::HorizontalAlignment::BEGIN),
+    relativeLineSize(1),
+    horizontalAlignmentDefined{false},
+    relativeLineSizeDefined(false)
+  {
+  }
+
+  Text::HorizontalAlignment::Type horizontalAlignment;            ///< The paragraph horizontal alignment. Values "BEGIN" "CENTER" "END".
+  float                           relativeLineSize;               ///< The relative line height to be used for this paragaraph.
+  bool                            horizontalAlignmentDefined : 1; ///< Whether the horizontal alignment is defined.
+  bool                            relativeLineSizeDefined : 1;    ///< Whether the relative line height is defined for this paragraph.
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow BoundedParagraphRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::BoundedParagraphRun> : public Dali::BasicTypes<Dali::Toolkit::Text::BoundedParagraphRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_BOUNDED_PARAGRAPH_RUN_H
diff --git a/dali-toolkit/internal/text/character-run.h b/dali-toolkit/internal/text/character-run.h
index 51a3ef7..757beb0 100644
--- a/dali-toolkit/internal/text/character-run.h
+++ b/dali-toolkit/internal/text/character-run.h
@@ -46,6 +46,21 @@ struct CharacterRun
 
   CharacterIndex characterIndex;     ///< Index to the first character.
   Length         numberOfCharacters; ///< Number of characters in the run.
+
+  //Methods
+
+  /**
+  * @brief Calculate the end index in run.
+  * @return the end character index in run.
+  */
+  CharacterIndex GetEndCharacterIndex() const
+  {
+    DALI_ASSERT_DEBUG(!((0u == numberOfCharacters) && (characterIndex > 0u)) &&
+                      "Toolkit::Text::CharacterRun. NumberOfCharacters should be greater than zero");
+
+    // Note: Length is uint32. Extra validation to avoid a potential defects.
+    return (numberOfCharacters == 0u ? 0u : (characterIndex + numberOfCharacters - 1u));
+  }
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/character-spacing-character-run.h b/dali-toolkit/internal/text/character-spacing-character-run.h
new file mode 100644
index 0000000..f256c6a
--- /dev/null
+++ b/dali-toolkit/internal/text/character-spacing-character-run.h
@@ -0,0 +1,66 @@
+#ifndef DALI_TOOLKIT_TEXT_CHARACTER_SPACING_CHARACTER_RUN_H
+#define DALI_TOOLKIT_TEXT_CHARACTER_SPACING_CHARACTER_RUN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Run of character-spacing characters with same properties.
+ */
+struct CharacterSpacingCharacterRun : public AbstractStyleCharacterRun
+{
+  /**
+   * @brief Constructor.
+   * Default constructor to set the default values
+   */
+  CharacterSpacingCharacterRun()
+  : AbstractStyleCharacterRun(),
+    value{0.f} //The default value is 0.f which does nothing.
+  {
+  }
+
+  float value; /// The spaces between characters in Pixels. A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+
+  //TODO: Add unit property to choose between Pixel or Scale (%)
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow ColorRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::CharacterSpacingCharacterRun> : public Dali::BasicTypes<Dali::Toolkit::Text::CharacterSpacingCharacterRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CHARACTER_SPACING_CHARACTER_RUN_H
diff --git a/dali-toolkit/internal/text/character-spacing-glyph-run.h b/dali-toolkit/internal/text/character-spacing-glyph-run.h
new file mode 100644
index 0000000..7375533
--- /dev/null
+++ b/dali-toolkit/internal/text/character-spacing-glyph-run.h
@@ -0,0 +1,57 @@
+#ifndef DALI_TOOLKIT_TEXT_CHARACTER_SPACING_GLYPH_RUN_H
+#define DALI_TOOLKIT_TEXT_CHARACTER_SPACING_GLYPH_RUN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector4.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/glyph-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Run of character-spacing glyphs with same properties.
+ */
+struct CharacterSpacingGlyphRun
+{
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  CharacterSpacingGlyphRun()
+  : glyphRun{},
+    value{0.f} //The default value is 0.f which does nothing.
+  {
+  }
+
+  GlyphRun glyphRun; ///< The initial glyph index and the number of glyphs in the run.
+  float    value;    ///< The spaces between characters in Pixels.
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CHARACTER_SPACING_GLYPH_RUN_H
diff --git a/dali-toolkit/internal/text/characters-helper-functions.cpp b/dali-toolkit/internal/text/characters-helper-functions.cpp
new file mode 100644
index 0000000..d89f1fb
--- /dev/null
+++ b/dali-toolkit/internal/text/characters-helper-functions.cpp
@@ -0,0 +1,60 @@
+// FILE HEADER
+#include <dali-toolkit/internal/text/characters-helper-functions.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/emoji-helper.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+CharacterRun RetrieveClusteredCharactersOfCharacterIndex(const VisualModelPtr&  visualModel,
+                                                         const LogicalModelPtr& logicalModel,
+                                                         const CharacterIndex&  characterIndex)
+{
+  // Initialization
+  CharacterRun clusteredCharacters;
+  clusteredCharacters.characterIndex     = characterIndex;
+  clusteredCharacters.numberOfCharacters = 1u;
+
+  const GlyphIndex* const     charactersToGlyphBuffer  = visualModel->mCharactersToGlyph.Begin();
+  const Length* const         charactersPerGlyphBuffer = visualModel->mCharactersPerGlyph.Begin();
+  const CharacterIndex* const glyphsToCharacters       = visualModel->mGlyphsToCharacters.Begin();
+
+  GlyphIndex glyphIndex               = *(charactersToGlyphBuffer + characterIndex);
+  Length     actualNumberOfCharacters = *(charactersPerGlyphBuffer + glyphIndex);
+
+  if(actualNumberOfCharacters > 1u)
+  {
+    const Script script = logicalModel->GetScript(characterIndex);
+    // Prevents to break the Latin ligatures like fi, ff, or Arabic ï»», ...
+    // Keep actual index of character as is. Because these characters cannot be clustered.
+
+    if(!HasLigatureMustBreak(script))
+    {
+      clusteredCharacters.numberOfCharacters = actualNumberOfCharacters;
+      clusteredCharacters.characterIndex     = *(glyphsToCharacters + glyphIndex); // firstCharacterIndex
+    }
+  }
+  else
+  {
+    while(0u == actualNumberOfCharacters)
+    {
+      ++glyphIndex;
+      actualNumberOfCharacters = *(charactersPerGlyphBuffer + glyphIndex);
+    }
+
+    clusteredCharacters.characterIndex     = *(glyphsToCharacters + glyphIndex); // firstCharacterIndex
+    clusteredCharacters.numberOfCharacters = actualNumberOfCharacters;
+  }
+
+  return clusteredCharacters;
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/characters-helper-functions.h b/dali-toolkit/internal/text/characters-helper-functions.h
new file mode 100644
index 0000000..00b1b4e
--- /dev/null
+++ b/dali-toolkit/internal/text/characters-helper-functions.h
@@ -0,0 +1,52 @@
+#ifndef DALI_TOOLKIT_TEXT_CHARACTERS_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_CHARACTERS_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-run.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-model.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Retrieve the clustered consecutive characters that contains current character index.
+ * Found the first index of clustered characters and number of characters.
+ *
+ * @param[in] visualModel The visual model.
+ * @param[in] logicalModel The logical model.
+ * @param[in] characterIndex The character index.
+ *
+ * @return CharacterRun for the clustered characters contains character Index
+ */
+CharacterRun RetrieveClusteredCharactersOfCharacterIndex(const VisualModelPtr&  visualModel,
+                                                         const LogicalModelPtr& logicalModel,
+                                                         const CharacterIndex&  characterIndex);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CHARACTERS_HELPER_FUNCTIONS_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/color-run.h b/dali-toolkit/internal/text/color-run.h
index edae1e2..75bd27b 100644
--- a/dali-toolkit/internal/text/color-run.h
+++ b/dali-toolkit/internal/text/color-run.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_COLOR_RUN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,8 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <dali/public-api/math/vector4.h>
-
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/character-run.h>
-#include <dali-toolkit/internal/text/glyph-run.h>
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
 
 namespace Dali
 {
@@ -34,16 +30,33 @@ namespace Text
 /**
  * @brief Run of characters with the same color.
  */
-struct ColorRun
+struct ColorRun : public AbstractStyleCharacterRun
 {
-  CharacterRun characterRun; ///< The initial character index and the number of characters of the run.
-  Vector4      color;        ///< The color of the characters.
+  /**
+   * @brief Constructor.
+   * Default constructor to set the default values
+   */
+  ColorRun()
+  : AbstractStyleCharacterRun()
+  {
+  }
+  Vector4 color; ///< The color of the characters.
 };
 
 } // namespace Text
 
 } // namespace Toolkit
 
+// Allow ColorRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::ColorRun> : public Dali::BasicTypes<Dali::Toolkit::Text::ColorRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
 } // namespace Dali
 
 #endif // DALI_TOOLKIT_TEXT_COLOR_RUN_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-background-actor.cpp b/dali-toolkit/internal/text/controller/text-controller-background-actor.cpp
new file mode 100644
index 0000000..f37c9c7
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-background-actor.cpp
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-background-actor.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/renderer.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/internal/text/cursor-helper-functions.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
+#include <dali-toolkit/internal/text/text-view.h>
+
+namespace Dali::Toolkit::Text
+{
+namespace
+{
+struct BackgroundVertex
+{
+  Vector2 mPosition; ///< Vertex posiiton
+  Vector4 mColor;    ///< Vertex color
+};
+
+struct BackgroundMesh
+{
+  Vector<BackgroundVertex> mVertices; ///< container of vertices
+  Vector<unsigned short>   mIndices;  ///< container of indices
+};
+} // unnamed namespace
+
+Length CalculateBackgroundLineHeight(LineRun lineRun)
+{
+  Length height = lineRun.ascender + -(lineRun.descender);
+
+  if(lineRun.lineSpacing > 0)
+  {
+    height += lineRun.lineSpacing;
+  }
+
+  return height;
+}
+
+Actor CreateControllerBackgroundActor(const View& textView, const VisualModelPtr& textVisualModel, const LogicalModelPtr& textLogicalModel, Shader& textShaderBackground)
+{
+  // NOTE: Currently we only support background color for left-to-right text.
+
+  Actor actor;
+
+  Length numberOfGlyphs = textView.GetNumberOfGlyphs();
+  if(numberOfGlyphs > 0u)
+  {
+    Vector<GlyphInfo> glyphs;
+    glyphs.Resize(numberOfGlyphs);
+
+    Vector<Vector2> positions;
+    positions.Resize(numberOfGlyphs);
+
+    // Get the line where the glyphs are laid-out.
+    const LineRun* lineRun         = textVisualModel->mLines.Begin();
+    float          alignmentOffset = lineRun->alignmentOffset;
+    numberOfGlyphs                 = textView.GetGlyphs(glyphs.Begin(),
+                                        positions.Begin(),
+                                        alignmentOffset,
+                                        0u,
+                                        numberOfGlyphs);
+
+    glyphs.Resize(numberOfGlyphs);
+    positions.Resize(numberOfGlyphs);
+
+    const GlyphInfo* const glyphsBuffer    = glyphs.Begin();
+    const Vector2* const   positionsBuffer = positions.Begin();
+
+    BackgroundMesh mesh;
+    mesh.mVertices.Reserve(4u * glyphs.Size());
+    mesh.mIndices.Reserve(6u * glyphs.Size());
+
+    const Vector2 textSize = textView.GetLayoutSize();
+
+    const float offsetX = alignmentOffset + textSize.width * 0.5f;
+    const float offsetY = textSize.height * 0.5f;
+
+    const Vector4* const    backgroundColorsBuffer       = textView.GetBackgroundColors();
+    const ColorIndex* const backgroundColorIndicesBuffer = textView.GetBackgroundColorIndices();
+    const Vector4&          defaultBackgroundColor       = textVisualModel->IsBackgroundEnabled() ? textVisualModel->GetBackgroundColor() : Color::TRANSPARENT;
+    const float             modelCharacterSpacing        = textVisualModel->GetCharacterSpacing();
+    Vector<CharacterIndex>& glyphToCharacterMap          = textVisualModel->mGlyphsToCharacters;
+    const CharacterIndex*   glyphToCharacterMapBuffer    = glyphToCharacterMap.Begin();
+    float                   calculatedAdvance            = 0.f;
+
+    // Get the character-spacing runs.
+    const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = textVisualModel->GetCharacterSpacingGlyphRuns();
+
+    Vector4   quad;
+    uint32_t  numberOfQuads = 0u;
+    Length    yLineOffset   = 0;
+    Length    prevLineIndex = 0;
+    LineIndex lineIndex;
+
+    for(uint32_t i = 0, glyphSize = glyphs.Size(); i < glyphSize; ++i)
+    {
+      const GlyphInfo& glyph = *(glyphsBuffer + i);
+
+      // Get the background color of the character.
+      // The color index zero is reserved for the default background color (i.e. Color::TRANSPARENT)
+      const bool       isMarkupBackground       = textView.IsMarkupBackgroundColorSet();
+      const ColorIndex backgroundColorIndex     = isMarkupBackground ? *(backgroundColorIndicesBuffer + i) : 0u;
+      const bool       isDefaultBackgroundColor = (0u == backgroundColorIndex);
+      const Vector4&   backgroundColor          = isDefaultBackgroundColor ? defaultBackgroundColor : *(backgroundColorsBuffer + backgroundColorIndex - 1u);
+
+      lineIndex         = textVisualModel->GetLineOfGlyph(i);
+      Length lineHeight = CalculateBackgroundLineHeight(lineRun[lineIndex]);
+
+      if(lineIndex != prevLineIndex)
+      {
+        yLineOffset += CalculateBackgroundLineHeight(lineRun[prevLineIndex]);
+
+        if(lineRun[prevLineIndex].lineSpacing < 0)
+        {
+          yLineOffset += lineRun[prevLineIndex].lineSpacing;
+        }
+      }
+
+      // Only create quads for glyphs with a background color
+      if(backgroundColor != Color::TRANSPARENT)
+      {
+        const float characterSpacing = GetGlyphCharacterSpacing(i, characterSpacingGlyphRuns, modelCharacterSpacing);
+
+        const Vector2 position = *(positionsBuffer + i);
+        calculatedAdvance      = GetCalculatedAdvance(*(textLogicalModel->mText.Begin() + (*(glyphToCharacterMapBuffer + i))), characterSpacing, glyph.advance);
+
+        if(i == 0u && glyphSize == 1u) // Only one glyph in the whole text
+        {
+          quad.x = position.x;
+          quad.y = yLineOffset;
+          quad.z = quad.x + std::max(calculatedAdvance, glyph.xBearing + glyph.width);
+          quad.w = lineHeight;
+        }
+        else if((lineIndex != prevLineIndex) || (i == 0u)) // The first glyph in the line
+        {
+          quad.x = position.x;
+          quad.y = yLineOffset;
+          quad.z = quad.x - glyph.xBearing + calculatedAdvance;
+          quad.w = quad.y + lineHeight;
+        }
+        else if(i == glyphSize - 1u) // The last glyph in the whole text
+        {
+          quad.x = position.x - glyph.xBearing;
+          quad.y = yLineOffset;
+          quad.z = quad.x + std::max(calculatedAdvance, glyph.xBearing + glyph.width);
+          quad.w = quad.y + lineHeight;
+        }
+        else // The glyph in the middle of the text
+        {
+          quad.x = position.x - glyph.xBearing;
+          quad.y = yLineOffset;
+          quad.z = quad.x + calculatedAdvance;
+          quad.w = quad.y + lineHeight;
+        }
+
+        BackgroundVertex vertex;
+
+        // Top left
+        vertex.mPosition.x = quad.x - offsetX;
+        vertex.mPosition.y = quad.y - offsetY;
+        vertex.mColor      = backgroundColor;
+        mesh.mVertices.PushBack(vertex);
+
+        // Top right
+        vertex.mPosition.x = quad.z - offsetX;
+        vertex.mPosition.y = quad.y - offsetY;
+        vertex.mColor      = backgroundColor;
+        mesh.mVertices.PushBack(vertex);
+
+        // Bottom left
+        vertex.mPosition.x = quad.x - offsetX;
+        vertex.mPosition.y = quad.w - offsetY;
+        vertex.mColor      = backgroundColor;
+        mesh.mVertices.PushBack(vertex);
+
+        // Bottom right
+        vertex.mPosition.x = quad.z - offsetX;
+        vertex.mPosition.y = quad.w - offsetY;
+        vertex.mColor      = backgroundColor;
+        mesh.mVertices.PushBack(vertex);
+
+        // Six indices in counter clockwise winding
+        mesh.mIndices.PushBack(1u + 4 * numberOfQuads);
+        mesh.mIndices.PushBack(0u + 4 * numberOfQuads);
+        mesh.mIndices.PushBack(2u + 4 * numberOfQuads);
+        mesh.mIndices.PushBack(2u + 4 * numberOfQuads);
+        mesh.mIndices.PushBack(3u + 4 * numberOfQuads);
+        mesh.mIndices.PushBack(1u + 4 * numberOfQuads);
+
+        numberOfQuads++;
+      }
+
+      if(lineIndex != prevLineIndex)
+      {
+        prevLineIndex = lineIndex;
+      }
+    }
+
+    // Only create the background actor if there are glyphs with background color
+    if(mesh.mVertices.Count() > 0u)
+    {
+      Property::Map quadVertexFormat;
+      quadVertexFormat["aPosition"] = Property::VECTOR2;
+      quadVertexFormat["aColor"]    = Property::VECTOR4;
+
+      VertexBuffer quadVertices = VertexBuffer::New(quadVertexFormat);
+      quadVertices.SetData(&mesh.mVertices[0], mesh.mVertices.Size());
+
+      Geometry quadGeometry = Geometry::New();
+      quadGeometry.AddVertexBuffer(quadVertices);
+      quadGeometry.SetIndexBuffer(&mesh.mIndices[0], mesh.mIndices.Size());
+
+      if(!textShaderBackground)
+      {
+        textShaderBackground = Shader::New(SHADER_TEXT_CONTROLLER_BACKGROUND_SHADER_VERT, SHADER_TEXT_CONTROLLER_BACKGROUND_SHADER_FRAG, Shader::Hint::NONE, "TEXT_SCROLLER");
+      }
+
+      Dali::Renderer renderer = Dali::Renderer::New(quadGeometry, textShaderBackground);
+      renderer.SetProperty(Dali::Renderer::Property::BLEND_MODE, BlendMode::ON);
+      renderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, DepthIndex::CONTENT);
+
+      actor = Actor::New();
+      actor.SetProperty(Dali::Actor::Property::NAME, "TextBackgroundColorActor");
+      actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+      actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+      actor.SetProperty(Actor::Property::SIZE, textSize);
+      actor.SetProperty(Actor::Property::COLOR_MODE, USE_OWN_MULTIPLY_PARENT_COLOR);
+      actor.AddRenderer(renderer);
+    }
+  }
+
+  return actor;
+}
+
+} // namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/controller/text-controller-background-actor.h b/dali-toolkit/internal/text/controller/text-controller-background-actor.h
new file mode 100644
index 0000000..41b549c
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-background-actor.h
@@ -0,0 +1,47 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_BACKGROUND_ACTOR_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_BACKGROUND_ACTOR_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/rendering/shader.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/visual-model-impl.h>
+
+namespace Dali::Toolkit::Text
+{
+class View;
+
+/**
+ * @brief Create an actor that renders the text background color
+ *
+ * @param[in] textView The text view.
+ * @param[in] textVisualModel The text visual model.
+ * @param[in] textLogicalModel The text logical model.
+ * @param[in] textShaderBackground The text shader for background.
+ *
+ * @return the created actor or an empty handle if no background color needs to be rendered.
+ */
+Actor CreateControllerBackgroundActor(const View& textView, const VisualModelPtr& textVisualModel, const LogicalModelPtr& textLogicalModel, Shader& textShaderBackground);
+
+} // namespace Dali::Toolkit::Text
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_BACKGROUND_ACTOR_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp
new file mode 100644
index 0000000..99cc227
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp
@@ -0,0 +1,1051 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/key-devel.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/cursor-helper-functions.h>
+#include <dali-toolkit/internal/text/text-editable-control-interface.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_TEXT_PERFORMANCE_MARKER, false);
+
+const char* KEY_C_NAME      = "c";
+const char* KEY_V_NAME      = "v";
+const char* KEY_X_NAME      = "x";
+const char* KEY_A_NAME      = "a";
+const char* KEY_INSERT_NAME = "Insert";
+
+} // namespace
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void Controller::EventHandler::KeyboardFocusGainEvent(Controller& controller)
+{
+  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected KeyboardFocusGainEvent");
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    if((EventData::INACTIVE == controller.mImpl->mEventData->mState) ||
+       (EventData::INTERRUPTED == controller.mImpl->mEventData->mState))
+    {
+      controller.mImpl->ChangeState(EventData::EDITING);
+      controller.mImpl->mEventData->mUpdateCursorPosition      = true; //If editing started without tap event, cursor update must be triggered.
+      controller.mImpl->mEventData->mUpdateInputStyle          = true;
+      controller.mImpl->mEventData->mScrollAfterUpdatePosition = true;
+    }
+    controller.mImpl->NotifyInputMethodContextMultiLineStatus();
+    if(controller.mImpl->IsShowingPlaceholderText())
+    {
+      // Show alternative placeholder-text when editing
+      PlaceholderHandler::ShowPlaceholderText(*controller.mImpl);
+    }
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+void Controller::EventHandler::KeyboardFocusLostEvent(Controller& controller)
+{
+  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected KeyboardFocusLostEvent");
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    if(EventData::INTERRUPTED != controller.mImpl->mEventData->mState)
+    {
+      // Init selection position
+      if(controller.mImpl->mEventData->mState == EventData::SELECTING)
+      {
+        uint32_t oldStart, oldEnd;
+        oldStart = controller.mImpl->mEventData->mLeftSelectionPosition;
+        oldEnd   = controller.mImpl->mEventData->mRightSelectionPosition;
+
+        controller.mImpl->mEventData->mLeftSelectionPosition  = controller.mImpl->mEventData->mPrimaryCursorPosition;
+        controller.mImpl->mEventData->mRightSelectionPosition = controller.mImpl->mEventData->mPrimaryCursorPosition;
+
+        if(controller.mImpl->mSelectableControlInterface != nullptr)
+        {
+          controller.mImpl->mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, controller.mImpl->mEventData->mPrimaryCursorPosition, controller.mImpl->mEventData->mPrimaryCursorPosition);
+        }
+      }
+
+      controller.mImpl->ChangeState(EventData::INACTIVE);
+
+      if(!controller.mImpl->IsShowingRealText())
+      {
+        // Revert to regular placeholder-text when not editing
+        PlaceholderHandler::ShowPlaceholderText(*controller.mImpl);
+      }
+    }
+  }
+  controller.mImpl->RequestRelayout();
+}
+
+bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyEvent& keyEvent)
+{
+  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected KeyEvent");
+
+  bool textChanged    = false;
+  bool relayoutNeeded = false;
+  bool isEditable     = controller.IsEditable() && controller.IsUserInteractionEnabled();
+
+  if((NULL != controller.mImpl->mEventData) &&
+     (keyEvent.GetState() == KeyEvent::DOWN))
+  {
+    int                keyCode   = keyEvent.GetKeyCode();
+    const std::string& keyString = keyEvent.GetKeyString();
+    const std::string  keyName   = keyEvent.GetKeyName();
+    // Key will produce same logical-key value when ctrl
+    // is down, regardless of language layout
+    const std::string logicalKey = keyEvent.GetLogicalKey();
+
+    const bool isNullKey = (0 == keyCode) && (keyString.empty());
+
+    // Pre-process to separate modifying events from non-modifying input events.
+    if(isNullKey)
+    {
+      // In some platforms arrive key events with no key code.
+      // Do nothing.
+      return false;
+    }
+    else if(Dali::DALI_KEY_ESCAPE == keyCode || Dali::DALI_KEY_BACK == keyCode || Dali::DALI_KEY_SEARCH == keyCode)
+    {
+      // Do nothing
+      return false;
+    }
+    else if((Dali::DALI_KEY_CURSOR_LEFT == keyCode) ||
+            (Dali::DALI_KEY_CURSOR_RIGHT == keyCode) ||
+            (Dali::DALI_KEY_CURSOR_UP == keyCode) ||
+            (Dali::DALI_KEY_CURSOR_DOWN == keyCode))
+    {
+      // If don't have any text, do nothing.
+      if(!controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters || !isEditable)
+      {
+        return false;
+      }
+
+      uint32_t cursorPosition     = controller.mImpl->mEventData->mPrimaryCursorPosition;
+      uint32_t numberOfCharacters = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
+      uint32_t cursorLine         = controller.mImpl->mModel->mVisualModel->GetLineOfCharacter(cursorPosition);
+      uint32_t numberOfLines      = controller.mImpl->mModel->GetNumberOfLines();
+
+      // Logic to determine whether this text control will lose focus or not.
+      if((Dali::DALI_KEY_CURSOR_LEFT == keyCode && 0 == cursorPosition && !keyEvent.IsShiftModifier()) ||
+         (Dali::DALI_KEY_CURSOR_RIGHT == keyCode && numberOfCharacters == cursorPosition && !keyEvent.IsShiftModifier()) ||
+         (Dali::DALI_KEY_CURSOR_DOWN == keyCode && cursorLine == numberOfLines - 1) ||
+         (Dali::DALI_KEY_CURSOR_DOWN == keyCode && numberOfCharacters == cursorPosition && cursorLine - 1 == numberOfLines - 1) ||
+         (Dali::DALI_KEY_CURSOR_UP == keyCode && cursorLine == 0) ||
+         (Dali::DALI_KEY_CURSOR_UP == keyCode && numberOfCharacters == cursorPosition && cursorLine == 1))
+      {
+        // Release the active highlight.
+        if(controller.mImpl->mEventData->mState == EventData::SELECTING)
+        {
+          uint32_t oldStart, oldEnd;
+          oldStart = controller.mImpl->mEventData->mLeftSelectionPosition;
+          oldEnd   = controller.mImpl->mEventData->mRightSelectionPosition;
+
+          controller.mImpl->ChangeState(EventData::EDITING);
+
+          // Update selection position.
+          controller.mImpl->mEventData->mLeftSelectionPosition  = controller.mImpl->mEventData->mPrimaryCursorPosition;
+          controller.mImpl->mEventData->mRightSelectionPosition = controller.mImpl->mEventData->mPrimaryCursorPosition;
+          controller.mImpl->mEventData->mUpdateCursorPosition   = true;
+
+          if(controller.mImpl->mSelectableControlInterface != nullptr)
+          {
+            controller.mImpl->mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, controller.mImpl->mEventData->mLeftSelectionPosition, controller.mImpl->mEventData->mRightSelectionPosition);
+          }
+
+          controller.mImpl->RequestRelayout();
+        }
+        return false;
+      }
+
+      if(controller.mImpl->mEventData->mState == EventData::INACTIVE)
+      {
+        // Cursor position will be updated
+        controller.mImpl->ChangeState(EventData::EDITING);
+      }
+
+      controller.mImpl->mEventData->mCheckScrollAmount = true;
+      Event event(Event::CURSOR_KEY_EVENT);
+      event.p1.mInt  = keyCode;
+      event.p2.mBool = keyEvent.IsShiftModifier();
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+
+      // Will request for relayout.
+      relayoutNeeded = true;
+    }
+    else if(Dali::DevelKey::DALI_KEY_CONTROL_LEFT == keyCode || Dali::DevelKey::DALI_KEY_CONTROL_RIGHT == keyCode)
+    {
+      // Left or Right Control key event is received before Ctrl-C/V/X key event is received
+      // If not handle it here, any selected text will be deleted
+
+      // Do nothing
+      return false;
+    }
+    else if(keyEvent.IsCtrlModifier() && !keyEvent.IsShiftModifier() && isEditable)
+    {
+      bool consumed = false;
+      if(keyName == KEY_C_NAME || keyName == KEY_INSERT_NAME || logicalKey == KEY_C_NAME || logicalKey == KEY_INSERT_NAME)
+      {
+        if(!keyEvent.IsRepeat())
+        {
+          // Ctrl-C or Ctrl+Insert to copy the selected text
+          controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::COPY);
+        }
+        consumed = true;
+      }
+      else if(keyName == KEY_V_NAME || logicalKey == KEY_V_NAME)
+      {
+        // Ctrl-V to paste the copied text
+        controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::PASTE);
+        consumed = true;
+      }
+      else if(keyName == KEY_X_NAME || logicalKey == KEY_X_NAME)
+      {
+        // Ctrl-X to cut the selected text
+        controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::CUT);
+        consumed = true;
+      }
+      else if(keyName == KEY_A_NAME || logicalKey == KEY_A_NAME)
+      {
+        // Ctrl-A to select All the text
+        controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::SELECT_ALL);
+        consumed = true;
+      }
+      return consumed;
+    }
+    else if((Dali::DALI_KEY_BACKSPACE == keyCode) ||
+            (Dali::DevelKey::DALI_KEY_DELETE == keyCode))
+    {
+      textChanged = DeleteEvent(controller, keyCode);
+
+      // Will request for relayout.
+      relayoutNeeded = true;
+    }
+    else if(IsKey(keyEvent, Dali::DALI_KEY_POWER) ||
+            IsKey(keyEvent, Dali::DALI_KEY_MENU) ||
+            IsKey(keyEvent, Dali::DALI_KEY_HOME))
+    {
+      // Power key/Menu/Home key behaviour does not allow edit mode to resume.
+      controller.mImpl->ChangeState(EventData::INACTIVE);
+
+      // Will request for relayout.
+      relayoutNeeded = true;
+
+      // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text.
+    }
+    else if((Dali::DALI_KEY_SHIFT_LEFT == keyCode) || (Dali::DALI_KEY_SHIFT_RIGHT == keyCode))
+    {
+      // DALI_KEY_SHIFT_LEFT or DALI_KEY_SHIFT_RIGHT is the key code for Shift. It's sent (by the InputMethodContext?) when the predictive text is enabled
+      // and a character is typed after the type of a upper case latin character.
+
+      // Do nothing.
+      return false;
+    }
+    else if((Dali::DALI_KEY_VOLUME_UP == keyCode) || (Dali::DALI_KEY_VOLUME_DOWN == keyCode))
+    {
+      // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text.
+      // Do nothing.
+      return false;
+    }
+    else
+    {
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", &controller, keyString.c_str());
+      if(!isEditable) return false;
+
+      std::string refinedKey = keyString;
+      if(controller.mImpl->mInputFilter != NULL && !refinedKey.empty())
+      {
+        bool accepted = false;
+        bool rejected = false;
+        accepted      = controller.mImpl->mInputFilter->Contains(Toolkit::InputFilter::Property::ACCEPTED, keyString);
+        rejected      = controller.mImpl->mInputFilter->Contains(Toolkit::InputFilter::Property::REJECTED, keyString);
+
+        if(!accepted)
+        {
+          // The filtered key is set to empty.
+          refinedKey = "";
+          // Signal emits when the character to be inserted is filtered by the accepted filter.
+          controller.mImpl->mEditableControlInterface->InputFiltered(Toolkit::InputFilter::Property::ACCEPTED);
+        }
+        if(rejected)
+        {
+          // The filtered key is set to empty.
+          refinedKey = "";
+          // Signal emits when the character to be inserted is filtered by the rejected filter.
+          controller.mImpl->mEditableControlInterface->InputFiltered(Toolkit::InputFilter::Property::REJECTED);
+        }
+      }
+
+      if(!refinedKey.empty())
+      {
+        // InputMethodContext is no longer handling key-events
+        controller.mImpl->ClearPreEditFlag();
+
+        TextUpdater::InsertText(controller, refinedKey, COMMIT);
+
+        textChanged = true;
+
+        // Will request for relayout.
+        relayoutNeeded = true;
+      }
+    }
+
+    if((controller.mImpl->mEventData->mState != EventData::INTERRUPTED) &&
+       (controller.mImpl->mEventData->mState != EventData::INACTIVE) &&
+       (!isNullKey) &&
+       (Dali::DALI_KEY_SHIFT_LEFT != keyCode) &&
+       (Dali::DALI_KEY_SHIFT_RIGHT != keyCode) &&
+       (Dali::DALI_KEY_VOLUME_UP != keyCode) &&
+       (Dali::DALI_KEY_VOLUME_DOWN != keyCode))
+    {
+      // Should not change the state if the key is the shift send by the InputMethodContext.
+      // Otherwise, when the state is SELECTING the text controller can't send the right
+      // surrounding info to the InputMethodContext.
+      controller.mImpl->ChangeState(EventData::EDITING);
+
+      // Will request for relayout.
+      relayoutNeeded = true;
+    }
+
+    if(relayoutNeeded)
+    {
+      controller.mImpl->RequestRelayout();
+    }
+  }
+  else if((NULL != controller.mImpl->mEventData) && (keyEvent.GetState() == KeyEvent::UP))
+  {
+    // Handles specific keys that require event propagation.
+    if(Dali::DALI_KEY_BACK == keyEvent.GetKeyCode())
+    {
+      // Do nothing
+      return false;
+    }
+  }
+
+  if(textChanged &&
+     (NULL != controller.mImpl->mEditableControlInterface))
+  {
+    // Do this last since it provides callbacks into application code
+    controller.mImpl->mEditableControlInterface->TextChanged(false);
+  }
+
+  return true;
+}
+
+void Controller::EventHandler::AnchorEvent(Controller& controller, float x, float y)
+{
+  if(!controller.mImpl->mMarkupProcessorEnabled ||
+     !controller.mImpl->mModel->mLogicalModel->mAnchors.Count() ||
+     !controller.mImpl->IsShowingRealText())
+  {
+    return;
+  }
+
+  CharacterIndex cursorPosition = 0u;
+
+  // Convert from control's coords to text's coords.
+
+  const float xPosition = x - controller.mImpl->mModel->mScrollPosition.x;
+  const float yPosition = y - controller.mImpl->mModel->mScrollPosition.y;
+
+  Vector2 visualTransformOffset = controller.mImpl->mModel->mVisualTransformOffset;
+
+  // Whether to touch point hits on a glyph.
+  bool matchedCharacter = false;
+  cursorPosition        = Text::GetClosestCursorIndex(controller.mImpl->mModel->mVisualModel,
+                                               controller.mImpl->mModel->mLogicalModel,
+                                               controller.mImpl->mMetrics,
+                                               xPosition,
+                                               yPosition - visualTransformOffset.y,
+                                               CharacterHitTest::TAP,
+                                               matchedCharacter);
+
+  for(auto& anchor : controller.mImpl->mModel->mLogicalModel->mAnchors)
+  {
+    // Anchor clicked if the calculated cursor position is within the range of anchor.
+    if(cursorPosition >= anchor.startIndex && cursorPosition < anchor.endIndex)
+    {
+      if(controller.mImpl->mAnchorControlInterface)
+      {
+        if(!anchor.isClicked)
+        {
+          anchor.isClicked = true;
+          // TODO: in mutable text, the anchor color and underline run index should be able to be updated.
+          if(!controller.IsEditable())
+          {
+            // If there is a markup clicked color attribute, use it. Otherwise, use the property color.
+            if(controller.mImpl->mModel->mLogicalModel->mColorRuns.Count() > anchor.colorRunIndex)
+            {
+              ColorRun& colorRun = *(controller.mImpl->mModel->mLogicalModel->mColorRuns.Begin() + anchor.colorRunIndex);
+              colorRun.color = anchor.isMarkupClickedColorSet ? anchor.markupClickedColor : controller.mImpl->mAnchorClickedColor;
+            }
+            if(controller.mImpl->mModel->mLogicalModel->mUnderlinedCharacterRuns.Count() > anchor.underlinedCharacterRunIndex)
+            {
+              UnderlinedCharacterRun& underlineRun = *(controller.mImpl->mModel->mLogicalModel->mUnderlinedCharacterRuns.Begin() + anchor.underlinedCharacterRunIndex);
+              underlineRun.properties.color = anchor.isMarkupClickedColorSet ? anchor.markupClickedColor : controller.mImpl->mAnchorClickedColor;
+            }
+
+            controller.mImpl->ClearFontData();
+            controller.mImpl->mOperationsPending = static_cast<OperationsMask>(controller.mImpl->mOperationsPending | COLOR);
+            controller.mImpl->RequestRelayout();
+          }
+        }
+
+        std::string href = anchor.href == nullptr ? "" : anchor.href;
+        controller.mImpl->mAnchorControlInterface->AnchorClicked(href);
+        break;
+      }
+    }
+  }
+}
+
+void Controller::EventHandler::TapEvent(Controller& controller, unsigned int tapCount, float x, float y)
+{
+  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected TapEvent");
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Concise, "TapEvent state:%d \n", controller.mImpl->mEventData->mState);
+    EventData::State state(controller.mImpl->mEventData->mState);
+    bool             relayoutNeeded(false); // to avoid unnecessary relayouts when tapping an empty text-field
+
+    if(controller.mImpl->IsClipboardVisible())
+    {
+      if(EventData::INACTIVE == state || EventData::EDITING == state)
+      {
+        controller.mImpl->ChangeState(EventData::EDITING_WITH_GRAB_HANDLE);
+      }
+      relayoutNeeded = true;
+    }
+    else if(1u == tapCount)
+    {
+      if(EventData::EDITING_WITH_POPUP == state || EventData::EDITING_WITH_PASTE_POPUP == state)
+      {
+        controller.mImpl->ChangeState(EventData::EDITING_WITH_GRAB_HANDLE); // If Popup shown hide it here so can be shown again if required.
+      }
+
+      if(controller.mImpl->IsShowingRealText() && (EventData::INACTIVE != state))
+      {
+        controller.mImpl->ChangeState(EventData::EDITING_WITH_GRAB_HANDLE);
+        relayoutNeeded = true;
+      }
+      else
+      {
+        if(controller.mImpl->IsShowingPlaceholderText() && !controller.mImpl->IsFocusedPlaceholderAvailable())
+        {
+          // Hide placeholder text
+          TextUpdater::ResetText(controller);
+        }
+
+        if(EventData::INACTIVE == state)
+        {
+          controller.mImpl->ChangeState(EventData::EDITING);
+        }
+        else if(!controller.mImpl->IsClipboardEmpty())
+        {
+          controller.mImpl->ChangeState(EventData::EDITING_WITH_POPUP);
+        }
+        relayoutNeeded = true;
+      }
+    }
+    else if(2u == tapCount)
+    {
+      if(controller.mImpl->mEventData->mSelectionEnabled &&
+         controller.mImpl->IsShowingRealText())
+      {
+        relayoutNeeded                                       = true;
+        controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
+        controller.mImpl->mEventData->mIsRightHandleSelected = true;
+      }
+    }
+
+    // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
+    if(relayoutNeeded)
+    {
+      Event event(Event::TAP_EVENT);
+      event.p1.mUint  = tapCount;
+      event.p2.mFloat = x;
+      event.p3.mFloat = y;
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+
+      controller.mImpl->RequestRelayout();
+    }
+  }
+
+  // Reset keyboard as tap event has occurred.
+  controller.mImpl->ResetInputMethodContext();
+}
+
+void Controller::EventHandler::PanEvent(Controller& controller, GestureState state, const Vector2& displacement)
+{
+  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected PanEvent");
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    Event event(Event::PAN_EVENT);
+    event.p1.mInt   = static_cast<int>(state);
+    event.p2.mFloat = displacement.x;
+    event.p3.mFloat = displacement.y;
+    controller.mImpl->mEventData->mEventQueue.push_back(event);
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+void Controller::EventHandler::LongPressEvent(Controller& controller, GestureState state, float x, float y)
+{
+  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected LongPressEvent");
+
+  if((state == GestureState::STARTED) &&
+     (NULL != controller.mImpl->mEventData))
+  {
+    // The 1st long-press on inactive text-field is treated as tap
+    if(EventData::INACTIVE == controller.mImpl->mEventData->mState)
+    {
+      controller.mImpl->ChangeState(EventData::EDITING);
+
+      Event event(Event::TAP_EVENT);
+      event.p1.mUint  = 1;
+      event.p2.mFloat = x;
+      event.p3.mFloat = y;
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+
+      controller.mImpl->RequestRelayout();
+    }
+    else if(!controller.mImpl->IsShowingRealText())
+    {
+      Event event(Event::LONG_PRESS_EVENT);
+      event.p1.mInt   = static_cast<int>(state);
+      event.p2.mFloat = x;
+      event.p3.mFloat = y;
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+      controller.mImpl->RequestRelayout();
+    }
+    else if(!controller.mImpl->IsClipboardVisible())
+    {
+      // Reset the InputMethodContext to commit the pre-edit before selecting the text.
+      controller.mImpl->ResetInputMethodContext();
+
+      Event event(Event::LONG_PRESS_EVENT);
+      event.p1.mInt   = static_cast<int>(state);
+      event.p2.mFloat = x;
+      event.p3.mFloat = y;
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+      controller.mImpl->RequestRelayout();
+
+      controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
+      controller.mImpl->mEventData->mIsRightHandleSelected = true;
+    }
+  }
+}
+
+void Controller::EventHandler::SelectEvent(Controller& controller, float x, float y, SelectionType selectType)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SelectEvent\n");
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    if(selectType == SelectionType::ALL)
+    {
+      Event event(Event::SELECT_ALL);
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+    }
+    else if(selectType == SelectionType::NONE)
+    {
+      Event event(Event::SELECT_NONE);
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+    }
+    else
+    {
+      Event event(Event::SELECT);
+      event.p2.mFloat = x;
+      event.p3.mFloat = y;
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+    }
+
+    controller.mImpl->mEventData->mCheckScrollAmount     = true;
+    controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
+    controller.mImpl->mEventData->mIsRightHandleSelected = true;
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+void Controller::EventHandler::SelectEvent(Controller& controller, const uint32_t start, const uint32_t end, SelectionType selectType)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SelectEvent\n");
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    if(selectType == SelectionType::RANGE)
+    {
+      Event event(Event::SELECT_RANGE);
+      event.p2.mUint = start;
+      event.p3.mUint = end;
+      controller.mImpl->mEventData->mEventQueue.push_back(event);
+    }
+
+    controller.mImpl->mEventData->mCheckScrollAmount     = true;
+    controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
+    controller.mImpl->mEventData->mIsRightHandleSelected = true;
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+void Controller::EventHandler::ProcessModifyEvents(Controller& controller)
+{
+  Vector<ModifyEvent>& events = controller.mImpl->mModifyEvents;
+
+  if(0u == events.Count())
+  {
+    // Nothing to do.
+    return;
+  }
+
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_MODIFY_EVENTS");
+
+  for(Vector<ModifyEvent>::ConstIterator it    = events.Begin(),
+                                         endIt = events.End();
+      it != endIt;
+      ++it)
+  {
+    const ModifyEvent& event = *it;
+
+    if(ModifyEvent::TEXT_REPLACED == event.type)
+    {
+      // A (single) replace event should come first, otherwise we wasted time processing NOOP events
+      DALI_ASSERT_DEBUG(it == events.Begin() && "Unexpected TEXT_REPLACED event");
+
+      TextReplacedEvent(controller);
+    }
+    else if(ModifyEvent::TEXT_INSERTED == event.type)
+    {
+      TextInsertedEvent(controller);
+    }
+    else if(ModifyEvent::TEXT_DELETED == event.type)
+    {
+      // Placeholder-text cannot be deleted
+      if(!controller.mImpl->IsShowingPlaceholderText())
+      {
+        TextDeletedEvent(controller);
+      }
+    }
+  }
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    uint32_t oldStart, oldEnd;
+    oldStart = controller.mImpl->mEventData->mLeftSelectionPosition;
+    oldEnd   = controller.mImpl->mEventData->mRightSelectionPosition;
+
+    // When the text is being modified, delay cursor blinking
+    controller.mImpl->mEventData->mDecorator->DelayCursorBlink();
+
+    // Update selection position after modifying the text
+    controller.mImpl->mEventData->mLeftSelectionPosition  = controller.mImpl->mEventData->mPrimaryCursorPosition;
+    controller.mImpl->mEventData->mRightSelectionPosition = controller.mImpl->mEventData->mPrimaryCursorPosition;
+
+    if(controller.mImpl->mSelectableControlInterface != nullptr && controller.mImpl->mEventData->mState == EventData::SELECTING)
+    {
+      controller.mImpl->mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, controller.mImpl->mEventData->mLeftSelectionPosition, controller.mImpl->mEventData->mRightSelectionPosition);
+    }
+  }
+
+  // DISCARD temporary text
+  events.Clear();
+}
+
+void Controller::EventHandler::TextReplacedEvent(Controller& controller)
+{
+  // The natural size needs to be re-calculated.
+  controller.mImpl->mRecalculateNaturalSize = true;
+
+  // The text direction needs to be updated.
+  controller.mImpl->mUpdateTextDirection = true;
+
+  // Apply modifications to the model
+  controller.mImpl->mOperationsPending = ALL_OPERATIONS;
+}
+
+void Controller::EventHandler::TextInsertedEvent(Controller& controller)
+{
+  DALI_ASSERT_DEBUG(NULL != controller.mImpl->mEventData && "Unexpected TextInsertedEvent");
+
+  if(NULL == controller.mImpl->mEventData)
+  {
+    return;
+  }
+
+  controller.mImpl->mEventData->mCheckScrollAmount = true;
+
+  // The natural size needs to be re-calculated.
+  controller.mImpl->mRecalculateNaturalSize = true;
+
+  // The text direction needs to be updated.
+  controller.mImpl->mUpdateTextDirection = true;
+
+  // Apply modifications to the model; TODO - Optimize this
+  controller.mImpl->mOperationsPending = ALL_OPERATIONS;
+}
+
+void Controller::EventHandler::TextDeletedEvent(Controller& controller)
+{
+  DALI_ASSERT_DEBUG(NULL != controller.mImpl->mEventData && "Unexpected TextDeletedEvent");
+
+  if(NULL == controller.mImpl->mEventData)
+  {
+    return;
+  }
+
+  if(!controller.IsEditable()) return;
+
+  controller.mImpl->mEventData->mCheckScrollAmount = true;
+
+  // The natural size needs to be re-calculated.
+  controller.mImpl->mRecalculateNaturalSize = true;
+
+  // The text direction needs to be updated.
+  controller.mImpl->mUpdateTextDirection = true;
+
+  // Apply modifications to the model; TODO - Optimize this
+  controller.mImpl->mOperationsPending = ALL_OPERATIONS;
+}
+
+bool Controller::EventHandler::DeleteEvent(Controller& controller, int keyCode)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::KeyEvent %p KeyCode : %d \n", &controller, keyCode);
+
+  bool removed = false;
+
+  if(NULL == controller.mImpl->mEventData)
+  {
+    return removed;
+  }
+
+  if(!controller.IsEditable()) return false;
+
+  // InputMethodContext is no longer handling key-events
+  controller.mImpl->ClearPreEditFlag();
+
+  if(EventData::SELECTING == controller.mImpl->mEventData->mState)
+  {
+    removed = TextUpdater::RemoveSelectedText(controller);
+  }
+  else if((controller.mImpl->mEventData->mPrimaryCursorPosition > 0) && (keyCode == Dali::DALI_KEY_BACKSPACE))
+  {
+    // Remove the character before the current cursor position
+    removed = TextUpdater::RemoveText(controller, -1, 1, UPDATE_INPUT_STYLE, false);
+  }
+  else if((controller.mImpl->mEventData->mPrimaryCursorPosition < controller.mImpl->mModel->mLogicalModel->mText.Count()) &&
+          (keyCode == Dali::DevelKey::DALI_KEY_DELETE))
+  {
+    // Remove the character after the current cursor position
+    removed = TextUpdater::RemoveText(controller, 0, 1, UPDATE_INPUT_STYLE, false);
+  }
+
+  if(removed)
+  {
+    if((0u != controller.mImpl->mModel->mLogicalModel->mText.Count()) ||
+       !controller.mImpl->IsPlaceholderAvailable())
+    {
+      controller.mImpl->QueueModifyEvent(ModifyEvent::TEXT_DELETED);
+    }
+    else
+    {
+      PlaceholderHandler::ShowPlaceholderText(*controller.mImpl);
+    }
+    controller.mImpl->mEventData->mUpdateCursorPosition = true;
+    controller.mImpl->mEventData->mScrollAfterDelete    = true;
+  }
+
+  return removed;
+}
+
+InputMethodContext::CallbackData Controller::EventHandler::OnInputMethodContextEvent(Controller& controller, InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
+{
+  // Whether the text needs to be relaid-out.
+  bool requestRelayout = false;
+
+  // Whether to retrieve the text and cursor position to be sent to the InputMethodContext.
+  bool retrieveText   = false;
+  bool retrieveCursor = false;
+
+  switch(inputMethodContextEvent.eventName)
+  {
+    case InputMethodContext::COMMIT:
+    {
+      TextUpdater::InsertText(controller, inputMethodContextEvent.predictiveString, Text::Controller::COMMIT);
+      requestRelayout = true;
+      retrieveCursor  = true;
+      break;
+    }
+    case InputMethodContext::PRE_EDIT:
+    {
+      TextUpdater::InsertText(controller, inputMethodContextEvent.predictiveString, Text::Controller::PRE_EDIT);
+      requestRelayout = true;
+      retrieveCursor  = true;
+      break;
+    }
+    case InputMethodContext::DELETE_SURROUNDING:
+    {
+      const bool textDeleted = TextUpdater::RemoveText(controller,
+                                                       inputMethodContextEvent.cursorOffset,
+                                                       inputMethodContextEvent.numberOfChars,
+                                                       DONT_UPDATE_INPUT_STYLE,
+                                                       false);
+
+      if(textDeleted)
+      {
+        if((0u != controller.mImpl->mModel->mLogicalModel->mText.Count()) ||
+           !controller.mImpl->IsPlaceholderAvailable())
+        {
+          controller.mImpl->QueueModifyEvent(ModifyEvent::TEXT_DELETED);
+        }
+        else
+        {
+          PlaceholderHandler::ShowPlaceholderText(*controller.mImpl);
+        }
+        controller.mImpl->mEventData->mUpdateCursorPosition = true;
+        controller.mImpl->mEventData->mScrollAfterDelete    = true;
+
+        requestRelayout = true;
+      }
+      break;
+    }
+    case InputMethodContext::GET_SURROUNDING:
+    {
+      retrieveText   = true;
+      retrieveCursor = true;
+      break;
+    }
+    case InputMethodContext::PRIVATE_COMMAND:
+    {
+      // PRIVATECOMMAND event is just for getting the private command message
+      retrieveText   = true;
+      retrieveCursor = true;
+      break;
+    }
+    case InputMethodContext::SELECTION_SET:
+    {
+      uint32_t start = static_cast<uint32_t>(inputMethodContextEvent.startIndex);
+      uint32_t end   = static_cast<uint32_t>(inputMethodContextEvent.endIndex);
+      if(start == end)
+      {
+        controller.SetPrimaryCursorPosition(start, true);
+      }
+      else
+      {
+        controller.SelectText(start, end);
+      }
+
+      break;
+    }
+    case InputMethodContext::VOID:
+    {
+      // do nothing
+      break;
+    }
+  } // end switch
+
+  if(requestRelayout)
+  {
+    controller.mImpl->mOperationsPending = ALL_OPERATIONS;
+    controller.mImpl->RequestRelayout();
+  }
+
+  std::string    text;
+  CharacterIndex cursorPosition      = 0u;
+
+  if(retrieveCursor)
+  {
+    cursorPosition = controller.mImpl->GetLogicalCursorPosition();
+  }
+
+  if(retrieveText)
+  {
+    if(!controller.mImpl->IsShowingPlaceholderText())
+    {
+      // Retrieves the normal text string.
+      controller.mImpl->GetText(0u, text);
+    }
+    else
+    {
+      // When the current text is Placeholder Text, the surrounding text should be empty string.
+      // It means DALi should send empty string ("") to IME.
+      text = "";
+    }
+  }
+
+  InputMethodContext::CallbackData callbackData((retrieveText || retrieveCursor), cursorPosition, text, false);
+
+  if(requestRelayout &&
+     (NULL != controller.mImpl->mEditableControlInterface))
+  {
+    // Do this last since it provides callbacks into application code
+    controller.mImpl->mEditableControlInterface->TextChanged(false);
+  }
+
+  return callbackData;
+}
+
+void Controller::EventHandler::PasteClipboardItemEvent(Controller& controller, const std::string& text)
+{
+  // Commit the current pre-edit text; the contents of the clipboard should be appended
+  controller.mImpl->ResetInputMethodContext();
+
+  // Temporary disable hiding clipboard
+  controller.mImpl->SetClipboardHideEnable(false);
+
+  // Paste
+  TextUpdater::PasteText(controller, text);
+
+  controller.mImpl->SetClipboardHideEnable(true);
+}
+
+void Controller::EventHandler::DecorationEvent(Controller& controller, HandleType handleType, HandleState state, float x, float y)
+{
+  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected DecorationEvent");
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    switch(handleType)
+    {
+      case GRAB_HANDLE:
+      {
+        Event event(Event::GRAB_HANDLE_EVENT);
+        event.p1.mUint  = state;
+        event.p2.mFloat = x;
+        event.p3.mFloat = y;
+
+        controller.mImpl->mEventData->mEventQueue.push_back(event);
+        break;
+      }
+      case LEFT_SELECTION_HANDLE:
+      {
+        Event event(Event::LEFT_SELECTION_HANDLE_EVENT);
+        event.p1.mUint  = state;
+        event.p2.mFloat = x;
+        event.p3.mFloat = y;
+
+        controller.mImpl->mEventData->mEventQueue.push_back(event);
+        break;
+      }
+      case RIGHT_SELECTION_HANDLE:
+      {
+        Event event(Event::RIGHT_SELECTION_HANDLE_EVENT);
+        event.p1.mUint  = state;
+        event.p2.mFloat = x;
+        event.p3.mFloat = y;
+
+        controller.mImpl->mEventData->mEventQueue.push_back(event);
+        break;
+      }
+      case LEFT_SELECTION_HANDLE_MARKER:
+      case RIGHT_SELECTION_HANDLE_MARKER:
+      {
+        // Markers do not move the handles.
+        break;
+      }
+      case HANDLE_TYPE_COUNT:
+      {
+        DALI_ASSERT_DEBUG(!"Controller::HandleEvent. Unexpected handle type");
+      }
+    }
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+void Controller::EventHandler::TextPopupButtonTouched(Controller& controller, Dali::Toolkit::TextSelectionPopup::Buttons button)
+{
+  if(NULL == controller.mImpl->mEventData)
+  {
+    return;
+  }
+
+  switch(button)
+  {
+    case Toolkit::TextSelectionPopup::CUT:
+    {
+      controller.CutText();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::COPY:
+    {
+      controller.CopyText();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::PASTE:
+    {
+      controller.PasteText();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT:
+    {
+      const Vector2& currentCursorPosition = controller.mImpl->mEventData->mDecorator->GetPosition(PRIMARY_CURSOR);
+
+      if(controller.mImpl->mEventData->mSelectionEnabled)
+      {
+        // Creates a SELECT event.
+        SelectEvent(controller, currentCursorPosition.x, currentCursorPosition.y, SelectionType::INTERACTIVE);
+      }
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT_ALL:
+    {
+      // Creates a SELECT_ALL event
+      SelectEvent(controller, 0.f, 0.f, SelectionType::ALL);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::CLIPBOARD:
+    {
+      controller.mImpl->ShowClipboard();
+      break;
+    }
+    case Toolkit::TextSelectionPopup::NONE:
+    {
+      // Nothing to do.
+      break;
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/controller/text-controller-event-handler.h b/dali-toolkit/internal/text/controller/text-controller-event-handler.h
new file mode 100644
index 0000000..48ab1d5
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-event-handler.h
@@ -0,0 +1,147 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_EVENT_HANDLER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_EVENT_HANDLER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/input-method-context.h>
+#include <dali/public-api/events/gesture-enumerations.h>
+#include <dali/public-api/events/key-event.h>
+#include <dali/public-api/math/vector2.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Controller::EventHandler
+{
+  /// @copydoc Text::Controller::KeyboardFocusGainEvent
+  /// @param[in] controller A reference to the controller class
+  static void KeyboardFocusGainEvent(Controller& controller);
+
+  /// @copydoc Text::Controller::KeyboardFocusLostEvent
+  /// @param[in] controller A reference to the controller class
+  static void KeyboardFocusLostEvent(Controller& controller);
+
+  /// @copydoc Text::Controller::KeyEvent
+  /// @param[in] controller A reference to the controller class
+  static bool KeyEvent(Controller& controller, const Dali::KeyEvent& keyEvent);
+
+  /// @copydoc Text::Controller::AnchorEvent
+  /// @param[in] controller A reference to the controller class
+  static void AnchorEvent(Controller& controller, float x, float y);
+
+  /// @copydoc Text::Controller::TapEvent
+  /// @param[in] controller A reference to the controller class
+  static void TapEvent(Controller& controller, unsigned int tapCount, float x, float y);
+
+  /// @copydoc Text::Controller::PanEvent
+  /// @param[in] controller A reference to the controller class
+  static void PanEvent(Controller& controller, GestureState state, const Vector2& displacement);
+
+  /// @copydoc Text::Controller::LongPressEvent
+  /// @param[in] controller A reference to the controller class
+  static void LongPressEvent(Controller& controller, GestureState state, float x, float y);
+
+  /// @copydoc Text::Controller::SelectEvent
+  /// @param[in] controller A reference to the controller class
+  static void SelectEvent(Controller& controller, float x, float y, SelectionType selectType);
+
+  /**
+   * @brief Creates a selection event with a selection index.
+   *
+   * It could be called from the SelectText().
+   * The start and end parameters are passed through the event.
+   *
+   * @param[in] controller A reference to the controller class
+   * @param[in] start The start selection position.
+   * @param[in] end The end selection position.
+   * @param[in] selection type like the range.
+   */
+  static void SelectEvent(Controller& controller, const uint32_t start, const uint32_t end, SelectionType selectType);
+
+  /**
+   * @brief Process queued events which modify the model.
+   * @param[in] controller A reference to the controller class
+   */
+  static void ProcessModifyEvents(Controller& controller);
+
+  /**
+   * @brief Used to process an event queued from SetText()
+   * @param[in] controller A reference to the controller class
+   */
+  static void TextReplacedEvent(Controller& controller);
+
+  /**
+   * @brief Used to process an event queued from key events etc.
+   * @param[in] controller A reference to the controller class
+   */
+  static void TextInsertedEvent(Controller& controller);
+
+  /**
+   * @brief Used to process an event queued from backspace key etc.
+   * @param[in] controller A reference to the controller class
+   */
+  static void TextDeletedEvent(Controller& controller);
+
+  /**
+   * @brief Helper to KeyEvent() to handle the backspace or delete key case.
+   *
+   * @param[in] controller A reference to the controller class
+   * @param[in] keyCode The keycode for the key pressed
+   * @return True if a character was deleted.
+   */
+  static bool DeleteEvent(Controller& controller, int keyCode);
+
+  /// @copydoc Text::Controller::OnInputMethodContextEvent
+  /// @param[in] controller A reference to the controller class
+  static InputMethodContext::CallbackData OnInputMethodContextEvent(Controller&                          controller,
+                                                                    InputMethodContext&                  inputMethodContext,
+                                                                    const InputMethodContext::EventData& inputMethodContextEvent);
+
+  /**
+   * @brief This function executes the actual text update when a clipboard paste event occurs.
+   *
+   * @param[in] controller A reference to the controller class.
+   * @param[in] text The text data to be pasted into the text controller.
+   */
+  static void PasteClipboardItemEvent(Controller& controller, const std::string& text);
+
+  /// @copydoc Text::Controller::DecorationEvent
+  /// @param[in] controller A reference to the controller class
+  static void DecorationEvent(Controller& controller, HandleType handleType, HandleState state, float x, float y);
+
+  /// @copydoc Text::Controller::TextPopupButtonTouched
+  /// @param[in] controller A reference to the controller class
+  static void TextPopupButtonTouched(Controller& controller, Dali::Toolkit::TextSelectionPopup::Buttons button);
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_EVENT_HANDLER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.cpp
new file mode 100644
index 0000000..3822fb3
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.cpp
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/text-run-container.h>
+
+namespace Dali::Toolkit::Text
+{
+
+void ControllerImplDataClearer::ClearFullModelData(Controller::Impl& impl, Controller::OperationsMask operations)
+{
+  ModelPtr& model = impl.mModel;
+
+  if(Controller::NO_OPERATION != (Controller::GET_LINE_BREAKS & operations))
+  {
+    model->mLogicalModel->mLineBreakInfo.Clear();
+    model->mLogicalModel->mParagraphInfo.Clear();
+  }
+
+  if(Controller::NO_OPERATION != (Controller::GET_SCRIPTS & operations))
+  {
+    model->mLogicalModel->mScriptRuns.Clear();
+  }
+
+  if(Controller::NO_OPERATION != (Controller::VALIDATE_FONTS & operations))
+  {
+    model->mLogicalModel->mFontRuns.Clear();
+  }
+
+  if(0u != model->mLogicalModel->mBidirectionalParagraphInfo.Count())
+  {
+    if(Controller::NO_OPERATION != (Controller::BIDI_INFO & operations))
+    {
+      model->mLogicalModel->mBidirectionalParagraphInfo.Clear();
+      model->mLogicalModel->mCharacterDirections.Clear();
+    }
+
+    if(Controller::NO_OPERATION != (Controller::REORDER & operations))
+    {
+      // Free the allocated memory used to store the conversion table in the bidirectional line info run.
+      for(Vector<BidirectionalLineInfoRun>::Iterator it    = model->mLogicalModel->mBidirectionalLineInfo.Begin(),
+                                                     endIt = model->mLogicalModel->mBidirectionalLineInfo.End();
+          it != endIt;
+          ++it)
+      {
+        BidirectionalLineInfoRun& bidiLineInfo = *it;
+
+        free(bidiLineInfo.visualToLogicalMap);
+        bidiLineInfo.visualToLogicalMap = NULL;
+      }
+      model->mLogicalModel->mBidirectionalLineInfo.Clear();
+    }
+  }
+
+  if(Controller::NO_OPERATION != (Controller::SHAPE_TEXT & operations))
+  {
+    model->mVisualModel->mGlyphs.Clear();
+    model->mVisualModel->mGlyphsToCharacters.Clear();
+    model->mVisualModel->mCharactersToGlyph.Clear();
+    model->mVisualModel->mCharactersPerGlyph.Clear();
+    model->mVisualModel->mGlyphsPerCharacter.Clear();
+    model->mVisualModel->mGlyphPositions.Clear();
+  }
+
+  if(Controller::NO_OPERATION != (Controller::LAYOUT & operations))
+  {
+    model->mVisualModel->mLines.Clear();
+  }
+
+  if(Controller::NO_OPERATION != (Controller::COLOR & operations))
+  {
+    model->mVisualModel->mColorIndices.Clear();
+    model->mVisualModel->mBackgroundColorIndices.Clear();
+  }
+}
+
+void ControllerImplDataClearer::ClearCharacterModelData(Controller::Impl& impl, CharacterIndex startIndex, CharacterIndex endIndex, Controller::OperationsMask operations)
+{
+  const CharacterIndex endIndexPlusOne = endIndex + 1u;
+  ModelPtr& model = impl.mModel;
+
+  if(Controller::NO_OPERATION != (Controller::GET_LINE_BREAKS & operations))
+  {
+    // Clear the line break info.
+    LineBreakInfo* lineBreakInfoBuffer = model->mLogicalModel->mLineBreakInfo.Begin();
+
+    model->mLogicalModel->mLineBreakInfo.Erase(lineBreakInfoBuffer + startIndex,
+                                                     lineBreakInfoBuffer + endIndexPlusOne);
+
+    // Clear the paragraphs.
+    ClearCharacterRuns(startIndex,
+                       endIndex,
+                       model->mLogicalModel->mParagraphInfo);
+  }
+
+  if(Controller::NO_OPERATION != (Controller::GET_SCRIPTS & operations))
+  {
+    // Clear the scripts.
+    ClearCharacterRuns(startIndex,
+                       endIndex,
+                       model->mLogicalModel->mScriptRuns);
+  }
+
+  if(Controller::NO_OPERATION != (Controller::VALIDATE_FONTS & operations))
+  {
+    // Clear the fonts.
+    ClearCharacterRuns(startIndex,
+                       endIndex,
+                       model->mLogicalModel->mFontRuns);
+  }
+
+  if(0u != model->mLogicalModel->mBidirectionalParagraphInfo.Count())
+  {
+    if(Controller::NO_OPERATION != (Controller::BIDI_INFO & operations))
+    {
+      // Clear the bidirectional paragraph info.
+      ClearCharacterRuns(startIndex,
+                         endIndex,
+                         model->mLogicalModel->mBidirectionalParagraphInfo);
+
+      // Clear the character's directions.
+      CharacterDirection* characterDirectionsBuffer = model->mLogicalModel->mCharacterDirections.Begin();
+
+      model->mLogicalModel->mCharacterDirections.Erase(characterDirectionsBuffer + startIndex,
+                                                       characterDirectionsBuffer + endIndexPlusOne);
+    }
+
+    if(Controller::NO_OPERATION != (Controller::REORDER & operations))
+    {
+      uint32_t startRemoveIndex = model->mLogicalModel->mBidirectionalLineInfo.Count();
+      uint32_t endRemoveIndex   = startRemoveIndex;
+      ClearCharacterRuns(startIndex,
+                         endIndex,
+                         model->mLogicalModel->mBidirectionalLineInfo,
+                         startRemoveIndex,
+                         endRemoveIndex);
+
+      BidirectionalLineInfoRun* bidirectionalLineInfoBuffer = model->mLogicalModel->mBidirectionalLineInfo.Begin();
+
+      // Free the allocated memory used to store the conversion table in the bidirectional line info run.
+      for(Vector<BidirectionalLineInfoRun>::Iterator it    = bidirectionalLineInfoBuffer + startRemoveIndex,
+                                                     endIt = bidirectionalLineInfoBuffer + endRemoveIndex;
+          it != endIt;
+          ++it)
+      {
+        BidirectionalLineInfoRun& bidiLineInfo = *it;
+
+        free(bidiLineInfo.visualToLogicalMap);
+        bidiLineInfo.visualToLogicalMap = NULL;
+      }
+
+      model->mLogicalModel->mBidirectionalLineInfo.Erase(bidirectionalLineInfoBuffer + startRemoveIndex,
+                                                         bidirectionalLineInfoBuffer + endRemoveIndex);
+    }
+  }
+}
+
+void ControllerImplDataClearer::ClearGlyphModelData(Controller::Impl& impl, CharacterIndex startIndex, CharacterIndex endIndex, Controller::OperationsMask operations)
+{
+  const CharacterIndex endIndexPlusOne           = endIndex + 1u;
+  const Length         numberOfCharactersRemoved = endIndexPlusOne - startIndex;
+  ModelPtr&            model                     = impl.mModel;
+  TextUpdateInfo&      textUpdateInfo            = impl.mTextUpdateInfo;
+
+
+  // Convert the character index to glyph index before deleting the character to glyph and the glyphs per character buffers.
+  GlyphIndex* charactersToGlyphBuffer  = model->mVisualModel->mCharactersToGlyph.Begin();
+  Length*     glyphsPerCharacterBuffer = model->mVisualModel->mGlyphsPerCharacter.Begin();
+
+  const GlyphIndex endGlyphIndexPlusOne  = *(charactersToGlyphBuffer + endIndex) + *(glyphsPerCharacterBuffer + endIndex);
+  const Length     numberOfGlyphsRemoved = endGlyphIndexPlusOne - textUpdateInfo.mStartGlyphIndex;
+
+  if(Controller::NO_OPERATION != (Controller::SHAPE_TEXT & operations))
+  {
+    // Update the character to glyph indices.
+    for(Vector<GlyphIndex>::Iterator it    = charactersToGlyphBuffer + endIndexPlusOne,
+                                     endIt = charactersToGlyphBuffer + model->mVisualModel->mCharactersToGlyph.Count();
+        it != endIt;
+        ++it)
+    {
+      CharacterIndex& index = *it;
+      index -= numberOfGlyphsRemoved;
+    }
+
+    // Clear the character to glyph conversion table.
+    model->mVisualModel->mCharactersToGlyph.Erase(charactersToGlyphBuffer + startIndex,
+                                                  charactersToGlyphBuffer + endIndexPlusOne);
+
+    // Clear the glyphs per character table.
+    model->mVisualModel->mGlyphsPerCharacter.Erase(glyphsPerCharacterBuffer + startIndex,
+                                                   glyphsPerCharacterBuffer + endIndexPlusOne);
+
+    // Clear the glyphs buffer.
+    GlyphInfo* glyphsBuffer = model->mVisualModel->mGlyphs.Begin();
+    model->mVisualModel->mGlyphs.Erase(glyphsBuffer + textUpdateInfo.mStartGlyphIndex,
+                                       glyphsBuffer + endGlyphIndexPlusOne);
+
+    CharacterIndex* glyphsToCharactersBuffer = model->mVisualModel->mGlyphsToCharacters.Begin();
+
+    // Update the glyph to character indices.
+    for(Vector<CharacterIndex>::Iterator it    = glyphsToCharactersBuffer + endGlyphIndexPlusOne,
+                                         endIt = glyphsToCharactersBuffer + model->mVisualModel->mGlyphsToCharacters.Count();
+        it != endIt;
+        ++it)
+    {
+      CharacterIndex& index = *it;
+      index -= numberOfCharactersRemoved;
+    }
+
+    // Clear the glyphs to characters buffer.
+    model->mVisualModel->mGlyphsToCharacters.Erase(glyphsToCharactersBuffer + textUpdateInfo.mStartGlyphIndex,
+                                                   glyphsToCharactersBuffer + endGlyphIndexPlusOne);
+
+    // Clear the characters per glyph buffer.
+    Length* charactersPerGlyphBuffer = model->mVisualModel->mCharactersPerGlyph.Begin();
+    model->mVisualModel->mCharactersPerGlyph.Erase(charactersPerGlyphBuffer + textUpdateInfo.mStartGlyphIndex,
+                                                   charactersPerGlyphBuffer + endGlyphIndexPlusOne);
+
+    // Should pass if mGlyphPositions has already been cleared in Controller::Relayouter::Relayout
+    if(0u != model->mVisualModel->mGlyphPositions.Count())
+    {
+      // Clear the positions buffer.
+      Vector2* positionsBuffer = model->mVisualModel->mGlyphPositions.Begin();
+      model->mVisualModel->mGlyphPositions.Erase(positionsBuffer + textUpdateInfo.mStartGlyphIndex,
+                                                 positionsBuffer + endGlyphIndexPlusOne);
+    }
+  }
+
+  if(Controller::NO_OPERATION != (Controller::LAYOUT & operations))
+  {
+    // Clear the lines.
+    uint32_t startRemoveIndex = model->mVisualModel->mLines.Count();
+    uint32_t endRemoveIndex   = startRemoveIndex;
+    ClearCharacterRuns(startIndex,
+                       endIndex,
+                       model->mVisualModel->mLines,
+                       startRemoveIndex,
+                       endRemoveIndex);
+
+    // Will update the glyph runs.
+    startRemoveIndex = model->mVisualModel->mLines.Count();
+    endRemoveIndex   = startRemoveIndex;
+    ClearGlyphRuns(textUpdateInfo.mStartGlyphIndex,
+                   endGlyphIndexPlusOne - 1u,
+                   model->mVisualModel->mLines,
+                   startRemoveIndex,
+                   endRemoveIndex);
+
+    // Set the line index from where to insert the new laid-out lines.
+    textUpdateInfo.mStartLineIndex = startRemoveIndex;
+
+    LineRun* linesBuffer = model->mVisualModel->mLines.Begin();
+    model->mVisualModel->mLines.Erase(linesBuffer + startRemoveIndex,
+                                      linesBuffer + endRemoveIndex);
+  }
+
+  if(Controller::NO_OPERATION != (Controller::COLOR & operations))
+  {
+    if(0u != model->mVisualModel->mColorIndices.Count())
+    {
+      ColorIndex* colorIndexBuffer = model->mVisualModel->mColorIndices.Begin();
+      model->mVisualModel->mColorIndices.Erase(colorIndexBuffer + textUpdateInfo.mStartGlyphIndex,
+                                                colorIndexBuffer + endGlyphIndexPlusOne);
+    }
+
+    if(0u != model->mVisualModel->mBackgroundColorIndices.Count())
+    {
+      ColorIndex* backgroundColorIndexBuffer = model->mVisualModel->mBackgroundColorIndices.Begin();
+      model->mVisualModel->mBackgroundColorIndices.Erase(backgroundColorIndexBuffer + textUpdateInfo.mStartGlyphIndex,
+                                                         backgroundColorIndexBuffer + endGlyphIndexPlusOne);
+    }
+  }
+}
+
+void ControllerImplDataClearer::ClearModelData(Controller::Impl& impl, CharacterIndex startIndex, CharacterIndex endIndex, Controller::OperationsMask operations)
+{
+  TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo;
+
+  if(textUpdateInfo.mClearAll ||
+     ((0u == startIndex) &&
+      (textUpdateInfo.mPreviousNumberOfCharacters == endIndex + 1u)))
+  {
+    ClearFullModelData(impl, operations);
+  }
+  else
+  {
+    // Clear the model data related with characters.
+    ClearCharacterModelData(impl, startIndex, endIndex, operations);
+
+    // Clear the model data related with glyphs.
+    ClearGlyphModelData(impl, startIndex, endIndex, operations);
+  }
+
+  ModelPtr& model = impl.mModel;
+
+  // The estimated number of lines. Used to avoid reallocations when layouting.
+  textUpdateInfo.mEstimatedNumberOfLines = std::max(model->mVisualModel->mLines.Count(), model->mLogicalModel->mParagraphInfo.Count());
+
+  model->mVisualModel->ClearCaches();
+}
+
+} // namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h
new file mode 100644
index 0000000..878b285
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h
@@ -0,0 +1,81 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_DATA_CLEARER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_DATA_CLEARER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+
+namespace Dali::Toolkit::Text
+{
+
+/// Provides methods to clear some of the model data in the Text::Controller::Impl
+struct ControllerImplDataClearer
+{
+
+  /**
+   * @brief Helper to clear completely the parts of the model specified by the given @p operations.
+   *
+   * @note It never clears the text stored in utf32.
+   *
+   * @param[in] impl The text controller impl.
+   * @param[in] operations The operations required.
+   */
+  static void ClearFullModelData(Controller::Impl& impl, Controller::OperationsMask operations);
+
+  /**
+   * @brief Helper to clear completely the parts of the model related with the characters specified by the given @p operations.
+   *
+   * @note It never clears the text stored in utf32.
+   *
+   * @param[in] impl The text controller impl.
+   * @param[in] startIndex Index to the first character to be cleared.
+   * @param[in] endIndex Index to the last character to be cleared.
+   * @param[in] operations The operations required.
+   */
+  static void ClearCharacterModelData(Controller::Impl& impl, CharacterIndex startIndex, CharacterIndex endIndex, Controller::OperationsMask operations);
+
+  /**
+   * @brief Helper to clear completely the parts of the model related with the glyphs specified by the given @p operations.
+   *
+   * @note It never clears the text stored in utf32.
+   * @note Character indices are transformed to glyph indices.
+   *
+   * @param[in] impl The text controller impl.
+   * @param[in] startIndex Index to the first character to be cleared.
+   * @param[in] endIndex Index to the last character to be cleared.
+   * @param[in] operations The operations required.
+   */
+  static void ClearGlyphModelData(Controller::Impl& impl, CharacterIndex startIndex, CharacterIndex endIndex, Controller::OperationsMask operations);
+
+  /**
+   * @brief Helper to clear the parts of the model specified by the given @p operations and from @p startIndex to @p endIndex.
+   *
+   * @note It never clears the text stored in utf32.
+   *
+   * @param[in] impl The text controller impl.
+   * @param[in] startIndex Index to the first character to be cleared.
+   * @param[in] endIndex Index to the last character to be cleared.
+   * @param[in] operations The operations required.
+   */
+  static void ClearModelData(Controller::Impl& impl, CharacterIndex startIndex, CharacterIndex endIndex, Controller::OperationsMask operations);
+};
+
+} // namespace Dali::Toolkit::Text
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_DATA_CLEARER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.cpp
new file mode 100644
index 0000000..e888f74
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.cpp
@@ -0,0 +1,1129 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/adaptor-framework/key.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/cursor-helper-functions.h>
+#include <dali-toolkit/internal/text/text-editable-control-interface.h>
+
+using namespace Dali;
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+} // namespace
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+bool ControllerImplEventHandler::ProcessInputEvents(Controller::Impl& impl)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::ProcessInputEvents\n");
+
+  EventData*& eventData = impl.mEventData;
+  if(NULL == eventData)
+  {
+    // Nothing to do if there is no text input.
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::ProcessInputEvents no event data\n");
+    return false;
+  }
+
+  unsigned int oldPos = eventData->mPrimaryCursorPosition;
+
+  if(eventData->mDecorator)
+  {
+    for(std::vector<Event>::iterator iter = eventData->mEventQueue.begin();
+        iter != eventData->mEventQueue.end();
+        ++iter)
+    {
+      switch(iter->type)
+      {
+        case Event::CURSOR_KEY_EVENT:
+        {
+          OnCursorKeyEvent(impl, *iter);
+          break;
+        }
+        case Event::TAP_EVENT:
+        {
+          OnTapEvent(impl, *iter);
+          break;
+        }
+        case Event::LONG_PRESS_EVENT:
+        {
+          OnLongPressEvent(impl, *iter);
+          break;
+        }
+        case Event::PAN_EVENT:
+        {
+          OnPanEvent(impl, *iter);
+          break;
+        }
+        case Event::GRAB_HANDLE_EVENT:
+        case Event::LEFT_SELECTION_HANDLE_EVENT:
+        case Event::RIGHT_SELECTION_HANDLE_EVENT: // Fall through
+        {
+          OnHandleEvent(impl, *iter);
+          break;
+        }
+        case Event::SELECT:
+        {
+          OnSelectEvent(impl, *iter);
+          break;
+        }
+        case Event::SELECT_ALL:
+        {
+          OnSelectAllEvent(impl);
+          break;
+        }
+        case Event::SELECT_NONE:
+        {
+          OnSelectNoneEvent(impl);
+          break;
+        }
+        case Event::SELECT_RANGE:
+        {
+          OnSelectRangeEvent(impl, *iter);
+          break;
+        }
+      }
+    }
+  }
+
+  if(eventData->mUpdateCursorPosition ||
+     eventData->mUpdateHighlightBox)
+  {
+    impl.NotifyInputMethodContext();
+  }
+
+  // The cursor must also be repositioned after inserts into the model
+  if(eventData->mUpdateCursorPosition)
+  {
+    // Updates the cursor position and scrolls the text to make it visible.
+    CursorInfo cursorInfo;
+
+    // Calculate the cursor position from the new cursor index.
+    impl.GetCursorPosition(eventData->mPrimaryCursorPosition, cursorInfo);
+
+    //only emit the event if the cursor is moved in current function.
+    if(nullptr != impl.mEditableControlInterface && eventData->mEventQueue.size() > 0)
+    {
+      impl.mEditableControlInterface->CursorPositionChanged(oldPos, eventData->mPrimaryCursorPosition);
+    }
+
+    if(eventData->mUpdateCursorHookPosition)
+    {
+      // Update the cursor hook position. Used to move the cursor with the keys 'up' and 'down'.
+      eventData->mCursorHookPositionX      = cursorInfo.primaryPosition.x;
+      eventData->mUpdateCursorHookPosition = false;
+    }
+
+    // Scroll first the text after delete ...
+    if(eventData->mScrollAfterDelete)
+    {
+      impl.ScrollTextToMatchCursor(cursorInfo);
+    }
+
+    // ... then, text can be scrolled to make the cursor visible.
+    if(eventData->mScrollAfterUpdatePosition)
+    {
+      const Vector2 currentCursorPosition(cursorInfo.primaryPosition.x, cursorInfo.lineOffset);
+      impl.ScrollToMakePositionVisible(currentCursorPosition, cursorInfo.lineHeight);
+    }
+    eventData->mScrollAfterUpdatePosition = false;
+    eventData->mScrollAfterDelete         = false;
+
+    impl.UpdateCursorPosition(cursorInfo);
+
+    eventData->mDecoratorUpdated         = true;
+    eventData->mUpdateCursorPosition     = false;
+    eventData->mUpdateGrabHandlePosition = false;
+  }
+
+  if(eventData->mUpdateHighlightBox ||
+     eventData->mUpdateLeftSelectionPosition ||
+     eventData->mUpdateRightSelectionPosition)
+  {
+    CursorInfo leftHandleInfo;
+    CursorInfo rightHandleInfo;
+
+    if(eventData->mUpdateHighlightBox)
+    {
+      impl.GetCursorPosition(eventData->mLeftSelectionPosition, leftHandleInfo);
+
+      impl.GetCursorPosition(eventData->mRightSelectionPosition, rightHandleInfo);
+
+      if(eventData->mScrollAfterUpdatePosition && (eventData->mIsLeftHandleSelected ? eventData->mUpdateLeftSelectionPosition : eventData->mUpdateRightSelectionPosition))
+      {
+        if(eventData->mIsLeftHandleSelected && eventData->mIsRightHandleSelected)
+        {
+          CursorInfo& infoLeft = leftHandleInfo;
+
+          const Vector2 currentCursorPositionLeft(infoLeft.primaryPosition.x, infoLeft.lineOffset);
+          impl.ScrollToMakePositionVisible(currentCursorPositionLeft, infoLeft.lineHeight);
+
+          CursorInfo& infoRight = rightHandleInfo;
+
+          const Vector2 currentCursorPositionRight(infoRight.primaryPosition.x, infoRight.lineOffset);
+          impl.ScrollToMakePositionVisible(currentCursorPositionRight, infoRight.lineHeight);
+        }
+        else
+        {
+          CursorInfo& info = eventData->mIsLeftHandleSelected ? leftHandleInfo : rightHandleInfo;
+
+          const Vector2 currentCursorPosition(info.primaryPosition.x, info.lineOffset);
+          impl.ScrollToMakePositionVisible(currentCursorPosition, info.lineHeight);
+        }
+      }
+    }
+
+    if(eventData->mUpdateLeftSelectionPosition)
+    {
+      impl.UpdateSelectionHandle(LEFT_SELECTION_HANDLE, leftHandleInfo);
+
+      impl.SetPopupButtons();
+      eventData->mDecoratorUpdated            = true;
+      eventData->mUpdateLeftSelectionPosition = false;
+    }
+
+    if(eventData->mUpdateRightSelectionPosition)
+    {
+      impl.UpdateSelectionHandle(RIGHT_SELECTION_HANDLE, rightHandleInfo);
+
+      impl.SetPopupButtons();
+      eventData->mDecoratorUpdated             = true;
+      eventData->mUpdateRightSelectionPosition = false;
+    }
+
+    if(eventData->mUpdateHighlightBox)
+    {
+      impl.RepositionSelectionHandles();
+
+      eventData->mUpdateLeftSelectionPosition  = false;
+      eventData->mUpdateRightSelectionPosition = false;
+      eventData->mUpdateHighlightBox           = false;
+      eventData->mIsLeftHandleSelected         = false;
+      eventData->mIsRightHandleSelected        = false;
+    }
+
+    eventData->mScrollAfterUpdatePosition = false;
+  }
+
+  if(eventData->mUpdateInputStyle)
+  {
+    // Keep a copy of the current input style.
+    InputStyle currentInputStyle;
+    currentInputStyle.Copy(eventData->mInputStyle);
+
+    // Set the default style first.
+    impl.RetrieveDefaultInputStyle(eventData->mInputStyle);
+
+    // Get the character index from the cursor index.
+    const CharacterIndex styleIndex = (eventData->mPrimaryCursorPosition > 0u) ? eventData->mPrimaryCursorPosition - 1u : 0u;
+
+    // Retrieve the style from the style runs stored in the logical model.
+    impl.mModel->mLogicalModel->RetrieveStyle(styleIndex, eventData->mInputStyle);
+
+    // Compare if the input style has changed.
+    const bool hasInputStyleChanged = !currentInputStyle.Equal(eventData->mInputStyle);
+
+    if(hasInputStyleChanged)
+    {
+      const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask(eventData->mInputStyle);
+      // Queue the input style changed signal.
+      eventData->mInputStyleChangedQueue.PushBack(styleChangedMask);
+    }
+
+    eventData->mUpdateInputStyle = false;
+  }
+
+  eventData->mEventQueue.clear();
+
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::ProcessInputEvents\n");
+
+  const bool decoratorUpdated  = eventData->mDecoratorUpdated;
+  eventData->mDecoratorUpdated = false;
+
+  return decoratorUpdated;
+}
+
+void ControllerImplEventHandler::OnCursorKeyEvent(Controller::Impl& impl, const Event& event)
+{
+  if(NULL == impl.mEventData || !impl.IsShowingRealText())
+  {
+    // Nothing to do if there is no text input.
+    return;
+  }
+
+  int              keyCode         = event.p1.mInt;
+  bool             isShiftModifier = event.p2.mBool;
+  EventData&       eventData       = *impl.mEventData;
+  ModelPtr&        model           = impl.mModel;
+  LogicalModelPtr& logicalModel    = model->mLogicalModel;
+  VisualModelPtr&  visualModel     = model->mVisualModel;
+  uint32_t         oldSelStart     = eventData.mLeftSelectionPosition;
+  uint32_t         oldSelEnd       = eventData.mRightSelectionPosition;
+
+  CharacterIndex& primaryCursorPosition         = eventData.mPrimaryCursorPosition;
+  CharacterIndex  previousPrimaryCursorPosition = primaryCursorPosition;
+
+  if(Dali::DALI_KEY_CURSOR_LEFT == keyCode)
+  {
+    if(primaryCursorPosition > 0u)
+    {
+      if(!isShiftModifier && eventData.mDecorator->IsHighlightVisible())
+      {
+        primaryCursorPosition = std::min(eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+      }
+      else
+      {
+        primaryCursorPosition = impl.CalculateNewCursorIndex(primaryCursorPosition - 1u);
+      }
+    }
+  }
+  else if(Dali::DALI_KEY_CURSOR_RIGHT == keyCode)
+  {
+    if(logicalModel->mText.Count() > primaryCursorPosition)
+    {
+      if(!isShiftModifier && eventData.mDecorator->IsHighlightVisible())
+      {
+        primaryCursorPosition = std::max(eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+      }
+      else
+      {
+        primaryCursorPosition = impl.CalculateNewCursorIndex(primaryCursorPosition);
+      }
+    }
+  }
+  else if(Dali::DALI_KEY_CURSOR_UP == keyCode && !isShiftModifier)
+  {
+    // Ignore Shift-Up for text selection for now.
+
+    // Get first the line index of the current cursor position index.
+    CharacterIndex characterIndex = 0u;
+
+    if(primaryCursorPosition > 0u)
+    {
+      characterIndex = primaryCursorPosition - 1u;
+    }
+
+    const LineIndex lineIndex         = visualModel->GetLineOfCharacter(characterIndex);
+    const LineIndex previousLineIndex = (lineIndex > 0 ? lineIndex - 1u : lineIndex);
+    const size_t    lastLineIndex     = (visualModel->mLines.Size() > 0 ? visualModel->mLines.Size() - 1u : 0);
+    const bool      isLastLine        = (previousLineIndex == lastLineIndex);
+
+    // Retrieve the cursor position info.
+    CursorInfo cursorInfo;
+    impl.GetCursorPosition(primaryCursorPosition,
+                           cursorInfo);
+
+    // Get the line above.
+    const LineRun& line = *(visualModel->mLines.Begin() + previousLineIndex);
+
+    // Get the next hit 'y' point.
+    const float hitPointY = cursorInfo.lineOffset - 0.5f * GetLineHeight(line, isLastLine);
+
+    // Use the cursor hook position 'x' and the next hit 'y' position to calculate the new cursor index.
+    bool matchedCharacter = false;
+    primaryCursorPosition = Text::GetClosestCursorIndex(visualModel,
+                                                        logicalModel,
+                                                        impl.mMetrics,
+                                                        eventData.mCursorHookPositionX,
+                                                        hitPointY,
+                                                        CharacterHitTest::TAP,
+                                                        matchedCharacter);
+  }
+  else if(Dali::DALI_KEY_CURSOR_DOWN == keyCode && !isShiftModifier)
+  {
+    // Ignore Shift-Down for text selection for now.
+
+    // Get first the line index of the current cursor position index.
+    CharacterIndex characterIndex = 0u;
+
+    if(primaryCursorPosition > 0u)
+    {
+      characterIndex = primaryCursorPosition - 1u;
+    }
+
+    const LineIndex lineIndex = visualModel->GetLineOfCharacter(characterIndex);
+
+    if(lineIndex + 1u < visualModel->mLines.Count())
+    {
+      // Retrieve the cursor position info.
+      CursorInfo cursorInfo;
+      impl.GetCursorPosition(primaryCursorPosition, cursorInfo);
+
+      // Get the line below.
+      const LineRun& nextline = *(visualModel->mLines.Begin() + lineIndex + 1u);
+      const LineRun& currline = *(visualModel->mLines.Begin() + lineIndex);
+
+      // Get last line index
+      const size_t    lastLineIndex = (visualModel->mLines.Size() > 0 ? visualModel->mLines.Size() - 1u : 0);
+      const bool      isLastLine    = (lineIndex + 1u == lastLineIndex);
+
+      // Get the next hit 'y' point.
+      const float hitPointY = cursorInfo.lineOffset + GetLineHeight(currline, false) + 0.5f * GetLineHeight(nextline, isLastLine);
+
+      // Use the cursor hook position 'x' and the next hit 'y' position to calculate the new cursor index.
+      bool matchedCharacter = false;
+      primaryCursorPosition = Text::GetClosestCursorIndex(visualModel,
+                                                          logicalModel,
+                                                          impl.mMetrics,
+                                                          eventData.mCursorHookPositionX,
+                                                          hitPointY,
+                                                          CharacterHitTest::TAP,
+                                                          matchedCharacter);
+    }
+  }
+
+  if(!isShiftModifier && eventData.mState != EventData::SELECTING)
+  {
+    // Update selection position after moving the cursor
+    eventData.mLeftSelectionPosition  = primaryCursorPosition;
+    eventData.mRightSelectionPosition = primaryCursorPosition;
+
+    if(impl.mSelectableControlInterface != nullptr && eventData.mDecorator->IsHighlightVisible())
+    {
+      impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+    }
+  }
+
+  if(isShiftModifier && impl.IsShowingRealText() && eventData.mShiftSelectionFlag)
+  {
+    // Handle text selection
+    bool selecting = false;
+
+    if(Dali::DALI_KEY_CURSOR_LEFT == keyCode || Dali::DALI_KEY_CURSOR_RIGHT == keyCode)
+    {
+      // Shift-Left/Right to select the text
+      int cursorPositionDelta = primaryCursorPosition - previousPrimaryCursorPosition;
+      if(cursorPositionDelta > 0 || eventData.mRightSelectionPosition > 0u) // Check the boundary
+      {
+        eventData.mRightSelectionPosition += cursorPositionDelta;
+        eventData.mPrimaryCursorPosition = eventData.mRightSelectionPosition;
+
+        if(impl.mSelectableControlInterface != nullptr)
+        {
+          impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+        }
+      }
+
+      if(impl.mSelectableControlInterface != nullptr && eventData.mLeftSelectionPosition == eventData.mRightSelectionPosition)
+      {
+        // If left selection position and right selection position are the same, the selection is canceled.
+        selecting = false;
+      }
+      else
+      {
+        selecting = true;
+      }
+    }
+    else if(eventData.mLeftSelectionPosition != eventData.mRightSelectionPosition)
+    {
+      // Show no grab handles and text highlight if Shift-Up/Down pressed but no selected text
+      selecting = true;
+    }
+
+    if(selecting)
+    {
+      // Notify the cursor position to the InputMethodContext.
+      if(eventData.mInputMethodContext)
+      {
+        eventData.mInputMethodContext.SetCursorPosition(primaryCursorPosition);
+        eventData.mInputMethodContext.NotifyCursorPosition();
+      }
+
+      impl.ChangeState(EventData::SELECTING);
+
+      eventData.mUpdateLeftSelectionPosition  = true;
+      eventData.mUpdateRightSelectionPosition = true;
+      eventData.mUpdateGrabHandlePosition     = true;
+      eventData.mUpdateHighlightBox           = true;
+
+      // Hide the text selection popup if select the text using keyboard instead of moving grab handles
+      if(eventData.mGrabHandlePopupEnabled)
+      {
+        eventData.mDecorator->SetPopupActive(false);
+      }
+    }
+    else
+    {
+      // If no selection, set a normal cursor.
+      impl.ChangeState(EventData::EDITING);
+      eventData.mUpdateCursorPosition = true;
+    }
+  }
+  else
+  {
+    // Handle normal cursor move
+    impl.ChangeState(EventData::EDITING);
+    eventData.mUpdateCursorPosition = true;
+  }
+
+  eventData.mUpdateInputStyle          = true;
+  eventData.mScrollAfterUpdatePosition = true;
+}
+
+void ControllerImplEventHandler::OnTapEvent(Controller::Impl& impl, const Event& event)
+{
+  if(impl.mEventData)
+  {
+    const unsigned int tapCount     = event.p1.mUint;
+    EventData&         eventData    = *impl.mEventData;
+    ModelPtr&          model        = impl.mModel;
+    LogicalModelPtr&   logicalModel = model->mLogicalModel;
+    VisualModelPtr&    visualModel  = model->mVisualModel;
+
+    if(1u == tapCount)
+    {
+      if(impl.IsShowingRealText())
+      {
+        // Convert from control's coords to text's coords.
+        const float xPosition   = event.p2.mFloat - model->mScrollPosition.x;
+        const float yPosition   = event.p3.mFloat - model->mScrollPosition.y;
+        uint32_t    oldSelStart = eventData.mLeftSelectionPosition;
+        uint32_t    oldSelEnd   = eventData.mRightSelectionPosition;
+
+        // Keep the tap 'x' position. Used to move the cursor.
+        eventData.mCursorHookPositionX = xPosition;
+
+        // Whether to touch point hits on a glyph.
+        bool matchedCharacter            = false;
+        eventData.mPrimaryCursorPosition = Text::GetClosestCursorIndex(visualModel,
+                                                                       logicalModel,
+                                                                       impl.mMetrics,
+                                                                       xPosition,
+                                                                       yPosition,
+                                                                       CharacterHitTest::TAP,
+                                                                       matchedCharacter);
+
+        if(impl.mSelectableControlInterface != nullptr && eventData.mDecorator->IsHighlightVisible())
+        {
+          impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, eventData.mPrimaryCursorPosition, eventData.mPrimaryCursorPosition);
+        }
+
+        // When the cursor position is changing, delay cursor blinking
+        eventData.mDecorator->DelayCursorBlink();
+      }
+      else
+      {
+        eventData.mPrimaryCursorPosition = 0u;
+      }
+
+      // Update selection position after tapping
+      eventData.mLeftSelectionPosition  = eventData.mPrimaryCursorPosition;
+      eventData.mRightSelectionPosition = eventData.mPrimaryCursorPosition;
+
+      eventData.mUpdateCursorPosition      = true;
+      eventData.mUpdateGrabHandlePosition  = true;
+      eventData.mScrollAfterUpdatePosition = true;
+      eventData.mUpdateInputStyle          = true;
+
+      // Notify the cursor position to the InputMethodContext.
+      if(eventData.mInputMethodContext)
+      {
+        eventData.mInputMethodContext.SetCursorPosition(eventData.mPrimaryCursorPosition);
+        eventData.mInputMethodContext.NotifyCursorPosition();
+      }
+    }
+    else if(2u == tapCount)
+    {
+      if(eventData.mSelectionEnabled)
+      {
+        // Convert from control's coords to text's coords.
+        const float xPosition = event.p2.mFloat - model->mScrollPosition.x;
+        const float yPosition = event.p3.mFloat - model->mScrollPosition.y;
+
+        // Calculates the logical position from the x,y coords.
+        impl.RepositionSelectionHandles(xPosition, yPosition, eventData.mDoubleTapAction);
+      }
+    }
+  }
+}
+
+void ControllerImplEventHandler::OnPanEvent(Controller::Impl& impl, const Event& event)
+{
+  if(impl.mEventData)
+  {
+    EventData&    eventData = *impl.mEventData;
+    DecoratorPtr& decorator = eventData.mDecorator;
+
+    const bool isHorizontalScrollEnabled = decorator->IsHorizontalScrollEnabled();
+    const bool isVerticalScrollEnabled   = decorator->IsVerticalScrollEnabled();
+
+    if(!isHorizontalScrollEnabled && !isVerticalScrollEnabled)
+    {
+      // Nothing to do if scrolling is not enabled.
+      return;
+    }
+
+    const GestureState state = static_cast<GestureState>(event.p1.mInt);
+    switch(state)
+    {
+      case GestureState::STARTED:
+      {
+        // Will remove the cursor, handles or text's popup, ...
+        impl.ChangeState(EventData::TEXT_PANNING);
+        break;
+      }
+      case GestureState::CONTINUING:
+      {
+        ModelPtr& model = impl.mModel;
+
+        const Vector2& layoutSize     = model->mVisualModel->GetLayoutSize();
+        Vector2&       scrollPosition = model->mScrollPosition;
+        const Vector2  currentScroll  = scrollPosition;
+
+        if(isHorizontalScrollEnabled)
+        {
+          const float displacementX = event.p2.mFloat;
+          scrollPosition.x += displacementX;
+
+          impl.ClampHorizontalScroll(layoutSize);
+        }
+
+        if(isVerticalScrollEnabled)
+        {
+          const float displacementY = event.p3.mFloat;
+          scrollPosition.y += displacementY;
+
+          impl.ClampVerticalScroll(layoutSize);
+        }
+
+        decorator->UpdatePositions(scrollPosition - currentScroll);
+        break;
+      }
+      case GestureState::FINISHED:
+      case GestureState::CANCELLED: // FALLTHROUGH
+      {
+        // Will go back to the previous state to show the cursor, handles, the text's popup, ...
+        impl.ChangeState(eventData.mPreviousState);
+        break;
+      }
+      default:
+        break;
+    }
+  }
+}
+
+void ControllerImplEventHandler::OnLongPressEvent(Controller::Impl& impl, const Event& event)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::OnLongPressEvent\n");
+
+  if(impl.mEventData)
+  {
+    EventData& eventData = *impl.mEventData;
+
+    if(!impl.IsShowingRealText() && (EventData::EDITING == eventData.mState))
+    {
+      impl.ChangeState(EventData::EDITING_WITH_POPUP);
+      eventData.mDecoratorUpdated = true;
+      eventData.mUpdateInputStyle = true;
+    }
+    else
+    {
+      if(eventData.mSelectionEnabled)
+      {
+        ModelPtr& model = impl.mModel;
+
+        // Convert from control's coords to text's coords.
+        const float xPosition = event.p2.mFloat - model->mScrollPosition.x;
+        const float yPosition = event.p3.mFloat - model->mScrollPosition.y;
+
+        // Calculates the logical position from the x,y coords.
+        impl.RepositionSelectionHandles(xPosition, yPosition, eventData.mLongPressAction);
+      }
+    }
+  }
+}
+
+void ControllerImplEventHandler::OnHandleEvent(Controller::Impl& impl, const Event& event)
+{
+  if(impl.mEventData)
+  {
+    const unsigned int state                    = event.p1.mUint;
+    const bool         handleStopScrolling      = (HANDLE_STOP_SCROLLING == state);
+    const bool         isSmoothHandlePanEnabled = impl.mEventData->mDecorator->IsSmoothHandlePanEnabled();
+
+    if(HANDLE_PRESSED == state)
+    {
+      OnHandlePressed(impl, event, isSmoothHandlePanEnabled);
+    } // end ( HANDLE_PRESSED == state )
+    else if((HANDLE_RELEASED == state) ||
+            handleStopScrolling)
+    {
+      OnHandleReleased(impl, event, isSmoothHandlePanEnabled, handleStopScrolling);
+    } // end ( ( HANDLE_RELEASED == state ) || ( HANDLE_STOP_SCROLLING == state ) )
+    else if(HANDLE_SCROLLING == state)
+    {
+      OnHandleScrolling(impl, event, isSmoothHandlePanEnabled);
+    } // end ( HANDLE_SCROLLING == state )
+  }
+}
+
+void ControllerImplEventHandler::OnSelectEvent(Controller::Impl& impl, const Event& event)
+{
+  if(impl.mEventData && impl.mEventData->mSelectionEnabled)
+  {
+    ModelPtr&      model          = impl.mModel;
+    const Vector2& scrollPosition = model->mScrollPosition;
+
+    // Convert from control's coords to text's coords.
+    const float xPosition = event.p2.mFloat - scrollPosition.x;
+    const float yPosition = event.p3.mFloat - scrollPosition.y;
+
+    // Calculates the logical position from the x,y coords.
+    impl.RepositionSelectionHandles(xPosition, yPosition, Controller::NoTextTap::HIGHLIGHT);
+  }
+}
+
+void ControllerImplEventHandler::OnSelectAllEvent(Controller::Impl& impl)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "OnSelectAllEvent mEventData->mSelectionEnabled%s \n", impl.mEventData->mSelectionEnabled ? "true" : "false");
+
+  if(impl.mEventData)
+  {
+    EventData& eventData = *impl.mEventData;
+    if(eventData.mSelectionEnabled && eventData.mState != EventData::INACTIVE)
+    {
+      ModelPtr&      model          = impl.mModel;
+      const Vector2& scrollPosition = model->mScrollPosition;
+
+      // Calculates the logical position from the start.
+      impl.RepositionSelectionHandles(0.f - scrollPosition.x,
+                                      0.f - scrollPosition.y,
+                                      Controller::NoTextTap::HIGHLIGHT);
+
+      uint32_t oldStart = eventData.mLeftSelectionPosition;
+      uint32_t oldEnd   = eventData.mRightSelectionPosition;
+
+      eventData.mLeftSelectionPosition  = 0u;
+      eventData.mRightSelectionPosition = model->mLogicalModel->mText.Count();
+      eventData.mPrimaryCursorPosition  = eventData.mRightSelectionPosition;
+
+      if(impl.mSelectableControlInterface != nullptr)
+      {
+        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+      }
+    }
+  }
+}
+
+void ControllerImplEventHandler::OnSelectNoneEvent(Controller::Impl& impl)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "OnSelectNoneEvent mEventData->mSelectionEnabled%s \n", impl.mEventData->mSelectionEnabled ? "true" : "false");
+
+  if(impl.mEventData)
+  {
+    EventData& eventData = *impl.mEventData;
+    if(eventData.mSelectionEnabled && eventData.mState == EventData::SELECTING)
+    {
+      uint32_t oldStart = eventData.mLeftSelectionPosition;
+      uint32_t oldEnd   = eventData.mRightSelectionPosition;
+
+      eventData.mLeftSelectionPosition = eventData.mRightSelectionPosition = eventData.mPrimaryCursorPosition;
+      impl.ChangeState(EventData::EDITING);
+      eventData.mUpdateCursorPosition      = true;
+      eventData.mUpdateInputStyle          = true;
+      eventData.mScrollAfterUpdatePosition = true;
+
+      if(impl.mSelectableControlInterface != nullptr)
+      {
+        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+      }
+    }
+  }
+}
+
+void ControllerImplEventHandler::OnSelectRangeEvent(Controller::Impl& impl, const Event& event)
+{
+  if(impl.mEventData && impl.mEventData->mSelectionEnabled && impl.mEventData->mState != EventData::INACTIVE)
+  {
+    ModelPtr&      model          = impl.mModel;
+    const Vector2& scrollPosition = model->mScrollPosition;
+
+    // Calculate the selection index.
+    const uint32_t length = static_cast<uint32_t>(model->mLogicalModel->mText.Count());
+    const uint32_t start  = std::min(event.p2.mUint, length);
+    const uint32_t end    = std::min(event.p3.mUint, length);
+
+    if(start != end)
+    {
+      uint32_t oldStart = impl.mEventData->mLeftSelectionPosition;
+      uint32_t oldEnd   = impl.mEventData->mRightSelectionPosition;
+
+      // Calculates the logical position from the x,y coords.
+      impl.RepositionSelectionHandles(0.f - scrollPosition.x, 0.f - scrollPosition.y, Controller::NoTextTap::HIGHLIGHT);
+
+      impl.mEventData->mLeftSelectionPosition  = start;
+      impl.mEventData->mRightSelectionPosition = end;
+      impl.mEventData->mPrimaryCursorPosition  = end;
+
+      if(impl.mSelectableControlInterface != nullptr)
+      {
+        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, start, end);
+      }
+    }
+  }
+}
+
+void ControllerImplEventHandler::OnHandlePressed(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled)
+{
+  ModelPtr&      model          = impl.mModel;
+  const Vector2& scrollPosition = model->mScrollPosition;
+
+  // Convert from decorator's coords to text's coords.
+  const float xPosition = event.p2.mFloat - scrollPosition.x;
+  const float yPosition = event.p3.mFloat - scrollPosition.y;
+
+  // Need to calculate the handle's new position.
+  bool                 matchedCharacter  = false;
+  const CharacterIndex handleNewPosition = Text::GetClosestCursorIndex(model->mVisualModel,
+                                                                       model->mLogicalModel,
+                                                                       impl.mMetrics,
+                                                                       xPosition,
+                                                                       yPosition,
+                                                                       CharacterHitTest::SCROLL,
+                                                                       matchedCharacter);
+
+  EventData& eventData = *impl.mEventData;
+  uint32_t   oldStart  = eventData.mLeftSelectionPosition;
+  uint32_t   oldEnd    = eventData.mRightSelectionPosition;
+
+  if(Event::GRAB_HANDLE_EVENT == event.type)
+  {
+    impl.ChangeState(EventData::GRAB_HANDLE_PANNING);
+
+    if(handleNewPosition != eventData.mPrimaryCursorPosition)
+    {
+      // Updates the cursor position if the handle's new position is different than the current one.
+      eventData.mUpdateCursorPosition = true;
+      // Does not update the grab handle position if the smooth panning is enabled. (The decorator does it smooth).
+      eventData.mUpdateGrabHandlePosition = !isSmoothHandlePanEnabled;
+      eventData.mPrimaryCursorPosition    = handleNewPosition;
+    }
+
+    // Updates the decorator if the soft handle panning is enabled. It triggers a relayout in the decorator and the new position of the handle is set.
+    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
+  }
+  else if(Event::LEFT_SELECTION_HANDLE_EVENT == event.type)
+  {
+    impl.ChangeState(EventData::SELECTION_HANDLE_PANNING);
+
+    if((handleNewPosition != eventData.mLeftSelectionPosition) &&
+       (handleNewPosition != eventData.mRightSelectionPosition))
+    {
+      // Updates the highlight box if the handle's new position is different than the current one.
+      eventData.mUpdateHighlightBox = true;
+      // Does not update the selection handle position if the smooth panning is enabled. (The decorator does it smooth).
+      eventData.mUpdateLeftSelectionPosition = !isSmoothHandlePanEnabled;
+      eventData.mLeftSelectionPosition       = handleNewPosition;
+    }
+
+    // Updates the decorator if the soft handle panning is enabled. It triggers a relayout in the decorator and the new position of the handle is set.
+    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
+
+    // Will define the order to scroll the text to match the handle position.
+    eventData.mIsLeftHandleSelected  = true;
+    eventData.mIsRightHandleSelected = false;
+  }
+  else if(Event::RIGHT_SELECTION_HANDLE_EVENT == event.type)
+  {
+    impl.ChangeState(EventData::SELECTION_HANDLE_PANNING);
+
+    if((handleNewPosition != eventData.mRightSelectionPosition) &&
+       (handleNewPosition != eventData.mLeftSelectionPosition))
+    {
+      // Updates the highlight box if the handle's new position is different than the current one.
+      eventData.mUpdateHighlightBox = true;
+      // Does not update the selection handle position if the smooth panning is enabled. (The decorator does it smooth).
+      eventData.mUpdateRightSelectionPosition = !isSmoothHandlePanEnabled;
+      eventData.mRightSelectionPosition       = handleNewPosition;
+    }
+
+    // Updates the decorator if the soft handle panning is enabled. It triggers a relayout in the decorator and the new position of the handle is set.
+    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
+
+    // Will define the order to scroll the text to match the handle position.
+    eventData.mIsLeftHandleSelected  = false;
+    eventData.mIsRightHandleSelected = true;
+  }
+
+  if((impl.mSelectableControlInterface != nullptr) && ((oldStart != eventData.mLeftSelectionPosition) || (oldEnd != eventData.mRightSelectionPosition)))
+  {
+    impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+  }
+}
+
+void ControllerImplEventHandler::OnHandleReleased(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled, const bool handleStopScrolling)
+{
+  CharacterIndex handlePosition = 0u;
+  if(handleStopScrolling || isSmoothHandlePanEnabled)
+  {
+    ModelPtr&      model          = impl.mModel;
+    const Vector2& scrollPosition = model->mScrollPosition;
+
+    // Convert from decorator's coords to text's coords.
+    const float xPosition = event.p2.mFloat - scrollPosition.x;
+    const float yPosition = event.p3.mFloat - scrollPosition.y;
+
+    bool matchedCharacter = false;
+    handlePosition        = Text::GetClosestCursorIndex(model->mVisualModel,
+                                                 model->mLogicalModel,
+                                                 impl.mMetrics,
+                                                 xPosition,
+                                                 yPosition,
+                                                 CharacterHitTest::SCROLL,
+                                                 matchedCharacter);
+  }
+
+  EventData& eventData = *impl.mEventData;
+  uint32_t   oldStart  = eventData.mLeftSelectionPosition;
+  uint32_t   oldEnd    = eventData.mRightSelectionPosition;
+
+  if(Event::GRAB_HANDLE_EVENT == event.type)
+  {
+    eventData.mUpdateCursorPosition     = true;
+    eventData.mUpdateGrabHandlePosition = true;
+    eventData.mUpdateInputStyle         = true;
+
+    if(!impl.IsClipboardEmpty())
+    {
+      impl.ChangeState(EventData::EDITING_WITH_PASTE_POPUP); // Moving grabhandle will show Paste Popup
+    }
+
+    if(handleStopScrolling || isSmoothHandlePanEnabled)
+    {
+      eventData.mScrollAfterUpdatePosition = true;
+      eventData.mPrimaryCursorPosition     = handlePosition;
+    }
+  }
+  else if(Event::LEFT_SELECTION_HANDLE_EVENT == event.type)
+  {
+    impl.ChangeState(EventData::SELECTING);
+
+    eventData.mUpdateHighlightBox           = true;
+    eventData.mUpdateLeftSelectionPosition  = true;
+    eventData.mUpdateRightSelectionPosition = true;
+
+    if(handleStopScrolling || isSmoothHandlePanEnabled)
+    {
+      eventData.mScrollAfterUpdatePosition = true;
+
+      if((handlePosition != eventData.mRightSelectionPosition) &&
+         (handlePosition != eventData.mLeftSelectionPosition))
+      {
+        eventData.mLeftSelectionPosition = handlePosition;
+      }
+    }
+  }
+  else if(Event::RIGHT_SELECTION_HANDLE_EVENT == event.type)
+  {
+    impl.ChangeState(EventData::SELECTING);
+
+    eventData.mUpdateHighlightBox           = true;
+    eventData.mUpdateRightSelectionPosition = true;
+    eventData.mUpdateLeftSelectionPosition  = true;
+
+    if(handleStopScrolling || isSmoothHandlePanEnabled)
+    {
+      eventData.mScrollAfterUpdatePosition = true;
+      if((handlePosition != eventData.mRightSelectionPosition) &&
+         (handlePosition != eventData.mLeftSelectionPosition))
+      {
+        eventData.mRightSelectionPosition = handlePosition;
+      }
+    }
+  }
+
+  if((impl.mSelectableControlInterface != nullptr) && ((oldStart != eventData.mLeftSelectionPosition) || (oldEnd != eventData.mRightSelectionPosition)))
+  {
+    impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+  }
+
+  eventData.mDecoratorUpdated = true;
+}
+
+void ControllerImplEventHandler::OnHandleScrolling(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled)
+{
+  ModelPtr&       model          = impl.mModel;
+  Vector2&        scrollPosition = model->mScrollPosition;
+  VisualModelPtr& visualModel    = model->mVisualModel;
+
+  const float    xSpeed                = event.p2.mFloat;
+  const float    ySpeed                = event.p3.mFloat;
+  const Vector2& layoutSize            = visualModel->GetLayoutSize();
+  const Vector2  currentScrollPosition = scrollPosition;
+
+  scrollPosition.x += xSpeed;
+  scrollPosition.y += ySpeed;
+
+  impl.ClampHorizontalScroll(layoutSize);
+  impl.ClampVerticalScroll(layoutSize);
+
+  EventData&    eventData = *impl.mEventData;
+  DecoratorPtr& decorator = eventData.mDecorator;
+
+  bool endOfScroll = false;
+  if(Vector2::ZERO == (currentScrollPosition - scrollPosition))
+  {
+    // Notify the decorator there is no more text to scroll.
+    // The decorator won't send more scroll events.
+    decorator->NotifyEndOfScroll();
+    // Still need to set the position of the handle.
+    endOfScroll = true;
+  }
+
+  // Set the position of the handle.
+  const bool scrollRightDirection      = xSpeed > 0.f;
+  const bool scrollBottomDirection     = ySpeed > 0.f;
+  const bool leftSelectionHandleEvent  = Event::LEFT_SELECTION_HANDLE_EVENT == event.type;
+  const bool rightSelectionHandleEvent = Event::RIGHT_SELECTION_HANDLE_EVENT == event.type;
+
+  if(Event::GRAB_HANDLE_EVENT == event.type)
+  {
+    impl.ChangeState(EventData::GRAB_HANDLE_PANNING);
+
+    // Get the grab handle position in decorator coords.
+    Vector2 position = decorator->GetPosition(GRAB_HANDLE);
+
+    if(decorator->IsHorizontalScrollEnabled())
+    {
+      // Position the grag handle close to either the left or right edge.
+      position.x = scrollRightDirection ? 0.f : visualModel->mControlSize.width;
+    }
+
+    if(decorator->IsVerticalScrollEnabled())
+    {
+      position.x = eventData.mCursorHookPositionX;
+
+      // Position the grag handle close to either the top or bottom edge.
+      position.y = scrollBottomDirection ? 0.f : visualModel->mControlSize.height;
+    }
+
+    // Get the new handle position.
+    // The grab handle's position is in decorator's coords. Need to transforms to text's coords.
+    bool                 matchedCharacter = false;
+    const CharacterIndex handlePosition   = Text::GetClosestCursorIndex(visualModel,
+                                                                      impl.mModel->mLogicalModel,
+                                                                      impl.mMetrics,
+                                                                      position.x - scrollPosition.x,
+                                                                      position.y - scrollPosition.y,
+                                                                      CharacterHitTest::SCROLL,
+                                                                      matchedCharacter);
+
+    if(eventData.mPrimaryCursorPosition != handlePosition)
+    {
+      eventData.mUpdateCursorPosition      = true;
+      eventData.mUpdateGrabHandlePosition  = !isSmoothHandlePanEnabled;
+      eventData.mScrollAfterUpdatePosition = true;
+      eventData.mPrimaryCursorPosition     = handlePosition;
+    }
+    eventData.mUpdateInputStyle = eventData.mUpdateCursorPosition;
+
+    // Updates the decorator if the soft handle panning is enabled.
+    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
+  }
+  else if(leftSelectionHandleEvent || rightSelectionHandleEvent)
+  {
+    impl.ChangeState(EventData::SELECTION_HANDLE_PANNING);
+
+    // Get the selection handle position in decorator coords.
+    Vector2 position = decorator->GetPosition(leftSelectionHandleEvent ? Text::LEFT_SELECTION_HANDLE : Text::RIGHT_SELECTION_HANDLE);
+
+    if(decorator->IsHorizontalScrollEnabled())
+    {
+      // Position the selection handle close to either the left or right edge.
+      position.x = scrollRightDirection ? 0.f : visualModel->mControlSize.width;
+    }
+
+    if(decorator->IsVerticalScrollEnabled())
+    {
+      position.x = eventData.mCursorHookPositionX;
+
+      // Position the grag handle close to either the top or bottom edge.
+      position.y = scrollBottomDirection ? 0.f : visualModel->mControlSize.height;
+    }
+
+    // Get the new handle position.
+    // The selection handle's position is in decorator's coords. Need to transform to text's coords.
+    bool                 matchedCharacter = false;
+    const CharacterIndex handlePosition   = Text::GetClosestCursorIndex(visualModel,
+                                                                      impl.mModel->mLogicalModel,
+                                                                      impl.mMetrics,
+                                                                      position.x - scrollPosition.x,
+                                                                      position.y - scrollPosition.y,
+                                                                      CharacterHitTest::SCROLL,
+                                                                      matchedCharacter);
+    uint32_t             oldStart         = eventData.mLeftSelectionPosition;
+    uint32_t             oldEnd           = eventData.mRightSelectionPosition;
+
+    if(leftSelectionHandleEvent)
+    {
+      const bool differentHandles = (eventData.mLeftSelectionPosition != handlePosition) && (eventData.mRightSelectionPosition != handlePosition);
+
+      if(differentHandles || endOfScroll)
+      {
+        eventData.mUpdateHighlightBox           = true;
+        eventData.mUpdateLeftSelectionPosition  = !isSmoothHandlePanEnabled;
+        eventData.mUpdateRightSelectionPosition = isSmoothHandlePanEnabled;
+        eventData.mLeftSelectionPosition        = handlePosition;
+      }
+    }
+    else
+    {
+      const bool differentHandles = (eventData.mRightSelectionPosition != handlePosition) && (eventData.mLeftSelectionPosition != handlePosition);
+      if(differentHandles || endOfScroll)
+      {
+        eventData.mUpdateHighlightBox           = true;
+        eventData.mUpdateRightSelectionPosition = !isSmoothHandlePanEnabled;
+        eventData.mUpdateLeftSelectionPosition  = isSmoothHandlePanEnabled;
+        eventData.mRightSelectionPosition       = handlePosition;
+      }
+    }
+
+    if(eventData.mUpdateLeftSelectionPosition || eventData.mUpdateRightSelectionPosition)
+    {
+      impl.RepositionSelectionHandles();
+
+      eventData.mScrollAfterUpdatePosition = !isSmoothHandlePanEnabled;
+
+      if(impl.mSelectableControlInterface != nullptr)
+      {
+        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
+      }
+    }
+  }
+  eventData.mDecoratorUpdated = true;
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h
new file mode 100644
index 0000000..ca93586
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h
@@ -0,0 +1,151 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_EVENT_HANDLER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_EVENT_HANDLER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * Contains all the event handling methods for Text::Controller::Impl
+ */
+struct ControllerImplEventHandler
+{
+  /**
+   * @brief Processes input events
+   *
+   * @param[in] impl A reference to Controller::Impl
+   * @return True if the decorator has been updated
+   */
+  static bool ProcessInputEvents(Controller::Impl& impl);
+
+  /**
+   * @brief Called by Controller::Impl when a cursor key event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnCursorKeyEvent(Controller::Impl& controllerImpl, const Event& event);
+
+  /**
+   * @brief Called by Controller::Impl when a tap event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnTapEvent(Controller::Impl& controllerImpl, const Event& event);
+
+  /**
+   * @brief Called by Controller::Impl when a pan event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnPanEvent(Controller::Impl& controllerImpl, const Event& event);
+
+  /**
+   * @brief Called by Controller::Impl when a long press event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnLongPressEvent(Controller::Impl& controllerImpl, const Event& event);
+
+  /**
+   * @brief Called by Controller::Impl when a handle event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnHandleEvent(Controller::Impl& controllerImpl, const Event& event);
+
+  /**
+   * @brief Called by Controller::Impl when a select event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnSelectEvent(Controller::Impl& controllerImpl, const Event& event);
+
+  /**
+   * @brief Called by Controller::Impl when a select all event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnSelectAllEvent(Controller::Impl& controllerImpl);
+
+  /**
+   * @brief Called by Controller::Impl when a select none event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnSelectNoneEvent(Controller::Impl& controllerImpl);
+
+  /**
+   * @brief Called by Controller::Impl when a select range event is received.
+   *
+   * @param controllerImpl A reference to Controller::Impl
+   * @param event The event
+   */
+  static void OnSelectRangeEvent(Controller::Impl& controllerImpl, const Event& event);
+
+private:
+  /**
+   * @brief Called by OnHandleEvent when we are in the Pressed state.
+   *
+   * @param impl A reference to Controller::Impl
+   * @param event The event
+   * @param isSmoothHandlePanEnabled Whether smooth handle pan is enabled
+   */
+  static void OnHandlePressed(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled);
+
+  /**
+   * @brief Called by OnHandleEvent when we are in the Released state.
+   *
+   * @param impl A reference to Controller::Impl
+   * @param event The event
+   * @param isSmoothHandlePanEnabled Whether smooth handle pan is enabled
+   * @param handleStopScrolling Whether we should handle stop scrolling or not
+   */
+  static void OnHandleReleased(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled, const bool handleStopScrolling);
+
+  /**
+   * @brief Called by OnHandleEvent when we are in the Scrolling state.
+   *
+   * @param impl A reference to Controller::Impl
+   * @param event The event
+   * @param isSmoothHandlePanEnabled Whether smooth handle pan is enabled
+   */
+  static void OnHandleScrolling(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled);
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_EVENT_HANDLER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
new file mode 100644
index 0000000..fb4eb5f
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
@@ -0,0 +1,695 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h>
+
+// EXTERNAL INCLUDES
+#include <chrono>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
+#include <dali/public-api/math/math-utils.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/bidirectional-support.h>
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/color-segmentation.h>
+#include <dali-toolkit/internal/text/hyphenator.h>
+#include <dali-toolkit/internal/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/segmentation.h>
+#include <dali-toolkit/internal/text/shaper.h>
+#include <dali-toolkit/internal/text/text-editable-control-interface.h>
+
+namespace Dali::Toolkit::Text
+{
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_TEXT_PERFORMANCE_MARKER, false);
+
+#if defined(TRACE_ENABLED)
+uint32_t GetMilliSeconds()
+{
+  // Get the time of a monotonic clock since its epoch.
+  auto epoch = std::chrono::steady_clock::now().time_since_epoch();
+
+  auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(epoch);
+
+  return static_cast<uint32_t>(duration.count());
+}
+#endif
+
+// The relative luminance of a color is defined as (L = 0.2126 * R + 0.7152 * G + 0.0722 * B)
+// based on W3C Recommendations (https://www.w3.org/TR/WCAG20/)
+constexpr float         BRIGHTNESS_THRESHOLD = 0.179f;
+constexpr float         CONSTANT_R           = 0.2126f;
+constexpr float         CONSTANT_G           = 0.7152f;
+constexpr float         CONSTANT_B           = 0.0722f;
+constexpr Dali::Vector4 BLACK(0.f, 0.f, 0.f, 1.f);
+constexpr Dali::Vector4 WHITE(1.f, 1.f, 1.f, 1.f);
+constexpr Dali::Vector4 LIGHT_BLUE(0.75f, 0.96f, 1.f, 1.f);
+constexpr Dali::Vector4 BACKGROUND_SUB4(0.58f, 0.87f, 0.96f, 1.f);
+constexpr Dali::Vector4 BACKGROUND_SUB5(0.83f, 0.94f, 0.98f, 1.f);
+constexpr Dali::Vector4 BACKGROUND_SUB6(1.f, 0.5f, 0.5f, 1.f);
+constexpr Dali::Vector4 BACKGROUND_SUB7(1.f, 0.8f, 0.8f, 1.f);
+} // namespace
+
+bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask operationsRequired)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::UpdateModel\n");
+
+  // Calculate the operations to be done.
+  const OperationsMask operations = static_cast<OperationsMask>(impl.mOperationsPending & operationsRequired);
+
+  if(Controller::NO_OPERATION == operations)
+  {
+    // Nothing to do if no operations are pending and required.
+    return false;
+  }
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_MODEL_UPDATE");
+
+  Vector<Character>& srcCharacters = impl.mModel->mLogicalModel->mText;
+  Vector<Character>  displayCharacters;
+  bool               useHiddenText = false;
+  if(impl.mHiddenInput && impl.mEventData != nullptr)
+  {
+    if(impl.mEventData->mIsShowingPlaceholderText)
+    {
+      impl.mHiddenInput->InitPreviousTextCount();
+    }
+    else
+    {
+      impl.mHiddenInput->Substitute(srcCharacters, displayCharacters, impl.mEventData->mPrimaryCursorPosition);
+      useHiddenText = true;
+    }
+  }
+
+  Vector<Character>& utf32Characters    = useHiddenText ? displayCharacters : srcCharacters;
+  const Length       numberOfCharacters = utf32Characters.Count();
+
+  // Index to the first character of the first paragraph to be updated.
+  CharacterIndex startIndex = 0u;
+  // Number of characters of the paragraphs to be removed.
+  Length paragraphCharacters = 0u;
+
+  impl.CalculateTextUpdateIndices(paragraphCharacters);
+
+  // Check whether the indices for updating the text is valid
+  if(impl.mTextUpdateInfo.mParagraphCharacterIndex > numberOfCharacters ||
+     impl.mTextUpdateInfo.mRequestedNumberOfCharacters > numberOfCharacters)
+  {
+    if(numberOfCharacters == 0u)
+    {
+      impl.mTextUpdateInfo.Clear();
+      impl.mTextUpdateInfo.mClearAll = true;
+    }
+    else // numberOfCharacters > 0u
+    {
+      std::string currentText;
+      Utf32ToUtf8(impl.mModel->mLogicalModel->mText.Begin(), numberOfCharacters, currentText);
+
+      DALI_LOG_ERROR("Controller::Impl::UpdateModel: mTextUpdateInfo has invalid indices\n");
+      DALI_LOG_ERROR("Number of characters: %d, current text is: %s paragraphCharacters: %d\n", numberOfCharacters, currentText.c_str(), paragraphCharacters);
+
+      // Dump mTextUpdateInfo
+      DALI_LOG_ERROR("Dump mTextUpdateInfo:\n");
+      DALI_LOG_ERROR("     mTextUpdateInfo.mCharacterIndex = %u\n", impl.mTextUpdateInfo.mCharacterIndex);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mNumberOfCharactersToRemove = %u\n", impl.mTextUpdateInfo.mNumberOfCharactersToRemove);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mNumberOfCharactersToAdd = %u\n", impl.mTextUpdateInfo.mNumberOfCharactersToAdd);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mPreviousNumberOfCharacters = %u\n", impl.mTextUpdateInfo.mPreviousNumberOfCharacters);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mParagraphCharacterIndex = %u\n", impl.mTextUpdateInfo.mParagraphCharacterIndex);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mRequestedNumberOfCharacters = %u\n", impl.mTextUpdateInfo.mRequestedNumberOfCharacters);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mStartGlyphIndex = %u\n", impl.mTextUpdateInfo.mStartGlyphIndex);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mStartLineIndex = %u\n", impl.mTextUpdateInfo.mStartLineIndex);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mEstimatedNumberOfLines = %u\n", impl.mTextUpdateInfo.mEstimatedNumberOfLines);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mClearAll = %d\n", impl.mTextUpdateInfo.mClearAll);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mFullRelayoutNeeded = %d\n", impl.mTextUpdateInfo.mFullRelayoutNeeded);
+      DALI_LOG_ERROR("     mTextUpdateInfo.mIsLastCharacterNewParagraph = %d\n", impl.mTextUpdateInfo.mIsLastCharacterNewParagraph);
+
+      return false;
+    }
+  }
+
+  startIndex = impl.mTextUpdateInfo.mParagraphCharacterIndex;
+
+  if(impl.mTextUpdateInfo.mClearAll ||
+     (0u != paragraphCharacters))
+  {
+    impl.ClearModelData(startIndex, startIndex + ((paragraphCharacters > 0u) ? paragraphCharacters - 1u : 0u), operations);
+  }
+
+  impl.mTextUpdateInfo.mClearAll = false;
+
+  // Whether the model is updated.
+  bool updated = false;
+
+  Vector<LineBreakInfo>& lineBreakInfo               = impl.mModel->mLogicalModel->mLineBreakInfo;
+  const Length           requestedNumberOfCharacters = impl.mTextUpdateInfo.mRequestedNumberOfCharacters;
+
+  if(Controller::NO_OPERATION != (Controller::GET_LINE_BREAKS & operations))
+  {
+    // Retrieves the line break info. The line break info is used to split the text in 'paragraphs' to
+    // calculate the bidirectional info for each 'paragraph'.
+    // It's also used to layout the text (where it should be a new line) or to shape the text (text in different lines
+    // is not shaped together).
+    lineBreakInfo.Resize(numberOfCharacters, TextAbstraction::LINE_NO_BREAK);
+
+    SetLineBreakInfo(utf32Characters,
+                     startIndex,
+                     requestedNumberOfCharacters,
+                     lineBreakInfo);
+
+    if(impl.mModel->mLineWrapMode == ((Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) ||
+       impl.mModel->mLineWrapMode == ((Text::LineWrap::Mode)DevelText::LineWrap::MIXED))
+    {
+      CharacterIndex end                 = startIndex + requestedNumberOfCharacters;
+      LineBreakInfo* lineBreakInfoBuffer = lineBreakInfo.Begin();
+
+      for(CharacterIndex index = startIndex; index < end; index++)
+      {
+        CharacterIndex wordEnd = index;
+        while((*(lineBreakInfoBuffer + wordEnd) != TextAbstraction::LINE_ALLOW_BREAK) && (*(lineBreakInfoBuffer + wordEnd) != TextAbstraction::LINE_MUST_BREAK))
+        {
+          wordEnd++;
+        }
+
+        if((wordEnd + 1) == end) // add last char
+        {
+          wordEnd++;
+        }
+
+        Vector<bool> hyphens = GetWordHyphens(utf32Characters.Begin() + index, wordEnd - index, nullptr);
+
+        for(CharacterIndex i = 0; i < (wordEnd - index); i++)
+        {
+          if(hyphens[i])
+          {
+            *(lineBreakInfoBuffer + index + i) = TextAbstraction::LINE_HYPHENATION_BREAK;
+          }
+        }
+
+        index = wordEnd;
+      }
+    }
+
+    // Create the paragraph info.
+    impl.mModel->mLogicalModel->CreateParagraphInfo(startIndex,
+                                                    requestedNumberOfCharacters);
+    updated = true;
+  }
+
+  const bool getScripts    = Controller::NO_OPERATION != (Controller::GET_SCRIPTS & operations);
+  const bool validateFonts = Controller::NO_OPERATION != (Controller::VALIDATE_FONTS & operations);
+
+  Vector<ScriptRun>& scripts    = impl.mModel->mLogicalModel->mScriptRuns;
+  Vector<FontRun>&   validFonts = impl.mModel->mLogicalModel->mFontRuns;
+
+  if(getScripts || validateFonts)
+  {
+    // Validates the fonts assigned by the application or assigns default ones.
+    // It makes sure all the characters are going to be rendered by the correct font.
+    MultilanguageSupport multilanguageSupport = MultilanguageSupport::Get();
+
+    if(getScripts)
+    {
+      // Retrieves the scripts used in the text.
+      multilanguageSupport.SetScripts(utf32Characters,
+                                      startIndex,
+                                      requestedNumberOfCharacters,
+                                      scripts);
+    }
+
+    if(validateFonts)
+    {
+      // Validate the fonts set through the mark-up string.
+      Vector<FontDescriptionRun>& fontDescriptionRuns = impl.mModel->mLogicalModel->mFontDescriptionRuns;
+
+      // Get the default font's description.
+      TextAbstraction::FontDescription defaultFontDescription;
+      TextAbstraction::PointSize26Dot6 defaultPointSize = TextAbstraction::FontClient::DEFAULT_POINT_SIZE * impl.GetFontSizeScale();
+
+      //Get the number of points per one unit of point-size
+      uint32_t numberOfPointsPerOneUnitOfPointSize = impl.mFontClient.GetNumberOfPointsPerOneUnitOfPointSize();
+
+      if(impl.IsShowingPlaceholderText() && impl.mEventData && (nullptr != impl.mEventData->mPlaceholderFont))
+      {
+        // If the placeholder font is set specifically, only placeholder font is changed.
+        defaultFontDescription = impl.mEventData->mPlaceholderFont->mFontDescription;
+        if(impl.mEventData->mPlaceholderFont->sizeDefined)
+        {
+          defaultPointSize = impl.mEventData->mPlaceholderFont->mDefaultPointSize * impl.GetFontSizeScale() * numberOfPointsPerOneUnitOfPointSize;
+        }
+      }
+      else if(nullptr != impl.mFontDefaults)
+      {
+        // Set the normal font and the placeholder font.
+        defaultFontDescription = impl.mFontDefaults->mFontDescription;
+
+        if(impl.mTextFitEnabled || impl.mTextFitArrayEnabled)
+        {
+          defaultPointSize = impl.mFontDefaults->mFitPointSize * numberOfPointsPerOneUnitOfPointSize;
+        }
+        else
+        {
+          defaultPointSize = impl.mFontDefaults->mDefaultPointSize * impl.GetFontSizeScale() * numberOfPointsPerOneUnitOfPointSize;
+        }
+      }
+
+      // Validates the fonts. If there is a character with no assigned font it sets a default one.
+      // After this call, fonts are validated.
+      multilanguageSupport.ValidateFonts(utf32Characters,
+                                         scripts,
+                                         fontDescriptionRuns,
+                                         defaultFontDescription,
+                                         defaultPointSize,
+                                         impl.GetFontSizeScale(),
+                                         startIndex,
+                                         requestedNumberOfCharacters,
+                                         validFonts);
+    }
+    updated = true;
+  }
+
+  Vector<Character> mirroredUtf32Characters;
+  bool              textMirrored       = false;
+  const Length      numberOfParagraphs = impl.mModel->mLogicalModel->mParagraphInfo.Count();
+  if(Controller::NO_OPERATION != (Controller::BIDI_INFO & operations))
+  {
+    Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = impl.mModel->mLogicalModel->mBidirectionalParagraphInfo;
+    bidirectionalInfo.Reserve(numberOfParagraphs);
+
+    // Calculates the bidirectional info for the whole paragraph if it contains right to left scripts.
+    SetBidirectionalInfo(utf32Characters,
+                         scripts,
+                         lineBreakInfo,
+                         startIndex,
+                         requestedNumberOfCharacters,
+                         bidirectionalInfo,
+                         (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS),
+                         impl.mLayoutDirection);
+
+    if(0u != bidirectionalInfo.Count())
+    {
+      // Only set the character directions if there is right to left characters.
+      Vector<CharacterDirection>& directions = impl.mModel->mLogicalModel->mCharacterDirections;
+      GetCharactersDirection(bidirectionalInfo,
+                             numberOfCharacters,
+                             startIndex,
+                             requestedNumberOfCharacters,
+                             directions);
+
+      // This paragraph has right to left text. Some characters may need to be mirrored.
+      // TODO: consider if the mirrored string can be stored as well.
+
+      textMirrored = GetMirroredText(utf32Characters,
+                                     directions,
+                                     bidirectionalInfo,
+                                     startIndex,
+                                     requestedNumberOfCharacters,
+                                     mirroredUtf32Characters);
+    }
+    else
+    {
+      // There is no right to left characters. Clear the directions vector.
+      impl.mModel->mLogicalModel->mCharacterDirections.Clear();
+    }
+    updated = true;
+  }
+
+  Vector<GlyphInfo>&      glyphs                = impl.mModel->mVisualModel->mGlyphs;
+  Vector<CharacterIndex>& glyphsToCharactersMap = impl.mModel->mVisualModel->mGlyphsToCharacters;
+  Vector<Length>&         charactersPerGlyph    = impl.mModel->mVisualModel->mCharactersPerGlyph;
+  Vector<GlyphIndex>      newParagraphGlyphs;
+  newParagraphGlyphs.Reserve(numberOfParagraphs);
+
+  const Length currentNumberOfGlyphs = glyphs.Count();
+
+#if defined(TRACE_ENABLED)
+  uint32_t logThreshold = TextAbstraction::FontClient::GetPerformanceLogThresholdTime();
+  bool     logEnabled   = TextAbstraction::FontClient::IsPerformanceLogEnabled();
+
+  uint32_t timeStamps[6];
+  uint32_t timeStampIndex = 0;
+
+  if(logEnabled)
+  {
+    timeStamps[timeStampIndex++] = GetMilliSeconds();
+  }
+#endif
+
+  if(Controller::NO_OPERATION != (Controller::SHAPE_TEXT & operations))
+  {
+    const Vector<Character>& textToShape = textMirrored ? mirroredUtf32Characters : utf32Characters;
+    // Shapes the text.
+    ShapeText(textToShape,
+              lineBreakInfo,
+              scripts,
+              validFonts,
+              startIndex,
+              impl.mTextUpdateInfo.mStartGlyphIndex,
+              requestedNumberOfCharacters,
+              glyphs,
+              glyphsToCharactersMap,
+              charactersPerGlyph,
+              newParagraphGlyphs);
+
+    // Create the 'number of glyphs' per character and the glyph to character conversion tables.
+    impl.mModel->mVisualModel->CreateGlyphsPerCharacterTable(startIndex, impl.mTextUpdateInfo.mStartGlyphIndex, requestedNumberOfCharacters);
+    impl.mModel->mVisualModel->CreateCharacterToGlyphTable(startIndex, impl.mTextUpdateInfo.mStartGlyphIndex, requestedNumberOfCharacters);
+
+    updated = true;
+  }
+
+#if defined(TRACE_ENABLED)
+  if(logEnabled)
+  {
+    timeStamps[timeStampIndex++] = GetMilliSeconds();
+  }
+#endif
+
+  const Length numberOfGlyphs = static_cast<Length>(glyphs.Count()) - currentNumberOfGlyphs;
+
+  if(Controller::NO_OPERATION != (Controller::GET_GLYPH_METRICS & operations))
+  {
+    GlyphInfo* glyphsBuffer = glyphs.Begin();
+    impl.mMetrics->GetGlyphMetrics(glyphsBuffer + impl.mTextUpdateInfo.mStartGlyphIndex, numberOfGlyphs);
+
+    // Update the width and advance of all new paragraph characters.
+    for(Vector<GlyphIndex>::ConstIterator it = newParagraphGlyphs.Begin(), endIt = newParagraphGlyphs.End(); it != endIt; ++it)
+    {
+      const GlyphIndex index = *it;
+      GlyphInfo&       glyph = *(glyphsBuffer + index);
+
+      glyph.xBearing = 0.f;
+      glyph.width    = 0.f;
+      glyph.advance  = 0.f;
+    }
+    updated = true;
+  }
+
+#if defined(TRACE_ENABLED)
+  if(logEnabled)
+  {
+    timeStamps[timeStampIndex++] = GetMilliSeconds();
+  }
+#endif
+
+  if((nullptr != impl.mEventData) &&
+     impl.mEventData->mPreEditFlag &&
+     (0u != impl.mModel->mVisualModel->mCharactersToGlyph.Count()))
+  {
+    Dali::InputMethodContext::PreEditAttributeDataContainer attrs;
+    impl.mEventData->mInputMethodContext.GetPreeditStyle(attrs);
+    Dali::InputMethodContext::PreeditStyle type = Dali::InputMethodContext::PreeditStyle::NONE;
+
+    // Check the type of preedit and run it.
+    for(Dali::InputMethodContext::PreEditAttributeDataContainer::Iterator it = attrs.Begin(), endIt = attrs.End(); it != endIt; it++)
+    {
+      Dali::InputMethodContext::PreeditAttributeData attrData = *it;
+      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::UpdateModel PreeditStyle type : %d  start %d end %d \n", attrData.preeditType, attrData.startIndex, attrData.endIndex);
+      type = attrData.preeditType;
+
+      // Check the number of commit characters for the start position.
+      unsigned int numberOfCommit  = impl.mEventData->mPrimaryCursorPosition - impl.mEventData->mPreEditLength;
+      Length       numberOfIndices = attrData.endIndex - attrData.startIndex;
+
+      switch(type)
+      {
+        case Dali::InputMethodContext::PreeditStyle::UNDERLINE:
+        {
+          // Add the underline for the pre-edit text.
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
+          impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
+
+          //Mark-up processor case
+          if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+             impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
+          {
+            impl.CopyUnderlinedFromLogicalToVisualModels(false);
+          }
+          break;
+        }
+        case Dali::InputMethodContext::PreeditStyle::REVERSE:
+        {
+          Vector4  textColor = impl.mModel->mVisualModel->GetTextColor();
+          ColorRun backgroundColorRun;
+          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
+          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
+          backgroundColorRun.color                           = textColor;
+          impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
+
+          Vector4 backgroundColor = impl.mModel->mVisualModel->GetBackgroundColor();
+          if(Dali::EqualsZero(backgroundColor.a)) // There is no text background color.
+          {
+            // Try use the control's background color.
+            if(nullptr != impl.mEditableControlInterface)
+            {
+              impl.mEditableControlInterface->GetControlBackgroundColor(backgroundColor);
+              if(Dali::EqualsZero(backgroundColor.a)) // There is no control background color.
+              {
+                // Determines black or white color according to text color.
+                // Based on W3C Recommendations (https://www.w3.org/TR/WCAG20/)
+                float L         = CONSTANT_R * textColor.r + CONSTANT_G * textColor.g + CONSTANT_B * textColor.b;
+                backgroundColor = L > BRIGHTNESS_THRESHOLD ? BLACK : WHITE;
+              }
+            }
+          }
+
+          Vector<ColorRun> colorRuns;
+          colorRuns.Resize(1u);
+          ColorRun& colorRun                       = *(colorRuns.Begin());
+          colorRun.color                           = backgroundColor;
+          colorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
+          colorRun.characterRun.numberOfCharacters = numberOfIndices;
+          impl.mModel->mLogicalModel->mColorRuns.PushBack(colorRun);
+
+          //Mark-up processor case
+          if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+             impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
+          {
+            impl.CopyUnderlinedFromLogicalToVisualModels(false);
+          }
+          break;
+        }
+        case Dali::InputMethodContext::PreeditStyle::HIGHLIGHT:
+        {
+          ColorRun backgroundColorRun;
+          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
+          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
+          backgroundColorRun.color                           = LIGHT_BLUE;
+          impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
+
+          //Mark-up processor case
+          if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+             impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
+          {
+            impl.CopyUnderlinedFromLogicalToVisualModels(false);
+          }
+          break;
+        }
+        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_1:
+        {
+          // CUSTOM_PLATFORM_STYLE_1 should be drawn with background and underline together.
+          ColorRun backgroundColorRun;
+          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
+          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
+          backgroundColorRun.color                           = BACKGROUND_SUB4;
+          impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
+
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
+          impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
+
+          //Mark-up processor case
+          if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+             impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
+          {
+            impl.CopyUnderlinedFromLogicalToVisualModels(false);
+          }
+          break;
+        }
+        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_2:
+        {
+          // CUSTOM_PLATFORM_STYLE_2 should be drawn with background and underline together.
+          ColorRun backgroundColorRun;
+          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
+          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
+          backgroundColorRun.color                           = BACKGROUND_SUB5;
+          impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
+
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
+          impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
+
+          //Mark-up processor case
+          if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+             impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
+          {
+            impl.CopyUnderlinedFromLogicalToVisualModels(false);
+          }
+          break;
+        }
+        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_3:
+        {
+          // CUSTOM_PLATFORM_STYLE_3 should be drawn with background and underline together.
+          ColorRun backgroundColorRun;
+          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
+          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
+          backgroundColorRun.color                           = BACKGROUND_SUB6;
+          impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
+
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
+          impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
+
+          //Mark-up processor case
+          if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+             impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
+          {
+            impl.CopyUnderlinedFromLogicalToVisualModels(false);
+          }
+          break;
+        }
+        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_4:
+        {
+          // CUSTOM_PLATFORM_STYLE_4 should be drawn with background and underline together.
+          ColorRun backgroundColorRun;
+          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
+          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
+          backgroundColorRun.color                           = BACKGROUND_SUB7;
+          impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
+
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
+          impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
+
+          //Mark-up processor case
+          if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+             impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
+          {
+            impl.CopyUnderlinedFromLogicalToVisualModels(false);
+          }
+          break;
+        }
+        case Dali::InputMethodContext::PreeditStyle::NONE:
+        default:
+        {
+          break;
+        }
+      }
+    }
+    attrs.Clear();
+    updated = true;
+  }
+
+#if defined(TRACE_ENABLED)
+  if(logEnabled)
+  {
+    timeStamps[timeStampIndex++] = GetMilliSeconds();
+  }
+#endif
+
+  if(Controller::NO_OPERATION != (Controller::COLOR & operations))
+  {
+    // Set the color runs in glyphs.
+    SetColorSegmentationInfo(impl.mModel->mLogicalModel->mColorRuns,
+                             impl.mModel->mVisualModel->mCharactersToGlyph,
+                             impl.mModel->mVisualModel->mGlyphsPerCharacter,
+                             startIndex,
+                             impl.mTextUpdateInfo.mStartGlyphIndex,
+                             requestedNumberOfCharacters,
+                             impl.mModel->mVisualModel->mColors,
+                             impl.mModel->mVisualModel->mColorIndices);
+
+    // Set the background color runs in glyphs.
+    SetColorSegmentationInfo(impl.mModel->mLogicalModel->mBackgroundColorRuns,
+                             impl.mModel->mVisualModel->mCharactersToGlyph,
+                             impl.mModel->mVisualModel->mGlyphsPerCharacter,
+                             startIndex,
+                             impl.mTextUpdateInfo.mStartGlyphIndex,
+                             requestedNumberOfCharacters,
+                             impl.mModel->mVisualModel->mBackgroundColors,
+                             impl.mModel->mVisualModel->mBackgroundColorIndices);
+
+    updated = true;
+  }
+
+#if defined(TRACE_ENABLED)
+  if(logEnabled)
+  {
+    timeStamps[timeStampIndex++] = GetMilliSeconds();
+  }
+#endif
+
+  if((Controller::NO_OPERATION != (Controller::SHAPE_TEXT & operations)) &&
+     !((nullptr != impl.mEventData) &&
+       impl.mEventData->mPreEditFlag &&
+       (0u != impl.mModel->mVisualModel->mCharactersToGlyph.Count())))
+  {
+    //Mark-up processor case
+    if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+       impl.mModel->mLogicalModel->mUnderlineRunsUpdated ||
+       impl.mModel->mLogicalModel->mCharacterSpacingRunsUpdated ||
+       impl.mModel->mLogicalModel->mStrikethroughRunsUpdated)
+    {
+      impl.CopyUnderlinedFromLogicalToVisualModels(true);
+      impl.CopyStrikethroughFromLogicalToVisualModels();
+      impl.CopyCharacterSpacingFromLogicalToVisualModels();
+    }
+
+    updated = true;
+  }
+
+#if defined(TRACE_ENABLED)
+  if(logEnabled)
+  {
+    timeStamps[timeStampIndex++] = GetMilliSeconds();
+    uint32_t timeShape   = timeStamps[1] - timeStamps[0];
+    uint32_t timeGlyph   = timeStamps[2] - timeStamps[1];
+    uint32_t timePreedit = timeStamps[3] - timeStamps[2];
+    uint32_t timeColor   = timeStamps[4] - timeStamps[3];
+    uint32_t timeCopy    = timeStamps[5] - timeStamps[4];
+
+    if(timeStamps[5] - timeStamps[0] > logThreshold)
+    {
+      std::string currentText;
+      Utf32ToUtf8(impl.mModel->mLogicalModel->mText.Begin(), numberOfCharacters, currentText);
+      DALI_LOG_DEBUG_INFO("DALI_TEXT_MODEL_UPDATE shape:%u ms, glyph:%u ms, preedit:%u ms, color:%u ms, copy:%u ms\n", timeShape, timeGlyph, timePreedit, timeColor, timeCopy);
+      DALI_LOG_DEBUG_INFO("DALI_TEXT_MODEL_UPDATE chars:%d, text:%s\n", numberOfCharacters, currentText.c_str());
+    }
+  }
+#endif
+
+  // The estimated number of lines. Used to avoid reallocations when layouting.
+  impl.mTextUpdateInfo.mEstimatedNumberOfLines = std::max(impl.mModel->mVisualModel->mLines.Count(), impl.mModel->mLogicalModel->mParagraphInfo.Count());
+
+  // Set the previous number of characters for the next time the text is updated.
+  impl.mTextUpdateInfo.mPreviousNumberOfCharacters = numberOfCharacters;
+
+  return updated;
+}
+
+} // namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h
new file mode 100644
index 0000000..928d8c5
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h
@@ -0,0 +1,46 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_MODEL_UPDATER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_MODEL_UPDATER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+
+namespace Dali::Toolkit::Text
+{
+
+/**
+ * Contains methods for updating the models in the TextController
+ */
+struct ControllerImplModelUpdater
+{
+  using OperationsMask = Controller::OperationsMask;
+
+  /**
+   * @brief Updates the logical and visual models. Updates the style runs in the visual model when the text's styles changes.
+   *
+   * @param[in] impl A reference to the Controller::Impl class
+   * @param[in] operationsRequired The operations required
+   * @return true if mode has been modified.
+   */
+  static bool Update(Controller::Impl& impl, OperationsMask operationsRequired);
+};
+
+} // namespace Dali::Toolkit::Text
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_MODEL_UPDATER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl.cpp b/dali-toolkit/internal/text/controller/text-controller-impl.cpp
new file mode 100644
index 0000000..f70d8af
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl.cpp
@@ -0,0 +1,2068 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/rendering/renderer.h>
+#include <cmath>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-data-clearer.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/cursor-helper-functions.h>
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/text-control-interface.h>
+#include <dali-toolkit/internal/text/text-editable-control-interface.h>
+#include <dali-toolkit/internal/text/text-enumerations-impl.h>
+#include <dali-toolkit/internal/text/text-run-container.h>
+#include <dali-toolkit/internal/text/text-selection-handle-controller.h>
+#include <dali-toolkit/internal/text/underlined-glyph-run.h>
+
+using namespace Dali;
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+constexpr float MAX_FLOAT = std::numeric_limits<float>::max();
+
+const char* EMPTY_STRING         = "";
+const char* MIME_TYPE_TEXT_PLAIN = "text/plain;charset=utf-8";
+
+} // namespace
+
+namespace Dali::Toolkit::Text
+{
+namespace
+{
+void SetDefaultInputStyle(InputStyle& inputStyle, const FontDefaults* const fontDefaults, const Vector4& textColor)
+{
+  // Sets the default text's color.
+  inputStyle.textColor      = textColor;
+  inputStyle.isDefaultColor = true;
+
+  inputStyle.familyName.clear();
+  inputStyle.weight = TextAbstraction::FontWeight::NORMAL;
+  inputStyle.width  = TextAbstraction::FontWidth::NORMAL;
+  inputStyle.slant  = TextAbstraction::FontSlant::NORMAL;
+  inputStyle.size   = 0.f;
+
+  inputStyle.lineSpacing = 0.f;
+
+  inputStyle.underlineProperties.clear();
+  inputStyle.shadowProperties.clear();
+  inputStyle.embossProperties.clear();
+  inputStyle.outlineProperties.clear();
+
+  inputStyle.isFamilyDefined = false;
+  inputStyle.isWeightDefined = false;
+  inputStyle.isWidthDefined  = false;
+  inputStyle.isSlantDefined  = false;
+  inputStyle.isSizeDefined   = false;
+
+  inputStyle.isLineSpacingDefined = false;
+
+  inputStyle.isUnderlineDefined = false;
+  inputStyle.isShadowDefined    = false;
+  inputStyle.isEmbossDefined    = false;
+  inputStyle.isOutlineDefined   = false;
+
+  // Sets the default font's family name, weight, width, slant and size.
+  if(fontDefaults)
+  {
+    if(fontDefaults->familyDefined)
+    {
+      inputStyle.familyName      = fontDefaults->mFontDescription.family;
+      inputStyle.isFamilyDefined = true;
+    }
+
+    if(fontDefaults->weightDefined)
+    {
+      inputStyle.weight          = fontDefaults->mFontDescription.weight;
+      inputStyle.isWeightDefined = true;
+    }
+
+    if(fontDefaults->widthDefined)
+    {
+      inputStyle.width          = fontDefaults->mFontDescription.width;
+      inputStyle.isWidthDefined = true;
+    }
+
+    if(fontDefaults->slantDefined)
+    {
+      inputStyle.slant          = fontDefaults->mFontDescription.slant;
+      inputStyle.isSlantDefined = true;
+    }
+
+    if(fontDefaults->sizeDefined)
+    {
+      inputStyle.size          = fontDefaults->mDefaultPointSize;
+      inputStyle.isSizeDefined = true;
+    }
+  }
+}
+
+void ChangeTextControllerState(Controller::Impl& impl, EventData::State newState)
+{
+  EventData* eventData = impl.mEventData;
+
+  if(nullptr == eventData)
+  {
+    // Nothing to do if there is no text input.
+    return;
+  }
+
+  DecoratorPtr& decorator = eventData->mDecorator;
+  if(!decorator)
+  {
+    // Nothing to do if there is no decorator.
+    return;
+  }
+
+  DALI_LOG_INFO(gLogFilter, Debug::General, "ChangeState state:%d  newstate:%d\n", eventData->mState, newState);
+
+  if(eventData->mState != newState)
+  {
+    eventData->mPreviousState = eventData->mState;
+    eventData->mState         = newState;
+
+    switch(eventData->mState)
+    {
+      case EventData::INACTIVE:
+      {
+        decorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
+        decorator->StopCursorBlink();
+        decorator->SetHandleActive(GRAB_HANDLE, false);
+        decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+        decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+        decorator->SetHighlightActive(false);
+        decorator->SetPopupActive(false);
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+
+      case EventData::INTERRUPTED:
+      {
+        decorator->SetHandleActive(GRAB_HANDLE, false);
+        decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+        decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+        decorator->SetHighlightActive(false);
+        decorator->SetPopupActive(false);
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+
+      case EventData::SELECTING:
+      {
+        decorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
+        decorator->StopCursorBlink();
+        decorator->SetHandleActive(GRAB_HANDLE, false);
+        if(eventData->mGrabHandleEnabled)
+        {
+          decorator->SetHandleActive(LEFT_SELECTION_HANDLE, true);
+          decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, true);
+        }
+        decorator->SetHighlightActive(true);
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          impl.SetPopupButtons();
+          decorator->SetPopupActive(true);
+        }
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+
+      case EventData::EDITING:
+      {
+        decorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
+        if(eventData->mCursorBlinkEnabled)
+        {
+          decorator->StartCursorBlink();
+        }
+        // Grab handle is not shown until a tap is received whilst EDITING
+        decorator->SetHandleActive(GRAB_HANDLE, false);
+        decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+        decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+        decorator->SetHighlightActive(false);
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          decorator->SetPopupActive(false);
+        }
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+      case EventData::EDITING_WITH_POPUP:
+      {
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "EDITING_WITH_POPUP \n", newState);
+
+        decorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
+        if(eventData->mCursorBlinkEnabled)
+        {
+          decorator->StartCursorBlink();
+        }
+        if(eventData->mSelectionEnabled)
+        {
+          decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+          decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+          decorator->SetHighlightActive(false);
+        }
+        else if(eventData->mGrabHandleEnabled)
+        {
+          decorator->SetHandleActive(GRAB_HANDLE, true);
+        }
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          impl.SetPopupButtons();
+          decorator->SetPopupActive(true);
+        }
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+      case EventData::EDITING_WITH_GRAB_HANDLE:
+      {
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "EDITING_WITH_GRAB_HANDLE \n", newState);
+
+        decorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
+        if(eventData->mCursorBlinkEnabled)
+        {
+          decorator->StartCursorBlink();
+        }
+        // Grab handle is not shown until a tap is received whilst EDITING
+        if(eventData->mGrabHandleEnabled)
+        {
+          decorator->SetHandleActive(GRAB_HANDLE, true);
+        }
+        decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+        decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+        decorator->SetHighlightActive(false);
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          decorator->SetPopupActive(false);
+        }
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+
+      case EventData::SELECTION_HANDLE_PANNING:
+      {
+        decorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
+        decorator->StopCursorBlink();
+        decorator->SetHandleActive(GRAB_HANDLE, false);
+        if(eventData->mGrabHandleEnabled)
+        {
+          decorator->SetHandleActive(LEFT_SELECTION_HANDLE, true);
+          decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, true);
+        }
+        decorator->SetHighlightActive(true);
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          decorator->SetPopupActive(false);
+        }
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+
+      case EventData::GRAB_HANDLE_PANNING:
+      {
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "GRAB_HANDLE_PANNING \n", newState);
+
+        decorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
+        if(eventData->mCursorBlinkEnabled)
+        {
+          decorator->StartCursorBlink();
+        }
+        if(eventData->mGrabHandleEnabled)
+        {
+          decorator->SetHandleActive(GRAB_HANDLE, true);
+        }
+        decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+        decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+        decorator->SetHighlightActive(false);
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          decorator->SetPopupActive(false);
+        }
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+
+      case EventData::EDITING_WITH_PASTE_POPUP:
+      {
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "EDITING_WITH_PASTE_POPUP \n", newState);
+
+        decorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
+        if(eventData->mCursorBlinkEnabled)
+        {
+          decorator->StartCursorBlink();
+        }
+
+        if(eventData->mGrabHandleEnabled)
+        {
+          decorator->SetHandleActive(GRAB_HANDLE, true);
+        }
+        decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+        decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+        decorator->SetHighlightActive(false);
+
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          impl.SetPopupButtons();
+          decorator->SetPopupActive(true);
+        }
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+
+      case EventData::TEXT_PANNING:
+      {
+        decorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
+        decorator->StopCursorBlink();
+        decorator->SetHandleActive(GRAB_HANDLE, false);
+        if(eventData->mDecorator->IsHandleActive(LEFT_SELECTION_HANDLE) ||
+           decorator->IsHandleActive(RIGHT_SELECTION_HANDLE))
+        {
+          decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+          decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+          decorator->SetHighlightActive(true);
+        }
+
+        if(eventData->mGrabHandlePopupEnabled)
+        {
+          decorator->SetPopupActive(false);
+        }
+
+        eventData->mDecoratorUpdated = true;
+        break;
+      }
+    }
+  }
+}
+
+void UpdateCursorPositionForAlignment(Controller::Impl& impl, bool needFullAlignment)
+{
+  EventData* eventData = impl.mEventData;
+
+  // Set the flag to redo the alignment operation
+  impl.mOperationsPending = static_cast<Controller::OperationsMask>(impl.mOperationsPending | Controller::OperationsMask::ALIGN);
+
+  if(eventData)
+  {
+    // Note: mUpdateAlignment is currently only needed for horizontal alignment
+    eventData->mUpdateAlignment = needFullAlignment;
+
+    // Update the cursor if it's in editing mode
+    if(EventData::IsEditingState(eventData->mState))
+    {
+      impl.ChangeState(EventData::EDITING);
+      eventData->mUpdateCursorPosition = true;
+    }
+  }
+}
+
+} // unnamed Namespace
+
+EventData::EventData(DecoratorPtr decorator, InputMethodContext& inputMethodContext)
+: mDecorator(decorator),
+  mInputMethodContext(inputMethodContext),
+  mPlaceholderFont(nullptr),
+  mPlaceholderTextActive(),
+  mPlaceholderTextInactive(),
+  mPlaceholderTextColor(0.8f, 0.8f, 0.8f, 0.8f), // This color has been published in the Public API (placeholder-properties.h).
+  mEventQueue(),
+  mInputStyleChangedQueue(),
+  mPreviousState(INACTIVE),
+  mState(INACTIVE),
+  mPrimaryCursorPosition(0u),
+  mLeftSelectionPosition(0u),
+  mRightSelectionPosition(0u),
+  mPreEditStartPosition(0u),
+  mPreEditLength(0u),
+  mCursorHookPositionX(0.f),
+  mDoubleTapAction(Controller::NoTextTap::NO_ACTION),
+  mLongPressAction(Controller::NoTextTap::SHOW_SELECTION_POPUP),
+  mIsShowingPlaceholderText(false),
+  mPreEditFlag(false),
+  mDecoratorUpdated(false),
+  mCursorBlinkEnabled(true),
+  mGrabHandleEnabled(true),
+  mGrabHandlePopupEnabled(true),
+  mSelectionEnabled(true),
+  mUpdateCursorHookPosition(false),
+  mUpdateCursorPosition(false),
+  mUpdateGrabHandlePosition(false),
+  mUpdateLeftSelectionPosition(false),
+  mUpdateRightSelectionPosition(false),
+  mIsLeftHandleSelected(false),
+  mIsRightHandleSelected(false),
+  mUpdateHighlightBox(false),
+  mScrollAfterUpdatePosition(false),
+  mScrollAfterDelete(false),
+  mAllTextSelected(false),
+  mUpdateInputStyle(false),
+  mPasswordInput(false),
+  mCheckScrollAmount(false),
+  mIsPlaceholderPixelSize(false),
+  mIsPlaceholderElideEnabled(false),
+  mPlaceholderEllipsisFlag(false),
+  mShiftSelectionFlag(true),
+  mUpdateAlignment(false),
+  mEditingEnabled(true)
+{
+}
+
+bool Controller::Impl::ProcessInputEvents()
+{
+  return ControllerImplEventHandler::ProcessInputEvents(*this);
+}
+
+void Controller::Impl::SetAnchorColor(const Vector4& color)
+{
+  mAnchorColor = color;
+  UpdateAnchorColor();
+}
+
+const Vector4& Controller::Impl::GetAnchorColor() const
+{
+  return mAnchorColor;
+}
+
+void Controller::Impl::SetAnchorClickedColor(const Vector4& color)
+{
+  mAnchorClickedColor = color;
+  UpdateAnchorColor();
+}
+
+const Vector4& Controller::Impl::GetAnchorClickedColor() const
+{
+  return mAnchorClickedColor;
+}
+
+void Controller::Impl::UpdateAnchorColor()
+{
+  if(!mAnchorControlInterface ||
+     !mMarkupProcessorEnabled ||
+     !mModel->mLogicalModel->mAnchors.Count() ||
+     !IsShowingRealText())
+  {
+    return;
+  }
+
+  bool updateNeeded = false;
+
+  // The anchor color & clicked color needs to be updated with the property's color.
+  for(auto& anchor : mModel->mLogicalModel->mAnchors)
+  {
+    if(!anchor.isMarkupColorSet && !anchor.isClicked)
+    {
+      if(mModel->mLogicalModel->mColorRuns.Count() > anchor.colorRunIndex)
+      {
+        ColorRun& colorRun = *(mModel->mLogicalModel->mColorRuns.Begin() + anchor.colorRunIndex);
+        colorRun.color     = mAnchorColor;
+        updateNeeded       = true;
+      }
+      if(mModel->mLogicalModel->mUnderlinedCharacterRuns.Count() > anchor.underlinedCharacterRunIndex)
+      {
+        UnderlinedCharacterRun& underlineRun = *(mModel->mLogicalModel->mUnderlinedCharacterRuns.Begin() + anchor.underlinedCharacterRunIndex);
+        underlineRun.properties.color        = mAnchorColor;
+        updateNeeded                         = true;
+      }
+    }
+    else if(!anchor.isMarkupClickedColorSet && anchor.isClicked)
+    {
+      if(mModel->mLogicalModel->mColorRuns.Count() > anchor.colorRunIndex)
+      {
+        ColorRun& colorRun = *(mModel->mLogicalModel->mColorRuns.Begin() + anchor.colorRunIndex);
+        colorRun.color     = mAnchorClickedColor;
+        updateNeeded       = true;
+      }
+      if(mModel->mLogicalModel->mUnderlinedCharacterRuns.Count() > anchor.underlinedCharacterRunIndex)
+      {
+        UnderlinedCharacterRun& underlineRun = *(mModel->mLogicalModel->mUnderlinedCharacterRuns.Begin() + anchor.underlinedCharacterRunIndex);
+        underlineRun.properties.color        = mAnchorClickedColor;
+        updateNeeded                         = true;
+      }
+    }
+  }
+
+  if(updateNeeded)
+  {
+    ClearFontData();
+    mOperationsPending = static_cast<OperationsMask>(mOperationsPending | COLOR);
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::NotifyInputMethodContext()
+{
+  if(mEventData && mEventData->mInputMethodContext)
+  {
+    CharacterIndex cursorPosition = GetLogicalCursorPosition();
+    mEventData->mInputMethodContext.SetCursorPosition(cursorPosition);
+    mEventData->mInputMethodContext.NotifyCursorPosition();
+  }
+}
+
+void Controller::Impl::NotifyInputMethodContextMultiLineStatus()
+{
+  if(mEventData && mEventData->mInputMethodContext)
+  {
+    Text::Layout::Engine::Type layout = mLayoutEngine.GetLayout();
+    mEventData->mInputMethodContext.NotifyTextInputMultiLine(layout == Text::Layout::Engine::MULTI_LINE_BOX);
+  }
+}
+
+CharacterIndex Controller::Impl::GetLogicalCursorPosition() const
+{
+  CharacterIndex cursorPosition = 0u;
+
+  if(mEventData)
+  {
+    if((EventData::SELECTING == mEventData->mState) ||
+       (EventData::SELECTION_HANDLE_PANNING == mEventData->mState))
+    {
+      cursorPosition = std::min(mEventData->mRightSelectionPosition, mEventData->mLeftSelectionPosition);
+    }
+    else
+    {
+      cursorPosition = mEventData->mPrimaryCursorPosition;
+    }
+  }
+
+  return cursorPosition;
+}
+
+Length Controller::Impl::GetNumberOfWhiteSpaces(CharacterIndex index) const
+{
+  Length numberOfWhiteSpaces = 0u;
+
+  // Get the buffer to the text.
+  Character* utf32CharacterBuffer = mModel->mLogicalModel->mText.Begin();
+
+  const Length totalNumberOfCharacters = mModel->mLogicalModel->mText.Count();
+  for(; index < totalNumberOfCharacters; ++index, ++numberOfWhiteSpaces)
+  {
+    if(!TextAbstraction::IsWhiteSpace(*(utf32CharacterBuffer + index)))
+    {
+      break;
+    }
+  }
+
+  return numberOfWhiteSpaces;
+}
+
+void Controller::Impl::GetText(std::string& text) const
+{
+  if(!IsShowingPlaceholderText())
+  {
+    // Retrieves the text string.
+    GetText(0u, text);
+  }
+  else
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::GetText %p empty (but showing placeholder)\n", this);
+  }
+}
+
+Length Controller::Impl::GetNumberOfCharacters() const
+{
+  if(!IsShowingPlaceholderText())
+  {
+    return mModel->GetNumberOfCharacters();
+  }
+  else
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::GetNumberOfCharacters %p empty (but showing placeholder)\n", this);
+    return 0u;
+  }
+}
+
+void Controller::Impl::GetText(CharacterIndex index, std::string& text) const
+{
+  // Get the total number of characters.
+  Length numberOfCharacters = mModel->mLogicalModel->mText.Count();
+
+  // Retrieve the text.
+  if(0u != numberOfCharacters)
+  {
+    Utf32ToUtf8(mModel->mLogicalModel->mText.Begin() + index, numberOfCharacters - index, text);
+  }
+}
+
+Dali::LayoutDirection::Type Controller::Impl::GetLayoutDirection(Dali::Actor& actor) const
+{
+  if(mModel->mMatchLayoutDirection == DevelText::MatchLayoutDirection::LOCALE ||
+     (mModel->mMatchLayoutDirection == DevelText::MatchLayoutDirection::INHERIT && !mIsLayoutDirectionChanged))
+  {
+    Integration::SceneHolder sceneHolder = Integration::SceneHolder::Get(actor);
+    return static_cast<Dali::LayoutDirection::Type>(sceneHolder ? sceneHolder.GetRootLayer().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>() : LayoutDirection::LEFT_TO_RIGHT);
+  }
+  else
+  {
+    return static_cast<Dali::LayoutDirection::Type>(actor.GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
+  }
+}
+
+Toolkit::DevelText::TextDirection::Type Controller::Impl::GetTextDirection()
+{
+  if(mUpdateTextDirection)
+  {
+    // Operations that can be done only once until the text changes.
+    const OperationsMask onlyOnceOperations = static_cast<OperationsMask>(CONVERT_TO_UTF32 |
+                                                                          GET_SCRIPTS |
+                                                                          VALIDATE_FONTS |
+                                                                          GET_LINE_BREAKS |
+                                                                          BIDI_INFO |
+                                                                          SHAPE_TEXT |
+                                                                          GET_GLYPH_METRICS);
+
+    // Set the update info to relayout the whole text.
+    mTextUpdateInfo.mParagraphCharacterIndex     = 0u;
+    mTextUpdateInfo.mRequestedNumberOfCharacters = mModel->mLogicalModel->mText.Count();
+
+    // Make sure the model is up-to-date before layouting
+    UpdateModel(onlyOnceOperations);
+
+    Vector3 naturalSize;
+    Relayouter::DoRelayout(*this,
+                           Size(MAX_FLOAT, MAX_FLOAT),
+                           static_cast<OperationsMask>(onlyOnceOperations |
+                                                       LAYOUT | REORDER | UPDATE_DIRECTION),
+                           naturalSize.GetVectorXY());
+
+    // Do not do again the only once operations.
+    mOperationsPending = static_cast<OperationsMask>(mOperationsPending & ~onlyOnceOperations);
+
+    // Clear the update info. This info will be set the next time the text is updated.
+    mTextUpdateInfo.Clear();
+
+    // FullRelayoutNeeded should be true because DoRelayout is MAX_FLOAT, MAX_FLOAT.
+    mTextUpdateInfo.mFullRelayoutNeeded = true;
+
+    mUpdateTextDirection = false;
+  }
+
+  return mIsTextDirectionRTL ? Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT : Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT;
+}
+
+void Controller::Impl::CalculateTextUpdateIndices(Length& numberOfCharacters)
+{
+  mTextUpdateInfo.mParagraphCharacterIndex = 0u;
+  mTextUpdateInfo.mStartGlyphIndex         = 0u;
+  mTextUpdateInfo.mStartLineIndex          = 0u;
+  numberOfCharacters                       = 0u;
+
+  const Length numberOfParagraphs = mModel->mLogicalModel->mParagraphInfo.Count();
+  if(0u == numberOfParagraphs)
+  {
+    mTextUpdateInfo.mParagraphCharacterIndex = 0u;
+    numberOfCharacters                       = 0u;
+
+    mTextUpdateInfo.mRequestedNumberOfCharacters = mTextUpdateInfo.mNumberOfCharactersToAdd - mTextUpdateInfo.mNumberOfCharactersToRemove;
+
+    // Nothing else to do if there are no paragraphs.
+    return;
+  }
+
+  // Find the paragraphs to be updated.
+  Vector<ParagraphRunIndex> paragraphsToBeUpdated;
+  if(mTextUpdateInfo.mCharacterIndex >= mTextUpdateInfo.mPreviousNumberOfCharacters)
+  {
+    // Text is being added at the end of the current text.
+    if(mTextUpdateInfo.mIsLastCharacterNewParagraph)
+    {
+      // Text is being added in a new paragraph after the last character of the text.
+      mTextUpdateInfo.mParagraphCharacterIndex     = mTextUpdateInfo.mPreviousNumberOfCharacters;
+      numberOfCharacters                           = 0u;
+      mTextUpdateInfo.mRequestedNumberOfCharacters = mTextUpdateInfo.mNumberOfCharactersToAdd - mTextUpdateInfo.mNumberOfCharactersToRemove;
+
+      mTextUpdateInfo.mStartGlyphIndex = mModel->mVisualModel->mGlyphs.Count();
+      mTextUpdateInfo.mStartLineIndex  = (mModel->mVisualModel->mLines.Count() > 0u) ? mModel->mVisualModel->mLines.Count() - 1u : 0u;
+
+      // Nothing else to do;
+      return;
+    }
+
+    paragraphsToBeUpdated.PushBack(numberOfParagraphs - 1u);
+  }
+  else
+  {
+    Length numberOfCharactersToUpdate = 0u;
+    if(mTextUpdateInfo.mFullRelayoutNeeded)
+    {
+      numberOfCharactersToUpdate = mTextUpdateInfo.mPreviousNumberOfCharacters;
+    }
+    else
+    {
+      numberOfCharactersToUpdate = (mTextUpdateInfo.mNumberOfCharactersToRemove > 0u) ? mTextUpdateInfo.mNumberOfCharactersToRemove : 1u;
+    }
+    mModel->mLogicalModel->FindParagraphs(mTextUpdateInfo.mCharacterIndex,
+                                          numberOfCharactersToUpdate,
+                                          paragraphsToBeUpdated);
+  }
+
+  if(0u != paragraphsToBeUpdated.Count())
+  {
+    const ParagraphRunIndex firstParagraphIndex = *(paragraphsToBeUpdated.Begin());
+    const ParagraphRun&     firstParagraph      = *(mModel->mLogicalModel->mParagraphInfo.Begin() + firstParagraphIndex);
+    mTextUpdateInfo.mParagraphCharacterIndex    = firstParagraph.characterRun.characterIndex;
+
+    ParagraphRunIndex   lastParagraphIndex = *(paragraphsToBeUpdated.End() - 1u);
+    const ParagraphRun& lastParagraph      = *(mModel->mLogicalModel->mParagraphInfo.Begin() + lastParagraphIndex);
+
+    if((mTextUpdateInfo.mNumberOfCharactersToRemove > 0u) &&                                           // Some character are removed.
+       (lastParagraphIndex < numberOfParagraphs - 1u) &&                                               // There is a next paragraph.
+       ((lastParagraph.characterRun.characterIndex + lastParagraph.characterRun.numberOfCharacters) == // The last removed character is the new paragraph character.
+        (mTextUpdateInfo.mCharacterIndex + mTextUpdateInfo.mNumberOfCharactersToRemove)))
+    {
+      // The new paragraph character of the last updated paragraph has been removed so is going to be merged with the next one.
+      const ParagraphRun& lastParagraph = *(mModel->mLogicalModel->mParagraphInfo.Begin() + lastParagraphIndex + 1u);
+
+      numberOfCharacters = lastParagraph.characterRun.characterIndex + lastParagraph.characterRun.numberOfCharacters - mTextUpdateInfo.mParagraphCharacterIndex;
+    }
+    else
+    {
+      numberOfCharacters = lastParagraph.characterRun.characterIndex + lastParagraph.characterRun.numberOfCharacters - mTextUpdateInfo.mParagraphCharacterIndex;
+    }
+  }
+
+  mTextUpdateInfo.mRequestedNumberOfCharacters = numberOfCharacters + mTextUpdateInfo.mNumberOfCharactersToAdd - mTextUpdateInfo.mNumberOfCharactersToRemove;
+  mTextUpdateInfo.mStartGlyphIndex             = *(mModel->mVisualModel->mCharactersToGlyph.Begin() + mTextUpdateInfo.mParagraphCharacterIndex);
+}
+
+void Controller::Impl::ClearModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations)
+{
+  ControllerImplDataClearer::ClearModelData(*this, startIndex, endIndex, operations);
+}
+
+bool Controller::Impl::UpdateModel(OperationsMask operationsRequired)
+{
+  return ControllerImplModelUpdater::Update(*this, operationsRequired);
+}
+
+void Controller::Impl::RetrieveDefaultInputStyle(InputStyle& inputStyle)
+{
+  SetDefaultInputStyle(inputStyle, mFontDefaults, mTextColor);
+}
+
+float Controller::Impl::GetDefaultFontLineHeight()
+{
+  FontId defaultFontId = 0u;
+  if(nullptr == mFontDefaults)
+  {
+    TextAbstraction::FontDescription fontDescription;
+    defaultFontId = mFontClient.GetFontId(fontDescription, TextAbstraction::FontClient::DEFAULT_POINT_SIZE * GetFontSizeScale());
+  }
+  else
+  {
+    defaultFontId = mFontDefaults->GetFontId(mFontClient, mFontDefaults->mDefaultPointSize * GetFontSizeScale());
+  }
+
+  Text::FontMetrics fontMetrics;
+  mMetrics->GetFontMetrics(defaultFontId, fontMetrics);
+
+  return (fontMetrics.ascender - fontMetrics.descender);
+}
+
+bool Controller::Impl::SetDefaultLineSpacing(float lineSpacing)
+{
+  if(std::fabs(lineSpacing - mLayoutEngine.GetDefaultLineSpacing()) > Math::MACHINE_EPSILON_1000)
+  {
+    mLayoutEngine.SetDefaultLineSpacing(lineSpacing);
+
+    RelayoutAllCharacters();
+    return true;
+  }
+  return false;
+}
+
+bool Controller::Impl::SetDefaultLineSize(float lineSize)
+{
+  if(std::fabs(lineSize - mLayoutEngine.GetDefaultLineSize()) > Math::MACHINE_EPSILON_1000)
+  {
+    mLayoutEngine.SetDefaultLineSize(lineSize);
+
+    RelayoutAllCharacters();
+    return true;
+  }
+  return false;
+}
+
+bool Controller::Impl::SetRelativeLineSize(float relativeLineSize)
+{
+  if(std::fabs(relativeLineSize - GetRelativeLineSize()) > Math::MACHINE_EPSILON_1000)
+  {
+    mLayoutEngine.SetRelativeLineSize(relativeLineSize);
+
+    RelayoutAllCharacters();
+    return true;
+  }
+  return false;
+}
+
+float Controller::Impl::GetRelativeLineSize()
+{
+  return mLayoutEngine.GetRelativeLineSize();
+}
+
+string Controller::Impl::GetSelectedText()
+{
+  string text;
+  if(EventData::SELECTING == mEventData->mState)
+  {
+    RetrieveSelection(text, false);
+  }
+  return text;
+}
+
+string Controller::Impl::CopyText()
+{
+  string text;
+  RetrieveSelection(text, false);
+  SendSelectionToClipboard(false); // Text not modified
+
+  mEventData->mUpdateCursorPosition = true;
+
+  RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup
+
+  return text;
+}
+
+string Controller::Impl::CutText()
+{
+  string text;
+  RetrieveSelection(text, false);
+
+  if(!IsEditable())
+  {
+    return EMPTY_STRING;
+  }
+
+  SendSelectionToClipboard(true); // Synchronous call to modify text
+  mOperationsPending = ALL_OPERATIONS;
+
+  if((0u != mModel->mLogicalModel->mText.Count()) ||
+     !IsPlaceholderAvailable())
+  {
+    QueueModifyEvent(ModifyEvent::TEXT_DELETED);
+  }
+  else
+  {
+    PlaceholderHandler::ShowPlaceholderText(*this);
+  }
+
+  mEventData->mUpdateCursorPosition = true;
+  mEventData->mScrollAfterDelete    = true;
+
+  RequestRelayout();
+
+  if(nullptr != mEditableControlInterface)
+  {
+    mEditableControlInterface->TextChanged(true);
+  }
+  return text;
+}
+
+void Controller::Impl::SetTextSelectionRange(const uint32_t* pStart, const uint32_t* pEnd)
+{
+  if(nullptr == mEventData)
+  {
+    // Nothing to do if there is no text.
+    return;
+  }
+
+  if(mEventData->mSelectionEnabled && (pStart || pEnd))
+  {
+    uint32_t length   = static_cast<uint32_t>(mModel->mLogicalModel->mText.Count());
+    uint32_t oldStart = mEventData->mLeftSelectionPosition;
+    uint32_t oldEnd   = mEventData->mRightSelectionPosition;
+
+    if(pStart)
+    {
+      mEventData->mLeftSelectionPosition = std::min(*pStart, length);
+    }
+    if(pEnd)
+    {
+      mEventData->mRightSelectionPosition = std::min(*pEnd, length);
+    }
+
+    if(mEventData->mLeftSelectionPosition == mEventData->mRightSelectionPosition)
+    {
+      ChangeState(EventData::EDITING);
+      mEventData->mPrimaryCursorPosition = mEventData->mLeftSelectionPosition = mEventData->mRightSelectionPosition;
+      mEventData->mUpdateCursorPosition                                       = true;
+    }
+    else
+    {
+      ChangeState(EventData::SELECTING);
+      mEventData->mUpdateHighlightBox           = true;
+      mEventData->mUpdateLeftSelectionPosition  = true;
+      mEventData->mUpdateRightSelectionPosition = true;
+    }
+
+    if(mSelectableControlInterface != nullptr)
+    {
+      mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition);
+    }
+  }
+}
+
+CharacterIndex Controller::Impl::GetPrimaryCursorPosition() const
+{
+  if(nullptr == mEventData)
+  {
+    return 0;
+  }
+  return mEventData->mPrimaryCursorPosition;
+}
+
+bool Controller::Impl::SetPrimaryCursorPosition(CharacterIndex index, bool focused)
+{
+  if(nullptr == mEventData)
+  {
+    // Nothing to do if there is no text.
+    return false;
+  }
+
+  if(mEventData->mPrimaryCursorPosition == index && mEventData->mState != EventData::SELECTING)
+  {
+    // Nothing for same cursor position.
+    return false;
+  }
+
+  uint32_t length                    = static_cast<uint32_t>(mModel->mLogicalModel->mText.Count());
+  uint32_t oldCursorPos              = mEventData->mPrimaryCursorPosition;
+  mEventData->mPrimaryCursorPosition = std::min(index, length);
+  // If there is no focus, only the value is updated.
+  if(focused)
+  {
+    bool     wasInSelectingState = mEventData->mState == EventData::SELECTING;
+    uint32_t oldStart            = mEventData->mLeftSelectionPosition;
+    uint32_t oldEnd              = mEventData->mRightSelectionPosition;
+    ChangeState(EventData::EDITING);
+    mEventData->mLeftSelectionPosition = mEventData->mRightSelectionPosition = mEventData->mPrimaryCursorPosition;
+    mEventData->mUpdateCursorPosition                                        = true;
+
+    if(mSelectableControlInterface != nullptr && wasInSelectingState)
+    {
+      mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition);
+    }
+
+    ScrollTextToMatchCursor();
+  }
+
+  if(nullptr != mEditableControlInterface)
+  {
+    mEditableControlInterface->CursorPositionChanged(oldCursorPos, mEventData->mPrimaryCursorPosition);
+  }
+
+  return true;
+}
+
+Uint32Pair Controller::Impl::GetTextSelectionRange() const
+{
+  Uint32Pair range;
+
+  if(mEventData)
+  {
+    range.first  = mEventData->mLeftSelectionPosition;
+    range.second = mEventData->mRightSelectionPosition;
+  }
+
+  return range;
+}
+
+bool Controller::Impl::IsEditable() const
+{
+  return mEventData && mEventData->mEditingEnabled;
+}
+
+void Controller::Impl::SetEditable(bool editable)
+{
+  if(mEventData)
+  {
+    mEventData->mEditingEnabled = editable;
+
+    if(mEventData->mDecorator)
+    {
+      bool decoratorEditable = editable && mIsUserInteractionEnabled;
+      mEventData->mDecorator->SetEditable(decoratorEditable);
+      mEventData->mDecoratorUpdated = true;
+      RequestRelayout();
+    }
+  }
+}
+
+void Controller::Impl::UpdateAfterFontChange(const std::string& newDefaultFont)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange\n");
+
+  if(!mFontDefaults->familyDefined) // If user defined font then should not update when system font changes
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str());
+    mFontDefaults->mFontDescription.family = newDefaultFont;
+
+    ClearFontData();
+
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::RetrieveSelection(std::string& selectedText, bool deleteAfterRetrieval)
+{
+  if(mEventData->mLeftSelectionPosition == mEventData->mRightSelectionPosition)
+  {
+    // Nothing to select if handles are in the same place.
+    selectedText.clear();
+    return;
+  }
+
+  const bool handlesCrossed = mEventData->mLeftSelectionPosition > mEventData->mRightSelectionPosition;
+
+  //Get start and end position of selection
+  const CharacterIndex startOfSelectedText  = handlesCrossed ? mEventData->mRightSelectionPosition : mEventData->mLeftSelectionPosition;
+  const Length         lengthOfSelectedText = (handlesCrossed ? mEventData->mLeftSelectionPosition : mEventData->mRightSelectionPosition) - startOfSelectedText;
+
+  Vector<Character>& utf32Characters    = mModel->mLogicalModel->mText;
+  const Length       numberOfCharacters = utf32Characters.Count();
+
+  // Validate the start and end selection points
+  if((startOfSelectedText + lengthOfSelectedText) <= numberOfCharacters)
+  {
+    //Get text as a UTF8 string
+    Utf32ToUtf8(&utf32Characters[startOfSelectedText], lengthOfSelectedText, selectedText);
+
+    if(deleteAfterRetrieval) // Only delete text if copied successfully
+    {
+      // Keep a copy of the current input style.
+      InputStyle currentInputStyle;
+      currentInputStyle.Copy(mEventData->mInputStyle);
+
+      // Set as input style the style of the first deleted character.
+      mModel->mLogicalModel->RetrieveStyle(startOfSelectedText, mEventData->mInputStyle);
+
+      // Compare if the input style has changed.
+      const bool hasInputStyleChanged = !currentInputStyle.Equal(mEventData->mInputStyle);
+
+      if(hasInputStyleChanged)
+      {
+        const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask(mEventData->mInputStyle);
+        // Queue the input style changed signal.
+        mEventData->mInputStyleChangedQueue.PushBack(styleChangedMask);
+      }
+
+      mModel->mLogicalModel->UpdateTextStyleRuns(startOfSelectedText, -static_cast<int>(lengthOfSelectedText));
+
+      // Mark the paragraphs to be updated.
+      if(Layout::Engine::SINGLE_LINE_BOX == mLayoutEngine.GetLayout())
+      {
+        mTextUpdateInfo.mCharacterIndex             = 0;
+        mTextUpdateInfo.mNumberOfCharactersToRemove = mTextUpdateInfo.mPreviousNumberOfCharacters;
+        mTextUpdateInfo.mNumberOfCharactersToAdd    = mTextUpdateInfo.mPreviousNumberOfCharacters - lengthOfSelectedText;
+        mTextUpdateInfo.mClearAll                   = true;
+      }
+      else
+      {
+        mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
+        mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
+      }
+
+      // Delete text between handles
+      Vector<Character>::Iterator first = utf32Characters.Begin() + startOfSelectedText;
+      Vector<Character>::Iterator last  = first + lengthOfSelectedText;
+      utf32Characters.Erase(first, last);
+
+      // Will show the cursor at the first character of the selection.
+      mEventData->mPrimaryCursorPosition = handlesCrossed ? mEventData->mRightSelectionPosition : mEventData->mLeftSelectionPosition;
+    }
+    else
+    {
+      // Will show the cursor at the last character of the selection.
+      mEventData->mPrimaryCursorPosition = handlesCrossed ? mEventData->mLeftSelectionPosition : mEventData->mRightSelectionPosition;
+    }
+
+    mEventData->mDecoratorUpdated = true;
+  }
+}
+
+void Controller::Impl::SetSelection(int start, int end)
+{
+  uint32_t oldStart = mEventData->mLeftSelectionPosition;
+  uint32_t oldEnd   = mEventData->mRightSelectionPosition;
+
+  mEventData->mLeftSelectionPosition  = start;
+  mEventData->mRightSelectionPosition = end;
+  mEventData->mUpdateCursorPosition   = true;
+
+  if(mSelectableControlInterface != nullptr)
+  {
+    mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, start, end);
+  }
+}
+
+std::pair<int, int> Controller::Impl::GetSelectionIndexes() const
+{
+  return {mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition};
+}
+
+void Controller::Impl::ShowClipboard()
+{
+  if(EnsureClipboardCreated())
+  {
+    mClipboard.ShowClipboard();
+  }
+}
+
+void Controller::Impl::HideClipboard()
+{
+  if(EnsureClipboardCreated() && mClipboardHideEnabled)
+  {
+    mClipboard.HideClipboard();
+  }
+}
+
+void Controller::Impl::SetClipboardHideEnable(bool enable)
+{
+  mClipboardHideEnabled = enable;
+}
+
+bool Controller::Impl::CopyStringToClipboard(const std::string& source)
+{
+  if(EnsureClipboardCreated())
+  {
+    Dali::Clipboard::ClipData data(MIME_TYPE_TEXT_PLAIN, source.c_str());
+    return mClipboard.SetData(data); // Send clipboard data to clipboard.
+  }
+
+  return false;
+}
+
+void Controller::Impl::SendSelectionToClipboard(bool deleteAfterSending)
+{
+  std::string selectedText;
+  RetrieveSelection(selectedText, deleteAfterSending);
+  CopyStringToClipboard(selectedText);
+  ChangeState(EventData::EDITING);
+}
+
+void Controller::Impl::RepositionSelectionHandles()
+{
+  SelectionHandleController::Reposition(*this);
+}
+void Controller::Impl::RepositionSelectionHandles(float visualX, float visualY, Controller::NoTextTap::Action action)
+{
+  SelectionHandleController::Reposition(*this, visualX, visualY, action);
+}
+
+void Controller::Impl::SetPopupButtons()
+{
+  /**
+   *  Sets the Popup buttons to be shown depending on State.
+   *
+   *  If SELECTING :  CUT & COPY + ( PASTE & CLIPBOARD if content available to paste )
+   *
+   *  If EDITING_WITH_POPUP : SELECT & SELECT_ALL
+   */
+
+  bool                        isEditable    = IsEditable();
+  TextSelectionPopup::Buttons buttonsToShow = TextSelectionPopup::NONE;
+
+  if(EventData::SELECTING == mEventData->mState)
+  {
+    buttonsToShow = TextSelectionPopup::Buttons(TextSelectionPopup::COPY);
+    if(isEditable)
+    {
+      buttonsToShow = TextSelectionPopup::Buttons(buttonsToShow | TextSelectionPopup::CUT);
+    }
+
+    if(!IsClipboardEmpty())
+    {
+      if(isEditable)
+      {
+        buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::PASTE));
+      }
+      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::CLIPBOARD));
+    }
+
+    if(!mEventData->mAllTextSelected)
+    {
+      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::SELECT_ALL));
+    }
+  }
+  else if(EventData::EDITING_WITH_POPUP == mEventData->mState)
+  {
+    if(mModel->mLogicalModel->mText.Count() && !IsShowingPlaceholderText())
+    {
+      buttonsToShow = TextSelectionPopup::Buttons(TextSelectionPopup::SELECT | TextSelectionPopup::SELECT_ALL);
+    }
+
+    if(!IsClipboardEmpty())
+    {
+      if(isEditable)
+      {
+        buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::PASTE));
+      }
+      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::CLIPBOARD));
+    }
+  }
+  else if(EventData::EDITING_WITH_PASTE_POPUP == mEventData->mState)
+  {
+    if(!IsClipboardEmpty())
+    {
+      if(isEditable)
+      {
+        buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::PASTE));
+      }
+      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::CLIPBOARD));
+    }
+  }
+
+  mEventData->mDecorator->SetEnabledPopupButtons(buttonsToShow);
+}
+
+void Controller::Impl::ChangeState(EventData::State newState)
+{
+  ChangeTextControllerState(*this, newState);
+}
+
+void Controller::Impl::GetCursorPosition(CharacterIndex logical,
+                                         CursorInfo&    cursorInfo)
+{
+  if(!IsShowingRealText())
+  {
+    // Do not want to use the place-holder text to set the cursor position.
+
+    // Use the line's height of the font's family set to set the cursor's size.
+    // If there is no font's family set, use the default font.
+    // Use the current alignment to place the cursor at the beginning, center or end of the box.
+
+    cursorInfo.lineOffset          = 0.f;
+    cursorInfo.lineHeight          = GetDefaultFontLineHeight();
+    cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
+
+    bool isRTL = false;
+    if(mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS)
+    {
+      isRTL = mLayoutDirection == LayoutDirection::RIGHT_TO_LEFT;
+    }
+
+    switch(mModel->mHorizontalAlignment)
+    {
+      case Text::HorizontalAlignment::BEGIN:
+      {
+        if(isRTL)
+        {
+          cursorInfo.primaryPosition.x = mModel->mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
+        }
+        else
+        {
+          cursorInfo.primaryPosition.x = 0.f;
+        }
+        break;
+      }
+      case Text::HorizontalAlignment::CENTER:
+      {
+        cursorInfo.primaryPosition.x = floorf(0.5f * mModel->mVisualModel->mControlSize.width);
+        break;
+      }
+      case Text::HorizontalAlignment::END:
+      {
+        if(isRTL)
+        {
+          cursorInfo.primaryPosition.x = 0.f;
+        }
+        else
+        {
+          cursorInfo.primaryPosition.x = mModel->mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
+        }
+        break;
+      }
+    }
+
+    // Nothing else to do.
+    return;
+  }
+
+  const bool                  isMultiLine = (Layout::Engine::MULTI_LINE_BOX == mLayoutEngine.GetLayout());
+  GetCursorPositionParameters parameters;
+  parameters.visualModel  = mModel->mVisualModel;
+  parameters.logicalModel = mModel->mLogicalModel;
+  parameters.metrics      = mMetrics;
+  parameters.logical      = logical;
+  parameters.isMultiline  = isMultiLine;
+
+  float defaultFontLineHeight = GetDefaultFontLineHeight();
+
+  Text::GetCursorPosition(parameters,
+                          defaultFontLineHeight,
+                          cursorInfo);
+
+  // Adds Outline offset.
+  const float outlineWidth = static_cast<float>(mModel->GetOutlineWidth());
+  cursorInfo.primaryPosition.x += outlineWidth;
+  cursorInfo.primaryPosition.y += outlineWidth;
+  cursorInfo.secondaryPosition.x += outlineWidth;
+  cursorInfo.secondaryPosition.y += outlineWidth;
+
+  if(isMultiLine)
+  {
+    // If the text is editable and multi-line, the cursor position after a white space shouldn't exceed the boundaries of the text control.
+
+    // Note the white spaces laid-out at the end of the line might exceed the boundaries of the control.
+    // The reason is a wrapped line must not start with a white space so they are laid-out at the end of the line.
+
+    if(0.f > cursorInfo.primaryPosition.x)
+    {
+      cursorInfo.primaryPosition.x = 0.f;
+    }
+
+    const float edgeWidth = mModel->mVisualModel->mControlSize.width - static_cast<float>(mEventData->mDecorator->GetCursorWidth());
+    if(cursorInfo.primaryPosition.x > edgeWidth)
+    {
+      cursorInfo.primaryPosition.x = edgeWidth;
+    }
+  }
+}
+
+CharacterIndex Controller::Impl::CalculateNewCursorIndex(CharacterIndex index) const
+{
+  if(nullptr == mEventData)
+  {
+    // Nothing to do if there is no text input.
+    return 0u;
+  }
+
+  CharacterIndex cursorIndex = mEventData->mPrimaryCursorPosition;
+
+  const GlyphIndex* const charactersToGlyphBuffer  = mModel->mVisualModel->mCharactersToGlyph.Begin();
+  const Length* const     charactersPerGlyphBuffer = mModel->mVisualModel->mCharactersPerGlyph.Begin();
+
+  GlyphIndex glyphIndex         = *(charactersToGlyphBuffer + index);
+  Length     numberOfCharacters = *(charactersPerGlyphBuffer + glyphIndex);
+
+  if(numberOfCharacters > 1u)
+  {
+    const Script script = mModel->mLogicalModel->GetScript(index);
+    if(HasLigatureMustBreak(script))
+    {
+      // Prevents to jump the whole Latin ligatures like fi, ff, or Arabic ï»», ...
+      numberOfCharacters = 1u;
+    }
+  }
+  else
+  {
+    while(0u == numberOfCharacters)
+    {
+      ++glyphIndex;
+      numberOfCharacters = *(charactersPerGlyphBuffer + glyphIndex);
+    }
+  }
+
+  if(index < mEventData->mPrimaryCursorPosition)
+  {
+    cursorIndex = cursorIndex < numberOfCharacters ? 0u : cursorIndex - numberOfCharacters;
+  }
+  else
+  {
+    Length textLength = mModel->mVisualModel->mCharactersToGlyph.Count();
+    cursorIndex       = cursorIndex + numberOfCharacters > textLength ? textLength : cursorIndex + numberOfCharacters;
+  }
+
+  // Will update the cursor hook position.
+  mEventData->mUpdateCursorHookPosition = true;
+
+  return cursorIndex;
+}
+
+void Controller::Impl::UpdateCursorPosition(const CursorInfo& cursorInfo)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::UpdateCursorPosition %p\n", this);
+  if(nullptr == mEventData)
+  {
+    // Nothing to do if there is no text input.
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::UpdateCursorPosition no event data\n");
+    return;
+  }
+
+  const Vector2 cursorPosition = cursorInfo.primaryPosition + mModel->mScrollPosition;
+
+  mEventData->mDecorator->SetGlyphOffset(PRIMARY_CURSOR, cursorInfo.glyphOffset);
+
+  // Sets the cursor position.
+  mEventData->mDecorator->SetPosition(PRIMARY_CURSOR,
+                                      cursorPosition.x,
+                                      cursorPosition.y,
+                                      cursorInfo.primaryCursorHeight,
+                                      cursorInfo.lineHeight);
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Primary cursor position: %f,%f\n", cursorPosition.x, cursorPosition.y);
+
+  if(mEventData->mUpdateGrabHandlePosition)
+  {
+    // Sets the grab handle position.
+    mEventData->mDecorator->SetPosition(GRAB_HANDLE,
+                                        cursorPosition.x,
+                                        cursorInfo.lineOffset + mModel->mScrollPosition.y,
+                                        cursorInfo.lineHeight);
+  }
+
+  if(cursorInfo.isSecondaryCursor)
+  {
+    mEventData->mDecorator->SetPosition(SECONDARY_CURSOR,
+                                        cursorInfo.secondaryPosition.x + mModel->mScrollPosition.x,
+                                        cursorInfo.secondaryPosition.y + mModel->mScrollPosition.y,
+                                        cursorInfo.secondaryCursorHeight,
+                                        cursorInfo.lineHeight);
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Secondary cursor position: %f,%f\n", cursorInfo.secondaryPosition.x + mModel->mScrollPosition.x, cursorInfo.secondaryPosition.y + mModel->mScrollPosition.y);
+  }
+
+  // Set which cursors are active according the state.
+  if(EventData::IsEditingState(mEventData->mState) || (EventData::GRAB_HANDLE_PANNING == mEventData->mState))
+  {
+    if(cursorInfo.isSecondaryCursor)
+    {
+      mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_BOTH);
+    }
+    else
+    {
+      mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
+    }
+  }
+  else
+  {
+    mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
+  }
+
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::UpdateCursorPosition\n");
+}
+
+void Controller::Impl::UpdateSelectionHandle(HandleType        handleType,
+                                             const CursorInfo& cursorInfo)
+{
+  SelectionHandleController::Update(*this, handleType, cursorInfo);
+}
+
+void Controller::Impl::ClampHorizontalScroll(const Vector2& layoutSize)
+{
+  // Clamp between -space & -alignment offset.
+
+  if(layoutSize.width > mModel->mVisualModel->mControlSize.width)
+  {
+    const float space         = (layoutSize.width - mModel->mVisualModel->mControlSize.width) + mModel->mAlignmentOffset;
+    mModel->mScrollPosition.x = (mModel->mScrollPosition.x < -space) ? -space : mModel->mScrollPosition.x;
+    mModel->mScrollPosition.x = (mModel->mScrollPosition.x > -mModel->mAlignmentOffset) ? -mModel->mAlignmentOffset : mModel->mScrollPosition.x;
+
+    mEventData->mDecoratorUpdated = true;
+  }
+  else
+  {
+    mModel->mScrollPosition.x = 0.f;
+  }
+}
+
+void Controller::Impl::ClampVerticalScroll(const Vector2& layoutSize)
+{
+  if(Layout::Engine::SINGLE_LINE_BOX == mLayoutEngine.GetLayout())
+  {
+    // Nothing to do if the text is single line.
+    return;
+  }
+
+  // Clamp between -space & 0.
+  if(layoutSize.height > mModel->mVisualModel->mControlSize.height)
+  {
+    const float space         = (layoutSize.height - mModel->mVisualModel->mControlSize.height);
+    mModel->mScrollPosition.y = (mModel->mScrollPosition.y < -space) ? -space : mModel->mScrollPosition.y;
+    mModel->mScrollPosition.y = (mModel->mScrollPosition.y > 0.f) ? 0.f : mModel->mScrollPosition.y;
+
+    mEventData->mDecoratorUpdated = true;
+  }
+  else
+  {
+    mModel->mScrollPosition.y = 0.f;
+  }
+}
+
+void Controller::Impl::ScrollToMakePositionVisible(const Vector2& position, float lineHeight)
+{
+  const float cursorWidth = mEventData->mDecorator ? static_cast<float>(mEventData->mDecorator->GetCursorWidth()) : 0.f;
+
+  // position is in actor's coords.
+  const float positionEndX = position.x + cursorWidth;
+  const float positionEndY = position.y + lineHeight;
+
+  // Transform the position to decorator coords.
+  const float decoratorPositionBeginX = position.x + mModel->mScrollPosition.x;
+  const float decoratorPositionEndX   = positionEndX + mModel->mScrollPosition.x;
+
+  const float decoratorPositionBeginY = position.y + mModel->mScrollPosition.y;
+  const float decoratorPositionEndY   = positionEndY + mModel->mScrollPosition.y;
+
+  if(decoratorPositionBeginX < 0.f)
+  {
+    mModel->mScrollPosition.x = -position.x;
+  }
+  else if(decoratorPositionEndX > mModel->mVisualModel->mControlSize.width)
+  {
+    mModel->mScrollPosition.x = mModel->mVisualModel->mControlSize.width - positionEndX;
+  }
+
+  if(Layout::Engine::MULTI_LINE_BOX == mLayoutEngine.GetLayout())
+  {
+    if(decoratorPositionBeginY < 0.f)
+    {
+      mModel->mScrollPosition.y = -position.y;
+    }
+    else if(decoratorPositionEndY > mModel->mVisualModel->mControlSize.height)
+    {
+      mModel->mScrollPosition.y = mModel->mVisualModel->mControlSize.height - positionEndY;
+    }
+    else if(mModel->mLogicalModel->mText.Count() == 0u)
+    {
+      Relayouter::CalculateVerticalOffset(*this, mModel->mVisualModel->mControlSize);
+    }
+  }
+}
+
+void Controller::Impl::ScrollTextToMatchCursor(const CursorInfo& cursorInfo)
+{
+  // Get the current cursor position in decorator coords.
+  const Vector2& currentCursorPosition = mEventData->mDecorator->GetPosition(PRIMARY_CURSOR);
+
+  const LineIndex lineIndex = mModel->mVisualModel->GetLineOfCharacter(mEventData->mPrimaryCursorPosition);
+
+  // Calculate the offset to match the cursor position before the character was deleted.
+  mModel->mScrollPosition.x = currentCursorPosition.x - cursorInfo.primaryPosition.x;
+
+  //If text control has more than two lines and current line index is not last, calculate scrollpositionY
+  if(mModel->mVisualModel->mLines.Count() > 1u && lineIndex != mModel->mVisualModel->mLines.Count() - 1u)
+  {
+    const float currentCursorGlyphOffset = mEventData->mDecorator->GetGlyphOffset(PRIMARY_CURSOR);
+    mModel->mScrollPosition.y            = currentCursorPosition.y - cursorInfo.lineOffset - currentCursorGlyphOffset;
+  }
+
+  ClampHorizontalScroll(mModel->mVisualModel->GetLayoutSize());
+  ClampVerticalScroll(mModel->mVisualModel->GetLayoutSize());
+
+  // Makes the new cursor position visible if needed.
+  ScrollToMakePositionVisible(cursorInfo.primaryPosition, cursorInfo.lineHeight);
+}
+
+void Controller::Impl::ScrollTextToMatchCursor()
+{
+  CursorInfo cursorInfo;
+  GetCursorPosition(mEventData->mPrimaryCursorPosition, cursorInfo);
+  ScrollTextToMatchCursor(cursorInfo);
+}
+
+void Controller::Impl::RequestRelayout()
+{
+  if(nullptr != mControlInterface)
+  {
+    mControlInterface->RequestTextRelayout();
+  }
+}
+
+void Controller::Impl::RelayoutAllCharacters()
+{
+  // relayout all characters
+  mTextUpdateInfo.mCharacterIndex             = 0;
+  mTextUpdateInfo.mNumberOfCharactersToRemove = mTextUpdateInfo.mPreviousNumberOfCharacters;
+  mTextUpdateInfo.mNumberOfCharactersToAdd    = mModel->mLogicalModel->mText.Count();
+  mOperationsPending                          = static_cast<OperationsMask>(mOperationsPending | LAYOUT);
+
+  mTextUpdateInfo.mFullRelayoutNeeded = true;
+
+  // Need to recalculate natural size
+  mRecalculateNaturalSize = true;
+
+  //remove selection
+  if((mEventData != nullptr) && (mEventData->mState == EventData::SELECTING))
+  {
+    ChangeState(EventData::EDITING);
+  }
+
+  RequestRelayout();
+}
+
+bool Controller::Impl::IsInputStyleChangedSignalsQueueEmpty()
+{
+  return (NULL == mEventData) || (0u == mEventData->mInputStyleChangedQueue.Count());
+}
+
+void Controller::Impl::ProcessInputStyleChangedSignals()
+{
+  if(mEventData)
+  {
+    if(mEditableControlInterface)
+    {
+      // Emit the input style changed signal for each mask
+      std::for_each(mEventData->mInputStyleChangedQueue.begin(),
+                    mEventData->mInputStyleChangedQueue.end(),
+                    [&](const auto mask) { mEditableControlInterface->InputStyleChanged(mask); });
+    }
+
+    mEventData->mInputStyleChangedQueue.Clear();
+  }
+}
+
+void Controller::Impl::ScrollBy(Vector2 scroll)
+{
+  if(mEventData && (fabs(scroll.x) > Math::MACHINE_EPSILON_0 || fabs(scroll.y) > Math::MACHINE_EPSILON_0))
+  {
+    const Vector2& layoutSize    = mModel->mVisualModel->GetLayoutSize();
+    const Vector2  currentScroll = mModel->mScrollPosition;
+
+    scroll.x = -scroll.x;
+    scroll.y = -scroll.y;
+
+    if(fabs(scroll.x) > Math::MACHINE_EPSILON_0)
+    {
+      mModel->mScrollPosition.x += scroll.x;
+      ClampHorizontalScroll(layoutSize);
+    }
+
+    if(fabs(scroll.y) > Math::MACHINE_EPSILON_0)
+    {
+      mModel->mScrollPosition.y += scroll.y;
+      ClampVerticalScroll(layoutSize);
+    }
+
+    if(mModel->mScrollPosition != currentScroll)
+    {
+      mEventData->mDecorator->UpdatePositions(mModel->mScrollPosition - currentScroll);
+      RequestRelayout();
+    }
+  }
+}
+
+bool Controller::Impl::IsScrollable(const Vector2& displacement)
+{
+  bool isScrollable = false;
+  if(mEventData)
+  {
+    const bool isHorizontalScrollEnabled = mEventData->mDecorator->IsHorizontalScrollEnabled();
+    const bool isVerticalScrollEnabled   = mEventData->mDecorator->IsVerticalScrollEnabled();
+    if(isHorizontalScrollEnabled || isVerticalScrollEnabled)
+    {
+      const Vector2& targetSize     = mModel->mVisualModel->mControlSize;
+      const Vector2& layoutSize     = mModel->mVisualModel->GetLayoutSize();
+      const Vector2& scrollPosition = mModel->mScrollPosition;
+
+      if(isHorizontalScrollEnabled)
+      {
+        const float displacementX = displacement.x;
+        const float positionX     = scrollPosition.x + displacementX;
+        if(layoutSize.width > targetSize.width && -positionX > 0.f && -positionX < layoutSize.width - targetSize.width)
+        {
+          isScrollable = true;
+        }
+      }
+
+      if(isVerticalScrollEnabled)
+      {
+        const float displacementY = displacement.y;
+        const float positionY     = scrollPosition.y + displacementY;
+        if(layoutSize.height > targetSize.height && -positionY > 0 && -positionY < layoutSize.height - targetSize.height)
+        {
+          isScrollable = true;
+        }
+      }
+    }
+  }
+  return isScrollable;
+}
+
+float Controller::Impl::GetHorizontalScrollPosition()
+{
+  // Scroll values are negative internally so we convert them to positive numbers
+  return mEventData ? -mModel->mScrollPosition.x : 0.0f;
+}
+
+float Controller::Impl::GetVerticalScrollPosition()
+{
+  // Scroll values are negative internally so we convert them to positive numbers
+  return mEventData ? -mModel->mScrollPosition.y : 0.0f;
+}
+
+Vector3 Controller::Impl::GetAnchorPosition(Anchor anchor) const
+{
+  //TODO
+  return Vector3(10.f, 10.f, 10.f);
+}
+
+Vector2 Controller::Impl::GetAnchorSize(Anchor anchor) const
+{
+  //TODO
+  return Vector2(10.f, 10.f);
+}
+
+Toolkit::TextAnchor Controller::Impl::CreateAnchorActor(Anchor anchor)
+{
+  auto actor = Toolkit::TextAnchor::New();
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  const Vector3 anchorPosition = GetAnchorPosition(anchor);
+  actor.SetProperty(Actor::Property::POSITION, anchorPosition);
+  const Vector2 anchorSize = GetAnchorSize(anchor);
+  actor.SetProperty(Actor::Property::SIZE, anchorSize);
+  std::string anchorText(mModel->mLogicalModel->mText.Begin() + anchor.startIndex, mModel->mLogicalModel->mText.Begin() + anchor.endIndex);
+  actor.SetProperty(Actor::Property::NAME, anchorText);
+  actor.SetProperty(Toolkit::TextAnchor::Property::URI, std::string(anchor.href));
+  actor.SetProperty(Toolkit::TextAnchor::Property::START_CHARACTER_INDEX, static_cast<int>(anchor.startIndex));
+  actor.SetProperty(Toolkit::TextAnchor::Property::END_CHARACTER_INDEX, static_cast<int>(anchor.endIndex));
+  return actor;
+}
+
+void Controller::Impl::GetAnchorActors(std::vector<Toolkit::TextAnchor>& anchorActors)
+{
+  /* TODO: Now actors are created/destroyed in every "RenderText" function call. Even when we add just 1 character,
+           we need to create and destroy potentially many actors. Some optimization can be considered here.
+           Maybe a "dirty" flag in mLogicalModel? */
+  anchorActors.clear();
+  for(auto& anchor : mModel->mLogicalModel->mAnchors)
+  {
+    auto actor = CreateAnchorActor(anchor);
+    anchorActors.push_back(actor);
+  }
+}
+
+int32_t Controller::Impl::GetAnchorIndex(size_t characterOffset) const
+{
+  Vector<Anchor>::Iterator it = mModel->mLogicalModel->mAnchors.Begin();
+
+  while(it != mModel->mLogicalModel->mAnchors.End() && (it->startIndex > characterOffset || it->endIndex <= characterOffset))
+  {
+    it++;
+  }
+
+  return it == mModel->mLogicalModel->mAnchors.End() ? -1 : it - mModel->mLogicalModel->mAnchors.Begin();
+}
+
+void Controller::Impl::CopyUnderlinedFromLogicalToVisualModels(bool shouldClearPreUnderlineRuns)
+{
+  //Underlined character runs for markup-processor
+  const Vector<UnderlinedCharacterRun>& underlinedCharacterRuns = mModel->mLogicalModel->mUnderlinedCharacterRuns;
+  const Vector<GlyphIndex>&             charactersToGlyph       = mModel->mVisualModel->mCharactersToGlyph;
+  const Vector<Length>&                 glyphsPerCharacter      = mModel->mVisualModel->mGlyphsPerCharacter;
+
+  if(shouldClearPreUnderlineRuns)
+  {
+    mModel->mVisualModel->mUnderlineRuns.Clear();
+  }
+
+  for(Vector<UnderlinedCharacterRun>::ConstIterator it = underlinedCharacterRuns.Begin(), endIt = underlinedCharacterRuns.End(); it != endIt; ++it)
+  {
+    CharacterIndex characterIndex     = it->characterRun.characterIndex;
+    Length         numberOfCharacters = it->characterRun.numberOfCharacters;
+
+    if(numberOfCharacters == 0)
+    {
+      continue;
+    }
+
+    // Create one run for all glyphs of all run's characters that has same properties
+    // This enhance performance and reduce the needed memory to store glyphs-runs
+    UnderlinedGlyphRun underlineGlyphRun;
+    underlineGlyphRun.glyphRun.glyphIndex     = charactersToGlyph[characterIndex];
+    underlineGlyphRun.glyphRun.numberOfGlyphs = glyphsPerCharacter[characterIndex];
+    //Copy properties (attributes)
+    underlineGlyphRun.properties = it->properties;
+
+    for(Length index = 1u; index < numberOfCharacters; index++)
+    {
+      underlineGlyphRun.glyphRun.numberOfGlyphs += glyphsPerCharacter[characterIndex + index];
+    }
+
+    mModel->mVisualModel->mUnderlineRuns.PushBack(underlineGlyphRun);
+  }
+
+  // Reset flag. The updates have been applied from logical to visual.
+  mModel->mLogicalModel->mUnderlineRunsUpdated = false;
+}
+
+void Controller::Impl::CopyStrikethroughFromLogicalToVisualModels()
+{
+  //Strikethrough character runs from markup-processor
+  const Vector<StrikethroughCharacterRun>& strikethroughCharacterRuns = mModel->mLogicalModel->mStrikethroughCharacterRuns;
+  const Vector<GlyphIndex>&                charactersToGlyph          = mModel->mVisualModel->mCharactersToGlyph;
+  const Vector<Length>&                    glyphsPerCharacter         = mModel->mVisualModel->mGlyphsPerCharacter;
+
+  mModel->mVisualModel->mStrikethroughRuns.Clear();
+
+  for(Vector<StrikethroughCharacterRun>::ConstIterator it = strikethroughCharacterRuns.Begin(), endIt = strikethroughCharacterRuns.End(); it != endIt; ++it)
+  {
+    CharacterIndex characterIndex     = it->characterRun.characterIndex;
+    Length         numberOfCharacters = it->characterRun.numberOfCharacters;
+
+    if(numberOfCharacters == 0)
+    {
+      continue;
+    }
+
+    StrikethroughGlyphRun strikethroughGlyphRun;
+    strikethroughGlyphRun.properties              = it->properties;
+    strikethroughGlyphRun.glyphRun.glyphIndex     = charactersToGlyph[characterIndex];
+    strikethroughGlyphRun.glyphRun.numberOfGlyphs = glyphsPerCharacter[characterIndex];
+
+    for(Length index = 1u; index < numberOfCharacters; index++)
+    {
+      strikethroughGlyphRun.glyphRun.numberOfGlyphs += glyphsPerCharacter[characterIndex + index];
+    }
+
+    mModel->mVisualModel->mStrikethroughRuns.PushBack(strikethroughGlyphRun);
+  }
+
+  // Reset flag. The updates have been applied from logical to visual.
+  mModel->mLogicalModel->mStrikethroughRunsUpdated = false;
+}
+
+void Controller::Impl::CopyCharacterSpacingFromLogicalToVisualModels()
+{
+  //CharacterSpacing character runs from markup-processor
+  const Vector<CharacterSpacingCharacterRun>& characterSpacingCharacterRuns = mModel->mLogicalModel->mCharacterSpacingCharacterRuns;
+  const Vector<GlyphIndex>&                   charactersToGlyph             = mModel->mVisualModel->mCharactersToGlyph;
+  const Vector<Length>&                       glyphsPerCharacter            = mModel->mVisualModel->mGlyphsPerCharacter;
+
+  mModel->mVisualModel->mCharacterSpacingRuns.Clear();
+
+  for(Vector<CharacterSpacingCharacterRun>::ConstIterator it = characterSpacingCharacterRuns.Begin(), endIt = characterSpacingCharacterRuns.End(); it != endIt; ++it)
+  {
+    const CharacterIndex& characterIndex     = it->characterRun.characterIndex;
+    const Length&         numberOfCharacters = it->characterRun.numberOfCharacters;
+
+    if(numberOfCharacters == 0)
+    {
+      continue;
+    }
+
+    CharacterSpacingGlyphRun characterSpacingGlyphRun;
+    characterSpacingGlyphRun.value                   = it->value;
+    characterSpacingGlyphRun.glyphRun.glyphIndex     = charactersToGlyph[characterIndex];
+    characterSpacingGlyphRun.glyphRun.numberOfGlyphs = glyphsPerCharacter[characterIndex];
+
+    for(Length index = 1u; index < numberOfCharacters; index++)
+    {
+      characterSpacingGlyphRun.glyphRun.numberOfGlyphs += glyphsPerCharacter[characterIndex + index];
+    }
+
+    mModel->mVisualModel->mCharacterSpacingRuns.PushBack(characterSpacingGlyphRun);
+  }
+  mModel->mLogicalModel->mCharacterSpacingRunsUpdated = false;
+}
+
+void Controller::Impl::SetAutoScrollEnabled(bool enable)
+{
+  if(mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX)
+  {
+    mOperationsPending = static_cast<OperationsMask>(mOperationsPending |
+                                                     LAYOUT |
+                                                     ALIGN |
+                                                     UPDATE_LAYOUT_SIZE |
+                                                     REORDER);
+
+    if(enable)
+    {
+      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled for SINGLE_LINE_BOX\n");
+      mOperationsPending = static_cast<OperationsMask>(mOperationsPending | UPDATE_DIRECTION);
+    }
+    else
+    {
+      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled Disabling autoscroll\n");
+    }
+
+    mIsAutoScrollEnabled = enable;
+    RequestRelayout();
+  }
+  else
+  {
+    DALI_LOG_WARNING("Attempted AutoScrolling on a non SINGLE_LINE_BOX, request ignored\n");
+    mIsAutoScrollEnabled = false;
+  }
+}
+
+void Controller::Impl::SetEnableCursorBlink(bool enable)
+{
+  DALI_ASSERT_DEBUG(NULL != mEventData && "TextInput disabled");
+
+  if(mEventData)
+  {
+    mEventData->mCursorBlinkEnabled = enable;
+
+    if(!enable && mEventData->mDecorator)
+    {
+      mEventData->mDecorator->StopCursorBlink();
+    }
+  }
+}
+
+void Controller::Impl::SetMultiLineEnabled(bool enable)
+{
+  const Layout::Engine::Type layout = enable ? Layout::Engine::MULTI_LINE_BOX : Layout::Engine::SINGLE_LINE_BOX;
+
+  if(layout != mLayoutEngine.GetLayout())
+  {
+    // Set the layout type.
+    mLayoutEngine.SetLayout(layout);
+
+    // Set the flags to redo the layout operations
+    const OperationsMask layoutOperations = static_cast<OperationsMask>(LAYOUT |
+                                                                        UPDATE_LAYOUT_SIZE |
+                                                                        ALIGN |
+                                                                        REORDER);
+
+    mTextUpdateInfo.mFullRelayoutNeeded = true;
+    mOperationsPending                  = static_cast<OperationsMask>(mOperationsPending | layoutOperations);
+
+    // Need to recalculate natural size
+    mRecalculateNaturalSize = true;
+
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::SetHorizontalAlignment(Text::HorizontalAlignment::Type alignment)
+{
+  if(alignment != mModel->mHorizontalAlignment)
+  {
+    // Set the alignment.
+    mModel->mHorizontalAlignment = alignment;
+    UpdateCursorPositionForAlignment(*this, true);
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::SetVerticalAlignment(VerticalAlignment::Type alignment)
+{
+  if(alignment != mModel->mVerticalAlignment)
+  {
+    // Set the alignment.
+    mModel->mVerticalAlignment = alignment;
+    UpdateCursorPositionForAlignment(*this, false);
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::SetLineWrapMode(Text::LineWrap::Mode lineWrapMode)
+{
+  if(lineWrapMode != mModel->mLineWrapMode)
+  {
+    // Update Text layout for applying wrap mode
+    mOperationsPending = static_cast<OperationsMask>(mOperationsPending |
+                                                     ALIGN |
+                                                     LAYOUT |
+                                                     UPDATE_LAYOUT_SIZE |
+                                                     REORDER);
+
+    if((mModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) || (lineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) ||
+       (mModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::MIXED) || (lineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::MIXED)) // hyphen is treated as line break
+    {
+      mOperationsPending = static_cast<OperationsMask>(mOperationsPending | GET_LINE_BREAKS);
+    }
+
+    // Set the text wrap mode.
+    mModel->mLineWrapMode = lineWrapMode;
+
+    mTextUpdateInfo.mCharacterIndex             = 0u;
+    mTextUpdateInfo.mNumberOfCharactersToRemove = mTextUpdateInfo.mPreviousNumberOfCharacters;
+    mTextUpdateInfo.mNumberOfCharactersToAdd    = mModel->mLogicalModel->mText.Count();
+
+    // Request relayout
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::SetDefaultColor(const Vector4& color)
+{
+  mTextColor = color;
+
+  if(!IsShowingPlaceholderText())
+  {
+    mModel->mVisualModel->SetTextColor(color);
+    mOperationsPending = static_cast<OperationsMask>(mOperationsPending | COLOR);
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::SetUserInteractionEnabled(bool enabled)
+{
+  mIsUserInteractionEnabled = enabled;
+
+  if(mEventData && mEventData->mDecorator)
+  {
+    bool editable = mEventData->mEditingEnabled && enabled;
+    mEventData->mDecorator->SetEditable(editable);
+    mEventData->mDecoratorUpdated = true;
+    RequestRelayout();
+  }
+}
+
+void Controller::Impl::ClearFontData()
+{
+  if(mFontDefaults)
+  {
+    mFontDefaults->mFontId = 0u; // Remove old font ID
+  }
+
+  // Set flags to update the model.
+  mTextUpdateInfo.mCharacterIndex             = 0u;
+  mTextUpdateInfo.mNumberOfCharactersToRemove = mTextUpdateInfo.mPreviousNumberOfCharacters;
+  mTextUpdateInfo.mNumberOfCharactersToAdd    = mModel->mLogicalModel->mText.Count();
+
+  mTextUpdateInfo.mClearAll           = true;
+  mTextUpdateInfo.mFullRelayoutNeeded = true;
+  mRecalculateNaturalSize             = true;
+
+  mOperationsPending = static_cast<OperationsMask>(mOperationsPending |
+                                                   VALIDATE_FONTS |
+                                                   SHAPE_TEXT |
+                                                   BIDI_INFO |
+                                                   GET_GLYPH_METRICS |
+                                                   LAYOUT |
+                                                   UPDATE_LAYOUT_SIZE |
+                                                   REORDER |
+                                                   ALIGN);
+}
+
+void Controller::Impl::ClearStyleData()
+{
+  mModel->mLogicalModel->mColorRuns.Clear();
+  mModel->mLogicalModel->ClearFontDescriptionRuns();
+  mModel->mLogicalModel->ClearStrikethroughRuns();
+  mModel->mLogicalModel->ClearUnderlineRuns();
+}
+
+void Controller::Impl::ResetScrollPosition()
+{
+  if(mEventData)
+  {
+    // Reset the scroll position.
+    mModel->mScrollPosition                = Vector2::ZERO;
+    mEventData->mScrollAfterUpdatePosition = true;
+  }
+}
+
+} // namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/controller/text-controller-impl.h b/dali-toolkit/internal/text/controller/text-controller-impl.h
new file mode 100644
index 0000000..56ca85b
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-impl.h
@@ -0,0 +1,1122 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/public-api/rendering/shader.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/input-style.h>
+#include <dali-toolkit/internal/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/text-model.h>
+#include <dali-toolkit/internal/text/text-view.h>
+#include <dali-toolkit/public-api/styling/style-manager.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+const float DEFAULT_TEXTFIT_MIN            = 10.f;
+const float DEFAULT_TEXTFIT_MAX            = 100.f;
+const float DEFAULT_TEXTFIT_STEP           = 1.f;
+const float DEFAULT_FONT_SIZE_SCALE        = 1.f;
+const float DEFAULT_DISABLED_COLOR_OPACITY = 0.3f;
+
+//Forward declarations
+struct CursorInfo;
+struct FontDefaults;
+struct ControllerImplEventHandler;
+struct ControllerImplModelUpdater;
+struct SelectionHandleController;
+
+class SelectableControlInterface;
+class AnchorControlInterface;
+
+struct Event
+{
+  // Used to queue input events until DoRelayout()
+  enum Type
+  {
+    CURSOR_KEY_EVENT,
+    TAP_EVENT,
+    PAN_EVENT,
+    LONG_PRESS_EVENT,
+    GRAB_HANDLE_EVENT,
+    LEFT_SELECTION_HANDLE_EVENT,
+    RIGHT_SELECTION_HANDLE_EVENT,
+    SELECT,
+    SELECT_ALL,
+    SELECT_NONE,
+    SELECT_RANGE,
+  };
+
+  union Param
+  {
+    int          mInt;
+    unsigned int mUint;
+    float        mFloat;
+    bool         mBool;
+  };
+
+  Event(Type eventType)
+  : type(eventType)
+  {
+    p1.mInt = 0;
+    p2.mInt = 0;
+    p3.mInt = 0;
+  }
+
+  Type  type;
+  Param p1;
+  Param p2;
+  Param p3;
+};
+
+struct EventData
+{
+  enum State
+  {
+    INACTIVE,
+    INTERRUPTED,
+    SELECTING,
+    EDITING,
+    EDITING_WITH_POPUP,
+    EDITING_WITH_GRAB_HANDLE,
+    EDITING_WITH_PASTE_POPUP,
+    GRAB_HANDLE_PANNING,
+    SELECTION_HANDLE_PANNING,
+    TEXT_PANNING
+  };
+
+  EventData(DecoratorPtr decorator, InputMethodContext& inputMethodContext);
+
+  ~EventData() = default;
+
+  static bool IsEditingState(State stateToCheck)
+  {
+    return (stateToCheck == EDITING || stateToCheck == EDITING_WITH_POPUP || stateToCheck == EDITING_WITH_GRAB_HANDLE || stateToCheck == EDITING_WITH_PASTE_POPUP);
+  }
+
+  DecoratorPtr                  mDecorator;               ///< Pointer to the decorator.
+  InputMethodContext            mInputMethodContext;      ///< The Input Method Framework Manager.
+  std::unique_ptr<FontDefaults> mPlaceholderFont;         ///< The placeholder default font.
+  std::string                   mPlaceholderTextActive;   ///< The text to display when the TextField is empty with key-input focus.
+  std::string                   mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
+  Vector4                       mPlaceholderTextColor;    ///< The in/active placeholder text color.
+
+  /**
+   * This is used to delay handling events until after the model has been updated.
+   * The number of updates to the model is minimized to improve performance.
+   */
+  std::vector<Event> mEventQueue; ///< The queue of touch events etc.
+
+  Vector<InputStyle::Mask> mInputStyleChangedQueue; ///< Queue of changes in the input style. Used to emit the signal in the iddle callback.
+
+  InputStyle mInputStyle; ///< The style to be set to the new inputed text.
+
+  State mPreviousState; ///< Stores the current state before it's updated with the new one.
+  State mState;         ///< Selection mode, edit mode etc.
+
+  CharacterIndex mPrimaryCursorPosition;  ///< Index into logical model for primary cursor.
+  CharacterIndex mLeftSelectionPosition;  ///< Index into logical model for left selection handle.
+  CharacterIndex mRightSelectionPosition; ///< Index into logical model for right selection handle.
+
+  CharacterIndex mPreEditStartPosition; ///< Used to remove the pre-edit text if necessary.
+  Length         mPreEditLength;        ///< Used to remove the pre-edit text if necessary.
+
+  float mCursorHookPositionX; ///< Used to move the cursor with the keys or when scrolling the text vertically with the handles.
+
+  Controller::NoTextTap::Action mDoubleTapAction; ///< Action to be done when there is a double tap on top of 'no text'
+  Controller::NoTextTap::Action mLongPressAction; ///< Action to be done when there is a long press on top of 'no text'
+
+  bool mIsShowingPlaceholderText : 1;     ///< True if the place-holder text is being displayed.
+  bool mPreEditFlag : 1;                  ///< True if the model contains text in pre-edit state.
+  bool mDecoratorUpdated : 1;             ///< True if the decorator was updated during event processing.
+  bool mCursorBlinkEnabled : 1;           ///< True if cursor should blink when active.
+  bool mGrabHandleEnabled : 1;            ///< True if grab handle is enabled.
+  bool mGrabHandlePopupEnabled : 1;       ///< True if the grab handle popu-up should be shown.
+  bool mSelectionEnabled : 1;             ///< True if selection handles, highlight etc. are enabled.
+  bool mUpdateCursorHookPosition : 1;     ///< True if the cursor hook position must be updated. Used to move the cursor with the keys 'up' and 'down'.
+  bool mUpdateCursorPosition : 1;         ///< True if the visual position of the cursor must be recalculated.
+  bool mUpdateGrabHandlePosition : 1;     ///< True if the visual position of the grab handle must be recalculated.
+  bool mUpdateLeftSelectionPosition : 1;  ///< True if the visual position of the left selection handle must be recalculated.
+  bool mUpdateRightSelectionPosition : 1; ///< True if the visual position of the right selection handle must be recalculated.
+  bool mIsLeftHandleSelected : 1;         ///< Whether is the left handle the one which is selected.
+  bool mIsRightHandleSelected : 1;        ///< Whether is the right handle the one which is selected.
+  bool mUpdateHighlightBox : 1;           ///< True if the text selection high light box must be updated.
+  bool mScrollAfterUpdatePosition : 1;    ///< Whether to scroll after the cursor position is updated.
+  bool mScrollAfterDelete : 1;            ///< Whether to scroll after delete characters.
+  bool mAllTextSelected : 1;              ///< True if the selection handles are selecting all the text.
+  bool mUpdateInputStyle : 1;             ///< Whether to update the input style after moving the cursor.
+  bool mPasswordInput : 1;                ///< True if password input is enabled.
+  bool mCheckScrollAmount : 1;            ///< Whether to check scrolled amount after updating the position
+  bool mIsPlaceholderPixelSize : 1;       ///< True if the placeholder font size is set as pixel size.
+  bool mIsPlaceholderElideEnabled : 1;    ///< True if the placeholder text's elide is enabled.
+  bool mPlaceholderEllipsisFlag : 1;      ///< True if the text controller sets the placeholder ellipsis.
+  bool mShiftSelectionFlag : 1;           ///< True if the text selection using Shift key is enabled.
+  bool mUpdateAlignment : 1;              ///< True if the whole text needs to be full aligned..
+  bool mEditingEnabled : 1;               ///< True if the editing is enabled, false otherwise.
+};
+
+struct ModifyEvent
+{
+  enum Type
+  {
+    TEXT_REPLACED, ///< The entire text was replaced
+    TEXT_INSERTED, ///< Insert characters at the current cursor position
+    TEXT_DELETED   ///< Characters were deleted
+  };
+
+  Type type;
+};
+
+struct FontDefaults
+{
+  FontDefaults()
+  : mFontDescription(),
+    mDefaultPointSize(0.f),
+    mFitPointSize(0.f),
+    mFontId(0u),
+    familyDefined(false),
+    weightDefined(false),
+    widthDefined(false),
+    slantDefined(false),
+    sizeDefined(false)
+  {
+    // Initially use the default platform font
+    TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+    fontClient.GetDefaultPlatformFontDescription(mFontDescription);
+  }
+
+  FontId GetFontId(TextAbstraction::FontClient& fontClient, float fontPointSize)
+  {
+    if(!mFontId)
+    {
+      const PointSize26Dot6 pointSize = static_cast<PointSize26Dot6>(fontPointSize * 64.f);
+      mFontId                         = fontClient.GetFontId(mFontDescription, pointSize);
+    }
+
+    return mFontId;
+  }
+
+  TextAbstraction::FontDescription mFontDescription;  ///< The default font's description.
+  float                            mDefaultPointSize; ///< The default font's point size.
+  float                            mFitPointSize;     ///< The fit font's point size.
+  FontId                           mFontId;           ///< The font's id of the default font.
+  bool                             familyDefined : 1; ///< Whether the default font's family name is defined.
+  bool                             weightDefined : 1; ///< Whether the default font's weight is defined.
+  bool                             widthDefined : 1;  ///< Whether the default font's width is defined.
+  bool                             slantDefined : 1;  ///< Whether the default font's slant is defined.
+  bool                             sizeDefined : 1;   ///< Whether the default font's point size is defined.
+};
+
+/**
+ * @brief Stores indices used to update the text.
+ * Stores the character index where the text is updated and the number of characters removed and added.
+ * Stores as well indices to the first and the last paragraphs to be updated.
+ */
+struct TextUpdateInfo
+{
+  TextUpdateInfo()
+  : mCharacterIndex(0u),
+    mNumberOfCharactersToRemove(0u),
+    mNumberOfCharactersToAdd(0u),
+    mPreviousNumberOfCharacters(0u),
+    mParagraphCharacterIndex(0u),
+    mRequestedNumberOfCharacters(0u),
+    mStartGlyphIndex(0u),
+    mStartLineIndex(0u),
+    mEstimatedNumberOfLines(0u),
+    mClearAll(true),
+    mFullRelayoutNeeded(true),
+    mIsLastCharacterNewParagraph(false)
+  {
+  }
+
+  ~TextUpdateInfo()
+  {
+  }
+
+  CharacterIndex mCharacterIndex;             ///< Index to the first character to be updated.
+  Length         mNumberOfCharactersToRemove; ///< The number of characters to be removed.
+  Length         mNumberOfCharactersToAdd;    ///< The number of characters to be added.
+  Length         mPreviousNumberOfCharacters; ///< The number of characters before the text update.
+
+  CharacterIndex mParagraphCharacterIndex;     ///< Index of the first character of the first paragraph to be updated.
+  Length         mRequestedNumberOfCharacters; ///< The requested number of characters.
+  GlyphIndex     mStartGlyphIndex;
+  LineIndex      mStartLineIndex;
+  Length         mEstimatedNumberOfLines; ///< The estimated number of lines. Used to avoid reallocations when layouting.
+
+  bool mClearAll : 1;                    ///< Whether the whole text is cleared. i.e. when the text is reset.
+  bool mFullRelayoutNeeded : 1;          ///< Whether a full re-layout is needed. i.e. when a new size is set to the text control.
+  bool mIsLastCharacterNewParagraph : 1; ///< Whether the last character is a new paragraph character.
+
+  void Clear()
+  {
+    // Clear all info except the mPreviousNumberOfCharacters member.
+    mCharacterIndex              = static_cast<CharacterIndex>(-1);
+    mNumberOfCharactersToRemove  = 0u;
+    mNumberOfCharactersToAdd     = 0u;
+    mParagraphCharacterIndex     = 0u;
+    mRequestedNumberOfCharacters = 0u;
+    mStartGlyphIndex             = 0u;
+    mStartLineIndex              = 0u;
+    mEstimatedNumberOfLines      = 0u;
+    mClearAll                    = false;
+    mFullRelayoutNeeded          = false;
+    mIsLastCharacterNewParagraph = false;
+  }
+};
+
+struct UnderlineDefaults
+{
+  std::string properties;
+  // TODO: complete with underline parameters.
+};
+
+struct ShadowDefaults
+{
+  std::string properties;
+  // TODO: complete with shadow parameters.
+};
+
+struct EmbossDefaults
+{
+  std::string properties;
+  // TODO: complete with emboss parameters.
+};
+
+struct OutlineDefaults
+{
+  std::string properties;
+  // TODO: complete with outline parameters.
+};
+
+struct Controller::Impl
+{
+  Impl(ControlInterface*           controlInterface,
+       EditableControlInterface*   editableControlInterface,
+       SelectableControlInterface* selectableControlInterface,
+       AnchorControlInterface*     anchorControlInterface)
+  : mControlInterface(controlInterface),
+    mEditableControlInterface(editableControlInterface),
+    mSelectableControlInterface(selectableControlInterface),
+    mAnchorControlInterface(anchorControlInterface),
+    mModel(),
+    mFontDefaults(NULL),
+    mUnderlineDefaults(NULL),
+    mShadowDefaults(NULL),
+    mEmbossDefaults(NULL),
+    mOutlineDefaults(NULL),
+    mEventData(NULL),
+    mIdleCallback(NULL),
+    mFontClient(),
+    mClipboard(),
+    mView(),
+    mMetrics(),
+    mModifyEvents(),
+    mTextColor(Color::BLACK),
+    mAnchorColor(Color::MEDIUM_BLUE),
+    mAnchorClickedColor(Color::DARK_MAGENTA),
+    mTextUpdateInfo(),
+    mOperationsPending(NO_OPERATION),
+    mMaximumNumberOfCharacters(50u),
+    mHiddenInput(NULL),
+    mInputFilter(nullptr),
+    mTextFitContentSize(),
+    mTextFitArray(),
+    mRecalculateNaturalSize(true),
+    mMarkupProcessorEnabled(false),
+    mClipboardHideEnabled(true),
+    mIsAutoScrollEnabled(false),
+    mIsAutoScrollMaxTextureExceeded(false),
+    mUpdateTextDirection(true),
+    mIsTextDirectionRTL(false),
+    mUnderlineSetByString(false),
+    mShadowSetByString(false),
+    mOutlineSetByString(false),
+    mFontStyleSetByString(false),
+    mStrikethroughSetByString(false),
+    mShouldClearFocusOnEscape(true),
+    mLayoutDirection(LayoutDirection::LEFT_TO_RIGHT),
+    mCurrentLineSize(0.f),
+    mTextFitMinSize(DEFAULT_TEXTFIT_MIN),
+    mTextFitMaxSize(DEFAULT_TEXTFIT_MAX),
+    mTextFitStepSize(DEFAULT_TEXTFIT_STEP),
+    mTextFitLineSize(0.f),
+    mFontSizeScale(DEFAULT_FONT_SIZE_SCALE),
+    mDisabledColorOpacity(DEFAULT_DISABLED_COLOR_OPACITY),
+    mFontSizeScaleEnabled(true),
+    mTextFitEnabled(false),
+    mTextFitChanged(false),
+    mTextFitArrayEnabled(false),
+    mIsLayoutDirectionChanged(false),
+    mIsUserInteractionEnabled(true),
+    mProcessorRegistered(false)
+  {
+    mModel = Model::New();
+
+    mFontClient = TextAbstraction::FontClient::Get();
+    if(mEditableControlInterface != nullptr && Clipboard::IsAvailable())
+    {
+      mClipboard = Clipboard::Get();
+    }
+
+    mView.SetVisualModel(mModel->mVisualModel);
+    mView.SetLogicalModel(mModel->mLogicalModel);
+
+    // Use this to access FontClient i.e. to get down-scaled Emoji metrics.
+    mMetrics = Metrics::New(mFontClient);
+    mLayoutEngine.SetMetrics(mMetrics);
+
+    // Set the text properties to default
+    mModel->mVisualModel->SetUnderlineEnabled(false);
+    mModel->mVisualModel->SetUnderlineHeight(0.0f);
+
+    Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+    if(styleManager)
+    {
+      const auto clearFocusOnEscapeValue = Toolkit::DevelStyleManager::GetConfigurations(styleManager).Find("clearFocusOnEscape", Property::Type::BOOLEAN);
+
+      // Default is true. If config don't have "clearFocusOnEscape" property, make it true.
+      mShouldClearFocusOnEscape = (!clearFocusOnEscapeValue || clearFocusOnEscapeValue->Get<bool>());
+    }
+  }
+
+  ~Impl()
+  {
+    delete mHiddenInput;
+    delete mFontDefaults;
+    delete mUnderlineDefaults;
+    delete mShadowDefaults;
+    delete mEmbossDefaults;
+    delete mOutlineDefaults;
+    delete mEventData;
+  }
+
+  // Text Controller Implementation.
+
+  /**
+   * @copydoc Text::Controller::RequestRelayout()
+   */
+  void RequestRelayout();
+
+  /**
+   * @brief Request a relayout using the ControlInterface.
+   */
+  void QueueModifyEvent(ModifyEvent::Type type)
+  {
+    if(ModifyEvent::TEXT_REPLACED == type)
+    {
+      // Cancel previously queued inserts etc.
+      mModifyEvents.Clear();
+    }
+
+    ModifyEvent event;
+    event.type = type;
+    mModifyEvents.PushBack(event);
+
+    // The event will be processed during relayout
+    RequestRelayout();
+  }
+
+  /**
+   * @copydoc Text::Controller::ResetFontAndStyleData()
+   */
+  void ResetFontAndStyleData()
+  {
+    ClearFontData();
+    ClearStyleData();
+    RequestRelayout();
+  }
+
+  /**
+   * @brief Helper to move the cursor, grab handle etc.
+   */
+  bool ProcessInputEvents();
+
+  /**
+   * @brief Helper to check whether any place-holder text is available.
+   */
+  bool IsPlaceholderAvailable() const
+  {
+    return (mEventData &&
+            (!mEventData->mPlaceholderTextInactive.empty() ||
+             !mEventData->mPlaceholderTextActive.empty()));
+  }
+
+  bool IsShowingPlaceholderText() const
+  {
+    return (mEventData && mEventData->mIsShowingPlaceholderText);
+  }
+
+  /**
+   * @brief Helper to check whether active place-holder text is available.
+   */
+  bool IsFocusedPlaceholderAvailable() const
+  {
+    return (mEventData && !mEventData->mPlaceholderTextActive.empty());
+  }
+
+  bool IsShowingRealText() const
+  {
+    return (!IsShowingPlaceholderText() &&
+            0u != mModel->mLogicalModel->mText.Count());
+  }
+
+  /**
+   * @brief Called when placeholder-text is hidden
+   */
+  void PlaceholderCleared()
+  {
+    if(mEventData)
+    {
+      mEventData->mIsShowingPlaceholderText = false;
+
+      // Remove mPlaceholderTextColor
+      mModel->mVisualModel->SetTextColor(mTextColor);
+    }
+  }
+
+  void ClearPreEditFlag()
+  {
+    if(mEventData)
+    {
+      mEventData->mPreEditFlag          = false;
+      mEventData->mPreEditStartPosition = 0;
+      mEventData->mPreEditLength        = 0;
+    }
+  }
+
+  void ResetInputMethodContext()
+  {
+    if(mEventData)
+    {
+      // Reset incase we are in a pre-edit state.
+      if(mEventData->mInputMethodContext)
+      {
+        mEventData->mInputMethodContext.Reset(); // Will trigger a message ( commit, get surrounding )
+      }
+
+      ClearPreEditFlag();
+    }
+  }
+
+  float GetFontSizeScale()
+  {
+    return mFontSizeScaleEnabled ? mFontSizeScale : 1.0f;
+  }
+
+  /**
+   * @copydoc Controller::SetAnchorColor()
+   */
+  void SetAnchorColor(const Vector4& color);
+
+  /**
+   * @copydoc Controller::GetAnchorColor()
+   */
+  const Vector4& GetAnchorColor() const;
+
+  /**
+   * @copydoc Controller::SetAnchorClickedColor()
+   */
+  void SetAnchorClickedColor(const Vector4& color);
+
+  /**
+   * @copydoc Controller::GetAnchorClickedColor()
+   */
+  const Vector4& GetAnchorClickedColor() const;
+
+  /**
+   * @brief Updates the color of anchors.
+   */
+  void UpdateAnchorColor();
+
+  /**
+   * @brief Helper to notify InputMethodContext with surrounding text & cursor changes.
+   */
+  void NotifyInputMethodContext();
+
+  /**
+   * @brief Helper to notify InputMethodContext with multi line status.
+   */
+  void NotifyInputMethodContextMultiLineStatus();
+
+  /**
+   * @brief Retrieve the current cursor position.
+   *
+   * @return The cursor position.
+   */
+  CharacterIndex GetLogicalCursorPosition() const;
+
+  /**
+   * @brief Retrieves the number of consecutive white spaces starting from the given @p index.
+   *
+   * @param[in] index The character index from where to count the number of consecutive white spaces.
+   *
+   * @return The number of consecutive white spaces.
+   */
+  Length GetNumberOfWhiteSpaces(CharacterIndex index) const;
+
+  /**
+   * @brief Retrieve any text previously set.
+   *
+   * @param[out] text A string of UTF-8 characters.
+   */
+  void GetText(std::string& text) const;
+
+  /**
+   * @brief Retrieve any text previously set starting from the given @p index.
+   *
+   * @param[in] index The character index from where to retrieve the text.
+   * @param[out] text A string of UTF-8 characters.
+   *
+   * @see Dali::Toolkit::Text::Controller::GetText()
+   */
+  void GetText(CharacterIndex index, std::string& text) const;
+
+  /**
+   * @brief Retrieves number of characters previously set.
+   *
+   * @return A length of UTF-32 characters.
+   *
+   * @see Dali::Toolkit::Text::Controller::GetNumberOfCharacters()
+   */
+  Length GetNumberOfCharacters() const;
+
+  bool EnsureClipboardCreated()
+  {
+    if(!mClipboard)
+    {
+      mClipboard = Clipboard::Get();
+    }
+
+    return mClipboard != nullptr ? true : false;
+  }
+
+  bool IsClipboardEmpty()
+  {
+    bool result(Clipboard::IsAvailable() && EnsureClipboardCreated() && mClipboard.NumberOfItems());
+    return !result; // If NumberOfItems greater than 0, return false
+  }
+
+  bool IsClipboardVisible()
+  {
+    bool result(Clipboard::IsAvailable() && EnsureClipboardCreated() && mClipboard.IsVisible());
+    return result;
+  }
+
+  /**
+   * @copydoc Controller::GetLayoutDirection()
+   */
+  Dali::LayoutDirection::Type GetLayoutDirection(Dali::Actor& actor) const;
+
+  /**
+   * @brief Checks text direction.
+   * @return The text direction.
+   */
+  Toolkit::DevelText::TextDirection::Type GetTextDirection();
+
+  /**
+   * @brief Calculates the start character index of the first paragraph to be updated and
+   * the end character index of the last paragraph to be updated.
+   *
+   * @param[out] numberOfCharacters The number of characters to be updated.
+   */
+  void CalculateTextUpdateIndices(Length& numberOfCharacters);
+
+  /**
+   * @brief Helper to clear the parts of the model specified by the given @p operations and from @p startIndex to @p endIndex.
+   *
+   * @note It never clears the text stored in utf32.
+   *
+   * @param[in] startIndex Index to the first character to be cleared.
+   * @param[in] endIndex Index to the last character to be cleared.
+   * @param[in] operations The operations required.
+   */
+  void ClearModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations);
+
+  /**
+   * @brief Updates the logical and visual models. Updates the style runs in the visual model when the text's styles changes.
+   *
+   * When text or style changes the model is set with some operations pending.
+   * When i.e. the text's size or a relayout is required this method is called
+   * with a given @p operationsRequired parameter. The operations required are
+   * matched with the operations pending to perform the minimum number of operations.
+   *
+   * @param[in] operationsRequired The operations required.
+   *
+   * @return @e true if the model has been modified.
+   */
+  bool UpdateModel(OperationsMask operationsRequired);
+
+  /**
+   * @brief Retreieves the default style.
+   *
+   * @param[out] inputStyle The default style.
+   */
+  void RetrieveDefaultInputStyle(InputStyle& inputStyle);
+
+  /**
+   * @brief Retrieve the line height of the default font.
+   */
+  float GetDefaultFontLineHeight();
+
+  /**
+   * @copydoc Controller::SetDefaultLineSpacing
+   */
+  bool SetDefaultLineSpacing(float lineSpacing);
+
+  /**
+   * @copydoc Controller::SetDefaultLineSize
+   */
+  bool SetDefaultLineSize(float lineSize);
+
+  /**
+   * @copydoc Controller::SetRelativeLineSize
+   */
+  bool SetRelativeLineSize(float relativeLineSize);
+
+  /**
+   * @copydoc Controller::GetRelativeLineSize
+   */
+  float GetRelativeLineSize();
+
+  /**
+   * @copydoc Text::Controller::GetPrimaryCursorPosition()
+   */
+  CharacterIndex GetPrimaryCursorPosition() const;
+
+  /**
+   * @copydoc Text::Controller::SetPrimaryCursorPosition()
+   */
+  bool SetPrimaryCursorPosition(CharacterIndex index, bool focused);
+
+  /**
+   * @copydoc Text::SelectableControlInterface::GetSelectedText()
+   */
+  string GetSelectedText();
+
+  /**
+   * @copydoc Text::EditableControlInterface::CopyText()
+   */
+  string CopyText();
+
+  /**
+   * @copydoc Text::EditableControlInterface::CutText()
+   */
+  string CutText();
+
+  /**
+   * @copydoc Text::SelectableControlInterface::SetTextSelectionRange()
+   */
+  void SetTextSelectionRange(const uint32_t* pStart, const uint32_t* pEndf);
+
+  /**
+   * @copydoc Text::SelectableControlInterface::GetTextSelectionRange()
+   */
+  Uint32Pair GetTextSelectionRange() const;
+
+  /**
+   * @copydoc Text::EditableControlInterface::IsEditable()
+   */
+  bool IsEditable() const;
+
+  /**
+   * @copydoc Text::EditableControlInterface::SetEditable()
+   */
+  void SetEditable(bool editable);
+
+  /**
+   * @copydoc Controller::UpdateAfterFontChange
+   */
+  void UpdateAfterFontChange(const std::string& newDefaultFont);
+
+  /**
+   * @brief Retrieves the selected text. It removes the text if the @p deleteAfterRetrieval parameter is @e true.
+   *
+   * @param[out] selectedText The selected text encoded in utf8.
+   * @param[in] deleteAfterRetrieval Whether the text should be deleted after retrieval.
+   */
+  void RetrieveSelection(std::string& selectedText, bool deleteAfterRetrieval);
+
+  void SetSelection(int start, int end);
+
+  std::pair<int, int> GetSelectionIndexes() const;
+
+  void ShowClipboard();
+
+  void HideClipboard();
+
+  void SetClipboardHideEnable(bool enable);
+
+  bool CopyStringToClipboard(const std::string& source);
+
+  void SendSelectionToClipboard(bool deleteAfterSending);
+
+  void RepositionSelectionHandles();
+  void RepositionSelectionHandles(float visualX, float visualY, Controller::NoTextTap::Action action);
+
+  void SetPopupButtons();
+
+  void ChangeState(EventData::State newState);
+
+  /**
+   * @brief Calculates the cursor's position for a given character index in the logical order.
+   *
+   * It retrieves as well the line's height and the cursor's height and
+   * if there is a valid alternative cursor, its position and height.
+   *
+   * @param[in] logical The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
+   * @param[out] cursorInfo The line's height, the cursor's height, the cursor's position and whether there is an alternative cursor.
+   */
+  void GetCursorPosition(CharacterIndex logical,
+                         CursorInfo&    cursorInfo);
+
+  /**
+   * @brief Calculates the new cursor index.
+   *
+   * It takes into account that in some scripts multiple characters can form a glyph and all of them
+   * need to be jumped with one key event.
+   *
+   * @param[in] index The initial new index.
+   *
+   * @return The new cursor index.
+   */
+  CharacterIndex CalculateNewCursorIndex(CharacterIndex index) const;
+
+  /**
+   * @brief Updates the cursor position.
+   *
+   * Sets the cursor's position into the decorator. It transforms the cursor's position into decorator's coords.
+   * It sets the position of the secondary cursor if it's a valid one.
+   * Sets which cursors are active.
+   *
+   * @param[in] cursorInfo Contains the selection handle position in Actor's coords.
+   *
+   */
+  void UpdateCursorPosition(const CursorInfo& cursorInfo);
+
+  /**
+   * @brief Updates the position of the given selection handle. It transforms the handle's position into decorator's coords.
+   *
+   * @param[in] handleType One of the selection handles.
+   * @param[in] cursorInfo Contains the selection handle position in Actor's coords.
+   */
+  void UpdateSelectionHandle(HandleType        handleType,
+                             const CursorInfo& cursorInfo);
+
+  /**
+   * @biref Clamps the horizontal scrolling to get the control always filled with text.
+   *
+   * @param[in] layoutSize The size of the laid out text.
+   */
+  void ClampHorizontalScroll(const Vector2& layoutSize);
+
+  /**
+   * @biref Clamps the vertical scrolling to get the control always filled with text.
+   *
+   * @param[in] layoutSize The size of the laid out text.
+   */
+  void ClampVerticalScroll(const Vector2& layoutSize);
+
+  /**
+   * @brief Scrolls the text to make a position visible.
+   *
+   * @pre mEventData must not be NULL. (there is a text-input or selection capabilities).
+   *
+   * @param[in] position A position in text coords.
+   * @param[in] lineHeight The line height for the given position.
+   *
+   * This method is called after inserting text, moving the cursor with the grab handle or the keypad,
+   * or moving the selection handles.
+   */
+  void ScrollToMakePositionVisible(const Vector2& position, float lineHeight);
+
+  /**
+   * @brief Scrolls the text to make the cursor visible.
+   *
+   * This method is called after deleting text.
+   */
+  void ScrollTextToMatchCursor(const CursorInfo& cursorInfo);
+
+  /**
+   * @brief Scrolls the text to make primary cursor visible.
+   */
+  void ScrollTextToMatchCursor();
+
+  /**
+   * @brief Create an actor that renders the text background color
+   *
+   * @return the created actor or an empty handle if no background color needs to be rendered.
+   */
+  Actor CreateBackgroundActor();
+
+  /**
+   * @brief fill needed relayout parameters whenever a property is changed and a re-layout is needed for the entire text.
+   */
+  void RelayoutAllCharacters();
+
+  /**
+   * @copydoc Controller::IsInputStyleChangedSignalsQueueEmpty
+   */
+  bool IsInputStyleChangedSignalsQueueEmpty();
+
+  /**
+   * @copydoc Controller::ProcessInputStyleChangedSignals
+   */
+  void ProcessInputStyleChangedSignals();
+
+  /**
+   * @copydoc Controller::ScrollBy()
+   */
+  void ScrollBy(Vector2 scroll);
+
+  /**
+   * @copydoc Controller::IsScrollable()
+   */
+  bool IsScrollable(const Vector2& displacement);
+
+  /**
+   * @copydoc Controller::GetHorizontalScrollPosition()
+   */
+  float GetHorizontalScrollPosition();
+
+  /**
+   * @copydoc Controller::GetVerticalScrollPosition()
+   */
+  float GetVerticalScrollPosition();
+
+  /**
+   * @copydoc Controller::SetAutoScrollEnabled()
+   */
+  void SetAutoScrollEnabled(bool enable);
+
+  /**
+   * @copydoc Controller::SetEnableCursorBlink()
+   */
+  void SetEnableCursorBlink(bool enable);
+
+  /**
+   * @copydoc Controller::SetMultiLineEnabled()
+   */
+  void SetMultiLineEnabled(bool enable);
+
+  /**
+   * @copydoc Controller::SetHorizontalAlignment()
+   */
+  void SetHorizontalAlignment(HorizontalAlignment::Type alignment);
+
+  /**
+   * @copydoc Controller::SetVerticalAlignment()
+   */
+  void SetVerticalAlignment(VerticalAlignment::Type alignment);
+
+  /**
+   * @copydoc Controller::SetLineWrapMode()
+   */
+  void SetLineWrapMode(Text::LineWrap::Mode textWarpMode);
+
+  /**
+   * @copydoc Controller::SetDefaultColor()
+   */
+  void SetDefaultColor(const Vector4& color);
+
+  /**
+   * @copydoc Controller::SetUserInteractionEnabled()
+   */
+  void SetUserInteractionEnabled(bool enabled);
+
+  /**
+   * @brief Helper to clear font-specific data (only).
+   */
+  void ClearFontData();
+
+  /**
+   * @brief Helper to clear text's style data.
+   */
+  void ClearStyleData();
+
+  /**
+   * @brief Used to reset the scroll position after setting a new text.
+   */
+  void ResetScrollPosition();
+
+  /**
+   * @brief Resets a provided vector with actors that marks the position of anchors in markup enabled text
+   *
+   * @param[out] anchorActors the vector of actor (empty collection if no anchors available).
+   */
+  void GetAnchorActors(std::vector<Toolkit::TextAnchor>& anchorActors);
+
+  /**
+   * @brief Return an index of first anchor in the anchor vector whose boundaries includes given character offset
+   *
+   * @param[in] characterOffset A position in text coords.
+   *
+   * @return the 0-based index in anchor vector (-1 if an anchor not found)
+   */
+  int32_t GetAnchorIndex(size_t characterOffset) const;
+
+  /**
+   * @brief Return the geometrical position of an anchor relative to the parent origin point.
+   *
+   * @param[in] anchor An anchor.
+   *
+   * @return The x, y, z coordinates of an anchor.
+   */
+  Vector3 GetAnchorPosition(Anchor anchor) const;
+
+  /**
+   * @brief Return the size of an anchor expresed as a vector containing anchor's width and height.
+   *
+   * @param[in] anchor An anchor.
+   *
+   * @return The width and height of an anchor.
+   */
+  Vector2 GetAnchorSize(Anchor anchor) const;
+
+  /**
+   * @brief Return the actor representing an anchor.
+   *
+   * @param[in] anchor An anchor.
+   *
+   * @return The actor representing an anchor.
+   */
+  Toolkit::TextAnchor CreateAnchorActor(Anchor anchor);
+
+public:
+  /**
+   * @brief Gets implementation from the controller handle.
+   * @param controller The text controller
+   * @return The implementation of the Controller
+   */
+  static Impl& GetImplementation(Text::Controller& controller)
+  {
+    return *controller.mImpl;
+  }
+
+private:
+  // Declared private and left undefined to avoid copies.
+  Impl(const Impl&);
+  // Declared private and left undefined to avoid copies.
+  Impl& operator=(const Impl&);
+
+  /**
+   * @brief Copy Underlined-Character-Runs from Logical-Model to Underlined-Glyph-Runs in Visual-Model
+   *
+   * @param shouldClearPreUnderlineRuns Whether should clear the existing Underlined-Glyph-Runs in Visual-Model
+   */
+  void CopyUnderlinedFromLogicalToVisualModels(bool shouldClearPreUnderlineRuns);
+
+  /**
+   * @brief Copy strikethrough-Character-Runs from Logical-Model to strikethrough-Glyph-Runs in Visual-Model
+   *
+   */
+  void CopyStrikethroughFromLogicalToVisualModels();
+
+  /**
+   * @brief Copy CharacterSpacing-Character-Runs from Logical-Model to CharacterSpacing-Glyph-Runs in Visual-Model
+   *
+   */
+  void CopyCharacterSpacingFromLogicalToVisualModels();
+
+public:
+  ControlInterface*            mControlInterface;           ///< Reference to the text controller.
+  EditableControlInterface*    mEditableControlInterface;   ///< Reference to the editable text controller.
+  SelectableControlInterface*  mSelectableControlInterface; ///< Reference to the selectable text controller.
+  AnchorControlInterface*      mAnchorControlInterface;     ///< Reference to the anchor controller.
+  ModelPtr                     mModel;                      ///< Pointer to the text's model.
+  FontDefaults*                mFontDefaults;               ///< Avoid allocating this when the user does not specify a font.
+  UnderlineDefaults*           mUnderlineDefaults;          ///< Avoid allocating this when the user does not specify underline parameters.
+  ShadowDefaults*              mShadowDefaults;             ///< Avoid allocating this when the user does not specify shadow parameters.
+  EmbossDefaults*              mEmbossDefaults;             ///< Avoid allocating this when the user does not specify emboss parameters.
+  OutlineDefaults*             mOutlineDefaults;            ///< Avoid allocating this when the user does not specify outline parameters.
+  EventData*                   mEventData;                  ///< Avoid allocating everything for text input until EnableTextInput().
+  CallbackBase*                mIdleCallback;               ///< Callback what would be called at idler
+  TextAbstraction::FontClient  mFontClient;                 ///< Handle to the font client.
+  Clipboard                    mClipboard;                  ///< Handle to the system clipboard
+  View                         mView;                       ///< The view interface to the rendering back-end.
+  MetricsPtr                   mMetrics;                    ///< A wrapper around FontClient used to get metrics & potentially down-scaled Emoji metrics.
+  Layout::Engine               mLayoutEngine;               ///< The layout engine.
+  Vector<ModifyEvent>          mModifyEvents;               ///< Temporary stores the text set until the next relayout.
+  Vector4                      mTextColor;                  ///< The regular text color
+  Vector4                      mAnchorColor;                ///< The anchor color
+  Vector4                      mAnchorClickedColor;         ///< The anchor clicked color
+  TextUpdateInfo               mTextUpdateInfo;             ///< Info of the characters updated.
+  OperationsMask               mOperationsPending;          ///< Operations pending to be done to layout the text.
+  Length                       mMaximumNumberOfCharacters;  ///< Maximum number of characters that can be inserted.
+  HiddenText*                  mHiddenInput;                ///< Avoid allocating this when the user does not specify hidden input mode.
+  std::unique_ptr<InputFilter> mInputFilter;                ///< Avoid allocating this when the user does not specify input filter mode.
+  Vector2                      mTextFitContentSize;         ///< Size of Text fit content
+
+  std::vector<Toolkit::DevelTextLabel::FitOption> mTextFitArray; ///< List of FitOption for TextFitArray operation.
+
+  bool               mRecalculateNaturalSize : 1;         ///< Whether the natural size needs to be recalculated.
+  bool               mMarkupProcessorEnabled : 1;         ///< Whether the mark-up procesor is enabled.
+  bool               mClipboardHideEnabled : 1;           ///< Whether the ClipboardHide function work or not
+  bool               mIsAutoScrollEnabled : 1;            ///< Whether auto text scrolling is enabled.
+  bool               mIsAutoScrollMaxTextureExceeded : 1; ///< Whether auto text scrolling is exceed max texture size.
+  bool               mUpdateTextDirection : 1;            ///< Whether the text direction needs to be updated.
+  CharacterDirection mIsTextDirectionRTL : 1;             ///< Whether the text direction is right to left or not
+
+  bool                  mUnderlineSetByString : 1;     ///< Set when underline is set by string (legacy) instead of map
+  bool                  mShadowSetByString : 1;        ///< Set when shadow is set by string (legacy) instead of map
+  bool                  mOutlineSetByString : 1;       ///< Set when outline is set by string (legacy) instead of map
+  bool                  mFontStyleSetByString : 1;     ///< Set when font style is set by string (legacy) instead of map
+  bool                  mStrikethroughSetByString : 1; ///< Set when strikethrough is set by string (legacy) instead of map
+  bool                  mShouldClearFocusOnEscape : 1; ///< Whether text control should clear key input focus
+  LayoutDirection::Type mLayoutDirection;              ///< Current system language direction
+
+  Shader mShaderBackground; ///< The shader for text background.
+
+  float mCurrentLineSize;              ///< Used to store the MinLineSize set by user when TextFitArray is enabled.
+  float mTextFitMinSize;               ///< Minimum Font Size for text fit. Default 10
+  float mTextFitMaxSize;               ///< Maximum Font Size for text fit. Default 100
+  float mTextFitStepSize;              ///< Step Size for font intervalse. Default 1
+  float mTextFitLineSize;              ///< This is the LineSize that is the standard when performing TextFit.
+  float mFontSizeScale;                ///< Scale value for Font Size. Default 1.0
+  float mDisabledColorOpacity;         ///< Color opacity when disabled.
+  bool  mFontSizeScaleEnabled : 1;     ///< Whether the font size scale is enabled.
+  bool  mTextFitEnabled : 1;           ///< Whether the text's fit is enabled.
+  bool  mTextFitChanged : 1;           ///< Whether the text fit property has changed.
+  bool  mTextFitArrayEnabled : 1;      ///< Whether the text's fit array is enabled.
+  bool  mIsLayoutDirectionChanged : 1; ///< Whether the layout has changed.
+  bool  mIsUserInteractionEnabled : 1; ///< Whether the user interaction is enabled.
+  bool  mProcessorRegistered : 1;      ///< Whether the text controller registered into processor or not.
+
+private:
+  friend ControllerImplEventHandler;
+  friend ControllerImplModelUpdater;
+  friend SelectionHandleController;
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
new file mode 100644
index 0000000..39ecad1
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
@@ -0,0 +1,445 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-input-font-handler.h>
+
+// EXTERNAL INCLUDES
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace
+{
+/**
+ * @brief Adds a new font description run for the selected text.
+ *
+ * The new font parameters are added after the call to this method.
+ *
+ * @param[in] eventData The event data pointer.
+ * @param[in] logicalModel The logical model where to add the new font description run.
+ * @param[out] startOfSelectedText Index to the first selected character.
+ * @param[out] lengthOfSelectedText Number of selected characters.
+ */
+FontDescriptionRun& UpdateSelectionFontStyleRun(EventData*      eventData,
+                                                LogicalModelPtr logicalModel,
+                                                CharacterIndex& startOfSelectedText,
+                                                Length&         lengthOfSelectedText)
+{
+  const bool handlesCrossed = eventData->mLeftSelectionPosition > eventData->mRightSelectionPosition;
+
+  // Get start and end position of selection
+  startOfSelectedText  = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition;
+  lengthOfSelectedText = (handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition) - startOfSelectedText;
+
+  // Add the font run.
+  const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count();
+  logicalModel->mFontDescriptionRuns.Resize(numberOfRuns + 1u);
+
+  FontDescriptionRun& fontDescriptionRun = *(logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns);
+
+  fontDescriptionRun.characterRun.characterIndex     = startOfSelectedText;
+  fontDescriptionRun.characterRun.numberOfCharacters = lengthOfSelectedText;
+
+  // Recalculate the selection highlight as the metrics may have changed.
+  eventData->mUpdateLeftSelectionPosition  = true;
+  eventData->mUpdateRightSelectionPosition = true;
+  eventData->mUpdateHighlightBox           = true;
+
+  return fontDescriptionRun;
+}
+
+} // unnamed namespace
+
+void Controller::InputFontHandler::SetInputFontFamily(Controller& controller, const std::string& fontFamily)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.familyName      = fontFamily;
+    controller.mImpl->mEventData->mInputStyle.isFamilyDefined = true;
+
+    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
+    {
+      CharacterIndex startOfSelectedText  = 0u;
+      Length         lengthOfSelectedText = 0u;
+
+      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
+      {
+        // Update a font description run for the selecting state.
+        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
+                                                                             controller.mImpl->mModel->mLogicalModel,
+                                                                             startOfSelectedText,
+                                                                             lengthOfSelectedText);
+
+        fontDescriptionRun.familyLength = fontFamily.size();
+        fontDescriptionRun.familyName   = new char[fontDescriptionRun.familyLength];
+        memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
+        fontDescriptionRun.familyDefined = true;
+
+        // The memory allocated for the font family name is freed when the font description is removed from the logical model.
+
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
+      }
+      else
+      {
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
+      }
+
+      // Request to relayout.
+      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
+                                                                         VALIDATE_FONTS |
+                                                                         SHAPE_TEXT |
+                                                                         GET_GLYPH_METRICS |
+                                                                         LAYOUT |
+                                                                         UPDATE_LAYOUT_SIZE |
+                                                                         REORDER |
+                                                                         ALIGN);
+      controller.mImpl->mRecalculateNaturalSize = true;
+      controller.mImpl->RequestRelayout();
+
+      // As the font changes, recalculate the handle positions is needed.
+      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
+      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
+      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
+      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
+    }
+  }
+}
+
+std::string Controller::InputFontHandler::GetInputFontFamily(const Controller& controller)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    return controller.mImpl->mEventData->mInputStyle.familyName;
+  }
+
+  // Return the default font's family if there is no EventData.
+  return controller.GetDefaultFontFamily();
+}
+
+void Controller::InputFontHandler::SetInputFontWeight(const Controller& controller, FontWeight weight)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.weight          = weight;
+    controller.mImpl->mEventData->mInputStyle.isWeightDefined = true;
+
+    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
+    {
+      CharacterIndex startOfSelectedText  = 0u;
+      Length         lengthOfSelectedText = 0u;
+
+      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
+      {
+        // Update a font description run for the selecting state.
+        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
+                                                                             controller.mImpl->mModel->mLogicalModel,
+                                                                             startOfSelectedText,
+                                                                             lengthOfSelectedText);
+
+        fontDescriptionRun.weight        = weight;
+        fontDescriptionRun.weightDefined = true;
+
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
+      }
+      else
+      {
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
+      }
+
+      // Request to relayout.
+      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
+                                                                         VALIDATE_FONTS |
+                                                                         SHAPE_TEXT |
+                                                                         GET_GLYPH_METRICS |
+                                                                         LAYOUT |
+                                                                         UPDATE_LAYOUT_SIZE |
+                                                                         REORDER |
+                                                                         ALIGN);
+      controller.mImpl->mRecalculateNaturalSize = true;
+      controller.mImpl->RequestRelayout();
+
+      // As the font might change, recalculate the handle positions is needed.
+      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
+      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
+      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
+      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
+    }
+  }
+}
+
+bool Controller::InputFontHandler::IsInputFontWeightDefined(const Controller& controller)
+{
+  bool defined = false;
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    defined = controller.mImpl->mEventData->mInputStyle.isWeightDefined;
+  }
+
+  return defined;
+}
+
+FontWeight Controller::InputFontHandler::GetInputFontWeight(const Controller& controller)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    return controller.mImpl->mEventData->mInputStyle.weight;
+  }
+
+  return controller.GetDefaultFontWeight();
+}
+
+void Controller::InputFontHandler::SetInputFontWidth(Controller& controller, FontWidth width)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.width          = width;
+    controller.mImpl->mEventData->mInputStyle.isWidthDefined = true;
+
+    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
+    {
+      CharacterIndex startOfSelectedText  = 0u;
+      Length         lengthOfSelectedText = 0u;
+
+      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
+      {
+        // Update a font description run for the selecting state.
+        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
+                                                                             controller.mImpl->mModel->mLogicalModel,
+                                                                             startOfSelectedText,
+                                                                             lengthOfSelectedText);
+
+        fontDescriptionRun.width        = width;
+        fontDescriptionRun.widthDefined = true;
+
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
+      }
+      else
+      {
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
+      }
+
+      // Request to relayout.
+      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
+                                                                         VALIDATE_FONTS |
+                                                                         SHAPE_TEXT |
+                                                                         GET_GLYPH_METRICS |
+                                                                         LAYOUT |
+                                                                         UPDATE_LAYOUT_SIZE |
+                                                                         REORDER |
+                                                                         ALIGN);
+      controller.mImpl->mRecalculateNaturalSize = true;
+      controller.mImpl->RequestRelayout();
+
+      // As the font might change, recalculate the handle positions is needed.
+      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
+      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
+      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
+      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
+    }
+  }
+}
+
+bool Controller::InputFontHandler::IsInputFontWidthDefined(const Controller& controller)
+{
+  bool defined = false;
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    defined = controller.mImpl->mEventData->mInputStyle.isWidthDefined;
+  }
+
+  return defined;
+}
+
+FontWidth Controller::InputFontHandler::GetInputFontWidth(const Controller& controller)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    return controller.mImpl->mEventData->mInputStyle.width;
+  }
+
+  return controller.GetDefaultFontWidth();
+}
+
+void Controller::InputFontHandler::SetInputFontSlant(Controller& controller, FontSlant slant)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.slant          = slant;
+    controller.mImpl->mEventData->mInputStyle.isSlantDefined = true;
+
+    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
+    {
+      CharacterIndex startOfSelectedText  = 0u;
+      Length         lengthOfSelectedText = 0u;
+
+      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
+      {
+        // Update a font description run for the selecting state.
+        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
+                                                                             controller.mImpl->mModel->mLogicalModel,
+                                                                             startOfSelectedText,
+                                                                             lengthOfSelectedText);
+
+        fontDescriptionRun.slant        = slant;
+        fontDescriptionRun.slantDefined = true;
+
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
+      }
+      else
+      {
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
+      }
+
+      // Request to relayout.
+      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
+                                                                         VALIDATE_FONTS |
+                                                                         SHAPE_TEXT |
+                                                                         GET_GLYPH_METRICS |
+                                                                         LAYOUT |
+                                                                         UPDATE_LAYOUT_SIZE |
+                                                                         REORDER |
+                                                                         ALIGN);
+      controller.mImpl->mRecalculateNaturalSize = true;
+      controller.mImpl->RequestRelayout();
+
+      // As the font might change, recalculate the handle positions is needed.
+      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
+      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
+      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
+      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
+    }
+  }
+}
+
+bool Controller::InputFontHandler::IsInputFontSlantDefined(const Controller& controller)
+{
+  bool defined = false;
+
+  if(NULL != controller.mImpl->mEventData)
+  {
+    defined = controller.mImpl->mEventData->mInputStyle.isSlantDefined;
+  }
+
+  return defined;
+}
+
+FontSlant Controller::InputFontHandler::GetInputFontSlant(const Controller& controller)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    return controller.mImpl->mEventData->mInputStyle.slant;
+  }
+
+  return controller.GetDefaultFontSlant();
+}
+
+void Controller::InputFontHandler::SetInputFontPointSize(Controller& controller, float size, bool defaultFontSizeUpdated)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.size          = size;
+    controller.mImpl->mEventData->mInputStyle.isSizeDefined = true;
+
+    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
+    {
+      CharacterIndex startOfSelectedText  = 0u;
+      Length         lengthOfSelectedText = 0u;
+
+      if(EventData::SELECTING == controller.mImpl->mEventData->mState && !defaultFontSizeUpdated)
+      {
+        // Update a font description run for the selecting state.
+        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
+                                                                             controller.mImpl->mModel->mLogicalModel,
+                                                                             startOfSelectedText,
+                                                                             lengthOfSelectedText);
+
+        fontDescriptionRun.size        = static_cast<PointSize26Dot6>(size * controller.mImpl->GetFontSizeScale() * 64.f);
+        fontDescriptionRun.sizeDefined = true;
+
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
+      }
+      else
+      {
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
+      }
+
+      // Request to relayout.
+      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
+                                                                         VALIDATE_FONTS |
+                                                                         SHAPE_TEXT |
+                                                                         GET_GLYPH_METRICS |
+                                                                         LAYOUT |
+                                                                         UPDATE_LAYOUT_SIZE |
+                                                                         REORDER |
+                                                                         ALIGN);
+      controller.mImpl->mRecalculateNaturalSize = true;
+      controller.mImpl->RequestRelayout();
+
+      // As the font might change, recalculate the handle positions is needed.
+      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
+      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
+      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
+      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
+    }
+  }
+}
+
+float Controller::InputFontHandler::GetInputFontPointSize(const Controller& controller)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    return controller.mImpl->mEventData->mInputStyle.size;
+  }
+
+  // Return the default font's point size if there is no EventData.
+  return controller.GetDefaultFontSize(Text::Controller::POINT_SIZE);
+}
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/controller/text-controller-input-font-handler.h b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.h
new file mode 100644
index 0000000..8008196
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.h
@@ -0,0 +1,57 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_FONT_HANDLER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_FONT_HANDLER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Controller::InputFontHandler
+{
+  static void               SetInputFontFamily(Controller& controller, const std::string& fontFamily);
+  static std::string        GetInputFontFamily(const Controller& controller);
+  static void               SetInputFontWeight(const Controller& controller, FontWeight weight);
+  static bool               IsInputFontWeightDefined(const Controller& controller);
+  static FontWeight         GetInputFontWeight(const Controller& controller);
+  static void               SetInputFontWidth(Controller& controller, FontWidth width);
+  static bool               IsInputFontWidthDefined(const Controller& controller);
+  static FontWidth          GetInputFontWidth(const Controller& controller);
+  static void               SetInputFontSlant(Controller& controller, FontSlant slant);
+  static bool               IsInputFontSlantDefined(const Controller& controller);
+  static FontSlant          GetInputFontSlant(const Controller& controller);
+  static void               SetInputFontPointSize(Controller& controller, float size, bool defaultFontSizeUpdated);
+  static float              GetInputFontPointSize(const Controller& controller);
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_FONT_HANDLER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp b/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp
new file mode 100644
index 0000000..7842d05
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-input-properties.h>
+
+// EXTERNAL INCLUDES
+//#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+//#include <dali/devel-api/adaptor-framework/window-devel.h>
+//#include <dali/integration-api/debug.h>
+#include <memory.h>
+#include <cmath>
+#include <limits>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-font-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/text-editable-control-interface.h>
+
+namespace
+{
+const char* EMPTY_STRING = "";
+}
+
+namespace Dali::Toolkit::Text
+{
+
+void Controller::InputProperties::SetInputColor(Controller& controller, const Vector4& color)
+{
+  if(controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.textColor      = color;
+    controller.mImpl->mEventData->mInputStyle.isDefaultColor = false;
+
+    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
+    {
+      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
+      {
+        const bool handlesCrossed = controller.mImpl->mEventData->mLeftSelectionPosition > controller.mImpl->mEventData->mRightSelectionPosition;
+
+        // Get start and end position of selection
+        const CharacterIndex startOfSelectedText  = handlesCrossed ? controller.mImpl->mEventData->mRightSelectionPosition : controller.mImpl->mEventData->mLeftSelectionPosition;
+        const Length         lengthOfSelectedText = (handlesCrossed ? controller.mImpl->mEventData->mLeftSelectionPosition : controller.mImpl->mEventData->mRightSelectionPosition) - startOfSelectedText;
+
+        // Add the color run.
+        const VectorBase::SizeType numberOfRuns = controller.mImpl->mModel->mLogicalModel->mColorRuns.Count();
+        controller.mImpl->mModel->mLogicalModel->mColorRuns.Resize(numberOfRuns + 1u);
+
+        ColorRun& colorRun                       = *(controller.mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns);
+        colorRun.color                           = color;
+        colorRun.characterRun.characterIndex     = startOfSelectedText;
+        colorRun.characterRun.numberOfCharacters = lengthOfSelectedText;
+
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
+      }
+      else
+      {
+        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
+        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
+      }
+
+      // Request to relayout.
+      controller.mImpl->mOperationsPending = static_cast<OperationsMask>(controller.mImpl->mOperationsPending | COLOR);
+      controller.mImpl->RequestRelayout();
+    }
+  }
+}
+
+const Vector4& Controller::InputProperties::GetInputColor(const Controller& controller)
+{
+  // Return event text input color if we have it, otherwise just return the default text's color
+  return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.textColor : controller.mImpl->mTextColor;
+}
+
+void Controller::InputProperties::SetInputLineSpacing(Controller& controller, float lineSpacing)
+{
+  if(controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.lineSpacing          = lineSpacing;
+    controller.mImpl->mEventData->mInputStyle.isLineSpacingDefined = true;
+  }
+}
+
+float Controller::InputProperties::GetInputLineSpacing(const Controller& controller)
+{
+  return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.lineSpacing : 0.0f;
+}
+
+void Controller::InputProperties::SetInputShadowProperties(Controller& controller, const std::string& shadowProperties)
+{
+  if(controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.shadowProperties = shadowProperties;
+  }
+}
+
+std::string Controller::InputProperties::GetInputShadowProperties(const Controller& controller)
+{
+  return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.shadowProperties : EMPTY_STRING;
+}
+
+void Controller::InputProperties::SetInputUnderlineProperties(Controller& controller, const std::string& underlineProperties)
+{
+  if(controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.underlineProperties = underlineProperties;
+  }
+}
+
+std::string Controller::InputProperties::GetInputUnderlineProperties(const Controller& controller)
+{
+  return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.underlineProperties : EMPTY_STRING;
+}
+
+void Controller::InputProperties::SetInputEmbossProperties(Controller& controller, const std::string& embossProperties)
+{
+  if(controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.embossProperties = embossProperties;
+  }
+}
+
+std::string Controller::InputProperties::GetInputEmbossProperties(const Controller& controller)
+{
+  return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.embossProperties : controller.GetDefaultEmbossProperties();
+}
+
+void Controller::InputProperties::SetInputOutlineProperties(Controller& controller, const std::string& outlineProperties)
+{
+  if(controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mInputStyle.outlineProperties = outlineProperties;
+  }
+}
+
+std::string Controller::InputProperties::GetInputOutlineProperties(const Controller& controller)
+{
+  return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.outlineProperties : controller.GetDefaultOutlineProperties();
+}
+
+void Controller::InputProperties::SetInputModePassword(Controller& controller, bool passwordInput)
+{
+  if(controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mPasswordInput = passwordInput;
+  }
+}
+
+bool Controller::InputProperties::IsInputModePassword(Controller& controller)
+{
+  return controller.mImpl->mEventData && controller.mImpl->mEventData->mPasswordInput;
+}
+
+} // namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/controller/text-controller-input-properties.h b/dali-toolkit/internal/text/controller/text-controller-input-properties.h
new file mode 100644
index 0000000..9b31d22
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-input-properties.h
@@ -0,0 +1,64 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_PROPERTIES_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_PROPERTIES_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/input-method-context.h>
+#include <dali/public-api/events/gesture.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+
+namespace Dali::Toolkit::Text
+{
+struct Controller::InputProperties
+{
+  static void SetInputColor(Controller& controller, const Vector4& color);
+
+  static const Vector4& GetInputColor(const Controller& controller);
+
+  static void SetInputLineSpacing(Controller& controller, float lineSpacing);
+
+  static float GetInputLineSpacing(const Controller& controller);
+
+  static void SetInputShadowProperties(Controller& controller, const std::string& shadowProperties);
+
+  static std::string GetInputShadowProperties(const Controller& controller);
+
+  static void SetInputUnderlineProperties(Controller& controller, const std::string& underlineProperties);
+
+  static std::string GetInputUnderlineProperties(const Controller& controller);
+
+  static void SetInputEmbossProperties(Controller& controller, const std::string& embossProperties);
+
+  static std::string GetInputEmbossProperties(const Controller& controller);
+
+  static void SetInputOutlineProperties(Controller& controller, const std::string& outlineProperties);
+
+  static std::string GetInputOutlineProperties(const Controller& controller);
+
+  static void SetInputModePassword(Controller& controller, bool passwordInput);
+
+  static bool IsInputModePassword(Controller& controller);
+};
+
+
+} // namespace Dali::Toolkit::Text
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_PROPERTIES_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.cpp
new file mode 100644
index 0000000..d6d2acc
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.cpp
@@ -0,0 +1,598 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/text-font-style.h>
+#include <dali-toolkit/public-api/controls/text-controls/placeholder-properties.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+const char* EMPTY_STRING = "";
+
+const char* const PLACEHOLDER_TEXT         = "text";
+const char* const PLACEHOLDER_TEXT_FOCUSED = "textFocused";
+const char* const PLACEHOLDER_COLOR        = "color";
+const char* const PLACEHOLDER_FONT_FAMILY  = "fontFamily";
+const char* const PLACEHOLDER_FONT_STYLE   = "fontStyle";
+const char* const PLACEHOLDER_POINT_SIZE   = "pointSize";
+const char* const PLACEHOLDER_PIXEL_SIZE   = "pixelSize";
+const char* const PLACEHOLDER_ELLIPSIS     = "ellipsis";
+
+/**
+ * Convert all string keys to int keys
+ * @param[in] key The key to convert
+ * @return the index key supplied or matching, or INVALID_INDEX if no match
+ */
+static Dali::Property::Index GetIntKey(const Dali::Property::Key& key)
+{
+  if(key.type == Dali::Property::Key::INDEX)
+  {
+    return key.indexKey;
+  }
+
+  if(key.stringKey == PLACEHOLDER_TEXT)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::TEXT;
+  }
+  else if(key.stringKey == PLACEHOLDER_TEXT_FOCUSED)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::TEXT_FOCUSED;
+  }
+  else if(key.stringKey == PLACEHOLDER_COLOR)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::COLOR;
+  }
+  else if(key.stringKey == PLACEHOLDER_FONT_FAMILY)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::FONT_FAMILY;
+  }
+  else if(key.stringKey == PLACEHOLDER_FONT_STYLE)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::FONT_STYLE;
+  }
+  else if(key.stringKey == PLACEHOLDER_POINT_SIZE)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::POINT_SIZE;
+  }
+  else if(key.stringKey == PLACEHOLDER_PIXEL_SIZE)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::PIXEL_SIZE;
+  }
+  else if(key.stringKey == PLACEHOLDER_ELLIPSIS)
+  {
+    return Dali::Toolkit::Text::PlaceHolder::Property::ELLIPSIS;
+  }
+
+  return Dali::Property::INVALID_INDEX;
+}
+
+} // namespace
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void Controller::PlaceholderHandler::SetPlaceholderTextElideEnabled(Controller& controller, bool enabled)
+{
+  controller.mImpl->mEventData->mIsPlaceholderElideEnabled = enabled;
+  controller.mImpl->mEventData->mPlaceholderEllipsisFlag   = true;
+
+  // Update placeholder if there is no text
+  if(controller.mImpl->IsShowingPlaceholderText() ||
+     (0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
+  {
+    ShowPlaceholderText(*controller.mImpl);
+  }
+}
+
+bool Controller::PlaceholderHandler::IsPlaceholderTextElideEnabled(const Controller& controller)
+{
+  return controller.mImpl->mEventData->mIsPlaceholderElideEnabled;
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderText(Controller& controller, PlaceholderType type, const std::string& text)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    if(PLACEHOLDER_TYPE_INACTIVE == type)
+    {
+      controller.mImpl->mEventData->mPlaceholderTextInactive = text;
+    }
+    else
+    {
+      controller.mImpl->mEventData->mPlaceholderTextActive = text;
+    }
+
+    // Update placeholder if there is no text
+    if(controller.mImpl->IsShowingPlaceholderText() ||
+       (0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
+    {
+      ShowPlaceholderText(*controller.mImpl);
+    }
+  }
+}
+
+void Controller::PlaceholderHandler::GetPlaceholderText(const Controller& controller, PlaceholderType type, std::string& text)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    if(PLACEHOLDER_TYPE_INACTIVE == type)
+    {
+      text = controller.mImpl->mEventData->mPlaceholderTextInactive;
+    }
+    else
+    {
+      text = controller.mImpl->mEventData->mPlaceholderTextActive;
+    }
+  }
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderFontFamily(Controller& controller, const std::string& placeholderTextFontFamily)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    // if mPlaceholderFont is null, create an instance.
+    CreatePlaceholderFont(controller);
+
+    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.family = placeholderTextFontFamily;
+    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetPlaceholderFontFamily %s\n", placeholderTextFontFamily.c_str());
+    controller.mImpl->mEventData->mPlaceholderFont->familyDefined = !placeholderTextFontFamily.empty();
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+std::string Controller::PlaceholderHandler::GetPlaceholderFontFamily(const Controller& controller)
+{
+  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
+  {
+    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.family;
+  }
+
+  return EMPTY_STRING;
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderTextFontWeight(Controller& controller, FontWeight weight)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    // if mPlaceholderFont is null, create an instance.
+    CreatePlaceholderFont(controller);
+
+    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.weight = weight;
+    controller.mImpl->mEventData->mPlaceholderFont->weightDefined           = true;
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+bool Controller::PlaceholderHandler::IsPlaceholderTextFontWeightDefined(const Controller& controller)
+{
+  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
+  {
+    return controller.mImpl->mEventData->mPlaceholderFont->weightDefined;
+  }
+  return false;
+}
+
+FontWeight Controller::PlaceholderHandler::GetPlaceholderTextFontWeight(const Controller& controller)
+{
+  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
+  {
+    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.weight;
+  }
+
+  return TextAbstraction::FontWeight::NORMAL;
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderTextFontWidth(Controller& controller, FontWidth width)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    // if mPlaceholderFont is null, create an instance.
+    CreatePlaceholderFont(controller);
+
+    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.width = width;
+    controller.mImpl->mEventData->mPlaceholderFont->widthDefined           = true;
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+bool Controller::PlaceholderHandler::IsPlaceholderTextFontWidthDefined(const Controller& controller)
+{
+  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
+  {
+    return controller.mImpl->mEventData->mPlaceholderFont->widthDefined;
+  }
+  return false;
+}
+
+FontWidth Controller::PlaceholderHandler::GetPlaceholderTextFontWidth(const Controller& controller)
+{
+  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
+  {
+    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.width;
+  }
+
+  return TextAbstraction::FontWidth::NORMAL;
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderTextFontSlant(Controller& controller, FontSlant slant)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    // if mPlaceholderFont is null, create an instance.
+    CreatePlaceholderFont(controller);
+
+    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.slant = slant;
+    controller.mImpl->mEventData->mPlaceholderFont->slantDefined           = true;
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+bool Controller::PlaceholderHandler::IsPlaceholderTextFontSlantDefined(const Controller& controller)
+{
+  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
+  {
+    return controller.mImpl->mEventData->mPlaceholderFont->slantDefined;
+  }
+  return false;
+}
+
+FontSlant Controller::PlaceholderHandler::GetPlaceholderTextFontSlant(const Controller& controller)
+{
+  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
+  {
+    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.slant;
+  }
+
+  return TextAbstraction::FontSlant::NORMAL;
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderTextFontSize(Controller& controller, float fontSize, FontSizeType type)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    // if mPlaceholderFont is null, create an instance.
+    CreatePlaceholderFont(controller);
+
+    switch(type)
+    {
+      case POINT_SIZE:
+      {
+        controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = fontSize;
+        controller.mImpl->mEventData->mPlaceholderFont->sizeDefined       = true;
+        controller.mImpl->mEventData->mIsPlaceholderPixelSize             = false; // Font size flag
+        break;
+      }
+      case PIXEL_SIZE:
+      {
+        // Point size = Pixel size * 72.f / DPI
+        unsigned int                horizontalDpi = 0u;
+        unsigned int                verticalDpi   = 0u;
+        TextAbstraction::FontClient fontClient    = TextAbstraction::FontClient::Get();
+        fontClient.GetDpi(horizontalDpi, verticalDpi);
+
+        controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = (fontSize * 72.f) / static_cast<float>(horizontalDpi);
+        controller.mImpl->mEventData->mPlaceholderFont->sizeDefined       = true;
+        controller.mImpl->mEventData->mIsPlaceholderPixelSize             = true; // Font size flag
+        break;
+      }
+    }
+
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+float Controller::PlaceholderHandler::GetPlaceholderTextFontSize(const Controller& controller, FontSizeType type)
+{
+  float value = 0.0f;
+  if(NULL != controller.mImpl->mEventData)
+  {
+    switch(type)
+    {
+      case POINT_SIZE:
+      {
+        if(NULL != controller.mImpl->mEventData->mPlaceholderFont)
+        {
+          value = controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize;
+        }
+        else
+        {
+          // If the placeholder text font size is not set, then return the default font size.
+          value = controller.GetDefaultFontSize(POINT_SIZE);
+        }
+        break;
+      }
+      case PIXEL_SIZE:
+      {
+        if(NULL != controller.mImpl->mEventData->mPlaceholderFont)
+        {
+          // Pixel size = Point size * DPI / 72.f
+          unsigned int                horizontalDpi = 0u;
+          unsigned int                verticalDpi   = 0u;
+          TextAbstraction::FontClient fontClient    = TextAbstraction::FontClient::Get();
+          fontClient.GetDpi(horizontalDpi, verticalDpi);
+
+          value = controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize * static_cast<float>(horizontalDpi) / 72.f;
+        }
+        else
+        {
+          // If the placeholder text font size is not set, then return the default font size.
+          value = controller.GetDefaultFontSize(PIXEL_SIZE);
+        }
+        break;
+      }
+    }
+    return value;
+  }
+
+  return value;
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderTextColor(Controller& controller, const Vector4& textColor)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    controller.mImpl->mEventData->mPlaceholderTextColor = textColor;
+  }
+
+  if(controller.mImpl->IsShowingPlaceholderText())
+  {
+    controller.mImpl->mModel->mVisualModel->SetTextColor(textColor);
+    controller.mImpl->mModel->mLogicalModel->mColorRuns.Clear();
+    controller.mImpl->mOperationsPending = static_cast<OperationsMask>(controller.mImpl->mOperationsPending | COLOR);
+    controller.mImpl->RequestRelayout();
+  }
+}
+
+const Vector4& Controller::PlaceholderHandler::GetPlaceholderTextColor(const Controller& controller)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    return controller.mImpl->mEventData->mPlaceholderTextColor;
+  }
+
+  return Color::BLACK;
+}
+
+void Controller::PlaceholderHandler::SetPlaceholderProperty(Controller& controller, const Property::Map& map)
+{
+  const Property::Map::SizeType count = map.Count();
+
+  for(Property::Map::SizeType position = 0; position < count; ++position)
+  {
+    const KeyValuePair&    keyValue = map.GetKeyValue(position);
+    const Property::Key&   key      = keyValue.first;
+    const Property::Value& value    = keyValue.second;
+
+    Property::Index indexKey = GetIntKey(key);
+
+    switch(indexKey)
+    {
+      case Toolkit::Text::PlaceHolder::Property::TEXT:
+      case Toolkit::Text::PlaceHolder::Property::TEXT_FOCUSED:
+      {
+        PlaceholderType placeHolderType = (indexKey == PlaceHolder::Property::TEXT) ? Controller::PLACEHOLDER_TYPE_INACTIVE : Controller::PLACEHOLDER_TYPE_ACTIVE;
+
+        std::string text = "";
+        if(value.Get(text))
+        {
+          SetPlaceholderText(controller, placeHolderType, text);
+        }
+        break;
+      }
+      case Toolkit::Text::PlaceHolder::Property::COLOR:
+      {
+        Vector4 textColor;
+        if(value.Get(textColor))
+        {
+          if(GetPlaceholderTextColor(controller) != textColor)
+          {
+            SetPlaceholderTextColor(controller, textColor);
+          }
+        }
+        break;
+      }
+      case Toolkit::Text::PlaceHolder::Property::FONT_FAMILY:
+      {
+        std::string fontFamily = "";
+        if(value.Get(fontFamily))
+        {
+          SetPlaceholderFontFamily(controller, fontFamily);
+        }
+        break;
+      }
+      case Toolkit::Text::PlaceHolder::Property::FONT_STYLE:
+      {
+        SetFontStyleProperty(&controller, value, Text::FontStyle::PLACEHOLDER);
+        break;
+      }
+      case Toolkit::Text::PlaceHolder::Property::POINT_SIZE:
+      case Toolkit::Text::PlaceHolder::Property::PIXEL_SIZE:
+      {
+        FontSizeType fontSizeType = (indexKey == PlaceHolder::Property::POINT_SIZE) ? Text::Controller::POINT_SIZE : Text::Controller::PIXEL_SIZE;
+
+        float fontSizeValue = 0.0f;
+        if(value.Get(fontSizeValue))
+        {
+          if(!Equals(GetPlaceholderTextFontSize(controller, fontSizeType), fontSizeValue))
+          {
+            SetPlaceholderTextFontSize(controller, fontSizeValue, fontSizeType);
+          }
+        }
+        break;
+      }
+      case Toolkit::Text::PlaceHolder::Property::ELLIPSIS:
+      {
+        bool ellipsis = false;
+        if(value.Get(ellipsis))
+        {
+          SetPlaceholderTextElideEnabled(controller, ellipsis);
+        }
+        break;
+      }
+    }
+  }
+}
+
+void Controller::PlaceholderHandler::GetPlaceholderProperty(Controller& controller, Property::Map& map)
+{
+  if(NULL != controller.mImpl->mEventData)
+  {
+    if(!controller.mImpl->mEventData->mPlaceholderTextActive.empty())
+    {
+      map[Text::PlaceHolder::Property::TEXT_FOCUSED] = controller.mImpl->mEventData->mPlaceholderTextActive;
+    }
+    if(!controller.mImpl->mEventData->mPlaceholderTextInactive.empty())
+    {
+      map[Text::PlaceHolder::Property::TEXT] = controller.mImpl->mEventData->mPlaceholderTextInactive;
+    }
+
+    map[Text::PlaceHolder::Property::COLOR]       = controller.mImpl->mEventData->mPlaceholderTextColor;
+    map[Text::PlaceHolder::Property::FONT_FAMILY] = GetPlaceholderFontFamily(controller);
+
+    Property::Value fontStyleMapGet;
+    GetFontStyleProperty(&controller, fontStyleMapGet, Text::FontStyle::PLACEHOLDER);
+    map[Text::PlaceHolder::Property::FONT_STYLE] = fontStyleMapGet;
+
+    // Choose font size : POINT_SIZE or PIXEL_SIZE
+    if(!controller.mImpl->mEventData->mIsPlaceholderPixelSize)
+    {
+      map[Text::PlaceHolder::Property::POINT_SIZE] = GetPlaceholderTextFontSize(controller, Text::Controller::POINT_SIZE);
+    }
+    else
+    {
+      map[Text::PlaceHolder::Property::PIXEL_SIZE] = GetPlaceholderTextFontSize(controller, Text::Controller::PIXEL_SIZE);
+    }
+
+    if(controller.mImpl->mEventData->mPlaceholderEllipsisFlag)
+    {
+      map[Text::PlaceHolder::Property::ELLIPSIS] = IsPlaceholderTextElideEnabled(controller);
+    }
+  }
+}
+
+void Controller::PlaceholderHandler::ShowPlaceholderText(Controller::Impl& impl)
+{
+  if(impl.IsPlaceholderAvailable())
+  {
+    EventData*& eventData = impl.mEventData;
+    DALI_ASSERT_DEBUG(eventData && "No placeholder text available");
+
+    if(NULL == eventData)
+    {
+      return;
+    }
+
+    eventData->mIsShowingPlaceholderText = true;
+
+    // Disable handles when showing place-holder text
+    DecoratorPtr& decorator = eventData->mDecorator;
+    decorator->SetHandleActive(GRAB_HANDLE, false);
+    decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
+    decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+
+    const char* text(NULL);
+    size_t      size(0);
+
+    // TODO - Switch Placeholder text when changing state
+    std::string& placeholderTextActive = eventData->mPlaceholderTextActive;
+    if((EventData::INACTIVE != eventData->mState) &&
+       (0u != placeholderTextActive.c_str()))
+    {
+      text = placeholderTextActive.c_str();
+      size = placeholderTextActive.size();
+    }
+    else
+    {
+      std::string& placeholderTextInactive = eventData->mPlaceholderTextInactive;
+      text                                 = placeholderTextInactive.c_str();
+      size                                 = placeholderTextInactive.size();
+    }
+
+    TextUpdateInfo& textUpdateInfo             = impl.mTextUpdateInfo;
+    textUpdateInfo.mCharacterIndex             = 0u;
+    textUpdateInfo.mNumberOfCharactersToRemove = textUpdateInfo.mPreviousNumberOfCharacters;
+
+    // Reset model for showing placeholder.
+    ModelPtr&        model        = impl.mModel;
+    LogicalModelPtr& logicalModel = model->mLogicalModel;
+    logicalModel->mText.Clear();
+    model->mVisualModel->SetTextColor(eventData->mPlaceholderTextColor);
+
+    // Convert text into UTF-32
+    Vector<Character>& utf32Characters = logicalModel->mText;
+    utf32Characters.Resize(size);
+
+    // This is a bit horrible but std::string returns a (signed) char*
+    const uint8_t* utf8 = reinterpret_cast<const uint8_t*>(text);
+
+    // Transform a text array encoded in utf8 into an array encoded in utf32.
+    // It returns the actual number of characters.
+    const Length characterCount = Utf8ToUtf32(utf8, size, utf32Characters.Begin());
+    utf32Characters.Resize(characterCount);
+
+    // The characters to be added.
+    textUpdateInfo.mNumberOfCharactersToAdd = characterCount;
+
+    // Reset the cursor position
+    eventData->mPrimaryCursorPosition = 0;
+
+    // The natural size needs to be re-calculated.
+    impl.mRecalculateNaturalSize = true;
+
+    // The text direction needs to be updated.
+    impl.mUpdateTextDirection = true;
+
+    // Apply modifications to the model
+    impl.mOperationsPending = ALL_OPERATIONS;
+
+    // Update the rest of the model during size negotiation
+    impl.QueueModifyEvent(ModifyEvent::TEXT_REPLACED);
+  }
+}
+
+void Controller::PlaceholderHandler::CreatePlaceholderFont(Controller& controller)
+{
+  if(nullptr == controller.mImpl->mEventData->mPlaceholderFont)
+  {
+    controller.mImpl->mEventData->mPlaceholderFont = std::unique_ptr<FontDefaults>(new FontDefaults());
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h
new file mode 100644
index 0000000..3bbf87b
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h
@@ -0,0 +1,68 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_PLACEHOLDER_HANDLER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_PLACEHOLDER_HANDLER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector4.h>
+#include <dali/public-api/object/property-map.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Controller::PlaceholderHandler
+{
+  static void               SetPlaceholderTextElideEnabled(Controller& controller, bool enabled);
+  static bool               IsPlaceholderTextElideEnabled(const Controller& controller);
+  static void               SetPlaceholderText(Controller& controller, PlaceholderType type, const std::string& text);
+  static void               GetPlaceholderText(const Controller& controller, PlaceholderType type, std::string& text);
+  static void               SetPlaceholderFontFamily(Controller& controller, const std::string& placeholderTextFontFamily);
+  static std::string        GetPlaceholderFontFamily(const Controller& controller);
+  static void               SetPlaceholderTextFontWeight(Controller& controller, FontWeight weight);
+  static bool               IsPlaceholderTextFontWeightDefined(const Controller& controller);
+  static FontWeight         GetPlaceholderTextFontWeight(const Controller& controller);
+  static void               SetPlaceholderTextFontWidth(Controller& controller, FontWidth width);
+  static bool               IsPlaceholderTextFontWidthDefined(const Controller& controller);
+  static FontWidth          GetPlaceholderTextFontWidth(const Controller& controller);
+  static void               SetPlaceholderTextFontSlant(Controller& controller, FontSlant slant);
+  static bool               IsPlaceholderTextFontSlantDefined(const Controller& controller);
+  static FontSlant          GetPlaceholderTextFontSlant(const Controller& controller);
+  static void               SetPlaceholderTextFontSize(Controller& controller, float fontSize, FontSizeType type);
+  static float              GetPlaceholderTextFontSize(const Controller& controller, FontSizeType type);
+  static void               SetPlaceholderTextColor(Controller& controller, const Vector4& textColor);
+  static const Vector4&     GetPlaceholderTextColor(const Controller& controller);
+  static void               SetPlaceholderProperty(Controller& controller, const Property::Map& map);
+  static void               GetPlaceholderProperty(Controller& controller, Property::Map& map);
+  static void               ShowPlaceholderText(Controller::Impl& impl);
+  static void               CreatePlaceholderFont(Controller& controller);
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_PLACEHOLDER_HANDLER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp b/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp
new file mode 100644
index 0000000..de4c776
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp
@@ -0,0 +1,1123 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
+
+// EXTERNAL INCLUDES
+#include <cmath>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
+#include <dali/public-api/common/constants.h>
+#include <dali/public-api/math/math-utils.h>
+#include <limits>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_TEXT_PERFORMANCE_MARKER, false);
+DALI_INIT_TRACE_FILTER(gTraceFilter2, DALI_TRACE_PERFORMANCE_MARKER, false);
+
+constexpr float MAX_FLOAT = std::numeric_limits<float>::max();
+
+float ConvertToEven(float value)
+{
+  int intValue(static_cast<int>(value));
+  return static_cast<float>(intValue + (intValue & 1));
+}
+
+} // namespace
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->CalculateLayoutSizeOnRequiredControllerSize\n");
+  Size calculatedLayoutSize;
+
+  Controller::Impl& impl        = *controller.mImpl;
+  ModelPtr&         model       = impl.mModel;
+  VisualModelPtr&   visualModel = model->mVisualModel;
+
+  // Operations that can be done only once until the text changes.
+  const OperationsMask onlyOnceOperations = static_cast<OperationsMask>(CONVERT_TO_UTF32 |
+                                                                        GET_SCRIPTS |
+                                                                        VALIDATE_FONTS |
+                                                                        GET_LINE_BREAKS |
+                                                                        BIDI_INFO |
+                                                                        SHAPE_TEXT |
+                                                                        GET_GLYPH_METRICS);
+
+  const OperationsMask sizeOperations = static_cast<OperationsMask>(LAYOUT | ALIGN | REORDER);
+
+  // Set the update info to relayout the whole text.
+  TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo;
+  if((0 == textUpdateInfo.mNumberOfCharactersToAdd) &&
+     (0 == textUpdateInfo.mPreviousNumberOfCharacters) &&
+     ((visualModel->mControlSize.width < Math::MACHINE_EPSILON_1000) || (visualModel->mControlSize.height < Math::MACHINE_EPSILON_1000)))
+  {
+    textUpdateInfo.mNumberOfCharactersToAdd = model->mLogicalModel->mText.Count();
+  }
+  textUpdateInfo.mParagraphCharacterIndex     = 0u;
+  textUpdateInfo.mRequestedNumberOfCharacters = model->mLogicalModel->mText.Count();
+
+  // Get a reference to the pending operations member
+  OperationsMask& operationsPending = impl.mOperationsPending;
+
+  // Store the actual control's size to restore later.
+  const Size actualControlSize = visualModel->mControlSize;
+
+  // This is to keep Index to the first character to be updated.
+  // Then restore it after calling Clear method.
+  auto updateInfoCharIndexBackup = textUpdateInfo.mCharacterIndex;
+
+  // Whether the text control is editable
+  const bool isEditable = NULL != impl.mEventData;
+
+  if(!isEditable)
+  {
+    if(NO_OPERATION != (VALIDATE_FONTS & operationsPending) &&
+       textUpdateInfo.mCharacterIndex == static_cast<CharacterIndex>(-1))
+    {
+      impl.ClearFontData();
+      updateInfoCharIndexBackup = textUpdateInfo.mCharacterIndex;
+    }
+
+    impl.UpdateModel(onlyOnceOperations);
+
+    // Layout the text for the new width.
+    operationsPending = static_cast<OperationsMask>(operationsPending | requestedOperationsMask);
+
+    DoRelayout(impl,
+               requestedControllerSize,
+               static_cast<OperationsMask>(onlyOnceOperations | requestedOperationsMask),
+               calculatedLayoutSize);
+
+    textUpdateInfo.Clear();
+    textUpdateInfo.mClearAll = true;
+
+    // Do not do again the only once operations.
+    operationsPending = static_cast<OperationsMask>(operationsPending & ~onlyOnceOperations);
+  }
+  else
+  {
+    // Layout the text for the new width.
+    // Apply the pending operations, requested operations and the only once operations.
+    // Then remove onlyOnceOperations
+    operationsPending = static_cast<OperationsMask>(operationsPending | requestedOperationsMask | onlyOnceOperations);
+
+    // Make sure the model is up-to-date before layouting
+    impl.UpdateModel(static_cast<OperationsMask>(operationsPending & ~UPDATE_LAYOUT_SIZE));
+
+    DoRelayout(impl,
+               requestedControllerSize,
+               static_cast<OperationsMask>(operationsPending & ~UPDATE_LAYOUT_SIZE),
+               calculatedLayoutSize);
+
+    // Clear the update info. This info will be set the next time the text is updated.
+    textUpdateInfo.Clear();
+
+    //TODO: Refactor "DoRelayout" and extract common code of size calculation without modifying attributes of mVisualModel,
+    //TODO: then calculate GlyphPositions. Lines, Size, Layout for Natural-Size
+    //TODO: and utilize the values in OperationsPending and TextUpdateInfo without changing the original one.
+    //TODO: Also it will improve performance because there is no need todo FullRelyout on the next need for layouting.
+  }
+
+  // FullRelayoutNeeded should be true because DoRelayout is MAX_FLOAT, MAX_FLOAT.
+  // By this no need to take backup and restore it.
+  textUpdateInfo.mFullRelayoutNeeded = true;
+
+  // Restore mCharacterIndex. Because "Clear" set it to the maximum integer.
+  // The "CalculateTextUpdateIndices" does not work proprely because the mCharacterIndex will be greater than mPreviousNumberOfCharacters.
+  // Which apply an assumption to update only the last  paragraph. That could cause many of out of index crashes.
+  textUpdateInfo.mCharacterIndex = updateInfoCharIndexBackup;
+
+  // Do the size related operations again.
+  operationsPending = static_cast<OperationsMask>(operationsPending | sizeOperations);
+
+  // Restore the actual control's size.
+  visualModel->mControlSize = actualControlSize;
+
+  return calculatedLayoutSize;
+}
+
+Vector3 Controller::Relayouter::GetNaturalSize(Controller& controller)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n");
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_GET_NATURAL_SIZE");
+  Vector3 naturalSizeVec3;
+
+  // Make sure the model is up-to-date before layouting
+  EventHandler::ProcessModifyEvents(controller);
+
+  Controller::Impl& impl        = *controller.mImpl;
+  ModelPtr&         model       = impl.mModel;
+  VisualModelPtr&   visualModel = model->mVisualModel;
+
+  if(impl.mRecalculateNaturalSize)
+  {
+    Size naturalSize;
+
+    // Layout the text for the new width.
+    OperationsMask requestedOperationsMask  = static_cast<OperationsMask>(LAYOUT | REORDER);
+    Size           sizeMaxWidthAndMaxHeight = Size(MAX_FLOAT, MAX_FLOAT);
+
+    naturalSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeMaxWidthAndMaxHeight, requestedOperationsMask);
+
+    // Stores the natural size to avoid recalculate it again
+    // unless the text/style changes.
+    visualModel->SetNaturalSize(naturalSize);
+    naturalSizeVec3 = naturalSize;
+
+    impl.mRecalculateNaturalSize = false;
+
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSizeVec3.x, naturalSizeVec3.y, naturalSizeVec3.z);
+  }
+  else
+  {
+    naturalSizeVec3 = visualModel->GetNaturalSize();
+
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSizeVec3.x, naturalSizeVec3.y, naturalSizeVec3.z);
+  }
+
+  naturalSizeVec3.x = ConvertToEven(naturalSizeVec3.x);
+  naturalSizeVec3.y = ConvertToEven(naturalSizeVec3.y);
+
+  return naturalSizeVec3;
+}
+
+bool Controller::Relayouter::CheckForTextFit(Controller& controller, float pointSize, const Size& layoutSize)
+{
+  Size              textSize;
+  Controller::Impl& impl            = *controller.mImpl;
+  TextUpdateInfo&   textUpdateInfo  = impl.mTextUpdateInfo;
+  impl.mFontDefaults->mFitPointSize = pointSize;
+  impl.mFontDefaults->sizeDefined   = true;
+  impl.ClearFontData();
+
+  // Operations that can be done only once until the text changes.
+  const OperationsMask onlyOnceOperations = static_cast<OperationsMask>(CONVERT_TO_UTF32 |
+                                                                        GET_SCRIPTS |
+                                                                        VALIDATE_FONTS |
+                                                                        GET_LINE_BREAKS |
+                                                                        BIDI_INFO |
+                                                                        SHAPE_TEXT |
+                                                                        GET_GLYPH_METRICS);
+
+  textUpdateInfo.mParagraphCharacterIndex     = 0u;
+  textUpdateInfo.mRequestedNumberOfCharacters = impl.mModel->mLogicalModel->mText.Count();
+
+  // Make sure the model is up-to-date before layouting
+  impl.UpdateModel(onlyOnceOperations);
+
+  bool layoutTooSmall = false;
+  DoRelayout(impl,
+             Size(layoutSize.width, MAX_FLOAT),
+             static_cast<OperationsMask>(onlyOnceOperations | LAYOUT),
+             textSize,
+             layoutTooSmall);
+
+  // Clear the update info. This info will be set the next time the text is updated.
+  textUpdateInfo.Clear();
+  textUpdateInfo.mClearAll = true;
+
+  if(layoutTooSmall || textSize.width > layoutSize.width || textSize.height > layoutSize.height)
+  {
+    return false;
+  }
+  return true;
+}
+
+void Controller::Relayouter::FitArrayPointSizeforLayout(Controller& controller, const Size& layoutSize)
+{
+  Controller::Impl& impl = *controller.mImpl;
+
+  const OperationsMask operations = impl.mOperationsPending;
+  if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations) || impl.mTextFitContentSize != layoutSize)
+  {
+    DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_FIT_ARRAY_LAYOUT");
+    std::vector<Toolkit::DevelTextLabel::FitOption> fitOptions = impl.mTextFitArray;
+    int numberOfFitOptions = static_cast<int>(fitOptions.size());
+    if(numberOfFitOptions == 0)
+    {
+      DALI_LOG_ERROR("fitOptions is empty\n");
+      return;
+    }
+
+    ModelPtr& model          = impl.mModel;
+    bool      actualellipsis = model->mElideEnabled;
+    model->mElideEnabled     = false;
+
+    // Sort in ascending order by PointSize.
+    std::sort(fitOptions.begin(), fitOptions.end(), compareByPointSize);
+
+    // Decide whether to use binary search.
+    // If MinLineSize is not sorted in ascending order,
+    // binary search cannot guarantee that it will always find the best value.
+    bool  binarySearch    = true;
+    float prevMinLineSize = 0.0f;
+    for(Toolkit::DevelTextLabel::FitOption& option : fitOptions)
+    {
+      float optionMinLineSize = option.GetMinLineSize();
+      if(prevMinLineSize > optionMinLineSize)
+      {
+        binarySearch = false;
+        break;
+      }
+      prevMinLineSize = optionMinLineSize;
+    }
+
+    // Set the first FitOption(Minimum PointSize) to the best value.
+    // If the search does not find an optimal value, the minimum PointSize will be used to text fit.
+    Toolkit::DevelTextLabel::FitOption firstOption = fitOptions.front();
+    bool  bestSizeUpdatedLatest = false;
+    float bestPointSize         = firstOption.GetPointSize();
+    float bestMinLineSize       = firstOption.GetMinLineSize();
+
+    if(binarySearch)
+    {
+      int left = 0u;
+      int right = numberOfFitOptions - 1;
+
+      while (left <= right)
+      {
+        int mid = left + (right - left) / 2;
+        Toolkit::DevelTextLabel::FitOption option = fitOptions[mid];
+        float testPointSize   = option.GetPointSize();
+        float testMinLineSize = option.GetMinLineSize();
+        impl.SetDefaultLineSize(testMinLineSize);
+
+        if(CheckForTextFit(controller, testPointSize, layoutSize))
+        {
+          bestSizeUpdatedLatest = true;
+          bestPointSize   = testPointSize;
+          bestMinLineSize = testMinLineSize;
+          left = mid + 1;
+        }
+        else
+        {
+          bestSizeUpdatedLatest = false;
+          right = mid - 1;
+        }
+      }
+    }
+    else
+    {
+      // If binary search is not possible, search sequentially starting from the largest PointSize.
+      for(auto it = fitOptions.rbegin(); it != fitOptions.rend(); ++it)
+      {
+        Toolkit::DevelTextLabel::FitOption option = *it;
+        float testPointSize   = option.GetPointSize();
+        float testMinLineSize = option.GetMinLineSize();
+        impl.SetDefaultLineSize(testMinLineSize);
+
+        if(CheckForTextFit(controller, testPointSize, layoutSize))
+        {
+          bestSizeUpdatedLatest = true;
+          bestPointSize   = testPointSize;
+          bestMinLineSize = testMinLineSize;
+          break;
+        }
+        else
+        {
+          bestSizeUpdatedLatest = false;
+        }
+      }
+    }
+
+    // Best point size was not updated. re-run so the TextFit should be fitted really.
+    if(!bestSizeUpdatedLatest)
+    {
+      impl.SetDefaultLineSize(bestMinLineSize);
+      CheckForTextFit(controller, bestPointSize, layoutSize);
+    }
+
+    model->mElideEnabled              = actualellipsis;
+    impl.mFontDefaults->mFitPointSize = bestPointSize;
+    impl.mFontDefaults->sizeDefined   = true;
+    impl.ClearFontData();
+  }
+}
+
+void Controller::Relayouter::FitPointSizeforLayout(Controller& controller, const Size& layoutSize)
+{
+  Controller::Impl& impl = *controller.mImpl;
+
+  const OperationsMask operations = impl.mOperationsPending;
+  if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations) || impl.mTextFitContentSize != layoutSize)
+  {
+    DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_FIT_LAYOUT");
+    ModelPtr& model = impl.mModel;
+
+    bool  actualellipsis         = model->mElideEnabled;
+    float minPointSize           = impl.mTextFitMinSize;
+    float maxPointSize           = impl.mTextFitMaxSize;
+    float pointInterval          = impl.mTextFitStepSize;
+    float currentFitPointSize    = impl.mFontDefaults->mFitPointSize;
+    float currentDefaultLineSize = impl.mLayoutEngine.GetDefaultLineSize();
+    bool  isMultiLine            = impl.mLayoutEngine.GetLayout() == Layout::Engine::MULTI_LINE_BOX;
+    // Instead of using the LineSize of the current TextLabel, the LineSize set in TextFit is used.
+
+    impl.SetDefaultLineSize(impl.mTextFitLineSize);
+
+    model->mElideEnabled = false;
+    float bestPointSize = minPointSize;
+
+    // check zero value
+    if(pointInterval < 1.f)
+    {
+      impl.mTextFitStepSize = pointInterval = 1.0f;
+    }
+
+    uint32_t pointSizeRange = static_cast<uint32_t>(ceil((maxPointSize - minPointSize) / pointInterval));
+
+    if(isMultiLine || pointSizeRange < 3)
+    {
+      // Ensure minPointSize + pointSizeRange * pointInverval >= maxPointSize
+      while(minPointSize + static_cast<float>(pointSizeRange) * pointInterval < maxPointSize)
+      {
+        ++pointSizeRange;
+      }
+
+      uint32_t bestSizeIndex = 0;
+      uint32_t minIndex      = bestSizeIndex + 1u;
+      uint32_t maxIndex      = pointSizeRange + 1u;
+
+      bool bestSizeUpdatedLatest = false;
+      // Find best size as binary search.
+      // Range format as [l r). (left closed, right opened)
+      // It mean, we already check all i < l is valid, and r <= i is invalid.
+      // Below binary search will check m = (l+r)/2 point.
+      // Search area sperate as [l m) or [m+1 r)
+      //
+      // Basically, we can assume that 0 (minPointSize) is always valid.
+      // Now, we will check [1 pointSizeRange] range s.t. pointSizeRange mean the maxPointSize
+      while(minIndex < maxIndex)
+      {
+        uint32_t    testIndex     = minIndex + ((maxIndex - minIndex) >> 1u);
+        const float testPointSize = std::min(maxPointSize, minPointSize + static_cast<float>(testIndex) * pointInterval);
+
+        if(CheckForTextFit(controller, testPointSize, layoutSize))
+        {
+          bestSizeUpdatedLatest = true;
+
+          bestSizeIndex = testIndex;
+          minIndex      = testIndex + 1u;
+        }
+        else
+        {
+          bestSizeUpdatedLatest = false;
+          maxIndex              = testIndex;
+        }
+      }
+      bestPointSize = std::min(maxPointSize, minPointSize + static_cast<float>(bestSizeIndex) * pointInterval);
+
+      // Best point size was not updated. re-run so the TextFit should be fitted really.
+      if(!bestSizeUpdatedLatest)
+      {
+        CheckForTextFit(controller, bestPointSize, layoutSize);
+      }
+    }
+    else
+    {
+      // assume textSize = a * pointSize + b, finding a and b.
+      Size              textSize;
+      TextUpdateInfo&   textUpdateInfo  = impl.mTextUpdateInfo;
+      const OperationsMask onlyOnceOperations = static_cast<OperationsMask>(CONVERT_TO_UTF32 |
+                                                                            GET_SCRIPTS |
+                                                                            VALIDATE_FONTS |
+                                                                            GET_LINE_BREAKS |
+                                                                            BIDI_INFO |
+                                                                            SHAPE_TEXT |
+                                                                            GET_GLYPH_METRICS);
+
+      float resultBasedX[2];
+      float resultBasedY[2];
+      float tmpPointSize[2] = {minPointSize, maxPointSize};
+
+      // Calculate a and b by creating simultaneous equations with two calculations.
+      for(int i=0;i<2;i++)
+      {
+        impl.mFontDefaults->mFitPointSize = tmpPointSize[i];
+        impl.mFontDefaults->sizeDefined = true;
+        impl.ClearFontData();
+
+        textUpdateInfo.mParagraphCharacterIndex     = 0u;
+        textUpdateInfo.mRequestedNumberOfCharacters = impl.mModel->mLogicalModel->mText.Count();
+
+
+        // Make sure the model is up-to-date before layouting
+        impl.UpdateModel(onlyOnceOperations);
+
+        DoRelayout(impl,
+                  Size(layoutSize.width, MAX_FLOAT),
+                  static_cast<OperationsMask>(onlyOnceOperations | LAYOUT),
+                  textSize);
+
+        // Clear the update info. This info will be set the next time the text is updated.
+        textUpdateInfo.Clear();
+        textUpdateInfo.mClearAll = true;
+
+        resultBasedX[i] = textSize.x;
+        resultBasedY[i] = textSize.y;
+      }
+
+      float aBasedX = (resultBasedX[1] - resultBasedX[0]) / (tmpPointSize[1] - tmpPointSize[0]);
+      float bBasedX = resultBasedX[1] - aBasedX * tmpPointSize[1];
+      aBasedX = std::max(aBasedX, Dali::Math::MACHINE_EPSILON_1000);
+
+      float aBasedY = (resultBasedY[1] - resultBasedY[0]) / (tmpPointSize[1] - tmpPointSize[0]);
+      float bBasedY = resultBasedY[1] - aBasedY * tmpPointSize[1];
+      aBasedY = std::max(aBasedY, Dali::Math::MACHINE_EPSILON_1000);
+
+      float bestPointSizeBasedX = (layoutSize.x - bBasedX) / aBasedX;
+      float bestPointSizeBasedY = (layoutSize.y - bBasedY) / aBasedY;
+
+      bestPointSize = std::min(bestPointSizeBasedX, bestPointSizeBasedY);
+      bestPointSize = std::min(std::max(bestPointSize, minPointSize), maxPointSize);
+      bestPointSize = std::floor((bestPointSize - minPointSize) / pointInterval) * pointInterval + minPointSize;
+
+      if(CheckForTextFit(controller, bestPointSize, layoutSize))
+      {
+        while(bestPointSize + pointInterval <= maxPointSize && CheckForTextFit(controller, bestPointSize + pointInterval, layoutSize))
+        {
+          bestPointSize += pointInterval;
+        }
+      }
+      else if(bestPointSize - pointInterval >= minPointSize)
+      {
+        do
+        {
+          bestPointSize -= pointInterval;
+        } while(bestPointSize - pointInterval >= minPointSize && !CheckForTextFit(controller, bestPointSize, layoutSize));
+      }
+    }
+
+    model->mElideEnabled = actualellipsis;
+    if(!Dali::Equals(currentFitPointSize, bestPointSize))
+    {
+      impl.mTextFitChanged = true;
+    }
+    // Revert back to the original TextLabel LineSize.
+    impl.SetDefaultLineSize(currentDefaultLineSize);
+    impl.mFontDefaults->mFitPointSize = bestPointSize;
+    impl.mFontDefaults->sizeDefined   = true;
+    impl.ClearFontData();
+  }
+}
+
+float Controller::Relayouter::GetHeightForWidth(Controller& controller, float width)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", &controller, width);
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_GET_HEIGHT_FOR_WIDTH");
+
+  // Make sure the model is up-to-date before layouting
+  EventHandler::ProcessModifyEvents(controller);
+
+  Controller::Impl& impl           = *controller.mImpl;
+  ModelPtr&         model          = impl.mModel;
+  VisualModelPtr&   visualModel    = model->mVisualModel;
+  TextUpdateInfo&   textUpdateInfo = impl.mTextUpdateInfo;
+
+  // Get cached value.
+  Size layoutSize = visualModel->GetHeightForWidth();
+
+  if(fabsf(width - layoutSize.width) > Math::MACHINE_EPSILON_1000 ||
+     textUpdateInfo.mFullRelayoutNeeded ||
+     textUpdateInfo.mClearAll)
+  {
+    // Layout the text for the new width.
+    OperationsMask requestedOperationsMask        = static_cast<OperationsMask>(LAYOUT);
+    Size           sizeRequestedWidthAndMaxHeight = Size(width, MAX_FLOAT);
+
+    layoutSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeRequestedWidthAndMaxHeight, requestedOperationsMask);
+
+    // The calculated layout width may not be the same as the requested width.
+    // For cache efficiency, the requested width is stored.
+    layoutSize.width = width;
+    visualModel->SetHeightForWidth(layoutSize);
+
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height);
+  }
+  else
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height);
+  }
+
+  return layoutSize.height;
+}
+
+Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controller, const Size& size, Dali::LayoutDirection::Type layoutDirection)
+{
+  Controller::Impl& impl           = *controller.mImpl;
+  ModelPtr&         model          = impl.mModel;
+  VisualModelPtr&   visualModel    = model->mVisualModel;
+  TextUpdateInfo&   textUpdateInfo = impl.mTextUpdateInfo;
+
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", &controller, size.width, size.height, impl.mIsAutoScrollEnabled ? "true" : "false");
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_RELAYOUT");
+
+  UpdateTextType updateTextType = NONE_UPDATED;
+
+  if((size.width < Math::MACHINE_EPSILON_1000) || (size.height < Math::MACHINE_EPSILON_1000))
+  {
+    if(0u != visualModel->mGlyphPositions.Count())
+    {
+      visualModel->mGlyphPositions.Clear();
+      updateTextType = MODEL_UPDATED;
+    }
+
+    // Clear the update info. This info will be set the next time the text is updated.
+    textUpdateInfo.Clear();
+
+    // Not worth to relayout if width or height is equal to zero.
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n");
+
+    return updateTextType;
+  }
+
+  // Whether a new size has been set.
+  const bool newSize = (size != visualModel->mControlSize);
+
+  // Get a reference to the pending operations member
+  OperationsMask& operationsPending = impl.mOperationsPending;
+
+  if(newSize)
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", visualModel->mControlSize.width, visualModel->mControlSize.height);
+
+    if((0 == textUpdateInfo.mNumberOfCharactersToAdd) &&
+       (0 == textUpdateInfo.mPreviousNumberOfCharacters) &&
+       ((visualModel->mControlSize.width < Math::MACHINE_EPSILON_1000) || (visualModel->mControlSize.height < Math::MACHINE_EPSILON_1000)))
+    {
+      textUpdateInfo.mNumberOfCharactersToAdd = model->mLogicalModel->mText.Count();
+    }
+
+    // Layout operations that need to be done if the size changes.
+    operationsPending = static_cast<OperationsMask>(operationsPending |
+                                                    LAYOUT |
+                                                    ALIGN |
+                                                    UPDATE_LAYOUT_SIZE |
+                                                    REORDER);
+    // Set the update info to relayout the whole text.
+    textUpdateInfo.mFullRelayoutNeeded = true;
+    textUpdateInfo.mCharacterIndex     = 0u;
+
+    // Store the size used to layout the text.
+    visualModel->mControlSize = size;
+  }
+
+  // Whether there are modify events.
+  if(0u != impl.mModifyEvents.Count())
+  {
+    // Style operations that need to be done if the text is modified.
+    operationsPending = static_cast<OperationsMask>(operationsPending | COLOR);
+  }
+
+  // Set the update info to elide the text.
+  if(model->mElideEnabled ||
+     ((NULL != impl.mEventData) && impl.mEventData->mIsPlaceholderElideEnabled))
+  {
+    // Update Text layout for applying elided
+    operationsPending                  = static_cast<OperationsMask>(operationsPending |
+                                                    ALIGN |
+                                                    LAYOUT |
+                                                    UPDATE_LAYOUT_SIZE |
+                                                    REORDER);
+    textUpdateInfo.mFullRelayoutNeeded = true;
+    textUpdateInfo.mCharacterIndex     = 0u;
+  }
+
+  bool layoutDirectionChanged = false;
+  if(impl.mLayoutDirection != layoutDirection)
+  {
+    // Flag to indicate that the layout direction has changed.
+    layoutDirectionChanged = true;
+    // Clear the update info. This info will be set the next time the text is updated.
+    textUpdateInfo.mClearAll = true;
+    // Apply modifications to the model
+    // Shape the text again is needed because characters like '()[]{}' have to be mirrored and the glyphs generated again.
+    operationsPending     = static_cast<OperationsMask>(operationsPending |
+                                                    GET_GLYPH_METRICS |
+                                                    SHAPE_TEXT |
+                                                    UPDATE_DIRECTION |
+                                                    ALIGN |
+                                                    LAYOUT |
+                                                    BIDI_INFO |
+                                                    REORDER);
+    impl.mLayoutDirection = layoutDirection;
+  }
+
+  // Make sure the model is up-to-date before layouting.
+  EventHandler::ProcessModifyEvents(controller);
+  bool updated = impl.UpdateModel(operationsPending);
+
+  // Layout the text.
+  Size layoutSize;
+  updated = DoRelayout(impl, size, operationsPending, layoutSize) || updated;
+
+  if(updated)
+  {
+    updateTextType = MODEL_UPDATED;
+  }
+
+  // Do not re-do any operation until something changes.
+  operationsPending          = NO_OPERATION;
+  model->mScrollPositionLast = model->mScrollPosition;
+
+  // Whether the text control is editable
+  const bool isEditable = NULL != impl.mEventData;
+
+  // Keep the current offset as it will be used to update the decorator's positions (if the size changes).
+  Vector2 offset;
+  if(newSize && isEditable)
+  {
+    offset = model->mScrollPosition;
+  }
+
+  if(!isEditable || !controller.IsMultiLineEnabled())
+  {
+    // After doing the text layout, the vertical offset to place the actor in the desired position can be calculated.
+    CalculateVerticalOffset(impl, size);
+  }
+  else // TextEditor
+  {
+    // If layoutSize is bigger than size, vertical align has no meaning.
+    if(layoutSize.y < size.y)
+    {
+      CalculateVerticalOffset(impl, size);
+      if(impl.mEventData)
+      {
+        impl.mEventData->mScrollAfterDelete = false;
+      }
+    }
+  }
+
+  if(isEditable)
+  {
+    if(newSize || layoutDirectionChanged)
+    {
+      // If there is a new size or layout direction is changed, the scroll position needs to be clamped.
+      impl.ClampHorizontalScroll(layoutSize);
+
+      // Update the decorator's positions is needed if there is a new size.
+      impl.mEventData->mDecorator->UpdatePositions(model->mScrollPosition - offset);
+
+      // All decorator elements need to be updated.
+      if(EventData::IsEditingState(impl.mEventData->mState))
+      {
+        impl.mEventData->mScrollAfterUpdatePosition = true;
+        impl.mEventData->mUpdateCursorPosition      = true;
+        impl.mEventData->mUpdateGrabHandlePosition  = true;
+      }
+      else if(impl.mEventData->mState == EventData::SELECTING)
+      {
+        impl.mEventData->mUpdateHighlightBox = true;
+      }
+    }
+
+    // Move the cursor, grab handle etc.
+    if(impl.ProcessInputEvents())
+    {
+      updateTextType = static_cast<UpdateTextType>(updateTextType | DECORATOR_UPDATED);
+    }
+  }
+
+  // Clear the update info. This info will be set the next time the text is updated.
+  textUpdateInfo.Clear();
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout\n");
+
+  return updateTextType;
+}
+
+bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size, OperationsMask operationsRequired, Size& layoutSize)
+{
+  bool layoutTooSmall = false;
+  return DoRelayout(impl, size, operationsRequired, layoutSize, layoutTooSmall);
+}
+
+bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size, OperationsMask operationsRequired, Size& layoutSize, bool& layoutTooSmall)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::Relayouter::DoRelayout %p size %f,%f\n", &impl, size.width, size.height);
+  DALI_TRACE_SCOPE(gTraceFilter2, "DALI_TEXT_DORELAYOUT");
+  bool viewUpdated(false);
+
+  // Calculate the operations to be done.
+  const OperationsMask operations = static_cast<OperationsMask>(impl.mOperationsPending & operationsRequired);
+
+  TextUpdateInfo&      textUpdateInfo              = impl.mTextUpdateInfo;
+  const CharacterIndex startIndex                  = textUpdateInfo.mParagraphCharacterIndex;
+  const Length         requestedNumberOfCharacters = textUpdateInfo.mRequestedNumberOfCharacters;
+
+  // Get the current layout size.
+  VisualModelPtr& visualModel = impl.mModel->mVisualModel;
+  layoutSize                  = visualModel->GetLayoutSize();
+
+  if(NO_OPERATION != (LAYOUT & operations))
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n");
+
+    // Some vectors with data needed to layout and reorder may be void
+    // after the first time the text has been laid out.
+    // Fill the vectors again.
+
+    // Calculate the number of glyphs to layout.
+    const Vector<GlyphIndex>& charactersToGlyph        = visualModel->mCharactersToGlyph;
+    const Vector<Length>&     glyphsPerCharacter       = visualModel->mGlyphsPerCharacter;
+    const GlyphIndex* const   charactersToGlyphBuffer  = charactersToGlyph.Begin();
+    const Length* const       glyphsPerCharacterBuffer = glyphsPerCharacter.Begin();
+
+    const CharacterIndex lastIndex       = startIndex + ((requestedNumberOfCharacters > 0u) ? requestedNumberOfCharacters - 1u : 0u);
+    const GlyphIndex     startGlyphIndex = textUpdateInfo.mStartGlyphIndex;
+
+    // Make sure the index is not out of bound
+    if(charactersToGlyph.Count() != glyphsPerCharacter.Count() ||
+       requestedNumberOfCharacters > charactersToGlyph.Count() ||
+       (lastIndex > charactersToGlyph.Count() && charactersToGlyph.Count() > 0u))
+    {
+      std::string currentText;
+      impl.GetText(currentText);
+
+      DALI_LOG_ERROR("Controller::DoRelayout: Attempting to access invalid buffer\n");
+      DALI_LOG_ERROR("Current text is: %s\n", currentText.c_str());
+      DALI_LOG_ERROR("startIndex: %u, lastIndex: %u, requestedNumberOfCharacters: %u, charactersToGlyph.Count = %lu, glyphsPerCharacter.Count = %lu\n", startIndex, lastIndex, requestedNumberOfCharacters, charactersToGlyph.Count(), glyphsPerCharacter.Count());
+
+      return false;
+    }
+
+    const Length numberOfGlyphs      = (requestedNumberOfCharacters > 0u) ? *(charactersToGlyphBuffer + lastIndex) + *(glyphsPerCharacterBuffer + lastIndex) - startGlyphIndex : 0u;
+    const Length totalNumberOfGlyphs = visualModel->mGlyphs.Count();
+
+    if(0u == totalNumberOfGlyphs)
+    {
+      if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations))
+      {
+        visualModel->SetLayoutSize(Size::ZERO);
+      }
+
+      // Nothing else to do if there is no glyphs.
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n");
+      return true;
+    }
+
+    // Set the layout parameters.
+    Layout::Parameters layoutParameters(size, impl.mModel);
+
+    // Resize the vector of positions to have the same size than the vector of glyphs.
+    Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
+    glyphPositions.Resize(totalNumberOfGlyphs);
+
+    // Whether the last character is a new paragraph character.
+    const Character* const textBuffer           = impl.mModel->mLogicalModel->mText.Begin();
+    textUpdateInfo.mIsLastCharacterNewParagraph = TextAbstraction::IsNewParagraph(*(textBuffer + (impl.mModel->mLogicalModel->mText.Count() - 1u)));
+    layoutParameters.isLastNewParagraph         = textUpdateInfo.mIsLastCharacterNewParagraph;
+
+    // The initial glyph and the number of glyphs to layout.
+    layoutParameters.startGlyphIndex        = startGlyphIndex;
+    layoutParameters.numberOfGlyphs         = numberOfGlyphs;
+    layoutParameters.startLineIndex         = textUpdateInfo.mStartLineIndex;
+    layoutParameters.estimatedNumberOfLines = textUpdateInfo.mEstimatedNumberOfLines;
+
+    // Update the ellipsis
+    bool elideTextEnabled = impl.mModel->mElideEnabled;
+    auto ellipsisPosition = impl.mModel->mEllipsisPosition;
+
+    if(NULL != impl.mEventData)
+    {
+      if(impl.mEventData->mPlaceholderEllipsisFlag && impl.IsShowingPlaceholderText())
+      {
+        elideTextEnabled = impl.mEventData->mIsPlaceholderElideEnabled;
+      }
+      else if(EventData::INACTIVE != impl.mEventData->mState)
+      {
+        // Disable ellipsis when editing
+        elideTextEnabled = false;
+      }
+
+      // Reset the scroll position in inactive state
+      if(elideTextEnabled && (impl.mEventData->mState == EventData::INACTIVE))
+      {
+        impl.ResetScrollPosition();
+      }
+    }
+
+    // Update the visual model.
+    bool isAutoScrollEnabled            = impl.mIsAutoScrollEnabled;
+    bool isAutoScrollMaxTextureExceeded = impl.mIsAutoScrollMaxTextureExceeded;
+    bool isHiddenInputEnabled           = false;
+    if(impl.mHiddenInput && impl.mEventData != nullptr && impl.mHiddenInput->GetHideMode() != Toolkit::HiddenInput::Mode::HIDE_NONE)
+    {
+      isHiddenInputEnabled = true;
+    }
+
+    Size newLayoutSize;
+    viewUpdated               = impl.mLayoutEngine.LayoutText(layoutParameters,
+                                                newLayoutSize,
+                                                elideTextEnabled,
+                                                isAutoScrollEnabled,
+                                                isAutoScrollMaxTextureExceeded,
+                                                isHiddenInputEnabled,
+                                                ellipsisPosition);
+    impl.mIsAutoScrollEnabled = isAutoScrollEnabled;
+    layoutTooSmall = !viewUpdated;
+
+    viewUpdated = viewUpdated || (newLayoutSize != layoutSize);
+
+    if(viewUpdated)
+    {
+      layoutSize = newLayoutSize;
+
+      if(NO_OPERATION != (UPDATE_DIRECTION & operations))
+      {
+        impl.mIsTextDirectionRTL = false;
+      }
+
+      if((NO_OPERATION != (UPDATE_DIRECTION & operations)) && !visualModel->mLines.Empty())
+      {
+        impl.mIsTextDirectionRTL = visualModel->mLines[0u].direction;
+      }
+
+      // Sets the layout size.
+      if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations))
+      {
+        visualModel->SetLayoutSize(layoutSize);
+      }
+    } // view updated
+  }
+
+  if(NO_OPERATION != (ALIGN & operations))
+  {
+    DoRelayoutHorizontalAlignment(impl, size, startIndex, requestedNumberOfCharacters);
+    viewUpdated = true;
+  }
+#if defined(DEBUG_ENABLED)
+  std::string currentText;
+  impl.GetText(currentText);
+  DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::Relayouter::DoRelayout [%p] mImpl->mIsTextDirectionRTL[%s] [%s]\n", &impl, (impl.mIsTextDirectionRTL) ? "true" : "false", currentText.c_str());
+#endif
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayouter::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false"));
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayouter::DoRelayout, layout too small %s\n", (layoutTooSmall ? "true" : "false"));
+  return viewUpdated;
+}
+
+void Controller::Relayouter::DoRelayoutHorizontalAlignment(Controller::Impl&    impl,
+                                                           const Size&          size,
+                                                           const CharacterIndex startIndex,
+                                                           const Length         requestedNumberOfCharacters)
+{
+  // The visualModel
+  VisualModelPtr& visualModel = impl.mModel->mVisualModel;
+
+  // The laid-out lines.
+  Vector<LineRun>& lines = visualModel->mLines;
+
+  CharacterIndex alignStartIndex                  = startIndex;
+  Length         alignRequestedNumberOfCharacters = requestedNumberOfCharacters;
+
+  // the whole text needs to be full aligned.
+  // If you do not do a full aligned, only the last line of the multiline input is aligned.
+  if(impl.mEventData && impl.mEventData->mUpdateAlignment)
+  {
+    alignStartIndex                   = 0u;
+    alignRequestedNumberOfCharacters  = impl.mModel->mLogicalModel->mText.Count();
+    impl.mEventData->mUpdateAlignment = false;
+  }
+
+  // If there is no BoundedParagraphRuns then apply the alignment of controller.
+  // Check whether the layout is single line. It's needed to apply one alignment for single-line.
+  // In single-line layout case we need to check whether to follow the alignment of controller or the first BoundedParagraph.
+  // Apply BoundedParagraph's alignment if and only if there is one BoundedParagraph contains all characters. Otherwise follow controller's alignment.
+  const bool isFollowControllerAlignment = ((impl.mModel->GetNumberOfBoundedParagraphRuns() == 0u) ||
+                                            ((Layout::Engine::SINGLE_LINE_BOX == impl.mLayoutEngine.GetLayout()) &&
+                                             (impl.mModel->GetBoundedParagraphRuns()[0].characterRun.numberOfCharacters != impl.mModel->mLogicalModel->mText.Count())));
+
+  if(isFollowControllerAlignment)
+  {
+    // Need to align with the control's size as the text may contain lines
+    // starting either with left to right text or right to left.
+    impl.mLayoutEngine.Align(size,
+                             alignStartIndex,
+                             alignRequestedNumberOfCharacters,
+                             impl.mModel->mHorizontalAlignment,
+                             lines,
+                             impl.mModel->mAlignmentOffset,
+                             impl.mLayoutDirection,
+                             (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS));
+  }
+  else
+  {
+    //Override the controller horizontal-alignment by horizontal-alignment of bounded paragraph.
+    const Length&                      numberOfBoundedParagraphRuns = impl.mModel->GetNumberOfBoundedParagraphRuns();
+    const Vector<BoundedParagraphRun>& boundedParagraphRuns         = impl.mModel->GetBoundedParagraphRuns();
+    const CharacterIndex               alignEndIndex                = alignStartIndex + alignRequestedNumberOfCharacters - 1u;
+
+    Length alignIndex               = alignStartIndex;
+    Length boundedParagraphRunIndex = 0u;
+
+    while(alignIndex <= alignEndIndex && boundedParagraphRunIndex < numberOfBoundedParagraphRuns)
+    {
+      //BP: BoundedParagraph
+      const BoundedParagraphRun& boundedParagraphRun   = boundedParagraphRuns[boundedParagraphRunIndex];
+      const CharacterIndex&      characterStartIndexBP = boundedParagraphRun.characterRun.characterIndex;
+      const Length&              numberOfCharactersBP  = boundedParagraphRun.characterRun.numberOfCharacters;
+      const CharacterIndex       characterEndIndexBP   = characterStartIndexBP + numberOfCharactersBP - 1u;
+
+      CharacterIndex                  decidedAlignStartIndex         = alignIndex;
+      Length                          decidedAlignNumberOfCharacters = alignEndIndex - alignIndex + 1u;
+      Text::HorizontalAlignment::Type decidedHorizontalAlignment     = impl.mModel->mHorizontalAlignment;
+
+      /*
+         * Shortcuts to explain indexes cases:
+         *
+         * AS: Alignment Start Index
+         * AE: Alignment End Index
+         * PS: Paragraph Start Index
+         * PE: Paragraph End Index
+         * B: BoundedParagraph Alignment
+         * M: Model Alignment
+         *
+         */
+
+      if(alignIndex < characterStartIndexBP && characterStartIndexBP <= alignEndIndex) /// AS.MMMMMM.PS--------AE
+      {
+        // Alignment from "Alignment Start Index" to index before "Paragraph Start Index" according to "Model Alignment"
+        decidedAlignStartIndex         = alignIndex;
+        decidedAlignNumberOfCharacters = characterStartIndexBP - alignIndex;
+        decidedHorizontalAlignment     = impl.mModel->mHorizontalAlignment;
+
+        // Need to re-heck the case of current bounded paragraph
+        alignIndex = characterStartIndexBP; // Shift AS to be PS
+      }
+      else if((characterStartIndexBP <= alignIndex && alignIndex <= characterEndIndexBP) ||     /// ---PS.BBBBBBB.AS.BBBBBBB.PE---
+              (characterStartIndexBP <= alignEndIndex && alignEndIndex <= characterEndIndexBP)) /// ---PS.BBBBBB.AE.BBBBBBB.PE---
+      {
+        // Alignment from "Paragraph Start Index" to "Paragraph End Index" according to "BoundedParagraph Alignment"
+        decidedAlignStartIndex         = characterStartIndexBP;
+        decidedAlignNumberOfCharacters = numberOfCharactersBP;
+        decidedHorizontalAlignment     = boundedParagraphRun.horizontalAlignmentDefined ? boundedParagraphRun.horizontalAlignment : impl.mModel->mHorizontalAlignment;
+
+        alignIndex = characterEndIndexBP + 1u; // Shift AS to be after PE direct
+        boundedParagraphRunIndex++;            // Align then check the case of next bounded paragraph
+      }
+      else
+      {
+        boundedParagraphRunIndex++; // Check the case of next bounded paragraph
+        continue;
+      }
+
+      impl.mLayoutEngine.Align(size,
+                               decidedAlignStartIndex,
+                               decidedAlignNumberOfCharacters,
+                               decidedHorizontalAlignment,
+                               lines,
+                               impl.mModel->mAlignmentOffset,
+                               impl.mLayoutDirection,
+                               (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS));
+    }
+
+    //Align the remaining that is not aligned
+    if(alignIndex <= alignEndIndex)
+    {
+      impl.mLayoutEngine.Align(size,
+                               alignIndex,
+                               (alignEndIndex - alignIndex + 1u),
+                               impl.mModel->mHorizontalAlignment,
+                               lines,
+                               impl.mModel->mAlignmentOffset,
+                               impl.mLayoutDirection,
+                               (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS));
+    }
+  }
+}
+
+void Controller::Relayouter::CalculateVerticalOffset(Controller::Impl& impl, const Size& controlSize)
+{
+  ModelPtr&       model                 = impl.mModel;
+  VisualModelPtr& visualModel           = model->mVisualModel;
+  Size            layoutSize            = model->mVisualModel->GetLayoutSize();
+  Size            oldLayoutSize         = layoutSize;
+  float           offsetY               = 0.f;
+  bool            needRecalc            = false;
+  float           defaultFontLineHeight = impl.GetDefaultFontLineHeight();
+
+  if(fabsf(layoutSize.height) < Math::MACHINE_EPSILON_1000)
+  {
+    // Get the line height of the default font.
+    layoutSize.height = defaultFontLineHeight;
+  }
+
+  // Whether the text control is editable
+  const bool isEditable = NULL != impl.mEventData;
+  if(isEditable && !Dali::Equals(layoutSize.height, defaultFontLineHeight) && impl.IsShowingPlaceholderText())
+  {
+    // This code prevents the wrong positioning of cursor when the layout size is bigger/smaller than defaultFontLineHeight.
+    // This situation occurs when the size of placeholder text is different from the default text.
+    layoutSize.height = defaultFontLineHeight;
+    needRecalc        = true;
+  }
+
+  switch(model->mVerticalAlignment)
+  {
+    case VerticalAlignment::TOP:
+    {
+      model->mScrollPosition.y = 0.f;
+      offsetY                  = 0.f;
+      break;
+    }
+    case VerticalAlignment::CENTER:
+    {
+      model->mScrollPosition.y = floorf(0.5f * (controlSize.height - layoutSize.height)); // try to avoid pixel alignment.
+      if(needRecalc) offsetY = floorf(0.5f * (layoutSize.height - oldLayoutSize.height));
+      break;
+    }
+    case VerticalAlignment::BOTTOM:
+    {
+      model->mScrollPosition.y = controlSize.height - layoutSize.height;
+      if(needRecalc) offsetY = layoutSize.height - oldLayoutSize.height;
+      break;
+    }
+  }
+
+  if(needRecalc)
+  {
+    // Update glyphPositions according to recalculation.
+    const Length     positionCount  = visualModel->mGlyphPositions.Count();
+    Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
+    for(Length index = 0u; index < positionCount; index++)
+    {
+      glyphPositions[index].y += offsetY;
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/controller/text-controller-relayouter.h b/dali-toolkit/internal/text/controller/text-controller-relayouter.h
new file mode 100644
index 0000000..3f7c3b9
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-relayouter.h
@@ -0,0 +1,163 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_RELAYOUTER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_RELAYOUTER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor-enumerations.h>
+#include <dali/public-api/math/vector2.h>
+#include <dali/public-api/math/vector3.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * Contains all the relayouting related methods for Text::Controller
+ */
+struct Controller::Relayouter
+{
+  /**
+   * @brief Called by the Controller to retrieve the natural size.
+   *
+   * @param[in] controller A reference to the controller class
+   * @return
+   */
+  static Vector3 GetNaturalSize(Controller& controller);
+
+  /**
+   * @brief Called by the Controller to check if the text fits.
+   *
+   * @param[in] controller A reference to the controller class
+   * @param[in] pointSize The point size
+   * @param[in] layoutSize The layout size
+   * @return
+   */
+  static bool CheckForTextFit(Controller& controller, float pointSize, const Size& layoutSize);
+
+  /**
+   * @brief Calculates the point size for text for given layout()
+   *
+   * @param[in] controller A reference to the controller class
+   * @param[in] layoutSize The layout size
+   */
+  static void FitPointSizeforLayout(Controller& controller, const Size& layoutSize);
+
+  /**
+   * @brief Calculates the point size for text for given layout() using text fit array.
+   *
+   * @param[in] controller A reference to the controller class
+   * @param[in] layoutSize The layout size
+   */
+  static void FitArrayPointSizeforLayout(Controller& controller, const Size& layoutSize);
+
+  /**
+   * @brief Called by the Controller to get the height for a particular width.
+   *
+   * @param[in] controller A reference to the controller class
+   * @param[in] width The width we want the height for
+   * @return
+   */
+  static float GetHeightForWidth(Controller& controller, float width);
+
+  /**
+   * @brief Called by the Controller to do the relayout itself.
+   *
+   * @param[in] controller A reference to the controller class
+   * @param[in] size The size to set
+   * @param[in] layoutDirection The layout direction
+   * @return
+   */
+  static Controller::UpdateTextType Relayout(Controller& controller, const Size& size, Dali::LayoutDirection::Type layoutDirection);
+
+  /**
+   * @brief Called by the Controller to do certain operations when relayouting.
+   *
+   * @param[in] impl A reference to the controller impl class
+   * @param[in] size The size to set
+   * @param[in] operationsRequired The operations we need to do
+   * @param[in/out] layoutSize The Layout size which can be updated depending on the result of the performed operations
+   * @return whether view updated after relayout
+   */
+
+  static bool DoRelayout(Controller::Impl& impl, const Size& size, OperationsMask operationsRequired, Size& layoutSize);
+
+  /**
+   * @brief Called by the Controller to do certain operations when relayouting.
+   *
+   * @param[in] impl A reference to the controller impl class
+   * @param[in] size The size to set
+   * @param[in] operationsRequired The operations we need to do
+   * @param[in/out] layoutSize The Layout size which can be updated depending on the result of the performed operations
+   * @param[out] layoutTooSmall True if layout is too small to render one glyph, else false.
+   * @return whether view updated after relayout
+   */
+
+  static bool DoRelayout(Controller::Impl& impl, const Size& size, OperationsMask operationsRequired, Size& layoutSize, bool& layoutTooSmall);
+
+  /**
+   * @brief Called by the Controller to calculate the veritcal offset give the control size.
+   *
+   * @param[in] impl A reference to the controller impl class
+   * @param[in] controlSize The control size
+   */
+  static void CalculateVerticalOffset(Controller::Impl& impl, const Size& controlSize);
+
+  /**
+  * @brief Calculates the layout size of control according to @p requestedControllerSize and @p requestedOperationsMask
+  *
+  * GetNaturalSize() and GetHeightForWidth() calls this method.
+  *
+  * @param[in] controller The controller to calcualte size on it.
+  * @param[in] requestedControllerSize The requested size of controller to calcualte layout size on it.
+  * @param[in] requestedOperationsMask The requested operations-mask to calcualte layout size according to it.
+  *
+  * @return The calculated layout-size.
+  */
+  static Size CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask);
+
+private:
+  /**
+   * @brief Called by the DoRelayout to do HorizontalAlignment operation when relayouting.
+   *
+   * @param[in] impl A reference to the controller impl class
+   * @param[in] size The size to set
+   * @param[in] startIndex The start index for relayouting
+   * @param[in] requestedNumberOfCharacters The number Of characters for relayouting
+   */
+
+  static void DoRelayoutHorizontalAlignment(Controller::Impl& impl, const Size& size, const CharacterIndex startIndex, const Length requestedNumberOfCharacters);
+};
+
+inline bool compareByPointSize(Toolkit::DevelTextLabel::FitOption& lhs, Toolkit::DevelTextLabel::FitOption& rhs)
+{
+  return lhs.GetPointSize() < rhs.GetPointSize();
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_RELAYOUTER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-spannable-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-spannable-handler.cpp
new file mode 100644
index 0000000..af765fa
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-spannable-handler.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-spannable-handler.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+} // namespace
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void Controller::SpannableHandler::SetSpannedText(Controller& controller, const Text::Spanned& spannedText)
+{
+  // Copy content(text)
+  const std::string& text = spannedText.ToString();
+  Controller::TextUpdater::SetText(controller, text);
+
+  Controller::Impl& impl         = *controller.mImpl;
+  LogicalModelPtr&  logicalModel = impl.mModel->mLogicalModel;
+
+  // Set spanned-text
+  logicalModel->mSpannedTextPlaced = true;
+
+  std::vector<Dali::Toolkit::Text::BaseSpan> spans;
+  std::vector<Dali::Toolkit::Text::Range>    ranges;
+  spannedText.RetrieveAllSpansAndRanges(spans, ranges);
+
+  for(std::vector<Dali::Toolkit::Text::BaseSpan>::size_type i = 0; i < spans.size(); i++)
+  {
+    GetImplementation(spans[i]).CreateStyleCharacterRun(logicalModel, ranges[i]);
+  }
+}
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/controller/text-controller-spannable-handler.h b/dali-toolkit/internal/text/controller/text-controller-spannable-handler.h
new file mode 100644
index 0000000..b420010
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-spannable-handler.h
@@ -0,0 +1,49 @@
+#ifndef DALI_TOOLKIT_TEXT_SPANNABLE_HANDLER_H
+#define DALI_TOOLKIT_TEXT_SPANNABLE_HANDLER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Methods that update the text
+ */
+struct Controller::SpannableHandler
+{
+  /// @copydoc Text::Contoller::SetSpannedText
+  /// @param[in] controller The controller
+  static void SetSpannedText(Controller& controller, const Text::Spanned& spannedText);
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_SPANNABLE_HANDLER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller-text-updater.cpp b/dali-toolkit/internal/text/controller/text-controller-text-updater.cpp
new file mode 100644
index 0000000..59da80a
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-text-updater.cpp
@@ -0,0 +1,866 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/math/math-utils.h>
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/characters-helper-functions.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/emoji-helper.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
+#include <dali-toolkit/internal/text/text-editable-control-interface.h>
+
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+} // namespace
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void Controller::TextUpdater::SetText(Controller& controller, const std::string& text)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SetText\n");
+
+  Controller::Impl& impl = *controller.mImpl;
+
+  // Reset keyboard as text changed
+  impl.ResetInputMethodContext();
+
+  // Remove the previously set text and style.
+  ResetText(controller);
+
+  // Remove the style.
+  impl.ClearStyleData();
+
+  CharacterIndex lastCursorIndex = 0u;
+
+  EventData*& eventData = impl.mEventData;
+
+  if(nullptr != eventData)
+  {
+    // If popup shown then hide it by switching to Editing state
+    if((EventData::SELECTING == eventData->mState) ||
+       (EventData::EDITING_WITH_POPUP == eventData->mState) ||
+       (EventData::EDITING_WITH_GRAB_HANDLE == eventData->mState) ||
+       (EventData::EDITING_WITH_PASTE_POPUP == eventData->mState))
+    {
+      if((impl.mSelectableControlInterface != nullptr) && (EventData::SELECTING == eventData->mState))
+      {
+        impl.mSelectableControlInterface->SelectionChanged(eventData->mLeftSelectionPosition, eventData->mRightSelectionPosition, eventData->mPrimaryCursorPosition, eventData->mPrimaryCursorPosition);
+      }
+
+      impl.ChangeState(EventData::EDITING);
+    }
+  }
+
+  if(!text.empty())
+  {
+    ModelPtr&        model        = impl.mModel;
+    LogicalModelPtr& logicalModel = model->mLogicalModel;
+    model->mVisualModel->SetTextColor(impl.mTextColor);
+
+    MarkupProcessData markupProcessData(logicalModel->mColorRuns,
+                                        logicalModel->mFontDescriptionRuns,
+                                        logicalModel->mEmbeddedItems,
+                                        logicalModel->mAnchors,
+                                        logicalModel->mUnderlinedCharacterRuns,
+                                        logicalModel->mBackgroundColorRuns,
+                                        logicalModel->mStrikethroughCharacterRuns,
+                                        logicalModel->mBoundedParagraphRuns,
+                                        logicalModel->mCharacterSpacingCharacterRuns);
+
+    Length         textSize = 0u;
+    const uint8_t* utf8     = NULL;
+    if(impl.mMarkupProcessorEnabled)
+    {
+      MarkupPropertyData markupPropertyData(impl.mAnchorColor, impl.mAnchorClickedColor);
+
+      ProcessMarkupString(text, markupPropertyData, markupProcessData);
+      textSize = markupProcessData.markupProcessedText.size();
+
+      // This is a bit horrible but std::string returns a (signed) char*
+      utf8 = reinterpret_cast<const uint8_t*>(markupProcessData.markupProcessedText.c_str());
+    }
+    else
+    {
+      textSize = text.size();
+
+      // This is a bit horrible but std::string returns a (signed) char*
+      utf8 = reinterpret_cast<const uint8_t*>(text.c_str());
+    }
+
+    //  Convert text into UTF-32
+    Vector<Character>& utf32Characters = logicalModel->mText;
+    utf32Characters.Resize(textSize);
+
+    // Transform a text array encoded in utf8 into an array encoded in utf32.
+    // It returns the actual number of characters.
+    Length characterCount = Utf8ToUtf32(utf8, textSize, utf32Characters.Begin());
+    utf32Characters.Resize(characterCount);
+
+    DALI_ASSERT_DEBUG(textSize >= characterCount && "Invalid UTF32 conversion length");
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", &controller, textSize, logicalModel->mText.Count());
+
+    // The characters to be added.
+    impl.mTextUpdateInfo.mNumberOfCharactersToAdd = logicalModel->mText.Count();
+
+    // To reset the cursor position
+    lastCursorIndex = characterCount;
+
+    // Update the rest of the model during size negotiation
+    impl.QueueModifyEvent(ModifyEvent::TEXT_REPLACED);
+
+    // The natural size needs to be re-calculated.
+    impl.mRecalculateNaturalSize = true;
+
+    // The text direction needs to be updated.
+    impl.mUpdateTextDirection = true;
+
+    // Apply modifications to the model
+    impl.mOperationsPending = ALL_OPERATIONS;
+  }
+  else
+  {
+    PlaceholderHandler::ShowPlaceholderText(impl);
+  }
+
+  unsigned int oldCursorPos = (nullptr != eventData ? eventData->mPrimaryCursorPosition : 0);
+
+  // Resets the cursor position.
+  controller.ResetCursorPosition(lastCursorIndex);
+
+  // Scrolls the text to make the cursor visible.
+  impl.ResetScrollPosition();
+
+  impl.RequestRelayout();
+
+  if(nullptr != eventData)
+  {
+    // Cancel previously queued events
+    eventData->mEventQueue.clear();
+  }
+
+  // Do this last since it provides callbacks into application code.
+  if(NULL != impl.mEditableControlInterface)
+  {
+    impl.mEditableControlInterface->CursorPositionChanged(oldCursorPos, lastCursorIndex);
+    impl.mEditableControlInterface->TextChanged(true);
+  }
+}
+
+void Controller::TextUpdater::InsertText(Controller& controller, const std::string& text, Controller::InsertType type)
+{
+  Controller::Impl& impl      = *controller.mImpl;
+  EventData*&       eventData = impl.mEventData;
+
+  DALI_ASSERT_DEBUG(nullptr != eventData && "Unexpected InsertText")
+
+  if(NULL == eventData)
+  {
+    return;
+  }
+
+  bool         removedPrevious  = false;
+  bool         removedSelected  = false;
+  bool         maxLengthReached = false;
+  unsigned int oldCursorPos     = eventData->mPrimaryCursorPosition;
+
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", &controller, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), eventData->mPrimaryCursorPosition, eventData->mPreEditFlag, eventData->mPreEditStartPosition, eventData->mPreEditLength);
+
+  ModelPtr&        model        = impl.mModel;
+  LogicalModelPtr& logicalModel = model->mLogicalModel;
+
+  // TODO: At the moment the underline runs are only for pre-edit.
+  model->mVisualModel->mUnderlineRuns.Clear();
+
+  // Remove the previous InputMethodContext pre-edit.
+  if(eventData->mPreEditFlag && (0u != eventData->mPreEditLength))
+  {
+    removedPrevious = RemoveText(controller,
+                                 -static_cast<int>(eventData->mPrimaryCursorPosition - eventData->mPreEditStartPosition),
+                                 eventData->mPreEditLength,
+                                 DONT_UPDATE_INPUT_STYLE,
+                                 true);
+
+    eventData->mPrimaryCursorPosition = eventData->mPreEditStartPosition;
+    eventData->mPreEditLength         = 0u;
+  }
+  else
+  {
+    // Remove the previous Selection.
+    removedSelected = RemoveSelectedText(controller);
+  }
+
+  Vector<Character> utf32Characters;
+  Length            characterCount = 0u;
+
+  if(!text.empty())
+  {
+    std::string redefinedText = text;
+
+    if(controller.mImpl->mInputFilter != NULL)
+    {
+      bool accepted = false;
+      bool rejected = false;
+
+      accepted = impl.mInputFilter->Filter(Toolkit::InputFilter::Property::ACCEPTED, redefinedText);
+      rejected = impl.mInputFilter->Filter(Toolkit::InputFilter::Property::REJECTED, redefinedText);
+
+      if(accepted)
+      {
+        // Signal emits when the string to be inserted is filtered by the accepted filter.
+        controller.mImpl->mEditableControlInterface->InputFiltered(Toolkit::InputFilter::Property::ACCEPTED);
+      }
+      if(rejected)
+      {
+        // Signal emits when the string to be inserted is filtered by the rejected filter.
+        controller.mImpl->mEditableControlInterface->InputFiltered(Toolkit::InputFilter::Property::REJECTED);
+      }
+    }
+
+    //  Convert text into UTF-32
+    utf32Characters.Resize(redefinedText.size());
+
+    // This is a bit horrible but std::string returns a (signed) char*
+    const uint8_t* utf8 = reinterpret_cast<const uint8_t*>(redefinedText.c_str());
+
+    // Transform a text array encoded in utf8 into an array encoded in utf32.
+    // It returns the actual number of characters.
+    characterCount = Utf8ToUtf32(utf8, redefinedText.size(), utf32Characters.Begin());
+    utf32Characters.Resize(characterCount);
+
+    DALI_ASSERT_DEBUG(redefinedText.size() >= utf32Characters.Count() && "Invalid UTF32 conversion length");
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "UTF8 size %d, UTF32 size %d\n", redefinedText.size(), utf32Characters.Count());
+  }
+
+  if(0u != utf32Characters.Count()) // Check if Utf8ToUtf32 conversion succeeded
+  {
+    // The placeholder text is no longer needed
+    if(impl.IsShowingPlaceholderText())
+    {
+      ResetText(controller);
+    }
+
+    impl.ChangeState(EventData::EDITING);
+
+    // Handle the InputMethodContext (predicitive text) state changes
+    if(COMMIT == type)
+    {
+      // InputMethodContext is no longer handling key-events
+      impl.ClearPreEditFlag();
+    }
+    else // PRE_EDIT
+    {
+      if(!eventData->mPreEditFlag)
+      {
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Entered PreEdit state\n");
+
+        // Record the start of the pre-edit text
+        eventData->mPreEditStartPosition = eventData->mPrimaryCursorPosition;
+      }
+
+      eventData->mPreEditLength = utf32Characters.Count();
+      eventData->mPreEditFlag   = true;
+
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", eventData->mPreEditStartPosition, eventData->mPreEditLength);
+    }
+
+    const Length numberOfCharactersInModel = logicalModel->mText.Count();
+
+    // Restrict new text to fit within Maximum characters setting.
+    Length temp_length      = (impl.mMaximumNumberOfCharacters > numberOfCharactersInModel ? impl.mMaximumNumberOfCharacters - numberOfCharactersInModel : 0);
+    Length maxSizeOfNewText = std::min(temp_length, characterCount);
+    maxLengthReached        = (characterCount > maxSizeOfNewText);
+
+    // The cursor position.
+    CharacterIndex& cursorIndex = eventData->mPrimaryCursorPosition;
+
+    // Update the text's style.
+
+    // Updates the text style runs by adding characters.
+    logicalModel->UpdateTextStyleRuns(cursorIndex, maxSizeOfNewText);
+
+    // Get the character index from the cursor index.
+    const CharacterIndex styleIndex = (cursorIndex > 0u) ? cursorIndex - 1u : 0u;
+
+    // Retrieve the text's style for the given index.
+    InputStyle style;
+    impl.RetrieveDefaultInputStyle(style);
+    logicalModel->RetrieveStyle(styleIndex, style);
+
+    InputStyle& inputStyle = eventData->mInputStyle;
+
+    // Whether to add a new text color run.
+    const bool addColorRun = (style.textColor != inputStyle.textColor) && !inputStyle.isDefaultColor;
+
+    // Whether to add a new font run.
+    const bool addFontNameRun   = (style.familyName != inputStyle.familyName) && inputStyle.isFamilyDefined;
+    const bool addFontWeightRun = (style.weight != inputStyle.weight) && inputStyle.isWeightDefined;
+    const bool addFontWidthRun  = (style.width != inputStyle.width) && inputStyle.isWidthDefined;
+    const bool addFontSlantRun  = (style.slant != inputStyle.slant) && inputStyle.isSlantDefined;
+    const bool addFontSizeRun   = (!Dali::Equals(style.size, inputStyle.size)) && inputStyle.isSizeDefined;
+
+    // Add style runs.
+    if(addColorRun)
+    {
+      const VectorBase::SizeType numberOfRuns = logicalModel->mColorRuns.Count();
+      logicalModel->mColorRuns.Resize(numberOfRuns + 1u);
+
+      ColorRun& colorRun                       = *(logicalModel->mColorRuns.Begin() + numberOfRuns);
+      colorRun.color                           = inputStyle.textColor;
+      colorRun.characterRun.characterIndex     = cursorIndex;
+      colorRun.characterRun.numberOfCharacters = maxSizeOfNewText;
+    }
+
+    if(addFontNameRun ||
+       addFontWeightRun ||
+       addFontWidthRun ||
+       addFontSlantRun ||
+       addFontSizeRun)
+    {
+      const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count();
+      logicalModel->mFontDescriptionRuns.Resize(numberOfRuns + 1u);
+
+      FontDescriptionRun& fontDescriptionRun = *(logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns);
+
+      if(addFontNameRun)
+      {
+        fontDescriptionRun.familyLength = inputStyle.familyName.size();
+        fontDescriptionRun.familyName   = new char[fontDescriptionRun.familyLength];
+        memcpy(fontDescriptionRun.familyName, inputStyle.familyName.c_str(), fontDescriptionRun.familyLength);
+        fontDescriptionRun.familyDefined = true;
+
+        // The memory allocated for the font family name is freed when the font description is removed from the logical model.
+      }
+
+      if(addFontWeightRun)
+      {
+        fontDescriptionRun.weight        = inputStyle.weight;
+        fontDescriptionRun.weightDefined = true;
+      }
+
+      if(addFontWidthRun)
+      {
+        fontDescriptionRun.width        = inputStyle.width;
+        fontDescriptionRun.widthDefined = true;
+      }
+
+      if(addFontSlantRun)
+      {
+        fontDescriptionRun.slant        = inputStyle.slant;
+        fontDescriptionRun.slantDefined = true;
+      }
+
+      if(addFontSizeRun)
+      {
+        fontDescriptionRun.size        = static_cast<PointSize26Dot6>(inputStyle.size * impl.GetFontSizeScale() * 64.f);
+        fontDescriptionRun.sizeDefined = true;
+      }
+
+      fontDescriptionRun.characterRun.characterIndex     = cursorIndex;
+      fontDescriptionRun.characterRun.numberOfCharacters = maxSizeOfNewText;
+    }
+
+    // Insert at current cursor position.
+    Vector<Character>& modifyText = logicalModel->mText;
+
+    auto pos = modifyText.End();
+    if(cursorIndex < numberOfCharactersInModel)
+    {
+      pos = modifyText.Begin() + cursorIndex;
+    }
+    unsigned int realPos = static_cast<unsigned int>(pos - modifyText.Begin());
+    modifyText.Insert(pos, utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText);
+
+    if(NULL != impl.mEditableControlInterface)
+    {
+      impl.mEditableControlInterface->TextInserted(realPos, maxSizeOfNewText, text);
+    }
+
+    TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo;
+
+    // Mark the first paragraph to be updated.
+    if(Layout::Engine::SINGLE_LINE_BOX == impl.mLayoutEngine.GetLayout())
+    {
+      textUpdateInfo.mCharacterIndex             = 0;
+      textUpdateInfo.mNumberOfCharactersToRemove = textUpdateInfo.mPreviousNumberOfCharacters;
+      textUpdateInfo.mNumberOfCharactersToAdd    = numberOfCharactersInModel + maxSizeOfNewText;
+      textUpdateInfo.mClearAll                   = true;
+    }
+    else
+    {
+      textUpdateInfo.mCharacterIndex = std::min(cursorIndex, textUpdateInfo.mCharacterIndex);
+      textUpdateInfo.mNumberOfCharactersToAdd += maxSizeOfNewText;
+    }
+
+    if(impl.mMarkupProcessorEnabled)
+    {
+      InsertTextAnchor(controller, maxSizeOfNewText, cursorIndex);
+    }
+
+    // Update the cursor index.
+    cursorIndex += maxSizeOfNewText;
+
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, logicalModel->mText.Count(), eventData->mPrimaryCursorPosition);
+  }
+
+  if((0u == logicalModel->mText.Count()) &&
+     impl.IsPlaceholderAvailable())
+  {
+    // Show place-holder if empty after removing the pre-edit text
+    PlaceholderHandler::ShowPlaceholderText(impl);
+    eventData->mUpdateCursorPosition = true;
+    impl.ClearPreEditFlag();
+  }
+  else if(removedPrevious ||
+          removedSelected ||
+          (0 != utf32Characters.Count()))
+  {
+    // Queue an inserted event
+    impl.QueueModifyEvent(ModifyEvent::TEXT_INSERTED);
+
+    eventData->mUpdateCursorPosition = true;
+    if(removedSelected)
+    {
+      eventData->mScrollAfterDelete = true;
+    }
+    else
+    {
+      eventData->mScrollAfterUpdatePosition = true;
+    }
+  }
+
+  if(nullptr != impl.mEditableControlInterface)
+  {
+    impl.mEditableControlInterface->CursorPositionChanged(oldCursorPos, eventData->mPrimaryCursorPosition);
+  }
+
+  if(maxLengthReached)
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", logicalModel->mText.Count());
+
+    impl.ResetInputMethodContext();
+
+    if(NULL != impl.mEditableControlInterface)
+    {
+      // Do this last since it provides callbacks into application code
+      impl.mEditableControlInterface->MaxLengthReached();
+    }
+  }
+}
+
+void Controller::TextUpdater::PasteText(Controller& controller, const std::string& stringToPaste)
+{
+  InsertText(controller, stringToPaste, Text::Controller::COMMIT);
+  Controller::Impl& impl = *controller.mImpl;
+  impl.ChangeState(EventData::EDITING);
+  impl.RequestRelayout();
+
+  if(NULL != impl.mEditableControlInterface)
+  {
+    // Do this last since it provides callbacks into application code
+    impl.mEditableControlInterface->TextChanged(true);
+  }
+}
+
+bool Controller::TextUpdater::RemoveText(
+  Controller&          controller,
+  int                  cursorOffset,
+  int                  numberOfCharacters,
+  UpdateInputStyleType type,
+  bool                 isDeletingPreEdit)
+{
+  bool removed   = false;
+  bool removeAll = false;
+
+  Controller::Impl& impl      = *controller.mImpl;
+  EventData*&       eventData = impl.mEventData;
+
+  if(nullptr == eventData)
+  {
+    return removed;
+  }
+
+  ModelPtr&        model        = impl.mModel;
+  LogicalModelPtr& logicalModel = model->mLogicalModel;
+  VisualModelPtr&  visualModel  = model->mVisualModel;
+
+  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfCharacters %d\n", &controller, logicalModel->mText.Count(), eventData->mPrimaryCursorPosition, cursorOffset, numberOfCharacters);
+
+  if(!impl.IsShowingPlaceholderText())
+  {
+    // Delete at current cursor position
+    Vector<Character>& currentText         = logicalModel->mText;
+    CharacterIndex&    previousCursorIndex = eventData->mPrimaryCursorPosition;
+
+    CharacterIndex cursorIndex = 0;
+
+    // Validate the cursor position & number of characters
+    if((static_cast<int>(eventData->mPrimaryCursorPosition) + cursorOffset) >= 0)
+    {
+      cursorIndex = eventData->mPrimaryCursorPosition + cursorOffset;
+    }
+
+    //Handle Emoji clustering for cursor handling
+    // Deletion case: this is handling the deletion cases when the cursor is before or after Emoji
+    //  - Before: when use delete key and cursor is before Emoji (cursorOffset = -1)
+    //  - After: when use backspace key and cursor is after Emoji (cursorOffset = 0)
+
+    const Script script = logicalModel->GetScript(cursorIndex);
+    if((numberOfCharacters == 1u) &&
+       (IsOneOfEmojiScripts(script)))
+    {
+      //TODO: Use this clustering for Emoji cases only. This needs more testing to generalize to all scripts.
+      CharacterRun emojiClusteredCharacters = RetrieveClusteredCharactersOfCharacterIndex(visualModel, logicalModel, cursorIndex);
+      Length       actualNumberOfCharacters = emojiClusteredCharacters.numberOfCharacters;
+
+      //Set cursorIndex at the first characterIndex of clustred Emoji
+      cursorIndex = emojiClusteredCharacters.characterIndex;
+
+      numberOfCharacters = actualNumberOfCharacters;
+    }
+
+    if((cursorIndex + numberOfCharacters) > currentText.Count())
+    {
+      numberOfCharacters = currentText.Count() - cursorIndex;
+    }
+
+    if((cursorIndex == 0) && (currentText.Count() - numberOfCharacters == 0))
+    {
+      removeAll = true;
+    }
+
+    TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo;
+
+    if(eventData->mPreEditFlag || removeAll || // If the preedit flag is enabled, it means two (or more) of them came together i.e. when two keys have been pressed at the same time.
+       ((cursorIndex + numberOfCharacters) <= textUpdateInfo.mPreviousNumberOfCharacters))
+    {
+      // Mark the paragraphs to be updated.
+      if(Layout::Engine::SINGLE_LINE_BOX == impl.mLayoutEngine.GetLayout())
+      {
+        textUpdateInfo.mCharacterIndex             = 0;
+        textUpdateInfo.mNumberOfCharactersToRemove = textUpdateInfo.mPreviousNumberOfCharacters;
+        textUpdateInfo.mNumberOfCharactersToAdd    = textUpdateInfo.mPreviousNumberOfCharacters - numberOfCharacters;
+        textUpdateInfo.mClearAll                   = true;
+      }
+      else
+      {
+        textUpdateInfo.mCharacterIndex = std::min(cursorIndex, textUpdateInfo.mCharacterIndex);
+        textUpdateInfo.mNumberOfCharactersToRemove += numberOfCharacters;
+      }
+
+      // Update the input style and remove the text's style before removing the text.
+
+      if(UPDATE_INPUT_STYLE == type)
+      {
+        InputStyle& eventDataInputStyle = eventData->mInputStyle;
+
+        // Keep a copy of the current input style.
+        InputStyle currentInputStyle;
+        currentInputStyle.Copy(eventDataInputStyle);
+
+        // Set first the default input style.
+        impl.RetrieveDefaultInputStyle(eventDataInputStyle);
+
+        // Update the input style.
+        logicalModel->RetrieveStyle(cursorIndex, eventDataInputStyle);
+
+        // Compare if the input style has changed.
+        const bool hasInputStyleChanged = !currentInputStyle.Equal(eventDataInputStyle);
+
+        if(hasInputStyleChanged)
+        {
+          const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask(eventDataInputStyle);
+          // Queue the input style changed signal.
+          eventData->mInputStyleChangedQueue.PushBack(styleChangedMask);
+        }
+      }
+
+      // If the number of current text and the number of characters to be deleted are same,
+      // it means all texts should be removed and all Preedit variables should be initialized.
+      if(removeAll)
+      {
+        impl.ClearPreEditFlag();
+        if(!isDeletingPreEdit)
+        {
+          textUpdateInfo.mNumberOfCharactersToAdd = 0;
+        }
+      }
+
+      // Updates the text style runs by removing characters. Runs with no characters are removed.
+      logicalModel->UpdateTextStyleRuns(cursorIndex, -numberOfCharacters);
+
+      // Remove the characters.
+      Vector<Character>::Iterator first = currentText.Begin() + cursorIndex;
+      Vector<Character>::Iterator last  = first + numberOfCharacters;
+
+      if(NULL != impl.mEditableControlInterface)
+      {
+        std::string utf8;
+        Utf32ToUtf8(first, numberOfCharacters, utf8);
+        impl.mEditableControlInterface->TextDeleted(cursorIndex, numberOfCharacters, utf8);
+      }
+
+      currentText.Erase(first, last);
+
+      if(impl.mMarkupProcessorEnabled)
+      {
+        RemoveTextAnchor(controller, cursorOffset, numberOfCharacters, previousCursorIndex);
+      }
+
+      if(nullptr != impl.mEditableControlInterface)
+      {
+        impl.mEditableControlInterface->CursorPositionChanged(previousCursorIndex, cursorIndex);
+      }
+
+      // Cursor position retreat
+      previousCursorIndex = cursorIndex;
+
+      eventData->mScrollAfterDelete = true;
+
+      if(EventData::INACTIVE == eventData->mState)
+      {
+        impl.ChangeState(EventData::EDITING);
+      }
+
+      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", &controller, numberOfCharacters);
+      removeAll = false;
+      removed   = true;
+    }
+  }
+
+  return removed;
+}
+
+bool Controller::TextUpdater::RemoveSelectedText(Controller& controller)
+{
+  bool textRemoved(false);
+
+  Controller::Impl& impl = *controller.mImpl;
+
+  if(EventData::SELECTING == impl.mEventData->mState)
+  {
+    std::string removedString;
+    uint32_t    oldSelStart = impl.mEventData->mLeftSelectionPosition;
+    uint32_t    oldSelEnd   = impl.mEventData->mRightSelectionPosition;
+
+    impl.RetrieveSelection(removedString, true);
+
+    if(!removedString.empty())
+    {
+      textRemoved = true;
+      impl.ChangeState(EventData::EDITING);
+
+      if(impl.mMarkupProcessorEnabled)
+      {
+        int             cursorOffset        = -1;
+        int             numberOfCharacters  = removedString.length();
+        CharacterIndex& cursorIndex         = impl.mEventData->mPrimaryCursorPosition;
+        CharacterIndex  previousCursorIndex = cursorIndex + numberOfCharacters;
+
+        RemoveTextAnchor(controller, cursorOffset, numberOfCharacters, previousCursorIndex);
+      }
+
+      if(impl.mSelectableControlInterface != nullptr)
+      {
+        impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, impl.mEventData->mPrimaryCursorPosition, impl.mEventData->mPrimaryCursorPosition);
+      }
+    }
+  }
+
+  return textRemoved;
+}
+
+void Controller::TextUpdater::ResetText(Controller& controller)
+{
+  Controller::Impl& impl         = *controller.mImpl;
+  LogicalModelPtr&  logicalModel = impl.mModel->mLogicalModel;
+
+  // Reset spanned-text
+  logicalModel->mSpannedTextPlaced = false;
+
+  // Reset buffers.
+  logicalModel->mText.Clear();
+
+  // Reset the embedded images buffer.
+  logicalModel->ClearEmbeddedImages();
+
+  // Reset the anchors buffer.
+  logicalModel->ClearAnchors();
+
+  // We have cleared everything including the placeholder-text
+  impl.PlaceholderCleared();
+
+  impl.mTextUpdateInfo.mCharacterIndex             = 0u;
+  impl.mTextUpdateInfo.mNumberOfCharactersToRemove = impl.mTextUpdateInfo.mPreviousNumberOfCharacters;
+  impl.mTextUpdateInfo.mNumberOfCharactersToAdd    = 0u;
+
+  // Clear any previous text.
+  impl.mTextUpdateInfo.mClearAll = true;
+
+  // The natural size needs to be re-calculated.
+  impl.mRecalculateNaturalSize = true;
+
+  // The text direction needs to be updated.
+  impl.mUpdateTextDirection = true;
+
+  // Apply modifications to the model
+  impl.mOperationsPending = ALL_OPERATIONS;
+}
+
+void Controller::TextUpdater::InsertTextAnchor(Controller& controller, int numberOfCharacters, CharacterIndex previousCursorIndex)
+{
+  Controller::Impl& impl         = *controller.mImpl;
+  ModelPtr&         model        = impl.mModel;
+  LogicalModelPtr&  logicalModel = model->mLogicalModel;
+
+  for(auto& anchor : logicalModel->mAnchors)
+  {
+    if(anchor.endIndex < previousCursorIndex) //      [anchor]  CUR
+    {
+      continue;
+    }
+    if(anchor.startIndex < previousCursorIndex) //      [anCURr]
+    {
+      anchor.endIndex += numberOfCharacters;
+    }
+    else // CUR  [anchor]
+    {
+      anchor.startIndex += numberOfCharacters;
+      anchor.endIndex += numberOfCharacters;
+    }
+    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::InsertTextAnchor[%p] Anchor[%s] start[%d] end[%d]\n", &controller, anchor.href, anchor.startIndex, anchor.endIndex);
+  }
+}
+
+void Controller::TextUpdater::RemoveTextAnchor(Controller& controller, int cursorOffset, int numberOfCharacters, CharacterIndex previousCursorIndex)
+{
+  Controller::Impl&        impl         = *controller.mImpl;
+  ModelPtr&                model        = impl.mModel;
+  LogicalModelPtr&         logicalModel = model->mLogicalModel;
+  Vector<Anchor>::Iterator it           = logicalModel->mAnchors.Begin();
+
+  while(it != logicalModel->mAnchors.End())
+  {
+    Anchor& anchor = *it;
+
+    if(anchor.endIndex <= previousCursorIndex && cursorOffset == 0) // [anchor]    CUR >>
+    {
+      // Nothing happens.
+    }
+    else if(anchor.endIndex <= previousCursorIndex && cursorOffset == -1) // [anchor] << CUR
+    {
+      int endIndex = anchor.endIndex;
+      int offset   = previousCursorIndex - endIndex;
+      int index    = endIndex - (numberOfCharacters - offset);
+
+      if(index < endIndex)
+      {
+        endIndex = index;
+      }
+
+      if((int)anchor.startIndex >= endIndex)
+      {
+        if(anchor.href)
+        {
+          delete[] anchor.href;
+        }
+        it = logicalModel->mAnchors.Erase(it);
+        continue;
+      }
+      else
+      {
+        anchor.endIndex = endIndex;
+      }
+    }
+    else if(anchor.startIndex >= previousCursorIndex && cursorOffset == -1) // << CUR    [anchor]
+    {
+      anchor.startIndex -= numberOfCharacters;
+      anchor.endIndex -= numberOfCharacters;
+    }
+    else if(anchor.startIndex >= previousCursorIndex && cursorOffset == 0) //    CUR >> [anchor]
+    {
+      int startIndex = anchor.startIndex;
+      int endIndex   = anchor.endIndex;
+      int index      = previousCursorIndex + numberOfCharacters - 1;
+
+      if(startIndex > index)
+      {
+        anchor.startIndex -= numberOfCharacters;
+        anchor.endIndex -= numberOfCharacters;
+      }
+      else if(endIndex > index + 1)
+      {
+        anchor.endIndex -= numberOfCharacters;
+      }
+      else
+      {
+        if(anchor.href)
+        {
+          delete[] anchor.href;
+        }
+        it = logicalModel->mAnchors.Erase(it);
+        continue;
+      }
+    }
+    else if(cursorOffset == -1) // [<< CUR]
+    {
+      int startIndex = anchor.startIndex;
+      int index      = previousCursorIndex - numberOfCharacters;
+
+      if(startIndex >= index)
+      {
+        anchor.startIndex = index;
+      }
+      anchor.endIndex -= numberOfCharacters;
+    }
+    else if(cursorOffset == 0) // [CUR >>]
+    {
+      anchor.endIndex -= numberOfCharacters;
+    }
+    else
+    {
+      // When this condition is reached, someting is wrong.
+      DALI_LOG_ERROR("Controller::RemoveTextAnchor[%p] Invaild state cursorOffset[%d]\n", &controller, cursorOffset);
+    }
+
+    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveTextAnchor[%p] Anchor[%s] start[%d] end[%d]\n", &controller, anchor.href, anchor.startIndex, anchor.endIndex);
+
+    it++;
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/controller/text-controller-text-updater.h b/dali-toolkit/internal/text/controller/text-controller-text-updater.h
new file mode 100644
index 0000000..319697f
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller-text-updater.h
@@ -0,0 +1,110 @@
+#ifndef DALI_TOOLKIT_TEXT_UPDATER_H
+#define DALI_TOOLKIT_TEXT_UPDATER_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Methods that update the text
+ */
+struct Controller::TextUpdater
+{
+  /// @copydoc Text::Contoller::SetText
+  /// @param[in] controller The controller
+  static void SetText(Controller& controller, const std::string& text);
+
+  /**
+   * @brief Called by editable UI controls when key events are received.
+   *
+   * @param[in] controller The controller
+   * @param[in] text The text to insert.
+   * @param[in] type Used to distinguish between regular key events and InputMethodContext events.
+   */
+  static void InsertText(Controller& controller, const std::string& text, Controller::InsertType type);
+
+  /// @copydoc Text::EditableControlInterface::PasteText()
+  /// @param[in] controller The controller
+  static void PasteText(Controller& controller, const std::string& stringToPaste);
+
+  /**
+   * @brief Remove a given number of characters
+   *
+   * When predictve text is used the pre-edit text is removed and inserted again with the new characters.
+   * The UpdateInputStyleType @type parameter if set to DONT_UPDATE_INPUT_STYLE avoids to update the input
+   * style when pre-edit text is removed.
+   *
+   * @param[in] controller The controller
+   * @param[in] cursorOffset Start position from the current cursor position to start deleting characters.
+   * @param[in] numberOfCharacters The number of characters to delete from the cursorOffset.
+   * @param[in] type Whether to update the input style.
+   * @param[in] isDeletingPreEdit Whether to remove pre-edit when inserting text.
+   * @return True if the remove was successful.
+   */
+  static bool RemoveText(Controller& controller, int cursorOffset, int numberOfCharacters, UpdateInputStyleType type, bool isDeletingPreEdit);
+
+  /**
+   * @brief Checks if text is selected and if so removes it.
+   * @param[in] controller The controller
+   * @return true if text was removed
+   */
+  static bool RemoveSelectedText(Controller& controller);
+
+  /**
+   * @brief Used to remove the text included the placeholder text.
+   * @param[in] controller The controller
+   */
+  static void ResetText(Controller& controller);
+
+  /**
+   * @brief Update anchor position from given number of inserted characters.
+   *
+   * @param[in] controller The controller
+   * @param[in] numberOfCharacters The number of inserted characters.
+   * @param[in] previousCursorIndex A cursor position before event occurs.
+   */
+  static void InsertTextAnchor(Controller& controller, int numberOfCharacters, CharacterIndex previousCursorIndex);
+
+  /**
+   * @brief Update anchor position from given number of removed characters.
+   *
+   * @param[in] controller The controller
+   * @param[in] cursorOffset Start position from the current cursor position to start deleting characters.
+   * @param[in] numberOfCharacters The number of removed characters.
+   * @param[in] previousCursorIndex A cursor position before event occurs.
+   */
+  static void RemoveTextAnchor(Controller& controller, int cursorOffset, int numberOfCharacters, CharacterIndex previousCursorIndex);
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_UPDATER_H
diff --git a/dali-toolkit/internal/text/controller/text-controller.cpp b/dali-toolkit/internal/text/controller/text-controller.cpp
new file mode 100644
index 0000000..d17e187
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller.cpp
@@ -0,0 +1,1925 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <memory.h>
+#include <cmath>
+#include <limits>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/controller/text-controller-background-actor.h>
+#include <dali-toolkit/internal/text/controller/text-controller-event-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-font-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-input-properties.h>
+#include <dali-toolkit/internal/text/controller/text-controller-placeholder-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-relayouter.h>
+#include <dali-toolkit/internal/text/controller/text-controller-spannable-handler.h>
+#include <dali-toolkit/internal/text/controller/text-controller-text-updater.h>
+#include <dali-toolkit/internal/text/text-editable-control-interface.h>
+#include <dali-toolkit/internal/text/text-geometry.h>
+namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+const char* EMPTY_STRING         = "";
+const char* MIME_TYPE_TEXT_PLAIN = "text/plain;charset=utf-8";
+
+template<typename Type>
+void EnsureCreated(Type*& object)
+{
+  if(!object)
+  {
+    object = new Type();
+  }
+}
+
+template<typename Type>
+void EnsureCreated(std::unique_ptr<Type>& object)
+{
+  if(!object)
+  {
+    object = std::unique_ptr<Type>(new Type());
+  }
+}
+
+template<typename Type, typename Arg1>
+void EnsureCreated(Type*& object, Arg1 arg1)
+{
+  if(!object)
+  {
+    object = new Type(arg1);
+  }
+}
+
+template<typename Type, typename Arg1, typename Arg2>
+void EnsureCreated(Type*& object, Arg1 arg1, Arg2 arg2)
+{
+  if(!object)
+  {
+    object = new Type(arg1, arg2);
+  }
+}
+
+float GetDpi()
+{
+  static uint32_t horizontalDpi = 0u;
+  static uint32_t verticalDpi   = 0u;
+
+  // TODO : How can we know when fontClient DPI changed case?
+  if(DALI_UNLIKELY(horizontalDpi == 0u))
+  {
+    Dali::TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get();
+    fontClient.GetDpi(horizontalDpi, verticalDpi);
+  }
+  return static_cast<float>(horizontalDpi);
+}
+
+float ConvertPixelToPoint(float pixel)
+{
+  return pixel * 72.0f / GetDpi();
+}
+
+float ConvertPointToPixel(float point)
+{
+  // Pixel size = Point size * DPI / 72.f
+  return point * GetDpi() / 72.0f;
+}
+
+void UpdateCursorPosition(Dali::Toolkit::Text::EventData* eventData)
+{
+  if(eventData && Dali::Toolkit::Text::EventData::IsEditingState(eventData->mState))
+  {
+    // Update the cursor position if it's in editing mode
+    eventData->mDecoratorUpdated     = true;
+    eventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font size is updated.
+  }
+}
+
+} // namespace
+
+namespace Dali::Toolkit::Text
+{
+void Controller::EnableTextInput(DecoratorPtr decorator, InputMethodContext& inputMethodContext)
+{
+  if(!decorator)
+  {
+    delete mImpl->mEventData;
+    mImpl->mEventData = NULL;
+
+    // Nothing else to do.
+    return;
+  }
+
+  EnsureCreated(mImpl->mEventData, decorator, inputMethodContext);
+}
+
+void Controller::SetGlyphType(TextAbstraction::GlyphType glyphType)
+{
+  // Metrics for bitmap & vector based glyphs are different
+  mImpl->mMetrics->SetGlyphType(glyphType);
+
+  // Clear the font-specific data
+  mImpl->ClearFontData();
+
+  mImpl->RequestRelayout();
+}
+
+void Controller::SetMarkupProcessorEnabled(bool enable)
+{
+  if(enable != mImpl->mMarkupProcessorEnabled)
+  {
+    //If Text was already set, call the SetText again for enabling or disabling markup
+    mImpl->mMarkupProcessorEnabled = enable;
+    std::string text;
+    GetText(text);
+    SetText(text);
+  }
+
+  mImpl->mModel->mVisualModel->SetMarkupProcessorEnabled(enable);
+}
+
+bool Controller::IsMarkupProcessorEnabled() const
+{
+  return mImpl->mMarkupProcessorEnabled;
+}
+
+bool Controller::HasAnchors() const
+{
+  return (mImpl->mMarkupProcessorEnabled && mImpl->mModel->mLogicalModel->mAnchors.Count() && mImpl->IsShowingRealText());
+}
+
+void Controller::SetAutoScrollEnabled(bool enable)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable) ? "true" : "false", (mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX) ? "true" : "false", this);
+  mImpl->SetAutoScrollEnabled(enable);
+}
+
+void Controller::SetAutoScrollMaxTextureExceeded(bool exceed)
+{
+  mImpl->mIsAutoScrollMaxTextureExceeded = exceed;
+}
+
+bool Controller::IsAutoScrollEnabled() const
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", mImpl->mIsAutoScrollEnabled ? "true" : "false");
+  return mImpl->mIsAutoScrollEnabled;
+}
+
+CharacterDirection Controller::GetAutoScrollDirection() const
+{
+  return mImpl->mIsTextDirectionRTL;
+}
+
+float Controller::GetAutoScrollLineAlignment() const
+{
+  float offset = 0.f;
+  if(mImpl->mModel->mVisualModel && (0u != mImpl->mModel->mVisualModel->mLines.Count()))
+  {
+    offset = (*mImpl->mModel->mVisualModel->mLines.Begin()).alignmentOffset;
+  }
+  return offset;
+}
+
+void Controller::SetHorizontalScrollEnabled(bool enable)
+{
+  if(mImpl->mEventData && mImpl->mEventData->mDecorator)
+  {
+    mImpl->mEventData->mDecorator->SetHorizontalScrollEnabled(enable);
+  }
+}
+
+bool Controller::IsHorizontalScrollEnabled() const
+{
+  return mImpl->mEventData && mImpl->mEventData->mDecorator && mImpl->mEventData->mDecorator->IsHorizontalScrollEnabled();
+}
+
+void Controller::SetVerticalScrollEnabled(bool enable)
+{
+  if(mImpl->mEventData && mImpl->mEventData->mDecorator)
+  {
+    mImpl->mEventData->mDecorator->SetVerticalScrollEnabled(enable);
+  }
+}
+
+bool Controller::IsVerticalScrollEnabled() const
+{
+  return mImpl->mEventData && mImpl->mEventData->mDecorator && mImpl->mEventData->mDecorator->IsVerticalScrollEnabled();
+}
+
+void Controller::SetSmoothHandlePanEnabled(bool enable)
+{
+  if(mImpl->mEventData && mImpl->mEventData->mDecorator)
+  {
+    mImpl->mEventData->mDecorator->SetSmoothHandlePanEnabled(enable);
+  }
+}
+
+bool Controller::IsSmoothHandlePanEnabled() const
+{
+  return mImpl->mEventData && mImpl->mEventData->mDecorator && mImpl->mEventData->mDecorator->IsSmoothHandlePanEnabled();
+}
+
+void Controller::SetMaximumNumberOfCharacters(Length maxCharacters)
+{
+  mImpl->mMaximumNumberOfCharacters = maxCharacters;
+}
+
+int Controller::GetMaximumNumberOfCharacters()
+{
+  return mImpl->mMaximumNumberOfCharacters;
+}
+
+void Controller::SetEnableCursorBlink(bool enable)
+{
+  mImpl->SetEnableCursorBlink(enable);
+}
+
+bool Controller::GetEnableCursorBlink() const
+{
+  return mImpl->mEventData && mImpl->mEventData->mCursorBlinkEnabled;
+}
+
+void Controller::SetMultiLineEnabled(bool enable)
+{
+  mImpl->SetMultiLineEnabled(enable);
+}
+
+bool Controller::IsMultiLineEnabled() const
+{
+  return Layout::Engine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout();
+}
+
+void Controller::SetHorizontalAlignment(Text::HorizontalAlignment::Type alignment)
+{
+  mImpl->SetHorizontalAlignment(alignment);
+}
+
+Text::HorizontalAlignment::Type Controller::GetHorizontalAlignment() const
+{
+  return mImpl->mModel->mHorizontalAlignment;
+}
+
+void Controller::SetVerticalAlignment(VerticalAlignment::Type alignment)
+{
+  mImpl->SetVerticalAlignment(alignment);
+}
+
+VerticalAlignment::Type Controller::GetVerticalAlignment() const
+{
+  return mImpl->mModel->mVerticalAlignment;
+}
+
+bool Controller::IsIgnoreSpacesAfterText() const
+{
+  return mImpl->mModel->mIgnoreSpacesAfterText;
+}
+
+void Controller::SetIgnoreSpacesAfterText(bool ignore)
+{
+  mImpl->mModel->mIgnoreSpacesAfterText = ignore;
+}
+
+bool Controller::IsRemoveFrontInset() const
+{
+  return mImpl->mModel->mRemoveFrontInset;
+}
+
+void Controller::SetRemoveFrontInset(bool remove)
+{
+  mImpl->mModel->mRemoveFrontInset = remove;
+}
+
+bool Controller::IsRemoveBackInset() const
+{
+  return mImpl->mModel->mRemoveBackInset;
+}
+
+void Controller::SetRemoveBackInset(bool remove)
+{
+  mImpl->mModel->mRemoveBackInset = remove;
+}
+
+void Controller::ChangedLayoutDirection()
+{
+  mImpl->mIsLayoutDirectionChanged = true;
+}
+
+void Controller::ResetFontAndStyleData()
+{
+  mImpl->ResetFontAndStyleData();
+}
+
+void Controller::SetMatchLayoutDirection(DevelText::MatchLayoutDirection type)
+{
+  mImpl->mModel->mMatchLayoutDirection = type;
+}
+
+DevelText::MatchLayoutDirection Controller::GetMatchLayoutDirection() const
+{
+  return mImpl->mModel->mMatchLayoutDirection;
+}
+
+void Controller::SetLayoutDirection(Dali::LayoutDirection::Type layoutDirection)
+{
+  mImpl->mLayoutDirection = layoutDirection;
+}
+
+Dali::LayoutDirection::Type Controller::GetLayoutDirection(Dali::Actor& actor) const
+{
+  return mImpl->GetLayoutDirection(actor);
+}
+
+bool Controller::IsShowingRealText() const
+{
+  return mImpl->IsShowingRealText();
+}
+
+void Controller::SetLineWrapMode(Text::LineWrap::Mode lineWrapMode)
+{
+  mImpl->SetLineWrapMode(lineWrapMode);
+}
+
+Text::LineWrap::Mode Controller::GetLineWrapMode() const
+{
+  return mImpl->mModel->mLineWrapMode;
+}
+
+void Controller::SetTextElideEnabled(bool enabled)
+{
+  mImpl->mModel->mElideEnabled = enabled;
+  mImpl->mModel->mVisualModel->SetTextElideEnabled(enabled);
+}
+
+bool Controller::IsTextElideEnabled() const
+{
+  return mImpl->mModel->mElideEnabled;
+}
+
+void Controller::SetTextFitEnabled(bool enabled)
+{
+  mImpl->mTextFitEnabled = enabled;
+}
+
+bool Controller::IsTextFitEnabled() const
+{
+  return mImpl->mTextFitEnabled;
+}
+
+void Controller::SetTextFitChanged(bool changed)
+{
+  mImpl->mTextFitChanged = changed;
+}
+
+bool Controller::IsTextFitChanged() const
+{
+  return mImpl->mTextFitChanged;
+}
+
+void Controller::SetCurrentLineSize(float lineSize)
+{
+  mImpl->mCurrentLineSize = lineSize;
+}
+
+float Controller::GetCurrentLineSize() const
+{
+  return mImpl->mCurrentLineSize;
+}
+
+void Controller::SetTextFitMinSize(float minSize, FontSizeType type)
+{
+  mImpl->mTextFitMinSize = (type == POINT_SIZE) ? minSize : ConvertPixelToPoint(minSize);
+}
+
+float Controller::GetTextFitMinSize() const
+{
+  return mImpl->mTextFitMinSize;
+}
+
+void Controller::SetTextFitMaxSize(float maxSize, FontSizeType type)
+{
+  mImpl->mTextFitMaxSize = (type == POINT_SIZE) ? maxSize : ConvertPixelToPoint(maxSize);
+}
+
+float Controller::GetTextFitMaxSize() const
+{
+  return mImpl->mTextFitMaxSize;
+}
+
+void Controller::SetTextFitStepSize(float step, FontSizeType type)
+{
+  mImpl->mTextFitStepSize = (type == POINT_SIZE) ? step : ConvertPixelToPoint(step);
+}
+
+float Controller::GetTextFitStepSize() const
+{
+  return mImpl->mTextFitStepSize;
+}
+
+void Controller::SetTextFitContentSize(Vector2 size)
+{
+  mImpl->mTextFitContentSize = size;
+}
+
+Vector2 Controller::GetTextFitContentSize() const
+{
+  return mImpl->mTextFitContentSize;
+}
+
+float Controller::GetTextFitPointSize() const
+{
+  return mImpl->mFontDefaults ? mImpl->mFontDefaults->mFitPointSize : 0.0f;
+}
+
+void Controller::SetTextFitLineSize(float lineSize)
+{
+  mImpl->mTextFitLineSize = lineSize;
+}
+
+void Controller::SetTextFitArrayEnabled(bool enabled)
+{
+  mImpl->mTextFitArrayEnabled = enabled;
+  mImpl->ClearFontData();
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsTextFitArrayEnabled() const
+{
+  return mImpl->mTextFitArrayEnabled;
+}
+
+void Controller::SetTextFitArray(std::vector<Toolkit::DevelTextLabel::FitOption>& fitOptions)
+{
+  mImpl->mTextFitArray = fitOptions;
+}
+
+std::vector<Toolkit::DevelTextLabel::FitOption>& Controller::GetTextFitArray()
+{
+  return mImpl->mTextFitArray;
+}
+
+void Controller::SetPlaceholderTextElideEnabled(bool enabled)
+{
+  PlaceholderHandler::SetPlaceholderTextElideEnabled(*this, enabled);
+}
+
+bool Controller::IsPlaceholderTextElideEnabled() const
+{
+  return PlaceholderHandler::IsPlaceholderTextElideEnabled(*this);
+}
+
+void Controller::SetSelectionEnabled(bool enabled)
+{
+  mImpl->mEventData->mSelectionEnabled = enabled;
+}
+
+bool Controller::IsSelectionEnabled() const
+{
+  return mImpl->mEventData->mSelectionEnabled;
+}
+
+void Controller::SetShiftSelectionEnabled(bool enabled)
+{
+  mImpl->mEventData->mShiftSelectionFlag = enabled;
+}
+
+bool Controller::IsShiftSelectionEnabled() const
+{
+  return mImpl->mEventData->mShiftSelectionFlag;
+}
+
+void Controller::SetGrabHandleEnabled(bool enabled)
+{
+  mImpl->mEventData->mGrabHandleEnabled = enabled;
+}
+
+bool Controller::IsGrabHandleEnabled() const
+{
+  return mImpl->mEventData->mGrabHandleEnabled;
+}
+
+void Controller::SetGrabHandlePopupEnabled(bool enabled)
+{
+  mImpl->mEventData->mGrabHandlePopupEnabled = enabled;
+}
+
+bool Controller::IsGrabHandlePopupEnabled() const
+{
+  return mImpl->mEventData->mGrabHandlePopupEnabled;
+}
+
+void Controller::SetText(const std::string& text)
+{
+  TextUpdater::SetText(*this, text);
+}
+
+void Controller::GetText(std::string& text) const
+{
+  mImpl->GetText(text);
+}
+
+Length Controller::GetNumberOfCharacters() const
+{
+  return mImpl->GetNumberOfCharacters();
+}
+
+void Controller::SetSpannedText(const Text::Spanned& spannedText)
+{
+  SpannableHandler::SetSpannedText(*this, spannedText);
+}
+
+void Controller::SetPlaceholderText(PlaceholderType type, const std::string& text)
+{
+  PlaceholderHandler::SetPlaceholderText(*this, type, text);
+}
+
+void Controller::GetPlaceholderText(PlaceholderType type, std::string& text) const
+{
+  PlaceholderHandler::GetPlaceholderText(*this, type, text);
+}
+
+void Controller::UpdateAfterFontChange(const std::string& newDefaultFont)
+{
+  mImpl->UpdateAfterFontChange(newDefaultFont);
+}
+
+void Controller::RetrieveSelection(std::string& selectedText) const
+{
+  mImpl->RetrieveSelection(selectedText, false);
+}
+
+void Controller::SetSelection(int start, int end)
+{
+  mImpl->SetSelection(start, end);
+}
+
+std::pair<int, int> Controller::GetSelectionIndexes() const
+{
+  return mImpl->GetSelectionIndexes();
+}
+
+void Controller::CopyStringToClipboard(const std::string& source)
+{
+  mImpl->CopyStringToClipboard(source);
+}
+
+void Controller::SendSelectionToClipboard(bool deleteAfterSending)
+{
+  mImpl->SendSelectionToClipboard(deleteAfterSending);
+}
+
+void Controller::SetDefaultFontFamily(const std::string& defaultFontFamily)
+{
+  EnsureCreated(mImpl->mFontDefaults);
+
+  if(mImpl->mFontDefaults->mFontDescription.family != defaultFontFamily)
+  {
+    mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily;
+    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str());
+    mImpl->mFontDefaults->familyDefined = !defaultFontFamily.empty();
+
+    // Update the cursor position if it's in editing mode
+    UpdateCursorPosition(mImpl->mEventData);
+
+    // Clear the font-specific data
+    mImpl->ClearFontData();
+
+    mImpl->RequestRelayout();
+  }
+}
+
+std::string Controller::GetDefaultFontFamily() const
+{
+  return mImpl->mFontDefaults ? mImpl->mFontDefaults->mFontDescription.family : EMPTY_STRING;
+}
+
+void Controller::SetPlaceholderFontFamily(const std::string& placeholderTextFontFamily)
+{
+  PlaceholderHandler::SetPlaceholderFontFamily(*this, placeholderTextFontFamily);
+}
+
+std::string Controller::GetPlaceholderFontFamily() const
+{
+  return PlaceholderHandler::GetPlaceholderFontFamily(*this);
+}
+
+void Controller::SetDefaultFontWeight(FontWeight weight)
+{
+  EnsureCreated(mImpl->mFontDefaults);
+
+  mImpl->mFontDefaults->mFontDescription.weight = weight;
+  mImpl->mFontDefaults->weightDefined           = true;
+
+  // Update the cursor position if it's in editing mode
+  UpdateCursorPosition(mImpl->mEventData);
+
+  // Clear the font-specific data
+  mImpl->ClearFontData();
+
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsDefaultFontWeightDefined() const
+{
+  return mImpl->mFontDefaults && mImpl->mFontDefaults->weightDefined;
+}
+
+FontWeight Controller::GetDefaultFontWeight() const
+{
+  return mImpl->mFontDefaults ? mImpl->mFontDefaults->mFontDescription.weight : TextAbstraction::FontWeight::NORMAL;
+}
+
+void Controller::SetPlaceholderTextFontWeight(FontWeight weight)
+{
+  PlaceholderHandler::SetPlaceholderTextFontWeight(*this, weight);
+}
+
+bool Controller::IsPlaceholderTextFontWeightDefined() const
+{
+  return PlaceholderHandler::IsPlaceholderTextFontWeightDefined(*this);
+}
+
+FontWeight Controller::GetPlaceholderTextFontWeight() const
+{
+  return PlaceholderHandler::GetPlaceholderTextFontWeight(*this);
+}
+
+void Controller::SetDefaultFontWidth(FontWidth width)
+{
+  EnsureCreated(mImpl->mFontDefaults);
+
+  mImpl->mFontDefaults->mFontDescription.width = width;
+  mImpl->mFontDefaults->widthDefined           = true;
+
+  // Update the cursor position if it's in editing mode
+  UpdateCursorPosition(mImpl->mEventData);
+
+  // Clear the font-specific data
+  mImpl->ClearFontData();
+
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsDefaultFontWidthDefined() const
+{
+  return mImpl->mFontDefaults && mImpl->mFontDefaults->widthDefined;
+}
+
+FontWidth Controller::GetDefaultFontWidth() const
+{
+  return mImpl->mFontDefaults ? mImpl->mFontDefaults->mFontDescription.width : TextAbstraction::FontWidth::NORMAL;
+}
+
+void Controller::SetPlaceholderTextFontWidth(FontWidth width)
+{
+  PlaceholderHandler::SetPlaceholderTextFontWidth(*this, width);
+}
+
+bool Controller::IsPlaceholderTextFontWidthDefined() const
+{
+  return PlaceholderHandler::IsPlaceholderTextFontWidthDefined(*this);
+}
+
+FontWidth Controller::GetPlaceholderTextFontWidth() const
+{
+  return PlaceholderHandler::GetPlaceholderTextFontWidth(*this);
+}
+
+void Controller::SetDefaultFontSlant(FontSlant slant)
+{
+  EnsureCreated(mImpl->mFontDefaults);
+
+  mImpl->mFontDefaults->mFontDescription.slant = slant;
+  mImpl->mFontDefaults->slantDefined           = true;
+
+  // Update the cursor position if it's in editing mode
+  UpdateCursorPosition(mImpl->mEventData);
+
+  // Clear the font-specific data
+  mImpl->ClearFontData();
+
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsDefaultFontSlantDefined() const
+{
+  return mImpl->mFontDefaults && mImpl->mFontDefaults->slantDefined;
+}
+
+FontSlant Controller::GetDefaultFontSlant() const
+{
+  return mImpl->mFontDefaults ? mImpl->mFontDefaults->mFontDescription.slant : TextAbstraction::FontSlant::NORMAL;
+}
+
+void Controller::SetPlaceholderTextFontSlant(FontSlant slant)
+{
+  PlaceholderHandler::SetPlaceholderTextFontSlant(*this, slant);
+}
+
+bool Controller::IsPlaceholderTextFontSlantDefined() const
+{
+  return PlaceholderHandler::IsPlaceholderTextFontSlantDefined(*this);
+}
+
+FontSlant Controller::GetPlaceholderTextFontSlant() const
+{
+  return PlaceholderHandler::GetPlaceholderTextFontSlant(*this);
+}
+
+void Controller::SetFontSizeScale(float scale)
+{
+  mImpl->mFontSizeScale = scale;
+
+  // No relayout is required
+  if(!mImpl->mFontSizeScaleEnabled) return;
+
+  // Update the cursor position if it's in editing mode
+  UpdateCursorPosition(mImpl->mEventData);
+
+  // Clear the font-specific data
+  mImpl->ClearFontData();
+
+  mImpl->RequestRelayout();
+}
+
+float Controller::GetFontSizeScale() const
+{
+  return mImpl->mFontDefaults ? mImpl->mFontSizeScale : 1.0f;
+}
+
+void Controller::SetFontSizeScaleEnabled(bool enabled)
+{
+  mImpl->mFontSizeScaleEnabled = enabled;
+
+  // Update the cursor position if it's in editing mode
+  UpdateCursorPosition(mImpl->mEventData);
+
+  // Clear the font-specific data
+  mImpl->ClearFontData();
+
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsFontSizeScaleEnabled() const
+{
+  return mImpl->mFontSizeScaleEnabled;
+}
+
+void Controller::SetDefaultFontSize(float fontSize, FontSizeType type)
+{
+  EnsureCreated(mImpl->mFontDefaults);
+
+  mImpl->mFontDefaults->mDefaultPointSize = (type == POINT_SIZE) ? fontSize : ConvertPixelToPoint(fontSize);
+  mImpl->mFontDefaults->sizeDefined       = true;
+
+  // Update the cursor position if it's in editing mode
+  UpdateCursorPosition(mImpl->mEventData);
+
+  // Clear the font-specific data
+  mImpl->ClearFontData();
+
+  mImpl->RequestRelayout();
+
+  if(mImpl->mEventData && EventData::INACTIVE != mImpl->mEventData->mState)
+  {
+    SetInputFontPointSize(fontSize, true);
+  }
+}
+
+float Controller::GetDefaultFontSize(FontSizeType type) const
+{
+  if(mImpl->mFontDefaults)
+  {
+    return (type == POINT_SIZE) ? mImpl->mFontDefaults->mDefaultPointSize : ConvertPointToPixel(mImpl->mFontDefaults->mDefaultPointSize);
+  }
+  return 0.0f;
+}
+
+void Controller::SetPlaceholderTextFontSize(float fontSize, FontSizeType type)
+{
+  PlaceholderHandler::SetPlaceholderTextFontSize(*this, fontSize, type);
+}
+
+float Controller::GetPlaceholderTextFontSize(FontSizeType type) const
+{
+  return PlaceholderHandler::GetPlaceholderTextFontSize(*this, type);
+}
+
+void Controller::SetDefaultColor(const Vector4& color)
+{
+  mImpl->SetDefaultColor(color);
+}
+
+const Vector4& Controller::GetDefaultColor() const
+{
+  return mImpl->mTextColor;
+}
+
+void Controller::SetAnchorColor(const Vector4& color)
+{
+  mImpl->SetAnchorColor(color);
+}
+
+const Vector4& Controller::GetAnchorColor() const
+{
+  return mImpl->GetAnchorColor();
+}
+
+void Controller::SetAnchorClickedColor(const Vector4& color)
+{
+  mImpl->SetAnchorClickedColor(color);
+}
+
+const Vector4& Controller::GetAnchorClickedColor() const
+{
+  return mImpl->GetAnchorClickedColor();
+}
+
+void Controller::SetDisabledColorOpacity(float opacity)
+{
+  mImpl->mDisabledColorOpacity = opacity;
+}
+
+float Controller::GetDisabledColorOpacity() const
+{
+  return mImpl->mDisabledColorOpacity;
+}
+
+void Controller::SetUserInteractionEnabled(bool enabled)
+{
+  mImpl->SetUserInteractionEnabled(enabled);
+}
+
+bool Controller::IsUserInteractionEnabled() const
+{
+  return mImpl->mIsUserInteractionEnabled;
+}
+
+void Controller::SetPlaceholderTextColor(const Vector4& textColor)
+{
+  PlaceholderHandler::SetPlaceholderTextColor(*this, textColor);
+}
+
+const Vector4& Controller::GetPlaceholderTextColor() const
+{
+  return PlaceholderHandler::GetPlaceholderTextColor(*this);
+}
+
+void Controller::SetShadowOffset(const Vector2& shadowOffset)
+{
+  mImpl->mModel->mVisualModel->SetShadowOffset(shadowOffset);
+  mImpl->RequestRelayout();
+}
+
+const Vector2& Controller::GetShadowOffset() const
+{
+  return mImpl->mModel->mVisualModel->GetShadowOffset();
+}
+
+void Controller::SetShadowColor(const Vector4& shadowColor)
+{
+  mImpl->mModel->mVisualModel->SetShadowColor(shadowColor);
+  mImpl->RequestRelayout();
+}
+
+const Vector4& Controller::GetShadowColor() const
+{
+  return mImpl->mModel->mVisualModel->GetShadowColor();
+}
+
+void Controller::SetShadowBlurRadius(const float& shadowBlurRadius)
+{
+  if(fabsf(GetShadowBlurRadius() - shadowBlurRadius) > Math::MACHINE_EPSILON_1)
+  {
+    mImpl->mModel->mVisualModel->SetShadowBlurRadius(shadowBlurRadius);
+    mImpl->RequestRelayout();
+  }
+}
+
+const float& Controller::GetShadowBlurRadius() const
+{
+  return mImpl->mModel->mVisualModel->GetShadowBlurRadius();
+}
+
+void Controller::SetUnderlineColor(const Vector4& color)
+{
+  mImpl->mModel->mVisualModel->SetUnderlineColor(color);
+  mImpl->RequestRelayout();
+}
+
+const Vector4& Controller::GetUnderlineColor() const
+{
+  return mImpl->mModel->mVisualModel->GetUnderlineColor();
+}
+
+void Controller::SetUnderlineEnabled(bool enabled)
+{
+  mImpl->mModel->mVisualModel->SetUnderlineEnabled(enabled);
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsUnderlineEnabled() const
+{
+  return mImpl->mModel->mVisualModel->IsUnderlineEnabled();
+}
+
+void Controller::SetUnderlineHeight(float height)
+{
+  mImpl->mModel->mVisualModel->SetUnderlineHeight(height);
+  mImpl->RequestRelayout();
+}
+
+float Controller::GetUnderlineHeight() const
+{
+  return mImpl->mModel->mVisualModel->GetUnderlineHeight();
+}
+
+void Controller::SetUnderlineType(Text::Underline::Type type)
+{
+  mImpl->mModel->mVisualModel->SetUnderlineType(type);
+
+  mImpl->RequestRelayout();
+}
+
+Text::Underline::Type Controller::GetUnderlineType() const
+{
+  return mImpl->mModel->mVisualModel->GetUnderlineType();
+}
+
+void Controller::SetDashedUnderlineWidth(float width)
+{
+  mImpl->mModel->mVisualModel->SetDashedUnderlineWidth(width);
+
+  mImpl->RequestRelayout();
+}
+
+float Controller::GetDashedUnderlineWidth() const
+{
+  return mImpl->mModel->mVisualModel->GetDashedUnderlineWidth();
+}
+
+void Controller::SetDashedUnderlineGap(float gap)
+{
+  mImpl->mModel->mVisualModel->SetDashedUnderlineGap(gap);
+
+  mImpl->RequestRelayout();
+}
+
+float Controller::GetDashedUnderlineGap() const
+{
+  return mImpl->mModel->mVisualModel->GetDashedUnderlineGap();
+}
+
+void Controller::SetOutlineColor(const Vector4& color)
+{
+  mImpl->mModel->mVisualModel->SetOutlineColor(color);
+  mImpl->RequestRelayout();
+}
+
+const Vector4& Controller::GetOutlineColor() const
+{
+  return mImpl->mModel->mVisualModel->GetOutlineColor();
+}
+
+void Controller::SetOutlineWidth(uint16_t width)
+{
+  mImpl->mModel->mVisualModel->SetOutlineWidth(width);
+  mImpl->RequestRelayout();
+}
+
+uint16_t Controller::GetOutlineWidth() const
+{
+  return mImpl->mModel->mVisualModel->GetOutlineWidth();
+}
+
+void Controller::SetBackgroundColor(const Vector4& color)
+{
+  mImpl->mModel->mVisualModel->SetBackgroundColor(color);
+  mImpl->RequestRelayout();
+}
+
+const Vector4& Controller::GetBackgroundColor() const
+{
+  return mImpl->mModel->mVisualModel->GetBackgroundColor();
+}
+
+void Controller::SetBackgroundEnabled(bool enabled)
+{
+  mImpl->mModel->mVisualModel->SetBackgroundEnabled(enabled);
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsBackgroundEnabled() const
+{
+  return mImpl->mModel->mVisualModel->IsBackgroundEnabled();
+}
+
+void Controller::SetDefaultEmbossProperties(const std::string& embossProperties)
+{
+  EnsureCreated(mImpl->mEmbossDefaults);
+  mImpl->mEmbossDefaults->properties = embossProperties;
+}
+
+std::string Controller::GetDefaultEmbossProperties() const
+{
+  return mImpl->mEmbossDefaults ? mImpl->mEmbossDefaults->properties : EMPTY_STRING;
+}
+
+void Controller::SetDefaultOutlineProperties(const std::string& outlineProperties)
+{
+  EnsureCreated(mImpl->mOutlineDefaults);
+  mImpl->mOutlineDefaults->properties = outlineProperties;
+}
+
+std::string Controller::GetDefaultOutlineProperties() const
+{
+  return mImpl->mOutlineDefaults ? mImpl->mOutlineDefaults->properties : EMPTY_STRING;
+}
+
+bool Controller::SetDefaultLineSpacing(float lineSpacing)
+{
+  return mImpl->SetDefaultLineSpacing(lineSpacing);
+}
+
+float Controller::GetDefaultLineSpacing() const
+{
+  return mImpl->mLayoutEngine.GetDefaultLineSpacing();
+}
+
+bool Controller::SetDefaultLineSize(float lineSize)
+{
+  return mImpl->SetDefaultLineSize(lineSize);
+}
+
+float Controller::GetDefaultLineSize() const
+{
+  return mImpl->mLayoutEngine.GetDefaultLineSize();
+}
+
+bool Controller::SetRelativeLineSize(float relativeLineSize)
+{
+  return mImpl->SetRelativeLineSize(relativeLineSize);
+}
+
+float Controller::GetRelativeLineSize() const
+{
+  return mImpl->GetRelativeLineSize();
+}
+
+void Controller::SetInputColor(const Vector4& color)
+{
+  InputProperties::SetInputColor(*this, color);
+}
+
+const Vector4& Controller::GetInputColor() const
+{
+  return InputProperties::GetInputColor(*this);
+}
+
+void Controller::SetInputFontFamily(const std::string& fontFamily)
+{
+  InputFontHandler::SetInputFontFamily(*this, fontFamily);
+}
+
+std::string Controller::GetInputFontFamily() const
+{
+  return InputFontHandler::GetInputFontFamily(*this);
+}
+
+void Controller::SetInputFontWeight(FontWeight weight)
+{
+  InputFontHandler::SetInputFontWeight(*this, weight);
+}
+
+bool Controller::IsInputFontWeightDefined() const
+{
+  return InputFontHandler::IsInputFontWeightDefined(*this);
+}
+
+FontWeight Controller::GetInputFontWeight() const
+{
+  return InputFontHandler::GetInputFontWeight(*this);
+}
+
+void Controller::SetInputFontWidth(FontWidth width)
+{
+  InputFontHandler::SetInputFontWidth(*this, width);
+}
+
+bool Controller::IsInputFontWidthDefined() const
+{
+  return InputFontHandler::IsInputFontWidthDefined(*this);
+}
+
+FontWidth Controller::GetInputFontWidth() const
+{
+  return InputFontHandler::GetInputFontWidth(*this);
+}
+
+void Controller::SetInputFontSlant(FontSlant slant)
+{
+  InputFontHandler::SetInputFontSlant(*this, slant);
+}
+
+bool Controller::IsInputFontSlantDefined() const
+{
+  return InputFontHandler::IsInputFontSlantDefined(*this);
+}
+
+FontSlant Controller::GetInputFontSlant() const
+{
+  return InputFontHandler::GetInputFontSlant(*this);
+}
+
+void Controller::SetInputFontPointSize(float size, bool defaultFontSizeUpdated)
+{
+  InputFontHandler::SetInputFontPointSize(*this, size, defaultFontSizeUpdated);
+}
+
+float Controller::GetInputFontPointSize() const
+{
+  return InputFontHandler::GetInputFontPointSize(*this);
+}
+
+void Controller::SetInputLineSpacing(float lineSpacing)
+{
+  InputProperties::SetInputLineSpacing(*this, lineSpacing);
+}
+
+float Controller::GetInputLineSpacing() const
+{
+  return InputProperties::GetInputLineSpacing(*this);
+}
+
+void Controller::SetInputShadowProperties(const std::string& shadowProperties)
+{
+  InputProperties::SetInputShadowProperties(*this, shadowProperties);
+}
+
+std::string Controller::GetInputShadowProperties() const
+{
+  return InputProperties::GetInputShadowProperties(*this);
+}
+
+void Controller::SetInputUnderlineProperties(const std::string& underlineProperties)
+{
+  InputProperties::SetInputUnderlineProperties(*this, underlineProperties);
+}
+
+std::string Controller::GetInputUnderlineProperties() const
+{
+  return InputProperties::GetInputUnderlineProperties(*this);
+}
+
+void Controller::SetInputEmbossProperties(const std::string& embossProperties)
+{
+  InputProperties::SetInputEmbossProperties(*this, embossProperties);
+}
+
+std::string Controller::GetInputEmbossProperties() const
+{
+  return InputProperties::GetInputEmbossProperties(*this);
+}
+
+void Controller::SetInputOutlineProperties(const std::string& outlineProperties)
+{
+  InputProperties::SetInputOutlineProperties(*this, outlineProperties);
+}
+
+std::string Controller::GetInputOutlineProperties() const
+{
+  return InputProperties::GetInputOutlineProperties(*this);
+}
+
+void Controller::SetInputModePassword(bool passwordInput)
+{
+  InputProperties::SetInputModePassword(*this, passwordInput);
+}
+
+bool Controller::IsInputModePassword()
+{
+  return InputProperties::IsInputModePassword(*this);
+}
+
+void Controller::SetNoTextDoubleTapAction(NoTextTap::Action action)
+{
+  if(mImpl->mEventData)
+  {
+    mImpl->mEventData->mDoubleTapAction = action;
+  }
+}
+
+Controller::NoTextTap::Action Controller::GetNoTextDoubleTapAction() const
+{
+  return mImpl->mEventData ? mImpl->mEventData->mDoubleTapAction : NoTextTap::NO_ACTION;
+}
+
+void Controller::SetNoTextLongPressAction(NoTextTap::Action action)
+{
+  if(mImpl->mEventData)
+  {
+    mImpl->mEventData->mLongPressAction = action;
+  }
+}
+
+Controller::NoTextTap::Action Controller::GetNoTextLongPressAction() const
+{
+  return mImpl->mEventData ? mImpl->mEventData->mLongPressAction : NoTextTap::NO_ACTION;
+}
+
+bool Controller::IsUnderlineSetByString()
+{
+  return mImpl->mUnderlineSetByString;
+}
+
+void Controller::UnderlineSetByString(bool setByString)
+{
+  mImpl->mUnderlineSetByString = setByString;
+}
+
+bool Controller::IsShadowSetByString()
+{
+  return mImpl->mShadowSetByString;
+}
+
+void Controller::ShadowSetByString(bool setByString)
+{
+  mImpl->mShadowSetByString = setByString;
+}
+
+bool Controller::IsOutlineSetByString()
+{
+  return mImpl->mOutlineSetByString;
+}
+
+void Controller::OutlineSetByString(bool setByString)
+{
+  mImpl->mOutlineSetByString = setByString;
+}
+
+bool Controller::IsFontStyleSetByString()
+{
+  return mImpl->mFontStyleSetByString;
+}
+
+void Controller::FontStyleSetByString(bool setByString)
+{
+  mImpl->mFontStyleSetByString = setByString;
+}
+
+void Controller::SetStrikethroughHeight(float height)
+{
+  mImpl->mModel->mVisualModel->SetStrikethroughHeight(height);
+
+  mImpl->RequestRelayout();
+}
+
+float Controller::GetStrikethroughHeight() const
+{
+  return mImpl->mModel->mVisualModel->GetStrikethroughHeight();
+}
+
+void Controller::SetStrikethroughColor(const Vector4& color)
+{
+  mImpl->mModel->mVisualModel->SetStrikethroughColor(color);
+
+  mImpl->RequestRelayout();
+}
+
+const Vector4& Controller::GetStrikethroughColor() const
+{
+  return mImpl->mModel->mVisualModel->GetStrikethroughColor();
+}
+
+void Controller::SetStrikethroughEnabled(bool enabled)
+{
+  mImpl->mModel->mVisualModel->SetStrikethroughEnabled(enabled);
+
+  mImpl->RequestRelayout();
+}
+
+bool Controller::IsStrikethroughEnabled() const
+{
+  return mImpl->mModel->mVisualModel->IsStrikethroughEnabled();
+}
+
+void Controller::SetInputStrikethroughProperties(const std::string& strikethroughProperties)
+{
+  if(NULL != mImpl->mEventData)
+  {
+    mImpl->mEventData->mInputStyle.strikethroughProperties = strikethroughProperties;
+  }
+}
+
+std::string Controller::GetInputStrikethroughProperties() const
+{
+  return (NULL != mImpl->mEventData) ? mImpl->mEventData->mInputStyle.strikethroughProperties : EMPTY_STRING;
+}
+
+bool Controller::IsStrikethroughSetByString()
+{
+  return mImpl->mStrikethroughSetByString;
+}
+
+void Controller::StrikethroughSetByString(bool setByString)
+{
+  mImpl->mStrikethroughSetByString = setByString;
+}
+
+Layout::Engine& Controller::GetLayoutEngine()
+{
+  return mImpl->mLayoutEngine;
+}
+
+View& Controller::GetView()
+{
+  return mImpl->mView;
+}
+
+Vector3 Controller::GetNaturalSize()
+{
+  return Relayouter::GetNaturalSize(*this);
+}
+
+bool Controller::CheckForTextFit(float pointSize, Size& layoutSize)
+{
+  return Relayouter::CheckForTextFit(*this, pointSize, layoutSize);
+}
+
+void Controller::FitPointSizeforLayout(Size layoutSize)
+{
+  Relayouter::FitPointSizeforLayout(*this, layoutSize);
+}
+
+void Controller::FitArrayPointSizeforLayout(Size layoutSize)
+{
+  Relayouter::FitArrayPointSizeforLayout(*this, layoutSize);
+}
+
+float Controller::GetHeightForWidth(float width)
+{
+  return Relayouter::GetHeightForWidth(*this, width);
+}
+
+int Controller::GetLineCount(float width)
+{
+  GetHeightForWidth(width);
+  return mImpl->mModel->GetNumberOfLines();
+}
+
+const ModelInterface* Controller::GetTextModel() const
+{
+  return mImpl->mModel.Get();
+}
+
+float Controller::GetScrollAmountByUserInput()
+{
+  float scrollAmount = 0.0f;
+
+  if(NULL != mImpl->mEventData && mImpl->mEventData->mCheckScrollAmount)
+  {
+    scrollAmount                          = mImpl->mModel->mScrollPosition.y - mImpl->mModel->mScrollPositionLast.y;
+    mImpl->mEventData->mCheckScrollAmount = false;
+  }
+  return scrollAmount;
+}
+
+bool Controller::GetTextScrollInfo(float& scrollPosition, float& controlHeight, float& layoutHeight)
+{
+  const Vector2& layout = mImpl->mModel->mVisualModel->GetLayoutSize();
+  bool           isScrolled;
+
+  controlHeight  = mImpl->mModel->mVisualModel->mControlSize.height;
+  layoutHeight   = layout.height;
+  scrollPosition = mImpl->mModel->mScrollPosition.y;
+  isScrolled     = !Equals(mImpl->mModel->mScrollPosition.y, mImpl->mModel->mScrollPositionLast.y, Math::MACHINE_EPSILON_1);
+  return isScrolled;
+}
+
+void Controller::SetHiddenInputOption(const Property::Map& options)
+{
+  EnsureCreated<HiddenText, Controller*>(mImpl->mHiddenInput, this);
+  mImpl->mHiddenInput->SetProperties(options);
+}
+
+void Controller::GetHiddenInputOption(Property::Map& options)
+{
+  if(mImpl->mHiddenInput)
+  {
+    mImpl->mHiddenInput->GetProperties(options);
+  }
+}
+
+void Controller::SetInputFilterOption(const Property::Map& options)
+{
+  EnsureCreated(mImpl->mInputFilter);
+  mImpl->mInputFilter->SetProperties(options);
+}
+
+void Controller::GetInputFilterOption(Property::Map& options)
+{
+  if(mImpl->mInputFilter)
+  {
+    mImpl->mInputFilter->GetProperties(options);
+  }
+}
+
+void Controller::SetPlaceholderProperty(const Property::Map& map)
+{
+  PlaceholderHandler::SetPlaceholderProperty(*this, map);
+}
+
+void Controller::GetPlaceholderProperty(Property::Map& map)
+{
+  PlaceholderHandler::GetPlaceholderProperty(*this, map);
+}
+
+Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection()
+{
+  // Make sure the model is up-to-date before layouting
+  EventHandler::ProcessModifyEvents(*this);
+
+  return mImpl->GetTextDirection();
+}
+
+Toolkit::DevelText::VerticalLineAlignment::Type Controller::GetVerticalLineAlignment() const
+{
+  return mImpl->mModel->GetVerticalLineAlignment();
+}
+
+void Controller::SetVerticalLineAlignment(Toolkit::DevelText::VerticalLineAlignment::Type alignment)
+{
+  mImpl->mModel->mVerticalLineAlignment = alignment;
+}
+
+Toolkit::DevelText::EllipsisPosition::Type Controller::GetEllipsisPosition() const
+{
+  return mImpl->mModel->GetEllipsisPosition();
+}
+
+void Controller::SetEllipsisPosition(Toolkit::DevelText::EllipsisPosition::Type ellipsisPosition)
+{
+  mImpl->mModel->mEllipsisPosition = ellipsisPosition;
+  mImpl->mModel->mVisualModel->SetEllipsisPosition(ellipsisPosition);
+}
+
+void Controller::SetCharacterSpacing(float characterSpacing)
+{
+  mImpl->mModel->mVisualModel->SetCharacterSpacing(characterSpacing);
+
+  mImpl->RelayoutAllCharacters();
+  mImpl->RequestRelayout();
+}
+
+const float Controller::GetCharacterSpacing() const
+{
+  return mImpl->mModel->mVisualModel->GetCharacterSpacing();
+}
+
+void Controller::SetVisualTransformOffset(Vector2 offset)
+{
+  mImpl->mModel->mVisualTransformOffset = offset;
+}
+
+Controller::UpdateTextType Controller::Relayout(const Size& size, Dali::LayoutDirection::Type layoutDirection)
+{
+  return Relayouter::Relayout(*this, size, layoutDirection);
+}
+
+void Controller::RequestRelayout()
+{
+  mImpl->RequestRelayout();
+}
+
+Vector<Vector2> Controller::GetTextSize(CharacterIndex startIndex, CharacterIndex endIndex)
+{
+  Vector<Vector2> sizesList;
+  Vector<Vector2> positionsList;
+
+  GetTextGeometry(mImpl->mModel, startIndex, endIndex, sizesList, positionsList);
+  return sizesList;
+}
+
+Vector<Vector2> Controller::GetTextPosition(CharacterIndex startIndex, CharacterIndex endIndex)
+{
+  Vector<Vector2> sizesList;
+  Vector<Vector2> positionsList;
+
+  GetTextGeometry(mImpl->mModel, startIndex, endIndex, sizesList, positionsList);
+  return positionsList;
+}
+
+Rect<float> Controller::GetLineBoundingRectangle(const uint32_t lineIndex)
+{
+  return GetLineBoundingRect(mImpl->mModel, lineIndex);
+}
+
+Rect<float> Controller::GetCharacterBoundingRectangle(const uint32_t charIndex)
+{
+  return GetCharacterBoundingRect(mImpl->mModel, charIndex);
+}
+
+int Controller::GetCharacterIndexAtPosition(float visualX, float visualY)
+{
+  return GetCharIndexAtPosition(mImpl->mModel, visualX, visualY);
+}
+
+Rect<> Controller::GetTextBoundingRectangle(CharacterIndex startIndex, CharacterIndex endIndex)
+{
+  Vector<Vector2> sizeList;
+  Vector<Vector2> positionList;
+
+  GetTextGeometry(mImpl->mModel, startIndex, endIndex, sizeList, positionList);
+
+  if(sizeList.Empty() || sizeList.Size() != positionList.Size())
+  {
+    return {0, 0, 0, 0};
+  }
+
+  auto controlWidth = mImpl->mModel->mVisualModel->mControlSize.width;
+  auto minX         = positionList[0].x;
+  auto minY         = positionList[0].y;
+  auto maxRight     = positionList[0].x + sizeList[0].x;
+  auto maxBottom    = positionList[0].y + sizeList[0].y;
+
+  for(unsigned int i = 1; i < sizeList.Size(); i++)
+  {
+    minX      = std::min(minX, positionList[i].x);
+    minY      = std::min(minY, positionList[i].y);
+    maxRight  = std::max(maxRight, positionList[i].x + sizeList[i].x);
+    maxBottom = std::max(maxBottom, positionList[i].y + sizeList[i].y);
+  }
+
+  if(minX < 0.0f)
+  {
+    minX = 0.0f;
+  }
+
+  if(maxRight > controlWidth)
+  {
+    maxRight = controlWidth;
+  }
+
+  return {minX, minY, maxRight - minX, maxBottom - minY};
+}
+
+bool Controller::IsInputStyleChangedSignalsQueueEmpty()
+{
+  return mImpl->IsInputStyleChangedSignalsQueueEmpty();
+}
+
+void Controller::RequestProcessInputStyleChangedSignals()
+{
+  if(Dali::Adaptor::IsAvailable() && !mImpl->mProcessorRegistered)
+  {
+    mImpl->mProcessorRegistered = true;
+    Dali::Adaptor::Get().RegisterProcessor(*this, true);
+  }
+}
+
+void Controller::OnIdleSignal()
+{
+  if(mImpl->mIdleCallback)
+  {
+    mImpl->mIdleCallback = NULL;
+
+    mImpl->ProcessInputStyleChangedSignals();
+  }
+}
+
+void Controller::KeyboardFocusGainEvent()
+{
+  EventHandler::KeyboardFocusGainEvent(*this);
+}
+
+void Controller::KeyboardFocusLostEvent()
+{
+  EventHandler::KeyboardFocusLostEvent(*this);
+}
+
+bool Controller::KeyEvent(const Dali::KeyEvent& keyEvent)
+{
+  return EventHandler::KeyEvent(*this, keyEvent);
+}
+
+void Controller::AnchorEvent(float x, float y)
+{
+  EventHandler::AnchorEvent(*this, x, y);
+}
+
+void Controller::TapEvent(unsigned int tapCount, float x, float y)
+{
+  EventHandler::TapEvent(*this, tapCount, x, y);
+}
+
+void Controller::PanEvent(GestureState state, const Vector2& displacement)
+{
+  EventHandler::PanEvent(*this, state, displacement);
+}
+
+void Controller::LongPressEvent(GestureState state, float x, float y)
+{
+  EventHandler::LongPressEvent(*this, state, x, y);
+}
+
+void Controller::SelectEvent(float x, float y, SelectionType selectType)
+{
+  EventHandler::SelectEvent(*this, x, y, selectType);
+}
+
+void Controller::SetTextSelectionRange(const uint32_t* start, const uint32_t* end)
+{
+  if(mImpl->mEventData)
+  {
+    mImpl->mEventData->mCheckScrollAmount     = true;
+    mImpl->mEventData->mIsLeftHandleSelected  = true;
+    mImpl->mEventData->mIsRightHandleSelected = true;
+    mImpl->SetTextSelectionRange(start, end);
+    mImpl->RequestRelayout();
+    EventHandler::KeyboardFocusGainEvent(*this);
+  }
+}
+
+Uint32Pair Controller::GetTextSelectionRange() const
+{
+  return mImpl->GetTextSelectionRange();
+}
+
+CharacterIndex Controller::GetPrimaryCursorPosition() const
+{
+  return mImpl->GetPrimaryCursorPosition();
+}
+
+bool Controller::SetPrimaryCursorPosition(CharacterIndex index, bool focused)
+{
+  if(mImpl->mEventData)
+  {
+    mImpl->mEventData->mCheckScrollAmount     = true;
+    mImpl->mEventData->mIsLeftHandleSelected  = true;
+    mImpl->mEventData->mIsRightHandleSelected = true;
+    mImpl->mEventData->mCheckScrollAmount     = true;
+    if(mImpl->SetPrimaryCursorPosition(index, focused) && focused)
+    {
+      EventHandler::KeyboardFocusGainEvent(*this);
+      return true;
+    }
+  }
+  return false;
+}
+
+void Controller::SelectWholeText()
+{
+  EventHandler::SelectEvent(*this, 0.f, 0.f, SelectionType::ALL);
+}
+
+void Controller::SelectNone()
+{
+  EventHandler::SelectEvent(*this, 0.f, 0.f, SelectionType::NONE);
+}
+
+void Controller::SelectText(const uint32_t start, const uint32_t end)
+{
+  EventHandler::SelectEvent(*this, start, end, SelectionType::RANGE);
+}
+
+string Controller::GetSelectedText() const
+{
+  return mImpl->GetSelectedText();
+}
+
+string Controller::CopyText()
+{
+  return mImpl->CopyText();
+}
+
+string Controller::CutText()
+{
+  return mImpl->CutText();
+}
+
+void Controller::PasteClipboardItemEvent(uint32_t id, const char* mimeType, const char* data)
+{
+  // Upon receiving the data, it is important to disconnect the signal
+  // to avoid potential unintended pasting caused by subsequent requests.
+  mImpl->mClipboard.DataReceivedSignal().Disconnect(this, &Controller::PasteClipboardItemEvent);
+
+  // If the id is 0u, it is an invalid response.
+  // text-controller allows only plain text type.
+  if(id != 0u && !strncmp(mimeType, MIME_TYPE_TEXT_PLAIN, strlen(MIME_TYPE_TEXT_PLAIN)))
+  {
+    EventHandler::PasteClipboardItemEvent(*this, data);
+  }
+}
+
+void Controller::PasteText()
+{
+  if(mImpl->EnsureClipboardCreated())
+  {
+    // Connect the signal before calling GetData() of the clipboard.
+    mImpl->mClipboard.DataReceivedSignal().Connect(this, &Controller::PasteClipboardItemEvent);
+
+    // Request clipboard service to retrieve an item.
+    uint id = mImpl->mClipboard.GetData(MIME_TYPE_TEXT_PLAIN);
+    if(id == 0u)
+    {
+      // If the return id is 0u, the signal is not emitted, we must disconnect signal here.
+      mImpl->mClipboard.DataReceivedSignal().Disconnect(this, &Controller::PasteClipboardItemEvent);
+    }
+  }
+}
+
+InputMethodContext::CallbackData Controller::OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
+{
+  return EventHandler::OnInputMethodContextEvent(*this, inputMethodContext, inputMethodContextEvent);
+}
+
+void Controller::GetTargetSize(Vector2& targetSize)
+{
+  targetSize = mImpl->mModel->mVisualModel->mControlSize;
+}
+
+void Controller::AddDecoration(Actor& actor, DecorationType type, bool needsClipping)
+{
+  if(mImpl->mEditableControlInterface)
+  {
+    mImpl->mEditableControlInterface->AddDecoration(actor, type, needsClipping);
+  }
+}
+
+bool Controller::IsEditable() const
+{
+  return mImpl->IsEditable();
+}
+
+void Controller::SetEditable(bool editable)
+{
+  mImpl->SetEditable(editable);
+}
+
+void Controller::ScrollBy(Vector2 scroll)
+{
+  mImpl->ScrollBy(scroll);
+}
+
+bool Controller::IsScrollable(const Vector2& displacement)
+{
+  return mImpl->IsScrollable(displacement);
+}
+
+float Controller::GetHorizontalScrollPosition()
+{
+  return mImpl->GetHorizontalScrollPosition();
+}
+
+float Controller::GetVerticalScrollPosition()
+{
+  return mImpl->GetVerticalScrollPosition();
+}
+
+void Controller::DecorationEvent(HandleType handleType, HandleState state, float x, float y)
+{
+  EventHandler::DecorationEvent(*this, handleType, state, x, y);
+}
+
+void Controller::TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::Buttons button)
+{
+  EventHandler::TextPopupButtonTouched(*this, button);
+}
+
+void Controller::DisplayTimeExpired()
+{
+  mImpl->mEventData->mUpdateCursorPosition = true;
+  // Apply modifications to the model
+  mImpl->mOperationsPending = ALL_OPERATIONS;
+
+  mImpl->RequestRelayout();
+}
+
+void Controller::ResetCursorPosition(CharacterIndex cursorIndex)
+{
+  // Reset the cursor position
+  if(NULL != mImpl->mEventData)
+  {
+    mImpl->mEventData->mPrimaryCursorPosition = cursorIndex;
+
+    // Update the cursor if it's in editing mode.
+    if(EventData::IsEditingState(mImpl->mEventData->mState))
+    {
+      mImpl->mEventData->mUpdateCursorPosition = true;
+    }
+  }
+}
+
+CharacterIndex Controller::GetCursorPosition()
+{
+  return mImpl->mEventData ? mImpl->mEventData->mPrimaryCursorPosition : 0;
+}
+
+void Controller::SetControlInterface(ControlInterface* controlInterface)
+{
+  mImpl->mControlInterface = controlInterface;
+}
+
+void Controller::SetAnchorControlInterface(AnchorControlInterface* anchorControlInterface)
+{
+  mImpl->mAnchorControlInterface = anchorControlInterface;
+}
+
+bool Controller::ShouldClearFocusOnEscape() const
+{
+  return mImpl->mShouldClearFocusOnEscape;
+}
+
+Actor Controller::CreateBackgroundActor()
+{
+  return CreateControllerBackgroundActor(mImpl->mView, mImpl->mModel->mVisualModel, mImpl->mModel->mLogicalModel, mImpl->mShaderBackground);
+}
+
+void Controller::GetAnchorActors(std::vector<Toolkit::TextAnchor>& anchorActors)
+{
+  mImpl->GetAnchorActors(anchorActors);
+}
+
+int Controller::GetAnchorIndex(size_t characterOffset)
+{
+  return mImpl->GetAnchorIndex(characterOffset);
+}
+
+void Controller::Process(bool postProcess)
+{
+  if(Dali::Adaptor::IsAvailable() && mImpl->mProcessorRegistered)
+  {
+    Dali::Adaptor& adaptor = Dali::Adaptor::Get();
+
+    adaptor.UnregisterProcessor(*this, true);
+    mImpl->mProcessorRegistered = false;
+
+    if(NULL == mImpl->mIdleCallback)
+    {
+      // @note: The callback manager takes the ownership of the callback object.
+      mImpl->mIdleCallback = MakeCallback(this, &Controller::OnIdleSignal);
+      if(DALI_UNLIKELY(!adaptor.AddIdle(mImpl->mIdleCallback, false)))
+      {
+        DALI_LOG_ERROR("Fail to add idle callback for text controller style changed signals queue. Skip these callbacks\n");
+
+        // Clear queue forcely.
+        if(mImpl->mEventData)
+        {
+          mImpl->mEventData->mInputStyleChangedQueue.Clear();
+        }
+
+        // Set the pointer to null as the callback manager deletes the callback even AddIdle failed.
+        mImpl->mIdleCallback = NULL;
+      }
+    }
+  }
+}
+
+Controller::Controller(ControlInterface*           controlInterface,
+                       EditableControlInterface*   editableControlInterface,
+                       SelectableControlInterface* selectableControlInterface,
+                       AnchorControlInterface*     anchorControlInterface)
+: mImpl(new Controller::Impl(controlInterface, editableControlInterface, selectableControlInterface, anchorControlInterface))
+{
+}
+
+Controller::~Controller()
+{
+  if(Dali::Adaptor::IsAvailable())
+  {
+    if(mImpl->mProcessorRegistered)
+    {
+      Dali::Adaptor::Get().UnregisterProcessor(*this, true);
+    }
+    if(mImpl->mIdleCallback)
+    {
+      Dali::Adaptor::Get().RemoveIdle(mImpl->mIdleCallback);
+    }
+  }
+}
+
+} // namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/controller/text-controller.h b/dali-toolkit/internal/text/controller/text-controller.h
new file mode 100644
index 0000000..b8ff325
--- /dev/null
+++ b/dali-toolkit/internal/text/controller/text-controller.h
@@ -0,0 +1,2277 @@
+#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_H
+#define DALI_TOOLKIT_TEXT_CONTROLLER_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spanned.h>
+#include <dali/devel-api/adaptor-framework/clipboard.h>
+#include <dali/devel-api/adaptor-framework/input-method-context.h>
+#include <dali/integration-api/processor-interface.h>
+#include <dali/public-api/events/gesture.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/text-controls/text-anchor-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/hidden-text.h>
+#include <dali-toolkit/internal/text/input-filter.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/text-anchor-control-interface.h>
+#include <dali-toolkit/internal/text/text-model-interface.h>
+#include <dali-toolkit/internal/text/text-selectable-control-interface.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+
+namespace Dali::Toolkit::Text
+{
+class Controller;
+class ControlInterface;
+class EditableControlInterface;
+class View;
+class RenderingController;
+
+/**
+   * @brief Text selection operations .
+   */
+enum SelectionType
+{
+  INTERACTIVE = 0x0000, ///< Select the word where the cursor is located.
+  ALL         = 0x0001, ///< Select the whole text.
+  NONE        = 0x0002, ///< Unselect the whole text.
+  RANGE       = 0x0003  ///< Select the range text.
+};
+
+typedef IntrusivePtr<Controller> ControllerPtr;
+
+/**
+ * @brief A Text Controller is used by UI Controls which display text.
+ *
+ * It manipulates the Logical & Visual text models on behalf of the UI Controls.
+ * It provides a view of the text that can be used by rendering back-ends.
+ *
+ * For selectable/editable UI controls, the controller handles input events from the UI control
+ * and decorations (grab handles etc) via the Decorator::ControllerInterface interface.
+ *
+ * The text selection popup button callbacks are as well handled via the TextSelectionPopupCallbackInterface interface.
+ */
+class Controller : public RefObject,
+                   public Decorator::ControllerInterface,
+                   public TextSelectionPopupCallbackInterface,
+                   public HiddenText::Observer,
+                   public ConnectionTracker,
+                   public Integration::Processor
+{
+public: // Enumerated types.
+  /**
+   * @brief Text related operations to be done in the relayout process.
+   */
+  enum OperationsMask
+  {
+    NO_OPERATION       = 0x0000,
+    CONVERT_TO_UTF32   = 0x0001,
+    GET_SCRIPTS        = 0x0002,
+    VALIDATE_FONTS     = 0x0004,
+    GET_LINE_BREAKS    = 0x0008,
+    BIDI_INFO          = 0x0010,
+    SHAPE_TEXT         = 0x0020,
+    GET_GLYPH_METRICS  = 0x0040,
+    LAYOUT             = 0x0080,
+    UPDATE_LAYOUT_SIZE = 0x0100,
+    REORDER            = 0x0200,
+    ALIGN              = 0x0400,
+    COLOR              = 0x0800,
+    UPDATE_DIRECTION   = 0x1000,
+    ALL_OPERATIONS     = 0xFFFF
+  };
+
+  /**
+   * @brief Used to distinguish between regular key events and InputMethodContext events
+   */
+  enum InsertType
+  {
+    COMMIT,
+    PRE_EDIT
+  };
+
+  /**
+   * @brief Used to specify whether to update the input style.
+   */
+  enum UpdateInputStyleType
+  {
+    UPDATE_INPUT_STYLE,
+    DONT_UPDATE_INPUT_STYLE
+  };
+
+  /**
+   * @brief Used to specify what has been updated after the Relayout() method has been called.
+   */
+  enum UpdateTextType
+  {
+    NONE_UPDATED      = 0x0, ///< Nothing has been updated.
+    MODEL_UPDATED     = 0x1, ///< The text's model has been updated.
+    DECORATOR_UPDATED = 0x2  ///< The decoration has been updated.
+  };
+
+  /**
+   * @brief Different placeholder-text can be shown when the control is active/inactive.
+   */
+  enum PlaceholderType
+  {
+    PLACEHOLDER_TYPE_ACTIVE,
+    PLACEHOLDER_TYPE_INACTIVE,
+  };
+
+  /**
+   * @brief Enumeration for Font Size Type.
+   */
+  enum FontSizeType
+  {
+    POINT_SIZE, // The size of font in points.
+    PIXEL_SIZE  // The size of font in pixels.
+  };
+
+  struct NoTextTap
+  {
+    enum Action
+    {
+      NO_ACTION,           ///< Does no action if there is a tap on top of an area with no text.
+      HIGHLIGHT,           ///< Highlights the nearest text (at the beginning or end of the text) and shows the text's selection popup.
+      SHOW_SELECTION_POPUP ///< Shows the text's selection popup.
+    };
+  };
+
+  struct TextFitInfo
+  {
+    enum Property
+    {
+      TEXT_FIT_ENABLE,
+      TEXT_FIT_MIN_SIZE,
+      TEXT_FIT_MAX_SIZE,
+      TEXT_FIT_STEP_SIZE,
+      TEXT_FIT_FONT_SIZE_TYPE
+    };
+  };
+
+public: // Constructor.
+  /**
+   * @brief Create a new instance of a Controller.
+   *
+   * @return A pointer to a new Controller.
+   */
+  static ControllerPtr New()
+  {
+    return ControllerPtr(new Controller());
+  }
+
+  /**
+   * @brief Create a new instance of a Controller.
+   *
+   * @param[in] controlInterface The control's interface.
+   *
+   * @return A pointer to a new Controller.
+   */
+  static ControllerPtr New(ControlInterface* controlInterface)
+  {
+    return ControllerPtr(new Controller(controlInterface));
+  }
+
+  /**
+   * @brief Create a new instance of a Controller.
+   *
+   * @param[in] controlInterface The control's interface.
+   * @param[in] editableControlInterface The editable control's interface.
+   * @param[in] selectableControlInterface The selectable control's interface.
+   * @param[in] anchorControlInterface The anchor control's interface.
+   *
+   * @return A pointer to a new Controller.
+   */
+  static ControllerPtr New(ControlInterface*           controlInterface,
+                           EditableControlInterface*   editableControlInterface,
+                           SelectableControlInterface* selectableControlInterface,
+                           AnchorControlInterface*     anchorControlInterface)
+  {
+    return ControllerPtr(new Controller(controlInterface,
+                                        editableControlInterface,
+                                        selectableControlInterface,
+                                        anchorControlInterface));
+  }
+
+public: // Configure the text controller.
+  /**
+   * @brief Called to enable text input.
+   *
+   * @note Selectable or editable controls should call this once after Controller::New().
+   * @param[in] decorator Used to create cursor, selection handle decorations etc.
+   * @param[in] inputMethodContext Used to manager ime.
+   */
+  void EnableTextInput(DecoratorPtr decorator, InputMethodContext& inputMethodContext);
+
+  /**
+   * @brief Used to switch between bitmap & vector based glyphs
+   *
+   * @param[in] glyphType The type of glyph; note that metrics for bitmap & vector based glyphs are different.
+   */
+  void SetGlyphType(TextAbstraction::GlyphType glyphType);
+
+  /**
+   * @brief Enables/disables the mark-up processor.
+   *
+   * By default is disabled.
+   *
+   * @param[in] enable Whether to enable the mark-up processor.
+   */
+  void SetMarkupProcessorEnabled(bool enable);
+
+  /**
+   * @brief Retrieves whether the mark-up processor is enabled.
+   *
+   * By default is disabled.
+   *
+   * @return @e true if the mark-up processor is enabled, otherwise returns @e false.
+   */
+  bool IsMarkupProcessorEnabled() const;
+
+  /**
+   * @brief Retrieves whether the current text contains anchors.
+   *
+   * @return @e true if the current text contains anchors. @e false.
+   */
+  bool HasAnchors() const;
+
+  /**
+   * @brief Enables/disables the auto text scrolling
+   *
+   * By default is disabled.
+   *
+   * @param[in] enable Whether to enable the auto scrolling
+   */
+  void SetAutoScrollEnabled(bool enable);
+
+  /**
+   * @brief Whether the auto scrolling texture exceed max texture.
+   *
+   * By default is false.
+   *
+   * @param[in] exceed Whether the auto scrolling texture exceed max texture.
+   */
+  void SetAutoScrollMaxTextureExceeded(bool exceed);
+
+  /**
+   * @brief Retrieves whether auto text scrolling is enabled.
+   *
+   * By default is disabled.
+   *
+   * @return @e true if auto scrolling is enabled, otherwise returns @e false.
+   */
+  bool IsAutoScrollEnabled() const;
+
+  /**
+   * @brief Get direction of the text from the first line of text,
+   * @return bool rtl (right to left) is true
+   */
+  CharacterDirection GetAutoScrollDirection() const;
+
+  /**
+   * @brief Get the alignment offset of the first line of text.
+   *
+   * @return The alignment offset.
+   */
+  float GetAutoScrollLineAlignment() const;
+
+  /**
+   * @brief Enables the horizontal scrolling.
+   *
+   * @param[in] enable Whether to enable the horizontal scrolling.
+   */
+  void SetHorizontalScrollEnabled(bool enable);
+
+  /**
+   * @brief Retrieves whether the horizontal scrolling is enabled.
+   *
+   * @return @e true if the horizontal scrolling is enabled, otherwise it returns @e false.
+   */
+  bool IsHorizontalScrollEnabled() const;
+
+  /**
+   * @brief Enables the vertical scrolling.
+   *
+   * @param[in] enable Whether to enable the vertical scrolling.
+   */
+  void SetVerticalScrollEnabled(bool enable);
+
+  /**
+   * @brief Retrieves whether the verticall scrolling is enabled.
+   *
+   * @return @e true if the vertical scrolling is enabled, otherwise it returns @e false.
+   */
+  bool IsVerticalScrollEnabled() const;
+
+  /**
+   * @brief Enables the smooth handle panning.
+   *
+   * @param[in] enable Whether to enable the smooth handle panning.
+   */
+  void SetSmoothHandlePanEnabled(bool enable);
+
+  /**
+   * @brief Retrieves whether the smooth handle panning is enabled.
+   *
+   * @return @e true if the smooth handle panning is enabled.
+   */
+  bool IsSmoothHandlePanEnabled() const;
+
+  /**
+   * @brief Sets the maximum number of characters that can be inserted into the TextModel
+   *
+   * @param[in] maxCharacters maximum number of characters to be accepted
+   */
+  void SetMaximumNumberOfCharacters(Length maxCharacters);
+
+  /**
+   * @brief Sets the maximum number of characters that can be inserted into the TextModel
+   *
+   * @param[in] maxCharacters maximum number of characters to be accepted
+   */
+  int GetMaximumNumberOfCharacters();
+
+  /**
+   * @brief Called to enable/disable cursor blink.
+   *
+   * @note Only editable controls should calls this.
+   * @param[in] enabled Whether the cursor should blink or not.
+   */
+  void SetEnableCursorBlink(bool enable);
+
+  /**
+   * @brief Query whether cursor blink is enabled.
+   *
+   * @return Whether the cursor should blink or not.
+   */
+  bool GetEnableCursorBlink() const;
+
+  /**
+   * @brief Whether to enable the multi-line layout.
+   *
+   * @param[in] enable \e true enables the multi-line (by default)
+   */
+  void SetMultiLineEnabled(bool enable);
+
+  /**
+   * @return Whether the multi-line layout is enabled.
+   */
+  bool IsMultiLineEnabled() const;
+
+  /**
+   * @brief Sets the text's horizontal alignment.
+   *
+   * @param[in] alignment The horizontal alignment.
+   */
+  void SetHorizontalAlignment(HorizontalAlignment::Type alignment);
+
+  /**
+   * @copydoc ModelInterface::GetHorizontalAlignment()
+   */
+  HorizontalAlignment::Type GetHorizontalAlignment() const;
+
+  /**
+   * @brief Sets the text's vertical alignment.
+   *
+   * @param[in] alignment The vertical alignment.
+   */
+  void SetVerticalAlignment(VerticalAlignment::Type alignment);
+
+  /**
+   * @copydoc ModelInterface::GetVerticalAlignment()
+   */
+  VerticalAlignment::Type GetVerticalAlignment() const;
+
+  /**
+   * @brief Sets the text's wrap mode
+   * @param[in] text wrap mode The unit of wrapping
+   */
+  void SetLineWrapMode(Text::LineWrap::Mode textWarpMode);
+
+  /**
+   * @brief Retrieve text wrap mode previously set.
+   * @return text wrap mode
+   */
+  Text::LineWrap::Mode GetLineWrapMode() const;
+
+  /**
+   * @brief Enable or disable the text elide.
+   *
+   * @param[in] enabled Whether to enable the text elide.
+   */
+  void SetTextElideEnabled(bool enabled);
+
+  /**
+   * @copydoc ModelInterface::IsTextElideEnabled()
+   */
+  bool IsTextElideEnabled() const;
+
+  /**
+   * @brief Enable or disable the text fit.
+   *
+   * @param[in] enabled Whether to enable the text fit.
+   */
+  void SetTextFitEnabled(bool enabled);
+
+  /**
+   * @brief Whether the text fit is enabled or not.
+   *
+   * @return True if the text fit is enabled
+   */
+  bool IsTextFitEnabled() const;
+
+  /**
+   * @brief Sets current line size.
+   *
+   * @param[in] lineSize line size value to store the MinLineSize set by user when TextFitArray is enabled.
+   */
+  void SetCurrentLineSize(float lineSize);
+
+  /**
+   * @brief Retrieves the current line size.
+   *
+   * @return The current line size
+   */
+  float GetCurrentLineSize() const;
+
+  /**
+   * @brief Sets minimum size valid for text fit.
+   *
+   * @param[in] minimum size value.
+   * @param[in] type The font size type is point size or pixel size
+   */
+  void SetTextFitMinSize(float pointSize, FontSizeType type);
+
+  /**
+   * @brief Retrieves the minimum point size valid for text fit.
+   *
+   * @return The minimum point size valid for text fit
+   */
+  float GetTextFitMinSize() const;
+
+  /**
+   * @brief Sets maximum size valid for text fit.
+   *
+   * @param[in] maximum size value.
+   * @param[in] type The font size type is point size or pixel size
+   */
+  void SetTextFitMaxSize(float pointSize, FontSizeType type);
+
+  /**
+   * @brief Retrieves the maximum point size valid for text fit.
+   *
+   * @return The maximum point size valid for text fit
+   */
+  float GetTextFitMaxSize() const;
+
+  /**
+   * @brief Sets step size for font increase valid for text fit.
+   *
+   * @param[in] step size value.
+   * @param[in] type The font size type is point size or pixel size
+   */
+  void SetTextFitStepSize(float step, FontSizeType type);
+
+  /**
+   * @brief Retrieves the step point size valid for text fit.
+   *
+   * @return The step point size valid for text fit
+   */
+  float GetTextFitStepSize() const;
+
+  /**
+   * @brief Sets content size valid for text fit.
+   *
+   * @param[in] Content size value.
+   */
+  void SetTextFitContentSize(Vector2 size);
+
+  /**
+   * @brief Retrieves the content size valid for text fit.
+   *
+   * @return The content size valid for text fit
+   */
+  Vector2 GetTextFitContentSize() const;
+
+  /**
+   * @brief Retrieve the fited point size.
+   *
+   * @return The fited point size.
+   */
+  float GetTextFitPointSize() const;
+
+  /**
+   * @brief Sets whether the text fit properties have changed.
+   *
+   * @param[in] changed Whether to changed the text fit.
+   */
+  void SetTextFitChanged(bool changed);
+
+  /**
+   * @brief Whether the text fit properties are changed or not.
+   *
+   * @return True if the text fit properties are changed
+   */
+  bool IsTextFitChanged() const;
+
+  /**
+   * @brief Sets line size valid for text fit.
+   *
+   * @param[in] lineSize line size value
+   */
+  void SetTextFitLineSize(float lineSize);
+
+  /**
+   * @brief Enable or disable the text fit array.
+   *
+   * @param[in] enabled Whether to enable the text fit array.
+   */
+  void SetTextFitArrayEnabled(bool enabled);
+
+  /**
+   * @brief Whether the text fit array is enabled or not.
+   *
+   * @return True if the text fit array is enabled.
+   */
+  bool IsTextFitArrayEnabled() const;
+
+  /**
+   * @brief Sets the text fit array.
+   *
+   * @param[in] fitOptions The list of text fit options.
+   */
+  void SetTextFitArray(std::vector<Toolkit::DevelTextLabel::FitOption>& fitOptions);
+
+  /**
+   * @brief Retrieve the text fit array.
+   *
+   * @return The list of text fit options.
+   */
+  std::vector<Toolkit::DevelTextLabel::FitOption>& GetTextFitArray();
+
+  /**
+   * @brief Sets disabled color opacity.
+   *
+   * @param[in] opacity The color opacity value in disabled state.
+   */
+  void SetDisabledColorOpacity(float opacity);
+
+  /**
+   * @brief Retrieves the disabled color opacity.
+   *
+   * @return The disabled color opacity value for disabled state.
+   */
+  float GetDisabledColorOpacity() const;
+
+  /**
+   * @brief Enable or disable the placeholder text elide.
+   * @param enabled Whether to enable the placeholder text elide.
+   */
+  void SetPlaceholderTextElideEnabled(bool enabled);
+
+  /**
+   * @brief Whether the placeholder text elide property is enabled.
+   * @return True if the placeholder text elide property is enabled, false otherwise.
+   */
+  bool IsPlaceholderTextElideEnabled() const;
+
+  /**
+   * @brief Enable or disable the text selection.
+   * @param[in] enabled Whether to enable the text selection.
+   */
+  void SetSelectionEnabled(bool enabled);
+
+  /**
+   * @brief Whether the text selection is enabled or not.
+   * @return True if the text selection is enabled
+   */
+  bool IsSelectionEnabled() const;
+
+  /**
+   * @brief Enable or disable the text selection using Shift key.
+   * @param enabled Whether to enable the text selection using Shift key
+   */
+  void SetShiftSelectionEnabled(bool enabled);
+
+  /**
+   * @brief Whether the text selection using Shift key is enabled or not.
+   * @return True if the text selection using Shift key is enabled
+   */
+  bool IsShiftSelectionEnabled() const;
+
+  /**
+   * @brief Enable or disable the grab handles for text selection.
+   *
+   * @param[in] enabled Whether to enable the grab handles
+   */
+  void SetGrabHandleEnabled(bool enabled);
+
+  /**
+   * @brief Returns whether the grab handles are enabled.
+   *
+   * @return True if the grab handles are enabled
+   */
+  bool IsGrabHandleEnabled() const;
+
+  /**
+   * @brief Enable or disable the grab handles for text selection.
+   *
+   * @param[in] enabled Whether to enable the grab handles
+   */
+  void SetGrabHandlePopupEnabled(bool enabled);
+
+  /**
+   * @brief Returns whether the grab handles are enabled.
+   *
+   * @return True if the grab handles are enabled
+   */
+  bool IsGrabHandlePopupEnabled() const;
+
+  /**
+   * @brief Sets input type to password
+   *
+   * @note The string is displayed hidden character
+   *
+   * @param[in] passwordInput True if password input is enabled.
+   */
+  void SetInputModePassword(bool passwordInput);
+
+  /**
+   * @brief Returns whether the input mode type is set as password.
+   *
+   * @return True if input mode type is password
+   */
+  bool IsInputModePassword();
+
+  /**
+   * @brief Sets the action when there is a double tap event on top of a text area with no text.
+   *
+   * @param[in] action The action to do.
+   */
+  void SetNoTextDoubleTapAction(NoTextTap::Action action);
+
+  /**
+   * @brief Retrieves the action when there is a double tap event on top of a text area with no text.
+   *
+   * @return The action to do.
+   */
+  NoTextTap::Action GetNoTextDoubleTapAction() const;
+
+  /**
+   * @briefSets the action when there is a long press event on top of a text area with no text.
+   *
+   * @param[in] action The action to do.
+   */
+  void SetNoTextLongPressAction(NoTextTap::Action action);
+
+  /**
+   * @brief Retrieves the action when there is a long press event on top of a text area with no text.
+   *
+   * @return The action to do.
+   */
+  NoTextTap::Action GetNoTextLongPressAction() const;
+
+  /**
+   * @brief Query if Underline settings were provided by string or map
+   * @return bool true if set by string
+   */
+  bool IsUnderlineSetByString();
+
+  /**
+   * Set method underline setting were set by
+   * @param[in] bool, true if set by string
+   */
+  void UnderlineSetByString(bool setByString);
+
+  /**
+   * @brief Query if shadow settings were provided by string or map
+   * @return bool true if set by string
+   */
+  bool IsShadowSetByString();
+
+  /**
+   * Set method shadow setting were set by
+   * @param[in] bool, true if set by string
+   */
+  void ShadowSetByString(bool setByString);
+
+  /**
+   * @brief Query if outline settings were provided by string or map
+   * @return bool true if set by string
+   */
+  bool IsOutlineSetByString();
+
+  /**
+   * Set method outline setting were set by
+   * @param[in] bool, true if set by string
+   */
+  void OutlineSetByString(bool setByString);
+
+  /**
+   * @brief Query if font style settings were provided by string or map
+   * @return bool true if set by string
+   */
+  bool IsFontStyleSetByString();
+
+  /**
+   * Set method font style setting were set by
+   * @param[in] bool, true if set by string
+   */
+  void FontStyleSetByString(bool setByString);
+
+  /**
+   * @brief Query if Strikethrough settings were provided by string or map
+   * @return bool true if set by string
+   */
+  bool IsStrikethroughSetByString();
+
+  /**
+   * Set method Strikethrough setting were set by
+   * @param[in] bool, true if set by string
+   */
+  void StrikethroughSetByString(bool setByString);
+
+  /**
+   * @brief Set the override used for strikethrough height, 0 indicates height will be supplied by font metrics
+   *
+   * @param[in] height The height in pixels of the strikethrough
+   */
+  void SetStrikethroughHeight(float height);
+
+  /**
+   * @brief Retrieves the override height of an strikethrough, 0 indicates height is supplied by font metrics
+   *
+   * @return The height of the strikethrough, or 0 if height is not overrided.
+   */
+  float GetStrikethroughHeight() const;
+
+  /**
+   * @brief Set the strikethrough color.
+   *
+   * @param[in] color color of strikethrough.
+   */
+  void SetStrikethroughColor(const Vector4& color);
+
+  /**
+   * @brief Retrieve the strikethrough color.
+   *
+   * @return The strikethrough color.
+   */
+  const Vector4& GetStrikethroughColor() const;
+
+  /**
+   * @brief Set the strikethrough enabled flag.
+   *
+   * @param[in] enabled The strikethrough enabled flag.
+   */
+  void SetStrikethroughEnabled(bool enabled);
+
+  /**
+   * @brief Returns whether the text has a strikethrough or not.
+   *
+   * @return The strikethrough state.
+   */
+  bool IsStrikethroughEnabled() const;
+
+public: // Update.
+  /**
+   * @brief Replaces any text previously set.
+   *
+   * @note This will be converted into UTF-32 when stored in the text model.
+   * @param[in] text A string of UTF-8 characters.
+   */
+  void SetText(const std::string& text);
+
+  /**
+   * @brief Retrieve any text previously set.
+   *
+   * @param[out] text A string of UTF-8 characters.
+   */
+  void GetText(std::string& text) const;
+
+  /**
+   * @brief Retrieves number of characters previously set.
+   *
+   * @return A length of string of UTF-32 characters.
+   */
+  Length GetNumberOfCharacters() const;
+
+  /**
+ * @brief Set the @p spannedText
+ * the spanned text contains content (text) and  format (spans with ranges)
+ * the text is copied into text-controller and the spans are applied on ranges
+ *
+ * @param[in] spannedText the text with spans.
+ */
+  void SetSpannedText(const Text::Spanned& spannedText);
+
+  /**
+   * @brief Replaces any placeholder text previously set.
+   *
+   * @param[in] type Different placeholder-text can be shown when the control is active/inactive.
+   * @param[in] text A string of UTF-8 characters.
+   */
+  void SetPlaceholderText(PlaceholderType type, const std::string& text);
+
+  /**
+   * @brief Retrieve any placeholder text previously set.
+   *
+   * @param[in] type Different placeholder-text can be shown when the control is active/inactive.
+   * @param[out] A string of UTF-8 characters.
+   */
+  void GetPlaceholderText(PlaceholderType type, std::string& text) const;
+
+  /**
+   * @ brief Update the text after a font change
+   * @param[in] newDefaultFont The new font to change to
+   */
+  void UpdateAfterFontChange(const std::string& newDefaultFont);
+
+  /**
+   * @brief The method acquires currently selected text
+   * @param selectedText variable to place selected text in
+   */
+  void RetrieveSelection(std::string& selectedText) const;
+
+  /**
+   * @brief The method sets selection in given range
+   * @param start index of first character
+   * @param end   index of first character after selection
+   */
+  void SetSelection(int start, int end);
+
+  /**
+   * @brief This method retrieve indexes of current selection
+   *
+   * @return a pair, where first element is left index of selection and second is the right one
+   */
+  std::pair<int, int> GetSelectionIndexes() const;
+
+  /**
+   * Place string in system clipboard
+   * @param source std::string
+   */
+  void CopyStringToClipboard(const std::string& source);
+
+  /**
+   * Place currently selected text in system clipboard
+   * @param deleteAfterSending flag pointing if text should be deleted after sending to clipboard
+   */
+  void SendSelectionToClipboard(bool deleteAfterSending);
+
+public: // Default style & Input style
+  /**
+   * @brief Set the default font family.
+   *
+   * @param[in] defaultFontFamily The default font family.
+   */
+  void SetDefaultFontFamily(const std::string& defaultFontFamily);
+
+  /**
+   * @brief Retrieve the default font family.
+   *
+   * @return The default font family.
+   */
+  std::string GetDefaultFontFamily() const;
+
+  /**
+   * @brief Sets the placeholder text font family.
+   * @param[in] placeholderTextFontFamily The placeholder text font family.
+   */
+  void SetPlaceholderFontFamily(const std::string& placeholderTextFontFamily);
+
+  /**
+   * @brief Retrieves the placeholder text font family.
+   *
+   * @return The placeholder text font family
+   */
+  std::string GetPlaceholderFontFamily() const;
+
+  /**
+   * @brief Sets the default font weight.
+   *
+   * @param[in] weight The font weight.
+   */
+  void SetDefaultFontWeight(FontWeight weight);
+
+  /**
+   * @brief Whether the font's weight has been defined.
+   */
+  bool IsDefaultFontWeightDefined() const;
+
+  /**
+   * @brief Retrieves the default font weight.
+   *
+   * @return The default font weight.
+   */
+  FontWeight GetDefaultFontWeight() const;
+
+  /**
+   * @brief Sets the placeholder text font weight.
+   *
+   * @param[in] weight The font weight
+   */
+  void SetPlaceholderTextFontWeight(FontWeight weight);
+
+  /**
+   * @brief Whether the font's weight has been defined.
+   *
+   * @return True if the placeholder text font weight is defined
+   */
+  bool IsPlaceholderTextFontWeightDefined() const;
+
+  /**
+   * @brief Retrieves the placeholder text font weight.
+   *
+   * @return The placeholder text font weight
+   */
+  FontWeight GetPlaceholderTextFontWeight() const;
+
+  /**
+   * @brief Sets the default font width.
+   *
+   * @param[in] width The font width.
+   */
+  void SetDefaultFontWidth(FontWidth width);
+
+  /**
+   * @brief Whether the font's width has been defined.
+   */
+  bool IsDefaultFontWidthDefined() const;
+
+  /**
+   * @brief Retrieves the default font width.
+   *
+   * @return The default font width.
+   */
+  FontWidth GetDefaultFontWidth() const;
+
+  /**
+   * @brief Sets the placeholder text font width.
+   *
+   * @param[in] width The font width
+   */
+  void SetPlaceholderTextFontWidth(FontWidth width);
+
+  /**
+   * @brief Whether the font's width has been defined.
+   *
+   * @return True if the placeholder text font width is defined
+   */
+  bool IsPlaceholderTextFontWidthDefined() const;
+
+  /**
+   * @brief Retrieves the placeholder text font width.
+   *
+   * @return The placeholder text font width
+   */
+  FontWidth GetPlaceholderTextFontWidth() const;
+
+  /**
+   * @brief Sets the default font slant.
+   *
+   * @param[in] slant The font slant.
+   */
+  void SetDefaultFontSlant(FontSlant slant);
+
+  /**
+   * @brief Whether the font's slant has been defined.
+   */
+  bool IsDefaultFontSlantDefined() const;
+
+  /**
+   * @brief Retrieves the default font slant.
+   *
+   * @return The default font slant.
+   */
+  FontSlant GetDefaultFontSlant() const;
+
+  /**
+   * @brief Sets the placeholder text font slant.
+   *
+   * @param[in] slant The font slant
+   */
+  void SetPlaceholderTextFontSlant(FontSlant slant);
+
+  /**
+   * @brief Whether the font's slant has been defined.
+   *
+   * @return True if the placeholder text font slant is defined
+   */
+  bool IsPlaceholderTextFontSlantDefined() const;
+
+  /**
+   * @brief Retrieves the placeholder text font slant.
+   *
+   * @return The placeholder text font slant
+   */
+  FontSlant GetPlaceholderTextFontSlant() const;
+
+  /**
+   * @brief Set the default font size.
+   *
+   * @param[in] fontSize The default font size
+   * @param[in] type The font size type is point size or pixel size
+   */
+  void SetDefaultFontSize(float fontSize, FontSizeType type);
+
+  /**
+   * @brief Retrieve the default point size.
+   *
+   * @param[in] type The font size type
+   * @return The default point size.
+   */
+  float GetDefaultFontSize(FontSizeType type) const;
+
+  /**
+   * @brief Set the font size scale.
+   *
+   * @param[in] scale The font size scale
+   */
+  void SetFontSizeScale(float scale);
+
+  /**
+   * @brief Get the font size scale.
+   *
+   * @return The font size scale.
+   */
+  float GetFontSizeScale() const;
+
+  /**
+   * @brief Set the font size scale enabled flag.
+   *
+   * @param[in] enabled whether to enable the font size scale.
+   */
+  void SetFontSizeScaleEnabled(bool enabled);
+
+  /**
+   * @brief Returns whether the font size scale is enabled or not.
+   *
+   * @return @e true if the font size scale is enabled, otherwise returns @e false.
+   */
+  bool IsFontSizeScaleEnabled() const;
+
+  /**
+   * @brief Sets the Placeholder text font size.
+   * @param[in] fontSize The placeholder text font size
+   * @param[in] type The font size type is point size or pixel size
+   */
+  void SetPlaceholderTextFontSize(float fontSize, FontSizeType type);
+
+  /**
+   * @brief Retrieves the Placeholder text font size.
+   * @param[in] type The font size type
+   * @return The placeholder font size
+   */
+  float GetPlaceholderTextFontSize(FontSizeType type) const;
+
+  /**
+   * @brief Sets the text's default color.
+   *
+   * @param color The default color.
+   */
+  void SetDefaultColor(const Vector4& color);
+
+  /**
+   * @brief Retrieves the text's default color.
+   *
+   * @return The default color.
+   */
+  const Vector4& GetDefaultColor() const;
+
+  /**
+   * @brief Sets the anchor's default color.
+   *
+   * @param color The anchor color.
+   */
+  void SetAnchorColor(const Vector4& color);
+
+  /**
+   * @brief Retrieves the anchor's default color.
+   *
+   * @return The anchor color.
+   */
+  const Vector4& GetAnchorColor() const;
+
+  /**
+   * @brief Sets the anchor's clicked color.
+   *
+   * @param color The anchor color.
+   */
+  void SetAnchorClickedColor(const Vector4& color);
+
+  /**
+   * @brief Retrieves the anchor's clicked color.
+   *
+   * @return The anchor color.
+   */
+  const Vector4& GetAnchorClickedColor() const;
+
+  /**
+   * @brief Sets the user interaction enabled.
+   *
+   * @param enabled whether to enable the user interaction.
+   */
+  void SetUserInteractionEnabled(bool enabled);
+
+  /**
+   * @brief Whether the user interaction is enabled.
+   *
+   * @return true if the user interaction is enabled, false otherwise.
+   */
+  bool IsUserInteractionEnabled() const;
+
+  /**
+   * @brief Set the text color
+   *
+   * @param textColor The text color
+   */
+  void SetPlaceholderTextColor(const Vector4& textColor);
+
+  /**
+   * @brief Retrieve the text color
+   *
+   * @return The text color
+   */
+  const Vector4& GetPlaceholderTextColor() const;
+
+  /**
+   * @brief Set the shadow offset.
+   *
+   * @param[in] shadowOffset The shadow offset, 0,0 indicates no shadow.
+   */
+  void SetShadowOffset(const Vector2& shadowOffset);
+
+  /**
+   * @brief Retrieve the shadow offset.
+   *
+   * @return The shadow offset.
+   */
+  const Vector2& GetShadowOffset() const;
+
+  /**
+   * @brief Set the shadow color.
+   *
+   * @param[in] shadowColor The shadow color.
+   */
+  void SetShadowColor(const Vector4& shadowColor);
+
+  /**
+   * @brief Retrieve the shadow color.
+   *
+   * @return The shadow color.
+   */
+  const Vector4& GetShadowColor() const;
+
+  /**
+   * @brief Set the shadow blur radius.
+   *
+   * @param[in] shadowBlurRadius The shadow blur radius, 0,0 indicates no blur.
+   */
+  void SetShadowBlurRadius(const float& shadowBlurRadius);
+
+  /**
+   * @brief Retrieve the shadow blur radius.
+   *
+   * @return The shadow blur radius.
+   */
+  const float& GetShadowBlurRadius() const;
+
+  /**
+   * @brief Set the underline color.
+   *
+   * @param[in] color color of underline.
+   */
+  void SetUnderlineColor(const Vector4& color);
+
+  /**
+   * @brief Retrieve the underline color.
+   *
+   * @return The underline color.
+   */
+  const Vector4& GetUnderlineColor() const;
+
+  /**
+   * @brief Set the underline enabled flag.
+   *
+   * @param[in] enabled The underline enabled flag.
+   */
+  void SetUnderlineEnabled(bool enabled);
+
+  /**
+   * @brief Returns whether the text is underlined or not.
+   *
+   * @return The underline state.
+   */
+  bool IsUnderlineEnabled() const;
+
+  /**
+   * @brief Set the override used for underline height, 0 indicates height will be supplied by font metrics
+   *
+   * @param[in] height The height in pixels of the underline
+   */
+  void SetUnderlineHeight(float height);
+
+  /**
+   * @brief Retrieves the override height of an underline, 0 indicates height is supplied by font metrics
+   *
+   * @return The height of the underline, or 0 if height is not overrided.
+   */
+  float GetUnderlineHeight() const;
+
+  /**
+   * @brief Sets the underline type.
+   * @param[in] type The underline type.
+   */
+  void SetUnderlineType(Text::Underline::Type type);
+
+  /**
+   * @brief Retrieve underline type.
+   * @return The underline type.
+   */
+  Text::Underline::Type GetUnderlineType() const;
+
+  /**
+   * @brief Set the width of the dashes of the dashed underline.
+   *
+   * @param[in] width The width in pixels of the dashes of the dashed underline.
+   */
+  void SetDashedUnderlineWidth(float width);
+
+  /**
+   * @brief Retrieves the width of the dashes of the dashed underline.
+   *
+   * @return The width of the dashes of the dashed underline.
+   */
+  float GetDashedUnderlineWidth() const;
+
+  /**
+   * @brief Set the gap between the dashes of the dashed underline.
+   *
+   * @param[in] gap The gap between the dashes of the dashed underline.
+   */
+  void SetDashedUnderlineGap(float gap);
+
+  /**
+   * @brief Retrieves the gap between the dashes of the dashed underline.
+   *
+   * @return The The gap between the dashes of the dashed underline.
+   */
+  float GetDashedUnderlineGap() const;
+
+  /**
+   * @brief Set the outline color.
+   *
+   * @param[in] color color of outline.
+   */
+  void SetOutlineColor(const Vector4& color);
+
+  /**
+   * @brief Retrieve the outline color.
+   *
+   * @return The outline color.
+   */
+  const Vector4& GetOutlineColor() const;
+
+  /**
+   * @brief Set the outline width
+   *
+   * @param[in] width The width in pixels of the outline, 0 indicates no outline
+   */
+  void SetOutlineWidth(uint16_t width);
+
+  /**
+   * @brief Retrieves the width of an outline
+   *
+   * @return The width of the outline.
+   */
+  uint16_t GetOutlineWidth() const;
+
+  /**
+   * @brief Set the background color.
+   *
+   * @param[in] color color of background.
+   */
+  void SetBackgroundColor(const Vector4& color);
+
+  /**
+   * @brief Retrieve the background color.
+   *
+   * @return The background color.
+   */
+  const Vector4& GetBackgroundColor() const;
+
+  /**
+   * @brief Set the background enabled flag.
+   *
+   * @param[in] enabled The background enabled flag.
+   */
+  void SetBackgroundEnabled(bool enabled);
+
+  /**
+   * @brief Returns whether to enable text background or not.
+   *
+   * @return Whether text background is enabled.
+   */
+  bool IsBackgroundEnabled() const;
+
+  /**
+   * @brief Sets the emboss's properties string.
+   *
+   * @note The string is stored to be recovered.
+   *
+   * @param[in] embossProperties The emboss's properties string.
+   */
+  void SetDefaultEmbossProperties(const std::string& embossProperties);
+
+  /**
+   * @brief Retrieves the emboss's properties string.
+   *
+   * @return The emboss's properties string.
+   */
+  std::string GetDefaultEmbossProperties() const;
+
+  /**
+   * @brief Sets the outline's properties string.
+   *
+   * @note The string is stored to be recovered.
+   *
+   * @param[in] outlineProperties The outline's properties string.
+   */
+  void SetDefaultOutlineProperties(const std::string& outlineProperties);
+
+  /**
+   * @brief Retrieves the outline's properties string.
+   *
+   * @return The outline's properties string.
+   */
+  std::string GetDefaultOutlineProperties() const;
+
+  /**
+   * @brief Sets the default line spacing.
+   *
+   * @param[in] lineSpacing The line spacing.
+   *
+   * @return True if lineSpacing has been updated, false otherwise
+   */
+  bool SetDefaultLineSpacing(float lineSpacing);
+
+  /**
+   * @brief Retrieves the default line spacing.
+   *
+   * @return The line spacing.
+   */
+  float GetDefaultLineSpacing() const;
+
+  /**
+   * @brief Sets the default line size.
+   *
+   * @param[in] lineSize The line size.
+   *
+   * @return True if lineSize has been updated, false otherwise
+   */
+  bool SetDefaultLineSize(float lineSize);
+
+  /**
+   * @brief Retrieves the default line size.
+   *
+   * @return The line size.
+   */
+  float GetDefaultLineSize() const;
+
+  /**
+   * @brief Sets the relative line size to the original line size.
+   *
+   * @param[in] relativeLineSize The relativeline size.
+   *
+   * @return True if relativeLineSize has been updated, false otherwise
+   */
+  bool SetRelativeLineSize(float lineSize);
+
+  /**
+   * @brief Retrieves the relative line size.
+   *
+   * @return The relative line size.
+   */
+  float GetRelativeLineSize() const;
+
+  /**
+   * @brief Sets the input text's color.
+   *
+   * @param[in] color The input text's color.
+   */
+  void SetInputColor(const Vector4& color);
+
+  /**
+   * @brief Retrieves the input text's color.
+   *
+   * @return The input text's color.
+   */
+  const Vector4& GetInputColor() const;
+
+  /**
+   * @brief Sets the input text's font family name.
+   *
+   * @param[in] fontFamily The text's font family name.
+   */
+  void SetInputFontFamily(const std::string& fontFamily);
+
+  /**
+   * @brief Retrieves the input text's font family name.
+   *
+   * @return The input text's font family name.
+   */
+  std::string GetInputFontFamily() const;
+
+  /**
+   * @brief Sets the input font's weight.
+   *
+   * @param[in] weight The input font's weight.
+   */
+  void SetInputFontWeight(FontWeight weight);
+
+  /**
+   * @return Whether the font's weight has been defined.
+   */
+  bool IsInputFontWeightDefined() const;
+
+  /**
+   * @brief Retrieves the input font's weight.
+   *
+   * @return The input font's weight.
+   */
+  FontWeight GetInputFontWeight() const;
+
+  /**
+   * @brief Sets the input font's width.
+   *
+   * @param[in] width The input font's width.
+   */
+  void SetInputFontWidth(FontWidth width);
+
+  /**
+   * @return Whether the font's width has been defined.
+   */
+  bool IsInputFontWidthDefined() const;
+
+  /**
+   * @brief Retrieves the input font's width.
+   *
+   * @return The input font's width.
+   */
+  FontWidth GetInputFontWidth() const;
+
+  /**
+   * @brief Sets the input font's slant.
+   *
+   * @param[in] slant The input font's slant.
+   */
+  void SetInputFontSlant(FontSlant slant);
+
+  /**
+   * @return Whether the font's slant has been defined.
+   */
+  bool IsInputFontSlantDefined() const;
+
+  /**
+   * @brief Retrieves the input font's slant.
+   *
+   * @return The input font's slant.
+   */
+  FontSlant GetInputFontSlant() const;
+
+  /**
+   * @brief Sets the input font's point size.
+   *
+   * @param[in] size The input font's point size.
+   * @param[in] defaultFontSizeUpdated True If the default font size is updated and sets the input point size, false otherwise.
+   */
+  void SetInputFontPointSize(float size, bool defaultFontSizeUpdated = false);
+
+  /**
+   * @brief Retrieves the input font's point size.
+   *
+   * @return The input font's point size.
+   */
+  float GetInputFontPointSize() const;
+
+  /**
+   * @brief Sets the input line spacing.
+   *
+   * @param[in] lineSpacing The line spacing.
+   */
+  void SetInputLineSpacing(float lineSpacing);
+
+  /**
+   * @brief Retrieves the input line spacing.
+   *
+   * @return The line spacing.
+   */
+  float GetInputLineSpacing() const;
+
+  /**
+   * @brief Sets the input shadow's properties string.
+   *
+   * @note The string is stored to be recovered.
+   *
+   * @param[in] shadowProperties The shadow's properties string.
+   */
+  void SetInputShadowProperties(const std::string& shadowProperties);
+
+  /**
+   * @brief Retrieves the input shadow's properties string.
+   *
+   * @return The shadow's properties string.
+   */
+  std::string GetInputShadowProperties() const;
+
+  /**
+   * @brief Sets the input underline's properties string.
+   *
+   * @note The string is stored to be recovered.
+   *
+   * @param[in] underlineProperties The underline's properties string.
+   */
+  void SetInputUnderlineProperties(const std::string& underlineProperties);
+
+  /**
+   * @brief Retrieves the input underline's properties string.
+   *
+   * @return The underline's properties string.
+   */
+  std::string GetInputUnderlineProperties() const;
+
+  /**
+   * @brief Sets the input emboss's properties string.
+   *
+   * @note The string is stored to be recovered.
+   *
+   * @param[in] embossProperties The emboss's properties string.
+   */
+  void SetInputEmbossProperties(const std::string& embossProperties);
+
+  /**
+   * @brief Retrieves the input emboss's properties string.
+   *
+   * @return The emboss's properties string.
+   */
+  std::string GetInputEmbossProperties() const;
+
+  /**
+   * @brief Sets input the outline's properties string.
+   *
+   * @note The string is stored to be recovered.
+   *
+   * @param[in] outlineProperties The outline's properties string.
+   */
+  void SetInputOutlineProperties(const std::string& outlineProperties);
+
+  /**
+   * @brief Retrieves the input outline's properties string.
+   *
+   * @return The outline's properties string.
+   */
+  std::string GetInputOutlineProperties() const;
+
+  /**
+   * @brief Sets the input strikethrough's properties string.
+   *
+   * @note The string is stored to be recovered.
+   *
+   * @param[in] strikethroughProperties The strikethrough's properties string.
+   */
+  void SetInputStrikethroughProperties(const std::string& strikethroughProperties);
+
+  /**
+   * @brief Retrieves the input strikethrough's properties string.
+   *
+   * @return The strikethrough's properties string.
+   */
+  std::string GetInputStrikethroughProperties() const;
+
+  /**
+   * @brief Set the control's interface.
+   *
+   * @param[in] controlInterface The control's interface.
+   */
+  void SetControlInterface(ControlInterface* controlInterface);
+
+  /**
+   * @brief Set the anchor control's interface.
+   *
+   * @param[in] anchorControlInterface The control's interface.
+   */
+  void SetAnchorControlInterface(AnchorControlInterface* anchorControlInterface);
+
+  /**
+   * @brief Sets the character spacing.
+   *
+   * @note A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+   *
+   * @param[in] characterSpacing The character spacing.
+   */
+  void SetCharacterSpacing(float characterSpacing);
+
+  /**
+   * @brief Retrieves the character spacing.
+   *
+   * @note A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+   *
+   * @return The character spacing.
+   */
+  const float GetCharacterSpacing() const;
+
+  /**
+   * @brief Sets the visual transform offset.
+   *
+   * @param[in] offset The offset.
+   */
+  void SetVisualTransformOffset(Vector2 offset);
+
+public: // Queries & retrieves.
+  /**
+   * @brief Return the layout engine.
+   *
+   * @return A reference to the layout engine.
+   */
+  Layout::Engine& GetLayoutEngine();
+
+  /**
+   * @brief Return a view of the text.
+   *
+   * @return A reference to the view.
+   */
+  View& GetView();
+
+  /**
+   * @copydoc Control::GetNaturalSize()
+   */
+  Vector3 GetNaturalSize();
+
+  /**
+   * @copydoc Control::GetHeightForWidth()
+   */
+  float GetHeightForWidth(float width);
+
+  /**
+   * @brief Calculates the point size for text for given layout()
+   */
+  void FitPointSizeforLayout(Size layoutSize);
+
+  /**
+   * @brief Calculates the point size for text for given layout() using fit array.
+   */
+  void FitArrayPointSizeforLayout(Size layoutSize);
+
+  /**
+   * @brief Checks if the point size fits within the layout size.
+   *
+   * @return Whether the point size fits within the layout size.
+   */
+  bool CheckForTextFit(float pointSize, Size& layoutSize);
+
+  /**
+   * @brief Retrieves the text's number of lines for a given width.
+   * @param[in] width The width of the text's area.
+   * @ return The number of lines.
+   */
+  int GetLineCount(float width);
+
+  /**
+   * @brief Retrieves the text's model.
+   *
+   * @return A pointer to the text's model.
+   */
+  const ModelInterface* GetTextModel() const;
+
+  /**
+   * @brief Used to get scrolled distance by user input
+   *
+   * @return Distance from last scroll offset to new scroll offset
+   */
+  float GetScrollAmountByUserInput();
+
+  /**
+   * @brief Get latest scroll amount, control size and layout size
+   *
+   * This method is used to get information of control's scroll
+   * @param[out] scrollPosition The current scrolled position
+   * @param[out] controlHeight The size of a UI control
+   * @param[out] layoutHeight The size of a bounding box to layout text within.
+   *
+   * @return Whether the text scroll position is changed or not after last update.
+   */
+  bool GetTextScrollInfo(float& scrollPosition, float& controlHeight, float& layoutHeight);
+
+  /**
+   * @brief Used to set the hidden input option
+   */
+  void SetHiddenInputOption(const Property::Map& options);
+
+  /**
+   * @brief Used to get the hidden input option
+   */
+  void GetHiddenInputOption(Property::Map& options);
+
+  /**
+   * @brief Used to set the input filter option
+   */
+  void SetInputFilterOption(const Property::Map& options);
+
+  /**
+   * @brief Used to get the input filter option
+   */
+  void GetInputFilterOption(Property::Map& options);
+
+  /**
+   * @brief Sets the Placeholder Properties.
+   *
+   * @param[in] map The placeholder property map
+   */
+  void SetPlaceholderProperty(const Property::Map& map);
+
+  /**
+   * @brief Retrieves the Placeholder Property map.
+   *
+   * @param[out] map The property map
+   */
+  void GetPlaceholderProperty(Property::Map& map);
+
+  /**
+   * @brief Checks text direction.
+   * @return The text direction.
+   */
+  Toolkit::DevelText::TextDirection::Type GetTextDirection();
+
+  /**
+   * @brief Retrieves vertical line alignment
+   * @return The vertical line alignment
+   */
+  Toolkit::DevelText::VerticalLineAlignment::Type GetVerticalLineAlignment() const;
+
+  /**
+   * @brief Sets vertical line alignment
+   * @param[in] alignment The vertical line alignment for the text
+   */
+  void SetVerticalLineAlignment(Toolkit::DevelText::VerticalLineAlignment::Type alignment);
+
+  /**
+   * @brief Retrieves ellipsis position
+   * @return The ellipsis position
+   */
+  Toolkit::DevelText::EllipsisPosition::Type GetEllipsisPosition() const;
+
+  /**
+   * @brief Sets ellipsis position
+   * @param[in] ellipsisPosition The ellipsis position for the text
+   */
+  void SetEllipsisPosition(Toolkit::DevelText::EllipsisPosition::Type ellipsisPosition);
+
+  /**
+   * @brief Retrieves ignoreSpaceAfterText value from model
+   * @return The value of ignoreSpaceAfterText
+   */
+  bool IsIgnoreSpacesAfterText() const;
+
+  /**
+   * @brief Sets ignoreSpaceAfterText value to model
+   * @param[in] ignore The value of ignoreSpacesAfterText for the text
+   */
+  void SetIgnoreSpacesAfterText(bool ignore);
+
+  /**
+   * @brief Retrieves removeFrontInset value from model
+   * @return The value of removeFrontInset
+   */
+  bool IsRemoveFrontInset() const;
+
+  /**
+   * @brief Sets removeFrontInset value to model
+   * @param[in] remove The value of removeFrontInset for the text
+   */
+  void SetRemoveFrontInset(bool remove);
+
+  /**
+   * @brief Retrieves removeBackInset value from model
+   * @return The value of removeBackInset
+   */
+  bool IsRemoveBackInset() const;
+
+  /**
+   * @brief Sets removeBackInset value to model
+   * @param[in] remove The value of removeBackInset for the text
+   */
+  void SetRemoveBackInset(bool remove);
+
+  /**
+   * @brief Sets SetMatchLayoutDirection value to model
+   * @param[in] match The value of matchLayoutDirection for the text
+   */
+  void SetMatchLayoutDirection(DevelText::MatchLayoutDirection type);
+
+  /**
+   * @brief Retrieves matchLayoutDirection value from model
+   * @return The value of matchLayoutDirection
+   */
+  DevelText::MatchLayoutDirection GetMatchLayoutDirection() const;
+
+  /**
+   * @brief Sets layoutDirection type value.
+   * @param[in] layoutDirection The value of the layout direction type.
+   */
+  void SetLayoutDirection(Dali::LayoutDirection::Type layoutDirection);
+
+  /**
+   * @brief Gets layoutDirection type value.
+   * @param[in] actor The actor which will get the layout direction type.
+   * @return The value of the layout direction type.
+   */
+  Dali::LayoutDirection::Type GetLayoutDirection(Dali::Actor& actor) const;
+
+  /**
+   * @brief Get the rendered size of a specific text range.
+   * if the requested text is at multilines, multiple sizes will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to calculate size for.
+   * @param[in] endIndex end index(included) of the text requested to calculate size for.
+   * @return list of sizes of the reuested text.
+   */
+  Vector<Vector2> GetTextSize(CharacterIndex startIndex, CharacterIndex endIndex);
+
+  /**
+   * @brief Get the top/left rendered position of a specific text range.
+   * if the requested text is at multilines, multiple positions will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple positions will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] startIndex start index of the text requested to get position to.
+   * @param[in] endIndex end index(included) of the text requested to get position to.
+   * @return list of positions of the requested text.
+   */
+  Vector<Vector2> GetTextPosition(CharacterIndex startIndex, CharacterIndex endIndex);
+
+  /**
+   * @brief Get the line bounding rectangle.
+   * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] lineIndex line index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+  Rect<float> GetLineBoundingRectangle(const uint32_t lineIndex);
+
+  /**
+   * @brief Get the char bounding rectangle.
+   * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+   *
+   * @param[in] charIndex character index to which we want to calculate the geometry for.
+   * @return bounding rectangle.
+   */
+  Rect<float> GetCharacterBoundingRectangle(const uint32_t charIndex);
+
+  /**
+   * @brief Get the character index.
+   * If the text is not yet rendered or the text is empty, -1 is returned.
+   *
+   * @param[in] visualX visual x position.
+   * @param[in] visualY visual y position.
+   * @return character index.
+   */
+  int GetCharacterIndexAtPosition(float visualX, float visualY);
+
+  /**
+   * @brief Gets the bounding box of a specific text range.
+   *
+   * @param[in] startIndex start index of the text requested to get bounding box to.
+   * @param[in] endIndex end index(included) of the text requested to get bounding box to.
+   * @return bounding box of the requested text.
+   */
+  Rect<> GetTextBoundingRectangle(CharacterIndex startIndex, CharacterIndex endIndex);
+
+  /**
+   * @brief Sets the layout direction changed.
+   */
+  void ChangedLayoutDirection();
+
+  /**
+   * @brief Clear font and style data.
+   */
+  void ResetFontAndStyleData();
+
+  /**
+   * @brief Retrieves if showing real text or not.
+   * @return The value of showing real text.
+   */
+  bool IsShowingRealText() const;
+
+public: // Relayout.
+  /**
+   * @brief Triggers a relayout which updates View (if necessary).
+   *
+   * @note UI Controls are expected to minimize calls to this method e.g. call once after size negotiation.
+   * @param[in] size A the size of a bounding box to layout text within.
+   * @param[in] layoutDirection The direction of the system language.
+   *
+   * @return Whether the text model or decorations were updated.
+   */
+  UpdateTextType Relayout(const Size& size, Dali::LayoutDirection::Type layoutDirection = Dali::LayoutDirection::LEFT_TO_RIGHT);
+
+  /**
+   * @brief Request a relayout using the ControlInterface.
+   */
+  void RequestRelayout();
+
+public: // Input style change signals.
+  /**
+   * @return Whether the queue of input style changed signals is empty.
+   */
+  bool IsInputStyleChangedSignalsQueueEmpty();
+
+  /**
+   * @brief Request process all pending input style changed signals.
+   *
+   * Request to calls the Text::ControlInterface::InputStyleChanged() method which is overriden by the
+   * text controls. Text controls may send signals to state the input style has changed.
+   *
+   * The signal will be execute next idle time, or skip if we fail to add idler.
+   */
+  void RequestProcessInputStyleChangedSignals();
+
+private:
+  /**
+   * @brief Callbacks called on idle.
+   *
+   * If there are notifications of change of input style on the queue, Toolkit::TextField::InputStyleChangedSignal() are emitted.
+   */
+  void OnIdleSignal();
+
+public: // Text-input Event Queuing.
+  /**
+   * @brief Called by editable UI controls when keyboard focus is gained.
+   */
+  void KeyboardFocusGainEvent();
+
+  /**
+   * @brief Called by editable UI controls when focus is lost.
+   */
+  void KeyboardFocusLostEvent();
+
+  /**
+   * @brief Called by editable UI controls when key events are received.
+   *
+   * @param[in] event The key event.
+   * @param[in] type Used to distinguish between regular key events and InputMethodContext events.
+   */
+  bool KeyEvent(const Dali::KeyEvent& event);
+
+  /**
+   * @brief Called by anchor when a tap gesture occurs.
+   * @param[in] x The x position relative to the top-left of the parent control.
+   * @param[in] y The y position relative to the top-left of the parent control.
+   */
+  void AnchorEvent(float x, float y);
+
+  /**
+   * @brief Called by editable UI controls when a tap gesture occurs.
+   * @param[in] tapCount The number of taps.
+   * @param[in] x The x position relative to the top-left of the parent control.
+   * @param[in] y The y position relative to the top-left of the parent control.
+   */
+  void TapEvent(unsigned int tapCount, float x, float y);
+
+  /**
+   * @brief Called by editable UI controls when a pan gesture occurs.
+   *
+   * @param[in] state The state of the gesture.
+   * @param[in] displacement This distance panned since the last pan gesture.
+   */
+  void PanEvent(GestureState state, const Vector2& displacement);
+
+  /**
+   * @brief Called by editable UI controls when a long press gesture occurs.
+   *
+   * @param[in] state The state of the gesture.
+   * @param[in] x The x position relative to the top-left of the parent control.
+   * @param[in] y The y position relative to the top-left of the parent control.
+   */
+  void LongPressEvent(GestureState state, float x, float y);
+
+  /**
+   * @brief Used to get the Primary cursor position.
+   *
+   * @return Primary cursor position.
+   */
+  CharacterIndex GetPrimaryCursorPosition() const;
+
+  /**
+   * @brief Used to set the Primary cursor position.
+   *
+   * @param[in] index for the Primary cursor position.
+   * @param[in] focused true if UI control has gained focus to receive key event, false otherwise.
+   * @return[in] true if cursor position changed, false otherwise.
+   */
+  bool SetPrimaryCursorPosition(CharacterIndex index, bool focused);
+
+  /**
+   * @brief Creates a selection event.
+   *
+   * It could be called from the TapEvent (double tap) or when the text selection popup's sellect all button is pressed.
+   *
+   * @param[in] x The x position relative to the top-left of the parent control.
+   * @param[in] y The y position relative to the top-left of the parent control.
+   * @param[in] selection type like the whole text is selected or unselected.
+   */
+  void SelectEvent(float x, float y, SelectionType selection);
+
+  /**
+   * @copydoc Text::SelectableControlInterface::SetTextSelectionRange()
+   */
+  void SetTextSelectionRange(const uint32_t* start, const uint32_t* end);
+
+  /**
+   * @copydoc Text::SelectableControlInterface::GetTextSelectionRange()
+   */
+  Uint32Pair GetTextSelectionRange() const;
+
+  /**
+   * @copydoc Text::SelectableControlInterface::SelectWholeText()
+   */
+  void SelectWholeText();
+
+  /**
+   * @copydoc Text::EditableControlInterface::CopyText()
+   */
+  string CopyText();
+
+  /**
+   * @copydoc Text::EditableControlInterface::CutText()
+   */
+  string CutText();
+
+  /**
+   * @copydoc Text::EditableControlInterface::PasteText()
+   */
+  void PasteText();
+
+  /**
+   * @copydoc Text::SelectableControlInterface::SelectNone()
+   */
+  void SelectNone();
+
+  /**
+   * @copydoc Text::SelectableControlInterface::SelectText()
+   */
+  void SelectText(const uint32_t start, const uint32_t end);
+
+  /**
+   * @copydoc Text::SelectableControlInterface::GetSelectedText()
+   */
+  string GetSelectedText() const;
+
+  /**
+   * @copydoc Text::EditableControlInterface::IsEditable()
+   */
+  virtual bool IsEditable() const;
+
+  /**
+   * @copydoc Text::EditableControlInterface::SetEditable()
+   */
+  virtual void SetEditable(bool editable);
+
+  /**
+   * @copydoc Dali::Toolkit::Internal::TextEditor::ScrollBy()
+   */
+  virtual void ScrollBy(Vector2 scroll);
+
+  /**
+   * @brief Whether the text is scrollable.
+   * @return Returns true if the text is scrollable.
+   */
+  bool IsScrollable(const Vector2& displacement);
+
+  /**
+   * @copydoc Dali::Toolkit::Internal::TextEditor::GetHorizontalScrollPosition()
+   */
+  float GetHorizontalScrollPosition();
+
+  /**
+   * @copydoc Dali::Toolkit::Internal::TextEditor::GetVerticalScrollPosition()
+   */
+  float GetVerticalScrollPosition();
+
+  /**
+   * @brief Event received from input method context
+   *
+   * @param[in] inputMethodContext The input method context.
+   * @param[in] inputMethodContextEvent The event received.
+   * @return A data struture indicating if update is needed, cursor position and current text.
+   */
+  InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent);
+
+  /**
+   * @brief Event from Clipboard notifying an Item has been selected for pasting
+   *
+   * @param[in] id The id of the data request.
+   * @param[in] mimeType The mime type of data received.
+   * @param[in] data The data received.
+   * @note
+   * This event is executed by receiving the Clipboard's DataReceivedSignal.
+   */
+  void PasteClipboardItemEvent(uint32_t id, const char* mimeType, const char* data);
+
+  /**
+   * @brief Return true when text control should clear key input focus when escape key is pressed.
+   *
+   * @return Whether text control should clear key input focus or not when escape key is pressed.
+   */
+  bool ShouldClearFocusOnEscape() const;
+
+  /**
+   * @brief Create an actor that renders the text background color
+   *
+   * @return the created actor or an empty handle if no background color needs to be rendered.
+   */
+  Actor CreateBackgroundActor();
+
+  /**
+   * @brief Used to reset the cursor position after setting a new text.
+   *
+   * @param[in] cursorIndex Where to place the cursor.
+   */
+  void ResetCursorPosition(CharacterIndex cursorIndex);
+
+  /**
+   * @brief The method acquires current position of cursor
+   * @return unsigned value with cursor position
+   */
+  CharacterIndex GetCursorPosition();
+
+  /**
+   * @brief Resets a provided vector with actors that marks the position of anchors in markup enabled text
+   *
+   * @param[out] anchorActors the vector of actor (empty collection if no anchors available).
+   */
+  void GetAnchorActors(std::vector<Toolkit::TextAnchor>& anchorActors);
+
+  /**
+   * @brief Return an index of first anchor in the anchor vector whose boundaries includes given character offset
+   *
+   * @param[in] characterOffset A position in text coords.
+   *
+   * @return the index in anchor vector (-1 if an anchor not found)
+   */
+  int GetAnchorIndex(size_t characterOffset);
+
+protected: // Inherit from Text::Decorator::ControllerInterface.
+  /**
+   * @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::GetTargetSize()
+   */
+  void GetTargetSize(Vector2& targetSize) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::AddDecoration()
+   */
+  void AddDecoration(Actor& actor, DecorationType type, bool needsClipping) override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::DecorationEvent()
+   */
+  void DecorationEvent(HandleType handle, HandleState state, float x, float y) override;
+
+protected: // Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface.
+  /**
+   * @copydoc Dali::Toolkit::TextSelectionPopup::TextPopupButtonCallbackInterface::TextPopupButtonTouched()
+   */
+  void TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::Buttons button) override;
+
+protected: // Inherit from HiddenText.
+  /**
+   * @brief Invoked from HiddenText when showing time of the last character was expired
+   */
+  void DisplayTimeExpired() override;
+
+protected: // Inherit from Integration::Processor
+  /**
+   * @copydoc Dali::Integration::Processor::Process()
+   */
+  void Process(bool postProcess) override;
+
+  /**
+   * @copydoc Dali::Integration::Processor::GetProcessorName()
+   */
+  std::string_view GetProcessorName() const override
+  {
+    return "Text::Controller";
+  }
+
+private: // Private contructors & copy operator.
+  /**
+   * @brief Private constructor.
+   */
+  Controller()
+  : Controller(nullptr, nullptr, nullptr, nullptr)
+  {
+  }
+
+  /**
+   * @brief Private constructor.
+   */
+  Controller(ControlInterface* controlInterface)
+  : Controller(controlInterface, nullptr, nullptr, nullptr)
+  {
+  }
+
+  /**
+   * @brief Private constructor.
+   */
+  Controller(ControlInterface*           controlInterface,
+             EditableControlInterface*   editableControlInterface,
+             SelectableControlInterface* selectableControlInterface,
+             AnchorControlInterface*     anchorControlInterface);
+
+  Controller(const Controller& handle) = delete;
+  Controller& operator=(const Controller& handle) = delete;
+
+protected: // Destructor.
+  /**
+   * @brief A reference counted object may only be deleted by calling Unreference().
+   */
+  virtual ~Controller();
+
+public:
+  struct Impl; ///< Made public for testing purposes
+
+private:
+  struct EventHandler;
+  struct InputFontHandler;
+  struct InputProperties;
+  struct PlaceholderHandler;
+  struct Relayouter;
+  struct TextUpdater;
+  struct SpannableHandler;
+
+  std::unique_ptr<Impl> mImpl{nullptr};
+};
+
+} // namespace Dali::Toolkit::Text
+
+#endif // DALI_TOOLKIT_TEXT_CONTROLLER_H
diff --git a/dali-toolkit/internal/text/cursor-helper-functions.cpp b/dali-toolkit/internal/text/cursor-helper-functions.cpp
index c2d35d9..5dfebde 100644
--- a/dali-toolkit/internal/text/cursor-helper-functions.cpp
+++ b/dali-toolkit/internal/text/cursor-helper-functions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,10 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/characters-helper-functions.h>
+#include <dali-toolkit/internal/text/emoji-helper.h>
 #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
 
 namespace
 {
@@ -153,9 +156,10 @@ LineIndex GetClosestLine(VisualModelPtr visualModel,
       it != endIt;
       ++it, ++lineIndex)
   {
-    const LineRun& lineRun = *it;
+    const LineRun& lineRun    = *it;
+    bool           isLastLine = (it + 1 == endIt);
 
-    totalHeight += GetLineHeight(lineRun);
+    totalHeight += GetLineHeight(lineRun, isLastLine);
 
     if(visualY < totalHeight)
     {
@@ -182,9 +186,10 @@ float CalculateLineOffset(const Vector<LineRun>& lines,
       it != endIt;
       ++it)
   {
-    const LineRun& lineRun = *it;
+    const LineRun& lineRun    = *it;
+    bool           isLastLine = (it + 1 == lines.End());
 
-    offset += GetLineHeight(lineRun);
+    offset += GetLineHeight(lineRun, isLastLine);
   }
 
   return offset;
@@ -213,6 +218,10 @@ CharacterIndex GetClosestCursorIndex(VisualModelPtr         visualModel,
     return logicalIndex;
   }
 
+  // Get the character-spacing runs.
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = visualModel->GetCharacterSpacingGlyphRuns();
+  const float                             modelCharacterSpacing     = visualModel->GetCharacterSpacing();
+
   // Whether there is a hit on a line.
   bool matchedLine = false;
 
@@ -262,8 +271,11 @@ CharacterIndex GetClosestCursorIndex(VisualModelPtr         visualModel,
   bool isBeforeFirstGlyph = false;
 
   // Traverses glyphs in visual order. To do that use the visual to logical conversion table.
-  CharacterIndex visualIndex              = startCharacter;
-  Length         numberOfVisualCharacters = 0;
+  CharacterIndex          visualIndex               = startCharacter;
+  Length                  numberOfVisualCharacters  = 0;
+  float                   calculatedAdvance         = 0.f;
+  Vector<CharacterIndex>& glyphToCharacterMap       = visualModel->mGlyphsToCharacters;
+  const CharacterIndex*   glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
   for(; visualIndex < endCharacter; ++visualIndex)
   {
     // The character in logical order.
@@ -283,11 +295,14 @@ CharacterIndex GetClosestCursorIndex(VisualModelPtr         visualModel,
 
       // Get the metrics for the group of glyphs.
       GlyphMetrics glyphMetrics;
+      const float  characterSpacing = GetGlyphCharacterSpacing(firstLogicalGlyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+      calculatedAdvance             = GetCalculatedAdvance(*(logicalModel->mText.Begin() + (*(glyphToCharacterMapBuffer + firstLogicalGlyphIndex))), characterSpacing, (*(visualModel->mGlyphs.Begin() + firstLogicalGlyphIndex)).advance);
       GetGlyphsMetrics(firstLogicalGlyphIndex,
                        numberOfGlyphs,
                        glyphMetrics,
                        glyphInfoBuffer,
-                       metrics);
+                       metrics,
+                       calculatedAdvance);
 
       // Get the position of the first glyph.
       const Vector2& position = *(positionsBuffer + firstLogicalGlyphIndex);
@@ -450,6 +465,19 @@ CharacterIndex GetClosestCursorIndex(VisualModelPtr         visualModel,
 
   logicalIndex = (bidiLineFetched ? logicalModel->GetLogicalCursorIndex(visualIndex) : visualIndex);
 
+  // Handle Emoji clustering for cursor handling:
+  // Fixing this case:
+  // - When there is Emoji contains multi unicodes and it is layoutted at the end of line (LineWrap case , is not new line case)
+  // - Try to click at the center or at the end of Emoji then the cursor appears inside Emoji
+  // - Example:"FamilyManWomanGirlBoy &#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;"
+  const Script script = logicalModel->GetScript(logicalIndex);
+  if(IsOneOfEmojiScripts(script))
+  {
+    //TODO: Use this clustering for Emoji cases only. This needs more testing to generalize to all scripts.
+    CharacterRun emojiClusteredCharacters = RetrieveClusteredCharactersOfCharacterIndex(visualModel, logicalModel, logicalIndex);
+    logicalIndex                          = emojiClusteredCharacters.characterIndex;
+  }
+
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "closest visualIndex %d logicalIndex %d\n", visualIndex, logicalIndex);
 
   DALI_ASSERT_DEBUG((logicalIndex <= logicalModel->mText.Count() && logicalIndex >= 0) && "GetClosestCursorIndex - Out of bounds index");
@@ -458,6 +486,7 @@ CharacterIndex GetClosestCursorIndex(VisualModelPtr         visualModel,
 }
 
 void GetCursorPosition(GetCursorPositionParameters& parameters,
+                       float                        defaultFontLineHeight,
                        CursorInfo&                  cursorInfo)
 {
   const LineRun* const modelLines = parameters.visualModel->mLines.Begin();
@@ -479,6 +508,12 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
   const LineIndex lineIndex = parameters.visualModel->GetLineOfCharacter(characterOfLine);
   const LineRun&  line      = *(modelLines + lineIndex);
 
+  CharacterIndex index;
+  GlyphMetrics   glyphMetrics;
+  MetricsPtr&    metrics        = parameters.metrics;
+  GlyphIndex     glyphIndex     = 0u;
+  Length         numberOfGlyphs = 0u;
+
   if(isLastNewParagraph)
   {
     // The cursor is in a new line with no characters. Place the cursor in that line.
@@ -491,10 +526,22 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
     cursorInfo.lineOffset = CalculateLineOffset(parameters.visualModel->mLines,
                                                 newLineIndex);
 
-    cursorInfo.lineHeight = GetLineHeight(newLine);
+    // The line height is the addition of the line ascender and the line descender.
+    // However, the line descender has a negative value, hence the subtraction also line spacing should not be included in cursor height.
+    cursorInfo.lineHeight = newLine.ascender - newLine.descender;
+
+    index                                = 0u;
+    const Length totalNumberOfCharacters = parameters.logicalModel->mText.Count();
+    if(totalNumberOfCharacters > 0u)
+    {
+      index = totalNumberOfCharacters - 1u;
+    }
+
+    GetGlyphMetricsFromCharacterIndex(index, parameters.visualModel, parameters.logicalModel, metrics, glyphMetrics, glyphIndex, numberOfGlyphs);
 
     // Set the primary cursor's height.
-    cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
+    // The primary cursor height will take the font height of the last character and if there are no characters, it'll take the default font line height.
+    cursorInfo.primaryCursorHeight = (totalNumberOfCharacters > 0) ? (cursorInfo.isSecondaryCursor ? 0.5f * glyphMetrics.fontHeight : glyphMetrics.fontHeight) : defaultFontLineHeight;
 
     // Set the primary cursor's position.
     cursorInfo.primaryPosition.x = (LTR == line.direction) ? newLine.alignmentOffset : parameters.visualModel->mControlSize.width - newLine.alignmentOffset;
@@ -537,11 +584,13 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
     cursorInfo.lineOffset = CalculateLineOffset(parameters.visualModel->mLines,
                                                 lineIndex);
 
-    cursorInfo.lineHeight = GetLineHeight(line);
+    // The line height is the addition of the line ascender and the line descender.
+    // However, the line descender has a negative value, hence the subtraction also line spacing should not be included in cursor height.
+    cursorInfo.lineHeight = line.ascender - line.descender;
 
     // Calculate the primary cursor.
 
-    CharacterIndex index = characterIndex;
+    index = characterIndex;
     if(cursorInfo.isSecondaryCursor)
     {
       // If there is a secondary position, the primary cursor may be in a different place than the logical index.
@@ -574,25 +623,19 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
       }
     }
 
-    const GlyphIndex* const     charactersToGlyphBuffer  = parameters.visualModel->mCharactersToGlyph.Begin();
-    const Length* const         glyphsPerCharacterBuffer = parameters.visualModel->mGlyphsPerCharacter.Begin();
     const Length* const         charactersPerGlyphBuffer = parameters.visualModel->mCharactersPerGlyph.Begin();
     const CharacterIndex* const glyphsToCharactersBuffer = parameters.visualModel->mGlyphsToCharacters.Begin();
     const Vector2* const        glyphPositionsBuffer     = parameters.visualModel->mGlyphPositions.Begin();
-    const GlyphInfo* const      glyphInfoBuffer          = parameters.visualModel->mGlyphs.Begin();
+    const float                 modelCharacterSpacing    = parameters.visualModel->GetCharacterSpacing();
 
-    // Convert the cursor position into the glyph position.
-    const GlyphIndex primaryGlyphIndex         = *(charactersToGlyphBuffer + index);
-    const Length     primaryNumberOfGlyphs     = *(glyphsPerCharacterBuffer + index);
-    const Length     primaryNumberOfCharacters = *(charactersPerGlyphBuffer + primaryGlyphIndex);
+    const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = parameters.visualModel->GetCharacterSpacingGlyphRuns();
 
     // Get the metrics for the group of glyphs.
-    GlyphMetrics glyphMetrics;
-    GetGlyphsMetrics(primaryGlyphIndex,
-                     primaryNumberOfGlyphs,
-                     glyphMetrics,
-                     glyphInfoBuffer,
-                     parameters.metrics);
+    GetGlyphMetricsFromCharacterIndex(index, parameters.visualModel, parameters.logicalModel, metrics, glyphMetrics, glyphIndex, numberOfGlyphs);
+
+    // Convert the cursor position into the glyph position.
+    const GlyphIndex primaryGlyphIndex         = glyphIndex;
+    const Length     primaryNumberOfCharacters = *(charactersPerGlyphBuffer + primaryGlyphIndex);
 
     // Whether to add the glyph's advance to the cursor position.
     // i.e if the paragraph is left to right and the logical cursor is zero, the position is the position of the first glyph and the advance is not added,
@@ -628,7 +671,7 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
                                   (isFirstPositionOfLine && isRightToLeftParagraph) ||
                                   (!isFirstPositionOfLine && !isLastPosition && !isCurrentRightToLeft));
 
-    float glyphAdvance = addGlyphAdvance ? glyphMetrics.advance : 0.f;
+    float glyphAdvance = addGlyphAdvance ? (glyphMetrics.advance) : 0.f;
 
     if(!isLastPositionOfLine &&
        (primaryNumberOfCharacters > 1u))
@@ -647,7 +690,7 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
         numberOfGlyphAdvance = primaryNumberOfCharacters - numberOfGlyphAdvance;
       }
 
-      glyphAdvance = static_cast<float>(numberOfGlyphAdvance) * glyphMetrics.advance / static_cast<float>(primaryNumberOfCharacters);
+      glyphAdvance = static_cast<float>(numberOfGlyphAdvance) * (glyphMetrics.advance) / static_cast<float>(primaryNumberOfCharacters);
     }
 
     // Get the glyph position and x bearing (in the line's coords).
@@ -676,16 +719,10 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
         index = (isRightToLeftParagraph == isCurrentRightToLeft) ? nextCharacterIndex : characterIndex;
       }
 
-      const GlyphIndex secondaryGlyphIndex     = *(charactersToGlyphBuffer + index);
-      const Length     secondaryNumberOfGlyphs = *(glyphsPerCharacterBuffer + index);
-
-      const Vector2& secondaryPosition = *(glyphPositionsBuffer + secondaryGlyphIndex);
+      GetGlyphMetricsFromCharacterIndex(index, parameters.visualModel, parameters.logicalModel, metrics, glyphMetrics, glyphIndex, numberOfGlyphs);
 
-      GetGlyphsMetrics(secondaryGlyphIndex,
-                       secondaryNumberOfGlyphs,
-                       glyphMetrics,
-                       glyphInfoBuffer,
-                       parameters.metrics);
+      const GlyphIndex secondaryGlyphIndex = glyphIndex;
+      const Vector2&   secondaryPosition   = *(glyphPositionsBuffer + secondaryGlyphIndex);
 
       // Set the secondary cursor's position.
 
@@ -708,7 +745,8 @@ void GetCursorPosition(GetCursorPositionParameters& parameters,
       const bool addGlyphAdvance = ((!isFirstPositionOfLine && !isCurrentRightToLeft) ||
                                     (isFirstPositionOfLine && !isRightToLeftParagraph));
 
-      cursorInfo.secondaryPosition.x = -glyphMetrics.xBearing + secondaryPosition.x + (addGlyphAdvance ? glyphMetrics.advance : 0.f);
+      const float characterSpacing   = GetGlyphCharacterSpacing(secondaryGlyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+      cursorInfo.secondaryPosition.x = -glyphMetrics.xBearing + secondaryPosition.x + (addGlyphAdvance ? (glyphMetrics.advance + characterSpacing) : 0.f);
       cursorInfo.secondaryPosition.y = cursorInfo.lineOffset + cursorInfo.lineHeight - cursorInfo.secondaryCursorHeight;
 
       // Transform the cursor info from line's coords to text's coords.
diff --git a/dali-toolkit/internal/text/cursor-helper-functions.h b/dali-toolkit/internal/text/cursor-helper-functions.h
index dc005a3..4414743 100644
--- a/dali-toolkit/internal/text/cursor-helper-functions.h
+++ b/dali-toolkit/internal/text/cursor-helper-functions.h
@@ -22,6 +22,7 @@
 #include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/metrics.h>
 #include <dali-toolkit/internal/text/visual-model-impl.h>
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 
 namespace Dali
 {
@@ -142,9 +143,11 @@ CharacterIndex GetClosestCursorIndex(VisualModelPtr         visualModel,
  * if there is a valid alternative cursor, its position and height.
  *
  * @param[in] parameters Parameters used to calculate the cursor's position.
+ * @param[in] defaultFontLineHeight The default font line height.
  * @param[out] cursorInfo The line's height, the cursor's height, the cursor's position and whether there is an alternative cursor.
  */
 void GetCursorPosition(GetCursorPositionParameters& parameters,
+                       float                        defaultFontLineHeight,
                        CursorInfo&                  cursorInfo);
 
 /**
diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp
index c586deb..b3e562e 100644
--- a/dali-toolkit/internal/text/decorator/text-decorator.cpp
+++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,9 +29,11 @@
 #include <dali/public-api/object/property-notification.h>
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/renderer.h>
+#include <dali/public-api/size-negotiation/relayout-container.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
@@ -242,7 +244,7 @@ struct Decorator::Impl : public ConnectionTracker
     mHidePrimaryCursorAndGrabHandle(false)
   {
     mQuadVertexFormat["aPosition"] = Property::VECTOR2;
-    mHighlightShader               = Shader::New(SHADER_TEXT_DECORATOR_SHADER_VERT, SHADER_TEXT_DECORATOR_SHADER_FRAG);
+    mHighlightShader               = Shader::New(SHADER_TEXT_DECORATOR_SHADER_VERT, SHADER_TEXT_DECORATOR_SHADER_FRAG, Shader::Hint::NONE, "TEXT_DECORATOR");
     SetupGestures();
   }
 
@@ -250,12 +252,13 @@ struct Decorator::Impl : public ConnectionTracker
    * Relayout of the decorations owned by the decorator.
    * @param[in] size The Size of the UI control the decorator is adding it's decorations to.
    */
-  void Relayout(const Vector2& size)
+  void Relayout(const Vector2& size, RelayoutContainer& container)
   {
     mControlSize = size;
 
     // TODO - Remove this if nothing is active
-    CreateActiveLayer();
+    CreateLayer(mActiveLayer, DecorationType::ACTIVE_LAYER);
+    CreateLayer(mCursorLayer, DecorationType::CURSOR_LAYER);
 
     // Show or hide the cursors
     CreateCursors();
@@ -265,12 +268,14 @@ struct Decorator::Impl : public ConnectionTracker
       const CursorImpl& cursor = mCursor[PRIMARY_CURSOR];
       mPrimaryCursorVisible    = (!mHidePrimaryCursorAndGrabHandle) && ((mControlSize.width - (cursor.position.x + mCursorWidth) > -Math::MACHINE_EPSILON_1000) &&
                                                                      (cursor.position.x > -Math::MACHINE_EPSILON_1000) &&
-                                                                     (mControlSize.height - (cursor.position.y + cursor.cursorHeight) > -Math::MACHINE_EPSILON_1000) &&
-                                                                     (cursor.position.y > -Math::MACHINE_EPSILON_1000));
+                                                                     (mControlSize.height - cursor.position.y > -Math::MACHINE_EPSILON_1000) &&
+                                                                     (cursor.position.y + cursor.cursorHeight > -Math::MACHINE_EPSILON_1000));
       if(mPrimaryCursorVisible)
       {
         mPrimaryCursor.SetProperty(Actor::Property::POSITION, Vector2(cursor.position.x, cursor.position.y));
         mPrimaryCursor.SetProperty(Actor::Property::SIZE, Size(mCursorWidth, cursor.cursorHeight));
+
+        container.Add(mPrimaryCursor, Size(mCursorWidth, cursor.cursorHeight));
       }
       mPrimaryCursor.SetProperty(Actor::Property::VISIBLE, mPrimaryCursorVisible && mCursorBlinkStatus);
     }
@@ -279,12 +284,14 @@ struct Decorator::Impl : public ConnectionTracker
       const CursorImpl& cursor = mCursor[SECONDARY_CURSOR];
       mSecondaryCursorVisible  = ((mControlSize.width - (cursor.position.x + mCursorWidth) > -Math::MACHINE_EPSILON_1000) &&
                                  (cursor.position.x > -Math::MACHINE_EPSILON_1000) &&
-                                 (mControlSize.height - (cursor.position.y + cursor.cursorHeight) > -Math::MACHINE_EPSILON_1000) &&
-                                 (cursor.position.y > -Math::MACHINE_EPSILON_1000));
+                                 (mControlSize.height - cursor.position.y > -Math::MACHINE_EPSILON_1000) &&
+                                 (cursor.position.y + cursor.cursorHeight > -Math::MACHINE_EPSILON_1000));
       if(mSecondaryCursorVisible)
       {
         mSecondaryCursor.SetProperty(Actor::Property::POSITION, Vector2(cursor.position.x, cursor.position.y));
         mSecondaryCursor.SetProperty(Actor::Property::SIZE, Size(mCursorWidth, cursor.cursorHeight));
+
+        container.Add(mSecondaryCursor, Size(mCursorWidth, cursor.cursorHeight));
       }
       mSecondaryCursor.SetProperty(Actor::Property::VISIBLE, mSecondaryCursorVisible && mCursorBlinkStatus);
     }
@@ -298,8 +305,8 @@ struct Decorator::Impl : public ConnectionTracker
     {
       grabHandle.horizontallyVisible = ((mControlSize.width - (grabHandle.position.x + floor(0.5f * mCursorWidth)) > -Math::MACHINE_EPSILON_1000) &&
                                         (grabHandle.position.x > -Math::MACHINE_EPSILON_1000));
-      grabHandle.verticallyVisible   = (((mControlSize.height - grabHandle.lineHeight) - grabHandle.position.y > -Math::MACHINE_EPSILON_1000) &&
-                                      (grabHandle.position.y > -Math::MACHINE_EPSILON_1000));
+      grabHandle.verticallyVisible   = ((fabsf(mControlSize.height - grabHandle.lineHeight) - grabHandle.position.y > -Math::MACHINE_EPSILON_1000) &&
+                                      (grabHandle.position.y + grabHandle.lineHeight > -Math::MACHINE_EPSILON_1000));
 
       const bool isVisible = grabHandle.horizontallyVisible && grabHandle.verticallyVisible && (!mHidePrimaryCursorAndGrabHandle);
       if(isVisible)
@@ -333,11 +340,11 @@ struct Decorator::Impl : public ConnectionTracker
 
     primary.horizontallyVisible   = ((mControlSize.width - primary.position.x > -Math::MACHINE_EPSILON_1000) &&
                                    (primary.position.x > -Math::MACHINE_EPSILON_1000));
-    primary.verticallyVisible     = (((mControlSize.height - primary.lineHeight) - primary.position.y > -Math::MACHINE_EPSILON_1000) &&
+    primary.verticallyVisible     = ((fabsf(mControlSize.height - primary.lineHeight) - primary.position.y > -Math::MACHINE_EPSILON_1000) &&
                                  (primary.position.y + (primary.verticallyFlipped ? 0.f : primary.lineHeight) > -Math::MACHINE_EPSILON_1000));
     secondary.horizontallyVisible = ((mControlSize.width - secondary.position.x > -Math::MACHINE_EPSILON_1000) &&
                                      (secondary.position.x > -Math::MACHINE_EPSILON_1000));
-    secondary.verticallyVisible   = (((mControlSize.height - secondary.lineHeight) - secondary.position.y > -Math::MACHINE_EPSILON_1000) &&
+    secondary.verticallyVisible   = ((fabsf(mControlSize.height - secondary.lineHeight) - secondary.position.y > -Math::MACHINE_EPSILON_1000) &&
                                    (secondary.position.y + (secondary.verticallyFlipped ? 0.f : secondary.lineHeight) > -Math::MACHINE_EPSILON_1000));
 
     const bool primaryVisible   = primary.horizontallyVisible && primary.verticallyVisible;
@@ -631,6 +638,7 @@ struct Decorator::Impl : public ConnectionTracker
     cursor.SetBackgroundColor(color);
     cursor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
     cursor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+    cursor.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN, true);
   }
 
   // Add or Remove cursor(s) from parent
@@ -663,7 +671,7 @@ struct Decorator::Impl : public ConnectionTracker
 
         if(!mPrimaryCursor.GetParent())
         {
-          mActiveLayer.Add(mPrimaryCursor);
+          mCursorLayer.Add(mPrimaryCursor);
         }
       }
 
@@ -679,7 +687,7 @@ struct Decorator::Impl : public ConnectionTracker
 
         if(!mSecondaryCursor.GetParent())
         {
-          mActiveLayer.Add(mSecondaryCursor);
+          mCursorLayer.Add(mSecondaryCursor);
         }
       }
       else
@@ -733,23 +741,34 @@ struct Decorator::Impl : public ConnectionTracker
     mPanDetector.DetectedSignal().Connect(this, &Decorator::Impl::OnPan);
   }
 
-  void CreateActiveLayer()
+  void CreateLayer(Actor& layer, DecorationType type)
   {
-    if(!mActiveLayer)
+    if(!layer)
     {
-      mActiveLayer = Actor::New();
+      layer = Actor::New();
 #ifdef DECORATOR_DEBUG
-      mActiveLayer.SetProperty(Actor::Property::NAME, "ActiveLayerActor");
+      if(type == DecorationType::ACTIVE_LAYER)
+      {
+        layer.SetProperty(Actor::Property::NAME, "ActiveLayerActor");
+      }
+      else if(type == DecorationType::CURSOR_LAYER)
+      {
+        layer.SetProperty(Actor::Property::NAME, "CursorLayerActor");
+      }
 #endif
+      bool needsClipping = false;
+      if(type == DecorationType::CURSOR_LAYER)
+      {
+        needsClipping = true;
+      }
 
-      mActiveLayer.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-      mActiveLayer.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+      layer.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+      layer.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
-      // Add the active layer telling the controller it doesn't need clipping.
-      mController.AddDecoration(mActiveLayer, false);
+      mController.AddDecoration(layer, type, needsClipping);
     }
 
-    mActiveLayer.RaiseToTop();
+    layer.RaiseToTop();
   }
 
   void SetSelectionHandleMarkerSize(HandleImpl& handle)
@@ -770,6 +789,7 @@ struct Decorator::Impl : public ConnectionTracker
         grabHandle.actor = ImageView::New(mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED]);
         GetImpl(grabHandle.actor).SetDepthIndex(DepthIndex::DECORATION);
         grabHandle.actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER);
+        grabHandle.actor.SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
 
         // Area that Grab handle responds to, larger than actual handle so easier to move
 #ifdef DECORATOR_DEBUG
@@ -853,6 +873,7 @@ struct Decorator::Impl : public ConnectionTracker
         primary.actor.SetProperty(Dali::Actor::Property::NAME, "SelectionHandleOne");
 #endif
         primary.actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
+        primary.actor.SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
         GetImpl(primary.actor).SetDepthIndex(DepthIndex::DECORATION);
         primary.actor.SetProperty(Actor::Property::COLOR, mHandleColor);
 
@@ -897,6 +918,7 @@ struct Decorator::Impl : public ConnectionTracker
         secondary.actor.SetProperty(Dali::Actor::Property::NAME, "SelectionHandleTwo");
 #endif
         secondary.actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text.
+        secondary.actor.SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
         GetImpl(secondary.actor).SetDepthIndex(DepthIndex::DECORATION);
         secondary.actor.SetProperty(Actor::Property::COLOR, mHandleColor);
 
@@ -932,6 +954,20 @@ struct Decorator::Impl : public ConnectionTracker
     }
   }
 
+  void CreateSelectionPopup()
+  {
+    if(!mCopyPastePopup.actor)
+    {
+      mCopyPastePopup.actor = TextSelectionPopup::New(&mTextSelectionPopupCallbackInterface);
+#ifdef DECORATOR_DEBUG
+      mCopyPastePopup.actor.SetProperty(Dali::Actor::Property::NAME, "mCopyPastePopup");
+#endif
+      mCopyPastePopup.actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+      mCopyPastePopup.actor.SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
+      mCopyPastePopup.actor.OnRelayoutSignal().Connect(this, &Decorator::Impl::SetPopupPosition); // Position popup after size negotiation
+    }
+  }
+
   void CalculateHandleWorldCoordinates(HandleImpl& handle, Vector2& position)
   {
     // Gets the world position of the active layer. The active layer is where the handles are added.
@@ -1065,11 +1101,11 @@ struct Decorator::Impl : public ConnectionTracker
 
   void ApplyDisplacement(HandleImpl& handle, float yLocalPosition)
   {
-    if( handle.actor )
+    if(handle.actor)
     {
       float adjustedDisplacementX = 0.0f;
       float adjustedDisplacementY = 0.0f;
-      if (mSmoothHandlePanEnabled)
+      if(mSmoothHandlePanEnabled)
       {
         adjustedDisplacementX = CalculateAdjustedDisplacement(handle.position.x, handle.grabDisplacementX, mControlSize.x);
         adjustedDisplacementY = CalculateAdjustedDisplacement(handle.position.y, handle.grabDisplacementY, (mControlSize.y - handle.lineHeight));
@@ -1158,7 +1194,7 @@ struct Decorator::Impl : public ConnectionTracker
     }
 
     // Add the highlight box telling the controller it needs clipping.
-    mController.AddDecoration(mHighlightActor, true);
+    mController.AddDecoration(mHighlightActor, DecorationType::NONE_LAYER, true);
   }
 
   void UpdateHighlight()
@@ -1879,6 +1915,7 @@ struct Decorator::Impl : public ConnectionTracker
   Timer mScrollTimer;      ///< Timer used to scroll the text when the grab handle is moved close to the edges.
 
   Actor                mActiveLayer;                             ///< Actor for active handles and alike that ensures they are above all else.
+  Actor                mCursorLayer;                             ///< Actor for cursor layer. this is for cursor clipping.
   PropertyNotification mHandleVerticalLessThanNotification;      ///< Notifies when the 'y' coord of the active layer is less than a given value.
   PropertyNotification mHandleVerticalGreaterThanNotification;   ///< Notifies when the 'y' coord of the active layer is grater than a given value.
   PropertyNotification mHandleHorizontalLessThanNotification;    ///< Notifies when the 'x' coord of the active layer is less than a given value.
@@ -1962,9 +1999,9 @@ void Decorator::GetBoundingBox(Rect<int>& boundingBox) const
   WorldToLocalCoordinatesBoundingBox(mImpl->mBoundingBox, boundingBox);
 }
 
-void Decorator::Relayout(const Vector2& size)
+void Decorator::Relayout(const Vector2& size, RelayoutContainer& container)
 {
-  mImpl->Relayout(size);
+  mImpl->Relayout(size, container);
 }
 
 void Decorator::UpdatePositions(const Vector2& scrollOffset)
@@ -2024,6 +2061,15 @@ const float Decorator::GetGlyphOffset(Cursor cursor) const
 void Decorator::SetCursorColor(Cursor cursor, const Dali::Vector4& color)
 {
   mImpl->mCursor[cursor].color = color;
+
+  if(cursor == PRIMARY_CURSOR && mImpl->mPrimaryCursor)
+  {
+    mImpl->mPrimaryCursor.SetBackgroundColor(color);
+  }
+  else if(cursor == SECONDARY_CURSOR && mImpl->mSecondaryCursor)
+  {
+    mImpl->mSecondaryCursor.SetBackgroundColor(color);
+  }
 }
 
 const Dali::Vector4& Decorator::GetColor(Cursor cursor) const
@@ -2084,6 +2130,15 @@ float Decorator::GetCursorBlinkDuration() const
 void Decorator::SetCursorWidth(int width)
 {
   mImpl->mCursorWidth = static_cast<float>(width);
+
+  if(mImpl->mPrimaryCursorVisible && mImpl->mPrimaryCursor)
+  {
+    mImpl->mPrimaryCursor.SetProperty(Actor::Property::SIZE, Size(mImpl->mCursorWidth, mImpl->mCursor[PRIMARY_CURSOR].cursorHeight));
+  }
+  if(mImpl->mSecondaryCursorVisible && mImpl->mSecondaryCursor)
+  {
+    mImpl->mSecondaryCursor.SetProperty(Actor::Property::SIZE, Size(mImpl->mCursorWidth, mImpl->mCursor[SECONDARY_CURSOR].cursorHeight));
+  }
 }
 
 int Decorator::GetCursorWidth() const
@@ -2094,7 +2149,26 @@ int Decorator::GetCursorWidth() const
 void Decorator::SetEditable(bool editable)
 {
   mImpl->mHidePrimaryCursorAndGrabHandle = !editable;
-  mImpl->Relayout(mImpl->mControlSize);
+  // If editable is false, all decorators should be disabled.
+  if(!editable)
+  {
+    if(IsHighlightActive())
+    {
+      SetHighlightActive(false);
+    }
+    if(IsHandleActive(LEFT_SELECTION_HANDLE))
+    {
+      SetHandleActive(LEFT_SELECTION_HANDLE, false);
+    }
+    if(IsHandleActive(RIGHT_SELECTION_HANDLE))
+    {
+      SetHandleActive(RIGHT_SELECTION_HANDLE, false);
+    }
+    if(IsPopupActive())
+    {
+      SetPopupActive(false);
+    }
+  }
 }
 /** Handles **/
 
@@ -2140,6 +2214,23 @@ const std::string& Decorator::GetHandleImage(HandleType handleType, HandleImageT
 void Decorator::SetHandleColor(const Vector4& color)
 {
   mImpl->mHandleColor = color;
+
+  Impl::HandleImpl& grabHandle      = mImpl->mHandle[GRAB_HANDLE];
+  Impl::HandleImpl& primaryHandle   = mImpl->mHandle[LEFT_SELECTION_HANDLE];
+  Impl::HandleImpl& secondaryHandle = mImpl->mHandle[RIGHT_SELECTION_HANDLE];
+
+  if(grabHandle.actor)
+  {
+    grabHandle.actor.SetProperty(Actor::Property::COLOR, color);
+  }
+  if(primaryHandle.actor)
+  {
+    primaryHandle.actor.SetProperty(Actor::Property::COLOR, color);
+  }
+  if(secondaryHandle.actor)
+  {
+    secondaryHandle.actor.SetProperty(Actor::Property::COLOR, color);
+  }
 }
 
 const Vector4& Decorator::GetHandleColor() const
@@ -2226,6 +2317,11 @@ void Decorator::ResizeHighlightQuads(unsigned int numberOfQuads)
 void Decorator::SetHighlightColor(const Vector4& color)
 {
   mImpl->mHighlightColor = color;
+
+  if(mImpl->mHighlightActor)
+  {
+    mImpl->mHighlightActor.SetProperty(Actor::Property::COLOR, color);
+  }
 }
 
 const Vector4& Decorator::GetHighlightColor() const
@@ -2266,17 +2362,7 @@ bool Decorator::IsPopupActive() const
 void Decorator::SetEnabledPopupButtons(TextSelectionPopup::Buttons& enabledButtonsBitMask)
 {
   mImpl->mEnabledPopupButtons = enabledButtonsBitMask;
-
-  if(!mImpl->mCopyPastePopup.actor)
-  {
-    mImpl->mCopyPastePopup.actor = TextSelectionPopup::New(&mImpl->mTextSelectionPopupCallbackInterface);
-#ifdef DECORATOR_DEBUG
-    mImpl->mCopyPastePopup.actor.SetProperty(Dali::Actor::Property::NAME, "mCopyPastePopup");
-#endif
-    mImpl->mCopyPastePopup.actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-    mImpl->mCopyPastePopup.actor.OnRelayoutSignal().Connect(mImpl, &Decorator::Impl::SetPopupPosition); // Position popup after size negotiation
-  }
-
+  mImpl->CreateSelectionPopup();
   mImpl->mCopyPastePopup.actor.EnableButtons(mImpl->mEnabledPopupButtons);
 }
 
@@ -2285,6 +2371,20 @@ TextSelectionPopup::Buttons& Decorator::GetEnabledPopupButtons()
   return mImpl->mEnabledPopupButtons;
 }
 
+void Decorator::SetSelectionPopupStyle(const Property::Map& options)
+{
+  mImpl->CreateSelectionPopup();
+  mImpl->mCopyPastePopup.actor.SetProperties(options);
+}
+
+void Decorator::GetSelectionPopupStyle(Property::Map& options)
+{
+  if(mImpl->mCopyPastePopup.actor)
+  {
+    mImpl->mCopyPastePopup.actor.GetProperties(options);
+  }
+}
+
 /** Scroll **/
 
 void Decorator::SetScrollThreshold(float threshold)
diff --git a/dali-toolkit/internal/text/decorator/text-decorator.h b/dali-toolkit/internal/text/decorator/text-decorator.h
index 59b06e1..ab0153a 100644
--- a/dali-toolkit/internal/text/decorator/text-decorator.h
+++ b/dali-toolkit/internal/text/decorator/text-decorator.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_DECORATOR_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/math/rect.h>
+#include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/ref-object.h>
 
 // INTERNAL INCLUDES
@@ -83,6 +84,14 @@ enum HandleType
   HANDLE_TYPE_COUNT
 };
 
+// Types of decoration.
+enum DecorationType
+{
+  NONE_LAYER,
+  ACTIVE_LAYER,
+  CURSOR_LAYER
+};
+
 /**
  * @brief A Text Decorator is used to display cursors, handles, selection highlights and pop-ups.
  *
@@ -122,9 +131,11 @@ public:
     /**
      * @brief Add a decoration to the parent UI control.
      *
-     * @param[in] decoration The actor displaying a decoration.
+     * @param[in] actor The actor displaying a decoration.
+     * @param[in] type Whether this decoration is a layer or not, which layer it is.
+     * @param[in] needsClipping Whether the actor needs clipping.
      */
-    virtual void AddDecoration(Actor& actor, bool needsClipping) = 0;
+    virtual void AddDecoration(Actor& actor, DecorationType type, bool needsClipping) = 0;
 
     /**
      * @brief An input event from one of the handles.
@@ -182,8 +193,10 @@ public:
    * @brief The decorator waits until a relayout before creating actors etc.
    *
    * @param[in] size The size of the parent control after size-negotiation.
+   * @param[in,out]  container  The control should add actors to this container that it is not able
+   *                            to allocate a size for.
    */
-  void Relayout(const Dali::Vector2& size);
+  void Relayout(const Dali::Vector2& size, RelayoutContainer& container);
 
   /**
    * @brief Updates the decorator's actor positions after scrolling.
@@ -548,6 +561,20 @@ public:
   TextSelectionPopup::Buttons& GetEnabledPopupButtons();
 
   /**
+   * @brief Used to set the selection popup options
+   *
+   * @param[in] options The property map of selection popup options
+   */
+  void SetSelectionPopupStyle(const Property::Map& options);
+
+  /**
+   * @brief Used to get the selection popup options
+   *
+   * @param[out] options The property map of selection popup options
+   */
+  void GetSelectionPopupStyle(Property::Map& options);
+
+  /**
    * @brief Sets the scroll threshold.
    *
    * It defines a square area inside the control, close to the edge.
diff --git a/dali-toolkit/internal/text/emoji-helper.cpp b/dali-toolkit/internal/text/emoji-helper.cpp
new file mode 100644
index 0000000..35a7760
--- /dev/null
+++ b/dali-toolkit/internal/text/emoji-helper.cpp
@@ -0,0 +1,225 @@
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/emoji-helper.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+bool IsTextPresentationSequence(const TextAbstraction::Script&    currentRunScript,
+                                const TextAbstraction::Character& character)
+{
+  return (IsSymbolOrEmojiOrTextScript(currentRunScript) && TextAbstraction::IsTextPresentationSelector(character));
+}
+
+bool IsEmojiPresentationSequence(const TextAbstraction::Script&    currentRunScript,
+                                 const TextAbstraction::Character& character)
+{
+  return ((IsSymbolOrEmojiScript(currentRunScript) || IsEmojiColorScript(currentRunScript)) &&
+          TextAbstraction::IsEmojiPresentationSelector(character));
+}
+
+bool IsEmojiSequence(const TextAbstraction::Script&    currentRunScript,
+                     const TextAbstraction::Character& character,
+                     const TextAbstraction::Script&    characterScript)
+{
+  return (!(TextAbstraction::IsNegativeSquaredLatinCapitalLetter(character)) &&
+          (IsOneOfEmojiScripts(currentRunScript) &&
+           (IsOneOfEmojiScripts(characterScript) ||
+            TextAbstraction::IsZeroWidthJoiner(character) ||
+            TextAbstraction::IsZeroWidthNonJoiner(character) ||
+            TextAbstraction::IsEmojiItem(character) ||
+            TextAbstraction::IsMiscellaneousSymbolsAndArrowsEmoji(character) ||
+            TextAbstraction::IsDingbatsEmoji(character))));
+}
+
+bool IsNewSequence(const Character* const         textBuffer,
+                   const TextAbstraction::Script& currentRunScript,
+                   const Length&                  currentCharacterIndex,
+                   const Length&                  lastCharacterIndex,
+                   TextAbstraction::Script&       currentCharacterScript)
+{
+  // Until now we have two cases : VariationSelector & Keycap
+  // In-case there are more cases then should be added in this function
+
+  return IsNewKeycapSequence(textBuffer, currentCharacterIndex, lastCharacterIndex, currentCharacterScript) ||
+         IsNewVariationSelectorSequence(textBuffer, currentRunScript, currentCharacterIndex, lastCharacterIndex, currentCharacterScript);
+}
+
+//
+
+bool IsNewKeycapSequence(const Character* const   textBuffer,
+                         const Length&            currentCharacterIndex,
+                         const Length&            lastCharacterIndex,
+                         TextAbstraction::Script& currentCharacterScript)
+{
+  // Ref: https://www.unicode.org/Public/emoji/14.0/emoji-sequences.txt Search on "Emoji_Keycap_Sequence"
+  // Ref: https://www.unicode.org/Public/emoji/14.0/emoji-test.txt Search on "subgroup: keycap"
+
+  // Default initialization does not keycap sequence
+  bool isNewKeycapSequence = false;
+
+  if(currentCharacterIndex <= lastCharacterIndex)
+  {
+    Character currentCharacter = *(textBuffer + currentCharacterIndex);
+    if(IsStartForKeycapSequence(currentCharacter))
+    {
+      if(!isNewKeycapSequence && currentCharacterIndex + 2 <= lastCharacterIndex)
+      {
+        Character characterOne = *(textBuffer + currentCharacterIndex + 1);
+        Character characterTwo = *(textBuffer + currentCharacterIndex + 2);
+
+        if(TextAbstraction::IsEmojiPresentationSelector(characterOne) &&
+           TextAbstraction::IsCombiningEnclosingKeycap(characterTwo))
+        {
+          isNewKeycapSequence    = true;
+          currentCharacterScript = TextAbstraction::EMOJI_COLOR;
+        }
+      } // if(!isNewKeycapSequence && currentCharacterIndex + 2 <= lastCharacterIndex)
+    }   // if(IsStartForKeycapSequence(currentCharacter))
+  }     // if(currentCharacterIndex < lastCharacterIndex)
+
+  return isNewKeycapSequence;
+}
+
+bool IsNewVariationSelectorSequence(const Character* const         textBuffer,
+                                    const TextAbstraction::Script& currentRunScript,
+                                    const Length&                  currentCharacterIndex,
+                                    const Length&                  lastCharacterIndex,
+                                    TextAbstraction::Script&       currentCharacterScript)
+{
+  // Ref: Emoji and Text Presentation Selectors: https://www.unicode.org/reports/tr51/#Emoji_Variation_Selectors
+  // Ref: Emoji Variation Sequences for UTS #51: https://www.unicode.org/Public/14.0.0/ucd/emoji/emoji-variation-sequences.txt
+
+  // Default initialization does not VariationSelector sequence
+  bool isNewVariationSelectorSequence = false;
+
+  if(currentCharacterIndex <= lastCharacterIndex)
+  {
+    Character currentCharacter = *(textBuffer + currentCharacterIndex);
+    if(TextAbstraction::IsEmojiVariationSequences(currentCharacter))
+    {
+      if(!isNewVariationSelectorSequence && currentCharacterIndex + 1 <= lastCharacterIndex)
+      {
+        Character characterVS = *(textBuffer + currentCharacterIndex + 1);
+
+        if(TextAbstraction::IsEmojiPresentationSelector(characterVS))
+        {
+          isNewVariationSelectorSequence = currentRunScript != TextAbstraction::EMOJI_COLOR;
+          currentCharacterScript         = TextAbstraction::EMOJI_COLOR;
+        }
+        else if(TextAbstraction::IsTextPresentationSelector(characterVS))
+        {
+          isNewVariationSelectorSequence = currentRunScript != TextAbstraction::EMOJI_TEXT;
+          currentCharacterScript         = TextAbstraction::EMOJI_TEXT;
+        }
+
+      } // if(!isNewVariationSelectorSequence && currentCharacterIndex + 1 <= lastCharacterIndex)
+    }   // if(TextAbstraction::IsEmojiVariationSequences(currentCharacter))
+  }     // if(currentCharacterIndex < lastCharacterIndex)
+
+  return isNewVariationSelectorSequence;
+}
+
+bool IsStartForKeycapSequence(const TextAbstraction::Character& character)
+{
+  return (TextAbstraction::IsASCIIDigits(character) ||
+          TextAbstraction::CHAR_NUMBER_SIGN == character ||
+          TextAbstraction::CHAR_ASTERISK == character);
+}
+
+bool IsScriptChangedToFollowSequence(const TextAbstraction::Script&    currentRunScript,
+                                     const TextAbstraction::Character& character,
+                                     TextAbstraction::Script&          currentCharacterScript)
+{
+  bool isUpdated = false;
+
+  // Keycap cases
+  if(TextAbstraction::IsCombiningEnclosingKeycap(character))
+  {
+    if(TextAbstraction::EMOJI == currentRunScript)
+    {
+      // Keycap and unqualified
+      // Emoji request a default presentation for an emoji character.
+      isUpdated              = (currentCharacterScript != TextAbstraction::EMOJI);
+      currentCharacterScript = TextAbstraction::EMOJI;
+    }
+    else if(TextAbstraction::EMOJI_COLOR == currentRunScript)
+    {
+      // Keycap and fully-qualified
+      // Emoji request an emoji presentation for an emoji character.
+      isUpdated              = (currentCharacterScript != TextAbstraction::EMOJI_COLOR);
+      currentCharacterScript = TextAbstraction::EMOJI_COLOR;
+    }
+  }
+  // Emoji(Text) Presentation cases
+  else if(IsTextPresentationSequence(currentRunScript, character))
+  {
+    // Emoji request a text presentation for an emoji character.
+    isUpdated              = (currentCharacterScript != TextAbstraction::EMOJI_TEXT);
+    currentCharacterScript = TextAbstraction::EMOJI_TEXT;
+  }
+  // Emoji(Color) Presentation cases
+  else if(IsEmojiPresentationSequence(currentRunScript, character))
+  {
+    // Emoji request an emoji presentation for an emoji character.
+    isUpdated              = (currentCharacterScript != TextAbstraction::EMOJI_COLOR);
+    currentCharacterScript = TextAbstraction::EMOJI_COLOR;
+  }
+  // Default Emoji
+  else if(IsEmojiScript(currentRunScript) && IsEmojiScript(currentCharacterScript))
+  {
+    // Emoji request an emoji presentation for an emoji character.
+    isUpdated              = (currentCharacterScript != TextAbstraction::EMOJI);
+    currentCharacterScript = TextAbstraction::EMOJI;
+  }
+  // Emoji sequences
+  else if(IsEmojiSequence(currentRunScript, character, currentCharacterScript))
+  {
+    // Emoji request an emoji presentation for an emoji character.
+    isUpdated              = (currentCharacterScript != TextAbstraction::EMOJI_COLOR);
+    currentCharacterScript = TextAbstraction::EMOJI_COLOR;
+  }
+
+  return isUpdated;
+}
+
+Character GetVariationSelectorByScript(const TextAbstraction::Script& script)
+{
+  Character character = 0u;
+  if(TextAbstraction::EMOJI_COLOR == script)
+  {
+    character = TextAbstraction::CHAR_VARIATION_SELECTOR_16;
+  }
+  else if(TextAbstraction::EMOJI_TEXT == script)
+  {
+    character = TextAbstraction::CHAR_VARIATION_SELECTOR_15;
+  }
+
+  return character;
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/emoji-helper.h b/dali-toolkit/internal/text/emoji-helper.h
new file mode 100644
index 0000000..95efd9f
--- /dev/null
+++ b/dali-toolkit/internal/text/emoji-helper.h
@@ -0,0 +1,170 @@
+#ifndef DALI_TOOLKIT_TEXT_EMOJI_HELPER_H
+#define DALI_TOOLKIT_TEXT_EMOJI_HELPER_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/text-definitions.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/emoji-character-properties.h>
+#include <dali/devel-api/text-abstraction/emoji-helper.h>
+#include <dali/devel-api/text-abstraction/script.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Whether the sequence is a variation sequence consisting of an emoji character followed by a text presentation selector.
+ *
+ * @param[in] currentRunScript The script of current run.
+ * @param[in] character The next character.
+ *
+ * @return @e true if the sequence is text presentation sequence.
+ */
+bool IsTextPresentationSequence(const TextAbstraction::Script& currentRunScript, const TextAbstraction::Character& character);
+
+/**
+ * @brief Whether the sequence is a variation sequence consisting of an emoji character followed by a emoji presentation selector.
+ *
+ * @param[in] currentRunScript The script of current run.
+ * @param[in] character The next character.
+ *
+ * @return @e true if the sequence is emoji presentation sequence.
+ */
+bool IsEmojiPresentationSequence(const TextAbstraction::Script&    currentRunScript,
+                                 const TextAbstraction::Character& character);
+
+/**
+ * @brief Whether the sequence is an emoji sequence.
+ *
+ * @param[in] currentRunScript The script of current run.
+ * @param[in] character The next character.
+ * @param[in] characterScript The script of the next character.
+ *
+ * @return @e true if the sequence is an emoji sequence.
+ */
+bool IsEmojiSequence(const TextAbstraction::Script&    currentRunScript,
+                     const TextAbstraction::Character& character,
+                     const TextAbstraction::Script&    characterScript);
+
+/**
+ * @brief Whether the sequence is a keycap sequence and set script according to the case.
+ *
+ * @param[in] textBuffer The text.
+ * @param[in] currentCharacterIndex The index of current character.
+ * @param[in] lastCharacterIndex The index of last character.
+ * @param[out] currentCharacterScript The current character script to update it in-case it's the Keycap sequence.
+ *
+ * @return @e true if @p currentRunScript is ASCII_DIGITS and @p character is COMBINING_ENCLOSING_KEYCAP
+ */
+bool IsNewKeycapSequence(const Character* const   textBuffer,
+                         const Length&            currentCharacterIndex,
+                         const Length&            lastCharacterIndex,
+                         TextAbstraction::Script& currentCharacterScript);
+
+/**
+ * @brief Whether the sequence is a variation selector sequence and set script according to the case.
+ *
+ * @param[in] textBuffer The text.
+ * @param[in] currentRunScript The script of current run.
+ * @param[in] currentCharacterIndex The index of current character.
+ * @param[in] lastCharacterIndex The index of last character.
+ * @param[out] currentCharacterScript The current character script to update it in-case it's the VariationSelector sequence.
+ *
+ * @return @e true if @p currentRunScript is ASCII_DIGITS and @p character is COMBINING_ENCLOSING_KEYCAP
+ */
+bool IsNewVariationSelectorSequence(const Character* const         textBuffer,
+                                    const TextAbstraction::Script& currentRunScript,
+                                    const Length&                  currentCharacterIndex,
+                                    const Length&                  lastCharacterIndex,
+                                    TextAbstraction::Script&       currentCharacterScript);
+
+/**
+ * @brief Whether the case is a new sequence and set script according to the case.
+ *
+ * @param[in] textBuffer The text.
+ * @param[in] currentRunScript The script of current run.
+ * @param[in] currentCharacterIndex The index of current character.
+ * @param[in] lastCharacterIndex The index of last character.
+ * @param[out] currentCharacterScript The current character script to update according to sequence.
+ *
+ * @return @e true the case is a new sequence
+ */
+bool IsNewSequence(const Character* const         textBuffer,
+                   const TextAbstraction::Script& currentRunScript,
+                   const Length&                  currentCharacterIndex,
+                   const Length&                  lastCharacterIndex,
+                   TextAbstraction::Script&       currentCharacterScript);
+
+/**
+ * @brief Whether the character is ASCII digits | # Number Sign | * Asterisk.
+ *
+ * @param[in] character The character.
+ *
+ * @return @e true if the character is ASCII digits | # Number Sign | * Asterisk.
+ */
+bool IsStartForKeycapSequence(const TextAbstraction::Character& character);
+
+/**
+ * @brief Check sequence case and update script of character if needed.
+ *
+ * @param[in] currentRunScript The script of current run.
+ * @param[in] character The next character.
+ * @param[out] script The current character script to update according to sequence.
+ *
+ * @return @e true if the script is changed
+ */
+bool IsScriptChangedToFollowSequence(const TextAbstraction::Script&    currentRunScript,
+                                     const TextAbstraction::Character& character,
+                                     TextAbstraction::Script&          script);
+
+/**
+ * @brief Check sequence case and update script of character if needed.
+ *
+ * @param[in] currentRunScript The script of current run.
+ * @param[in] character The next character.
+ * @param[out] script The current character script to update according to sequence.
+ *
+ * @return @e true if the script is changed
+ */
+bool HandleEmojiSequence(const Character* const         textBuffer,
+                         const Length&                  currentCharacterIndex,
+                         const Length&                  lastCharacterIndex,
+                         const TextAbstraction::Script& currentRunScript,
+                         TextAbstraction::Script&       currentCharacterScript);
+
+/**
+ * @brief Determine the Variation Selector according to script.
+ *
+ * @param[in] script The script.
+ *
+ * @return CHAR_VARIATION_SELECTOR_15 in-case EMOJI_TEXT or CHAR_VARIATION_SELECTOR_16 in-case EMOJI_COLOR or 0 otherwise
+ */
+Character GetVariationSelectorByScript(const TextAbstraction::Script& script);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_EMOJI_HELPER_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/font-description-run.h b/dali-toolkit/internal/text/font-description-run.h
index 04a5e91..77b8db8 100644
--- a/dali-toolkit/internal/text/font-description-run.h
+++ b/dali-toolkit/internal/text/font-description-run.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_FONT_DESCRIPTION_RUN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/devel-api/text-abstraction/font-list.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/character-run.h>
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
@@ -34,13 +34,13 @@ namespace Text
 /**
  * @brief Run of characters with the same font.
  */
-struct FontDescriptionRun
+struct FontDescriptionRun : public AbstractStyleCharacterRun
 {
   /**
    * Default constructor to set the default values of bitfields
    */
   FontDescriptionRun()
-  : characterRun{},
+  : AbstractStyleCharacterRun(),
     familyName{nullptr},
     familyLength{0u},
     weight{FontWeight::NONE},
@@ -67,7 +67,7 @@ struct FontDescriptionRun
                      bool                widthDefined,
                      bool                slantDefined,
                      bool                sizeDefined)
-  : characterRun{characterRun},
+  : AbstractStyleCharacterRun(characterRun),
     familyName{familyName},
     familyLength{familyLength},
     weight{weight},
@@ -82,7 +82,6 @@ struct FontDescriptionRun
   {
   }
 
-  CharacterRun    characterRun; ///< The initial character index and the number of characters of the run.
   char*           familyName;   ///< The font's family name.
   Length          familyLength; ///< The length of the font's family name.
   FontWeight      weight;       ///< The font's weight.
@@ -101,6 +100,16 @@ struct FontDescriptionRun
 
 } // namespace Toolkit
 
+// Allow FontDescriptionRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::FontDescriptionRun> : public Dali::BasicTypes<Dali::Toolkit::Text::FontDescriptionRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
 } // namespace Dali
 
 #endif // DALI_TOOLKIT_TEXT_FONT_DESCRIPTION_RUN_H
diff --git a/dali-toolkit/internal/text/glyph-metrics-helper.cpp b/dali-toolkit/internal/text/glyph-metrics-helper.cpp
index 1f27a84..c46fefd 100644
--- a/dali-toolkit/internal/text/glyph-metrics-helper.cpp
+++ b/dali-toolkit/internal/text/glyph-metrics-helper.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
 // FILE HEADER
 #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
+
 namespace Dali
 {
 namespace Toolkit
@@ -50,7 +53,8 @@ void GetGlyphsMetrics(GlyphIndex             glyphIndex,
                       Length                 numberOfGlyphs,
                       GlyphMetrics&          glyphMetrics,
                       const GlyphInfo* const glyphsBuffer,
-                      MetricsPtr&            metrics)
+                      MetricsPtr&            metrics,
+                      float                  calculatedAdvance)
 {
   const GlyphInfo& firstGlyph = *(glyphsBuffer + glyphIndex);
 
@@ -72,7 +76,7 @@ void GetGlyphsMetrics(GlyphIndex             glyphIndex,
   glyphMetrics.fontId     = firstGlyph.fontId;
   glyphMetrics.fontHeight = fontMetrics.height;
   glyphMetrics.width      = firstGlyph.width;
-  glyphMetrics.advance    = firstGlyph.advance;
+  glyphMetrics.advance    = calculatedAdvance;
   glyphMetrics.ascender   = fontMetrics.ascender;
   glyphMetrics.xBearing   = firstGlyph.xBearing;
 
@@ -91,7 +95,7 @@ void GetGlyphsMetrics(GlyphIndex             glyphIndex,
       const float currentMaxGlyphWidthEdge = glyphMetrics.advance + glyphInfo.xBearing + glyphInfo.width;
       maxWidthEdge                         = std::max(maxWidthEdge, currentMaxGlyphWidthEdge);
 
-      glyphMetrics.advance += glyphInfo.advance;
+      glyphMetrics.advance += (glyphInfo.advance);
     }
 
     glyphMetrics.width = maxWidthEdge - glyphMetrics.xBearing;
@@ -100,6 +104,53 @@ void GetGlyphsMetrics(GlyphIndex             glyphIndex,
   glyphMetrics.width += (firstGlyph.isItalicRequired && !isItalicFont) ? TextAbstraction::FontClient::DEFAULT_ITALIC_ANGLE * firstGlyph.height : 0.f;
 }
 
+void GetGlyphMetricsFromCharacterIndex(CharacterIndex         index,
+                                       const VisualModelPtr&  visualModel,
+                                       const LogicalModelPtr& logicalModel,
+                                       MetricsPtr&            metrics,
+                                       GlyphMetrics&          glyphMetrics,
+                                       GlyphIndex&            glyphIndex,
+                                       Length&                numberOfGlyphs)
+{
+  const GlyphIndex* const charactersToGlyphBuffer   = visualModel->mCharactersToGlyph.Begin();
+  const Length* const     glyphsPerCharacterBuffer  = visualModel->mGlyphsPerCharacter.Begin();
+  const GlyphInfo* const  glyphInfoBuffer           = visualModel->mGlyphs.Begin();
+  Vector<CharacterIndex>& glyphToCharacterMap       = visualModel->mGlyphsToCharacters;
+  const CharacterIndex*   glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
+  const float             modelCharacterSpacing     = visualModel->GetCharacterSpacing();
+
+  // Get the character-spacing runs.
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = visualModel->GetCharacterSpacingGlyphRuns();
+
+  //Takes the character index, obtains the glyph index (and the number of Glyphs) from it and finally gets the glyph metrics.
+  glyphIndex     = *(charactersToGlyphBuffer + index);
+  numberOfGlyphs = *(glyphsPerCharacterBuffer + index);
+
+  float calculatedAdvance = 0.f;
+
+  const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+  calculatedAdvance            = GetCalculatedAdvance(*(logicalModel->mText.Begin() + (*(glyphToCharacterMapBuffer + glyphIndex))), characterSpacing, (*(visualModel->mGlyphs.Begin() + glyphIndex)).advance);
+
+  // Get the metrics for the group of glyphs.
+  GetGlyphsMetrics(glyphIndex,
+                   numberOfGlyphs,
+                   glyphMetrics,
+                   glyphInfoBuffer,
+                   metrics,
+                   calculatedAdvance);
+}
+
+float GetCalculatedAdvance(unsigned int character, float characterSpacing, float advance)
+{
+  //Gets the final advance value by adding the CharacterSpacing value to it
+  //In some cases the CharacterSpacing should not be added. Ex: when the glyph is a ZWSP (Zero Width Space)
+  return (TextAbstraction::IsZeroWidthNonJoiner(character) || TextAbstraction::IsZeroWidthJoiner(character) ||
+          TextAbstraction::IsZeroWidthSpace(character) || TextAbstraction::IsNewParagraph(character) ||
+          TextAbstraction::IsLeftToRightMark(character) || TextAbstraction::IsRightToLeftMark(character))
+           ? advance
+           : advance + characterSpacing;
+}
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/text/glyph-metrics-helper.h b/dali-toolkit/internal/text/glyph-metrics-helper.h
index 05ba882..0c996db 100644
--- a/dali-toolkit/internal/text/glyph-metrics-helper.h
+++ b/dali-toolkit/internal/text/glyph-metrics-helper.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_GLYPH_METRICS_HELPER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
  */
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/metrics.h>
+#include <dali-toolkit/internal/text/visual-model-impl.h>
 
 namespace Dali
 {
@@ -76,12 +78,46 @@ Length GetNumberOfGlyphsOfGroup(GlyphIndex          glyphIndex,
  * @param[out] glyphMetrics Some glyph metrics (font height, advance, ascender and x bearing).
  * @param[in] glyphsBuffer The glyphs buffer.
  * @param[in] metrics Used to access metrics from FontClient.
+ * @param[in] calculatedAdvance The final advance value obtained by adding the CharacterSpacing value to the original advance. In some cases the CharacterSpacing should not be added. Ex: when the glyph is a ZWSP (Zero Width Space)
  */
 void GetGlyphsMetrics(GlyphIndex             glyphIndex,
                       Length                 numberOfGlyphs,
                       GlyphMetrics&          glyphMetrics,
                       const GlyphInfo* const glyphsBuffer,
-                      MetricsPtr&            metrics);
+                      MetricsPtr&            metrics,
+                      float                  calculatedAdvance);
+
+/**
+ * @brief Gets the final advance value by adding the CharacterSpacing value to it
+ *In some cases the CharacterSpacing should not be added. Ex: when the glyph is a ZWSP (Zero Width Space)
+ *
+ * @param[in] character The character of which the advance is to be calculated.
+ * @param[in] characterSpacing The character spacing to be added to the advance.
+ * @param[in] advance The original advance.
+ *
+ * @return The calculated advance
+ */
+float GetCalculatedAdvance(unsigned int character, float characterSpacing, float advance);
+
+/**
+ * @brief Takes the character index, obtains the glyph index (and the number of Glyphs) from it and finally gets the glyph metrics.
+ *
+ * @param[in] index The character index.
+ * @param[in] visualModel The visual model.
+ * @param[in] logicalModel The logical model.
+ * @param[in] metrics Used to access metrics from FontClient.
+ * @param[out] glyphMetrics Some glyph metrics (font height, advance, ascender and x bearing).
+ * @param[out] glyphIndex The glyph index obtained from the character index.
+ * @param[out] numberOfGlyphs The number of glyphs in the character of which the index was passed to the function.
+ *
+ */
+void GetGlyphMetricsFromCharacterIndex(CharacterIndex         index,
+                                       const VisualModelPtr&  visualModel,
+                                       const LogicalModelPtr& logicalModel,
+                                       MetricsPtr&            metrics,
+                                       GlyphMetrics&          glyphMetrics,
+                                       GlyphIndex&            glyphIndex,
+                                       Length&                numberOfGlyphs);
 
 } // namespace Text
 
diff --git a/dali-toolkit/internal/text/hidden-text.cpp b/dali-toolkit/internal/text/hidden-text.cpp
index 1adbe83..4f0cabf 100644
--- a/dali-toolkit/internal/text/hidden-text.cpp
+++ b/dali-toolkit/internal/text/hidden-text.cpp
@@ -23,7 +23,6 @@
 
 using namespace Dali::Toolkit;
 
-const uint32_t STAR                  = 0x2A; // Set default substitute character as '*'
 const int      DEFAULT_SHOW_DURATION = 1000;
 
 namespace Dali
@@ -43,7 +42,8 @@ HiddenText::HiddenText(Observer* observer)
   mSubstituteText(STAR),
   mDisplayDuration(DEFAULT_SHOW_DURATION),
   mSubstituteCount(0),
-  mPreviousTextCount(0)
+  mPreviousTextCount(0u),
+  mIsLastCharacterShow(false)
 {
   mTimer = Timer::New(mDisplayDuration);
   mTimer.TickSignal().Connect(this, &HiddenText::OnTick);
@@ -86,7 +86,7 @@ void HiddenText::GetProperties(Property::Map& map)
   map[Toolkit::HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION] = mDisplayDuration;
 }
 
-void HiddenText::Substitute(const Vector<Character>& source, Vector<Character>& destination)
+void HiddenText::Substitute(const Vector<Character>& source, Vector<Character>& destination, Length cursorPos)
 {
   const Length characterCount = source.Count();
 
@@ -126,14 +126,15 @@ void HiddenText::Substitute(const Vector<Character>& source, Vector<Character>&
     }
     case Toolkit::HiddenInput::Mode::SHOW_LAST_CHARACTER:
     {
+      hideStart = begin;
+      hideEnd   = end;
       if(mPreviousTextCount < characterCount)
       {
-        hideStart = begin;
-        hideEnd   = end - 1;
         if(mDisplayDuration > 0)
         {
           mTimer.SetInterval(mDisplayDuration);
           mTimer.Start();
+          mIsLastCharacterShow = true;
         }
         else
         {
@@ -142,34 +143,65 @@ void HiddenText::Substitute(const Vector<Character>& source, Vector<Character>&
       }
       else
       {
-        hideStart = begin;
-        hideEnd   = end;
+        mIsLastCharacterShow = false;
       }
       break;
     }
   }
-  for(; begin < end; ++begin)
+
+
+  if(mHideMode == Toolkit::HiddenInput::Mode::SHOW_LAST_CHARACTER)
   {
-    if(begin >= hideStart && begin < hideEnd)
+    Length currentPos = 0u;
+    for(; begin < end; ++begin)
     {
-      *begin = static_cast<uint32_t>(mSubstituteText);
+      if(begin >= hideStart && begin < hideEnd && cursorPos > 0u && currentPos != cursorPos - 1u)
+      {
+        *begin = static_cast<uint32_t>(mSubstituteText);
+      }
+      else
+      {
+        *begin = mIsLastCharacterShow ? *sourcePos : static_cast<uint32_t>(mSubstituteText);
+      }
       sourcePos++;
+      currentPos++;
     }
-    else
+  }
+  else
+  {
+    for(; begin < end; ++begin)
     {
-      *begin = *sourcePos++;
+      if(begin >= hideStart && begin < hideEnd)
+      {
+        *begin = static_cast<uint32_t>(mSubstituteText);
+        sourcePos++;
+      }
+      else
+      {
+        *begin = *sourcePos++;
+      }
     }
   }
   mPreviousTextCount = characterCount;
 }
 
+void HiddenText::InitPreviousTextCount()
+{
+  mPreviousTextCount = 0u;
+}
+
+int HiddenText::GetHideMode()
+{
+  return mHideMode;
+}
+
 bool HiddenText::OnTick()
 {
   if(mObserver != NULL)
   {
     mObserver->DisplayTimeExpired();
   }
-
+  mIsLastCharacterShow = false;
   return false;
 }
 
diff --git a/dali-toolkit/internal/text/hidden-text.h b/dali-toolkit/internal/text/hidden-text.h
index 70d4a82..49d8010 100644
--- a/dali-toolkit/internal/text/hidden-text.h
+++ b/dali-toolkit/internal/text/hidden-text.h
@@ -32,6 +32,9 @@ namespace Toolkit
 {
 namespace Text
 {
+
+static constexpr const uint32_t STAR = 0x2A; // Set default substitute character as '*'
+
 /**
  * Class to handle the hidden text
  */
@@ -71,7 +74,18 @@ public: // Intended for internal use
    * @param[in] source The original text
    * @param[out] destination The applied text
    */
-  void Substitute(const Vector<Character>& source, Vector<Character>& destination);
+  void Substitute(const Vector<Character>& source, Vector<Character>& destination, Length currentCursorIndex);
+
+  /**
+   * @brief Initialize the value of PreviousTextCount
+   */
+  void InitPreviousTextCount();
+
+  /**
+   * @brief Returns the hide mode of hidden text.
+   * @return The hide mode of hidden text.
+   */
+  int GetHideMode();
 
   /**
    * @brief Invoked when the timer is expired
@@ -86,6 +100,7 @@ private:
   int       mDisplayDuration;
   int       mSubstituteCount;
   Length    mPreviousTextCount;
+  bool      mIsLastCharacterShow;
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/input-filter.cpp b/dali-toolkit/internal/text/input-filter.cpp
index eafcfe7..4a67a0b 100644
--- a/dali-toolkit/internal/text/input-filter.cpp
+++ b/dali-toolkit/internal/text/input-filter.cpp
@@ -92,6 +92,47 @@ bool InputFilter::Contains(Toolkit::InputFilter::Property::Type type, std::strin
   return match;
 }
 
+bool InputFilter::Filter(Toolkit::InputFilter::Property::Type type, std::string& text)
+{
+  std::regex pattern;
+  std::string result;
+
+  if(type == Toolkit::InputFilter::Property::ACCEPTED)
+  {
+    if(mAccepted.empty())
+    {
+      return false;
+    }
+    pattern = mAccepted;
+
+    auto start = std::sregex_iterator(text.begin(), text.end(), pattern);
+    auto end   = std::sregex_iterator();
+
+    while (start != end) {
+      result += start->str();
+      ++start;
+    }
+  }
+  else if(type == Toolkit::InputFilter::Property::REJECTED)
+  {
+    if(mRejected.empty())
+    {
+      return false;
+    }
+    pattern = mRejected;
+
+    result = std::regex_replace(text, pattern, "");
+  }
+
+  if(result.compare(text) == 0)
+  {
+    return false;
+  }
+
+  text = result;
+  return true;
+}
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/text/input-filter.h b/dali-toolkit/internal/text/input-filter.h
index 6de0132..be1f019 100644
--- a/dali-toolkit/internal/text/input-filter.h
+++ b/dali-toolkit/internal/text/input-filter.h
@@ -63,6 +63,14 @@ public: // Intended for internal use
    */
   bool Contains(Toolkit::InputFilter::Property::Type type, std::string source);
 
+  /**
+   * @brief Filtering the text using regex.
+   * @param[in] type ACCEPTED or REJECTED
+   * @param[in,out] text The string value to filter and write back.
+   * @return @e true if the text is filtered by the regex, otherwise returns @e false.
+   */
+  bool Filter(Toolkit::InputFilter::Property::Type type, std::string& text);
+
 private:
   std::string mAccepted;
   std::string mRejected;
diff --git a/dali-toolkit/internal/text/input-style.h b/dali-toolkit/internal/text/input-style.h
index de3a1f2..1027903 100644
--- a/dali-toolkit/internal/text/input-style.h
+++ b/dali-toolkit/internal/text/input-style.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_INPUT_STYLE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/constants.h>
+#include <dali/public-api/math/math-utils.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/text-definitions.h>
@@ -37,18 +38,19 @@ struct InputStyle
 {
   enum Mask
   {
-    NONE               = 0x0000,
-    INPUT_COLOR        = 0x0001,
-    INPUT_FONT_FAMILY  = 0x0002,
-    INPUT_POINT_SIZE   = 0x0004,
-    INPUT_FONT_WEIGHT  = 0x0008,
-    INPUT_FONT_WIDTH   = 0x0010,
-    INPUT_FONT_SLANT   = 0x0020,
-    INPUT_LINE_SPACING = 0x0040,
-    INPUT_UNDERLINE    = 0x0080,
-    INPUT_SHADOW       = 0x0100,
-    INPUT_EMBOSS       = 0x0200,
-    INPUT_OUTLINE      = 0x0400
+    NONE                = 0x0000,
+    INPUT_COLOR         = 0x0001,
+    INPUT_FONT_FAMILY   = 0x0002,
+    INPUT_POINT_SIZE    = 0x0004,
+    INPUT_FONT_WEIGHT   = 0x0008,
+    INPUT_FONT_WIDTH    = 0x0010,
+    INPUT_FONT_SLANT    = 0x0020,
+    INPUT_LINE_SPACING  = 0x0040,
+    INPUT_UNDERLINE     = 0x0080,
+    INPUT_SHADOW        = 0x0100,
+    INPUT_EMBOSS        = 0x0200,
+    INPUT_OUTLINE       = 0x0400,
+    INPUT_STRIKETHROUGH = 0x0800
   };
 
   InputStyle()
@@ -63,6 +65,7 @@ struct InputStyle
     shadowProperties(),
     embossProperties(),
     outlineProperties(),
+    strikethroughProperties(),
     isDefaultColor(true),
     isFamilyDefined(false),
     isWeightDefined(false),
@@ -73,7 +76,8 @@ struct InputStyle
     isUnderlineDefined(false),
     isShadowDefined(false),
     isEmbossDefined(false),
-    isOutlineDefined(false)
+    isOutlineDefined(false),
+    isStrikethroughDefined(false)
   {
   }
 
@@ -118,6 +122,9 @@ struct InputStyle
 
     isOutlineDefined  = inputStyle.isOutlineDefined;
     outlineProperties = inputStyle.outlineProperties;
+
+    isStrikethroughDefined  = inputStyle.isStrikethroughDefined;
+    strikethroughProperties = inputStyle.strikethroughProperties;
   }
 
   /**
@@ -143,12 +150,13 @@ struct InputStyle
        (weight != inputStyle.weight) ||
        (width != inputStyle.width) ||
        (slant != inputStyle.slant) ||
-       (size != inputStyle.size) ||
-       (lineSpacing != inputStyle.lineSpacing) ||
+       (!Dali::Equals(size, inputStyle.size)) ||
+       (!Dali::Equals(lineSpacing, inputStyle.lineSpacing)) ||
        (underlineProperties != inputStyle.underlineProperties) ||
        (shadowProperties != inputStyle.shadowProperties) ||
        (embossProperties != inputStyle.embossProperties) ||
-       (outlineProperties != inputStyle.outlineProperties))
+       (outlineProperties != inputStyle.outlineProperties) ||
+       (isStrikethroughDefined != inputStyle.isStrikethroughDefined))
     {
       return false;
     }
@@ -180,11 +188,11 @@ struct InputStyle
     {
       mask = static_cast<Mask>(mask | INPUT_FONT_SLANT);
     }
-    if(size != inputStyle.size)
+    if(!Dali::Equals(size, inputStyle.size))
     {
       mask = static_cast<Mask>(mask | INPUT_POINT_SIZE);
     }
-    if(lineSpacing != inputStyle.lineSpacing)
+    if(!Dali::Equals(lineSpacing, inputStyle.lineSpacing))
     {
       mask = static_cast<Mask>(mask | INPUT_LINE_SPACING);
     }
@@ -204,6 +212,10 @@ struct InputStyle
     {
       mask = static_cast<Mask>(mask | INPUT_OUTLINE);
     }
+    if(strikethroughProperties != inputStyle.strikethroughProperties)
+    {
+      mask = static_cast<Mask>(mask | INPUT_STRIKETHROUGH);
+    }
 
     return mask;
   }
@@ -217,10 +229,11 @@ struct InputStyle
 
   float lineSpacing; ///< The line's spacing.
 
-  std::string underlineProperties; ///< The underline properties string.
-  std::string shadowProperties;    ///< The shadow properties string.
-  std::string embossProperties;    ///< The emboss properties string.
-  std::string outlineProperties;   ///< The outline properties string.
+  std::string underlineProperties;     ///< The underline properties string.
+  std::string shadowProperties;        ///< The shadow properties string.
+  std::string embossProperties;        ///< The emboss properties string.
+  std::string outlineProperties;       ///< The outline properties string.
+  std::string strikethroughProperties; ///< The strikethrough properties string.
 
   bool isDefaultColor : 1;  ///< Whether the text's color is the default.
   bool isFamilyDefined : 1; ///< Whether the font's family is defined.
@@ -229,11 +242,12 @@ struct InputStyle
   bool isSlantDefined : 1;  ///< Whether the font's slant is defined.
   bool isSizeDefined : 1;   ///< Whether the font's size is defined.
 
-  bool isLineSpacingDefined : 1; ///< Whether the line spacing is defined.
-  bool isUnderlineDefined : 1;   ///< Whether the underline parameters are defined.
-  bool isShadowDefined : 1;      ///< Whether the shadow parameters are defined.
-  bool isEmbossDefined : 1;      ///< Whether the emboss parameters are defined.
-  bool isOutlineDefined : 1;     ///< Whether the outline parameters are defined.
+  bool isLineSpacingDefined : 1;   ///< Whether the line spacing is defined.
+  bool isUnderlineDefined : 1;     ///< Whether the underline parameters are defined.
+  bool isShadowDefined : 1;        ///< Whether the shadow parameters are defined.
+  bool isEmbossDefined : 1;        ///< Whether the emboss parameters are defined.
+  bool isOutlineDefined : 1;       ///< Whether the outline parameters are defined.
+  bool isStrikethroughDefined : 1; ///< Whether the strikethrough parameters are defined.
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/layouts/layout-engine-helper-functions.cpp b/dali-toolkit/internal/text/layouts/layout-engine-helper-functions.cpp
new file mode 100644
index 0000000..834ee7f
--- /dev/null
+++ b/dali-toolkit/internal/text/layouts/layout-engine-helper-functions.cpp
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/layouts/layout-engine-helper-functions.h>
+
+// INTERNAL INCLUDE
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Layout
+{
+void CalculateGlyphPositionsLTR(const VisualModelPtr&  visualModel,
+                                const LogicalModelPtr& logicalModel,
+                                const float            interGlyphExtraAdvance,
+                                const Length           numberOfGlyphs,
+                                const GlyphIndex       startIndexForGlyph,
+                                const GlyphIndex       startIndexForGlyphPositions,
+                                Vector2*               glyphPositionsBuffer,
+                                float&                 penX)
+{
+  const GlyphInfo* const glyphsBuffer          = visualModel->mGlyphs.Begin();
+  const float            modelCharacterSpacing = visualModel->GetCharacterSpacing();
+  const Character* const textBuffer            = logicalModel->mText.Begin();
+
+  Vector<CharacterIndex>& glyphToCharacterMap       = visualModel->mGlyphsToCharacters;
+  const CharacterIndex*   glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
+
+  // Get the character-spacing runs.
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = visualModel->GetCharacterSpacingGlyphRuns();
+
+  float calculatedAdvance = 0.f;
+
+  for(GlyphIndex i = 0u; i < numberOfGlyphs; ++i)
+  {
+    const GlyphInfo& glyph    = *(glyphsBuffer + startIndexForGlyph + i);
+    Vector2&         position = *(glyphPositionsBuffer + startIndexForGlyphPositions + i);
+
+    position.x = penX + glyph.xBearing;
+    position.y = -glyph.yBearing;
+
+    const float characterSpacing = GetGlyphCharacterSpacing((startIndexForGlyph + i), characterSpacingGlyphRuns, modelCharacterSpacing);
+    calculatedAdvance            = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + (startIndexForGlyph + i)))), characterSpacing, glyph.advance);
+    penX += (calculatedAdvance + interGlyphExtraAdvance);
+  }
+}
+
+void CalculateGlyphPositionsRTL(const VisualModelPtr&            visualModel,
+                                const LogicalModelPtr&           logicalModel,
+                                const BidirectionalLineRunIndex& bidiLineIndex,
+                                const GlyphIndex&                startGlyphIndex,
+                                Vector2*                         glyphPositionsBuffer,
+                                CharacterIndex&                  characterVisualIndex,
+                                CharacterIndex&                  characterLogicalIndex,
+                                float&                           penX)
+{
+  const Character* const          textBuffer               = logicalModel->mText.Begin();
+  const BidirectionalLineInfoRun& bidiLine                 = logicalModel->mBidirectionalLineInfo[bidiLineIndex];
+  const GlyphInfo* const          glyphsBuffer             = visualModel->mGlyphs.Begin();
+  const GlyphIndex* const         charactersToGlyphsBuffer = visualModel->mCharactersToGlyph.Begin();
+  const float                     modelCharacterSpacing    = visualModel->GetCharacterSpacing();
+
+  // Get the character-spacing runs.
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = visualModel->GetCharacterSpacingGlyphRuns();
+
+  float calculatedAdvance = 0.f;
+
+  while(TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex)))
+  {
+    const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
+    const GlyphInfo& glyph      = *(glyphsBuffer + glyphIndex);
+
+    Vector2& position = *(glyphPositionsBuffer + static_cast<std::size_t>(glyphIndex - startGlyphIndex));
+    position.x        = penX;
+    position.y        = -glyph.yBearing;
+
+    const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+    calculatedAdvance            = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, glyph.advance);
+    penX += calculatedAdvance;
+
+    ++characterLogicalIndex;
+    characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
+  }
+}
+
+void TraversesCharactersForGlyphPositionsRTL(const VisualModelPtr&  visualModel,
+                                             const Character* const textBuffer,
+                                             const GlyphIndex&      startGlyphIndex,
+                                             const float            interGlyphExtraAdvance,
+                                             const CharacterRun&    bidiLineCharacterRun,
+                                             CharacterIndex*        bidiLineVisualToLogicalMap,
+                                             Vector2*               glyphPositionsBuffer,
+                                             CharacterIndex&        characterLogicalIndex,
+                                             float&                 penX)
+{
+  const GlyphInfo* const  glyphsBuffer             = visualModel->mGlyphs.Begin();
+  const GlyphIndex* const charactersToGlyphsBuffer = visualModel->mCharactersToGlyph.Begin();
+  const float             modelCharacterSpacing    = visualModel->GetCharacterSpacing();
+  const Length* const     glyphsPerCharacterBuffer = visualModel->mGlyphsPerCharacter.Begin();
+
+  // Get the character-spacing runs.
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = visualModel->GetCharacterSpacingGlyphRuns();
+
+  float calculatedAdvance = 0.f;
+
+  for(; characterLogicalIndex < bidiLineCharacterRun.numberOfCharacters;
+      ++characterLogicalIndex)
+  {
+    // Convert the character in the logical order into the character in the visual order.
+    const CharacterIndex characterVisualIndex = bidiLineCharacterRun.characterIndex + *(bidiLineVisualToLogicalMap + characterLogicalIndex);
+
+    // Get the number of glyphs of the character.
+    const Length numberOfGlyphs = *(glyphsPerCharacterBuffer + characterVisualIndex);
+
+    for(GlyphIndex index = 0u; index < numberOfGlyphs; ++index)
+    {
+      // Convert the character in the visual order into the glyph in the visual order.
+      const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex) + index;
+
+      DALI_ASSERT_DEBUG(glyphIndex < visualModel->mGlyphs.Count());
+
+      const GlyphInfo& glyph    = *(glyphsBuffer + glyphIndex);
+      Vector2&         position = *(glyphPositionsBuffer + static_cast<std::size_t>(glyphIndex - startGlyphIndex));
+
+      position.x = penX + glyph.xBearing;
+      position.y = -glyph.yBearing;
+
+      const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+      calculatedAdvance            = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, glyph.advance);
+      penX += (calculatedAdvance + interGlyphExtraAdvance);
+    }
+  }
+}
+
+} // namespace Layout
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/layouts/layout-engine-helper-functions.h b/dali-toolkit/internal/text/layouts/layout-engine-helper-functions.h
new file mode 100644
index 0000000..0d0e362
--- /dev/null
+++ b/dali-toolkit/internal/text/layouts/layout-engine-helper-functions.h
@@ -0,0 +1,106 @@
+#ifndef DALI_TOOLKIT_TEXT_LAYOUT_ENGINE_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_LAYOUT_ENGINE_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDE
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/visual-model-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Layout
+{
+/**
+   * @brief Calculate glyph positions when set glyph positions for left to right.
+   *
+   * @param[in] visualModel The visual model.
+   * @param[in] logicalModel The logical model.
+   * @param[in] interGlyphExtraAdvance Extra advance added to each glyph.
+   * @param[in] numberOfGlyphs The number of glyphs.
+   * @param[in] startIndexForGlyph The index of the first glyph in the line.
+   * @param[in] startIndexForGlyphPositions The index of the first glyph for GlyphPositions.
+   * @param[in,out] glyphPositionsBuffer The glyph positions buffer.
+   * @param[in,out] penX The current position for the horizontal pen.
+   */
+void CalculateGlyphPositionsLTR(const VisualModelPtr&  visualModel,
+                                const LogicalModelPtr& logicalModel,
+                                const float            interGlyphExtraAdvance,
+                                const Length           numberOfGlyphs,
+                                const GlyphIndex       startIndexForGlyph,
+                                const GlyphIndex       startIndexForGlyphPositions,
+                                Vector2*               glyphPositionsBuffer,
+                                float&                 penX);
+
+/**
+   * @brief Calculate glyph positions when set glyph positions for right to left.
+   *
+   * @param[in] visualModel The visual model.
+   * @param[in] logicalModel The logical model.
+   * @param[in] bidiLineIndex Index to the line's bidirectional info.
+   * @param[in] startGlyphIndex The index of the first glyph in the line.
+   * @param[in,out] glyphPositionsBuffer The glyph positions buffer.
+   * @param[in] characterVisualIndex The character visual index.
+   * @param[in] characterLogicalIndex The character logical index.
+   * @param[in,out] penX The current position for the horizontal pen.
+   */
+void CalculateGlyphPositionsRTL(const VisualModelPtr&            visualModel,
+                                const LogicalModelPtr&           logicalModel,
+                                const BidirectionalLineRunIndex& bidiLineIndex,
+                                const GlyphIndex&                startGlyphIndex,
+                                Vector2*                         glyphPositionsBuffer,
+                                CharacterIndex&                  characterVisualIndex,
+                                CharacterIndex&                  characterLogicalIndex,
+                                float&                           penX);
+
+/**
+   * @brief Calculate glyph positions when set glyph positions for right to left.
+   *
+   * @param[in] visualModel The visual model.
+   * @param[in] textBuffer The text buffer.
+   * @param[in] startGlyphIndex The index of the first glyph in the line.
+   * @param[in] interGlyphExtraAdvance Extra advance added to each glyph.
+   * @param[in] bidiLineCharacterRun The initial character index within the whole text and the number of characters of the run for BidirectionalLine.
+   * @param[in] bidiLineVisualToLogicalMap Pointer to the visual to logical map table for BidirectionalLine.
+   * @param[in,out] glyphPositionsBuffer The glyph positions buffer.
+   * @param[in,out] characterLogicalIndex The character logical index.
+   * @param[in,out] penX The current position for the horizontal pen.
+   */
+void TraversesCharactersForGlyphPositionsRTL(const VisualModelPtr&  visualModel,
+                                             const Character* const textBuffer,
+                                             const GlyphIndex&      startGlyphIndex,
+                                             const float            interGlyphExtraAdvance,
+                                             const CharacterRun&    bidiLineCharacterRun,
+                                             CharacterIndex*        bidiLineVisualToLogicalMap,
+                                             Vector2*               glyphPositionsBuffer,
+                                             CharacterIndex&        characterLogicalIndex,
+                                             float&                 penX);
+
+} // namespace Layout
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_LAYOUT_ENGINE_HELPER_FUNCTIONS_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index 695d950..e78a544 100644
--- a/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,9 @@
 #include <dali-toolkit/internal/text/bidirectional-support.h>
 #include <dali-toolkit/internal/text/cursor-helper-functions.h>
 #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine-helper-functions.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
 
 namespace Dali
 {
@@ -36,12 +38,20 @@ namespace Toolkit
 {
 namespace Text
 {
-float GetLineHeight(const LineRun lineRun)
+float GetLineHeight(const LineRun lineRun, bool isLastLine)
 {
   // The line height is the addition of the line ascender, the line descender and the line spacing.
   // However, the line descender has a negative value, hence the subtraction.
-  return lineRun.ascender - lineRun.descender + lineRun.lineSpacing;
+  // In case this is the only/last line then line spacing should be ignored.
+  float lineHeight = lineRun.ascender - lineRun.descender;
+
+  if(!isLastLine || lineRun.lineSpacing > 0)
+  {
+    lineHeight += lineRun.lineSpacing;
+  }
+  return lineHeight;
 }
+
 namespace Layout
 {
 namespace
@@ -50,12 +60,13 @@ namespace
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_LAYOUT");
 #endif
 
-const float              MAX_FLOAT      = std::numeric_limits<float>::max();
-const CharacterDirection LTR            = false;
-const CharacterDirection RTL            = !LTR;
-const float              LINE_SPACING   = 0.f;
-const float              MIN_LINE_SIZE  = 0.f;
-const Character          HYPHEN_UNICODE = 0x002D;
+const float              MAX_FLOAT          = std::numeric_limits<float>::max();
+const CharacterDirection LTR                = false;
+const CharacterDirection RTL                = !LTR;
+const float              LINE_SPACING       = 0.f;
+const float              MIN_LINE_SIZE      = 0.f;
+const Character          HYPHEN_UNICODE     = 0x002D;
+const float              RELATIVE_LINE_SIZE = 1.f;
 
 inline bool isEmptyLineAtLast(const Vector<LineRun>& lines, const Vector<LineRun>::Iterator& line)
 {
@@ -86,7 +97,8 @@ struct LineLayout
     glyphIndexInSecondHalfLine{0u},
     characterIndexInSecondHalfLine{0u},
     numberOfGlyphsInSecondHalfLine{0u},
-    numberOfCharactersInSecondHalfLine{0u}
+    numberOfCharactersInSecondHalfLine{0u},
+    relativeLineSize{1.0f}
 
   {
   }
@@ -109,6 +121,7 @@ struct LineLayout
     characterIndexInSecondHalfLine     = 0u;
     numberOfGlyphsInSecondHalfLine     = 0u;
     numberOfCharactersInSecondHalfLine = 0u;
+    relativeLineSize                   = 1.0f;
   }
 
   GlyphIndex         glyphIndex;                ///< Index of the first glyph to be laid-out.
@@ -129,6 +142,8 @@ struct LineLayout
   CharacterIndex characterIndexInSecondHalfLine;     ///< Index of the first character to be laid-out for the second half of line.
   Length         numberOfGlyphsInSecondHalfLine;     ///< The number of glyph which fit in one line for the second half of line.
   Length         numberOfCharactersInSecondHalfLine; ///< The number of characters which fit in one line for the second half of line.
+
+  float relativeLineSize; ///< The relative line size to be applied for this line.
 };
 
 struct LayoutBidiParameters
@@ -153,11 +168,56 @@ struct Engine::Impl
   : mLayout{Layout::Engine::SINGLE_LINE_BOX},
     mCursorWidth{0.f},
     mDefaultLineSpacing{LINE_SPACING},
-    mDefaultLineSize{MIN_LINE_SIZE}
+    mDefaultLineSize{MIN_LINE_SIZE},
+    mRelativeLineSize{RELATIVE_LINE_SIZE}
   {
   }
 
   /**
+   * @brief get the line spacing.
+   *
+   * @param[in] textSize The text size.
+   * @param[in] relativeLineSize The relative line size to be applied.
+   * @return the line spacing value.
+   */
+  float GetLineSpacing(float textSize, float relativeLineSize)
+  {
+    float lineSpacing;
+    float relTextSize;
+
+    // Sets the line size
+    lineSpacing = mDefaultLineSize - textSize;
+    lineSpacing = lineSpacing < 0.f ? 0.f : lineSpacing;
+
+    // Add the line spacing
+    lineSpacing += mDefaultLineSpacing;
+
+    //subtract line spcaing if relativeLineSize < 1 & larger than min height
+    relTextSize = textSize * relativeLineSize;
+    if(relTextSize > mDefaultLineSize)
+    {
+      if(relativeLineSize < 1)
+      {
+        //subtract the difference (always will be positive)
+        lineSpacing -= (textSize - relTextSize);
+      }
+      else
+      {
+        //reverse the addition in the top.
+        if(mDefaultLineSize > textSize)
+        {
+          lineSpacing -= mDefaultLineSize - textSize;
+        }
+
+        //add difference instead
+        lineSpacing += relTextSize - textSize;
+      }
+    }
+
+    return lineSpacing;
+  }
+
+  /**
    * @brief Updates the line ascender and descender with the metrics of a new font.
    *
    * @param[in] glyphMetrics The metrics of the new font.
@@ -185,12 +245,7 @@ struct Engine::Impl
     // Sets the minimum descender.
     lineLayout.descender = std::min(lineLayout.descender, fontMetrics.descender);
 
-    // Sets the line size
-    lineLayout.lineSpacing = mDefaultLineSize - (lineLayout.ascender + -lineLayout.descender);
-    lineLayout.lineSpacing = lineLayout.lineSpacing < 0.f ? 0.f : lineLayout.lineSpacing;
-
-    // Add the line spacing
-    lineLayout.lineSpacing += mDefaultLineSpacing;
+    lineLayout.lineSpacing = GetLineSpacing(lineLayout.ascender + -lineLayout.descender, lineLayout.relativeLineSize);
   }
 
   /**
@@ -250,10 +305,16 @@ struct Engine::Impl
 
     const float      outlineWidth                = static_cast<float>(parameters.textModel->GetOutlineWidth());
     const GlyphIndex lastGlyphOfParagraphPlusOne = parameters.startGlyphIndex + parameters.numberOfGlyphs;
+    const float      modelCharacterSpacing       = parameters.textModel->mVisualModel->GetCharacterSpacing();
+
+    // Get the character-spacing runs.
+    const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = parameters.textModel->mVisualModel->GetCharacterSpacingGlyphRuns();
 
     CharacterIndex characterLogicalIndex = 0u;
     CharacterIndex characterVisualIndex  = 0u;
 
+    float calculatedAdvance = 0.f;
+
     // If there are characters in the second half of Line then the first visual index mapped from visualToLogicalMapSecondHalf
     // Otherwise maps the first visual index from visualToLogicalMap.
     // This is to initialize the first visual index.
@@ -278,7 +339,9 @@ struct Engine::Impl
         {
           const GlyphInfo& glyphInfo = *(glyphsBuffer + *(charactersToGlyphsBuffer + characterVisualIndex));
 
-          whiteSpaceLengthEndOfLine += glyphInfo.advance;
+          const float characterSpacing = GetGlyphCharacterSpacing(characterVisualIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+          calculatedAdvance            = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, glyphInfo.advance);
+          whiteSpaceLengthEndOfLine += calculatedAdvance;
 
           ++characterLogicalIndex;
           characterVisualIndex = bidirectionalLineInfo.characterRunForSecondHalfLine.characterIndex + *(bidirectionalLineInfo.visualToLogicalMapSecondHalf + characterLogicalIndex);
@@ -299,7 +362,9 @@ struct Engine::Impl
         {
           const GlyphInfo& glyphInfo = *(glyphsBuffer + *(charactersToGlyphsBuffer + characterVisualIndex));
 
-          whiteSpaceLengthEndOfLine += glyphInfo.advance;
+          const float characterSpacing = GetGlyphCharacterSpacing(characterVisualIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+          calculatedAdvance            = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, glyphInfo.advance);
+          whiteSpaceLengthEndOfLine += calculatedAdvance;
 
           ++characterLogicalIndex;
           characterVisualIndex = bidirectionalLineInfo.characterRun.characterIndex + *(bidirectionalLineInfo.visualToLogicalMap + characterLogicalIndex);
@@ -316,11 +381,14 @@ struct Engine::Impl
                                                                   charactersPerGlyphBuffer);
 
     GlyphMetrics glyphMetrics;
+    const float  characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+    calculatedAdvance             = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
     GetGlyphsMetrics(glyphIndex,
                      numberOfGLyphsInGroup,
                      glyphMetrics,
                      glyphsBuffer,
-                     mMetrics);
+                     mMetrics,
+                     calculatedAdvance);
 
     float penX = -glyphMetrics.xBearing + mCursorWidth + outlineWidth;
 
@@ -345,11 +413,14 @@ struct Engine::Impl
         characterLogicalIndex += *(charactersPerGlyphBuffer + glyphIndex + numberOfGLyphsInGroup - 1u);
 
         GlyphMetrics glyphMetrics;
+        const float  characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+        calculatedAdvance             = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
         GetGlyphsMetrics(glyphIndex,
                          numberOfGLyphsInGroup,
                          glyphMetrics,
                          glyphsBuffer,
-                         mMetrics);
+                         mMetrics,
+                         calculatedAdvance);
 
         if(isWhiteSpace)
         {
@@ -378,7 +449,16 @@ struct Engine::Impl
           {
             whiteSpaceLengthEndOfLine = 0.f;
           }
-          length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+
+          if(parameters.textModel->mRemoveBackInset)
+          {
+            length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+          }
+          else
+          {
+            length = std::max(length, penX + glyphMetrics.advance);
+          }
+
           penX += (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
         }
       }
@@ -405,11 +485,14 @@ struct Engine::Impl
       characterLogicalIndex += *(charactersPerGlyphBuffer + glyphIndex + numberOfGLyphsInGroup - 1u);
 
       GlyphMetrics glyphMetrics;
+      const float  characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+      calculatedAdvance             = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
       GetGlyphsMetrics(glyphIndex,
                        numberOfGLyphsInGroup,
                        glyphMetrics,
                        glyphsBuffer,
-                       mMetrics);
+                       mMetrics,
+                       calculatedAdvance);
 
       if(isWhiteSpace)
       {
@@ -438,7 +521,15 @@ struct Engine::Impl
         {
           whiteSpaceLengthEndOfLine = 0.f;
         }
-        length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+
+        if(parameters.textModel->mRemoveBackInset)
+        {
+          length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+        }
+        else
+        {
+          length = std::max(length, penX + glyphMetrics.advance);
+        }
         penX += (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
       }
     }
@@ -593,6 +684,7 @@ struct Engine::Impl
    * @param[out] lineLayout The line layout.
    * @param[in] completelyFill Whether to completely fill the line ( even if the last word exceeds the boundaries ).
    * @param[in] ellipsisPosition Where is the location the text elide
+   * @param[in] hiddenInputEnabled Whether the hidden input is enabled.
    */
   void GetLineLayoutForBox(const Parameters&                 parameters,
                            LayoutBidiParameters&             bidiParameters,
@@ -600,7 +692,8 @@ struct Engine::Impl
                            bool                              completelyFill,
                            DevelText::EllipsisPosition::Type ellipsisPosition,
                            bool                              enforceEllipsisInSingleLine,
-                           bool                              elideTextEnabled)
+                           bool                              elideTextEnabled,
+                           bool                              hiddenInputEnabled)
   {
     DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->GetLineLayoutForBox\n");
     DALI_LOG_INFO(gLogFilter, Debug::Verbose, "  initial glyph index : %d\n", lineLayout.glyphIndex);
@@ -639,13 +732,24 @@ struct Engine::Impl
     float widthFirstHalf = ((ellipsisPosition != DevelText::EllipsisPosition::MIDDLE) ? targetWidth : targetWidth - std::floor(targetWidth / 2));
 
     bool isSecondHalf = false;
+    // Character Spacing
+    const float             modelCharacterSpacing     = parameters.textModel->mVisualModel->GetCharacterSpacing();
+    float                   calculatedAdvance         = 0.f;
+    Vector<CharacterIndex>& glyphToCharacterMap       = parameters.textModel->mVisualModel->mGlyphsToCharacters;
+    const CharacterIndex*   glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
+
+    // Get the character-spacing runs.
+    const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = parameters.textModel->mVisualModel->GetCharacterSpacingGlyphRuns();
 
     GlyphMetrics glyphMetrics;
+    const float  characterSpacing = GetGlyphCharacterSpacing(lineLayout.glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+    calculatedAdvance             = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + lineLayout.glyphIndex))), characterSpacing, (*(glyphsBuffer + lineLayout.glyphIndex)).advance);
     GetGlyphsMetrics(lineLayout.glyphIndex,
                      numberOfGLyphsInGroup,
                      glyphMetrics,
                      glyphsBuffer,
-                     mMetrics);
+                     mMetrics,
+                     calculatedAdvance);
 
     // Set the direction of the first character of the line.
     lineLayout.characterIndex = *(glyphsToCharactersBuffer + lineLayout.glyphIndex);
@@ -658,7 +762,14 @@ struct Engine::Impl
     // The initial start point is zero. However it needs a correction according the 'x' bearing of the first glyph.
     // i.e. if the bearing of the first glyph is negative it may exceed the boundaries of the text area.
     // It needs to add as well space for the cursor if the text is in edit mode and extra space in case the text is outlined.
-    tmpLineLayout.penX = -glyphMetrics.xBearing + mCursorWidth + outlineWidth;
+
+    tmpLineLayout.penX = mCursorWidth + outlineWidth;
+    if(parameters.textModel->mRemoveFrontInset)
+    {
+      tmpLineLayout.penX -= glyphMetrics.xBearing;
+    }
+
+    tmpLineLayout.relativeLineSize = lineLayout.relativeLineSize;
 
     // Calculate the line height if there is no characters.
     FontId lastFontId = glyphMetrics.fontId;
@@ -680,11 +791,14 @@ struct Engine::Impl
                                                                     charactersPerGlyphBuffer);
 
       GlyphMetrics glyphMetrics;
+      const float  characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+      calculatedAdvance             = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + glyphIndex))), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
       GetGlyphsMetrics(glyphIndex,
                        numberOfGLyphsInGroup,
                        glyphMetrics,
                        glyphsBuffer,
-                       mMetrics);
+                       mMetrics,
+                       calculatedAdvance);
 
       const bool isLastGlyph = glyphIndex + numberOfGLyphsInGroup == totalNumberOfGlyphs;
 
@@ -736,17 +850,28 @@ struct Engine::Impl
       const float previousTmpLength                    = tmpLineLayout.length;
       const float previousTmpWhiteSpaceLengthEndOfLine = tmpLineLayout.whiteSpaceLengthEndOfLine;
 
-      if(isWhiteSpace)
+      // The calculated text size is used in atlas renderer.
+      // When the text is all white space, partial render issue occurs because the width is 0.
+      // To avoid issue, do not remove the white space size in hidden input mode.
+      if(isWhiteSpace && !hiddenInputEnabled)
       {
         // Add the length to the length of white spaces at the end of the line.
-        tmpLineLayout.whiteSpaceLengthEndOfLine += glyphMetrics.advance; // The advance is used as the width is always zero for the white spaces.
+        tmpLineLayout.whiteSpaceLengthEndOfLine += glyphMetrics.advance;
+        // The advance is used as the width is always zero for the white spaces.
       }
       else
       {
         tmpLineLayout.penX += tmpLineLayout.previousAdvance + tmpLineLayout.whiteSpaceLengthEndOfLine;
         tmpLineLayout.previousAdvance = (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
 
-        tmpLineLayout.length = std::max(tmpLineLayout.length, tmpLineLayout.penX + glyphMetrics.xBearing + glyphMetrics.width);
+        if(parameters.textModel->mRemoveBackInset)
+        {
+          tmpLineLayout.length = std::max(tmpLineLayout.length, tmpLineLayout.penX + glyphMetrics.xBearing + glyphMetrics.width);
+        }
+        else
+        {
+          tmpLineLayout.length = std::max(tmpLineLayout.length, tmpLineLayout.penX + glyphMetrics.advance);
+        }
 
         // Clear the white space length at the end of the line.
         tmpLineLayout.whiteSpaceLengthEndOfLine = 0.f;
@@ -777,11 +902,14 @@ struct Engine::Impl
         while(tmpLineLayout.length + tmpLineLayout.whiteSpaceLengthEndOfLine > targetWidth && glyphIndexToRemove < glyphIndex)
         {
           GlyphMetrics glyphMetrics;
+          const float  characterSpacing = GetGlyphCharacterSpacing(glyphIndexToRemove, characterSpacingGlyphRuns, modelCharacterSpacing);
+          calculatedAdvance             = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + glyphIndexToRemove))), characterSpacing, (*(glyphsBuffer + glyphIndexToRemove)).advance);
           GetGlyphsMetrics(glyphIndexToRemove,
                            numberOfGLyphsInGroup,
                            glyphMetrics,
                            glyphsBuffer,
-                           mMetrics);
+                           mMetrics,
+                           calculatedAdvance);
 
           const Length numberOfGLyphsInGroup = GetNumberOfGlyphsOfGroup(glyphIndexToRemove,
                                                                         lastGlyphOfParagraphPlusOne,
@@ -813,7 +941,7 @@ struct Engine::Impl
             tmpLineLayout.numberOfGlyphs -= numberOfGLyphsInGroup;
           }
 
-          if(isRemovedGlyphWhiteSpace)
+          if(isRemovedGlyphWhiteSpace && !hiddenInputEnabled)
           {
             tmpLineLayout.penX -= glyphMetrics.advance;
             tmpLineLayout.length -= glyphMetrics.advance;
@@ -1006,35 +1134,36 @@ struct Engine::Impl
     // If it has a negative x bearing, it will exceed the boundaries of the actor,
     // so the penX position needs to be moved to the right.
     const GlyphInfo& glyph = *(glyphsBuffer + startIndexForGlyph);
-    float            penX  = -glyph.xBearing + mCursorWidth + outlineWidth; //
+    float            penX  = mCursorWidth + outlineWidth; //
 
-    for(GlyphIndex i = 0u; i < numberOfGlyphs; ++i)
+    if(layoutParameters.textModel->mRemoveFrontInset)
     {
-      const GlyphInfo& glyph    = *(glyphsBuffer + startIndexForGlyph + i);
-      Vector2&         position = *(glyphPositionsBuffer + startIndexForGlyphPositions + i);
-
-      position.x = penX + glyph.xBearing;
-      position.y = -glyph.yBearing;
-
-      penX += (glyph.advance + interGlyphExtraAdvance);
+      penX -= glyph.xBearing;
     }
 
+    CalculateGlyphPositionsLTR(layoutParameters.textModel->mVisualModel,
+                               layoutParameters.textModel->mLogicalModel,
+                               interGlyphExtraAdvance,
+                               numberOfGlyphs,
+                               startIndexForGlyph, // startIndexForGlyph is the index of the first glyph in the line
+                               startIndexForGlyphPositions,
+                               glyphPositionsBuffer,
+                               penX);
+
     if(layout.isSplitToTwoHalves)
     {
       const GlyphIndex startIndexForGlyphInSecondHalf         = layout.glyphIndexInSecondHalfLine;
       const Length     numberOfGlyphsInSecondHalfLine         = layout.numberOfGlyphsInSecondHalfLine;
       const GlyphIndex startIndexForGlyphPositionsnSecondHalf = layout.glyphIndexInSecondHalfLine - layoutParameters.startGlyphIndex;
 
-      for(GlyphIndex i = 0u; i < numberOfGlyphsInSecondHalfLine; ++i)
-      {
-        const GlyphInfo& glyph    = *(glyphsBuffer + startIndexForGlyphInSecondHalf + i);
-        Vector2&         position = *(glyphPositionsBuffer + startIndexForGlyphPositionsnSecondHalf + i);
-
-        position.x = penX + glyph.xBearing;
-        position.y = -glyph.yBearing;
-
-        penX += (glyph.advance + interGlyphExtraAdvance);
-      }
+      CalculateGlyphPositionsLTR(layoutParameters.textModel->mVisualModel,
+                                 layoutParameters.textModel->mLogicalModel,
+                                 interGlyphExtraAdvance,
+                                 numberOfGlyphsInSecondHalfLine,
+                                 startIndexForGlyphInSecondHalf, // startIndexForGlyph is the index of the first glyph in the line
+                                 startIndexForGlyphPositionsnSecondHalf,
+                                 glyphPositionsBuffer,
+                                 penX);
     }
   }
 
@@ -1043,11 +1172,9 @@ struct Engine::Impl
                          LayoutBidiParameters& layoutBidiParameters,
                          const LineLayout&     layout)
   {
-    const Character* const          textBuffer               = layoutParameters.textModel->mLogicalModel->mText.Begin();
     const BidirectionalLineInfoRun& bidiLine                 = layoutParameters.textModel->mLogicalModel->mBidirectionalLineInfo[layoutBidiParameters.bidiLineIndex];
     const GlyphInfo* const          glyphsBuffer             = layoutParameters.textModel->mVisualModel->mGlyphs.Begin();
     const GlyphIndex* const         charactersToGlyphsBuffer = layoutParameters.textModel->mVisualModel->mCharactersToGlyph.Begin();
-    const Length* const             glyphsPerCharacterBuffer = layoutParameters.textModel->mVisualModel->mGlyphsPerCharacter.Begin();
 
     CharacterIndex characterLogicalIndex = 0u;
     CharacterIndex characterVisualIndex  = bidiLine.characterRunForSecondHalfLine.characterIndex + *(bidiLine.visualToLogicalMapSecondHalf + characterLogicalIndex);
@@ -1057,20 +1184,14 @@ struct Engine::Impl
 
     if(layout.isSplitToTwoHalves)
     {
-      while(TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex)))
-      {
-        const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
-        const GlyphInfo& glyph      = *(glyphsBuffer + glyphIndex);
-
-        Vector2& position = *(glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex);
-        position.x        = penX;
-        position.y        = -glyph.yBearing;
-
-        penX += glyph.advance;
-
-        ++characterLogicalIndex;
-        characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
-      }
+      CalculateGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+                                 layoutParameters.textModel->mLogicalModel,
+                                 layoutBidiParameters.bidiLineIndex,
+                                 layoutParameters.startGlyphIndex,
+                                 glyphPositionsBuffer,
+                                 characterVisualIndex,
+                                 characterLogicalIndex,
+                                 penX);
     }
 
     if(characterLogicalIndex == bidiLine.characterRunForSecondHalfLine.numberOfCharacters)
@@ -1079,20 +1200,14 @@ struct Engine::Impl
       characterLogicalIndex = 0u;
       characterVisualIndex  = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
 
-      while(TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex)))
-      {
-        const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
-        const GlyphInfo& glyph      = *(glyphsBuffer + glyphIndex);
-
-        Vector2& position = *(glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex);
-        position.x        = penX;
-        position.y        = -glyph.yBearing;
-
-        penX += glyph.advance;
-
-        ++characterLogicalIndex;
-        characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
-      }
+      CalculateGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+                                 layoutParameters.textModel->mLogicalModel,
+                                 layoutBidiParameters.bidiLineIndex,
+                                 layoutParameters.startGlyphIndex,
+                                 glyphPositionsBuffer,
+                                 characterVisualIndex,
+                                 characterLogicalIndex,
+                                 penX);
     }
 
     const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
@@ -1103,59 +1218,28 @@ struct Engine::Impl
     // Traverses the characters of the right to left paragraph.
     if(layout.isSplitToTwoHalves && !extendedToSecondHalf)
     {
-      for(; characterLogicalIndex < bidiLine.characterRunForSecondHalfLine.numberOfCharacters;
-          ++characterLogicalIndex)
-      {
-        // Convert the character in the logical order into the character in the visual order.
-        const CharacterIndex characterVisualIndex = bidiLine.characterRunForSecondHalfLine.characterIndex + *(bidiLine.visualToLogicalMapSecondHalf + characterLogicalIndex);
-
-        // Get the number of glyphs of the character.
-        const Length numberOfGlyphs = *(glyphsPerCharacterBuffer + characterVisualIndex);
-
-        for(GlyphIndex index = 0u; index < numberOfGlyphs; ++index)
-        {
-          // Convert the character in the visual order into the glyph in the visual order.
-          const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex) + index;
-
-          DALI_ASSERT_DEBUG(glyphIndex < layoutParameters.textModel->mVisualModel->mGlyphs.Count());
-
-          const GlyphInfo& glyph    = *(glyphsBuffer + glyphIndex);
-          Vector2&         position = *(glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex);
-
-          position.x = penX + glyph.xBearing;
-          position.y = -glyph.yBearing;
-
-          penX += (glyph.advance + layoutParameters.interGlyphExtraAdvance);
-        }
-      }
+      TraversesCharactersForGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+                                              layoutParameters.textModel->mLogicalModel->mText.Begin(),
+                                              layoutParameters.startGlyphIndex,
+                                              layoutParameters.interGlyphExtraAdvance,
+                                              bidiLine.characterRunForSecondHalfLine,
+                                              bidiLine.visualToLogicalMapSecondHalf,
+                                              glyphPositionsBuffer,
+                                              characterLogicalIndex,
+                                              penX);
     }
 
     characterLogicalIndex = extendedToSecondHalf ? characterLogicalIndex : 0u;
-    for(; characterLogicalIndex < bidiLine.characterRun.numberOfCharacters;
-        ++characterLogicalIndex)
-    {
-      // Convert the character in the logical order into the character in the visual order.
-      const CharacterIndex characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
-
-      // Get the number of glyphs of the character.
-      const Length numberOfGlyphs = *(glyphsPerCharacterBuffer + characterVisualIndex);
-
-      for(GlyphIndex index = 0u; index < numberOfGlyphs; ++index)
-      {
-        // Convert the character in the visual order into the glyph in the visual order.
-        const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex) + index;
-
-        DALI_ASSERT_DEBUG(glyphIndex < layoutParameters.textModel->mVisualModel->mGlyphs.Count());
-
-        const GlyphInfo& glyph    = *(glyphsBuffer + glyphIndex);
-        Vector2&         position = *(glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex);
 
-        position.x = penX + glyph.xBearing;
-        position.y = -glyph.yBearing;
-
-        penX += (glyph.advance + layoutParameters.interGlyphExtraAdvance);
-      }
-    }
+    TraversesCharactersForGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+                                            layoutParameters.textModel->mLogicalModel->mText.Begin(),
+                                            layoutParameters.startGlyphIndex,
+                                            layoutParameters.interGlyphExtraAdvance,
+                                            bidiLine.characterRun,
+                                            bidiLine.visualToLogicalMap,
+                                            glyphPositionsBuffer,
+                                            characterLogicalIndex,
+                                            penX);
   }
 
   /**
@@ -1202,6 +1286,7 @@ struct Engine::Impl
    * @param[in] penY The vertical layout position.
    * @param[in] currentParagraphDirection The current paragraph's direction.
    * @param[in,out] isAutoScrollEnabled If the isAutoScrollEnabled is true and the height of the text exceeds the boundaries of the control the text is elided and the isAutoScrollEnabled is set to false to disable the autoscroll
+   * @param[in] isHiddenInputEnabled Whether the hidden input is enabled.
    * @param[in] ellipsisPosition Where is the location the text elide
    *
    * return Whether the line is ellipsized.
@@ -1215,21 +1300,31 @@ struct Engine::Impl
                     Length&                           numberOfLines,
                     float                             penY,
                     bool&                             isAutoScrollEnabled,
+                    bool                              isAutoScrollMaxTextureExceeded,
+                    bool                              isHiddenInputEnabled,
                     DevelText::EllipsisPosition::Type ellipsisPosition,
                     bool                              enforceEllipsisInSingleLine)
   {
-    const bool ellipsis    = enforceEllipsisInSingleLine || (isAutoScrollEnabled ? (penY - layout.descender > layoutParameters.boundingBox.height) : ((penY - layout.descender > layoutParameters.boundingBox.height) || ((mLayout == SINGLE_LINE_BOX) && (layout.length > layoutParameters.boundingBox.width))));
+    const bool ellipsis    = enforceEllipsisInSingleLine || (isAutoScrollEnabled ? isAutoScrollMaxTextureExceeded : ((penY - layout.descender > layoutParameters.boundingBox.height) || ((mLayout == SINGLE_LINE_BOX) && (layout.length > layoutParameters.boundingBox.width))));
     const bool isMultiline = !enforceEllipsisInSingleLine && (mLayout == MULTI_LINE_BOX);
     if(ellipsis && (ellipsisPosition == DevelText::EllipsisPosition::END || !isMultiline))
     {
-      isAutoScrollEnabled = false;
-      // Do not layout more lines if ellipsis is enabled.
+      if(penY - layout.descender > layoutParameters.boundingBox.height)
+      {
+        // Even if auto scroll is enabled and text is bigger than max texture size,
+        // if the the height is small, auto scroll should not work.
+        isAutoScrollEnabled = false;
+      }
 
+      // Do not layout more lines if ellipsis is enabled.
       // The last line needs to be completely filled with characters.
       // Part of a word may be used.
 
       LineRun*   lineRun = nullptr;
       LineLayout ellipsisLayout;
+
+      ellipsisLayout.relativeLineSize = layout.relativeLineSize;
+
       if(0u != numberOfLines)
       {
         // Get the last line and layout it again with the 'completelyFill' flag to true.
@@ -1256,7 +1351,8 @@ struct Engine::Impl
                           true,
                           ellipsisPosition,
                           enforceEllipsisInSingleLine,
-                          true);
+                          true,
+                          isHiddenInputEnabled);
 
       if(ellipsisPosition == DevelText::EllipsisPosition::START && !isMultiline)
       {
@@ -1281,7 +1377,16 @@ struct Engine::Impl
       layoutSize.width = layoutParameters.boundingBox.width;
       if(layoutSize.height < Math::MACHINE_EPSILON_1000)
       {
-        layoutSize.height += GetLineHeight(*lineRun);
+        layoutSize.height += GetLineHeight(*lineRun, true);
+      }
+      else
+      {
+        //when we apply ellipsis, the last line should not take negative linespacing into account for layoutSize.height calculation
+        //usually we don't includ it in normal cases using GetLineHeight()
+        if(lineRun->lineSpacing < 0)
+        {
+          layoutSize.height -= lineRun->lineSpacing;
+        }
       }
 
       const Vector<BidirectionalLineInfoRun>& bidirectionalLinesInfo = layoutParameters.textModel->mLogicalModel->mBidirectionalLineInfo;
@@ -1377,10 +1482,7 @@ struct Engine::Impl
     lineRun.direction = layout.direction;
     lineRun.ellipsis  = false;
 
-    lineRun.lineSpacing = mDefaultLineSize - (lineRun.ascender + -lineRun.descender);
-    lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing;
-
-    lineRun.lineSpacing += mDefaultLineSpacing;
+    lineRun.lineSpacing = GetLineSpacing(lineRun.ascender + -lineRun.descender, layout.relativeLineSize);
 
     // Update the actual size.
     if(lineRun.width > layoutSize.width)
@@ -1388,7 +1490,7 @@ struct Engine::Impl
       layoutSize.width = lineRun.width;
     }
 
-    layoutSize.height += GetLineHeight(lineRun);
+    layoutSize.height += GetLineHeight(lineRun, isLastLine);
   }
 
   /**
@@ -1410,6 +1512,12 @@ struct Engine::Impl
   {
     const Vector<GlyphInfo>& glyphs = layoutParameters.textModel->mVisualModel->mGlyphs;
 
+    if(glyphs.Size() == 0u)
+    {
+      // Do nothing.
+      return;
+    }
+
     // Need to add a new line with no characters but with height to increase the layoutSize.height
     const GlyphInfo& glyphInfo = glyphs[glyphs.Count() - 1u];
 
@@ -1434,12 +1542,13 @@ struct Engine::Impl
     lineRun.direction                       = LTR;
     lineRun.ellipsis                        = false;
 
-    lineRun.lineSpacing = mDefaultLineSize - (lineRun.ascender + -lineRun.descender);
-    lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing;
+    BoundedParagraphRun currentParagraphRun;
+    LineLayout          tempLineLayout;
+    (GetBoundedParagraph(layoutParameters.textModel->GetBoundedParagraphRuns(), characterIndex, currentParagraphRun) ? SetRelativeLineSize(&currentParagraphRun, tempLineLayout) : SetRelativeLineSize(nullptr, tempLineLayout));
 
-    lineRun.lineSpacing += mDefaultLineSpacing;
+    lineRun.lineSpacing = GetLineSpacing(lineRun.ascender + -lineRun.descender, tempLineLayout.relativeLineSize);
 
-    layoutSize.height += GetLineHeight(lineRun);
+    layoutSize.height += GetLineHeight(lineRun, true);
   }
 
   /**
@@ -1456,14 +1565,15 @@ struct Engine::Impl
         it != endIt;
         ++it)
     {
-      const LineRun& line = *it;
+      const LineRun& line       = *it;
+      bool           isLastLine = (it + 1 == endIt);
 
       if(line.width > layoutSize.width)
       {
         layoutSize.width = line.width;
       }
 
-      layoutSize.height += GetLineHeight(line);
+      layoutSize.height += GetLineHeight(line, isLastLine);
     }
   }
 
@@ -1496,10 +1606,57 @@ struct Engine::Impl
     }
   }
 
+  /**
+   * @brief Sets the relative line size for the LineLayout
+   *
+   * @param[in] currentParagraphRun Contains the bounded paragraph for this line layout.
+   * @param[in,out] lineLayout The line layout to be updated.
+   */
+  void SetRelativeLineSize(BoundedParagraphRun* currentParagraphRun, LineLayout& lineLayout)
+  {
+    lineLayout.relativeLineSize = mRelativeLineSize;
+
+    if(currentParagraphRun != nullptr && currentParagraphRun->relativeLineSizeDefined)
+    {
+      lineLayout.relativeLineSize = currentParagraphRun->relativeLineSize;
+    }
+  }
+
+  /**
+   * @brief Get the bounded paragraph for the characterIndex if exists.
+   *
+   * @param[in] boundedParagraphRuns The bounded paragraph list to search in.
+   * @param[in] characterIndex The character index to get bounded paragraph for.
+   * @param[out] currentParagraphRun Contains the bounded paragraph if found for the characterIndex.
+   *
+   * @return returns true if a bounded paragraph was found.
+   */
+  bool GetBoundedParagraph(const Vector<BoundedParagraphRun> boundedParagraphRuns, CharacterIndex characterIndex, BoundedParagraphRun& currentParagraphRun)
+  {
+    for(Vector<BoundedParagraphRun>::Iterator it    = boundedParagraphRuns.Begin(),
+                                              endIt = boundedParagraphRuns.End();
+        it != endIt;
+        ++it)
+    {
+      BoundedParagraphRun& tempParagraphRun = *it;
+
+      if(characterIndex >= tempParagraphRun.characterRun.characterIndex &&
+         characterIndex < (tempParagraphRun.characterRun.characterIndex + tempParagraphRun.characterRun.numberOfCharacters))
+      {
+        currentParagraphRun = tempParagraphRun;
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   bool LayoutText(Parameters&                       layoutParameters,
                   Size&                             layoutSize,
                   bool                              elideTextEnabled,
                   bool&                             isAutoScrollEnabled,
+                  bool                              isAutoScrollMaxTextureExceeded,
+                  bool                              isHiddenInputEnabled,
                   DevelText::EllipsisPosition::Type ellipsisPosition)
   {
     DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->LayoutText\n");
@@ -1514,7 +1671,8 @@ struct Engine::Impl
     layoutParameters.textModel->mVisualModel->SetFirstMiddleIndexOfElidedGlyphs(0u);
     layoutParameters.textModel->mVisualModel->SetSecondMiddleIndexOfElidedGlyphs(0u);
 
-    Vector<LineRun>& lines = layoutParameters.textModel->mVisualModel->mLines;
+    Vector<LineRun>&                   lines                = layoutParameters.textModel->mVisualModel->mLines;
+    const Vector<BoundedParagraphRun>& boundedParagraphRuns = layoutParameters.textModel->GetBoundedParagraphRuns();
 
     if(0u == layoutParameters.numberOfGlyphs)
     {
@@ -1574,7 +1732,7 @@ struct Engine::Impl
     // Retrieve BiDi info.
     const bool hasBidiParagraphs = !layoutParameters.textModel->mLogicalModel->mBidirectionalParagraphInfo.Empty();
 
-    const CharacterIndex* const                  glyphsToCharactersBuffer    = hasBidiParagraphs ? layoutParameters.textModel->mVisualModel->mGlyphsToCharacters.Begin() : nullptr;
+    const CharacterIndex* const                  glyphsToCharactersBuffer    = layoutParameters.textModel->mVisualModel->mGlyphsToCharacters.Begin();
     const Vector<BidirectionalParagraphInfoRun>& bidirectionalParagraphsInfo = layoutParameters.textModel->mLogicalModel->mBidirectionalParagraphInfo;
     const Vector<BidirectionalLineInfoRun>&      bidirectionalLinesInfo      = layoutParameters.textModel->mLogicalModel->mBidirectionalLineInfo;
 
@@ -1678,13 +1836,18 @@ struct Engine::Impl
       LineLayout layout;
       layout.direction  = layoutBidiParameters.paragraphDirection;
       layout.glyphIndex = index;
+
+      BoundedParagraphRun currentParagraphRun;
+      (GetBoundedParagraph(boundedParagraphRuns, *(glyphsToCharactersBuffer + index), currentParagraphRun) ? SetRelativeLineSize(&currentParagraphRun, layout) : SetRelativeLineSize(nullptr, layout));
+
       GetLineLayoutForBox(layoutParameters,
                           layoutBidiParameters,
                           layout,
                           false,
                           ellipsisPosition,
                           false,
-                          elideTextEnabled);
+                          elideTextEnabled,
+                          isHiddenInputEnabled);
 
       DALI_LOG_INFO(gLogFilter, Debug::Verbose, "           glyph index %d\n", layout.glyphIndex);
       DALI_LOG_INFO(gLogFilter, Debug::Verbose, "       character index %d\n", layout.characterIndex);
@@ -1692,6 +1855,14 @@ struct Engine::Impl
       DALI_LOG_INFO(gLogFilter, Debug::Verbose, "  number of characters %d\n", layout.numberOfCharacters);
       DALI_LOG_INFO(gLogFilter, Debug::Verbose, "                length %f\n", layout.length);
 
+      CharacterIndex lastCharacterInParagraph = currentParagraphRun.characterRun.characterIndex + currentParagraphRun.characterRun.numberOfCharacters - 1;
+
+      //check if this is the last line in paragraph, if false we should use the default relative line size (the one set using the property)
+      if(lastCharacterInParagraph >= layout.characterIndex && lastCharacterInParagraph < layout.characterIndex + layout.numberOfCharacters)
+      {
+        layout.relativeLineSize = mRelativeLineSize;
+      }
+
       if(0u == layout.numberOfGlyphs + layout.numberOfGlyphsInSecondHalfLine)
       {
         // The width is too small and no characters are laid-out.
@@ -1726,6 +1897,8 @@ struct Engine::Impl
                                 numberOfLines,
                                 penY,
                                 isAutoScrollEnabled,
+                                isAutoScrollMaxTextureExceeded,
+                                isHiddenInputEnabled,
                                 ellipsisPosition,
                                 false);
       }
@@ -1744,6 +1917,8 @@ struct Engine::Impl
                                   numberOfLines,
                                   penY,
                                   isAutoScrollEnabled,
+                                  isAutoScrollMaxTextureExceeded,
+                                  isHiddenInputEnabled,
                                   ellipsisPosition,
                                   true);
         }
@@ -1835,14 +2010,7 @@ struct Engine::Impl
         }
 
         // Updates the vertical pen's position.
-        penY += -layout.descender + layout.lineSpacing + mDefaultLineSpacing;
-        // If there is a defaultLineSize, updates the pen's position.
-        if(mDefaultLineSize > 0.f)
-        {
-          float lineSpacing = mDefaultLineSize - (layout.ascender + -layout.descender);
-          lineSpacing       = lineSpacing < 0.f ? 0.f : lineSpacing;
-          penY += lineSpacing;
-        }
+        penY += -layout.descender + layout.lineSpacing + GetLineSpacing(layout.ascender + -layout.descender, layout.relativeLineSize);
 
         // Increase the glyph index.
         index = nextIndex;
@@ -1867,7 +2035,6 @@ struct Engine::Impl
             linesBuffer[lineIndex].ellipsis = false;
           }
           numberOfLines--;
-          lineIndex++;
         }
         linesBuffer[0u].ellipsis = true;
       }
@@ -2102,6 +2269,7 @@ struct Engine::Impl
   float mDefaultLineSize;
 
   IntrusivePtr<Metrics> mMetrics;
+  float                 mRelativeLineSize;
 };
 
 Engine::Engine()
@@ -2145,12 +2313,16 @@ bool Engine::LayoutText(Parameters&                       layoutParameters,
                         Size&                             layoutSize,
                         bool                              elideTextEnabled,
                         bool&                             isAutoScrollEnabled,
+                        bool                              isAutoScrollMaxTextureExceeded,
+                        bool                              isHiddenInputEnabled,
                         DevelText::EllipsisPosition::Type ellipsisPosition)
 {
   return mImpl->LayoutText(layoutParameters,
                            layoutSize,
                            elideTextEnabled,
                            isAutoScrollEnabled,
+                           isAutoScrollMaxTextureExceeded,
+                           isHiddenInputEnabled,
                            ellipsisPosition);
 }
 
@@ -2193,6 +2365,16 @@ float Engine::GetDefaultLineSize() const
   return mImpl->mDefaultLineSize;
 }
 
+void Engine::SetRelativeLineSize(float relativeLineSize)
+{
+  mImpl->mRelativeLineSize = relativeLineSize;
+}
+
+float Engine::GetRelativeLineSize() const
+{
+  return mImpl->mRelativeLineSize;
+}
+
 } // namespace Layout
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/layouts/layout-engine.h b/dali-toolkit/internal/text/layouts/layout-engine.h
index e11c549..5fa41d6 100644
--- a/dali-toolkit/internal/text/layouts/layout-engine.h
+++ b/dali-toolkit/internal/text/layouts/layout-engine.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_LAYOUT_ENGINE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,6 +107,8 @@ public:
    * @param[out] layoutSize The size of the text after it has been laid-out.
    * @param[in] elideTextEnabled Whether the text elide is enabled.
    * @param[in,out] isAutoScrollEnabled If the isAutoScrollEnabled is true and the height of the text exceeds the boundaries of the control the text is elided and the isAutoScrollEnabled is set to false to disable the autoscroll
+   * @param[in] isAutoScrollMaxTextureExceeded If isAutoScrollMaxTextureExceeded is true, enable ellipsis during auro scroll.
+   * @param[in] isHiddenInputEnabled if isHiddenInputEnabled is true, hidden input feature is enabled.
    * @param[in] ellipsisPosition The location of the text ellipsis
    *
    * @return \e true if the text has been re-laid-out. \e false means the given width is too small to layout even a single character.
@@ -115,6 +117,8 @@ public:
                   Size&                             layoutSize,
                   bool                              elideTextEnabled,
                   bool&                             isAutoScrollEnabled,
+                  bool                              isAutoScrollMaxTextureExceeded,
+                  bool                              isHiddenInputEnabled,
                   DevelText::EllipsisPosition::Type ellipsisPosition);
 
   /**
@@ -166,6 +170,20 @@ public:
    */
   float GetDefaultLineSize() const;
 
+  /**
+   * @brief Sets relative line size to the original line size.
+   *
+   * @param[in] relativeLineSize The relative line size.
+   */
+  void SetRelativeLineSize(float relativeLineSize);
+
+  /**
+   * @brief Retrieves the relative line size.
+   *
+   * @return The relative line size.
+   */
+  float GetRelativeLineSize() const;
+
 private:
   // Undefined
   Engine(const Engine& handle);
diff --git a/dali-toolkit/internal/text/line-helper-functions.cpp b/dali-toolkit/internal/text/line-helper-functions.cpp
new file mode 100644
index 0000000..d2ffcd1
--- /dev/null
+++ b/dali-toolkit/internal/text/line-helper-functions.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/line-helper-functions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+float GetPreOffsetVerticalLineAlignment(const LineRun& line, const DevelText::VerticalLineAlignment::Type& verLineAlign)
+{
+  // Calculate vertical line alignment
+  float offset = 0.0f;
+
+  switch(verLineAlign)
+  {
+    case DevelText::VerticalLineAlignment::TOP:
+    {
+      break;
+    }
+    case DevelText::VerticalLineAlignment::MIDDLE:
+    {
+      offset = line.lineSpacing * 0.5f;
+      break;
+    }
+    case DevelText::VerticalLineAlignment::BOTTOM:
+    {
+      offset = line.lineSpacing;
+      break;
+    }
+  }
+
+  // Apply TOP case when the lineSpacing is less than zero.
+  offset = line.lineSpacing < 0.0f ? 0.0f : offset;
+
+  return offset;
+}
+
+float GetPostOffsetVerticalLineAlignment(const LineRun& line, const DevelText::VerticalLineAlignment::Type& verLineAlign)
+{
+  // Calculate vertical line alignment
+  float offset = 0.0f;
+
+  switch(verLineAlign)
+  {
+    case DevelText::VerticalLineAlignment::TOP:
+    {
+      offset = line.lineSpacing;
+      break;
+    }
+    case DevelText::VerticalLineAlignment::MIDDLE:
+    {
+      offset = line.lineSpacing * 0.5f;
+      break;
+    }
+    case DevelText::VerticalLineAlignment::BOTTOM:
+    {
+      break;
+    }
+  }
+
+  // Apply TOP case when the lineSpacing is less than zero.
+  offset = line.lineSpacing < 0.0f ? line.lineSpacing : offset;
+
+  return offset;
+}
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/line-helper-functions.h b/dali-toolkit/internal/text/line-helper-functions.h
new file mode 100644
index 0000000..ad94086
--- /dev/null
+++ b/dali-toolkit/internal/text/line-helper-functions.h
@@ -0,0 +1,59 @@
+#ifndef DALI_TOOLKIT_TEXT_LINE_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_LINE_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/line-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+  * @brief Retrieves the vertical offset to shift text inside line to up by negative value and to down by positive value.
+  * The shifting depends on the vertical line alignment @p verLineAlign and lineSpacing when the lineSpacing is poistive.
+  * When the lineSpacing is negative then ignore @p verLineAlign
+  * @param[in] line the line.
+  * @param[in] line the line.
+  *
+  * @return The vertical offset before text.
+  */
+float GetPreOffsetVerticalLineAlignment(const LineRun& line, const Dali::Toolkit::DevelText::VerticalLineAlignment::Type& verLineAlign);
+
+/**
+  * @brief Retrieves the vertical offset to shift the next line to up by negative value and to down by positive value.
+  * The shifting depends on the vertical line alignment @p verLineAlign and lineSpacing when the lineSpacing is poistive.
+  * When the lineSpacing is negative then ignore @p verLineAlign
+  * @param[in] line the line.
+  * @param[in] line the line.
+  *
+  * @return The vertical offset after text.
+  */
+float GetPostOffsetVerticalLineAlignment(const LineRun& line, const Dali::Toolkit::DevelText::VerticalLineAlignment::Type& verLineAlign);
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_LINE_HELPER_FUNCTIONS_H
diff --git a/dali-toolkit/internal/text/line-run.h b/dali-toolkit/internal/text/line-run.h
index 52c47a1..5d5b28b 100644
--- a/dali-toolkit/internal/text/line-run.h
+++ b/dali-toolkit/internal/text/line-run.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_LINE_RUN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,8 +52,18 @@ struct LineRun
  * @brief Get the line height for the specified line run.
  *
  * @param[in] lineRun The line runs to get the height for.
+ * @param[in] isLastLine whether this is the last line in the text.
  */
-float GetLineHeight(const LineRun lineRun);
+float GetLineHeight(const LineRun lineRun, bool isLastLine);
+
+/**
+ * @brief Get the line width for the specified line run.
+ * The width in the geometry = glyph.advance, not glyph.width.
+ *
+ * @param[in] lineRun The line runs to get the width for.
+ * @return the width of the line.
+ */
+float GetLineWidth(const LineRun& lineRun);
 
 } // namespace Text
 
diff --git a/dali-toolkit/internal/text/logical-model-impl.cpp b/dali-toolkit/internal/text/logical-model-impl.cpp
index 0de63d5..8502629 100644
--- a/dali-toolkit/internal/text/logical-model-impl.cpp
+++ b/dali-toolkit/internal/text/logical-model-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/text/logical-model-impl.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/bounded-paragraph-helper-functions.h>
 #include <dali-toolkit/internal/text/input-style.h>
 #include <dali-toolkit/internal/text/text-run-container.h>
 
@@ -145,8 +146,8 @@ CharacterIndex LogicalModel::GetLogicalCursorIndex(CharacterIndex visualCursorIn
     // both characters and the direction of the paragraph.
 
     const CharacterIndex previousVisualCursorIndex  = visualCursorIndex - 1u;
-    const CharacterIndex previousLogicalCursorIndex = *(bidirectionalLineInfo->visualToLogicalMap + previousVisualCursorIndex - bidirectionalLineInfo->characterRun.characterIndex) + bidirectionalLineInfo->characterRun.characterIndex;
-    const CharacterIndex currentLogicalCursorIndex  = *(bidirectionalLineInfo->visualToLogicalMap + visualCursorIndex - bidirectionalLineInfo->characterRun.characterIndex) + bidirectionalLineInfo->characterRun.characterIndex;
+    const CharacterIndex previousLogicalCursorIndex = *(bidirectionalLineInfo->visualToLogicalMap + static_cast<std::size_t>(previousVisualCursorIndex - bidirectionalLineInfo->characterRun.characterIndex)) + bidirectionalLineInfo->characterRun.characterIndex;
+    const CharacterIndex currentLogicalCursorIndex  = *(bidirectionalLineInfo->visualToLogicalMap + static_cast<std::size_t>(visualCursorIndex - bidirectionalLineInfo->characterRun.characterIndex)) + bidirectionalLineInfo->characterRun.characterIndex;
 
     const CharacterDirection previousCharacterDirection = *(modelCharacterDirections + previousLogicalCursorIndex);
     const CharacterDirection currentCharacterDirection  = *(modelCharacterDirections + currentLogicalCursorIndex);
@@ -198,7 +199,7 @@ CharacterIndex LogicalModel::GetLogicalCharacterIndex(CharacterIndex visualChara
   // The bidirectional line info.
   const BidirectionalLineInfoRun* const bidirectionalLineInfo = mBidirectionalLineInfo.Begin() + mBidirectionalLineIndex;
 
-  return *(bidirectionalLineInfo->visualToLogicalMap + visualCharacterIndex - bidirectionalLineInfo->characterRun.characterIndex) + bidirectionalLineInfo->characterRun.characterIndex;
+  return *(bidirectionalLineInfo->visualToLogicalMap + static_cast<std::size_t>(visualCharacterIndex - bidirectionalLineInfo->characterRun.characterIndex)) + bidirectionalLineInfo->characterRun.characterIndex;
 }
 
 bool LogicalModel::FetchBidirectionalLineInfo(CharacterIndex characterIndex)
@@ -300,10 +301,18 @@ void LogicalModel::UpdateTextStyleRuns(CharacterIndex index, int numberOfCharact
   // Process the underlined runs.
   Vector<UnderlinedCharacterRun> removedUnderlinedCharacterRuns;
   UpdateCharacterRuns<UnderlinedCharacterRun>(index,
-                                numberOfCharacters,
-                                totalNumberOfCharacters,
-                                mUnderlinedCharacterRuns,
-                                removedUnderlinedCharacterRuns);
+                                              numberOfCharacters,
+                                              totalNumberOfCharacters,
+                                              mUnderlinedCharacterRuns,
+                                              removedUnderlinedCharacterRuns);
+
+  // Process the strikethrough runs.
+  Vector<StrikethroughCharacterRun> removedStrikethroughCharacterRuns;
+  UpdateCharacterRuns<StrikethroughCharacterRun>(index,
+                                                 numberOfCharacters,
+                                                 totalNumberOfCharacters,
+                                                 mStrikethroughCharacterRuns,
+                                                 removedStrikethroughCharacterRuns);
 
   // Process the background color runs.
   Vector<ColorRun> removedBackgroundColorRuns;
@@ -323,6 +332,26 @@ void LogicalModel::UpdateTextStyleRuns(CharacterIndex index, int numberOfCharact
 
   // Free memory allocated for the font family name.
   FreeFontFamilyNames(removedFontDescriptionRuns);
+
+  // Process the bounded paragraph runs
+  MergeBoundedParagraphRunsWhenRemoveCharacters(mText,
+                                                index,
+                                                numberOfCharacters,
+                                                mBoundedParagraphRuns);
+
+  Vector<BoundedParagraphRun> removedBoundedParagraphRuns;
+  UpdateCharacterRuns<BoundedParagraphRun>(index,
+                                           numberOfCharacters,
+                                           totalNumberOfCharacters,
+                                           mBoundedParagraphRuns,
+                                           removedBoundedParagraphRuns);
+
+  Vector<CharacterSpacingCharacterRun> removedCharacterSpacingCharacterRuns;
+  UpdateCharacterRuns<CharacterSpacingCharacterRun>(index,
+                                                    numberOfCharacters,
+                                                    totalNumberOfCharacters,
+                                                    mCharacterSpacingCharacterRuns,
+                                                    removedCharacterSpacingCharacterRuns);
 }
 
 void LogicalModel::RetrieveStyle(CharacterIndex index, InputStyle& style)
@@ -463,6 +492,16 @@ void LogicalModel::ClearFontDescriptionRuns()
   FreeFontFamilyNames(mFontDescriptionRuns);
 }
 
+void LogicalModel::ClearStrikethroughRuns()
+{
+  mStrikethroughCharacterRuns.Clear();
+}
+
+void LogicalModel::ClearUnderlineRuns()
+{
+  mUnderlinedCharacterRuns.Clear();
+}
+
 void LogicalModel::CreateParagraphInfo(CharacterIndex startIndex,
                                        Length         numberOfCharacters)
 {
@@ -509,7 +548,7 @@ void LogicalModel::CreateParagraphInfo(CharacterIndex startIndex,
   if(updateCurrentParagraphs)
   {
     for(Vector<ParagraphRun>::ConstIterator it    = mParagraphInfo.Begin(),
-                                            endIt = mParagraphInfo.Begin() + totalNumberOfParagraphs - numberOfNewParagraphs;
+                                            endIt = mParagraphInfo.Begin() + static_cast<std::size_t>(totalNumberOfParagraphs - numberOfNewParagraphs);
         it != endIt;
         ++it)
     {
@@ -587,6 +626,26 @@ void LogicalModel::FindParagraphs(CharacterIndex             index,
   }
 }
 
+Length LogicalModel::GetNumberOfBoundedParagraphRuns() const
+{
+  return mBoundedParagraphRuns.Count();
+}
+
+const Vector<BoundedParagraphRun>& LogicalModel::GetBoundedParagraphRuns() const
+{
+  return mBoundedParagraphRuns;
+}
+
+Length LogicalModel::GetNumberOfCharacterSpacingCharacterRuns() const
+{
+  return mCharacterSpacingCharacterRuns.Count();
+}
+
+const Vector<CharacterSpacingCharacterRun>& LogicalModel::GetCharacterSpacingCharacterRuns() const
+{
+  return mCharacterSpacingCharacterRuns;
+}
+
 void LogicalModel::ClearEmbeddedImages()
 {
   FreeEmbeddedItems(mEmbeddedItems);
@@ -604,7 +663,11 @@ LogicalModel::~LogicalModel()
 }
 
 LogicalModel::LogicalModel()
-: mBidirectionalLineIndex(0u)
+: mBidirectionalLineIndex(0u),
+  mSpannedTextPlaced(false),
+  mUnderlineRunsUpdated(false),
+  mCharacterSpacingRunsUpdated(false),
+  mStrikethroughRunsUpdated(false)
 {
 }
 
diff --git a/dali-toolkit/internal/text/logical-model-impl.h b/dali-toolkit/internal/text/logical-model-impl.h
index 80a1285..af4510f 100644
--- a/dali-toolkit/internal/text/logical-model-impl.h
+++ b/dali-toolkit/internal/text/logical-model-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_LOGICAL_MODEL_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,12 +27,15 @@
 #include <dali-toolkit/internal/text/anchor.h>
 #include <dali-toolkit/internal/text/bidirectional-line-info-run.h>
 #include <dali-toolkit/internal/text/bidirectional-paragraph-info-run.h>
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/character-spacing-character-run.h>
 #include <dali-toolkit/internal/text/color-run.h>
 #include <dali-toolkit/internal/text/embedded-item.h>
 #include <dali-toolkit/internal/text/font-description-run.h>
 #include <dali-toolkit/internal/text/font-run.h>
 #include <dali-toolkit/internal/text/paragraph-run.h>
 #include <dali-toolkit/internal/text/script-run.h>
+#include <dali-toolkit/internal/text/strikethrough-character-run.h>
 #include <dali-toolkit/internal/text/underlined-character-run.h>
 
 namespace Dali
@@ -152,6 +155,16 @@ public:
    */
   void ClearFontDescriptionRuns();
 
+  /**
+   * @brief Clears the strikethrough runs.
+   */
+  void ClearStrikethroughRuns();
+
+  /**
+   * @brief Clears the underline runs.
+   */
+  void ClearUnderlineRuns();
+
   // Paragraphs
 
   /**
@@ -176,6 +189,34 @@ public:
                       Length                     numberOfCharacters,
                       Vector<ParagraphRunIndex>& paragraphs);
 
+  /**
+   * @brief Retrieves the number of bounded paragraph runs.
+   *
+   * @return The number of bounded paragraph runs.
+   */
+  Length GetNumberOfBoundedParagraphRuns() const;
+
+  /**
+   * @brief Retrieves the reference for bounded paragraph runs.
+   *
+   * @return The reference for bounded paragraph runs.
+   */
+  const Vector<BoundedParagraphRun>& GetBoundedParagraphRuns() const;
+
+  /**
+   * @brief Retrieves the number of character-spacing runs.
+   *
+   * @return The number of character-spacing runs.
+   */
+  Length GetNumberOfCharacterSpacingCharacterRuns() const;
+
+  /**
+   * @brief Retrieves the reference for character-spacing runs.
+   *
+   * @return The reference for character-spacing runs.
+   */
+  const Vector<CharacterSpacingCharacterRun>& GetCharacterSpacingCharacterRuns() const;
+
   // Embedded images
 
   /**
@@ -220,9 +261,17 @@ public:
   Vector<BidirectionalLineInfoRun>      mBidirectionalLineInfo;
   Vector<EmbeddedItem>                  mEmbeddedItems;
   Vector<Anchor>                        mAnchors;
-  Vector<UnderlinedCharacterRun>        mUnderlinedCharacterRuns; ///< The underlined character run from markup-processor
+  Vector<UnderlinedCharacterRun>        mUnderlinedCharacterRuns;       ///< The underlined character run from markup-processor
+  Vector<StrikethroughCharacterRun>     mStrikethroughCharacterRuns;    ///< The strikethrough character run from markup-processor
+  Vector<BoundedParagraphRun>           mBoundedParagraphRuns;          ///< The bounded paragraph is used to handle a paragraph mark-up tag and it's attributes. Like TextAlign, TextDirection, TextIndent, LineHeight, etc.
+  Vector<CharacterSpacingCharacterRun>  mCharacterSpacingCharacterRuns; ///< The character-spacing character run from markup-processor.
 
   BidirectionalLineRunIndex mBidirectionalLineIndex; ///< The last fetched bidirectional line info.
+  bool                      mSpannedTextPlaced : 1;  ///< Whether the spanned-text is placed.
+
+  bool mUnderlineRunsUpdated : 1;        /// Whether the UnderlinedCharacterRuns is updated. (Added for SpannedText)
+  bool mCharacterSpacingRunsUpdated : 1; // Flag for updating character-spacing.
+  bool mStrikethroughRunsUpdated : 1;    /// Whether the StrikethroughCharacterRuns is updated. (Added for SpannedText)
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/markup-processor-anchor.cpp b/dali-toolkit/internal/text/markup-processor-anchor.cpp
deleted file mode 100644
index 4c4bb29..0000000
--- a/dali-toolkit/internal/text/markup-processor-anchor.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-anchor.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-#include <memory.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/anchor.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-const std::string XHTML_HREF_ATTRIBUTE("href");
-} // namespace
-
-void ProcessAnchor(const Tag& tag, Anchor& anchor)
-{
-  anchor.href = nullptr;
-
-  for(auto&& attribute : tag.attributes)
-  {
-    if(TokenComparison(XHTML_HREF_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      Length hrefLength = attribute.valueLength + 1;
-      anchor.href       = new char[hrefLength];
-      memcpy(anchor.href, attribute.valueBuffer, hrefLength);
-      anchor.href[hrefLength - 1] = '\0';
-      // The memory is freed when the font run is removed from the logical model.
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor-anchor.h b/dali-toolkit/internal/text/markup-processor-anchor.h
deleted file mode 100644
index 7c1d181..0000000
--- a/dali-toolkit/internal/text/markup-processor-anchor.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ANCHOR_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ANCHOR_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Text
-{
-
-struct Tag;
-struct Anchor;
-
-/**
- * @brief Retrieves the @e anchor from the @p tag.
- *
- * @param[in] tag The anchor tag and its attributes.
- * @param[in,out] anchor The anchor.
- */
-void ProcessAnchor( const Tag& tag, Anchor& anchor );
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ANCHOR_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor-background.cpp b/dali-toolkit/internal/text/markup-processor-background.cpp
deleted file mode 100644
index 8a9910e..0000000
--- a/dali-toolkit/internal/text/markup-processor-background.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-background.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-#include <memory.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/color-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-const std::string XHTML_COLOR_ATTRIBUTE("color");
-} // namespace
-
-void ProcessBackground(const Tag& tag, ColorRun& colorRun)
-{
-  for(auto&& attribute : tag.attributes)
-  {
-    if(TokenComparison(XHTML_COLOR_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, colorRun.color);
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor-background.h b/dali-toolkit/internal/text/markup-processor-background.h
deleted file mode 100644
index 331d2c8..0000000
--- a/dali-toolkit/internal/text/markup-processor-background.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_BACKGROUND_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_BACKGROUND_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Tag;
-struct ColorRun;
-
-/**
- * @brief Retrieves the @e background from the @p tag.
- *
- * @param[in] tag The background tag and its attributes.
- * @param[in,out] colorRun The color run to be filled.
- */
-void ProcessBackground(const Tag& tag, ColorRun& colorRun);
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_BACKGROUND_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor-color.cpp b/dali-toolkit/internal/text/markup-processor-color.cpp
deleted file mode 100644
index d5fce04..0000000
--- a/dali-toolkit/internal/text/markup-processor-color.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-color.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/color-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-const std::string XHTML_VALUE_ATTRIBUTE("value");
-}
-
-void ProcessColor(const Attribute& attribute, ColorRun& colorRun)
-{
-  ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, colorRun.color);
-}
-
-void ProcessColorTag(const Tag& tag, ColorRun& colorRun)
-{
-  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
-                                       endIt = tag.attributes.End();
-      it != endIt;
-      ++it)
-  {
-    const Attribute& attribute(*it);
-    if(TokenComparison(XHTML_VALUE_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      ProcessColor(attribute, colorRun);
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-color.h b/dali-toolkit/internal/text/markup-processor-color.h
deleted file mode 100644
index 02210fb..0000000
--- a/dali-toolkit/internal/text/markup-processor-color.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Tag;
-struct Attribute;
-struct ColorRun;
-
-/**
- * @brief Retrieves the color value from the tag and sets it to the color run.
- *
- * @param[in] attribute the color attribute.
- * @param[in,out] colorRun The color run.
- */
-void ProcessColor(const Attribute& attribute, ColorRun& colorRun);
-
-/**
- * @brief Retrieves the color value from the tag and sets it to the color run.
- *
- * @param[in] tag The color tag and its attributes.
- * @param[in,out] colorRun The color run.
- */
-void ProcessColorTag(const Tag& tag, ColorRun& colorRun);
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H
diff --git a/dali-toolkit/internal/text/markup-processor-embedded-item.cpp b/dali-toolkit/internal/text/markup-processor-embedded-item.cpp
deleted file mode 100644
index 1bfa3f4..0000000
--- a/dali-toolkit/internal/text/markup-processor-embedded-item.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-embedded-item.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-#include <memory.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/embedded-item.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-const std::string XHTML_URL_ATTRIBUTE("url");
-const std::string XHTML_WIDTH_ATTRIBUTE("width");
-const std::string XHTML_HEIGHT_ATTRIBUTE("height");
-const std::string XHTML_COLOR_BLENDING_ATTRIBUTE("color-blending");
-
-const std::string NONE("none");
-const std::string MULTIPLY("multiply");
-} // namespace
-
-void ProcessEmbeddedItem(const Tag& tag, EmbeddedItem& embeddedItem)
-{
-  embeddedItem.url               = nullptr;
-  embeddedItem.urlLength         = 0u;
-  embeddedItem.width             = 0u;
-  embeddedItem.height            = 0u;
-  embeddedItem.colorBlendingMode = ColorBlendingMode::NONE;
-
-  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
-                                       endIt = tag.attributes.End();
-      it != endIt;
-      ++it)
-  {
-    const Attribute& attribute(*it);
-    if(TokenComparison(XHTML_URL_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      embeddedItem.urlLength = attribute.valueLength;
-      embeddedItem.url       = new char[embeddedItem.urlLength];
-      memcpy(embeddedItem.url, attribute.valueBuffer, embeddedItem.urlLength);
-      // The memory is freed when the font run is removed from the logical model.
-    }
-    else if(TokenComparison(XHTML_WIDTH_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      embeddedItem.width = StringToUint(attribute.valueBuffer);
-    }
-    else if(TokenComparison(XHTML_HEIGHT_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      embeddedItem.height = StringToUint(attribute.valueBuffer);
-    }
-    else if(TokenComparison(XHTML_COLOR_BLENDING_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      if(TokenComparison(MULTIPLY, attribute.valueBuffer, attribute.valueLength))
-      {
-        embeddedItem.colorBlendingMode = ColorBlendingMode::MULTIPLY;
-      }
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-embedded-item.h b/dali-toolkit/internal/text/markup-processor-embedded-item.h
deleted file mode 100644
index 1677244..0000000
--- a/dali-toolkit/internal/text/markup-processor-embedded-item.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_EMBEDDED_ITEM_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_EMBEDDED_ITEM_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Tag;
-struct EmbeddedItem;
-
-/**
- * @brief Retrieves the @e embedded @e item from the @p tag.
- *
- * @param[in] tag The embedded item tag and its attributes.
- * @param[in,out] embeddedItem The embedded item.
- */
-void ProcessEmbeddedItem(const Tag& tag, EmbeddedItem& embeddedItem);
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_EMBEDDED_ITEM_H
diff --git a/dali-toolkit/internal/text/markup-processor-font.cpp b/dali-toolkit/internal/text/markup-processor-font.cpp
deleted file mode 100644
index df8b6ec..0000000
--- a/dali-toolkit/internal/text/markup-processor-font.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-font.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-#include <memory.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/font-description-run.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-#include <dali-toolkit/internal/text/text-font-style.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-const std::string XHTML_FAMILY_ATTRIBUTE("family");
-const std::string XHTML_SIZE_ATTRIBUTE("size");
-const std::string XHTML_WEIGHT_ATTRIBUTE("weight");
-const std::string XHTML_WIDTH_ATTRIBUTE("width");
-const std::string XHTML_SLANT_ATTRIBUTE("slant");
-
-const std::string  FONT_PREFIX("font-");
-const unsigned int FONT_PREFIX_LENGTH      = 5u;
-const unsigned int MIN_FONT_ATTRIBUTE_SIZE = 4u;   ///< The minimum length of any of the possible 'weight', 'width' , 'slant' or 'size' values.
-const unsigned int MAX_FONT_ATTRIBUTE_SIZE = 15u;  ///< The maximum length of any of the possible 'weight', 'width' or 'slant' values.
-const float        PIXEL_FORMAT_64_FACTOR  = 64.f; ///< 64.f is used to convert from point size to 26.6 pixel format.
-} // namespace
-
-void processFontAttributeValue(char value[], const Attribute& attribute)
-{
-  // The StringToWeight() uses the Scripting::GetEnumeration() function which requires the input string to end with a '\0' char.
-  const Length length = attribute.valueLength > MAX_FONT_ATTRIBUTE_SIZE ? MAX_FONT_ATTRIBUTE_SIZE : attribute.valueLength;
-  memcpy(value, attribute.valueBuffer, length);
-  value[length] = 0;
-}
-
-void ProcessFontFamily(const Attribute& attribute, FontDescriptionRun& fontRun)
-{
-  fontRun.familyDefined = true;
-  fontRun.familyLength  = attribute.valueLength;
-  fontRun.familyName    = new char[fontRun.familyLength];
-  memcpy(fontRun.familyName, attribute.valueBuffer, fontRun.familyLength);
-  // The memory is freed when the font run is removed from the logical model.
-}
-
-void ProcessFontSize(const Attribute& attribute, FontDescriptionRun& fontRun)
-{
-  // 64.f is used to convert from point size to 26.6 pixel format.
-  fontRun.size        = static_cast<PointSize26Dot6>(StringToFloat(attribute.valueBuffer) * PIXEL_FORMAT_64_FACTOR);
-  fontRun.sizeDefined = true;
-}
-
-void ProcessFontWeight(const Attribute& attribute, FontDescriptionRun& fontRun)
-{
-  char value[MAX_FONT_ATTRIBUTE_SIZE + 1u];
-  processFontAttributeValue(value, attribute);
-
-  fontRun.weight        = StringToWeight(value);
-  fontRun.weightDefined = true;
-}
-
-void ProcessFontWidth(const Attribute& attribute, FontDescriptionRun& fontRun)
-{
-  char value[MAX_FONT_ATTRIBUTE_SIZE + 1u];
-  processFontAttributeValue(value, attribute);
-
-  fontRun.width        = StringToWidth(value);
-  fontRun.widthDefined = true;
-}
-
-void ProcessFontSlant(const Attribute& attribute, FontDescriptionRun& fontRun)
-{
-  char value[MAX_FONT_ATTRIBUTE_SIZE + 1u];
-  processFontAttributeValue(value, attribute);
-
-  fontRun.slant        = StringToSlant(value);
-  fontRun.slantDefined = true;
-}
-
-void ProcessFontTag(const Tag& tag, FontDescriptionRun& fontRun)
-{
-  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
-                                       endIt = tag.attributes.End();
-      it != endIt;
-      ++it)
-  {
-    const Attribute& attribute(*it);
-
-    if(TokenComparison(XHTML_FAMILY_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      ProcessFontFamily(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_SIZE_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      ProcessFontSize(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_WEIGHT_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      ProcessFontWeight(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_WIDTH_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      ProcessFontWidth(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_SLANT_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      ProcessFontSlant(attribute, fontRun);
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-font.h b/dali-toolkit/internal/text/markup-processor-font.h
deleted file mode 100644
index 6461451..0000000
--- a/dali-toolkit/internal/text/markup-processor-font.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Tag;
-struct Attribute;
-struct FontDescriptionRun;
-
-/**
- * @brief Retrieves the font attributes from the tag and sets it to the font run.
- *
- * @param[in] tag The font tag and its attributes.
- * @param[in,out] fontRun The font description run.
- */
-void ProcessFontTag(const Tag& tag, FontDescriptionRun& fontRun);
-
-/**
- * @brief Fill the font run with the font slant attribute value.
- *
- * @param[in] attribute the font slant attribute.
- * @param[out] fontRun The font description run.
- */
-void ProcessFontSlant(const Attribute& attribute, FontDescriptionRun& fontRun);
-
-/**
- * @brief Fill the font run with the font width attribute value.
- *
- * @param[in] attribute the font width attribute.
- * @param[out] fontRun The font description run.
- */
-void ProcessFontWidth(const Attribute& attribute, FontDescriptionRun& fontRun);
-
-/**
- * @brief Fill the font run with the font weight attribute value.
- *
- * @param[in] attribute the font weight attribute.
- * @param[out] fontRun The font description run.
- */
-void ProcessFontWeight(const Attribute& attribute, FontDescriptionRun& fontRun);
-
-/**
- * @brief Fill the font run with the font size attribute value.
- *
- * @param[in] attribute the font size attribute.
- * @param[out] fontRun The font description run.
- */
-void ProcessFontSize(const Attribute& attribute, FontDescriptionRun& fontRun);
-
-/**
- * @brief Fill the font run with the font family attribute value.
- *
- * @param[in] attribute the font family attribute.
- * @param[out] fontRun The font description run.
- */
-void ProcessFontFamily(const Attribute& attribute, FontDescriptionRun& fontRun);
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H
diff --git a/dali-toolkit/internal/text/markup-processor-helper-functions.cpp b/dali-toolkit/internal/text/markup-processor-helper-functions.cpp
deleted file mode 100644
index ffa4cce..0000000
--- a/dali-toolkit/internal/text/markup-processor-helper-functions.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/constants.h>
-#include <dali/public-api/math/vector2.h>
-#include <stdlib.h>
-#include <iomanip>
-#include <sstream>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-const char WHITE_SPACE      = 0x20; // ASCII value of the white space.
-const char FIRST_UPPER_CASE = 0x41; // ASCII value of the one after the first upper case character (A).
-const char LAST_UPPER_CASE  = 0x5b; // ASCII value of the one after the last upper case character (Z).
-const char TO_LOWER_CASE    = 32;   // Value to add to a upper case character to transform it into a lower case.
-
-const char        WEB_COLOR_TOKEN('#');
-const char* const HEX_COLOR_TOKEN("0x");
-const char* const ALPHA_ONE("FF");
-
-const std::string BLACK_COLOR("black");
-const std::string WHITE_COLOR("white");
-const std::string RED_COLOR("red");
-const std::string GREEN_COLOR("green");
-const std::string BLUE_COLOR("blue");
-const std::string YELLOW_COLOR("yellow");
-const std::string MAGENTA_COLOR("magenta");
-const std::string CYAN_COLOR("cyan");
-const std::string TRANSPARENT_COLOR("transparent");
-} // namespace
-
-bool TokenComparison(const std::string& string1, const char* const stringBuffer2, Length length)
-{
-  const Length stringSize = string1.size();
-  if(stringSize != length)
-  {
-    // Early return. Strings have different sizes.
-    return false;
-  }
-
-  const char* const stringBuffer1 = string1.c_str();
-
-  for(std::size_t index = 0; index < stringSize; ++index)
-  {
-    const char character = *(stringBuffer2 + index);
-    const bool toLower   = (character < LAST_UPPER_CASE) && (character >= FIRST_UPPER_CASE);
-    if(*(stringBuffer1 + index) != (toLower ? character + TO_LOWER_CASE : character))
-    {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-void SkipWhiteSpace(const char*&      stringBuffer,
-                    const char* const stringEndBuffer)
-{
-  for(; (WHITE_SPACE >= *stringBuffer) && (stringBuffer < stringEndBuffer); ++stringBuffer)
-    ;
-}
-
-void JumpToWhiteSpace(const char*&      stringBuffer,
-                      const char* const stringEndBuffer)
-{
-  for(; (WHITE_SPACE != *stringBuffer) && (stringBuffer < stringEndBuffer); ++stringBuffer)
-    ;
-}
-
-unsigned int StringToUint(const char* const uintStr)
-{
-  return static_cast<unsigned int>(strtoul(uintStr, NULL, 10));
-}
-
-unsigned int StringToHex(const char* const uintStr)
-{
-  return static_cast<unsigned int>(strtoul(uintStr, NULL, 16));
-}
-
-float StringToFloat(const char* const floatStr)
-{
-  return static_cast<float>(strtod(floatStr, NULL));
-}
-
-void FloatToString(float value, std::string& floatStr)
-{
-  std::stringstream ss;
-  ss << value;
-  floatStr = ss.str();
-}
-
-void UintToString(unsigned int value, std::string& uIntStr)
-{
-  std::stringstream ss;
-  ss << value;
-  uIntStr = ss.str();
-}
-
-void UintColorToVector4(unsigned int color, Vector4& retColor)
-{
-  retColor.a = static_cast<float>((color & 0xFF000000) >> 24u) / 255.f;
-  retColor.r = static_cast<float>((color & 0x00FF0000) >> 16u) / 255.f;
-  retColor.g = static_cast<float>((color & 0x0000FF00) >> 8u) / 255.f;
-  retColor.b = static_cast<float>(color & 0x000000FF) / 255.f;
-}
-
-void ColorStringToVector4(const char* const colorStr, Length length, Vector4& retColor)
-{
-  if(WEB_COLOR_TOKEN == *colorStr)
-  {
-    std::string webColor(colorStr + 1u, length - 1u);
-    if(4u == length) // 3 component web color #F00 (red)
-    {
-      webColor.insert(2u, &(webColor[2]), 1u);
-      webColor.insert(1u, &(webColor[1]), 1u);
-      webColor.insert(0u, &(webColor[0]), 1u);
-      webColor.insert(0u, ALPHA_ONE);
-    }
-    else if(7u == length) // 6 component web color #FF0000 (red)
-    {
-      webColor.insert(0u, ALPHA_ONE);
-    }
-
-    UintColorToVector4(StringToHex(webColor.c_str()), retColor);
-  }
-  else if(TokenComparison(HEX_COLOR_TOKEN, colorStr, 2u))
-  {
-    UintColorToVector4(StringToHex(colorStr + 2u), retColor);
-  }
-  else if(TokenComparison(BLACK_COLOR, colorStr, length))
-  {
-    retColor = Color::BLACK;
-  }
-  else if(TokenComparison(WHITE_COLOR, colorStr, length))
-  {
-    retColor = Color::WHITE;
-  }
-  else if(TokenComparison(RED_COLOR, colorStr, length))
-  {
-    retColor = Color::RED;
-  }
-  else if(TokenComparison(GREEN_COLOR, colorStr, length))
-  {
-    retColor = Color::GREEN;
-  }
-  else if(TokenComparison(BLUE_COLOR, colorStr, length))
-  {
-    retColor = Color::BLUE;
-  }
-  else if(TokenComparison(YELLOW_COLOR, colorStr, length))
-  {
-    retColor = Color::YELLOW;
-  }
-  else if(TokenComparison(MAGENTA_COLOR, colorStr, length))
-  {
-    retColor = Color::MAGENTA;
-  }
-  else if(TokenComparison(CYAN_COLOR, colorStr, length))
-  {
-    retColor = Color::CYAN;
-  }
-  else if(TokenComparison(TRANSPARENT_COLOR, colorStr, length))
-  {
-    retColor = Color::TRANSPARENT;
-  }
-}
-
-void Vector4ToColorString(const Vector4& value, std::string& vector2Str)
-{
-  if(Color::BLACK == value)
-  {
-    vector2Str = BLACK_COLOR;
-    return;
-  }
-
-  if(Color::WHITE == value)
-  {
-    vector2Str = WHITE_COLOR;
-    return;
-  }
-
-  if(Color::RED == value)
-  {
-    vector2Str = RED_COLOR;
-    return;
-  }
-
-  if(Color::GREEN == value)
-  {
-    vector2Str = GREEN_COLOR;
-    return;
-  }
-
-  if(Color::BLUE == value)
-  {
-    vector2Str = BLUE_COLOR;
-    return;
-  }
-
-  if(Color::YELLOW == value)
-  {
-    vector2Str = YELLOW_COLOR;
-    return;
-  }
-
-  if(Color::MAGENTA == value)
-  {
-    vector2Str = MAGENTA_COLOR;
-    return;
-  }
-
-  if(Color::CYAN == value)
-  {
-    vector2Str = CYAN_COLOR;
-    return;
-  }
-
-  if(Color::TRANSPARENT == value)
-  {
-    vector2Str = TRANSPARENT_COLOR;
-    return;
-  }
-
-  const unsigned int alpha = static_cast<unsigned int>(255.f * value.a);
-  const unsigned int red   = static_cast<unsigned int>(255.f * value.r);
-  const unsigned int green = static_cast<unsigned int>(255.f * value.g);
-  const unsigned int blue  = static_cast<unsigned int>(255.f * value.b);
-
-  std::stringstream  ss;
-  const unsigned int size = 2u * sizeof(unsigned char);
-
-  ss << "0x"
-     << std::setfill('0') << std::setw(size)
-     << std::hex << alpha
-     << std::setfill('0') << std::setw(size)
-     << std::hex << red
-     << std::setfill('0') << std::setw(size)
-     << std::hex << green
-     << std::setfill('0') << std::setw(size)
-     << std::hex << blue;
-  vector2Str = ss.str();
-}
-
-void StringToVector2(const char* const vectorStr, Length length, Vector2& vector2)
-{
-  // Points to the first character of the string.
-  const char* strBuffer = vectorStr;
-
-  // Points to the first character of the 'x' value.
-  const char* const xBuffer = strBuffer;
-
-  // Jumps to the next white space.
-  JumpToWhiteSpace(strBuffer, strBuffer + length);
-
-  // Points to the first character of the 'y' value.
-  const char* const yBuffer = strBuffer;
-
-  // Converts the shadow's offset to float.
-  vector2.x = StringToFloat(xBuffer);
-  vector2.y = StringToFloat(yBuffer);
-}
-
-void Vector2ToString(const Vector2& value, std::string& vector2Str)
-{
-  FloatToString(value.x, vector2Str);
-  vector2Str += " ";
-
-  std::string yStr;
-  FloatToString(value.y, yStr);
-
-  vector2Str += yStr;
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-helper-functions.h b/dali-toolkit/internal/text/markup-processor-helper-functions.h
deleted file mode 100644
index 490e51f..0000000
--- a/dali-toolkit/internal/text/markup-processor-helper-functions.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-definitions.h>
-
-namespace Dali
-{
-struct Vector2;
-struct Vector4;
-
-namespace Toolkit
-{
-namespace Text
-{
-/**
- * @brief Stores an attribute pair: name, value.
- */
-struct Attribute
-{
-  const char* nameBuffer;
-  const char* valueBuffer;
-  Length      nameLength;
-  Length      valueLength;
-};
-
-/**
- * @brief Stores a tag and its attributes.
- */
-struct Tag
-{
-  Vector<Attribute> attributes;
-  const char*       buffer;
-  Length            length;
-  bool              isEndTag;
-};
-
-/**
- * @brief Compare if two tokens are equal.
- *
- * @pre @p string1 must be lower case. (The html-ish constant tokens)
- * The @p stringBuffer2 parameter is transformed to lower case.
- * This function is used in the mark-up parser.
- * It has no sense to transform the constants html-ish tokens to lower case when
- * it's known they already are.
- *
- * @param[in] string1 The html-ish constant token.
- * @param[in] stringBuffer2 Pointer to the html-ish token buffer.
- * @param[in] length The length of the html-ish token.
- *
- * @return @e true if both strings are equal.
- */
-bool TokenComparison(const std::string& string1, const char* const stringBuffer2, Length length);
-
-/**
- * @brief Skips any unnecessary white space.
- *
- * @param[in,out] stringBuffer The string buffer. It's a const iterator pointing the current character.
- * @param[in] stringEndBuffer Pointer to one character after the end of the string buffer.
- */
-void SkipWhiteSpace(const char*&      stringBuffer,
-                    const char* const stringEndBuffer);
-
-/**
- * @Brief Jumps to the next white space.
- *
- * @param[in,out] stringBuffer The string buffer. It's a const iterator pointing the current character.
- * @param[in] stringEndBuffer Pointer to one character after the end of the string buffer.
- */
-void JumpToWhiteSpace(const char*&      stringBuffer,
-                      const char* const stringEndBuffer);
-
-/**
-* @brief Converts a string into an unsigned int.
-*
-* @param[in] uintStr An unsigned int packed inside a string.
-*
-* @return The unsigned int value.
-*/
-unsigned int StringToUint(const char* const uintStr);
-
-/**
- * @brief Converts a string into an hexadecimal unsigned int.
- *
- * @param[in] uintStr An hexadecimal unsigned int packed inside a string.
- *
- * @return The hexadecimal value.
- */
-unsigned int StringToHex(const char* const uintStr);
-
-/**
- * @brief Converts a string into a float value.
- *
- * @param[in] floatStr A float packed inside a string.
- *
- * @return The float value.
- */
-float StringToFloat(const char* const floatStr);
-
-/**
- * @brief Converts a float into a string.
- *
- * @param[in] value The float value.
- * @param[out] floatStr The string.
- */
-void FloatToString(float value, std::string& floatStr);
-
-/**
- * @brief Converts an unsigned int into a string.
- *
- * @param[in] value The unsigned int value.
- * @param[out] uIntStr The string.
- */
-void UintToString(unsigned int value, std::string& uIntStr);
-
-/**
- * @brief Converts an ARGB color packed in 4 byte unsigned int into a Vector4 color used in Dali.
- *
- * @param[in] color An ARGB color packed in an unsigned int.
- * @param[out] retColor A Vector4 with the converted color.
- */
-void UintColorToVector4(unsigned int color, Vector4& retColor);
-
-/**
- * @brief Converts a color packed inside a string into an ARGB Vector4 color.
- *
- * The string color could be in hexadecimal ( 0xFF0000FF ), webcolor ( #0000FF or #00F ) or some constant values:
- * black, white, red, green, blue, yellow, magenta, cyan or transparent.
- *
- * @param[in] colorStr A color packed inside a string.
- * @param[in] length The length of the color string.
- * @param[out] retColor A color packed inside a Vector4.
- */
-void ColorStringToVector4(const char* const colorStr, Length length, Vector4& retColor);
-
-/**
- * @brief Converts a color packed in a Vector4 into a string.
- *
- * Constant colors will be converted to the strings black, white, red, green, blue, yellow, magenta, cyan or transparent.
- *
- * If is not a constant color it will be converted to a string with hexadecimal ARGB content.
- *
- * @param[in] value The color value.
- * @param[out] colorStr The string.
- */
-void Vector4ToColorString(const Vector4& value, std::string& vector2Str);
-
-/**
- * @brief Converts a two dimension vector packed inside a string into a Vector2.
- *
- * @param[in] vectorStr The two dimension vector packed inside a string.
- * @param[in] length The length of the string.
- * @param[out] vector2 The Vector2.
- */
-void StringToVector2(const char* const vectorStr, Length length, Vector2& vector2);
-
-/**
- * @brief Converts a Vector2 into a string.
- *
- * @param[in] value The vector2 value.
- * @param[out] vector2Str The string.
- */
-void Vector2ToString(const Vector2& value, std::string& vector2Str);
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
diff --git a/dali-toolkit/internal/text/markup-processor-span.cpp b/dali-toolkit/internal/text/markup-processor-span.cpp
deleted file mode 100644
index 40a508d..0000000
--- a/dali-toolkit/internal/text/markup-processor-span.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor-color.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/color-run.h>
-#include <dali-toolkit/internal/text/font-description-run.h>
-#include <dali-toolkit/internal/text/markup-processor-font.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-const std::string XHTML_FAMILY_ATTRIBUTE("font-family");
-const std::string XHTML_SIZE_ATTRIBUTE("font-size");
-const std::string XHTML_WEIGHT_ATTRIBUTE("font-weight");
-const std::string XHTML_WIDTH_ATTRIBUTE("font-width");
-const std::string XHTML_SLANT_ATTRIBUTE("font-slant");
-
-const std::string XHTML_COLOR_ATTRIBUTE("text-color");
-} // namespace
-
-void ProcessSpanTag(const Tag& tag, ColorRun& colorRun, FontDescriptionRun& fontRun, bool& isColorDefined, bool& isFontDefined)
-{
-  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
-                                       endIt = tag.attributes.End();
-      it != endIt;
-      ++it)
-  {
-    const Attribute& attribute(*it);
-
-    if(TokenComparison(XHTML_COLOR_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      isColorDefined = true;
-      ProcessColor(attribute, colorRun);
-    }
-    else if(TokenComparison(XHTML_FAMILY_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      isFontDefined = true;
-      ProcessFontFamily(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_SIZE_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      isFontDefined = true;
-      ProcessFontSize(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_WEIGHT_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      isFontDefined = true;
-      ProcessFontWeight(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_WIDTH_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      isFontDefined = true;
-      ProcessFontWidth(attribute, fontRun);
-    }
-    else if(TokenComparison(XHTML_SLANT_ATTRIBUTE, attribute.nameBuffer, attribute.nameLength))
-    {
-      isFontDefined = true;
-      ProcessFontSlant(attribute, fontRun);
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor-span.h b/dali-toolkit/internal/text/markup-processor-span.h
deleted file mode 100644
index 330caf1..0000000
--- a/dali-toolkit/internal/text/markup-processor-span.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_SPAN_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_SPAN_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Tag;
-struct MarkupProcessData;
-
-/**
- * @brief process the span from the tag and process all styles in it.
- *
- * @param[in] tag The span tag and its attributes.
- * @param[out] colorRun the color run to be filled.
- * @param[out] fontRun the font run to be filled.
- * @param[out] isColorDefined if the span has color defined.
- * @param[out] isFontDefined if the span has font defined.
- */
-void ProcessSpanTag(const Tag& tag, ColorRun& colorRun, FontDescriptionRun& fontRun, bool& isColorDefined, bool& isFontDefined);
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_SPAN_H
diff --git a/dali-toolkit/internal/text/markup-processor.cpp b/dali-toolkit/internal/text/markup-processor.cpp
deleted file mode 100644
index b656aa4..0000000
--- a/dali-toolkit/internal/text/markup-processor.cpp
+++ /dev/null
@@ -1,997 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// FILE HEADER
-#include <dali-toolkit/internal/text/markup-processor.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <climits> // for ULONG_MAX
-#include <functional>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/character-set-conversion.h>
-#include <dali-toolkit/internal/text/markup-processor-anchor.h>
-#include <dali-toolkit/internal/text/markup-processor-background.h>
-#include <dali-toolkit/internal/text/markup-processor-color.h>
-#include <dali-toolkit/internal/text/markup-processor-embedded-item.h>
-#include <dali-toolkit/internal/text/markup-processor-font.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
-#include <dali-toolkit/internal/text/markup-processor-span.h>
-#include <dali-toolkit/internal/text/xhtml-entities.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-// HTML-ISH tag and attribute constants.
-// Note they must be lower case in order to make the comparison to work
-// as the parser converts all the read tags to lower case.
-const std::string XHTML_COLOR_TAG("color");
-const std::string XHTML_FONT_TAG("font");
-const std::string XHTML_B_TAG("b");
-const std::string XHTML_I_TAG("i");
-const std::string XHTML_U_TAG("u");
-const std::string XHTML_SHADOW_TAG("shadow");
-const std::string XHTML_GLOW_TAG("glow");
-const std::string XHTML_OUTLINE_TAG("outline");
-const std::string XHTML_ITEM_TAG("item");
-const std::string XHTML_ANCHOR_TAG("a");
-const std::string XHTML_BACKGROUND_TAG("background");
-const std::string XHTML_SPAN_TAG("span");
-
-const char LESS_THAN      = '<';
-const char GREATER_THAN   = '>';
-const char EQUAL          = '=';
-const char QUOTATION_MARK = '\'';
-const char SLASH          = '/';
-const char BACK_SLASH     = '\\';
-const char AMPERSAND      = '&';
-const char HASH           = '#';
-const char SEMI_COLON     = ';';
-const char CHAR_ARRAY_END = '\0';
-const char HEX_CODE       = 'x';
-
-const char WHITE_SPACE = 0x20; // ASCII value of the white space.
-
-// Range 1 0x0u < XHTML_DECIMAL_ENTITY_RANGE <= 0xD7FFu
-// Range 2 0xE000u < XHTML_DECIMAL_ENTITY_RANGE <= 0xFFFDu
-// Range 3 0x10000u < XHTML_DECIMAL_ENTITY_RANGE <= 0x10FFFFu
-const unsigned long XHTML_DECIMAL_ENTITY_RANGE[] = {0x0u, 0xD7FFu, 0xE000u, 0xFFFDu, 0x10000u, 0x10FFFFu};
-
-const unsigned int MAX_NUM_OF_ATTRIBUTES = 5u;  ///< The font tag has the 'family', 'size' 'weight', 'width' and 'slant' attrubutes.
-const unsigned int DEFAULT_VECTOR_SIZE   = 16u; ///< Default size of run vectors.
-
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_MARKUP_PROCESSOR");
-#endif
-
-typedef VectorBase::SizeType RunIndex;
-
-/**
- * @brief Struct used to retrieve the style runs from the mark-up string.
- */
-template<typename StyleStackType>
-struct StyleStack
-{
-  Vector<StyleStackType> stack;    ///< Use a vector as a style stack.
-  unsigned int           topIndex; ///< Points the top of the stack.
-
-  StyleStack()
-  : stack(),
-    topIndex(0u)
-  {
-    stack.Resize(DEFAULT_VECTOR_SIZE);
-  }
-
-  void Push(StyleStackType item)
-  {
-    // Check if there is space inside the style stack.
-    const VectorBase::SizeType size = stack.Count();
-    if(topIndex >= size)
-    {
-      // Resize the style stack.
-      stack.Resize(2u * size);
-    }
-
-    // Set the item in the top of the stack.
-    *(stack.Begin() + topIndex) = item;
-
-    // Reposition the pointer to the top of the stack.
-    ++topIndex;
-  }
-
-  StyleStackType Pop()
-  {
-    // Pop the top of the stack.
-    --topIndex;
-    return *(stack.Begin() + topIndex);
-  }
-};
-
-/**
- * @brief Struct used to retrieve spans from the mark-up string.
- */
-struct Span
-{
-  RunIndex colorRunIndex;
-  RunIndex fontRunIndex;
-  bool     isColorDefined;
-  bool     isFontDefined;
-};
-
-/**
- * @brief Initializes a font run description to its defaults.
- *
- * @param[in,out] fontRun The font description run to initialize.
- */
-void Initialize(FontDescriptionRun& fontRun)
-{
-  fontRun.characterRun.characterIndex     = 0u;
-  fontRun.characterRun.numberOfCharacters = 0u;
-  fontRun.familyName                      = NULL;
-  fontRun.familyLength                    = 0u;
-  fontRun.weight                          = TextAbstraction::FontWeight::NORMAL;
-  fontRun.width                           = TextAbstraction::FontWidth::NORMAL;
-  fontRun.slant                           = TextAbstraction::FontSlant::NORMAL;
-  fontRun.size                            = 0u;
-  fontRun.familyDefined                   = false;
-  fontRun.weightDefined                   = false;
-  fontRun.widthDefined                    = false;
-  fontRun.slantDefined                    = false;
-  fontRun.sizeDefined                     = false;
-}
-
-/**
- * @brief Initializes a color run description to its defaults.
- *
- * @param[in,out] colorRun The font description run to initialize.
- */
-void Initialize(ColorRun& colorRun)
-{
-  colorRun.characterRun.characterIndex     = 0u;
-  colorRun.characterRun.numberOfCharacters = 0u;
-}
-
-/**
- * @brief Initializes a underlined character run to its defaults.
- *
- * @param[in,out] underlinedCharacterRun The underelined character run to initialize.
- */
-void Initialize(UnderlinedCharacterRun& underlinedCharacterRun)
-{
-  underlinedCharacterRun.characterRun.characterIndex     = 0u;
-  underlinedCharacterRun.characterRun.numberOfCharacters = 0u;
-}
-
-/**
- * @brief Initializes a span to its defaults.
- *
- * @param[in,out] span The span to be initialized.
- */
-void Initialize(Span& span)
-{
-  span.colorRunIndex  = 0u;
-  span.isColorDefined = false;
-  span.fontRunIndex   = 0u;
-  span.isFontDefined  = false;
-}
-
-/**
- * @brief Splits the tag string into the tag name and its attributes.
- *
- * The attributes are stored in a vector in the tag.
- *
- * @param[in,out] tag The tag.
- */
-void ParseAttributes(Tag& tag)
-{
-  if(tag.buffer == NULL)
-  {
-    return;
-  }
-
-  tag.attributes.Resize(MAX_NUM_OF_ATTRIBUTES);
-
-  // Find first the tag name.
-  bool isQuotationOpen = false;
-
-  const char*       tagBuffer    = tag.buffer;
-  const char* const tagEndBuffer = tagBuffer + tag.length;
-  tag.length                     = 0u;
-  for(; tagBuffer < tagEndBuffer; ++tagBuffer)
-  {
-    const char character = *tagBuffer;
-    if(WHITE_SPACE < character)
-    {
-      ++tag.length;
-    }
-    else
-    {
-      // Stops counting the length of the tag when a white space is found.
-      // @note a white space is the WHITE_SPACE character and anything below as 'tab', 'return' or 'control characters'.
-      break;
-    }
-  }
-  SkipWhiteSpace(tagBuffer, tagEndBuffer);
-
-  // Find the attributes.
-  unsigned int attributeIndex = 0u;
-  const char*  nameBuffer     = NULL;
-  const char*  valueBuffer    = NULL;
-  Length       nameLength     = 0u;
-  Length       valueLength    = 0u;
-
-  bool   addToNameValue     = true;
-  Length numberOfWhiteSpace = 0u;
-  for(; tagBuffer < tagEndBuffer; ++tagBuffer)
-  {
-    const char character = *tagBuffer;
-    if((WHITE_SPACE >= character) && !isQuotationOpen)
-    {
-      if(NULL != valueBuffer)
-      {
-        // Remove white spaces at the end of the value.
-        valueLength -= numberOfWhiteSpace;
-      }
-
-      if((NULL != nameBuffer) && (NULL != valueBuffer))
-      {
-        // Every time a white space is found, a new attribute is created and stored in the attributes vector.
-        Attribute& attribute = *(tag.attributes.Begin() + attributeIndex);
-        ++attributeIndex;
-
-        attribute.nameBuffer  = nameBuffer;
-        attribute.valueBuffer = valueBuffer;
-        attribute.nameLength  = nameLength;
-        attribute.valueLength = valueLength;
-
-        nameBuffer  = NULL;
-        valueBuffer = NULL;
-        nameLength  = 0u;
-        valueLength = 0u;
-
-        addToNameValue = true; // next read characters will be added to the name.
-      }
-    }
-    else if(EQUAL == character) // '='
-    {
-      addToNameValue = false; // next read characters will be added to the value.
-      SkipWhiteSpace(tagBuffer, tagEndBuffer);
-    }
-    else if(QUOTATION_MARK == character) // '\''
-    {
-      // Do not add quotation marks to neither name nor value.
-      isQuotationOpen = !isQuotationOpen;
-
-      if(isQuotationOpen)
-      {
-        ++tagBuffer;
-        SkipWhiteSpace(tagBuffer, tagEndBuffer);
-        --tagBuffer;
-      }
-    }
-    else
-    {
-      // Adds characters to the name or the value.
-      if(addToNameValue)
-      {
-        if(NULL == nameBuffer)
-        {
-          nameBuffer = tagBuffer;
-        }
-        ++nameLength;
-      }
-      else
-      {
-        if(isQuotationOpen)
-        {
-          if(WHITE_SPACE >= character)
-          {
-            ++numberOfWhiteSpace;
-          }
-          else
-          {
-            numberOfWhiteSpace = 0u;
-          }
-        }
-        if(NULL == valueBuffer)
-        {
-          valueBuffer = tagBuffer;
-        }
-        ++valueLength;
-      }
-    }
-  }
-
-  if(NULL != valueBuffer)
-  {
-    // Remove white spaces at the end of the value.
-    valueLength -= numberOfWhiteSpace;
-  }
-
-  if((NULL != nameBuffer) && (NULL != valueBuffer))
-  {
-    // Checks if the last attribute needs to be added.
-    Attribute& attribute = *(tag.attributes.Begin() + attributeIndex);
-    ++attributeIndex;
-
-    attribute.nameBuffer  = nameBuffer;
-    attribute.valueBuffer = valueBuffer;
-    attribute.nameLength  = nameLength;
-    attribute.valueLength = valueLength;
-  }
-
-  // Resize the vector of attributes.
-  tag.attributes.Resize(attributeIndex);
-}
-
-/**
- * @brief It parses a tag and its attributes if the given iterator @e it is pointing at a tag beginning.
- *
- * @param[in,out] markupStringBuffer The mark-up string buffer. It's a const iterator pointing the current character.
- * @param[in] markupStringEndBuffer Pointer to one character after the end of the mark-up string buffer.
- * @param[out] tag The tag with its attributes.
- *
- * @return @e true if the iterator @e it is pointing a mark-up tag. Otherwise @e false.
- */
-bool IsTag(const char*&      markupStringBuffer,
-           const char* const markupStringEndBuffer,
-           Tag&              tag)
-{
-  bool isTag              = false;
-  bool isQuotationOpen    = false;
-  bool attributesFound    = false;
-  tag.isEndTag            = false;
-  bool isPreviousLessThan = false;
-  bool isPreviousSlash    = false;
-
-  const char character = *markupStringBuffer;
-  if(LESS_THAN == character) // '<'
-  {
-    tag.buffer         = NULL;
-    tag.length         = 0u;
-    isPreviousLessThan = true;
-
-    // if the iterator is pointing to a '<' character, then check if it's a mark-up tag is needed.
-    ++markupStringBuffer;
-    if(markupStringBuffer < markupStringEndBuffer)
-    {
-      SkipWhiteSpace(markupStringBuffer, markupStringEndBuffer);
-
-      for(; (!isTag) && (markupStringBuffer < markupStringEndBuffer); ++markupStringBuffer)
-      {
-        const char character = *markupStringBuffer;
-
-        if(!isQuotationOpen && (SLASH == character)) // '/'
-        {
-          if(isPreviousLessThan)
-          {
-            tag.isEndTag = true;
-          }
-          else
-          {
-            // if the tag has a '/' it may be an end tag.
-            isPreviousSlash = true;
-          }
-
-          isPreviousLessThan = false;
-          if((markupStringBuffer + 1u < markupStringEndBuffer) && (WHITE_SPACE >= *(markupStringBuffer + 1u)))
-          {
-            ++markupStringBuffer;
-            SkipWhiteSpace(markupStringBuffer, markupStringEndBuffer);
-            --markupStringBuffer;
-          }
-        }
-        else if(GREATER_THAN == character) // '>'
-        {
-          isTag = true;
-          if(isPreviousSlash)
-          {
-            tag.isEndTag = true;
-          }
-
-          isPreviousSlash    = false;
-          isPreviousLessThan = false;
-        }
-        else if(QUOTATION_MARK == character)
-        {
-          isQuotationOpen = !isQuotationOpen;
-          ++tag.length;
-
-          isPreviousSlash    = false;
-          isPreviousLessThan = false;
-        }
-        else if(WHITE_SPACE >= character) // ' '
-        {
-          // If the tag contains white spaces then it may have attributes.
-          if(!isQuotationOpen)
-          {
-            attributesFound = true;
-          }
-          ++tag.length;
-        }
-        else
-        {
-          if(NULL == tag.buffer)
-          {
-            tag.buffer = markupStringBuffer;
-          }
-
-          // If it's not any of the 'special' characters then just add it to the tag string.
-          ++tag.length;
-
-          isPreviousSlash    = false;
-          isPreviousLessThan = false;
-        }
-      }
-    }
-
-    // If the tag string has white spaces, then parse the attributes is needed.
-    if(attributesFound)
-    {
-      ParseAttributes(tag);
-    }
-  }
-
-  return isTag;
-}
-
-/**
- * @brief Returns length of XHTML entity by parsing the text. It also determines if it is XHTML entity or not.
- *
- * @param[in] markupStringBuffer The mark-up string buffer. It's a const iterator pointing the current character.
- * @param[in] markupStringEndBuffer Pointing to end of mark-up string buffer.
- *
- * @return Length of markupText in case of XHTML entity otherwise return 0.
- */
-unsigned int GetXHTMLEntityLength(const char*&      markupStringBuffer,
-                                  const char* const markupStringEndBuffer)
-{
-  char character = *markupStringBuffer;
-  if(AMPERSAND == character) // '&'
-  {
-    // if the iterator is pointing to a '&' character, then check for ';' to find end to XHTML entity.
-    ++markupStringBuffer;
-    if(markupStringBuffer < markupStringEndBuffer)
-    {
-      unsigned int len = 1u;
-      for(; markupStringBuffer < markupStringEndBuffer; ++markupStringBuffer)
-      {
-        character = *markupStringBuffer;
-        ++len;
-        if(SEMI_COLON == character) // ';'
-        {
-          // found end of XHTML entity
-          ++markupStringBuffer;
-          return len;
-        }
-        else if((AMPERSAND == character) || (BACK_SLASH == character) || (LESS_THAN == character))
-        {
-          return 0;
-        }
-      }
-    }
-  }
-  return 0;
-}
-
-/**
- * @brief It parses a XHTML string which has hex/decimal entity and fill its corresponging utf-8 string.
- *
- * @param[in] markupText The mark-up text buffer.
- * @param[out] utf-8 text Corresponding to markup Text
- *
- * @return true if string is successfully parsed otherwise false
- */
-bool XHTMLNumericEntityToUtf8(const char* markupText, char* utf8)
-{
-  bool result = false;
-
-  if(NULL != markupText)
-  {
-    bool isHex = false;
-
-    // check if hex or decimal entity
-    if((CHAR_ARRAY_END != *markupText) && (HEX_CODE == *markupText))
-    {
-      isHex = true;
-      ++markupText;
-    }
-
-    char*         end = NULL;
-    unsigned long l   = strtoul(markupText, &end, (isHex ? 16 : 10)); // l contains UTF-32 code in case of correct XHTML entity
-
-    // check for valid XHTML numeric entities (between '#' or "#x" and ';')
-    if((l > 0) && (l < ULONG_MAX) && (*end == SEMI_COLON)) // in case wrong XHTML entity is set eg. "&#23abcdefs;" in that case *end will be 'a'
-    {
-      /* characters XML 1.1 permits */
-      if(((XHTML_DECIMAL_ENTITY_RANGE[0] < l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[1])) ||
-         ((XHTML_DECIMAL_ENTITY_RANGE[2] <= l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[3])) ||
-         ((XHTML_DECIMAL_ENTITY_RANGE[4] <= l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[5])))
-      {
-        // Convert UTF32 code to UTF8
-        Utf32ToUtf8(reinterpret_cast<const uint32_t* const>(&l), 1, reinterpret_cast<uint8_t*>(utf8));
-        result = true;
-      }
-    }
-  }
-  return result;
-}
-
-/**
- * @brief Processes a particular tag for the required run (color-run, font-run or underlined-character-run).
- *
- * @tparam RunType Whether ColorRun , FontDescriptionRun or UnderlinedCharacterRun
- *
- * @param[in/out] runsContainer The container containing all the runs
- * @param[in/out] styleStack The style stack
- * @param[in] tag The tag we are currently processing
- * @param[in] characterIndex The current character index
- * @param[in/out] runIndex The run index
- * @param[in/out] tagReference The tagReference we should increment/decrement
- * @param[in] parameterSettingFunction This function will be called to set run specific parameters
- */
-template<typename RunType>
-void ProcessTagForRun(
-  Vector<RunType>&                          runsContainer,
-  StyleStack<RunIndex>&                     styleStack,
-  const Tag&                                tag,
-  const CharacterIndex                      characterIndex,
-  RunIndex&                                 runIndex,
-  int&                                      tagReference,
-  std::function<void(const Tag&, RunType&)> parameterSettingFunction)
-{
-  if(!tag.isEndTag)
-  {
-    // Create a new run.
-    RunType run;
-    Initialize(run);
-
-    // Fill the run with the parameters.
-    run.characterRun.characterIndex = characterIndex;
-    parameterSettingFunction(tag, run);
-
-    // Push the run in the logical model.
-    runsContainer.PushBack(run);
-
-    // Push the index of the run into the stack.
-    styleStack.Push(runIndex);
-
-    // Point the next free run.
-    ++runIndex;
-
-    // Increase reference
-    ++tagReference;
-  }
-  else
-  {
-    if(tagReference > 0)
-    {
-      // Pop the top of the stack and set the number of characters of the run.
-      RunType& run                        = *(runsContainer.Begin() + styleStack.Pop());
-      run.characterRun.numberOfCharacters = characterIndex - run.characterRun.characterIndex;
-      --tagReference;
-    }
-  }
-}
-
-/**
- * @brief Processes the item tag
- *
- * @param[in/out] markupProcessData The markup process data
- * @param[in] tag The current tag
- * @param[in/out] characterIndex The current character index
- */
-void ProcessItemTag(
-  MarkupProcessData& markupProcessData,
-  const Tag          tag,
-  CharacterIndex&    characterIndex)
-{
-  if(tag.isEndTag)
-  {
-    // Create an embedded item instance.
-    EmbeddedItem item;
-    item.characterIndex = characterIndex;
-    ProcessEmbeddedItem(tag, item);
-
-    markupProcessData.items.PushBack(item);
-
-    // Insert white space character that will be replaced by the item.
-    markupProcessData.markupProcessedText.append(1u, WHITE_SPACE);
-    ++characterIndex;
-  }
-}
-
-/**
- * @brief Processes the anchor tag
- *
- * @param[in/out] markupProcessData The markup process data
- * @param[in] tag The current tag
- * @param[in/out] characterIndex The current character index
- */
-void ProcessAnchorTag(
-  MarkupProcessData& markupProcessData,
-  const Tag          tag,
-  CharacterIndex&    characterIndex)
-{
-  if(!tag.isEndTag)
-  {
-    // Create an anchor instance.
-    Anchor anchor;
-    anchor.startIndex = characterIndex;
-    anchor.endIndex   = 0u;
-    ProcessAnchor(tag, anchor);
-    markupProcessData.anchors.PushBack(anchor);
-  }
-  else
-  {
-    // Update end index.
-    unsigned int count = markupProcessData.anchors.Count();
-    if(count > 0)
-    {
-      markupProcessData.anchors[count - 1].endIndex = characterIndex;
-    }
-  }
-}
-
-/**
- * @brief Processes span tag for the color-run & font-run.
- *
- * @param[in] spanTag The tag we are currently processing
- * @param[in/out] spanStack The spans stack
- * @param[int/out] colorRuns The container containing all the color runs
- * @param[int/out] fontRuns The container containing all the font description runs
- * @param[in/out] colorRunIndex The color run index
- * @param[in/out] fontRunIndex The font run index
- * @param[in] characterIndex The current character index
- * @param[in] tagReference The tagReference we should increment/decrement
- */
-void ProcessSpanForRun(
-  const Tag&                  spanTag,
-  StyleStack<Span>&           spanStack,
-  Vector<ColorRun>&           colorRuns,
-  Vector<FontDescriptionRun>& fontRuns,
-  RunIndex&                   colorRunIndex,
-  RunIndex&                   fontRunIndex,
-  const CharacterIndex        characterIndex,
-  int&                        tagReference)
-{
-  if(!spanTag.isEndTag)
-  {
-    // Create a new run.
-    ColorRun colorRun;
-    Initialize(colorRun);
-
-    FontDescriptionRun fontRun;
-    Initialize(fontRun);
-
-    Span span;
-    Initialize(span);
-
-    // Fill the run with the parameters.
-    colorRun.characterRun.characterIndex = characterIndex;
-    fontRun.characterRun.characterIndex  = characterIndex;
-
-    span.colorRunIndex = colorRunIndex;
-    span.fontRunIndex  = fontRunIndex;
-
-    ProcessSpanTag(spanTag, colorRun, fontRun, span.isColorDefined, span.isFontDefined);
-
-    // Push the span into the stack.
-    spanStack.Push(span);
-
-    // Point the next free run.
-    if(span.isColorDefined)
-    {
-      // Push the run in the logical model.
-      colorRuns.PushBack(colorRun);
-      ++colorRunIndex;
-    }
-
-    if(span.isFontDefined)
-    {
-      // Push the run in the logical model.
-      fontRuns.PushBack(fontRun);
-      ++fontRunIndex;
-    }
-
-    // Increase reference
-    ++tagReference;
-  }
-  else
-  {
-    if(tagReference > 0)
-    {
-      // Pop the top of the stack and set the number of characters of the run.
-      Span span = spanStack.Pop();
-
-      if(span.isColorDefined)
-      {
-        ColorRun& colorRun                       = *(colorRuns.Begin() + span.colorRunIndex);
-        colorRun.characterRun.numberOfCharacters = characterIndex - colorRun.characterRun.characterIndex;
-      }
-
-      if(span.isFontDefined)
-      {
-        FontDescriptionRun& fontRun             = *(fontRuns.Begin() + span.fontRunIndex);
-        fontRun.characterRun.numberOfCharacters = characterIndex - fontRun.characterRun.characterIndex;
-      }
-
-      --tagReference;
-    }
-  }
-}
-
-/**
- * @brief Resizes the model's vectors
- *
- * @param[in/out] markupProcessData The markup process data
- * @param[in] fontRunIndex The font run index
- * @param[in] colorRunIndex The color run index
- * @param[in] underlinedCharacterRunIndex The underlined character run index
- * @param[in] backgroundRunIndex The background run index
- */
-void ResizeModelVectors(MarkupProcessData& markupProcessData, const RunIndex fontRunIndex, const RunIndex colorRunIndex, const RunIndex underlinedCharacterRunIndex, const RunIndex backgroundRunIndex)
-{
-  markupProcessData.fontRuns.Resize(fontRunIndex);
-  markupProcessData.colorRuns.Resize(colorRunIndex);
-  markupProcessData.underlinedCharacterRuns.Resize(underlinedCharacterRunIndex);
-  markupProcessData.backgroundColorRuns.Resize(backgroundRunIndex);
-
-#ifdef DEBUG_ENABLED
-  for(unsigned int i = 0; i < colorRunIndex; ++i)
-  {
-    ColorRun& run = markupProcessData.colorRuns[i];
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "run[%d] index: %d, length: %d, color %f,%f,%f,%f\n", i, run.characterRun.characterIndex, run.characterRun.numberOfCharacters, run.color.r, run.color.g, run.color.b, run.color.a);
-  }
-#endif
-}
-
-/**
- * @brief Processes the markup string buffer
- *
- * @param[in/out] markupProcessData The markup process data
- * @param[in/out] markupStringBuffer The markup string buffer pointer
- * @param[in] markupStringEndBuffer The markup string end buffer pointer
- * @param[in/out] characterIndex The current character index
- */
-void ProcessMarkupStringBuffer(
-  MarkupProcessData& markupProcessData,
-  const char*&       markupStringBuffer,
-  const char* const  markupStringEndBuffer,
-  CharacterIndex&    characterIndex)
-{
-  unsigned char character    = *markupStringBuffer;
-  const char*   markupBuffer = markupStringBuffer;
-  unsigned char count        = GetUtf8Length(character);
-  char          utf8[8];
-
-  if((BACK_SLASH == character) && (markupStringBuffer + 1u < markupStringEndBuffer))
-  {
-    // Adding < , >  or & special character.
-    const unsigned char nextCharacter = *(markupStringBuffer + 1u);
-    if((LESS_THAN == nextCharacter) || (GREATER_THAN == nextCharacter) || (AMPERSAND == nextCharacter))
-    {
-      character = nextCharacter;
-      ++markupStringBuffer;
-
-      count        = GetUtf8Length(character);
-      markupBuffer = markupStringBuffer;
-    }
-  }
-  else // checking if contains XHTML entity or not
-  {
-    const unsigned int len = GetXHTMLEntityLength(markupStringBuffer, markupStringEndBuffer);
-
-    // Parse markupStringTxt if it contains XHTML Entity between '&' and ';'
-    if(len > 0)
-    {
-      char* entityCode = NULL;
-      bool  result     = false;
-      count            = 0;
-
-      // Checking if XHTML Numeric Entity
-      if(HASH == *(markupBuffer + 1u))
-      {
-        entityCode = &utf8[0];
-        // markupBuffer is currently pointing to '&'. By adding 2u to markupBuffer it will point to numeric string by skipping "&#'
-        result = XHTMLNumericEntityToUtf8((markupBuffer + 2u), entityCode);
-      }
-      else // Checking if XHTML Named Entity
-      {
-        entityCode = const_cast<char*>(NamedEntityToUtf8(markupBuffer, len));
-        result     = (entityCode != NULL);
-      }
-      if(result)
-      {
-        markupBuffer = entityCode; //utf8 text assigned to markupBuffer
-        character    = markupBuffer[0];
-      }
-      else
-      {
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Not valid XHTML entity : (%.*s) \n", len, markupBuffer);
-        markupBuffer = NULL;
-      }
-    }
-    else // in case string conatins Start of XHTML Entity('&') but not its end character(';')
-    {
-      if(character == AMPERSAND)
-      {
-        markupBuffer = NULL;
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Not Well formed XHTML content \n");
-      }
-    }
-  }
-
-  if(markupBuffer != NULL)
-  {
-    const unsigned char numberOfBytes = GetUtf8Length(character);
-    markupProcessData.markupProcessedText.push_back(character);
-
-    for(unsigned char i = 1u; i < numberOfBytes; ++i)
-    {
-      ++markupBuffer;
-      markupProcessData.markupProcessedText.push_back(*markupBuffer);
-    }
-
-    ++characterIndex;
-    markupStringBuffer += count;
-  }
-}
-
-} // namespace
-
-void ProcessMarkupString(const std::string& markupString, MarkupProcessData& markupProcessData)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "markupString: %s\n", markupString.c_str());
-
-  // Reserve space for the plain text.
-  const Length markupStringSize = markupString.size();
-  markupProcessData.markupProcessedText.reserve(markupStringSize);
-
-  // Stores a struct with the index to the first character of the run, the type of run and its parameters.
-  StyleStack<RunIndex> styleStack;
-
-  // Stores a struct with the index to the first character of the color run & color font for the span.
-  StyleStack<Span> spanStack;
-
-  // Points the next free position in the vector of runs.
-  RunIndex colorRunIndex               = 0u;
-  RunIndex fontRunIndex                = 0u;
-  RunIndex underlinedCharacterRunIndex = 0u;
-  RunIndex backgroundRunIndex          = 0u;
-
-  // check tag reference
-  int colorTagReference      = 0u;
-  int fontTagReference       = 0u;
-  int iTagReference          = 0u;
-  int bTagReference          = 0u;
-  int uTagReference          = 0u;
-  int backgroundTagReference = 0u;
-  int spanTagReference       = 0u;
-
-  // Give an initial default value to the model's vectors.
-  markupProcessData.colorRuns.Reserve(DEFAULT_VECTOR_SIZE);
-  markupProcessData.fontRuns.Reserve(DEFAULT_VECTOR_SIZE);
-  markupProcessData.underlinedCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE);
-  markupProcessData.backgroundColorRuns.Reserve(DEFAULT_VECTOR_SIZE);
-
-  // Get the mark-up string buffer.
-  const char*       markupStringBuffer    = markupString.c_str();
-  const char* const markupStringEndBuffer = markupStringBuffer + markupStringSize;
-
-  Tag            tag;
-  CharacterIndex characterIndex = 0u;
-  for(; markupStringBuffer < markupStringEndBuffer;)
-  {
-    tag.attributes.Clear();
-    if(IsTag(markupStringBuffer,
-             markupStringEndBuffer,
-             tag))
-    {
-      if(TokenComparison(XHTML_COLOR_TAG, tag.buffer, tag.length))
-      {
-        ProcessTagForRun<ColorRun>(
-          markupProcessData.colorRuns, styleStack, tag, characterIndex, colorRunIndex, colorTagReference, [](const Tag& tag, ColorRun& run) { ProcessColorTag(tag, run); });
-      } // <color></color>
-      else if(TokenComparison(XHTML_I_TAG, tag.buffer, tag.length))
-      {
-        ProcessTagForRun<FontDescriptionRun>(
-          markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, iTagReference, [](const Tag&, FontDescriptionRun& fontRun) {
-            fontRun.slant        = TextAbstraction::FontSlant::ITALIC;
-            fontRun.slantDefined = true;
-          });
-      } // <i></i>
-      else if(TokenComparison(XHTML_U_TAG, tag.buffer, tag.length))
-      {
-        ProcessTagForRun<UnderlinedCharacterRun>(
-          markupProcessData.underlinedCharacterRuns, styleStack, tag, characterIndex, underlinedCharacterRunIndex, uTagReference, [](const Tag& tag, UnderlinedCharacterRun& run) {});
-      } // <u></u>
-      else if(TokenComparison(XHTML_B_TAG, tag.buffer, tag.length))
-      {
-        ProcessTagForRun<FontDescriptionRun>(
-          markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, bTagReference, [](const Tag&, FontDescriptionRun& fontRun) {
-            fontRun.weight        = TextAbstraction::FontWeight::BOLD;
-            fontRun.weightDefined = true;
-          });
-      } // <b></b>
-      else if(TokenComparison(XHTML_FONT_TAG, tag.buffer, tag.length))
-      {
-        ProcessTagForRun<FontDescriptionRun>(
-          markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, fontTagReference, [](const Tag& tag, FontDescriptionRun& fontRun) { ProcessFontTag(tag, fontRun); });
-      } // <font></font>
-      else if(TokenComparison(XHTML_ANCHOR_TAG, tag.buffer, tag.length))
-      {
-        /* Anchor */
-        ProcessAnchorTag(markupProcessData, tag, characterIndex);
-        /* Color */
-        ProcessTagForRun<ColorRun>(
-          markupProcessData.colorRuns, styleStack, tag, characterIndex, colorRunIndex, colorTagReference, [](const Tag& tag, ColorRun& run) {
-            run.color = Color::BLUE;
-            ProcessColorTag(tag, run);
-          });
-        /* TODO - underline */
-      } // <a href=https://www.tizen.org>tizen</a>
-      else if(TokenComparison(XHTML_SHADOW_TAG, tag.buffer, tag.length))
-      {
-        // TODO: If !tag.isEndTag, then create a new shadow run.
-        //       else Pop the top of the stack and set the number of characters of the run.
-      } // <shadow></shadow>
-      else if(TokenComparison(XHTML_GLOW_TAG, tag.buffer, tag.length))
-      {
-        // TODO: If !tag.isEndTag, then create a new glow run.
-        //       else Pop the top of the stack and set the number of characters of the run.
-      } // <glow></glow>
-      else if(TokenComparison(XHTML_OUTLINE_TAG, tag.buffer, tag.length))
-      {
-        // TODO: If !tag.isEndTag, then create a new outline run.
-        //       else Pop the top of the stack and set the number of characters of the run.
-      } // <outline></outline>
-      else if(TokenComparison(XHTML_ITEM_TAG, tag.buffer, tag.length))
-      {
-        ProcessItemTag(markupProcessData, tag, characterIndex);
-      }
-      else if(TokenComparison(XHTML_BACKGROUND_TAG, tag.buffer, tag.length))
-      {
-        ProcessTagForRun<ColorRun>(
-          markupProcessData.backgroundColorRuns, styleStack, tag, characterIndex, backgroundRunIndex, backgroundTagReference, [](const Tag& tag, ColorRun& run) { ProcessBackground(tag, run); });
-      }
-      else if(TokenComparison(XHTML_SPAN_TAG, tag.buffer, tag.length))
-      {
-        ProcessSpanForRun(tag, spanStack, markupProcessData.colorRuns, markupProcessData.fontRuns, colorRunIndex, fontRunIndex, characterIndex, spanTagReference);
-      }
-    } // end if( IsTag() )
-    else if(markupStringBuffer < markupStringEndBuffer)
-    {
-      ProcessMarkupStringBuffer(markupProcessData, markupStringBuffer, markupStringEndBuffer, characterIndex);
-    }
-  }
-
-  // Resize the model's vectors.
-  ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, backgroundRunIndex);
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor.h b/dali-toolkit/internal/text/markup-processor.h
deleted file mode 100644
index e84b892..0000000
--- a/dali-toolkit/internal/text/markup-processor.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
-#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/anchor.h>
-#include <dali-toolkit/internal/text/color-run.h>
-#include <dali-toolkit/internal/text/embedded-item.h>
-#include <dali-toolkit/internal/text/font-description-run.h>
-#include <dali-toolkit/internal/text/underlined-character-run.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-/**
- * @brief Keeps the plain text and references to vectors from the model which stores runs with text styles.
- */
-struct MarkupProcessData
-{
-  MarkupProcessData(Vector<ColorRun>&               colorRuns,
-                    Vector<FontDescriptionRun>&     fontRuns,
-                    Vector<EmbeddedItem>&           items,
-                    Vector<Anchor>&                 anchors,
-                    Vector<UnderlinedCharacterRun>& underlinedCharacterRuns,
-                    Vector<ColorRun>&               backgroundColorRuns)
-  : colorRuns(colorRuns),
-    fontRuns(fontRuns),
-    items(items),
-    anchors(anchors),
-    underlinedCharacterRuns(underlinedCharacterRuns),
-    backgroundColorRuns(backgroundColorRuns),
-    markupProcessedText()
-  {
-  }
-
-  Vector<ColorRun>&               colorRuns;               ///< The color runs.
-  Vector<FontDescriptionRun>&     fontRuns;                ///< The font description runs.
-  Vector<EmbeddedItem>&           items;                   ///< The embedded items.
-  Vector<Anchor>&                 anchors;                 ///< The anchors.
-  Vector<UnderlinedCharacterRun>& underlinedCharacterRuns; ///< The underlined character runs.
-  Vector<ColorRun>&               backgroundColorRuns;     ///< The background color runs.
-  std::string                     markupProcessedText;     ///< The mark-up string.
-};
-
-/**
- * @brief Process the mark-up string.
- *
- * @param[in] markupString The mark-up string.
- * @param[out] markupProcessData The plain text and the style.
- */
-void ProcessMarkupString(const std::string& markupString, MarkupProcessData& markupProcessData);
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.cpp
new file mode 100644
index 0000000..ed80c40
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/anchor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-color.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-underline.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+
+void ProcessAnchorTag(const Tag&              tag,
+                      Anchor&                 anchor,
+                      ColorRun&               colorRun,
+                      UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  for(auto&& attribute : tag.attributes)
+  {
+    if(TokenComparison(MARKUP::ANCHOR_ATTRIBUTES::HREF, attribute.nameBuffer, attribute.nameLength))
+    {
+      Length hrefLength = attribute.valueLength + 1;
+      anchor.href       = new char[hrefLength];
+      memcpy(anchor.href, attribute.valueBuffer, hrefLength);
+      anchor.href[hrefLength - 1] = '\0';
+      // The memory is freed when the font run is removed from the logical model.
+    }
+    else if(TokenComparison(MARKUP::ANCHOR_ATTRIBUTES::COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      // The markup anchor color is set on the text and underline color runs.
+      // This takes precedence over the anchor color property of the text-label.
+      ProcessColor(attribute, colorRun);
+      ProcessColorAttribute(attribute, underlinedCharacterRun);
+      anchor.isMarkupColorSet = true;
+    }
+    else if(TokenComparison(MARKUP::ANCHOR_ATTRIBUTES::CLICKED_COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      // The markup anchor clicked color is stored here.
+      // This is later used when the anchor's click event occurs.
+      ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, anchor.markupClickedColor);
+      anchor.isMarkupClickedColorSet = true;
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h
new file mode 100644
index 0000000..1fca0c0
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h
@@ -0,0 +1,55 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ANCHOR_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ANCHOR_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/underlined-character-run.h>
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+namespace Text
+{
+
+struct Tag;
+struct Anchor;
+
+/**
+ * @brief Retrieves the @e anchor from the @p tag.
+ *
+ * @param[in] tag The anchor tag and its attributes.
+ * @param[in,out] anchor The anchor.
+ * @param[out] colorRun the color run to be filled.
+ * @param[out] underlinedCharacterRun the underlined character run to be filled.
+ */
+void ProcessAnchorTag(const Tag&              tag,
+                      Anchor&                 anchor,
+                      ColorRun&               colorRun,
+                      UnderlinedCharacterRun& underlinedCharacterRun);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ANCHOR_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.cpp
new file mode 100644
index 0000000..5554c22
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+
+// EXTERNAL INCLUDES
+#include <memory.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void CopyAttributeValueFromBuffer(const Attribute& attribute, const Length maxLengthAttributeValue, char* value)
+{
+  const Length length = attribute.valueLength > maxLengthAttributeValue ? maxLengthAttributeValue : attribute.valueLength;
+  memcpy(value, attribute.valueBuffer, length);
+  value[length] = 0;
+}
+
+float ProcessFloatAttribute(const Attribute& attribute)
+{
+  return StringToFloat(attribute.valueBuffer);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h
new file mode 100644
index 0000000..ab7e07e
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h
@@ -0,0 +1,88 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ATTRIBUTE_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ATTRIBUTE_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/text-definitions.h>
+
+// EXTERNAL INCLUDES
+#include <functional>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Attribute;
+
+/**
+ * @brief Copy the value from attribute buffer to value.
+ *
+ * @param[in] attribute the value of attribute.
+ * @param[in] maxLengthAttributeValue the maximum length of any of the possible value for attribute
+ * @param[out] value the value container.
+ *
+ */
+void CopyAttributeValueFromBuffer(const Attribute& attribute, const Length maxLengthAttributeValue, char* value);
+
+/**
+ * @brief Process the float attribute value from buffer.
+ *
+ * @param[in] attribute the float attribute.
+ *
+ * @return The float value.
+ */
+float ProcessFloatAttribute(const Attribute& attribute);
+
+/**
+ * @brief Process the Enumeration attribute value from buffer.
+ *
+ * @param[in] attribute the Enumeration attribute.
+ * @param[in] maxLengthAttributeValue the maximum length of any of the possible value for attribute
+ * @param[in] funcStringToEnum the function converts string value to enum value
+ * @param[out] enumValue the enum value
+ *
+ * @return      True if the enum value was processed successfully
+ *
+ */
+template<typename T>
+bool ProcessEnumerationAttribute(const Attribute&                    attribute,
+                                 const Length                        maxLengthAttributeValue,
+                                 std::function<T(const char* const)> funcStringToEnum,
+                                 T&                                  enumValue)
+{
+  char* value = new char[maxLengthAttributeValue + 1u];
+
+  CopyAttributeValueFromBuffer(attribute, maxLengthAttributeValue, value);
+
+  enumValue = funcStringToEnum(value); // @TODO: the functions that process Enum value should be refactored to return bool from Scripting::GetEnumeration
+
+  delete[] value;
+
+  return true;
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_ATTRIBUTE_HELPER_FUNCTIONS_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-background.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-background.cpp
new file mode 100644
index 0000000..303fff7
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-background.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-background.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void ProcessBackground(const Tag& tag, ColorRun& colorRun)
+{
+  for(auto&& attribute : tag.attributes)
+  {
+    if(TokenComparison(MARKUP::BACKGROUND_ATTRIBUTES::COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, colorRun.color);
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-background.h b/dali-toolkit/internal/text/markup-processor/markup-processor-background.h
new file mode 100644
index 0000000..9420dac
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-background.h
@@ -0,0 +1,44 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_BACKGROUND_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_BACKGROUND_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct ColorRun;
+
+/**
+ * @brief Retrieves the @e background from the @p tag.
+ *
+ * @param[in] tag The background tag and its attributes.
+ * @param[in,out] colorRun The color run to be filled.
+ */
+void ProcessBackground(const Tag& tag, ColorRun& colorRun);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_BACKGROUND_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.cpp
new file mode 100644
index 0000000..f18efe3
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-spacing-character-run.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void ProcessValueAttribute(const Attribute& attribute, CharacterSpacingCharacterRun& characterSpacingCharacterRun)
+{
+  characterSpacingCharacterRun.value = ProcessFloatAttribute(attribute);
+}
+
+void ProcessCharacterSpacingTag(const Tag& tag, CharacterSpacingCharacterRun& characterSpacingCharacterRun)
+{
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+
+    if(TokenComparison(MARKUP::CHARACTER_SPACING_ATTRIBUTES::VALUE, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessValueAttribute(attribute, characterSpacingCharacterRun);
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h b/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h
new file mode 100644
index 0000000..b8b9beb
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h
@@ -0,0 +1,53 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_CHARACTER_SPACING_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_CHARACTER_SPACING_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct Attribute;
+struct CharacterSpacingCharacterRun;
+
+/**
+ * @brief Fill the character-spacing character run with the value (space or advance) attribute.
+ *
+ * @param[in] attribute the value attribute.
+ * @param[out] characterSpacingCharacterRun The underlined character run
+ */
+void ProcessValueAttribute(const Attribute& attribute, CharacterSpacingCharacterRun& characterSpacingCharacterRun);
+
+/**
+ * @brief Retrieves the character-spacing run info from the tag and sets it to the character-spacing run.
+ *
+ * @param[in] tag The character-spacing tag and its attributes.
+ * @param[in,out] characterSpacingCharacterRun The character-spacing character run
+ */
+void ProcessCharacterSpacingTag(const Tag& tag, CharacterSpacingCharacterRun& characterSpacingCharacterRun);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_CHARACTER_SPACING_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-color.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-color.cpp
new file mode 100644
index 0000000..1a5ce73
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-color.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-color.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void ProcessColor(const Attribute& attribute, ColorRun& colorRun)
+{
+  ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, colorRun.color);
+}
+
+void ProcessColorTag(const Tag& tag, ColorRun& colorRun)
+{
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+    if(TokenComparison(MARKUP::COLOR_ATTRIBUTES::VALUE, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessColor(attribute, colorRun);
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-color.h b/dali-toolkit/internal/text/markup-processor/markup-processor-color.h
new file mode 100644
index 0000000..2d8be1e
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-color.h
@@ -0,0 +1,53 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct Attribute;
+struct ColorRun;
+
+/**
+ * @brief Retrieves the color value from the tag and sets it to the color run.
+ *
+ * @param[in] attribute the color attribute.
+ * @param[in,out] colorRun The color run.
+ */
+void ProcessColor(const Attribute& attribute, ColorRun& colorRun);
+
+/**
+ * @brief Retrieves the color value from the tag and sets it to the color run.
+ *
+ * @param[in] tag The color tag and its attributes.
+ * @param[in,out] colorRun The color run.
+ */
+void ProcessColorTag(const Tag& tag, ColorRun& colorRun);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.cpp
new file mode 100644
index 0000000..f39afce
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/embedded-item.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace
+{
+const char* MULTIPLY = "multiply";
+} // namespace
+
+void ProcessEmbeddedItem(const Tag& tag, EmbeddedItem& embeddedItem)
+{
+  embeddedItem.url               = nullptr;
+  embeddedItem.urlLength         = 0u;
+  embeddedItem.width             = 0u;
+  embeddedItem.height            = 0u;
+  embeddedItem.colorBlendingMode = ColorBlendingMode::NONE;
+
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+    if(TokenComparison(MARKUP::EMBEDDED_ITEM_ATTRIBUTES::URL, attribute.nameBuffer, attribute.nameLength))
+    {
+      embeddedItem.urlLength = attribute.valueLength;
+      embeddedItem.url       = new char[embeddedItem.urlLength];
+      memcpy(embeddedItem.url, attribute.valueBuffer, embeddedItem.urlLength);
+      // The memory is freed when the font run is removed from the logical model.
+    }
+    else if(TokenComparison(MARKUP::EMBEDDED_ITEM_ATTRIBUTES::WIDTH, attribute.nameBuffer, attribute.nameLength))
+    {
+      embeddedItem.width = StringToUint(attribute.valueBuffer);
+    }
+    else if(TokenComparison(MARKUP::EMBEDDED_ITEM_ATTRIBUTES::HEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      embeddedItem.height = StringToUint(attribute.valueBuffer);
+    }
+    else if(TokenComparison(MARKUP::EMBEDDED_ITEM_ATTRIBUTES::COLOR_BLENDING, attribute.nameBuffer, attribute.nameLength))
+    {
+      if(TokenComparison(MULTIPLY, attribute.valueBuffer, attribute.valueLength))
+      {
+        embeddedItem.colorBlendingMode = ColorBlendingMode::MULTIPLY;
+      }
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h
new file mode 100644
index 0000000..ed6a371
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h
@@ -0,0 +1,44 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_EMBEDDED_ITEM_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_EMBEDDED_ITEM_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct EmbeddedItem;
+
+/**
+ * @brief Retrieves the @e embedded @e item from the @p tag.
+ *
+ * @param[in] tag The embedded item tag and its attributes.
+ * @param[in,out] embeddedItem The embedded item.
+ */
+void ProcessEmbeddedItem(const Tag& tag, EmbeddedItem& embeddedItem);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_EMBEDDED_ITEM_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-font.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-font.cpp
new file mode 100644
index 0000000..13afaa0
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-font.cpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-font.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+#include <dali-toolkit/internal/text/text-font-style.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace
+{
+const unsigned int MAX_FONT_ATTRIBUTE_SIZE = 15u;  ///< The maximum length of any of the possible 'weight', 'width' or 'slant' values.
+const float        PIXEL_FORMAT_64_FACTOR  = 64.f; ///< 64.f is used to convert from point size to 26.6 pixel format.
+} // namespace
+
+void processFontAttributeValue(char value[], const Attribute& attribute)
+{
+  // The StringToWeight() uses the Scripting::GetEnumeration() function which requires the input string to end with a '\0' char.
+  const Length length = attribute.valueLength > MAX_FONT_ATTRIBUTE_SIZE ? MAX_FONT_ATTRIBUTE_SIZE : attribute.valueLength;
+  memcpy(value, attribute.valueBuffer, length);
+  value[length] = 0;
+}
+
+void ProcessFontFamily(const Attribute& attribute, FontDescriptionRun& fontRun)
+{
+  fontRun.familyDefined = true;
+  fontRun.familyLength  = attribute.valueLength;
+  fontRun.familyName    = new char[fontRun.familyLength];
+  memcpy(fontRun.familyName, attribute.valueBuffer, fontRun.familyLength);
+  // The memory is freed when the font run is removed from the logical model.
+}
+
+void ProcessFontSize(const Attribute& attribute, FontDescriptionRun& fontRun)
+{
+  // 64.f is used to convert from point size to 26.6 pixel format.
+  fontRun.size        = static_cast<PointSize26Dot6>(ProcessFloatAttribute(attribute) * PIXEL_FORMAT_64_FACTOR);
+  fontRun.sizeDefined = true;
+}
+
+void ProcessFontWeight(const Attribute& attribute, FontDescriptionRun& fontRun)
+{
+  fontRun.weightDefined = ProcessEnumerationAttribute<FontWeight>(attribute, MAX_FONT_ATTRIBUTE_SIZE, &StringToWeight, fontRun.weight);
+}
+
+void ProcessFontWidth(const Attribute& attribute, FontDescriptionRun& fontRun)
+{
+  fontRun.widthDefined = ProcessEnumerationAttribute<FontWidth>(attribute, MAX_FONT_ATTRIBUTE_SIZE, &StringToWidth, fontRun.width);
+}
+
+void ProcessFontSlant(const Attribute& attribute, FontDescriptionRun& fontRun)
+{
+  fontRun.slantDefined = ProcessEnumerationAttribute<FontSlant>(attribute, MAX_FONT_ATTRIBUTE_SIZE, &StringToSlant, fontRun.slant);
+}
+
+void ProcessFontTag(const Tag& tag, FontDescriptionRun& fontRun)
+{
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+
+    if(TokenComparison(MARKUP::FONT_ATTRIBUTES::FAMILY, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessFontFamily(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::FONT_ATTRIBUTES::SIZE, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessFontSize(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::FONT_ATTRIBUTES::WEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessFontWeight(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::FONT_ATTRIBUTES::WIDTH, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessFontWidth(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::FONT_ATTRIBUTES::SLANT, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessFontSlant(attribute, fontRun);
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-font.h b/dali-toolkit/internal/text/markup-processor/markup-processor-font.h
new file mode 100644
index 0000000..cc2b561
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-font.h
@@ -0,0 +1,85 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct Attribute;
+struct FontDescriptionRun;
+
+/**
+ * @brief Retrieves the font attributes from the tag and sets it to the font run.
+ *
+ * @param[in] tag The font tag and its attributes.
+ * @param[in,out] fontRun The font description run.
+ */
+void ProcessFontTag(const Tag& tag, FontDescriptionRun& fontRun);
+
+/**
+ * @brief Fill the font run with the font slant attribute value.
+ *
+ * @param[in] attribute the font slant attribute.
+ * @param[out] fontRun The font description run.
+ */
+void ProcessFontSlant(const Attribute& attribute, FontDescriptionRun& fontRun);
+
+/**
+ * @brief Fill the font run with the font width attribute value.
+ *
+ * @param[in] attribute the font width attribute.
+ * @param[out] fontRun The font description run.
+ */
+void ProcessFontWidth(const Attribute& attribute, FontDescriptionRun& fontRun);
+
+/**
+ * @brief Fill the font run with the font weight attribute value.
+ *
+ * @param[in] attribute the font weight attribute.
+ * @param[out] fontRun The font description run.
+ */
+void ProcessFontWeight(const Attribute& attribute, FontDescriptionRun& fontRun);
+
+/**
+ * @brief Fill the font run with the font size attribute value.
+ *
+ * @param[in] attribute the font size attribute.
+ * @param[out] fontRun The font description run.
+ */
+void ProcessFontSize(const Attribute& attribute, FontDescriptionRun& fontRun);
+
+/**
+ * @brief Fill the font run with the font family attribute value.
+ *
+ * @param[in] attribute the font family attribute.
+ * @param[out] fontRun The font description run.
+ */
+void ProcessFontFamily(const Attribute& attribute, FontDescriptionRun& fontRun);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.cpp
new file mode 100644
index 0000000..f7ed507
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.cpp
@@ -0,0 +1,352 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/constants.h>
+#include <dali/public-api/math/vector2.h>
+#include <stdlib.h>
+#include <iomanip>
+#include <sstream>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace
+{
+const char WHITE_SPACE      = 0x20; // ASCII value of the white space.
+const char FIRST_UPPER_CASE = 0x41; // ASCII value of the one after the first upper case character (A).
+const char LAST_UPPER_CASE  = 0x5b; // ASCII value of the one after the last upper case character (Z).
+const char TO_LOWER_CASE    = 32;   // Value to add to a upper case character to transform it into a lower case.
+
+const unsigned int MAX_FLOAT_ATTRIBUTE_SIZE = 17u; ///< The maximum length of any of the possible float values.  +99999.999999999f  (sign, five digits, dot, nine digits, f)
+
+const char        WEB_COLOR_TOKEN('#');
+const char* const HEX_COLOR_TOKEN("0x");
+const char* const ALPHA_ONE("FF");
+
+const char* BLACK_COLOR("black");
+const char* WHITE_COLOR("white");
+const char* RED_COLOR("red");
+const char* GREEN_COLOR("green");
+const char* BLUE_COLOR("blue");
+const char* YELLOW_COLOR("yellow");
+const char* MAGENTA_COLOR("magenta");
+const char* CYAN_COLOR("cyan");
+const char* TRANSPARENT_COLOR("transparent");
+
+const char* SOLID_UNDERLINE("solid");
+const char* DASHED_UNDERLINE("dashed");
+const char* DOUBLE_UNDERLINE("double");
+
+const char* BEGIN_HORIZONTAL_ALIGNMENT("begin");
+const char* CENTER_HORIZONTAL_ALIGNMENT("center");
+const char* END_HORIZONTAL_ALIGNMENT("end");
+
+} // namespace
+
+bool TokenComparison(const std::string& string1, const char* const stringBuffer2, Length length)
+{
+  const Length stringSize = string1.size();
+  if(stringSize != length)
+  {
+    // Early return. Strings have different sizes.
+    return false;
+  }
+
+  const char* const stringBuffer1 = string1.c_str();
+
+  for(std::size_t index = 0; index < stringSize; ++index)
+  {
+    const char character = *(stringBuffer2 + index);
+    const bool toLower   = (character < LAST_UPPER_CASE) && (character >= FIRST_UPPER_CASE);
+    if(*(stringBuffer1 + index) != (toLower ? character + TO_LOWER_CASE : character))
+    {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+void SkipWhiteSpace(const char*&      stringBuffer,
+                    const char* const stringEndBuffer)
+{
+  for(; (WHITE_SPACE >= *stringBuffer) && (stringBuffer < stringEndBuffer); ++stringBuffer)
+    ;
+}
+
+void JumpToWhiteSpace(const char*&      stringBuffer,
+                      const char* const stringEndBuffer)
+{
+  for(; (WHITE_SPACE != *stringBuffer) && (stringBuffer < stringEndBuffer); ++stringBuffer)
+    ;
+}
+
+unsigned int StringToUint(const char* const uintStr)
+{
+  return static_cast<unsigned int>(strtoul(uintStr, NULL, 10));
+}
+
+unsigned int StringToHex(const char* const uintStr)
+{
+  return static_cast<unsigned int>(strtoul(uintStr, NULL, 16));
+}
+
+float StringToFloat(const char* const floatStr)
+{
+  return static_cast<float>(strtod(floatStr, NULL));
+}
+
+void FloatToString(float value, std::string& floatStr)
+{
+  std::stringstream ss;
+  ss << value;
+  floatStr = ss.str();
+}
+
+void UintToString(unsigned int value, std::string& uIntStr)
+{
+  std::stringstream ss;
+  ss << value;
+  uIntStr = ss.str();
+}
+
+void UintColorToVector4(unsigned int color, Vector4& retColor)
+{
+  retColor.a = static_cast<float>((color & 0xFF000000) >> 24u) / 255.f;
+  retColor.r = static_cast<float>((color & 0x00FF0000) >> 16u) / 255.f;
+  retColor.g = static_cast<float>((color & 0x0000FF00) >> 8u) / 255.f;
+  retColor.b = static_cast<float>(color & 0x000000FF) / 255.f;
+}
+
+void ColorStringToVector4(const char* const colorStr, Length length, Vector4& retColor)
+{
+  if(WEB_COLOR_TOKEN == *colorStr)
+  {
+    std::string webColor(colorStr + 1u, length - 1u);
+    if(4u == length) // 3 component web color #F00 (red)
+    {
+      webColor.insert(2u, &(webColor[2]), 1u);
+      webColor.insert(1u, &(webColor[1]), 1u);
+      webColor.insert(0u, &(webColor[0]), 1u);
+      webColor.insert(0u, ALPHA_ONE);
+    }
+    else if(7u == length) // 6 component web color #FF0000 (red)
+    {
+      webColor.insert(0u, ALPHA_ONE);
+    }
+
+    UintColorToVector4(StringToHex(webColor.c_str()), retColor);
+  }
+  else if(TokenComparison(HEX_COLOR_TOKEN, colorStr, 2u))
+  {
+    UintColorToVector4(StringToHex(colorStr + 2u), retColor);
+  }
+  else if(TokenComparison(BLACK_COLOR, colorStr, length))
+  {
+    retColor = Color::BLACK;
+  }
+  else if(TokenComparison(WHITE_COLOR, colorStr, length))
+  {
+    retColor = Color::WHITE;
+  }
+  else if(TokenComparison(RED_COLOR, colorStr, length))
+  {
+    retColor = Color::RED;
+  }
+  else if(TokenComparison(GREEN_COLOR, colorStr, length))
+  {
+    retColor = Color::GREEN;
+  }
+  else if(TokenComparison(BLUE_COLOR, colorStr, length))
+  {
+    retColor = Color::BLUE;
+  }
+  else if(TokenComparison(YELLOW_COLOR, colorStr, length))
+  {
+    retColor = Color::YELLOW;
+  }
+  else if(TokenComparison(MAGENTA_COLOR, colorStr, length))
+  {
+    retColor = Color::MAGENTA;
+  }
+  else if(TokenComparison(CYAN_COLOR, colorStr, length))
+  {
+    retColor = Color::CYAN;
+  }
+  else if(TokenComparison(TRANSPARENT_COLOR, colorStr, length))
+  {
+    retColor = Color::TRANSPARENT;
+  }
+}
+
+void Vector4ToColorString(const Vector4& value, std::string& vector2Str)
+{
+  if(Color::BLACK == value)
+  {
+    vector2Str = BLACK_COLOR;
+    return;
+  }
+
+  if(Color::WHITE == value)
+  {
+    vector2Str = WHITE_COLOR;
+    return;
+  }
+
+  if(Color::RED == value)
+  {
+    vector2Str = RED_COLOR;
+    return;
+  }
+
+  if(Color::GREEN == value)
+  {
+    vector2Str = GREEN_COLOR;
+    return;
+  }
+
+  if(Color::BLUE == value)
+  {
+    vector2Str = BLUE_COLOR;
+    return;
+  }
+
+  if(Color::YELLOW == value)
+  {
+    vector2Str = YELLOW_COLOR;
+    return;
+  }
+
+  if(Color::MAGENTA == value)
+  {
+    vector2Str = MAGENTA_COLOR;
+    return;
+  }
+
+  if(Color::CYAN == value)
+  {
+    vector2Str = CYAN_COLOR;
+    return;
+  }
+
+  if(Color::TRANSPARENT == value)
+  {
+    vector2Str = TRANSPARENT_COLOR;
+    return;
+  }
+
+  const unsigned int alpha = static_cast<unsigned int>(255.f * value.a);
+  const unsigned int red   = static_cast<unsigned int>(255.f * value.r);
+  const unsigned int green = static_cast<unsigned int>(255.f * value.g);
+  const unsigned int blue  = static_cast<unsigned int>(255.f * value.b);
+
+  std::stringstream  ss;
+  const unsigned int size = 2u * sizeof(unsigned char);
+
+  ss << "0x"
+     << std::setfill('0') << std::setw(size)
+     << std::hex << alpha
+     << std::setfill('0') << std::setw(size)
+     << std::hex << red
+     << std::setfill('0') << std::setw(size)
+     << std::hex << green
+     << std::setfill('0') << std::setw(size)
+     << std::hex << blue;
+  vector2Str = ss.str();
+}
+
+void StringToVector2(const char* const vectorStr, Length length, Vector2& vector2)
+{
+  // Points to the first character of the string.
+  const char* strBuffer = vectorStr;
+
+  // Points to the first character of the 'x' value.
+  const char* const xBuffer = strBuffer;
+
+  // Jumps to the next white space.
+  JumpToWhiteSpace(strBuffer, strBuffer + length);
+
+  // Points to the first character of the 'y' value.
+  const char* const yBuffer = strBuffer;
+
+  // Converts the shadow's offset to float.
+  vector2.x = StringToFloat(xBuffer);
+  vector2.y = StringToFloat(yBuffer);
+}
+
+void Vector2ToString(const Vector2& value, std::string& vector2Str)
+{
+  FloatToString(value.x, vector2Str);
+  vector2Str += " ";
+
+  std::string yStr;
+  FloatToString(value.y, yStr);
+
+  vector2Str += yStr;
+}
+
+void UnderlineTypeStringToTypeValue(const char* const typeStr, Length length, Text::Underline::Type& retType)
+{
+  if(TokenComparison(SOLID_UNDERLINE, typeStr, length))
+  {
+    retType = Text::Underline::SOLID;
+  }
+  else if(TokenComparison(DASHED_UNDERLINE, typeStr, length))
+  {
+    retType = Text::Underline::DASHED;
+  }
+  else if(TokenComparison(DOUBLE_UNDERLINE, typeStr, length))
+  {
+    retType = Text::Underline::DOUBLE;
+  }
+}
+
+bool HorizontalAlignmentTypeStringToTypeValue(const char* const typeStr, Length length, Text::HorizontalAlignment::Type& retType)
+{
+  // The string is valid value for HorizontalAlignment
+  bool valid = false;
+  if(TokenComparison(BEGIN_HORIZONTAL_ALIGNMENT, typeStr, length))
+  {
+    retType = Text::HorizontalAlignment::BEGIN;
+    valid   = true;
+  }
+  else if(TokenComparison(CENTER_HORIZONTAL_ALIGNMENT, typeStr, length))
+  {
+    retType = Text::HorizontalAlignment::CENTER;
+    valid   = true;
+  }
+  else if(TokenComparison(END_HORIZONTAL_ALIGNMENT, typeStr, length))
+  {
+    retType = Text::HorizontalAlignment::END;
+    valid   = true;
+  }
+
+  return valid;
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h b/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h
new file mode 100644
index 0000000..d763318
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h
@@ -0,0 +1,222 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/text-definitions.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+
+namespace Dali
+{
+struct Vector2;
+struct Vector4;
+
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Stores an attribute pair: name, value.
+ */
+struct Attribute
+{
+  const char* nameBuffer;
+  const char* valueBuffer;
+  Length      nameLength;
+  Length      valueLength;
+};
+
+/**
+ * @brief Stores a tag and its attributes.
+ */
+struct Tag
+{
+  Vector<Attribute> attributes;
+  const char*       buffer;
+  Length            length;
+  bool              isEndTag;
+};
+
+/**
+ * @brief Compare if two tokens are equal.
+ *
+ * @pre @p string1 must be lower case. (The html-ish constant tokens)
+ * The @p stringBuffer2 parameter is transformed to lower case.
+ * This function is used in the mark-up parser.
+ * It has no sense to transform the constants html-ish tokens to lower case when
+ * it's known they already are.
+ *
+ * @param[in] string1 The html-ish constant token.
+ * @param[in] stringBuffer2 Pointer to the html-ish token buffer.
+ * @param[in] length The length of the html-ish token.
+ *
+ * @return @e true if both strings are equal.
+ */
+bool TokenComparison(const std::string& string1, const char* const stringBuffer2, Length length);
+
+/**
+ * @brief Skips any unnecessary white space.
+ *
+ * @param[in,out] stringBuffer The string buffer. It's a const iterator pointing the current character.
+ * @param[in] stringEndBuffer Pointer to one character after the end of the string buffer.
+ */
+void SkipWhiteSpace(const char*&      stringBuffer,
+                    const char* const stringEndBuffer);
+
+/**
+ * @Brief Jumps to the next white space.
+ *
+ * @param[in,out] stringBuffer The string buffer. It's a const iterator pointing the current character.
+ * @param[in] stringEndBuffer Pointer to one character after the end of the string buffer.
+ */
+void JumpToWhiteSpace(const char*&      stringBuffer,
+                      const char* const stringEndBuffer);
+
+/**
+* @brief Converts a string into an unsigned int.
+*
+* @param[in] uintStr An unsigned int packed inside a string.
+*
+* @return The unsigned int value.
+*/
+unsigned int StringToUint(const char* const uintStr);
+
+/**
+ * @brief Converts a string into an hexadecimal unsigned int.
+ *
+ * @param[in] uintStr An hexadecimal unsigned int packed inside a string.
+ *
+ * @return The hexadecimal value.
+ */
+unsigned int StringToHex(const char* const uintStr);
+
+/**
+ * @brief Converts a string into a float value.
+ *
+ * @param[in] floatStr A float packed inside a string.
+ *
+ * @return The float value.
+ */
+float StringToFloat(const char* const floatStr);
+
+/**
+ * @brief Converts a float into a string.
+ *
+ * @param[in] value The float value.
+ * @param[out] floatStr The string.
+ */
+void FloatToString(float value, std::string& floatStr);
+
+/**
+ * @brief Converts an unsigned int into a string.
+ *
+ * @param[in] value The unsigned int value.
+ * @param[out] uIntStr The string.
+ */
+void UintToString(unsigned int value, std::string& uIntStr);
+
+/**
+ * @brief Converts an ARGB color packed in 4 byte unsigned int into a Vector4 color used in Dali.
+ *
+ * @param[in] color An ARGB color packed in an unsigned int.
+ * @param[out] retColor A Vector4 with the converted color.
+ */
+void UintColorToVector4(unsigned int color, Vector4& retColor);
+
+/**
+ * @brief Converts a color packed inside a string into an ARGB Vector4 color.
+ *
+ * The string color could be in hexadecimal ( 0xFF0000FF ), webcolor ( #0000FF or #00F ) or some constant values:
+ * black, white, red, green, blue, yellow, magenta, cyan or transparent.
+ *
+ * @param[in] colorStr A color packed inside a string.
+ * @param[in] length The length of the color string.
+ * @param[out] retColor A color packed inside a Vector4.
+ */
+void ColorStringToVector4(const char* const colorStr, Length length, Vector4& retColor);
+
+/**
+ * @brief Converts a color packed in a Vector4 into a string.
+ *
+ * Constant colors will be converted to the strings black, white, red, green, blue, yellow, magenta, cyan or transparent.
+ *
+ * If is not a constant color it will be converted to a string with hexadecimal ARGB content.
+ *
+ * @param[in] value The color value.
+ * @param[out] colorStr The string.
+ */
+void Vector4ToColorString(const Vector4& value, std::string& vector2Str);
+
+/**
+ * @brief Converts a two dimension vector packed inside a string into a Vector2.
+ *
+ * @param[in] vectorStr The two dimension vector packed inside a string.
+ * @param[in] length The length of the string.
+ * @param[out] vector2 The Vector2.
+ */
+void StringToVector2(const char* const vectorStr, Length length, Vector2& vector2);
+
+/**
+ * @brief Converts a Vector2 into a string.
+ *
+ * @param[in] value The vector2 value.
+ * @param[out] vector2Str The string.
+ */
+void Vector2ToString(const Vector2& value, std::string& vector2Str);
+
+/**
+ * @brief Converts a string into its value in the enum Text::Underline::Type.
+ *
+ * @param[in] typeStr The underline type value packed inside a string.
+ * @param[in] length The length of the string.
+ * @param[out] retType The Underline type.
+ */
+void UnderlineTypeStringToTypeValue(const char* const typeStr, Length length, Text::Underline::Type& retType);
+
+/**
+ * @brief Converts a string into a float value.
+ *
+ * @param[in] floatStr A float packed inside a string.
+ *
+ * @return The float value.
+ */
+float StringToFloat(const char* const floatStr);
+
+/**
+ * @brief Converts a string into its value in the enum Text::HorizontalAlignment::Type.
+ *
+ * @param[in] typeStr The horizontal-alignment type value packed inside a string.
+ * @param[in] length The length of the string.
+ * @param[out] retType The HorizontalAlignment type.
+ *
+ * @return Whether the value parsed or not.
+ */
+bool HorizontalAlignmentTypeStringToTypeValue(const char* const typeStr, Length length, Text::HorizontalAlignment::Type& retType);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.cpp
new file mode 100644
index 0000000..8676198
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void ProcessHorizontalAlignment(const Attribute& attribute, BoundedParagraphRun& boundedParagraphRun)
+{
+  boundedParagraphRun.horizontalAlignmentDefined = HorizontalAlignmentTypeStringToTypeValue(attribute.valueBuffer,
+                                                                                            attribute.valueLength,
+                                                                                            boundedParagraphRun.horizontalAlignment);
+}
+
+void ProcessRelativeLineHeight(const Attribute& attribute, BoundedParagraphRun& boundedParagraphRun)
+{
+  boundedParagraphRun.relativeLineSize        = StringToFloat(attribute.valueBuffer);
+  boundedParagraphRun.relativeLineSizeDefined = true;
+}
+
+void ProcessAttributesOfParagraphTag(const Tag& tag, BoundedParagraphRun& boundedParagraphRun)
+{
+  // By default the align attribute is not defined until it's parsed.
+  boundedParagraphRun.horizontalAlignmentDefined = false;
+
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+    if(TokenComparison(MARKUP::PARAGRAPH_ATTRIBUTES::ALIGN, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessHorizontalAlignment(attribute, boundedParagraphRun);
+    }
+    else if(TokenComparison(MARKUP::PARAGRAPH_ATTRIBUTES::RELATIVE_LINE_HEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessRelativeLineHeight(attribute, boundedParagraphRun);
+    }
+  }
+}
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h b/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h
new file mode 100644
index 0000000..2859794
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h
@@ -0,0 +1,61 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_PARAGRAPH_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_PARAGRAPH_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct Attribute;
+struct BoundedParagraphRun;
+
+/**
+ * @brief Retrieves the horizontal alignment value from the tag and sets it to the bounded paragraph run.
+ *
+ * @param[in] attribute the horizontal alignment attribute.
+ * @param[in,out] boundedParagraphRun The bounded paragraph run.
+ */
+void ProcessHorizontalAlignment(const Attribute& attribute, BoundedParagraphRun& boundedParagraphRun);
+
+/**
+ * @brief Retrieves the paragraph value from the tag and sets it to the bounded paragraph run.
+ *
+ * @param[in] tag The paragraph tag and its attributes.
+ * @param[in,out] boundedParagraphRun The bounded paragraph run.
+ */
+void ProcessAttributesOfParagraphTag(const Tag& tag, BoundedParagraphRun& boundedParagraphRun);
+
+/**
+ * @brief Retrieves the relative line height value from the paragraph tag and sets it to the bounded paragraph run.
+ *
+ * @param[in] attribute the relative line height attribute.
+ * @param[in,out] boundedParagraphRun The bounded paragraph run.
+ */
+void ProcessRelativeLineHeight(const Attribute& attribute, BoundedParagraphRun& boundedParagraphRun);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_PARAGRAPH_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-span.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-span.cpp
new file mode 100644
index 0000000..5f8dfa2
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-span.cpp
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-color.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-font.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-underline.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void ProcessSpanTag(const Tag&                    tag,
+                    ColorRun&                     colorRun,
+                    FontDescriptionRun&           fontRun,
+                    UnderlinedCharacterRun&       underlinedCharacterRun,
+                    ColorRun&                     backgroundColorRun,
+                    StrikethroughCharacterRun&    strikethroughRun,
+                    CharacterSpacingCharacterRun& characterSpacingCharacterRun,
+                    bool&                         isColorDefined,
+                    bool&                         isFontDefined,
+                    bool&                         isUnderlinedCharacterDefined,
+                    bool&                         isBackgroundColorDefined,
+                    bool&                         isStrikethroughDefined,
+                    bool&                         isCharacterSpacingDefined)
+{
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+
+    if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::TEXT_COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      isColorDefined = true;
+      ProcessColor(attribute, colorRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::BACKGROUND_COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      isBackgroundColorDefined = true;
+      ProcessColor(attribute, backgroundColorRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::FONT_FAMILY, attribute.nameBuffer, attribute.nameLength))
+    {
+      isFontDefined = true;
+      ProcessFontFamily(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::FONT_SIZE, attribute.nameBuffer, attribute.nameLength))
+    {
+      isFontDefined = true;
+      ProcessFontSize(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::FONT_WEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      isFontDefined = true;
+      ProcessFontWeight(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::FONT_WIDTH, attribute.nameBuffer, attribute.nameLength))
+    {
+      isFontDefined = true;
+      ProcessFontWidth(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::FONT_SLANT, attribute.nameBuffer, attribute.nameLength))
+    {
+      isFontDefined = true;
+      ProcessFontSlant(attribute, fontRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::UNDERLINE_COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      isUnderlinedCharacterDefined = true;
+      ProcessColorAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::UNDERLINE_HEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      isUnderlinedCharacterDefined = true;
+      ProcessHeightAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::UNDERLINE_TYPE, attribute.nameBuffer, attribute.nameLength))
+    {
+      isUnderlinedCharacterDefined = true;
+      ProcessTypeAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::UNDERLINE_DASH_GAP, attribute.nameBuffer, attribute.nameLength))
+    {
+      isUnderlinedCharacterDefined = true;
+      ProcessDashGapAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::UNDERLINE_DASH_WIDTH, attribute.nameBuffer, attribute.nameLength))
+    {
+      isUnderlinedCharacterDefined = true;
+      ProcessDashWidthAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::STRIKETHROUGH_COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      isStrikethroughDefined = true;
+      ProcessColorAttribute(attribute, strikethroughRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::STRIKETHROUGH_HEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      isStrikethroughDefined = true;
+      ProcessHeightAttribute(attribute, strikethroughRun);
+    }
+    else if(TokenComparison(MARKUP::SPAN_ATTRIBUTES::CHARACTER_SPACING_VALUE, attribute.nameBuffer, attribute.nameLength))
+    {
+      isCharacterSpacingDefined = true;
+      ProcessValueAttribute(attribute, characterSpacingCharacterRun);
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-span.h b/dali-toolkit/internal/text/markup-processor/markup-processor-span.h
new file mode 100644
index 0000000..5630fd3
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-span.h
@@ -0,0 +1,67 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_SPAN_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_SPAN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct MarkupProcessData;
+
+/**
+ * @brief process the span from the tag and process all styles in it.
+ *
+ * @param[in] tag The span tag and its attributes.
+ * @param[out] colorRun the color run to be filled.
+ * @param[out] fontRun the font run to be filled.
+ * @param[out] underlinedCharacterRun the underlined character run to be filled.
+ * @param[out] backgroundColorRun the background color run to be filled.
+ * @param[out] strikethroughRun the strikethrough run to be filled.
+ * @param[out] characterSpacingCharacterRun the character-spacing run to be filled.
+ * @param[out] isColorDefined if the span has color defined.
+ * @param[out] isFontDefined if the span has font defined.
+ * @param[out] isUnderlinedCharacterDefined if the span has underlined-character defined.
+ * @param[out] isBackgroundColorDefined if the span has background color defined.
+ * @param[out] isStrikethroughDefined if the span has strikethrough defined.
+ * @param[out] isCharacterSpacingDefined if the span has character-spacing defined.
+ */
+void ProcessSpanTag(const Tag&                    tag,
+                    ColorRun&                     colorRun,
+                    FontDescriptionRun&           fontRun,
+                    UnderlinedCharacterRun&       underlinedCharacterRun,
+                    ColorRun&                     backgroundColorRun,
+                    StrikethroughCharacterRun&    strikethroughRun,
+                    CharacterSpacingCharacterRun& characterSpacingCharacterRun,
+                    bool&                         isColorDefined,
+                    bool&                         isFontDefined,
+                    bool&                         isUnderlinedCharacterDefined,
+                    bool&                         isBackgroundColorDefined,
+                    bool&                         isStrikethroughDefined,
+                    bool&                         isCharacterSpacingDefined);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_SPAN_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.cpp
new file mode 100644
index 0000000..5d08c93
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+#include <dali-toolkit/internal/text/strikethrough-character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+void ProcessColorAttribute(const Attribute& attribute, StrikethroughCharacterRun& strikethroughRun)
+
+{
+  ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, strikethroughRun.properties.color);
+  strikethroughRun.properties.colorDefined = true;
+}
+
+void ProcessHeightAttribute(const Attribute& attribute, StrikethroughCharacterRun& strikethroughRun)
+{
+  strikethroughRun.properties.height        = ProcessFloatAttribute(attribute);
+  strikethroughRun.properties.heightDefined = true;
+}
+
+void ProcessStrikethroughTag(const Tag& tag, StrikethroughCharacterRun& strikethroughRun)
+{
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+
+    if(TokenComparison(MARKUP::STRIKETHROUGH_ATTRIBUTES::COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessColorAttribute(attribute, strikethroughRun);
+    }
+    else if(TokenComparison(MARKUP::STRIKETHROUGH_ATTRIBUTES::HEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessHeightAttribute(attribute, strikethroughRun);
+    }
+  }
+}
+
+void OverrideNestedStrikethroughCharacterRuns(Vector<StrikethroughCharacterRun>& strikethroughCharacterRuns)
+{
+  // Handle nested tags
+  // The inner tag inherit the attributes of the outer tag and override them when defined in the inner tag.
+  // Example:
+  // <s height='5.0f' color='blue'> outer tag before  <s color='green'> inner tag </s> outer tag after </s>
+  // "outer tag before" and  "outer tag after" have height = 5.0f and color = 'blue'
+  // "inner tag" has height = 5.0f and color = 'green'
+
+  if(strikethroughCharacterRuns.Count() > 0u)
+  {
+    Vector<StrikethroughCharacterRun>::ConstIterator preIt = strikethroughCharacterRuns.Begin();
+
+    Vector<StrikethroughCharacterRun>::Iterator      it    = strikethroughCharacterRuns.Begin() + 1;
+    Vector<StrikethroughCharacterRun>::ConstIterator endIt = strikethroughCharacterRuns.End();
+
+    while(it != endIt)
+    {
+      const StrikethroughCharacterRun& run                = *it;
+      const CharacterIndex&            characterIndex     = run.characterRun.characterIndex;
+      const Length&                    numberOfCharacters = run.characterRun.numberOfCharacters;
+
+      const StrikethroughCharacterRun& preRun                = *preIt;
+      const CharacterIndex&            preCharacterIndex     = preRun.characterRun.characterIndex;
+      const Length&                    preNumberOfCharacters = preRun.characterRun.numberOfCharacters;
+
+      if((preCharacterIndex <= characterIndex) &&
+         ((characterIndex + numberOfCharacters) <= (preCharacterIndex + preNumberOfCharacters)))
+      {
+        it->properties.CopyIfNotDefined(preIt->properties);
+      }
+
+      it++;
+      preIt++;
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h b/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h
new file mode 100644
index 0000000..fca6d34
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h
@@ -0,0 +1,74 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_STRIKETHROUGH_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_STRIKETHROUGH_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/strikethrough-character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct Attribute;
+struct StrikethroughCharacterRun;
+
+/**
+ * @brief Fill the strikethrough character run with the color attribute value.
+ *
+ * @param[in] attribute the color attribute.
+ * @param[out] strikethroughCharacterRun The strikethrough character run
+ */
+void ProcessColorAttribute(const Attribute& attribute, StrikethroughCharacterRun& strikethroughCharacterRun);
+
+/**
+ * @brief Fill the strikethrough character run with the height attribute value.
+ *
+ * @param[in] attribute the height attribute.
+ * @param[out] strikethroughRun The strikethrough character run
+ */
+void ProcessHeightAttribute(const Attribute& attribute, StrikethroughCharacterRun& strikethroughRun);
+
+/**
+ * @brief Retrieves the strikethrough run info from the tag and sets it to the strikethrough run.
+ *
+ * @param[in] tag The strikethrough tag and its attributes.
+ * @param[in,out] strikethroughRun The strikethrough run.
+ */
+void ProcessStrikethroughTag(const Tag& tag, StrikethroughCharacterRun& strikethroughRun);
+
+/**
+ * @brief Override the run's attributes which contained in the previous run. This is to handle the nested tags.
+ *
+ * @param[in,out] strikethroughCharacterRun The list of strikethrough character run
+ */
+void OverrideNestedStrikethroughCharacterRuns(Vector<StrikethroughCharacterRun>& strikethroughCharacterRun);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_STRIKETHROUGH_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-underline.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor-underline.cpp
new file mode 100644
index 0000000..ac1b0ae
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-underline.cpp
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-underline.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-attribute-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+#include <dali-toolkit/internal/text/text-effects-style.h>
+#include <dali-toolkit/internal/text/underlined-character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace
+{
+const unsigned int MAX_TYPE_ATTRIBUTE_SIZE = 7u; ///< The maximum length of any of the possible 'type' values.
+
+} // namespace
+
+void ProcessTypeAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  underlinedCharacterRun.properties.typeDefined = ProcessEnumerationAttribute<Text::Underline::Type>(attribute,
+                                                                                                     MAX_TYPE_ATTRIBUTE_SIZE,
+                                                                                                     &StringToUnderlineType,
+                                                                                                     underlinedCharacterRun.properties.type);
+}
+
+void ProcessDashGapAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  underlinedCharacterRun.properties.dashGap        = ProcessFloatAttribute(attribute);
+  underlinedCharacterRun.properties.dashGapDefined = true;
+}
+
+void ProcessDashWidthAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  underlinedCharacterRun.properties.dashWidth        = ProcessFloatAttribute(attribute);
+  underlinedCharacterRun.properties.dashWidthDefined = true;
+}
+void ProcessHeightAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  underlinedCharacterRun.properties.height        = ProcessFloatAttribute(attribute);
+  underlinedCharacterRun.properties.heightDefined = true;
+}
+
+void ProcessColorAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  ColorStringToVector4(attribute.valueBuffer, attribute.valueLength, underlinedCharacterRun.properties.color);
+  underlinedCharacterRun.properties.colorDefined = true;
+}
+
+void ProcessUnderlineTag(const Tag& tag, UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  for(Vector<Attribute>::ConstIterator it    = tag.attributes.Begin(),
+                                       endIt = tag.attributes.End();
+      it != endIt;
+      ++it)
+  {
+    const Attribute& attribute(*it);
+
+    if(TokenComparison(MARKUP::UNDERLINE_ATTRIBUTES::COLOR, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessColorAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::UNDERLINE_ATTRIBUTES::HEIGHT, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessHeightAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::UNDERLINE_ATTRIBUTES::TYPE, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessTypeAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::UNDERLINE_ATTRIBUTES::DASH_GAP, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessDashGapAttribute(attribute, underlinedCharacterRun);
+    }
+    else if(TokenComparison(MARKUP::UNDERLINE_ATTRIBUTES::DASH_WIDTH, attribute.nameBuffer, attribute.nameLength))
+    {
+      ProcessDashWidthAttribute(attribute, underlinedCharacterRun);
+    }
+  }
+}
+
+void OverrideNestedUnderlinedCharacterRuns(Vector<UnderlinedCharacterRun>& underlinedCharacterRuns)
+{
+  // Handle nested tags
+  // The inner tag inherit the attributes of the outer tag and override them when defined in the inner tag.
+  // Example:
+  // <u height='5.0f' color='blue'> outer tag before  <u color='green'> inner tag </u> outer tag after </u>
+  // "outer tag before" and  "outer tag after" have height = 5.0f and color = 'blue'
+  // "inner tag" has height = 5.0f and color = 'green'
+
+  if(underlinedCharacterRuns.Count() > 0u)
+  {
+    Vector<UnderlinedCharacterRun>::ConstIterator preIt = underlinedCharacterRuns.Begin();
+
+    Vector<UnderlinedCharacterRun>::Iterator      it    = underlinedCharacterRuns.Begin() + 1;
+    Vector<UnderlinedCharacterRun>::ConstIterator endIt = underlinedCharacterRuns.End();
+
+    while(it != endIt)
+    {
+      const UnderlinedCharacterRun& run                = *it;
+      const CharacterIndex&         characterIndex     = run.characterRun.characterIndex;
+      const Length&                 numberOfCharacters = run.characterRun.numberOfCharacters;
+
+      const UnderlinedCharacterRun& preRun                = *preIt;
+      const CharacterIndex&         preCharacterIndex     = preRun.characterRun.characterIndex;
+      const Length&                 preNumberOfCharacters = preRun.characterRun.numberOfCharacters;
+
+      if((preCharacterIndex <= characterIndex) &&
+         ((characterIndex + numberOfCharacters) <= (preCharacterIndex + preNumberOfCharacters)))
+      {
+        it->properties.CopyIfNotDefined(preIt->properties);
+      }
+
+      it++;
+      preIt++;
+    }
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor-underline.h b/dali-toolkit/internal/text/markup-processor/markup-processor-underline.h
new file mode 100644
index 0000000..cde347c
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor-underline.h
@@ -0,0 +1,97 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_UNDERLINE_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_UNDERLINE_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/underlined-character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+struct Tag;
+struct Attribute;
+
+/**
+ * @brief Fill the underlined character run with the type attribute value.
+ *
+ * @param[in] attribute the type attribute.
+ * @param[out] underlinedCharacterRun The underlined character run
+ */
+void ProcessTypeAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun);
+
+/**
+ * @brief Fill the underlined character run with the dash-gap attribute value.
+ *
+ * @param[in] attribute the dash-gap attribute.
+ * @param[out] underlinedCharacterRun The underlined character run
+ */
+void ProcessDashGapAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun);
+
+/**
+ * @brief Fill the underlined character run with the dash-width attribute value.
+ *
+ * @param[in] attribute the dash-width attribute.
+ * @param[out] underlinedCharacterRun The underlined character run
+ */
+void ProcessDashWidthAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun);
+
+/**
+ * @brief Fill the underlined character run with the height attribute value.
+ *
+ * @param[in] attribute the height attribute.
+ * @param[out] underlinedCharacterRun The underlined character run
+ */
+void ProcessHeightAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun);
+
+/**
+ * @brief Fill the underlined character run with the color attribute value.
+ *
+ * @param[in] attribute the color attribute.
+ * @param[out] underlinedCharacterRun The underlined character run
+ */
+void ProcessColorAttribute(const Attribute& attribute, UnderlinedCharacterRun& underlinedCharacterRun);
+
+/**
+ * @brief Retrieves the underline run info from the tag and sets it to the underline run.
+ *
+ * @param[in] tag The underline tag and its attributes.
+ * @param[in,out] underlinedCharacterRun The underlined character run
+ */
+void ProcessUnderlineTag(const Tag& tag, UnderlinedCharacterRun& underlinedCharacterRun);
+
+/**
+ * @brief Override the run's attributes which contained in the previous run. This is to handle the nested tags.
+ *
+ * @param[in,out] underlinedCharacterRuns The list of underlined character run
+ */
+void OverrideNestedUnderlinedCharacterRuns(Vector<UnderlinedCharacterRun>& underlinedCharacterRuns);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_UNDERLINE_H
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor.cpp b/dali-toolkit/internal/text/markup-processor/markup-processor.cpp
new file mode 100644
index 0000000..654a44b
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor.cpp
@@ -0,0 +1,1327 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// FILE HEADER
+#include <dali-toolkit/internal/text/markup-processor/markup-processor.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <climits> // for ULONG_MAX
+#include <functional>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-anchor.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-background.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-character-spacing.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-color.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-embedded-item.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-font.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-paragraph.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-span.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-strikethrough.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-underline.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+#include <dali-toolkit/internal/text/xhtml-entities.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace
+{
+const char LESS_THAN      = '<';
+const char GREATER_THAN   = '>';
+const char EQUAL          = '=';
+const char QUOTATION_MARK = '\'';
+const char SLASH          = '/';
+const char BACK_SLASH     = '\\';
+const char AMPERSAND      = '&';
+const char HASH           = '#';
+const char SEMI_COLON     = ';';
+const char CHAR_ARRAY_END = '\0';
+const char HEX_CODE       = 'x';
+
+const char WHITE_SPACE = 0x20; // ASCII value of the white space.
+const char NEW_LINE    = 0x0A; // ASCII value of the newline.
+
+// Range 1 0x0u < XHTML_DECIMAL_ENTITY_RANGE <= 0xD7FFu
+// Range 2 0xE000u < XHTML_DECIMAL_ENTITY_RANGE <= 0xFFFDu
+// Range 3 0x10000u < XHTML_DECIMAL_ENTITY_RANGE <= 0x10FFFFu
+const unsigned long XHTML_DECIMAL_ENTITY_RANGE[] = {0x0u, 0xD7FFu, 0xE000u, 0xFFFDu, 0x10000u, 0x10FFFFu};
+
+// The MAX_NUM_OF_ATTRIBUTES is the number of attributes in span tag "markup-processor-span.cpp". Because it contains the maximum number of attributes in  all tags.
+const unsigned int MAX_NUM_OF_ATTRIBUTES = 14u; ///< The span tag has the 'font-family', 'font-size' 'font-weight', 'font-width', 'font-slant','text-color', 'u-color', 'u-height','u-type','u-dash-gap', 'u-dash-width', 's-color', 's-height' and 'char-space-value' attrubutes.
+const unsigned int DEFAULT_VECTOR_SIZE   = 16u; ///< Default size of run vectors.
+
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_MARKUP_PROCESSOR");
+#endif
+
+typedef VectorBase::SizeType RunIndex;
+
+/**
+ * @brief Struct used to retrieve the style runs from the mark-up string.
+ */
+template<typename StyleStackType>
+struct StyleStack
+{
+  Vector<StyleStackType> stack;    ///< Use a vector as a style stack.
+  unsigned int           topIndex; ///< Points the top of the stack.
+
+  StyleStack()
+  : stack(),
+    topIndex(0u)
+  {
+    stack.Resize(DEFAULT_VECTOR_SIZE);
+  }
+
+  void Push(StyleStackType item)
+  {
+    // Check if there is space inside the style stack.
+    const VectorBase::SizeType size = stack.Count();
+    if(topIndex >= size)
+    {
+      // Resize the style stack.
+      stack.Resize(2u * size);
+    }
+
+    // Set the item in the top of the stack.
+    *(stack.Begin() + topIndex) = item;
+
+    // Reposition the pointer to the top of the stack.
+    ++topIndex;
+  }
+
+  StyleStackType Pop()
+  {
+    // Pop the top of the stack.
+    --topIndex;
+    return *(stack.Begin() + topIndex);
+  }
+};
+
+/**
+ * @brief Struct used to retrieve spans from the mark-up string.
+ */
+struct Span
+{
+  RunIndex colorRunIndex;
+  RunIndex fontRunIndex;
+  RunIndex underlinedCharacterRunIndex;
+  RunIndex backgroundColorRunIndex;
+  RunIndex strikethroughCharacterRunIndex;
+  RunIndex characterSpacingCharacterRunIndex;
+
+  bool isColorDefined;
+  bool isFontDefined;
+  bool isUnderlinedCharacterDefined;
+  bool isBackgroundColorDefined;
+  bool isStrikethroughDefined;
+  bool isCharacterSpacingDefined;
+};
+
+/**
+ * @brief Struct used to retrieve anchors from the mark-up string.
+ */
+struct AnchorForStack
+{
+  RunIndex colorRunIndex;
+  RunIndex underlinedCharacterRunIndex;
+};
+
+/**
+ * @brief Initializes a font run description to its defaults.
+ *
+ * @param[in,out] fontRun The font description run to initialize.
+ */
+void Initialize(FontDescriptionRun& fontRun)
+{
+  fontRun.characterRun.characterIndex     = 0u;
+  fontRun.characterRun.numberOfCharacters = 0u;
+  fontRun.familyName                      = NULL;
+  fontRun.familyLength                    = 0u;
+  fontRun.weight                          = TextAbstraction::FontWeight::NORMAL;
+  fontRun.width                           = TextAbstraction::FontWidth::NORMAL;
+  fontRun.slant                           = TextAbstraction::FontSlant::NORMAL;
+  fontRun.size                            = 0u;
+  fontRun.familyDefined                   = false;
+  fontRun.weightDefined                   = false;
+  fontRun.widthDefined                    = false;
+  fontRun.slantDefined                    = false;
+  fontRun.sizeDefined                     = false;
+}
+
+/**
+ * @brief Initializes a color run description to its defaults.
+ *
+ * @param[in,out] colorRun The font description run to initialize.
+ */
+void Initialize(ColorRun& colorRun)
+{
+  colorRun.characterRun.characterIndex     = 0u;
+  colorRun.characterRun.numberOfCharacters = 0u;
+}
+
+/**
+ * @brief Initializes a underlined character run to its defaults.
+ *
+ * @param[in,out] underlinedCharacterRun The underelined character run to initialize.
+ */
+void Initialize(UnderlinedCharacterRun& underlinedCharacterRun)
+{
+  underlinedCharacterRun.characterRun.characterIndex     = 0u;
+  underlinedCharacterRun.characterRun.numberOfCharacters = 0u;
+}
+
+/**
+ * @brief Initializes a span to its defaults.
+ *
+ * @param[in,out] span The span to be initialized.
+ */
+void Initialize(Span& span)
+{
+  span.colorRunIndex  = 0u;
+  span.isColorDefined = false;
+
+  span.fontRunIndex  = 0u;
+  span.isFontDefined = false;
+
+  span.underlinedCharacterRunIndex  = 0u;
+  span.isUnderlinedCharacterDefined = false;
+  span.backgroundColorRunIndex      = 0u;
+  span.isBackgroundColorDefined     = false;
+
+  //strikethrough
+  span.strikethroughCharacterRunIndex = 0u;
+  span.isStrikethroughDefined         = false;
+
+  //characterSpacing
+  span.characterSpacingCharacterRunIndex = 0u;
+  span.isCharacterSpacingDefined         = false;
+}
+
+/**
+ * @brief Initializes a anchor to its defaults.
+ *
+ * @param[in,out] anchor The anchor to be initialized.
+ */
+void Initialize(AnchorForStack& anchor)
+{
+  anchor.colorRunIndex               = 0u;
+  anchor.underlinedCharacterRunIndex = 0u;
+}
+
+/**
+ * @brief Initializes a strikethrough character run to its defaults.
+ *
+ * @param[in,out] strikethroughCharacterRun The strikethrough character run to initialize.
+ */
+void Initialize(StrikethroughCharacterRun& strikethroughCharacterRun)
+{
+  strikethroughCharacterRun.characterRun.characterIndex     = 0u;
+  strikethroughCharacterRun.characterRun.numberOfCharacters = 0u;
+  strikethroughCharacterRun.properties.colorDefined         = false;
+}
+
+/**
+ * @brief Initializes a  bounded-paragraph character run to its defaults.
+ *
+ * @param[in,out] boundedParagraphRun The bounded paragraphRun run to initialize.
+ */
+void Initialize(BoundedParagraphRun& boundedParagraphRun)
+{
+  boundedParagraphRun.characterRun.characterIndex     = 0u;
+  boundedParagraphRun.characterRun.numberOfCharacters = 0u;
+}
+
+/**
+ * @brief Initializes a character-spacing run to its defaults.
+ *
+ * @param[in,out] characterSpacingCharacterRun The character-spacing run to initialize.
+ */
+void Initialize(CharacterSpacingCharacterRun& characterSpacingCharacterRun)
+{
+  characterSpacingCharacterRun.characterRun.characterIndex     = 0u;
+  characterSpacingCharacterRun.characterRun.numberOfCharacters = 0u;
+  characterSpacingCharacterRun.value                           = 0.0f;
+}
+
+/**
+ * @brief Splits the tag string into the tag name and its attributes.
+ *
+ * The attributes are stored in a vector in the tag.
+ *
+ * @param[in,out] tag The tag.
+ */
+void ParseAttributes(Tag& tag)
+{
+  if(tag.buffer == NULL)
+  {
+    return;
+  }
+
+  tag.attributes.Resize(MAX_NUM_OF_ATTRIBUTES);
+
+  // Find first the tag name.
+  bool isQuotationOpen = false;
+
+  const char*       tagBuffer    = tag.buffer;
+  const char* const tagEndBuffer = tagBuffer + tag.length;
+  tag.length                     = 0u;
+  for(; tagBuffer < tagEndBuffer; ++tagBuffer)
+  {
+    const char character = *tagBuffer;
+    if(WHITE_SPACE < character)
+    {
+      ++tag.length;
+    }
+    else
+    {
+      // Stops counting the length of the tag when a white space is found.
+      // @note a white space is the WHITE_SPACE character and anything below as 'tab', 'return' or 'control characters'.
+      break;
+    }
+  }
+  SkipWhiteSpace(tagBuffer, tagEndBuffer);
+
+  // Find the attributes.
+  unsigned int attributeIndex = 0u;
+  const char*  nameBuffer     = NULL;
+  const char*  valueBuffer    = NULL;
+  Length       nameLength     = 0u;
+  Length       valueLength    = 0u;
+
+  bool   addToNameValue     = true;
+  Length numberOfWhiteSpace = 0u;
+  for(; tagBuffer < tagEndBuffer; ++tagBuffer)
+  {
+    const char character = *tagBuffer;
+    if((WHITE_SPACE >= character) && !isQuotationOpen)
+    {
+      if(NULL != valueBuffer)
+      {
+        // Remove white spaces at the end of the value.
+        valueLength -= numberOfWhiteSpace;
+      }
+
+      if((NULL != nameBuffer) && (NULL != valueBuffer))
+      {
+        // Every time a white space is found, a new attribute is created and stored in the attributes vector.
+        Attribute& attribute = *(tag.attributes.Begin() + attributeIndex);
+        ++attributeIndex;
+
+        attribute.nameBuffer  = nameBuffer;
+        attribute.valueBuffer = valueBuffer;
+        attribute.nameLength  = nameLength;
+        attribute.valueLength = valueLength;
+
+        nameBuffer  = NULL;
+        valueBuffer = NULL;
+        nameLength  = 0u;
+        valueLength = 0u;
+
+        addToNameValue = true; // next read characters will be added to the name.
+      }
+    }
+    else if(EQUAL == character) // '='
+    {
+      if(isQuotationOpen)
+      {
+        ++valueLength;
+      }
+      else
+      {
+        addToNameValue = false; // next read characters will be added to the value.
+        SkipWhiteSpace(tagBuffer, tagEndBuffer);
+      }
+    }
+    else if(QUOTATION_MARK == character) // '\''
+    {
+      // Do not add quotation marks to neither name nor value.
+      isQuotationOpen = !isQuotationOpen;
+
+      if(isQuotationOpen)
+      {
+        ++tagBuffer;
+        SkipWhiteSpace(tagBuffer, tagEndBuffer);
+        --tagBuffer;
+      }
+    }
+    else
+    {
+      // Adds characters to the name or the value.
+      if(addToNameValue)
+      {
+        if(NULL == nameBuffer)
+        {
+          nameBuffer = tagBuffer;
+        }
+        ++nameLength;
+      }
+      else
+      {
+        if(isQuotationOpen)
+        {
+          if(WHITE_SPACE >= character)
+          {
+            ++numberOfWhiteSpace;
+          }
+          else
+          {
+            numberOfWhiteSpace = 0u;
+          }
+        }
+        if(NULL == valueBuffer)
+        {
+          valueBuffer = tagBuffer;
+        }
+        ++valueLength;
+      }
+    }
+  }
+
+  if(NULL != valueBuffer)
+  {
+    // Remove white spaces at the end of the value.
+    valueLength -= numberOfWhiteSpace;
+  }
+
+  if((NULL != nameBuffer) && (NULL != valueBuffer))
+  {
+    // Checks if the last attribute needs to be added.
+    Attribute& attribute = *(tag.attributes.Begin() + attributeIndex);
+    ++attributeIndex;
+
+    attribute.nameBuffer  = nameBuffer;
+    attribute.valueBuffer = valueBuffer;
+    attribute.nameLength  = nameLength;
+    attribute.valueLength = valueLength;
+  }
+
+  // Resize the vector of attributes.
+  tag.attributes.Resize(attributeIndex);
+}
+
+/**
+ * @brief It parses a tag and its attributes if the given iterator @e it is pointing at a tag beginning.
+ *
+ * @param[in,out] markupStringBuffer The mark-up string buffer. It's a const iterator pointing the current character.
+ * @param[in] markupStringEndBuffer Pointer to one character after the end of the mark-up string buffer.
+ * @param[out] tag The tag with its attributes.
+ *
+ * @return @e true if the iterator @e it is pointing a mark-up tag. Otherwise @e false.
+ */
+bool IsTag(const char*&      markupStringBuffer,
+           const char* const markupStringEndBuffer,
+           Tag&              tag)
+{
+  bool isTag              = false;
+  bool isQuotationOpen    = false;
+  bool attributesFound    = false;
+  tag.isEndTag            = false;
+  bool isPreviousLessThan = false;
+  bool isPreviousSlash    = false;
+
+  const char character = *markupStringBuffer;
+  if(LESS_THAN == character) // '<'
+  {
+    tag.buffer         = NULL;
+    tag.length         = 0u;
+    isPreviousLessThan = true;
+
+    // if the iterator is pointing to a '<' character, then check if it's a mark-up tag is needed.
+    ++markupStringBuffer;
+    if(markupStringBuffer < markupStringEndBuffer)
+    {
+      SkipWhiteSpace(markupStringBuffer, markupStringEndBuffer);
+
+      for(; (!isTag) && (markupStringBuffer < markupStringEndBuffer); ++markupStringBuffer)
+      {
+        const char character = *markupStringBuffer;
+
+        if(!isQuotationOpen && (SLASH == character)) // '/'
+        {
+          if(isPreviousLessThan)
+          {
+            tag.isEndTag = true;
+          }
+          else
+          {
+            // if the tag has a '/' it may be an end tag.
+            isPreviousSlash = true;
+          }
+
+          isPreviousLessThan = false;
+          if((markupStringBuffer + 1u < markupStringEndBuffer) && (WHITE_SPACE >= *(markupStringBuffer + 1u)))
+          {
+            ++markupStringBuffer;
+            SkipWhiteSpace(markupStringBuffer, markupStringEndBuffer);
+            --markupStringBuffer;
+          }
+        }
+        else if(GREATER_THAN == character) // '>'
+        {
+          isTag = true;
+          if(isPreviousSlash)
+          {
+            tag.isEndTag = true;
+          }
+
+          isPreviousSlash    = false;
+          isPreviousLessThan = false;
+        }
+        else if(QUOTATION_MARK == character)
+        {
+          isQuotationOpen = !isQuotationOpen;
+          ++tag.length;
+
+          isPreviousSlash    = false;
+          isPreviousLessThan = false;
+        }
+        else if(WHITE_SPACE >= character) // ' '
+        {
+          // If the tag contains white spaces then it may have attributes.
+          if(!isQuotationOpen)
+          {
+            attributesFound = true;
+          }
+          ++tag.length;
+        }
+        else
+        {
+          if(NULL == tag.buffer)
+          {
+            tag.buffer = markupStringBuffer;
+          }
+
+          // If it's not any of the 'special' characters then just add it to the tag string.
+          ++tag.length;
+
+          isPreviousSlash    = false;
+          isPreviousLessThan = false;
+        }
+      }
+    }
+
+    // If the tag string has white spaces, then parse the attributes is needed.
+    if(attributesFound)
+    {
+      ParseAttributes(tag);
+    }
+  }
+
+  return isTag;
+}
+
+/**
+ * @brief Returns length of XHTML entity by parsing the text. It also determines if it is XHTML entity or not.
+ *
+ * @param[in] markupStringBuffer The mark-up string buffer. It's a const iterator pointing the current character.
+ * @param[in] markupStringEndBuffer Pointing to end of mark-up string buffer.
+ *
+ * @return Length of markupText in case of XHTML entity otherwise return 0.
+ */
+unsigned int GetXHTMLEntityLength(const char*&      markupStringBuffer,
+                                  const char* const markupStringEndBuffer)
+{
+  char character = *markupStringBuffer;
+  if(AMPERSAND == character) // '&'
+  {
+    // if the iterator is pointing to a '&' character, then check for ';' to find end to XHTML entity.
+    ++markupStringBuffer;
+    if(markupStringBuffer < markupStringEndBuffer)
+    {
+      unsigned int len = 1u;
+      for(; markupStringBuffer < markupStringEndBuffer; ++markupStringBuffer)
+      {
+        character = *markupStringBuffer;
+        ++len;
+        if(SEMI_COLON == character) // ';'
+        {
+          // found end of XHTML entity
+          ++markupStringBuffer;
+          return len;
+        }
+        else if((AMPERSAND == character) || (BACK_SLASH == character) || (LESS_THAN == character))
+        {
+          return 0;
+        }
+      }
+    }
+  }
+  return 0;
+}
+
+/**
+ * @brief It parses a XHTML string which has hex/decimal entity and fill its corresponging utf-8 string.
+ *
+ * @param[in] markupText The mark-up text buffer.
+ * @param[out] utf-8 text Corresponding to markup Text
+ *
+ * @return true if string is successfully parsed otherwise false
+ */
+bool XHTMLNumericEntityToUtf8(const char* markupText, char* utf8)
+{
+  bool result = false;
+
+  if(NULL != markupText)
+  {
+    bool isHex = false;
+
+    // check if hex or decimal entity
+    if((CHAR_ARRAY_END != *markupText) && (HEX_CODE == *markupText))
+    {
+      isHex = true;
+      ++markupText;
+    }
+
+    char*         end = NULL;
+    unsigned long l   = strtoul(markupText, &end, (isHex ? 16 : 10)); // l contains UTF-32 code in case of correct XHTML entity
+
+    // check for valid XHTML numeric entities (between '#' or "#x" and ';')
+    if((l > 0) && (l < ULONG_MAX) && (*end == SEMI_COLON)) // in case wrong XHTML entity is set eg. "&#23abcdefs;" in that case *end will be 'a'
+    {
+      /* characters XML 1.1 permits */
+      if(((XHTML_DECIMAL_ENTITY_RANGE[0] < l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[1])) ||
+         ((XHTML_DECIMAL_ENTITY_RANGE[2] <= l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[3])) ||
+         ((XHTML_DECIMAL_ENTITY_RANGE[4] <= l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[5])))
+      {
+        // Convert UTF32 code to UTF8
+        Utf32ToUtf8(reinterpret_cast<const uint32_t* const>(&l), 1, reinterpret_cast<uint8_t*>(utf8));
+        result = true;
+      }
+    }
+  }
+  return result;
+}
+
+/**
+ * @brief Processes a particular tag for the required run (color-run, font-run or underlined-character-run).
+ *
+ * @tparam RunType Whether ColorRun , FontDescriptionRun or UnderlinedCharacterRun
+ *
+ * @param[in/out] runsContainer The container containing all the runs
+ * @param[in/out] styleStack The style stack
+ * @param[in] tag The tag we are currently processing
+ * @param[in] characterIndex The current character index
+ * @param[in/out] runIndex The run index
+ * @param[in/out] tagReference The tagReference we should increment/decrement
+ * @param[in] parameterSettingFunction This function will be called to set run specific parameters
+ */
+template<typename RunType>
+void ProcessTagForRun(
+  Vector<RunType>&                          runsContainer,
+  StyleStack<RunIndex>&                     styleStack,
+  const Tag&                                tag,
+  const CharacterIndex                      characterIndex,
+  RunIndex&                                 runIndex,
+  int&                                      tagReference,
+  std::function<void(const Tag&, RunType&)> parameterSettingFunction)
+{
+  if(!tag.isEndTag)
+  {
+    // Create a new run.
+    RunType run;
+    Initialize(run);
+
+    // Fill the run with the parameters.
+    run.characterRun.characterIndex = characterIndex;
+    parameterSettingFunction(tag, run);
+
+    // Push the run in the logical model.
+    runsContainer.PushBack(run);
+
+    // Push the index of the run into the stack.
+    styleStack.Push(runIndex);
+
+    // Point the next free run.
+    ++runIndex;
+
+    // Increase reference
+    ++tagReference;
+  }
+  else
+  {
+    if(tagReference > 0)
+    {
+      // Pop the top of the stack and set the number of characters of the run.
+      RunType& run                        = *(runsContainer.Begin() + styleStack.Pop());
+      run.characterRun.numberOfCharacters = characterIndex - run.characterRun.characterIndex;
+      --tagReference;
+    }
+  }
+}
+
+/**
+ * @brief Processes the item tag
+ *
+ * @param[in/out] markupProcessData The markup process data
+ * @param[in] tag The current tag
+ * @param[in/out] characterIndex The current character index
+ */
+void ProcessItemTag(
+  MarkupProcessData& markupProcessData,
+  const Tag          tag,
+  CharacterIndex&    characterIndex)
+{
+  if(tag.isEndTag)
+  {
+    // Create an embedded item instance.
+    EmbeddedItem item;
+    item.characterIndex = characterIndex;
+    ProcessEmbeddedItem(tag, item);
+
+    markupProcessData.items.PushBack(item);
+
+    // Insert white space character that will be replaced by the item.
+    markupProcessData.markupProcessedText.append(1u, WHITE_SPACE);
+    ++characterIndex;
+  }
+}
+
+/**
+ * @brief Processes the paragraph-tag
+ *
+ * @param[in/out] markupProcessData The markup process data
+ * @param[in] tag The current tag
+ * @param[in] isEndBuffer Whether the end of buffer
+ * @param[in/out] characterIndex The current character index
+ */
+void ProcessParagraphTag(
+  MarkupProcessData& markupProcessData,
+  const Tag          tag,
+  bool               isEndBuffer,
+  CharacterIndex&    characterIndex)
+{
+  if((characterIndex > 0 &&
+      markupProcessData.markupProcessedText[characterIndex - 1u] != NEW_LINE) &&
+     (!(tag.isEndTag && isEndBuffer)))
+  {
+    // Insert new-line character at the start and end of paragraph.
+    markupProcessData.markupProcessedText.append(1u, NEW_LINE);
+    ++characterIndex;
+  }
+}
+
+/**
+ * @brief Processes span tag for the color-run & font-run.
+ *
+ * @param[in] spanTag The tag we are currently processing
+ * @param[inout] spanStack The spans stack
+ * @param[inout] colorRuns The container containing all the color runs
+ * @param[inout] fontRuns The container containing all the font description runs
+ * @param[inout] underlinedCharacterRuns The container containing all the underlined character runs
+ * @param[inout] strikethroughCharacterRuns The container containing all the strikethroughed character runs
+ * @param[inout] colorRunIndex The color run index
+ * @param[inout] fontRunIndex The font run index
+ * @param[inout] underlinedCharacterRunIndex The underlined character run index
+ * @param[inout] strikethroughCharacterRunIndex The strikethroughed character run index
+ * @param[in] characterIndex The current character index
+ * @param[in] tagReference The tagReference we should increment/decrement
+ */
+void ProcessSpanForRun(
+  const Tag&                            spanTag,
+  StyleStack<Span>&                     spanStack,
+  Vector<ColorRun>&                     colorRuns,
+  Vector<FontDescriptionRun>&           fontRuns,
+  Vector<UnderlinedCharacterRun>&       underlinedCharacterRuns,
+  Vector<ColorRun>&                     backgroundColorRuns,
+  Vector<StrikethroughCharacterRun>&    strikethroughCharacterRuns,
+  Vector<CharacterSpacingCharacterRun>& characterSpacingCharacterRuns,
+  RunIndex&                             colorRunIndex,
+  RunIndex&                             fontRunIndex,
+  RunIndex&                             underlinedCharacterRunIndex,
+  RunIndex&                             backgroundColorRunIndex,
+  RunIndex&                             strikethroughCharacterRunIndex,
+  RunIndex&                             characterSpacingCharacterRunIndex,
+  const CharacterIndex                  characterIndex,
+  int&                                  tagReference)
+{
+  if(!spanTag.isEndTag)
+  {
+    // Create a new run.
+    ColorRun colorRun;
+    Initialize(colorRun);
+
+    FontDescriptionRun fontRun;
+    Initialize(fontRun);
+
+    UnderlinedCharacterRun underlinedCharacterRun;
+    Initialize(underlinedCharacterRun);
+
+    ColorRun backgroundColorRun;
+    Initialize(backgroundColorRun);
+
+    StrikethroughCharacterRun strikethroughCharacterRun;
+    Initialize(strikethroughCharacterRun);
+
+    CharacterSpacingCharacterRun characterSpacingCharacterRun;
+    Initialize(characterSpacingCharacterRun);
+
+    Span span;
+    Initialize(span);
+
+    // Fill the run with the parameters.
+    colorRun.characterRun.characterIndex                     = characterIndex;
+    fontRun.characterRun.characterIndex                      = characterIndex;
+    underlinedCharacterRun.characterRun.characterIndex       = characterIndex;
+    backgroundColorRun.characterRun.characterIndex           = characterIndex;
+    strikethroughCharacterRun.characterRun.characterIndex    = characterIndex;
+    characterSpacingCharacterRun.characterRun.characterIndex = characterIndex;
+
+    span.colorRunIndex                     = colorRunIndex;
+    span.fontRunIndex                      = fontRunIndex;
+    span.underlinedCharacterRunIndex       = underlinedCharacterRunIndex;
+    span.backgroundColorRunIndex           = backgroundColorRunIndex;
+    span.strikethroughCharacterRunIndex    = strikethroughCharacterRunIndex;
+    span.characterSpacingCharacterRunIndex = characterSpacingCharacterRunIndex;
+
+    ProcessSpanTag(spanTag,
+                   colorRun,
+                   fontRun,
+                   underlinedCharacterRun,
+                   backgroundColorRun,
+                   strikethroughCharacterRun,
+                   characterSpacingCharacterRun,
+                   span.isColorDefined,
+                   span.isFontDefined,
+                   span.isUnderlinedCharacterDefined,
+                   span.isBackgroundColorDefined,
+                   span.isStrikethroughDefined,
+                   span.isCharacterSpacingDefined);
+
+    // Push the span into the stack.
+    spanStack.Push(span);
+
+    // Point the next free run.
+    if(span.isColorDefined)
+    {
+      // Push the run in the logical model.
+      colorRuns.PushBack(colorRun);
+      ++colorRunIndex;
+    }
+
+    if(span.isFontDefined)
+    {
+      // Push the run in the logical model.
+      fontRuns.PushBack(fontRun);
+      ++fontRunIndex;
+    }
+
+    if(span.isUnderlinedCharacterDefined)
+    {
+      // Push the run in the logical model.
+      underlinedCharacterRuns.PushBack(underlinedCharacterRun);
+      ++underlinedCharacterRunIndex;
+    }
+
+    if(span.isBackgroundColorDefined)
+    {
+      // Push the run in the logical model.
+      backgroundColorRuns.PushBack(backgroundColorRun);
+      ++backgroundColorRunIndex;
+    }
+
+    if(span.isStrikethroughDefined)
+    {
+      // Push the run in the logical model.
+      strikethroughCharacterRuns.PushBack(strikethroughCharacterRun);
+      ++strikethroughCharacterRunIndex;
+    }
+
+    if(span.isCharacterSpacingDefined)
+    {
+      // Push the run in the logical model.
+      characterSpacingCharacterRuns.PushBack(characterSpacingCharacterRun);
+      ++characterSpacingCharacterRunIndex;
+    }
+
+    // Increase reference
+    ++tagReference;
+  }
+  else
+  {
+    if(tagReference > 0)
+    {
+      // Pop the top of the stack and set the number of characters of the run.
+      Span span = spanStack.Pop();
+
+      if(span.isColorDefined)
+      {
+        ColorRun& colorRun                       = *(colorRuns.Begin() + span.colorRunIndex);
+        colorRun.characterRun.numberOfCharacters = characterIndex - colorRun.characterRun.characterIndex;
+      }
+
+      if(span.isFontDefined)
+      {
+        FontDescriptionRun& fontRun             = *(fontRuns.Begin() + span.fontRunIndex);
+        fontRun.characterRun.numberOfCharacters = characterIndex - fontRun.characterRun.characterIndex;
+      }
+
+      if(span.isUnderlinedCharacterDefined)
+      {
+        UnderlinedCharacterRun& underlinedCharacterRun         = *(underlinedCharacterRuns.Begin() + span.underlinedCharacterRunIndex);
+        underlinedCharacterRun.characterRun.numberOfCharacters = characterIndex - underlinedCharacterRun.characterRun.characterIndex;
+      }
+
+      if(span.isBackgroundColorDefined)
+      {
+        ColorRun& backgroundColorRun                       = *(backgroundColorRuns.Begin() + span.backgroundColorRunIndex);
+        backgroundColorRun.characterRun.numberOfCharacters = characterIndex - backgroundColorRun.characterRun.characterIndex;
+      }
+
+      if(span.isStrikethroughDefined)
+      {
+        StrikethroughCharacterRun& strikethroughCharacterRun      = *(strikethroughCharacterRuns.Begin() + span.strikethroughCharacterRunIndex);
+        strikethroughCharacterRun.characterRun.numberOfCharacters = characterIndex - strikethroughCharacterRun.characterRun.characterIndex;
+      }
+
+      if(span.isCharacterSpacingDefined)
+      {
+        CharacterSpacingCharacterRun& characterSpacingCharacterRun   = *(characterSpacingCharacterRuns.Begin() + span.characterSpacingCharacterRunIndex);
+        characterSpacingCharacterRun.characterRun.numberOfCharacters = characterIndex - characterSpacingCharacterRun.characterRun.characterIndex;
+      }
+
+      --tagReference;
+    }
+  }
+}
+
+/**
+ * @brief Processes anchor tag for the color-run & underline-run.
+ *
+ * @param[in,out] markupProcessData The markup process data
+ * @param[in] markupPropertyData The markup property data
+ * @param[in] tag The tag we are currently processing
+ * @param[in,out] anchorStack The anchors stack
+ * @param[in,out] colorRuns The container containing all the color runs
+ * @param[in,out] underlinedCharacterRuns The container containing all the underlined character runs
+ * @param[in,out] colorRunIndex The color run index
+ * @param[in,out] underlinedCharacterRunIndex The underlined character run index
+ * @param[in] characterIndex The current character index
+ * @param[in] tagReference The tagReference we should increment/decrement
+ */
+void ProcessAnchorForRun(
+  MarkupProcessData&                    markupProcessData,
+  MarkupPropertyData&                   markupPropertyData,
+  const Tag&                            tag,
+  StyleStack<AnchorForStack>&           anchorStack,
+  Vector<ColorRun>&                     colorRuns,
+  Vector<UnderlinedCharacterRun>&       underlinedCharacterRuns,
+  RunIndex&                             colorRunIndex,
+  RunIndex&                             underlinedCharacterRunIndex,
+  const CharacterIndex                  characterIndex,
+  int&                                  tagReference)
+{
+  if(!tag.isEndTag)
+  {
+    // Create an anchor instance.
+    Anchor anchor;
+    anchor.href                        = nullptr;
+    anchor.startIndex                  = characterIndex;
+    anchor.endIndex                    = 0u;
+    anchor.colorRunIndex               = colorRunIndex;
+    anchor.underlinedCharacterRunIndex = underlinedCharacterRunIndex;
+    anchor.markupClickedColor          = markupPropertyData.anchorClickedColor;
+
+    // Create a new run.
+    ColorRun colorRun;
+    Initialize(colorRun);
+
+    UnderlinedCharacterRun underlinedCharacterRun;
+    Initialize(underlinedCharacterRun);
+
+    AnchorForStack anchorForStack;
+    Initialize(anchorForStack);
+
+    // Fill the run with the parameters.
+    colorRun.characterRun.characterIndex               = characterIndex;
+    underlinedCharacterRun.characterRun.characterIndex = characterIndex;
+
+    anchorForStack.colorRunIndex               = colorRunIndex;
+    anchorForStack.underlinedCharacterRunIndex = underlinedCharacterRunIndex;
+
+    // Init default color
+    colorRun.color                                 = markupPropertyData.anchorColor;
+    underlinedCharacterRun.properties.color        = markupPropertyData.anchorColor;
+    underlinedCharacterRun.properties.colorDefined = true;
+
+    ProcessAnchorTag(tag, anchor, colorRun, underlinedCharacterRun);
+
+    markupProcessData.anchors.PushBack(anchor);
+
+    // Push the anchor into the stack.
+    anchorStack.Push(anchorForStack);
+
+    // Push the run in the logical model.
+    colorRuns.PushBack(colorRun);
+    ++colorRunIndex;
+
+    // Push the run in the logical model.
+    underlinedCharacterRuns.PushBack(underlinedCharacterRun);
+    ++underlinedCharacterRunIndex;
+
+    // Increase reference
+    ++tagReference;
+  }
+  else
+  {
+    if(tagReference > 0)
+    {
+      // Update end index.
+      unsigned int count = markupProcessData.anchors.Count();
+      if(count > 0)
+      {
+        markupProcessData.anchors[count - 1].endIndex = characterIndex;
+      }
+
+      // Pop the top of the stack and set the number of characters of the run.
+      AnchorForStack anchorForStack = anchorStack.Pop();
+
+      ColorRun& colorRun                       = *(colorRuns.Begin() + anchorForStack.colorRunIndex);
+      colorRun.characterRun.numberOfCharacters = characterIndex - colorRun.characterRun.characterIndex;
+
+      UnderlinedCharacterRun& underlinedCharacterRun         = *(underlinedCharacterRuns.Begin() + anchorForStack.underlinedCharacterRunIndex);
+      underlinedCharacterRun.characterRun.numberOfCharacters = characterIndex - underlinedCharacterRun.characterRun.characterIndex;
+
+      --tagReference;
+    }
+  }
+}
+
+/**
+ * @brief Resizes the model's vectors
+ *
+ * @param[inout] markupProcessData The markup process data
+ * @param[in] fontRunIndex The font run index
+ * @param[in] colorRunIndex The color run index
+ * @param[in] underlinedCharacterRunIndex The underlined character run index
+ * @param[in] strikethroughCharacterRunIndex The strikethroughed character run index
+ * @param[in] backgroundRunIndex The background run index
+ * @param[in] boundedParagraphRunIndex The bounded paragraph run index
+ * @param[in] characterSpacingCharacterRunIndex The character-spacing character run index
+ *
+ */
+void ResizeModelVectors(MarkupProcessData& markupProcessData,
+                        const RunIndex     fontRunIndex,
+                        const RunIndex     colorRunIndex,
+                        const RunIndex     underlinedCharacterRunIndex,
+                        const RunIndex     strikethroughCharacterRunIndex,
+                        const RunIndex     backgroundRunIndex,
+                        const RunIndex     boundedParagraphRunIndex,
+                        const RunIndex     characterSpacingCharacterRunIndex)
+{
+  markupProcessData.fontRuns.Resize(fontRunIndex);
+  markupProcessData.colorRuns.Resize(colorRunIndex);
+  markupProcessData.underlinedCharacterRuns.Resize(underlinedCharacterRunIndex);
+  markupProcessData.strikethroughCharacterRuns.Resize(strikethroughCharacterRunIndex);
+  markupProcessData.backgroundColorRuns.Resize(backgroundRunIndex);
+  markupProcessData.boundedParagraphRuns.Resize(boundedParagraphRunIndex);
+  markupProcessData.characterSpacingCharacterRuns.Resize(characterSpacingCharacterRunIndex);
+
+#ifdef DEBUG_ENABLED
+  if(gLogFilter->IsEnabledFor(Debug::Verbose))
+  {
+    for(uint32_t i = 0; i < colorRunIndex; ++i)
+    {
+      ColorRun& run = markupProcessData.colorRuns[i];
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "run[%d] index: %d, length: %d, color %f,%f,%f,%f\n", i, run.characterRun.characterIndex, run.characterRun.numberOfCharacters, run.color.r, run.color.g, run.color.b, run.color.a);
+    }
+  }
+#endif
+}
+
+/**
+ * @brief Processes the markup string buffer
+ *
+ * @param[in/out] markupProcessData The markup process data
+ * @param[in/out] markupStringBuffer The markup string buffer pointer
+ * @param[in] markupStringEndBuffer The markup string end buffer pointer
+ * @param[in/out] characterIndex The current character index
+ */
+void ProcessMarkupStringBuffer(
+  MarkupProcessData& markupProcessData,
+  const char*&       markupStringBuffer,
+  const char* const  markupStringEndBuffer,
+  CharacterIndex&    characterIndex)
+{
+  unsigned char character    = *markupStringBuffer;
+  const char*   markupBuffer = markupStringBuffer;
+  unsigned char count        = GetUtf8Length(character);
+  char          utf8[8];
+
+  if((BACK_SLASH == character) && (markupStringBuffer + 1u < markupStringEndBuffer))
+  {
+    // Adding < , >  or & special character.
+    const unsigned char nextCharacter = *(markupStringBuffer + 1u);
+    if((LESS_THAN == nextCharacter) || (GREATER_THAN == nextCharacter) || (AMPERSAND == nextCharacter))
+    {
+      character = nextCharacter;
+      ++markupStringBuffer;
+
+      count        = GetUtf8Length(character);
+      markupBuffer = markupStringBuffer;
+    }
+  }
+  else // checking if contains XHTML entity or not
+  {
+    const unsigned int len = GetXHTMLEntityLength(markupStringBuffer, markupStringEndBuffer);
+
+    // Parse markupStringTxt if it contains XHTML Entity between '&' and ';'
+    if(len > 0)
+    {
+      char* entityCode = NULL;
+      bool  result     = false;
+      count            = 0;
+
+      // Checking if XHTML Numeric Entity
+      if(HASH == *(markupBuffer + 1u))
+      {
+        entityCode = &utf8[0];
+        // markupBuffer is currently pointing to '&'. By adding 2u to markupBuffer it will point to numeric string by skipping "&#'
+        result = XHTMLNumericEntityToUtf8((markupBuffer + 2u), entityCode);
+      }
+      else // Checking if XHTML Named Entity
+      {
+        entityCode = const_cast<char*>(NamedEntityToUtf8(markupBuffer, len));
+        result     = (entityCode != NULL);
+      }
+      if(result)
+      {
+        markupBuffer = entityCode; //utf8 text assigned to markupBuffer
+        character    = markupBuffer[0];
+      }
+      else
+      {
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Not valid XHTML entity : (%.*s) \n", len, markupBuffer);
+        markupBuffer = NULL;
+      }
+    }
+    else // in case string conatins Start of XHTML Entity('&') but not its end character(';')
+    {
+      if(character == AMPERSAND)
+      {
+        markupBuffer = NULL;
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Not Well formed XHTML content \n");
+      }
+    }
+  }
+
+  if(markupBuffer != NULL)
+  {
+    const unsigned char numberOfBytes = GetUtf8Length(character);
+    markupProcessData.markupProcessedText.push_back(character);
+
+    for(unsigned char i = 1u; i < numberOfBytes; ++i)
+    {
+      ++markupBuffer;
+      markupProcessData.markupProcessedText.push_back(*markupBuffer);
+    }
+
+    ++characterIndex;
+    markupStringBuffer += count;
+  }
+}
+
+} // namespace
+
+void ProcessMarkupString(const std::string& markupString, MarkupPropertyData& markupPropertyData, MarkupProcessData& markupProcessData)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "markupString: %s\n", markupString.c_str());
+
+  // Reserve space for the plain text.
+  const Length markupStringSize = markupString.size();
+  markupProcessData.markupProcessedText.reserve(markupStringSize);
+
+  // Stores a struct with the index to the first character of the run, the type of run and its parameters.
+  StyleStack<RunIndex> styleStack;
+
+  // Stores a struct with the index to the first character of the color run & color font for the span.
+  StyleStack<Span> spanStack;
+
+  StyleStack<AnchorForStack> anchorStack;
+
+  // Points the next free position in the vector of runs.
+  RunIndex colorRunIndex                     = 0u;
+  RunIndex fontRunIndex                      = 0u;
+  RunIndex underlinedCharacterRunIndex       = 0u;
+  RunIndex backgroundRunIndex                = 0u;
+  RunIndex strikethroughCharacterRunIndex    = 0u;
+  RunIndex boundedParagraphRunIndex          = 0u;
+  RunIndex characterSpacingCharacterRunIndex = 0u;
+
+  // check tag reference
+  int colorTagReference            = 0u;
+  int fontTagReference             = 0u;
+  int iTagReference                = 0u;
+  int bTagReference                = 0u;
+  int uTagReference                = 0u;
+  int backgroundTagReference       = 0u;
+  int spanTagReference             = 0u;
+  int sTagReference                = 0u;
+  int pTagReference                = 0u;
+  int characterSpacingTagReference = 0u;
+  int aTagReference                = 0u;
+
+  // Give an initial default value to the model's vectors.
+  markupProcessData.colorRuns.Reserve(DEFAULT_VECTOR_SIZE);
+  markupProcessData.fontRuns.Reserve(DEFAULT_VECTOR_SIZE);
+  markupProcessData.underlinedCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE);
+  markupProcessData.backgroundColorRuns.Reserve(DEFAULT_VECTOR_SIZE);
+  markupProcessData.strikethroughCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE);
+  markupProcessData.characterSpacingCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE);
+
+  // Get the mark-up string buffer.
+  const char*       markupStringBuffer    = markupString.c_str();
+  const char* const markupStringEndBuffer = markupStringBuffer + markupStringSize;
+
+  Tag            tag;
+  CharacterIndex characterIndex = 0u;
+  for(; markupStringBuffer < markupStringEndBuffer;)
+  {
+    tag.attributes.Clear();
+    if(IsTag(markupStringBuffer,
+             markupStringEndBuffer,
+             tag))
+    {
+      if(TokenComparison(MARKUP::TAG::COLOR, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<ColorRun>(
+          markupProcessData.colorRuns, styleStack, tag, characterIndex, colorRunIndex, colorTagReference, [](const Tag& tag, ColorRun& run) { ProcessColorTag(tag, run); });
+      } // <color></color>
+      else if(TokenComparison(MARKUP::TAG::ITALIC, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<FontDescriptionRun>(
+          markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, iTagReference, [](const Tag&, FontDescriptionRun& fontRun) {
+            fontRun.slant        = TextAbstraction::FontSlant::ITALIC;
+            fontRun.slantDefined = true;
+          });
+      } // <i></i>
+      else if(TokenComparison(MARKUP::TAG::UNDERLINE, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<UnderlinedCharacterRun>(
+          markupProcessData.underlinedCharacterRuns, styleStack, tag, characterIndex, underlinedCharacterRunIndex, uTagReference, [](const Tag& tag, UnderlinedCharacterRun& run) { ProcessUnderlineTag(tag, run); });
+      } // <u></u>
+      else if(TokenComparison(MARKUP::TAG::BOLD, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<FontDescriptionRun>(
+          markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, bTagReference, [](const Tag&, FontDescriptionRun& fontRun) {
+            fontRun.weight        = TextAbstraction::FontWeight::BOLD;
+            fontRun.weightDefined = true;
+          });
+      } // <b></b>
+      else if(TokenComparison(MARKUP::TAG::FONT, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<FontDescriptionRun>(
+          markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, fontTagReference, [](const Tag& tag, FontDescriptionRun& fontRun) { ProcessFontTag(tag, fontRun); });
+      } // <font></font>
+      else if(TokenComparison(MARKUP::TAG::ANCHOR, tag.buffer, tag.length))
+      {
+        ProcessAnchorForRun(markupProcessData,
+                            markupPropertyData,
+                            tag,
+                            anchorStack,
+                            markupProcessData.colorRuns,
+                            markupProcessData.underlinedCharacterRuns,
+                            colorRunIndex,
+                            underlinedCharacterRunIndex,
+                            characterIndex,
+                            aTagReference);
+      } // <a href=https://www.tizen.org>tizen</a>
+      else if(TokenComparison(MARKUP::TAG::SHADOW, tag.buffer, tag.length))
+      {
+        // TODO: If !tag.isEndTag, then create a new shadow run.
+        //       else Pop the top of the stack and set the number of characters of the run.
+      } // <shadow></shadow>
+      else if(TokenComparison(MARKUP::TAG::GLOW, tag.buffer, tag.length))
+      {
+        // TODO: If !tag.isEndTag, then create a new glow run.
+        //       else Pop the top of the stack and set the number of characters of the run.
+      } // <glow></glow>
+      else if(TokenComparison(MARKUP::TAG::OUTLINE, tag.buffer, tag.length))
+      {
+        // TODO: If !tag.isEndTag, then create a new outline run.
+        //       else Pop the top of the stack and set the number of characters of the run.
+      } // <outline></outline>
+      else if(TokenComparison(MARKUP::TAG::EMBEDDED_ITEM, tag.buffer, tag.length))
+      {
+        ProcessItemTag(markupProcessData, tag, characterIndex);
+      }
+      else if(TokenComparison(MARKUP::TAG::BACKGROUND, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<ColorRun>(
+          markupProcessData.backgroundColorRuns, styleStack, tag, characterIndex, backgroundRunIndex, backgroundTagReference, [](const Tag& tag, ColorRun& run) { ProcessBackground(tag, run); });
+      }
+      else if(TokenComparison(MARKUP::TAG::SPAN, tag.buffer, tag.length))
+      {
+        ProcessSpanForRun(tag,
+                          spanStack,
+                          markupProcessData.colorRuns,
+                          markupProcessData.fontRuns,
+                          markupProcessData.underlinedCharacterRuns,
+                          markupProcessData.backgroundColorRuns,
+                          markupProcessData.strikethroughCharacterRuns,
+                          markupProcessData.characterSpacingCharacterRuns,
+                          colorRunIndex,
+                          fontRunIndex,
+                          underlinedCharacterRunIndex,
+                          backgroundRunIndex,
+                          strikethroughCharacterRunIndex,
+                          characterSpacingCharacterRunIndex,
+                          characterIndex,
+                          spanTagReference);
+      }
+      else if(TokenComparison(MARKUP::TAG::STRIKETHROUGH, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<StrikethroughCharacterRun>(
+          markupProcessData.strikethroughCharacterRuns, styleStack, tag, characterIndex, strikethroughCharacterRunIndex, sTagReference, [](const Tag& tag, StrikethroughCharacterRun& run) { ProcessStrikethroughTag(tag, run); });
+      } // <s></s>
+      else if(TokenComparison(MARKUP::TAG::PARAGRAPH, tag.buffer, tag.length))
+      {
+        ProcessParagraphTag(markupProcessData, tag, (markupStringBuffer == markupStringEndBuffer), characterIndex);
+        ProcessTagForRun<BoundedParagraphRun>(
+          markupProcessData.boundedParagraphRuns, styleStack, tag, characterIndex, boundedParagraphRunIndex, pTagReference, [](const Tag& tag, BoundedParagraphRun& run) { ProcessAttributesOfParagraphTag(tag, run); });
+      } // <p></p>
+      else if(TokenComparison(MARKUP::TAG::CHARACTER_SPACING, tag.buffer, tag.length))
+      {
+        ProcessTagForRun<CharacterSpacingCharacterRun>(
+          markupProcessData.characterSpacingCharacterRuns, styleStack, tag, characterIndex, characterSpacingCharacterRunIndex, characterSpacingTagReference, [](const Tag& tag, CharacterSpacingCharacterRun& run) { ProcessCharacterSpacingTag(tag, run); });
+      } // <char-spacing></char-spacing>
+    }   // end if( IsTag() )
+    else if(markupStringBuffer < markupStringEndBuffer)
+    {
+      ProcessMarkupStringBuffer(markupProcessData, markupStringBuffer, markupStringEndBuffer, characterIndex);
+    }
+  }
+
+  // Resize the model's vectors.
+  ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, strikethroughCharacterRunIndex, backgroundRunIndex, boundedParagraphRunIndex, characterSpacingCharacterRunIndex);
+
+  // Handle the nested tags
+  OverrideNestedUnderlinedCharacterRuns(markupProcessData.underlinedCharacterRuns);
+  OverrideNestedStrikethroughCharacterRuns(markupProcessData.strikethroughCharacterRuns);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/markup-processor/markup-processor.h b/dali-toolkit/internal/text/markup-processor/markup-processor.h
new file mode 100644
index 0000000..1ee520d
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-processor/markup-processor.h
@@ -0,0 +1,109 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
+#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/anchor.h>
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/character-spacing-character-run.h>
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/embedded-item.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/strikethrough-character-run.h>
+#include <dali-toolkit/internal/text/underlined-character-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Keeps the plain text and references to vectors from the model which stores runs with text styles.
+ */
+struct MarkupProcessData
+{
+  MarkupProcessData(Vector<ColorRun>&                     colorRuns,
+                    Vector<FontDescriptionRun>&           fontRuns,
+                    Vector<EmbeddedItem>&                 items,
+                    Vector<Anchor>&                       anchors,
+                    Vector<UnderlinedCharacterRun>&       underlinedCharacterRuns,
+                    Vector<ColorRun>&                     backgroundColorRuns,
+                    Vector<StrikethroughCharacterRun>&    strikethroughCharacterRuns,
+                    Vector<BoundedParagraphRun>&          boundedParagraphRuns,
+                    Vector<CharacterSpacingCharacterRun>& characterSpacingCharacterRuns)
+  : colorRuns(colorRuns),
+    fontRuns(fontRuns),
+    items(items),
+    anchors(anchors),
+    underlinedCharacterRuns(underlinedCharacterRuns),
+    backgroundColorRuns(backgroundColorRuns),
+    strikethroughCharacterRuns(strikethroughCharacterRuns),
+    boundedParagraphRuns(boundedParagraphRuns),
+    characterSpacingCharacterRuns(characterSpacingCharacterRuns),
+    markupProcessedText()
+  {
+  }
+
+  Vector<ColorRun>&                     colorRuns;                     ///< The color runs.
+  Vector<FontDescriptionRun>&           fontRuns;                      ///< The font description runs.
+  Vector<EmbeddedItem>&                 items;                         ///< The embedded items.
+  Vector<Anchor>&                       anchors;                       ///< The anchors.
+  Vector<UnderlinedCharacterRun>&       underlinedCharacterRuns;       ///< The underlined character runs.
+  Vector<ColorRun>&                     backgroundColorRuns;           ///< The background color runs.
+  Vector<StrikethroughCharacterRun>&    strikethroughCharacterRuns;    ///< The strikethrough character runs.
+  Vector<BoundedParagraphRun>&          boundedParagraphRuns;          ///< The bounded paragraph runs
+  Vector<CharacterSpacingCharacterRun>& characterSpacingCharacterRuns; ///< The character-spacing runs
+
+  std::string markupProcessedText; ///< The mark-up string.
+};
+
+struct MarkupPropertyData
+{
+  MarkupPropertyData(Vector4 anchorColor,
+                     Vector4 anchorClickedColor)
+  : anchorColor(anchorColor),
+    anchorClickedColor(anchorClickedColor)
+  {
+  }
+
+  Vector4 anchorColor;        ///< The anchor color
+  Vector4 anchorClickedColor; ///< The anchor clicked color
+};
+
+/**
+ * @brief Process the mark-up string.
+ *
+ * @param[in] markupString The mark-up string.
+ * @param[in] markupPropertyData The property data that will be used by default in markup processing.
+ * @param[out] markupProcessData The plain text and the style.
+ */
+void ProcessMarkupString(const std::string& markupString, MarkupPropertyData& markupPropertyData, MarkupProcessData& markupProcessData);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
diff --git a/dali-toolkit/internal/text/markup-tags-and-attributes.h b/dali-toolkit/internal/text/markup-tags-and-attributes.h
new file mode 100644
index 0000000..0cc21c0
--- /dev/null
+++ b/dali-toolkit/internal/text/markup-tags-and-attributes.h
@@ -0,0 +1,729 @@
+#ifndef DALI_TOOLKIT_TEXT_MARKUPS_AND_ATTRIBUTES_H
+#define DALI_TOOLKIT_TEXT_MARKUPS_AND_ATTRIBUTES_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <string>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Use markup styling to style Text-Controller.
+ * The markup tag is opend by <> and closed by </>
+ *
+ * @details You can use markup elements to change the style of the text.
+ * Since the text controls do not process markup elements by default, you must first set the EnableMarkup property of the Text-Controller  to true:
+ *
+ * @note The markup processor does not check for markup validity, and styles are rendered in priority order.
+ * Incorrect or incompatible elements can cause the text to be rendered incorrectly.
+ */
+namespace MARKUP
+{
+namespace TAG
+{
+// HTML-ISH tag and attribute constants.
+// Note they must be lower case in order to make the comparison to work
+// as the parser converts all the read tags to lower case.
+
+/**
+ * @brief Sets the color for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<color value='red'>Hello world</color>";
+ *
+ * @endcode
+ *
+ * @see COLOR_ATTRIBUTES
+ *
+ */
+static const std::string COLOR("color");
+
+/**
+ * @brief Sets the font values for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<font family='DejaVuSerif' size='18'>Hello world</font>";
+ *
+ * @endcode
+ *
+ * @see FONT_ATTRIBUTES
+ */
+static const std::string FONT("font");
+
+/**
+ * @brief Sets Bold decoration for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<b>Hello world</b>";
+ *
+ * @endcode
+ *
+ * @see
+ */
+static const std::string BOLD("b");
+
+/**
+ * @brief Sets Italic decoration for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<i>Hello world</i>";
+ *
+ * @endcode
+ *
+ */
+static const std::string ITALIC("i");
+
+/**
+ * @brief Sets the underlined values for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<u>Hello world</u>";
+ *
+ * @endcode
+ *
+ * @see UNDERLINE_ATTRIBUTES
+ */
+static const std::string UNDERLINE("u");
+
+/**
+ * @todo Sets the shadow for the characters inside the element.
+ *
+ */
+static const std::string SHADOW("shadow"); ///< This tag under construction.
+
+/**
+ * @todo Sets the glow for the characters inside the element.
+ *
+ */
+static const std::string GLOW("glow"); ///< This tag under construction.
+
+/**
+ * @todo Sets the outline for the characters inside the element.
+ *
+ */
+static const std::string OUTLINE("outline"); ///< This tag under construction.
+
+/**
+ * @brief Defines an embedded item within the text.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<item 'width'=26 'height'=26 'url'='path/image.png' 'color-blending'='multiply'/>";
+ *
+ * @endcode
+ *
+ * @see EMBEDDED_ITEM_ATTRIBUTES
+ */
+static const std::string EMBEDDED_ITEM("item");
+
+/**
+ * @brief Defines a hyperlink for the text inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<a href='https://www.tizen.org'>TIZEN</a>";
+ *
+ * @endcode
+ *
+ * @see ANCHOR_ATTRIBUTES
+ */
+static const std::string ANCHOR("a");
+
+/**
+ * @brief Sets the background color for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<background color='yellow'>Hello world</background>";
+ *
+ * @endcode
+ *
+ * @see BACKGROUND_ATTRIBUTES
+ */
+static const std::string BACKGROUND("background");
+
+/**
+ * @brief Use span tag to set many styles on character's level for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<span font-size='20' font-family='DejaVu Sans' font-width='condensed' font-slant='italic' text-color='green' char-space-value='10.0f'>Hello world</span>";
+ *
+ * @endcode
+ *
+ * @see SPAN_ATTRIBUTES
+ */
+static const std::string SPAN("span");
+
+/**
+ * @brief Sets the strikethrough values for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<s>Hello world</s>";
+ *
+ * @endcode
+ *
+ * @see STRIKETHROUGH_ATTRIBUTES
+ */
+static const std::string STRIKETHROUGH("s");
+
+/**
+ * @brief Use paragraph tag to set many styles on paragraph's level for the lines inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "test before paragraph tag <p>test paragraph tag </p>test after paragraph tag ";
+ *
+ * @endcode
+ *
+ * @see PARAGRAPH_ATTRIBUTES
+ */
+static const std::string PARAGRAPH("p");
+
+/**
+ * @brief Sets the character spacing values for the characters inside the element.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<char-spacing value='3.0f'>Hello world</char-spacing>";
+ *
+ * @endcode
+ *
+ * @see CHARACTER_SPACING_ATTRIBUTES
+ */
+static const std::string CHARACTER_SPACING("char-spacing");
+} // namespace TAG
+
+namespace COLOR_ATTRIBUTES
+{
+/**
+ * @brief Use the value attribute to define the color.
+ * The supported attribute values are red, green, blue, yellow, magenta, cyan, white, black, and transparent.
+ * Web colors and colors represented in 32-bit hexadecimal 0xAARRGGBB format are also supported.
+ *
+ * The following examples show text in red color:
+ * @code
+ *
+ * textController.Text = "<color value='red'>Hello world</color>"; /// Color coded with a text constant
+ *
+ * @endcode
+ *
+ * @code
+ *
+ * textController.Text = "<color value='0xFFFF0000'>Hello world</color>"); /// Color packed inside an ARGB hexadecimal value
+ *
+ * @endcode
+ */
+static const std::string VALUE("value");
+} // namespace COLOR_ATTRIBUTES
+
+namespace FONT_ATTRIBUTES
+{
+/**
+ * @brief Use the family attribute to define the font name.
+ *
+ * Example:
+ * @code
+ *
+ * textController.Text = "<font family='SamsungSans' >Hello world</font>";
+ *
+ * @endcode
+ *
+ */
+static const std::string FAMILY("family");
+
+/**
+ * @brief Use the size attribute to define the font size in points.
+ *
+ * Example:
+ * @code
+ *
+ * textController.Text = "<font size='50' >Hello world</font>";
+ *
+ * @endcode
+ *
+ */
+static const std::string SIZE("size");
+
+/**
+ * @brief Use the weight attribute to define the font weight.
+ *
+ * Example:
+ * @code
+ *
+ * textController.Text = "<font weight='bold' >Hello world</font>";
+ *
+ * @endcode
+ *
+ */
+static const std::string WEIGHT("weight");
+
+/**
+ * @brief Use the width attribute to define the font width.
+ *
+ * Example:
+ * @code
+ *
+ * textController.Text = "<font width='condensed' >Hello world</font>";
+ *
+ * @endcode
+ *
+ */
+static const std::string WIDTH("width");
+
+/**
+ * @brief Use the slant attribute to define the font slant.
+ *
+ * Example:
+ * @code
+ *
+ * textController.Text = "<font slant='italic' >Hello world</font>";
+ *
+ * @endcode
+ *
+ */
+static const std::string SLANT("slant");
+} // namespace FONT_ATTRIBUTES
+
+namespace UNDERLINE_ATTRIBUTES
+{
+/**
+ * @brief Use the color attribute to define the color of underline.
+ * The supported attribute values are red, green, blue, yellow, magenta, cyan, white, black, and transparent.
+ * Web colors and colors represented in 32-bit hexadecimal 0xAARRGGBB format are also supported.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<u color='green'>Hello world</u>";
+ *
+ * @endcode
+ */
+static const std::string COLOR("color");
+
+/**
+ * @brief Use the height attribute to define the height of underline.
+ * It is float value.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<u height='2.0f'>Hello world</u>";
+ *
+ * @endcode
+ */
+static const std::string HEIGHT("height");
+
+/**
+ * @brief Use the type attribute to define the type of underline.
+ * The supported attribute values are solid, dashed and double
+ * The default value is solid
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<u type='double'>Hello world</u>";
+ *
+ * @endcode
+ */
+static const std::string TYPE("type");
+
+/**
+ * @brief Use the dash-gap attribute to define the dash-gap of underline.
+ * The gap in pixels between the dashes of the dashed underline. Only valid when "DASHED" underline type is used.
+ *
+ * It is float value.
+ * @note If not provided then the default gap is used (1 pixel).
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<u type='dashed' dash-gap='2.0f'>Hello world</u>";
+ *
+ * @endcode
+ */
+static const std::string DASH_GAP("dash-gap");
+
+/**
+ * @brief Use the dash-width attribute to define the dash-width of underline.
+ * The width in pixels of the dashes of the dashed underline. Only valid when "DASHED" underline type is used.
+ * It is float value.
+ * @note If not provided then the default width is used (2 pixel).
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<u type='dashed' dash-width='3.0f'>Hello world</u>";
+ *
+ * @endcode
+ */
+static const std::string DASH_WIDTH("dash-width");
+
+} // namespace UNDERLINE_ATTRIBUTES
+
+namespace SPAN_ATTRIBUTES
+{
+//NOTE: the MAX_NUM_OF_ATTRIBUTES in "markup-processor.cpp" should be updated when add a new attribute for span tag.
+
+/**
+ * @brief The font family attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span font-family='SamsungSans' >Hello world</span>";
+ * @endcode
+ * @see FONT_ATTRIBUTES::FAMILY
+ */
+static const std::string FONT_FAMILY("font-family");
+
+/**
+ * @brief The font size attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span font-size='50' >Hello world</span>";
+ * @endcode
+ * @see FONT_ATTRIBUTES::SIZE
+ */
+static const std::string FONT_SIZE("font-size");
+
+/**
+ * @brief The font weight attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span font-weight='bold' >Hello world</span>";
+ * @endcode
+ * @see FONT_ATTRIBUTES::WEIGHT
+ */
+static const std::string FONT_WEIGHT("font-weight");
+
+/**
+ * @brief The font width attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span font-width='condensed' >Hello world</span>";
+ * @endcode
+ * @see FONT_ATTRIBUTES::WIDTH
+ */
+static const std::string FONT_WIDTH("font-width");
+
+/**
+ * @brief The font slant attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span font-slant='italic' >Hello world</span>";
+ * @endcode
+ * @see FONT_ATTRIBUTES::SLANT
+ */
+static const std::string FONT_SLANT("font-slant");
+
+/**
+ * @brief The color value attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span text-color='blue' >Hello world</span>";
+ * @endcode
+ * @see COLOR_ATTRIBUTES::VALUE
+ */
+static const std::string TEXT_COLOR("text-color");
+
+/**
+ * @brief The background color attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span background-color='yellow' >Hello world</span>";
+ * @endcode
+ * @see BACKGROUND_ATTRIBUTES::COLOR
+ */
+static const std::string BACKGROUND_COLOR("background-color");
+
+/**
+ * @brief The undeline color attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span u-color='green' >Hello world</span>";
+ * @endcode
+ * @see UNDERLINE_ATTRIBUTES::COLOR
+ */
+static const std::string UNDERLINE_COLOR("u-color");
+
+/**
+ * @brief The undeline height attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span u-height='3.0f' >Hello world</span>";
+ * @endcode
+ * @see UNDERLINE_ATTRIBUTES::HEIGHT
+ */
+static const std::string UNDERLINE_HEIGHT("u-height");
+
+/**
+ * @brief The undeline type attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span u-type='solid' >Hello world</span>";
+ * @endcode
+ * @see UNDERLINE_ATTRIBUTES::TYPE
+ */
+static const std::string UNDERLINE_TYPE("u-type");
+
+/**
+ * @brief The undeline dash-gap attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span u-type='dashed' u-dash-gap='2.0f' >Hello world</span>";
+ * @endcode
+ * @see UNDERLINE_ATTRIBUTES::DASH_GAP
+ */
+static const std::string UNDERLINE_DASH_GAP("u-dash-gap");
+
+/**
+ * @brief The undeline dash-width attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span u-type='dashed' u-dash-width='4.0f' >Hello world</span>";
+ * @endcode
+ * @see UNDERLINE_ATTRIBUTES::DASH_WIDTH
+ */
+static const std::string UNDERLINE_DASH_WIDTH("u-dash-width");
+
+/**
+ * @brief The strikethrough color attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span s-color='green' >Hello world</span>";
+ * @endcode
+ * @see STRIKETHROUGH_ATTRIBUTES::COLOR
+ */
+static const std::string STRIKETHROUGH_COLOR("s-color");
+
+/**
+ * @brief The strikethrough height attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span s-height='3.0f' >Hello world</span>";
+ * @endcode
+ * @see STRIKETHROUGH_ATTRIBUTES::HEIGHT
+ */
+static const std::string STRIKETHROUGH_HEIGHT("s-height");
+
+/**
+ * @brief The character-spacing value attribute.
+ *
+ * Example:
+ * @code
+ * textController.Text = "<span char-space-value='5.0f' >Hello world</span>";
+ * @endcode
+ * @see CHARACTER_SPACING_ATTRIBUTES::VALUE
+ */
+static const std::string CHARACTER_SPACING_VALUE("char-space-value");
+} // namespace SPAN_ATTRIBUTES
+
+namespace STRIKETHROUGH_ATTRIBUTES
+{
+/**
+ * @brief Use the color attribute to define the color of strikethrough.
+ * The supported attribute values are red, green, blue, yellow, magenta, cyan, white, black, and transparent.
+ * Web colors and colors represented in 32-bit hexadecimal 0xAARRGGBB format are also supported.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<s color='green'>Hello world</s>";
+ *
+ * @endcode
+ */
+static const std::string COLOR("color");
+
+/**
+ * @brief Use the height attribute to define the height of strikethrough.
+ * It is float value.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<s height='2.0f'>Hello world</s>";
+ *
+ * @endcode
+ */
+static const std::string HEIGHT("height");
+} // namespace STRIKETHROUGH_ATTRIBUTES
+
+namespace PARAGRAPH_ATTRIBUTES
+{
+/**
+ * @brief Use the align attribute to define the horizontal alignment of paragraph.
+ * The supported attribute values are begin, center and end .
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = ""text outside<p align='end'>Paragraph end</p>text outside<p align='center'>Paragraph center</p>text outside<p align='begin' >Paragraph begin</p>";
+ *
+ * @endcode
+ */
+static const std::string ALIGN("align");
+
+/**
+ * @brief Use the rrel-line-height attribute to define the relative height of the line (a factor that will be multiplied by text height).
+ * It is float value.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<p>line 1</p><p rel-line-height=0.5>line\n2</p>line 3<p rel-line-height=3>line\n4</p>line 5";
+ *
+ * @endcode
+ * @note If the value is less than 1, the lines could to be overlapped.
+ */
+static const std::string RELATIVE_LINE_HEIGHT("rel-line-height");
+
+} // namespace PARAGRAPH_ATTRIBUTES
+
+namespace CHARACTER_SPACING_ATTRIBUTES
+{
+/**
+ * @brief Use the value attribute to define the spaces between characters in Pixels.
+ *  A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+ *
+ * Examples:
+ * @code
+ *
+ * textController.Text = "<char-spacing value='5.0f'>Hello world</char-spacing>"; /// Expanded
+ *
+ * @endcode
+ *
+ * @code
+ *
+ * textController.Text = "<char-spacing value='-5.0f'>Hello world</char-spacing>"); /// Condensed
+ *
+ * @endcode
+ */
+static const std::string VALUE("value");
+} // namespace CHARACTER_SPACING_ATTRIBUTES
+namespace BACKGROUND_ATTRIBUTES
+{
+/**
+ * @brief Use the value attribute to define the color of background.
+ * The supported attribute values are red, green, blue, yellow, magenta, cyan, white, black, and transparent.
+ * Web colors and colors represented in 32-bit hexadecimal 0xAARRGGBB format are also supported.
+ *
+ * The following example explains how to apply it:
+ * @code
+ *
+ * textController.Text = "<background color='green'>Hello world</background>";
+ *
+ * @endcode
+ */
+static const std::string COLOR("color");
+
+} // namespace BACKGROUND_ATTRIBUTES
+
+namespace EMBEDDED_ITEM_ATTRIBUTES
+{
+/**
+ * @brief Use the url attribute to define url path of the image.
+ *
+ * @note  The url of the image is optional. If there is no image
+ * the layout engine will use the width and height to
+ * create a space inside the text. This gap can be filled later.
+ */
+static const std::string URL("url");
+
+/**
+ * @brief Use the width attribute to define the width of the item.
+ */
+static const std::string WIDTH("width");
+
+/**
+ * @brief Use the height attribute to define the height of the item.
+ */
+static const std::string HEIGHT("height");
+
+/**
+ * @brief Use the color-blending attribute to define whether the color of the image is multiplied by the color of the text.
+ *
+ * @note A color blending mode can be set. The default is NONE, the image will use its own color. If MULTIPLY is set, the color
+ * of the image will be multiplied by the color of the text.
+ */
+static const std::string COLOR_BLENDING("color-blending");
+} // namespace EMBEDDED_ITEM_ATTRIBUTES
+
+namespace ANCHOR_ATTRIBUTES
+{
+/**
+ * @brief Use the href attribute to define the url of hyperlink.
+ */
+static const std::string HREF("href");
+
+/**
+ * @brief Sets the color for the characters and underlines inside the element.
+ */
+static const std::string COLOR("color");
+
+/**
+ * @brief Sets the clicked color for the characters and underlines inside the element.
+ */
+static const std::string CLICKED_COLOR("clicked-color");
+
+} // namespace ANCHOR_ATTRIBUTES
+
+} // namespace MARKUP
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_MARKUPS_AND_ATTRIBUTES_H
diff --git a/dali-toolkit/internal/text/multi-language-helper-functions.cpp b/dali-toolkit/internal/text/multi-language-helper-functions.cpp
index f53bfef..930cb8b 100644
--- a/dali-toolkit/internal/text/multi-language-helper-functions.cpp
+++ b/dali-toolkit/internal/text/multi-language-helper-functions.cpp
@@ -30,6 +30,7 @@ namespace Text
 void MergeFontDescriptions(const Vector<FontDescriptionRun>&       fontDescriptions,
                            const TextAbstraction::FontDescription& defaultFontDescription,
                            TextAbstraction::PointSize26Dot6        defaultPointSize,
+                           float                                   fontSizeScale,
                            CharacterIndex                          characterIndex,
                            TextAbstraction::FontDescription&       fontDescription,
                            TextAbstraction::PointSize26Dot6&       fontPointSize,
@@ -133,7 +134,7 @@ void MergeFontDescriptions(const Vector<FontDescriptionRun>&       fontDescripti
     if(sizeOverriden)
     {
       const FontDescriptionRun& fontRun = *(fontDescriptionsBuffer + sizeIndex);
-      fontPointSize                     = fontRun.size;
+      fontPointSize                     = static_cast<PointSize26Dot6>(fontRun.size * fontSizeScale);
     }
   }
 }
diff --git a/dali-toolkit/internal/text/multi-language-helper-functions.h b/dali-toolkit/internal/text/multi-language-helper-functions.h
index 41cb04a..f9992d0 100644
--- a/dali-toolkit/internal/text/multi-language-helper-functions.h
+++ b/dali-toolkit/internal/text/multi-language-helper-functions.h
@@ -37,6 +37,7 @@ namespace Text
  * @param[in] fontDescriptions The font's descriptions for the whole text.
  * @param[in] defaultFontDescription The default font's description.
  * @param[in] defaultPointSize The default font's point size.
+ * @param[in] fontSizeScale The font's size scale.
  * @param[in] characterIndex Index to the character to retrieve its font's description.
  * @param[out] fontDescription The font's description for the character.
  * @param[out] fontPointSize The font's point size for the character.
@@ -45,6 +46,7 @@ namespace Text
 void MergeFontDescriptions(const Vector<FontDescriptionRun>&       fontDescriptions,
                            const TextAbstraction::FontDescription& defaultFontDescription,
                            TextAbstraction::PointSize26Dot6        defaultPointSize,
+                           float                                   fontSizeScale,
                            CharacterIndex                          characterIndex,
                            TextAbstraction::FontDescription&       fontDescription,
                            TextAbstraction::PointSize26Dot6&       fontPointSize,
diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index a0e6ae5..41ba5ac 100644
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,12 @@
 // EXTERNAL INCLUDES
 #include <dali/devel-api/common/singleton-service.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/emoji-helper.h>
 #include <dali-toolkit/internal/text/multi-language-helper-functions.h>
 
 namespace Dali
@@ -36,13 +39,150 @@ namespace
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_MULTI_LANGUAGE_SUPPORT");
 #endif
 
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_FONT_PERFORMANCE_MARKER, false);
+
 const Dali::Toolkit::Text::Character UTF32_A = 0x0041;
+
+// TODO : Customization required for these values.
+constexpr std::size_t MAX_VALIDATE_FONTS_PER_SCRIPT_CACHE_SIZE = 63;
+constexpr std::size_t MAX_DEFAULT_FONTS_CACHE_SIZE             = 15;
+
+constexpr int VALIDATE_FONTS_PER_SCRIPT_REMAIN_COUNT = 8;
+constexpr int DEFAULT_FONTS_REMAIN_COUNT             = 2;
 } // namespace
 
 namespace Text
 {
 namespace Internal
 {
+
+namespace
+{
+void CheckFontSupportsCharacter(
+  bool& isValidFont,
+  bool& isCommonScript,
+  const Character& character,
+  ValidateFontsPerScript**& validFontsPerScriptCacheBuffer,
+  const Script& script,
+  FontId& fontId,
+  TextAbstraction::FontClient& fontClient,
+  const bool isValidCachedDefaultFont,
+  const FontId& cachedDefaultFontId,
+  const TextAbstraction::FontDescription& currentFontDescription,
+  const TextAbstraction::PointSize26Dot6& currentFontPointSize,
+  DefaultFonts**& defaultFontPerScriptCacheBuffer)
+{
+  // Need to check if the given font supports the current character.
+  if(!isValidFont) // (1)
+  {
+    // Whether the current character is common for all scripts (i.e. white spaces, ...)
+
+    // Is not desirable to cache fonts for the common script.
+    //
+    // i.e. Consider the text " हिंदी", the 'white space' has assigned the DEVANAGARI script.
+    //      The user may have set a font or the platform's default is used.
+    //
+    //      As the 'white space' is the first character, no font is cached so the font validation
+    //      retrieves a glyph from the given font.
+    //
+    //      Many fonts support 'white spaces' so probably the font set by the user or the platform's default
+    //      supports the 'white space'. However, that font may not support the DEVANAGARI script.
+    isCommonScript = TextAbstraction::IsCommonScript(character) || TextAbstraction::IsEmojiPresentationSelector(character);
+
+    // Check in the valid fonts cache.
+    ValidateFontsPerScript* validateFontsPerScript = *(validFontsPerScriptCacheBuffer + script);
+
+    if(NULL != validateFontsPerScript)
+    {
+      // This cache stores valid fonts set by the user.
+      isValidFont = validateFontsPerScript->IsValidFont(fontId);
+
+      // It may happen that a validated font for a script doesn't have all the glyphs for that script.
+      // i.e a font validated for the CJK script may contain glyphs for the chinese language but not for the Japanese.
+      if(isValidFont)
+      {
+        // Checks if the current character is supported by the font is needed.
+        isValidFont = fontClient.IsCharacterSupportedByFont(fontId, character);
+      }
+    }
+
+    if(!isValidFont) // (2)
+    {
+      // The selected font is not stored in any cache.
+
+      // Checks if the current character is supported by the selected font.
+      isValidFont = fontClient.IsCharacterSupportedByFont(fontId, character);
+
+      // If there is a valid font, cache it.
+      if(isValidFont && !isCommonScript)
+      {
+        if(NULL == validateFontsPerScript)
+        {
+          validateFontsPerScript = new ValidateFontsPerScript();
+
+          *(validFontsPerScriptCacheBuffer + script) = validateFontsPerScript;
+        }
+
+        validateFontsPerScript->Cache(fontId);
+      }
+
+      if(!isValidFont && (fontId != cachedDefaultFontId) && (!TextAbstraction::IsNewParagraph(character))) // (3)
+      {
+        // The selected font by the user or the platform's default font has failed to validate the character.
+
+        // Checks if the previously discarted cached default font supports the character.
+        bool isValidCachedFont = false;
+        if(isValidCachedDefaultFont)
+        {
+          isValidCachedFont = fontClient.IsCharacterSupportedByFont(cachedDefaultFontId, character);
+        }
+
+        if(isValidCachedFont)
+        {
+          // Use the cached default font for the script if there is one.
+          fontId      = cachedDefaultFontId;
+          isValidFont = true;
+        }
+        else
+        {
+          // There is no valid cached default font for the script.
+
+          DefaultFonts* defaultFontsPerScript = NULL;
+
+          // Find a fallback-font.
+          fontId = fontClient.FindFallbackFont(character,
+                                               currentFontDescription,
+                                               currentFontPointSize,
+                                               false);
+
+          if(0u == fontId)
+          {
+            fontId = fontClient.FindDefaultFont(UTF32_A, currentFontPointSize);
+          }
+
+          if(!isCommonScript && (script != TextAbstraction::UNKNOWN))
+          {
+            // Cache the font if it is not an unknown script
+            if(NULL == defaultFontsPerScript)
+            {
+              defaultFontsPerScript = *(defaultFontPerScriptCacheBuffer + script);
+
+              if(NULL == defaultFontsPerScript)
+              {
+                defaultFontsPerScript                       = new DefaultFonts();
+                *(defaultFontPerScriptCacheBuffer + script) = defaultFontsPerScript;
+              }
+            }
+            defaultFontsPerScript->Cache(currentFontDescription, fontId);
+            isValidFont = true;
+          }
+        }
+      } // !isValidFont (3)
+    }   // !isValidFont (2)
+  }     // !isValidFont (1)
+}
+} // unnamed namespace
+
 bool ValidateFontsPerScript::IsValidFont(FontId fontId) const
 {
   for(Vector<FontId>::ConstIterator it    = mValidFonts.Begin(),
@@ -58,6 +198,20 @@ bool ValidateFontsPerScript::IsValidFont(FontId fontId) const
 
   return false;
 }
+void ValidateFontsPerScript::Cache(FontId fontId)
+{
+  mValidFonts.PushBack(fontId);
+  if(MAX_VALIDATE_FONTS_PER_SCRIPT_CACHE_SIZE < mValidFonts.Count())
+  {
+    // Clear cache but remaind some last items.
+    const auto offset = mValidFonts.Count() - VALIDATE_FONTS_PER_SCRIPT_REMAIN_COUNT;
+    for(int i = 0; i < VALIDATE_FONTS_PER_SCRIPT_REMAIN_COUNT; ++i)
+    {
+      mValidFonts[i] = std::move(mValidFonts[offset + i]);
+    }
+    mValidFonts.Resize(VALIDATE_FONTS_PER_SCRIPT_REMAIN_COUNT);
+  }
+}
 
 FontId DefaultFonts::FindFont(TextAbstraction::FontClient&            fontClient,
                               const TextAbstraction::FontDescription& description,
@@ -89,19 +243,35 @@ void DefaultFonts::Cache(const TextAbstraction::FontDescription& description, Fo
   item.description = description;
   item.fontId      = fontId;
   mFonts.push_back(item);
+  if(MAX_DEFAULT_FONTS_CACHE_SIZE < mFonts.size())
+  {
+    // Clear cache but remaind some last items.
+    const auto offset = mFonts.size() - DEFAULT_FONTS_REMAIN_COUNT;
+    for(int i = 0; i < DEFAULT_FONTS_REMAIN_COUNT; ++i)
+    {
+      mFonts[i] = std::move(mFonts[offset + i]);
+    }
+    mFonts.resize(DEFAULT_FONTS_REMAIN_COUNT);
+  }
 }
 
 MultilanguageSupport::MultilanguageSupport()
 : mDefaultFontPerScriptCache(),
-  mValidFontsPerScriptCache()
+  mValidFontsPerScriptCache(),
+  mLocale(std::string())
 {
   // Initializes the default font cache to zero (invalid font).
   // Reserves space to cache the default fonts and access them with the script as an index.
-  mDefaultFontPerScriptCache.Resize(TextAbstraction::UNKNOWN + 1, NULL);
+  mDefaultFontPerScriptCache.Resize(TextAbstraction::GetNumberOfScripts(), NULL);
 
   // Initializes the valid fonts cache to NULL (no valid fonts).
   // Reserves space to cache the valid fonts and access them with the script as an index.
-  mValidFontsPerScriptCache.Resize(TextAbstraction::UNKNOWN + 1, NULL);
+  mValidFontsPerScriptCache.Resize(TextAbstraction::GetNumberOfScripts(), NULL);
+
+  if(Dali::Adaptor::IsAvailable())
+  {
+    Dali::Adaptor::Get().LocaleChangedSignal().Connect(this, &MultilanguageSupport::OnLocaleChanged);
+  }
 }
 
 MultilanguageSupport::~MultilanguageSupport()
@@ -125,6 +295,29 @@ MultilanguageSupport::~MultilanguageSupport()
   }
 }
 
+void MultilanguageSupport::OnLocaleChanged(std::string locale)
+{
+  if(mLocale != locale)
+  {
+    mLocale = locale;
+    ClearCache();
+  }
+}
+
+void MultilanguageSupport::ClearCache()
+{
+  mDefaultFontPerScriptCache.Clear();
+  mValidFontsPerScriptCache.Clear();
+
+  mDefaultFontPerScriptCache.Resize(TextAbstraction::GetNumberOfScripts(), NULL);
+  mValidFontsPerScriptCache.Resize(TextAbstraction::GetNumberOfScripts(), NULL);
+}
+
+std::string MultilanguageSupport::GetLocale()
+{
+  return mLocale;
+}
+
 Text::MultilanguageSupport MultilanguageSupport::Get()
 {
   Text::MultilanguageSupport multilanguageSupportHandle;
@@ -204,8 +397,9 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
   currentScriptRun.isRightToLeft = false;
 
   // Traverse all characters and set the scripts.
-  const Length lastCharacter = startIndex + numberOfCharacters;
-  for(Length index = startIndex; index < lastCharacter; ++index)
+  const Length lastCharacter = startIndex + numberOfCharacters - 1u;
+
+  for(Length index = startIndex; index <= lastCharacter; ++index)
   {
     Character character = *(textBuffer + index);
 
@@ -221,26 +415,41 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
     //   script of the first character of the paragraph with a defined script.
 
     // Skip those characters valid for many scripts like white spaces or '\n'.
-    bool endOfText = index == lastCharacter;
+    bool endOfText = index > lastCharacter;
+
+    //Handle all Emoji Sequence cases
+    if(IsNewSequence(textBuffer, currentScriptRun.script, index, lastCharacter, script))
+    {
+      AddCurrentScriptAndCreatNewScript(script,
+                                        false,
+                                        false,
+                                        currentScriptRun,
+                                        numberOfAllScriptCharacters,
+                                        scripts,
+                                        scriptIndex);
+    }
+    else if(IsScriptChangedToFollowSequence(currentScriptRun.script, character, script))
+    {
+      currentScriptRun.script = script;
+    }
+    else if(IsOneOfEmojiScripts(currentScriptRun.script) && (TextAbstraction::COMMON == script))
+    {
+      // Emojis doesn't mix well with characters common to all scripts. Insert the emoji run.
+      AddCurrentScriptAndCreatNewScript(TextAbstraction::UNKNOWN,
+                                        false,
+                                        false,
+                                        currentScriptRun,
+                                        numberOfAllScriptCharacters,
+                                        scripts,
+                                        scriptIndex);
+    }
+
     while(!endOfText &&
           (TextAbstraction::COMMON == script))
     {
       // Check if whether is right to left markup and Keeps true if the previous value was true.
       currentScriptRun.isRightToLeft = currentScriptRun.isRightToLeft || TextAbstraction::IsRightToLeftMark(character);
 
-      if(TextAbstraction::EMOJI == currentScriptRun.script)
-      {
-        // Emojis doesn't mix well with characters common to all scripts. Insert the emoji run.
-        scripts.Insert(scripts.Begin() + scriptIndex, currentScriptRun);
-        ++scriptIndex;
-
-        // Initialize the new one.
-        currentScriptRun.characterRun.characterIndex     = currentScriptRun.characterRun.characterIndex + currentScriptRun.characterRun.numberOfCharacters;
-        currentScriptRun.characterRun.numberOfCharacters = 0u;
-        currentScriptRun.script                          = TextAbstraction::UNKNOWN;
-        numberOfAllScriptCharacters                      = 0u;
-      }
-
       // Count all these characters to be added into a script.
       ++numberOfAllScriptCharacters;
 
@@ -252,29 +461,38 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
         // the same direction than the first script of the paragraph.
         isFirstScriptToBeSet = true;
 
-        // Characters common to all scripts at the end of the paragraph are added to the last script.
-        currentScriptRun.characterRun.numberOfCharacters += numberOfAllScriptCharacters;
-
-        // Store the script run.
-        scripts.Insert(scripts.Begin() + scriptIndex, currentScriptRun);
-        ++scriptIndex;
-
-        // Initialize the new one.
-        currentScriptRun.characterRun.characterIndex     = currentScriptRun.characterRun.characterIndex + currentScriptRun.characterRun.numberOfCharacters;
-        currentScriptRun.characterRun.numberOfCharacters = 0u;
-        currentScriptRun.script                          = TextAbstraction::UNKNOWN;
-        numberOfAllScriptCharacters                      = 0u;
-        // Initialize whether is right to left direction
-        currentScriptRun.isRightToLeft = false;
+        AddCurrentScriptAndCreatNewScript(TextAbstraction::UNKNOWN,
+                                          false,
+                                          false,
+                                          currentScriptRun,
+                                          numberOfAllScriptCharacters,
+                                          scripts,
+                                          scriptIndex);
       }
 
       // Get the next character.
       ++index;
-      endOfText = index == lastCharacter;
+      endOfText = index > lastCharacter;
       if(!endOfText)
       {
         character = *(textBuffer + index);
         script    = TextAbstraction::GetCharacterScript(character);
+
+        //Handle all Emoji Sequence cases
+        if(IsNewSequence(textBuffer, currentScriptRun.script, index, lastCharacter, script))
+        {
+          AddCurrentScriptAndCreatNewScript(script,
+                                            false,
+                                            false,
+                                            currentScriptRun,
+                                            numberOfAllScriptCharacters,
+                                            scripts,
+                                            scriptIndex);
+        }
+        else if(IsScriptChangedToFollowSequence(currentScriptRun.script, character, script))
+        {
+          currentScriptRun.script = script;
+        }
       }
     } // end while( !endOfText && ( TextAbstraction::COMMON == script ) )
 
@@ -289,7 +507,10 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
     if(isFirstScriptToBeSet &&
        (TextAbstraction::UNKNOWN != script) &&
        (TextAbstraction::COMMON != script) &&
-       (TextAbstraction::EMOJI != script))
+       (TextAbstraction::EMOJI != script) &&
+       (TextAbstraction::EMOJI_TEXT != script) &&
+       (TextAbstraction::EMOJI_COLOR != script) &&
+       (!TextAbstraction::IsSymbolScript(script)))
     {
       // Sets the direction of the first valid script.
       isParagraphRTL       = currentScriptRun.isRightToLeft || TextAbstraction::IsRightToLeftScript(script);
@@ -318,26 +539,21 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
         numberOfAllScriptCharacters = 0u;
       }
       else if((TextAbstraction::UNKNOWN == currentScriptRun.script) &&
-              (TextAbstraction::EMOJI == script))
+              (TextAbstraction::IsSymbolOrEmojiOrTextScript(script)))
       {
         currentScriptRun.characterRun.numberOfCharacters += numberOfAllScriptCharacters;
         numberOfAllScriptCharacters = 0u;
       }
 
-      if(0u != currentScriptRun.characterRun.numberOfCharacters)
-      {
-        // Store the script run.
-        scripts.Insert(scripts.Begin() + scriptIndex, currentScriptRun);
-        ++scriptIndex;
-      }
-
-      // Initialize the new one.
-      currentScriptRun.characterRun.characterIndex     = currentScriptRun.characterRun.characterIndex + currentScriptRun.characterRun.numberOfCharacters;
-      currentScriptRun.characterRun.numberOfCharacters = numberOfAllScriptCharacters + 1u; // Adds the white spaces which are at the begining of the script.
-      currentScriptRun.script                          = script;
-      numberOfAllScriptCharacters                      = 0u;
-      // Check if whether is right to left script.
-      currentScriptRun.isRightToLeft = TextAbstraction::IsRightToLeftScript(currentScriptRun.script);
+      // Adds the white spaces which are at the begining of the script.
+      numberOfAllScriptCharacters++;
+      AddCurrentScriptAndCreatNewScript(script,
+                                        TextAbstraction::IsRightToLeftScript(script),
+                                        true,
+                                        currentScriptRun,
+                                        numberOfAllScriptCharacters,
+                                        scripts,
+                                        scriptIndex);
     }
     else
     {
@@ -386,6 +602,7 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
                                          const Vector<FontDescriptionRun>&       fontDescriptions,
                                          const TextAbstraction::FontDescription& defaultFontDescription,
                                          TextAbstraction::PointSize26Dot6        defaultFontPointSize,
+                                         float                                   fontSizeScale,
                                          CharacterIndex                          startIndex,
                                          Length                                  numberOfCharacters,
                                          Vector<FontRun>&                        fonts)
@@ -399,6 +616,8 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
     return;
   }
 
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_FONTS_VALIDATE");
+
   // Find the first index where to insert the font run.
   FontRunIndex fontIndex = 0u;
   if(0u != startIndex)
@@ -444,10 +663,12 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
   Vector<ScriptRun>::ConstIterator scriptRunEndIt          = scripts.End();
   bool                             isNewParagraphCharacter = false;
 
-  bool isPreviousEmojiScript = false;
+  FontId                  currentFontId       = 0u;
+  FontId                  previousFontId      = 0u;
+  TextAbstraction::Script previousScript      = TextAbstraction::UNKNOWN;
 
-  CharacterIndex lastCharacter = startIndex + numberOfCharacters;
-  for(Length index = startIndex; index < lastCharacter; ++index)
+  CharacterIndex lastCharacter = startIndex + numberOfCharacters - 1u;
+  for(Length index = startIndex; index <= lastCharacter; ++index)
   {
     // Get the current character.
     const Character character        = *(textBuffer + index);
@@ -461,6 +682,7 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
     MergeFontDescriptions(fontDescriptions,
                           defaultFontDescription,
                           defaultFontPointSize,
+                          fontSizeScale,
                           index,
                           currentFontDescription,
                           currentFontPointSize,
@@ -468,6 +690,7 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
 
     // Get the font for the current character.
     FontId fontId = fontClient.GetFontId(currentFontDescription, currentFontPointSize);
+    currentFontId = fontId;
 
     // Get the script for the current character.
     Script script = GetScript(index,
@@ -475,6 +698,7 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
                               scriptRunEndIt);
 
 #ifdef DEBUG_ENABLED
+    if(gLogFilter->IsEnabledFor(Debug::Verbose))
     {
       Dali::TextAbstraction::FontDescription description;
       fontClient.GetDescription(fontId, description);
@@ -515,139 +739,80 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
       isValidFont = fontClient.IsCharacterSupportedByFont(fontId, character);
     }
 
-    bool isCommonScript = false;
-    bool isEmojiScript  = TextAbstraction::EMOJI == script;
+    bool isEmojiScript = IsEmojiColorScript(script) || IsEmojiTextScript(script);
+    bool isZWJ         = TextAbstraction::IsZeroWidthJoiner(character);
 
-    if(isEmojiScript && !isPreviousEmojiScript)
+    if((previousScript == script) &&
+       (isEmojiScript || isZWJ))
     {
-      if(0u != currentFontRun.characterRun.numberOfCharacters)
+      // This sequence should use the previous font.
+      if(0u != previousFontId)
       {
-        // Store the font run.
-        fonts.Insert(fonts.Begin() + fontIndex, currentFontRun);
-        ++fontIndex;
+        fontId      = previousFontId;
+        isValidFont = true;
       }
+    }
 
-      // Initialize the new one.
-      currentFontRun.characterRun.characterIndex     = currentFontRun.characterRun.characterIndex + currentFontRun.characterRun.numberOfCharacters;
-      currentFontRun.characterRun.numberOfCharacters = 0u;
-      currentFontRun.fontId                          = fontId;
-      currentFontRun.isItalicRequired                = false;
-      currentFontRun.isBoldRequired                  = false;
+    if(TextAbstraction::IsSpace(character) &&
+       TextAbstraction::HasLigatureMustBreak(script) &&
+       isValidCachedDefaultFont &&
+       (isDefaultFont || (currentFontId == previousFontId)))
+    {
+      fontId      = cachedDefaultFontId;
+      isValidFont = true;
     }
 
+    // This is valid after CheckFontSupportsCharacter();
+    bool isCommonScript = false;
+
     // If the given font is not valid, it means either:
     // - there is no cached font for the current script yet or,
     // - the user has set a different font than the default one for the current script or,
     // - the platform default font is different than the default font for the current script.
 
     // Need to check if the given font supports the current character.
-    if(!isValidFont) // (1)
+    CheckFontSupportsCharacter(isValidFont, isCommonScript, character, validFontsPerScriptCacheBuffer, script, fontId, fontClient,
+                               isValidCachedDefaultFont, cachedDefaultFontId, currentFontDescription, currentFontPointSize, defaultFontPerScriptCacheBuffer);
+
+    if(isEmojiScript && (previousScript != script))
     {
-      // Whether the current character is common for all scripts (i.e. white spaces, ...)
-
-      // Is not desirable to cache fonts for the common script.
-      //
-      // i.e. Consider the text " हिंदी", the 'white space' has assigned the DEVANAGARI script.
-      //      The user may have set a font or the platform's default is used.
-      //
-      //      As the 'white space' is the first character, no font is cached so the font validation
-      //      retrieves a glyph from the given font.
-      //
-      //      Many fonts support 'white spaces' so probably the font set by the user or the platform's default
-      //      supports the 'white space'. However, that font may not support the DEVANAGARI script.
-      isCommonScript = TextAbstraction::IsCommonScript(character);
-
-      // Check in the valid fonts cache.
-      ValidateFontsPerScript* validateFontsPerScript = *(validFontsPerScriptCacheBuffer + script);
-
-      if(NULL != validateFontsPerScript)
+      //New Emoji sequence should select font according to the variation selector (VS15 or VS16).
+      if(0u != currentFontRun.characterRun.numberOfCharacters)
       {
-        // This cache stores valid fonts set by the user.
-        isValidFont = validateFontsPerScript->IsValidFont(fontId);
-
-        // It may happen that a validated font for a script doesn't have all the glyphs for that script.
-        // i.e a font validated for the CJK script may contain glyphs for the chinese language but not for the Japanese.
-        if(isValidFont)
-        {
-          // Checks if the current character is supported by the font is needed.
-          isValidFont = fontClient.IsCharacterSupportedByFont(fontId, character);
-        }
+        // Store the font run.
+        fonts.Insert(fonts.Begin() + fontIndex, currentFontRun);
+        ++fontIndex;
       }
 
-      if(!isValidFont) // (2)
+      // Initialize the new one.
+      currentFontRun.characterRun.characterIndex     = currentFontRun.characterRun.characterIndex + currentFontRun.characterRun.numberOfCharacters;
+      currentFontRun.characterRun.numberOfCharacters = 0u;
+      currentFontRun.fontId                          = fontId;
+      currentFontRun.isItalicRequired                = false;
+      currentFontRun.isBoldRequired                  = false;
+
+      if(TextAbstraction::IsEmojiColorScript(script) || TextAbstraction::IsEmojiTextScript(script))
       {
-        // The selected font is not stored in any cache.
+        bool       isModifiedByVariationSelector = false;
+        GlyphIndex glyphIndexChar                = fontClient.GetGlyphIndex(fontId, character);
+        GlyphIndex glyphIndexCharByVS            = fontClient.GetGlyphIndex(fontId, character, Text::GetVariationSelectorByScript(script));
 
-        // Checks if the current character is supported by the selected font.
-        isValidFont = fontClient.IsCharacterSupportedByFont(fontId, character);
+        isModifiedByVariationSelector = glyphIndexChar != glyphIndexCharByVS;
 
-        // If there is a valid font, cache it.
-        if(isValidFont && !isCommonScript)
+        if(isModifiedByVariationSelector)
         {
-          if(NULL == validateFontsPerScript)
+          FontId requestedFontId = fontClient.FindDefaultFont(character, currentFontPointSize, IsEmojiColorScript(script));
+          if(0u != requestedFontId)
           {
-            validateFontsPerScript = new ValidateFontsPerScript();
-
-            *(validFontsPerScriptCacheBuffer + script) = validateFontsPerScript;
+            currentFontRun.fontId = fontId = requestedFontId;
+            isValidFont                    = true;
           }
-
-          validateFontsPerScript->mValidFonts.PushBack(fontId);
         }
-
-        if(!isValidFont && (fontId != cachedDefaultFontId) && (!TextAbstraction::IsNewParagraph(character))) // (3)
-        {
-          // The selected font by the user or the platform's default font has failed to validate the character.
-
-          // Checks if the previously discarted cached default font supports the character.
-          bool isValidCachedFont = false;
-          if(isValidCachedDefaultFont)
-          {
-            isValidCachedFont = fontClient.IsCharacterSupportedByFont(cachedDefaultFontId, character);
-          }
-
-          if(isValidCachedFont)
-          {
-            // Use the cached default font for the script if there is one.
-            fontId = cachedDefaultFontId;
-          }
-          else
-          {
-            // There is no valid cached default font for the script.
-
-            DefaultFonts* defaultFontsPerScript = NULL;
-
-            // Find a fallback-font.
-            fontId = fontClient.FindFallbackFont(character,
-                                                 currentFontDescription,
-                                                 currentFontPointSize,
-                                                 false);
-
-            if(0u == fontId)
-            {
-              fontId = fontClient.FindDefaultFont(UTF32_A, currentFontPointSize);
-            }
-
-            if(!isCommonScript && (script != TextAbstraction::UNKNOWN))
-            {
-              // Cache the font if it is not an unknown script
-              if(NULL == defaultFontsPerScript)
-              {
-                defaultFontsPerScript = *(defaultFontPerScriptCacheBuffer + script);
-
-                if(NULL == defaultFontsPerScript)
-                {
-                  defaultFontsPerScript                       = new DefaultFonts();
-                  *(defaultFontPerScriptCacheBuffer + script) = defaultFontsPerScript;
-                }
-              }
-              defaultFontsPerScript->Cache(currentFontDescription, fontId);
-            }
-          }
-        } // !isValidFont (3)
-      }   // !isValidFont (2)
-    }     // !isValidFont (1)
+      }
+    }
 
 #ifdef DEBUG_ENABLED
+    if(gLogFilter->IsEnabledFor(Debug::Verbose))
     {
       Dali::TextAbstraction::FontDescription description;
       fontClient.GetDescription(fontId, description);
@@ -659,6 +824,15 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
                     description.path.c_str());
     }
 #endif
+    if(!isValidFont && !isCommonScript)
+    {
+      Dali::TextAbstraction::FontDescription descriptionForLog;
+      fontClient.GetDescription(fontId, descriptionForLog);
+      DALI_LOG_RELEASE_INFO("Validated font set fail : Character : %x, Script : %s, Font : %s \n",
+                            character,
+                            Dali::TextAbstraction::ScriptName[script],
+                            descriptionForLog.path.c_str());
+    }
 
     // Whether bols style is required.
     isBoldRequired = (currentFontDescription.weight >= TextAbstraction::FontWeight::BOLD);
@@ -694,7 +868,9 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
 
     // Whether the current character is a new paragraph character.
     isNewParagraphCharacter = TextAbstraction::IsNewParagraph(character);
-    isPreviousEmojiScript   = isEmojiScript;
+    previousScript          = script;
+    currentFontId           = fontId;
+    previousFontId          = currentFontId;
   } // end traverse characters.
 
   if(0u != currentFontRun.characterRun.numberOfCharacters)
@@ -725,6 +901,34 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
   DALI_LOG_INFO(gLogFilter, Debug::General, "<--MultilanguageSupport::ValidateFonts\n");
 }
 
+void MultilanguageSupport::AddCurrentScriptAndCreatNewScript(const Script       requestedScript,
+                                                             const bool         isRightToLeft,
+                                                             const bool         addScriptCharactersToNewScript,
+                                                             ScriptRun&         currentScriptRun,
+                                                             Length&            numberOfAllScriptCharacters,
+                                                             Vector<ScriptRun>& scripts,
+                                                             ScriptRunIndex&    scriptIndex)
+{
+  // Add the pending characters to the current script
+  currentScriptRun.characterRun.numberOfCharacters += (addScriptCharactersToNewScript ? 0u : numberOfAllScriptCharacters);
+
+  // In-case the current script is empty then no need to add it for scripts
+  if(0u != currentScriptRun.characterRun.numberOfCharacters)
+  {
+    // Store the script run.
+    scripts.Insert(scripts.Begin() + scriptIndex, currentScriptRun);
+    ++scriptIndex;
+  }
+
+  // Initialize the new one by the requested script
+  currentScriptRun.characterRun.characterIndex     = currentScriptRun.characterRun.characterIndex + currentScriptRun.characterRun.numberOfCharacters;
+  currentScriptRun.characterRun.numberOfCharacters = (addScriptCharactersToNewScript ? numberOfAllScriptCharacters : 0u);
+  currentScriptRun.script                          = requestedScript;
+  numberOfAllScriptCharacters                      = 0u;
+  // Initialize whether is right to left direction
+  currentScriptRun.isRightToLeft = isRightToLeft;
+}
+
 } // namespace Internal
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/multi-language-support-impl.h b/dali-toolkit/internal/text/multi-language-support-impl.h
index de44e19..2f0a904 100644
--- a/dali-toolkit/internal/text/multi-language-support-impl.h
+++ b/dali-toolkit/internal/text/multi-language-support-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>
+#include <dali/public-api/signals/connection-tracker.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/multi-language-support.h>
@@ -67,6 +68,14 @@ struct ValidateFontsPerScript
    */
   bool IsValidFont(FontId fontId) const;
 
+  /**
+   * @brief Cache the given @p fontId in the vector of valid fonts.
+   * @note If cache size is big enough, we might remove some caches.
+   *
+   * @param[in] fontId The font id.
+   */
+  void Cache(FontId fontId);
+
   Vector<FontId> mValidFonts;
 };
 
@@ -109,6 +118,13 @@ struct DefaultFonts
                   const TextAbstraction::FontDescription& description,
                   PointSize26Dot6                         size) const;
 
+  /**
+   * @brief Cache a default font for the given @p size.
+   * @note If cache size is big enough, we might remove some caches.
+   *
+   * @param[in] description The font's description.
+   * @param[in] fontId The font id.
+   */
   void Cache(const TextAbstraction::FontDescription& description, FontId fontId);
 
   std::vector<CacheItem> mFonts;
@@ -117,7 +133,7 @@ struct DefaultFonts
 /**
  * @brief Multi-language support implementation. @see Text::MultilanguageSupport.
  */
-class MultilanguageSupport : public BaseObject
+class MultilanguageSupport : public BaseObject, public ConnectionTracker
 {
 public:
   /**
@@ -153,13 +169,54 @@ public:
                      const Vector<FontDescriptionRun>&       fontDescriptions,
                      const TextAbstraction::FontDescription& defaultFontDescription,
                      TextAbstraction::PointSize26Dot6        defaultFontPointSize,
+                     float                                   fontSizeScale,
                      CharacterIndex                          startIndex,
                      Length                                  numberOfCharacters,
                      Vector<FontRun>&                        fonts);
 
+  /**
+   * @brief Callback function for when the locale is changed.
+   * @param[in] locale The new system locale.
+   */
+  void OnLocaleChanged(std::string locale);
+
+  /**
+   * @brief Clear font caches when locale changed.
+   */
+  void ClearCache();
+
+  /**
+   * @brief Gets the locale.
+   */
+  std::string GetLocale();
+
 private:
   Vector<DefaultFonts*>           mDefaultFontPerScriptCache; ///< Caches default fonts for a script.
   Vector<ValidateFontsPerScript*> mValidFontsPerScriptCache;  ///< Caches valid fonts for a script.
+
+  std::string mLocale;
+
+  //Methods
+
+  /**
+ * @brief Add the current script to scripts and create new script.
+ *
+ * @param[in] requestedScript The script of the new script run.
+ * @param[in] isRightToLeft The direction of the new script run.
+ * @param[in] addScriptCharactersToNewScript Whether to add the pending characters to the new script run or to the current script run.
+ * @param[inout] currentScriptRun The current character script run and it will be updated it to the new script run.
+ * @param[inout] numberOfAllScriptCharacters The pending characters.
+ * @param[inout] scripts The list of scripts.
+ * @param[inout] scriptIndex The current index of scripts.
+ *
+ */
+  void AddCurrentScriptAndCreatNewScript(const Script       requestedScript,
+                                         const bool         isRightToLeft,
+                                         const bool         addScriptCharactersToNewScript,
+                                         ScriptRun&         currentScriptRun,
+                                         Length&            numberOfAllScriptCharacters,
+                                         Vector<ScriptRun>& scripts,
+                                         ScriptRunIndex&    scriptIndex);
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/text/multi-language-support.cpp b/dali-toolkit/internal/text/multi-language-support.cpp
index 11ba9c0..fd930c8 100644
--- a/dali-toolkit/internal/text/multi-language-support.cpp
+++ b/dali-toolkit/internal/text/multi-language-support.cpp
@@ -61,6 +61,7 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
                                          const Vector<FontDescriptionRun>&       fontDescriptions,
                                          const TextAbstraction::FontDescription& defaultFontDescription,
                                          TextAbstraction::PointSize26Dot6        defaultFontPointSize,
+                                         float                                   fontSizeScale,
                                          CharacterIndex                          startIndex,
                                          Length                                  numberOfCharacters,
                                          Vector<FontRun>&                        fonts)
@@ -70,6 +71,7 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
                                          fontDescriptions,
                                          defaultFontDescription,
                                          defaultFontPointSize,
+                                         fontSizeScale,
                                          startIndex,
                                          numberOfCharacters,
                                          fonts);
diff --git a/dali-toolkit/internal/text/multi-language-support.h b/dali-toolkit/internal/text/multi-language-support.h
index 7423820..5d15956 100644
--- a/dali-toolkit/internal/text/multi-language-support.h
+++ b/dali-toolkit/internal/text/multi-language-support.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,6 +110,7 @@ public:
    * @param[in] fontDescriptions The fonts set through the mark-up string or the input style set through the property system.
    * @param[in] defaultFontDescription The default font's description set through the property system.
    * @param[in] defaultFontPointSize The default font's point size set through the property system.
+   * @param[in] fontSizeScale The font's size scale.
    * @param[in] startIndex The character from where the font info is set.
    * @param[in] numberOfCharacters The number of characters to set the font.
    * @param[out] fonts The validated fonts.
@@ -119,9 +120,17 @@ public:
                      const Vector<FontDescriptionRun>&       fontDescriptions,
                      const TextAbstraction::FontDescription& defaultFontDescription,
                      TextAbstraction::PointSize26Dot6        defaultFontPointSize,
+                     float                                   fontSizeScale,
                      CharacterIndex                          startIndex,
                      Length                                  numberOfCharacters,
                      Vector<FontRun>&                        fonts);
+
+public:
+  // Default copy and move operator
+  MultilanguageSupport(const MultilanguageSupport& rhs) = default;
+  MultilanguageSupport(MultilanguageSupport&& rhs)      = default;
+  MultilanguageSupport& operator=(const MultilanguageSupport& rhs) = default;
+  MultilanguageSupport& operator=(MultilanguageSupport&& rhs) = default;
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/property-string-parser.cpp b/dali-toolkit/internal/text/property-string-parser.cpp
index ec0fc94..9265472 100644
--- a/dali-toolkit/internal/text/property-string-parser.cpp
+++ b/dali-toolkit/internal/text/property-string-parser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/builder/json-parser.h>
 #include <dali-toolkit/devel-api/builder/tree-node.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
index cc6f92f..f1a292b 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -181,6 +181,13 @@ public:
    */
   void AdjustReferenceCount(Text::FontId fontId, Text::GlyphIndex index, const GlyphStyle& style, int32_t delta);
 
+public:
+  // Default copy and move operator
+  AtlasGlyphManager(const AtlasGlyphManager& rhs) = default;
+  AtlasGlyphManager(AtlasGlyphManager&& rhs)      = default;
+  AtlasGlyphManager& operator=(const AtlasGlyphManager& rhs) = default;
+  AtlasGlyphManager& operator=(AtlasGlyphManager&& rhs) = default;
+
 private:
   explicit DALI_INTERNAL AtlasGlyphManager(Internal::AtlasGlyphManager* impl);
 };
diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp
index 8745db1..0308691 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp
@@ -240,7 +240,7 @@ AtlasManager::SizeType AtlasManager::CheckAtlas(SizeType      atlas,
   {
     // Check to see if the image will fit in these blocks
 
-    const SizeType availableBlocks = mAtlasList[atlas].mAvailableBlocks + mAtlasList[atlas].mFreeBlocksList.Size();
+    const SizeType availableBlocks = mAtlasList[atlas].mAvailableBlocks + static_cast<SizeType>(mAtlasList[atlas].mFreeBlocksList.Size());
 
     if(availableBlocks && IsBlockSizeSufficient(width, height, mAtlasList[atlas].mSize.mBlockWidth, mAtlasList[atlas].mSize.mBlockHeight))
     {
@@ -454,7 +454,7 @@ void AtlasManager::GetMetrics(Toolkit::AtlasManager::Metrics& metrics)
   {
     entry.mSize        = mAtlasList[i].mSize;
     entry.mTotalBlocks = mAtlasList[i].mTotalBlocks;
-    entry.mBlocksUsed  = entry.mTotalBlocks - mAtlasList[i].mAvailableBlocks + mAtlasList[i].mFreeBlocksList.Size();
+    entry.mBlocksUsed  = entry.mTotalBlocks - mAtlasList[i].mAvailableBlocks + static_cast<SizeType>(mAtlasList[i].mFreeBlocksList.Size());
     entry.mPixelFormat = GetPixelFormat(i + 1);
 
     metrics.mAtlasMetrics.PushBack(entry);
diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
index 91bb97e..dcbcf27 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ATLAS_MANAGER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -269,6 +269,13 @@ public:
    */
   void SetTextures(AtlasId atlas, TextureSet& textureSet);
 
+public:
+  // Default copy and move operator
+  AtlasManager(const AtlasManager& rhs) = default;
+  AtlasManager(AtlasManager&& rhs)      = default;
+  AtlasManager& operator=(const AtlasManager& rhs) = default;
+  AtlasManager& operator=(AtlasManager&& rhs) = default;
+
 private:
   explicit DALI_INTERNAL AtlasManager(Internal::AtlasManager* impl);
 };
diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
index ef80844..5ccaad0 100644
--- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,15 +22,20 @@
 #include <dali/devel-api/text-abstraction/font-client.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/renderer.h>
+#include <map>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 #include <dali-toolkit/internal/text/glyph-run.h>
 #include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
 #include <dali-toolkit/internal/text/rendering/atlas/atlas-mesh-factory.h>
+#include <dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.h>
+#include <dali-toolkit/internal/text/rendering/styles/underline-helper-functions.h>
 #include <dali-toolkit/internal/text/text-view.h>
 
 using namespace Dali;
@@ -46,6 +51,7 @@ Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT
 const float    ZERO(0.0f);
 const float    HALF(0.5f);
 const float    ONE(1.0f);
+const float    ONE_AND_A_HALF(1.5f);
 const uint32_t DOUBLE_PIXEL_PADDING = 4u; //Padding will be added twice to Atlas
 const uint16_t NO_OUTLINE           = 0u;
 } // namespace
@@ -70,7 +76,7 @@ struct AtlasRenderer::Impl
   };
 
   /**
-   * brief Struct used to generate the underline mesh.
+   * brief Struct used to generate the underline/striketthrough mesh.
    * There is one Extent per line of text.
    */
   struct Extent
@@ -80,9 +86,11 @@ struct AtlasRenderer::Impl
       mLeft(0.0f),
       mRight(0.0f),
       mUnderlinePosition(0.0f),
-      mUnderlineThickness(0.0f),
+      mLineThickness(0.0f),
       mMeshRecordIndex(0u),
-      mUnderlineChunkId(0u)
+      mUnderlineChunkId(0u),
+      mStrikethroughPosition(0.0f),
+      mStrikethroughChunkId(0u)
     {
     }
 
@@ -90,9 +98,11 @@ struct AtlasRenderer::Impl
     float    mLeft;
     float    mRight;
     float    mUnderlinePosition;
-    float    mUnderlineThickness;
+    float    mLineThickness;
     uint32_t mMeshRecordIndex;
     uint32_t mUnderlineChunkId;
+    float    mStrikethroughPosition;
+    uint32_t mStrikethroughChunkId;
   };
 
   struct MaxBlockSize
@@ -152,25 +162,6 @@ struct AtlasRenderer::Impl
     mQuadVertexFormat["aColor"]    = Property::VECTOR4;
   }
 
-  bool IsGlyphUnderlined(GlyphIndex              index,
-                         const Vector<GlyphRun>& underlineRuns)
-  {
-    for(Vector<GlyphRun>::ConstIterator it    = underlineRuns.Begin(),
-                                        endIt = underlineRuns.End();
-        it != endIt;
-        ++it)
-    {
-      const GlyphRun& run = *it;
-
-      if((run.glyphIndex <= index) && (index < run.glyphIndex + run.numberOfGlyphs))
-      {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
   void CacheGlyph(const GlyphInfo& glyph, FontId lastFontId, const AtlasGlyphManager::GlyphStyle& style, AtlasManager::AtlasSlot& slot)
   {
     const Size& defaultTextAtlasSize = mFontClient.GetDefaultTextAtlasSize(); //Retrieve default size of text-atlas-block from font-client.
@@ -214,7 +205,7 @@ struct AtlasRenderer::Impl
       if(!isOutline || (isOutline && !isColorGlyph))
       {
         // Retrieve the emoji's bitmap.
-        TextAbstraction::FontClient::GlyphBufferData glyphBufferData;
+        TextAbstraction::GlyphBufferData glyphBufferData;
         glyphBufferData.width  = isColorGlyph ? glyph.width : 0; // Desired width and height.
         glyphBufferData.height = isColorGlyph ? glyph.height : 0;
 
@@ -225,13 +216,35 @@ struct AtlasRenderer::Impl
                                  glyphBufferData,
                                  style.outline);
 
+        uint32_t glyphBufferSize = glyphBufferData.width * glyphBufferData.height * Pixel::GetBytesPerPixel(glyphBufferData.format);
+        // If glyph buffer data don't have ownership, Or if we need to decompress, create new memory and replace ownership.
+        if(!glyphBufferData.isBufferOwned || glyphBufferData.compressionType != TextAbstraction::GlyphBufferData::CompressionType::NO_COMPRESSION)
+        {
+          uint8_t* newBuffer = (uint8_t*)malloc(glyphBufferSize);
+          if(DALI_LIKELY(newBuffer != nullptr))
+          {
+            TextAbstraction::GlyphBufferData::Decompress(glyphBufferData, newBuffer);
+            if(glyphBufferData.isBufferOwned)
+            {
+              // Release previous buffer
+              free(glyphBufferData.buffer);
+            }
+            glyphBufferData.isBufferOwned   = true;
+            glyphBufferData.buffer          = newBuffer;
+            glyphBufferData.compressionType = TextAbstraction::GlyphBufferData::CompressionType::NO_COMPRESSION;
+          }
+        }
+
         // Create the pixel data.
         bitmap = PixelData::New(glyphBufferData.buffer,
-                                glyphBufferData.width * glyphBufferData.height * GetBytesPerPixel(glyphBufferData.format),
+                                glyphBufferSize,
                                 glyphBufferData.width,
                                 glyphBufferData.height,
                                 glyphBufferData.format,
-                                PixelData::DELETE_ARRAY);
+                                PixelData::FREE);
+
+        // Change buffer ownership.
+        glyphBufferData.isBufferOwned = false;
 
         if(bitmap)
         {
@@ -283,27 +296,32 @@ struct AtlasRenderer::Impl
                     const Vector4&           color,
                     uint16_t                 outline,
                     AtlasManager::AtlasSlot& slot,
-                    bool                     underlineGlyph,
+                    bool                     decorationlineGlyph,
                     float                    currentUnderlinePosition,
-                    float                    currentUnderlineThickness,
+                    float                    currentlineThickness,
                     std::vector<MeshRecord>& meshContainer,
                     Vector<TextCacheEntry>&  newTextCache,
                     Vector<Extent>&          extents,
-                    uint32_t                 underlineChunkId)
+                    uint32_t                 underlineChunkId,
+                    bool                     isGlyphCached,
+                    uint32_t                 strikethroughChunkId)
   {
     // Generate mesh data for this quad, plugging in our supplied position
     AtlasManager::Mesh2D newMesh;
     mGlyphManager.GenerateMeshData(slot.mImageId, position, newMesh);
 
-    TextCacheEntry textCacheEntry;
-    textCacheEntry.mFontId       = glyph.fontId;
-    textCacheEntry.mImageId      = slot.mImageId;
-    textCacheEntry.mIndex        = glyph.index;
-    textCacheEntry.mOutlineWidth = outline;
-    textCacheEntry.isItalic      = glyph.isItalicRequired;
-    textCacheEntry.isBold        = glyph.isBoldRequired;
-
-    newTextCache.PushBack(textCacheEntry);
+    if(!isGlyphCached)
+    {
+      TextCacheEntry textCacheEntry;
+      textCacheEntry.mFontId       = glyph.fontId;
+      textCacheEntry.mImageId      = slot.mImageId;
+      textCacheEntry.mIndex        = glyph.index;
+      textCacheEntry.mOutlineWidth = outline;
+      textCacheEntry.isItalic      = glyph.isItalicRequired;
+      textCacheEntry.isBold        = glyph.isBoldRequired;
+
+      newTextCache.PushBack(textCacheEntry);
+    }
 
     AtlasManager::Vertex2D* verticesBuffer = newMesh.mVertices.Begin();
 
@@ -317,16 +335,22 @@ struct AtlasRenderer::Impl
       vertex.mColor = color;
     }
 
+    // Since Free Type font doesn't contain the strikethrough-position property,
+    // strikethrough position will be calculated by moving the underline position upwards by half the value of the line height.
+    float strikethroughStartingYPosition = (position.y + glyph.yBearing + currentUnderlinePosition) - ((glyph.height) * HALF);
+
     // Find an existing mesh data object to attach to ( or create a new one, if we can't find one using the same atlas)
     StitchTextMesh(meshContainer,
                    newMesh,
                    extents,
                    position.y + glyph.yBearing,
-                   underlineGlyph,
+                   decorationlineGlyph,
                    currentUnderlinePosition,
-                   currentUnderlineThickness,
+                   currentlineThickness,
                    slot,
-                   underlineChunkId);
+                   underlineChunkId,
+                   strikethroughStartingYPosition,
+                   strikethroughChunkId);
   }
 
   void CreateActors(const std::vector<MeshRecord>& meshContainer,
@@ -416,6 +440,7 @@ struct AtlasRenderer::Impl
     std::vector<MeshRecord> meshContainer;
     std::vector<MeshRecord> meshContainerOutline;
     Vector<Extent>          extents;
+    Vector<Extent>          strikethroughExtents;
     mDepth = depth;
 
     const Vector2&   textSize(view.GetLayoutSize());
@@ -423,14 +448,14 @@ struct AtlasRenderer::Impl
     const Vector2&   shadowOffset(view.GetShadowOffset());
     const Vector4&   shadowColor(view.GetShadowColor());
     const bool       underlineEnabled = view.IsUnderlineEnabled();
-    const Vector4&   underlineColor(view.GetUnderlineColor());
-    const float      underlineHeight = view.GetUnderlineHeight();
-    const uint16_t   outlineWidth    = view.GetOutlineWidth();
+    const uint16_t   outlineWidth     = view.GetOutlineWidth();
     const Vector4&   outlineColor(view.GetOutlineColor());
-    const bool       isOutline     = 0u != outlineWidth;
-    const GlyphInfo* hyphens       = view.GetHyphens();
-    const Length*    hyphenIndices = view.GetHyphenIndices();
-    const Length     hyphensCount  = view.GetHyphensCount();
+    const bool       isOutline            = 0u != outlineWidth;
+    const GlyphInfo* hyphens              = view.GetHyphens();
+    const Length*    hyphenIndices        = view.GetHyphenIndices();
+    const Length     hyphensCount         = view.GetHyphensCount();
+    const bool       strikethroughEnabled = view.IsStrikethroughEnabled();
+    const float      characterSpacing(view.GetCharacterSpacing());
 
     // Elided text info. Indices according to elided text.
     const auto startIndexOfGlyphs              = view.GetStartIndexOfElidedGlyphs();
@@ -439,21 +464,49 @@ struct AtlasRenderer::Impl
 
     const bool useDefaultColor = (NULL == colorsBuffer);
 
+    // Get a handle of the font client. Used to retrieve the bitmaps of the glyphs.
+    TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+
     // Get the underline runs.
-    const Length     numberOfUnderlineRuns = view.GetNumberOfUnderlineRuns();
-    Vector<GlyphRun> underlineRuns;
+    const Length               numberOfUnderlineRuns = view.GetNumberOfUnderlineRuns();
+    Vector<UnderlinedGlyphRun> underlineRuns;
     underlineRuns.Resize(numberOfUnderlineRuns);
     view.GetUnderlineRuns(underlineRuns.Begin(),
                           0u,
                           numberOfUnderlineRuns);
 
-    bool thereAreUnderlinedGlyphs = false;
-
-    float  currentUnderlinePosition  = ZERO;
-    float  currentUnderlineThickness = underlineHeight;
-    FontId lastFontId                = 0;
-    FontId lastUnderlinedFontId      = 0;
-    Style  style                     = STYLE_NORMAL;
+    // Aggregate underline-style-properties from view
+    const UnderlineStyleProperties viewUnderlineProperties{view.GetUnderlineType(),
+                                                           view.GetUnderlineColor(),
+                                                           view.GetUnderlineHeight(),
+                                                           view.GetDashedUnderlineGap(),
+                                                           view.GetDashedUnderlineWidth(),
+                                                           true,
+                                                           true,
+                                                           true,
+                                                           true,
+                                                           true};
+
+    float maxUnderlineHeight = viewUnderlineProperties.height;
+
+    // Get the strikethrough runs.
+    const Length                  numberOfStrikethroughRuns = view.GetNumberOfStrikethroughRuns();
+    Vector<StrikethroughGlyphRun> strikethroughRuns;
+    strikethroughRuns.Resize(numberOfStrikethroughRuns);
+    view.GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+    const StrikethroughStyleProperties viewStrikethroughProperties{view.GetStrikethroughColor(),
+                                                                   view.GetStrikethroughHeight(),
+                                                                   true,
+                                                                   true};
+
+    float maxStrikethroughHeight = viewStrikethroughProperties.height;
+
+    FontId lastFontId                  = 0;
+    Style  style                       = STYLE_NORMAL;
+    float  currentUnderlinePosition    = ZERO;
+    bool   thereAreUnderlinedGlyphs    = false;
+    bool   thereAreStrikethroughGlyphs = false;
 
     if(fabsf(shadowOffset.x) > Math::MACHINE_EPSILON_1 || fabsf(shadowOffset.y) > Math::MACHINE_EPSILON_1)
     {
@@ -470,8 +523,21 @@ struct AtlasRenderer::Impl
     uint32_t               hyphenIndex = 0;
 
     //For septated underlined chunks. (this is for Markup case)
-    uint32_t underlineChunkId = 0u;    // give id for each chunk.
-    bool     isPreUnderlined  = false; // status of underlined for previous glyph.
+    uint32_t                                     underlineChunkId = 0u;                            // give id for each chunk.
+    bool                                         isPreUnderlined  = false;                         // status of underlined for previous glyph.
+    std::map<uint32_t, UnderlineStyleProperties> mapUnderlineChunkIdWithProperties;                // mapping underlineChunkId with UnderlineStyleProperties to get properties of underlined chunk
+    UnderlineStyleProperties                     preUnderlineProperties = viewUnderlineProperties; // the previous UnderlineStyleProperties
+
+    //For septated strikethrough chunks. (this is for Markup case)
+    uint32_t                                         strikethroughChunkId = 0u;                                // give id for each chunk.
+    bool                                             isPreStrikethrough   = false;                             // status of strikethrough for previous glyph.
+    std::map<uint32_t, StrikethroughStyleProperties> mapStrikethroughChunkIdWithProperties;                    // mapping strikethroughChunkId with StrikethroughStyleProperties to get properties of strikethrough chunk
+    StrikethroughStyleProperties                     preStrikethroughProperties = viewStrikethroughProperties; // the previous StrikethroughStyleProperties
+
+    const Character*              textBuffer                = view.GetTextBuffer();
+    float                         calculatedAdvance         = 0.f;
+    const Vector<CharacterIndex>& glyphToCharacterMap       = view.GetGlyphsToCharacters();
+    const CharacterIndex*         glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
 
     //Skip hyphenIndices less than startIndexOfGlyphs or between two middle of elided text
     if(hyphenIndices)
@@ -483,11 +549,18 @@ struct AtlasRenderer::Impl
       }
     }
 
+    //To keep the last fontMetrics of lastDecorativeLinesFontId
+    FontId      lastDecorativeLinesFontId = 0; // DecorativeLines like Undeline and Strikethrough
+    FontMetrics lastDecorativeLinesFontMetrics;
+    fontClient.GetFontMetrics(lastDecorativeLinesFontId, lastDecorativeLinesFontMetrics);
+
+    // Iteration on glyphs
     for(uint32_t i = 0, glyphSize = glyphs.Size(); i < glyphSize; ++i)
     {
       GlyphInfo glyph;
       bool      addHyphen = ((hyphenIndex < hyphensCount) && hyphenIndices && ((i + startIndexOfGlyphs) == hyphenIndices[hyphenIndex]));
-      if(addHyphen && hyphens)
+      // TODO : Shouldn't we have to control here when i == 0 cases?
+      if(addHyphen && hyphens && i > 0u)
       {
         glyph = hyphens[hyphenIndex];
         i--;
@@ -497,51 +570,62 @@ struct AtlasRenderer::Impl
         glyph = *(glyphsBuffer + i);
       }
 
-      const bool isGlyphUnderlined = underlineEnabled || IsGlyphUnderlined(i, underlineRuns);
-      thereAreUnderlinedGlyphs     = thereAreUnderlinedGlyphs || isGlyphUnderlined;
+      Vector<UnderlinedGlyphRun>::ConstIterator currentUnderlinedGlyphRunIt = underlineRuns.End();
+      const bool                                isGlyphUnderlined           = underlineEnabled || IsGlyphUnderlined(i, underlineRuns, currentUnderlinedGlyphRunIt);
+      const UnderlineStyleProperties            currentUnderlineProperties  = GetCurrentUnderlineProperties(i, isGlyphUnderlined, underlineRuns, currentUnderlinedGlyphRunIt, viewUnderlineProperties);
+      float                                     currentUnderlineHeight      = currentUnderlineProperties.height;
+      thereAreUnderlinedGlyphs                                              = thereAreUnderlinedGlyphs || isGlyphUnderlined;
+
+      Vector<StrikethroughGlyphRun>::ConstIterator currentStrikethroughGlyphRunIt = strikethroughRuns.End();
+      const bool                                   isGlyphStrikethrough           = strikethroughEnabled || IsGlyphStrikethrough(i, strikethroughRuns, currentStrikethroughGlyphRunIt);
+      const StrikethroughStyleProperties           currentStrikethroughProperties = GetCurrentStrikethroughProperties(i, isGlyphStrikethrough, strikethroughRuns, currentStrikethroughGlyphRunIt, viewStrikethroughProperties);
+      float                                        currentStrikethroughHeight     = currentStrikethroughProperties.height;
+      thereAreStrikethroughGlyphs                                                 = thereAreStrikethroughGlyphs || isGlyphStrikethrough;
 
       // No operation for white space
-      if(glyph.width && glyph.height)
+      if(!Dali::EqualsZero(glyph.width) && !Dali::EqualsZero(glyph.height))
       {
-        // Are we still using the same fontId as previous
-        if(isGlyphUnderlined && (glyph.fontId != lastUnderlinedFontId))
+        // Check and update decorative-lines informations
+        if(isGlyphUnderlined || isGlyphStrikethrough)
         {
-          // We need to fetch fresh font underline metrics
-          FontMetrics fontMetrics;
-          mFontClient.GetFontMetrics(glyph.fontId, fontMetrics);
-          currentUnderlinePosition = ceil(fabsf(fontMetrics.underlinePosition));
-          const float descender    = ceil(fabsf(fontMetrics.descender));
-
-          if(fabsf(underlineHeight) < Math::MACHINE_EPSILON_1000)
+          bool isDecorativeLinesFontIdUpdated = false;
+          // Are we still using the same fontId as previous
+          if(glyph.fontId != lastDecorativeLinesFontId)
           {
-            currentUnderlineThickness = fontMetrics.underlineThickness;
+            // We need to fetch fresh font metrics
+            lastDecorativeLinesFontId      = glyph.fontId;
+            isDecorativeLinesFontIdUpdated = true;
+            fontClient.GetFontMetrics(lastDecorativeLinesFontId, lastDecorativeLinesFontMetrics);
 
-            // Ensure underline will be at least a pixel high
-            if(currentUnderlineThickness < ONE)
-            {
-              currentUnderlineThickness = ONE;
-            }
-            else
+            if(isGlyphStrikethrough || isGlyphUnderlined)
             {
-              currentUnderlineThickness = ceil(currentUnderlineThickness);
+              //The currentUnderlinePosition will be used for both Underline and/or Strikethrough
+              currentUnderlinePosition = FetchUnderlinePositionFromFontMetrics(lastDecorativeLinesFontMetrics);
             }
           }
 
-          // Clamp the underline position at the font descender and check for ( as EFL describes it ) a broken font
-          if(currentUnderlinePosition > descender)
+          if(isGlyphUnderlined && (isDecorativeLinesFontIdUpdated || !(currentUnderlineProperties.IsHeightEqualTo(preUnderlineProperties))))
           {
-            currentUnderlinePosition = descender;
-          }
+            //If the Underline Height is changed then we need to recalculate height.
+            if(!(currentUnderlineProperties.IsHeightEqualTo(preUnderlineProperties)))
+            {
+              maxUnderlineHeight = currentUnderlineHeight;
+            }
 
-          if(fabsf(currentUnderlinePosition) < Math::MACHINE_EPSILON_1000)
-          {
-            // Move offset down by one ( EFL behavior )
-            currentUnderlinePosition = ONE;
+            CalcualteUnderlineHeight(lastDecorativeLinesFontMetrics, currentUnderlineHeight, maxUnderlineHeight);
           }
 
-          lastUnderlinedFontId = glyph.fontId;
+          if(isGlyphStrikethrough && (isDecorativeLinesFontIdUpdated || !(currentStrikethroughProperties.IsHeightEqualTo(preStrikethroughProperties))))
+          {
+            //If the Strikethrough Height is changed then we need to recalculate height.
+            if(!(currentStrikethroughProperties.IsHeightEqualTo(preStrikethroughProperties)))
+            {
+              maxStrikethroughHeight = currentStrikethroughHeight;
+            }
 
-        } // underline
+            CalcualteStrikethroughHeight(currentStrikethroughHeight, maxStrikethroughHeight);
+          }
+        } // decorative-lines
 
         AtlasGlyphManager::GlyphStyle style;
         style.isItalic = glyph.isItalicRequired;
@@ -563,7 +647,8 @@ struct AtlasRenderer::Impl
         if(addHyphen)
         {
           GlyphInfo tempInfo = *(glyphsBuffer + i);
-          position.x         = position.x + tempInfo.advance - tempInfo.xBearing + glyph.xBearing;
+          calculatedAdvance  = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + i))), characterSpacing, tempInfo.advance);
+          position.x         = position.x + calculatedAdvance - tempInfo.xBearing + glyph.xBearing;
           position.y += tempInfo.yBearing - glyph.yBearing;
         }
 
@@ -583,6 +668,18 @@ struct AtlasRenderer::Impl
           const ColorIndex colorIndex = useDefaultColor ? 0u : *(colorIndicesBuffer + i);
           const Vector4&   color      = (useDefaultColor || (0u == colorIndex)) ? defaultColor : *(colorsBuffer + colorIndex - 1u);
 
+          //The new underlined chunk. Add new id if they are not consecutive indices (this is for Markup case)
+          // Examples: "Hello <u>World</u> Hello <u>World</u>", "<u>World</u> Hello <u>World</u>", "<u>   World</u> Hello <u>World</u>"
+          if((!isPreUnderlined && isGlyphUnderlined) || (isGlyphUnderlined && (preUnderlineProperties != currentUnderlineProperties)))
+          {
+            underlineChunkId++;
+            mapUnderlineChunkIdWithProperties.insert(std::pair<uint32_t, UnderlineStyleProperties>(underlineChunkId, currentUnderlineProperties));
+          }
+
+          //Keep status of underlined for previous glyph to check consecutive indices
+          isPreUnderlined        = isGlyphUnderlined;
+          preUnderlineProperties = currentUnderlineProperties;
+
           GenerateMesh(glyph,
                        positionPlusOutlineOffset,
                        color,
@@ -590,11 +687,43 @@ struct AtlasRenderer::Impl
                        slot,
                        isGlyphUnderlined,
                        currentUnderlinePosition,
-                       currentUnderlineThickness,
+                       maxUnderlineHeight,
                        meshContainer,
                        newTextCache,
                        extents,
-                       underlineChunkId);
+                       underlineChunkId,
+                       false,
+                       0u);
+
+          if(isGlyphStrikethrough)
+          {
+            //The new strikethrough chunk. Add new id if they are not consecutive indices (this is for Markup case)
+            // Examples: "Hello <s>World</s> Hello <s>World</s>", "<s>World</s> Hello <s>World</s>", "<s>   World</s> Hello <s>World</s>"
+            if((!isPreStrikethrough) || (preStrikethroughProperties != currentStrikethroughProperties))
+            {
+              strikethroughChunkId++;
+              mapStrikethroughChunkIdWithProperties.insert(std::pair<uint32_t, StrikethroughStyleProperties>(strikethroughChunkId, currentStrikethroughProperties));
+            }
+
+            GenerateMesh(glyph,
+                         positionPlusOutlineOffset,
+                         color,
+                         NO_OUTLINE,
+                         slot,
+                         isGlyphStrikethrough,
+                         0.0f,
+                         maxStrikethroughHeight,
+                         meshContainer,
+                         newTextCache,
+                         strikethroughExtents,
+                         0u,
+                         true,
+                         strikethroughChunkId);
+          }
+
+          //Keep status of Strikethrough for previous glyph to check consecutive indices
+          isPreStrikethrough         = isGlyphStrikethrough;
+          preStrikethroughProperties = currentStrikethroughProperties;
 
           lastFontId = glyph.fontId; // Prevents searching for existing blocksizes when string of the same fontId.
         }
@@ -608,21 +737,14 @@ struct AtlasRenderer::Impl
                        slotOutline,
                        false,
                        currentUnderlinePosition,
-                       currentUnderlineThickness,
+                       maxUnderlineHeight,
                        meshContainerOutline,
                        newTextCache,
                        extents,
+                       0u,
+                       false,
                        0u);
         }
-
-        //The new underlined chunk. Add new id if they are not consecutive indices (this is for Markup case)
-        // Examples: "Hello <u>World</u> Hello <u>World</u>", "<u>World</u> Hello <u>World</u>", "<u>   World</u> Hello <u>World</u>"
-        if(isPreUnderlined && (isPreUnderlined != isGlyphUnderlined))
-        {
-          underlineChunkId++;
-        }
-        //Keep status of underlined for previous glyph to check consecutive indices
-        isPreUnderlined = isGlyphUnderlined;
       }
 
       if(addHyphen)
@@ -638,7 +760,13 @@ struct AtlasRenderer::Impl
     if(thereAreUnderlinedGlyphs)
     {
       // Check to see if any of the text needs an underline
-      GenerateUnderlines(meshContainer, extents, underlineColor);
+      GenerateUnderlines(meshContainer, extents, viewUnderlineProperties, mapUnderlineChunkIdWithProperties);
+    }
+
+    if(thereAreStrikethroughGlyphs)
+    {
+      // Check to see if any of the text needs a strikethrough
+      GenerateStrikethrough(meshContainer, strikethroughExtents, viewStrikethroughProperties, mapStrikethroughChunkIdWithProperties);
     }
 
     // For each MeshData object, create a mesh actor and add to the renderable actor
@@ -676,11 +804,14 @@ struct AtlasRenderer::Impl
     Toolkit::AtlasGlyphManager::Metrics metrics = mGlyphManager.GetMetrics();
     DALI_LOG_INFO(gLogFilter, Debug::General, "TextAtlasRenderer::GlyphManager::GlyphCount: %i, AtlasCount: %i, TextureMemoryUse: %iK\n", metrics.mGlyphCount, metrics.mAtlasMetrics.mAtlasCount, metrics.mAtlasMetrics.mTextureMemoryUsed / 1024);
 
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "%s\n", metrics.mVerboseGlyphCounts.c_str());
-
-    for(uint32_t i = 0; i < metrics.mAtlasMetrics.mAtlasCount; ++i)
+    if(gLogFilter->IsEnabledFor(Debug::Verbose))
     {
-      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "   Atlas [%i] %sPixels: %s Size: %ix%i, BlockSize: %ix%i, BlocksUsed: %i/%i\n", i + 1, i > 8 ? "" : " ", metrics.mAtlasMetrics.mAtlasMetrics[i].mPixelFormat == Pixel::L8 ? "L8  " : "BGRA", metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mWidth, metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mHeight, metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mBlockWidth, metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mBlockHeight, metrics.mAtlasMetrics.mAtlasMetrics[i].mBlocksUsed, metrics.mAtlasMetrics.mAtlasMetrics[i].mTotalBlocks);
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "%s\n", metrics.mVerboseGlyphCounts.c_str());
+
+      for(uint32_t i = 0; i < metrics.mAtlasMetrics.mAtlasCount; ++i)
+      {
+        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "   Atlas [%i] %sPixels: %s Size: %ix%i, BlockSize: %ix%i, BlocksUsed: %i/%i\n", i + 1, i > 8 ? "" : " ", metrics.mAtlasMetrics.mAtlasMetrics[i].mPixelFormat == Pixel::L8 ? "L8  " : "BGRA", metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mWidth, metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mHeight, metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mBlockWidth, metrics.mAtlasMetrics.mAtlasMetrics[i].mSize.mBlockHeight, metrics.mAtlasMetrics.mAtlasMetrics[i].mBlocksUsed, metrics.mAtlasMetrics.mAtlasMetrics[i].mTotalBlocks);
+      }
     }
 #endif
   }
@@ -717,7 +848,7 @@ struct AtlasRenderer::Impl
       // The glyph is an emoji and is not a shadow.
       if(!mShaderRgba)
       {
-        mShaderRgba = Shader::New(SHADER_TEXT_ATLAS_SHADER_VERT, SHADER_TEXT_ATLAS_RGBA_SHADER_FRAG);
+        mShaderRgba = Shader::New(SHADER_TEXT_ATLAS_SHADER_VERT, SHADER_TEXT_ATLAS_RGBA_SHADER_FRAG, Shader::Hint::NONE, "TEXT_ATLAS_RGBA");
       }
       shader = mShaderRgba;
     }
@@ -726,7 +857,7 @@ struct AtlasRenderer::Impl
       // The glyph is text or a shadow.
       if(!mShaderL8)
       {
-        mShaderL8 = Shader::New(SHADER_TEXT_ATLAS_SHADER_VERT, SHADER_TEXT_ATLAS_L8_SHADER_FRAG);
+        mShaderL8 = Shader::New(SHADER_TEXT_ATLAS_SHADER_VERT, SHADER_TEXT_ATLAS_L8_SHADER_FRAG, Shader::Hint::NONE, "TEXT_ATLAS_L8");
       }
       shader = mShaderL8;
     }
@@ -775,11 +906,13 @@ struct AtlasRenderer::Impl
                       AtlasManager::Mesh2D&    newMesh,
                       Vector<Extent>&          extents,
                       float                    baseLine,
-                      bool                     underlineGlyph,
+                      bool                     decorationlineGlyph,
                       float                    underlinePosition,
-                      float                    underlineThickness,
+                      float                    lineThickness,
                       AtlasManager::AtlasSlot& slot,
-                      uint32_t                 underlineChunkId)
+                      uint32_t                 underlineChunkId,
+                      float                    strikethroughPosition,
+                      uint32_t                 strikethroughChunkId)
   {
     if(slot.mImageId)
     {
@@ -798,7 +931,7 @@ struct AtlasRenderer::Impl
           // Append the mesh to the existing mesh and adjust any extents
           Toolkit::Internal::AtlasMeshFactory::AppendMesh(mIt->mMesh, newMesh);
 
-          if(underlineGlyph)
+          if(decorationlineGlyph)
           {
             AdjustExtents(extents,
                           meshContainer,
@@ -807,8 +940,10 @@ struct AtlasRenderer::Impl
                           right,
                           baseLine,
                           underlinePosition,
-                          underlineThickness,
-                          underlineChunkId);
+                          lineThickness,
+                          underlineChunkId,
+                          strikethroughPosition,
+                          strikethroughChunkId);
           }
 
           return;
@@ -821,7 +956,7 @@ struct AtlasRenderer::Impl
       meshRecord.mMesh    = newMesh;
       meshContainer.push_back(meshRecord);
 
-      if(underlineGlyph)
+      if(decorationlineGlyph)
       {
         // Adjust extents for this new meshrecord
         AdjustExtents(extents,
@@ -831,8 +966,10 @@ struct AtlasRenderer::Impl
                       right,
                       baseLine,
                       underlinePosition,
-                      underlineThickness,
-                      underlineChunkId);
+                      lineThickness,
+                      underlineChunkId,
+                      strikethroughPosition,
+                      strikethroughChunkId);
       }
     }
   }
@@ -844,8 +981,10 @@ struct AtlasRenderer::Impl
                      float                    right,
                      float                    baseLine,
                      float                    underlinePosition,
-                     float                    underlineThickness,
-                     uint32_t                 underlineChunkId)
+                     float                    lineThickness,
+                     uint32_t                 underlineChunkId,
+                     float                    strikethroughPosition,
+                     uint32_t                 strikethroughChunkId)
   {
     bool foundExtent = false;
     for(Vector<Extent>::Iterator eIt    = extents.Begin(),
@@ -853,7 +992,7 @@ struct AtlasRenderer::Impl
         eIt != eEndIt;
         ++eIt)
     {
-      if(Equals(baseLine, eIt->mBaseLine) && underlineChunkId == eIt->mUnderlineChunkId)
+      if(Equals(baseLine, eIt->mBaseLine) && underlineChunkId == eIt->mUnderlineChunkId && strikethroughChunkId == eIt->mStrikethroughChunkId)
       {
         foundExtent = true;
         if(left < eIt->mLeft)
@@ -869,22 +1008,24 @@ struct AtlasRenderer::Impl
         {
           eIt->mUnderlinePosition = underlinePosition;
         }
-        if(underlineThickness > eIt->mUnderlineThickness)
+        if(lineThickness > eIt->mLineThickness)
         {
-          eIt->mUnderlineThickness = underlineThickness;
+          eIt->mLineThickness = lineThickness;
         }
       }
     }
     if(!foundExtent)
     {
       Extent extent;
-      extent.mLeft               = left;
-      extent.mRight              = right;
-      extent.mBaseLine           = baseLine;
-      extent.mUnderlinePosition  = underlinePosition;
-      extent.mUnderlineThickness = underlineThickness;
-      extent.mMeshRecordIndex    = index;
-      extent.mUnderlineChunkId   = underlineChunkId;
+      extent.mLeft                  = left;
+      extent.mRight                 = right;
+      extent.mBaseLine              = baseLine;
+      extent.mUnderlinePosition     = underlinePosition;
+      extent.mMeshRecordIndex       = index;
+      extent.mUnderlineChunkId      = underlineChunkId;
+      extent.mLineThickness         = lineThickness;
+      extent.mStrikethroughPosition = strikethroughPosition;
+      extent.mStrikethroughChunkId  = strikethroughChunkId;
       extents.PushBack(extent);
     }
   }
@@ -927,12 +1068,14 @@ struct AtlasRenderer::Impl
     }
   }
 
-  void GenerateUnderlines(std::vector<MeshRecord>& meshRecords,
-                          Vector<Extent>&          extents,
-                          const Vector4&           underlineColor)
+  void GenerateUnderlines(std::vector<MeshRecord>&                            meshRecords,
+                          Vector<Extent>&                                     extents,
+                          const UnderlineStyleProperties&                     viewUnderlineProperties,
+                          const std::map<uint32_t, UnderlineStyleProperties>& mapUnderlineChunkIdWithProperties)
   {
     AtlasManager::Mesh2D newMesh;
     unsigned short       faceIndex = 0;
+
     for(Vector<Extent>::ConstIterator eIt    = extents.Begin(),
                                       eEndIt = extents.End();
         eIt != eEndIt;
@@ -942,38 +1085,226 @@ struct AtlasRenderer::Impl
       uint32_t               index = eIt->mMeshRecordIndex;
       Vector2                uv    = mGlyphManager.GetAtlasSize(meshRecords[index].mAtlasId);
 
+      auto pairUnderlineChunkIdWithProperties = mapUnderlineChunkIdWithProperties.find(eIt->mUnderlineChunkId);
+
+      const UnderlineStyleProperties underlineProperties = (pairUnderlineChunkIdWithProperties == mapUnderlineChunkIdWithProperties.end())
+                                                             ? viewUnderlineProperties
+                                                             : pairUnderlineChunkIdWithProperties->second;
+
+      const Vector4&               underlineColor       = underlineProperties.colorDefined ? underlineProperties.color : viewUnderlineProperties.color;
+      const Text::Underline::Type& underlineType        = underlineProperties.typeDefined ? underlineProperties.type : viewUnderlineProperties.type;
+      const float&                 dashedUnderlineGap   = underlineProperties.dashGapDefined ? underlineProperties.dashGap : viewUnderlineProperties.dashGap;
+      const float&                 dashedUnderlineWidth = underlineProperties.dashWidthDefined ? underlineProperties.dashWidth : viewUnderlineProperties.dashWidth;
+
+      // Make sure we don't hit texture edge for single pixel texture ( filled pixel is in top left of every atlas )
+      float u           = HALF / uv.x;
+      float v           = HALF / uv.y;
+      float thickness   = eIt->mLineThickness;
+      float ShiftLineBy = (underlineType == Text::Underline::Type::DOUBLE) ? (thickness * ONE_AND_A_HALF) : (thickness * HALF);
+      float baseLine    = eIt->mBaseLine + eIt->mUnderlinePosition - ShiftLineBy;
+      float tlx         = eIt->mLeft;
+      float brx         = eIt->mRight;
+
+      if(underlineType == Text::Underline::Type::DASHED)
+      {
+        float dashTlx = tlx;
+        float dashBrx = tlx;
+
+        while((dashTlx >= tlx) && (dashTlx < brx) && ((dashTlx + dashedUnderlineWidth) <= brx))
+        {
+          dashBrx = dashTlx + dashedUnderlineWidth;
+
+          //The top left edge of the underline
+          vert.mPosition.x  = dashTlx;
+          vert.mPosition.y  = baseLine;
+          vert.mTexCoords.x = ZERO;
+          vert.mTexCoords.y = ZERO;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          //The top right edge of the underline
+          vert.mPosition.x  = dashBrx;
+          vert.mPosition.y  = baseLine;
+          vert.mTexCoords.x = u;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          //The bottom left edge of the underline
+          vert.mPosition.x  = dashTlx;
+          vert.mPosition.y  = baseLine + thickness;
+          vert.mTexCoords.x = ZERO;
+          vert.mTexCoords.y = v;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          //The bottom right edge of the underline
+          vert.mPosition.x  = dashBrx;
+          vert.mPosition.y  = baseLine + thickness;
+          vert.mTexCoords.x = u;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          dashTlx = dashBrx + dashedUnderlineGap; // The next dash will start at the right of the current dash plus the gap
+
+          // Six indices in counter clockwise winding
+          newMesh.mIndices.PushBack(faceIndex + 1u);
+          newMesh.mIndices.PushBack(faceIndex);
+          newMesh.mIndices.PushBack(faceIndex + 2u);
+          newMesh.mIndices.PushBack(faceIndex + 2u);
+          newMesh.mIndices.PushBack(faceIndex + 3u);
+          newMesh.mIndices.PushBack(faceIndex + 1u);
+
+          faceIndex += 4;
+
+          Toolkit::Internal::AtlasMeshFactory::AppendMesh(meshRecords[index].mMesh, newMesh);
+        }
+      }
+      else
+      {
+        // It's either SOLID or DOUBLE so we need to generate the first solid underline anyway.
+        vert.mPosition.x  = tlx;
+        vert.mPosition.y  = baseLine;
+        vert.mTexCoords.x = ZERO;
+        vert.mTexCoords.y = ZERO;
+        vert.mColor       = underlineColor;
+        newMesh.mVertices.PushBack(vert);
+
+        vert.mPosition.x  = brx;
+        vert.mPosition.y  = baseLine;
+        vert.mTexCoords.x = u;
+        vert.mColor       = underlineColor;
+        newMesh.mVertices.PushBack(vert);
+
+        vert.mPosition.x  = tlx;
+        vert.mPosition.y  = baseLine + thickness;
+        vert.mTexCoords.x = ZERO;
+        vert.mTexCoords.y = v;
+        vert.mColor       = underlineColor;
+        newMesh.mVertices.PushBack(vert);
+
+        vert.mPosition.x  = brx;
+        vert.mPosition.y  = baseLine + thickness;
+        vert.mTexCoords.x = u;
+        vert.mColor       = underlineColor;
+        newMesh.mVertices.PushBack(vert);
+
+        // Six indices in counter clockwise winding
+        newMesh.mIndices.PushBack(faceIndex + 1u);
+        newMesh.mIndices.PushBack(faceIndex);
+        newMesh.mIndices.PushBack(faceIndex + 2u);
+        newMesh.mIndices.PushBack(faceIndex + 2u);
+        newMesh.mIndices.PushBack(faceIndex + 3u);
+        newMesh.mIndices.PushBack(faceIndex + 1u);
+        faceIndex += 4;
+
+        Toolkit::Internal::AtlasMeshFactory::AppendMesh(meshRecords[index].mMesh, newMesh);
+
+        if(underlineType == Text::Underline::Type::DOUBLE)
+        {
+          baseLine += 2 * thickness;
+
+          //The top left edge of the underline
+          vert.mPosition.x  = tlx;
+          vert.mPosition.y  = baseLine; // Vertical start of the second underline
+          vert.mTexCoords.x = ZERO;
+          vert.mTexCoords.y = ZERO;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          //The top right edge of the underline
+          vert.mPosition.x  = brx;
+          vert.mPosition.y  = baseLine;
+          vert.mTexCoords.x = u;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          //The bottom left edge of the underline
+          vert.mPosition.x  = tlx;
+          vert.mPosition.y  = baseLine + thickness; // Vertical End of the second underline
+          vert.mTexCoords.x = ZERO;
+          vert.mTexCoords.y = v;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          //The bottom right edge of the underline
+          vert.mPosition.x  = brx;
+          vert.mPosition.y  = baseLine + thickness;
+          vert.mTexCoords.x = u;
+          vert.mColor       = underlineColor;
+          newMesh.mVertices.PushBack(vert);
+
+          // Six indices in counter clockwise winding
+          newMesh.mIndices.PushBack(faceIndex + 1u);
+          newMesh.mIndices.PushBack(faceIndex);
+          newMesh.mIndices.PushBack(faceIndex + 2u);
+          newMesh.mIndices.PushBack(faceIndex + 2u);
+          newMesh.mIndices.PushBack(faceIndex + 3u);
+          newMesh.mIndices.PushBack(faceIndex + 1u);
+
+          faceIndex += 4;
+
+          Toolkit::Internal::AtlasMeshFactory::AppendMesh(meshRecords[index].mMesh, newMesh);
+        }
+      }
+    }
+  }
+
+  void GenerateStrikethrough(std::vector<MeshRecord>&                                meshRecords,
+                             Vector<Extent>&                                         extents,
+                             const StrikethroughStyleProperties&                     viewStrikethroughProperties,
+                             const std::map<uint32_t, StrikethroughStyleProperties>& mapStrikethroughChunkIdWithProperties)
+  {
+    AtlasManager::Mesh2D newMesh;
+    unsigned short       faceIndex = 0;
+    for(Vector<Extent>::ConstIterator eIt    = extents.Begin(),
+                                      eEndIt = extents.End();
+        eIt != eEndIt;
+        ++eIt)
+    {
+      AtlasManager::Vertex2D vert;
+      uint32_t               index = eIt->mMeshRecordIndex;
+      Vector2                uv    = mGlyphManager.GetAtlasSize(meshRecords[index].mAtlasId);
+
+      auto pairStrikethroughChunkIdWithProperties = mapStrikethroughChunkIdWithProperties.find(eIt->mStrikethroughChunkId);
+
+      const StrikethroughStyleProperties strikethroughProperties = (pairStrikethroughChunkIdWithProperties == mapStrikethroughChunkIdWithProperties.end())
+                                                                     ? viewStrikethroughProperties
+                                                                     : pairStrikethroughChunkIdWithProperties->second;
+
+      const Vector4& strikethroughColor = strikethroughProperties.colorDefined ? strikethroughProperties.color : viewStrikethroughProperties.color;
+
       // Make sure we don't hit texture edge for single pixel texture ( filled pixel is in top left of every atlas )
-      float u         = HALF / uv.x;
-      float v         = HALF / uv.y;
-      float thickness = eIt->mUnderlineThickness;
-      float baseLine  = eIt->mBaseLine + eIt->mUnderlinePosition - (thickness * HALF);
-      float tlx       = eIt->mLeft;
-      float brx       = eIt->mRight;
+      float u                     = HALF / uv.x;
+      float v                     = HALF / uv.y;
+      float thickness             = eIt->mLineThickness;
+      float tlx                   = eIt->mLeft;
+      float brx                   = eIt->mRight;
+      float strikethroughPosition = eIt->mStrikethroughPosition;
 
       vert.mPosition.x  = tlx;
-      vert.mPosition.y  = baseLine;
+      vert.mPosition.y  = strikethroughPosition;
       vert.mTexCoords.x = ZERO;
       vert.mTexCoords.y = ZERO;
-      vert.mColor       = underlineColor;
+      vert.mColor       = strikethroughColor;
       newMesh.mVertices.PushBack(vert);
 
       vert.mPosition.x  = brx;
-      vert.mPosition.y  = baseLine;
+      vert.mPosition.y  = strikethroughPosition;
       vert.mTexCoords.x = u;
-      vert.mColor       = underlineColor;
+      vert.mColor       = strikethroughColor;
       newMesh.mVertices.PushBack(vert);
 
       vert.mPosition.x  = tlx;
-      vert.mPosition.y  = baseLine + thickness;
+      vert.mPosition.y  = strikethroughPosition + thickness;
       vert.mTexCoords.x = ZERO;
       vert.mTexCoords.y = v;
-      vert.mColor       = underlineColor;
+      vert.mColor       = strikethroughColor;
       newMesh.mVertices.PushBack(vert);
 
       vert.mPosition.x  = brx;
-      vert.mPosition.y  = baseLine + thickness;
+      vert.mPosition.y  = strikethroughPosition + thickness;
       vert.mTexCoords.x = u;
-      vert.mColor       = underlineColor;
+      vert.mColor       = strikethroughColor;
       newMesh.mVertices.PushBack(vert);
 
       // Six indices in counter clockwise winding
diff --git a/dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.cpp b/dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.cpp
new file mode 100644
index 0000000..a65a4f2
--- /dev/null
+++ b/dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+float GetGlyphCharacterSpacing(const GlyphIndex&                       index,
+                               const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns,
+                               const float                             modelCharacterSpacing)
+{
+  float characterSpacing = modelCharacterSpacing;
+  for(Vector<CharacterSpacingGlyphRun>::ConstIterator it    = characterSpacingGlyphRuns.Begin(),
+                                                      endIt = characterSpacingGlyphRuns.End();
+      it != endIt;
+      ++it)
+  {
+    const CharacterSpacingGlyphRun& run = *it;
+
+    if((run.glyphRun.glyphIndex <= index) && (index < run.glyphRun.glyphIndex + run.glyphRun.numberOfGlyphs))
+    {
+      // Retrieve the latest run to handle the nested case.
+      //TODO: Using reverse Iterator will improve performance in this loop
+      characterSpacing = run.value;
+    }
+  }
+
+  return characterSpacing;
+}
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h b/dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h
new file mode 100644
index 0000000..a15aa5e
--- /dev/null
+++ b/dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h
@@ -0,0 +1,53 @@
+#ifndef DALI_TOOLKIT_TEXT_RENDERING_STYLES_CHARACTER_SPACING_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_RENDERING_STYLES_CHARACTER_SPACING_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/font-metrics.h>
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-spacing-glyph-run.h>
+#include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Check the glyph at index is had character-spacing or not then return its value. Otherwise return the model character-spacing height.
+ *
+ * @param[in] index the index of glyph.
+ * @param[in] characterSpacingGlyphRuns the character-spacing glyph runs.
+ * @param[in] modelCharacterSpacing the model character-spacing value.
+ *
+ * @return the determined character-spacing value
+ */
+float GetGlyphCharacterSpacing(const GlyphIndex&                       index,
+                               const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns,
+                               const float                             modelCharacterSpacing);
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_RENDERING_STYLES_CHARACTER_SPACING_HELPER_FUNCTIONS_H
diff --git a/dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.cpp b/dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.cpp
new file mode 100644
index 0000000..76b8ce3
--- /dev/null
+++ b/dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+bool IsGlyphStrikethrough(GlyphIndex                                    index,
+                          const Vector<StrikethroughGlyphRun>&          strikethroughRuns,
+                          Vector<StrikethroughGlyphRun>::ConstIterator& currentStrikethroughGlyphRunIt)
+{
+  for(Vector<StrikethroughGlyphRun>::ConstIterator it    = strikethroughRuns.Begin(),
+                                                   endIt = strikethroughRuns.End();
+      it != endIt;
+      ++it)
+  {
+    const StrikethroughGlyphRun& run = *it;
+
+    if((run.glyphRun.glyphIndex <= index) && (index < run.glyphRun.glyphIndex + run.glyphRun.numberOfGlyphs))
+    {
+      currentStrikethroughGlyphRunIt = it;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+StrikethroughStyleProperties GetCurrentStrikethroughProperties(GlyphIndex                                    index,
+                                                               const bool&                                   isGlyphStrikethrough,
+                                                               const Vector<StrikethroughGlyphRun>&          strikethroughRuns,
+                                                               Vector<StrikethroughGlyphRun>::ConstIterator& currentStrikethroughGlyphRunIt,
+                                                               const StrikethroughStyleProperties&           commonStrikethroughProperties)
+{
+  StrikethroughStyleProperties currentStrikethroughStyleProperties = commonStrikethroughProperties;
+
+  if(isGlyphStrikethrough && (currentStrikethroughGlyphRunIt != strikethroughRuns.End()))
+  {
+    // Retrieve the latest run to handle the nested case.
+    for(Vector<StrikethroughGlyphRun>::ConstIterator it    = currentStrikethroughGlyphRunIt + 1,
+                                                     endIt = strikethroughRuns.End();
+        it != endIt;
+        ++it)
+    {
+      const StrikethroughGlyphRun& run = *it;
+
+      if((run.glyphRun.glyphIndex <= index) && (index < (run.glyphRun.glyphIndex + run.glyphRun.numberOfGlyphs)))
+      {
+        currentStrikethroughGlyphRunIt = it;
+      }
+    }
+
+    currentStrikethroughStyleProperties.OverrideByDefinedProperties(currentStrikethroughGlyphRunIt->properties);
+  }
+
+  return currentStrikethroughStyleProperties;
+}
+
+/// Helper method to fetch the strikethrough metrics for the specified font glyph
+void CalcualteStrikethroughHeight(float& currentStrikethroughHeight, float& maxStrikethroughHeight)
+{
+  //Height of strikethrough represents the thickness of line.
+
+  // Ensure strikethrough will be at least a pixel high
+  if(currentStrikethroughHeight < 1.0f)
+  {
+    currentStrikethroughHeight = 1.0f;
+  }
+  else
+  {
+    currentStrikethroughHeight = ceil(currentStrikethroughHeight);
+  }
+
+  // The strikethrough height should be the max strikethrough height of all glyphs of the line.
+  if(currentStrikethroughHeight > maxStrikethroughHeight)
+  {
+    maxStrikethroughHeight = currentStrikethroughHeight;
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.h b/dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.h
new file mode 100644
index 0000000..d9c86e4
--- /dev/null
+++ b/dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.h
@@ -0,0 +1,80 @@
+#ifndef DALI_TOOLKIT_TEXT_RENDERING_STYLES_STRIKETHROUGH_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_RENDERING_STYLES_STRIKETHROUGH_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/font-metrics.h>
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/strikethrough-glyph-run.h>
+#include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Whether the glyph at index is strikethrough or not. If true then return iterator to the run containes index.
+ *
+ * @param[in] index the index of glyph.
+ * @param[in] strikethroughRuns the strikethrough runs.
+ * @param[out] currentStrikethroughGlyphRunIt the iterator of current strikethrough glyph run.
+ *
+ * @return true if glyph at index is strikethrough
+ */
+bool IsGlyphStrikethrough(GlyphIndex                                    index,
+                          const Vector<StrikethroughGlyphRun>&          strikethroughRuns,
+                          Vector<StrikethroughGlyphRun>::ConstIterator& currentStrikethroughGlyphRunIt);
+
+/**
+ * @brief Check the current strikethrough glyph run iterator if not empty and isGlyphStrikethrough is true then return its StrikethroughProperties. Otherwise return the common strikethrough properties.
+ *
+ * @param[in] index the index of glyph.
+ * @param[in] isGlyphStrikethrough whether the glyph is strikethrough.
+ * @param[in] strikethroughRuns the strikethrough runs.
+ * @param[in] currentStrikethroughGlyphRunIt the iterator of current strikethrough glyph run.
+ * @param[in] commonStrikethroughProperties the common strikethrough properties.
+ *
+ * @return the determined strikethrough properties
+ */
+StrikethroughStyleProperties GetCurrentStrikethroughProperties(GlyphIndex                                    index,
+                                                               const bool&                                   isGlyphStrikethrough,
+                                                               const Vector<StrikethroughGlyphRun>&          strikethroughRuns,
+                                                               Vector<StrikethroughGlyphRun>::ConstIterator& currentStrikethroughGlyphRunIt,
+                                                               const StrikethroughStyleProperties&           commonStrikethroughProperties);
+
+/**
+ * @brief Calculate the current strikethrough height and update maximum strikethrough height
+ *
+ * @param[inout] currentStrikethroughHeight the current strikethrough height.
+ * @param[inout] maxStrikethroughHeight the maximum strikethrough height.
+ *
+ */
+void CalcualteStrikethroughHeight(float& currentStrikethroughHeight, float& maxStrikethroughHeight);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_RENDERING_STYLES_STRIKETHROUGH_HELPER_FUNCTIONS_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/rendering/styles/underline-helper-functions.cpp b/dali-toolkit/internal/text/rendering/styles/underline-helper-functions.cpp
new file mode 100644
index 0000000..873ef86
--- /dev/null
+++ b/dali-toolkit/internal/text/rendering/styles/underline-helper-functions.cpp
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/rendering/styles/underline-helper-functions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+bool IsGlyphUnderlined(GlyphIndex                                 index,
+                       const Vector<UnderlinedGlyphRun>&          underlineRuns,
+                       Vector<UnderlinedGlyphRun>::ConstIterator& currentUnderlinedGlyphRunIt)
+{
+  for(Vector<UnderlinedGlyphRun>::ConstIterator it    = underlineRuns.Begin(),
+                                                endIt = underlineRuns.End();
+      it != endIt;
+      ++it)
+  {
+    const UnderlinedGlyphRun& run = *it;
+
+    if((run.glyphRun.glyphIndex <= index) && (index < run.glyphRun.glyphIndex + run.glyphRun.numberOfGlyphs))
+    {
+      currentUnderlinedGlyphRunIt = it;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+UnderlineStyleProperties GetCurrentUnderlineProperties(GlyphIndex                                 index,
+                                                       const bool&                                isGlyphUnderlined,
+                                                       const Vector<UnderlinedGlyphRun>&          underlineRuns,
+                                                       Vector<UnderlinedGlyphRun>::ConstIterator& currentUnderlinedGlyphRunIt,
+                                                       const UnderlineStyleProperties&            commonUnderlineProperties)
+{
+  UnderlineStyleProperties currentUnderlineStyleProperties = commonUnderlineProperties;
+
+  if(isGlyphUnderlined && (currentUnderlinedGlyphRunIt != underlineRuns.End()))
+  {
+    // Retrieve the latest run to handle the nested case.
+    for(Vector<UnderlinedGlyphRun>::ConstIterator it    = currentUnderlinedGlyphRunIt + 1,
+                                                  endIt = underlineRuns.End();
+        it != endIt;
+        ++it)
+    {
+      const UnderlinedGlyphRun& run = *it;
+
+      if((run.glyphRun.glyphIndex <= index) && (index < (run.glyphRun.glyphIndex + run.glyphRun.numberOfGlyphs)))
+      {
+        currentUnderlinedGlyphRunIt = it;
+      }
+    }
+
+    currentUnderlineStyleProperties.OverrideByDefinedProperties(currentUnderlinedGlyphRunIt->properties);
+  }
+
+  return currentUnderlineStyleProperties;
+}
+
+float FetchUnderlinePositionFromFontMetrics(const FontMetrics& fontMetrics)
+{
+  //Helper method to fetch the underline metrics for the specified font glyph
+  const float descender         = ceil(fabsf(fontMetrics.descender));
+  float       underlinePosition = ceil(fabsf(fontMetrics.underlinePosition));
+
+  // Clamp the underline position at the font descender and check for ( as EFL describes it ) a broken font
+  if(underlinePosition > descender)
+  {
+    underlinePosition = descender;
+  }
+
+  if(fabsf(underlinePosition) < Math::MACHINE_EPSILON_1000)
+  {
+    // Move offset down by one ( EFL behavior )
+    underlinePosition = 1.0f;
+  }
+
+  return underlinePosition;
+}
+
+void CalcualteUnderlineHeight(const FontMetrics& fontMetrics, float& currentUnderlineHeight, float& maxUnderlineHeight)
+{
+  //Helper method to fetch the underline metrics for the specified font glyph
+  //Height of underline represents the thickness of line.
+  if(fabsf(currentUnderlineHeight) < Math::MACHINE_EPSILON_1000)
+  {
+    currentUnderlineHeight = fontMetrics.underlineThickness;
+
+    // Ensure underline will be at least a pixel high
+    if(currentUnderlineHeight < 1.0f)
+    {
+      currentUnderlineHeight = 1.0f;
+    }
+    else
+    {
+      currentUnderlineHeight = ceil(currentUnderlineHeight);
+    }
+  }
+
+  // The underline height should be the max underline height of all glyphs of the line.
+  if(currentUnderlineHeight > maxUnderlineHeight)
+  {
+    maxUnderlineHeight = currentUnderlineHeight;
+  }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/rendering/styles/underline-helper-functions.h b/dali-toolkit/internal/text/rendering/styles/underline-helper-functions.h
new file mode 100644
index 0000000..38471c8
--- /dev/null
+++ b/dali-toolkit/internal/text/rendering/styles/underline-helper-functions.h
@@ -0,0 +1,90 @@
+#ifndef DALI_TOOLKIT_TEXT_RENDERING_STYLES_UNDERLINE_HELPER_FUNCTIONS_H
+#define DALI_TOOLKIT_TEXT_RENDERING_STYLES_UNDERLINE_HELPER_FUNCTIONS_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/text-abstraction/font-metrics.h>
+#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/underlined-glyph-run.h>
+#include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Whether the glyph at index is underlined or not. If true then return iterator to the run containes index.
+ *
+ * @param[in] index the index of glyph.
+ * @param[in] underlineRuns the underline runs.
+ * @param[out] currentUnderlinedGlyphRunIt the iterator of current underlined glyph run.
+ *
+ * @return true if glyph at index is underlined
+ */
+bool IsGlyphUnderlined(GlyphIndex                                 index,
+                       const Vector<UnderlinedGlyphRun>&          underlineRuns,
+                       Vector<UnderlinedGlyphRun>::ConstIterator& currentUnderlinedGlyphRunIt);
+
+/**
+ * @brief Check the current underlined glyph run iterator if not empty and isGlyphUnderlined is true then return its UnderlineProperties. Otherwise return the common underline properties.
+ *
+ * @param[in] index the index of glyph.
+ * @param[in] isGlyphUnderlined whether the glyph is underlined.
+ * @param[in] underlineRuns the underline runs.
+ * @param[in] currentUnderlinedGlyphRunIt the iterator of current underlined glyph run.
+ * @param[in] commonUnderlineProperties the common underline properties.
+ *
+ * @return the determined underline properties
+ */
+UnderlineStyleProperties GetCurrentUnderlineProperties(GlyphIndex                                 index,
+                                                       const bool&                                isGlyphUnderlined,
+                                                       const Vector<UnderlinedGlyphRun>&          underlineRuns,
+                                                       Vector<UnderlinedGlyphRun>::ConstIterator& currentUnderlinedGlyphRunIt,
+                                                       const UnderlineStyleProperties&            commonUnderlineProperties);
+
+/**
+ * @brief Fetch and calculate underline Position using font-metrics
+ *
+ * @param[in] fontMetrics the font metrics of glyph.
+ *
+ * @return the underline position
+ */
+float FetchUnderlinePositionFromFontMetrics(const FontMetrics& fontMetrics);
+
+/**
+ * @brief Calculate the current underline height using font-metrics and update maximum underline height
+ *
+ * @param[in] fontMetrics the font metrics of glyph.
+ * @param[inout] currentUnderlineHeight the current underline height.
+ * @param[inout] maxUnderlineHeight the maximum underline height.
+ *
+ */
+void CalcualteUnderlineHeight(const FontMetrics& fontMetrics, float& currentUnderlineHeight, float& maxUnderlineHeight);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_RENDERING_STYLES_UNDERLINE_HELPER_FUNCTIONS_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/rendering/text-backend.cpp b/dali-toolkit/internal/text/rendering/text-backend.cpp
index 1802b7b..e236c4c 100644
--- a/dali-toolkit/internal/text/rendering/text-backend.cpp
+++ b/dali-toolkit/internal/text/rendering/text-backend.cpp
@@ -45,16 +45,13 @@ Backend::~Backend()
 {
 }
 
-Backend::Backend(const Backend& handle)
-: BaseHandle(handle)
-{
-}
+Backend::Backend(const Backend& handle) = default;
 
-Backend& Backend::operator=(const Backend& handle)
-{
-  BaseHandle::operator=(handle);
-  return *this;
-}
+Backend& Backend::operator=(const Backend& handle) = default;
+
+Backend::Backend(Backend&& handle) = default;
+
+Backend& Backend::operator=(Backend&& handle) = default;
 
 Backend::Backend(Internal::Backend* internal)
 : BaseHandle(internal)
diff --git a/dali-toolkit/internal/text/rendering/text-backend.h b/dali-toolkit/internal/text/rendering/text-backend.h
index 926ecd3..733e688 100644
--- a/dali-toolkit/internal/text/rendering/text-backend.h
+++ b/dali-toolkit/internal/text/rendering/text-backend.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_BACKEND_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,6 +83,21 @@ public:
    */
   Backend& operator=(const Backend& handle);
 
+  /**
+   * @brief This move constructor is required for (smart) pointer semantics.
+   *
+   * @param[in] handle A reference to the moved handle.
+   */
+  Backend(Backend&& handle);
+
+  /**
+   * @brief This move assignment operator is required for (smart) pointer semantics.
+   *
+   * @param [in] handle  A reference to the moved handle.
+   * @return A reference to this.
+   */
+  Backend& operator=(Backend&& handle);
+
 public: // Not intended for application developers
   /**
    * @brief This constructor is used by Backend::Get().
diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
index cea2a19..1c31199 100644
--- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp
+++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,18 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/integration-api/trace.h>
 #include <dali/public-api/common/constants.h>
+#include <dali/public-api/math/math-utils.h>
 #include <memory.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/line-helper-functions.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
+#include <dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.h>
+#include <dali-toolkit/internal/text/rendering/styles/underline-helper-functions.h>
 #include <dali-toolkit/internal/text/rendering/view-model.h>
 
 namespace Dali
@@ -35,34 +42,113 @@ namespace Text
 {
 namespace
 {
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_TEXT_PERFORMANCE_MARKER, false);
+
+const float HALF(0.5f);
+const float ONE_AND_A_HALF(1.5f);
+
+/**
+ * @brief Fast multiply & divide by 255. It wiil be useful when we applying alpha value in color
+ *
+ * @param x The value between [0..255]
+ * @param y The value between [0..255]
+ * @return (x*y)/255
+ */
+inline uint8_t MultiplyAndNormalizeColor(const uint8_t x, const uint8_t y) noexcept
+{
+  const uint32_t xy = static_cast<const uint32_t>(x) * y;
+  return ((xy << 15) + (xy << 7) + xy) >> 23;
+}
+
+/// Helper macro define for glyph typesetter. It will reduce some duplicated code line.
+// clang-format off
+/**
+ * @brief Prepare decode glyph bitmap data. It must be call END_GLYPH_BITMAP end of same scope.
+ */
+#define BEGIN_GLYPH_BITMAP(data)                                                                                                                \
+{                                                                                                                                               \
+  uint32_t   glyphOffet               = 0u;                                                                                                     \
+  const bool useLocalScanline         = data.glyphBitmap.compressionType != TextAbstraction::GlyphBufferData::CompressionType::NO_COMPRESSION;  \
+  uint8_t* __restrict__ glyphScanline = useLocalScanline ? (uint8_t*)malloc(data.glyphBitmap.width * glyphPixelSize) : data.glyphBitmap.buffer; \
+  DALI_ASSERT_ALWAYS(glyphScanline && "Glyph scanline for buffer is null!");
+
+/**
+ * @brief Macro to skip useless line fast.
+ */
+#define SKIP_GLYPH_SCANLINE(skipLine)                                                                  \
+if(useLocalScanline)                                                                                   \
+{                                                                                                      \
+  for(int32_t lineIndex = 0; lineIndex < skipLine; ++lineIndex)                                        \
+  {                                                                                                    \
+    TextAbstraction::GlyphBufferData::DecompressScanline(data.glyphBitmap, glyphScanline, glyphOffet); \
+  }                                                                                                    \
+}                                                                                                      \
+else                                                                                                   \
+{                                                                                                      \
+  glyphScanline += skipLine * static_cast<int32_t>(data.glyphBitmap.width * glyphPixelSize);           \
+}
+
+/**
+ * @brief Prepare scanline of glyph bitmap data per each lines. It must be call END_GLYPH_SCANLINE_DECODE end of same scope.
+ */
+#define BEGIN_GLYPH_SCANLINE_DECODE(data)                                                              \
+{                                                                                                      \
+  if(useLocalScanline)                                                                                 \
+  {                                                                                                    \
+    TextAbstraction::GlyphBufferData::DecompressScanline(data.glyphBitmap, glyphScanline, glyphOffet); \
+  }
+
+/**
+ * @brief Finalize scanline of glyph bitmap data per each lines.
+ */
+#define END_GLYPH_SCANLINE_DECODE(data)                       \
+  if(!useLocalScanline)                                       \
+  {                                                           \
+    glyphScanline += data.glyphBitmap.width * glyphPixelSize; \
+  }                                                           \
+} // For ensure that we call BEGIN_GLYPH_SCANLINE_DECODE before
+
+/**
+ * @brief Finalize decode glyph bitmap data.
+ */
+#define END_GLYPH_BITMAP() \
+  if(useLocalScanline)     \
+  {                        \
+    free(glyphScanline);   \
+  }                        \
+} // For ensure that we call BEGIN_GLYPH_BITMAP before
+
+// clang-format on
+/// Helper macro define end.
+
 /**
  * @brief Data struct used to set the buffer of the glyph's bitmap into the final bitmap's buffer.
  */
 struct GlyphData
 {
-  Devel::PixelBuffer                           bitmapBuffer;     ///< The buffer of the whole bitmap. The format is RGBA8888.
-  Vector2*                                     position;         ///< The position of the glyph.
-  TextAbstraction::FontClient::GlyphBufferData glyphBitmap;      ///< The glyph's bitmap.
-  unsigned int                                 width;            ///< The bitmap's width.
-  unsigned int                                 height;           ///< The bitmap's height.
-  int                                          horizontalOffset; ///< The horizontal offset to be added to the 'x' glyph's position.
-  int                                          verticalOffset;   ///< The vertical offset to be added to the 'y' glyph's position.
+  Devel::PixelBuffer               bitmapBuffer;     ///< The buffer of the whole bitmap. The format is RGBA8888.
+  Vector2*                         position;         ///< The position of the glyph.
+  TextAbstraction::GlyphBufferData glyphBitmap;      ///< The glyph's bitmap.
+  uint32_t                         width;            ///< The bitmap's width.
+  uint32_t                         height;           ///< The bitmap's height.
+  int32_t                          horizontalOffset; ///< The horizontal offset to be added to the 'x' glyph's position.
+  int32_t                          verticalOffset;   ///< The vertical offset to be added to the 'y' glyph's position.
 };
 
 /**
  * @brief Sets the glyph's buffer into the bitmap's buffer.
  *
- * @param[in] data Struct which contains the glyph's data and the bitmap's data.
+ * @param[in, out] data Struct which contains the glyph's data and the bitmap's data.
  * @param[in] position The position of the glyph.
  * @param[in] color The color of the glyph.
  * @param[in] style The style of the text.
  * @param[in] pixelFormat The format of the pixel in the image that the text is rendered as (i.e. either Pixel::BGRA8888 or Pixel::L8).
  */
-void TypesetGlyph(GlyphData&           data,
-                  const Vector2* const position,
-                  const Vector4* const color,
-                  Typesetter::Style    style,
-                  Pixel::Format        pixelFormat)
+void TypesetGlyph(GlyphData& __restrict__ data,
+                  const Vector2* const __restrict__ position,
+                  const Vector4* const __restrict__ color,
+                  const Typesetter::Style style,
+                  const Pixel::Format     pixelFormat)
 {
   if((0u == data.glyphBitmap.width) || (0u == data.glyphBitmap.height))
   {
@@ -70,112 +156,135 @@ void TypesetGlyph(GlyphData&           data,
     return;
   }
 
-  const int widthMinusOne  = static_cast<int>(data.width - 1u);
-  const int heightMinusOne = static_cast<int>(data.height - 1u);
+  // Initial vertical / horizontal offset.
+  const int32_t yOffset = data.verticalOffset + position->y;
+  const int32_t xOffset = data.horizontalOffset + position->x;
+
+  // Whether the given glyph is a color one.
+  const bool     isColorGlyph    = data.glyphBitmap.isColorEmoji || data.glyphBitmap.isColorBitmap;
+  const uint32_t glyphPixelSize  = Pixel::GetBytesPerPixel(data.glyphBitmap.format);
+  const uint32_t glyphAlphaIndex = (glyphPixelSize > 0u) ? glyphPixelSize - 1u : 0u;
+
+  // Determinate iterator range.
+  const int32_t lineIndexRangeMin = std::max(0, -yOffset);
+  const int32_t lineIndexRangeMax = std::min(static_cast<int32_t>(data.glyphBitmap.height), static_cast<int32_t>(data.height) - yOffset);
+  const int32_t indexRangeMin     = std::max(0, -xOffset);
+  const int32_t indexRangeMax     = std::min(static_cast<int32_t>(data.glyphBitmap.width), static_cast<int32_t>(data.width) - xOffset);
+
+  // If current glyph don't need to be rendered, just ignore.
+  if(lineIndexRangeMax <= lineIndexRangeMin || indexRangeMax <= indexRangeMin)
+  {
+    return;
+  }
 
   if(Pixel::RGBA8888 == pixelFormat)
   {
-    // Whether the given glyph is a color one.
-    const bool     isColorGlyph   = data.glyphBitmap.isColorEmoji || data.glyphBitmap.isColorBitmap;
-    const uint32_t glyphPixelSize = Pixel::GetBytesPerPixel(data.glyphBitmap.format);
-    const uint32_t alphaIndex     = glyphPixelSize - 1u;
-    const bool     swapChannelsBR = Pixel::BGRA8888 == data.glyphBitmap.format;
+    uint32_t* __restrict__ bitmapBuffer = reinterpret_cast<uint32_t*>(data.bitmapBuffer.GetBuffer());
+    // Skip basic line.
+    bitmapBuffer += (lineIndexRangeMin + yOffset) * static_cast<int32_t>(data.width);
 
-    // Pointer to the color glyph if there is one.
-    const uint32_t* const colorGlyphBuffer = isColorGlyph ? reinterpret_cast<uint32_t*>(data.glyphBitmap.buffer) : NULL;
+    // Fast-cut if style is MASK or OUTLINE. Outline not shown for color glyph.
+    // Just overwrite transparent color and return.
+    if(isColorGlyph && (Typesetter::STYLE_MASK == style || Typesetter::STYLE_OUTLINE == style))
+    {
+      for(int32_t lineIndex = lineIndexRangeMin; lineIndex < lineIndexRangeMax; ++lineIndex)
+      {
+        // We can use memset here.
+        memset(bitmapBuffer + xOffset + indexRangeMin, 0, (indexRangeMax - indexRangeMin) * sizeof(uint32_t));
+        bitmapBuffer += data.width;
+      }
+      return;
+    }
+
+    const bool swapChannelsBR = Pixel::BGRA8888 == data.glyphBitmap.format;
+
+    // Precalculate input color's packed result.
+    uint32_t packedInputColor                    = 0u;
+    uint8_t* __restrict__ packedInputColorBuffer = reinterpret_cast<uint8_t*>(&packedInputColor);
 
-    // Initial vertical offset.
-    const int yOffset = data.verticalOffset + position->y;
+    *(packedInputColorBuffer + 3u) = static_cast<uint8_t>(color->a * 255);
+    *(packedInputColorBuffer + 2u) = static_cast<uint8_t>(color->b * 255);
+    *(packedInputColorBuffer + 1u) = static_cast<uint8_t>(color->g * 255);
+    *(packedInputColorBuffer)      = static_cast<uint8_t>(color->r * 255);
 
-    uint32_t* bitmapBuffer = reinterpret_cast<uint32_t*>(data.bitmapBuffer.GetBuffer());
+    // Prepare glyph bitmap
+    BEGIN_GLYPH_BITMAP(data);
+
+    // Skip basic line of glyph.
+    SKIP_GLYPH_SCANLINE(lineIndexRangeMin);
 
     // Traverse the pixels of the glyph line per line.
-    for(int lineIndex = 0, glyphHeight = static_cast<int>(data.glyphBitmap.height); lineIndex < glyphHeight; ++lineIndex)
+    if(isColorGlyph)
     {
-      const int yOffsetIndex = yOffset + lineIndex;
-      if((0 > yOffsetIndex) || (yOffsetIndex > heightMinusOne))
+      for(int32_t lineIndex = lineIndexRangeMin; lineIndex < lineIndexRangeMax; ++lineIndex)
       {
-        // Do not write out of bounds.
-        continue;
-      }
+        BEGIN_GLYPH_SCANLINE_DECODE(data);
 
-      const int verticalOffset    = yOffsetIndex * data.width;
-      const int xOffset           = data.horizontalOffset + position->x;
-      const int glyphBufferOffset = lineIndex * static_cast<int>(data.glyphBitmap.width);
-      for(int index = 0, glyphWidth = static_cast<int>(data.glyphBitmap.width); index < glyphWidth; ++index)
-      {
-        const int xOffsetIndex = xOffset + index;
-        if((0 > xOffsetIndex) || (xOffsetIndex > widthMinusOne))
+        for(int32_t index = indexRangeMin; index < indexRangeMax; ++index)
         {
-          // Don't write out of bounds.
-          continue;
-        }
+          const int32_t xOffsetIndex = xOffset + index;
 
-        if(isColorGlyph)
-        {
           // Retrieves the color from the color glyph.
-          uint32_t packedColorGlyph       = *(colorGlyphBuffer + glyphBufferOffset + index);
-          uint8_t* packedColorGlyphBuffer = reinterpret_cast<uint8_t*>(&packedColorGlyph);
+          uint32_t packedColorGlyph                    = *(reinterpret_cast<const uint32_t*>(glyphScanline + (index << 2)));
+          uint8_t* __restrict__ packedColorGlyphBuffer = reinterpret_cast<uint8_t*>(&packedColorGlyph);
 
           // Update the alpha channel.
-          if(Typesetter::STYLE_MASK == style || Typesetter::STYLE_OUTLINE == style) // Outline not shown for color glyph
+          const uint8_t colorAlpha       = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 3u), *(packedColorGlyphBuffer + 3u));
+          *(packedColorGlyphBuffer + 3u) = colorAlpha;
+
+          if(Typesetter::STYLE_SHADOW == style)
           {
-            // Create an alpha mask for color glyph.
-            *(packedColorGlyphBuffer + 3u) = 0u;
-            *(packedColorGlyphBuffer + 2u) = 0u;
-            *(packedColorGlyphBuffer + 1u) = 0u;
-            *packedColorGlyphBuffer        = 0u;
+            // The shadow of color glyph needs to have the shadow color.
+            *(packedColorGlyphBuffer + 2u) = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 2u), colorAlpha);
+            *(packedColorGlyphBuffer + 1u) = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 1u), colorAlpha);
+            *packedColorGlyphBuffer        = MultiplyAndNormalizeColor(*packedInputColorBuffer, colorAlpha);
           }
           else
           {
-            const uint8_t colorAlpha       = static_cast<uint8_t>(color->a * static_cast<float>(*(packedColorGlyphBuffer + 3u)));
-            *(packedColorGlyphBuffer + 3u) = colorAlpha;
-
-            if(Typesetter::STYLE_SHADOW == style)
+            if(swapChannelsBR)
             {
-              // The shadow of color glyph needs to have the shadow color.
-              *(packedColorGlyphBuffer + 2u) = static_cast<uint8_t>(color->b * colorAlpha);
-              *(packedColorGlyphBuffer + 1u) = static_cast<uint8_t>(color->g * colorAlpha);
-              *packedColorGlyphBuffer        = static_cast<uint8_t>(color->r * colorAlpha);
+              std::swap(*packedColorGlyphBuffer, *(packedColorGlyphBuffer + 2u)); // Swap B and R.
             }
-            else
+
+            *(packedColorGlyphBuffer + 2u) = MultiplyAndNormalizeColor(*(packedColorGlyphBuffer + 2u), colorAlpha);
+            *(packedColorGlyphBuffer + 1u) = MultiplyAndNormalizeColor(*(packedColorGlyphBuffer + 1u), colorAlpha);
+            *packedColorGlyphBuffer        = MultiplyAndNormalizeColor(*packedColorGlyphBuffer, colorAlpha);
+
+            if(data.glyphBitmap.isColorBitmap)
             {
-              if(swapChannelsBR)
-              {
-                std::swap(*packedColorGlyphBuffer, *(packedColorGlyphBuffer + 2u)); // Swap B and R.
-              }
-
-              *(packedColorGlyphBuffer + 2u) = (*(packedColorGlyphBuffer + 2u) * colorAlpha / 255);
-              *(packedColorGlyphBuffer + 1u) = (*(packedColorGlyphBuffer + 1u) * colorAlpha / 255);
-              *packedColorGlyphBuffer        = (*(packedColorGlyphBuffer)*colorAlpha / 255);
-
-              if(data.glyphBitmap.isColorBitmap)
-              {
-                *(packedColorGlyphBuffer + 2u) = static_cast<uint8_t>(*(packedColorGlyphBuffer + 2u) * color->b);
-                *(packedColorGlyphBuffer + 1u) = static_cast<uint8_t>(*(packedColorGlyphBuffer + 1u) * color->g);
-                *packedColorGlyphBuffer        = static_cast<uint8_t>(*packedColorGlyphBuffer * color->r);
-              }
+              *(packedColorGlyphBuffer + 2u) = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 2u), *(packedColorGlyphBuffer + 2u));
+              *(packedColorGlyphBuffer + 1u) = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 1u), *(packedColorGlyphBuffer + 1u));
+              *packedColorGlyphBuffer        = MultiplyAndNormalizeColor(*packedInputColorBuffer, *packedColorGlyphBuffer);
             }
           }
 
           // Set the color into the final pixel buffer.
-          *(bitmapBuffer + verticalOffset + xOffsetIndex) = packedColorGlyph;
+          *(bitmapBuffer + xOffsetIndex) = packedColorGlyph;
         }
-        else
-        {
-          // Pack the given color into a 32bit buffer. The alpha channel will be updated later for each pixel.
-          // The format is RGBA8888.
-          uint32_t packedColor       = 0u;
-          uint8_t* packedColorBuffer = reinterpret_cast<uint8_t*>(&packedColor);
 
+        bitmapBuffer += data.width;
+
+        END_GLYPH_SCANLINE_DECODE(data);
+      }
+    }
+    else
+    {
+      for(int32_t lineIndex = lineIndexRangeMin; lineIndex < lineIndexRangeMax; ++lineIndex)
+      {
+        BEGIN_GLYPH_SCANLINE_DECODE(data);
+
+        for(int32_t index = indexRangeMin; index < indexRangeMax; ++index)
+        {
           // Update the alpha channel.
-          const uint8_t alpha = *(data.glyphBitmap.buffer + glyphPixelSize * (glyphBufferOffset + index) + alphaIndex);
+          const uint8_t alpha = *(glyphScanline + index * glyphPixelSize + glyphAlphaIndex);
 
           // Copy non-transparent pixels only
           if(alpha > 0u)
           {
+            const int32_t xOffsetIndex = xOffset + index;
+
             // Check alpha of overlapped pixels
-            uint32_t& currentColor             = *(bitmapBuffer + verticalOffset + xOffsetIndex);
+            uint32_t& currentColor             = *(bitmapBuffer + xOffsetIndex);
             uint8_t*  packedCurrentColorBuffer = reinterpret_cast<uint8_t*>(&currentColor);
 
             // For any pixel overlapped with the pixel in previous glyphs, make sure we don't
@@ -184,64 +293,70 @@ void TypesetGlyph(GlyphData&           data,
             // happen, for example, in the RTL text when we copy glyphs from right to left).
             uint8_t currentAlpha = *(packedCurrentColorBuffer + 3u);
             currentAlpha         = std::max(currentAlpha, alpha);
-
-            // Color is pre-muliplied with its alpha.
-            *(packedColorBuffer + 3u) = static_cast<uint8_t>(color->a * currentAlpha);
-            *(packedColorBuffer + 2u) = static_cast<uint8_t>(color->b * currentAlpha);
-            *(packedColorBuffer + 1u) = static_cast<uint8_t>(color->g * currentAlpha);
-            *(packedColorBuffer)      = static_cast<uint8_t>(color->r * currentAlpha);
-
-            // Set the color into the final pixel buffer.
-            currentColor = packedColor;
+            if(currentAlpha == 255)
+            {
+              // Fast-cut to avoid float type operation.
+              currentColor = packedInputColor;
+            }
+            else
+            {
+              // Pack the given color into a 32bit buffer. The alpha channel will be updated later for each pixel.
+              // The format is RGBA8888.
+              uint32_t packedColor                    = 0u;
+              uint8_t* __restrict__ packedColorBuffer = reinterpret_cast<uint8_t*>(&packedColor);
+
+              // Color is pre-muliplied with its alpha.
+              *(packedColorBuffer + 3u) = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 3u), currentAlpha);
+              *(packedColorBuffer + 2u) = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 2u), currentAlpha);
+              *(packedColorBuffer + 1u) = MultiplyAndNormalizeColor(*(packedInputColorBuffer + 1u), currentAlpha);
+              *(packedColorBuffer)      = MultiplyAndNormalizeColor(*packedInputColorBuffer, currentAlpha);
+
+              // Set the color into the final pixel buffer.
+              currentColor = packedColor;
+            }
           }
         }
+
+        bitmapBuffer += data.width;
+
+        END_GLYPH_SCANLINE_DECODE(data);
       }
     }
+
+    END_GLYPH_BITMAP();
   }
-  else
+  else // Pixel::L8
   {
-    // Whether the given glyph is a color one.
-    const bool     isColorGlyph   = data.glyphBitmap.isColorEmoji || data.glyphBitmap.isColorBitmap;
-    const uint32_t glyphPixelSize = Pixel::GetBytesPerPixel(data.glyphBitmap.format);
-    const uint32_t alphaIndex     = glyphPixelSize - 1u;
+    // Below codes required only if not color glyph.
+    if(!isColorGlyph)
+    {
+      uint8_t* __restrict__ bitmapBuffer = data.bitmapBuffer.GetBuffer();
+      // Skip basic line.
+      bitmapBuffer += (lineIndexRangeMin + yOffset) * static_cast<int32_t>(data.width);
 
-    // Initial vertical offset.
-    const int yOffset = data.verticalOffset + position->y;
+      // Prepare glyph bitmap
+      BEGIN_GLYPH_BITMAP(data);
 
-    uint8_t* bitmapBuffer = reinterpret_cast<uint8_t*>(data.bitmapBuffer.GetBuffer());
+      // Skip basic line of glyph.
+      SKIP_GLYPH_SCANLINE(lineIndexRangeMin);
 
-    // Traverse the pixels of the glyph line per line.
-    for(int lineIndex = 0, glyphHeight = static_cast<int>(data.glyphBitmap.height); lineIndex < glyphHeight; ++lineIndex)
-    {
-      const int yOffsetIndex = yOffset + lineIndex;
-      if((0 > yOffsetIndex) || (yOffsetIndex > heightMinusOne))
+      // Traverse the pixels of the glyph line per line.
+      for(int32_t lineIndex = lineIndexRangeMin; lineIndex < lineIndexRangeMax; ++lineIndex)
       {
-        // Do not write out of bounds.
-        continue;
-      }
+        BEGIN_GLYPH_SCANLINE_DECODE(data);
 
-      const int verticalOffset    = yOffsetIndex * data.width;
-      const int xOffset           = data.horizontalOffset + position->x;
-      const int glyphBufferOffset = lineIndex * static_cast<int>(data.glyphBitmap.width);
-      for(int index = 0, glyphWidth = static_cast<int>(data.glyphBitmap.width); index < glyphWidth; ++index)
-      {
-        const int xOffsetIndex = xOffset + index;
-        if((0 > xOffsetIndex) || (xOffsetIndex > widthMinusOne))
+        for(int32_t index = indexRangeMin; index < indexRangeMax; ++index)
         {
-          // Don't write out of bounds.
-          continue;
-        }
+          const int32_t xOffsetIndex = xOffset + index;
 
-        if(!isColorGlyph)
-        {
           // Update the alpha channel.
-          const uint8_t alpha = *(data.glyphBitmap.buffer + glyphPixelSize * (glyphBufferOffset + index) + alphaIndex);
+          const uint8_t alpha = *(glyphScanline + index * glyphPixelSize + glyphAlphaIndex);
 
           // Copy non-transparent pixels only
           if(alpha > 0u)
           {
             // Check alpha of overlapped pixels
-            uint8_t& currentAlpha = *(bitmapBuffer + verticalOffset + xOffsetIndex);
+            uint8_t& currentAlpha = *(bitmapBuffer + xOffsetIndex);
 
             // For any pixel overlapped with the pixel in previous glyphs, make sure we don't
             // overwrite a previous bigger alpha with a smaller alpha (in order to avoid
@@ -250,174 +365,216 @@ void TypesetGlyph(GlyphData&           data,
             currentAlpha = std::max(currentAlpha, alpha);
           }
         }
+
+        bitmapBuffer += data.width;
+
+        END_GLYPH_SCANLINE_DECODE(data);
       }
+
+      END_GLYPH_BITMAP();
     }
   }
 }
 
-bool IsGlyphUnderlined(GlyphIndex              index,
-                       const Vector<GlyphRun>& underlineRuns)
+/// Draws the specified underline color to the buffer
+void DrawUnderline(
+  const uint32_t                  bufferWidth,
+  const uint32_t                  bufferHeight,
+  GlyphData&                      glyphData,
+  const float                     baseline,
+  const float                     currentUnderlinePosition,
+  const float                     maxUnderlineHeight,
+  const float                     lineExtentLeft,
+  const float                     lineExtentRight,
+  const UnderlineStyleProperties& commonUnderlineProperties,
+  const UnderlineStyleProperties& currentUnderlineProperties,
+  const LineRun&                  line)
 {
-  for(Vector<GlyphRun>::ConstIterator it    = underlineRuns.Begin(),
-                                      endIt = underlineRuns.End();
-      it != endIt;
-      ++it)
-  {
-    const GlyphRun& run = *it;
+  const Vector4&              underlineColor       = currentUnderlineProperties.colorDefined ? currentUnderlineProperties.color : commonUnderlineProperties.color;
+  const Text::Underline::Type underlineType        = currentUnderlineProperties.typeDefined ? currentUnderlineProperties.type : commonUnderlineProperties.type;
+  const float                 dashedUnderlineWidth = currentUnderlineProperties.dashWidthDefined ? currentUnderlineProperties.dashWidth : commonUnderlineProperties.dashWidth;
+  const float                 dashedUnderlineGap   = currentUnderlineProperties.dashGapDefined ? currentUnderlineProperties.dashGap : commonUnderlineProperties.dashGap;
 
-    if((run.glyphIndex <= index) && (index < run.glyphIndex + run.numberOfGlyphs))
-    {
-      return true;
-    }
+  int32_t underlineYOffset = glyphData.verticalOffset + baseline + currentUnderlinePosition;
+
+  const uint32_t yRangeMin = underlineYOffset;
+  const uint32_t yRangeMax = std::min(bufferHeight, underlineYOffset + static_cast<uint32_t>(maxUnderlineHeight));
+  const uint32_t xRangeMin = static_cast<uint32_t>(glyphData.horizontalOffset + lineExtentLeft);
+  const uint32_t xRangeMax = std::min(bufferWidth, static_cast<uint32_t>(glyphData.horizontalOffset + lineExtentRight + 1)); // Due to include last point, we add 1 here
+
+  // If current glyph don't need to be rendered, just ignore.
+  if((underlineType != Text::Underline::DOUBLE && yRangeMax <= yRangeMin) || xRangeMax <= xRangeMin)
+  {
+    return;
   }
 
-  return false;
-}
+  // We can optimize by memset when underlineColor.a is near zero
+  uint8_t underlineColorAlpha = static_cast<uint8_t>(underlineColor.a * 255.f);
 
-/// Helper method to fetch the underline metrics for the specified font glyph
-void FetchFontUnderlineMetrics(
-  TextAbstraction::FontClient& fontClient,
-  const GlyphInfo* const       glyphInfo,
-  float&                       currentUnderlinePosition,
-  const float                  underlineHeight,
-  float&                       currentUnderlineThickness,
-  float&                       maxUnderlineThickness,
-  FontId&                      lastUnderlinedFontId)
-{
-  FontMetrics fontMetrics;
-  fontClient.GetFontMetrics(glyphInfo->fontId, fontMetrics);
-  currentUnderlinePosition = ceil(fabsf(fontMetrics.underlinePosition));
-  const float descender    = ceil(fabsf(fontMetrics.descender));
+  uint32_t* bitmapBuffer = reinterpret_cast<uint32_t*>(glyphData.bitmapBuffer.GetBuffer());
 
-  if(fabsf(underlineHeight) < Math::MACHINE_EPSILON_1000)
-  {
-    currentUnderlineThickness = fontMetrics.underlineThickness;
+  // Skip yRangeMin line.
+  bitmapBuffer += yRangeMin * glyphData.width;
 
-    // Ensure underline will be at least a pixel high
-    if(currentUnderlineThickness < 1.0f)
+  // Note if underlineType is DASHED, we cannot setup color by memset.
+  if(underlineType != Text::Underline::DASHED && underlineColorAlpha == 0)
+  {
+    for(uint32_t y = yRangeMin; y < yRangeMax; y++)
     {
-      currentUnderlineThickness = 1.0f;
+      // We can use memset.
+      memset(bitmapBuffer + xRangeMin, 0, (xRangeMax - xRangeMin) * sizeof(uint32_t));
+      bitmapBuffer += glyphData.width;
     }
-    else
+    if(underlineType == Text::Underline::DOUBLE)
     {
-      currentUnderlineThickness = ceil(currentUnderlineThickness);
-    }
-  }
+      int32_t        secondUnderlineYOffset = underlineYOffset - ONE_AND_A_HALF * maxUnderlineHeight;
+      const uint32_t secondYRangeMin        = static_cast<uint32_t>(std::max(0, secondUnderlineYOffset));
+      const uint32_t secondYRangeMax        = static_cast<uint32_t>(std::max(0, std::min(static_cast<int32_t>(bufferHeight), secondUnderlineYOffset + static_cast<int32_t>(maxUnderlineHeight))));
 
-  // The underline thickness should be the max underline thickness of all glyphs of the line.
-  if(currentUnderlineThickness > maxUnderlineThickness)
-  {
-    maxUnderlineThickness = currentUnderlineThickness;
-  }
+      // Rewind bitmapBuffer pointer, and skip secondYRangeMin line.
+      bitmapBuffer = reinterpret_cast<uint32_t*>(glyphData.bitmapBuffer.GetBuffer()) + yRangeMin * glyphData.width;
 
-  // Clamp the underline position at the font descender and check for ( as EFL describes it ) a broken font
-  if(currentUnderlinePosition > descender)
-  {
-    currentUnderlinePosition = descender;
+      for(uint32_t y = secondYRangeMin; y < secondYRangeMax; y++)
+      {
+        // We can use memset.
+        memset(bitmapBuffer + xRangeMin, 0, (xRangeMax - xRangeMin) * sizeof(uint32_t));
+        bitmapBuffer += glyphData.width;
+      }
+    }
   }
-
-  if(fabsf(currentUnderlinePosition) < Math::MACHINE_EPSILON_1000)
+  else
   {
-    // Move offset down by one ( EFL behavior )
-    currentUnderlinePosition = 1.0f;
-  }
-
-  lastUnderlinedFontId = glyphInfo->fontId;
-}
-
-/// Draws the specified color to the pixel buffer
-void WriteColorToPixelBuffer(
-  GlyphData&         glyphData,
-  uint32_t*          bitmapBuffer,
-  const Vector4&     color,
-  const unsigned int x,
-  const unsigned int y)
-{
-  // Always RGBA image for text with styles
-  uint32_t pixel       = *(bitmapBuffer + y * glyphData.width + x);
-  uint8_t* pixelBuffer = reinterpret_cast<uint8_t*>(&pixel);
-
-  // Write the color to the pixel buffer
-  uint8_t colorAlpha  = static_cast<uint8_t>(color.a * 255.f);
-  *(pixelBuffer + 3u) = colorAlpha;
-  *(pixelBuffer + 2u) = static_cast<uint8_t>(color.b * colorAlpha);
-  *(pixelBuffer + 1u) = static_cast<uint8_t>(color.g * colorAlpha);
-  *(pixelBuffer)      = static_cast<uint8_t>(color.r * colorAlpha);
-
-  *(bitmapBuffer + y * glyphData.width + x) = pixel;
-}
+    uint32_t packedUnderlineColor       = 0u;
+    uint8_t* packedUnderlineColorBuffer = reinterpret_cast<uint8_t*>(&packedUnderlineColor);
 
-/// Draws the specified underline color to the buffer
-void DrawUnderline(
-  const Vector4&     underlineColor,
-  const unsigned int bufferWidth,
-  const unsigned int bufferHeight,
-  GlyphData&         glyphData,
-  const float        baseline,
-  const float        currentUnderlinePosition,
-  const float        maxUnderlineThickness,
-  const float        lineExtentLeft,
-  const float        lineExtentRight)
-{
-  int       underlineYOffset = glyphData.verticalOffset + baseline + currentUnderlinePosition;
-  uint32_t* bitmapBuffer     = reinterpret_cast<uint32_t*>(glyphData.bitmapBuffer.GetBuffer());
+    // Write the color to the pixel buffer
+    *(packedUnderlineColorBuffer + 3u) = underlineColorAlpha;
+    *(packedUnderlineColorBuffer + 2u) = static_cast<uint8_t>(underlineColor.b * underlineColorAlpha);
+    *(packedUnderlineColorBuffer + 1u) = static_cast<uint8_t>(underlineColor.g * underlineColorAlpha);
+    *(packedUnderlineColorBuffer)      = static_cast<uint8_t>(underlineColor.r * underlineColorAlpha);
 
-  for(unsigned int y = underlineYOffset; y < underlineYOffset + maxUnderlineThickness; y++)
-  {
-    if(y > bufferHeight - 1)
+    for(uint32_t y = yRangeMin; y < yRangeMax; y++)
     {
-      // Do not write out of bounds.
-      break;
-    }
+      if(underlineType == Text::Underline::DASHED)
+      {
+        float dashWidth = dashedUnderlineWidth;
+        float dashGap   = 0;
 
-    for(unsigned int x = glyphData.horizontalOffset + lineExtentLeft; x <= glyphData.horizontalOffset + lineExtentRight; x++)
-    {
-      if(x > bufferWidth - 1)
+        for(uint32_t x = xRangeMin; x < xRangeMax; x++)
+        {
+          if(Dali::EqualsZero(dashGap) && dashWidth > 0)
+          {
+            // Note : this is same logic as bitmap[y][x] = underlineColor;
+            *(bitmapBuffer + x) = packedUnderlineColor;
+            dashWidth--;
+          }
+          else if(dashGap < dashedUnderlineGap)
+          {
+            dashGap++;
+          }
+          else
+          {
+            //reset
+            dashWidth = dashedUnderlineWidth;
+            dashGap   = 0;
+          }
+        }
+      }
+      else
       {
-        // Do not write out of bounds.
-        break;
+        for(uint32_t x = xRangeMin; x < xRangeMax; x++)
+        {
+          // Note : this is same logic as bitmap[y][x] = underlineColor;
+          *(bitmapBuffer + x) = packedUnderlineColor;
+        }
       }
+      bitmapBuffer += glyphData.width;
+    }
+    if(underlineType == Text::Underline::DOUBLE)
+    {
+      int32_t        secondUnderlineYOffset = underlineYOffset - ONE_AND_A_HALF * maxUnderlineHeight;
+      const uint32_t secondYRangeMin        = static_cast<uint32_t>(std::max(0, secondUnderlineYOffset));
+      const uint32_t secondYRangeMax        = static_cast<uint32_t>(std::max(0, std::min(static_cast<int32_t>(bufferHeight), secondUnderlineYOffset + static_cast<int32_t>(maxUnderlineHeight))));
 
-      WriteColorToPixelBuffer(glyphData, bitmapBuffer, underlineColor, x, y);
+      // Rewind bitmapBuffer pointer, and skip secondYRangeMin line.
+      bitmapBuffer = reinterpret_cast<uint32_t*>(glyphData.bitmapBuffer.GetBuffer()) + yRangeMin * glyphData.width;
+
+      for(uint32_t y = secondYRangeMin; y < secondYRangeMax; y++)
+      {
+        for(uint32_t x = xRangeMin; x < xRangeMax; x++)
+        {
+          // Note : this is same logic as bitmap[y][x] = underlineColor;
+          *(bitmapBuffer + x) = packedUnderlineColor;
+        }
+        bitmapBuffer += glyphData.width;
+      }
     }
   }
 }
 
 /// Draws the background color to the buffer
 void DrawBackgroundColor(
-  Vector4            backgroundColor,
-  const unsigned int bufferWidth,
-  const unsigned int bufferHeight,
-  GlyphData&         glyphData,
-  const float        baseline,
-  const LineRun&     line,
-  const float        lineExtentLeft,
-  const float        lineExtentRight)
+  Vector4        backgroundColor,
+  const uint32_t bufferWidth,
+  const uint32_t bufferHeight,
+  GlyphData&     glyphData,
+  const float    baseline,
+  const LineRun& line,
+  const float    lineExtentLeft,
+  const float    lineExtentRight)
 {
+  const int32_t yRangeMin = std::max(0, static_cast<int32_t>(glyphData.verticalOffset + baseline - line.ascender));
+  const int32_t yRangeMax = std::min(static_cast<int32_t>(bufferHeight), static_cast<int32_t>(glyphData.verticalOffset + baseline - line.descender));
+  const int32_t xRangeMin = std::max(0, static_cast<int32_t>(glyphData.horizontalOffset + lineExtentLeft));
+  const int32_t xRangeMax = std::min(static_cast<int32_t>(bufferWidth), static_cast<int32_t>(glyphData.horizontalOffset + lineExtentRight + 1)); // Due to include last point, we add 1 here
+
+  // If current glyph don't need to be rendered, just ignore.
+  if(yRangeMax <= yRangeMin || xRangeMax <= xRangeMin)
+  {
+    return;
+  }
+
+  // We can optimize by memset when backgroundColor.a is near zero
+  uint8_t backgroundColorAlpha = static_cast<uint8_t>(backgroundColor.a * 255.f);
+
   uint32_t* bitmapBuffer = reinterpret_cast<uint32_t*>(glyphData.bitmapBuffer.GetBuffer());
 
-  for(int y = glyphData.verticalOffset + baseline - line.ascender; y < glyphData.verticalOffset + baseline - line.descender; y++)
+  // Skip yRangeMin line.
+  bitmapBuffer += yRangeMin * glyphData.width;
+
+  if(backgroundColorAlpha == 0)
   {
-    if((y < 0) || (y > static_cast<int>(bufferHeight - 1)))
+    for(int32_t y = yRangeMin; y < yRangeMax; y++)
     {
-      // Do not write out of bounds.
-      continue;
+      // We can use memset.
+      memset(bitmapBuffer + xRangeMin, 0, (xRangeMax - xRangeMin) * sizeof(uint32_t));
+      bitmapBuffer += glyphData.width;
     }
+  }
+  else
+  {
+    uint32_t packedBackgroundColor       = 0u;
+    uint8_t* packedBackgroundColorBuffer = reinterpret_cast<uint8_t*>(&packedBackgroundColor);
 
-    for(int x = glyphData.horizontalOffset + lineExtentLeft; x <= glyphData.horizontalOffset + lineExtentRight; x++)
+    // Write the color to the pixel buffer
+    *(packedBackgroundColorBuffer + 3u) = backgroundColorAlpha;
+    *(packedBackgroundColorBuffer + 2u) = static_cast<uint8_t>(backgroundColor.b * backgroundColorAlpha);
+    *(packedBackgroundColorBuffer + 1u) = static_cast<uint8_t>(backgroundColor.g * backgroundColorAlpha);
+    *(packedBackgroundColorBuffer)      = static_cast<uint8_t>(backgroundColor.r * backgroundColorAlpha);
+
+    for(int32_t y = yRangeMin; y < yRangeMax; y++)
     {
-      if((x < 0) || (x > static_cast<int>(bufferWidth - 1)))
+      for(int32_t x = xRangeMin; x < xRangeMax; x++)
       {
-        // Do not write out of bounds.
-        continue;
+        // Note : this is same logic as bitmap[y][x] = backgroundColor;
+        *(bitmapBuffer + x) = packedBackgroundColor;
       }
-
-      WriteColorToPixelBuffer(glyphData, bitmapBuffer, backgroundColor, x, y);
+      bitmapBuffer += glyphData.width;
     }
   }
 }
 
-Devel::PixelBuffer DrawGlyphsBackground(const ViewModel* model, Devel::PixelBuffer& buffer, const unsigned int bufferWidth, const unsigned int bufferHeight, bool ignoreHorizontalAlignment, int horizontalOffset, int verticalOffset)
+Devel::PixelBuffer DrawGlyphsBackground(const ViewModel* model, Devel::PixelBuffer& buffer, const uint32_t bufferWidth, const uint32_t bufferHeight, const bool ignoreHorizontalAlignment, const int32_t horizontalOffset, const int32_t verticalOffset)
 {
   // Retrieve lines, glyphs, positions and colors from the view model.
   const Length            modelNumberOfLines           = model->GetNumberOfLines();
@@ -428,6 +585,8 @@ Devel::PixelBuffer DrawGlyphsBackground(const ViewModel* model, Devel::PixelBuff
   const Vector4* const    backgroundColorsBuffer       = model->GetBackgroundColors();
   const ColorIndex* const backgroundColorIndicesBuffer = model->GetBackgroundColorIndices();
 
+  const DevelText::VerticalLineAlignment::Type verLineAlign = model->GetVerticalLineAlignment();
+
   // Create and initialize the pixel buffer.
   GlyphData glyphData;
   glyphData.verticalOffset   = verticalOffset;
@@ -445,17 +604,11 @@ Devel::PixelBuffer DrawGlyphsBackground(const ViewModel* model, Devel::PixelBuff
     const LineRun& line = *(modelLinesBuffer + lineIndex);
 
     // Sets the horizontal offset of the line.
-    glyphData.horizontalOffset = ignoreHorizontalAlignment ? 0 : static_cast<int>(line.alignmentOffset);
+    glyphData.horizontalOffset = ignoreHorizontalAlignment ? 0 : static_cast<int32_t>(line.alignmentOffset);
     glyphData.horizontalOffset += horizontalOffset;
 
     // Increases the vertical offset with the line's ascender.
-    glyphData.verticalOffset += static_cast<int>(line.ascender);
-
-    // Include line spacing after first line
-    if(lineIndex > 0u)
-    {
-      glyphData.verticalOffset += static_cast<int>(line.lineSpacing);
-    }
+    glyphData.verticalOffset += static_cast<int32_t>(line.ascender + GetPreOffsetVerticalLineAlignment(line, verLineAlign));
 
     float left     = bufferWidth;
     float right    = 0.0f;
@@ -521,44 +674,229 @@ Devel::PixelBuffer DrawGlyphsBackground(const ViewModel* model, Devel::PixelBuff
     }
 
     // Increases the vertical offset with the line's descender.
-    glyphData.verticalOffset += static_cast<int>(-line.descender);
+    glyphData.verticalOffset += static_cast<int32_t>(-line.descender + GetPostOffsetVerticalLineAlignment(line, verLineAlign));
   }
 
   return glyphData.bitmapBuffer;
 }
 
-} // namespace
-
-TypesetterPtr Typesetter::New(const ModelInterface* const model)
+/// Draws the specified strikethrough color to the buffer
+void DrawStrikethrough(const uint32_t                      bufferWidth,
+                       const uint32_t                      bufferHeight,
+                       GlyphData&                          glyphData,
+                       const float                         baseline,
+                       const float                         strikethroughStartingYPosition,
+                       const float                         maxStrikethroughHeight,
+                       const float                         lineExtentLeft,
+                       const float                         lineExtentRight,
+                       const StrikethroughStyleProperties& commonStrikethroughProperties,
+                       const StrikethroughStyleProperties& currentStrikethroughProperties,
+                       const LineRun&                      line)
 {
-  return TypesetterPtr(new Typesetter(model));
-}
+  const Vector4& strikethroughColor = currentStrikethroughProperties.colorDefined ? currentStrikethroughProperties.color : commonStrikethroughProperties.color;
 
-ViewModel* Typesetter::GetViewModel()
-{
-  return mModel;
+  const uint32_t yRangeMin = static_cast<uint32_t>(strikethroughStartingYPosition);
+  const uint32_t yRangeMax = std::min(bufferHeight, static_cast<uint32_t>(strikethroughStartingYPosition + maxStrikethroughHeight));
+  const uint32_t xRangeMin = static_cast<uint32_t>(glyphData.horizontalOffset + lineExtentLeft);
+  const uint32_t xRangeMax = std::min(bufferWidth, static_cast<uint32_t>(glyphData.horizontalOffset + lineExtentRight + 1)); // Due to include last point, we add 1 here
+
+  // If current glyph don't need to be rendered, just ignore.
+  if(yRangeMax <= yRangeMin || xRangeMax <= xRangeMin)
+  {
+    return;
+  }
+
+  // We can optimize by memset when strikethroughColor.a is near zero
+  uint8_t strikethroughColorAlpha = static_cast<uint8_t>(strikethroughColor.a * 255.f);
+
+  uint32_t* bitmapBuffer = reinterpret_cast<uint32_t*>(glyphData.bitmapBuffer.GetBuffer());
+
+  // Skip yRangeMin line.
+  bitmapBuffer += yRangeMin * glyphData.width;
+
+  if(strikethroughColorAlpha == 0)
+  {
+    for(uint32_t y = yRangeMin; y < yRangeMax; y++)
+    {
+      // We can use memset.
+      memset(bitmapBuffer + xRangeMin, 0, (xRangeMax - xRangeMin) * sizeof(uint32_t));
+      bitmapBuffer += glyphData.width;
+    }
+  }
+  else
+  {
+    uint32_t packedStrikethroughColor       = 0u;
+    uint8_t* packedStrikethroughColorBuffer = reinterpret_cast<uint8_t*>(&packedStrikethroughColor);
+
+    // Write the color to the pixel buffer
+    *(packedStrikethroughColorBuffer + 3u) = strikethroughColorAlpha;
+    *(packedStrikethroughColorBuffer + 2u) = static_cast<uint8_t>(strikethroughColor.b * strikethroughColorAlpha);
+    *(packedStrikethroughColorBuffer + 1u) = static_cast<uint8_t>(strikethroughColor.g * strikethroughColorAlpha);
+    *(packedStrikethroughColorBuffer)      = static_cast<uint8_t>(strikethroughColor.r * strikethroughColorAlpha);
+
+    for(uint32_t y = yRangeMin; y < yRangeMax; y++)
+    {
+      for(uint32_t x = xRangeMin; x < xRangeMax; x++)
+      {
+        // Note : this is same logic as bitmap[y][x] = strikethroughColor;
+        *(bitmapBuffer + x) = packedStrikethroughColor;
+      }
+      bitmapBuffer += glyphData.width;
+    }
+  }
 }
 
-Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth, const unsigned int bufferHeight, Pixel::Format pixelFormat)
+/**
+ * @brief Create an initialized image buffer filled with transparent color.
+ *
+ * Creates the pixel data used to generate the final image with the given size.
+ *
+ * @param[in] bufferWidth The width of the image buffer.
+ * @param[in] bufferHeight The height of the image buffer.
+ * @param[in] pixelFormat The format of the pixel in the image that the text is rendered as (i.e. either Pixel::BGRA8888 or Pixel::L8).
+ *
+ * @return An image buffer.
+ */
+inline Devel::PixelBuffer CreateTransparentImageBuffer(const uint32_t bufferWidth, const uint32_t bufferHeight, const Pixel::Format pixelFormat)
 {
   Devel::PixelBuffer imageBuffer = Devel::PixelBuffer::New(bufferWidth, bufferHeight, pixelFormat);
 
   if(Pixel::RGBA8888 == pixelFormat)
   {
-    const unsigned int bufferSizeInt  = bufferWidth * bufferHeight;
-    const unsigned int bufferSizeChar = 4u * bufferSizeInt;
-    memset(imageBuffer.GetBuffer(), 0u, bufferSizeChar);
+    const uint32_t bufferSizeInt  = bufferWidth * bufferHeight;
+    const size_t   bufferSizeChar = sizeof(uint32_t) * static_cast<std::size_t>(bufferSizeInt);
+    memset(imageBuffer.GetBuffer(), 0, bufferSizeChar);
   }
   else
   {
-    memset(imageBuffer.GetBuffer(), 0, bufferWidth * bufferHeight);
+    memset(imageBuffer.GetBuffer(), 0, static_cast<std::size_t>(bufferWidth * bufferHeight));
   }
 
   return imageBuffer;
 }
 
+/**
+ * @brief Combine the two RGBA image buffers together.
+ *
+ * The top layer buffer will blend over the bottom layer buffer:
+ * - If the pixel is not fully opaque from either buffer, it will be blended with
+ *   the pixel from the other buffer and copied to the combined buffer.
+ * - If the pixels from both buffers are fully opaque, the pixels from the top layer
+ *   buffer will be copied to the combined buffer.
+ *
+ * Due to the performance issue, We need to re-use input'ed pixelBuffer memory.
+ * We can determine which pixelBuffer's memory is destination
+ *
+ * @param[in, out] topPixelBuffer The top layer buffer.
+ * @param[in, out] bottomPixelBuffer The bottom layer buffer.
+ * @param[in] bufferWidth The width of the image buffer.
+ * @param[in] bufferHeight The height of the image buffer.
+ * @param[in] storeResultIntoTop True if we store the combined image buffer result into topPixelBuffer.
+ * False if we store the combined image buffer result into bottomPixelBuffer.
+ *
+ */
+void CombineImageBuffer(Devel::PixelBuffer& __restrict__ topPixelBuffer, Devel::PixelBuffer& __restrict__ bottomPixelBuffer, const uint32_t bufferWidth, const uint32_t bufferHeight, bool storeResultIntoTop)
+{
+  // Assume that we always combine two RGBA images
+  // Jump with 4bytes for optimize runtime.
+  uint32_t* topBuffer    = reinterpret_cast<uint32_t*>(topPixelBuffer.GetBuffer());
+  uint32_t* bottomBuffer = reinterpret_cast<uint32_t*>(bottomPixelBuffer.GetBuffer());
+
+  if(topBuffer == NULL && bottomBuffer == NULL)
+  {
+    // Nothing to do if both buffers are empty.
+    return;
+  }
+
+  if(topBuffer == NULL)
+  {
+    // Nothing to do if topBuffer is empty.
+    // If we need to store the result into top, change topPixelBuffer as bottomPixelBuffer.
+    if(storeResultIntoTop)
+    {
+      topPixelBuffer = bottomPixelBuffer;
+    }
+    return;
+  }
+
+  if(bottomBuffer == NULL)
+  {
+    // Nothing to do if bottomBuffer is empty.
+    // If we need to store the result into bottom, change bottomPixelBuffer as topPixelBuffer.
+    if(!storeResultIntoTop)
+    {
+      bottomPixelBuffer = topPixelBuffer;
+    }
+    return;
+  }
+
+  const uint32_t bufferSizeInt = bufferWidth * bufferHeight;
+
+  uint32_t* __restrict__ combinedBuffer       = storeResultIntoTop ? topBuffer : bottomBuffer;
+  uint8_t* __restrict__ topAlphaBufferPointer = reinterpret_cast<uint8_t*>(topBuffer) + 3;
+
+  for(uint32_t pixelIndex = 0; pixelIndex < bufferSizeInt; ++pixelIndex)
+  {
+    // If the alpha of the pixel in either buffer is not fully opaque, blend the two pixels.
+    // Otherwise, copy pixel from topBuffer to combinedBuffer.
+    // Note : Be careful when we read & write into combinedBuffer. It can be write into same pointer.
+
+    uint8_t topAlpha = *topAlphaBufferPointer;
+
+    if(topAlpha == 0)
+    {
+      // Copy the pixel from bottomBuffer to combinedBuffer
+      if(storeResultIntoTop)
+      {
+        *(combinedBuffer) = *(bottomBuffer);
+      }
+    }
+    else if(topAlpha == 255)
+    {
+      // Copy the pixel from topBuffer to combinedBuffer
+      if(!storeResultIntoTop)
+      {
+        *(combinedBuffer) = *(topBuffer);
+      }
+    }
+    else
+    {
+      // At least one pixel is not fully opaque
+      // "Over" blend the the pixel from topBuffer with the pixel in bottomBuffer
+      uint32_t blendedBottomBufferColor                    = *(bottomBuffer);
+      uint8_t* __restrict__ blendedBottomBufferColorBuffer = reinterpret_cast<uint8_t*>(&blendedBottomBufferColor);
+
+      blendedBottomBufferColorBuffer[0] = MultiplyAndNormalizeColor(blendedBottomBufferColorBuffer[0], 255 - topAlpha);
+      blendedBottomBufferColorBuffer[1] = MultiplyAndNormalizeColor(blendedBottomBufferColorBuffer[1], 255 - topAlpha);
+      blendedBottomBufferColorBuffer[2] = MultiplyAndNormalizeColor(blendedBottomBufferColorBuffer[2], 255 - topAlpha);
+      blendedBottomBufferColorBuffer[3] = MultiplyAndNormalizeColor(blendedBottomBufferColorBuffer[3], 255 - topAlpha);
+
+      *(combinedBuffer) = *(topBuffer) + blendedBottomBufferColor;
+    }
+
+    // Increase each buffer's pointer.
+    ++combinedBuffer;
+    ++topBuffer;
+    ++bottomBuffer;
+    topAlphaBufferPointer += sizeof(uint32_t) / sizeof(uint8_t);
+  }
+}
+
+} // namespace
+
+TypesetterPtr Typesetter::New(const ModelInterface* const model)
+{
+  return TypesetterPtr(new Typesetter(model));
+}
+
+ViewModel* Typesetter::GetViewModel()
+{
+  return mModel;
+}
+
 PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirection::Type textDirection, RenderBehaviour behaviour, bool ignoreHorizontalAlignment, Pixel::Format pixelFormat)
 {
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_RENDERING_TYPESETTER");
   // @todo. This initial implementation for a TextLabel has only one visible page.
 
   // Elides the text if needed.
@@ -567,10 +905,10 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
   // Retrieves the layout size.
   const Size& layoutSize = mModel->GetLayoutSize();
 
-  const int outlineWidth = static_cast<int>(mModel->GetOutlineWidth());
+  const int32_t outlineWidth = static_cast<int32_t>(mModel->GetOutlineWidth());
 
   // Set the offset for the horizontal alignment according to the text direction and outline width.
-  int penX = 0;
+  int32_t penX = 0;
 
   switch(mModel->GetHorizontalAlignment())
   {
@@ -592,7 +930,7 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
   }
 
   // Set the offset for the vertical alignment.
-  int penY = 0u;
+  int32_t penY = 0u;
 
   switch(mModel->GetVerticalAlignment())
   {
@@ -603,36 +941,13 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
     }
     case VerticalAlignment::CENTER:
     {
-      penY = static_cast<int>(0.5f * (size.height - layoutSize.height));
+      penY = static_cast<int32_t>(0.5f * (size.height - layoutSize.height));
       penY = penY < 0.f ? 0.f : penY;
       break;
     }
     case VerticalAlignment::BOTTOM:
     {
-      penY = static_cast<int>(size.height - layoutSize.height);
-      break;
-    }
-  }
-
-  // Calculate vertical line alignment
-  switch(mModel->GetVerticalLineAlignment())
-  {
-    case DevelText::VerticalLineAlignment::TOP:
-    {
-      break;
-    }
-    case DevelText::VerticalLineAlignment::MIDDLE:
-    {
-      const auto& line = *mModel->GetLines();
-      penY -= line.descender;
-      penY += static_cast<int>(line.lineSpacing * 0.5f + line.descender);
-      break;
-    }
-    case DevelText::VerticalLineAlignment::BOTTOM:
-    {
-      const auto& line       = *mModel->GetLines();
-      const auto  lineHeight = line.ascender + (-line.descender) + line.lineSpacing;
-      penY += static_cast<int>(lineHeight - (line.ascender - line.descender));
+      penY = static_cast<int32_t>(size.height - layoutSize.height);
       break;
     }
   }
@@ -642,11 +957,11 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
   // do all of these in CPU only, so that once the final texture is generated,
   // no calculation is needed in GPU during each frame.
 
-  const unsigned int bufferWidth  = static_cast<unsigned int>(size.width);
-  const unsigned int bufferHeight = static_cast<unsigned int>(size.height);
+  const uint32_t bufferWidth  = static_cast<uint32_t>(size.width);
+  const uint32_t bufferHeight = static_cast<uint32_t>(size.height);
 
-  const unsigned int bufferSizeInt  = bufferWidth * bufferHeight;
-  const unsigned int bufferSizeChar = 4u * bufferSizeInt;
+  const uint32_t bufferSizeInt  = bufferWidth * bufferHeight;
+  const size_t   bufferSizeChar = sizeof(uint32_t) * static_cast<std::size_t>(bufferSizeInt);
 
   //Elided text in ellipsis at START could start on index greater than 0
   auto startIndexOfGlyphs = mModel->GetStartIndexOfElidedGlyphs();
@@ -659,7 +974,7 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
     // Generate the image buffer as an alpha mask for color glyphs.
     imageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_MASK, ignoreHorizontalAlignment, pixelFormat, penX, penY, startIndexOfGlyphs, endIndexOfGlyphs);
   }
-  else if(RENDER_NO_TEXT == behaviour)
+  else if(RENDER_NO_TEXT == behaviour || RENDER_OVERLAY_STYLE == behaviour)
   {
     // Generate an empty image buffer so that it can been combined with the image buffers for styles
     imageBuffer = Devel::PixelBuffer::New(bufferWidth, bufferHeight, Pixel::RGBA8888);
@@ -675,20 +990,22 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
   {
     // Generate the outline if enabled
     const uint16_t outlineWidth = mModel->GetOutlineWidth();
-    if(outlineWidth != 0u)
+    const float    outlineAlpha = mModel->GetOutlineColor().a;
+    if(outlineWidth != 0u && fabsf(outlineAlpha) > Math::MACHINE_EPSILON_1 && RENDER_OVERLAY_STYLE != behaviour)
     {
       // Create the image buffer for outline
       Devel::PixelBuffer outlineImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_OUTLINE, ignoreHorizontalAlignment, pixelFormat, penX, penY, startIndexOfGlyphs, endIndexOfGlyphs);
 
       // Combine the two buffers
-      imageBuffer = CombineImageBuffer(imageBuffer, outlineImageBuffer, bufferWidth, bufferHeight);
+      CombineImageBuffer(imageBuffer, outlineImageBuffer, bufferWidth, bufferHeight, true);
     }
 
-    // @todo. Support shadow and underline for partial text later on.
+    // @todo. Support shadow for partial text later on.
 
     // Generate the shadow if enabled
     const Vector2& shadowOffset = mModel->GetShadowOffset();
-    if(fabsf(shadowOffset.x) > Math::MACHINE_EPSILON_1 || fabsf(shadowOffset.y) > Math::MACHINE_EPSILON_1)
+    const float    shadowAlpha  = mModel->GetShadowColor().a;
+    if(RENDER_OVERLAY_STYLE != behaviour && fabsf(shadowAlpha) > Math::MACHINE_EPSILON_1 && (fabsf(shadowOffset.x) > Math::MACHINE_EPSILON_1 || fabsf(shadowOffset.y) > Math::MACHINE_EPSILON_1))
     {
       // Create the image buffer for shadow
       Devel::PixelBuffer shadowImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_SHADOW, ignoreHorizontalAlignment, pixelFormat, penX, penY, startIndexOfGlyphs, endIndexOfGlyphs);
@@ -702,24 +1019,13 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
       }
 
       // Combine the two buffers
-      imageBuffer = CombineImageBuffer(imageBuffer, shadowImageBuffer, bufferWidth, bufferHeight);
-    }
-
-    // Generate the underline if enabled
-    const bool underlineEnabled = mModel->IsUnderlineEnabled();
-    if(underlineEnabled)
-    {
-      // Create the image buffer for underline
-      Devel::PixelBuffer underlineImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_UNDERLINE, ignoreHorizontalAlignment, pixelFormat, penX, penY, startIndexOfGlyphs, endIndexOfGlyphs);
-
-      // Combine the two buffers
-      imageBuffer = CombineImageBuffer(imageBuffer, underlineImageBuffer, bufferWidth, bufferHeight);
+      CombineImageBuffer(imageBuffer, shadowImageBuffer, bufferWidth, bufferHeight, true);
     }
 
     // Generate the background if enabled
     const bool backgroundEnabled   = mModel->IsBackgroundEnabled();
     const bool backgroundMarkupSet = mModel->IsMarkupBackgroundColorSet();
-    if(backgroundEnabled || backgroundMarkupSet)
+    if((backgroundEnabled || backgroundMarkupSet) && RENDER_OVERLAY_STYLE != behaviour)
     {
       Devel::PixelBuffer backgroundImageBuffer;
 
@@ -729,7 +1035,7 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
       }
       else
       {
-        backgroundImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, pixelFormat);
+        backgroundImageBuffer = CreateTransparentImageBuffer(bufferWidth, bufferHeight, pixelFormat);
       }
 
       if(backgroundMarkupSet)
@@ -738,12 +1044,43 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
       }
 
       // Combine the two buffers
-      imageBuffer = CombineImageBuffer(imageBuffer, backgroundImageBuffer, bufferWidth, bufferHeight);
+      CombineImageBuffer(imageBuffer, backgroundImageBuffer, bufferWidth, bufferHeight, true);
     }
 
-    // Markup-Processor
+    if(RENDER_OVERLAY_STYLE == behaviour)
+    {
+      if(mModel->IsUnderlineEnabled())
+      {
+        // Create the image buffer for underline
+        Devel::PixelBuffer underlineImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_UNDERLINE, ignoreHorizontalAlignment, pixelFormat, penX, penY, startIndexOfGlyphs, endIndexOfGlyphs);
 
-    imageBuffer = ApplyMarkupProcessorOnPixelBuffer(imageBuffer, bufferWidth, bufferHeight, ignoreHorizontalAlignment, pixelFormat, penX, penY);
+        // Combine the two buffers
+        CombineImageBuffer(imageBuffer, underlineImageBuffer, bufferWidth, bufferHeight, true);
+      }
+
+      if(mModel->IsStrikethroughEnabled())
+      {
+        // Create the image buffer for strikethrough
+        Devel::PixelBuffer strikethroughImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_STRIKETHROUGH, ignoreHorizontalAlignment, pixelFormat, penX, penY, 0u, endIndexOfGlyphs);
+
+        // Combine the two buffers
+        CombineImageBuffer(imageBuffer, strikethroughImageBuffer, bufferWidth, bufferHeight, true);
+      }
+
+      // Markup-Processor for overlay styles
+      if(mModel->IsMarkupProcessorEnabled() || mModel->IsSpannedTextPlaced())
+      {
+        if(mModel->IsMarkupUnderlineSet())
+        {
+          imageBuffer = ApplyUnderlineMarkupImageBuffer(imageBuffer, bufferWidth, bufferHeight, ignoreHorizontalAlignment, pixelFormat, penX, penY);
+        }
+
+        if(mModel->IsMarkupStrikethroughSet())
+        {
+          imageBuffer = ApplyStrikethroughMarkupImageBuffer(imageBuffer, bufferWidth, bufferHeight, ignoreHorizontalAlignment, pixelFormat, penX, penY);
+        }
+      }
+    }
   }
 
   // Create the final PixelData for the combined image buffer
@@ -752,18 +1089,18 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
   return pixelData;
 }
 
-Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth, const unsigned int bufferHeight, Typesetter::Style style, bool ignoreHorizontalAlignment, Pixel::Format pixelFormat, int horizontalOffset, int verticalOffset, GlyphIndex fromGlyphIndex, GlyphIndex toGlyphIndex)
+Devel::PixelBuffer Typesetter::CreateImageBuffer(const uint32_t bufferWidth, const uint32_t bufferHeight, const Typesetter::Style style, const bool ignoreHorizontalAlignment, const Pixel::Format pixelFormat, const int32_t horizontalOffset, const int32_t verticalOffset, const GlyphIndex fromGlyphIndex, const GlyphIndex toGlyphIndex)
 {
   // Retrieve lines, glyphs, positions and colors from the view model.
-  const Length            modelNumberOfLines = mModel->GetNumberOfLines();
-  const LineRun* const    modelLinesBuffer   = mModel->GetLines();
-  const GlyphInfo* const  glyphsBuffer       = mModel->GetGlyphs();
-  const Vector2* const    positionBuffer     = mModel->GetLayout();
-  const Vector4* const    colorsBuffer       = mModel->GetColors();
-  const ColorIndex* const colorIndexBuffer   = mModel->GetColorIndices();
-  const GlyphInfo*        hyphens            = mModel->GetHyphens();
-  const Length*           hyphenIndices      = mModel->GetHyphenIndices();
-  const Length            hyphensCount       = mModel->GetHyphensCount();
+  const Length modelNumberOfLines                       = mModel->GetNumberOfLines();
+  const LineRun* const __restrict__ modelLinesBuffer    = mModel->GetLines();
+  const GlyphInfo* const __restrict__ glyphsBuffer      = mModel->GetGlyphs();
+  const Vector2* const __restrict__ positionBuffer      = mModel->GetLayout();
+  const Vector4* const __restrict__ colorsBuffer        = mModel->GetColors();
+  const ColorIndex* const __restrict__ colorIndexBuffer = mModel->GetColorIndices();
+  const GlyphInfo* __restrict__ hyphens                 = mModel->GetHyphens();
+  const Length* __restrict__ hyphenIndices              = mModel->GetHyphenIndices();
+  const Length hyphensCount                             = mModel->GetHyphensCount();
 
   // Elided text info. Indices according to elided text and Ellipsis position.
   const auto startIndexOfGlyphs              = mModel->GetStartIndexOfElidedGlyphs();
@@ -781,30 +1118,31 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
   glyphData.verticalOffset   = verticalOffset;
   glyphData.width            = bufferWidth;
   glyphData.height           = bufferHeight;
-  glyphData.bitmapBuffer     = CreateImageBuffer(bufferWidth, bufferHeight, pixelFormat);
+  glyphData.bitmapBuffer     = CreateTransparentImageBuffer(bufferWidth, bufferHeight, pixelFormat);
   glyphData.horizontalOffset = 0;
 
   // Get a handle of the font client. Used to retrieve the bitmaps of the glyphs.
   TextAbstraction::FontClient fontClient  = TextAbstraction::FontClient::Get();
   Length                      hyphenIndex = 0;
 
+  const Character* __restrict__ textBuffer                       = mModel->GetTextBuffer();
+  float calculatedAdvance                                        = 0.f;
+  const Vector<CharacterIndex>& __restrict__ glyphToCharacterMap = mModel->GetGlyphsToCharacters();
+  const CharacterIndex* __restrict__ glyphToCharacterMapBuffer   = glyphToCharacterMap.Begin();
+
+  const DevelText::VerticalLineAlignment::Type verLineAlign = mModel->GetVerticalLineAlignment();
+
   // Traverses the lines of the text.
   for(LineIndex lineIndex = 0u; lineIndex < modelNumberOfLines; ++lineIndex)
   {
     const LineRun& line = *(modelLinesBuffer + lineIndex);
 
     // Sets the horizontal offset of the line.
-    glyphData.horizontalOffset = ignoreHorizontalAlignment ? 0 : static_cast<int>(line.alignmentOffset);
+    glyphData.horizontalOffset = ignoreHorizontalAlignment ? 0 : static_cast<int32_t>(line.alignmentOffset);
     glyphData.horizontalOffset += horizontalOffset;
 
     // Increases the vertical offset with the line's ascender.
-    glyphData.verticalOffset += static_cast<int>(line.ascender);
-
-    // Include line spacing after first line
-    if(lineIndex > 0u)
-    {
-      glyphData.verticalOffset += static_cast<int>(line.lineSpacing);
-    }
+    glyphData.verticalOffset += static_cast<int32_t>(line.ascender + GetPreOffsetVerticalLineAlignment(line, verLineAlign));
 
     // Retrieves the glyph's outline width
     float outlineWidth = static_cast<float>(mModel->GetOutlineWidth());
@@ -830,23 +1168,57 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
       }
     }
 
-    const bool     underlineEnabled = mModel->IsUnderlineEnabled();
-    const Vector4& underlineColor   = mModel->GetUnderlineColor();
-    const float    underlineHeight  = mModel->GetUnderlineHeight();
+    const bool  underlineEnabled      = mModel->IsUnderlineEnabled();
+    const bool  strikethroughEnabled  = mModel->IsStrikethroughEnabled();
+    const float modelCharacterSpacing = mModel->GetCharacterSpacing();
+
+    // Get the character-spacing runs.
+    const Vector<CharacterSpacingGlyphRun>& __restrict__ characterSpacingGlyphRuns = mModel->GetCharacterSpacingGlyphRuns();
+
+    // Aggregate underline-style-properties from mModel
+    const UnderlineStyleProperties modelUnderlineProperties{mModel->GetUnderlineType(),
+                                                            mModel->GetUnderlineColor(),
+                                                            mModel->GetUnderlineHeight(),
+                                                            mModel->GetDashedUnderlineGap(),
+                                                            mModel->GetDashedUnderlineWidth(),
+                                                            true,
+                                                            true,
+                                                            true,
+                                                            true,
+                                                            true};
+
+    // Aggregate strikethrough-style-properties from mModel
+    const StrikethroughStyleProperties modelStrikethroughProperties{mModel->GetStrikethroughColor(),
+                                                                    mModel->GetStrikethroughHeight(),
+                                                                    true,
+                                                                    true};
 
     // Get the underline runs.
-    const Length     numberOfUnderlineRuns = mModel->GetNumberOfUnderlineRuns();
-    Vector<GlyphRun> underlineRuns;
+    const Length               numberOfUnderlineRuns = mModel->GetNumberOfUnderlineRuns();
+    Vector<UnderlinedGlyphRun> underlineRuns;
     underlineRuns.Resize(numberOfUnderlineRuns);
     mModel->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
 
-    bool thereAreUnderlinedGlyphs = false;
+    // Get the strikethrough runs.
+    const Length                  numberOfStrikethroughRuns = mModel->GetNumberOfStrikethroughRuns();
+    Vector<StrikethroughGlyphRun> strikethroughRuns;
+    strikethroughRuns.Resize(numberOfStrikethroughRuns);
+    mModel->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+    bool thereAreUnderlinedGlyphs    = false;
+    bool thereAreStrikethroughGlyphs = false;
+
+    float currentUnderlinePosition   = 0.0f;
+    float currentUnderlineHeight     = modelUnderlineProperties.height;
+    float maxUnderlineHeight         = currentUnderlineHeight;
+    auto  currentUnderlineProperties = modelUnderlineProperties;
 
-    float currentUnderlinePosition  = 0.0f;
-    float currentUnderlineThickness = underlineHeight;
-    float maxUnderlineThickness     = currentUnderlineThickness;
+    float currentStrikethroughHeight     = modelStrikethroughProperties.height;
+    float maxStrikethroughHeight         = currentStrikethroughHeight;
+    auto  currentStrikethroughProperties = modelStrikethroughProperties;
+    float strikethroughStartingYPosition = 0.0f;
 
-    FontId lastUnderlinedFontId = 0;
+    FontId lastFontId = 0;
 
     float lineExtentLeft  = bufferWidth;
     float lineExtentRight = 0.0f;
@@ -854,18 +1226,12 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
     bool  addHyphen       = false;
 
     // Traverses the glyphs of the line.
-    const GlyphIndex startGlyphIndex = std::max(line.glyphRun.glyphIndex, startIndexOfGlyphs);
+    const GlyphIndex startGlyphIndex = std::max(std::max(line.glyphRun.glyphIndex, startIndexOfGlyphs), fromGlyphIndex);
     GlyphIndex       endGlyphIndex   = (line.isSplitToTwoHalves ? line.glyphRunSecondHalf.glyphIndex + line.glyphRunSecondHalf.numberOfGlyphs : line.glyphRun.glyphIndex + line.glyphRun.numberOfGlyphs) - 1u;
-    endGlyphIndex                    = std::min(endGlyphIndex, endIndexOfGlyphs);
+    endGlyphIndex                    = std::min(std::min(endGlyphIndex, endIndexOfGlyphs), toGlyphIndex);
 
     for(GlyphIndex glyphIndex = startGlyphIndex; glyphIndex <= endGlyphIndex; ++glyphIndex)
     {
-      if(glyphIndex < fromGlyphIndex || glyphIndex > toGlyphIndex)
-      {
-        // Ignore any glyph that out of the specified range
-        continue;
-      }
-
       //To handle START case of ellipsis, the first glyph has been shifted
       //glyphIndex represent indices in whole glyphs but elidedGlyphIndex represents indices in elided Glyphs
       GlyphIndex elidedGlyphIndex = glyphIndex - startIndexOfGlyphs;
@@ -905,24 +1271,52 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
         continue;
       }
 
-      const bool underlineGlyph = underlineEnabled || IsGlyphUnderlined(glyphIndex, underlineRuns);
-      thereAreUnderlinedGlyphs  = thereAreUnderlinedGlyphs || underlineGlyph;
+      Vector<UnderlinedGlyphRun>::ConstIterator currentUnderlinedGlyphRunIt = underlineRuns.End();
+      const bool                                underlineGlyph              = underlineEnabled || IsGlyphUnderlined(glyphIndex, underlineRuns, currentUnderlinedGlyphRunIt);
+      currentUnderlineProperties                                            = GetCurrentUnderlineProperties(glyphIndex, underlineGlyph, underlineRuns, currentUnderlinedGlyphRunIt, modelUnderlineProperties);
+      currentUnderlineHeight                                                = currentUnderlineProperties.height;
+      thereAreUnderlinedGlyphs                                              = thereAreUnderlinedGlyphs || underlineGlyph;
+
+      Vector<StrikethroughGlyphRun>::ConstIterator currentStrikethroughGlyphRunIt = strikethroughRuns.End();
+      const bool                                   strikethroughGlyph             = strikethroughEnabled || IsGlyphStrikethrough(glyphIndex, strikethroughRuns, currentStrikethroughGlyphRunIt);
+      currentStrikethroughProperties                                              = GetCurrentStrikethroughProperties(glyphIndex, strikethroughGlyph, strikethroughRuns, currentStrikethroughGlyphRunIt, modelStrikethroughProperties);
+      currentStrikethroughHeight                                                  = currentStrikethroughProperties.height;
+      thereAreStrikethroughGlyphs                                                 = thereAreStrikethroughGlyphs || strikethroughGlyph;
 
       // Are we still using the same fontId as previous
-      if(underlineGlyph && (glyphInfo->fontId != lastUnderlinedFontId))
+      if((glyphInfo->fontId != lastFontId) && (strikethroughGlyph || underlineGlyph))
       {
         // We need to fetch fresh font underline metrics
-        FetchFontUnderlineMetrics(fontClient, glyphInfo, currentUnderlinePosition, underlineHeight, currentUnderlineThickness, maxUnderlineThickness, lastUnderlinedFontId);
-      } // underline
+        FontMetrics fontMetrics;
+        fontClient.GetFontMetrics(glyphInfo->fontId, fontMetrics);
+
+        //The currentUnderlinePosition will be used for both Underline and/or Strikethrough
+        currentUnderlinePosition = FetchUnderlinePositionFromFontMetrics(fontMetrics);
+
+        if(underlineGlyph)
+        {
+          CalcualteUnderlineHeight(fontMetrics, currentUnderlineHeight, maxUnderlineHeight);
+        }
+
+        if(strikethroughGlyph)
+        {
+          CalcualteStrikethroughHeight(currentStrikethroughHeight, maxStrikethroughHeight);
+        }
+
+        // Update lastFontId because fontId is changed
+        lastFontId = glyphInfo->fontId; // Prevents searching for existing blocksizes when string of the same fontId.
+      }
 
       // Retrieves the glyph's position.
       Vector2 position = *(positionBuffer + elidedGlyphIndex);
 
       if(addHyphen)
       {
-        GlyphInfo tempInfo = *(glyphsBuffer + elidedGlyphIndex);
-        position.x         = position.x + tempInfo.advance - tempInfo.xBearing + glyphInfo->xBearing;
-        position.y         = -glyphInfo->yBearing;
+        GlyphInfo   tempInfo         = *(glyphsBuffer + elidedGlyphIndex);
+        const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+        calculatedAdvance            = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + elidedGlyphIndex))), characterSpacing, tempInfo.advance);
+        position.x                   = position.x + calculatedAdvance - tempInfo.xBearing + glyphInfo->xBearing;
+        position.y                   = -glyphInfo->yBearing;
       }
 
       if(baseline < position.y + glyphInfo->yBearing)
@@ -974,14 +1368,14 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
         outlineWidth = 0.0f;
       }
 
-      if(style != Typesetter::STYLE_UNDERLINE)
+      if(style != Typesetter::STYLE_UNDERLINE && style != Typesetter::STYLE_STRIKETHROUGH)
       {
         fontClient.CreateBitmap(glyphInfo->fontId,
                                 glyphInfo->index,
                                 glyphInfo->isItalicRequired,
                                 glyphInfo->isBoldRequired,
                                 glyphData.glyphBitmap,
-                                static_cast<int>(outlineWidth));
+                                static_cast<int32_t>(outlineWidth));
       }
 
       // Sets the glyph's bitmap into the bitmap of the whole text.
@@ -1008,8 +1402,12 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
           glyphData.verticalOffset += glyphData.glyphBitmap.outlineOffsetY;
         }
 
-        // delete the glyphBitmap.buffer as it is now copied into glyphData.bitmapBuffer
-        delete[] glyphData.glyphBitmap.buffer;
+        // free the glyphBitmap.buffer if it is owner of buffer
+        if(glyphData.glyphBitmap.isBufferOwned)
+        {
+          free(glyphData.glyphBitmap.buffer);
+          glyphData.glyphBitmap.isBufferOwned = false;
+        }
         glyphData.glyphBitmap.buffer = NULL;
       }
 
@@ -1031,7 +1429,7 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
     // Draw the underline from the leftmost glyph to the rightmost glyph
     if(thereAreUnderlinedGlyphs && style == Typesetter::STYLE_UNDERLINE)
     {
-      DrawUnderline(underlineColor, bufferWidth, bufferHeight, glyphData, baseline, currentUnderlinePosition, maxUnderlineThickness, lineExtentLeft, lineExtentRight);
+      DrawUnderline(bufferWidth, bufferHeight, glyphData, baseline, currentUnderlinePosition, maxUnderlineHeight, lineExtentLeft, lineExtentRight, modelUnderlineProperties, currentUnderlineProperties, line);
     }
 
     // Draw the background color from the leftmost glyph to the rightmost glyph
@@ -1040,112 +1438,80 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth,
       DrawBackgroundColor(mModel->GetBackgroundColor(), bufferWidth, bufferHeight, glyphData, baseline, line, lineExtentLeft, lineExtentRight);
     }
 
-    // Increases the vertical offset with the line's descender.
-    glyphData.verticalOffset += static_cast<int>(-line.descender);
+    // Draw the strikethrough from the leftmost glyph to the rightmost glyph
+    if(thereAreStrikethroughGlyphs && style == Typesetter::STYLE_STRIKETHROUGH)
+    {
+      //TODO : The currently implemented strikethrough creates a strikethrough on the line level. We need to create different strikethroughs the case of glyphs with different sizes.
+      strikethroughStartingYPosition = (glyphData.verticalOffset + baseline + currentUnderlinePosition) - ((line.ascender) * HALF); // Since Free Type font doesn't contain the strikethrough-position property, strikethrough position will be calculated by moving the underline position upwards by half the value of the line height.
+      DrawStrikethrough(bufferWidth, bufferHeight, glyphData, baseline, strikethroughStartingYPosition, maxStrikethroughHeight, lineExtentLeft, lineExtentRight, modelStrikethroughProperties, currentStrikethroughProperties, line);
+    }
+
+    // Increases the vertical offset with the line's descender & line spacing.
+    glyphData.verticalOffset += static_cast<int32_t>(-line.descender + GetPostOffsetVerticalLineAlignment(line, verLineAlign));
   }
 
   return glyphData.bitmapBuffer;
 }
 
-Devel::PixelBuffer Typesetter::CombineImageBuffer(Devel::PixelBuffer topPixelBuffer, Devel::PixelBuffer bottomPixelBuffer, const unsigned int bufferWidth, const unsigned int bufferHeight)
+Devel::PixelBuffer Typesetter::ApplyUnderlineMarkupImageBuffer(Devel::PixelBuffer topPixelBuffer, const uint32_t bufferWidth, const uint32_t bufferHeight, const bool ignoreHorizontalAlignment, const Pixel::Format pixelFormat, const int32_t horizontalOffset, const int32_t verticalOffset)
 {
-  unsigned char* topBuffer    = topPixelBuffer.GetBuffer();
-  unsigned char* bottomBuffer = bottomPixelBuffer.GetBuffer();
-
-  Devel::PixelBuffer combinedPixelBuffer;
-
-  if(topBuffer == NULL && bottomBuffer == NULL)
+  // Underline-tags (this is for Markup case)
+  // Get the underline runs.
+  const Length               numberOfUnderlineRuns = mModel->GetNumberOfUnderlineRuns();
+  Vector<UnderlinedGlyphRun> underlineRuns;
+  underlineRuns.Resize(numberOfUnderlineRuns);
+  mModel->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+
+  // Iterate on the consecutive underlined glyph run and connect them into one chunk of underlined characters.
+  Vector<UnderlinedGlyphRun>::ConstIterator itGlyphRun    = underlineRuns.Begin();
+  Vector<UnderlinedGlyphRun>::ConstIterator endItGlyphRun = underlineRuns.End();
+  GlyphIndex                                startGlyphIndex, endGlyphIndex;
+
+  //The outer loop to iterate on the separated chunks of underlined glyph runs
+  while(itGlyphRun != endItGlyphRun)
   {
-    // Nothing to do if both buffers are empty.
-    return combinedPixelBuffer;
-  }
+    startGlyphIndex = itGlyphRun->glyphRun.glyphIndex;
+    endGlyphIndex   = startGlyphIndex + itGlyphRun->glyphRun.numberOfGlyphs - 1;
 
-  if(topBuffer == NULL)
-  {
-    // Nothing to do if topBuffer is empty.
-    return bottomPixelBuffer;
-  }
+    // Create the image buffer for underline
+    Devel::PixelBuffer underlineImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_UNDERLINE, ignoreHorizontalAlignment, pixelFormat, horizontalOffset, verticalOffset, startGlyphIndex, endGlyphIndex);
+    // Combine the two buffers
+    // Result pixel buffer will be stored into topPixelBuffer.
+    CombineImageBuffer(underlineImageBuffer, topPixelBuffer, bufferWidth, bufferHeight, false);
 
-  if(bottomBuffer == NULL)
-  {
-    // Nothing to do if bottomBuffer is empty.
-    return topPixelBuffer;
+    itGlyphRun++;
   }
 
-  // Always combine two RGBA images
-  const unsigned int bufferSizeInt  = bufferWidth * bufferHeight;
-  const unsigned int bufferSizeChar = 4u * bufferSizeInt;
-
-  combinedPixelBuffer     = Devel::PixelBuffer::New(bufferWidth, bufferHeight, Pixel::RGBA8888);
-  uint8_t* combinedBuffer = reinterpret_cast<uint8_t*>(combinedPixelBuffer.GetBuffer());
-  memset(combinedBuffer, 0u, bufferSizeChar);
-
-  for(unsigned int pixelIndex = 0; pixelIndex < bufferSizeInt; pixelIndex++)
-  {
-    // If the alpha of the pixel in either buffer is not fully opaque, blend the two pixels.
-    // Otherwise, copy pixel from topBuffer to combinedBuffer.
-
-    unsigned int alphaBuffer1 = topBuffer[pixelIndex * 4 + 3];
-
-    if(alphaBuffer1 != 255)
-    {
-      // At least one pixel is not fully opaque
-      // "Over" blend the the pixel from topBuffer with the pixel in bottomBuffer
-      combinedBuffer[pixelIndex * 4]     = topBuffer[pixelIndex * 4] + (bottomBuffer[pixelIndex * 4] * (255 - topBuffer[pixelIndex * 4 + 3]) / 255);
-      combinedBuffer[pixelIndex * 4 + 1] = topBuffer[pixelIndex * 4 + 1] + (bottomBuffer[pixelIndex * 4 + 1] * (255 - topBuffer[pixelIndex * 4 + 3]) / 255);
-      combinedBuffer[pixelIndex * 4 + 2] = topBuffer[pixelIndex * 4 + 2] + (bottomBuffer[pixelIndex * 4 + 2] * (255 - topBuffer[pixelIndex * 4 + 3]) / 255);
-      combinedBuffer[pixelIndex * 4 + 3] = topBuffer[pixelIndex * 4 + 3] + (bottomBuffer[pixelIndex * 4 + 3] * (255 - topBuffer[pixelIndex * 4 + 3]) / 255);
-    }
-    else
-    {
-      // Copy the pixel from topBuffer to combinedBuffer
-      combinedBuffer[pixelIndex * 4]     = topBuffer[pixelIndex * 4];
-      combinedBuffer[pixelIndex * 4 + 1] = topBuffer[pixelIndex * 4 + 1];
-      combinedBuffer[pixelIndex * 4 + 2] = topBuffer[pixelIndex * 4 + 2];
-      combinedBuffer[pixelIndex * 4 + 3] = topBuffer[pixelIndex * 4 + 3];
-    }
-  }
-
-  return combinedPixelBuffer;
+  return topPixelBuffer;
 }
 
-Devel::PixelBuffer Typesetter::ApplyMarkupProcessorOnPixelBuffer(Devel::PixelBuffer topPixelBuffer, const unsigned int bufferWidth, const unsigned int bufferHeight, bool ignoreHorizontalAlignment, Pixel::Format pixelFormat, int horizontalOffset, int verticalOffset)
+Devel::PixelBuffer Typesetter::ApplyStrikethroughMarkupImageBuffer(Devel::PixelBuffer topPixelBuffer, const uint32_t bufferWidth, const uint32_t bufferHeight, const bool ignoreHorizontalAlignment, const Pixel::Format pixelFormat, const int32_t horizontalOffset, const int32_t verticalOffset)
 {
-  // Apply the markup-Processor if enabled
-  const bool markupProcessorEnabled = mModel->IsMarkupProcessorEnabled();
-  if(markupProcessorEnabled)
+  // strikethrough-tags (this is for Markup case)
+  // Get the strikethrough runs.
+  const Length                  numberOfStrikethroughRuns = mModel->GetNumberOfStrikethroughRuns();
+  Vector<StrikethroughGlyphRun> strikethroughRuns;
+  strikethroughRuns.Resize(numberOfStrikethroughRuns);
+  mModel->GetStrikethroughRuns(strikethroughRuns.Begin(), 0u, numberOfStrikethroughRuns);
+
+  // Iterate on the consecutive strikethrough glyph run and connect them into one chunk of strikethrough characters.
+  Vector<StrikethroughGlyphRun>::ConstIterator itGlyphRun    = strikethroughRuns.Begin();
+  Vector<StrikethroughGlyphRun>::ConstIterator endItGlyphRun = strikethroughRuns.End();
+  GlyphIndex                                   startGlyphIndex, endGlyphIndex;
+
+  //The outer loop to iterate on the separated chunks of strikethrough glyph runs
+  while(itGlyphRun != endItGlyphRun)
   {
-    // Underline-tags (this is for Markup case)
-    // Get the underline runs.
-    const Length     numberOfUnderlineRuns = mModel->GetNumberOfUnderlineRuns();
-    Vector<GlyphRun> underlineRuns;
-    underlineRuns.Resize(numberOfUnderlineRuns);
-    mModel->GetUnderlineRuns(underlineRuns.Begin(), 0u, numberOfUnderlineRuns);
+    startGlyphIndex = itGlyphRun->glyphRun.glyphIndex;
+    endGlyphIndex   = startGlyphIndex + itGlyphRun->glyphRun.numberOfGlyphs - 1;
 
-    // Iterate on the consecutive underlined glyph run and connect them into one chunk of underlined characters.
-    Vector<GlyphRun>::ConstIterator itGlyphRun    = underlineRuns.Begin();
-    Vector<GlyphRun>::ConstIterator endItGlyphRun = underlineRuns.End();
-    GlyphIndex                      startGlyphIndex, endGlyphIndex;
+    // Create the image buffer for strikethrough
+    Devel::PixelBuffer strikethroughImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_STRIKETHROUGH, ignoreHorizontalAlignment, pixelFormat, horizontalOffset, verticalOffset, startGlyphIndex, endGlyphIndex);
+    // Combine the two buffers
+    // Result pixel buffer will be stored into topPixelBuffer.
+    CombineImageBuffer(strikethroughImageBuffer, topPixelBuffer, bufferWidth, bufferHeight, false);
 
-    //The outer loop to iterate on the separated chunks of underlined glyph runs
-    while(itGlyphRun != endItGlyphRun)
-    {
-      startGlyphIndex = itGlyphRun->glyphIndex;
-      endGlyphIndex   = startGlyphIndex;
-      //The inner loop to make a connected underline for the consecutive characters
-      do
-      {
-        endGlyphIndex += itGlyphRun->numberOfGlyphs;
-        itGlyphRun++;
-      } while(itGlyphRun != endItGlyphRun && itGlyphRun->glyphIndex == endGlyphIndex);
-
-      endGlyphIndex--;
-
-      // Create the image buffer for underline
-      Devel::PixelBuffer underlineImageBuffer = CreateImageBuffer(bufferWidth, bufferHeight, Typesetter::STYLE_UNDERLINE, ignoreHorizontalAlignment, pixelFormat, horizontalOffset, verticalOffset, startGlyphIndex, endGlyphIndex);
-      // Combine the two buffers
-      topPixelBuffer = CombineImageBuffer(topPixelBuffer, underlineImageBuffer, bufferWidth, bufferHeight);
-    }
+    itGlyphRun++;
   }
 
   return topPixelBuffer;
diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.h b/dali-toolkit/internal/text/rendering/text-typesetter.h
index ee57e29..296126e 100644
--- a/dali-toolkit/internal/text/rendering/text-typesetter.h
+++ b/dali-toolkit/internal/text/rendering/text-typesetter.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_TYPESETTER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,9 +51,10 @@ public:
   enum RenderBehaviour
   {
     RENDER_TEXT_AND_STYLES, ///< Render both the text and its styles
-    RENDER_NO_TEXT,         ///< Do not render the text itself
+    RENDER_NO_TEXT,         ///< Do not render the text itself but render the background styles such as outline and background.
     RENDER_NO_STYLES,       ///< Do not render any styles
-    RENDER_MASK             ///< Render an alpha mask (for color glyphs with no color animation, e.g. emoji)
+    RENDER_MASK,            ///< Render an alpha mask (for color glyphs with no color animation, e.g. emoji)
+    RENDER_OVERLAY_STYLE    ///< Do not render the text itself but render the style but overlay the style on the text (foreground styles such as strikethrough and underline)
   };
 
   /**
@@ -61,13 +62,14 @@ public:
    */
   enum Style
   {
-    STYLE_NONE,        ///< No style
-    STYLE_MASK,        ///< Alpha mask
-    STYLE_SHADOW,      ///< Hard shadow
-    STYLE_SOFT_SHADOW, ///< Soft shadow
-    STYLE_UNDERLINE,   ///< Underline
-    STYLE_OUTLINE,     ///< Outline
-    STYLE_BACKGROUND   ///< Text background
+    STYLE_NONE,         ///< No style
+    STYLE_MASK,         ///< Alpha mask
+    STYLE_SHADOW,       ///< Hard shadow
+    STYLE_SOFT_SHADOW,  ///< Soft shadow
+    STYLE_UNDERLINE,    ///< Underline
+    STYLE_OUTLINE,      ///< Outline
+    STYLE_BACKGROUND,   ///< Text background
+    STYLE_STRIKETHROUGH ///< Strikethrough
   };
 
 public: // Constructor.
@@ -142,48 +144,37 @@ private:
    *
    * @return An image buffer with the text.
    */
-  Devel::PixelBuffer CreateImageBuffer(const unsigned int bufferWidth, const unsigned int bufferHeight, Typesetter::Style style, bool ignoreHorizontalAlignment, Pixel::Format pixelFormat, int horizontalOffset, int verticalOffset, TextAbstraction::GlyphIndex fromGlyphIndex, TextAbstraction::GlyphIndex toGlyphIndex);
+  Devel::PixelBuffer CreateImageBuffer(const uint32_t bufferWidth, const uint32_t bufferHeight, const Typesetter::Style style, const bool ignoreHorizontalAlignment, const Pixel::Format pixelFormat, const int32_t horizontalOffset, const int32_t verticalOffset, const TextAbstraction::GlyphIndex fromGlyphIndex, const TextAbstraction::GlyphIndex toGlyphIndex);
 
   /**
-   * @brief Create an initialized image buffer.
+   * @brief Apply markup underline tags.
    *
-   * Creates the pixel data used to generate the final image with the given size.
-   *
-   * @param[in] bufferWidth The width of the image buffer.
-   * @param[in] bufferHeight The height of the image buffer.
-   * @param[in] pixelFormat The format of the pixel in the image that the text is rendered as (i.e. either Pixel::BGRA8888 or Pixel::L8).
-   *
-   * @return An image buffer.
-   */
-  Devel::PixelBuffer CreateImageBuffer(const unsigned int bufferWidth, const unsigned int bufferHeight, Pixel::Format pixelFormat);
-
-  /**
-   * @brief Combine the two RGBA image buffers together.
-   *
-   * The top layer buffer will blend over the bottom layer buffer:
-   * - If the pixel is not fully opaque from either buffer, it will be blended with
-   *   the pixel from the other buffer and copied to the combined buffer.
-   * - If the pixels from both buffers are fully opaque, the pixels from the top layer
-   *   buffer will be copied to the combined buffer.
+   * The properties on TextLabel override the behavior of Markup.
+   * Because the markup will be the bottom layer buffer
+   *  - i.e: If you set property UNDERLINE to enabled and blue.
+   *    And the TEXT is "<color value='green'>Hello</color> <u>World</u> <i>Hello</i> <b>World</b>".
+   *    Then the output of the whole text is underlined by blue line.
    *
    * @param[in] topPixelBuffer The top layer buffer.
-   * @param[in] bottomPixelBuffer The bottom layer buffer.
    * @param[in] bufferWidth The width of the image buffer.
    * @param[in] bufferHeight The height of the image buffer.
+   * @param[in] ignoreHorizontalAlignment Whether to ignore the horizontal alignment, not ignored by default.
+   * @param[in] pixelFormat The format of the pixel in the image that the text is rendered as (i.e. either Pixel::BGRA8888 or Pixel::L8).
+   * @param[in] horizontalOffset The horizontal offset to be added to the glyph's position.
+   * @param[in] verticalOffset The vertical offset to be added to the glyph's position.
    *
-   * @return The combined image buffer with the text.
-   *
+   * @return The image buffer with the markup.
    */
-  Devel::PixelBuffer CombineImageBuffer(Devel::PixelBuffer topPixelBuffer, Devel::PixelBuffer bottomPixelBuffer, const unsigned int bufferWidth, const unsigned int bufferHeightbool);
+  Devel::PixelBuffer ApplyUnderlineMarkupImageBuffer(Devel::PixelBuffer topPixelBuffer, const uint32_t bufferWidth, const uint32_t bufferHeight, const bool ignoreHorizontalAlignment, const Pixel::Format pixelFormat, const int32_t horizontalOffset, const int32_t verticalOffset);
 
   /**
-   * @brief Apply behaviour of tags if the markup-processor is enabled.
+   * @brief Apply markup strikethrough tags.
    *
    * The properties on TextLabel override the behavior of Markup.
    * Because the markup will be the bottom layer buffer
-   *  - i.e: If you set property UNDERLINE to enabled and blue.
-   *    And the TEXT is "<color value='green'>Hello</color> <u>World</u> <i>Hello</i> <b>World</b>".
-   *    Then the output of the whole text is underlined by blue line.
+   *  - i.e: If you set property STRIKETHROUGH to enabled and blue.
+   *    And the TEXT is "<color value='green'>Hello</color> <s>World</s> <i>Hello</i> <b>World</b>".
+   *    Then the whole text will have a blue line strikethrough.
    *
    * @param[in] topPixelBuffer The top layer buffer.
    * @param[in] bufferWidth The width of the image buffer.
@@ -195,7 +186,7 @@ private:
    *
    * @return The image buffer with the markup.
    */
-  Devel::PixelBuffer ApplyMarkupProcessorOnPixelBuffer(Devel::PixelBuffer topPixelBuffer, const unsigned int bufferWidth, const unsigned int bufferHeight, bool ignoreHorizontalAlignment, Pixel::Format pixelFormat, int horizontalOffset, int verticalOffset);
+  Devel::PixelBuffer ApplyStrikethroughMarkupImageBuffer(Devel::PixelBuffer topPixelBuffer, const uint32_t bufferWidth, const uint32_t bufferHeight, const bool ignoreHorizontalAlignment, const Pixel::Format pixelFormat, const int32_t horizontalOffset, const int32_t verticalOffset);
 
 protected:
   /**
@@ -215,4 +206,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_TOOLKIT_TEXT_TYPESETTER_H
+#endif // DALI_TOOLKIT_TEXT_TYPESETTER_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.cpp b/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.cpp
index 6ff571a..d0e04c3 100644
--- a/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.cpp
+++ b/dali-toolkit/internal/text/rendering/vector-based/glyphy-shader/glyphy-shader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,8 @@ GlyphyShader GlyphyShader::New(const Dali::Vector4& atlasInfo)
 
   Shader shaderEffectCustom = Shader::New(vertexShaderStringStream.str(),
                                           fragmentShaderStringStream.str(),
-                                          Shader::Hint::OUTPUT_IS_TRANSPARENT);
+                                          Shader::Hint::OUTPUT_IS_TRANSPARENT,
+                                          "GLYPHY_SHADER");
 
   GlyphyShader handle(shaderEffectCustom);
 
diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h
index d58848a..822ea3d 100644
--- a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h
+++ b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VECTOR_BLOB_ATLAS_SHARE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,6 +70,13 @@ public:
    */
   VectorBlobAtlas* GetNewAtlas();
 
+public:
+  // Default copy and move operator
+  VectorBlobAtlasShare(const VectorBlobAtlasShare& rhs) = default;
+  VectorBlobAtlasShare(VectorBlobAtlasShare&& rhs)      = default;
+  VectorBlobAtlasShare& operator=(const VectorBlobAtlasShare& rhs) = default;
+  VectorBlobAtlasShare& operator=(VectorBlobAtlasShare&& rhs) = default;
+
 private:
   class Impl;
 
diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp
index 0f11c11..d71b641 100644
--- a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp
+++ b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp
@@ -188,7 +188,7 @@ void VectorBlobAtlas::TexSubImage(unsigned int offsetX,
                                   unsigned int height,
                                   VectorBlob*  blob)
 {
-  const size_t size   = width * height * 4;
+  const size_t size   = static_cast<size_t>(width) * static_cast<size_t>(height) * 4;
   uint8_t*     pixbuf = new uint8_t[size];
 
   size_t pos;
diff --git a/dali-toolkit/internal/text/rendering/view-model.cpp b/dali-toolkit/internal/text/rendering/view-model.cpp
index 35c0a87..3799fc9 100644
--- a/dali-toolkit/internal/text/rendering/view-model.cpp
+++ b/dali-toolkit/internal/text/rendering/view-model.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include <memory.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 #include <dali-toolkit/internal/text/line-run.h>
 
 namespace Dali
@@ -92,7 +93,7 @@ Length ViewModel::GetNumberOfLines() const
   return mModel->GetNumberOfLines();
 }
 
-const LineRun* const ViewModel::GetLines() const
+const LineRun* ViewModel::GetLines() const
 {
   return mModel->GetLines();
 }
@@ -102,11 +103,16 @@ Length ViewModel::GetNumberOfScripts() const
   return mModel->GetNumberOfScripts();
 }
 
-const ScriptRun* const ViewModel::GetScriptRuns() const
+const ScriptRun* ViewModel::GetScriptRuns() const
 {
   return mModel->GetScriptRuns();
 }
 
+Length ViewModel::GetNumberOfCharacters() const
+{
+  return mModel->GetNumberOfCharacters();
+}
+
 Length ViewModel::GetNumberOfGlyphs() const
 {
   if(mIsTextElided && mModel->IsTextElideEnabled())
@@ -161,7 +167,7 @@ GlyphIndex ViewModel::GetSecondMiddleIndexOfElidedGlyphs() const
   return mModel->GetSecondMiddleIndexOfElidedGlyphs();
 }
 
-const GlyphInfo* const ViewModel::GetGlyphs() const
+const GlyphInfo* ViewModel::GetGlyphs() const
 {
   if(mIsTextElided && mModel->IsTextElideEnabled())
   {
@@ -175,7 +181,7 @@ const GlyphInfo* const ViewModel::GetGlyphs() const
   return NULL;
 }
 
-const Vector2* const ViewModel::GetLayout() const
+const Vector2* ViewModel::GetLayout() const
 {
   if(mIsTextElided && mModel->IsTextElideEnabled())
   {
@@ -189,27 +195,27 @@ const Vector2* const ViewModel::GetLayout() const
   return NULL;
 }
 
-const Vector4* const ViewModel::GetColors() const
+const Vector4* ViewModel::GetColors() const
 {
   return mModel->GetColors();
 }
 
-const ColorIndex* const ViewModel::GetColorIndices() const
+const ColorIndex* ViewModel::GetColorIndices() const
 {
   return mModel->GetColorIndices();
 }
 
-const Vector4* const ViewModel::GetBackgroundColors() const
+const Vector4* ViewModel::GetBackgroundColors() const
 {
   return mModel->GetBackgroundColors();
 }
 
-const ColorIndex* const ViewModel::GetBackgroundColorIndices() const
+const ColorIndex* ViewModel::GetBackgroundColorIndices() const
 {
   return mModel->GetBackgroundColorIndices();
 }
 
-bool const ViewModel::IsMarkupBackgroundColorSet() const
+bool ViewModel::IsMarkupBackgroundColorSet() const
 {
   return mModel->IsMarkupBackgroundColorSet();
 }
@@ -244,17 +250,37 @@ bool ViewModel::IsUnderlineEnabled() const
   return mModel->IsUnderlineEnabled();
 }
 
+bool ViewModel::IsMarkupUnderlineSet() const
+{
+  return mModel->IsMarkupUnderlineSet();
+}
+
 float ViewModel::GetUnderlineHeight() const
 {
   return mModel->GetUnderlineHeight();
 }
 
+Text::Underline::Type ViewModel::GetUnderlineType() const
+{
+  return mModel->GetUnderlineType();
+}
+
+float ViewModel::GetDashedUnderlineWidth() const
+{
+  return mModel->GetDashedUnderlineWidth();
+}
+
+float ViewModel::GetDashedUnderlineGap() const
+{
+  return mModel->GetDashedUnderlineGap();
+}
+
 Length ViewModel::GetNumberOfUnderlineRuns() const
 {
   return mModel->GetNumberOfUnderlineRuns();
 }
 
-void ViewModel::GetUnderlineRuns(GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const
+void ViewModel::GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const
 {
   mModel->GetUnderlineRuns(underlineRuns, index, numberOfRuns);
 }
@@ -284,6 +310,11 @@ bool ViewModel::IsMarkupProcessorEnabled() const
   return mModel->IsMarkupProcessorEnabled();
 }
 
+bool ViewModel::IsSpannedTextPlaced() const
+{
+  return mModel->IsSpannedTextPlaced();
+}
+
 const GlyphInfo* ViewModel::GetHyphens() const
 {
   return mModel->GetHyphens();
@@ -299,13 +330,33 @@ Length ViewModel::GetHyphensCount() const
   return mModel->GetHyphensCount();
 }
 
+float ViewModel::GetCharacterSpacing() const
+{
+  return mModel->GetCharacterSpacing();
+}
+
+const Character* ViewModel::GetTextBuffer() const
+{
+  return mModel->GetTextBuffer();
+}
+
+const Vector<CharacterIndex>& ViewModel::GetGlyphsToCharacters() const
+{
+  return mModel->GetGlyphsToCharacters();
+}
+
 void ViewModel::ElideGlyphs()
 {
   mIsTextElided             = false;
   mStartIndexOfElidedGlyphs = mFirstMiddleIndexOfElidedGlyphs = mSecondMiddleIndexOfElidedGlyphs = 0;
   mEndIndexOfElidedGlyphs                                                                        = mModel->GetNumberOfGlyphs() - 1u;
 
-  auto ellipsisPosition = GetEllipsisPosition();
+  auto                          ellipsisPosition          = GetEllipsisPosition();
+  auto                          characterSpacing          = GetCharacterSpacing();
+  const Character*              textBuffer                = GetTextBuffer();
+  const Vector<CharacterIndex>& glyphToCharacterMap       = GetGlyphsToCharacters();
+  const CharacterIndex*         glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
+  float                         calculatedAdvance         = 0.f;
 
   if(IsTextElideEnabled())
   {
@@ -449,7 +500,7 @@ void ViewModel::ElideGlyphs()
               // Need to reshape the glyph as the font may be different in size.
               const GlyphInfo& ellipsisGlyph = fontClient.GetEllipsisGlyph(fontClient.GetPointSize(glyphToRemove.fontId));
 
-              if(!firstPenSet)
+              if(!firstPenSet || EqualsZero(glyphToRemove.advance))
               {
                 const Vector2& position = *(elidedPositionsBuffer + indexOfEllipsis);
 
@@ -469,7 +520,8 @@ void ViewModel::ElideGlyphs()
                 firstPenSet = true;
               }
 
-              removedGlypsWidth += std::min(glyphToRemove.advance, (glyphToRemove.xBearing + glyphToRemove.width));
+              calculatedAdvance = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + indexOfEllipsis))), characterSpacing, glyphToRemove.advance);
+              removedGlypsWidth += std::min(calculatedAdvance, (glyphToRemove.xBearing + glyphToRemove.width));
 
               // Calculate the width of the ellipsis glyph and check if it fits.
               const float ellipsisGlyphWidth = ellipsisGlyph.width + ellipsisGlyph.xBearing;
@@ -487,7 +539,71 @@ void ViewModel::ElideGlyphs()
                 // Change the 'x' and 'y' position of the ellipsis glyph.
                 if(position.x > firstPenX)
                 {
-                  position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
+                  if(isTailMode)
+                  {
+                    // To handle case of the mixed languages (LTR then RTL) with
+                    // EllipsisPosition::END and the LayoutDirection::RIGHT_TO_LEFT
+                    float nextXPositions = ellipsisLine->width;
+                    if(indexOfEllipsis + 1u < numberOfGlyphs)
+                    {
+                      Vector2& positionOfNextGlyph = *(elidedPositionsBuffer + indexOfEllipsis + 1u);
+                      nextXPositions               = positionOfNextGlyph.x;
+                    }
+
+                    if(position.x > nextXPositions) // RTL language
+                    {
+                      if((indexOfEllipsis > 0u) && ((position.x - nextXPositions) > removedGlypsWidth))
+                      {
+                        // To handle mixed directions
+                        // Re-calculates the first penX which will be used if rtl text is elided.
+                        firstPenX = position.x - glyphToRemove.xBearing;
+                        if(firstPenX < -ellipsisGlyph.xBearing)
+                        {
+                          // Avoids to exceed the bounding box when rtl text is elided.
+                          firstPenX = -ellipsisGlyph.xBearing;
+                        }
+                        //Reset the width of removed glyphs
+                        removedGlypsWidth = std::min(calculatedAdvance, (glyphToRemove.xBearing + glyphToRemove.width)) - ellipsisGlyph.xBearing;
+
+                        --indexOfEllipsis;
+                        continue;
+                      }
+                      else
+                      {
+                        // To handle the case of RTL language with EllipsisPosition::END
+                        position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
+                      }
+                    }
+                  }
+                  else
+                  {
+                    // To handle the case of LTR language with EllipsisPosition::START
+                    position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
+                  }
+                }
+                else
+                {
+                  if(!isTailMode)
+                  {
+                    // To handle case of the mixed languages (RTL then LTR) with
+                    // EllipsisPosition::START and the LayoutDirection::RIGHT_TO_LEFT
+                    float nextXPositions = ellipsisLine->width;
+                    if(indexOfEllipsis + 1u < numberOfGlyphs)
+                    {
+                      Vector2& positionOfNextGlyph = *(elidedPositionsBuffer + indexOfEllipsis + 1u);
+                      nextXPositions               = positionOfNextGlyph.x;
+                    }
+
+                    if(position.x < nextXPositions) // LTR language
+                    {
+                      position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
+
+                      if((position.x + ellipsisGlyphWidth + ellipsisGlyph.xBearing) > nextXPositions)
+                      {
+                        position.x -= (position.x + ellipsisGlyphWidth + ellipsisGlyph.xBearing) - nextXPositions;
+                      }
+                    }
+                  }
                 }
 
                 position.x += ellipsisGlyph.xBearing;
@@ -583,6 +699,66 @@ void ViewModel::ElideGlyphs()
   }
 }
 
+float ViewModel::GetStrikethroughHeight() const
+{
+  return mModel->GetStrikethroughHeight();
+}
+
+const Vector4& ViewModel::GetStrikethroughColor() const
+{
+  return mModel->GetStrikethroughColor();
+}
+
+bool ViewModel::IsStrikethroughEnabled() const
+{
+  return mModel->IsStrikethroughEnabled();
+}
+
+bool ViewModel::IsMarkupStrikethroughSet() const
+{
+  return mModel->IsMarkupStrikethroughSet();
+}
+
+Length ViewModel::GetNumberOfStrikethroughRuns() const
+{
+  return mModel->GetNumberOfStrikethroughRuns();
+}
+
+void ViewModel::GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns, StrikethroughRunIndex index, Length numberOfRuns) const
+{
+  mModel->GetStrikethroughRuns(strikethroughRuns, index, numberOfRuns);
+}
+
+Length ViewModel::GetNumberOfBoundedParagraphRuns() const
+{
+  return mModel->GetNumberOfBoundedParagraphRuns();
+}
+
+const Vector<BoundedParagraphRun>& ViewModel::GetBoundedParagraphRuns() const
+{
+  return mModel->GetBoundedParagraphRuns();
+}
+
+Length ViewModel::GetNumberOfCharacterSpacingGlyphRuns() const
+{
+  return mModel->GetNumberOfCharacterSpacingGlyphRuns();
+}
+
+const Vector<CharacterSpacingGlyphRun>& ViewModel::GetCharacterSpacingGlyphRuns() const
+{
+  return mModel->GetCharacterSpacingGlyphRuns();
+}
+
+const Vector<FontRun>& ViewModel::GetFontRuns() const
+{
+  return mModel->GetFontRuns();
+}
+
+const Vector<FontDescriptionRun>& ViewModel::GetFontDescriptionRuns() const
+{
+  return mModel->GetFontDescriptionRuns();
+}
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/text/rendering/view-model.h b/dali-toolkit/internal/text/rendering/view-model.h
index fd83b62..4de580d 100644
--- a/dali-toolkit/internal/text/rendering/view-model.h
+++ b/dali-toolkit/internal/text/rendering/view-model.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_VIEW_MODEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
 #include <dali-toolkit/internal/text/text-model-interface.h>
 #include <dali-toolkit/public-api/text/text-enumerations.h>
 
@@ -103,7 +104,7 @@ public:
   /**
    * @copydoc ModelInterface::GetLines()
    */
-  const LineRun* const GetLines() const override;
+  const LineRun* GetLines() const override;
 
   /**
    * @copydoc ModelInterface::GetNumberOfScripts()
@@ -113,7 +114,12 @@ public:
   /**
    * @copydoc ModelInterface::GetScriptRuns()
    */
-  const ScriptRun* const GetScriptRuns() const override;
+  const ScriptRun* GetScriptRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfCharacters()
+   */
+  Length GetNumberOfCharacters() const override;
 
   /**
    * @copydoc ModelInterface::GetNumberOfGlyphs()
@@ -143,37 +149,37 @@ public:
   /**
    * @copydoc ModelInterface::GetGlyphs()
    */
-  const GlyphInfo* const GetGlyphs() const override;
+  const GlyphInfo* GetGlyphs() const override;
 
   /**
    * @copydoc ModelInterface::GetLayout()
    */
-  const Vector2* const GetLayout() const override;
+  const Vector2* GetLayout() const override;
 
   /**
    * @copydoc ModelInterface::GetColors()
    */
-  const Vector4* const GetColors() const override;
+  const Vector4* GetColors() const override;
 
   /**
    * @copydoc ModelInterface::GetColorIndices()
    */
-  const ColorIndex* const GetColorIndices() const override;
+  const ColorIndex* GetColorIndices() const override;
 
   /**
    * @copydoc ModelInterface::GetBackgroundColors()
    */
-  const Vector4* const GetBackgroundColors() const override;
+  const Vector4* GetBackgroundColors() const override;
 
   /**
    * @copydoc ModelInterface::GetBackgroundColorIndices()
    */
-  const ColorIndex* const GetBackgroundColorIndices() const override;
+  const ColorIndex* GetBackgroundColorIndices() const override;
 
   /**
    * @copydoc ModelInterface::IsMarkupBackgroundColorSet()
    */
-  bool const IsMarkupBackgroundColorSet() const override;
+  bool IsMarkupBackgroundColorSet() const override;
 
   /**
    * @copydoc ModelInterface::GetDefaultColor()
@@ -206,11 +212,31 @@ public:
   bool IsUnderlineEnabled() const override;
 
   /**
+   * @copydoc ModelInterface::IsMarkupUnderlineSet()
+   */
+  bool IsMarkupUnderlineSet() const override;
+
+  /**
    * @copydoc ModelInterface::GetUnderlineHeight()
    */
   float GetUnderlineHeight() const override;
 
   /**
+   * @copydoc ModelInterface::GetUnderlineType()
+   */
+  Text::Underline::Type GetUnderlineType() const override;
+
+  /**
+   * @copydoc ModelInterface::GetDashedUnderlineWidth()
+   */
+  float GetDashedUnderlineWidth() const override;
+
+  /**
+   * @copydoc ModelInterface::GetDashedUnderlineGap()
+   */
+  float GetDashedUnderlineGap() const override;
+
+  /**
    * @copydoc ModelInterface::GetNumberOfUnderlineRuns()
    */
   Length GetNumberOfUnderlineRuns() const override;
@@ -218,7 +244,7 @@ public:
   /**
    * @copydoc ModelInterface::GetUnderlineRuns()
    */
-  void GetUnderlineRuns(GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const override;
+  void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const override;
 
   /**
    * @copydoc ModelInterface::GetOutlineColor()
@@ -246,6 +272,11 @@ public:
   bool IsMarkupProcessorEnabled() const override;
 
   /**
+   * @copydoc ModelInterface::IsSpannedTextPlaced()
+   */
+  bool IsSpannedTextPlaced() const override;
+
+  /**
   * @copydoc ModelInterface::GetHyphens()
   */
   const GlyphInfo* GetHyphens() const override;
@@ -261,6 +292,21 @@ public:
   Length GetHyphensCount() const override;
 
   /**
+  * @copydoc ModelInterface::GetCharacterSpacing()
+  */
+  float GetCharacterSpacing() const override;
+
+  /**
+  * @copydoc ModelInterface::GetTextBuffer()
+  */
+  const Character* GetTextBuffer() const override;
+
+  /**
+  * @copydoc ModelInterface::GetGlyphsToCharacters()
+  */
+  const Vector<CharacterIndex>& GetGlyphsToCharacters() const override;
+
+  /**
    * @brief Does the text elide at the end, start or middle of text according to ellipsis position
    *
    * It stores a copy of the visible glyphs and removes as many glyphs as needed
@@ -272,6 +318,66 @@ public:
    */
   void ElideGlyphs();
 
+  /**
+   * @copydoc ModelInterface::GetStrikethroughHeight()
+   */
+  float GetStrikethroughHeight() const override;
+
+  /**
+   * @copydoc ModelInterface::GetStrikethroughColor()
+   */
+  const Vector4& GetStrikethroughColor() const override;
+
+  /**
+   * @copydoc ModelInterface::IsStrikethroughEnabled()
+   */
+  bool IsStrikethroughEnabled() const override;
+
+  /**
+   * @copydoc ModelInterface::IsMarkupStrikethroughSet()
+   */
+  bool IsMarkupStrikethroughSet() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfStrikethroughRuns()
+   */
+  Length GetNumberOfStrikethroughRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfBoundedParagraphRuns()
+   */
+  virtual Length GetNumberOfBoundedParagraphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetBoundedParagraphRuns()
+   */
+  virtual const Vector<BoundedParagraphRun>& GetBoundedParagraphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetStrikethroughRuns()
+   */
+  void GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns, StrikethroughRunIndex index, Length numberOfRuns) const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfCharacterSpacingGlyphRuns()
+   */
+  Length GetNumberOfCharacterSpacingGlyphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetCharacterSpacingGlyphRuns()
+   */
+  const Vector<CharacterSpacingGlyphRun>& GetCharacterSpacingGlyphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetFontRuns()
+   */
+  const Vector<FontRun>& GetFontRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetFontDescriptionRuns()
+   */
+  const Vector<FontDescriptionRun>& GetFontDescriptionRuns() const override;
+
 private:
   const ModelInterface* const mModel;                           ///< Pointer to the text's model.
   Vector<GlyphInfo>           mElidedGlyphs;                    ///< Stores the glyphs of the elided text.
diff --git a/dali-toolkit/internal/text/shaper.cpp b/dali-toolkit/internal/text/shaper.cpp
index 9d9fc1b..5fbabd4 100644
--- a/dali-toolkit/internal/text/shaper.cpp
+++ b/dali-toolkit/internal/text/shaper.cpp
@@ -19,7 +19,11 @@
 #include <dali-toolkit/internal/text/shaper.h>
 
 // EXTERNAL INCLUDES
+#include <chrono>
+#include <dali/devel-api/text-abstraction/font-client.h>
 #include <dali/devel-api/text-abstraction/shaping.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
 
 namespace Dali
 {
@@ -27,12 +31,26 @@ namespace Toolkit
 {
 namespace Text
 {
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_TEXT_PERFORMANCE_MARKER, false);
+
 CharacterIndex min(CharacterIndex index0,
                    CharacterIndex index1)
 {
   return (index0 < index1) ? index0 : index1;
 }
 
+#if defined(TRACE_ENABLED)
+uint32_t GetMilliSeconds()
+{
+  // Get the time of a monotonic clock since its epoch.
+  auto epoch = std::chrono::steady_clock::now().time_since_epoch();
+
+  auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(epoch);
+
+  return static_cast<uint32_t>(duration.count());
+}
+#endif
+
 void ShapeText(const Vector<Character>&     text,
                const Vector<LineBreakInfo>& lineBreakInfo,
                const Vector<ScriptRun>&     scripts,
@@ -51,6 +69,15 @@ void ShapeText(const Vector<Character>&     text,
     return;
   }
 
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_SHAPE_TEXT");
+
+#if defined(TRACE_ENABLED)
+  uint32_t sumPre = 0, sumShape = 0, sumPost = 0;
+
+  uint32_t logThreshold = TextAbstraction::FontClient::GetPerformanceLogThresholdTime();
+  bool     logEnabled   = TextAbstraction::FontClient::IsPerformanceLogEnabled();
+#endif
+
 #ifdef DEBUG_ENABLED
   const Length numberOfFontRuns        = fonts.Count();
   const Length numberOfScriptRuns      = scripts.Count();
@@ -132,6 +159,16 @@ void ShapeText(const Vector<Character>&     text,
   const CharacterIndex lastCharacter = startCharacterIndex + numberOfCharacters;
   for(previousIndex = startCharacterIndex; previousIndex < lastCharacter;)
   {
+#if defined(TRACE_ENABLED)
+    uint32_t timeStamps[4];
+    uint32_t timeStampIndex = 0;
+
+    if(logEnabled)
+    {
+      timeStamps[timeStampIndex++] = GetMilliSeconds();
+    }
+#endif
+
     // Get the font id and the script.
     const FontRun&   fontRun   = *fontRunIt;
     const ScriptRun& scriptRun = *scriptRunIt;
@@ -164,12 +201,26 @@ void ShapeText(const Vector<Character>&     text,
       }
     }
 
+#if defined(TRACE_ENABLED)
+    if(logEnabled)
+    {
+      timeStamps[timeStampIndex++] = GetMilliSeconds();
+    }
+#endif
+
     // Shape the text for the current chunk.
     const Length numberOfGlyphs = shaping.Shape(textBuffer + previousIndex,
                                                 (currentIndex - previousIndex), // The number of characters to shape.
                                                 currentFontId,
                                                 currentScript);
 
+#if defined(TRACE_ENABLED)
+    if(logEnabled)
+    {
+      timeStamps[timeStampIndex++] = GetMilliSeconds();
+    }
+#endif
+
     // Retrieve the glyphs and the glyph to character conversion map.
     Vector<GlyphInfo>      tmpGlyphs;
     Vector<CharacterIndex> tmpGlyphToCharacterMap;
@@ -224,6 +275,16 @@ void ShapeText(const Vector<Character>&     text,
 
     // Update the previous index.
     previousIndex = currentIndex;
+
+#if defined(TRACE_ENABLED)
+    if(logEnabled)
+    {
+      timeStamps[timeStampIndex++] = GetMilliSeconds();
+      sumPre   += timeStamps[1] - timeStamps[0];
+      sumShape += timeStamps[2] - timeStamps[1];
+      sumPost  += timeStamps[3] - timeStamps[2];
+    }
+#endif
   }
 
   // Update indices.
@@ -252,6 +313,16 @@ void ShapeText(const Vector<Character>&     text,
   // Resize the vectors to set the right number of items.
   glyphs.Resize(totalNumberOfGlyphs);
   glyphToCharacterMap.Resize(totalNumberOfGlyphs);
+
+#if defined(TRACE_ENABLED)
+  if(logEnabled)
+  {
+    if(sumPre + sumShape + sumPost > logThreshold)
+    {
+      DALI_LOG_DEBUG_INFO("DALI_TEXT_SHAPE_TEXT updated:%u/%u, pre:%u ms, shape:%u ms, post:%u ms\n", numberOfNewGlyphs, totalNumberOfGlyphs, sumPre, sumShape, sumPost);
+    }
+  }
+#endif
 }
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/spannable/span-ranges-container-impl.cpp b/dali-toolkit/internal/text/spannable/span-ranges-container-impl.cpp
new file mode 100644
index 0000000..aa0a062
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/span-ranges-container-impl.cpp
@@ -0,0 +1,116 @@
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/span-ranges-container-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/map-wrapper.h>
+#include <utility>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct SpanRangesContainer::Impl
+{
+  using SpanId = uint32_t;
+
+  // Key : BaseSpan, Value : <Range, Added order>
+  using SpanRangeContainer = std::map<Dali::Toolkit::Text::BaseSpan, std::pair<Dali::Toolkit::Text::Range, SpanId>>;
+
+  SpanRangeContainer mSpanWithRanges{}; ///< The list of style-span
+  SpanId             mSpanId{0};        ///< The global id for each added Span. It will be used when we determine order of span.
+};
+
+SpanRangesContainer::SpanRangesContainer()
+{
+  mImpl = std::make_unique<Impl>();
+}
+
+SpanRangesContainer::~SpanRangesContainer()
+{
+}
+
+void SpanRangesContainer::AddSpan(const Dali::Toolkit::Text::BaseSpan& span, const Dali::Toolkit::Text::Range& range)
+{
+  mImpl->mSpanWithRanges.insert(std::make_pair(span, std::make_pair(range, mImpl->mSpanId++)));
+}
+
+void SpanRangesContainer::RemoveSpan(const Dali::Toolkit::Text::BaseSpan& span)
+{
+  mImpl->mSpanWithRanges.erase(span);
+}
+
+bool SpanRangesContainer::Contains(const Dali::Toolkit::Text::BaseSpan& span) const
+{
+  const auto it = mImpl->mSpanWithRanges.find(span);
+
+  return it != mImpl->mSpanWithRanges.end();
+}
+
+void SpanRangesContainer::GetSpans(std::vector<Dali::Toolkit::Text::BaseSpan>& listOfSpans) const
+{
+  std::map<Impl::SpanId, Dali::Toolkit::Text::BaseSpan> reorderedListOfSpans;
+
+  listOfSpans.reserve(listOfSpans.size() + mImpl->mSpanWithRanges.size());
+
+  // At first, sort the list of spans ordered by added time.
+  for(auto iter = mImpl->mSpanWithRanges.begin(), iterEnd = mImpl->mSpanWithRanges.end(); iter != iterEnd; ++iter)
+  {
+    reorderedListOfSpans.insert(std::make_pair(iter->second.second, iter->first));
+  }
+
+  // Retrieve result.
+  for(auto iter = reorderedListOfSpans.begin(), iterEnd = reorderedListOfSpans.end(); iter != iterEnd; ++iter)
+  {
+    listOfSpans.push_back(iter->second);
+  }
+}
+
+void SpanRangesContainer::GetSpansAndRanges(std::vector<Dali::Toolkit::Text::BaseSpan>& spans, std::vector<Dali::Toolkit::Text::Range>& ranges) const
+{
+  std::map<Impl::SpanId, std::pair<Dali::Toolkit::Text::BaseSpan, Dali::Toolkit::Text::Range>> reorderedListOfSpansWithRanges;
+
+  spans.reserve(spans.size() + mImpl->mSpanWithRanges.size());
+  ranges.reserve(ranges.size() + mImpl->mSpanWithRanges.size());
+
+  // At first, sort the list of spans ordered by added time.
+  for(auto iter = mImpl->mSpanWithRanges.begin(), iterEnd = mImpl->mSpanWithRanges.end(); iter != iterEnd; ++iter)
+  {
+    reorderedListOfSpansWithRanges.insert(std::make_pair(iter->second.second, std::make_pair(iter->first, iter->second.first)));
+  }
+
+  // Retrieve result.
+  for(auto iter = reorderedListOfSpansWithRanges.begin(), iterEnd = reorderedListOfSpansWithRanges.end(); iter != iterEnd; ++iter)
+  {
+    spans.push_back(iter->second.first);
+    ranges.push_back(iter->second.second);
+  }
+}
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/span-ranges-container-impl.h b/dali-toolkit/internal/text/spannable/span-ranges-container-impl.h
new file mode 100644
index 0000000..f89846e
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/span-ranges-container-impl.h
@@ -0,0 +1,136 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_SPANS_CONTAINER_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_SPANS_CONTAINER_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/range.h>
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/math/vector4.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali-toolkit/internal/text/string-text/range-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class SpanRangesContainer;
+
+/**
+ * @brief The container for style spans.
+ * This is to isolate the responsibility of container type from the logic of the spanned text.
+ */
+class SpanRangesContainer
+{
+public:
+  /**
+   * @brief Default constructor.
+   */
+  SpanRangesContainer();
+
+  /**
+   * @brief Virtual destructor.
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~SpanRangesContainer();
+
+  //Methods
+public:
+  /**
+   * @brief Add the span to the list of spans.
+   *
+   * @param[in] span The span of style.
+   * @param[in] range The range.
+   *
+   */
+  void AddSpan(const Dali::Toolkit::Text::BaseSpan& span, const Dali::Toolkit::Text::Range& range);
+
+  /**
+   * @brief Remove the span from the list.
+   *
+   * @param[in] span The span of style.
+   *
+   */
+  void RemoveSpan(const Dali::Toolkit::Text::BaseSpan& span);
+
+  /**
+   * @brief Check if a given @p span is in list
+   *
+   * @param[in] span The span of style.
+   *
+   * @return true if the @p span exists. Otherwise false.
+   */
+  bool Contains(const Dali::Toolkit::Text::BaseSpan& span) const;
+
+  /**
+   * @brief Retrieve all spans.
+   *
+   * @param[out] listOfSpans container to clone spans
+   */
+  void GetSpans(std::vector<Dali::Toolkit::Text::BaseSpan>& listOfSpans) const;
+
+  /**
+   * @brief Retrieve all spans and ranges.
+   *
+   * @param[out] spans container to clone spans
+   * @param[out] ranges container to clone ranges
+   */
+  void GetSpansAndRanges(std::vector<Dali::Toolkit::Text::BaseSpan>& spans, std::vector<Dali::Toolkit::Text::Range>& ranges) const;
+
+  // Removed constructors and assignment operators
+public:                                                                // Constructors
+  SpanRangesContainer(const SpanRangesContainer&) = delete;            ///< Deleted copy constructor
+  SpanRangesContainer(SpanRangesContainer&&)      = delete;            ///< Deleted move constructor
+  SpanRangesContainer& operator=(const SpanRangesContainer&) = delete; ///< Deleted copy assignment operator
+  SpanRangesContainer& operator=(SpanRangesContainer&&) = delete;      ///< Deleted move assignment operator
+
+private:
+  // Data
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class SpanRangesContainer
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow SpanRangesContainer to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Internal::SpanRangesContainer> : public Dali::BasicTypes<Dali::Toolkit::Text::Internal::SpanRangesContainer>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANS_CONTAINER_IMPL_H
diff --git a/dali-toolkit/internal/text/spannable/spannable-impl.cpp b/dali-toolkit/internal/text/spannable/spannable-impl.cpp
new file mode 100644
index 0000000..1a2b01b
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spannable-impl.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// HEADER FILE
+#include <dali-toolkit/internal/text/spannable/spannable-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+Spannable::Spannable()
+: Spanned()
+{
+}
+
+Spannable::~Spannable()
+{
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spannable-impl.h b/dali-toolkit/internal/text/spannable/spannable-impl.h
new file mode 100644
index 0000000..0b56043
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spannable-impl.h
@@ -0,0 +1,117 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spannable.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spanned-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class Spannable;
+
+typedef IntrusivePtr<Spannable> SpannablePtr;
+typedef const Spannable*        SpannableConstPtr;
+
+/**
+ * @copydoc Dali::Toolkit::Text::Spannable
+ */
+class Spannable : public Spanned
+{
+public:
+  /**
+   * This constructor is only used by derived classes.
+   */
+  Spannable();
+
+  /**
+   * @brief Virtual destructor.
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~Spannable() = 0;
+
+  // Removed constructors and assignment operators
+public:
+  Spannable(const Spannable&) = delete;            ///< Deleted copy constructor
+  Spannable(Spannable&&)      = delete;            ///< Deleted move constructor
+  Spannable& operator=(const Spannable&) = delete; ///< Deleted copy assignment operator
+  Spannable& operator=(Spannable&&) = delete;      ///< Deleted move assignment operator
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::Spannable::AttachSpan()
+   */
+  virtual bool AttachSpan(const Dali::Toolkit::Text::BaseSpan& styleSpan, const Dali::Toolkit::Text::Range& range) = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Spannable::DetachSpan()
+   */
+  virtual bool DetachSpan(const Dali::Toolkit::Text::BaseSpan& styleSpan) = 0;
+
+}; // class Spannable
+
+} // namespace Internal
+
+/**
+ * Helper methods for public API.
+ */
+inline Internal::Spannable& GetImplementation(Dali::Toolkit::Text::Spannable& spannable)
+{
+  DALI_ASSERT_ALWAYS(spannable && "spannable handle is empty");
+
+  BaseObject& handle = spannable.GetBaseObject();
+
+  return static_cast<Internal::Spannable&>(handle);
+}
+
+inline const Internal::Spannable& GetImplementation(const Dali::Toolkit::Text::Spannable& spannable)
+{
+  DALI_ASSERT_ALWAYS(spannable && "spannable handle is empty");
+
+  const BaseObject& handle = spannable.GetBaseObject();
+
+  return static_cast<const Internal::Spannable&>(handle);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow Spannable to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Internal::Spannable> : public Dali::BasicTypes<Dali::Toolkit::Text::Internal::Spannable>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_IMPL_H
diff --git a/dali-toolkit/internal/text/spannable/spannable-string-impl.cpp b/dali-toolkit/internal/text/spannable/spannable-string-impl.cpp
new file mode 100644
index 0000000..f224889
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spannable-string-impl.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spannable-string-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct SpannableString::Impl
+{
+  std::string       mText;       ///< The text (utf8).
+  Vector<Character> mCharacters; ///< The container of characters (utf32).
+  SpanRangesContainer mSpansContainer; ///< The container of spans and ranges
+};
+
+SpannableString::SpannableString(const std::string& text)
+{
+  mImpl                   = std::make_unique<Impl>();
+  mImpl->mText            = text;
+  Length         textSize = 0u;
+  const uint8_t* utf8     = NULL;
+
+  textSize = text.size();
+  utf8     = reinterpret_cast<const uint8_t*>(text.c_str());
+
+  //  Convert text into UTF-32
+  Vector<Character>& utf32Characters = mImpl->mCharacters;
+  utf32Characters.Resize(textSize);
+
+  // Transform a text array encoded in utf8 into an array encoded in utf32.
+  // It returns the actual number of characters.
+  Length characterCount = Utf8ToUtf32(utf8, textSize, utf32Characters.Begin());
+  utf32Characters.Resize(characterCount);
+
+  DALI_ASSERT_DEBUG(textSize >= characterCount && "Invalid UTF32 conversion length");
+}
+
+SpannableString::~SpannableString()
+{
+}
+
+Dali::Toolkit::Text::SpannableString SpannableString::New(const std::string& text)
+{
+  SpannableStringPtr object = new SpannableString(text);
+
+  Dali::Toolkit::Text::SpannableString handle = Dali::Toolkit::Text::SpannableString(object.Get());
+
+  return handle;
+}
+
+//Methods from CharacterSequence
+
+Vector<uint32_t> SpannableString::GetCharacters() const
+{
+  return mImpl->mCharacters;
+}
+
+uint32_t SpannableString::GetNumberOfCharacters() const
+{
+  return mImpl->mCharacters.Count();
+}
+
+std::string SpannableString::ToString() const
+{
+  return mImpl->mText;
+}
+
+//Methods from Spannable
+bool SpannableString::AttachSpan(const Dali::Toolkit::Text::BaseSpan& styleSpan, const Dali::Toolkit::Text::Range& range)
+{
+  if(range.GetStartIndex() < GetNumberOfCharacters() && range.GetEndIndex() < GetNumberOfCharacters())
+  {
+    mImpl->mSpansContainer.AddSpan(styleSpan, range);
+    return true;
+  }
+
+  return false;
+}
+
+bool SpannableString::DetachSpan(const Dali::Toolkit::Text::BaseSpan& styleSpan)
+{
+  if(mImpl->mSpansContainer.Contains(styleSpan))
+  {
+    mImpl->mSpansContainer.RemoveSpan(styleSpan);
+
+    return true;
+  }
+
+  return false;
+}
+
+//Methods from Spanned
+
+std::vector<Dali::Toolkit::Text::BaseSpan> SpannableString::GetAllSpans() const
+{
+  std::vector<Dali::Toolkit::Text::BaseSpan> listOfSpans;
+  mImpl->mSpansContainer.GetSpans(listOfSpans);
+  return listOfSpans;
+}
+
+void SpannableString::RetrieveAllSpansAndRanges(std::vector<Dali::Toolkit::Text::BaseSpan>& spans, std::vector<Dali::Toolkit::Text::Range>& ranges) const
+{
+  mImpl->mSpansContainer.GetSpansAndRanges(spans, ranges);
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spannable-string-impl.h b/dali-toolkit/internal/text/spannable/spannable-string-impl.h
new file mode 100644
index 0000000..5ecb823
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spannable-string-impl.h
@@ -0,0 +1,159 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_STRING_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_STRING_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spannable-string.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/span-ranges-container-impl.h>
+#include <dali-toolkit/internal/text/spannable/spannable-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class SpannableString;
+
+typedef IntrusivePtr<SpannableString> SpannableStringPtr;
+typedef const SpannableString*        SpannableStringConstPtr;
+
+/**
+ * @copydoc Dali::Toolkit::Text::SpannableString
+ */
+class SpannableString : public Spannable
+{
+public:
+  /**
+   * @brief Creates a new SpannableString.
+   *
+   * @return A public handle to the newly allocated SpannableString.
+   */
+  static Dali::Toolkit::Text::SpannableString New(const std::string& text);
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~SpannableString() override;
+
+protected:
+  /**
+   * @brief Constructs a new SpannableString.
+   */
+  SpannableString(const std::string& text);
+
+  // Removed constructors and assignment operators
+public:
+  SpannableString(const SpannableString&) = delete;            ///< Deleted copy constructor
+  SpannableString(SpannableString&&)      = delete;            ///< Deleted move constructor
+  SpannableString& operator=(const SpannableString&) = delete; ///< Deleted copy assignment operator
+  SpannableString& operator=(SpannableString&&) = delete;      ///< Deleted move assignment operator
+
+public:
+  //Methods from CharacterSequence
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSequence::GetCharacters()
+   */
+  Vector<uint32_t> GetCharacters() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSequence::GetNumberOfCharacters()
+   */
+  uint32_t GetNumberOfCharacters() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSequence::ToString()
+   */
+  std::string ToString() const override;
+
+  //Methods from Spannable
+  /**
+   * @copydoc Dali::Toolkit::Text::Spannable::AttachSpan()
+   */
+  bool AttachSpan(const Dali::Toolkit::Text::BaseSpan& styleSpan, const Dali::Toolkit::Text::Range& range);
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Spannable::DetachSpan()
+   */
+  bool DetachSpan(const Dali::Toolkit::Text::BaseSpan& styleSpan);
+
+  //Methods from Spanned
+  /**
+   * @copydoc Dali::Toolkit::Text::Spanned::GetAllSpans()
+   */
+  std::vector<Dali::Toolkit::Text::BaseSpan> GetAllSpans() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Spanned::RetrieveAllSpansAndRanges()
+   */
+  void RetrieveAllSpansAndRanges(std::vector<Dali::Toolkit::Text::BaseSpan>& spans, std::vector<Dali::Toolkit::Text::Range>& ranges) const;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class SpannableString
+
+} // namespace Internal
+
+/**
+ * Helper methods for public API.
+ */
+inline Internal::SpannableString& GetImplementation(Dali::Toolkit::Text::SpannableString& spannableString)
+{
+  DALI_ASSERT_ALWAYS(spannableString && "spannableString handle is empty");
+
+  BaseObject& handle = spannableString.GetBaseObject();
+
+  return static_cast<Internal::SpannableString&>(handle);
+}
+
+inline const Internal::SpannableString& GetImplementation(const Dali::Toolkit::Text::SpannableString& spannableString)
+{
+  DALI_ASSERT_ALWAYS(spannableString && "spannableString handle is empty");
+
+  const BaseObject& handle = spannableString.GetBaseObject();
+
+  return static_cast<const Internal::SpannableString&>(handle);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow SpannableString to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Internal::SpannableString> : public Dali::BasicTypes<Dali::Toolkit::Text::Internal::SpannableString>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_STRING_IMPL_H
diff --git a/dali-toolkit/internal/text/spannable/spanned-impl.cpp b/dali-toolkit/internal/text/spannable/spanned-impl.cpp
new file mode 100644
index 0000000..5610b92
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spanned-impl.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// HEADER FILE
+#include <dali-toolkit/internal/text/spannable/spanned-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+Spanned::Spanned()
+: CharacterSequence()
+{
+}
+
+Spanned::~Spanned()
+{
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spanned-impl.h b/dali-toolkit/internal/text/spannable/spanned-impl.h
new file mode 100644
index 0000000..4e5a8c7
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spanned-impl.h
@@ -0,0 +1,118 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_SPANNED_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_SPANNED_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spanned.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/string-text/character-sequence-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class CharacterSequence;
+class Spanned;
+
+typedef IntrusivePtr<Spanned> SpannedPtr;
+typedef const Spanned*        SpannedConstPtr;
+
+/**
+ * @copydoc Dali::Toolkit::Text::Spanned
+ */
+class Spanned : public CharacterSequence
+{
+public:
+  /**
+   * This constructor is only used by derived classes.
+   */
+  Spanned();
+
+  /**
+   * @brief Virtual destructor.
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~Spanned() = 0;
+
+  // Removed constructors and assignment operators
+public:                                        // Constructors
+  Spanned(const Spanned&) = delete;            ///< Deleted copy constructor
+  Spanned(Spanned&&)      = delete;            ///< Deleted move constructor
+  Spanned& operator=(const Spanned&) = delete; ///< Deleted copy assignment operator
+  Spanned& operator=(Spanned&&) = delete;      ///< Deleted move assignment operator
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::Spanned::GetAllSpans()
+   */
+  virtual std::vector<Dali::Toolkit::Text::BaseSpan> GetAllSpans() const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Spanned::RetrieveAllSpansAndRanges()
+   */
+  virtual void RetrieveAllSpansAndRanges(std::vector<Dali::Toolkit::Text::BaseSpan>& spans, std::vector<Dali::Toolkit::Text::Range>& ranges) const = 0;
+
+}; // class Spanned
+
+} // namespace Internal
+
+/**
+ * Helper methods for public API.
+ */
+inline Internal::Spanned& GetImplementation(Dali::Toolkit::Text::Spanned& spanned)
+{
+  DALI_ASSERT_ALWAYS(spanned && "spanned handle is empty");
+
+  BaseObject& handle = spanned.GetBaseObject();
+
+  return static_cast<Internal::Spanned&>(handle);
+}
+
+inline const Internal::Spanned& GetImplementation(const Dali::Toolkit::Text::Spanned& spanned)
+{
+  DALI_ASSERT_ALWAYS(spanned && "spanned handle is empty");
+
+  const BaseObject& handle = spanned.GetBaseObject();
+
+  return static_cast<const Internal::Spanned&>(handle);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow Spanned to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Internal::Spanned> : public Dali::BasicTypes<Dali::Toolkit::Text::Internal::Spanned>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANNED_IMPL_H
diff --git a/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.cpp
new file mode 100644
index 0000000..26d33a6
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct BackgroundColorSpan::Impl
+{
+  Vector4 mBackgroundColor;            ///< The color of the characters.
+  bool    mBackgroundColorDefined : 1; ///< Whether the background color is defined.
+};
+
+BackgroundColorSpan::BackgroundColorSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::BACKGROUND_COLOR)
+{
+  mImpl = std::make_unique<Impl>();
+}
+
+BackgroundColorSpan ::~BackgroundColorSpan()
+{
+}
+
+Dali::Toolkit::Text::BackgroundColorSpan BackgroundColorSpan::New(const Vector4 &color)
+{
+  BackgroundColorSpanPtr object = new BackgroundColorSpan();
+  object->SetBackgroundColor(color);
+  Dali::Toolkit::Text::BackgroundColorSpan handle = Dali::Toolkit::Text::BackgroundColorSpan(object.Get());
+
+  return handle;
+}
+
+//Methods
+Vector4 BackgroundColorSpan::GetBackgroundColor() const
+{
+  return mImpl->mBackgroundColor;
+}
+
+bool BackgroundColorSpan::IsBackgroundColorDefined() const
+{
+  return mImpl->mBackgroundColorDefined;
+}
+
+void BackgroundColorSpan::SetBackgroundColor(const Vector4 &color)
+{
+  mImpl->mBackgroundColor        = color;
+  mImpl->mBackgroundColorDefined = true;
+}
+
+void BackgroundColorSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+{
+  ColorRun backgroundColorRun;
+  backgroundColorRun.characterRun.characterIndex     = range.GetStartIndex();
+  backgroundColorRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+  backgroundColorRun.color                           = mImpl->mBackgroundColor;
+  logicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h
new file mode 100644
index 0000000..d39bc1c
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h
@@ -0,0 +1,135 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_BACKGROUND_COLOR_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_BACKGROUND_COLOR_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/background-color-span.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class BackgroundColorSpan;
+using BackgroundColorSpanPtr = IntrusivePtr<BackgroundColorSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::BackgroundColorSpan
+ */
+class BackgroundColorSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new BackgroundColorSpan object.
+   */
+  static Dali::Toolkit::Text::BackgroundColorSpan New(const Vector4 &color);
+
+  /**
+   * Default Constructor
+   */
+  BackgroundColorSpan();
+
+  ///< Deleted copy constructor
+  BackgroundColorSpan(const BackgroundColorSpan&) = delete;
+
+  ///< Deleted move constructor
+  BackgroundColorSpan(BackgroundColorSpan&&) = delete;
+
+  ///< Deleted copy assignment operator
+  BackgroundColorSpan& operator=(const BackgroundColorSpan&) = delete;
+
+  ///< Deleted move assignment operator
+  BackgroundColorSpan& operator=(BackgroundColorSpan&&) = delete;
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~BackgroundColorSpan() override;
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::BackgroundColorSpan::GetBackgroundColor()
+   */
+  Vector4 GetBackgroundColor() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::BackgroundColorSpan::IsBackgroundColorDefined()
+   */
+  bool IsBackgroundColorDefined() const;
+
+public: //Methods. Not intended for application developers
+  /**
+   * @brief Set the background-color.
+   *
+   * @param[in] color The background-color.
+   */
+  void SetBackgroundColor(const Vector4 &color);
+
+public: //Methods for internal only
+  /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class BackgroundColorSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::BackgroundColorSpan& GetImplementation(Dali::Toolkit::Text::BackgroundColorSpan& BackgroundColorSpan)
+{
+  DALI_ASSERT_ALWAYS(BackgroundColorSpan && "BackgroundColorSpan handle is empty");
+
+  BaseObject& object = BackgroundColorSpan.GetBaseObject();
+
+  return static_cast<Internal::BackgroundColorSpan&>(object);
+}
+
+inline const Internal::BackgroundColorSpan& GetImplementation(const Dali::Toolkit::Text::BackgroundColorSpan& BackgroundColorSpan)
+{
+  DALI_ASSERT_ALWAYS(BackgroundColorSpan && "BackgroundColorSpan handle is empty");
+
+  const BaseObject& object = BackgroundColorSpan.GetBaseObject();
+
+  return static_cast<const Internal::BackgroundColorSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_BACKGROUND_COLOR_SPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp
new file mode 100644
index 0000000..3e1fb35
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct BaseSpan::Impl
+{
+  Dali::Toolkit::Text::SpanType::Value mSpanTypeValue; ///< The span type value.
+};
+
+BaseSpan::BaseSpan(Dali::Toolkit::Text::SpanType::Value spanType)
+{
+  mImpl                 = std::make_unique<Impl>();
+  mImpl->mSpanTypeValue = spanType;
+}
+
+BaseSpan::~BaseSpan()
+{
+}
+
+Dali::Toolkit::Text::SpanType::Value BaseSpan::GetSpanType() const
+{
+  return mImpl->mSpanTypeValue;
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spans/base-span-impl.h b/dali-toolkit/internal/text/spannable/spans/base-span-impl.h
new file mode 100644
index 0000000..5f01524
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/base-span-impl.h
@@ -0,0 +1,131 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_BASE_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_BASE_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/range.h>
+#include <dali-toolkit/devel-api/text/spans/base-span.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
+#include <dali/public-api/object/base-object.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+class LogicalModel;
+struct AbstractStyleCharacterRun;
+
+namespace Internal
+{
+class BaseSpan;
+
+using BaseSpanPtr      = IntrusivePtr<BaseSpan>;
+using BaseSpanConstPtr = const BaseSpan*;
+
+/**
+ * @copydoc Dali::Toolkit::Text::BaseSpan
+ */
+class BaseSpan : public BaseObject
+{
+public:
+  BaseSpan(const BaseSpan&) = delete;            ///< Deleted copy constructor
+  BaseSpan(BaseSpan&&)      = delete;            ///< Deleted move constructor
+  BaseSpan& operator=(const BaseSpan&) = delete; ///< Deleted copy assignment operator
+  BaseSpan& operator=(BaseSpan&&) = delete;      ///< Deleted move assignment operator
+
+protected:
+  /**
+   * @brief Default Constructor
+   */
+  BaseSpan(Dali::Toolkit::Text::SpanType::Value spanType);
+
+  /**
+   * @brief Virtual destructor.
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~BaseSpan();
+
+public:
+  /**
+   * @copydoc Dali::Toolkit::Text::SpanType::Value GetSpanType
+   */
+
+  Dali::Toolkit::Text::SpanType::Value GetSpanType() const;
+
+public: //Methods for internal only
+  /**
+   * @brief Create an instance for specific style character run and add it to its logicalModel run.
+   *
+   * @param[in] logicalModel The logical model.
+   * @param[in] range The range.
+   */
+  virtual void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const = 0;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class BaseSpan
+
+} // namespace Internal
+
+/**
+ * Helper methods for public API.
+ */
+inline Internal::BaseSpan& GetImplementation(Dali::Toolkit::Text::BaseSpan& baseSpan)
+{
+  DALI_ASSERT_ALWAYS(baseSpan && "baseSpan handle is empty");
+
+  BaseObject& handle = baseSpan.GetBaseObject();
+
+  return static_cast<Internal::BaseSpan&>(handle);
+}
+
+inline const Internal::BaseSpan& GetImplementation(const Dali::Toolkit::Text::BaseSpan& baseSpan)
+{
+  DALI_ASSERT_ALWAYS(baseSpan && "baseSpan handle is empty");
+
+  const BaseObject& handle = baseSpan.GetBaseObject();
+
+  return static_cast<const Internal::BaseSpan&>(handle);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow BaseSpan to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Internal::BaseSpan> : public Dali::BasicTypes<Dali::Toolkit::Text::Internal::BaseSpan>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_BASE_SPAN_IMPL_H
diff --git a/dali-toolkit/internal/text/spannable/spans/bold-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/bold-span-impl.cpp
new file mode 100644
index 0000000..0f054f7
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/bold-span-impl.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/bold-span-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/font-description-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+BoldSpan::BoldSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::BOLD)
+{
+}
+
+BoldSpan::~BoldSpan()
+{
+}
+
+Dali::Toolkit::Text::BoldSpan BoldSpan::New()
+{
+  BoldSpanPtr object = new BoldSpan();
+  Dali::Toolkit::Text::BoldSpan handle = Dali::Toolkit::Text::BoldSpan(object.Get());
+  return handle;
+}
+
+void BoldSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+{
+  FontDescriptionRun fontRun;
+  fontRun.weight        = TextAbstraction::FontWeight::BOLD;
+  fontRun.weightDefined = true;
+  fontRun.characterRun.characterIndex     = range.GetStartIndex();
+  fontRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+  logicalModel->mFontDescriptionRuns.PushBack(fontRun);
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spans/bold-span-impl.h b/dali-toolkit/internal/text/spannable/spans/bold-span-impl.h
new file mode 100644
index 0000000..f3a356d
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/bold-span-impl.h
@@ -0,0 +1,111 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_BOLDSPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_BOLDSPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/bold-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class BoldSpan;
+using BoldSpanPtr = IntrusivePtr<BoldSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::BoldSpan
+ */
+class BoldSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new BoldSpan object.
+   *
+   * @return Dali::Toolkit::Text::BoldSpan
+   */
+  static Dali::Toolkit::Text::BoldSpan New();
+
+  /**
+   * @brief Construct a new Bold Span object
+   *
+   */
+  BoldSpan();
+
+  ///< Deleted copy constructor
+  BoldSpan(const BoldSpan& rhs) = delete;
+
+  ///< Deleted move constructor
+  BoldSpan(BoldSpan&& rhs) = delete;
+
+  ///< Deleted copy assignment operator
+  BoldSpan& operator=(const BoldSpan& rhs) = delete;
+
+  ///< Deleted move assignment operator
+  BoldSpan& operator=(BoldSpan&& rhs) = delete;
+
+  /**
+   * @brief Destructor
+   * A reference counted object may only be deleted by calling Unreference().
+   */
+  ~BoldSpan() override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+}; // class BoldSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::BoldSpan& GetImplementation(Dali::Toolkit::Text::BoldSpan& boldSpan)
+{
+  DALI_ASSERT_ALWAYS(boldSpan && "boldSpan handle is empty");
+
+  BaseObject& object = boldSpan.GetBaseObject();
+
+  return static_cast<Internal::BoldSpan&>(object);
+}
+
+inline const Internal::BoldSpan& GetImplementation(const Dali::Toolkit::Text::BoldSpan& boldSpan)
+{
+  DALI_ASSERT_ALWAYS(boldSpan && "boldSpan handle is empty");
+
+  const BaseObject& object = boldSpan.GetBaseObject();
+
+  return static_cast<const Internal::BoldSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif //DALI_TOOLKIT_INTERNAL_TEXT_BOLDSPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.cpp
new file mode 100644
index 0000000..aacf892
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct CharacterSpacingSpan::Impl
+{
+  float mCharacterSpacing;            ///< The character-spacing-value.
+  bool  mCharacterSpacingDefined : 1; ///< Whether the character-spacing-value is defined.
+};
+
+CharacterSpacingSpan::CharacterSpacingSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::CHARACTER_SPACING)
+{
+  mImpl = std::make_unique<Impl>();
+}
+
+CharacterSpacingSpan ::~CharacterSpacingSpan()
+{
+}
+
+Dali::Toolkit::Text::CharacterSpacingSpan CharacterSpacingSpan::New(const float& value)
+{
+  CharacterSpacingSpanPtr object = new CharacterSpacingSpan();
+  object->SetCharacterSpacing(value);
+
+  Dali::Toolkit::Text::CharacterSpacingSpan handle = Dali::Toolkit::Text::CharacterSpacingSpan(object.Get());
+
+  return handle;
+}
+
+//Methods
+float CharacterSpacingSpan::GetCharacterSpacing() const
+{
+  return mImpl->mCharacterSpacing;
+}
+
+bool CharacterSpacingSpan::IsCharacterSpacingDefined() const
+{
+  return mImpl->mCharacterSpacingDefined;
+}
+
+void CharacterSpacingSpan::SetCharacterSpacing(const float& value)
+{
+  mImpl->mCharacterSpacing        = value;
+  mImpl->mCharacterSpacingDefined = true;
+}
+
+void CharacterSpacingSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+{
+  CharacterSpacingCharacterRun characterSpacingCharacterRun;
+  characterSpacingCharacterRun.characterRun.characterIndex     = range.GetStartIndex();
+  characterSpacingCharacterRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+  characterSpacingCharacterRun.value                           = mImpl->mCharacterSpacing;
+  logicalModel->mCharacterSpacingCharacterRuns.PushBack(characterSpacingCharacterRun);
+  logicalModel->mCharacterSpacingRunsUpdated = true;
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h
new file mode 100644
index 0000000..c3446f0
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h
@@ -0,0 +1,128 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SPACING_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SPACING_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/character-spacing-span.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class CharacterSpacingSpan;
+using CharacterSpacingSpanPtr = IntrusivePtr<CharacterSpacingSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::CharacterSpacingSpan
+ */
+class CharacterSpacingSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new CharacterSpacingSpan object.
+   */
+  static Dali::Toolkit::Text::CharacterSpacingSpan New(const float& value);
+
+  /**
+   * Default Constructor
+   */
+  CharacterSpacingSpan();
+
+  CharacterSpacingSpan(const CharacterSpacingSpan&) = delete;            ///< Deleted copy constructor
+  CharacterSpacingSpan(CharacterSpacingSpan&&)      = delete;            ///< Deleted move constructor
+  CharacterSpacingSpan& operator=(const CharacterSpacingSpan&) = delete; ///< Deleted copy assignment operator
+  CharacterSpacingSpan& operator=(CharacterSpacingSpan&&) = delete;      ///< Deleted move assignment operator
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~CharacterSpacingSpan() override;
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSpacingSpan::GetCharacterSpacing()
+   */
+  float GetCharacterSpacing() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSpacingSpan::IsCharacterSpacingDefined()
+   */
+  bool IsCharacterSpacingDefined() const;
+
+public: //Methods. Not intended for application developers
+  /**
+   * @brief Set the CharacterSpacing.
+   *
+   * @param[in] value The CharacterSpacing.
+   */
+  void SetCharacterSpacing(const float& value);
+
+public: //Methods for internal only
+  /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class CharacterSpacingSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::CharacterSpacingSpan& GetImplementation(Dali::Toolkit::Text::CharacterSpacingSpan& characterSpacingSpan)
+{
+  DALI_ASSERT_ALWAYS(characterSpacingSpan && "CharacterSpacingSpan handle is empty");
+
+  BaseObject& object = characterSpacingSpan.GetBaseObject();
+
+  return static_cast<Internal::CharacterSpacingSpan&>(object);
+}
+
+inline const Internal::CharacterSpacingSpan& GetImplementation(const Dali::Toolkit::Text::CharacterSpacingSpan& CharacterSpacingSpan)
+{
+  DALI_ASSERT_ALWAYS(CharacterSpacingSpan && "CharacterSpacingSpan handle is empty");
+
+  const BaseObject& object = CharacterSpacingSpan.GetBaseObject();
+
+  return static_cast<const Internal::CharacterSpacingSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SPACING_SPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp
new file mode 100644
index 0000000..66212ad
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/font-span-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/font-span.h>
+#include <memory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+namespace
+{
+const float PIXEL_FORMAT_64_FACTOR = 64.f; ///< 64.f is used to convert from point size to 26.6 pixel format.
+}
+
+struct FontSpan::Impl
+{
+  std::string mFamilyName; ///< The font's family name.
+  Dali::TextAbstraction::FontWeight::Type mWeight;     ///< The font's weight.
+  Dali::TextAbstraction::FontWidth::Type  mWidth;      ///< The font's width.
+  Dali::TextAbstraction::FontSlant::Type  mSlant;      ///< The font's slant.
+  float       mSize;       ///< The font's size.
+
+  bool mFamilyNameDefined : 1; ///< Whether the font's family is defined.
+  bool mWeightDefined : 1;     ///< Whether the font's weight is defined.
+  bool mWidthDefined : 1;      ///< Whether the font's width is defined.
+  bool mSlantDefined : 1;      ///< Whether the font's slant is defined.
+  bool mSizeDefined : 1;       ///< Whether the font's size is defined.
+};
+
+FontSpan::FontSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::FONT)
+{
+  mImpl = std::make_unique<Impl>();
+}
+
+FontSpan ::~FontSpan()
+{
+}
+
+Dali::Toolkit::Text::FontSpan FontSpan::New(const std::string&                             familyName,
+                                            const float&                                   sizeInPoints,
+                                            const Dali::TextAbstraction::FontWeight::Type& weight,
+                                            const Dali::TextAbstraction::FontWidth::Type&  width,
+                                            const Dali::TextAbstraction::FontSlant::Type&  slant)
+{
+  FontSpanPtr object = new FontSpan();
+  object->SetFamilyName(familyName);
+  object->SetSize(sizeInPoints);
+  object->SetWeight(weight);
+  object->SetWidth(width);
+  object->SetSlant(slant);
+
+  Dali::Toolkit::Text::FontSpan handle = Dali::Toolkit::Text::FontSpan(object.Get());
+
+  return handle;
+}
+
+//Methods
+const std::string FontSpan::GetFamilyName() const
+{
+  return mImpl->mFamilyName;
+}
+
+bool FontSpan::IsFamilyNameDefined() const
+{
+  return mImpl->mFamilyNameDefined;
+}
+
+void FontSpan::SetFamilyName(const std::string& familyName)
+{
+  mImpl->mFamilyName        = familyName;
+  mImpl->mFamilyNameDefined = true;
+}
+
+Dali::TextAbstraction::FontWeight::Type FontSpan::GetWeight() const
+{
+  return mImpl->mWeight;
+}
+
+bool FontSpan::IsWeightDefined() const
+{
+  return mImpl->mWeightDefined;
+}
+
+void FontSpan::SetWeight(const Dali::TextAbstraction::FontWeight::Type& weight)
+{
+  mImpl->mWeight        = weight;
+  mImpl->mWeightDefined = true;
+}
+
+Dali::TextAbstraction::FontWidth::Type FontSpan::GetWidth() const
+{
+  return mImpl->mWidth;
+}
+
+bool FontSpan::IsWidthDefined() const
+{
+  return mImpl->mWidthDefined;
+}
+
+void FontSpan::SetWidth(const Dali::TextAbstraction::FontWidth::Type& width)
+{
+  mImpl->mWidth        = width;
+  mImpl->mWidthDefined = true;
+}
+
+Dali::TextAbstraction::FontSlant::Type FontSpan::GetSlant() const
+{
+  return mImpl->mSlant;
+}
+
+bool FontSpan::IsSlantDefined() const
+{
+  return mImpl->mSlantDefined;
+}
+
+void FontSpan::SetSlant(const Dali::TextAbstraction::FontSlant::Type& slant)
+{
+  mImpl->mSlant        = slant;
+  mImpl->mSlantDefined = true;
+}
+
+float FontSpan::GetSize() const
+{
+  return mImpl->mSize;
+}
+
+bool FontSpan::IsSizeDefined() const
+{
+  return mImpl->mSizeDefined;
+}
+
+void FontSpan::SetSize(const float& size)
+{
+  mImpl->mSize        = size;
+  mImpl->mSizeDefined = true;
+}
+
+void FontSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+{
+  FontDescriptionRun fontRun;
+  fontRun.characterRun.characterIndex     = range.GetStartIndex();
+  fontRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+
+  InitializeFontRun(fontRun);
+  ProcessFontFamily(fontRun);
+  ProcessFontSize(fontRun);
+  ProcessFontWeight(fontRun);
+  ProcessFontWidth(fontRun);
+  ProcessFontSlant(fontRun);
+
+  logicalModel->mFontDescriptionRuns.PushBack(fontRun);
+}
+
+void FontSpan::InitializeFontRun(FontDescriptionRun& fontRun) const
+{
+  fontRun.familyName   = NULL;
+  fontRun.familyLength = 0u;
+  fontRun.weight       = TextAbstraction::FontWeight::NORMAL;
+  fontRun.width        = TextAbstraction::FontWidth::NORMAL;
+  fontRun.slant        = TextAbstraction::FontSlant::NORMAL;
+  fontRun.size         = 0u;
+
+  fontRun.familyDefined = false;
+  fontRun.weightDefined = false;
+  fontRun.widthDefined  = false;
+  fontRun.slantDefined  = false;
+  fontRun.sizeDefined   = false;
+}
+
+void FontSpan::ProcessFontFamily(FontDescriptionRun& fontRun) const
+{
+  if(IsFamilyNameDefined())
+  {
+    const std::string& familyName = GetFamilyName();
+    fontRun.familyDefined         = true;
+    fontRun.familyLength          = familyName.length();
+    fontRun.familyName            = new char[fontRun.familyLength];
+    memcpy(fontRun.familyName, familyName.c_str(), fontRun.familyLength);
+    // The memory is freed when the font run is removed from the logical model.
+  }
+}
+
+void FontSpan::ProcessFontSize(FontDescriptionRun& fontRun) const
+{
+  if(IsSizeDefined())
+  {
+    // 64.f is used to convert from point size to 26.6 pixel format.
+    fontRun.size        = static_cast<PointSize26Dot6>(GetSize() * PIXEL_FORMAT_64_FACTOR);
+    fontRun.sizeDefined = true;
+  }
+}
+
+void FontSpan::ProcessFontWeight(FontDescriptionRun& fontRun) const
+{
+  if(IsWeightDefined())
+  {
+    fontRun.weight        = GetWeight();
+    fontRun.weightDefined = true;
+  }
+}
+
+void FontSpan::ProcessFontWidth(FontDescriptionRun& fontRun) const
+{
+  if(IsWidthDefined())
+  {
+    fontRun.width        = GetWidth();
+    fontRun.widthDefined = true;
+  }
+}
+
+void FontSpan::ProcessFontSlant(FontDescriptionRun& fontRun) const
+{
+  if(IsSlantDefined())
+  {
+    fontRun.slant        = GetSlant();
+    fontRun.slantDefined = true;
+  }
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spans/font-span-impl.h b/dali-toolkit/internal/text/spannable/spans/font-span-impl.h
new file mode 100644
index 0000000..56ab9d2
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/font-span-impl.h
@@ -0,0 +1,209 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_FONT_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_FONT_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/font-span.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class FontSpan;
+using FontSpanPtr = IntrusivePtr<FontSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::FontSpan
+ */
+class FontSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new FontSpan object.
+   */
+  static Dali::Toolkit::Text::FontSpan New(const std::string&                             familyName,
+                                           const float&                                   sizeInPoints,
+                                           const Dali::TextAbstraction::FontWeight::Type& weight,
+                                           const Dali::TextAbstraction::FontWidth::Type&  width,
+                                           const Dali::TextAbstraction::FontSlant::Type&  slant);
+
+  /**
+   * Default Constructor
+   */
+  FontSpan();
+
+  FontSpan(const FontSpan&) = delete;            ///< Deleted copy constructor
+  FontSpan(FontSpan&&)      = delete;            ///< Deleted move constructor
+  FontSpan& operator=(const FontSpan&) = delete; ///< Deleted copy assignment operator
+  FontSpan& operator=(FontSpan&&) = delete;      ///< Deleted move assignment operator
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~FontSpan() override;
+
+public: //Methods
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::GetFamilyName()
+   */
+  const std::string GetFamilyName() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::IsFamilyNameDefined()
+   */
+  bool IsFamilyNameDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::GetWeight()
+   */
+  Dali::TextAbstraction::FontWeight::Type GetWeight() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::IsWeightDefined()
+   */
+  bool IsWeightDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::GetWidth()
+   */
+  Dali::TextAbstraction::FontWidth::Type GetWidth() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::IsWidthDefined()
+   */
+  bool IsWidthDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::GetSlant()
+   */
+  Dali::TextAbstraction::FontSlant::Type GetSlant() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::IsSlantDefined()
+   */
+  bool IsSlantDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::GetSize()
+   */
+  float GetSize() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::FontSpan::IsSizeDefined()
+   */
+  bool IsSizeDefined() const;
+
+public: //Methods. Not intended for application developers
+  /**
+   * @brief Set the font family name.
+   *
+   * @param[in] familyName The font family name.
+   */
+  void SetFamilyName(const std::string& familyName);
+
+  /**
+   * @brief Set the font weight.
+   *
+   * @param[in] weight The font weight.
+   */
+  void SetWeight(const Dali::TextAbstraction::FontWeight::Type& weight);
+
+  /**
+   * @brief Set the font width.
+   *
+   * @param[in] width The font width.
+   */
+  void SetWidth(const Dali::TextAbstraction::FontWidth::Type& width);
+
+  /**
+   * @brief Set the font slant.
+   *
+   * @param[in] slant The font slant.
+   */
+  void SetSlant(const Dali::TextAbstraction::FontSlant::Type& slant);
+
+  /**
+   * @brief Set the font size.
+   *
+   * @param[in] size The font size.
+   */
+  void SetSize(const float& size);
+
+private: //Methods
+  void InitializeFontRun(FontDescriptionRun& fontRun) const;
+  void ProcessFontFamily(FontDescriptionRun& fontRun) const;
+  void ProcessFontSize(FontDescriptionRun& fontRun) const;
+  void ProcessFontWeight(FontDescriptionRun& fontRun) const;
+  void ProcessFontWidth(FontDescriptionRun& fontRun) const;
+  void ProcessFontSlant(FontDescriptionRun& fontRun) const;
+
+public: //Methods for internal only
+        /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class FontSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::FontSpan& GetImplementation(Dali::Toolkit::Text::FontSpan& fontSpan)
+{
+  DALI_ASSERT_ALWAYS(fontSpan && "fontSpan handle is empty");
+
+  BaseObject& object = fontSpan.GetBaseObject();
+
+  return static_cast<Internal::FontSpan&>(object);
+}
+
+inline const Internal::FontSpan& GetImplementation(const Dali::Toolkit::Text::FontSpan& fontSpan)
+{
+  DALI_ASSERT_ALWAYS(fontSpan && "fontSpan handle is empty");
+
+  const BaseObject& object = fontSpan.GetBaseObject();
+
+  return static_cast<const Internal::FontSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_FONT_SPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.cpp
new file mode 100644
index 0000000..9e0ab32
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct ForegroundColorSpan::Impl
+{
+  Vector4 mForegroundColor;            ///< The foreground-color of the characters.
+  bool    mForegroundColorDefined : 1; ///< Whether the foreground-color is defined.
+};
+
+ForegroundColorSpan::ForegroundColorSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::FOREGROUND_COLOR)
+{
+  mImpl = std::make_unique<Impl>();
+}
+
+ForegroundColorSpan ::~ForegroundColorSpan()
+{
+}
+
+Dali::Toolkit::Text::ForegroundColorSpan ForegroundColorSpan::New(Vector4 color)
+{
+  ForegroundColorSpanPtr object = new ForegroundColorSpan();
+  object->SetForegroundColor(color);
+
+  Dali::Toolkit::Text::ForegroundColorSpan handle = Dali::Toolkit::Text::ForegroundColorSpan(object.Get());
+
+  return handle;
+}
+
+//Methods
+Vector4 ForegroundColorSpan::GetForegroundColor() const
+{
+  return mImpl->mForegroundColor;
+}
+
+bool ForegroundColorSpan::IsForegroundColorDefined() const
+{
+  return mImpl->mForegroundColorDefined;
+}
+
+void ForegroundColorSpan::SetForegroundColor(Vector4 color)
+{
+  mImpl->mForegroundColor        = color;
+  mImpl->mForegroundColorDefined = true;
+}
+
+void ForegroundColorSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+{
+  ColorRun colorRun;
+  colorRun.characterRun.characterIndex     = range.GetStartIndex();
+  colorRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+
+  colorRun.color = mImpl->mForegroundColor;
+  logicalModel->mColorRuns.PushBack(colorRun);
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h
new file mode 100644
index 0000000..b75a5aa
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h
@@ -0,0 +1,128 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_FOREGROUND_COLOR_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_FOREGROUND_COLOR_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/foreground-color-span.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class ForegroundColorSpan;
+using ForegroundColorSpanPtr = IntrusivePtr<ForegroundColorSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::ForegroundColorSpan
+ */
+class ForegroundColorSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new ForegroundColorSpan object.
+   */
+  static Dali::Toolkit::Text::ForegroundColorSpan New(Vector4 color);
+
+  /**
+   * Default Constructor
+   */
+  ForegroundColorSpan();
+
+  ForegroundColorSpan(const ForegroundColorSpan&) = delete;            ///< Deleted copy constructor
+  ForegroundColorSpan(ForegroundColorSpan&&)      = delete;            ///< Deleted move constructor
+  ForegroundColorSpan& operator=(const ForegroundColorSpan&) = delete; ///< Deleted copy assignment operator
+  ForegroundColorSpan& operator=(ForegroundColorSpan&&) = delete;      ///< Deleted move assignment operator
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~ForegroundColorSpan() override;
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::ForegroundColorSpan::GetForegroundColor()
+   */
+  Vector4 GetForegroundColor() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ForegroundColorSpan::IsForegroundColorDefined()
+   */
+  bool IsForegroundColorDefined() const;
+
+public: //Methods. Not intended for application developers
+  /**
+   * @brief Set the foreground-color.
+   *
+   * @param[in] color The foreground-color.
+   */
+  void SetForegroundColor(Vector4 color);
+
+public: //Methods for internal only
+        /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class ForegroundColorSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::ForegroundColorSpan& GetImplementation(Dali::Toolkit::Text::ForegroundColorSpan& foregroundColorSpan)
+{
+  DALI_ASSERT_ALWAYS(foregroundColorSpan && "foregroundColorSpan handle is empty");
+
+  BaseObject& object = foregroundColorSpan.GetBaseObject();
+
+  return static_cast<Internal::ForegroundColorSpan&>(object);
+}
+
+inline const Internal::ForegroundColorSpan& GetImplementation(const Dali::Toolkit::Text::ForegroundColorSpan& foregroundColorSpan)
+{
+  DALI_ASSERT_ALWAYS(foregroundColorSpan && "foregroundColorSpan handle is empty");
+
+  const BaseObject& object = foregroundColorSpan.GetBaseObject();
+
+  return static_cast<const Internal::ForegroundColorSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_FOREGROUND_COLOR_SPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/italic-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/italic-span-impl.cpp
new file mode 100644
index 0000000..64d9eee
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/italic-span-impl.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/italic-span-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/font-description-run.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+ItalicSpan::ItalicSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::ITALIC)
+{
+}
+
+ItalicSpan::~ItalicSpan()
+{
+}
+
+Dali::Toolkit::Text::ItalicSpan ItalicSpan::New()
+{
+  ItalicSpanPtr object = new ItalicSpan();
+  Dali::Toolkit::Text::ItalicSpan handle = Dali::Toolkit::Text::ItalicSpan(object.Get());
+  return handle;
+}
+void ItalicSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+{
+  FontDescriptionRun fontRun;
+  fontRun.slant        = TextAbstraction::FontSlant::ITALIC;
+  fontRun.slantDefined = true;
+  fontRun.characterRun.characterIndex     = range.GetStartIndex();
+  fontRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+  logicalModel->mFontDescriptionRuns.PushBack(fontRun);
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/italic-span-impl.h b/dali-toolkit/internal/text/spannable/spans/italic-span-impl.h
new file mode 100644
index 0000000..5279038
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/italic-span-impl.h
@@ -0,0 +1,112 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_ITALIC_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_ITALIC_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/italic-span.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class ItalicSpan;
+using ItalicSpanPtr = IntrusivePtr<ItalicSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::ItalicSpan
+ */
+class ItalicSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new ItalicSpan object.
+   */
+  static Dali::Toolkit::Text::ItalicSpan New();
+
+  /**
+   * Default Constructor
+   */
+  ItalicSpan();
+
+  ///< Deleted copy constructor
+  ItalicSpan(const ItalicSpan&) = delete;
+
+  ///< Deleted move constructor
+  ItalicSpan(ItalicSpan&&) = delete;
+
+  ///< Deleted copy assignment operator
+  ItalicSpan& operator=(const ItalicSpan&) = delete;
+
+  ///< Deleted move assignment operator
+  ItalicSpan& operator=(ItalicSpan&&) = delete;
+
+  /**
+   * @brief Destructor.
+   *
+   * A reference counted object may only be deleted by calling Unreference().
+   */
+  ~ItalicSpan() override;
+
+  //Methods for internal only
+  /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+}; // class ItalicSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::ItalicSpan& GetImplementation(Dali::Toolkit::Text::ItalicSpan& italicSpan)
+{
+  DALI_ASSERT_ALWAYS(italicSpan && "italicSpan handle is empty");
+
+  BaseObject& object = italicSpan.GetBaseObject();
+
+  return static_cast<Internal::ItalicSpan&>(object);
+}
+
+inline const Internal::ItalicSpan& GetImplementation(const Dali::Toolkit::Text::ItalicSpan& italicSpan)
+{
+  DALI_ASSERT_ALWAYS(italicSpan && "italicSpan handle is empty");
+
+  const BaseObject& object = italicSpan.GetBaseObject();
+
+  return static_cast<const Internal::ItalicSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_ITALIC_SPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.cpp
new file mode 100644
index 0000000..7cca940
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.cpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct StrikethroughSpan::Impl
+{
+  StrikethroughStyleProperties mStrikethroughProperties; ///< The properties of strikethrough style.
+};
+
+StrikethroughSpan::StrikethroughSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::STRIKETHROUGH)
+{
+  mImpl = std::make_unique<Impl>();
+}
+
+StrikethroughSpan ::~StrikethroughSpan()
+{
+}
+
+Dali::Toolkit::Text::StrikethroughSpan StrikethroughSpan::New()
+{
+  StrikethroughSpanPtr                   object = new StrikethroughSpan();
+  Dali::Toolkit::Text::StrikethroughSpan handle = Dali::Toolkit::Text::StrikethroughSpan(object.Get());
+  return handle;
+}
+
+Dali::Toolkit::Text::StrikethroughSpan StrikethroughSpan::New(Vector4 color, float height)
+{
+  StrikethroughSpanPtr object = new StrikethroughSpan();
+  object->SetColor(color);
+  object->SetHeight(height);
+  Dali::Toolkit::Text::StrikethroughSpan handle = Dali::Toolkit::Text::StrikethroughSpan(object.Get());
+
+  return handle;
+}
+
+//Methods
+Vector4 StrikethroughSpan::GetColor() const
+{
+  return mImpl->mStrikethroughProperties.color;
+}
+
+bool StrikethroughSpan::IsColorDefined() const
+{
+  return mImpl->mStrikethroughProperties.colorDefined;
+}
+
+void StrikethroughSpan::SetColor(const Vector4& color)
+{
+  mImpl->mStrikethroughProperties.color        = color;
+  mImpl->mStrikethroughProperties.colorDefined = true;
+}
+
+float StrikethroughSpan::GetHeight() const
+{
+  return mImpl->mStrikethroughProperties.height;
+}
+
+bool StrikethroughSpan::IsHeightDefined() const
+{
+  return mImpl->mStrikethroughProperties.heightDefined;
+}
+
+void StrikethroughSpan::SetHeight(const float& height)
+{
+  mImpl->mStrikethroughProperties.height        = height;
+  mImpl->mStrikethroughProperties.heightDefined = true;
+}
+
+void StrikethroughSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+
+{
+  StrikethroughCharacterRun strikethroughCharacterRun;
+  strikethroughCharacterRun.characterRun.characterIndex     = range.GetStartIndex();
+  strikethroughCharacterRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+  strikethroughCharacterRun.properties                      = mImpl->mStrikethroughProperties;
+  logicalModel->mStrikethroughCharacterRuns.PushBack(strikethroughCharacterRun);
+  logicalModel->mStrikethroughRunsUpdated = true;
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h
new file mode 100644
index 0000000..def7fa9
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h
@@ -0,0 +1,155 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_STRIKETHROUGH_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_STRIKETHROUGH_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/strikethrough-span.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class StrikethroughSpan;
+
+using StrikethroughSpanPtr = IntrusivePtr<StrikethroughSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::StrikethroughSpan
+ */
+
+class StrikethroughSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new StrikethroughSpan object.
+   *
+   * @return A new StrikethroughSpan object.
+   */
+  static Dali::Toolkit::Text::StrikethroughSpan New();
+
+  /**
+   * @brief Creates a new StrikethroughSpan object.
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   *
+   * @return A new StrikethroughSpan object.
+   */
+  static Dali::Toolkit::Text::StrikethroughSpan New(Vector4 color, float height);
+
+  /**
+   * Default Constructor
+   */
+  StrikethroughSpan();
+  StrikethroughSpan(const StrikethroughSpan&) = delete;            ///< Deleted copy constructor
+  StrikethroughSpan(StrikethroughSpan&&)      = delete;            ///< Deleted move constructor
+  StrikethroughSpan& operator=(const StrikethroughSpan&) = delete; ///< Deleted copy assignment operator
+  StrikethroughSpan& operator=(StrikethroughSpan&&) = delete;      ///< Deleted move assignment operator
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~StrikethroughSpan() override;
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::StrikethroughSpan::GetColor()
+   */
+  Vector4 GetColor() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::StrikethroughSpan::IsColorDefined()
+   */
+  bool IsColorDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::StrikethroughSpan::GetHeight()
+   */
+  float GetHeight() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::StrikethroughSpan::IsHeightDefined()
+   */
+  bool IsHeightDefined() const;
+
+public: //Methods. Not intended for application developers
+  /**
+   * @brief Set the color of underline.
+   *
+   * @param[in] color The color of line.
+   */
+  void SetColor(const Vector4& color);
+
+  /**
+   * @brief Set the height of underline.
+   *
+   * @param[in] height The height of line.
+   */
+  void SetHeight(const float& height);
+
+public: //Methods for internal only
+  /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+private:
+  struct Impl;
+
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class StrikethroughSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::StrikethroughSpan& GetImplementation(Dali::Toolkit::Text::StrikethroughSpan& foregroundColorSpan)
+{
+  DALI_ASSERT_ALWAYS(foregroundColorSpan && "foregroundColorSpan handle is empty");
+  BaseObject& object = foregroundColorSpan.GetBaseObject();
+  return static_cast<Internal::StrikethroughSpan&>(object);
+}
+
+inline const Internal::StrikethroughSpan& GetImplementation(const Dali::Toolkit::Text::StrikethroughSpan& foregroundColorSpan)
+{
+  DALI_ASSERT_ALWAYS(foregroundColorSpan && "foregroundColorSpan handle is empty");
+  const BaseObject& object = foregroundColorSpan.GetBaseObject();
+  return static_cast<const Internal::StrikethroughSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_STRIKETHROUGH_SPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/spannable/spans/underline-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.cpp
new file mode 100644
index 0000000..841c5ea
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.cpp
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/spannable/spans/underline-span-impl.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/markup-tags-and-attributes.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct UnderlineSpan::Impl
+{
+  UnderlineStyleProperties mUnderlineProperties; ///< The properties of underline style.
+};
+
+UnderlineSpan::UnderlineSpan()
+: BaseSpan(Dali::Toolkit::Text::SpanType::Value::UNDERLINE)
+{
+  mImpl = std::make_unique<Impl>();
+}
+
+UnderlineSpan ::~UnderlineSpan()
+{
+}
+
+Dali::Toolkit::Text::UnderlineSpan UnderlineSpan::New()
+{
+  UnderlineSpanPtr object = new UnderlineSpan();
+
+  Dali::Toolkit::Text::UnderlineSpan handle = Dali::Toolkit::Text::UnderlineSpan(object.Get());
+
+  return handle;
+}
+
+Dali::Toolkit::Text::UnderlineSpan UnderlineSpan::NewSolid(Vector4 color, float height)
+{
+  UnderlineSpanPtr object = new UnderlineSpan();
+  object->SetType(Text::Underline::SOLID);
+  object->SetColor(color);
+  object->SetHeight(height);
+
+  Dali::Toolkit::Text::UnderlineSpan handle = Dali::Toolkit::Text::UnderlineSpan(object.Get());
+
+  return handle;
+}
+
+Dali::Toolkit::Text::UnderlineSpan UnderlineSpan::NewDashed(Vector4 color, float height, float dashGap, float dashWidth)
+{
+  UnderlineSpanPtr object = new UnderlineSpan();
+  object->SetType(Text::Underline::DASHED);
+  object->SetColor(color);
+  object->SetHeight(height);
+  object->SetDashGap(dashGap);
+  object->SetDashWidth(dashWidth);
+
+  Dali::Toolkit::Text::UnderlineSpan handle = Dali::Toolkit::Text::UnderlineSpan(object.Get());
+
+  return handle;
+}
+
+Dali::Toolkit::Text::UnderlineSpan UnderlineSpan::NewDouble(Vector4 color, float height)
+{
+  UnderlineSpanPtr object = new UnderlineSpan();
+  object->SetType(Text::Underline::DOUBLE);
+  object->SetColor(color);
+  object->SetHeight(height);
+
+  Dali::Toolkit::Text::UnderlineSpan handle = Dali::Toolkit::Text::UnderlineSpan(object.Get());
+
+  return handle;
+}
+
+//Methods
+
+Text::Underline::Type UnderlineSpan::GetType() const
+{
+  return mImpl->mUnderlineProperties.type;
+}
+
+bool UnderlineSpan::IsTypeDefined() const
+{
+  return mImpl->mUnderlineProperties.typeDefined;
+}
+
+void UnderlineSpan::SetType(const Text::Underline::Type& type)
+{
+  mImpl->mUnderlineProperties.type        = type;
+  mImpl->mUnderlineProperties.typeDefined = true;
+}
+
+Vector4 UnderlineSpan::GetColor() const
+{
+  return mImpl->mUnderlineProperties.color;
+}
+
+bool UnderlineSpan::IsColorDefined() const
+{
+  return mImpl->mUnderlineProperties.colorDefined;
+}
+
+void UnderlineSpan::SetColor(const Vector4& color)
+{
+  mImpl->mUnderlineProperties.color        = color;
+  mImpl->mUnderlineProperties.colorDefined = true;
+}
+
+float UnderlineSpan::GetHeight() const
+{
+  return mImpl->mUnderlineProperties.height;
+}
+
+bool UnderlineSpan::IsHeightDefined() const
+{
+  return mImpl->mUnderlineProperties.heightDefined;
+}
+
+void UnderlineSpan::SetHeight(const float& height)
+{
+  mImpl->mUnderlineProperties.height        = height;
+  mImpl->mUnderlineProperties.heightDefined = true;
+}
+
+float UnderlineSpan::GetDashGap() const
+{
+  return mImpl->mUnderlineProperties.dashGap;
+}
+
+bool UnderlineSpan::IsDashGapDefined() const
+{
+  return mImpl->mUnderlineProperties.dashGapDefined;
+}
+
+void UnderlineSpan::SetDashGap(const float& dashGap)
+{
+  mImpl->mUnderlineProperties.dashGap        = dashGap;
+  mImpl->mUnderlineProperties.dashGapDefined = true;
+}
+
+float UnderlineSpan::GetDashWidth() const
+{
+  return mImpl->mUnderlineProperties.dashWidth;
+}
+
+bool UnderlineSpan::IsDashWidthDefined() const
+{
+  return mImpl->mUnderlineProperties.dashWidthDefined;
+}
+
+void UnderlineSpan::SetDashWidth(const float& dashWidth)
+{
+  mImpl->mUnderlineProperties.dashWidth        = dashWidth;
+  mImpl->mUnderlineProperties.dashWidthDefined = true;
+}
+
+void UnderlineSpan::CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const
+{
+  UnderlinedCharacterRun underlinedCharacterRun;
+  underlinedCharacterRun.characterRun.characterIndex     = range.GetStartIndex();
+  underlinedCharacterRun.characterRun.numberOfCharacters = range.GetNumberOfIndices();
+
+  underlinedCharacterRun.properties = mImpl->mUnderlineProperties;
+  logicalModel->mUnderlinedCharacterRuns.PushBack(underlinedCharacterRun);
+
+  logicalModel->mUnderlineRunsUpdated = true;
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/spannable/spans/underline-span-impl.h b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.h
new file mode 100644
index 0000000..023e3d4
--- /dev/null
+++ b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.h
@@ -0,0 +1,229 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_UNDERLINE_SPAN_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_UNDERLINE_SPAN_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/spans/underline-span.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/logical-model-impl.h>
+#include <dali-toolkit/internal/text/spannable/spans/base-span-impl.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class UnderlineSpan;
+using UnderlineSpanPtr = IntrusivePtr<UnderlineSpan>;
+
+/**
+ * @copydoc Dali::Toolkit::Text::UnderlineSpan
+ */
+class UnderlineSpan : public BaseSpan
+{
+public:
+  /**
+   * @brief Creates a new UnderlineSpan object.
+   *
+   * @return A new UnderlineSpan object.
+   */
+  static Dali::Toolkit::Text::UnderlineSpan New();
+
+  /**
+   * @brief Creates a new UnderlineSpan object.
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   *
+   * @return A new UnderlineSpan object.
+   */
+  static Dali::Toolkit::Text::UnderlineSpan NewSolid(Vector4 color, float height);
+
+  /**
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   * @param[in] dashGap The dash-gap of line.
+   * @param[in] dashWidth The dash-width of line.
+   *
+   * @return A new UnderlineSpan object.
+   */
+  static Dali::Toolkit::Text::UnderlineSpan NewDashed(Vector4 color, float height, float dashGap, float dashWidth);
+
+  /**
+   * @brief Creates a new UnderlineSpan object.
+   *
+   * @param[in] color The color of line.
+   * @param[in] height The height of line.
+   *
+   * @return A new UnderlineSpan object.
+   */
+  static Dali::Toolkit::Text::UnderlineSpan NewDouble(Vector4 color, float height);
+
+  /**
+   * Default Constructor
+   */
+  UnderlineSpan();
+
+  UnderlineSpan(const UnderlineSpan&) = delete;            ///< Deleted copy constructor
+  UnderlineSpan(UnderlineSpan&&)      = delete;            ///< Deleted move constructor
+  UnderlineSpan& operator=(const UnderlineSpan&) = delete; ///< Deleted copy assignment operator
+  UnderlineSpan& operator=(UnderlineSpan&&) = delete;      ///< Deleted move assignment operator
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~UnderlineSpan() override;
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetType()
+   */
+  Text::Underline::Type GetType() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsTypeDefined()
+   */
+  bool IsTypeDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetColor()
+   */
+  Vector4 GetColor() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsColorDefined()
+   */
+  bool IsColorDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetHeight()
+   */
+  float GetHeight() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsHeightDefined()
+   */
+  bool IsHeightDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetDashGap()
+   */
+  float GetDashGap() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsDashGapDefined()
+   */
+  bool IsDashGapDefined() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetDashWidth()
+   */
+  float GetDashWidth() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsDashWidthDefined()
+   */
+  bool IsDashWidthDefined() const;
+
+public: //Methods. Not intended for application developers
+  /**
+   * @brief Set the type of underline.
+   *
+   * @param[in] type The type of line.
+   */
+  void SetType(const Text::Underline::Type& type);
+
+  /**
+   * @brief Set the color of underline.
+   *
+   * @param[in] color The color of line.
+   */
+  void SetColor(const Vector4& color);
+
+  /**
+   * @brief Set the height of underline.
+   *
+   * @param[in] height The height of line.
+   */
+  void SetHeight(const float& height);
+
+  /**
+   * @brief Set the dash-gap of underline.
+   *
+   * @param[in] dashGap The dash-gap of line.
+   */
+  void SetDashGap(const float& dashGap);
+
+  /**
+    * @brief Set the dash-width of underline.
+    *
+    * @param[in] dashWidth The dash-width of line.
+    */
+  void SetDashWidth(const float& dashWidth);
+
+public: //Methods for internal only
+        /**
+   * @copydoc Dali::Toolkit::Text::BaseSpan::CreateStyleCharacterRun
+   */
+  void CreateStyleCharacterRun(IntrusivePtr<LogicalModel>& logicalModel, const Dali::Toolkit::Text::Range& range) const override;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class UnderlineSpan
+
+} // namespace Internal
+
+// Helpers for public-api forwarding methods
+
+inline Internal::UnderlineSpan& GetImplementation(Dali::Toolkit::Text::UnderlineSpan& underlineSpan)
+{
+  DALI_ASSERT_ALWAYS(underlineSpan && "underlineSpan handle is empty");
+
+  BaseObject& object = underlineSpan.GetBaseObject();
+
+  return static_cast<Internal::UnderlineSpan&>(object);
+}
+
+inline const Internal::UnderlineSpan& GetImplementation(const Dali::Toolkit::Text::UnderlineSpan& underlineSpan)
+{
+  DALI_ASSERT_ALWAYS(underlineSpan && "underlineSpan handle is empty");
+
+  const BaseObject& object = underlineSpan.GetBaseObject();
+
+  return static_cast<const Internal::UnderlineSpan&>(object);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_UNDERLINE_SPAN_IMPL_H
\ No newline at end of file
diff --git a/dali-toolkit/internal/text/strikethrough-character-run.h b/dali-toolkit/internal/text/strikethrough-character-run.h
new file mode 100644
index 0000000..1d0bc87
--- /dev/null
+++ b/dali-toolkit/internal/text/strikethrough-character-run.h
@@ -0,0 +1,67 @@
+#ifndef DALI_TOOLKIT_TEXT_STRIKETHROUGH_CHARACTER_RUN_H
+#define DALI_TOOLKIT_TEXT_STRIKETHROUGH_CHARACTER_RUN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector4.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
+#include <dali-toolkit/internal/text/strikethrough-style-properties.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Run of strikethrough characters with same properties.
+ */
+struct StrikethroughCharacterRun : public AbstractStyleCharacterRun
+{
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  StrikethroughCharacterRun()
+  : AbstractStyleCharacterRun(),
+    properties{}
+  {
+  }
+
+  StrikethroughStyleProperties properties; /// The properties of strikethrough style
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow StrikethroughCharacterRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::StrikethroughCharacterRun> : public Dali::BasicTypes<Dali::Toolkit::Text::StrikethroughCharacterRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_STRIKETHROUGH_CHARACTER_RUN_H
diff --git a/dali-toolkit/internal/text/strikethrough-glyph-run.h b/dali-toolkit/internal/text/strikethrough-glyph-run.h
new file mode 100644
index 0000000..61536bc
--- /dev/null
+++ b/dali-toolkit/internal/text/strikethrough-glyph-run.h
@@ -0,0 +1,58 @@
+#ifndef DALI_TOOLKIT_TEXT_STRIKETHROUGH_GLYPH_RUN_H
+#define DALI_TOOLKIT_TEXT_STRIKETHROUGH_GLYPH_RUN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector4.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/glyph-run.h>
+#include <dali-toolkit/internal/text/strikethrough-style-properties.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Run of strikethrough glyphs with same properties.
+ */
+struct StrikethroughGlyphRun
+{
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  StrikethroughGlyphRun()
+  : glyphRun{},
+    properties{}
+  {
+  }
+
+  GlyphRun                     glyphRun;   ///< The initial glyph index and the number of glyphs in the run.
+  StrikethroughStyleProperties properties; /// The properties of strikethrough style
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_STRIKETHROUGH_GLYPH_RUN_H
diff --git a/dali-toolkit/internal/text/strikethrough-style-properties.h b/dali-toolkit/internal/text/strikethrough-style-properties.h
new file mode 100644
index 0000000..1a68bbe
--- /dev/null
+++ b/dali-toolkit/internal/text/strikethrough-style-properties.h
@@ -0,0 +1,134 @@
+#ifndef DALI_TOOLKIT_TEXT_STRIKETHROUGH_STYLE_PROPERTIES_H
+#define DALI_TOOLKIT_TEXT_STRIKETHROUGH_STYLE_PROPERTIES_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/math-utils.h>
+#include <dali/public-api/math/vector4.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Properties of strikethrough style.
+ */
+struct StrikethroughStyleProperties
+{
+  // Constructors
+
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  StrikethroughStyleProperties()
+  : color{Color::BLACK},
+    height{0u},
+    colorDefined{false},
+    heightDefined{false}
+  {
+  }
+
+  StrikethroughStyleProperties(Vector4 color,
+                               float   height,
+                               bool    colorDefined,
+                               bool    heightDefined)
+  : color{color},
+    height{height},
+    colorDefined{colorDefined},
+    heightDefined{heightDefined}
+
+  {
+  }
+
+  // Overloading operators
+
+  bool operator==(const StrikethroughStyleProperties& other) const
+  {
+    //The property is similar when both are not defined or when both are defined and have the same value.
+    return ((!colorDefined && !other.colorDefined) || ((colorDefined && other.colorDefined) && (color == other.color))) &&
+           ((!heightDefined && !other.heightDefined) || ((heightDefined && other.heightDefined) && (Dali::Equals(height, other.height))));
+  }
+
+  bool operator!=(const StrikethroughStyleProperties& other) const
+  {
+    return !(*this == other);
+  }
+
+  bool IsHeightEqualTo(const StrikethroughStyleProperties& other) const
+  {
+    return ((!heightDefined && !other.heightDefined) || ((heightDefined && other.heightDefined) && (Dali::Equals(height, other.height))));
+  }
+
+  StrikethroughStyleProperties& CopyIfNotDefined(const StrikethroughStyleProperties& other)
+  {
+    //Copy only the defined properties in other and not defined in this from other to this
+
+    if(!heightDefined && other.heightDefined)
+    {
+      height        = other.height;
+      heightDefined = true;
+    }
+
+    if(!colorDefined && other.colorDefined)
+    {
+      color        = other.color;
+      colorDefined = true;
+    }
+
+    // to chain this method
+    return *this;
+  }
+
+  StrikethroughStyleProperties& OverrideByDefinedProperties(const StrikethroughStyleProperties& other)
+  {
+    //Copy only the defined properties in other from other to this
+
+    if(other.heightDefined)
+    {
+      height        = other.height;
+      heightDefined = true;
+    }
+
+    if(other.colorDefined)
+    {
+      color        = other.color;
+      colorDefined = true;
+    }
+
+    // to chain this method
+    return *this;
+  }
+
+  //Attributes
+  Vector4 color;  ///< The color of strikethrough.
+  float   height; ///< The height of strikethrough.
+
+  bool colorDefined : 1;  ///< Whether the color is defined.
+  bool heightDefined : 1; ///< Whether the height is defined.
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_STRIKETHROUGH_STYLE_PROPERTIES_H
diff --git a/dali-toolkit/internal/text/string-text/character-sequence-impl.cpp b/dali-toolkit/internal/text/string-text/character-sequence-impl.cpp
new file mode 100644
index 0000000..10ebe24
--- /dev/null
+++ b/dali-toolkit/internal/text/string-text/character-sequence-impl.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// HEADER FILE
+#include <dali-toolkit/internal/text/string-text/character-sequence-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+CharacterSequence::CharacterSequence()
+: BaseObject()
+{
+}
+
+CharacterSequence::~CharacterSequence()
+{
+}
+
+} // namespace Internal
+} // namespace Text
+} // namespace Toolkit
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/string-text/character-sequence-impl.h b/dali-toolkit/internal/text/string-text/character-sequence-impl.h
new file mode 100644
index 0000000..d04883b
--- /dev/null
+++ b/dali-toolkit/internal/text/string-text/character-sequence-impl.h
@@ -0,0 +1,124 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SEQUENCE_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SEQUENCE_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/character-sequence.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/text-definitions.h>
+#include <dali/public-api/object/base-object.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class CharacterSequence;
+
+typedef IntrusivePtr<CharacterSequence> CharacterSequencePtr;
+typedef const CharacterSequence*        CharacterSequenceConstPtr;
+
+/**
+ * @copydoc Dali::Toolkit::Text::CharacterSequence
+ */
+class CharacterSequence : public BaseObject
+{
+public:
+  /**
+   * This constructor is only used by derived classes.
+   */
+  CharacterSequence();
+
+  /**
+   * @brief Virtual destructor.
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  virtual ~CharacterSequence() = 0;
+
+  // Removed constructors and assignment operators
+public:
+  CharacterSequence(const CharacterSequence&) = delete;            ///< Deleted copy constructor
+  CharacterSequence(CharacterSequence&&)      = delete;            ///< Deleted move constructor
+  CharacterSequence& operator=(const CharacterSequence&) = delete; ///< Deleted copy assignment operator
+  CharacterSequence& operator=(CharacterSequence&&) = delete;      ///< Deleted move assignment operator
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSequence::GetCharacters()
+   */
+  virtual Vector<uint32_t> GetCharacters() const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSequence::GetNumberOfCharacters()
+   */
+  virtual uint32_t GetNumberOfCharacters() const = 0;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::CharacterSequence::ToString()
+   */
+  virtual std::string ToString() const = 0;
+
+}; // class CharacterSequence
+
+} // namespace Internal
+
+/**
+ * Helper methods for public API.
+ */
+inline Internal::CharacterSequence& GetImplementation(Dali::Toolkit::Text::CharacterSequence& characterSequence)
+{
+  DALI_ASSERT_ALWAYS(characterSequence && "characterSequence handle is empty");
+
+  BaseObject& handle = characterSequence.GetBaseObject();
+
+  return static_cast<Internal::CharacterSequence&>(handle);
+}
+
+inline const Internal::CharacterSequence& GetImplementation(const Dali::Toolkit::Text::CharacterSequence& characterSequence)
+{
+  DALI_ASSERT_ALWAYS(characterSequence && "characterSequence handle is empty");
+
+  const BaseObject& handle = characterSequence.GetBaseObject();
+
+  return static_cast<const Internal::CharacterSequence&>(handle);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow AbstractStyleSpan to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Internal::CharacterSequence> : public Dali::BasicTypes<Dali::Toolkit::Text::Internal::CharacterSequence>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SEQUENCE_IMPL_H
diff --git a/dali-toolkit/internal/text/string-text/range-impl.cpp b/dali-toolkit/internal/text/string-text/range-impl.cpp
new file mode 100644
index 0000000..8090958
--- /dev/null
+++ b/dali-toolkit/internal/text/string-text/range-impl.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/string-text/range-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+struct Range::Impl
+{
+  u_int32_t mStartIndex; /// The start index of range
+  u_int32_t mEndIndex;   /// The end index of range
+};
+
+Dali::Toolkit::Text::Range Range::New(u_int32_t startIndex, u_int32_t endIndex)
+{
+  RangePtr object = new Range(startIndex, endIndex);
+
+  Dali::Toolkit::Text::Range handle = Dali::Toolkit::Text::Range(object.Get());
+
+  return handle;
+}
+
+Range::Range(u_int32_t startIndex, u_int32_t endIndex)
+{
+  mImpl = std::make_unique<Impl>();
+
+  mImpl->mStartIndex = startIndex <= endIndex ? startIndex : endIndex;
+  mImpl->mEndIndex   = startIndex >= endIndex ? startIndex : endIndex;
+}
+
+Range::~Range()
+{
+}
+
+u_int32_t Range::GetStartIndex() const
+{
+  return mImpl->mStartIndex;
+}
+
+u_int32_t Range::GetEndIndex() const
+{
+  return mImpl->mEndIndex;
+}
+
+u_int32_t Range::GetNumberOfIndices() const
+{
+  return 1u + ((mImpl->mStartIndex <= mImpl->mEndIndex) ? (mImpl->mEndIndex - mImpl->mStartIndex) : (mImpl->mStartIndex - mImpl->mEndIndex));
+}
+
+} // namespace Internal
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/string-text/range-impl.h b/dali-toolkit/internal/text/string-text/range-impl.h
new file mode 100644
index 0000000..8b0f0d2
--- /dev/null
+++ b/dali-toolkit/internal/text/string-text/range-impl.h
@@ -0,0 +1,141 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_RANGE_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_RANGE_IMPL_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/text/range.h>
+#include <dali/public-api/object/base-object.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+namespace Internal
+{
+class Range;
+
+typedef IntrusivePtr<Range> RangePtr;
+
+/**
+ * @copydoc Dali::Toolkit::Text::Range
+ */
+class Range : public BaseObject
+{
+public:
+  /**
+   * @brief Creates a new Range.
+   *
+   * @param[in] startIndex the start index of range (included)
+   * @param[in] endIndex the end index of range (included)
+   *
+   * @return A public handle to the newly allocated Range.
+   */
+  static Dali::Toolkit::Text::Range New(u_int32_t startIndex, u_int32_t endIndex);
+
+  /**
+   * @brief Destructor
+   *
+   * A reference counted object may only be deleted by calling Unreference()
+   */
+  ~Range();
+
+protected:
+  /**
+   * @brief Constructs a new Range.
+   *
+   * @param[in] startIndex the start index of range (included)
+   * @param[in] endIndex the end index of range (included)
+   *
+   */
+  Range(u_int32_t startIndex, u_int32_t endIndex);
+
+public: //Methods
+  /**
+   * @copydoc Dali::Toolkit::Text::Range::GetStartIndex()
+   */
+  u_int32_t GetStartIndex() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Range::GetEndIndex()
+   */
+  u_int32_t GetEndIndex() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::Range::GetNumberOfIndices()
+   */
+  u_int32_t GetNumberOfIndices() const;
+
+public:
+  Range(const Range&) = delete;            ///< Deleted copy constructor
+  Range(Range&&)      = delete;            ///< Deleted move constructor
+  Range& operator=(const Range&) = delete; ///< Deleted copy assignment operator
+  Range& operator=(Range&&) = delete;      ///< Deleted move assignment operator
+
+private:
+  // Data
+  struct Impl;
+  std::unique_ptr<Impl> mImpl{nullptr};
+
+}; // class Range
+
+} // namespace Internal
+
+/**
+ * Helper methods for public API.
+ */
+inline Internal::Range& GetImplementation(Dali::Toolkit::Text::Range& range)
+{
+  DALI_ASSERT_ALWAYS(range && "range handle is empty");
+
+  BaseObject& handle = range.GetBaseObject();
+
+  return static_cast<Internal::Range&>(handle);
+}
+
+inline const Internal::Range& GetImplementation(const Dali::Toolkit::Text::Range& range)
+{
+  DALI_ASSERT_ALWAYS(range && "range handle is empty");
+
+  const BaseObject& handle = range.GetBaseObject();
+
+  return static_cast<const Internal::Range&>(handle);
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+// Allow Range to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::Internal::Range> : public Dali::BasicTypes<Dali::Toolkit::Text::Internal::Range>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_RANGE_IMPL_H
diff --git a/dali-toolkit/internal/text/text-controller-event-handler.cpp b/dali-toolkit/internal/text/text-controller-event-handler.cpp
deleted file mode 100644
index 5d78405..0000000
--- a/dali-toolkit/internal/text/text-controller-event-handler.cpp
+++ /dev/null
@@ -1,1002 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-event-handler.h>
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
-#include <dali/devel-api/adaptor-framework/key-devel.h>
-#include <dali/integration-api/debug.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/cursor-helper-functions.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-editable-control-interface.h>
-
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
-#endif
-
-const std::string KEY_C_NAME      = "c";
-const std::string KEY_V_NAME      = "v";
-const std::string KEY_X_NAME      = "x";
-const std::string KEY_A_NAME      = "a";
-const std::string KEY_INSERT_NAME = "Insert";
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-void Controller::EventHandler::KeyboardFocusGainEvent(Controller& controller)
-{
-  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected KeyboardFocusGainEvent");
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    if((EventData::INACTIVE == controller.mImpl->mEventData->mState) ||
-       (EventData::INTERRUPTED == controller.mImpl->mEventData->mState))
-    {
-      controller.mImpl->ChangeState(EventData::EDITING);
-      controller.mImpl->mEventData->mUpdateCursorPosition      = true; //If editing started without tap event, cursor update must be triggered.
-      controller.mImpl->mEventData->mUpdateInputStyle          = true;
-      controller.mImpl->mEventData->mScrollAfterUpdatePosition = true;
-    }
-    controller.mImpl->NotifyInputMethodContextMultiLineStatus();
-    if(controller.mImpl->IsShowingPlaceholderText())
-    {
-      // Show alternative placeholder-text when editing
-      controller.ShowPlaceholderText();
-    }
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-void Controller::EventHandler::KeyboardFocusLostEvent(Controller& controller)
-{
-  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected KeyboardFocusLostEvent");
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    if(EventData::INTERRUPTED != controller.mImpl->mEventData->mState)
-    {
-      // Init selection position
-      if(controller.mImpl->mEventData->mState == EventData::SELECTING)
-      {
-        uint32_t oldStart, oldEnd;
-        oldStart = controller.mImpl->mEventData->mLeftSelectionPosition;
-        oldEnd   = controller.mImpl->mEventData->mRightSelectionPosition;
-
-        controller.mImpl->mEventData->mLeftSelectionPosition  = controller.mImpl->mEventData->mPrimaryCursorPosition;
-        controller.mImpl->mEventData->mRightSelectionPosition = controller.mImpl->mEventData->mPrimaryCursorPosition;
-
-        if(controller.mImpl->mSelectableControlInterface != nullptr)
-        {
-          controller.mImpl->mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, controller.mImpl->mEventData->mPrimaryCursorPosition, controller.mImpl->mEventData->mPrimaryCursorPosition);
-        }
-      }
-
-      controller.mImpl->ChangeState(EventData::INACTIVE);
-
-      if(!controller.mImpl->IsShowingRealText())
-      {
-        // Revert to regular placeholder-text when not editing
-        controller.ShowPlaceholderText();
-      }
-    }
-  }
-  controller.mImpl->RequestRelayout();
-}
-
-bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyEvent& keyEvent)
-{
-  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected KeyEvent");
-
-  bool textChanged    = false;
-  bool relayoutNeeded = false;
-
-  if((NULL != controller.mImpl->mEventData) &&
-     (keyEvent.GetState() == KeyEvent::DOWN))
-  {
-    int                keyCode   = keyEvent.GetKeyCode();
-    const std::string& keyString = keyEvent.GetKeyString();
-    const std::string  keyName   = keyEvent.GetKeyName();
-    // Key will produce same logical-key value when ctrl
-    // is down, regardless of language layout
-    const std::string logicalKey = keyEvent.GetLogicalKey();
-
-    const bool isNullKey = (0 == keyCode) && (keyString.empty());
-
-    // Pre-process to separate modifying events from non-modifying input events.
-    if(isNullKey)
-    {
-      // In some platforms arrive key events with no key code.
-      // Do nothing.
-      return false;
-    }
-    else if(Dali::DALI_KEY_ESCAPE == keyCode || Dali::DALI_KEY_BACK == keyCode || Dali::DALI_KEY_SEARCH == keyCode)
-    {
-      // Do nothing
-      return false;
-    }
-    else if((Dali::DALI_KEY_CURSOR_LEFT == keyCode) ||
-            (Dali::DALI_KEY_CURSOR_RIGHT == keyCode) ||
-            (Dali::DALI_KEY_CURSOR_UP == keyCode) ||
-            (Dali::DALI_KEY_CURSOR_DOWN == keyCode))
-    {
-      // If don't have any text, do nothing.
-      if(!controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters)
-      {
-        return false;
-      }
-
-      uint32_t cursorPosition     = controller.mImpl->mEventData->mPrimaryCursorPosition;
-      uint32_t numberOfCharacters = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-      uint32_t cursorLine         = controller.mImpl->mModel->mVisualModel->GetLineOfCharacter(cursorPosition);
-      uint32_t numberOfLines      = controller.mImpl->mModel->GetNumberOfLines();
-
-      // Logic to determine whether this text control will lose focus or not.
-      if((Dali::DALI_KEY_CURSOR_LEFT == keyCode && 0 == cursorPosition && !keyEvent.IsShiftModifier()) ||
-         (Dali::DALI_KEY_CURSOR_RIGHT == keyCode && numberOfCharacters == cursorPosition && !keyEvent.IsShiftModifier()) ||
-         (Dali::DALI_KEY_CURSOR_DOWN == keyCode && cursorLine == numberOfLines - 1) ||
-         (Dali::DALI_KEY_CURSOR_DOWN == keyCode && numberOfCharacters == cursorPosition && cursorLine - 1 == numberOfLines - 1) ||
-         (Dali::DALI_KEY_CURSOR_UP == keyCode && cursorLine == 0) ||
-         (Dali::DALI_KEY_CURSOR_UP == keyCode && numberOfCharacters == cursorPosition && cursorLine == 1))
-      {
-        // Release the active highlight.
-        if(controller.mImpl->mEventData->mState == EventData::SELECTING)
-        {
-          uint32_t oldStart, oldEnd;
-          oldStart = controller.mImpl->mEventData->mLeftSelectionPosition;
-          oldEnd   = controller.mImpl->mEventData->mRightSelectionPosition;
-
-          controller.mImpl->ChangeState(EventData::EDITING);
-
-          // Update selection position.
-          controller.mImpl->mEventData->mLeftSelectionPosition  = controller.mImpl->mEventData->mPrimaryCursorPosition;
-          controller.mImpl->mEventData->mRightSelectionPosition = controller.mImpl->mEventData->mPrimaryCursorPosition;
-          controller.mImpl->mEventData->mUpdateCursorPosition   = true;
-
-          if(controller.mImpl->mSelectableControlInterface != nullptr)
-          {
-            controller.mImpl->mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, controller.mImpl->mEventData->mLeftSelectionPosition, controller.mImpl->mEventData->mRightSelectionPosition);
-          }
-
-          controller.mImpl->RequestRelayout();
-        }
-        return false;
-      }
-
-      controller.mImpl->mEventData->mCheckScrollAmount = true;
-      Event event(Event::CURSOR_KEY_EVENT);
-      event.p1.mInt  = keyCode;
-      event.p2.mBool = keyEvent.IsShiftModifier();
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-    }
-    else if(Dali::DevelKey::DALI_KEY_CONTROL_LEFT == keyCode || Dali::DevelKey::DALI_KEY_CONTROL_RIGHT == keyCode)
-    {
-      // Left or Right Control key event is received before Ctrl-C/V/X key event is received
-      // If not handle it here, any selected text will be deleted
-
-      // Do nothing
-      return false;
-    }
-    else if(keyEvent.IsCtrlModifier() && !keyEvent.IsShiftModifier())
-    {
-      bool consumed = false;
-      if(keyName == KEY_C_NAME || keyName == KEY_INSERT_NAME || logicalKey == KEY_C_NAME || logicalKey == KEY_INSERT_NAME)
-      {
-        // Ctrl-C or Ctrl+Insert to copy the selected text
-        controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::COPY);
-        consumed = true;
-      }
-      else if(keyName == KEY_V_NAME || logicalKey == KEY_V_NAME)
-      {
-        // Ctrl-V to paste the copied text
-        controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::PASTE);
-        consumed = true;
-      }
-      else if(keyName == KEY_X_NAME || logicalKey == KEY_X_NAME)
-      {
-        // Ctrl-X to cut the selected text
-        controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::CUT);
-        consumed = true;
-      }
-      else if(keyName == KEY_A_NAME || logicalKey == KEY_A_NAME)
-      {
-        // Ctrl-A to select All the text
-        controller.TextPopupButtonTouched(Toolkit::TextSelectionPopup::SELECT_ALL);
-        consumed = true;
-      }
-      return consumed;
-    }
-    else if((Dali::DALI_KEY_BACKSPACE == keyCode) ||
-            (Dali::DevelKey::DALI_KEY_DELETE == keyCode))
-    {
-      textChanged = controller.DeleteEvent(keyCode);
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-    }
-    else if(IsKey(keyEvent, Dali::DALI_KEY_POWER) ||
-            IsKey(keyEvent, Dali::DALI_KEY_MENU) ||
-            IsKey(keyEvent, Dali::DALI_KEY_HOME))
-    {
-      // Power key/Menu/Home key behaviour does not allow edit mode to resume.
-      controller.mImpl->ChangeState(EventData::INACTIVE);
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-
-      // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text.
-    }
-    else if((Dali::DALI_KEY_SHIFT_LEFT == keyCode) || (Dali::DALI_KEY_SHIFT_RIGHT == keyCode))
-    {
-      // DALI_KEY_SHIFT_LEFT or DALI_KEY_SHIFT_RIGHT is the key code for Shift. It's sent (by the InputMethodContext?) when the predictive text is enabled
-      // and a character is typed after the type of a upper case latin character.
-
-      // Do nothing.
-      return false;
-    }
-    else if((Dali::DALI_KEY_VOLUME_UP == keyCode) || (Dali::DALI_KEY_VOLUME_DOWN == keyCode))
-    {
-      // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text.
-      // Do nothing.
-      return false;
-    }
-    else
-    {
-      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", &controller, keyString.c_str());
-      if(!controller.IsEditable()) return false;
-
-      std::string refinedKey = keyString;
-      if(controller.mImpl->mInputFilter != NULL && !refinedKey.empty())
-      {
-        bool accepted = false;
-        bool rejected = false;
-        accepted      = controller.mImpl->mInputFilter->Contains(Toolkit::InputFilter::Property::ACCEPTED, keyString);
-        rejected      = controller.mImpl->mInputFilter->Contains(Toolkit::InputFilter::Property::REJECTED, keyString);
-
-        if(!accepted)
-        {
-          // The filtered key is set to empty.
-          refinedKey = "";
-          // Signal emits when the character to be inserted is filtered by the accepted filter.
-          controller.mImpl->mEditableControlInterface->InputFiltered(Toolkit::InputFilter::Property::ACCEPTED);
-        }
-        if(rejected)
-        {
-          // The filtered key is set to empty.
-          refinedKey = "";
-          // Signal emits when the character to be inserted is filtered by the rejected filter.
-          controller.mImpl->mEditableControlInterface->InputFiltered(Toolkit::InputFilter::Property::REJECTED);
-        }
-      }
-
-      if(!refinedKey.empty())
-      {
-        // InputMethodContext is no longer handling key-events
-        controller.mImpl->ClearPreEditFlag();
-
-        controller.InsertText(refinedKey, COMMIT);
-
-        textChanged = true;
-
-        // Will request for relayout.
-        relayoutNeeded = true;
-      }
-    }
-
-    if((controller.mImpl->mEventData->mState != EventData::INTERRUPTED) &&
-       (controller.mImpl->mEventData->mState != EventData::INACTIVE) &&
-       (!isNullKey) &&
-       (Dali::DALI_KEY_SHIFT_LEFT != keyCode) &&
-       (Dali::DALI_KEY_SHIFT_RIGHT != keyCode) &&
-       (Dali::DALI_KEY_VOLUME_UP != keyCode) &&
-       (Dali::DALI_KEY_VOLUME_DOWN != keyCode))
-    {
-      // Should not change the state if the key is the shift send by the InputMethodContext.
-      // Otherwise, when the state is SELECTING the text controller can't send the right
-      // surrounding info to the InputMethodContext.
-      controller.mImpl->ChangeState(EventData::EDITING);
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-    }
-
-    if(relayoutNeeded)
-    {
-      controller.mImpl->RequestRelayout();
-    }
-  }
-
-  if(textChanged &&
-     (NULL != controller.mImpl->mEditableControlInterface))
-  {
-    // Do this last since it provides callbacks into application code
-    controller.mImpl->mEditableControlInterface->TextChanged(false);
-  }
-
-  return true;
-}
-
-void Controller::EventHandler::AnchorEvent(Controller& controller, float x, float y)
-{
-  if(!controller.mImpl->mMarkupProcessorEnabled ||
-     !controller.mImpl->mModel->mLogicalModel->mAnchors.Count() ||
-     !controller.mImpl->IsShowingRealText())
-  {
-    return;
-  }
-
-  CharacterIndex cursorPosition = 0u;
-
-  // Convert from control's coords to text's coords.
-  const float xPosition = x - controller.mImpl->mModel->mScrollPosition.x;
-  const float yPosition = y - controller.mImpl->mModel->mScrollPosition.y;
-
-  // Whether to touch point hits on a glyph.
-  bool matchedCharacter = false;
-  cursorPosition        = Text::GetClosestCursorIndex(controller.mImpl->mModel->mVisualModel,
-                                               controller.mImpl->mModel->mLogicalModel,
-                                               controller.mImpl->mMetrics,
-                                               xPosition,
-                                               yPosition,
-                                               CharacterHitTest::TAP,
-                                               matchedCharacter);
-
-  for(const auto& anchor : controller.mImpl->mModel->mLogicalModel->mAnchors)
-  {
-    // Anchor clicked if the calculated cursor position is within the range of anchor.
-    if(cursorPosition >= anchor.startIndex && cursorPosition < anchor.endIndex)
-    {
-      if(controller.mImpl->mAnchorControlInterface && anchor.href)
-      {
-        std::string href(anchor.href);
-        controller.mImpl->mAnchorControlInterface->AnchorClicked(href);
-        break;
-      }
-    }
-  }
-}
-
-void Controller::EventHandler::TapEvent(Controller& controller, unsigned int tapCount, float x, float y)
-{
-  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected TapEvent");
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    DALI_LOG_INFO(gLogFilter, Debug::Concise, "TapEvent state:%d \n", controller.mImpl->mEventData->mState);
-    EventData::State state(controller.mImpl->mEventData->mState);
-    bool             relayoutNeeded(false); // to avoid unnecessary relayouts when tapping an empty text-field
-
-    if(controller.mImpl->IsClipboardVisible())
-    {
-      if(EventData::INACTIVE == state || EventData::EDITING == state)
-      {
-        controller.mImpl->ChangeState(EventData::EDITING_WITH_GRAB_HANDLE);
-      }
-      relayoutNeeded = true;
-    }
-    else if(1u == tapCount)
-    {
-      if(EventData::EDITING_WITH_POPUP == state || EventData::EDITING_WITH_PASTE_POPUP == state)
-      {
-        controller.mImpl->ChangeState(EventData::EDITING_WITH_GRAB_HANDLE); // If Popup shown hide it here so can be shown again if required.
-      }
-
-      if(controller.mImpl->IsShowingRealText() && (EventData::INACTIVE != state))
-      {
-        controller.mImpl->ChangeState(EventData::EDITING_WITH_GRAB_HANDLE);
-        relayoutNeeded = true;
-      }
-      else
-      {
-        if(controller.mImpl->IsShowingPlaceholderText() && !controller.mImpl->IsFocusedPlaceholderAvailable())
-        {
-          // Hide placeholder text
-          controller.ResetText();
-        }
-
-        if(EventData::INACTIVE == state)
-        {
-          controller.mImpl->ChangeState(EventData::EDITING);
-        }
-        else if(!controller.mImpl->IsClipboardEmpty())
-        {
-          controller.mImpl->ChangeState(EventData::EDITING_WITH_POPUP);
-        }
-        relayoutNeeded = true;
-      }
-    }
-    else if(2u == tapCount)
-    {
-      if(controller.mImpl->mEventData->mSelectionEnabled &&
-         controller.mImpl->IsShowingRealText())
-      {
-        relayoutNeeded                                       = true;
-        controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
-        controller.mImpl->mEventData->mIsRightHandleSelected = true;
-      }
-    }
-
-    // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
-    if(relayoutNeeded)
-    {
-      Event event(Event::TAP_EVENT);
-      event.p1.mUint  = tapCount;
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-
-      controller.mImpl->RequestRelayout();
-    }
-  }
-
-  // Reset keyboard as tap event has occurred.
-  controller.mImpl->ResetInputMethodContext();
-}
-
-void Controller::EventHandler::PanEvent(Controller& controller, GestureState state, const Vector2& displacement)
-{
-  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected PanEvent");
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    Event event(Event::PAN_EVENT);
-    event.p1.mInt   = static_cast<int>(state);
-    event.p2.mFloat = displacement.x;
-    event.p3.mFloat = displacement.y;
-    controller.mImpl->mEventData->mEventQueue.push_back(event);
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-void Controller::EventHandler::LongPressEvent(Controller& controller, GestureState state, float x, float y)
-{
-  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected LongPressEvent");
-
-  if((state == GestureState::STARTED) &&
-     (NULL != controller.mImpl->mEventData))
-  {
-    // The 1st long-press on inactive text-field is treated as tap
-    if(EventData::INACTIVE == controller.mImpl->mEventData->mState)
-    {
-      controller.mImpl->ChangeState(EventData::EDITING);
-
-      Event event(Event::TAP_EVENT);
-      event.p1.mUint  = 1;
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-
-      controller.mImpl->RequestRelayout();
-    }
-    else if(!controller.mImpl->IsShowingRealText())
-    {
-      Event event(Event::LONG_PRESS_EVENT);
-      event.p1.mInt   = static_cast<int>(state);
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-      controller.mImpl->RequestRelayout();
-    }
-    else if(!controller.mImpl->IsClipboardVisible())
-    {
-      // Reset the InputMethodContext to commit the pre-edit before selecting the text.
-      controller.mImpl->ResetInputMethodContext();
-
-      Event event(Event::LONG_PRESS_EVENT);
-      event.p1.mInt   = static_cast<int>(state);
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-      controller.mImpl->RequestRelayout();
-
-      controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
-      controller.mImpl->mEventData->mIsRightHandleSelected = true;
-    }
-  }
-}
-
-void Controller::EventHandler::SelectEvent(Controller& controller, float x, float y, SelectionType selectType)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SelectEvent\n");
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    if(selectType == SelectionType::ALL)
-    {
-      Event event(Event::SELECT_ALL);
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-    }
-    else if(selectType == SelectionType::NONE)
-    {
-      Event event(Event::SELECT_NONE);
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-    }
-    else
-    {
-      Event event(Event::SELECT);
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-    }
-
-    controller.mImpl->mEventData->mCheckScrollAmount     = true;
-    controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
-    controller.mImpl->mEventData->mIsRightHandleSelected = true;
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-void Controller::EventHandler::SelectEvent(Controller& controller, const uint32_t start, const uint32_t end, SelectionType selectType)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SelectEvent\n");
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    if(selectType == SelectionType::RANGE)
-    {
-      Event event(Event::SELECT_RANGE);
-      event.p2.mUint = start;
-      event.p3.mUint = end;
-      controller.mImpl->mEventData->mEventQueue.push_back(event);
-    }
-
-    controller.mImpl->mEventData->mCheckScrollAmount     = true;
-    controller.mImpl->mEventData->mIsLeftHandleSelected  = true;
-    controller.mImpl->mEventData->mIsRightHandleSelected = true;
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-void Controller::EventHandler::ProcessModifyEvents(Controller& controller)
-{
-  Vector<ModifyEvent>& events = controller.mImpl->mModifyEvents;
-
-  if(0u == events.Count())
-  {
-    // Nothing to do.
-    return;
-  }
-
-  for(Vector<ModifyEvent>::ConstIterator it    = events.Begin(),
-                                         endIt = events.End();
-      it != endIt;
-      ++it)
-  {
-    const ModifyEvent& event = *it;
-
-    if(ModifyEvent::TEXT_REPLACED == event.type)
-    {
-      // A (single) replace event should come first, otherwise we wasted time processing NOOP events
-      DALI_ASSERT_DEBUG(it == events.Begin() && "Unexpected TEXT_REPLACED event");
-
-      controller.TextReplacedEvent();
-    }
-    else if(ModifyEvent::TEXT_INSERTED == event.type)
-    {
-      controller.TextInsertedEvent();
-    }
-    else if(ModifyEvent::TEXT_DELETED == event.type)
-    {
-      // Placeholder-text cannot be deleted
-      if(!controller.mImpl->IsShowingPlaceholderText())
-      {
-        controller.TextDeletedEvent();
-      }
-    }
-  }
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    uint32_t oldStart, oldEnd;
-    oldStart = controller.mImpl->mEventData->mLeftSelectionPosition;
-    oldEnd   = controller.mImpl->mEventData->mRightSelectionPosition;
-
-    // When the text is being modified, delay cursor blinking
-    controller.mImpl->mEventData->mDecorator->DelayCursorBlink();
-
-    // Update selection position after modifying the text
-    controller.mImpl->mEventData->mLeftSelectionPosition  = controller.mImpl->mEventData->mPrimaryCursorPosition;
-    controller.mImpl->mEventData->mRightSelectionPosition = controller.mImpl->mEventData->mPrimaryCursorPosition;
-
-    if(controller.mImpl->mSelectableControlInterface != nullptr && controller.mImpl->mEventData->mState == EventData::SELECTING)
-    {
-      controller.mImpl->mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, controller.mImpl->mEventData->mLeftSelectionPosition, controller.mImpl->mEventData->mRightSelectionPosition);
-    }
-  }
-
-  // DISCARD temporary text
-  events.Clear();
-}
-
-void Controller::EventHandler::TextReplacedEvent(Controller& controller)
-{
-  // The natural size needs to be re-calculated.
-  controller.mImpl->mRecalculateNaturalSize = true;
-
-  // The text direction needs to be updated.
-  controller.mImpl->mUpdateTextDirection = true;
-
-  // Apply modifications to the model
-  controller.mImpl->mOperationsPending = ALL_OPERATIONS;
-}
-
-void Controller::EventHandler::TextInsertedEvent(Controller& controller)
-{
-  DALI_ASSERT_DEBUG(NULL != controller.mImpl->mEventData && "Unexpected TextInsertedEvent");
-
-  if(NULL == controller.mImpl->mEventData)
-  {
-    return;
-  }
-
-  controller.mImpl->mEventData->mCheckScrollAmount = true;
-
-  // The natural size needs to be re-calculated.
-  controller.mImpl->mRecalculateNaturalSize = true;
-
-  // The text direction needs to be updated.
-  controller.mImpl->mUpdateTextDirection = true;
-
-  // Apply modifications to the model; TODO - Optimize this
-  controller.mImpl->mOperationsPending = ALL_OPERATIONS;
-}
-
-void Controller::EventHandler::TextDeletedEvent(Controller& controller)
-{
-  DALI_ASSERT_DEBUG(NULL != controller.mImpl->mEventData && "Unexpected TextDeletedEvent");
-
-  if(NULL == controller.mImpl->mEventData)
-  {
-    return;
-  }
-
-  if(!controller.IsEditable()) return;
-
-  controller.mImpl->mEventData->mCheckScrollAmount = true;
-
-  // The natural size needs to be re-calculated.
-  controller.mImpl->mRecalculateNaturalSize = true;
-
-  // The text direction needs to be updated.
-  controller.mImpl->mUpdateTextDirection = true;
-
-  // Apply modifications to the model; TODO - Optimize this
-  controller.mImpl->mOperationsPending = ALL_OPERATIONS;
-}
-
-bool Controller::EventHandler::DeleteEvent(Controller& controller, int keyCode)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::KeyEvent %p KeyCode : %d \n", &controller, keyCode);
-
-  bool removed = false;
-
-  if(NULL == controller.mImpl->mEventData)
-  {
-    return removed;
-  }
-
-  if(!controller.IsEditable()) return false;
-
-  // InputMethodContext is no longer handling key-events
-  controller.mImpl->ClearPreEditFlag();
-
-  if(EventData::SELECTING == controller.mImpl->mEventData->mState)
-  {
-    removed = controller.RemoveSelectedText();
-  }
-  else if((controller.mImpl->mEventData->mPrimaryCursorPosition > 0) && (keyCode == Dali::DALI_KEY_BACKSPACE))
-  {
-    // Remove the character before the current cursor position
-    removed = controller.RemoveText(-1,
-                                    1,
-                                    UPDATE_INPUT_STYLE);
-  }
-  else if((controller.mImpl->mEventData->mPrimaryCursorPosition < controller.mImpl->mModel->mLogicalModel->mText.Count()) &&
-          (keyCode == Dali::DevelKey::DALI_KEY_DELETE))
-  {
-    // Remove the character after the current cursor position
-    removed = controller.RemoveText(0,
-                                    1,
-                                    UPDATE_INPUT_STYLE);
-  }
-
-  if(removed)
-  {
-    if((0u != controller.mImpl->mModel->mLogicalModel->mText.Count()) ||
-       !controller.mImpl->IsPlaceholderAvailable())
-    {
-      controller.mImpl->QueueModifyEvent(ModifyEvent::TEXT_DELETED);
-    }
-    else
-    {
-      controller.ShowPlaceholderText();
-    }
-    controller.mImpl->mEventData->mUpdateCursorPosition = true;
-    controller.mImpl->mEventData->mScrollAfterDelete    = true;
-  }
-
-  return removed;
-}
-
-InputMethodContext::CallbackData Controller::EventHandler::OnInputMethodContextEvent(Controller& controller, InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
-{
-  // Whether the text needs to be relaid-out.
-  bool requestRelayout = false;
-
-  // Whether to retrieve the text and cursor position to be sent to the InputMethodContext.
-  bool retrieveText   = false;
-  bool retrieveCursor = false;
-
-  switch(inputMethodContextEvent.eventName)
-  {
-    case InputMethodContext::COMMIT:
-    {
-      controller.InsertText(inputMethodContextEvent.predictiveString, Text::Controller::COMMIT);
-      requestRelayout = true;
-      retrieveCursor  = true;
-      break;
-    }
-    case InputMethodContext::PRE_EDIT:
-    {
-      controller.InsertText(inputMethodContextEvent.predictiveString, Text::Controller::PRE_EDIT);
-      requestRelayout = true;
-      retrieveCursor  = true;
-      break;
-    }
-    case InputMethodContext::DELETE_SURROUNDING:
-    {
-      const bool textDeleted = controller.RemoveText(inputMethodContextEvent.cursorOffset,
-                                                     inputMethodContextEvent.numberOfChars,
-                                                     DONT_UPDATE_INPUT_STYLE);
-
-      if(textDeleted)
-      {
-        if((0u != controller.mImpl->mModel->mLogicalModel->mText.Count()) ||
-           !controller.mImpl->IsPlaceholderAvailable())
-        {
-          controller.mImpl->QueueModifyEvent(ModifyEvent::TEXT_DELETED);
-        }
-        else
-        {
-          controller.ShowPlaceholderText();
-        }
-        controller.mImpl->mEventData->mUpdateCursorPosition = true;
-        controller.mImpl->mEventData->mScrollAfterDelete    = true;
-
-        requestRelayout = true;
-      }
-      break;
-    }
-    case InputMethodContext::GET_SURROUNDING:
-    {
-      retrieveText   = true;
-      retrieveCursor = true;
-      break;
-    }
-    case InputMethodContext::PRIVATE_COMMAND:
-    {
-      // PRIVATECOMMAND event is just for getting the private command message
-      retrieveText   = true;
-      retrieveCursor = true;
-      break;
-    }
-    case InputMethodContext::VOID:
-    {
-      // do nothing
-      break;
-    }
-  } // end switch
-
-  if(requestRelayout)
-  {
-    controller.mImpl->mOperationsPending = ALL_OPERATIONS;
-    controller.mImpl->RequestRelayout();
-  }
-
-  std::string    text;
-  CharacterIndex cursorPosition      = 0u;
-  Length         numberOfWhiteSpaces = 0u;
-
-  if(retrieveCursor)
-  {
-    numberOfWhiteSpaces = controller.mImpl->GetNumberOfWhiteSpaces(0u);
-
-    cursorPosition = controller.mImpl->GetLogicalCursorPosition();
-
-    if(cursorPosition < numberOfWhiteSpaces)
-    {
-      cursorPosition = 0u;
-    }
-    else
-    {
-      cursorPosition -= numberOfWhiteSpaces;
-    }
-  }
-
-  if(retrieveText)
-  {
-    if(!controller.mImpl->IsShowingPlaceholderText())
-    {
-      // Retrieves the normal text string.
-      controller.mImpl->GetText(numberOfWhiteSpaces, text);
-    }
-    else
-    {
-      // When the current text is Placeholder Text, the surrounding text should be empty string.
-      // It means DALi should send empty string ("") to IME.
-      text = "";
-    }
-  }
-
-  InputMethodContext::CallbackData callbackData((retrieveText || retrieveCursor), cursorPosition, text, false);
-
-  if(requestRelayout &&
-     (NULL != controller.mImpl->mEditableControlInterface))
-  {
-    // Do this last since it provides callbacks into application code
-    controller.mImpl->mEditableControlInterface->TextChanged(false);
-  }
-
-  return callbackData;
-}
-
-void Controller::EventHandler::PasteClipboardItemEvent(Controller& controller)
-{
-  // Retrieve the clipboard contents first
-  ClipboardEventNotifier notifier(ClipboardEventNotifier::Get());
-  std::string            stringToPaste(notifier.GetContent());
-
-  // Commit the current pre-edit text; the contents of the clipboard should be appended
-  controller.mImpl->ResetInputMethodContext();
-
-  // Temporary disable hiding clipboard
-  controller.mImpl->SetClipboardHideEnable(false);
-
-  // Paste
-  controller.PasteText(stringToPaste);
-
-  controller.mImpl->SetClipboardHideEnable(true);
-}
-
-void Controller::EventHandler::DecorationEvent(Controller& controller, HandleType handleType, HandleState state, float x, float y)
-{
-  DALI_ASSERT_DEBUG(controller.mImpl->mEventData && "Unexpected DecorationEvent");
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    switch(handleType)
-    {
-      case GRAB_HANDLE:
-      {
-        Event event(Event::GRAB_HANDLE_EVENT);
-        event.p1.mUint  = state;
-        event.p2.mFloat = x;
-        event.p3.mFloat = y;
-
-        controller.mImpl->mEventData->mEventQueue.push_back(event);
-        break;
-      }
-      case LEFT_SELECTION_HANDLE:
-      {
-        Event event(Event::LEFT_SELECTION_HANDLE_EVENT);
-        event.p1.mUint  = state;
-        event.p2.mFloat = x;
-        event.p3.mFloat = y;
-
-        controller.mImpl->mEventData->mEventQueue.push_back(event);
-        break;
-      }
-      case RIGHT_SELECTION_HANDLE:
-      {
-        Event event(Event::RIGHT_SELECTION_HANDLE_EVENT);
-        event.p1.mUint  = state;
-        event.p2.mFloat = x;
-        event.p3.mFloat = y;
-
-        controller.mImpl->mEventData->mEventQueue.push_back(event);
-        break;
-      }
-      case LEFT_SELECTION_HANDLE_MARKER:
-      case RIGHT_SELECTION_HANDLE_MARKER:
-      {
-        // Markers do not move the handles.
-        break;
-      }
-      case HANDLE_TYPE_COUNT:
-      {
-        DALI_ASSERT_DEBUG(!"Controller::HandleEvent. Unexpected handle type");
-      }
-    }
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-void Controller::EventHandler::TextPopupButtonTouched(Controller& controller, Dali::Toolkit::TextSelectionPopup::Buttons button)
-{
-  if(NULL == controller.mImpl->mEventData)
-  {
-    return;
-  }
-
-  switch(button)
-  {
-    case Toolkit::TextSelectionPopup::CUT:
-    {
-      controller.CutText();
-      break;
-    }
-    case Toolkit::TextSelectionPopup::COPY:
-    {
-      controller.CopyText();
-      break;
-    }
-    case Toolkit::TextSelectionPopup::PASTE:
-    {
-      controller.PasteText();
-      break;
-    }
-    case Toolkit::TextSelectionPopup::SELECT:
-    {
-      const Vector2& currentCursorPosition = controller.mImpl->mEventData->mDecorator->GetPosition(PRIMARY_CURSOR);
-
-      if(controller.mImpl->mEventData->mSelectionEnabled)
-      {
-        // Creates a SELECT event.
-        controller.SelectEvent(currentCursorPosition.x, currentCursorPosition.y, SelectionType::INTERACTIVE);
-      }
-      break;
-    }
-    case Toolkit::TextSelectionPopup::SELECT_ALL:
-    {
-      // Creates a SELECT_ALL event
-      controller.SelectEvent(0.f, 0.f, SelectionType::ALL);
-      break;
-    }
-    case Toolkit::TextSelectionPopup::CLIPBOARD:
-    {
-      controller.mImpl->ShowClipboard();
-      break;
-    }
-    case Toolkit::TextSelectionPopup::NONE:
-    {
-      // Nothing to do.
-      break;
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-event-handler.h b/dali-toolkit/internal/text/text-controller-event-handler.h
deleted file mode 100644
index 6e6e068..0000000
--- a/dali-toolkit/internal/text/text-controller-event-handler.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_EVENT_HANDLER_H
-#define DALI_TOOLKIT_TEXT_CONTROLLER_EVENT_HANDLER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/input-method-context.h>
-#include <dali/public-api/events/gesture-enumerations.h>
-#include <dali/public-api/events/key-event.h>
-#include <dali/public-api/math/vector2.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
-#include <dali-toolkit/internal/text/decorator/text-decorator.h>
-#include <dali-toolkit/internal/text/text-controller.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Controller::EventHandler
-{
-  static void KeyboardFocusGainEvent(Controller& controller);
-  static void KeyboardFocusLostEvent(Controller& controller);
-  static bool KeyEvent(Controller& controller, const Dali::KeyEvent& keyEvent);
-  static void AnchorEvent(Controller& controller, float x, float y);
-  static void TapEvent(Controller& controller, unsigned int tapCount, float x, float y);
-  static void PanEvent(Controller& controller, GestureState state, const Vector2& displacement);
-  static void LongPressEvent(Controller& controller, GestureState state, float x, float y);
-  static void SelectEvent(Controller& controller, float x, float y, SelectionType selectType);
-  static void SelectEvent(Controller& controller, const uint32_t start, const uint32_t end, SelectionType selectType);
-  static void ProcessModifyEvents(Controller& controller);
-  static void TextReplacedEvent(Controller& controller);
-  static void TextInsertedEvent(Controller& controller);
-  static void TextDeletedEvent(Controller& controller);
-  static bool DeleteEvent(Controller& controller, int keyCode);
-
-  static InputMethodContext::CallbackData OnInputMethodContextEvent(Controller&                          controller,
-                                                                    InputMethodContext&                  inputMethodContext,
-                                                                    const InputMethodContext::EventData& inputMethodContextEvent);
-
-  static void PasteClipboardItemEvent(Controller& controller);
-  static void DecorationEvent(Controller& controller, HandleType handleType, HandleState state, float x, float y);
-  static void TextPopupButtonTouched(Controller& controller, Dali::Toolkit::TextSelectionPopup::Buttons button);
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_CONTROLLER_EVENT_HANDLER_H
diff --git a/dali-toolkit/internal/text/text-controller-impl-event-handler.cpp b/dali-toolkit/internal/text/text-controller-impl-event-handler.cpp
deleted file mode 100644
index 290c229..0000000
--- a/dali-toolkit/internal/text/text-controller-impl-event-handler.cpp
+++ /dev/null
@@ -1,1122 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-impl-event-handler.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/adaptor-framework/key.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/cursor-helper-functions.h>
-#include <dali-toolkit/internal/text/text-editable-control-interface.h>
-
-using namespace Dali;
-
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
-#endif
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-bool ControllerImplEventHandler::ProcessInputEvents(Controller::Impl& impl)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::ProcessInputEvents\n");
-
-  EventData*& eventData = impl.mEventData;
-  if(NULL == eventData)
-  {
-    // Nothing to do if there is no text input.
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::ProcessInputEvents no event data\n");
-    return false;
-  }
-
-  unsigned int oldPos = eventData->mPrimaryCursorPosition;
-
-  if(eventData->mDecorator)
-  {
-    for(std::vector<Event>::iterator iter = eventData->mEventQueue.begin();
-        iter != eventData->mEventQueue.end();
-        ++iter)
-    {
-      switch(iter->type)
-      {
-        case Event::CURSOR_KEY_EVENT:
-        {
-          OnCursorKeyEvent(impl, *iter);
-          break;
-        }
-        case Event::TAP_EVENT:
-        {
-          OnTapEvent(impl, *iter);
-          break;
-        }
-        case Event::LONG_PRESS_EVENT:
-        {
-          OnLongPressEvent(impl, *iter);
-          break;
-        }
-        case Event::PAN_EVENT:
-        {
-          OnPanEvent(impl, *iter);
-          break;
-        }
-        case Event::GRAB_HANDLE_EVENT:
-        case Event::LEFT_SELECTION_HANDLE_EVENT:
-        case Event::RIGHT_SELECTION_HANDLE_EVENT: // Fall through
-        {
-          OnHandleEvent(impl, *iter);
-          break;
-        }
-        case Event::SELECT:
-        {
-          OnSelectEvent(impl, *iter);
-          break;
-        }
-        case Event::SELECT_ALL:
-        {
-          OnSelectAllEvent(impl);
-          break;
-        }
-        case Event::SELECT_NONE:
-        {
-          OnSelectNoneEvent(impl);
-          break;
-        }
-        case Event::SELECT_RANGE:
-        {
-          OnSelectRangeEvent(impl, *iter);
-          break;
-        }
-      }
-    }
-  }
-
-  if(eventData->mUpdateCursorPosition ||
-     eventData->mUpdateHighlightBox)
-  {
-    impl.NotifyInputMethodContext();
-  }
-
-  // The cursor must also be repositioned after inserts into the model
-  if(eventData->mUpdateCursorPosition)
-  {
-    // Updates the cursor position and scrolls the text to make it visible.
-    CursorInfo cursorInfo;
-
-    // Calculate the cursor position from the new cursor index.
-    impl.GetCursorPosition(eventData->mPrimaryCursorPosition, cursorInfo);
-
-    //only emit the event if the cursor is moved in current function.
-    if(nullptr != impl.mEditableControlInterface && eventData->mEventQueue.size() > 0)
-    {
-      impl.mEditableControlInterface->CursorPositionChanged(oldPos, eventData->mPrimaryCursorPosition);
-    }
-
-    if(eventData->mUpdateCursorHookPosition)
-    {
-      // Update the cursor hook position. Used to move the cursor with the keys 'up' and 'down'.
-      eventData->mCursorHookPositionX      = cursorInfo.primaryPosition.x;
-      eventData->mUpdateCursorHookPosition = false;
-    }
-
-    // Scroll first the text after delete ...
-    if(eventData->mScrollAfterDelete)
-    {
-      impl.ScrollTextToMatchCursor(cursorInfo);
-    }
-
-    // ... then, text can be scrolled to make the cursor visible.
-    if(eventData->mScrollAfterUpdatePosition)
-    {
-      const Vector2 currentCursorPosition(cursorInfo.primaryPosition.x, cursorInfo.lineOffset);
-      impl.ScrollToMakePositionVisible(currentCursorPosition, cursorInfo.lineHeight);
-    }
-    eventData->mScrollAfterUpdatePosition = false;
-    eventData->mScrollAfterDelete         = false;
-
-    impl.UpdateCursorPosition(cursorInfo);
-
-    eventData->mDecoratorUpdated         = true;
-    eventData->mUpdateCursorPosition     = false;
-    eventData->mUpdateGrabHandlePosition = false;
-  }
-
-  if(eventData->mUpdateHighlightBox ||
-     eventData->mUpdateLeftSelectionPosition ||
-     eventData->mUpdateRightSelectionPosition)
-  {
-    CursorInfo leftHandleInfo;
-    CursorInfo rightHandleInfo;
-
-    if(eventData->mUpdateHighlightBox)
-    {
-      impl.GetCursorPosition(eventData->mLeftSelectionPosition, leftHandleInfo);
-
-      impl.GetCursorPosition(eventData->mRightSelectionPosition, rightHandleInfo);
-
-      if(eventData->mScrollAfterUpdatePosition && (eventData->mIsLeftHandleSelected ? eventData->mUpdateLeftSelectionPosition : eventData->mUpdateRightSelectionPosition))
-      {
-        if(eventData->mIsLeftHandleSelected && eventData->mIsRightHandleSelected)
-        {
-          CursorInfo& infoLeft = leftHandleInfo;
-
-          const Vector2 currentCursorPositionLeft(infoLeft.primaryPosition.x, infoLeft.lineOffset);
-          impl.ScrollToMakePositionVisible(currentCursorPositionLeft, infoLeft.lineHeight);
-
-          CursorInfo& infoRight = rightHandleInfo;
-
-          const Vector2 currentCursorPositionRight(infoRight.primaryPosition.x, infoRight.lineOffset);
-          impl.ScrollToMakePositionVisible(currentCursorPositionRight, infoRight.lineHeight);
-        }
-        else
-        {
-          CursorInfo& info = eventData->mIsLeftHandleSelected ? leftHandleInfo : rightHandleInfo;
-
-          const Vector2 currentCursorPosition(info.primaryPosition.x, info.lineOffset);
-          impl.ScrollToMakePositionVisible(currentCursorPosition, info.lineHeight);
-        }
-      }
-    }
-
-    if(eventData->mUpdateLeftSelectionPosition)
-    {
-      impl.UpdateSelectionHandle(LEFT_SELECTION_HANDLE, leftHandleInfo);
-
-      impl.SetPopupButtons();
-      eventData->mDecoratorUpdated            = true;
-      eventData->mUpdateLeftSelectionPosition = false;
-    }
-
-    if(eventData->mUpdateRightSelectionPosition)
-    {
-      impl.UpdateSelectionHandle(RIGHT_SELECTION_HANDLE, rightHandleInfo);
-
-      impl.SetPopupButtons();
-      eventData->mDecoratorUpdated             = true;
-      eventData->mUpdateRightSelectionPosition = false;
-    }
-
-    if(eventData->mUpdateHighlightBox)
-    {
-      impl.RepositionSelectionHandles();
-
-      eventData->mUpdateLeftSelectionPosition  = false;
-      eventData->mUpdateRightSelectionPosition = false;
-      eventData->mUpdateHighlightBox           = false;
-      eventData->mIsLeftHandleSelected         = false;
-      eventData->mIsRightHandleSelected        = false;
-    }
-
-    eventData->mScrollAfterUpdatePosition = false;
-  }
-
-  if(eventData->mUpdateInputStyle)
-  {
-    // Keep a copy of the current input style.
-    InputStyle currentInputStyle;
-    currentInputStyle.Copy(eventData->mInputStyle);
-
-    // Set the default style first.
-    impl.RetrieveDefaultInputStyle(eventData->mInputStyle);
-
-    // Get the character index from the cursor index.
-    const CharacterIndex styleIndex = (eventData->mPrimaryCursorPosition > 0u) ? eventData->mPrimaryCursorPosition - 1u : 0u;
-
-    // Retrieve the style from the style runs stored in the logical model.
-    impl.mModel->mLogicalModel->RetrieveStyle(styleIndex, eventData->mInputStyle);
-
-    // Compare if the input style has changed.
-    const bool hasInputStyleChanged = !currentInputStyle.Equal(eventData->mInputStyle);
-
-    if(hasInputStyleChanged)
-    {
-      const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask(eventData->mInputStyle);
-      // Queue the input style changed signal.
-      eventData->mInputStyleChangedQueue.PushBack(styleChangedMask);
-    }
-
-    eventData->mUpdateInputStyle = false;
-  }
-
-  eventData->mEventQueue.clear();
-
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::ProcessInputEvents\n");
-
-  const bool decoratorUpdated  = eventData->mDecoratorUpdated;
-  eventData->mDecoratorUpdated = false;
-
-  return decoratorUpdated;
-}
-
-void ControllerImplEventHandler::OnCursorKeyEvent(Controller::Impl& impl, const Event& event)
-{
-  if(NULL == impl.mEventData || !impl.IsShowingRealText())
-  {
-    // Nothing to do if there is no text input.
-    return;
-  }
-
-  int              keyCode         = event.p1.mInt;
-  bool             isShiftModifier = event.p2.mBool;
-  EventData&       eventData       = *impl.mEventData;
-  ModelPtr&        model           = impl.mModel;
-  LogicalModelPtr& logicalModel    = model->mLogicalModel;
-  VisualModelPtr&  visualModel     = model->mVisualModel;
-  uint32_t         oldSelStart     = eventData.mLeftSelectionPosition;
-  uint32_t         oldSelEnd       = eventData.mRightSelectionPosition;
-
-  CharacterIndex& primaryCursorPosition         = eventData.mPrimaryCursorPosition;
-  CharacterIndex  previousPrimaryCursorPosition = primaryCursorPosition;
-
-  if(Dali::DALI_KEY_CURSOR_LEFT == keyCode)
-  {
-    if(primaryCursorPosition > 0u)
-    {
-      if(!isShiftModifier && eventData.mDecorator->IsHighlightVisible())
-      {
-        primaryCursorPosition = std::min(eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-      }
-      else
-      {
-        primaryCursorPosition = impl.CalculateNewCursorIndex(primaryCursorPosition - 1u);
-      }
-    }
-  }
-  else if(Dali::DALI_KEY_CURSOR_RIGHT == keyCode)
-  {
-    if(logicalModel->mText.Count() > primaryCursorPosition)
-    {
-      if(!isShiftModifier && eventData.mDecorator->IsHighlightVisible())
-      {
-        primaryCursorPosition = std::max(eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-      }
-      else
-      {
-        primaryCursorPosition = impl.CalculateNewCursorIndex(primaryCursorPosition);
-      }
-    }
-  }
-  else if(Dali::DALI_KEY_CURSOR_UP == keyCode && !isShiftModifier)
-  {
-    // Ignore Shift-Up for text selection for now.
-
-    // Get first the line index of the current cursor position index.
-    CharacterIndex characterIndex = 0u;
-
-    if(primaryCursorPosition > 0u)
-    {
-      characterIndex = primaryCursorPosition - 1u;
-    }
-
-    const LineIndex lineIndex         = visualModel->GetLineOfCharacter(characterIndex);
-    const LineIndex previousLineIndex = (lineIndex > 0 ? lineIndex - 1u : lineIndex);
-
-    // Retrieve the cursor position info.
-    CursorInfo cursorInfo;
-    impl.GetCursorPosition(primaryCursorPosition,
-                           cursorInfo);
-
-    // Get the line above.
-    const LineRun& line = *(visualModel->mLines.Begin() + previousLineIndex);
-
-    // Get the next hit 'y' point.
-    const float hitPointY = cursorInfo.lineOffset - 0.5f * GetLineHeight(line);
-
-    // Use the cursor hook position 'x' and the next hit 'y' position to calculate the new cursor index.
-    bool matchedCharacter = false;
-    primaryCursorPosition = Text::GetClosestCursorIndex(visualModel,
-                                                        logicalModel,
-                                                        impl.mMetrics,
-                                                        eventData.mCursorHookPositionX,
-                                                        hitPointY,
-                                                        CharacterHitTest::TAP,
-                                                        matchedCharacter);
-  }
-  else if(Dali::DALI_KEY_CURSOR_DOWN == keyCode && !isShiftModifier)
-  {
-    // Ignore Shift-Down for text selection for now.
-
-    // Get first the line index of the current cursor position index.
-    CharacterIndex characterIndex = 0u;
-
-    if(primaryCursorPosition > 0u)
-    {
-      characterIndex = primaryCursorPosition - 1u;
-    }
-
-    const LineIndex lineIndex = visualModel->GetLineOfCharacter(characterIndex);
-
-    if(lineIndex + 1u < visualModel->mLines.Count())
-    {
-      // Retrieve the cursor position info.
-      CursorInfo cursorInfo;
-      impl.GetCursorPosition(primaryCursorPosition, cursorInfo);
-
-      // Get the line below.
-      const LineRun& line = *(visualModel->mLines.Begin() + lineIndex + 1u);
-
-      // Get the next hit 'y' point.
-      const float hitPointY = cursorInfo.lineOffset + cursorInfo.lineHeight + 0.5f * GetLineHeight(line);
-
-      // Use the cursor hook position 'x' and the next hit 'y' position to calculate the new cursor index.
-      bool matchedCharacter = false;
-      primaryCursorPosition = Text::GetClosestCursorIndex(visualModel,
-                                                          logicalModel,
-                                                          impl.mMetrics,
-                                                          eventData.mCursorHookPositionX,
-                                                          hitPointY,
-                                                          CharacterHitTest::TAP,
-                                                          matchedCharacter);
-    }
-  }
-
-  if(!isShiftModifier && eventData.mState != EventData::SELECTING)
-  {
-    // Update selection position after moving the cursor
-    eventData.mLeftSelectionPosition  = primaryCursorPosition;
-    eventData.mRightSelectionPosition = primaryCursorPosition;
-
-    if(impl.mSelectableControlInterface != nullptr && eventData.mDecorator->IsHighlightVisible())
-    {
-      impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-    }
-  }
-
-  if(isShiftModifier && impl.IsShowingRealText() && eventData.mShiftSelectionFlag)
-  {
-    // Handle text selection
-    bool selecting = false;
-
-    if(Dali::DALI_KEY_CURSOR_LEFT == keyCode || Dali::DALI_KEY_CURSOR_RIGHT == keyCode)
-    {
-      // Shift-Left/Right to select the text
-      int cursorPositionDelta = primaryCursorPosition - previousPrimaryCursorPosition;
-      if(cursorPositionDelta > 0 || eventData.mRightSelectionPosition > 0u) // Check the boundary
-      {
-        eventData.mRightSelectionPosition += cursorPositionDelta;
-        eventData.mPrimaryCursorPosition = eventData.mRightSelectionPosition;
-
-        if(impl.mSelectableControlInterface != nullptr)
-        {
-          impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-        }
-      }
-
-      if(impl.mSelectableControlInterface != nullptr && eventData.mLeftSelectionPosition == eventData.mRightSelectionPosition)
-      {
-        // If left selection position and right selection position are the same, the selection is canceled.
-        selecting = false;
-      }
-      else
-      {
-        selecting = true;
-      }
-    }
-    else if(eventData.mLeftSelectionPosition != eventData.mRightSelectionPosition)
-    {
-      // Show no grab handles and text highlight if Shift-Up/Down pressed but no selected text
-      selecting = true;
-    }
-
-    if(selecting)
-    {
-      // Notify the cursor position to the InputMethodContext.
-      if(eventData.mInputMethodContext)
-      {
-        eventData.mInputMethodContext.SetCursorPosition(primaryCursorPosition);
-        eventData.mInputMethodContext.NotifyCursorPosition();
-      }
-
-      impl.ChangeState(EventData::SELECTING);
-
-      eventData.mUpdateLeftSelectionPosition  = true;
-      eventData.mUpdateRightSelectionPosition = true;
-      eventData.mUpdateGrabHandlePosition     = true;
-      eventData.mUpdateHighlightBox           = true;
-
-      // Hide the text selection popup if select the text using keyboard instead of moving grab handles
-      if(eventData.mGrabHandlePopupEnabled)
-      {
-        eventData.mDecorator->SetPopupActive(false);
-      }
-    }
-    else
-    {
-      // If no selection, set a normal cursor.
-      impl.ChangeState(EventData::EDITING);
-      eventData.mUpdateCursorPosition = true;
-    }
-  }
-  else
-  {
-    // Handle normal cursor move
-    impl.ChangeState(EventData::EDITING);
-    eventData.mUpdateCursorPosition = true;
-  }
-
-  eventData.mUpdateInputStyle          = true;
-  eventData.mScrollAfterUpdatePosition = true;
-}
-
-void ControllerImplEventHandler::OnTapEvent(Controller::Impl& impl, const Event& event)
-{
-  if(impl.mEventData)
-  {
-    const unsigned int tapCount     = event.p1.mUint;
-    EventData&         eventData    = *impl.mEventData;
-    ModelPtr&          model        = impl.mModel;
-    LogicalModelPtr&   logicalModel = model->mLogicalModel;
-    VisualModelPtr&    visualModel  = model->mVisualModel;
-
-    if(1u == tapCount)
-    {
-      if(impl.IsShowingRealText())
-      {
-        // Convert from control's coords to text's coords.
-        const float xPosition   = event.p2.mFloat - model->mScrollPosition.x;
-        const float yPosition   = event.p3.mFloat - model->mScrollPosition.y;
-        uint32_t    oldSelStart = eventData.mLeftSelectionPosition;
-        uint32_t    oldSelEnd   = eventData.mRightSelectionPosition;
-
-        // Keep the tap 'x' position. Used to move the cursor.
-        eventData.mCursorHookPositionX = xPosition;
-
-        // Whether to touch point hits on a glyph.
-        bool matchedCharacter            = false;
-        eventData.mPrimaryCursorPosition = Text::GetClosestCursorIndex(visualModel,
-                                                                       logicalModel,
-                                                                       impl.mMetrics,
-                                                                       xPosition,
-                                                                       yPosition,
-                                                                       CharacterHitTest::TAP,
-                                                                       matchedCharacter);
-
-        if(impl.mSelectableControlInterface != nullptr && eventData.mDecorator->IsHighlightVisible())
-        {
-          impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, eventData.mPrimaryCursorPosition, eventData.mPrimaryCursorPosition);
-        }
-
-        // When the cursor position is changing, delay cursor blinking
-        eventData.mDecorator->DelayCursorBlink();
-      }
-      else
-      {
-        eventData.mPrimaryCursorPosition = 0u;
-      }
-
-      // Update selection position after tapping
-      eventData.mLeftSelectionPosition  = eventData.mPrimaryCursorPosition;
-      eventData.mRightSelectionPosition = eventData.mPrimaryCursorPosition;
-
-      eventData.mUpdateCursorPosition      = true;
-      eventData.mUpdateGrabHandlePosition  = true;
-      eventData.mScrollAfterUpdatePosition = true;
-      eventData.mUpdateInputStyle          = true;
-
-      // Notify the cursor position to the InputMethodContext.
-      if(eventData.mInputMethodContext)
-      {
-        eventData.mInputMethodContext.SetCursorPosition(eventData.mPrimaryCursorPosition);
-        eventData.mInputMethodContext.NotifyCursorPosition();
-      }
-    }
-    else if(2u == tapCount)
-    {
-      if(eventData.mSelectionEnabled)
-      {
-        // Convert from control's coords to text's coords.
-        const float xPosition = event.p2.mFloat - model->mScrollPosition.x;
-        const float yPosition = event.p3.mFloat - model->mScrollPosition.y;
-
-        // Calculates the logical position from the x,y coords.
-        impl.RepositionSelectionHandles(xPosition, yPosition, eventData.mDoubleTapAction);
-      }
-    }
-  }
-}
-
-void ControllerImplEventHandler::OnPanEvent(Controller::Impl& impl, const Event& event)
-{
-  if(impl.mEventData)
-  {
-    EventData&    eventData = *impl.mEventData;
-    DecoratorPtr& decorator = eventData.mDecorator;
-
-    const bool isHorizontalScrollEnabled = decorator->IsHorizontalScrollEnabled();
-    const bool isVerticalScrollEnabled   = decorator->IsVerticalScrollEnabled();
-
-    if(!isHorizontalScrollEnabled && !isVerticalScrollEnabled)
-    {
-      // Nothing to do if scrolling is not enabled.
-      return;
-    }
-
-    const GestureState state = static_cast<GestureState>(event.p1.mInt);
-    switch(state)
-    {
-      case GestureState::STARTED:
-      {
-        // Will remove the cursor, handles or text's popup, ...
-        impl.ChangeState(EventData::TEXT_PANNING);
-        break;
-      }
-      case GestureState::CONTINUING:
-      {
-        ModelPtr& model = impl.mModel;
-
-        const Vector2& layoutSize     = model->mVisualModel->GetLayoutSize();
-        Vector2&       scrollPosition = model->mScrollPosition;
-        const Vector2  currentScroll  = scrollPosition;
-
-        if(isHorizontalScrollEnabled)
-        {
-          const float displacementX = event.p2.mFloat;
-          scrollPosition.x += displacementX;
-
-          impl.ClampHorizontalScroll(layoutSize);
-        }
-
-        if(isVerticalScrollEnabled)
-        {
-          const float displacementY = event.p3.mFloat;
-          scrollPosition.y += displacementY;
-
-          impl.ClampVerticalScroll(layoutSize);
-        }
-
-        decorator->UpdatePositions(scrollPosition - currentScroll);
-        break;
-      }
-      case GestureState::FINISHED:
-      case GestureState::CANCELLED: // FALLTHROUGH
-      {
-        // Will go back to the previous state to show the cursor, handles, the text's popup, ...
-        impl.ChangeState(eventData.mPreviousState);
-        break;
-      }
-      default:
-        break;
-    }
-  }
-}
-
-void ControllerImplEventHandler::OnLongPressEvent(Controller::Impl& impl, const Event& event)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::OnLongPressEvent\n");
-
-  if(impl.mEventData)
-  {
-    EventData& eventData = *impl.mEventData;
-
-    if(!impl.IsShowingRealText() && (EventData::EDITING == eventData.mState))
-    {
-      impl.ChangeState(EventData::EDITING_WITH_POPUP);
-      eventData.mDecoratorUpdated = true;
-      eventData.mUpdateInputStyle = true;
-    }
-    else
-    {
-      if(eventData.mSelectionEnabled)
-      {
-        ModelPtr& model = impl.mModel;
-
-        // Convert from control's coords to text's coords.
-        const float xPosition = event.p2.mFloat - model->mScrollPosition.x;
-        const float yPosition = event.p3.mFloat - model->mScrollPosition.y;
-
-        // Calculates the logical position from the x,y coords.
-        impl.RepositionSelectionHandles(xPosition, yPosition, eventData.mLongPressAction);
-      }
-    }
-  }
-}
-
-void ControllerImplEventHandler::OnHandleEvent(Controller::Impl& impl, const Event& event)
-{
-  if(impl.mEventData)
-  {
-    const unsigned int state                    = event.p1.mUint;
-    const bool         handleStopScrolling      = (HANDLE_STOP_SCROLLING == state);
-    const bool         isSmoothHandlePanEnabled = impl.mEventData->mDecorator->IsSmoothHandlePanEnabled();
-
-    if(HANDLE_PRESSED == state)
-    {
-      OnHandlePressed(impl, event, isSmoothHandlePanEnabled);
-    } // end ( HANDLE_PRESSED == state )
-    else if((HANDLE_RELEASED == state) ||
-            handleStopScrolling)
-    {
-      OnHandleReleased(impl, event, isSmoothHandlePanEnabled, handleStopScrolling);
-    } // end ( ( HANDLE_RELEASED == state ) || ( HANDLE_STOP_SCROLLING == state ) )
-    else if(HANDLE_SCROLLING == state)
-    {
-      OnHandleScrolling(impl, event, isSmoothHandlePanEnabled);
-    } // end ( HANDLE_SCROLLING == state )
-  }
-}
-
-void ControllerImplEventHandler::OnSelectEvent(Controller::Impl& impl, const Event& event)
-{
-  if(impl.mEventData && impl.mEventData->mSelectionEnabled)
-  {
-    ModelPtr&      model          = impl.mModel;
-    const Vector2& scrollPosition = model->mScrollPosition;
-
-    // Convert from control's coords to text's coords.
-    const float xPosition = event.p2.mFloat - scrollPosition.x;
-    const float yPosition = event.p3.mFloat - scrollPosition.y;
-
-    // Calculates the logical position from the x,y coords.
-    impl.RepositionSelectionHandles(xPosition, yPosition, Controller::NoTextTap::HIGHLIGHT);
-  }
-}
-
-void ControllerImplEventHandler::OnSelectAllEvent(Controller::Impl& impl)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "OnSelectAllEvent mEventData->mSelectionEnabled%s \n", impl.mEventData->mSelectionEnabled ? "true" : "false");
-
-  if(impl.mEventData)
-  {
-    EventData& eventData = *impl.mEventData;
-    if(eventData.mSelectionEnabled && eventData.mState != EventData::INACTIVE)
-    {
-      ModelPtr&      model          = impl.mModel;
-      const Vector2& scrollPosition = model->mScrollPosition;
-
-      // Calculates the logical position from the start.
-      impl.RepositionSelectionHandles(0.f - scrollPosition.x,
-                                      0.f - scrollPosition.y,
-                                      Controller::NoTextTap::HIGHLIGHT);
-
-      uint32_t oldStart = eventData.mLeftSelectionPosition;
-      uint32_t oldEnd   = eventData.mRightSelectionPosition;
-
-      eventData.mLeftSelectionPosition  = 0u;
-      eventData.mRightSelectionPosition = model->mLogicalModel->mText.Count();
-      eventData.mPrimaryCursorPosition  = eventData.mRightSelectionPosition;
-
-      if(impl.mSelectableControlInterface != nullptr)
-      {
-        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-      }
-    }
-  }
-}
-
-void ControllerImplEventHandler::OnSelectNoneEvent(Controller::Impl& impl)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "OnSelectNoneEvent mEventData->mSelectionEnabled%s \n", impl.mEventData->mSelectionEnabled ? "true" : "false");
-
-  if(impl.mEventData)
-  {
-    EventData& eventData = *impl.mEventData;
-    if(eventData.mSelectionEnabled && eventData.mState == EventData::SELECTING)
-    {
-      uint32_t oldStart = eventData.mLeftSelectionPosition;
-      uint32_t oldEnd   = eventData.mRightSelectionPosition;
-
-      eventData.mLeftSelectionPosition = eventData.mRightSelectionPosition = eventData.mPrimaryCursorPosition;
-      impl.ChangeState(EventData::EDITING);
-      eventData.mUpdateCursorPosition      = true;
-      eventData.mUpdateInputStyle          = true;
-      eventData.mScrollAfterUpdatePosition = true;
-
-      if(impl.mSelectableControlInterface != nullptr)
-      {
-        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-      }
-    }
-  }
-}
-
-void ControllerImplEventHandler::OnSelectRangeEvent(Controller::Impl& impl, const Event& event)
-{
-  if(impl.mEventData && impl.mEventData->mSelectionEnabled && impl.mEventData->mState != EventData::INACTIVE)
-  {
-    ModelPtr&      model          = impl.mModel;
-    const Vector2& scrollPosition = model->mScrollPosition;
-
-    // Calculate the selection index.
-    const uint32_t length = static_cast<uint32_t>(model->mLogicalModel->mText.Count());
-    const uint32_t start  = std::min(event.p2.mUint, length);
-    const uint32_t end    = std::min(event.p3.mUint, length);
-
-    if(start != end)
-    {
-      uint32_t oldStart = impl.mEventData->mLeftSelectionPosition;
-      uint32_t oldEnd   = impl.mEventData->mRightSelectionPosition;
-
-      // Calculates the logical position from the x,y coords.
-      impl.RepositionSelectionHandles(0.f - scrollPosition.x, 0.f - scrollPosition.y, Controller::NoTextTap::HIGHLIGHT);
-
-      impl.mEventData->mLeftSelectionPosition  = start;
-      impl.mEventData->mRightSelectionPosition = end;
-      impl.mEventData->mPrimaryCursorPosition  = end;
-
-      if(impl.mSelectableControlInterface != nullptr)
-      {
-        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, start, end);
-      }
-    }
-  }
-}
-
-void ControllerImplEventHandler::OnHandlePressed(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled)
-{
-  ModelPtr&      model          = impl.mModel;
-  const Vector2& scrollPosition = model->mScrollPosition;
-
-  // Convert from decorator's coords to text's coords.
-  const float xPosition = event.p2.mFloat - scrollPosition.x;
-  const float yPosition = event.p3.mFloat - scrollPosition.y;
-
-  // Need to calculate the handle's new position.
-  bool                 matchedCharacter  = false;
-  const CharacterIndex handleNewPosition = Text::GetClosestCursorIndex(model->mVisualModel,
-                                                                       model->mLogicalModel,
-                                                                       impl.mMetrics,
-                                                                       xPosition,
-                                                                       yPosition,
-                                                                       CharacterHitTest::SCROLL,
-                                                                       matchedCharacter);
-
-  EventData& eventData = *impl.mEventData;
-  uint32_t   oldStart  = eventData.mLeftSelectionPosition;
-  uint32_t   oldEnd    = eventData.mRightSelectionPosition;
-
-  if(Event::GRAB_HANDLE_EVENT == event.type)
-  {
-    impl.ChangeState(EventData::GRAB_HANDLE_PANNING);
-
-    if(handleNewPosition != eventData.mPrimaryCursorPosition)
-    {
-      // Updates the cursor position if the handle's new position is different than the current one.
-      eventData.mUpdateCursorPosition = true;
-      // Does not update the grab handle position if the smooth panning is enabled. (The decorator does it smooth).
-      eventData.mUpdateGrabHandlePosition = !isSmoothHandlePanEnabled;
-      eventData.mPrimaryCursorPosition    = handleNewPosition;
-    }
-
-    // Updates the decorator if the soft handle panning is enabled. It triggers a relayout in the decorator and the new position of the handle is set.
-    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
-  }
-  else if(Event::LEFT_SELECTION_HANDLE_EVENT == event.type)
-  {
-    impl.ChangeState(EventData::SELECTION_HANDLE_PANNING);
-
-    if((handleNewPosition != eventData.mLeftSelectionPosition) &&
-       (handleNewPosition != eventData.mRightSelectionPosition))
-    {
-      // Updates the highlight box if the handle's new position is different than the current one.
-      eventData.mUpdateHighlightBox = true;
-      // Does not update the selection handle position if the smooth panning is enabled. (The decorator does it smooth).
-      eventData.mUpdateLeftSelectionPosition = !isSmoothHandlePanEnabled;
-      eventData.mLeftSelectionPosition       = handleNewPosition;
-    }
-
-    // Updates the decorator if the soft handle panning is enabled. It triggers a relayout in the decorator and the new position of the handle is set.
-    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
-
-    // Will define the order to scroll the text to match the handle position.
-    eventData.mIsLeftHandleSelected  = true;
-    eventData.mIsRightHandleSelected = false;
-  }
-  else if(Event::RIGHT_SELECTION_HANDLE_EVENT == event.type)
-  {
-    impl.ChangeState(EventData::SELECTION_HANDLE_PANNING);
-
-    if((handleNewPosition != eventData.mRightSelectionPosition) &&
-       (handleNewPosition != eventData.mLeftSelectionPosition))
-    {
-      // Updates the highlight box if the handle's new position is different than the current one.
-      eventData.mUpdateHighlightBox = true;
-      // Does not update the selection handle position if the smooth panning is enabled. (The decorator does it smooth).
-      eventData.mUpdateRightSelectionPosition = !isSmoothHandlePanEnabled;
-      eventData.mRightSelectionPosition       = handleNewPosition;
-    }
-
-    // Updates the decorator if the soft handle panning is enabled. It triggers a relayout in the decorator and the new position of the handle is set.
-    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
-
-    // Will define the order to scroll the text to match the handle position.
-    eventData.mIsLeftHandleSelected  = false;
-    eventData.mIsRightHandleSelected = true;
-  }
-
-  if((impl.mSelectableControlInterface != nullptr) && ((oldStart != eventData.mLeftSelectionPosition) || (oldEnd != eventData.mRightSelectionPosition)))
-  {
-    impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-  }
-}
-
-void ControllerImplEventHandler::OnHandleReleased(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled, const bool handleStopScrolling)
-{
-  CharacterIndex handlePosition = 0u;
-  if(handleStopScrolling || isSmoothHandlePanEnabled)
-  {
-    ModelPtr&      model          = impl.mModel;
-    const Vector2& scrollPosition = model->mScrollPosition;
-
-    // Convert from decorator's coords to text's coords.
-    const float xPosition = event.p2.mFloat - scrollPosition.x;
-    const float yPosition = event.p3.mFloat - scrollPosition.y;
-
-    bool matchedCharacter = false;
-    handlePosition        = Text::GetClosestCursorIndex(model->mVisualModel,
-                                                 model->mLogicalModel,
-                                                 impl.mMetrics,
-                                                 xPosition,
-                                                 yPosition,
-                                                 CharacterHitTest::SCROLL,
-                                                 matchedCharacter);
-  }
-
-  EventData& eventData = *impl.mEventData;
-  uint32_t   oldStart  = eventData.mLeftSelectionPosition;
-  uint32_t   oldEnd    = eventData.mRightSelectionPosition;
-
-  if(Event::GRAB_HANDLE_EVENT == event.type)
-  {
-    eventData.mUpdateCursorPosition     = true;
-    eventData.mUpdateGrabHandlePosition = true;
-    eventData.mUpdateInputStyle         = true;
-
-    if(!impl.IsClipboardEmpty())
-    {
-      impl.ChangeState(EventData::EDITING_WITH_PASTE_POPUP); // Moving grabhandle will show Paste Popup
-    }
-
-    if(handleStopScrolling || isSmoothHandlePanEnabled)
-    {
-      eventData.mScrollAfterUpdatePosition = true;
-      eventData.mPrimaryCursorPosition     = handlePosition;
-    }
-  }
-  else if(Event::LEFT_SELECTION_HANDLE_EVENT == event.type)
-  {
-    impl.ChangeState(EventData::SELECTING);
-
-    eventData.mUpdateHighlightBox           = true;
-    eventData.mUpdateLeftSelectionPosition  = true;
-    eventData.mUpdateRightSelectionPosition = true;
-
-    if(handleStopScrolling || isSmoothHandlePanEnabled)
-    {
-      eventData.mScrollAfterUpdatePosition = true;
-
-      if((handlePosition != eventData.mRightSelectionPosition) &&
-         (handlePosition != eventData.mLeftSelectionPosition))
-      {
-        eventData.mLeftSelectionPosition = handlePosition;
-      }
-    }
-  }
-  else if(Event::RIGHT_SELECTION_HANDLE_EVENT == event.type)
-  {
-    impl.ChangeState(EventData::SELECTING);
-
-    eventData.mUpdateHighlightBox           = true;
-    eventData.mUpdateRightSelectionPosition = true;
-    eventData.mUpdateLeftSelectionPosition  = true;
-
-    if(handleStopScrolling || isSmoothHandlePanEnabled)
-    {
-      eventData.mScrollAfterUpdatePosition = true;
-      if((handlePosition != eventData.mRightSelectionPosition) &&
-         (handlePosition != eventData.mLeftSelectionPosition))
-      {
-        eventData.mRightSelectionPosition = handlePosition;
-      }
-    }
-  }
-
-  if((impl.mSelectableControlInterface != nullptr) && ((oldStart != eventData.mLeftSelectionPosition) || (oldEnd != eventData.mRightSelectionPosition)))
-  {
-    impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-  }
-
-  eventData.mDecoratorUpdated = true;
-}
-
-void ControllerImplEventHandler::OnHandleScrolling(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled)
-{
-  ModelPtr&       model          = impl.mModel;
-  Vector2&        scrollPosition = model->mScrollPosition;
-  VisualModelPtr& visualModel    = model->mVisualModel;
-
-  const float    xSpeed                = event.p2.mFloat;
-  const float    ySpeed                = event.p3.mFloat;
-  const Vector2& layoutSize            = visualModel->GetLayoutSize();
-  const Vector2  currentScrollPosition = scrollPosition;
-
-  scrollPosition.x += xSpeed;
-  scrollPosition.y += ySpeed;
-
-  impl.ClampHorizontalScroll(layoutSize);
-  impl.ClampVerticalScroll(layoutSize);
-
-  EventData&    eventData = *impl.mEventData;
-  DecoratorPtr& decorator = eventData.mDecorator;
-
-  bool endOfScroll = false;
-  if(Vector2::ZERO == (currentScrollPosition - scrollPosition))
-  {
-    // Notify the decorator there is no more text to scroll.
-    // The decorator won't send more scroll events.
-    decorator->NotifyEndOfScroll();
-    // Still need to set the position of the handle.
-    endOfScroll = true;
-  }
-
-  // Set the position of the handle.
-  const bool scrollRightDirection      = xSpeed > 0.f;
-  const bool scrollBottomDirection     = ySpeed > 0.f;
-  const bool leftSelectionHandleEvent  = Event::LEFT_SELECTION_HANDLE_EVENT == event.type;
-  const bool rightSelectionHandleEvent = Event::RIGHT_SELECTION_HANDLE_EVENT == event.type;
-
-  if(Event::GRAB_HANDLE_EVENT == event.type)
-  {
-    impl.ChangeState(EventData::GRAB_HANDLE_PANNING);
-
-    // Get the grab handle position in decorator coords.
-    Vector2 position = decorator->GetPosition(GRAB_HANDLE);
-
-    if(decorator->IsHorizontalScrollEnabled())
-    {
-      // Position the grag handle close to either the left or right edge.
-      position.x = scrollRightDirection ? 0.f : visualModel->mControlSize.width;
-    }
-
-    if(decorator->IsVerticalScrollEnabled())
-    {
-      position.x = eventData.mCursorHookPositionX;
-
-      // Position the grag handle close to either the top or bottom edge.
-      position.y = scrollBottomDirection ? 0.f : visualModel->mControlSize.height;
-    }
-
-    // Get the new handle position.
-    // The grab handle's position is in decorator's coords. Need to transforms to text's coords.
-    bool                 matchedCharacter = false;
-    const CharacterIndex handlePosition   = Text::GetClosestCursorIndex(visualModel,
-                                                                      impl.mModel->mLogicalModel,
-                                                                      impl.mMetrics,
-                                                                      position.x - scrollPosition.x,
-                                                                      position.y - scrollPosition.y,
-                                                                      CharacterHitTest::SCROLL,
-                                                                      matchedCharacter);
-
-    if(eventData.mPrimaryCursorPosition != handlePosition)
-    {
-      eventData.mUpdateCursorPosition      = true;
-      eventData.mUpdateGrabHandlePosition  = !isSmoothHandlePanEnabled;
-      eventData.mScrollAfterUpdatePosition = true;
-      eventData.mPrimaryCursorPosition     = handlePosition;
-    }
-    eventData.mUpdateInputStyle = eventData.mUpdateCursorPosition;
-
-    // Updates the decorator if the soft handle panning is enabled.
-    eventData.mDecoratorUpdated = isSmoothHandlePanEnabled;
-  }
-  else if(leftSelectionHandleEvent || rightSelectionHandleEvent)
-  {
-    impl.ChangeState(EventData::SELECTION_HANDLE_PANNING);
-
-    // Get the selection handle position in decorator coords.
-    Vector2 position = decorator->GetPosition(leftSelectionHandleEvent ? Text::LEFT_SELECTION_HANDLE : Text::RIGHT_SELECTION_HANDLE);
-
-    if(decorator->IsHorizontalScrollEnabled())
-    {
-      // Position the selection handle close to either the left or right edge.
-      position.x = scrollRightDirection ? 0.f : visualModel->mControlSize.width;
-    }
-
-    if(decorator->IsVerticalScrollEnabled())
-    {
-      position.x = eventData.mCursorHookPositionX;
-
-      // Position the grag handle close to either the top or bottom edge.
-      position.y = scrollBottomDirection ? 0.f : visualModel->mControlSize.height;
-    }
-
-    // Get the new handle position.
-    // The selection handle's position is in decorator's coords. Need to transform to text's coords.
-    bool                 matchedCharacter = false;
-    const CharacterIndex handlePosition   = Text::GetClosestCursorIndex(visualModel,
-                                                                      impl.mModel->mLogicalModel,
-                                                                      impl.mMetrics,
-                                                                      position.x - scrollPosition.x,
-                                                                      position.y - scrollPosition.y,
-                                                                      CharacterHitTest::SCROLL,
-                                                                      matchedCharacter);
-    uint32_t             oldStart         = eventData.mLeftSelectionPosition;
-    uint32_t             oldEnd           = eventData.mRightSelectionPosition;
-
-    if(leftSelectionHandleEvent)
-    {
-      const bool differentHandles = (eventData.mLeftSelectionPosition != handlePosition) && (eventData.mRightSelectionPosition != handlePosition);
-
-      if(differentHandles || endOfScroll)
-      {
-        eventData.mUpdateHighlightBox           = true;
-        eventData.mUpdateLeftSelectionPosition  = !isSmoothHandlePanEnabled;
-        eventData.mUpdateRightSelectionPosition = isSmoothHandlePanEnabled;
-        eventData.mLeftSelectionPosition        = handlePosition;
-      }
-    }
-    else
-    {
-      const bool differentHandles = (eventData.mRightSelectionPosition != handlePosition) && (eventData.mLeftSelectionPosition != handlePosition);
-      if(differentHandles || endOfScroll)
-      {
-        eventData.mUpdateHighlightBox           = true;
-        eventData.mUpdateRightSelectionPosition = !isSmoothHandlePanEnabled;
-        eventData.mUpdateLeftSelectionPosition  = isSmoothHandlePanEnabled;
-        eventData.mRightSelectionPosition       = handlePosition;
-      }
-    }
-
-    if(eventData.mUpdateLeftSelectionPosition || eventData.mUpdateRightSelectionPosition)
-    {
-      impl.RepositionSelectionHandles();
-
-      eventData.mScrollAfterUpdatePosition = !isSmoothHandlePanEnabled;
-
-      if(impl.mSelectableControlInterface != nullptr)
-      {
-        impl.mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, eventData.mLeftSelectionPosition, eventData.mRightSelectionPosition);
-      }
-    }
-  }
-  eventData.mDecoratorUpdated = true;
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-impl-event-handler.h b/dali-toolkit/internal/text/text-controller-impl-event-handler.h
deleted file mode 100644
index 82e5c78..0000000
--- a/dali-toolkit/internal/text/text-controller-impl-event-handler.h
+++ /dev/null
@@ -1,151 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_EVENT_HANDLER_H
-#define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_EVENT_HANDLER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-/**
- * Contains all the event handling methods for Text::Controller::Impl
- */
-struct ControllerImplEventHandler
-{
-  /**
-   * @brief Processes input events
-   *
-   * @param[in] impl A reference to Controller::Impl
-   * @return True if the decorator has been updated
-   */
-  static bool ProcessInputEvents(Controller::Impl& impl);
-
-  /**
-   * @brief Called by Controller::Impl when a cursor key event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnCursorKeyEvent(Controller::Impl& controllerImpl, const Event& event);
-
-  /**
-   * @brief Called by Controller::Impl when a tap event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnTapEvent(Controller::Impl& controllerImpl, const Event& event);
-
-  /**
-   * @brief Called by Controller::Impl when a pan event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnPanEvent(Controller::Impl& controllerImpl, const Event& event);
-
-  /**
-   * @brief Called by Controller::Impl when a long press event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnLongPressEvent(Controller::Impl& controllerImpl, const Event& event);
-
-  /**
-   * @brief Called by Controller::Impl when a handle event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnHandleEvent(Controller::Impl& controllerImpl, const Event& event);
-
-  /**
-   * @brief Called by Controller::Impl when a select event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnSelectEvent(Controller::Impl& controllerImpl, const Event& event);
-
-  /**
-   * @brief Called by Controller::Impl when a select all event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnSelectAllEvent(Controller::Impl& controllerImpl);
-
-  /**
-   * @brief Called by Controller::Impl when a select none event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnSelectNoneEvent(Controller::Impl& controllerImpl);
-
-  /**
-   * @brief Called by Controller::Impl when a select range event is received.
-   *
-   * @param controllerImpl A reference to Controller::Impl
-   * @param event The event
-   */
-  static void OnSelectRangeEvent(Controller::Impl& controllerImpl, const Event& event);
-
-private:
-  /**
-   * @brief Called by OnHandleEvent when we are in the Pressed state.
-   *
-   * @param impl A reference to Controller::Impl
-   * @param event The event
-   * @param isSmoothHandlePanEnabled Whether smooth handle pan is enabled
-   */
-  static void OnHandlePressed(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled);
-
-  /**
-   * @brief Called by OnHandleEvent when we are in the Released state.
-   *
-   * @param impl A reference to Controller::Impl
-   * @param event The event
-   * @param isSmoothHandlePanEnabled Whether smooth handle pan is enabled
-   * @param handleStopScrolling Whether we should handle stop scrolling or not
-   */
-  static void OnHandleReleased(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled, const bool handleStopScrolling);
-
-  /**
-   * @brief Called by OnHandleEvent when we are in the Scrolling state.
-   *
-   * @param impl A reference to Controller::Impl
-   * @param event The event
-   * @param isSmoothHandlePanEnabled Whether smooth handle pan is enabled
-   */
-  static void OnHandleScrolling(Controller::Impl& impl, const Event& event, const bool isSmoothHandlePanEnabled);
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_EVENT_HANDLER_H
diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp
deleted file mode 100644
index 045fb8a..0000000
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ /dev/null
@@ -1,2304 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/rendering/renderer.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
-#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
-#include <dali-toolkit/internal/text/bidirectional-support.h>
-#include <dali-toolkit/internal/text/character-set-conversion.h>
-#include <dali-toolkit/internal/text/color-segmentation.h>
-#include <dali-toolkit/internal/text/cursor-helper-functions.h>
-#include <dali-toolkit/internal/text/hyphenator.h>
-#include <dali-toolkit/internal/text/multi-language-support.h>
-#include <dali-toolkit/internal/text/segmentation.h>
-#include <dali-toolkit/internal/text/shaper.h>
-#include <dali-toolkit/internal/text/text-control-interface.h>
-#include <dali-toolkit/internal/text/text-controller-impl-event-handler.h>
-#include <dali-toolkit/internal/text/text-editable-control-interface.h>
-#include <dali-toolkit/internal/text/text-enumerations-impl.h>
-#include <dali-toolkit/internal/text/text-run-container.h>
-#include <dali-toolkit/internal/text/text-selection-handle-controller.h>
-
-using namespace Dali;
-
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
-#endif
-
-struct BackgroundVertex
-{
-  Vector2 mPosition; ///< Vertex posiiton
-  Vector4 mColor;    ///< Vertex color
-};
-
-struct BackgroundMesh
-{
-  Vector<BackgroundVertex> mVertices; ///< container of vertices
-  Vector<unsigned short>   mIndices;  ///< container of indices
-};
-
-// The relative luminance of a color is defined as (L = 0.2126 * R + 0.7152 * G + 0.0722 * B)
-// based on W3C Recommendations (https://www.w3.org/TR/WCAG20/)
-const float         BRIGHTNESS_THRESHOLD = 0.179f;
-const float         CONSTANT_R           = 0.2126f;
-const float         CONSTANT_G           = 0.7152f;
-const float         CONSTANT_B           = 0.0722f;
-const Dali::Vector4 BLACK(0.f, 0.f, 0.f, 1.f);
-const Dali::Vector4 WHITE(1.f, 1.f, 1.f, 1.f);
-const Dali::Vector4 LIGHT_BLUE(0.75f, 0.96f, 1.f, 1.f);
-const Dali::Vector4 BACKGROUND_SUB4(0.58f, 0.87f, 0.96f, 1.f);
-const Dali::Vector4 BACKGROUND_SUB5(0.83f, 0.94f, 0.98f, 1.f);
-const Dali::Vector4 BACKGROUND_SUB6(1.f, 0.5f, 0.5f, 1.f);
-const Dali::Vector4 BACKGROUND_SUB7(1.f, 0.8f, 0.8f, 1.f);
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-EventData::EventData(DecoratorPtr decorator, InputMethodContext& inputMethodContext)
-: mDecorator(decorator),
-  mInputMethodContext(inputMethodContext),
-  mPlaceholderFont(nullptr),
-  mPlaceholderTextActive(),
-  mPlaceholderTextInactive(),
-  mPlaceholderTextColor(0.8f, 0.8f, 0.8f, 0.8f), // This color has been published in the Public API (placeholder-properties.h).
-  mEventQueue(),
-  mInputStyleChangedQueue(),
-  mPreviousState(INACTIVE),
-  mState(INACTIVE),
-  mPrimaryCursorPosition(0u),
-  mLeftSelectionPosition(0u),
-  mRightSelectionPosition(0u),
-  mPreEditStartPosition(0u),
-  mPreEditLength(0u),
-  mCursorHookPositionX(0.f),
-  mDoubleTapAction(Controller::NoTextTap::NO_ACTION),
-  mLongPressAction(Controller::NoTextTap::SHOW_SELECTION_POPUP),
-  mIsShowingPlaceholderText(false),
-  mPreEditFlag(false),
-  mDecoratorUpdated(false),
-  mCursorBlinkEnabled(true),
-  mGrabHandleEnabled(true),
-  mGrabHandlePopupEnabled(true),
-  mSelectionEnabled(true),
-  mUpdateCursorHookPosition(false),
-  mUpdateCursorPosition(false),
-  mUpdateGrabHandlePosition(false),
-  mUpdateLeftSelectionPosition(false),
-  mUpdateRightSelectionPosition(false),
-  mIsLeftHandleSelected(false),
-  mIsRightHandleSelected(false),
-  mUpdateHighlightBox(false),
-  mScrollAfterUpdatePosition(false),
-  mScrollAfterDelete(false),
-  mAllTextSelected(false),
-  mUpdateInputStyle(false),
-  mPasswordInput(false),
-  mCheckScrollAmount(false),
-  mIsPlaceholderPixelSize(false),
-  mIsPlaceholderElideEnabled(false),
-  mPlaceholderEllipsisFlag(false),
-  mShiftSelectionFlag(true),
-  mUpdateAlignment(false),
-  mEditingEnabled(true)
-{
-}
-
-bool Controller::Impl::ProcessInputEvents()
-{
-  return ControllerImplEventHandler::ProcessInputEvents(*this);
-}
-
-void Controller::Impl::NotifyInputMethodContext()
-{
-  if(mEventData && mEventData->mInputMethodContext)
-  {
-    CharacterIndex cursorPosition = GetLogicalCursorPosition();
-
-    const Length numberOfWhiteSpaces = GetNumberOfWhiteSpaces(0u);
-
-    // Update the cursor position by removing the initial white spaces.
-    if(cursorPosition < numberOfWhiteSpaces)
-    {
-      cursorPosition = 0u;
-    }
-    else
-    {
-      cursorPosition -= numberOfWhiteSpaces;
-    }
-
-    mEventData->mInputMethodContext.SetCursorPosition(cursorPosition);
-    mEventData->mInputMethodContext.NotifyCursorPosition();
-  }
-}
-
-void Controller::Impl::NotifyInputMethodContextMultiLineStatus()
-{
-  if(mEventData && mEventData->mInputMethodContext)
-  {
-    Text::Layout::Engine::Type layout = mLayoutEngine.GetLayout();
-    mEventData->mInputMethodContext.NotifyTextInputMultiLine(layout == Text::Layout::Engine::MULTI_LINE_BOX);
-  }
-}
-
-CharacterIndex Controller::Impl::GetLogicalCursorPosition() const
-{
-  CharacterIndex cursorPosition = 0u;
-
-  if(mEventData)
-  {
-    if((EventData::SELECTING == mEventData->mState) ||
-       (EventData::SELECTION_HANDLE_PANNING == mEventData->mState))
-    {
-      cursorPosition = std::min(mEventData->mRightSelectionPosition, mEventData->mLeftSelectionPosition);
-    }
-    else
-    {
-      cursorPosition = mEventData->mPrimaryCursorPosition;
-    }
-  }
-
-  return cursorPosition;
-}
-
-Length Controller::Impl::GetNumberOfWhiteSpaces(CharacterIndex index) const
-{
-  Length numberOfWhiteSpaces = 0u;
-
-  // Get the buffer to the text.
-  Character* utf32CharacterBuffer = mModel->mLogicalModel->mText.Begin();
-
-  const Length totalNumberOfCharacters = mModel->mLogicalModel->mText.Count();
-  for(; index < totalNumberOfCharacters; ++index, ++numberOfWhiteSpaces)
-  {
-    if(!TextAbstraction::IsWhiteSpace(*(utf32CharacterBuffer + index)))
-    {
-      break;
-    }
-  }
-
-  return numberOfWhiteSpaces;
-}
-
-void Controller::Impl::GetText(CharacterIndex index, std::string& text) const
-{
-  // Get the total number of characters.
-  Length numberOfCharacters = mModel->mLogicalModel->mText.Count();
-
-  // Retrieve the text.
-  if(0u != numberOfCharacters)
-  {
-    Utf32ToUtf8(mModel->mLogicalModel->mText.Begin() + index, numberOfCharacters - index, text);
-  }
-}
-
-void Controller::Impl::CalculateTextUpdateIndices(Length& numberOfCharacters)
-{
-  mTextUpdateInfo.mParagraphCharacterIndex = 0u;
-  mTextUpdateInfo.mStartGlyphIndex         = 0u;
-  mTextUpdateInfo.mStartLineIndex          = 0u;
-  numberOfCharacters                       = 0u;
-
-  const Length numberOfParagraphs = mModel->mLogicalModel->mParagraphInfo.Count();
-  if(0u == numberOfParagraphs)
-  {
-    mTextUpdateInfo.mParagraphCharacterIndex = 0u;
-    numberOfCharacters                       = 0u;
-
-    mTextUpdateInfo.mRequestedNumberOfCharacters = mTextUpdateInfo.mNumberOfCharactersToAdd - mTextUpdateInfo.mNumberOfCharactersToRemove;
-
-    // Nothing else to do if there are no paragraphs.
-    return;
-  }
-
-  // Find the paragraphs to be updated.
-  Vector<ParagraphRunIndex> paragraphsToBeUpdated;
-  if(mTextUpdateInfo.mCharacterIndex >= mTextUpdateInfo.mPreviousNumberOfCharacters)
-  {
-    // Text is being added at the end of the current text.
-    if(mTextUpdateInfo.mIsLastCharacterNewParagraph)
-    {
-      // Text is being added in a new paragraph after the last character of the text.
-      mTextUpdateInfo.mParagraphCharacterIndex     = mTextUpdateInfo.mPreviousNumberOfCharacters;
-      numberOfCharacters                           = 0u;
-      mTextUpdateInfo.mRequestedNumberOfCharacters = mTextUpdateInfo.mNumberOfCharactersToAdd - mTextUpdateInfo.mNumberOfCharactersToRemove;
-
-      mTextUpdateInfo.mStartGlyphIndex = mModel->mVisualModel->mGlyphs.Count();
-      mTextUpdateInfo.mStartLineIndex  = mModel->mVisualModel->mLines.Count() - 1u;
-
-      // Nothing else to do;
-      return;
-    }
-
-    paragraphsToBeUpdated.PushBack(numberOfParagraphs - 1u);
-  }
-  else
-  {
-    Length numberOfCharactersToUpdate = 0u;
-    if(mTextUpdateInfo.mFullRelayoutNeeded)
-    {
-      numberOfCharactersToUpdate = mTextUpdateInfo.mPreviousNumberOfCharacters;
-    }
-    else
-    {
-      numberOfCharactersToUpdate = (mTextUpdateInfo.mNumberOfCharactersToRemove > 0u) ? mTextUpdateInfo.mNumberOfCharactersToRemove : 1u;
-    }
-    mModel->mLogicalModel->FindParagraphs(mTextUpdateInfo.mCharacterIndex,
-                                          numberOfCharactersToUpdate,
-                                          paragraphsToBeUpdated);
-  }
-
-  if(0u != paragraphsToBeUpdated.Count())
-  {
-    const ParagraphRunIndex firstParagraphIndex = *(paragraphsToBeUpdated.Begin());
-    const ParagraphRun&     firstParagraph      = *(mModel->mLogicalModel->mParagraphInfo.Begin() + firstParagraphIndex);
-    mTextUpdateInfo.mParagraphCharacterIndex    = firstParagraph.characterRun.characterIndex;
-
-    ParagraphRunIndex   lastParagraphIndex = *(paragraphsToBeUpdated.End() - 1u);
-    const ParagraphRun& lastParagraph      = *(mModel->mLogicalModel->mParagraphInfo.Begin() + lastParagraphIndex);
-
-    if((mTextUpdateInfo.mNumberOfCharactersToRemove > 0u) &&                                           // Some character are removed.
-       (lastParagraphIndex < numberOfParagraphs - 1u) &&                                               // There is a next paragraph.
-       ((lastParagraph.characterRun.characterIndex + lastParagraph.characterRun.numberOfCharacters) == // The last removed character is the new paragraph character.
-        (mTextUpdateInfo.mCharacterIndex + mTextUpdateInfo.mNumberOfCharactersToRemove)))
-    {
-      // The new paragraph character of the last updated paragraph has been removed so is going to be merged with the next one.
-      const ParagraphRun& lastParagraph = *(mModel->mLogicalModel->mParagraphInfo.Begin() + lastParagraphIndex + 1u);
-
-      numberOfCharacters = lastParagraph.characterRun.characterIndex + lastParagraph.characterRun.numberOfCharacters - mTextUpdateInfo.mParagraphCharacterIndex;
-    }
-    else
-    {
-      numberOfCharacters = lastParagraph.characterRun.characterIndex + lastParagraph.characterRun.numberOfCharacters - mTextUpdateInfo.mParagraphCharacterIndex;
-    }
-  }
-
-  mTextUpdateInfo.mRequestedNumberOfCharacters = numberOfCharacters + mTextUpdateInfo.mNumberOfCharactersToAdd - mTextUpdateInfo.mNumberOfCharactersToRemove;
-  mTextUpdateInfo.mStartGlyphIndex             = *(mModel->mVisualModel->mCharactersToGlyph.Begin() + mTextUpdateInfo.mParagraphCharacterIndex);
-}
-
-void Controller::Impl::ClearFullModelData(OperationsMask operations)
-{
-  if(NO_OPERATION != (GET_LINE_BREAKS & operations))
-  {
-    mModel->mLogicalModel->mLineBreakInfo.Clear();
-    mModel->mLogicalModel->mParagraphInfo.Clear();
-  }
-
-  if(NO_OPERATION != (GET_SCRIPTS & operations))
-  {
-    mModel->mLogicalModel->mScriptRuns.Clear();
-  }
-
-  if(NO_OPERATION != (VALIDATE_FONTS & operations))
-  {
-    mModel->mLogicalModel->mFontRuns.Clear();
-  }
-
-  if(0u != mModel->mLogicalModel->mBidirectionalParagraphInfo.Count())
-  {
-    if(NO_OPERATION != (BIDI_INFO & operations))
-    {
-      mModel->mLogicalModel->mBidirectionalParagraphInfo.Clear();
-      mModel->mLogicalModel->mCharacterDirections.Clear();
-    }
-
-    if(NO_OPERATION != (REORDER & operations))
-    {
-      // Free the allocated memory used to store the conversion table in the bidirectional line info run.
-      for(Vector<BidirectionalLineInfoRun>::Iterator it    = mModel->mLogicalModel->mBidirectionalLineInfo.Begin(),
-                                                     endIt = mModel->mLogicalModel->mBidirectionalLineInfo.End();
-          it != endIt;
-          ++it)
-      {
-        BidirectionalLineInfoRun& bidiLineInfo = *it;
-
-        free(bidiLineInfo.visualToLogicalMap);
-        bidiLineInfo.visualToLogicalMap = NULL;
-      }
-      mModel->mLogicalModel->mBidirectionalLineInfo.Clear();
-    }
-  }
-
-  if(NO_OPERATION != (SHAPE_TEXT & operations))
-  {
-    mModel->mVisualModel->mGlyphs.Clear();
-    mModel->mVisualModel->mGlyphsToCharacters.Clear();
-    mModel->mVisualModel->mCharactersToGlyph.Clear();
-    mModel->mVisualModel->mCharactersPerGlyph.Clear();
-    mModel->mVisualModel->mGlyphsPerCharacter.Clear();
-    mModel->mVisualModel->mGlyphPositions.Clear();
-  }
-
-  if(NO_OPERATION != (LAYOUT & operations))
-  {
-    mModel->mVisualModel->mLines.Clear();
-  }
-
-  if(NO_OPERATION != (COLOR & operations))
-  {
-    mModel->mVisualModel->mColorIndices.Clear();
-    mModel->mVisualModel->mBackgroundColorIndices.Clear();
-  }
-}
-
-void Controller::Impl::ClearCharacterModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations)
-{
-  const CharacterIndex endIndexPlusOne = endIndex + 1u;
-
-  if(NO_OPERATION != (GET_LINE_BREAKS & operations))
-  {
-    // Clear the line break info.
-    LineBreakInfo* lineBreakInfoBuffer = mModel->mLogicalModel->mLineBreakInfo.Begin();
-
-    mModel->mLogicalModel->mLineBreakInfo.Erase(lineBreakInfoBuffer + startIndex,
-                                                lineBreakInfoBuffer + endIndexPlusOne);
-
-    // Clear the paragraphs.
-    ClearCharacterRuns(startIndex,
-                       endIndex,
-                       mModel->mLogicalModel->mParagraphInfo);
-  }
-
-  if(NO_OPERATION != (GET_SCRIPTS & operations))
-  {
-    // Clear the scripts.
-    ClearCharacterRuns(startIndex,
-                       endIndex,
-                       mModel->mLogicalModel->mScriptRuns);
-  }
-
-  if(NO_OPERATION != (VALIDATE_FONTS & operations))
-  {
-    // Clear the fonts.
-    ClearCharacterRuns(startIndex,
-                       endIndex,
-                       mModel->mLogicalModel->mFontRuns);
-  }
-
-  if(0u != mModel->mLogicalModel->mBidirectionalParagraphInfo.Count())
-  {
-    if(NO_OPERATION != (BIDI_INFO & operations))
-    {
-      // Clear the bidirectional paragraph info.
-      ClearCharacterRuns(startIndex,
-                         endIndex,
-                         mModel->mLogicalModel->mBidirectionalParagraphInfo);
-
-      // Clear the character's directions.
-      CharacterDirection* characterDirectionsBuffer = mModel->mLogicalModel->mCharacterDirections.Begin();
-
-      mModel->mLogicalModel->mCharacterDirections.Erase(characterDirectionsBuffer + startIndex,
-                                                        characterDirectionsBuffer + endIndexPlusOne);
-    }
-
-    if(NO_OPERATION != (REORDER & operations))
-    {
-      uint32_t startRemoveIndex = mModel->mLogicalModel->mBidirectionalLineInfo.Count();
-      uint32_t endRemoveIndex   = startRemoveIndex;
-      ClearCharacterRuns(startIndex,
-                         endIndex,
-                         mModel->mLogicalModel->mBidirectionalLineInfo,
-                         startRemoveIndex,
-                         endRemoveIndex);
-
-      BidirectionalLineInfoRun* bidirectionalLineInfoBuffer = mModel->mLogicalModel->mBidirectionalLineInfo.Begin();
-
-      // Free the allocated memory used to store the conversion table in the bidirectional line info run.
-      for(Vector<BidirectionalLineInfoRun>::Iterator it    = bidirectionalLineInfoBuffer + startRemoveIndex,
-                                                     endIt = bidirectionalLineInfoBuffer + endRemoveIndex;
-          it != endIt;
-          ++it)
-      {
-        BidirectionalLineInfoRun& bidiLineInfo = *it;
-
-        free(bidiLineInfo.visualToLogicalMap);
-        bidiLineInfo.visualToLogicalMap = NULL;
-      }
-
-      mModel->mLogicalModel->mBidirectionalLineInfo.Erase(bidirectionalLineInfoBuffer + startRemoveIndex,
-                                                          bidirectionalLineInfoBuffer + endRemoveIndex);
-    }
-  }
-}
-
-void Controller::Impl::ClearGlyphModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations)
-{
-  const CharacterIndex endIndexPlusOne           = endIndex + 1u;
-  const Length         numberOfCharactersRemoved = endIndexPlusOne - startIndex;
-
-  // Convert the character index to glyph index before deleting the character to glyph and the glyphs per character buffers.
-  GlyphIndex* charactersToGlyphBuffer  = mModel->mVisualModel->mCharactersToGlyph.Begin();
-  Length*     glyphsPerCharacterBuffer = mModel->mVisualModel->mGlyphsPerCharacter.Begin();
-
-  const GlyphIndex endGlyphIndexPlusOne  = *(charactersToGlyphBuffer + endIndex) + *(glyphsPerCharacterBuffer + endIndex);
-  const Length     numberOfGlyphsRemoved = endGlyphIndexPlusOne - mTextUpdateInfo.mStartGlyphIndex;
-
-  if(NO_OPERATION != (SHAPE_TEXT & operations))
-  {
-    // Update the character to glyph indices.
-    for(Vector<GlyphIndex>::Iterator it    = charactersToGlyphBuffer + endIndexPlusOne,
-                                     endIt = charactersToGlyphBuffer + mModel->mVisualModel->mCharactersToGlyph.Count();
-        it != endIt;
-        ++it)
-    {
-      CharacterIndex& index = *it;
-      index -= numberOfGlyphsRemoved;
-    }
-
-    // Clear the character to glyph conversion table.
-    mModel->mVisualModel->mCharactersToGlyph.Erase(charactersToGlyphBuffer + startIndex,
-                                                   charactersToGlyphBuffer + endIndexPlusOne);
-
-    // Clear the glyphs per character table.
-    mModel->mVisualModel->mGlyphsPerCharacter.Erase(glyphsPerCharacterBuffer + startIndex,
-                                                    glyphsPerCharacterBuffer + endIndexPlusOne);
-
-    // Clear the glyphs buffer.
-    GlyphInfo* glyphsBuffer = mModel->mVisualModel->mGlyphs.Begin();
-    mModel->mVisualModel->mGlyphs.Erase(glyphsBuffer + mTextUpdateInfo.mStartGlyphIndex,
-                                        glyphsBuffer + endGlyphIndexPlusOne);
-
-    CharacterIndex* glyphsToCharactersBuffer = mModel->mVisualModel->mGlyphsToCharacters.Begin();
-
-    // Update the glyph to character indices.
-    for(Vector<CharacterIndex>::Iterator it    = glyphsToCharactersBuffer + endGlyphIndexPlusOne,
-                                         endIt = glyphsToCharactersBuffer + mModel->mVisualModel->mGlyphsToCharacters.Count();
-        it != endIt;
-        ++it)
-    {
-      CharacterIndex& index = *it;
-      index -= numberOfCharactersRemoved;
-    }
-
-    // Clear the glyphs to characters buffer.
-    mModel->mVisualModel->mGlyphsToCharacters.Erase(glyphsToCharactersBuffer + mTextUpdateInfo.mStartGlyphIndex,
-                                                    glyphsToCharactersBuffer + endGlyphIndexPlusOne);
-
-    // Clear the characters per glyph buffer.
-    Length* charactersPerGlyphBuffer = mModel->mVisualModel->mCharactersPerGlyph.Begin();
-    mModel->mVisualModel->mCharactersPerGlyph.Erase(charactersPerGlyphBuffer + mTextUpdateInfo.mStartGlyphIndex,
-                                                    charactersPerGlyphBuffer + endGlyphIndexPlusOne);
-
-    // Should pass if mGlyphPositions has already been cleared in Controller::Relayouter::Relayout
-    if(0u != mModel->mVisualModel->mGlyphPositions.Count())
-    {
-      // Clear the positions buffer.
-      Vector2* positionsBuffer = mModel->mVisualModel->mGlyphPositions.Begin();
-      mModel->mVisualModel->mGlyphPositions.Erase(positionsBuffer + mTextUpdateInfo.mStartGlyphIndex,
-                                                  positionsBuffer + endGlyphIndexPlusOne);
-    }
-  }
-
-  if(NO_OPERATION != (LAYOUT & operations))
-  {
-    // Clear the lines.
-    uint32_t startRemoveIndex = mModel->mVisualModel->mLines.Count();
-    uint32_t endRemoveIndex   = startRemoveIndex;
-    ClearCharacterRuns(startIndex,
-                       endIndex,
-                       mModel->mVisualModel->mLines,
-                       startRemoveIndex,
-                       endRemoveIndex);
-
-    // Will update the glyph runs.
-    startRemoveIndex = mModel->mVisualModel->mLines.Count();
-    endRemoveIndex   = startRemoveIndex;
-    ClearGlyphRuns(mTextUpdateInfo.mStartGlyphIndex,
-                   endGlyphIndexPlusOne - 1u,
-                   mModel->mVisualModel->mLines,
-                   startRemoveIndex,
-                   endRemoveIndex);
-
-    // Set the line index from where to insert the new laid-out lines.
-    mTextUpdateInfo.mStartLineIndex = startRemoveIndex;
-
-    LineRun* linesBuffer = mModel->mVisualModel->mLines.Begin();
-    mModel->mVisualModel->mLines.Erase(linesBuffer + startRemoveIndex,
-                                       linesBuffer + endRemoveIndex);
-  }
-
-  if(NO_OPERATION != (COLOR & operations))
-  {
-    if(0u != mModel->mVisualModel->mColorIndices.Count())
-    {
-      ColorIndex* colorIndexBuffer = mModel->mVisualModel->mColorIndices.Begin();
-      mModel->mVisualModel->mColorIndices.Erase(colorIndexBuffer + mTextUpdateInfo.mStartGlyphIndex,
-                                                colorIndexBuffer + endGlyphIndexPlusOne);
-    }
-
-    if(0u != mModel->mVisualModel->mBackgroundColorIndices.Count())
-    {
-      ColorIndex* backgroundColorIndexBuffer = mModel->mVisualModel->mBackgroundColorIndices.Begin();
-      mModel->mVisualModel->mBackgroundColorIndices.Erase(backgroundColorIndexBuffer + mTextUpdateInfo.mStartGlyphIndex,
-                                                          backgroundColorIndexBuffer + endGlyphIndexPlusOne);
-    }
-  }
-}
-
-void Controller::Impl::ClearModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations)
-{
-  if(mTextUpdateInfo.mClearAll ||
-     ((0u == startIndex) &&
-      (mTextUpdateInfo.mPreviousNumberOfCharacters == endIndex + 1u)))
-  {
-    ClearFullModelData(operations);
-  }
-  else
-  {
-    // Clear the model data related with characters.
-    ClearCharacterModelData(startIndex, endIndex, operations);
-
-    // Clear the model data related with glyphs.
-    ClearGlyphModelData(startIndex, endIndex, operations);
-  }
-
-  // The estimated number of lines. Used to avoid reallocations when layouting.
-  mTextUpdateInfo.mEstimatedNumberOfLines = std::max(mModel->mVisualModel->mLines.Count(), mModel->mLogicalModel->mParagraphInfo.Count());
-
-  mModel->mVisualModel->ClearCaches();
-}
-
-bool Controller::Impl::UpdateModel(OperationsMask operationsRequired)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::UpdateModel\n");
-
-  // Calculate the operations to be done.
-  const OperationsMask operations = static_cast<OperationsMask>(mOperationsPending & operationsRequired);
-
-  if(NO_OPERATION == operations)
-  {
-    // Nothing to do if no operations are pending and required.
-    return false;
-  }
-
-  Vector<Character>& srcCharacters = mModel->mLogicalModel->mText;
-  Vector<Character>  displayCharacters;
-  bool               useHiddenText = false;
-  if(mHiddenInput && mEventData != nullptr && !mEventData->mIsShowingPlaceholderText)
-  {
-    mHiddenInput->Substitute(srcCharacters, displayCharacters);
-    useHiddenText = true;
-  }
-
-  Vector<Character>& utf32Characters    = useHiddenText ? displayCharacters : srcCharacters;
-  const Length       numberOfCharacters = utf32Characters.Count();
-
-  // Index to the first character of the first paragraph to be updated.
-  CharacterIndex startIndex = 0u;
-  // Number of characters of the paragraphs to be removed.
-  Length paragraphCharacters = 0u;
-
-  CalculateTextUpdateIndices(paragraphCharacters);
-
-  // Check whether the indices for updating the text is valid
-  if(numberOfCharacters > 0u &&
-     (mTextUpdateInfo.mParagraphCharacterIndex > numberOfCharacters ||
-      mTextUpdateInfo.mRequestedNumberOfCharacters > numberOfCharacters))
-  {
-    std::string currentText;
-    Utf32ToUtf8(mModel->mLogicalModel->mText.Begin(), numberOfCharacters, currentText);
-
-    DALI_LOG_ERROR("Controller::Impl::UpdateModel: mTextUpdateInfo has invalid indices\n");
-    DALI_LOG_ERROR("Number of characters: %d, current text is: %s\n", numberOfCharacters, currentText.c_str());
-
-    // Dump mTextUpdateInfo
-    DALI_LOG_ERROR("Dump mTextUpdateInfo:\n");
-    DALI_LOG_ERROR("     mTextUpdateInfo.mCharacterIndex = %u\n", mTextUpdateInfo.mCharacterIndex);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mNumberOfCharactersToRemove = %u\n", mTextUpdateInfo.mNumberOfCharactersToRemove);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mNumberOfCharactersToAdd = %u\n", mTextUpdateInfo.mNumberOfCharactersToAdd);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mPreviousNumberOfCharacters = %u\n", mTextUpdateInfo.mPreviousNumberOfCharacters);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mParagraphCharacterIndex = %u\n", mTextUpdateInfo.mParagraphCharacterIndex);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mRequestedNumberOfCharacters = %u\n", mTextUpdateInfo.mRequestedNumberOfCharacters);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mStartGlyphIndex = %u\n", mTextUpdateInfo.mStartGlyphIndex);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mStartLineIndex = %u\n", mTextUpdateInfo.mStartLineIndex);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mEstimatedNumberOfLines = %u\n", mTextUpdateInfo.mEstimatedNumberOfLines);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mClearAll = %d\n", mTextUpdateInfo.mClearAll);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mFullRelayoutNeeded = %d\n", mTextUpdateInfo.mFullRelayoutNeeded);
-    DALI_LOG_ERROR("     mTextUpdateInfo.mIsLastCharacterNewParagraph = %d\n", mTextUpdateInfo.mIsLastCharacterNewParagraph);
-
-    return false;
-  }
-
-  startIndex = mTextUpdateInfo.mParagraphCharacterIndex;
-
-  if(mTextUpdateInfo.mClearAll ||
-     (0u != paragraphCharacters))
-  {
-    ClearModelData(startIndex, startIndex + ((paragraphCharacters > 0u) ? paragraphCharacters - 1u : 0u), operations);
-  }
-
-  mTextUpdateInfo.mClearAll = false;
-
-  // Whether the model is updated.
-  bool updated = false;
-
-  Vector<LineBreakInfo>& lineBreakInfo               = mModel->mLogicalModel->mLineBreakInfo;
-  const Length           requestedNumberOfCharacters = mTextUpdateInfo.mRequestedNumberOfCharacters;
-
-  if(NO_OPERATION != (GET_LINE_BREAKS & operations))
-  {
-    // Retrieves the line break info. The line break info is used to split the text in 'paragraphs' to
-    // calculate the bidirectional info for each 'paragraph'.
-    // It's also used to layout the text (where it should be a new line) or to shape the text (text in different lines
-    // is not shaped together).
-    lineBreakInfo.Resize(numberOfCharacters, TextAbstraction::LINE_NO_BREAK);
-
-    SetLineBreakInfo(utf32Characters,
-                     startIndex,
-                     requestedNumberOfCharacters,
-                     lineBreakInfo);
-
-    if(mModel->mLineWrapMode == ((Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) ||
-       mModel->mLineWrapMode == ((Text::LineWrap::Mode)DevelText::LineWrap::MIXED))
-    {
-      CharacterIndex end                 = startIndex + requestedNumberOfCharacters;
-      LineBreakInfo* lineBreakInfoBuffer = lineBreakInfo.Begin();
-
-      for(CharacterIndex index = startIndex; index < end; index++)
-      {
-        CharacterIndex wordEnd = index;
-        while((*(lineBreakInfoBuffer + wordEnd) != TextAbstraction::LINE_ALLOW_BREAK) && (*(lineBreakInfoBuffer + wordEnd) != TextAbstraction::LINE_MUST_BREAK))
-        {
-          wordEnd++;
-        }
-
-        if((wordEnd + 1) == end) // add last char
-        {
-          wordEnd++;
-        }
-
-        Vector<bool> hyphens = GetWordHyphens(utf32Characters.Begin() + index, wordEnd - index, nullptr);
-
-        for(CharacterIndex i = 0; i < (wordEnd - index); i++)
-        {
-          if(hyphens[i])
-          {
-            *(lineBreakInfoBuffer + index + i) = TextAbstraction::LINE_HYPHENATION_BREAK;
-          }
-        }
-
-        index = wordEnd;
-      }
-    }
-
-    // Create the paragraph info.
-    mModel->mLogicalModel->CreateParagraphInfo(startIndex,
-                                               requestedNumberOfCharacters);
-    updated = true;
-  }
-
-  const bool getScripts    = NO_OPERATION != (GET_SCRIPTS & operations);
-  const bool validateFonts = NO_OPERATION != (VALIDATE_FONTS & operations);
-
-  Vector<ScriptRun>& scripts    = mModel->mLogicalModel->mScriptRuns;
-  Vector<FontRun>&   validFonts = mModel->mLogicalModel->mFontRuns;
-
-  if(getScripts || validateFonts)
-  {
-    // Validates the fonts assigned by the application or assigns default ones.
-    // It makes sure all the characters are going to be rendered by the correct font.
-    MultilanguageSupport multilanguageSupport = MultilanguageSupport::Get();
-
-    if(getScripts)
-    {
-      // Retrieves the scripts used in the text.
-      multilanguageSupport.SetScripts(utf32Characters,
-                                      startIndex,
-                                      requestedNumberOfCharacters,
-                                      scripts);
-    }
-
-    if(validateFonts)
-    {
-      // Validate the fonts set through the mark-up string.
-      Vector<FontDescriptionRun>& fontDescriptionRuns = mModel->mLogicalModel->mFontDescriptionRuns;
-
-      // Get the default font's description.
-      TextAbstraction::FontDescription defaultFontDescription;
-      TextAbstraction::PointSize26Dot6 defaultPointSize = TextAbstraction::FontClient::DEFAULT_POINT_SIZE * mFontSizeScale;
-
-      //Get the number of points per one unit of point-size
-      uint32_t numberOfPointsPerOneUnitOfPointSize = mFontClient.GetNumberOfPointsPerOneUnitOfPointSize();
-
-      if(IsShowingPlaceholderText() && mEventData && (nullptr != mEventData->mPlaceholderFont))
-      {
-        // If the placeholder font is set specifically, only placeholder font is changed.
-        defaultFontDescription = mEventData->mPlaceholderFont->mFontDescription;
-        if(mEventData->mPlaceholderFont->sizeDefined)
-        {
-          defaultPointSize = mEventData->mPlaceholderFont->mDefaultPointSize * mFontSizeScale * numberOfPointsPerOneUnitOfPointSize;
-        }
-      }
-      else if(nullptr != mFontDefaults)
-      {
-        // Set the normal font and the placeholder font.
-        defaultFontDescription = mFontDefaults->mFontDescription;
-
-        if(mTextFitEnabled)
-        {
-          defaultPointSize = mFontDefaults->mFitPointSize * numberOfPointsPerOneUnitOfPointSize;
-        }
-        else
-        {
-          defaultPointSize = mFontDefaults->mDefaultPointSize * mFontSizeScale * numberOfPointsPerOneUnitOfPointSize;
-        }
-      }
-
-      // Validates the fonts. If there is a character with no assigned font it sets a default one.
-      // After this call, fonts are validated.
-      multilanguageSupport.ValidateFonts(utf32Characters,
-                                         scripts,
-                                         fontDescriptionRuns,
-                                         defaultFontDescription,
-                                         defaultPointSize,
-                                         startIndex,
-                                         requestedNumberOfCharacters,
-                                         validFonts);
-    }
-    updated = true;
-  }
-
-  Vector<Character> mirroredUtf32Characters;
-  bool              textMirrored       = false;
-  const Length      numberOfParagraphs = mModel->mLogicalModel->mParagraphInfo.Count();
-  if(NO_OPERATION != (BIDI_INFO & operations))
-  {
-    Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = mModel->mLogicalModel->mBidirectionalParagraphInfo;
-    bidirectionalInfo.Reserve(numberOfParagraphs);
-
-    // Calculates the bidirectional info for the whole paragraph if it contains right to left scripts.
-    SetBidirectionalInfo(utf32Characters,
-                         scripts,
-                         lineBreakInfo,
-                         startIndex,
-                         requestedNumberOfCharacters,
-                         bidirectionalInfo,
-                         (mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS),
-                         mLayoutDirection);
-
-    if(0u != bidirectionalInfo.Count())
-    {
-      // Only set the character directions if there is right to left characters.
-      Vector<CharacterDirection>& directions = mModel->mLogicalModel->mCharacterDirections;
-      GetCharactersDirection(bidirectionalInfo,
-                             numberOfCharacters,
-                             startIndex,
-                             requestedNumberOfCharacters,
-                             directions);
-
-      // This paragraph has right to left text. Some characters may need to be mirrored.
-      // TODO: consider if the mirrored string can be stored as well.
-
-      textMirrored = GetMirroredText(utf32Characters,
-                                     directions,
-                                     bidirectionalInfo,
-                                     startIndex,
-                                     requestedNumberOfCharacters,
-                                     mirroredUtf32Characters);
-    }
-    else
-    {
-      // There is no right to left characters. Clear the directions vector.
-      mModel->mLogicalModel->mCharacterDirections.Clear();
-    }
-    updated = true;
-  }
-
-  Vector<GlyphInfo>&      glyphs                = mModel->mVisualModel->mGlyphs;
-  Vector<CharacterIndex>& glyphsToCharactersMap = mModel->mVisualModel->mGlyphsToCharacters;
-  Vector<Length>&         charactersPerGlyph    = mModel->mVisualModel->mCharactersPerGlyph;
-  Vector<GlyphIndex>      newParagraphGlyphs;
-  newParagraphGlyphs.Reserve(numberOfParagraphs);
-
-  const Length currentNumberOfGlyphs = glyphs.Count();
-  if(NO_OPERATION != (SHAPE_TEXT & operations))
-  {
-    const Vector<Character>& textToShape = textMirrored ? mirroredUtf32Characters : utf32Characters;
-    // Shapes the text.
-    ShapeText(textToShape,
-              lineBreakInfo,
-              scripts,
-              validFonts,
-              startIndex,
-              mTextUpdateInfo.mStartGlyphIndex,
-              requestedNumberOfCharacters,
-              glyphs,
-              glyphsToCharactersMap,
-              charactersPerGlyph,
-              newParagraphGlyphs);
-
-    // Create the 'number of glyphs' per character and the glyph to character conversion tables.
-    mModel->mVisualModel->CreateGlyphsPerCharacterTable(startIndex, mTextUpdateInfo.mStartGlyphIndex, requestedNumberOfCharacters);
-    mModel->mVisualModel->CreateCharacterToGlyphTable(startIndex, mTextUpdateInfo.mStartGlyphIndex, requestedNumberOfCharacters);
-
-    updated = true;
-  }
-
-  const Length numberOfGlyphs = glyphs.Count() - currentNumberOfGlyphs;
-
-  if(NO_OPERATION != (GET_GLYPH_METRICS & operations))
-  {
-    GlyphInfo* glyphsBuffer = glyphs.Begin();
-    mMetrics->GetGlyphMetrics(glyphsBuffer + mTextUpdateInfo.mStartGlyphIndex, numberOfGlyphs);
-
-    // Update the width and advance of all new paragraph characters.
-    for(Vector<GlyphIndex>::ConstIterator it = newParagraphGlyphs.Begin(), endIt = newParagraphGlyphs.End(); it != endIt; ++it)
-    {
-      const GlyphIndex index = *it;
-      GlyphInfo&       glyph = *(glyphsBuffer + index);
-
-      glyph.xBearing = 0.f;
-      glyph.width    = 0.f;
-      glyph.advance  = 0.f;
-    }
-    updated = true;
-  }
-
-  if((nullptr != mEventData) &&
-     mEventData->mPreEditFlag &&
-     (0u != mModel->mVisualModel->mCharactersToGlyph.Count()))
-  {
-    Dali::InputMethodContext::PreEditAttributeDataContainer attrs;
-    mEventData->mInputMethodContext.GetPreeditStyle(attrs);
-    Dali::InputMethodContext::PreeditStyle type = Dali::InputMethodContext::PreeditStyle::NONE;
-
-    // Check the type of preedit and run it.
-    for(Dali::InputMethodContext::PreEditAttributeDataContainer::Iterator it = attrs.Begin(), endIt = attrs.End(); it != endIt; it++)
-    {
-      Dali::InputMethodContext::PreeditAttributeData attrData = *it;
-      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::UpdateModel PreeditStyle type : %d  start %d end %d \n", attrData.preeditType, attrData.startIndex, attrData.endIndex);
-      type = attrData.preeditType;
-
-      // Check the number of commit characters for the start position.
-      unsigned int numberOfCommit  = mEventData->mPrimaryCursorPosition - mEventData->mPreEditLength;
-      Length       numberOfIndices = attrData.endIndex - attrData.startIndex;
-
-      switch(type)
-      {
-        case Dali::InputMethodContext::PreeditStyle::UNDERLINE:
-        {
-          // Add the underline for the pre-edit text.
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
-          mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
-
-          //Mark-up processor case
-          if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-          {
-            CopyUnderlinedFromLogicalToVisualModels(false);
-          }
-          break;
-        }
-        case Dali::InputMethodContext::PreeditStyle::REVERSE:
-        {
-          Vector4  textColor = mModel->mVisualModel->GetTextColor();
-          ColorRun backgroundColorRun;
-          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
-          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
-          backgroundColorRun.color                           = textColor;
-          mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
-
-          Vector4 backgroundColor = mModel->mVisualModel->GetBackgroundColor();
-          if(backgroundColor.a == 0) // There is no text background color.
-          {
-            // Try use the control's background color.
-            if(nullptr != mEditableControlInterface)
-            {
-              mEditableControlInterface->GetControlBackgroundColor(backgroundColor);
-              if(backgroundColor.a == 0) // There is no control background color.
-              {
-                // Determines black or white color according to text color.
-                // Based on W3C Recommendations (https://www.w3.org/TR/WCAG20/)
-                float L         = CONSTANT_R * textColor.r + CONSTANT_G * textColor.g + CONSTANT_B * textColor.b;
-                backgroundColor = L > BRIGHTNESS_THRESHOLD ? BLACK : WHITE;
-              }
-            }
-          }
-
-          Vector<ColorRun> colorRuns;
-          colorRuns.Resize(1u);
-          ColorRun& colorRun                       = *(colorRuns.Begin());
-          colorRun.color                           = backgroundColor;
-          colorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
-          colorRun.characterRun.numberOfCharacters = numberOfIndices;
-          mModel->mLogicalModel->mColorRuns.PushBack(colorRun);
-
-          //Mark-up processor case
-          if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-          {
-            CopyUnderlinedFromLogicalToVisualModels(false);
-          }
-          break;
-        }
-        case Dali::InputMethodContext::PreeditStyle::HIGHLIGHT:
-        {
-          ColorRun backgroundColorRun;
-          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
-          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
-          backgroundColorRun.color                           = LIGHT_BLUE;
-          mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
-
-          //Mark-up processor case
-          if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-          {
-            CopyUnderlinedFromLogicalToVisualModels(false);
-          }
-          break;
-        }
-        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_1:
-        {
-          // CUSTOM_PLATFORM_STYLE_1 should be drawn with background and underline together.
-          ColorRun backgroundColorRun;
-          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
-          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
-          backgroundColorRun.color                           = BACKGROUND_SUB4;
-          mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
-
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
-          mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
-
-          //Mark-up processor case
-          if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-          {
-            CopyUnderlinedFromLogicalToVisualModels(false);
-          }
-          break;
-        }
-        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_2:
-        {
-          // CUSTOM_PLATFORM_STYLE_2 should be drawn with background and underline together.
-          ColorRun backgroundColorRun;
-          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
-          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
-          backgroundColorRun.color                           = BACKGROUND_SUB5;
-          mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
-
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
-          mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
-
-          //Mark-up processor case
-          if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-          {
-            CopyUnderlinedFromLogicalToVisualModels(false);
-          }
-          break;
-        }
-        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_3:
-        {
-          // CUSTOM_PLATFORM_STYLE_3 should be drawn with background and underline together.
-          ColorRun backgroundColorRun;
-          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
-          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
-          backgroundColorRun.color                           = BACKGROUND_SUB6;
-          mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
-
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
-          mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
-
-          //Mark-up processor case
-          if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-          {
-            CopyUnderlinedFromLogicalToVisualModels(false);
-          }
-          break;
-        }
-        case Dali::InputMethodContext::PreeditStyle::CUSTOM_PLATFORM_STYLE_4:
-        {
-          // CUSTOM_PLATFORM_STYLE_4 should be drawn with background and underline together.
-          ColorRun backgroundColorRun;
-          backgroundColorRun.characterRun.characterIndex     = attrData.startIndex + numberOfCommit;
-          backgroundColorRun.characterRun.numberOfCharacters = numberOfIndices;
-          backgroundColorRun.color                           = BACKGROUND_SUB7;
-          mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
-
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
-          mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
-
-          //Mark-up processor case
-          if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-          {
-            CopyUnderlinedFromLogicalToVisualModels(false);
-          }
-          break;
-        }
-        case Dali::InputMethodContext::PreeditStyle::NONE:
-        default:
-        {
-          break;
-        }
-      }
-    }
-    attrs.Clear();
-    updated = true;
-  }
-
-  if(NO_OPERATION != (COLOR & operations))
-  {
-    // Set the color runs in glyphs.
-    SetColorSegmentationInfo(mModel->mLogicalModel->mColorRuns,
-                             mModel->mVisualModel->mCharactersToGlyph,
-                             mModel->mVisualModel->mGlyphsPerCharacter,
-                             startIndex,
-                             mTextUpdateInfo.mStartGlyphIndex,
-                             requestedNumberOfCharacters,
-                             mModel->mVisualModel->mColors,
-                             mModel->mVisualModel->mColorIndices);
-
-    // Set the background color runs in glyphs.
-    SetColorSegmentationInfo(mModel->mLogicalModel->mBackgroundColorRuns,
-                             mModel->mVisualModel->mCharactersToGlyph,
-                             mModel->mVisualModel->mGlyphsPerCharacter,
-                             startIndex,
-                             mTextUpdateInfo.mStartGlyphIndex,
-                             requestedNumberOfCharacters,
-                             mModel->mVisualModel->mBackgroundColors,
-                             mModel->mVisualModel->mBackgroundColorIndices);
-
-    updated = true;
-  }
-
-  if((NO_OPERATION != (SHAPE_TEXT & operations)) &&
-     !((nullptr != mEventData) &&
-       mEventData->mPreEditFlag &&
-       (0u != mModel->mVisualModel->mCharactersToGlyph.Count())))
-  {
-    //Mark-up processor case
-    if(mModel->mVisualModel->IsMarkupProcessorEnabled())
-    {
-      CopyUnderlinedFromLogicalToVisualModels(true);
-    }
-
-    updated = true;
-  }
-
-  // The estimated number of lines. Used to avoid reallocations when layouting.
-  mTextUpdateInfo.mEstimatedNumberOfLines = std::max(mModel->mVisualModel->mLines.Count(), mModel->mLogicalModel->mParagraphInfo.Count());
-
-  // Set the previous number of characters for the next time the text is updated.
-  mTextUpdateInfo.mPreviousNumberOfCharacters = numberOfCharacters;
-
-  return updated;
-}
-
-void Controller::Impl::RetrieveDefaultInputStyle(InputStyle& inputStyle)
-{
-  // Sets the default text's color.
-  inputStyle.textColor      = mTextColor;
-  inputStyle.isDefaultColor = true;
-
-  inputStyle.familyName.clear();
-  inputStyle.weight = TextAbstraction::FontWeight::NORMAL;
-  inputStyle.width  = TextAbstraction::FontWidth::NORMAL;
-  inputStyle.slant  = TextAbstraction::FontSlant::NORMAL;
-  inputStyle.size   = 0.f;
-
-  inputStyle.lineSpacing = 0.f;
-
-  inputStyle.underlineProperties.clear();
-  inputStyle.shadowProperties.clear();
-  inputStyle.embossProperties.clear();
-  inputStyle.outlineProperties.clear();
-
-  inputStyle.isFamilyDefined = false;
-  inputStyle.isWeightDefined = false;
-  inputStyle.isWidthDefined  = false;
-  inputStyle.isSlantDefined  = false;
-  inputStyle.isSizeDefined   = false;
-
-  inputStyle.isLineSpacingDefined = false;
-
-  inputStyle.isUnderlineDefined = false;
-  inputStyle.isShadowDefined    = false;
-  inputStyle.isEmbossDefined    = false;
-  inputStyle.isOutlineDefined   = false;
-
-  // Sets the default font's family name, weight, width, slant and size.
-  if(mFontDefaults)
-  {
-    if(mFontDefaults->familyDefined)
-    {
-      inputStyle.familyName      = mFontDefaults->mFontDescription.family;
-      inputStyle.isFamilyDefined = true;
-    }
-
-    if(mFontDefaults->weightDefined)
-    {
-      inputStyle.weight          = mFontDefaults->mFontDescription.weight;
-      inputStyle.isWeightDefined = true;
-    }
-
-    if(mFontDefaults->widthDefined)
-    {
-      inputStyle.width          = mFontDefaults->mFontDescription.width;
-      inputStyle.isWidthDefined = true;
-    }
-
-    if(mFontDefaults->slantDefined)
-    {
-      inputStyle.slant          = mFontDefaults->mFontDescription.slant;
-      inputStyle.isSlantDefined = true;
-    }
-
-    if(mFontDefaults->sizeDefined)
-    {
-      inputStyle.size          = mFontDefaults->mDefaultPointSize;
-      inputStyle.isSizeDefined = true;
-    }
-  }
-}
-
-float Controller::Impl::GetDefaultFontLineHeight()
-{
-  FontId defaultFontId = 0u;
-  if(nullptr == mFontDefaults)
-  {
-    TextAbstraction::FontDescription fontDescription;
-    defaultFontId = mFontClient.GetFontId(fontDescription, TextAbstraction::FontClient::DEFAULT_POINT_SIZE * mFontSizeScale);
-  }
-  else
-  {
-    defaultFontId = mFontDefaults->GetFontId(mFontClient, mFontDefaults->mDefaultPointSize * mFontSizeScale);
-  }
-
-  Text::FontMetrics fontMetrics;
-  mMetrics->GetFontMetrics(defaultFontId, fontMetrics);
-
-  return (fontMetrics.ascender - fontMetrics.descender);
-}
-
-void Controller::Impl::SetTextSelectionRange(const uint32_t* pStart, const uint32_t* pEnd)
-{
-  if(nullptr == mEventData)
-  {
-    // Nothing to do if there is no text.
-    return;
-  }
-
-  if(mEventData->mSelectionEnabled && (pStart || pEnd))
-  {
-    uint32_t length   = static_cast<uint32_t>(mModel->mLogicalModel->mText.Count());
-    uint32_t oldStart = mEventData->mLeftSelectionPosition;
-    uint32_t oldEnd   = mEventData->mRightSelectionPosition;
-
-    if(pStart)
-    {
-      mEventData->mLeftSelectionPosition = std::min(*pStart, length);
-    }
-    if(pEnd)
-    {
-      mEventData->mRightSelectionPosition = std::min(*pEnd, length);
-    }
-
-    if(mEventData->mLeftSelectionPosition == mEventData->mRightSelectionPosition)
-    {
-      ChangeState(EventData::EDITING);
-      mEventData->mPrimaryCursorPosition = mEventData->mLeftSelectionPosition = mEventData->mRightSelectionPosition;
-      mEventData->mUpdateCursorPosition                                       = true;
-    }
-    else
-    {
-      ChangeState(EventData::SELECTING);
-      mEventData->mUpdateHighlightBox           = true;
-      mEventData->mUpdateLeftSelectionPosition  = true;
-      mEventData->mUpdateRightSelectionPosition = true;
-    }
-
-    if(mSelectableControlInterface != nullptr)
-    {
-      mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition);
-    }
-  }
-}
-
-CharacterIndex Controller::Impl::GetPrimaryCursorPosition() const
-{
-  if(nullptr == mEventData)
-  {
-    return 0;
-  }
-  return mEventData->mPrimaryCursorPosition;
-}
-
-bool Controller::Impl::SetPrimaryCursorPosition(CharacterIndex index, bool focused)
-{
-  if(nullptr == mEventData)
-  {
-    // Nothing to do if there is no text.
-    return false;
-  }
-
-  if(mEventData->mPrimaryCursorPosition == index && mEventData->mState != EventData::SELECTING)
-  {
-    // Nothing for same cursor position.
-    return false;
-  }
-
-  uint32_t length                    = static_cast<uint32_t>(mModel->mLogicalModel->mText.Count());
-  uint32_t oldCursorPos              = mEventData->mPrimaryCursorPosition;
-  mEventData->mPrimaryCursorPosition = std::min(index, length);
-  // If there is no focus, only the value is updated.
-  if(focused)
-  {
-    bool     wasInSelectingState = mEventData->mState == EventData::SELECTING;
-    uint32_t oldStart            = mEventData->mLeftSelectionPosition;
-    uint32_t oldEnd              = mEventData->mRightSelectionPosition;
-    ChangeState(EventData::EDITING);
-    mEventData->mLeftSelectionPosition = mEventData->mRightSelectionPosition = mEventData->mPrimaryCursorPosition;
-    mEventData->mUpdateCursorPosition                                        = true;
-
-    if(mSelectableControlInterface != nullptr && wasInSelectingState)
-    {
-      mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition);
-    }
-
-    ScrollTextToMatchCursor();
-  }
-
-  if(nullptr != mEditableControlInterface)
-  {
-    mEditableControlInterface->CursorPositionChanged(oldCursorPos, mEventData->mPrimaryCursorPosition);
-  }
-
-  return true;
-}
-
-Uint32Pair Controller::Impl::GetTextSelectionRange() const
-{
-  Uint32Pair range;
-
-  if(mEventData)
-  {
-    range.first  = mEventData->mLeftSelectionPosition;
-    range.second = mEventData->mRightSelectionPosition;
-  }
-
-  return range;
-}
-
-bool Controller::Impl::IsEditable() const
-{
-  return mEventData && mEventData->mEditingEnabled;
-}
-
-void Controller::Impl::SetEditable(bool editable)
-{
-  if(mEventData)
-  {
-    mEventData->mEditingEnabled = editable;
-  }
-}
-
-void Controller::Impl::RetrieveSelection(std::string& selectedText, bool deleteAfterRetrieval)
-{
-  if(mEventData->mLeftSelectionPosition == mEventData->mRightSelectionPosition)
-  {
-    // Nothing to select if handles are in the same place.
-    selectedText.clear();
-    return;
-  }
-
-  const bool handlesCrossed = mEventData->mLeftSelectionPosition > mEventData->mRightSelectionPosition;
-
-  //Get start and end position of selection
-  const CharacterIndex startOfSelectedText  = handlesCrossed ? mEventData->mRightSelectionPosition : mEventData->mLeftSelectionPosition;
-  const Length         lengthOfSelectedText = (handlesCrossed ? mEventData->mLeftSelectionPosition : mEventData->mRightSelectionPosition) - startOfSelectedText;
-
-  Vector<Character>& utf32Characters    = mModel->mLogicalModel->mText;
-  const Length       numberOfCharacters = utf32Characters.Count();
-
-  // Validate the start and end selection points
-  if((startOfSelectedText + lengthOfSelectedText) <= numberOfCharacters)
-  {
-    //Get text as a UTF8 string
-    Utf32ToUtf8(&utf32Characters[startOfSelectedText], lengthOfSelectedText, selectedText);
-
-    if(deleteAfterRetrieval) // Only delete text if copied successfully
-    {
-      // Keep a copy of the current input style.
-      InputStyle currentInputStyle;
-      currentInputStyle.Copy(mEventData->mInputStyle);
-
-      // Set as input style the style of the first deleted character.
-      mModel->mLogicalModel->RetrieveStyle(startOfSelectedText, mEventData->mInputStyle);
-
-      // Compare if the input style has changed.
-      const bool hasInputStyleChanged = !currentInputStyle.Equal(mEventData->mInputStyle);
-
-      if(hasInputStyleChanged)
-      {
-        const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask(mEventData->mInputStyle);
-        // Queue the input style changed signal.
-        mEventData->mInputStyleChangedQueue.PushBack(styleChangedMask);
-      }
-
-      mModel->mLogicalModel->UpdateTextStyleRuns(startOfSelectedText, -static_cast<int>(lengthOfSelectedText));
-
-      // Mark the paragraphs to be updated.
-      if(Layout::Engine::SINGLE_LINE_BOX == mLayoutEngine.GetLayout())
-      {
-        mTextUpdateInfo.mCharacterIndex             = 0;
-        mTextUpdateInfo.mNumberOfCharactersToRemove = mTextUpdateInfo.mPreviousNumberOfCharacters;
-        mTextUpdateInfo.mNumberOfCharactersToAdd    = mTextUpdateInfo.mPreviousNumberOfCharacters - lengthOfSelectedText;
-        mTextUpdateInfo.mClearAll                   = true;
-      }
-      else
-      {
-        mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
-        mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-      }
-
-      // Delete text between handles
-      Vector<Character>::Iterator first = utf32Characters.Begin() + startOfSelectedText;
-      Vector<Character>::Iterator last  = first + lengthOfSelectedText;
-      utf32Characters.Erase(first, last);
-
-      // Will show the cursor at the first character of the selection.
-      mEventData->mPrimaryCursorPosition = handlesCrossed ? mEventData->mRightSelectionPosition : mEventData->mLeftSelectionPosition;
-    }
-    else
-    {
-      // Will show the cursor at the last character of the selection.
-      mEventData->mPrimaryCursorPosition = handlesCrossed ? mEventData->mLeftSelectionPosition : mEventData->mRightSelectionPosition;
-    }
-
-    mEventData->mDecoratorUpdated = true;
-  }
-}
-
-void Controller::Impl::SetSelection(int start, int end)
-{
-  uint32_t oldStart = mEventData->mLeftSelectionPosition;
-  uint32_t oldEnd   = mEventData->mRightSelectionPosition;
-
-  mEventData->mLeftSelectionPosition  = start;
-  mEventData->mRightSelectionPosition = end;
-  mEventData->mUpdateCursorPosition   = true;
-
-  if(mSelectableControlInterface != nullptr)
-  {
-    mSelectableControlInterface->SelectionChanged(oldStart, oldEnd, start, end);
-  }
-}
-
-std::pair<int, int> Controller::Impl::GetSelectionIndexes() const
-{
-  return {mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition};
-}
-
-void Controller::Impl::ShowClipboard()
-{
-  if(mClipboard)
-  {
-    mClipboard.ShowClipboard();
-  }
-}
-
-void Controller::Impl::HideClipboard()
-{
-  if(mClipboard && mClipboardHideEnabled)
-  {
-    mClipboard.HideClipboard();
-  }
-}
-
-void Controller::Impl::SetClipboardHideEnable(bool enable)
-{
-  mClipboardHideEnabled = enable;
-}
-
-bool Controller::Impl::CopyStringToClipboard(const std::string& source)
-{
-  //Send string to clipboard
-  return (mClipboard && mClipboard.SetItem(source));
-}
-
-void Controller::Impl::SendSelectionToClipboard(bool deleteAfterSending)
-{
-  std::string selectedText;
-  RetrieveSelection(selectedText, deleteAfterSending);
-  CopyStringToClipboard(selectedText);
-  ChangeState(EventData::EDITING);
-}
-
-void Controller::Impl::RequestGetTextFromClipboard()
-{
-  if(mClipboard)
-  {
-    mClipboard.RequestItem();
-  }
-}
-
-void Controller::Impl::RepositionSelectionHandles()
-{
-  SelectionHandleController::Reposition(*this);
-}
-void Controller::Impl::RepositionSelectionHandles(float visualX, float visualY, Controller::NoTextTap::Action action)
-{
-  SelectionHandleController::Reposition(*this, visualX, visualY, action);
-}
-
-void Controller::Impl::SetPopupButtons()
-{
-  /**
-   *  Sets the Popup buttons to be shown depending on State.
-   *
-   *  If SELECTING :  CUT & COPY + ( PASTE & CLIPBOARD if content available to paste )
-   *
-   *  If EDITING_WITH_POPUP : SELECT & SELECT_ALL
-   */
-
-  bool                        isEditable    = IsEditable();
-  TextSelectionPopup::Buttons buttonsToShow = TextSelectionPopup::NONE;
-
-  if(EventData::SELECTING == mEventData->mState)
-  {
-    buttonsToShow = TextSelectionPopup::Buttons(TextSelectionPopup::COPY);
-    if(isEditable)
-    {
-      buttonsToShow = TextSelectionPopup::Buttons(buttonsToShow | TextSelectionPopup::CUT);
-    }
-
-    if(!IsClipboardEmpty())
-    {
-      if(isEditable)
-      {
-        buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::PASTE));
-      }
-      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::CLIPBOARD));
-    }
-
-    if(!mEventData->mAllTextSelected)
-    {
-      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::SELECT_ALL));
-    }
-  }
-  else if(EventData::EDITING_WITH_POPUP == mEventData->mState)
-  {
-    if(mModel->mLogicalModel->mText.Count() && !IsShowingPlaceholderText())
-    {
-      buttonsToShow = TextSelectionPopup::Buttons(TextSelectionPopup::SELECT | TextSelectionPopup::SELECT_ALL);
-    }
-
-    if(!IsClipboardEmpty())
-    {
-      if(isEditable)
-      {
-        buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::PASTE));
-      }
-      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::CLIPBOARD));
-    }
-  }
-  else if(EventData::EDITING_WITH_PASTE_POPUP == mEventData->mState)
-  {
-    if(!IsClipboardEmpty())
-    {
-      if(isEditable)
-      {
-        buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::PASTE));
-      }
-      buttonsToShow = TextSelectionPopup::Buttons((buttonsToShow | TextSelectionPopup::CLIPBOARD));
-    }
-  }
-
-  mEventData->mDecorator->SetEnabledPopupButtons(buttonsToShow);
-}
-
-void Controller::Impl::ChangeState(EventData::State newState)
-{
-  if(nullptr == mEventData)
-  {
-    // Nothing to do if there is no text input.
-    return;
-  }
-
-  DALI_LOG_INFO(gLogFilter, Debug::General, "ChangeState state:%d  newstate:%d\n", mEventData->mState, newState);
-
-  if(mEventData->mState != newState)
-  {
-    mEventData->mPreviousState = mEventData->mState;
-    mEventData->mState         = newState;
-
-    switch(mEventData->mState)
-    {
-      case EventData::INACTIVE:
-      {
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
-        mEventData->mDecorator->StopCursorBlink();
-        mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHighlightActive(false);
-        mEventData->mDecorator->SetPopupActive(false);
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::INTERRUPTED:
-      {
-        mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHighlightActive(false);
-        mEventData->mDecorator->SetPopupActive(false);
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::SELECTING:
-      {
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
-        mEventData->mDecorator->StopCursorBlink();
-        mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, false);
-        if(mEventData->mGrabHandleEnabled)
-        {
-          mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, true);
-          mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, true);
-        }
-        mEventData->mDecorator->SetHighlightActive(true);
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          SetPopupButtons();
-          mEventData->mDecorator->SetPopupActive(true);
-        }
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::EDITING:
-      {
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
-        if(mEventData->mCursorBlinkEnabled)
-        {
-          mEventData->mDecorator->StartCursorBlink();
-        }
-        // Grab handle is not shown until a tap is received whilst EDITING
-        mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHighlightActive(false);
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          mEventData->mDecorator->SetPopupActive(false);
-        }
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::EDITING_WITH_POPUP:
-      {
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "EDITING_WITH_POPUP \n", newState);
-
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
-        if(mEventData->mCursorBlinkEnabled)
-        {
-          mEventData->mDecorator->StartCursorBlink();
-        }
-        if(mEventData->mSelectionEnabled)
-        {
-          mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-          mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-          mEventData->mDecorator->SetHighlightActive(false);
-        }
-        else if(mEventData->mGrabHandleEnabled)
-        {
-          mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, true);
-        }
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          SetPopupButtons();
-          mEventData->mDecorator->SetPopupActive(true);
-        }
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::EDITING_WITH_GRAB_HANDLE:
-      {
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "EDITING_WITH_GRAB_HANDLE \n", newState);
-
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
-        if(mEventData->mCursorBlinkEnabled)
-        {
-          mEventData->mDecorator->StartCursorBlink();
-        }
-        // Grab handle is not shown until a tap is received whilst EDITING
-        if(mEventData->mGrabHandleEnabled)
-        {
-          mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, true);
-        }
-        mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHighlightActive(false);
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          mEventData->mDecorator->SetPopupActive(false);
-        }
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::SELECTION_HANDLE_PANNING:
-      {
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
-        mEventData->mDecorator->StopCursorBlink();
-        mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, false);
-        if(mEventData->mGrabHandleEnabled)
-        {
-          mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, true);
-          mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, true);
-        }
-        mEventData->mDecorator->SetHighlightActive(true);
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          mEventData->mDecorator->SetPopupActive(false);
-        }
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::GRAB_HANDLE_PANNING:
-      {
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "GRAB_HANDLE_PANNING \n", newState);
-
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
-        if(mEventData->mCursorBlinkEnabled)
-        {
-          mEventData->mDecorator->StartCursorBlink();
-        }
-        if(mEventData->mGrabHandleEnabled)
-        {
-          mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, true);
-        }
-        mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHighlightActive(false);
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          mEventData->mDecorator->SetPopupActive(false);
-        }
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::EDITING_WITH_PASTE_POPUP:
-      {
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "EDITING_WITH_PASTE_POPUP \n", newState);
-
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
-        if(mEventData->mCursorBlinkEnabled)
-        {
-          mEventData->mDecorator->StartCursorBlink();
-        }
-
-        if(mEventData->mGrabHandleEnabled)
-        {
-          mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, true);
-        }
-        mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-        mEventData->mDecorator->SetHighlightActive(false);
-
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          SetPopupButtons();
-          mEventData->mDecorator->SetPopupActive(true);
-        }
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-      case EventData::TEXT_PANNING:
-      {
-        mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
-        mEventData->mDecorator->StopCursorBlink();
-        mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, false);
-        if(mEventData->mDecorator->IsHandleActive(LEFT_SELECTION_HANDLE) ||
-           mEventData->mDecorator->IsHandleActive(RIGHT_SELECTION_HANDLE))
-        {
-          mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-          mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-          mEventData->mDecorator->SetHighlightActive(true);
-        }
-
-        if(mEventData->mGrabHandlePopupEnabled)
-        {
-          mEventData->mDecorator->SetPopupActive(false);
-        }
-
-        mEventData->mDecoratorUpdated = true;
-        break;
-      }
-    }
-  }
-}
-
-void Controller::Impl::GetCursorPosition(CharacterIndex logical,
-                                         CursorInfo&    cursorInfo)
-{
-  if(!IsShowingRealText())
-  {
-    // Do not want to use the place-holder text to set the cursor position.
-
-    // Use the line's height of the font's family set to set the cursor's size.
-    // If there is no font's family set, use the default font.
-    // Use the current alignment to place the cursor at the beginning, center or end of the box.
-
-    cursorInfo.lineOffset          = 0.f;
-    cursorInfo.lineHeight          = GetDefaultFontLineHeight();
-    cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
-
-    bool isRTL = false;
-    if(mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS)
-    {
-      isRTL = mLayoutDirection == LayoutDirection::RIGHT_TO_LEFT;
-    }
-
-    switch(mModel->mHorizontalAlignment)
-    {
-      case Text::HorizontalAlignment::BEGIN:
-      {
-        if(isRTL)
-        {
-          cursorInfo.primaryPosition.x = mModel->mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
-        }
-        else
-        {
-          cursorInfo.primaryPosition.x = 0.f;
-        }
-        break;
-      }
-      case Text::HorizontalAlignment::CENTER:
-      {
-        cursorInfo.primaryPosition.x = floorf(0.5f * mModel->mVisualModel->mControlSize.width);
-        break;
-      }
-      case Text::HorizontalAlignment::END:
-      {
-        if(isRTL)
-        {
-          cursorInfo.primaryPosition.x = 0.f;
-        }
-        else
-        {
-          cursorInfo.primaryPosition.x = mModel->mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
-        }
-        break;
-      }
-    }
-
-    // Nothing else to do.
-    return;
-  }
-
-  const bool                  isMultiLine = (Layout::Engine::MULTI_LINE_BOX == mLayoutEngine.GetLayout());
-  GetCursorPositionParameters parameters;
-  parameters.visualModel  = mModel->mVisualModel;
-  parameters.logicalModel = mModel->mLogicalModel;
-  parameters.metrics      = mMetrics;
-  parameters.logical      = logical;
-  parameters.isMultiline  = isMultiLine;
-
-  Text::GetCursorPosition(parameters,
-                          cursorInfo);
-
-  // Adds Outline offset.
-  const float outlineWidth = static_cast<float>(mModel->GetOutlineWidth());
-  cursorInfo.primaryPosition.x += outlineWidth;
-  cursorInfo.primaryPosition.y += outlineWidth;
-  cursorInfo.secondaryPosition.x += outlineWidth;
-  cursorInfo.secondaryPosition.y += outlineWidth;
-
-  if(isMultiLine)
-  {
-    // If the text is editable and multi-line, the cursor position after a white space shouldn't exceed the boundaries of the text control.
-
-    // Note the white spaces laid-out at the end of the line might exceed the boundaries of the control.
-    // The reason is a wrapped line must not start with a white space so they are laid-out at the end of the line.
-
-    if(0.f > cursorInfo.primaryPosition.x)
-    {
-      cursorInfo.primaryPosition.x = 0.f;
-    }
-
-    const float edgeWidth = mModel->mVisualModel->mControlSize.width - static_cast<float>(mEventData->mDecorator->GetCursorWidth());
-    if(cursorInfo.primaryPosition.x > edgeWidth)
-    {
-      cursorInfo.primaryPosition.x = edgeWidth;
-    }
-  }
-}
-
-CharacterIndex Controller::Impl::CalculateNewCursorIndex(CharacterIndex index) const
-{
-  if(nullptr == mEventData)
-  {
-    // Nothing to do if there is no text input.
-    return 0u;
-  }
-
-  CharacterIndex cursorIndex = mEventData->mPrimaryCursorPosition;
-
-  const GlyphIndex* const charactersToGlyphBuffer  = mModel->mVisualModel->mCharactersToGlyph.Begin();
-  const Length* const     charactersPerGlyphBuffer = mModel->mVisualModel->mCharactersPerGlyph.Begin();
-
-  GlyphIndex glyphIndex         = *(charactersToGlyphBuffer + index);
-  Length     numberOfCharacters = *(charactersPerGlyphBuffer + glyphIndex);
-
-  if(numberOfCharacters > 1u)
-  {
-    const Script script = mModel->mLogicalModel->GetScript(index);
-    if(HasLigatureMustBreak(script))
-    {
-      // Prevents to jump the whole Latin ligatures like fi, ff, or Arabic ï»», ...
-      numberOfCharacters = 1u;
-    }
-  }
-  else
-  {
-    while(0u == numberOfCharacters)
-    {
-      ++glyphIndex;
-      numberOfCharacters = *(charactersPerGlyphBuffer + glyphIndex);
-    }
-  }
-
-  if(index < mEventData->mPrimaryCursorPosition)
-  {
-    cursorIndex -= numberOfCharacters;
-  }
-  else
-  {
-    cursorIndex += numberOfCharacters;
-  }
-
-  // Will update the cursor hook position.
-  mEventData->mUpdateCursorHookPosition = true;
-
-  return cursorIndex;
-}
-
-void Controller::Impl::UpdateCursorPosition(const CursorInfo& cursorInfo)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::UpdateCursorPosition %p\n", this);
-  if(nullptr == mEventData)
-  {
-    // Nothing to do if there is no text input.
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::UpdateCursorPosition no event data\n");
-    return;
-  }
-
-  const Vector2 cursorPosition = cursorInfo.primaryPosition + mModel->mScrollPosition;
-
-  mEventData->mDecorator->SetGlyphOffset(PRIMARY_CURSOR, cursorInfo.glyphOffset);
-
-  // Sets the cursor position.
-  mEventData->mDecorator->SetPosition(PRIMARY_CURSOR,
-                                      cursorPosition.x,
-                                      cursorPosition.y,
-                                      cursorInfo.primaryCursorHeight,
-                                      cursorInfo.lineHeight);
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Primary cursor position: %f,%f\n", cursorPosition.x, cursorPosition.y);
-
-  if(mEventData->mUpdateGrabHandlePosition)
-  {
-    // Sets the grab handle position.
-    mEventData->mDecorator->SetPosition(GRAB_HANDLE,
-                                        cursorPosition.x,
-                                        cursorInfo.lineOffset + mModel->mScrollPosition.y,
-                                        cursorInfo.lineHeight);
-  }
-
-  if(cursorInfo.isSecondaryCursor)
-  {
-    mEventData->mDecorator->SetPosition(SECONDARY_CURSOR,
-                                        cursorInfo.secondaryPosition.x + mModel->mScrollPosition.x,
-                                        cursorInfo.secondaryPosition.y + mModel->mScrollPosition.y,
-                                        cursorInfo.secondaryCursorHeight,
-                                        cursorInfo.lineHeight);
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Secondary cursor position: %f,%f\n", cursorInfo.secondaryPosition.x + mModel->mScrollPosition.x, cursorInfo.secondaryPosition.y + mModel->mScrollPosition.y);
-  }
-
-  // Set which cursors are active according the state.
-  if(EventData::IsEditingState(mEventData->mState) || (EventData::GRAB_HANDLE_PANNING == mEventData->mState))
-  {
-    if(cursorInfo.isSecondaryCursor)
-    {
-      mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_BOTH);
-    }
-    else
-    {
-      mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_PRIMARY);
-    }
-  }
-  else
-  {
-    mEventData->mDecorator->SetActiveCursor(ACTIVE_CURSOR_NONE);
-  }
-
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::UpdateCursorPosition\n");
-}
-
-void Controller::Impl::UpdateSelectionHandle(HandleType        handleType,
-                                             const CursorInfo& cursorInfo)
-{
-  SelectionHandleController::Update(*this, handleType, cursorInfo);
-}
-
-void Controller::Impl::ClampHorizontalScroll(const Vector2& layoutSize)
-{
-  // Clamp between -space & -alignment offset.
-
-  if(layoutSize.width > mModel->mVisualModel->mControlSize.width)
-  {
-    const float space         = (layoutSize.width - mModel->mVisualModel->mControlSize.width) + mModel->mAlignmentOffset;
-    mModel->mScrollPosition.x = (mModel->mScrollPosition.x < -space) ? -space : mModel->mScrollPosition.x;
-    mModel->mScrollPosition.x = (mModel->mScrollPosition.x > -mModel->mAlignmentOffset) ? -mModel->mAlignmentOffset : mModel->mScrollPosition.x;
-
-    mEventData->mDecoratorUpdated = true;
-  }
-  else
-  {
-    mModel->mScrollPosition.x = 0.f;
-  }
-}
-
-void Controller::Impl::ClampVerticalScroll(const Vector2& layoutSize)
-{
-  if(Layout::Engine::SINGLE_LINE_BOX == mLayoutEngine.GetLayout())
-  {
-    // Nothing to do if the text is single line.
-    return;
-  }
-
-  // Clamp between -space & 0.
-  if(layoutSize.height > mModel->mVisualModel->mControlSize.height)
-  {
-    const float space         = (layoutSize.height - mModel->mVisualModel->mControlSize.height);
-    mModel->mScrollPosition.y = (mModel->mScrollPosition.y < -space) ? -space : mModel->mScrollPosition.y;
-    mModel->mScrollPosition.y = (mModel->mScrollPosition.y > 0.f) ? 0.f : mModel->mScrollPosition.y;
-
-    mEventData->mDecoratorUpdated = true;
-  }
-  else
-  {
-    mModel->mScrollPosition.y = 0.f;
-  }
-}
-
-void Controller::Impl::ScrollToMakePositionVisible(const Vector2& position, float lineHeight)
-{
-  const float cursorWidth = mEventData->mDecorator ? static_cast<float>(mEventData->mDecorator->GetCursorWidth()) : 0.f;
-
-  // position is in actor's coords.
-  const float positionEndX = position.x + cursorWidth;
-  const float positionEndY = position.y + lineHeight;
-
-  // Transform the position to decorator coords.
-  const float decoratorPositionBeginX = position.x + mModel->mScrollPosition.x;
-  const float decoratorPositionEndX   = positionEndX + mModel->mScrollPosition.x;
-
-  const float decoratorPositionBeginY = position.y + mModel->mScrollPosition.y;
-  const float decoratorPositionEndY   = positionEndY + mModel->mScrollPosition.y;
-
-  if(decoratorPositionBeginX < 0.f)
-  {
-    mModel->mScrollPosition.x = -position.x;
-  }
-  else if(decoratorPositionEndX > mModel->mVisualModel->mControlSize.width)
-  {
-    mModel->mScrollPosition.x = mModel->mVisualModel->mControlSize.width - positionEndX;
-  }
-
-  if(Layout::Engine::MULTI_LINE_BOX == mLayoutEngine.GetLayout())
-  {
-    if(decoratorPositionBeginY < 0.f)
-    {
-      mModel->mScrollPosition.y = -position.y;
-    }
-    else if(decoratorPositionEndY > mModel->mVisualModel->mControlSize.height)
-    {
-      mModel->mScrollPosition.y = mModel->mVisualModel->mControlSize.height - positionEndY;
-    }
-  }
-}
-
-void Controller::Impl::ScrollTextToMatchCursor(const CursorInfo& cursorInfo)
-{
-  // Get the current cursor position in decorator coords.
-  const Vector2& currentCursorPosition = mEventData->mDecorator->GetPosition(PRIMARY_CURSOR);
-
-  const LineIndex lineIndex = mModel->mVisualModel->GetLineOfCharacter(mEventData->mPrimaryCursorPosition);
-
-  // Calculate the offset to match the cursor position before the character was deleted.
-  mModel->mScrollPosition.x = currentCursorPosition.x - cursorInfo.primaryPosition.x;
-
-  //If text control has more than two lines and current line index is not last, calculate scrollpositionY
-  if(mModel->mVisualModel->mLines.Count() > 1u && lineIndex != mModel->mVisualModel->mLines.Count() - 1u)
-  {
-    const float currentCursorGlyphOffset = mEventData->mDecorator->GetGlyphOffset(PRIMARY_CURSOR);
-    mModel->mScrollPosition.y            = currentCursorPosition.y - cursorInfo.lineOffset - currentCursorGlyphOffset;
-  }
-
-  ClampHorizontalScroll(mModel->mVisualModel->GetLayoutSize());
-  ClampVerticalScroll(mModel->mVisualModel->GetLayoutSize());
-
-  // Makes the new cursor position visible if needed.
-  ScrollToMakePositionVisible(cursorInfo.primaryPosition, cursorInfo.lineHeight);
-}
-
-void Controller::Impl::ScrollTextToMatchCursor()
-{
-  CursorInfo cursorInfo;
-  GetCursorPosition(mEventData->mPrimaryCursorPosition, cursorInfo);
-  ScrollTextToMatchCursor(cursorInfo);
-}
-
-void Controller::Impl::RequestRelayout()
-{
-  if(nullptr != mControlInterface)
-  {
-    mControlInterface->RequestTextRelayout();
-  }
-}
-
-Actor Controller::Impl::CreateBackgroundActor()
-{
-  // NOTE: Currently we only support background color for left-to-right text.
-
-  Actor actor;
-
-  Length numberOfGlyphs = mView.GetNumberOfGlyphs();
-  if(numberOfGlyphs > 0u)
-  {
-    Vector<GlyphInfo> glyphs;
-    glyphs.Resize(numberOfGlyphs);
-
-    Vector<Vector2> positions;
-    positions.Resize(numberOfGlyphs);
-
-    // Get the line where the glyphs are laid-out.
-    const LineRun* lineRun         = mModel->mVisualModel->mLines.Begin();
-    float          alignmentOffset = lineRun->alignmentOffset;
-    numberOfGlyphs                 = mView.GetGlyphs(glyphs.Begin(),
-                                     positions.Begin(),
-                                     alignmentOffset,
-                                     0u,
-                                     numberOfGlyphs);
-
-    glyphs.Resize(numberOfGlyphs);
-    positions.Resize(numberOfGlyphs);
-
-    const GlyphInfo* const glyphsBuffer    = glyphs.Begin();
-    const Vector2* const   positionsBuffer = positions.Begin();
-
-    BackgroundMesh mesh;
-    mesh.mVertices.Reserve(4u * glyphs.Size());
-    mesh.mIndices.Reserve(6u * glyphs.Size());
-
-    const Vector2 textSize = mView.GetLayoutSize();
-
-    const float offsetX = textSize.width * 0.5f;
-    const float offsetY = textSize.height * 0.5f;
-
-    const Vector4* const    backgroundColorsBuffer       = mView.GetBackgroundColors();
-    const ColorIndex* const backgroundColorIndicesBuffer = mView.GetBackgroundColorIndices();
-    const Vector4&          defaultBackgroundColor       = mModel->mVisualModel->IsBackgroundEnabled() ? mModel->mVisualModel->GetBackgroundColor() : Color::TRANSPARENT;
-
-    Vector4   quad;
-    uint32_t  numberOfQuads = 0u;
-    Length    yLineOffset   = 0;
-    Length    prevLineIndex = 0;
-    LineIndex lineIndex;
-    Length    numberOfLines;
-
-    for(uint32_t i = 0, glyphSize = glyphs.Size(); i < glyphSize; ++i)
-    {
-      const GlyphInfo& glyph = *(glyphsBuffer + i);
-
-      // Get the background color of the character.
-      // The color index zero is reserved for the default background color (i.e. Color::TRANSPARENT)
-      const bool       isMarkupBackground       = mView.IsMarkupBackgroundColorSet();
-      const ColorIndex backgroundColorIndex     = isMarkupBackground ? *(backgroundColorIndicesBuffer + i) : 0u;
-      const bool       isDefaultBackgroundColor = (0u == backgroundColorIndex);
-      const Vector4&   backgroundColor          = isDefaultBackgroundColor ? defaultBackgroundColor : *(backgroundColorsBuffer + backgroundColorIndex - 1u);
-
-      mModel->mVisualModel->GetNumberOfLines(i, 1, lineIndex, numberOfLines);
-      Length lineHeight = lineRun[lineIndex].ascender + -(lineRun[lineIndex].descender) + lineRun[lineIndex].lineSpacing;
-
-      if(lineIndex != prevLineIndex)
-      {
-        yLineOffset += lineHeight;
-      }
-
-      // Only create quads for glyphs with a background color
-      if(backgroundColor != Color::TRANSPARENT)
-      {
-        const Vector2 position = *(positionsBuffer + i);
-
-        if(i == 0u && glyphSize == 1u) // Only one glyph in the whole text
-        {
-          quad.x = position.x;
-          quad.y = yLineOffset;
-          quad.z = quad.x + std::max(glyph.advance, glyph.xBearing + glyph.width);
-          quad.w = lineHeight;
-        }
-        else if((lineIndex != prevLineIndex) || (i == 0u)) // The first glyph in the line
-        {
-          quad.x = position.x;
-          quad.y = yLineOffset;
-          quad.z = quad.x - glyph.xBearing + glyph.advance;
-          quad.w = quad.y + lineHeight;
-        }
-        else if(i == glyphSize - 1u) // The last glyph in the whole text
-        {
-          quad.x = position.x - glyph.xBearing;
-          quad.y = yLineOffset;
-          quad.z = quad.x + std::max(glyph.advance, glyph.xBearing + glyph.width);
-          quad.w = quad.y + lineHeight;
-        }
-        else // The glyph in the middle of the text
-        {
-          quad.x = position.x - glyph.xBearing;
-          quad.y = yLineOffset;
-          quad.z = quad.x + glyph.advance;
-          quad.w = quad.y + lineHeight;
-        }
-
-        BackgroundVertex vertex;
-
-        // Top left
-        vertex.mPosition.x = quad.x - offsetX;
-        vertex.mPosition.y = quad.y - offsetY;
-        vertex.mColor      = backgroundColor;
-        mesh.mVertices.PushBack(vertex);
-
-        // Top right
-        vertex.mPosition.x = quad.z - offsetX;
-        vertex.mPosition.y = quad.y - offsetY;
-        vertex.mColor      = backgroundColor;
-        mesh.mVertices.PushBack(vertex);
-
-        // Bottom left
-        vertex.mPosition.x = quad.x - offsetX;
-        vertex.mPosition.y = quad.w - offsetY;
-        vertex.mColor      = backgroundColor;
-        mesh.mVertices.PushBack(vertex);
-
-        // Bottom right
-        vertex.mPosition.x = quad.z - offsetX;
-        vertex.mPosition.y = quad.w - offsetY;
-        vertex.mColor      = backgroundColor;
-        mesh.mVertices.PushBack(vertex);
-
-        // Six indices in counter clockwise winding
-        mesh.mIndices.PushBack(1u + 4 * numberOfQuads);
-        mesh.mIndices.PushBack(0u + 4 * numberOfQuads);
-        mesh.mIndices.PushBack(2u + 4 * numberOfQuads);
-        mesh.mIndices.PushBack(2u + 4 * numberOfQuads);
-        mesh.mIndices.PushBack(3u + 4 * numberOfQuads);
-        mesh.mIndices.PushBack(1u + 4 * numberOfQuads);
-
-        numberOfQuads++;
-      }
-
-      if(lineIndex != prevLineIndex)
-      {
-        prevLineIndex = lineIndex;
-      }
-    }
-
-    // Only create the background actor if there are glyphs with background color
-    if(mesh.mVertices.Count() > 0u)
-    {
-      Property::Map quadVertexFormat;
-      quadVertexFormat["aPosition"] = Property::VECTOR2;
-      quadVertexFormat["aColor"]    = Property::VECTOR4;
-
-      VertexBuffer quadVertices = VertexBuffer::New(quadVertexFormat);
-      quadVertices.SetData(&mesh.mVertices[0], mesh.mVertices.Size());
-
-      Geometry quadGeometry = Geometry::New();
-      quadGeometry.AddVertexBuffer(quadVertices);
-      quadGeometry.SetIndexBuffer(&mesh.mIndices[0], mesh.mIndices.Size());
-
-      if(!mShaderBackground)
-      {
-        mShaderBackground = Shader::New(SHADER_TEXT_CONTROLLER_BACKGROUND_SHADER_VERT, SHADER_TEXT_CONTROLLER_BACKGROUND_SHADER_FRAG);
-      }
-
-      Dali::Renderer renderer = Dali::Renderer::New(quadGeometry, mShaderBackground);
-      renderer.SetProperty(Dali::Renderer::Property::BLEND_MODE, BlendMode::ON);
-      renderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, DepthIndex::CONTENT);
-
-      actor = Actor::New();
-      actor.SetProperty(Dali::Actor::Property::NAME, "TextBackgroundColorActor");
-      actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-      actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-      actor.SetProperty(Actor::Property::SIZE, textSize);
-      actor.SetProperty(Actor::Property::COLOR_MODE, USE_OWN_MULTIPLY_PARENT_COLOR);
-      actor.AddRenderer(renderer);
-    }
-  }
-
-  return actor;
-}
-
-void Controller::Impl::CopyUnderlinedFromLogicalToVisualModels(bool shouldClearPreUnderlineRuns)
-{
-  //Underlined character runs for markup-processor
-  const Vector<UnderlinedCharacterRun>& underlinedCharacterRuns = mModel->mLogicalModel->mUnderlinedCharacterRuns;
-  const Vector<GlyphIndex>&             charactersToGlyph       = mModel->mVisualModel->mCharactersToGlyph;
-  const Vector<Length>&                 glyphsPerCharacter      = mModel->mVisualModel->mGlyphsPerCharacter;
-
-  if(shouldClearPreUnderlineRuns)
-  {
-    mModel->mVisualModel->mUnderlineRuns.Clear();
-  }
-
-  for(Vector<UnderlinedCharacterRun>::ConstIterator it = underlinedCharacterRuns.Begin(), endIt = underlinedCharacterRuns.End(); it != endIt; ++it)
-  {
-    CharacterIndex characterIndex     = it->characterRun.characterIndex;
-    Length         numberOfCharacters = it->characterRun.numberOfCharacters;
-    for(Length index = 0u; index < numberOfCharacters; index++)
-    {
-      GlyphRun underlineGlyphRun;
-      underlineGlyphRun.glyphIndex     = charactersToGlyph[characterIndex + index];
-      underlineGlyphRun.numberOfGlyphs = glyphsPerCharacter[characterIndex + index];
-      mModel->mVisualModel->mUnderlineRuns.PushBack(underlineGlyphRun);
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h
deleted file mode 100644
index 02fbff8..0000000
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ /dev/null
@@ -1,857 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_H
-#define DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/clipboard.h>
-#include <dali/devel-api/text-abstraction/font-client.h>
-#include <dali/public-api/rendering/shader.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
-#include <dali-toolkit/internal/text/input-style.h>
-#include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-model.h>
-#include <dali-toolkit/internal/text/text-view.h>
-#include <dali-toolkit/public-api/styling/style-manager.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-const float DEFAULT_TEXTFIT_MIN     = 10.f;
-const float DEFAULT_TEXTFIT_MAX     = 100.f;
-const float DEFAULT_TEXTFIT_STEP    = 1.f;
-const float DEFAULT_FONT_SIZE_SCALE = 1.f;
-
-//Forward declarations
-struct CursorInfo;
-struct FontDefaults;
-struct ControllerImplEventHandler;
-struct SelectionHandleController;
-
-class SelectableControlInterface;
-class AnchorControlInterface;
-
-struct Event
-{
-  // Used to queue input events until DoRelayout()
-  enum Type
-  {
-    CURSOR_KEY_EVENT,
-    TAP_EVENT,
-    PAN_EVENT,
-    LONG_PRESS_EVENT,
-    GRAB_HANDLE_EVENT,
-    LEFT_SELECTION_HANDLE_EVENT,
-    RIGHT_SELECTION_HANDLE_EVENT,
-    SELECT,
-    SELECT_ALL,
-    SELECT_NONE,
-    SELECT_RANGE,
-  };
-
-  union Param
-  {
-    int          mInt;
-    unsigned int mUint;
-    float        mFloat;
-    bool         mBool;
-  };
-
-  Event(Type eventType)
-  : type(eventType)
-  {
-    p1.mInt = 0;
-    p2.mInt = 0;
-    p3.mInt = 0;
-  }
-
-  Type  type;
-  Param p1;
-  Param p2;
-  Param p3;
-};
-
-struct EventData
-{
-  enum State
-  {
-    INACTIVE,
-    INTERRUPTED,
-    SELECTING,
-    EDITING,
-    EDITING_WITH_POPUP,
-    EDITING_WITH_GRAB_HANDLE,
-    EDITING_WITH_PASTE_POPUP,
-    GRAB_HANDLE_PANNING,
-    SELECTION_HANDLE_PANNING,
-    TEXT_PANNING
-  };
-
-  EventData(DecoratorPtr decorator, InputMethodContext& inputMethodContext);
-
-  ~EventData() = default;
-
-  static bool IsEditingState(State stateToCheck)
-  {
-    return (stateToCheck == EDITING || stateToCheck == EDITING_WITH_POPUP || stateToCheck == EDITING_WITH_GRAB_HANDLE || stateToCheck == EDITING_WITH_PASTE_POPUP);
-  }
-
-  DecoratorPtr                  mDecorator;               ///< Pointer to the decorator.
-  InputMethodContext            mInputMethodContext;      ///< The Input Method Framework Manager.
-  std::unique_ptr<FontDefaults> mPlaceholderFont;         ///< The placeholder default font.
-  std::string                   mPlaceholderTextActive;   ///< The text to display when the TextField is empty with key-input focus.
-  std::string                   mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
-  Vector4                       mPlaceholderTextColor;    ///< The in/active placeholder text color.
-
-  /**
-   * This is used to delay handling events until after the model has been updated.
-   * The number of updates to the model is minimized to improve performance.
-   */
-  std::vector<Event> mEventQueue; ///< The queue of touch events etc.
-
-  Vector<InputStyle::Mask> mInputStyleChangedQueue; ///< Queue of changes in the input style. Used to emit the signal in the iddle callback.
-
-  InputStyle mInputStyle; ///< The style to be set to the new inputed text.
-
-  State mPreviousState; ///< Stores the current state before it's updated with the new one.
-  State mState;         ///< Selection mode, edit mode etc.
-
-  CharacterIndex mPrimaryCursorPosition;  ///< Index into logical model for primary cursor.
-  CharacterIndex mLeftSelectionPosition;  ///< Index into logical model for left selection handle.
-  CharacterIndex mRightSelectionPosition; ///< Index into logical model for right selection handle.
-
-  CharacterIndex mPreEditStartPosition; ///< Used to remove the pre-edit text if necessary.
-  Length         mPreEditLength;        ///< Used to remove the pre-edit text if necessary.
-
-  float mCursorHookPositionX; ///< Used to move the cursor with the keys or when scrolling the text vertically with the handles.
-
-  Controller::NoTextTap::Action mDoubleTapAction; ///< Action to be done when there is a double tap on top of 'no text'
-  Controller::NoTextTap::Action mLongPressAction; ///< Action to be done when there is a long press on top of 'no text'
-
-  bool mIsShowingPlaceholderText : 1;     ///< True if the place-holder text is being displayed.
-  bool mPreEditFlag : 1;                  ///< True if the model contains text in pre-edit state.
-  bool mDecoratorUpdated : 1;             ///< True if the decorator was updated during event processing.
-  bool mCursorBlinkEnabled : 1;           ///< True if cursor should blink when active.
-  bool mGrabHandleEnabled : 1;            ///< True if grab handle is enabled.
-  bool mGrabHandlePopupEnabled : 1;       ///< True if the grab handle popu-up should be shown.
-  bool mSelectionEnabled : 1;             ///< True if selection handles, highlight etc. are enabled.
-  bool mUpdateCursorHookPosition : 1;     ///< True if the cursor hook position must be updated. Used to move the cursor with the keys 'up' and 'down'.
-  bool mUpdateCursorPosition : 1;         ///< True if the visual position of the cursor must be recalculated.
-  bool mUpdateGrabHandlePosition : 1;     ///< True if the visual position of the grab handle must be recalculated.
-  bool mUpdateLeftSelectionPosition : 1;  ///< True if the visual position of the left selection handle must be recalculated.
-  bool mUpdateRightSelectionPosition : 1; ///< True if the visual position of the right selection handle must be recalculated.
-  bool mIsLeftHandleSelected : 1;         ///< Whether is the left handle the one which is selected.
-  bool mIsRightHandleSelected : 1;        ///< Whether is the right handle the one which is selected.
-  bool mUpdateHighlightBox : 1;           ///< True if the text selection high light box must be updated.
-  bool mScrollAfterUpdatePosition : 1;    ///< Whether to scroll after the cursor position is updated.
-  bool mScrollAfterDelete : 1;            ///< Whether to scroll after delete characters.
-  bool mAllTextSelected : 1;              ///< True if the selection handles are selecting all the text.
-  bool mUpdateInputStyle : 1;             ///< Whether to update the input style after moving the cursor.
-  bool mPasswordInput : 1;                ///< True if password input is enabled.
-  bool mCheckScrollAmount : 1;            ///< Whether to check scrolled amount after updating the position
-  bool mIsPlaceholderPixelSize : 1;       ///< True if the placeholder font size is set as pixel size.
-  bool mIsPlaceholderElideEnabled : 1;    ///< True if the placeholder text's elide is enabled.
-  bool mPlaceholderEllipsisFlag : 1;      ///< True if the text controller sets the placeholder ellipsis.
-  bool mShiftSelectionFlag : 1;           ///< True if the text selection using Shift key is enabled.
-  bool mUpdateAlignment : 1;              ///< True if the whole text needs to be full aligned..
-  bool mEditingEnabled : 1;               ///< True if the editing is enabled, false otherwise.
-};
-
-struct ModifyEvent
-{
-  enum Type
-  {
-    TEXT_REPLACED, ///< The entire text was replaced
-    TEXT_INSERTED, ///< Insert characters at the current cursor position
-    TEXT_DELETED   ///< Characters were deleted
-  };
-
-  Type type;
-};
-
-struct FontDefaults
-{
-  FontDefaults()
-  : mFontDescription(),
-    mDefaultPointSize(0.f),
-    mFitPointSize(0.f),
-    mFontId(0u),
-    familyDefined(false),
-    weightDefined(false),
-    widthDefined(false),
-    slantDefined(false),
-    sizeDefined(false)
-  {
-    // Initially use the default platform font
-    TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-    fontClient.GetDefaultPlatformFontDescription(mFontDescription);
-  }
-
-  FontId GetFontId(TextAbstraction::FontClient& fontClient, float fontPointSize)
-  {
-    if(!mFontId)
-    {
-      const PointSize26Dot6 pointSize = static_cast<PointSize26Dot6>(fontPointSize * 64.f);
-      mFontId                         = fontClient.GetFontId(mFontDescription, pointSize);
-    }
-
-    return mFontId;
-  }
-
-  TextAbstraction::FontDescription mFontDescription;  ///< The default font's description.
-  float                            mDefaultPointSize; ///< The default font's point size.
-  float                            mFitPointSize;     ///< The fit font's point size.
-  FontId                           mFontId;           ///< The font's id of the default font.
-  bool                             familyDefined : 1; ///< Whether the default font's family name is defined.
-  bool                             weightDefined : 1; ///< Whether the default font's weight is defined.
-  bool                             widthDefined : 1;  ///< Whether the default font's width is defined.
-  bool                             slantDefined : 1;  ///< Whether the default font's slant is defined.
-  bool                             sizeDefined : 1;   ///< Whether the default font's point size is defined.
-};
-
-/**
- * @brief Stores indices used to update the text.
- * Stores the character index where the text is updated and the number of characters removed and added.
- * Stores as well indices to the first and the last paragraphs to be updated.
- */
-struct TextUpdateInfo
-{
-  TextUpdateInfo()
-  : mCharacterIndex(0u),
-    mNumberOfCharactersToRemove(0u),
-    mNumberOfCharactersToAdd(0u),
-    mPreviousNumberOfCharacters(0u),
-    mParagraphCharacterIndex(0u),
-    mRequestedNumberOfCharacters(0u),
-    mStartGlyphIndex(0u),
-    mStartLineIndex(0u),
-    mEstimatedNumberOfLines(0u),
-    mClearAll(true),
-    mFullRelayoutNeeded(true),
-    mIsLastCharacterNewParagraph(false)
-  {
-  }
-
-  ~TextUpdateInfo()
-  {
-  }
-
-  CharacterIndex mCharacterIndex;             ///< Index to the first character to be updated.
-  Length         mNumberOfCharactersToRemove; ///< The number of characters to be removed.
-  Length         mNumberOfCharactersToAdd;    ///< The number of characters to be added.
-  Length         mPreviousNumberOfCharacters; ///< The number of characters before the text update.
-
-  CharacterIndex mParagraphCharacterIndex;     ///< Index of the first character of the first paragraph to be updated.
-  Length         mRequestedNumberOfCharacters; ///< The requested number of characters.
-  GlyphIndex     mStartGlyphIndex;
-  LineIndex      mStartLineIndex;
-  Length         mEstimatedNumberOfLines; ///< The estimated number of lines. Used to avoid reallocations when layouting.
-
-  bool mClearAll : 1;                    ///< Whether the whole text is cleared. i.e. when the text is reset.
-  bool mFullRelayoutNeeded : 1;          ///< Whether a full re-layout is needed. i.e. when a new size is set to the text control.
-  bool mIsLastCharacterNewParagraph : 1; ///< Whether the last character is a new paragraph character.
-
-  void Clear()
-  {
-    // Clear all info except the mPreviousNumberOfCharacters member.
-    mCharacterIndex              = static_cast<CharacterIndex>(-1);
-    mNumberOfCharactersToRemove  = 0u;
-    mNumberOfCharactersToAdd     = 0u;
-    mParagraphCharacterIndex     = 0u;
-    mRequestedNumberOfCharacters = 0u;
-    mStartGlyphIndex             = 0u;
-    mStartLineIndex              = 0u;
-    mEstimatedNumberOfLines      = 0u;
-    mClearAll                    = false;
-    mFullRelayoutNeeded          = false;
-    mIsLastCharacterNewParagraph = false;
-  }
-};
-
-struct UnderlineDefaults
-{
-  std::string properties;
-  // TODO: complete with underline parameters.
-};
-
-struct ShadowDefaults
-{
-  std::string properties;
-  // TODO: complete with shadow parameters.
-};
-
-struct EmbossDefaults
-{
-  std::string properties;
-  // TODO: complete with emboss parameters.
-};
-
-struct OutlineDefaults
-{
-  std::string properties;
-  // TODO: complete with outline parameters.
-};
-
-struct Controller::Impl
-{
-  Impl(ControlInterface*           controlInterface,
-       EditableControlInterface*   editableControlInterface,
-       SelectableControlInterface* selectableControlInterface,
-       AnchorControlInterface*     anchorControlInterface)
-  : mControlInterface(controlInterface),
-    mEditableControlInterface(editableControlInterface),
-    mSelectableControlInterface(selectableControlInterface),
-    mAnchorControlInterface(anchorControlInterface),
-    mModel(),
-    mFontDefaults(NULL),
-    mUnderlineDefaults(NULL),
-    mShadowDefaults(NULL),
-    mEmbossDefaults(NULL),
-    mOutlineDefaults(NULL),
-    mEventData(NULL),
-    mFontClient(),
-    mClipboard(),
-    mView(),
-    mMetrics(),
-    mModifyEvents(),
-    mTextColor(Color::BLACK),
-    mTextUpdateInfo(),
-    mOperationsPending(NO_OPERATION),
-    mMaximumNumberOfCharacters(50u),
-    mHiddenInput(NULL),
-    mInputFilter(nullptr),
-    mRecalculateNaturalSize(true),
-    mMarkupProcessorEnabled(false),
-    mClipboardHideEnabled(true),
-    mIsAutoScrollEnabled(false),
-    mUpdateTextDirection(true),
-    mIsTextDirectionRTL(false),
-    mUnderlineSetByString(false),
-    mShadowSetByString(false),
-    mOutlineSetByString(false),
-    mFontStyleSetByString(false),
-    mShouldClearFocusOnEscape(true),
-    mLayoutDirection(LayoutDirection::LEFT_TO_RIGHT),
-    mTextFitMinSize(DEFAULT_TEXTFIT_MIN),
-    mTextFitMaxSize(DEFAULT_TEXTFIT_MAX),
-    mTextFitStepSize(DEFAULT_TEXTFIT_STEP),
-    mTextFitEnabled(false),
-    mFontSizeScale(DEFAULT_FONT_SIZE_SCALE),
-    mIsLayoutDirectionChanged(false)
-  {
-    mModel = Model::New();
-
-    mFontClient = TextAbstraction::FontClient::Get();
-    mClipboard  = Clipboard::Get();
-
-    mView.SetVisualModel(mModel->mVisualModel);
-
-    // Use this to access FontClient i.e. to get down-scaled Emoji metrics.
-    mMetrics = Metrics::New(mFontClient);
-    mLayoutEngine.SetMetrics(mMetrics);
-
-    // Set the text properties to default
-    mModel->mVisualModel->SetUnderlineEnabled(false);
-    mModel->mVisualModel->SetUnderlineHeight(0.0f);
-
-    Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
-    if(styleManager)
-    {
-      bool          temp;
-      Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager);
-      if(config["clearFocusOnEscape"].Get(temp))
-      {
-        mShouldClearFocusOnEscape = temp;
-      }
-    }
-  }
-
-  ~Impl()
-  {
-    delete mHiddenInput;
-    delete mFontDefaults;
-    delete mUnderlineDefaults;
-    delete mShadowDefaults;
-    delete mEmbossDefaults;
-    delete mOutlineDefaults;
-    delete mEventData;
-  }
-
-  // Text Controller Implementation.
-
-  /**
-   * @copydoc Text::Controller::RequestRelayout()
-   */
-  void RequestRelayout();
-
-  /**
-   * @brief Request a relayout using the ControlInterface.
-   */
-  void QueueModifyEvent(ModifyEvent::Type type)
-  {
-    if(ModifyEvent::TEXT_REPLACED == type)
-    {
-      // Cancel previously queued inserts etc.
-      mModifyEvents.Clear();
-    }
-
-    ModifyEvent event;
-    event.type = type;
-    mModifyEvents.PushBack(event);
-
-    // The event will be processed during relayout
-    RequestRelayout();
-  }
-
-  /**
-   * @brief Helper to move the cursor, grab handle etc.
-   */
-  bool ProcessInputEvents();
-
-  /**
-   * @brief Helper to check whether any place-holder text is available.
-   */
-  bool IsPlaceholderAvailable() const
-  {
-    return (mEventData &&
-            (!mEventData->mPlaceholderTextInactive.empty() ||
-             !mEventData->mPlaceholderTextActive.empty()));
-  }
-
-  bool IsShowingPlaceholderText() const
-  {
-    return (mEventData && mEventData->mIsShowingPlaceholderText);
-  }
-
-  /**
-   * @brief Helper to check whether active place-holder text is available.
-   */
-  bool IsFocusedPlaceholderAvailable() const
-  {
-    return (mEventData && !mEventData->mPlaceholderTextActive.empty());
-  }
-
-  bool IsShowingRealText() const
-  {
-    return (!IsShowingPlaceholderText() &&
-            0u != mModel->mLogicalModel->mText.Count());
-  }
-
-  /**
-   * @brief Called when placeholder-text is hidden
-   */
-  void PlaceholderCleared()
-  {
-    if(mEventData)
-    {
-      mEventData->mIsShowingPlaceholderText = false;
-
-      // Remove mPlaceholderTextColor
-      mModel->mVisualModel->SetTextColor(mTextColor);
-    }
-  }
-
-  void ClearPreEditFlag()
-  {
-    if(mEventData)
-    {
-      mEventData->mPreEditFlag          = false;
-      mEventData->mPreEditStartPosition = 0;
-      mEventData->mPreEditLength        = 0;
-    }
-  }
-
-  void ResetInputMethodContext()
-  {
-    if(mEventData)
-    {
-      // Reset incase we are in a pre-edit state.
-      if(mEventData->mInputMethodContext)
-      {
-        mEventData->mInputMethodContext.Reset(); // Will trigger a message ( commit, get surrounding )
-      }
-
-      ClearPreEditFlag();
-    }
-  }
-
-  /**
-   * @brief Helper to notify InputMethodContext with surrounding text & cursor changes.
-   */
-  void NotifyInputMethodContext();
-
-  /**
-   * @brief Helper to notify InputMethodContext with multi line status.
-   */
-  void NotifyInputMethodContextMultiLineStatus();
-
-  /**
-   * @brief Retrieve the current cursor position.
-   *
-   * @return The cursor position.
-   */
-  CharacterIndex GetLogicalCursorPosition() const;
-
-  /**
-   * @brief Retrieves the number of consecutive white spaces starting from the given @p index.
-   *
-   * @param[in] index The character index from where to count the number of consecutive white spaces.
-   *
-   * @return The number of consecutive white spaces.
-   */
-  Length GetNumberOfWhiteSpaces(CharacterIndex index) const;
-
-  /**
-   * @brief Retrieve any text previously set starting from the given @p index.
-   *
-   * @param[in] index The character index from where to retrieve the text.
-   * @param[out] text A string of UTF-8 characters.
-   *
-   * @see Dali::Toolkit::Text::Controller::GetText()
-   */
-  void GetText(CharacterIndex index, std::string& text) const;
-
-  bool IsClipboardEmpty()
-  {
-    bool result(mClipboard && mClipboard.NumberOfItems());
-    return !result; // If NumberOfItems greater than 0, return false
-  }
-
-  bool IsClipboardVisible()
-  {
-    bool result(mClipboard && mClipboard.IsVisible());
-    return result;
-  }
-
-  /**
-   * @brief Calculates the start character index of the first paragraph to be updated and
-   * the end character index of the last paragraph to be updated.
-   *
-   * @param[out] numberOfCharacters The number of characters to be updated.
-   */
-  void CalculateTextUpdateIndices(Length& numberOfCharacters);
-
-  /**
-   * @brief Helper to clear completely the parts of the model specified by the given @p operations.
-   *
-   * @note It never clears the text stored in utf32.
-   */
-  void ClearFullModelData(OperationsMask operations);
-
-  /**
-   * @brief Helper to clear completely the parts of the model related with the characters specified by the given @p operations.
-   *
-   * @note It never clears the text stored in utf32.
-   *
-   * @param[in] startIndex Index to the first character to be cleared.
-   * @param[in] endIndex Index to the last character to be cleared.
-   * @param[in] operations The operations required.
-   */
-  void ClearCharacterModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations);
-
-  /**
-   * @brief Helper to clear completely the parts of the model related with the glyphs specified by the given @p operations.
-   *
-   * @note It never clears the text stored in utf32.
-   * @note Character indices are transformed to glyph indices.
-   *
-   * @param[in] startIndex Index to the first character to be cleared.
-   * @param[in] endIndex Index to the last character to be cleared.
-   * @param[in] operations The operations required.
-   */
-  void ClearGlyphModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations);
-
-  /**
-   * @brief Helper to clear the parts of the model specified by the given @p operations and from @p startIndex to @p endIndex.
-   *
-   * @note It never clears the text stored in utf32.
-   *
-   * @param[in] startIndex Index to the first character to be cleared.
-   * @param[in] endIndex Index to the last character to be cleared.
-   * @param[in] operations The operations required.
-   */
-  void ClearModelData(CharacterIndex startIndex, CharacterIndex endIndex, OperationsMask operations);
-
-  /**
-   * @brief Updates the logical and visual models. Updates the style runs in the visual model when the text's styles changes.
-   *
-   * When text or style changes the model is set with some operations pending.
-   * When i.e. the text's size or a relayout is required this method is called
-   * with a given @p operationsRequired parameter. The operations required are
-   * matched with the operations pending to perform the minimum number of operations.
-   *
-   * @param[in] operationsRequired The operations required.
-   *
-   * @return @e true if the model has been modified.
-   */
-  bool UpdateModel(OperationsMask operationsRequired);
-
-  /**
-   * @brief Retreieves the default style.
-   *
-   * @param[out] inputStyle The default style.
-   */
-  void RetrieveDefaultInputStyle(InputStyle& inputStyle);
-
-  /**
-   * @brief Retrieve the line height of the default font.
-   */
-  float GetDefaultFontLineHeight();
-
-  /**
-   * @copydoc Text::Controller::GetPrimaryCursorPosition()
-   */
-  CharacterIndex GetPrimaryCursorPosition() const;
-
-  /**
-   * @copydoc Text::Controller::SetPrimaryCursorPosition()
-   */
-  bool SetPrimaryCursorPosition(CharacterIndex index, bool focused);
-
-  /**
-   * @copydoc Text::SelectableControlInterface::SetTextSelectionRange()
-   */
-  void SetTextSelectionRange(const uint32_t* pStart, const uint32_t* pEndf);
-
-  /**
-   * @copydoc Text::SelectableControlInterface::GetTextSelectionRange()
-   */
-  Uint32Pair GetTextSelectionRange() const;
-
-  /**
-   * @copydoc Text::EditableControlInterface::IsEditable()
-   */
-  bool IsEditable() const;
-
-  /**
-   * @copydoc Text::EditableControlInterface::SetEditable()
-   */
-  void SetEditable(bool editable);
-
-  /**
-   * @brief Retrieves the selected text. It removes the text if the @p deleteAfterRetrieval parameter is @e true.
-   *
-   * @param[out] selectedText The selected text encoded in utf8.
-   * @param[in] deleteAfterRetrieval Whether the text should be deleted after retrieval.
-   */
-  void RetrieveSelection(std::string& selectedText, bool deleteAfterRetrieval);
-
-  void SetSelection(int start, int end);
-
-  std::pair<int, int> GetSelectionIndexes() const;
-
-  void ShowClipboard();
-
-  void HideClipboard();
-
-  void SetClipboardHideEnable(bool enable);
-
-  bool CopyStringToClipboard(const std::string& source);
-
-  void SendSelectionToClipboard(bool deleteAfterSending);
-
-  void RequestGetTextFromClipboard();
-
-  void RepositionSelectionHandles();
-  void RepositionSelectionHandles(float visualX, float visualY, Controller::NoTextTap::Action action);
-
-  void SetPopupButtons();
-
-  void ChangeState(EventData::State newState);
-
-  /**
-   * @brief Calculates the cursor's position for a given character index in the logical order.
-   *
-   * It retrieves as well the line's height and the cursor's height and
-   * if there is a valid alternative cursor, its position and height.
-   *
-   * @param[in] logical The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
-   * @param[out] cursorInfo The line's height, the cursor's height, the cursor's position and whether there is an alternative cursor.
-   */
-  void GetCursorPosition(CharacterIndex logical,
-                         CursorInfo&    cursorInfo);
-
-  /**
-   * @brief Calculates the new cursor index.
-   *
-   * It takes into account that in some scripts multiple characters can form a glyph and all of them
-   * need to be jumped with one key event.
-   *
-   * @param[in] index The initial new index.
-   *
-   * @return The new cursor index.
-   */
-  CharacterIndex CalculateNewCursorIndex(CharacterIndex index) const;
-
-  /**
-   * @brief Updates the cursor position.
-   *
-   * Sets the cursor's position into the decorator. It transforms the cursor's position into decorator's coords.
-   * It sets the position of the secondary cursor if it's a valid one.
-   * Sets which cursors are active.
-   *
-   * @param[in] cursorInfo Contains the selection handle position in Actor's coords.
-   *
-   */
-  void UpdateCursorPosition(const CursorInfo& cursorInfo);
-
-  /**
-   * @brief Updates the position of the given selection handle. It transforms the handle's position into decorator's coords.
-   *
-   * @param[in] handleType One of the selection handles.
-   * @param[in] cursorInfo Contains the selection handle position in Actor's coords.
-   */
-  void UpdateSelectionHandle(HandleType        handleType,
-                             const CursorInfo& cursorInfo);
-
-  /**
-   * @biref Clamps the horizontal scrolling to get the control always filled with text.
-   *
-   * @param[in] layoutSize The size of the laid out text.
-   */
-  void ClampHorizontalScroll(const Vector2& layoutSize);
-
-  /**
-   * @biref Clamps the vertical scrolling to get the control always filled with text.
-   *
-   * @param[in] layoutSize The size of the laid out text.
-   */
-  void ClampVerticalScroll(const Vector2& layoutSize);
-
-  /**
-   * @brief Scrolls the text to make a position visible.
-   *
-   * @pre mEventData must not be NULL. (there is a text-input or selection capabilities).
-   *
-   * @param[in] position A position in text coords.
-   * @param[in] lineHeight The line height for the given position.
-   *
-   * This method is called after inserting text, moving the cursor with the grab handle or the keypad,
-   * or moving the selection handles.
-   */
-  void ScrollToMakePositionVisible(const Vector2& position, float lineHeight);
-
-  /**
-   * @brief Scrolls the text to make the cursor visible.
-   *
-   * This method is called after deleting text.
-   */
-  void ScrollTextToMatchCursor(const CursorInfo& cursorInfo);
-
-  /**
-   * @brief Scrolls the text to make primary cursor visible.
-   */
-  void ScrollTextToMatchCursor();
-
-  /**
-   * @brief Create an actor that renders the text background color
-   *
-   * @return the created actor or an empty handle if no background color needs to be rendered.
-   */
-  Actor CreateBackgroundActor();
-
-public:
-  /**
-   * @brief Gets implementation from the controller handle.
-   * @param controller The text controller
-   * @return The implementation of the Controller
-   */
-  static Impl& GetImplementation(Text::Controller& controller)
-  {
-    return *controller.mImpl;
-  }
-
-private:
-  // Declared private and left undefined to avoid copies.
-  Impl(const Impl&);
-  // Declared private and left undefined to avoid copies.
-  Impl& operator=(const Impl&);
-
-  /**
-   * @brief Copy Underlined-Character-Runs from Logical-Model to Underlined-Glyph-Runs in Visual-Model
-   *
-   * @param shouldClearPreUnderlineRuns Whether should clear the existing Underlined-Glyph-Runs in Visual-Model
-   */
-  void CopyUnderlinedFromLogicalToVisualModels(bool shouldClearPreUnderlineRuns);
-
-public:
-  ControlInterface*            mControlInterface;           ///< Reference to the text controller.
-  EditableControlInterface*    mEditableControlInterface;   ///< Reference to the editable text controller.
-  SelectableControlInterface*  mSelectableControlInterface; ///< Reference to the selectable text controller.
-  AnchorControlInterface*      mAnchorControlInterface;     ///< Reference to the anchor controller.
-  ModelPtr                     mModel;                      ///< Pointer to the text's model.
-  FontDefaults*                mFontDefaults;               ///< Avoid allocating this when the user does not specify a font.
-  UnderlineDefaults*           mUnderlineDefaults;          ///< Avoid allocating this when the user does not specify underline parameters.
-  ShadowDefaults*              mShadowDefaults;             ///< Avoid allocating this when the user does not specify shadow parameters.
-  EmbossDefaults*              mEmbossDefaults;             ///< Avoid allocating this when the user does not specify emboss parameters.
-  OutlineDefaults*             mOutlineDefaults;            ///< Avoid allocating this when the user does not specify outline parameters.
-  EventData*                   mEventData;                  ///< Avoid allocating everything for text input until EnableTextInput().
-  TextAbstraction::FontClient  mFontClient;                 ///< Handle to the font client.
-  Clipboard                    mClipboard;                  ///< Handle to the system clipboard
-  View                         mView;                       ///< The view interface to the rendering back-end.
-  MetricsPtr                   mMetrics;                    ///< A wrapper around FontClient used to get metrics & potentially down-scaled Emoji metrics.
-  Layout::Engine               mLayoutEngine;               ///< The layout engine.
-  Vector<ModifyEvent>          mModifyEvents;               ///< Temporary stores the text set until the next relayout.
-  Vector4                      mTextColor;                  ///< The regular text color
-  TextUpdateInfo               mTextUpdateInfo;             ///< Info of the characters updated.
-  OperationsMask               mOperationsPending;          ///< Operations pending to be done to layout the text.
-  Length                       mMaximumNumberOfCharacters;  ///< Maximum number of characters that can be inserted.
-  HiddenText*                  mHiddenInput;                ///< Avoid allocating this when the user does not specify hidden input mode.
-  std::unique_ptr<InputFilter> mInputFilter;                ///< Avoid allocating this when the user does not specify input filter mode.
-  Vector2                      mTextFitContentSize;         ///< Size of Text fit content
-
-  bool               mRecalculateNaturalSize : 1; ///< Whether the natural size needs to be recalculated.
-  bool               mMarkupProcessorEnabled : 1; ///< Whether the mark-up procesor is enabled.
-  bool               mClipboardHideEnabled : 1;   ///< Whether the ClipboardHide function work or not
-  bool               mIsAutoScrollEnabled : 1;    ///< Whether auto text scrolling is enabled.
-  bool               mUpdateTextDirection : 1;    ///< Whether the text direction needs to be updated.
-  CharacterDirection mIsTextDirectionRTL : 1;     ///< Whether the text direction is right to left or not
-
-  bool                  mUnderlineSetByString : 1;     ///< Set when underline is set by string (legacy) instead of map
-  bool                  mShadowSetByString : 1;        ///< Set when shadow is set by string (legacy) instead of map
-  bool                  mOutlineSetByString : 1;       ///< Set when outline is set by string (legacy) instead of map
-  bool                  mFontStyleSetByString : 1;     ///< Set when font style is set by string (legacy) instead of map
-  bool                  mShouldClearFocusOnEscape : 1; ///< Whether text control should clear key input focus
-  LayoutDirection::Type mLayoutDirection;              ///< Current system language direction
-
-  Shader mShaderBackground; ///< The shader for text background.
-
-  float mTextFitMinSize;               ///< Minimum Font Size for text fit. Default 10
-  float mTextFitMaxSize;               ///< Maximum Font Size for text fit. Default 100
-  float mTextFitStepSize;              ///< Step Size for font intervalse. Default 1
-  bool  mTextFitEnabled : 1;           ///< Whether the text's fit is enabled.
-  float mFontSizeScale;                ///< Scale value for Font Size. Default 1.0
-  bool  mIsLayoutDirectionChanged : 1; ///< Whether the layout has changed.
-
-private:
-  friend ControllerImplEventHandler;
-  friend SelectionHandleController;
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_CONTROLLER_H
diff --git a/dali-toolkit/internal/text/text-controller-input-font-handler.cpp b/dali-toolkit/internal/text/text-controller-input-font-handler.cpp
deleted file mode 100644
index 8a3ac3e..0000000
--- a/dali-toolkit/internal/text/text-controller-input-font-handler.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-input-font-handler.h>
-
-// EXTERNAL INCLUDES
-#include <memory.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-namespace
-{
-/**
- * @brief Adds a new font description run for the selected text.
- *
- * The new font parameters are added after the call to this method.
- *
- * @param[in] eventData The event data pointer.
- * @param[in] logicalModel The logical model where to add the new font description run.
- * @param[out] startOfSelectedText Index to the first selected character.
- * @param[out] lengthOfSelectedText Number of selected characters.
- */
-FontDescriptionRun& UpdateSelectionFontStyleRun(EventData*      eventData,
-                                                LogicalModelPtr logicalModel,
-                                                CharacterIndex& startOfSelectedText,
-                                                Length&         lengthOfSelectedText)
-{
-  const bool handlesCrossed = eventData->mLeftSelectionPosition > eventData->mRightSelectionPosition;
-
-  // Get start and end position of selection
-  startOfSelectedText  = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition;
-  lengthOfSelectedText = (handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition) - startOfSelectedText;
-
-  // Add the font run.
-  const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count();
-  logicalModel->mFontDescriptionRuns.Resize(numberOfRuns + 1u);
-
-  FontDescriptionRun& fontDescriptionRun = *(logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns);
-
-  fontDescriptionRun.characterRun.characterIndex     = startOfSelectedText;
-  fontDescriptionRun.characterRun.numberOfCharacters = lengthOfSelectedText;
-
-  // Recalculate the selection highlight as the metrics may have changed.
-  eventData->mUpdateLeftSelectionPosition  = true;
-  eventData->mUpdateRightSelectionPosition = true;
-  eventData->mUpdateHighlightBox           = true;
-
-  return fontDescriptionRun;
-}
-
-} // unnamed namespace
-
-void Controller::InputFontHandler::SetInputFontFamily(Controller& controller, const std::string& fontFamily)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    controller.mImpl->mEventData->mInputStyle.familyName      = fontFamily;
-    controller.mImpl->mEventData->mInputStyle.isFamilyDefined = true;
-
-    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
-    {
-      CharacterIndex startOfSelectedText  = 0u;
-      Length         lengthOfSelectedText = 0u;
-
-      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
-      {
-        // Update a font description run for the selecting state.
-        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
-                                                                             controller.mImpl->mModel->mLogicalModel,
-                                                                             startOfSelectedText,
-                                                                             lengthOfSelectedText);
-
-        fontDescriptionRun.familyLength = fontFamily.size();
-        fontDescriptionRun.familyName   = new char[fontDescriptionRun.familyLength];
-        memcpy(fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength);
-        fontDescriptionRun.familyDefined = true;
-
-        // The memory allocated for the font family name is freed when the font description is removed from the logical model.
-
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
-      }
-      else
-      {
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
-      }
-
-      // Request to relayout.
-      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
-                                                                         VALIDATE_FONTS |
-                                                                         SHAPE_TEXT |
-                                                                         GET_GLYPH_METRICS |
-                                                                         LAYOUT |
-                                                                         UPDATE_LAYOUT_SIZE |
-                                                                         REORDER |
-                                                                         ALIGN);
-      controller.mImpl->mRecalculateNaturalSize = true;
-      controller.mImpl->RequestRelayout();
-
-      // As the font changes, recalculate the handle positions is needed.
-      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
-      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
-      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
-    }
-  }
-}
-
-const std::string& Controller::InputFontHandler::GetInputFontFamily(const Controller& controller)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    return controller.mImpl->mEventData->mInputStyle.familyName;
-  }
-
-  // Return the default font's family if there is no EventData.
-  return controller.GetDefaultFontFamily();
-}
-
-void Controller::InputFontHandler::SetInputFontWeight(const Controller& controller, FontWeight weight)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    controller.mImpl->mEventData->mInputStyle.weight          = weight;
-    controller.mImpl->mEventData->mInputStyle.isWeightDefined = true;
-
-    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
-    {
-      CharacterIndex startOfSelectedText  = 0u;
-      Length         lengthOfSelectedText = 0u;
-
-      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
-      {
-        // Update a font description run for the selecting state.
-        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
-                                                                             controller.mImpl->mModel->mLogicalModel,
-                                                                             startOfSelectedText,
-                                                                             lengthOfSelectedText);
-
-        fontDescriptionRun.weight        = weight;
-        fontDescriptionRun.weightDefined = true;
-
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
-      }
-      else
-      {
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
-      }
-
-      // Request to relayout.
-      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
-                                                                         VALIDATE_FONTS |
-                                                                         SHAPE_TEXT |
-                                                                         GET_GLYPH_METRICS |
-                                                                         LAYOUT |
-                                                                         UPDATE_LAYOUT_SIZE |
-                                                                         REORDER |
-                                                                         ALIGN);
-      controller.mImpl->mRecalculateNaturalSize = true;
-      controller.mImpl->RequestRelayout();
-
-      // As the font might change, recalculate the handle positions is needed.
-      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
-      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
-      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
-    }
-  }
-}
-
-bool Controller::InputFontHandler::IsInputFontWeightDefined(const Controller& controller)
-{
-  bool defined = false;
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    defined = controller.mImpl->mEventData->mInputStyle.isWeightDefined;
-  }
-
-  return defined;
-}
-
-FontWeight Controller::InputFontHandler::GetInputFontWeight(const Controller& controller)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    return controller.mImpl->mEventData->mInputStyle.weight;
-  }
-
-  return controller.GetDefaultFontWeight();
-}
-
-void Controller::InputFontHandler::SetInputFontWidth(Controller& controller, FontWidth width)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    controller.mImpl->mEventData->mInputStyle.width          = width;
-    controller.mImpl->mEventData->mInputStyle.isWidthDefined = true;
-
-    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
-    {
-      CharacterIndex startOfSelectedText  = 0u;
-      Length         lengthOfSelectedText = 0u;
-
-      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
-      {
-        // Update a font description run for the selecting state.
-        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
-                                                                             controller.mImpl->mModel->mLogicalModel,
-                                                                             startOfSelectedText,
-                                                                             lengthOfSelectedText);
-
-        fontDescriptionRun.width        = width;
-        fontDescriptionRun.widthDefined = true;
-
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
-      }
-      else
-      {
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
-      }
-
-      // Request to relayout.
-      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
-                                                                         VALIDATE_FONTS |
-                                                                         SHAPE_TEXT |
-                                                                         GET_GLYPH_METRICS |
-                                                                         LAYOUT |
-                                                                         UPDATE_LAYOUT_SIZE |
-                                                                         REORDER |
-                                                                         ALIGN);
-      controller.mImpl->mRecalculateNaturalSize = true;
-      controller.mImpl->RequestRelayout();
-
-      // As the font might change, recalculate the handle positions is needed.
-      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
-      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
-      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
-    }
-  }
-}
-
-bool Controller::InputFontHandler::IsInputFontWidthDefined(const Controller& controller)
-{
-  bool defined = false;
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    defined = controller.mImpl->mEventData->mInputStyle.isWidthDefined;
-  }
-
-  return defined;
-}
-
-FontWidth Controller::InputFontHandler::GetInputFontWidth(const Controller& controller)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    return controller.mImpl->mEventData->mInputStyle.width;
-  }
-
-  return controller.GetDefaultFontWidth();
-}
-
-void Controller::InputFontHandler::SetInputFontSlant(Controller& controller, FontSlant slant)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    controller.mImpl->mEventData->mInputStyle.slant          = slant;
-    controller.mImpl->mEventData->mInputStyle.isSlantDefined = true;
-
-    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
-    {
-      CharacterIndex startOfSelectedText  = 0u;
-      Length         lengthOfSelectedText = 0u;
-
-      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
-      {
-        // Update a font description run for the selecting state.
-        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
-                                                                             controller.mImpl->mModel->mLogicalModel,
-                                                                             startOfSelectedText,
-                                                                             lengthOfSelectedText);
-
-        fontDescriptionRun.slant        = slant;
-        fontDescriptionRun.slantDefined = true;
-
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
-      }
-      else
-      {
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
-      }
-
-      // Request to relayout.
-      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
-                                                                         VALIDATE_FONTS |
-                                                                         SHAPE_TEXT |
-                                                                         GET_GLYPH_METRICS |
-                                                                         LAYOUT |
-                                                                         UPDATE_LAYOUT_SIZE |
-                                                                         REORDER |
-                                                                         ALIGN);
-      controller.mImpl->mRecalculateNaturalSize = true;
-      controller.mImpl->RequestRelayout();
-
-      // As the font might change, recalculate the handle positions is needed.
-      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
-      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
-      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
-    }
-  }
-}
-
-bool Controller::InputFontHandler::IsInputFontSlantDefined(const Controller& controller)
-{
-  bool defined = false;
-
-  if(NULL != controller.mImpl->mEventData)
-  {
-    defined = controller.mImpl->mEventData->mInputStyle.isSlantDefined;
-  }
-
-  return defined;
-}
-
-FontSlant Controller::InputFontHandler::GetInputFontSlant(const Controller& controller)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    return controller.mImpl->mEventData->mInputStyle.slant;
-  }
-
-  return controller.GetDefaultFontSlant();
-}
-
-void Controller::InputFontHandler::SetInputFontPointSize(Controller& controller, float size)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    controller.mImpl->mEventData->mInputStyle.size          = size;
-    controller.mImpl->mEventData->mInputStyle.isSizeDefined = true;
-
-    if(EventData::SELECTING == controller.mImpl->mEventData->mState || EventData::EDITING == controller.mImpl->mEventData->mState || EventData::INACTIVE == controller.mImpl->mEventData->mState)
-    {
-      CharacterIndex startOfSelectedText  = 0u;
-      Length         lengthOfSelectedText = 0u;
-
-      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
-      {
-        // Update a font description run for the selecting state.
-        FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,
-                                                                             controller.mImpl->mModel->mLogicalModel,
-                                                                             startOfSelectedText,
-                                                                             lengthOfSelectedText);
-
-        fontDescriptionRun.size        = static_cast<PointSize26Dot6>(size * controller.mImpl->mFontSizeScale * 64.f);
-        fontDescriptionRun.sizeDefined = true;
-
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
-      }
-      else
-      {
-        controller.mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-        controller.mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = controller.mImpl->mModel->mLogicalModel->mText.Count();
-      }
-
-      // Request to relayout.
-      controller.mImpl->mOperationsPending      = static_cast<OperationsMask>(controller.mImpl->mOperationsPending |
-                                                                         VALIDATE_FONTS |
-                                                                         SHAPE_TEXT |
-                                                                         GET_GLYPH_METRICS |
-                                                                         LAYOUT |
-                                                                         UPDATE_LAYOUT_SIZE |
-                                                                         REORDER |
-                                                                         ALIGN);
-      controller.mImpl->mRecalculateNaturalSize = true;
-      controller.mImpl->RequestRelayout();
-
-      // As the font might change, recalculate the handle positions is needed.
-      controller.mImpl->mEventData->mUpdateLeftSelectionPosition  = true;
-      controller.mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      controller.mImpl->mEventData->mUpdateHighlightBox           = true;
-      controller.mImpl->mEventData->mScrollAfterUpdatePosition    = true;
-    }
-  }
-}
-
-float Controller::InputFontHandler::GetInputFontPointSize(const Controller& controller)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    return controller.mImpl->mEventData->mInputStyle.size;
-  }
-
-  // Return the default font's point size if there is no EventData.
-  return controller.GetDefaultFontSize(Text::Controller::POINT_SIZE);
-}
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-input-font-handler.h b/dali-toolkit/internal/text/text-controller-input-font-handler.h
deleted file mode 100644
index f76bc41..0000000
--- a/dali-toolkit/internal/text/text-controller-input-font-handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_FONT_HANDLER_H
-#define DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_FONT_HANDLER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-definitions.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Controller::InputFontHandler
-{
-  static void               SetInputFontFamily(Controller& controller, const std::string& fontFamily);
-  static const std::string& GetInputFontFamily(const Controller& controller);
-  static void               SetInputFontWeight(const Controller& controller, FontWeight weight);
-  static bool               IsInputFontWeightDefined(const Controller& controller);
-  static FontWeight         GetInputFontWeight(const Controller& controller);
-  static void               SetInputFontWidth(Controller& controller, FontWidth width);
-  static bool               IsInputFontWidthDefined(const Controller& controller);
-  static FontWidth          GetInputFontWidth(const Controller& controller);
-  static void               SetInputFontSlant(Controller& controller, FontSlant slant);
-  static bool               IsInputFontSlantDefined(const Controller& controller);
-  static FontSlant          GetInputFontSlant(const Controller& controller);
-  static void               SetInputFontPointSize(Controller& controller, float size);
-  static float              GetInputFontPointSize(const Controller& controller);
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_CONTROLLER_INPUT_FONT_HANDLER_H
diff --git a/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp b/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
deleted file mode 100644
index d649371..0000000
--- a/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/character-set-conversion.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-font-style.h>
-#include <dali-toolkit/public-api/controls/text-controls/placeholder-properties.h>
-
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
-#endif
-
-const std::string EMPTY_STRING("");
-
-const char* const PLACEHOLDER_TEXT         = "text";
-const char* const PLACEHOLDER_TEXT_FOCUSED = "textFocused";
-const char* const PLACEHOLDER_COLOR        = "color";
-const char* const PLACEHOLDER_FONT_FAMILY  = "fontFamily";
-const char* const PLACEHOLDER_FONT_STYLE   = "fontStyle";
-const char* const PLACEHOLDER_POINT_SIZE   = "pointSize";
-const char* const PLACEHOLDER_PIXEL_SIZE   = "pixelSize";
-const char* const PLACEHOLDER_ELLIPSIS     = "ellipsis";
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-void Controller::PlaceholderHandler::SetPlaceholderTextElideEnabled(Controller& controller, bool enabled)
-{
-  controller.mImpl->mEventData->mIsPlaceholderElideEnabled = enabled;
-  controller.mImpl->mEventData->mPlaceholderEllipsisFlag   = true;
-
-  // Update placeholder if there is no text
-  if(controller.mImpl->IsShowingPlaceholderText() ||
-     (0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
-  {
-    controller.ShowPlaceholderText();
-  }
-}
-
-bool Controller::PlaceholderHandler::IsPlaceholderTextElideEnabled(const Controller& controller)
-{
-  return controller.mImpl->mEventData->mIsPlaceholderElideEnabled;
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderText(Controller& controller, PlaceholderType type, const std::string& text)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    if(PLACEHOLDER_TYPE_INACTIVE == type)
-    {
-      controller.mImpl->mEventData->mPlaceholderTextInactive = text;
-    }
-    else
-    {
-      controller.mImpl->mEventData->mPlaceholderTextActive = text;
-    }
-
-    // Update placeholder if there is no text
-    if(controller.mImpl->IsShowingPlaceholderText() ||
-       (0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
-    {
-      controller.ShowPlaceholderText();
-    }
-  }
-}
-
-void Controller::PlaceholderHandler::GetPlaceholderText(const Controller& controller, PlaceholderType type, std::string& text)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    if(PLACEHOLDER_TYPE_INACTIVE == type)
-    {
-      text = controller.mImpl->mEventData->mPlaceholderTextInactive;
-    }
-    else
-    {
-      text = controller.mImpl->mEventData->mPlaceholderTextActive;
-    }
-  }
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderFontFamily(Controller& controller, const std::string& placeholderTextFontFamily)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
-
-    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.family = placeholderTextFontFamily;
-    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetPlaceholderFontFamily %s\n", placeholderTextFontFamily.c_str());
-    controller.mImpl->mEventData->mPlaceholderFont->familyDefined = !placeholderTextFontFamily.empty();
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-const std::string& Controller::PlaceholderHandler::GetPlaceholderFontFamily(const Controller& controller)
-{
-  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
-  {
-    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.family;
-  }
-
-  return EMPTY_STRING;
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderTextFontWeight(Controller& controller, FontWeight weight)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
-
-    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.weight = weight;
-    controller.mImpl->mEventData->mPlaceholderFont->weightDefined           = true;
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-bool Controller::PlaceholderHandler::IsPlaceholderTextFontWeightDefined(const Controller& controller)
-{
-  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
-  {
-    return controller.mImpl->mEventData->mPlaceholderFont->weightDefined;
-  }
-  return false;
-}
-
-FontWeight Controller::PlaceholderHandler::GetPlaceholderTextFontWeight(const Controller& controller)
-{
-  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
-  {
-    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.weight;
-  }
-
-  return TextAbstraction::FontWeight::NORMAL;
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderTextFontWidth(Controller& controller, FontWidth width)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
-
-    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.width = width;
-    controller.mImpl->mEventData->mPlaceholderFont->widthDefined           = true;
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-bool Controller::PlaceholderHandler::IsPlaceholderTextFontWidthDefined(const Controller& controller)
-{
-  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
-  {
-    return controller.mImpl->mEventData->mPlaceholderFont->widthDefined;
-  }
-  return false;
-}
-
-FontWidth Controller::PlaceholderHandler::GetPlaceholderTextFontWidth(const Controller& controller)
-{
-  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
-  {
-    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.width;
-  }
-
-  return TextAbstraction::FontWidth::NORMAL;
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderTextFontSlant(Controller& controller, FontSlant slant)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
-
-    controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.slant = slant;
-    controller.mImpl->mEventData->mPlaceholderFont->slantDefined           = true;
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-bool Controller::PlaceholderHandler::IsPlaceholderTextFontSlantDefined(const Controller& controller)
-{
-  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
-  {
-    return controller.mImpl->mEventData->mPlaceholderFont->slantDefined;
-  }
-  return false;
-}
-
-FontSlant Controller::PlaceholderHandler::GetPlaceholderTextFontSlant(const Controller& controller)
-{
-  if((NULL != controller.mImpl->mEventData) && (NULL != controller.mImpl->mEventData->mPlaceholderFont))
-  {
-    return controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.slant;
-  }
-
-  return TextAbstraction::FontSlant::NORMAL;
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderTextFontSize(Controller& controller, float fontSize, FontSizeType type)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
-
-    switch(type)
-    {
-      case POINT_SIZE:
-      {
-        controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = fontSize;
-        controller.mImpl->mEventData->mPlaceholderFont->sizeDefined       = true;
-        controller.mImpl->mEventData->mIsPlaceholderPixelSize             = false; // Font size flag
-        break;
-      }
-      case PIXEL_SIZE:
-      {
-        // Point size = Pixel size * 72.f / DPI
-        unsigned int                horizontalDpi = 0u;
-        unsigned int                verticalDpi   = 0u;
-        TextAbstraction::FontClient fontClient    = TextAbstraction::FontClient::Get();
-        fontClient.GetDpi(horizontalDpi, verticalDpi);
-
-        controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = (fontSize * 72.f) / static_cast<float>(horizontalDpi);
-        controller.mImpl->mEventData->mPlaceholderFont->sizeDefined       = true;
-        controller.mImpl->mEventData->mIsPlaceholderPixelSize             = true; // Font size flag
-        break;
-      }
-    }
-
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-float Controller::PlaceholderHandler::GetPlaceholderTextFontSize(const Controller& controller, FontSizeType type)
-{
-  float value = 0.0f;
-  if(NULL != controller.mImpl->mEventData)
-  {
-    switch(type)
-    {
-      case POINT_SIZE:
-      {
-        if(NULL != controller.mImpl->mEventData->mPlaceholderFont)
-        {
-          value = controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize;
-        }
-        else
-        {
-          // If the placeholder text font size is not set, then return the default font size.
-          value = controller.GetDefaultFontSize(POINT_SIZE);
-        }
-        break;
-      }
-      case PIXEL_SIZE:
-      {
-        if(NULL != controller.mImpl->mEventData->mPlaceholderFont)
-        {
-          // Pixel size = Point size * DPI / 72.f
-          unsigned int                horizontalDpi = 0u;
-          unsigned int                verticalDpi   = 0u;
-          TextAbstraction::FontClient fontClient    = TextAbstraction::FontClient::Get();
-          fontClient.GetDpi(horizontalDpi, verticalDpi);
-
-          value = controller.mImpl->mEventData->mPlaceholderFont->mDefaultPointSize * static_cast<float>(horizontalDpi) / 72.f;
-        }
-        else
-        {
-          // If the placeholder text font size is not set, then return the default font size.
-          value = controller.GetDefaultFontSize(PIXEL_SIZE);
-        }
-        break;
-      }
-    }
-    return value;
-  }
-
-  return value;
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderTextColor(Controller& controller, const Vector4& textColor)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    controller.mImpl->mEventData->mPlaceholderTextColor = textColor;
-  }
-
-  if(controller.mImpl->IsShowingPlaceholderText())
-  {
-    controller.mImpl->mModel->mVisualModel->SetTextColor(textColor);
-    controller.mImpl->mModel->mLogicalModel->mColorRuns.Clear();
-    controller.mImpl->mOperationsPending = static_cast<OperationsMask>(controller.mImpl->mOperationsPending | COLOR);
-    controller.mImpl->RequestRelayout();
-  }
-}
-
-const Vector4& Controller::PlaceholderHandler::GetPlaceholderTextColor(const Controller& controller)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    return controller.mImpl->mEventData->mPlaceholderTextColor;
-  }
-
-  return Color::BLACK;
-}
-
-void Controller::PlaceholderHandler::SetPlaceholderProperty(Controller& controller, const Property::Map& map)
-{
-  const Property::Map::SizeType count = map.Count();
-
-  for(Property::Map::SizeType position = 0; position < count; ++position)
-  {
-    KeyValuePair     keyValue = map.GetKeyValue(position);
-    Property::Key&   key      = keyValue.first;
-    Property::Value& value    = keyValue.second;
-
-    if(key == Toolkit::Text::PlaceHolder::Property::TEXT || key == PLACEHOLDER_TEXT)
-    {
-      std::string text = "";
-      value.Get(text);
-      SetPlaceholderText(controller, Controller::PLACEHOLDER_TYPE_INACTIVE, text);
-    }
-    else if(key == Toolkit::Text::PlaceHolder::Property::TEXT_FOCUSED || key == PLACEHOLDER_TEXT_FOCUSED)
-    {
-      std::string text = "";
-      value.Get(text);
-      SetPlaceholderText(controller, Controller::PLACEHOLDER_TYPE_ACTIVE, text);
-    }
-    else if(key == Toolkit::Text::PlaceHolder::Property::COLOR || key == PLACEHOLDER_COLOR)
-    {
-      Vector4 textColor;
-      value.Get(textColor);
-      if(GetPlaceholderTextColor(controller) != textColor)
-      {
-        SetPlaceholderTextColor(controller, textColor);
-      }
-    }
-    else if(key == Toolkit::Text::PlaceHolder::Property::FONT_FAMILY || key == PLACEHOLDER_FONT_FAMILY)
-    {
-      std::string fontFamily = "";
-      value.Get(fontFamily);
-      SetPlaceholderFontFamily(controller, fontFamily);
-    }
-    else if(key == Toolkit::Text::PlaceHolder::Property::FONT_STYLE || key == PLACEHOLDER_FONT_STYLE)
-    {
-      SetFontStyleProperty(&controller, value, Text::FontStyle::PLACEHOLDER);
-    }
-    else if(key == Toolkit::Text::PlaceHolder::Property::POINT_SIZE || key == PLACEHOLDER_POINT_SIZE)
-    {
-      float pointSize;
-      value.Get(pointSize);
-      if(!Equals(GetPlaceholderTextFontSize(controller, Text::Controller::POINT_SIZE), pointSize))
-      {
-        SetPlaceholderTextFontSize(controller, pointSize, Text::Controller::POINT_SIZE);
-      }
-    }
-    else if(key == Toolkit::Text::PlaceHolder::Property::PIXEL_SIZE || key == PLACEHOLDER_PIXEL_SIZE)
-    {
-      float pixelSize;
-      value.Get(pixelSize);
-      if(!Equals(GetPlaceholderTextFontSize(controller, Text::Controller::PIXEL_SIZE), pixelSize))
-      {
-        SetPlaceholderTextFontSize(controller, pixelSize, Text::Controller::PIXEL_SIZE);
-      }
-    }
-    else if(key == Toolkit::Text::PlaceHolder::Property::ELLIPSIS || key == PLACEHOLDER_ELLIPSIS)
-    {
-      bool ellipsis;
-      value.Get(ellipsis);
-      SetPlaceholderTextElideEnabled(controller, ellipsis);
-    }
-  }
-}
-
-void Controller::PlaceholderHandler::GetPlaceholderProperty(Controller& controller, Property::Map& map)
-{
-  if(NULL != controller.mImpl->mEventData)
-  {
-    if(!controller.mImpl->mEventData->mPlaceholderTextActive.empty())
-    {
-      map[Text::PlaceHolder::Property::TEXT_FOCUSED] = controller.mImpl->mEventData->mPlaceholderTextActive;
-    }
-    if(!controller.mImpl->mEventData->mPlaceholderTextInactive.empty())
-    {
-      map[Text::PlaceHolder::Property::TEXT] = controller.mImpl->mEventData->mPlaceholderTextInactive;
-    }
-
-    map[Text::PlaceHolder::Property::COLOR]       = controller.mImpl->mEventData->mPlaceholderTextColor;
-    map[Text::PlaceHolder::Property::FONT_FAMILY] = GetPlaceholderFontFamily(controller);
-
-    Property::Value fontStyleMapGet;
-    GetFontStyleProperty(&controller, fontStyleMapGet, Text::FontStyle::PLACEHOLDER);
-    map[Text::PlaceHolder::Property::FONT_STYLE] = fontStyleMapGet;
-
-    // Choose font size : POINT_SIZE or PIXEL_SIZE
-    if(!controller.mImpl->mEventData->mIsPlaceholderPixelSize)
-    {
-      map[Text::PlaceHolder::Property::POINT_SIZE] = GetPlaceholderTextFontSize(controller, Text::Controller::POINT_SIZE);
-    }
-    else
-    {
-      map[Text::PlaceHolder::Property::PIXEL_SIZE] = GetPlaceholderTextFontSize(controller, Text::Controller::PIXEL_SIZE);
-    }
-
-    if(controller.mImpl->mEventData->mPlaceholderEllipsisFlag)
-    {
-      map[Text::PlaceHolder::Property::ELLIPSIS] = IsPlaceholderTextElideEnabled(controller);
-    }
-  }
-}
-
-void Controller::PlaceholderHandler::ShowPlaceholderText(Controller& controller)
-{
-  Controller::Impl& impl = *controller.mImpl;
-
-  if(impl.IsPlaceholderAvailable())
-  {
-    EventData*& eventData = impl.mEventData;
-    DALI_ASSERT_DEBUG(eventData && "No placeholder text available");
-
-    if(NULL == eventData)
-    {
-      return;
-    }
-
-    eventData->mIsShowingPlaceholderText = true;
-
-    // Disable handles when showing place-holder text
-    DecoratorPtr& decorator = eventData->mDecorator;
-    decorator->SetHandleActive(GRAB_HANDLE, false);
-    decorator->SetHandleActive(LEFT_SELECTION_HANDLE, false);
-    decorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false);
-
-    const char* text(NULL);
-    size_t      size(0);
-
-    // TODO - Switch Placeholder text when changing state
-    std::string& placeholderTextActive = eventData->mPlaceholderTextActive;
-    if((EventData::INACTIVE != eventData->mState) &&
-       (0u != placeholderTextActive.c_str()))
-    {
-      text = placeholderTextActive.c_str();
-      size = placeholderTextActive.size();
-    }
-    else
-    {
-      std::string& placeholderTextInactive = eventData->mPlaceholderTextInactive;
-      text                                 = placeholderTextInactive.c_str();
-      size                                 = placeholderTextInactive.size();
-    }
-
-    TextUpdateInfo& textUpdateInfo             = impl.mTextUpdateInfo;
-    textUpdateInfo.mCharacterIndex             = 0u;
-    textUpdateInfo.mNumberOfCharactersToRemove = textUpdateInfo.mPreviousNumberOfCharacters;
-
-    // Reset model for showing placeholder.
-    ModelPtr&        model        = impl.mModel;
-    LogicalModelPtr& logicalModel = model->mLogicalModel;
-    logicalModel->mText.Clear();
-    model->mVisualModel->SetTextColor(eventData->mPlaceholderTextColor);
-
-    // Convert text into UTF-32
-    Vector<Character>& utf32Characters = logicalModel->mText;
-    utf32Characters.Resize(size);
-
-    // This is a bit horrible but std::string returns a (signed) char*
-    const uint8_t* utf8 = reinterpret_cast<const uint8_t*>(text);
-
-    // Transform a text array encoded in utf8 into an array encoded in utf32.
-    // It returns the actual number of characters.
-    const Length characterCount = Utf8ToUtf32(utf8, size, utf32Characters.Begin());
-    utf32Characters.Resize(characterCount);
-
-    // The characters to be added.
-    textUpdateInfo.mNumberOfCharactersToAdd = characterCount;
-
-    // Reset the cursor position
-    eventData->mPrimaryCursorPosition = 0;
-
-    // The natural size needs to be re-calculated.
-    impl.mRecalculateNaturalSize = true;
-
-    // The text direction needs to be updated.
-    impl.mUpdateTextDirection = true;
-
-    // Apply modifications to the model
-    impl.mOperationsPending = ALL_OPERATIONS;
-
-    // Update the rest of the model during size negotiation
-    impl.QueueModifyEvent(ModifyEvent::TEXT_REPLACED);
-  }
-}
-
-void Controller::PlaceholderHandler::CreatePlaceholderFont(Controller& controller)
-{
-  if(nullptr == controller.mImpl->mEventData->mPlaceholderFont)
-  {
-    controller.mImpl->mEventData->mPlaceholderFont = std::unique_ptr<FontDefaults>(new FontDefaults());
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-placeholder-handler.h b/dali-toolkit/internal/text/text-controller-placeholder-handler.h
deleted file mode 100644
index ac2ba1b..0000000
--- a/dali-toolkit/internal/text/text-controller-placeholder-handler.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_PLACEHOLDER_HANDLER_H
-#define DALI_TOOLKIT_TEXT_CONTROLLER_PLACEHOLDER_HANDLER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/math/vector4.h>
-#include <dali/public-api/object/property-map.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-definitions.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-struct Controller::PlaceholderHandler
-{
-  static void               SetPlaceholderTextElideEnabled(Controller& controller, bool enabled);
-  static bool               IsPlaceholderTextElideEnabled(const Controller& controller);
-  static void               SetPlaceholderText(Controller& controller, PlaceholderType type, const std::string& text);
-  static void               GetPlaceholderText(const Controller& controller, PlaceholderType type, std::string& text);
-  static void               SetPlaceholderFontFamily(Controller& controller, const std::string& placeholderTextFontFamily);
-  static const std::string& GetPlaceholderFontFamily(const Controller& controller);
-  static void               SetPlaceholderTextFontWeight(Controller& controller, FontWeight weight);
-  static bool               IsPlaceholderTextFontWeightDefined(const Controller& controller);
-  static FontWeight         GetPlaceholderTextFontWeight(const Controller& controller);
-  static void               SetPlaceholderTextFontWidth(Controller& controller, FontWidth width);
-  static bool               IsPlaceholderTextFontWidthDefined(const Controller& controller);
-  static FontWidth          GetPlaceholderTextFontWidth(const Controller& controller);
-  static void               SetPlaceholderTextFontSlant(Controller& controller, FontSlant slant);
-  static bool               IsPlaceholderTextFontSlantDefined(const Controller& controller);
-  static FontSlant          GetPlaceholderTextFontSlant(const Controller& controller);
-  static void               SetPlaceholderTextFontSize(Controller& controller, float fontSize, FontSizeType type);
-  static float              GetPlaceholderTextFontSize(const Controller& controller, FontSizeType type);
-  static void               SetPlaceholderTextColor(Controller& controller, const Vector4& textColor);
-  static const Vector4&     GetPlaceholderTextColor(const Controller& controller);
-  static void               SetPlaceholderProperty(Controller& controller, const Property::Map& map);
-  static void               GetPlaceholderProperty(Controller& controller, Property::Map& map);
-  static void               ShowPlaceholderText(Controller& controller);
-  static void               CreatePlaceholderFont(Controller& controller);
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_CONTROLLER_PLACEHOLDER_HANDLER_H
diff --git a/dali-toolkit/internal/text/text-controller-relayouter.cpp b/dali-toolkit/internal/text/text-controller-relayouter.cpp
deleted file mode 100644
index 4c71934..0000000
--- a/dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-relayouter.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <limits>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
-#endif
-
-constexpr float MAX_FLOAT = std::numeric_limits<float>::max();
-
-float ConvertToEven(float value)
-{
-  int intValue(static_cast<int>(value));
-  return static_cast<float>(intValue + (intValue & 1));
-}
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask, bool restoreLinesAndGlyphPositions)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->CalculateLayoutSizeOnRequiredControllerSize\n");
-  Size calculatedLayoutSize;
-
-  Controller::Impl& impl        = *controller.mImpl;
-  ModelPtr&         model       = impl.mModel;
-  VisualModelPtr&   visualModel = model->mVisualModel;
-
-  // Store the pending operations mask so that it can be restored later on with no modifications made on it
-  // while getting the natural size were reflected on the original mask.
-  OperationsMask operationsPendingBackUp = static_cast<OperationsMask>(impl.mOperationsPending);
-
-  // This is a hotfix for side effect on Scrolling, LineWrap and Invalid position of cursor in TextEditor after calling CalculateLayoutSizeOnRequiredControllerSize.
-  // The number of lines and glyph-positions inside visualModel have been changed by calling DoRelayout with requestedControllerSize.
-  // Store the mLines and mGlyphPositions from visualModel so that they can be restored later on with no modifications made on them.
-  //TODO: Refactor "DoRelayout" and extract common code of size calculation without modifying attributes of mVisualModel, and then blah, blah, etc.
-  Vector<LineRun> linesBackup          = visualModel->mLines;
-  Vector<Vector2> glyphPositionsBackup = visualModel->mGlyphPositions;
-
-  // Operations that can be done only once until the text changes.
-  const OperationsMask onlyOnceOperations = static_cast<OperationsMask>(CONVERT_TO_UTF32 |
-                                                                        GET_SCRIPTS |
-                                                                        VALIDATE_FONTS |
-                                                                        GET_LINE_BREAKS |
-                                                                        BIDI_INFO |
-                                                                        SHAPE_TEXT |
-                                                                        GET_GLYPH_METRICS);
-
-  // Set the update info to relayout the whole text.
-  TextUpdateInfo& textUpdateInfo              = impl.mTextUpdateInfo;
-  textUpdateInfo.mParagraphCharacterIndex     = 0u;
-  textUpdateInfo.mRequestedNumberOfCharacters = model->mLogicalModel->mText.Count();
-
-  // Make sure the model is up-to-date before layouting
-  impl.UpdateModel(onlyOnceOperations);
-
-  // Get a reference to the pending operations member
-  OperationsMask& operationsPending = impl.mOperationsPending;
-
-  // Layout the text for the new width.
-  operationsPending = static_cast<OperationsMask>(operationsPending | requestedOperationsMask);
-
-  // Store the actual control's size to restore later.
-  const Size actualControlSize = visualModel->mControlSize;
-
-  DoRelayout(controller,
-             requestedControllerSize,
-             static_cast<OperationsMask>(onlyOnceOperations |
-                                         requestedOperationsMask),
-             calculatedLayoutSize);
-
-  // Clear the update info. This info will be set the next time the text is updated.
-  textUpdateInfo.Clear();
-  textUpdateInfo.mClearAll = true;
-
-  // Restore the actual control's size.
-  visualModel->mControlSize = actualControlSize;
-  // Restore the previously backed-up pending operations' mask without the only once operations.
-  impl.mOperationsPending = static_cast<OperationsMask>(operationsPendingBackUp & ~onlyOnceOperations);
-
-  // Restore the previously backed-up mLines and mGlyphPositions from visualModel.
-  if(restoreLinesAndGlyphPositions)
-  {
-    visualModel->mLines          = linesBackup;
-    visualModel->mGlyphPositions = glyphPositionsBackup;
-  }
-
-  return calculatedLayoutSize;
-}
-
-Vector3 Controller::Relayouter::GetNaturalSize(Controller& controller)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n");
-  Vector3 naturalSizeVec3;
-
-  // Make sure the model is up-to-date before layouting
-  controller.ProcessModifyEvents();
-
-  Controller::Impl& impl        = *controller.mImpl;
-  ModelPtr&         model       = impl.mModel;
-  VisualModelPtr&   visualModel = model->mVisualModel;
-
-  if(impl.mRecalculateNaturalSize)
-  {
-    Size naturalSize;
-
-    // Layout the text for the new width.
-    OperationsMask requestedOperationsMask  = static_cast<OperationsMask>(LAYOUT | REORDER);
-    Size           sizeMaxWidthAndMaxHeight = Size(MAX_FLOAT, MAX_FLOAT);
-
-    naturalSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeMaxWidthAndMaxHeight, requestedOperationsMask, true);
-
-    // Stores the natural size to avoid recalculate it again
-    // unless the text/style changes.
-    visualModel->SetNaturalSize(naturalSize);
-    naturalSizeVec3 = naturalSize;
-
-    impl.mRecalculateNaturalSize = false;
-
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSizeVec3.x, naturalSizeVec3.y, naturalSizeVec3.z);
-  }
-  else
-  {
-    naturalSizeVec3 = visualModel->GetNaturalSize();
-
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSizeVec3.x, naturalSizeVec3.y, naturalSizeVec3.z);
-  }
-
-  naturalSizeVec3.x = ConvertToEven(naturalSizeVec3.x);
-  naturalSizeVec3.y = ConvertToEven(naturalSizeVec3.y);
-
-  return naturalSizeVec3;
-}
-
-bool Controller::Relayouter::CheckForTextFit(Controller& controller, float pointSize, const Size& layoutSize)
-{
-  Size              textSize;
-  Controller::Impl& impl            = *controller.mImpl;
-  TextUpdateInfo&   textUpdateInfo  = impl.mTextUpdateInfo;
-  impl.mFontDefaults->mFitPointSize = pointSize;
-  impl.mFontDefaults->sizeDefined   = true;
-  controller.ClearFontData();
-
-  // Operations that can be done only once until the text changes.
-  const OperationsMask onlyOnceOperations = static_cast<OperationsMask>(CONVERT_TO_UTF32 |
-                                                                        GET_SCRIPTS |
-                                                                        VALIDATE_FONTS |
-                                                                        GET_LINE_BREAKS |
-                                                                        BIDI_INFO |
-                                                                        SHAPE_TEXT |
-                                                                        GET_GLYPH_METRICS);
-
-  textUpdateInfo.mParagraphCharacterIndex     = 0u;
-  textUpdateInfo.mRequestedNumberOfCharacters = impl.mModel->mLogicalModel->mText.Count();
-
-  // Make sure the model is up-to-date before layouting
-  impl.UpdateModel(onlyOnceOperations);
-
-  DoRelayout(controller,
-             Size(layoutSize.width, MAX_FLOAT),
-             static_cast<OperationsMask>(onlyOnceOperations | LAYOUT),
-             textSize);
-
-  // Clear the update info. This info will be set the next time the text is updated.
-  textUpdateInfo.Clear();
-  textUpdateInfo.mClearAll = true;
-
-  if(textSize.width > layoutSize.width || textSize.height > layoutSize.height)
-  {
-    return false;
-  }
-  return true;
-}
-
-void Controller::Relayouter::FitPointSizeforLayout(Controller& controller, const Size& layoutSize)
-{
-  Controller::Impl& impl = *controller.mImpl;
-
-  const OperationsMask operations = impl.mOperationsPending;
-  if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations) || impl.mTextFitContentSize != layoutSize)
-  {
-    ModelPtr& model = impl.mModel;
-
-    bool  actualellipsis = model->mElideEnabled;
-    float minPointSize   = impl.mTextFitMinSize;
-    float maxPointSize   = impl.mTextFitMaxSize;
-    float pointInterval  = impl.mTextFitStepSize;
-
-    model->mElideEnabled = false;
-    Vector<float> pointSizeArray;
-
-    // check zero value
-    if(pointInterval < 1.f)
-    {
-      impl.mTextFitStepSize = pointInterval = 1.0f;
-    }
-
-    pointSizeArray.Reserve(static_cast<unsigned int>(ceil((maxPointSize - minPointSize) / pointInterval)));
-
-    for(float i = minPointSize; i < maxPointSize; i += pointInterval)
-    {
-      pointSizeArray.PushBack(i);
-    }
-
-    pointSizeArray.PushBack(maxPointSize);
-
-    int bestSizeIndex = 0;
-    int min           = bestSizeIndex + 1;
-    int max           = pointSizeArray.Size() - 1;
-    while(min <= max)
-    {
-      int destI = (min + max) / 2;
-
-      if(CheckForTextFit(controller, pointSizeArray[destI], layoutSize))
-      {
-        bestSizeIndex = min;
-        min           = destI + 1;
-      }
-      else
-      {
-        max           = destI - 1;
-        bestSizeIndex = max;
-      }
-    }
-
-    model->mElideEnabled              = actualellipsis;
-    impl.mFontDefaults->mFitPointSize = pointSizeArray[bestSizeIndex];
-    impl.mFontDefaults->sizeDefined   = true;
-    controller.ClearFontData();
-  }
-}
-
-float Controller::Relayouter::GetHeightForWidth(Controller& controller, float width)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", &controller, width);
-
-  // Make sure the model is up-to-date before layouting
-  controller.ProcessModifyEvents();
-
-  Controller::Impl& impl           = *controller.mImpl;
-  ModelPtr&         model          = impl.mModel;
-  VisualModelPtr&   visualModel    = model->mVisualModel;
-  TextUpdateInfo&   textUpdateInfo = impl.mTextUpdateInfo;
-
-  Size layoutSize;
-
-  if(fabsf(width - visualModel->mControlSize.width) > Math::MACHINE_EPSILON_1000 ||
-     textUpdateInfo.mFullRelayoutNeeded ||
-     textUpdateInfo.mClearAll)
-  {
-    // Layout the text for the new width.
-    OperationsMask requestedOperationsMask        = static_cast<OperationsMask>(LAYOUT);
-    Size           sizeRequestedWidthAndMaxHeight = Size(width, MAX_FLOAT);
-
-    // Skip restore, because if GetHeightForWidth called before rendering and layouting then visualModel->mControlSize will be zero which will make LineCount zero.
-    // The implementation of Get LineCount property depends on calling GetHeightForWidth then read mLines.Count() from visualModel direct.
-    // If the LineCount property is requested before rendering and layouting then the value will be zero, which is incorrect.
-    // So we will not restore the previously backed-up mLines and mGlyphPositions from visualModel in such case.
-    // Another case to skip restore is when the requested width equals the Control's width which means the caller need to update the old values.
-    // For example, when the text is changed.
-    bool restoreLinesAndGlyphPositions = (visualModel->mControlSize.width > 0 && visualModel->mControlSize.height > 0) && (visualModel->mControlSize.width != width);
-
-    layoutSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeRequestedWidthAndMaxHeight, requestedOperationsMask, restoreLinesAndGlyphPositions);
-
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height);
-  }
-  else
-  {
-    layoutSize = visualModel->GetLayoutSize();
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height);
-  }
-
-  return layoutSize.height;
-}
-
-Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controller, const Size& size, Dali::LayoutDirection::Type layoutDirection)
-{
-  Controller::Impl& impl           = *controller.mImpl;
-  ModelPtr&         model          = impl.mModel;
-  VisualModelPtr&   visualModel    = model->mVisualModel;
-  TextUpdateInfo&   textUpdateInfo = impl.mTextUpdateInfo;
-
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", &controller, size.width, size.height, impl.mIsAutoScrollEnabled ? "true" : "false");
-
-  UpdateTextType updateTextType = NONE_UPDATED;
-
-  if((size.width < Math::MACHINE_EPSILON_1000) || (size.height < Math::MACHINE_EPSILON_1000))
-  {
-    if(0u != visualModel->mGlyphPositions.Count())
-    {
-      visualModel->mGlyphPositions.Clear();
-      updateTextType = MODEL_UPDATED;
-    }
-
-    // Clear the update info. This info will be set the next time the text is updated.
-    textUpdateInfo.Clear();
-
-    // Not worth to relayout if width or height is equal to zero.
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n");
-
-    return updateTextType;
-  }
-
-  // Whether a new size has been set.
-  const bool newSize = (size != visualModel->mControlSize);
-
-  // Get a reference to the pending operations member
-  OperationsMask& operationsPending = impl.mOperationsPending;
-
-  if(newSize)
-  {
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", visualModel->mControlSize.width, visualModel->mControlSize.height);
-
-    if((0 == textUpdateInfo.mNumberOfCharactersToAdd) &&
-       (0 == textUpdateInfo.mPreviousNumberOfCharacters) &&
-       ((visualModel->mControlSize.width < Math::MACHINE_EPSILON_1000) || (visualModel->mControlSize.height < Math::MACHINE_EPSILON_1000)))
-    {
-      textUpdateInfo.mNumberOfCharactersToAdd = model->mLogicalModel->mText.Count();
-    }
-
-    // Layout operations that need to be done if the size changes.
-    operationsPending = static_cast<OperationsMask>(operationsPending |
-                                                    LAYOUT |
-                                                    ALIGN |
-                                                    UPDATE_LAYOUT_SIZE |
-                                                    REORDER);
-    // Set the update info to relayout the whole text.
-    textUpdateInfo.mFullRelayoutNeeded = true;
-    textUpdateInfo.mCharacterIndex     = 0u;
-
-    // Store the size used to layout the text.
-    visualModel->mControlSize = size;
-  }
-
-  // Whether there are modify events.
-  if(0u != impl.mModifyEvents.Count())
-  {
-    // Style operations that need to be done if the text is modified.
-    operationsPending = static_cast<OperationsMask>(operationsPending | COLOR);
-  }
-
-  // Set the update info to elide the text.
-  if(model->mElideEnabled ||
-     ((NULL != impl.mEventData) && impl.mEventData->mIsPlaceholderElideEnabled))
-  {
-    // Update Text layout for applying elided
-    operationsPending                  = static_cast<OperationsMask>(operationsPending |
-                                                    ALIGN |
-                                                    LAYOUT |
-                                                    UPDATE_LAYOUT_SIZE |
-                                                    REORDER);
-    textUpdateInfo.mFullRelayoutNeeded = true;
-    textUpdateInfo.mCharacterIndex     = 0u;
-  }
-
-  if(impl.mLayoutDirection != layoutDirection)
-  {
-    // Clear the update info. This info will be set the next time the text is updated.
-    textUpdateInfo.mClearAll = true;
-    // Apply modifications to the model
-    // Shape the text again is needed because characters like '()[]{}' have to be mirrored and the glyphs generated again.
-    operationsPending     = static_cast<OperationsMask>(operationsPending |
-                                                    GET_GLYPH_METRICS |
-                                                    SHAPE_TEXT |
-                                                    UPDATE_DIRECTION |
-                                                    ALIGN |
-                                                    LAYOUT |
-                                                    BIDI_INFO |
-                                                    REORDER);
-    impl.mLayoutDirection = layoutDirection;
-  }
-
-  // Make sure the model is up-to-date before layouting.
-  controller.ProcessModifyEvents();
-  bool updated = impl.UpdateModel(operationsPending);
-
-  // Layout the text.
-  Size layoutSize;
-  updated = DoRelayout(controller, size, operationsPending, layoutSize) || updated;
-
-  if(updated)
-  {
-    updateTextType = MODEL_UPDATED;
-  }
-
-  // Do not re-do any operation until something changes.
-  operationsPending          = NO_OPERATION;
-  model->mScrollPositionLast = model->mScrollPosition;
-
-  // Whether the text control is editable
-  const bool isEditable = NULL != impl.mEventData;
-
-  // Keep the current offset as it will be used to update the decorator's positions (if the size changes).
-  Vector2 offset;
-  if(newSize && isEditable)
-  {
-    offset = model->mScrollPosition;
-  }
-
-  if(!isEditable || !controller.IsMultiLineEnabled())
-  {
-    // After doing the text layout, the vertical offset to place the actor in the desired position can be calculated.
-    controller.CalculateVerticalOffset(size);
-  }
-
-  if(isEditable)
-  {
-    if(newSize)
-    {
-      // If there is a new size, the scroll position needs to be clamped.
-      impl.ClampHorizontalScroll(layoutSize);
-
-      // Update the decorator's positions is needed if there is a new size.
-      impl.mEventData->mDecorator->UpdatePositions(model->mScrollPosition - offset);
-    }
-
-    // Move the cursor, grab handle etc.
-    if(impl.ProcessInputEvents())
-    {
-      updateTextType = static_cast<UpdateTextType>(updateTextType | DECORATOR_UPDATED);
-    }
-  }
-
-  // Clear the update info. This info will be set the next time the text is updated.
-  textUpdateInfo.Clear();
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout\n");
-
-  return updateTextType;
-}
-
-bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size, OperationsMask operationsRequired, Size& layoutSize)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::DoRelayout %p size %f,%f\n", &controller, size.width, size.height);
-  bool viewUpdated(false);
-
-  Controller::Impl& impl = *controller.mImpl;
-
-  // Calculate the operations to be done.
-  const OperationsMask operations = static_cast<OperationsMask>(impl.mOperationsPending & operationsRequired);
-
-  TextUpdateInfo&      textUpdateInfo              = impl.mTextUpdateInfo;
-  const CharacterIndex startIndex                  = textUpdateInfo.mParagraphCharacterIndex;
-  const Length         requestedNumberOfCharacters = textUpdateInfo.mRequestedNumberOfCharacters;
-
-  // Get the current layout size.
-  VisualModelPtr& visualModel = impl.mModel->mVisualModel;
-  layoutSize                  = visualModel->GetLayoutSize();
-
-  if(NO_OPERATION != (LAYOUT & operations))
-  {
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n");
-
-    // Some vectors with data needed to layout and reorder may be void
-    // after the first time the text has been laid out.
-    // Fill the vectors again.
-
-    // Calculate the number of glyphs to layout.
-    const Vector<GlyphIndex>& charactersToGlyph        = visualModel->mCharactersToGlyph;
-    const Vector<Length>&     glyphsPerCharacter       = visualModel->mGlyphsPerCharacter;
-    const GlyphIndex* const   charactersToGlyphBuffer  = charactersToGlyph.Begin();
-    const Length* const       glyphsPerCharacterBuffer = glyphsPerCharacter.Begin();
-
-    const CharacterIndex lastIndex       = startIndex + ((requestedNumberOfCharacters > 0u) ? requestedNumberOfCharacters - 1u : 0u);
-    const GlyphIndex     startGlyphIndex = textUpdateInfo.mStartGlyphIndex;
-
-    // Make sure the index is not out of bound
-    if(charactersToGlyph.Count() != glyphsPerCharacter.Count() ||
-       requestedNumberOfCharacters > charactersToGlyph.Count() ||
-       (lastIndex > charactersToGlyph.Count() && charactersToGlyph.Count() > 0u))
-    {
-      std::string currentText;
-      controller.GetText(currentText);
-
-      DALI_LOG_ERROR("Controller::DoRelayout: Attempting to access invalid buffer\n");
-      DALI_LOG_ERROR("Current text is: %s\n", currentText.c_str());
-      DALI_LOG_ERROR("startIndex: %u, lastIndex: %u, requestedNumberOfCharacters: %u, charactersToGlyph.Count = %lu, glyphsPerCharacter.Count = %lu\n", startIndex, lastIndex, requestedNumberOfCharacters, charactersToGlyph.Count(), glyphsPerCharacter.Count());
-
-      return false;
-    }
-
-    const Length numberOfGlyphs      = (requestedNumberOfCharacters > 0u) ? *(charactersToGlyphBuffer + lastIndex) + *(glyphsPerCharacterBuffer + lastIndex) - startGlyphIndex : 0u;
-    const Length totalNumberOfGlyphs = visualModel->mGlyphs.Count();
-
-    if(0u == totalNumberOfGlyphs)
-    {
-      if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations))
-      {
-        visualModel->SetLayoutSize(Size::ZERO);
-      }
-
-      // Nothing else to do if there is no glyphs.
-      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n");
-      return true;
-    }
-
-    // Set the layout parameters.
-    Layout::Parameters layoutParameters(size, impl.mModel);
-
-    // Resize the vector of positions to have the same size than the vector of glyphs.
-    Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
-    glyphPositions.Resize(totalNumberOfGlyphs);
-
-    // Whether the last character is a new paragraph character.
-    const Character* const textBuffer           = impl.mModel->mLogicalModel->mText.Begin();
-    textUpdateInfo.mIsLastCharacterNewParagraph = TextAbstraction::IsNewParagraph(*(textBuffer + (impl.mModel->mLogicalModel->mText.Count() - 1u)));
-    layoutParameters.isLastNewParagraph         = textUpdateInfo.mIsLastCharacterNewParagraph;
-
-    // The initial glyph and the number of glyphs to layout.
-    layoutParameters.startGlyphIndex        = startGlyphIndex;
-    layoutParameters.numberOfGlyphs         = numberOfGlyphs;
-    layoutParameters.startLineIndex         = textUpdateInfo.mStartLineIndex;
-    layoutParameters.estimatedNumberOfLines = textUpdateInfo.mEstimatedNumberOfLines;
-
-    // Update the ellipsis
-    bool elideTextEnabled = impl.mModel->mElideEnabled;
-    auto ellipsisPosition = impl.mModel->mEllipsisPosition;
-
-    if(NULL != impl.mEventData)
-    {
-      if(impl.mEventData->mPlaceholderEllipsisFlag && impl.IsShowingPlaceholderText())
-      {
-        elideTextEnabled = impl.mEventData->mIsPlaceholderElideEnabled;
-      }
-      else if(EventData::INACTIVE != impl.mEventData->mState)
-      {
-        // Disable ellipsis when editing
-        elideTextEnabled = false;
-      }
-
-      // Reset the scroll position in inactive state
-      if(elideTextEnabled && (impl.mEventData->mState == EventData::INACTIVE))
-      {
-        controller.ResetScrollPosition();
-      }
-    }
-
-    // Update the visual model.
-    bool isAutoScrollEnabled = impl.mIsAutoScrollEnabled;
-    Size newLayoutSize;
-    viewUpdated               = impl.mLayoutEngine.LayoutText(layoutParameters,
-                                                newLayoutSize,
-                                                elideTextEnabled,
-                                                isAutoScrollEnabled,
-                                                ellipsisPosition);
-    impl.mIsAutoScrollEnabled = isAutoScrollEnabled;
-
-    viewUpdated = viewUpdated || (newLayoutSize != layoutSize);
-
-    if(viewUpdated)
-    {
-      layoutSize = newLayoutSize;
-
-      if(NO_OPERATION != (UPDATE_DIRECTION & operations))
-      {
-        impl.mIsTextDirectionRTL = false;
-      }
-
-      if((NO_OPERATION != (UPDATE_DIRECTION & operations)) && !visualModel->mLines.Empty())
-      {
-        impl.mIsTextDirectionRTL = visualModel->mLines[0u].direction;
-      }
-
-      // Sets the layout size.
-      if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations))
-      {
-        visualModel->SetLayoutSize(layoutSize);
-      }
-    } // view updated
-  }
-
-  if(NO_OPERATION != (ALIGN & operations))
-  {
-    // The laid-out lines.
-    Vector<LineRun>& lines = visualModel->mLines;
-
-    CharacterIndex alignStartIndex                  = startIndex;
-    Length         alignRequestedNumberOfCharacters = requestedNumberOfCharacters;
-
-    // the whole text needs to be full aligned.
-    // If you do not do a full aligned, only the last line of the multiline input is aligned.
-    if(impl.mEventData && impl.mEventData->mUpdateAlignment)
-    {
-      alignStartIndex                   = 0u;
-      alignRequestedNumberOfCharacters  = impl.mModel->mLogicalModel->mText.Count();
-      impl.mEventData->mUpdateAlignment = false;
-    }
-
-    // Need to align with the control's size as the text may contain lines
-    // starting either with left to right text or right to left.
-    impl.mLayoutEngine.Align(size,
-                             alignStartIndex,
-                             alignRequestedNumberOfCharacters,
-                             impl.mModel->mHorizontalAlignment,
-                             lines,
-                             impl.mModel->mAlignmentOffset,
-                             impl.mLayoutDirection,
-                             (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS));
-
-    viewUpdated = true;
-  }
-#if defined(DEBUG_ENABLED)
-  std::string currentText;
-  controller.GetText(currentText);
-  DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mIsTextDirectionRTL[%s] [%s]\n", &controller, (impl.mIsTextDirectionRTL) ? "true" : "false", currentText.c_str());
-#endif
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false"));
-  return viewUpdated;
-}
-
-void Controller::Relayouter::CalculateVerticalOffset(Controller& controller, const Size& controlSize)
-{
-  Controller::Impl& impl                  = *controller.mImpl;
-  ModelPtr&         model                 = impl.mModel;
-  VisualModelPtr&   visualModel           = model->mVisualModel;
-  Size              layoutSize            = model->mVisualModel->GetLayoutSize();
-  Size              oldLayoutSize         = layoutSize;
-  float             offsetY               = 0.f;
-  bool              needRecalc            = false;
-  float             defaultFontLineHeight = impl.GetDefaultFontLineHeight();
-
-  if(fabsf(layoutSize.height) < Math::MACHINE_EPSILON_1000)
-  {
-    // Get the line height of the default font.
-    layoutSize.height = defaultFontLineHeight;
-  }
-
-  // Whether the text control is editable
-  const bool isEditable = NULL != impl.mEventData;
-  if(isEditable && layoutSize.height != defaultFontLineHeight && impl.IsShowingPlaceholderText())
-  {
-    // This code prevents the wrong positioning of cursor when the layout size is bigger/smaller than defaultFontLineHeight.
-    // This situation occurs when the size of placeholder text is different from the default text.
-    layoutSize.height = defaultFontLineHeight;
-    needRecalc        = true;
-  }
-
-  switch(model->mVerticalAlignment)
-  {
-    case VerticalAlignment::TOP:
-    {
-      model->mScrollPosition.y = 0.f;
-      offsetY                  = 0.f;
-      break;
-    }
-    case VerticalAlignment::CENTER:
-    {
-      model->mScrollPosition.y = floorf(0.5f * (controlSize.height - layoutSize.height)); // try to avoid pixel alignment.
-      if(needRecalc) offsetY = floorf(0.5f * (layoutSize.height - oldLayoutSize.height));
-      break;
-    }
-    case VerticalAlignment::BOTTOM:
-    {
-      model->mScrollPosition.y = controlSize.height - layoutSize.height;
-      if(needRecalc) offsetY = layoutSize.height - oldLayoutSize.height;
-      break;
-    }
-  }
-
-  if(needRecalc)
-  {
-    // Update glyphPositions according to recalculation.
-    const Length     positionCount  = visualModel->mGlyphPositions.Count();
-    Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
-    for(Length index = 0u; index < positionCount; index++)
-    {
-      glyphPositions[index].y += offsetY;
-    }
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-relayouter.h b/dali-toolkit/internal/text/text-controller-relayouter.h
deleted file mode 100644
index 1b586b2..0000000
--- a/dali-toolkit/internal/text/text-controller-relayouter.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_RELAYOUTER_H
-#define DALI_TOOLKIT_TEXT_CONTROLLER_RELAYOUTER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/actor-enumerations.h>
-#include <dali/public-api/math/vector2.h>
-#include <dali/public-api/math/vector3.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-/**
- * Contains all the relayouting related methods for Text::Controller
- */
-struct Controller::Relayouter
-{
-  /**
-   * @brief Called by the Controller to retrieve the natural size.
-   *
-   * @param[in] controller A reference to the controller class
-   * @return
-   */
-  static Vector3 GetNaturalSize(Controller& controller);
-
-  /**
-   * @brief Called by the Controller to check if the text fits.
-   *
-   * @param[in] controller A reference to the controller class
-   * @param[in] pointSize The point size
-   * @param[in] layoutSize The layout size
-   * @return
-   */
-  static bool CheckForTextFit(Controller& controller, float pointSize, const Size& layoutSize);
-
-  /**
-   * @brief Calculates the point size for text for given layout()
-   *
-   * @param[in] controller A reference to the controller class
-   * @param[in] layoutSize The layout size
-   */
-  static void FitPointSizeforLayout(Controller& controller, const Size& layoutSize);
-
-  /**
-   * @brief Called by the Controller to get the height for a particular width.
-   *
-   * @param[in] controller A reference to the controller class
-   * @param[in] width The width we want the height for
-   * @return
-   */
-  static float GetHeightForWidth(Controller& controller, float width);
-
-  /**
-   * @brief Called by the Controller to do the relayout itself.
-   *
-   * @param[in] controller A reference to the controller class
-   * @param[in] size The size to set
-   * @param[in] layoutDirection The layout direction
-   * @return
-   */
-  static Controller::UpdateTextType Relayout(Controller& controller, const Size& size, Dali::LayoutDirection::Type layoutDirection);
-
-  /**
-   * @brief Called by the Controller to do certain operations when relayouting.
-   *
-   * @param[in] controller A reference to the controller class
-   * @param[in] size The size to set
-   * @param[in] operationsRequired The operations we need to do
-   * @param[in/out] layoutSize The Layout size which can be updated depending on the result of the performed operations
-   * @return
-   */
-  static bool DoRelayout(Controller& controller, const Size& size, OperationsMask operationsRequired, Size& layoutSize);
-
-  /**
-   * @brief Called by the Controller to calculate the veritcal offset give the control size.
-   *
-   * @param[in] controller A reference to the controller class
-   * @param[in] controlSize The control size
-   */
-  static void CalculateVerticalOffset(Controller& controller, const Size& controlSize);
-
-  /**
-  * @brief Calculates the layout size of control according to @p requestedControllerSize and @p requestedOperationsMask
-  *
-  * GetNaturalSize() and GetHeightForWidth() calls this method.
-  *
-  * @param[in] controller The controller to calcualte size on it.
-  * @param[in] requestedControllerSize The requested size of controller to calcualte layout size on it.
-  * @param[in] requestedOperationsMask The requested operations-mask to calcualte layout size according to it.
-  * @param[in] restoreLinesAndGlyphPositions whether to restore lines and glyph-positions to status before requesting calculation on size.
-  *
-  * @return The calculated layout-size.
-  */
-  static Size CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask, bool restoreLinesAndGlyphPositions);
-
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_CONTROLLER_RELAYOUTER_H
diff --git a/dali-toolkit/internal/text/text-controller-text-updater.cpp b/dali-toolkit/internal/text/text-controller-text-updater.cpp
deleted file mode 100644
index 75ea73c..0000000
--- a/dali-toolkit/internal/text/text-controller-text-updater.cpp
+++ /dev/null
@@ -1,800 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller-text-updater.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <memory.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/character-set-conversion.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-editable-control-interface.h>
-
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
-#endif
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-void Controller::TextUpdater::SetText(Controller& controller, const std::string& text)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SetText\n");
-
-  Controller::Impl& impl = *controller.mImpl;
-
-  // Reset keyboard as text changed
-  impl.ResetInputMethodContext();
-
-  // Remove the previously set text and style.
-  ResetText(controller);
-
-  // Remove the style.
-  controller.ClearStyleData();
-
-  CharacterIndex lastCursorIndex = 0u;
-
-  EventData*& eventData = impl.mEventData;
-
-  if(nullptr != eventData)
-  {
-    // If popup shown then hide it by switching to Editing state
-    if((EventData::SELECTING == eventData->mState) ||
-       (EventData::EDITING_WITH_POPUP == eventData->mState) ||
-       (EventData::EDITING_WITH_GRAB_HANDLE == eventData->mState) ||
-       (EventData::EDITING_WITH_PASTE_POPUP == eventData->mState))
-    {
-      if((impl.mSelectableControlInterface != nullptr) && (EventData::SELECTING == eventData->mState))
-      {
-        impl.mSelectableControlInterface->SelectionChanged(eventData->mLeftSelectionPosition, eventData->mRightSelectionPosition, eventData->mPrimaryCursorPosition, eventData->mPrimaryCursorPosition);
-      }
-
-      impl.ChangeState(EventData::EDITING);
-    }
-  }
-
-  if(!text.empty())
-  {
-    ModelPtr&        model        = impl.mModel;
-    LogicalModelPtr& logicalModel = model->mLogicalModel;
-    model->mVisualModel->SetTextColor(impl.mTextColor);
-
-    MarkupProcessData markupProcessData(logicalModel->mColorRuns,
-                                        logicalModel->mFontDescriptionRuns,
-                                        logicalModel->mEmbeddedItems,
-                                        logicalModel->mAnchors,
-                                        logicalModel->mUnderlinedCharacterRuns,
-                                        logicalModel->mBackgroundColorRuns);
-
-    Length         textSize = 0u;
-    const uint8_t* utf8     = NULL;
-    if(impl.mMarkupProcessorEnabled)
-    {
-      ProcessMarkupString(text, markupProcessData);
-      textSize = markupProcessData.markupProcessedText.size();
-
-      // This is a bit horrible but std::string returns a (signed) char*
-      utf8 = reinterpret_cast<const uint8_t*>(markupProcessData.markupProcessedText.c_str());
-    }
-    else
-    {
-      textSize = text.size();
-
-      // This is a bit horrible but std::string returns a (signed) char*
-      utf8 = reinterpret_cast<const uint8_t*>(text.c_str());
-    }
-
-    //  Convert text into UTF-32
-    Vector<Character>& utf32Characters = logicalModel->mText;
-    utf32Characters.Resize(textSize);
-
-    // Transform a text array encoded in utf8 into an array encoded in utf32.
-    // It returns the actual number of characters.
-    Length characterCount = Utf8ToUtf32(utf8, textSize, utf32Characters.Begin());
-    utf32Characters.Resize(characterCount);
-
-    DALI_ASSERT_DEBUG(textSize >= characterCount && "Invalid UTF32 conversion length");
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", &controller, textSize, logicalModel->mText.Count());
-
-    // The characters to be added.
-    impl.mTextUpdateInfo.mNumberOfCharactersToAdd = logicalModel->mText.Count();
-
-    // To reset the cursor position
-    lastCursorIndex = characterCount;
-
-    // Update the rest of the model during size negotiation
-    impl.QueueModifyEvent(ModifyEvent::TEXT_REPLACED);
-
-    // The natural size needs to be re-calculated.
-    impl.mRecalculateNaturalSize = true;
-
-    // The text direction needs to be updated.
-    impl.mUpdateTextDirection = true;
-
-    // Apply modifications to the model
-    impl.mOperationsPending = ALL_OPERATIONS;
-  }
-  else
-  {
-    controller.ShowPlaceholderText();
-  }
-
-  unsigned int oldCursorPos = (nullptr != eventData ? eventData->mPrimaryCursorPosition : 0);
-
-  // Resets the cursor position.
-  controller.ResetCursorPosition(lastCursorIndex);
-
-  // Scrolls the text to make the cursor visible.
-  controller.ResetScrollPosition();
-
-  impl.RequestRelayout();
-
-  if(nullptr != eventData)
-  {
-    // Cancel previously queued events
-    eventData->mEventQueue.clear();
-  }
-
-  // Do this last since it provides callbacks into application code.
-  if(NULL != impl.mEditableControlInterface)
-  {
-    impl.mEditableControlInterface->CursorPositionChanged(oldCursorPos, lastCursorIndex);
-    impl.mEditableControlInterface->TextChanged(true);
-  }
-}
-
-void Controller::TextUpdater::InsertText(Controller& controller, const std::string& text, Controller::InsertType type)
-{
-  Controller::Impl& impl      = *controller.mImpl;
-  EventData*&       eventData = impl.mEventData;
-
-  DALI_ASSERT_DEBUG(nullptr != eventData && "Unexpected InsertText")
-
-  if(NULL == eventData)
-  {
-    return;
-  }
-
-  bool         removedPrevious  = false;
-  bool         removedSelected  = false;
-  bool         maxLengthReached = false;
-  unsigned int oldCursorPos     = eventData->mPrimaryCursorPosition;
-
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", &controller, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), eventData->mPrimaryCursorPosition, eventData->mPreEditFlag, eventData->mPreEditStartPosition, eventData->mPreEditLength);
-
-  ModelPtr&        model        = impl.mModel;
-  LogicalModelPtr& logicalModel = model->mLogicalModel;
-
-  // TODO: At the moment the underline runs are only for pre-edit.
-  model->mVisualModel->mUnderlineRuns.Clear();
-
-  // Remove the previous InputMethodContext pre-edit.
-  if(eventData->mPreEditFlag && (0u != eventData->mPreEditLength))
-  {
-    removedPrevious = RemoveText(controller,
-                                 -static_cast<int>(eventData->mPrimaryCursorPosition - eventData->mPreEditStartPosition),
-                                 eventData->mPreEditLength,
-                                 DONT_UPDATE_INPUT_STYLE);
-
-    eventData->mPrimaryCursorPosition = eventData->mPreEditStartPosition;
-    eventData->mPreEditLength         = 0u;
-  }
-  else
-  {
-    // Remove the previous Selection.
-    removedSelected = RemoveSelectedText(controller);
-  }
-
-  Vector<Character> utf32Characters;
-  Length            characterCount = 0u;
-
-  if(!text.empty())
-  {
-    //  Convert text into UTF-32
-    utf32Characters.Resize(text.size());
-
-    // This is a bit horrible but std::string returns a (signed) char*
-    const uint8_t* utf8 = reinterpret_cast<const uint8_t*>(text.c_str());
-
-    // Transform a text array encoded in utf8 into an array encoded in utf32.
-    // It returns the actual number of characters.
-    characterCount = Utf8ToUtf32(utf8, text.size(), utf32Characters.Begin());
-    utf32Characters.Resize(characterCount);
-
-    DALI_ASSERT_DEBUG(text.size() >= utf32Characters.Count() && "Invalid UTF32 conversion length");
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "UTF8 size %d, UTF32 size %d\n", text.size(), utf32Characters.Count());
-  }
-
-  if(0u != utf32Characters.Count()) // Check if Utf8ToUtf32 conversion succeeded
-  {
-    // The placeholder text is no longer needed
-    if(impl.IsShowingPlaceholderText())
-    {
-      ResetText(controller);
-    }
-
-    impl.ChangeState(EventData::EDITING);
-
-    // Handle the InputMethodContext (predicitive text) state changes
-    if(COMMIT == type)
-    {
-      // InputMethodContext is no longer handling key-events
-      impl.ClearPreEditFlag();
-    }
-    else // PRE_EDIT
-    {
-      if(!eventData->mPreEditFlag)
-      {
-        DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Entered PreEdit state\n");
-
-        // Record the start of the pre-edit text
-        eventData->mPreEditStartPosition = eventData->mPrimaryCursorPosition;
-      }
-
-      eventData->mPreEditLength = utf32Characters.Count();
-      eventData->mPreEditFlag   = true;
-
-      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", eventData->mPreEditStartPosition, eventData->mPreEditLength);
-    }
-
-    const Length numberOfCharactersInModel = logicalModel->mText.Count();
-
-    // Restrict new text to fit within Maximum characters setting.
-    Length temp_length      = (impl.mMaximumNumberOfCharacters > numberOfCharactersInModel ? impl.mMaximumNumberOfCharacters - numberOfCharactersInModel : 0);
-    Length maxSizeOfNewText = std::min(temp_length, characterCount);
-    maxLengthReached        = (characterCount > maxSizeOfNewText);
-
-    // The cursor position.
-    CharacterIndex& cursorIndex = eventData->mPrimaryCursorPosition;
-
-    // Update the text's style.
-
-    // Updates the text style runs by adding characters.
-    logicalModel->UpdateTextStyleRuns(cursorIndex, maxSizeOfNewText);
-
-    // Get the character index from the cursor index.
-    const CharacterIndex styleIndex = (cursorIndex > 0u) ? cursorIndex - 1u : 0u;
-
-    // Retrieve the text's style for the given index.
-    InputStyle style;
-    impl.RetrieveDefaultInputStyle(style);
-    logicalModel->RetrieveStyle(styleIndex, style);
-
-    InputStyle& inputStyle = eventData->mInputStyle;
-
-    // Whether to add a new text color run.
-    const bool addColorRun = (style.textColor != inputStyle.textColor) && !inputStyle.isDefaultColor;
-
-    // Whether to add a new font run.
-    const bool addFontNameRun   = (style.familyName != inputStyle.familyName) && inputStyle.isFamilyDefined;
-    const bool addFontWeightRun = (style.weight != inputStyle.weight) && inputStyle.isWeightDefined;
-    const bool addFontWidthRun  = (style.width != inputStyle.width) && inputStyle.isWidthDefined;
-    const bool addFontSlantRun  = (style.slant != inputStyle.slant) && inputStyle.isSlantDefined;
-    const bool addFontSizeRun   = (style.size != inputStyle.size) && inputStyle.isSizeDefined;
-
-    // Add style runs.
-    if(addColorRun)
-    {
-      const VectorBase::SizeType numberOfRuns = logicalModel->mColorRuns.Count();
-      logicalModel->mColorRuns.Resize(numberOfRuns + 1u);
-
-      ColorRun& colorRun                       = *(logicalModel->mColorRuns.Begin() + numberOfRuns);
-      colorRun.color                           = inputStyle.textColor;
-      colorRun.characterRun.characterIndex     = cursorIndex;
-      colorRun.characterRun.numberOfCharacters = maxSizeOfNewText;
-    }
-
-    if(addFontNameRun ||
-       addFontWeightRun ||
-       addFontWidthRun ||
-       addFontSlantRun ||
-       addFontSizeRun)
-    {
-      const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count();
-      logicalModel->mFontDescriptionRuns.Resize(numberOfRuns + 1u);
-
-      FontDescriptionRun& fontDescriptionRun = *(logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns);
-
-      if(addFontNameRun)
-      {
-        fontDescriptionRun.familyLength = inputStyle.familyName.size();
-        fontDescriptionRun.familyName   = new char[fontDescriptionRun.familyLength];
-        memcpy(fontDescriptionRun.familyName, inputStyle.familyName.c_str(), fontDescriptionRun.familyLength);
-        fontDescriptionRun.familyDefined = true;
-
-        // The memory allocated for the font family name is freed when the font description is removed from the logical model.
-      }
-
-      if(addFontWeightRun)
-      {
-        fontDescriptionRun.weight        = inputStyle.weight;
-        fontDescriptionRun.weightDefined = true;
-      }
-
-      if(addFontWidthRun)
-      {
-        fontDescriptionRun.width        = inputStyle.width;
-        fontDescriptionRun.widthDefined = true;
-      }
-
-      if(addFontSlantRun)
-      {
-        fontDescriptionRun.slant        = inputStyle.slant;
-        fontDescriptionRun.slantDefined = true;
-      }
-
-      if(addFontSizeRun)
-      {
-        fontDescriptionRun.size        = static_cast<PointSize26Dot6>(inputStyle.size * impl.mFontSizeScale * 64.f);
-        fontDescriptionRun.sizeDefined = true;
-      }
-
-      fontDescriptionRun.characterRun.characterIndex     = cursorIndex;
-      fontDescriptionRun.characterRun.numberOfCharacters = maxSizeOfNewText;
-    }
-
-    // Insert at current cursor position.
-    Vector<Character>& modifyText = logicalModel->mText;
-
-    auto pos = modifyText.End();
-    if(cursorIndex < numberOfCharactersInModel)
-    {
-      pos = modifyText.Begin() + cursorIndex;
-    }
-    unsigned int realPos = pos - modifyText.Begin();
-    modifyText.Insert(pos, utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText);
-
-    if(NULL != impl.mEditableControlInterface)
-    {
-      impl.mEditableControlInterface->TextInserted(realPos, maxSizeOfNewText, text);
-    }
-
-    TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo;
-
-    // Mark the first paragraph to be updated.
-    if(Layout::Engine::SINGLE_LINE_BOX == impl.mLayoutEngine.GetLayout())
-    {
-      textUpdateInfo.mCharacterIndex             = 0;
-      textUpdateInfo.mNumberOfCharactersToRemove = textUpdateInfo.mPreviousNumberOfCharacters;
-      textUpdateInfo.mNumberOfCharactersToAdd    = numberOfCharactersInModel + maxSizeOfNewText;
-      textUpdateInfo.mClearAll                   = true;
-    }
-    else
-    {
-      textUpdateInfo.mCharacterIndex = std::min(cursorIndex, textUpdateInfo.mCharacterIndex);
-      textUpdateInfo.mNumberOfCharactersToAdd += maxSizeOfNewText;
-    }
-
-    if(impl.mMarkupProcessorEnabled)
-    {
-      InsertTextAnchor(controller, maxSizeOfNewText, cursorIndex);
-    }
-
-    // Update the cursor index.
-    cursorIndex += maxSizeOfNewText;
-
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, logicalModel->mText.Count(), eventData->mPrimaryCursorPosition);
-  }
-
-  if((0u == logicalModel->mText.Count()) &&
-     impl.IsPlaceholderAvailable())
-  {
-    // Show place-holder if empty after removing the pre-edit text
-    controller.ShowPlaceholderText();
-    eventData->mUpdateCursorPosition = true;
-    impl.ClearPreEditFlag();
-  }
-  else if(removedPrevious ||
-          removedSelected ||
-          (0 != utf32Characters.Count()))
-  {
-    // Queue an inserted event
-    impl.QueueModifyEvent(ModifyEvent::TEXT_INSERTED);
-
-    eventData->mUpdateCursorPosition = true;
-    if(removedSelected)
-    {
-      eventData->mScrollAfterDelete = true;
-    }
-    else
-    {
-      eventData->mScrollAfterUpdatePosition = true;
-    }
-  }
-
-  if(nullptr != impl.mEditableControlInterface)
-  {
-    impl.mEditableControlInterface->CursorPositionChanged(oldCursorPos, eventData->mPrimaryCursorPosition);
-  }
-
-  if(maxLengthReached)
-  {
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", logicalModel->mText.Count());
-
-    impl.ResetInputMethodContext();
-
-    if(NULL != impl.mEditableControlInterface)
-    {
-      // Do this last since it provides callbacks into application code
-      impl.mEditableControlInterface->MaxLengthReached();
-    }
-  }
-}
-
-void Controller::TextUpdater::PasteText(Controller& controller, const std::string& stringToPaste)
-{
-  InsertText(controller, stringToPaste, Text::Controller::COMMIT);
-  Controller::Impl& impl = *controller.mImpl;
-  impl.ChangeState(EventData::EDITING);
-  impl.RequestRelayout();
-
-  if(NULL != impl.mEditableControlInterface)
-  {
-    // Do this last since it provides callbacks into application code
-    impl.mEditableControlInterface->TextChanged(true);
-  }
-}
-
-bool Controller::TextUpdater::RemoveText(
-  Controller&          controller,
-  int                  cursorOffset,
-  int                  numberOfCharacters,
-  UpdateInputStyleType type)
-{
-  bool removed = false;
-
-  Controller::Impl& impl      = *controller.mImpl;
-  EventData*&       eventData = impl.mEventData;
-
-  if(nullptr == eventData)
-  {
-    return removed;
-  }
-
-  ModelPtr&        model        = impl.mModel;
-  LogicalModelPtr& logicalModel = model->mLogicalModel;
-
-  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfCharacters %d\n", &controller, logicalModel->mText.Count(), eventData->mPrimaryCursorPosition, cursorOffset, numberOfCharacters);
-
-  if(!impl.IsShowingPlaceholderText())
-  {
-    // Delete at current cursor position
-    Vector<Character>& currentText         = logicalModel->mText;
-    CharacterIndex&    previousCursorIndex = eventData->mPrimaryCursorPosition;
-
-    CharacterIndex cursorIndex = 0;
-
-    // Validate the cursor position & number of characters
-    if((static_cast<int>(eventData->mPrimaryCursorPosition) + cursorOffset) >= 0)
-    {
-      cursorIndex = eventData->mPrimaryCursorPosition + cursorOffset;
-    }
-
-    if((cursorIndex + numberOfCharacters) > currentText.Count())
-    {
-      numberOfCharacters = currentText.Count() - cursorIndex;
-    }
-
-    TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo;
-
-    if(eventData->mPreEditFlag || // If the preedit flag is enabled, it means two (or more) of them came together i.e. when two keys have been pressed at the same time.
-       ((cursorIndex + numberOfCharacters) <= textUpdateInfo.mPreviousNumberOfCharacters))
-    {
-      // Mark the paragraphs to be updated.
-      if(Layout::Engine::SINGLE_LINE_BOX == impl.mLayoutEngine.GetLayout())
-      {
-        textUpdateInfo.mCharacterIndex             = 0;
-        textUpdateInfo.mNumberOfCharactersToRemove = textUpdateInfo.mPreviousNumberOfCharacters;
-        textUpdateInfo.mNumberOfCharactersToAdd    = textUpdateInfo.mPreviousNumberOfCharacters - numberOfCharacters;
-        textUpdateInfo.mClearAll                   = true;
-      }
-      else
-      {
-        textUpdateInfo.mCharacterIndex = std::min(cursorIndex, textUpdateInfo.mCharacterIndex);
-        textUpdateInfo.mNumberOfCharactersToRemove += numberOfCharacters;
-      }
-
-      // Update the input style and remove the text's style before removing the text.
-
-      if(UPDATE_INPUT_STYLE == type)
-      {
-        InputStyle& eventDataInputStyle = eventData->mInputStyle;
-
-        // Keep a copy of the current input style.
-        InputStyle currentInputStyle;
-        currentInputStyle.Copy(eventDataInputStyle);
-
-        // Set first the default input style.
-        impl.RetrieveDefaultInputStyle(eventDataInputStyle);
-
-        // Update the input style.
-        logicalModel->RetrieveStyle(cursorIndex, eventDataInputStyle);
-
-        // Compare if the input style has changed.
-        const bool hasInputStyleChanged = !currentInputStyle.Equal(eventDataInputStyle);
-
-        if(hasInputStyleChanged)
-        {
-          const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask(eventDataInputStyle);
-          // Queue the input style changed signal.
-          eventData->mInputStyleChangedQueue.PushBack(styleChangedMask);
-        }
-      }
-
-      // If the number of current text and the number of characters to be deleted are same,
-      // it means all texts should be removed and all Preedit variables should be initialized.
-      if((currentText.Count() - numberOfCharacters == 0) && (cursorIndex == 0))
-      {
-        impl.ClearPreEditFlag();
-        textUpdateInfo.mNumberOfCharactersToAdd = 0;
-      }
-
-      // Updates the text style runs by removing characters. Runs with no characters are removed.
-      logicalModel->UpdateTextStyleRuns(cursorIndex, -numberOfCharacters);
-
-      // Remove the characters.
-      Vector<Character>::Iterator first = currentText.Begin() + cursorIndex;
-      Vector<Character>::Iterator last  = first + numberOfCharacters;
-
-      if(NULL != impl.mEditableControlInterface)
-      {
-        std::string utf8;
-        Utf32ToUtf8(first, numberOfCharacters, utf8);
-        impl.mEditableControlInterface->TextDeleted(cursorIndex, numberOfCharacters, utf8);
-      }
-
-      currentText.Erase(first, last);
-
-      if(impl.mMarkupProcessorEnabled)
-      {
-        RemoveTextAnchor(controller, cursorOffset, numberOfCharacters, previousCursorIndex);
-      }
-
-      if(nullptr != impl.mEditableControlInterface)
-      {
-        impl.mEditableControlInterface->CursorPositionChanged(previousCursorIndex, cursorIndex);
-      }
-
-      // Cursor position retreat
-      previousCursorIndex = cursorIndex;
-
-      eventData->mScrollAfterDelete = true;
-
-      if(EventData::INACTIVE == eventData->mState)
-      {
-        impl.ChangeState(EventData::EDITING);
-      }
-
-      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", &controller, numberOfCharacters);
-      removed = true;
-    }
-  }
-
-  return removed;
-}
-
-bool Controller::TextUpdater::RemoveSelectedText(Controller& controller)
-{
-  bool textRemoved(false);
-
-  Controller::Impl& impl = *controller.mImpl;
-
-  if(EventData::SELECTING == impl.mEventData->mState)
-  {
-    std::string removedString;
-    uint32_t    oldSelStart = impl.mEventData->mLeftSelectionPosition;
-    uint32_t    oldSelEnd   = impl.mEventData->mRightSelectionPosition;
-
-    impl.RetrieveSelection(removedString, true);
-
-    if(!removedString.empty())
-    {
-      textRemoved = true;
-      impl.ChangeState(EventData::EDITING);
-
-      if(impl.mMarkupProcessorEnabled)
-      {
-        int             cursorOffset        = -1;
-        int             numberOfCharacters  = removedString.length();
-        CharacterIndex& cursorIndex         = impl.mEventData->mPrimaryCursorPosition;
-        CharacterIndex  previousCursorIndex = cursorIndex + numberOfCharacters;
-
-        RemoveTextAnchor(controller, cursorOffset, numberOfCharacters, previousCursorIndex);
-      }
-
-      if(impl.mSelectableControlInterface != nullptr)
-      {
-        impl.mSelectableControlInterface->SelectionChanged(oldSelStart, oldSelEnd, impl.mEventData->mPrimaryCursorPosition, impl.mEventData->mPrimaryCursorPosition);
-      }
-    }
-  }
-
-  return textRemoved;
-}
-
-void Controller::TextUpdater::ResetText(Controller& controller)
-{
-  Controller::Impl& impl         = *controller.mImpl;
-  LogicalModelPtr&  logicalModel = impl.mModel->mLogicalModel;
-
-  // Reset buffers.
-  logicalModel->mText.Clear();
-
-  // Reset the embedded images buffer.
-  logicalModel->ClearEmbeddedImages();
-
-  // Reset the anchors buffer.
-  logicalModel->ClearAnchors();
-
-  // We have cleared everything including the placeholder-text
-  impl.PlaceholderCleared();
-
-  impl.mTextUpdateInfo.mCharacterIndex             = 0u;
-  impl.mTextUpdateInfo.mNumberOfCharactersToRemove = impl.mTextUpdateInfo.mPreviousNumberOfCharacters;
-  impl.mTextUpdateInfo.mNumberOfCharactersToAdd    = 0u;
-
-  // Clear any previous text.
-  impl.mTextUpdateInfo.mClearAll = true;
-
-  // The natural size needs to be re-calculated.
-  impl.mRecalculateNaturalSize = true;
-
-  // The text direction needs to be updated.
-  impl.mUpdateTextDirection = true;
-
-  // Apply modifications to the model
-  impl.mOperationsPending = ALL_OPERATIONS;
-}
-
-void Controller::TextUpdater::InsertTextAnchor(Controller& controller, int numberOfCharacters, CharacterIndex previousCursorIndex)
-{
-  Controller::Impl& impl         = *controller.mImpl;
-  ModelPtr&         model        = impl.mModel;
-  LogicalModelPtr&  logicalModel = model->mLogicalModel;
-
-  for(auto& anchor : logicalModel->mAnchors)
-  {
-    if(anchor.endIndex < previousCursorIndex) //      [anchor]  CUR
-    {
-      continue;
-    }
-    if(anchor.startIndex < previousCursorIndex) //      [anCURr]
-    {
-      anchor.endIndex += numberOfCharacters;
-    }
-    else // CUR  [anchor]
-    {
-      anchor.startIndex += numberOfCharacters;
-      anchor.endIndex += numberOfCharacters;
-    }
-    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::InsertTextAnchor[%p] Anchor[%s] start[%d] end[%d]\n", &controller, anchor.href, anchor.startIndex, anchor.endIndex);
-  }
-}
-
-void Controller::TextUpdater::RemoveTextAnchor(Controller& controller, int cursorOffset, int numberOfCharacters, CharacterIndex previousCursorIndex)
-{
-  Controller::Impl&        impl         = *controller.mImpl;
-  ModelPtr&                model        = impl.mModel;
-  LogicalModelPtr&         logicalModel = model->mLogicalModel;
-  Vector<Anchor>::Iterator it           = logicalModel->mAnchors.Begin();
-
-  while(it != logicalModel->mAnchors.End())
-  {
-    Anchor& anchor = *it;
-
-    if(anchor.endIndex <= previousCursorIndex && cursorOffset == 0) // [anchor]    CUR >>
-    {
-      // Nothing happens.
-    }
-    else if(anchor.endIndex <= previousCursorIndex && cursorOffset == -1) // [anchor] << CUR
-    {
-      int endIndex = anchor.endIndex;
-      int offset   = previousCursorIndex - endIndex;
-      int index    = endIndex - (numberOfCharacters - offset);
-
-      if(index < endIndex)
-      {
-        endIndex = index;
-      }
-
-      if((int)anchor.startIndex >= endIndex)
-      {
-        if(anchor.href)
-        {
-          delete[] anchor.href;
-        }
-        it = logicalModel->mAnchors.Erase(it);
-        continue;
-      }
-      else
-      {
-        anchor.endIndex = endIndex;
-      }
-    }
-    else if(anchor.startIndex >= previousCursorIndex && cursorOffset == -1) // << CUR    [anchor]
-    {
-      anchor.startIndex -= numberOfCharacters;
-      anchor.endIndex -= numberOfCharacters;
-    }
-    else if(anchor.startIndex >= previousCursorIndex && cursorOffset == 0) //    CUR >> [anchor]
-    {
-      int startIndex = anchor.startIndex;
-      int endIndex   = anchor.endIndex;
-      int index      = previousCursorIndex + numberOfCharacters - 1;
-
-      if(startIndex > index)
-      {
-        anchor.startIndex -= numberOfCharacters;
-        anchor.endIndex -= numberOfCharacters;
-      }
-      else if(endIndex > index + 1)
-      {
-        anchor.endIndex -= numberOfCharacters;
-      }
-      else
-      {
-        if(anchor.href)
-        {
-          delete[] anchor.href;
-        }
-        it = logicalModel->mAnchors.Erase(it);
-        continue;
-      }
-    }
-    else if(cursorOffset == -1) // [<< CUR]
-    {
-      int startIndex = anchor.startIndex;
-      int index      = previousCursorIndex - numberOfCharacters;
-
-      if(startIndex >= index)
-      {
-        anchor.startIndex = index;
-      }
-      anchor.endIndex -= numberOfCharacters;
-    }
-    else if(cursorOffset == 0) // [CUR >>]
-    {
-      anchor.endIndex -= numberOfCharacters;
-    }
-    else
-    {
-      // When this condition is reached, someting is wrong.
-      DALI_LOG_ERROR("Controller::RemoveTextAnchor[%p] Invaild state cursorOffset[%d]\n", &controller, cursorOffset);
-    }
-
-    DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveTextAnchor[%p] Anchor[%s] start[%d] end[%d]\n", &controller, anchor.href, anchor.startIndex, anchor.endIndex);
-
-    it++;
-  }
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller-text-updater.h b/dali-toolkit/internal/text/text-controller-text-updater.h
deleted file mode 100644
index f512940..0000000
--- a/dali-toolkit/internal/text/text-controller-text-updater.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_UPDATER_H
-#define DALI_TOOLKIT_TEXT_UPDATER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-/**
- * @brief Methods that update the text
- */
-struct Controller::TextUpdater
-{
-  /// @copydoc Text::Contoller::SetText
-  /// @param[in] controller The controller
-  static void SetText(Controller& controller, const std::string& text);
-
-  /// @copydoc Text::Contoller::InsertText
-  /// @param[in] controller The controller
-  static void InsertText(Controller& controller, const std::string& text, Controller::InsertType type);
-
-  /// @copydoc Text::Contoller::PasteText
-  /// @param[in] controller The controller
-  static void PasteText(Controller& controller, const std::string& stringToPaste);
-
-  /// @copydoc Text::Contoller::RemoveText
-  /// @param[in] controller The controller
-  static bool RemoveText(Controller& controller, int cursorOffset, int numberOfCharacters, UpdateInputStyleType type);
-
-  /// @copydoc Text::Contoller::RemoveSelectedText
-  /// @param[in] controller The controller
-  static bool RemoveSelectedText(Controller& controller);
-
-  /// @copydoc Text::Contoller::ResetText
-  /// @param[in] controller The controller
-  static void ResetText(Controller& controller);
-
-  /// @copydoc Text::Contoller::InsertTextAnchor
-  /// @param[in] controller The controller
-  static void InsertTextAnchor(Controller& controller, int numberOfCharacters, CharacterIndex previousCursorIndex);
-
-  /// @copydoc Text::Contoller::RemoveTextAnchor
-  /// @param[in] controller The controller
-  static void RemoveTextAnchor(Controller& controller, int cursorOffset, int numberOfCharacters, CharacterIndex previousCursorIndex);
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_UPDATER_H
diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
deleted file mode 100644
index 30c6e04..0000000
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ /dev/null
@@ -1,2288 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/text/text-controller.h>
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
-#include <dali/devel-api/adaptor-framework/window-devel.h>
-#include <dali/integration-api/debug.h>
-#include <memory.h>
-#include <cmath>
-#include <limits>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
-#include <dali-toolkit/internal/text/text-controller-event-handler.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
-#include <dali-toolkit/internal/text/text-controller-input-font-handler.h>
-#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
-#include <dali-toolkit/internal/text/text-controller-relayouter.h>
-#include <dali-toolkit/internal/text/text-controller-text-updater.h>
-#include <dali-toolkit/internal/text/text-editable-control-interface.h>
-
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
-#endif
-
-constexpr float MAX_FLOAT = std::numeric_limits<float>::max();
-
-const std::string EMPTY_STRING("");
-
-int ConvertPixelToPint(float pixel)
-{
-  unsigned int                      horizontalDpi = 0u;
-  unsigned int                      verticalDpi   = 0u;
-  Dali::TextAbstraction::FontClient fontClient    = Dali::TextAbstraction::FontClient::Get();
-  fontClient.GetDpi(horizontalDpi, verticalDpi);
-
-  return (pixel * 72.f) / static_cast<float>(horizontalDpi);
-}
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-// public : Constructor.
-
-ControllerPtr Controller::New()
-{
-  return ControllerPtr(new Controller());
-}
-
-ControllerPtr Controller::New(ControlInterface* controlInterface)
-{
-  return ControllerPtr(new Controller(controlInterface));
-}
-
-ControllerPtr Controller::New(ControlInterface*           controlInterface,
-                              EditableControlInterface*   editableControlInterface,
-                              SelectableControlInterface* selectableControlInterface,
-                              AnchorControlInterface*     anchorControlInterface)
-{
-  return ControllerPtr(new Controller(controlInterface,
-                                      editableControlInterface,
-                                      selectableControlInterface,
-                                      anchorControlInterface));
-}
-
-// public : Configure the text controller.
-
-void Controller::EnableTextInput(DecoratorPtr decorator, InputMethodContext& inputMethodContext)
-{
-  if(!decorator)
-  {
-    delete mImpl->mEventData;
-    mImpl->mEventData = NULL;
-
-    // Nothing else to do.
-    return;
-  }
-
-  if(NULL == mImpl->mEventData)
-  {
-    mImpl->mEventData = new EventData(decorator, inputMethodContext);
-  }
-}
-
-void Controller::SetGlyphType(TextAbstraction::GlyphType glyphType)
-{
-  // Metrics for bitmap & vector based glyphs are different
-  mImpl->mMetrics->SetGlyphType(glyphType);
-
-  // Clear the font-specific data
-  ClearFontData();
-
-  mImpl->RequestRelayout();
-}
-
-void Controller::SetMarkupProcessorEnabled(bool enable)
-{
-  if(enable != mImpl->mMarkupProcessorEnabled)
-  {
-    //If Text was already set, call the SetText again for enabling or disabling markup
-    mImpl->mMarkupProcessorEnabled = enable;
-    std::string text;
-    GetText(text);
-    SetText(text);
-  }
-
-  mImpl->mModel->mVisualModel->SetMarkupProcessorEnabled(enable);
-}
-
-bool Controller::IsMarkupProcessorEnabled() const
-{
-  return mImpl->mMarkupProcessorEnabled;
-}
-
-bool Controller::HasAnchors() const
-{
-  return (mImpl->mMarkupProcessorEnabled && mImpl->mModel->mLogicalModel->mAnchors.Count() && mImpl->IsShowingRealText());
-}
-
-void Controller::SetAutoScrollEnabled(bool enable)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable) ? "true" : "false", (mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX) ? "true" : "false", this);
-
-  if(mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX)
-  {
-    if(enable)
-    {
-      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled for SINGLE_LINE_BOX\n");
-      mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending |
-                                                              LAYOUT |
-                                                              ALIGN |
-                                                              UPDATE_LAYOUT_SIZE |
-                                                              UPDATE_DIRECTION |
-                                                              REORDER);
-    }
-    else
-    {
-      DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled Disabling autoscroll\n");
-      mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending |
-                                                              LAYOUT |
-                                                              ALIGN |
-                                                              UPDATE_LAYOUT_SIZE |
-                                                              REORDER);
-    }
-
-    mImpl->mIsAutoScrollEnabled = enable;
-    mImpl->RequestRelayout();
-  }
-  else
-  {
-    DALI_LOG_WARNING("Attempted AutoScrolling on a non SINGLE_LINE_BOX, request ignored\n");
-    mImpl->mIsAutoScrollEnabled = false;
-  }
-}
-
-bool Controller::IsAutoScrollEnabled() const
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", mImpl->mIsAutoScrollEnabled ? "true" : "false");
-
-  return mImpl->mIsAutoScrollEnabled;
-}
-
-CharacterDirection Controller::GetAutoScrollDirection() const
-{
-  return mImpl->mIsTextDirectionRTL;
-}
-
-float Controller::GetAutoScrollLineAlignment() const
-{
-  float offset = 0.f;
-
-  if(mImpl->mModel->mVisualModel &&
-     (0u != mImpl->mModel->mVisualModel->mLines.Count()))
-  {
-    offset = (*mImpl->mModel->mVisualModel->mLines.Begin()).alignmentOffset;
-  }
-
-  return offset;
-}
-
-void Controller::SetHorizontalScrollEnabled(bool enable)
-{
-  if((NULL != mImpl->mEventData) &&
-     mImpl->mEventData->mDecorator)
-  {
-    mImpl->mEventData->mDecorator->SetHorizontalScrollEnabled(enable);
-  }
-}
-bool Controller::IsHorizontalScrollEnabled() const
-{
-  if((NULL != mImpl->mEventData) &&
-     mImpl->mEventData->mDecorator)
-  {
-    return mImpl->mEventData->mDecorator->IsHorizontalScrollEnabled();
-  }
-
-  return false;
-}
-
-void Controller::SetVerticalScrollEnabled(bool enable)
-{
-  if((NULL != mImpl->mEventData) &&
-     mImpl->mEventData->mDecorator)
-  {
-    if(mImpl->mEventData->mDecorator)
-    {
-      mImpl->mEventData->mDecorator->SetVerticalScrollEnabled(enable);
-    }
-  }
-}
-
-bool Controller::IsVerticalScrollEnabled() const
-{
-  if((NULL != mImpl->mEventData) &&
-     mImpl->mEventData->mDecorator)
-  {
-    return mImpl->mEventData->mDecorator->IsVerticalScrollEnabled();
-  }
-
-  return false;
-}
-
-void Controller::SetSmoothHandlePanEnabled(bool enable)
-{
-  if((NULL != mImpl->mEventData) &&
-     mImpl->mEventData->mDecorator)
-  {
-    mImpl->mEventData->mDecorator->SetSmoothHandlePanEnabled(enable);
-  }
-}
-
-bool Controller::IsSmoothHandlePanEnabled() const
-{
-  if((NULL != mImpl->mEventData) &&
-     mImpl->mEventData->mDecorator)
-  {
-    return mImpl->mEventData->mDecorator->IsSmoothHandlePanEnabled();
-  }
-
-  return false;
-}
-
-void Controller::SetMaximumNumberOfCharacters(Length maxCharacters)
-{
-  mImpl->mMaximumNumberOfCharacters = maxCharacters;
-}
-
-int Controller::GetMaximumNumberOfCharacters()
-{
-  return mImpl->mMaximumNumberOfCharacters;
-}
-
-void Controller::SetEnableCursorBlink(bool enable)
-{
-  DALI_ASSERT_DEBUG(NULL != mImpl->mEventData && "TextInput disabled");
-
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mCursorBlinkEnabled = enable;
-
-    if(!enable &&
-       mImpl->mEventData->mDecorator)
-    {
-      mImpl->mEventData->mDecorator->StopCursorBlink();
-    }
-  }
-}
-
-bool Controller::GetEnableCursorBlink() const
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mCursorBlinkEnabled;
-  }
-
-  return false;
-}
-
-void Controller::SetMultiLineEnabled(bool enable)
-{
-  const Layout::Engine::Type layout = enable ? Layout::Engine::MULTI_LINE_BOX : Layout::Engine::SINGLE_LINE_BOX;
-
-  if(layout != mImpl->mLayoutEngine.GetLayout())
-  {
-    // Set the layout type.
-    mImpl->mLayoutEngine.SetLayout(layout);
-
-    // Set the flags to redo the layout operations
-    const OperationsMask layoutOperations = static_cast<OperationsMask>(LAYOUT |
-                                                                        UPDATE_LAYOUT_SIZE |
-                                                                        ALIGN |
-                                                                        REORDER);
-
-    mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true;
-    mImpl->mOperationsPending                  = static_cast<OperationsMask>(mImpl->mOperationsPending | layoutOperations);
-
-    // Need to recalculate natural size
-    mImpl->mRecalculateNaturalSize = true;
-
-    mImpl->RequestRelayout();
-  }
-}
-
-bool Controller::IsMultiLineEnabled() const
-{
-  return Layout::Engine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout();
-}
-
-void Controller::SetHorizontalAlignment(Text::HorizontalAlignment::Type alignment)
-{
-  if(alignment != mImpl->mModel->mHorizontalAlignment)
-  {
-    // Set the alignment.
-    mImpl->mModel->mHorizontalAlignment = alignment;
-
-    // Set the flag to redo the alignment operation.
-    mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending | ALIGN);
-
-    if(mImpl->mEventData)
-    {
-      mImpl->mEventData->mUpdateAlignment = true;
-
-      // Update the cursor if it's in editing mode
-      if(EventData::IsEditingState(mImpl->mEventData->mState))
-      {
-        mImpl->ChangeState(EventData::EDITING);
-        mImpl->mEventData->mUpdateCursorPosition = true;
-      }
-    }
-
-    mImpl->RequestRelayout();
-  }
-}
-
-Text::HorizontalAlignment::Type Controller::GetHorizontalAlignment() const
-{
-  return mImpl->mModel->mHorizontalAlignment;
-}
-
-void Controller::SetVerticalAlignment(VerticalAlignment::Type alignment)
-{
-  if(alignment != mImpl->mModel->mVerticalAlignment)
-  {
-    // Set the alignment.
-    mImpl->mModel->mVerticalAlignment = alignment;
-
-    mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending | ALIGN);
-
-    mImpl->RequestRelayout();
-  }
-}
-
-VerticalAlignment::Type Controller::GetVerticalAlignment() const
-{
-  return mImpl->mModel->mVerticalAlignment;
-}
-
-bool Controller::IsIgnoreSpacesAfterText() const
-{
-  return mImpl->mModel->mIgnoreSpacesAfterText;
-}
-
-void Controller::SetIgnoreSpacesAfterText(bool ignore)
-{
-  mImpl->mModel->mIgnoreSpacesAfterText = ignore;
-}
-
-void Controller::ChangedLayoutDirection()
-{
-  mImpl->mIsLayoutDirectionChanged = true;
-}
-
-void Controller::SetMatchLayoutDirection(DevelText::MatchLayoutDirection type)
-{
-  mImpl->mModel->mMatchLayoutDirection = type;
-}
-
-DevelText::MatchLayoutDirection Controller::GetMatchLayoutDirection() const
-{
-  return mImpl->mModel->mMatchLayoutDirection;
-}
-
-void Controller::SetLayoutDirection(Dali::LayoutDirection::Type layoutDirection)
-{
-  mImpl->mLayoutDirection = layoutDirection;
-}
-
-Dali::LayoutDirection::Type Controller::GetLayoutDirection(Dali::Actor& actor) const
-{
-  if(mImpl->mModel->mMatchLayoutDirection == DevelText::MatchLayoutDirection::LOCALE ||
-     (mImpl->mModel->mMatchLayoutDirection == DevelText::MatchLayoutDirection::INHERIT && !mImpl->mIsLayoutDirectionChanged))
-  {
-    return static_cast<Dali::LayoutDirection::Type>(DevelWindow::Get(actor).GetRootLayer().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
-  }
-  else
-  {
-    return static_cast<Dali::LayoutDirection::Type>(actor.GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
-  }
-}
-
-bool Controller::IsShowingRealText() const
-{
-  return mImpl->IsShowingRealText();
-}
-
-void Controller::SetLineWrapMode(Text::LineWrap::Mode lineWrapMode)
-{
-  if(lineWrapMode != mImpl->mModel->mLineWrapMode)
-  {
-    // Update Text layout for applying wrap mode
-    mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending |
-                                                            ALIGN |
-                                                            LAYOUT |
-                                                            UPDATE_LAYOUT_SIZE |
-                                                            REORDER);
-
-    if((mImpl->mModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) || (lineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) ||
-       (mImpl->mModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::MIXED) || (lineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::MIXED)) // hyphen is treated as line break
-    {
-      mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending | GET_LINE_BREAKS);
-    }
-
-    // Set the text wrap mode.
-    mImpl->mModel->mLineWrapMode = lineWrapMode;
-
-    mImpl->mTextUpdateInfo.mCharacterIndex             = 0u;
-    mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-    mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = mImpl->mModel->mLogicalModel->mText.Count();
-
-    // Request relayout
-    mImpl->RequestRelayout();
-  }
-}
-
-Text::LineWrap::Mode Controller::GetLineWrapMode() const
-{
-  return mImpl->mModel->mLineWrapMode;
-}
-
-void Controller::SetTextElideEnabled(bool enabled)
-{
-  mImpl->mModel->mElideEnabled = enabled;
-  mImpl->mModel->mVisualModel->SetTextElideEnabled(enabled);
-}
-
-bool Controller::IsTextElideEnabled() const
-{
-  return mImpl->mModel->mElideEnabled;
-}
-
-void Controller::SetTextFitEnabled(bool enabled)
-{
-  mImpl->mTextFitEnabled = enabled;
-}
-
-bool Controller::IsTextFitEnabled() const
-{
-  return mImpl->mTextFitEnabled;
-}
-
-void Controller::SetTextFitMinSize(float minSize, FontSizeType type)
-{
-  switch(type)
-  {
-    case POINT_SIZE:
-    {
-      mImpl->mTextFitMinSize = minSize;
-      break;
-    }
-    case PIXEL_SIZE:
-    {
-      mImpl->mTextFitMinSize = ConvertPixelToPint(minSize);
-      break;
-    }
-  }
-}
-
-float Controller::GetTextFitMinSize() const
-{
-  return mImpl->mTextFitMinSize;
-}
-
-void Controller::SetTextFitMaxSize(float maxSize, FontSizeType type)
-{
-  switch(type)
-  {
-    case POINT_SIZE:
-    {
-      mImpl->mTextFitMaxSize = maxSize;
-      break;
-    }
-    case PIXEL_SIZE:
-    {
-      mImpl->mTextFitMaxSize = ConvertPixelToPint(maxSize);
-      break;
-    }
-  }
-}
-
-float Controller::GetTextFitMaxSize() const
-{
-  return mImpl->mTextFitMaxSize;
-}
-
-void Controller::SetTextFitStepSize(float step, FontSizeType type)
-{
-  switch(type)
-  {
-    case POINT_SIZE:
-    {
-      mImpl->mTextFitStepSize = step;
-      break;
-    }
-    case PIXEL_SIZE:
-    {
-      mImpl->mTextFitStepSize = ConvertPixelToPint(step);
-      break;
-    }
-  }
-}
-
-float Controller::GetTextFitStepSize() const
-{
-  return mImpl->mTextFitStepSize;
-}
-
-void Controller::SetTextFitContentSize(Vector2 size)
-{
-  mImpl->mTextFitContentSize = size;
-}
-
-Vector2 Controller::GetTextFitContentSize() const
-{
-  return mImpl->mTextFitContentSize;
-}
-
-void Controller::SetPlaceholderTextElideEnabled(bool enabled)
-{
-  PlaceholderHandler::SetPlaceholderTextElideEnabled(*this, enabled);
-}
-
-bool Controller::IsPlaceholderTextElideEnabled() const
-{
-  return PlaceholderHandler::IsPlaceholderTextElideEnabled(*this);
-}
-
-void Controller::SetSelectionEnabled(bool enabled)
-{
-  mImpl->mEventData->mSelectionEnabled = enabled;
-}
-
-bool Controller::IsSelectionEnabled() const
-{
-  return mImpl->mEventData->mSelectionEnabled;
-}
-
-void Controller::SetShiftSelectionEnabled(bool enabled)
-{
-  mImpl->mEventData->mShiftSelectionFlag = enabled;
-}
-
-bool Controller::IsShiftSelectionEnabled() const
-{
-  return mImpl->mEventData->mShiftSelectionFlag;
-}
-
-void Controller::SetGrabHandleEnabled(bool enabled)
-{
-  mImpl->mEventData->mGrabHandleEnabled = enabled;
-}
-
-bool Controller::IsGrabHandleEnabled() const
-{
-  return mImpl->mEventData->mGrabHandleEnabled;
-}
-
-void Controller::SetGrabHandlePopupEnabled(bool enabled)
-{
-  mImpl->mEventData->mGrabHandlePopupEnabled = enabled;
-}
-
-bool Controller::IsGrabHandlePopupEnabled() const
-{
-  return mImpl->mEventData->mGrabHandlePopupEnabled;
-}
-
-// public : Update
-
-void Controller::SetText(const std::string& text)
-{
-  TextUpdater::SetText(*this, text);
-}
-
-void Controller::GetText(std::string& text) const
-{
-  if(!mImpl->IsShowingPlaceholderText())
-  {
-    // Retrieves the text string.
-    mImpl->GetText(0u, text);
-  }
-  else
-  {
-    DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::GetText %p empty (but showing placeholder)\n", this);
-  }
-}
-
-void Controller::SetPlaceholderText(PlaceholderType type, const std::string& text)
-{
-  PlaceholderHandler::SetPlaceholderText(*this, type, text);
-}
-
-void Controller::GetPlaceholderText(PlaceholderType type, std::string& text) const
-{
-  PlaceholderHandler::GetPlaceholderText(*this, type, text);
-}
-
-void Controller::UpdateAfterFontChange(const std::string& newDefaultFont)
-{
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange\n");
-
-  if(!mImpl->mFontDefaults->familyDefined) // If user defined font then should not update when system font changes
-  {
-    DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str());
-    mImpl->mFontDefaults->mFontDescription.family = newDefaultFont;
-
-    ClearFontData();
-
-    mImpl->RequestRelayout();
-  }
-}
-
-void Controller::RetrieveSelection(std::string& selectedText) const
-{
-  mImpl->RetrieveSelection(selectedText, false);
-}
-
-void Controller::SetSelection(int start, int end)
-{
-  mImpl->SetSelection(start, end);
-}
-
-std::pair<int, int> Controller::GetSelectionIndexes() const
-{
-  return mImpl->GetSelectionIndexes();
-}
-
-void Controller::CopyStringToClipboard(const std::string& source)
-{
-  mImpl->CopyStringToClipboard(source);
-}
-
-void Controller::SendSelectionToClipboard(bool deleteAfterSending)
-{
-  mImpl->SendSelectionToClipboard(deleteAfterSending);
-}
-
-// public : Default style & Input style
-
-void Controller::SetDefaultFontFamily(const std::string& defaultFontFamily)
-{
-  if(NULL == mImpl->mFontDefaults)
-  {
-    mImpl->mFontDefaults = new FontDefaults();
-  }
-
-  mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily;
-  DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str());
-  mImpl->mFontDefaults->familyDefined = !defaultFontFamily.empty();
-
-  if(mImpl->mEventData)
-  {
-    // Update the cursor position if it's in editing mode
-    if(EventData::IsEditingState(mImpl->mEventData->mState))
-    {
-      mImpl->mEventData->mDecoratorUpdated     = true;
-      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font family is updated.
-    }
-  }
-
-  // Clear the font-specific data
-  ClearFontData();
-
-  mImpl->RequestRelayout();
-}
-
-const std::string& Controller::GetDefaultFontFamily() const
-{
-  if(NULL != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontDefaults->mFontDescription.family;
-  }
-
-  return EMPTY_STRING;
-}
-
-void Controller::SetPlaceholderFontFamily(const std::string& placeholderTextFontFamily)
-{
-  PlaceholderHandler::SetPlaceholderFontFamily(*this, placeholderTextFontFamily);
-}
-
-const std::string& Controller::GetPlaceholderFontFamily() const
-{
-  return PlaceholderHandler::GetPlaceholderFontFamily(*this);
-}
-
-void Controller::SetDefaultFontWeight(FontWeight weight)
-{
-  if(NULL == mImpl->mFontDefaults)
-  {
-    mImpl->mFontDefaults = new FontDefaults();
-  }
-
-  mImpl->mFontDefaults->mFontDescription.weight = weight;
-  mImpl->mFontDefaults->weightDefined           = true;
-
-  if(mImpl->mEventData)
-  {
-    // Update the cursor position if it's in editing mode
-    if(EventData::IsEditingState(mImpl->mEventData->mState))
-    {
-      mImpl->mEventData->mDecoratorUpdated     = true;
-      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font weight is updated.
-    }
-  }
-
-  // Clear the font-specific data
-  ClearFontData();
-
-  mImpl->RequestRelayout();
-}
-
-bool Controller::IsDefaultFontWeightDefined() const
-{
-  if(NULL != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontDefaults->weightDefined;
-  }
-
-  return false;
-}
-
-FontWeight Controller::GetDefaultFontWeight() const
-{
-  if(NULL != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontDefaults->mFontDescription.weight;
-  }
-
-  return TextAbstraction::FontWeight::NORMAL;
-}
-
-void Controller::SetPlaceholderTextFontWeight(FontWeight weight)
-{
-  PlaceholderHandler::SetPlaceholderTextFontWeight(*this, weight);
-}
-
-bool Controller::IsPlaceholderTextFontWeightDefined() const
-{
-  return PlaceholderHandler::IsPlaceholderTextFontWeightDefined(*this);
-  ;
-}
-
-FontWeight Controller::GetPlaceholderTextFontWeight() const
-{
-  return PlaceholderHandler::GetPlaceholderTextFontWeight(*this);
-}
-
-void Controller::SetDefaultFontWidth(FontWidth width)
-{
-  if(NULL == mImpl->mFontDefaults)
-  {
-    mImpl->mFontDefaults = new FontDefaults();
-  }
-
-  mImpl->mFontDefaults->mFontDescription.width = width;
-  mImpl->mFontDefaults->widthDefined           = true;
-
-  if(mImpl->mEventData)
-  {
-    // Update the cursor position if it's in editing mode
-    if(EventData::IsEditingState(mImpl->mEventData->mState))
-    {
-      mImpl->mEventData->mDecoratorUpdated     = true;
-      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font width is updated.
-    }
-  }
-
-  // Clear the font-specific data
-  ClearFontData();
-
-  mImpl->RequestRelayout();
-}
-
-bool Controller::IsDefaultFontWidthDefined() const
-{
-  if(NULL != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontDefaults->widthDefined;
-  }
-
-  return false;
-}
-
-FontWidth Controller::GetDefaultFontWidth() const
-{
-  if(NULL != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontDefaults->mFontDescription.width;
-  }
-
-  return TextAbstraction::FontWidth::NORMAL;
-}
-
-void Controller::SetPlaceholderTextFontWidth(FontWidth width)
-{
-  PlaceholderHandler::SetPlaceholderTextFontWidth(*this, width);
-}
-
-bool Controller::IsPlaceholderTextFontWidthDefined() const
-{
-  return PlaceholderHandler::IsPlaceholderTextFontWidthDefined(*this);
-}
-
-FontWidth Controller::GetPlaceholderTextFontWidth() const
-{
-  return PlaceholderHandler::GetPlaceholderTextFontWidth(*this);
-}
-
-void Controller::SetDefaultFontSlant(FontSlant slant)
-{
-  if(NULL == mImpl->mFontDefaults)
-  {
-    mImpl->mFontDefaults = new FontDefaults();
-  }
-
-  mImpl->mFontDefaults->mFontDescription.slant = slant;
-  mImpl->mFontDefaults->slantDefined           = true;
-
-  if(mImpl->mEventData)
-  {
-    // Update the cursor position if it's in editing mode
-    if(EventData::IsEditingState(mImpl->mEventData->mState))
-    {
-      mImpl->mEventData->mDecoratorUpdated     = true;
-      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font slant is updated.
-    }
-  }
-
-  // Clear the font-specific data
-  ClearFontData();
-
-  mImpl->RequestRelayout();
-}
-
-bool Controller::IsDefaultFontSlantDefined() const
-{
-  if(NULL != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontDefaults->slantDefined;
-  }
-  return false;
-}
-
-FontSlant Controller::GetDefaultFontSlant() const
-{
-  if(NULL != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontDefaults->mFontDescription.slant;
-  }
-
-  return TextAbstraction::FontSlant::NORMAL;
-}
-
-void Controller::SetPlaceholderTextFontSlant(FontSlant slant)
-{
-  PlaceholderHandler::SetPlaceholderTextFontSlant(*this, slant);
-}
-
-bool Controller::IsPlaceholderTextFontSlantDefined() const
-{
-  return PlaceholderHandler::IsPlaceholderTextFontSlantDefined(*this);
-}
-
-FontSlant Controller::GetPlaceholderTextFontSlant() const
-{
-  return PlaceholderHandler::GetPlaceholderTextFontSlant(*this);
-}
-
-void Controller::SetFontSizeScale(float scale)
-{
-  mImpl->mFontSizeScale = scale;
-
-  if(mImpl->mEventData)
-  {
-    // Update the cursor position if it's in editing mode
-    if(EventData::IsEditingState(mImpl->mEventData->mState))
-    {
-      mImpl->mEventData->mDecoratorUpdated     = true;
-      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font size is updated.
-    }
-  }
-
-  // Clear the font-specific data
-  ClearFontData();
-
-  mImpl->RequestRelayout();
-}
-
-float Controller::GetFontSizeScale() const
-{
-  if(nullptr != mImpl->mFontDefaults)
-  {
-    return mImpl->mFontSizeScale;
-  }
-
-  return 1.f;
-}
-
-void Controller::SetDefaultFontSize(float fontSize, FontSizeType type)
-{
-  if(NULL == mImpl->mFontDefaults)
-  {
-    mImpl->mFontDefaults = new FontDefaults();
-  }
-
-  switch(type)
-  {
-    case POINT_SIZE:
-    {
-      mImpl->mFontDefaults->mDefaultPointSize = fontSize;
-      mImpl->mFontDefaults->sizeDefined       = true;
-      break;
-    }
-    case PIXEL_SIZE:
-    {
-      // Point size = Pixel size * 72.f / DPI
-      unsigned int                horizontalDpi = 0u;
-      unsigned int                verticalDpi   = 0u;
-      TextAbstraction::FontClient fontClient    = TextAbstraction::FontClient::Get();
-      fontClient.GetDpi(horizontalDpi, verticalDpi);
-
-      mImpl->mFontDefaults->mDefaultPointSize = (fontSize * 72.f) / static_cast<float>(horizontalDpi);
-      mImpl->mFontDefaults->sizeDefined       = true;
-      break;
-    }
-  }
-
-  if(mImpl->mEventData)
-  {
-    // Update the cursor position if it's in editing mode
-    if(EventData::IsEditingState(mImpl->mEventData->mState))
-    {
-      mImpl->mEventData->mDecoratorUpdated     = true;
-      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font size is updated.
-    }
-  }
-
-  // Clear the font-specific data
-  ClearFontData();
-
-  mImpl->RequestRelayout();
-}
-
-float Controller::GetDefaultFontSize(FontSizeType type) const
-{
-  float value = 0.0f;
-  if(NULL != mImpl->mFontDefaults)
-  {
-    switch(type)
-    {
-      case POINT_SIZE:
-      {
-        value = mImpl->mFontDefaults->mDefaultPointSize;
-        break;
-      }
-      case PIXEL_SIZE:
-      {
-        // Pixel size = Point size * DPI / 72.f
-        unsigned int                horizontalDpi = 0u;
-        unsigned int                verticalDpi   = 0u;
-        TextAbstraction::FontClient fontClient    = TextAbstraction::FontClient::Get();
-        fontClient.GetDpi(horizontalDpi, verticalDpi);
-
-        value = mImpl->mFontDefaults->mDefaultPointSize * static_cast<float>(horizontalDpi) / 72.f;
-        break;
-      }
-    }
-    return value;
-  }
-
-  return value;
-}
-
-void Controller::SetPlaceholderTextFontSize(float fontSize, FontSizeType type)
-{
-  PlaceholderHandler::SetPlaceholderTextFontSize(*this, fontSize, type);
-}
-
-float Controller::GetPlaceholderTextFontSize(FontSizeType type) const
-{
-  return PlaceholderHandler::GetPlaceholderTextFontSize(*this, type);
-}
-
-void Controller::SetDefaultColor(const Vector4& color)
-{
-  mImpl->mTextColor = color;
-
-  if(!mImpl->IsShowingPlaceholderText())
-  {
-    mImpl->mModel->mVisualModel->SetTextColor(color);
-
-    mImpl->mModel->mLogicalModel->mColorRuns.Clear();
-
-    mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending | COLOR);
-
-    mImpl->RequestRelayout();
-  }
-}
-
-const Vector4& Controller::GetDefaultColor() const
-{
-  return mImpl->mTextColor;
-}
-
-void Controller::SetPlaceholderTextColor(const Vector4& textColor)
-{
-  PlaceholderHandler::SetPlaceholderTextColor(*this, textColor);
-}
-
-const Vector4& Controller::GetPlaceholderTextColor() const
-{
-  return PlaceholderHandler::GetPlaceholderTextColor(*this);
-}
-
-void Controller::SetShadowOffset(const Vector2& shadowOffset)
-{
-  mImpl->mModel->mVisualModel->SetShadowOffset(shadowOffset);
-
-  mImpl->RequestRelayout();
-}
-
-const Vector2& Controller::GetShadowOffset() const
-{
-  return mImpl->mModel->mVisualModel->GetShadowOffset();
-}
-
-void Controller::SetShadowColor(const Vector4& shadowColor)
-{
-  mImpl->mModel->mVisualModel->SetShadowColor(shadowColor);
-
-  mImpl->RequestRelayout();
-}
-
-const Vector4& Controller::GetShadowColor() const
-{
-  return mImpl->mModel->mVisualModel->GetShadowColor();
-}
-
-void Controller::SetShadowBlurRadius(const float& shadowBlurRadius)
-{
-  if(fabsf(GetShadowBlurRadius() - shadowBlurRadius) > Math::MACHINE_EPSILON_1)
-  {
-    mImpl->mModel->mVisualModel->SetShadowBlurRadius(shadowBlurRadius);
-
-    mImpl->RequestRelayout();
-  }
-}
-
-const float& Controller::GetShadowBlurRadius() const
-{
-  return mImpl->mModel->mVisualModel->GetShadowBlurRadius();
-}
-
-void Controller::SetUnderlineColor(const Vector4& color)
-{
-  mImpl->mModel->mVisualModel->SetUnderlineColor(color);
-
-  mImpl->RequestRelayout();
-}
-
-const Vector4& Controller::GetUnderlineColor() const
-{
-  return mImpl->mModel->mVisualModel->GetUnderlineColor();
-}
-
-void Controller::SetUnderlineEnabled(bool enabled)
-{
-  mImpl->mModel->mVisualModel->SetUnderlineEnabled(enabled);
-
-  mImpl->RequestRelayout();
-}
-
-bool Controller::IsUnderlineEnabled() const
-{
-  return mImpl->mModel->mVisualModel->IsUnderlineEnabled();
-}
-
-void Controller::SetUnderlineHeight(float height)
-{
-  mImpl->mModel->mVisualModel->SetUnderlineHeight(height);
-
-  mImpl->RequestRelayout();
-}
-
-float Controller::GetUnderlineHeight() const
-{
-  return mImpl->mModel->mVisualModel->GetUnderlineHeight();
-}
-
-void Controller::SetOutlineColor(const Vector4& color)
-{
-  mImpl->mModel->mVisualModel->SetOutlineColor(color);
-
-  mImpl->RequestRelayout();
-}
-
-const Vector4& Controller::GetOutlineColor() const
-{
-  return mImpl->mModel->mVisualModel->GetOutlineColor();
-}
-
-void Controller::SetOutlineWidth(uint16_t width)
-{
-  mImpl->mModel->mVisualModel->SetOutlineWidth(width);
-
-  mImpl->RequestRelayout();
-}
-
-uint16_t Controller::GetOutlineWidth() const
-{
-  return mImpl->mModel->mVisualModel->GetOutlineWidth();
-}
-
-void Controller::SetBackgroundColor(const Vector4& color)
-{
-  mImpl->mModel->mVisualModel->SetBackgroundColor(color);
-
-  mImpl->RequestRelayout();
-}
-
-const Vector4& Controller::GetBackgroundColor() const
-{
-  return mImpl->mModel->mVisualModel->GetBackgroundColor();
-}
-
-void Controller::SetBackgroundEnabled(bool enabled)
-{
-  mImpl->mModel->mVisualModel->SetBackgroundEnabled(enabled);
-
-  mImpl->RequestRelayout();
-}
-
-bool Controller::IsBackgroundEnabled() const
-{
-  return mImpl->mModel->mVisualModel->IsBackgroundEnabled();
-}
-
-void Controller::SetDefaultEmbossProperties(const std::string& embossProperties)
-{
-  if(NULL == mImpl->mEmbossDefaults)
-  {
-    mImpl->mEmbossDefaults = new EmbossDefaults();
-  }
-
-  mImpl->mEmbossDefaults->properties = embossProperties;
-}
-
-const std::string& Controller::GetDefaultEmbossProperties() const
-{
-  if(NULL != mImpl->mEmbossDefaults)
-  {
-    return mImpl->mEmbossDefaults->properties;
-  }
-
-  return EMPTY_STRING;
-}
-
-void Controller::SetDefaultOutlineProperties(const std::string& outlineProperties)
-{
-  if(NULL == mImpl->mOutlineDefaults)
-  {
-    mImpl->mOutlineDefaults = new OutlineDefaults();
-  }
-
-  mImpl->mOutlineDefaults->properties = outlineProperties;
-}
-
-const std::string& Controller::GetDefaultOutlineProperties() const
-{
-  if(NULL != mImpl->mOutlineDefaults)
-  {
-    return mImpl->mOutlineDefaults->properties;
-  }
-
-  return EMPTY_STRING;
-}
-
-void Controller::RelayoutForNewLineSize()
-{
-  // relayout all characters
-  mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
-  mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-  mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = mImpl->mModel->mLogicalModel->mText.Count();
-  mImpl->mOperationsPending                          = static_cast<OperationsMask>(mImpl->mOperationsPending | LAYOUT);
-
-  //remove selection
-  if((mImpl->mEventData != nullptr) && (mImpl->mEventData->mState == EventData::SELECTING))
-  {
-    mImpl->ChangeState(EventData::EDITING);
-  }
-
-  mImpl->RequestRelayout();
-}
-
-bool Controller::SetDefaultLineSpacing(float lineSpacing)
-{
-  if(std::fabs(lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing()) > Math::MACHINE_EPSILON_1000)
-  {
-    mImpl->mLayoutEngine.SetDefaultLineSpacing(lineSpacing);
-    mImpl->mRecalculateNaturalSize = true;
-
-    RelayoutForNewLineSize();
-    return true;
-  }
-  return false;
-}
-
-float Controller::GetDefaultLineSpacing() const
-{
-  return mImpl->mLayoutEngine.GetDefaultLineSpacing();
-}
-
-bool Controller::SetDefaultLineSize(float lineSize)
-{
-  if(std::fabs(lineSize - mImpl->mLayoutEngine.GetDefaultLineSize()) > Math::MACHINE_EPSILON_1000)
-  {
-    mImpl->mLayoutEngine.SetDefaultLineSize(lineSize);
-    mImpl->mRecalculateNaturalSize = true;
-
-    RelayoutForNewLineSize();
-    return true;
-  }
-  return false;
-}
-
-float Controller::GetDefaultLineSize() const
-{
-  return mImpl->mLayoutEngine.GetDefaultLineSize();
-}
-
-void Controller::SetInputColor(const Vector4& color)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mInputStyle.textColor      = color;
-    mImpl->mEventData->mInputStyle.isDefaultColor = false;
-
-    if(EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState)
-    {
-      if(EventData::SELECTING == mImpl->mEventData->mState)
-      {
-        const bool handlesCrossed = mImpl->mEventData->mLeftSelectionPosition > mImpl->mEventData->mRightSelectionPosition;
-
-        // Get start and end position of selection
-        const CharacterIndex startOfSelectedText  = handlesCrossed ? mImpl->mEventData->mRightSelectionPosition : mImpl->mEventData->mLeftSelectionPosition;
-        const Length         lengthOfSelectedText = (handlesCrossed ? mImpl->mEventData->mLeftSelectionPosition : mImpl->mEventData->mRightSelectionPosition) - startOfSelectedText;
-
-        // Add the color run.
-        const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mColorRuns.Count();
-        mImpl->mModel->mLogicalModel->mColorRuns.Resize(numberOfRuns + 1u);
-
-        ColorRun& colorRun                       = *(mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns);
-        colorRun.color                           = color;
-        colorRun.characterRun.characterIndex     = startOfSelectedText;
-        colorRun.characterRun.numberOfCharacters = lengthOfSelectedText;
-
-        mImpl->mTextUpdateInfo.mCharacterIndex             = startOfSelectedText;
-        mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-        mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = lengthOfSelectedText;
-      }
-      else
-      {
-        mImpl->mTextUpdateInfo.mCharacterIndex             = 0;
-        mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-        mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = mImpl->mModel->mLogicalModel->mText.Count();
-      }
-
-      // Request to relayout.
-      mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending | COLOR);
-      mImpl->RequestRelayout();
-    }
-  }
-}
-
-const Vector4& Controller::GetInputColor() const
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mInputStyle.textColor;
-  }
-
-  // Return the default text's color if there is no EventData.
-  return mImpl->mTextColor;
-}
-
-void Controller::SetInputFontFamily(const std::string& fontFamily)
-{
-  InputFontHandler::SetInputFontFamily(*this, fontFamily);
-}
-
-const std::string& Controller::GetInputFontFamily() const
-{
-  return InputFontHandler::GetInputFontFamily(*this);
-}
-
-void Controller::SetInputFontWeight(FontWeight weight)
-{
-  InputFontHandler::SetInputFontWeight(*this, weight);
-}
-
-bool Controller::IsInputFontWeightDefined() const
-{
-  return InputFontHandler::IsInputFontWeightDefined(*this);
-}
-
-FontWeight Controller::GetInputFontWeight() const
-{
-  return InputFontHandler::GetInputFontWeight(*this);
-}
-
-void Controller::SetInputFontWidth(FontWidth width)
-{
-  InputFontHandler::SetInputFontWidth(*this, width);
-}
-
-bool Controller::IsInputFontWidthDefined() const
-{
-  return InputFontHandler::IsInputFontWidthDefined(*this);
-}
-
-FontWidth Controller::GetInputFontWidth() const
-{
-  return InputFontHandler::GetInputFontWidth(*this);
-}
-
-void Controller::SetInputFontSlant(FontSlant slant)
-{
-  InputFontHandler::SetInputFontSlant(*this, slant);
-}
-
-bool Controller::IsInputFontSlantDefined() const
-{
-  return InputFontHandler::IsInputFontSlantDefined(*this);
-}
-
-FontSlant Controller::GetInputFontSlant() const
-{
-  return InputFontHandler::GetInputFontSlant(*this);
-}
-
-void Controller::SetInputFontPointSize(float size)
-{
-  InputFontHandler::SetInputFontPointSize(*this, size);
-}
-
-float Controller::GetInputFontPointSize() const
-{
-  return InputFontHandler::GetInputFontPointSize(*this);
-}
-
-void Controller::SetInputLineSpacing(float lineSpacing)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mInputStyle.lineSpacing          = lineSpacing;
-    mImpl->mEventData->mInputStyle.isLineSpacingDefined = true;
-  }
-}
-
-float Controller::GetInputLineSpacing() const
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mInputStyle.lineSpacing;
-  }
-
-  return 0.f;
-}
-
-void Controller::SetInputShadowProperties(const std::string& shadowProperties)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mInputStyle.shadowProperties = shadowProperties;
-  }
-}
-
-const std::string& Controller::GetInputShadowProperties() const
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mInputStyle.shadowProperties;
-  }
-
-  return EMPTY_STRING;
-}
-
-void Controller::SetInputUnderlineProperties(const std::string& underlineProperties)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mInputStyle.underlineProperties = underlineProperties;
-  }
-}
-
-const std::string& Controller::GetInputUnderlineProperties() const
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mInputStyle.underlineProperties;
-  }
-
-  return EMPTY_STRING;
-}
-
-void Controller::SetInputEmbossProperties(const std::string& embossProperties)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mInputStyle.embossProperties = embossProperties;
-  }
-}
-
-const std::string& Controller::GetInputEmbossProperties() const
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mInputStyle.embossProperties;
-  }
-
-  return GetDefaultEmbossProperties();
-}
-
-void Controller::SetInputOutlineProperties(const std::string& outlineProperties)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mInputStyle.outlineProperties = outlineProperties;
-  }
-}
-
-const std::string& Controller::GetInputOutlineProperties() const
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mInputStyle.outlineProperties;
-  }
-
-  return GetDefaultOutlineProperties();
-}
-
-void Controller::SetInputModePassword(bool passwordInput)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mPasswordInput = passwordInput;
-  }
-}
-
-bool Controller::IsInputModePassword()
-{
-  if(NULL != mImpl->mEventData)
-  {
-    return mImpl->mEventData->mPasswordInput;
-  }
-  return false;
-}
-
-void Controller::SetNoTextDoubleTapAction(NoTextTap::Action action)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mDoubleTapAction = action;
-  }
-}
-
-Controller::NoTextTap::Action Controller::GetNoTextDoubleTapAction() const
-{
-  NoTextTap::Action action = NoTextTap::NO_ACTION;
-
-  if(NULL != mImpl->mEventData)
-  {
-    action = mImpl->mEventData->mDoubleTapAction;
-  }
-
-  return action;
-}
-
-void Controller::SetNoTextLongPressAction(NoTextTap::Action action)
-{
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mLongPressAction = action;
-  }
-}
-
-Controller::NoTextTap::Action Controller::GetNoTextLongPressAction() const
-{
-  NoTextTap::Action action = NoTextTap::NO_ACTION;
-
-  if(NULL != mImpl->mEventData)
-  {
-    action = mImpl->mEventData->mLongPressAction;
-  }
-
-  return action;
-}
-
-bool Controller::IsUnderlineSetByString()
-{
-  return mImpl->mUnderlineSetByString;
-}
-
-void Controller::UnderlineSetByString(bool setByString)
-{
-  mImpl->mUnderlineSetByString = setByString;
-}
-
-bool Controller::IsShadowSetByString()
-{
-  return mImpl->mShadowSetByString;
-}
-
-void Controller::ShadowSetByString(bool setByString)
-{
-  mImpl->mShadowSetByString = setByString;
-}
-
-bool Controller::IsOutlineSetByString()
-{
-  return mImpl->mOutlineSetByString;
-}
-
-void Controller::OutlineSetByString(bool setByString)
-{
-  mImpl->mOutlineSetByString = setByString;
-}
-
-bool Controller::IsFontStyleSetByString()
-{
-  return mImpl->mFontStyleSetByString;
-}
-
-void Controller::FontStyleSetByString(bool setByString)
-{
-  mImpl->mFontStyleSetByString = setByString;
-}
-
-// public : Queries & retrieves.
-
-Layout::Engine& Controller::GetLayoutEngine()
-{
-  return mImpl->mLayoutEngine;
-}
-
-View& Controller::GetView()
-{
-  return mImpl->mView;
-}
-
-Vector3 Controller::GetNaturalSize()
-{
-  return Relayouter::GetNaturalSize(*this);
-}
-
-bool Controller::CheckForTextFit(float pointSize, Size& layoutSize)
-{
-  return Relayouter::CheckForTextFit(*this, pointSize, layoutSize);
-}
-
-void Controller::FitPointSizeforLayout(Size layoutSize)
-{
-  Relayouter::FitPointSizeforLayout(*this, layoutSize);
-}
-
-float Controller::GetHeightForWidth(float width)
-{
-  return Relayouter::GetHeightForWidth(*this, width);
-}
-
-int Controller::GetLineCount(float width)
-{
-  GetHeightForWidth(width);
-  int numberofLines = mImpl->mModel->GetNumberOfLines();
-  return numberofLines;
-}
-
-const ModelInterface* const Controller::GetTextModel() const
-{
-  return mImpl->mModel.Get();
-}
-
-float Controller::GetScrollAmountByUserInput()
-{
-  float scrollAmount = 0.0f;
-
-  if(NULL != mImpl->mEventData && mImpl->mEventData->mCheckScrollAmount)
-  {
-    scrollAmount                          = mImpl->mModel->mScrollPosition.y - mImpl->mModel->mScrollPositionLast.y;
-    mImpl->mEventData->mCheckScrollAmount = false;
-  }
-  return scrollAmount;
-}
-
-bool Controller::GetTextScrollInfo(float& scrollPosition, float& controlHeight, float& layoutHeight)
-{
-  const Vector2& layout = mImpl->mModel->mVisualModel->GetLayoutSize();
-  bool           isScrolled;
-
-  controlHeight  = mImpl->mModel->mVisualModel->mControlSize.height;
-  layoutHeight   = layout.height;
-  scrollPosition = mImpl->mModel->mScrollPosition.y;
-  isScrolled     = !Equals(mImpl->mModel->mScrollPosition.y, mImpl->mModel->mScrollPositionLast.y, Math::MACHINE_EPSILON_1);
-  return isScrolled;
-}
-
-void Controller::SetHiddenInputOption(const Property::Map& options)
-{
-  if(NULL == mImpl->mHiddenInput)
-  {
-    mImpl->mHiddenInput = new HiddenText(this);
-  }
-  mImpl->mHiddenInput->SetProperties(options);
-}
-
-void Controller::GetHiddenInputOption(Property::Map& options)
-{
-  if(NULL != mImpl->mHiddenInput)
-  {
-    mImpl->mHiddenInput->GetProperties(options);
-  }
-}
-
-void Controller::SetInputFilterOption(const Property::Map& options)
-{
-  if(!mImpl->mInputFilter)
-  {
-    mImpl->mInputFilter = std::unique_ptr<InputFilter>(new InputFilter());
-  }
-  mImpl->mInputFilter->SetProperties(options);
-}
-
-void Controller::GetInputFilterOption(Property::Map& options)
-{
-  if(NULL != mImpl->mInputFilter)
-  {
-    mImpl->mInputFilter->GetProperties(options);
-  }
-}
-
-void Controller::SetPlaceholderProperty(const Property::Map& map)
-{
-  PlaceholderHandler::SetPlaceholderProperty(*this, map);
-}
-
-void Controller::GetPlaceholderProperty(Property::Map& map)
-{
-  PlaceholderHandler::GetPlaceholderProperty(*this, map);
-}
-
-Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection()
-{
-  // Make sure the model is up-to-date before layouting
-  ProcessModifyEvents();
-
-  if(mImpl->mUpdateTextDirection)
-  {
-    // Operations that can be done only once until the text changes.
-    const OperationsMask onlyOnceOperations = static_cast<OperationsMask>(CONVERT_TO_UTF32 |
-                                                                          GET_SCRIPTS |
-                                                                          VALIDATE_FONTS |
-                                                                          GET_LINE_BREAKS |
-                                                                          BIDI_INFO |
-                                                                          SHAPE_TEXT |
-                                                                          GET_GLYPH_METRICS);
-
-    // Set the update info to relayout the whole text.
-    mImpl->mTextUpdateInfo.mParagraphCharacterIndex     = 0u;
-    mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count();
-
-    // Make sure the model is up-to-date before layouting
-    mImpl->UpdateModel(onlyOnceOperations);
-
-    Vector3 naturalSize;
-    DoRelayout(Size(MAX_FLOAT, MAX_FLOAT),
-               static_cast<OperationsMask>(onlyOnceOperations |
-                                           LAYOUT | REORDER | UPDATE_DIRECTION),
-               naturalSize.GetVectorXY());
-
-    // Do not do again the only once operations.
-    mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending & ~onlyOnceOperations);
-
-    // Clear the update info. This info will be set the next time the text is updated.
-    mImpl->mTextUpdateInfo.Clear();
-
-    // FullRelayoutNeeded should be true because DoRelayout is MAX_FLOAT, MAX_FLOAT.
-    mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true;
-
-    mImpl->mUpdateTextDirection = false;
-  }
-
-  return mImpl->mIsTextDirectionRTL ? Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT : Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT;
-}
-
-Toolkit::DevelText::VerticalLineAlignment::Type Controller::GetVerticalLineAlignment() const
-{
-  return mImpl->mModel->GetVerticalLineAlignment();
-}
-
-void Controller::SetVerticalLineAlignment(Toolkit::DevelText::VerticalLineAlignment::Type alignment)
-{
-  mImpl->mModel->mVerticalLineAlignment = alignment;
-}
-
-Toolkit::DevelText::EllipsisPosition::Type Controller::GetEllipsisPosition() const
-{
-  return mImpl->mModel->GetEllipsisPosition();
-}
-
-void Controller::SetEllipsisPosition(Toolkit::DevelText::EllipsisPosition::Type ellipsisPosition)
-{
-  mImpl->mModel->mEllipsisPosition = ellipsisPosition;
-  mImpl->mModel->mVisualModel->SetEllipsisPosition(ellipsisPosition);
-}
-
-// public : Relayout.
-
-Controller::UpdateTextType Controller::Relayout(const Size& size, Dali::LayoutDirection::Type layoutDirection)
-{
-  return Relayouter::Relayout(*this, size, layoutDirection);
-}
-
-void Controller::RequestRelayout()
-{
-  mImpl->RequestRelayout();
-}
-
-// public : Input style change signals.
-
-bool Controller::IsInputStyleChangedSignalsQueueEmpty()
-{
-  return (NULL == mImpl->mEventData) || (0u == mImpl->mEventData->mInputStyleChangedQueue.Count());
-}
-
-void Controller::ProcessInputStyleChangedSignals()
-{
-  if(NULL == mImpl->mEventData)
-  {
-    // Nothing to do.
-    return;
-  }
-
-  for(Vector<InputStyle::Mask>::ConstIterator it    = mImpl->mEventData->mInputStyleChangedQueue.Begin(),
-                                              endIt = mImpl->mEventData->mInputStyleChangedQueue.End();
-      it != endIt;
-      ++it)
-  {
-    const InputStyle::Mask mask = *it;
-
-    if(NULL != mImpl->mEditableControlInterface)
-    {
-      // Emit the input style changed signal.
-      mImpl->mEditableControlInterface->InputStyleChanged(mask);
-    }
-  }
-
-  mImpl->mEventData->mInputStyleChangedQueue.Clear();
-}
-
-// public : Text-input Event Queuing.
-
-void Controller::KeyboardFocusGainEvent()
-{
-  EventHandler::KeyboardFocusGainEvent(*this);
-}
-
-void Controller::KeyboardFocusLostEvent()
-{
-  EventHandler::KeyboardFocusLostEvent(*this);
-}
-
-bool Controller::KeyEvent(const Dali::KeyEvent& keyEvent)
-{
-  return EventHandler::KeyEvent(*this, keyEvent);
-}
-
-void Controller::AnchorEvent(float x, float y)
-{
-  EventHandler::AnchorEvent(*this, x, y);
-}
-
-void Controller::TapEvent(unsigned int tapCount, float x, float y)
-{
-  EventHandler::TapEvent(*this, tapCount, x, y);
-}
-
-void Controller::PanEvent(GestureState state, const Vector2& displacement)
-{
-  EventHandler::PanEvent(*this, state, displacement);
-}
-
-void Controller::LongPressEvent(GestureState state, float x, float y)
-{
-  EventHandler::LongPressEvent(*this, state, x, y);
-}
-
-void Controller::SelectEvent(float x, float y, SelectionType selectType)
-{
-  EventHandler::SelectEvent(*this, x, y, selectType);
-}
-
-void Controller::SelectEvent(const uint32_t start, const uint32_t end, SelectionType selectType)
-{
-  EventHandler::SelectEvent(*this, start, end, selectType);
-}
-
-void Controller::SetTextSelectionRange(const uint32_t* start, const uint32_t* end)
-{
-  if(mImpl->mEventData)
-  {
-    mImpl->mEventData->mCheckScrollAmount     = true;
-    mImpl->mEventData->mIsLeftHandleSelected  = true;
-    mImpl->mEventData->mIsRightHandleSelected = true;
-    mImpl->SetTextSelectionRange(start, end);
-    mImpl->RequestRelayout();
-    KeyboardFocusGainEvent();
-  }
-}
-
-Uint32Pair Controller::GetTextSelectionRange() const
-{
-  return mImpl->GetTextSelectionRange();
-}
-
-CharacterIndex Controller::GetPrimaryCursorPosition() const
-{
-  return mImpl->GetPrimaryCursorPosition();
-}
-
-bool Controller::SetPrimaryCursorPosition(CharacterIndex index, bool focused)
-{
-  if(mImpl->mEventData)
-  {
-    mImpl->mEventData->mCheckScrollAmount     = true;
-    mImpl->mEventData->mIsLeftHandleSelected  = true;
-    mImpl->mEventData->mIsRightHandleSelected = true;
-    mImpl->mEventData->mCheckScrollAmount     = true;
-    if(mImpl->SetPrimaryCursorPosition(index, focused) && focused)
-    {
-      KeyboardFocusGainEvent();
-      return true;
-    }
-  }
-  return false;
-}
-
-void Controller::SelectWholeText()
-{
-  SelectEvent(0.f, 0.f, SelectionType::ALL);
-}
-
-void Controller::SelectNone()
-{
-  SelectEvent(0.f, 0.f, SelectionType::NONE);
-}
-
-void Controller::SelectText(const uint32_t start, const uint32_t end)
-{
-  SelectEvent(start, end, SelectionType::RANGE);
-}
-
-string Controller::GetSelectedText() const
-{
-  string text;
-  if(EventData::SELECTING == mImpl->mEventData->mState)
-  {
-    mImpl->RetrieveSelection(text, false);
-  }
-  return text;
-}
-
-string Controller::CopyText()
-{
-  string text;
-  mImpl->RetrieveSelection(text, false);
-  mImpl->SendSelectionToClipboard(false); // Text not modified
-
-  mImpl->mEventData->mUpdateCursorPosition = true;
-
-  mImpl->RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup
-
-  return text;
-}
-
-string Controller::CutText()
-{
-  string text;
-  mImpl->RetrieveSelection(text, false);
-
-  if(!IsEditable())
-  {
-    return "";
-  }
-
-  mImpl->SendSelectionToClipboard(true); // Synchronous call to modify text
-  mImpl->mOperationsPending = ALL_OPERATIONS;
-
-  if((0u != mImpl->mModel->mLogicalModel->mText.Count()) ||
-     !mImpl->IsPlaceholderAvailable())
-  {
-    mImpl->QueueModifyEvent(ModifyEvent::TEXT_DELETED);
-  }
-  else
-  {
-    ShowPlaceholderText();
-  }
-
-  mImpl->mEventData->mUpdateCursorPosition = true;
-  mImpl->mEventData->mScrollAfterDelete    = true;
-
-  mImpl->RequestRelayout();
-
-  if(nullptr != mImpl->mEditableControlInterface)
-  {
-    mImpl->mEditableControlInterface->TextChanged(true);
-  }
-  return text;
-}
-
-void Controller::PasteText()
-{
-  mImpl->RequestGetTextFromClipboard(); // Request clipboard service to retrieve an item
-}
-
-InputMethodContext::CallbackData Controller::OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
-{
-  return EventHandler::OnInputMethodContextEvent(*this, inputMethodContext, inputMethodContextEvent);
-}
-
-void Controller::PasteClipboardItemEvent()
-{
-  EventHandler::PasteClipboardItemEvent(*this);
-}
-
-// protected : Inherit from Text::Decorator::ControllerInterface.
-
-void Controller::GetTargetSize(Vector2& targetSize)
-{
-  targetSize = mImpl->mModel->mVisualModel->mControlSize;
-}
-
-void Controller::AddDecoration(Actor& actor, bool needsClipping)
-{
-  if(NULL != mImpl->mEditableControlInterface)
-  {
-    mImpl->mEditableControlInterface->AddDecoration(actor, needsClipping);
-  }
-}
-
-bool Controller::IsEditable() const
-{
-  return mImpl->IsEditable();
-}
-
-void Controller::SetEditable(bool editable)
-{
-  mImpl->SetEditable(editable);
-  if(mImpl->mEventData && mImpl->mEventData->mDecorator)
-  {
-    mImpl->mEventData->mDecorator->SetEditable(editable);
-  }
-}
-
-void Controller::ScrollBy(Vector2 scroll)
-{
-  if(mImpl->mEventData && (fabs(scroll.x) > Math::MACHINE_EPSILON_0 || fabs(scroll.y) > Math::MACHINE_EPSILON_0))
-  {
-    const Vector2& layoutSize    = mImpl->mModel->mVisualModel->GetLayoutSize();
-    const Vector2  currentScroll = mImpl->mModel->mScrollPosition;
-
-    scroll.x = -scroll.x;
-    scroll.y = -scroll.y;
-
-    if(fabs(scroll.x) > Math::MACHINE_EPSILON_0)
-    {
-      mImpl->mModel->mScrollPosition.x += scroll.x;
-      mImpl->ClampHorizontalScroll(layoutSize);
-    }
-
-    if(fabs(scroll.y) > Math::MACHINE_EPSILON_0)
-    {
-      mImpl->mModel->mScrollPosition.y += scroll.y;
-      mImpl->ClampVerticalScroll(layoutSize);
-    }
-
-    if(mImpl->mModel->mScrollPosition != currentScroll)
-    {
-      mImpl->mEventData->mDecorator->UpdatePositions(mImpl->mModel->mScrollPosition - currentScroll);
-      mImpl->RequestRelayout();
-    }
-  }
-}
-
-float Controller::GetHorizontalScrollPosition()
-{
-  if(mImpl->mEventData)
-  {
-    //scroll values are negative internally so we convert them to positive numbers
-    return -mImpl->mModel->mScrollPosition.x;
-  }
-  return 0;
-}
-
-float Controller::GetVerticalScrollPosition()
-{
-  if(mImpl->mEventData)
-  {
-    //scroll values are negative internally so we convert them to positive numbers
-    return -mImpl->mModel->mScrollPosition.y;
-  }
-  return 0;
-}
-
-void Controller::DecorationEvent(HandleType handleType, HandleState state, float x, float y)
-{
-  EventHandler::DecorationEvent(*this, handleType, state, x, y);
-}
-
-// protected : Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface.
-
-void Controller::TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::Buttons button)
-{
-  EventHandler::TextPopupButtonTouched(*this, button);
-}
-
-void Controller::DisplayTimeExpired()
-{
-  mImpl->mEventData->mUpdateCursorPosition = true;
-  // Apply modifications to the model
-  mImpl->mOperationsPending = ALL_OPERATIONS;
-
-  mImpl->RequestRelayout();
-}
-
-// private : Update.
-
-void Controller::InsertText(const std::string& text, Controller::InsertType type)
-{
-  TextUpdater::InsertText(*this, text, type);
-}
-
-void Controller::PasteText(const std::string& stringToPaste)
-{
-  TextUpdater::PasteText(*this, stringToPaste);
-}
-
-bool Controller::RemoveText(int                  cursorOffset,
-                            int                  numberOfCharacters,
-                            UpdateInputStyleType type)
-{
-  return TextUpdater::RemoveText(*this, cursorOffset, numberOfCharacters, type);
-}
-
-bool Controller::RemoveSelectedText()
-{
-  return TextUpdater::RemoveSelectedText(*this);
-}
-
-void Controller::InsertTextAnchor(int            numberOfCharacters,
-                                  CharacterIndex previousCursorIndex)
-{
-  TextUpdater::InsertTextAnchor(*this, numberOfCharacters, previousCursorIndex);
-}
-
-void Controller::RemoveTextAnchor(int            cursorOffset,
-                                  int            numberOfCharacters,
-                                  CharacterIndex previousCursorIndex)
-{
-  TextUpdater::RemoveTextAnchor(*this, cursorOffset, numberOfCharacters, previousCursorIndex);
-}
-
-// private : Relayout.
-
-bool Controller::DoRelayout(const Size&    size,
-                            OperationsMask operationsRequired,
-                            Size&          layoutSize)
-{
-  return Relayouter::DoRelayout(*this, size, operationsRequired, layoutSize);
-}
-
-void Controller::CalculateVerticalOffset(const Size& controlSize)
-{
-  Relayouter::CalculateVerticalOffset(*this, controlSize);
-}
-
-// private : Events.
-
-void Controller::ProcessModifyEvents()
-{
-  EventHandler::ProcessModifyEvents(*this);
-}
-
-void Controller::TextReplacedEvent()
-{
-  EventHandler::TextReplacedEvent(*this);
-}
-
-void Controller::TextInsertedEvent()
-{
-  EventHandler::TextInsertedEvent(*this);
-}
-
-void Controller::TextDeletedEvent()
-{
-  EventHandler::TextDeletedEvent(*this);
-}
-
-bool Controller::DeleteEvent(int keyCode)
-{
-  return EventHandler::DeleteEvent(*this, keyCode);
-}
-
-// private : Helpers.
-
-void Controller::ResetText()
-{
-  TextUpdater::ResetText(*this);
-}
-
-void Controller::ShowPlaceholderText()
-{
-  PlaceholderHandler::ShowPlaceholderText(*this);
-}
-
-void Controller::ClearFontData()
-{
-  if(mImpl->mFontDefaults)
-  {
-    mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID
-  }
-
-  // Set flags to update the model.
-  mImpl->mTextUpdateInfo.mCharacterIndex             = 0u;
-  mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-  mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd    = mImpl->mModel->mLogicalModel->mText.Count();
-
-  mImpl->mTextUpdateInfo.mClearAll           = true;
-  mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true;
-  mImpl->mRecalculateNaturalSize             = true;
-
-  mImpl->mOperationsPending = static_cast<OperationsMask>(mImpl->mOperationsPending |
-                                                          VALIDATE_FONTS |
-                                                          SHAPE_TEXT |
-                                                          BIDI_INFO |
-                                                          GET_GLYPH_METRICS |
-                                                          LAYOUT |
-                                                          UPDATE_LAYOUT_SIZE |
-                                                          REORDER |
-                                                          ALIGN);
-}
-
-void Controller::ClearStyleData()
-{
-  mImpl->mModel->mLogicalModel->mColorRuns.Clear();
-  mImpl->mModel->mLogicalModel->ClearFontDescriptionRuns();
-}
-
-void Controller::ResetCursorPosition(CharacterIndex cursorIndex)
-{
-  // Reset the cursor position
-  if(NULL != mImpl->mEventData)
-  {
-    mImpl->mEventData->mPrimaryCursorPosition = cursorIndex;
-
-    // Update the cursor if it's in editing mode.
-    if(EventData::IsEditingState(mImpl->mEventData->mState))
-    {
-      mImpl->mEventData->mUpdateCursorPosition = true;
-    }
-  }
-}
-
-CharacterIndex Controller::GetCursorPosition()
-{
-  if(!mImpl->mEventData)
-    return 0;
-
-  return mImpl->mEventData->mPrimaryCursorPosition;
-}
-
-void Controller::ResetScrollPosition()
-{
-  if(NULL != mImpl->mEventData)
-  {
-    // Reset the scroll position.
-    mImpl->mModel->mScrollPosition                = Vector2::ZERO;
-    mImpl->mEventData->mScrollAfterUpdatePosition = true;
-  }
-}
-
-void Controller::SetControlInterface(ControlInterface* controlInterface)
-{
-  mImpl->mControlInterface = controlInterface;
-}
-
-void Controller::SetAnchorControlInterface(AnchorControlInterface* anchorControlInterface)
-{
-  mImpl->mAnchorControlInterface = anchorControlInterface;
-}
-
-bool Controller::ShouldClearFocusOnEscape() const
-{
-  return mImpl->mShouldClearFocusOnEscape;
-}
-
-Actor Controller::CreateBackgroundActor()
-{
-  return mImpl->CreateBackgroundActor();
-}
-
-// private : Private contructors & copy operator.
-
-Controller::Controller()
-: Controller(nullptr, nullptr, nullptr, nullptr)
-{
-}
-
-Controller::Controller(ControlInterface* controlInterface)
-: Controller(controlInterface, nullptr, nullptr, nullptr)
-{
-}
-
-Controller::Controller(ControlInterface*           controlInterface,
-                       EditableControlInterface*   editableControlInterface,
-                       SelectableControlInterface* selectableControlInterface,
-                       AnchorControlInterface*     anchorControlInterface)
-: mImpl(new Controller::Impl(controlInterface, editableControlInterface, selectableControlInterface, anchorControlInterface))
-{
-}
-
-// The copy constructor and operator are left unimplemented.
-
-// protected : Destructor.
-
-Controller::~Controller()
-{
-  delete mImpl;
-}
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h
deleted file mode 100644
index 9302cf5..0000000
--- a/dali-toolkit/internal/text/text-controller.h
+++ /dev/null
@@ -1,1946 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXT_CONTROLLER_H
-#define DALI_TOOLKIT_TEXT_CONTROLLER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/input-method-context.h>
-#include <dali/public-api/events/gesture.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
-#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
-#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
-#include <dali-toolkit/internal/text/decorator/text-decorator.h>
-#include <dali-toolkit/internal/text/hidden-text.h>
-#include <dali-toolkit/internal/text/input-filter.h>
-#include <dali-toolkit/internal/text/layouts/layout-engine.h>
-#include <dali-toolkit/internal/text/text-anchor-control-interface.h>
-#include <dali-toolkit/internal/text/text-model-interface.h>
-#include <dali-toolkit/internal/text/text-selectable-control-interface.h>
-#include <dali-toolkit/public-api/text/text-enumerations.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Text
-{
-class Controller;
-class ControlInterface;
-class EditableControlInterface;
-class View;
-class RenderingController;
-
-/**
-   * @brief Text selection operations .
-   */
-enum SelectionType
-{
-  INTERACTIVE = 0x0000, ///< Select the word where the cursor is located.
-  ALL         = 0x0001, ///< Select the whole text.
-  NONE        = 0x0002, ///< Unselect the whole text.
-  RANGE       = 0x0003  ///< Select the range text.
-};
-
-typedef IntrusivePtr<Controller> ControllerPtr;
-
-/**
- * @brief A Text Controller is used by UI Controls which display text.
- *
- * It manipulates the Logical & Visual text models on behalf of the UI Controls.
- * It provides a view of the text that can be used by rendering back-ends.
- *
- * For selectable/editable UI controls, the controller handles input events from the UI control
- * and decorations (grab handles etc) via the Decorator::ControllerInterface interface.
- *
- * The text selection popup button callbacks are as well handled via the TextSelectionPopupCallbackInterface interface.
- */
-class Controller : public RefObject, public Decorator::ControllerInterface, public TextSelectionPopupCallbackInterface, public HiddenText::Observer
-{
-public: // Enumerated types.
-  /**
-   * @brief Text related operations to be done in the relayout process.
-   */
-  enum OperationsMask
-  {
-    NO_OPERATION       = 0x0000,
-    CONVERT_TO_UTF32   = 0x0001,
-    GET_SCRIPTS        = 0x0002,
-    VALIDATE_FONTS     = 0x0004,
-    GET_LINE_BREAKS    = 0x0008,
-    BIDI_INFO          = 0x0010,
-    SHAPE_TEXT         = 0x0020,
-    GET_GLYPH_METRICS  = 0x0040,
-    LAYOUT             = 0x0080,
-    UPDATE_LAYOUT_SIZE = 0x0100,
-    REORDER            = 0x0200,
-    ALIGN              = 0x0400,
-    COLOR              = 0x0800,
-    UPDATE_DIRECTION   = 0x1000,
-    ALL_OPERATIONS     = 0xFFFF
-  };
-
-  /**
-   * @brief Used to distinguish between regular key events and InputMethodContext events
-   */
-  enum InsertType
-  {
-    COMMIT,
-    PRE_EDIT
-  };
-
-  /**
-   * @brief Used to specify whether to update the input style.
-   */
-  enum UpdateInputStyleType
-  {
-    UPDATE_INPUT_STYLE,
-    DONT_UPDATE_INPUT_STYLE
-  };
-
-  /**
-   * @brief Used to specify what has been updated after the Relayout() method has been called.
-   */
-  enum UpdateTextType
-  {
-    NONE_UPDATED      = 0x0, ///< Nothing has been updated.
-    MODEL_UPDATED     = 0x1, ///< The text's model has been updated.
-    DECORATOR_UPDATED = 0x2  ///< The decoration has been updated.
-  };
-
-  /**
-   * @brief Different placeholder-text can be shown when the control is active/inactive.
-   */
-  enum PlaceholderType
-  {
-    PLACEHOLDER_TYPE_ACTIVE,
-    PLACEHOLDER_TYPE_INACTIVE,
-  };
-
-  /**
-   * @brief Enumeration for Font Size Type.
-   */
-  enum FontSizeType
-  {
-    POINT_SIZE, // The size of font in points.
-    PIXEL_SIZE  // The size of font in pixels.
-  };
-
-  struct NoTextTap
-  {
-    enum Action
-    {
-      NO_ACTION,           ///< Does no action if there is a tap on top of an area with no text.
-      HIGHLIGHT,           ///< Highlights the nearest text (at the beginning or end of the text) and shows the text's selection popup.
-      SHOW_SELECTION_POPUP ///< Shows the text's selection popup.
-    };
-  };
-
-  struct TextFitInfo
-  {
-    enum Property
-    {
-      TEXT_FIT_ENABLE,
-      TEXT_FIT_MIN_SIZE,
-      TEXT_FIT_MAX_SIZE,
-      TEXT_FIT_STEP_SIZE,
-      TEXT_FIT_FONT_SIZE_TYPE
-    };
-  };
-
-public: // Constructor.
-  /**
-   * @brief Create a new instance of a Controller.
-   *
-   * @return A pointer to a new Controller.
-   */
-  static ControllerPtr New();
-
-  /**
-   * @brief Create a new instance of a Controller.
-   *
-   * @param[in] controlInterface The control's interface.
-   *
-   * @return A pointer to a new Controller.
-   */
-  static ControllerPtr New(ControlInterface* controlInterface);
-
-  /**
-   * @brief Create a new instance of a Controller.
-   *
-   * @param[in] controlInterface The control's interface.
-   * @param[in] editableControlInterface The editable control's interface.
-   * @param[in] selectableControlInterface The selectable control's interface.
-   * @param[in] anchorControlInterface The anchor control's interface.
-   *
-   * @return A pointer to a new Controller.
-   */
-  static ControllerPtr New(ControlInterface*           controlInterface,
-                           EditableControlInterface*   editableControlInterface,
-                           SelectableControlInterface* selectableControlInterface,
-                           AnchorControlInterface*     anchorControlInterface);
-
-public: // Configure the text controller.
-  /**
-   * @brief Called to enable text input.
-   *
-   * @note Selectable or editable controls should call this once after Controller::New().
-   * @param[in] decorator Used to create cursor, selection handle decorations etc.
-   * @param[in] inputMethodContext Used to manager ime.
-   */
-  void EnableTextInput(DecoratorPtr decorator, InputMethodContext& inputMethodContext);
-
-  /**
-   * @brief Used to switch between bitmap & vector based glyphs
-   *
-   * @param[in] glyphType The type of glyph; note that metrics for bitmap & vector based glyphs are different.
-   */
-  void SetGlyphType(TextAbstraction::GlyphType glyphType);
-
-  /**
-   * @brief Enables/disables the mark-up processor.
-   *
-   * By default is disabled.
-   *
-   * @param[in] enable Whether to enable the mark-up processor.
-   */
-  void SetMarkupProcessorEnabled(bool enable);
-
-  /**
-   * @brief Retrieves whether the mark-up processor is enabled.
-   *
-   * By default is disabled.
-   *
-   * @return @e true if the mark-up processor is enabled, otherwise returns @e false.
-   */
-  bool IsMarkupProcessorEnabled() const;
-
-  /**
-   * @brief Retrieves whether the current text contains anchors.
-   *
-   * @return @e true if the current text contains anchors. @e false.
-   */
-  bool HasAnchors() const;
-
-  /**
-   * @brief Enables/disables the auto text scrolling
-   *
-   * By default is disabled.
-   *
-   * @param[in] enable Whether to enable the auto scrolling
-   */
-  void SetAutoScrollEnabled(bool enable);
-
-  /**
-   * @brief Retrieves whether auto text scrolling is enabled.
-   *
-   * By default is disabled.
-   *
-   * @return @e true if auto scrolling is enabled, otherwise returns @e false.
-   */
-  bool IsAutoScrollEnabled() const;
-
-  /**
-   * @brief Get direction of the text from the first line of text,
-   * @return bool rtl (right to left) is true
-   */
-  CharacterDirection GetAutoScrollDirection() const;
-
-  /**
-   * @brief Get the alignment offset of the first line of text.
-   *
-   * @return The alignment offset.
-   */
-  float GetAutoScrollLineAlignment() const;
-
-  /**
-   * @brief Enables the horizontal scrolling.
-   *
-   * @param[in] enable Whether to enable the horizontal scrolling.
-   */
-  void SetHorizontalScrollEnabled(bool enable);
-
-  /**
-   * @brief Retrieves whether the horizontal scrolling is enabled.
-   *
-   * @return @e true if the horizontal scrolling is enabled, otherwise it returns @e false.
-   */
-  bool IsHorizontalScrollEnabled() const;
-
-  /**
-   * @brief Enables the vertical scrolling.
-   *
-   * @param[in] enable Whether to enable the vertical scrolling.
-   */
-  void SetVerticalScrollEnabled(bool enable);
-
-  /**
-   * @brief Retrieves whether the verticall scrolling is enabled.
-   *
-   * @return @e true if the vertical scrolling is enabled, otherwise it returns @e false.
-   */
-  bool IsVerticalScrollEnabled() const;
-
-  /**
-   * @brief Enables the smooth handle panning.
-   *
-   * @param[in] enable Whether to enable the smooth handle panning.
-   */
-  void SetSmoothHandlePanEnabled(bool enable);
-
-  /**
-   * @brief Retrieves whether the smooth handle panning is enabled.
-   *
-   * @return @e true if the smooth handle panning is enabled.
-   */
-  bool IsSmoothHandlePanEnabled() const;
-
-  /**
-   * @brief Sets the maximum number of characters that can be inserted into the TextModel
-   *
-   * @param[in] maxCharacters maximum number of characters to be accepted
-   */
-  void SetMaximumNumberOfCharacters(Length maxCharacters);
-
-  /**
-   * @brief Sets the maximum number of characters that can be inserted into the TextModel
-   *
-   * @param[in] maxCharacters maximum number of characters to be accepted
-   */
-  int GetMaximumNumberOfCharacters();
-
-  /**
-   * @brief Called to enable/disable cursor blink.
-   *
-   * @note Only editable controls should calls this.
-   * @param[in] enabled Whether the cursor should blink or not.
-   */
-  void SetEnableCursorBlink(bool enable);
-
-  /**
-   * @brief Query whether cursor blink is enabled.
-   *
-   * @return Whether the cursor should blink or not.
-   */
-  bool GetEnableCursorBlink() const;
-
-  /**
-   * @brief Whether to enable the multi-line layout.
-   *
-   * @param[in] enable \e true enables the multi-line (by default)
-   */
-  void SetMultiLineEnabled(bool enable);
-
-  /**
-   * @return Whether the multi-line layout is enabled.
-   */
-  bool IsMultiLineEnabled() const;
-
-  /**
-   * @brief Sets the text's horizontal alignment.
-   *
-   * @param[in] alignment The horizontal alignment.
-   */
-  void SetHorizontalAlignment(HorizontalAlignment::Type alignment);
-
-  /**
-   * @copydoc ModelInterface::GetHorizontalAlignment()
-   */
-  HorizontalAlignment::Type GetHorizontalAlignment() const;
-
-  /**
-   * @brief Sets the text's vertical alignment.
-   *
-   * @param[in] alignment The vertical alignment.
-   */
-  void SetVerticalAlignment(VerticalAlignment::Type alignment);
-
-  /**
-   * @copydoc ModelInterface::GetVerticalAlignment()
-   */
-  VerticalAlignment::Type GetVerticalAlignment() const;
-
-  /**
-   * @brief Sets the text's wrap mode
-   * @param[in] text wrap mode The unit of wrapping
-   */
-  void SetLineWrapMode(Text::LineWrap::Mode textWarpMode);
-
-  /**
-   * @brief Retrieve text wrap mode previously set.
-   * @return text wrap mode
-   */
-  Text::LineWrap::Mode GetLineWrapMode() const;
-
-  /**
-   * @brief Enable or disable the text elide.
-   *
-   * @param[in] enabled Whether to enable the text elide.
-   */
-  void SetTextElideEnabled(bool enabled);
-
-  /**
-   * @copydoc ModelInterface::IsTextElideEnabled()
-   */
-  bool IsTextElideEnabled() const;
-
-  /**
-   * @brief Enable or disable the text fit.
-   *
-   * @param[in] enabled Whether to enable the text fit.
-   */
-  void SetTextFitEnabled(bool enabled);
-
-  /**
-   * @brief Whether the text fit is enabled or not.
-   *
-   * @return True if the text fit is enabled
-   */
-  bool IsTextFitEnabled() const;
-
-  /**
-   * @brief Sets minimum size valid for text fit.
-   *
-   * @param[in] minimum size value.
-   * @param[in] type The font size type is point size or pixel size
-   */
-  void SetTextFitMinSize(float pointSize, FontSizeType type);
-
-  /**
-   * @brief Retrieves the minimum point size valid for text fit.
-   *
-   * @return The minimum point size valid for text fit
-   */
-  float GetTextFitMinSize() const;
-
-  /**
-   * @brief Sets maximum size valid for text fit.
-   *
-   * @param[in] maximum size value.
-   * @param[in] type The font size type is point size or pixel size
-   */
-  void SetTextFitMaxSize(float pointSize, FontSizeType type);
-
-  /**
-   * @brief Retrieves the maximum point size valid for text fit.
-   *
-   * @return The maximum point size valid for text fit
-   */
-  float GetTextFitMaxSize() const;
-
-  /**
-   * @brief Sets step size for font increase valid for text fit.
-   *
-   * @param[in] step size value.
-   * @param[in] type The font size type is point size or pixel size
-   */
-  void SetTextFitStepSize(float step, FontSizeType type);
-
-  /**
-   * @brief Retrieves the step point size valid for text fit.
-   *
-   * @return The step point size valid for text fit
-   */
-  float GetTextFitStepSize() const;
-
-  /**
-   * @brief Sets content size valid for text fit.
-   *
-   * @param[in] Content size value.
-   */
-  void SetTextFitContentSize(Vector2 size);
-
-  /**
-   * @brief Retrieves the content size valid for text fit.
-   *
-   * @return The content size valid for text fit
-   */
-  Vector2 GetTextFitContentSize() const;
-
-  /**
-   * @brief Enable or disable the placeholder text elide.
-   * @param enabled Whether to enable the placeholder text elide.
-   */
-  void SetPlaceholderTextElideEnabled(bool enabled);
-
-  /**
-   * @brief Whether the placeholder text elide property is enabled.
-   * @return True if the placeholder text elide property is enabled, false otherwise.
-   */
-  bool IsPlaceholderTextElideEnabled() const;
-
-  /**
-   * @brief Enable or disable the text selection.
-   * @param[in] enabled Whether to enable the text selection.
-   */
-  void SetSelectionEnabled(bool enabled);
-
-  /**
-   * @brief Whether the text selection is enabled or not.
-   * @return True if the text selection is enabled
-   */
-  bool IsSelectionEnabled() const;
-
-  /**
-   * @brief Enable or disable the text selection using Shift key.
-   * @param enabled Whether to enable the text selection using Shift key
-   */
-  void SetShiftSelectionEnabled(bool enabled);
-
-  /**
-   * @brief Whether the text selection using Shift key is enabled or not.
-   * @return True if the text selection using Shift key is enabled
-   */
-  bool IsShiftSelectionEnabled() const;
-
-  /**
-   * @brief Enable or disable the grab handles for text selection.
-   *
-   * @param[in] enabled Whether to enable the grab handles
-   */
-  void SetGrabHandleEnabled(bool enabled);
-
-  /**
-   * @brief Returns whether the grab handles are enabled.
-   *
-   * @return True if the grab handles are enabled
-   */
-  bool IsGrabHandleEnabled() const;
-
-  /**
-   * @brief Enable or disable the grab handles for text selection.
-   *
-   * @param[in] enabled Whether to enable the grab handles
-   */
-  void SetGrabHandlePopupEnabled(bool enabled);
-
-  /**
-   * @brief Returns whether the grab handles are enabled.
-   *
-   * @return True if the grab handles are enabled
-   */
-  bool IsGrabHandlePopupEnabled() const;
-
-  /**
-   * @brief Sets input type to password
-   *
-   * @note The string is displayed hidden character
-   *
-   * @param[in] passwordInput True if password input is enabled.
-   */
-  void SetInputModePassword(bool passwordInput);
-
-  /**
-   * @brief Returns whether the input mode type is set as password.
-   *
-   * @return True if input mode type is password
-   */
-  bool IsInputModePassword();
-
-  /**
-   * @brief Sets the action when there is a double tap event on top of a text area with no text.
-   *
-   * @param[in] action The action to do.
-   */
-  void SetNoTextDoubleTapAction(NoTextTap::Action action);
-
-  /**
-   * @brief Retrieves the action when there is a double tap event on top of a text area with no text.
-   *
-   * @return The action to do.
-   */
-  NoTextTap::Action GetNoTextDoubleTapAction() const;
-
-  /**
-   * @briefSets the action when there is a long press event on top of a text area with no text.
-   *
-   * @param[in] action The action to do.
-   */
-  void SetNoTextLongPressAction(NoTextTap::Action action);
-
-  /**
-   * @brief Retrieves the action when there is a long press event on top of a text area with no text.
-   *
-   * @return The action to do.
-   */
-  NoTextTap::Action GetNoTextLongPressAction() const;
-
-  /**
-   * @brief Query if Underline settings were provided by string or map
-   * @return bool true if set by string
-   */
-  bool IsUnderlineSetByString();
-
-  /**
-   * Set method underline setting were set by
-   * @param[in] bool, true if set by string
-   */
-  void UnderlineSetByString(bool setByString);
-
-  /**
-   * @brief Query if shadow settings were provided by string or map
-   * @return bool true if set by string
-   */
-  bool IsShadowSetByString();
-
-  /**
-   * Set method shadow setting were set by
-   * @param[in] bool, true if set by string
-   */
-  void ShadowSetByString(bool setByString);
-
-  /**
-   * @brief Query if outline settings were provided by string or map
-   * @return bool true if set by string
-   */
-  bool IsOutlineSetByString();
-
-  /**
-   * Set method outline setting were set by
-   * @param[in] bool, true if set by string
-   */
-  void OutlineSetByString(bool setByString);
-
-  /**
-   * @brief Query if font style settings were provided by string or map
-   * @return bool true if set by string
-   */
-  bool IsFontStyleSetByString();
-
-  /**
-   * Set method font style setting were set by
-   * @param[in] bool, true if set by string
-   */
-  void FontStyleSetByString(bool setByString);
-
-public: // Update.
-  /**
-   * @brief Replaces any text previously set.
-   *
-   * @note This will be converted into UTF-32 when stored in the text model.
-   * @param[in] text A string of UTF-8 characters.
-   */
-  void SetText(const std::string& text);
-
-  /**
-   * @brief Retrieve any text previously set.
-   *
-   * @param[out] text A string of UTF-8 characters.
-   */
-  void GetText(std::string& text) const;
-
-  /**
-   * @brief Replaces any placeholder text previously set.
-   *
-   * @param[in] type Different placeholder-text can be shown when the control is active/inactive.
-   * @param[in] text A string of UTF-8 characters.
-   */
-  void SetPlaceholderText(PlaceholderType type, const std::string& text);
-
-  /**
-   * @brief Retrieve any placeholder text previously set.
-   *
-   * @param[in] type Different placeholder-text can be shown when the control is active/inactive.
-   * @param[out] A string of UTF-8 characters.
-   */
-  void GetPlaceholderText(PlaceholderType type, std::string& text) const;
-
-  /**
-   * @ brief Update the text after a font change
-   * @param[in] newDefaultFont The new font to change to
-   */
-  void UpdateAfterFontChange(const std::string& newDefaultFont);
-
-  /**
-   * @brief The method acquires currently selected text
-   * @param selectedText variable to place selected text in
-   */
-  void RetrieveSelection(std::string& selectedText) const;
-
-  /**
-   * @brief The method sets selection in given range
-   * @param start index of first character
-   * @param end   index of first character after selection
-   */
-  void SetSelection(int start, int end);
-
-  /**
-   * @brief This method retrieve indexes of current selection
-   *
-   * @return a pair, where first element is left index of selection and second is the right one
-   */
-  std::pair<int, int> GetSelectionIndexes() const;
-
-  /**
-   * Place string in system clipboard
-   * @param source std::string
-   */
-  void CopyStringToClipboard(const std::string& source);
-
-  /**
-   * Place currently selected text in system clipboard
-   * @param deleteAfterSending flag pointing if text should be deleted after sending to clipboard
-   */
-  void SendSelectionToClipboard(bool deleteAfterSending);
-
-public: // Default style & Input style
-  /**
-   * @brief Set the default font family.
-   *
-   * @param[in] defaultFontFamily The default font family.
-   */
-  void SetDefaultFontFamily(const std::string& defaultFontFamily);
-
-  /**
-   * @brief Retrieve the default font family.
-   *
-   * @return The default font family.
-   */
-  const std::string& GetDefaultFontFamily() const;
-
-  /**
-   * @brief Sets the placeholder text font family.
-   * @param[in] placeholderTextFontFamily The placeholder text font family.
-   */
-  void SetPlaceholderFontFamily(const std::string& placeholderTextFontFamily);
-
-  /**
-   * @brief Retrieves the placeholder text font family.
-   *
-   * @return The placeholder text font family
-   */
-  const std::string& GetPlaceholderFontFamily() const;
-
-  /**
-   * @brief Sets the default font weight.
-   *
-   * @param[in] weight The font weight.
-   */
-  void SetDefaultFontWeight(FontWeight weight);
-
-  /**
-   * @brief Whether the font's weight has been defined.
-   */
-  bool IsDefaultFontWeightDefined() const;
-
-  /**
-   * @brief Retrieves the default font weight.
-   *
-   * @return The default font weight.
-   */
-  FontWeight GetDefaultFontWeight() const;
-
-  /**
-   * @brief Sets the placeholder text font weight.
-   *
-   * @param[in] weight The font weight
-   */
-  void SetPlaceholderTextFontWeight(FontWeight weight);
-
-  /**
-   * @brief Whether the font's weight has been defined.
-   *
-   * @return True if the placeholder text font weight is defined
-   */
-  bool IsPlaceholderTextFontWeightDefined() const;
-
-  /**
-   * @brief Retrieves the placeholder text font weight.
-   *
-   * @return The placeholder text font weight
-   */
-  FontWeight GetPlaceholderTextFontWeight() const;
-
-  /**
-   * @brief Sets the default font width.
-   *
-   * @param[in] width The font width.
-   */
-  void SetDefaultFontWidth(FontWidth width);
-
-  /**
-   * @brief Whether the font's width has been defined.
-   */
-  bool IsDefaultFontWidthDefined() const;
-
-  /**
-   * @brief Retrieves the default font width.
-   *
-   * @return The default font width.
-   */
-  FontWidth GetDefaultFontWidth() const;
-
-  /**
-   * @brief Sets the placeholder text font width.
-   *
-   * @param[in] width The font width
-   */
-  void SetPlaceholderTextFontWidth(FontWidth width);
-
-  /**
-   * @brief Whether the font's width has been defined.
-   *
-   * @return True if the placeholder text font width is defined
-   */
-  bool IsPlaceholderTextFontWidthDefined() const;
-
-  /**
-   * @brief Retrieves the placeholder text font width.
-   *
-   * @return The placeholder text font width
-   */
-  FontWidth GetPlaceholderTextFontWidth() const;
-
-  /**
-   * @brief Sets the default font slant.
-   *
-   * @param[in] slant The font slant.
-   */
-  void SetDefaultFontSlant(FontSlant slant);
-
-  /**
-   * @brief Whether the font's slant has been defined.
-   */
-  bool IsDefaultFontSlantDefined() const;
-
-  /**
-   * @brief Retrieves the default font slant.
-   *
-   * @return The default font slant.
-   */
-  FontSlant GetDefaultFontSlant() const;
-
-  /**
-   * @brief Sets the placeholder text font slant.
-   *
-   * @param[in] slant The font slant
-   */
-  void SetPlaceholderTextFontSlant(FontSlant slant);
-
-  /**
-   * @brief Whether the font's slant has been defined.
-   *
-   * @return True if the placeholder text font slant is defined
-   */
-  bool IsPlaceholderTextFontSlantDefined() const;
-
-  /**
-   * @brief Retrieves the placeholder text font slant.
-   *
-   * @return The placeholder text font slant
-   */
-  FontSlant GetPlaceholderTextFontSlant() const;
-
-  /**
-   * @brief Set the default font size.
-   *
-   * @param[in] fontSize The default font size
-   * @param[in] type The font size type is point size or pixel size
-   */
-  void SetDefaultFontSize(float fontSize, FontSizeType type);
-
-  /**
-   * @brief Retrieve the default point size.
-   *
-   * @param[in] type The font size type
-   * @return The default point size.
-   */
-  float GetDefaultFontSize(FontSizeType type) const;
-
-  /**
-   * @brief Set the font size scale.
-   *
-   * @param[in] scale The font size scale
-   */
-  void SetFontSizeScale(float scale);
-
-  /**
-   * @brief Get the font size scale.
-   *
-   * @return The font size scale.
-   */
-  float GetFontSizeScale() const;
-
-  /**
-   * @brief Sets the Placeholder text font size.
-   * @param[in] fontSize The placeholder text font size
-   * @param[in] type The font size type is point size or pixel size
-   */
-  void SetPlaceholderTextFontSize(float fontSize, FontSizeType type);
-
-  /**
-   * @brief Retrieves the Placeholder text font size.
-   * @param[in] type The font size type
-   * @return The placeholder font size
-   */
-  float GetPlaceholderTextFontSize(FontSizeType type) const;
-
-  /**
-   * @brief Sets the text's default color.
-   *
-   * @param color The default color.
-   */
-  void SetDefaultColor(const Vector4& color);
-
-  /**
-   * @brief Retrieves the text's default color.
-   *
-   * @return The default color.
-   */
-  const Vector4& GetDefaultColor() const;
-
-  /**
-   * @brief Set the text color
-   *
-   * @param textColor The text color
-   */
-  void SetPlaceholderTextColor(const Vector4& textColor);
-
-  /**
-   * @brief Retrieve the text color
-   *
-   * @return The text color
-   */
-  const Vector4& GetPlaceholderTextColor() const;
-
-  /**
-   * @brief Set the shadow offset.
-   *
-   * @param[in] shadowOffset The shadow offset, 0,0 indicates no shadow.
-   */
-  void SetShadowOffset(const Vector2& shadowOffset);
-
-  /**
-   * @brief Retrieve the shadow offset.
-   *
-   * @return The shadow offset.
-   */
-  const Vector2& GetShadowOffset() const;
-
-  /**
-   * @brief Set the shadow color.
-   *
-   * @param[in] shadowColor The shadow color.
-   */
-  void SetShadowColor(const Vector4& shadowColor);
-
-  /**
-   * @brief Retrieve the shadow color.
-   *
-   * @return The shadow color.
-   */
-  const Vector4& GetShadowColor() const;
-
-  /**
-   * @brief Set the shadow blur radius.
-   *
-   * @param[in] shadowBlurRadius The shadow blur radius, 0,0 indicates no blur.
-   */
-  void SetShadowBlurRadius(const float& shadowBlurRadius);
-
-  /**
-   * @brief Retrieve the shadow blur radius.
-   *
-   * @return The shadow blur radius.
-   */
-  const float& GetShadowBlurRadius() const;
-
-  /**
-   * @brief Set the underline color.
-   *
-   * @param[in] color color of underline.
-   */
-  void SetUnderlineColor(const Vector4& color);
-
-  /**
-   * @brief Retrieve the underline color.
-   *
-   * @return The underline color.
-   */
-  const Vector4& GetUnderlineColor() const;
-
-  /**
-   * @brief Set the underline enabled flag.
-   *
-   * @param[in] enabled The underline enabled flag.
-   */
-  void SetUnderlineEnabled(bool enabled);
-
-  /**
-   * @brief Returns whether the text is underlined or not.
-   *
-   * @return The underline state.
-   */
-  bool IsUnderlineEnabled() const;
-
-  /**
-   * @brief Set the override used for underline height, 0 indicates height will be supplied by font metrics
-   *
-   * @param[in] height The height in pixels of the underline
-   */
-  void SetUnderlineHeight(float height);
-
-  /**
-   * @brief Retrieves the override height of an underline, 0 indicates height is supplied by font metrics
-   *
-   * @return The height of the underline, or 0 if height is not overrided.
-   */
-  float GetUnderlineHeight() const;
-
-  /**
-   * @brief Set the outline color.
-   *
-   * @param[in] color color of outline.
-   */
-  void SetOutlineColor(const Vector4& color);
-
-  /**
-   * @brief Retrieve the outline color.
-   *
-   * @return The outline color.
-   */
-  const Vector4& GetOutlineColor() const;
-
-  /**
-   * @brief Set the outline width
-   *
-   * @param[in] width The width in pixels of the outline, 0 indicates no outline
-   */
-  void SetOutlineWidth(uint16_t width);
-
-  /**
-   * @brief Retrieves the width of an outline
-   *
-   * @return The width of the outline.
-   */
-  uint16_t GetOutlineWidth() const;
-
-  /**
-   * @brief Set the background color.
-   *
-   * @param[in] color color of background.
-   */
-  void SetBackgroundColor(const Vector4& color);
-
-  /**
-   * @brief Retrieve the background color.
-   *
-   * @return The background color.
-   */
-  const Vector4& GetBackgroundColor() const;
-
-  /**
-   * @brief Set the background enabled flag.
-   *
-   * @param[in] enabled The background enabled flag.
-   */
-  void SetBackgroundEnabled(bool enabled);
-
-  /**
-   * @brief Returns whether to enable text background or not.
-   *
-   * @return Whether text background is enabled.
-   */
-  bool IsBackgroundEnabled() const;
-
-  /**
-   * @brief Sets the emboss's properties string.
-   *
-   * @note The string is stored to be recovered.
-   *
-   * @param[in] embossProperties The emboss's properties string.
-   */
-  void SetDefaultEmbossProperties(const std::string& embossProperties);
-
-  /**
-   * @brief Retrieves the emboss's properties string.
-   *
-   * @return The emboss's properties string.
-   */
-  const std::string& GetDefaultEmbossProperties() const;
-
-  /**
-   * @brief Sets the outline's properties string.
-   *
-   * @note The string is stored to be recovered.
-   *
-   * @param[in] outlineProperties The outline's properties string.
-   */
-  void SetDefaultOutlineProperties(const std::string& outlineProperties);
-
-  /**
-   * @brief Retrieves the outline's properties string.
-   *
-   * @return The outline's properties string.
-   */
-  const std::string& GetDefaultOutlineProperties() const;
-
-  /**
-   * @brief Sets the default line spacing.
-   *
-   * @param[in] lineSpacing The line spacing.
-   *
-   * @return True if lineSpacing has been updated, false otherwise
-   */
-  bool SetDefaultLineSpacing(float lineSpacing);
-
-  /**
-   * @brief Retrieves the default line spacing.
-   *
-   * @return The line spacing.
-   */
-  float GetDefaultLineSpacing() const;
-
-  /**
-   * @brief Sets the default line size.
-   *
-   * @param[in] lineSize The line size.
-   *
-   * @return True if lineSize has been updated, false otherwise
-   */
-  bool SetDefaultLineSize(float lineSize);
-
-  /**
-   * @brief Retrieves the default line size.
-   *
-   * @return The line size.
-   */
-  float GetDefaultLineSize() const;
-
-  /**
-   * @brief Sets the input text's color.
-   *
-   * @param[in] color The input text's color.
-   */
-  void SetInputColor(const Vector4& color);
-
-  /**
-   * @brief Retrieves the input text's color.
-   *
-   * @return The input text's color.
-   */
-  const Vector4& GetInputColor() const;
-
-  /**
-   * @brief Sets the input text's font family name.
-   *
-   * @param[in] fontFamily The text's font family name.
-   */
-  void SetInputFontFamily(const std::string& fontFamily);
-
-  /**
-   * @brief Retrieves the input text's font family name.
-   *
-   * @return The input text's font family name.
-   */
-  const std::string& GetInputFontFamily() const;
-
-  /**
-   * @brief Sets the input font's weight.
-   *
-   * @param[in] weight The input font's weight.
-   */
-  void SetInputFontWeight(FontWeight weight);
-
-  /**
-   * @return Whether the font's weight has been defined.
-   */
-  bool IsInputFontWeightDefined() const;
-
-  /**
-   * @brief Retrieves the input font's weight.
-   *
-   * @return The input font's weight.
-   */
-  FontWeight GetInputFontWeight() const;
-
-  /**
-   * @brief Sets the input font's width.
-   *
-   * @param[in] width The input font's width.
-   */
-  void SetInputFontWidth(FontWidth width);
-
-  /**
-   * @return Whether the font's width has been defined.
-   */
-  bool IsInputFontWidthDefined() const;
-
-  /**
-   * @brief Retrieves the input font's width.
-   *
-   * @return The input font's width.
-   */
-  FontWidth GetInputFontWidth() const;
-
-  /**
-   * @brief Sets the input font's slant.
-   *
-   * @param[in] slant The input font's slant.
-   */
-  void SetInputFontSlant(FontSlant slant);
-
-  /**
-   * @return Whether the font's slant has been defined.
-   */
-  bool IsInputFontSlantDefined() const;
-
-  /**
-   * @brief Retrieves the input font's slant.
-   *
-   * @return The input font's slant.
-   */
-  FontSlant GetInputFontSlant() const;
-
-  /**
-   * @brief Sets the input font's point size.
-   *
-   * @param[in] size The input font's point size.
-   */
-  void SetInputFontPointSize(float size);
-
-  /**
-   * @brief Retrieves the input font's point size.
-   *
-   * @return The input font's point size.
-   */
-  float GetInputFontPointSize() const;
-
-  /**
-   * @brief Sets the input line spacing.
-   *
-   * @param[in] lineSpacing The line spacing.
-   */
-  void SetInputLineSpacing(float lineSpacing);
-
-  /**
-   * @brief Retrieves the input line spacing.
-   *
-   * @return The line spacing.
-   */
-  float GetInputLineSpacing() const;
-
-  /**
-   * @brief Sets the input shadow's properties string.
-   *
-   * @note The string is stored to be recovered.
-   *
-   * @param[in] shadowProperties The shadow's properties string.
-   */
-  void SetInputShadowProperties(const std::string& shadowProperties);
-
-  /**
-   * @brief Retrieves the input shadow's properties string.
-   *
-   * @return The shadow's properties string.
-   */
-  const std::string& GetInputShadowProperties() const;
-
-  /**
-   * @brief Sets the input underline's properties string.
-   *
-   * @note The string is stored to be recovered.
-   *
-   * @param[in] underlineProperties The underline's properties string.
-   */
-  void SetInputUnderlineProperties(const std::string& underlineProperties);
-
-  /**
-   * @brief Retrieves the input underline's properties string.
-   *
-   * @return The underline's properties string.
-   */
-  const std::string& GetInputUnderlineProperties() const;
-
-  /**
-   * @brief Sets the input emboss's properties string.
-   *
-   * @note The string is stored to be recovered.
-   *
-   * @param[in] embossProperties The emboss's properties string.
-   */
-  void SetInputEmbossProperties(const std::string& embossProperties);
-
-  /**
-   * @brief Retrieves the input emboss's properties string.
-   *
-   * @return The emboss's properties string.
-   */
-  const std::string& GetInputEmbossProperties() const;
-
-  /**
-   * @brief Sets input the outline's properties string.
-   *
-   * @note The string is stored to be recovered.
-   *
-   * @param[in] outlineProperties The outline's properties string.
-   */
-  void SetInputOutlineProperties(const std::string& outlineProperties);
-
-  /**
-   * @brief Retrieves the input outline's properties string.
-   *
-   * @return The outline's properties string.
-   */
-  const std::string& GetInputOutlineProperties() const;
-
-  /**
-   * @brief Set the control's interface.
-   *
-   * @param[in] controlInterface The control's interface.
-   */
-  void SetControlInterface(ControlInterface* controlInterface);
-
-  /**
-   * @brief Set the anchor control's interface.
-   *
-   * @param[in] anchorControlInterface The control's interface.
-   */
-  void SetAnchorControlInterface(AnchorControlInterface* anchorControlInterface);
-
-public: // Queries & retrieves.
-  /**
-   * @brief Return the layout engine.
-   *
-   * @return A reference to the layout engine.
-   */
-  Layout::Engine& GetLayoutEngine();
-
-  /**
-   * @brief Return a view of the text.
-   *
-   * @return A reference to the view.
-   */
-  View& GetView();
-
-  /**
-   * @copydoc Control::GetNaturalSize()
-   */
-  Vector3 GetNaturalSize();
-
-  /**
-   * @copydoc Control::GetHeightForWidth()
-   */
-  float GetHeightForWidth(float width);
-
-  /**
-   * @brief Calculates the point size for text for given layout()
-   */
-  void FitPointSizeforLayout(Size layoutSize);
-
-  /**
-   * @brief Checks if the point size fits within the layout size.
-   *
-   * @return Whether the point size fits within the layout size.
-   */
-  bool CheckForTextFit(float pointSize, Size& layoutSize);
-
-  /**
-   * @brief Retrieves the text's number of lines for a given width.
-   * @param[in] width The width of the text's area.
-   * @ return The number of lines.
-   */
-  int GetLineCount(float width);
-
-  /**
-   * @brief Retrieves the text's model.
-   *
-   * @return A pointer to the text's model.
-   */
-  const ModelInterface* const GetTextModel() const;
-
-  /**
-   * @brief Used to get scrolled distance by user input
-   *
-   * @return Distance from last scroll offset to new scroll offset
-   */
-  float GetScrollAmountByUserInput();
-
-  /**
-   * @brief Get latest scroll amount, control size and layout size
-   *
-   * This method is used to get information of control's scroll
-   * @param[out] scrollPosition The current scrolled position
-   * @param[out] controlHeight The size of a UI control
-   * @param[out] layoutHeight The size of a bounding box to layout text within.
-   *
-   * @return Whether the text scroll position is changed or not after last update.
-   */
-  bool GetTextScrollInfo(float& scrollPosition, float& controlHeight, float& layoutHeight);
-
-  /**
-   * @brief Used to set the hidden input option
-   */
-  void SetHiddenInputOption(const Property::Map& options);
-
-  /**
-   * @brief Used to get the hidden input option
-   */
-  void GetHiddenInputOption(Property::Map& options);
-
-  /**
-   * @brief Used to set the input filter option
-   */
-  void SetInputFilterOption(const Property::Map& options);
-
-  /**
-   * @brief Used to get the input filter option
-   */
-  void GetInputFilterOption(Property::Map& options);
-
-  /**
-   * @brief Sets the Placeholder Properties.
-   *
-   * @param[in] map The placeholder property map
-   */
-  void SetPlaceholderProperty(const Property::Map& map);
-
-  /**
-   * @brief Retrieves the Placeholder Property map.
-   *
-   * @param[out] map The property map
-   */
-  void GetPlaceholderProperty(Property::Map& map);
-
-  /**
-   * @brief Checks text direction.
-   * @return The text direction.
-   */
-  Toolkit::DevelText::TextDirection::Type GetTextDirection();
-
-  /**
-   * @brief Retrieves vertical line alignment
-   * @return The vertical line alignment
-   */
-  Toolkit::DevelText::VerticalLineAlignment::Type GetVerticalLineAlignment() const;
-
-  /**
-   * @brief Sets vertical line alignment
-   * @param[in] alignment The vertical line alignment for the text
-   */
-  void SetVerticalLineAlignment(Toolkit::DevelText::VerticalLineAlignment::Type alignment);
-
-  /**
-   * @brief Retrieves ellipsis position
-   * @return The ellipsis position
-   */
-  Toolkit::DevelText::EllipsisPosition::Type GetEllipsisPosition() const;
-
-  /**
-   * @brief Sets ellipsis position
-   * @param[in] ellipsisPosition The ellipsis position for the text
-   */
-  void SetEllipsisPosition(Toolkit::DevelText::EllipsisPosition::Type ellipsisPosition);
-
-  /**
-   * @brief Retrieves ignoreSpaceAfterText value from model
-   * @return The value of ignoreSpaceAfterText
-   */
-  bool IsIgnoreSpacesAfterText() const;
-
-  /**
-   * @brief Sets ignoreSpaceAfterText value to model
-   * @param[in] ignore The value of ignoreSpacesAfterText for the text
-   */
-  void SetIgnoreSpacesAfterText(bool ignore);
-
-  /**
-   * @brief Sets SetMatchLayoutDirection value to model
-   * @param[in] match The value of matchLayoutDirection for the text
-   */
-  void SetMatchLayoutDirection(DevelText::MatchLayoutDirection type);
-
-  /**
-   * @brief Retrieves matchLayoutDirection value from model
-   * @return The value of matchLayoutDirection
-   */
-  DevelText::MatchLayoutDirection GetMatchLayoutDirection() const;
-
-  /**
-   * @brief Sets layoutDirection type value.
-   * @param[in] layoutDirection The value of the layout direction type.
-   */
-  void SetLayoutDirection(Dali::LayoutDirection::Type layoutDirection);
-
-  /**
-   * @brief Gets layoutDirection type value.
-   * @param[in] actor The actor which will get the layout direction type.
-   * @return The value of the layout direction type.
-   */
-  Dali::LayoutDirection::Type GetLayoutDirection(Dali::Actor& actor) const;
-
-  /**
-   * @brief Sets the layout direction changed.
-   */
-  void ChangedLayoutDirection();
-
-  /**
-   * @brief Retrieves if showing real text or not.
-   * @return The value of showing real text.
-   */
-  bool IsShowingRealText() const;
-
-public: // Relayout.
-  /**
-   * @brief Triggers a relayout which updates View (if necessary).
-   *
-   * @note UI Controls are expected to minimize calls to this method e.g. call once after size negotiation.
-   * @param[in] size A the size of a bounding box to layout text within.
-   * @param[in] layoutDirection The direction of the system language.
-   *
-   * @return Whether the text model or decorations were updated.
-   */
-  UpdateTextType Relayout(const Size& size, Dali::LayoutDirection::Type layoutDirection = Dali::LayoutDirection::LEFT_TO_RIGHT);
-
-  /**
-   * @brief Request a relayout using the ControlInterface.
-   */
-  void RequestRelayout();
-
-public: // Input style change signals.
-  /**
-   * @return Whether the queue of input style changed signals is empty.
-   */
-  bool IsInputStyleChangedSignalsQueueEmpty();
-
-  /**
-   * @brief Process all pending input style changed signals.
-   *
-   * Calls the Text::ControlInterface::InputStyleChanged() method which is overriden by the
-   * text controls. Text controls may send signals to state the input style has changed.
-   */
-  void ProcessInputStyleChangedSignals();
-
-public: // Text-input Event Queuing.
-  /**
-   * @brief Called by editable UI controls when keyboard focus is gained.
-   */
-  void KeyboardFocusGainEvent();
-
-  /**
-   * @brief Called by editable UI controls when focus is lost.
-   */
-  void KeyboardFocusLostEvent();
-
-  /**
-   * @brief Called by editable UI controls when key events are received.
-   *
-   * @param[in] event The key event.
-   * @param[in] type Used to distinguish between regular key events and InputMethodContext events.
-   */
-  bool KeyEvent(const Dali::KeyEvent& event);
-
-  /**
-   * @brief Called by anchor when a tap gesture occurs.
-   * @param[in] x The x position relative to the top-left of the parent control.
-   * @param[in] y The y position relative to the top-left of the parent control.
-   */
-  void AnchorEvent(float x, float y);
-
-  /**
-   * @brief Called by editable UI controls when a tap gesture occurs.
-   * @param[in] tapCount The number of taps.
-   * @param[in] x The x position relative to the top-left of the parent control.
-   * @param[in] y The y position relative to the top-left of the parent control.
-   */
-  void TapEvent(unsigned int tapCount, float x, float y);
-
-  /**
-   * @brief Called by editable UI controls when a pan gesture occurs.
-   *
-   * @param[in] state The state of the gesture.
-   * @param[in] displacement This distance panned since the last pan gesture.
-   */
-  void PanEvent(GestureState state, const Vector2& displacement);
-
-  /**
-   * @brief Called by editable UI controls when a long press gesture occurs.
-   *
-   * @param[in] state The state of the gesture.
-   * @param[in] x The x position relative to the top-left of the parent control.
-   * @param[in] y The y position relative to the top-left of the parent control.
-   */
-  void LongPressEvent(GestureState state, float x, float y);
-
-  /**
-   * @brief Used to get the Primary cursor position.
-   *
-   * @return Primary cursor position.
-   */
-  CharacterIndex GetPrimaryCursorPosition() const;
-
-  /**
-   * @brief Used to set the Primary cursor position.
-   *
-   * @param[in] index for the Primary cursor position.
-   * @param[in] focused true if UI control has gained focus to receive key event, false otherwise.
-   * @return[in] true if cursor position changed, false otherwise.
-   */
-  bool SetPrimaryCursorPosition(CharacterIndex index, bool focused);
-
-  /**
-   * @brief Creates a selection event.
-   *
-   * It could be called from the TapEvent (double tap) or when the text selection popup's sellect all button is pressed.
-   *
-   * @param[in] x The x position relative to the top-left of the parent control.
-   * @param[in] y The y position relative to the top-left of the parent control.
-   * @param[in] selection type like the whole text is selected or unselected.
-   */
-  void SelectEvent(float x, float y, SelectionType selection);
-
-  /**
-   * @brief Creates a selection event with a selection index.
-   *
-   * It could be called from the SelectText().
-   * The start and end parameters are passed through the event.
-   *
-   * @param[in] start The start selection position.
-   * @param[in] end The end selection position.
-   * @param[in] selection type like the range.
-   */
-  void SelectEvent(const uint32_t start, const uint32_t end, SelectionType selection);
-
-  /**
-   * @copydoc Text::SelectableControlInterface::SetTextSelectionRange()
-   */
-  void SetTextSelectionRange(const uint32_t* start, const uint32_t* end);
-
-  /**
-   * @copydoc Text::SelectableControlInterface::GetTextSelectionRange()
-   */
-  Uint32Pair GetTextSelectionRange() const;
-
-  /**
-   * @copydoc Text::SelectableControlInterface::SelectWholeText()
-   */
-  void SelectWholeText();
-
-  /**
-   * @copydoc Text::EditableControlInterface::CopyText()
-   */
-  string CopyText();
-
-  /**
-   * @copydoc Text::EditableControlInterface::CutText()
-   */
-  string CutText();
-
-  /**
-   * @copydoc Text::EditableControlInterface::PasteText()
-   */
-  void PasteText();
-
-  /**
-   * @copydoc Text::SelectableControlInterface::SelectNone()
-   */
-  void SelectNone();
-
-  /**
-   * @copydoc Text::SelectableControlInterface::SelectText()
-   */
-  void SelectText(const uint32_t start, const uint32_t end);
-
-  /**
-   * @copydoc Text::SelectableControlInterface::GetSelectedText()
-   */
-  string GetSelectedText() const;
-
-  /**
-   * @copydoc Text::EditableControlInterface::IsEditable()
-   */
-  virtual bool IsEditable() const;
-
-  /**
-   * @copydoc Text::EditableControlInterface::SetEditable()
-   */
-  virtual void SetEditable(bool editable);
-
-  /**
-   * @copydoc Dali::Toolkit::Internal::TextEditor::ScrollBy()
-   */
-  virtual void ScrollBy(Vector2 scroll);
-
-  /**
-   * @copydoc Dali::Toolkit::Internal::TextEditor::GetHorizontalScrollPosition()
-   */
-  float GetHorizontalScrollPosition();
-
-  /**
-   * @copydoc Dali::Toolkit::Internal::TextEditor::GetVerticalScrollPosition()
-   */
-  float GetVerticalScrollPosition();
-
-  /**
-   * @brief Event received from input method context
-   *
-   * @param[in] inputMethodContext The input method context.
-   * @param[in] inputMethodContextEvent The event received.
-   * @return A data struture indicating if update is needed, cursor position and current text.
-   */
-  InputMethodContext::CallbackData OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent);
-
-  /**
-   * @brief Event from Clipboard notifying an Item has been selected for pasting
-   */
-  void PasteClipboardItemEvent();
-
-  /**
-   * @brief Return true when text control should clear key input focus when escape key is pressed.
-   *
-   * @return Whether text control should clear key input focus or not when escape key is pressed.
-   */
-  bool ShouldClearFocusOnEscape() const;
-
-  /**
-   * @brief Create an actor that renders the text background color
-   *
-   * @return the created actor or an empty handle if no background color needs to be rendered.
-   */
-  Actor CreateBackgroundActor();
-
-  /**
-   * @brief Used to reset the cursor position after setting a new text.
-   *
-   * @param[in] cursorIndex Where to place the cursor.
-   */
-  void ResetCursorPosition(CharacterIndex cursorIndex);
-
-  /**
-   * @brief The method acquires current position of cursor
-   * @return unsigned value with cursor position
-   */
-  CharacterIndex GetCursorPosition();
-
-protected: // Inherit from Text::Decorator::ControllerInterface.
-  /**
-   * @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::GetTargetSize()
-   */
-  void GetTargetSize(Vector2& targetSize) override;
-
-  /**
-   * @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::AddDecoration()
-   */
-  void AddDecoration(Actor& actor, bool needsClipping) override;
-
-  /**
-   * @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::DecorationEvent()
-   */
-  void DecorationEvent(HandleType handle, HandleState state, float x, float y) override;
-
-protected: // Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface.
-  /**
-   * @copydoc Dali::Toolkit::TextSelectionPopup::TextPopupButtonCallbackInterface::TextPopupButtonTouched()
-   */
-  void TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::Buttons button) override;
-
-protected: // Inherit from HiddenText.
-  /**
-   * @brief Invoked from HiddenText when showing time of the last character was expired
-   */
-  void DisplayTimeExpired() override;
-
-private: // Update.
-  /**
-   * @brief Called by editable UI controls when key events are received.
-   *
-   * @param[in] text The text to insert.
-   * @param[in] type Used to distinguish between regular key events and InputMethodContext events.
-   */
-  void InsertText(const std::string& text, InsertType type);
-
-  /**
-   * @copydoc Text::EditableControlInterface::PasteText()
-   */
-  void PasteText(const std::string& stringToPaste);
-
-  /**
-   * @brief Remove a given number of characters
-   *
-   * When predictve text is used the pre-edit text is removed and inserted again with the new characters.
-   * The UpdateInputStyleType @type parameter if set to DONT_UPDATE_INPUT_STYLE avoids to update the input
-   * style when pre-edit text is removed.
-   *
-   * @param[in] cursorOffset Start position from the current cursor position to start deleting characters.
-   * @param[in] numberOfCharacters The number of characters to delete from the cursorOffset.
-   * @param[in] type Whether to update the input style.
-   * @return True if the remove was successful.
-   */
-  bool RemoveText(int                  cursorOffset,
-                  int                  numberOfCharacters,
-                  UpdateInputStyleType type);
-
-  /**
-   * @brief Checks if text is selected and if so removes it.
-   * @return true if text was removed
-   */
-  bool RemoveSelectedText();
-
-  /**
-   * @brief Update anchor position from given number of inserted characters.
-   *
-   * @param[in] numberOfCharacters The number of inserted characters.
-   * @param[in] previousCursorIndex A cursor position before event occurs.
-   */
-  void InsertTextAnchor(int            numberOfCharacters,
-                        CharacterIndex previousCursorIndex);
-
-  /**
-   * @brief Update anchor position from given number of removed characters.
-   *
-   * @param[in] cursorOffset Start position from the current cursor position to start deleting characters.
-   * @param[in] numberOfCharacters The number of removed characters.
-   * @param[in] previousCursorIndex A cursor position before event occurs.
-   */
-  void RemoveTextAnchor(int            cursorOffset,
-                        int            numberOfCharacters,
-                        CharacterIndex previousCursorIndex);
-
-private: // Relayout.
-  /**
-   * @brief Lays-out the text.
-   *
-   * GetNaturalSize(), GetHeightForWidth() and Relayout() calls this method.
-   *
-   * @param[in] size A the size of a bounding box to layout text within.
-   * @param[in] operations The layout operations which need to be done.
-   * @param[out] layoutSize The size of the laid-out text.
-   */
-  bool DoRelayout(const Size&    size,
-                  OperationsMask operations,
-                  Size&          layoutSize);
-
-  /**
-   * @brief Calulates the vertical offset to align the text inside the bounding box.
-   *
-   * @param[in] size The size of the bounding box.
-   */
-  void CalculateVerticalOffset(const Size& size);
-
-private: // Events.
-  /**
-   * @brief Process queued events which modify the model.
-   */
-  void ProcessModifyEvents();
-
-  /**
-   * @brief Used to process an event queued from SetText()
-   */
-  void TextReplacedEvent();
-
-  /**
-   * @brief Used to process an event queued from key events etc.
-   */
-  void TextInsertedEvent();
-
-  /**
-   * @brief Used to process an event queued from backspace key etc.
-   */
-  void TextDeletedEvent();
-
-  /**
-   * @brief Helper to KeyEvent() to handle the backspace or delete key case.
-   *
-   * @param[in] keyCode The keycode for the key pressed
-   * @return True if a character was deleted.
-   */
-  bool DeleteEvent(int keyCode);
-
-private: // Helpers.
-  /**
-   * @brief Used to remove the text included the placeholder text.
-   */
-  void ResetText();
-
-  /**
-   * @brief Helper to show the place holder text..
-   */
-  void ShowPlaceholderText();
-
-  /**
-   * @brief Helper to clear font-specific data (only).
-   */
-  void ClearFontData();
-
-  /**
-   * @brief Helper to clear text's style data.
-   */
-  void ClearStyleData();
-
-  /**
-   * @brief Used to reset the scroll position after setting a new text.
-   */
-  void ResetScrollPosition();
-
-  /**
-   * @brief fill needed relayout parameters when line size is changed & request relayout.
-   */
-  void RelayoutForNewLineSize();
-
-private: // Private contructors & copy operator.
-  /**
-   * @brief Private constructor.
-   */
-  Controller();
-
-  /**
-   * @brief Private constructor.
-   */
-  Controller(ControlInterface* controlInterface);
-
-  /**
-   * @brief Private constructor.
-   */
-  Controller(ControlInterface*           controlInterface,
-             EditableControlInterface*   editableControlInterface,
-             SelectableControlInterface* selectableControlInterface,
-             AnchorControlInterface*     anchorControlInterface);
-
-  // Undefined
-  Controller(const Controller& handle);
-
-  // Undefined
-  Controller& operator=(const Controller& handle);
-
-protected: // Destructor.
-  /**
-   * @brief A reference counted object may only be deleted by calling Unreference().
-   */
-  virtual ~Controller();
-
-public:
-  struct Impl; ///< Made public for testing purposes
-
-private:
-  struct EventHandler;
-  struct InputFontHandler;
-  struct PlaceholderHandler;
-  struct Relayouter;
-  struct TextUpdater;
-
-  Impl* mImpl;
-};
-
-} // namespace Text
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXT_CONTROLLER_H
diff --git a/dali-toolkit/internal/text/text-definitions.h b/dali-toolkit/internal/text/text-definitions.h
index 7cbc279..d5ce520 100644
--- a/dali-toolkit/internal/text/text-definitions.h
+++ b/dali-toolkit/internal/text/text-definitions.h
@@ -2,7 +2,7 @@
 #define DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,7 @@ typedef uint32_t GlyphIndex;                ///< An index into an array of glyph
 typedef uint32_t ScriptRunIndex;            ///< An index into an array of script runs.
 typedef uint32_t FontRunIndex;              ///< An index into an array of font runs.
 typedef uint32_t UnderlineRunIndex;         ///< An index into an array of underline runs.
+typedef uint32_t StrikethroughRunIndex;     ///< An index into an array of underline runs.
 typedef uint32_t BidirectionalRunIndex;     ///< An index into an array of bidirectional info.
 typedef uint32_t BidirectionalLineRunIndex; ///< An index into an array of bidirectional line info.
 typedef uint32_t LineIndex;                 ///< An index into an array of lines.
diff --git a/dali-toolkit/internal/text/text-editable-control-interface.h b/dali-toolkit/internal/text/text-editable-control-interface.h
index 12d4256..f64da8c 100644
--- a/dali-toolkit/internal/text/text-editable-control-interface.h
+++ b/dali-toolkit/internal/text/text-editable-control-interface.h
@@ -88,9 +88,10 @@ public:
    * @brief Add a decoration.
    *
    * @param[in] decoration The actor displaying a decoration.
+   * @param[in] type Whether this decoration is a layer or not, which layer it is.
    * @param[in] needsClipping Whether the actor needs clipping.
    */
-  virtual void AddDecoration(Actor& actor, bool needsClipping) = 0;
+  virtual void AddDecoration(Actor& actor, DecorationType type, bool needsClipping) = 0;
 
   /**
    * @brief Gets the color of the control.
diff --git a/dali-toolkit/internal/text/text-effects-style.cpp b/dali-toolkit/internal/text/text-effects-style.cpp
index a367696..2bf1398 100644
--- a/dali-toolkit/internal/text/text-effects-style.cpp
+++ b/dali-toolkit/internal/text/text-effects-style.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,14 @@
 // FILE HEADER
 #include <dali-toolkit/internal/text/text-effects-style.h>
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/math-utils.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h>
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/property-string-parser.h>
+#include <dali-toolkit/internal/text/text-enumerations-impl.h>
 
 namespace Dali
 {
@@ -31,14 +35,16 @@ namespace Text
 {
 namespace
 {
-const std::string COLOR_KEY("color");
-const std::string OFFSET_KEY("offset");
-const std::string BLUR_RADIUS_KEY("blurRadius");
-const std::string WIDTH_KEY("width");
-const std::string HEIGHT_KEY("height");
-const std::string ENABLE_KEY("enable");
-const std::string TRUE_TOKEN("true");
-const std::string FALSE_TOKEN("false");
+const char* COLOR_KEY = "color";
+const char* OFFSET_KEY = "offset";
+const char* BLUR_RADIUS_KEY = "blurRadius";
+const char* WIDTH_KEY = "width";
+const char* HEIGHT_KEY = "height";
+const char* ENABLE_KEY = "enable";
+const char* TYPE_KEY = "type";
+const char* DASH_WIDTH_KEY = "dashWidth";
+const char* DASH_GAP_KEY = "dashGap";
+const char* TRUE_TOKEN = "true";
 } // namespace
 
 bool ParseShadowProperties(const Property::Map& shadowPropertiesMap,
@@ -106,12 +112,18 @@ bool ParseShadowProperties(const Property::Map& shadowPropertiesMap,
   return 0u == numberOfItems;
 }
 
-bool ParseUnderlineProperties(const Property::Map& underlinePropertiesMap,
-                              bool&                enabled,
-                              bool&                colorDefined,
-                              Vector4&             color,
-                              bool&                heightDefined,
-                              float&               height)
+bool ParseUnderlineProperties(const Property::Map&   underlinePropertiesMap,
+                              bool&                  enabled,
+                              bool&                  colorDefined,
+                              Vector4&               color,
+                              bool&                  heightDefined,
+                              float&                 height,
+                              bool&                  typeDefined,
+                              Text::Underline::Type& type,
+                              bool&                  dashWidthDefined,
+                              float&                 dashWidth,
+                              bool&                  dashGapDefined,
+                              float&                 dashGap)
 {
   const unsigned int numberOfItems = underlinePropertiesMap.Count();
 
@@ -163,6 +175,51 @@ bool ParseUnderlineProperties(const Property::Map& underlinePropertiesMap,
         height = valueGet.second.Get<float>();
       }
     }
+    else if((DevelText::Underline::Property::TYPE == valueGet.first.indexKey) || (TYPE_KEY == valueGet.first.stringKey))
+    {
+      /// Underline Type key.
+      typeDefined = true;
+
+      if(valueGet.second.GetType() == Dali::Property::STRING)
+      {
+        const std::string typeStr = valueGet.second.Get<std::string>();
+        Text::UnderlineTypeStringToTypeValue(typeStr.c_str(), typeStr.size(), type);
+      }
+      else
+      {
+        type = valueGet.second.Get<Text::Underline::Type>();
+      }
+    }
+    else if((DevelText::Underline::Property::DASH_WIDTH == valueGet.first.indexKey) || (DASH_WIDTH_KEY == valueGet.first.stringKey))
+    {
+      /// Dashed Underline Width key.
+      dashWidthDefined = true;
+
+      if(valueGet.second.GetType() == Dali::Property::STRING)
+      {
+        const std::string dashWidthStr = valueGet.second.Get<std::string>();
+        dashWidth                      = StringToFloat(dashWidthStr.c_str());
+      }
+      else
+      {
+        dashWidth = valueGet.second.Get<float>();
+      }
+    }
+    else if((DevelText::Underline::Property::DASH_GAP == valueGet.first.indexKey) || (DASH_GAP_KEY == valueGet.first.stringKey))
+    {
+      /// Dashed Underline Gap key.
+      dashGapDefined = true;
+
+      if(valueGet.second.GetType() == Dali::Property::STRING)
+      {
+        const std::string dashGapStr = valueGet.second.Get<std::string>();
+        dashGap                      = StringToFloat(dashGapStr.c_str());
+      }
+      else
+      {
+        dashGap = valueGet.second.Get<float>();
+      }
+    }
   }
 
   return 0u == numberOfItems;
@@ -226,6 +283,67 @@ bool ParseBackgroundProperties(const Property::Map& backgroundProperties,
   return 0u == numberOfItems;
 }
 
+bool ParseStrikethroughProperties(const Property::Map& strikethroughPropertiesMap,
+                                  bool&                enabled,
+                                  bool&                colorDefined,
+                                  Vector4&             color,
+                                  bool&                heightDefined,
+                                  float&               height)
+{
+  const unsigned int numberOfItems = strikethroughPropertiesMap.Count();
+
+  // Parses and applies the style.
+  for(unsigned int index = 0u; index < numberOfItems; ++index)
+  {
+    const KeyValuePair& valueGet = strikethroughPropertiesMap.GetKeyValue(index);
+
+    if((DevelText::Strikethrough::Property::ENABLE == valueGet.first.indexKey) || (ENABLE_KEY == valueGet.first.stringKey))
+    {
+      /// Enable key.
+      if(valueGet.second.GetType() == Dali::Property::STRING)
+      {
+        const std::string enableStr = valueGet.second.Get<std::string>();
+        enabled                     = Text::TokenComparison(TRUE_TOKEN, enableStr.c_str(), enableStr.size());
+      }
+      else
+      {
+        enabled = valueGet.second.Get<bool>();
+      }
+    }
+    else if((DevelText::Strikethrough::Property::COLOR == valueGet.first.indexKey) || (COLOR_KEY == valueGet.first.stringKey))
+    {
+      /// Color key.
+      colorDefined = true;
+
+      if(valueGet.second.GetType() == Dali::Property::STRING)
+      {
+        const std::string colorStr = valueGet.second.Get<std::string>();
+        Text::ColorStringToVector4(colorStr.c_str(), colorStr.size(), color);
+      }
+      else
+      {
+        color = valueGet.second.Get<Vector4>();
+      }
+    }
+    else if((DevelText::Strikethrough::Property::HEIGHT == valueGet.first.indexKey) || (HEIGHT_KEY == valueGet.first.stringKey))
+    {
+      /// Height key.
+      heightDefined = true;
+
+      if(valueGet.second.GetType() == Dali::Property::STRING)
+      {
+        const std::string heightStr = valueGet.second.Get<std::string>();
+        height                      = StringToFloat(heightStr.c_str());
+      }
+      else
+      {
+        height = valueGet.second.Get<float>();
+      }
+    }
+  }
+  return 0u == numberOfItems;
+}
+
 bool SetUnderlineProperties(ControllerPtr controller, const Property::Value& value, EffectStyle::Type type)
 {
   bool update = false;
@@ -238,11 +356,17 @@ bool SetUnderlineProperties(ControllerPtr controller, const Property::Value& val
       {
         const Property::Map& propertiesMap = value.Get<Property::Map>();
 
-        bool    enabled      = false;
-        bool    colorDefined = false;
-        Vector4 color;
-        bool    heightDefined = false;
-        float   height        = 0.f;
+        bool                  enabled      = false;
+        bool                  colorDefined = false;
+        Vector4               color;
+        bool                  heightDefined = false;
+        float                 height        = 0.f;
+        bool                  typeDefined   = false;
+        Text::Underline::Type type;
+        bool                  dashWidthDefined = false;
+        float                 dashWidth        = 2.0f;
+        bool                  dashGapDefined   = false;
+        float                 dashGap          = 1.0f;
 
         bool empty = true;
 
@@ -261,7 +385,13 @@ bool SetUnderlineProperties(ControllerPtr controller, const Property::Value& val
                                              colorDefined,
                                              color,
                                              heightDefined,
-                                             height);
+                                             height,
+                                             typeDefined,
+                                             type,
+                                             dashWidthDefined,
+                                             dashWidth,
+                                             dashGapDefined,
+                                             dashGap);
 
             controller->UnderlineSetByString(!empty);
           }
@@ -273,7 +403,13 @@ bool SetUnderlineProperties(ControllerPtr controller, const Property::Value& val
                                            colorDefined,
                                            color,
                                            heightDefined,
-                                           height);
+                                           height,
+                                           typeDefined,
+                                           type,
+                                           dashWidthDefined,
+                                           dashWidth,
+                                           dashGapDefined,
+                                           dashGap);
 
           controller->UnderlineSetByString(false);
         }
@@ -298,6 +434,24 @@ bool SetUnderlineProperties(ControllerPtr controller, const Property::Value& val
             controller->SetUnderlineHeight(height);
             update = true;
           }
+
+          if(typeDefined && (controller->GetUnderlineType() != type))
+          {
+            controller->SetUnderlineType(type);
+            update = true;
+          }
+
+          if(dashWidthDefined && (fabsf(controller->GetDashedUnderlineWidth() - dashWidth) > Math::MACHINE_EPSILON_1000))
+          {
+            controller->SetDashedUnderlineWidth(dashWidth);
+            update = true;
+          }
+
+          if(dashGapDefined && (fabsf(controller->GetDashedUnderlineGap() - dashGap) > Math::MACHINE_EPSILON_1000))
+          {
+            controller->SetDashedUnderlineGap(dashGap);
+            update = true;
+          }
         }
         else
         {
@@ -331,9 +485,12 @@ void GetUnderlineProperties(ControllerPtr controller, Property::Value& value, Ef
     {
       case EffectStyle::DEFAULT:
       {
-        const bool     enabled = controller->IsUnderlineEnabled();
-        const Vector4& color   = controller->GetUnderlineColor();
-        const float    height  = controller->GetUnderlineHeight();
+        const bool                  enabled   = controller->IsUnderlineEnabled();
+        const Vector4&              color     = controller->GetUnderlineColor();
+        const float                 height    = controller->GetUnderlineHeight();
+        const Text::Underline::Type type      = controller->GetUnderlineType();
+        const float                 dashWidth = controller->GetDashedUnderlineWidth();
+        const float                 dashGap   = controller->GetDashedUnderlineGap();
 
         if(controller->IsUnderlineSetByString())
         {
@@ -347,7 +504,19 @@ void GetUnderlineProperties(ControllerPtr controller, Property::Value& value, Ef
 
           std::string heightStr;
           FloatToString(height, heightStr);
-          underlineProperties += "\"height\":\"" + heightStr + "\"}";
+          underlineProperties += "\"height\":\"" + heightStr + "\",";
+
+          std::string typeStr;
+          typeStr = GetUnderlineTypeToString(type);
+          underlineProperties += "\"type\":\"" + typeStr + "\",";
+
+          std::string dashWidthStr;
+          FloatToString(dashWidth, dashWidthStr);
+          underlineProperties += "\"dashWidth\":\"" + dashWidthStr + "\",";
+
+          std::string dashGapStr;
+          FloatToString(dashGap, dashGapStr);
+          underlineProperties += "\"dashGap\":\"" + dashGapStr + "\"}";
 
           value = underlineProperties;
         }
@@ -358,6 +527,9 @@ void GetUnderlineProperties(ControllerPtr controller, Property::Value& value, Ef
           map.Insert(ENABLE_KEY, enabled);
           map.Insert(COLOR_KEY, color);
           map.Insert(HEIGHT_KEY, height);
+          map.Insert(TYPE_KEY, type);
+          map.Insert(DASH_WIDTH_KEY, dashWidth);
+          map.Insert(DASH_GAP_KEY, dashGap);
 
           value = map;
         }
@@ -440,7 +612,7 @@ bool SetShadowProperties(ControllerPtr controller, const Property::Value& value,
             update = true;
           }
 
-          if(blurRadiusDefined && (controller->GetShadowBlurRadius() != blurRadius))
+          if(blurRadiusDefined && (!Dali::Equals(controller->GetShadowBlurRadius(), blurRadius)))
           {
             controller->SetShadowBlurRadius(blurRadius);
             update = true;
@@ -774,6 +946,164 @@ void GetBackgroundProperties(ControllerPtr controller, Property::Value& value, E
   }
 }
 
+bool SetStrikethroughProperties(ControllerPtr controller, const Property::Value& value, EffectStyle::Type type)
+{
+  bool update = false;
+
+  if(controller)
+  {
+    switch(type)
+    {
+      case EffectStyle::DEFAULT:
+      {
+        const Property::Map& propertiesMap = value.Get<Property::Map>();
+
+        bool    enabled      = false;
+        bool    colorDefined = false;
+        Vector4 color;
+        bool    heightDefined = false;
+        float   height        = 0.f;
+
+        bool empty = true;
+
+        if(propertiesMap.Empty())
+        {
+          // Map empty so check if a string provided
+          const std::string propertyString = value.Get<std::string>();
+
+          if(!propertyString.empty())
+          {
+            Property::Map parsedStringMap;
+            Text::ParsePropertyString(propertyString, parsedStringMap);
+
+            empty = ParseStrikethroughProperties(parsedStringMap,
+                                                 enabled,
+                                                 colorDefined,
+                                                 color,
+                                                 heightDefined,
+                                                 height);
+
+            controller->StrikethroughSetByString(!empty);
+          }
+        }
+        else
+        {
+          empty = ParseStrikethroughProperties(propertiesMap,
+                                               enabled,
+                                               colorDefined,
+                                               color,
+                                               heightDefined,
+                                               height);
+
+          controller->StrikethroughSetByString(false);
+        }
+
+        if(!empty)
+        {
+          if(enabled != controller->IsStrikethroughEnabled())
+          {
+            controller->SetStrikethroughEnabled(enabled);
+            update = true;
+          }
+
+          // Sets the default strikethrough values.
+          if(colorDefined && (controller->GetStrikethroughColor() != color))
+          {
+            controller->SetStrikethroughColor(color);
+            update = true;
+          }
+          if(heightDefined && (fabsf(controller->GetStrikethroughHeight() - height) > Math::MACHINE_EPSILON_1000))
+          {
+            controller->SetStrikethroughHeight(height);
+            update = true;
+          }
+        }
+        else
+        {
+          // Disable strikethrough.
+          if(controller->IsStrikethroughEnabled())
+          {
+            controller->SetStrikethroughEnabled(false);
+            update = true;
+          }
+        }
+        break;
+      }
+      case EffectStyle::INPUT:
+      {
+        const std::string& strikethroughProperties = value.Get<std::string>();
+
+        controller->SetInputStrikethroughProperties(strikethroughProperties);
+        update = true;
+        break;
+      }
+    } // switch
+  }   // if( controller )
+
+  return update;
+}
+
+void GetStrikethroughProperties(ControllerPtr controller, Property::Value& value, EffectStyle::Type type)
+{
+  if(controller)
+  {
+    switch(type)
+    {
+      case EffectStyle::DEFAULT:
+      {
+        const bool     enabled = controller->IsStrikethroughEnabled();
+        const Vector4& color   = controller->GetStrikethroughColor();
+        const float    height  = controller->GetStrikethroughHeight();
+
+        if(controller->IsStrikethroughSetByString())
+        {
+          std::string       strikethroughProperties = "{\"enable\":";
+          const std::string enabledStr              = enabled ? "true" : "false";
+          strikethroughProperties += "\"" + enabledStr + "\",";
+
+          std::string colorStr;
+          Vector4ToColorString(color, colorStr);
+          strikethroughProperties += "\"color\":\"" + colorStr + "\",";
+
+          std::string heightStr;
+          FloatToString(height, heightStr);
+          strikethroughProperties += "\"height\":\"" + heightStr + "\"}";
+
+          value = strikethroughProperties;
+        }
+        else
+        {
+          Property::Map map;
+
+          map.Insert(ENABLE_KEY, enabled);
+          map.Insert(COLOR_KEY, color);
+          map.Insert(HEIGHT_KEY, height);
+
+          value = map;
+        }
+
+        break;
+      }
+      case EffectStyle::INPUT:
+      {
+        value = controller->GetInputStrikethroughProperties();
+        break;
+      }
+    }
+  }
+}
+
+Underline::Type StringToUnderlineType(const char* const underlineTypeStr)
+{
+  Underline::Type underlineType = Text::Underline::SOLID;
+  Scripting::GetEnumeration<Underline::Type>(underlineTypeStr,
+                                             UNDERLINE_TYPE_STRING_TABLE,
+                                             UNDERLINE_TYPE_STRING_TABLE_COUNT,
+                                             underlineType);
+
+  return underlineType;
+}
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/text/text-effects-style.h b/dali-toolkit/internal/text/text-effects-style.h
index fcc2381..0ceeab3 100644
--- a/dali-toolkit/internal/text/text-effects-style.h
+++ b/dali-toolkit/internal/text/text-effects-style.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_EFFECTS_STYLE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+#include <dali/devel-api/scripting/scripting.h>
 
 namespace Dali
 {
@@ -27,6 +29,12 @@ namespace Toolkit
 {
 namespace Text
 {
+const Scripting::StringEnum UNDERLINE_TYPE_STRING_TABLE[] =
+  {
+    {"solid", Text::Underline::SOLID},
+    {"dashed", Text::Underline::DASHED},
+    {"double", Text::Underline::DOUBLE}};
+const unsigned int UNDERLINE_TYPE_STRING_TABLE_COUNT = sizeof(UNDERLINE_TYPE_STRING_TABLE) / sizeof(UNDERLINE_TYPE_STRING_TABLE[0]);
 namespace EffectStyle
 {
 enum Type
@@ -60,13 +68,22 @@ bool ParseShadowProperties(const Property::Map& shadowProperties,
  * @param[out] color The underline's color.
  * @param[out] heightDefined Whether the underline's height is defined.
  * @param[out] height The underline's height.
+ * @param[out] type The underline's type; DASHED, DOUBLE, etc. Default is a solid underline.
+ * @param[out] dashWidth The dashed underline's width.
+ * @param[out] dashGap The dashed underline's gap.
  */
-bool ParseUnderlineProperties(const Property::Map& underlineProperties,
-                              bool&                enabled,
-                              bool&                colorDefined,
-                              Vector4&             color,
-                              bool&                heightDefined,
-                              float&               height);
+bool ParseUnderlineProperties(const Property::Map&   underlineProperties,
+                              bool&                  enabled,
+                              bool&                  colorDefined,
+                              Vector4&               color,
+                              bool&                  heightDefined,
+                              float&                 height,
+                              bool&                  typeDefined,
+                              Text::Underline::Type& type,
+                              bool&                  widthDefined,
+                              float&                 dashWidth,
+                              bool&                  dashGapDefined,
+                              float&                 dashGap);
 
 /**
  * @brief Parses the outline properties.
@@ -97,6 +114,23 @@ bool ParseBackgroundProperties(const Property::Map& backgroundProperties,
                                Vector4&             color);
 
 /**
+ * @brief Parses the strikethrough properties.
+ *
+ * @param[in] strikethroughProperties The map with the strikethrough properties.
+ * @param[out] enabled Whether the strikethrough is enabled.
+ * @param[out] colorDefined Whether the strikethrough's color is defined.
+ * @param[out] color The strikethrough's color.
+ * @param[out] heightDefined Whether the strikethrough's height is defined.
+ * @param[out] height The strikethrough's height.
+ */
+bool ParseStrikethroughProperties(const Property::Map& strikethroughProperties,
+                                  bool&                enabled,
+                                  bool&                colorDefined,
+                                  Vector4&             color,
+                                  bool&                heightDefined,
+                                  float&               height);
+
+/**
  * @brief Sets the underline properties.
  *
  * @param[in] controller The text's controller.
@@ -108,6 +142,17 @@ bool ParseBackgroundProperties(const Property::Map& backgroundProperties,
 bool SetUnderlineProperties(ControllerPtr controller, const Property::Value& value, EffectStyle::Type type);
 
 /**
+ * @brief Sets the strikethrough properties.
+ *
+ * @param[in] controller The text's controller.
+ * @param[in] value The values of the strikethrough's properties.
+ * @param[in] type Whether the property is for the default strikethrough or the input strikethrough.
+ *
+ * @return Whether the strikethrough properties have been updated.
+ */
+bool SetStrikethroughProperties(ControllerPtr controller, const Property::Value& value, EffectStyle::Type type);
+
+/**
  * @brief Retrieves the underline's properties.
  *
  * @param[in] controller The text's controller.
@@ -117,6 +162,15 @@ bool SetUnderlineProperties(ControllerPtr controller, const Property::Value& val
 void GetUnderlineProperties(ControllerPtr controller, Property::Value& value, EffectStyle::Type type);
 
 /**
+ * @brief Retrieves the strikethrough's properties.
+ *
+ * @param[in] controller The text's controller.
+ * @param[out] value The value of the strikethrough's properties.
+ * @param[in] type Whether the property is for the default strikethrough or the input strikethrough.
+ */
+void GetStrikethroughProperties(ControllerPtr controller, Property::Value& value, EffectStyle::Type type);
+
+/**
  * @brief Sets the shadow properties.
  *
  * @param[in] controller The text's controller.
@@ -196,6 +250,15 @@ bool SetBackgroundProperties(ControllerPtr controller, const Property::Value& va
  */
 void GetBackgroundProperties(ControllerPtr controller, Property::Value& value, EffectStyle::Type type);
 
+/**
+ * @brief Converts a underline type string into @e Underline::Type
+ *
+ * @param[in] underlineTypeStr The underline type string. Must end with '\0'.
+ *
+ * @return The @e Underline::Type value corresponding to the string.
+ */
+Underline::Type StringToUnderlineType(const char* const underlineTypeStr);
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/text/text-enumerations-impl.cpp b/dali-toolkit/internal/text/text-enumerations-impl.cpp
index ebb567d..0296dfd 100644
--- a/dali-toolkit/internal/text/text-enumerations-impl.cpp
+++ b/dali-toolkit/internal/text/text-enumerations-impl.cpp
@@ -55,6 +55,11 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(ELLIPSIS_POSITION_TYPE)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::DevelText::EllipsisPosition, MIDDLE)
 DALI_ENUM_TO_STRING_TABLE_END(ELLIPSIS_POSITION_TYPE)
 
+DALI_ENUM_TO_STRING_TABLE_BEGIN(UNDERLINE_TYPE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::Underline::Type, SOLID)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::Underline::Type, DASHED)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::Underline::Type, DOUBLE)
+DALI_ENUM_TO_STRING_TABLE_END(UNDERLINE_TYPE)
 } // namespace
 
 bool GetHorizontalAlignmentEnumeration(const Property::Value& propertyValue, Toolkit::Text::HorizontalAlignment::Type& alignment)
@@ -91,6 +96,13 @@ bool GetEllipsisPositionTypeEnumeration(const Property::Value& propertyValue, To
   return Scripting::GetEnumerationProperty(propertyValue, ELLIPSIS_POSITION_TYPE_TABLE, ELLIPSIS_POSITION_TYPE_TABLE_COUNT, ellipsisPositionType);
 }
 
+const char* GetUnderlineTypeToString(const Toolkit::Text::Underline::Type& type)
+{
+  return Scripting::GetLinearEnumerationName<Toolkit::Text::Underline::Type>(type,
+                                                                             UNDERLINE_TYPE_TABLE,
+                                                                             UNDERLINE_TYPE_TABLE_COUNT);
+}
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/text/text-enumerations-impl.h b/dali-toolkit/internal/text/text-enumerations-impl.h
index af71f7d..3aa1fbd 100644
--- a/dali-toolkit/internal/text/text-enumerations-impl.h
+++ b/dali-toolkit/internal/text/text-enumerations-impl.h
@@ -78,6 +78,13 @@ const char* GetVerticalAlignmentString(const Toolkit::Text::VerticalAlignment::T
  */
 bool GetEllipsisPositionTypeEnumeration(const Property::Value& propertyValue, Toolkit::DevelText::EllipsisPosition::Type& ellipsisPositionType);
 
+/**
+ * @brief Converts the underline type to string format.
+ * @param[in] type the Toolkit::Text::Underline::Type enum source
+ * @return the string equivalent
+ */
+const char* GetUnderlineTypeToString(const Toolkit::Text::Underline::Type& type);
+
 } // namespace Text
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/text/text-font-style.cpp b/dali-toolkit/internal/text/text-font-style.cpp
index 117268a..f087a1e 100644
--- a/dali-toolkit/internal/text/text-font-style.cpp
+++ b/dali-toolkit/internal/text/text-font-style.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
+#include <dali-toolkit/internal/text/markup-processor/markup-processor-helper-functions.h>
 #include <dali-toolkit/internal/text/property-string-parser.h>
 
 namespace Dali
@@ -33,14 +33,13 @@ namespace Text
 {
 namespace
 {
-const std::string STYLE_KEY("style");
-const std::string WEIGHT_KEY("weight");
-const std::string WIDTH_KEY("width");
-const std::string SLANT_KEY("slant");
-const std::string FAMILY_KEY("family");
-const std::string TYPE_KEY("type");
-
-const std::string SYSTEM_TOKEN("system");
+const char* WEIGHT_KEY = "weight";
+const char* WIDTH_KEY = "width";
+const char* SLANT_KEY = "slant";
+const char* FAMILY_KEY = "family";
+const char* TYPE_KEY = "type";
+
+const char* SYSTEM_TOKEN = "system";
 
 } // namespace
 
diff --git a/dali-toolkit/internal/text/text-font-style.h b/dali-toolkit/internal/text/text-font-style.h
index c85ec58..e2955c7 100644
--- a/dali-toolkit/internal/text/text-font-style.h
+++ b/dali-toolkit/internal/text/text-font-style.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/devel-api/scripting/scripting.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-geometry.cpp b/dali-toolkit/internal/text/text-geometry.cpp
new file mode 100644
index 0000000..3635d0c
--- /dev/null
+++ b/dali-toolkit/internal/text/text-geometry.cpp
@@ -0,0 +1,522 @@
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/text/text-geometry.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/math/math-utils.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/cursor-helper-functions.h>
+#include <dali-toolkit/internal/text/line-run.h>
+#include <dali-toolkit/internal/text/visual-model-impl.h>
+#include <algorithm>
+
+using namespace Dali;
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+bool GetNextLine(GlyphIndex index, LineIndex& lineIndex, LineRun*& lineRun, GlyphIndex& lastGlyphOfLine, Length numberOfLines, bool& isLastLine)
+{
+  if(index == lastGlyphOfLine)
+  {
+    ++lineIndex;
+    if(lineIndex < numberOfLines)
+    {
+      isLastLine = (lineIndex + 1 == numberOfLines);
+      ++lineRun;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+void UpdateLineInfo(const LineRun* lineRun, float& currentLineOffset, float& currentLineHeight, GlyphIndex& lastGlyphOfLine, bool isLastLine)
+{
+  lastGlyphOfLine   = lineRun->glyphRun.glyphIndex + lineRun->glyphRun.numberOfGlyphs - 1u;
+  currentLineOffset = currentLineOffset + currentLineHeight;
+  currentLineHeight = GetLineHeight(*lineRun, isLastLine);
+}
+
+void GetTextGeometry(ModelPtr textModel, CharacterIndex startIndex, CharacterIndex endIndex, Vector<Vector2>& sizesList, Vector<Vector2>& positionsList)
+{
+  VisualModelPtr&  visualModel  = textModel->mVisualModel;
+  LogicalModelPtr& logicalModel = textModel->mLogicalModel;
+
+  const GlyphIndex* const         charactersToGlyphBuffer        = visualModel->mCharactersToGlyph.Begin();
+  const Length* const             glyphsPerCharacterBuffer       = visualModel->mGlyphsPerCharacter.Begin();
+  const GlyphInfo* const          glyphsBuffer                   = visualModel->mGlyphs.Begin();
+  const Vector2* const            positionsBuffer                = visualModel->mGlyphPositions.Begin();
+  const Length* const             charactersPerGlyphBuffer       = visualModel->mCharactersPerGlyph.Begin();
+  const CharacterIndex* const     glyphToCharacterBuffer         = visualModel->mGlyphsToCharacters.Begin();
+  const CharacterDirection* const modelCharacterDirectionsBuffer = (0u != logicalModel->mCharacterDirections.Count()) ? logicalModel->mCharacterDirections.Begin() : NULL;
+
+  //Clear the lists
+  sizesList.Clear();
+  positionsList.Clear();
+
+  if(charactersToGlyphBuffer == nullptr || glyphsPerCharacterBuffer == nullptr || charactersPerGlyphBuffer == nullptr || glyphToCharacterBuffer == nullptr)
+  {
+    return;
+  }
+
+  if(startIndex >= logicalModel->mText.Count() && endIndex >= logicalModel->mText.Count())
+  {
+    return;
+  }
+
+  if(startIndex >= logicalModel->mText.Count())
+  {
+    startIndex = static_cast<CharacterIndex>(logicalModel->mText.Count() - 1u);
+  }
+
+  if(endIndex >= logicalModel->mText.Count())
+  {
+    endIndex = static_cast<CharacterIndex>(logicalModel->mText.Count() - 1u);
+  }
+
+  if(startIndex > endIndex)
+  {
+    std::swap(startIndex, endIndex);
+  }
+
+  LineRun*   lineRun    = visualModel->mLines.Begin();
+  GlyphIndex glyphStart = *(charactersToGlyphBuffer + startIndex);
+
+  //if glyph not in the first line (in some ellipsis cases)
+  if(glyphStart < lineRun->glyphRun.glyphIndex)
+  {
+    glyphStart = lineRun->glyphRun.glyphIndex;
+    startIndex = *(glyphToCharacterBuffer + glyphStart);
+
+    if(startIndex > endIndex)
+    {
+      std::swap(startIndex, endIndex);
+    }
+  }
+
+  const Length numberOfGlyphs = *(glyphsPerCharacterBuffer + endIndex);
+  GlyphIndex   glyphEnd       = *(charactersToGlyphBuffer + endIndex) + ((numberOfGlyphs > 0) ? numberOfGlyphs - 1u : 0u);
+  LineIndex    lineIndex      = visualModel->GetLineOfCharacter(startIndex);
+  Length       numberOfLines  = visualModel->GetTotalNumberOfLines();
+  bool         isLastLine     = lineIndex + 1 == numberOfLines;
+
+  LineIndex firstLineIndex = lineIndex;
+  Size      textInLineSize;
+  Vector2   textInLinePosition;
+
+  lineRun += firstLineIndex;
+
+  //get the first line and its vertical offset
+  float      currentLineOffset = CalculateLineOffset(visualModel->mLines, firstLineIndex);
+  float      currentLineHeight = GetLineHeight(*lineRun, isLastLine);
+  GlyphIndex lastGlyphOfLine   = lineRun->glyphRun.glyphIndex + lineRun->glyphRun.numberOfGlyphs - 1;
+
+  // Check if the first/last glyph is a ligature that needs be splitted like English fi or Arabic ï»».
+  const Length numberOfCharactersStart = *(charactersPerGlyphBuffer + glyphStart);
+  const Length numberOfCharactersEnd   = *(charactersPerGlyphBuffer + glyphEnd);
+
+  bool splitStartGlyph = (numberOfCharactersStart > 1u) && HasLigatureMustBreak(logicalModel->GetScript(startIndex));
+  bool splitEndGlyph   = (glyphStart != glyphEnd) && (numberOfCharactersEnd > 1u) && HasLigatureMustBreak(logicalModel->GetScript(endIndex));
+
+  Vector2            currentSize;
+  Vector2            currentPosition;
+  Vector2            blockSize;
+  Vector2            blockPos;
+  CharacterDirection isCurrentRightToLeft;
+
+  CharacterDirection                      isPrevoiusRightToLeft           = (nullptr != modelCharacterDirectionsBuffer ? *(modelCharacterDirectionsBuffer + startIndex) : false);
+  const bool                              isEllipsisEnabled               = textModel->mElideEnabled;
+  const GlyphIndex                        startIndexOfGlyphs              = textModel->GetStartIndexOfElidedGlyphs();
+  const GlyphIndex                        endIndexOfGlyphs                = textModel->GetEndIndexOfElidedGlyphs();
+  const GlyphIndex                        firstMiddleIndexOfElidedGlyphs  = textModel->GetFirstMiddleIndexOfElidedGlyphs();
+  const GlyphIndex                        secondMiddleIndexOfElidedGlyphs = textModel->GetSecondMiddleIndexOfElidedGlyphs();
+  const DevelText::EllipsisPosition::Type ellipsisPosition                = textModel->GetEllipsisPosition();
+
+  for(GlyphIndex index = glyphStart; index <= glyphEnd; ++index)
+  {
+    if(isEllipsisEnabled)
+    {
+      if(ellipsisPosition == DevelText::EllipsisPosition::MIDDLE)
+      {
+        if(index >= firstMiddleIndexOfElidedGlyphs &&
+           index < secondMiddleIndexOfElidedGlyphs)
+        {
+          if((index - 1 == firstMiddleIndexOfElidedGlyphs) && (firstMiddleIndexOfElidedGlyphs != 0))
+          {
+            sizesList.PushBack(blockSize);
+            positionsList.PushBack(blockPos);
+          }
+
+          if(GetNextLine(index, lineIndex, lineRun, lastGlyphOfLine, numberOfLines, isLastLine))
+          {
+            UpdateLineInfo(lineRun, currentLineOffset, currentLineHeight, lastGlyphOfLine, isLastLine);
+          }
+          // Ignore any glyph that was removed
+          continue;
+        }
+      }
+      else
+      {
+        if((ellipsisPosition == DevelText::EllipsisPosition::END) && (index > endIndexOfGlyphs))
+        {
+          //skip remaining elided glyphs
+          break;
+        }
+        else if((ellipsisPosition == DevelText::EllipsisPosition::START) && (index <= startIndexOfGlyphs))
+        {
+          if(GetNextLine(index, lineIndex, lineRun, lastGlyphOfLine, numberOfLines, isLastLine))
+          {
+            UpdateLineInfo(lineRun, currentLineOffset, currentLineHeight, lastGlyphOfLine, isLastLine);
+          }
+
+          continue;
+        }
+      }
+    }
+
+    const GlyphInfo& glyph    = *(glyphsBuffer + index);
+    const Vector2&   position = *(positionsBuffer + index);
+
+    // If NULL, means all of the characters is left to right.
+    isCurrentRightToLeft = (nullptr != modelCharacterDirectionsBuffer ? *(modelCharacterDirectionsBuffer + *(glyphToCharacterBuffer + index)) : false);
+
+    if(splitStartGlyph && (index == glyphStart))
+    {
+      // If the first glyph is a ligature that needs to be splitted, we may need only to add part of the glyph.
+      const float          glyphAdvance       = glyph.advance / static_cast<float>(numberOfCharactersStart);
+      const CharacterIndex interGlyphIndex    = startIndex - *(glyphToCharacterBuffer + glyphStart);
+      const Length         numberOfCharacters = (glyphStart == glyphEnd) ? (endIndex - startIndex) + 1 : (numberOfCharactersStart - interGlyphIndex);
+
+      currentPosition.x = lineRun->alignmentOffset + position.x - glyph.xBearing + textModel->mScrollPosition.x + glyphAdvance * static_cast<float>(isCurrentRightToLeft ? (numberOfCharactersStart - interGlyphIndex - numberOfCharacters) : interGlyphIndex);
+      currentPosition.y = currentLineOffset + textModel->mScrollPosition.y;
+      currentSize.x     = static_cast<float>(numberOfCharacters) * glyphAdvance;
+      currentSize.y     = currentLineHeight;
+      splitStartGlyph   = false;
+    }
+    else if(splitEndGlyph && (index == glyphEnd))
+    {
+      const float          glyphAdvance       = glyph.advance / static_cast<float>(numberOfCharactersEnd);
+      const CharacterIndex interGlyphIndex    = endIndex - *(glyphToCharacterBuffer + glyphEnd);
+      const Length         numberOfCharacters = numberOfCharactersEnd - interGlyphIndex - 1;
+
+      currentPosition.x = lineRun->alignmentOffset + position.x - glyph.xBearing + textModel->mScrollPosition.x + (isCurrentRightToLeft ? (glyphAdvance * static_cast<float>(numberOfCharacters)) : 0.f);
+      currentPosition.y = currentLineOffset + textModel->mScrollPosition.y;
+      currentSize.x     = static_cast<float>(interGlyphIndex + 1) * glyphAdvance;
+      currentSize.y     = currentLineHeight;
+      splitEndGlyph     = false;
+    }
+    else
+    {
+      currentPosition.x = lineRun->alignmentOffset + position.x - glyph.xBearing + textModel->mScrollPosition.x;
+      currentPosition.y = currentLineOffset + textModel->mScrollPosition.y;
+      currentSize.x     = glyph.advance;
+      currentSize.y     = currentLineHeight;
+
+      // if there is next line to retrieve.
+      if(GetNextLine(index, lineIndex, lineRun, lastGlyphOfLine, numberOfLines, isLastLine))
+      {
+        UpdateLineInfo(lineRun, currentLineOffset, currentLineHeight, lastGlyphOfLine, isLastLine);
+      }
+    }
+
+    if((index == glyphStart) || (isEllipsisEnabled && (((ellipsisPosition == DevelText::EllipsisPosition::MIDDLE) && (index == secondMiddleIndexOfElidedGlyphs)) || ((ellipsisPosition == DevelText::EllipsisPosition::START) && (index - 1 == startIndexOfGlyphs)))))
+    {
+      blockPos  = currentPosition;
+      blockSize = currentSize;
+    }
+    else if((isPrevoiusRightToLeft != isCurrentRightToLeft) || (!Dali::Equals(blockPos.y, currentPosition.y))) //new direction or new line
+    {
+      sizesList.PushBack(blockSize);
+      positionsList.PushBack(blockPos);
+
+      blockPos  = currentPosition;
+      blockSize = currentSize;
+    }
+    else
+    {
+      if(isCurrentRightToLeft)
+      {
+        blockPos.x -= currentSize.x;
+      }
+
+      blockSize.x += currentSize.x;
+    }
+
+    isPrevoiusRightToLeft = isCurrentRightToLeft;
+  }
+
+  //add last block
+  sizesList.PushBack(blockSize);
+  positionsList.PushBack(blockPos);
+}
+
+float GetLineLeft(const LineRun& lineRun)
+{
+  return lineRun.alignmentOffset;
+}
+
+float GetLineTop(const Vector<LineRun>& lines, const LineRun& lineRun)
+{
+  float     lineTop       = 0;
+  const int numberOfLines = (int)lines.Count();
+
+  int                            currentLineIndex = 0;
+  Vector<LineRun>::ConstIterator endIt            = (&lineRun);
+  for(Vector<LineRun>::Iterator it = lines.Begin();
+      it != endIt;
+      ++it, ++currentLineIndex)
+  {
+    LineRun& line       = *it;
+    bool     isLastLine = (currentLineIndex + 1) == numberOfLines;
+    lineTop += GetLineHeight(line, isLastLine);
+  }
+
+  return lineTop;
+}
+
+float GetLineWidth(const LineRun& lineRun)
+{
+  return lineRun.width;
+}
+
+Rect<float> GetLineBoundingRect(ModelPtr textModel, const uint32_t lineIndex)
+{
+  if(textModel->mVisualModel == nullptr)
+  {
+    return {0, 0, 0, 0};
+  }
+
+  Length numberOfLines = textModel->mVisualModel->GetTotalNumberOfLines();
+
+  if(lineIndex >= numberOfLines)
+  {
+    return {0, 0, 0, 0};
+  }
+
+  const Vector<LineRun>& lines       = textModel->mVisualModel->mLines;
+  const LineRun&         lineRun     = lines[lineIndex];
+  bool                   isFirstLine = lineIndex == 0;
+  bool                   isLastLine  = (lineIndex + 1) == numberOfLines;
+
+  // Calculate the Left(lineX) = X position.
+  float lineX = GetLineLeft(lineRun) + textModel->mScrollPosition.x;
+
+  // Calculate the Top(lineY) = PreviousHeights.
+  // If the line is the first line of the text; its top = 0.
+  float lineY = (isFirstLine ? 0 : GetLineTop(lines, lineRun)) + textModel->mScrollPosition.y;
+
+  // The rectangle contains the width and height:
+  float lineWidth  = GetLineWidth(lineRun);
+  float lineHeight = GetLineHeight(lineRun, isLastLine);
+
+  return {lineX, lineY, lineWidth, lineHeight};
+}
+
+float GetCharacterLeft(const GlyphInfo& glyph, const Vector2& characterPosition)
+{
+  return characterPosition.x - glyph.xBearing;
+}
+
+float GetCharacterTop(const float& yPosition)
+{
+  return (-1 * yPosition);
+}
+
+float GetCharacterHeight(const GlyphInfo& glyph)
+{
+  return glyph.height;
+}
+
+float GetCharacterWidth(const GlyphInfo& glyph)
+{
+  return glyph.advance;
+}
+
+Rect<> GetCharacterBoundingRect(ModelPtr textModel, const uint32_t charIndex)
+{
+  if(textModel->mVisualModel == nullptr)
+  {
+    return {0, 0, 0, 0};
+  }
+
+  VisualModelPtr&  visualModel  = textModel->mVisualModel;
+  LogicalModelPtr& logicalModel = textModel->mLogicalModel;
+
+  if(charIndex >= logicalModel->mText.Count() || visualModel->mLines.Empty())
+  {
+    return {0, 0, 0, 0};
+  }
+
+  const Vector<Vector2>&   glyphPositions = visualModel->mGlyphPositions;
+  const Vector<GlyphInfo>& glyphs         = visualModel->mGlyphs;
+  const Vector<LineRun>&   lines          = visualModel->mLines;
+
+  //For each character, the index of the first glyph.
+  const GlyphIndex glyphIndex = visualModel->mCharactersToGlyph[charIndex]; //took its glyphs
+
+  const Vector2&   characterPosition = glyphPositions[glyphIndex];
+  const GlyphInfo& glyphInfo         = glyphs[glyphIndex];
+
+  // GetLineOfCharacter function returns 0 if the lines are empty
+  const int      lineIndex = visualModel->GetLineOfCharacter(charIndex);
+  const LineRun& lineRun   = lines[lineIndex];
+
+  //Calculate the left: x position of the glyph + alignmentOffset of the line +  mScrollPosition.x.
+  float characterX = lineRun.alignmentOffset + GetCharacterLeft(glyphInfo, characterPosition) + textModel->mScrollPosition.x;
+
+  //Calculate the Top(characterY): position.Y + previouse lines height + mScrollPosition.y.
+  bool isFirstLine = lineIndex == 0;
+
+  //If the line is the first line of the text; its top = 0.
+  float lineY = (isFirstLine ? 0 : GetLineTop(lines, lineRun));
+
+  float characterY = lineY + GetCharacterTop(characterPosition.y) + textModel->mScrollPosition.y;
+
+  //The rectangle contains the width and height:
+  float characterWidth  = GetCharacterWidth(glyphInfo);
+  float characterHeight = GetCharacterHeight(glyphInfo);
+
+  return {characterX, characterY, characterWidth, characterHeight};
+}
+
+int GetCharIndexAtPosition(ModelPtr textModel, float visualX, float visualY)
+{
+  if(textModel == nullptr)
+  {
+    return -1;
+  }
+
+  VisualModelPtr& visualModel = textModel->mVisualModel;
+
+  const int totalNumberOfGlyphs = visualModel->mGlyphs.Count();
+  const int totalNumberOfLines  = visualModel->mLines.Count();
+
+  if((0 == totalNumberOfGlyphs) ||
+     (0 == totalNumberOfLines))
+  {
+    return -1;
+  }
+
+  //The top point of the view = 0.
+  if(visualY < 0)
+  {
+    return -1;
+  }
+
+  const Vector<LineRun>& lines = visualModel->mLines;
+
+  float lineTop   = 0.f;
+  int   lineIndex = 0;
+  int   high      = totalNumberOfLines;
+  int   low       = -1;
+  int   guess;
+
+  // Searching for the correct line.
+  while(high - low > 1)
+  {
+    guess = (high + low) / 2;
+    Vector<LineRun>::ConstIterator it = lines.Begin() + guess;
+
+    lineTop = GetLineTop(lines, *it);
+
+    if(lineTop > visualY)
+    {
+      high = guess;
+    }
+    else
+    {
+      low = guess;
+    }
+  }
+
+  if(low < 0)
+  {
+    lineIndex = 0;
+  }
+  else
+  {
+    lineIndex = low;
+  }
+
+  bool isLastLine = lineIndex + 1 == totalNumberOfLines;
+
+  if(isLastLine)
+  {
+    const LineRun& line = *(visualModel->mLines.Begin() + lineIndex);
+    float lineHeight = GetLineHeight(line, isLastLine);
+
+    // If the visualY is placed after the last line.
+    if(visualY > lineTop + lineHeight)
+    {
+      return -1;
+    }
+  }
+
+ // Start searching for the visualX
+  const LineRun& line = *(visualModel->mLines.Begin() + lineIndex);
+
+  visualX -= line.alignmentOffset;
+
+  // Positions of the glyphs
+  const Vector2* const positionsBuffer = visualModel->mGlyphPositions.Begin();
+
+  const CharacterIndex startCharacter = line.characterRun.characterIndex;
+  const CharacterIndex endCharacter   = line.characterRun.characterIndex + line.characterRun.numberOfCharacters - 1;
+
+  CharacterIndex characterIndexAtPosition = -1;
+  CharacterIndex characterIndex           = startCharacter;
+  float characterPosition;
+  float rightMostCharacterPosition;
+
+  for(; characterIndex != endCharacter; characterIndex++)
+  {
+    characterPosition = positionsBuffer[characterIndex].x;
+    rightMostCharacterPosition = positionsBuffer[characterIndex+1].x;
+
+    if(visualX < rightMostCharacterPosition && visualX >= characterPosition)
+    {
+      characterIndexAtPosition = characterIndex;
+      break;
+    }
+  }
+
+  if(characterIndex == endCharacter)
+  {
+    // If the visualX is within the last character position or it comes after the last character; we return the last character.
+    rightMostCharacterPosition = positionsBuffer[endCharacter].x + GetCharacterWidth(visualModel->mGlyphs[endCharacter]);
+
+    if(visualX >= positionsBuffer[endCharacter].x && visualX < rightMostCharacterPosition)
+    {
+      characterIndexAtPosition = endCharacter;
+    }
+  }
+
+  return characterIndexAtPosition;
+}
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/text/text-geometry.h b/dali-toolkit/internal/text/text-geometry.h
new file mode 100644
index 0000000..1d410bf
--- /dev/null
+++ b/dali-toolkit/internal/text/text-geometry.h
@@ -0,0 +1,136 @@
+#ifndef DALI_TOOLKIT_TEXT_GEOMETRY_H
+#define DALI_TOOLKIT_TEXT_GEOMETRY_H
+
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/rect.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/text-model.h>
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+   * @brief Get the rendered size & position of a specific text range.
+   * if the requested text is at multilines, multiple sizes/positions will be returned for each text located in a separate line.
+   * if a line contains characters with different directions, multiple sizes will be returned for each block of contiguous characters with the same direction.
+   *
+   * @param[in] textModel text model containing text info.
+   * @param[in] startIndex start index of the text requested to get position/size for.
+   * @param[in] endIndex end index(included) of the text requested to get position/size for.
+   * @param[in] sizesList list of sizes for the reuested text.
+   * @param[in] positionsList list of positions for the requested text
+   */
+void GetTextGeometry(ModelPtr textModel, CharacterIndex startIndex, CharacterIndex endIndex, Vector<Vector2>& sizesList, Vector<Vector2>& positionsList);
+
+/**
+  * @brief Get the line bounding rectangle.
+  * if the requested index is out of range or the line is not yet rendered, a rect of {0, 0, 0, 0} is returned.
+  *
+  * @param[in] textModel text model containing line info.
+  * @param[in] lineIndex line index to which we want to calculate the geometry for.
+  * @return bounding rectangle.
+  */
+Rect<float> GetLineBoundingRect(ModelPtr textModel, const uint32_t lineIndex);
+
+/**
+  * @brief Get the left point of the line (x).
+  *
+  * @param[in] lineRun the requested line.
+  * @return x point of the line.
+  */
+float GetLineLeft(const LineRun& lineRun);
+
+/**
+  * @brief Get the top point of the line (y).
+  * if the requested line id the first; the top = 0, else the top = the heights of the previouse lines.
+  *
+  * @param[in] lines   the lines in the text controller.
+  * @param[in] lineRun the requested line.
+  * @return y point of the line.
+  */
+float GetLineTop(const Vector<LineRun>& lines, const LineRun& lineRun);
+
+/**
+  * @brief Get the rendered size and position of a specific character in a rectangle.
+  * If the text is not yet rendered or the index > text.Count(); a rect of {0, 0, 0, 0} is returned.
+  * The Width  of the character = glyph.advance
+  * The Height of the character = glyph.height
+  * The Left (X) of the character = characterPosition.x - glyph.xBearing; Regardless of the language direction RTL or LTR, the x point is the left x-point of the glyph. 
+  * The Top  (Y) of the character = characterPosition.y.
+  * @param[in] textModel text model containing text info.
+  * @param[in] charIndex character index to which we want to calculate the geometry for.
+  * @return Rect {x, y, width, height}.
+  */
+Rect<> GetCharacterBoundingRect(ModelPtr textModel, const uint32_t charIndex);
+
+/**
+  * @brief Get the character index.
+  * If the text is not yet rendered or the text is empty, -1 is returned.
+  *
+  * @param[in] textModel text model containing text info.
+  * @param[in] visualX visual x position.
+  * @param[in] visualY visual y position.
+  * @return character index.
+  */
+int GetCharIndexAtPosition(ModelPtr textModel, float visualX, float visualY);
+
+/**
+  * @brief Get the left point of the character (x).
+  *
+  * @param[in] glyph the requested character glyph.
+  * @param[in] characterPosition the position of the requested character.
+  * @return x point of the character.
+  */
+float GetCharacterLeft(const GlyphInfo& glyph, const Vector2& characterPosition);
+
+/**
+  * @brief Get the top point of the character (y).
+  *
+  * @param[in] characterPosition the position of the requested character.
+  * @return y point of the character.
+  */
+float GetCharacterTop(const Vector2& characterPosition);
+
+/**
+  * @brief Get the height of the character.
+  *
+  * @param[in] glyph the requested character glyph.
+  * @return height of the character.
+  */
+float GetCharacterHeight(const GlyphInfo& glyph);
+
+/**
+  * @brief Get the left point of the character.
+  *
+  * @param[in] glyph the requested character glyph.
+  * @return width of the character.
+  */
+float GetCharacterWidth(const GlyphInfo& glyph);
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_GEOMETRY_H
diff --git a/dali-toolkit/internal/text/text-model-interface.h b/dali-toolkit/internal/text/text-model-interface.h
index d9520f1..bd34ff8 100644
--- a/dali-toolkit/internal/text/text-model-interface.h
+++ b/dali-toolkit/internal/text/text-model-interface.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MODEL_INTERFACE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,15 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/character-spacing-glyph-run.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
+#include <dali-toolkit/internal/text/font-run.h>
 #include <dali-toolkit/internal/text/line-run.h>
 #include <dali-toolkit/internal/text/script-run.h>
+#include <dali-toolkit/internal/text/strikethrough-glyph-run.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
+#include <dali-toolkit/internal/text/underlined-glyph-run.h>
 #include <dali-toolkit/public-api/text/text-enumerations.h>
 
 namespace Dali
@@ -115,7 +121,7 @@ public:
    *
    * @return A pointer to the vector with the laid-out lines.
    */
-  virtual const LineRun* const GetLines() const = 0;
+  virtual const LineRun* GetLines() const = 0;
 
   /**
    * @brief Retrieves the number of script runs.
@@ -129,7 +135,14 @@ public:
    *
    * @return A pointer to the vector with the runs of characters with the same script..
    */
-  virtual const ScriptRun* const GetScriptRuns() const = 0;
+  virtual const ScriptRun* GetScriptRuns() const = 0;
+
+  /**
+   * @brief Retrieves number of characters.
+   *
+   * @return The number of characters.
+   */
+  virtual Length GetNumberOfCharacters() const = 0;
 
   /**
    * @brief Retrieves the number of laid-out glyphs.
@@ -171,49 +184,49 @@ public:
    *
    * @return A pointer to the vector with the laid-out glyphs.
    */
-  virtual const GlyphInfo* const GetGlyphs() const = 0;
+  virtual const GlyphInfo* GetGlyphs() const = 0;
 
   /**
    * @brief Retrieves the text layout.
    *
    * @return A pointer to the vector with the positions for each glyph.
    */
-  virtual const Vector2* const GetLayout() const = 0;
+  virtual const Vector2* GetLayout() const = 0;
 
   /**
    * @brief Retrieves the vector of colors.
    *
    * @return Pointer to the vector of colors.
    */
-  virtual const Vector4* const GetColors() const = 0;
+  virtual const Vector4* GetColors() const = 0;
 
   /**
    * @brief Retrieves the vector of indices to the vector of colors.
    *
    * @return Pointer to a vector which stores for each glyph the index to the vector of colors.
    */
-  virtual const ColorIndex* const GetColorIndices() const = 0;
+  virtual const ColorIndex* GetColorIndices() const = 0;
 
   /**
    * @brief Retrieves the vector of background colors.
    *
    * @return Pointer to the vector of background colors.
    */
-  virtual const Vector4* const GetBackgroundColors() const = 0;
+  virtual const Vector4* GetBackgroundColors() const = 0;
 
   /**
    * @brief Retrieves the vector of indices to the vector of background colors.
    *
    * @return Pointer to a vector which stores for each glyph the index to the vector of background colors.
    */
-  virtual const ColorIndex* const GetBackgroundColorIndices() const = 0;
+  virtual const ColorIndex* GetBackgroundColorIndices() const = 0;
 
   /**
    * @brief checks if there is background colors set using markup.
    *
    * @return boolean if there is background colors set using markup .
    */
-  virtual bool const IsMarkupBackgroundColorSet() const = 0;
+  virtual bool IsMarkupBackgroundColorSet() const = 0;
 
   /**
    * @brief Retrieves the text's default color.
@@ -258,6 +271,13 @@ public:
   virtual bool IsUnderlineEnabled() const = 0;
 
   /**
+   * @brief checks if there is underline set using markup.
+   *
+   * @return boolean if there is underline set using markup.
+   */
+  virtual bool IsMarkupUnderlineSet() const = 0;
+
+  /**
    * @brief Retrieves the underline height override
    *
    * @return Returns the override height for an underline, 0 indicates that adaptor will determine the height
@@ -265,6 +285,27 @@ public:
   virtual float GetUnderlineHeight() const = 0;
 
   /**
+   * @brief Retrieves the underline type override.
+   *
+   * @return Returns the override type for an underline.
+   */
+  virtual Text::Underline::Type GetUnderlineType() const = 0;
+
+  /**
+   * @brief Retrieves the dashed underline width override
+   *
+   * @return Returns the override width for the dashed underline.
+   */
+  virtual float GetDashedUnderlineWidth() const = 0;
+
+  /**
+   * @brief Retrieves the dashed underline gap override
+   *
+   * @return Returns the override gap for the dashed underline.
+   */
+  virtual float GetDashedUnderlineGap() const = 0;
+
+  /**
    * @brief Retrieves the number of underline runs.
    *
    * @return The number of underline runs.
@@ -278,7 +319,7 @@ public:
    * @param[in] index Index of the first underline run to be copied.
    * @param[in] numberOfRuns Number of underline runs to be copied.
    */
-  virtual void GetUnderlineRuns(GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const = 0;
+  virtual void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const = 0;
 
   /**
    * @brief Retrieve the outline color.
@@ -316,6 +357,15 @@ public:
   virtual bool IsMarkupProcessorEnabled() const = 0;
 
   /**
+   * @brief Retrieves whether the spanned-text is placed.
+   *
+   * By default is disabled.
+   *
+   * @return @e true if the spanned-text is placed, otherwise returns @e false.
+   */
+  virtual bool IsSpannedTextPlaced() const = 0;
+
+  /**
    * @brief Returns the hyphens glyph info.
    *
    * @return hyphens glyph info.
@@ -335,6 +385,115 @@ public:
    * @return number of hyphens.
    */
   virtual Length GetHyphensCount() const = 0;
+
+  /**
+   * @brief Retrieves the strikethrough color.
+   *
+   * @return The strikethrough color.
+   */
+  virtual const Vector4& GetStrikethroughColor() const = 0;
+
+  /**
+   * @brief Returns whether strikethrough is enabled or not.
+   *
+   * @return The strikethrough state.
+   */
+  virtual bool IsStrikethroughEnabled() const = 0;
+
+  /**
+   * @brief checks if there is strikethrough set using markup.
+   *
+   * @return boolean if there is strikethrough set using markup.
+   */
+  virtual bool IsMarkupStrikethroughSet() const = 0;
+
+  /**
+   * @brief Retrieves the strikethrough height override
+   *
+   * @return Returns the override height for a strikethrough, 0 indicates that adaptor will determine the height
+   */
+  virtual float GetStrikethroughHeight() const = 0;
+
+  /**
+   * @brief Retrieves the number of strikethrough runs.
+   *
+   * @return The number of strikethrough runs.
+   */
+  virtual Length GetNumberOfStrikethroughRuns() const = 0;
+
+  /**
+   * @brief Retrieves the number of bounded paragraph runs.
+   *
+   * @return The number of bounded paragraph runs.
+   */
+  virtual Length GetNumberOfBoundedParagraphRuns() const = 0;
+
+  /**
+   * @brief Retrieves the reference for bounded paragraph runs.
+   *
+   * @return The reference for bounded paragraph runs.
+   */
+  virtual const Vector<BoundedParagraphRun>& GetBoundedParagraphRuns() const = 0;
+
+  /**
+   * @brief Retrieves the number of character-spacing glyph runs.
+   *
+   * @return The number of character-spacing glyph runs.
+   */
+  virtual Length GetNumberOfCharacterSpacingGlyphRuns() const = 0;
+
+  /**
+   * @brief Retrieves the reference for character-spacing glyph runs.
+   *
+   * @return The reference for character-spacing glyph runs.
+   */
+  virtual const Vector<CharacterSpacingGlyphRun>& GetCharacterSpacingGlyphRuns() const = 0;
+
+  /**
+   * @brief Retrieves the strikethrough runs.
+   *
+   * @param[out] strikethroughRuns Pointer to a buffer where the strikethrough runs are copied.
+   * @param[in] index Index of the first strikethrough run to be copied.
+   * @param[in] numberOfRuns Number of strikethrough runs to be copied.
+   */
+  virtual void GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns, StrikethroughRunIndex index, Length numberOfRuns) const = 0;
+
+  /**
+   * @brief Retrieves the character spacing.
+   *
+   * @note A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+   *
+   * @return The character spacing.
+   */
+  virtual float GetCharacterSpacing() const = 0;
+
+  /**
+   * @brief Retrieves the text buffer.
+   *
+   * @return The text buffer.
+   */
+  virtual const Character* GetTextBuffer() const = 0;
+
+  /**
+   * @brief Retrieves the Glyphs to Characters Array.
+   *
+   * @return The GlyphsToCharacters.
+   */
+  virtual const Vector<CharacterIndex>& GetGlyphsToCharacters() const = 0;
+
+  /**
+   * @brief Retrieves the reference for font runs.
+   *
+   * @return The reference for font runs.
+   */
+  virtual const Vector<FontRun>& GetFontRuns() const = 0;
+
+  /**
+   * @brief Retrieves the reference for font description runs.
+   *
+   * @return The reference for font description runs.
+   */
+  virtual const Vector<FontDescriptionRun>& GetFontDescriptionRuns() const = 0;
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp
index 4c3e3f0..ae0dd7c 100644
--- a/dali-toolkit/internal/text/text-model.cpp
+++ b/dali-toolkit/internal/text/text-model.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ Length Model::GetNumberOfLines() const
   return mVisualModel->mLines.Count();
 }
 
-const LineRun* const Model::GetLines() const
+const LineRun* Model::GetLines() const
 {
   return mVisualModel->mLines.Begin();
 }
@@ -92,11 +92,16 @@ Length Model::GetNumberOfScripts() const
   return mLogicalModel->mScriptRuns.Count();
 }
 
-const ScriptRun* const Model::GetScriptRuns() const
+const ScriptRun* Model::GetScriptRuns() const
 {
   return mLogicalModel->mScriptRuns.Begin();
 }
 
+Length Model::GetNumberOfCharacters() const
+{
+  return mLogicalModel->mText.Count();
+}
+
 Length Model::GetNumberOfGlyphs() const
 {
   return mVisualModel->mGlyphs.Count();
@@ -122,37 +127,37 @@ GlyphIndex Model::GetSecondMiddleIndexOfElidedGlyphs() const
   return mVisualModel->GetSecondMiddleIndexOfElidedGlyphs();
 }
 
-const GlyphInfo* const Model::GetGlyphs() const
+const GlyphInfo* Model::GetGlyphs() const
 {
   return mVisualModel->mGlyphs.Begin();
 }
 
-const Vector2* const Model::GetLayout() const
+const Vector2* Model::GetLayout() const
 {
   return mVisualModel->mGlyphPositions.Begin();
 }
 
-const Vector4* const Model::GetColors() const
+const Vector4* Model::GetColors() const
 {
   return mVisualModel->mColors.Begin();
 }
 
-const ColorIndex* const Model::GetColorIndices() const
+const ColorIndex* Model::GetColorIndices() const
 {
   return mVisualModel->mColorIndices.Begin();
 }
 
-const Vector4* const Model::GetBackgroundColors() const
+const Vector4* Model::GetBackgroundColors() const
 {
   return mVisualModel->mBackgroundColors.Begin();
 }
 
-const ColorIndex* const Model::GetBackgroundColorIndices() const
+const ColorIndex* Model::GetBackgroundColorIndices() const
 {
   return mVisualModel->mBackgroundColorIndices.Begin();
 }
 
-bool const Model::IsMarkupBackgroundColorSet() const
+bool Model::IsMarkupBackgroundColorSet() const
 {
   return (mVisualModel->mBackgroundColors.Count() > 0);
 }
@@ -187,17 +192,37 @@ bool Model::IsUnderlineEnabled() const
   return mVisualModel->IsUnderlineEnabled();
 }
 
+bool Model::IsMarkupUnderlineSet() const
+{
+  return (mVisualModel->mUnderlineRuns.Count() > 0u);
+}
+
 float Model::GetUnderlineHeight() const
 {
   return mVisualModel->GetUnderlineHeight();
 }
 
+Text::Underline::Type Model::GetUnderlineType() const
+{
+  return mVisualModel->GetUnderlineType();
+}
+
+float Model::GetDashedUnderlineWidth() const
+{
+  return mVisualModel->GetDashedUnderlineWidth();
+}
+
+float Model::GetDashedUnderlineGap() const
+{
+  return mVisualModel->GetDashedUnderlineGap();
+}
+
 Length Model::GetNumberOfUnderlineRuns() const
 {
   return mVisualModel->GetNumberOfUnderlineRuns();
 }
 
-void Model::GetUnderlineRuns(GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const
+void Model::GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const
 {
   mVisualModel->GetUnderlineRuns(underlineRuns, index, numberOfRuns);
 }
@@ -227,6 +252,11 @@ bool Model::IsMarkupProcessorEnabled() const
   return mVisualModel->IsMarkupProcessorEnabled();
 }
 
+bool Model::IsSpannedTextPlaced() const
+{
+  return mLogicalModel->mSpannedTextPlaced;
+}
+
 const GlyphInfo* Model::GetHyphens() const
 {
   return mVisualModel->mHyphen.glyph.Begin();
@@ -241,6 +271,80 @@ Length Model::GetHyphensCount() const
 {
   return mVisualModel->mHyphen.glyph.Size();
 }
+const Vector4& Model::GetStrikethroughColor() const
+{
+  return mVisualModel->GetStrikethroughColor();
+}
+
+bool Model::IsStrikethroughEnabled() const
+{
+  return mVisualModel->IsStrikethroughEnabled();
+}
+
+bool Model::IsMarkupStrikethroughSet() const
+{
+  return (mVisualModel->mStrikethroughRuns.Count() > 0u);
+}
+
+float Model::GetStrikethroughHeight() const
+{
+  return mVisualModel->GetStrikethroughHeight();
+}
+
+Length Model::GetNumberOfStrikethroughRuns() const
+{
+  return mVisualModel->GetNumberOfStrikethroughRuns();
+}
+
+Length Model::GetNumberOfBoundedParagraphRuns() const
+{
+  return mLogicalModel->GetNumberOfBoundedParagraphRuns();
+}
+
+const Vector<BoundedParagraphRun>& Model::GetBoundedParagraphRuns() const
+{
+  return mLogicalModel->GetBoundedParagraphRuns();
+}
+
+void Model::GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns, StrikethroughRunIndex index, Length numberOfRuns) const
+{
+  mVisualModel->GetStrikethroughRuns(strikethroughRuns, index, numberOfRuns);
+}
+
+Length Model::GetNumberOfCharacterSpacingGlyphRuns() const
+{
+  return mVisualModel->GetNumberOfCharacterSpacingGlyphRuns();
+}
+
+const Vector<CharacterSpacingGlyphRun>& Model::GetCharacterSpacingGlyphRuns() const
+{
+  return mVisualModel->GetCharacterSpacingGlyphRuns();
+}
+
+float Model::GetCharacterSpacing() const
+{
+  return mVisualModel->GetCharacterSpacing();
+}
+
+const Character* Model::GetTextBuffer() const
+{
+  return mLogicalModel->mText.Begin();
+}
+
+const Vector<CharacterIndex>& Model::GetGlyphsToCharacters() const
+{
+  return mVisualModel->mGlyphsToCharacters;
+}
+
+const Vector<FontRun>& Model::GetFontRuns() const
+{
+  return mLogicalModel->mFontRuns;
+}
+
+const Vector<FontDescriptionRun>& Model::GetFontDescriptionRuns() const
+{
+  return mLogicalModel->mFontDescriptionRuns;
+}
 
 Model::Model()
 : mLogicalModel(),
@@ -254,6 +358,8 @@ Model::Model()
   mAlignmentOffset(0.0f),
   mElideEnabled(false),
   mIgnoreSpacesAfterText(true),
+  mRemoveFrontInset(true),
+  mRemoveBackInset(true),
   mMatchLayoutDirection(DevelText::MatchLayoutDirection::INHERIT),
   mEllipsisPosition(DevelText::EllipsisPosition::END)
 {
diff --git a/dali-toolkit/internal/text/text-model.h b/dali-toolkit/internal/text/text-model.h
index 280b63d..e738784 100644
--- a/dali-toolkit/internal/text/text-model.h
+++ b/dali-toolkit/internal/text/text-model.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_MODEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
 #include <dali/public-api/object/ref-object.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/character-spacing-glyph-run.h>
 #include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/text-model-interface.h>
 #include <dali-toolkit/internal/text/visual-model-impl.h>
@@ -100,7 +102,7 @@ public:
   /**
    * @copydoc ModelInterface::GetLines()
    */
-  const LineRun* const GetLines() const override;
+  const LineRun* GetLines() const override;
 
   /**
    * @copydoc ModelInterface::GetNumberOfScripts()
@@ -110,7 +112,12 @@ public:
   /**
    * @copydoc ModelInterface::GetScriptRuns()
    */
-  const ScriptRun* const GetScriptRuns() const override;
+  const ScriptRun* GetScriptRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfCharacters()
+   */
+  Length GetNumberOfCharacters() const override;
 
   /**
    * @copydoc ModelInterface::GetNumberOfGlyphs()
@@ -140,37 +147,37 @@ public:
   /**
    * @copydoc ModelInterface::GetGlyphs()
    */
-  const GlyphInfo* const GetGlyphs() const override;
+  const GlyphInfo* GetGlyphs() const override;
 
   /**
    * @copydoc ModelInterface::GetLayout()
    */
-  const Vector2* const GetLayout() const override;
+  const Vector2* GetLayout() const override;
 
   /**
    * @copydoc ModelInterface::GetColors()
    */
-  const Vector4* const GetColors() const override;
+  const Vector4* GetColors() const override;
 
   /**
    * @copydoc ModelInterface::GetColorIndices()
    */
-  const ColorIndex* const GetColorIndices() const override;
+  const ColorIndex* GetColorIndices() const override;
 
   /**
    * @copydoc ModelInterface::GetBackgroundColors()
    */
-  const Vector4* const GetBackgroundColors() const override;
+  const Vector4* GetBackgroundColors() const override;
 
   /**
    * @copydoc ModelInterface::GetBackgroundColorIndices()
    */
-  const ColorIndex* const GetBackgroundColorIndices() const override;
+  const ColorIndex* GetBackgroundColorIndices() const override;
 
   /**
    * @copydoc ModelInterface::IsMarkupBackgroundColorSet()
    */
-  bool const IsMarkupBackgroundColorSet() const override;
+  bool IsMarkupBackgroundColorSet() const override;
 
   /**
    * @copydoc ModelInterface::GetDefaultColor()
@@ -203,11 +210,31 @@ public:
   bool IsUnderlineEnabled() const override;
 
   /**
+   * @copydoc ModelInterface::IsMarkupUnderlineSet()
+   */
+  bool IsMarkupUnderlineSet() const override;
+
+  /**
    * @copydoc ModelInterface::GetUnderlineHeight()
    */
   float GetUnderlineHeight() const override;
 
   /**
+   * @copydoc ModelInterface::GetUnderlineType()
+   */
+  Text::Underline::Type GetUnderlineType() const override;
+
+  /**
+   * @copydoc ModelInterface::GetDashedUnderlineWidth()
+   */
+  float GetDashedUnderlineWidth() const override;
+
+  /**
+   * @copydoc ModelInterface::GetDashedUnderlineGap()
+   */
+  float GetDashedUnderlineGap() const override;
+
+  /**
    * @copydoc ModelInterface::GetNumberOfUnderlineRuns()
    */
   Length GetNumberOfUnderlineRuns() const override;
@@ -215,7 +242,7 @@ public:
   /**
    * @copydoc ModelInterface::GetUnderlineRuns()
    */
-  void GetUnderlineRuns(GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const override;
+  void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const override;
 
   /**
    * @copydoc ModelInterface::GetOutlineColor()
@@ -243,6 +270,11 @@ public:
   bool IsMarkupProcessorEnabled() const override;
 
   /**
+   * @copydoc ModelInterface::IsSpannedTextPlaced()
+   */
+  bool IsSpannedTextPlaced() const override;
+
+  /**
   * @copydoc ModelInterface::GetHyphens()
   */
   const GlyphInfo* GetHyphens() const override;
@@ -257,6 +289,81 @@ public:
   */
   Length GetHyphensCount() const override;
 
+  /**
+   * @copydoc ModelInterface::GetStrikethroughHeight()
+   */
+  float GetStrikethroughHeight() const override;
+
+  /**
+   * @copydoc ModelInterface::GetStrikethroughColor()
+   */
+  const Vector4& GetStrikethroughColor() const override;
+
+  /**
+   * @copydoc ModelInterface::IsStrikethroughEnabled()
+   */
+  bool IsStrikethroughEnabled() const override;
+
+  /**
+   * @copydoc ModelInterface::IsMarkupStrikethroughSet()
+   */
+  bool IsMarkupStrikethroughSet() const override;
+
+  /**
+   * @copydoc ModelInterface::GetCharacterSpacing()
+   */
+  float GetCharacterSpacing() const override;
+
+  /**
+   * @copydoc ModelInterface::GetTextBuffer()
+   */
+  const Character* GetTextBuffer() const override;
+
+  /**
+   * @copydoc ModelInterface::GetGlyphsToCharacters()
+   */
+  const Vector<CharacterIndex>& GetGlyphsToCharacters() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfStrikethroughRuns()
+   */
+  Length GetNumberOfStrikethroughRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetStrikethroughRuns()
+   */
+  void GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns, StrikethroughRunIndex index, Length numberOfRuns) const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfBoundedParagraphRuns()
+   */
+  virtual Length GetNumberOfBoundedParagraphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetBoundedParagraphRuns()
+   */
+  virtual const Vector<BoundedParagraphRun>& GetBoundedParagraphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetNumberOfCharacterSpacingGlyphRuns()
+   */
+  Length GetNumberOfCharacterSpacingGlyphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetCharacterSpacingGlyphRuns()
+   */
+  const Vector<CharacterSpacingGlyphRun>& GetCharacterSpacingGlyphRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetFontRuns()
+   */
+  const Vector<FontRun>& GetFontRuns() const override;
+
+  /**
+   * @copydoc ModelInterface::GetFontDescriptionRuns()
+   */
+  const Vector<FontDescriptionRun>& GetFontDescriptionRuns() const override;
+
 private: // Private contructors & copy operator.
   /**
    * @brief Private constructor.
@@ -291,8 +398,11 @@ public:
   float                                  mAlignmentOffset;           ///< The alignment offset.
   bool                                   mElideEnabled : 1;          ///< Whether the text's elide is enabled.
   bool                                   mIgnoreSpacesAfterText : 1; ///< Whether ignoring spaces after text or not. Default is true.
+  bool                                   mRemoveFrontInset : 1;      ///< Whether to ignore xBearing of the first glyph. Default is true.
+  bool                                   mRemoveBackInset : 1;       ///< Whether to ignore advance of the last glyph. Default is true.
   DevelText::MatchLayoutDirection        mMatchLayoutDirection;      ///< Whether to match text alignment with layout direction or not.
   DevelText::EllipsisPosition::Type      mEllipsisPosition;          ///< Where is the location the text elide
+  Vector2                                mVisualTransformOffset;     ///< The offset of the layout based on the controller due to alignment.
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index cec4081..59bb09f 100644
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,7 +226,7 @@ void TextScroller::SetParameters(Actor scrollingTextActor, Renderer renderer, Te
   mTextureSet = mRenderer.GetTextures();
 
   // Set the shader and texture for scrolling
-  Shader shader = Shader::New(SHADER_TEXT_SCROLLER_SHADER_VERT, SHADER_TEXT_SCROLLER_SHADER_FRAG, Shader::Hint::NONE);
+  Shader shader = Shader::New(SHADER_TEXT_SCROLLER_SHADER_VERT, SHADER_TEXT_SCROLLER_SHADER_FRAG, Shader::Hint::NONE, "TEXT_SCROLLER");
   mRenderer.SetShader(shader);
   mRenderer.SetTextures(textureSet);
 
diff --git a/dali-toolkit/internal/text/text-selection-handle-controller.cpp b/dali-toolkit/internal/text/text-selection-handle-controller.cpp
index cf63deb..fef3baa 100644
--- a/dali-toolkit/internal/text/text-selection-handle-controller.cpp
+++ b/dali-toolkit/internal/text/text-selection-handle-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/cursor-helper-functions.h>
-#include <dali-toolkit/internal/text/text-controller-impl-event-handler.h>
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
+#include <dali-toolkit/internal/text/controller/text-controller-impl-event-handler.h>
 
 using namespace Dali;
 
@@ -103,10 +105,16 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
   }
 
   // Get the indices to the first and last selected glyphs.
-  const CharacterIndex selectionEndMinusOne = selectionEnd - 1u;
-  const GlyphIndex     glyphStart           = *(charactersToGlyphBuffer + selectionStart);
-  const Length         numberOfGlyphs       = *(glyphsPerCharacterBuffer + selectionEndMinusOne);
-  const GlyphIndex     glyphEnd             = *(charactersToGlyphBuffer + selectionEndMinusOne) + ((numberOfGlyphs > 0) ? numberOfGlyphs - 1u : 0u);
+  const CharacterIndex    selectionEndMinusOne      = selectionEnd - 1u;
+  const GlyphIndex        glyphStart                = *(charactersToGlyphBuffer + selectionStart);
+  const Length            numberOfGlyphs            = *(glyphsPerCharacterBuffer + selectionEndMinusOne);
+  const GlyphIndex        glyphEnd                  = *(charactersToGlyphBuffer + selectionEndMinusOne) + ((numberOfGlyphs > 0) ? numberOfGlyphs - 1u : 0u);
+  const float             modelCharacterSpacing     = visualModel->GetCharacterSpacing();
+  Vector<CharacterIndex>& glyphToCharacterMap       = visualModel->mGlyphsToCharacters;
+  const CharacterIndex*   glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
+
+  // Get the character-spacing runs.
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = visualModel->GetCharacterSpacingGlyphRuns();
 
   // Get the lines where the glyphs are laid-out.
   const LineRun* lineRun = visualModel->mLines.Begin();
@@ -144,7 +152,9 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
 
   lineRun += firstLineIndex;
 
-  selectionBoxInfo->lineHeight = GetLineHeight(*lineRun);
+  // The line height is the addition of the line ascender and the line descender.
+  // However, the line descender has a negative value, hence the subtraction also line spacing should not be included in selection height.
+  selectionBoxInfo->lineHeight = lineRun->ascender - lineRun->descender;
 
   GlyphIndex lastGlyphOfLine = lineRun->glyphRun.glyphIndex + lineRun->glyphRun.numberOfGlyphs - 1u;
 
@@ -163,18 +173,21 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
   // Count the actual number of quads.
   unsigned int actualNumberOfQuads = 0u;
   Vector4      quad;
+  float        calculatedAdvance = 0.f;
 
   // Traverse the glyphs.
   for(GlyphIndex index = glyphStart; index <= glyphEnd; ++index)
   {
-    const GlyphInfo& glyph    = *(glyphsBuffer + index);
-    const Vector2&   position = *(positionsBuffer + index);
+    const float      characterSpacing = GetGlyphCharacterSpacing(index, characterSpacingGlyphRuns, modelCharacterSpacing);
+    const GlyphInfo& glyph            = *(glyphsBuffer + index);
+    const Vector2&   position         = *(positionsBuffer + index);
+    calculatedAdvance                 = GetCalculatedAdvance(*(logicalModel->mText.Begin() + (*(glyphToCharacterMapBuffer + index))), characterSpacing, glyph.advance);
 
     if(splitStartGlyph)
     {
       // If the first glyph is a ligature that must be broken it may be needed to add only part of the glyph to the highlight box.
 
-      const float          glyphAdvance    = glyph.advance / static_cast<float>(numberOfCharactersStart);
+      const float          glyphAdvance    = calculatedAdvance / static_cast<float>(numberOfCharactersStart);
       const CharacterIndex interGlyphIndex = selectionStart - *(glyphToCharacterBuffer + glyphStart);
       // Get the direction of the character.
       CharacterDirection isCurrentRightToLeft = false;
@@ -207,7 +220,7 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
     {
       // Equally, if the last glyph is a ligature that must be broken it may be needed to add only part of the glyph to the highlight box.
 
-      const float          glyphAdvance    = glyph.advance / static_cast<float>(numberOfCharactersEnd);
+      const float          glyphAdvance    = calculatedAdvance / static_cast<float>(numberOfCharactersEnd);
       const CharacterIndex interGlyphIndex = selectionEnd - *(glyphToCharacterBuffer + glyphEnd);
       // Get the direction of the character.
       CharacterDirection isCurrentRightToLeft = false;
@@ -237,7 +250,7 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
 
     quad.x = lineRun->alignmentOffset + position.x - glyph.xBearing + model->mScrollPosition.x;
     quad.y = selectionBoxInfo->lineOffset;
-    quad.z = quad.x + glyph.advance;
+    quad.z = quad.x + calculatedAdvance;
     quad.w = quad.y + selectionBoxInfo->lineHeight;
 
     // Store the min and max 'x' for each line.
@@ -254,6 +267,8 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
       ++lineIndex;
       if(lineIndex < firstLineIndex + numberOfLines)
       {
+        float currentLineSpacing = lineRun->lineSpacing;
+
         // Retrieve the next line.
         ++lineRun;
 
@@ -271,9 +286,16 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
         selectionBoxInfo->maxX = MIN_FLOAT;
 
         // Update the line's vertical offset.
-        selectionBoxInfo->lineOffset = currentLineOffset + currentLineHeight;
+        selectionBoxInfo->lineOffset = currentLineOffset + currentLineHeight + currentLineSpacing;
+
+        // The line height is the addition of the line ascender and the line descender.
+        // However, the line descender has a negative value, hence the subtraction also line spacing should not be included in selection height.
+        selectionBoxInfo->lineHeight = lineRun->ascender - lineRun->descender;
 
-        selectionBoxInfo->lineHeight = GetLineHeight(*lineRun);
+        if(lineRun->lineSpacing > 0)
+        {
+          selectionBoxInfo->lineHeight += lineRun->lineSpacing;
+        }
       }
     }
   }
diff --git a/dali-toolkit/internal/text/text-selection-handle-controller.h b/dali-toolkit/internal/text/text-selection-handle-controller.h
index 62032fd..a021009 100644
--- a/dali-toolkit/internal/text/text-selection-handle-controller.h
+++ b/dali-toolkit/internal/text/text-selection-handle-controller.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_SELECTION_HANDLE_CONTROLLER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/cursor-helper-functions.h>
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 
 namespace Dali
 {
diff --git a/dali-toolkit/internal/text/text-view-interface.h b/dali-toolkit/internal/text/text-view-interface.h
index 24994bf..24fcfff 100644
--- a/dali-toolkit/internal/text/text-view-interface.h
+++ b/dali-toolkit/internal/text/text-view-interface.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_VIEW_INTERFACE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,16 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/character-spacing-glyph-run.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
+#include <dali-toolkit/internal/text/underlined-glyph-run.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
 
 namespace Dali
 {
@@ -32,6 +39,7 @@ namespace Toolkit
 namespace Text
 {
 struct GlyphRun;
+struct StrikethroughGlyphRun;
 
 /**
  * @brief Abstract interface to provide the information necessary to display text.
@@ -101,35 +109,35 @@ public:
    *
    * @return Pointer to the vector of colors.
    */
-  virtual const Vector4* const GetColors() const = 0;
+  virtual const Vector4* GetColors() const = 0;
 
   /**
    * @brief Retrieves the vector of indices to the vector of colors.
    *
    * @return Pointer to a vector which stores for each glyph the index to the vector of colors.
    */
-  virtual const ColorIndex* const GetColorIndices() const = 0;
+  virtual const ColorIndex* GetColorIndices() const = 0;
 
   /**
    * @brief Retrieves the vector of background colors.
    *
    * @return Pointer to the vector of background colors.
    */
-  virtual const Vector4* const GetBackgroundColors() const = 0;
+  virtual const Vector4* GetBackgroundColors() const = 0;
 
   /**
    * @brief Retrieves the vector of indices to the vector of background colors.
    *
    * @return Pointer to a vector which stores for each glyph the index to the vector of background colors.
    */
-  virtual const ColorIndex* const GetBackgroundColorIndices() const = 0;
+  virtual const ColorIndex* GetBackgroundColorIndices() const = 0;
 
   /**
    * @brief checks if there is background colors set using markup.
    *
    * @return boolean if there is background colors set using markup .
    */
-  virtual bool const IsMarkupBackgroundColorSet() const = 0;
+  virtual bool IsMarkupBackgroundColorSet() const = 0;
 
   /**
    * @brief Retrieves the text color
@@ -167,6 +175,13 @@ public:
   virtual bool IsUnderlineEnabled() const = 0;
 
   /**
+   * @brief checks if there is underline set using markup.
+   *
+   * @return boolean if there is underline set using markup.
+   */
+  virtual bool IsMarkupUnderlineSet() const = 0;
+
+  /**
    * @brief Returns the hyphens glyph info.
    *
    * @return hyphens glyph info.
@@ -194,6 +209,27 @@ public:
   virtual float GetUnderlineHeight() const = 0;
 
   /**
+   * @brief Retrieves the underline type override
+   *
+   * @return Returns the override type for an underline.
+   */
+  virtual Text::Underline::Type GetUnderlineType() const = 0;
+
+  /**
+   * @brief Retrieves the dashed underline width override.
+   *
+   * @return Returns the override width for the dashed underline.
+   */
+  virtual float GetDashedUnderlineWidth() const = 0;
+
+  /**
+   * @brief Retrieves the dashed underline gap override.
+   *
+   * @return Returns the override gap for the dashed underline.
+   */
+  virtual float GetDashedUnderlineGap() const = 0;
+
+  /**
    * @brief Retrieves the number of underline runs.
    *
    * @return The number of underline runs.
@@ -207,9 +243,9 @@ public:
    * @param[in] index Index of the first underline run to be copied.
    * @param[in] numberOfRuns Number of underline runs to be copied.
    */
-  virtual void GetUnderlineRuns(GlyphRun*         underlineRuns,
-                                UnderlineRunIndex index,
-                                Length            numberOfRuns) const = 0;
+  virtual void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns,
+                                UnderlineRunIndex   index,
+                                Length              numberOfRuns) const = 0;
 
   /**
    * @brief Retrieve the outline color.
@@ -266,6 +302,89 @@ public:
    * @return The second middle index of elided glyphs, index of ellipsis of middle.
    */
   virtual GlyphIndex GetSecondMiddleIndexOfElidedGlyphs() const = 0;
+
+  /**
+   * @brief Retrieves the strikethrough color.
+   *
+   * @return The strikethrough color.
+   */
+  virtual const Vector4& GetStrikethroughColor() const = 0;
+
+  /**
+   * @brief Returns whether strikethrough is enabled or not.
+   *
+   * @return The strikethrough state.
+   */
+  virtual bool IsStrikethroughEnabled() const = 0;
+
+  /**
+   * @brief checks if there is strikethrough set using markup.
+   *
+   * @return boolean if there is strikethrough set using markup.
+   */
+  virtual bool IsMarkupStrikethroughSet() const = 0;
+
+  /**
+   * @brief Retrieves the strikethrough height override
+   *
+   * @return Returns the override height for a strikethrough, 0 indicates that adaptor will determine the height
+   */
+  virtual float GetStrikethroughHeight() const = 0;
+
+  /**
+   * @brief Retrieves the number of strikethrough runs.
+   *
+   * @return The number of strikethrough runs.
+   */
+  virtual Length GetNumberOfStrikethroughRuns() const = 0;
+
+  /**
+   * @brief Retrieves the number of bounded paragraph runs.
+   *
+   * @return The number of bounded paragraph runs.
+   */
+  virtual Length GetNumberOfBoundedParagraphRuns() const = 0;
+
+  /**
+   * @brief Retrieves the reference for bounded paragraph runs.
+   *
+   * @return The reference for bounded paragraph runs.
+   */
+  virtual const Vector<BoundedParagraphRun>& GetBoundedParagraphRuns() const = 0;
+
+  /**
+   * @brief Retrieves the strikethrough runs.
+   *
+   * @param[out] strikethroughRuns Pointer to a buffer where the strikethrough runs are copied.
+   * @param[in] index Index of the first strikethrough run to be copied.
+   * @param[in] numberOfRuns Number of strikethrough runs to be copied.
+   */
+  virtual void GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns,
+                                    StrikethroughRunIndex  index,
+                                    Length                 numberOfRuns) const = 0;
+
+  /**
+   * @brief The spaces between characters in Pixels.
+   *
+   * @note A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+   *
+   * @return characterSpacing.
+   */
+  virtual float GetCharacterSpacing() const = 0;
+
+  /**
+   * @brief The text buffer.
+   *
+   * @return The text buffer.
+   */
+  virtual const Character* GetTextBuffer() const = 0;
+
+  /**
+   * @brief The text Glyph to Characters Array.
+   *
+   * @return GetGlyphsToCharacters.
+   */
+  virtual const Vector<CharacterIndex>& GetGlyphsToCharacters() const = 0;
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/text/text-view.cpp b/dali-toolkit/internal/text/text-view.cpp
index a5a6b3b..d71000b 100644
--- a/dali-toolkit/internal/text/text-view.cpp
+++ b/dali-toolkit/internal/text/text-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,20 +23,364 @@
 #include <dali/public-api/math/vector2.h>
 #include <memory.h>
 
-namespace Dali
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
+
+namespace Dali::Toolkit::Text
 {
-namespace Toolkit
+
+namespace
 {
-namespace Text
+
+/// If ellipsis is enabled, calculate the number of laid out glyphs.
+/// Otherwise use the given number of glyphs.
+void CalculateNumberOfLaidOutGlyphes(
+    const bool                               hasEllipsis,
+    bool&                                    textElided,
+    Length&                                  numberOfLaidOutGlyphs,
+    Length&                                  numberOfActualLaidOutGlyphs,
+    const Length&                            numberOfGlyphs,
+    const DevelText::EllipsisPosition::Type& ellipsisPosition,
+    const LineRun*&                          ellipsisLine,
+    const Length&                            numberOfLines,
+    const LineRun* const&                    lines)
 {
+  if(hasEllipsis)
+  {
+    textElided            = true;
+    numberOfLaidOutGlyphs = numberOfGlyphs;
+
+    switch(ellipsisPosition)
+    {
+      case DevelText::EllipsisPosition::START:
+      {
+        numberOfActualLaidOutGlyphs = numberOfGlyphs - ellipsisLine->glyphRun.glyphIndex;
+        break;
+      }
+      case DevelText::EllipsisPosition::MIDDLE:
+      {
+        numberOfActualLaidOutGlyphs = 0u;
+        for(Length lineIndex = 0u ; lineIndex < numberOfLines ; lineIndex++)
+        {
+          numberOfActualLaidOutGlyphs += lines[lineIndex].glyphRun.numberOfGlyphs + lines[lineIndex].glyphRunSecondHalf.numberOfGlyphs;
+        }
+        break;
+      }
+      case DevelText::EllipsisPosition::END:
+      {
+        numberOfActualLaidOutGlyphs = ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs;
+        break;
+      }
+    }
+  }
+  else
+  {
+    numberOfActualLaidOutGlyphs = numberOfLaidOutGlyphs = numberOfGlyphs;
+  }
+}
+
+void InsertEllipsisGlyph(
+  GlyphInfo*& glyphs,
+  GlyphIndex& indexOfEllipsis,
+  Length& numberOfRemovedGlyphs,
+  Vector2*& glyphPositions,
+  TextAbstraction::FontClient& fontClient,
+  const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns,
+  const float& modelCharacterSpacing,
+  float& calculatedAdvance,
+  const Character*& textBuffer,
+  const CharacterIndex*& glyphToCharacterMapBuffer,
+  const Length& numberOfGlyphs,
+  const bool isTailMode,
+  const LineRun*& ellipsisLine,
+  const Length& numberOfLaidOutGlyphs)
+{
+  // firstPenX, penY and firstPenSet are used to position the ellipsis glyph if needed.
+  float firstPenX   = 0.f; // Used if rtl text is elided.
+  float penY        = 0.f;
+  bool  firstPenSet = false;
+  bool  inserted    = false;
+
+  float removedGlyphsWidth = 0.f;
+
+  while(!inserted)
+  {
+    const GlyphInfo& glyphToRemove = *(glyphs + indexOfEllipsis);
+
+    if(0u != glyphToRemove.fontId)
+    {
+      // i.e. The font id of the glyph shaped from the '\n' character is zero.
+
+      // Need to reshape the glyph as the font may be different in size.
+      const GlyphInfo& ellipsisGlyph = fontClient.GetEllipsisGlyph(fontClient.GetPointSize(glyphToRemove.fontId));
+
+      if(!firstPenSet)
+      {
+        const Vector2& position = *(glyphPositions + indexOfEllipsis);
+
+        // Calculates the penY of the current line. It will be used to position the ellipsis glyph.
+        penY = position.y + glyphToRemove.yBearing;
+
+        // Calculates the first penX which will be used if rtl text is elided.
+        firstPenX = position.x - glyphToRemove.xBearing;
+        if(firstPenX < -ellipsisGlyph.xBearing)
+        {
+          // Avoids to exceed the bounding box when rtl text is elided.
+          firstPenX = -ellipsisGlyph.xBearing;
+        }
+
+        removedGlyphsWidth = -ellipsisGlyph.xBearing;
+
+        firstPenSet = true;
+      }
+
+      const float characterSpacing = GetGlyphCharacterSpacing(indexOfEllipsis, characterSpacingGlyphRuns, modelCharacterSpacing);
+      calculatedAdvance            = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + indexOfEllipsis))), characterSpacing, glyphToRemove.advance);
+      removedGlyphsWidth += std::min(calculatedAdvance, (glyphToRemove.xBearing + glyphToRemove.width));
+
+      // Calculate the width of the ellipsis glyph and check if it fits.
+      const float ellipsisGlyphWidth = ellipsisGlyph.width + ellipsisGlyph.xBearing;
+      if((ellipsisGlyphWidth < removedGlyphsWidth) || (isTailMode ? (indexOfEllipsis == 0u) : (indexOfEllipsis == numberOfGlyphs - 1u)))
+      {
+        GlyphInfo& glyphInfo = *(glyphs + indexOfEllipsis);
+        Vector2&   position  = *(glyphPositions + indexOfEllipsis);
+        position.x -= (0.f > glyphInfo.xBearing) ? glyphInfo.xBearing : 0.f;
+
+        // Replace the glyph by the ellipsis glyph.
+        glyphInfo = ellipsisGlyph;
+
+        // Change the 'x' and 'y' position of the ellipsis glyph.
+        if(position.x > firstPenX)
+        {
+          if(isTailMode)
+          {
+            // To handle case of the mixed languages (LTR then RTL) with
+            // EllipsisPosition::END and the LayoutDirection::RIGHT_TO_LEFT
+            float nextXPositions = ellipsisLine->width;
+            if(indexOfEllipsis + 1u < numberOfGlyphs)
+            {
+              Vector2& positionOfNextGlyph = *(glyphPositions + indexOfEllipsis + 1u);
+              nextXPositions               = positionOfNextGlyph.x;
+            }
+
+            if(position.x > nextXPositions) // RTL language
+            {
+              if((indexOfEllipsis > 0u) && ((position.x - nextXPositions) > removedGlyphsWidth))
+              {
+                // To handle mixed directions
+                // Re-calculates the first penX which will be used if rtl text is elided.
+                firstPenX = position.x - glyphToRemove.xBearing;
+                if(firstPenX < -ellipsisGlyph.xBearing)
+                {
+                  // Avoids to exceed the bounding box when rtl text is elided.
+                  firstPenX = -ellipsisGlyph.xBearing;
+                }
+                //Reset the width of removed glyphs
+                removedGlyphsWidth = std::min(calculatedAdvance, (glyphToRemove.xBearing + glyphToRemove.width)) - ellipsisGlyph.xBearing;
+
+                --indexOfEllipsis;
+                continue;
+              }
+              else
+              {
+                // To handle the case of RTL language with EllipsisPosition::END
+                position.x = firstPenX + removedGlyphsWidth - ellipsisGlyphWidth;
+              }
+            }
+          }
+          else
+          {
+            // To handle the case of LTR language with EllipsisPosition::START
+            position.x = firstPenX + removedGlyphsWidth - ellipsisGlyphWidth;
+          }
+        }
+        else
+        {
+          if(!isTailMode)
+          {
+            // To handle case of the mixed languages (RTL then LTR) with
+            // EllipsisPosition::START and the LayoutDirection::RIGHT_TO_LEFT
+            float nextXPositions = ellipsisLine->width;
+            if(indexOfEllipsis + 1u < numberOfGlyphs)
+            {
+              Vector2& positionOfNextGlyph = *(glyphPositions + indexOfEllipsis + 1u);
+              nextXPositions               = positionOfNextGlyph.x;
+            }
+
+            if(position.x < nextXPositions) // LTR language
+            {
+              position.x = firstPenX + removedGlyphsWidth - ellipsisGlyphWidth;
+
+              if((position.x + ellipsisGlyphWidth + ellipsisGlyph.xBearing) > nextXPositions)
+              {
+                position.x -= (position.x + ellipsisGlyphWidth + ellipsisGlyph.xBearing) - nextXPositions;
+              }
+            }
+          }
+        }
+
+        position.x += ellipsisGlyph.xBearing;
+        position.y = penY - ellipsisGlyph.yBearing;
+
+        inserted = true;
+      }
+    }
+
+    if(!inserted)
+    {
+      if(isTailMode && indexOfEllipsis > 0u)
+      {
+        // Tail Mode: remove glyphs from startIndexOfEllipsis then decrement indexOfEllipsis, until arrive to index zero.
+        --indexOfEllipsis;
+      }
+      else if(!isTailMode && indexOfEllipsis < numberOfLaidOutGlyphs - 1u)
+      {
+        // Not Tail Mode: remove glyphs from startIndexOfEllipsis then increase indexOfEllipsis, until arrive to last index (numberOfGlyphs - 1u).
+        ++indexOfEllipsis;
+      }
+      else
+      {
+        // No space for the ellipsis.
+        inserted = true;
+      }
+      ++numberOfRemovedGlyphs;
+    }
+  }
+}
+
+/// 'Removes' all the glyphs after the ellipsis glyph.
+void RemoveAllGlyphsAfterEllipsisGlyph(
+    const DevelText::EllipsisPosition::Type& ellipsisPosition,
+    Length& numberOfLaidOutGlyphs,
+    const Length& numberOfActualLaidOutGlyphs,
+    const Length& numberOfRemovedGlyphs,
+    const bool isTailMode,
+    const GlyphIndex& indexOfEllipsis,
+    const LineRun*& ellipsisNextLine,
+    const LineRun*& ellipsisLine,
+    GlyphInfo*& glyphs,
+    Vector2*& glyphPositions,
+    const Length& numberOfGlyphs,
+    const GlyphIndex& startIndexOfEllipsis,
+    VisualModelPtr& visualModel)
+{
+  switch(ellipsisPosition)
+  {
+    case DevelText::EllipsisPosition::MIDDLE:
+    {
+      //Reduce size, shift glyphs and start from ellipsis glyph
+      numberOfLaidOutGlyphs = numberOfActualLaidOutGlyphs - numberOfRemovedGlyphs;
+
+      GlyphIndex firstMiddleIndexOfElidedGlyphs  = 0u;
+      GlyphIndex secondMiddleIndexOfElidedGlyphs = 0u;
+
+      bool isOnlySecondHalf = false;
+      if(isTailMode)
+      {
+        // Multi-lines case with MIDDLE
+        // In case the Ellipsis in the end of line,
+        // then this index will be the firstMiddleIndex.
+        // The secondMiddleIndex will be the fisrt index in next line.
+        // But in case there is no line after Ellipsis's line then secondMiddleIndex and endIndex equal firstMiddle
+        // Example:
+        // A: are laid out glyphs in line has Ellipsis in the end.
+        // N: are laid out glyphs in lines after removed lines.
+        // R: are removed glyphs.
+        // L: are removed glyphs when removed lines.
+        // AAAAAAAAAAAA...RRR    => Here's the firstMiddleIndex (First index after last A)
+        // LLLLLLLLLLLLLLL
+        // LLLLLLLLLLLLLLL
+        // NNNNNNNNNNNNNN        => Here's the secondMiddleIndex (First N)
+        // NNNNNNNNNN
+
+        firstMiddleIndexOfElidedGlyphs = indexOfEllipsis;
+        if(ellipsisNextLine != nullptr)
+        {
+          secondMiddleIndexOfElidedGlyphs = ellipsisNextLine->glyphRun.glyphIndex;
+        } else
+        {
+          secondMiddleIndexOfElidedGlyphs = firstMiddleIndexOfElidedGlyphs;
+          visualModel->SetEndIndexOfElidedGlyphs(firstMiddleIndexOfElidedGlyphs);
+        }
+      } else
+      {
+        // Single line case with MIDDLE
+        // In case the Ellipsis in the middle of line,
+        // Then the last index in first half will be firstMiddleIndex.
+        // And the indexOfEllipsis will be secondMiddleIndex, which is the first index in second half.
+        // Example:
+        // A: are laid out glyphs in first half of line.
+        // N: are laid out glyphs in second half of line.
+        // R: are removed glyphs.
+        // L: re removed glyphs when layouting text
+        // AAAAAAALLLLLLLLLLLRRR...NNNNN
+        // firstMiddleIndex (index of last A)
+        // secondMiddleIndex (index before first N)
+
+        firstMiddleIndexOfElidedGlyphs  = (ellipsisLine->glyphRun.numberOfGlyphs > 0u) ? (ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs - 1u) : (ellipsisLine->glyphRun.glyphIndex);
+        secondMiddleIndexOfElidedGlyphs = indexOfEllipsis;
+        isOnlySecondHalf                = ellipsisLine->glyphRun.numberOfGlyphs == 0u && ellipsisLine->glyphRunSecondHalf.numberOfGlyphs > 0u;
+      }
+
+      visualModel->SetFirstMiddleIndexOfElidedGlyphs(firstMiddleIndexOfElidedGlyphs);
+      visualModel->SetSecondMiddleIndexOfElidedGlyphs(secondMiddleIndexOfElidedGlyphs);
+
+      // The number of shifted glyphs and shifting positions will be different according to Single-line or Multi-lines.
+      // isOnlySecondHalf will be true when MIDDLE Ellipsis glyph in single line.
+      if(isOnlySecondHalf)
+      {
+        Length numberOfSecondHalfGlyphs = numberOfLaidOutGlyphs - firstMiddleIndexOfElidedGlyphs;
+
+        //Copy elided glyphs after the ellipsis glyph.
+        memcpy(glyphs + firstMiddleIndexOfElidedGlyphs, glyphs + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(GlyphInfo));
+        memcpy(glyphPositions + firstMiddleIndexOfElidedGlyphs, glyphPositions + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(Vector2));
+      } else
+      {
+        Length numberOfSecondHalfGlyphs = numberOfLaidOutGlyphs - firstMiddleIndexOfElidedGlyphs + 1u;
+
+        // Make sure that out-of-boundary does not occur.
+        if(secondMiddleIndexOfElidedGlyphs + numberOfSecondHalfGlyphs > numberOfGlyphs)
+        {
+          numberOfSecondHalfGlyphs = numberOfGlyphs - secondMiddleIndexOfElidedGlyphs;
+        }
+
+        //Copy elided glyphs after the ellipsis glyph.
+        memcpy(glyphs + firstMiddleIndexOfElidedGlyphs + 1u, glyphs + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(GlyphInfo));
+        memcpy(glyphPositions + firstMiddleIndexOfElidedGlyphs + 1u, glyphPositions + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(Vector2));
+      }
+      break;
+    }
+
+    case DevelText::EllipsisPosition::START:
+    {
+      numberOfLaidOutGlyphs = numberOfActualLaidOutGlyphs - numberOfRemovedGlyphs;
+      //Copy elided glyphs after the ellipsis glyph.
+      memcpy(glyphs, glyphs + startIndexOfEllipsis + numberOfRemovedGlyphs, numberOfLaidOutGlyphs * sizeof(GlyphInfo));
+      memcpy(glyphPositions, glyphPositions + startIndexOfEllipsis + numberOfRemovedGlyphs, numberOfLaidOutGlyphs * sizeof(Vector2));
+      visualModel->SetStartIndexOfElidedGlyphs(indexOfEllipsis);
+      break;
+    }
+
+    case DevelText::EllipsisPosition::END:
+    {
+      numberOfLaidOutGlyphs = numberOfActualLaidOutGlyphs - numberOfRemovedGlyphs;
+      visualModel->SetEndIndexOfElidedGlyphs(indexOfEllipsis);
+      break;
+    }
+  }
+} // unnamed namespace
+
+}
 struct View::Impl
 {
   VisualModelPtr              mVisualModel;
+  LogicalModelPtr             mLogicalModel;
   TextAbstraction::FontClient mFontClient; ///< Handle to the font client.
 };
 
 View::View()
-: mImpl(NULL)
+    : mImpl(NULL)
 {
   mImpl = new View::Impl();
 
@@ -53,6 +397,11 @@ void View::SetVisualModel(VisualModelPtr visualModel)
   mImpl->mVisualModel = visualModel;
 }
 
+void View::SetLogicalModel(LogicalModelPtr logicalModel)
+{
+  mImpl->mLogicalModel = logicalModel;
+}
+
 const Vector2& View::GetControlSize() const
 {
   if(mImpl->mVisualModel)
@@ -96,17 +445,25 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
                        GlyphIndex glyphIndex,
                        Length     numberOfGlyphs) const
 {
-  Length numberOfLaidOutGlyphs       = 0u;
-  Length numberOfActualLaidOutGlyphs = 0u;
+  Length                  numberOfLaidOutGlyphs       = 0u;
+  Length                  numberOfActualLaidOutGlyphs = 0u;
+  const float             modelCharacterSpacing       = mImpl->mVisualModel->GetCharacterSpacing();
+  Vector<CharacterIndex>& glyphToCharacterMap         = mImpl->mVisualModel->mGlyphsToCharacters;
+  const CharacterIndex*   glyphToCharacterMapBuffer   = glyphToCharacterMap.Begin();
+  float                   calculatedAdvance           = 0.f;
+  const Character*        textBuffer                  = mImpl->mLogicalModel->mText.Begin();
 
   if(mImpl->mVisualModel)
   {
+    // Get the character-spacing runs.
+    const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = mImpl->mVisualModel->GetCharacterSpacingGlyphRuns();
+
     bool                              textElided       = false;
     DevelText::EllipsisPosition::Type ellipsisPosition = GetEllipsisPosition();
 
     //Reset indices of ElidedGlyphs
     mImpl->mVisualModel->SetStartIndexOfElidedGlyphs(0u);
-    mImpl->mVisualModel->SetEndIndexOfElidedGlyphs(numberOfGlyphs);
+    mImpl->mVisualModel->SetEndIndexOfElidedGlyphs(numberOfGlyphs - 1u); // Initialization is the last index of Glyphs
     mImpl->mVisualModel->SetFirstMiddleIndexOfElidedGlyphs(0u);
     mImpl->mVisualModel->SetSecondMiddleIndexOfElidedGlyphs(0u);
 
@@ -137,34 +494,7 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
         }
       }
 
-      // If ellipsis is enabled, calculate the number of laid out glyphs.
-      // Otherwise use the given number of glyphs.
-      if(hasEllipsis)
-      {
-        textElided            = true;
-        numberOfLaidOutGlyphs = numberOfGlyphs;
-
-        if(ellipsisPosition == DevelText::EllipsisPosition::START)
-        {
-          numberOfActualLaidOutGlyphs = numberOfGlyphs - ellipsisLine->glyphRun.glyphIndex;
-        }
-        else if(ellipsisPosition == DevelText::EllipsisPosition::MIDDLE)
-        {
-          numberOfActualLaidOutGlyphs = 0u;
-          for(Length lineIndex = 0u; lineIndex < numberOfLines; lineIndex++)
-          {
-            numberOfActualLaidOutGlyphs += lines[lineIndex].glyphRun.numberOfGlyphs + lines[lineIndex].glyphRunSecondHalf.numberOfGlyphs;
-          }
-        }
-        else // DevelText::EllipsisPosition::END
-        {
-          numberOfActualLaidOutGlyphs = ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs;
-        }
-      }
-      else
-      {
-        numberOfActualLaidOutGlyphs = numberOfLaidOutGlyphs = numberOfGlyphs;
-      }
+      CalculateNumberOfLaidOutGlyphes(hasEllipsis, textElided, numberOfLaidOutGlyphs, numberOfActualLaidOutGlyphs, numberOfGlyphs, ellipsisPosition, ellipsisLine, numberOfLines, lines);
 
       if(0u < numberOfActualLaidOutGlyphs)
       {
@@ -213,7 +543,7 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
 
           if(lastGlyphIndexOfLine == index)
           {
-            penY += -line->descender;
+            penY += -line->descender + line->lineSpacing;
 
             // Get the next line.
             ++lineIndex;
@@ -225,7 +555,7 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
 
               lastGlyphIndexOfLine = (line->isSplitToTwoHalves ? line->glyphRunSecondHalf.glyphIndex + line->glyphRunSecondHalf.numberOfGlyphs : line->glyphRun.glyphIndex + line->glyphRun.numberOfGlyphs) - 1u;
 
-              penY += line->ascender + line->lineSpacing;
+              penY += line->ascender;
             }
           }
         }
@@ -235,21 +565,27 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
         GlyphIndex startIndexOfEllipsis = 0u;
         if(hasEllipsis)
         {
-          if(ellipsisPosition == DevelText::EllipsisPosition::START)
-          {
-            // It's the fisrt glyph in line.
-            startIndexOfEllipsis = ellipsisLine->glyphRun.glyphIndex;
-          }
-          else if(ellipsisPosition == DevelText::EllipsisPosition::MIDDLE)
-          {
-            // It's the second middle of the line in case the line split to two halves.
-            // Otherwise it's It's the last glyph in line (line before all removed lines).
-            startIndexOfEllipsis = ellipsisLine->isSplitToTwoHalves ? (ellipsisLine->glyphRunSecondHalf.glyphIndex) : (ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs - 1u);
-          }
-          else // DevelText::EllipsisPosition::END
+          switch(ellipsisPosition)
           {
-            // It's the last glyph in line.
-            startIndexOfEllipsis = ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs - 1u;
+            case DevelText::EllipsisPosition::START:
+            {
+              // It's the fisrt glyph in line.
+              startIndexOfEllipsis = ellipsisLine->glyphRun.glyphIndex;
+              break;
+            }
+            case DevelText::EllipsisPosition::MIDDLE:
+            {
+              // It's the second middle of the line in case the line split to two halves.
+              // Otherwise it's It's the last glyph in line (line before all removed lines).
+              startIndexOfEllipsis = ellipsisLine->isSplitToTwoHalves ? (ellipsisLine->glyphRunSecondHalf.glyphIndex) : (ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs - 1u);
+              break;
+            }
+            case DevelText::EllipsisPosition::END:
+            {
+              // It's the last glyph in line.
+              startIndexOfEllipsis = ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs - 1u;
+              break;
+            }
           }
         }
 
@@ -265,7 +601,7 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
           const LineRun& elidedLine = *ellipsisLine;
 
           if((1u == numberOfLines) &&
-             (GetLineHeight(elidedLine) > mImpl->mVisualModel->mControlSize.height))
+             (GetLineHeight(elidedLine, true) > mImpl->mVisualModel->mControlSize.height))
           {
             // Replace the first glyph with ellipsis glyph
             auto indexOfFirstGlyph = (ellipsisPosition == DevelText::EllipsisPosition::START) ? startIndexOfEllipsis : 0u;
@@ -295,14 +631,7 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
             return numberOfLaidOutGlyphs;
           }
 
-          // firstPenX, penY and firstPenSet are used to position the ellipsis glyph if needed.
-          float firstPenX   = 0.f; // Used if rtl text is elided.
-          float penY        = 0.f;
-          bool  firstPenSet = false;
-
           // Add the ellipsis glyph.
-          bool       inserted              = false;
-          float      removedGlypsWidth     = 0.f;
           Length     numberOfRemovedGlyphs = 0u;
           GlyphIndex indexOfEllipsis       = startIndexOfEllipsis;
 
@@ -311,179 +640,13 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
                                   (ellipsisPosition == DevelText::EllipsisPosition::MIDDLE && numberOfLines != 1u);
 
           // The ellipsis glyph has to fit in the place where the last glyph(s) is(are) removed.
-          while(!inserted)
-          {
-            const GlyphInfo& glyphToRemove = *(glyphs + indexOfEllipsis);
-
-            if(0u != glyphToRemove.fontId)
-            {
-              // i.e. The font id of the glyph shaped from the '\n' character is zero.
-
-              // Need to reshape the glyph as the font may be different in size.
-              const GlyphInfo& ellipsisGlyph = mImpl->mFontClient.GetEllipsisGlyph(mImpl->mFontClient.GetPointSize(glyphToRemove.fontId));
-
-              if(!firstPenSet)
-              {
-                const Vector2& position = *(glyphPositions + indexOfEllipsis);
-
-                // Calculates the penY of the current line. It will be used to position the ellipsis glyph.
-                penY = position.y + glyphToRemove.yBearing;
-
-                // Calculates the first penX which will be used if rtl text is elided.
-                firstPenX = position.x - glyphToRemove.xBearing;
-                if(firstPenX < -ellipsisGlyph.xBearing)
-                {
-                  // Avoids to exceed the bounding box when rtl text is elided.
-                  firstPenX = -ellipsisGlyph.xBearing;
-                }
-
-                removedGlypsWidth = -ellipsisGlyph.xBearing;
-
-                firstPenSet = true;
-              }
-
-              removedGlypsWidth += std::min(glyphToRemove.advance, (glyphToRemove.xBearing + glyphToRemove.width));
-
-              // Calculate the width of the ellipsis glyph and check if it fits.
-              const float ellipsisGlyphWidth = ellipsisGlyph.width + ellipsisGlyph.xBearing;
-              if((ellipsisGlyphWidth < removedGlypsWidth) || (isTailMode ? (indexOfEllipsis == 0u) : (indexOfEllipsis == numberOfGlyphs - 1u)))
-              {
-                GlyphInfo& glyphInfo = *(glyphs + indexOfEllipsis);
-                Vector2&   position  = *(glyphPositions + indexOfEllipsis);
-                position.x -= (0.f > glyphInfo.xBearing) ? glyphInfo.xBearing : 0.f;
-
-                // Replace the glyph by the ellipsis glyph.
-                glyphInfo = ellipsisGlyph;
-
-                // Change the 'x' and 'y' position of the ellipsis glyph.
-
-                if(position.x > firstPenX)
-                {
-                  position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
-                }
-
-                position.x += ellipsisGlyph.xBearing;
-                position.y = penY - ellipsisGlyph.yBearing;
-
-                inserted = true;
-              }
-            }
-
-            if(!inserted)
-            {
-              if(isTailMode && indexOfEllipsis > 0u)
-              {
-                // Tail Mode: remove glyphs from startIndexOfEllipsis then decrement indexOfEllipsis, until arrive to index zero.
-                --indexOfEllipsis;
-              }
-              else if(!isTailMode && indexOfEllipsis < numberOfLaidOutGlyphs - 1u)
-              {
-                // Not Tail Mode: remove glyphs from startIndexOfEllipsis then increase indexOfEllipsis, until arrive to last index (numberOfGlyphs - 1u).
-                ++indexOfEllipsis;
-              }
-              else
-              {
-                // No space for the ellipsis.
-                inserted = true;
-              }
-              ++numberOfRemovedGlyphs;
-            }
-          }
-
-          // 'Removes' all the glyphs after the ellipsis glyph.
-          if(ellipsisPosition == DevelText::EllipsisPosition::MIDDLE)
-          {
-            //Reduce size, shift glyphs and start from ellipsis glyph
-            numberOfLaidOutGlyphs = numberOfActualLaidOutGlyphs - numberOfRemovedGlyphs;
-
-            GlyphIndex firstMiddleIndexOfElidedGlyphs  = 0u;
-            GlyphIndex secondMiddleIndexOfElidedGlyphs = 0u;
-
-            bool isOnlySecondHalf = false;
-            if(isTailMode)
-            {
-              // Multi-lines case with MIDDLE
-              // In case the Ellipsis in the end of line,
-              // then this index will be the firstMiddleIndex.
-              // The secondMiddleIndex will be the fisrt index in next line.
-              // But in case there is no line after Ellipsis's line then secondMiddleIndex and endIndex equal firstMiddle
-              // Example:
-              // A: are laid out glyphs in line has Ellipsis in the end.
-              // N: are laid out glyphs in lines after removed lines.
-              // R: are removed glyphs.
-              // L: are removed glyphs when removed lines.
-              // AAAAAAAAAAAA...RRR    => Here's the firstMiddleIndex (First index after last A)
-              // LLLLLLLLLLLLLLL
-              // LLLLLLLLLLLLLLL
-              // NNNNNNNNNNNNNN        => Here's the secondMiddleIndex (First N)
-              // NNNNNNNNNN
-
-              firstMiddleIndexOfElidedGlyphs = indexOfEllipsis;
-              if(ellipsisNextLine != nullptr)
-              {
-                secondMiddleIndexOfElidedGlyphs = ellipsisNextLine->glyphRun.glyphIndex;
-              }
-              else
-              {
-                secondMiddleIndexOfElidedGlyphs = firstMiddleIndexOfElidedGlyphs;
-                mImpl->mVisualModel->SetEndIndexOfElidedGlyphs(firstMiddleIndexOfElidedGlyphs);
-              }
-            }
-            else
-            {
-              // Single line case with MIDDLE
-              // In case the Ellipsis in the middle of line,
-              // Then the last index in first half will be firstMiddleIndex.
-              // And the indexOfEllipsis will be secondMiddleIndex, which is the first index in second half.
-              // Example:
-              // A: are laid out glyphs in first half of line.
-              // N: are laid out glyphs in second half of line.
-              // R: are removed glyphs.
-              // L: re removed glyphs when layouting text
-              // AAAAAAALLLLLLLLLLLRRR...NNNNN
-              // firstMiddleIndex (index of last A)
-              // secondMiddleIndex (index before first N)
-
-              firstMiddleIndexOfElidedGlyphs  = (ellipsisLine->glyphRun.numberOfGlyphs > 0u) ? (ellipsisLine->glyphRun.glyphIndex + ellipsisLine->glyphRun.numberOfGlyphs - 1u) : (ellipsisLine->glyphRun.glyphIndex);
-              secondMiddleIndexOfElidedGlyphs = indexOfEllipsis;
-              isOnlySecondHalf                = ellipsisLine->glyphRun.numberOfGlyphs == 0u && ellipsisLine->glyphRunSecondHalf.numberOfGlyphs > 0u;
-            }
-
-            mImpl->mVisualModel->SetFirstMiddleIndexOfElidedGlyphs(firstMiddleIndexOfElidedGlyphs);
-            mImpl->mVisualModel->SetSecondMiddleIndexOfElidedGlyphs(secondMiddleIndexOfElidedGlyphs);
-
-            // The number of shifted glyphs and shifting positions will be different according to Single-line or Multi-lines.
-            // isOnlySecondHalf will be true when MIDDLE Ellipsis glyph in single line.
-            if(isOnlySecondHalf)
-            {
-              Length numberOfSecondHalfGlyphs = numberOfLaidOutGlyphs - firstMiddleIndexOfElidedGlyphs;
-
-              //Copy elided glyphs after the ellipsis glyph.
-              memcpy(glyphs + firstMiddleIndexOfElidedGlyphs, glyphs + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(GlyphInfo));
-              memcpy(glyphPositions + firstMiddleIndexOfElidedGlyphs, glyphPositions + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(Vector2));
-            }
-            else
-            {
-              Length numberOfSecondHalfGlyphs = numberOfLaidOutGlyphs - firstMiddleIndexOfElidedGlyphs + 1u;
+          InsertEllipsisGlyph(
+            glyphs, indexOfEllipsis, numberOfRemovedGlyphs, glyphPositions, mImpl->mFontClient, characterSpacingGlyphRuns, modelCharacterSpacing,
+            calculatedAdvance, textBuffer, glyphToCharacterMapBuffer, numberOfGlyphs, isTailMode, ellipsisLine, numberOfLaidOutGlyphs);
 
-              //Copy elided glyphs after the ellipsis glyph.
-              memcpy(glyphs + firstMiddleIndexOfElidedGlyphs + 1u, glyphs + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(GlyphInfo));
-              memcpy(glyphPositions + firstMiddleIndexOfElidedGlyphs + 1u, glyphPositions + secondMiddleIndexOfElidedGlyphs, numberOfSecondHalfGlyphs * sizeof(Vector2));
-            }
-          }
-          else if(ellipsisPosition == DevelText::EllipsisPosition::START)
-          {
-            numberOfLaidOutGlyphs = numberOfActualLaidOutGlyphs - numberOfRemovedGlyphs;
-            //Copy elided glyphs after the ellipsis glyph.
-            memcpy(glyphs, glyphs + startIndexOfEllipsis + numberOfRemovedGlyphs, numberOfLaidOutGlyphs * sizeof(GlyphInfo));
-            memcpy(glyphPositions, glyphPositions + startIndexOfEllipsis + numberOfRemovedGlyphs, numberOfLaidOutGlyphs * sizeof(Vector2));
-            mImpl->mVisualModel->SetStartIndexOfElidedGlyphs(indexOfEllipsis);
-          }
-          else // DevelText::EllipsisPosition::END
-          {
-            numberOfLaidOutGlyphs = numberOfActualLaidOutGlyphs - numberOfRemovedGlyphs;
-            mImpl->mVisualModel->SetEndIndexOfElidedGlyphs(indexOfEllipsis);
-          }
+          RemoveAllGlyphsAfterEllipsisGlyph(
+              ellipsisPosition, numberOfLaidOutGlyphs, numberOfActualLaidOutGlyphs, numberOfRemovedGlyphs, isTailMode, indexOfEllipsis, ellipsisNextLine,
+              ellipsisLine, glyphs, glyphPositions, numberOfGlyphs, startIndexOfEllipsis, mImpl->mVisualModel);
         }
       }
     }
@@ -492,7 +655,7 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
   return numberOfLaidOutGlyphs;
 }
 
-const Vector4* const View::GetColors() const
+const Vector4* View::GetColors() const
 {
   if(mImpl->mVisualModel)
   {
@@ -502,7 +665,7 @@ const Vector4* const View::GetColors() const
   return NULL;
 }
 
-const ColorIndex* const View::GetColorIndices() const
+const ColorIndex* View::GetColorIndices() const
 {
   if(mImpl->mVisualModel)
   {
@@ -512,7 +675,7 @@ const ColorIndex* const View::GetColorIndices() const
   return NULL;
 }
 
-const Vector4* const View::GetBackgroundColors() const
+const Vector4* View::GetBackgroundColors() const
 {
   if(mImpl->mVisualModel)
   {
@@ -522,7 +685,7 @@ const Vector4* const View::GetBackgroundColors() const
   return nullptr;
 }
 
-const ColorIndex* const View::GetBackgroundColorIndices() const
+const ColorIndex* View::GetBackgroundColorIndices() const
 {
   if(mImpl->mVisualModel)
   {
@@ -532,7 +695,7 @@ const ColorIndex* const View::GetBackgroundColorIndices() const
   return nullptr;
 }
 
-bool const View::IsMarkupBackgroundColorSet() const
+bool View::IsMarkupBackgroundColorSet() const
 {
   if(mImpl->mVisualModel)
   {
@@ -587,6 +750,11 @@ bool View::IsUnderlineEnabled() const
   return false;
 }
 
+bool View::IsMarkupUnderlineSet() const
+{
+  return (GetNumberOfUnderlineRuns() > 0u);
+}
+
 const GlyphInfo* View::GetHyphens() const
 {
   if(mImpl->mVisualModel)
@@ -625,6 +793,36 @@ float View::GetUnderlineHeight() const
   return 0.0f;
 }
 
+Text::Underline::Type View::GetUnderlineType() const
+{
+  Text::Underline::Type type = Text::Underline::Type::SOLID;
+  if(mImpl->mVisualModel)
+  {
+    type = mImpl->mVisualModel->GetUnderlineType();
+  }
+  return type;
+}
+
+float View::GetDashedUnderlineWidth() const
+{
+  float width = 0.0f;
+  if(mImpl->mVisualModel)
+  {
+    width = mImpl->mVisualModel->GetDashedUnderlineWidth();
+  }
+  return width;
+}
+
+float View::GetDashedUnderlineGap() const
+{
+  float gap = 0.0f;
+  if(mImpl->mVisualModel)
+  {
+    gap = mImpl->mVisualModel->GetDashedUnderlineGap();
+  }
+  return gap;
+}
+
 Length View::GetNumberOfUnderlineRuns() const
 {
   if(mImpl->mVisualModel)
@@ -635,9 +833,9 @@ Length View::GetNumberOfUnderlineRuns() const
   return 0u;
 }
 
-void View::GetUnderlineRuns(GlyphRun*         underlineRuns,
-                            UnderlineRunIndex index,
-                            Length            numberOfRuns) const
+void View::GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns,
+                            UnderlineRunIndex   index,
+                            Length              numberOfRuns) const
 {
   if(mImpl->mVisualModel)
   {
@@ -742,8 +940,76 @@ GlyphIndex View::GetSecondMiddleIndexOfElidedGlyphs() const
   return secondMiddleIndexOfElidedGlyphs;
 }
 
-} // namespace Text
+const Vector4& View::GetStrikethroughColor() const
+{
+  return (mImpl->mVisualModel) ? mImpl->mVisualModel->GetStrikethroughColor() : Vector4::ZERO;
+}
+
+bool View::IsStrikethroughEnabled() const
+{
+  return (mImpl->mVisualModel) ? mImpl->mVisualModel->IsStrikethroughEnabled() : false;
+}
+
+bool View::IsMarkupStrikethroughSet() const
+{
+  return (GetNumberOfStrikethroughRuns() > 0u);
+}
+
+float View::GetStrikethroughHeight() const
+{
+  return (mImpl->mVisualModel) ? mImpl->mVisualModel->GetStrikethroughHeight() : 0.0f;
+}
+
+Length View::GetNumberOfStrikethroughRuns() const
+{
+  if(mImpl->mVisualModel)
+  {
+    return mImpl->mVisualModel->GetNumberOfStrikethroughRuns();
+  }
+
+  return 0u;
+}
+
+void View::GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns,
+                                StrikethroughRunIndex  index,
+                                Length                 numberOfRuns) const
+{
+  if(mImpl->mVisualModel)
+  {
+    mImpl->mVisualModel->GetStrikethroughRuns(strikethroughRuns,
+                                              index,
+                                              numberOfRuns);
+  }
+}
 
-} // namespace Toolkit
+Length View::GetNumberOfBoundedParagraphRuns() const
+{
+  if(mImpl->mLogicalModel)
+  {
+    return mImpl->mLogicalModel->GetNumberOfBoundedParagraphRuns();
+  }
+
+  return 0u;
+}
+
+const Vector<BoundedParagraphRun>& View::GetBoundedParagraphRuns() const
+{
+  return mImpl->mLogicalModel->GetBoundedParagraphRuns();
+}
+
+float View::GetCharacterSpacing() const
+{
+  return mImpl->mVisualModel->GetCharacterSpacing();
+}
+
+const Character* View::GetTextBuffer() const
+{
+  return mImpl->mLogicalModel->mText.Begin();
+}
+
+const Vector<CharacterIndex>& View::GetGlyphsToCharacters() const
+{
+  return mImpl->mVisualModel->GetGlyphsToCharacters();
+}
 
-} // namespace Dali
+} // namespace Dali::Toolkit::Text
diff --git a/dali-toolkit/internal/text/text-view.h b/dali-toolkit/internal/text/text-view.h
index 62324e8..5bf55e1 100644
--- a/dali-toolkit/internal/text/text-view.h
+++ b/dali-toolkit/internal/text/text-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_VIEW_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
  */
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/bounded-paragraph-run.h>
+#include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/text-view-interface.h>
 #include <dali-toolkit/internal/text/visual-model-impl.h>
 
@@ -52,6 +54,13 @@ public:
   void SetVisualModel(VisualModelPtr visualModel);
 
   /**
+   * @brief Set the logical model.
+   *
+   * @param[in] logicalModel The logical model used by the View.
+   */
+  void SetLogicalModel(LogicalModelPtr logicalModel);
+
+  /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetControlSize()
    */
   const Vector2& GetControlSize() const override;
@@ -78,27 +87,27 @@ public:
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetColors()
    */
-  const Vector4* const GetColors() const override;
+  const Vector4* GetColors() const override;
 
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetColorIndices()
    */
-  const ColorIndex* const GetColorIndices() const override;
+  const ColorIndex* GetColorIndices() const override;
 
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColors()
    */
-  const Vector4* const GetBackgroundColors() const override;
+  const Vector4* GetBackgroundColors() const override;
 
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColorIndices()
    */
-  const ColorIndex* const GetBackgroundColorIndices() const override;
+  const ColorIndex* GetBackgroundColorIndices() const override;
 
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::IsMarkupBackgroundColorSet()
    */
-  bool const IsMarkupBackgroundColorSet() const;
+  bool IsMarkupBackgroundColorSet() const;
 
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetTextColor()
@@ -126,6 +135,11 @@ public:
   bool IsUnderlineEnabled() const override;
 
   /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::IsMarkupUnderlineSet()
+   */
+  bool IsMarkupUnderlineSet() const;
+
+  /**
   * @copydoc Dali::Toolkit::Text::ViewInterface::GetHyphens()
   */
   const GlyphInfo* GetHyphens() const override;
@@ -146,6 +160,21 @@ public:
   float GetUnderlineHeight() const override;
 
   /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineType()
+   */
+  Text::Underline::Type GetUnderlineType() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetDashedUnderlineWidth()
+   */
+  float GetDashedUnderlineWidth() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetDashedUnderlineGap()
+   */
+  float GetDashedUnderlineGap() const override;
+
+  /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfUnderlineRuns()
    */
   Length GetNumberOfUnderlineRuns() const override;
@@ -153,9 +182,9 @@ public:
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineRuns()
    */
-  virtual void GetUnderlineRuns(GlyphRun*         underlineRuns,
-                                UnderlineRunIndex index,
-                                Length            numberOfRuns) const;
+  virtual void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns,
+                                UnderlineRunIndex   index,
+                                Length              numberOfRuns) const;
 
   /**
    * @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineColor()
@@ -197,6 +226,63 @@ public:
    */
   GlyphIndex GetSecondMiddleIndexOfElidedGlyphs() const override;
 
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetStrikethroughColor()
+   */
+  const Vector4& GetStrikethroughColor() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::IsStrikethroughEnabled()
+   */
+  bool IsStrikethroughEnabled() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::IsMarkupStrikethroughSet()
+   */
+  bool IsMarkupStrikethroughSet() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetStrikethroughHeight()
+   */
+  float GetStrikethroughHeight() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfStrikethroughRuns()
+   */
+  Length GetNumberOfStrikethroughRuns() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetStrikethroughRuns()
+   */
+  void GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns,
+                            StrikethroughRunIndex  index,
+                            Length                 numberOfRuns) const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfBoundedParagraphRuns()
+   */
+  virtual Length GetNumberOfBoundedParagraphRuns() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetBoundedParagraphRuns()
+   */
+  virtual const Vector<BoundedParagraphRun>& GetBoundedParagraphRuns() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetCharacterSpacing()
+   */
+  float GetCharacterSpacing() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetTextBuffer()
+   */
+  const Character* GetTextBuffer() const override;
+
+  /**
+   * @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphsToCharacters()
+   */
+  const Vector<CharacterIndex>& GetGlyphsToCharacters() const override;
+
 private:
   // Undefined
   View(const View& handle);
diff --git a/dali-toolkit/internal/text/underline-style-properties.h b/dali-toolkit/internal/text/underline-style-properties.h
new file mode 100644
index 0000000..c2bd9ab
--- /dev/null
+++ b/dali-toolkit/internal/text/underline-style-properties.h
@@ -0,0 +1,198 @@
+#ifndef DALI_TOOLKIT_TEXT_UNDERLINE_STYLE_PROPERTIES_H
+#define DALI_TOOLKIT_TEXT_UNDERLINE_STYLE_PROPERTIES_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/constants.h>
+#include <dali/public-api/math/math-utils.h>
+#include <dali/public-api/math/vector4.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/text/text-enumerations.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Properties of underline style.
+ */
+struct UnderlineStyleProperties
+{
+  // Constructors
+
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  UnderlineStyleProperties()
+  : type{Text::Underline::SOLID},
+    color{Color::BLACK},
+    height{0u},
+    dashGap{1u},
+    dashWidth{2u},
+    typeDefined{false},
+    colorDefined{false},
+    heightDefined{false},
+    dashGapDefined{false},
+    dashWidthDefined{false}
+  {
+  }
+
+  UnderlineStyleProperties(Text::Underline::Type type,
+                           Vector4               color,
+                           float                 height,
+                           float                 dashGap,
+                           float                 dashWidth,
+                           bool                  typeDefined,
+                           bool                  colorDefined,
+                           bool                  heightDefined,
+                           bool                  dashGapDefined,
+                           bool                  dashWidthDefined)
+  : type{type},
+    color{color},
+    height{height},
+    dashGap{dashGap},
+    dashWidth{dashWidth},
+    typeDefined{typeDefined},
+    colorDefined{colorDefined},
+    heightDefined{heightDefined},
+    dashGapDefined{dashGapDefined},
+    dashWidthDefined{dashWidthDefined}
+  {
+  }
+
+  // Overloading operators
+
+  bool operator==(const UnderlineStyleProperties& other) const
+  {
+    //The property is similar when both are not defined or when both are defined and have the same value.
+    return ((!typeDefined && !other.typeDefined) || ((typeDefined && other.typeDefined) && (type == other.type))) &&
+           ((!colorDefined && !other.colorDefined) || ((colorDefined && other.colorDefined) && (color == other.color))) &&
+           ((!heightDefined && !other.heightDefined) || ((heightDefined && other.heightDefined) && (Dali::Equals(height, other.height)))) &&
+           ((!dashGapDefined && !other.dashGapDefined) || ((dashGapDefined && other.dashGapDefined) && (Dali::Equals(dashGap, other.dashGap)))) &&
+           ((!dashWidthDefined && !other.dashWidthDefined) || ((dashWidthDefined && other.dashWidthDefined) && (Dali::Equals(dashWidth, other.dashWidth))));
+  }
+
+  bool operator!=(const UnderlineStyleProperties& other) const
+  {
+    return !(*this == other);
+  }
+
+  bool IsHeightEqualTo(const UnderlineStyleProperties& other) const
+  {
+    return ((!heightDefined && !other.heightDefined) || ((heightDefined && other.heightDefined) && (Dali::Equals(height, other.height))));
+  }
+
+  UnderlineStyleProperties& CopyIfNotDefined(const UnderlineStyleProperties& other)
+  {
+    //Copy only the defined properties in other and not defined in this from other to this
+    if(!typeDefined && other.typeDefined)
+    {
+      type        = other.type;
+      typeDefined = true;
+    }
+
+    if(!heightDefined && other.heightDefined)
+    {
+      height        = other.height;
+      heightDefined = true;
+    }
+
+    if(!colorDefined && other.colorDefined)
+    {
+      color        = other.color;
+      colorDefined = true;
+    }
+
+    if(!dashGapDefined && other.dashGapDefined)
+    {
+      dashGap        = other.dashGap;
+      dashGapDefined = true;
+    }
+
+    if(!dashWidthDefined && other.dashWidthDefined)
+    {
+      dashWidth        = other.dashWidth;
+      dashWidthDefined = true;
+    }
+
+    // to chain this method
+    return *this;
+  }
+
+  UnderlineStyleProperties& OverrideByDefinedProperties(const UnderlineStyleProperties& other)
+  {
+    //Copy only the defined properties in other from other to this
+    if(other.typeDefined)
+    {
+      type        = other.type;
+      typeDefined = true;
+    }
+
+    if(other.heightDefined)
+    {
+      height        = other.height;
+      heightDefined = true;
+    }
+
+    if(other.colorDefined)
+    {
+      color        = other.color;
+      colorDefined = true;
+    }
+
+    if(other.dashGapDefined)
+    {
+      dashGap        = other.dashGap;
+      dashGapDefined = true;
+    }
+
+    if(other.dashWidthDefined)
+    {
+      dashWidth        = other.dashWidth;
+      dashWidthDefined = true;
+    }
+
+    // to chain this method
+    return *this;
+  }
+
+  //Attributes
+  Text::Underline::Type type;      ///< The type of underline.
+  Vector4               color;     ///< The color of underline.
+  float                 height;    ///< The height of underline.
+  float                 dashGap;   ///< The dash-gap of underline.
+  float                 dashWidth; ///< The height of underline.
+
+  bool typeDefined : 1;      ///< Whether the type is defined.
+  bool colorDefined : 1;     ///< Whether the color is defined.
+  bool heightDefined : 1;    ///< Whether the height is defined.
+  bool dashGapDefined : 1;   ///< Whether the dash-gap is defined.
+  bool dashWidthDefined : 1; ///< Whether the dash-width is defined.
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_UNDERLINE_STYLE_PROPERTIES_H
diff --git a/dali-toolkit/internal/text/underlined-character-run.h b/dali-toolkit/internal/text/underlined-character-run.h
index 99d5967..c16bca6 100644
--- a/dali-toolkit/internal/text/underlined-character-run.h
+++ b/dali-toolkit/internal/text/underlined-character-run.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_UNDERLINED_CHARACTER_RUN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 #include <dali/public-api/math/vector4.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/character-run.h>
-#include <dali-toolkit/internal/text/glyph-run.h>
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
+#include <dali-toolkit/internal/text/underline-style-properties.h>
 
 namespace Dali
 {
@@ -34,18 +34,34 @@ namespace Text
 /**
  * @brief Run of underlined characters with same properties.
  */
-struct UnderlinedCharacterRun
+struct UnderlinedCharacterRun : public AbstractStyleCharacterRun
 {
-  CharacterRun characterRun; ///< The initial character index and the number of characters of the run.
-  //TODO: add properties like color, height and style
-  //Vector4      color;       ///< The color of underline.
-  //float        height;      ///< The height of underline.
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  UnderlinedCharacterRun()
+  : AbstractStyleCharacterRun(),
+    properties{}
+  {
+  }
+
+  UnderlineStyleProperties properties; /// The properties of underline style
 };
 
 } // namespace Text
 
 } // namespace Toolkit
 
+// Allow UnderlinedCharacterRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::UnderlinedCharacterRun> : public Dali::BasicTypes<Dali::Toolkit::Text::UnderlinedCharacterRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
 } // namespace Dali
 
 #endif // DALI_TOOLKIT_TEXT_UNDERLINED_CHARACTER_RUN_H
diff --git a/dali-toolkit/internal/text/underlined-glyph-run.h b/dali-toolkit/internal/text/underlined-glyph-run.h
new file mode 100644
index 0000000..4c5ed7a
--- /dev/null
+++ b/dali-toolkit/internal/text/underlined-glyph-run.h
@@ -0,0 +1,58 @@
+#ifndef DALI_TOOLKIT_TEXT_UNDERLINED_GLYPH_RUN_H
+#define DALI_TOOLKIT_TEXT_UNDERLINED_GLYPH_RUN_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector4.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/glyph-run.h>
+#include <dali-toolkit/internal/text/underline-style-properties.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Text
+{
+/**
+ * @brief Run of underlined glyphs with same properties.
+ */
+struct UnderlinedGlyphRun
+{
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  UnderlinedGlyphRun()
+  : glyphRun{},
+    properties{}
+  {
+  }
+
+  GlyphRun                 glyphRun;   ///< The initial glyph index and the number of glyphs in the run.
+  UnderlineStyleProperties properties; /// The properties of underline style
+};
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_UNDERLINED_GLYPH_RUN_H
diff --git a/dali-toolkit/internal/text/visual-model-impl.cpp b/dali-toolkit/internal/text/visual-model-impl.cpp
index 5fa3843..c79e5a9 100644
--- a/dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/dali-toolkit/internal/text/visual-model-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -204,6 +204,11 @@ void VisualModel::GetGlyphPositions(Vector2*   glyphPositions,
   memcpy(glyphPositions, mGlyphPositions.Begin() + glyphIndex, numberOfGlyphs * sizeof(Vector2));
 }
 
+Length VisualModel::GetTotalNumberOfLines() const
+{
+  return mLines.Size();
+}
+
 void VisualModel::GetNumberOfLines(GlyphIndex glyphIndex,
                                    Length     numberOfGlyphs,
                                    LineIndex& firstLine,
@@ -249,6 +254,12 @@ void VisualModel::GetNumberOfLines(GlyphIndex glyphIndex,
   }
 }
 
+LineIndex VisualModel::GetLineOfGlyph( GlyphIndex glyphIndex )
+{
+  const CharacterIndex characterIndex = *(mGlyphsToCharacters.Begin() + glyphIndex);
+  return GetLineOfCharacter(characterIndex);
+}
+
 void VisualModel::GetLinesOfGlyphRange(LineRun*   lines,
                                        GlyphIndex glyphIndex,
                                        Length     numberOfGlyphs) const
@@ -300,13 +311,13 @@ LineIndex VisualModel::GetLineOfCharacter(CharacterIndex characterIndex)
   return index;
 }
 
-void VisualModel::GetUnderlineRuns(GlyphRun*         underlineRuns,
-                                   UnderlineRunIndex index,
-                                   Length            numberOfRuns) const
+void VisualModel::GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns,
+                                   UnderlineRunIndex   index,
+                                   Length              numberOfRuns) const
 {
   memcpy(underlineRuns,
          mUnderlineRuns.Begin() + index,
-         numberOfRuns * sizeof(GlyphRun));
+         numberOfRuns * sizeof(UnderlinedGlyphRun));
 }
 
 void VisualModel::SetNaturalSize(const Vector2& size)
@@ -329,6 +340,16 @@ const Vector2& VisualModel::GetLayoutSize() const
   return mLayoutSize;
 }
 
+void VisualModel::SetHeightForWidth(const Vector2& size)
+{
+  mHeightForWidth = size;
+}
+
+const Vector2& VisualModel::GetHeightForWidth() const
+{
+  return mHeightForWidth;
+}
+
 void VisualModel::SetTextColor(const Vector4& textColor)
 {
   mTextColor = textColor;
@@ -375,6 +396,21 @@ void VisualModel::SetUnderlineHeight(float height)
   mUnderlineHeight = height;
 }
 
+void VisualModel::SetUnderlineType(Text::Underline::Type type)
+{
+  mUnderlineType = type;
+}
+
+void VisualModel::SetDashedUnderlineWidth(float width)
+{
+  mDashedUnderlineWidth = width;
+}
+
+void VisualModel::SetDashedUnderlineGap(float gap)
+{
+  mDashedUnderlineGap = gap;
+}
+
 void VisualModel::SetOutlineWidth(uint16_t width)
 {
   mOutlineWidth = width;
@@ -425,6 +461,26 @@ void VisualModel::SetSecondMiddleIndexOfElidedGlyphs(GlyphIndex secondMiddleInde
   mSecondMiddleIndexOfElidedGlyphs = secondMiddleIndexOfElidedGlyphs;
 }
 
+void VisualModel::SetStrikethroughColor(const Vector4& color)
+{
+  mStrikethroughColor = color;
+}
+
+void VisualModel::SetStrikethroughEnabled(bool enabled)
+{
+  mStrikethroughEnabled = enabled;
+}
+
+void VisualModel::SetStrikethroughHeight(float height)
+{
+  mStrikethroughHeight = height;
+}
+
+void VisualModel::SetCharacterSpacing(float characterSpacing)
+{
+  mCharacterSpacing = characterSpacing;
+}
+
 const Vector4& VisualModel::GetTextColor() const
 {
   return mTextColor;
@@ -465,6 +521,21 @@ float VisualModel::GetUnderlineHeight() const
   return mUnderlineHeight;
 }
 
+Text::Underline::Type VisualModel::GetUnderlineType() const
+{
+  return mUnderlineType;
+}
+
+float VisualModel::GetDashedUnderlineWidth() const
+{
+  return mDashedUnderlineWidth;
+}
+
+float VisualModel::GetDashedUnderlineGap() const
+{
+  return mDashedUnderlineGap;
+}
+
 uint16_t VisualModel::GetOutlineWidth() const
 {
   return mOutlineWidth;
@@ -475,6 +546,11 @@ const Vector4& VisualModel::GetBackgroundColor() const
   return mBackgroundColor;
 }
 
+const float VisualModel::GetCharacterSpacing() const
+{
+  return mCharacterSpacing;
+}
+
 bool VisualModel::IsBackgroundEnabled() const
 {
   return mBackgroundEnabled;
@@ -520,11 +596,55 @@ Length VisualModel::GetNumberOfUnderlineRuns() const
   return mUnderlineRuns.Count();
 }
 
+const Vector4& VisualModel::GetStrikethroughColor() const
+{
+  return mStrikethroughColor;
+}
+
+bool VisualModel::IsStrikethroughEnabled() const
+{
+  return mStrikethroughEnabled;
+}
+
+float VisualModel::GetStrikethroughHeight() const
+{
+  return mStrikethroughHeight;
+}
+
+void VisualModel::GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns,
+                                       StrikethroughRunIndex  index,
+                                       Length                 numberOfRuns) const
+{
+  memcpy(strikethroughRuns,
+         mStrikethroughRuns.Begin() + index,
+         numberOfRuns * sizeof(StrikethroughGlyphRun));
+}
+
+Length VisualModel::GetNumberOfStrikethroughRuns() const
+{
+  return mStrikethroughRuns.Count();
+}
+
+Length VisualModel::GetNumberOfCharacterSpacingGlyphRuns() const
+{
+  return mCharacterSpacingRuns.Count();
+}
+
+const Vector<CharacterSpacingGlyphRun>& VisualModel::GetCharacterSpacingGlyphRuns() const
+{
+  return mCharacterSpacingRuns;
+}
+
 void VisualModel::ClearCaches()
 {
   mCachedLineIndex = 0u;
 }
 
+const Vector<CharacterIndex>& VisualModel::GetGlyphsToCharacters() const
+{
+  return mGlyphsToCharacters;
+}
+
 VisualModel::~VisualModel()
 {
 }
@@ -542,13 +662,19 @@ VisualModel::VisualModel()
   mUnderlineColor(Color::BLACK),
   mOutlineColor(Color::WHITE),
   mBackgroundColor(Color::TRANSPARENT),
+  mStrikethroughColor(Color::BLACK),
   mControlSize(),
   mShadowOffset(),
   mUnderlineHeight(0.0f),
+  mStrikethroughHeight(0.0f),
+  mUnderlineType(Text::Underline::SOLID),
+  mDashedUnderlineWidth(2.0f),
+  mDashedUnderlineGap(1.0f),
   mShadowBlurRadius(0.0f),
   mOutlineWidth(0u),
   mNaturalSize(),
   mLayoutSize(),
+  mHeightForWidth(0.0f, 0.0f),
   mCachedLineIndex(0u),
   mEllipsisPosition(DevelText::EllipsisPosition::END),
   mStartIndexOfElidedGlyphs(0u),
@@ -559,7 +685,9 @@ VisualModel::VisualModel()
   mUnderlineEnabled(false),
   mUnderlineColorSet(false),
   mBackgroundEnabled(false),
-  mMarkupProcessorEnabled(false)
+  mMarkupProcessorEnabled(false),
+  mStrikethroughEnabled(false),
+  mCharacterSpacing(0.0f)
 
 {
 }
diff --git a/dali-toolkit/internal/text/visual-model-impl.h b/dali-toolkit/internal/text/visual-model-impl.h
index 359b695..9dae2cf 100644
--- a/dali-toolkit/internal/text/visual-model-impl.h
+++ b/dali-toolkit/internal/text/visual-model-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_VISUAL_MODEL_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,12 @@
 #include <dali/public-api/object/ref-object.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/character-spacing-glyph-run.h>
 #include <dali-toolkit/internal/text/color-run.h>
 #include <dali-toolkit/internal/text/line-run.h>
+#include <dali-toolkit/internal/text/strikethrough-glyph-run.h>
+#include <dali-toolkit/internal/text/underlined-glyph-run.h>
+#include <dali-toolkit/public-api/text/text-enumerations.h>
 
 // DEVEL INCLUDES
 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
@@ -120,6 +124,13 @@ public:
   // Line interface.
 
   /**
+   * @brief Retrieves the total number of lines.
+   *
+   * @return The number of lines.
+   */
+  Length GetTotalNumberOfLines() const;
+
+  /**
    * @brief Retrieves the number of lines and the index to the first line where the given range of glyphs is laid out.
    *
    * @param[in] glyphIndex Index to the first glyph.
@@ -133,6 +144,15 @@ public:
                         Length&    numberOfLines) const;
 
   /**
+   * @brief Retrieves the line index where the glyph is laid-out.
+   *
+   * @param[in] glyphIndex The glyph's index.
+   *
+   * @return The line index.
+   */
+  LineIndex GetLineOfGlyph(GlyphIndex glyphIndex);
+
+  /**
    * @brief Retrieves the lines where the given range of glyphs is laid out.
    *
    * The size of the @p lines buffer needs to be big enough to copy the @p numberOfLines.
@@ -163,9 +183,9 @@ public:
    * @param[in] index Index of the first underline run to be copied.
    * @param[in] numberOfRuns Number of underline runs to be copied.
    */
-  void GetUnderlineRuns(GlyphRun*         underlineRuns,
-                        UnderlineRunIndex index,
-                        Length            numberOfRuns) const;
+  void GetUnderlineRuns(UnderlinedGlyphRun* underlineRuns,
+                        UnderlineRunIndex   index,
+                        Length              numberOfRuns) const;
 
   // Size interface
 
@@ -198,6 +218,20 @@ public:
   const Vector2& GetLayoutSize() const;
 
   /**
+   * @brief Sets the size of height for width.
+   *
+   * @param[in] size The text's height for width size.
+   */
+  void SetHeightForWidth(const Vector2& size);
+
+  /**
+   * @brief Retrieves the height for width size.
+   *
+   * @return The text's height for width size.
+   */
+  const Vector2& GetHeightForWidth() const;
+
+  /**
    * @brief Set the text's color
    *
    * @param[in] textColor The text's color
@@ -294,6 +328,27 @@ public:
   void SetUnderlineHeight(float height);
 
   /**
+   * @brief Set the override used for underline type.
+   *
+   * @param[in] underlineType The type of the underline.
+   */
+  void SetUnderlineType(Text::Underline::Type type);
+
+  /**
+   * @brief Set the override used for the width of the dashes of the dashed underline.
+   *
+   * @param[in] width width of the dashes.
+   */
+  void SetDashedUnderlineWidth(float width);
+
+  /**
+   * @brief Set the override used for the gap between the dashes of the dashed underline.
+   *
+   * @param[in] gap gap between the dashes.
+   */
+  void SetDashedUnderlineGap(float gap);
+
+  /**
    * @brief Retrieves the underline height override
    *
    * @return Returns the override height for an underline, 0 indicates that font metrics will determine the height
@@ -301,6 +356,27 @@ public:
   float GetUnderlineHeight() const;
 
   /**
+   * @brief Retrieves the underline type override.
+   *
+   * @return Returns the override type for the underline.
+   */
+  Text::Underline::Type GetUnderlineType() const;
+
+  /**
+   * @brief Retrieves the dashed underline width.
+   *
+   * @return Returns the override width for the dashed underline.
+   */
+  float GetDashedUnderlineWidth() const;
+
+  /**
+   * @brief Retrieves the dashed underline gap.
+   *
+   * @return Returns the override gap for the dashed underline.
+   */
+  float GetDashedUnderlineGap() const;
+
+  /**
    * @brief Retrieves the number of underline runs.
    *
    * @return The number of underline runs.
@@ -460,6 +536,104 @@ public:
    */
   GlyphIndex GetSecondMiddleIndexOfElidedGlyphs() const;
 
+  /**
+   * @brief Sets the text's strikethrough color.
+   *
+   * @param[in] color The text's strikethrough color.
+   */
+  void SetStrikethroughColor(const Vector4& color);
+
+  /**
+   * @brief Retrieves the text's strikethrough color.
+   *
+   * @return The text's strikethrough color.
+   */
+  const Vector4& GetStrikethroughColor() const;
+
+  /**
+   * @brief Sets the text strikethrough flag.
+   *
+   * @param[in] enabled true if strikethrough.
+   */
+  void SetStrikethroughEnabled(bool enabled);
+
+  /**
+   * @brief Returns whether the text is strikethrough or not.
+   *
+   * @return strikethrough state.
+   */
+  bool IsStrikethroughEnabled() const;
+
+  /**
+   * @brief Set the override used for strikethrough height, 0 indicates height will be come from font metrics
+   *
+   * @param[in] height The height in pixels of the strikethrough
+   */
+  void SetStrikethroughHeight(float height);
+
+  /**
+   * @brief Retrieves the strikethrough height override
+   *
+   * @return Returns the override height for a strikethrough, 0 indicates that font metrics will determine the height
+   */
+  float GetStrikethroughHeight() const;
+  /**
+   * @brief Set the override used for character spacing.
+   *
+   * @note A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+   *
+   * @param[in] characterSpacing The character spacing.
+   */
+  void SetCharacterSpacing(float characterSpacing);
+
+  /**
+   * @brief Retrieves the characterSpacing.
+   *
+   * @note A positive value will make the characters far apart (expanded) and a negative value will bring them closer (condensed).
+   *
+   * @return Returns the characterSpacing.
+   */
+  const float GetCharacterSpacing() const;
+
+  /**
+   * @brief Retrieves the Glyphs to Characters Array.
+   *
+   * @return The GlyphsToCharacters.
+   */
+  const Vector<CharacterIndex>& GetGlyphsToCharacters() const;
+
+  /**
+   * @brief Retrieves the strikethrough runs.
+   *
+   * @param[out] strikethroughRuns Pointer to a buffer where the strikethrough runs are copied.
+   * @param[in] index Index of the first strikethrough run to be copied.
+   * @param[in] numberOfRuns Number of strikethrough runs to be copied.
+   */
+  void GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns,
+                            StrikethroughRunIndex  index,
+                            Length                 numberOfRuns) const;
+
+  /**
+   * @brief Retrieves the number of strikethrough runs.
+   *
+   * @return The number of strikethrough runs.
+   */
+  Length GetNumberOfStrikethroughRuns() const;
+
+  /**
+   * @brief Retrieves the number of character-spacing glyph runs.
+   *
+   * @return The number of character-spacing glyph runs.
+   */
+  Length GetNumberOfCharacterSpacingGlyphRuns() const;
+
+  /**
+   * @brief Retrieves the reference for character-spacing glyph runs.
+   *
+   * @return The reference for character-spacing glyph runs.
+   */
+  const Vector<CharacterSpacingGlyphRun>& GetCharacterSpacingGlyphRuns() const;
+
 protected:
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -479,33 +653,40 @@ private:
   VisualModel& operator=(const VisualModel& handle);
 
 public:
-  Vector<GlyphInfo>      mGlyphs;                 ///< For each glyph, the font's id, glyph's index within the font and glyph's metrics.
-  Vector<CharacterIndex> mGlyphsToCharacters;     ///< For each glyph, the index of the first character.
-  Vector<GlyphIndex>     mCharactersToGlyph;      ///< For each character, the index of the first glyph.
-  Vector<Length>         mCharactersPerGlyph;     ///< For each glyph, the number of characters that form the glyph.
-  Vector<Length>         mGlyphsPerCharacter;     ///< For each character, the number of glyphs that are shaped.
-  Vector<Vector2>        mGlyphPositions;         ///< For each glyph, the position.
-  Vector<LineRun>        mLines;                  ///< The laid out lines.
-  Vector<GlyphRun>       mUnderlineRuns;          ///< Runs of glyphs that are underlined.
-  Vector<Vector4>        mColors;                 ///< Colors of the glyphs.
-  Vector<ColorIndex>     mColorIndices;           ///< Indices to the vector of colors for each glyphs.
-  Vector<Vector4>        mBackgroundColors;       ///< Background colors of the glyphs.
-  Vector<ColorIndex>     mBackgroundColorIndices; ///< Indices to the vector of background colors for each glyphs.
-
-  Vector4  mTextColor;        ///< The text color
-  Vector4  mShadowColor;      ///< Color of drop shadow
-  Vector4  mUnderlineColor;   ///< Color of underline
-  Vector4  mOutlineColor;     ///< Color of outline
-  Vector4  mBackgroundColor;  ///< Color of text background
-  Size     mControlSize;      ///< The size of the UI control.
-  Vector2  mShadowOffset;     ///< Offset for drop shadow, 0 indicates no shadow
-  float    mUnderlineHeight;  ///< Fixed height for underline to override font metrics.
-  float    mShadowBlurRadius; ///< Blur radius of shadow, 0 indicates no blur.
-  uint16_t mOutlineWidth;     ///< Width of outline.
+  Vector<GlyphInfo>                mGlyphs;                 ///< For each glyph, the font's id, glyph's index within the font and glyph's metrics.
+  Vector<CharacterIndex>           mGlyphsToCharacters;     ///< For each glyph, the index of the first character.
+  Vector<GlyphIndex>               mCharactersToGlyph;      ///< For each character, the index of the first glyph.
+  Vector<Length>                   mCharactersPerGlyph;     ///< For each glyph, the number of characters that form the glyph.
+  Vector<Length>                   mGlyphsPerCharacter;     ///< For each character, the number of glyphs that are shaped.
+  Vector<Vector2>                  mGlyphPositions;         ///< For each glyph, the position.
+  Vector<LineRun>                  mLines;                  ///< The laid out lines.
+  Vector<UnderlinedGlyphRun>       mUnderlineRuns;          ///< Runs of glyphs that are underlined.
+  Vector<Vector4>                  mColors;                 ///< Colors of the glyphs.
+  Vector<ColorIndex>               mColorIndices;           ///< Indices to the vector of colors for each glyphs.
+  Vector<Vector4>                  mBackgroundColors;       ///< Background colors of the glyphs.
+  Vector<ColorIndex>               mBackgroundColorIndices; ///< Indices to the vector of background colors for each glyphs.
+  Vector4                          mTextColor;              ///< The text color
+  Vector4                          mShadowColor;            ///< Color of drop shadow
+  Vector4                          mUnderlineColor;         ///< Color of underline
+  Vector4                          mOutlineColor;           ///< Color of outline
+  Vector4                          mBackgroundColor;        ///< Color of text background
+  Vector4                          mStrikethroughColor;     ///< Color of text background
+  Size                             mControlSize;            ///< The size of the UI control.
+  Vector2                          mShadowOffset;           ///< Offset for drop shadow, 0 indicates no shadow
+  float                            mUnderlineHeight;        ///< Fixed height for underline to override font metrics.
+  float                            mStrikethroughHeight;    ///< Fixed height for strikethrough to override font metrics.
+  Text::Underline::Type            mUnderlineType;          ///< The type of the underline.
+  float                            mDashedUnderlineWidth;   ///< The width of the dashes of the dashed underline.
+  float                            mDashedUnderlineGap;     ///< The gap between the dashes of the dashed underline.
+  float                            mShadowBlurRadius;       ///< Blur radius of shadow, 0 indicates no blur.
+  uint16_t                         mOutlineWidth;           ///< Width of outline.
+  Vector<StrikethroughGlyphRun>    mStrikethroughRuns;      ///< Runs of glyphs that have strikethrough.
+  Vector<CharacterSpacingGlyphRun> mCharacterSpacingRuns;   ///< Runs of glyphs that have character-spacing.
 
 private:
-  Size mNaturalSize; ///< Size of the text with no line wrapping.
-  Size mLayoutSize;  ///< Size of the laid-out text considering the layout properties set.
+  Size mNaturalSize;    ///< Size of the text with no line wrapping.
+  Size mLayoutSize;     ///< Size of the laid-out text considering the layout properties set.
+  Size mHeightForWidth; ///< Size of the text last calculated using GetHeightForWidth.
 
   // Caches to increase performance in some consecutive operations.
   LineIndex mCachedLineIndex; ///< Used to increase performance in consecutive calls to GetLineOfGlyph() or GetLineOfCharacter() with consecutive glyphs or characters.
@@ -523,6 +704,8 @@ public:
   bool       mBackgroundEnabled : 1;      ///< Background enabled flag
   bool       mMarkupProcessorEnabled : 1; ///< Markup-processor enabled flag
   HyphenInfo mHyphen;                     ///< Contains hyphen glyph info & the character index to draw hyphen after.
+  bool       mStrikethroughEnabled : 1;   ///< Strikethrough enabled flag
+  float      mCharacterSpacing;           ///< Contains the value of the character spacing.
 };
 
 } // namespace Text
diff --git a/dali-toolkit/internal/texture-manager/texture-async-loading-helper.cpp b/dali-toolkit/internal/texture-manager/texture-async-loading-helper.cpp
new file mode 100644
index 0000000..972b919
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-async-loading-helper.cpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/texture-manager/texture-async-loading-helper.h>
+
+// EXTERNAL HEADERS
+#include <dali/integration-api/debug.h>
+
+// INTERNAL HEADERS
+#include <dali-toolkit/internal/image-loader/async-image-loader-impl.h>
+#include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+#ifdef DEBUG_ENABLED
+extern Debug::Filter* gTextureManagerLogFilter; ///< Define at texture-manager-impl.cpp
+#endif
+
+TextureAsyncLoadingHelper::TextureAsyncLoadingHelper(TextureManager& textureManager)
+: mTextureManager(textureManager),
+  mLoadTaskId(0u)
+{
+}
+
+void TextureAsyncLoadingHelper::LoadAnimatedImage(const TextureManager::TextureId                textureId,
+                                                  Dali::AnimatedImageLoading                     animatedImageLoading,
+                                                  const uint32_t                                 frameIndex,
+                                                  const Dali::ImageDimensions&                   desiredSize,
+                                                  const Dali::FittingMode::Type                  fittingMode,
+                                                  const Dali::SamplingMode::Type                 samplingMode,
+                                                  const DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
+{
+  LoadingTaskPtr loadingTask = new LoadingTask(++mLoadTaskId, animatedImageLoading, frameIndex, desiredSize, fittingMode, samplingMode, preMultiplyOnLoad, MakeCallback(this, &TextureAsyncLoadingHelper::AsyncLoadComplete));
+  loadingTask->SetTextureId(textureId);
+  Dali::AsyncTaskManager::Get().AddTask(loadingTask);
+}
+
+void TextureAsyncLoadingHelper::Load(const TextureManager::TextureId                textureId,
+                                     const VisualUrl&                               url,
+                                     const Dali::ImageDimensions&                   desiredSize,
+                                     const Dali::FittingMode::Type                  fittingMode,
+                                     const Dali::SamplingMode::Type                 samplingMode,
+                                     const bool                                     orientationCorrection,
+                                     const DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+                                     const bool                                     loadYuvPlanes)
+{
+  LoadingTaskPtr loadingTask;
+  if(DALI_UNLIKELY(url.IsBufferResource()))
+  {
+    loadingTask = new LoadingTask(++mLoadTaskId, mTextureManager.GetEncodedImageBuffer(url.GetUrl()), desiredSize, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad, MakeCallback(this, &TextureAsyncLoadingHelper::AsyncLoadComplete));
+  }
+  else
+  {
+    loadingTask = new LoadingTask(++mLoadTaskId, url, desiredSize, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad, loadYuvPlanes, MakeCallback(this, &TextureAsyncLoadingHelper::AsyncLoadComplete));
+  }
+
+  loadingTask->SetTextureId(textureId);
+  Dali::AsyncTaskManager::Get().AddTask(loadingTask);
+}
+
+void TextureAsyncLoadingHelper::ApplyMask(const TextureManager::TextureId                textureId,
+                                          Devel::PixelBuffer                             pixelBuffer,
+                                          Devel::PixelBuffer                             maskPixelBuffer,
+                                          const float                                    contentScale,
+                                          const bool                                     cropToMask,
+                                          const DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
+{
+  LoadingTaskPtr loadingTask = new LoadingTask(++mLoadTaskId, pixelBuffer, maskPixelBuffer, contentScale, cropToMask, preMultiplyOnLoad, MakeCallback(this, &TextureAsyncLoadingHelper::AsyncLoadComplete));
+  loadingTask->SetTextureId(textureId);
+  Dali::AsyncTaskManager::Get().AddTask(loadingTask);
+}
+
+void TextureAsyncLoadingHelper::AsyncLoadComplete(LoadingTaskPtr task)
+{
+  // Call TextureManager::AsyncLoadComplete
+  if(task->textureId != TextureManager::INVALID_TEXTURE_ID)
+  {
+    mTextureManager.AsyncLoadComplete(task->textureId, task->pixelBuffers);
+  }
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/texture-manager/texture-async-loading-helper.h b/dali-toolkit/internal/texture-manager/texture-async-loading-helper.h
new file mode 100644
index 0000000..a8fddbf
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-async-loading-helper.h
@@ -0,0 +1,124 @@
+#ifndef DALI_TOOLKIT_TEXTURE_ASYNC_LOADING_HELPER_H
+#define DALI_TOOLKIT_TEXTURE_ASYNC_LOADING_HELPER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/signals/connection-tracker.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/image-loader/loading-task.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+/**
+ * @brief Helper class to keep the relation between AsyncImageLoader and corresponding LoadingInfo container
+ */
+class TextureAsyncLoadingHelper : public ConnectionTracker
+{
+public:
+  /**
+   * @brief Create an TextureAsyncLoadingHelper.
+   * @param[in] textureManager Reference to the texture manager
+   */
+  TextureAsyncLoadingHelper(TextureManager& textureManager);
+
+  /**
+   * @brief Load a new frame of animated image
+   * @param[in] textureId             TextureId to reference the texture that will be loaded
+   * @param[in] animatedImageLoading  The AnimatedImageLoading to load animated image
+   * @param[in] frameIndex            The frame index of a frame to be loaded frame
+   * @param[in] desiredSize           The size the image is likely to appear at.
+   *                                  This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in] preMultiplyOnLoad     if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   */
+  void LoadAnimatedImage(const TextureManager::TextureId                textureId,
+                         Dali::AnimatedImageLoading                     animatedImageLoading,
+                         const uint32_t                                 frameIndex,
+                         const Dali::ImageDimensions&                   desiredSize,
+                         const Dali::FittingMode::Type                  fittingMode,
+                         const Dali::SamplingMode::Type                 samplingMode,
+                         const DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
+
+  /**
+   * @brief Load a new texture.
+   * @param[in] textureId             TextureId to reference the texture that will be loaded
+   * @param[in] url                   The URL of the image to load
+   * @param[in] desiredSize           The size the image is likely to appear at.
+   *                                  This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in] orientationCorrection Whether to use image metadata to rotate or flip the image,
+   *                                  e.g., from portrait to landscape
+   * @param[in] preMultiplyOnLoad     if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
+   * @param[in] loadYuvPlanes         True if the image should be loaded as yuv planes
+   */
+  void Load(const TextureManager::TextureId                textureId,
+            const VisualUrl&                               url,
+            const Dali::ImageDimensions&                   desiredSize,
+            const Dali::FittingMode::Type                  fittingMode,
+            const Dali::SamplingMode::Type                 samplingMode,
+            const bool                                     orientationCorrection,
+            const DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad,
+            const bool                                     loadYuvPlanes);
+
+  /**
+   * @brief Apply mask
+   * @param [in] textureId of the texture
+   * @param [in] pixelBuffer of the to be masked image
+   * @param [in] maskPixelBuffer of the mask image
+   * @param [in] contentScale The factor to scale the content
+   * @param [in] cropToMask Whether to crop the content to the mask size
+   * @param [in] preMultiplyOnLoad if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha.
+   */
+  void ApplyMask(const TextureManager::TextureId                textureId,
+                 Devel::PixelBuffer                             pixelBuffer,
+                 Devel::PixelBuffer                             maskPixelBuffer,
+                 const float                                    contentScale,
+                 const bool                                     cropToMask,
+                 const DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
+
+public:
+  TextureAsyncLoadingHelper(const TextureAsyncLoadingHelper&) = delete;
+  TextureAsyncLoadingHelper& operator=(const TextureAsyncLoadingHelper&) = delete;
+
+private:
+  /**
+   * @brief Callback to be called when texture loading is complete, it passes the pixel buffer list on to texture manager.
+   * @param[in] task LoadingTaskPtr
+   */
+  void AsyncLoadComplete(LoadingTaskPtr task);
+
+private: // Member Variables:
+  TextureManager& mTextureManager;
+  uint32_t        mLoadTaskId;
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXTURE_ASYNC_LOADING_HELPER_H
diff --git a/dali-toolkit/internal/texture-manager/texture-cache-manager.cpp b/dali-toolkit/internal/texture-manager/texture-cache-manager.cpp
new file mode 100644
index 0000000..2dfd16f
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-cache-manager.cpp
@@ -0,0 +1,734 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/texture-manager/texture-cache-manager.h>
+
+// EXTERNAL HEADERS
+#include <dali/devel-api/common/hash.h>
+#include <dali/integration-api/debug.h>
+#include <string_view>
+#include <unordered_map>
+
+// INTERNAL HEADERS
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+const std::string_view& GetEncodedImageBufferExtensions(Dali::EncodedImageBuffer::ImageType imageType)
+{
+  static constexpr std::string_view                                                            emptyString = "";
+  static const std::unordered_map<Dali::EncodedImageBuffer::ImageType, const std::string_view> gEncodedImageBufferExtensionMap =
+    {
+      {Dali::EncodedImageBuffer::ImageType::REGULAR_IMAGE, emptyString},
+      {Dali::EncodedImageBuffer::ImageType::VECTOR_IMAGE, ".svg"},
+      {Dali::EncodedImageBuffer::ImageType::ANIMATED_VECTOR_IMAGE, ".json"},
+    };
+
+  const auto iter = gEncodedImageBufferExtensionMap.find(imageType);
+
+  if(DALI_LIKELY(iter != gEncodedImageBufferExtensionMap.end()))
+  {
+    return iter->second;
+  }
+
+  return emptyString;
+}
+} // namespace
+#ifdef DEBUG_ENABLED
+extern Debug::Filter* gTextureManagerLogFilter; ///< Define at texture-manager-impl.cpp
+
+// clang-format off
+#define GET_LOAD_STATE_STRING(loadState) \
+  loadState == TextureManagerType::LoadState::NOT_STARTED      ? "NOT_STARTED"      : \
+  loadState == TextureManagerType::LoadState::LOADING          ? "LOADING"          : \
+  loadState == TextureManagerType::LoadState::LOAD_FINISHED    ? "LOAD_FINISHED"    : \
+  loadState == TextureManagerType::LoadState::WAITING_FOR_MASK ? "WAITING_FOR_MASK" : \
+  loadState == TextureManagerType::LoadState::MASK_APPLYING    ? "MASK_APPLYING"    : \
+  loadState == TextureManagerType::LoadState::MASK_APPLIED     ? "MASK_APPLIED"     : \
+  loadState == TextureManagerType::LoadState::UPLOADED         ? "UPLOADED"         : \
+  loadState == TextureManagerType::LoadState::CANCELLED        ? "CANCELLED"        : \
+  loadState == TextureManagerType::LoadState::MASK_CANCELLED   ? "MASK_CANCELLED"   : \
+  loadState == TextureManagerType::LoadState::LOAD_FAILED      ? "LOAD_FAILED"      : \
+                                                                 "Unknown"
+// clang-format on
+#endif
+
+// Due to the compile issue, this specialized template code must be defined top of this code.
+template<>
+void TextureCacheManager::RemoveTextureInfoByIndex<TextureCacheManager::EncodedImageBufferInfoContainerType>(TextureCacheManager::EncodedImageBufferInfoContainerType& cacheContainer, const TextureCacheManager::TextureCacheIndex& removeContainerIndex)
+{
+  // Swap last data of cacheContainer.
+  if(static_cast<std::size_t>(removeContainerIndex.GetIndex() + 1) < cacheContainer.size())
+  {
+    // First, change the cache index infomations inside of converter
+    mTextureIdConverter[cacheContainer.back().bufferId] = static_cast<uint32_t>(removeContainerIndex);
+
+    // After change converter, swap the value between current data and last data.
+    std::swap(cacheContainer[removeContainerIndex.GetIndex()], cacheContainer.back());
+  }
+
+  // Now we can assume that latest data should be removed. pop_back.
+  cacheContainer.pop_back();
+}
+
+template<class ContainerType>
+void TextureCacheManager::RemoveTextureInfoByIndex(ContainerType& cacheContainer, const TextureCacheManager::TextureCacheIndex& removeContainerIndex)
+{
+  // Swap last data of cacheContainer.
+  if(static_cast<std::size_t>(removeContainerIndex.GetIndex() + 1) < cacheContainer.size())
+  {
+    // First, change the cache index infomations inside of converter
+    mTextureIdConverter[cacheContainer.back().textureId] = static_cast<uint32_t>(removeContainerIndex);
+
+    // After change converter, swap the value between current data and last data.
+    std::swap(cacheContainer[removeContainerIndex.GetIndex()], cacheContainer.back());
+  }
+
+  // Now we can assume that latest data should be removed. pop_back.
+  cacheContainer.pop_back();
+}
+
+TextureCacheManager::TextureCacheManager()
+{
+}
+
+TextureCacheManager::~TextureCacheManager()
+{
+}
+
+VisualUrl TextureCacheManager::GetVisualUrl(const TextureCacheManager::TextureId textureId)
+{
+  VisualUrl         visualUrl("");
+  TextureCacheIndex cacheIndex = static_cast<TextureCacheIndex>(mTextureIdConverter[static_cast<uint32_t>(textureId)]);
+
+  switch(static_cast<TextureCacheIndexType>(cacheIndex.detailValue.type))
+  {
+    case TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_LOCAL:
+    {
+      DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::GetVisualUrl. Using cached texture index=%d, textureId=%d\n", cacheIndex.GetIndex(), textureId);
+
+      TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex.GetIndex()]);
+      visualUrl = cachedTextureInfo.url;
+      break;
+    }
+    case TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_TEXTURE:
+    {
+      DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::GetVisualUrl. Using cached external texture index=%d, textureId=%d\n", cacheIndex.GetIndex(), textureId);
+      visualUrl = VisualUrl::CreateTextureUrl(std::to_string(textureId));
+      break;
+    }
+    case TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_BUFFER:
+    {
+      DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::GetVisualUrl. Using cached buffer index=%d, bufferId=%d\n", cacheIndex.GetIndex(), textureId);
+
+      EncodedImageBufferInfo& cachedEncodedImageBufferInfo(mEncodedImageBuffers[cacheIndex.GetIndex()]);
+      const auto&             encodedImageBuffer = cachedEncodedImageBufferInfo.encodedImageBuffer;
+      visualUrl                                  = VisualUrl::CreateBufferUrl(std::to_string(textureId), GetEncodedImageBufferExtensions(encodedImageBuffer.GetImageType()));
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+
+  return visualUrl;
+}
+
+TextureCacheManager::LoadState TextureCacheManager::GetTextureState(const TextureCacheManager::TextureId textureId)
+{
+  LoadState         loadState  = TextureCacheManager::LoadState::NOT_STARTED;
+  TextureCacheIndex cacheIndex = static_cast<TextureCacheIndex>(mTextureIdConverter[static_cast<uint32_t>(textureId)]);
+
+  switch(static_cast<TextureCacheIndexType>(cacheIndex.detailValue.type))
+  {
+    case TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_LOCAL:
+    {
+      TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex.GetIndex()]);
+      loadState = cachedTextureInfo.loadState;
+      break;
+    }
+    case TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_TEXTURE:
+    {
+      loadState = LoadState::UPLOADED;
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+
+  return loadState;
+}
+
+TextureCacheManager::LoadState TextureCacheManager::GetTextureStateInternal(const TextureCacheManager::TextureId textureId)
+{
+  LoadState         loadState  = TextureCacheManager::LoadState::NOT_STARTED;
+  TextureCacheIndex cacheIndex = GetCacheIndexFromId(textureId);
+  if(cacheIndex != INVALID_CACHE_INDEX)
+  {
+    TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex.GetIndex()]);
+    loadState = cachedTextureInfo.loadState;
+  }
+
+  return loadState;
+}
+
+Texture TextureCacheManager::GetTexture(const TextureCacheManager::TextureId textureId, const uint32_t textureIndex)
+{
+  Texture           texture; // empty handle
+  TextureCacheIndex cacheIndex = GetCacheIndexFromId(textureId);
+
+  switch(static_cast<TextureCacheIndexType>(cacheIndex.detailValue.type))
+  {
+    case TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_LOCAL:
+    {
+      TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex.GetIndex()]);
+      if(textureIndex < static_cast<uint32_t>(cachedTextureInfo.textures.size()))
+      {
+        texture = cachedTextureInfo.textures[textureIndex];
+      }
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+
+  return texture;
+}
+
+TextureCacheManager::ExternalTextureInfo& TextureCacheManager::GetExternalTextureInfo(const TextureCacheManager::TextureId textureId)
+{
+  TextureCacheIndex cacheIndex = GetCacheIndexFromExternalTextureId(textureId);
+  DALI_ASSERT_ALWAYS(cacheIndex != INVALID_CACHE_INDEX);
+
+  return mExternalTextures[cacheIndex.GetIndex()];
+}
+
+EncodedImageBuffer TextureCacheManager::GetEncodedImageBuffer(const TextureCacheManager::TextureId bufferId)
+{
+  EncodedImageBuffer encodedImageBuffer; // empty handle
+  TextureCacheIndex  cacheIndex = GetCacheIndexFromEncodedImageBufferId(bufferId);
+  if(cacheIndex != INVALID_CACHE_INDEX)
+  {
+    encodedImageBuffer = mEncodedImageBuffers[cacheIndex.GetIndex()].encodedImageBuffer;
+  }
+  return encodedImageBuffer;
+}
+
+EncodedImageBuffer TextureCacheManager::GetEncodedImageBuffer(const VisualUrl& url)
+{
+  EncodedImageBuffer encodedImageBuffer; // empty handle
+  if(url.IsValid() && VisualUrl::BUFFER == url.GetProtocolType())
+  {
+    std::string location = url.GetLocationWithoutExtension();
+    if(location.size() > 0u)
+    {
+      TextureId bufferId = std::stoi(location);
+      return GetEncodedImageBuffer(bufferId);
+    }
+  }
+  return encodedImageBuffer;
+}
+
+std::string TextureCacheManager::AddExternalTexture(const TextureSet& textureSet, const bool preMultiplied)
+{
+  TextureId textureId = GenerateTextureId(TextureCacheIndex(TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_TEXTURE, mExternalTextures.size()));
+
+  TextureCacheManager::ExternalTextureInfo textureInfo(textureId, textureSet, preMultiplied);
+  mExternalTextures.emplace_back(textureInfo);
+
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::AddExternalTexture() : New texture registered. textureId:%d, preMultiplied:%d\n", textureInfo.textureId, preMultiplied);
+
+  return VisualUrl::CreateTextureUrl(std::to_string(textureInfo.textureId));
+}
+
+std::string TextureCacheManager::AddEncodedImageBuffer(const EncodedImageBuffer& encodedImageBuffer)
+{
+  // Duplication check
+  TextureHash       bufferHash       = static_cast<TextureHash>(encodedImageBuffer.GetHash());
+  TextureCacheIndex bufferCacheIndex = FindCachedEncodedImageBuffer(bufferHash, encodedImageBuffer);
+  if(bufferCacheIndex != INVALID_CACHE_INDEX)
+  {
+    EncodedImageBufferInfo& bufferInfo(mEncodedImageBuffers[bufferCacheIndex.GetIndex()]);
+
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::AddExternalEncodedImageBuffer() : Increase reference. bufferId:%d, cache index:%d, reference:%d\n", bufferInfo.bufferId, bufferCacheIndex.GetIndex(), static_cast<int>(bufferInfo.referenceCount));
+
+    // If same buffer added, increase reference count and return.
+    bufferInfo.referenceCount++;
+    return VisualUrl::CreateBufferUrl(std::to_string(bufferInfo.bufferId), GetEncodedImageBufferExtensions(encodedImageBuffer.GetImageType()));
+  }
+
+  TextureId bufferId = GenerateTextureId(TextureCacheIndex(TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_BUFFER, mEncodedImageBuffers.size()));
+
+  TextureCacheManager::EncodedImageBufferInfo info(bufferId, bufferHash, encodedImageBuffer);
+  mEncodedImageBuffers.emplace_back(info);
+
+  // Insert TextureHashContainer
+  // Find exist list -or- Create new list.
+  std::vector<TextureId>& idList = mTextureHashContainer[bufferHash];
+  // We already assume that list doesn't contain id. just emplace back
+  idList.emplace_back(bufferId);
+
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::AddExternalEncodedImageBuffer() : New buffer regested. bufferId:%d\n", info.bufferId);
+
+  return VisualUrl::CreateBufferUrl(std::to_string(info.bufferId), GetEncodedImageBufferExtensions(encodedImageBuffer.GetImageType()));
+}
+
+TextureSet TextureCacheManager::RemoveExternalTexture(const VisualUrl& url)
+{
+  TextureSet        textureSet;
+  bool              removeTextureInfo  = false;
+  TextureCacheIndex removeTextureIndex = INVALID_CACHE_INDEX;
+  if(url.IsValid())
+  {
+    if(VisualUrl::TEXTURE == url.GetProtocolType())
+    {
+      // get the location from the Url
+      std::string location = url.GetLocation();
+      if(location.size() > 0u)
+      {
+        TextureId textureId = std::stoi(location);
+        removeTextureIndex  = GetCacheIndexFromExternalTextureId(textureId);
+        if(removeTextureIndex != INVALID_CACHE_INDEX)
+        {
+          ExternalTextureInfo& textureInfo(mExternalTextures[removeTextureIndex.GetIndex()]);
+          DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::RemoveExternalTexture(url:%s) textureId:%d reference:%d\n", url.GetUrl().c_str(), textureId, static_cast<int>(textureInfo.referenceCount));
+          textureSet = textureInfo.textureSet;
+          if(--(textureInfo.referenceCount) <= 0)
+          {
+            removeTextureInfo = true;
+            // id life is finished. Remove it at converter
+            mTextureIdConverter.Remove(textureId);
+          }
+        }
+      }
+    }
+  }
+
+  // Post removal process to avoid mExternalTextures reference problems.
+  if(removeTextureInfo)
+  {
+    // Swap last data of mExternalTextures, and pop_back.
+    RemoveTextureInfoByIndex(mExternalTextures, removeTextureIndex);
+  }
+  return textureSet;
+}
+
+EncodedImageBuffer TextureCacheManager::RemoveEncodedImageBuffer(const VisualUrl& url)
+{
+  EncodedImageBuffer encodedImageBuffer;
+  bool               removeBufferInfo  = false;
+  TextureCacheIndex  removeBufferIndex = INVALID_CACHE_INDEX;
+  if(url.IsValid())
+  {
+    if(VisualUrl::BUFFER == url.GetProtocolType())
+    {
+      // get the location from the Url
+      std::string location = url.GetLocationWithoutExtension();
+      if(location.size() > 0u)
+      {
+        TextureId bufferId = std::stoi(location);
+        removeBufferIndex  = GetCacheIndexFromEncodedImageBufferId(bufferId);
+
+        if(removeBufferIndex != INVALID_CACHE_INDEX)
+        {
+          EncodedImageBufferInfo& bufferInfo(mEncodedImageBuffers[removeBufferIndex.GetIndex()]);
+          DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::RemoveEncodedImageBuffer(url:%s) bufferId:%d reference:%d\n", url.GetUrl().c_str(), bufferId, static_cast<int>(bufferInfo.referenceCount));
+
+          encodedImageBuffer = bufferInfo.encodedImageBuffer;
+          if(--(bufferInfo.referenceCount) <= 0)
+          {
+            removeBufferInfo = true;
+            // Step 1. remove current textureId information in mTextureHashContainer.
+            RemoveHashId(bufferInfo.bufferHash, bufferId);
+            // Step 2. id life is finished. Remove it at converter
+            mTextureIdConverter.Remove(bufferId);
+          }
+        }
+      }
+    }
+  }
+
+  // Post removal process to avoid mEncodedImageBuffers reference problems.
+  if(removeBufferInfo)
+  {
+    // Step 3. swap last data of mEncodedImageBuffers, and pop_back.
+    RemoveTextureInfoByIndex(mEncodedImageBuffers, removeBufferIndex);
+  }
+  return encodedImageBuffer;
+}
+
+void TextureCacheManager::UseExternalResource(const VisualUrl& url)
+{
+  if(VisualUrl::TEXTURE == url.GetProtocolType())
+  {
+    std::string location = url.GetLocation();
+    if(location.size() > 0u)
+    {
+      TextureId         id         = std::stoi(location);
+      TextureCacheIndex cacheIndex = GetCacheIndexFromExternalTextureId(id);
+      if(cacheIndex != INVALID_CACHE_INDEX)
+      {
+        ExternalTextureInfo& textureInfo(mExternalTextures[cacheIndex.GetIndex()]);
+        DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::UseExternalResource(url:%s) type:TEXTURE, location:%s, reference:%d\n", url.GetUrl().c_str(), url.GetLocation().c_str(), static_cast<int>(textureInfo.referenceCount));
+
+        textureInfo.referenceCount++;
+        return;
+      }
+    }
+  }
+  else if(VisualUrl::BUFFER == url.GetProtocolType())
+  {
+    std::string location = url.GetLocationWithoutExtension();
+    if(location.size() > 0u)
+    {
+      TextureId         id         = std::stoi(location);
+      TextureCacheIndex cacheIndex = GetCacheIndexFromEncodedImageBufferId(id);
+      if(cacheIndex != INVALID_CACHE_INDEX)
+      {
+        EncodedImageBufferInfo& bufferInfo(mEncodedImageBuffers[cacheIndex.GetIndex()]);
+        DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::UseExternalResource(url:%s) type:BUFFER, location:%s, reference:%d\n", url.GetUrl().c_str(), url.GetLocation().c_str(), static_cast<int>(bufferInfo.referenceCount));
+
+        bufferInfo.referenceCount++;
+        return;
+      }
+    }
+  }
+}
+
+TextureCacheManager::TextureId TextureCacheManager::GenerateTextureId(const TextureCacheIndex& textureCacheIndex)
+{
+  return mTextureIdConverter.Add(static_cast<uint32_t>(textureCacheIndex.indexValue));
+}
+
+TextureCacheManager::TextureCacheIndex TextureCacheManager::GetCacheIndexFromId(const TextureCacheManager::TextureId textureId)
+{
+  if(textureId == INVALID_TEXTURE_ID) return INVALID_CACHE_INDEX;
+
+  TextureCacheIndex cacheIndex = static_cast<TextureCacheIndex>(mTextureIdConverter[static_cast<uint32_t>(textureId)]);
+  if(DALI_UNLIKELY(cacheIndex.detailValue.type != TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_LOCAL))
+  {
+    return INVALID_CACHE_INDEX;
+  }
+
+  DALI_ASSERT_DEBUG(static_cast<std::size_t>(cacheIndex.GetIndex()) < mTextureInfoContainer.size());
+
+  return cacheIndex;
+}
+
+TextureCacheManager::TextureCacheIndex TextureCacheManager::GetCacheIndexFromExternalTextureId(const TextureCacheManager::TextureId textureId)
+{
+  if(textureId == INVALID_TEXTURE_ID) return INVALID_CACHE_INDEX;
+
+  TextureCacheIndex cacheIndex = static_cast<TextureCacheIndex>(mTextureIdConverter[static_cast<uint32_t>(textureId)]);
+  if(DALI_UNLIKELY(cacheIndex.detailValue.type != TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_TEXTURE))
+  {
+    return INVALID_CACHE_INDEX;
+  }
+
+  DALI_ASSERT_DEBUG(static_cast<std::size_t>(cacheIndex.GetIndex()) < mExternalTextures.size());
+
+  return cacheIndex;
+}
+
+TextureCacheManager::TextureCacheIndex TextureCacheManager::GetCacheIndexFromEncodedImageBufferId(const TextureCacheManager::TextureId bufferId)
+{
+  if(bufferId == INVALID_TEXTURE_ID) return INVALID_CACHE_INDEX;
+
+  TextureCacheIndex cacheIndex = static_cast<TextureCacheIndex>(mTextureIdConverter[static_cast<uint32_t>(bufferId)]);
+  if(DALI_UNLIKELY(cacheIndex.detailValue.type != TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_BUFFER))
+  {
+    return INVALID_CACHE_INDEX;
+  }
+
+  DALI_ASSERT_DEBUG(static_cast<std::size_t>(cacheIndex.GetIndex()) < mEncodedImageBuffers.size());
+
+  return cacheIndex;
+}
+
+TextureCacheManager::TextureCacheIndex TextureCacheManager::FindCachedEncodedImageBuffer(const TextureCacheManager::TextureHash hash, const EncodedImageBuffer& encodedImageBuffer)
+{
+  // Iterate through our hashes to find a match.
+  const auto& hashIterator = mTextureHashContainer.find(hash);
+  if(hashIterator != mTextureHashContainer.cend())
+  {
+    for(const auto& id : hashIterator->second)
+    {
+      // We have a match, now we check all the original parameters in case of a hash collision.
+      TextureCacheIndex cacheIndex = GetCacheIndexFromEncodedImageBufferId(id);
+      if(cacheIndex != INVALID_CACHE_INDEX)
+      {
+        EncodedImageBufferInfo& bufferInfo(mEncodedImageBuffers[cacheIndex.GetIndex()]);
+
+        if(bufferInfo.encodedImageBuffer == encodedImageBuffer)
+        {
+          // The found encoded image buffer.
+          return cacheIndex;
+        }
+      }
+    }
+  }
+
+  // Default to an invalid ID, in case we do not find a match.
+  return INVALID_CACHE_INDEX;
+}
+
+TextureCacheManager::TextureHash TextureCacheManager::GenerateHash(
+  const VisualUrl&                     url,
+  const Dali::ImageDimensions&         size,
+  const Dali::FittingMode::Type        fittingMode,
+  const Dali::SamplingMode::Type       samplingMode,
+  const TextureCacheManager::TextureId maskTextureId,
+  const bool                           cropToMask,
+  const uint32_t                       frameIndex)
+{
+  std::vector<std::uint8_t> hashTarget;
+  const uint16_t            width  = size.GetWidth();
+  const uint16_t            height = size.GetWidth();
+
+  // If either the width or height has been specified, include the resizing options in the hash
+  if(width != 0 || height != 0)
+  {
+    // We are appending 5 bytes to the URL to form the hash input.
+    hashTarget.resize(5u);
+    std::uint8_t* hashTargetPtr = &(hashTarget[0u]);
+
+    // Pack the width and height (4 bytes total).
+    *hashTargetPtr++ = size.GetWidth() & 0xff;
+    *hashTargetPtr++ = (size.GetWidth() >> 8u) & 0xff;
+    *hashTargetPtr++ = size.GetHeight() & 0xff;
+    *hashTargetPtr++ = (size.GetHeight() >> 8u) & 0xff;
+
+    // Bit-pack the FittingMode, SamplingMode.
+    // FittingMode=2bits, SamplingMode=3bits
+    *hashTargetPtr = (fittingMode << 3u) | (samplingMode);
+  }
+
+  if(maskTextureId != INVALID_TEXTURE_ID)
+  {
+    auto textureIdIndex = hashTarget.size();
+    hashTarget.resize(hashTarget.size() + sizeof(TextureId) + 1u);
+    std::uint8_t* hashTargetPtr = reinterpret_cast<std::uint8_t*>(&(hashTarget[textureIdIndex]));
+
+    // Append the texture id to the end of the URL byte by byte:
+    // (to avoid SIGBUS / alignment issues)
+    TextureId saltedMaskTextureId = maskTextureId;
+    for(size_t byteIter = 0; byteIter < sizeof(TextureId); ++byteIter)
+    {
+      *hashTargetPtr++ = saltedMaskTextureId & 0xff;
+      saltedMaskTextureId >>= 8u;
+    }
+    *hashTargetPtr++ = (cropToMask ? 'C' : 'M');
+  }
+
+  // Append the frameIndex. We don't do additional job when frameIndex = 0u due to the non-animated image case.
+  if(frameIndex > 0u)
+  {
+    auto textureIdIndex = hashTarget.size();
+    hashTarget.resize(hashTarget.size() + sizeof(uint32_t));
+    std::uint8_t* hashTargetPtr = reinterpret_cast<std::uint8_t*>(&(hashTarget[textureIdIndex]));
+
+    // Append the frame index to the end of the URL byte by byte:
+    // (to avoid SIGBUS / alignment issues)
+    uint32_t saltedFrameIndex = frameIndex;
+    for(size_t byteIter = 0; byteIter < sizeof(uint32_t); ++byteIter)
+    {
+      *hashTargetPtr++ = saltedFrameIndex & 0xff;
+      saltedFrameIndex >>= 8u;
+    }
+  }
+
+  return url.GetUrlHash() ^ Dali::CalculateHash(hashTarget);
+}
+
+TextureCacheManager::TextureCacheIndex TextureCacheManager::FindCachedTexture(
+  const TextureCacheManager::TextureHash    hash,
+  const VisualUrl&                          url,
+  const Dali::ImageDimensions&              size,
+  const Dali::FittingMode::Type             fittingMode,
+  const Dali::SamplingMode::Type            samplingMode,
+  const TextureCacheManager::StorageType    storageType,
+  const TextureCacheManager::TextureId      maskTextureId,
+  const bool                                cropToMask,
+  const TextureCacheManager::MultiplyOnLoad preMultiplyOnLoad,
+  const bool                                isAnimatedImage,
+  const uint32_t                            frameIndex)
+{
+  // Iterate through our hashes to find a match.
+  const auto& hashIterator = mTextureHashContainer.find(hash);
+  if(hashIterator != mTextureHashContainer.cend())
+  {
+    for(const auto& textureId : hashIterator->second)
+    {
+      // We have a match, now we check all the original parameters in case of a hash collision.
+      TextureCacheIndex cacheIndex = GetCacheIndexFromId(textureId);
+      if(cacheIndex != INVALID_CACHE_INDEX)
+      {
+        TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex.GetIndex()]);
+
+        if((url.GetUrl() == textureInfo.url.GetUrl()) &&
+           (maskTextureId == textureInfo.maskTextureId) &&
+           (cropToMask == textureInfo.cropToMask) &&
+           (size == textureInfo.desiredSize) &&
+           (isAnimatedImage == textureInfo.isAnimatedImageFormat) &&
+           (storageType == textureInfo.storageType) &&
+           (frameIndex == textureInfo.frameIndex) &&
+           ((size.GetWidth() == 0 && size.GetHeight() == 0) ||
+            (fittingMode == textureInfo.fittingMode &&
+             samplingMode == textureInfo.samplingMode)))
+        {
+          // 1. If preMultiplyOnLoad is MULTIPLY_ON_LOAD, then textureInfo.preMultiplyOnLoad should be true. The premultiplication result can be different.
+          // 2. If preMultiplyOnLoad is LOAD_WITHOUT_MULTIPLY, then textureInfo.preMultiplied should be false.
+          if((preMultiplyOnLoad == MultiplyOnLoad::MULTIPLY_ON_LOAD && textureInfo.preMultiplyOnLoad) || (preMultiplyOnLoad == MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY && !textureInfo.preMultiplied))
+          {
+            // The found Texture is a match.
+            return cacheIndex;
+          }
+        }
+      }
+    }
+  }
+
+  // Default to an invalid ID, in case we do not find a match.
+  return INVALID_CACHE_INDEX;
+}
+
+TextureCacheManager::TextureCacheIndex TextureCacheManager::AppendCache(const TextureCacheManager::TextureInfo& textureInfo)
+{
+  // If we use EncodedImageBuffer, increase reference during it contains mTextureInfoContainer.
+  // This reference will be decreased when we call RemoveCache
+  if(textureInfo.url.GetProtocolType() == VisualUrl::BUFFER)
+  {
+    UseExternalResource(textureInfo.url);
+  }
+
+  TextureHash hash = textureInfo.hash;
+  TextureId   id   = textureInfo.textureId;
+
+  // Insert TextureHash container first
+  // Find exist list -or- Create new list.
+  std::vector<TextureId>& idList = mTextureHashContainer[hash];
+  // We already assume that list doesn't contain id. just emplace back
+  idList.emplace_back(id);
+
+  // Insert TextureInfo back of mTextureInfoContainer.
+  TextureCacheIndex cacheIndex = TextureCacheIndex(TextureCacheIndexType::TEXTURE_CACHE_INDEX_TYPE_LOCAL, mTextureInfoContainer.size());
+  mTextureInfoContainer.emplace_back(textureInfo);
+
+  // Add converter id --> cacheIndex
+  // NOTE : We should assume that id already generated by GenerateTextureId function.
+  mTextureIdConverter[id] = cacheIndex;
+
+  return cacheIndex;
+}
+
+void TextureCacheManager::RemoveCache(TextureCacheManager::TextureInfo& textureInfo)
+{
+  TextureCacheIndex textureInfoIndex  = GetCacheIndexFromId(textureInfo.textureId);
+  bool              removeTextureInfo = false;
+
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureCacheManager::Remove(textureId:%d) url:%s\n  cacheIdx:%d loadState:%s reference count = %d\n", textureInfo.textureId, textureInfo.url.GetUrl().c_str(), textureInfoIndex.GetIndex(), GET_LOAD_STATE_STRING(textureInfo.loadState), textureInfo.referenceCount);
+
+  // Decrement the reference count and check if this is the last user of this Texture.
+  if(--textureInfo.referenceCount <= 0)
+  {
+    // This is the last remove for this Texture.
+    textureInfo.referenceCount = 0;
+
+    // If loaded, we can remove the TextureInfo
+    if(textureInfo.loadState == LoadState::UPLOADED)
+    {
+      removeTextureInfo = true;
+    }
+    else if(textureInfo.loadState == LoadState::LOADING)
+    {
+      // We mark the textureInfo for removal.
+      // Once the load has completed, this method will be called again.
+      textureInfo.loadState = LoadState::CANCELLED;
+    }
+    else if(textureInfo.loadState == LoadState::MASK_APPLYING)
+    {
+      // We mark the textureInfo for removal.
+      // Once the load has completed, this method will be called again.
+      textureInfo.loadState = LoadState::MASK_CANCELLED;
+    }
+    else
+    {
+      // In other states, we are not waiting for a load so we are safe to remove the TextureInfo data.
+      removeTextureInfo = true;
+    }
+
+    // If the state allows us to remove the TextureInfo data, we do so.
+    if(removeTextureInfo)
+    {
+      // If url location is BUFFER, decrease reference count of EncodedImageBuffer.
+      if(textureInfo.url.IsBufferResource())
+      {
+        RemoveEncodedImageBuffer(textureInfo.url.GetUrl());
+      }
+
+      // Permanently remove the textureInfo struct.
+
+      // Step 1. remove current textureId information in mTextureHashContainer.
+      RemoveHashId(textureInfo.hash, textureInfo.textureId);
+      // Step 2. make textureId is not using anymore. After this job, we can reuse textureId.
+      mTextureIdConverter.Remove(textureInfo.textureId);
+    }
+  }
+
+  // Post removal process to avoid mTextureInfoContainer reference problems.
+  if(removeTextureInfo)
+  {
+    // Step 3. swap last data of TextureInfoContainer, and pop_back.
+    RemoveTextureInfoByIndex(mTextureInfoContainer, textureInfoIndex);
+  }
+}
+
+void TextureCacheManager::RemoveHashId(const TextureCacheManager::TextureHash textureHash, const TextureCacheManager::TextureId textureId)
+{
+  auto hashIterator = mTextureHashContainer.find(textureHash);
+  if(hashIterator != mTextureHashContainer.end())
+  {
+    auto        hashIdList     = hashIterator->second;
+    const auto& hashIdIterator = std::find(hashIdList.cbegin(), hashIdList.cend(), textureId);
+    if(hashIdIterator != hashIdList.cend())
+    {
+      hashIdList.erase(hashIdIterator);
+      if(hashIdList.size() == 0)
+      {
+        // If id list in current hash is empty, remove it self in the container.
+        mTextureHashContainer.erase(hashIterator);
+      }
+    }
+  }
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/texture-manager/texture-cache-manager.h b/dali-toolkit/internal/texture-manager/texture-cache-manager.h
new file mode 100644
index 0000000..03075f4
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-cache-manager.h
@@ -0,0 +1,396 @@
+#ifndef DALI_TOOLKIT_TEXTURE_CACHE_MANAGER_H
+#define DALI_TOOLKIT_TEXTURE_CACHE_MANAGER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/free-list.h>
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
+#include <unordered_map>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/texture-manager/texture-manager-type.h>
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+/**
+ * @brief The contain and managing cached textures.
+ * Each Texture hold there TextureId. These TextureId can be used outside of TextureManager.
+ * Internally, each cached texture can be accessed by TextureCacheIndex.
+ * You can Convert TextureId into TextureCacheIndex by this class.
+ *
+ * Also, You can store external TextureSet or EncodedImageBuffer here.
+ *
+ * There are 3 type of CachedContainer in this manager
+ *  - mTextureInfoContainer : Cache all kind of textures that need some load/upload jobs.
+ *                            All kind of images that visual using (not vector image) will be stored here.
+ *                            This container will use TEXTURE_CACHE_INDEX_TYPE_LOCAL
+ *
+ *  - mExternalTextures : External appended TextureSet cache container.
+ *                        External TextureSet can be Something like NativeImageSource, FrameBuffer and PixelData.
+ *                        This container will use TEXTURE_CACHE_INDEX_TYPE_TEXTURE
+ *                        The textureId will be used for VisualUrl. ex) dali://1
+ *
+ *  - mEncodedImageBuffers : External appended EncodedImageBuffer cache container.
+ *                           This container will use TEXTURE_CACHE_INDEX_TYPE_BUFFER
+ *                           The bufferId will be used for VisualUrl. ex) enbuf://1
+ *                           Note that this bufferId is not equal with textureId in mTextureInfoContainer.
+ */
+class TextureCacheManager
+{
+public:
+  // Copy enum and types and const values that TextureCacheManager will use.
+  using TextureCacheIndexType = TextureManagerType::TextureCacheIndexType;
+  using TextureCacheIndexData = TextureManagerType::TextureCacheIndexData;
+
+  using TextureId         = TextureManagerType::TextureId;
+  using TextureCacheIndex = TextureManagerType::TextureCacheIndex;
+  using TextureHash       = TextureManagerType::TextureHash;
+
+  static constexpr TextureId         INVALID_TEXTURE_ID  = TextureManagerType::INVALID_TEXTURE_ID;
+  static constexpr TextureCacheIndex INVALID_CACHE_INDEX = TextureManagerType::INVALID_CACHE_INDEX;
+
+  using StorageType         = TextureManagerType::StorageType;
+  using LoadState           = TextureManagerType::LoadState;
+  using ReloadPolicy        = TextureManagerType::ReloadPolicy;
+  using MultiplyOnLoad      = TextureManagerType::MultiplyOnLoad;
+  using TextureInfo         = TextureManagerType::TextureInfo;
+  using ExternalTextureInfo = TextureManagerType::ExternalTextureInfo;
+
+public:
+  /**
+   * Constructor.
+   */
+  TextureCacheManager();
+
+  /**
+   * Destructor.
+   */
+  ~TextureCacheManager();
+
+public:
+  // TextureCacheManager Main API:
+
+  /**
+   * @brief Get the visualUrl associated with the texture id.
+   * @param[in] textureId The texture Id to get
+   * @return The visual Url associated with the texture id.
+   */
+  VisualUrl GetVisualUrl(const TextureCacheManager::TextureId textureId);
+
+  /**
+   * @brief Get the current state of a texture
+   * @note This API doesn't consider encodedimagebuffer.
+   * @param[in] textureId The texture id to query.defaul value is 0.
+   * @return The loading state if the texture is valid, or NOT_STARTED if the textureId
+   * is not valid.
+   */
+  TextureCacheManager::LoadState GetTextureState(const TextureCacheManager::TextureId textureId);
+
+  /**
+   * @brief Get the current state of a texture
+   * @note This API doesn't consider external & encodedimagebuffer.
+   * @param[in] textureId The texture id to query
+   * @return The loading state if the texture is valid, or NOT_STARTED if the textureId
+   * is not valid.
+   */
+  TextureCacheManager::LoadState GetTextureStateInternal(const TextureCacheManager::TextureId textureId);
+
+  /**
+   * @brief Get the associated texture set if the texture id is valid
+   * @param[in] textureId The texture Id to look up
+   * @param[in] textureIndex The texture index to query
+   * @return the associated texture, or an empty handle if textureId is not valid
+   */
+  Texture GetTexture(const TextureCacheManager::TextureId textureId, const uint32_t textureIndex = 0);
+
+  /**
+   * @brief Get the external texture set information if the texture id is valid
+   * @param[in] textureId The texture Id to look up
+   * @return the external texture information. Assert if textureId is not valid
+   */
+  TextureCacheManager::ExternalTextureInfo& GetExternalTextureInfo(const TextureCacheManager::TextureId textureId);
+
+  /**
+   * @brief Get the encoded image buffer
+   * @param[in] bufferId The bufferId to look up
+   * @return the encoded image buffer, or an empty handle if bufferId is not valid
+   */
+  EncodedImageBuffer GetEncodedImageBuffer(const TextureCacheManager::TextureId bufferId);
+
+  /**
+   * @brief Get the encoded image buffer by VisualUrl
+   * @param[in] url The url to look up
+   * @return the encoded image buffer, or an empty handle if url is not buffer resource or buffer is not valid
+   */
+  EncodedImageBuffer GetEncodedImageBuffer(const VisualUrl& url);
+
+  /**
+   * Adds an external texture to the texture manager
+   * @param[in] texture The texture to add
+   * @param[in] preMultiplied Whether this external texture preMultiplied or not. Default as false.
+   * @return string containing the URL for the texture
+   */
+  std::string AddExternalTexture(const TextureSet& texture, const bool preMultiplied);
+
+  /**
+   * Adds an encoded image buffer to the texture manager
+   * @param[in] encodedImageBuffer The image buffer to add
+   * @return string containing the URL for the texture
+   */
+  std::string AddEncodedImageBuffer(const EncodedImageBuffer& encodedImageBuffer);
+
+  /**
+   * Removes an external texture from texture manager
+   * @param[in] url The string containing the texture to remove
+   * @return handle to the texture
+   */
+  TextureSet RemoveExternalTexture(const VisualUrl& url);
+
+  /**
+   * Removes an external encoded image buffer from texture manager
+   * @param[in] url The string containing the encoded image buffer to remove
+   * @return handle to the encoded image buffer
+   */
+  EncodedImageBuffer RemoveEncodedImageBuffer(const VisualUrl& url);
+
+  /**
+   * @brief Notify that external textures or encoded image buffers are used.
+   * @param[in] url The URL of the texture to use.
+   */
+  void UseExternalResource(const VisualUrl& url);
+
+public:
+  // To Generate / Get / Remove TextureId.
+
+  /**
+   * @brief Generates a new valid TextureId.
+   * @param[in] textureCacheIndex the index of the cache container. If we don't setup this value, default is INVALID_CACHE_INDEX
+   * @return A TextureId
+   */
+  TextureCacheManager::TextureId GenerateTextureId(const TextureCacheIndex& textureCacheIndex = INVALID_CACHE_INDEX);
+
+  /**
+   * @brief Used to lookup an index into the TextureInfoContainer from a TextureId
+   * @param[in] textureId The TextureId to look up
+   * @return              The cache index
+   */
+  TextureCacheManager::TextureCacheIndex GetCacheIndexFromId(const TextureCacheManager::TextureId textureId);
+
+  /**
+   * @brief Generates a hash for caching based on the input parameters.
+   * Only applies size, fitting mode andsampling mode if the size is specified.
+   * Only applies maskTextureId if it isn't INVALID_TEXTURE_ID
+   * Only applied frameIndex if it is not 0.
+   * @param[in] url              The URL of the image to load
+   * @param[in] size             The image size
+   * @param[in] fittingMode      The FittingMode to use
+   * @param[in] samplingMode     The SamplingMode to use
+   * @param[in] maskTextureId    The masking texture id (or INVALID_TEXTURE_ID)
+   * @param[in] cropToMask       True if crop to mask
+   * @param[in] frameIndex       The frame index to use
+   * @return                     A hash of the provided data for caching.
+   */
+  TextureCacheManager::TextureHash GenerateHash(
+    const VisualUrl&                     url,
+    const Dali::ImageDimensions&         size,
+    const Dali::FittingMode::Type        fittingMode,
+    const Dali::SamplingMode::Type       samplingMode,
+    const TextureCacheManager::TextureId maskTextureId,
+    const bool                           cropToMask,
+    const uint32_t                       frameIndex);
+
+  /**
+   * @brief Looks up a cached texture by its hash.
+   * If found, the given parameters are used to check there is no hash-collision.
+   * @param[in] hash              The hash to look up
+   * @param[in] url               The URL of the image to load
+   * @param[in] size              The image size
+   * @param[in] fittingMode       The FittingMode to use
+   * @param[in] samplingMode      The SamplingMode to use
+   * @param[in] storageType       Whether the pixel data is stored in the cache or uploaded to the GPU
+   * @param[in] maskTextureId     Optional texture ID to use to mask this image
+   * @param[in] cropToMask        True if crop to mask
+   * @param[in] preMultiplyOnLoad if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha.
+   * @param[in] isAnimatedImage   True if the texture is from animated image.
+   * @param[in] frameIndex        The frame index to use
+   * @return                      A TextureCacheIndex of a cached Texture if found. Or INVALID_CACHE_INDEX if not found.
+   */
+  TextureCacheManager::TextureCacheIndex FindCachedTexture(
+    const TextureCacheManager::TextureHash    hash,
+    const VisualUrl&                          url,
+    const Dali::ImageDimensions&              size,
+    const Dali::FittingMode::Type             fittingMode,
+    const Dali::SamplingMode::Type            samplingMode,
+    const TextureCacheManager::StorageType    storageType,
+    const TextureCacheManager::TextureId      maskTextureId,
+    const bool                                cropToMask,
+    const TextureCacheManager::MultiplyOnLoad preMultiplyOnLoad,
+    const bool                                isAnimatedImage,
+    const uint32_t                            frameIndex);
+
+  /**
+   * @brief Append a Texture to the TextureCacheManager.
+   * @note This API doesn't check duplication of TextureId.
+   * @note This API doesn't consider external & encodedimagebuffer.
+   *
+   * @param[in] textureInfo TextureInfo that want to cache in container.
+   * @return Index of newly appended texture info.
+   */
+  TextureCacheManager::TextureCacheIndex AppendCache(const TextureCacheManager::TextureInfo& textureInfo);
+
+  /**
+   * @brief Remove a Texture from the TextureCacheManager.
+   * @note This API doesn't consider external & encodedimagebuffer.
+   *
+   * Textures are cached and therefore only the removal of the last
+   * occurrence of a Texture will cause its removal internally.
+   *
+   * @param[in] textureInfo TextureInfo that want to cache in container.
+   */
+  void RemoveCache(TextureCacheManager::TextureInfo& textureInfo);
+
+public:
+  /**
+   * @brief Get TextureInfo as TextureCacheIndex.
+   * @note This API doesn't consider external & encodedimagebuffer.
+   * @param[in] textureCacheIndex Index of cahced texture.
+   * @return TextureInfo as textureCacheIndex
+   */
+  inline TextureCacheManager::TextureInfo& operator[](const TextureCacheManager::TextureCacheIndex& textureCacheIndex) noexcept
+  {
+    return mTextureInfoContainer[textureCacheIndex.GetIndex()];
+  }
+
+  /**
+   * @brief The number of associated cached image
+   * @note This API doesn't consider external & encodedimagebuffer.
+   * @return The number of associated cached image
+   */
+  inline size_t size() noexcept
+  {
+    return mTextureInfoContainer.size();
+  }
+
+private:
+  // Private defined structs.
+
+  /**
+   * @brief This struct is used to manage the life-cycle of EncodedImageBuffer url.
+   */
+  struct EncodedImageBufferInfo
+  {
+    EncodedImageBufferInfo(const TextureCacheManager::TextureId   bufferId,
+                           const TextureCacheManager::TextureHash bufferHash,
+                           const EncodedImageBuffer&              encodedImageBuffer)
+    : bufferId(bufferId),
+      bufferHash(bufferHash),
+      encodedImageBuffer(encodedImageBuffer),
+      referenceCount(1)
+    {
+    }
+    TextureCacheManager::TextureId   bufferId;
+    TextureCacheManager::TextureHash bufferHash;
+    EncodedImageBuffer               encodedImageBuffer;
+    int32_t                          referenceCount;
+  };
+
+  typedef Dali::FreeList TextureIdConverterType; ///< The converter type from TextureId to index of TextureInfoContainer.
+
+  typedef std::unordered_map<TextureCacheManager::TextureHash, std::vector<TextureCacheManager::TextureId>> TextureHashContainerType;            ///< The container type used to fast-find the TextureId by TextureHash.
+  typedef std::vector<TextureCacheManager::TextureInfo>                                                     TextureInfoContainerType;            ///< The container type used to manage the life-cycle and caching of Textures
+  typedef std::vector<TextureCacheManager::ExternalTextureInfo>                                             ExternalTextureInfoContainerType;    ///< The container type used to manage the life-cycle and caching of ExternalTexture url
+  typedef std::vector<TextureCacheManager::EncodedImageBufferInfo>                                          EncodedImageBufferInfoContainerType; ///< The container type used to manage the life-cycle and caching of EncodedImageBuffer url
+
+private:
+  // Private API: only used internally
+
+  /**
+   * @brief Used to lookup an index into the ExternalTextureInfoContainer from a textureId
+   * @param[in] textureId The TextureId to look up
+   * @return              The cache index
+   */
+  TextureCacheManager::TextureCacheIndex GetCacheIndexFromExternalTextureId(const TextureCacheManager::TextureId textureId);
+
+  /**
+   * @brief Used to lookup an index into the EncodedImageBufferInfoContainer from a bufferId
+   * @param[in] bufferId The bufferId to look up
+   * @return             The cache index
+   */
+  TextureCacheManager::TextureCacheIndex GetCacheIndexFromEncodedImageBufferId(const TextureCacheManager::TextureId bufferId);
+
+  /**
+   * @brief Looks up a cached encoded image buffer cached by its hash.
+   * If found, the given parameters are used to check there is no hash-collision.
+   * @param[in] hash               The hash to look up
+   * @param[in] encodedImageBuffer The image buffer to load
+   * @return                       A TextureCacheIndex of a cached Texture if found. Or INVALID_CACHE_INDEX if not found.
+   */
+  TextureCacheManager::TextureCacheIndex FindCachedEncodedImageBuffer(const TextureCacheManager::TextureHash hash, const EncodedImageBuffer& encodedImageBuffer);
+
+  /**
+   * @brief Remove id in HashContainer.
+   * @param[in] hash The hash of the texture/buffer to be delete
+   * @param[in] id   The texture/buffer id to be deleted.
+   */
+  void RemoveHashId(const TextureCacheManager::TextureHash hash, const TextureCacheManager::TextureId id);
+
+  /**
+   * @brief Remove data from container by the TextureCacheIndex.
+   * It also valiate the TextureIdConverter internally.
+   * We will assume that only valid TextureCacheIndex will come.
+   *
+   * @tparam ContainerType The type of container. It will automatically defined
+   * @param[in] cacheContainer The container that will remove texture info.
+   * @param[in] removeContainerIndex The index of texture info that will remove.
+   */
+  template<class ContainerType>
+  void RemoveTextureInfoByIndex(ContainerType& cacheContainer, const TextureCacheManager::TextureCacheIndex& removeContainerIndex);
+
+private:
+  /**
+   * Deleted copy constructor.
+   */
+  TextureCacheManager(const TextureCacheManager&) = delete;
+
+  /**
+   * Deleted assignment operator.
+   */
+  TextureCacheManager& operator=(const TextureCacheManager& rhs) = delete;
+
+private:                                            // Member Variables:
+  TextureIdConverterType   mTextureIdConverter{};   ///< Convert TextureId into various container's index.
+  TextureHashContainerType mTextureHashContainer{}; ///< Used to manage the life-cycle and caching of Textures + EncodedImageBuffer by TextureHash
+
+  TextureInfoContainerType            mTextureInfoContainer{}; ///< Used to manage the life-cycle and caching of Textures
+  ExternalTextureInfoContainerType    mExternalTextures{};     ///< Externally provided textures
+  EncodedImageBufferInfoContainerType mEncodedImageBuffers{};  ///< Externally encoded image buffer
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXTURE_CACHE_MANAGER_H
diff --git a/dali-toolkit/internal/texture-manager/texture-manager-impl.cpp b/dali-toolkit/internal/texture-manager/texture-manager-impl.cpp
new file mode 100644
index 0000000..ef2e759
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-manager-impl.cpp
@@ -0,0 +1,1546 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
+
+// EXTERNAL HEADERS
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
+#include <dali/public-api/rendering/geometry.h>
+
+// INTERNAL HEADERS
+#include <dali-toolkit/internal/texture-manager/texture-async-loading-helper.h>
+#include <dali-toolkit/internal/texture-manager/texture-cache-manager.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/rendering-addon.h>
+
+namespace
+{
+constexpr auto INITIAL_HASH_NUMBER = size_t{0u};
+
+constexpr auto TEXTURE_INDEX      = 0u; ///< The Index for texture
+constexpr auto MASK_TEXTURE_INDEX = 1u; ///< The Index for mask texture
+
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
+} // namespace
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+#ifdef DEBUG_ENABLED
+// Define logfilter Internal namespace level so other files (e.g. texture-cache-manager.cpp) can also use this filter.
+Debug::Filter* gTextureManagerLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_TEXTURE_MANAGER");
+
+// clang-format off
+#define GET_LOAD_STATE_STRING(loadState) \
+  loadState == TextureManagerType::LoadState::NOT_STARTED      ? "NOT_STARTED"      : \
+  loadState == TextureManagerType::LoadState::LOADING          ? "LOADING"          : \
+  loadState == TextureManagerType::LoadState::LOAD_FINISHED    ? "LOAD_FINISHED"    : \
+  loadState == TextureManagerType::LoadState::WAITING_FOR_MASK ? "WAITING_FOR_MASK" : \
+  loadState == TextureManagerType::LoadState::MASK_APPLYING    ? "MASK_APPLYING"    : \
+  loadState == TextureManagerType::LoadState::MASK_APPLIED     ? "MASK_APPLIED"     : \
+  loadState == TextureManagerType::LoadState::UPLOADED         ? "UPLOADED"         : \
+  loadState == TextureManagerType::LoadState::CANCELLED        ? "CANCELLED"        : \
+  loadState == TextureManagerType::LoadState::MASK_CANCELLED   ? "MASK_CANCELLED"   : \
+  loadState == TextureManagerType::LoadState::LOAD_FAILED      ? "LOAD_FAILED"      : \
+                                                                 "Unknown"
+// clang-format on
+#endif
+
+namespace
+{
+const Vector4 FULL_ATLAS_RECT(0.0f, 0.0f, 1.0f, 1.0f); ///< UV Rectangle that covers the full Texture
+
+void PreMultiply(Devel::PixelBuffer pixelBuffer, TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
+{
+  if(Pixel::HasAlpha(pixelBuffer.GetPixelFormat()))
+  {
+    if(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD)
+    {
+      pixelBuffer.MultiplyColorByAlpha();
+    }
+  }
+  else
+  {
+    preMultiplyOnLoad = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  }
+}
+
+} // Anonymous namespace
+
+TextureManager::MaskingData::MaskingData()
+: mAlphaMaskUrl(),
+  mAlphaMaskId(INVALID_TEXTURE_ID),
+  mContentScaleFactor(1.0f),
+  mCropToMask(true),
+  mPreappliedMasking(true),
+  mMaskImageLoadingFailed(false)
+{
+}
+
+TextureManager::TextureManager(bool loadYuvPlanes)
+: mTextureCacheManager(),
+  mAsyncLoader(std::unique_ptr<TextureAsyncLoadingHelper>(new TextureAsyncLoadingHelper(*this))),
+  mLifecycleObservers(),
+  mLoadQueue(),
+  mLoadingQueueTextureId(INVALID_TEXTURE_ID),
+  mRemoveQueue(),
+  mLoadYuvPlanes(loadYuvPlanes),
+  mRemoveProcessorRegistered(false)
+{
+  // Initialize the AddOn
+  RenderingAddOn::Get();
+}
+
+TextureManager::~TextureManager()
+{
+  if(mRemoveProcessorRegistered && Adaptor::IsAvailable())
+  {
+    Adaptor::Get().UnregisterProcessor(*this, true);
+    mRemoveProcessorRegistered = false;
+  }
+
+  for(auto iter = mLifecycleObservers.Begin(), endIter = mLifecycleObservers.End(); iter != endIter; ++iter)
+  {
+    (*iter)->TextureManagerDestroyed();
+  }
+}
+
+TextureSet TextureManager::LoadAnimatedImageTexture(
+  const VisualUrl&                url,
+  Dali::AnimatedImageLoading      animatedImageLoading,
+  const uint32_t                  frameIndex,
+  TextureManager::TextureId&      textureId,
+  MaskingDataPointer&             maskInfo,
+  const Dali::ImageDimensions&    desiredSize,
+  const Dali::FittingMode::Type   fittingMode,
+  const Dali::SamplingMode::Type  samplingMode,
+  const bool                      synchronousLoading,
+  TextureUploadObserver*          textureObserver,
+  TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
+{
+  TextureSet textureSet;
+
+  if(synchronousLoading)
+  {
+    Devel::PixelBuffer pixelBuffer;
+    if(animatedImageLoading)
+    {
+      pixelBuffer = animatedImageLoading.LoadFrame(frameIndex, desiredSize, fittingMode, samplingMode);
+    }
+    if(!pixelBuffer)
+    {
+      DALI_LOG_ERROR("TextureManager::LoadAnimatedImageTexture: Synchronous loading is failed\n");
+    }
+    else
+    {
+      Texture maskTexture;
+      if(maskInfo && maskInfo->mAlphaMaskUrl.IsValid())
+      {
+        Devel::PixelBuffer maskPixelBuffer = LoadImageFromFile(maskInfo->mAlphaMaskUrl.GetUrl(), desiredSize, fittingMode, samplingMode, true);
+        if(maskPixelBuffer)
+        {
+          if(!maskInfo->mPreappliedMasking)
+          {
+            PixelData maskPixelData = Devel::PixelBuffer::Convert(maskPixelBuffer); // takes ownership of buffer
+            maskTexture             = Texture::New(Dali::TextureType::TEXTURE_2D, maskPixelData.GetPixelFormat(), maskPixelData.GetWidth(), maskPixelData.GetHeight());
+            maskTexture.Upload(maskPixelData);
+          }
+          else
+          {
+            pixelBuffer.ApplyMask(maskPixelBuffer, maskInfo->mContentScaleFactor, maskInfo->mCropToMask);
+          }
+        }
+        else
+        {
+          DALI_LOG_ERROR("TextureManager::LoadAnimatedImageTexture: Synchronous mask image loading is failed\n");
+        }
+      }
+
+      if(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD)
+      {
+        PreMultiply(pixelBuffer, preMultiplyOnLoad);
+      }
+
+      PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer
+      if(!textureSet)
+      {
+        Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+        texture.Upload(pixelData);
+        textureSet = TextureSet::New();
+        textureSet.SetTexture(TEXTURE_INDEX, texture);
+        if(maskTexture)
+        {
+          textureSet.SetTexture(MASK_TEXTURE_INDEX, maskTexture);
+        }
+      }
+    }
+  }
+  else
+  {
+    TextureId alphaMaskId        = INVALID_TEXTURE_ID;
+    float     contentScaleFactor = 1.0f;
+    bool      cropToMask         = false;
+    if(maskInfo && maskInfo->mAlphaMaskUrl.IsValid())
+    {
+      maskInfo->mAlphaMaskId = RequestMaskLoad(maskInfo->mAlphaMaskUrl, maskInfo->mPreappliedMasking ? TextureManager::StorageType::KEEP_PIXEL_BUFFER : TextureManager::StorageType::KEEP_TEXTURE);
+      alphaMaskId            = maskInfo->mAlphaMaskId;
+      if(maskInfo->mPreappliedMasking)
+      {
+        contentScaleFactor = maskInfo->mContentScaleFactor;
+        cropToMask         = maskInfo->mCropToMask;
+      }
+    }
+
+    textureId = RequestLoadInternal(url, alphaMaskId, textureId, contentScaleFactor, desiredSize, fittingMode, samplingMode, cropToMask, TextureManager::StorageType::UPLOAD_TO_TEXTURE, textureObserver, true, TextureManager::ReloadPolicy::CACHED, preMultiplyOnLoad, animatedImageLoading, frameIndex, false);
+
+    TextureManager::LoadState loadState = mTextureCacheManager.GetTextureStateInternal(textureId);
+    if(loadState == TextureManager::LoadState::UPLOADED)
+    {
+      // LoadComplete has already been called - keep the same texture set
+      textureSet = GetTextureSet(textureId);
+    }
+  }
+
+  return textureSet;
+}
+
+Devel::PixelBuffer TextureManager::LoadPixelBuffer(
+  const VisualUrl&                url,
+  const Dali::ImageDimensions&    desiredSize,
+  const Dali::FittingMode::Type   fittingMode,
+  const Dali::SamplingMode::Type  samplingMode,
+  const bool                      synchronousLoading,
+  TextureUploadObserver*          textureObserver,
+  const bool                      orientationCorrection,
+  TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
+{
+  Devel::PixelBuffer pixelBuffer;
+  if(synchronousLoading)
+  {
+    if(url.IsValid())
+    {
+      if(url.IsBufferResource())
+      {
+        const EncodedImageBuffer& encodedImageBuffer = mTextureCacheManager.GetEncodedImageBuffer(url);
+        if(encodedImageBuffer)
+        {
+          pixelBuffer = LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), desiredSize, fittingMode, samplingMode, orientationCorrection);
+        }
+      }
+      else
+      {
+        pixelBuffer = LoadImageFromFile(url.GetUrl(), desiredSize, fittingMode, samplingMode, orientationCorrection);
+      }
+      if(pixelBuffer && preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD)
+      {
+        PreMultiply(pixelBuffer, preMultiplyOnLoad);
+      }
+    }
+  }
+  else
+  {
+    RequestLoadInternal(url, INVALID_TEXTURE_ID, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, false, TextureManager::StorageType::RETURN_PIXEL_BUFFER, textureObserver, orientationCorrection, TextureManager::ReloadPolicy::FORCED, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u, false);
+  }
+
+  return pixelBuffer;
+}
+
+TextureSet TextureManager::LoadTexture(
+  const VisualUrl&                   url,
+  const Dali::ImageDimensions&       desiredSize,
+  const Dali::FittingMode::Type      fittingMode,
+  const Dali::SamplingMode::Type     samplingMode,
+  MaskingDataPointer&                maskInfo,
+  const bool                         synchronousLoading,
+  TextureManager::TextureId&         textureId,
+  Vector4&                           textureRect,
+  Dali::ImageDimensions&             textureRectSize,
+  bool&                              atlasingStatus,
+  bool&                              loadingStatus,
+  TextureUploadObserver*             textureObserver,
+  AtlasUploadObserver*               atlasObserver,
+  ImageAtlasManagerPtr               imageAtlasManager,
+  const bool                         orientationCorrection,
+  const TextureManager::ReloadPolicy reloadPolicy,
+  TextureManager::MultiplyOnLoad&    preMultiplyOnLoad)
+{
+  TextureSet textureSet;
+
+  loadingStatus = false;
+  textureRect   = FULL_ATLAS_RECT;
+
+  if(VisualUrl::TEXTURE == url.GetProtocolType())
+  {
+    std::string location = url.GetLocation();
+    if(location.size() > 0u)
+    {
+      TextureId id                  = std::stoi(location);
+      auto      externalTextureInfo = mTextureCacheManager.GetExternalTextureInfo(id);
+      if(externalTextureInfo.textureSet)
+      {
+        if(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD)
+        {
+          // Change preMultiplyOnLoad value so make caller determine to preMultiplyAlpha or not.
+          // TODO : Should we seperate input and output value?
+          preMultiplyOnLoad = externalTextureInfo.preMultiplied ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+        }
+
+        TextureId alphaMaskId = INVALID_TEXTURE_ID;
+        if(maskInfo && maskInfo->mAlphaMaskUrl.IsValid())
+        {
+          maskInfo->mAlphaMaskId = RequestMaskLoad(maskInfo->mAlphaMaskUrl, TextureManager::StorageType::KEEP_TEXTURE, synchronousLoading);
+          alphaMaskId            = maskInfo->mAlphaMaskId;
+
+          // Create new textureId. this textureId is not same as location
+          textureId = RequestLoad(url, alphaMaskId, textureId, 1.0f, desiredSize, fittingMode, samplingMode, false, textureObserver, orientationCorrection, reloadPolicy, preMultiplyOnLoad, synchronousLoading);
+
+          TextureManager::LoadState loadState = mTextureCacheManager.GetTextureStateInternal(textureId);
+          if(loadState == TextureManager::LoadState::UPLOADED)
+          {
+            textureSet = GetTextureSet(textureId);
+          }
+        }
+        else
+        {
+          // TextureId is same as location
+          textureId = id;
+
+          textureSet = TextureSet::New();
+          textureSet.SetTexture(TEXTURE_INDEX, externalTextureInfo.textureSet.GetTexture(TEXTURE_INDEX));
+        }
+      }
+    }
+  }
+  else
+  {
+    // For Atlas
+    if(synchronousLoading && atlasingStatus)
+    {
+      const bool synchronousAtlasAvaliable = (desiredSize != ImageDimensions() || url.IsLocalResource()) ? imageAtlasManager->CheckAtlasAvailable(url, desiredSize)
+                                                                                                         : false;
+      if(synchronousAtlasAvaliable)
+      {
+        std::vector<Devel::PixelBuffer> pixelBuffers;
+        LoadImageSynchronously(url, desiredSize, fittingMode, samplingMode, orientationCorrection, false, pixelBuffers);
+
+        if(!pixelBuffers.empty() && maskInfo && maskInfo->mAlphaMaskUrl.IsValid())
+        {
+          std::vector<Devel::PixelBuffer> maskPixelBuffers;
+          LoadImageSynchronously(maskInfo->mAlphaMaskUrl, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, true, false, maskPixelBuffers);
+          if(!maskPixelBuffers.empty())
+          {
+            pixelBuffers[0].ApplyMask(maskPixelBuffers[0], maskInfo->mContentScaleFactor, maskInfo->mCropToMask);
+          }
+        }
+
+        PixelData data;
+        if(!pixelBuffers.empty())
+        {
+          PreMultiply(pixelBuffers[0], preMultiplyOnLoad);
+          data = Devel::PixelBuffer::Convert(pixelBuffers[0]); // takes ownership of buffer
+
+          if(data)
+          {
+            textureSet = imageAtlasManager->Add(textureRect, data);
+            if(textureSet)
+            {
+              textureRectSize.SetWidth(data.GetWidth());
+              textureRectSize.SetHeight(data.GetHeight());
+            }
+          }
+          else
+          {
+            DALI_LOG_ERROR("TextureManager::LoadTexture: Synchronous Texture loading with atlasing is failed.\n");
+          }
+        }
+        if(!textureSet)
+        {
+          atlasingStatus = false;
+        }
+      }
+    }
+
+    if(!textureSet)
+    {
+      loadingStatus = true;
+      // Atlas manager can chage desired size when it is set by 0,0.
+      // We should store into textureRectSize only if atlasing successed.
+      // So copy inputed desiredSize, and replace value into textureRectSize only if atlasing success.
+      Dali::ImageDimensions atlasDesiredSize = desiredSize;
+      if(atlasingStatus)
+      {
+        if(url.IsBufferResource())
+        {
+          const EncodedImageBuffer& encodedImageBuffer = GetEncodedImageBuffer(url.GetUrl());
+          if(encodedImageBuffer)
+          {
+            textureSet = imageAtlasManager->Add(textureRect, encodedImageBuffer, desiredSize, fittingMode, true, atlasObserver);
+          }
+        }
+        else
+        {
+          textureSet = imageAtlasManager->Add(textureRect, url, atlasDesiredSize, fittingMode, true, atlasObserver);
+        }
+      }
+      if(!textureSet) // big image, no atlasing or atlasing failed
+      {
+        atlasingStatus = false;
+
+        TextureId alphaMaskId        = INVALID_TEXTURE_ID;
+        float     contentScaleFactor = 1.0f;
+        bool      cropToMask         = false;
+        if(maskInfo && maskInfo->mAlphaMaskUrl.IsValid())
+        {
+          maskInfo->mAlphaMaskId = RequestMaskLoad(maskInfo->mAlphaMaskUrl, maskInfo->mPreappliedMasking ? TextureManager::StorageType::KEEP_PIXEL_BUFFER : TextureManager::StorageType::KEEP_TEXTURE, synchronousLoading);
+          alphaMaskId            = maskInfo->mAlphaMaskId;
+          if(maskInfo && maskInfo->mPreappliedMasking)
+          {
+            contentScaleFactor = maskInfo->mContentScaleFactor;
+            cropToMask         = maskInfo->mCropToMask;
+          }
+        }
+
+        textureId = RequestLoad(
+          url,
+          alphaMaskId,
+          textureId,
+          contentScaleFactor,
+          desiredSize,
+          fittingMode,
+          samplingMode,
+          cropToMask,
+          textureObserver,
+          orientationCorrection,
+          reloadPolicy,
+          preMultiplyOnLoad,
+          synchronousLoading);
+
+        TextureManager::LoadState loadState = mTextureCacheManager.GetTextureStateInternal(textureId);
+        if(loadState == TextureManager::LoadState::UPLOADED)
+        {
+          // LoadComplete has already been called - keep the same texture set
+          textureSet = GetTextureSet(textureId);
+        }
+
+        // If we are loading the texture, or waiting for the ready signal handler to complete, inform
+        // caller that they need to wait.
+        loadingStatus = (loadState == TextureManager::LoadState::LOADING ||
+                         loadState == TextureManager::LoadState::WAITING_FOR_MASK ||
+                         loadState == TextureManager::LoadState::MASK_APPLYING ||
+                         loadState == TextureManager::LoadState::MASK_APPLIED ||
+                         loadState == TextureManager::LoadState::NOT_STARTED ||
+                         mLoadingQueueTextureId != INVALID_TEXTURE_ID);
+      }
+      else
+      {
+        textureRectSize = atlasDesiredSize;
+      }
+    }
+  }
+
+  if(synchronousLoading)
+  {
+    loadingStatus = false;
+  }
+
+  return textureSet;
+}
+
+TextureManager::TextureId TextureManager::RequestLoad(
+  const VisualUrl&                   url,
+  const ImageDimensions&             desiredSize,
+  const Dali::FittingMode::Type      fittingMode,
+  const Dali::SamplingMode::Type     samplingMode,
+  TextureUploadObserver*             observer,
+  const bool                         orientationCorrection,
+  const TextureManager::ReloadPolicy reloadPolicy,
+  TextureManager::MultiplyOnLoad&    preMultiplyOnLoad,
+  const bool                         synchronousLoading)
+{
+  return RequestLoadInternal(url, INVALID_TEXTURE_ID, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, false, TextureManager::StorageType::UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u, synchronousLoading);
+}
+
+TextureManager::TextureId TextureManager::RequestLoad(
+  const VisualUrl&                   url,
+  const TextureManager::TextureId    maskTextureId,
+  const TextureManager::TextureId    previousTextureId,
+  const float                        contentScale,
+  const Dali::ImageDimensions&       desiredSize,
+  const Dali::FittingMode::Type      fittingMode,
+  const Dali::SamplingMode::Type     samplingMode,
+  const bool                         cropToMask,
+  TextureUploadObserver*             observer,
+  const bool                         orientationCorrection,
+  const TextureManager::ReloadPolicy reloadPolicy,
+  TextureManager::MultiplyOnLoad&    preMultiplyOnLoad,
+  const bool                         synchronousLoading)
+{
+  return RequestLoadInternal(url, maskTextureId, previousTextureId, contentScale, desiredSize, fittingMode, samplingMode, cropToMask, TextureManager::StorageType::UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u, synchronousLoading);
+}
+
+TextureManager::TextureId TextureManager::RequestMaskLoad(
+  const VisualUrl&                  maskUrl,
+  const TextureManager::StorageType storageType,
+  const bool                        synchronousLoading)
+{
+  // Use the normal load procedure to get the alpha mask.
+  auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  return RequestLoadInternal(maskUrl, INVALID_TEXTURE_ID, INVALID_TEXTURE_ID, 1.0f, ImageDimensions(), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::NO_FILTER, false, storageType, NULL, true, TextureManager::ReloadPolicy::CACHED, preMultiply, Dali::AnimatedImageLoading(), 0u, synchronousLoading);
+}
+
+TextureManager::TextureId TextureManager::RequestLoadInternal(
+  const VisualUrl&                   url,
+  const TextureManager::TextureId    maskTextureId,
+  const TextureManager::TextureId    previousTextureId,
+  const float                        contentScale,
+  const Dali::ImageDimensions&       desiredSize,
+  const Dali::FittingMode::Type      fittingMode,
+  const Dali::SamplingMode::Type     samplingMode,
+  const bool                         cropToMask,
+  const TextureManager::StorageType  storageType,
+  TextureUploadObserver*             observer,
+  const bool                         orientationCorrection,
+  const TextureManager::ReloadPolicy reloadPolicy,
+  TextureManager::MultiplyOnLoad&    preMultiplyOnLoad,
+  Dali::AnimatedImageLoading         animatedImageLoading,
+  const uint32_t                     frameIndex,
+  const bool                         synchronousLoading)
+{
+  TextureHash       textureHash   = INITIAL_HASH_NUMBER;
+  TextureCacheIndex cacheIndex    = INVALID_CACHE_INDEX;
+  bool              loadYuvPlanes = (mLoadYuvPlanes && maskTextureId == INVALID_TEXTURE_ID && storageType == TextureManager::StorageType::UPLOAD_TO_TEXTURE);
+
+  if(storageType != TextureManager::StorageType::RETURN_PIXEL_BUFFER)
+  {
+    textureHash = mTextureCacheManager.GenerateHash(url, desiredSize, fittingMode, samplingMode, maskTextureId, cropToMask, frameIndex);
+
+    // Look up the texture by hash. Note: The extra parameters are used in case of a hash collision.
+    cacheIndex = mTextureCacheManager.FindCachedTexture(textureHash, url, desiredSize, fittingMode, samplingMode, storageType, maskTextureId, cropToMask, preMultiplyOnLoad, (animatedImageLoading) ? true : false, frameIndex);
+  }
+
+  TextureManager::TextureId textureId = INVALID_TEXTURE_ID;
+  // Check if the requested Texture exists in the cache.
+  if(cacheIndex != INVALID_CACHE_INDEX)
+  {
+    if(TextureManager::ReloadPolicy::CACHED == reloadPolicy || TextureManager::INVALID_TEXTURE_ID == previousTextureId)
+    {
+      // Mark this texture being used by another client resource, or Reload forced without request load before.
+      // Forced reload which have current texture before, would replace the current texture.
+      // without the need for incrementing the reference count.
+      ++(mTextureCacheManager[cacheIndex].referenceCount);
+    }
+    textureId = mTextureCacheManager[cacheIndex].textureId;
+
+    // Update preMultiplyOnLoad value. It should be changed according to preMultiplied value of the cached info.
+    preMultiplyOnLoad = mTextureCacheManager[cacheIndex].preMultiplied ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) Using cached texture id@%d, textureId=%d, maskTextureId=%d, prevTextureId=%d, frameindex=%d, premultiplied=%d, refCount=%d\n", url.GetUrl().c_str(), observer, cacheIndex.GetIndex(), textureId, maskTextureId, previousTextureId, frameIndex, mTextureCacheManager[cacheIndex].preMultiplied ? 1 : 0, static_cast<int>(mTextureCacheManager[cacheIndex].referenceCount));
+  }
+
+  if(textureId == INVALID_TEXTURE_ID) // There was no caching, or caching not required
+  {
+    textureId = mTextureCacheManager.GenerateTextureId();
+
+    bool preMultiply = (preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
+
+    // Cache new texutre, and get cacheIndex.
+    cacheIndex = mTextureCacheManager.AppendCache(TextureInfo(textureId, maskTextureId, url, desiredSize, contentScale, fittingMode, samplingMode, false, cropToMask, textureHash, orientationCorrection, preMultiply, animatedImageLoading, frameIndex, loadYuvPlanes));
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) New texture, cacheIndex:%d, textureId=%d, maskTextureId=%d, frameindex=%d premultiply=%d\n", url.GetUrl().c_str(), observer, cacheIndex.GetIndex(), textureId, maskTextureId, frameIndex, preMultiply);
+  }
+
+  // The below code path is common whether we are using the cache or not.
+  // The textureInfoIndex now refers to either a pre-existing cached TextureInfo,
+  // or a new TextureInfo just created.
+  TextureInfo& textureInfo(mTextureCacheManager[cacheIndex]);
+  textureInfo.maskTextureId         = maskTextureId;
+  textureInfo.storageType           = storageType;
+  textureInfo.orientationCorrection = orientationCorrection;
+
+  // the case using external texture has already been loaded texture, so change its status to WAITING_FOR_MASK.
+  if(url.GetProtocolType() == VisualUrl::TEXTURE)
+  {
+    if(textureInfo.loadState != TextureManager::LoadState::UPLOADED)
+    {
+      textureInfo.preMultiplied = (preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
+      textureInfo.loadState     = TextureManager::LoadState::WAITING_FOR_MASK;
+    }
+  }
+
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureInfo loadState:%s\n", GET_LOAD_STATE_STRING(textureInfo.loadState));
+
+  // Force reloading of texture by setting loadState unless already loading or cancelled.
+  if(TextureManager::ReloadPolicy::FORCED == reloadPolicy &&
+     TextureManager::LoadState::LOADING != textureInfo.loadState &&
+     TextureManager::LoadState::WAITING_FOR_MASK != textureInfo.loadState &&
+     TextureManager::LoadState::MASK_APPLYING != textureInfo.loadState &&
+     TextureManager::LoadState::MASK_APPLIED != textureInfo.loadState &&
+     TextureManager::LoadState::CANCELLED != textureInfo.loadState &&
+     TextureManager::LoadState::MASK_CANCELLED != textureInfo.loadState)
+  {
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "TextureManager::RequestLoad( url=%s observer=%p ) ForcedReload cacheIndex:%d, textureId=%d, maskTextureId=%d, prevTextureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex.GetIndex(), textureId, maskTextureId, previousTextureId);
+    textureInfo.loadState = TextureManager::LoadState::NOT_STARTED;
+  }
+
+  if(!synchronousLoading)
+  {
+    // Check if we should add the observer.
+    // Only do this if we have not loaded yet and it will not have loaded by the end of this method.
+    switch(textureInfo.loadState)
+    {
+      case TextureManager::LoadState::LOAD_FAILED: // Failed notifies observer which then stops observing.
+      case TextureManager::LoadState::NOT_STARTED:
+      {
+        LoadOrQueueTexture(textureInfo, observer); // If called inside NotifyObservers, queues until afterwards
+        break;
+      }
+      case TextureManager::LoadState::LOADING:
+      case TextureManager::LoadState::WAITING_FOR_MASK:
+      case TextureManager::LoadState::MASK_APPLYING:
+      case TextureManager::LoadState::MASK_APPLIED:
+      {
+        // Do not observe even we reload forced when texture is already loading state.
+        if(TextureManager::ReloadPolicy::CACHED == reloadPolicy || TextureManager::INVALID_TEXTURE_ID == previousTextureId)
+        {
+          ObserveTexture(textureInfo, observer);
+        }
+        break;
+      }
+      case TextureManager::LoadState::UPLOADED:
+      {
+        if(observer)
+        {
+          LoadOrQueueTexture(textureInfo, observer);
+        }
+        break;
+      }
+      case TextureManager::LoadState::CANCELLED:
+      {
+        // A cancelled texture hasn't finished loading yet. Treat as a loading texture
+        // (it's ref count has already been incremented, above)
+        textureInfo.loadState = TextureManager::LoadState::LOADING;
+        ObserveTexture(textureInfo, observer);
+        break;
+      }
+      case TextureManager::LoadState::MASK_CANCELLED:
+      {
+        // A cancelled texture hasn't finished mask applying yet. Treat as a mask applying texture
+        // (it's ref count has already been incremented, above)
+        textureInfo.loadState = TextureManager::LoadState::MASK_APPLYING;
+        ObserveTexture(textureInfo, observer);
+        break;
+      }
+      case TextureManager::LoadState::LOAD_FINISHED:
+      {
+        // Loading has already completed.
+        if(observer && textureInfo.storageType == TextureManager::StorageType::RETURN_PIXEL_BUFFER)
+        {
+          LoadOrQueueTexture(textureInfo, observer);
+        }
+        break;
+      }
+    }
+  }
+  else
+  {
+    // If the image is already finished to load, use cached texture.
+    // We don't need to consider Observer because this is synchronous loading.
+    if(!(textureInfo.loadState == TextureManager::LoadState::UPLOADED ||
+         textureInfo.loadState == TextureManager::LoadState::LOAD_FINISHED))
+    {
+      if(url.GetProtocolType() == VisualUrl::TEXTURE)
+      {
+        // Get external textureSet from cacheManager.
+        std::string location = textureInfo.url.GetLocation();
+        if(!location.empty())
+        {
+          TextureId id                  = std::stoi(location);
+          auto      externalTextureInfo = mTextureCacheManager.GetExternalTextureInfo(id);
+          textureInfo.textures.push_back(externalTextureInfo.textureSet.GetTexture(0));
+          textureInfo.loadState = TextureManager::LoadState::UPLOADED;
+        }
+      }
+      else
+      {
+        std::vector<Devel::PixelBuffer> pixelBuffers;
+        LoadImageSynchronously(url, desiredSize, fittingMode, samplingMode, orientationCorrection, loadYuvPlanes, pixelBuffers);
+
+        if(pixelBuffers.empty())
+        {
+          // If pixelBuffer loading is failed in synchronously, call RequestRemove() method.
+          RequestRemove(textureId, nullptr);
+          return INVALID_TEXTURE_ID;
+        }
+
+        if(storageType == TextureManager::StorageType::KEEP_PIXEL_BUFFER) // For the mask image loading.
+        {
+          textureInfo.pixelBuffer = pixelBuffers[0]; // Store the pixel data
+          textureInfo.loadState   = TextureManager::LoadState::LOAD_FINISHED;
+        }
+        else // For the image loading.
+        {
+          Texture maskTexture;
+          if(maskTextureId != INVALID_TEXTURE_ID)
+          {
+            TextureCacheIndex maskCacheIndex = mTextureCacheManager.GetCacheIndexFromId(maskTextureId);
+            if(maskCacheIndex != INVALID_CACHE_INDEX)
+            {
+              if(mTextureCacheManager[maskCacheIndex].storageType == TextureManager::StorageType::KEEP_PIXEL_BUFFER)
+              {
+                Devel::PixelBuffer maskPixelBuffer = mTextureCacheManager[maskCacheIndex].pixelBuffer;
+                if(maskPixelBuffer)
+                {
+                  pixelBuffers[0].ApplyMask(maskPixelBuffer, contentScale, cropToMask);
+                }
+                else
+                {
+                  DALI_LOG_ERROR("Mask image cached invalid pixel buffer!\n");
+                }
+              }
+            }
+            else
+            {
+              DALI_LOG_ERROR("Mask image is not stored in cache.\n");
+            }
+          }
+          PreMultiply(pixelBuffers[0], preMultiplyOnLoad);
+
+          // Upload texture
+          UploadTextures(pixelBuffers, textureInfo);
+        }
+      }
+    }
+  }
+
+  return textureId;
+}
+
+void TextureManager::RequestRemove(const TextureManager::TextureId textureId, TextureUploadObserver* observer)
+{
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestRemove( textureId=%d observer=%p )\n", textureId, observer);
+
+  // Queue to remove.
+  if(textureId != INVALID_TEXTURE_ID)
+  {
+    TextureCacheIndex textureCacheIndex = mTextureCacheManager.GetCacheIndexFromId(textureId);
+    if(textureCacheIndex != INVALID_CACHE_INDEX)
+    {
+      if(observer)
+      {
+        // Remove observer from cached texture info
+        TextureInfo& textureInfo(mTextureCacheManager[textureCacheIndex]);
+        RemoveTextureObserver(textureInfo, observer);
+      }
+
+      mRemoveQueue.PushBack(textureId);
+
+      if(!mRemoveProcessorRegistered && Adaptor::IsAvailable())
+      {
+        mRemoveProcessorRegistered = true;
+        Adaptor::Get().RegisterProcessor(*this, true);
+      }
+    }
+  }
+}
+
+void TextureManager::Remove(const TextureManager::TextureId textureId)
+{
+  if(textureId != INVALID_TEXTURE_ID)
+  {
+    TextureCacheIndex textureCacheIndex = mTextureCacheManager.GetCacheIndexFromId(textureId);
+    if(textureCacheIndex != INVALID_CACHE_INDEX)
+    {
+      TextureManager::TextureId maskTextureId = INVALID_TEXTURE_ID;
+      TextureInfo&              textureInfo(mTextureCacheManager[textureCacheIndex]);
+      // We only need to consider maskTextureId when texture's loadState is not cancelled. Because it is already deleted.
+      if(textureInfo.loadState != TextureManager::LoadState::CANCELLED && textureInfo.loadState != TextureManager::LoadState::MASK_CANCELLED)
+      {
+        if(textureInfo.maskTextureId != INVALID_TEXTURE_ID)
+        {
+          maskTextureId = textureInfo.maskTextureId;
+        }
+      }
+
+      DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::Remove( textureId=%d ) cacheIndex:%d removal maskTextureId=%d, loadState=%s\n", textureId, textureCacheIndex.GetIndex(), maskTextureId, GET_LOAD_STATE_STRING(textureInfo.loadState));
+
+      // Remove textureId in CacheManager. Now, textureInfo is invalidate.
+      mTextureCacheManager.RemoveCache(textureInfo);
+
+      // Remove maskTextureId in CacheManager
+      if(maskTextureId != INVALID_TEXTURE_ID)
+      {
+        TextureCacheIndex maskCacheIndex = mTextureCacheManager.GetCacheIndexFromId(maskTextureId);
+        if(maskCacheIndex != INVALID_CACHE_INDEX)
+        {
+          TextureInfo& maskTextureInfo(mTextureCacheManager[maskCacheIndex]);
+
+          DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::Remove mask texture( maskTextureId=%d ) cacheIndex:%d, loadState=%s\n", maskTextureId, maskCacheIndex.GetIndex(), GET_LOAD_STATE_STRING(maskTextureInfo.loadState));
+
+          mTextureCacheManager.RemoveCache(maskTextureInfo);
+        }
+      }
+    }
+  }
+}
+
+void TextureManager::ProcessRemoveQueue()
+{
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_TEXTURE_MANAGER_PROCESS_REMOVE_QUEUE", [&](std::ostringstream& oss) {
+    oss << "[" << mRemoveQueue.Count() << "]";
+  });
+
+  // Note that RemoveQueue is not be changed during Remove().
+  for(auto&& textureId : mRemoveQueue)
+  {
+    if(textureId != INVALID_TEXTURE_ID)
+    {
+      Remove(textureId);
+    }
+  }
+
+  mRemoveQueue.Clear();
+
+  DALI_TRACE_END(gTraceFilter, "DALI_TEXTURE_MANAGER_PROCESS_REMOVE_QUEUE");
+}
+
+void TextureManager::Process(bool postProcessor)
+{
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::Process()\n");
+
+  ProcessRemoveQueue();
+
+  if(Adaptor::IsAvailable())
+  {
+    Adaptor::Get().UnregisterProcessor(*this, true);
+    mRemoveProcessorRegistered = false;
+  }
+}
+
+void TextureManager::LoadImageSynchronously(
+  const VisualUrl&                 url,
+  const Dali::ImageDimensions&     desiredSize,
+  const Dali::FittingMode::Type    fittingMode,
+  const Dali::SamplingMode::Type   samplingMode,
+  const bool                       orientationCorrection,
+  const bool                       loadYuvPlanes,
+  std::vector<Devel::PixelBuffer>& pixelBuffers)
+{
+  Devel::PixelBuffer pixelBuffer;
+  if(url.IsBufferResource())
+  {
+    const EncodedImageBuffer& encodedImageBuffer = mTextureCacheManager.GetEncodedImageBuffer(url);
+    if(encodedImageBuffer)
+    {
+      pixelBuffer = LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), desiredSize, fittingMode, samplingMode, orientationCorrection);
+    }
+  }
+  else
+  {
+    if(loadYuvPlanes)
+    {
+      Dali::LoadImagePlanesFromFile(url.GetUrl(), pixelBuffers, desiredSize, fittingMode, samplingMode, orientationCorrection);
+    }
+    else
+    {
+      pixelBuffer = Dali::LoadImageFromFile(url.GetUrl(), desiredSize, fittingMode, samplingMode, orientationCorrection);
+    }
+  }
+
+  if(pixelBuffer)
+  {
+    pixelBuffers.push_back(pixelBuffer);
+  }
+}
+
+void TextureManager::AddObserver(TextureManager::LifecycleObserver& observer)
+{
+  // make sure an observer doesn't observe the same object twice
+  // otherwise it will get multiple calls to ObjectDestroyed()
+  DALI_ASSERT_DEBUG(mLifecycleObservers.End() == std::find(mLifecycleObservers.Begin(), mLifecycleObservers.End(), &observer));
+  mLifecycleObservers.PushBack(&observer);
+}
+
+void TextureManager::RemoveObserver(TextureManager::LifecycleObserver& observer)
+{
+  // Find the observer...
+  auto endIter = mLifecycleObservers.End();
+  for(auto iter = mLifecycleObservers.Begin(); iter != endIter; ++iter)
+  {
+    if((*iter) == &observer)
+    {
+      mLifecycleObservers.Erase(iter);
+      break;
+    }
+  }
+  DALI_ASSERT_DEBUG(endIter != mLifecycleObservers.End());
+}
+
+void TextureManager::LoadOrQueueTexture(TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer)
+{
+  switch(textureInfo.loadState)
+  {
+    case TextureManager::LoadState::NOT_STARTED:
+    case TextureManager::LoadState::LOAD_FAILED:
+    {
+      if(mLoadingQueueTextureId != INVALID_TEXTURE_ID)
+      {
+        QueueLoadTexture(textureInfo, observer);
+      }
+      else
+      {
+        LoadTexture(textureInfo, observer);
+      }
+      break;
+    }
+    case TextureManager::LoadState::UPLOADED:
+    {
+      if(mLoadingQueueTextureId != INVALID_TEXTURE_ID)
+      {
+        QueueLoadTexture(textureInfo, observer);
+      }
+      else
+      {
+        // The Texture has already loaded. The other observers have already been notified.
+        // We need to send a "late" loaded notification for this observer.
+        if(observer)
+        {
+          EmitLoadComplete(observer, textureInfo, true);
+        }
+      }
+      break;
+    }
+    case TextureManager::LoadState::LOADING:
+    case TextureManager::LoadState::CANCELLED:
+    case TextureManager::LoadState::MASK_CANCELLED:
+    case TextureManager::LoadState::LOAD_FINISHED:
+    case TextureManager::LoadState::WAITING_FOR_MASK:
+    case TextureManager::LoadState::MASK_APPLYING:
+    case TextureManager::LoadState::MASK_APPLIED:
+    {
+      break;
+    }
+  }
+}
+
+void TextureManager::QueueLoadTexture(const TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer)
+{
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "Add observer to observer queue (textureId:%d, observer:%p)\n", textureInfo.textureId, observer);
+
+  const auto& textureId = textureInfo.textureId;
+  mLoadQueue.PushBack(QueueElement(textureId, observer));
+
+  if(observer)
+  {
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "  Connect DestructionSignal to observer:%p\n", observer);
+    observer->DestructionSignal().Connect(this, &TextureManager::ObserverDestroyed);
+  }
+}
+
+void TextureManager::LoadTexture(TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer)
+{
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::LoadTexture(): url:%s sync:%s\n", textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously ? "T" : "F");
+  textureInfo.loadState = TextureManager::LoadState::LOADING;
+  if(!textureInfo.loadSynchronously)
+  {
+    auto premultiplyOnLoad = (textureInfo.preMultiplyOnLoad && textureInfo.maskTextureId == INVALID_TEXTURE_ID) ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF;
+    if(textureInfo.animatedImageLoading)
+    {
+      mAsyncLoader->LoadAnimatedImage(textureInfo.textureId, textureInfo.animatedImageLoading, textureInfo.frameIndex, textureInfo.desiredSize, textureInfo.fittingMode, textureInfo.samplingMode, premultiplyOnLoad);
+    }
+    else
+    {
+      mAsyncLoader->Load(textureInfo.textureId, textureInfo.url, textureInfo.desiredSize, textureInfo.fittingMode, textureInfo.samplingMode, textureInfo.orientationCorrection, premultiplyOnLoad, textureInfo.loadYuvPlanes);
+    }
+  }
+  ObserveTexture(textureInfo, observer);
+}
+
+void TextureManager::ProcessLoadQueue()
+{
+  for(auto&& element : mLoadQueue)
+  {
+    if(element.mTextureId == INVALID_TEXTURE_ID)
+    {
+      continue;
+    }
+
+    TextureCacheIndex cacheIndex = mTextureCacheManager.GetCacheIndexFromId(element.mTextureId);
+    if(cacheIndex != INVALID_CACHE_INDEX)
+    {
+      TextureInfo& textureInfo(mTextureCacheManager[cacheIndex]);
+
+      DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::ProcessLoadQueue() textureId=%d, observer=%p, cacheIndex=@%d, loadState:%s\n", element.mTextureId, element.mObserver, cacheIndex.GetIndex(), GET_LOAD_STATE_STRING(textureInfo.loadState));
+
+      if((textureInfo.loadState == TextureManager::LoadState::UPLOADED) ||
+         (textureInfo.loadState == TextureManager::LoadState::LOAD_FINISHED &&
+          textureInfo.storageType == TextureManager::StorageType::RETURN_PIXEL_BUFFER))
+      {
+        if(element.mObserver)
+        {
+          DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "  Disconnect DestructionSignal to observer:%p\n", element.mObserver);
+          element.mObserver->DestructionSignal().Disconnect(this, &TextureManager::ObserverDestroyed);
+
+          EmitLoadComplete(element.mObserver, textureInfo, true);
+        }
+      }
+      else if(textureInfo.loadState == TextureManager::LoadState::LOADING)
+      {
+        // Note : LOADING state texture cannot be queue.
+        // This case be occured when same texture id are queue in mLoadQueue.
+        ObserveTexture(textureInfo, element.mObserver);
+      }
+      else
+      {
+        LoadTexture(textureInfo, element.mObserver);
+      }
+    }
+  }
+
+  mLoadQueue.Clear();
+}
+
+void TextureManager::ObserveTexture(TextureManager::TextureInfo& textureInfo,
+                                    TextureUploadObserver*       observer)
+{
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::ObserveTexture(): url:%s observer:%p\n", textureInfo.url.GetUrl().c_str(), observer);
+
+  if(observer)
+  {
+    textureInfo.observerList.PushBack(observer);
+
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "  Connect DestructionSignal to observer:%p\n", observer);
+    observer->DestructionSignal().Connect(this, &TextureManager::ObserverDestroyed);
+  }
+}
+
+void TextureManager::AsyncLoadComplete(const TextureManager::TextureId textureId, std::vector<Devel::PixelBuffer>& pixelBuffers)
+{
+  TextureCacheIndex cacheIndex = mTextureCacheManager.GetCacheIndexFromId(textureId);
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::AsyncLoadComplete( textureId:%d CacheIndex:%d )\n", textureId, cacheIndex.GetIndex());
+  if(cacheIndex != INVALID_CACHE_INDEX)
+  {
+    TextureInfo& textureInfo(mTextureCacheManager[cacheIndex]);
+
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "  textureId:%d Url:%s CacheIndex:%d LoadState: %s\n", textureInfo.textureId, textureInfo.url.GetUrl().c_str(), cacheIndex.GetIndex(), GET_LOAD_STATE_STRING(textureInfo.loadState));
+    if(textureInfo.loadState != TextureManager::LoadState::CANCELLED && textureInfo.loadState != TextureManager::LoadState::MASK_CANCELLED)
+    {
+      // textureInfo can be invalidated after this call (as the mTextureInfoContainer may be modified)
+      PostLoad(textureInfo, pixelBuffers);
+    }
+    else
+    {
+      Remove(textureInfo.textureId);
+    }
+  }
+}
+
+void TextureManager::PostLoad(TextureManager::TextureInfo& textureInfo, std::vector<Devel::PixelBuffer>& pixelBuffers)
+{
+  if(!pixelBuffers.empty()) ///< Load success
+  {
+    if(pixelBuffers.size() == 1)
+    {
+      Devel::PixelBuffer pixelBuffer = pixelBuffers[0];
+      if(pixelBuffer && (pixelBuffer.GetWidth() != 0) && (pixelBuffer.GetHeight() != 0))
+      {
+        textureInfo.preMultiplied = pixelBuffer.IsAlphaPreMultiplied();
+
+        if(textureInfo.storageType == TextureManager::StorageType::UPLOAD_TO_TEXTURE)
+        {
+          // If there is a mask texture ID associated with this texture, then apply the mask
+          // if it's already loaded. If it hasn't, and the mask is still loading,
+          // wait for the mask to finish loading.
+          // note, If the texture is already uploaded synchronously during loading,
+          // we don't need to apply mask.
+          if(textureInfo.loadState != TextureManager::LoadState::UPLOADED &&
+             textureInfo.maskTextureId != INVALID_TEXTURE_ID)
+          {
+            if(textureInfo.loadState == TextureManager::LoadState::MASK_APPLYING)
+            {
+              textureInfo.loadState = TextureManager::LoadState::MASK_APPLIED;
+              UploadTextures(pixelBuffers, textureInfo);
+              NotifyObservers(textureInfo, true);
+            }
+            else
+            {
+              LoadState maskLoadState = mTextureCacheManager.GetTextureStateInternal(textureInfo.maskTextureId);
+              textureInfo.pixelBuffer = pixelBuffer; // Store the pixel buffer temporarily
+              if(maskLoadState == TextureManager::LoadState::LOADING)
+              {
+                textureInfo.loadState = TextureManager::LoadState::WAITING_FOR_MASK;
+              }
+              else if(maskLoadState == TextureManager::LoadState::LOAD_FINISHED || maskLoadState == TextureManager::LoadState::UPLOADED)
+              {
+                TextureCacheIndex maskCacheIndex = mTextureCacheManager.GetCacheIndexFromId(textureInfo.maskTextureId);
+                if(maskCacheIndex != INVALID_CACHE_INDEX)
+                {
+                  TextureInfo& maskTextureInfo(mTextureCacheManager[maskCacheIndex]);
+                  if(maskTextureInfo.storageType == TextureManager::StorageType::KEEP_PIXEL_BUFFER)
+                  {
+                    ApplyMask(textureInfo, textureInfo.maskTextureId);
+                  }
+                  else if(maskTextureInfo.storageType == TextureManager::StorageType::KEEP_TEXTURE)
+                  {
+                    // Upload image texture. textureInfo.loadState will be UPLOADED.
+                    UploadTextures(pixelBuffers, textureInfo);
+
+                    // notify mask texture set.
+                    NotifyObservers(textureInfo, true);
+                  }
+                }
+              }
+              else // maskLoadState == TextureManager::LoadState::LOAD_FAILED
+              {
+                // Url texture load success, But alpha mask texture load failed. Run as normal image upload.
+                DALI_LOG_ERROR("Alpha mask image loading failed! Image will not be masked\n");
+                UploadTextures(pixelBuffers, textureInfo);
+                NotifyObservers(textureInfo, true);
+              }
+            }
+          }
+          else
+          {
+            UploadTextures(pixelBuffers, textureInfo);
+            NotifyObservers(textureInfo, true);
+          }
+        }
+        else
+        {
+          textureInfo.pixelBuffer = pixelBuffer; // Store the pixel data
+          textureInfo.loadState   = TextureManager::LoadState::LOAD_FINISHED;
+
+          if(textureInfo.storageType == TextureManager::StorageType::RETURN_PIXEL_BUFFER)
+          {
+            NotifyObservers(textureInfo, true);
+          }
+          else // for the TextureManager::StorageType::KEEP_PIXEL_BUFFER and TextureManager::StorageType::KEEP_TEXTURE
+          {
+            // Check if there was another texture waiting for this load to complete
+            // (e.g. if this was an image mask, and its load is on a different thread)
+            CheckForWaitingTexture(textureInfo);
+          }
+        }
+      }
+    }
+    else
+    {
+      // YUV case
+      textureInfo.preMultiplied = false;
+
+      UploadTextures(pixelBuffers, textureInfo);
+      NotifyObservers(textureInfo, true);
+    }
+  }
+  else ///< Load fail
+  {
+    textureInfo.loadState = TextureManager::LoadState::LOAD_FAILED;
+    if(textureInfo.storageType == TextureManager::StorageType::KEEP_PIXEL_BUFFER || textureInfo.storageType == TextureManager::StorageType::KEEP_TEXTURE)
+    {
+      // Check if there was another texture waiting for this load to complete
+      // (e.g. if this was an image mask, and its load is on a different thread)
+      CheckForWaitingTexture(textureInfo);
+    }
+    else
+    {
+      NotifyObservers(textureInfo, false);
+    }
+  }
+}
+
+void TextureManager::CheckForWaitingTexture(TextureManager::TextureInfo& maskTextureInfo)
+{
+  if(maskTextureInfo.loadState == TextureManager::LoadState::LOAD_FINISHED &&
+     maskTextureInfo.storageType == TextureManager::StorageType::KEEP_TEXTURE)
+  {
+    // Upload mask texture. textureInfo.loadState will be UPLOADED.
+    std::vector<Devel::PixelBuffer> pixelBuffers;
+    pixelBuffers.push_back(maskTextureInfo.pixelBuffer);
+    UploadTextures(pixelBuffers, maskTextureInfo);
+  }
+
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::CheckForWaitingTexture(): maskTextureId=%d, maskTextureUrl=%s\n", maskTextureInfo.textureId, maskTextureInfo.url.GetUrl().c_str());
+
+  // Search the cache, checking if any texture has this texture id as a maskTextureId
+  const size_t size = mTextureCacheManager.size();
+
+  // Keep notify observer required textureIds.
+  // Note : NotifyObservers can change mTextureCacheManager cache struct. We should check id's validation before notify.
+  std::vector<TextureId> notifyRequiredTextureIds;
+
+  // TODO : Refactorize here to not iterate whole cached image.
+  for(TextureCacheIndex cacheIndex = TextureCacheIndex(TextureManagerType::TEXTURE_CACHE_INDEX_TYPE_LOCAL, 0u); cacheIndex.GetIndex() < size; ++cacheIndex.detailValue.index)
+  {
+    if(mTextureCacheManager[cacheIndex].maskTextureId == maskTextureInfo.textureId &&
+       mTextureCacheManager[cacheIndex].loadState == TextureManager::LoadState::WAITING_FOR_MASK)
+    {
+      TextureInfo& textureInfo(mTextureCacheManager[cacheIndex]);
+
+      if(maskTextureInfo.loadState == TextureManager::LoadState::LOAD_FINISHED)
+      {
+        if(maskTextureInfo.storageType == TextureManager::StorageType::KEEP_PIXEL_BUFFER)
+        {
+          ApplyMask(textureInfo, maskTextureInfo.textureId);
+        }
+      }
+      else if(maskTextureInfo.loadState == TextureManager::LoadState::UPLOADED)
+      {
+        if(maskTextureInfo.storageType == TextureManager::StorageType::KEEP_TEXTURE)
+        {
+          if(textureInfo.url.GetProtocolType() == VisualUrl::TEXTURE)
+          {
+            // Get external textureSet from cacheManager.
+            std::string location = textureInfo.url.GetLocation();
+            if(!location.empty())
+            {
+              TextureId id                  = std::stoi(location);
+              auto      externalTextureInfo = mTextureCacheManager.GetExternalTextureInfo(id);
+              textureInfo.textures.push_back(externalTextureInfo.textureSet.GetTexture(0));
+              textureInfo.loadState = TextureManager::LoadState::UPLOADED;
+            }
+          }
+          else
+          {
+            // Upload image texture. textureInfo.loadState will be UPLOADED.
+            std::vector<Devel::PixelBuffer> pixelBuffers;
+            pixelBuffers.push_back(textureInfo.pixelBuffer);
+            UploadTextures(pixelBuffers, textureInfo);
+          }
+
+          // Increase reference counts for notify required textureId.
+          // Now we can assume that we don't remove & re-assign this textureId
+          // during NotifyObserver signal emit.
+          maskTextureInfo.referenceCount++;
+          textureInfo.referenceCount++;
+
+          DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::CheckForWaitingTexture(): Ready to notify textureId=%d\n", textureInfo.textureId);
+
+          notifyRequiredTextureIds.push_back(textureInfo.textureId);
+        }
+      }
+      else // maskTextureInfo.loadState == TextureManager::LoadState::LOAD_FAILED
+      {
+        // Url texture load success, But alpha mask texture load failed. Run as normal image upload.
+        DALI_LOG_ERROR("Alpha mask image loading failed! Image will not be masked\n");
+        std::vector<Devel::PixelBuffer> pixelBuffers;
+        pixelBuffers.push_back(textureInfo.pixelBuffer);
+        UploadTextures(pixelBuffers, textureInfo);
+
+        // Increase reference counts for notify required textureId.
+        // Now we can assume that we don't remove & re-assign this textureId
+        // during NotifyObserver signal emit.
+        maskTextureInfo.referenceCount++;
+        textureInfo.referenceCount++;
+
+        DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::CheckForWaitingTexture(): Ready to notify textureId=%d\n", textureInfo.textureId);
+
+        notifyRequiredTextureIds.push_back(textureInfo.textureId);
+      }
+    }
+  }
+
+  // Notify textures are masked
+  for(const auto textureId : notifyRequiredTextureIds)
+  {
+    TextureCacheIndex textureCacheIndex = mTextureCacheManager.GetCacheIndexFromId(textureId);
+    if(textureCacheIndex != INVALID_CACHE_INDEX)
+    {
+      TextureInfo& textureInfo(mTextureCacheManager[textureCacheIndex]);
+      NotifyObservers(textureInfo, true);
+    }
+  }
+
+  // Decrease reference count
+  for(const auto textureId : notifyRequiredTextureIds)
+  {
+    RequestRemove(textureId, nullptr);
+  }
+}
+
+void TextureManager::ApplyMask(TextureManager::TextureInfo& textureInfo, const TextureManager::TextureId maskTextureId)
+{
+  TextureCacheIndex maskCacheIndex = mTextureCacheManager.GetCacheIndexFromId(maskTextureId);
+  if(maskCacheIndex != INVALID_CACHE_INDEX)
+  {
+    Devel::PixelBuffer maskPixelBuffer = mTextureCacheManager[maskCacheIndex].pixelBuffer;
+    Devel::PixelBuffer pixelBuffer     = textureInfo.pixelBuffer;
+    textureInfo.pixelBuffer.Reset();
+
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::ApplyMask(): url:%s sync:%s\n", textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously ? "T" : "F");
+
+    textureInfo.loadState  = TextureManager::LoadState::MASK_APPLYING;
+    auto premultiplyOnLoad = textureInfo.preMultiplyOnLoad ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF;
+    mAsyncLoader->ApplyMask(textureInfo.textureId, pixelBuffer, maskPixelBuffer, textureInfo.scaleFactor, textureInfo.cropToMask, premultiplyOnLoad);
+  }
+}
+
+void TextureManager::UploadTextures(std::vector<Devel::PixelBuffer>& pixelBuffers, TextureManager::TextureInfo& textureInfo)
+{
+  if(!pixelBuffers.empty() && textureInfo.loadState != TextureManager::LoadState::UPLOADED)
+  {
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "  TextureManager::UploadTextures() New Texture for textureId:%d\n", textureInfo.textureId);
+
+    // Check if this pixelBuffer is premultiplied
+    textureInfo.preMultiplied = pixelBuffers[0].IsAlphaPreMultiplied();
+
+    auto& renderingAddOn = RenderingAddOn::Get();
+    if(renderingAddOn.IsValid())
+    {
+      renderingAddOn.CreateGeometry(textureInfo.textureId, pixelBuffers[0]);
+    }
+
+    // Remove previous textures and insert new textures
+    textureInfo.textures.clear();
+
+    for(auto&& pixelBuffer : pixelBuffers)
+    {
+      Texture   texture   = Texture::New(Dali::TextureType::TEXTURE_2D, pixelBuffer.GetPixelFormat(), pixelBuffer.GetWidth(), pixelBuffer.GetHeight());
+      PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer);
+      texture.Upload(pixelData);
+      textureInfo.textures.push_back(texture);
+    }
+  }
+
+  // Update the load state.
+  // Note: This is regardless of success as we care about whether a
+  // load attempt is in progress or not.  If unsuccessful, a broken
+  // image is still loaded.
+  textureInfo.loadState = TextureManager::LoadState::UPLOADED;
+}
+
+void TextureManager::NotifyObservers(TextureManager::TextureInfo& textureInfo, const bool success)
+{
+  TextureId textureId = textureInfo.textureId;
+
+  // If there is an observer: Notify the load is complete, whether successful or not,
+  // and erase it from the list
+  TextureInfo* info = &textureInfo;
+
+  if(info->animatedImageLoading)
+  {
+    // If loading failed, we don't need to get frameCount and frameInterval.
+    if(success)
+    {
+      info->frameCount    = info->animatedImageLoading.GetImageCount();
+      info->frameInterval = info->animatedImageLoading.GetFrameInterval(info->frameIndex);
+    }
+    info->animatedImageLoading.Reset();
+  }
+
+  mLoadingQueueTextureId = textureId;
+
+  // Reverse observer list that we can pop_back the observer.
+  std::reverse(info->observerList.Begin(), info->observerList.End());
+
+  while(info->observerList.Count())
+  {
+    TextureUploadObserver* observer = *(info->observerList.End() - 1u);
+
+    // During LoadComplete() a Control ResourceReady() signal is emitted.
+    // During that signal the app may add remove /add Textures (e.g. via
+    // ImageViews).
+    // It is possible for observers to be removed from the observer list,
+    // and it is also possible for the mTextureInfoContainer to be modified,
+    // invalidating the reference to the textureInfo struct.
+    // Texture load requests for the same URL are deferred until the end of this
+    // method.
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::NotifyObservers() observer:%p textureId:%d url:%s loadState:%s\n", observer, textureId, info->url.GetUrl().c_str(), GET_LOAD_STATE_STRING(info->loadState));
+    // It is possible for the observer to be deleted.
+    // Disconnect and remove the observer first.
+    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "  Disconnect DestructionSignal to observer:%p\n", observer);
+    observer->DestructionSignal().Disconnect(this, &TextureManager::ObserverDestroyed);
+
+    info->observerList.Erase(info->observerList.End() - 1u);
+
+    EmitLoadComplete(observer, *info, success);
+
+    // Get the textureInfo from the container again as it may have been invalidated.
+    TextureCacheIndex textureInfoIndex = mTextureCacheManager.GetCacheIndexFromId(textureId);
+    if(textureInfoIndex == INVALID_CACHE_INDEX)
+    {
+      break; // texture has been removed - can stop.
+    }
+    info = &mTextureCacheManager[textureInfoIndex];
+  }
+
+  mLoadingQueueTextureId = INVALID_TEXTURE_ID;
+  ProcessLoadQueue();
+
+  if(info->storageType == TextureManager::StorageType::RETURN_PIXEL_BUFFER && info->observerList.Count() == 0)
+  {
+    RequestRemove(info->textureId, nullptr);
+  }
+}
+
+void TextureManager::ObserverDestroyed(TextureUploadObserver* observer)
+{
+  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "TextureManager::ObserverDestroyed() observer:%p\n", observer);
+
+  const std::size_t size = mTextureCacheManager.size();
+  for(TextureCacheIndex cacheIndex = TextureCacheIndex(TextureManagerType::TEXTURE_CACHE_INDEX_TYPE_LOCAL, 0u); cacheIndex.GetIndex() < size; ++cacheIndex.detailValue.index)
+  {
+    TextureInfo& textureInfo(mTextureCacheManager[cacheIndex]);
+    for(TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin();
+        j != textureInfo.observerList.End();)
+    {
+      if(*j == observer)
+      {
+        j = textureInfo.observerList.Erase(j);
+      }
+      else
+      {
+        ++j;
+      }
+    }
+  }
+
+  // Remove element from the LoadQueue
+  for(auto&& element : mLoadQueue)
+  {
+    if(element.mObserver == observer)
+    {
+      DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "Remove observer from observer queue (textureId:%d, observer:%p)\n", element.mTextureId, element.mObserver);
+      element.mTextureId = INVALID_TEXTURE_ID;
+      element.mObserver  = nullptr;
+    }
+  }
+}
+
+Dali::Geometry TextureManager::GetRenderGeometry(const TextureManager::TextureId textureId, uint32_t& frontElements, uint32_t& backElements)
+{
+  return RenderingAddOn::Get().IsValid() ? RenderingAddOn::Get().GetGeometry(textureId, frontElements, backElements) : Geometry();
+}
+
+void TextureManager::EmitLoadComplete(TextureUploadObserver* observer, TextureManager::TextureInfo& textureInfo, const bool success)
+{
+  if(textureInfo.storageType == TextureManager::StorageType::RETURN_PIXEL_BUFFER)
+  {
+    observer->LoadComplete(success, TextureUploadObserver::TextureInformation(TextureUploadObserver::ReturnType::PIXEL_BUFFER, textureInfo.pixelBuffer, textureInfo.url.GetUrl(), textureInfo.preMultiplied));
+  }
+  else
+  {
+    TextureSet textureSet = GetTextureSet(textureInfo);
+    if(textureInfo.isAnimatedImageFormat)
+    {
+      observer->LoadComplete(success, TextureUploadObserver::TextureInformation(TextureUploadObserver::ReturnType::ANIMATED_IMAGE_TEXTURE, textureInfo.textureId, textureSet, textureInfo.frameCount, textureInfo.frameInterval, textureInfo.preMultiplied));
+    }
+    else
+    {
+      observer->LoadComplete(success, TextureUploadObserver::TextureInformation(TextureUploadObserver::ReturnType::TEXTURE, textureInfo.textureId, textureSet, textureInfo.preMultiplied));
+    }
+  }
+}
+
+TextureSet TextureManager::GetTextureSet(const TextureManager::TextureId textureId)
+{
+  TextureSet                textureSet;
+  TextureManager::LoadState loadState = mTextureCacheManager.GetTextureStateInternal(textureId);
+  if(loadState == TextureManager::LoadState::UPLOADED)
+  {
+    TextureCacheIndex textureCacheIndex = mTextureCacheManager.GetCacheIndexFromId(textureId);
+    if(textureCacheIndex != INVALID_CACHE_INDEX)
+    {
+      TextureInfo& textureInfo(mTextureCacheManager[textureCacheIndex]);
+      textureSet = GetTextureSet(textureInfo);
+    }
+  }
+  else
+  {
+    DALI_LOG_ERROR("GetTextureSet is failed. texture is not uploaded \n");
+  }
+  return textureSet;
+}
+
+TextureSet TextureManager::GetTextureSet(const TextureManager::TextureInfo& textureInfo)
+{
+  TextureSet textureSet;
+
+  // Always create new TextureSet here, so we don't share same TextureSets for multiple visuals.
+  textureSet = TextureSet::New();
+
+  if(!textureInfo.textures.empty())
+  {
+    if(textureInfo.textures.size() > 1) // For YUV case
+    {
+      uint32_t index = 0u;
+      for(auto&& texture : textureInfo.textures)
+      {
+        textureSet.SetTexture(index++, texture);
+      }
+    }
+    else
+    {
+      textureSet.SetTexture(TEXTURE_INDEX, textureInfo.textures[0]);
+      TextureCacheIndex maskCacheIndex = mTextureCacheManager.GetCacheIndexFromId(textureInfo.maskTextureId);
+      if(maskCacheIndex != INVALID_CACHE_INDEX)
+      {
+        TextureInfo& maskTextureInfo(mTextureCacheManager[maskCacheIndex]);
+        if(maskTextureInfo.storageType == TextureManager::StorageType::UPLOAD_TO_TEXTURE || maskTextureInfo.storageType == TextureManager::StorageType::KEEP_TEXTURE)
+        {
+          if(!maskTextureInfo.textures.empty())
+          {
+            textureSet.SetTexture(MASK_TEXTURE_INDEX, maskTextureInfo.textures[0]);
+          }
+        }
+      }
+    }
+  }
+  return textureSet;
+}
+
+void TextureManager::RemoveTextureObserver(TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer)
+{
+  if(observer)
+  {
+    const auto iterEnd = textureInfo.observerList.End();
+    const auto iter    = std::find(textureInfo.observerList.Begin(), iterEnd, observer);
+    if(iter != iterEnd)
+    {
+      // Disconnect and remove the observer.
+      DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "  Disconnect DestructionSignal to observer:%p\n", observer);
+      observer->DestructionSignal().Disconnect(this, &TextureManager::ObserverDestroyed);
+      textureInfo.observerList.Erase(iter);
+    }
+    else
+    {
+      // Given textureId might exist at load queue.
+      // Remove observer from the LoadQueue
+      for(auto&& element : mLoadQueue)
+      {
+        if(element.mTextureId == textureInfo.textureId && element.mObserver == observer)
+        {
+          DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "Remove observer from observer queue (textureId:%d, observer:%p)\n", element.mTextureId, element.mObserver);
+          DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "  Disconnect DestructionSignal to observer:%p\n", observer);
+          observer->DestructionSignal().Disconnect(this, &TextureManager::ObserverDestroyed);
+          element.mObserver = nullptr;
+          break;
+        }
+      }
+    }
+  }
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/texture-manager/texture-manager-impl.h b/dali-toolkit/internal/texture-manager/texture-manager-impl.h
new file mode 100644
index 0000000..fdae67a
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-manager-impl.h
@@ -0,0 +1,696 @@
+#ifndef DALI_TOOLKIT_TEXTURE_MANAGER_IMPL_H
+#define DALI_TOOLKIT_TEXTURE_MANAGER_IMPL_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/animated-image-loading.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/integration-api/processor-interface.h>
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
+#include <dali/public-api/adaptor-framework/round-robin-container-view.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/rendering/geometry.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
+#include <dali-toolkit/internal/texture-manager/texture-cache-manager.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-type.h>
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+class ImageAtlasManager;
+typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
+class TextureAsyncLoadingHelper;
+
+/**
+ * The TextureManager provides a common Image loading API for Visuals.
+ *
+ * The TextureManager is responsible for providing sync, async,
+ * CPU time alpha masking, animated image loads.
+ *
+ * Texture caching is provided and performed by TextureCacheManager.
+ * TextureUploadObserver.LoadComplete called when async load completed.
+ */
+class TextureManager : public ConnectionTracker, public Integration::Processor
+{
+public:
+  // Copy enum and types and const values that TextureManager will use.
+  using TextureId         = TextureManagerType::TextureId;
+  using TextureCacheIndex = TextureManagerType::TextureCacheIndex;
+  using TextureHash       = TextureManagerType::TextureHash;
+
+  static constexpr TextureId         INVALID_TEXTURE_ID  = TextureManagerType::INVALID_TEXTURE_ID;
+  static constexpr TextureCacheIndex INVALID_CACHE_INDEX = TextureManagerType::INVALID_CACHE_INDEX;
+
+  using StorageType    = TextureManagerType::StorageType;
+  using LoadState      = TextureManagerType::LoadState;
+  using ReloadPolicy   = TextureManagerType::ReloadPolicy;
+  using MultiplyOnLoad = TextureManagerType::MultiplyOnLoad;
+  using TextureInfo    = TextureManagerType::TextureInfo;
+
+public:
+  struct MaskingData
+  {
+    MaskingData();
+    ~MaskingData() = default;
+
+    VisualUrl                 mAlphaMaskUrl;
+    TextureManager::TextureId mAlphaMaskId;
+    float                     mContentScaleFactor;
+    bool                      mCropToMask;
+    bool                      mPreappliedMasking;
+    bool                      mMaskImageLoadingFailed;
+  };
+  using MaskingDataPointer = std::unique_ptr<MaskingData>;
+
+  /**
+   * Class to provide lifecycle event on destruction of texture manager.
+   */
+  struct LifecycleObserver
+  {
+    /**
+     * Called shortly before the texture manager is destroyed.
+     */
+    virtual void TextureManagerDestroyed() = 0;
+  };
+
+  /**
+   * Constructor.
+   *
+   * @param[in] loadYuvPlanes Whether we allow to load YuvPlanes or not. Default is false.
+   */
+  TextureManager(bool loadYuvPlanes = false);
+
+  /**
+   * Destructor.
+   */
+  ~TextureManager() override;
+
+  // TextureManager Main API:
+
+  /**
+   * @brief Requests an frame of animated image load.
+   *
+   * The parameters are used to specify how the animated image is loaded.
+   * The observer has the LoadComplete method called when the load is ready.
+   *
+   * @param[in]  url                   The URL of the image to load
+   * @param[in]  animatedImageLoading  The AnimatedImageLoading that contain the animated image information
+   * @param[in]  frameIndex            The frame index to load.
+   * @param[out] textureId             The textureId of the frame
+   * @param[in, out] maskInfo          Mask info structure
+   * @param[in]  desiredSize           The size the image is likely to appear at. This can be set to 0, 0 for automatic
+   * @param[in]  fittingMode           The FittingMode to use
+   * @param[in]  samplingMode          The SamplingMode to use
+   * @param[in]  synchronousLoading    true if the frame should be loaded synchronously
+   * @param[in]  textureObserver       The client object should inherit from this and provide the "LoadCompleted" virtual.
+   *                                   This is called when an image load completes (or fails).
+   * @param[in,out] preMultiplyOnLoad  True if the image color should be multiplied by it's alpha. Set to false if the
+   *                                   image has no alpha channel
+   *
+   * @return                           The texture set containing the frame of animated image, or empty if still loading.
+   */
+  TextureSet LoadAnimatedImageTexture(const VisualUrl&                url,
+                                      Dali::AnimatedImageLoading      animatedImageLoading,
+                                      const uint32_t                  frameIndex,
+                                      TextureManager::TextureId&      textureId,
+                                      MaskingDataPointer&             maskInfo,
+                                      const Dali::ImageDimensions&    desiredSize,
+                                      const Dali::FittingMode::Type   fittingMode,
+                                      const Dali::SamplingMode::Type  samplingMode,
+                                      const bool                      synchronousLoading,
+                                      TextureUploadObserver*          textureObserver,
+                                      TextureManager::MultiplyOnLoad& preMultiplyOnLoad);
+
+  /**
+   * @brief Requests an image load of the given URL to get PixelBuffer.
+   *
+   * The parameters are used to specify how the image is loaded.
+   * The observer has the LoadComplete method called when the load is ready.
+   *
+   * @param[in] url                   The URL of the image to load
+   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in] synchronousLoading    true if the URL should be loaded synchronously
+   * @param[in] textureObserver       The client object should inherit from this and provide the "LoadCompleted" virtual.
+   *                                  This is called when an image load completes (or fails).
+   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
+   * @param[in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the
+   *                                  image has no alpha channel
+   *
+   * @return                          The pixel buffer containing the image, or empty if still loading.
+   */
+  Devel::PixelBuffer LoadPixelBuffer(
+    const VisualUrl&                url,
+    const Dali::ImageDimensions&    desiredSize,
+    const Dali::FittingMode::Type   fittingMode,
+    const Dali::SamplingMode::Type  samplingMode,
+    const bool                      synchronousLoading,
+    TextureUploadObserver*          textureObserver,
+    const bool                      orientationCorrection,
+    TextureManager::MultiplyOnLoad& preMultiplyOnLoad);
+
+  /**
+   * @brief Requests an image load of the given URL.
+   *
+   * The parameters are used to specify how the image is loaded.
+   * The observer has the LoadComplete method called when the load is ready.
+   *
+   * When the client has finished with the Texture, Remove() should be called.
+   *
+   * @param[in] url                   The URL of the image to load
+   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in, out] maskInfo         Mask info structure
+   * @param[in] synchronousLoading    true if the URL should be loaded synchronously
+   * @param[in, out] textureId        The textureId of the URL. It is also be used to check the previous textureId
+   *                                  what requestor had. It will be used only ReloadPolicy::FORCED for now.
+   * @param[out] textureRect          The rectangle within the texture atlas that this URL occupies,
+   *                                  this is the rectangle in normalized coordinates.
+   * @param[out] textureRectSize      The rectangle within the texture atlas that this URL occupies,
+   *                                  this is the same rectangle in pixels.
+   * @param[in,out] atlasingStatus    Set to true to attempt atlasing. If atlasing fails, the image will still
+   *                                  be loaded, and marked successful, but this will be set to false.
+   *                                  If atlasing succeeds, this will be set to true.
+   * @param[out] loadingStatus        The loading status of the texture
+   * @param[in] textureObserver       The client object should inherit from this and provide the "LoadCompleted" virtual.
+   *                                  This is called when an image load completes (or fails).
+   * @param[in] atlasObserver         This is used if the texture is atlased, and will be called instead of
+   *                                  textureObserver.LoadCompleted
+   * @param[in] imageAtlasManager     The atlas manager to use for atlasing textures
+   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
+   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
+   * @param[in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the
+   *                                  image has no alpha channel
+   *
+   * @return                          The texture set containing the image, or empty if still loading.
+   */
+  TextureSet LoadTexture(
+    const VisualUrl&                   url,
+    const Dali::ImageDimensions&       desiredSize,
+    const Dali::FittingMode::Type      fittingMode,
+    const Dali::SamplingMode::Type     samplingMode,
+    MaskingDataPointer&                maskInfo,
+    const bool                         synchronousLoading,
+    TextureManager::TextureId&         textureId,
+    Dali::Vector4&                     textureRect,
+    Dali::ImageDimensions&             textureRectSize,
+    bool&                              atlasingStatus,
+    bool&                              loadingStatus,
+    TextureUploadObserver*             textureObserver,
+    AtlasUploadObserver*               atlasObserver,
+    ImageAtlasManagerPtr               imageAtlasManager,
+    const bool                         orientationCorrection,
+    const TextureManager::ReloadPolicy reloadPolicy,
+    TextureManager::MultiplyOnLoad&    preMultiplyOnLoad);
+
+  /**
+   * Add an observer to the object.
+   * @param[in] observer The observer to add.
+   */
+  void AddObserver(TextureManager::LifecycleObserver& observer);
+
+  /**
+   * Remove an observer from the object
+   * @pre The observer has already been added.
+   * @param[in] observer The observer to remove.
+   */
+  void RemoveObserver(TextureManager::LifecycleObserver& observer);
+
+  /**
+   * @brief Returns the geometry associated with texture.
+   * @param[in] textureId Id of the texture
+   * @param[out] frontElements number of front elements
+   * @param[out] backElements number of back elements
+   * @return Returns valid geometry object
+   */
+  Geometry GetRenderGeometry(const TextureManager::TextureId textureId, uint32_t& frontElements, uint32_t& backElements);
+
+  /**
+   * @brief Returns the textureSet in texture manager.
+   * @param[in] textureId Id of the texture
+   * @return The textureSet in texture manager. These textures include YUV textures or images and masks.
+   */
+  TextureSet GetTextureSet(const TextureManager::TextureId textureId);
+
+  /**
+   * @brief Returns the textureSet in texture manager.
+   * @param[in] textureInfo the information of the texture
+   * @return The textureSet in texture manager. These textures include YUV textures or images and masks.
+   */
+  TextureSet GetTextureSet(const TextureManager::TextureInfo& textureInfo);
+
+public:
+  // API list that need to access TextureCacheManager.
+
+  /**
+   * @copydoc TextureCacheManager::GetVisualUrl
+   */
+  inline VisualUrl GetVisualUrl(const TextureManager::TextureId textureId)
+  {
+    return mTextureCacheManager.GetVisualUrl(textureId);
+  }
+
+  /**
+   * @copydoc TextureCacheManager::GetTexture
+   */
+  inline Texture GetTexture(const TextureManager::TextureId textureId)
+  {
+    return mTextureCacheManager.GetTexture(textureId);
+  }
+
+  /**
+   * @copydoc TextureCacheManager::RemoveExternalTexture
+   */
+  inline TextureSet RemoveExternalTexture(const std::string& url)
+  {
+    return mTextureCacheManager.RemoveExternalTexture(url);
+  }
+
+  /**
+   * @copydoc TextureCacheManager::RemoveEncodedImageBuffer
+   */
+  inline EncodedImageBuffer RemoveEncodedImageBuffer(const std::string& url)
+  {
+    return mTextureCacheManager.RemoveEncodedImageBuffer(url);
+  }
+
+  /**
+   * @copydoc TextureCacheManager::UseExternalResource
+   */
+  inline void UseExternalResource(const VisualUrl& url)
+  {
+    mTextureCacheManager.UseExternalResource(url);
+  }
+
+  /**
+   * @copydoc TextureCacheManager::GetEncodedImageBuffer
+   */
+  inline EncodedImageBuffer GetEncodedImageBuffer(const std::string& url)
+  {
+    return mTextureCacheManager.GetEncodedImageBuffer(url);
+  }
+
+  /**
+   * @copydoc TextureCacheManager::AddExternalTexture
+   */
+  inline std::string AddExternalTexture(const TextureSet& texture, const bool preMultiplied = false)
+  {
+    return mTextureCacheManager.AddExternalTexture(texture, preMultiplied);
+  }
+
+  /**
+   * @copydoc TextureCacheManager::AddEncodedImageBuffer
+   */
+  inline std::string AddEncodedImageBuffer(const EncodedImageBuffer& encodedImageBuffer)
+  {
+    return mTextureCacheManager.AddEncodedImageBuffer(encodedImageBuffer);
+  }
+
+public: // Load Request API
+  /**
+   * @brief Requests an image load of the given URL.
+   *
+   * The parameters are used to specify how the image is loaded.
+   * The observer has the LoadComplete method called when the load is ready.
+   *
+   * When the client has finished with the Texture, Remove() should be called.
+   *
+   * @param[in] url                   The URL of the image to load
+   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in] observer              The client object should inherit from this and provide the "LoadCompleted" virtual.
+   *                                  This is called when an image load completes (or fails).
+   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
+   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
+   * @param[in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the image has no alpha channel
+   * @param[in] synchronousLoading    True if the frame should be loaded synchronously. If you skip this parameter,
+   *                                  default is false.
+   * @return                          A TextureId to use as a handle to reference this Texture
+   */
+  TextureId RequestLoad(
+    const VisualUrl&                   url,
+    const ImageDimensions&             desiredSize,
+    const Dali::FittingMode::Type      fittingMode,
+    const Dali::SamplingMode::Type     samplingMode,
+    TextureUploadObserver*             observer,
+    const bool                         orientationCorrection,
+    const TextureManager::ReloadPolicy reloadPolicy,
+    TextureManager::MultiplyOnLoad&    preMultiplyOnLoad,
+    const bool                         synchronousLoading = false);
+
+private: // Internal Load Request API
+  /**
+   * @brief Requests an image load of the given URL, when the texture has
+   * have loaded, it will perform a blend with the image mask, and upload
+   * the blended texture.
+   *
+   * The parameters are used to specify how the image is loaded.
+   * The observer has the LoadComplete method called when the load is ready.
+   *
+   * When the client has finished with the Texture, Remove() should be called.
+   *
+   * @param[in] url                   The URL of the image to load
+   * @param[in] maskTextureId         The texture id of an image to mask this with
+   *                                  (can be INVALID if no masking required)
+   * @param[in] previousTextureId     The texture id of an image which the requestor already has before
+   * @param[in] contentScale          The scale factor to apply to the image before masking
+   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in] cropToMask            Only used with masking, this will crop the scaled image to the mask size.
+   *                                  If false, then the mask will be scaled to fit the image before being applied.
+   * @param[in] observer              The client object should inherit from this and provide the "LoadCompleted"
+   *                                  virtual.
+   *                                  This is called when an image load completes (or fails).
+   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
+   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
+   * @param[in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the
+   *                                  image has no alpha channel
+   * @param[in] synchronousLoading    True if the frame should be loaded synchronously. If you skip this parameter,
+   *                                  default is false.
+   * @return                          A TextureId to use as a handle to reference this Texture
+   */
+  TextureId RequestLoad(
+    const VisualUrl&                   url,
+    const TextureManager::TextureId    maskTextureId,
+    const TextureManager::TextureId    previousTextureId,
+    const float                        contentScale,
+    const ImageDimensions&             desiredSize,
+    const Dali::FittingMode::Type      fittingMode,
+    const Dali::SamplingMode::Type     samplingMode,
+    const bool                         cropToMask,
+    TextureUploadObserver*             observer,
+    const bool                         orientationCorrection,
+    const TextureManager::ReloadPolicy reloadPolicy,
+    TextureManager::MultiplyOnLoad&    preMultiplyOnLoad,
+    const bool                         synchronousLoading = false);
+
+  /**
+   * @brief Requests a masking image to be loaded. This mask is not uploaded to GL,
+   * instead, it is stored in CPU memory, and can be used for CPU blending.
+   * @param[in] maskUrl            The URL of the mask image to load
+   * @param[in] storageType        Whether the pixel data is stored in the cache or uploaded to the GPU
+   * @param[in] synchronousLoading True if the frame should be loaded synchronously. If you skip this parameter,
+   *                               default is false.
+   * @return                       A TextureId to use as a handle to reference this mask Texture
+   */
+  TextureId RequestMaskLoad(
+    const VisualUrl&                  maskUrl,
+    const TextureManager::StorageType storageType,
+    const bool                        synchronousLoading = false);
+
+  /**
+   * @brief Requests an image load of the given URL, when the texture has
+   * have loaded, if there is a valid maskTextureId, it will perform a
+   * CPU blend with the mask, and upload the blend texture.
+   *
+   * The parameters are used to specify how the image is loaded.
+   * The observer has the LoadComplete method called when the load is ready.
+   *
+   * When the client has finished with the Texture, Remove() should be called.
+   *
+   * @param[in] url                   The URL of the image to load
+   * @param[in] maskTextureId         The texture id of an image to use as a mask. If no mask is required, then set
+   *                                  to INVALID_TEXTURE_ID
+   * @param[in] previousTextureId     The texture id of an image which the requestor already has before. It will be used
+   *                                  when reloadPolicy is FORCED.
+   * @param[in] contentScale          The scaling factor to apply to the content when masking
+   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in] cropToMask            Whether to crop the target after masking, or scale the mask to the image before
+   *                                  masking.
+   * @param[in] storageType           Whether the pixel data is stored in the cache or uploaded to the GPU
+   * @param[in] observer              The client object should inherit from this and provide the "LoadCompleted"
+   *                                  virtual.
+   *                                  This is called when an image load completes (or fails).
+   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
+   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
+   * @param[in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if
+   *                                  there is no alpha
+   * @param[in] animatedImageLoading  The AnimatedImageLoading to load animated image
+   * @param[in] frameIndex            The frame index of a frame to be loaded frame
+   * @param[in] synchronousLoading    True if the frame should be loaded synchronously. If you skip this parameter,
+   *                                  default is false.
+   * @return                          A TextureId to use as a handle to reference this Texture
+   */
+  TextureId RequestLoadInternal(
+    const VisualUrl&                   url,
+    const TextureManager::TextureId    maskTextureId,
+    const TextureManager::TextureId    previousTextureId,
+    const float                        contentScale,
+    const Dali::ImageDimensions&       desiredSize,
+    const Dali::FittingMode::Type      fittingMode,
+    const Dali::SamplingMode::Type     samplingMode,
+    const bool                         cropToMask,
+    const TextureManager::StorageType  storageType,
+    TextureUploadObserver*             observer,
+    const bool                         orientationCorrection,
+    const TextureManager::ReloadPolicy reloadPolicy,
+    TextureManager::MultiplyOnLoad&    preMultiplyOnLoad,
+    Dali::AnimatedImageLoading         animatedImageLoading,
+    const uint32_t                     frameIndex,
+    const bool                         synchronousLoading);
+
+  /**
+   * @brief Load a new image synchronously.
+   * @param[in] url                   The URL of the image to load
+   * @param[in] desiredSize           The size the image is likely to appear at.
+   *                                  This can be set to 0,0 for automatic
+   * @param[in] fittingMode           The FittingMode to use
+   * @param[in] samplingMode          The SamplingMode to use
+   * @param[in] orientationCorrection Whether to use image metadata to rotate or flip the image,
+   *                                  e.g., from portrait to landscape
+   * @param[in] loadYuvPlanes         True if the image should be loaded as yuv planes
+   * @param[out] pixelBuffers         The image pixelBuffer
+   * @return PixelBuffer of loaded image.
+   */
+  void LoadImageSynchronously(
+    const VisualUrl&                 url,
+    const Dali::ImageDimensions&     desiredSize,
+    const Dali::FittingMode::Type    fittingMode,
+    const Dali::SamplingMode::Type   samplingMode,
+    const bool                       orientationCorrection,
+    const bool                       loadYuvPlanes,
+    std::vector<Devel::PixelBuffer>& pixelBuffers);
+
+public: // Remove Request API
+  /**
+   * @brief Request Remove a Texture from the TextureManager.
+   *
+   * Textures are cached and therefore only the removal of the last
+   * occurrence of a Texture will cause its removal internally.
+   *
+   * @param[in] textureId The ID of the Texture to remove.
+   * @param[in] textureObserver The texture observer.
+   */
+  void RequestRemove(const TextureManager::TextureId textureId, TextureUploadObserver* textureObserver);
+
+private:
+  /**
+   * @brief Remove a Texture from the TextureManager.
+   *
+   * Textures are cached and therefore only the removal of the last
+   * occurrence of a Texture will cause its removal internally.
+   *
+   * @param[in] textureId The ID of the Texture to remove.
+   */
+  void Remove(const TextureManager::TextureId textureId);
+
+  /**
+   * @brief Initiate remove of texture queued.
+   */
+  void ProcessRemoveQueue();
+
+private:
+  // Load and queue
+
+  /**
+   * Structure to hold info about a texture load queued during NotifyObservers
+   */
+  struct QueueElement
+  {
+    QueueElement(const TextureManager::TextureId textureId, TextureUploadObserver* observer)
+    : mTextureId(textureId),
+      mObserver(observer)
+    {
+    }
+
+    TextureManager::TextureId mTextureId; ///< The texture id of the requested load.
+    TextureUploadObserver*    mObserver;  ///< Observer of texture load.
+  };
+
+  /**
+   * @brief Initiate a load or queue load if NotifyObservers is invoking callbacks
+   * @param[in] textureInfo The TextureInfo struct associated with the Texture
+   * @param[in] observer The observer wishing to observe the texture upload
+   */
+  void LoadOrQueueTexture(TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer);
+
+  /**
+   * @brief Queue a texture load to be subsequently handled by ProcessLoadQueue.
+   * @param[in] textureInfo The TextureInfo struct associated with the Texture
+   * @param[in] observer The observer wishing to observe the texture upload
+   */
+  void QueueLoadTexture(const TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer);
+
+  /**
+   * @brief Used internally to initiate a load.
+   * @param[in] textureInfo The TextureInfo struct associated with the Texture
+   * @param[in] observer The observer wishing to observe the texture upload
+   */
+  void LoadTexture(TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer);
+
+  /**
+   * @brief Initiate load of textures queued whilst NotifyObservers invoking callbacks.
+   */
+  void ProcessLoadQueue();
+
+  /**
+   * Add the observer to the observer list
+   * @param[in] textureInfo The TextureInfo struct associated with the texture
+   * @param[in] observer The observer wishing to observe the texture upload
+   */
+  void ObserveTexture(TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer);
+
+  /**
+   * @brief Performs Post-Load steps.
+   * @param[in] textureInfo  The struct associated with this Texture
+   * @param[in] pixelBuffers The image pixelBuffer
+   * @return    True if successful
+   */
+  void PostLoad(TextureManager::TextureInfo& textureInfo, std::vector<Devel::PixelBuffer>& pixelBuffers);
+
+  /**
+   * Check if there is a texture waiting to be masked. If there
+   * is then apply this mask and upload it.
+   * @param[in] maskTextureInfo The texture info of the mask that has just loaded.
+   */
+  void CheckForWaitingTexture(TextureManager::TextureInfo& maskTextureInfo);
+
+  /**
+   * Apply the mask to the pixelBuffer.
+   * @param[in] textureInfo The information of texture to apply the mask to
+   * @param[in] maskTextureId The texture id of the mask.
+   */
+  void ApplyMask(TextureManager::TextureInfo& textureInfo, const TextureManager::TextureId maskTextureId);
+
+  /**
+   * Upload the texture specified in pixelBuffer to the appropriate location
+   * @param[in] pixelBuffers The image data to upload
+   * @param[in] textureInfo  The texture info containing the location to store the data to.
+   */
+  void UploadTextures(std::vector<Devel::PixelBuffer>& pixelBuffers, TextureManager::TextureInfo& textureInfo);
+
+  /**
+   * Notify the current observers that the texture upload is complete,
+   * then remove the observers from the list.
+   * @param[in] textureInfo The struct associated with this Texture
+   * @param[in] success If the pixel data was retrieved successfully and uploaded to GPU
+   */
+  void NotifyObservers(TextureManager::TextureInfo& textureInfo, const bool success);
+
+  /**
+   * Call LoadComplete to the observer.
+   * @param[in] observer    The client object should inherit from this and provide the "LoadCompleted"
+   * @param[in] textureInfo The struct associated with this Texture
+   * @param[in] success     If the pixel data was retrieved successfully and uploaded to GPU
+   */
+  void EmitLoadComplete(TextureUploadObserver* observer, TextureManager::TextureInfo& textureInfo, const bool success);
+
+  /**
+   * @brief Remove observer in textureInfo
+   *
+   * @param textureInfo The struct associated with this Texture.
+   * @param observer The observer wishing to remove.
+   */
+  void RemoveTextureObserver(TextureManager::TextureInfo& textureInfo, TextureUploadObserver* observer);
+
+public:
+  /**
+   * @brief Common method to handle loading completion.
+   * TextureAsyncLoadingHelper will call this API After async loading finished.
+   * @param[in] textureId    The ID of the texture load complete.
+   * @param[in] pixelBuffers The loaded image data
+   */
+  void AsyncLoadComplete(const TextureManager::TextureId textureId, std::vector<Devel::PixelBuffer>& pixelBuffers);
+
+protected: // Implementation of Processor
+  /**
+   * @copydoc Dali::Integration::Processor::Process()
+   */
+  void Process(bool postProcessor) override;
+
+  /**
+   * @copydoc Dali::Integration::Processor::GetProcessorName()
+   */
+  std::string_view GetProcessorName() const override
+  {
+    return "TextureManager";
+  }
+
+private:
+  /**
+   * Deleted copy constructor.
+   */
+  TextureManager(const TextureManager&) = delete;
+
+  /**
+   * Deleted assignment operator.
+   */
+  TextureManager& operator=(const TextureManager& rhs) = delete;
+
+  /**
+   * This is called by the TextureManagerUploadObserver when an observer is destroyed.
+   * We use the callback to know when to remove an observer from our notify list.
+   * @param[in] observer The observer that generated the callback
+   */
+  void ObserverDestroyed(TextureUploadObserver* observer);
+
+private:                                    // Member Variables:
+  TextureCacheManager mTextureCacheManager; ///< Manager the life-cycle and caching of Textures
+
+  std::unique_ptr<TextureAsyncLoadingHelper> mAsyncLoader;        ///< The Asynchronous image loader used to provide all local async loads
+  Dali::Vector<LifecycleObserver*>           mLifecycleObservers; ///< Lifecycle observers of texture manager
+
+  Dali::Vector<QueueElement> mLoadQueue;             ///< Queue of textures to load after NotifyObservers
+  TextureManager::TextureId  mLoadingQueueTextureId; ///< TextureId when it is loading. it causes Load Textures to be queued.
+
+  Dali::Vector<TextureManager::TextureId> mRemoveQueue; ///< Queue of textures to remove at PostProcess. It will be cleared after PostProcess.
+
+  const bool mLoadYuvPlanes;             ///< A global flag to specify if the image should be loaded as yuv planes
+  bool       mRemoveProcessorRegistered; ///< Flag if remove processor registered or not.
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXTURE_MANAGER_IMPL_H
diff --git a/dali-toolkit/internal/texture-manager/texture-manager-type.h b/dali-toolkit/internal/texture-manager/texture-manager-type.h
new file mode 100644
index 0000000..1f54fb7
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-manager-type.h
@@ -0,0 +1,319 @@
+#ifndef DALI_TOOLKIT_TEXTURE_MANAGER_TYPE_H
+#define DALI_TOOLKIT_TEXTURE_MANAGER_TYPE_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/animated-image-loading.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/math/vector4.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+/**
+ * @brief Define common type, enum, and struct that both TextureManager and TextureCacheManager will use.
+ */
+namespace TextureManagerType
+{
+// Enum!
+
+enum TextureCacheIndexType
+{
+  TEXTURE_CACHE_INDEX_FREE_LIST  = 0, ///< Only for FreeList. We should not use this for TextureCacheIndex.
+  TEXTURE_CACHE_INDEX_TYPE_LOCAL = 1,
+  TEXTURE_CACHE_INDEX_TYPE_TEXTURE,
+  TEXTURE_CACHE_INDEX_TYPE_BUFFER,
+  TEXTURE_CACHE_INDEX_TYPE_MASKING, ///< Not implemented yet.
+  TEXTURE_CACHE_INDEX_TYPE_MAX = 7, ///< Maximum number of cache type we can use.
+};
+
+// Union!
+
+/**
+ * @brief standard union type of texture index.
+ * Due to the FreeList can only use for uint32_t and we need to seperate
+ * each index per container type, we can only hold maximum 2^28 textures
+ * at the same time.
+ *      0 ~   2^28 - 1 : index of FreeList. TextureCacheManager will not use it.
+ *   2^28 ~ 2*2^28 - 1 : index of mTextureInfoContainer, the main texture container.
+ * 2*2^28 ~ 3*2^28 - 1 : index of mExternalTextures.
+ * 3*2^28 ~ 4*2^28 - 1 : index of mEncodedBufferTextures.
+ */
+union TextureCacheIndexData
+{
+  TextureCacheIndexData() = default;
+  constexpr TextureCacheIndexData(const uint32_t index)
+  : indexValue(index)
+  {
+  }
+  constexpr explicit TextureCacheIndexData(const int32_t index)
+  : indexValue(static_cast<uint32_t>(index))
+  {
+  }
+  constexpr TextureCacheIndexData(const TextureCacheIndexType& type, const uint32_t index)
+  : detailValue{index, type}
+  {
+  }
+  constexpr TextureCacheIndexData(const TextureCacheIndexData& indexData)
+  : indexValue(indexData.indexValue)
+  {
+  }
+  constexpr TextureCacheIndexData(TextureCacheIndexData&& indexData)
+  : indexValue(indexData.indexValue)
+  {
+  }
+
+  TextureCacheIndexData& operator=(const uint32_t index)
+  {
+    indexValue = index;
+    return *this;
+  }
+  TextureCacheIndexData& operator=(const TextureCacheIndexData& rhs)
+  {
+    indexValue = rhs.indexValue;
+    return *this;
+  }
+  TextureCacheIndexData& operator=(TextureCacheIndexData&& rhs)
+  {
+    indexValue = rhs.indexValue;
+    return *this;
+  }
+
+  constexpr operator uint32_t() const
+  {
+    return indexValue;
+  }
+  constexpr operator uint32_t()
+  {
+    return indexValue;
+  }
+  constexpr explicit operator int32_t() const
+  {
+    return static_cast<int32_t>(indexValue);
+  }
+  constexpr explicit operator int32_t()
+  {
+    return static_cast<int32_t>(indexValue);
+  }
+
+  // Return detailValue.index. - the real index of datailValue.type container
+  constexpr inline uint32_t GetIndex() const
+  {
+    return detailValue.index;
+  }
+
+  inline constexpr bool operator==(const TextureCacheIndexData& rhs)
+  {
+    return indexValue == rhs.indexValue;
+  }
+  inline constexpr bool operator<(const TextureCacheIndexData& rhs)
+  {
+    return indexValue < rhs.indexValue;
+  }
+
+  // Data area
+  uint32_t indexValue;
+  struct
+  {
+    unsigned int          index : 28;
+    TextureCacheIndexType type : 4;
+  } detailValue;
+};
+
+// Typedef:
+
+typedef int32_t               TextureId;         ///< The TextureId type. This is used as a handle to refer to a particular Texture.
+typedef TextureCacheIndexData TextureCacheIndex; ///< The TextureCacheIndex type. This is used as a handles to refer to a particular Texture in TextureCacheManager.
+                                                 ///  Note : For the same Texture, TextureId will not be changed. But TextureCacheIndex can be chaged when TextureCacheManager
+                                                 ///  Internal container informations changed by Append or Remove.
+typedef size_t TextureHash;                      ///< The type used to store the hash used for Texture caching.
+
+// Constant values:
+
+static constexpr TextureId         INVALID_TEXTURE_ID  = -1; ///< Used to represent a null TextureId or error
+static constexpr TextureCacheIndex INVALID_CACHE_INDEX = 0;  ///< Used to represent a null TextureCacheIndex or error
+
+// Enum classes:
+
+/**
+ * Whether the pixel data should be kept in TextureManager, returned with pixelBuffer or uploaded for rendering
+ */
+enum class StorageType
+{
+  KEEP_PIXEL_BUFFER,   ///< Keep loaded pixel buffer inside of texture manager without making texture. This could be used for inside pixel process like mask image.
+  RETURN_PIXEL_BUFFER, ///< Return loaded pixel buffer without making texture.
+                       ///  Because a pixel buffer cannot be used multiple texture, this pixel buffer only cached during loading, and is removed after loading is finished.
+  KEEP_TEXTURE,        ///< Keep loaded texture inside of texture manager. This could be used for pixel processing like GPU masking.
+  UPLOAD_TO_TEXTURE    ///< Loaded image will be uploaded to texture and the texture will be returned.
+};
+
+/**
+ * @brief The LoadState Enumeration represents the current state of a particular Texture's life-cycle.
+ */
+enum class LoadState
+{
+  NOT_STARTED,      ///< Default
+  LOADING,          ///< Loading has been started, but not finished.
+  LOAD_FINISHED,    ///< Loading has finished. (for CPU storage only)
+  WAITING_FOR_MASK, ///< Loading has finished, but waiting for mask image
+  MASK_APPLYING,    ///< Loading has finished, Mask is applying
+  MASK_APPLIED,     ///< Loading has finished, Mask is applyied by GPU
+  UPLOADED,         ///< Uploaded and ready. (For GPU upload only)
+  CANCELLED,        ///< Removed before loading completed
+  MASK_CANCELLED,   ///< Removed before mask applying completed
+  LOAD_FAILED       ///< Async loading failed, e.g. connection problem
+};
+
+/**
+ * @brief Types of reloading policies
+ */
+enum class ReloadPolicy
+{
+  CACHED = 0, ///< Loads cached texture if it exists.
+  FORCED      ///< Forces reloading of texture.
+};
+
+/**
+ * @brief Whether to multiply alpha into color channels on load
+ */
+enum class MultiplyOnLoad
+{
+  LOAD_WITHOUT_MULTIPLY = 0, ///< Don't modify the image
+  MULTIPLY_ON_LOAD           ///< Multiply alpha into color channels on load
+};
+
+// Structs:
+
+/**
+ * @brief This struct is used to manage the life-cycle of Texture loading and caching.
+ */
+struct TextureInfo
+{
+  TextureInfo(const TextureId                   textureId,
+              const TextureId                   maskTextureId,
+              const VisualUrl&                  url,
+              const Dali::ImageDimensions&      desiredSize,
+              const float                       scaleFactor,
+              const Dali::FittingMode::Type     fittingMode,
+              const Dali::SamplingMode::Type    samplingMode,
+              const bool                        loadSynchronously,
+              const bool                        cropToMask,
+              const TextureHash                 hash,
+              const bool                        orientationCorrection,
+              const bool                        preMultiplyOnLoad,
+              const Dali::AnimatedImageLoading& animatedImageLoading,
+              const uint32_t                    frameIndex,
+              const bool                        loadYuvPlanes)
+  : url(url),
+    desiredSize(desiredSize),
+    useSize(desiredSize),
+    textureId(textureId),
+    maskTextureId(maskTextureId),
+    hash(hash),
+    scaleFactor(scaleFactor),
+    referenceCount(1),
+    loadState(LoadState::NOT_STARTED),
+    fittingMode(fittingMode),
+    samplingMode(samplingMode),
+    storageType(StorageType::UPLOAD_TO_TEXTURE),
+    animatedImageLoading(animatedImageLoading),
+    frameIndex(frameIndex),
+    frameCount(0u),
+    frameInterval(0u),
+    loadSynchronously(loadSynchronously),
+    cropToMask(cropToMask),
+    orientationCorrection(true),
+    preMultiplyOnLoad(preMultiplyOnLoad),
+    preMultiplied(preMultiplyOnLoad),
+    loadYuvPlanes(loadYuvPlanes)
+  {
+    isAnimatedImageFormat = (animatedImageLoading) ? true : false;
+  }
+
+  /**
+   * Container type used to store all observer clients of this Texture
+   */
+  typedef Dali::Vector<TextureUploadObserver*> ObserverListType;
+
+  ObserverListType           observerList;         ///< Container used to store all observer clients of this Texture
+  Dali::Devel::PixelBuffer   pixelBuffer;          ///< The PixelBuffer holding the image data (May be empty after upload)
+  std::vector<Dali::Texture> textures;             ///< The Textures
+  VisualUrl                  url;                  ///< The URL of the image
+  Dali::ImageDimensions      desiredSize;          ///< The size requested
+  Dali::ImageDimensions      useSize;              ///< The size used
+  TextureId                  textureId;            ///< The TextureId associated with this Texture
+  TextureId                  maskTextureId;        ///< The mask TextureId to be applied on load
+  TextureHash                hash;                 ///< The hash used to cache this Texture
+  float                      scaleFactor;          ///< The scale factor to apply to the Texture when masking
+  int32_t                    referenceCount;       ///< The reference count of clients using this Texture
+  LoadState                  loadState;            ///< The load state showing the load progress of the Texture
+  Dali::FittingMode::Type    fittingMode : 3;      ///< The requested FittingMode
+  Dali::SamplingMode::Type   samplingMode : 3;     ///< The requested SamplingMode
+  StorageType                storageType;          ///< CPU storage / GPU upload;
+  Dali::AnimatedImageLoading animatedImageLoading; ///< AnimatedImageLoading that contains animated image information.
+  uint32_t                   frameIndex;           ///< Frame index that be loaded, in case of animated image
+  uint32_t                   frameCount;           ///< Total frame count of input animated image. If this variable is not 0, this textureInfo is for animated image file format.
+  uint32_t                   frameInterval;        ///< Time interval between this frame and next frame of animated image.
+
+  bool loadSynchronously : 1;     ///< True if synchronous loading was requested
+  bool cropToMask : 1;            ///< True if the image should be cropped to the mask size.
+  bool orientationCorrection : 1; ///< True if the image should be rotated to match exif orientation data
+  bool preMultiplyOnLoad : 1;     ///< True if the image's color should be multiplied by it's alpha
+  bool preMultiplied : 1;         ///< True if the image's color was multiplied by it's alpha
+  bool isAnimatedImageFormat : 1; ///< true if the image is requested from animated image visual.
+  bool loadYuvPlanes : 1;         ///< true if the image should be loaded as yuv planes
+};
+
+/**
+ * @brief This struct is used to manage the life-cycle of ExternalTexture url.
+ */
+struct ExternalTextureInfo
+{
+  ExternalTextureInfo(const TextureId   textureId,
+                      const TextureSet& textureSet,
+                      const bool        preMultiplied)
+  : textureId(textureId),
+    textureSet(textureSet),
+    referenceCount(1),
+    preMultiplied(preMultiplied)
+  {
+  }
+
+  TextureId  textureId;         ///< The TextureId associated with this ExternalTexture
+  TextureSet textureSet;        ///< The external texture
+  int32_t    referenceCount;    ///< The reference count of clients using this ExternalTexture
+  bool       preMultiplied : 1; ///< True if the image's color was multiplied by it's alpha
+};
+
+} // namespace TextureManagerType
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXTURE_MANAGER_TYPE_H
diff --git a/dali-toolkit/internal/texture-manager/texture-upload-observer.cpp b/dali-toolkit/internal/texture-manager/texture-upload-observer.cpp
new file mode 100644
index 0000000..08a6df1
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-upload-observer.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/texture-manager/texture-manager-type.h> // for INVALUD_TEXTURE_ID
+
+namespace Dali
+{
+namespace Toolkit
+{
+TextureUploadObserver::TextureInformation::TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const bool preMultiplied)
+: returnType(returnType),
+  textureId(textureId),
+  textureSet(textureSet),
+  preMultiplied(preMultiplied),
+  pixelBuffer(),
+  url()
+{
+}
+
+TextureUploadObserver::TextureInformation::TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const std::string& url, const bool preMultiplied)
+: returnType(returnType),
+  textureId(textureId),
+  textureSet(textureSet),
+  preMultiplied(preMultiplied),
+  pixelBuffer(),
+  url(url)
+{
+}
+
+TextureUploadObserver::TextureInformation::TextureInformation(const ReturnType returnType, Devel::PixelBuffer pixelBuffer, const std::string& url, const bool preMultiplied)
+: returnType(returnType),
+  textureId(Internal::TextureManagerType::INVALID_TEXTURE_ID),
+  textureSet(),
+  preMultiplied(preMultiplied),
+  pixelBuffer(pixelBuffer),
+  url(url)
+{
+}
+
+TextureUploadObserver::TextureInformation::TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const uint32_t frameCount, const uint32_t interval, const bool preMultiplied)
+: returnType(returnType),
+  textureId(textureId),
+  textureSet(textureSet),
+  preMultiplied(preMultiplied),
+  pixelBuffer(),
+  url(),
+  frameCount(frameCount),
+  interval(interval)
+{
+}
+
+TextureUploadObserver::TextureUploadObserver()
+{
+}
+
+TextureUploadObserver::~TextureUploadObserver()
+{
+  if(!mDestructionSignal.Empty())
+  {
+    mDestructionSignal.Emit(this);
+  }
+}
+
+TextureUploadObserver::DestructionSignalType& TextureUploadObserver::DestructionSignal()
+{
+  return mDestructionSignal;
+}
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/texture-manager/texture-upload-observer.h b/dali-toolkit/internal/texture-manager/texture-upload-observer.h
new file mode 100644
index 0000000..3685a55
--- /dev/null
+++ b/dali-toolkit/internal/texture-manager/texture-upload-observer.h
@@ -0,0 +1,107 @@
+#ifndef DALI_TOOLKIT_INTERNAL_TEXTURE_UPLOAD_OBSERVER_H
+#define DALI_TOOLKIT_INTERNAL_TEXTURE_UPLOAD_OBSERVER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/public-api/rendering/texture-set.h>
+#include <dali/public-api/signals/dali-signal.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/visual-url.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+/**
+ * @brief Base class used to observe the upload status of a texture.
+ *
+ * Derived class must implement the LoadComplete method which is
+ * executed once the texture is ready to draw.
+ */
+class TextureUploadObserver
+{
+public:
+  typedef Signal<void(TextureUploadObserver*)> DestructionSignalType; ///< Signal prototype for the Destruction Signal.
+
+  enum class ReturnType
+  {
+    PIXEL_BUFFER = 0,
+    TEXTURE,
+    ANIMATED_IMAGE_TEXTURE
+  };
+
+  struct TextureInformation
+  {
+    TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const bool preMultiplied);
+    TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const std::string& url, const bool preMultiplied);
+    TextureInformation(const ReturnType returnType, Devel::PixelBuffer pixelBuffer, const std::string& url, const bool preMultiplied);
+    TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const uint32_t frameCount, const uint32_t interval, const bool preMultiplied);
+
+    TextureInformation();
+
+    ReturnType         returnType;    ///< Returned Texture type.
+    int32_t            textureId;     ///< The textureId of the loaded texture in the TextureManager
+    TextureSet         textureSet;    ///< The TextureSet containing the Texture
+    bool               preMultiplied; ///< True if the image had pre-multiplied alpha applied
+    Devel::PixelBuffer pixelBuffer;   ///< The PixelBuffer of the loaded image.
+    std::string_view   url;           ///< The url address of the loaded image.
+    uint32_t           frameCount{0}; ///< The frameCount of the animated image
+    uint32_t           interval{0};   ///< Time interval between currently loaded frame and next frame.
+  };
+
+public:
+  /**
+   * @brief Constructor.
+   */
+  TextureUploadObserver();
+
+  /**
+   * @brief Virtual destructor.
+   */
+  virtual ~TextureUploadObserver();
+
+  /**
+   * The action to be taken once the async load has finished.
+   * And in case of texture loading, this method is called after uploading.
+   * This should be overridden by the deriving class.
+   *
+   * @param[in] loadSuccess True if the texture load was successful (i.e. the resource is available). If false, then the resource failed to load. In future, this will automatically upload a "broken" image.
+   * @param[in] textureInformation Structure that contains loaded texture information.
+   */
+  virtual void LoadComplete(bool loadSuccess, TextureInformation textureInformation) = 0;
+
+  /**
+   * @brief Returns the destruction signal.
+   * This is emitted when the observer is destroyed.
+   * This is used by the observer notifier to mark this observer as destroyed (IE. It no longer needs notifying).
+   */
+  DestructionSignalType& DestructionSignal();
+
+private:
+  DestructionSignalType mDestructionSignal; ///< The destruction signal emitted when the observer is destroyed.
+};
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_INTERNAL_TEXTURE_UPLOAD_OBSERVER_H
diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index 31dd157..b1d70c6 100644
--- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,7 +212,7 @@ void CubeTransitionEffect::Initialize()
 void CubeTransitionEffect::OnSceneConnection(int depth)
 {
   Geometry geometry = VisualFactoryCache::CreateQuadGeometry();
-  Shader   shader   = Shader::New(SHADER_CUBE_TRANSITION_EFFECT_VERT, SHADER_CUBE_TRANSITION_EFFECT_FRAG);
+  Shader   shader   = Shader::New(SHADER_CUBE_TRANSITION_EFFECT_VERT, SHADER_CUBE_TRANSITION_EFFECT_FRAG, Shader::Hint::NONE, "CUBE_TRANSITION_EFFECT");
 
   TextureSet textureSet = TextureSet::New();
 
diff --git a/dali-toolkit/internal/transition/slide-transition-impl.cpp b/dali-toolkit/internal/transition/slide-transition-impl.cpp
index 21b9977..71bcdc3 100644
--- a/dali-toolkit/internal/transition/slide-transition-impl.cpp
+++ b/dali-toolkit/internal/transition/slide-transition-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/object/type-registry.h>
 #include <limits>
 
@@ -105,10 +106,10 @@ void SlideTransition::OnPlay()
                           Vector2(currentPosition.x + ((mDirection.x < 0.0f) ? size.x / 2.0f : -size.x / 2.0f),
                                   currentPosition.y + ((mDirection.y < 0.0f) ? size.y / 2.0f : -size.y / 2.0f));
 
-  float xScale = (mDirection.x == 0.0f) ? std::numeric_limits<float>::max()
-                                        : ((mDirection.x < 0.0f) ? checkPosition.x : windowSize.x - checkPosition.x) / std::abs(mDirection.x);
-  float yScale = (mDirection.y == 0.0f) ? std::numeric_limits<float>::max()
-                                        : ((mDirection.y < 0.0f) ? checkPosition.y : windowSize.y - checkPosition.y) / std::abs(mDirection.y);
+  float xScale = (Dali::EqualsZero(mDirection.x)) ? std::numeric_limits<float>::max()
+                                                  : ((mDirection.x < 0.0f) ? checkPosition.x : windowSize.x - checkPosition.x) / std::abs(mDirection.x);
+  float yScale = (Dali::EqualsZero(mDirection.y)) ? std::numeric_limits<float>::max()
+                                                  : ((mDirection.y < 0.0f) ? checkPosition.y : windowSize.y - checkPosition.y) / std::abs(mDirection.y);
 
   Vector2 displacement = mDirection * std::min(xScale, yScale);
 
diff --git a/dali-toolkit/internal/transition/transition-base-impl.cpp b/dali-toolkit/internal/transition/transition-base-impl.cpp
old mode 100644
new mode 100755
index f8aed47..1c3ca66
--- a/dali-toolkit/internal/transition/transition-base-impl.cpp
+++ b/dali-toolkit/internal/transition/transition-base-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,20 +36,6 @@ namespace Internal
 {
 namespace
 {
-static constexpr float OPACITY_TRANSPARENT = 0.0f;
-
-const Dali::AlphaFunction DEFAULT_ALPHA_FUNCTION(Dali::AlphaFunction::DEFAULT);
-
-const Property::Map PROPERTY_MAP_INDEPENDENT_CONTROL{
-  {Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER},
-  {Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER},
-  {Dali::Actor::Property::POSITION_USES_ANCHOR_POINT, true},
-  {Dali::Actor::Property::INHERIT_POSITION, false},
-  {Dali::Actor::Property::INHERIT_ORIENTATION, false},
-  {Dali::Actor::Property::INHERIT_SCALE, false},
-  {Dali::Actor::Property::COLOR_MODE, Dali::ColorMode::USE_OWN_COLOR},
-};
-
 Property::Map GetOriginalProperties(Dali::Toolkit::Control control)
 {
   Property::Map propertyMap;
@@ -69,37 +55,6 @@ Property::Map GetOriginalProperties(Dali::Toolkit::Control control)
 
   return propertyMap;
 }
-
-/**
- * @brief Computes and center position by using transform properties.
- * @param[in] anchorPoint anchorPoint of an actor.
- * @param[in] positionUsesAnchorPoint positionUsesAnchorPoint of an actor.
- * @param[in] size size of an actor.
- * @param[in] scale scale of an actor.
- * @param[in] orientation orientation of an actor.
- */
-Vector3 CalculateCenterPosition(
-  const Vector3&    anchorPoint,
-  const bool        positionUsesAnchorPoint,
-  const Vector3&    size,
-  const Vector3&    scale,
-  const Quaternion& orientation)
-{
-  Vector3       centerPosition;
-  const Vector3 half(0.5f, 0.5f, 0.5f);
-  const Vector3 topLeft(0.0f, 0.0f, 0.5f);
-  // Calculate the center-point by applying the scale and rotation on the anchor point.
-  centerPosition = (half - anchorPoint) * size * scale;
-  centerPosition *= orientation;
-
-  // If the position is ignoring the anchor-point, then remove the anchor-point shift from the position.
-  if(!positionUsesAnchorPoint)
-  {
-    centerPosition -= (topLeft - anchorPoint) * size;
-  }
-  return centerPosition;
-}
-
 } // anonymous namespace
 
 TransitionBasePtr TransitionBase::New()
@@ -113,7 +68,7 @@ TransitionBasePtr TransitionBase::New()
 }
 
 TransitionBase::TransitionBase()
-: mAlphaFunction(DEFAULT_ALPHA_FUNCTION),
+: mAlphaFunction(Dali::AlphaFunction::DEFAULT),
   mTimePeriod(TimePeriod(0.0f)),
   mTransitionWithChild(false),
   mMoveTargetChildren(false),
@@ -161,7 +116,7 @@ void TransitionBase::TransitionWithChild(bool transitionWithChild)
 
 void TransitionBase::PreProcess(Dali::Animation animation)
 {
-  mAnimation           = animation;
+  mAnimation = animation;
   // Retrieve original property map of mTarget to backup and to reset after transition is finished.
   mOriginalPropertyMap = GetOriginalProperties(mTarget);
   mMoveTargetChildren  = false;
@@ -183,13 +138,20 @@ void TransitionBase::Play()
 
   // Set world transform and color to the target control to make it independent of the parent control and its transition.
   // The properties will be returned at the TransitionFinished() method.
-  Matrix     targetWorldTransform = GetWorldTransform(mTarget);
+  Matrix     targetWorldTransform = DevelActor::GetWorldTransform(mTarget);
   Vector3    targetPosition, targetScale;
   Quaternion targetOrientation;
   targetWorldTransform.GetTransformComponents(targetPosition, targetOrientation, targetScale);
-  Vector4 targetColor = GetWorldColor(mTarget);
+  Vector4 targetColor = DevelActor::GetWorldColor(mTarget);
+
+  mTarget[Dali::Actor::Property::ANCHOR_POINT]               = AnchorPoint::CENTER;
+  mTarget[Dali::Actor::Property::PARENT_ORIGIN]              = ParentOrigin::CENTER;
+  mTarget[Dali::Actor::Property::POSITION_USES_ANCHOR_POINT] = true;
+  mTarget[Dali::Actor::Property::INHERIT_POSITION]           = false;
+  mTarget[Dali::Actor::Property::INHERIT_ORIENTATION]        = false;
+  mTarget[Dali::Actor::Property::INHERIT_SCALE]              = false;
+  mTarget[Dali::Actor::Property::COLOR_MODE]                 = Dali::ColorMode::USE_OWN_COLOR;
 
-  mTarget.SetProperties(PROPERTY_MAP_INDEPENDENT_CONTROL);
   mTarget[Dali::Actor::Property::POSITION]    = targetPosition;
   mTarget[Dali::Actor::Property::SCALE]       = targetScale;
   mTarget[Dali::Actor::Property::ORIENTATION] = targetOrientation;
@@ -208,22 +170,18 @@ void TransitionBase::SetAnimation()
     return;
   }
 
-  // If this transition is not a transition from a Control to another Control
-  // and a transition effect to appear with delay,
-  // the mTarget should not be shown until delay seconds.
-  if(!IsPairTransition() && mIsAppearingTransition && mAnimation && mTimePeriod.delaySeconds > Dali::Math::MACHINE_EPSILON_10)
-  {
-    Dali::KeyFrames initialKeyframes = Dali::KeyFrames::New();
-    initialKeyframes.Add(0.0f, OPACITY_TRANSPARENT);
-    initialKeyframes.Add(1.0f, OPACITY_TRANSPARENT);
-    mAnimation.AnimateBetween(Property(mTarget, Dali::Actor::Property::OPACITY), initialKeyframes, TimePeriod(mTimePeriod.delaySeconds));
-  }
-
   for(uint32_t i = 0; i < mStartPropertyMap.Count(); ++i)
   {
     Property::Value* finishValue = mFinishPropertyMap.Find(mStartPropertyMap.GetKeyAt(i).indexKey);
     if(finishValue)
     {
+      // If this transition is appearing transition, this property keeps start value during delay.
+      // If multiple transitions are applied to this Control and others run before this transition,
+      // this property should keep start value until this transition starts.
+      if(!IsPairTransition() && IsAppearingTransition() && mTimePeriod.delaySeconds > Dali::Math::MACHINE_EPSILON_10)
+      {
+        mTarget.SetProperty(mStartPropertyMap.GetKeyAt(i).indexKey, mStartPropertyMap.GetValue(i));
+      }
       AnimateBetween(mTarget, mStartPropertyMap.GetKeyAt(i).indexKey, mStartPropertyMap.GetValue(i), *finishValue);
     }
   }
@@ -286,141 +244,6 @@ void TransitionBase::TransitionFinished()
   mAnimation.Reset();
 }
 
-Matrix TransitionBase::GetWorldTransform(Dali::Actor actor)
-{
-  enum InheritanceMode
-  {
-    DONT_INHERIT_TRANSFORM = 0,
-    INHERIT_POSITION       = 1,
-    INHERIT_SCALE          = 2,
-    INHERIT_ORIENTATION    = 4,
-    INHERIT_ALL            = INHERIT_POSITION | INHERIT_SCALE | INHERIT_ORIENTATION,
-  };
-
-  std::vector<Dali::Actor>     descentList;
-  std::vector<InheritanceMode> inheritanceModeList;
-  Dali::Actor                  currentActor = actor;
-  int                          inheritance  = 0;
-  do
-  {
-    inheritance = (static_cast<int>(currentActor.GetProperty<bool>(Dali::Actor::Property::INHERIT_ORIENTATION)) << 2) +
-                  (static_cast<int>(currentActor.GetProperty<bool>(Dali::Actor::Property::INHERIT_SCALE)) << 1) +
-                  static_cast<int>(currentActor.GetProperty<bool>(Dali::Actor::Property::INHERIT_POSITION));
-    inheritanceModeList.push_back(static_cast<InheritanceMode>(inheritance));
-    descentList.push_back(currentActor);
-    currentActor = currentActor.GetParent();
-  } while(inheritance != DONT_INHERIT_TRANSFORM && currentActor);
-
-  Matrix  worldMatrix;
-  Vector3 localPosition;
-  for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i)
-  {
-    Vector3    anchorPoint             = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::ANCHOR_POINT);
-    Vector3    parentOrigin            = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::PARENT_ORIGIN);
-    bool       positionUsesAnchorPoint = descentList[i].GetProperty<bool>(Dali::Actor::Property::POSITION_USES_ANCHOR_POINT);
-    Vector3    size                    = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::SIZE);
-    Vector3    actorPosition           = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::POSITION);
-    Quaternion localOrientation        = descentList[i].GetProperty<Quaternion>(Dali::Actor::Property::ORIENTATION);
-    Vector3    localScale              = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::SCALE);
-
-    Vector3 centerPosition = CalculateCenterPosition(anchorPoint, positionUsesAnchorPoint, size, localScale, localOrientation);
-    if(inheritanceModeList[i] != DONT_INHERIT_TRANSFORM && descentList[i].GetParent())
-    {
-      Matrix  localMatrix;
-      Vector3 parentSize = descentList[i + 1].GetProperty<Vector3>(Dali::Actor::Property::SIZE);
-      if(inheritanceModeList[i] == INHERIT_ALL)
-      {
-        localPosition = actorPosition + centerPosition + (parentOrigin - Vector3(0.5f, 0.5f, 0.5f)) * parentSize;
-        localMatrix.SetTransformComponents(localScale, localOrientation, localPosition);
-
-        //Update the world matrix
-        Matrix tempMatrix;
-        Matrix::Multiply(tempMatrix, localMatrix, worldMatrix);
-        worldMatrix = tempMatrix;
-      }
-      else
-      {
-        Vector3    parentPosition, parentScale;
-        Quaternion parentOrientation;
-        worldMatrix.GetTransformComponents(parentPosition, parentOrientation, parentScale);
-
-        if((inheritanceModeList[i] & INHERIT_SCALE) == 0)
-        {
-          //Don't inherit scale
-          localScale /= parentScale;
-        }
-
-        if((inheritanceModeList[i] & INHERIT_ORIENTATION) == 0)
-        {
-          //Don't inherit orientation
-          parentOrientation.Invert();
-          localOrientation = parentOrientation * localOrientation;
-        }
-
-        if((inheritanceModeList[i] & INHERIT_POSITION) == 0)
-        {
-          localMatrix.SetTransformComponents(localScale, localOrientation, Vector3::ZERO);
-          Matrix tempMatrix;
-          Matrix::Multiply(tempMatrix, localMatrix, worldMatrix);
-          worldMatrix = tempMatrix;
-          worldMatrix.SetTranslation(actorPosition + centerPosition);
-        }
-        else
-        {
-          localPosition = actorPosition + centerPosition + (parentOrigin - Vector3(0.5f, 0.5f, 0.5f)) * parentSize;
-          localMatrix.SetTransformComponents(localScale, localOrientation, localPosition);
-          Matrix tempMatrix;
-          Matrix::Multiply(tempMatrix, localMatrix, worldMatrix);
-          worldMatrix = tempMatrix;
-        }
-      }
-    }
-    else
-    {
-      localPosition = actorPosition + centerPosition;
-      worldMatrix.SetTransformComponents(localScale, localOrientation, localPosition);
-    }
-  }
-
-  return worldMatrix;
-}
-
-Vector4 TransitionBase::GetWorldColor(Dali::Actor actor)
-{
-  std::vector<Dali::Actor>     descentList;
-  std::vector<Dali::ColorMode> inheritanceModeList;
-  Dali::Actor                  currentActor = actor;
-  Dali::ColorMode              inheritance  = Dali::ColorMode::USE_OWN_MULTIPLY_PARENT_ALPHA;
-  do
-  {
-    inheritance = currentActor.GetProperty<Dali::ColorMode>(Dali::Actor::Property::COLOR_MODE);
-    inheritanceModeList.push_back(inheritance);
-    descentList.push_back(currentActor);
-    currentActor = currentActor.GetParent();
-  } while(inheritance != Dali::ColorMode::USE_OWN_COLOR && currentActor);
-
-  Vector4 worldColor;
-  for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i)
-  {
-    if(inheritanceModeList[i] == USE_OWN_COLOR || i == descentList.size() - 1)
-    {
-      worldColor = descentList[i].GetProperty<Vector4>(Dali::Actor::Property::COLOR);
-    }
-    else if(inheritanceModeList[i] == USE_OWN_MULTIPLY_PARENT_ALPHA)
-    {
-      Vector4 ownColor = descentList[i].GetProperty<Vector4>(Dali::Actor::Property::COLOR);
-      worldColor       = Vector4(ownColor.r, ownColor.g, ownColor.b, ownColor.a * worldColor.a);
-    }
-    else if(inheritanceModeList[i] == USE_OWN_MULTIPLY_PARENT_COLOR)
-    {
-      Vector4 ownColor = descentList[i].GetProperty<Vector4>(Dali::Actor::Property::COLOR);
-      worldColor *= ownColor;
-    }
-  }
-
-  return worldColor;
-}
-
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/transition/transition-base-impl.h b/dali-toolkit/internal/transition/transition-base-impl.h
index 409eb60..73e30dd 100644
--- a/dali-toolkit/internal/transition/transition-base-impl.h
+++ b/dali-toolkit/internal/transition/transition-base-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TRANSITION_BASE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,9 +101,32 @@ public:
     mIsAppearingTransition = appearingTransition;
   }
 
-protected:
+  /**
+   * @brief Returns whether this transition is appearing transition or not
+   */
+  bool IsAppearingTransition() const
+  {
+    return mIsAppearingTransition;
+  }
+
+  /**
+   * @brief Returns whether this transition is a transition from a Control to another Control or effect to appearing or disappearing.
+   */
+  bool IsPairTransition() const
+  {
+    return mIsPairTransition;
+  }
 
   /**
+   * @brief Returns target which will be transition.
+   */
+  const Dali::Toolkit::Control GetTarget() const
+  {
+    return mTarget;
+  }
+
+protected:
+  /**
    * @brief Set property map which will be used as a animation start properties.
    * @param[in] propertyMap propertyMap that will be used as a start value of transition.
    */
@@ -139,18 +162,6 @@ protected:
   }
 
   /**
-   * @brief Gets world transform of input Actor.
-   * @param[in] actor actor for get world transform.
-   */
-  Matrix GetWorldTransform(Dali::Actor actor);
-
-  /**
-   * @brief Gets world color of input Actor.
-   * @param[in] actor actor for get world color.
-   */
-  Vector4 GetWorldColor(Dali::Actor actor);
-
-  /**
    * @brief Returns whether this transition will be applied to children of target or not.
    */
   bool IsTransitionWithChild() const
@@ -159,14 +170,6 @@ protected:
   }
 
   /**
-   * @brief Returns whether this transition is appearing transition or not
-   */
-  bool IsAppearingTransition() const
-  {
-    return mIsAppearingTransition;
-  }
-
-  /**
    * @brief Set whether this transition is a transition from a Control to another Control or effect to appearing or disappearing.
    * @param[in] pairTransition True if this transition is appearing transition.
    */
@@ -175,14 +178,6 @@ protected:
     mIsPairTransition = pairTransition;
   }
 
-  /**
-   * @brief Returns whether this transition is a transition from a Control to another Control or effect to appearing or disappearing.
-   */
-  bool IsPairTransition() const
-  {
-    return mIsPairTransition;
-  }
-
 protected:
   /**
    * Construct a new TransitionBase.
@@ -248,19 +243,19 @@ private:
   }
 
 private:
-  Dali::Toolkit::Control       mTarget;              ///< Target that will be animated.
-  Dali::Actor                  mCopiedActor;         ///< Copied View that will replace mTarget during transition
-  Dali::Animation              mAnimation;           ///< Property animations for the transition of mTarget
-  AlphaFunction                mAlphaFunction;       ///< Alpha function that will applied for the property animation
-  Property::Map                mStartPropertyMap;    ///< Start properties to be animated. (world transform)
-  Property::Map                mFinishPropertyMap;   ///< Finish properties to be animated. (world transform)
-  Property::Map                mOriginalPropertyMap; ///< Original properties of mTarget to be used to restore after the transition is finished.
-  Dali::TimePeriod             mTimePeriod;          ///< TimePeriod of transition
-  bool                         mTransitionWithChild; ///< True, if mTarget transition is inherit to its child Actors.
-                                                     ///< If this is false, the child Actors are moved to the child of mCopiedActor that will have original properties of target Actor during Transition.
-  bool mMoveTargetChildren;                          ///< Flag, if mTransitionWithChild is false and mTarget has children than True.
-  bool mIsAppearingTransition;                       ///< True, if this transition is appearing transition.
-  bool mIsPairTransition;                            ///< True, if this transition is started from a Control to another Control.
+  Dali::Toolkit::Control mTarget;              ///< Target that will be animated.
+  Dali::Actor            mCopiedActor;         ///< Copied View that will replace mTarget during transition
+  Dali::Animation        mAnimation;           ///< Property animations for the transition of mTarget
+  AlphaFunction          mAlphaFunction;       ///< Alpha function that will applied for the property animation
+  Property::Map          mStartPropertyMap;    ///< Start properties to be animated. (world transform)
+  Property::Map          mFinishPropertyMap;   ///< Finish properties to be animated. (world transform)
+  Property::Map          mOriginalPropertyMap; ///< Original properties of mTarget to be used to restore after the transition is finished.
+  Dali::TimePeriod       mTimePeriod;          ///< TimePeriod of transition
+  bool                   mTransitionWithChild; ///< True, if mTarget transition is inherit to its child Actors.
+                                               ///< If this is false, the child Actors are moved to the child of mCopiedActor that will have original properties of target Actor during Transition.
+  bool mMoveTargetChildren;                    ///< Flag, if mTransitionWithChild is false and mTarget has children than True.
+  bool mIsAppearingTransition;                 ///< True, if this transition is appearing transition.
+  bool mIsPairTransition;                      ///< True, if this transition is started from a Control to another Control.
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/transition/transition-impl.cpp b/dali-toolkit/internal/transition/transition-impl.cpp
index 2cbd14d..332c9e0 100644
--- a/dali-toolkit/internal/transition/transition-impl.cpp
+++ b/dali-toolkit/internal/transition/transition-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 
 namespace Dali
 {
@@ -34,13 +35,7 @@ namespace Toolkit
 {
 namespace Internal
 {
-namespace
-{
-const Dali::AlphaFunction DEFAULT_ALPHA_FUNCTION(Dali::AlphaFunction::DEFAULT);
-
-} // anonymous namespace
-
-TransitionPtr Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod)
+TransitionPtr Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, bool useDestinationTarget, TimePeriod timePeriod)
 {
   float delaySeconds = timePeriod.delaySeconds;
   if(delaySeconds < 0.0f)
@@ -56,7 +51,7 @@ TransitionPtr Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Cont
     durationSeconds = 0.0f;
   }
 
-  TransitionPtr transition = new Transition(source, destination, TimePeriod(delaySeconds, durationSeconds));
+  TransitionPtr transition = new Transition(source, destination, useDestinationTarget, TimePeriod(delaySeconds, durationSeconds));
 
   // Second-phase construction
   transition->Initialize();
@@ -64,12 +59,14 @@ TransitionPtr Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Cont
   return transition;
 }
 
-Transition::Transition(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod)
+Transition::Transition(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, bool useDestinationTarget, TimePeriod timePeriod)
 : TransitionBase(),
+  mUseDestinationTarget(useDestinationTarget),
+  mOriginalSize(),
   mSourceControl(source),
   mDestinationControl(destination)
 {
-  SetTarget(destination);
+  SetTarget(mUseDestinationTarget ? destination : source);
   SetTimePeriod(timePeriod);
   SetPairTransition(true);
 }
@@ -80,7 +77,7 @@ Transition::~Transition()
 
 void Transition::OnPlay()
 {
-  Dali::Toolkit::Control sourceControl = mSourceControl.GetHandle();
+  Dali::Toolkit::Control sourceControl      = mSourceControl.GetHandle();
   Dali::Toolkit::Control destinationControl = mDestinationControl.GetHandle();
   if(!sourceControl || !sourceControl[Dali::Actor::Property::CONNECTED_TO_SCENE] ||
      !destinationControl || !destinationControl[Dali::Actor::Property::CONNECTED_TO_SCENE])
@@ -90,16 +87,15 @@ void Transition::OnPlay()
   }
 
   //Make startPropertyMap and finishPropertyMap to use for property animation.
-  Matrix     sourceWorldTransform = sourceControl[Dali::Actor::Property::WORLD_MATRIX];
+  Matrix     sourceWorldTransform = DevelActor::GetWorldTransform(sourceControl);
   Vector3    sourcePosition, sourceScale;
   Quaternion sourceOrientation;
   sourceWorldTransform.GetTransformComponents(sourcePosition, sourceOrientation, sourceScale);
 
-  Vector3    destinationPosition    = destinationControl[Dali::Actor::Property::POSITION];
-  Vector3    destinationScale       = destinationControl[Dali::Actor::Property::SCALE];
-  Quaternion destinationOrientation = destinationControl[Dali::Actor::Property::ORIENTATION];
-  Vector4    targetColor            = destinationControl[Dali::Actor::Property::COLOR];
-  Vector3    targetSize             = destinationControl[Dali::Actor::Property::SIZE];
+  Matrix     destinationWorldTransform = DevelActor::GetWorldTransform(destinationControl);
+  Vector3    destinationPosition, destinationScale;
+  Quaternion destinationOrientation;
+  destinationWorldTransform.GetTransformComponents(destinationPosition, destinationOrientation, destinationScale);
 
   Property::Map startPropertyMap;
   Property::Map finishPropertyMap;
@@ -114,29 +110,36 @@ void Transition::OnPlay()
   startPropertyMap.Insert(Dali::Actor::Property::SCALE, sourceScale);
   finishPropertyMap.Insert(Dali::Actor::Property::SCALE, destinationScale);
 
-  Vector4 sourceColor = sourceControl.GetCurrentProperty<Vector4>(Dali::Actor::Property::WORLD_COLOR);
+  Vector4 sourceColor      = DevelActor::GetWorldColor(sourceControl);
+  Vector4 destinationColor = DevelActor::GetWorldColor(destinationControl);
   startPropertyMap.Insert(Dali::Actor::Property::COLOR, sourceColor);
-  finishPropertyMap.Insert(Dali::Actor::Property::COLOR, targetColor);
+  finishPropertyMap.Insert(Dali::Actor::Property::COLOR, destinationColor);
 
   // Set animation for other properties if source and destination is different.
-  Vector3 sourceSize = sourceControl.GetCurrentProperty<Vector3>(Dali::Actor::Property::SIZE);
-  if(sourceSize != targetSize)
+  Vector3 sourceSize      = sourceControl[Dali::Actor::Property::SIZE];
+  Vector3 destinationSize = destinationControl[Dali::Actor::Property::SIZE];
+  if(sourceSize != destinationSize)
   {
     startPropertyMap.Insert(Dali::Actor::Property::SIZE, sourceSize);
-    finishPropertyMap.Insert(Dali::Actor::Property::SIZE, targetSize);
+    finishPropertyMap.Insert(Dali::Actor::Property::SIZE, destinationSize);
+    if(!mUseDestinationTarget)
+    {
+      mOriginalSize = GetTargetControl().GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+    }
   }
 
   SetStartPropertyMap(startPropertyMap);
   SetFinishPropertyMap(finishPropertyMap);
 
   // source View becomes transparent during transition.
+  Dali::Toolkit::Control waitingControl = GetWaitingControl();
   if(IsTransitionWithChild())
   {
-    sourceControl[Dali::Actor::Property::VISIBLE] = false;
+    waitingControl[Dali::Actor::Property::VISIBLE] = false;
   }
   else
   {
-    GetImplementation(sourceControl).SetTransparent(true);
+    GetImplementation(waitingControl).SetTransparent(true);
   }
 
   Dali::Animation animation = GetAnimation();
@@ -145,27 +148,82 @@ void Transition::OnPlay()
     DALI_LOG_ERROR("animation is still not initialized\n");
     return;
   }
-  Dali::Toolkit::DevelControl::CreateTransitions(destinationControl, animation, sourceControl, GetAlphaFunction(), GetTimePeriod());
+
+  mOriginalVisualProperties.clear();
+  std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>> destinationVisualProperties;
+  Dali::Toolkit::Control                                             targetControl   = GetTargetControl();
+  Internal::Control&                                                 internalControl = Toolkit::Internal::GetImplementation(targetControl);
+  Internal::Control::Impl&                                           controlDataImpl = Toolkit::Internal::Control::Impl::Get(internalControl);
+  controlDataImpl.CreateTransitions(mOriginalVisualProperties, destinationVisualProperties, sourceControl, destinationControl);
+
+  for(uint32_t index = 0; index < mOriginalVisualProperties.size(); ++index)
+  {
+    Dali::Property::Map source      = mOriginalVisualProperties[index].second;
+    Dali::Property::Map destination = destinationVisualProperties[index].second;
+    for(size_t i = 0; i < source.Count(); ++i)
+    {
+      Dali::Property property = DevelControl::GetVisualProperty(targetControl, mOriginalVisualProperties[index].first, source.GetKeyAt(i));
+      if(GetTimePeriod().delaySeconds > 0.0f)
+      {
+        Dali::KeyFrames initialKeyframes = Dali::KeyFrames::New();
+        initialKeyframes.Add(0.0f, source.GetValue(i));
+        animation.AnimateBetween(property, initialKeyframes, TimePeriod(GetTimePeriod().delaySeconds));
+      }
+      Dali::KeyFrames keyframes = Dali::KeyFrames::New();
+      keyframes.Add(0.0f, source.GetValue(i));
+      keyframes.Add(1.0f, destination.GetValue(i));
+      animation.AnimateBetween(property, keyframes, GetAlphaFunction(), GetTimePeriod());
+    }
+  }
 }
 
 void Transition::OnFinished()
 {
-  Dali::Toolkit::Control sourceControl = mSourceControl.GetHandle();
-  if(!sourceControl)
+  Dali::Toolkit::Control waitingControl = GetWaitingControl();
+  if(!waitingControl)
   {
     return;
   }
 
+  if(!mUseDestinationTarget)
+  {
+    Dali::Toolkit::Control target         = GetTargetControl();
+    Dali::Animation        resetAnimation = Dali::Animation::New(0.0f);
+    if(mOriginalSize != target.GetProperty<Vector3>(Dali::Actor::Property::SIZE))
+    {
+      // Use Animation not to notify size change and not to change width and height resize policy.
+      resetAnimation.AnimateTo(Dali::Property(target, Dali::Actor::Property::SIZE), mOriginalSize);
+    }
+    resetAnimation.Play();
+
+    Dali::Toolkit::Control   targetControl   = GetTargetControl();
+    Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(targetControl);
+    Internal::Control::Impl& controlDataImpl = Toolkit::Internal::Control::Impl::Get(internalControl);
+    controlDataImpl.UpdateVisualProperties(mOriginalVisualProperties);
+  }
+
   if(IsTransitionWithChild())
   {
-    sourceControl[Dali::Actor::Property::VISIBLE] = true;
+    waitingControl[Dali::Actor::Property::VISIBLE] = true;
   }
   else
   {
-    GetImplementation(sourceControl).SetTransparent(false);
+    GetImplementation(waitingControl).SetTransparent(false);
   }
 }
 
+Dali::Toolkit::Control Transition::GetTargetControl()
+{
+  Dali::Toolkit::Control target = mUseDestinationTarget ? mDestinationControl.GetHandle() : mSourceControl.GetHandle();
+  return target;
+}
+
+Dali::Toolkit::Control Transition::GetWaitingControl()
+{
+  Dali::Toolkit::Control waitingControl = mUseDestinationTarget ? mSourceControl.GetHandle() : mDestinationControl.GetHandle();
+  return waitingControl;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/transition/transition-impl.h b/dali-toolkit/internal/transition/transition-impl.h
index 6aa1374..22cc01f 100644
--- a/dali-toolkit/internal/transition/transition-impl.h
+++ b/dali-toolkit/internal/transition/transition-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TRANSITION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include <dali-toolkit/public-api/transition/transition.h>
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/weak-handle.h>
 
 namespace Dali
@@ -41,10 +42,11 @@ public:
    * @brief Create a new Transition object.
    * @param[in] source A source control of this transition.
    * @param[in] destination A destination control of this transition.
+   * @param[in] useDestinationTarget True if this transition uses destination control as target.
    * @param[in] timePeriod The timePeriod of the animation.
    * @return A smart-pointer to the newly allocated Transition.
    */
-  static TransitionPtr New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod);
+  static TransitionPtr New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, bool useDestinationTarget, TimePeriod timePeriod);
 
 protected:
   /**
@@ -63,6 +65,7 @@ protected:
    */
   Transition(Dali::Toolkit::Control source,
              Dali::Toolkit::Control destination,
+             bool                   useDestinationTarget,
              TimePeriod             timePeriod);
 
   /**
@@ -78,8 +81,15 @@ private:
   Transition& operator=(const Transition& rhs);
 
 private:
-  WeakHandle<Dali::Toolkit::Control> mSourceControl;
-  WeakHandle<Dali::Toolkit::Control> mDestinationControl;
+  Dali::Toolkit::Control GetTargetControl();
+  Dali::Toolkit::Control GetWaitingControl();
+
+private:
+  bool                                                               mUseDestinationTarget;
+  Vector3                                                            mOriginalSize;
+  std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>> mOriginalVisualProperties;
+  WeakHandle<Dali::Toolkit::Control>                                 mSourceControl;
+  WeakHandle<Dali::Toolkit::Control>                                 mDestinationControl;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/transition/transition-set-impl.cpp b/dali-toolkit/internal/transition/transition-set-impl.cpp
index fd019b6..d1b16af 100644
--- a/dali-toolkit/internal/transition/transition-set-impl.cpp
+++ b/dali-toolkit/internal/transition/transition-set-impl.cpp
@@ -37,6 +37,13 @@ namespace
 // Signals
 static constexpr std::string_view SIGNAL_FINISHED = "finished";
 
+static constexpr float OPACITY_TRANSPARENT = 0.0f;
+
+float CustomAlphaFunction(float progress)
+{
+  return (progress >= 1.0f) ? 1.0f : 0.0f;
+}
+
 BaseHandle Create()
 {
   return Dali::Toolkit::TransitionSet::New();
@@ -117,9 +124,46 @@ void TransitionSet::TransitionPreProcess()
 
 void TransitionSet::TransitionStart()
 {
+  std::vector<std::pair<Dali::Actor, float>> minimumDelays;
   for(auto&& transition : mTransitions)
   {
     transition->Play();
+
+    // If target Control has appearing transition, the target will not be rendered during delay.
+    // And if the Control has multiple transitions, the target will not be rendered during minimum delay of the transitions.
+    // Here we can find minimum delay of each target.
+    if(!transition->IsPairTransition() && transition->IsAppearingTransition())
+    {
+      bool found = false;
+      for(uint32_t index = 0; index < minimumDelays.size(); ++index)
+      {
+        if(minimumDelays[index].first == transition->GetTarget())
+        {
+          minimumDelays[index].second = std::min(minimumDelays[index].second, transition->GetTimePeriod().delaySeconds);
+          found = true;
+          break;
+        }
+      }
+      if(!found)
+      {
+        minimumDelays.push_back(std::pair<Dali::Actor, float>(transition->GetTarget(), transition->GetTimePeriod().delaySeconds));
+      }
+    }
+  }
+
+  // If the target has delay that is larger than 0, hide the target during minimum delay.
+  // The custom alpha function make the target hide just during delay.
+  for(auto&& delay : minimumDelays)
+  {
+    if(delay.second > Dali::Math::MACHINE_EPSILON_10)
+    {
+      Dali::KeyFrames initialKeyframes = Dali::KeyFrames::New();
+      initialKeyframes.Add(0.0f, OPACITY_TRANSPARENT);
+      initialKeyframes.Add(1.0f, delay.first.GetProperty<float>(Dali::Actor::Property::OPACITY));
+
+      AlphaFunction alpha(&CustomAlphaFunction);
+      mAnimation.AnimateBetween(Property(delay.first, Dali::Actor::Property::OPACITY), initialKeyframes, alpha, TimePeriod(delay.second));
+    }
   }
 
   mAnimation.FinishedSignal().Connect(this, &TransitionSet::TransitionFinished);
diff --git a/dali-toolkit/internal/transition/transition-set-impl.h b/dali-toolkit/internal/transition/transition-set-impl.h
index eb9962d..ff7d60e 100644
--- a/dali-toolkit/internal/transition/transition-set-impl.h
+++ b/dali-toolkit/internal/transition/transition-set-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TRANSITION_SET_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/processor-interface.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/signals/connection-tracker.h>
 
@@ -110,6 +111,14 @@ protected: // Implementation of Processor
    */
   void Process(bool postProcessor) override;
 
+  /**
+   * @copydoc Dali::Integration::Processor::GetProcessorName()
+   */
+  std::string_view GetProcessorName() const override
+  {
+    return "TransitionSet";
+  }
+
 protected:
   /**
    * Construct a new TransitionSet.
diff --git a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp
index ef55fd8..0835552 100644
--- a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp
+++ b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,8 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(7); // Start point/color, end point/color, rotate center/angle, offset
+
 DALI_ENUM_TO_STRING_TABLE_BEGIN(GRADIENT_TYPE)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::DevelAnimatedGradientVisual::GradientType, LINEAR)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::DevelAnimatedGradientVisual::GradientType, RADIAL)
@@ -461,7 +463,7 @@ void AnimatedGradientVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -589,10 +591,12 @@ void AnimatedGradientVisual::DoCreateInstancePropertyMap(Property::Map& map) con
 {
 }
 
-Shader AnimatedGradientVisual::CreateShader()
+Shader AnimatedGradientVisual::GetOrCreateShader()
 {
   Shader shader;
 
+  VisualFactoryCache::ShaderType shaderType = GetShaderType(mGradientType, mUnitType, mSpreadType);
+
   std::string tagUnit;
   std::string tagGrad;
   std::string tagSpread;
@@ -647,33 +651,28 @@ Shader AnimatedGradientVisual::CreateShader()
   vert = "#define " + tagUnit + "\n" + SHADER_ANIMATED_GRADIENT_VISUAL_SHADER_VERT.data();
   frag = "#define " + tagGrad + "\n" + "#define " + tagSpread + "\n" + SHADER_ANIMATED_GRADIENT_VISUAL_SHADER_FRAG.data();
 
-  shader = Shader::New(vert, frag);
+  shader = mFactoryCache.GenerateAndSaveShader(shaderType, vert, frag);
   return shader;
 }
 
 void AnimatedGradientVisual::OnInitialize()
 {
-  Geometry                       geometry   = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
-  VisualFactoryCache::ShaderType shaderType = GetShaderType(mGradientType, mUnitType, mSpreadType);
-  Shader                         shader     = mFactoryCache.GetShader(shaderType);
-  if(!shader)
-  {
-    shader = CreateShader();
-    mFactoryCache.SaveShader(shaderType, shader);
-  }
+  Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
+  Shader   shader   = GetOrCreateShader();
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = VisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
-  mImpl->mRenderer.RegisterProperty(UNIFORM_START_POINT_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::START_POSITION, START_POSITION_NAME));
-  mImpl->mRenderer.RegisterProperty(UNIFORM_START_COLOR_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::START_COLOR, START_COLOR_NAME));
-  mImpl->mRenderer.RegisterProperty(UNIFORM_END_POINT_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::END_POSITION, END_POSITION_NAME));
-  mImpl->mRenderer.RegisterProperty(UNIFORM_END_COLOR_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::END_COLOR, END_COLOR_NAME));
-  mImpl->mRenderer.RegisterProperty(UNIFORM_ROTATE_CENTER_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::ROTATE_CENTER, ROTATE_CENTER_NAME));
-  mImpl->mRenderer.RegisterProperty(UNIFORM_ROTATE_ANGLE_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, ROTATE_AMOUNT_NAME));
-  mImpl->mRenderer.RegisterProperty(UNIFORM_OFFSET_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::OFFSET, OFFSET_NAME));
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_START_POINT_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::START_POSITION, START_POSITION_NAME));
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_START_COLOR_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::START_COLOR, START_COLOR_NAME));
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_END_POINT_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::END_POSITION, END_POSITION_NAME));
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_END_COLOR_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::END_COLOR, END_COLOR_NAME));
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_ROTATE_CENTER_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::ROTATE_CENTER, ROTATE_CENTER_NAME));
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_ROTATE_ANGLE_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::ROTATE_AMOUNT, ROTATE_AMOUNT_NAME));
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_OFFSET_NAME, GetStartValue(mValueMap, Toolkit::DevelAnimatedGradientVisual::Property::OFFSET, OFFSET_NAME));
 
   //Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 } //namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h
index 70e9925..d16099f 100644
--- a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h
+++ b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ANIMATED_GRADIENT_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -243,11 +243,11 @@ private:
   void SetupGradientAnimationData(const Property::Map& propertyMap);
 
   /**
-   * @brief Create new shader
+   * @brief Get or Create new shader
    *
    * return A Shader which made by non-animated properties
    */
-  Shader CreateShader();
+  Shader GetOrCreateShader();
 
   // Undefined
   AnimatedGradientVisual(const AnimatedGradientVisual& gradientRenderer);
diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp
index da54e1e..6dac0e7 100644
--- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,13 @@
  */
 
 // CLASS HEADER
-#include "animated-image-visual.h"
+#include <dali-toolkit/internal/visuals/animated-image/animated-image-visual.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
 #include <memory>
 
 // INTERNAL INCLUDES
@@ -31,6 +33,7 @@
 #include <dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h>
 #include <dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h>
 #include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
@@ -46,6 +49,28 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(5); // ltr, wrap, pixel area, crop to mask, mask texture ratio
+
+// fitting modes
+DALI_ENUM_TO_STRING_TABLE_BEGIN(FITTING_MODE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::FittingMode, SHRINK_TO_FIT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::FittingMode, SCALE_TO_FILL)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::FittingMode, FIT_WIDTH)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::FittingMode, FIT_HEIGHT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::FittingMode, DEFAULT)
+DALI_ENUM_TO_STRING_TABLE_END(FITTING_MODE)
+
+// sampling modes
+DALI_ENUM_TO_STRING_TABLE_BEGIN(SAMPLING_MODE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::SamplingMode, BOX)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::SamplingMode, NEAREST)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::SamplingMode, LINEAR)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::SamplingMode, BOX_THEN_NEAREST)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::SamplingMode, BOX_THEN_LINEAR)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::SamplingMode, NO_FILTER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::SamplingMode, DONT_CARE)
+DALI_ENUM_TO_STRING_TABLE_END(SAMPLING_MODE)
+
 // stop behavior
 DALI_ENUM_TO_STRING_TABLE_BEGIN(STOP_BEHAVIOR)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::Toolkit::DevelImageVisual::StopBehavior, CURRENT_FRAME)
@@ -61,8 +86,27 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(WRAP_MODE)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::WrapMode, MIRRORED_REPEAT)
 DALI_ENUM_TO_STRING_TABLE_END(WRAP_MODE)
 
-const Vector4  FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
-constexpr auto LOOP_FOREVER = -1;
+// load policies
+DALI_ENUM_TO_STRING_TABLE_BEGIN(LOAD_POLICY)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::Toolkit::ImageVisual::LoadPolicy, IMMEDIATE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::Toolkit::ImageVisual::LoadPolicy, ATTACHED)
+DALI_ENUM_TO_STRING_TABLE_END(LOAD_POLICY)
+
+// release policies
+DALI_ENUM_TO_STRING_TABLE_BEGIN(RELEASE_POLICY)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::Toolkit::ImageVisual::ReleasePolicy, DETACHED)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::Toolkit::ImageVisual::ReleasePolicy, DESTROYED)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::Toolkit::ImageVisual::ReleasePolicy, NEVER)
+DALI_ENUM_TO_STRING_TABLE_END(RELEASE_POLICY)
+
+static constexpr uint32_t SINGLE_IMAGE_COUNT = 1u;
+static constexpr uint32_t FIRST_FRAME_INDEX  = 0u;
+static constexpr uint16_t MINIMUM_CACHESIZE  = 1;
+static constexpr Vector4  FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
+static constexpr auto     LOOP_FOREVER = -1;
+static constexpr auto     FIRST_LOOP   = 0u;
+
+constexpr uint32_t TEXTURE_COUNT_FOR_GPU_ALPHA_MASK = 2u;
 
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gAnimImgLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_ANIMATED_IMAGE");
@@ -74,18 +118,15 @@ Debug::Filter* gAnimImgLogFilter = Debug::Filter::New(Debug::NoLogging, false, "
  *
  *   | New
  *   |   DoSetProperties()
- *   |   LoadFirstBatch()
- *   |     new cache
- *   |       cache->LoadBatch()
+ *   |   OnInitialize()
+ *   |     CreateImageCache()
  *   |
  *   | DoSetOnScene()
  *   |   PrepareTextureSet()
  *   |     cache->FirstFrame()
- *   |   CreateRenderer()    (Doesn't become ready until first frame loads)
- *   |   StartFirstFrame()
  *   |
  *   | FrameReady(textureSet)
- *   |   start first frame:
+ *   |   StartFirstFrame:
  *   |     actor.AddRenderer
  *   |     start timer
  *   |   mRenderer.SetTextures(textureSet)
@@ -95,8 +136,7 @@ Debug::Filter* gAnimImgLogFilter = Debug::Filter::New(Debug::NoLogging, false, "
  *   |     if front frame is ready,
  *   |       mRenderer.SetTextures( front frame's texture )
  *   |     else
- *   |       mWaitingForTexture=true
- *   |     cache->LoadBatch()
+ *   |       Waiting for frame ready.
  *   |
  *   | FrameReady(textureSet)
  *   |   mRenderer.SetTextures(textureSet)
@@ -106,15 +146,10 @@ Debug::Filter* gAnimImgLogFilter = Debug::Filter::New(Debug::NoLogging, false, "
 
 AnimatedImageVisualPtr AnimatedImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties)
 {
-  AnimatedImageVisualPtr visual(new AnimatedImageVisual(factoryCache, shaderFactory));
+  AnimatedImageVisualPtr visual(new AnimatedImageVisual(factoryCache, shaderFactory, ImageDimensions()));
   visual->InitializeAnimatedImage(imageUrl);
   visual->SetProperties(properties);
 
-  if(visual->mFrameCount > 0)
-  {
-    visual->LoadFirstBatch();
-  }
-
   visual->Initialize();
 
   return visual;
@@ -122,7 +157,7 @@ AnimatedImageVisualPtr AnimatedImageVisual::New(VisualFactoryCache& factoryCache
 
 AnimatedImageVisualPtr AnimatedImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const Property::Array& imageUrls, const Property::Map& properties)
 {
-  AnimatedImageVisualPtr visual(new AnimatedImageVisual(factoryCache, shaderFactory));
+  AnimatedImageVisualPtr visual(new AnimatedImageVisual(factoryCache, shaderFactory, ImageDimensions()));
   visual->mImageUrls = new ImageCache::UrlList();
   visual->mImageUrls->reserve(imageUrls.Count());
 
@@ -136,26 +171,16 @@ AnimatedImageVisualPtr AnimatedImageVisual::New(VisualFactoryCache& factoryCache
   visual->mFrameCount = imageUrls.Count();
   visual->SetProperties(properties);
 
-  if(visual->mFrameCount > 0)
-  {
-    visual->LoadFirstBatch();
-  }
-
   visual->Initialize();
 
   return visual;
 }
 
-AnimatedImageVisualPtr AnimatedImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl)
+AnimatedImageVisualPtr AnimatedImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size)
 {
-  AnimatedImageVisualPtr visual(new AnimatedImageVisual(factoryCache, shaderFactory));
+  AnimatedImageVisualPtr visual(new AnimatedImageVisual(factoryCache, shaderFactory, size));
   visual->InitializeAnimatedImage(imageUrl);
 
-  if(visual->mFrameCount > 0)
-  {
-    visual->LoadFirstBatch();
-  }
-
   visual->Initialize();
 
   return visual;
@@ -165,11 +190,43 @@ void AnimatedImageVisual::InitializeAnimatedImage(const VisualUrl& imageUrl)
 {
   mImageUrl             = imageUrl;
   mAnimatedImageLoading = AnimatedImageLoading::New(imageUrl.GetUrl(), imageUrl.IsLocalResource());
-  mFrameCount           = mAnimatedImageLoading.GetImageCount();
 }
 
-AnimatedImageVisual::AnimatedImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory)
-: Visual::Base(factoryCache, Visual::FittingMode::FIT_KEEP_ASPECT_RATIO, Toolkit::Visual::ANIMATED_IMAGE),
+void AnimatedImageVisual::CreateImageCache()
+{
+  DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::CreateImageCache()  batchSize:%d  cacheSize:%d\n", mBatchSize, mCacheSize);
+
+  TextureManager& textureManager = mFactoryCache.GetTextureManager();
+
+  if(mAnimatedImageLoading)
+  {
+    mImageCache = new RollingAnimatedImageCache(textureManager, mDesiredSize, mFittingMode, mSamplingMode, mAnimatedImageLoading, mMaskingData, *this, mCacheSize, mBatchSize, mWrapModeU, mWrapModeV, IsSynchronousLoadingRequired(), IsPreMultipliedAlphaEnabled());
+  }
+  else if(mImageUrls)
+  {
+    // Ensure the batch size and cache size are no bigger than the number of URLs,
+    // and that the cache is at least as big as the batch size.
+    uint16_t numUrls   = mImageUrls->size();
+    uint16_t batchSize = std::max(std::min(mBatchSize, numUrls), MINIMUM_CACHESIZE);
+    uint16_t cacheSize = std::max(std::min(std::max(batchSize, mCacheSize), numUrls), MINIMUM_CACHESIZE);
+    if(cacheSize < numUrls)
+    {
+      mImageCache = new RollingImageCache(textureManager, mDesiredSize, mFittingMode, mSamplingMode, *mImageUrls, mMaskingData, *this, cacheSize, batchSize, mFrameDelay, IsPreMultipliedAlphaEnabled());
+    }
+    else
+    {
+      mImageCache = new FixedImageCache(textureManager, mDesiredSize, mFittingMode, mSamplingMode, *mImageUrls, mMaskingData, *this, batchSize, mFrameDelay, IsPreMultipliedAlphaEnabled());
+    }
+  }
+
+  if(!mImageCache)
+  {
+    DALI_LOG_ERROR("mImageCache is null\n");
+  }
+}
+
+AnimatedImageVisual::AnimatedImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, ImageDimensions desiredSize)
+: Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::ANIMATED_IMAGE),
   mFrameDelayTimer(),
   mPlacementActor(),
   mImageVisualShaderFactory(shaderFactory),
@@ -177,42 +234,76 @@ AnimatedImageVisual::AnimatedImageVisual(VisualFactoryCache& factoryCache, Image
   mImageUrl(),
   mAnimatedImageLoading(),
   mFrameIndexForJumpTo(0),
+  mCurrentFrameIndex(FIRST_FRAME_INDEX),
   mImageUrls(NULL),
   mImageCache(NULL),
   mCacheSize(2),
   mBatchSize(2),
   mFrameDelay(100),
   mLoopCount(LOOP_FOREVER),
-  mCurrentLoopIndex(0),
-  mUrlIndex(0),
+  mCurrentLoopIndex(FIRST_LOOP),
+  mLoadPolicy(Toolkit::ImageVisual::LoadPolicy::ATTACHED),
+  mReleasePolicy(Toolkit::ImageVisual::ReleasePolicy::DETACHED),
+  mMaskingData(),
+  mDesiredSize(desiredSize),
   mFrameCount(0),
   mImageSize(),
+  mActionStatus(DevelAnimatedImageVisual::Action::PLAY),
   mWrapModeU(WrapMode::DEFAULT),
   mWrapModeV(WrapMode::DEFAULT),
-  mActionStatus(DevelAnimatedImageVisual::Action::PLAY),
+  mFittingMode(FittingMode::SCALE_TO_FILL),
+  mSamplingMode(SamplingMode::BOX_THEN_LINEAR),
   mStopBehavior(DevelImageVisual::StopBehavior::CURRENT_FRAME),
   mStartFirstFrame(false),
   mIsJumpTo(false)
 {
+  EnablePreMultipliedAlpha(mFactoryCache.GetPreMultiplyOnLoad());
 }
 
 AnimatedImageVisual::~AnimatedImageVisual()
 {
+  // AnimatedImageVisual destroyed so remove texture unless ReleasePolicy is set to never release
+  // If this is animated image, clear cache. Else if this is single frame image, this is affected be release policy.
+  if(mFrameCount > SINGLE_IMAGE_COUNT || mReleasePolicy != Toolkit::ImageVisual::ReleasePolicy::NEVER)
+  {
+    mImageCache->ClearCache();
+  }
   delete mImageCache;
   delete mImageUrls;
 }
 
 void AnimatedImageVisual::GetNaturalSize(Vector2& naturalSize)
 {
+  if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0)
+  {
+    naturalSize.x = mDesiredSize.GetWidth();
+    naturalSize.y = mDesiredSize.GetHeight();
+    return;
+  }
+
+  naturalSize = Vector2::ZERO;
   if(mImageSize.GetWidth() == 0 && mImageSize.GetHeight() == 0)
   {
+    if(mMaskingData && mMaskingData->mAlphaMaskUrl.IsValid() &&
+       mMaskingData->mCropToMask)
+    {
+      ImageDimensions dimensions = Dali::GetClosestImageSize(mMaskingData->mAlphaMaskUrl.GetUrl());
+      if(dimensions != ImageDimensions(0, 0))
+      {
+        mImageSize    = dimensions;
+        naturalSize.x = dimensions.GetWidth();
+        naturalSize.y = dimensions.GetHeight();
+        return;
+      }
+    }
+
     if(mImageUrl.IsValid())
     {
       mImageSize = mAnimatedImageLoading.GetImageSize();
     }
     else if(mImageUrls && mImageUrls->size() > 0)
     {
-      mImageSize = Dali::GetClosestImageSize((*mImageUrls)[0].mUrl);
+      mImageSize = Dali::GetClosestImageSize((*mImageUrls)[0].mUrl.GetUrl());
     }
   }
 
@@ -238,7 +329,7 @@ void AnimatedImageVisual::DoCreatePropertyMap(Property::Map& map) const
     Property::Array urls;
     for(unsigned int i = 0; i < mImageUrls->size(); ++i)
     {
-      urls.Add((*mImageUrls)[i].mUrl);
+      urls.Add((*mImageUrls)[i].mUrl.GetUrl());
     }
     Property::Value value(const_cast<Property::Array&>(urls));
     map.Insert(Toolkit::ImageVisual::Property::URL, value);
@@ -253,14 +344,35 @@ void AnimatedImageVisual::DoCreatePropertyMap(Property::Map& map) const
   map.Insert(Toolkit::ImageVisual::Property::FRAME_DELAY, static_cast<int>(mFrameDelay));
   map.Insert(Toolkit::DevelImageVisual::Property::LOOP_COUNT, static_cast<int>(mLoopCount));
   map.Insert(Toolkit::DevelImageVisual::Property::CURRENT_FRAME_NUMBER, (mImageCache) ? static_cast<int32_t>(mImageCache->GetCurrentFrameIndex()) : -1);
-  map.Insert(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, (mImageCache) ? static_cast<int32_t>(mImageCache->GetTotalFrameCount()) : -1);
+  map.Insert(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, (mImageCache) ? static_cast<int32_t>((mAnimatedImageLoading) ? mAnimatedImageLoading.GetImageCount() : mImageCache->GetTotalFrameCount()) : -1);
 
   map.Insert(Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mStopBehavior);
+
+  if(mMaskingData != nullptr)
+  {
+    map.Insert(Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mMaskingData->mAlphaMaskUrl.GetUrl());
+    map.Insert(Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, mMaskingData->mContentScaleFactor);
+    map.Insert(Toolkit::ImageVisual::Property::CROP_TO_MASK, mMaskingData->mCropToMask);
+    map.Insert(Toolkit::DevelImageVisual::Property::MASKING_TYPE, mMaskingData->mPreappliedMasking ? DevelImageVisual::MaskingType::MASKING_ON_LOADING : DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
+  }
+
+  map.Insert(Toolkit::ImageVisual::Property::LOAD_POLICY, mLoadPolicy);
+  map.Insert(Toolkit::ImageVisual::Property::RELEASE_POLICY, mReleasePolicy);
+  map.Insert(Toolkit::ImageVisual::Property::FITTING_MODE, mFittingMode);
+  map.Insert(Toolkit::ImageVisual::Property::SAMPLING_MODE, mSamplingMode);
+  map.Insert(Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth());
+  map.Insert(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight());
 }
 
 void AnimatedImageVisual::DoCreateInstancePropertyMap(Property::Map& map) const
 {
-  // Do nothing
+  map.Clear();
+  map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::ANIMATED_IMAGE);
+  if(mImageUrl.IsValid())
+  {
+    map.Insert(Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth());
+    map.Insert(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight());
+  }
 }
 
 void AnimatedImageVisual::OnDoAction(const Dali::Property::Index actionId, const Dali::Property::Value& attributes)
@@ -293,7 +405,8 @@ void AnimatedImageVisual::OnDoAction(const Dali::Property::Index actionId, const
     {
       // STOP reset functionality will actually be done in a future change
       // Stop will be executed on next timer tick
-      mActionStatus = DevelAnimatedImageVisual::Action::STOP;
+      mActionStatus     = DevelAnimatedImageVisual::Action::STOP;
+      mCurrentLoopIndex = FIRST_LOOP;
       if(IsOnScene())
       {
         DisplayNextFrame();
@@ -368,8 +481,57 @@ void AnimatedImageVisual::DoSetProperties(const Property::Map& propertyMap)
       {
         DoSetProperty(Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, keyValue.second);
       }
+      else if(keyValue.first == ALPHA_MASK_URL)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::ALPHA_MASK_URL, keyValue.second);
+      }
+      else if(keyValue.first == MASK_CONTENT_SCALE_NAME)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, keyValue.second);
+      }
+      else if(keyValue.first == CROP_TO_MASK_NAME)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::CROP_TO_MASK, keyValue.second);
+      }
+      else if(keyValue.first == MASKING_TYPE_NAME)
+      {
+        DoSetProperty(Toolkit::DevelImageVisual::Property::MASKING_TYPE, keyValue.second);
+      }
+      else if(keyValue.first == LOAD_POLICY_NAME)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::LOAD_POLICY, keyValue.second);
+      }
+      else if(keyValue.first == RELEASE_POLICY_NAME)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::RELEASE_POLICY, keyValue.second);
+      }
+      else if(keyValue.first == SYNCHRONOUS_LOADING)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second);
+      }
+      else if(keyValue.first == IMAGE_FITTING_MODE)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::FITTING_MODE, keyValue.second);
+      }
+      else if(keyValue.first == IMAGE_SAMPLING_MODE)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::SAMPLING_MODE, keyValue.second);
+      }
+      else if(keyValue.first == IMAGE_DESIRED_WIDTH)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_WIDTH, keyValue.second);
+      }
+      else if(keyValue.first == IMAGE_DESIRED_HEIGHT)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, keyValue.second);
+      }
     }
   }
+  // Load image immediately if LOAD_POLICY requires it
+  if(mLoadPolicy == Toolkit::ImageVisual::LoadPolicy::IMMEDIATE)
+  {
+    PrepareTextureSet();
+  }
 }
 
 void AnimatedImageVisual::DoSetProperty(Property::Index        index,
@@ -449,6 +611,10 @@ void AnimatedImageVisual::DoSetProperty(Property::Index        index,
       if(value.Get(frameDelay))
       {
         mFrameDelay = frameDelay;
+        if(mImageCache)
+        {
+          mImageCache->SetInterval(static_cast<uint32_t>(mFrameDelay));
+        }
       }
       break;
     }
@@ -479,11 +645,115 @@ void AnimatedImageVisual::DoSetProperty(Property::Index        index,
       value.Get(sync);
       if(sync)
       {
-        mImpl->mFlags |= Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+        mImpl->mFlags |= Visual::Base::Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+      }
+      else
+      {
+        mImpl->mFlags &= ~Visual::Base::Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+      }
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::ALPHA_MASK_URL:
+    {
+      std::string alphaUrl = "";
+      if(value.Get(alphaUrl))
+      {
+        AllocateMaskData();
+        mMaskingData->mAlphaMaskUrl = alphaUrl;
+      }
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE:
+    {
+      float scale = 1.0f;
+      if(value.Get(scale))
+      {
+        AllocateMaskData();
+        mMaskingData->mContentScaleFactor = scale;
+      }
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::CROP_TO_MASK:
+    {
+      bool crop = false;
+      if(value.Get(crop))
+      {
+        AllocateMaskData();
+        mMaskingData->mCropToMask = crop;
+      }
+      break;
+    }
+
+    case Toolkit::DevelImageVisual::Property::MASKING_TYPE:
+    {
+      int maskingType = 0;
+      if(value.Get(maskingType))
+      {
+        AllocateMaskData();
+        mMaskingData->mPreappliedMasking = Toolkit::DevelImageVisual::MaskingType::Type(maskingType) == Toolkit::DevelImageVisual::MaskingType::MASKING_ON_LOADING ? true : false;
+      }
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::RELEASE_POLICY:
+    {
+      int releasePolicy = 0;
+      Scripting::GetEnumerationProperty(value, RELEASE_POLICY_TABLE, RELEASE_POLICY_TABLE_COUNT, releasePolicy);
+      mReleasePolicy = Toolkit::ImageVisual::ReleasePolicy::Type(releasePolicy);
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::LOAD_POLICY:
+    {
+      int loadPolicy = 0;
+      Scripting::GetEnumerationProperty(value, LOAD_POLICY_TABLE, LOAD_POLICY_TABLE_COUNT, loadPolicy);
+      mLoadPolicy = Toolkit::ImageVisual::LoadPolicy::Type(loadPolicy);
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::FITTING_MODE:
+    {
+      int fittingMode = 0;
+      Scripting::GetEnumerationProperty(value, FITTING_MODE_TABLE, FITTING_MODE_TABLE_COUNT, fittingMode);
+      mFittingMode = Dali::FittingMode::Type(fittingMode);
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::SAMPLING_MODE:
+    {
+      int samplingMode = 0;
+      Scripting::GetEnumerationProperty(value, SAMPLING_MODE_TABLE, SAMPLING_MODE_TABLE_COUNT, samplingMode);
+      mSamplingMode = Dali::SamplingMode::Type(samplingMode);
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::DESIRED_WIDTH:
+    {
+      float desiredWidth = 0.0f;
+      if(value.Get(desiredWidth))
+      {
+        mDesiredSize.SetWidth(desiredWidth);
       }
       else
       {
-        mImpl->mFlags &= ~Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+        DALI_LOG_ERROR("AnimatedImageVisual: desiredWidth property has incorrect type\n");
+      }
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::DESIRED_HEIGHT:
+    {
+      float desiredHeight = 0.0f;
+      if(value.Get(desiredHeight))
+      {
+        mDesiredSize.SetHeight(desiredHeight);
+      }
+      else
+      {
+        DALI_LOG_ERROR("AnimatedImageVisual: desiredHeight property has incorrect type\n");
       }
       break;
     }
@@ -492,23 +762,16 @@ void AnimatedImageVisual::DoSetProperty(Property::Index        index,
 
 void AnimatedImageVisual::DoSetOnScene(Actor& actor)
 {
-  mPlacementActor       = actor;
-  TextureSet textureSet = PrepareTextureSet();
+  mStartFirstFrame = true;
+  mPlacementActor  = actor;
+  PrepareTextureSet();
 
-  // Loading animated image file is failed.
-  if(!mImageCache ||
-     (mAnimatedImageLoading && !mAnimatedImageLoading.HasLoadingSucceeded()))
-  {
-    textureSet = SetLoadingFailed();
-  }
+  DevelActor::VisibilityChangedSignal(actor).Connect(this, &AnimatedImageVisual::OnControlVisibilityChanged);
 
-  if(textureSet) // if the image loading is successful
+  Window window = DevelWindow::Get(actor);
+  if(window)
   {
-    StartFirstFrame(textureSet);
-  }
-  else
-  {
-    mStartFirstFrame = true;
+    DevelWindow::VisibilityChangedSignal(window).Connect(this, &AnimatedImageVisual::OnWindowVisibilityChanged);
   }
 }
 
@@ -523,15 +786,34 @@ void AnimatedImageVisual::DoSetOffScene(Actor& actor)
   }
 
   actor.RemoveRenderer(mImpl->mRenderer);
+  if(mReleasePolicy == Toolkit::ImageVisual::ReleasePolicy::DETACHED)
+  {
+    mImageCache->ClearCache(); // If INVALID_TEXTURE_ID then removal will be attempted on atlas
+    mImpl->mResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING;
+
+    TextureSet textureSet = TextureSet::New();
+    mImpl->mRenderer.SetTextures(textureSet);
+  }
+
   mPlacementActor.Reset();
-  mStartFirstFrame = false;
+  mStartFirstFrame   = false;
+  mCurrentFrameIndex = FIRST_FRAME_INDEX;
+  mCurrentLoopIndex  = FIRST_LOOP;
+
+  DevelActor::VisibilityChangedSignal(actor).Disconnect(this, &AnimatedImageVisual::OnControlVisibilityChanged);
+
+  Window window = DevelWindow::Get(actor);
+  if(window)
+  {
+    DevelWindow::VisibilityChangedSignal(window).Disconnect(this, &AnimatedImageVisual::OnWindowVisibilityChanged);
+  }
 }
 
 void AnimatedImageVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -544,17 +826,35 @@ void AnimatedImageVisual::UpdateShader()
   }
 }
 
+Shader AnimatedImageVisual::GenerateShader() const
+{
+  bool   defaultWrapMode                 = mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE;
+  bool   requiredAlphaMaskingOnRendering = (mMaskingData && !mMaskingData->mMaskImageLoadingFailed) ? !mMaskingData->mPreappliedMasking : false;
+  Shader shader;
+  shader = mImageVisualShaderFactory.GetShader(
+    mFactoryCache,
+    ImageVisualShaderFeatureBuilder()
+      .ApplyDefaultTextureWrapMode(defaultWrapMode)
+      .EnableRoundedCorner(IsRoundedCornerRequired())
+      .EnableBorderline(IsBorderlineRequired())
+      .EnableAlphaMaskingOnRendering(requiredAlphaMaskingOnRendering));
+  return shader;
+}
+
 void AnimatedImageVisual::OnInitialize()
 {
+  CreateImageCache();
+
   bool   defaultWrapMode = mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE;
   Shader shader          = GenerateShader();
 
   Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
   // Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 
   if(!defaultWrapMode) // custom wrap mode
   {
@@ -567,63 +867,20 @@ void AnimatedImageVisual::OnInitialize()
   {
     mImpl->mRenderer.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, mPixelArea);
   }
-}
-
-void AnimatedImageVisual::LoadFirstBatch()
-{
-  // Ensure the batch size and cache size are no bigger than the number of URLs,
-  // and that the cache is at least as big as the batch size.
-  uint16_t numUrls   = 0;
-  uint16_t batchSize = 1;
-  uint16_t cacheSize = 1;
 
-  if(mImageUrls)
+  if(mMaskingData)
   {
-    numUrls = mImageUrls->size();
+    mImpl->mRenderer.RegisterProperty(CROP_TO_MASK_NAME, static_cast<float>(mMaskingData->mCropToMask));
   }
-  else
-  {
-    numUrls = mFrameCount;
-  }
-
-  batchSize = std::min(mBatchSize, numUrls);
-  cacheSize = std::min(std::max(batchSize, mCacheSize), numUrls);
 
-  DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::LoadFirstBatch()  batchSize:%d  cacheSize:%d\n", batchSize, cacheSize);
-
-  mUrlIndex                      = 0;
-  TextureManager& textureManager = mFactoryCache.GetTextureManager();
-
-  if(mAnimatedImageLoading)
-  {
-    mImageCache = new RollingAnimatedImageCache(textureManager, mAnimatedImageLoading, mFrameCount, *this, cacheSize, batchSize, IsSynchronousLoadingRequired());
-  }
-  else if(mImageUrls)
-  {
-    if(batchSize > 0 && cacheSize > 0)
-    {
-      if(cacheSize < numUrls)
-      {
-        mImageCache = new RollingImageCache(textureManager, *mImageUrls, *this, cacheSize, batchSize);
-      }
-      else
-      {
-        mImageCache = new FixedImageCache(textureManager, *mImageUrls, *this, batchSize);
-      }
-    }
-    else
-    {
-      mImageCache = new RollingImageCache(textureManager, *mImageUrls, *this, 1, 1);
-    }
-  }
-
-  if(!mImageCache)
-  {
-    DALI_LOG_ERROR("mImageCache is null\n");
-  }
+  // Enable PreMultipliedAlpha if it need premultiplied
+  auto preMultiplyOnLoad = IsPreMultipliedAlphaEnabled() && !mImpl->mCustomShader
+                             ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
+                             : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+  EnablePreMultipliedAlpha(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
 }
 
-void AnimatedImageVisual::StartFirstFrame(TextureSet& textureSet)
+void AnimatedImageVisual::StartFirstFrame(TextureSet& textureSet, uint32_t firstInterval)
 {
   DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::StartFirstFrame()\n");
 
@@ -631,6 +888,7 @@ void AnimatedImageVisual::StartFirstFrame(TextureSet& textureSet)
   if(mImpl->mRenderer)
   {
     mImpl->mRenderer.SetTextures(textureSet);
+    CheckMaskTexture();
 
     Actor actor = mPlacementActor.GetHandle();
     if(actor)
@@ -640,26 +898,23 @@ void AnimatedImageVisual::StartFirstFrame(TextureSet& textureSet)
     }
   }
 
-  if(mFrameCount > 1)
+  if(mImpl->mResourceStatus != Toolkit::Visual::ResourceStatus::FAILED)
   {
-    int frameDelay = mImageCache->GetFrameInterval(0);
-    if(frameDelay == 0u)
+    if(mFrameCount > SINGLE_IMAGE_COUNT)
     {
-      frameDelay = mFrameDelay; // from URL array
+      mFrameDelayTimer = Timer::New(firstInterval);
+      mFrameDelayTimer.TickSignal().Connect(this, &AnimatedImageVisual::DisplayNextFrame);
+      mFrameDelayTimer.Start();
     }
-    mFrameDelayTimer = Timer::New(frameDelay);
-    mFrameDelayTimer.TickSignal().Connect(this, &AnimatedImageVisual::DisplayNextFrame);
-    mFrameDelayTimer.Start();
-  }
 
-  if(mImpl->mResourceStatus != Toolkit::Visual::ResourceStatus::FAILED)
-  {
     DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "ResourceReady(ResourceStatus::READY)\n");
     ResourceReady(Toolkit::Visual::ResourceStatus::READY);
   }
+
+  mCurrentFrameIndex = FIRST_FRAME_INDEX;
 }
 
-TextureSet AnimatedImageVisual::PrepareTextureSet()
+void AnimatedImageVisual::PrepareTextureSet()
 {
   TextureSet textureSet;
   if(mImageCache)
@@ -667,12 +922,11 @@ TextureSet AnimatedImageVisual::PrepareTextureSet()
     textureSet = mImageCache->FirstFrame();
   }
 
+  // Check whether synchronous loading is true or false for the first frame.
   if(textureSet)
   {
     SetImageSize(textureSet);
   }
-
-  return textureSet;
 }
 
 void AnimatedImageVisual::SetImageSize(TextureSet& textureSet)
@@ -685,28 +939,51 @@ void AnimatedImageVisual::SetImageSize(TextureSet& textureSet)
       mImageSize.SetWidth(texture.GetWidth());
       mImageSize.SetHeight(texture.GetHeight());
     }
+
+    if(textureSet.GetTextureCount() > 1u && mMaskingData && mMaskingData->mCropToMask)
+    {
+      Texture maskTexture = textureSet.GetTexture(1);
+      if(maskTexture)
+      {
+        mImageSize.SetWidth(std::min(static_cast<uint32_t>(mImageSize.GetWidth() * mMaskingData->mContentScaleFactor), maskTexture.GetWidth()));
+        mImageSize.SetHeight(std::min(static_cast<uint32_t>(mImageSize.GetHeight() * mMaskingData->mContentScaleFactor), maskTexture.GetHeight()));
+
+        float   textureWidth  = std::max(static_cast<float>(texture.GetWidth() * mMaskingData->mContentScaleFactor), Dali::Math::MACHINE_EPSILON_1);
+        float   textureHeight = std::max(static_cast<float>(texture.GetHeight() * mMaskingData->mContentScaleFactor), Dali::Math::MACHINE_EPSILON_1);
+        Vector2 textureRatio(std::min(static_cast<float>(maskTexture.GetWidth()), textureWidth) / textureWidth,
+                             std::min(static_cast<float>(maskTexture.GetHeight()), textureHeight) / textureHeight);
+        mImpl->mRenderer.RegisterProperty(MASK_TEXTURE_RATIO_NAME, textureRatio);
+      }
+    }
   }
 }
 
-void AnimatedImageVisual::FrameReady(TextureSet textureSet)
+void AnimatedImageVisual::FrameReady(TextureSet textureSet, uint32_t interval, bool preMultiplied)
 {
+  EnablePreMultipliedAlpha(preMultiplied);
+
   // When image visual requested to load new frame to mImageCache and it is failed.
-  if(!textureSet)
+  if(!mImageCache || !textureSet)
   {
     textureSet = SetLoadingFailed();
   }
-
   SetImageSize(textureSet);
 
   if(mStartFirstFrame)
   {
-    StartFirstFrame(textureSet);
+    mFrameCount = mImageCache->GetTotalFrameCount();
+    StartFirstFrame(textureSet, interval);
   }
   else
   {
     if(mImpl->mRenderer)
     {
+      if(mFrameDelayTimer && interval > 0u)
+      {
+        mFrameDelayTimer.SetInterval(interval);
+      }
       mImpl->mRenderer.SetTextures(textureSet);
+      CheckMaskTexture();
     }
   }
 }
@@ -718,7 +995,6 @@ bool AnimatedImageVisual::DisplayNextFrame()
 
   if(mImageCache)
   {
-    bool     nextFrame  = false;
     uint32_t frameIndex = mImageCache->GetCurrentFrameIndex();
 
     if(mIsJumpTo)
@@ -732,10 +1008,10 @@ bool AnimatedImageVisual::DisplayNextFrame()
     }
     else if(mActionStatus == DevelAnimatedImageVisual::Action::STOP)
     {
-      frameIndex = 0;
+      mCurrentLoopIndex = FIRST_LOOP;
       if(mStopBehavior == DevelImageVisual::StopBehavior::FIRST_FRAME)
       {
-        frameIndex = 0;
+        frameIndex = FIRST_FRAME_INDEX;
       }
       else if(mStopBehavior == DevelImageVisual::StopBehavior::LAST_FRAME)
       {
@@ -748,13 +1024,12 @@ bool AnimatedImageVisual::DisplayNextFrame()
     }
     else
     {
-      if(mFrameCount > 1)
+      if(mFrameCount > SINGLE_IMAGE_COUNT)
       {
-        nextFrame = true;
         frameIndex++;
         if(frameIndex >= mFrameCount)
         {
-          frameIndex %= mFrameCount;
+          frameIndex = FIRST_FRAME_INDEX;
           ++mCurrentLoopIndex;
         }
 
@@ -765,38 +1040,25 @@ bool AnimatedImageVisual::DisplayNextFrame()
           return DisplayNextFrame();
         }
       }
-
-      unsigned int delay = mImageCache->GetFrameInterval(frameIndex);
-      if(delay > 0u)
-      {
-        if(mFrameDelayTimer.GetInterval() != delay)
-        {
-          mFrameDelayTimer.SetInterval(delay);
-        }
-      }
     }
 
     DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::DisplayNextFrame(this:%p) CurrentFrameIndex:%d\n", this, frameIndex);
 
-    if(nextFrame)
-    {
-      textureSet = mImageCache->NextFrame();
-    }
-    else
-    {
-      textureSet = mImageCache->Frame(frameIndex);
-    }
-
-    continueTimer = (mActionStatus == DevelAnimatedImageVisual::Action::PLAY) ? true : false;
-  }
+    textureSet = mImageCache->Frame(frameIndex);
 
-  if(textureSet)
-  {
-    SetImageSize(textureSet);
-    if(mImpl->mRenderer)
+    if(textureSet)
     {
-      mImpl->mRenderer.SetTextures(textureSet);
+      SetImageSize(textureSet);
+      if(mImpl->mRenderer)
+      {
+        mImpl->mRenderer.SetTextures(textureSet);
+        CheckMaskTexture();
+      }
+      mFrameDelayTimer.SetInterval(mImageCache->GetFrameInterval(frameIndex));
     }
+
+    mCurrentFrameIndex = frameIndex;
+    continueTimer      = (mActionStatus == DevelAnimatedImageVisual::Action::PLAY && textureSet) ? true : false;
   }
 
   return continueTimer;
@@ -807,9 +1069,14 @@ TextureSet AnimatedImageVisual::SetLoadingFailed()
   DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "ResourceReady(ResourceStatus::FAILED)\n");
   ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
 
-  TextureSet textureSet  = TextureSet::New();
-  Texture    brokenImage = mFactoryCache.GetBrokenVisualImage();
-  textureSet.SetTexture(0u, brokenImage);
+  Actor   actor     = mPlacementActor.GetHandle();
+  Vector2 imageSize = Vector2::ZERO;
+  if(actor)
+  {
+    imageSize = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+  }
+  mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize);
+  TextureSet textureSet = mImpl->mRenderer.GetTextures();
 
   if(mFrameDelayTimer)
   {
@@ -822,17 +1089,50 @@ TextureSet AnimatedImageVisual::SetLoadingFailed()
   return textureSet;
 }
 
-Shader AnimatedImageVisual::GenerateShader() const
+void AnimatedImageVisual::AllocateMaskData()
 {
-  bool   defaultWrapMode = mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE;
-  Shader shader;
-  shader = mImageVisualShaderFactory.GetShader(
-    mFactoryCache,
-    TextureAtlas::DISABLED,
-    defaultWrapMode ? DefaultTextureWrapMode::APPLY : DefaultTextureWrapMode::DO_NOT_APPLY,
-    IsRoundedCornerRequired() ? RoundedCorner::ENABLED : RoundedCorner::DISABLED,
-    IsBorderlineRequired() ? Borderline::ENABLED : Borderline::DISABLED);
-  return shader;
+  if(!mMaskingData)
+  {
+    mMaskingData.reset(new TextureManager::MaskingData());
+  }
+}
+
+void AnimatedImageVisual::CheckMaskTexture()
+{
+  if(mMaskingData && !mMaskingData->mPreappliedMasking)
+  {
+    bool       maskLoadFailed = true;
+    TextureSet textures       = mImpl->mRenderer.GetTextures();
+    if(textures && textures.GetTextureCount() >= TEXTURE_COUNT_FOR_GPU_ALPHA_MASK)
+    {
+      maskLoadFailed = false;
+    }
+    if(mMaskingData->mMaskImageLoadingFailed != maskLoadFailed)
+    {
+      mMaskingData->mMaskImageLoadingFailed = maskLoadFailed;
+      UpdateShader();
+    }
+  }
+}
+
+void AnimatedImageVisual::OnControlVisibilityChanged(Actor actor, bool visible, DevelActor::VisibilityChange::Type type)
+{
+  if(!visible && mActionStatus != DevelAnimatedImageVisual::Action::STOP)
+  {
+    mActionStatus = DevelAnimatedImageVisual::Action::STOP;
+    DisplayNextFrame();
+    DALI_LOG_INFO(gAnimImgLogFilter, Debug::Verbose, "AnimatedImageVisual::OnControlVisibilityChanged: invisibile. Pause animation [%p]\n", this);
+  }
+}
+
+void AnimatedImageVisual::OnWindowVisibilityChanged(Window window, bool visible)
+{
+  if(!visible && mActionStatus != DevelAnimatedImageVisual::Action::STOP)
+  {
+    mActionStatus = DevelAnimatedImageVisual::Action::STOP;
+    DisplayNextFrame();
+    DALI_LOG_INFO(gAnimImgLogFilter, Debug::Verbose, "AnimatedImageVisual::OnWindowVisibilityChanged: invisibile. Pause animation [%p]\n", this);
+  }
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
index 347e9d3..b37d74b 100644
--- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
+++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ANIMATED_IMAGE_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/public-api/adaptor-framework/window.h>
 #include <dali/devel-api/adaptor-framework/animated-image-loading.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/common/dali-vector.h>
@@ -111,8 +113,9 @@ public:
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    * @param[in] shaderFactory The ImageVisualShaderFactory object
    * @param[in] imageUrl The URL to animated image resource to use
+   * @param[in] size The width and height of the image. The visual size will be used if these are 0.
    */
-  static AnimatedImageVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
+  static AnimatedImageVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size = ImageDimensions());
 
 public: // from Visual
   /**
@@ -133,7 +136,7 @@ public: // from Visual
   /**
    * @copydoc Visual::Base::OnDoAction
    */
-  void OnDoAction(const Dali::Property::Index actionName, const Dali::Property::Value& attributes) override;
+  void OnDoAction(const Dali::Property::Index actionId, const Dali::Property::Value& attributes) override;
 
 protected:
   /**
@@ -141,8 +144,9 @@ protected:
    *
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    * @param[in] shaderFactory The ImageVisualShaderFactory object
+   * @param[in] desiredSize The width and height of the image. The visual size will be used if these are 0.
    */
-  AnimatedImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory);
+  AnimatedImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, ImageDimensions desiredSize);
 
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -193,56 +197,76 @@ protected:
 
 private:
   /**
-   * Creates the renderer for the animated image
+   * @brief Initialize the animated image variables.
+   * @param[in] imageUrl The url of the animated image
    */
-  void CreateRenderer();
+  void InitializeAnimatedImage(const VisualUrl& imageUrl);
 
   /**
-   * Starts the Load of the first batch of URLs
+   * @brief Create image cache for animated image or image array.
    */
-  void LoadFirstBatch();
+  void CreateImageCache();
 
   /**
-   * Adds the texture set to the renderer, and the renderer to the
+   * @brief Adds the texture set to the renderer, and the renderer to the
    * placement actor, and starts the frame timer
-   * @param[in] textureSet The texture set to apply
+   * @param[in] textureSet    The texture set to apply
+   * @param[in] firstInterval frame interval(ms) for the first frame.
    */
-  void StartFirstFrame(TextureSet& textureSet);
+  void StartFirstFrame(TextureSet& textureSet, uint32_t firstInterval);
 
   /**
-   * Prepares the texture set for displaying
+   * @brief Prepares the texture set for displaying
    */
-  TextureSet PrepareTextureSet();
+  void PrepareTextureSet();
 
   /**
-   * Set the image size from the texture set
+   * @brief Set the image size from the texture set
    * @param[in] textureSet The texture set to get the size from
    */
   void SetImageSize(TextureSet& textureSet);
 
   /**
-   * Called when the next frame is ready.
+   * @brief Called when the next frame is ready.
    * @param[in] textureSet the texture set to apply
+   * @param[in] interval interval(ms) for the frame
+   * @param[in] preMultiplied whether the texture is premultied alpha or not.
    */
-  void FrameReady(TextureSet textureSet) override;
+  void FrameReady(TextureSet textureSet, uint32_t interval, bool preMultiplied) override;
 
   /**
-   * Display the next frame. It is called when the mFrameDelayTimer ticks.
-   * Returns true to ensure the timer continues running.
+   * @brief Display the next frame. It is called when the mFrameDelayTimer ticks.
+   * @return true to ensure the timer continues running.
    */
   bool DisplayNextFrame();
 
   /**
-   * Initialize the animated image variables.
-   * @param[in] imageUrl The url of the animated image
+   * @brief Set the state of loading fail of an image or a frame.
+   * @return TextureSet of broken image.
    */
-  void InitializeAnimatedImage(const VisualUrl& imageUrl);
+  TextureSet SetLoadingFailed();
 
   /**
-   * Set the state of loading fail of an image or a frame.
-   * Returns TextureSet of broken image.
+   * @brief Allocate mask data.
+   * This is allocated only once.
    */
-  TextureSet SetLoadingFailed();
+  void AllocateMaskData();
+
+  /**
+   * @brief Check whether the mask texture is loaded or not.
+   * If MaskingType is MASKING_ON_LOADING and mask texture is failed to load, update shader.
+   */
+  void CheckMaskTexture();
+
+  /**
+   * @brief Callback when the visibility of the actor is changed.
+   */
+  void OnControlVisibilityChanged(Actor actor, bool visible, DevelActor::VisibilityChange::Type type);
+
+  /**
+   * @brief Callback when the visibility of the window is changed.
+   */
+  void OnWindowVisibilityChanged(Window window, bool visible);
 
   // Undefined
   AnimatedImageVisual(const AnimatedImageVisual& animatedImageVisual);
@@ -260,6 +284,7 @@ private:
   VisualUrl                  mImageUrl;
   Dali::AnimatedImageLoading mAnimatedImageLoading; // Only needed for animated image
   uint32_t                   mFrameIndexForJumpTo;  // Frame index into textureRects
+  uint32_t                   mCurrentFrameIndex;
 
   // Variables for Multi-Image player
   ImageCache::UrlList* mImageUrls;
@@ -269,18 +294,26 @@ private:
   uint16_t             mFrameDelay;
   int16_t              mLoopCount;
   int16_t              mCurrentLoopIndex;
-  uint16_t             mUrlIndex;
+
+  // Variables for image visual properties.
+  Dali::Toolkit::ImageVisual::LoadPolicy::Type    mLoadPolicy;
+  Dali::Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy;
+  TextureManager::MaskingDataPointer              mMaskingData;
+  Dali::ImageDimensions                           mDesiredSize;
 
   // Shared variables
   uint32_t        mFrameCount; // Number of frames
   ImageDimensions mImageSize;
 
-  Dali::WrapMode::Type                   mWrapModeU : 3;
-  Dali::WrapMode::Type                   mWrapModeV : 3;
-  DevelAnimatedImageVisual::Action::Type mActionStatus : 3;
-  DevelImageVisual::StopBehavior::Type   mStopBehavior : 2;
-  bool                                   mStartFirstFrame : 1;
-  bool                                   mIsJumpTo : 1;
+  DevelAnimatedImageVisual::Action::Type mActionStatus;
+
+  Dali::WrapMode::Type                 mWrapModeU : 3;
+  Dali::WrapMode::Type                 mWrapModeV : 3;
+  Dali::FittingMode::Type              mFittingMode : 3;
+  Dali::SamplingMode::Type             mSamplingMode : 4;
+  DevelImageVisual::StopBehavior::Type mStopBehavior : 2;
+  bool                                 mStartFirstFrame : 1;
+  bool                                 mIsJumpTo : 1;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
index 4593bc7..adf8da8 100644
--- a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,9 @@
 // INTERNAL HEADERS
 #include <dali-toolkit/internal/visuals/image-atlas-manager.h> // For ImageAtlasManagerPtr
 
+// EXTERNAL HEADERS
+#include <dali/integration-api/debug.h>
+
 namespace Dali
 {
 namespace Toolkit
@@ -28,84 +31,73 @@ namespace Internal
 {
 namespace
 {
-const bool ENABLE_ORIENTATION_CORRECTION(true);
+constexpr bool     ENABLE_ORIENTATION_CORRECTION(true);
+constexpr uint32_t FIRST_FRAME_INDEX = 0u;
 } // namespace
 
-FixedImageCache::FixedImageCache(
-  TextureManager& textureManager, UrlList& urlList, ImageCache::FrameReadyObserver& observer, unsigned int batchSize)
-: ImageCache(textureManager, observer, batchSize),
+FixedImageCache::FixedImageCache(TextureManager&                     textureManager,
+                                 ImageDimensions                     size,
+                                 Dali::FittingMode::Type             fittingMode,
+                                 Dali::SamplingMode::Type            samplingMode,
+                                 UrlList&                            urlList,
+                                 TextureManager::MaskingDataPointer& maskingData,
+                                 ImageCache::FrameReadyObserver&     observer,
+                                 uint32_t                            batchSize,
+                                 uint32_t                            interval,
+                                 bool                                preMultiplyOnLoad)
+: ImageCache(textureManager, size, fittingMode, samplingMode, maskingData, observer, batchSize, interval, preMultiplyOnLoad),
   mImageUrls(urlList),
-  mFront(0u)
+  mCurrentFrameIndex(FIRST_FRAME_INDEX)
 {
   mReadyFlags.reserve(mImageUrls.size());
-  LoadBatch();
 }
 
 FixedImageCache::~FixedImageCache()
 {
-  if(mTextureManagerAlive)
-  {
-    for(std::size_t i = 0; i < mImageUrls.size(); ++i)
-    {
-      mTextureManager.Remove(mImageUrls[i].mTextureId, this);
-    }
-  }
+  ClearCache();
 }
 
 TextureSet FixedImageCache::Frame(uint32_t frameIndex)
 {
-  while(frameIndex > mFront)
-  {
-    ++mFront;
-    if(mFront >= mImageUrls.size())
-    {
-      mFront = 0;
-    }
-    LoadBatch();
-  }
-
-  mFront = frameIndex;
-
   TextureSet textureSet;
-  if(IsFrontReady() == true)
+  if(frameIndex >= mImageUrls.size())
   {
-    textureSet = GetFrontTextureSet();
+    DALI_LOG_ERROR("Wrong frameIndex requested.\n");
+    return textureSet;
   }
-  else
+
+  while(mReadyFlags.size() < mImageUrls.size() &&
+        (frameIndex > mCurrentFrameIndex || mReadyFlags.empty()))
   {
-    mWaitingForReadyFrame = true;
+    ++mCurrentFrameIndex;
+    LoadBatch();
   }
 
-  return textureSet;
-}
-
-TextureSet FixedImageCache::FirstFrame()
-{
-  TextureSet textureSet = GetFrontTextureSet();
+  mCurrentFrameIndex = frameIndex;
 
-  if(!textureSet)
+  if(IsFrameReady(mCurrentFrameIndex) && mLoadState != TextureManager::LoadState::LOAD_FAILED)
   {
-    mWaitingForReadyFrame = true;
+    textureSet = GetTextureSet(mCurrentFrameIndex);
   }
 
   return textureSet;
 }
 
-TextureSet FixedImageCache::NextFrame()
+TextureSet FixedImageCache::FirstFrame()
 {
-  TextureSet textureSet = Frame((mFront + 1) % mImageUrls.size());
+  TextureSet textureSet = Frame(FIRST_FRAME_INDEX);
 
   return textureSet;
 }
 
 uint32_t FixedImageCache::GetFrameInterval(uint32_t frameIndex) const
 {
-  return 0u;
+  return mInterval;
 }
 
 int32_t FixedImageCache::GetCurrentFrameIndex() const
 {
-  return static_cast<int32_t>(mFront);
+  return static_cast<int32_t>(mCurrentFrameIndex);
 }
 
 int32_t FixedImageCache::GetTotalFrameCount() const
@@ -113,115 +105,113 @@ int32_t FixedImageCache::GetTotalFrameCount() const
   return mImageUrls.size();
 }
 
-bool FixedImageCache::IsFrontReady() const
+bool FixedImageCache::IsFrameReady(uint32_t frameIndex) const
 {
-  return (mReadyFlags.size() > 0 && mReadyFlags[mFront] == true);
+  return (mReadyFlags.size() > 0 && mReadyFlags[frameIndex] == true);
 }
 
 void FixedImageCache::LoadBatch()
 {
   // Try and load up to mBatchSize images, until the cache is filled.
-  // Once the cache is filled, mUrlIndex exceeds mImageUrls size and
-  // no more images are loaded.
-  bool frontFrameReady = IsFrontReady();
-
-  for(unsigned int i = 0; i < mBatchSize && mUrlIndex < mImageUrls.size(); ++i)
+  // Once the cache is filled, no more images are loaded.
+  for(unsigned int i = 0; i < mBatchSize && mReadyFlags.size() < mImageUrls.size(); ++i)
   {
-    std::string& url = mImageUrls[mUrlIndex].mUrl;
+    uint32_t   frameIndex = mReadyFlags.size();
+    VisualUrl& url        = mImageUrls[frameIndex].mUrl;
 
     mReadyFlags.push_back(false);
 
-    // Note, if the image is already loaded, then UploadComplete will get called
+    // Note, if the image is already loaded, then LoadComplete will get called
     // from within this method. This means it won't yet have a texture id, so we
-    // need to account for this inside the UploadComplete method using mRequestingLoad.
+    // need to account for this inside the LoadComplete method using mRequestingLoad.
     mRequestingLoad = true;
+    mLoadState      = TextureManager::LoadState::LOADING;
 
-    bool                               synchronousLoading = false;
-    bool                               atlasingStatus     = false;
-    bool                               loadingStatus      = false;
-    TextureManager::MaskingDataPointer maskInfo           = nullptr;
-    AtlasUploadObserver*               atlasObserver      = nullptr;
-    ImageAtlasManagerPtr               imageAtlasManager  = nullptr;
-    Vector4                            textureRect;
-    Dali::ImageDimensions              textureRectSize;
-    auto                               preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+    bool                  synchronousLoading = false;
+    bool                  atlasingStatus     = false;
+    bool                  loadingStatus      = false;
+    AtlasUploadObserver*  atlasObserver      = nullptr;
+    ImageAtlasManagerPtr  imageAtlasManager  = nullptr;
+    Vector4               textureRect;
+    Dali::ImageDimensions textureRectSize;
 
-    mTextureManager.LoadTexture(
-      url, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, maskInfo, synchronousLoading, mImageUrls[mUrlIndex].mTextureId, textureRect, textureRectSize, atlasingStatus, loadingStatus, Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT, this, atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED, preMultiply);
+    auto preMultiplyOnLoading = mPreMultiplyOnLoad ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
+                                                   : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
 
-    if(loadingStatus == false) // not loading, means it's already ready.
-    {
-      SetImageFrameReady(mImageUrls[mUrlIndex].mTextureId);
-    }
+    mTextureManager.LoadTexture(url, mDesiredSize, mFittingMode, mSamplingMode, mMaskingData, synchronousLoading, mImageUrls[frameIndex].mTextureId, textureRect, textureRectSize, atlasingStatus, loadingStatus, this, atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED, preMultiplyOnLoading);
     mRequestingLoad = false;
-    ++mUrlIndex;
   }
-
-  CheckFrontFrame(frontFrameReady);
 }
 
-void FixedImageCache::SetImageFrameReady(TextureManager::TextureId textureId)
+TextureSet FixedImageCache::GetTextureSet(uint32_t frameIndex) const
 {
-  for(std::size_t i = 0; i < mImageUrls.size(); ++i)
+  TextureSet textureSet = mTextureManager.GetTextureSet(mImageUrls[frameIndex].mTextureId);
+  if(textureSet)
   {
-    if(mImageUrls[i].mTextureId == textureId)
-    {
-      mReadyFlags[i] = true;
-      break;
-    }
+    Sampler sampler = Sampler::New();
+    sampler.SetWrapMode(Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT);
+    textureSet.SetSampler(0u, sampler);
   }
+  return textureSet;
 }
 
-TextureSet FixedImageCache::GetFrontTextureSet() const
+void FixedImageCache::MakeReady(bool wasReady, uint32_t frameIndex, bool preMultiplied)
 {
-  return mTextureManager.GetTextureSet(mImageUrls[mFront].mTextureId);
+  if(wasReady == false && IsFrameReady(frameIndex))
+  {
+    mObserver.FrameReady(GetTextureSet(frameIndex), mInterval, preMultiplied);
+  }
 }
 
-void FixedImageCache::CheckFrontFrame(bool wasReady)
+void FixedImageCache::ClearCache()
 {
-  if(mWaitingForReadyFrame && wasReady == false && IsFrontReady())
+  if(mTextureManagerAlive)
   {
-    mWaitingForReadyFrame = false;
-    mObserver.FrameReady(GetFrontTextureSet());
+    for(std::size_t i = 0; i < mImageUrls.size(); ++i)
+    {
+      mTextureManager.RequestRemove(mImageUrls[i].mTextureId, this);
+      mImageUrls[i].mTextureId = TextureManager::INVALID_TEXTURE_ID;
+    }
+  }
+  mReadyFlags.clear();
+  mLoadState = TextureManager::LoadState::NOT_STARTED;
+  if(mMaskingData)
+  {
+    mMaskingData->mAlphaMaskId = TextureManager::INVALID_TEXTURE_ID;
   }
 }
 
-void FixedImageCache::UploadComplete(
-  bool           loadSuccess,
-  int32_t        textureId,
-  TextureSet     textureSet,
-  bool           useAtlasing,
-  const Vector4& atlasRect,
-  bool           preMultiplied)
+void FixedImageCache::LoadComplete(bool loadSuccess, TextureInformation textureInformation)
 {
-  bool frontFrameReady = IsFrontReady();
-
-  if(!mRequestingLoad)
+  if(loadSuccess)
   {
-    SetImageFrameReady(textureId);
-
-    CheckFrontFrame(frontFrameReady);
+    mLoadState           = TextureManager::LoadState::LOAD_FINISHED;
+    bool isCurrentFrameReady = IsFrameReady(mCurrentFrameIndex);
+    if(!mRequestingLoad)
+    {
+      for(std::size_t i = 0; i < mImageUrls.size(); ++i)
+      {
+        if(mImageUrls[i].mTextureId == textureInformation.textureId)
+        {
+          mReadyFlags[i] = true;
+          break;
+        }
+      }
+    }
+    else
+    {
+      mReadyFlags.back() = true;
+    }
+    MakeReady(isCurrentFrameReady, mCurrentFrameIndex, textureInformation.preMultiplied);
   }
   else
   {
-    // UploadComplete has been called from within RequestLoad. TextureManager must
-    // therefore already have the texture cached, so make the texture ready.
-    // (Use the last texture, as the texture id hasn't been assigned yet)
-    mReadyFlags.back() = true;
+    mLoadState = TextureManager::LoadState::LOAD_FAILED;
+    // preMultiplied should be false because broken image don't premultiply alpha on load
+    mObserver.FrameReady(TextureSet(), 0, false);
   }
 }
 
-void FixedImageCache::LoadComplete(
-  bool               loadSuccess,
-  Devel::PixelBuffer pixelBuffer,
-  const VisualUrl&   url,
-  bool               preMultiplied)
-{
-  // LoadComplete is called if this TextureUploadObserver requested to load
-  // an image that will be returned as a type of PixelBuffer by using a method
-  // TextureManager::LoadPixelBuffer.
-}
-
 } //namespace Internal
 } //namespace Toolkit
 } //namespace Dali
\ No newline at end of file
diff --git a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
index 63212df..4fc4ecc 100644
--- a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_FIXED_IMAGE_CACHE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
 
 namespace Dali
 {
@@ -32,102 +32,105 @@ class FixedImageCache : public ImageCache, public TextureUploadObserver
 public:
   /**
    * Constructor.
-   * @param[in] textureManager The texture manager
-   * @param[in] urlList List of urls to cache
-   * @param[in] observer FrameReady observer
-   * @param[in] batchSize The size of a batch to load
+   * @param[in] textureManager    The texture manager
+   * @param[in] size              The width and height to fit the loaded image to.
+   * @param[in] fittingMode       The FittingMode of the resource to load
+   * @param[in] samplingMode      The SamplingMode of the resource to load
+   * @param[in] urlList           List of urls to cache
+   * @param[in] maskingData       Masking data to be applied.
+   * @param[in] observer          FrameReady observer
+   * @param[in] batchSize         The size of a batch to load
+   * @param[in] interval          Time interval between each frame
+   * @param[in] preMultiplyOnLoad The flag if image's color should be multiplied by it's alpha
    *
    * This will start loading textures immediately, according to the
    * batch and cache sizes. The cache is as large as the number of urls.
    */
-  FixedImageCache(TextureManager&                 textureManager,
-                  UrlList&                        urlList,
-                  ImageCache::FrameReadyObserver& observer,
-                  unsigned int                    batchSize);
+  FixedImageCache(TextureManager&                     textureManager,
+                  ImageDimensions                     size,
+                  Dali::FittingMode::Type             fittingMode,
+                  Dali::SamplingMode::Type            samplingMode,
+                  UrlList&                            urlList,
+                  TextureManager::MaskingDataPointer& maskingData,
+                  ImageCache::FrameReadyObserver&     observer,
+                  uint32_t                            batchSize,
+                  uint32_t                            interval,
+                  bool                                preMultiplyOnLoad);
 
   ~FixedImageCache() override;
 
   /**
-   * Get the Nth frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
+   * @copydoc Internal::ImageCache::Frame()
    */
   TextureSet Frame(uint32_t frameIndex) override;
 
   /**
-   * Get the first frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
+   * @copydoc Internal::ImageCache::FirstFrame()
    */
   TextureSet FirstFrame() override;
 
   /**
-   * Get the next frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
-   */
-  TextureSet NextFrame() override;
-
-  /**
-   * Get the interval of Nth frame.
+   * @copydoc Internal::ImageCache::GetFrameInterval()
    */
   uint32_t GetFrameInterval(uint32_t frameIndex) const override;
 
   /**
-   * Get the current rendered frame index.
-   * If there isn't any loaded frame, returns -1.
+   * @copydoc Internal::ImageCache::GetCurrentFrameIndex()
    */
   int32_t GetCurrentFrameIndex() const override;
 
   /**
-   * Get total frame count of the animated image file.
+   * @copydoc Internal::ImageCache::GetTotalFrameCount()
    */
   int32_t GetTotalFrameCount() const override;
 
-private:
   /**
-   * @return true if the front frame is ready
+   * @copydoc Internal::ImageCache::ClearCache()
    */
-  bool IsFrontReady() const;
+  void ClearCache() override;
 
+private:
   /**
-   * Load the next batch of images
+   * @brief Check whether the frame is ready or not.
+   * @param[in] frameIndex The frame index to check the frame is ready or not.
+   *
+   * @return true if the frame is ready
    */
-  void LoadBatch();
+  bool IsFrameReady(uint32_t frameIndex) const;
 
   /**
-   * Find the matching image frame, and set it to ready
+   * @brief Load the next batch of images
    */
-  void SetImageFrameReady(TextureManager::TextureId textureId);
+  void LoadBatch();
 
   /**
-   * Get the texture set of the front frame.
-   * @return the texture set
+   * @brief Get the texture set at the input frame index
+   * @param[in] frameIndex The frame index to retrieve texture set.
+   *
+   * @return the texture set of the front of Cache.
    */
-  TextureSet GetFrontTextureSet() const;
+  TextureSet GetTextureSet(uint32_t frameIndex) const;
 
   /**
-   * Check if the front frame has become ready - if so, inform observer
+   * @brief Check if the front frame has become ready - if so, inform observer
+   *
    * @param[in] wasReady Readiness before call.
+   * @param[in] frameIndex The frame index for this frame
+   * @param[in] preMultiplied whether the texture is premultied alpha or not.
    */
-  void CheckFrontFrame(bool wasReady);
+  void MakeReady(bool wasReady, uint32_t frameIndex, bool preMultiplied);
 
 protected:
-  void UploadComplete(
-    bool           loadSuccess,
-    int32_t        textureId,
-    TextureSet     textureSet,
-    bool           useAtlasing,
-    const Vector4& atlasRect,
-    bool           premultiplied) override;
-
-  void LoadComplete(
-    bool               loadSuccess,
-    Devel::PixelBuffer pixelBuffer,
-    const VisualUrl&   url,
-    bool               preMultiplied) override;
+  /**
+   * @copydoc Toolkit::TextureUploadObserver::LoadComplete()
+   */
+  void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override;
 
 private:
-  std::vector<UrlStore>& mImageUrls;
-  std::vector<bool>      mReadyFlags;
-  unsigned int           mFront;
+  std::vector<UrlStore>&                 mImageUrls;
+  std::vector<bool>                      mReadyFlags;
+  std::vector<TextureManager::LoadState> mLoadStates;
+  uint32_t                               mCurrentFrameIndex;
 };
 
 } //namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-image/image-cache.cpp b/dali-toolkit/internal/visuals/animated-image/image-cache.cpp
index cccb085..2fda611 100644
--- a/dali-toolkit/internal/visuals/animated-image/image-cache.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/image-cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-#include "image-cache.h"
+// CLASS HEADER
+#include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
 
 namespace Dali
 {
@@ -22,15 +23,26 @@ namespace Toolkit
 {
 namespace Internal
 {
-ImageCache::ImageCache(TextureManager&                 textureManager,
-                       ImageCache::FrameReadyObserver& observer,
-                       unsigned int                    batchSize)
+ImageCache::ImageCache(TextureManager&                     textureManager,
+                       ImageDimensions                     size,
+                       Dali::FittingMode::Type             fittingMode,
+                       Dali::SamplingMode::Type            samplingMode,
+                       TextureManager::MaskingDataPointer& maskingData,
+                       ImageCache::FrameReadyObserver&     observer,
+                       uint32_t                            batchSize,
+                       uint32_t                            interval,
+                       bool                                preMultiplyOnLoad)
 : mTextureManager(textureManager),
   mObserver(observer),
+  mMaskingData(maskingData),
+  mDesiredSize(size),
+  mFittingMode(fittingMode),
+  mSamplingMode(samplingMode),
   mBatchSize(batchSize),
-  mUrlIndex(0u),
-  mWaitingForReadyFrame(false),
+  mInterval(interval),
+  mLoadState(TextureManager::LoadState::NOT_STARTED),
   mRequestingLoad(false),
+  mPreMultiplyOnLoad(preMultiplyOnLoad),
   mTextureManagerAlive(true)
 {
   mTextureManager.AddObserver(*this);
@@ -49,6 +61,11 @@ void ImageCache::TextureManagerDestroyed()
   mTextureManagerAlive = false;
 }
 
+void ImageCache::SetInterval(uint32_t interval)
+{
+  mInterval = interval;
+}
+
 } //namespace Internal
 } //namespace Toolkit
 } //namespace Dali
diff --git a/dali-toolkit/internal/visuals/animated-image/image-cache.h b/dali-toolkit/internal/visuals/animated-image/image-cache.h
index f21d707..c40a895 100644
--- a/dali-toolkit/internal/visuals/animated-image/image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/image-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_IMAGE_CACHE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
-#include <dali-toolkit/internal/visuals/texture-upload-observer.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
 
 namespace Dali
 {
@@ -37,16 +37,18 @@ public:
   {
   public:
     /**
-     * Informs observer when the next texture set is ready to display
+     * @brief Informs observer when the next texture set is ready to display
      * @param[in] textureSet The ready texture set
+     * @param[in] interval interval(ms) for the frame
+     * @param[in] preMultiplied whether the texture is premultied alpha or not.
      */
-    virtual void FrameReady(TextureSet textureSet) = 0;
+    virtual void FrameReady(TextureSet textureSet, uint32_t interval, bool preMultiplied) = 0;
   };
 
   struct UrlStore
   {
     TextureManager::TextureId mTextureId = TextureManager::INVALID_TEXTURE_ID;
-    std::string               mUrl;
+    VisualUrl                 mUrl;
   };
 
   /**
@@ -56,73 +58,109 @@ public:
 
 public:
   /**
-   * Constructor.
-   * @param[in] textureManager The texture manager
-   * @param[in] urlList List of urls to cache
-   * @param[in] observer FrameReady observer
-   * @param[in] batchSize The size of a batch to load
+   * @brief Constructor.
+   * @param[in] textureManager    The texture manager
+   * @param[in] size              The width and height to fit the loaded image to.
+   * @param[in] fittingMode       The FittingMode of the resource to load
+   * @param[in] samplingMode      The SamplingMode of the resource to load
+   * @param[in] observer          FrameReady observer
+   * @param[in] maskingData       Masking data to be applied.
+   * @param[in] batchSize         The size of a batch to load
+   * @param[in] interval          Time interval(ms) between each frame
+   * @param[in] preMultiplyOnLoad The flag if image's color should be multiplied by it's alpha
    *
    * This will start loading textures immediately, according to the
    * batch and cache sizes. The cache is as large as the number of urls.
    */
-  ImageCache(TextureManager&                 textureManager,
-             ImageCache::FrameReadyObserver& observer,
-             unsigned int                    batchSize);
+  ImageCache(TextureManager&                     textureManager,
+             ImageDimensions                     size,
+             Dali::FittingMode::Type             fittingMode,
+             Dali::SamplingMode::Type            samplingMode,
+             TextureManager::MaskingDataPointer& maskingData,
+             ImageCache::FrameReadyObserver&     observer,
+             uint32_t                            batchSize,
+             uint32_t                            interval,
+             bool                                preMultiplyOnLoad);
 
   virtual ~ImageCache();
 
   /**
-   * Get the first frame. If it's not ready, this will trigger the
+   * @brief Get the first frame. If it's not ready, this will trigger the
    * sending of FrameReady() when the image becomes ready.
+   *
+   * @return TextureSet of the first frame.
    */
   virtual TextureSet FirstFrame() = 0;
 
   /**
-   * Get the next frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
-   */
-  virtual TextureSet NextFrame() = 0;
-
-  /**
-   * Get the Nth frame. If it's not ready, this will trigger the
+   * @brief Get the Nth frame. If it's not ready, this will trigger the
    * sending of FrameReady() when the image becomes ready.
+   *
+   * @param[in] frameIndex required frame index to be returned.
+   * @return TextureSet of the frame index.
    */
   virtual TextureSet Frame(uint32_t frameIndex) = 0;
 
   /**
-   * Get the interval of Nth frame.
+   * @brief Get the interval(ms) of Nth frame.
+   *
+   * @param[in] frameIndex frame index to get frame interval.
+   * @return Time interval in millisecond between frames of frameIndex and frameIndex + 1.
    */
   virtual uint32_t GetFrameInterval(uint32_t frameIndex) const = 0;
 
   /**
-   * Get the current rendered frame index.
+   * @brief Get the current rendered frame index.
    * If there isn't any loaded frame, returns -1.
+   *
+   * @return Frame index of currently showing frame.
    */
   virtual int32_t GetCurrentFrameIndex() const = 0;
 
   /**
-   * Get total frame count of the animated image file.
+   * @brief Get total frame count of the animated image file.
+   *
+   * @return Total frame count of the animated image file.
    */
   virtual int32_t GetTotalFrameCount() const = 0;
 
+  /**
+   * @brief Clears animated image cache and remove loaded textures.
+   */
+  virtual void ClearCache() = 0;
+
+  /**
+   * @brief Set default interval(ms) between each frame.
+   *
+   * @param[in] interval time interval in millisecond to be used as default interval.
+   */
+  virtual void SetInterval(uint32_t interval);
+
 private:
   /**
-   * Called before the texture manager is destroyed.
+   * @brief Called before the texture manager is destroyed.
    */
   void TextureManagerDestroyed() final;
 
+  void AllocateMaskData();
+
 protected:
-  TextureManager&     mTextureManager;
-  FrameReadyObserver& mObserver;
-  unsigned int        mBatchSize;
-  unsigned int        mUrlIndex;
-  bool                mWaitingForReadyFrame : 1;
-  bool                mRequestingLoad : 1;
-  bool                mTextureManagerAlive : 1;
+  TextureManager&                     mTextureManager;
+  FrameReadyObserver&                 mObserver;
+  TextureManager::MaskingDataPointer& mMaskingData;
+  Dali::ImageDimensions               mDesiredSize;
+  Dali::FittingMode::Type             mFittingMode : 3;
+  Dali::SamplingMode::Type            mSamplingMode : 4;
+  uint32_t                            mBatchSize;
+  uint32_t                            mInterval;
+  TextureManager::LoadState           mLoadState;
+  bool                                mRequestingLoad : 1;
+  bool                                mPreMultiplyOnLoad : 1;
+  bool                                mTextureManagerAlive : 1;
 };
 
-} //namespace Internal
-} //namespace Toolkit
-} //namespace Dali
+} // namespace Internal
+} // namespace Toolkit
+} // namespace Dali
 
 #endif // DALI_TOOLKIT_INTERNAL_IMAGE_CACHE_H
diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp b/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp
index eba9341..370a678 100644
--- a/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,7 @@
  */
 
 // CLASS HEADER
-#include "rolling-animated-image-cache.h"
-
-// EXTERNAL HEADERS
+#include <dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h>
 
 // INTERNAL HEADERS
 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
@@ -29,24 +27,22 @@ namespace
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gAnimImgLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_ANIMATED_IMAGE");
 
-#define LOG_CACHE                                                                                                                 \
-  {                                                                                                                               \
-    std::ostringstream oss;                                                                                                       \
-    oss << "Size:" << mQueue.Count() << " [ ";                                                                                    \
-    for(std::size_t _i = 0; _i < mQueue.Count(); ++_i)                                                                            \
-    {                                                                                                                             \
-      oss << _i << "={ frm#: " << mQueue[_i].mFrameNumber << " tex: " << mImageUrls[mQueue[_i].mFrameNumber].mTextureId << "}, "; \
-    }                                                                                                                             \
-    oss << " ]" << std::endl;                                                                                                     \
-    DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "%s", oss.str().c_str());                                                    \
+#define LOG_CACHE                                                                                                       \
+  if(gAnimImgLogFilter->IsEnabledFor(Debug::Concise))                                                                   \
+  {                                                                                                                     \
+    std::ostringstream oss;                                                                                             \
+    oss << "Size:" << mQueue.Count() << " [ ";                                                                          \
+    for(std::size_t _i = 0; _i < mQueue.Count(); ++_i)                                                                  \
+    {                                                                                                                   \
+      oss << _i << "={ frm#: " << mQueue[_i].mFrameNumber << " tex: " << mTextureIds[mQueue[_i].mFrameNumber] << "}, "; \
+    }                                                                                                                   \
+    oss << " ]" << std::endl;                                                                                           \
+    DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "%s", oss.str().c_str());                                          \
   }
 
 #else
 #define LOG_CACHE
 #endif
-
-const bool ENABLE_ORIENTATION_CORRECTION(true);
-
 } // namespace
 
 namespace Dali
@@ -55,32 +51,44 @@ namespace Toolkit
 {
 namespace Internal
 {
-RollingAnimatedImageCache::RollingAnimatedImageCache(
-  TextureManager& textureManager, AnimatedImageLoading& animatedImageLoading, uint32_t frameCount, ImageCache::FrameReadyObserver& observer, uint16_t cacheSize, uint16_t batchSize, bool isSynchronousLoading)
-: ImageCache(textureManager, observer, batchSize),
+namespace
+{
+static constexpr uint32_t SINGLE_IMAGE_COUNT = 1u;
+static constexpr uint32_t FIRST_FRAME_INDEX  = 0u;
+} // namespace
+
+RollingAnimatedImageCache::RollingAnimatedImageCache(TextureManager&                     textureManager,
+                                                     ImageDimensions                     size,
+                                                     Dali::FittingMode::Type             fittingMode,
+                                                     Dali::SamplingMode::Type            samplingMode,
+                                                     AnimatedImageLoading&               animatedImageLoading,
+                                                     TextureManager::MaskingDataPointer& maskingData,
+                                                     ImageCache::FrameReadyObserver&     observer,
+                                                     uint16_t                            cacheSize,
+                                                     uint16_t                            batchSize,
+                                                     const Dali::WrapMode::Type&         wrapModeU,
+                                                     const Dali::WrapMode::Type&         wrapModeV,
+                                                     bool                                isSynchronousLoading,
+                                                     bool                                preMultiplyOnLoad)
+: ImageCache(textureManager, size, fittingMode, samplingMode, maskingData, observer, batchSize, 0u, preMultiplyOnLoad),
+  mImageUrl(animatedImageLoading.GetUrl()),
   mAnimatedImageLoading(animatedImageLoading),
-  mFrameCount(frameCount),
-  mFrameIndex(0),
+  mFrameCount(SINGLE_IMAGE_COUNT),
+  mFrameIndex(FIRST_FRAME_INDEX),
   mCacheSize(cacheSize),
   mQueue(cacheSize),
-  mIsSynchronousLoading(isSynchronousLoading),
-  mOnLoading(false)
+  mWrapModeU(wrapModeU),
+  mWrapModeV(wrapModeV),
+  mIsSynchronousLoading(isSynchronousLoading)
 {
-  mImageUrls.resize(mFrameCount);
+  mTextureIds.resize(mFrameCount);
   mIntervals.assign(mFrameCount, 0);
-  LoadBatch();
 }
 
 RollingAnimatedImageCache::~RollingAnimatedImageCache()
 {
-  if(mTextureManagerAlive)
-  {
-    while(!mQueue.IsEmpty())
-    {
-      ImageFrame imageFrame = mQueue.PopFront();
-      mTextureManager.Remove(mImageUrls[imageFrame.mFrameNumber].mTextureId, this);
-    }
-  }
+  ClearCache();
+  mAnimatedImageLoading.Reset();
 }
 
 TextureSet RollingAnimatedImageCache::Frame(uint32_t frameIndex)
@@ -88,60 +96,61 @@ TextureSet RollingAnimatedImageCache::Frame(uint32_t frameIndex)
   bool popExist = false;
   while(!mQueue.IsEmpty() && mQueue.Front().mFrameNumber != frameIndex)
   {
-    ImageFrame imageFrame = mQueue.PopFront();
-    mTextureManager.Remove(mImageUrls[imageFrame.mFrameNumber].mTextureId, this);
-    mImageUrls[imageFrame.mFrameNumber].mTextureId = TextureManager::INVALID_TEXTURE_ID;
-    popExist                                       = true;
+    PopFrontCache();
+    popExist = true;
   }
 
   TextureSet textureSet;
+  uint32_t   batchFrameIndex = frameIndex;
   // If we need to load new frame that are not stored in queue.
   // Load the frame synchronously.
+  bool synchronouslyLoaded = false;
   if(mIsSynchronousLoading && mQueue.IsEmpty())
   {
-    bool synchronousLoading = true;
-    textureSet              = mTextureManager.LoadAnimatedImageTexture(mAnimatedImageLoading, frameIndex, SamplingMode::BOX_THEN_LINEAR, synchronousLoading, mImageUrls[frameIndex].mTextureId, Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT, this);
-    mFrameIndex             = (frameIndex + 1) % mFrameCount;
+    auto preMultiplyOnLoading = mPreMultiplyOnLoad ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
+                                                   : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+    textureSet        = RequestFrameLoading(frameIndex, true, preMultiplyOnLoading);
+    batchFrameIndex   = (frameIndex + 1) % mFrameCount;
+    uint32_t interval = 0u;
+    if(textureSet)
+    {
+      synchronouslyLoaded = true;
+      interval            = mAnimatedImageLoading.GetFrameInterval(mQueue.Back().mFrameNumber);
+    }
+    MakeFrameReady(synchronouslyLoaded, textureSet, interval, preMultiplyOnLoading == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
   }
 
-  if(popExist || mQueue.IsEmpty())
+  if(popExist || mQueue.IsEmpty() || synchronouslyLoaded)
   {
     // If the frame of frameIndex was already loaded, load batch from the last frame of queue
     if(!mQueue.IsEmpty())
     {
       if(!mLoadWaitingQueue.empty())
       {
-        mFrameIndex = (mLoadWaitingQueue.back() + 1) % mFrameCount;
+        batchFrameIndex = (mLoadWaitingQueue.back() + 1) % mFrameCount;
       }
       else
       {
-        mFrameIndex = (mQueue.Back().mFrameNumber + 1) % mFrameCount;
+        batchFrameIndex = (mQueue.Back().mFrameNumber + 1) % mFrameCount;
       }
     }
     else
     {
-      mOnLoading = false;
       // If the request is for the first frame or a jumped frame(JUMP_TO) remove current waiting queue.
       mLoadWaitingQueue.clear();
       // If the queue is empty, and the frame of frameIndex is not loaded synchronously. load batch from the frame of frameIndex
       if(!textureSet)
       {
-        mFrameIndex = frameIndex;
+        batchFrameIndex = frameIndex;
       }
     }
-    LoadBatch();
+    LoadBatch(batchFrameIndex);
   }
 
-  if(!textureSet)
+  if(!textureSet && mLoadState != TextureManager::LoadState::LOAD_FAILED && IsFrontReady() == true)
   {
-    if(IsFrontReady() == true)
-    {
-      textureSet = GetFrontTextureSet();
-    }
-    else
-    {
-      mWaitingForReadyFrame = true;
-    }
+    textureSet = GetFrontTextureSet();
   }
 
   return textureSet;
@@ -149,32 +158,17 @@ TextureSet RollingAnimatedImageCache::Frame(uint32_t frameIndex)
 
 TextureSet RollingAnimatedImageCache::FirstFrame()
 {
-  return Frame(0u);
-}
-
-TextureSet RollingAnimatedImageCache::NextFrame()
-{
-  TextureSet textureSet;
-  if(!mQueue.IsEmpty())
-  {
-    uint32_t frameIndex = mQueue.Front().mFrameNumber;
-    if(IsFrontReady())
-    {
-      frameIndex = (frameIndex + 1) % mFrameCount;
-    }
-    textureSet = Frame(frameIndex);
-  }
-  else
-  {
-    DALI_LOG_ERROR("Cache is empty.");
-  }
-
+  TextureSet textureSet = Frame(FIRST_FRAME_INDEX);
   return textureSet;
 }
 
 uint32_t RollingAnimatedImageCache::GetFrameInterval(uint32_t frameIndex) const
 {
-  return mAnimatedImageLoading.GetFrameInterval(frameIndex);
+  if(frameIndex >= mIntervals.size())
+  {
+    return 0u;
+  }
+  return mIntervals[frameIndex];
 }
 
 int32_t RollingAnimatedImageCache::GetCurrentFrameIndex() const
@@ -196,7 +190,15 @@ bool RollingAnimatedImageCache::IsFrontReady() const
   return (!mQueue.IsEmpty() && mQueue.Front().mReady);
 }
 
-void RollingAnimatedImageCache::RequestFrameLoading(uint32_t frameIndex)
+TextureSet RollingAnimatedImageCache::RequestFrameLoading(uint32_t frameIndex)
+{
+  auto preMultiplyOnLoading = mPreMultiplyOnLoad ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
+                                                 : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+  return RequestFrameLoading(frameIndex, false, preMultiplyOnLoading);
+}
+
+TextureSet RollingAnimatedImageCache::RequestFrameLoading(uint32_t frameIndex, bool synchronousLoading, TextureManager::MultiplyOnLoad& preMultiplyOnLoading)
 {
   ImageFrame imageFrame;
   imageFrame.mFrameNumber = frameIndex;
@@ -204,39 +206,53 @@ void RollingAnimatedImageCache::RequestFrameLoading(uint32_t frameIndex)
 
   mQueue.PushBack(imageFrame);
 
-  mRequestingLoad = true;
+  mLoadState = TextureManager::LoadState::LOADING;
+
+  TextureManager::TextureId loadTextureId = TextureManager::INVALID_TEXTURE_ID;
+  TextureSet                textureSet    = mTextureManager.LoadAnimatedImageTexture(mImageUrl,
+                                                                   mAnimatedImageLoading,
+                                                                   frameIndex,
+                                                                   loadTextureId,
+                                                                   mMaskingData,
+                                                                   mDesiredSize,
+                                                                   mFittingMode,
+                                                                   mSamplingMode,
+                                                                   synchronousLoading,
+                                                                   this,
+                                                                   preMultiplyOnLoading);
+  if(textureSet)
+  {
+    Sampler sampler = Sampler::New();
+    sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+    textureSet.SetSampler(0u, sampler);
+  }
 
-  bool synchronousLoading = false;
-  mTextureManager.LoadAnimatedImageTexture(mAnimatedImageLoading, frameIndex, SamplingMode::BOX_THEN_LINEAR, synchronousLoading, mImageUrls[frameIndex].mTextureId, Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT, this);
+  mTextureIds[frameIndex] = loadTextureId;
 
-  mRequestingLoad = false;
+  return textureSet;
 }
 
-void RollingAnimatedImageCache::LoadBatch()
+void RollingAnimatedImageCache::LoadBatch(uint32_t frameIndex)
 {
   // Try and load up to mBatchSize images, until the cache is filled.
   // Once the cache is filled, as frames progress, the old frame is
   // removed, and another frame is loaded
-
-  bool frontFrameReady = IsFrontReady();
-  for(unsigned int i = 0; i < mBatchSize && mQueue.Count() + mLoadWaitingQueue.size() < static_cast<uint32_t>(mCacheSize) && !mQueue.IsFull(); ++i)
+  uint32_t minimumSize = std::min(mCacheSize, mFrameCount);
+  for(uint32_t i = 0; i < mBatchSize && (mQueue.Count() + mLoadWaitingQueue.size()) < minimumSize; ++i)
   {
-    if(!mOnLoading)
+    if(mLoadState != TextureManager::LoadState::LOADING)
     {
-      mOnLoading = true;
-      RequestFrameLoading(mFrameIndex);
+      RequestFrameLoading(frameIndex);
     }
     else
     {
-      mLoadWaitingQueue.push_back(mFrameIndex);
+      mLoadWaitingQueue.push_back(frameIndex);
     }
 
-    mFrameIndex++;
-    mFrameIndex %= mFrameCount;
+    frameIndex++;
+    frameIndex %= mFrameCount;
   }
 
-  CheckFrontFrame(frontFrameReady);
-
   LOG_CACHE;
 }
 
@@ -256,77 +272,129 @@ TextureSet RollingAnimatedImageCache::GetFrontTextureSet() const
 {
   DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "RollingAnimatedImageCache::GetFrontTextureSet() FrameNumber:%d\n", mQueue[0].mFrameNumber);
 
-  TextureManager::TextureId textureId = GetCachedTextureId(0);
-  return mTextureManager.GetTextureSet(textureId);
+  TextureManager::TextureId textureId  = GetCachedTextureId(0);
+  TextureSet                textureSet = mTextureManager.GetTextureSet(textureId);
+  if(textureSet)
+  {
+    Sampler sampler = Sampler::New();
+    sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+    textureSet.SetSampler(0u, sampler);
+  }
+  return textureSet;
 }
 
 TextureManager::TextureId RollingAnimatedImageCache::GetCachedTextureId(int index) const
 {
-  return mImageUrls[mQueue[index].mFrameNumber].mTextureId;
+  return mTextureIds[mQueue[index].mFrameNumber];
 }
 
-void RollingAnimatedImageCache::CheckFrontFrame(bool wasReady)
+void RollingAnimatedImageCache::PopFrontCache()
 {
-  if(mWaitingForReadyFrame && wasReady == false && IsFrontReady())
+  ImageFrame imageFrame = mQueue.PopFront();
+
+  mTextureManager.RequestRemove(mTextureIds[imageFrame.mFrameNumber], this);
+  mTextureIds[imageFrame.mFrameNumber] = TextureManager::INVALID_TEXTURE_ID;
+
+  if(mMaskingData && mMaskingData->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID)
   {
-    mWaitingForReadyFrame = false;
-    mObserver.FrameReady(GetFrontTextureSet());
+    if(mQueue.IsEmpty())
+    {
+      mMaskingData->mAlphaMaskId = TextureManager::INVALID_TEXTURE_ID;
+    }
   }
 }
 
-void RollingAnimatedImageCache::UploadComplete(
-  bool           loadSuccess,
-  int32_t        textureId,
-  TextureSet     textureSet,
-  bool           useAtlasing,
-  const Vector4& atlasRect,
-  bool           preMultiplied)
+void RollingAnimatedImageCache::ClearCache()
 {
-  DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::UploadComplete(textureId:%d) start\n", textureId);
-  LOG_CACHE;
-
-  bool frontFrameReady = IsFrontReady();
-
-  if(!mRequestingLoad)
+  while(mTextureManagerAlive && !mQueue.IsEmpty())
   {
-    SetImageFrameReady(textureId);
+    PopFrontCache();
+  }
+  mLoadWaitingQueue.clear();
+  mLoadState = TextureManager::LoadState::NOT_STARTED;
+}
 
-    CheckFrontFrame(frontFrameReady);
+void RollingAnimatedImageCache::MakeFrameReady(bool loadSuccess, TextureSet textureSet, uint32_t interval, bool preMultiplied)
+{
+  if(!loadSuccess)
+  {
+    mLoadState = TextureManager::LoadState::LOAD_FAILED;
+    // preMultiplied should be false because broken image don't premultiply alpha on load
+    mObserver.FrameReady(TextureSet(), 0, false);
   }
   else
   {
-    // UploadComplete has been called from within RequestLoad. TextureManager must
-    // therefore already have the texture cached, so make the texture ready.
-    // (Use the last texture, as the texture id hasn't been assigned yet)
-    mQueue.Back().mReady = true;
+    mLoadState = TextureManager::LoadState::LOAD_FINISHED;
+
+    // Reset size of Queue according to the real frame count.
+    if(mFrameCount != mAnimatedImageLoading.GetImageCount())
+    {
+      mFrameCount = mAnimatedImageLoading.GetImageCount();
+      mTextureIds.resize(mFrameCount);
+      mIntervals.assign(mFrameCount, 0u);
+    }
+
+    bool frontFrameReady = IsFrontReady();
+    // Because only one frame is on loading and the others are in mLoadWaitingQueue,
+    // mQueue.Back() is always the frame currently loaded.
+    mQueue.Back().mReady                   = true;
+    mIntervals[mQueue.Back().mFrameNumber] = interval;
+    // Check whether currently loaded frame is front of queue or not.
+    // If it is, notify frame ready to observer.
+    if(frontFrameReady == false && IsFrontReady())
+    {
+      mObserver.FrameReady(textureSet, interval, preMultiplied);
+    }
+  }
+}
+
+void RollingAnimatedImageCache::LoadComplete(bool loadSuccess, TextureInformation textureInformation)
+{
+  DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::LoadComplete(textureId:%d) start\n", textureInformation.textureId);
+  LOG_CACHE;
+
+  if(textureInformation.textureSet)
+  {
+    Sampler sampler = Sampler::New();
+    sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+    textureInformation.textureSet.SetSampler(0u, sampler);
   }
 
-  mOnLoading = false;
-  // The frames of a single animated image can not be loaded parallelly.
-  // Therefore, a frame is now loading, other orders are waiting.
-  // And, after the frame is loaded, requests load of next order.
-  if(!mLoadWaitingQueue.empty())
+  MakeFrameReady(loadSuccess, textureInformation.textureSet, textureInformation.interval, textureInformation.preMultiplied);
+
+  // TODO : We need to remove some below logics, since user can remove Visual during ResourceReady callback.
+
+  if(loadSuccess)
   {
-    uint32_t loadingIndex = mLoadWaitingQueue.front();
-    mLoadWaitingQueue.erase(mLoadWaitingQueue.begin());
-    mOnLoading = true;
-    RequestFrameLoading(loadingIndex);
+    // The frames of a single animated image can not be loaded parallelly.
+    // Therefore, a frame is now loading, other orders are waiting.
+    // And, after the frame is loaded, requests load of next order.
+    if(!mLoadWaitingQueue.empty())
+    {
+      uint32_t loadingIndex = mLoadWaitingQueue.front();
+      mLoadWaitingQueue.erase(mLoadWaitingQueue.begin());
+      RequestFrameLoading(loadingIndex);
+    }
+    else if(mQueue.Count() == 1u && textureInformation.frameCount > SINGLE_IMAGE_COUNT)
+    {
+      // There is only an image in queue and no waiting queue.
+      // Request to load batch once again.
+      uint32_t batchFrameIndex = 0u;
+      if(!mLoadWaitingQueue.empty())
+      {
+        batchFrameIndex = (mLoadWaitingQueue.back() + 1) % mFrameCount;
+      }
+      else
+      {
+        batchFrameIndex = (mQueue.Back().mFrameNumber + 1) % mFrameCount;
+      }
+      LoadBatch(batchFrameIndex);
+    }
   }
 
   LOG_CACHE;
 }
 
-void RollingAnimatedImageCache::LoadComplete(
-  bool               loadSuccess,
-  Devel::PixelBuffer pixelBuffer,
-  const VisualUrl&   url,
-  bool               preMultiplied)
-{
-  // LoadComplete is called if this TextureUploadObserver requested to load
-  // an image that will be returned as a type of PixelBuffer by using a method
-  // TextureManager::LoadPixelBuffer.
-}
-
 } //namespace Internal
 } //namespace Toolkit
 } //namespace Dali
diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h b/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h
index b1b4afc..5c63db5 100644
--- a/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ROLLING_ANIMATED_IMAGE_CACHE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
 #include <dali/devel-api/adaptor-framework/animated-image-loading.h>
 #include <dali/devel-api/common/circular-queue.h>
 
@@ -40,117 +40,150 @@ class RollingAnimatedImageCache : public ImageCache, public TextureUploadObserve
 {
 public:
   /**
-   * Constructor.
-   * @param[in] textureManager The texture manager
-   * @param[in] animatedImageLoader The loaded animated image
-   * @param[in] frameCount The number of frames in the animated image
-   * @param[in] observer FrameReady observer
-   * @param[in] cacheSize The size of the cache
-   * @param[in] batchSize The size of a batch to load
+   * @brief Constructor.
+   * @param[in] textureManager       The texture manager
+   * @param[in] size                 The width and height to fit the loaded image to.
+   * @param[in] fittingMode          The FittingMode of the resource to load
+   * @param[in] samplingMode         The SamplingMode of the resource to load
+   * @param[in] animatedImageLoading The loaded animated image
+   * @param[in] maskingData          Masking data to be applied.
+   * @param[in] observer             FrameReady observer
+   * @param[in] cacheSize            The size of the cache
+   * @param[in] batchSize            The size of a batch to load
+   * @param[in] wrapModeU            Horizontal Wrap mode
+   * @param[in] wrapModeV            Vertical Wrap mode
    * @param[in] isSynchronousLoading The flag to define whether to load first frame synchronously
+   * @param[in] preMultiplyOnLoad    The flag if image's color should be multiplied by it's alpha
    *
    * This will start loading textures immediately, according to the
    * batch and cache sizes.
    */
-  RollingAnimatedImageCache(TextureManager&                 textureManager,
-                            AnimatedImageLoading&           animatedImageLoader,
-                            uint32_t                        frameCount,
-                            ImageCache::FrameReadyObserver& observer,
-                            uint16_t                        cacheSize,
-                            uint16_t                        batchSize,
-                            bool                            isSynchronousLoading);
+  RollingAnimatedImageCache(TextureManager&                     textureManager,
+                            ImageDimensions                     size,
+                            Dali::FittingMode::Type             fittingMode,
+                            Dali::SamplingMode::Type            samplingMode,
+                            AnimatedImageLoading&               animatedImageLoading,
+                            TextureManager::MaskingDataPointer& maskingData,
+                            ImageCache::FrameReadyObserver&     observer,
+                            uint16_t                            cacheSize,
+                            uint16_t                            batchSize,
+                            const Dali::WrapMode::Type&         wrapModeU,
+                            const Dali::WrapMode::Type&         wrapModeV,
+                            bool                                isSynchronousLoading,
+                            bool                                preMultiplyOnLoad);
 
   /**
-   * Destructor
+   * @brief Destructor
    */
   ~RollingAnimatedImageCache() override;
 
   /**
-   * Get the Nth frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
+   * @copydoc Internal::ImageCache::Frame()
    */
   TextureSet Frame(uint32_t frameIndex) override;
 
   /**
-   * Get the first frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
+   * @copydoc Internal::ImageCache::FirstFrame()
    */
   TextureSet FirstFrame() override;
 
   /**
-   * Get the next frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
-   */
-  TextureSet NextFrame() override;
-
-  /**
-   * Get the interval of Nth frame.
+   * @copydoc Internal::ImageCache::GetFrameInterval()
    */
   uint32_t GetFrameInterval(uint32_t frameIndex) const override;
 
   /**
-   * Get the current rendered frame index.
-   * If there isn't any loaded frame, returns -1.
+   * @copydoc Internal::ImageCache::GetCurrentFrameIndex()
    */
   int32_t GetCurrentFrameIndex() const override;
 
   /**
-   * Get total frame count of the animated image file.
+   * @copydoc Internal::ImageCache::GetTotalFrameCount()
    */
   int32_t GetTotalFrameCount() const override;
 
+  /**
+   * @copydoc Internal::ImageCache::ClearCache()
+   */
+  void ClearCache() override;
+
 private:
   /**
+   * @brief Check whether the front frame is ready or not.
+   *
    * @return true if the front frame is ready
    */
   bool IsFrontReady() const;
 
   /**
-   * Request to Load a frame
+   * @brief Request to Load a frame asynchronously
+   *
+   * @param[in] frameIndex index of frame to be loaded.
+   *
+   * @return the texture set currently loaded.
+   */
+  TextureSet RequestFrameLoading(uint32_t frameIndex);
+
+  /**
+   * @brief Request to Load a frame
+   *
+   * @param[in] frameIndex             Index of frame to be loaded.
+   * @param[in] synchronousLoading     True if the frame should be loaded synchronously
+   * @param[in,out] preMultiplyOnLoad  True if the image color should be multiplied by it's alpha. Set to false if the
+   *                                   image has no alpha channel
+   *
+   * @return the texture set currently loaded.
    */
-  void RequestFrameLoading(uint32_t frameIndex);
+  TextureSet RequestFrameLoading(uint32_t frameIndex, bool synchronousLoading, TextureManager::MultiplyOnLoad& preMultiplyOnLoading);
 
   /**
-   * Load the next batch of images
+   * @brief Load the next batch of images
+   *
+   * @param[in] frameIndex starting frame index of batch to be loaded.
    */
-  void LoadBatch();
+  void LoadBatch(uint32_t frameIndex);
 
   /**
-   * Find the matching image frame, and set it to ready
+   * @brief Find the matching image frame, and set it to ready
+   *
+   * @param[in] textureId texture id to be marked as ready.
    */
   void SetImageFrameReady(TextureManager::TextureId textureId);
 
   /**
-   * Get the texture set of the front frame.
-   * @return the texture set
+   * @brief Get the texture set of the front frame.
+   *
+   * @return the texture set of the front of Cache.
    */
   TextureSet GetFrontTextureSet() const;
 
   /**
-   * Get the texture id of the given index
+   * @brief Get the texture id of the given index
+   *
+   * @param[in] index index of the queue.
    */
   TextureManager::TextureId GetCachedTextureId(int index) const;
 
   /**
-   * Check if the front frame has become ready - if so, inform observer
-   * @param[in] wasReady Readiness before call.
+   * @brief Make the loaded frame ready and notify it to the texture upload observer
+   *
+   * @param[in] loadSuccess whether the loading is succeded or not.
+   * @param[in] textureSet textureSet for this frame.
+   * @param[in] interval interval between this frame and next frame.
+   * @param[in] preMultiplied whether the texture is premultied alpha or not.
+   */
+  void MakeFrameReady(bool loadSuccess, TextureSet textureSet, uint32_t interval, bool preMultiplied);
+
+  /**
+   * @brief Pop front entity of Cache.
    */
-  void CheckFrontFrame(bool wasReady);
+  void PopFrontCache();
 
 protected:
-  void UploadComplete(
-    bool           loadSuccess,
-    int32_t        textureId,
-    TextureSet     textureSet,
-    bool           useAtlasing,
-    const Vector4& atlasRect,
-    bool           preMultiplied) override;
-
-  void LoadComplete(
-    bool               loadSuccess,
-    Devel::PixelBuffer pixelBuffer,
-    const VisualUrl&   url,
-    bool               preMultiplied) override;
+  /**
+   * @copydoc Toolkit::TextureUploadObserver::LoadComplete()
+   */
+  void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override;
 
 private:
   /**
@@ -158,20 +191,22 @@ private:
    */
   struct ImageFrame
   {
-    unsigned int mFrameNumber = 0u;
-    bool         mReady       = false;
+    uint32_t mFrameNumber = 0u;
+    bool     mReady       = false;
   };
+  std::vector<TextureManager::TextureId> mTextureIds;
 
+  VisualUrl                  mImageUrl;
   Dali::AnimatedImageLoading mAnimatedImageLoading;
   uint32_t                   mFrameCount;
-  int                        mFrameIndex;
-  int                        mCacheSize;
-  std::vector<UrlStore>      mImageUrls;
+  uint32_t                   mFrameIndex;
+  uint32_t                   mCacheSize;
   std::vector<int32_t>       mIntervals;
   std::vector<uint32_t>      mLoadWaitingQueue;
   CircularQueue<ImageFrame>  mQueue;
+  Dali::WrapMode::Type       mWrapModeU : 3;
+  Dali::WrapMode::Type       mWrapModeV : 3;
   bool                       mIsSynchronousLoading;
-  bool                       mOnLoading;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.cpp b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.cpp
index 9bcf8e4..0bb1629 100644
--- a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ namespace
 Debug::Filter* gAnimImgLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_ANIMATED_IMAGE");
 
 #define LOG_CACHE                                                                                                                                                        \
+  if(gAnimImgLogFilter->IsEnabledFor(Debug::Concise))                                                                                                                    \
   {                                                                                                                                                                      \
     std::ostringstream oss;                                                                                                                                              \
     oss << "Size:" << mQueue.Count() << " [ ";                                                                                                                           \
@@ -44,7 +45,9 @@ Debug::Filter* gAnimImgLogFilter = Debug::Filter::New(Debug::NoLogging, false, "
 #define LOG_CACHE
 #endif
 
-const bool ENABLE_ORIENTATION_CORRECTION(true);
+static constexpr bool ENABLE_ORIENTATION_CORRECTION(true);
+
+static constexpr uint32_t FIRST_FRAME_INDEX = 0u;
 
 } // namespace
 
@@ -54,101 +57,68 @@ namespace Toolkit
 {
 namespace Internal
 {
-RollingImageCache::RollingImageCache(
-  TextureManager& textureManager, UrlList& urlList, ImageCache::FrameReadyObserver& observer, uint16_t cacheSize, uint16_t batchSize)
-: ImageCache(textureManager, observer, batchSize),
+RollingImageCache::RollingImageCache(TextureManager&                     textureManager,
+                                     ImageDimensions                     size,
+                                     Dali::FittingMode::Type             fittingMode,
+                                     Dali::SamplingMode::Type            samplingMode,
+                                     UrlList&                            urlList,
+                                     TextureManager::MaskingDataPointer& maskingData,
+                                     ImageCache::FrameReadyObserver&     observer,
+                                     uint16_t                            cacheSize,
+                                     uint16_t                            batchSize,
+                                     uint32_t                            interval,
+                                     bool                                preMultiplyOnLoad)
+: ImageCache(textureManager, size, fittingMode, samplingMode, maskingData, observer, batchSize, interval, preMultiplyOnLoad),
   mImageUrls(urlList),
   mQueue(cacheSize)
 {
-  LoadBatch();
 }
 
 RollingImageCache::~RollingImageCache()
 {
-  if(mTextureManagerAlive)
-  {
-    while(!mQueue.IsEmpty())
-    {
-      ImageFrame imageFrame = mQueue.PopFront();
-      mTextureManager.Remove(mImageUrls[imageFrame.mUrlIndex].mTextureId, this);
-    }
-  }
+  ClearCache();
 }
 
 TextureSet RollingImageCache::Frame(uint32_t frameIndex)
 {
-  // If a frame of frameIndex is not loaded, clear the queue and remove all loaded textures.
-  if(mImageUrls[frameIndex].mTextureId == TextureManager::INVALID_TEXTURE_ID)
+  // Pop frames until the frame of frameIndex become front frame.
+  bool popExist = false;
+  while(!mQueue.IsEmpty() && mQueue.Front().mUrlIndex != frameIndex)
   {
-    mUrlIndex = frameIndex;
-    while(!mQueue.IsEmpty())
-    {
-      ImageFrame imageFrame = mQueue.PopFront();
-      mTextureManager.Remove(mImageUrls[imageFrame.mUrlIndex].mTextureId, this);
-      mImageUrls[imageFrame.mUrlIndex].mTextureId = TextureManager::INVALID_TEXTURE_ID;
-    }
-    LoadBatch();
+    PopFrontCache();
+    popExist = true;
   }
-  // If the frame is already loaded, remove previous frames of the frame in the queue
-  // and load new frames amount of removed frames.
-  else
+
+  // TODO: synchronous loading of first frame.
+  if(popExist || mQueue.IsEmpty())
   {
-    bool popExist = false;
-    while(!mQueue.IsEmpty() && mQueue.Front().mUrlIndex != frameIndex)
-    {
-      ImageFrame imageFrame = mQueue.PopFront();
-      mTextureManager.Remove(mImageUrls[imageFrame.mUrlIndex].mTextureId, this);
-      mImageUrls[imageFrame.mUrlIndex].mTextureId = TextureManager::INVALID_TEXTURE_ID;
-      popExist                                    = true;
-    }
-    if(popExist)
+    uint32_t batchFrameIndex = frameIndex;
+    // If the frame of frameIndex was already loaded, load batch from the last frame of queue
+    if(!mQueue.IsEmpty())
     {
-      mUrlIndex = (mQueue.Back().mUrlIndex + 1) % mImageUrls.size();
-      LoadBatch();
+      batchFrameIndex = (mQueue.Back().mUrlIndex + 1) % static_cast<uint32_t>(mImageUrls.size());
     }
+    LoadBatch(batchFrameIndex);
   }
 
   TextureSet textureSet;
-  if(IsFrontReady() == true)
+  if(IsFrontReady() == true && mLoadState != TextureManager::LoadState::LOAD_FAILED)
   {
     textureSet = GetFrontTextureSet();
   }
-  else
-  {
-    mWaitingForReadyFrame = true;
-  }
 
   return textureSet;
 }
 
 TextureSet RollingImageCache::FirstFrame()
 {
-  return Frame(0u);
-}
-
-TextureSet RollingImageCache::NextFrame()
-{
-  TextureSet textureSet;
-  if(!mQueue.IsEmpty())
-  {
-    uint32_t frameIndex = mQueue.Front().mUrlIndex;
-    if(IsFrontReady())
-    {
-      frameIndex = (frameIndex + 1) % mImageUrls.size();
-    }
-    textureSet = Frame(frameIndex);
-  }
-  else
-  {
-    DALI_LOG_ERROR("Cache is empty.");
-  }
-
+  TextureSet textureSet = Frame(FIRST_FRAME_INDEX);
   return textureSet;
 }
 
 uint32_t RollingImageCache::GetFrameInterval(uint32_t frameIndex) const
 {
-  return 0u;
+  return mInterval;
 }
 
 int32_t RollingImageCache::GetCurrentFrameIndex() const
@@ -170,123 +140,142 @@ bool RollingImageCache::IsFrontReady() const
   return (!mQueue.IsEmpty() && mQueue.Front().mReady);
 }
 
-void RollingImageCache::LoadBatch()
+void RollingImageCache::LoadBatch(uint32_t frameIndex)
 {
   // Try and load up to mBatchSize images, until the cache is filled.
   // Once the cache is filled, as frames progress, the old frame is
   // cleared, but not erased, and another image is loaded
-  bool frontFrameReady = IsFrontReady();
-
   for(unsigned int i = 0; i < mBatchSize && !mQueue.IsFull(); ++i)
   {
     ImageFrame imageFrame;
 
-    std::string& url     = mImageUrls[mUrlIndex].mUrl;
-    imageFrame.mUrlIndex = mUrlIndex;
+    VisualUrl& url       = mImageUrls[frameIndex].mUrl;
+    imageFrame.mUrlIndex = frameIndex;
     imageFrame.mReady    = false;
 
-    ++mUrlIndex;
-    mUrlIndex %= mImageUrls.size();
-
     mQueue.PushBack(imageFrame);
 
-    // Note, if the image is already loaded, then UploadComplete will get called
+    // Note, if the image is already loaded, then LoadComplete will get called
     // from within this method. This means it won't yet have a texture id, so we
-    // need to account for this inside the UploadComplete method using mRequestingLoad.
+    // need to account for this inside the LoadComplete method using mRequestingLoad.
     mRequestingLoad = true;
+    mLoadState      = TextureManager::LoadState::LOADING;
 
-    bool                               synchronousLoading = false;
-    bool                               atlasingStatus     = false;
-    bool                               loadingStatus      = false;
-    TextureManager::MaskingDataPointer maskInfo           = nullptr;
-    AtlasUploadObserver*               atlasObserver      = nullptr;
-    ImageAtlasManagerPtr               imageAtlasManager  = nullptr;
-    Vector4                            textureRect;
-    Dali::ImageDimensions              textureRectSize;
-    auto                               preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+    bool                  synchronousLoading = false;
+    bool                  atlasingStatus     = false;
+    bool                  loadingStatus      = false;
+    AtlasUploadObserver*  atlasObserver      = nullptr;
+    ImageAtlasManagerPtr  imageAtlasManager  = nullptr;
+    Vector4               textureRect;
+    Dali::ImageDimensions textureRectSize;
 
-    mTextureManager.LoadTexture(
-      url, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, maskInfo, synchronousLoading, mImageUrls[imageFrame.mUrlIndex].mTextureId, textureRect, textureRectSize, atlasingStatus, loadingStatus, Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT, this, atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED, preMultiply);
+    auto preMultiplyOnLoading = mPreMultiplyOnLoad ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
+                                                   : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+    TextureManager::TextureId loadTextureId = TextureManager::INVALID_TEXTURE_ID;
+    TextureSet                textureSet    = mTextureManager.LoadTexture(
+      url, mDesiredSize, mFittingMode, mSamplingMode, mMaskingData, synchronousLoading, loadTextureId, textureRect, textureRectSize, atlasingStatus, loadingStatus, this, atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED, preMultiplyOnLoading);
+    mImageUrls[imageFrame.mUrlIndex].mTextureId = loadTextureId;
 
     mRequestingLoad = false;
-  }
 
-  CheckFrontFrame(frontFrameReady);
+    ++frameIndex;
+    frameIndex %= mImageUrls.size();
+  }
 }
 
-void RollingImageCache::SetImageFrameReady(TextureManager::TextureId textureId)
+TextureSet RollingImageCache::GetFrontTextureSet() const
 {
-  for(std::size_t i = 0; i < mQueue.Count(); ++i)
+  TextureManager::TextureId textureId  = GetCachedTextureId(0);
+  TextureSet                textureSet = mTextureManager.GetTextureSet(textureId);
+  if(textureSet)
   {
-    if(GetCachedTextureId(i) == textureId)
-    {
-      mQueue[i].mReady = true;
-      break;
-    }
+    Sampler sampler = Sampler::New();
+    sampler.SetWrapMode(Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT);
+    textureSet.SetSampler(0u, sampler);
   }
+  return textureSet;
 }
 
-TextureSet RollingImageCache::GetFrontTextureSet() const
+TextureManager::TextureId RollingImageCache::GetCachedTextureId(int index) const
 {
-  TextureManager::TextureId textureId = GetCachedTextureId(0);
-  return mTextureManager.GetTextureSet(textureId);
+  return mImageUrls[mQueue[index].mUrlIndex].mTextureId;
 }
 
-TextureManager::TextureId RollingImageCache::GetCachedTextureId(int index) const
+void RollingImageCache::PopFrontCache()
 {
-  return mImageUrls[mQueue[index].mUrlIndex].mTextureId;
+  ImageFrame imageFrame = mQueue.PopFront();
+
+  mTextureManager.RequestRemove(mImageUrls[imageFrame.mUrlIndex].mTextureId, this);
+  mImageUrls[imageFrame.mUrlIndex].mTextureId = TextureManager::INVALID_TEXTURE_ID;
+
+  if(mMaskingData && mMaskingData->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID)
+  {
+    if(mQueue.IsEmpty())
+    {
+      mMaskingData->mAlphaMaskId = TextureManager::INVALID_TEXTURE_ID;
+    }
+  }
 }
 
-void RollingImageCache::CheckFrontFrame(bool wasReady)
+void RollingImageCache::ClearCache()
 {
-  if(mWaitingForReadyFrame && wasReady == false && IsFrontReady())
+  while(mTextureManagerAlive && !mQueue.IsEmpty())
   {
-    mWaitingForReadyFrame = false;
-    mObserver.FrameReady(GetFrontTextureSet());
+    PopFrontCache();
   }
+  mLoadState = TextureManager::LoadState::NOT_STARTED;
 }
 
-void RollingImageCache::UploadComplete(
-  bool           loadSuccess,
-  int32_t        textureId,
-  TextureSet     textureSet,
-  bool           useAtlasing,
-  const Vector4& atlasRect,
-  bool           preMultiplied)
+void RollingImageCache::LoadComplete(bool loadSuccess, TextureInformation textureInformation)
 {
-  DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::UploadComplete(textureId:%d) start\n", textureId);
+  DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::LoadComplete(textureId:%d) start\n", textureInformation.textureId);
   LOG_CACHE;
 
-  bool frontFrameReady = IsFrontReady();
-
-  if(!mRequestingLoad)
+  if(loadSuccess)
   {
-    SetImageFrameReady(textureId);
+    mLoadState           = TextureManager::LoadState::LOAD_FINISHED;
+    bool frontFrameReady = IsFrontReady();
+    if(!mRequestingLoad)
+    {
+      for(std::size_t i = 0; i < mQueue.Count(); ++i)
+      {
+        if(GetCachedTextureId(i) == textureInformation.textureId)
+        {
+          mQueue[i].mReady = true;
+          break;
+        }
+      }
+    }
+    else
+    {
+      // LoadComplete has been called from within RequestLoad. TextureManager must
+      // therefore already have the texture cached, so make the texture ready.
+      // (Use the last texture, as the texture id hasn't been assigned yet)
+      mQueue.Back().mReady = true;
+    }
 
-    CheckFrontFrame(frontFrameReady);
+    if(!frontFrameReady && IsFrontReady())
+    {
+      if(textureInformation.textureSet)
+      {
+        Sampler sampler = Sampler::New();
+        sampler.SetWrapMode(Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT);
+        textureInformation.textureSet.SetSampler(0u, sampler);
+      }
+      mObserver.FrameReady(textureInformation.textureSet, mInterval, textureInformation.preMultiplied);
+    }
   }
   else
   {
-    // UploadComplete has been called from within RequestLoad. TextureManager must
-    // therefore already have the texture cached, so make the texture ready.
-    // (Use the last texture, as the texture id hasn't been assigned yet)
-    mQueue.Back().mReady = true;
+    mLoadState = TextureManager::LoadState::LOAD_FAILED;
+    // preMultiplied should be false because broken image don't premultiply alpha on load
+    mObserver.FrameReady(TextureSet(), 0, false);
   }
 
   LOG_CACHE;
 }
 
-void RollingImageCache::LoadComplete(
-  bool               loadSuccess,
-  Devel::PixelBuffer pixelBuffer,
-  const VisualUrl&   url,
-  bool               preMultiplied)
-{
-  // LoadComplete is called if this TextureUploadObserver requested to load
-  // an image that will be returned as a type of PixelBuffer by using a method
-  // TextureManager::LoadPixelBuffer.
-}
-
 } //namespace Internal
 } //namespace Toolkit
 } //namespace Dali
diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
index 1fcbe88..1654d27 100644
--- a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ROLLING_IMAGE_CACHE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,8 @@
  */
 
 // EXTERNAL INCLUDES
-
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
 #include <dali/devel-api/common/circular-queue.h>
 
 namespace Dali
@@ -38,20 +37,32 @@ class RollingImageCache : public ImageCache, public TextureUploadObserver
 public:
   /**
    * Constructor.
-   * @param[in] textureManager The texture manager
-   * @param[in] urlList List of urls to cache
-   * @param[in] observer FrameReady observer
-   * @param[in] cacheSize The size of the cache
-   * @param[in] batchSize The size of a batch to load
+   * @param[in] textureManager    The texture manager
+   * @param[in] size              The width and height to fit the loaded image to.
+   * @param[in] fittingMode       The FittingMode of the resource to load
+   * @param[in] samplingMode      The SamplingMode of the resource to load
+   * @param[in] urlList           List of urls to cache
+   * @param[in] maskingData       Masking data to be applied.
+   * @param[in] observer          FrameReady observer
+   * @param[in] cacheSize         The size of the cache
+   * @param[in] batchSize         The size of a batch to load
+   * @param[in] interval          Time interval between each frame
+   * @param[in] preMultiplyOnLoad The flag if image's color should be multiplied by it's alpha
    *
    * This will start loading textures immediately, according to the
    * batch and cache sizes.
    */
-  RollingImageCache(TextureManager&                 textureManager,
-                    UrlList&                        urlList,
-                    ImageCache::FrameReadyObserver& observer,
-                    uint16_t                        cacheSize,
-                    uint16_t                        batchSize);
+  RollingImageCache(TextureManager&                     textureManager,
+                    ImageDimensions                     size,
+                    Dali::FittingMode::Type             fittingMode,
+                    Dali::SamplingMode::Type            samplingMode,
+                    UrlList&                            urlList,
+                    TextureManager::MaskingDataPointer& maskingData,
+                    ImageCache::FrameReadyObserver&     observer,
+                    uint16_t                            cacheSize,
+                    uint16_t                            batchSize,
+                    uint32_t                            interval,
+                    bool                                preMultiplyOnLoad);
 
   /**
    * Destructor
@@ -59,86 +70,74 @@ public:
   ~RollingImageCache() override;
 
   /**
-   * Get the Nth frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
+   * @copydoc Internal::ImageCache::Frame()
    */
   TextureSet Frame(uint32_t frameIndex) override;
 
   /**
-   * Get the first frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
+   * @copydoc Internal::ImageCache::FirstFrame()
    */
   TextureSet FirstFrame() override;
 
   /**
-   * Get the next frame. If it's not ready, this will trigger the
-   * sending of FrameReady() when the image becomes ready.
-   */
-  TextureSet NextFrame() override;
-
-  /**
-   * Get the interval of Nth frame.
+   * @copydoc Internal::ImageCache::GetFrameInterval()
    */
   uint32_t GetFrameInterval(uint32_t frameIndex) const override;
 
   /**
-   * Get the current rendered frame index.
-   * If there isn't any loaded frame, returns -1.
+   * @copydoc Internal::ImageCache::GetCurrentFrameIndex()
    */
   int32_t GetCurrentFrameIndex() const override;
 
   /**
-   * Get total frame count of the animated image file.
+   * @copydoc Internal::ImageCache::GetTotalFrameCount()
    */
   int32_t GetTotalFrameCount() const override;
 
-private:
   /**
-   * @return true if the front frame is ready
+   * @copydoc Internal::ImageCache::ClearCache()
    */
-  bool IsFrontReady() const;
+  void ClearCache() override;
 
+private:
   /**
-   * Load the next batch of images
+   * @brief Check whether the front frame is ready or not.
+   *
+   * @return true if the front frame is ready
    */
-  void LoadBatch();
+  bool IsFrontReady() const;
 
   /**
-   * Find the matching image frame, and set it to ready
+   * @brief Load the next batch of images
+   *
+   * @param[in] frameIndex starting frame index of batch to be loaded.
    */
-  void SetImageFrameReady(TextureManager::TextureId textureId);
+  void LoadBatch(uint32_t frameIndex);
 
   /**
-   * Get the texture set of the front frame.
-   * @return the texture set
+   * @brief Get the texture set of the front frame.
+   *
+   * @return the texture set of the front of Cache.
    */
   TextureSet GetFrontTextureSet() const;
 
   /**
-   * Get the texture id of the given index
+   * @brief Get the texture id of the given index
+   *
+   * @param[in] index index of the queue.
    */
   TextureManager::TextureId GetCachedTextureId(int index) const;
 
   /**
-   * Check if the front frame has become ready - if so, inform observer
-   * @param[in] wasReady Readiness before call.
+   * @brief Pop front entity of Cache.
    */
-  void CheckFrontFrame(bool wasReady);
+  void PopFrontCache();
 
 protected:
-  void UploadComplete(
-    bool           loadSuccess,
-    int32_t        textureId,
-    TextureSet     textureSet,
-    bool           useAtlasing,
-    const Vector4& atlasRect,
-    bool           preMultiplied) override;
-
-  void LoadComplete(
-    bool               loadSuccess,
-    Devel::PixelBuffer pixelBuffer,
-    const VisualUrl&   url,
-    bool               preMultiplied) override;
+  /**
+   * @copydoc Toolkit::TextureUploadObserver::LoadComplete()
+   */
+  void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override;
 
 private:
   /**
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
index 35d7456..9c81c3b 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,16 @@
 #include <dali/devel-api/common/stage.h>
 #include <dali/devel-api/rendering/renderer-devel.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/math/math-utils.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-signals-devel.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h>
 #include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
@@ -43,6 +47,8 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(1); // pixel area,
+
 const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
 // stop behavior
@@ -66,64 +72,67 @@ Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New(Debug::NoLogging,
 
 AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties)
 {
-  AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl));
+  AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl, ImageDimensions{}));
   visual->SetProperties(properties);
   visual->Initialize();
   return visual;
 }
 
-AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl)
+AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size)
 {
-  AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl));
+  AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl, size));
   visual->Initialize();
   return visual;
 }
 
-AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl)
+AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size)
 : Visual::Base(factoryCache, Visual::FittingMode::FILL, static_cast<Toolkit::Visual::Type>(Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE)),
-  mUrl(imageUrl),
+  mImageUrl(imageUrl),
   mAnimationData(),
   mVectorAnimationTask(new VectorAnimationTask(factoryCache)),
   mImageVisualShaderFactory(shaderFactory),
   mVisualSize(),
   mVisualScale(Vector2::ONE),
+  mDesiredSize(size),
   mPlacementActor(),
   mPlayState(DevelImageVisual::PlayState::STOPPED),
   mEventCallback(nullptr),
+  mLastSentPlayStateId(0u),
   mLoadFailed(false),
   mRendererAdded(false),
   mCoreShutdown(false),
-  mRedrawInScalingDown(true)
+  mRedrawInScalingDown(true),
+  mEnableFrameCache(false),
+  mUseNativeImage(false)
 {
   // the rasterized image is with pre-multiplied alpha format
-  mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
-
-  if(!mVectorAnimationTask->Load(mUrl.GetUrl()))
-  {
-    mLoadFailed = true;
-  }
-
-  mVectorAnimationTask->UploadCompletedSignal().Connect(this, &AnimatedVectorImageVisual::OnUploadCompleted);
-  mVectorAnimationTask->SetAnimationFinishedCallback(new EventThreadCallback(MakeCallback(this, &AnimatedVectorImageVisual::OnAnimationFinished)));
+  mImpl->mFlags |= Visual::Base::Impl::IS_PREMULTIPLIED_ALPHA;
 
-  auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager();
-  vectorAnimationManager.AddObserver(*this);
+  // By default, load a file synchronously
+  mImpl->mFlags |= Visual::Base::Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
 }
 
 AnimatedVectorImageVisual::~AnimatedVectorImageVisual()
 {
   if(!mCoreShutdown)
   {
+    if(mImageUrl.IsBufferResource())
+    {
+      TextureManager& textureManager = mFactoryCache.GetTextureManager();
+      textureManager.RemoveEncodedImageBuffer(mImageUrl.GetUrl());
+    }
+
     auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager();
     vectorAnimationManager.RemoveObserver(*this);
 
     if(mEventCallback)
     {
       mFactoryCache.GetVectorAnimationManager().UnregisterEventCallback(mEventCallback);
+      mEventCallback = nullptr;
     }
 
     // Finalize animation task and disconnect the signal in the main thread
-    mVectorAnimationTask->UploadCompletedSignal().Disconnect(this, &AnimatedVectorImageVisual::OnUploadCompleted);
+    mVectorAnimationTask->ResourceReadySignal().Disconnect(this, &AnimatedVectorImageVisual::OnResourceReady);
     mVectorAnimationTask->Finalize();
   }
 }
@@ -136,16 +145,39 @@ void AnimatedVectorImageVisual::VectorAnimationManagerDestroyed()
 
 void AnimatedVectorImageVisual::GetNaturalSize(Vector2& naturalSize)
 {
-  if(mVisualSize != Vector2::ZERO)
+  if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0)
+  {
+    naturalSize.x = mDesiredSize.GetWidth();
+    naturalSize.y = mDesiredSize.GetHeight();
+  }
+  else if(mVisualSize != Vector2::ZERO)
   {
     naturalSize = mVisualSize;
   }
   else
   {
-    uint32_t width, height;
-    mVectorAnimationTask->GetDefaultSize(width, height);
-    naturalSize.x = width;
-    naturalSize.y = height;
+    if(mLoadFailed && mImpl->mRenderer)
+    {
+      // Load failed, use broken image size
+      auto textureSet = mImpl->mRenderer.GetTextures();
+      if(textureSet && textureSet.GetTextureCount())
+      {
+        auto texture = textureSet.GetTexture(0);
+        if(texture)
+        {
+          naturalSize.x = texture.GetWidth();
+          naturalSize.y = texture.GetHeight();
+          return;
+        }
+      }
+    }
+    else
+    {
+      uint32_t width, height;
+      mVectorAnimationTask->GetDefaultSize(width, height);
+      naturalSize.x = width;
+      naturalSize.y = height;
+    }
   }
 
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::GetNaturalSize: w = %f, h = %f [%p]\n", naturalSize.width, naturalSize.height, this);
@@ -155,9 +187,9 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap(Property::Map& map) const
 {
   map.Clear();
   map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE);
-  if(mUrl.IsValid())
+  if(mImageUrl.IsValid())
   {
-    map.Insert(Toolkit::ImageVisual::Property::URL, mUrl.GetUrl());
+    map.Insert(Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl());
   }
   map.Insert(Toolkit::DevelImageVisual::Property::LOOP_COUNT, mAnimationData.loopCount);
 
@@ -180,6 +212,15 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap(Property::Map& map) const
   Property::Map layerInfo;
   mVectorAnimationTask->GetLayerInfo(layerInfo);
   map.Insert(Toolkit::DevelImageVisual::Property::CONTENT_INFO, layerInfo);
+
+  Property::Map markerInfo;
+  mVectorAnimationTask->GetMarkerInfo(markerInfo);
+  map.Insert(Toolkit::DevelImageVisual::Property::MARKER_INFO, markerInfo);
+
+  map.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired());
+  map.Insert(Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth());
+  map.Insert(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight());
+  map.Insert(Toolkit::DevelImageVisual::Property::ENABLE_FRAME_CACHE, mEnableFrameCache);
 }
 
 void AnimatedVectorImageVisual::DoCreateInstancePropertyMap(Property::Map& map) const
@@ -187,6 +228,15 @@ void AnimatedVectorImageVisual::DoCreateInstancePropertyMap(Property::Map& map)
   // Do nothing
 }
 
+void AnimatedVectorImageVisual::EnablePreMultipliedAlpha(bool preMultiplied)
+{
+  // Make always enable pre multiplied alpha whether preMultiplied value is false.
+  if(!preMultiplied)
+  {
+    DALI_LOG_WARNING("Note : AnimatedVectorVisual cannot disable PreMultipliedAlpha\n");
+  }
+}
+
 void AnimatedVectorImageVisual::DoSetProperties(const Property::Map& propertyMap)
 {
   // url already passed in from constructor
@@ -219,6 +269,22 @@ void AnimatedVectorImageVisual::DoSetProperties(const Property::Map& propertyMap
       {
         DoSetProperty(Toolkit::DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, keyValue.second);
       }
+      else if(keyValue.first == SYNCHRONOUS_LOADING)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second);
+      }
+      else if(keyValue.first == IMAGE_DESIRED_WIDTH)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_WIDTH, keyValue.second);
+      }
+      else if(keyValue.first == IMAGE_DESIRED_HEIGHT)
+      {
+        DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, keyValue.second);
+      }
+      else if(keyValue.first == ENABLE_FRAME_CACHE)
+      {
+        DoSetProperty(Toolkit::DevelImageVisual::Property::ENABLE_FRAME_CACHE, keyValue.second);
+      }
     }
   }
 
@@ -247,6 +313,17 @@ void AnimatedVectorImageVisual::DoSetProperty(Property::Index index, const Prope
         mAnimationData.playRange = *array;
         mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_RANGE;
       }
+      else if(value.GetType() == Property::STRING)
+      {
+        std::string markerName;
+        if(value.Get(markerName))
+        {
+          Property::Array array;
+          array.Add(markerName);
+          mAnimationData.playRange = std::move(array);
+          mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_RANGE;
+        }
+      }
       break;
     }
     case Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR:
@@ -278,22 +355,96 @@ void AnimatedVectorImageVisual::DoSetProperty(Property::Index index, const Prope
       }
       break;
     }
+    case Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING:
+    {
+      bool sync = false;
+      if(value.Get(sync))
+      {
+        if(sync)
+        {
+          mImpl->mFlags |= Visual::Base::Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+        }
+        else
+        {
+          mImpl->mFlags &= ~Visual::Base::Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+        }
+      }
+      break;
+    }
+    case Toolkit::ImageVisual::Property::DESIRED_WIDTH:
+    {
+      int32_t desiredWidth = 0;
+      if(value.Get(desiredWidth))
+      {
+        mDesiredSize.SetWidth(desiredWidth);
+      }
+      break;
+    }
+
+    case Toolkit::ImageVisual::Property::DESIRED_HEIGHT:
+    {
+      int32_t desiredHeight = 0;
+      if(value.Get(desiredHeight))
+      {
+        mDesiredSize.SetHeight(desiredHeight);
+      }
+      break;
+    }
+
+    case Toolkit::DevelImageVisual::Property::ENABLE_FRAME_CACHE:
+    {
+      bool enableFrameCache = false;
+      if(value.Get(enableFrameCache))
+      {
+        mEnableFrameCache = enableFrameCache;
+        if(mVectorAnimationTask)
+        {
+          mVectorAnimationTask->KeepRasterizedBuffer(mEnableFrameCache);
+        }
+      }
+      break;
+    }
   }
 }
 
 void AnimatedVectorImageVisual::OnInitialize(void)
 {
+  mVectorAnimationTask->ResourceReadySignal().Connect(this, &AnimatedVectorImageVisual::OnResourceReady);
+  mVectorAnimationTask->SetAnimationFinishedCallback(MakeCallback(this, &AnimatedVectorImageVisual::OnAnimationFinished));
+
+  EncodedImageBuffer encodedImageBuffer;
+
+  if(mImageUrl.IsBufferResource())
+  {
+    // Increase reference count of External Resources :
+    // EncodedImageBuffer.
+    // Reference count will be decreased at destructor of the visual.
+    TextureManager& textureManager = mFactoryCache.GetTextureManager();
+    textureManager.UseExternalResource(mImageUrl.GetUrl());
+
+    encodedImageBuffer = textureManager.GetEncodedImageBuffer(mImageUrl.GetUrl());
+  }
+
+  mVectorAnimationTask->KeepRasterizedBuffer(mEnableFrameCache);
+  mVectorAnimationTask->RequestLoad(mImageUrl, encodedImageBuffer, IsSynchronousLoadingRequired());
+
+  auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager();
+  vectorAnimationManager.AddObserver(*this);
+
   Shader shader = GenerateShader();
 
   Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
   TextureSet textureSet = TextureSet::New();
   mImpl->mRenderer.SetTextures(textureSet);
 
   // Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+
+  mVectorAnimationTask->SetRenderer(mImpl->mRenderer);
 }
 
 void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor)
@@ -305,20 +456,14 @@ void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor)
 
   if(mLoadFailed)
   {
-    TextureSet textureSet = TextureSet::New();
-    mImpl->mRenderer.SetTextures(textureSet);
-
-    Texture brokenImage = mFactoryCache.GetBrokenVisualImage();
-    textureSet.SetTexture(0u, brokenImage);
-
+    Vector2 imageSize = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+    mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize, false);
     actor.AddRenderer(mImpl->mRenderer);
-
+    mRendererAdded = true;
     ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
   }
   else
   {
-    mVectorAnimationTask->SetRenderer(mImpl->mRenderer);
-
     // Add property notification for scaling & size
     mScaleNotification = actor.AddPropertyNotification(Actor::Property::WORLD_SCALE, StepCondition(0.1f, 1.0f));
     mScaleNotification.NotifySignal().Connect(this, &AnimatedVectorImageVisual::OnScaleNotification);
@@ -333,6 +478,15 @@ void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor)
     {
       DevelWindow::VisibilityChangedSignal(window).Connect(this, &AnimatedVectorImageVisual::OnWindowVisibilityChanged);
     }
+
+    if(mImpl->mEventObserver)
+    {
+      // The visual needs it's size set before it can be rasterized hence request relayout once on stage
+      mImpl->mEventObserver->RelayoutRequest(*this);
+    }
+
+    mAnimationData.resendFlag |= VectorAnimationTask::RESEND_NEED_RESOURCE_READY;
+    TriggerVectorRasterization();
   }
 
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnScene [%p]\n", this);
@@ -341,7 +495,7 @@ void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor)
 void AnimatedVectorImageVisual::DoSetOffScene(Actor& actor)
 {
   StopAnimation();
-  SendAnimationData();
+  TriggerVectorRasterization();
 
   if(mImpl->mRenderer)
   {
@@ -364,8 +518,10 @@ void AnimatedVectorImageVisual::DoSetOffScene(Actor& actor)
   mPlacementActor.Reset();
 
   // Reset the visual size to zero so that when adding the actor back to stage the rasterization is forced
-  mVisualSize  = Vector2::ZERO;
-  mVisualScale = Vector2::ONE;
+  mVisualSize           = Vector2::ZERO;
+  mVisualScale          = Vector2::ONE;
+  mAnimationData.width  = 0;
+  mAnimationData.height = 0;
 
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffScene [%p]\n", this);
 }
@@ -388,7 +544,7 @@ void AnimatedVectorImageVisual::OnSetTransform()
       mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE;
     }
 
-    SendAnimationData();
+    TriggerVectorRasterization();
   }
 }
 
@@ -410,11 +566,9 @@ void AnimatedVectorImageVisual::OnDoAction(const Property::Index actionId, const
     {
       if(IsOnScene() && mVisualSize != Vector2::ZERO)
       {
-        if(mAnimationData.playState != DevelImageVisual::PlayState::PLAYING)
-        {
-          mAnimationData.playState = DevelImageVisual::PlayState::PLAYING;
-          mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE;
-        }
+        // Always resend Playing state. If task is already playing, it will be ignored at Rasterize time.
+        mAnimationData.playState = DevelImageVisual::PlayState::PLAYING;
+        mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE;
       }
       mPlayState = DevelImageVisual::PlayState::PLAYING;
       break;
@@ -449,12 +603,11 @@ void AnimatedVectorImageVisual::OnDoAction(const Property::Index actionId, const
       }
       break;
     }
-    case DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY:
+    case DevelAnimatedVectorImageVisual::Action::FLUSH:
     {
-      const Property::Map* map = attributes.GetMap();
-      if(map)
+      if(DALI_LIKELY(!mCoreShutdown))
       {
-        DoSetProperties(*map);
+        SendAnimationData();
       }
       break;
     }
@@ -463,23 +616,94 @@ void AnimatedVectorImageVisual::OnDoAction(const Property::Index actionId, const
   TriggerVectorRasterization();
 }
 
-void AnimatedVectorImageVisual::OnUploadCompleted()
+void AnimatedVectorImageVisual::OnDoActionExtension(const Property::Index actionId, Dali::Any attributes)
 {
-  // If weak handle is holding a placement actor, it is the time to add the renderer to actor.
-  Actor actor = mPlacementActor.GetHandle();
-  if(actor && !mRendererAdded)
+  switch(actionId)
   {
-    actor.AddRenderer(mImpl->mRenderer);
-    mRendererAdded = true;
+    case DevelAnimatedVectorImageVisual::Action::SET_DYNAMIC_PROPERTY:
+    {
+      DevelAnimatedVectorImageVisual::DynamicPropertyInfo info = AnyCast<DevelAnimatedVectorImageVisual::DynamicPropertyInfo>(attributes);
+      mAnimationData.dynamicProperties.push_back(info);
+      mAnimationData.resendFlag |= VectorAnimationTask::RESEND_DYNAMIC_PROPERTY;
+      break;
+    }
+  }
+
+  TriggerVectorRasterization();
+}
+
+void AnimatedVectorImageVisual::OnResourceReady(VectorAnimationTask::ResourceStatus status)
+{
+  AnimatedVectorImageVisualPtr self = this; // Keep reference until this API finished
+
+  if(status == VectorAnimationTask::ResourceStatus::LOADED)
+  {
+    if(mImpl->mEventObserver)
+    {
+      mImpl->mEventObserver->RelayoutRequest(*this);
+    }
+  }
+  else
+  {
+    mLoadFailed = status == VectorAnimationTask::ResourceStatus::FAILED ? true : false;
+    if(status == VectorAnimationTask::ResourceStatus::READY)
+    {
+      // Texture was ready. Change the shader if we need.
+      bool useNativeImage = false;
+      if(mImpl->mRenderer)
+      {
+        auto textureSet = mImpl->mRenderer.GetTextures();
+        if(textureSet && textureSet.GetTextureCount() > 0)
+        {
+          auto texture = textureSet.GetTexture(0u);
+          if(texture)
+          {
+            useNativeImage = DevelTexture::IsNative(texture);
+
+            if(mUseNativeImage != useNativeImage)
+            {
+              mUseNativeImage = useNativeImage;
+              UpdateShader();
+            }
+          }
+        }
+      }
+    }
 
-    ResourceReady(Toolkit::Visual::ResourceStatus::READY);
+    // If weak handle is holding a placement actor, it is the time to add the renderer to actor.
+    Actor actor = mPlacementActor.GetHandle();
+    if(actor && !mRendererAdded)
+    {
+      if(!mLoadFailed)
+      {
+        actor.AddRenderer(mImpl->mRenderer);
+        ResourceReady(Toolkit::Visual::ResourceStatus::READY);
+      }
+      else
+      {
+        Vector2 imageSize = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+        mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize, false);
+        actor.AddRenderer(mImpl->mRenderer);
+        ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
+      }
 
-    DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnUploadCompleted: Renderer is added [%p]\n", this);
+      mRendererAdded = true;
+    }
   }
+
+  DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "status = %d [%p]\n", status, this);
 }
 
-void AnimatedVectorImageVisual::OnAnimationFinished()
+void AnimatedVectorImageVisual::OnAnimationFinished(uint32_t playStateId)
 {
+  // Only send event when animation is finished by the last Play/Pause/Stop request.
+  if(mLastSentPlayStateId != playStateId)
+  {
+    return;
+  }
+
+  AnimatedVectorImageVisualPtr self = this; // Keep reference until this API finished
+
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnAnimationFinished: action state = %d [%p]\n", mPlayState, this);
 
   if(mPlayState != DevelImageVisual::PlayState::STOPPED)
@@ -504,6 +728,13 @@ void AnimatedVectorImageVisual::SendAnimationData()
 {
   if(mAnimationData.resendFlag)
   {
+    if(mAnimationData.resendFlag & VectorAnimationTask::RESEND_PLAY_STATE)
+    {
+      // Keep last sent playId. It will be used when we try to emit AnimationFinished signal.
+      // The OnAnimationFinished signal what before Play/Pause/Stop action send could be come after action sent.
+      // To ensure the OnAnimationFinished signal comes belong to what we sent, we need to keep last sent playId.
+      mAnimationData.playStateId = ++mLastSentPlayStateId;
+    }
     mVectorAnimationTask->SetAnimationData(mAnimationData);
 
     if(mImpl->mRenderer)
@@ -524,12 +755,24 @@ void AnimatedVectorImageVisual::SendAnimationData()
 
 void AnimatedVectorImageVisual::SetVectorImageSize()
 {
-  uint32_t width  = static_cast<uint32_t>(mVisualSize.width * mVisualScale.width);
-  uint32_t height = static_cast<uint32_t>(mVisualSize.height * mVisualScale.height);
+  uint32_t width, height;
+  if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0)
+  {
+    width  = mDesiredSize.GetWidth();
+    height = mDesiredSize.GetHeight();
+  }
+  else
+  {
+    width  = static_cast<uint32_t>(mVisualSize.width * mVisualScale.width);
+    height = static_cast<uint32_t>(mVisualSize.height * mVisualScale.height);
+  }
 
-  mAnimationData.width  = width;
-  mAnimationData.height = height;
-  mAnimationData.resendFlag |= VectorAnimationTask::RESEND_SIZE;
+  if(mAnimationData.width != width || mAnimationData.height != height)
+  {
+    mAnimationData.width  = width;
+    mAnimationData.height = height;
+    mAnimationData.resendFlag |= VectorAnimationTask::RESEND_SIZE;
+  }
 }
 
 void AnimatedVectorImageVisual::StopAnimation()
@@ -561,7 +804,7 @@ void AnimatedVectorImageVisual::OnScaleNotification(PropertyNotification& source
   {
     Vector3 scale = actor.GetProperty<Vector3>(Actor::Property::WORLD_SCALE);
 
-    if(mRedrawInScalingDown || scale.width >= 1.0f || scale.height >= 1.0f)
+    if((!Dali::Equals(mVisualScale.width, scale.width) || !Dali::Equals(mVisualScale.height, scale.height)) && (mRedrawInScalingDown || scale.width >= 1.0f || scale.height >= 1.0f))
     {
       mVisualScale.width  = scale.width;
       mVisualScale.height = scale.height;
@@ -581,16 +824,20 @@ void AnimatedVectorImageVisual::OnSizeNotification(PropertyNotification& source)
   Actor actor = mPlacementActor.GetHandle();
   if(actor)
   {
-    Vector3 size       = actor.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
-    mVisualSize.width  = size.width;
-    mVisualSize.height = size.height;
+    Vector3 size = actor.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
 
-    DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSizeNotification: size = %f, %f [%p]\n", mVisualSize.width, mVisualSize.height, this);
+    if(!Dali::Equals(mVisualSize.width, size.width) || !Dali::Equals(mVisualSize.height, size.height))
+    {
+      mVisualSize.width  = size.width;
+      mVisualSize.height = size.height;
 
-    SetVectorImageSize();
-    SendAnimationData();
+      DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSizeNotification: size = %f, %f [%p]\n", mVisualSize.width, mVisualSize.height, this);
 
-    Stage::GetCurrent().KeepRendering(0.0f); // Trigger event processing
+      SetVectorImageSize();
+      SendAnimationData();
+
+      Stage::GetCurrent().KeepRendering(0.0f); // Trigger event processing
+    }
   }
 }
 
@@ -638,16 +885,14 @@ Shader AnimatedVectorImageVisual::GenerateShader() const
   {
     shader = mImageVisualShaderFactory.GetShader(
       mFactoryCache,
-      TextureAtlas::DISABLED,
-      DefaultTextureWrapMode::APPLY,
-      IsRoundedCornerRequired() ? RoundedCorner::ENABLED : RoundedCorner::DISABLED,
-      IsBorderlineRequired() ? Borderline::ENABLED : Borderline::DISABLED
-    );
+      ImageVisualShaderFeatureBuilder()
+        .EnableRoundedCorner(IsRoundedCornerRequired())
+        .EnableBorderline(IsBorderlineRequired())
+        .SetTextureForFragmentShaderCheck(mUseNativeImage ? mImpl->mRenderer.GetTextures().GetTexture(0) : Dali::Texture()));
   }
   return shader;
 }
 
-
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
index 4f1a859..fc7d7a4 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,9 +73,10 @@ public:
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    * @param[in] shaderFactory The ImageVisualShaderFactory object
    * @param[in] imageUrl The URL to an animated vector image to use
+   * @param[in] size The width and height of the rasterized buffer. The visual size will be used if these are 0.
    * @return A smart-pointer to the newly allocated visual.
    */
-  static AnimatedVectorImageVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
+  static AnimatedVectorImageVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size = ImageDimensions());
 
 public: // from Visual
   /**
@@ -93,6 +94,11 @@ public: // from Visual
    */
   void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
+  /**
+   * @copydoc Visual::Base::EnablePreMultipliedAlpha
+   */
+  void EnablePreMultipliedAlpha(bool preMultiplied) override;
+
 protected: // From VectorAnimationManager::LifecycleObserver:
   /**
    * @copydoc VectorAnimationManager::LifecycleObserver::VectorAnimationManagerDestroyed()
@@ -106,8 +112,9 @@ protected:
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    * @param[in] shaderFactory The ImageVisualShaderFactory object
    * @param[in] imageUrl The URL to an animated vector image to use
+   * @param[in] size The width and height of the rasterized buffer. The visual size will be used if these are 0.
    */
-  AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
+  AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size);
 
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -154,6 +161,11 @@ protected:
    */
   void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override;
 
+  /**
+   * @copydoc Visual::Base::OnDoActionExtension
+   */
+  void OnDoActionExtension(const Property::Index actionId, Dali::Any attributes) override;
+
 private:
   /**
    * Helper method to set individual values by index key.
@@ -163,14 +175,17 @@ private:
   void DoSetProperty(Property::Index index, const Property::Value& value);
 
   /**
-   * @brief Called when the texture upload is completed.
+   * @brief Called when the resource is ready.
+   * @param[in] status The resource status
    */
-  void OnUploadCompleted();
+  void OnResourceReady(VectorAnimationTask::ResourceStatus status);
 
   /**
    * @brief Event callback from rasterize thread. This is called after the animation is finished.
+   *
+   * @param[in] playStateId The play state id
    */
-  void OnAnimationFinished();
+  void OnAnimationFinished(uint32_t playStateId);
 
   /**
    * @brief Send animation data to the rasterize thread.
@@ -224,7 +239,7 @@ private:
   AnimatedVectorImageVisual& operator=(const AnimatedVectorImageVisual& visual) = delete;
 
 private:
-  VisualUrl                          mUrl;
+  VisualUrl                          mImageUrl;
   VectorAnimationTask::AnimationData mAnimationData;
   VectorAnimationTaskPtr             mVectorAnimationTask;
   ImageVisualShaderFactory&          mImageVisualShaderFactory;
@@ -232,13 +247,19 @@ private:
   PropertyNotification               mSizeNotification;
   Vector2                            mVisualSize;
   Vector2                            mVisualScale;
+  Dali::ImageDimensions              mDesiredSize{};
   WeakHandle<Actor>                  mPlacementActor;
   DevelImageVisual::PlayState::Type  mPlayState;
   CallbackBase*                      mEventCallback; // Not owned
-  bool                               mLoadFailed;
-  bool                               mRendererAdded;
-  bool                               mCoreShutdown;
-  bool                               mRedrawInScalingDown;
+
+  uint32_t mLastSentPlayStateId;
+
+  bool mLoadFailed : 1;
+  bool mRendererAdded : 1;
+  bool mCoreShutdown : 1;
+  bool mRedrawInScalingDown : 1;
+  bool mEnableFrameCache : 1;
+  bool mUseNativeImage : 1;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp
index f23439d..fda5168 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h>
@@ -37,6 +38,8 @@ namespace
 Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VECTOR_ANIMATION");
 #endif
 
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
+
 } // unnamed namespace
 
 VectorAnimationManager::VectorAnimationManager()
@@ -49,15 +52,11 @@ VectorAnimationManager::VectorAnimationManager()
 
 VectorAnimationManager::~VectorAnimationManager()
 {
-  for(auto&& iter : mEventCallbacks)
-  {
-    delete iter;
-  }
   mEventCallbacks.clear();
 
-  if(mProcessorRegistered)
+  if(mProcessorRegistered && Adaptor::IsAvailable())
   {
-    Adaptor::Get().UnregisterProcessor(*this);
+    Adaptor::Get().UnregisterProcessor(*this, true);
   }
 
   for(auto observer : mLifecycleObservers)
@@ -93,18 +92,22 @@ VectorAnimationThread& VectorAnimationManager::GetVectorAnimationThread()
 
 void VectorAnimationManager::RegisterEventCallback(CallbackBase* callback)
 {
-  mEventCallbacks.push_back(callback);
+  mEventCallbacks.emplace_back(std::unique_ptr<Dali::CallbackBase>(callback));
 
   if(!mProcessorRegistered)
   {
-    Adaptor::Get().RegisterProcessor(*this);
+    Adaptor::Get().RegisterProcessor(*this, true); // Use post processor to trigger after layoutting
     mProcessorRegistered = true;
   }
 }
 
 void VectorAnimationManager::UnregisterEventCallback(CallbackBase* callback)
 {
-  auto iter = std::find(mEventCallbacks.begin(), mEventCallbacks.end(), callback);
+  auto iter = std::find_if(mEventCallbacks.begin(),
+                           mEventCallbacks.end(),
+                           [callback](const std::unique_ptr<CallbackBase>& element) {
+                             return element.get() == callback;
+                           });
   if(iter != mEventCallbacks.end())
   {
     mEventCallbacks.erase(iter);
@@ -113,7 +116,7 @@ void VectorAnimationManager::UnregisterEventCallback(CallbackBase* callback)
     {
       if(Adaptor::IsAvailable())
       {
-        Adaptor::Get().UnregisterProcessor(*this);
+        Adaptor::Get().UnregisterProcessor(*this, true);
         mProcessorRegistered = false;
       }
     }
@@ -122,14 +125,37 @@ void VectorAnimationManager::UnregisterEventCallback(CallbackBase* callback)
 
 void VectorAnimationManager::Process(bool postProcessor)
 {
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    if(mEventCallbacks.size() > 0u)
+    {
+      std::ostringstream oss;
+      oss << "[" << mEventCallbacks.size() << "]";
+      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_VECTOR_ANIMATION_MANAGER_PROCESS", oss.str().c_str());
+    }
+  }
+#endif
+
   for(auto&& iter : mEventCallbacks)
   {
     CallbackBase::Execute(*iter);
-    delete iter;
   }
+
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    if(mEventCallbacks.size() > 0u)
+    {
+      std::ostringstream oss;
+      oss << "[" << mEventCallbacks.size() << "]";
+      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_VECTOR_ANIMATION_MANAGER_PROCESS", oss.str().c_str());
+    }
+  }
+#endif
   mEventCallbacks.clear();
 
-  Adaptor::Get().UnregisterProcessor(*this);
+  Adaptor::Get().UnregisterProcessor(*this, true);
   mProcessorRegistered = false;
 }
 
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h
index fe6b87a..c3cba21 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_VECTOR_ANIMATION_MANAGER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,6 +94,14 @@ protected: // Implementation of Processor
    */
   void Process(bool postProcessor) override;
 
+  /**
+   * @copydoc Dali::Integration::Processor::GetProcessorName()
+   */
+  std::string_view GetProcessorName() const override
+  {
+    return "VectorAnimationManager";
+  }
+
 private:
   // Undefined
   VectorAnimationManager(const VectorAnimationManager& manager) = delete;
@@ -102,10 +110,10 @@ private:
   VectorAnimationManager& operator=(const VectorAnimationManager& manager) = delete;
 
 private:
-  std::vector<CallbackBase*>             mEventCallbacks;
-  std::vector<LifecycleObserver*>        mLifecycleObservers;
-  std::unique_ptr<VectorAnimationThread> mVectorAnimationThread;
-  bool                                   mProcessorRegistered;
+  std::vector<std::unique_ptr<CallbackBase>> mEventCallbacks;
+  std::vector<LifecycleObserver*>            mLifecycleObservers;
+  std::unique_ptr<VectorAnimationThread>     mVectorAnimationThread;
+  bool                                       mProcessorRegistered;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
index 91bdc42..4f4e97d 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 #include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/file-loader.h>
 #include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
 #include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/object/property-array.h>
 
@@ -28,6 +30,13 @@
 #include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h>
 #include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
 
+#ifdef TRACE_ENABLED
+#include <chrono>
+#include <iomanip>
+#include <sstream>
+#include <thread>
+#endif
+
 namespace Dali
 {
 namespace Toolkit
@@ -43,15 +52,32 @@ constexpr auto MICROSECONDS_PER_SECOND(1e+6);
 Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VECTOR_ANIMATION");
 #endif
 
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
+
+#ifdef TRACE_ENABLED
+uint64_t GetNanoseconds()
+{
+  // Get the time of a monotonic clock since its epoch.
+  auto epoch    = std::chrono::steady_clock::now().time_since_epoch();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(epoch);
+  return static_cast<uint64_t>(duration.count());
+}
+#endif
+
 } // unnamed namespace
 
 VectorAnimationTask::VectorAnimationTask(VisualFactoryCache& factoryCache)
-: mUrl(),
+: AsyncTask(MakeCallback(this, &VectorAnimationTask::TaskCompleted), AsyncTask::PriorityType::HIGH, AsyncTask::ThreadType::WORKER_THREAD),
+  mImageUrl(),
+  mEncodedImageBuffer(),
   mVectorRenderer(VectorAnimationRenderer::New()),
   mAnimationData(),
   mVectorAnimationThread(factoryCache.GetVectorAnimationManager().GetVectorAnimationThread()),
-  mConditionalWait(),
-  mAnimationFinishedTrigger(),
+  mMutex(),
+  mResourceReadySignal(),
+  mLoadCompletedCallback(MakeCallback(this, &VectorAnimationTask::OnLoadCompleted)),
+  mCachedLayerInfo(),
+  mCachedMarkerInfo(),
   mPlayState(PlayState::STOPPED),
   mStopBehavior(DevelImageVisual::StopBehavior::CURRENT_FRAME),
   mLoopingMode(DevelImageVisual::LoopingMode::RESTART),
@@ -66,14 +92,24 @@ VectorAnimationTask::VectorAnimationTask(VisualFactoryCache& factoryCache)
   mWidth(0),
   mHeight(0),
   mAnimationDataIndex(0),
+  mAppliedPlayStateId(0u),
   mLoopCount(LOOP_FOREVER),
   mCurrentLoop(0),
   mForward(true),
   mUpdateFrameNumber(false),
   mNeedAnimationFinishedTrigger(true),
   mAnimationDataUpdated(false),
-  mDestroyTask(false)
+  mDestroyTask(false),
+  mLoadRequest(false),
+  mLoadFailed(false),
+  mRasterized(false),
+  mKeepAnimation(false),
+  mLayerInfoCached(false),
+  mMarkerInfoCached(false),
+  mEnableFrameCache(false),
+  mSizeUpdated(false)
 {
+  mVectorRenderer.UploadCompletedSignal().Connect(this, &VectorAnimationTask::OnUploadCompleted);
 }
 
 VectorAnimationTask::~VectorAnimationTask()
@@ -81,28 +117,120 @@ VectorAnimationTask::~VectorAnimationTask()
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::~VectorAnimationTask: destructor [%p]\n", this);
 }
 
-void VectorAnimationTask::Finalize()
+void VectorAnimationTask::Process()
 {
-  ConditionalWait::ScopedLock lock(mConditionalWait);
+  mRasterized = Rasterize();
+}
 
-  // Release some objects in the main thread
-  if(mAnimationFinishedTrigger)
+bool VectorAnimationTask::IsReady()
+{
+  return true;
+}
+
+void VectorAnimationTask::Finalize()
+{
   {
-    mAnimationFinishedTrigger.reset();
+    Mutex::ScopedLock lock(mMutex);
+
+    // Release some objects in the main thread
+    if(mAnimationFinishedCallback)
+    {
+      mVectorAnimationThread.RemoveEventTriggerCallbacks(mAnimationFinishedCallback.get());
+      mAnimationFinishedCallback.reset();
+    }
+    if(mLoadCompletedCallback)
+    {
+      mVectorAnimationThread.RemoveEventTriggerCallbacks(mLoadCompletedCallback.get());
+      mLoadCompletedCallback.reset();
+    }
+
+    mDestroyTask = true;
   }
 
   mVectorRenderer.Finalize();
+}
 
-  mDestroyTask = true;
+void VectorAnimationTask::TaskCompleted(VectorAnimationTaskPtr task)
+{
+  mVectorAnimationThread.OnTaskCompleted(task, task->IsRasterized(), task->IsAnimating());
 }
 
-bool VectorAnimationTask::Load(const std::string& url)
+bool VectorAnimationTask::IsRasterized()
 {
-  mUrl = url;
+  return mRasterized;
+}
+
+bool VectorAnimationTask::IsAnimating()
+{
+  return mKeepAnimation;
+}
+
+bool VectorAnimationTask::Load(bool synchronousLoading)
+{
+#ifdef TRACE_ENABLED
+  uint64_t mStartTimeNanoSceonds = 0;
+  uint64_t mEndTimeNanoSceonds   = 0;
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mStartTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << "[u:" << mImageUrl.GetEllipsedUrl() << "]";
+    // DALI_TRACE_BEGIN(gTraceFilter, "DALI_LOTTIE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("BEGIN: DALI_LOTTIE_LOADING_TASK %s", oss.str().c_str());
+  }
+#endif
+
+  if(mEncodedImageBuffer)
+  {
+    if(!mVectorRenderer.Load(mEncodedImageBuffer.GetRawBuffer()))
+    {
+      mLoadFailed = true;
+    }
 
-  if(!mVectorRenderer.Load(mUrl))
+    // We don't need to hold image buffer anymore.
+    mEncodedImageBuffer.Reset();
+  }
+  else if(mImageUrl.IsLocalResource())
   {
-    DALI_LOG_ERROR("VectorAnimationTask::Load: Load failed [%s]\n", mUrl.c_str());
+    if(!mVectorRenderer.Load(mImageUrl.GetUrl()))
+    {
+      mLoadFailed = true;
+    }
+  }
+  else
+  {
+    Dali::Vector<uint8_t> remoteData;
+    if(!Dali::FileLoader::DownloadFileSynchronously(mImageUrl.GetUrl(), remoteData) || // Failed if we fail to download json file,
+       !mVectorRenderer.Load(remoteData))                                              // or download data is not valid vector animation file.
+    {
+      mLoadFailed = true;
+    }
+  }
+
+  if(mLoadFailed)
+  {
+    DALI_LOG_ERROR("VectorAnimationTask::Load: Load failed [%s]\n", mImageUrl.GetUrl().c_str());
+    mLoadRequest = false;
+    {
+      Mutex::ScopedLock lock(mMutex);
+      if(!synchronousLoading && mLoadCompletedCallback)
+      {
+        mVectorAnimationThread.AddEventTriggerCallback(mLoadCompletedCallback.get(), 0u);
+      }
+    }
+#ifdef TRACE_ENABLED
+    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+    {
+      mEndTimeNanoSceonds = GetNanoseconds();
+      std::ostringstream oss;
+      oss << std::fixed << std::setprecision(3);
+      oss << "[";
+      oss << "d:" << static_cast<float>(mEndTimeNanoSceonds - mStartTimeNanoSceonds) / 1000000.0f << "ms ";
+      oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+      // DALI_TRACE_END(gTraceFilter, "DALI_LOTTIE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
+      DALI_LOG_RELEASE_INFO("END: DALI_LOTTIE_LOADING_TASK %s", oss.str().c_str());
+    }
+#endif
     return false;
   }
 
@@ -113,34 +241,74 @@ bool VectorAnimationTask::Load(const std::string& url)
   mFrameRate                 = mVectorRenderer.GetFrameRate();
   mFrameDurationMicroSeconds = MICROSECONDS_PER_SECOND / mFrameRate;
 
-  uint32_t width, height;
-  mVectorRenderer.GetDefaultSize(width, height);
+  mLoadRequest = false;
+  {
+    Mutex::ScopedLock lock(mMutex);
+    if(!synchronousLoading && mLoadCompletedCallback)
+    {
+      mVectorAnimationThread.AddEventTriggerCallback(mLoadCompletedCallback.get(), 0u);
+    }
+  }
 
-  SetSize(width, height);
+  DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::Load: file = %s [%d frames, %f fps] [%p]\n", mImageUrl.GetUrl().c_str(), mTotalFrame, mFrameRate, this);
 
-  DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::Load: file = %s [%d frames, %f fps] [%p]\n", mUrl.c_str(), mTotalFrame, mFrameRate, this);
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mEndTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << std::fixed << std::setprecision(3);
+    oss << "[";
+    oss << "d:" << static_cast<float>(mEndTimeNanoSceonds - mStartTimeNanoSceonds) / 1000000.0f << "ms ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+    // DALI_TRACE_END(gTraceFilter, "DALI_LOTTIE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("END: DALI_LOTTIE_LOADING_TASK %s", oss.str().c_str());
+  }
+#endif
 
   return true;
 }
 
 void VectorAnimationTask::SetRenderer(Renderer renderer)
 {
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
   mVectorRenderer.SetRenderer(renderer);
 
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetRenderer [%p]\n", this);
 }
 
+void VectorAnimationTask::RequestLoad(const VisualUrl& url, EncodedImageBuffer encodedImageBuffer, bool synchronousLoading)
+{
+  mImageUrl           = url;
+  mEncodedImageBuffer = encodedImageBuffer;
+
+  if(!synchronousLoading)
+  {
+    mLoadRequest = true;
+
+    mVectorAnimationThread.AddTask(this);
+  }
+  else
+  {
+    Load(true);
+
+    OnLoadCompleted(0u);
+  }
+}
+
+bool VectorAnimationTask::IsLoadRequested() const
+{
+  return mLoadRequest;
+}
+
 void VectorAnimationTask::SetAnimationData(const AnimationData& data)
 {
-  ConditionalWait::ScopedLock lock(mConditionalWait);
+  Mutex::ScopedLock lock(mMutex);
 
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetAnimationData [%p]\n", this);
 
   uint32_t index = mAnimationDataIndex == 0 ? 1 : 0; // Use the other buffer
 
-  mAnimationData[index] = data;
+  mAnimationData[index].push_back(data);
   mAnimationDataUpdated = true;
 
   if(data.resendFlag & VectorAnimationTask::RESEND_SIZE)
@@ -161,6 +329,20 @@ void VectorAnimationTask::SetSize(uint32_t width, uint32_t height)
     mWidth  = width;
     mHeight = height;
 
+    // If fixedCache is enabled, Call KeepRasterizedBuffer()
+    if(mEnableFrameCache)
+    {
+      if(mTotalFrame > 0 && !mLoadFailed)
+      {
+        mVectorRenderer.KeepRasterizedBuffer();
+      }
+      else
+      {
+        // If Load is not yet, update the size later.
+        mSizeUpdated = true;
+      }
+    }
+
     DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetSize: width = %d, height = %d [%p]\n", width, height, this);
   }
 }
@@ -198,13 +380,10 @@ void VectorAnimationTask::PauseAnimation()
   }
 }
 
-void VectorAnimationTask::SetAnimationFinishedCallback(EventThreadCallback* callback)
+void VectorAnimationTask::SetAnimationFinishedCallback(CallbackBase* callback)
 {
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-  if(callback)
-  {
-    mAnimationFinishedTrigger = std::unique_ptr<EventThreadCallback>(callback);
-  }
+  Mutex::ScopedLock lock(mMutex);
+  mAnimationFinishedCallback = std::unique_ptr<CallbackBase>(callback);
 }
 
 void VectorAnimationTask::SetLoopCount(int32_t count)
@@ -268,38 +447,33 @@ void VectorAnimationTask::SetPlayRange(const Property::Array& playRange)
   }
 
   // Make sure the range specified is between 0 and the total frame number
-  if(startFrame < mTotalFrame && endFrame < mTotalFrame)
+  startFrame = std::min(startFrame, mTotalFrame - 1);
+  endFrame   = std::min(endFrame, mTotalFrame - 1);
+
+  // If the range is not in order swap values
+  if(startFrame > endFrame)
+  {
+    uint32_t temp = startFrame;
+    startFrame    = endFrame;
+    endFrame      = temp;
+  }
+
+  if(startFrame != mStartFrame || endFrame != mEndFrame)
   {
-    // If the range is not in order swap values
-    if(startFrame > endFrame)
+    mStartFrame = startFrame;
+    mEndFrame   = endFrame;
+
+    // If the current frame is out of the range, change the current frame also.
+    if(mStartFrame > mCurrentFrame)
     {
-      uint32_t temp = startFrame;
-      startFrame    = endFrame;
-      endFrame      = temp;
+      mCurrentFrame = mStartFrame;
     }
-
-    if(startFrame != mStartFrame || endFrame != mEndFrame)
+    else if(mEndFrame < mCurrentFrame)
     {
-      mStartFrame = startFrame;
-      mEndFrame   = endFrame;
-
-      // If the current frame is out of the range, change the current frame also.
-      if(mStartFrame > mCurrentFrame)
-      {
-        mCurrentFrame = mStartFrame;
-      }
-      else if(mEndFrame < mCurrentFrame)
-      {
-        mCurrentFrame = mEndFrame;
-      }
-
-      DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetPlayRange: [%d, %d] [%p]\n", mStartFrame, mEndFrame, this);
+      mCurrentFrame = mEndFrame;
     }
-  }
-  else
-  {
-    DALI_LOG_ERROR("VectorAnimationTask::SetPlayRange: Invalid range (%d, %d) [%p]\n", startFrame, endFrame, this);
-    return;
+
+    DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetPlayRange: [%d, %d] [%s] [%p]\n", mStartFrame, mEndFrame, mImageUrl.GetUrl().c_str(), this);
   }
 }
 
@@ -326,7 +500,7 @@ void VectorAnimationTask::SetCurrentFrameNumber(uint32_t frameNumber)
   }
   else
   {
-    DALI_LOG_ERROR("Invalid frame number [%d (%d, %d)]\n", frameNumber, mStartFrame, mEndFrame);
+    DALI_LOG_ERROR("Invalid frame number [%d (%d, %d)] [%p]\n", frameNumber, mStartFrame, mEndFrame, this);
   }
 }
 
@@ -361,21 +535,53 @@ void VectorAnimationTask::SetLoopingMode(DevelImageVisual::LoopingMode::Type loo
 
 void VectorAnimationTask::GetLayerInfo(Property::Map& map) const
 {
-  mVectorRenderer.GetLayerInfo(map);
+  // Fast-out if file is loading, or load failed.
+  if(mLoadFailed || IsLoadRequested())
+  {
+    return;
+  }
+
+  if(DALI_UNLIKELY(!mLayerInfoCached))
+  {
+    // Update only 1 time.
+    mLayerInfoCached = true;
+    mVectorRenderer.GetLayerInfo(mCachedLayerInfo);
+  }
+
+  map = mCachedLayerInfo;
 }
 
-VectorAnimationTask::UploadCompletedSignalType& VectorAnimationTask::UploadCompletedSignal()
+void VectorAnimationTask::GetMarkerInfo(Property::Map& map) const
 {
-  return mVectorRenderer.UploadCompletedSignal();
+  // Fast-out if file is loading, or load failed.
+  if(mLoadFailed || IsLoadRequested())
+  {
+    return;
+  }
+
+  if(DALI_UNLIKELY(!mMarkerInfoCached))
+  {
+    // Update only 1 time.
+    mMarkerInfoCached = true;
+    mVectorRenderer.GetMarkerInfo(mCachedMarkerInfo);
+  }
+
+  map = mCachedMarkerInfo;
+}
+
+VectorAnimationTask::ResourceReadySignalType& VectorAnimationTask::ResourceReadySignal()
+{
+  return mResourceReadySignal;
 }
 
 bool VectorAnimationTask::Rasterize()
 {
   bool     stopped = false;
   uint32_t currentFrame;
+  mKeepAnimation = false;
 
   {
-    ConditionalWait::ScopedLock lock(mConditionalWait);
+    Mutex::ScopedLock lock(mMutex);
     if(mDestroyTask)
     {
       // The task will be destroyed. We don't need rasterization.
@@ -383,11 +589,31 @@ bool VectorAnimationTask::Rasterize()
     }
   }
 
+  if(mLoadRequest)
+  {
+    return Load(false);
+  }
+
+  if(mLoadFailed)
+  {
+    return false;
+  }
+
+#ifdef TRACE_ENABLED
+  uint64_t mStartTimeNanoSceonds = 0;
+  uint64_t mEndTimeNanoSceonds   = 0;
+#endif
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_LOTTIE_RASTERIZE_TASK", [&](std::ostringstream& oss) {
+    mStartTimeNanoSceonds = GetNanoseconds();
+    oss << "[s:" << mWidth << "x" << mHeight << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+  });
+
   ApplyAnimationData();
 
   if(mPlayState == PlayState::PLAYING && mUpdateFrameNumber)
   {
-    mCurrentFrame = mForward ? mCurrentFrame + mDroppedFrames + 1 : mCurrentFrame - mDroppedFrames - 1;
+    mCurrentFrame = mForward ? mCurrentFrame + mDroppedFrames + 1 : (mCurrentFrame > mDroppedFrames ? mCurrentFrame - mDroppedFrames - 1 : 0);
     Dali::ClampInPlace(mCurrentFrame, mStartFrame, mEndFrame);
   }
 
@@ -467,25 +693,42 @@ bool VectorAnimationTask::Rasterize()
     mForward     = true;
     mCurrentLoop = 0;
 
+    if(mVectorRenderer)
+    {
+      // Notify the Renderer that rendering is stopped.
+      mVectorRenderer.RenderStopped();
+    }
+
     // Animation is finished
     {
-      ConditionalWait::ScopedLock lock(mConditionalWait);
-      if(mNeedAnimationFinishedTrigger && mAnimationFinishedTrigger)
+      Mutex::ScopedLock lock(mMutex);
+      if(mNeedAnimationFinishedTrigger && mAnimationFinishedCallback)
       {
-        mAnimationFinishedTrigger->Trigger();
+        mVectorAnimationThread.AddEventTriggerCallback(mAnimationFinishedCallback.get(), mAppliedPlayStateId);
       }
     }
 
     DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::Rasterize: Animation is finished [current = %d] [%p]\n", currentFrame, this);
   }
 
-  bool keepAnimation = true;
-  if(mPlayState == PlayState::PAUSED || mPlayState == PlayState::STOPPED)
+  if(mPlayState != PlayState::PAUSED && mPlayState != PlayState::STOPPED)
   {
-    keepAnimation = false;
+    mKeepAnimation = true;
   }
 
-  return keepAnimation;
+  DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_LOTTIE_RASTERIZE_TASK", [&](std::ostringstream& oss) {
+    mEndTimeNanoSceonds = GetNanoseconds();
+    oss << std::fixed << std::setprecision(3);
+    oss << "[";
+    oss << "d:" << static_cast<float>(mEndTimeNanoSceonds - mStartTimeNanoSceonds) / 1000000.0f << "ms ";
+    oss << "s:" << mWidth << "x" << mHeight << " ";
+    oss << "f:" << mCurrentFrame << " ";
+    oss << "l:" << mCurrentLoop << " ";
+    oss << "p:" << mPlayState << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+  });
+
+  return true;
 }
 
 uint32_t VectorAnimationTask::GetStoppedFrame(uint32_t startFrame, uint32_t endFrame, uint32_t currentFrame)
@@ -528,10 +771,11 @@ VectorAnimationTask::TimePoint VectorAnimationTask::CalculateNextFrameTime(bool
   // is casted to use the default duration.
   mNextFrameStartTime = std::chrono::time_point_cast<TimePoint::duration>(mNextFrameStartTime + std::chrono::microseconds(mFrameDurationMicroSeconds));
   auto current        = std::chrono::steady_clock::now();
+  mDroppedFrames      = 0;
+
   if(renderNow)
   {
     mNextFrameStartTime = current;
-    mDroppedFrames      = 0;
   }
   else if(mNextFrameStartTime < current)
   {
@@ -560,9 +804,9 @@ void VectorAnimationTask::ApplyAnimationData()
   uint32_t index;
 
   {
-    ConditionalWait::ScopedLock lock(mConditionalWait);
+    Mutex::ScopedLock lock(mMutex);
 
-    if(!mAnimationDataUpdated || mAnimationData[mAnimationDataIndex].resendFlag != 0)
+    if(!mAnimationDataUpdated || mAnimationData[mAnimationDataIndex].size() != 0)
     {
       // Data is not updated or the previous data is not applied yet.
       return;
@@ -574,50 +818,89 @@ void VectorAnimationTask::ApplyAnimationData()
     index = mAnimationDataIndex;
   }
 
-  if(mAnimationData[index].resendFlag & VectorAnimationTask::RESEND_LOOP_COUNT)
+  for(const auto& animationData : mAnimationData[index])
   {
-    SetLoopCount(mAnimationData[index].loopCount);
-  }
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_LOOP_COUNT)
+    {
+      SetLoopCount(animationData.loopCount);
+    }
 
-  if(mAnimationData[index].resendFlag & VectorAnimationTask::RESEND_PLAY_RANGE)
-  {
-    SetPlayRange(mAnimationData[index].playRange);
-  }
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_PLAY_RANGE)
+    {
+      SetPlayRange(animationData.playRange);
+    }
 
-  if(mAnimationData[index].resendFlag & VectorAnimationTask::RESEND_STOP_BEHAVIOR)
-  {
-    SetStopBehavior(mAnimationData[index].stopBehavior);
-  }
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_STOP_BEHAVIOR)
+    {
+      SetStopBehavior(animationData.stopBehavior);
+    }
 
-  if(mAnimationData[index].resendFlag & VectorAnimationTask::RESEND_LOOPING_MODE)
-  {
-    SetLoopingMode(mAnimationData[index].loopingMode);
-  }
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_LOOPING_MODE)
+    {
+      SetLoopingMode(animationData.loopingMode);
+    }
 
-  if(mAnimationData[index].resendFlag & VectorAnimationTask::RESEND_CURRENT_FRAME)
-  {
-    SetCurrentFrameNumber(mAnimationData[index].currentFrame);
-  }
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_CURRENT_FRAME)
+    {
+      SetCurrentFrameNumber(animationData.currentFrame);
+    }
 
-  if(mAnimationData[index].resendFlag & VectorAnimationTask::RESEND_PLAY_STATE)
-  {
-    if(mAnimationData[index].playState == DevelImageVisual::PlayState::PLAYING)
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_NEED_RESOURCE_READY)
     {
-      PlayAnimation();
+      mVectorRenderer.InvalidateBuffer();
     }
-    else if(mAnimationData[index].playState == DevelImageVisual::PlayState::PAUSED)
+
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_DYNAMIC_PROPERTY)
     {
-      PauseAnimation();
+      for(auto&& iter : animationData.dynamicProperties)
+      {
+        mVectorRenderer.AddPropertyValueCallback(iter.keyPath, static_cast<VectorAnimationRenderer::VectorProperty>(iter.property), iter.callback, iter.id);
+      }
     }
-    else if(mAnimationData[index].playState == DevelImageVisual::PlayState::STOPPED)
+
+    if(animationData.resendFlag & VectorAnimationTask::RESEND_PLAY_STATE)
     {
-      StopAnimation();
+      mAppliedPlayStateId = animationData.playStateId;
+      if(animationData.playState == DevelImageVisual::PlayState::PLAYING)
+      {
+        PlayAnimation();
+      }
+      else if(animationData.playState == DevelImageVisual::PlayState::PAUSED)
+      {
+        PauseAnimation();
+      }
+      else if(animationData.playState == DevelImageVisual::PlayState::STOPPED)
+      {
+        StopAnimation();
+      }
     }
   }
 
-  mAnimationData[index].resendFlag = 0;
+  // reset data list
+  mAnimationData[index].clear();
+}
+
+void VectorAnimationTask::OnUploadCompleted()
+{
+  mResourceReadySignal.Emit(ResourceStatus::READY);
 }
 
+void VectorAnimationTask::OnLoadCompleted(uint32_t /* not used */)
+{
+  if(!mLoadFailed)
+  {
+    if(mEnableFrameCache && mSizeUpdated)
+    {
+      mVectorRenderer.KeepRasterizedBuffer();
+      mSizeUpdated = false;
+    }
+    mResourceReadySignal.Emit(ResourceStatus::LOADED);
+  }
+  else
+  {
+    mResourceReadySignal.Emit(ResourceStatus::FAILED);
+  }
+}
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
index 3c0b8e3..eb48a13 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VECTOR_ANIMATION_TASK_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,18 @@
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/event-thread-callback.h>
 #include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
-#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/property-array.h>
 #include <chrono>
 #include <memory>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali
 {
@@ -42,25 +47,35 @@ typedef IntrusivePtr<VectorAnimationTask> VectorAnimationTaskPtr;
 /**
  * The task of the vector animation.
  */
-class VectorAnimationTask : public RefObject
+class VectorAnimationTask : public AsyncTask, public ConnectionTracker
 {
 public:
-  using UploadCompletedSignalType = Dali::VectorAnimationRenderer::UploadCompletedSignalType;
+  enum class ResourceStatus
+  {
+    LOADED, /// Resource is loaded
+    READY,  /// Resource is ready
+    FAILED  /// Resource is fail to load
+  };
 
-  using TimePoint = std::chrono::time_point<std::chrono::steady_clock>;
+  using ResourceReadySignalType = Signal<void(ResourceStatus)>;
+
+  using TimePoint           = std::chrono::time_point<std::chrono::steady_clock>;
+  using DynamicPropertyType = std::vector<DevelAnimatedVectorImageVisual::DynamicPropertyInfo>;
 
   /**
    * Flags for re-sending data to the vector animation thread
    */
   enum ResendFlags
   {
-    RESEND_PLAY_RANGE    = 1 << 0,
-    RESEND_LOOP_COUNT    = 1 << 1,
-    RESEND_STOP_BEHAVIOR = 1 << 2,
-    RESEND_LOOPING_MODE  = 1 << 3,
-    RESEND_CURRENT_FRAME = 1 << 4,
-    RESEND_SIZE          = 1 << 5,
-    RESEND_PLAY_STATE    = 1 << 6
+    RESEND_PLAY_RANGE          = 1 << 0,
+    RESEND_LOOP_COUNT          = 1 << 1,
+    RESEND_STOP_BEHAVIOR       = 1 << 2,
+    RESEND_LOOPING_MODE        = 1 << 3,
+    RESEND_CURRENT_FRAME       = 1 << 4,
+    RESEND_SIZE                = 1 << 5,
+    RESEND_PLAY_STATE          = 1 << 6,
+    RESEND_NEED_RESOURCE_READY = 1 << 7,
+    RESEND_DYNAMIC_PROPERTY    = 1 << 8
   };
 
   /**
@@ -71,13 +86,15 @@ public:
     AnimationData()
     : resendFlag(0),
       playRange(),
+      dynamicProperties(),
       playState(),
       stopBehavior(DevelImageVisual::StopBehavior::CURRENT_FRAME),
       loopingMode(DevelImageVisual::LoopingMode::RESTART),
       currentFrame(0),
       width(0),
       height(0),
-      loopCount(-1)
+      loopCount(-1),
+      playStateId(0)
     {
     }
 
@@ -92,11 +109,14 @@ public:
       width        = rhs.width;
       height       = rhs.height;
       loopCount    = rhs.loopCount;
+      playStateId  = rhs.playStateId;
+      dynamicProperties.insert(dynamicProperties.end(), rhs.dynamicProperties.begin(), rhs.dynamicProperties.end());
       return *this;
     }
 
     uint32_t                             resendFlag;
     Property::Array                      playRange;
+    DynamicPropertyType                  dynamicProperties;
     DevelImageVisual::PlayState::Type    playState;
     DevelImageVisual::StopBehavior::Type stopBehavior;
     DevelImageVisual::LoopingMode::Type  loopingMode;
@@ -104,6 +124,7 @@ public:
     uint32_t                             width;
     uint32_t                             height;
     int32_t                              loopCount;
+    uint32_t                             playStateId;
   };
 
   /**
@@ -124,19 +145,26 @@ public:
   void Finalize();
 
   /**
-   * @brief Loads the animation file.
+   * @brief Sets the renderer used to display the result image.
    *
-   * @param[in] url The url of the vector animation file
-   * @return True if loading success, false otherwise.
+   * @param[in] renderer The renderer used to display the result image
    */
-  bool Load(const std::string& url);
+  void SetRenderer(Renderer renderer);
 
   /**
-   * @brief Sets the renderer used to display the result image.
+   * @brief Requests to load the animation file.
    *
-   * @param[in] renderer The renderer used to display the result image
+   * @param[in] url The url of the vector animation file
+   * @param[in] encodedImageBuffer The resource buffer if required.
+   * @param[in] synchronousLoading True if the url should be loaded synchronously
    */
-  void SetRenderer(Renderer renderer);
+  void RequestLoad(const VisualUrl& url, EncodedImageBuffer encodedImageBuffer, bool synchronousLoading);
+
+  /**
+   * @brief Queries whether loading is requested.
+   * @return True if loading is requested.
+   */
+  bool IsLoadRequested() const;
 
   /**
    * @brief Sets data to specify animation playback.
@@ -148,7 +176,7 @@ public:
    * @brief This callback is called after the animation is finished.
    * @param[in] callback The animation finished callback
    */
-  void SetAnimationFinishedCallback(EventThreadCallback* callback);
+  void SetAnimationFinishedCallback(CallbackBase* callback);
 
   /**
    * @brief Gets the playing range in frame number.
@@ -182,14 +210,20 @@ public:
   void GetLayerInfo(Property::Map& map) const;
 
   /**
-   * @brief Connect to this signal to be notified when the texture upload is completed.
+   * @brief Gets the all marker information.
+   * @param[out] map The marker information
+   */
+  void GetMarkerInfo(Property::Map& map) const;
+
+  /**
+   * @brief Connect to this signal to be notified when the resource is ready.
    * @return The signal to connect to.
    */
-  UploadCompletedSignalType& UploadCompletedSignal();
+  ResourceReadySignalType& ResourceReadySignal();
 
   /**
    * @brief Rasterizes the current frame.
-   * @return true if the animation is running, false otherwise.
+   * @return true if the rasterization succeeded, false otherwise.
    */
   bool Rasterize();
 
@@ -205,8 +239,63 @@ public:
    */
   TimePoint GetNextFrameTime();
 
+  /**
+   * @brief Called when the rasterization is completed from the asyncTaskManager
+   * @param[in] task The completed task
+   */
+  void TaskCompleted(VectorAnimationTaskPtr task);
+
+  /**
+   * @brief Check the rasterization succeeded
+   * @return true if the rasterization succeeded, false otherwise.
+   */
+  bool IsRasterized();
+
+  /**
+   * @brief Check the animation is running
+   * @return true if the animation is running, false otherwise.
+   */
+  bool IsAnimating();
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady() override;
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "VectorAnimationTask";
+  }
+
+  void KeepRasterizedBuffer(bool enableFrameCache)
+  {
+    mEnableFrameCache = enableFrameCache;
+  }
+
+  bool IsKeptRasterizedBuffer()
+  {
+    return mEnableFrameCache;
+  }
+
 private:
   /**
+   * @brief Loads the animation file.
+   *
+   * @param[in] synchronousLoading True if loading is requested synchronously
+   * @return True if loading succeeded, false otherwise.
+   */
+  bool Load(bool synchronousLoading);
+
+  /**
    * @brief Play the vector animation.
    */
   void PlayAnimation();
@@ -271,6 +360,16 @@ private:
    */
   void ApplyAnimationData();
 
+  /**
+   * @brief Called when the texture upload is completed.
+   */
+  void OnUploadCompleted();
+
+  /**
+   * @brief Event callback from rasterize thread. This is called when the file loading is completed.
+   */
+  void OnLoadCompleted(uint32_t argument);
+
   // Undefined
   VectorAnimationTask(const VectorAnimationTask& task) = delete;
 
@@ -286,12 +385,17 @@ private:
     PAUSED    ///< The animation is paused
   };
 
-  std::string                          mUrl;
+  VisualUrl                            mImageUrl;
+  EncodedImageBuffer                   mEncodedImageBuffer;
   VectorAnimationRenderer              mVectorRenderer;
-  AnimationData                        mAnimationData[2];
+  std::vector<AnimationData>           mAnimationData[2];
   VectorAnimationThread&               mVectorAnimationThread;
-  ConditionalWait                      mConditionalWait;
-  std::unique_ptr<EventThreadCallback> mAnimationFinishedTrigger;
+  Mutex                                mMutex;
+  ResourceReadySignalType              mResourceReadySignal;
+  std::unique_ptr<CallbackBase>        mAnimationFinishedCallback{};
+  std::unique_ptr<CallbackBase>        mLoadCompletedCallback{};
+  mutable Property::Map                mCachedLayerInfo;
+  mutable Property::Map                mCachedMarkerInfo;
   PlayState                            mPlayState;
   DevelImageVisual::StopBehavior::Type mStopBehavior;
   DevelImageVisual::LoopingMode::Type  mLoopingMode;
@@ -306,13 +410,22 @@ private:
   uint32_t                             mWidth;
   uint32_t                             mHeight;
   uint32_t                             mAnimationDataIndex;
+  uint32_t                             mAppliedPlayStateId;
   int32_t                              mLoopCount;
   int32_t                              mCurrentLoop;
-  bool                                 mForward;
-  bool                                 mUpdateFrameNumber;
-  bool                                 mNeedAnimationFinishedTrigger;
-  bool                                 mAnimationDataUpdated;
-  bool                                 mDestroyTask;
+  bool                                 mForward : 1;
+  bool                                 mUpdateFrameNumber : 1;
+  bool                                 mNeedAnimationFinishedTrigger : 1;
+  bool                                 mAnimationDataUpdated : 1;
+  bool                                 mDestroyTask : 1;
+  bool                                 mLoadRequest : 1;
+  bool                                 mLoadFailed : 1;
+  bool                                 mRasterized : 1;
+  bool                                 mKeepAnimation : 1;
+  mutable bool                         mLayerInfoCached : 1;
+  mutable bool                         mMarkerInfoCached : 1;
+  bool                                 mEnableFrameCache : 1;
+  bool                                 mSizeUpdated : 1;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp
index 97634f6..b07ba5b 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,19 +33,6 @@ namespace Internal
 {
 namespace
 {
-constexpr auto DEFAULT_NUMBER_OF_RASTERIZE_THREADS = size_t{4u};
-constexpr auto NUMBER_OF_RASTERIZE_THREADS_ENV     = "DALI_VECTOR_RASTERIZE_THREADS";
-
-size_t GetNumberOfThreads(const char* environmentVariable, size_t defaultValue)
-{
-  using Dali::EnvironmentVariable::GetEnvironmentVariable;
-  auto           numberString          = GetEnvironmentVariable(environmentVariable);
-  auto           numberOfThreads       = numberString ? std::strtoul(numberString, nullptr, 10) : 0;
-  constexpr auto MAX_NUMBER_OF_THREADS = 100u;
-  DALI_ASSERT_DEBUG(numberOfThreads < MAX_NUMBER_OF_THREADS);
-  return (numberOfThreads > 0 && numberOfThreads < MAX_NUMBER_OF_THREADS) ? numberOfThreads : defaultValue;
-}
-
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VECTOR_ANIMATION");
 #endif
@@ -56,14 +43,18 @@ VectorAnimationThread::VectorAnimationThread()
 : mAnimationTasks(),
   mCompletedTasks(),
   mWorkingTasks(),
-  mRasterizers(GetNumberOfThreads(NUMBER_OF_RASTERIZE_THREADS_ENV, DEFAULT_NUMBER_OF_RASTERIZE_THREADS), [&]() { return RasterizeHelper(*this); }),
   mSleepThread(MakeCallback(this, &VectorAnimationThread::OnAwakeFromSleep)),
   mConditionalWait(),
+  mEventTriggerMutex(),
   mNeedToSleep(false),
   mDestroyThread(false),
-  mLogFactory(Dali::Adaptor::Get().GetLogFactory())
+  mLogFactory(Dali::Adaptor::Get().GetLogFactory()),
+  mTraceFactory(Dali::Adaptor::Get().GetTraceFactory())
 {
+  mAsyncTaskManager = Dali::AsyncTaskManager::Get();
   mSleepThread.Start();
+
+  mEventTrigger = std::unique_ptr<EventThreadCallback>(new EventThreadCallback(MakeCallback(this, &VectorAnimationThread::OnEventCallbackTriggered)));
 }
 
 VectorAnimationThread::~VectorAnimationThread()
@@ -71,11 +62,18 @@ VectorAnimationThread::~VectorAnimationThread()
   // Stop the thread
   {
     ConditionalWait::ScopedLock lock(mConditionalWait);
-    mDestroyThread = true;
-    mNeedToSleep   = false;
+    // Wait until some event thread trigger relative job finished.
+    {
+      Mutex::ScopedLock lock(mEventTriggerMutex);
+      mDestroyThread = true;
+    }
+    mNeedToSleep = false;
     mConditionalWait.Notify(lock);
   }
 
+  // Stop event trigger
+  mEventTrigger.reset();
+
   DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationThread::~VectorAnimationThread: Join [%p]\n", this);
 
   Join();
@@ -85,7 +83,9 @@ void VectorAnimationThread::AddTask(VectorAnimationTaskPtr task)
 {
   ConditionalWait::ScopedLock lock(mConditionalWait);
 
-  if(mAnimationTasks.end() == std::find(mAnimationTasks.begin(), mAnimationTasks.end(), task))
+  // Find if the task is already in the list except loading task
+  auto iter = std::find_if(mAnimationTasks.begin(), mAnimationTasks.end(), [task](VectorAnimationTaskPtr& element) { return (element == task && !element->IsLoadRequested()); });
+  if(iter == mAnimationTasks.end())
   {
     auto currentTime = task->CalculateNextFrameTime(true); // Rasterize as soon as possible
 
@@ -112,7 +112,7 @@ void VectorAnimationThread::AddTask(VectorAnimationTaskPtr task)
   }
 }
 
-void VectorAnimationThread::OnTaskCompleted(VectorAnimationTaskPtr task, bool keepAnimation)
+void VectorAnimationThread::OnTaskCompleted(VectorAnimationTaskPtr task, bool success, bool keepAnimation)
 {
   if(!mDestroyThread)
   {
@@ -131,7 +131,7 @@ void VectorAnimationThread::OnTaskCompleted(VectorAnimationTaskPtr task, bool ke
       needRasterize = true;
     }
 
-    if(keepAnimation)
+    if(keepAnimation && success)
     {
       if(mCompletedTasks.end() == std::find(mCompletedTasks.begin(), mCompletedTasks.end(), task))
       {
@@ -159,10 +159,36 @@ void VectorAnimationThread::OnAwakeFromSleep()
   }
 }
 
+void VectorAnimationThread::AddEventTriggerCallback(CallbackBase* callback, uint32_t argument)
+{
+  Mutex::ScopedLock lock(mEventTriggerMutex);
+  if(!mDestroyThread)
+  {
+    mTriggerEventCallbacks.emplace_back(callback, argument);
+
+    if(!mEventTriggered)
+    {
+      mEventTrigger->Trigger();
+      mEventTriggered = true;
+    }
+  }
+}
+
+void VectorAnimationThread::RemoveEventTriggerCallbacks(CallbackBase* callback)
+{
+  Mutex::ScopedLock lock(mEventTriggerMutex);
+  if(!mDestroyThread)
+  {
+    auto iter = std::remove_if(mTriggerEventCallbacks.begin(), mTriggerEventCallbacks.end(), [&callback](std::pair<CallbackBase*, uint32_t>& item) { return item.first == callback; });
+    mTriggerEventCallbacks.erase(iter, mTriggerEventCallbacks.end());
+  }
+}
+
 void VectorAnimationThread::Run()
 {
   SetThreadName("VectorAnimationThread");
   mLogFactory.InstallLogFunction();
+  mTraceFactory.InstallTraceFunction();
 
   while(!mDestroyThread)
   {
@@ -220,11 +246,10 @@ void VectorAnimationThread::Rasterize()
     auto nextFrameTime = nextTask->GetNextFrameTime();
 
 #if defined(DEBUG_ENABLED)
-    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(nextFrameTime - currentTime);
+//    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(nextFrameTime - currentTime);
 
-    DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationThread::Rasterize: [next time = %lld]\n", duration.count());
+//    DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationThread::Rasterize: [next time = %lld]\n", duration.count());
 #endif
-
     if(nextFrameTime <= currentTime)
     {
       // If the task is not in the working list
@@ -234,11 +259,7 @@ void VectorAnimationThread::Rasterize()
 
         // Add it to the working list
         mWorkingTasks.push_back(nextTask);
-
-        auto rasterizerHelperIt = mRasterizers.GetNext();
-        DALI_ASSERT_ALWAYS(rasterizerHelperIt != mRasterizers.End());
-
-        rasterizerHelperIt->Rasterize(nextTask);
+        mAsyncTaskManager.AddTask(nextTask);
       }
       else
       {
@@ -253,29 +274,34 @@ void VectorAnimationThread::Rasterize()
   }
 }
 
-VectorAnimationThread::RasterizeHelper::RasterizeHelper(VectorAnimationThread& animationThread)
-: RasterizeHelper(std::unique_ptr<VectorRasterizeThread>(new VectorRasterizeThread()), animationThread)
+void VectorAnimationThread::OnEventCallbackTriggered()
 {
+  while(true)
+  {
+    auto callbackPair = GetNextEventCallback();
+    if(callbackPair.first == nullptr)
+    {
+      break;
+    }
+    CallbackBase::Execute(*callbackPair.first, callbackPair.second);
+  }
 }
 
-VectorAnimationThread::RasterizeHelper::RasterizeHelper(RasterizeHelper&& rhs)
-: RasterizeHelper(std::move(rhs.mRasterizer), rhs.mAnimationThread)
-{
-}
-
-VectorAnimationThread::RasterizeHelper::RasterizeHelper(std::unique_ptr<VectorRasterizeThread> rasterizer, VectorAnimationThread& animationThread)
-: mRasterizer(std::move(rasterizer)),
-  mAnimationThread(animationThread)
-{
-  mRasterizer->SetCompletedCallback(MakeCallback(&mAnimationThread, &VectorAnimationThread::OnTaskCompleted));
-}
-
-void VectorAnimationThread::RasterizeHelper::Rasterize(VectorAnimationTaskPtr task)
+std::pair<CallbackBase*, uint32_t> VectorAnimationThread::GetNextEventCallback()
 {
-  if(task)
+  Mutex::ScopedLock lock(mEventTriggerMutex);
+  if(!mDestroyThread)
   {
-    mRasterizer->AddTask(task);
+    if(!mTriggerEventCallbacks.empty())
+    {
+      auto iter           = mTriggerEventCallbacks.begin();
+      auto callbackIdPair = *iter;
+      mTriggerEventCallbacks.erase(iter);
+      return callbackIdPair;
+    }
+    mEventTriggered = false;
   }
+  return std::make_pair(nullptr, 0u);
 }
 
 VectorAnimationThread::SleepThread::SleepThread(CallbackBase* callback)
@@ -283,6 +309,7 @@ VectorAnimationThread::SleepThread::SleepThread(CallbackBase* callback)
   mAwakeCallback(std::unique_ptr<CallbackBase>(callback)),
   mSleepTimePoint(),
   mLogFactory(Dali::Adaptor::Get().GetLogFactory()),
+  mTraceFactory(Dali::Adaptor::Get().GetTraceFactory()),
   mNeedToSleep(false),
   mDestroyThread(false)
 {
@@ -312,6 +339,7 @@ void VectorAnimationThread::SleepThread::Run()
 {
   SetThreadName("VectorSleepThread");
   mLogFactory.InstallLogFunction();
+  mTraceFactory.InstallTraceFunction();
 
   while(!mDestroyThread)
   {
@@ -330,9 +358,9 @@ void VectorAnimationThread::SleepThread::Run()
     if(needToSleep)
     {
 #if defined(DEBUG_ENABLED)
-      auto sleepDuration = std::chrono::duration_cast<std::chrono::milliseconds>(mSleepTimePoint - std::chrono::steady_clock::now());
+//      auto sleepDuration = std::chrono::duration_cast<std::chrono::milliseconds>(mSleepTimePoint - std::chrono::steady_clock::now());
 
-      DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationThread::SleepThread::Run: [sleep duration = %lld]\n", sleepDuration.count());
+//      DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationThread::SleepThread::Run: [sleep duration = %lld]\n", sleepDuration.count());
 #endif
 
       std::this_thread::sleep_until(sleepTimePoint);
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h
index 8190e7b..b1f608a 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VECTOR_ANIMATION_THREAD_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,16 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/devel-api/threading/mutex.h>
 #include <dali/devel-api/threading/thread.h>
 #include <dali/integration-api/adaptor-framework/log-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/trace-factory-interface.h>
+#include <dali/public-api/adaptor-framework/round-robin-container-view.h>
 #include <dali/public-api/signals/connection-tracker.h>
 #include <memory>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/helpers/round-robin-container-view.h>
 #include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h>
-#include <dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h>
 
 namespace Dali
 {
@@ -52,7 +53,7 @@ public:
   ~VectorAnimationThread() override;
 
   /**
-   * Add a animation task into the vector animation thread, called by main thread.
+   * @brief Add a animation task into the vector animation thread, called by main thread.
    *
    * @param[in] task The task added to the thread.
    */
@@ -60,15 +61,35 @@ public:
 
   /**
    * @brief Called when the rasterization is completed from the rasterize thread.
-   * @param task The completed task
+   *
+   * @param[in] task The completed task
+   * @param[in] success true if the task succeeded, false otherwise.
+   * @param[in] keepAnimation true if the animation is running, false otherwise.
    */
-  void OnTaskCompleted(VectorAnimationTaskPtr task, bool stopped);
+  void OnTaskCompleted(VectorAnimationTaskPtr task, bool success, bool keepAnimation);
 
   /**
    * @brief Called when the sleep thread is awaken.
    */
   void OnAwakeFromSleep();
 
+  /**
+   * @brief Add an event trigger callback.
+   *
+   * @param callback The callback to add
+   * @param argument The argument to pass to the callback
+   * @note Ownership of the callback is NOT passed onto this class.
+   * @note The callback will be excuted in the main thread.
+   */
+  void AddEventTriggerCallback(CallbackBase* callback, uint32_t argument);
+
+  /**
+   * @brief Remove event trigger callbacks what we added before.
+   *
+   * @param callback The callback to remove
+   */
+  void RemoveEventTriggerCallbacks(CallbackBase* callback);
+
 protected:
   /**
    * @brief The entry function of the animation thread.
@@ -77,48 +98,19 @@ protected:
 
 private:
   /**
-   * Rasterizes the tasks.
+   * @brief Rasterizes the tasks.
    */
   void Rasterize();
 
-private:
   /**
-   * @brief Helper class to keep the relation between VectorRasterizeThread and corresponding container
+   * @brief Called when the event callback is triggered.
    */
-  class RasterizeHelper : public ConnectionTracker
-  {
-  public:
-    /**
-     * @brief Create an RasterizeHelper.
-     *
-     * @param[in] animationThread Reference to the VectorAnimationThread
-     */
-    RasterizeHelper(VectorAnimationThread& animationThread);
+  void OnEventCallbackTriggered();
 
-    /**
-     * @brief Rasterizes the task.
-     *
-     * @param[in] task The task to rasterize.
-     */
-    void Rasterize(VectorAnimationTaskPtr task);
-
-  public:
-    RasterizeHelper(const RasterizeHelper&) = delete;
-    RasterizeHelper& operator=(const RasterizeHelper&) = delete;
-
-    RasterizeHelper(RasterizeHelper&& rhs);
-    RasterizeHelper& operator=(RasterizeHelper&& rhs) = delete;
-
-  private:
-    /**
-     * @brief Main constructor that used by all other constructors
-     */
-    RasterizeHelper(std::unique_ptr<VectorRasterizeThread> rasterizer, VectorAnimationThread& animationThread);
-
-  private:
-    std::unique_ptr<VectorRasterizeThread> mRasterizer;
-    VectorAnimationThread&                 mAnimationThread;
-  };
+  /**
+   * @brief Gets next event callback to process.
+   */
+  std::pair<CallbackBase*, uint32_t> GetNextEventCallback();
 
   /**
    * @brief The thread to sleep until the next frame time.
@@ -156,6 +148,7 @@ private:
     std::unique_ptr<CallbackBase>                      mAwakeCallback;
     std::chrono::time_point<std::chrono::steady_clock> mSleepTimePoint;
     const Dali::LogFactoryInterface&                   mLogFactory;
+    const Dali::TraceFactoryInterface&                 mTraceFactory;
     bool                                               mNeedToSleep;
     bool                                               mDestroyThread;
   };
@@ -168,15 +161,20 @@ private:
   VectorAnimationThread& operator=(const VectorAnimationThread& thread) = delete;
 
 private:
-  std::vector<VectorAnimationTaskPtr>      mAnimationTasks;
-  std::vector<VectorAnimationTaskPtr>      mCompletedTasks;
-  std::vector<VectorAnimationTaskPtr>      mWorkingTasks;
-  RoundRobinContainerView<RasterizeHelper> mRasterizers;
-  SleepThread                              mSleepThread;
-  ConditionalWait                          mConditionalWait;
-  bool                                     mNeedToSleep;
-  bool                                     mDestroyThread;
-  const Dali::LogFactoryInterface&         mLogFactory;
+  std::vector<VectorAnimationTaskPtr>             mAnimationTasks;
+  std::vector<VectorAnimationTaskPtr>             mCompletedTasks;
+  std::vector<VectorAnimationTaskPtr>             mWorkingTasks;
+  std::vector<std::pair<CallbackBase*, uint32_t>> mTriggerEventCallbacks{}; // Callbacks are not owned
+  SleepThread                                     mSleepThread;
+  ConditionalWait                                 mConditionalWait;
+  Mutex                                           mEventTriggerMutex;
+  std::unique_ptr<EventThreadCallback>            mEventTrigger{};
+  bool                                            mNeedToSleep;
+  bool                                            mDestroyThread;
+  bool                                            mEventTriggered{false};
+  const Dali::LogFactoryInterface&                mLogFactory;
+  const Dali::TraceFactoryInterface&              mTraceFactory;
+  Dali::AsyncTaskManager                          mAsyncTaskManager;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
deleted file mode 100644
index 9a3f909..0000000
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h>
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/thread-settings.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-#include <dali/integration-api/debug.h>
-#include <chrono>
-#include <thread>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-namespace
-{
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VECTOR_ANIMATION");
-#endif
-
-} // unnamed namespace
-
-VectorRasterizeThread::VectorRasterizeThread()
-: mRasterizeTasks(),
-  mConditionalWait(),
-  mCompletedCallback(),
-  mDestroyThread(false),
-  mIsThreadStarted(false),
-  mLogFactory(Dali::Adaptor::Get().GetLogFactory())
-{
-}
-
-VectorRasterizeThread::~VectorRasterizeThread()
-{
-  // Stop the thread
-  {
-    ConditionalWait::ScopedLock lock(mConditionalWait);
-    mDestroyThread = true;
-    mConditionalWait.Notify(lock);
-  }
-
-  DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::~VectorRasterizeThread: Join [%p]\n", this);
-
-  Join();
-}
-
-void VectorRasterizeThread::SetCompletedCallback(CallbackBase* callback)
-{
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
-  mCompletedCallback = std::unique_ptr<CallbackBase>(callback);
-}
-
-void VectorRasterizeThread::AddTask(VectorAnimationTaskPtr task)
-{
-  // Lock while adding task to the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
-  if(!mIsThreadStarted)
-  {
-    Start();
-    mIsThreadStarted = true;
-  }
-
-  if(mRasterizeTasks.end() == std::find(mRasterizeTasks.begin(), mRasterizeTasks.end(), task))
-  {
-    mRasterizeTasks.push_back(task);
-
-    // wake up the animation thread
-    mConditionalWait.Notify(lock);
-  }
-}
-
-void VectorRasterizeThread::Run()
-{
-  SetThreadName("VectorRasterizeThread");
-  mLogFactory.InstallLogFunction();
-
-  while(!mDestroyThread)
-  {
-    Rasterize();
-  }
-}
-
-void VectorRasterizeThread::Rasterize()
-{
-  VectorAnimationTaskPtr nextTask;
-  {
-    // Lock while popping task out from the queue
-    ConditionalWait::ScopedLock lock(mConditionalWait);
-
-    // conditional wait
-    if(mRasterizeTasks.empty())
-    {
-      mConditionalWait.Wait(lock);
-    }
-
-    // pop out the next task from the queue
-    if(!mRasterizeTasks.empty())
-    {
-      std::vector<VectorAnimationTaskPtr>::iterator next = mRasterizeTasks.begin();
-      nextTask                                           = *next;
-      mRasterizeTasks.erase(next);
-    }
-  }
-
-  if(nextTask)
-  {
-    bool keepAnimation = nextTask->Rasterize();
-
-    if(mCompletedCallback)
-    {
-      CallbackBase::Execute(*mCompletedCallback, nextTask, keepAnimation);
-    }
-  }
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
deleted file mode 100644
index 25bd4e5..0000000
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef DALI_TOOLKIT_VECTOR_IMAGE_RASTERIZE_THREAD_H
-#define DALI_TOOLKIT_VECTOR_IMAGE_RASTERIZE_THREAD_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/threading/conditional-wait.h>
-#include <dali/devel-api/threading/thread.h>
-#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
-#include <memory>
-#include <vector>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-/**
- * The worker thread for vector image rasterization.
- */
-class VectorRasterizeThread : public Thread
-{
-public:
-  /**
-   * @brief Constructor.
-   */
-  VectorRasterizeThread();
-
-  /**
-   * @brief Destructor.
-   */
-  ~VectorRasterizeThread() override;
-
-  /**
-   * The callback is called from the rasterize thread after the rasterization is completed.
-   * @param[in] callBack  The function to call.
-   */
-  void SetCompletedCallback(CallbackBase* callback);
-
-  /**
-   * Add a task to rasterize.
-   *
-   * @param[in] task The task to rasterize
-   */
-  void AddTask(VectorAnimationTaskPtr task);
-
-protected:
-  /**
-   * @brief The entry function of the worker thread.
-   *        It rasterizes the vector image.
-   */
-  void Run() override;
-
-private:
-  /**
-   * Rasterizes the tasks.
-   */
-  void Rasterize();
-
-private:
-  // Undefined
-  VectorRasterizeThread(const VectorRasterizeThread& thread) = delete;
-
-  // Undefined
-  VectorRasterizeThread& operator=(const VectorRasterizeThread& thread) = delete;
-
-private:
-  std::vector<VectorAnimationTaskPtr> mRasterizeTasks;
-  ConditionalWait                     mConditionalWait;
-  std::unique_ptr<CallbackBase>       mCompletedCallback;
-  bool                                mDestroyThread; ///< Whether the thread be destroyed
-  bool                                mIsThreadStarted;
-  const Dali::LogFactoryInterface&    mLogFactory; ///< The log factory
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_VECTOR_IMAGE_RASTERIZE_THREAD_H
diff --git a/dali-toolkit/internal/visuals/arc/arc-visual.cpp b/dali-toolkit/internal/visuals/arc/arc-visual.cpp
index 76328f4..8c9f0fe 100644
--- a/dali-toolkit/internal/visuals/arc/arc-visual.cpp
+++ b/dali-toolkit/internal/visuals/arc/arc-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 #include <dali/integration-api/debug.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
@@ -38,6 +37,8 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(4); // thickness,start,sweep,radius
+
 // cap
 DALI_ENUM_TO_STRING_TABLE_BEGIN(CAP)
   DALI_ENUM_TO_STRING_WITH_SCOPE(DevelArcVisual::Cap, BUTT)
@@ -188,23 +189,6 @@ void ArcVisual::OnSetTransform()
   }
 }
 
-void ArcVisual::OnDoAction(const Property::Index actionId, const Property::Value& attributes)
-{
-  // Check if action is valid for this visual type and perform action if possible
-  switch(actionId)
-  {
-    case DevelArcVisual::Action::UPDATE_PROPERTY:
-    {
-      const Property::Map* map = attributes.GetMap();
-      if(map)
-      {
-        DoSetProperties(*map);
-      }
-      break;
-    }
-  }
-}
-
 void ArcVisual::OnInitialize()
 {
   Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
@@ -215,8 +199,7 @@ void ArcVisual::OnInitialize()
     shader = mFactoryCache.GetShader(VisualFactoryCache::ARC_BUTT_CAP_SHADER);
     if(!shader)
     {
-      shader = Shader::New(Dali::Shader::GetVertexShaderPrefix() + SHADER_ARC_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_ARC_VISUAL_BUTT_CAP_SHADER_FRAG.data());
-      mFactoryCache.SaveShader(VisualFactoryCache::ARC_BUTT_CAP_SHADER, shader);
+      shader = mFactoryCache.GenerateAndSaveShader(VisualFactoryCache::ARC_BUTT_CAP_SHADER, Dali::Shader::GetVertexShaderPrefix() + SHADER_ARC_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_ARC_VISUAL_BUTT_CAP_SHADER_FRAG.data());
     }
   }
   else
@@ -224,23 +207,23 @@ void ArcVisual::OnInitialize()
     shader = mFactoryCache.GetShader(VisualFactoryCache::ARC_ROUND_CAP_SHADER);
     if(!shader)
     {
-      shader = Shader::New(Dali::Shader::GetVertexShaderPrefix() + SHADER_ARC_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_ARC_VISUAL_ROUND_CAP_SHADER_FRAG.data());
-      mFactoryCache.SaveShader(VisualFactoryCache::ARC_ROUND_CAP_SHADER, shader);
+      shader = mFactoryCache.GenerateAndSaveShader(VisualFactoryCache::ARC_ROUND_CAP_SHADER, Dali::Shader::GetVertexShaderPrefix() + SHADER_ARC_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_ARC_VISUAL_ROUND_CAP_SHADER_FRAG.data());
     }
   }
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = VisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
-  mThicknessIndex  = mImpl->mRenderer.RegisterProperty(DevelArcVisual::Property::THICKNESS, THICKNESS_NAME, mThickness);
-  mStartAngleIndex = mImpl->mRenderer.RegisterProperty(DevelArcVisual::Property::START_ANGLE, START_ANGLE_NAME, mStartAngle);
-  mSweepAngleIndex = mImpl->mRenderer.RegisterProperty(DevelArcVisual::Property::SWEEP_ANGLE, SWEEP_ANGLE_NAME, mSweepAngle);
+  mThicknessIndex  = mImpl->mRenderer.RegisterUniqueProperty(DevelArcVisual::Property::THICKNESS, THICKNESS_NAME, mThickness);
+  mStartAngleIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelArcVisual::Property::START_ANGLE, START_ANGLE_NAME, mStartAngle);
+  mSweepAngleIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelArcVisual::Property::SWEEP_ANGLE, SWEEP_ANGLE_NAME, mSweepAngle);
 
   mRadiusIndex = mImpl->mRenderer.RegisterProperty(RADIUS_NAME, mRadius);
 
   mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
 
   // Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/arc/arc-visual.h b/dali-toolkit/internal/visuals/arc/arc-visual.h
index 4746351..011b946 100644
--- a/dali-toolkit/internal/visuals/arc/arc-visual.h
+++ b/dali-toolkit/internal/visuals/arc/arc-visual.h
@@ -107,11 +107,6 @@ protected:
    */
   void OnSetTransform() override;
 
-  /**
-   * @copydoc Visual::Base::OnDoAction
-   */
-  void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override;
-
 private:
   // Undefined
   ArcVisual(const ArcVisual& arcVisual) = delete;
diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp
index e0e5830..322017f 100644
--- a/dali-toolkit/internal/visuals/border/border-visual.cpp
+++ b/dali-toolkit/internal/visuals/border/border-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,8 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(2); // color,size
+
 const char* const POSITION_ATTRIBUTE_NAME("aPosition");
 const char* const DRIFT_ATTRIBUTE_NAME("aDrift");
 const char* const INDEX_NAME("indices");
@@ -127,12 +129,18 @@ void BorderVisual::DoSetProperty(Dali::Property::Index        index,
 
 void BorderVisual::DoSetOnScene(Actor& actor)
 {
-  mBorderColorIndex = mImpl->mRenderer.RegisterProperty(Toolkit::BorderVisual::Property::COLOR, COLOR_NAME, mBorderColor);
+  if(mBorderColorIndex == Property::INVALID_INDEX)
+  {
+    mBorderColorIndex = mImpl->mRenderer.RegisterUniqueProperty(Toolkit::BorderVisual::Property::COLOR, COLOR_NAME, mBorderColor);
+  }
   if(mBorderColor.a < 1.f || mAntiAliasing)
   {
     mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
   }
-  mBorderSizeIndex = mImpl->mRenderer.RegisterProperty(Toolkit::BorderVisual::Property::SIZE, SIZE_NAME, mBorderSize);
+  if(mBorderSizeIndex == Property::INVALID_INDEX)
+  {
+    mBorderSizeIndex = mImpl->mRenderer.RegisterUniqueProperty(Toolkit::BorderVisual::Property::SIZE, SIZE_NAME, mBorderSize);
+  }
 
   actor.AddRenderer(mImpl->mRenderer);
 
@@ -158,7 +166,7 @@ void BorderVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -172,10 +180,11 @@ void BorderVisual::OnInitialize()
   }
 
   Shader shader    = GetBorderShader();
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = VisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
   //Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 Shader BorderVisual::GetBorderShader()
@@ -186,8 +195,7 @@ Shader BorderVisual::GetBorderShader()
     shader = mFactoryCache.GetShader(VisualFactoryCache::BORDER_SHADER_ANTI_ALIASING);
     if(!shader)
     {
-      shader = Shader::New(Dali::Shader::GetVertexShaderPrefix() + SHADER_BORDER_VISUAL_ANTI_ALIASING_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_BORDER_VISUAL_ANTI_ALIASING_SHADER_FRAG.data());
-      mFactoryCache.SaveShader(VisualFactoryCache::BORDER_SHADER_ANTI_ALIASING, shader);
+      shader = mFactoryCache.GenerateAndSaveShader(VisualFactoryCache::BORDER_SHADER_ANTI_ALIASING, Dali::Shader::GetVertexShaderPrefix() + SHADER_BORDER_VISUAL_ANTI_ALIASING_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_BORDER_VISUAL_ANTI_ALIASING_SHADER_FRAG.data());
     }
   }
   else
@@ -195,8 +203,7 @@ Shader BorderVisual::GetBorderShader()
     shader = mFactoryCache.GetShader(VisualFactoryCache::BORDER_SHADER);
     if(!shader)
     {
-      shader = Shader::New(Dali::Shader::GetVertexShaderPrefix() + SHADER_BORDER_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_BORDER_VISUAL_SHADER_FRAG.data());
-      mFactoryCache.SaveShader(VisualFactoryCache::BORDER_SHADER, shader);
+      shader = mFactoryCache.GenerateAndSaveShader(VisualFactoryCache::BORDER_SHADER, Dali::Shader::GetVertexShaderPrefix() + SHADER_BORDER_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_BORDER_VISUAL_SHADER_FRAG.data());
     }
   }
 
diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp
index 9863364..cb20865 100644
--- a/dali-toolkit/internal/visuals/color/color-visual.cpp
+++ b/dali-toolkit/internal/visuals/color/color-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,11 @@
 // EXTERNAL INCLUDES
 #include <dali/devel-api/rendering/renderer-devel.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visuals/color-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
@@ -41,14 +42,16 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(0);
+
 VisualFactoryCache::ShaderType SHADER_TYPE_TABLE[6] =
-{
-  VisualFactoryCache::COLOR_SHADER,
-  VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER,
-  VisualFactoryCache::COLOR_SHADER_BORDERLINE,
-  VisualFactoryCache::COLOR_SHADER_ROUNDED_BORDERLINE,
-  VisualFactoryCache::COLOR_SHADER_BLUR_EDGE,
-  VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER_BLUR_EDGE,
+  {
+    VisualFactoryCache::COLOR_SHADER,
+    VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER,
+    VisualFactoryCache::COLOR_SHADER_BORDERLINE,
+    VisualFactoryCache::COLOR_SHADER_ROUNDED_BORDERLINE,
+    VisualFactoryCache::COLOR_SHADER_BLUR_EDGE,
+    VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER_BLUR_EDGE,
 };
 
 // enum of required list when we select shader
@@ -59,6 +62,8 @@ enum ColorVisualRequireFlag
   BORDERLINE     = 1 << 1,
   BLUR           = 1 << 2,
 };
+
+constexpr uint32_t MINIMUM_SHADER_VERSION_SUPPORT_ROUNDED_BLUR = 300;
 } // unnamed namespace
 ColorVisualPtr ColorVisual::New(VisualFactoryCache& factoryCache, const Property::Map& properties)
 {
@@ -71,8 +76,7 @@ ColorVisualPtr ColorVisual::New(VisualFactoryCache& factoryCache, const Property
 ColorVisual::ColorVisual(VisualFactoryCache& factoryCache)
 : Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::COLOR),
   mBlurRadius(0.0f),
-  mBlurRadiusIndex(Property::INVALID_INDEX),
-  mNeedBlurRadius(false)
+  mAlwaysUsingBlurRadius(false)
 {
 }
 
@@ -114,6 +118,28 @@ void ColorVisual::DoSetProperties(const Property::Map& propertyMap)
     {
       DALI_LOG_ERROR("ColorVisual:DoSetProperties:: BLUR_RADIUS property has incorrect type: %d\n", blurRadiusValue->GetType());
     }
+
+    if(DALI_UNLIKELY(mImpl->mRenderer))
+    {
+      // Unusual case. SetProperty called after OnInitialize().
+      // Assume that DoAction call UPDATE_PROPERTY.
+      DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBlurRadiusUniform();
+      mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BLUR_RADIUS, mBlurRadius);
+
+      // Check whether we must update shader.
+      if(!mAlwaysUsingBlurRadius && IsBlurRequired())
+      {
+        // Change the shader must not be occured many times. we always have to use blur feature.
+        mAlwaysUsingBlurRadius = true;
+
+        mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+        // Change shader
+        if(!mImpl->mCustomShader)
+        {
+          UpdateShader();
+        }
+      }
+    }
   }
 }
 
@@ -136,10 +162,10 @@ void ColorVisual::DoCreatePropertyMap(Property::Map& map) const
   map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
   map.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, mImpl->mMixColor);
 
-  if(mImpl->mRenderer && mBlurRadiusIndex != Property::INVALID_INDEX)
+  if(mImpl->mRenderer)
   {
     // Update values from Renderer
-    float blurRadius = mImpl->mRenderer.GetProperty<float>(mBlurRadiusIndex);
+    float blurRadius = mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BLUR_RADIUS);
     map.Insert(Toolkit::DevelColorVisual::Property::BLUR_RADIUS, blurRadius);
   }
   else
@@ -153,28 +179,20 @@ void ColorVisual::DoCreateInstancePropertyMap(Property::Map& map) const
   // Do nothing
 }
 
-void ColorVisual::OnSetTransform()
+void ColorVisual::EnablePreMultipliedAlpha(bool preMultiplied)
 {
-  if(mImpl->mRenderer)
+  // Make always disable pre multiplied alpha whether preMultiplied value is true.
+  if(preMultiplied)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    DALI_LOG_WARNING("Note : ColorVisual cannot enable PreMultipliedAlpha\n");
   }
 }
 
-void ColorVisual::OnDoAction(const Property::Index actionId, const Property::Value& attributes)
+void ColorVisual::OnSetTransform()
 {
-  // Check if action is valid for this visual type and perform action if possible
-  switch(actionId)
+  if(mImpl->mRenderer)
   {
-    case DevelColorVisual::Action::UPDATE_PROPERTY:
-    {
-      const Property::Map* map = attributes.GetMap();
-      if(map)
-      {
-        DoSetProperties(*map);
-      }
-      break;
-    }
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -193,72 +211,78 @@ void ColorVisual::OnInitialize()
 
   Shader shader = GenerateShader();
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
-  // ColorVisual has it's own index key for mix color - use this instead
-  // of using the new base index to avoid changing existing applications
-  // String keys will get to this property.
-  mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty(Toolkit::ColorVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor));
+  mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(mImpl->mMixColor));
 
-  if(!EqualsZero(mBlurRadius))
+  if(mAlwaysUsingBlurRadius || !EqualsZero(mBlurRadius))
   {
-    mBlurRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelColorVisual::Property::BLUR_RADIUS, BLUR_RADIUS_NAME, mBlurRadius);
+    DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBlurRadiusUniform();
+    mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BLUR_RADIUS, mBlurRadius);
     mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
   }
 
   // Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 Shader ColorVisual::GenerateShader() const
 {
-  Shader shader;
+  Shader                         shader;
   VisualFactoryCache::ShaderType shaderType;
 
-  bool roundedCorner = IsRoundedCornerRequired();
-  bool borderline    = IsBorderlineRequired();
-  bool blur          = !EqualsZero(mBlurRadius) || mNeedBlurRadius;
-  int shaderTypeFlag = ColorVisualRequireFlag::DEFAULT;
+  bool roundedCorner  = IsRoundedCornerRequired();
+  bool borderline     = IsBorderlineRequired();
+  bool blur           = IsBlurRequired();
+  int  shaderTypeFlag = ColorVisualRequireFlag::DEFAULT;
 
-  if(roundedCorner)
-  {
-    shaderTypeFlag |= ColorVisualRequireFlag::ROUNDED_CORNER;
-  }
   if(blur)
   {
     // If we use blur, just ignore borderline
     borderline = false;
     shaderTypeFlag |= ColorVisualRequireFlag::BLUR;
   }
+  if(roundedCorner)
+  {
+    shaderTypeFlag |= ColorVisualRequireFlag::ROUNDED_CORNER;
+  }
   if(borderline)
   {
     shaderTypeFlag |= ColorVisualRequireFlag::BORDERLINE;
   }
 
   shaderType = SHADER_TYPE_TABLE[shaderTypeFlag];
-  shader = mFactoryCache.GetShader(shaderType);
+  shader     = mFactoryCache.GetShader(shaderType);
   if(!shader)
   {
     std::string vertexShaderPrefixList;
     std::string fragmentShaderPrefixList;
     if(roundedCorner)
     {
-      vertexShaderPrefixList   += "#define IS_REQUIRED_ROUNDED_CORNER 1\n";
-      fragmentShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER 1\n";
+      vertexShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+      fragmentShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER\n";
     }
     if(blur)
     {
-      vertexShaderPrefixList   += "#define IS_REQUIRED_BLUR 1\n";
-      fragmentShaderPrefixList += "#define IS_REQUIRED_BLUR 1\n";
+      vertexShaderPrefixList += "#define IS_REQUIRED_BLUR\n";
+      fragmentShaderPrefixList += "#define IS_REQUIRED_BLUR\n";
+
+      // If shader version doesn't support latest blur with corner radius, Let we use legacy code.
+      if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_ROUNDED_BLUR))
+      {
+        fragmentShaderPrefixList += "#define SL_VERSION_LOW\n";
+      }
     }
     if(borderline)
     {
-      vertexShaderPrefixList   += "#define IS_REQUIRED_BORDERLINE 1\n";
-      fragmentShaderPrefixList += "#define IS_REQUIRED_BORDERLINE 1\n";
+      vertexShaderPrefixList += "#define IS_REQUIRED_BORDERLINE\n";
+      fragmentShaderPrefixList += "#define IS_REQUIRED_BORDERLINE\n";
     }
-    shader = Shader::New(Dali::Shader::GetVertexShaderPrefix()   + vertexShaderPrefixList   + SHADER_COLOR_VISUAL_SHADER_VERT.data(),
-                         Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderPrefixList + SHADER_COLOR_VISUAL_SHADER_FRAG.data());
-    mFactoryCache.SaveShader(shaderType, shader);
+
+    shader = mFactoryCache.GenerateAndSaveShader(shaderType,
+                                                 Dali::Shader::GetVertexShaderPrefix() + vertexShaderPrefixList + SHADER_COLOR_VISUAL_SHADER_VERT.data(),
+                                                 Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderPrefixList + SHADER_COLOR_VISUAL_SHADER_FRAG.data());
   }
 
   return shader;
@@ -274,22 +298,39 @@ Dali::Property ColorVisual::OnGetPropertyObject(Dali::Property::Key key)
 
   if((key.type == Property::Key::INDEX && key.indexKey == DevelColorVisual::Property::BLUR_RADIUS) || (key.type == Property::Key::STRING && key.stringKey == BLUR_RADIUS_NAME))
   {
-    mBlurRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelColorVisual::Property::BLUR_RADIUS, BLUR_RADIUS_NAME, mBlurRadius);
-
-    mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+    const bool updateShader = !mImpl->mCustomShader && !IsBlurRequired();
 
-    mNeedBlurRadius = true;
+    // Blur is animated now. we always have to use blur feature.
+    mAlwaysUsingBlurRadius = true;
 
-    // Change shader
-    UpdateShader();
+    if(updateShader)
+    {
+      // Update each values to renderer
+      DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBlurRadiusUniform();
+      mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BLUR_RADIUS, mBlurRadius);
 
-    return Dali::Property(mImpl->mRenderer, mBlurRadiusIndex);
+      // Change shader
+      UpdateShader();
+    }
+    mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+    return Dali::Property(mImpl->mRenderer, DecoratedVisualRenderer::Property::BLUR_RADIUS);
   }
 
   Handle handle;
   return Dali::Property(handle, Property::INVALID_INDEX);
 }
 
+bool ColorVisual::IsBlurRequired() const
+{
+  float blurRadius = mBlurRadius;
+  if(mImpl->mRenderer)
+  {
+    // Update values from Renderer
+    blurRadius = mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BLUR_RADIUS);
+  }
+  return mAlwaysUsingBlurRadius || !EqualsZero(blurRadius);
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h
index 1f2af5c..0a8a8b2 100644
--- a/dali-toolkit/internal/visuals/color/color-visual.h
+++ b/dali-toolkit/internal/visuals/color/color-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,6 +65,11 @@ public: // from Visual
    */
   void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
+  /**
+   * @copydoc Visual::Base::EnablePreMultipliedAlpha
+   */
+  void EnablePreMultipliedAlpha(bool preMultiplied) override;
+
 protected:
   /**
    * @brief Constructor.
@@ -104,11 +109,6 @@ protected:
   void OnSetTransform() override;
 
   /**
-   * @copydoc Visual::Base::OnDoAction
-   */
-  void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override;
-
-  /**
    * @copydoc Visual::Base::UpdateShader
    */
   void UpdateShader() override;
@@ -123,6 +123,14 @@ protected:
    */
   Dali::Property OnGetPropertyObject(Dali::Property::Key key) override;
 
+protected:
+  /**
+   * @brief Query whether the visual requires to be blur.
+   *
+   * @return Returns true if the blur is required, false otherwise.
+   */
+  bool IsBlurRequired() const;
+
 private:
   // Undefined
   ColorVisual(const ColorVisual& colorRenderer);
@@ -131,9 +139,8 @@ private:
   ColorVisual& operator=(const ColorVisual& colorRenderer);
 
 private:
-  float           mBlurRadius;      ///< The blur radius
-  Property::Index mBlurRadiusIndex; ///< The blur radius property index
-  bool            mNeedBlurRadius;  ///< Whether we need the blur radius in shader.
+  float mBlurRadius;                ///< The blur radius
+  bool  mAlwaysUsingBlurRadius : 1; ///< Whether we need the blur radius in shader always.
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
index 18e4767..1aa9bd8 100644
--- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
+++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/object/property-array.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
 #include <typeinfo>
 
 // INTERNAL INCLUDES
@@ -46,6 +47,8 @@ namespace Internal
 {
 namespace
 {
+static constexpr int32_t CUSTOM_PROPERTY_COUNT(1); // alignment
+
 DALI_ENUM_TO_STRING_TABLE_BEGIN(UNITS)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::GradientVisual::Units, OBJECT_BOUNDING_BOX)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::GradientVisual::Units, USER_SPACE)
@@ -58,30 +61,31 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(SPREAD_METHOD)
 DALI_ENUM_TO_STRING_TABLE_END(SPREAD_METHOD)
 
 // uniform names
-const char* const UNIFORM_ALIGNMENT_MATRIX_NAME("uAlignmentMatrix");
+static constexpr std::string_view UNIFORM_ALIGNMENT_MATRIX_NAME("uAlignmentMatrix");
+static constexpr std::string_view UNIFORM_TEXTURE_COORDINATE_SCALE_FACTOR_NAME("uTextureCoordinateScaleFactor");
 
 // default offset value
-const unsigned int DEFAULT_OFFSET_MINIMUM = 0.0f;
-const unsigned int DEFAULT_OFFSET_MAXIMUM = 1.0f;
+static constexpr float DEFAULT_OFFSET_MINIMUM = 0.0f;
+static constexpr float DEFAULT_OFFSET_MAXIMUM = 1.0f;
 
 VisualFactoryCache::ShaderType SHADER_TYPE_TABLE[16] =
-{
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX,
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_CORNER,
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX_BORDERLINE,
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_BORDERLINE,
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE,
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_CORNER,
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE_BORDERLINE,
-  VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_BORDERLINE,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_CORNER,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX_BORDERLINE,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_BORDERLINE,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_CORNER,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE_BORDERLINE,
-  VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_BORDERLINE,
+  {
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX,
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_CORNER,
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX_BORDERLINE,
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_BORDERLINE,
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE,
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_CORNER,
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE_BORDERLINE,
+    VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_BORDERLINE,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_CORNER,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX_BORDERLINE,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_BORDERLINE,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_CORNER,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE_BORDERLINE,
+    VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_BORDERLINE,
 };
 
 // enum of required list when we select shader
@@ -167,7 +171,7 @@ void GradientVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -236,12 +240,21 @@ void GradientVisual::DoCreateInstancePropertyMap(Property::Map& map) const
   // Do nothing
 }
 
+void GradientVisual::EnablePreMultipliedAlpha(bool preMultiplied)
+{
+  // Make always enable pre multiplied alpha whether preMultiplied value is false.
+  if(!preMultiplied)
+  {
+    DALI_LOG_WARNING("Note : GradientVisual cannot disable PreMultipliedAlpha\n");
+  }
+}
+
 void GradientVisual::OnInitialize()
 {
   Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
   Shader   shader   = GenerateShader();
 
-  //Set up the texture set
+  // Set up the texture set
   TextureSet    textureSet    = TextureSet::New();
   Dali::Texture lookupTexture = mGradient->GenerateLookupTexture();
   textureSet.SetTexture(0u, lookupTexture);
@@ -250,7 +263,8 @@ void GradientVisual::OnInitialize()
   sampler.SetWrapMode(wrap, wrap);
   textureSet.SetSampler(0u, sampler);
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
   mImpl->mRenderer.SetTextures(textureSet);
 
   // If opaque and then no need to have blending
@@ -259,10 +273,13 @@ void GradientVisual::OnInitialize()
     mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::OFF);
   }
 
-  mImpl->mRenderer.RegisterProperty(UNIFORM_ALIGNMENT_MATRIX_NAME, mGradientTransform);
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_ALIGNMENT_MATRIX_NAME, mGradientTransform);
+
+  float textureSize = static_cast<float>(lookupTexture.GetWidth());
+  mImpl->mRenderer.RegisterUniqueProperty(UNIFORM_TEXTURE_COORDINATE_SCALE_FACTOR_NAME, (textureSize - 1.0f) / textureSize);
 
-  //Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  // Register transform properties
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 bool GradientVisual::NewGradient(Type gradientType, const Property::Map& propertyMap)
@@ -352,7 +369,7 @@ Shader GradientVisual::GenerateShader() const
   bool borderline     = IsBorderlineRequired();
   bool radialGradient = (mGradientType == Type::RADIAL);
 
-  int  shaderTypeFlag = GradientVisualRequireFlag::DEFAULT;
+  int shaderTypeFlag = GradientVisualRequireFlag::DEFAULT;
   if(roundedCorner)
   {
     shaderTypeFlag |= GradientVisualRequireFlag::ROUNDED_CORNER;
@@ -379,26 +396,26 @@ Shader GradientVisual::GenerateShader() const
 
     if(roundedCorner)
     {
-      vertexShaderPrefixList   += "#define IS_REQUIRED_ROUNDED_CORNER 1\n";
-      fragmentShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER 1\n";
+      vertexShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+      fragmentShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER\n";
     }
     if(borderline)
     {
-      vertexShaderPrefixList   += "#define IS_REQUIRED_BORDERLINE 1\n";
-      fragmentShaderPrefixList += "#define IS_REQUIRED_BORDERLINE 1\n";
+      vertexShaderPrefixList += "#define IS_REQUIRED_BORDERLINE\n";
+      fragmentShaderPrefixList += "#define IS_REQUIRED_BORDERLINE\n";
     }
     if(radialGradient)
     {
-      fragmentShaderPrefixList += "#define RADIAL 1\n";
+      fragmentShaderPrefixList += "#define RADIAL\n";
     }
     if(userspaceUnit)
     {
-      vertexShaderPrefixList   += "#define USER_SPACE 1\n";
+      vertexShaderPrefixList += "#define USER_SPACE\n";
     }
 
-    shader = Shader::New(Dali::Shader::GetVertexShaderPrefix()   + vertexShaderPrefixList   + SHADER_GRADIENT_VISUAL_SHADER_VERT.data(),
-                         Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderPrefixList + SHADER_GRADIENT_VISUAL_SHADER_FRAG.data());
-    mFactoryCache.SaveShader(shaderType, shader);
+    shader = mFactoryCache.GenerateAndSaveShader(shaderType,
+                                                 Dali::Shader::GetVertexShaderPrefix() + vertexShaderPrefixList + SHADER_GRADIENT_VISUAL_SHADER_VERT.data(),
+                                                 Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderPrefixList + SHADER_GRADIENT_VISUAL_SHADER_FRAG.data());
   }
 
   return shader;
diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.h b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
index 40223b8..9a471d4 100644
--- a/dali-toolkit/internal/visuals/gradient/gradient-visual.h
+++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,6 +101,11 @@ public: // from Visual
    */
   void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
+  /**
+   * @copydoc Visual::Base::EnablePreMultipliedAlpha
+   */
+  void EnablePreMultipliedAlpha(bool preMultiplied) override;
+
 protected:
   /**
    * @brief Constructor.
diff --git a/dali-toolkit/internal/visuals/gradient/gradient.cpp b/dali-toolkit/internal/visuals/gradient/gradient.cpp
index 34da8a6..e96cf32 100644
--- a/dali-toolkit/internal/visuals/gradient/gradient.cpp
+++ b/dali-toolkit/internal/visuals/gradient/gradient.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,7 +91,8 @@ Dali::Texture Gradient::GenerateLookupTexture()
 {
   std::sort(mGradientStops.Begin(), mGradientStops.End());
 
-  unsigned int numStops = mGradientStops.Count();
+  uint32_t numStops = mGradientStops.Count();
+  DALI_ASSERT_ALWAYS(numStops > 0u && "The number of gradient stop should not be zero!");
 
   /**
    * If the stops have not covered the whole zero to one range,
@@ -179,8 +180,10 @@ Dali::Texture Gradient::GenerateLookupTexture()
 
 unsigned int Gradient::EstimateTextureResolution()
 {
-  float minInterval = 1.0;
-  for(unsigned int i = 0, numStops = mGradientStops.Count(); i < numStops - 1u; i++)
+  float          minInterval = 1.0;
+  const uint32_t numStops    = mGradientStops.Count();
+  DALI_ASSERT_ALWAYS(numStops > 0u && "The number of gradient stop should not be zero!");
+  for(uint32_t i = 0; i < numStops - 1u; i++)
   {
     float interval = mGradientStops[i + 1].mOffset - mGradientStops[i].mOffset;
     minInterval    = interval > minInterval ? minInterval : interval;
diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.cpp b/dali-toolkit/internal/visuals/image-atlas-manager.cpp
index a8de5a8..25fff39 100644
--- a/dali-toolkit/internal/visuals/image-atlas-manager.cpp
+++ b/dali-toolkit/internal/visuals/image-atlas-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,23 @@ ImageAtlasManager::~ImageAtlasManager()
 {
 }
 
+bool ImageAtlasManager::CheckAtlasAvailable(const VisualUrl& url, const ImageDimensions& size) const
+{
+  ImageDimensions dimensions = size;
+  ImageDimensions zero;
+  if(size == zero)
+  {
+    dimensions = Dali::GetClosestImageSize(url.GetUrl());
+  }
+
+  // big image, atlasing is not applied
+  if(static_cast<uint32_t>(dimensions.GetWidth()) * static_cast<uint32_t>(dimensions.GetHeight()) > MAX_ITEM_AREA || dimensions.GetWidth() > DEFAULT_ATLAS_SIZE || dimensions.GetHeight() > DEFAULT_ATLAS_SIZE)
+  {
+    return false;
+  }
+  return true;
+}
+
 TextureSet ImageAtlasManager::Add(Vector4&             textureRect,
                                   const VisualUrl&     url,
                                   ImageDimensions&     size,
@@ -67,7 +84,7 @@ TextureSet ImageAtlasManager::Add(Vector4&             textureRect,
   }
   size = dimensions;
 
-  unsigned int i = 0;
+  uint32_t i = 0;
   for(AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter)
   {
     if(GetImplementation(*iter).Upload(textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver))
@@ -82,6 +99,34 @@ TextureSet ImageAtlasManager::Add(Vector4&             textureRect,
   return mTextureSetList.back();
 }
 
+TextureSet ImageAtlasManager::Add(Vector4&                  textureRect,
+                                  const EncodedImageBuffer& encodedImageBuffer,
+                                  const ImageDimensions&    size,
+                                  FittingMode::Type         fittingMode,
+                                  bool                      orientationCorrection,
+                                  AtlasUploadObserver*      atlasUploadObserver)
+{
+  // big image, atlasing is not applied
+  if(static_cast<uint32_t>(size.GetWidth()) * static_cast<uint32_t>(size.GetHeight()) > MAX_ITEM_AREA || size.GetWidth() > DEFAULT_ATLAS_SIZE || size.GetHeight() > DEFAULT_ATLAS_SIZE)
+  {
+    return TextureSet();
+  }
+
+  uint32_t i = 0;
+  for(AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter)
+  {
+    if(GetImplementation(*iter).Upload(textureRect, encodedImageBuffer, size, fittingMode, orientationCorrection, atlasUploadObserver))
+    {
+      return mTextureSetList[i];
+    }
+    i++;
+  }
+
+  CreateNewAtlas();
+  GetImplementation(mAtlasList.back()).Upload(textureRect, encodedImageBuffer, size, fittingMode, orientationCorrection, atlasUploadObserver);
+  return mTextureSetList.back();
+}
+
 TextureSet ImageAtlasManager::Add(Vector4&  textureRect,
                                   PixelData pixelData)
 {
@@ -91,7 +136,7 @@ TextureSet ImageAtlasManager::Add(Vector4&  textureRect,
     return TextureSet();
   }
 
-  unsigned int i = 0;
+  uint32_t i = 0;
   for(AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter)
   {
     if((*iter).Upload(textureRect, pixelData))
@@ -108,7 +153,7 @@ TextureSet ImageAtlasManager::Add(Vector4&  textureRect,
 
 void ImageAtlasManager::Remove(TextureSet textureSet, const Vector4& textureRect)
 {
-  unsigned int i = 0;
+  uint32_t i = 0;
   for(TextureSetContainer::iterator iter = mTextureSetList.begin(); iter != mTextureSetList.end(); ++iter)
   {
     if((*iter) == textureSet)
diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.h b/dali-toolkit/internal/visuals/image-atlas-manager.h
index b8f5a11..ec7a402 100644
--- a/dali-toolkit/internal/visuals/image-atlas-manager.h
+++ b/dali-toolkit/internal/visuals/image-atlas-manager.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_ATLAS_MANAGER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/rendering/texture-set.h>
@@ -52,6 +53,15 @@ public:
   ImageAtlasManager();
 
   /**
+   * @brief Check whether the image of url could be Atlas or not.
+   *
+   * @param [in] url The URL of the resource image file to use.
+   * @param [in] size The width and height to fit the loaded image to.
+   * @return True if the image could be Atlas.
+   */
+  bool CheckAtlasAvailable(const VisualUrl& url, const ImageDimensions& size) const;
+
+  /**
    * @brief Add an image to the atlas.
    *
    * @note To make the atlasing efficient, an valid size should be provided.
@@ -73,6 +83,29 @@ public:
                  FittingMode::Type    fittingMode           = FittingMode::DEFAULT,
                  bool                 orientationCorrection = true,
                  AtlasUploadObserver* atlasUploadObserver   = NULL);
+
+  /**
+   * @brief Add an image to the atlas.
+   *
+   * @note To make the atlasing efficient, an valid size should be provided.
+   *
+   * SamplingMode::BOX_THEN_LINEAR is used to sampling pixels from the input image while fitting it to desired size.
+   *
+   * @param [out] textureRect The texture area of the resource image in the atlas.
+   * @param [in] encodedImageBuffer The encoded buffer of the resource image file to use.
+   * @param [in] size The width and height to fit the loaded image to.
+   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
+   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
+   * @param [in] atlasUploadObserver The object to observe the uploading state inside ImageAtlas.
+   * @return The texture set containing the image.
+   */
+  TextureSet Add(Vector4&                  textureRect,
+                 const EncodedImageBuffer& encodedImageBuffer,
+                 const ImageDimensions&    size,
+                 FittingMode::Type         fittingMode           = FittingMode::DEFAULT,
+                 bool                      orientationCorrection = true,
+                 AtlasUploadObserver*      atlasUploadObserver   = NULL);
+
   /**
    * @brief Add a pixel buffer to the atlas
    *
diff --git a/dali-toolkit/internal/visuals/image-visual-shader-debug.cpp b/dali-toolkit/internal/visuals/image-visual-shader-debug.cpp
new file mode 100644
index 0000000..bc2f930
--- /dev/null
+++ b/dali-toolkit/internal/visuals/image-visual-shader-debug.cpp
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/visuals/image-visual-shader-debug.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/environment-variable.h>
+#include <dali/devel-api/adaptor-framework/style-monitor.h> ///< for load json file.
+#include <dali/public-api/common/vector-wrapper.h>
+
+#include <regex> ///< for redefine shader
+#include <string_view>
+
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/devel-api/builder/json-parser.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+constexpr auto DALI_DEBUG_IMAGE_VISUAL_SHADER_ENV = "DALI_DEBUG_IMAGE_VISUAL_SHADER";
+
+bool DebugImageVisualShaderEnvironmentEnabled()
+{
+  static bool enabled       = false;
+  static bool enabledSetted = false;
+  if(!enabledSetted)
+  {
+    enabledSetted           = true;
+    auto debugEnabledString = Dali::EnvironmentVariable::GetEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_ENV);
+    enabled                 = debugEnabledString ? std::atoi(debugEnabledString) : false;
+  }
+  return enabled;
+}
+
+constexpr auto DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME_ENV = "DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME";
+constexpr auto DEFAULT_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME  = "debug-image-visual-shader-script.json";
+
+const std::string& GetScriptFilename()
+{
+  // Set the full path for the default script file.
+  const static std::string styleDirPath{AssetManager::GetDaliStylePath()};
+  static std::string       mScriptFileName{};
+
+  if(DALI_UNLIKELY(mScriptFileName.empty()))
+  {
+    // Use user's own script if exist.
+    auto environmentScriptFilename = Dali::EnvironmentVariable::GetEnvironmentVariable(DALI_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME_ENV);
+
+    mScriptFileName = environmentScriptFilename ? std::string(environmentScriptFilename) : styleDirPath + std::string(DEFAULT_DEBUG_IMAGE_VISUAL_SHADER_SCRIPT_FILE_NAME);
+
+    DALI_ASSERT_DEBUG(0 != mScriptFileName.length());
+  }
+
+  return mScriptFileName;
+}
+
+bool LoadJsonScript(std::string& stringOut)
+{
+  auto styleMonitor = StyleMonitor::Get();
+
+  // as toolkit is platform agnostic, it cannot load files from filesystem
+  // ask style monitor to load the style sheet
+  if(styleMonitor)
+  {
+    try
+    {
+      return styleMonitor.LoadThemeFile(GetScriptFilename(), stringOut);
+    }
+    catch(const std::exception& e)
+    {
+      DALI_LOG_ERROR("Something system exception throwed during load script file![%s]\n", GetScriptFilename().c_str());
+      DALI_LOG_ERROR("Error message : [%s]\n", e.what());
+    }
+    catch(const Dali::DaliException& e)
+    {
+      DALI_LOG_ERROR("Something Dali exception throwed during load script file![%s]\n", GetScriptFilename().c_str());
+      DALI_LOG_ERROR("Error message : [%s]\n", e.condition);
+    }
+    catch(...)
+    {
+      DALI_LOG_ERROR("Something unkown exception throwed during load script file![%s]\n", GetScriptFilename().c_str());
+    }
+  }
+
+  return false;
+}
+// Json keywords what we will get information from json.
+constexpr std::string_view DEBUG_SCRIPT_VERSION_JSON_KEY = "version";
+
+constexpr std::string_view DEBUG_EXTRA_ATTRIBUTES_JSON_KEY    = "extraAttributes";
+constexpr std::string_view DEBUG_EXTRA_VARYINGS_JSON_KEY      = "extraVaryings";
+constexpr std::string_view DEBUG_EXTRA_UNIFORMS_JSON_KEY      = "extraUniforms";
+constexpr std::string_view DEBUG_APPLY_VARYINGS_CODE_JSON_KEY = "applyVaryingsCode";
+
+constexpr std::string_view MINIMUM_DEBUG_COLOR_RATE_JSON_KEY = "minimumColorRate";
+constexpr std::string_view MAXIMUM_DEBUG_COLOR_RATE_JSON_KEY = "maximumColorRate";
+
+constexpr std::string_view DEBUG_RED_CHANNEL_CODE_JSON_KEY   = "redChannelCodes";
+constexpr std::string_view DEBUG_GREEN_CHANNEL_CODE_JSON_KEY = "greenChannelCodes";
+constexpr std::string_view DEBUG_BLUE_CHANNEL_CODE_JSON_KEY  = "blueChannelCodes";
+constexpr std::string_view DEBUG_TRIGGER_CODE_JSON_KEY       = "triggerCode";
+constexpr std::string_view DEBUG_RATIO_CODE_JSON_KEY         = "ratioCode";
+
+// Macro keywords what we will replace at vertex/fragment shader.
+constexpr std::string_view DEBUG_EXTRA_ATTRIBUTES_MACRO_KEY    = "DEBUG_EXTRA_ATTRIBUTES";
+constexpr std::string_view DEBUG_EXTRA_VARYINGS_MACRO_KEY      = "DEBUG_EXTRA_VARYINGS";
+constexpr std::string_view DEBUG_EXTRA_UNIFORMS_MACRO_KEY      = "DEBUG_EXTRA_UNIFORMS";
+constexpr std::string_view DEBUG_APPLY_VARYINGS_CODE_MACRO_KEY = "DEBUG_APPLY_VARYING_CODE";
+
+constexpr std::string_view MINIMUM_DEBUG_COLOR_RATE_MACRO_KEY = "MINIMUM_DEBUG_COLOR_RATE";
+constexpr std::string_view MAXIMUM_DEBUG_COLOR_RATE_MACRO_KEY = "MAXIMUM_DEBUG_COLOR_RATE";
+
+constexpr std::string_view DEBUG_TRIGGER_RED_CODE_MACRO_KEY   = "DEBUG_TRIGGER_RED_CODE";
+constexpr std::string_view DEBUG_TRIGGER_GREEN_CODE_MACRO_KEY = "DEBUG_TRIGGER_GREEN_CODE";
+constexpr std::string_view DEBUG_TRIGGER_BLUE_CODE_MACRO_KEY  = "DEBUG_TRIGGER_BLUE_CODE";
+constexpr std::string_view DEBUG_RATIO_RED_CODE_MACRO_KEY     = "DEBUG_RATIO_RED_CODE";
+constexpr std::string_view DEBUG_RATIO_GREEN_CODE_MACRO_KEY   = "DEBUG_RATIO_GREEN_CODE";
+constexpr std::string_view DEBUG_RATIO_BLUE_CODE_MACRO_KEY    = "DEBUG_RATIO_BLUE_CODE";
+
+// Default macro keywords when we fail to parse script.
+constexpr std::string_view DEFAULT_DEBUG_COLOR_RATE_MACRO_VALUE          = "0.0";
+constexpr std::string_view DEFAULT_DEBUG_TRIGGER_CODE_MACRO_VALUE        = "return false;";
+constexpr std::string_view DEFAULT_DEBUG_RATIO_CODE_MACRO_VALUE          = "return 0.0;";
+constexpr std::string_view DEFAULT_DEBUG_APPLY_VARYINGS_CODE_MACRO_VALUE = "return;";
+
+constexpr std::string_view EMPTY_STRING                    = "";
+constexpr std::string_view VERTEX_SHADER_ATTRIBUTES_PREFIX = "INPUT";
+constexpr std::string_view VERTEX_SHADER_VARYINGS_PREFIX   = "OUTPUT";
+constexpr std::string_view FRAGMENT_SHADER_VARYINGS_PREFIX = "INPUT";
+constexpr std::string_view UNIFORMS_PREFIX                 = "uniform";
+
+bool ParseScriptInfomation(Property::Map& vertexResult, Property::Map& fragmentResult)
+{
+  std::string stringOut;
+  if(!LoadJsonScript(stringOut))
+  {
+    DALI_LOG_ERROR("Fail to load script file [%s]\n", GetScriptFilename().c_str());
+    return false;
+  }
+
+  Toolkit::JsonParser parser = Toolkit::JsonParser::New();
+
+  if(!parser.Parse(stringOut))
+  {
+    std::ostringstream stream;
+    if(parser.ParseError())
+    {
+      stream << "position: " << parser.GetErrorPosition() << ", line: " << parser.GetErrorLineNumber() << ", column: " << parser.GetErrorColumn() << ", description: " << parser.GetErrorDescription() << ".";
+    }
+    DALI_LOG_ERROR("Fail to parse json script\nError : %s\nJson : %s\n", stream.str().c_str(), stringOut.c_str());
+    return false;
+  }
+
+  const auto* rootNode = parser.GetRoot();
+  if(!rootNode)
+  {
+    DALI_LOG_ERROR("Fail to get root node\n");
+    return false;
+  }
+
+  auto InsertScriptMap = [](Property::Map& result, const TreeNode* node, const std::string_view& jsonKey, const std::string_view& macroKey, const std::string_view& defaultValue, const std::string_view& prefixString) {
+    std::ostringstream oss;
+    oss.clear();
+
+    if(node)
+    {
+      const auto* childNode = node->GetChild(jsonKey);
+
+      if(childNode)
+      {
+        if(childNode->GetType() == TreeNode::FLOAT)
+        {
+          oss << childNode->GetFloat();
+        }
+        else if(childNode->GetType() == TreeNode::STRING)
+        {
+          if(!prefixString.empty())
+          {
+            oss << prefixString << " ";
+          }
+          oss << childNode->GetString();
+        }
+        else if(childNode->GetType() == TreeNode::ARRAY)
+        {
+          // Concat strings with line feed
+          bool isFirst = true;
+          for(auto iter = childNode->CBegin(), endIter = childNode->CEnd(); iter != endIter; ++iter)
+          {
+            if((*iter).second.GetType() == TreeNode::STRING)
+            {
+              if(isFirst)
+              {
+                isFirst = false;
+              }
+              else
+              {
+                oss << "\n";
+              }
+              if(!prefixString.empty())
+              {
+                oss << prefixString << " ";
+              }
+              oss << (*iter).second.GetString();
+            }
+          }
+        }
+      }
+    }
+
+    if(oss.str().empty() && !defaultValue.empty())
+    {
+      oss << defaultValue;
+    }
+
+    if(!oss.str().empty())
+    {
+      result.Insert(std::string(macroKey), oss.str());
+    }
+  };
+
+  auto InsertChannelScriptMap = [&InsertScriptMap](Property::Map& result, const TreeNode* node, const std::string_view& channelJsonKey, const std::string_view& triggerMacroKey, const std::string_view& ratioMacroKey) {
+    const auto* channelNode = node->GetChild(channelJsonKey);
+    InsertScriptMap(result, channelNode, DEBUG_TRIGGER_CODE_JSON_KEY, triggerMacroKey, DEFAULT_DEBUG_TRIGGER_CODE_MACRO_VALUE, EMPTY_STRING);
+    InsertScriptMap(result, channelNode, DEBUG_RATIO_CODE_JSON_KEY, ratioMacroKey, DEFAULT_DEBUG_RATIO_CODE_MACRO_VALUE, EMPTY_STRING);
+  };
+
+  // Get attribute value code
+  InsertScriptMap(vertexResult, rootNode, DEBUG_EXTRA_ATTRIBUTES_JSON_KEY, DEBUG_EXTRA_ATTRIBUTES_MACRO_KEY, EMPTY_STRING, VERTEX_SHADER_ATTRIBUTES_PREFIX);
+
+  // Get varying value code
+  InsertScriptMap(vertexResult, rootNode, DEBUG_EXTRA_VARYINGS_JSON_KEY, DEBUG_EXTRA_VARYINGS_MACRO_KEY, EMPTY_STRING, VERTEX_SHADER_VARYINGS_PREFIX);
+  InsertScriptMap(fragmentResult, rootNode, DEBUG_EXTRA_VARYINGS_JSON_KEY, DEBUG_EXTRA_VARYINGS_MACRO_KEY, EMPTY_STRING, FRAGMENT_SHADER_VARYINGS_PREFIX);
+
+  // Get uniform value code
+  InsertScriptMap(vertexResult, rootNode, DEBUG_EXTRA_UNIFORMS_JSON_KEY, DEBUG_EXTRA_UNIFORMS_MACRO_KEY, EMPTY_STRING, UNIFORMS_PREFIX);
+  InsertScriptMap(fragmentResult, rootNode, DEBUG_EXTRA_UNIFORMS_JSON_KEY, DEBUG_EXTRA_UNIFORMS_MACRO_KEY, EMPTY_STRING, UNIFORMS_PREFIX);
+
+  // Get apply varying code
+  InsertScriptMap(vertexResult, rootNode, DEBUG_APPLY_VARYINGS_CODE_JSON_KEY, DEBUG_APPLY_VARYINGS_CODE_MACRO_KEY, DEFAULT_DEBUG_APPLY_VARYINGS_CODE_MACRO_VALUE, EMPTY_STRING);
+
+  // Get color rate
+  InsertScriptMap(fragmentResult, rootNode, MINIMUM_DEBUG_COLOR_RATE_JSON_KEY, MINIMUM_DEBUG_COLOR_RATE_MACRO_KEY, DEFAULT_DEBUG_COLOR_RATE_MACRO_VALUE, EMPTY_STRING);
+  InsertScriptMap(fragmentResult, rootNode, MAXIMUM_DEBUG_COLOR_RATE_JSON_KEY, MAXIMUM_DEBUG_COLOR_RATE_MACRO_KEY, DEFAULT_DEBUG_COLOR_RATE_MACRO_VALUE, EMPTY_STRING);
+
+  // Get each color ChannelCodes
+  InsertChannelScriptMap(fragmentResult, rootNode, DEBUG_RED_CHANNEL_CODE_JSON_KEY, DEBUG_TRIGGER_RED_CODE_MACRO_KEY, DEBUG_RATIO_RED_CODE_MACRO_KEY);
+  InsertChannelScriptMap(fragmentResult, rootNode, DEBUG_GREEN_CHANNEL_CODE_JSON_KEY, DEBUG_TRIGGER_GREEN_CODE_MACRO_KEY, DEBUG_RATIO_GREEN_CODE_MACRO_KEY);
+  InsertChannelScriptMap(fragmentResult, rootNode, DEBUG_BLUE_CHANNEL_CODE_JSON_KEY, DEBUG_TRIGGER_BLUE_CODE_MACRO_KEY, DEBUG_RATIO_BLUE_CODE_MACRO_KEY);
+
+  return true;
+}
+
+const std::vector<Property::Map>& GetScriptInfomation()
+{
+  static std::vector<Property::Map> results;
+
+  if(DALI_UNLIKELY(results.empty()))
+  {
+    results.resize(2);
+
+    auto& vertexShaderResult   = results[0];
+    auto& fragmentShaderResult = results[1];
+
+    if(!ParseScriptInfomation(vertexShaderResult, fragmentShaderResult))
+    {
+      // Use default script information if parse failed.
+      vertexShaderResult.Clear();
+      fragmentShaderResult.Clear();
+
+      vertexShaderResult.Insert(std::string(DEBUG_APPLY_VARYINGS_CODE_MACRO_KEY), std::string(DEFAULT_DEBUG_APPLY_VARYINGS_CODE_MACRO_VALUE));
+
+      fragmentShaderResult.Insert(std::string(MINIMUM_DEBUG_COLOR_RATE_MACRO_KEY), std::string(DEFAULT_DEBUG_COLOR_RATE_MACRO_VALUE));
+      fragmentShaderResult.Insert(std::string(MAXIMUM_DEBUG_COLOR_RATE_MACRO_KEY), std::string(DEFAULT_DEBUG_COLOR_RATE_MACRO_VALUE));
+      fragmentShaderResult.Insert(std::string(DEBUG_TRIGGER_RED_CODE_MACRO_KEY), std::string(DEFAULT_DEBUG_TRIGGER_CODE_MACRO_VALUE));
+      fragmentShaderResult.Insert(std::string(DEBUG_TRIGGER_GREEN_CODE_MACRO_KEY), std::string(DEFAULT_DEBUG_TRIGGER_CODE_MACRO_VALUE));
+      fragmentShaderResult.Insert(std::string(DEBUG_TRIGGER_BLUE_CODE_MACRO_KEY), std::string(DEFAULT_DEBUG_TRIGGER_CODE_MACRO_VALUE));
+      fragmentShaderResult.Insert(std::string(DEBUG_RATIO_RED_CODE_MACRO_KEY), std::string(DEFAULT_DEBUG_RATIO_CODE_MACRO_VALUE));
+      fragmentShaderResult.Insert(std::string(DEBUG_RATIO_GREEN_CODE_MACRO_KEY), std::string(DEFAULT_DEBUG_RATIO_CODE_MACRO_VALUE));
+      fragmentShaderResult.Insert(std::string(DEBUG_RATIO_BLUE_CODE_MACRO_KEY), std::string(DEFAULT_DEBUG_RATIO_CODE_MACRO_VALUE));
+    }
+  }
+
+  return results;
+}
+
+void RedefineMacro(std::string& shaderCode, std::string macro, std::string value)
+{
+  std::string definition = "#define " + macro;
+  std::size_t found      = shaderCode.find(definition);
+  DALI_ASSERT_ALWAYS(found != std::string::npos && "Macro keyword was not exist in shader code!");
+
+  std::size_t insertionPoint = found + definition.length();
+
+  // Automatically insert line-continuation character into value
+  std::regex                 re("\n");
+  std::sregex_token_iterator first{value.begin(), value.end(), re, -1}, last;
+  for(auto i = first; i != last; ++i)
+  {
+    std::string line = std::string(" \\\n") + (*i).str();
+    shaderCode.insert(insertionPoint, line);
+    insertionPoint += line.length();
+  }
+}
+
+} // namespace
+
+namespace ImageVisualShaderDebug
+{
+bool DebugImageVisualShaderEnabled()
+{
+  return DebugImageVisualShaderEnvironmentEnabled();
+}
+
+void ApplyImageVisualShaderDebugScriptCode(std::string& vertexShader, std::string& fragmentShader)
+{
+  const auto& resultMaps = GetScriptInfomation();
+
+  for(std::size_t i = 0u; i < resultMaps[0].Count(); ++i)
+  {
+    auto        key   = resultMaps[0].GetKeyAt(i);
+    const auto& value = resultMaps[0].GetValue(i);
+
+    RedefineMacro(vertexShader, std::move(key.stringKey), value.Get<std::string>());
+  }
+
+  for(std::size_t i = 0u; i < resultMaps[1].Count(); ++i)
+  {
+    auto        key   = resultMaps[1].GetKeyAt(i);
+    const auto& value = resultMaps[1].GetValue(i);
+
+    RedefineMacro(fragmentShader, std::move(key.stringKey), value.Get<std::string>());
+  }
+}
+} // namespace ImageVisualShaderDebug
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/image-visual-shader-debug.h b/dali-toolkit/internal/visuals/image-visual-shader-debug.h
new file mode 100644
index 0000000..aff6130
--- /dev/null
+++ b/dali-toolkit/internal/visuals/image-visual-shader-debug.h
@@ -0,0 +1,54 @@
+#ifndef DALI_TOOLKIT_IMAGE_VISUAL_SHADER_DEBUG_H
+#define DALI_TOOLKIT_IMAGE_VISUAL_SHADER_DEBUG_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <string>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace ImageVisualShaderDebug
+{
+/**
+ * @brief Check whether we need to use debug option for image visual.
+ *
+ * @return True if ImageVisualShader relative environment on. False otherwise.
+ */
+bool DebugImageVisualShaderEnabled();
+
+/**
+ * @brief Apply vertex / fragment shader use debug script.
+ *
+ * @param[in, out] vertexShader Vertex shader code to apply debug script.
+ * @param[in, out] fragmentShader Fragment shader code to apply debug script.
+ */
+void ApplyImageVisualShaderDebugScriptCode(std::string& vertexShader, std::string& fragmentShader);
+
+} // namespace ImageVisualShaderDebug
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_IMAGE_VISUAL_SHADER_DEBUG_H
diff --git a/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp b/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp
index 7f2cac7..f0e413c 100644
--- a/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp
+++ b/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@
 #include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/rendering/texture-devel.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-debug.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
 #include <dali/integration-api/debug.h>
 
@@ -34,15 +36,40 @@ namespace
 {
 const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
-// global string variable to caching complate vertex shader
-static std::string gVertexShader;
-
-// global string variable to caching complate fragment shader (no atlas)
-static std::string gFragmentShaderNoAtlas;
-
+constexpr int              NATIVE_SHADER_TYPE_OFFSET = VisualFactoryCache::ShaderType::NATIVE_IMAGE_SHADER - VisualFactoryCache::ShaderType::IMAGE_SHADER;
+constexpr std::string_view Y_FLIP_MASK_TEXTURE       = "uYFlipMaskTexture";
+constexpr float            NOT_FLIP_MASK_TEXTURE     = 0.0f;
+
+constexpr auto SHADER_TYPE_COUNT = 6u;
+
+constexpr std::string_view VertexPredefines[SHADER_TYPE_COUNT]{
+  "",                                     // VisualFactoryCache::IMAGE_SHADER,
+  "#define IS_REQUIRED_ROUNDED_CORNER\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER,
+  "",                                     // VisualFactoryCache::IMAGE_SHADER_YUV_TO_RGB,
+  "#define IS_REQUIRED_ROUNDED_CORNER\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB,
+  "",                                     // VisualFactoryCache::IMAGE_SHADER_YUV_AND_RGB,
+  "#define IS_REQUIRED_ROUNDED_CORNER\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB,
+};
+constexpr std::string_view FragmentPredefines[SHADER_TYPE_COUNT]{
+  "",                                                                              // VisualFactoryCache::IMAGE_SHADER,
+  "#define IS_REQUIRED_ROUNDED_CORNER\n",                                          // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER,
+  "#define IS_REQUIRED_YUV_TO_RGB\n",                                              // VisualFactoryCache::IMAGE_SHADER_YUV_TO_RGB,
+  "#define IS_REQUIRED_ROUNDED_CORNER\n#define IS_REQUIRED_YUV_TO_RGB\n",          // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB,
+  "#define IS_REQUIRED_UNIFIED_YUV_AND_RGB\n",                                     // VisualFactoryCache::IMAGE_SHADER_YUV_AND_RGB,
+  "#define IS_REQUIRED_ROUNDED_CORNER\n#define IS_REQUIRED_UNIFIED_YUV_AND_RGB\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB,
+};
+constexpr VisualFactoryCache::ShaderType ShaderTypePredefines[SHADER_TYPE_COUNT]{
+  VisualFactoryCache::ShaderType::IMAGE_SHADER,
+  VisualFactoryCache::ShaderType::IMAGE_SHADER_ROUNDED_CORNER,
+  VisualFactoryCache::ShaderType::IMAGE_SHADER_YUV_TO_RGB,
+  VisualFactoryCache::ShaderType::IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB,
+  VisualFactoryCache::ShaderType::IMAGE_SHADER_YUV_AND_RGB,
+  VisualFactoryCache::ShaderType::IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB,
+};
 } // unnamed namespace
 
 ImageVisualShaderFactory::ImageVisualShaderFactory()
+: mFragmentShaderNeedChange(ImageVisualShaderFeature::ChangeFragmentShader::UNDECIDED)
 {
 }
 
@@ -50,77 +77,75 @@ ImageVisualShaderFactory::~ImageVisualShaderFactory()
 {
 }
 
-Shader ImageVisualShaderFactory::GetShader(VisualFactoryCache& factoryCache, TextureAtlas atlasing, DefaultTextureWrapMode defaultTextureWrapping, RoundedCorner roundedCorner, Borderline borderline)
+Shader ImageVisualShaderFactory::GetShader(VisualFactoryCache& factoryCache, ImageVisualShaderFeatureBuilder& featureBuilder)
 {
-  Shader shader;
-  VisualFactoryCache::ShaderType shaderType = VisualFactoryCache::IMAGE_SHADER;
-  if(atlasing == TextureAtlas::ENABLED)
+  Shader                         shader;
+  VisualFactoryCache::ShaderType shaderType = featureBuilder.GetShaderType();
+
+  if(featureBuilder.NeedToChangeFragmentShader() == ImageVisualShaderFeature::ChangeFragmentShader::NEED_CHANGE &&
+     (mFragmentShaderNeedChange == ImageVisualShaderFeature::ChangeFragmentShader::UNDECIDED ||
+      mFragmentShaderNeedChange == ImageVisualShaderFeature::ChangeFragmentShader::NEED_CHANGE))
   {
-    if(defaultTextureWrapping == DefaultTextureWrapMode::APPLY)
-    {
-      shaderType = VisualFactoryCache::IMAGE_SHADER_ATLAS_DEFAULT_WRAP;
-    }
-    else
-    {
-      shaderType = VisualFactoryCache::IMAGE_SHADER_ATLAS_CUSTOM_WRAP;
-    }
+    DALI_ASSERT_DEBUG((static_cast<int>(shaderType) >= static_cast<int>(VisualFactoryCache::IMAGE_SHADER)) &&
+                      (static_cast<int>(shaderType) <= static_cast<int>(VisualFactoryCache::IMAGE_SHADER_ATLAS_CUSTOM_WRAP)) &&
+                      "Do not support native image shader for given feature!!");
+    shaderType = static_cast<VisualFactoryCache::ShaderType>(static_cast<int>(shaderType) + NATIVE_SHADER_TYPE_OFFSET);
   }
-  else
+
+  shader = factoryCache.GetShader(shaderType);
+  if(shader)
   {
-    if(roundedCorner == RoundedCorner::ENABLED)
-    {
-      if(borderline == Borderline::ENABLED)
-      {
-        shaderType = VisualFactoryCache::IMAGE_SHADER_ROUNDED_BORDERLINE;
-      }
-      else
-      {
-        shaderType = VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER;
-      }
-    }
-    else
-    {
-      if(borderline == Borderline::ENABLED)
-      {
-        shaderType = VisualFactoryCache::IMAGE_SHADER_BORDERLINE;
-      }
-    }
+    return shader;
   }
 
-  shader = factoryCache.GetShader(shaderType);
-  if(!shader)
+  std::string vertexShaderPrefixList;
+  std::string fragmentShaderPrefixList;
+  featureBuilder.GetVertexShaderPrefixList(vertexShaderPrefixList);
+  featureBuilder.GetFragmentShaderPrefixList(fragmentShaderPrefixList);
+
+  if(Dali::Toolkit::Internal::ImageVisualShaderDebug::DebugImageVisualShaderEnabled())
+  {
+    vertexShaderPrefixList += "#define IS_REQUIRED_DEBUG_VISUAL_SHADER\n";
+    fragmentShaderPrefixList += "#define IS_REQUIRED_DEBUG_VISUAL_SHADER\n";
+  }
+
+  std::string vertexShader   = std::string(Dali::Shader::GetVertexShaderPrefix() + vertexShaderPrefixList + SHADER_IMAGE_VISUAL_SHADER_VERT.data());
+  std::string fragmentShader = std::string(Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderPrefixList + SHADER_IMAGE_VISUAL_SHADER_FRAG.data());
+
+  if(Dali::Toolkit::Internal::ImageVisualShaderDebug::DebugImageVisualShaderEnabled())
+  {
+    Dali::Toolkit::Internal::ImageVisualShaderDebug::ApplyImageVisualShaderDebugScriptCode(vertexShader, fragmentShader);
+  }
+
+  if(featureBuilder.NeedToChangeFragmentShader() == ImageVisualShaderFeature::ChangeFragmentShader::NEED_CHANGE)
   {
-    std::string vertexShaderPrefixList;
-    std::string fragmentShaderPrefixList;
-    if(atlasing == TextureAtlas::ENABLED)
+    bool modified = DevelTexture::ApplyNativeFragmentShader(featureBuilder.GetTexture(), fragmentShader);
+    if(mFragmentShaderNeedChange == ImageVisualShaderFeature::ChangeFragmentShader::NEED_CHANGE)
     {
-      if(defaultTextureWrapping == DefaultTextureWrapMode::APPLY)
-      {
-        fragmentShaderPrefixList += "#define ATLAS_DEFAULT_WARP 1\n";
-      }
-      else
-      {
-        fragmentShaderPrefixList += "#define ATLAS_CUSTOM_WARP 1\n";
-      }
+      DALI_ASSERT_ALWAYS(modified && "NativeImageTexture need to change fragment shader. But DALI default image shader doesn't changed!");
     }
-    else
+    else if(DALI_UNLIKELY(mFragmentShaderNeedChange == ImageVisualShaderFeature::ChangeFragmentShader::UNDECIDED))
     {
-      if(roundedCorner == RoundedCorner::ENABLED)
-      {
-        vertexShaderPrefixList   += "#define IS_REQUIRED_ROUNDED_CORNER 1\n";
-        fragmentShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER 1\n";
-      }
-      if(borderline == Borderline::ENABLED)
+      mFragmentShaderNeedChange = (modified) ? ImageVisualShaderFeature::ChangeFragmentShader::NEED_CHANGE : ImageVisualShaderFeature::ChangeFragmentShader::DONT_CHANGE;
+
+      if(mFragmentShaderNeedChange == ImageVisualShaderFeature::ChangeFragmentShader::DONT_CHANGE)
       {
-        vertexShaderPrefixList   += "#define IS_REQUIRED_BORDERLINE 1\n";
-        fragmentShaderPrefixList += "#define IS_REQUIRED_BORDERLINE 1\n";
+        shaderType = static_cast<VisualFactoryCache::ShaderType>(static_cast<int>(shaderType) - NATIVE_SHADER_TYPE_OFFSET);
+        shader     = factoryCache.GetShader(shaderType);
       }
     }
+  }
+
+  if(shader)
+  {
+    return shader;
+  }
 
-    shader = Shader::New(Dali::Shader::GetVertexShaderPrefix()   + vertexShaderPrefixList   + SHADER_IMAGE_VISUAL_SHADER_VERT.data(),
-                         Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderPrefixList + SHADER_IMAGE_VISUAL_SHADER_FRAG.data());
-    shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
-    factoryCache.SaveShader(shaderType, shader);
+  shader = factoryCache.GenerateAndSaveShader(shaderType, vertexShader, fragmentShader);
+  shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
+  if(featureBuilder.IsEnabledAlphaMaskingOnRendering())
+  {
+    shader.RegisterProperty(Y_FLIP_MASK_TEXTURE, NOT_FLIP_MASK_TEXTURE);
   }
 
   return shader;
@@ -128,6 +153,8 @@ Shader ImageVisualShaderFactory::GetShader(VisualFactoryCache& factoryCache, Tex
 
 std::string_view ImageVisualShaderFactory::GetVertexShaderSource()
 {
+  // static string variable to cache complete vertex shader
+  static std::string gVertexShader;
   if(gVertexShader.empty())
   {
     gVertexShader = Dali::Shader::GetVertexShaderPrefix() + SHADER_IMAGE_VISUAL_SHADER_VERT.data();
@@ -138,6 +165,8 @@ std::string_view ImageVisualShaderFactory::GetVertexShaderSource()
 
 std::string_view ImageVisualShaderFactory::GetFragmentShaderSource()
 {
+  // static string variable to cache complete fragment shader (no atlas)
+  static std::string gFragmentShaderNoAtlas;
   if(gFragmentShaderNoAtlas.empty())
   {
     gFragmentShaderNoAtlas = Dali::Shader::GetFragmentShaderPrefix() + SHADER_IMAGE_VISUAL_SHADER_FRAG.data();
@@ -145,6 +174,29 @@ std::string_view ImageVisualShaderFactory::GetFragmentShaderSource()
   return gFragmentShaderNoAtlas;
 }
 
+void ImageVisualShaderFactory::GetPreCompiledShader(RawShaderData& shaders)
+{
+  std::vector<std::string_view> vertexPrefix;
+  std::vector<std::string_view> fragmentPrefix;
+  std::vector<std::string_view> shaderName;
+  shaders.shaderCount = 0;
+  int shaderCount     = 0;
+  for(uint32_t i = 0; i < SHADER_TYPE_COUNT; ++i)
+  {
+    vertexPrefix.push_back(VertexPredefines[i]);
+    fragmentPrefix.push_back(FragmentPredefines[i]);
+    shaderName.push_back(Scripting::GetLinearEnumerationName<VisualFactoryCache::ShaderType>(ShaderTypePredefines[i], VISUAL_SHADER_TYPE_TABLE, VISUAL_SHADER_TYPE_TABLE_COUNT));
+    shaderCount++;
+  }
+
+  shaders.vertexPrefix   = vertexPrefix;
+  shaders.fragmentPrefix = fragmentPrefix;
+  shaders.shaderName     = shaderName;
+  shaders.vertexShader   = SHADER_IMAGE_VISUAL_SHADER_VERT;
+  shaders.fragmentShader = SHADER_IMAGE_VISUAL_SHADER_FRAG;
+  shaders.shaderCount    = shaderCount;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/visuals/image-visual-shader-factory.h b/dali-toolkit/internal/visuals/image-visual-shader-factory.h
index 604b49b..8b50669 100644
--- a/dali-toolkit/internal/visuals/image-visual-shader-factory.h
+++ b/dali-toolkit/internal/visuals/image-visual-shader-factory.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_VISUAL_SHADER_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
 #include <string_view>
 
 namespace Dali
@@ -29,41 +30,6 @@ namespace Toolkit
 {
 namespace Internal
 {
-/**
- * @brief Whether use texture with atlas, or not
- */
-enum class TextureAtlas
-{
-  DISABLED = 0, ///< Image visual use ATLAS
-  ENABLED       ///< Image visual doesn't use ATLAS
-};
-
-/**
- * @brief Whether apply to texture wraping in default, or not
- */
-enum class DefaultTextureWrapMode
-{
-  DO_NOT_APPLY = 0, ///< Image visual doesn't apply to wraping texture in default
-  APPLY             ///< Image visual apply to wraping texture in default
-};
-
-/**
- * @brief Whether use rounded corner, or not
- */
-enum class RoundedCorner
-{
-  DISABLED = 0, ///< Image visual doesn't use rounded corner
-  ENABLED       ///< Image visual use rounded corner
-};
-
-/**
- * @brief Whether use borderline, or not
- */
-enum class Borderline
-{
-  DISABLED = 0, ///< Image visual doesn't use borderline
-  ENABLED       ///< Image visual use borderline
-};
 
 /**
  * ImageVisualShaderFactory is an object that provides and shares shaders between image visuals
@@ -71,7 +37,6 @@ enum class Borderline
 class ImageVisualShaderFactory
 {
 public:
-
   /**
    * @brief Constructor
    */
@@ -83,27 +48,31 @@ public:
   ~ImageVisualShaderFactory();
 
   /**
-   * Get the standard image rendering shader.
+   * @brief Get the standard image rendering shader.
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
-   * @param[in] atlasing Whether texture atlasing is applied.
-   * @param[in] defaultTextureWrapping Whether the default texture wrap mode is applied.
-   * @param[in] roundedCorner Whether the rounded corder is applied.
-   * @param[in] borderline Whether the borderline of visual is applied.
+   * @param[in] featureBuilder Collection of current image shader's features
+   * @return The standard image rendering shader with features.
    */
-  Shader GetShader(VisualFactoryCache& factoryCache, TextureAtlas atlasing, DefaultTextureWrapMode defaultTextureWrapping, RoundedCorner roundedCorner, Borderline borderline);
+  Shader GetShader(VisualFactoryCache& factoryCache, ImageVisualShaderFeatureBuilder& featureBuilder);
 
   /**
-   * Request the default vertex shader source.
+   * @brief Request the default vertex shader source.
    * @return The default vertex shader source.
    */
   std::string_view GetVertexShaderSource();
 
   /**
-   * Request the default fragment shader source.
+   * @brief Request the default fragment shader source.
    * @return The default fragment shader source.
    */
   std::string_view GetFragmentShaderSource();
 
+  /**
+   * @brief Get the default shader source.
+   * @param[in] shaders shaderList for precompile
+   */
+  void GetPreCompiledShader(RawShaderData& shaders);
+
 protected:
   /**
    * Undefined copy constructor.
@@ -116,6 +85,18 @@ protected:
   ImageVisualShaderFactory& operator=(const ImageVisualShaderFactory& rhs);
 
 private:
+  /**
+   * @brief Cached information whether native image should change fragment shader.
+   * Default it is ChangeFragmentShader::UNDECIDED.
+   * If we have any chance to check native image source apply fragment shader,
+   * this vaule will be changed one of these : ChangeFragmentShader::DONT_CHANGE or ChangeFragmentShader::NEED_CHANGE
+   *
+   * After result cached, this value will not be changed.
+   *
+   * If value is DONT_CHANGE, ImageVisualShaderFactory::GetShader never call ApplyNativeFragmentShader.
+   * Else, ImageVisualShaderFactory::GetShader will call ApplyNativeFragmentShader if native image source texture come.
+   */
+  ImageVisualShaderFeature::ChangeFragmentShader::Type mFragmentShaderNeedChange : 3;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/image-visual-shader-feature-builder.cpp b/dali-toolkit/internal/visuals/image-visual-shader-feature-builder.cpp
new file mode 100644
index 0000000..6939cd1
--- /dev/null
+++ b/dali-toolkit/internal/visuals/image-visual-shader-feature-builder.cpp
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+// enum of required list when we select shader
+enum class ImageVisualRequireFlag : uint32_t
+{
+  DEFAULT          = 0,
+  ROUNDED_CORNER   = 1 << 0,
+  BORDERLINE       = 1 << 1,
+  ALPHA_MASKING    = 1 << 2,
+  COLOR_CONVERSION = 1 << 3,
+
+  UNIFIED_YUV_AND_RGB = 1 << 2, // Special enum to trick unified YUV and RGB.
+};
+
+static constexpr auto          SHADER_TYPE_COUNT = 16u;
+VisualFactoryCache::ShaderType SHADER_TYPE_TABLE[SHADER_TYPE_COUNT] =
+  {
+    VisualFactoryCache::IMAGE_SHADER,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER,
+    VisualFactoryCache::IMAGE_SHADER_BORDERLINE,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_BORDERLINE,
+    VisualFactoryCache::IMAGE_SHADER_MASKING,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_MASKING,
+    VisualFactoryCache::IMAGE_SHADER_BORDERLINE_MASKING,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_BORDERLINE_MASKING,
+    VisualFactoryCache::IMAGE_SHADER_YUV_TO_RGB,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB,
+    VisualFactoryCache::IMAGE_SHADER_BORDERLINE_YUV_TO_RGB,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_BORDERLINE_YUV_TO_RGB,
+    VisualFactoryCache::IMAGE_SHADER_YUV_AND_RGB,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB,
+    VisualFactoryCache::IMAGE_SHADER_BORDERLINE_YUV_AND_RGB,
+    VisualFactoryCache::IMAGE_SHADER_ROUNDED_BORDERLINE_YUV_AND_RGB};
+} // unnamed namespace
+
+ImageVisualShaderFeatureBuilder::ImageVisualShaderFeatureBuilder()
+: mTextureAtlas(ImageVisualShaderFeature::TextureAtlas::DISABLED),
+  mDefaultTextureWrapMode(ImageVisualShaderFeature::DefaultTextureWrapMode::APPLY),
+  mRoundedCorner(ImageVisualShaderFeature::RoundedCorner::DISABLED),
+  mBorderline(ImageVisualShaderFeature::Borderline::DISABLED),
+  mAlphaMaskingOnRendering(ImageVisualShaderFeature::AlphaMaskingOnRendering::DISABLED),
+  mColorConversion(ImageVisualShaderFeature::ColorConversion::DONT_NEED),
+  mTexture()
+{
+}
+
+ImageVisualShaderFeatureBuilder& ImageVisualShaderFeatureBuilder::EnableTextureAtlas(bool enableTextureAtlas)
+{
+  mTextureAtlas = (enableTextureAtlas ? ImageVisualShaderFeature::TextureAtlas::ENABLED : ImageVisualShaderFeature::TextureAtlas::DISABLED);
+  return *this;
+}
+
+ImageVisualShaderFeatureBuilder& ImageVisualShaderFeatureBuilder::ApplyDefaultTextureWrapMode(bool applyDefaultTextureWrapMode)
+{
+  mDefaultTextureWrapMode = (applyDefaultTextureWrapMode ? ImageVisualShaderFeature::DefaultTextureWrapMode::APPLY : ImageVisualShaderFeature::DefaultTextureWrapMode::DO_NOT_APPLY);
+  return *this;
+}
+
+ImageVisualShaderFeatureBuilder& ImageVisualShaderFeatureBuilder::EnableRoundedCorner(bool enableRoundedCorner)
+{
+  mRoundedCorner = (enableRoundedCorner ? ImageVisualShaderFeature::RoundedCorner::ENABLED : ImageVisualShaderFeature::RoundedCorner::DISABLED);
+  return *this;
+}
+
+ImageVisualShaderFeatureBuilder& ImageVisualShaderFeatureBuilder::EnableBorderline(bool enableBorderline)
+{
+  mBorderline = (enableBorderline ? ImageVisualShaderFeature::Borderline::ENABLED : ImageVisualShaderFeature::Borderline::DISABLED);
+  return *this;
+}
+
+ImageVisualShaderFeatureBuilder& ImageVisualShaderFeatureBuilder::SetTextureForFragmentShaderCheck(const Dali::Texture& texture)
+{
+  mTexture = texture;
+  return *this;
+}
+
+ImageVisualShaderFeatureBuilder& ImageVisualShaderFeatureBuilder::EnableAlphaMaskingOnRendering(bool enableAlphaMaskingOnRendering)
+{
+  mAlphaMaskingOnRendering = (enableAlphaMaskingOnRendering ? ImageVisualShaderFeature::AlphaMaskingOnRendering::ENABLED : ImageVisualShaderFeature::AlphaMaskingOnRendering::DISABLED);
+  return *this;
+}
+
+ImageVisualShaderFeatureBuilder& ImageVisualShaderFeatureBuilder::EnableYuvToRgb(bool enableYuvToRgb, bool enableUnifiedYuvAndRgb)
+{
+  mColorConversion = (enableUnifiedYuvAndRgb ? ImageVisualShaderFeature::ColorConversion::UNIFIED_YUV_AND_RGB : (enableYuvToRgb ? ImageVisualShaderFeature::ColorConversion::YUV_TO_RGB : ImageVisualShaderFeature::ColorConversion::DONT_NEED));
+  return *this;
+}
+
+VisualFactoryCache::ShaderType ImageVisualShaderFeatureBuilder::GetShaderType()
+{
+  VisualFactoryCache::ShaderType shaderType = VisualFactoryCache::IMAGE_SHADER;
+  if(mTextureAtlas == ImageVisualShaderFeature::TextureAtlas::ENABLED)
+  {
+    if(mDefaultTextureWrapMode == ImageVisualShaderFeature::DefaultTextureWrapMode::APPLY)
+    {
+      shaderType = VisualFactoryCache::IMAGE_SHADER_ATLAS_DEFAULT_WRAP;
+    }
+    else
+    {
+      shaderType = VisualFactoryCache::IMAGE_SHADER_ATLAS_CUSTOM_WRAP;
+    }
+  }
+  else
+  {
+    uint32_t shaderTypeFlag = static_cast<uint32_t>(ImageVisualRequireFlag::DEFAULT);
+    if(mRoundedCorner == ImageVisualShaderFeature::RoundedCorner::ENABLED)
+    {
+      shaderTypeFlag |= static_cast<uint32_t>(ImageVisualRequireFlag::ROUNDED_CORNER);
+    }
+    if(mBorderline == ImageVisualShaderFeature::Borderline::ENABLED)
+    {
+      shaderTypeFlag |= static_cast<uint32_t>(ImageVisualRequireFlag::BORDERLINE);
+    }
+    if(mAlphaMaskingOnRendering == ImageVisualShaderFeature::AlphaMaskingOnRendering::ENABLED)
+    {
+      shaderTypeFlag |= static_cast<uint32_t>(ImageVisualRequireFlag::ALPHA_MASKING);
+    }
+    else if(mColorConversion == ImageVisualShaderFeature::ColorConversion::YUV_TO_RGB) // Not support gpu masking and color conversion at the same time now
+    {
+      shaderTypeFlag |= static_cast<uint32_t>(ImageVisualRequireFlag::COLOR_CONVERSION);
+    }
+    else if(mColorConversion == ImageVisualShaderFeature::ColorConversion::UNIFIED_YUV_AND_RGB)
+    {
+      shaderTypeFlag |= static_cast<uint32_t>(ImageVisualRequireFlag::COLOR_CONVERSION);
+      shaderTypeFlag |= static_cast<uint32_t>(ImageVisualRequireFlag::UNIFIED_YUV_AND_RGB);
+    }
+    shaderType = SHADER_TYPE_TABLE[shaderTypeFlag];
+  }
+
+  return shaderType;
+}
+
+ImageVisualShaderFeature::ChangeFragmentShader::Type ImageVisualShaderFeatureBuilder::NeedToChangeFragmentShader()
+{
+  return (mTexture && DevelTexture::IsNative(mTexture))
+           ? ImageVisualShaderFeature::ChangeFragmentShader::NEED_CHANGE
+           : ImageVisualShaderFeature::ChangeFragmentShader::DONT_CHANGE;
+}
+
+void ImageVisualShaderFeatureBuilder::GetVertexShaderPrefixList(std::string& vertexShaderPrefixList)
+{
+  if(mTextureAtlas != ImageVisualShaderFeature::TextureAtlas::ENABLED)
+  {
+    if(mRoundedCorner == ImageVisualShaderFeature::RoundedCorner::ENABLED)
+    {
+      vertexShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+    }
+    if(mBorderline == ImageVisualShaderFeature::Borderline::ENABLED)
+    {
+      vertexShaderPrefixList += "#define IS_REQUIRED_BORDERLINE\n";
+    }
+    if(mAlphaMaskingOnRendering == ImageVisualShaderFeature::AlphaMaskingOnRendering::ENABLED)
+    {
+      vertexShaderPrefixList += "#define IS_REQUIRED_ALPHA_MASKING\n";
+    }
+  }
+}
+
+void ImageVisualShaderFeatureBuilder::GetFragmentShaderPrefixList(std::string& fragmentShaderPrefixList)
+{
+  if(mTextureAtlas == ImageVisualShaderFeature::TextureAtlas::ENABLED)
+  {
+    if(mDefaultTextureWrapMode == ImageVisualShaderFeature::DefaultTextureWrapMode::APPLY)
+    {
+      fragmentShaderPrefixList += "#define ATLAS_DEFAULT_WARP\n";
+    }
+    else
+    {
+      fragmentShaderPrefixList += "#define ATLAS_CUSTOM_WARP\n";
+    }
+  }
+  else
+  {
+    if(mRoundedCorner == ImageVisualShaderFeature::RoundedCorner::ENABLED)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_ROUNDED_CORNER\n";
+    }
+    if(mBorderline == ImageVisualShaderFeature::Borderline::ENABLED)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_BORDERLINE\n";
+    }
+    if(mAlphaMaskingOnRendering == ImageVisualShaderFeature::AlphaMaskingOnRendering::ENABLED)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_ALPHA_MASKING\n";
+    }
+    else if(mColorConversion == ImageVisualShaderFeature::ColorConversion::YUV_TO_RGB)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_YUV_TO_RGB\n";
+    }
+    else if(mColorConversion == ImageVisualShaderFeature::ColorConversion::UNIFIED_YUV_AND_RGB)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_UNIFIED_YUV_AND_RGB\n";
+    }
+  }
+}
+
+Dali::Texture ImageVisualShaderFeatureBuilder::GetTexture()
+{
+  return mTexture;
+}
+
+bool ImageVisualShaderFeatureBuilder::IsEnabledAlphaMaskingOnRendering() const
+{
+  return mAlphaMaskingOnRendering == ImageVisualShaderFeature::AlphaMaskingOnRendering::ENABLED;
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h b/dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h
new file mode 100644
index 0000000..0f1eccb
--- /dev/null
+++ b/dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h
@@ -0,0 +1,175 @@
+#ifndef DALI_TOOLKIT_IMAGE_VISUAL_SHADER_FEATURE_BUILDER_H
+#define DALI_TOOLKIT_IMAGE_VISUAL_SHADER_FEATURE_BUILDER_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/texture.h>
+#include <dali/devel-api/rendering/texture-devel.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+
+// INTERNAL INCLUDES
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+/**
+ * ImageVisualShaderFeature contains feature lists what image visual shader need to know.
+ */
+namespace ImageVisualShaderFeature
+{
+namespace TextureAtlas
+{
+/**
+ * @brief Whether use texture with atlas, or not
+ */
+enum Type
+{
+  DISABLED = 0, ///< Image visual doesn't use ATLAS
+  ENABLED       ///< Image visual uses ATLAS
+};
+} // namespace TextureAtlas
+
+namespace DefaultTextureWrapMode
+{
+/**
+ * @brief Whether apply to texture wraping in default, or not
+ */
+enum Type
+{
+  APPLY = 0,   ///< Image visual applies to wraping texture in default
+  DO_NOT_APPLY ///< Image visual doesn't apply to wraping texture in default
+};
+} // namespace DefaultTextureWrapMode
+
+namespace RoundedCorner
+{
+/**
+ * @brief Whether use rounded corner, or not
+ */
+enum Type
+{
+  DISABLED = 0, ///< Image visual doesn't use rounded corner
+  ENABLED       ///< Image visual uses rounded corner
+};
+} // namespace RoundedCorner
+
+namespace Borderline
+{
+/**
+ * @brief Whether use borderline, or not
+ */
+enum Type
+{
+  DISABLED = 0, ///< Image visual doesn't use borderline
+  ENABLED       ///< Image visual uses borderline
+};
+} // namespace Borderline
+
+namespace ChangeFragmentShader
+{
+/**
+ * @brief Whether native image change the default fragment shader, or not
+ */
+enum Type
+{
+  DONT_CHANGE = 0, ///< Native image doesn't change default fragment shader.
+  NEED_CHANGE,     ///< Native image changes default fragment shader. We need another shader cache.
+  UNDECIDED,       ///< Undecided.
+};
+} // namespace ChangeFragmentShader
+
+namespace AlphaMaskingOnRendering
+{
+/**
+ * @brief Whether use runtime alpha masking in shader, or not
+ */
+enum Type
+{
+  DISABLED = 0, ///< Image visual doesn't use runtime alpha masking
+  ENABLED       ///< Image visual uses runtime alpha masking
+};
+} // namespace AlphaMaskingOnRendering
+
+namespace ColorConversion
+{
+/**
+ * @brief Whether the color format conversion is needed or not
+ */
+enum Type
+{
+  DONT_NEED = 0,      ///< Not need to convert
+  YUV_TO_RGB,         ///< Need yuv to rgb conversion
+  UNIFIED_YUV_AND_RGB ///< Need to support both yuv conversion case and normal case.
+};
+} // namespace ColorConversion
+
+} // namespace ImageVisualShaderFeature
+
+/**
+ * @brief Collection of current image visual feature. Only use for ImageVisualShaderFactory::GetShader()
+ */
+class ImageVisualShaderFeatureBuilder
+{
+public:
+  ImageVisualShaderFeatureBuilder();
+
+  ImageVisualShaderFeatureBuilder& EnableTextureAtlas(bool enableTextureAtlas);
+
+  ImageVisualShaderFeatureBuilder& ApplyDefaultTextureWrapMode(bool applyDefaultTextureWrapMode);
+
+  ImageVisualShaderFeatureBuilder& EnableRoundedCorner(bool enableRoundedCorner);
+
+  ImageVisualShaderFeatureBuilder& EnableBorderline(bool enableBorderline);
+
+  ImageVisualShaderFeatureBuilder& SetTextureForFragmentShaderCheck(const Dali::Texture& texture);
+
+  ImageVisualShaderFeatureBuilder& EnableAlphaMaskingOnRendering(bool enableAlphaMaskingOnRendering);
+
+  ImageVisualShaderFeatureBuilder& EnableYuvToRgb(bool enableYuvToRgb, bool enableUnifiedYuvAndRgb = false);
+
+  VisualFactoryCache::ShaderType GetShaderType();
+
+  ImageVisualShaderFeature::ChangeFragmentShader::Type NeedToChangeFragmentShader();
+
+  void GetVertexShaderPrefixList(std::string& vertexShaderPrefixList);
+  void GetFragmentShaderPrefixList(std::string& fragmentShaderPrefixList);
+
+  Dali::Texture GetTexture();
+
+  bool IsEnabledAlphaMaskingOnRendering() const;
+
+private:
+  ImageVisualShaderFeature::TextureAtlas::Type            mTextureAtlas : 2;            ///< Whether use texture with atlas, or not. default as TextureAtlas::DISABLED
+  ImageVisualShaderFeature::DefaultTextureWrapMode::Type  mDefaultTextureWrapMode : 2;  ///< Whether apply to texture wraping in default, or not. default as DefaultTextureWrapMode::APPLY
+  ImageVisualShaderFeature::RoundedCorner::Type           mRoundedCorner : 2;           ///< Whether use rounded corner, or not. default as RoundedCorner::DISABLED
+  ImageVisualShaderFeature::Borderline::Type              mBorderline : 2;              ///< Whether use borderline, or not. default as Borderline::DISABLED
+  ImageVisualShaderFeature::AlphaMaskingOnRendering::Type mAlphaMaskingOnRendering : 2; ///< Whether use runtime alpha masking, or not. default as AlphaMaskingOnRendering::DISABLED
+  ImageVisualShaderFeature::ColorConversion::Type         mColorConversion : 2;         ///< Whether the color format conversion is needed or not
+  Dali::Texture                                           mTexture;                     ///< Texture to check whether we need to change fragment shader or not
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_IMAGE_VISUAL_SHADER_FACTORY_H
diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp
index 0251a1d..6b30a02 100644
--- a/dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/dali-toolkit/internal/visuals/image/image-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,16 @@
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/actors/layer.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
 #include <cstring> // for strlen()
 
 // INTERNAL HEADERS
 #include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 #include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
@@ -51,6 +54,8 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(7); // ltr, wrap, pixel area, atlas, pixalign, crop to mask, mask texture ratio
+
 // fitting modes
 DALI_ENUM_TO_STRING_TABLE_BEGIN(FITTING_MODE)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Dali::FittingMode, SHRINK_TO_FIT)
@@ -94,8 +99,36 @@ DALI_ENUM_TO_STRING_TABLE_END(RELEASE_POLICY)
 
 const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
-const float PIXEL_ALIGN_ON  = 1.0f;
-const float PIXEL_ALIGN_OFF = 0.0f;
+constexpr uint32_t TEXTURE_COUNT_FOR_GPU_ALPHA_MASK = 2u;
+
+struct NameIndexMatch
+{
+  const char* const name;
+  Property::Index   index;
+};
+
+const NameIndexMatch NAME_INDEX_MATCH_TABLE[] =
+  {
+    {IMAGE_FITTING_MODE, Toolkit::ImageVisual::Property::FITTING_MODE},
+    {IMAGE_SAMPLING_MODE, Toolkit::ImageVisual::Property::SAMPLING_MODE},
+    {IMAGE_DESIRED_WIDTH, Toolkit::ImageVisual::Property::DESIRED_WIDTH},
+    {IMAGE_DESIRED_HEIGHT, Toolkit::ImageVisual::Property::DESIRED_HEIGHT},
+    {PIXEL_AREA_UNIFORM_NAME, Toolkit::ImageVisual::Property::PIXEL_AREA},
+    {IMAGE_WRAP_MODE_U, Toolkit::ImageVisual::Property::WRAP_MODE_U},
+    {IMAGE_WRAP_MODE_V, Toolkit::ImageVisual::Property::WRAP_MODE_V},
+    {SYNCHRONOUS_LOADING, Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING},
+    {IMAGE_ATLASING, Toolkit::ImageVisual::Property::ATLASING},
+    {ALPHA_MASK_URL, Toolkit::ImageVisual::Property::ALPHA_MASK_URL},
+    {MASK_CONTENT_SCALE_NAME, Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE},
+    {CROP_TO_MASK_NAME, Toolkit::ImageVisual::Property::CROP_TO_MASK},
+    {MASKING_TYPE_NAME, Toolkit::DevelImageVisual::Property::MASKING_TYPE},
+    {ENABLE_BROKEN_IMAGE, Toolkit::DevelImageVisual::Property::ENABLE_BROKEN_IMAGE},
+    {LOAD_POLICY_NAME, Toolkit::ImageVisual::Property::LOAD_POLICY},
+    {RELEASE_POLICY_NAME, Toolkit::ImageVisual::Property::RELEASE_POLICY},
+    {ORIENTATION_CORRECTION_NAME, Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION},
+    {FAST_TRACK_UPLOADING_NAME, Toolkit::DevelImageVisual::Property::FAST_TRACK_UPLOADING},
+};
+const int NAME_INDEX_MATCH_TABLE_SIZE = sizeof(NAME_INDEX_MATCH_TABLE) / sizeof(NAME_INDEX_MATCH_TABLE[0]);
 
 Geometry CreateGeometry(VisualFactoryCache& factoryCache, ImageDimensions gridSize)
 {
@@ -149,6 +182,7 @@ ImageVisual::ImageVisual(VisualFactoryCache&       factoryCache,
                          Dali::SamplingMode::Type  samplingMode)
 : Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::IMAGE),
   mPixelArea(FULL_TEXTURE_RECT),
+  mPixelAreaIndex(Property::INVALID_INDEX),
   mPlacementActor(),
   mImageUrl(imageUrl),
   mMaskingData(),
@@ -166,7 +200,8 @@ ImageVisual::ImageVisual(VisualFactoryCache&       factoryCache,
   mAtlasRectSize(0, 0),
   mLoadState(TextureManager::LoadState::NOT_STARTED),
   mAttemptAtlasing(false),
-  mOrientationCorrection(true)
+  mOrientationCorrection(true),
+  mEnableBrokenImage(true)
 {
   EnablePreMultipliedAlpha(mFactoryCache.GetPreMultiplyOnLoad());
 }
@@ -175,18 +210,6 @@ ImageVisual::~ImageVisual()
 {
   if(Stage::IsInstalled())
   {
-    if(mMaskingData)
-    {
-      // TextureManager could have been deleted before the actor that contains this
-      // ImageVisual is destroyed (e.g. due to stage shutdown). Ensure the stage
-      // is still valid before accessing texture manager.
-      if(mMaskingData->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID)
-      {
-        TextureManager& textureManager = mFactoryCache.GetTextureManager();
-        textureManager.Remove(mMaskingData->mAlphaMaskId, this);
-      }
-    }
-
     if(mImageUrl.IsValid())
     {
       // Decrease reference count of External Resources :
@@ -200,7 +223,7 @@ ImageVisual::~ImageVisual()
       else if(mImageUrl.IsBufferResource())
       {
         TextureManager& textureManager = mFactoryCache.GetTextureManager();
-        textureManager.RemoveExternalEncodedImageBuffer(mImageUrl.GetUrl());
+        textureManager.RemoveEncodedImageBuffer(mImageUrl.GetUrl());
       }
     }
 
@@ -209,6 +232,8 @@ ImageVisual::~ImageVisual()
     {
       RemoveTexture();
     }
+
+    ResetFastTrackLoadingTask();
   }
 }
 
@@ -224,65 +249,13 @@ void ImageVisual::DoSetProperties(const Property::Map& propertyMap)
     }
     else
     {
-      if(keyValue.first == IMAGE_FITTING_MODE)
+      for(int i = 0; i < NAME_INDEX_MATCH_TABLE_SIZE; ++i)
       {
-        DoSetProperty(Toolkit::ImageVisual::Property::FITTING_MODE, keyValue.second);
-      }
-      else if(keyValue.first == IMAGE_SAMPLING_MODE)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::SAMPLING_MODE, keyValue.second);
-      }
-      else if(keyValue.first == IMAGE_DESIRED_WIDTH)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_WIDTH, keyValue.second);
-      }
-      else if(keyValue.first == IMAGE_DESIRED_HEIGHT)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, keyValue.second);
-      }
-      else if(keyValue.first == PIXEL_AREA_UNIFORM_NAME)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::PIXEL_AREA, keyValue.second);
-      }
-      else if(keyValue.first == IMAGE_WRAP_MODE_U)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::WRAP_MODE_U, keyValue.second);
-      }
-      else if(keyValue.first == IMAGE_WRAP_MODE_V)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::WRAP_MODE_V, keyValue.second);
-      }
-      else if(keyValue.first == SYNCHRONOUS_LOADING)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second);
-      }
-      else if(keyValue.first == IMAGE_ATLASING)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::ATLASING, keyValue.second);
-      }
-      else if(keyValue.first == ALPHA_MASK_URL)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::ALPHA_MASK_URL, keyValue.second);
-      }
-      else if(keyValue.first == MASK_CONTENT_SCALE_NAME)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, keyValue.second);
-      }
-      else if(keyValue.first == CROP_TO_MASK_NAME)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::CROP_TO_MASK, keyValue.second);
-      }
-      else if(keyValue.first == LOAD_POLICY_NAME)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::LOAD_POLICY, keyValue.second);
-      }
-      else if(keyValue.first == RELEASE_POLICY_NAME)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::RELEASE_POLICY, keyValue.second);
-      }
-      else if(keyValue.first == ORIENTATION_CORRECTION_NAME)
-      {
-        DoSetProperty(Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION, keyValue.second);
+        if(keyValue.first == NAME_INDEX_MATCH_TABLE[i].name)
+        {
+          DoSetProperty(NAME_INDEX_MATCH_TABLE[i].index, keyValue.second);
+          break;
+        }
       }
     }
   }
@@ -305,11 +278,11 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va
       {
         if(sync)
         {
-          mImpl->mFlags |= Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+          mImpl->mFlags |= Visual::Base::Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
         }
         else
         {
-          mImpl->mFlags &= ~Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+          mImpl->mFlags &= ~Visual::Base::Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
         }
       }
       else
@@ -321,7 +294,7 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va
 
     case Toolkit::ImageVisual::Property::DESIRED_WIDTH:
     {
-      float desiredWidth = 0.0f;
+      int32_t desiredWidth = 0;
       if(value.Get(desiredWidth))
       {
         mDesiredSize.SetWidth(desiredWidth);
@@ -335,7 +308,7 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va
 
     case Toolkit::ImageVisual::Property::DESIRED_HEIGHT:
     {
-      float desiredHeight = 0.0f;
+      int32_t desiredHeight = 0;
       if(value.Get(desiredHeight))
       {
         mDesiredSize.SetHeight(desiredHeight);
@@ -366,6 +339,13 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va
     case Toolkit::ImageVisual::Property::PIXEL_AREA:
     {
       value.Get(mPixelArea);
+
+      if(DALI_UNLIKELY(mImpl->mRenderer))
+      {
+        // Unusual case. SetProperty called after OnInitialize().
+        // Assume that DoAction call UPDATE_PROPERTY.
+        mPixelAreaIndex = mImpl->mRenderer.RegisterProperty(mPixelAreaIndex, PIXEL_AREA_UNIFORM_NAME, mPixelArea);
+      }
       break;
     }
 
@@ -424,6 +404,32 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va
       break;
     }
 
+    case Toolkit::DevelImageVisual::Property::MASKING_TYPE:
+    {
+      int maskingType = 0;
+      if(value.Get(maskingType))
+      {
+        AllocateMaskData();
+        if(mImageUrl.IsValid() && mImageUrl.GetProtocolType() == VisualUrl::TEXTURE)
+        {
+          // For external textures, only gpu masking is available.
+          // Therefore, MASKING_TYPE is set to MASKING_ON_RENDERING forcelly.
+          mMaskingData->mPreappliedMasking = false;
+        }
+        else
+        {
+          mMaskingData->mPreappliedMasking = (Toolkit::DevelImageVisual::MaskingType::Type(maskingType) == Toolkit::DevelImageVisual::MaskingType::MASKING_ON_LOADING);
+        }
+      }
+      break;
+    }
+
+    case Toolkit::DevelImageVisual::Property::ENABLE_BROKEN_IMAGE:
+    {
+      value.Get(mEnableBrokenImage);
+      break;
+    }
+
     case Toolkit::ImageVisual::Property::RELEASE_POLICY:
     {
       int releasePolicy = 0;
@@ -441,11 +447,13 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va
     }
     case Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION:
     {
-      bool orientationCorrection(mOrientationCorrection);
-      if(value.Get(orientationCorrection))
-      {
-        mOrientationCorrection = orientationCorrection;
-      }
+      value.Get(mOrientationCorrection);
+      break;
+    }
+
+    case Toolkit::DevelImageVisual::Property::FAST_TRACK_UPLOADING:
+    {
+      value.Get(mUseFastTrackUploading);
       break;
     }
   }
@@ -456,6 +464,10 @@ void ImageVisual::AllocateMaskData()
   if(!mMaskingData)
   {
     mMaskingData.reset(new TextureManager::MaskingData());
+    if(mImageUrl.IsValid() && mImageUrl.GetProtocolType() == VisualUrl::TEXTURE)
+    {
+      mMaskingData->mPreappliedMasking = false;
+    }
   }
 }
 
@@ -469,7 +481,7 @@ void ImageVisual::GetNaturalSize(Vector2& naturalSize)
   }
   else if(mImpl->mRenderer) // Check if we have a loaded image
   {
-    if(mImpl->mFlags & Impl::IS_ATLASING_APPLIED)
+    if(mImpl->mFlags & Visual::Base::Impl::IS_ATLASING_APPLIED)
     {
       naturalSize.x = mAtlasRectSize.GetWidth();
       naturalSize.y = mAtlasRectSize.GetHeight();
@@ -477,13 +489,11 @@ void ImageVisual::GetNaturalSize(Vector2& naturalSize)
     }
 
     auto textureSet = mImpl->mRenderer.GetTextures();
-    if(textureSet)
+    if(textureSet && textureSet.GetTextureCount())
     {
-      auto texture = textureSet.GetTexture(0);
-      if(texture)
+      if(mTextureSize != Vector2::ZERO)
       {
-        naturalSize.x = texture.GetWidth();
-        naturalSize.y = texture.GetHeight();
+        naturalSize = mTextureSize;
         return;
       }
     }
@@ -513,10 +523,22 @@ void ImageVisual::GetNaturalSize(Vector2& naturalSize)
       }
       else
       {
-        Texture brokenImage = mFactoryCache.GetBrokenVisualImage();
+        Actor   actor     = mPlacementActor.GetHandle();
+        Vector2 imageSize = Vector2::ZERO;
+        if(actor)
+        {
+          imageSize = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+        }
+        else
+        {
+          imageSize = mPlacementActorSize;
+        }
 
-        naturalSize.x = brokenImage.GetWidth();
-        naturalSize.y = brokenImage.GetWidth();
+        mUseBrokenImageRenderer = true;
+        mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize);
+        Texture brokenImage = mImpl->mRenderer.GetTextures().GetTexture(0);
+        naturalSize.x       = brokenImage.GetWidth();
+        naturalSize.y       = brokenImage.GetWidth();
       }
       return;
     }
@@ -526,27 +548,6 @@ void ImageVisual::GetNaturalSize(Vector2& naturalSize)
 
 void ImageVisual::OnInitialize()
 {
-  Geometry geometry;
-
-  // Get the geometry
-  if(mImpl->mCustomShader)
-  {
-    geometry = CreateGeometry(mFactoryCache, mImpl->mCustomShader->mGridSize);
-  }
-  else // Get any geometry associated with the texture
-  {
-    TextureManager& textureManager = mFactoryCache.GetTextureManager();
-
-    uint32_t firstElementCount{0u};
-    uint32_t secondElementCount{0u};
-    geometry = textureManager.GetRenderGeometry(mTextureId, firstElementCount, secondElementCount);
-
-    if(!firstElementCount && !secondElementCount) // Otherwise use quad
-    {
-      geometry = CreateGeometry(mFactoryCache, ImageDimensions(1, 1));
-    }
-  }
-
   // Increase reference count of External Resources :
   // EncodedImageBuffer or ExternalTextures.
   // Reference count will be decreased at destructor of the visual.
@@ -556,15 +557,23 @@ void ImageVisual::OnInitialize()
     textureManager.UseExternalResource(mImageUrl.GetUrl());
   }
 
-  Shader shader = GenerateShader();
+  // Generate geometry and shader. Note that we should check AddOn when generate geometry, due to LoadPolicy::IMMEDIATE case
+  Geometry geometry = GenerateGeometry(mTextureId, true);
+  Shader   shader   = GenerateShader();
 
   // Create the renderer
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
   //Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 
   EnablePreMultipliedAlpha(IsPreMultipliedAlphaEnabled());
+
+  if(mMaskingData)
+  {
+    mImpl->mRenderer.RegisterProperty(CROP_TO_MASK_NAME, static_cast<float>(mMaskingData->mCropToMask));
+  }
 }
 
 void ImageVisual::LoadTexture(bool& atlasing, Vector4& atlasRect, TextureSet& textures, bool orientationCorrection, TextureManager::ReloadPolicy forceReload)
@@ -586,9 +595,92 @@ void ImageVisual::LoadTexture(bool& atlasing, Vector4& atlasRect, TextureSet& te
                              : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
 
   bool synchronousLoading = IsSynchronousLoadingRequired();
-  bool loadingStatus;
+  bool loadingStatus      = false;
 
-  textures = textureManager.LoadTexture(mImageUrl, mDesiredSize, mFittingMode, mSamplingMode, mMaskingData, synchronousLoading, mTextureId, atlasRect, mAtlasRectSize, atlasing, loadingStatus, mWrapModeU, mWrapModeV, textureObserver, atlasUploadObserver, atlasManager, mOrientationCorrection, forceReload, preMultiplyOnLoad);
+  // Remove previous loading task.
+  ResetFastTrackLoadingTask();
+
+  // Rare case. If someone call LoadTexture during fast track loading task running, (Ex : Action::RELOAD)
+  // we should remove previously added renderer now.
+  if(mRendererAdded)
+  {
+    Actor actor = mPlacementActor.GetHandle();
+    if(actor)
+    {
+      actor.RemoveRenderer(mImpl->mRenderer);
+      mRendererAdded = false;
+    }
+  }
+
+  /**
+   * @brief Check whether FastTrackUploading is avaliable or not.
+   * @return True if we can use fast track uploading feature. False otherwise.
+   */
+  auto IsFastTrackUploadingAvailable = [&]() {
+    if(mUseFastTrackUploading &&
+       mLoadPolicy == Toolkit::ImageVisual::LoadPolicy::ATTACHED &&
+       mReleasePolicy == Toolkit::ImageVisual::ReleasePolicy::DETACHED &&
+       forceReload == TextureManager::ReloadPolicy::CACHED &&
+       (mImageUrl.GetProtocolType() == VisualUrl::LOCAL || mImageUrl.GetProtocolType() == VisualUrl::REMOTE) &&
+       !synchronousLoading &&
+       !atlasing &&
+       !mImpl->mCustomShader &&
+       !(mMaskingData && mMaskingData->mAlphaMaskUrl.IsValid()))
+    {
+      return true;
+    }
+    else if(mUseFastTrackUploading)
+    {
+      DALI_LOG_DEBUG_INFO("FastTrack : Fail to load fast track. mUrl : [%s]%s%s%s%s%s%s%s%s\n",
+                          mImageUrl.GetEllipsedUrl().c_str(),
+                          (mLoadPolicy != Toolkit::ImageVisual::LoadPolicy::ATTACHED) ? "/ mLoadPolicy != ATTACHED" : "",
+                          (mReleasePolicy != Toolkit::ImageVisual::ReleasePolicy::DETACHED) ? "/ mReleasePolicy != DETACHED" : "",
+                          (forceReload != TextureManager::ReloadPolicy::CACHED) ? "/ forceReload != CACHED" : "",
+                          (!(mImageUrl.GetProtocolType() == VisualUrl::LOCAL || mImageUrl.GetProtocolType() == VisualUrl::REMOTE)) ? "/ url is not image" : "",
+                          (synchronousLoading) ? "/ synchronousLoading" : "",
+                          (atlasing) ? "/ atlasing" : "",
+                          (mImpl->mCustomShader) ? "/ use customs shader" : "",
+                          (mMaskingData && mMaskingData->mAlphaMaskUrl.IsValid()) ? "/ use masking url" : "");
+    }
+    return false;
+  };
+
+  if(IsFastTrackUploadingAvailable())
+  {
+    // Enable PremultipliedAlpha first.
+    EnablePreMultipliedAlpha(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
+
+    // Set new TextureSet with fast track loading task
+    mFastTrackLoadingTask = new FastTrackLoadingTask(mImageUrl, mDesiredSize, mFittingMode, mSamplingMode, mOrientationCorrection, preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, mFactoryCache.GetLoadYuvPlanes(), MakeCallback(this, &ImageVisual::FastLoadComplete));
+
+    TextureSet textureSet = TextureSet::New();
+    if(!mFastTrackLoadingTask->mLoadPlanesAvaliable)
+    {
+      DALI_ASSERT_ALWAYS(mFastTrackLoadingTask->mTextures.size() >= 1u);
+      textureSet.SetTexture(0u, mFastTrackLoadingTask->mTextures[0]);
+    }
+    else
+    {
+      DALI_ASSERT_ALWAYS(mFastTrackLoadingTask->mTextures.size() >= 3u);
+      textureSet.SetTexture(2u, mFastTrackLoadingTask->mTextures[2]);
+      textureSet.SetTexture(1u, mFastTrackLoadingTask->mTextures[1]);
+      textureSet.SetTexture(0u, mFastTrackLoadingTask->mTextures[0]);
+
+      // We cannot determine what kind of shader will be used.
+      // Just use unified shader, and then change shader after load completed.
+      mNeedUnifiedYuvAndRgb = true;
+      UpdateShader();
+    }
+    mImpl->mRenderer.SetTextures(textureSet);
+
+    Dali::AsyncTaskManager::Get().AddTask(mFastTrackLoadingTask);
+
+    mLoadState = TextureManager::LoadState::LOADING;
+  }
+  else
+  {
+    textures = textureManager.LoadTexture(mImageUrl, mDesiredSize, mFittingMode, mSamplingMode, mMaskingData, synchronousLoading, mTextureId, atlasRect, mAtlasRectSize, atlasing, loadingStatus, textureObserver, atlasUploadObserver, atlasManager, mOrientationCorrection, forceReload, preMultiplyOnLoad);
+  }
 
   if(textures)
   {
@@ -602,6 +694,12 @@ void ImageVisual::LoadTexture(bool& atlasing, Vector4& atlasRect, TextureSet& te
     }
 
     EnablePreMultipliedAlpha(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
+    if(!atlasing)
+    {
+      Sampler sampler = Sampler::New();
+      sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+      textures.SetSampler(0u, sampler);
+    }
   }
   else if(synchronousLoading)
   {
@@ -611,11 +709,11 @@ void ImageVisual::LoadTexture(bool& atlasing, Vector4& atlasRect, TextureSet& te
 
   if(atlasing) // Flag needs to be set before creating renderer
   {
-    mImpl->mFlags |= Impl::IS_ATLASING_APPLIED;
+    mImpl->mFlags |= Visual::Base::Impl::IS_ATLASING_APPLIED;
   }
   else
   {
-    mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
+    mImpl->mFlags &= ~Visual::Base::Impl::IS_ATLASING_APPLIED;
   }
 }
 
@@ -646,17 +744,52 @@ void ImageVisual::InitializeRenderer()
     else
     {
       mTextures = mFactoryCache.GetTextureManager().GetTextureSet(mTextureId);
+      if(!(mImpl->mFlags & Visual::Base::Impl::IS_ATLASING_APPLIED) && mTextures)
+      {
+        Sampler sampler = Sampler::New();
+        sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+        mTextures.SetSampler(0u, sampler);
+      }
     }
   }
 
   if(mTextures)
   {
     mImpl->mRenderer.SetTextures(mTextures);
-    if(DevelTexture::IsNative(mTextures.GetTexture(0)))
+    ComputeTextureSize();
+    CheckMaskTexture();
+
+    bool needToUpdateShader = DevelTexture::IsNative(mTextures.GetTexture(0)) || mUseBrokenImageRenderer;
+
+    if(mTextures.GetTextureCount() == 3)
+    {
+      if(mTextures.GetTexture(0).GetPixelFormat() == Pixel::L8 && mTextures.GetTexture(1).GetPixelFormat() == Pixel::CHROMINANCE_U && mTextures.GetTexture(2).GetPixelFormat() == Pixel::CHROMINANCE_V)
+      {
+        mNeedYuvToRgb      = true;
+        needToUpdateShader = true;
+      }
+    }
+
+    if(needToUpdateShader)
     {
       UpdateShader();
     }
     mTextures.Reset(); // Visual should not keep a handle to the texture after this point.
+
+    if(DALI_UNLIKELY(mUseBrokenImageRenderer))
+    {
+      // We need to re-generate geometry only if it was broken image before, and result changed after Reload.
+      auto geometry = GenerateGeometry(mTextureId, true);
+
+      // Update geometry only if we need.
+      if(geometry)
+      {
+        mImpl->mRenderer.SetGeometry(geometry);
+      }
+    }
+
+    // We don't use broken image anymore.
+    mUseBrokenImageRenderer = false;
   }
 
   if(attemptAtlasing) // the texture is packed inside atlas
@@ -687,22 +820,16 @@ void ImageVisual::DoSetOnScene(Actor& actor)
   }
 
   mPlacementActor = actor;
-  // Search the Actor tree to find if Layer UI behaviour set.
-  Layer layer = actor.GetLayer();
-  if(layer && layer.GetProperty<Layer::Behavior>(Layer::Property::BEHAVIOR) == Layer::LAYER_3D)
-  {
-    // Layer 3D set, do not align pixels
-    mImpl->mRenderer.RegisterProperty(PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_OFF);
-  }
 
   if(mPixelArea != FULL_TEXTURE_RECT)
   {
-    mImpl->mRenderer.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, mPixelArea);
+    mPixelAreaIndex = mImpl->mRenderer.RegisterProperty(mPixelAreaIndex, PIXEL_AREA_UNIFORM_NAME, mPixelArea);
   }
 
   if(mLoadState == TextureManager::LoadState::LOAD_FINISHED)
   {
     actor.AddRenderer(mImpl->mRenderer);
+    mRendererAdded = true;
     mPlacementActor.Reset();
 
     // Image loaded and ready to display
@@ -710,17 +837,17 @@ void ImageVisual::DoSetOnScene(Actor& actor)
   }
   else if(mLoadState == TextureManager::LoadState::LOAD_FAILED)
   {
-    Texture brokenImage = mFactoryCache.GetBrokenVisualImage();
-
-    mTextures = TextureSet::New();
-    mTextures.SetTexture(0u, brokenImage);
-    mImpl->mRenderer.SetTextures(mTextures);
-
-    actor.AddRenderer(mImpl->mRenderer);
-    mPlacementActor.Reset();
-
+    ShowBrokenImage();
     ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
   }
+  else
+  {
+    if(mFastTrackLoadingTask)
+    {
+      actor.AddRenderer(mImpl->mRenderer);
+      mRendererAdded = true;
+    }
+  }
 }
 
 void ImageVisual::DoSetOffScene(Actor& actor)
@@ -729,15 +856,11 @@ void ImageVisual::DoSetOffScene(Actor& actor)
 
   // Image release is dependent on the ReleasePolicy, renderer is removed.
   actor.RemoveRenderer(mImpl->mRenderer);
+  mRendererAdded = false;
+
   if(mReleasePolicy == Toolkit::ImageVisual::ReleasePolicy::DETACHED)
   {
-    RemoveTexture(); // If INVALID_TEXTURE_ID then removal will be attempted on atlas
-    mImpl->mResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING;
-
-    TextureSet textureSet = TextureSet::New();
-    mImpl->mRenderer.SetTextures(textureSet);
-
-    mLoadState = TextureManager::LoadState::NOT_STARTED;
+    ResetRenderer();
   }
 
   mPlacementActor.Reset();
@@ -749,7 +872,7 @@ void ImageVisual::DoCreatePropertyMap(Property::Map& map) const
   map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
 
   bool sync = IsSynchronousLoadingRequired();
-  map.Insert(SYNCHRONOUS_LOADING, sync);
+  map.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, sync);
   if(mImageUrl.IsValid())
   {
     map.Insert(Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl());
@@ -760,7 +883,17 @@ void ImageVisual::DoCreatePropertyMap(Property::Map& map) const
   map.Insert(Toolkit::ImageVisual::Property::FITTING_MODE, mFittingMode);
   map.Insert(Toolkit::ImageVisual::Property::SAMPLING_MODE, mSamplingMode);
 
-  map.Insert(Toolkit::ImageVisual::Property::PIXEL_AREA, mPixelArea);
+  if(mImpl->mRenderer && mPixelAreaIndex != Property::INVALID_INDEX)
+  {
+    // Update values from Renderer
+    Vector4 pixelArea = mImpl->mRenderer.GetProperty<Vector4>(mPixelAreaIndex);
+    map.Insert(Toolkit::ImageVisual::Property::PIXEL_AREA, pixelArea);
+  }
+  else
+  {
+    map.Insert(Toolkit::ImageVisual::Property::PIXEL_AREA, mPixelArea);
+  }
+
   map.Insert(Toolkit::ImageVisual::Property::WRAP_MODE_U, mWrapModeU);
   map.Insert(Toolkit::ImageVisual::Property::WRAP_MODE_V, mWrapModeV);
 
@@ -771,11 +904,14 @@ void ImageVisual::DoCreatePropertyMap(Property::Map& map) const
     map.Insert(Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mMaskingData->mAlphaMaskUrl.GetUrl());
     map.Insert(Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, mMaskingData->mContentScaleFactor);
     map.Insert(Toolkit::ImageVisual::Property::CROP_TO_MASK, mMaskingData->mCropToMask);
+    map.Insert(Toolkit::DevelImageVisual::Property::MASKING_TYPE, mMaskingData->mPreappliedMasking ? DevelImageVisual::MaskingType::MASKING_ON_LOADING : DevelImageVisual::MaskingType::MASKING_ON_RENDERING);
   }
 
   map.Insert(Toolkit::ImageVisual::Property::LOAD_POLICY, mLoadPolicy);
   map.Insert(Toolkit::ImageVisual::Property::RELEASE_POLICY, mReleasePolicy);
   map.Insert(Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION, mOrientationCorrection);
+
+  map.Insert(Toolkit::DevelImageVisual::Property::FAST_TRACK_UPLOADING, mUseFastTrackUploading);
 }
 
 void ImageVisual::DoCreateInstancePropertyMap(Property::Map& map) const
@@ -789,15 +925,20 @@ void ImageVisual::DoCreateInstancePropertyMap(Property::Map& map) const
   }
 }
 
-void ImageVisual::OnDoAction(const Dali::Property::Index actionName, const Dali::Property::Value& attributes)
+void ImageVisual::OnDoAction(const Dali::Property::Index actionId, const Dali::Property::Value& attributes)
 {
   // Check if action is valid for this visual type and perform action if possible
 
-  switch(actionName)
+  switch(actionId)
   {
     case DevelImageVisual::Action::RELOAD:
     {
       auto attemptAtlasing = AttemptAtlasing();
+
+      // Reset resource ready status when we call reload.
+      ResourceReady(Toolkit::Visual::ResourceStatus::PREPARING);
+      mLoadState = TextureManager::LoadState::NOT_STARTED;
+
       LoadTexture(attemptAtlasing, mAtlasRect, mTextures, mOrientationCorrection, TextureManager::ReloadPolicy::FORCED);
       break;
     }
@@ -808,16 +949,10 @@ void ImageVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
-bool ImageVisual::IsResourceReady() const
-{
-  return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ||
-          mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED);
-}
-
 void ImageVisual::UpdateShader()
 {
   if(mImpl->mRenderer)
@@ -837,6 +972,7 @@ void ImageVisual::UploadCompleted()
   {
     mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, mAtlasRect);
     actor.AddRenderer(mImpl->mRenderer);
+    mRendererAdded = true;
     // reset the weak handle so that the renderer only get added to actor once
     mPlacementActor.Reset();
   }
@@ -846,46 +982,132 @@ void ImageVisual::UploadCompleted()
   mLoadState = TextureManager::LoadState::LOAD_FINISHED;
 }
 
-// From Texture Manager
-void ImageVisual::UploadComplete(bool loadingSuccess, int32_t textureId, TextureSet textureSet, bool usingAtlas, const Vector4& atlasRectangle, bool preMultiplied)
+// From FastTrackLoadingTask
+void ImageVisual::FastLoadComplete(FastTrackLoadingTaskPtr task)
 {
   Toolkit::Visual::ResourceStatus resourceStatus;
-  if(mImpl->mRenderer)
+
+  DALI_ASSERT_ALWAYS(mFastTrackLoadingTask == task && "Task was not canceled successfully!");
+  DALI_ASSERT_ALWAYS(mRendererAdded && "Some FastTrack logic missed!");
+
+  Actor actor = mPlacementActor.GetHandle();
+
+  if(mFastTrackLoadingTask && mFastTrackLoadingTask->mLoadSuccess)
   {
-    if(usingAtlas)
+    resourceStatus = Toolkit::Visual::ResourceStatus::READY;
+    mLoadState     = TextureManager::LoadState::LOAD_FINISHED;
+
+    // Change premultiplied alpha flag after change renderer.
+    EnablePreMultipliedAlpha(mFastTrackLoadingTask->mPremultiplied);
+
+    if(mFastTrackLoadingTask->mLoadPlanesAvaliable)
     {
-      mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, mAtlasRect);
+      if(mFastTrackLoadingTask->mPlanesLoaded)
+      {
+        // Let we use regular yuv cases.
+        mNeedYuvToRgb = true;
+      }
+      else
+      {
+        // Let we use regular image cases.
+        mNeedYuvToRgb = false;
+
+        auto textureSet = mImpl->mRenderer.GetTextures();
+        DALI_ASSERT_ALWAYS(textureSet && textureSet.GetTextureCount() > 0u && "Previous texture set must exist!");
+
+        Dali::TextureSet newTextureSet = TextureSet::New();
+        newTextureSet.SetTexture(0u, textureSet.GetTexture(0u));
+        mImpl->mRenderer.SetTextures(newTextureSet);
+      }
+
+      // We can specify what kind of shader we need to use now. Update shader.
+      mNeedUnifiedYuvAndRgb = false;
+      UpdateShader();
     }
+  }
+  else
+  {
+    resourceStatus = Toolkit::Visual::ResourceStatus::FAILED;
+    mLoadState     = TextureManager::LoadState::LOAD_FAILED;
+
+    // Change renderer as broken.
+    ShowBrokenImage();
+  }
+
+  mFastTrackLoadingTask.Reset();
+
+  // Signal to observers ( control ) that resources are ready. Must be all resources.
+  ResourceReady(resourceStatus);
+}
+
+// From Texture Manager
+void ImageVisual::LoadComplete(bool loadingSuccess, TextureInformation textureInformation)
+{
+  Toolkit::Visual::ResourceStatus resourceStatus;
 
-    EnablePreMultipliedAlpha(preMultiplied);
+  if(mImpl->mRenderer)
+  {
+    EnablePreMultipliedAlpha(textureInformation.preMultiplied);
 
     Actor actor = mPlacementActor.GetHandle();
-    if(actor)
+    if(!loadingSuccess)
     {
-      actor.AddRenderer(mImpl->mRenderer);
-      // reset the weak handle so that the renderer only get added to actor once
-      mPlacementActor.Reset();
+      ShowBrokenImage();
+      textureInformation.textureSet = mImpl->mRenderer.GetTextures();
     }
-
-    if(!loadingSuccess)
+    else
     {
-      Texture brokenImage = mFactoryCache.GetBrokenVisualImage();
+      Sampler sampler = Sampler::New();
+      sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+      textureInformation.textureSet.SetSampler(0u, sampler);
 
-      textureSet = TextureSet::New();
-      textureSet.SetTexture(0u, brokenImage);
-      mImpl->mRenderer.SetTextures(textureSet);
-    }
+      mImpl->mRenderer.SetTextures(textureInformation.textureSet);
+      ComputeTextureSize();
+      CheckMaskTexture();
 
-    Sampler sampler = Sampler::New();
-    sampler.SetWrapMode(mWrapModeU, mWrapModeV);
-    textureSet.SetSampler(0u, sampler);
-    mImpl->mRenderer.SetTextures(textureSet);
+      bool needToUpdateShader = mUseBrokenImageRenderer;
+
+      if(textureInformation.textureSet.GetTextureCount() == 3)
+      {
+        if(textureInformation.textureSet.GetTexture(0).GetPixelFormat() == Pixel::L8 && textureInformation.textureSet.GetTexture(1).GetPixelFormat() == Pixel::CHROMINANCE_U && textureInformation.textureSet.GetTexture(2).GetPixelFormat() == Pixel::CHROMINANCE_V)
+        {
+          mNeedYuvToRgb      = true;
+          needToUpdateShader = true;
+        }
+      }
+
+      if(needToUpdateShader)
+      {
+        UpdateShader();
+      }
+
+      if(actor)
+      {
+        actor.AddRenderer(mImpl->mRenderer);
+        mRendererAdded = true;
+        // reset the weak handle so that the renderer only get added to actor once
+        mPlacementActor.Reset();
+      }
+
+      auto geometry = GenerateGeometry(textureInformation.textureId, mUseBrokenImageRenderer);
+
+      if(DALI_UNLIKELY(geometry))
+      {
+        // Rare cases. If load successed image don't use quad geometry (i.e. Show some n-patch broken image, and call Reload(), and success)
+        // or If given texture use AddOn,
+        // then we need to make to use quad geometry and update shader agian.
+        mImpl->mRenderer.SetGeometry(geometry);
+      }
+
+      // We don't use broken image anymore.
+      mUseBrokenImageRenderer = false;
+    }
   }
 
   // Storing TextureSet needed when renderer staged.
   if(!mImpl->mRenderer)
   {
-    mTextures = textureSet;
+    mTextures = textureInformation.textureSet;
   }
 
   // Image loaded, set status regardless of staged status.
@@ -900,36 +1122,6 @@ void ImageVisual::UploadComplete(bool loadingSuccess, int32_t textureId, Texture
     mLoadState     = TextureManager::LoadState::LOAD_FAILED;
   }
 
-  // use geometry if needed
-  if(loadingSuccess)
-  {
-    uint32_t firstElementCount{0u};
-    uint32_t secondElementCount{0u};
-    auto     geometry = mFactoryCache.GetTextureManager().GetRenderGeometry(mTextureId, firstElementCount, secondElementCount);
-    if(mImpl->mRenderer && geometry)
-    {
-      mImpl->mRenderer.SetGeometry(geometry);
-      Dali::DevelRenderer::DrawCommand drawCommand{};
-      drawCommand.drawType = DevelRenderer::DrawType::INDEXED;
-
-      if(firstElementCount)
-      {
-        drawCommand.firstIndex   = 0;
-        drawCommand.elementCount = firstElementCount;
-        drawCommand.queue        = DevelRenderer::RENDER_QUEUE_OPAQUE;
-        DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand);
-      }
-
-      if(secondElementCount)
-      {
-        drawCommand.firstIndex   = firstElementCount;
-        drawCommand.elementCount = secondElementCount;
-        drawCommand.queue        = DevelRenderer::RENDER_QUEUE_TRANSPARENT;
-        DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand);
-      }
-    }
-  }
-
   // Signal to observers ( control ) that resources are ready. Must be all resources.
   ResourceReady(resourceStatus);
 }
@@ -938,11 +1130,13 @@ void ImageVisual::RemoveTexture()
 {
   if(mTextureId != TextureManager::INVALID_TEXTURE_ID)
   {
-    mFactoryCache.GetTextureManager().Remove(mTextureId, this);
+    mFactoryCache.GetTextureManager().RequestRemove(mTextureId, this);
     mTextureId = TextureManager::INVALID_TEXTURE_ID;
   }
   else
   {
+    ResetFastTrackLoadingTask();
+
     Vector4         atlasRect(0.f, 0.f, 1.f, 1.f);
     Property::Index index = mImpl->mRenderer.GetPropertyIndex(ATLAS_RECT_UNIFORM_NAME);
     if(index != Property::INVALID_INDEX)
@@ -960,76 +1154,298 @@ void ImageVisual::RemoveTexture()
   }
 }
 
-Shader ImageVisual::GenerateShader() const
+void ImageVisual::ComputeTextureSize()
 {
-  Shader shader;
-
-  std::string_view vertexShaderView;
-  bool             usesWholeTexture = true;
-  if(mImpl->mCustomShader && !mImpl->mCustomShader->mVertexShader.empty())
+  if(mImpl->mRenderer)
   {
-    vertexShaderView = mImpl->mCustomShader->mVertexShader;
-    usesWholeTexture = false; // Impossible to tell.
+    auto textureSet = mImpl->mRenderer.GetTextures();
+    if(textureSet && textureSet.GetTextureCount())
+    {
+      auto texture = textureSet.GetTexture(0);
+      if(texture)
+      {
+        mTextureSize.x = texture.GetWidth();
+        mTextureSize.y = texture.GetHeight();
+        if(textureSet.GetTextureCount() > 1u && mMaskingData && !mMaskingData->mPreappliedMasking && mMaskingData->mCropToMask)
+        {
+          Texture maskTexture = textureSet.GetTexture(1);
+          if(maskTexture)
+          {
+            mTextureSize.x = std::min(static_cast<uint32_t>(mTextureSize.x * mMaskingData->mContentScaleFactor), maskTexture.GetWidth());
+            mTextureSize.y = std::min(static_cast<uint32_t>(mTextureSize.y * mMaskingData->mContentScaleFactor), maskTexture.GetHeight());
+          }
+        }
+      }
+    }
   }
-  else
+}
+
+Vector2 ImageVisual::ComputeMaskTextureRatio()
+{
+  Vector2 maskTextureRatio;
+  if(mImpl->mRenderer)
   {
-    vertexShaderView = mImageVisualShaderFactory.GetVertexShaderSource();
+    auto textureSet = mImpl->mRenderer.GetTextures();
+    if(textureSet && textureSet.GetTextureCount())
+    {
+      auto texture = textureSet.GetTexture(0);
+      if(texture)
+      {
+        if(textureSet.GetTextureCount() > 1u && mMaskingData && !mMaskingData->mPreappliedMasking && mMaskingData->mCropToMask)
+        {
+          Texture maskTexture = textureSet.GetTexture(1);
+          if(maskTexture)
+          {
+            float textureWidth  = std::max(static_cast<float>(texture.GetWidth() * mMaskingData->mContentScaleFactor), Dali::Math::MACHINE_EPSILON_1);
+            float textureHeight = std::max(static_cast<float>(texture.GetHeight() * mMaskingData->mContentScaleFactor), Dali::Math::MACHINE_EPSILON_1);
+            maskTextureRatio    = Vector2(std::min(static_cast<float>(maskTexture.GetWidth()), textureWidth) / textureWidth,
+                                       std::min(static_cast<float>(maskTexture.GetHeight()), textureHeight) / textureHeight);
+          }
+        }
+      }
+    }
   }
+  return maskTextureRatio;
+}
+
+Shader ImageVisual::GenerateShader() const
+{
+  Shader shader;
+
+  const bool useStandardShader = !mImpl->mCustomShader;
+  const bool useNativeImage    = (mTextures && DevelTexture::IsNative(mTextures.GetTexture(0)));
 
-  std::string_view fragmentShaderView;
-  if(mImpl->mCustomShader && !mImpl->mCustomShader->mFragmentShader.empty())
+  if(useStandardShader)
   {
-    fragmentShaderView = mImpl->mCustomShader->mFragmentShader;
+    bool requiredAlphaMaskingOnRendering = (mMaskingData && !mMaskingData->mMaskImageLoadingFailed) ? !mMaskingData->mPreappliedMasking : false;
+    // Create and cache the standard shader
+    shader = mImageVisualShaderFactory.GetShader(
+      mFactoryCache,
+      ImageVisualShaderFeatureBuilder()
+        .EnableTextureAtlas(mImpl->mFlags & Visual::Base::Impl::IS_ATLASING_APPLIED && !useNativeImage)
+        .ApplyDefaultTextureWrapMode(mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE)
+        .EnableRoundedCorner(IsRoundedCornerRequired())
+        .EnableBorderline(IsBorderlineRequired())
+        .SetTextureForFragmentShaderCheck(useNativeImage ? mTextures.GetTexture(0) : Dali::Texture())
+        .EnableAlphaMaskingOnRendering(requiredAlphaMaskingOnRendering)
+        .EnableYuvToRgb(mNeedYuvToRgb, mNeedUnifiedYuvAndRgb));
   }
   else
   {
-    fragmentShaderView = mImageVisualShaderFactory.GetFragmentShaderSource();
+    bool             usesWholeTexture = true;
+    std::string_view vertexShaderView;
+    std::string_view fragmentShaderView;
+
+    if(mImpl->mCustomShader && !mImpl->mCustomShader->mVertexShader.empty())
+    {
+      vertexShaderView = mImpl->mCustomShader->mVertexShader;
+      usesWholeTexture = false; // Impossible to tell.
+    }
+    else
+    {
+      vertexShaderView = mImageVisualShaderFactory.GetVertexShaderSource();
+    }
+
+    if(mImpl->mCustomShader && !mImpl->mCustomShader->mFragmentShader.empty())
+    {
+      fragmentShaderView = mImpl->mCustomShader->mFragmentShader;
+    }
+    else
+    {
+      fragmentShaderView = mImageVisualShaderFactory.GetFragmentShaderSource();
+    }
+
+    // If the texture is native, we may need to change prefix and sampler in
+    // the fragment shader
+    if(useNativeImage)
+    {
+      bool        modifiedFragmentShader = false;
+      Texture     nativeTexture          = mTextures.GetTexture(0);
+      std::string fragmentShaderString   = std::string(fragmentShaderView);
+
+      modifiedFragmentShader = DevelTexture::ApplyNativeFragmentShader(nativeTexture, fragmentShaderString);
+      if(modifiedFragmentShader)
+      {
+        fragmentShaderView = fragmentShaderString;
+      }
+
+      // Create shader here cause fragmentShaderString scope issue
+      shader = Shader::New(vertexShaderView, fragmentShaderView, mImpl->mCustomShader->mHints);
+    }
+    else
+    {
+      shader = Shader::New(vertexShaderView, fragmentShaderView, mImpl->mCustomShader->mHints);
+    }
+
+    if(usesWholeTexture)
+    {
+      shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
+    }
   }
 
-  // If the texture is native, we may need to change prefix and sampler in
-  // the fragment shader
-  bool        modifiedFragmentShader = false;
-  std::string fragmentShaderString;
-  if(mTextures && DevelTexture::IsNative(mTextures.GetTexture(0)))
+  return shader;
+}
+
+Dali::Property ImageVisual::OnGetPropertyObject(Dali::Property::Key key)
+{
+  if((key.type == Property::Key::INDEX && key.indexKey == Toolkit::ImageVisual::Property::PIXEL_AREA) || (key.type == Property::Key::STRING && key.stringKey == PIXEL_AREA_UNIFORM_NAME))
   {
-    Texture nativeTexture  = mTextures.GetTexture(0);
-    fragmentShaderString   = std::string(fragmentShaderView);
-    modifiedFragmentShader = DevelTexture::ApplyNativeFragmentShader(nativeTexture, fragmentShaderString);
-    fragmentShaderView     = fragmentShaderString;
+    if(DALI_LIKELY(mImpl->mRenderer))
+    {
+      if(mPixelAreaIndex == Property::INVALID_INDEX)
+      {
+        mPixelAreaIndex = mImpl->mRenderer.RegisterProperty(mPixelAreaIndex, PIXEL_AREA_UNIFORM_NAME, mPixelArea);
+      }
+      return Dali::Property(mImpl->mRenderer, mPixelAreaIndex);
+    }
   }
 
-  const bool useStandardShader = !mImpl->mCustomShader && !modifiedFragmentShader;
-  if(useStandardShader)
+  Handle handle;
+  return Dali::Property(handle, Property::INVALID_INDEX);
+}
+
+void ImageVisual::CheckMaskTexture()
+{
+  if(mMaskingData && !mMaskingData->mPreappliedMasking)
   {
-    // Create and cache the standard shader
-    shader = mImageVisualShaderFactory.GetShader(
-      mFactoryCache,
-      mImpl->mFlags & Impl::IS_ATLASING_APPLIED ? TextureAtlas::ENABLED : TextureAtlas::DISABLED,
-      mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE ? DefaultTextureWrapMode::APPLY : DefaultTextureWrapMode::DO_NOT_APPLY,
-      IsRoundedCornerRequired() ? RoundedCorner::ENABLED : RoundedCorner::DISABLED,
-      IsBorderlineRequired() ? Borderline::ENABLED : Borderline::DISABLED
-    );
+    bool       maskLoadFailed = true;
+    TextureSet textures       = mImpl->mRenderer.GetTextures();
+    if(textures && textures.GetTextureCount() >= TEXTURE_COUNT_FOR_GPU_ALPHA_MASK)
+    {
+      if(mMaskingData->mCropToMask)
+      {
+        mImpl->mRenderer.RegisterProperty(MASK_TEXTURE_RATIO_NAME, ComputeMaskTextureRatio());
+      }
+      else
+      {
+        mImpl->mRenderer.RegisterProperty(MASK_TEXTURE_RATIO_NAME, Vector2::ONE);
+      }
+      maskLoadFailed = false;
+    }
+
+    if(mMaskingData->mMaskImageLoadingFailed != maskLoadFailed)
+    {
+      mMaskingData->mMaskImageLoadingFailed = maskLoadFailed;
+      UpdateShader();
+    }
   }
-  else if(mImpl->mCustomShader)
+}
+
+void ImageVisual::ResetRenderer()
+{
+  RemoveTexture(); // If INVALID_TEXTURE_ID then removal will be attempted on atlas
+  mImpl->mResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING;
+
+  TextureSet textureSet = TextureSet::New();
+  mImpl->mRenderer.SetTextures(textureSet);
+  ComputeTextureSize();
+
+  mLoadState = TextureManager::LoadState::NOT_STARTED;
+}
+
+void ImageVisual::ShowBrokenImage()
+{
+  if(mEnableBrokenImage)
   {
-    shader = Shader::New(vertexShaderView, fragmentShaderView, mImpl->mCustomShader->mHints);
+    Actor actor = mPlacementActor.GetHandle();
+
+    Vector2 imageSize = Vector2::ZERO;
+    if(actor)
+    {
+      imageSize           = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+      mPlacementActorSize = imageSize;
+
+      if(mRendererAdded)
+      {
+        actor.RemoveRenderer(mImpl->mRenderer);
+        mRendererAdded = false;
+      }
+    }
+
+    mUseBrokenImageRenderer = true;
+    mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize);
+    if(actor)
+    {
+      actor.AddRenderer(mImpl->mRenderer);
+      mRendererAdded = true;
+      mPlacementActor.Reset();
+    }
   }
   else
   {
-    shader = Shader::New(vertexShaderView, fragmentShaderView);
+    if(mRendererAdded)
+    {
+      Actor actor = mPlacementActor.GetHandle();
+      if(actor)
+      {
+        actor.RemoveRenderer(mImpl->mRenderer);
+        mRendererAdded = false;
+      }
+    }
+    ResetRenderer();
   }
+}
 
-  if(usesWholeTexture)
+void ImageVisual::ResetFastTrackLoadingTask()
+{
+  if(mFastTrackLoadingTask)
   {
-    shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
+    Dali::AsyncTaskManager::Get().RemoveTask(mFastTrackLoadingTask);
+    mFastTrackLoadingTask.Reset();
   }
+}
+
+Geometry ImageVisual::GenerateGeometry(TextureManager::TextureId textureId, bool createForce)
+{
+  Geometry geometry;
+  if(Stage::IsInstalled())
+  {
+    if(mImpl->mCustomShader)
+    {
+      if(createForce)
+      {
+        geometry = CreateGeometry(mFactoryCache, mImpl->mCustomShader->mGridSize);
+      }
+    }
+    else
+    {
+      uint32_t firstElementCount{0u};
+      uint32_t secondElementCount{0u};
 
-  // Set pixel align off as default.
-  // ToDo: Pixel align causes issues such as rattling image animation.
-  // We should trun it off until issues are resolved
-  shader.RegisterProperty(PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_OFF);
+      geometry = mFactoryCache.GetTextureManager().GetRenderGeometry(textureId, firstElementCount, secondElementCount);
+      if(geometry)
+      {
+        if(mImpl->mRenderer)
+        {
+          Dali::DevelRenderer::DrawCommand drawCommand{};
+          drawCommand.drawType = DevelRenderer::DrawType::INDEXED;
+
+          if(firstElementCount)
+          {
+            drawCommand.firstIndex   = 0;
+            drawCommand.elementCount = firstElementCount;
+            drawCommand.queue        = DevelRenderer::RENDER_QUEUE_OPAQUE;
+            DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand);
+          }
+
+          if(secondElementCount)
+          {
+            drawCommand.firstIndex   = firstElementCount;
+            drawCommand.elementCount = secondElementCount;
+            drawCommand.queue        = DevelRenderer::RENDER_QUEUE_TRANSPARENT;
+            DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand);
+          }
+        }
+      }
+      else if(createForce)
+      {
+        // Create default quad geometry now
+        geometry = CreateGeometry(mFactoryCache, ImageDimensions(1, 1));
+      }
+    }
+  }
 
-  return shader;
+  return geometry;
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h
index c0a3f75..60a67f1 100644
--- a/dali-toolkit/internal/visuals/image/image-visual.h
+++ b/dali-toolkit/internal/visuals/image/image-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_IMAGE_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,13 @@
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/object/weak-handle.h>
+#include <dali/public-api/rendering/visual-renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/image-loader/atlas-upload-observer.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
-#include <dali-toolkit/internal/visuals/texture-upload-observer.h>
+#include <dali-toolkit/internal/image-loader/fast-track-loading-task.h>
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 #include <dali-toolkit/public-api/visuals/image-visual-properties.h>
@@ -171,7 +173,7 @@ public: // from Visual
   /**
    * @copydoc Visual::Base::OnDoAction
    */
-  void OnDoAction(const Dali::Property::Index actionName, const Dali::Property::Value& attributes) override;
+  void OnDoAction(const Dali::Property::Index actionId, const Dali::Property::Value& attributes) override;
 
 protected:
   /**
@@ -224,11 +226,6 @@ protected:
   void OnSetTransform() override;
 
   /**
-   * @copydoc Visual::Base::IsResourceReady
-   */
-  bool IsResourceReady() const override;
-
-  /**
    * @copydoc Visual::Base::UpdateShader
    */
   void UpdateShader() override;
@@ -238,6 +235,11 @@ protected:
    */
   Shader GenerateShader() const override;
 
+  /**
+   * @copydoc Visual::Base::OnGetPropertyObject
+   */
+  Dali::Property OnGetPropertyObject(Dali::Property::Key key) override;
+
 public:
   /**
    * @copydoc AtlasUploadObserver::UploadCompleted
@@ -248,24 +250,21 @@ public:
   void UploadCompleted() override;
 
   /**
-   * @copydoc TextureUploadObserver::UploadCompleted
+   * @copydoc TextureUploadObserver::LoadCompleted
    *
    * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready.
    * This callback is the place to add the renderer as it would be called once the loading is finished.
    */
-  void UploadComplete(bool success, int32_t textureId, TextureSet textureSet, bool usingAtlas, const Vector4& atlasRectangle, bool preMultiplied) override;
+  void LoadComplete(bool success, TextureInformation textureInformation) override;
 
-private:
   /**
-   * @copydoc TextureUploadObserver::LoadComplete
+   * @brief Test callback for FastTrackLoadingTask
    *
-   * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready.
-   * This callback is the place to add the renderer as it would be called once the PixelBuffer loading is finished.
+   * @param[in] task The pointer of task who call this callback.
    */
-  void LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied) override
-  {
-  }
+  void FastLoadComplete(FastTrackLoadingTaskPtr task);
 
+private:
   /**
    * Allocate the mask data when a masking property is defined in the property map
    */
@@ -314,14 +313,57 @@ private:
   void RemoveTexture();
 
   /**
+   * @brief Compute texture size
+   */
+  void ComputeTextureSize();
+
+  /**
+   * @brief Compute mask texture ratio
+   * @return The Mask Texture Ratio
+   */
+  Vector2 ComputeMaskTextureRatio();
+
+  /**
    * Helper method to set individual values by index key.
    * @param[in] index The index key of the value
    * @param[in] value The value
    */
   void DoSetProperty(Property::Index index, const Property::Value& value);
 
+  /**
+   * @brief Check whether the mask texture is loaded or not.
+   * If MaskingType is MASKING_ON_LOADING and mask texture is failed to load, update shader.
+   */
+  void CheckMaskTexture();
+
+  /**
+   * @brief Reset Renderer using empty texture
+   * For drawing empty visual, reset the renderer.
+   */
+  void ResetRenderer();
+
+  /**
+   * @brief Show broken image when image loading is failed.
+   */
+  void ShowBrokenImage();
+
+  /**
+   * @brief Remove current added fast track upload task.
+   */
+  void ResetFastTrackLoadingTask();
+
+  /**
+   * @brief Update geometry information and get the generated result.
+   *
+   * @param[in] textureId Id of texture. It will be used when we use AddOn.
+   * @param[in] createForce True if we need to create geometry forcely. False if we don't re-generate geometry.
+   * @return Generated geometry, or empty handle if we don't need to update geometry.
+   */
+  Geometry GenerateGeometry(TextureManager::TextureId textureId, bool createForce);
+
 private:
   Vector4                            mPixelArea;
+  Property::Index                    mPixelAreaIndex;
   WeakHandle<Actor>                  mPlacementActor;
   VisualUrl                          mImageUrl;
   TextureManager::MaskingDataPointer mMaskingData;
@@ -329,6 +371,10 @@ private:
   Dali::ImageDimensions     mDesiredSize;
   TextureManager::TextureId mTextureId;
   TextureSet                mTextures;
+  Vector2                   mTextureSize;
+  Vector2                   mPlacementActorSize;
+
+  FastTrackLoadingTaskPtr mFastTrackLoadingTask; ///< For fast track uploading.
 
   ImageVisualShaderFactory& mImageVisualShaderFactory;
 
@@ -340,9 +386,15 @@ private:
   Dali::Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy;
   Vector4                                         mAtlasRect;
   Dali::ImageDimensions                           mAtlasRectSize;
-  TextureManager::LoadState                       mLoadState;             ///< The texture loading state
-  bool                                            mAttemptAtlasing;       ///< If true will attempt atlasing, otherwise create unique texture
-  bool                                            mOrientationCorrection; ///< true if the image will have it's orientation corrected.
+  TextureManager::LoadState                       mLoadState;                     ///< The texture loading state
+  bool                                            mAttemptAtlasing;               ///< If true will attempt atlasing, otherwise create unique texture
+  bool                                            mOrientationCorrection;         ///< true if the image will have it's orientation corrected.
+  bool                                            mNeedYuvToRgb{false};           ///< true if we need to convert yuv to rgb.
+  bool                                            mNeedUnifiedYuvAndRgb{false};   ///< true if we need to support both yuv and rgb.
+  bool                                            mEnableBrokenImage{true};       ///< true if enable broken image.
+  bool                                            mUseFastTrackUploading{false};  ///< True if we use fast tack feature.
+  bool                                            mRendererAdded{false};          ///< True if renderer added into actor.
+  bool                                            mUseBrokenImageRenderer{false}; ///< True if renderer changed as broken image.
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
index e814bf1..3196a1a 100644
--- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
+++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,8 @@ namespace Dali
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(5); // 5 transform properties
+
 /**
    * @brief Loads a texture from a file
    * @param[in] imageUrl The url of the file
@@ -235,7 +237,7 @@ void MeshVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -300,20 +302,20 @@ void MeshVisual::OnInitialize()
     return;
   }
 
-  mImpl->mRenderer = Renderer::New(mGeometry, mShader);
+  mImpl->mRenderer = VisualRenderer::New(mGeometry, mShader);
   mImpl->mRenderer.SetTextures(mTextureSet);
   mImpl->mRenderer.SetProperty(Renderer::Property::DEPTH_WRITE_MODE, DepthWriteMode::ON);
   mImpl->mRenderer.SetProperty(Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::ON);
 
   //Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 void MeshVisual::SupplyEmptyGeometry()
 {
   mGeometry        = Geometry::New();
-  mShader          = Shader::New(SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT, SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG);
-  mImpl->mRenderer = Renderer::New(mGeometry, mShader);
+  mShader          = Shader::New(SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT, SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG, Shader::Hint::NONE, "MESH_VISUAL_SIMPLE");
+  mImpl->mRenderer = VisualRenderer::New(mGeometry, mShader);
 
   DALI_LOG_ERROR("Initialisation error in mesh visual.\n");
 }
@@ -336,15 +338,15 @@ void MeshVisual::CreateShader()
 {
   if(mShadingMode == Toolkit::MeshVisual::ShadingMode::TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING)
   {
-    mShader = Shader::New(SHADER_MESH_VISUAL_NORMAL_MAP_SHADER_VERT, SHADER_MESH_VISUAL_NORMAL_MAP_SHADER_FRAG);
+    mShader = Shader::New(SHADER_MESH_VISUAL_NORMAL_MAP_SHADER_VERT, SHADER_MESH_VISUAL_NORMAL_MAP_SHADER_FRAG, Shader::Hint::NONE, "MESH_VISUAL_NRMMAP");
   }
   else if(mShadingMode == Toolkit::MeshVisual::ShadingMode::TEXTURED_WITH_SPECULAR_LIGHTING)
   {
-    mShader = Shader::New(SHADER_MESH_VISUAL_SHADER_VERT, SHADER_MESH_VISUAL_SHADER_FRAG);
+    mShader = Shader::New(SHADER_MESH_VISUAL_SHADER_VERT, SHADER_MESH_VISUAL_SHADER_FRAG, Shader::Hint::NONE, "MESH_VISUA");
   }
   else //Textureless
   {
-    mShader = Shader::New(SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT, SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG);
+    mShader = Shader::New(SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT, SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG, Shader::Hint::NONE, "MESH_VISUAL_SIMPLE");
   }
 
   UpdateShaderUniforms();
diff --git a/dali-toolkit/internal/visuals/npatch-data.cpp b/dali-toolkit/internal/visuals/npatch-data.cpp
index cb144b8..28c3ebd 100644
--- a/dali-toolkit/internal/visuals/npatch-data.cpp
+++ b/dali-toolkit/internal/visuals/npatch-data.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,10 @@ NPatchData::NPatchData()
   mCroppedWidth(0),
   mCroppedHeight(0),
   mBorder(0, 0, 0, 0),
-  mLoadingState(LoadingState::LOADING),
+  mLoadingState(LoadingState::NOT_STARTED),
+  mRenderingMap{nullptr},
   mPreMultiplyOnLoad(false),
-  mRenderingMap{nullptr}
+  mObserverNotifying(false)
 {
 }
 
@@ -51,6 +52,8 @@ NPatchData::~NPatchData()
   {
     RenderingAddOn::Get().DestroyNPatch(mRenderingMap);
   }
+  mObserverList.Clear();
+  mQueuedObservers.Clear();
 }
 
 void NPatchData::SetId(const NPatchDataId id)
@@ -65,17 +68,33 @@ NPatchData::NPatchDataId NPatchData::GetId() const
 
 void NPatchData::AddObserver(TextureUploadObserver* textureObserver)
 {
-  mObserverList.PushBack(textureObserver);
+  if(textureObserver)
+  {
+    if(mObserverNotifying)
+    {
+      // Do not add it into observer list during observer notifying.
+      mQueuedObservers.PushBack(textureObserver);
+    }
+    else
+    {
+      mObserverList.PushBack(textureObserver);
+    }
+    textureObserver->DestructionSignal().Connect(this, &NPatchData::ObserverDestroyed);
+  }
 }
 
 void NPatchData::RemoveObserver(TextureUploadObserver* textureObserver)
 {
-  for(uint32_t index = 0; index < mObserverList.Count(); ++index)
+  if(textureObserver)
   {
-    if(textureObserver == mObserverList[index])
+    for(uint32_t index = 0; index < mObserverList.Count(); ++index)
     {
-      mObserverList.Erase(mObserverList.begin() + index);
-      break;
+      if(textureObserver == mObserverList[index])
+      {
+        textureObserver->DestructionSignal().Disconnect(this, &NPatchData::ObserverDestroyed);
+        mObserverList.Erase(mObserverList.begin() + index);
+        break;
+      }
     }
   }
 }
@@ -224,21 +243,93 @@ void NPatchData::SetLoadedNPatchData(Devel::PixelBuffer& pixelBuffer, bool preMu
   mLoadingState = LoadingState::LOAD_COMPLETE;
 }
 
-void NPatchData::LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied)
+void NPatchData::NotifyObserver(TextureUploadObserver* observer, const bool& loadSuccess)
+{
+  observer->LoadComplete(
+    loadSuccess,
+    TextureUploadObserver::TextureInformation(
+      TextureUploadObserver::ReturnType::TEXTURE,
+      static_cast<TextureManager::TextureId>(mId), ///< Note : until end of NPatchLoader::Load, npatch-visual don't know the id of data.
+      mTextureSet,
+      mUrl.GetUrl(),
+      mPreMultiplyOnLoad));
+}
+
+void NPatchData::LoadComplete(bool loadSuccess, TextureInformation textureInformation)
 {
+  NPatchDataPtr self = this; // Keep reference until this API finished
+
   if(loadSuccess)
   {
-    SetLoadedNPatchData(pixelBuffer, preMultiplied);
+    if(mLoadingState != LoadingState::LOAD_COMPLETE)
+    {
+      // If mLoadingState is LOAD_FAILED, just re-set (It can be happened when sync loading is failed, but async loading is succeeded).
+      SetLoadedNPatchData(textureInformation.pixelBuffer, textureInformation.preMultiplied);
+    }
   }
   else
   {
-    mLoadingState = LoadingState::LOAD_FAILED;
+    if(mLoadingState == LoadingState::LOADING)
+    {
+      mLoadingState = LoadingState::LOAD_FAILED;
+    }
+    // If mLoadingState is already LOAD_COMPLETE, we can use uploaded texture (It can be happened when sync loading is succeeded, but async loading is failed).
+    else if(mLoadingState == LoadingState::LOAD_COMPLETE)
+    {
+      loadSuccess = true;
+    }
   }
 
-  for(uint32_t index = 0; index < mObserverList.Count(); ++index)
+  mObserverNotifying = true;
+
+  // Reverse observer list that we can pop_back the observer.
+  std::reverse(mObserverList.Begin(), mObserverList.End());
+
+  while(mObserverList.Count() > 0u)
   {
-    TextureUploadObserver* observer = mObserverList[index];
-    observer->UploadComplete(loadSuccess, TextureManager::INVALID_TEXTURE_ID, mTextureSet, false, Vector4(), preMultiplied);
+    TextureUploadObserver* observer = *(mObserverList.End() - 1u);
+    mObserverList.Erase(mObserverList.End() - 1u);
+
+    observer->DestructionSignal().Disconnect(this, &NPatchData::ObserverDestroyed);
+
+    NotifyObserver(observer, loadSuccess);
+  }
+
+  mObserverNotifying = false;
+
+  // Swap observer list what we queued during notify observer.
+  // If mQueuedObserver is not empty, it mean mLoadingState was LOAD_FAILED, and we try to re-load for this data.
+  // (If mLoadingState was LOAD_COMPLETE, NotifyObserver will be called directly. @todo : Should we fix this logic, matched with texture manager?)
+  // So LoadComplete will be called.
+  mObserverList.Swap(mQueuedObservers);
+}
+
+void NPatchData::ObserverDestroyed(TextureUploadObserver* observer)
+{
+  for(auto iter = mObserverList.Begin(); iter != mObserverList.End();)
+  {
+    if(observer == (*iter))
+    {
+      iter = mObserverList.Erase(iter);
+    }
+    else
+    {
+      ++iter;
+    }
+  }
+  if(mObserverNotifying)
+  {
+    for(auto iter = mQueuedObservers.Begin(); iter != mQueuedObservers.End();)
+    {
+      if(observer == (*iter))
+      {
+        iter = mQueuedObservers.Erase(iter);
+      }
+      else
+      {
+        ++iter;
+      }
+    }
   }
 }
 
diff --git a/dali-toolkit/internal/visuals/npatch-data.h b/dali-toolkit/internal/visuals/npatch-data.h
index 7a052c4..99c4d08 100644
--- a/dali-toolkit/internal/visuals/npatch-data.h
+++ b/dali-toolkit/internal/visuals/npatch-data.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_NPATCH_DATA_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,13 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <string>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/utility/npatch-utilities.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali
@@ -33,20 +34,24 @@ namespace Toolkit
 {
 namespace Internal
 {
-class NPatchData : public Dali::Toolkit::TextureUploadObserver
+class NPatchData;
+typedef IntrusivePtr<NPatchData> NPatchDataPtr;
+
+class NPatchData : public ConnectionTracker, public Dali::Toolkit::TextureUploadObserver, public Dali::RefObject
 {
 public:
-  typedef int32_t  NPatchDataId;                ///< The NPatchDataId type. This is used as a handle to refer to a particular Npatch Data.
-  static const int INVALID_NPATCH_DATA_ID = -1; ///< Used to represent a null TextureId or error
+  typedef int32_t           NPatchDataId;                ///< The NPatchDataId type. This is used as a handle to refer to a particular Npatch Data.
+  static const NPatchDataId INVALID_NPATCH_DATA_ID = -1; ///< Used to represent a null TextureId or error
 
   /**
    * @brief Loading State of the NPatch image.
    */
   enum class LoadingState
   {
-    LOADING = 0,   ///< NPatch is on loading.
-    LOAD_COMPLETE, ///< NPatch loading is completed successfully.
-    LOAD_FAILED    ///< NPatch loading is failed.
+    NOT_STARTED = 0, ///< NPatch loading is not started yet.
+    LOADING,         ///< NPatch is on loading.
+    LOAD_COMPLETE,   ///< NPatch loading is completed successfully.
+    LOAD_FAILED      ///< NPatch loading is failed.
   };
 
 public:
@@ -251,41 +256,50 @@ public:
    */
   void SetLoadedNPatchData(Devel::PixelBuffer& pixelBuffer, bool preMultiplied);
 
-private:
   /**
-   * @copydoc TextureUploadObserver::UploadCompleted
+   * @brief Send LoadComplete notify with current setuped NPatchData
    *
-   * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready.
-   * This callback is the place to add the renderer as it would be called once the loading is finished.
+   * @param [in] observer observer who will be got LoadComplete notify
+   * @param [in] loadSuccess whether the image load success or not.
    */
-  void UploadComplete(bool loadSuccess, int32_t textureId, TextureSet textureSet, bool useAtlasing, const Vector4& atlasRect, bool preMultiplied) override
-  {
-  }
+  void NotifyObserver(TextureUploadObserver* observer, const bool& loadSuccess);
 
+private:
   /**
    * @copydoc TextureUploadObserver::LoadComplete
    *
    * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready.
    * This callback is the place to add the renderer as it would be called once the loading is finished.
    */
-  void LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied) override;
+  void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override;
+
+  /**
+   * This is called by the TextureUploadObserver when an observer is destroyed.
+   * We use the callback to know when to remove an observer from our notify list.
+   * @param[in] observer The observer that generated the callback
+   */
+  void ObserverDestroyed(TextureUploadObserver* observer);
 
 private:
   using ObserverListType = Dali::Vector<TextureUploadObserver*>;
 
-  NPatchDataId                 mId;
-  ObserverListType             mObserverList;      ///< Container used to store all observer clients of this Texture
-  VisualUrl                    mUrl;               ///< Url of the N-Patch
-  TextureSet                   mTextureSet;        ///< Texture containing the cropped image
-  NPatchUtility::StretchRanges mStretchPixelsX;    ///< X stretch pixels
-  NPatchUtility::StretchRanges mStretchPixelsY;    ///< Y stretch pixels
-  std::size_t                  mHash;              ///< Hash code for the Url
-  uint32_t                     mCroppedWidth;      ///< Width of the cropped middle part of N-patch
-  uint32_t                     mCroppedHeight;     ///< Height of the cropped middle part of N-patch
-  Rect<int>                    mBorder;            ///< The size of the border
-  LoadingState                 mLoadingState;      ///< True if the data loading is completed
-  bool                         mPreMultiplyOnLoad; ///< Whether to multiply alpha into color channels on load
-  void*                        mRenderingMap;      ///< NPatch rendering data
+  NPatchDataId     mId;
+  ObserverListType mObserverList;    ///< Container used to store all observer clients of this Texture
+  ObserverListType mQueuedObservers; ///< Container observers when user try to add during notify observers
+
+  VisualUrl                    mUrl;            ///< Url of the N-Patch
+  TextureSet                   mTextureSet;     ///< Texture containing the cropped image
+  NPatchUtility::StretchRanges mStretchPixelsX; ///< X stretch pixels
+  NPatchUtility::StretchRanges mStretchPixelsY; ///< Y stretch pixels
+  std::size_t                  mHash;           ///< Hash code for the Url
+  uint32_t                     mCroppedWidth;   ///< Width of the cropped middle part of N-patch
+  uint32_t                     mCroppedHeight;  ///< Height of the cropped middle part of N-patch
+  Rect<int>                    mBorder;         ///< The size of the border
+  LoadingState                 mLoadingState;   ///< True if the data loading is completed
+  void*                        mRenderingMap;   ///< NPatch rendering data
+
+  bool mPreMultiplyOnLoad : 1; ///< Whether to multiply alpha into color channels on load
+  bool mObserverNotifying : 1; ///< Whether this NPatchData notifying observers or not.
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/npatch-loader.cpp b/dali-toolkit/internal/visuals/npatch-loader.cpp
index 5f8ddff..fb844ce 100644
--- a/dali-toolkit/internal/visuals/npatch-loader.cpp
+++ b/dali-toolkit/internal/visuals/npatch-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@
 
 // EXTERNAL HEADERS
 #include <dali/devel-api/common/hash.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
 
 namespace Dali
 {
@@ -36,114 +38,89 @@ namespace
 constexpr auto INVALID_CACHE_INDEX = int32_t{-1}; ///< Invalid Cache index
 constexpr auto UNINITIALIZED_ID    = int32_t{0};  ///< uninitialised id, use to initialize ids
 
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
 } // Anonymous namespace
 
 NPatchLoader::NPatchLoader()
-: mCurrentNPatchDataId(0)
+: mCurrentNPatchDataId(0),
+  mRemoveProcessorRegistered(false)
 {
 }
 
 NPatchLoader::~NPatchLoader()
 {
+  if(mRemoveProcessorRegistered && Adaptor::IsAvailable())
+  {
+    Adaptor::Get().UnregisterProcessor(*this, true);
+    mRemoveProcessorRegistered = false;
+  }
 }
 
 NPatchData::NPatchDataId NPatchLoader::GenerateUniqueNPatchDataId()
 {
+  // Skip invalid id generation.
+  if(DALI_UNLIKELY(mCurrentNPatchDataId == NPatchData::INVALID_NPATCH_DATA_ID))
+  {
+    mCurrentNPatchDataId = 0;
+  }
   return mCurrentNPatchDataId++;
 }
 
-std::size_t NPatchLoader::Load(TextureManager& textureManager, TextureUploadObserver* textureObserver, const VisualUrl& url, const Rect<int>& border, bool& preMultiplyOnLoad, bool synchronousLoading)
+NPatchData::NPatchDataId NPatchLoader::Load(TextureManager& textureManager, TextureUploadObserver* textureObserver, const VisualUrl& url, const Rect<int>& border, bool& preMultiplyOnLoad, bool synchronousLoading)
 {
-  std::size_t                                 hash  = CalculateHash(url.GetUrl());
-  OwnerContainer<NPatchData*>::SizeType       index = UNINITIALIZED_ID;
-  const OwnerContainer<NPatchData*>::SizeType count = mCache.Count();
+  NPatchDataPtr data = GetNPatchData(url, border, preMultiplyOnLoad);
 
-  for(; index < count; ++index)
+  DALI_ASSERT_ALWAYS(data.Get() && "NPatchData creation failed!");
+
+  if(data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
   {
-    if(mCache[index]->GetHash() == hash)
+    if(!synchronousLoading)
     {
-      // hash match, check url as well in case of hash collision
-      if(mCache[index]->GetUrl().GetUrl() == url.GetUrl())
+      // NotifyObserver already done, so
+      // data will not iterate observer list.
+      // We need to call LoadComplete directly.
+      data->NotifyObserver(textureObserver, true);
+    }
+  }
+  else // if NOT_STARTED or LOADING or LOAD_FAILED, try to reload.
+  {
+    if(!synchronousLoading)
+    {
+      data->AddObserver(textureObserver);
+      // If still LOADING and async, don't need to request reload. Fast return.
+      if(data->GetLoadingState() == NPatchData::LoadingState::LOADING)
       {
-        // Use cached data
-        if(mCache[index]->GetBorder() == border)
-        {
-          if(mCache[index]->GetLoadingState() == NPatchData::LoadingState::LOADING)
-          {
-            mCache[index]->AddObserver(textureObserver);
-          }
-          return mCache[index]->GetId(); // valid indices are from 1 onwards
-        }
-        else
-        {
-          if(mCache[index]->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
-          {
-            // Same url but border is different - use the existing texture
-            NPatchData* newData = new NPatchData();
-            newData->SetId(GenerateUniqueNPatchDataId());
-            newData->SetHash(hash);
-            newData->SetUrl(url);
-            newData->SetCroppedWidth(mCache[index]->GetCroppedWidth());
-            newData->SetCroppedHeight(mCache[index]->GetCroppedHeight());
-
-            newData->SetTextures(mCache[index]->GetTextures());
-
-            NPatchUtility::StretchRanges stretchRangesX;
-            stretchRangesX.PushBack(Uint16Pair(border.left, ((newData->GetCroppedWidth() >= static_cast<unsigned int>(border.right)) ? newData->GetCroppedHeight() - border.right : 0)));
-
-            NPatchUtility::StretchRanges stretchRangesY;
-            stretchRangesY.PushBack(Uint16Pair(border.top, ((newData->GetCroppedWidth() >= static_cast<unsigned int>(border.bottom)) ? newData->GetCroppedHeight() - border.bottom : 0)));
-
-            newData->SetStretchPixelsX(stretchRangesX);
-            newData->SetStretchPixelsY(stretchRangesY);
-            newData->SetBorder(border);
-
-            newData->SetPreMultiplyOnLoad(mCache[index]->IsPreMultiplied());
-
-            newData->SetLoadingState(NPatchData::LoadingState::LOAD_COMPLETE);
-            newData->AddObserver(textureObserver);
-
-            mCache.PushBack(newData);
-
-            return newData->GetId(); // valid ids start from 1u
-          }
-        }
+        return data->GetId();
       }
     }
-  }
 
-  // If this is new image loading, make new cache data
-  NPatchData* data;
-  data = new NPatchData();
-  data->SetId(GenerateUniqueNPatchDataId());
-  data->SetHash(hash);
-  data->SetUrl(url);
-  data->SetBorder(border);
-  data->SetPreMultiplyOnLoad(preMultiplyOnLoad);
-  data->AddObserver(textureObserver);
-  mCache.PushBack(data);
+    data->SetLoadingState(NPatchData::LoadingState::LOADING);
 
-  auto preMultiplyOnLoading = preMultiplyOnLoad ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
-                                                : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+    auto preMultiplyOnLoading = preMultiplyOnLoad ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
+                                                  : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
 
-  Devel::PixelBuffer pixelBuffer = textureManager.LoadPixelBuffer(url, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, synchronousLoading, data, true, preMultiplyOnLoading);
+    Devel::PixelBuffer pixelBuffer = textureManager.LoadPixelBuffer(url, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, synchronousLoading, data.Get(), true, preMultiplyOnLoading);
 
-  if(pixelBuffer)
-  {
-    preMultiplyOnLoad = (preMultiplyOnLoading == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD) ? true : false;
-    data->SetLoadedNPatchData(pixelBuffer, preMultiplyOnLoad);
+    if(pixelBuffer)
+    {
+      preMultiplyOnLoad = (preMultiplyOnLoading == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD) ? true : false;
+      data->SetLoadedNPatchData(pixelBuffer, preMultiplyOnLoad);
+    }
+    else if(synchronousLoading)
+    {
+      data->SetLoadingState(NPatchData::LoadingState::LOAD_FAILED);
+    }
   }
-
   return data->GetId();
 }
 
 int32_t NPatchLoader::GetCacheIndexFromId(const NPatchData::NPatchDataId id)
 {
-  const unsigned int size = mCache.Count();
+  const unsigned int size = mCache.size();
 
   for(unsigned int i = 0; i < size; ++i)
   {
-    if(mCache[i]->GetId() == id)
+    if(mCache[i].mData->GetId() == id)
     {
       return i;
     }
@@ -152,19 +129,42 @@ int32_t NPatchLoader::GetCacheIndexFromId(const NPatchData::NPatchDataId id)
   return INVALID_CACHE_INDEX;
 }
 
-bool NPatchLoader::GetNPatchData(const NPatchData::NPatchDataId id, const NPatchData*& data)
+bool NPatchLoader::GetNPatchData(const NPatchData::NPatchDataId id, NPatchDataPtr& data)
 {
   int32_t cacheIndex = GetCacheIndexFromId(id);
   if(cacheIndex != INVALID_CACHE_INDEX)
   {
-    data = mCache[cacheIndex];
+    data = mCache[cacheIndex].mData;
     return true;
   }
   data = nullptr;
   return false;
 }
 
-void NPatchLoader::Remove(std::size_t id, TextureUploadObserver* textureObserver)
+void NPatchLoader::RequestRemove(NPatchData::NPatchDataId id, TextureUploadObserver* textureObserver)
+{
+  // Remove observer first
+  if(textureObserver)
+  {
+    int32_t cacheIndex = GetCacheIndexFromId(id);
+    if(cacheIndex != INVALID_CACHE_INDEX)
+    {
+      NPatchInfo& info(mCache[cacheIndex]);
+
+      info.mData->RemoveObserver(textureObserver);
+    }
+  }
+
+  mRemoveQueue.push_back({id, nullptr});
+
+  if(!mRemoveProcessorRegistered && Adaptor::IsAvailable())
+  {
+    mRemoveProcessorRegistered = true;
+    Adaptor::Get().RegisterProcessor(*this, true);
+  }
+}
+
+void NPatchLoader::Remove(NPatchData::NPatchDataId id, TextureUploadObserver* textureObserver)
 {
   int32_t cacheIndex = GetCacheIndexFromId(id);
   if(cacheIndex == INVALID_CACHE_INDEX)
@@ -172,17 +172,141 @@ void NPatchLoader::Remove(std::size_t id, TextureUploadObserver* textureObserver
     return;
   }
 
-  NPatchData* data;
-  data = mCache[cacheIndex];
+  NPatchInfo& info(mCache[cacheIndex]);
 
-  data->RemoveObserver(textureObserver);
+  info.mData->RemoveObserver(textureObserver);
 
-  if(data->GetObserverCount() == 0)
+  if(--info.mReferenceCount <= 0)
   {
-    mCache.Erase(mCache.Begin() + cacheIndex);
+    mCache.erase(mCache.begin() + cacheIndex);
   }
 }
 
+void NPatchLoader::Process(bool postProcessor)
+{
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_NPATCH_LOADER_PROCESS_REMOVE_QUEUE", [&](std::ostringstream& oss) {
+    oss << "[" << mRemoveQueue.size() << "]";
+  });
+
+  for(auto& iter : mRemoveQueue)
+  {
+    Remove(iter.first, iter.second);
+  }
+
+  mRemoveQueue.clear();
+
+  if(Adaptor::IsAvailable())
+  {
+    Adaptor::Get().UnregisterProcessor(*this, true);
+    mRemoveProcessorRegistered = false;
+  }
+
+  DALI_TRACE_END(gTraceFilter, "DALI_NPATCH_LOADER_PROCESS_REMOVE_QUEUE");
+}
+
+NPatchDataPtr NPatchLoader::GetNPatchData(const VisualUrl& url, const Rect<int>& border, bool& preMultiplyOnLoad)
+{
+  std::size_t                              hash  = CalculateHash(url.GetUrl());
+  std::vector<NPatchInfo>::size_type       index = UNINITIALIZED_ID;
+  const std::vector<NPatchInfo>::size_type count = mCache.size();
+
+  NPatchInfo* infoPtr = nullptr;
+
+  for(; index < count; ++index)
+  {
+    if(mCache[index].mData->GetHash() == hash)
+    {
+      // hash match, check url as well in case of hash collision
+      if(mCache[index].mData->GetUrl().GetUrl() == url.GetUrl())
+      {
+        // Use cached data. Need to fast-out return.
+        if(mCache[index].mData->GetBorder() == border)
+        {
+          mCache[index].mReferenceCount++;
+          return mCache[index].mData;
+        }
+        else
+        {
+          if(mCache[index].mData->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
+          {
+            // If we only found LOAD_FAILED case, replace current data. We can reuse texture
+            if(infoPtr == nullptr || infoPtr->mData->GetLoadingState() != NPatchData::LoadingState::LOAD_COMPLETE)
+            {
+              infoPtr = &mCache[index];
+            }
+          }
+          // Still loading pixel buffer. We cannot reuse cached texture yet. Skip checking
+          else if(mCache[index].mData->GetLoadingState() == NPatchData::LoadingState::LOADING)
+          {
+            continue;
+          }
+          // if LOAD_FAILED, reuse this cached NPatchData, and try to load again.
+          else
+          {
+            if(infoPtr == nullptr)
+            {
+              infoPtr = &mCache[index];
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // If this is new image loading, make new cache data
+  if(infoPtr == nullptr)
+  {
+    NPatchInfo info(new NPatchData());
+    info.mData->SetId(GenerateUniqueNPatchDataId());
+    info.mData->SetHash(hash);
+    info.mData->SetUrl(url);
+    info.mData->SetBorder(border);
+    info.mData->SetPreMultiplyOnLoad(preMultiplyOnLoad);
+
+    mCache.emplace_back(std::move(info));
+    infoPtr = &mCache.back();
+  }
+  // Else if LOAD_COMPLETE, Same url but border is different - use the existing texture
+  else if(infoPtr->mData->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
+  {
+    NPatchInfo info(new NPatchData());
+
+    info.mData->SetId(GenerateUniqueNPatchDataId());
+    info.mData->SetHash(hash);
+    info.mData->SetUrl(url);
+    info.mData->SetCroppedWidth(infoPtr->mData->GetCroppedWidth());
+    info.mData->SetCroppedHeight(infoPtr->mData->GetCroppedHeight());
+
+    info.mData->SetTextures(infoPtr->mData->GetTextures());
+
+    NPatchUtility::StretchRanges stretchRangesX;
+    stretchRangesX.PushBack(Uint16Pair(border.left, ((info.mData->GetCroppedWidth() >= static_cast<unsigned int>(border.right)) ? info.mData->GetCroppedHeight() - border.right : 0)));
+
+    NPatchUtility::StretchRanges stretchRangesY;
+    stretchRangesY.PushBack(Uint16Pair(border.top, ((info.mData->GetCroppedWidth() >= static_cast<unsigned int>(border.bottom)) ? info.mData->GetCroppedHeight() - border.bottom : 0)));
+
+    info.mData->SetStretchPixelsX(stretchRangesX);
+    info.mData->SetStretchPixelsY(stretchRangesY);
+    info.mData->SetBorder(border);
+
+    info.mData->SetPreMultiplyOnLoad(infoPtr->mData->IsPreMultiplied());
+
+    info.mData->SetLoadingState(NPatchData::LoadingState::LOAD_COMPLETE);
+
+    mCache.emplace_back(std::move(info));
+    infoPtr = &mCache.back();
+  }
+  // Else, LOAD_FAILED. just increase reference so we can reuse it.
+  else
+  {
+    infoPtr->mReferenceCount++;
+  }
+
+  DALI_ASSERT_ALWAYS(infoPtr && "NPatchInfo creation failed!");
+
+  return infoPtr->mData;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/visuals/npatch-loader.h b/dali-toolkit/internal/visuals/npatch-loader.h
index dd7f022..fb66fcc 100644
--- a/dali-toolkit/internal/visuals/npatch-loader.h
+++ b/dali-toolkit/internal/visuals/npatch-loader.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_NPATCH_LOADER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,15 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <dali/devel-api/common/owner-container.h>
+#include <dali/integration-api/processor-interface.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <string>
+#include <utility> // for std::pair
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/utility/npatch-utilities.h>
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/npatch-data.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali
@@ -44,7 +45,7 @@ namespace Internal
  * small space and there's not usually a lot of them. Usually N patches are specified in
  * toolkit default style and there is 1-2 per control that are shared across the whole application.
  */
-class NPatchLoader
+class NPatchLoader : public Integration::Processor
 {
 public:
   /**
@@ -69,16 +70,7 @@ public:
    * @param [in] synchronousLoading True if the image will be loaded in synchronous time.
    * @return id of the texture.
    */
-  std::size_t Load(TextureManager& textureManager, TextureUploadObserver* textureObserver, const VisualUrl& url, const Rect<int>& border, bool& preMultiplyOnLoad, bool synchronousLoading);
-
-  /**
-   * @brief Set loaded PixelBuffer and its information
-   *
-   * @param [in] id cache data id
-   * @param [in] pixelBuffer of loaded image
-   * @param [in] preMultiplied True if the image had pre-multiplied alpha applied
-   */
-  void SetNPatchData(std::size_t id, Devel::PixelBuffer& pixelBuffer, bool preMultiplied);
+  NPatchData::NPatchDataId Load(TextureManager& textureManager, TextureUploadObserver* textureObserver, const VisualUrl& url, const Rect<int>& border, bool& preMultiplyOnLoad, bool synchronousLoading);
 
   /**
    * @brief Retrieve N patch data matching to an id
@@ -86,23 +78,96 @@ public:
    * @param [out] data const pointer to the NPatchData
    * @return true if data matching to id was really found
    */
-  bool GetNPatchData(const NPatchData::NPatchDataId id, const NPatchData*& data);
+  bool GetNPatchData(const NPatchData::NPatchDataId id, NPatchDataPtr& data);
 
   /**
-   * @brief Remove a texture matching id.
-   * Erase the observer from the observer list of cache.
-   * If the observer list is empty, the textureSet will be reset.
+   * @brief Request remove a texture matching id.
+   * Erase the observer from the observer list of cache if we need.
    *
    * @param [in] id cache data id
    * @param [in] textureObserver The NPatchVisual that requested loading.
    */
-  void Remove(std::size_t id, TextureUploadObserver* textureObserver);
+  void RequestRemove(NPatchData::NPatchDataId id, TextureUploadObserver* textureObserver);
+
+protected: // Implementation of Processor
+  /**
+   * @copydoc Dali::Integration::Processor::Process()
+   */
+  void Process(bool postProcessor) override;
+
+  /**
+   * @copydoc Dali::Integration::Processor::GetProcessorName()
+   */
+  std::string_view GetProcessorName() const override
+  {
+    return "NPatchLoader";
+  }
 
 private:
   NPatchData::NPatchDataId GenerateUniqueNPatchDataId();
 
   int32_t GetCacheIndexFromId(const NPatchData::NPatchDataId id);
 
+  /**
+   * @brief Remove a texture matching id.
+   * Erase the observer from the observer list of cache if we need.
+   * This API decrease cached NPatchInfo reference.
+   * If the NPatchInfo reference become 0, the textureSet will be reset.
+   *
+   * @param [in] id cache data id
+   * @param [in] textureObserver The NPatchVisual that requested loading.
+   */
+  void Remove(NPatchData::NPatchDataId id, TextureUploadObserver* textureObserver);
+
+private:
+  /**
+   * @brief Information of NPatchData
+   * It also hold ownership of NPatchData memory.
+   */
+  struct NPatchInfo
+  {
+    NPatchInfo(NPatchDataPtr data)
+    : mData(data),
+      mReferenceCount(1u)
+    {
+    }
+    ~NPatchInfo()
+    {
+    }
+    NPatchInfo(NPatchInfo&& info) noexcept // move constructor
+    {
+      mData                = std::move(info.mData);
+      mReferenceCount      = info.mReferenceCount;
+      info.mReferenceCount = 0u;
+    }
+    NPatchInfo& operator=(NPatchInfo&& info) noexcept // move operator
+    {
+      mData                = std::move(info.mData);
+      mReferenceCount      = info.mReferenceCount;
+      info.mReferenceCount = 0u;
+      return *this;
+    }
+
+    NPatchInfo()                       = delete;            // Do not use default constructor
+    NPatchInfo(const NPatchInfo& info) = delete;            // Do not use copy constructor
+    NPatchInfo& operator=(const NPatchInfo& info) = delete; // Do not use copy assign
+
+    NPatchDataPtr mData;
+    std::int16_t  mReferenceCount; ///< The number of N-patch visuals that use this data.
+  };
+
+  /**
+   * @brief Get cached NPatchData by inputed url and border. If there is no cached data, create new one.
+   * @note This API increase cached NPatchInfo reference.
+   *
+   * @param [in] url to retrieve
+   * @param [in] border The border size of the image
+   * @param [in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the
+   *                                   image has no alpha channel
+   * @return NPatchData pointer that Load function will used.
+   */
+  NPatchDataPtr GetNPatchData(const VisualUrl& url, const Rect<int>& border, bool& preMultiplyOnLoad);
+
 protected:
   /**
    * Undefined copy constructor.
@@ -115,8 +180,12 @@ protected:
   NPatchLoader& operator=(const NPatchLoader& rhs);
 
 private:
-  NPatchData::NPatchDataId    mCurrentNPatchDataId;
-  OwnerContainer<NPatchData*> mCache;
+  NPatchData::NPatchDataId mCurrentNPatchDataId;
+  std::vector<NPatchInfo>  mCache;
+
+  std::vector<std::pair<NPatchData::NPatchDataId, TextureUploadObserver*>> mRemoveQueue; ///< Queue of textures to remove at PostProcess. It will be cleared after PostProcess.
+
+  bool mRemoveProcessorRegistered : 1; ///< Flag if remove processor registered or not.
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
index d9c26aa..2544899 100644
--- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
+++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,21 @@
  */
 
 // CLASS HEADER
-#include "npatch-visual.h"
+#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/common/stage.h>
 #include <dali/devel-api/rendering/renderer-devel.h>
 #include <dali/integration-api/debug.h>
-#include <dali/devel-api/common/stage.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/utility/npatch-helper.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 #include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
 #include <dali-toolkit/internal/visuals/npatch-loader.h>
 #include <dali-toolkit/internal/visuals/rendering-addon.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
@@ -45,90 +48,9 @@ namespace Internal
 {
 namespace
 {
-/**
- * @brief Creates the geometry formed from the vertices and indices
- *
- * @param[in]  vertices             The vertices to generate the geometry from
- * @param[in]  indices              The indices to generate the geometry from
- * @return The geometry formed from the vertices and indices
- */
-Geometry GenerateGeometry(const Vector<Vector2>& vertices, const Vector<unsigned short>& indices)
-{
-  Property::Map vertexFormat;
-  vertexFormat["aPosition"] = Property::VECTOR2;
-  VertexBuffer vertexBuffer = VertexBuffer::New(vertexFormat);
-  if(vertices.Size() > 0)
-  {
-    vertexBuffer.SetData(&vertices[0], vertices.Size());
-  }
-
-  // Create the geometry object
-  Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer(vertexBuffer);
-  if(indices.Size() > 0)
-  {
-    geometry.SetIndexBuffer(&indices[0], indices.Size());
-  }
-
-  return geometry;
-}
-
-/**
- * @brief Adds the indices to form a quad composed off two triangles where the indices are organised in a grid
- *
- * @param[out] indices     The indices to add to
- * @param[in]  rowIdx      The row index to start the quad
- * @param[in]  nextRowIdx  The index to the next row
- */
-void AddQuadIndices(Vector<unsigned short>& indices, unsigned int rowIdx, unsigned int nextRowIdx)
-{
-  indices.PushBack(rowIdx);
-  indices.PushBack(nextRowIdx + 1);
-  indices.PushBack(rowIdx + 1);
-
-  indices.PushBack(rowIdx);
-  indices.PushBack(nextRowIdx);
-  indices.PushBack(nextRowIdx + 1);
-}
-
-void AddVertex(Vector<Vector2>& vertices, unsigned int x, unsigned int y)
-{
-  vertices.PushBack(Vector2(x, y));
+const int CUSTOM_PROPERTY_COUNT(5); // fixed(3),stretch,aux
 }
 
-void RegisterStretchProperties(Renderer& renderer, const char* uniformName, const NPatchUtility::StretchRanges& stretchPixels, uint16_t imageExtent)
-{
-  uint16_t     prevEnd     = 0;
-  uint16_t     prevFix     = 0;
-  uint16_t     prevStretch = 0;
-  unsigned int i           = 1;
-  for(NPatchUtility::StretchRanges::ConstIterator it = stretchPixels.Begin(); it != stretchPixels.End(); ++it, ++i)
-  {
-    uint16_t start = it->GetX();
-    uint16_t end   = it->GetY();
-
-    uint16_t fix     = prevFix + start - prevEnd;
-    uint16_t stretch = prevStretch + end - start;
-
-    std::stringstream uniform;
-    uniform << uniformName << "[" << i << "]";
-    renderer.RegisterProperty(uniform.str(), Vector2(fix, stretch));
-
-    prevEnd     = end;
-    prevFix     = fix;
-    prevStretch = stretch;
-  }
-
-  {
-    prevFix += imageExtent - prevEnd;
-    std::stringstream uniform;
-    uniform << uniformName << "[" << i << "]";
-    renderer.RegisterProperty(uniform.str(), Vector2(prevFix, prevStretch));
-  }
-}
-
-} //unnamed namespace
-
 /////////////////NPatchVisual////////////////
 
 NPatchVisualPtr NPatchVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties)
@@ -153,23 +75,48 @@ void NPatchVisual::LoadImages()
   TextureManager& textureManager     = mFactoryCache.GetTextureManager();
   bool            synchronousLoading = mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
 
-  if(mId == NPatchData::INVALID_NPATCH_DATA_ID && (mImageUrl.IsLocalResource() || mImageUrl.IsBufferResource()))
+  if(mId == NPatchData::INVALID_NPATCH_DATA_ID)
   {
     bool preMultiplyOnLoad = IsPreMultipliedAlphaEnabled() && !mImpl->mCustomShader ? true : false;
     mId                    = mLoader.Load(textureManager, this, mImageUrl, mBorder, preMultiplyOnLoad, synchronousLoading);
 
-    const NPatchData* data;
+    NPatchDataPtr data;
     if(mLoader.GetNPatchData(mId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
     {
       EnablePreMultipliedAlpha(data->IsPreMultiplied());
     }
   }
 
-  if(!mAuxiliaryPixelBuffer && mAuxiliaryUrl.IsValid() && (mAuxiliaryUrl.IsLocalResource() || mAuxiliaryUrl.IsBufferResource()))
+  if(mAuxiliaryTextureId == TextureManager::INVALID_TEXTURE_ID && mAuxiliaryUrl.IsValid())
   {
+    auto preMultiplyOnLoad = IsPreMultipliedAlphaEnabled() && !mImpl->mCustomShader
+                               ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD
+                               : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+    TextureManager::MaskingDataPointer maskingDataPtr       = nullptr;
+    ImageAtlasManagerPtr               imageAtlasManagerPtr = nullptr;
+
+    bool atlasing      = false;
+    auto atlasRect     = Vector4::ZERO;
+    auto atlasRectSize = Dali::ImageDimensions();
+
+    bool loadingStatus = false;
+
     // Load the auxiliary image
-    auto preMultiplyOnLoading = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-    mAuxiliaryPixelBuffer     = textureManager.LoadPixelBuffer(mAuxiliaryUrl, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, synchronousLoading, this, true, preMultiplyOnLoading);
+    mAuxiliaryTextureSet = textureManager.LoadTexture(mAuxiliaryUrl, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, maskingDataPtr, synchronousLoading, mAuxiliaryTextureId, atlasRect, atlasRectSize, atlasing, loadingStatus, this, nullptr, imageAtlasManagerPtr, true, TextureManager::ReloadPolicy::CACHED, preMultiplyOnLoad);
+
+    if(mAuxiliaryTextureSet)
+    {
+      Sampler sampler = Sampler::New();
+      sampler.SetWrapMode(WrapMode::DEFAULT, WrapMode::DEFAULT);
+      mAuxiliaryTextureSet.SetSampler(0u, sampler);
+    }
+
+    // If synchronousLoading is true, we can check the auxiliaryResource's status now.
+    if(synchronousLoading)
+    {
+      mAuxiliaryResourceStatus = (mAuxiliaryTextureSet && mAuxiliaryTextureSet.GetTextureCount() > 0u) ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED;
+    }
   }
 }
 
@@ -179,7 +126,7 @@ void NPatchVisual::GetNaturalSize(Vector2& naturalSize)
   naturalSize.y = 0u;
 
   // load now if not already loaded
-  const NPatchData* data;
+  NPatchDataPtr data;
   if(mLoader.GetNPatchData(mId, data) && data->GetLoadingState() != NPatchData::LoadingState::LOADING)
   {
     naturalSize.x = data->GetCroppedWidth();
@@ -198,10 +145,10 @@ void NPatchVisual::GetNaturalSize(Vector2& naturalSize)
     }
   }
 
-  if(mAuxiliaryPixelBuffer)
+  if(mAuxiliaryTextureSet && mAuxiliaryTextureSet.GetTextureCount() > 0u)
   {
-    naturalSize.x = std::max(naturalSize.x, float(mAuxiliaryPixelBuffer.GetWidth()));
-    naturalSize.y = std::max(naturalSize.y, float(mAuxiliaryPixelBuffer.GetHeight()));
+    naturalSize.x = std::max(naturalSize.x, float(mAuxiliaryTextureSet.GetTexture(0u).GetWidth()));
+    naturalSize.y = std::max(naturalSize.y, float(mAuxiliaryTextureSet.GetTexture(0u).GetHeight()));
   }
 }
 
@@ -272,40 +219,39 @@ void NPatchVisual::DoSetOnScene(Actor& actor)
   // load when first go on stage
   LoadImages();
 
-  const NPatchData* data;
-  if(mLoader.GetNPatchData(mId, data))
-  {
-    Geometry geometry = CreateGeometry();
-    Shader   shader   = CreateShader();
+  // Set mPlacementActor now, because some case, LoadImages can use this information in LoadComplete API.
+  // at this case, we try to SetResouce to mPlaceActor twice. so, we should avoid that case.
+  mPlacementActor = actor;
 
-    mImpl->mRenderer.SetGeometry(geometry);
-    mImpl->mRenderer.SetShader(shader);
-
-    mPlacementActor = actor;
-    if(data->GetLoadingState() != NPatchData::LoadingState::LOADING)
+  NPatchDataPtr data;
+  if(mImpl->mRenderer && mLoader.GetNPatchData(mId, data) && data->GetLoadingState() != NPatchData::LoadingState::LOADING)
+  {
+    // If mAuxiliaryUrl need to be loaded, we should wait it until LoadComplete called.
+    if(!mAuxiliaryUrl.IsValid() || mAuxiliaryResourceStatus != Toolkit::Visual::ResourceStatus::PREPARING)
     {
-      if(RenderingAddOn::Get().IsValid())
-      {
-        RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->GetRenderingMap());
-      }
-
-      ApplyTextureAndUniforms();
-      actor.AddRenderer(mImpl->mRenderer);
-      mPlacementActor.Reset();
-
-      // npatch loaded and ready to display
-      ResourceReady(Toolkit::Visual::ResourceStatus::READY);
+      SetResource();
     }
   }
 }
 
 void NPatchVisual::DoSetOffScene(Actor& actor)
 {
-  if((mId != NPatchData::INVALID_NPATCH_DATA_ID) && mReleasePolicy == Toolkit::ImageVisual::ReleasePolicy::DETACHED)
+  if(mReleasePolicy == Toolkit::ImageVisual::ReleasePolicy::DETACHED)
   {
-    mLoader.Remove(mId, this);
-    mImpl->mResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING;
-    mId                    = NPatchData::INVALID_NPATCH_DATA_ID;
+    if(mId != NPatchData::INVALID_NPATCH_DATA_ID)
+    {
+      mLoader.RequestRemove(mId, this);
+      mImpl->mResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING;
+      mId                    = NPatchData::INVALID_NPATCH_DATA_ID;
+    }
+    if(mAuxiliaryTextureId != TextureManager::INVALID_TEXTURE_ID)
+    {
+      TextureManager& textureManager = mFactoryCache.GetTextureManager();
+      textureManager.RequestRemove(mAuxiliaryTextureId, this);
+      mAuxiliaryTextureId      = TextureManager::INVALID_TEXTURE_ID;
+      mAuxiliaryResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING;
+      mAuxiliaryTextureSet.Reset();
+    }
   }
 
   actor.RemoveRenderer(mImpl->mRenderer);
@@ -316,7 +262,7 @@ void NPatchVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -355,6 +301,9 @@ NPatchVisual::NPatchVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFa
   mImageUrl(),
   mAuxiliaryUrl(),
   mId(NPatchData::INVALID_NPATCH_DATA_ID),
+  mAuxiliaryTextureSet(),
+  mAuxiliaryTextureId(TextureManager::INVALID_TEXTURE_ID),
+  mAuxiliaryResourceStatus(Toolkit::Visual::ResourceStatus::PREPARING),
   mBorderOnly(false),
   mBorder(),
   mAuxiliaryImageAlpha(0.0f),
@@ -365,35 +314,47 @@ NPatchVisual::NPatchVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFa
 
 NPatchVisual::~NPatchVisual()
 {
-  if(Stage::IsInstalled() && (mId != NPatchData::INVALID_NPATCH_DATA_ID) && (mReleasePolicy != Toolkit::ImageVisual::ReleasePolicy::NEVER))
+  if(Stage::IsInstalled())
   {
-    mLoader.Remove(mId, this);
-    mId = NPatchData::INVALID_NPATCH_DATA_ID;
+    if(mReleasePolicy != Toolkit::ImageVisual::ReleasePolicy::NEVER)
+    {
+      if(mId != NPatchData::INVALID_NPATCH_DATA_ID)
+      {
+        mLoader.RequestRemove(mId, this);
+        mId = NPatchData::INVALID_NPATCH_DATA_ID;
+      }
+      if(mAuxiliaryTextureId != TextureManager::INVALID_TEXTURE_ID)
+      {
+        TextureManager& textureManager = mFactoryCache.GetTextureManager();
+
+        textureManager.RequestRemove(mAuxiliaryTextureId, this);
+        mAuxiliaryTextureId = TextureManager::INVALID_TEXTURE_ID;
+        mAuxiliaryTextureSet.Reset();
+      }
+    }
   }
 }
 
 void NPatchVisual::OnInitialize()
 {
   // Get basic geometry and shader
-  Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
-  Shader   shader   = mImageVisualShaderFactory.GetShader(
+  Geometry geometry                        = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
+  auto     imageVisualShaderFeatureBuilder = ImageVisualShaderFeatureBuilder();
+  Shader   shader                          = mImageVisualShaderFactory.GetShader(
     mFactoryCache,
-    TextureAtlas::DISABLED,
-    DefaultTextureWrapMode::APPLY,
-    RoundedCorner::DISABLED,
-    Borderline::DISABLED
-  );
+    imageVisualShaderFeatureBuilder);
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = VisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
 
   //Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 Geometry NPatchVisual::CreateGeometry()
 {
-  Geometry          geometry;
-  const NPatchData* data;
+  Geometry      geometry;
+  NPatchDataPtr data;
   if(mLoader.GetNPatchData(mId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
   {
     if(data->GetStretchPixelsX().Size() == 1 && data->GetStretchPixelsY().Size() == 1)
@@ -424,12 +385,12 @@ Geometry NPatchVisual::CreateGeometry()
       Uint16Pair gridSize(2 * data->GetStretchPixelsX().Size() + 1, 2 * data->GetStretchPixelsY().Size() + 1);
       if(!data->GetRenderingMap())
       {
-        geometry = !mBorderOnly ? CreateGridGeometry(gridSize) : CreateBorderGeometry(gridSize);
+        geometry = !mBorderOnly ? NPatchHelper::CreateGridGeometry(gridSize) : NPatchHelper::CreateBorderGeometry(gridSize);
       }
       else
       {
         uint32_t elementCount[2];
-        geometry = !mBorderOnly ? RenderingAddOn::Get().CreateGeometryGrid(data->GetRenderingMap(), gridSize, elementCount) : CreateBorderGeometry(gridSize);
+        geometry = !mBorderOnly ? RenderingAddOn::Get().CreateGeometryGrid(data->GetRenderingMap(), gridSize, elementCount) : NPatchHelper::CreateBorderGeometry(gridSize);
         if(mImpl->mRenderer)
         {
           RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->GetRenderingMap());
@@ -447,17 +408,17 @@ Geometry NPatchVisual::CreateGeometry()
 
 Shader NPatchVisual::CreateShader()
 {
-  Shader            shader;
-  const NPatchData* data;
+  Shader        shader;
+  NPatchDataPtr data;
   // 0 is either no data (load failed?) or no stretch regions on image
   // for both cases we use the default shader
   NPatchUtility::StretchRanges::SizeType xStretchCount = 0;
   NPatchUtility::StretchRanges::SizeType yStretchCount = 0;
 
-  auto fragmentShader = mAuxiliaryPixelBuffer ? SHADER_NPATCH_VISUAL_MASK_SHADER_FRAG
-                                              : SHADER_NPATCH_VISUAL_SHADER_FRAG;
-  auto shaderType     = mAuxiliaryPixelBuffer ? VisualFactoryCache::NINE_PATCH_MASK_SHADER
-                                              : VisualFactoryCache::NINE_PATCH_SHADER;
+  auto fragmentShader = mAuxiliaryResourceStatus == Toolkit::Visual::ResourceStatus::READY ? SHADER_NPATCH_VISUAL_MASK_SHADER_FRAG
+                                                                                           : SHADER_NPATCH_VISUAL_SHADER_FRAG;
+  auto shaderType     = mAuxiliaryResourceStatus == Toolkit::Visual::ResourceStatus::READY ? VisualFactoryCache::NINE_PATCH_MASK_SHADER
+                                                                                           : VisualFactoryCache::NINE_PATCH_SHADER;
 
   // ask loader for the regions
   if(mLoader.GetNPatchData(mId, data))
@@ -474,19 +435,20 @@ Shader NPatchVisual::CreateShader()
       shader = mFactoryCache.GetShader(shaderType);
       if(DALI_UNLIKELY(!shader))
       {
-        shader = Shader::New(SHADER_NPATCH_VISUAL_3X3_SHADER_VERT, fragmentShader);
-        // Only cache vanilla 9 patch shaders
-        mFactoryCache.SaveShader(shaderType, shader);
+        shader = mFactoryCache.GenerateAndSaveShader(shaderType, SHADER_NPATCH_VISUAL_3X3_SHADER_VERT, fragmentShader);
       }
     }
     else if(xStretchCount > 0 || yStretchCount > 0)
     {
+      std::stringstream shaderName;
+      shaderName << "N_PATCH_" << xStretchCount << "x" << yStretchCount;
+
       std::stringstream vertexShader;
       vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n"
                    << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n"
                    << SHADER_NPATCH_VISUAL_SHADER_VERT;
 
-      shader = Shader::New(vertexShader.str(), fragmentShader);
+      shader = Shader::New(vertexShader.str(), fragmentShader, Dali::Shader::Hint::NONE, shaderName.str());
     }
   }
   else
@@ -513,12 +475,15 @@ Shader NPatchVisual::CreateShader()
     }
     else if(xStretchCount > 0 || yStretchCount > 0)
     {
+      std::stringstream shaderName;
+      shaderName << "N_PATCH_" << xStretchCount << "x" << yStretchCount;
+
       std::stringstream vertexShader;
       vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n"
                    << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n"
                    << SHADER_NPATCH_VISUAL_SHADER_VERT;
 
-      shader = Shader::New(vertexShader.str(), fragmentShader, hints);
+      shader = Shader::New(vertexShader.str(), fragmentShader, hints, shaderName.str());
     }
   }
 
@@ -527,77 +492,47 @@ Shader NPatchVisual::CreateShader()
 
 void NPatchVisual::ApplyTextureAndUniforms()
 {
-  const NPatchData* data;
-  TextureSet        textureSet;
+  NPatchDataPtr data;
+  TextureSet    textureSet;
 
   if(mLoader.GetNPatchData(mId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
   {
     textureSet = data->GetTextures();
+    NPatchHelper::ApplyTextureAndUniforms(mImpl->mRenderer, data.Get());
 
-    if(data->GetStretchPixelsX().Size() == 1 && data->GetStretchPixelsY().Size() == 1)
+    if(mAuxiliaryResourceStatus == Toolkit::Visual::ResourceStatus::READY)
     {
-      //special case for 9 patch
-      Uint16Pair stretchX = data->GetStretchPixelsX()[0];
-      Uint16Pair stretchY = data->GetStretchPixelsY()[0];
-
-      uint16_t stretchWidth  = (stretchX.GetY() >= stretchX.GetX()) ? stretchX.GetY() - stretchX.GetX() : 0;
-      uint16_t stretchHeight = (stretchY.GetY() >= stretchY.GetX()) ? stretchY.GetY() - stretchY.GetX() : 0;
-
-      mImpl->mRenderer.RegisterProperty("uFixed[0]", Vector2::ZERO);
-      mImpl->mRenderer.RegisterProperty("uFixed[1]", Vector2(stretchX.GetX(), stretchY.GetX()));
-      mImpl->mRenderer.RegisterProperty("uFixed[2]", Vector2(data->GetCroppedWidth() - stretchWidth, data->GetCroppedHeight() - stretchHeight));
-      mImpl->mRenderer.RegisterProperty("uStretchTotal", Vector2(stretchWidth, stretchHeight));
-    }
-    else
-    {
-      mImpl->mRenderer.RegisterProperty("uNinePatchFactorsX[0]", Vector2::ZERO);
-      mImpl->mRenderer.RegisterProperty("uNinePatchFactorsY[0]", Vector2::ZERO);
-
-      RegisterStretchProperties(mImpl->mRenderer, "uNinePatchFactorsX", data->GetStretchPixelsX(), data->GetCroppedWidth());
-      RegisterStretchProperties(mImpl->mRenderer, "uNinePatchFactorsY", data->GetStretchPixelsY(), data->GetCroppedHeight());
+      DALI_ASSERT_ALWAYS(mAuxiliaryTextureId != TextureManager::INVALID_TEXTURE_ID);
+      DALI_ASSERT_ALWAYS(mAuxiliaryTextureSet && mAuxiliaryTextureSet.GetTextureCount() > 0u);
+
+      // TODO : This code exist due to the texture cache manager hold TextureSet, not Texture.
+      // If we call textureSet.SetTexture(1, texture) directly, the cached TextureSet also be changed.
+      // We should make pass utc-Dali-VisualFactory.cpp UtcDaliNPatchVisualAuxiliaryImage02().
+      TextureSet tempTextureSet = TextureSet::New();
+      tempTextureSet.SetTexture(1, mAuxiliaryTextureSet.GetTexture(0));
+      tempTextureSet.SetTexture(0, textureSet.GetTexture(0));
+      textureSet = tempTextureSet;
+
+      mImpl->mRenderer.RegisterProperty(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA,
+                                        AUXILIARY_IMAGE_ALPHA_NAME,
+                                        mAuxiliaryImageAlpha);
     }
+    mImpl->mRenderer.SetTextures(textureSet);
   }
   else
   {
     DALI_LOG_ERROR("The N patch image '%s' is not a valid N patch image\n", mImageUrl.GetUrl().c_str());
-    textureSet = TextureSet::New();
-
-    Texture croppedImage = mFactoryCache.GetBrokenVisualImage();
-    textureSet.SetTexture(0u, croppedImage);
-    mImpl->mRenderer.RegisterProperty("uFixed[0]", Vector2::ZERO);
-    mImpl->mRenderer.RegisterProperty("uFixed[1]", Vector2::ZERO);
-    mImpl->mRenderer.RegisterProperty("uFixed[2]", Vector2::ZERO);
-    mImpl->mRenderer.RegisterProperty("uStretchTotal", Vector2(croppedImage.GetWidth(), croppedImage.GetHeight()));
-  }
-
-  if(mAuxiliaryPixelBuffer)
-  {
-    // If the auxiliary image is smaller than the un-stretched NPatch, use CPU resizing to enlarge it to the
-    // same size as the unstretched NPatch. This will give slightly higher quality results than just relying
-    // on GL interpolation alone.
-    if(mAuxiliaryPixelBuffer.GetWidth() < data->GetCroppedWidth() &&
-       mAuxiliaryPixelBuffer.GetHeight() < data->GetCroppedHeight())
-    {
-      mAuxiliaryPixelBuffer.Resize(data->GetCroppedWidth(), data->GetCroppedHeight());
-    }
-
-    // Note, this resets mAuxiliaryPixelBuffer handle
-    auto auxiliaryPixelData = Devel::PixelBuffer::Convert(mAuxiliaryPixelBuffer);
-
-    auto texture = Texture::New(TextureType::TEXTURE_2D,
-                                auxiliaryPixelData.GetPixelFormat(),
-                                auxiliaryPixelData.GetWidth(),
-                                auxiliaryPixelData.GetHeight());
-    texture.Upload(auxiliaryPixelData);
-    textureSet.SetTexture(1, texture);
-    mImpl->mRenderer.RegisterProperty(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA,
-                                      AUXILIARY_IMAGE_ALPHA_NAME,
-                                      mAuxiliaryImageAlpha);
+    Actor   actor     = mPlacementActor.GetHandle();
+    Vector2 imageSize = Vector2::ZERO;
+    if(actor)
+    {
+      imageSize = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+    }
+    mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize, false);
   }
-  mImpl->mRenderer.SetTextures(textureSet);
 
   // Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 Geometry NPatchVisual::GetNinePatchGeometry(VisualFactoryCache::GeometryType subType)
@@ -607,151 +542,20 @@ Geometry NPatchVisual::GetNinePatchGeometry(VisualFactoryCache::GeometryType sub
   {
     if(DALI_LIKELY(VisualFactoryCache::NINE_PATCH_GEOMETRY == subType))
     {
-      geometry = CreateGridGeometry(Uint16Pair(3, 3));
+      geometry = NPatchHelper::CreateGridGeometry(Uint16Pair(3, 3));
     }
     else if(VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY == subType)
     {
-      geometry = CreateBorderGeometry(Uint16Pair(3, 3));
+      geometry = NPatchHelper::CreateBorderGeometry(Uint16Pair(3, 3));
     }
     mFactoryCache.SaveGeometry(subType, geometry);
   }
   return geometry;
 }
 
-Geometry NPatchVisual::CreateGridGeometry(Uint16Pair gridSize)
-{
-  uint16_t gridWidth  = gridSize.GetWidth();
-  uint16_t gridHeight = gridSize.GetHeight();
-
-  // Create vertices
-  Vector<Vector2> vertices;
-  vertices.Reserve((gridWidth + 1) * (gridHeight + 1));
-
-  for(int y = 0; y < gridHeight + 1; ++y)
-  {
-    for(int x = 0; x < gridWidth + 1; ++x)
-    {
-      AddVertex(vertices, x, y);
-    }
-  }
-
-  // Create indices
-  Vector<unsigned short> indices;
-  indices.Reserve(gridWidth * gridHeight * 6);
-
-  unsigned int rowIdx     = 0;
-  unsigned int nextRowIdx = gridWidth + 1;
-  for(int y = 0; y < gridHeight; ++y, ++nextRowIdx, ++rowIdx)
-  {
-    for(int x = 0; x < gridWidth; ++x, ++nextRowIdx, ++rowIdx)
-    {
-      AddQuadIndices(indices, rowIdx, nextRowIdx);
-    }
-  }
-
-  return GenerateGeometry(vertices, indices);
-}
-
-Geometry NPatchVisual::CreateBorderGeometry(Uint16Pair gridSize)
-{
-  uint16_t gridWidth  = gridSize.GetWidth();
-  uint16_t gridHeight = gridSize.GetHeight();
-
-  // Create vertices
-  Vector<Vector2> vertices;
-  vertices.Reserve((gridWidth + 1) * (gridHeight + 1));
-
-  //top
-  int y = 0;
-  for(; y < 2; ++y)
-  {
-    for(int x = 0; x < gridWidth + 1; ++x)
-    {
-      AddVertex(vertices, x, y);
-    }
-  }
-
-  for(; y < gridHeight - 1; ++y)
-  {
-    //left
-    AddVertex(vertices, 0, y);
-    AddVertex(vertices, 1, y);
-
-    //right
-    AddVertex(vertices, gridWidth - 1, y);
-    AddVertex(vertices, gridWidth, y);
-  }
-
-  //bottom
-  for(; y < gridHeight + 1; ++y)
-  {
-    for(int x = 0; x < gridWidth + 1; ++x)
-    {
-      AddVertex(vertices, x, y);
-    }
-  }
-
-  // Create indices
-  Vector<unsigned short> indices;
-  indices.Reserve(gridWidth * gridHeight * 6);
-
-  //top
-  unsigned int rowIdx     = 0;
-  unsigned int nextRowIdx = gridWidth + 1;
-  for(int x = 0; x < gridWidth; ++x, ++nextRowIdx, ++rowIdx)
-  {
-    AddQuadIndices(indices, rowIdx, nextRowIdx);
-  }
-
-  if(gridHeight > 2)
-  {
-    rowIdx     = gridWidth + 1;
-    nextRowIdx = (gridWidth + 1) * 2;
-
-    unsigned increment = gridWidth - 1;
-    if(gridHeight > 3)
-    {
-      increment = 2;
-      //second row left
-      AddQuadIndices(indices, rowIdx, nextRowIdx);
-
-      rowIdx     = gridWidth * 2;
-      nextRowIdx = (gridWidth + 1) * 2 + 2;
-      //second row right
-      AddQuadIndices(indices, rowIdx, nextRowIdx);
-
-      //left and right
-      rowIdx     = nextRowIdx - 2;
-      nextRowIdx = rowIdx + 4;
-      for(int y = 2; y < 2 * (gridHeight - 3); ++y, rowIdx += 2, nextRowIdx += 2)
-      {
-        AddQuadIndices(indices, rowIdx, nextRowIdx);
-      }
-    }
-
-    //second row left
-    AddQuadIndices(indices, rowIdx, nextRowIdx);
-
-    rowIdx += increment;
-    nextRowIdx += gridWidth - 1;
-    //second row right
-    AddQuadIndices(indices, rowIdx, nextRowIdx);
-  }
-
-  //bottom
-  rowIdx     = nextRowIdx - gridWidth + 1;
-  nextRowIdx = rowIdx + gridWidth + 1;
-  for(int x = 0; x < gridWidth; ++x, ++nextRowIdx, ++rowIdx)
-  {
-    AddQuadIndices(indices, rowIdx, nextRowIdx);
-  }
-
-  return GenerateGeometry(vertices, indices);
-}
-
 void NPatchVisual::SetResource()
 {
-  const NPatchData* data;
+  NPatchDataPtr data;
   if(mImpl->mRenderer && mLoader.GetNPatchData(mId, data))
   {
     Geometry geometry = CreateGeometry();
@@ -760,45 +564,80 @@ void NPatchVisual::SetResource()
     mImpl->mRenderer.SetGeometry(geometry);
     mImpl->mRenderer.SetShader(shader);
 
+    if(RenderingAddOn::Get().IsValid())
+    {
+      RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->GetRenderingMap());
+    }
     Actor actor = mPlacementActor.GetHandle();
     if(actor)
     {
       ApplyTextureAndUniforms();
       actor.AddRenderer(mImpl->mRenderer);
       mPlacementActor.Reset();
+    }
 
-      // npatch loaded and ready to display
+    // npatch loaded and ready to display
+    if(data->GetLoadingState() != NPatchData::LoadingState::LOAD_COMPLETE)
+    {
+      ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
+    }
+    else
+    {
       ResourceReady(Toolkit::Visual::ResourceStatus::READY);
     }
   }
 }
 
-void NPatchVisual::UploadComplete(bool loadSuccess, int32_t textureId, TextureSet textureSet, bool useAtlasing, const Vector4& atlasRect, bool preMultiplied)
+void NPatchVisual::LoadComplete(bool loadSuccess, TextureInformation textureInformation)
 {
-  EnablePreMultipliedAlpha(preMultiplied);
-  if(!loadSuccess)
+  if(textureInformation.url.length() > 0) // For the Url.
   {
-    // Image loaded and ready to display
-    ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
+    if(DALI_UNLIKELY(mId == NPatchData::INVALID_NPATCH_DATA_ID))
+    {
+      // Special case when mLoader.Load call LoadComplete function before mId setup.
+      // We can overwrite mId.
+      mId = static_cast<NPatchData::NPatchDataId>(textureInformation.textureId);
+    }
+    if(loadSuccess)
+    {
+      EnablePreMultipliedAlpha(textureInformation.preMultiplied);
+    }
   }
-
-  if(mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid())
+  else // For the AuxiliaryUrl
   {
-    SetResource();
-  }
-}
+    if(DALI_UNLIKELY(mAuxiliaryTextureId == TextureManager::INVALID_TEXTURE_ID))
+    {
+      // Special case when TextureManager.LoadTexture call LoadComplete function before mAuxiliaryTextureId setup.
+      // We can overwrite mAuxiliaryTextureId.
+      mAuxiliaryTextureId = textureInformation.textureId;
+    }
+    if(loadSuccess)
+    {
+      mAuxiliaryTextureSet = textureInformation.textureSet;
+      if(mAuxiliaryTextureSet)
+      {
+        Sampler sampler = Sampler::New();
+        sampler.SetWrapMode(WrapMode::DEFAULT, WrapMode::DEFAULT);
+        mAuxiliaryTextureSet.SetSampler(0u, sampler);
+      }
 
-void NPatchVisual::LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied)
-{
-  if(loadSuccess && url.GetUrl() == mAuxiliaryUrl.GetUrl())
-  {
-    mAuxiliaryPixelBuffer = pixelBuffer;
-    SetResource();
+      mAuxiliaryResourceStatus = Toolkit::Visual::ResourceStatus::READY;
+    }
+    else
+    {
+      mAuxiliaryResourceStatus = Toolkit::Visual::ResourceStatus::FAILED;
+    }
   }
-  else
+
+  // If auxiliaryUrl didn't required OR auxiliaryUrl load done.
+  if(!mAuxiliaryUrl.IsValid() || mAuxiliaryResourceStatus != Toolkit::Visual::ResourceStatus::PREPARING)
   {
-    // Image loaded and ready to display
-    ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
+    NPatchDataPtr data;
+    // and.. If Url loading done.
+    if(mImpl->mRenderer && mLoader.GetNPatchData(mId, data) && data->GetLoadingState() != NPatchData::LoadingState::LOADING)
+    {
+      SetResource();
+    }
   }
 }
 
diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h
index 02db5a4..c94e5b4 100644
--- a/dali-toolkit/internal/visuals/npatch/npatch-visual.h
+++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_N_PATCH_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 #include <dali/public-api/rendering/shader.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/texture-upload-observer.h>
+#include <dali-toolkit/internal/texture-manager/texture-upload-observer.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 #include <dali-toolkit/public-api/visuals/image-visual-properties.h>
@@ -207,33 +207,27 @@ private:
 
 private:
   /**
-   * @copydoc TextureUploadObserver::UploadCompleted
+   * @copydoc TextureUploadObserver::LoadCompleted
    *
    * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready.
    * This callback is the place to add the renderer as it would be called once the loading is finished.
    */
-  void UploadComplete(bool loadSuccess, int32_t textureId, TextureSet textureSet, bool useAtlasing, const Vector4& atlasRect, bool preMultiplied) override;
-
-  /**
-   * @copydoc TextureUploadObserver::LoadComplete
-   *
-   * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready.
-   * This callback is the place to add the renderer as it would be called once the loading is finished.
-   */
-  void LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied) override;
+  void LoadComplete(bool loadSuccess, TextureInformation textureInformation) override;
 
 private:
   WeakHandle<Actor>                         mPlacementActor; ///< Weakhandle to contain Actor during texture loading
   NPatchLoader&                             mLoader;         ///< reference to N patch loader for fast access
   ImageVisualShaderFactory&                 mImageVisualShaderFactory;
-  VisualUrl                                 mImageUrl;             ///< The url to the N patch to load
-  VisualUrl                                 mAuxiliaryUrl;         ///< An auxiliary image that can be displayed on top of the N-Patch
-  NPatchData::NPatchDataId                  mId;                   ///< id of the N patch (from loader/cache)
-  Devel::PixelBuffer                        mAuxiliaryPixelBuffer; ///< pixel buffer of the auxiliary mask image
-  bool                                      mBorderOnly;           ///< if only border is desired
-  Rect<int>                                 mBorder;               ///< The size of the border
-  float                                     mAuxiliaryImageAlpha;  ///< The alpha value for the auxiliary image only
-  Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy;        ///< The release policy to determine when an image should no longer be cached.
+  VisualUrl                                 mImageUrl;                ///< The url to the N patch to load
+  VisualUrl                                 mAuxiliaryUrl;            ///< An auxiliary image that can be displayed on top of the N-Patch
+  NPatchData::NPatchDataId                  mId;                      ///< id of the N patch (from loader/cache)
+  TextureSet                                mAuxiliaryTextureSet;     ///< TextureSet of the auxiliary mask image
+  TextureManager::TextureId                 mAuxiliaryTextureId;      ///< id of the auxiliary mask image (from TextureManager)
+  Toolkit::Visual::ResourceStatus           mAuxiliaryResourceStatus; ///< resource status for auxiliary mask image
+  bool                                      mBorderOnly;              ///< if only border is desired
+  Rect<int>                                 mBorder;                  ///< The size of the border
+  float                                     mAuxiliaryImageAlpha;     ///< The alpha value for the auxiliary image only
+  Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy;           ///< The release policy to determine when an image should no longer be cached.
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
index ae5138e..1afbfcd 100644
--- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
+++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -363,7 +363,7 @@ void PrimitiveVisual::OnSetTransform()
 {
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
@@ -379,13 +379,10 @@ void PrimitiveVisual::OnInitialize()
     CreateShader();
   }
 
-  mImpl->mRenderer = Renderer::New(mGeometry, mShader);
+  mImpl->mRenderer = VisualRenderer::New(mGeometry, mShader);
   mImpl->mRenderer.SetProperty(Renderer::Property::FACE_CULLING_MODE, FaceCullingMode::BACK);
-
-  // Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
-
-  mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty(Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor));
+  mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(mImpl->mMixColor));
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 void PrimitiveVisual::UpdateShaderUniforms()
@@ -406,7 +403,7 @@ void PrimitiveVisual::UpdateShaderUniforms()
 
 void PrimitiveVisual::CreateShader()
 {
-  mShader = Shader::New(SHADER_PRIMITIVE_VISUAL_SHADER_VERT, SHADER_PRIMITIVE_VISUAL_SHADER_FRAG);
+  mShader = Shader::New(SHADER_PRIMITIVE_VISUAL_SHADER_VERT, SHADER_PRIMITIVE_VISUAL_SHADER_FRAG, Shader::Hint::NONE, "PRIMITIVE_VISUAL");
   UpdateShaderUniforms();
 }
 
diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
deleted file mode 100644
index 273f08b..0000000
--- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "svg-rasterize-thread.h"
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/file-loader.h>
-#include <dali/devel-api/adaptor-framework/thread-settings.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-#include <dali/integration-api/debug.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-RasterizingTask::RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height)
-: mSvgVisual(svgRenderer),
-  mVectorRenderer(vectorRenderer),
-  mUrl(url),
-  mDpi(dpi),
-  mWidth(width),
-  mHeight(height),
-  mLoadSuccess(false)
-{
-}
-
-RasterizingTask::~RasterizingTask()
-{
-}
-
-void RasterizingTask::Load()
-{
-  if(!mUrl.IsLocalResource())
-  {
-    Dali::Vector<uint8_t> remoteBuffer;
-    if(!Dali::FileLoader::DownloadFileSynchronously(mUrl.GetUrl(), remoteBuffer))
-    {
-      DALI_LOG_ERROR("RasterizingTask::Load: Failed to download file! [%s]\n", mUrl.GetUrl().c_str());
-      return;
-    }
-
-    remoteBuffer.PushBack('\0');
-
-    if(!mVectorRenderer.Load(remoteBuffer, mDpi))
-    {
-      DALI_LOG_ERROR("RasterizingTask::Load:Failed to load data! [%s]\n", mUrl.GetUrl().c_str());
-      return;
-    }
-
-    mLoadSuccess = true;
-  }
-  else
-  {
-    mLoadSuccess = true;
-  }
-}
-
-void RasterizingTask::Rasterize()
-{
-  if(mWidth <= 0u || mHeight <= 0u)
-  {
-    DALI_LOG_ERROR("RasterizingTask::Rasterize: Size is zero!\n");
-    return;
-  }
-
-  Devel::PixelBuffer pixelBuffer = Devel::PixelBuffer::New(mWidth, mHeight, Dali::Pixel::RGBA8888);
-
-  uint32_t defaultWidth, defaultHeight;
-  mVectorRenderer.GetDefaultSize(defaultWidth, defaultHeight);
-
-  float scaleX = static_cast<float>(mWidth) / static_cast<float>(defaultWidth);
-  float scaleY = static_cast<float>(mHeight) / static_cast<float>(defaultHeight);
-  float scale  = scaleX < scaleY ? scaleX : scaleY;
-
-  if(!mVectorRenderer.Rasterize(pixelBuffer, scale))
-  {
-    DALI_LOG_ERROR("RasterizingTask::Rasterize: Rasterize is failed! [%s]\n", mUrl.GetUrl().c_str());
-    return;
-  }
-
-  mPixelData = Devel::PixelBuffer::Convert(pixelBuffer);
-}
-
-VectorImageRenderer RasterizingTask::GetVectorRenderer() const
-{
-  return mVectorRenderer;
-}
-
-bool RasterizingTask::IsLoaded() const
-{
-  return mLoadSuccess;
-}
-
-SvgVisual* RasterizingTask::GetSvgVisual() const
-{
-  return mSvgVisual.Get();
-}
-
-PixelData RasterizingTask::GetPixelData() const
-{
-  return mPixelData;
-}
-
-SvgRasterizeThread::SvgRasterizeThread()
-: mTrigger(new EventThreadCallback(MakeCallback(this, &SvgRasterizeThread::ApplyRasterizedSVGToSampler))),
-  mLogFactory(Dali::Adaptor::Get().GetLogFactory()),
-  mIsThreadWaiting(false),
-  mProcessorRegistered(false)
-{
-}
-
-SvgRasterizeThread::~SvgRasterizeThread()
-{
-  if(mProcessorRegistered)
-  {
-    Adaptor::Get().UnregisterProcessor(*this);
-  }
-}
-
-void SvgRasterizeThread::TerminateThread(SvgRasterizeThread*& thread)
-{
-  if(thread)
-  {
-    // add an empty task would stop the thread from conditional wait.
-    thread->AddTask(RasterizingTaskPtr());
-    // stop the thread
-    thread->Join();
-    // delete the thread
-    delete thread;
-    thread = NULL;
-  }
-}
-
-void SvgRasterizeThread::AddTask(RasterizingTaskPtr task)
-{
-  bool wasEmpty = false;
-
-  {
-    // Lock while adding task to the queue
-    ConditionalWait::ScopedLock lock(mConditionalWait);
-    wasEmpty = mRasterizeTasks.empty();
-    if(!wasEmpty && task != NULL)
-    {
-      // Remove the tasks with the same renderer.
-      // Older task which waiting to rasterize and apply the svg to the same renderer is expired.
-      for(std::vector<RasterizingTaskPtr>::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it)
-      {
-        if((*it) && (*it)->GetSvgVisual() == task->GetSvgVisual())
-        {
-          mRasterizeTasks.erase(it);
-          break;
-        }
-      }
-    }
-    mRasterizeTasks.push_back(task);
-
-    if(!mProcessorRegistered)
-    {
-      Adaptor::Get().RegisterProcessor(*this);
-      mProcessorRegistered = true;
-    }
-  }
-
-  if(wasEmpty)
-  {
-    // wake up the image loading thread
-    mConditionalWait.Notify();
-  }
-}
-
-RasterizingTaskPtr SvgRasterizeThread::NextCompletedTask()
-{
-  // Lock while popping task out from the queue
-  Mutex::ScopedLock lock(mMutex);
-
-  if(mCompletedTasks.empty())
-  {
-    return RasterizingTaskPtr();
-  }
-
-  std::vector<RasterizingTaskPtr>::iterator next     = mCompletedTasks.begin();
-  RasterizingTaskPtr                        nextTask = *next;
-  mCompletedTasks.erase(next);
-
-  return nextTask;
-}
-
-void SvgRasterizeThread::RemoveTask(SvgVisual* visual)
-{
-  // Lock while remove task from the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-  if(!mRasterizeTasks.empty())
-  {
-    for(std::vector<RasterizingTaskPtr>::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it)
-    {
-      if((*it) && (*it)->GetSvgVisual() == visual)
-      {
-        mRasterizeTasks.erase(it);
-        break;
-      }
-    }
-  }
-
-  UnregisterProcessor();
-}
-
-RasterizingTaskPtr SvgRasterizeThread::NextTaskToProcess()
-{
-  // Lock while popping task out from the queue
-  ConditionalWait::ScopedLock lock(mConditionalWait);
-
-  // conditional wait
-  while(mRasterizeTasks.empty())
-  {
-    mIsThreadWaiting = true;
-    mConditionalWait.Wait(lock);
-  }
-  mIsThreadWaiting = false;
-
-  // pop out the next task from the queue
-  std::vector<RasterizingTaskPtr>::iterator next     = mRasterizeTasks.begin();
-  RasterizingTaskPtr                        nextTask = *next;
-  mRasterizeTasks.erase(next);
-
-  return nextTask;
-}
-
-void SvgRasterizeThread::AddCompletedTask(RasterizingTaskPtr task)
-{
-  // Lock while adding task to the queue
-  Mutex::ScopedLock lock(mMutex);
-  mCompletedTasks.push_back(task);
-
-  // wake up the main thread
-  mTrigger->Trigger();
-}
-
-void SvgRasterizeThread::Run()
-{
-  SetThreadName("SVGThread");
-  mLogFactory.InstallLogFunction();
-
-  while(RasterizingTaskPtr task = NextTaskToProcess())
-  {
-    task->Load();
-    task->Rasterize();
-    AddCompletedTask(task);
-  }
-}
-
-void SvgRasterizeThread::ApplyRasterizedSVGToSampler()
-{
-  while(RasterizingTaskPtr task = NextCompletedTask())
-  {
-    task->GetSvgVisual()->ApplyRasterizedImage(task->GetVectorRenderer(), task->GetPixelData(), task->IsLoaded());
-  }
-
-  UnregisterProcessor();
-}
-
-void SvgRasterizeThread::Process(bool postProcessor)
-{
-  ApplyRasterizedSVGToSampler();
-}
-
-void SvgRasterizeThread::UnregisterProcessor()
-{
-  if(mProcessorRegistered)
-  {
-    if(mRasterizeTasks.empty() && mCompletedTasks.empty())
-    {
-      Adaptor::Get().UnregisterProcessor(*this);
-      mProcessorRegistered = false;
-    }
-  }
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
deleted file mode 100644
index 0204bef..0000000
--- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
+++ /dev/null
@@ -1,234 +0,0 @@
-#ifndef DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
-#define DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
-#include <dali/devel-api/adaptor-framework/vector-image-renderer.h>
-#include <dali/devel-api/threading/conditional-wait.h>
-#include <dali/devel-api/threading/mutex.h>
-#include <dali/devel-api/threading/thread.h>
-#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
-#include <dali/integration-api/processor-interface.h>
-#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/images/pixel-data.h>
-#include <dali/public-api/object/ref-object.h>
-#include <dali/public-api/rendering/texture-set.h>
-#include <memory>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-url.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-class SvgVisual;
-typedef IntrusivePtr<SvgVisual> SvgVisualPtr;
-class RasterizingTask;
-typedef IntrusivePtr<RasterizingTask> RasterizingTaskPtr;
-
-/**
- * The svg rasterizing tasks to be processed in the worker thread.
- *
- * Life cycle of a rasterizing task is as follows:
- * 1. Created by SvgVisual in the main thread
- * 2. Queued in the worked thread waiting to be processed.
- * 3. If this task gets its turn to do the rasterization, it triggers main thread to apply the rasterized image to material then been deleted in main thread call back
- *    Or if this task is been removed ( new image/size set to the visual or actor off stage) before its turn to be processed, it then been deleted in the worker thread.
- */
-class RasterizingTask : public RefObject
-{
-public:
-  /**
-   * Constructor
-   * @param[in] svgRenderer The renderer which the rasterized image to be applied.
-   * @param[in] url The URL to svg resource to use.
-   * @param[in] width The rasterization width.
-   * @param[in] height The rasterization height.
-   */
-  RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height);
-
-  /**
-   * Destructor.
-   */
-  ~RasterizingTask() override;
-
-  /**
-   * Do the rasterization with the mRasterizer.
-   */
-  void Rasterize();
-
-  /**
-   * Get the svg visual
-   */
-  SvgVisual* GetSvgVisual() const;
-
-  /**
-   * Get the rasterization result.
-   * @return The pixel data with the rasterized pixels.
-   */
-  PixelData GetPixelData() const;
-
-  /**
-   * Get the VectorRenderer.
-   * @return VectorRenderer.
-   */
-  VectorImageRenderer GetVectorRenderer() const;
-  /**
-   * Whether the resource is loaded.
-   * @return True if the resource is loaded.
-   */
-  bool IsLoaded() const;
-
-  /**
-   * Load svg file
-   */
-  void Load();
-
-private:
-  // Undefined
-  RasterizingTask(const RasterizingTask& task);
-
-  // Undefined
-  RasterizingTask& operator=(const RasterizingTask& task);
-
-private:
-  SvgVisualPtr        mSvgVisual;
-  VectorImageRenderer mVectorRenderer;
-  VisualUrl           mUrl;
-  PixelData           mPixelData;
-  float               mDpi;
-  unsigned int        mWidth;
-  unsigned int        mHeight;
-  bool                mLoadSuccess;
-};
-
-/**
- * The worker thread for SVG rasterization.
- */
-class SvgRasterizeThread : public Thread, Integration::Processor
-{
-public:
-  /**
-   * Constructor.
-   *
-   * @param[in] trigger The trigger to wake up the main thread.
-   */
-  SvgRasterizeThread();
-
-  /**
-   * Terminate the svg rasterize thread, join and delete.
-   */
-  static void TerminateThread(SvgRasterizeThread*& thread);
-
-  /**
-   * Add a rasterization task into the waiting queue, called by main thread.
-   *
-   * @param[in] task The task added to the queue.
-   */
-  void AddTask(RasterizingTaskPtr task);
-
-  /**
-   * Pop the next task out from the completed queue, called by main thread.
-   *
-   * @return The next task in the completed queue.
-   */
-  RasterizingTaskPtr NextCompletedTask();
-
-  /**
-   * Remove the task with the given visual from the waiting queue, called by main thread.
-   *
-   * Typically called when the actor is put off stage, so the renderer is not needed anymore.
-   *
-   * @param[in] visual The visual pointer.
-   */
-  void RemoveTask(SvgVisual* visual);
-
-  /**
-   * @copydoc Dali::Integration::Processor::Process()
-   */
-  void Process(bool postProcessor) override;
-
-private:
-  /**
-   * Pop the next task out from the queue.
-   *
-   * @return The next task to be processed.
-   */
-  RasterizingTaskPtr NextTaskToProcess();
-
-  /**
-   * Add a task in to the queue
-   *
-   * @param[in] task The task added to the queue.
-   */
-  void AddCompletedTask(RasterizingTaskPtr task);
-
-  /**
-   * Applies the rasterized image to material
-   */
-  void ApplyRasterizedSVGToSampler();
-
-  /**
-   * @brief Unregister a previously registered processor
-   *
-   */
-  void UnregisterProcessor();
-
-protected:
-  /**
-   * Destructor.
-   */
-  ~SvgRasterizeThread() override;
-
-  /**
-   * The entry function of the worker thread.
-   * It fetches task from the Queue, rasterizes the image and apply to the renderer.
-   */
-  void Run() override;
-
-private:
-  // Undefined
-  SvgRasterizeThread(const SvgRasterizeThread& thread);
-
-  // Undefined
-  SvgRasterizeThread& operator=(const SvgRasterizeThread& thread);
-
-private:
-  std::vector<RasterizingTaskPtr> mRasterizeTasks; //The queue of the tasks waiting to rasterize the SVG image
-  std::vector<RasterizingTaskPtr> mCompletedTasks; //The queue of the tasks with the SVG rasterization completed
-
-  ConditionalWait                      mConditionalWait;
-  Dali::Mutex                          mMutex;
-  std::unique_ptr<EventThreadCallback> mTrigger;
-  const Dali::LogFactoryInterface&     mLogFactory;
-  bool                                 mIsThreadWaiting;
-  bool                                 mProcessorRegistered;
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
diff --git a/dali-toolkit/internal/visuals/svg/svg-task.cpp b/dali-toolkit/internal/visuals/svg/svg-task.cpp
new file mode 100644
index 0000000..0a4ff89
--- /dev/null
+++ b/dali-toolkit/internal/visuals/svg/svg-task.cpp
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/visuals/svg/svg-task.h>
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/file-loader.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+
+#ifdef TRACE_ENABLED
+#include <chrono>
+#include <iomanip>
+#include <sstream>
+#include <thread>
+#endif
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_IMAGE_PERFORMANCE_MARKER, false);
+
+#ifdef TRACE_ENABLED
+uint64_t GetNanoseconds()
+{
+  // Get the time of a monotonic clock since its epoch.
+  auto epoch    = std::chrono::steady_clock::now().time_since_epoch();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(epoch);
+  return static_cast<uint64_t>(duration.count());
+}
+#endif
+} // namespace
+
+SvgTask::SvgTask(VectorImageRenderer vectorRenderer, CallbackBase* callback, AsyncTask::PriorityType priorityType)
+: AsyncTask(callback, priorityType),
+  mVectorRenderer(vectorRenderer),
+  mHasSucceeded(false)
+{
+}
+
+PixelData SvgTask::GetPixelData() const
+{
+  return PixelData();
+}
+
+bool SvgTask::HasSucceeded() const
+{
+  return mHasSucceeded;
+}
+
+VectorImageRenderer SvgTask::GetRenderer()
+{
+  return mVectorRenderer;
+}
+
+SvgLoadingTask::SvgLoadingTask(VectorImageRenderer vectorRenderer, const VisualUrl& url, EncodedImageBuffer encodedImageBuffer, float dpi, CallbackBase* callback)
+: SvgTask(vectorRenderer, callback, url.GetProtocolType() == VisualUrl::ProtocolType::REMOTE ? AsyncTask::PriorityType::LOW : AsyncTask::PriorityType::HIGH),
+  mImageUrl(url),
+  mEncodedImageBuffer(encodedImageBuffer),
+  mDpi(dpi)
+{
+}
+
+SvgLoadingTask::~SvgLoadingTask()
+{
+}
+
+void SvgLoadingTask::Process()
+{
+  if(mVectorRenderer.IsLoaded())
+  {
+    // Already loaded
+    mHasSucceeded = true;
+    return;
+  }
+
+#ifdef TRACE_ENABLED
+  uint64_t mStartTimeNanoSceonds = 0;
+  uint64_t mEndTimeNanoSceonds   = 0;
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mStartTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << "[u:" << mImageUrl.GetEllipsedUrl() << "]";
+    // DALI_TRACE_BEGIN(gTraceFilter, "DALI_SVG_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("BEGIN: DALI_SVG_LOADING_TASK %s", oss.str().c_str());
+  }
+#endif
+
+  bool loadFailed = false;
+
+  Dali::Vector<uint8_t> buffer;
+
+  if(mEncodedImageBuffer)
+  {
+    // Copy raw buffer.
+    // TODO : Can't we load svg without copy buffer in future?
+    buffer = mEncodedImageBuffer.GetRawBuffer();
+
+    // We don't need to hold image buffer anymore.
+    mEncodedImageBuffer.Reset();
+  }
+  else if(mImageUrl.IsLocalResource())
+  {
+    if(!Dali::FileLoader::ReadFile(mImageUrl.GetUrl(), buffer))
+    {
+      DALI_LOG_ERROR("Failed to read file! [%s]\n", mImageUrl.GetUrl().c_str());
+      loadFailed = true;
+    }
+  }
+  else
+  {
+    if(!Dali::FileLoader::DownloadFileSynchronously(mImageUrl.GetUrl(), buffer))
+    {
+      DALI_LOG_ERROR("Failed to download file! [%s]\n", mImageUrl.GetUrl().c_str());
+      loadFailed = true;
+    }
+  }
+
+  if(!loadFailed)
+  {
+    buffer.Reserve(buffer.Count() + 1u);
+    buffer.PushBack('\0');
+
+    if(!mVectorRenderer.Load(buffer, mDpi))
+    {
+      DALI_LOG_ERROR("Failed to load data! [%s]\n", mImageUrl.GetUrl().c_str());
+      loadFailed = true;
+    }
+  }
+
+  mHasSucceeded = !loadFailed;
+#ifdef TRACE_ENABLED
+  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
+  {
+    mEndTimeNanoSceonds = GetNanoseconds();
+    std::ostringstream oss;
+    oss << std::fixed << std::setprecision(3);
+    oss << "[";
+    oss << "d:" << static_cast<float>(mEndTimeNanoSceonds - mStartTimeNanoSceonds) / 1000000.0f << "ms ";
+    oss << "s:" << mHasSucceeded << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+    // DALI_TRACE_END(gTraceFilter, "DALI_SVG_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
+    DALI_LOG_RELEASE_INFO("END: DALI_SVG_LOADING_TASK %s", oss.str().c_str());
+  }
+#endif
+}
+
+bool SvgLoadingTask::IsReady()
+{
+  return true;
+}
+
+SvgRasterizingTask::SvgRasterizingTask(VectorImageRenderer vectorRenderer, uint32_t width, uint32_t height, CallbackBase* callback)
+: SvgTask(vectorRenderer, callback),
+  mWidth(width),
+  mHeight(height)
+{
+}
+
+SvgRasterizingTask::~SvgRasterizingTask()
+{
+}
+
+void SvgRasterizingTask::Process()
+{
+  if(!mVectorRenderer.IsLoaded())
+  {
+    DALI_LOG_ERROR("File is not loaded!\n");
+    return;
+  }
+
+#ifdef TRACE_ENABLED
+  uint64_t mStartTimeNanoSceonds = 0;
+  uint64_t mEndTimeNanoSceonds   = 0;
+#endif
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_SVG_RASTERIZE_TASK", [&](std::ostringstream& oss) {
+    mStartTimeNanoSceonds = GetNanoseconds();
+    oss << "[s:" << mWidth << "x" << mHeight << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+  });
+
+  Devel::PixelBuffer pixelBuffer = mVectorRenderer.Rasterize(mWidth, mHeight);
+  if(!pixelBuffer)
+  {
+    DALI_LOG_ERROR("Rasterize is failed!\n");
+    DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_SVG_RASTERIZE_TASK", [&](std::ostringstream& oss) {
+      oss << "[s:" << mWidth << "x" << mHeight << " ";
+      oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+    });
+    return;
+  }
+
+  mPixelData    = Devel::PixelBuffer::Convert(pixelBuffer);
+  mHasSucceeded = true;
+
+  DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_SVG_RASTERIZE_TASK", [&](std::ostringstream& oss) {
+    mEndTimeNanoSceonds = GetNanoseconds();
+    oss << std::fixed << std::setprecision(3);
+    oss << "[";
+    oss << "d:" << static_cast<float>(mEndTimeNanoSceonds - mStartTimeNanoSceonds) / 1000000.0f << "ms ";
+    oss << "s:" << mWidth << "x" << mHeight << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
+  });
+}
+
+bool SvgRasterizingTask::IsReady()
+{
+  return mVectorRenderer.IsLoaded();
+}
+
+PixelData SvgRasterizingTask::GetPixelData() const
+{
+  return mPixelData;
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/svg/svg-task.h b/dali-toolkit/internal/visuals/svg/svg-task.h
new file mode 100644
index 0000000..e23a8ae
--- /dev/null
+++ b/dali-toolkit/internal/visuals/svg/svg-task.h
@@ -0,0 +1,223 @@
+#ifndef DALI_TOOLKIT_SVG_TASK_H
+#define DALI_TOOLKIT_SVG_TASK_H
+
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/vector-image-renderer.h>
+#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/images/pixel-data.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/visual-url.h>
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+class SvgVisual;
+typedef IntrusivePtr<SvgVisual> SvgVisualPtr;
+class SvgTask;
+typedef IntrusivePtr<SvgTask> SvgTaskPtr;
+
+/**
+ * The svg rasterizing tasks to be processed in the worker thread.
+ *
+ * Life cycle of a rasterizing task is as follows:
+ * 1. Created by SvgVisual in the main thread
+ * 2. Queued in the worked thread waiting to be processed.
+ * 3. If this task gets its turn to do the rasterization, it triggers main thread to apply the rasterized image to material then been deleted in main thread call back
+ *    Or if this task is been removed ( new image/size set to the visual or actor off stage) before its turn to be processed, it then been deleted in the worker thread.
+ */
+class SvgTask : public AsyncTask
+{
+public:
+  /**
+   * Constructor
+   * @param[in] vectorRenderer The vector rasterizer.
+   * @param[in] callback The callback that is called when the operation is completed.
+   * @param[in] priorityType The priority of this task.
+   */
+  SvgTask(VectorImageRenderer vectorRenderer, CallbackBase* callback, AsyncTask::PriorityType priorityType = AsyncTask::PriorityType::DEFAULT);
+
+  /**
+   * Destructor.
+   */
+  virtual ~SvgTask() = default;
+
+  /**
+   * Whether the task has succeeded.
+   * @return True if the task has succeeded.
+   */
+  bool HasSucceeded() const;
+
+  /**
+   * @brief Get the task's imageRenderer
+   * @return VectorImageRenderer
+   */
+  VectorImageRenderer GetRenderer();
+
+  /**
+   * Get the rasterization result.
+   * @return The pixel data with the rasterized pixels.
+   */
+  virtual PixelData GetPixelData() const;
+
+private:
+  // Undefined
+  SvgTask(const SvgTask& task) = delete;
+
+  // Undefined
+  SvgTask& operator=(const SvgTask& task) = delete;
+
+protected:
+  VectorImageRenderer mVectorRenderer;
+  bool                mHasSucceeded;
+};
+
+class SvgLoadingTask : public SvgTask
+{
+public:
+  /**
+   * Constructor
+   * @param[in] vectorRenderer The vector rasterizer.
+   * @param[in] url The URL to svg resource to use.
+   * @param[in] encodedImageBuffer The resource buffer if required.
+   * @param[in] dpi The DPI of the screen.
+   * @param[in] callback The callback that is called when the operation is completed.
+   */
+  SvgLoadingTask(VectorImageRenderer vectorRenderer, const VisualUrl& url, EncodedImageBuffer encodedImageBuffer, float dpi, CallbackBase* callback);
+
+  /**
+   * Destructor.
+   */
+  ~SvgLoadingTask() override;
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process();
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady();
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "SvgLoadingTask";
+  }
+
+private:
+  // Undefined
+  SvgLoadingTask(const SvgLoadingTask& task) = delete;
+
+  // Undefined
+  SvgLoadingTask& operator=(const SvgLoadingTask& task) = delete;
+
+private:
+  VisualUrl          mImageUrl;
+  EncodedImageBuffer mEncodedImageBuffer;
+  float              mDpi;
+};
+
+class SvgRasterizingTask : public SvgTask
+{
+public:
+  /**
+   * Constructor
+   * @param[in] vectorRenderer The vector rasterizer.
+   * @param[in] width The rasterization width.
+   * @param[in] height The rasterization height.
+   * @param[in] callback The callback that is called when the operation is completed.
+   */
+  SvgRasterizingTask(VectorImageRenderer vectorRenderer, uint32_t width, uint32_t height, CallbackBase* callback);
+
+  /**
+   * Destructor.
+   */
+  ~SvgRasterizingTask() override;
+
+  /**
+   * Get the rasterization result.
+   * @return The pixel data with the rasterized pixels.
+   */
+  PixelData GetPixelData() const override;
+
+#ifdef TRACE_ENABLED
+  /**
+   * Set the url of rasterizatoin visual. Only for tracing
+   * @param[in] url The url of this visual
+   */
+  void SetUrl(VisualUrl url)
+  {
+    mImageUrl = std::move(url);
+  }
+#endif
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process();
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady();
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "SvgRasterizingTask";
+  }
+
+private:
+  // Undefined
+  SvgRasterizingTask(const SvgRasterizingTask& task) = delete;
+
+  // Undefined
+  SvgRasterizingTask& operator=(const SvgRasterizingTask& task) = delete;
+
+private:
+#ifdef TRACE_ENABLED
+  VisualUrl mImageUrl{};
+#endif
+  PixelData mPixelData;
+  uint32_t  mWidth;
+  uint32_t  mHeight;
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_SVG_TASK_H
diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
index 67fd435..49d62abb 100644
--- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,21 @@
  */
 
 // CLASS HEADER
-#include "svg-visual.h"
+#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 #include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
-#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-feature-builder.h>
+#include <dali-toolkit/internal/visuals/svg/svg-task.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
 #include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/file-loader.h>
 #include <dali/devel-api/common/stage.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
 
 namespace Dali
 {
@@ -39,6 +40,8 @@ namespace Internal
 {
 namespace
 {
+const int CUSTOM_PROPERTY_COUNT(1); // atlas
+
 // property name
 const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
@@ -46,22 +49,20 @@ const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
 SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties)
 {
-  SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl));
-  svgVisual->Load();
+  SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl, ImageDimensions{}));
   svgVisual->SetProperties(properties);
   svgVisual->Initialize();
   return svgVisual;
 }
 
-SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl)
+SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size)
 {
-  SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl));
-  svgVisual->Load();
+  SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl, size));
   svgVisual->Initialize();
   return svgVisual;
 }
 
-SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl)
+SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size)
 : Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG),
   mImageVisualShaderFactory(shaderFactory),
   mAtlasRect(FULL_TEXTURE_RECT),
@@ -70,7 +71,8 @@ SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory&
   mDefaultWidth(0),
   mDefaultHeight(0),
   mPlacementActor(),
-  mVisualSize(Vector2::ZERO),
+  mRasterizedSize(-Vector2::ONE), ///< Let we don't use zero since visual size could be zero after trasnform
+  mDesiredSize(size),
   mLoadFailed(false),
   mAttemptAtlasing(false)
 {
@@ -80,13 +82,63 @@ SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory&
 
 SvgVisual::~SvgVisual()
 {
+  if(Stage::IsInstalled())
+  {
+    if(mLoadingTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mLoadingTask);
+    }
+    if(mRasterizingTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask);
+    }
+
+    if(mImageUrl.IsBufferResource())
+    {
+      TextureManager& textureManager = mFactoryCache.GetTextureManager();
+      textureManager.RemoveEncodedImageBuffer(mImageUrl.GetUrl());
+    }
+  }
 }
 
 void SvgVisual::OnInitialize()
 {
-  Shader shader = GenerateShader();
+  Shader   shader   = GenerateShader();
   Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
-  mImpl->mRenderer  = Renderer::New(geometry, shader);
+  mImpl->mRenderer  = DecoratedVisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
+
+  Vector2 dpi     = Stage::GetCurrent().GetDpi();
+  float   meanDpi = (dpi.height + dpi.width) * 0.5f;
+
+  EncodedImageBuffer encodedImageBuffer;
+
+  if(mImageUrl.IsBufferResource())
+  {
+    // Increase reference count of External Resources :
+    // EncodedImageBuffer.
+    // Reference count will be decreased at destructor of the visual.
+    TextureManager& textureManager = mFactoryCache.GetTextureManager();
+    textureManager.UseExternalResource(mImageUrl.GetUrl());
+
+    encodedImageBuffer = textureManager.GetEncodedImageBuffer(mImageUrl.GetUrl());
+  }
+
+  mLoadingTask = new SvgLoadingTask(mVectorRenderer, mImageUrl, encodedImageBuffer, meanDpi, MakeCallback(this, &SvgVisual::ApplyRasterizedImage));
+
+  if(IsSynchronousLoadingRequired() && (mImageUrl.IsLocalResource() || mImageUrl.IsBufferResource()))
+  {
+    mLoadingTask->Process();
+    if(!mLoadingTask->HasSucceeded())
+    {
+      mLoadFailed = true;
+    }
+    mLoadingTask.Reset(); // We don't need it anymore.
+  }
+  else
+  {
+    Dali::AsyncTaskManager::Get().AddTask(mLoadingTask);
+  }
 }
 
 void SvgVisual::DoSetProperties(const Property::Map& propertyMap)
@@ -107,6 +159,14 @@ void SvgVisual::DoSetProperties(const Property::Map& propertyMap)
     {
       DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second);
     }
+    else if(keyValue.first == IMAGE_DESIRED_WIDTH)
+    {
+      DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_WIDTH, keyValue.second);
+    }
+    else if(keyValue.first == IMAGE_DESIRED_HEIGHT)
+    {
+      DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, keyValue.second);
+    }
   }
 }
 
@@ -139,6 +199,24 @@ void SvgVisual::DoSetProperty(Property::Index index, const Property::Value& valu
       }
       break;
     }
+    case Toolkit::ImageVisual::Property::DESIRED_WIDTH:
+    {
+      int32_t desiredWidth = 0;
+      if(value.Get(desiredWidth))
+      {
+        mDesiredSize.SetWidth(desiredWidth);
+      }
+      break;
+    }
+    case Toolkit::ImageVisual::Property::DESIRED_HEIGHT:
+    {
+      int32_t desiredHeight = 0;
+      if(value.Get(desiredHeight))
+      {
+        mDesiredSize.SetHeight(desiredHeight);
+      }
+      break;
+    }
   }
 }
 
@@ -148,7 +226,7 @@ void SvgVisual::DoSetOnScene(Actor& actor)
   mImpl->mRenderer.SetTextures(textureSet);
 
   // Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 
   // Defer the rasterisation task until we get given a size (by Size Negotiation algorithm)
 
@@ -157,35 +235,66 @@ void SvgVisual::DoSetOnScene(Actor& actor)
 
   if(mLoadFailed)
   {
-    Texture brokenImage = mFactoryCache.GetBrokenVisualImage();
-    textureSet.SetTexture(0u, brokenImage);
-
+    Vector2 imageSize = Vector2::ZERO;
+    imageSize         = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+    mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize);
     actor.AddRenderer(mImpl->mRenderer);
 
     ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
   }
   else
   {
-    // SVG visual needs it's size set before it can be rasterized hence set ResourceReady once on stage
-    ResourceReady(Toolkit::Visual::ResourceStatus::READY);
+    if(mImpl->mEventObserver)
+    {
+      // SVG visual needs it's size set before it can be rasterized hence request relayout once on stage
+      mImpl->mEventObserver->RelayoutRequest(*this);
+    }
   }
 }
 
 void SvgVisual::DoSetOffScene(Actor& actor)
 {
-  mFactoryCache.GetSVGRasterizationThread()->RemoveTask(this);
+  // Remove rasterizing task
+  if(mRasterizingTask)
+  {
+    Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask);
+    mRasterizingTask.Reset();
+  }
 
   actor.RemoveRenderer(mImpl->mRenderer);
   mPlacementActor.Reset();
 
   // Reset the visual size to zero so that when adding the actor back to stage the SVG rasterization is forced
-  mVisualSize = Vector2::ZERO;
+  mRasterizedSize = Vector2::ZERO;
 }
 
 void SvgVisual::GetNaturalSize(Vector2& naturalSize)
 {
-  naturalSize.x = mDefaultWidth;
-  naturalSize.y = mDefaultHeight;
+  if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0)
+  {
+    naturalSize.x = mDesiredSize.GetWidth();
+    naturalSize.y = mDesiredSize.GetHeight();
+  }
+  else if(mLoadFailed && mImpl->mRenderer)
+  {
+    // Load failed, use broken image size
+    auto textureSet = mImpl->mRenderer.GetTextures();
+    if(textureSet && textureSet.GetTextureCount())
+    {
+      auto texture = textureSet.GetTexture(0);
+      if(texture)
+      {
+        naturalSize.x = texture.GetWidth();
+        naturalSize.y = texture.GetHeight();
+        return;
+      }
+    }
+  }
+  else
+  {
+    naturalSize.x = mDefaultWidth;
+    naturalSize.y = mDefaultHeight;
+  }
 }
 
 void SvgVisual::DoCreatePropertyMap(Property::Map& map) const
@@ -198,6 +307,8 @@ void SvgVisual::DoCreatePropertyMap(Property::Map& map) const
     map.Insert(Toolkit::ImageVisual::Property::ATLASING, mAttemptAtlasing);
   }
   map.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired());
+  map.Insert(Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth());
+  map.Insert(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight());
 }
 
 void SvgVisual::DoCreateInstancePropertyMap(Property::Map& map) const
@@ -205,31 +316,12 @@ void SvgVisual::DoCreateInstancePropertyMap(Property::Map& map) const
   // Do nothing
 }
 
-void SvgVisual::Load()
+void SvgVisual::EnablePreMultipliedAlpha(bool preMultiplied)
 {
-  // load remote resource on svg rasterize thread.
-  if(mImageUrl.IsLocalResource())
+  // Make always enable pre multiplied alpha whether preMultiplied value is false.
+  if(!preMultiplied)
   {
-    Dali::Vector<uint8_t> buffer;
-    if(Dali::FileLoader::ReadFile(mImageUrl.GetUrl(), buffer))
-    {
-      buffer.PushBack('\0');
-
-      Vector2 dpi     = Stage::GetCurrent().GetDpi();
-      float   meanDpi = (dpi.height + dpi.width) * 0.5f;
-      if(!mVectorRenderer.Load(buffer, meanDpi))
-      {
-        mLoadFailed = true;
-        DALI_LOG_ERROR("SvgVisual::Load: Failed to load file! [%s]\n", mImageUrl.GetUrl().c_str());
-        return;
-      }
-      mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight);
-    }
-    else
-    {
-      mLoadFailed = true;
-      DALI_LOG_ERROR("SvgVisual::Load: Failed to read file! [%s]\n", mImageUrl.GetUrl().c_str());
-    }
+    DALI_LOG_WARNING("Note : SvgVisual cannot disable PreMultipliedAlpha\n");
   }
 }
 
@@ -237,101 +329,148 @@ void SvgVisual::AddRasterizationTask(const Vector2& size)
 {
   if(mImpl->mRenderer)
   {
+    // Remove previous task
+    if(mRasterizingTask)
+    {
+      Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask);
+      mRasterizingTask.Reset();
+    }
+
     unsigned int width  = static_cast<unsigned int>(size.width);
     unsigned int height = static_cast<unsigned int>(size.height);
 
-    Vector2 dpi     = Stage::GetCurrent().GetDpi();
-    float   meanDpi = (dpi.height + dpi.width) * 0.5f;
+    mRasterizingTask = new SvgRasterizingTask(mVectorRenderer, width, height, MakeCallback(this, &SvgVisual::ApplyRasterizedImage));
+
+#ifdef TRACE_ENABLED
+    reinterpret_cast<SvgRasterizingTask*>(mRasterizingTask.Get())->SetUrl(mImageUrl);
+#endif
 
-    RasterizingTaskPtr newTask = new RasterizingTask(this, mVectorRenderer, mImageUrl, meanDpi, width, height);
     if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource())
     {
-      newTask->Load();
-      newTask->Rasterize();
-      ApplyRasterizedImage(newTask->GetVectorRenderer(), newTask->GetPixelData(), newTask->IsLoaded());
+      mRasterizingTask->Process();
+      ApplyRasterizedImage(mRasterizingTask);
+      mRasterizingTask.Reset(); // We don't need it anymore.
     }
     else
     {
-      mFactoryCache.GetSVGRasterizationThread()->AddTask(newTask);
+      Dali::AsyncTaskManager::Get().AddTask(mRasterizingTask);
     }
   }
 }
 
-void SvgVisual::ApplyRasterizedImage(VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded)
+void SvgVisual::ApplyRasterizedImage(SvgTaskPtr task)
 {
-  if(isLoaded && rasterizedPixelData && IsOnScene())
+  SvgVisualPtr self = this; // Keep reference until this API finished
+
+  if(task->HasSucceeded())
   {
-    TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
-    if(mImpl->mFlags & Impl::IS_ATLASING_APPLIED)
+    PixelData rasterizedPixelData = task->GetPixelData();
+    if(mDefaultWidth == 0 || mDefaultHeight == 0)
     {
-      mFactoryCache.GetAtlasManager()->Remove(currentTextureSet, mAtlasRect);
+      task->GetRenderer().GetDefaultSize(mDefaultWidth, mDefaultHeight);
     }
 
-    TextureSet textureSet;
+    // We don't need to keep tasks anymore. reset now.
+    if(task == mLoadingTask)
+    {
+      mLoadingTask.Reset();
+    }
+    if(task == mRasterizingTask)
+    {
+      mRasterizingTask.Reset();
+    }
 
-    if(mAttemptAtlasing && !mImpl->mCustomShader)
+    // Rasterization success
+    if(rasterizedPixelData && IsOnScene())
     {
-      Vector4 atlasRect;
-      textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData);
-      if(textureSet) // atlasing
+      mRasterizedSize.x = static_cast<float>(rasterizedPixelData.GetWidth());
+      mRasterizedSize.y = static_cast<float>(rasterizedPixelData.GetHeight());
+
+      TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
+      if(mImpl->mFlags & Impl::IS_ATLASING_APPLIED)
       {
-        if(textureSet != currentTextureSet)
-        {
-          mImpl->mRenderer.SetTextures(textureSet);
-        }
-        mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, atlasRect);
-        mAtlasRect = atlasRect;
-        mImpl->mFlags |= Impl::IS_ATLASING_APPLIED;
+        mFactoryCache.GetAtlasManager()->Remove(currentTextureSet, mAtlasRect);
       }
-    }
 
-    if(!textureSet) // no atlasing - mAttemptAtlasing is false or adding to atlas is failed
-    {
-      Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight());
-      texture.Upload(rasterizedPixelData);
-      mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
+      TextureSet textureSet;
 
-      if(mAtlasRect == FULL_TEXTURE_RECT)
+      if(mAttemptAtlasing && !mImpl->mCustomShader)
       {
-        textureSet = currentTextureSet;
+        Vector4 atlasRect;
+        textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData);
+        if(textureSet) // atlasing
+        {
+          if(textureSet != currentTextureSet)
+          {
+            mImpl->mRenderer.SetTextures(textureSet);
+          }
+          mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, atlasRect);
+          mAtlasRect = atlasRect;
+          mImpl->mFlags |= Impl::IS_ATLASING_APPLIED;
+        }
       }
-      else
+
+      if(!textureSet) // no atlasing - mAttemptAtlasing is false or adding to atlas is failed
       {
-        textureSet = TextureSet::New();
-        mImpl->mRenderer.SetTextures(textureSet);
+        Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight());
+        texture.Upload(rasterizedPixelData);
+        mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
 
-        mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT);
-        mAtlasRect = FULL_TEXTURE_RECT;
+        if(mAtlasRect == FULL_TEXTURE_RECT)
+        {
+          textureSet = currentTextureSet;
+        }
+        else
+        {
+          textureSet = TextureSet::New();
+          mImpl->mRenderer.SetTextures(textureSet);
+
+          mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT);
+          mAtlasRect = FULL_TEXTURE_RECT;
+        }
+
+        if(textureSet)
+        {
+          textureSet.SetTexture(0, texture);
+        }
       }
 
-      if(textureSet)
+      // Rasterized pixels are uploaded to texture. If weak handle is holding a placement actor, it is the time to add the renderer to actor.
+      Actor actor = mPlacementActor.GetHandle();
+      if(actor)
       {
-        textureSet.SetTexture(0, texture);
+        actor.AddRenderer(mImpl->mRenderer);
+        // reset the weak handle so that the renderer only get added to actor once
+        mPlacementActor.Reset();
       }
+
+      // Svg loaded and ready to display
+      ResourceReady(Toolkit::Visual::ResourceStatus::READY);
     }
+  }
+  else if(!mLoadFailed)
+  {
+    mLoadFailed = true;
 
-    // Rasterized pixels are uploaded to texture. If weak handle is holding a placement actor, it is the time to add the renderer to actor.
-    Actor actor = mPlacementActor.GetHandle();
-    if(actor)
+    // Remove rasterizing task if we requested before.
+    if(mRasterizingTask)
     {
-      actor.AddRenderer(mImpl->mRenderer);
-      // reset the weak handle so that the renderer only get added to actor once
-      mPlacementActor.Reset();
+      Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask);
+      mRasterizingTask.Reset();
+    }
+
+    // We don't need to keep tasks anymore. reset now.
+    if(task == mLoadingTask)
+    {
+      mLoadingTask.Reset();
     }
 
-    // Svg loaded and ready to display
-    ResourceReady(Toolkit::Visual::ResourceStatus::READY);
-  }
-  else if(!isLoaded || !rasterizedPixelData)
-  {
     Actor actor = mPlacementActor.GetHandle();
     if(actor)
     {
-      TextureSet textureSet = mImpl->mRenderer.GetTextures();
-
-      Texture brokenImage = mFactoryCache.GetBrokenVisualImage();
-      textureSet.SetTexture(0u, brokenImage);
-
+      Vector2 imageSize = Vector2::ZERO;
+      imageSize         = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+      mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize);
       actor.AddRenderer(mImpl->mRenderer);
     }
 
@@ -341,29 +480,33 @@ void SvgVisual::ApplyRasterizedImage(VectorImageRenderer vectorRenderer, PixelDa
 
 void SvgVisual::OnSetTransform()
 {
-  Vector2 visualSize = mImpl->mTransform.GetVisualSize(mImpl->mControlSize);
-
   if(IsOnScene() && !mLoadFailed)
   {
-    if(visualSize != mVisualSize)
+    Vector2 size;
+    if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0)
+    {
+      // Use desired size
+      size = Vector2(mDesiredSize.GetWidth(), mDesiredSize.GetHeight());
+    }
+    else
+    {
+      // Use visual size
+      size = mImpl->mTransform.GetVisualSize(mImpl->mControlSize);
+    }
+
+    if(size != mRasterizedSize || mDefaultWidth == 0 || mDefaultHeight == 0)
     {
-      AddRasterizationTask(visualSize);
-      mVisualSize = visualSize;
+      mRasterizedSize = size;
+      AddRasterizationTask(size);
     }
   }
 
   if(mImpl->mRenderer)
   {
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
-bool SvgVisual::IsResourceReady() const
-{
-  return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ||
-          mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED);
-}
-
 void SvgVisual::UpdateShader()
 {
   if(mImpl->mRenderer)
@@ -380,11 +523,10 @@ Shader SvgVisual::GenerateShader() const
   {
     shader = mImageVisualShaderFactory.GetShader(
       mFactoryCache,
-      mAttemptAtlasing ? TextureAtlas::ENABLED : TextureAtlas::DISABLED,
-      DefaultTextureWrapMode::APPLY,
-      IsRoundedCornerRequired() ? RoundedCorner::ENABLED : RoundedCorner::DISABLED,
-      IsBorderlineRequired() ? Borderline::ENABLED : Borderline::DISABLED
-    );
+      ImageVisualShaderFeatureBuilder()
+        .EnableTextureAtlas(mAttemptAtlasing)
+        .EnableRoundedCorner(IsRoundedCornerRequired())
+        .EnableBorderline(IsBorderlineRequired()));
   }
   else
   {
diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h
index 66de43c..faf8a22 100644
--- a/dali-toolkit/internal/visuals/svg/svg-visual.h
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
+#include <dali-toolkit/internal/visuals/svg/svg-task.h>
 
 namespace Dali
 {
@@ -72,9 +73,10 @@ public:
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    * @param[in] shaderFactory The ImageVisualShaderFactory object
    * @param[in] imageUrl The URL to svg resource to use
+   * @param[in] size The width and height of the rasterized buffer. The visual size will be used if these are 0.
    * @return A smart-pointer to the newly allocated visual.
    */
-  static SvgVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
+  static SvgVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size = ImageDimensions());
 
 public: // from Visual
   /**
@@ -92,6 +94,11 @@ public: // from Visual
    */
   void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
+  /**
+   * @copydoc Visual::Base::EnablePreMultipliedAlpha
+   */
+  void EnablePreMultipliedAlpha(bool preMultiplied) override;
+
 protected:
   /**
    * @brief Constructor.
@@ -99,8 +106,9 @@ protected:
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    * @param[in] shaderFactory The ImageVisualShaderFactory object
    * @param[in] imageUrl The URL to svg resource to use
+   * @param[in] size The width and height of the rasterized buffer. The visual size will be used if these are 0.
    */
-  SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
+  SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size);
 
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -133,11 +141,6 @@ protected:
   void OnSetTransform() override;
 
   /**
-   * @copydoc Visual::Base::IsResourceReady
-   */
-  bool IsResourceReady() const override;
-
-  /**
    * @copydoc Visual::Base::UpdateShader
    */
   void UpdateShader() override;
@@ -151,19 +154,12 @@ public:
   /**
    * @bried Apply the rasterized image to the visual.
    *
-   * @param[in] vectorImage The data of vector image.
-   * @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
-   * @param[in] bool Whether the resource is loaded
+   * @param[in] task SvgTaskPtr
    */
-  void ApplyRasterizedImage(VectorImageRenderer vectorImage, PixelData rasterizedPixelData, bool isLoaded);
+  void ApplyRasterizedImage(SvgTaskPtr task);
 
 private:
   /**
-   * @brief Load the SVG Image from the set URL.
-   */
-  void Load();
-
-  /**
    * @bried Rasterize the svg with the given size, and add it to the visual.
    *
    * @param[in] size The target size of the SVG rasterization.
@@ -191,7 +187,10 @@ private:
   uint32_t                  mDefaultWidth;
   uint32_t                  mDefaultHeight;
   WeakHandle<Actor>         mPlacementActor;
-  Vector2                   mVisualSize;
+  Vector2                   mRasterizedSize;
+  Dali::ImageDimensions     mDesiredSize{};
+  SvgTaskPtr                mLoadingTask;
+  SvgTaskPtr                mRasterizingTask;
   bool                      mLoadFailed;
   bool                      mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
 };
diff --git a/dali-toolkit/internal/visuals/text-visual-shader-factory.cpp b/dali-toolkit/internal/visuals/text-visual-shader-factory.cpp
new file mode 100644
index 0000000..365de2f
--- /dev/null
+++ b/dali-toolkit/internal/visuals/text-visual-shader-factory.cpp
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/internal/visuals/text-visual-shader-factory.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali/integration-api/debug.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+namespace
+{
+// enum of required list when we select shader
+enum class TextVisualRequireFlag : uint32_t
+{
+  DEFAULT     = 0,
+  STYLES      = 1 << 0,
+  OVERLAY     = 1 << 1,
+  EMOJI       = 1 << 2,
+  MULTI_COLOR = 1 << 3,
+};
+
+const VisualFactoryCache::ShaderType SHADER_TYPE_TABLE[] =
+  {
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT,
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE,
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_OVERLAY,
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_OVERLAY,
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_EMOJI,
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI,
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_OVERLAY_AND_EMOJI,
+    VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_OVERLAY_AND_EMOJI,
+    VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT,
+    VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
+    VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT_WITH_OVERLAY,
+    VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE_AND_OVERLAY,
+};
+
+static constexpr auto      SHADER_TYPE_COUNT = 1u;
+constexpr std::string_view VertexPredefines[SHADER_TYPE_COUNT]{
+  "", // VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT
+};
+constexpr std::string_view FragmentPredefines[SHADER_TYPE_COUNT]{
+  "", // VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT
+};
+constexpr VisualFactoryCache::ShaderType ShaderTypePredefines[SHADER_TYPE_COUNT]{
+  VisualFactoryCache::ShaderType::TEXT_SHADER_SINGLE_COLOR_TEXT,
+};
+
+} // unnamed namespace
+
+namespace TextVisualShaderFeature
+{
+FeatureBuilder& FeatureBuilder::EnableMultiColor(bool enableMultiColor)
+{
+  mTextMultiColor = enableMultiColor ? TextMultiColor::MULTI_COLOR_TEXT : TextMultiColor::SINGLE_COLOR_TEXT;
+  return *this;
+}
+FeatureBuilder& FeatureBuilder::EnableEmoji(bool enableEmoji)
+{
+  mTextEmoji = enableEmoji ? TextEmoji::HAS_EMOJI : TextEmoji::NO_EMOJI;
+  return *this;
+}
+FeatureBuilder& FeatureBuilder::EnableStyle(bool enableStyle)
+{
+  mTextStyle = enableStyle ? TextStyle::HAS_STYLES : TextStyle::NO_STYLES;
+  return *this;
+}
+FeatureBuilder& FeatureBuilder::EnableOverlay(bool enableOverlay)
+{
+  mTextOverlay = enableOverlay ? TextOverlay::HAS_OVERLAY : TextOverlay::NO_OVERLAY;
+  return *this;
+}
+} // namespace TextVisualShaderFeature
+
+TextVisualShaderFactory::TextVisualShaderFactory()
+{
+}
+
+TextVisualShaderFactory::~TextVisualShaderFactory()
+{
+}
+
+Shader TextVisualShaderFactory::GetShader(VisualFactoryCache& factoryCache, const TextVisualShaderFeature::FeatureBuilder& featureBuilder)
+{
+  Shader                         shader;
+  uint32_t                       shaderTypeFlag = static_cast<uint32_t>(TextVisualRequireFlag::DEFAULT);
+  VisualFactoryCache::ShaderType shaderType     = VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT;
+
+  const auto& multiColor = featureBuilder.mTextMultiColor;
+  const auto& emoji      = featureBuilder.mTextEmoji;
+  const auto& style      = featureBuilder.mTextStyle;
+  const auto& overlay    = featureBuilder.mTextOverlay;
+
+  if(style == TextVisualShaderFeature::TextStyle::HAS_STYLES)
+  {
+    shaderTypeFlag |= static_cast<uint32_t>(TextVisualRequireFlag::STYLES);
+  }
+  if(overlay == TextVisualShaderFeature::TextOverlay::HAS_OVERLAY)
+  {
+    shaderTypeFlag |= static_cast<uint32_t>(TextVisualRequireFlag::OVERLAY);
+  }
+  // multi color can also render emoji. If multi color text, dont consider emoji
+  if(multiColor != TextVisualShaderFeature::TextMultiColor::MULTI_COLOR_TEXT && emoji == TextVisualShaderFeature::TextEmoji::HAS_EMOJI)
+  {
+    shaderTypeFlag |= static_cast<uint32_t>(TextVisualRequireFlag::EMOJI);
+  }
+  if(multiColor == TextVisualShaderFeature::TextMultiColor::MULTI_COLOR_TEXT)
+  {
+    shaderTypeFlag |= static_cast<uint32_t>(TextVisualRequireFlag::MULTI_COLOR);
+  }
+
+  shaderType = SHADER_TYPE_TABLE[shaderTypeFlag];
+  shader     = factoryCache.GetShader(shaderType);
+
+  if(!shader)
+  {
+    std::string vertexShaderPrefixList;
+    std::string fragmentShaderPrefixList;
+
+    if(style == TextVisualShaderFeature::TextStyle::HAS_STYLES)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_STYLE\n";
+    }
+    if(overlay == TextVisualShaderFeature::TextOverlay::HAS_OVERLAY)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_OVERLAY\n";
+    }
+    // multi color can also render emoji. If multi color text, dont consider emoji
+    if(multiColor != TextVisualShaderFeature::TextMultiColor::MULTI_COLOR_TEXT && emoji == TextVisualShaderFeature::TextEmoji::HAS_EMOJI)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_EMOJI\n";
+    }
+    if(multiColor == TextVisualShaderFeature::TextMultiColor::MULTI_COLOR_TEXT)
+    {
+      fragmentShaderPrefixList += "#define IS_REQUIRED_MULTI_COLOR\n";
+    }
+
+    std::string vertexShader   = std::string(Dali::Shader::GetVertexShaderPrefix() + vertexShaderPrefixList + SHADER_TEXT_VISUAL_SHADER_VERT.data());
+    std::string fragmentShader = std::string(Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderPrefixList + SHADER_TEXT_VISUAL_SHADER_FRAG.data());
+
+    shader = factoryCache.GenerateAndSaveShader(shaderType, vertexShader, fragmentShader);
+  }
+  return shader;
+}
+
+void TextVisualShaderFactory::GetPreCompiledShader(RawShaderData& shaders)
+{
+  std::vector<std::string_view> vertexPrefix;
+  std::vector<std::string_view> fragmentPrefix;
+  std::vector<std::string_view> shaderName;
+  int                           shaderCount = 0;
+  for(uint32_t i = 0; i < SHADER_TYPE_COUNT; ++i)
+  {
+    vertexPrefix.push_back(VertexPredefines[i]);
+    fragmentPrefix.push_back(FragmentPredefines[i]);
+    shaderName.push_back(Scripting::GetLinearEnumerationName<VisualFactoryCache::ShaderType>(ShaderTypePredefines[i], VISUAL_SHADER_TYPE_TABLE, VISUAL_SHADER_TYPE_TABLE_COUNT));
+    shaderCount++;
+  }
+
+  shaders.vertexPrefix   = vertexPrefix;
+  shaders.fragmentPrefix = fragmentPrefix;
+  shaders.shaderName     = shaderName;
+  shaders.vertexShader   = SHADER_TEXT_VISUAL_SHADER_VERT;
+  shaders.fragmentShader = SHADER_TEXT_VISUAL_SHADER_FRAG;
+  shaders.shaderCount    = shaderCount;
+}
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/text-visual-shader-factory.h b/dali-toolkit/internal/visuals/text-visual-shader-factory.h
new file mode 100644
index 0000000..ba4f606
--- /dev/null
+++ b/dali-toolkit/internal/visuals/text-visual-shader-factory.h
@@ -0,0 +1,178 @@
+#ifndef DALI_TOOLKIT_TEXT_VISUAL_SHADER_FACTORY_H
+#define DALI_TOOLKIT_TEXT_VISUAL_SHADER_FACTORY_H
+
+/*
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <string_view>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
+/**
+ * TextVisualShaderFeature contains feature lists what text visual shader need to know.
+ */
+namespace TextVisualShaderFeature
+{
+namespace TextMultiColor
+{
+/**
+ * @brief Whether text contains single color or not.
+ */
+enum Type
+{
+  SINGLE_COLOR_TEXT = 0, ///< The text contains single color only.
+  MULTI_COLOR_TEXT       ///< The text contains multiple colorｓ.
+};
+} // namespace TextMultiColor
+
+namespace TextEmoji
+{
+/**
+ * @brief Whether text contains emoji or not.
+ */
+enum Type
+{
+  NO_EMOJI = 0, ///< The text contains no emoji.
+  HAS_EMOJI     ///< The text contains emoji.
+};
+} // namespace TextEmoji
+
+namespace TextStyle
+{
+/**
+ * @brief Whether text contains styles (like shadow or background color) or not.
+ */
+enum Type
+{
+  NO_STYLES = 0, ///< The text contains contains no styles.
+  HAS_STYLES     ///< The text contains contains styles.
+};
+} // namespace TextStyle
+
+namespace TextOverlay
+{
+/**
+ * @brief Whether text contains overlay styles (like markdown) or not.
+ */
+enum Type
+{
+  NO_OVERLAY = 0, ///< The text contains contains no overlay.
+  HAS_OVERLAY     ///< The text contains contains overlay.
+};
+} // namespace TextOverlay
+
+/**
+ * @brief Collection of current text visual feature.
+ */
+struct FeatureBuilder
+{
+  FeatureBuilder()
+  : mTextMultiColor(TextMultiColor::SINGLE_COLOR_TEXT),
+    mTextEmoji(TextEmoji::NO_EMOJI),
+    mTextStyle(TextStyle::NO_STYLES),
+    mTextOverlay(TextOverlay::NO_OVERLAY)
+  {
+  }
+
+  FeatureBuilder& EnableMultiColor(bool enableMultiColor);
+  FeatureBuilder& EnableEmoji(bool enableEmoji);
+  FeatureBuilder& EnableStyle(bool enableStyle);
+  FeatureBuilder& EnableOverlay(bool enableOverlay);
+
+  bool IsEnabledMultiColor() const
+  {
+    return mTextMultiColor == TextMultiColor::MULTI_COLOR_TEXT;
+  }
+  bool IsEnabledEmoji() const
+  {
+    return mTextEmoji == TextEmoji::HAS_EMOJI;
+  }
+  bool IsEnabledStyle() const
+  {
+    return mTextStyle == TextStyle::HAS_STYLES;
+  }
+  bool IsEnabledOverlay() const
+  {
+    return mTextOverlay == TextOverlay::HAS_OVERLAY;
+  }
+
+  TextMultiColor::Type mTextMultiColor : 2; ///< Whether text has multiple color, or not. default as TextMultiColor::SINGLE_COLOR_TEXT
+  TextEmoji::Type      mTextEmoji : 2;      ///< Whether text has emoji, or not. default as TextEmoji::NO_EMOJI
+  TextStyle::Type      mTextStyle : 2;      ///< Whether text has style, or not. default as TextStyle::NO_STYLES
+  TextOverlay::Type    mTextOverlay : 2;    ///< Whether text has overlay style, or not. default as TextOverlay::NO_OVERLAY
+};
+
+} // namespace TextVisualShaderFeature
+
+/**
+ * TextVisualShaderFactory is an object that provides and shares shaders for text visuals
+ */
+class TextVisualShaderFactory
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  TextVisualShaderFactory();
+
+  /**
+   * @brief Destructor
+   */
+  ~TextVisualShaderFactory();
+
+  /**
+   * @brief Get the standard text rendering shader.
+   * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+   * @param[in] featureBuilder Collection of current text shader's features
+   * @return The standard text rendering shader with features.
+   */
+  Shader GetShader(VisualFactoryCache& factoryCache, const TextVisualShaderFeature::FeatureBuilder& featureBuilder);
+
+  /**
+   * @brief Get the default shader source.
+   * @param[in] shaders shaderList for precompile
+   */
+  void GetPreCompiledShader(RawShaderData& shaders);
+
+protected:
+  /**
+   * Undefined copy constructor.
+   */
+  TextVisualShaderFactory(const TextVisualShaderFactory&);
+
+  /**
+   * Undefined assignment operator.
+   */
+  TextVisualShaderFactory& operator=(const TextVisualShaderFactory& rhs);
+
+private:
+};
+
+} // namespace Internal
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_VISUAL_SHADER_FACTORY_H
diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp
index 19ecb5c..33e2c41 100644
--- a/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/image-loading.h>
-#include <dali/devel-api/images/pixel-data-devel.h>
 #include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali/devel-api/rendering/texture-devel.h>
 #include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
-#include <dali/public-api/animation/constraints.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
 #include <string.h>
 
 // INTERNAL HEADER
@@ -50,7 +51,9 @@ namespace Internal
 {
 namespace
 {
-const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_TEXT_PERFORMANCE_MARKER, false);
+
+const int CUSTOM_PROPERTY_COUNT(2); // uTextColorAnimatable, uHasMultipleTextColors
 
 /**
  * Return Property index for the given string key
@@ -146,9 +149,9 @@ void OpacityConstraint(float& current, const PropertyInputContainer& inputs)
 
 } // unnamed namespace
 
-TextVisualPtr TextVisual::New(VisualFactoryCache& factoryCache, const Property::Map& properties)
+TextVisualPtr TextVisual::New(VisualFactoryCache& factoryCache, TextVisualShaderFactory& shaderFactory, const Property::Map& properties)
 {
-  TextVisualPtr textVisualPtr(new TextVisual(factoryCache));
+  TextVisualPtr textVisualPtr(new TextVisual(factoryCache, shaderFactory));
   textVisualPtr->SetProperties(properties);
   textVisualPtr->Initialize();
   return textVisualPtr;
@@ -224,6 +227,9 @@ void TextVisual::DoCreatePropertyMap(Property::Map& map) const
 
   GetBackgroundProperties(mController, value, Text::EffectStyle::DEFAULT);
   map.Insert(Toolkit::DevelTextVisual::Property::BACKGROUND, value);
+
+  GetStrikethroughProperties(mController, value, Text::EffectStyle::DEFAULT);
+  map.Insert(Toolkit::DevelTextVisual::Property::STRIKETHROUGH, value);
 }
 
 void TextVisual::DoCreateInstancePropertyMap(Property::Map& map) const
@@ -235,13 +241,28 @@ void TextVisual::DoCreateInstancePropertyMap(Property::Map& map) const
   map.Insert(Toolkit::TextVisual::Property::TEXT, text);
 }
 
-TextVisual::TextVisual(VisualFactoryCache& factoryCache)
+void TextVisual::EnablePreMultipliedAlpha(bool preMultiplied)
+{
+  // Make always enable pre multiplied alpha whether preMultiplied value is false.
+  if(!preMultiplied)
+  {
+    DALI_LOG_WARNING("Note : TextVisual cannot disable PreMultipliedAlpha\n");
+  }
+}
+
+TextVisual::TextVisual(VisualFactoryCache& factoryCache, TextVisualShaderFactory& shaderFactory)
 : Visual::Base(factoryCache, Visual::FittingMode::FIT_KEEP_ASPECT_RATIO, Toolkit::Visual::TEXT),
   mController(Text::Controller::New()),
   mTypesetter(Text::Typesetter::New(mController->GetTextModel())),
+  mTextVisualShaderFactory(shaderFactory),
+  mTextShaderFeatureCache(),
+  mHasMultipleTextColorsIndex(Property::INVALID_INDEX),
   mAnimatableTextColorPropertyIndex(Property::INVALID_INDEX),
+  mTextColorAnimatableIndex(Property::INVALID_INDEX),
   mRendererUpdateNeeded(false)
 {
+  // Enable the pre-multiplied alpha to improve the text quality
+  mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
 }
 
 TextVisual::~TextVisual()
@@ -251,9 +272,11 @@ TextVisual::~TextVisual()
 void TextVisual::OnInitialize()
 {
   Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
-  Shader   shader   = GetTextShader(mFactoryCache, TextType::SINGLE_COLOR_TEXT, TextType::NO_EMOJI, TextType::NO_STYLES);
+  Shader   shader   = GetTextShader(mFactoryCache, TextVisualShaderFeature::FeatureBuilder());
 
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = VisualRenderer::New(geometry, shader);
+  mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
+  mHasMultipleTextColorsIndex = mImpl->mRenderer.RegisterUniqueProperty("uHasMultipleTextColors", static_cast<float>(false));
 }
 
 void TextVisual::DoSetProperties(const Property::Map& propertyMap)
@@ -288,33 +311,42 @@ void TextVisual::DoSetOnScene(Actor& actor)
 
   mImpl->mRenderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, Toolkit::DepthIndex::CONTENT);
 
-  // Enable the pre-multiplied alpha to improve the text quality
-  EnablePreMultipliedAlpha(true);
-
-  const Vector4&        defaultColor         = mController->GetTextModel()->GetDefaultColor();
-  Dali::Property::Index shaderTextColorIndex = mImpl->mRenderer.RegisterProperty("uTextColorAnimatable", defaultColor);
+  const Vector4& defaultColor = mController->GetTextModel()->GetDefaultColor();
+  if(mTextColorAnimatableIndex == Property::INVALID_INDEX)
+  {
+    mTextColorAnimatableIndex = mImpl->mRenderer.RegisterUniqueProperty("uTextColorAnimatable", defaultColor);
+  }
+  else
+  {
+    mImpl->mRenderer.SetProperty(mTextColorAnimatableIndex, defaultColor);
+  }
 
   if(mAnimatableTextColorPropertyIndex != Property::INVALID_INDEX)
   {
     // Create constraint for the animatable text's color Property with uTextColorAnimatable in the renderer.
-    if(shaderTextColorIndex != Property::INVALID_INDEX)
+    if(mTextColorAnimatableIndex != Property::INVALID_INDEX)
     {
-      Constraint colorConstraint = Constraint::New<Vector4>(mImpl->mRenderer, shaderTextColorIndex, TextColorConstraint);
-      colorConstraint.AddSource(Source(actor, mAnimatableTextColorPropertyIndex));
-      colorConstraint.Apply();
-
-      // Make zero if the alpha value of text color is zero to skip rendering text
-      Constraint opacityConstraint = Constraint::New<float>(mImpl->mRenderer, Dali::DevelRenderer::Property::OPACITY, OpacityConstraint);
-      opacityConstraint.AddSource(Source(actor, mAnimatableTextColorPropertyIndex));
-      opacityConstraint.Apply();
+      if(!mColorConstraint)
+      {
+        mColorConstraint = Constraint::New<Vector4>(mImpl->mRenderer, mTextColorAnimatableIndex, TextColorConstraint);
+        mColorConstraint.AddSource(Source(actor, mAnimatableTextColorPropertyIndex));
+      }
+      mColorConstraint.Apply();
     }
+
+    // Make zero if the alpha value of text color is zero to skip rendering text
+    if(!mOpacityConstraint)
+    {
+      // VisualRenderer::Property::OPACITY uses same animatable property internally.
+      mOpacityConstraint = Constraint::New<float>(mImpl->mRenderer, Dali::DevelRenderer::Property::OPACITY, OpacityConstraint);
+      mOpacityConstraint.AddSource(Source(actor, mAnimatableTextColorPropertyIndex));
+    }
+    mOpacityConstraint.Apply();
   }
 
   // Renderer needs textures and to be added to control
   mRendererUpdateNeeded = true;
 
-  mRendererList.push_back(mImpl->mRenderer);
-
   UpdateRenderer();
 }
 
@@ -335,6 +367,15 @@ void TextVisual::RemoveRenderer(Actor& actor)
 
 void TextVisual::DoSetOffScene(Actor& actor)
 {
+  if(mColorConstraint)
+  {
+    mColorConstraint.Remove();
+  }
+  if(mOpacityConstraint)
+  {
+    mOpacityConstraint.Remove();
+  }
+
   RemoveRenderer(actor);
 
   // Resets the control handle.
@@ -438,6 +479,11 @@ void TextVisual::DoSetProperty(Dali::Property::Index index, const Dali::Property
       SetBackgroundProperties(mController, propertyValue, Text::EffectStyle::DEFAULT);
       break;
     }
+    case Toolkit::DevelTextVisual::Property::STRIKETHROUGH:
+    {
+      SetStrikethroughProperties(mController, propertyValue, Text::EffectStyle::DEFAULT);
+      break;
+    }
   }
 }
 
@@ -460,10 +506,9 @@ void TextVisual::UpdateRenderer()
   relayoutSize.width  = floorf(0.5f + (isWidthRelative ? mImpl->mControlSize.width * mImpl->mTransform.mSize.x : mImpl->mTransform.mSize.width));
   relayoutSize.height = floorf(0.5f + (isHeightRelative ? mImpl->mControlSize.height * mImpl->mTransform.mSize.y : mImpl->mTransform.mSize.height));
 
-  std::string text;
-  mController->GetText(text);
+  auto textLengthUtf32 = mController->GetNumberOfCharacters();
 
-  if((fabsf(relayoutSize.width) < Math::MACHINE_EPSILON_1000) || (fabsf(relayoutSize.height) < Math::MACHINE_EPSILON_1000) || text.empty())
+  if((fabsf(relayoutSize.width) < Math::MACHINE_EPSILON_1000) || (fabsf(relayoutSize.height) < Math::MACHINE_EPSILON_1000) || textLengthUtf32 == 0u)
   {
     // Remove the texture set and any renderer previously set.
     RemoveRenderer(control);
@@ -519,14 +564,18 @@ void TextVisual::UpdateRenderer()
         shadowEnabled = true;
       }
 
-      const bool underlineEnabled       = mController->GetTextModel()->IsUnderlineEnabled();
-      const bool outlineEnabled         = (mController->GetTextModel()->GetOutlineWidth() > Math::MACHINE_EPSILON_1);
-      const bool backgroundEnabled      = mController->GetTextModel()->IsBackgroundEnabled();
-      const bool markupProcessorEnabled = mController->IsMarkupProcessorEnabled();
+      const bool outlineEnabled             = (mController->GetTextModel()->GetOutlineWidth() > Math::MACHINE_EPSILON_1);
+      const bool backgroundEnabled          = mController->GetTextModel()->IsBackgroundEnabled();
+      const bool markupOrSpannedText        = mController->IsMarkupProcessorEnabled() || mController->GetTextModel()->IsSpannedTextPlaced();
+      const bool markupUnderlineEnabled     = markupOrSpannedText && mController->GetTextModel()->IsMarkupUnderlineSet();
+      const bool markupStrikethroughEnabled = markupOrSpannedText && mController->GetTextModel()->IsMarkupStrikethroughSet();
+      const bool underlineEnabled           = mController->GetTextModel()->IsUnderlineEnabled() || markupUnderlineEnabled;
+      const bool strikethroughEnabled       = mController->GetTextModel()->IsStrikethroughEnabled() || markupStrikethroughEnabled;
+      const bool backgroundMarkupSet        = mController->GetTextModel()->IsMarkupBackgroundColorSet();
+      const bool styleEnabled               = (shadowEnabled || outlineEnabled || backgroundEnabled || markupOrSpannedText || backgroundMarkupSet);
+      const bool isOverlayStyle             = underlineEnabled || strikethroughEnabled;
 
-      const bool styleEnabled = (shadowEnabled || underlineEnabled || outlineEnabled || backgroundEnabled || markupProcessorEnabled);
-
-      AddRenderer(control, relayoutSize, hasMultipleTextColors, containsColorGlyph, styleEnabled);
+      AddRenderer(control, relayoutSize, hasMultipleTextColors, containsColorGlyph, styleEnabled, isOverlayStyle);
 
       // Text rendered and ready to display
       ResourceReady(Toolkit::Visual::ResourceStatus::READY);
@@ -546,82 +595,86 @@ void TextVisual::AddTexture(TextureSet& textureSet, PixelData& data, Sampler& sa
   textureSet.SetSampler(textureSetIndex, sampler);
 }
 
-PixelData TextVisual::ConvertToPixelData(unsigned char* buffer, int width, int height, int offsetPosition, const Pixel::Format textPixelFormat)
+void TextVisual::AddTilingTexture(TextureSet& textureSet, TilingInfo& tilingInfo, PixelData& data, Sampler& sampler, unsigned int textureSetIndex)
 {
-  int            bpp        = Pixel::GetBytesPerPixel(textPixelFormat);
-  unsigned int   bufferSize = width * height * bpp;
-  unsigned char* dstBuffer  = static_cast<unsigned char*>(malloc(bufferSize));
-  memcpy(dstBuffer, buffer + offsetPosition * bpp, bufferSize);
-  PixelData pixelData = Dali::PixelData::New(dstBuffer,
-                                             bufferSize,
-                                             width,
-                                             height,
-                                             textPixelFormat,
-                                             Dali::PixelData::FREE);
-  return pixelData;
+  Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D,
+                                 tilingInfo.textPixelFormat,
+                                 tilingInfo.width,
+                                 tilingInfo.height);
+  DevelTexture::UploadSubPixelData(texture, data, 0u, tilingInfo.offsetHeight, tilingInfo.width, tilingInfo.height);
+
+  textureSet.SetTexture(textureSetIndex, texture);
+  textureSet.SetSampler(textureSetIndex, sampler);
 }
 
-void TextVisual::CreateTextureSet(TilingInfo& info, Renderer& renderer, Sampler& sampler, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled)
+void TextVisual::CreateTextureSet(TilingInfo& info, VisualRenderer& renderer, Sampler& sampler)
 {
-  TextureSet   textureSet      = TextureSet::New();
-  unsigned int textureSetIndex = 0u;
+  TextureSet textureSet      = TextureSet::New();
+  uint32_t   textureSetIndex = 0u;
 
   // Convert the buffer to pixel data to make it a texture.
-  if(info.textBuffer)
+
+  if(info.textPixelData)
   {
-    PixelData data = ConvertToPixelData(info.textBuffer, info.width, info.height, info.offsetPosition, info.textPixelFormat);
-    AddTexture(textureSet, data, sampler, textureSetIndex);
+    AddTilingTexture(textureSet, info, info.textPixelData, sampler, textureSetIndex);
     ++textureSetIndex;
   }
 
-  if(styleEnabled && info.styleBuffer)
+  if(mTextShaderFeatureCache.IsEnabledStyle() && info.stylePixelData)
   {
-    PixelData styleData = ConvertToPixelData(info.styleBuffer, info.width, info.height, info.offsetPosition, Pixel::RGBA8888);
-    AddTexture(textureSet, styleData, sampler, textureSetIndex);
+    AddTilingTexture(textureSet, info, info.stylePixelData, sampler, textureSetIndex);
     ++textureSetIndex;
   }
 
-  if(containsColorGlyph && !hasMultipleTextColors && info.maskBuffer)
+  if(mTextShaderFeatureCache.IsEnabledOverlay() && info.overlayStylePixelData)
   {
-    PixelData maskData = ConvertToPixelData(info.maskBuffer, info.width, info.height, info.offsetPosition, Pixel::L8);
-    AddTexture(textureSet, maskData, sampler, textureSetIndex);
+    AddTilingTexture(textureSet, info, info.overlayStylePixelData, sampler, textureSetIndex);
+    ++textureSetIndex;
+  }
+
+  if(mTextShaderFeatureCache.IsEnabledEmoji() && !mTextShaderFeatureCache.IsEnabledMultiColor() && info.maskPixelData)
+  {
+    AddTilingTexture(textureSet, info, info.maskPixelData, sampler, textureSetIndex);
+    ++textureSetIndex;
   }
 
   renderer.SetTextures(textureSet);
 
   //Register transform properties
-  mImpl->mTransform.RegisterUniforms(renderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(renderer, Direction::LEFT_TO_RIGHT);
 
   // Enable the pre-multiplied alpha to improve the text quality
   renderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, true);
-  renderer.RegisterProperty(PREMULTIPLIED_ALPHA, 1.0f);
+  renderer.SetProperty(VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA, true);
 
   // Set size and offset for the tiling.
-  renderer.RegisterProperty(SIZE, Vector2(info.width, info.height));
-  renderer.RegisterProperty(OFFSET, Vector2(info.offSet.x, info.offSet.y));
-  renderer.RegisterProperty("uHasMultipleTextColors", static_cast<float>(hasMultipleTextColors));
+  renderer.SetProperty(VisualRenderer::Property::TRANSFORM_SIZE, Vector2(info.width, info.height));
+  renderer.SetProperty(VisualRenderer::Property::TRANSFORM_OFFSET, info.transformOffset);
   renderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+  renderer.RegisterProperty("uHasMultipleTextColors", static_cast<float>(mTextShaderFeatureCache.IsEnabledMultiColor()));
 
   mRendererList.push_back(renderer);
 }
 
-void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled)
+void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled, bool isOverlayStyle)
 {
-  Shader shader = GetTextShader(mFactoryCache, hasMultipleTextColors, containsColorGlyph, styleEnabled);
+  Shader shader = GetTextShader(mFactoryCache, TextVisualShaderFeature::FeatureBuilder().EnableMultiColor(hasMultipleTextColors).EnableEmoji(containsColorGlyph).EnableStyle(styleEnabled).EnableOverlay(isOverlayStyle));
   mImpl->mRenderer.SetShader(shader);
 
+  DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_VISUAL_UPDATE_RENDERER");
+
   // Get the maximum size.
   const int maxTextureSize = Dali::GetMaxTextureSize();
 
   // No tiling required. Use the default renderer.
   if(size.height < maxTextureSize)
   {
-    TextureSet textureSet = GetTextTexture(size, hasMultipleTextColors, containsColorGlyph, styleEnabled);
+    TextureSet textureSet = GetTextTexture(size);
 
     mImpl->mRenderer.SetTextures(textureSet);
     //Register transform properties
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
-    mImpl->mRenderer.RegisterProperty("uHasMultipleTextColors", static_cast<float>(hasMultipleTextColors));
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mRenderer.SetProperty(mHasMultipleTextColorsIndex, static_cast<float>(hasMultipleTextColors));
     mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
 
     mRendererList.push_back(mImpl->mRenderer);
@@ -648,24 +701,25 @@ void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultiple
     // Set information for creating textures.
     TilingInfo info(verifiedWidth, maxTextureSize, textPixelFormat);
 
-    // Get the buffer of text.
-    Dali::DevelPixelData::PixelDataBuffer textPixelData = Dali::DevelPixelData::ReleasePixelDataBuffer(data);
-    info.textBuffer                                     = textPixelData.buffer;
+    // Get the pixel data of text.
+    info.textPixelData = data;
 
-    if(styleEnabled)
+    if(mTextShaderFeatureCache.IsEnabledStyle())
     {
       // Create RGBA texture for all the text styles (without the text itself)
-      PixelData                             styleData      = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_NO_TEXT, false, Pixel::RGBA8888);
-      Dali::DevelPixelData::PixelDataBuffer stylePixelData = Dali::DevelPixelData::ReleasePixelDataBuffer(styleData);
-      info.styleBuffer                                     = stylePixelData.buffer;
+      info.stylePixelData = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_NO_TEXT, false, Pixel::RGBA8888);
+    }
+
+    if(mTextShaderFeatureCache.IsEnabledOverlay())
+    {
+      // Create RGBA texture for all the overlay styles
+      info.overlayStylePixelData = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_OVERLAY_STYLE, false, Pixel::RGBA8888);
     }
 
-    if(containsColorGlyph && !hasMultipleTextColors)
+    if(mTextShaderFeatureCache.IsEnabledEmoji() && !mTextShaderFeatureCache.IsEnabledMultiColor())
     {
       // Create a L8 texture as a mask to avoid color glyphs (e.g. emojis) to be affected by text color animation
-      PixelData                             maskData      = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_MASK, false, Pixel::L8);
-      Dali::DevelPixelData::PixelDataBuffer maskPixelData = Dali::DevelPixelData::ReleasePixelDataBuffer(maskData);
-      info.maskBuffer                                     = maskPixelData.buffer;
+      info.maskPixelData = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_MASK, false, Pixel::L8);
     }
 
     // Get the current offset for recalculate the offset when tiling.
@@ -674,30 +728,29 @@ void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultiple
     Property::Value* offsetValue = retMap.Find(Dali::Toolkit::Visual::Transform::Property::OFFSET);
     if(offsetValue)
     {
-      offsetValue->Get(info.offSet);
+      offsetValue->Get(info.transformOffset);
     }
 
     // Create a textureset in the default renderer.
-    CreateTextureSet(info, mImpl->mRenderer, sampler, hasMultipleTextColors, containsColorGlyph, styleEnabled);
+    CreateTextureSet(info, mImpl->mRenderer, sampler);
 
     verifiedHeight -= maxTextureSize;
 
     Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
 
-    int offsetPosition = verifiedWidth * maxTextureSize;
     // Create a renderer by cutting maxTextureSize.
     while(verifiedHeight > 0)
     {
-      Renderer tilingRenderer = Renderer::New(geometry, shader);
+      VisualRenderer tilingRenderer = VisualRenderer::New(geometry, shader);
       tilingRenderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, Toolkit::DepthIndex::CONTENT);
       // New offset position of buffer for tiling.
-      info.offsetPosition += offsetPosition;
+      info.offsetHeight += maxTextureSize;
       // New height for tiling.
       info.height = (verifiedHeight - maxTextureSize) > 0 ? maxTextureSize : verifiedHeight;
       // New offset for tiling.
-      info.offSet.y += maxTextureSize;
+      info.transformOffset.y += maxTextureSize;
       // Create a textureset int the new tiling renderer.
-      CreateTextureSet(info, tilingRenderer, sampler, hasMultipleTextColors, containsColorGlyph, styleEnabled);
+      CreateTextureSet(info, tilingRenderer, sampler);
 
       verifiedHeight -= maxTextureSize;
     }
@@ -705,17 +758,43 @@ void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultiple
 
   mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
 
+  const Vector4& defaultColor = mController->GetTextModel()->GetDefaultColor();
+
   for(RendererContainer::iterator iter = mRendererList.begin(); iter != mRendererList.end(); ++iter)
   {
     Renderer renderer = (*iter);
     if(renderer)
     {
       actor.AddRenderer(renderer);
+
+      if(renderer != mImpl->mRenderer)
+      {
+        // Set constraint for text label's color for non-default renderers.
+        if(mAnimatableTextColorPropertyIndex != Property::INVALID_INDEX)
+        {
+          // Register unique property, or get property for default renderer.
+          Property::Index index = renderer.RegisterUniqueProperty("uTextColorAnimatable", defaultColor);
+
+          // Create constraint for the animatable text's color Property with uTextColorAnimatable in the renderer.
+          if(index != Property::INVALID_INDEX)
+          {
+            Constraint colorConstraint = Constraint::New<Vector4>(renderer, index, TextColorConstraint);
+            colorConstraint.AddSource(Source(actor, mAnimatableTextColorPropertyIndex));
+            colorConstraint.Apply();
+          }
+
+          // Make zero if the alpha value of text color is zero to skip rendering text
+          // VisualRenderer::Property::OPACITY uses same animatable property internally.
+          Constraint opacityConstraint = Constraint::New<float>(renderer, Dali::DevelRenderer::Property::OPACITY, OpacityConstraint);
+          opacityConstraint.AddSource(Source(actor, mAnimatableTextColorPropertyIndex));
+          opacityConstraint.Apply();
+        }
+      }
     }
   }
 }
 
-TextureSet TextVisual::GetTextTexture(const Vector2& size, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled)
+TextureSet TextVisual::GetTextTexture(const Vector2& size)
 {
   // Filter mode needs to be set to linear to produce better quality while scaling.
   Sampler sampler = Sampler::New();
@@ -724,7 +803,7 @@ TextureSet TextVisual::GetTextTexture(const Vector2& size, bool hasMultipleTextC
   TextureSet textureSet = TextureSet::New();
 
   // Create RGBA texture if the text contains emojis or multiple text colors, otherwise L8 texture
-  Pixel::Format textPixelFormat = (containsColorGlyph || hasMultipleTextColors) ? Pixel::RGBA8888 : Pixel::L8;
+  Pixel::Format textPixelFormat = (mTextShaderFeatureCache.IsEnabledEmoji() || mTextShaderFeatureCache.IsEnabledMultiColor()) ? Pixel::RGBA8888 : Pixel::L8;
 
   // Check the text direction
   Toolkit::DevelText::TextDirection::Type textDirection = mController->GetTextDirection();
@@ -732,23 +811,27 @@ TextureSet TextVisual::GetTextTexture(const Vector2& size, bool hasMultipleTextC
   // Create a texture for the text without any styles
   PixelData data = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_NO_STYLES, false, textPixelFormat);
 
-  // It may happen the image atlas can't handle a pixel data it exceeds the maximum size.
-  // In that case, create a texture. TODO: should tile the text.
-  unsigned int textureSetIndex = 0u;
-
+  uint32_t textureSetIndex = 0u;
   AddTexture(textureSet, data, sampler, textureSetIndex);
   ++textureSetIndex;
 
-  if(styleEnabled)
+  if(mTextShaderFeatureCache.IsEnabledStyle())
   {
-    // Create RGBA texture for all the text styles (without the text itself)
+    // Create RGBA texture for all the text styles that render in the background (without the text itself)
     PixelData styleData = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_NO_TEXT, false, Pixel::RGBA8888);
-
     AddTexture(textureSet, styleData, sampler, textureSetIndex);
     ++textureSetIndex;
   }
 
-  if(containsColorGlyph && !hasMultipleTextColors)
+  if(mTextShaderFeatureCache.IsEnabledOverlay())
+  {
+    // Create RGBA texture for overlay styles such as underline and strikethrough (without the text itself)
+    PixelData overlayStyleData = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_OVERLAY_STYLE, false, Pixel::RGBA8888);
+    AddTexture(textureSet, overlayStyleData, sampler, textureSetIndex);
+    ++textureSetIndex;
+  }
+
+  if(mTextShaderFeatureCache.IsEnabledEmoji() && !mTextShaderFeatureCache.IsEnabledMultiColor())
   {
     // Create a L8 texture as a mask to avoid color glyphs (e.g. emojis) to be affected by text color animation
     PixelData maskData = mTypesetter->Render(size, textDirection, Text::Typesetter::RENDER_MASK, false, Pixel::L8);
@@ -759,73 +842,12 @@ TextureSet TextVisual::GetTextTexture(const Vector2& size, bool hasMultipleTextC
   return textureSet;
 }
 
-Shader TextVisual::GetTextShader(VisualFactoryCache& factoryCache, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled)
+Shader TextVisual::GetTextShader(VisualFactoryCache& factoryCache, const TextVisualShaderFeature::FeatureBuilder& featureBuilder)
 {
-  Shader shader;
-
-  if(hasMultipleTextColors && !styleEnabled)
-  {
-    // We don't animate text color if the text contains multiple colors
-    shader = factoryCache.GetShader(VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT);
-    if(!shader)
-    {
-      shader = Shader::New(SHADER_TEXT_VISUAL_SHADER_VERT, SHADER_TEXT_VISUAL_MULTI_COLOR_TEXT_SHADER_FRAG);
-      shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
-      factoryCache.SaveShader(VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT, shader);
-    }
-  }
-  else if(hasMultipleTextColors && styleEnabled)
-  {
-    // We don't animate text color if the text contains multiple colors
-    shader = factoryCache.GetShader(VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE);
-    if(!shader)
-    {
-      shader = Shader::New(SHADER_TEXT_VISUAL_SHADER_VERT, SHADER_TEXT_VISUAL_MULTI_COLOR_TEXT_WITH_STYLE_SHADER_FRAG);
-      shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
-      factoryCache.SaveShader(VisualFactoryCache::TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE, shader);
-    }
-  }
-  else if(!hasMultipleTextColors && !containsColorGlyph && !styleEnabled)
-  {
-    shader = factoryCache.GetShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT);
-    if(!shader)
-    {
-      shader = Shader::New(SHADER_TEXT_VISUAL_SHADER_VERT, SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_SHADER_FRAG);
-      shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
-      factoryCache.SaveShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT, shader);
-    }
-  }
-  else if(!hasMultipleTextColors && !containsColorGlyph && styleEnabled)
-  {
-    shader = factoryCache.GetShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE);
-    if(!shader)
-    {
-      shader = Shader::New(SHADER_TEXT_VISUAL_SHADER_VERT, SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_WITH_STYLE_SHADER_FRAG);
-      shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
-      factoryCache.SaveShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE, shader);
-    }
-  }
-  else if(!hasMultipleTextColors && containsColorGlyph && !styleEnabled)
-  {
-    shader = factoryCache.GetShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_EMOJI);
-    if(!shader)
-    {
-      shader = Shader::New(SHADER_TEXT_VISUAL_SHADER_VERT, SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_WITH_EMOJI_SHADER_FRAG);
-      shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
-      factoryCache.SaveShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_EMOJI, shader);
-    }
-  }
-  else // if( !hasMultipleTextColors && containsColorGlyph && styleEnabled )
-  {
-    shader = factoryCache.GetShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI);
-    if(!shader)
-    {
-      shader = Shader::New(SHADER_TEXT_VISUAL_SHADER_VERT, SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI_SHADER_FRAG);
-      shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
-      factoryCache.SaveShader(VisualFactoryCache::TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI, shader);
-    }
-  }
+  // Cache feature builder informations.
+  mTextShaderFeatureCache = featureBuilder;
 
+  Shader shader = mTextVisualShaderFactory.GetShader(factoryCache, mTextShaderFeatureCache);
   return shader;
 }
 
diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h
index 7ae5e4e..7be059c 100644
--- a/dali-toolkit/internal/visuals/text/text-visual.h
+++ b/dali-toolkit/internal/visuals/text/text-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,15 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/weak-handle.h>
+#include <dali/public-api/rendering/visual-renderer.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/text/controller/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-typesetter.h>
-#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/visuals/text-visual-shader-factory.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 
 namespace Dali
@@ -70,10 +73,11 @@ public:
    * @brief Create a new text visual.
    *
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+   * @param[in] shaderFactory The TextVisualShaderFactory object
    * @param[in] properties A Property::Map containing settings for this visual
    * @return A smart-pointer to the newly allocated visual.
    */
-  static TextVisualPtr New(VisualFactoryCache& factoryCache, const Property::Map& properties);
+  static TextVisualPtr New(VisualFactoryCache& factoryCache, TextVisualShaderFactory& shaderFactory, const Property::Map& properties);
 
   /**
    * @brief Converts all strings keys in property map to index keys.  Property Map can then be merged correctly.
@@ -141,13 +145,19 @@ public: // from Visual::Base
    */
   void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
+  /**
+   * @copydoc Visual::Base::EnablePreMultipliedAlpha
+   */
+  void EnablePreMultipliedAlpha(bool preMultiplied) override;
+
 protected:
   /**
    * @brief Constructor.
    *
    * @param[in] factoryCache The VisualFactoryCache object
+   * @param[in] shaderFactory The TextVisualShaderFactory object
    */
-  TextVisual(VisualFactoryCache& factoryCache);
+  TextVisual(VisualFactoryCache& factoryCache, TextVisualShaderFactory& shaderFactory);
 
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -184,41 +194,31 @@ protected:
 private:
   struct TilingInfo
   {
-    unsigned char* textBuffer;
-    unsigned char* styleBuffer;
-    unsigned char* maskBuffer;
-    int            width;
-    int            height;
-    Pixel::Format  textPixelFormat;
-    int            offsetPosition;
-    Vector2        offSet;
-
-    TilingInfo(int width, int height, Pixel::Format textPixelFormat)
-    : textBuffer(NULL),
-      styleBuffer(NULL),
-      maskBuffer(NULL),
+    PixelData     textPixelData;
+    PixelData     stylePixelData;
+    PixelData     overlayStylePixelData;
+    PixelData     maskPixelData;
+    int32_t       width;
+    int32_t       height;
+    Pixel::Format textPixelFormat;
+    uint32_t      offsetHeight;
+    Vector2       transformOffset;
+
+    TilingInfo(int32_t width, int32_t height, Pixel::Format textPixelFormat)
+    : textPixelData(),
+      stylePixelData(),
+      overlayStylePixelData(),
+      maskPixelData(),
       width(width),
       height(height),
       textPixelFormat(textPixelFormat),
-      offsetPosition(0),
-      offSet(0.f, 0.f)
+      offsetHeight(0u),
+      transformOffset(0.f, 0.f)
     {
     }
 
     ~TilingInfo()
     {
-      if(textBuffer)
-      {
-        free(textBuffer);
-      }
-      if(styleBuffer)
-      {
-        free(styleBuffer);
-      }
-      if(maskBuffer)
-      {
-        free(maskBuffer);
-      }
     }
   };
 
@@ -244,32 +244,29 @@ private:
   /**
    * @brief Create a texture in textureSet and add it.
    * @param[in] textureSet The textureSet to which the texture will be added.
-   * @param[in] data The PixelData to be uploaded to texture
+   * @param[in] data The PixelData to be uploaded to texture.
    * @param[in] sampler The sampler.
    * @param[in] textureSetIndex The Index of TextureSet.
    */
   void AddTexture(TextureSet& textureSet, PixelData& data, Sampler& sampler, unsigned int textureSetIndex);
 
   /**
-   * @brief Convert the buffer to pixelData.
-   * @param[in] buffer The Buffer to be converted to pixelData.
-   * @param[in] width The width of pixel data.
-   * @param[in] height The height of pixel data.
-   * @param[in] offsetPosition The The buffer's start position.
-   * @param[in] textPixelFormat The PixelForma of text.
+   * @brief Create a texture in textureSet and add it.
+   * @param[in] textureSet The textureSet to which the texture will be added.
+   * @param[in] tilingInfo The tiling infomation to be uploaded to texture.
+   * @param[in] data The PixelData to be uploaded to texture.
+   * @param[in] sampler The sampler.
+   * @param[in] textureSetIndex The Index of TextureSet.
    */
-  PixelData ConvertToPixelData(unsigned char* buffer, int width, int height, int offsetPosition, const Pixel::Format textPixelFormat);
+  void AddTilingTexture(TextureSet& textureSet, TilingInfo& tilingInfo, PixelData& data, Sampler& sampler, unsigned int textureSetIndex);
 
   /**
-   * @brief Create the text's texture.
+   * @brief Create the text's texture. It will use cached shader feature for text visual.
    * @param[in] info This is the information you need to create a Tiling.
    * @param[in] renderer The renderer to which the TextureSet will be added.
    * @param[in] sampler The sampler.
-   * @param[in] hasMultipleTextColors Whether the text contains multiple colors.
-   * @param[in] containsColorGlyph Whether the text contains color glyph.
-   * @param[in] styleEnabled Whether the text contains any styles (e.g. shadow, underline, etc.).
    */
-  void CreateTextureSet(TilingInfo& info, Renderer& renderer, Sampler& sampler, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled);
+  void CreateTextureSet(TilingInfo& info, VisualRenderer& renderer, Sampler& sampler);
 
   /**
    * Create renderer of the text for rendering.
@@ -278,26 +275,22 @@ private:
    * @param[in] hasMultipleTextColors Whether the text contains multiple colors.
    * @param[in] containsColorGlyph Whether the text contains color glyph.
    * @param[in] styleEnabled Whether the text contains any styles (e.g. shadow, underline, etc.).
+   * @param[in] isOverlayStyle Whether the style needs to overlay on the text (e.g. strikethrough, underline, etc.).
    */
-  void AddRenderer(Actor& actor, const Vector2& size, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled);
+  void AddRenderer(Actor& actor, const Vector2& size, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled, bool isOverlayStyle);
 
   /**
-   * Get the texture of the text for rendering.
+   * Get the texture of the text for rendering. It will use cached shader feature for text visual.
    * @param[in] size The texture size.
-   * @param[in] hasMultipleTextColors Whether the text contains multiple colors.
-   * @param[in] containsColorGlyph Whether the text contains color glyph.
-   * @param[in] styleEnabled Whether the text contains any styles (e.g. shadow, underline, etc.).
    */
-  TextureSet GetTextTexture(const Vector2& size, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled);
+  TextureSet GetTextTexture(const Vector2& size);
 
   /**
    * Get the text rendering shader.
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
-   * @param[in] hasMultipleTextColors Whether the text contains multiple colors.
-   * @param[in] containsColorGlyph Whether the text contains color glyph.
-   * @param[in] styleEnabled Whether the text contains any styles (e.g. shadow, underline, etc.).
+   * @param[in] featureBuilder Collection of current text shader's features. It will be cached as text visual.
    */
-  Shader GetTextShader(VisualFactoryCache& factoryCache, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled);
+  Shader GetTextShader(VisualFactoryCache& factoryCache, const TextVisualShaderFeature::FeatureBuilder& featureBuilder);
 
   /**
    * @brief Retrieve the TextVisual object.
@@ -312,29 +305,21 @@ private:
 private:
   typedef std::vector<Renderer> RendererContainer;
 
-  /**
-   * Used as an alternative to boolean so that it is obvious whether the text contains single or multiple text colors, and emoji and styles.
-   */
-  struct TextType
-  {
-    enum Type
-    {
-      SINGLE_COLOR_TEXT = 0, ///< The text contains single color only.
-      MULTI_COLOR_TEXT  = 1, ///< The text contains multiple colorｓ.
-      NO_EMOJI          = 0, ///< The text contains no emoji.
-      HAS_EMOJI         = 1, ///< The text contains emoji.
-      NO_STYLES         = 0, ///< The text contains contains no styles.
-      HAS_SYLES         = 1  ///< The text contains contains styles.
-    };
-  };
-
 private:
-  Text::ControllerPtr mController;                       ///< The text's controller.
-  Text::TypesetterPtr mTypesetter;                       ///< The text's typesetter.
-  WeakHandle<Actor>   mControl;                          ///< The control where the renderer is added.
-  Property::Index     mAnimatableTextColorPropertyIndex; ///< The index of animatable text color property registered by the control.
-  bool                mRendererUpdateNeeded : 1;         ///< The flag to indicate whether the renderer needs to be updated.
-  RendererContainer   mRendererList;
+  Text::ControllerPtr mController; ///< The text's controller.
+  Text::TypesetterPtr mTypesetter; ///< The text's typesetter.
+
+  TextVisualShaderFactory&                mTextVisualShaderFactory; ///< The shader factory for text visual.
+  TextVisualShaderFeature::FeatureBuilder mTextShaderFeatureCache;  ///< The cached shader feature for text visual.
+
+  WeakHandle<Actor> mControl;                          ///< The control where the renderer is added.
+  Constraint        mColorConstraint{};                ///< Color constraint
+  Constraint        mOpacityConstraint{};              ///< Opacity constraint
+  Property::Index   mHasMultipleTextColorsIndex;       ///< The index of uHasMultipleTextColors proeprty.
+  Property::Index   mAnimatableTextColorPropertyIndex; ///< The index of animatable text color property registered by the control.
+  Property::Index   mTextColorAnimatableIndex;         ///< The index of uTextColorAnimatable property.
+  bool              mRendererUpdateNeeded : 1;         ///< The flag to indicate whether the renderer needs to be updated.
+  RendererContainer mRendererList;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp
deleted file mode 100644
index 093954e..0000000
--- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp
+++ /dev/null
@@ -1,1487 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
-
-// EXTERNAL HEADERS
-#include <dali/devel-api/adaptor-framework/environment-variable.h>
-#include <dali/devel-api/adaptor-framework/image-loading.h>
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <dali/devel-api/common/hash.h>
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/math/vector4.h>
-#include <dali/public-api/rendering/geometry.h>
-#include <cstdlib>
-#include <string>
-
-// INTERNAL HEADERS
-#include <dali-toolkit/internal/image-loader/async-image-loader-impl.h>
-#include <dali-toolkit/internal/image-loader/image-atlas-impl.h>
-#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
-#include <dali-toolkit/internal/visuals/rendering-addon.h>
-#include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
-
-namespace
-{
-constexpr auto INITIAL_CACHE_NUMBER                    = size_t{0u};
-constexpr auto DEFAULT_NUMBER_OF_LOCAL_LOADER_THREADS  = size_t{4u};
-constexpr auto DEFAULT_NUMBER_OF_REMOTE_LOADER_THREADS = size_t{8u};
-
-constexpr auto NUMBER_OF_LOCAL_LOADER_THREADS_ENV  = "DALI_TEXTURE_LOCAL_THREADS";
-constexpr auto NUMBER_OF_REMOTE_LOADER_THREADS_ENV = "DALI_TEXTURE_REMOTE_THREADS";
-
-size_t GetNumberOfThreads(const char* environmentVariable, size_t defaultValue)
-{
-  using Dali::EnvironmentVariable::GetEnvironmentVariable;
-  auto           numberString          = GetEnvironmentVariable(environmentVariable);
-  auto           numberOfThreads       = numberString ? std::strtoul(numberString, nullptr, 10) : 0;
-  constexpr auto MAX_NUMBER_OF_THREADS = 100u;
-  DALI_ASSERT_DEBUG(numberOfThreads < MAX_NUMBER_OF_THREADS);
-  return (numberOfThreads > 0 && numberOfThreads < MAX_NUMBER_OF_THREADS) ? numberOfThreads : defaultValue;
-}
-
-size_t GetNumberOfLocalLoaderThreads()
-{
-  return GetNumberOfThreads(NUMBER_OF_LOCAL_LOADER_THREADS_ENV, DEFAULT_NUMBER_OF_LOCAL_LOADER_THREADS);
-}
-
-size_t GetNumberOfRemoteLoaderThreads()
-{
-  return GetNumberOfThreads(NUMBER_OF_REMOTE_LOADER_THREADS_ENV, DEFAULT_NUMBER_OF_REMOTE_LOADER_THREADS);
-}
-
-} // namespace
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-namespace
-{
-#ifdef DEBUG_ENABLED
-Debug::Filter* gTextureManagerLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_TEXTURE_MANAGER");
-
-#define GET_LOAD_STATE_STRING(loadState)                                                                                                              \
-  loadState == TextureManager::LoadState::NOT_STARTED ? "NOT_STARTED" : loadState == TextureManager::LoadState::LOADING          ? "LOADING"          \
-                                                                      : loadState == TextureManager::LoadState::LOAD_FINISHED    ? "LOAD_FINISHED"    \
-                                                                      : loadState == TextureManager::LoadState::WAITING_FOR_MASK ? "WAITING_FOR_MASK" \
-                                                                      : loadState == TextureManager::LoadState::MASK_APPLYING    ? "MASK_APPLYING"    \
-                                                                      : loadState == TextureManager::LoadState::MASK_APPLIED     ? "MASK_APPLIED"     \
-                                                                      : loadState == TextureManager::LoadState::UPLOADED         ? "UPLOADED"         \
-                                                                      : loadState == TextureManager::LoadState::CANCELLED        ? "CANCELLED"        \
-                                                                      : loadState == TextureManager::LoadState::LOAD_FAILED      ? "LOAD_FAILED"      \
-                                                                                                                                 : "Unknown"
-
-#endif
-
-const uint32_t DEFAULT_ATLAS_SIZE(1024u);               ///< This size can fit 8 by 8 images of average size 128 * 128
-const Vector4  FULL_ATLAS_RECT(0.0f, 0.0f, 1.0f, 1.0f); ///< UV Rectangle that covers the full Texture
-const int      INVALID_INDEX(-1);                       ///< Invalid index used to represent a non-existant TextureInfo struct
-const int      INVALID_CACHE_INDEX(-1);                 ///< Invalid Cache index
-
-void PreMultiply(Devel::PixelBuffer pixelBuffer, TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
-{
-  if(Pixel::HasAlpha(pixelBuffer.GetPixelFormat()))
-  {
-    if(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD)
-    {
-      pixelBuffer.MultiplyColorByAlpha();
-    }
-  }
-  else
-  {
-    preMultiplyOnLoad = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-  }
-}
-
-} // Anonymous namespace
-
-TextureManager::MaskingData::MaskingData()
-: mAlphaMaskUrl(),
-  mAlphaMaskId(INVALID_TEXTURE_ID),
-  mContentScaleFactor(1.0f),
-  mCropToMask(true)
-{
-}
-
-TextureManager::TextureManager()
-: mAsyncLocalLoaders(GetNumberOfLocalLoaderThreads(), [&]() { return AsyncLoadingHelper(*this); }),
-  mAsyncRemoteLoaders(GetNumberOfRemoteLoaderThreads(), [&]() { return AsyncLoadingHelper(*this); }),
-  mExternalTextures(),
-  mLifecycleObservers(),
-  mLoadQueue(),
-  mCurrentTextureId(0),
-  mQueueLoadFlag(false)
-{
-  // Initialize the AddOn
-  RenderingAddOn::Get();
-}
-
-TextureManager::~TextureManager()
-{
-  for(auto iter = mLifecycleObservers.Begin(), endIter = mLifecycleObservers.End(); iter != endIter; ++iter)
-  {
-    (*iter)->TextureManagerDestroyed();
-  }
-}
-
-TextureSet TextureManager::LoadAnimatedImageTexture(
-  Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex, Dali::SamplingMode::Type samplingMode, bool synchronousLoading, TextureManager::TextureId& textureId, Dali::WrapMode::Type wrapModeU, Dali::WrapMode::Type wrapModeV, TextureUploadObserver* textureObserver)
-{
-  TextureSet textureSet;
-
-  if(synchronousLoading)
-  {
-    Devel::PixelBuffer pixelBuffer;
-    if(animatedImageLoading)
-    {
-      pixelBuffer = animatedImageLoading.LoadFrame(frameIndex);
-    }
-    if(!pixelBuffer)
-    {
-      DALI_LOG_ERROR("TextureManager::LoadAnimatedImageTexture: Synchronous loading is failed\n");
-    }
-    else
-    {
-      PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer
-      if(!textureSet)
-      {
-        Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
-        texture.Upload(pixelData);
-        textureSet = TextureSet::New();
-        textureSet.SetTexture(0u, texture);
-      }
-    }
-  }
-  else
-  {
-    auto preMultiply                    = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-    textureId                           = RequestLoadInternal(animatedImageLoading.GetUrl(), INVALID_TEXTURE_ID, 1.0f, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, TextureManager::NO_ATLAS, false, StorageType::UPLOAD_TO_TEXTURE, textureObserver, true, TextureManager::ReloadPolicy::CACHED, preMultiply, animatedImageLoading, frameIndex);
-    TextureManager::LoadState loadState = GetTextureStateInternal(textureId);
-    if(loadState == TextureManager::LoadState::UPLOADED)
-    {
-      // UploadComplete has already been called - keep the same texture set
-      textureSet = GetTextureSet(textureId);
-    }
-  }
-
-  if(textureSet)
-  {
-    Sampler sampler = Sampler::New();
-    sampler.SetWrapMode(wrapModeU, wrapModeV);
-    textureSet.SetSampler(0u, sampler);
-  }
-
-  return textureSet;
-}
-
-Devel::PixelBuffer TextureManager::LoadPixelBuffer(
-  const VisualUrl& url, Dali::ImageDimensions desiredSize, Dali::FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode, bool synchronousLoading, TextureUploadObserver* textureObserver, bool orientationCorrection, TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
-{
-  Devel::PixelBuffer pixelBuffer;
-  if(synchronousLoading)
-  {
-    if(url.IsValid())
-    {
-      if(url.IsBufferResource())
-      {
-        const EncodedImageBuffer& encodedImageBuffer = GetEncodedImageBuffer(url.GetUrl());
-        if(encodedImageBuffer)
-        {
-          pixelBuffer = LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), desiredSize, fittingMode, samplingMode, orientationCorrection);
-        }
-      }
-      else
-      {
-        pixelBuffer = LoadImageFromFile(url.GetUrl(), desiredSize, fittingMode, samplingMode, orientationCorrection);
-      }
-      if(pixelBuffer && preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD)
-      {
-        PreMultiply(pixelBuffer, preMultiplyOnLoad);
-      }
-    }
-  }
-  else
-  {
-    RequestLoadInternal(url, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS, false, StorageType::RETURN_PIXEL_BUFFER, textureObserver, orientationCorrection, TextureManager::ReloadPolicy::FORCED, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u);
-  }
-
-  return pixelBuffer;
-}
-
-TextureSet TextureManager::LoadTexture(
-  const VisualUrl& url, Dali::ImageDimensions desiredSize, Dali::FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode, MaskingDataPointer& maskInfo, bool synchronousLoading, TextureManager::TextureId& textureId, Vector4& textureRect, Dali::ImageDimensions& textureRectSize, bool& atlasingStatus, bool& loadingStatus, Dali::WrapMode::Type wrapModeU, Dali::WrapMode::Type wrapModeV, TextureUploadObserver* textureObserver, AtlasUploadObserver* atlasObserver, ImageAtlasManagerPtr imageAtlasManager, bool orientationCorrection, TextureManager::ReloadPolicy reloadPolicy, TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
-{
-  TextureSet textureSet;
-
-  loadingStatus = false;
-  textureRect   = FULL_ATLAS_RECT;
-
-  if(VisualUrl::TEXTURE == url.GetProtocolType())
-  {
-    std::string location = url.GetLocation();
-    if(location.size() > 0u)
-    {
-      TextureId id = std::stoi(location);
-      for(auto&& elem : mExternalTextures)
-      {
-        if(elem.textureId == id)
-        {
-          preMultiplyOnLoad = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-          textureId         = elem.textureId;
-          return elem.textureSet;
-        }
-      }
-    }
-  }
-  else if(synchronousLoading)
-  {
-    PixelData data;
-    if(url.IsValid())
-    {
-      Devel::PixelBuffer pixelBuffer;
-      if(url.IsBufferResource())
-      {
-        const EncodedImageBuffer& encodedImageBuffer = GetEncodedImageBuffer(url.GetUrl());
-        if(encodedImageBuffer)
-        {
-          pixelBuffer = LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), desiredSize, fittingMode, samplingMode, orientationCorrection);
-        }
-      }
-      else
-      {
-        pixelBuffer = LoadImageFromFile(url.GetUrl(), desiredSize, fittingMode, samplingMode, orientationCorrection);
-      }
-      if(maskInfo && maskInfo->mAlphaMaskUrl.IsValid())
-      {
-        Devel::PixelBuffer maskPixelBuffer = LoadImageFromFile(maskInfo->mAlphaMaskUrl.GetUrl(), ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, true);
-        if(maskPixelBuffer)
-        {
-          pixelBuffer.ApplyMask(maskPixelBuffer, maskInfo->mContentScaleFactor, maskInfo->mCropToMask);
-        }
-      }
-      if(pixelBuffer)
-      {
-        PreMultiply(pixelBuffer, preMultiplyOnLoad);
-        data = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer
-      }
-    }
-    if(!data)
-    {
-      DALI_LOG_ERROR("TextureManager::LoadTexture: Synchronous loading is failed\n");
-    }
-    else
-    {
-      if(atlasingStatus) // attempt atlasing
-      {
-        textureSet = imageAtlasManager->Add(textureRect, data);
-      }
-      if(!textureSet) // big image, no atlasing or atlasing failed
-      {
-        atlasingStatus  = false;
-        Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, data.GetPixelFormat(), data.GetWidth(), data.GetHeight());
-        texture.Upload(data);
-        textureSet = TextureSet::New();
-        textureSet.SetTexture(0u, texture);
-      }
-      else
-      {
-        textureRectSize.SetWidth(data.GetWidth());
-        textureRectSize.SetHeight(data.GetHeight());
-      }
-    }
-  }
-  else
-  {
-    loadingStatus = true;
-    if(atlasingStatus)
-    {
-      textureSet = imageAtlasManager->Add(textureRect, url.GetUrl(), desiredSize, fittingMode, true, atlasObserver);
-    }
-    if(!textureSet) // big image, no atlasing or atlasing failed
-    {
-      atlasingStatus = false;
-      if(!maskInfo || !maskInfo->mAlphaMaskUrl.IsValid())
-      {
-        textureId = RequestLoad(url, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS, textureObserver, orientationCorrection, reloadPolicy, preMultiplyOnLoad);
-      }
-      else
-      {
-        maskInfo->mAlphaMaskId = RequestMaskLoad(maskInfo->mAlphaMaskUrl);
-        textureId              = RequestLoad(url,
-                                maskInfo->mAlphaMaskId,
-                                maskInfo->mContentScaleFactor,
-                                desiredSize,
-                                fittingMode,
-                                samplingMode,
-                                TextureManager::NO_ATLAS,
-                                maskInfo->mCropToMask,
-                                textureObserver,
-                                orientationCorrection,
-                                reloadPolicy,
-                                preMultiplyOnLoad);
-      }
-
-      TextureManager::LoadState loadState = GetTextureStateInternal(textureId);
-      if(loadState == TextureManager::LoadState::UPLOADED)
-      {
-        // UploadComplete has already been called - keep the same texture set
-        textureSet = GetTextureSet(textureId);
-      }
-
-      // If we are loading the texture, or waiting for the ready signal handler to complete, inform
-      // caller that they need to wait.
-      loadingStatus = (loadState == TextureManager::LoadState::LOADING ||
-                       loadState == TextureManager::LoadState::WAITING_FOR_MASK ||
-                       loadState == TextureManager::LoadState::MASK_APPLYING ||
-                       loadState == TextureManager::LoadState::MASK_APPLIED ||
-                       loadState == TextureManager::LoadState::NOT_STARTED ||
-                       mQueueLoadFlag);
-    }
-    else
-    {
-      textureRectSize = desiredSize;
-    }
-  }
-
-  if(!atlasingStatus && textureSet)
-  {
-    Sampler sampler = Sampler::New();
-    sampler.SetWrapMode(wrapModeU, wrapModeV);
-    textureSet.SetSampler(0u, sampler);
-  }
-
-  return textureSet;
-}
-
-TextureManager::TextureId TextureManager::RequestLoad(
-  const VisualUrl&                url,
-  const ImageDimensions           desiredSize,
-  FittingMode::Type               fittingMode,
-  Dali::SamplingMode::Type        samplingMode,
-  const UseAtlas                  useAtlas,
-  TextureUploadObserver*          observer,
-  bool                            orientationCorrection,
-  TextureManager::ReloadPolicy    reloadPolicy,
-  TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
-{
-  return RequestLoadInternal(url, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, useAtlas, false, StorageType::UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u);
-}
-
-TextureManager::TextureId TextureManager::RequestLoad(
-  const VisualUrl&                url,
-  TextureId                       maskTextureId,
-  float                           contentScale,
-  const ImageDimensions           desiredSize,
-  FittingMode::Type               fittingMode,
-  Dali::SamplingMode::Type        samplingMode,
-  const UseAtlas                  useAtlas,
-  bool                            cropToMask,
-  TextureUploadObserver*          observer,
-  bool                            orientationCorrection,
-  TextureManager::ReloadPolicy    reloadPolicy,
-  TextureManager::MultiplyOnLoad& preMultiplyOnLoad)
-{
-  return RequestLoadInternal(url, maskTextureId, contentScale, desiredSize, fittingMode, samplingMode, useAtlas, cropToMask, StorageType::UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u);
-}
-
-TextureManager::TextureId TextureManager::RequestMaskLoad(const VisualUrl& maskUrl)
-{
-  // Use the normal load procedure to get the alpha mask.
-  auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-  return RequestLoadInternal(maskUrl, INVALID_TEXTURE_ID, 1.0f, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, NO_ATLAS, false, StorageType::KEEP_PIXEL_BUFFER, NULL, true, TextureManager::ReloadPolicy::CACHED, preMultiply, Dali::AnimatedImageLoading(), 0u);
-}
-
-TextureManager::TextureId TextureManager::RequestLoadInternal(
-  const VisualUrl&                url,
-  TextureId                       maskTextureId,
-  float                           contentScale,
-  const ImageDimensions           desiredSize,
-  FittingMode::Type               fittingMode,
-  Dali::SamplingMode::Type        samplingMode,
-  UseAtlas                        useAtlas,
-  bool                            cropToMask,
-  StorageType                     storageType,
-  TextureUploadObserver*          observer,
-  bool                            orientationCorrection,
-  TextureManager::ReloadPolicy    reloadPolicy,
-  TextureManager::MultiplyOnLoad& preMultiplyOnLoad,
-  Dali::AnimatedImageLoading      animatedImageLoading,
-  uint32_t                        frameIndex)
-{
-  // First check if the requested Texture is cached.
-  bool isAnimatedImage = (animatedImageLoading) ? true : false;
-
-  TextureHash textureHash = INITIAL_CACHE_NUMBER;
-  int         cacheIndex  = INVALID_CACHE_INDEX;
-  if(storageType != StorageType::RETURN_PIXEL_BUFFER && !isAnimatedImage)
-  {
-    textureHash = GenerateHash(url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, maskTextureId);
-
-    // Look up the texture by hash. Note: The extra parameters are used in case of a hash collision.
-    cacheIndex = FindCachedTexture(textureHash, url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, maskTextureId, preMultiplyOnLoad);
-  }
-
-  TextureManager::TextureId textureId = INVALID_TEXTURE_ID;
-  // Check if the requested Texture exists in the cache.
-  if(cacheIndex != INVALID_CACHE_INDEX)
-  {
-    if(TextureManager::ReloadPolicy::CACHED == reloadPolicy)
-    {
-      // Mark this texture being used by another client resource. Forced reload would replace the current texture
-      // without the need for incrementing the reference count.
-      ++(mTextureInfoContainer[cacheIndex].referenceCount);
-    }
-    textureId = mTextureInfoContainer[cacheIndex].textureId;
-
-    // Update preMultiplyOnLoad value. It should be changed according to preMultiplied value of the cached info.
-    preMultiplyOnLoad = mTextureInfoContainer[cacheIndex].preMultiplied ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
-
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) Using cached texture id@%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId);
-  }
-
-  // Check if the requested Texture exist in Encoded Buffer
-  // This mean, that buffer is not cached, and need to be decoded.
-  if(textureId == INVALID_TEXTURE_ID && VisualUrl::BUFFER == url.GetProtocolType())
-  {
-    std::string location = url.GetLocation();
-    if(location.size() > 0u)
-    {
-      TextureId                 targetId           = std::stoi(location);
-      const EncodedImageBuffer& encodedImageBuffer = GetEncodedImageBuffer(targetId);
-      if(encodedImageBuffer)
-      {
-        textureId = targetId;
-
-        // Increase EncodedImageBuffer reference during it contains mTextureInfoContainer.
-        UseExternalResource(url.GetUrl());
-
-        // Insert this buffer at mTextureInfoContainer.
-        // This buffer will decode at ImageLoaderThread.
-        bool preMultiply = (preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
-        mTextureInfoContainer.push_back(TextureInfo(textureId, maskTextureId, url, desiredSize, contentScale, fittingMode, samplingMode, false, cropToMask, useAtlas, textureHash, orientationCorrection, preMultiply, animatedImageLoading, frameIndex));
-        cacheIndex = mTextureInfoContainer.size() - 1u;
-
-        DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) New buffered texture, cacheIndex:%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId);
-      }
-    }
-  }
-
-  if(textureId == INVALID_TEXTURE_ID) // There was no caching, or caching not required
-  {
-    // We need a new Texture.
-    textureId        = GenerateUniqueTextureId();
-    bool preMultiply = (preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD);
-    mTextureInfoContainer.push_back(TextureInfo(textureId, maskTextureId, url, desiredSize, contentScale, fittingMode, samplingMode, false, cropToMask, useAtlas, textureHash, orientationCorrection, preMultiply, animatedImageLoading, frameIndex));
-    cacheIndex = mTextureInfoContainer.size() - 1u;
-
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) New texture, cacheIndex:%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId);
-  }
-
-  // The below code path is common whether we are using the cache or not.
-  // The textureInfoIndex now refers to either a pre-existing cached TextureInfo,
-  // or a new TextureInfo just created.
-  TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]);
-  textureInfo.maskTextureId         = maskTextureId;
-  textureInfo.storageType           = storageType;
-  textureInfo.orientationCorrection = orientationCorrection;
-
-  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureInfo loadState:%s\n", GET_LOAD_STATE_STRING(textureInfo.loadState));
-
-  // Force reloading of texture by setting loadState unless already loading or cancelled.
-  if(TextureManager::ReloadPolicy::FORCED == reloadPolicy &&
-     TextureManager::LoadState::LOADING != textureInfo.loadState &&
-     TextureManager::LoadState::WAITING_FOR_MASK != textureInfo.loadState &&
-     TextureManager::LoadState::MASK_APPLYING != textureInfo.loadState &&
-     TextureManager::LoadState::MASK_APPLIED != textureInfo.loadState &&
-     TextureManager::LoadState::CANCELLED != textureInfo.loadState)
-  {
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "TextureManager::RequestLoad( url=%s observer=%p ) ForcedReload cacheIndex:%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId);
-
-    textureInfo.loadState = TextureManager::LoadState::NOT_STARTED;
-  }
-
-  // Check if we should add the observer.
-  // Only do this if we have not loaded yet and it will not have loaded by the end of this method.
-  switch(textureInfo.loadState)
-  {
-    case TextureManager::LoadState::LOAD_FAILED: // Failed notifies observer which then stops observing.
-    case TextureManager::LoadState::NOT_STARTED:
-    {
-      LoadOrQueueTexture(textureInfo, observer); // If called inside NotifyObservers, queues until afterwards
-      break;
-    }
-    case TextureManager::LoadState::LOADING:
-    case TextureManager::LoadState::WAITING_FOR_MASK:
-    case TextureManager::LoadState::MASK_APPLYING:
-    case TextureManager::LoadState::MASK_APPLIED:
-    {
-      ObserveTexture(textureInfo, observer);
-      break;
-    }
-    case TextureManager::LoadState::UPLOADED:
-    {
-      if(observer)
-      {
-        LoadOrQueueTexture(textureInfo, observer);
-      }
-      break;
-    }
-    case TextureManager::LoadState::CANCELLED:
-    {
-      // A cancelled texture hasn't finished loading yet. Treat as a loading texture
-      // (it's ref count has already been incremented, above)
-      textureInfo.loadState = TextureManager::LoadState::LOADING;
-      ObserveTexture(textureInfo, observer);
-      break;
-    }
-    case TextureManager::LoadState::LOAD_FINISHED:
-    {
-      // Loading has already completed.
-      if(observer && textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER)
-      {
-        LoadOrQueueTexture(textureInfo, observer);
-      }
-      break;
-    }
-  }
-
-  // Return the TextureId for which this Texture can now be referenced by externally.
-  return textureId;
-}
-
-void TextureManager::Remove(const TextureManager::TextureId textureId, TextureUploadObserver* observer)
-{
-  int textureInfoIndex = GetCacheIndexFromId(textureId);
-
-  if(textureInfoIndex != INVALID_INDEX)
-  {
-    TextureInfo& textureInfo(mTextureInfoContainer[textureInfoIndex]);
-
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::Remove(%d) url:%s\n  cacheIdx:%d loadState:%s reference count = %d\n", textureId, textureInfo.url.GetUrl().c_str(), textureInfoIndex, GET_LOAD_STATE_STRING(textureInfo.loadState), textureInfo.referenceCount);
-
-    // Decrement the reference count and check if this is the last user of this Texture.
-    if(--textureInfo.referenceCount <= 0)
-    {
-      // This is the last remove for this Texture.
-      textureInfo.referenceCount = 0;
-      bool removeTextureInfo     = false;
-
-      // If loaded, we can remove the TextureInfo and the Atlas (if atlased).
-      if(textureInfo.loadState == LoadState::UPLOADED)
-      {
-        if(textureInfo.atlas)
-        {
-          textureInfo.atlas.Remove(textureInfo.atlasRect);
-        }
-        removeTextureInfo = true;
-      }
-      else if(textureInfo.loadState == LoadState::LOADING)
-      {
-        // We mark the textureInfo for removal.
-        // Once the load has completed, this method will be called again.
-        textureInfo.loadState = LoadState::CANCELLED;
-      }
-      else
-      {
-        // In other states, we are not waiting for a load so we are safe to remove the TextureInfo data.
-        removeTextureInfo = true;
-      }
-
-      // If the state allows us to remove the TextureInfo data, we do so.
-      if(removeTextureInfo)
-      {
-        // If url location is BUFFER, decrease reference count of EncodedImageBuffer.
-        if(textureInfo.url.IsBufferResource())
-        {
-          RemoveExternalEncodedImageBuffer(textureInfo.url.GetUrl());
-        }
-        // Permanently remove the textureInfo struct.
-        mTextureInfoContainer.erase(mTextureInfoContainer.begin() + textureInfoIndex);
-      }
-    }
-
-    if(observer)
-    {
-      // Remove element from the LoadQueue
-      for(auto&& element : mLoadQueue)
-      {
-        if(element.mObserver == observer)
-        {
-          // Do not erase the item. We will clear it later in ProcessQueuedTextures().
-          element.mObserver = nullptr;
-          break;
-        }
-      }
-    }
-  }
-}
-
-VisualUrl TextureManager::GetVisualUrl(TextureId textureId)
-{
-  VisualUrl visualUrl("");
-  int       cacheIndex = GetCacheIndexFromId(textureId);
-
-  if(cacheIndex != INVALID_CACHE_INDEX)
-  {
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::GetVisualUrl. Using cached texture id=%d, textureId=%d\n", cacheIndex, textureId);
-
-    TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]);
-    visualUrl = cachedTextureInfo.url;
-  }
-  return visualUrl;
-}
-
-TextureManager::LoadState TextureManager::GetTextureState(TextureId textureId)
-{
-  LoadState loadState = TextureManager::LoadState::NOT_STARTED;
-
-  int cacheIndex = GetCacheIndexFromId(textureId);
-  if(cacheIndex != INVALID_CACHE_INDEX)
-  {
-    TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]);
-    loadState = cachedTextureInfo.loadState;
-  }
-  else
-  {
-    for(auto&& elem : mExternalTextures)
-    {
-      if(elem.textureId == textureId)
-      {
-        loadState = LoadState::UPLOADED;
-        break;
-      }
-    }
-  }
-  return loadState;
-}
-
-TextureManager::LoadState TextureManager::GetTextureStateInternal(TextureId textureId)
-{
-  LoadState loadState = TextureManager::LoadState::NOT_STARTED;
-
-  int cacheIndex = GetCacheIndexFromId(textureId);
-  if(cacheIndex != INVALID_CACHE_INDEX)
-  {
-    TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]);
-    loadState = cachedTextureInfo.loadState;
-  }
-
-  return loadState;
-}
-
-TextureSet TextureManager::GetTextureSet(TextureId textureId)
-{
-  TextureSet textureSet; // empty handle
-
-  int cacheIndex = GetCacheIndexFromId(textureId);
-  if(cacheIndex != INVALID_CACHE_INDEX)
-  {
-    TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]);
-    textureSet = cachedTextureInfo.textureSet;
-  }
-  else
-  {
-    for(auto&& elem : mExternalTextures)
-    {
-      if(elem.textureId == textureId)
-      {
-        textureSet = elem.textureSet;
-        break;
-      }
-    }
-  }
-  return textureSet;
-}
-
-EncodedImageBuffer TextureManager::GetEncodedImageBuffer(TextureId textureId)
-{
-  EncodedImageBuffer encodedImageBuffer; // empty handle
-  for(auto&& elem : mEncodedBufferTextures)
-  {
-    if(elem.textureId == textureId)
-    {
-      encodedImageBuffer = elem.encodedImageBuffer;
-      break;
-    }
-  }
-  return encodedImageBuffer;
-}
-
-EncodedImageBuffer TextureManager::GetEncodedImageBuffer(const std::string& url)
-{
-  EncodedImageBuffer encodedImageBuffer; // empty handle
-  if(url.size() > 0 && VisualUrl::BUFFER == VisualUrl::GetProtocolType(url))
-  {
-    std::string location = VisualUrl::GetLocation(url);
-    if(location.size() > 0u)
-    {
-      TextureId targetId = std::stoi(location);
-      return GetEncodedImageBuffer(targetId);
-    }
-  }
-  return encodedImageBuffer;
-}
-
-std::string TextureManager::AddExternalTexture(TextureSet& textureSet)
-{
-  TextureManager::ExternalTextureInfo info;
-  info.textureId  = GenerateUniqueTextureId();
-  info.textureSet = textureSet;
-  mExternalTextures.emplace_back(info);
-
-  return VisualUrl::CreateTextureUrl(std::to_string(info.textureId));
-}
-
-std::string TextureManager::AddExternalEncodedImageBuffer(const EncodedImageBuffer& encodedImageBuffer)
-{
-  // Duplication check
-  for(auto&& elem : mEncodedBufferTextures)
-  {
-    if(elem.encodedImageBuffer == encodedImageBuffer)
-    {
-      // If same buffer added, increase reference count and return.
-      elem.referenceCount++;
-      return VisualUrl::CreateBufferUrl(std::to_string(elem.textureId));;
-    }
-  }
-  TextureManager::EncodedBufferTextureInfo info(GenerateUniqueTextureId(), encodedImageBuffer);
-  mEncodedBufferTextures.emplace_back(info);
-  return VisualUrl::CreateBufferUrl(std::to_string(info.textureId));
-}
-
-TextureSet TextureManager::RemoveExternalTexture(const std::string& url)
-{
-  if(url.size() > 0u)
-  {
-    if(VisualUrl::TEXTURE == VisualUrl::GetProtocolType(url))
-    {
-      // get the location from the Url
-      std::string location = VisualUrl::GetLocation(url);
-      if(location.size() > 0u)
-      {
-        TextureId  id  = std::stoi(location);
-        const auto end = mExternalTextures.end();
-        for(auto iter = mExternalTextures.begin(); iter != end; ++iter)
-        {
-          if(iter->textureId == id)
-          {
-            auto textureSet = iter->textureSet;
-            if(--(iter->referenceCount) <= 0)
-            {
-              mExternalTextures.erase(iter);
-            }
-            return textureSet;
-          }
-        }
-      }
-    }
-  }
-  return TextureSet();
-}
-
-EncodedImageBuffer TextureManager::RemoveExternalEncodedImageBuffer(const std::string& url)
-{
-  if(url.size() > 0u)
-  {
-    if(VisualUrl::BUFFER == VisualUrl::GetProtocolType(url))
-    {
-      // get the location from the Url
-      std::string location = VisualUrl::GetLocation(url);
-      if(location.size() > 0u)
-      {
-        TextureId id = std::stoi(location);
-        const auto end = mEncodedBufferTextures.end();
-        for(auto iter = mEncodedBufferTextures.begin(); iter != end; ++iter)
-        {
-          if(iter->textureId == id)
-          {
-            auto encodedImageBuffer = iter->encodedImageBuffer;
-            if(--(iter->referenceCount) <= 0)
-            {
-              mEncodedBufferTextures.erase(iter);
-            }
-            return encodedImageBuffer;
-          }
-        }
-      }
-    }
-  }
-  return EncodedImageBuffer();
-}
-
-void TextureManager::UseExternalResource(const VisualUrl& url)
-{
-  if(VisualUrl::TEXTURE == url.GetProtocolType())
-  {
-    std::string location = url.GetLocation();
-    if(location.size() > 0u)
-    {
-      TextureId id = std::stoi(location);
-      for(auto&& elem : mExternalTextures)
-      {
-        if(elem.textureId == id)
-        {
-          elem.referenceCount++;
-          return;
-        }
-      }
-    }
-  }
-  else if(VisualUrl::BUFFER == url.GetProtocolType())
-  {
-    std::string location = url.GetLocation();
-    if(location.size() > 0u)
-    {
-      TextureId id = std::stoi(location);
-      for(auto&& elem : mEncodedBufferTextures)
-      {
-        if(elem.textureId == id)
-        {
-          elem.referenceCount++;
-          return;
-        }
-      }
-    }
-  }
-}
-
-void TextureManager::AddObserver(TextureManager::LifecycleObserver& observer)
-{
-  // make sure an observer doesn't observe the same object twice
-  // otherwise it will get multiple calls to ObjectDestroyed()
-  DALI_ASSERT_DEBUG(mLifecycleObservers.End() == std::find(mLifecycleObservers.Begin(), mLifecycleObservers.End(), &observer));
-  mLifecycleObservers.PushBack(&observer);
-}
-
-void TextureManager::RemoveObserver(TextureManager::LifecycleObserver& observer)
-{
-  // Find the observer...
-  auto endIter = mLifecycleObservers.End();
-  for(auto iter = mLifecycleObservers.Begin(); iter != endIter; ++iter)
-  {
-    if((*iter) == &observer)
-    {
-      mLifecycleObservers.Erase(iter);
-      break;
-    }
-  }
-  DALI_ASSERT_DEBUG(endIter != mLifecycleObservers.End());
-}
-
-void TextureManager::LoadOrQueueTexture(TextureInfo& textureInfo, TextureUploadObserver* observer)
-{
-  switch(textureInfo.loadState)
-  {
-    case LoadState::NOT_STARTED:
-    case LoadState::LOAD_FAILED:
-    {
-      if(mQueueLoadFlag)
-      {
-        QueueLoadTexture(textureInfo, observer);
-      }
-      else
-      {
-        LoadTexture(textureInfo, observer);
-      }
-      break;
-    }
-    case LoadState::UPLOADED:
-    {
-      if(mQueueLoadFlag)
-      {
-        QueueLoadTexture(textureInfo, observer);
-      }
-      else
-      {
-        // The Texture has already loaded. The other observers have already been notified.
-        // We need to send a "late" loaded notification for this observer.
-        observer->UploadComplete(true, textureInfo.textureId, textureInfo.textureSet, textureInfo.useAtlas, textureInfo.atlasRect, textureInfo.preMultiplied);
-      }
-      break;
-    }
-    case LoadState::LOADING:
-    case LoadState::CANCELLED:
-    case LoadState::LOAD_FINISHED:
-    case LoadState::WAITING_FOR_MASK:
-    case LoadState::MASK_APPLYING:
-    case LoadState::MASK_APPLIED:
-    {
-      break;
-    }
-  }
-}
-
-void TextureManager::QueueLoadTexture(TextureInfo& textureInfo, TextureUploadObserver* observer)
-{
-  auto textureId = textureInfo.textureId;
-  mLoadQueue.PushBack(LoadQueueElement(textureId, observer));
-
-  observer->DestructionSignal().Connect(this, &TextureManager::ObserverDestroyed);
-}
-
-void TextureManager::LoadTexture(TextureInfo& textureInfo, TextureUploadObserver* observer)
-{
-  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::LoadTexture(): url:%s sync:%s\n", textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously ? "T" : "F");
-
-  textureInfo.loadState = LoadState::LOADING;
-  if(!textureInfo.loadSynchronously)
-  {
-    auto& loadersContainer  = (textureInfo.url.IsLocalResource() || textureInfo.url.IsBufferResource()) ? mAsyncLocalLoaders : mAsyncRemoteLoaders;
-    auto  loadingHelperIt   = loadersContainer.GetNext();
-    auto  premultiplyOnLoad = (textureInfo.preMultiplyOnLoad && textureInfo.maskTextureId == INVALID_TEXTURE_ID) ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF;
-    DALI_ASSERT_ALWAYS(loadingHelperIt != loadersContainer.End());
-    if(textureInfo.animatedImageLoading)
-    {
-      loadingHelperIt->LoadAnimatedImage(textureInfo.textureId, textureInfo.animatedImageLoading, textureInfo.frameIndex);
-    }
-    else
-    {
-      loadingHelperIt->Load(textureInfo.textureId, textureInfo.url, textureInfo.desiredSize, textureInfo.fittingMode, textureInfo.samplingMode, textureInfo.orientationCorrection, premultiplyOnLoad);
-    }
-  }
-  ObserveTexture(textureInfo, observer);
-}
-
-void TextureManager::ProcessQueuedTextures()
-{
-  for(auto&& element : mLoadQueue)
-  {
-    if(!element.mObserver)
-    {
-      continue;
-    }
-
-    int cacheIndex = GetCacheIndexFromId(element.mTextureId);
-    if(cacheIndex != INVALID_CACHE_INDEX)
-    {
-      TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]);
-      if(textureInfo.loadState == LoadState::UPLOADED)
-      {
-        element.mObserver->UploadComplete(true, textureInfo.textureId, textureInfo.textureSet, textureInfo.useAtlas, textureInfo.atlasRect, textureInfo.preMultiplied);
-      }
-      else if(textureInfo.loadState == LoadState::LOAD_FINISHED && textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER)
-      {
-        element.mObserver->LoadComplete(true, textureInfo.pixelBuffer, textureInfo.url, textureInfo.preMultiplied);
-      }
-      else
-      {
-        LoadTexture(textureInfo, element.mObserver);
-      }
-    }
-  }
-  mLoadQueue.Clear();
-}
-
-void TextureManager::ObserveTexture(TextureInfo&           textureInfo,
-                                    TextureUploadObserver* observer)
-{
-  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::ObserveTexture(): url:%s observer:%p\n", textureInfo.url.GetUrl().c_str(), observer);
-
-  if(observer)
-  {
-    textureInfo.observerList.PushBack(observer);
-    observer->DestructionSignal().Connect(this, &TextureManager::ObserverDestroyed);
-  }
-}
-
-void TextureManager::AsyncLoadComplete(AsyncLoadingInfoContainerType& loadingContainer, uint32_t id, Devel::PixelBuffer pixelBuffer)
-{
-  DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::AsyncLoadComplete( id:%d )\n", id);
-
-  if(loadingContainer.size() >= 1u)
-  {
-    AsyncLoadingInfo loadingInfo = loadingContainer.front();
-
-    if(loadingInfo.loadId == id)
-    {
-      int cacheIndex = GetCacheIndexFromId(loadingInfo.textureId);
-      if(cacheIndex != INVALID_CACHE_INDEX)
-      {
-        TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]);
-
-        DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "  textureId:%d Url:%s CacheIndex:%d LoadState: %d\n", textureInfo.textureId, textureInfo.url.GetUrl().c_str(), cacheIndex, textureInfo.loadState);
-
-        if(textureInfo.loadState != LoadState::CANCELLED)
-        {
-          // textureInfo can be invalidated after this call (as the mTextureInfoContainer may be modified)
-          PostLoad(textureInfo, pixelBuffer);
-        }
-        else
-        {
-          Remove(textureInfo.textureId, nullptr);
-        }
-      }
-    }
-
-    loadingContainer.pop_front();
-  }
-}
-
-void TextureManager::PostLoad(TextureInfo& textureInfo, Devel::PixelBuffer& pixelBuffer)
-{
-  // Was the load successful?
-  if(pixelBuffer && (pixelBuffer.GetWidth() != 0) && (pixelBuffer.GetHeight() != 0))
-  {
-    // No atlas support for now
-    textureInfo.useAtlas      = NO_ATLAS;
-    textureInfo.preMultiplied = pixelBuffer.IsAlphaPreMultiplied();
-
-    if(textureInfo.storageType == StorageType::UPLOAD_TO_TEXTURE)
-    {
-      // If there is a mask texture ID associated with this texture, then apply the mask
-      // if it's already loaded. If it hasn't, and the mask is still loading,
-      // wait for the mask to finish loading.
-      if(textureInfo.maskTextureId != INVALID_TEXTURE_ID)
-      {
-        if(textureInfo.loadState == LoadState::MASK_APPLYING)
-        {
-          textureInfo.loadState = LoadState::MASK_APPLIED;
-          UploadTexture(pixelBuffer, textureInfo);
-          NotifyObservers(textureInfo, true);
-        }
-        else
-        {
-          LoadState maskLoadState = GetTextureStateInternal(textureInfo.maskTextureId);
-          textureInfo.pixelBuffer = pixelBuffer; // Store the pixel buffer temporarily
-          if(maskLoadState == LoadState::LOADING)
-          {
-            textureInfo.loadState = LoadState::WAITING_FOR_MASK;
-          }
-          else if(maskLoadState == LoadState::LOAD_FINISHED)
-          {
-            // Send New Task to Thread
-            ApplyMask(textureInfo, textureInfo.maskTextureId);
-          }
-        }
-      }
-      else
-      {
-        UploadTexture(pixelBuffer, textureInfo);
-        NotifyObservers(textureInfo, true);
-      }
-    }
-    else
-    {
-      textureInfo.pixelBuffer = pixelBuffer; // Store the pixel data
-      textureInfo.loadState   = LoadState::LOAD_FINISHED;
-
-      if(textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER)
-      {
-        NotifyObservers(textureInfo, true);
-      }
-      else
-      {
-        // Check if there was another texture waiting for this load to complete
-        // (e.g. if this was an image mask, and its load is on a different thread)
-        CheckForWaitingTexture(textureInfo);
-      }
-    }
-  }
-  else
-  {
-    textureInfo.loadState = LoadState::LOAD_FAILED;
-    CheckForWaitingTexture(textureInfo);
-    NotifyObservers(textureInfo, false);
-  }
-}
-
-void TextureManager::CheckForWaitingTexture(TextureInfo& maskTextureInfo)
-{
-  // Search the cache, checking if any texture has this texture id as a
-  // maskTextureId:
-  const unsigned int size = mTextureInfoContainer.size();
-
-  for(unsigned int cacheIndex = 0; cacheIndex < size; ++cacheIndex)
-  {
-    if(mTextureInfoContainer[cacheIndex].maskTextureId == maskTextureInfo.textureId &&
-       mTextureInfoContainer[cacheIndex].loadState == LoadState::WAITING_FOR_MASK)
-    {
-      TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]);
-
-      if(maskTextureInfo.loadState == LoadState::LOAD_FINISHED)
-      {
-        // Send New Task to Thread
-        ApplyMask(textureInfo, maskTextureInfo.textureId);
-      }
-      else
-      {
-        textureInfo.pixelBuffer.Reset();
-        textureInfo.loadState = LoadState::LOAD_FAILED;
-        NotifyObservers(textureInfo, false);
-      }
-    }
-  }
-}
-
-void TextureManager::ApplyMask(TextureInfo& textureInfo, TextureId maskTextureId)
-{
-  int maskCacheIndex = GetCacheIndexFromId(maskTextureId);
-  if(maskCacheIndex != INVALID_CACHE_INDEX)
-  {
-    Devel::PixelBuffer maskPixelBuffer = mTextureInfoContainer[maskCacheIndex].pixelBuffer;
-    Devel::PixelBuffer pixelBuffer     = textureInfo.pixelBuffer;
-    textureInfo.pixelBuffer.Reset();
-
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::ApplyMask(): url:%s sync:%s\n", textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously ? "T" : "F");
-
-    textureInfo.loadState   = LoadState::MASK_APPLYING;
-    auto& loadersContainer  = (textureInfo.url.IsLocalResource() || textureInfo.url.IsBufferResource()) ? mAsyncLocalLoaders : mAsyncRemoteLoaders;
-    auto  loadingHelperIt   = loadersContainer.GetNext();
-    auto  premultiplyOnLoad = textureInfo.preMultiplyOnLoad ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF;
-    DALI_ASSERT_ALWAYS(loadingHelperIt != loadersContainer.End());
-    loadingHelperIt->ApplyMask(textureInfo.textureId, pixelBuffer, maskPixelBuffer, textureInfo.scaleFactor, textureInfo.cropToMask, premultiplyOnLoad);
-  }
-}
-
-void TextureManager::UploadTexture(Devel::PixelBuffer& pixelBuffer, TextureInfo& textureInfo)
-{
-  if(textureInfo.useAtlas != USE_ATLAS)
-  {
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "  TextureManager::UploadTexture() New Texture for textureId:%d\n", textureInfo.textureId);
-
-    // Check if this pixelBuffer is premultiplied
-    textureInfo.preMultiplied = pixelBuffer.IsAlphaPreMultiplied();
-
-    auto& renderingAddOn = RenderingAddOn::Get();
-    if(renderingAddOn.IsValid())
-    {
-      renderingAddOn.CreateGeometry(textureInfo.textureId, pixelBuffer);
-    }
-
-    Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelBuffer.GetPixelFormat(), pixelBuffer.GetWidth(), pixelBuffer.GetHeight());
-
-    PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer);
-    texture.Upload(pixelData);
-    if(!textureInfo.textureSet)
-    {
-      textureInfo.textureSet = TextureSet::New();
-    }
-    textureInfo.textureSet.SetTexture(0u, texture);
-  }
-
-  // Update the load state.
-  // Note: This is regardless of success as we care about whether a
-  // load attempt is in progress or not.  If unsuccessful, a broken
-  // image is still loaded.
-  textureInfo.loadState = LoadState::UPLOADED;
-}
-
-void TextureManager::NotifyObservers(TextureInfo& textureInfo, bool success)
-{
-  TextureId textureId = textureInfo.textureId;
-
-  // If there is an observer: Notify the load is complete, whether successful or not,
-  // and erase it from the list
-  TextureInfo* info = &textureInfo;
-
-  mQueueLoadFlag = true;
-
-  while(info->observerList.Count())
-  {
-    TextureUploadObserver* observer = info->observerList[0];
-
-    // During UploadComplete() a Control ResourceReady() signal is emitted.
-    // During that signal the app may add remove /add Textures (e.g. via
-    // ImageViews).
-    // It is possible for observers to be removed from the observer list,
-    // and it is also possible for the mTextureInfoContainer to be modified,
-    // invalidating the reference to the textureInfo struct.
-    // Texture load requests for the same URL are deferred until the end of this
-    // method.
-    DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "NotifyObservers() url:%s loadState:%s\n", textureInfo.url.GetUrl().c_str(), GET_LOAD_STATE_STRING(textureInfo.loadState));
-
-    // It is possible for the observer to be deleted.
-    // Disconnect and remove the observer first.
-    observer->DestructionSignal().Disconnect(this, &TextureManager::ObserverDestroyed);
-
-    info->observerList.Erase(info->observerList.begin());
-
-    if(info->storageType == StorageType::RETURN_PIXEL_BUFFER)
-    {
-      observer->LoadComplete(success, info->pixelBuffer, info->url, info->preMultiplied);
-    }
-    else
-    {
-      observer->UploadComplete(success, info->textureId, info->textureSet, info->useAtlas, info->atlasRect, info->preMultiplied);
-    }
-
-    // Get the textureInfo from the container again as it may have been invalidated.
-    int textureInfoIndex = GetCacheIndexFromId(textureId);
-    if(textureInfoIndex == INVALID_CACHE_INDEX)
-    {
-      break; // texture has been removed - can stop.
-    }
-    info = &mTextureInfoContainer[textureInfoIndex];
-  }
-
-  mQueueLoadFlag = false;
-  ProcessQueuedTextures();
-
-  if(info->storageType == StorageType::RETURN_PIXEL_BUFFER && info->observerList.Count() == 0)
-  {
-    Remove(info->textureId, nullptr);
-  }
-}
-
-TextureManager::TextureId TextureManager::GenerateUniqueTextureId()
-{
-  return mCurrentTextureId++;
-}
-
-int TextureManager::GetCacheIndexFromId(const TextureId textureId)
-{
-  const unsigned int size = mTextureInfoContainer.size();
-
-  for(unsigned int i = 0; i < size; ++i)
-  {
-    if(mTextureInfoContainer[i].textureId == textureId)
-    {
-      return i;
-    }
-  }
-
-  return INVALID_CACHE_INDEX;
-}
-
-TextureManager::TextureHash TextureManager::GenerateHash(
-  const std::string&             url,
-  const ImageDimensions          size,
-  const FittingMode::Type        fittingMode,
-  const Dali::SamplingMode::Type samplingMode,
-  const UseAtlas                 useAtlas,
-  TextureId                      maskTextureId)
-{
-  std::string    hashTarget(url);
-  const size_t   urlLength = hashTarget.length();
-  const uint16_t width     = size.GetWidth();
-  const uint16_t height    = size.GetWidth();
-
-  // If either the width or height has been specified, include the resizing options in the hash
-  if(width != 0 || height != 0)
-  {
-    // We are appending 5 bytes to the URL to form the hash input.
-    hashTarget.resize(urlLength + 5u);
-    char* hashTargetPtr = &(hashTarget[urlLength]);
-
-    // Pack the width and height (4 bytes total).
-    *hashTargetPtr++ = size.GetWidth() & 0xff;
-    *hashTargetPtr++ = (size.GetWidth() >> 8u) & 0xff;
-    *hashTargetPtr++ = size.GetHeight() & 0xff;
-    *hashTargetPtr++ = (size.GetHeight() >> 8u) & 0xff;
-
-    // Bit-pack the FittingMode, SamplingMode and atlasing.
-    // FittingMode=2bits, SamplingMode=3bits, useAtlas=1bit
-    *hashTargetPtr = (fittingMode << 4u) | (samplingMode << 1) | useAtlas;
-  }
-  else
-  {
-    // We are not including sizing information, but we still need an extra byte for atlasing.
-    hashTarget.resize(urlLength + 1u);
-
-    // Add the atlasing to the hash input.
-    switch(useAtlas)
-    {
-      case UseAtlas::NO_ATLAS:
-      {
-        hashTarget[urlLength] = 'f';
-        break;
-      }
-      case UseAtlas::USE_ATLAS:
-      {
-        hashTarget[urlLength] = 't';
-        break;
-      }
-    }
-  }
-
-  if(maskTextureId != INVALID_TEXTURE_ID)
-  {
-    auto textureIdIndex = hashTarget.length();
-    hashTarget.resize(hashTarget.length() + sizeof(TextureId));
-    unsigned char* hashTargetPtr = reinterpret_cast<unsigned char*>(&(hashTarget[textureIdIndex]));
-
-    // Append the texture id to the end of the URL byte by byte:
-    // (to avoid SIGBUS / alignment issues)
-    for(size_t byteIter = 0; byteIter < sizeof(TextureId); ++byteIter)
-    {
-      *hashTargetPtr++ = maskTextureId & 0xff;
-      maskTextureId >>= 8u;
-    }
-  }
-
-  return Dali::CalculateHash(hashTarget);
-}
-
-int TextureManager::FindCachedTexture(
-  const TextureManager::TextureHash hash,
-  const std::string&                url,
-  const ImageDimensions             size,
-  const FittingMode::Type           fittingMode,
-  const Dali::SamplingMode::Type    samplingMode,
-  const bool                        useAtlas,
-  TextureId                         maskTextureId,
-  TextureManager::MultiplyOnLoad    preMultiplyOnLoad)
-{
-  // Default to an invalid ID, in case we do not find a match.
-  int cacheIndex = INVALID_CACHE_INDEX;
-
-  // Iterate through our hashes to find a match.
-  const unsigned int count = mTextureInfoContainer.size();
-  for(unsigned int i = 0u; i < count; ++i)
-  {
-    if(mTextureInfoContainer[i].hash == hash)
-    {
-      // We have a match, now we check all the original parameters in case of a hash collision.
-      TextureInfo& textureInfo(mTextureInfoContainer[i]);
-
-      if((url == textureInfo.url.GetUrl()) &&
-         (useAtlas == textureInfo.useAtlas) &&
-         (maskTextureId == textureInfo.maskTextureId) &&
-         (size == textureInfo.desiredSize) &&
-         ((size.GetWidth() == 0 && size.GetHeight() == 0) ||
-          (fittingMode == textureInfo.fittingMode &&
-           samplingMode == textureInfo.samplingMode)))
-      {
-        // 1. If preMultiplyOnLoad is MULTIPLY_ON_LOAD, then textureInfo.preMultiplyOnLoad should be true. The premultiplication result can be different.
-        // 2. If preMultiplyOnLoad is LOAD_WITHOUT_MULTIPLY, then textureInfo.preMultiplied should be false.
-        if((preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD && textureInfo.preMultiplyOnLoad) || (preMultiplyOnLoad == TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY && !textureInfo.preMultiplied))
-        {
-          // The found Texture is a match.
-          cacheIndex = i;
-          break;
-        }
-      }
-    }
-  }
-
-  return cacheIndex;
-}
-
-void TextureManager::ObserverDestroyed(TextureUploadObserver* observer)
-{
-  const unsigned int count = mTextureInfoContainer.size();
-  for(unsigned int i = 0; i < count; ++i)
-  {
-    TextureInfo& textureInfo(mTextureInfoContainer[i]);
-    for(TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin();
-        j != textureInfo.observerList.End();)
-    {
-      if(*j == observer)
-      {
-        j = textureInfo.observerList.Erase(j);
-      }
-      else
-      {
-        ++j;
-      }
-    }
-  }
-
-  // Remove element from the LoadQueue
-  for(auto&& element : mLoadQueue)
-  {
-    if(element.mObserver == observer)
-    {
-      element.mObserver = nullptr;
-    }
-  }
-}
-
-TextureManager::AsyncLoadingHelper::AsyncLoadingHelper(TextureManager& textureManager)
-: AsyncLoadingHelper(Toolkit::AsyncImageLoader::New(), textureManager, AsyncLoadingInfoContainerType())
-{
-}
-
-void TextureManager::AsyncLoadingHelper::LoadAnimatedImage(TextureId                  textureId,
-                                                           Dali::AnimatedImageLoading animatedImageLoading,
-                                                           uint32_t                   frameIndex)
-{
-  mLoadingInfoContainer.push_back(AsyncLoadingInfo(textureId));
-  auto id                             = GetImplementation(mLoader).LoadAnimatedImage(animatedImageLoading, frameIndex);
-  mLoadingInfoContainer.back().loadId = id;
-}
-
-void TextureManager::AsyncLoadingHelper::Load(TextureId                                textureId,
-                                              const VisualUrl&                         url,
-                                              ImageDimensions                          desiredSize,
-                                              FittingMode::Type                        fittingMode,
-                                              SamplingMode::Type                       samplingMode,
-                                              bool                                     orientationCorrection,
-                                              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
-{
-  mLoadingInfoContainer.push_back(AsyncLoadingInfo(textureId));
-  if(DALI_UNLIKELY(url.IsBufferResource()))
-  {
-    auto id                             = GetImplementation(mLoader).LoadEncodedImageBuffer(mTextureManager.GetEncodedImageBuffer(url.GetUrl()), desiredSize, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad);
-    mLoadingInfoContainer.back().loadId = id;
-  }
-  else
-  {
-    auto id                             = GetImplementation(mLoader).Load(url, desiredSize, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad);
-    mLoadingInfoContainer.back().loadId = id;
-  }
-}
-
-void TextureManager::AsyncLoadingHelper::ApplyMask(TextureId                                textureId,
-                                                   Devel::PixelBuffer                       pixelBuffer,
-                                                   Devel::PixelBuffer                       maskPixelBuffer,
-                                                   float                                    contentScale,
-                                                   bool                                     cropToMask,
-                                                   DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad)
-{
-  mLoadingInfoContainer.push_back(AsyncLoadingInfo(textureId));
-  auto id                             = GetImplementation(mLoader).ApplyMask(pixelBuffer, maskPixelBuffer, contentScale, cropToMask, preMultiplyOnLoad);
-  mLoadingInfoContainer.back().loadId = id;
-}
-
-TextureManager::AsyncLoadingHelper::AsyncLoadingHelper(AsyncLoadingHelper&& rhs)
-: AsyncLoadingHelper(rhs.mLoader, rhs.mTextureManager, std::move(rhs.mLoadingInfoContainer))
-{
-}
-
-TextureManager::AsyncLoadingHelper::AsyncLoadingHelper(
-  Toolkit::AsyncImageLoader       loader,
-  TextureManager&                 textureManager,
-  AsyncLoadingInfoContainerType&& loadingInfoContainer)
-: mLoader(loader),
-  mTextureManager(textureManager),
-  mLoadingInfoContainer(std::move(loadingInfoContainer))
-{
-  DevelAsyncImageLoader::PixelBufferLoadedSignal(mLoader).Connect(
-    this, &AsyncLoadingHelper::AsyncLoadComplete);
-}
-
-void TextureManager::AsyncLoadingHelper::AsyncLoadComplete(uint32_t           id,
-                                                           Devel::PixelBuffer pixelBuffer)
-{
-  mTextureManager.AsyncLoadComplete(mLoadingInfoContainer, id, pixelBuffer);
-}
-
-Geometry TextureManager::GetRenderGeometry(TextureId textureId, uint32_t& frontElements, uint32_t& backElements)
-{
-  return RenderingAddOn::Get().IsValid() ? RenderingAddOn::Get().GetGeometry(textureId, frontElements, backElements) : Geometry();
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h
deleted file mode 100644
index 48eea78..0000000
--- a/dali-toolkit/internal/visuals/texture-manager-impl.h
+++ /dev/null
@@ -1,941 +0,0 @@
-#ifndef DALI_TOOLKIT_TEXTURE_MANAGER_IMPL_H
-#define DALI_TOOLKIT_TEXTURE_MANAGER_IMPL_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <dali/devel-api/common/owner-container.h>
-#include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
-#include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/object/ref-object.h>
-#include <dali/public-api/rendering/geometry.h>
-#include <dali/public-api/rendering/texture-set.h>
-#include <deque>
-#include <functional>
-#include <memory>
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
-#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
-#include <dali-toolkit/internal/helpers/round-robin-container-view.h>
-#include <dali-toolkit/internal/image-loader/async-image-loader-impl.h>
-#include <dali-toolkit/internal/visuals/texture-upload-observer.h>
-#include <dali-toolkit/internal/visuals/visual-url.h>
-#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-class ImageAtlasManager;
-typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
-
-/**
- * The TextureManager provides a common Image loading API for Visuals.
- *
- * The TextureManager is responsible for providing sync, async, atlased and non-atlased loads.
- * Texture caching is provided and performed when possible.
- * Broken Images are automatically provided on load failure.
- */
-class TextureManager : public ConnectionTracker
-{
-public:
-  typedef int32_t  TextureId;               ///< The TextureId type. This is used as a handle to refer to a particular Texture.
-  static const int INVALID_TEXTURE_ID = -1; ///< Used to represent a null TextureId or error
-
-  /**
-   * Whether the texture should be atlased or uploaded into it's own GPU texture
-   */
-  enum UseAtlas
-  {
-    NO_ATLAS,
-    USE_ATLAS
-  };
-
-  /**
-   * Whether the pixel data should be kept in TextureManager, returned with pixelBuffer or uploaded for rendering
-   */
-  enum class StorageType : uint8_t
-  {
-    KEEP_PIXEL_BUFFER,
-    RETURN_PIXEL_BUFFER,
-    UPLOAD_TO_TEXTURE
-  };
-
-  /**
-   * Whether the texture should be loaded synchronously or asynchronously.
-   */
-  enum class LoadType : uint8_t
-  {
-    LOAD_ASYNCHRONOUSLY,
-    LOAD_SYNCHRONOUSLY
-  };
-
-  /**
-   * @brief The LoadState Enumeration represents the current state of a particular Texture's life-cycle.
-   */
-  enum class LoadState : uint8_t
-  {
-    NOT_STARTED,      ///< Default
-    LOADING,          ///< Loading has been started, but not finished.
-    LOAD_FINISHED,    ///< Loading has finished. (for CPU storage only)
-    WAITING_FOR_MASK, ///< Loading has finished, but waiting for mask image
-    MASK_APPLYING,    ///< Loading has finished, Mask is applying
-    MASK_APPLIED,     ///< Loading has finished, Mask is applyied by GPU
-    UPLOADED,         ///< Uploaded and ready. (For GPU upload only)
-    CANCELLED,        ///< Removed before loading completed
-    LOAD_FAILED       ///< Async loading failed, e.g. connection problem
-  };
-
-  /**
-   * @brief Types of reloading policies
-   */
-  enum class ReloadPolicy
-  {
-    CACHED = 0, ///< Loads cached texture if it exists.
-    FORCED      ///< Forces reloading of texture.
-  };
-
-  /**
-   * @brief Whether to multiply alpha into color channels on load
-   */
-  enum class MultiplyOnLoad
-  {
-    LOAD_WITHOUT_MULTIPLY = 0, ///< Don't modify the image
-    MULTIPLY_ON_LOAD           ///< Multiply alpha into color channels on load
-  };
-
-public:
-  struct MaskingData
-  {
-    MaskingData();
-    ~MaskingData() = default;
-
-    VisualUrl                 mAlphaMaskUrl;
-    TextureManager::TextureId mAlphaMaskId;
-    float                     mContentScaleFactor;
-    bool                      mCropToMask;
-  };
-  using MaskingDataPointer = std::unique_ptr<MaskingData>;
-
-  /**
-   * Class to provide lifecycle event on destruction of texture manager.
-   */
-  struct LifecycleObserver
-  {
-    /**
-     * Called shortly before the texture manager is destroyed.
-     */
-    virtual void TextureManagerDestroyed() = 0;
-  };
-
-  /**
-   * Constructor.
-   */
-  TextureManager();
-
-  /**
-   * Destructor.
-   */
-  ~TextureManager() override;
-
-  // TextureManager Main API:
-
-  /**
-   * @brief Requests an frame of animated image load.
-   *
-   * The parameters are used to specify how the animated image is loaded.
-   * The observer has the LoadComplete method called when the load is ready.
-   *
-   * @param[in] animatedImageLoading  The AnimatedImageLoading that contain the animated image information
-   * @param[in] frameIndex            The frame index to load.
-   * @param[in] samplingMode          The SamplingMode to use
-   * @param[in] synchronousLoading    true if the frame should be loaded synchronously
-   * @param[out] textureId            The textureId of the frame
-   * @param[in] wrapModeU             Horizontal Wrap mode
-   * @param[in] wrapModeV             Vertical Wrap mode
-   * @param[in] textureObserver       The client object should inherit from this and provide the "UploadCompleted" virtual.
-   *                                  This is called when an image load completes (or fails).
-   *
-   * @return                          The texture set containing the frame of animated image, or empty if still loading.
-   */
-
-  TextureSet LoadAnimatedImageTexture(Dali::AnimatedImageLoading animatedImageLoading,
-                                      uint32_t                   frameIndex,
-                                      Dali::SamplingMode::Type   samplingMode,
-                                      bool                       synchronousLoading,
-                                      TextureManager::TextureId& textureId,
-                                      Dali::WrapMode::Type       wrapModeU,
-                                      Dali::WrapMode::Type       wrapModeV,
-                                      TextureUploadObserver*     textureObserver);
-
-  /**
-   * @brief Requests an image load of the given URL to get PixelBuffer.
-   *
-   * The parameters are used to specify how the image is loaded.
-   * The observer has the LoadComplete method called when the load is ready.
-   *
-   * @param[in] url                   The URL of the image to load
-   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
-   * @param[in] fittingMode           The FittingMode to use
-   * @param[in] samplingMode          The SamplingMode to use
-   * @param[in] synchronousLoading    true if the URL should be loaded synchronously
-   * @param[in] textureObserver       The client object should inherit from this and provide the "UploadCompleted" virtual.
-   *                                  This is called when an image load completes (or fails).
-   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
-   * @param[in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the
-   *                                  image has no alpha channel
-   *
-   * @return                          The pixel buffer containing the image, or empty if still loading.
-   */
-
-  Devel::PixelBuffer LoadPixelBuffer(const VisualUrl&                url,
-                                     Dali::ImageDimensions           desiredSize,
-                                     Dali::FittingMode::Type         fittingMode,
-                                     Dali::SamplingMode::Type        samplingMode,
-                                     bool                            synchronousLoading,
-                                     TextureUploadObserver*          textureObserver,
-                                     bool                            orientationCorrection,
-                                     TextureManager::MultiplyOnLoad& preMultiplyOnLoad);
-
-  /**
-   * @brief Requests an image load of the given URL.
-   *
-   * The parameters are used to specify how the image is loaded.
-   * The observer has the UploadComplete method called when the load is ready.
-   *
-   * When the client has finished with the Texture, Remove() should be called.
-   *
-   * @param[in] url                   The URL of the image to load
-   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
-   * @param[in] fittingMode           The FittingMode to use
-   * @param[in] samplingMode          The SamplingMode to use
-   * @param[in, out] maskInfo         Mask info structure
-   * @param[in] synchronousLoading    true if the URL should be loaded synchronously
-   * @param[out] textureId,           The textureId of the URL
-   * @param[out] textureRect          The rectangle within the texture atlas that this URL occupies,
-   *                                  this is the rectangle in normalized coordinates.
-   * @param[out] textureRectSize      The rectangle within the texture atlas that this URL occupies,
-   *                                  this is the same rectangle in pixels.
-   * @param[in,out] atlasingStatus    Set to USE_ATLAS to attempt atlasing. If atlasing fails, the image will still
-   *                                  be loaded, and marked successful, but this will be set to false.
-   *                                  If atlasing succeeds, this will be set to true.
-   * @param[out] loadingStatus        The loading status of the texture
-   * @param[in] wrapModeU             Horizontal Wrap mode
-   * @param[in] wrapModeV             Vertical Wrap mode
-   * @param[in] textureObserver       The client object should inherit from this and provide the "UploadCompleted" virtual.
-   *                                  This is called when an image load completes (or fails).
-   * @param[in] atlasObserver         This is used if the texture is atlased, and will be called instead of
-   *                                  textureObserver.UploadCompleted
-   * @param[in] imageAtlasManager     The atlas manager to use for atlasing textures
-   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
-   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
-   * @param[in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the
-   *                                  image has no alpha channel
-   *
-   * @return                          The texture set containing the image, or empty if still loading.
-   */
-
-  TextureSet LoadTexture(const VisualUrl&             url,
-                         Dali::ImageDimensions        desiredSize,
-                         Dali::FittingMode::Type      fittingMode,
-                         Dali::SamplingMode::Type     samplingMode,
-                         MaskingDataPointer&          maskInfo,
-                         bool                         synchronousLoading,
-                         TextureManager::TextureId&   textureId,
-                         Vector4&                     textureRect,
-                         Dali::ImageDimensions&       textureRectSize,
-                         bool&                        atlasingStatus,
-                         bool&                        loadingStatus,
-                         Dali::WrapMode::Type         wrapModeU,
-                         Dali::WrapMode::Type         wrapModeV,
-                         TextureUploadObserver*       textureObserver,
-                         AtlasUploadObserver*         atlasObserver,
-                         ImageAtlasManagerPtr         imageAtlasManager,
-                         bool                         orientationCorrection,
-                         TextureManager::ReloadPolicy reloadPolicy,
-                         MultiplyOnLoad&              preMultiplyOnLoad);
-
-  /**
-   * @brief Requests an image load of the given URL.
-   *
-   * The parameters are used to specify how the image is loaded.
-   * The observer has the UploadComplete method called when the load is ready.
-   *
-   * When the client has finished with the Texture, Remove() should be called.
-   *
-   * @param[in] url                   The URL of the image to load
-   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
-   * @param[in] fittingMode           The FittingMode to use
-   * @param[in] samplingMode          The SamplingMode to use
-   * @param[in] useAtlasing           Set to USE_ATLAS to attempt atlasing. If atlasing fails, the image will still be loaded, and marked successful,
-   *                                  but "useAtlasing" will be set to false in the "UploadCompleted" callback from the TextureManagerUploadObserver.
-   * @param[in] observer              The client object should inherit from this and provide the "UploadCompleted" virtual.
-   *                                  This is called when an image load completes (or fails).
-   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
-   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
-   * @param[in,out] preMultiplyOnLoad     True if the image color should be multiplied by it's alpha. Set to false if the image has no alpha channel
-   * @return                          A TextureId to use as a handle to reference this Texture
-   */
-  TextureId RequestLoad(const VisualUrl&             url,
-                        const ImageDimensions        desiredSize,
-                        FittingMode::Type            fittingMode,
-                        Dali::SamplingMode::Type     samplingMode,
-                        const UseAtlas               useAtlasing,
-                        TextureUploadObserver*       observer,
-                        bool                         orientationCorrection,
-                        TextureManager::ReloadPolicy reloadPolicy,
-                        MultiplyOnLoad&              preMultiplyOnLoad);
-
-  /**
-   * @brief Requests an image load of the given URL, when the texture has
-   * have loaded, it will perform a blend with the image mask, and upload
-   * the blended texture.
-   *
-   * The parameters are used to specify how the image is loaded.
-   * The observer has the UploadComplete method called when the load is ready.
-   *
-   * When the client has finished with the Texture, Remove() should be called.
-   *
-   * @param[in] url                   The URL of the image to load
-   * @param[in] maskTextureId         The texture id of an image to mask this with
-   *                                  (can be INVALID if no masking required)
-   * @param[in] contentScale          The scale factor to apply to the image before masking
-   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
-   * @param[in] fittingMode           The FittingMode to use
-   * @param[in] samplingMode          The SamplingMode to use
-   * @param[in] useAtlasing           Set to USE_ATLAS to attempt atlasing. If atlasing fails, the image will still
-   *                                  be loaded, and marked successful,
-   *                                  but "useAtlasing" will be set to false in the "UploadCompleted" callback from
-   *                                  the TextureManagerUploadObserver.
-   * @param[in] cropToMask            Only used with masking, this will crop the scaled image to the mask size.
-   *                                  If false, then the mask will be scaled to fit the image before being applied.
-   * @param[in] observer              The client object should inherit from this and provide the "UploadCompleted"
-   *                                  virtual.
-   *                                  This is called when an image load completes (or fails).
-   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
-   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
-   * @param[in] preMultiplyOnLoad     True if the image color should be multiplied by it's alpha. Set to false if the
-   *                                  image has no alpha channel
-   * @return                          A TextureId to use as a handle to reference this Texture
-   */
-  TextureId RequestLoad(const VisualUrl&             url,
-                        TextureId                    maskTextureId,
-                        float                        contentScale,
-                        const ImageDimensions        desiredSize,
-                        FittingMode::Type            fittingMode,
-                        Dali::SamplingMode::Type     samplingMode,
-                        const UseAtlas               useAtlasing,
-                        bool                         cropToMask,
-                        TextureUploadObserver*       observer,
-                        bool                         orientationCorrection,
-                        TextureManager::ReloadPolicy reloadPolicy,
-                        MultiplyOnLoad&              preMultiplyOnLoad);
-
-  /**
-   * Requests a masking image to be loaded. This mask is not uploaded to GL,
-   * instead, it is stored in CPU memory, and can be used for CPU blending.
-   */
-  TextureId RequestMaskLoad(const VisualUrl& maskUrl);
-
-  /**
-   * @brief Remove a Texture from the TextureManager.
-   *
-   * Textures are cached and therefore only the removal of the last
-   * occurrence of a Texture will cause its removal internally.
-   *
-   * @param[in] textureId The ID of the Texture to remove.
-   * @param[in] textureObserver The texture observer.
-   */
-  void Remove(const TextureManager::TextureId textureId, TextureUploadObserver* textureObserver);
-
-  /**
-   * @brief Get the visualUrl associated with the texture id.
-   * @param[in] textureId The texture Id to get
-   * @return The visual Url associated with the texture id.
-   */
-  VisualUrl GetVisualUrl(TextureId textureId);
-
-  /**
-   * @brief Get the current state of a texture
-   * @param[in] textureId The texture id to query
-   * @return The loading state if the texture is valid, or NOT_STARTED if the textureId
-   * is not valid.
-   */
-  LoadState GetTextureState(TextureId textureId);
-
-  /**
-   * @brief Get the associated texture set if the texture id is valid
-   * @param[in] textureId The texture Id to look up
-   * @return the associated texture set, or an empty handle if textureId is not valid
-   */
-  TextureSet GetTextureSet(TextureId textureId);
-
-  /**
-   * @brief Get the encoded image buffer
-   * @param[in] textureId The textureId to look up
-   * @return the encoded image buffer, or an empty handle if textureId is not valid
-   */
-  EncodedImageBuffer GetEncodedImageBuffer(TextureId textureId);
-
-  /**
-   * @brief Get the encoded image buffer by VisualUrl
-   * @param[in] url The url to look up
-   * @return the encoded image buffer, or an empty handle if url is not buffer resource or buffer is not valid
-   */
-  EncodedImageBuffer GetEncodedImageBuffer(const std::string& url);
-
-  /**
-   * Adds an external texture to the texture manager
-   * @param[in] texture The texture to add
-   * @return string containing the URL for the texture
-   */
-  std::string AddExternalTexture(TextureSet& texture);
-
-  /**
-   * Adds an external encoded image buffer to the texture manager
-   * @param[in] encodedImageBuffer The image buffer to add
-   * @return string containing the URL for the texture
-   */
-  std::string AddExternalEncodedImageBuffer(const EncodedImageBuffer& encodedImageBuffer);
-
-  /**
-   * Removes an external texture from texture manager
-   * @param[in] url The string containing the texture to remove
-   * @return handle to the texture
-   */
-  TextureSet RemoveExternalTexture(const std::string& url);
-
-  /**
-   * Removes an external encoded image buffer from texture manager
-   * @param[in] url The string containing the encoded image buffer to remove
-   * @return handle to the encoded image buffer
-   */
-  EncodedImageBuffer RemoveExternalEncodedImageBuffer(const std::string& url);
-
-  /**
-   * @brief Notify that external textures or external encoded image buffers are used.
-   * @param[in] url The URL of the texture to use.
-   */
-  void UseExternalResource(const VisualUrl& url);
-
-  /**
-   * Add an observer to the object.
-   * @param[in] observer The observer to add.
-   */
-  void AddObserver(TextureManager::LifecycleObserver& observer);
-
-  /**
-   * Remove an observer from the object
-   * @pre The observer has already been added.
-   * @param[in] observer The observer to remove.
-   */
-  void RemoveObserver(TextureManager::LifecycleObserver& observer);
-
-  /**
-   * @brief Returns the geometry associated with texture.
-   * @param[in] textureId Id of the texture
-   * @param[out] frontElements number of front elements
-   * @param[out] backElements number of back elements
-   * @return Returns valid geometry object
-   */
-  Geometry GetRenderGeometry(TextureId textureId, uint32_t& frontElements, uint32_t& backElements);
-
-private:
-  /**
-   * @brief Requests an image load of the given URL, when the texture has
-   * have loaded, if there is a valid maskTextureId, it will perform a
-   * CPU blend with the mask, and upload the blend texture.
-   *
-   * The parameters are used to specify how the image is loaded.
-   * The observer has the UploadComplete method called when the load is ready.
-   *
-   * When the client has finished with the Texture, Remove() should be called.
-   *
-   * @param[in] url                   The URL of the image to load
-   * @param[in] maskTextureId         The texture id of an image to use as a mask. If no mask is required, then set
-   *                                  to INVALID_TEXTURE_ID
-   * @param[in] contentScale          The scaling factor to apply to the content when masking
-   * @param[in] desiredSize           The size the image is likely to appear at. This can be set to 0,0 for automatic
-   * @param[in] fittingMode           The FittingMode to use
-   * @param[in] samplingMode          The SamplingMode to use
-   * @param[in] useAtlasing           Set to USE_ATLAS to attempt atlasing. If atlasing fails, the image will still be
-   *                                  loaded, and marked successful, but "useAtlasing" will be set to false in the
-   *                                  "UploadCompleted" callback from the TextureManagerUploadObserver.
-   * @param[in] cropToMask            Whether to crop the target after masking, or scale the mask to the image before
-   *                                  masking.
-   * @param[in] storageType,          Whether the pixel data is stored in the cache or uploaded to the GPU
-   * @param[in] observer              The client object should inherit from this and provide the "UploadCompleted"
-   *                                  virtual.
-   *                                  This is called when an image load completes (or fails).
-   * @param[in] orientationCorrection Whether to rotate image to match embedded orientation data
-   * @param[in] reloadPolicy          Forces a reload of the texture even if already cached
-   * @param[in] preMultiplyOnLoad     True if the image color should be multiplied by it's alpha. Set to false if
-   *                                  there is no alpha
-   * @param[in] animatedImageLoading  The AnimatedImageLoading to load animated image
-   * @param[in] frameIndex            The frame index of a frame to be loaded frame
-   * @return                          A TextureId to use as a handle to reference this Texture
-   */
-  TextureId RequestLoadInternal(
-    const VisualUrl&             url,
-    TextureId                    maskTextureId,
-    float                        contentScale,
-    const ImageDimensions        desiredSize,
-    FittingMode::Type            fittingMode,
-    Dali::SamplingMode::Type     samplingMode,
-    UseAtlas                     useAtlas,
-    bool                         cropToMask,
-    StorageType                  storageType,
-    TextureUploadObserver*       observer,
-    bool                         orientationCorrection,
-    TextureManager::ReloadPolicy reloadPolicy,
-    MultiplyOnLoad&              preMultiplyOnLoad,
-    Dali::AnimatedImageLoading   animatedImageLoading,
-    uint32_t                     frameIndex);
-
-  /**
-   * @brief Get the current state of a texture
-   * @param[in] textureId The texture id to query
-   * @return The loading state if the texture is valid, or NOT_STARTED if the textureId
-   * is not valid.
-   */
-  LoadState GetTextureStateInternal(TextureId textureId);
-
-  typedef size_t TextureHash; ///< The type used to store the hash used for Texture caching.
-
-  // Structs:
-
-  /**
-   * @brief This struct is used to manage the life-cycle of Texture loading and caching.
-   */
-  struct TextureInfo
-  {
-    TextureInfo(TextureId                   textureId,
-                TextureId                   maskTextureId,
-                const VisualUrl&            url,
-                ImageDimensions             desiredSize,
-                float                       scaleFactor,
-                FittingMode::Type           fittingMode,
-                Dali::SamplingMode::Type    samplingMode,
-                bool                        loadSynchronously,
-                bool                        cropToMask,
-                UseAtlas                    useAtlas,
-                TextureManager::TextureHash hash,
-                bool                        orientationCorrection,
-                bool                        preMultiplyOnLoad,
-                Dali::AnimatedImageLoading  animatedImageLoading,
-                uint32_t                    frameIndex)
-    : url(url),
-      desiredSize(desiredSize),
-      useSize(desiredSize),
-      atlasRect(0.0f, 0.0f, 1.0f, 1.0f), // Full atlas rectangle
-      textureId(textureId),
-      maskTextureId(maskTextureId),
-      hash(hash),
-      scaleFactor(scaleFactor),
-      referenceCount(1u),
-      loadState(LoadState::NOT_STARTED),
-      fittingMode(fittingMode),
-      samplingMode(samplingMode),
-      storageType(StorageType::UPLOAD_TO_TEXTURE),
-      animatedImageLoading(animatedImageLoading),
-      frameIndex(frameIndex),
-      loadSynchronously(loadSynchronously),
-      useAtlas(useAtlas),
-      cropToMask(cropToMask),
-      orientationCorrection(true),
-      preMultiplyOnLoad(preMultiplyOnLoad),
-      preMultiplied(false)
-    {
-    }
-
-    /**
-     * Container type used to store all observer clients of this Texture
-     */
-    typedef Dali::Vector<TextureUploadObserver*> ObserverListType;
-
-    ObserverListType            observerList;          ///< Container used to store all observer clients of this Texture
-    Toolkit::ImageAtlas         atlas;                 ///< The atlas this Texture lays within (if any)
-    Devel::PixelBuffer          pixelBuffer;           ///< The PixelBuffer holding the image data (May be empty after upload)
-    TextureSet                  textureSet;            ///< The TextureSet holding the Texture
-    VisualUrl                   url;                   ///< The URL of the image
-    ImageDimensions             desiredSize;           ///< The size requested
-    ImageDimensions             useSize;               ///< The size used
-    Vector4                     atlasRect;             ///< The atlas rect used if atlased
-    TextureId                   textureId;             ///< The TextureId associated with this Texture
-    TextureId                   maskTextureId;         ///< The mask TextureId to be applied on load
-    TextureManager::TextureHash hash;                  ///< The hash used to cache this Texture
-    float                       scaleFactor;           ///< The scale factor to apply to the Texture when masking
-    int16_t                     referenceCount;        ///< The reference count of clients using this Texture
-    LoadState                   loadState;             ///< The load state showing the load progress of the Texture
-    FittingMode::Type           fittingMode : 3;       ///< The requested FittingMode
-    Dali::SamplingMode::Type    samplingMode : 3;      ///< The requested SamplingMode
-    StorageType                 storageType;           ///< CPU storage / GPU upload;
-    Dali::AnimatedImageLoading  animatedImageLoading;  ///< AnimatedImageLoading that contains animated image information.
-    uint32_t                    frameIndex;            ///< frame index that be loaded, in case of animated image
-    bool                        loadSynchronously : 1; ///< True if synchronous loading was requested
-    UseAtlas                    useAtlas : 2;          ///< USE_ATLAS if an atlas was requested.
-                                                       ///< This is updated to false if atlas is not used
-    bool cropToMask : 1;                               ///< true if the image should be cropped to the mask size.
-    bool orientationCorrection : 1;                    ///< true if the image should be rotated to match exif orientation data
-    bool preMultiplyOnLoad : 1;                        ///< true if the image's color should be multiplied by it's alpha
-    bool preMultiplied : 1;                            ///< true if the image's color was multiplied by it's alpha
-  };
-
-  /**
-   * Structure to hold info about a texture load queued during NotifyObservers
-   */
-  struct LoadQueueElement
-  {
-    LoadQueueElement(TextureId textureId, TextureUploadObserver* observer)
-    : mTextureId(textureId),
-      mObserver(observer)
-    {
-    }
-
-    TextureId              mTextureId; ///< The texture id of the requested load.
-    TextureUploadObserver* mObserver;  ///< Observer of texture load.
-  };
-
-  /**
-   * Struct to hold information about a requested Async load.
-   * This is used to look up a TextureManager::TextureId from the returned AsyncLoad Id.
-   */
-  struct AsyncLoadingInfo
-  {
-    AsyncLoadingInfo(TextureId textureId)
-    : textureId(textureId),
-      loadId(0)
-    {
-    }
-
-    TextureId textureId; ///< The external Texture Id assigned to this load
-    uint32_t  loadId;    ///< The load Id used by the async loader to reference this load
-  };
-
-  // Private typedefs:
-
-  typedef std::deque<AsyncLoadingInfo> AsyncLoadingInfoContainerType; ///< The container type used to manage Asynchronous loads in progress
-  typedef std::vector<TextureInfo>     TextureInfoContainerType;      ///< The container type used to manage the life-cycle and caching of Textures
-
-  /**
-   * @brief Initiate a load or queue load if NotifyObservers is invoking callbacks
-   * @param[in] textureInfo The TextureInfo struct associated with the Texture
-   * @param[in] observer The observer wishing to observe the texture upload
-   */
-  void LoadOrQueueTexture(TextureInfo& textureInfo, TextureUploadObserver* observer);
-
-  /**
-   * @brief Queue a texture load to be subsequently handled by ProcessQueuedTextures.
-   * @param[in] textureInfo The TextureInfo struct associated with the Texture
-   * @param[in] observer The observer wishing to observe the texture upload
-   */
-  void QueueLoadTexture(TextureInfo& textureInfo, TextureUploadObserver* observer);
-
-  /**
-   * @brief Used internally to initiate a load.
-   * @param[in] textureInfo The TextureInfo struct associated with the Texture
-   * @param[in] observer The observer wishing to observe the texture upload
-   */
-  void LoadTexture(TextureInfo& textureInfo, TextureUploadObserver* observer);
-
-  /**
-   * @brief Initiate load of textures queued whilst NotifyObservers invoking callbacks.
-   */
-  void ProcessQueuedTextures();
-
-  /**
-   * Add the observer to the observer list
-   * @param[in] textureInfo The TextureInfo struct associated with the texture
-   * @param[in] observer The observer wishing to observe the texture upload
-   */
-  void ObserveTexture(TextureInfo& textureInfo, TextureUploadObserver* observer);
-
-  /**
-   * @brief This signal handler is called when the async local loader finishes loading.
-   * @param[in] id        This is the async image loaders Id
-   * @param[in] pixelBuffer The loaded image data
-   */
-  void AsyncLocalLoadComplete(uint32_t id, Devel::PixelBuffer pixelBuffer);
-
-  /**
-   * @brief This signal handler is called when the async local loader finishes loading.
-   * @param[in] id        This is the async image loaders Id
-   * @param[in] pixelBuffer The loaded image data
-   */
-  void AsyncRemoteLoadComplete(uint32_t id, Devel::PixelBuffer pixelBuffer);
-
-  /**
-   * Common method to handle loading completion
-   * @param[in] container The Async loading container
-   * @param[in] id        This is the async image loaders Id
-   * @param[in] pixelBuffer The loaded image data
-   */
-  void AsyncLoadComplete(AsyncLoadingInfoContainerType& container, uint32_t id, Devel::PixelBuffer pixelBuffer);
-
-  /**
-   * @brief Performs Post-Load steps including atlasing.
-   * @param[in] textureInfo The struct associated with this Texture
-   * @param[in] pixelBuffer The image pixelBuffer
-   * @return    True if successful
-   */
-  void PostLoad(TextureManager::TextureInfo& textureInfo, Devel::PixelBuffer& pixelBuffer);
-
-  /**
-   * Check if there is a texture waiting to be masked. If there
-   * is then apply this mask and upload it.
-   * @param[in] maskTextureInfo The texture info of the mask that has just loaded.
-   */
-  void CheckForWaitingTexture(TextureInfo& maskTextureInfo);
-
-  /**
-   * Apply the mask to the pixelBuffer.
-   * @param[in] textureInfo The information of texture to apply the mask to
-   * @param[in] maskTextureId The texture id of the mask.
-   */
-  void ApplyMask(TextureInfo& textureInfo, TextureId maskTextureId);
-
-  /**
-   * Upload the texture specified in pixelBuffer to the appropriate location
-   * @param[in] pixelBuffer The image data to upload
-   * @param[in] textureInfo The texture info containing the location to
-   * store the data to.
-   */
-  void UploadTexture(Devel::PixelBuffer& pixelBuffer, TextureInfo& textureInfo);
-
-  /**
-   * Creates tiled geometry of for the texture which separates fully-opaque
-   * tiles from ones which use transparency.
-   * @param pixelBuffer
-   * @param textureInfo
-   */
-  bool CreateTiledGeometry(const Devel::PixelBuffer& pixelBuffer, TextureInfo& textureInfo);
-
-  /**
-   * Mark the texture as complete, and inform observers
-   * @param[in] textureInfo The struct associated with this Texture
-   */
-  void UploadComplete(TextureInfo& textureInfo);
-
-  /**
-   * Notify the current observers that the texture upload is complete,
-   * then remove the observers from the list.
-   * @param[in] textureInfo The struct associated with this Texture
-   * @param[in] success If the pixel data was retrieved successfully and uploaded to GPU
-   */
-  void NotifyObservers(TextureInfo& textureInfo, bool success);
-
-  /**
-   * @brief Generates a new, unique TextureId
-   * @return A unique TextureId
-   */
-  TextureManager::TextureId GenerateUniqueTextureId();
-
-  /**
-   * @brief Used to lookup an index into the TextureInfoContainer from a TextureId
-   * @param[in] textureId The TextureId to look up
-   * @return              The cache index
-   */
-  int GetCacheIndexFromId(TextureId textureId);
-
-  /**
-   * @brief Generates a hash for caching based on the input parameters.
-   * Only applies size, fitting mode andsampling mode if the size is specified.
-   * Only applies maskTextureId if it isn't INVALID_TEXTURE_ID
-   * Always applies useAtlas.
-   * @param[in] url              The URL of the image to load
-   * @param[in] size             The image size
-   * @param[in] fittingMode      The FittingMode to use
-   * @param[in] samplingMode     The SamplingMode to use
-   * @param[in] useAtlas         True if atlased
-   * @param[in] maskTextureId    The masking texture id (or INVALID_TEXTURE_ID)
-   * @return                     A hash of the provided data for caching.
-   */
-  TextureHash GenerateHash(const std::string& url, const ImageDimensions size, const FittingMode::Type fittingMode, const Dali::SamplingMode::Type samplingMode, const UseAtlas useAtlas, TextureId maskTextureId);
-
-  /**
-   * @brief Looks up a cached texture by its hash.
-   * If found, the given parameters are used to check there is no hash-collision.
-   * @param[in] hash              The hash to look up
-   * @param[in] url               The URL of the image to load
-   * @param[in] size              The image size
-   * @param[in] fittingMode       The FittingMode to use
-   * @param[in] samplingMode      The SamplingMode to use
-   * @param[in] useAtlas          True if atlased
-   * @param[in] maskTextureId     Optional texture ID to use to mask this image
-   * @param[in] preMultiplyOnLoad if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha.
-   * @return                      A TextureId of a cached Texture if found. Or INVALID_TEXTURE_ID if not found.
-   */
-  TextureManager::TextureId FindCachedTexture(
-    const TextureManager::TextureHash hash,
-    const std::string&                url,
-    const ImageDimensions             size,
-    const FittingMode::Type           fittingMode,
-    const Dali::SamplingMode::Type    samplingMode,
-    const bool                        useAtlas,
-    TextureId                         maskTextureId,
-    MultiplyOnLoad                    preMultiplyOnLoad);
-
-private:
-  /**
-   * @brief Helper class to keep the relation between AsyncImageLoader and corresponding LoadingInfo container
-   */
-  class AsyncLoadingHelper : public ConnectionTracker
-  {
-  public:
-    /**
-     * @brief Create an AsyncLoadingHelper.
-     * @param[in] textureManager Reference to the texture manager
-     */
-    AsyncLoadingHelper(TextureManager& textureManager);
-
-    /**
-     * @brief Load a new frame of animated image
-     * @param[in] textureId             TextureId to reference the texture that will be loaded
-     * @param[in] animatedImageLoading  The AnimatedImageLoading to load animated image
-     * @param[in] frameIndex            The frame index of a frame to be loaded frame
-     */
-    void LoadAnimatedImage(TextureId                  textureId,
-                           Dali::AnimatedImageLoading animatedImageLoading,
-                           uint32_t                   frameIndex);
-
-    /**
-     * @brief Load a new texture.
-     * @param[in] textureId             TextureId to reference the texture that will be loaded
-     * @param[in] url                   The URL of the image to load
-     * @param[in] desiredSize           The size the image is likely to appear at.
-     *                                  This can be set to 0,0 for automatic
-     * @param[in] fittingMode           The FittingMode to use
-     * @param[in] samplingMode          The SamplingMode to use
-     * @param[in] orientationCorrection Whether to use image metadata to rotate or flip the image,
-     *                                  e.g., from portrait to landscape
-     * @param[in] preMultiplyOnLoad     if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask.
-     */
-    void Load(TextureId                                textureId,
-              const VisualUrl&                         url,
-              ImageDimensions                          desiredSize,
-              FittingMode::Type                        fittingMode,
-              SamplingMode::Type                       samplingMode,
-              bool                                     orientationCorrection,
-              DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
-
-    /**
-     * @brief Apply mask
-     * @param [in] id of the texture
-     * @param [in] pixelBuffer of the to be masked image
-     * @param [in] maskPixelBuffer of the mask image
-     * @param [in] contentScale The factor to scale the content
-     * @param [in] cropToMask Whether to crop the content to the mask size
-     * @param [in] preMultiplyOnLoad if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha.
-     */
-    void ApplyMask(TextureId                                textureId,
-                   Devel::PixelBuffer                       pixelBuffer,
-                   Devel::PixelBuffer                       maskPixelBuffer,
-                   float                                    contentScale,
-                   bool                                     cropToMask,
-                   DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad);
-
-  public:
-    AsyncLoadingHelper(const AsyncLoadingHelper&) = delete;
-    AsyncLoadingHelper& operator=(const AsyncLoadingHelper&) = delete;
-
-    AsyncLoadingHelper(AsyncLoadingHelper&& rhs);
-    AsyncLoadingHelper& operator=(AsyncLoadingHelper&& rhs) = delete;
-
-  private:
-    /**
-     * @brief Main constructor that used by all other constructors
-     */
-    AsyncLoadingHelper(Toolkit::AsyncImageLoader       loader,
-                       TextureManager&                 textureManager,
-                       AsyncLoadingInfoContainerType&& loadingInfoContainer);
-
-    /**
-     * @brief Callback to be called when texture loading is complete, it passes the pixel buffer on to texture manager.
-     * @param[in] id          Loader id
-     * @param[in] pixelBuffer Image data
-     */
-    void AsyncLoadComplete(uint32_t id, Devel::PixelBuffer pixelBuffer);
-
-  private:
-    Toolkit::AsyncImageLoader     mLoader;
-    TextureManager&               mTextureManager;
-    AsyncLoadingInfoContainerType mLoadingInfoContainer;
-  };
-
-  struct ExternalTextureInfo
-  {
-    TextureId  textureId;
-    TextureSet textureSet;
-    int16_t    referenceCount{1};
-  };
-
-  struct EncodedBufferTextureInfo
-  {
-    EncodedBufferTextureInfo(TextureId                 textureId,
-                             const EncodedImageBuffer& encodedImageBuffer)
-    : textureId(textureId),
-      encodedImageBuffer(encodedImageBuffer),
-      referenceCount(1u)
-    {
-    }
-    TextureId          textureId;
-    EncodedImageBuffer encodedImageBuffer;
-    int16_t            referenceCount;
-  };
-
-private:
-  /**
-   * Deleted copy constructor.
-   */
-  TextureManager(const TextureManager&) = delete;
-
-  /**
-   * Deleted assignment operator.
-   */
-  TextureManager& operator=(const TextureManager& rhs) = delete;
-
-  /**
-   * This is called by the TextureManagerUploadObserver when an observer is destroyed.
-   * We use the callback to know when to remove an observer from our notify list.
-   * @param[in] observer The observer that generated the callback
-   */
-  void ObserverDestroyed(TextureUploadObserver* observer);
-
-private:                                                              // Member Variables:
-  TextureInfoContainerType                    mTextureInfoContainer;  ///< Used to manage the life-cycle and caching of Textures
-  RoundRobinContainerView<AsyncLoadingHelper> mAsyncLocalLoaders;     ///< The Asynchronous image loaders used to provide all local async loads
-  RoundRobinContainerView<AsyncLoadingHelper> mAsyncRemoteLoaders;    ///< The Asynchronous image loaders used to provide all remote async loads
-  std::vector<ExternalTextureInfo>            mExternalTextures;      ///< Externally provided textures
-  std::vector<EncodedBufferTextureInfo>       mEncodedBufferTextures; ///< Externally encoded buffer textures
-  Dali::Vector<LifecycleObserver*>            mLifecycleObservers;    ///< Lifecycle observers of texture manager
-  Dali::Vector<LoadQueueElement>              mLoadQueue;             ///< Queue of textures to load after NotifyObservers
-  TextureId                                   mCurrentTextureId;      ///< The current value used for the unique Texture Id generation
-  bool                                        mQueueLoadFlag;         ///< Flag that causes Load Textures to be queued.
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_TEXTURE_MANAGER_IMPL_H
diff --git a/dali-toolkit/internal/visuals/texture-upload-observer.cpp b/dali-toolkit/internal/visuals/texture-upload-observer.cpp
deleted file mode 100644
index 5c46ff2..0000000
--- a/dali-toolkit/internal/visuals/texture-upload-observer.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "texture-upload-observer.h"
-
-namespace Dali
-{
-namespace Toolkit
-{
-TextureUploadObserver::TextureUploadObserver()
-{
-}
-
-TextureUploadObserver::~TextureUploadObserver()
-{
-  if(!mDestructionSignal.Empty())
-  {
-    mDestructionSignal.Emit(this);
-  }
-}
-
-TextureUploadObserver::DestructionSignalType& TextureUploadObserver::DestructionSignal()
-{
-  return mDestructionSignal;
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/visuals/texture-upload-observer.h b/dali-toolkit/internal/visuals/texture-upload-observer.h
deleted file mode 100644
index d6657a2..0000000
--- a/dali-toolkit/internal/visuals/texture-upload-observer.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef DALI_TOOLKIT_INTERNAL_TEXTURE_UPLOAD_OBSERVER_H
-#define DALI_TOOLKIT_INTERNAL_TEXTURE_UPLOAD_OBSERVER_H
-
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <dali/public-api/signals/dali-signal.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-url.h>
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
-
-namespace Dali
-{
-class TextureSet;
-
-namespace Toolkit
-{
-/**
- * @brief Base class used to observe the upload status of a texture.
- *
- * Derived class must implement the UploadComplete method which is
- * executed once the texture is ready to draw.
- */
-class TextureUploadObserver
-{
-public:
-  typedef Signal<void(TextureUploadObserver*)> DestructionSignalType; ///< Signal prototype for the Destruction Signal.
-
-  /**
-   * @brief Constructor.
-   */
-  TextureUploadObserver();
-
-  /**
-   * @brief Virtual destructor.
-   */
-  virtual ~TextureUploadObserver();
-
-  /**
-   * The action to be taken once the async load has finished and the upload to GPU is completed.
-   * This should be overridden by the deriving class.
-   *
-   * @param[in] loadSuccess True if the texture load was successful (i.e. the resource is available). If false, then the resource failed to load. In future, this will automatically upload a "broken" image.
-   * @param[in] textureId   The textureId of the loaded texture in the TextureManager
-   * @param[in] textureSet  The TextureSet containing the Texture
-   * @param[in] useAtlasing True if atlasing was used (note: this may be different to what was requested)
-   * @param[in] atlasRect   If using atlasing, this is the rectangle within the atlas to use.
-   * @param[in] preMultiplied True if the image had pre-multiplied alpha applied
-   */
-  virtual void UploadComplete(bool loadSuccess, int32_t textureId, TextureSet textureSet, bool useAtlasing, const Vector4& atlasRect, bool preMultiplied) = 0;
-
-  /**
-   * The action to be taken once the async load has finished.
-   * This should be overridden by the deriving class.
-   *
-   * @param[in] loadSuccess   True if the image load was successful (i.e. the resource is available). If false, then the resource failed to load.
-   * @param[in] pixelBuffer   The PixelBuffer of the loaded image.
-   * @param[in] url           The url address of the loaded image.
-   * @param[in] preMultiplied True if the image had pre-multiplied alpha applied
-   */
-  virtual void LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const Internal::VisualUrl& url, bool preMultiplied) = 0;
-
-  /**
-   * @brief Returns the destruction signal.
-   * This is emitted when the observer is destroyed.
-   * This is used by the observer notifier to mark this observer as destroyed (IE. It no longer needs notifying).
-   */
-  DestructionSignalType& DestructionSignal();
-
-private:
-  DestructionSignalType mDestructionSignal; ///< The destruction signal emitted when the observer is destroyed.
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TOOLKIT_INTERNAL_TEXTURE_UPLOAD_OBSERVER_H
diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index 53b5246..b3d8201 100644
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@ Dali::Vector2 PointToVector2(Toolkit::Align::Type point, Toolkit::Direction::Typ
                                          0.0f,1.0f,
                                          0.5f,1.0f,
                                          1.0f,1.0f};
+
   // clang-format on
 
   Vector2 result(&pointToVector2[point * 2]);
@@ -114,34 +115,29 @@ bool GetPolicyFromValue(const Property::Value& value, Vector2& policy)
 } // unnamed namespace
 
 Internal::Visual::Base::Impl::Impl(FittingMode fittingMode, Toolkit::Visual::Type type)
-: mCustomShader(NULL),
-  mEventObserver(NULL),
+: mCustomShader(nullptr),
+  mEventObserver(nullptr),
   mTransform(),
   mMixColor(Color::WHITE),
   mControlSize(Vector2::ZERO),
-  mBorderlineWidth(0.0f),
-  mBorderlineColor(Color::BLACK),
-  mBorderlineOffset(0.0f),
-  mCornerRadius(Vector4::ZERO),
-  mCornerRadiusPolicy(1.0f),
+  mDecorationData(nullptr),
   mDepthIndex(0.0f),
-  mMixColorIndex(Property::INVALID_INDEX),
-  mBorderlineWidthIndex(Property::INVALID_INDEX),
-  mBorderlineColorIndex(Property::INVALID_INDEX),
-  mBorderlineOffsetIndex(Property::INVALID_INDEX),
-  mCornerRadiusIndex(Property::INVALID_INDEX),
   mFittingMode(fittingMode),
   mFlags(0),
   mResourceStatus(Toolkit::Visual::ResourceStatus::PREPARING),
   mType(type),
-  mNeedCornerRadius(false),
-  mNeedBorderline(false)
+  mAlwaysUsingBorderline(false),
+  mAlwaysUsingCornerRadius(false)
 {
 }
 
 Internal::Visual::Base::Impl::~Impl()
 {
   delete mCustomShader;
+  if(mDecorationData)
+  {
+    delete mDecorationData;
+  }
 }
 
 Internal::Visual::Base::Impl::CustomShader::CustomShader(const Property::Map& map)
@@ -252,9 +248,7 @@ Internal::Visual::Base::Impl::Transform::Transform()
   mExtraSize(0.0f, 0.0f),
   mOffsetSizeMode(0.0f, 0.0f, 0.0f, 0.0f),
   mOrigin(Toolkit::Align::TOP_BEGIN),
-  mAnchorPoint(Toolkit::Align::TOP_BEGIN),
-  mOffsetIndex(Property::INVALID_INDEX),
-  mSizeIndex(Property::INVALID_INDEX)
+  mAnchorPoint(Toolkit::Align::TOP_BEGIN)
 {
 }
 
@@ -276,76 +270,29 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property::
   for(Property::Map::SizeType i(0); i < map.Count(); ++i)
   {
     KeyValuePair keyValue = map.GetKeyValue(i);
-    if(keyValue.first.type == Property::Key::INDEX)
-    {
-      switch(keyValue.first.indexKey)
-      {
-        case Toolkit::Visual::Transform::Property::OFFSET:
-        {
-          keyValue.second.Get(mOffset);
-          break;
-        }
-        case Toolkit::Visual::Transform::Property::SIZE:
-        {
-          keyValue.second.Get(mSize);
-          break;
-        }
-        case Toolkit::Visual::Transform::Property::ORIGIN:
-        {
-          Scripting::GetEnumerationProperty<Toolkit::Align::Type>(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mOrigin);
-          break;
-        }
-        case Toolkit::Visual::Transform::Property::ANCHOR_POINT:
-        {
-          Scripting::GetEnumerationProperty<Toolkit::Align::Type>(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mAnchorPoint);
-          break;
-        }
-        case Toolkit::Visual::Transform::Property::OFFSET_POLICY:
-        {
-          Vector2 policy;
-          if(GetPolicyFromValue(keyValue.second, policy))
-          {
-            mOffsetSizeMode.x = policy.x;
-            mOffsetSizeMode.y = policy.y;
-          }
-          break;
-        }
-        case Toolkit::Visual::Transform::Property::SIZE_POLICY:
-        {
-          Vector2 policy;
-          if(GetPolicyFromValue(keyValue.second, policy))
-          {
-            mOffsetSizeMode.z = policy.x;
-            mOffsetSizeMode.w = policy.y;
-          }
-          break;
-        }
-        case Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE:
-        {
-          keyValue.second.Get(mExtraSize);
-          break;
-        }
-      }
-    }
-    else // Key type is STRING
+    switch(Visual::Base::GetIntKey(keyValue.first))
     {
-      if(keyValue.first == "offset")
+      case Toolkit::Visual::Transform::Property::OFFSET:
       {
         keyValue.second.Get(mOffset);
+        break;
       }
-      else if(keyValue.first == "size")
+      case Toolkit::Visual::Transform::Property::SIZE:
       {
         keyValue.second.Get(mSize);
+        break;
       }
-      else if(keyValue.first == "origin")
+      case Toolkit::Visual::Transform::Property::ORIGIN:
       {
         Scripting::GetEnumerationProperty<Toolkit::Align::Type>(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mOrigin);
+        break;
       }
-      else if(keyValue.first == "anchorPoint")
+      case Toolkit::Visual::Transform::Property::ANCHOR_POINT:
       {
         Scripting::GetEnumerationProperty<Toolkit::Align::Type>(keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mAnchorPoint);
+        break;
       }
-      else if(keyValue.first == "offsetPolicy")
+      case Toolkit::Visual::Transform::Property::OFFSET_POLICY:
       {
         Vector2 policy;
         if(GetPolicyFromValue(keyValue.second, policy))
@@ -353,8 +300,9 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property::
           mOffsetSizeMode.x = policy.x;
           mOffsetSizeMode.y = policy.y;
         }
+        break;
       }
-      else if(keyValue.first == "sizePolicy")
+      case Toolkit::Visual::Transform::Property::SIZE_POLICY:
       {
         Vector2 policy;
         if(GetPolicyFromValue(keyValue.second, policy))
@@ -362,10 +310,12 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property::
           mOffsetSizeMode.z = policy.x;
           mOffsetSizeMode.w = policy.y;
         }
+        break;
       }
-      else if(keyValue.first == "extraSize")
+      case Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE:
       {
         keyValue.second.Get(mExtraSize);
+        break;
       }
     }
   }
@@ -374,7 +324,8 @@ void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap(const Property::
 void Internal::Visual::Base::Impl::Transform::GetPropertyMap(Property::Map& map) const
 {
   map.Clear();
-  map.Add(Toolkit::Visual::Transform::Property::OFFSET, mOffset)
+  map
+    .Add(Toolkit::Visual::Transform::Property::OFFSET, mOffset)
     .Add(Toolkit::Visual::Transform::Property::SIZE, mSize)
     .Add(Toolkit::Visual::Transform::Property::ORIGIN, mOrigin)
     .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, mAnchorPoint)
@@ -383,14 +334,16 @@ void Internal::Visual::Base::Impl::Transform::GetPropertyMap(Property::Map& map)
     .Add(Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE, mExtraSize);
 }
 
-void Internal::Visual::Base::Impl::Transform::RegisterUniforms(Dali::Renderer renderer, Toolkit::Direction::Type direction)
+void Internal::Visual::Base::Impl::Transform::SetUniforms(Dali::VisualRenderer renderer, Toolkit::Direction::Type direction)
 {
-  mSizeIndex   = renderer.RegisterProperty(SIZE, mSize);
-  mOffsetIndex = renderer.RegisterProperty(OFFSET, direction == Toolkit::Direction::LEFT_TO_RIGHT ? mOffset : mOffset * Vector2(-1.0f, 1.0f));
-  renderer.RegisterProperty(OFFSET_SIZE_MODE, mOffsetSizeMode);
-  renderer.RegisterProperty(ORIGIN, PointToVector2(mOrigin, direction) - Vector2(0.5, 0.5));
-  renderer.RegisterProperty(ANCHOR_POINT, Vector2(0.5, 0.5) - PointToVector2(mAnchorPoint, direction));
-  renderer.RegisterProperty(EXTRA_SIZE, mExtraSize);
+  renderer.SetProperty(VisualRenderer::Property::TRANSFORM_SIZE, mSize);
+  renderer.SetProperty(VisualRenderer::Property::TRANSFORM_OFFSET,
+                       direction == Toolkit::Direction::LEFT_TO_RIGHT ? mOffset : mOffset * Vector2(-1.0f, 1.0f));
+  renderer.SetProperty(VisualRenderer::Property::TRANSFORM_OFFSET_SIZE_MODE, mOffsetSizeMode);
+  renderer.SetProperty(VisualRenderer::Property::TRANSFORM_ORIGIN, PointToVector2(mOrigin, direction) - Vector2(0.5, 0.5));
+  renderer.SetProperty(VisualRenderer::Property::TRANSFORM_ANCHOR_POINT,
+                       Vector2(0.5, 0.5) - PointToVector2(mAnchorPoint, direction));
+  renderer.SetProperty(VisualRenderer::Property::EXTRA_SIZE, mExtraSize);
 }
 
 Vector2 Internal::Visual::Base::Impl::Transform::GetVisualSize(const Vector2& controlSize)
diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h
index 52e0d98..e54c3ae 100644
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/math/vector2.h>
-#include <dali/public-api/rendering/renderer.h>
+#include <dali/public-api/rendering/visual-renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
@@ -53,10 +53,10 @@ struct Base::Impl
 
   enum Flags
   {
-    IS_ON_SCENE                     = 1,
-    IS_ATLASING_APPLIED             = 1 << 1,
-    IS_PREMULTIPLIED_ALPHA          = 1 << 2,
-    IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 3
+    IS_ON_SCENE                        = 1,
+    IS_ATLASING_APPLIED                = 1 << 1,
+    IS_PREMULTIPLIED_ALPHA             = 1 << 2,
+    IS_SYNCHRONOUS_RESOURCE_LOADING    = 1 << 3,
   };
 
   struct CustomShader
@@ -96,9 +96,9 @@ struct Base::Impl
     void UpdatePropertyMap(const Property::Map& map);
 
     /**
-     * Register or set the uniform properties onto the renderer
+     * Set the uniform properties onto the renderer
      */
-    void RegisterUniforms(Renderer renderer, Toolkit::Direction::Type direction);
+    void SetUniforms(VisualRenderer renderer, Toolkit::Direction::Type direction);
 
     /**
      * Convert the control size and the transform attributes into the actual
@@ -112,34 +112,150 @@ struct Base::Impl
     Vector4              mOffsetSizeMode;
     Toolkit::Align::Type mOrigin;
     Toolkit::Align::Type mAnchorPoint;
-    Property::Index      mOffsetIndex;
-    Property::Index      mSizeIndex;
   };
 
-  Renderer                        mRenderer;
+  struct DecorationData
+  {
+    // Default constructor
+    DecorationData()
+    : mBorderlineColor(Color::BLACK),
+      mCornerRadius(Vector4::ZERO),
+      mBorderlineWidth(0.0f),
+      mBorderlineOffset(0.0f),
+      mCornerRadiusPolicy(static_cast<int>(Toolkit::Visual::Transform::Policy::ABSOLUTE))
+    {
+    }
+    Vector4 mBorderlineColor;
+    Vector4 mCornerRadius;
+    float   mBorderlineWidth;
+    float   mBorderlineOffset;
+    int     mCornerRadiusPolicy;
+  };
+
+  DecorationData* EnsureDecorationData()
+  {
+    if(mDecorationData == nullptr)
+    {
+      mDecorationData = new DecorationData();
+    }
+    return mDecorationData;
+  }
+
+  /**
+   * @brief Get decoration data value : borderline width
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  float GetBorderlineWidth()
+  {
+    return mDecorationData ? mDecorationData->mBorderlineWidth : 0.0f;
+  }
+
+  /**
+   * @brief Set decoration data value : borderline width
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  void SetBorderlineWidth(float value)
+  {
+    EnsureDecorationData()->mBorderlineWidth = value;
+  }
+
+  /**
+   * @brief Get decoration data value : borderline color
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  Vector4 GetBorderlineColor()
+  {
+    return mDecorationData ? mDecorationData->mBorderlineColor : Color::BLACK;
+  }
+
+  /**
+   * @brief Set decoration data value : borderline color
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  void SetBorderlineColor(Vector4 value)
+  {
+    EnsureDecorationData()->mBorderlineColor = value;
+  }
+
+  /**
+   * @brief Get decoration data value : borderline offset
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  float GetBorderlineOffset()
+  {
+    return mDecorationData ? mDecorationData->mBorderlineOffset : 0.0f;
+  }
+
+  /**
+   * @brief Set decoration data value : borderline offset
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  void SetBorderlineOffset(float value)
+  {
+    EnsureDecorationData()->mBorderlineOffset = value;
+  }
+
+  /**
+   * @brief Get decoration data value : corner radius
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  Vector4 GetCornerRadius()
+  {
+    return mDecorationData ? mDecorationData->mCornerRadius : Vector4::ZERO;
+  }
+
+  /**
+   * @brief Set decoration data value : corner radius
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  void SetCornerRadius(Vector4 value)
+  {
+    EnsureDecorationData()->mCornerRadius = value;
+  }
+
+  /**
+   * @brief Get decoration data value : corner radius policy
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  int GetCornerRadiusPolicy()
+  {
+    return mDecorationData ? mDecorationData->mCornerRadiusPolicy : static_cast<int>(Toolkit::Visual::Transform::Policy::ABSOLUTE);
+  }
+
+  /**
+   * @brief Set decoration data value : corner radius policy
+   *
+   * Keep these API as inline function due to the performance.
+   */
+  void SetCornerRadiusPolicy(int value)
+  {
+    EnsureDecorationData()->mCornerRadiusPolicy = value;
+  }
+
+  VisualRenderer                  mRenderer;
   CustomShader*                   mCustomShader;
   EventObserver*                  mEventObserver; ///< Allows controls to observe when the visual has events to notify
   std::string                     mName;
   Transform                       mTransform;
   Vector4                         mMixColor;
   Size                            mControlSize;
-  float                           mBorderlineWidth;
-  Vector4                         mBorderlineColor;
-  float                           mBorderlineOffset;
-  Vector4                         mCornerRadius;
-  float                           mCornerRadiusPolicy;
+  DecorationData*                 mDecorationData;
   int                             mDepthIndex;
-  Property::Index                 mMixColorIndex;
-  Property::Index                 mBorderlineWidthIndex;
-  Property::Index                 mBorderlineColorIndex;
-  Property::Index                 mBorderlineOffsetIndex;
-  Property::Index                 mCornerRadiusIndex;
-  FittingMode                     mFittingMode; //< How the contents should fit the view
+  FittingMode                     mFittingMode; ///< How the contents should fit the view
   int                             mFlags;
   Toolkit::Visual::ResourceStatus mResourceStatus;
   const Toolkit::Visual::Type     mType;
-  bool                            mNeedCornerRadius;
-  bool                            mNeedBorderline;
+  bool                            mAlwaysUsingBorderline : 1;     ///< Whether we need the borderline in shader always.
+  bool                            mAlwaysUsingCornerRadius : 1;   ///< Whether we need the corner radius in shader always.
 };
 
 } // namespace Visual
diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index 49b3120..3d8e79e 100644
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,12 @@
 #include <dali/devel-api/rendering/renderer-devel.h>
 #include <dali/devel-api/scripting/enum-helper.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/rendering/decorated-visual-renderer.h>
+#include <dali/public-api/rendering/visual-renderer.h>
 
 //INTERNAL HEARDER
+#include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/internal/helpers/property-helper.h>
 #include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
@@ -39,7 +43,9 @@ namespace
 Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VISUAL_BASE");
 #endif
 
-const char* const PRE_MULTIPLIED_ALPHA_PROPERTY("preMultipliedAlpha");
+// visual string constants contains OFFSET_SIZE_MODE instead
+const char* const OFFSET_POLICY("offsetPolicy");
+const char* const SIZE_POLICY("sizePolicy");
 
 } // namespace
 
@@ -56,10 +62,97 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(VISUAL_FITTING_MODE)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FILL)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, OVER_FIT_KEEP_ASPECT_RATIO)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, CENTER)
-  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_WIDTH)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_HEIGHT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_WIDTH)
 DALI_ENUM_TO_STRING_TABLE_END(VISUAL_FITTING_MODE)
 
+/**
+ * @brief Check whether this visual type can use corner radius feature or not.
+ * @param type VisualType that want to checkup
+ * @return true if type can use corner radius feature.
+ */
+static bool IsTypeAvailableForCornerRadius(Toolkit::Visual::Type type)
+{
+  switch(static_cast<Toolkit::DevelVisual::Type>(type))
+  {
+    case Toolkit::Visual::Type::COLOR:
+    case Toolkit::Visual::Type::GRADIENT:
+    case Toolkit::Visual::Type::IMAGE:
+    case Toolkit::Visual::Type::SVG:
+    case Toolkit::Visual::Type::ANIMATED_IMAGE:
+    case Toolkit::DevelVisual::Type::ANIMATED_VECTOR_IMAGE:
+    {
+      return true;
+    }
+    default:
+    {
+      return false;
+    }
+  }
+}
+
+/**
+ * @brief Check whether this visual type can use borderline feature or not.
+ * @param type VisualType that want to checkup
+ * @return true if type can use borderline feature.
+ */
+static bool IsTypeAvailableForBorderline(Toolkit::Visual::Type type)
+{
+  switch(static_cast<Toolkit::DevelVisual::Type>(type))
+  {
+    case Toolkit::Visual::Type::COLOR:
+    case Toolkit::Visual::Type::GRADIENT:
+    case Toolkit::Visual::Type::IMAGE:
+    case Toolkit::Visual::Type::SVG:
+    case Toolkit::Visual::Type::ANIMATED_IMAGE:
+    case Toolkit::DevelVisual::Type::ANIMATED_VECTOR_IMAGE:
+    {
+      return true;
+    }
+    default:
+    {
+      return false;
+    }
+  }
+}
+
+struct StringProperty
+{
+  const char* const name;
+  Property::Index   index;
+};
+StringProperty PROPERTY_NAME_INDEX_TABLE[] =
+  {
+    {CUSTOM_SHADER, Toolkit::Visual::Property::SHADER},
+    {TRANSFORM, Toolkit::Visual::Property::TRANSFORM},
+    {PREMULTIPLIED_ALPHA, Toolkit::Visual::Property::PREMULTIPLIED_ALPHA},
+    {MIX_COLOR, Toolkit::Visual::Property::MIX_COLOR},
+    {OPACITY, Toolkit::Visual::Property::OPACITY},
+    {VISUAL_FITTING_MODE, Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE},
+    {BORDERLINE_WIDTH, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH},
+    {BORDERLINE_COLOR, Toolkit::DevelVisual::Property::BORDERLINE_COLOR},
+    {BORDERLINE_OFFSET, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET},
+    {CORNER_RADIUS, Toolkit::DevelVisual::Property::CORNER_RADIUS},
+    {CORNER_RADIUS_POLICY, Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY},
+};
+const uint16_t PROPERTY_NAME_INDEX_TABLE_COUNT = sizeof(PROPERTY_NAME_INDEX_TABLE) / sizeof(PROPERTY_NAME_INDEX_TABLE[0]);
+
+Property::Index GetVisualPropertyIndex(Property::Key key)
+{
+  if(key.type == Property::Key::STRING)
+  {
+    for(auto tableId = 0u; tableId < PROPERTY_NAME_INDEX_TABLE_COUNT; ++tableId)
+    {
+      if(key == PROPERTY_NAME_INDEX_TABLE[tableId].name)
+      {
+        return PROPERTY_NAME_INDEX_TABLE[tableId].index;
+        break;
+      }
+    }
+  }
+  return key.indexKey;
+}
+
 } // namespace
 
 Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type)
@@ -81,20 +174,14 @@ void Visual::Base::Initialize()
   if(mImpl->mRenderer)
   {
     RegisterMixColor();
+    RegisterDecoration();
 
-    if(IsRoundedCornerRequired())
+    if(IsBorderlineRequired())
     {
-      mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius);
-      mImpl->mRenderer.RegisterProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy);
-
-      mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+      mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL);
     }
-    if(IsBorderlineRequired())
+    else if(IsRoundedCornerRequired())
     {
-      mImpl->mBorderlineWidthIndex  = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::BORDERLINE_WIDTH,  BORDERLINE_WIDTH,  mImpl->mBorderlineWidth);
-      mImpl->mBorderlineColorIndex  = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::BORDERLINE_COLOR,  BORDERLINE_COLOR,  mImpl->mBorderlineColor);
-      mImpl->mBorderlineOffsetIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::BORDERLINE_OFFSET, BORDERLINE_OFFSET, mImpl->mBorderlineOffset);
-
       mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
     }
   }
@@ -117,62 +204,14 @@ void Visual::Base::SetCustomShader(const Property::Map& shaderMap)
 
 void Visual::Base::SetProperties(const Property::Map& propertyMap)
 {
+  bool needUpdateShader = false;
   for(size_t i = 0; i < propertyMap.Count(); ++i)
   {
     const KeyValuePair&    pair  = propertyMap.GetKeyValue(i);
     const Property::Key&   key   = pair.first;
     const Property::Value& value = pair.second;
 
-    Property::Key matchKey = key;
-    if(matchKey.type == Property::Key::STRING)
-    {
-      if(matchKey == CUSTOM_SHADER)
-      {
-        matchKey = Property::Key(Toolkit::Visual::Property::SHADER);
-      }
-      else if(matchKey == TRANSFORM)
-      {
-        matchKey = Property::Key(Toolkit::Visual::Property::TRANSFORM);
-      }
-      else if(matchKey == PREMULTIPLIED_ALPHA)
-      {
-        matchKey = Property::Key(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA);
-      }
-      else if(matchKey == MIX_COLOR)
-      {
-        matchKey = Property::Key(Toolkit::Visual::Property::MIX_COLOR);
-      }
-      else if(matchKey == OPACITY)
-      {
-        matchKey = Property::Key(Toolkit::Visual::Property::OPACITY);
-      }
-      else if(matchKey == VISUAL_FITTING_MODE)
-      {
-        matchKey = Property::Key(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE);
-      }
-      else if(matchKey == BORDERLINE_WIDTH)
-      {
-        matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH);
-      }
-      else if(matchKey == BORDERLINE_COLOR)
-      {
-        matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_COLOR);
-      }
-      else if(matchKey == BORDERLINE_OFFSET)
-      {
-        matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET);
-      }
-      else if(matchKey == CORNER_RADIUS)
-      {
-        matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS);
-      }
-      else if(matchKey == CORNER_RADIUS_POLICY)
-      {
-        matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY);
-      }
-    }
-
-    switch(matchKey.indexKey)
+    switch(GetVisualPropertyIndex(key))
     {
       case Toolkit::Visual::Property::SHADER:
       {
@@ -240,27 +279,69 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap)
       case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH:
       {
         float width;
-        if(value.Get(width))
+        if(value.Get(width) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(width)))
         {
-          mImpl->mBorderlineWidth = width;
+          mImpl->SetBorderlineWidth(width);
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
+        {
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+
+          // Check whether we must update shader.
+          if(!mImpl->mAlwaysUsingBorderline && IsBorderlineRequired())
+          {
+            // Required to change shader mean, we didn't setup BORDERLINE_COLOR and BORDERLINE_OFFSET into mRenderer before. Set property now.
+            mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+            mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+
+            // Make Blend mode ON_WITHOUT_CULL for transparent mix color.
+            mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL);
+
+            // Change the shader must not be occured many times. we always have to use borderline feature.
+            mImpl->mAlwaysUsingBorderline = true;
+
+            // Change shader
+            if(!mImpl->mCustomShader)
+            {
+              needUpdateShader = true;
+            }
+          }
         }
         break;
       }
       case Toolkit::DevelVisual::Property::BORDERLINE_COLOR:
       {
         Vector4 color;
-        if(value.Get(color))
+        if(value.Get(color) && (mImpl->mDecorationData != nullptr || color != Vector4::ZERO))
         {
-          mImpl->mBorderlineColor = color;
+          mImpl->SetBorderlineColor(color);
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
+        {
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
         }
         break;
       }
       case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET:
       {
         float offset;
-        if(value.Get(offset))
+        if(value.Get(offset) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(offset)))
+        {
+          mImpl->SetBorderlineOffset(offset);
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
         {
-          mImpl->mBorderlineOffset = offset;
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
         }
         break;
       }
@@ -272,9 +353,9 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap)
           // Each values mean the radius of
           // (top-left, top-right, bottom-right, bottom-left)
           Vector4 radius;
-          if(value.Get(radius))
+          if(value.Get(radius) && (mImpl->mDecorationData != nullptr || radius != Vector4::ZERO))
           {
-            mImpl->mCornerRadius = radius;
+            mImpl->SetCornerRadius(radius);
           }
         }
         else
@@ -282,11 +363,42 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap)
           // If CORNER_RADIUS Property is float,
           // Every corner radius have same value
           float radius;
-          if(value.Get(radius))
+          if(value.Get(radius) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(radius)))
           {
-            mImpl->mCornerRadius = Vector4(radius, radius, radius, radius);
+            mImpl->SetCornerRadius(Vector4(radius, radius, radius, radius));
+          }
+        }
+
+        if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForCornerRadius(mImpl->mType)))
+        {
+          // Unusual case. SetProperty called after OnInitialize().
+          // Assume that DoAction call UPDATE_PROPERTY.
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+
+          // Check whether we must update shader.
+          if(!mImpl->mAlwaysUsingCornerRadius && IsRoundedCornerRequired())
+          {
+            // Required to change shader mean, we didn't setup CORNER_RADIUS_POLICY into mRenderer before. Set property now.
+            mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+
+            // Change the shader must not be occured many times. we always have to use corner radius feature.
+            mImpl->mAlwaysUsingCornerRadius = true;
+
+            if(!IsBorderlineRequired())
+            {
+              // If IsBorderlineRequired is true, BLEND_MODE is already BlendMode::ON_WITHOUT_CULL. So we don't overwrite it.
+              mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+            }
+
+            // Change shader
+            if(!mImpl->mCustomShader)
+            {
+              needUpdateShader = true;
+            }
           }
         }
+
         break;
       }
       case Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY:
@@ -299,7 +411,13 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap)
             case Toolkit::Visual::Transform::Policy::RELATIVE:
             case Toolkit::Visual::Transform::Policy::ABSOLUTE:
             {
-              mImpl->mCornerRadiusPolicy = policy;
+              mImpl->SetCornerRadiusPolicy(policy);
+              if(DALI_UNLIKELY(mImpl->mRenderer))
+              {
+                // Unusual case. SetProperty called after OnInitialize().
+                // Assume that DoAction call UPDATE_PROPERTY.
+                mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+              }
               break;
             }
             default:
@@ -315,6 +433,11 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap)
   }
 
   DoSetProperties(propertyMap);
+
+  if(DALI_UNLIKELY(needUpdateShader))
+  {
+    UpdateShader();
+  }
 }
 
 void Visual::Base::SetTransformAndSize(const Property::Map& transform, Size controlSize)
@@ -346,7 +469,7 @@ float Visual::Base::GetHeightForWidth(float width)
   float   aspectCorrectedHeight = 0.f;
   Vector2 naturalSize;
   GetNaturalSize(naturalSize);
-  if(naturalSize.width)
+  if(naturalSize.width > 0.0f)
   {
     aspectCorrectedHeight = naturalSize.height * width / naturalSize.width;
   }
@@ -373,6 +496,25 @@ void Visual::Base::GetNaturalSize(Vector2& naturalSize)
 void Visual::Base::DoAction(const Property::Index actionId, const Property::Value attributes)
 {
   OnDoAction(actionId, attributes);
+
+  // Check if action is valid for this visual type and perform action if possible
+  switch(actionId)
+  {
+    case DevelVisual::Action::UPDATE_PROPERTY:
+    {
+      const Property::Map* map = attributes.GetMap();
+      if(map)
+      {
+        SetProperties(*map);
+      }
+      break;
+    }
+  }
+}
+
+void Visual::Base::DoActionExtension(const Dali::Property::Index actionId, const Dali::Any attributes)
+{
+  OnDoActionExtension(actionId, attributes);
 }
 
 void Visual::Base::SetDepthIndex(int index)
@@ -421,31 +563,21 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const
   if(mImpl->mRenderer)
   {
     // Update values from Renderer
-    mImpl->mMixColor   = mImpl->mRenderer.GetProperty<Vector3>(mImpl->mMixColorIndex);
+    mImpl->mMixColor   = mImpl->mRenderer.GetProperty<Vector3>(VisualRenderer::Property::VISUAL_MIX_COLOR);
     mImpl->mMixColor.a = mImpl->mRenderer.GetProperty<float>(DevelRenderer::Property::OPACITY);
-    if(mImpl->mTransform.mOffsetIndex != Property::INVALID_INDEX)
-    {
-      mImpl->mTransform.mOffset = mImpl->mRenderer.GetProperty<Vector2>(mImpl->mTransform.mOffsetIndex);
-    }
-    if(mImpl->mTransform.mSizeIndex != Property::INVALID_INDEX)
-    {
-      mImpl->mTransform.mSize = mImpl->mRenderer.GetProperty<Vector2>(mImpl->mTransform.mSizeIndex);
-    }
-    if(mImpl->mCornerRadiusIndex != Property::INVALID_INDEX)
-    {
-      mImpl->mCornerRadius = mImpl->mRenderer.GetProperty<Vector4>(mImpl->mCornerRadiusIndex);
-    }
-    if(mImpl->mBorderlineWidthIndex != Property::INVALID_INDEX)
-    {
-      mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty<float>(mImpl->mBorderlineWidthIndex);
-    }
-    if(mImpl->mBorderlineColorIndex != Property::INVALID_INDEX)
+
+    mImpl->mTransform.mOffset = mImpl->mRenderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_OFFSET);
+    mImpl->mTransform.mSize   = mImpl->mRenderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_SIZE);
+
+    if(IsRoundedCornerRequired())
     {
-      mImpl->mBorderlineColor = mImpl->mRenderer.GetProperty<Vector4>(mImpl->mBorderlineColorIndex);
+      mImpl->SetCornerRadius(mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS));
     }
-    if(mImpl->mBorderlineOffsetIndex != Property::INVALID_INDEX)
+    if(IsBorderlineRequired())
     {
-      mImpl->mBorderlineOffset = mImpl->mRenderer.GetProperty<float>(mImpl->mBorderlineOffsetIndex);
+      mImpl->SetBorderlineWidth(mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH));
+      mImpl->SetBorderlineColor(mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR));
+      mImpl->SetBorderlineOffset(mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET));
     }
   }
 
@@ -464,7 +596,7 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const
   map.Insert(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha);
 
   // Note, Color and Primitive will also insert their own mix color into the map
-  // which is ok, because they have a different key value range.
+  // which is ok, because they have a different key value range, but uses same cached value anyway.
   map.Insert(Toolkit::Visual::Property::MIX_COLOR, mImpl->mMixColor); // vec4
   map.Insert(Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a);
 
@@ -472,12 +604,18 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const
     mImpl->mFittingMode, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT);
   map.Insert(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE, fittingModeString);
 
-  map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth);
-  map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor);
-  map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset);
+  if(IsTypeAvailableForBorderline(mImpl->mType))
+  {
+    map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+    map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+    map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+  }
 
-  map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->mCornerRadius);
-  map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, static_cast<int>(mImpl->mCornerRadiusPolicy));
+  if(IsTypeAvailableForCornerRadius(mImpl->mType))
+  {
+    map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+    map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, mImpl->GetCornerRadiusPolicy());
+  }
 }
 
 void Visual::Base::CreateInstancePropertyMap(Property::Map& map) const
@@ -504,7 +642,7 @@ void Visual::Base::EnablePreMultipliedAlpha(bool preMultiplied)
   if(mImpl->mRenderer)
   {
     mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultiplied);
-    mImpl->mRenderer.RegisterProperty(PRE_MULTIPLIED_ALPHA_PROPERTY, static_cast<float>(preMultiplied));
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA, preMultiplied);
   }
 }
 
@@ -525,22 +663,50 @@ bool Visual::Base::IsOnScene() const
 
 bool Visual::Base::IsRoundedCornerRequired() const
 {
-  if(mImpl->mRenderer && mImpl->mCornerRadiusIndex != Property::INVALID_INDEX)
+  // If VisualType doesn't support rounded corner, always return false.
+  if(IsTypeAvailableForCornerRadius(mImpl->mType))
   {
-    // Update values from Renderer
-    mImpl->mCornerRadius = mImpl->mRenderer.GetProperty<Vector4>(mImpl->mCornerRadiusIndex);
+    if(mImpl->mRenderer)
+    {
+      // Update values from Renderer
+      Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS);
+
+      Vector4 retValue = Vector4::ZERO;
+      if(value.Get(retValue))
+      {
+        if(mImpl->mDecorationData != nullptr || retValue != Vector4::ZERO)
+        {
+          mImpl->SetCornerRadius(retValue);
+        }
+      }
+    }
+    return mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO);
   }
-  return !(mImpl->mCornerRadius == Vector4::ZERO) || mImpl->mNeedCornerRadius;
+  return false;
 }
 
 bool Visual::Base::IsBorderlineRequired() const
 {
-  if(mImpl->mRenderer && mImpl->mBorderlineWidthIndex != Property::INVALID_INDEX)
+  // If VisualType doesn't support borderline, always return false.
+  if(IsTypeAvailableForBorderline(mImpl->mType))
   {
-    // Update values from Renderer
-    mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty<float>(mImpl->mBorderlineWidthIndex);
+    if(mImpl->mRenderer)
+    {
+      // Update values from Renderer
+      Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
+
+      float retValue = 0.0f;
+      if(value.Get(retValue))
+      {
+        if(mImpl->mDecorationData != nullptr || !Dali::EqualsZero(retValue))
+        {
+          mImpl->SetBorderlineWidth(retValue);
+        }
+      }
+    }
+    return mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth());
   }
-  return !EqualsZero(mImpl->mBorderlineWidth) || mImpl->mNeedBorderline;
+  return false;
 }
 
 void Visual::Base::OnDoAction(const Property::Index actionId, const Property::Value& attributes)
@@ -548,26 +714,52 @@ void Visual::Base::OnDoAction(const Property::Index actionId, const Property::Va
   // May be overriden by derived class
 }
 
+void Visual::Base::OnDoActionExtension(const Property::Index actionId, const Dali::Any attributes)
+{
+  // May be overriden by derived class
+}
+
 void Visual::Base::RegisterMixColor()
 {
-  // Only register if not already registered.
-  // (Color and Primitive visuals will register their own and save to this index)
-  if(mImpl->mMixColorIndex == Property::INVALID_INDEX)
+  if(mImpl->mRenderer)
   {
-    mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty(
-      Toolkit::Visual::Property::MIX_COLOR,
-      MIX_COLOR,
-      Vector3(mImpl->mMixColor));
-  }
+    // All visual renderers now use same mix color / opacity properties.
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(mImpl->mMixColor));
+    mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, mImpl->mMixColor.a);
 
-  mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, mImpl->mMixColor.a);
+    float preMultipliedAlpha = 0.0f;
+    if(IsPreMultipliedAlphaEnabled())
+    {
+      preMultipliedAlpha = 1.0f;
+    }
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA, preMultipliedAlpha);
+  }
+}
 
-  float preMultipliedAlpha = 0.0f;
-  if(IsPreMultipliedAlphaEnabled())
+void Visual::Base::RegisterDecoration()
+{
+  if(mImpl->mRenderer)
   {
-    preMultipliedAlpha = 1.0f;
+    if(IsTypeAvailableForCornerRadius(mImpl->mType))
+    {
+      if(mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO))
+      {
+        DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+      }
+    }
+    if(IsTypeAvailableForBorderline(mImpl->mType))
+    {
+      if(mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth()))
+      {
+        DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+        mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+      }
+    }
   }
-  mImpl->mRenderer.RegisterProperty(PRE_MULTIPLIED_ALPHA_PROPERTY, preMultipliedAlpha);
 }
 
 void Visual::Base::SetMixColor(const Vector4& color)
@@ -576,7 +768,7 @@ void Visual::Base::SetMixColor(const Vector4& color)
 
   if(mImpl->mRenderer)
   {
-    mImpl->mRenderer.SetProperty(mImpl->mMixColorIndex, Vector3(color));
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, Vector3(color));
     mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, color.a);
   }
 }
@@ -589,7 +781,7 @@ void Visual::Base::SetMixColor(const Vector3& color)
 
   if(mImpl->mRenderer)
   {
-    mImpl->mRenderer.SetProperty(mImpl->mMixColorIndex, color);
+    mImpl->mRenderer.SetProperty(VisualRenderer::Property::VISUAL_MIX_COLOR, color);
   }
 }
 
@@ -619,7 +811,8 @@ void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus)
 
 bool Visual::Base::IsResourceReady() const
 {
-  return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY);
+  return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ||
+          mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED);
 }
 
 bool Visual::Base::IsSynchronousLoadingRequired() const
@@ -652,8 +845,139 @@ Renderer Visual::Base::GetRenderer()
   return mImpl->mRenderer;
 }
 
+Property::Index Visual::Base::GetIntKey(Property::Key key)
+{
+  if(key.type == Property::Key::INDEX)
+  {
+    return key.indexKey;
+  }
+
+  if(key.stringKey == ANCHOR_POINT)
+  {
+    return Toolkit::Visual::Transform::Property::ANCHOR_POINT;
+  }
+  else if(key.stringKey == EXTRA_SIZE)
+  {
+    return Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE;
+  }
+  else if(key.stringKey == MIX_COLOR)
+  {
+    return Toolkit::Visual::Property::MIX_COLOR;
+  }
+  else if(key.stringKey == OPACITY)
+  {
+    return Toolkit::Visual::Property::OPACITY;
+  }
+  else if(key.stringKey == OFFSET)
+  {
+    return Toolkit::Visual::Transform::Property::OFFSET;
+  }
+  else if(key.stringKey == OFFSET_POLICY)
+  {
+    return Toolkit::Visual::Transform::Property::OFFSET_POLICY;
+  }
+  else if(key.stringKey == ORIGIN)
+  {
+    return Toolkit::Visual::Transform::Property::ORIGIN;
+  }
+  else if(key.stringKey == PREMULTIPLIED_ALPHA)
+  {
+    return Toolkit::Visual::Property::PREMULTIPLIED_ALPHA;
+  }
+  else if(key.stringKey == CUSTOM_SHADER)
+  {
+    return Toolkit::Visual::Property::SHADER;
+  }
+  else if(key.stringKey == SIZE)
+  {
+    return Toolkit::Visual::Transform::Property::SIZE;
+  }
+  else if(key.stringKey == SIZE_POLICY)
+  {
+    return Toolkit::Visual::Transform::Property::SIZE_POLICY;
+  }
+  else if(key.stringKey == TRANSFORM)
+  {
+    return Toolkit::Visual::Property::TRANSFORM;
+  }
+  else if(key.stringKey == VISUAL_FITTING_MODE)
+  {
+    return Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE;
+  }
+  else if(key.stringKey == CORNER_RADIUS)
+  {
+    return Toolkit::DevelVisual::Property::CORNER_RADIUS;
+  }
+  else if(key.stringKey == CORNER_RADIUS_POLICY)
+  {
+    return Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY;
+  }
+  else if(key.stringKey == BORDERLINE_WIDTH)
+  {
+    return Toolkit::DevelVisual::Property::BORDERLINE_WIDTH;
+  }
+  else if(key.stringKey == BORDERLINE_COLOR)
+  {
+    return Toolkit::DevelVisual::Property::BORDERLINE_COLOR;
+  }
+  else if(key.stringKey == BORDERLINE_OFFSET)
+  {
+    return Toolkit::DevelVisual::Property::BORDERLINE_OFFSET;
+  }
+
+  return Property::INVALID_INDEX;
+}
+
 Property::Index Visual::Base::GetPropertyIndex(Property::Key key)
 {
+  switch(GetIntKey(key))
+  {
+    case Dali::Toolkit::Visual::Transform::Property::OFFSET:
+    {
+      return VisualRenderer::Property::TRANSFORM_OFFSET;
+    }
+    case Dali::Toolkit::Visual::Transform::Property::SIZE:
+    {
+      return VisualRenderer::Property::TRANSFORM_SIZE;
+    }
+    case Dali::Toolkit::Visual::Transform::Property::ORIGIN:
+    {
+      return VisualRenderer::Property::TRANSFORM_ORIGIN;
+    }
+    case Dali::Toolkit::Visual::Transform::Property::ANCHOR_POINT:
+    {
+      return VisualRenderer::Property::TRANSFORM_ANCHOR_POINT;
+    }
+    case Dali::Toolkit::Visual::Property::MIX_COLOR:
+    {
+      return VisualRenderer::Property::VISUAL_MIX_COLOR;
+    }
+    case Dali::Toolkit::Visual::Property::OPACITY:
+    {
+      return DevelRenderer::Property::OPACITY;
+    }
+    case Dali::Toolkit::Visual::Property::PREMULTIPLIED_ALPHA:
+    {
+      return VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA;
+    }
+    case Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS:
+    {
+      return DecoratedVisualRenderer::Property::CORNER_RADIUS;
+    }
+    case Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH:
+    {
+      return DecoratedVisualRenderer::Property::BORDERLINE_WIDTH;
+    }
+    case Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR:
+    {
+      return DecoratedVisualRenderer::Property::BORDERLINE_COLOR;
+    }
+    case Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET:
+    {
+      return DecoratedVisualRenderer::Property::BORDERLINE_OFFSET;
+    }
+  }
+
   Property::Index index = mImpl->mRenderer.GetPropertyIndex(key);
 
   if(index == Property::INVALID_INDEX)
@@ -678,7 +1002,9 @@ Property::Index Visual::Base::GetPropertyIndex(Property::Key key)
         // Leave keyIndex as INVALID_KEY - it can still be registered against the string key.
       }
       Property::Value value = shader.GetProperty(index);
-      index                 = mImpl->mRenderer.RegisterProperty(keyIndex, keyName, value);
+
+      // We already know that mRenderer didn't have property. So we can assume that it is unique.
+      index = mImpl->mRenderer.RegisterUniqueProperty(keyIndex, keyName, value);
     }
   }
   return index;
@@ -726,6 +1052,7 @@ void Visual::Base::AnimateProperty(
   Internal::TransitionData::Animator& animator)
 {
 #if defined(DEBUG_ENABLED)
+  if(gVisualBaseLogFilter->IsEnabledFor(Debug::General))
   {
     std::ostringstream oss;
     oss << "Visual::Base::AnimateProperty(Visual:" << mImpl->mName << " Property:" << animator.propertyKey << " Target: " << animator.targetValue << std::endl;
@@ -770,7 +1097,9 @@ void Visual::Base::AnimateRendererProperty(
   Dali::Animation&                    transition,
   Internal::TransitionData::Animator& animator)
 {
+  // Get actual renderer index (will convert transform keys into visualproperty indices)
   Property::Index index = GetPropertyIndex(animator.propertyKey);
+
   if(index != Property::INVALID_INDEX)
   {
     if(animator.targetValue.GetType() != Property::NONE)
@@ -789,7 +1118,6 @@ void Visual::Base::AnimateRendererProperty(
 
       mImpl->mTransform.UpdatePropertyMap(map);
     }
-
     SetupTransition(transition, animator, index, animator.initialValue, animator.targetValue);
   }
 }
@@ -798,50 +1126,47 @@ void Visual::Base::AnimateMixColorProperty(
   Dali::Animation&                    transition,
   Internal::TransitionData::Animator& animator)
 {
-  Property::Index index          = mImpl->mMixColorIndex;
-  bool            animateOpacity = false;
+  bool animateOpacity = false;
 
   Property::Value initialOpacity;
   Property::Value targetOpacity;
   Property::Value initialMixColor;
   Property::Value targetMixColor;
 
-  if(index != Property::INVALID_INDEX)
+  Vector4 initialColor;
+  if(animator.initialValue.Get(initialColor))
   {
-    Vector4 initialColor;
-    if(animator.initialValue.Get(initialColor))
+    if(animator.initialValue.GetType() == Property::VECTOR4)
     {
-      if(animator.initialValue.GetType() == Property::VECTOR4)
-      {
-        // if there is an initial color specifying alpha, test it
-        initialOpacity = initialColor.a;
-      }
-      initialMixColor = Vector3(initialColor);
+      // if there is an initial color specifying alpha, test it
+      initialOpacity = initialColor.a;
     }
+    initialMixColor = Vector3(initialColor);
+  }
 
-    // Set target value into data store
-    if(animator.targetValue.GetType() != Property::NONE)
+  // Set target value into data store
+  if(animator.targetValue.GetType() != Property::NONE)
+  {
+    Vector4 mixColor;
+    animator.targetValue.Get(mixColor);
+    if(animator.targetValue.GetType() == Property::VECTOR4)
     {
-      Vector4 mixColor;
-      animator.targetValue.Get(mixColor);
-      if(animator.targetValue.GetType() == Property::VECTOR4)
-      {
-        mImpl->mMixColor.a = mixColor.a;
-        targetOpacity      = mixColor.a;
-        animateOpacity     = true;
-      }
-
-      mImpl->mMixColor.r = mixColor.r;
-      mImpl->mMixColor.g = mixColor.g;
-      mImpl->mMixColor.b = mixColor.b;
-      targetMixColor     = Vector3(mixColor);
+      mImpl->mMixColor.a = mixColor.a;
+      targetOpacity      = mixColor.a;
+      animateOpacity     = true;
     }
 
-    SetupTransition(transition, animator, index, initialMixColor, targetMixColor);
-    if(animateOpacity)
-    {
-      SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity);
-    }
+    mImpl->mMixColor.r = mixColor.r;
+    mImpl->mMixColor.g = mixColor.g;
+    mImpl->mMixColor.b = mixColor.b;
+    targetMixColor     = Vector3(mixColor);
+  }
+
+  SetupTransition(transition, animator, VisualRenderer::Property::VISUAL_MIX_COLOR, initialMixColor, targetMixColor);
+
+  if(animateOpacity)
+  {
+    SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity);
   }
 }
 
@@ -853,90 +1178,114 @@ Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key)
     return Dali::Property(handle, Property::INVALID_INDEX);
   }
 
-  // Mix color or opacity cases
-  if(key.type == Property::Key::INDEX)
-  {
-    if(key.indexKey == Toolkit::Visual::Property::MIX_COLOR || (mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) || (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR))
-    {
-      return Dali::Property(mImpl->mRenderer, mImpl->mMixColorIndex);
-    }
-    else if(key.indexKey == Toolkit::Visual::Property::OPACITY)
-    {
-      return Dali::Property(mImpl->mRenderer, DevelRenderer::Property::OPACITY);
-    }
-    else if(key.indexKey == Toolkit::Visual::Transform::Property::OFFSET)
-    {
-      return Dali::Property(mImpl->mRenderer, OFFSET);
-    }
-    else if(key.indexKey == Toolkit::Visual::Transform::Property::SIZE)
-    {
-      return Dali::Property(mImpl->mRenderer, SIZE);
-    }
-  }
-  else
+  switch(GetIntKey(key))
   {
-    if(key.stringKey == MIX_COLOR)
+    // Default animatable properties from VisualRenderer
+    case Toolkit::Visual::Property::MIX_COLOR:
     {
-      return Dali::Property(mImpl->mRenderer, mImpl->mMixColorIndex);
+      return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR);
     }
-    else if(key.stringKey == OPACITY)
+    case Toolkit::Visual::Property::OPACITY:
     {
       return Dali::Property(mImpl->mRenderer, DevelRenderer::Property::OPACITY);
     }
-    else if(key.stringKey == OFFSET)
+    case Toolkit::Visual::Transform::Property::OFFSET:
     {
-      return Dali::Property(mImpl->mRenderer, OFFSET);
+      return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_OFFSET);
     }
-    else if(key.stringKey == SIZE)
+    case Toolkit::Visual::Transform::Property::SIZE:
     {
-      return Dali::Property(mImpl->mRenderer, SIZE);
+      return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_SIZE);
     }
-  }
 
-  // Other cases
-  Property::Index index = GetPropertyIndex(key);
-  if(index == Property::INVALID_INDEX)
-  {
-    if((key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::BORDERLINE_WIDTH)  || (key.type == Property::Key::STRING && key.stringKey == BORDERLINE_WIDTH) ||
-       (key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::BORDERLINE_COLOR)  || (key.type == Property::Key::STRING && key.stringKey == BORDERLINE_COLOR) ||
-       (key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::BORDERLINE_OFFSET) || (key.type == Property::Key::STRING && key.stringKey == BORDERLINE_OFFSET))
+    // Default animatable properties from DecoratedVisualRenderer
+    case Toolkit::DevelVisual::Property::CORNER_RADIUS:
     {
-      mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+      if(IsTypeAvailableForCornerRadius(mImpl->mType))
+      {
+        const bool updateShader = !mImpl->mCustomShader && !IsRoundedCornerRequired();
 
-      // Register borderline properties
-      mImpl->mBorderlineWidthIndex  = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::BORDERLINE_WIDTH, BORDERLINE_WIDTH, mImpl->mBorderlineWidth);
-      mImpl->mBorderlineColorIndex  = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::BORDERLINE_COLOR, BORDERLINE_COLOR, mImpl->mBorderlineColor);
-      mImpl->mBorderlineOffsetIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::BORDERLINE_OFFSET, BORDERLINE_OFFSET, mImpl->mBorderlineOffset);
-      mImpl->mNeedBorderline        = true;
+        // CornerRadius is animated now. we always have to use corner radius feature.
+        mImpl->mAlwaysUsingCornerRadius = true;
 
-      index = mImpl->mRenderer.GetPropertyIndex(key);
+        if(updateShader)
+        {
+          // Update each values to renderer
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
 
-      // Change shader
-      UpdateShader();
+          // Change shader
+          UpdateShader();
+        }
+        if(!IsBorderlineRequired())
+        {
+          // If IsBorderlineRequired is true, BLEND_MODE is already BlendMode::ON_WITHOUT_CULL. So we don't overwrite it.
+          mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+        }
+        return Dali::Property(mImpl->mRenderer, DecoratedVisualRenderer::Property::CORNER_RADIUS);
+      }
+      break;
     }
-    else if((key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::CORNER_RADIUS) || (key.type == Property::Key::STRING && key.stringKey == CORNER_RADIUS))
+    case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH:
+    case Toolkit::DevelVisual::Property::BORDERLINE_COLOR:
+    case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET:
     {
-      // Register CORNER_RADIUS property
-      mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius);
-      mImpl->mRenderer.RegisterProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy);
+      if(IsTypeAvailableForBorderline(mImpl->mType))
+      {
+        const bool updateShader = !mImpl->mCustomShader && !IsBorderlineRequired();
 
-      mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
+        // Borderline is animated now. we always have to use borderline feature.
+        mImpl->mAlwaysUsingBorderline = true;
 
-      index                    = mImpl->mCornerRadiusIndex;
-      mImpl->mNeedCornerRadius = true;
+        if(updateShader)
+        {
+          // Update each values to renderer
+          DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+          mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+
+          // Change shader
+          UpdateShader();
+        }
+        mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL);
 
-      // Change shader
-      UpdateShader();
+        return Dali::Property(mImpl->mRenderer, GetPropertyIndex(key));
+      }
+      break;
     }
-    else
+    default:
     {
-      // We can't find the property in the base class.
-      // Request to child class
-      return OnGetPropertyObject(key);
+      // Special case for MIX_COLOR
+      if(key.type == Property::Key::INDEX &&
+         ((mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) ||
+          (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR)))
+      {
+        return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR);
+      }
+
+      // Special case for BLUR_RADIUS
+      if(mImpl->mType == Toolkit::Visual::COLOR &&
+         ((key.type == Property::Key::INDEX && key.indexKey == DevelColorVisual::Property::BLUR_RADIUS) ||
+          (key.type == Property::Key::STRING && key.stringKey == BLUR_RADIUS_NAME)))
+      {
+        // Request to color-visual class
+        return OnGetPropertyObject(key);
+      }
     }
   }
 
-  return Dali::Property(mImpl->mRenderer, index);
+  // If it is not VisualRenderer property, check registered Renderer and Shader property.
+  Property::Index index = GetPropertyIndex(key);
+  if(index != Property::INVALID_INDEX)
+  {
+    return Dali::Property(mImpl->mRenderer, index);
+  }
+
+  // We can't find the property in the base class.
+  // Request to child class
+  return OnGetPropertyObject(key);
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h
index d04d3df..7ebf239 100644
--- a/dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_VISUAL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,12 +92,20 @@ public:
   void SetTransformAndSize(const Property::Map& transform, Size controlSize);
 
   /**
-   * @brief Performs an action on the visual with the given action name and attributes.
+   * @brief Performs an action on the visual with the given action id and attributes.
    *
-   * @param[in] actionName The name of the action to perform this API only takes an Index
+   * @param[in] actionId The id of the action to perform this API only takes an Index
    * @param[in] attributes The list of attributes for the action. ( optional for this data structure to have content )
    */
-  void DoAction(const Dali::Property::Index actionName, const Dali::Property::Value attributes);
+  void DoAction(const Dali::Property::Index actionId, const Dali::Property::Value attributes);
+
+  /**
+   * @brief Performs an action on the visual with the given action id and attributes.
+   *
+   * @param[in] actionId The id of the action to perform this API only takes an Index
+   * @param[in] attributes The list of attributes for the action. ( optional for this data structure to have content )
+   */
+  void DoActionExtension(const Dali::Property::Index actionId, const Dali::Any attributes);
 
   /**
    * @copydoc Toolkit::Visual::Base::GetHeightForWidth
@@ -155,7 +163,7 @@ public:
    *
    * @param[in] preMultiplied whether alpha is pre-multiplied.
    */
-  void EnablePreMultipliedAlpha(bool preMultiplied);
+  virtual void EnablePreMultipliedAlpha(bool preMultiplied);
 
   /**
    * @brief Query whether alpha is pre-multiplied.
@@ -186,6 +194,13 @@ public:
   Renderer GetRenderer();
 
   /**
+   * Convert all string keys to int keys
+   * @param[in] key The key to convert
+   * @return the index key supplied or matching, or INVALID_INDEX if no match
+   */
+  static Property::Index GetIntKey(Property::Key key);
+
+  /**
    * Sets the mix color ( including opacity )  of the visual.
    * @param[in] mixColor The new mix color
    */
@@ -232,8 +247,8 @@ public:
   void ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus);
 
   /**
-   * @brief Called when the visuals resources are loaded / ready
-   * @return true if ready, false otherwise
+   * @brief Called when the visuals resources are loaded / ready or failed (mean, broken image ready)
+   * @return true if ready or failed (mean, broken image ready), false otherwise
    */
   virtual bool IsResourceReady() const;
 
@@ -356,6 +371,14 @@ protected:
   virtual void OnDoAction(const Property::Index actionId, const Property::Value& attributes);
 
   /**
+   * @brief Called by DoActionExtension() allowing sub classes to do the given action.
+   *
+   * @param[in] actionId The action to perform
+   * @param[in] attributes The list of attributes for the action. ( optional for this data structure to have content )
+   */
+  virtual void OnDoActionExtension(const Property::Index actionId, Dali::Any attributes);
+
+  /**
    * @brief Update the shader when some properties are changed.
    */
   virtual void UpdateShader()
@@ -415,6 +438,11 @@ private:
   void RegisterMixColor();
 
   /**
+   * Register the uniform on the DecoratedVisualRenderer and store the property index if necessary.
+   */
+  void RegisterDecoration();
+
+  /**
    * Find the matching property on the renderer or shader. If it's a shader
    * property, register it on the renderer in order to animate it for this
    * visual independently.
diff --git a/dali-toolkit/internal/visuals/visual-event-observer.h b/dali-toolkit/internal/visuals/visual-event-observer.h
index 799962f..35a48fa 100644
--- a/dali-toolkit/internal/visuals/visual-event-observer.h
+++ b/dali-toolkit/internal/visuals/visual-event-observer.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TOOLKIT_VISUAL_EVENT_OBSERVER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,12 @@ public:
    */
   virtual void NotifyVisualEvent(Visual::Base& object, Property::Index signalId) = 0;
 
+  /**
+   * Requests a relayout to the observer.
+   * @param[in] object The connection owner
+   */
+  virtual void RelayoutRequest(Visual::Base& object) = 0;
+
 protected:
   /**
    * constructor
diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
index b4fde0a..e8b5dbf 100644
--- a/dali-toolkit/internal/visuals/visual-factory-cache.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,25 @@
  */
 
 // CLASS HEADER
-#include "visual-factory-cache.h"
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/environment-variable.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/devel-api/common/hash.h>
+#include <dali/devel-api/scripting/enum-helper.h>
+#include <dali/devel-api/scripting/scripting.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/math/math-utils.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/utility/npatch-helper.h>
+#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
 #include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
 #include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 #include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
 
 namespace Dali
 {
@@ -33,17 +41,34 @@ namespace Toolkit
 {
 namespace Internal
 {
+namespace
+{
+const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
+
+constexpr auto LOAD_IMAGE_YUV_PLANES_ENV = "DALI_LOAD_IMAGE_YUV_PLANES";
+
+bool NeedToLoadYuvPlanes()
+{
+  auto loadYuvPlanesString = Dali::EnvironmentVariable::GetEnvironmentVariable(LOAD_IMAGE_YUV_PLANES_ENV);
+  bool loadYuvPlanes       = loadYuvPlanesString ? std::atoi(loadYuvPlanesString) : false;
+  return loadYuvPlanes;
+}
+
+} // namespace
+
 VisualFactoryCache::VisualFactoryCache(bool preMultiplyOnLoad)
-: mSvgRasterizeThread(NULL),
-  mVectorAnimationManager(),
-  mBrokenImageUrl(""),
-  mPreMultiplyOnLoad(preMultiplyOnLoad)
+: mLoadYuvPlanes(NeedToLoadYuvPlanes()),
+  mTextureManager(mLoadYuvPlanes),
+  mVectorAnimationManager(nullptr),
+  mPreMultiplyOnLoad(preMultiplyOnLoad),
+  mBrokenImageInfoContainer(),
+  mDefaultBrokenImageUrl(""),
+  mUseDefaultBrokenImageOnly(true)
 {
 }
 
 VisualFactoryCache::~VisualFactoryCache()
 {
-  SvgRasterizeThread::TerminateThread(mSvgRasterizeThread);
 }
 
 Geometry VisualFactoryCache::GetGeometry(GeometryType type)
@@ -66,9 +91,11 @@ Shader VisualFactoryCache::GetShader(ShaderType type)
   return mShader[type];
 }
 
-void VisualFactoryCache::SaveShader(ShaderType type, Shader shader)
+Shader VisualFactoryCache::GenerateAndSaveShader(ShaderType type, std::string_view vertexShader, std::string_view fragmentShader)
 {
+  Shader shader = Shader::New(vertexShader, fragmentShader, Shader::Hint::NONE, Scripting::GetLinearEnumerationName<ShaderType>(type, VISUAL_SHADER_TYPE_TABLE, VISUAL_SHADER_TYPE_TABLE_COUNT));
   mShader[type] = shader;
+  return shader;
 }
 
 Geometry VisualFactoryCache::CreateQuadGeometry()
@@ -104,7 +131,7 @@ ImageAtlasManagerPtr VisualFactoryCache::GetAtlasManager()
   if(!mAtlasManager)
   {
     mAtlasManager = new ImageAtlasManager();
-    mAtlasManager->SetBrokenImage(mBrokenImageUrl);
+    mAtlasManager->SetBrokenImage(mDefaultBrokenImageUrl);
   }
 
   return mAtlasManager;
@@ -120,16 +147,6 @@ NPatchLoader& VisualFactoryCache::GetNPatchLoader()
   return mNPatchLoader;
 }
 
-SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
-{
-  if(!mSvgRasterizeThread)
-  {
-    mSvgRasterizeThread = new SvgRasterizeThread();
-    mSvgRasterizeThread->Start();
-  }
-  return mSvgRasterizeThread;
-}
-
 VectorAnimationManager& VisualFactoryCache::GetVectorAnimationManager()
 {
   if(!mVectorAnimationManager)
@@ -207,20 +224,22 @@ Geometry VisualFactoryCache::CreateGridGeometry(Uint16Pair gridSize)
   return geometry;
 }
 
-Texture VisualFactoryCache::GetBrokenVisualImage()
+Texture VisualFactoryCache::GetBrokenVisualImage(uint32_t brokenIndex)
 {
-  if(!mBrokenImageTexture && mBrokenImageUrl.size())
+  if(!(mBrokenImageInfoContainer[brokenIndex].texture))
   {
-    PixelData          data;
-    Devel::PixelBuffer pixelBuffer = LoadImageFromFile(mBrokenImageUrl);
+    PixelData          pixelData;
+    Devel::PixelBuffer pixelBuffer = LoadImageFromFile(mBrokenImageInfoContainer[brokenIndex].url);
     if(pixelBuffer)
     {
-      data                = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer
-      mBrokenImageTexture = Texture::New(Dali::TextureType::TEXTURE_2D, data.GetPixelFormat(), data.GetWidth(), data.GetHeight());
-      mBrokenImageTexture.Upload(data);
+      pixelData                                      = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer
+      mBrokenImageInfoContainer[brokenIndex].texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+      mBrokenImageInfoContainer[brokenIndex].texture.Upload(pixelData);
+      mBrokenImageInfoContainer[brokenIndex].width  = pixelData.GetWidth();
+      mBrokenImageInfoContainer[brokenIndex].height = pixelData.GetHeight();
     }
   }
-  return mBrokenImageTexture;
+  return mBrokenImageInfoContainer[brokenIndex].texture;
 }
 
 void VisualFactoryCache::SetPreMultiplyOnLoad(bool preMultiply)
@@ -228,21 +247,239 @@ void VisualFactoryCache::SetPreMultiplyOnLoad(bool preMultiply)
   mPreMultiplyOnLoad = preMultiply;
 }
 
-bool VisualFactoryCache::GetPreMultiplyOnLoad()
+bool VisualFactoryCache::GetPreMultiplyOnLoad() const
 {
   return mPreMultiplyOnLoad;
 }
 
-void VisualFactoryCache::SetBrokenImageUrl(const std::string& brokenImageUrl)
+bool VisualFactoryCache::GetLoadYuvPlanes() const
 {
-  mBrokenImageUrl = brokenImageUrl;
+  return mLoadYuvPlanes;
+}
 
-  if(!mAtlasManager)
+void VisualFactoryCache::SetBrokenImageUrl(std::string& defaultBrokenUrl, const std::vector<std::string>& brokenImageUrlList)
+{
+  mUseDefaultBrokenImageOnly = false;
+  mBrokenImageInfoContainer.clear();
+  mBrokenImageInfoContainer.assign(brokenImageUrlList.size(), BrokenImageInfo());
+  for(unsigned int i = 0; i < brokenImageUrlList.size(); i++)
   {
-    mAtlasManager = new ImageAtlasManager();
+    mBrokenImageInfoContainer[i].url = brokenImageUrlList[i];
+  }
+
+  mDefaultBrokenImageUrl = defaultBrokenUrl;
+}
+
+VisualUrl::Type VisualFactoryCache::GetBrokenImageVisualType(int index)
+{
+  return mBrokenImageInfoContainer[index].visualType;
+}
+
+Geometry VisualFactoryCache::GetNPatchGeometry(int index)
+{
+  Geometry      geometry;
+  NPatchDataPtr data;
+  if(mNPatchLoader.GetNPatchData(mBrokenImageInfoContainer[index].npatchId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
+  {
+    if(data->GetStretchPixelsX().Size() == 1 && data->GetStretchPixelsY().Size() == 1)
+    {
+      geometry = GetGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY);
+      if(!geometry)
+      {
+        geometry = NPatchHelper::CreateGridGeometry(Uint16Pair(3, 3));
+        SaveGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY, geometry);
+      }
+    }
+    else if(data->GetStretchPixelsX().Size() > 0 || data->GetStretchPixelsY().Size() > 0)
+    {
+      Uint16Pair gridSize(2 * data->GetStretchPixelsX().Size() + 1, 2 * data->GetStretchPixelsY().Size() + 1);
+      geometry = NPatchHelper::CreateGridGeometry(gridSize);
+    }
+  }
+  else
+  {
+    // no N patch data so use default geometry
+    geometry = GetGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY);
+    if(!geometry)
+    {
+      geometry = NPatchHelper::CreateGridGeometry(Uint16Pair(3, 3));
+      SaveGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY, geometry);
+    }
+  }
+  return geometry;
+}
+
+Shader VisualFactoryCache::GetNPatchShader(int index)
+{
+  Shader        shader;
+  NPatchDataPtr data;
+  // 0 is either no data (load failed?) or no stretch regions on image
+  // for both cases we use the default shader
+  NPatchUtility::StretchRanges::SizeType xStretchCount = 0;
+  NPatchUtility::StretchRanges::SizeType yStretchCount = 0;
+
+  // ask loader for the regions
+  if(mNPatchLoader.GetNPatchData(mBrokenImageInfoContainer[index].npatchId, data))
+  {
+    xStretchCount = data->GetStretchPixelsX().Count();
+    yStretchCount = data->GetStretchPixelsY().Count();
+  }
+
+  if(DALI_LIKELY((xStretchCount == 0 && yStretchCount == 0) || (xStretchCount == 1 && yStretchCount == 1)))
+  {
+    shader = GetShader(VisualFactoryCache::NINE_PATCH_SHADER);
+    if(DALI_UNLIKELY(!shader))
+    {
+      // Only cache vanilla 9 patch shaders
+      shader = GenerateAndSaveShader(VisualFactoryCache::NINE_PATCH_SHADER, SHADER_NPATCH_VISUAL_3X3_SHADER_VERT, SHADER_NPATCH_VISUAL_SHADER_FRAG);
+    }
+  }
+  else if(xStretchCount > 0 || yStretchCount > 0)
+  {
+    std::stringstream shaderName;
+    shaderName << "N_PATCH_" << xStretchCount << "x" << yStretchCount;
+
+    std::stringstream vertexShader;
+    vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n"
+                 << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n"
+                 << SHADER_NPATCH_VISUAL_SHADER_VERT;
+    shader = Shader::New(vertexShader.str(), SHADER_NPATCH_VISUAL_SHADER_FRAG, Dali::Shader::Hint::NONE, shaderName.str());
+  }
+  return shader;
+}
+
+void VisualFactoryCache::ApplyTextureAndUniforms(Renderer& renderer, int index)
+{
+  NPatchDataPtr data;
+  TextureSet    textureSet;
+  if(mNPatchLoader.GetNPatchData(mBrokenImageInfoContainer[index].npatchId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
+  {
+    textureSet                               = data->GetTextures();
+    mBrokenImageInfoContainer[index].texture = textureSet.GetTexture(0);
+    NPatchHelper::ApplyTextureAndUniforms(renderer, data.Get());
+    renderer.SetTextures(textureSet);
+  }
+}
+
+void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vector2& size, const bool& rendererIsImage)
+{
+  bool useDefaultBrokenImage = false;
+  if(mBrokenImageInfoContainer.size() == 0)
+  {
+    useDefaultBrokenImage = true;
+  }
+
+  // Load Information for broken image
+  for(uint32_t index = 0; (index < mBrokenImageInfoContainer.size()) && !useDefaultBrokenImage; index++)
+  {
+    if(mBrokenImageInfoContainer[index].width == 0 && mBrokenImageInfoContainer[index].height == 0)
+    {
+      if(!mBrokenImageInfoContainer[index].url.empty())
+      {
+        VisualUrl visualUrl(mBrokenImageInfoContainer[index].url);
+        mBrokenImageInfoContainer[index].visualType = visualUrl.GetType();
+        if(mBrokenImageInfoContainer[index].visualType == VisualUrl::Type::N_PATCH)
+        {
+          NPatchDataPtr data;
+          Rect<int>     border;
+          mBrokenImageInfoContainer[index].npatchId = mNPatchLoader.Load(mTextureManager, NULL, mBrokenImageInfoContainer[index].url, border, mPreMultiplyOnLoad, true);
+          if(mNPatchLoader.GetNPatchData(mBrokenImageInfoContainer[index].npatchId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE)
+          {
+            mBrokenImageInfoContainer[index].width  = data->GetCroppedWidth();
+            mBrokenImageInfoContainer[index].height = data->GetCroppedHeight();
+          }
+          else
+          {
+            DALI_LOG_ERROR("Can't update renderer for broken image. maybe image loading is failed [index:%d] [path:%s] \n", index, mBrokenImageInfoContainer[index].url.c_str());
+            useDefaultBrokenImage = true;
+          }
+        }
+        else
+        {
+          if(!GetBrokenVisualImage(index))
+          {
+            DALI_LOG_ERROR("Can't update renderer for broken image. maybe image loading is failed [index:%d] [path:%s] \n", index, mBrokenImageInfoContainer[index].url.c_str());
+            useDefaultBrokenImage = true;
+          }
+        }
+      }
+    }
+  }
+
+  if(!mUseDefaultBrokenImageOnly && useDefaultBrokenImage)
+  {
+    // Clear broken info
+    mBrokenImageInfoContainer.clear();
+
+    // assign for broken image
+    const int defaultBrokenIndex = 0;
+    mBrokenImageInfoContainer.assign(1, BrokenImageInfo());
+    mBrokenImageInfoContainer[defaultBrokenIndex].url = mDefaultBrokenImageUrl;
+    VisualUrl visualUrl(mBrokenImageInfoContainer[defaultBrokenIndex].url);
+    mBrokenImageInfoContainer[defaultBrokenIndex].visualType = visualUrl.GetType();
+    mUseDefaultBrokenImageOnly                               = true;
+  }
+
+  // Set Texutre to renderer
+  int brokenIndex = GetProperBrokenImageIndex(size);
+  if(GetBrokenImageVisualType(brokenIndex) == VisualUrl::N_PATCH)
+  {
+    // Set geometry and shader for npatch
+    Geometry geometry = GetNPatchGeometry(brokenIndex);
+    Shader   shader   = GetNPatchShader(brokenIndex);
+    renderer.SetGeometry(geometry);
+    renderer.SetShader(shader);
+    ApplyTextureAndUniforms(renderer, brokenIndex);
+  }
+  else
+  {
+    // Create single image renderer only if rederer is not use normal ImageShader. i.e. npatch visual.
+    if(!rendererIsImage)
+    {
+      Geometry geometry = GetGeometry(QUAD_GEOMETRY);
+      Shader   shader   = GetShader(IMAGE_SHADER);
+      if(!shader)
+      {
+        shader = GenerateAndSaveShader(IMAGE_SHADER, Dali::Shader::GetVertexShaderPrefix() + SHADER_IMAGE_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_IMAGE_VISUAL_SHADER_FRAG.data());
+        shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT);
+      }
+      renderer.SetGeometry(geometry);
+      renderer.SetShader(shader);
+    }
+    Texture    brokenImage = GetBrokenVisualImage(brokenIndex);
+    TextureSet textureSet  = TextureSet::New();
+    textureSet.SetTexture(0u, brokenImage);
+    renderer.SetTextures(textureSet);
+  }
+}
+
+int32_t VisualFactoryCache::GetProperBrokenImageIndex(const Vector2& size)
+{
+  // Sets the default broken type
+  int32_t returnIndex = 0;
+  if(Dali::EqualsZero(size.width) || Dali::EqualsZero(size.height) || mUseDefaultBrokenImageOnly)
+  {
+    // To do : Need to add observer about size
+    return returnIndex;
+  }
+
+  // Find the proper value if we know the size of the image
+  for(int32_t index = static_cast<int32_t>(mBrokenImageInfoContainer.size()) - 1; index >= 0; index--)
+  {
+    // Skip if the value is not set
+    if(mBrokenImageInfoContainer[index].width == 0 || mBrokenImageInfoContainer[index].height == 0)
+    {
+      continue;
+    }
+
+    if(mBrokenImageInfoContainer[index].width < size.width && mBrokenImageInfoContainer[index].height < size.height)
+    {
+      returnIndex = index;
+      break;
+    }
   }
 
-  mAtlasManager->SetBrokenImage(mBrokenImageUrl);
+  return returnIndex;
 }
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h
index 6e8f37d..1b3f098 100644
--- a/dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,16 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/common/owner-container.h>
+#include <dali/integration-api/adaptor-framework/shader-precompiler.h>
 #include <dali/public-api/math/uint-16-pair.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/shader.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
 #include <dali-toolkit/internal/visuals/npatch-loader.h>
-#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
 
 namespace Dali
 {
@@ -80,19 +81,47 @@ public:
     GRADIENT_SHADER_RADIAL_USER_SPACE_BORDERLINE,
     GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_BORDERLINE,
     IMAGE_SHADER,
-    IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
-    IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
     IMAGE_SHADER_ROUNDED_CORNER,
     IMAGE_SHADER_BORDERLINE,
     IMAGE_SHADER_ROUNDED_BORDERLINE,
+    IMAGE_SHADER_MASKING,
+    IMAGE_SHADER_ROUNDED_CORNER_MASKING,
+    IMAGE_SHADER_BORDERLINE_MASKING,
+    IMAGE_SHADER_ROUNDED_BORDERLINE_MASKING,
+    IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
+    IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
+    IMAGE_SHADER_YUV_TO_RGB,
+    IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB,
+    IMAGE_SHADER_BORDERLINE_YUV_TO_RGB,
+    IMAGE_SHADER_ROUNDED_BORDERLINE_YUV_TO_RGB,
+    IMAGE_SHADER_YUV_AND_RGB,
+    IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB,
+    IMAGE_SHADER_BORDERLINE_YUV_AND_RGB,
+    IMAGE_SHADER_ROUNDED_BORDERLINE_YUV_AND_RGB,
+    NATIVE_IMAGE_SHADER,
+    NATIVE_IMAGE_SHADER_ROUNDED_CORNER,
+    NATIVE_IMAGE_SHADER_BORDERLINE,
+    NATIVE_IMAGE_SHADER_ROUNDED_BORDERLINE,
+    NATIVE_IMAGE_SHADER_MASKING,
+    NATIVE_IMAGE_SHADER_ROUNDED_CORNER_MASKING,
+    NATIVE_IMAGE_SHADER_BORDERLINE_MASKING,
+    NATIVE_IMAGE_SHADER_ROUNDED_BORDERLINE_MASKING,
+    NATIVE_IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
+    NATIVE_IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
     NINE_PATCH_SHADER,
     NINE_PATCH_MASK_SHADER,
-    TEXT_SHADER_MULTI_COLOR_TEXT,
-    TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
     TEXT_SHADER_SINGLE_COLOR_TEXT,
     TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE,
+    TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_OVERLAY,
+    TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_OVERLAY,
     TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_EMOJI,
     TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI,
+    TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_OVERLAY_AND_EMOJI,
+    TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_OVERLAY_AND_EMOJI,
+    TEXT_SHADER_MULTI_COLOR_TEXT,
+    TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
+    TEXT_SHADER_MULTI_COLOR_TEXT_WITH_OVERLAY,
+    TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE_AND_OVERLAY,
     ANIMATED_GRADIENT_SHADER_LINEAR_BOUNDING_REFLECT,
     ANIMATED_GRADIENT_SHADER_LINEAR_BOUNDING_REPEAT,
     ANIMATED_GRADIENT_SHADER_LINEAR_BOUNDING_CLAMP,
@@ -157,11 +186,13 @@ public:
   Shader GetShader(ShaderType type);
 
   /**
-   * Cache the geometry of the give type.
-   * @param[in] type The geometry type.
-   * @param[in] geometry The geometry for caching.
+   * Generate and cache the shader of the give type. The name of shader will be installed to shader.
+   * @param[in] type The shder type.
+   * @param[in] vertexShader The vertex shader code.
+   * @param[in] fragmentShader The fragment shader code.
+   * @return The shader created by given vertex and fragment shader code.
    */
-  void SaveShader(ShaderType type, Shader shader);
+  Shader GenerateAndSaveShader(ShaderType type, std::string_view vertexShader, std::string_view fragmentShader);
 
   /*
    * Greate the quad geometry.
@@ -177,12 +208,6 @@ public:
   static Geometry CreateGridGeometry(Uint16Pair gridSize);
 
   /**
-   * @brief Returns a new Texture to use when a visual has failed to correctly render
-   * @return The broken image texture.
-   */
-  Texture GetBrokenVisualImage();
-
-  /**
    * @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
    */
   void SetPreMultiplyOnLoad(bool preMultiply);
@@ -190,13 +215,30 @@ public:
   /**
    * @copydoc Toolkit::VisualFactory::GetPreMultiplyOnLoad()
    */
-  bool GetPreMultiplyOnLoad();
+  bool GetPreMultiplyOnLoad() const;
 
   /**
    * @brief Set an image to be used when a visual has failed to correctly render
-   * @param[in] brokenImageUrl The broken image url.
+   * @param[in] brokenImageUrlList The broken image url list
+   */
+  void SetBrokenImageUrl(std::string& defaultBrokenUrl, const std::vector<std::string>& brokenImageUrlList);
+
+  /**
+   * @brief Update the broken image Renderer object
+   * @param[in,out] renderer renderer for broken image
+   * @param[in] size the size of actor
+   * @param[in] rendererIsImage True if input renderer use image shader already.
+   *                            If true, we don't need to create new renderer when broken image is single image.
+   *                            Most of user experience use normal images. So It can reduce runtime.
+   */
+  void UpdateBrokenImageRenderer(Renderer& renderer, const Vector2& size, const bool& rendererIsImage = true);
+
+  /**
+   * @brief Get whether we support YUV Planes load or not.
+   *
+   * @return True if we support to load YUV Planes. False otherwise.
    */
-  void SetBrokenImageUrl(const std::string& brokenImageUrl);
+  bool GetLoadYuvPlanes() const;
 
 public:
   /**
@@ -218,12 +260,6 @@ public:
   NPatchLoader& GetNPatchLoader();
 
   /**
-   * Get the SVG rasterization thread.
-   * @return A raw pointer pointing to the SVG rasterization thread.
-   */
-  SvgRasterizeThread* GetSVGRasterizationThread();
-
-  /**
    * Get the vector animation manager.
    * @return A reference to the vector animation manager.
    */
@@ -241,17 +277,93 @@ protected:
   VisualFactoryCache& operator=(const VisualFactoryCache& rhs);
 
 private:
+  /**
+   * @brief Returns a cached Texture to use when a visual has failed to correctly render
+   * @param[in] brokenIndex The index of broken image
+   *
+   * @return The broken image texture.
+   */
+  Texture GetBrokenVisualImage(uint32_t brokenIndex);
+
+  /**
+   * @brief Gets the Proper broken image index
+   * @param[in] size The size of actor
+   *
+   * @return The index of broken image
+   */
+  int32_t GetProperBrokenImageIndex(const Vector2& size);
+
+  /**
+   * @brief Apply a texture and uniforms
+   *
+   * @param[in,out] renderer The renderer for broken image
+   * @param[in] index The index of broken image
+   */
+  void ApplyTextureAndUniforms(Renderer& renderer, int index);
+
+  /**
+   * @brief Gets a geometry for npatch image
+   *
+   * @param[in] index the index of broken image
+   * @return The Geometry for NPatch
+   */
+  Geometry GetNPatchGeometry(int index);
+
+  /**
+   * @brief Gets the Npatch Shader object
+   *
+   * @param[in] index The index of broken image
+   * @return The Shader for NPatch
+   */
+  Shader GetNPatchShader(int index);
+
+  /**
+   * @brief Returns a broken image type
+   * @param[in] index BrokenImage index
+   * @return The broken image type.
+   */
+  VisualUrl::Type GetBrokenImageVisualType(int index);
+
+private:
+  struct BrokenImageInfo
+  {
+    BrokenImageInfo()
+    : visualType(),
+      url(""),
+      npatchId(NPatchData::INVALID_NPATCH_DATA_ID),
+      texture(),
+      width(0),
+      height(0)
+    {
+    }
+
+    ~BrokenImageInfo()
+    {
+    }
+
+    // Data
+    VisualUrl::Type          visualType;
+    std::string              url;
+    NPatchData::NPatchDataId npatchId;
+    Texture                  texture;
+    uint32_t                 width;
+    uint32_t                 height;
+  };
+
   Geometry mGeometry[GEOMETRY_TYPE_MAX + 1];
   Shader   mShader[SHADER_TYPE_MAX + 1];
 
-  ImageAtlasManagerPtr                    mAtlasManager;
-  TextureManager                          mTextureManager;
-  NPatchLoader                            mNPatchLoader;
-  Texture                                 mBrokenImageTexture;
-  SvgRasterizeThread*                     mSvgRasterizeThread;
+  bool mLoadYuvPlanes; ///< A global flag to specify if the image should be loaded as yuv planes
+
+  ImageAtlasManagerPtr mAtlasManager;
+  TextureManager       mTextureManager;
+  NPatchLoader         mNPatchLoader;
+
   std::unique_ptr<VectorAnimationManager> mVectorAnimationManager;
-  std::string                             mBrokenImageUrl;
   bool                                    mPreMultiplyOnLoad;
+  std::vector<BrokenImageInfo>            mBrokenImageInfoContainer;
+  std::string                             mDefaultBrokenImageUrl;
+  bool                                    mUseDefaultBrokenImageOnly;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 8c4b2f8..91584eb 100644
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/scripting/scripting.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/object/property-array.h>
 #include <dali/public-api/object/type-registry-helper.h>
@@ -26,7 +27,9 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
 #include <dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h>
 #include <dali-toolkit/internal/visuals/animated-image/animated-image-visual.h>
 #include <dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h>
@@ -40,6 +43,7 @@
 #include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
 #include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
 #include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/text-visual-shader-factory.h>
 #include <dali-toolkit/internal/visuals/text/text-visual.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
@@ -72,38 +76,58 @@ DALI_TYPE_REGISTRATION_BEGIN_CREATE(Toolkit::VisualFactory, Dali::BaseHandle, Cr
 DALI_TYPE_REGISTRATION_END()
 const char* const BROKEN_IMAGE_FILE_NAME = "broken.png"; ///< The file name of the broken image.
 
+static constexpr auto SHADER_TYPE_COUNT = 2u;
+
+constexpr std::string_view VertexPredefines[SHADER_TYPE_COUNT]{
+  "",                                     //VisualFactoryCache::COLOR_SHADER
+  "#define IS_REQUIRED_ROUNDED_CORNER\n", //VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER
+};
+constexpr std::string_view FragmentPredefines[SHADER_TYPE_COUNT]{
+  "",                                     //VisualFactoryCache::COLOR_SHADER
+  "#define IS_REQUIRED_ROUNDED_CORNER\n", //VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER
+};
+constexpr VisualFactoryCache::ShaderType ShaderTypePredefines[SHADER_TYPE_COUNT]{
+  VisualFactoryCache::ShaderType::COLOR_SHADER,
+  VisualFactoryCache::ShaderType::COLOR_SHADER_ROUNDED_CORNER,
+};
+
 } // namespace
 
 VisualFactory::VisualFactory(bool debugEnabled)
 : mFactoryCache(),
   mImageVisualShaderFactory(),
+  mTextVisualShaderFactory(),
   mSlotDelegate(this),
+  mIdleCallback(nullptr),
   mDebugEnabled(debugEnabled),
-  mPreMultiplyOnLoad(true)
+  mPreMultiplyOnLoad(true),
+  mPrecompiledShaderRequested(false)
 {
 }
 
 VisualFactory::~VisualFactory()
 {
+  if(mIdleCallback && Adaptor::IsAvailable())
+  {
+    // Removes the callback from the callback manager in case the control is destroyed before the callback is executed.
+    Adaptor::Get().RemoveIdle(mIdleCallback);
+    mIdleCallback = nullptr;
+  }
 }
 
 void VisualFactory::OnStyleChangedSignal(Toolkit::StyleManager styleManager, StyleChange::Type type)
 {
   if(type == StyleChange::THEME_CHANGE)
   {
-    const std::string imageDirPath   = AssetManager::GetDaliImagePath();
-    std::string       brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
-
-    Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager);
-    config["brokenImageUrl"].Get(brokenImageUrl);
-
-    if(mFactoryCache)
-    {
-      mFactoryCache->SetBrokenImageUrl(brokenImageUrl);
-    }
+    SetBrokenImageUrl(styleManager);
   }
 }
 
+void VisualFactory::OnBrokenImageChangedSignal(Toolkit::StyleManager styleManager)
+{
+  SetBrokenImageUrl(styleManager);
+}
+
 Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap)
 {
   Visual::BasePtr visualPtr;
@@ -154,6 +178,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM
                 visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap);
                 break;
               }
+              case VisualUrl::TVG:
               case VisualUrl::SVG:
               {
                 visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap);
@@ -181,7 +206,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM
         else
         {
           Property::Array* array = imageURLValue->GetArray();
-          if(array)
+          if(array && array->Count() > 0)
           {
             visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap);
           }
@@ -210,7 +235,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM
 
     case Toolkit::Visual::TEXT:
     {
-      visualPtr = TextVisual::New(GetFactoryCache(), propertyMap);
+      visualPtr = TextVisual::New(GetFactoryCache(), GetTextVisualShaderFactory(), propertyMap);
       break;
     }
 
@@ -220,7 +245,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM
       std::string      imageUrl;
       if(imageURLValue && imageURLValue->Get(imageUrl))
       {
-        visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+        if(!imageUrl.empty())
+        {
+          visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+        }
       }
       break;
     }
@@ -231,7 +259,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM
       std::string      imageUrl;
       if(imageURLValue && imageURLValue->Get(imageUrl))
       {
-        visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+        if(!imageUrl.empty())
+        {
+          visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+        }
       }
       break;
     }
@@ -244,12 +275,15 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM
       {
         if(imageURLValue->Get(imageUrl))
         {
-          visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+          if(!imageUrl.empty())
+          {
+            visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+          }
         }
         else
         {
           Property::Array* array = imageURLValue->GetArray();
-          if(array)
+          if(array && array->Count() > 0)
           {
             visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap);
           }
@@ -270,7 +304,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM
       std::string      imageUrl;
       if(imageURLValue && imageURLValue->Get(imageUrl))
       {
-        visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+        if(!imageUrl.empty())
+        {
+          visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+        }
       }
       break;
     }
@@ -318,20 +355,21 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageD
         visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl);
         break;
       }
+      case VisualUrl::TVG:
       case VisualUrl::SVG:
       {
-        visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl);
+        visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size);
         break;
       }
       case VisualUrl::GIF:
       case VisualUrl::WEBP:
       {
-        visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl);
+        visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size);
         break;
       }
       case VisualUrl::JSON:
       {
-        visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl);
+        visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size);
         break;
       }
       case VisualUrl::REGULAR_IMAGE:
@@ -365,30 +403,105 @@ bool VisualFactory::GetPreMultiplyOnLoad() const
   return mPreMultiplyOnLoad;
 }
 
+void VisualFactory::DiscardVisual(Toolkit::Visual::Base visual)
+{
+  mDiscardedVisuals.emplace_back(visual);
+
+  RegisterDiscardCallback();
+}
+
+void VisualFactory::UsePreCompiledShader()
+{
+  if(mPrecompiledShaderRequested)
+  {
+    return;
+  }
+  mPrecompiledShaderRequested = true;
+
+  ShaderPreCompiler::Get().Enable();
+
+  // Get image shader
+  std::vector<RawShaderData> rawShaderList;
+  RawShaderData              imageShaderData;
+  GetImageVisualShaderFactory().GetPreCompiledShader(imageShaderData);
+  rawShaderList.push_back(imageShaderData);
+
+  // Get text shader
+  RawShaderData textShaderData;
+  GetTextVisualShaderFactory().GetPreCompiledShader(textShaderData);
+  rawShaderList.push_back(textShaderData);
+
+  // Get color shader
+  RawShaderData colorShaderData;
+  GetPreCompiledShader(colorShaderData);
+  rawShaderList.push_back(colorShaderData);
+
+  // Save all shader
+  ShaderPreCompiler::Get().SavePreCompileShaderList(rawShaderList);
+}
+
 Internal::TextureManager& VisualFactory::GetTextureManager()
 {
   return GetFactoryCache().GetTextureManager();
 }
 
-Internal::VisualFactoryCache& VisualFactory::GetFactoryCache()
+void VisualFactory::SetBrokenImageUrl(Toolkit::StyleManager& styleManager)
 {
-  if(!mFactoryCache)
+  const std::string        imageDirPath   = AssetManager::GetDaliImagePath();
+  std::string              brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
+  std::vector<std::string> customBrokenImageUrlList;
+
+  if(styleManager)
+  {
+    customBrokenImageUrlList       = Toolkit::DevelStyleManager::GetBrokenImageUrlList(styleManager);
+    const auto brokenImageUrlValue = Toolkit::DevelStyleManager::GetConfigurations(styleManager).Find("brokenImageUrl", Property::Type::STRING);
+    if(brokenImageUrlValue)
+    {
+      brokenImageUrlValue->Get(brokenImageUrl);
+    }
+  }
+
+  // Add default image
+  mFactoryCache->SetBrokenImageUrl(brokenImageUrl, customBrokenImageUrlList);
+}
+
+void VisualFactory::GetPreCompiledShader(RawShaderData& shaders)
+{
+  std::vector<std::string_view> vertexPrefix;
+  std::vector<std::string_view> fragmentPrefix;
+  std::vector<std::string_view> shaderName;
+  int                           shaderCount = 0;
+  shaders.shaderCount                       = 0;
+  for(uint32_t i = 0u; i < SHADER_TYPE_COUNT; ++i)
   {
-    mFactoryCache = std::unique_ptr<VisualFactoryCache>(new VisualFactoryCache(mPreMultiplyOnLoad));
+    vertexPrefix.push_back(VertexPredefines[i]);
+    fragmentPrefix.push_back(FragmentPredefines[i]);
+    shaderName.push_back(Scripting::GetLinearEnumerationName<VisualFactoryCache::ShaderType>(ShaderTypePredefines[i], VISUAL_SHADER_TYPE_TABLE, VISUAL_SHADER_TYPE_TABLE_COUNT));
+    shaderCount++;
+  }
 
-    const std::string imageDirPath   = AssetManager::GetDaliImagePath();
-    std::string       brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
+  shaders.vertexPrefix   = vertexPrefix;
+  shaders.fragmentPrefix = fragmentPrefix;
+  shaders.shaderName     = shaderName;
+  shaders.vertexShader   = SHADER_COLOR_VISUAL_SHADER_VERT;
+  shaders.fragmentShader = SHADER_COLOR_VISUAL_SHADER_FRAG;
+  shaders.shaderCount    = shaderCount;
+}
 
+Internal::VisualFactoryCache& VisualFactory::GetFactoryCache()
+{
+  if(!mFactoryCache)
+  {
+    mFactoryCache                      = std::unique_ptr<VisualFactoryCache>(new VisualFactoryCache(mPreMultiplyOnLoad));
     Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
     if(styleManager)
     {
-      Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager);
-      config["brokenImageUrl"].Get(brokenImageUrl);
       styleManager.StyleChangedSignal().Connect(mSlotDelegate, &VisualFactory::OnStyleChangedSignal);
+      Toolkit::DevelStyleManager::BrokenImageChangedSignal(styleManager).Connect(mSlotDelegate, &VisualFactory::OnBrokenImageChangedSignal);
     }
-
-    mFactoryCache->SetBrokenImageUrl(brokenImageUrl);
+    SetBrokenImageUrl(styleManager);
   }
+
   return *mFactoryCache;
 }
 
@@ -401,6 +514,40 @@ ImageVisualShaderFactory& VisualFactory::GetImageVisualShaderFactory()
   return *mImageVisualShaderFactory;
 }
 
+TextVisualShaderFactory& VisualFactory::GetTextVisualShaderFactory()
+{
+  if(!mTextVisualShaderFactory)
+  {
+    mTextVisualShaderFactory = std::unique_ptr<TextVisualShaderFactory>(new TextVisualShaderFactory());
+  }
+  return *mTextVisualShaderFactory;
+}
+
+void VisualFactory::OnDiscardCallback()
+{
+  mIdleCallback = nullptr;
+
+  // Discard visual now.
+  mDiscardedVisuals.clear();
+}
+
+void VisualFactory::RegisterDiscardCallback()
+{
+  if(!mIdleCallback && Adaptor::IsAvailable())
+  {
+    // The callback manager takes the ownership of the callback object.
+    mIdleCallback = MakeCallback(this, &VisualFactory::OnDiscardCallback);
+
+    Adaptor& adaptor = Adaptor::Get();
+
+    if(DALI_UNLIKELY(!adaptor.AddIdle(mIdleCallback, false)))
+    {
+      DALI_LOG_ERROR("Fail to add idle callback for visual factory. Call it synchronously.\n");
+      OnDiscardCallback();
+    }
+  }
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.h b/dali-toolkit/internal/visuals/visual-factory-impl.h
index f038301..76bacf9 100644
--- a/dali-toolkit/internal/visuals/visual-factory-impl.h
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VISUAL_FACTORY_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,11 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
+#include <dali/integration-api/adaptor-framework/shader-precompiler.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
@@ -35,6 +36,7 @@ namespace Internal
 {
 class VisualFactoryCache;
 class ImageVisualShaderFactory;
+class TextVisualShaderFactory;
 
 /**
  * @copydoc Toolkit::VisualFactory
@@ -58,6 +60,13 @@ public:
   void OnStyleChangedSignal(Toolkit::StyleManager styleManager, StyleChange::Type type);
 
   /**
+   * @brief BrokenImageChanged callback
+   *
+   * @param[in] styleManager Handle for style manager.
+   */
+  void OnBrokenImageChangedSignal(Toolkit::StyleManager styleManager);
+
+  /**
    * @copydoc Toolkit::VisualFactory::CreateVisual( const Property::Map& )
    */
   Toolkit::Visual::Base CreateVisual(const Property::Map& propertyMap);
@@ -78,6 +87,16 @@ public:
   bool GetPreMultiplyOnLoad() const;
 
   /**
+   * @copydoc Toolkit::VisualFactory::DiscardVisual()
+   */
+  void DiscardVisual(Toolkit::Visual::Base visual);
+
+  /**
+   * @copydoc Toolkit::VisualFactory::UsePreCompiledShader()
+   */
+  void UsePreCompiledShader();
+
+  /**
    * @return the reference to texture manager
    */
   Internal::TextureManager& GetTextureManager();
@@ -90,6 +109,18 @@ protected:
 
 private:
   /**
+   * @brief Set the Broken Image url
+   * @param[in] styleManager The instance of StyleManager
+   */
+  void SetBrokenImageUrl(Toolkit::StyleManager& styleManager);
+
+  /**
+   * @brief Get the default shader source.
+   * @param[in] shaders shaderList for precompile
+   */
+  void GetPreCompiledShader(RawShaderData& shaders);
+
+  /**
    * Get the factory cache, creating it if necessary.
    */
   Internal::VisualFactoryCache& GetFactoryCache();
@@ -99,6 +130,21 @@ private:
    */
   ImageVisualShaderFactory& GetImageVisualShaderFactory();
 
+  /**
+   * Get the text visual shader factory, creating it if necessary.
+   */
+  TextVisualShaderFactory& GetTextVisualShaderFactory();
+
+  /**
+   * @brief Callbacks called for clear discarded visuals.
+   */
+  void OnDiscardCallback();
+
+  /**
+   * @brief Register idle callback for discard visuals if need.
+   */
+  void RegisterDiscardCallback();
+
   VisualFactory(const VisualFactory&) = delete;
 
   VisualFactory& operator=(const VisualFactory& rhs) = delete;
@@ -106,9 +152,14 @@ private:
 private:
   std::unique_ptr<VisualFactoryCache>       mFactoryCache;
   std::unique_ptr<ImageVisualShaderFactory> mImageVisualShaderFactory;
+  std::unique_ptr<TextVisualShaderFactory>  mTextVisualShaderFactory;
   SlotDelegate<VisualFactory>               mSlotDelegate;
+  CallbackBase*                             mIdleCallback;
+  using DiscardedVisualContainer = std::vector<Toolkit::Visual::Base>;
+  DiscardedVisualContainer mDiscardedVisuals{};
   bool                                      mDebugEnabled : 1;
   bool                                      mPreMultiplyOnLoad : 1; ///< Local store for this flag
+  bool                                      mPrecompiledShaderRequested : 1;
 };
 
 /**
diff --git a/dali-toolkit/internal/visuals/visual-string-constants.cpp b/dali-toolkit/internal/visuals/visual-string-constants.cpp
index 53bcd1c..6d89342 100644
--- a/dali-toolkit/internal/visuals/visual-string-constants.cpp
+++ b/dali-toolkit/internal/visuals/visual-string-constants.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
  */
 
 // CLASS HEADER
-#include "visual-string-constants.h"
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
 
 namespace Dali
@@ -45,6 +46,91 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(VISUAL_TYPE)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::DevelVisual, ARC)
 DALI_ENUM_TO_STRING_TABLE_END(VISUAL_TYPE)
 
+DALI_ENUM_TO_STRING_TABLE_BEGIN(VISUAL_SHADER_TYPE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, COLOR_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, COLOR_SHADER_ROUNDED_CORNER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, COLOR_SHADER_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, COLOR_SHADER_ROUNDED_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, COLOR_SHADER_BLUR_EDGE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, COLOR_SHADER_ROUNDED_CORNER_BLUR_EDGE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, BORDER_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, BORDER_SHADER_ANTI_ALIASING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_BOUNDING_BOX)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_CORNER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_BOUNDING_BOX_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_USER_SPACE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_CORNER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_USER_SPACE_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_BOUNDING_BOX)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_CORNER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_BOUNDING_BOX_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_USER_SPACE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_CORNER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_USER_SPACE_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_CORNER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_CORNER_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_BORDERLINE_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_BORDERLINE_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ATLAS_DEFAULT_WRAP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ATLAS_CUSTOM_WRAP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_YUV_TO_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_BORDERLINE_YUV_TO_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_BORDERLINE_YUV_TO_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_YUV_AND_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_BORDERLINE_YUV_AND_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, IMAGE_SHADER_ROUNDED_BORDERLINE_YUV_AND_RGB)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_ROUNDED_CORNER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_ROUNDED_BORDERLINE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_ROUNDED_CORNER_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_BORDERLINE_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_ROUNDED_BORDERLINE_MASKING)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_ATLAS_DEFAULT_WRAP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NATIVE_IMAGE_SHADER_ATLAS_CUSTOM_WRAP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NINE_PATCH_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, NINE_PATCH_MASK_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_OVERLAY)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_OVERLAY)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_EMOJI)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_OVERLAY_AND_EMOJI)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_SINGLE_COLOR_TEXT_WITH_STYLE_AND_OVERLAY_AND_EMOJI)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_MULTI_COLOR_TEXT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_MULTI_COLOR_TEXT_WITH_OVERLAY)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE_AND_OVERLAY)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_LINEAR_BOUNDING_REFLECT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_LINEAR_BOUNDING_REPEAT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_LINEAR_BOUNDING_CLAMP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_LINEAR_USER_REFLECT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_LINEAR_USER_REPEAT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_LINEAR_USER_REPEAT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_LINEAR_USER_CLAMP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_RADIAL_BOUNDING_REFLECT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_RADIAL_BOUNDING_REPEAT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_RADIAL_BOUNDING_CLAMP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_RADIAL_USER_REFLECT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_RADIAL_USER_REPEAT)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ANIMATED_GRADIENT_SHADER_RADIAL_USER_CLAMP)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, WIREFRAME_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ARC_BUTT_CAP_SHADER)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Internal::VisualFactoryCache::ShaderType, ARC_ROUND_CAP_SHADER)
+DALI_ENUM_TO_STRING_TABLE_END(VISUAL_SHADER_TYPE)
+
 // Visual Type
 const char* const VISUAL_TYPE("visualType");
 
@@ -95,7 +181,6 @@ const char* const WRAP_MODE_UNIFORM_NAME("wrapMode");
 const char* const IMAGE_WRAP_MODE_U("wrapModeU");
 const char* const IMAGE_WRAP_MODE_V("wrapModeV");
 const char* const IMAGE_BORDER("border");
-const char* const PIXEL_ALIGNED_UNIFORM_NAME("uPixelAligned");
 const char* const ANIMATED_IMAGE_URLS_NAME("urls");
 const char* const BATCH_SIZE_NAME("batchSize");
 const char* const CACHE_SIZE_NAME("cacheSize");
@@ -122,6 +207,11 @@ const char* const IMAGE_DESIRED_WIDTH("desiredWidth");
 const char* const IMAGE_DESIRED_HEIGHT("desiredHeight");
 const char* const ALPHA_MASK_URL("alphaMaskUrl");
 const char* const REDRAW_IN_SCALING_DOWN_NAME("redrawInScalingDown");
+const char* const MASKING_TYPE_NAME("maskingType");
+const char* const MASK_TEXTURE_RATIO_NAME("maskTextureRatio");
+const char* const FAST_TRACK_UPLOADING_NAME("fastTrackUploading");
+const char* const ENABLE_BROKEN_IMAGE("enableBrokenImage");
+const char* const ENABLE_FRAME_CACHE("enableFrameCache");
 
 // Text visual
 const char* const TEXT_PROPERTY("text");
@@ -137,6 +227,7 @@ const char* const SHADOW_PROPERTY("shadow");
 const char* const UNDERLINE_PROPERTY("underline");
 const char* const OUTLINE_PROPERTY("outline");
 const char* const BACKGROUND_PROPERTY("textBackground");
+const char* const STRIKETHROUGH_PROPERTY("strikethrough");
 
 //NPatch visual
 const char* const BORDER_ONLY("borderOnly");
diff --git a/dali-toolkit/internal/visuals/visual-string-constants.h b/dali-toolkit/internal/visuals/visual-string-constants.h
index 470ded9..cc97413 100644
--- a/dali-toolkit/internal/visuals/visual-string-constants.h
+++ b/dali-toolkit/internal/visuals/visual-string-constants.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_VISUAL_STRING_CONSTANTS_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,10 @@ extern const char* const                 VISUAL_TYPE;
 extern const Dali::Scripting::StringEnum VISUAL_TYPE_TABLE[];
 extern const unsigned int                VISUAL_TYPE_TABLE_COUNT;
 
+// Visual Shader type
+extern const Dali::Scripting::StringEnum VISUAL_SHADER_TYPE_TABLE[];
+extern const unsigned int                VISUAL_SHADER_TYPE_TABLE_COUNT;
+
 // Custom shader
 extern const char* const CUSTOM_SHADER;
 extern const char* const CUSTOM_VERTEX_SHADER;
@@ -79,7 +83,6 @@ extern const char* const WRAP_MODE_UNIFORM_NAME;
 extern const char* const IMAGE_WRAP_MODE_U;
 extern const char* const IMAGE_WRAP_MODE_V;
 extern const char* const IMAGE_BORDER;
-extern const char* const PIXEL_ALIGNED_UNIFORM_NAME;
 extern const char* const ANIMATED_IMAGE_URLS_NAME;
 extern const char* const BATCH_SIZE_NAME;
 extern const char* const CACHE_SIZE_NAME;
@@ -106,6 +109,11 @@ extern const char* const IMAGE_DESIRED_WIDTH;
 extern const char* const IMAGE_DESIRED_HEIGHT;
 extern const char* const ALPHA_MASK_URL;
 extern const char* const REDRAW_IN_SCALING_DOWN_NAME;
+extern const char* const MASKING_TYPE_NAME;
+extern const char* const MASK_TEXTURE_RATIO_NAME;
+extern const char* const FAST_TRACK_UPLOADING_NAME;
+extern const char* const ENABLE_BROKEN_IMAGE;
+extern const char* const ENABLE_FRAME_CACHE;
 
 // Text visual
 extern const char* const TEXT_PROPERTY;
@@ -121,6 +129,7 @@ extern const char* const SHADOW_PROPERTY;
 extern const char* const UNDERLINE_PROPERTY;
 extern const char* const OUTLINE_PROPERTY;
 extern const char* const BACKGROUND_PROPERTY;
+extern const char* const STRIKETHROUGH_PROPERTY;
 
 //NPatch visual
 extern const char* const BORDER_ONLY;
diff --git a/dali-toolkit/internal/visuals/visual-url.cpp b/dali-toolkit/internal/visuals/visual-url.cpp
index 30d9c02..2f16427 100644
--- a/dali-toolkit/internal/visuals/visual-url.cpp
+++ b/dali-toolkit/internal/visuals/visual-url.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
 // EXTERNAL HEADERS
+#include <dali/devel-api/common/hash.h>
 #include <cstring> // for toupper()
 
 namespace Dali
@@ -28,6 +29,10 @@ namespace Internal
 {
 namespace
 {
+constexpr uint32_t URL_ELLIPSED_LENGTH = 20u;
+
+static_assert(URL_ELLIPSED_LENGTH < URL_ELLIPSED_LENGTH + 3u); ///< Guard overflow cases. (for svace)
+
 VisualUrl::ProtocolType ResolveLocation(const std::string& url)
 {
   const char*    urlCStr = url.c_str();
@@ -104,7 +109,8 @@ VisualUrl::ProtocolType ResolveLocation(const std::string& url)
 VisualUrl::Type ResolveType(const std::string& url)
 {
   // if only one char in string, can only be regular image
-  const std::size_t count = url.size();
+  const std::size_t count      = url.size();
+  VisualUrl::Type   returnType = VisualUrl::REGULAR_IMAGE;
   if(count > 0)
   {
     // parsing from the end for better chance of early outs
@@ -118,7 +124,9 @@ VisualUrl::Type ResolveType(const std::string& url)
     char         GIF[4]    = {'f', 'i', 'g', '.'};
     char         WEBP[5]   = {'p', 'b', 'e', 'w', '.'};
     char         JSON[5]   = {'n', 'o', 's', 'j', '.'};
+    char         TVG[4]    = {'g', 'v', 't', '.'};
     unsigned int svgScore  = 0;
+    unsigned int tvgScore  = 0;
     unsigned int gifScore  = 0;
     unsigned int webpScore = 0;
     unsigned int jsonScore = 0;
@@ -135,20 +143,28 @@ VisualUrl::Type ResolveType(const std::string& url)
           return VisualUrl::SVG;
         }
       }
+      if((offsetFromEnd < sizeof(TVG)) && (currentChar == TVG[offsetFromEnd]))
+      {
+        // early out if TVG as can't be used in N patch for now
+        if(++tvgScore == sizeof(TVG))
+        {
+          return VisualUrl::TVG;
+        }
+      }
       if((offsetFromEnd < sizeof(GIF)) && (currentChar == GIF[offsetFromEnd]))
       {
-        // early out if GIF as can't be used in N patch for now
+        //find type, but need to be check used in N patch
         if(++gifScore == sizeof(GIF))
         {
-          return VisualUrl::GIF;
+          returnType = VisualUrl::GIF;
         }
       }
       if((offsetFromEnd < sizeof(WEBP)) && (currentChar == WEBP[offsetFromEnd]))
       {
-        // early out if WEBP as can't be used in N patch for now
         if(++webpScore == sizeof(WEBP))
         {
-          return VisualUrl::WEBP;
+          //find type, but need to be check used in N patch
+          returnType = VisualUrl::WEBP;
         }
       }
       if((offsetFromEnd < sizeof(JSON)) && (currentChar == JSON[offsetFromEnd]))
@@ -178,7 +194,7 @@ VisualUrl::Type ResolveType(const std::string& url)
           else
           {
             // early out, not a valid N/9-patch URL
-            return VisualUrl::REGULAR_IMAGE;
+            return returnType;
           }
           break;
         }
@@ -191,7 +207,7 @@ VisualUrl::Type ResolveType(const std::string& url)
           else
           {
             // early out, not a valid N/9-patch URL
-            return VisualUrl::REGULAR_IMAGE;
+            return returnType;
           }
           break;
         }
@@ -199,7 +215,7 @@ VisualUrl::Type ResolveType(const std::string& url)
     }
   }
   // if we got here it is a regular image
-  return VisualUrl::REGULAR_IMAGE;
+  return returnType;
 }
 
 } // namespace
@@ -207,21 +223,23 @@ VisualUrl::Type ResolveType(const std::string& url)
 VisualUrl::VisualUrl()
 : mUrl(),
   mType(VisualUrl::REGULAR_IMAGE),
-  mLocation(VisualUrl::LOCAL)
+  mLocation(VisualUrl::LOCAL),
+  mUrlHash(0ull)
 {
 }
 
 VisualUrl::VisualUrl(const std::string& url)
 : mUrl(url),
   mType(VisualUrl::REGULAR_IMAGE),
-  mLocation(VisualUrl::LOCAL)
+  mLocation(VisualUrl::LOCAL),
+  mUrlHash(0ull)
 {
   if(!url.empty())
   {
     mLocation = ResolveLocation(url);
-    if(VisualUrl::TEXTURE != mLocation && VisualUrl::BUFFER != mLocation)
+    if(VisualUrl::TEXTURE != mLocation)
     {
-      // TEXTURE and BUFFER location url doesn't need type resolving, REGULAR_IMAGE is fine
+      // TEXTURE location url doesn't need type resolving, REGULAR_IMAGE is fine
       mType = ResolveType(url);
     }
   }
@@ -230,10 +248,20 @@ VisualUrl::VisualUrl(const std::string& url)
 VisualUrl::VisualUrl(const VisualUrl& url)
 : mUrl(url.mUrl),
   mType(url.mType),
-  mLocation(url.mLocation)
+  mLocation(url.mLocation),
+  mUrlHash(url.mUrlHash)
 {
 }
 
+VisualUrl::VisualUrl(VisualUrl&& url) noexcept
+: mUrl(std::move(url.mUrl)),
+  mType(std::move(url.mType)),
+  mLocation(std::move(url.mLocation)),
+  mUrlHash(std::move(url.mUrlHash))
+{
+  url.mUrlHash = 0ull;
+}
+
 VisualUrl::~VisualUrl()
 {
 }
@@ -245,6 +273,21 @@ VisualUrl& VisualUrl::operator=(const VisualUrl& url)
     mUrl      = url.mUrl;
     mType     = url.mType;
     mLocation = url.mLocation;
+    mUrlHash  = url.mUrlHash;
+  }
+  return *this;
+}
+
+VisualUrl& VisualUrl::operator=(VisualUrl&& url) noexcept
+{
+  if(&url != this)
+  {
+    mUrl      = std::move(url.mUrl);
+    mType     = std::move(url.mType);
+    mLocation = std::move(url.mLocation);
+    mUrlHash  = std::move(url.mUrlHash);
+
+    url.mUrlHash = 0ull;
   }
   return *this;
 }
@@ -254,6 +297,22 @@ const std::string& VisualUrl::GetUrl() const
   return mUrl;
 }
 
+std::string VisualUrl::GetEllipsedUrl() const
+{
+  if(mUrl.size() > URL_ELLIPSED_LENGTH + 3)
+  {
+    std::string ellipsedUrl = "...";
+    ellipsedUrl += mUrl.substr(mUrl.size() - URL_ELLIPSED_LENGTH);
+    return ellipsedUrl;
+  }
+  return mUrl;
+}
+
+std::uint64_t VisualUrl::GetUrlHash() const
+{
+  return DALI_UNLIKELY(mUrlHash == 0) ? (mUrlHash = Dali::CalculateHash(mUrl)) : mUrlHash;
+}
+
 VisualUrl::Type VisualUrl::GetType() const
 {
   return mType;
@@ -284,14 +343,19 @@ std::string VisualUrl::GetLocation() const
   return GetLocation(mUrl);
 }
 
+std::string VisualUrl::GetLocationWithoutExtension() const
+{
+  return GetLocationWithoutExtension(mUrl);
+}
+
 std::string VisualUrl::CreateTextureUrl(const std::string& location)
 {
   return "dali://" + location;
 }
 
-std::string VisualUrl::CreateBufferUrl(const std::string& location)
+std::string VisualUrl::CreateBufferUrl(const std::string& location, const std::string_view& extension)
 {
-  return "enbuf://" + location;
+  return "enbuf://" + location + std::string(extension);
 }
 
 VisualUrl::ProtocolType VisualUrl::GetProtocolType(const std::string& url)
@@ -309,6 +373,18 @@ std::string VisualUrl::GetLocation(const std::string& url)
   return url;
 }
 
+std::string VisualUrl::GetLocationWithoutExtension(const std::string& url)
+{
+  const auto location = url.find("://");
+  if(std::string::npos != location)
+  {
+    const auto extension      = url.find_last_of("."); // Find last position of '.' keyword.
+    const auto locationLength = extension != std::string::npos ? extension - (location + 3u) : std::string::npos;
+    return url.substr(location + 3u, locationLength); // 3 characters forwards from the start of ://, and end of last '.' keyword.
+  }
+  return url;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
diff --git a/dali-toolkit/internal/visuals/visual-url.h b/dali-toolkit/internal/visuals/visual-url.h
index 555e383..8caf716 100644
--- a/dali-toolkit/internal/visuals/visual-url.h
+++ b/dali-toolkit/internal/visuals/visual-url.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_VISUAL_URL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,10 @@
  * limitations under the License.
  */
 
+// EXTERNAL INCLUDES
+#include <cstdint>
 #include <string>
+#include <string_view>
 
 namespace Dali
 {
@@ -38,7 +41,8 @@ public:
     SVG,
     GIF,
     WEBP,
-    JSON
+    JSON,
+    TVG
   };
 
   enum ProtocolType
@@ -83,12 +87,36 @@ public:
   VisualUrl& operator=(const VisualUrl& url);
 
   /**
+   * Move constructor
+   * @param[in] url The VisualUrl to move
+   */
+  VisualUrl(VisualUrl&& url) noexcept;
+
+  /**
+   * Move assignment operator
+   * @param[in] url The VisualUrl to move
+   */
+  VisualUrl& operator=(VisualUrl&& url) noexcept;
+
+  /**
    * Get the full URL
    * @return The url
    */
   const std::string& GetUrl() const;
 
   /**
+   * Get the ellipsed URL.
+   * @return The ellipsed url
+   */
+  std::string GetEllipsedUrl() const;
+
+  /**
+   * Get the hash value of full URL
+   * @return The hash value of url
+   */
+  std::uint64_t GetUrlHash() const;
+
+  /**
    * Get the visual type of the URL
    * @return The visual type of the URL
    */
@@ -122,6 +150,11 @@ public:
   std::string GetLocation() const;
 
   /**
+   * @return the location part of the url without extension
+   */
+  std::string GetLocationWithoutExtension() const;
+
+  /**
    * Helper to create a URL of type TEXTURE
    * @param location the location of the texture
    * @return the Url
@@ -130,10 +163,11 @@ public:
 
   /**
    * Helper to create a URL of type BUFFER
-   * @param location the location of the texture
+   * @param[in] location the location of the texture
+   * @param[in] extension the extension of url
    * @return the Url
    */
-  static std::string CreateBufferUrl(const std::string& location);
+  static std::string CreateBufferUrl(const std::string& location, const std::string_view& extension);
 
   /**
    * Helper to get a ProtocolType from url
@@ -149,10 +183,19 @@ public:
    */
   static std::string GetLocation(const std::string& url);
 
+  /**
+   * Helper to get a location from url without extension
+   * @param[in] url the location of the texture
+   * @return the location without extension
+   */
+  static std::string GetLocationWithoutExtension(const std::string& url);
+
 private:
   std::string  mUrl;
   Type         mType;
   ProtocolType mLocation;
+
+  mutable std::uint64_t mUrlHash;
 };
 
 } // namespace Internal
diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
index 44998f6..7611dd6 100644
--- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
+++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,8 +143,7 @@ void WireframeVisual::OnInitialize()
   Shader shader = mFactoryCache.GetShader(VisualFactoryCache::WIREFRAME_SHADER);
   if(!shader)
   {
-    shader = Shader::New(SHADER_WIREFRAME_VISUAL_SHADER_VERT, SHADER_WIREFRAME_VISUAL_SHADER_FRAG);
-    mFactoryCache.SaveShader(VisualFactoryCache::WIREFRAME_SHADER, shader);
+    shader = mFactoryCache.GenerateAndSaveShader(VisualFactoryCache::WIREFRAME_SHADER, SHADER_WIREFRAME_VISUAL_SHADER_VERT, SHADER_WIREFRAME_VISUAL_SHADER_FRAG);
   }
 
   Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::WIREFRAME_GEOMETRY);
@@ -155,10 +154,10 @@ void WireframeVisual::OnInitialize()
   }
 
   //Create the renderer
-  mImpl->mRenderer = Renderer::New(geometry, shader);
+  mImpl->mRenderer = VisualRenderer::New(geometry, shader);
 
   //Register transform properties
-  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+  mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 }
 
 Geometry WireframeVisual::CreateQuadWireframeGeometry()
@@ -198,7 +197,7 @@ void WireframeVisual::OnSetTransform()
   if(mImpl->mRenderer)
   {
     //Register transform properties
-    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+    mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp
index ebff4a6..63c9b7d 100644
--- a/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -37,11 +37,11 @@ Button::Button()
 
 Button::Button(const Button& button) = default;
 
-Button::Button(Button&& rhs) = default;
+Button::Button(Button&& rhs) noexcept = default;
 
 Button& Button::operator=(const Button& button) = default;
 
-Button& Button::operator=(Button&& rhs) = default;
+Button& Button::operator=(Button&& rhs) noexcept = default;
 
 Button::~Button()
 {
diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h
index f41e641..af706bd 100644
--- a/dali-toolkit/public-api/controls/buttons/button.h
+++ b/dali-toolkit/public-api/controls/buttons/button.h
@@ -237,7 +237,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  Button(Button&& rhs);
+  Button(Button&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -254,7 +254,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  Button& operator=(Button&& rhs);
+  Button& operator=(Button&& rhs) noexcept;
 
   /**
    * @brief Downcasts a handle to Button handle.
diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.cpp b/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
index 69794d5..720b595 100644
--- a/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
@@ -34,11 +34,11 @@ CheckBoxButton::CheckBoxButton()
 
 CheckBoxButton::CheckBoxButton(const CheckBoxButton& checkBox) = default;
 
-CheckBoxButton::CheckBoxButton(CheckBoxButton&& rhs) = default;
+CheckBoxButton::CheckBoxButton(CheckBoxButton&& rhs) noexcept = default;
 
 CheckBoxButton& CheckBoxButton::operator=(const CheckBoxButton& checkBox) = default;
 
-CheckBoxButton& CheckBoxButton::operator=(CheckBoxButton&& rhs) = default;
+CheckBoxButton& CheckBoxButton::operator=(CheckBoxButton&& rhs) noexcept = default;
 
 CheckBoxButton::~CheckBoxButton()
 {
diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h
index 12d14f3..9dafa28 100644
--- a/dali-toolkit/public-api/controls/buttons/check-box-button.h
+++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h
@@ -99,7 +99,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  CheckBoxButton(CheckBoxButton&& rhs);
+  CheckBoxButton(CheckBoxButton&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -116,7 +116,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  CheckBoxButton& operator=(CheckBoxButton&& rhs);
+  CheckBoxButton& operator=(CheckBoxButton&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/buttons/push-button.cpp b/dali-toolkit/public-api/controls/buttons/push-button.cpp
index ff2cd4c..dd3fdde 100644
--- a/dali-toolkit/public-api/controls/buttons/push-button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/push-button.cpp
@@ -40,11 +40,11 @@ PushButton::PushButton(Internal::PushButton& implementation)
 
 PushButton::PushButton(const PushButton& pushButton) = default;
 
-PushButton::PushButton(PushButton&& rhs) = default;
+PushButton::PushButton(PushButton&& rhs) noexcept = default;
 
 PushButton& PushButton::operator=(const PushButton& pushButton) = default;
 
-PushButton& PushButton::operator=(PushButton&& rhs) = default;
+PushButton& PushButton::operator=(PushButton&& rhs) noexcept = default;
 
 PushButton::PushButton(Dali::Internal::CustomActor* internal)
 : Button(internal)
diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h
index 478c981..f761a21 100644
--- a/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -135,7 +135,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  PushButton(PushButton&& rhs);
+  PushButton(PushButton&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -152,7 +152,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  PushButton& operator=(PushButton&& rhs);
+  PushButton& operator=(PushButton&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/buttons/radio-button.cpp b/dali-toolkit/public-api/controls/buttons/radio-button.cpp
index 6030031..cb3e0f7 100644
--- a/dali-toolkit/public-api/controls/buttons/radio-button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/radio-button.cpp
@@ -39,11 +39,11 @@ RadioButton::RadioButton(Internal::RadioButton& implementation)
 
 RadioButton::RadioButton(const RadioButton& radioButton) = default;
 
-RadioButton::RadioButton(RadioButton&& rhs) = default;
+RadioButton::RadioButton(RadioButton&& rhs) noexcept = default;
 
 RadioButton& RadioButton::operator=(const RadioButton& radioButton) = default;
 
-RadioButton& RadioButton::operator=(RadioButton&& rhs) = default;
+RadioButton& RadioButton::operator=(RadioButton&& rhs) noexcept = default;
 
 RadioButton::RadioButton(Dali::Internal::CustomActor* internal)
 : Button(internal)
diff --git a/dali-toolkit/public-api/controls/buttons/radio-button.h b/dali-toolkit/public-api/controls/buttons/radio-button.h
index 8ec4f5a..1ab4c71 100644
--- a/dali-toolkit/public-api/controls/buttons/radio-button.h
+++ b/dali-toolkit/public-api/controls/buttons/radio-button.h
@@ -106,7 +106,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  RadioButton(RadioButton&& rhs);
+  RadioButton(RadioButton&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -123,7 +123,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  RadioButton& operator=(RadioButton&& rhs);
+  RadioButton& operator=(RadioButton&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/camera-view/camera-view.cpp b/dali-toolkit/public-api/controls/camera-view/camera-view.cpp
index 297521e..9a86d0e 100644
--- a/dali-toolkit/public-api/controls/camera-view/camera-view.cpp
+++ b/dali-toolkit/public-api/controls/camera-view/camera-view.cpp
@@ -31,11 +31,11 @@ CameraView::CameraView()
 
 CameraView::CameraView(const CameraView& cameraView) = default;
 
-CameraView::CameraView(CameraView&& rhs) = default;
+CameraView::CameraView(CameraView&& rhs) noexcept = default;
 
 CameraView& CameraView::operator=(const CameraView& cameraView) = default;
 
-CameraView& CameraView::operator=(CameraView&& rhs) = default;
+CameraView& CameraView::operator=(CameraView&& rhs) noexcept = default;
 
 CameraView::~CameraView()
 {
diff --git a/dali-toolkit/public-api/controls/camera-view/camera-view.h b/dali-toolkit/public-api/controls/camera-view/camera-view.h
index 3cf9845..4d20686 100644
--- a/dali-toolkit/public-api/controls/camera-view/camera-view.h
+++ b/dali-toolkit/public-api/controls/camera-view/camera-view.h
@@ -86,7 +86,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  CameraView(CameraView&& rhs);
+  CameraView(CameraView&& rhs) noexcept;
 
   /**
    * @brief Update camera view
@@ -110,7 +110,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  CameraView& operator=(CameraView&& rhs);
+  CameraView& operator=(CameraView&& rhs) noexcept;
 
   /**
    * @brief Downcasts a handle to CameraView handle.
diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 17db11b..67b5ab0 100644
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,21 +24,19 @@
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/animation/constraint.h>
-#include <dali/public-api/object/type-info.h>
-#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>
 #include <cstring> // for strcmp
 #include <limits>
 #include <stack>
-#include <typeinfo>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
-#include <dali-toolkit/devel-api/visuals/color-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
@@ -88,8 +86,13 @@ void CreateClippingRenderer(Control& controlImpl)
 
 Toolkit::Control Control::New()
 {
+  return New(ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
+}
+
+Toolkit::Control Control::New(ControlBehaviour additionalBehaviour)
+{
   // Create the implementation, temporarily owned on stack
-  IntrusivePtr<Control> controlImpl = new Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT));
+  IntrusivePtr<Control> controlImpl = new Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour));
 
   // Pass ownership to handle
   Toolkit::Control handle(*controlImpl);
@@ -133,7 +136,7 @@ void Control::SetBackgroundColor(const Vector4& color)
   if(visual && visual.GetType() == Toolkit::Visual::COLOR)
   {
     // Update background color only
-    mImpl->DoAction(Toolkit::Control::Property::BACKGROUND, DevelColorVisual::Action::UPDATE_PROPERTY, map);
+    mImpl->DoAction(Toolkit::Control::Property::BACKGROUND, DevelVisual::Action::UPDATE_PROPERTY, map);
     return;
   }
 
@@ -162,6 +165,17 @@ void Control::ClearBackground()
   RelayoutRequest();
 }
 
+void Control::SetResourceReady()
+{
+  Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+  controlDataImpl.ResourceReady();
+}
+
+Toolkit::DevelControl::ControlAccessible* Control::GetAccessibleObject()
+{
+  return mImpl->GetAccessibleObject();
+}
+
 void Control::EnableGestureDetection(GestureType::Value type)
 {
   if((type & GestureType::PINCH) && !mImpl->mPinchGestureDetector)
@@ -294,12 +308,6 @@ bool Control::IsKeyboardFocusGroup()
   return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self());
 }
 
-void Control::AccessibilityActivate()
-{
-  // Inform deriving classes
-  OnAccessibilityActivated();
-}
-
 void Control::KeyboardEnter()
 {
   // Inform deriving classes
@@ -335,6 +343,11 @@ bool Control::OnAccessibilityZoom()
   return false; // Accessibility zoom action is not handled by default
 }
 
+DevelControl::ControlAccessible* Control::CreateAccessibleObject()
+{
+  return new DevelControl::ControlAccessible(Self());
+}
+
 Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled)
 {
   return Actor();
@@ -421,20 +434,18 @@ void Control::Initialize()
   {
     SetKeyboardNavigationSupport(true);
   }
-
-  Dali::TypeInfo type;
-  Self().GetTypeInfo(type);
-  if(type)
-  {
-    auto typeName = type.GetName();
-    DevelControl::AppendAccessibilityAttribute(Self(), "class", typeName);
-  }
 }
 
 void Control::OnInitialize()
 {
 }
 
+bool Control::IsResourceReady() const
+{
+  const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+  return controlDataImpl.IsResourceReady();
+}
+
 void Control::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change)
 {
   // By default the control is only interested in theme (not font) changes
@@ -479,12 +490,15 @@ void Control::EmitKeyInputFocusSignal(bool focusGained)
 
   if(Accessibility::IsUp())
   {
-    auto self = mImpl->GetAccessibilityObject(Self());
-    self->EmitFocused(focusGained);
-    auto parent = self->GetParent();
-    if(parent && !self->GetStates()[Dali::Accessibility::State::MANAGES_DESCENDANTS])
+    auto accessible = GetAccessibleObject();
+    if(DALI_LIKELY(accessible))
     {
-      parent->EmitActiveDescendantChanged(parent, self);
+      accessible->EmitFocused(focusGained);
+      auto parent = accessible->GetParent();
+      if(parent && !accessible->GetStates()[Dali::Accessibility::State::MANAGES_DESCENDANTS])
+      {
+        parent->EmitActiveDescendantChanged(accessible);
+      }
     }
   }
 
@@ -566,17 +580,19 @@ void Control::OnPropertySet(Property::Index index, const Property::Value& proper
     }
     case Actor::Property::VISIBLE:
     {
-      if(Dali::Accessibility::IsUp())
+      auto* accessible = GetAccessibleObject();
+      if(DALI_LIKELY(accessible))
       {
-        Dali::Accessibility::Accessible::Get(Self())->EmitVisible(Self().GetProperty(Actor::Property::VISIBLE).Get<bool>());
+        accessible->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
       }
       break;
     }
-    case Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE:
+    case DevelActor::Property::USER_INTERACTION_ENABLED:
     {
-      if(Dali::Accessibility::IsUp())
+      const bool enabled = propertyValue.Get<bool>();
+      if(!enabled && Self() == Dali::Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor())
       {
-        Dali::Accessibility::Accessible::Get(Self())->Emit(Dali::Accessibility::ObjectPropertyChangeEvent::ROLE);
+        Dali::Toolkit::KeyboardFocusManager::Get().ClearFocus();
       }
       break;
     }
@@ -702,6 +718,99 @@ void Control::SignalDisconnected(SlotObserver* slotObserver, CallbackBase* callb
   mImpl->SignalDisconnected(slotObserver, callback);
 }
 
+void Control::MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali::Property::Map& destinationPropertyMap, Dali::Toolkit::Control source, Dali::Toolkit::Control destination, Dali::Property::Index visualIndex)
+{
+  sourcePropertyMap.Clear();
+  destinationPropertyMap.Clear();
+
+  Toolkit::Visual::Base sourceVisual      = DevelControl::GetVisual(GetImplementation(source), visualIndex);
+  Toolkit::Visual::Base destinationVisual = DevelControl::GetVisual(GetImplementation(destination), visualIndex);
+
+  // If source or destination doesn't have the visual, do not create transition for the visual.
+  if(!sourceVisual || !destinationVisual)
+  {
+    return;
+  }
+
+  Property::Map sourceMap;
+  Property::Map destinationMap;
+  sourceVisual.CreatePropertyMap(sourceMap);
+  destinationVisual.CreatePropertyMap(destinationMap);
+
+  static auto findValueVector4 = [](const Property::Map& map, Property::Index index, const Vector4& defaultValue = Vector4()) -> Vector4 {
+    Property::Value* propertyValue = map.Find(index);
+    if(propertyValue)
+    {
+      return propertyValue->Get<Vector4>();
+    }
+    return defaultValue;
+  };
+
+  static auto findValueFloat = [](const Property::Map& map, Property::Index index, const float& defaultValue = 0.0f) -> float {
+    Property::Value* propertyValue = map.Find(index);
+    if(propertyValue)
+    {
+      return propertyValue->Get<float>();
+    }
+    return defaultValue;
+  };
+
+  Vector4 defaultMixColor(Color::TRANSPARENT);
+  Vector4 defaultCornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
+  float   defaultBorderlineWidth(0.0f);
+  Vector4 defaultBorderlineColor(0.0f, 0.0f, 0.0f, 1.0f);
+  float   defaultBorderlineOffset(0.0f);
+
+  Vector4 sourceMixColor         = findValueVector4(sourceMap, Dali::Toolkit::Visual::Property::MIX_COLOR, defaultMixColor);
+  Vector4 sourceCornerRadius     = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, defaultCornerRadius);
+  float   sourceBorderlineWidth  = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, defaultBorderlineWidth);
+  Vector4 sourceBorderlineColor  = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, defaultBorderlineColor);
+  float   sourceBorderlineOffset = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, defaultBorderlineOffset);
+
+  Vector4 destinationMixColor         = findValueVector4(destinationMap, Dali::Toolkit::Visual::Property::MIX_COLOR, defaultMixColor);
+  Vector4 destinationCornerRadius     = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, defaultCornerRadius);
+  float   destinationBorderlineWidth  = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, defaultBorderlineWidth);
+  Vector4 destinationBorderlineColor  = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, defaultBorderlineColor);
+  float   destinationBorderlineOffset = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, defaultBorderlineOffset);
+
+  // If the value of the source Control and that of destination Control is different, the property should be transitioned.
+  if(Vector3(sourceMixColor) != Vector3(destinationMixColor))
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::Visual::Property::MIX_COLOR, Vector3(sourceMixColor));
+    destinationPropertyMap.Add(Dali::Toolkit::Visual::Property::MIX_COLOR, Vector3(destinationMixColor));
+  }
+
+  if(std::abs(sourceMixColor.a - destinationMixColor.a) > Math::MACHINE_EPSILON_1)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::Visual::Property::OPACITY, sourceMixColor.a);
+    destinationPropertyMap.Add(Dali::Toolkit::Visual::Property::OPACITY, destinationMixColor.a);
+  }
+
+  if(sourceCornerRadius != destinationCornerRadius)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS, sourceCornerRadius);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS, destinationCornerRadius);
+  }
+
+  if(!Dali::Equals(sourceBorderlineWidth, destinationBorderlineWidth))
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, sourceBorderlineWidth);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, destinationBorderlineWidth);
+  }
+
+  if(sourceBorderlineColor != destinationBorderlineColor)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR, sourceBorderlineColor);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR, destinationBorderlineColor);
+  }
+
+  if(!Dali::Equals(sourceBorderlineOffset, destinationBorderlineOffset))
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, sourceBorderlineOffset);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, destinationBorderlineOffset);
+  }
+}
+
 Control& GetImplementation(Dali::Toolkit::Control& handle)
 {
   CustomActorImpl& customInterface = handle.GetImplementation();
diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 9a68ca1..9e2915e 100644
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,12 @@ namespace Toolkit
 
 class StyleManager;
 
+namespace DevelControl
+{
+class ControlAccessible;
+
+} // namespace DevelControl
+
 namespace Internal
 {
 /**
@@ -59,7 +65,6 @@ public:
   class Extension; ///< Forward declare future extension interface
 
   // Creation & Destruction
-
   /**
    * @brief Creates a new ControlImpl instance that does not require touch by default.
    *
@@ -109,6 +114,24 @@ public:
    */
   void ClearBackground();
 
+  /**
+   * @brief Called when resources of control are ready. this api does not request relayout.
+   */
+  void SetResourceReady();
+
+  // Accessibility
+
+  /**
+   * @brief Gets the Accessible object that represents this control.
+   *
+   * This method calls CreateAccessibleObject() if CreateAccessible is true.
+   *
+   * @return The Accessible object
+   *
+   * @see CreateAccessibleObject()
+   */
+  Toolkit::DevelControl::ControlAccessible* GetAccessibleObject();
+
   // Gesture Detection
 
   /**
@@ -241,19 +264,12 @@ public:
 
   /// @cond internal
   /**
-   * @brief Called by the AccessibilityManager to activate the Control.
-   * @SINCE_1_0.0
-   */
-  DALI_INTERNAL void AccessibilityActivate();
-
-  /**
    * @brief Called by the KeyboardFocusManager.
    * @SINCE_1_0.0
    */
   DALI_INTERNAL void KeyboardEnter();
   /// @endcond
 
-
   // Signals
 
   /**
@@ -381,9 +397,7 @@ protected: // From CustomActorImpl
    */
   void OnLayoutNegotiated(float size, Dimension::Type dimension) override;
 
-protected: // Helpers for deriving classes
-  // Construction
-
+public: // Helpers for deriving classes
   /**
    * @brief Flags for the constructor.
    * @SINCE_1_0.0
@@ -401,6 +415,19 @@ protected: // Helpers for deriving classes
   static const int CONTROL_BEHAVIOUR_FLAG_COUNT = Log<LAST_CONTROL_BEHAVIOUR_FLAG - 1>::value + 1; ///< Total count of flags
 
   /**
+   * @brief Creates a new ControlImpl instance that does not require touch by default.
+   *
+   * If touch is required, then the user can connect to this class' touch signal.
+   * @SINCE_2_1.8
+   * @param[in] additionalBehaviour Additional control behaviour.
+   * @return A handle to the ControlImpl instance
+   */
+  static Toolkit::Control New(ControlBehaviour additionalBehaviour);
+
+protected:
+  // Construction
+
+  /**
    * @brief Control constructor.
    *
    * @SINCE_1_0.0
@@ -425,6 +452,11 @@ public: // API for derived classes to override
    */
   virtual void OnInitialize();
 
+  /**
+   * @copydoc Dali::Toolkit::Control::IsResourceReady
+   */
+  virtual bool IsResourceReady() const;
+
   // Styling
 
   /**
@@ -476,6 +508,24 @@ public: // API for derived classes to override
    */
   virtual bool OnAccessibilityZoom();
 
+  /**
+   * @brief This method should be overriden by deriving classes when they wish to be
+   * represented by a custom Accessible object implementation.
+   *
+   * The AT-SPI infrastructure is responsible for destroying the returned object.
+   *
+   * Currently, this method is called at most once in a given Control's lifetime, when
+   * GetAccessibleObject() is called for the first time. A future version of the
+   * AT-SPI infrastructure, however, may delete the Accessible object and request a new
+   * one to be created (by calling this method) multiple times, for example during
+   * scene connection and disconnection.
+   *
+   * @return The newly created Accessible object
+   *
+   * @see GetAccessibleObject()
+   */
+  virtual DevelControl::ControlAccessible* CreateAccessibleObject();
+
   // Keyboard focus
 
   /**
@@ -617,18 +667,46 @@ public: // API for derived classes to override
     return NULL;
   }
 
-  // Transition
+  // Transition APIs
+
+  /**
+   * @brief Make visual transition from source control to destination control about specific Visual.
+   * If both of source and destination control have same visual index, than generates information for the transition of this Control.
+   *
+   * @param[out] sourcePropertyMap Source property map to be applied on this Control.
+   * @param[out] destinationPropertyMap Destination property map to be applied on this Control.
+   * @param[in] source Source control of the animation.
+   * @param[in] destination Destination control of the animation.
+   * @param[in] visualIndex Property::Index to make animation.
+   */
+  void MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali::Property::Map& destinationPropertyMap, Dali::Toolkit::Control source, Dali::Toolkit::Control destination, Dali::Property::Index visualIndex);
 
   /**
-   * @brief Retrieve visual property animations.
-   * This Control is a destination.
+   * @brief Retrieves source and destination visual properties for the Transition of this Control.
+   * The properties of this Control will be transitioned from the propeties of source Control to that of destination control.
+   * If a property value is different between source and destination Control,
+   * the property information of each Control will be included in sourceProperties and destinationProperties.
    *
-   * @param[in] animation generated animation
-   * @param[in] source source control of the animation.
-   * @param[in] alphaFunction AlphaFunction of the animation
-   * @param[in] timePeriod TimePeriod of the animation
+   * @param[out] sourceProperties Source property list to be applied on this Control.
+   * @param[out] destinationProperties Destination property list to be applied on this Control.
+   * @param[in] source Source control of the animation.
+   * @param[in] destination Destination control of the animation.
+   *
+   * @note This method do not handle Actor properties.
+   * And the size and order of the sourceProperties and destinationProperties must be synchronized.
+   */
+  virtual void OnCreateTransitions(std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& sourceProperties,
+                                   std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& destinationProperties,
+                                   Dali::Toolkit::Control                                              source,
+                                   Dali::Toolkit::Control                                              destination)
+  {
+  }
+
+  /**
+   * @brief Update visual properties.
+   * @param[in] properties Property list to be used to update visual properties of this Control.
    */
-  virtual void OnCreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod)
+  virtual void OnUpdateVisualProperties(const std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>>& properties)
   {
   }
 
diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp
index ec37028..2e918f0 100644
--- a/dali-toolkit/public-api/controls/control.cpp
+++ b/dali-toolkit/public-api/controls/control.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,12 @@ namespace Toolkit
 {
 Control Control::New()
 {
-  return Internal::Control::New();
+  return Toolkit::Internal::Control::New();
+}
+
+Control Control::New(ControlBehaviour additionalBehaviour)
+{
+  return Toolkit::Internal::Control::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
 }
 
 Control::Control()
@@ -40,7 +45,7 @@ Control::Control()
 
 Control::Control(const Control& uiControl) = default;
 
-Control::Control(Control&& rhs) = default;
+Control::Control(Control&& rhs) noexcept = default;
 
 Control::~Control()
 {
@@ -48,7 +53,7 @@ Control::~Control()
 
 Control& Control::operator=(const Control& handle) = default;
 
-Control& Control::operator=(Control&& rhs) = default;
+Control& Control::operator=(Control&& rhs) noexcept = default;
 
 Control Control::DownCast(BaseHandle handle)
 {
@@ -112,10 +117,7 @@ void Control::ClearBackground()
 
 bool Control::IsResourceReady() const
 {
-  const Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(*this);
-  const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(internalControl);
-
-  return controlDataImpl.IsResourceReady();
+  return Internal::GetImplementation(*this).IsResourceReady();
 }
 
 Toolkit::Visual::ResourceStatus Control::GetVisualResourceStatus(Dali::Property::Index index)
diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h
index fb2b5ad..e4e90a2 100644
--- a/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -147,12 +147,16 @@ public:
      */
     enum Direction
     {
-      LEFT,     ///< Move keyboard focus towards the left direction @SINCE_1_0.0
-      RIGHT,    ///< Move keyboard focus towards the right direction @SINCE_1_0.0
-      UP,       ///< Move keyboard focus towards the up direction @SINCE_1_0.0
-      DOWN,     ///< Move keyboard focus towards the down direction @SINCE_1_0.0
-      PAGE_UP,  ///< Move keyboard focus towards the previous page direction @SINCE_1_2.14
-      PAGE_DOWN ///< Move keyboard focus towards the next page direction @SINCE_1_2.14
+      LEFT,      ///< Move keyboard focus towards the left direction @SINCE_1_0.0
+      RIGHT,     ///< Move keyboard focus towards the right direction @SINCE_1_0.0
+      UP,        ///< Move keyboard focus towards the up direction @SINCE_1_0.0
+      DOWN,      ///< Move keyboard focus towards the down direction @SINCE_1_0.0
+      PAGE_UP,   ///< Move keyboard focus towards the previous page direction @SINCE_1_2.14
+      PAGE_DOWN, ///< Move keyboard focus towards the next page direction @SINCE_1_2.14
+      FORWARD,   ///< Move keyboard focus towards the forward direction @SINCE_2_1.10
+      BACKWARD,  ///< Move keyboard focus towards the backward direction @SINCE_2_1.10
+      CLOCKWISE,  ///< Move keyboard focus towards the clockwise direction @SINCE_2_1.14
+      COUNTER_CLOCKWISE,  ///< Move keyboard focus towards the counter clockwise direction @SINCE_2_1.14
     };
   };
 
@@ -168,6 +172,21 @@ public:
   typedef Signal<void(Control)> ResourceReadySignalType;
 
 public: // Creation & Destruction
+
+  /**
+   * @brief Additional control behaviour flags for the control constructor.
+   * @note TODO : Currunt code is hard-coded. We Should sync type values as
+   * CustomActorImpl::ActorFlag and Internal::Control::ControlBehaviour in future.
+   * @SINCE_2_1.8
+   */
+  enum ControlBehaviour
+  {
+    CONTROL_BEHAVIOUR_DEFAULT            = 0,            ///< Default behaviour: Size negotiation is enabled & listens to Style Change signal, but doesn't receive event callbacks. @SINCE_1_2_10
+    DISABLE_SIZE_NEGOTIATION             = 1 << (0 + 0), ///< True if control does not need size negotiation, i.e. it can be skipped in the algorithm @SINCE_1_0.0
+    REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << (4 + 1), ///< True if needs to support keyboard navigation @SINCE_1_0.0
+    DISABLE_STYLE_CHANGE_SIGNALS         = 1 << (4 + 2), ///< True if control should not monitor style change signals @SINCE_1_2_10
+  };
+
   /**
    * @brief Creates a new instance of a Control.
    *
@@ -177,6 +196,15 @@ public: // Creation & Destruction
   static Control New();
 
   /**
+   * @brief Creates a new instance of a Control with additional behaviour.
+   *
+   * @SINCE_2_1.8
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @return A handle to a new Control
+   */
+  static Control New(ControlBehaviour additionalBehaviour);
+
+  /**
    * @brief Creates an uninitialized Control handle.
    *
    * Only derived versions can be instantiated.  Calling member
@@ -200,7 +228,7 @@ public: // Creation & Destruction
    * @SINCE_1_9.23
    * @param[in] rhs Handle to move
    */
-  Control(Control&& rhs);
+  Control(Control&& rhs) noexcept;
 
   /**
    * @brief Dali::Control is intended as a base class.
@@ -228,7 +256,7 @@ public: // operators
    * @param[in] rhs Object to assign this to
    * @return Reference to this
    */
-  Control& operator=(Control&& rhs);
+  Control& operator=(Control&& rhs) noexcept;
 
 public:
   /**
diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.cpp b/dali-toolkit/public-api/controls/flex-container/flex-container.cpp
index 35fb2c1..069e2a1 100644
--- a/dali-toolkit/public-api/controls/flex-container/flex-container.cpp
+++ b/dali-toolkit/public-api/controls/flex-container/flex-container.cpp
@@ -36,11 +36,11 @@ FlexContainer::FlexContainer()
 
 FlexContainer::FlexContainer(const FlexContainer& handle) = default;
 
-FlexContainer::FlexContainer(FlexContainer&& rhs) = default;
+FlexContainer::FlexContainer(FlexContainer&& rhs) noexcept = default;
 
 FlexContainer& FlexContainer::operator=(const FlexContainer& handle) = default;
 
-FlexContainer& FlexContainer::operator=(FlexContainer&& rhs) = default;
+FlexContainer& FlexContainer::operator=(FlexContainer&& rhs) noexcept = default;
 
 FlexContainer::~FlexContainer()
 {
diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.h b/dali-toolkit/public-api/controls/flex-container/flex-container.h
index 71589e0..17c39e7 100644
--- a/dali-toolkit/public-api/controls/flex-container/flex-container.h
+++ b/dali-toolkit/public-api/controls/flex-container/flex-container.h
@@ -243,7 +243,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  FlexContainer(FlexContainer&& rhs);
+  FlexContainer(FlexContainer&& rhs) noexcept;
 
   /**
    * @brief Assignment operator. Changes this handle to point to another real object.
@@ -260,7 +260,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  FlexContainer& operator=(FlexContainer&& rhs);
+  FlexContainer& operator=(FlexContainer&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/gl-view/gl-view.cpp b/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
new file mode 100644
index 0000000..5060566
--- /dev/null
+++ b/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/gl-view/drawable-view-impl.h>
+#include <dali-toolkit/internal/controls/gl-view/gl-view-impl.h>
+
+namespace Dali::Toolkit
+{
+GlView::GlView() = default;
+
+GlView::GlView(const GlView& GlView) = default;
+
+GlView::GlView(GlView&& rhs) noexcept = default;
+
+GlView& GlView::operator=(const GlView& GlView) = default;
+
+GlView& GlView::operator=(GlView&& rhs) noexcept = default;
+
+GlView::~GlView() = default;
+
+GlView GlView::New(ColorFormat colorFormat)
+{
+  // This function is backward compatible and always returns
+  // backend based on NativeImage.
+  return Internal::GlView::New(colorFormat);
+}
+
+GlView GlView::New(BackendMode backendMode, ColorFormat colorFormat)
+{
+  switch(backendMode)
+  {
+    case BackendMode::DIRECT_RENDERING:
+    case BackendMode::DIRECT_RENDERING_THREADED:
+    case BackendMode::UNSAFE_DIRECT_RENDERING:
+    {
+      return Internal::DrawableView::New(backendMode);
+    }
+    case BackendMode::EGL_IMAGE_OFFSCREEN_RENDERING:
+    {
+      return Internal::GlView::New(colorFormat);
+    }
+    default:
+    {
+      DALI_ASSERT_ALWAYS("Invalid BackendMode");
+    }
+  }
+  return {};
+}
+
+GlView GlView::DownCast(BaseHandle handle)
+{
+  return Control::DownCast<GlView, Internal::GlViewImpl>(handle);
+}
+
+void GlView::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+{
+  Dali::Toolkit::GetImpl(*this).RegisterGlCallbacks(initCallback, renderFrameCallback, terminateCallback);
+}
+
+void GlView::SetResizeCallback(CallbackBase* resizeCallback)
+{
+  Dali::Toolkit::GetImpl(*this).SetResizeCallback(resizeCallback);
+}
+
+bool GlView::SetGraphicsConfig(bool depth, bool stencil, int msaa, GraphicsApiVersion version)
+{
+  return Dali::Toolkit::GetImpl(*this).SetGraphicsConfig(depth, stencil, msaa, version);
+}
+
+void GlView::SetRenderingMode(RenderingMode mode)
+{
+  Dali::Toolkit::GetImpl(*this).SetRenderingMode(mode);
+}
+
+Dali::Toolkit::GlView::RenderingMode GlView::GetRenderingMode() const
+{
+  return Dali::Toolkit::GetImpl(*this).GetRenderingMode();
+}
+
+Dali::Toolkit::GlView::BackendMode GlView::GetBackendMode() const
+{
+  return Dali::Toolkit::GetImpl(*this).GetBackendMode();
+}
+
+void GlView::RenderOnce()
+{
+  Dali::Toolkit::GetImpl(*this).RenderOnce();
+}
+
+void GlView::BindTextureResources(std::vector<Dali::Texture> textures)
+{
+  Dali::Toolkit::GetImpl(*this).BindTextureResources(std::move(textures));
+}
+
+GlView::GlView(Internal::GlViewImpl& implementation)
+: Control(implementation)
+{
+}
+
+GlView::GlView(Dali::Internal::CustomActor* internal)
+: Control(internal)
+{
+  VerifyCustomActorPointer<Internal::GlViewImpl>(internal);
+}
+
+} // namespace Dali::Toolkit
diff --git a/dali-toolkit/public-api/controls/gl-view/gl-view.h b/dali-toolkit/public-api/controls/gl-view/gl-view.h
new file mode 100644
index 0000000..13cc2e9
--- /dev/null
+++ b/dali-toolkit/public-api/controls/gl-view/gl-view.h
@@ -0,0 +1,386 @@
+#ifndef DALI_TOOLKIT_GL_VIEW_H
+#define DALI_TOOLKIT_GL_VIEW_H
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/rendering/texture.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal DALI_INTERNAL
+{
+class GlViewImpl;
+}
+
+/**
+ * @brief GlView is a class for rendering with GL
+ *
+ * GlView allows drawing with OpenGL.
+ * GlView creates a GL context, a GL surface and a render thread.
+ * The render thread invokes user's callbacks.
+ *
+ * @SINCE_2_0.45
+ */
+class DALI_TOOLKIT_API GlView : public Dali::Toolkit::Control
+{
+public:
+  /**
+   * @brief Implementation backend mode
+   *
+   * @SINCE_2_1.18
+   */
+  enum class BackendMode
+  {
+    /**
+     * DIRECT_RENDERING mode executes GL code within DALi graphics
+     * pipeline but creates isolated context hence it doesn't alter any
+     * DALi rendering state. When Renderer is about to be drawn, the callback
+     * will be executed and the custom code "injected" into the pipeline.
+     * This allows rendering directly to the surface rather than offscreen.
+     *
+     * @SINCE_2_3.12
+     */
+    DIRECT_RENDERING = 0,
+
+    /**
+     * DIRECT_RENDERING_THREADED mode executes GL code on separate thread
+     * and then blits the result within DALi graphics commands stream.
+     * The mode is logically compatible with the EGL_IMAGE_OFFSCREEN_RENDERING.
+     *
+     * @SINCE_2_1.30
+     */
+    DIRECT_RENDERING_THREADED,
+
+    /**
+     * EGL_IMAGE_OFFSCREEN_RENDERING mode executes GL code in own thread
+     * and renders to the offscreen NativeImage (EGL) buffer. This backend
+     * will render in parallel but has higher memory footprint and may suffer
+     * performance issues due to using EGL image.
+     *
+     * @SINCE_2_1.18
+     */
+    EGL_IMAGE_OFFSCREEN_RENDERING,
+
+    /**
+     * UNSAFE_DIRECT_RENDERING mode executes GL code within DALi graphics
+     * pipeline WITHOUT isolating the GL context so should be used with caution!
+     * The custom rendering code is executed within current window context and
+     * may alter the GL state. This mode is considered unsafe and should be used
+     * only when drawing on main GL context is necessary!
+     *
+     * When Renderer is about to be drawn, the callback
+     * will be executed and the custom code "injected" into the pipeline.
+     * This allows rendering directly to the surface rather than offscreen.
+     *
+     * @SINCE_2_3.12
+     */
+    UNSAFE_DIRECT_RENDERING,
+
+    /**
+     * The default mode is set to EGL_IMAGE_OFFSCREEN_RENDERING for backwards
+     * compatibility.
+     *
+     * @SINCE_2_1.18
+     */
+    DEFAULT = EGL_IMAGE_OFFSCREEN_RENDERING
+  };
+
+  /**
+   * @brief Enumeration for rendering mode
+   *
+   * This Enumeration is used to choose the rendering mode.
+   * It has two options.
+   * One of them is continuous mode. It is rendered continuously.
+   * The other is on demand mode. It is rendered by application.
+   *
+   * @SINCE_2_0.45
+   */
+  enum class RenderingMode
+  {
+    CONTINUOUS, ///< continuous mode
+    ON_DEMAND   ///< on demand by application
+  };
+
+  /**
+   * @brief Enumeration for Graphics API version
+   *
+   * This Enumeration is used to set a GLES version for EGL configuration.
+   *
+   * @SINCE_2_0.45
+   */
+  enum class GraphicsApiVersion
+  {
+    GLES_VERSION_2_0 = 0, ///< GLES version 2.0
+    GLES_VERSION_3_0,     ///< GLES version 3.0
+  };
+
+  /**
+   * @brief Enumeration for color buffer format
+   *
+   * This Enumeration is used to set a color buffer format of GlView
+   *
+   * @SINCE_2_0.45
+   */
+  enum class ColorFormat
+  {
+    RGB888,  ///< 8 red bits, 8 green bits, 8 blue bits
+    RGBA8888 ///< 8 red bits, 8 green bits, 8 blue bits, alpha 8 bits
+  };
+
+  /**
+   * @brief Creates a GlView control.
+   *
+   * @note This function always creates the GlView with NativeImage backend.
+   *
+   * @param[in] colorFormat the format of the color buffer.
+   * @return A handle to a GlView control
+   *
+   * @SINCE_2_0.45
+   */
+  static GlView New(ColorFormat colorFormat);
+
+  /**
+   * @brief Creates a GlView control.
+   *
+   * The new GlView will be created with specified backend.
+   * The colorFormat is ignored for DIRECT_RENDERING backend.
+   *
+   * @param[in] colorFormat the format of the color buffer.
+   * @param[in] backendMode the backend used by the GlView
+   * @return A handle to a GlView control
+   *
+   * @SINCE_2_1.18
+   */
+  static GlView New(BackendMode backendMode, ColorFormat colorFormat);
+
+  /**
+   * @brief Creates an uninitialized GlView.
+   *
+   * @SINCE_2_0.45
+   */
+  GlView();
+
+  /**
+   * @brief Destructor.
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   *
+   * @SINCE_2_0.45
+   */
+  ~GlView();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] GlView GlView to copy. The copied GlView will point at the same implementation
+   *
+   * @SINCE_2_0.45
+   */
+  GlView(const GlView& GlView);
+
+  /**
+   * @brief Move constructor
+   *
+   * @param[in] rhs A reference to the moved handle
+   *
+   * @SINCE_2_0.45
+   */
+  GlView(GlView&& rhs) noexcept;
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] GlView The GlView to assign from
+   * @return A reference to this
+   *
+   * @SINCE_2_0.45
+   */
+  GlView& operator=(const GlView& GlView);
+
+  /**
+   * @brief Move assignment
+   *
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   *
+   * @SINCE_2_0.45
+   */
+  GlView& operator=(GlView&& rhs) noexcept;
+
+  /**
+   * @brief Downcasts a handle to GlView handle.
+   *
+   * If handle points to a GlView, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle Handle to an object
+   * @return Handle to a GlView or an uninitialized handle
+   *
+   * @SINCE_2_0.45
+   */
+  static GlView DownCast(BaseHandle handle);
+
+  /**
+   * @brief Registers GL callback functions for GlView.
+   *
+   * @param[in] initCallback  the callback function to create GL resources.
+   * @param[in] renderFrameCallback the callback function to render for the frame.
+   * @param[in] terminateCallback the callback function to clean-up GL resources.
+   *
+   * A initCallback of the following type have to be used:
+   * @code
+   *   void intializeGL();
+   * @endcode
+   * This callback will be called before renderFrame callback is called once.
+   *
+   * A renderFrameCallback of the following type have to be used:
+   * @code
+   *   int renderFrameGL();
+   * @endcode
+   * If the return value of this callback is not 0, the eglSwapBuffers() will be called.
+   *
+   * A terminateCallback of the following type have to be used:
+   * @code
+   *   void terminateGL();
+   * @endcode
+   * This callback is called when GlView is deleted.
+   *
+   * @note Ownership of the callbacks is passed onto this class.
+   * <b>You can't call Dali APIs in your callbacks because it is invoked in GlView's own render thread.</b>
+   * And this must be called before adding GlView to the scene.
+   *
+   * @SINCE_2_0.45
+   */
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+
+  /**
+   * @brief Sets the ResizeCallback of the GlView.
+   * When GlView is resized, ResizeCallback would be invoked.
+   * You can get the resized width and height of the GlView.
+   *
+   * @param[in] resizeCallback The ResizeCallback function
+   *
+   * A resizeCallback of the following type have to be used:
+   * @code
+   *   void resizeCallback(int width, int height);
+   * @endcode
+   *
+   * @note Ownership of the callback is passed onto this class.
+   * <b>You can't call Dali APIs in your callback because it is invoked in GlView's own render thread.</b>
+   * And this must be called before adding GlView to the scene.
+   *
+   * @SINCE_2_0.45
+   */
+  void SetResizeCallback(CallbackBase* resizeCallback);
+
+  /**
+   * @brief Sets the rendering mode.
+   *
+   * @param[in] mode the rendering mode for GlView
+   *
+   * @note The default Rendering mode is CONTINUOUS.
+   * If ON_DEMAND mode is set, it is rendered by RenderOnce()
+   *
+   * @SINCE_2_0.45
+   */
+  void SetRenderingMode(RenderingMode mode);
+
+  /**
+   * @brief Gets the rendering mode.
+   *
+   * @SINCE_2_0.45
+   */
+  [[nodiscard]] RenderingMode GetRenderingMode() const;
+
+  /**
+   * @brief Gets the backend mode.
+   *
+   * @SINCE_2_1.18
+   */
+  [[nodiscard]] BackendMode GetBackendMode() const;
+
+  /**
+   * @brief Sets egl configuration for GlView
+   *
+   * @param[in] depth the flag of depth buffer. If the value is true, 24bit depth buffer is enabled.
+   * @param[in] stencil the flag of stencil. If the value is true, 8bit stencil buffer is enabled.
+   * @param[in] msaa the expected sampling number per pixel.
+   * @param[in] version the graphics API version
+   * @return True if the config exists, false otherwise.
+   *
+   * @SINCE_2_0.45
+   */
+  bool SetGraphicsConfig(bool depth, bool stencil, int msaa, GraphicsApiVersion version);
+
+  /**
+   * @brief Renders once more even if GL render functions are not added to idler.
+   * @note Will not work if the window is hidden or GL render functions are added to idler
+   *
+   * @SINCE_2_0.45
+   */
+  void RenderOnce();
+
+  /**
+   * @brief Binds DALi textures to the callback
+   *
+   * The textures that are bound to the callback will be passed upon
+   * callback execution providing native handles (like GL name) so they
+   * can be used alongside with custom GL code.
+   *
+   * Binding texture does not affect lifecycle and it's up to the client-side
+   * to make sure the resource is alive when used inside the callback.
+   *
+   * @param[in] textures List of DALi textures to be bound to the callback
+   *
+   * @note It only supported only in the GlView::BackendMode::DIRECT_RENDERING.
+   *
+   * @SINCE_2_2.2
+   */
+  void BindTextureResources(std::vector<Dali::Texture> textures);
+
+public: // Not intended for application developers
+  /// @cond internal
+  /**
+   * @brief Creates a handle using the Toolkit::Internal implementation.
+   * @param[in] implementation The GlView implementation
+   *
+   * @SINCE_2_0.45
+   */
+  DALI_INTERNAL GlView(Internal::GlViewImpl& implementation);
+
+  /**
+   * @brief Allows the creation of this GlView from an Internal::CustomActor pointer.
+   * @param[in] internal A pointer to the internal CustomActor
+   *
+   * @SINCE_2_0.45
+   */
+  DALI_INTERNAL GlView(Dali::Internal::CustomActor* internal);
+  /// @endcond
+};
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_GL_VIEW_H
diff --git a/dali-toolkit/public-api/controls/image-view/image-view.cpp b/dali-toolkit/public-api/controls/image-view/image-view.cpp
index d65bef0..a66d3aa 100644
--- a/dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/dali-toolkit/public-api/controls/image-view/image-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,11 +35,11 @@ ImageView::ImageView()
 
 ImageView::ImageView(const ImageView& imageView) = default;
 
-ImageView::ImageView(ImageView&& rhs) = default;
+ImageView::ImageView(ImageView&& rhs) noexcept = default;
 
 ImageView& ImageView::operator=(const ImageView& imageView) = default;
 
-ImageView& ImageView::operator=(ImageView&& rhs) = default;
+ImageView& ImageView::operator=(ImageView&& rhs) noexcept = default;
 
 ImageView::~ImageView()
 {
@@ -47,7 +47,7 @@ ImageView::~ImageView()
 
 ImageView ImageView::New()
 {
-  return Internal::ImageView::New();
+  return Toolkit::Internal::ImageView::New();
 }
 
 ImageView ImageView::New(const std::string& url)
@@ -64,6 +64,25 @@ ImageView ImageView::New(const std::string& url, ImageDimensions size)
   return imageView;
 }
 
+ImageView ImageView::New(ControlBehaviour additionalBehaviour)
+{
+  return Toolkit::Internal::ImageView::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+}
+
+ImageView ImageView::New(ControlBehaviour additionalBehaviour, const std::string& url)
+{
+  ImageView imageView = Internal::ImageView::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+  imageView.SetImage(url, ImageDimensions());
+  return imageView;
+}
+
+ImageView ImageView::New(ControlBehaviour additionalBehaviour, const std::string& url, ImageDimensions size)
+{
+  ImageView imageView = Internal::ImageView::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+  imageView.SetImage(url, size);
+  return imageView;
+}
+
 ImageView ImageView::DownCast(BaseHandle handle)
 {
   return Control::DownCast<ImageView, Internal::ImageView>(handle);
diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h
index bb6d966..6f52832 100644
--- a/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_VIEW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -114,6 +114,25 @@ public:
        */
       PRE_MULTIPLIED_ALPHA,
 
+      /**
+       * @brief name "placeholderImage", type string.
+       *
+       * placeholder image is shown when image view is waiting for the image to load.
+       * @SINCE_2_2.24
+       */
+      PLACEHOLDER_IMAGE,
+
+      /**
+       * @brief name "enableTransitionEffect", type Boolean
+       *
+       * This effect is a crossfade effect when the image is replaced.
+       * the default duration of the crossfade effect is 1.5 seconds.
+       * if the placeholder is enabled, the cross effect applies when the image is changed from a placeholder image to a new image.
+       * if not, the cross effect applies when a new image is shown or is changed from the previous image to a new image.
+       * @SINCE_2_2.24
+       */
+      ENABLE_TRANSITION_EFFECT,
+
       // Animatable properties
 
       /**
@@ -173,6 +192,49 @@ public:
   static ImageView New(const std::string& url, ImageDimensions size);
 
   /**
+   * @brief Create an initialized ImageView with additional behaviour.
+   *
+   * @SINCE_2_1.8
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @return A handle to a newly allocated Dali ImageView
+   *
+   * @note ImageView will not display anything.
+   */
+  static ImageView New(ControlBehaviour additionalBehaviour);
+
+  /**
+   * @brief Creates an initialized ImageView from an URL to an image resource with additional behaviour.
+   *
+   * If the string is empty, ImageView will not display anything.
+   *
+   * @SINCE_2_1.8
+   * @REMARK_INTERNET
+   * @REMARK_STORAGE
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @param[in] url The url of the image resource to display
+   * @return A handle to a newly allocated ImageView
+   */
+  static ImageView New(ControlBehaviour additionalBehaviour, const std::string& url);
+
+  /**
+   * @brief Creates an initialized ImageView from a URL to an image resource with additional behaviour.
+   *
+   * If the string is empty, ImageView will not display anything.
+   *
+   * @SINCE_2_1.8
+   * @REMARK_INTERNET
+   * @REMARK_STORAGE
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @param[in] url The url of the image resource to display
+   * @param[in] size The width and height to which to fit the loaded image
+   * @return A handle to a newly allocated ImageView
+   * @note A valid size is preferable for efficiency.
+   *       However, do not set a size that is bigger than the actual image size, as up-scaling is not available.
+   *       The content of the area not covered by the actual image is undefined and will not be cleared.
+   */
+  static ImageView New(ControlBehaviour additionalBehaviour, const std::string& url, ImageDimensions size);
+
+  /**
    * @brief Destructor.
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
@@ -194,7 +256,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  ImageView(ImageView&& rhs);
+  ImageView(ImageView&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -212,7 +274,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  ImageView& operator=(ImageView&& rhs);
+  ImageView& operator=(ImageView&& rhs) noexcept;
 
   /**
    * @brief Downcasts a handle to ImageView handle.
diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp b/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp
index 0850093..d401b65 100644
--- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp
+++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp
@@ -34,11 +34,11 @@ Model3dView::Model3dView()
 
 Model3dView::Model3dView(const Model3dView& model3dView) = default;
 
-Model3dView::Model3dView(Model3dView&& rhs) = default;
+Model3dView::Model3dView(Model3dView&& rhs) noexcept = default;
 
 Model3dView& Model3dView::operator=(const Model3dView& model3dView) = default;
 
-Model3dView& Model3dView::operator=(Model3dView&& rhs) = default;
+Model3dView& Model3dView::operator=(Model3dView&& rhs) noexcept = default;
 
 Model3dView::~Model3dView()
 {
diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
index 88200b2..2075673 100644
--- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
+++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
@@ -143,7 +143,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  Model3dView(Model3dView&& rhs);
+  Model3dView(Model3dView&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -160,7 +160,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  Model3dView& operator=(Model3dView&& rhs);
+  Model3dView& operator=(Model3dView&& rhs) noexcept;
 
   /**
    * @brief Downcasts an Object handle to Model3dView.
diff --git a/dali-toolkit/public-api/controls/progress-bar/progress-bar.cpp b/dali-toolkit/public-api/controls/progress-bar/progress-bar.cpp
index 3c57fd4..f23897f 100644
--- a/dali-toolkit/public-api/controls/progress-bar/progress-bar.cpp
+++ b/dali-toolkit/public-api/controls/progress-bar/progress-bar.cpp
@@ -31,11 +31,11 @@ ProgressBar::ProgressBar()
 
 ProgressBar::ProgressBar(const ProgressBar& handle) = default;
 
-ProgressBar::ProgressBar(ProgressBar&& rhs) = default;
+ProgressBar::ProgressBar(ProgressBar&& rhs) noexcept = default;
 
 ProgressBar& ProgressBar::operator=(const ProgressBar& handle) = default;
 
-ProgressBar& ProgressBar::operator=(ProgressBar&& rhs) = default;
+ProgressBar& ProgressBar::operator=(ProgressBar&& rhs) noexcept = default;
 
 ProgressBar::ProgressBar(Internal::ProgressBar& implementation)
 : Control(implementation)
diff --git a/dali-toolkit/public-api/controls/progress-bar/progress-bar.h b/dali-toolkit/public-api/controls/progress-bar/progress-bar.h
index b466d2d..66c24a5 100644
--- a/dali-toolkit/public-api/controls/progress-bar/progress-bar.h
+++ b/dali-toolkit/public-api/controls/progress-bar/progress-bar.h
@@ -181,7 +181,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  ProgressBar(ProgressBar&& rhs);
+  ProgressBar(ProgressBar&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -200,7 +200,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  ProgressBar& operator=(ProgressBar&& rhs);
+  ProgressBar& operator=(ProgressBar&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
index e7ff4b1..69bea49 100644
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
@@ -40,11 +40,11 @@ ItemView::ItemView(Dali::Internal::CustomActor* internal)
 
 ItemView::ItemView(const ItemView& itemView) = default;
 
-ItemView::ItemView(ItemView&& rhs) = default;
+ItemView::ItemView(ItemView&& rhs) noexcept = default;
 
 ItemView& ItemView::operator=(const ItemView& itemView) = default;
 
-ItemView& ItemView::operator=(ItemView&& rhs) = default;
+ItemView& ItemView::operator=(ItemView&& rhs) noexcept = default;
 
 ItemView ItemView::New(ItemFactory& factory)
 {
diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
index f7d74b5..67faa60 100644
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
@@ -216,7 +216,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  ItemView(ItemView&& rhs);
+  ItemView(ItemView&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -233,7 +233,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  ItemView& operator=(ItemView&& rhs);
+  ItemView& operator=(ItemView&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
index fead0d2..f738997 100644
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
@@ -298,11 +298,11 @@ ScrollView::ScrollView(Dali::Internal::CustomActor* internal)
 
 ScrollView::ScrollView(const ScrollView& handle) = default;
 
-ScrollView::ScrollView(ScrollView&& rhs) = default;
+ScrollView::ScrollView(ScrollView&& rhs) noexcept = default;
 
 ScrollView& ScrollView::operator=(const ScrollView& handle) = default;
 
-ScrollView& ScrollView::operator=(ScrollView&& rhs) = default;
+ScrollView& ScrollView::operator=(ScrollView&& rhs) noexcept = default;
 
 ScrollView ScrollView::New()
 {
diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
index 18583f2..76f3e20 100644
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
@@ -732,7 +732,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  ScrollView(ScrollView&& rhs);
+  ScrollView(ScrollView&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -751,7 +751,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  ScrollView& operator=(ScrollView&& rhs);
+  ScrollView& operator=(ScrollView&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
index 7c3f005..f46d699 100644
--- a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
@@ -41,11 +41,11 @@ Scrollable::Scrollable(Dali::Internal::CustomActor* internal)
 
 Scrollable::Scrollable(const Scrollable& handle) = default;
 
-Scrollable::Scrollable(Scrollable&& rhs) = default;
+Scrollable::Scrollable(Scrollable&& rhs) noexcept = default;
 
 Scrollable& Scrollable::operator=(const Scrollable& handle) = default;
 
-Scrollable& Scrollable::operator=(Scrollable&& rhs) = default;
+Scrollable& Scrollable::operator=(Scrollable&& rhs) noexcept = default;
 
 Scrollable::~Scrollable()
 {
diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h
index a12e3c2..2a35e66 100644
--- a/dali-toolkit/public-api/controls/scrollable/scrollable.h
+++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h
@@ -125,7 +125,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  Scrollable(Scrollable&& rhs);
+  Scrollable(Scrollable&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -144,7 +144,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  Scrollable& operator=(Scrollable&& rhs);
+  Scrollable& operator=(Scrollable&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/slider/slider.cpp b/dali-toolkit/public-api/controls/slider/slider.cpp
index ba60716..d6bd06b 100644
--- a/dali-toolkit/public-api/controls/slider/slider.cpp
+++ b/dali-toolkit/public-api/controls/slider/slider.cpp
@@ -33,11 +33,11 @@ Slider::Slider()
 
 Slider::Slider(const Slider& handle) = default;
 
-Slider::Slider(Slider&& rhs) = default;
+Slider::Slider(Slider&& rhs) noexcept = default;
 
 Slider& Slider::operator=(const Slider& handle) = default;
 
-Slider& Slider::operator=(Slider&& rhs) = default;
+Slider& Slider::operator=(Slider&& rhs) noexcept = default;
 
 Slider::Slider(Internal::Slider& implementation)
 : Control(implementation)
diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h
index f5be0d7..729c79d 100644
--- a/dali-toolkit/public-api/controls/slider/slider.h
+++ b/dali-toolkit/public-api/controls/slider/slider.h
@@ -194,7 +194,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  Slider(Slider&& rhs);
+  Slider(Slider&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -213,7 +213,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  Slider& operator=(Slider&& rhs);
+  Slider& operator=(Slider&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.cpp b/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
index 980b0c9..331148d 100644
--- a/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
+++ b/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
@@ -30,17 +30,22 @@ TextEditor TextEditor::New()
   return Internal::TextEditor::New();
 }
 
+TextEditor TextEditor::New(ControlBehaviour additionalBehaviour)
+{
+  return Internal::TextEditor::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+}
+
 TextEditor::TextEditor()
 {
 }
 
 TextEditor::TextEditor(const TextEditor& handle) = default;
 
-TextEditor::TextEditor(TextEditor&& rhs) = default;
+TextEditor::TextEditor(TextEditor&& rhs) noexcept = default;
 
 TextEditor& TextEditor::operator=(const TextEditor& handle) = default;
 
-TextEditor& TextEditor::operator=(TextEditor&& rhs) = default;
+TextEditor& TextEditor::operator=(TextEditor&& rhs) noexcept = default;
 
 TextEditor::~TextEditor()
 {
diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.h b/dali-toolkit/public-api/controls/text-controls/text-editor.h
index 81eb8d3..ba91995 100644
--- a/dali-toolkit/public-api/controls/text-controls/text-editor.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_EDITOR_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -449,16 +449,17 @@ public:
      */
     enum Mask
     {
-      NONE         = 0x0000, ///< @SINCE_1_2_2
-      COLOR        = 0x0001, ///< @SINCE_1_2_2
-      FONT_FAMILY  = 0x0002, ///< @SINCE_1_2_2
-      POINT_SIZE   = 0x0004, ///< @SINCE_1_2_2
-      FONT_STYLE   = 0x0008, ///< @SINCE_1_2_2
-      LINE_SPACING = 0x0010, ///< @SINCE_1_2_2
-      UNDERLINE    = 0x0020, ///< @SINCE_1_2_2
-      SHADOW       = 0x0040, ///< @SINCE_1_2_2
-      EMBOSS       = 0x0080, ///< @SINCE_1_2_2
-      OUTLINE      = 0x0100  ///< @SINCE_1_2_2
+      NONE          = 0x0000, ///< @SINCE_1_2_2
+      COLOR         = 0x0001, ///< @SINCE_1_2_2
+      FONT_FAMILY   = 0x0002, ///< @SINCE_1_2_2
+      POINT_SIZE    = 0x0004, ///< @SINCE_1_2_2
+      FONT_STYLE    = 0x0008, ///< @SINCE_1_2_2
+      LINE_SPACING  = 0x0010, ///< @SINCE_1_2_2
+      UNDERLINE     = 0x0020, ///< @SINCE_1_2_2
+      SHADOW        = 0x0040, ///< @SINCE_1_2_2
+      EMBOSS        = 0x0080, ///< @SINCE_1_2_2
+      OUTLINE       = 0x0100, ///< @SINCE_1_2_2
+      STRIKETHROUGH = 0x0200,
     };
   };
 
@@ -511,6 +512,15 @@ public:
   New();
 
   /**
+   * @brief Creates the TextEditor control with additional behaviour.
+   *
+   * @SINCE_2_2.3
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @return A handle to the TextEditor control
+   */
+  static TextEditor New(ControlBehaviour additionalBehaviour);
+
+  /**
    * @brief Creates an empty handle.
    *
    * @SINCE_1_1.37
@@ -531,7 +541,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  TextEditor(TextEditor&& rhs);
+  TextEditor(TextEditor&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -549,7 +559,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  TextEditor& operator=(TextEditor&& rhs);
+  TextEditor& operator=(TextEditor&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.cpp b/dali-toolkit/public-api/controls/text-controls/text-field.cpp
index 075a468..7a1c064 100644
--- a/dali-toolkit/public-api/controls/text-controls/text-field.cpp
+++ b/dali-toolkit/public-api/controls/text-controls/text-field.cpp
@@ -30,17 +30,22 @@ TextField TextField::New()
   return Internal::TextField::New();
 }
 
+TextField TextField::New(ControlBehaviour additionalBehaviour)
+{
+  return Internal::TextField::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+}
+
 TextField::TextField()
 {
 }
 
 TextField::TextField(const TextField& handle) = default;
 
-TextField::TextField(TextField&& rhs) = default;
+TextField::TextField(TextField&& rhs) noexcept = default;
 
 TextField& TextField::operator=(const TextField& handle) = default;
 
-TextField& TextField::operator=(TextField&& rhs) = default;
+TextField& TextField::operator=(TextField&& rhs) noexcept = default;
 
 TextField::~TextField()
 {
diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h
index 61bab1c..863fdbf 100644
--- a/dali-toolkit/public-api/controls/text-controls/text-field.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-field.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_FIELD_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -452,7 +452,7 @@ public:
        * @SINCE_1_2.60
        * @note PLACEHOLDER map is used to add ellipsis to placeholder text.
        */
-      ELLIPSIS
+      ELLIPSIS,
     };
   };
 
@@ -482,15 +482,16 @@ public:
    */
     enum Mask
     {
-      NONE        = 0x0000, ///< @SINCE_1_2_2
-      COLOR       = 0x0001, ///< @SINCE_1_2_2
-      FONT_FAMILY = 0x0002, ///< @SINCE_1_2_2
-      POINT_SIZE  = 0x0004, ///< @SINCE_1_2_2
-      FONT_STYLE  = 0x0008, ///< @SINCE_1_2_2
-      UNDERLINE   = 0x0010, ///< @SINCE_1_2_2
-      SHADOW      = 0x0020, ///< @SINCE_1_2_2
-      EMBOSS      = 0x0040, ///< @SINCE_1_2_2
-      OUTLINE     = 0x0080  ///< @SINCE_1_2_2
+      NONE          = 0x0000, ///< @SINCE_1_2_2
+      COLOR         = 0x0001, ///< @SINCE_1_2_2
+      FONT_FAMILY   = 0x0002, ///< @SINCE_1_2_2
+      POINT_SIZE    = 0x0004, ///< @SINCE_1_2_2
+      FONT_STYLE    = 0x0008, ///< @SINCE_1_2_2
+      UNDERLINE     = 0x0010, ///< @SINCE_1_2_2
+      SHADOW        = 0x0020, ///< @SINCE_1_2_2
+      EMBOSS        = 0x0040, ///< @SINCE_1_2_2
+      OUTLINE       = 0x0080, ///< @SINCE_1_2_2
+      STRIKETHROUGH = 0x1000
     };
   };
 
@@ -522,6 +523,15 @@ public:
   static TextField New();
 
   /**
+   * @brief Creates the TextField control with additional behaviour.
+   *
+   * @SINCE_2_2.3
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @return A handle to the TextField control
+   */
+  static TextField New(ControlBehaviour additionalBehaviour);
+
+  /**
    * @brief Creates an empty handle.
    * @SINCE_1_0.0
    */
@@ -541,7 +551,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  TextField(TextField&& rhs);
+  TextField(TextField&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -559,7 +569,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  TextField& operator=(TextField&& rhs);
+  TextField& operator=(TextField&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.cpp b/dali-toolkit/public-api/controls/text-controls/text-label.cpp
index 66710a1..b80e48b 100644
--- a/dali-toolkit/public-api/controls/text-controls/text-label.cpp
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,17 +38,30 @@ TextLabel TextLabel::New(const std::string& text)
   return label;
 }
 
+TextLabel TextLabel::New(ControlBehaviour additionalBehaviour)
+{
+  return Internal::TextLabel::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+}
+
+TextLabel TextLabel::New(ControlBehaviour additionalBehaviour, const std::string& text)
+{
+  TextLabel label = Internal::TextLabel::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+  label.SetProperty(TextLabel::Property::TEXT, text);
+
+  return label;
+}
+
 TextLabel::TextLabel()
 {
 }
 
 TextLabel::TextLabel(const TextLabel& handle) = default;
 
-TextLabel::TextLabel(TextLabel&& rhs) = default;
+TextLabel::TextLabel(TextLabel&& rhs) noexcept = default;
 
 TextLabel& TextLabel::operator=(const TextLabel& handle) = default;
 
-TextLabel& TextLabel::operator=(TextLabel&& rhs) = default;
+TextLabel& TextLabel::operator=(TextLabel&& rhs) noexcept = default;
 
 TextLabel::~TextLabel()
 {
diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
index 2d8c763..2d91933 100644
--- a/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_LABEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -382,6 +382,25 @@ public:
   static TextLabel New(const std::string& text);
 
   /**
+   * @brief Creates the TextLabel control with additional behaviour.
+   *
+   * @SINCE_2_1.8
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @return A handle to the TextLabel control
+   */
+  static TextLabel New(ControlBehaviour additionalBehaviour);
+
+  /**
+   * @brief Creates the TextLabel control with additional behaviour.
+   *
+   * @SINCE_2_1.8
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @param[in] text The text to display
+   * @return A handle to the TextLabel control
+   */
+  static TextLabel New(ControlBehaviour additionalBehaviour, const std::string& text);
+
+  /**
    * @brief Creates an empty handle.
    * @SINCE_1_0.0
    */
@@ -401,7 +420,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  TextLabel(TextLabel&& rhs);
+  TextLabel(TextLabel&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -419,7 +438,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  TextLabel& operator=(TextLabel&& rhs);
+  TextLabel& operator=(TextLabel&& rhs) noexcept;
 
   /**
    * @brief Destructor.
diff --git a/dali-toolkit/public-api/controls/video-view/video-view.cpp b/dali-toolkit/public-api/controls/video-view/video-view.cpp
index 97e9587..e72d000 100644
--- a/dali-toolkit/public-api/controls/video-view/video-view.cpp
+++ b/dali-toolkit/public-api/controls/video-view/video-view.cpp
@@ -35,11 +35,11 @@ VideoView::VideoView()
 
 VideoView::VideoView(const VideoView& videoView) = default;
 
-VideoView::VideoView(VideoView&& rhs) = default;
+VideoView::VideoView(VideoView&& rhs) noexcept = default;
 
 VideoView& VideoView::operator=(const VideoView& videoView) = default;
 
-VideoView& VideoView::operator=(VideoView&& rhs) = default;
+VideoView& VideoView::operator=(VideoView&& rhs) noexcept = default;
 
 VideoView::~VideoView()
 {
diff --git a/dali-toolkit/public-api/controls/video-view/video-view.h b/dali-toolkit/public-api/controls/video-view/video-view.h
index 38be0ff..1b939f7 100644
--- a/dali-toolkit/public-api/controls/video-view/video-view.h
+++ b/dali-toolkit/public-api/controls/video-view/video-view.h
@@ -255,7 +255,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  VideoView(VideoView&& rhs);
+  VideoView(VideoView&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -273,7 +273,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  VideoView& operator=(VideoView&& rhs);
+  VideoView& operator=(VideoView&& rhs) noexcept;
 
   /**
    * @brief Downcasts a handle to VideoView handle.
diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 805e7c6..08af10b 100644
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ namespace Dali
 namespace Toolkit
 {
 const unsigned int TOOLKIT_MAJOR_VERSION = 2;
-const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 44;
+const unsigned int TOOLKIT_MINOR_VERSION = 3;
+const unsigned int TOOLKIT_MICRO_VERSION = 19;
 const char* const  TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
index 7b72745..833bfbf 100644
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@ -27,10 +27,18 @@ SET( public_api_src_files
   ${public_api_src_dir}/controls/text-controls/text-field.cpp
   ${public_api_src_dir}/controls/video-view/video-view.cpp
   ${public_api_src_dir}/controls/camera-view/camera-view.cpp
+  ${public_api_src_dir}/controls/gl-view/gl-view.cpp
   ${public_api_src_dir}/image-loader/image.cpp
   ${public_api_src_dir}/image-loader/image-url.cpp
   ${public_api_src_dir}/image-loader/async-image-loader.cpp
   ${public_api_src_dir}/image-loader/sync-image-loader.cpp
+  ${public_api_src_dir}/particle-system/particle.cpp
+  ${public_api_src_dir}/particle-system/particle-domain.cpp
+  ${public_api_src_dir}/particle-system/particle-emitter.cpp
+  ${public_api_src_dir}/particle-system/particle-list.cpp
+  ${public_api_src_dir}/particle-system/particle-modifier.cpp
+  ${public_api_src_dir}/particle-system/particle-renderer.cpp
+  ${public_api_src_dir}/particle-system/particle-source.cpp
   ${public_api_src_dir}/styling/style-manager.cpp
   ${public_api_src_dir}/transition/fade-transition.cpp
   ${public_api_src_dir}/transition/slide-transition.cpp
@@ -141,6 +149,10 @@ SET( public_api_camera_view_header_files
   ${public_api_src_dir}/controls/camera-view/camera-view.h
 )
 
+SET( public_api_gl_view_header_files
+  ${public_api_src_dir}/controls/gl-view/gl-view.h
+)
+
 SET( public_api_visuals_header_files
   ${public_api_src_dir}/visuals/border-visual-properties.h
   ${public_api_src_dir}/visuals/color-visual-properties.h
@@ -152,6 +164,17 @@ SET( public_api_visuals_header_files
   ${public_api_src_dir}/visuals/text-visual-properties.h
 )
 
+SET( public_api_particle_system_header_files
+  ${public_api_src_dir}/particle-system/particle-domain.h
+  ${public_api_src_dir}/particle-system/particle-emitter.h
+  ${public_api_src_dir}/particle-system/particle.h
+  ${public_api_src_dir}/particle-system/particle-list.h
+  ${public_api_src_dir}/particle-system/particle-modifier.h
+  ${public_api_src_dir}/particle-system/particle-renderer.h
+  ${public_api_src_dir}/particle-system/particle-source.h
+  ${public_api_src_dir}/particle-system/particle-types.h
+)
+
 SET( public_api_transition_header_files
   ${public_api_src_dir}/transition/fade-transition.h
   ${public_api_src_dir}/transition/slide-transition.h
@@ -186,4 +209,6 @@ SET( PUBLIC_API_HEADERS ${PUBLIC_API_HEADERS}
   ${public_api_video_view_header_files}
   ${public_api_visuals_header_files}
   ${public_api_camera_view_header_files}
+  ${public_api_gl_view_header_files}
+  ${public_api_particle_system_header_files}
 )
diff --git a/dali-toolkit/public-api/image-loader/async-image-loader.cpp b/dali-toolkit/public-api/image-loader/async-image-loader.cpp
index 3cbfc60..25e2a8f 100644
--- a/dali-toolkit/public-api/image-loader/async-image-loader.cpp
+++ b/dali-toolkit/public-api/image-loader/async-image-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,11 +40,11 @@ AsyncImageLoader::AsyncImageLoader(Internal::AsyncImageLoader* impl)
 
 AsyncImageLoader::AsyncImageLoader(const AsyncImageLoader& handle) = default;
 
-AsyncImageLoader::AsyncImageLoader(AsyncImageLoader&& rhs) = default;
+AsyncImageLoader::AsyncImageLoader(AsyncImageLoader&& rhs) noexcept = default;
 
 AsyncImageLoader& AsyncImageLoader::operator=(const AsyncImageLoader& handle) = default;
 
-AsyncImageLoader& AsyncImageLoader::operator=(AsyncImageLoader&& rhs) = default;
+AsyncImageLoader& AsyncImageLoader::operator=(AsyncImageLoader&& rhs) noexcept = default;
 
 AsyncImageLoader AsyncImageLoader::DownCast(BaseHandle handle)
 {
@@ -59,12 +59,12 @@ AsyncImageLoader AsyncImageLoader::New()
 
 uint32_t AsyncImageLoader::Load(const std::string& url)
 {
-  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF);
+  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, false);
 }
 
 uint32_t AsyncImageLoader::Load(const std::string& url, ImageDimensions dimensions)
 {
-  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), dimensions, FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF);
+  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), dimensions, FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, false);
 }
 
 uint32_t AsyncImageLoader::Load(const std::string& url,
@@ -73,7 +73,7 @@ uint32_t AsyncImageLoader::Load(const std::string& url,
                                 SamplingMode::Type samplingMode,
                                 bool               orientationCorrection)
 {
-  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), dimensions, fittingMode, samplingMode, orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF);
+  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), dimensions, fittingMode, samplingMode, orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, false);
 }
 
 bool AsyncImageLoader::Cancel(uint32_t loadingTaskId)
diff --git a/dali-toolkit/public-api/image-loader/async-image-loader.h b/dali-toolkit/public-api/image-loader/async-image-loader.h
index 6f73dd0..9f9a441 100644
--- a/dali-toolkit/public-api/image-loader/async-image-loader.h
+++ b/dali-toolkit/public-api/image-loader/async-image-loader.h
@@ -130,7 +130,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  AsyncImageLoader(AsyncImageLoader&& rhs);
+  AsyncImageLoader(AsyncImageLoader&& rhs) noexcept;
 
   /**
    * @brief This assignment operator is required for (smart) pointer semantics.
@@ -147,7 +147,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  AsyncImageLoader& operator=(AsyncImageLoader&& rhs);
+  AsyncImageLoader& operator=(AsyncImageLoader&& rhs) noexcept;
 
   /**
    * @brief Creates a new loader to load the image asynchronously in a worker thread.
diff --git a/dali-toolkit/public-api/image-loader/image-url.cpp b/dali-toolkit/public-api/image-loader/image-url.cpp
index f936fdc..35d4c77 100644
--- a/dali-toolkit/public-api/image-loader/image-url.cpp
+++ b/dali-toolkit/public-api/image-loader/image-url.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,9 +32,9 @@ ImageUrl::~ImageUrl()
 {
 }
 
-ImageUrl ImageUrl::New(Texture& texture)
+ImageUrl ImageUrl::New(Texture& texture, bool preMultiplied)
 {
-  Toolkit::Internal::ImageUrlPtr internal = Toolkit::Internal::ImageUrl::New(texture);
+  Toolkit::Internal::ImageUrlPtr internal = Toolkit::Internal::ImageUrl::New(texture, preMultiplied);
   return ImageUrl(internal.Get());
 }
 
@@ -53,9 +53,9 @@ ImageUrl::ImageUrl(const ImageUrl& rhs) = default;
 
 ImageUrl& ImageUrl::operator=(const ImageUrl& url) = default;
 
-ImageUrl::ImageUrl(ImageUrl&& rhs) = default;
+ImageUrl::ImageUrl(ImageUrl&& rhs) noexcept = default;
 
-ImageUrl& ImageUrl::operator=(ImageUrl&& rhs) = default;
+ImageUrl& ImageUrl::operator=(ImageUrl&& rhs) noexcept = default;
 
 const std::string& ImageUrl::GetUrl() const
 {
diff --git a/dali-toolkit/public-api/image-loader/image-url.h b/dali-toolkit/public-api/image-loader/image-url.h
index 976f179..7e5b700 100644
--- a/dali-toolkit/public-api/image-loader/image-url.h
+++ b/dali-toolkit/public-api/image-loader/image-url.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_URL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,9 +60,10 @@ public:
    * @brief Create an initialized ImageUrl.
    *
    * @param[in] texture The texture url is got from external buffer.
+   * @param[in] preMultiplied Whether this external texture preMultiplied or not. Default as false.
    * @return A handle to a newly allocated Dali resource.
    */
-  static ImageUrl New(Texture& texture);
+  static ImageUrl New(Texture& texture, bool preMultiplied = false);
 
   /**
    * @brief Create an initialized ImageUrl.
@@ -99,14 +100,14 @@ public:
    * @brief Move constructor.
    * @param[in] rhs A reference to the moved handle
    */
-  ImageUrl(ImageUrl&& rhs);
+  ImageUrl(ImageUrl&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  ImageUrl& operator=(ImageUrl&& rhs);
+  ImageUrl& operator=(ImageUrl&& rhs) noexcept;
 
   /**
    * Get the url
diff --git a/dali-toolkit/public-api/image-loader/image.cpp b/dali-toolkit/public-api/image-loader/image.cpp
index 7b91059..5481d5f 100644
--- a/dali-toolkit/public-api/image-loader/image.cpp
+++ b/dali-toolkit/public-api/image-loader/image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 // CLASS HEADER
-#include "image.h"
+#include <dali-toolkit/public-api/image-loader/image.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
@@ -34,29 +34,31 @@ Dali::Toolkit::ImageUrl GenerateUrl(Dali::FrameBuffer frameBuffer, Pixel::Format
 {
   Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelFormat, width, height);
   frameBuffer.AttachColorTexture(texture, 0u, 0u);
-  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  // TODO : Need to check frameBuffer result use preMultiplied color or not. By default, we use premultiplied
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture, true);
   return imageUrl;
 }
 
 Dali::Toolkit::ImageUrl GenerateUrl(const Dali::FrameBuffer frameBuffer, uint8_t index)
 {
   Texture texture = Dali::DevelFrameBuffer::GetColorTexture(frameBuffer, index);
-  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  // TODO : Need to check frameBuffer result use preMultiplied color or not. By default, we use premultiplied
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture, true);
   return imageUrl;
 }
 
-Dali::Toolkit::ImageUrl GenerateUrl(const Dali::PixelData pixelData)
+Dali::Toolkit::ImageUrl GenerateUrl(const Dali::PixelData pixelData, bool preMultiplied)
 {
   Texture texture = Texture::New(TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
   texture.Upload(pixelData);
-  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture, preMultiplied);
   return imageUrl;
 }
 
-Dali::Toolkit::ImageUrl GenerateUrl(const Dali::NativeImageSourcePtr nativeImageSource)
+Dali::Toolkit::ImageUrl GenerateUrl(const Dali::NativeImageInterfacePtr nativeImageInterface, bool preMultiplied)
 {
-  Texture texture = Dali::Texture::New(*nativeImageSource);
-  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  Texture texture = Dali::Texture::New(*nativeImageInterface);
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture, preMultiplied);
   return imageUrl;
 }
 
@@ -65,6 +67,13 @@ Dali::Toolkit::ImageUrl GenerateUrl(const Dali::EncodedImageBuffer encodedImageB
   return Dali::Toolkit::ImageUrl::New(encodedImageBuffer);
 }
 
+Dali::Toolkit::ImageUrl GenerateDepthUrl(const Dali::FrameBuffer frameBuffer)
+{
+  Texture texture = Dali::DevelFrameBuffer::GetDepthTexture(frameBuffer);
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture, false);
+  return imageUrl;
+}
+
 } // namespace Image
 
 } // namespace Toolkit
diff --git a/dali-toolkit/public-api/image-loader/image.h b/dali-toolkit/public-api/image-loader/image.h
index 6db6e7e..96b40f9 100644
--- a/dali-toolkit/public-api/image-loader/image.h
+++ b/dali-toolkit/public-api/image-loader/image.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/adaptor-framework/encoded-image-buffer.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/public-api/images/pixel-data.h>
 #include <dali/public-api/rendering/frame-buffer.h>
 
@@ -33,7 +33,7 @@ namespace Toolkit
 {
 /**
  * API to interface with the toolkit image
- * Allows developers to add FrameBuffer, PixelData and NativeImageSource to toolkit so that visuals can use them to render
+ * Allows developers to add FrameBuffer, PixelData and NativeImageInterface to toolkit so that visuals can use them to render
  */
 namespace Image
 {
@@ -66,18 +66,20 @@ DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateUrl(const Dali::FrameBuffer fra
  * This Url can be used in visuals to render the pixel data.
  * @note This method does not check for duplicates, If same pixel data is entered multiple times, a different URL is returned each time.
  * @param[in] pixelData the pixel data to converted to Url
+ * @param[in] preMultiplied Whether this pixel data preMultiplied or not. Default as false.
  * @return the ImageUrl representing this pixel data
  */
-DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateUrl(const Dali::PixelData pixelData);
+DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateUrl(const Dali::PixelData pixelData, bool preMultiplied = false);
 
 /**
- * @brief Generate a Url from native image source.
- * This Url can be used in visuals to render the native image source.
- * @note This method does not check for duplicates, If same native image source is entered multiple times, a different URL is returned each time.
- * @param[in] nativeImageSource the native image source to converted to Url
- * @return the ImageUrl representing this native image source
+ * @brief Generate a Url from native image interface.
+ * This Url can be used in visuals to render the native image interface.
+ * @note This method does not check for duplicates, If same native image interface is entered multiple times, a different URL is returned each time.
+ * @param[in] nativeImageInterface the native image interface to converted to Url
+ * @param[in] preMultiplied Whether this native image interface preMultiplied or not. Default as false.
+ * @return the ImageUrl representing this native image interface
  */
-DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateUrl(const Dali::NativeImageSourcePtr nativeImageSource);
+DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateUrl(const Dali::NativeImageInterfacePtr nativeImageInterface, bool preMultiplied = false);
 
 /**
  * @brief Generate a Url from encoded image buffer.
@@ -88,6 +90,15 @@ DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateUrl(const Dali::NativeImageSour
  */
 DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateUrl(const Dali::EncodedImageBuffer encodedImageBuffer);
 
+/**
+ * @brief Generate a Url of depth texture from frame buffer.
+ * This Url can be used in visuals to render the frame buffer.
+ * This method does not check for duplicates, If same frame buffer is entered multiple times, a different URL is returned each time.
+ * @param[in] frameBuffer the frame buffer to converted to Url
+ * @return the ImageUrl representing this frame buffer
+ */
+DALI_TOOLKIT_API Dali::Toolkit::ImageUrl GenerateDepthUrl(const Dali::FrameBuffer frameBuffer);
+
 } // namespace Image
 
 } // namespace Toolkit
diff --git a/dali-toolkit/public-api/particle-system/particle-domain.cpp b/dali-toolkit/public-api/particle-system/particle-domain.cpp
new file mode 100644
index 0000000..135926a
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-domain.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/public-api/particle-system/particle-domain.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/particle-system/particle-domain-impl.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+ParticleDomain ParticleDomain::New()
+{
+  return {new Internal::ParticleDomain()};
+}
+
+ParticleDomain::ParticleDomain(Internal::ParticleDomain* impl)
+: Dali::BaseHandle(impl)
+{
+}
+
+ParticleDomain ParticleDomain::DownCast(BaseHandle handle)
+{
+  return {dynamic_cast<Internal::ParticleDomain*>(handle.GetObjectPtr())};
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-domain.h b/dali-toolkit/public-api/particle-system/particle-domain.h
new file mode 100644
index 0000000..b7b103d
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-domain.h
@@ -0,0 +1,79 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_DOMAIN_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_DOMAIN_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-types.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+#include <memory>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleDomain;
+}
+
+namespace Dali::Toolkit::ParticleSystem
+{
+
+/**
+ * @class ParticleDomain
+ *
+ * @brief ParticleDomain bounds simulation area to the specified region
+ */
+class DALI_TOOLKIT_API ParticleDomain : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  ParticleDomain() = default;
+
+  /**
+   * @brief Creates new ParticleDomain object
+   *
+   * @return New ParticleDomain object
+   */
+  static ParticleDomain New();
+
+  /**
+   * @brief Downcasts a handle to ParticleDomain handle.
+   *
+   * If handle points to an ParticleDomain object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle to An object
+   * @return handle to a ParticleDomain object or an uninitialized handle
+   */
+  static ParticleDomain DownCast(BaseHandle handle);
+
+private:
+  /// @cond internal
+  /**
+   * @brief This constructor is used by ParticleDomain::New() methods.
+   *
+   * @param [in] impl A pointer to a newly allocated implementation
+   */
+  ParticleDomain(Internal::ParticleDomain* impl);
+  /// @endcond
+};
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_DOMAIN_H
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-emitter.cpp b/dali-toolkit/public-api/particle-system/particle-emitter.cpp
new file mode 100644
index 0000000..e40f159
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-emitter.cpp
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/public-api/particle-system/particle-emitter.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/particle-system/particle-emitter-impl.h>
+#include <dali-toolkit/public-api/particle-system/particle-source.h>
+
+// EXTERNAL INCLUDES
+#include <utility>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+ParticleEmitter ParticleEmitter::New()
+{
+  return {new Dali::Toolkit::ParticleSystem::Internal::ParticleEmitter()};
+}
+
+ParticleEmitter ParticleEmitter::DownCast(BaseHandle handle)
+{
+  return {dynamic_cast<Internal::ParticleEmitter*>(handle.GetObjectPtr())};
+}
+
+void ParticleEmitter::SetSource(const ParticleSource& particleSource)
+{
+  GetImplementation(*this).SetSource(particleSource);
+}
+
+ParticleSource ParticleEmitter::GetSource() const
+{
+  return GetImplementation(*this).GetSource();
+}
+
+void ParticleEmitter::SetDomain(const ParticleDomain& particleDomain)
+{
+  GetImplementation(*this).SetDomain(particleDomain);
+}
+
+void ParticleEmitter::SetRenderer(const ParticleRenderer& particleRenderer)
+{
+  GetImplementation(*this).SetRenderer(particleRenderer);
+}
+
+void ParticleEmitter::SetParticleCount(uint32_t maxParticleCount)
+{
+  GetImplementation(*this).SetParticleCount(maxParticleCount);
+}
+
+uint32_t ParticleEmitter::GetParticleCount()
+{
+  return GetImplementation(*this).GetParticleCount();
+}
+
+ParticleDomain ParticleEmitter::GetDomain() const
+{
+  return GetImplementation(*this).GetDomain();
+}
+
+ParticleRenderer ParticleEmitter::GetRenderer() const
+{
+  return GetImplementation(*this).GetRenderer();
+}
+
+uint32_t ParticleEmitter::AddModifier(const ParticleModifier& particleModifier)
+{
+  return GetImplementation(*this).AddModifier(particleModifier);
+}
+
+ParticleModifier ParticleEmitter::GetModifierAt(uint32_t index)
+{
+  return GetImplementation(*this).GetModifierAt(index);
+}
+
+void ParticleEmitter::RemoveModifierAt(uint32_t index)
+{
+  return GetImplementation(*this).RemoveModifierAt(index);
+}
+
+void ParticleEmitter::AttachTo(Actor actor)
+{
+  GetImplementation(*this).AttachTo(std::move(actor));
+}
+
+ParticleEmitter::ParticleEmitter(Internal::ParticleEmitter* impl)
+: Dali::BaseHandle(impl)
+{
+}
+
+ParticleEmitter::Status ParticleEmitter::GetStatus() const
+{
+  return GetImplementation(*this).GetStatus();
+}
+
+ParticleList& ParticleEmitter::GetParticleList()
+{
+  return GetImplementation(*this).GetParticleList();
+}
+
+void ParticleEmitter::Start()
+{
+  GetImplementation(*this).Start();
+}
+
+void ParticleEmitter::Stop()
+{
+  GetImplementation(*this).Stop();
+}
+
+void ParticleEmitter::SetEmissionRate(uint32_t ratePerSecond)
+{
+  GetImplementation(*this).SetEmissionRate(ratePerSecond);
+}
+
+uint32_t ParticleEmitter::GetEmissionRate() const
+{
+  return GetImplementation(*this).GetEmissionRate();
+}
+
+[[maybe_unused]] void ParticleEmitter::EnableParallelProcessing(bool enabled)
+{
+  GetImplementation(*this).EnableParallelProcessing(enabled);
+}
+
+bool ParticleEmitter::IsParallelProcessingEnabled() const
+{
+  return GetImplementation(*this).IsParallelProcessingEnabled();
+}
+
+void ParticleEmitter::SetInitialParticleCount(uint32_t count)
+{
+  GetImplementation(*this).SetInitialParticleCount(count);
+}
+
+uint32_t ParticleEmitter::GetInitialParticleCount() const
+{
+  return GetImplementation(*this).GetInitialParticleCount();
+}
+
+void ParticleEmitter::SetActiveParticlesLimit(uint32_t count)
+{
+  GetImplementation(*this).SetActiveParticlesLimit(count);
+}
+
+uint32_t ParticleEmitter::GetActiveParticlesLimit() const
+{
+  return GetImplementation(*this).GetActiveParticlesLimit();
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
diff --git a/dali-toolkit/public-api/particle-system/particle-emitter.h b/dali-toolkit/public-api/particle-system/particle-emitter.h
new file mode 100644
index 0000000..dffa6e7
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-emitter.h
@@ -0,0 +1,343 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_EMITTER_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_EMITTER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-types.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/object/base-handle.h>
+#include <memory>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleEmitter;
+}
+
+namespace Dali::Toolkit::ParticleSystem
+{
+class ParticleSource;
+
+class ParticleDomain;
+
+class ParticleList;
+
+class ParticleModifier;
+
+class ParticleRenderer;
+
+/**
+ * @class ParticleEmitter
+ *
+ * ParticleEmitter manages a particle emission process. The primary function
+ * of the particle emitter class is to emit particles into a simulated environment.
+ *
+ * ParticleEmitter is responsible for:
+
+ * - Particle generation:
+ *
+ * The emitter generates particles with specific initial properties,
+ * such as position, velocity, size etc. It can create particles various ways which can be
+ * implemented by overriding ParticleSourceInterface. It may create particles in bursts, streams
+ * or in response to specific events. The ParticleSource must be set in order to generate particles
+ * in the system.
+ *
+ * - Particle simulation:
+ *
+ * The emitter updates state of each particle by invoking ParticleModifier stack. It updates particles
+ * over time to simulate desired behaviour. Particle modifiers may apply modifications to the system like
+ * applying forces (gravity, wind), integrating physics.
+ *
+ * The stack of modifiers is executed in order and output of previous modifier is an input of
+ * next one.
+ *
+ * At least one ParticleModifier must be set in order to update particle system and run
+ * the simulation.
+ *
+ * - Particle rendering
+ *
+ * ParticleRenderer must be set in order to render particles. The basic renderer renders only 2D billboard
+ * projected (always facing the camera) particles however the behaviour can be altered in order to render
+ * more complex systems.
+ *
+ * Rendering may be optimize for different graphics APIs.
+ *
+ * - Particle management
+ *
+ * The emitter manages the lifecycle of particles, including creation (via ParticleSource),
+ * update (via ParticleModifier stack) and removal (modifiers and specified lifetime of particles). It
+ * handles scenarios such as recycling particles that have reached the end of their lifespan, reusing them,
+ * or dynamically adjusting their properties based on the emitter's parameters or external factors.
+ *
+ * The particles are stored as ParticleList object which is generated internally. The emitter controls
+ * behaviour of the particle list.
+ *
+ * The basic components making the Particle System are:
+ * - ParticleEmitter - responsible for controlling the emission
+ * - ParticleSource - responsible for generating new particles in the system
+ * - ParticleModifier - responsible for altering the behaviour of particles (updates) and controlling the lifetime
+ * - ParticleRenderer - responsible for rendering the particle system
+ * - ParticleList - storage for particle data
+ * - Particle - view on a selected particle data
+ * - ParticleDomain - the domain of particle system (area/volume) that particle system is bound within
+ *
+ */
+class DALI_TOOLKIT_API ParticleEmitter : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Enum describing status of emitter
+   */
+  enum class Status
+  {
+    INCOMPLETE, ///< Status set when not all data is set in order to run simulation
+    READY,      ///< Emitter ready (fully set up)
+    STARTED,    ///< Emitter started
+    PAUSED,     ///< Emitter paused
+    STOPPED     ///< Emitter stopped
+  };
+
+  /**
+   * @brief Creates new ParticleEmitter
+   *
+   * Function creates new ParticleEmitter object with given initial specification.
+   *
+   * @return valid emitter object
+   */
+  static ParticleEmitter New();
+
+  /**
+   * @brief Downcasts a handle to ParticleEmitter handle.
+   *
+   * If handle points to an ParticleEmitter object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle to An object
+   * @return handle to a ParticleEmitter object or an uninitialized handle
+   */
+  static ParticleEmitter DownCast(BaseHandle handle);
+
+  /**
+   * @brief Enables parallel processing on the CPU
+   *
+   * This flag gives a hint to attached ParticleSystem objects to use
+   * multiple threads if possible.
+   *
+   * Setting this hint may have no effect after the particle system started
+   * simulation. It should be set before calling Start() function.
+   *
+   * @param[in] enabled if True it will try to use MT
+   */
+  void EnableParallelProcessing(bool enabled);
+
+  /**
+   * @brief Tests whether parallel processing is enabled
+   *
+   * @return True if parallel processing mode is enabled.
+   */
+  [[nodiscard]] bool IsParallelProcessingEnabled() const;
+
+  /**
+   * @brief Sets emitter source
+   *
+   * ParticleSource represents objects responsible for emitting
+   * new particles as well as reusing expired particles.
+   *
+   * @param[in] particleSource valid particle emitter source object
+   *
+   */
+  void SetSource(const ParticleSource& particleSource);
+
+  /**
+   * @brief Returns currently used particle emitter source
+   *
+   * @return Handle to the ParticleSource object
+   */
+  [[nodiscard]] ParticleSource GetSource() const;
+
+  /**
+   * @brief Sets emitter domain
+   *
+   * ParticleDomain encloses the area of particle emission.
+   *
+   * @param[in] particleDomain valid particle emitter domain
+   */
+  void SetDomain(const ParticleDomain& particleDomain);
+
+  /**
+   * @brief Sets emitter domain
+   *
+   * ParticleRenderer provides implementation for rendering set of particles
+   *
+   * @param[in] particleRenderer a valid instance of ParticleRenderer
+   */
+  void SetRenderer(const ParticleRenderer& particleRenderer);
+
+  /**
+   * @brief Sets maximum particle count in the system
+   *
+   * This value is mutable but changing number of particles will
+   * force regenerating the whole system data!
+   *
+   * @param[in] maxParticleCount maximum number of particles in the system
+   */
+  void SetParticleCount(uint32_t maxParticleCount);
+
+  /**
+   * @brief Returns maximum number of particles in the system
+   *
+   * @return Maximum number of particles
+   */
+  uint32_t GetParticleCount();
+
+  /**
+   * @brief Returns currently used particle emitter domain
+   *
+   * @return Handle to the ParticleDomain object
+   */
+  [[nodiscard]] ParticleDomain GetDomain() const;
+
+  /**
+   * @brief Returns currently used particle emitter renderer
+   *
+   * @return Handle to the ParticleRenderer object
+   */
+  [[nodiscard]] ParticleRenderer GetRenderer() const;
+
+  /**
+   * @brief Attaches particle system to an actor
+   *
+   * @param[in] actor actor to attach the particle system
+   */
+  void AttachTo(Actor actor);
+
+  /**
+   * @brief Adds new modifier
+   * @param[in] particleMmodifier valid ParticleModifier object
+   *
+   * @return Index into the modifier stack associated with added modifier
+   */
+  uint32_t AddModifier(const ParticleModifier& particleMmodifier);
+
+  /**
+   * @brief Sets particle emission rate per second
+   *
+   * @param[in] ratePerSecond maximum number of particles emitted per second
+   */
+  void SetEmissionRate(uint32_t ratePerSecond);
+
+  /**
+   * @brief Returns emission rate per second
+   *
+   * @return Value of emission rate
+   */
+  [[nodiscard]] uint32_t GetEmissionRate() const;
+
+  /**
+   * @brief number of particles to be emitted on start of the emitter
+   *
+   * @param[in] count Initial count of particles in the system
+   */
+  void SetInitialParticleCount(uint32_t count);
+
+  /**
+   * @brief returns number of particles being emitted on start of the emitter
+   *
+   * @return number of particles
+   */
+  [[nodiscard]] uint32_t GetInitialParticleCount() const;
+
+  /**
+   * @brief Sets maximum number of particles alive
+   *
+   * This function limits number of active particles in the system.
+   *
+   * If set to 0, there is no limit.
+   *
+   * If set to non-zero, if the system reaches limit, no new particles
+   * will spawn until some of them die.
+   *
+   * @param[in] count Limit of active particles
+   */
+  void SetActiveParticlesLimit(uint32_t count);
+
+  /**
+   * @brief Returns active particles limit
+   *
+   * @return Number of active particles system is limited to
+   */
+  [[nodiscard]] uint32_t GetActiveParticlesLimit() const;
+
+  /**
+   * @brief Returns modifier in stack
+   *
+   * @param[in] index Index of modifier
+   * @return Returns valid pointer to the modifier or nullptr
+   */
+  ParticleModifier GetModifierAt(uint32_t index);
+
+  /**
+   * @brief Removes modifier at specified index
+   *
+   * @param[in] index of modifier to be removed
+   */
+  void RemoveModifierAt(uint32_t index);
+
+  /**
+   * @brief Returns ParticleList object
+   *
+   * @return Valid reference to the ParticleList
+   */
+  ParticleList& GetParticleList();
+
+  /**
+   * @brief Starts emitting particles
+   */
+  void Start();
+
+  /**
+   * @brief Stops emitting particles
+   */
+  void Stop();
+
+  /**
+   * @brief Returns current emitter status
+   *
+   * @return Current emitter status
+   */
+  [[nodiscard]] Status GetStatus() const;
+
+  /**
+   * @brief Constructor
+   */
+  ParticleEmitter() = default;
+
+private:
+  /// @cond internal
+  /**
+   * @brief This constructor is used by ParticleEmitter::New() methods.
+   *
+   * @param [in] impl A pointer to a newly allocated implementation
+   */
+  ParticleEmitter(Dali::Toolkit::ParticleSystem::Internal::ParticleEmitter* impl);
+  /// @endcond
+};
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_EMITTER_H
diff --git a/dali-toolkit/public-api/particle-system/particle-list.cpp b/dali-toolkit/public-api/particle-system/particle-list.cpp
new file mode 100644
index 0000000..88cdf80
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-list.cpp
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/internal/particle-system/particle-list-impl.h>
+#include <dali-toolkit/public-api/particle-system/particle-list.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<Vector3>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT3;
+}
+
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<Vector4>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT4;
+}
+
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<Vector2>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT2;
+}
+
+template<>
+ParticleStream::StreamDataType StreamDataTypeWrapper<float>::GetType()
+{
+  return ParticleStream::StreamDataType::FLOAT;
+}
+
+ParticleList ParticleList::New(uint32_t capacity, const ParticleStreamTypeFlags& defaultStreams)
+{
+  return {new ParticleSystem::Internal::ParticleList(capacity, defaultStreams)};
+}
+
+ParticleList ParticleList::DownCast(BaseHandle handle)
+{
+  return {dynamic_cast<Internal::ParticleList*>(handle.GetObjectPtr())};
+}
+
+uint32_t ParticleList::AddStream(void* defaults, size_t dataTypeSize, ParticleStream::StreamDataType dataType, bool localStream)
+{
+  return GetImplementation(*this).AddStream(dataTypeSize, defaults, dataType, "", localStream);
+}
+
+void* ParticleList::GetRawStream(uint32_t streamIndex)
+{
+  return GetImplementation(*this).GetRawStream(streamIndex);
+}
+
+void* ParticleList::GetDefaultStream(ParticleStreamTypeFlagBit streamBit)
+{
+  return GetImplementation(*this).GetDefaultStream(streamBit);
+}
+
+uint32_t ParticleList::GetActiveParticleCount()
+{
+  return GetImplementation(*this).GetActiveParticleCount();
+}
+
+ParticleList::ParticleList(Dali::Toolkit::ParticleSystem::Internal::ParticleList* impl)
+: Dali::BaseHandle(impl)
+{
+}
+
+uint32_t ParticleList::GetCapacity() const
+{
+  return GetImplementation(*this).GetParticleCount();
+}
+
+Particle ParticleList::NewParticle(float lifetime)
+{
+  return GetImplementation(*this).NewParticle(lifetime);
+}
+
+uint32_t ParticleList::GetParticleDataSize(bool includeLocalStreams)
+{
+  return GetImplementation(*this).GetStreamElementSize(includeLocalStreams);
+}
+
+int ParticleList::GetDefaultStreamIndex(ParticleStreamTypeFlagBit defaultStreamBit)
+{
+  return GetImplementation(*this).GetDefaultStreamIndex(defaultStreamBit);
+}
+
+std::list<Particle>& ParticleList::GetActiveParticles()
+{
+  return GetImplementation(*this).GetParticles();
+}
+
+ParticleList::ParticleList() = default;
+
+} // namespace Dali::Toolkit::ParticleSystem
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-list.h b/dali-toolkit/public-api/particle-system/particle-list.h
new file mode 100644
index 0000000..7fea6b6
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-list.h
@@ -0,0 +1,281 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_LIST_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_LIST_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/list-wrapper.h>
+#include <dali/public-api/object/base-handle.h>
+#include <cinttypes>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleList;
+}
+
+namespace Dali::Toolkit::ParticleSystem
+{
+/**
+ * The function is a wrapper needed to retrieve data type enum through template
+ */
+template<class T>
+struct StreamDataTypeWrapper
+{
+  static ParticleStream::StreamDataType GetType()
+  {
+    return {};
+  }
+};
+
+/**
+ * @class ParticleList
+ *
+ * ParticleList defines a storage or a partial view on an existing storage of particle-related data.
+ *
+ * ParticleList contains streams of data (properties) laid out independently (non-interleaved).
+ *
+ * The layout is more optimal for:
+ * - parallel processing
+ * - data-oriented processing (CPU-cache friendly)
+ * - adding custom streams of data (for example, physics properties)
+ *
+ * Some streams are being added automatically by the emitter when certain modifiers are being added.
+ * If the modifier requires particular data it the emitter will update the list with proper stream.
+ *
+ * There are several built-in streams defined:
+ * - POSITION
+ * - VELOCITY
+ * - COLOR
+ * - OPACITY
+ * - SIZE
+ *
+ * The New() function allows adding streams upon creation.
+ *
+ * Custom streams may be used by custom renderers, modifiers and sources but also may play
+ * a role of temporary storage space when it comes to computing particle parameters.
+ *
+ * Represents all or subset of group of particles
+ */
+class DALI_TOOLKIT_API ParticleList : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  ParticleList();
+
+  /**
+   * @brief Bit flags grouping built-in particle streams by type
+   */
+  struct ParticleStreamTypeFlags
+  {
+    ParticleStreamTypeFlags(const ParticleStreamTypeFlags& flags)
+    {
+      value = flags.value;
+    }
+
+    ParticleStreamTypeFlags(const ParticleStreamTypeFlagBit& bit)
+    : value(bit)
+    {
+    }
+
+    ParticleStreamTypeFlags& operator|=(ParticleStreamTypeFlagBit flagBit)
+    {
+      value |= flagBit;
+      return *this;
+    }
+
+    ParticleStreamTypeFlags operator&(ParticleStreamTypeFlagBit flagBit)
+    {
+      return (value & flagBit);
+    }
+
+    explicit operator uint32_t() const
+    {
+      return value;
+    }
+
+    explicit operator bool() const
+    {
+      return value;
+    }
+
+    uint32_t value;
+  };
+
+  /**
+   * @brief Creates new ParticleList
+   *
+   * ParticleList is a storage object that contains data for particle system
+   * layouted as an array of streams.
+   *
+   * Stream may contain data like position, velocity, etc.
+   *
+   * When new ParticleList is created the default streams can be pre-allocated.
+   *
+   * @param[in] capacity Maximum capacity (number of particles in the system)
+   * @param[in] defaultStreams Default data streams to pre-allocate
+   */
+  static ParticleList New(uint32_t capacity, const ParticleStreamTypeFlags& defaultStreams);
+
+  /**
+   * @brief Downcasts a handle to ParticleList handle.
+   *
+   * If handle points to an ParticleList object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle to An object
+   * @return handle to a ParticleList object or an uninitialized handle
+   */
+  static ParticleList DownCast(BaseHandle handle);
+
+  /**
+   * @brief Registers new data-stream with given unique identifier
+   *
+   * @tparam T Type of data stored in the stream
+   * @param[in] defaults Default value of the stream uninitialized data
+   *
+   * Streams added using AddStream() function are automatically passed into
+   * the shader program as input attributes.
+   *
+   * If there is no need for the stream to be used as a shader attribute
+   * then use AddLocalStream() instead.
+   *
+   * @return Returns index of an allocated data stream
+   */
+  template<class T>
+  inline uint32_t AddStream(T defaults)
+  {
+    return AddStream(&defaults, StreamDataTypeWrapper<T>::GetType(), sizeof(T), false);
+  }
+
+  /**
+   * @brief Adds local data stream
+   *
+   * @tparam T Type of data stored in the stream
+   * @param[in] defaults Default value of the stream
+   *
+   * @return Returns index of newly allocated data stream
+   */
+  template<class T>
+  inline uint32_t AddLocalStream(T defaults)
+  {
+    return AddStream(&defaults, sizeof(T), StreamDataTypeWrapper<T>::GetType(), true);
+  }
+
+  template<class T>
+  T* GetStream(uint32_t streamIndex)
+  {
+    return reinterpret_cast<T*>(GetRawStream(streamIndex));
+  }
+
+  template<class T>
+  T* GetDefaultStream(ParticleStreamTypeFlagBit streamFlagBit)
+  {
+    return reinterpret_cast<T*>(GetDefaultStream(streamFlagBit));
+  }
+
+  /**
+   * @brief Returns size of list including only active particles
+   *
+   * @return
+   */
+  uint32_t GetActiveParticleCount();
+
+  /**
+   * @brief Returns capacity of particle list
+   */
+  [[nodiscard]] uint32_t GetCapacity() const;
+
+  /**
+   * Creates new particle in the list with specified lifetime
+   *
+   * @param[in] lifetime Expected lifetime of new particle (0.0f - lives forever)
+   * @return index into data streams
+   */
+  Particle NewParticle(float lifetime);
+
+  /**
+   * @brief Returns internal data size of streams
+   *
+   * @param[in] includeLocalStreams If true, the size will include local streams
+   * @return Size of data structure
+   */
+  uint32_t GetParticleDataSize(bool includeLocalStreams);
+
+  /**
+   * @brief Returns index associated with specified default stream
+   *
+   * @param[in] defaultStreamBit Default stream bit
+   * @return Returns a valid index or -1 on error.
+   */
+  int GetDefaultStreamIndex(ParticleStreamTypeFlagBit defaultStreamBit);
+
+  std::list<Particle>& GetActiveParticles();
+
+private:
+  /// @cond internal
+  /**
+   * @brief Adds new data stream to the list
+   *
+   * @param[in] defaults Default values to fill the stream with
+   * @param[in] dataTypeSize size of stored data type
+   * @param[in] dataType Stream data type
+   * @param[in] localStream Flag indicating whether stream is local (not used in shaders) or not
+   * @return Index of new stream
+   */
+  uint32_t
+  AddStream(void* defaults, size_t dataTypeSize, ParticleStream::StreamDataType dataType, bool localStream);
+  /// @endcond
+
+  /// @cond internal
+  /**
+   * @brief Returns raw data pointer to the stream at given index
+   *
+   * @param[in] streamIndex Stream index
+   *
+   * @return Valid data pointer or nullptr if index invalid
+   */
+  void* GetRawStream(uint32_t streamIndex);
+  /// @endcond
+
+  /// @cond internal
+  /**
+   * @brief Returns raw data stream of a default (built-in) stream
+   * @param[in] streamBit Bit (ParticleStreamTypeFlagBit) representing the stream
+   *
+   * @return Returns valid pointer to the data or nullptr if stream hasn't been used
+   */
+  void* GetDefaultStream(ParticleStreamTypeFlagBit streamBit);
+  /// @endcond
+
+  /// @cond internal
+  /**
+   * @brief This constructor is used by ParticleList::New() methods.
+   *
+   * @param [in] impl A pointer to a newly allocated implementation
+   */
+  ParticleList(Dali::Toolkit::ParticleSystem::Internal::ParticleList* impl);
+  /// @endcond
+};
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif
diff --git a/dali-toolkit/public-api/particle-system/particle-modifier.cpp b/dali-toolkit/public-api/particle-system/particle-modifier.cpp
new file mode 100644
index 0000000..9542289
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-modifier.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <memory>
+
+#include <dali-toolkit/internal/particle-system/particle-modifier-impl.h>
+#include <dali-toolkit/public-api/particle-system/particle-modifier.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+ParticleModifier ParticleModifier::New(std::unique_ptr<ParticleModifierInterface>&& modifierUpdater)
+{
+  return {new Internal::ParticleModifier(std::move(modifierUpdater))};
+}
+
+ParticleModifier::ParticleModifier(Internal::ParticleModifier* impl)
+: Dali::BaseHandle(impl)
+{
+}
+
+ParticleModifier ParticleModifier::DownCast(BaseHandle handle)
+{
+  return {dynamic_cast<Internal::ParticleModifier*>(handle.GetObjectPtr())};
+}
+
+ParticleModifierInterface& ParticleModifier::GetModifierCallback()
+{
+  return GetImplementation(*this).GetUpdater();
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-modifier.h b/dali-toolkit/public-api/particle-system/particle-modifier.h
new file mode 100644
index 0000000..1769d57
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-modifier.h
@@ -0,0 +1,146 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_MODIFIER_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_MODIFIER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-types.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/callback.h>
+#include <memory>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleModifier;
+}
+
+namespace Dali::Toolkit::ParticleSystem
+{
+class ParticleEmitter;
+
+class ParticleList;
+
+class DALI_TOOLKIT_API ParticleModifierInterface
+{
+public:
+  /**
+   * @brief Destructor
+   */
+  virtual ~ParticleModifierInterface() = default;
+
+  /**
+   * @brief Update function to update the modifier to alter the behavior of particles.
+   * @param[in] particleList       List of particles
+   * @param[in] firstParticleIndex Index of the first particle
+   * @param[in] particleCount      Number of particles
+   */
+  virtual void Update(ParticleList& particleList, uint32_t firstParticleIndex, uint32_t particleCount) = 0;
+
+  /**
+   * @brief Will be called to check whether modifier supports multi-threading
+   *
+   * If modifier supports multi-threading then Update() function will be called
+   * providing partial range of particles to process.
+   *
+   * It is important to make sure, the batch of particles has no dependencies
+   * on particles from outside the batch. If this is the case, the function
+   * must return false and single threaded process will proceed.
+   *
+   * @return True if modifier supports multi-threading
+   */
+  virtual bool IsMultiThreaded()
+  {
+    return false;
+  }
+};
+
+/**
+ * @class ParticleModifier
+ *
+ * @brief ParticleModifer allows altering particle behaviour during simulation.
+ *
+ * Multiple modifiers can be used in the modifier stack.
+ *
+ * Output of previous modifier becomes an input of the next one.
+ *
+ */
+class DALI_TOOLKIT_API ParticleModifier : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  ParticleModifier() = default;
+
+  /**
+   * @brief Destructor
+   */
+  ~ParticleModifier() = default;
+
+  /**
+   * @brief Creates new modifier with given functor object.
+   * The modifier takes over the ownership over the functor object.
+   *
+   * @param[in] modifierUpdater Functor for the modifier
+   * @return New ParticleModifier object
+   */
+  static ParticleModifier New(std::unique_ptr<ParticleModifierInterface>&& modifierUpdater);
+
+  /**
+   * @brief Creates new modifier with given class and construction arguments
+   *
+   * @return New ParticleModifier object
+   */
+  template<class T, class... Args>
+  static ParticleModifier New(Args... args)
+  {
+    return New(std::move(std::make_unique<T>(args...)));
+  }
+  /**
+   * @brief Returns associated particle modifier callback
+   *
+   * @return Valid reference to associated callback
+   */
+  ParticleModifierInterface& GetModifierCallback();
+
+  /**
+   * @brief Downcasts a handle to ParticleModifier handle.
+   *
+   * If handle points to an ParticleModifier object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle to An object
+   * @return handle to a ParticleModifier object or an uninitialized handle
+   */
+  static ParticleModifier DownCast(BaseHandle handle);
+
+private:
+  /// @cond internal
+  /**
+   * @brief This constructor is used by ParticleModifier::New() methods.
+   *
+   * @param [in] impl A pointer to a newly allocated implementation
+   */
+  ParticleModifier(Internal::ParticleModifier* impl);
+  /// @endcond
+};
+
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif
diff --git a/dali-toolkit/public-api/particle-system/particle-renderer.cpp b/dali-toolkit/public-api/particle-system/particle-renderer.cpp
new file mode 100644
index 0000000..c73949f
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-renderer.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/internal/particle-system/particle-renderer-impl.h>
+#include <dali-toolkit/public-api/particle-system/particle-renderer.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+ParticleRenderer ParticleRenderer::New()
+{
+  return {new Internal::ParticleRenderer()};
+}
+
+ParticleRenderer::ParticleRenderer(Internal::ParticleRenderer* impl)
+: Dali::BaseHandle(impl)
+{
+}
+
+void ParticleRenderer::SetTexture(const Dali::Texture& texture)
+{
+  GetImplementation(*this).SetTexture(texture);
+}
+
+void ParticleRenderer::SetBlendingMode(BlendingMode blendingMode)
+{
+  GetImplementation(*this).SetBlendingMode(blendingMode);
+}
+
+BlendingMode ParticleRenderer::GetBlendingMode() const
+{
+  return GetImplementation(*this).GetBlendingMode();
+}
+
+ParticleRenderer ParticleRenderer::DownCast(BaseHandle handle)
+{
+  return {dynamic_cast<Internal::ParticleRenderer*>(handle.GetObjectPtr())};
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-renderer.h b/dali-toolkit/public-api/particle-system/particle-renderer.h
new file mode 100644
index 0000000..8474c54
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-renderer.h
@@ -0,0 +1,105 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_RENDERER_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_RENDERER_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-types.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/callback.h>
+#include <memory>
+
+namespace Dali
+{
+class Texture;
+}
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleRenderer;
+}
+
+namespace Dali::Toolkit::ParticleSystem
+{
+/**
+ * @brief Blending modes for particle renderer
+ */
+enum class DALI_TOOLKIT_API BlendingMode
+{
+  ADDITIVE, ///< Additive blending mode (default)
+  DEFAULT = ADDITIVE,
+  SCREEN ///< SCREEN mode, Advanced blending support required
+};
+
+class DALI_TOOLKIT_API ParticleRenderer : public Dali::BaseHandle
+{
+public:
+  ParticleRenderer() = default;
+
+  /**
+   * @brief Creates new instance of basic 2D renderer
+   *
+   * @return Valid instance of renderer
+   */
+  static ParticleRenderer New();
+
+  /**
+   * @brief Sets blending mode for the renderer
+   *
+   * @param[in] blendingMode Valid particle blending mode to be used
+   */
+  void SetBlendingMode(BlendingMode blendingMode);
+
+  /**
+   * @brief Sets blending mode for the renderer
+   *
+   * @return Current blending mode
+   */
+  BlendingMode GetBlendingMode() const;
+
+  /**
+   * @brief Sets renderable as a 2D texture (sprites)
+   *
+   * @param[in] texture Valid texture
+   */
+  void SetTexture(const Dali::Texture& texture);
+
+  /**
+   * @brief Downcasts a handle to ParticleRenderer handle.
+   *
+   * If handle points to an ParticleRenderer object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle to An object
+   * @return handle to a ParticleRenderer object or an uninitialized handle
+   */
+  static ParticleRenderer DownCast(BaseHandle handle);
+
+private:
+  /// @cond internal
+  /**
+   * @brief This constructor is used by ParticleRenderer::New() methods.
+   *
+   * @param [in] impl A pointer to a newly allocated implementation
+   */
+  ParticleRenderer(Internal::ParticleRenderer* impl);
+  /// @endcond
+};
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_RENDERER_H
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-source.cpp b/dali-toolkit/public-api/particle-system/particle-source.cpp
new file mode 100644
index 0000000..3051b1d
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-source.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/internal/particle-system/particle-source-impl.h>
+#include <dali-toolkit/public-api/particle-system/particle-source.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+
+ParticleSource ParticleSource::New(std::unique_ptr<ParticleSourceInterface>&& sourceUpdater)
+{
+  return {new Internal::ParticleSource(std::move(sourceUpdater))};
+}
+
+ParticleSource::ParticleSource(Internal::ParticleSource* impl)
+: Dali::BaseHandle(impl)
+{
+}
+
+ParticleSource ParticleSource::DownCast(BaseHandle handle)
+{
+  return {dynamic_cast<Internal::ParticleSource*>(handle.GetObjectPtr())};
+}
+
+ParticleSourceInterface& ParticleSource::GetSourceCallback() const
+{
+  return GetImplementation(*this).GetUpdater();
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-source.h b/dali-toolkit/public-api/particle-system/particle-source.h
new file mode 100644
index 0000000..d2578a0
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-source.h
@@ -0,0 +1,149 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_SOURCE_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_SOURCE_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/callback.h>
+#include <memory>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-types.h>
+
+namespace Dali::Toolkit::ParticleSystem::Internal
+{
+class ParticleSource;
+}
+
+namespace Dali::Toolkit::ParticleSystem
+{
+class ParticleEmitter;
+
+class ParticleList;
+
+class ParticleDomain;
+
+class ParticleModifier;
+
+class ParticleRenderer;
+
+/**
+ * @brief Interface to override as a particle source
+ *
+ * ParticleSourceInterace allows altering behaviour for
+ * generating new particles.
+ */
+class DALI_TOOLKIT_API ParticleSourceInterface
+{
+public:
+  /**
+   * @brief Adds new particles
+   * @param[in] outList List to write back
+   * @param[in] count Requested particles count
+   *
+   * @return Function should return a Number of emitted particles
+   */
+  virtual uint32_t Update(ParticleList& outList, uint32_t count) = 0;
+
+  /**
+   * @brief Called when source is added to the emitter
+   */
+  virtual void Init() = 0;
+};
+
+/**
+ * @class ParticleSource
+ *
+ * ParticleSource defines a logic associated with particles emission.
+ * The emitter will use ParticleSource in order to spawn new particles.
+ *
+ * ParticleSource manages how, where and how many particles to emit.
+ *
+ * ParticleSource uses an implementation of ParticleSourceInterface when
+ * emitting new particles.
+ */
+class DALI_TOOLKIT_API ParticleSource : public Dali::BaseHandle
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  ParticleSource() = default;
+
+  /**
+   * @brief Destructor
+   */
+  ~ParticleSource() = default;
+
+  /**
+   * @brief Creates a new instance of ParticleSource
+   *
+   * New instance is given an ownership over valid implementation
+   * of a ParticleSourceInferface.
+   *
+   * @param[in] particleSourceCallback Valid implementation of ParticleSourceInterface
+   *
+   * @return New ParticleSource object handle
+   */
+  static ParticleSource New(std::unique_ptr<ParticleSourceInterface>&& particleSourceCallback);
+
+  /**
+   * @brief Creates new ParticleSource with given source callback and arguments
+   *
+   * The function creates a ParticleSource of a given class (T) and constructor
+   * arguments.
+   *
+   * @return New ParticleSource object handle
+   */
+  template<class T, class... Args>
+  static ParticleSource New(Args... args)
+  {
+    return New(std::move(std::make_unique<T>(args...)));
+  }
+
+  /**
+   * @brief Downcasts a handle to ParticleSource handle.
+   *
+   * If handle points to an ParticleSource object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle to An object
+   * @return handle to a ParticleSource object or an uninitialized handle
+   */
+  static ParticleSource DownCast(BaseHandle handle);
+
+  /**
+   * @brief Returns associated particle source callback
+   *
+   * @return Valid reference to associated callback
+   */
+  [[nodiscard]] ParticleSourceInterface& GetSourceCallback() const;
+
+private:
+  /// @cond internal
+  /**
+   * @brief This constructor is used by ParticleSource::New() methods.
+   *
+   * @param [in] impl A pointer to a newly allocated implementation
+   */
+  ParticleSource(Internal::ParticleSource* impl);
+  /// @endcond
+};
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_SOURCE_H
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle-types.h b/dali-toolkit/public-api/particle-system/particle-types.h
new file mode 100644
index 0000000..506241b
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle-types.h
@@ -0,0 +1,61 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_TYPES_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_TYPES_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL_INCLUDES
+#include <cinttypes>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+using ParticleStreamTypeFlagBit = uint32_t;
+
+namespace ParticleStream
+{
+constexpr ParticleStreamTypeFlagBit POSITION_STREAM_BIT      = 1 << 0; ///< 3D Position stream
+constexpr ParticleStreamTypeFlagBit ROTATION_STREAM_BIT      = 1 << 1; ///< 3D Rotation stream
+constexpr ParticleStreamTypeFlagBit SCALE_STREAM_BIT         = 1 << 2; ///< 3D Scale stream
+constexpr ParticleStreamTypeFlagBit SIZE_STREAM_BIT          = 1 << 3;
+constexpr ParticleStreamTypeFlagBit COLOR_STREAM_BIT         = 1 << 4;
+constexpr ParticleStreamTypeFlagBit OPACITY_STREAM_BIT       = 1 << 5;
+constexpr ParticleStreamTypeFlagBit VELOCITY_STREAM_BIT      = 1 << 6;
+constexpr ParticleStreamTypeFlagBit LIFETIME_STREAM_BIT      = 1 << 7;
+constexpr ParticleStreamTypeFlagBit LIFETIME_BASE_STREAM_BIT = 1 << 8;
+constexpr ParticleStreamTypeFlagBit ALL_STREAMS              = 255;
+constexpr ParticleStreamTypeFlagBit DEFAULT_STREAMS          = 255; ///< Default streams
+
+/**
+ * Stream data types
+ */
+enum class StreamDataType
+{
+  FLOAT,
+  FLOAT2,
+  FLOAT3,
+  FLOAT4,
+  INT,
+  INT2,
+  INT3,
+  INT4
+};
+
+} // namespace ParticleStream
+} // namespace Dali::Toolkit::ParticleSystem
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_TYPES_H
\ No newline at end of file
diff --git a/dali-toolkit/public-api/particle-system/particle.cpp b/dali-toolkit/public-api/particle-system/particle.cpp
new file mode 100644
index 0000000..d94cbae
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/particle-system/particle-impl.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+
+Particle Particle::DownCast(BaseHandle handle)
+{
+  return {dynamic_cast<Internal::Particle*>(handle.GetObjectPtr())};
+}
+
+void* Particle::Get(ParticleStreamTypeFlagBit streamBit)
+{
+  return GetImplementation(*this).Get(streamBit);
+}
+
+void* Particle::GetByIndex(uint32_t streamIndex)
+{
+  return GetImplementation(*this).GetByIndex(streamIndex);
+}
+
+Particle::Particle(Dali::Toolkit::ParticleSystem::Internal::Particle* impl)
+: Dali::BaseHandle(impl)
+{
+}
+
+uint32_t Particle::GetIndex() const
+{
+  return GetImplementation(*this).GetIndex();
+}
+
+} // namespace Dali::Toolkit::ParticleSystem
diff --git a/dali-toolkit/public-api/particle-system/particle.h b/dali-toolkit/public-api/particle-system/particle.h
new file mode 100644
index 0000000..641ef71
--- /dev/null
+++ b/dali-toolkit/public-api/particle-system/particle.h
@@ -0,0 +1,142 @@
+#ifndef DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_H
+#define DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_H
+/*
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/particle-system/particle-types.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>
+
+namespace Dali::Toolkit::ParticleSystem
+{
+namespace Internal
+{
+class Particle;
+}
+
+/**
+ * @class Particle
+ *
+ * Particle represents a single instance of a particle in the particle system.
+ *
+ * Particle provides a simple interface that allows R/W access to selected data stream and
+ * allows ignoring a placement of the particle data within the stream (Particle serves as a
+ * view on particular data within a stream).
+ */
+class DALI_TOOLKIT_API Particle : public BaseHandle
+{
+public:
+  /**
+   * @brief Constructor
+   */
+  Particle() = default;
+
+  /**
+   * @brief Downcasts a handle to Particle handle.
+   *
+   * If handle points to an Particle object, the downcast produces valid handle.
+   * If not, the returned handle is left uninitialized.
+   *
+   * @param[in] handle to An object
+   * @return handle to a Particle object or an uninitialized handle
+   */
+  static Particle DownCast(BaseHandle handle);
+
+  /**
+   * @brief Returns writeable reference to the data for specified stream
+   *
+   * The ParticleStreamTypeFlagBit allows accessing only pre-defined streams
+   * defined by the ParticleSystem. For custom streams GetByIndex() should be used.
+   *
+   * @tparam T type of data
+   * @param[in] streamBit Stream to access data from
+   * @return Reference to the data value
+   */
+  template<class T>
+  T& Get(ParticleStreamTypeFlagBit streamBit)
+  {
+    return *reinterpret_cast<T*>(Get(streamBit));
+  }
+
+  /**
+   * @brief Returns writeable reference to the data for a stream specified by stream index.
+   *
+   * This function allows accessing builtin streams as well as custom ones. The index of a custom
+   * stream should be stored upon creation.
+   *
+   * @tparam T type of data
+   * @param[in] streamIndex Index of stream in the emitter
+   * @return Reference to the data value
+   */
+  template<class T>
+  T& GetByIndex(uint32_t streamIndex)
+  {
+    return *reinterpret_cast<T*>(GetByIndex(streamIndex));
+  }
+
+  /**
+   * @brief Returns an index of particle within emitter data streams.
+   *
+   * @return Index of particle
+   */
+  [[nodiscard]] uint32_t GetIndex() const;
+
+public:
+  /// @cond internal
+  /**
+   * @brief This constructor is used by Particle::New() methods.
+   *
+   * @param [in] impl A pointer to a newly allocated implementation
+   */
+  Particle(Dali::Toolkit::ParticleSystem::Internal::Particle* impl);
+  /// @endcond
+
+private:
+  /// @cond internal
+  /**
+   * @brief Returns pointer to the value
+   *
+   *
+   * The ParticleStreamTypeFlagBit allows accessing only pre-defined streams
+   * defined by the ParticleSystem. For custom streams GetByIndex() should be used.
+   *
+   * @param[in] streamBit Stream to access data from
+   *
+   * @return void* to the memory within stream that stores the data
+   */
+  void* Get(ParticleStreamTypeFlagBit streamBit);
+  /// @endcond
+
+  /// @cond internal
+  /**
+   * @brief Returns writeable reference to the data for a stream specified by stream index.
+   *
+   * This function allows accessing builtin streams as well as custom ones. The index of a custom
+   * stream should be stored upon creation.
+   *
+   * @param[in] streamIndex Index of stream in the emitter
+   *
+   * @return void* to the memory within stream that stores the data
+   */
+  void* GetByIndex(uint32_t streamIndex);
+  /// @endcond
+};
+} // namespace Dali::Toolkit::ParticleSystem
+
+#endif // DALI_TOOLKIT_PARTICLE_SYSTEM_PARTICLE_H
\ No newline at end of file
diff --git a/dali-toolkit/public-api/text/text-enumerations.h b/dali-toolkit/public-api/text/text-enumerations.h
index 39918c1..e5b7fbe 100644
--- a/dali-toolkit/public-api/text/text-enumerations.h
+++ b/dali-toolkit/public-api/text/text-enumerations.h
@@ -109,6 +109,24 @@ enum Mode
 
 } // namespace LineWrap
 
+/**
+ * @brief The available underline types for text.
+ * @SINCE_1_2.60
+ */
+namespace Underline
+{
+/**
+ * @brief Enumerations specifying the underline type.
+ */
+enum Type
+{
+  SOLID,
+  DASHED,
+  DOUBLE
+};
+
+} // namespace UnderlineType
+
 } // namespace Text
 
 /**
diff --git a/dali-toolkit/public-api/transition/fade-transition.cpp b/dali-toolkit/public-api/transition/fade-transition.cpp
index 9d08185..806ab16 100644
--- a/dali-toolkit/public-api/transition/fade-transition.cpp
+++ b/dali-toolkit/public-api/transition/fade-transition.cpp
@@ -50,9 +50,9 @@ FadeTransition::FadeTransition(const FadeTransition& handle) = default;
 
 FadeTransition& FadeTransition::operator=(const FadeTransition& rhs) = default;
 
-FadeTransition::FadeTransition(FadeTransition&& rhs) = default;
+FadeTransition::FadeTransition(FadeTransition&& rhs) noexcept = default;
 
-FadeTransition& FadeTransition::operator=(FadeTransition&& rhs) = default;
+FadeTransition& FadeTransition::operator=(FadeTransition&& rhs) noexcept = default;
 
 } // namespace Toolkit
 
diff --git a/dali-toolkit/public-api/transition/fade-transition.h b/dali-toolkit/public-api/transition/fade-transition.h
index 3f5542a..9147af6 100644
--- a/dali-toolkit/public-api/transition/fade-transition.h
+++ b/dali-toolkit/public-api/transition/fade-transition.h
@@ -92,7 +92,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  FadeTransition(FadeTransition&& rhs);
+  FadeTransition(FadeTransition&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
@@ -100,7 +100,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  FadeTransition& operator=(FadeTransition&& rhs);
+  FadeTransition& operator=(FadeTransition&& rhs) noexcept;
 
 public: // Not intended for use by Application developers
   /// @cond internal
diff --git a/dali-toolkit/public-api/transition/scale-transition.cpp b/dali-toolkit/public-api/transition/scale-transition.cpp
index 676cc63..31ec37d 100644
--- a/dali-toolkit/public-api/transition/scale-transition.cpp
+++ b/dali-toolkit/public-api/transition/scale-transition.cpp
@@ -57,9 +57,9 @@ ScaleTransition::ScaleTransition(const ScaleTransition& handle) = default;
 
 ScaleTransition& ScaleTransition::operator=(const ScaleTransition& rhs) = default;
 
-ScaleTransition::ScaleTransition(ScaleTransition&& rhs) = default;
+ScaleTransition::ScaleTransition(ScaleTransition&& rhs) noexcept = default;
 
-ScaleTransition& ScaleTransition::operator=(ScaleTransition&& rhs) = default;
+ScaleTransition& ScaleTransition::operator=(ScaleTransition&& rhs) noexcept = default;
 
 void ScaleTransition::SetScaleFactor(const Vector2& scaleFactor)
 {
diff --git a/dali-toolkit/public-api/transition/scale-transition.h b/dali-toolkit/public-api/transition/scale-transition.h
index 8ce96c4..a7ab972 100644
--- a/dali-toolkit/public-api/transition/scale-transition.h
+++ b/dali-toolkit/public-api/transition/scale-transition.h
@@ -110,7 +110,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  ScaleTransition(ScaleTransition&& rhs);
+  ScaleTransition(ScaleTransition&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
@@ -118,7 +118,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  ScaleTransition& operator=(ScaleTransition&& rhs);
+  ScaleTransition& operator=(ScaleTransition&& rhs) noexcept;
 
   /**
    * @brief Sets scaleFactor to be used to scale target Control
diff --git a/dali-toolkit/public-api/transition/slide-transition.cpp b/dali-toolkit/public-api/transition/slide-transition.cpp
index e68da58..0348cf0 100644
--- a/dali-toolkit/public-api/transition/slide-transition.cpp
+++ b/dali-toolkit/public-api/transition/slide-transition.cpp
@@ -50,9 +50,9 @@ SlideTransition::SlideTransition(const SlideTransition& handle) = default;
 
 SlideTransition& SlideTransition::operator=(const SlideTransition& rhs) = default;
 
-SlideTransition::SlideTransition(SlideTransition&& rhs) = default;
+SlideTransition::SlideTransition(SlideTransition&& rhs) noexcept = default;
 
-SlideTransition& SlideTransition::operator=(SlideTransition&& rhs) = default;
+SlideTransition& SlideTransition::operator=(SlideTransition&& rhs) noexcept = default;
 
 void SlideTransition::SetDirection(const Vector2& direction)
 {
diff --git a/dali-toolkit/public-api/transition/slide-transition.h b/dali-toolkit/public-api/transition/slide-transition.h
index 41af842..e5826f8 100644
--- a/dali-toolkit/public-api/transition/slide-transition.h
+++ b/dali-toolkit/public-api/transition/slide-transition.h
@@ -106,7 +106,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  SlideTransition(SlideTransition&& rhs);
+  SlideTransition(SlideTransition&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
@@ -114,7 +114,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  SlideTransition& operator=(SlideTransition&& rhs);
+  SlideTransition& operator=(SlideTransition&& rhs) noexcept;
 
   /**
    * @brief Sets direction to be used to move target Control
diff --git a/dali-toolkit/public-api/transition/transition-base.cpp b/dali-toolkit/public-api/transition/transition-base.cpp
index 6b88c84..e2b403c 100644
--- a/dali-toolkit/public-api/transition/transition-base.cpp
+++ b/dali-toolkit/public-api/transition/transition-base.cpp
@@ -50,9 +50,9 @@ TransitionBase::TransitionBase(const TransitionBase& handle) = default;
 
 TransitionBase& TransitionBase::operator=(const TransitionBase& rhs) = default;
 
-TransitionBase::TransitionBase(TransitionBase&& rhs) = default;
+TransitionBase::TransitionBase(TransitionBase&& rhs) noexcept = default;
 
-TransitionBase& TransitionBase::operator=(TransitionBase&& rhs) = default;
+TransitionBase& TransitionBase::operator=(TransitionBase&& rhs) noexcept = default;
 
 void TransitionBase::SetTimePeriod(TimePeriod timePeriod)
 {
diff --git a/dali-toolkit/public-api/transition/transition-base.h b/dali-toolkit/public-api/transition/transition-base.h
index 6deaeff..472d555 100644
--- a/dali-toolkit/public-api/transition/transition-base.h
+++ b/dali-toolkit/public-api/transition/transition-base.h
@@ -94,7 +94,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  TransitionBase(TransitionBase&& rhs);
+  TransitionBase(TransitionBase&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
@@ -102,7 +102,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  TransitionBase& operator=(TransitionBase&& rhs);
+  TransitionBase& operator=(TransitionBase&& rhs) noexcept;
 
   /**
    * Set time period that contains delay and duration
diff --git a/dali-toolkit/public-api/transition/transition-set.cpp b/dali-toolkit/public-api/transition/transition-set.cpp
index fe8f33f..950312a 100644
--- a/dali-toolkit/public-api/transition/transition-set.cpp
+++ b/dali-toolkit/public-api/transition/transition-set.cpp
@@ -50,9 +50,9 @@ TransitionSet::TransitionSet(const TransitionSet& handle) = default;
 
 TransitionSet& TransitionSet::operator=(const TransitionSet& rhs) = default;
 
-TransitionSet::TransitionSet(TransitionSet&& rhs) = default;
+TransitionSet::TransitionSet(TransitionSet&& rhs) noexcept = default;
 
-TransitionSet& TransitionSet::operator=(TransitionSet&& rhs) = default;
+TransitionSet& TransitionSet::operator=(TransitionSet&& rhs) noexcept = default;
 
 void TransitionSet::AddTransition(TransitionBase transition)
 {
diff --git a/dali-toolkit/public-api/transition/transition-set.h b/dali-toolkit/public-api/transition/transition-set.h
index b690d45..a272d51 100644
--- a/dali-toolkit/public-api/transition/transition-set.h
+++ b/dali-toolkit/public-api/transition/transition-set.h
@@ -103,7 +103,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  TransitionSet(TransitionSet&& rhs);
+  TransitionSet(TransitionSet&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
@@ -111,7 +111,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  TransitionSet& operator=(TransitionSet&& rhs);
+  TransitionSet& operator=(TransitionSet&& rhs) noexcept;
 
   /**
    * @brief Add a TransitionBase on this TransitionSet.
diff --git a/dali-toolkit/public-api/transition/transition.cpp b/dali-toolkit/public-api/transition/transition.cpp
index 3e2f378..0e75654 100644
--- a/dali-toolkit/public-api/transition/transition.cpp
+++ b/dali-toolkit/public-api/transition/transition.cpp
@@ -32,9 +32,9 @@ Transition::Transition(Internal::Transition* transition)
 {
 }
 
-Transition Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod)
+Transition Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, bool useDestinationTarget, TimePeriod timePeriod)
 {
-  Internal::TransitionPtr internal = Dali::Toolkit::Internal::Transition::New(source, destination, timePeriod);
+  Internal::TransitionPtr internal = Dali::Toolkit::Internal::Transition::New(source, destination, useDestinationTarget, timePeriod);
 
   return Transition(internal.Get());
 }
@@ -50,9 +50,9 @@ Transition::Transition(const Transition& handle) = default;
 
 Transition& Transition::operator=(const Transition& rhs) = default;
 
-Transition::Transition(Transition&& rhs) = default;
+Transition::Transition(Transition&& rhs) noexcept = default;
 
-Transition& Transition::operator=(Transition&& rhs) = default;
+Transition& Transition::operator=(Transition&& rhs) noexcept = default;
 
 } // namespace Toolkit
 
diff --git a/dali-toolkit/public-api/transition/transition.h b/dali-toolkit/public-api/transition/transition.h
index 634face..b239262 100644
--- a/dali-toolkit/public-api/transition/transition.h
+++ b/dali-toolkit/public-api/transition/transition.h
@@ -51,13 +51,14 @@ public:
   /**
    * @brief Creates an initialized Transition.
    *
-   * @param[in] source Source
-   * @param[in] destination Destination
+   * @param[in] source A source control of this transition.
+   * @param[in] destination A destination control of this transition.
+   * @param[in] useDestinationTarget True if this transition uses destination control as target.
    * @param[in] timePeriod The duration in seconds
    * @return A handle to a newly allocated Dali resource
    * @note durationSeconds can not be negative.
    */
-  static Transition New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod);
+  static Transition New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, bool useDestinationTarget, TimePeriod timePeriod);
 
   /**
    * @brief Downcasts a handle to Transition handle.
@@ -97,7 +98,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  Transition(Transition&& rhs);
+  Transition(Transition&& rhs) noexcept;
 
   /**
    * @brief Move assignment operator.
@@ -105,7 +106,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this handle
    */
-  Transition& operator=(Transition&& rhs);
+  Transition& operator=(Transition&& rhs) noexcept;
 
 public: // Not intended for use by Application developers
   /// @cond internal
diff --git a/dali-toolkit/public-api/visuals/gradient-visual-properties.h b/dali-toolkit/public-api/visuals/gradient-visual-properties.h
index 8bf083c..5e2c6bf 100644
--- a/dali-toolkit/public-api/visuals/gradient-visual-properties.h
+++ b/dali-toolkit/public-api/visuals/gradient-visual-properties.h
@@ -51,6 +51,10 @@ enum
   /**
    * @brief The start position of a linear gradient.
    * @details Name "startPosition", type Property::VECTOR2.
+   * Gradient is drawn in a rectangular area, TopLeft is (-0.5, -0.5) and BottomRight is (0.5, 0.5).
+   * The outside of the entered Start Position and End Position is extended to the value of the border.
+   * Even if the range between Start Position and End Position is greater than (-0.5, -0.5) to (0.5, 0.5),
+   * only the corresponding area is drawn.
    * @SINCE_1_1.45
    * @note Mandatory for Linear.
    */
@@ -59,6 +63,10 @@ enum
   /**
    * @brief The end position of a linear gradient.
    * @details Name "endPosition", type Property::VECTOR2.
+   * Gradient is drawn in a rectangular area, TopLeft is (-0.5, -0.5) and BottomRight is (0.5, 0.5).
+   * The outside of the entered Start Position and End Position is extended to the value of the border.
+   * Even if the range between Start Position and End Position is greater than (-0.5, -0.5) to (0.5, 0.5),
+   * only the corresponding area is drawn.
    * @SINCE_1_1.45
    * @note Mandatory for Linear.
    */
diff --git a/dali-toolkit/public-api/visuals/image-visual-properties.h b/dali-toolkit/public-api/visuals/image-visual-properties.h
index b0b28d4..0ba2a56 100644
--- a/dali-toolkit/public-api/visuals/image-visual-properties.h
+++ b/dali-toolkit/public-api/visuals/image-visual-properties.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_VISUAL_PROPERTIES_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,7 +226,7 @@ enum
    * @details Name "cropToMask", type Property::BOOLEAN, True if the image should
    * be cropped to match the mask size, or false if the image should remain the same size.
    * @SINCE_1_2.60
-   * @note Optional.
+   * @note Optional, Default true
    * @note If this is false, then the mask is scaled to fit the image before being applied.
    */
   CROP_TO_MASK,
@@ -242,10 +242,10 @@ enum
   LOAD_POLICY,
 
   /**
-   * @brief The policy to determine when an image should no longer be cached.
+   * @brief The policy to determine when an image request to be released so should no longer be cached.
    * @details Name "releasePolicy", Type ReleasePolicy::Type (Property::INTEGER) or Property::STRING
    * @SINCE_1_3_5
-   * @note Default ReleasePolicy::DESTROYED
+   * @note Default ReleasePolicy::DETACHED
    * @see ReleasePolicy::Type
    */
   RELEASE_POLICY,
@@ -281,7 +281,7 @@ enum Type
 } // namespace LoadPolicy
 
 /**
- * @brief The policy determining when a image is deleted from the cache in relation to the ImageVisual lifetime.
+ * @brief The policy determining when a image is requested to be deleted from the cache in relation to the ImageVisual lifetime.
  * @SINCE_1_3_5
  * @note If the texture is being shared by another visual it persist if still required.
  */
diff --git a/dali-toolkit/public-api/visuals/text-visual-properties.h b/dali-toolkit/public-api/visuals/text-visual-properties.h
index cdd1a1a..2ab1cba 100644
--- a/dali-toolkit/public-api/visuals/text-visual-properties.h
+++ b/dali-toolkit/public-api/visuals/text-visual-properties.h
@@ -128,6 +128,12 @@ enum
    * @SINCE_1_2.60
    */
   UNDERLINE,
+
+  /**
+   * @brief The default strikethrough parameters.
+   * @details name "strikethrough", type Property::MAP.
+   */
+  STRIKETHROUGH,
 };
 
 } // namespace Property
diff --git a/dali-toolkit/shader-generator/shader-generator.cpp b/dali-toolkit/shader-generator/shader-generator.cpp
index d386fb3..16cddcc 100644
--- a/dali-toolkit/shader-generator/shader-generator.cpp
+++ b/dali-toolkit/shader-generator/shader-generator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -144,11 +144,24 @@ void GenerateHeaderFile(
             << endl;
     outFile << "const std::string_view " << shaderVariableName << endl;
     outFile << "{" << endl;
+
+    // Using Raw String Literal to generate shader files as this will simplify the file layout.
+    // And it will fix some compilation warnings about missing terminating strings.
+    // Note : we should skip empty headline to guarantee that "#version ~~~" as top of shader code.
+    outFile << "R\"(";
     string line;
+    bool   firstLinePrinted = false;
     while(getline(shaderFile, line))
     {
-      outFile << "\"" << line << "\\n\"" << endl;
+      if(!firstLinePrinted && line.find_first_not_of(" \t\r\n") == std::string::npos)
+      {
+        // Empty string occured!
+        continue;
+      }
+      firstLinePrinted = true;
+      outFile << line << endl;
     }
+    outFile << ")\"" << endl;
     outFile << "};" << endl;
     cout << " [OK]" << endl;
   }
diff --git a/dali-toolkit/styles/1920x1080_rpi/dali-toolkit-default-theme.json b/dali-toolkit/styles/1920x1080_rpi/dali-toolkit-default-theme.json
new file mode 100644
index 0000000..d862b80
--- /dev/null
+++ b/dali-toolkit/styles/1920x1080_rpi/dali-toolkit-default-theme.json
@@ -0,0 +1,541 @@
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * This file is part of Dali Toolkit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+//******************************************************************************
+//
+// Default Reference style theme for a 1920x1080 resolution, The values determined by UX design specification.
+// This file can be copied to a new folder within the styles/ directory and amended with new default values.
+// Can be overriden if StyleManager applies another style sheet.
+//
+//******************************************************************************
+
+{
+  "config":
+  {
+    "brokenImageUrl":"{DALI_IMAGE_DIR}broken.png",
+    "alwaysShowFocus":true,
+    "clearFocusOnEscape":false
+  },
+  "styles":
+  {
+    "Tooltip":
+    {
+      "tooltip":
+      {
+        "content":
+        {
+          "pointSize":24
+        },
+        "waitTime":0.5,
+        "background":
+        {
+          "visual":"{DALI_IMAGE_DIR}tooltip.9.png",
+          "border":[1,5,5,1]
+        },
+        "tail":
+        {
+          "visibility":false,
+          "aboveVisual":"{DALI_IMAGE_DIR}tooltip-tail-above.png",
+          "belowVisual":"{DALI_IMAGE_DIR}tooltip-tail-below.png"
+        },
+        "position":"BELOW",
+        "hoverPointOffset":[10,10],
+        "movementThreshold":5,
+        "disappearOnMovement":false
+      }
+    },
+    "TextLabel":
+    {
+      "pointSize":24,
+      "enableAutoScroll":false,
+      "autoScrollLoopCount":2,
+      "autoScrollGap":50,
+      "autoScrollSpeed":80,
+      "ignoreSpacesAfterText":false
+    },
+
+    "TextLabelFontSize0":
+    {
+      "pointSize":24
+    },
+    "TextLabelFontSize1":
+    {
+      "pointSize":28
+    },
+    "TextLabelFontSize2":
+    {
+      "pointSize":32
+    },
+    "TextLabelFontSize3":
+    {
+      "pointSize":36
+    },
+    "TextLabelFontSize4":
+    {
+      "pointSize":40
+    },
+
+    "TextField":
+    {
+      "pointSize":28,
+      "primaryCursorColor":[0.0,0.72,0.9,1.0],
+      "secondaryCursorColor":[0.0,0.72,0.9,1.0],
+      "cursorWidth":6,
+      "selectionHighlightColor":[0.75,0.96,1.0,1.0],
+      "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
+      "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
+      "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" },
+      "enableSelection":false
+    },
+
+    "TextFieldFontSize0":
+    {
+      "pointSize":24
+    },
+    "TextFieldFontSize1":
+    {
+      "pointSize":28
+    },
+    "TextFieldFontSize2":
+    {
+      "pointSize":32
+    },
+    "TextFieldFontSize3":
+    {
+      "pointSize":36
+    },
+    "TextFieldFontSize4":
+    {
+      "pointSize":40
+    },
+    "TextSelectionPopup":
+    {
+      "popupMaxSize":[1700,100],
+      "optionDividerSize":[2,0],
+      "popupDividerColor":[0.23,0.72,0.8,0.11],
+      "popupIconColor":[1.0,1.0,1.0,1.0],
+      "popupPressedColor":[0.24,0.72,0.8,0.11],
+      "background": {
+        "rendererType": "image",
+        "url": "{DALI_IMAGE_DIR}selection-popup-background.9.png"
+        },
+      "backgroundBorder": {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png",
+        "mixColor":[0.24,0.72,0.8,1.0]
+        },
+      "popupFadeInDuration":0.25,
+      "popupFadeOutDuration":0.25
+    },
+    "TextSelectionPopupButton":
+    {
+      "label":
+      {
+        "visualType":"TEXT",
+        "pointSize":24
+      },
+      "unselectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      },
+      "selectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      }
+    },
+    "TextSelectionToolbar":
+    {
+      "enableOvershoot":true,
+      "enableScrollBar":true,
+      "scrollView":
+      {
+        "overshootAnimationSpeed":360.0,
+        "overshootSize":[1920.0,130.0]
+      }
+    },
+    "TextSelectionScrollBar":
+    {
+      "indicatorShowDuration":0.25,
+      "indicatorHideDuration":0.25,
+      "indicatorTransientDuration":1.0
+    },
+    "TextSelectionScrollIndicator":
+    {
+      "image":
+      {
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}text_selection_scroll_indicator.9.png"
+      },
+      "color":[0.0,0.72,0.9,0.7]
+    },
+    "ScrollView":
+    {
+      "overshootEffectColor":"B018",
+      "overshootAnimationSpeed":960.0,
+      "overshootSize":[1920.0,130.0]
+    },
+    "ItemView":
+    {
+      "overshootEffectColor":"B018",
+      "overshootAnimationSpeed":960.0,
+      "overshootSize":[1920.0,130.0]
+    },
+    "ScrollBar":
+    {
+      "indicatorShowDuration":0.25,
+      "indicatorHideDuration":0.25,
+      "color":[0.0,0.72,0.9,0.7]
+    },
+    "TextEditor":
+    {
+      "pointSize":24,
+      "primaryCursorColor":[0.0,0.72,0.9,1.0],
+      "secondaryCursorColor":[0.0,0.72,0.9,1.0],
+      "cursorWidth":6,
+      "selectionHighlightColor":[0.75,0.96,1.0,1.0],
+      "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
+      "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
+      "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" },
+      "enableScrollBar":true,
+      "scrollBarShowDuration":0.8,
+      "scrollBarFadeDuration":0.5,
+      "enableSelection":false
+    },
+    "ProgressBar":
+    {
+      "trackVisual":{
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-track.9.png"
+      },
+      "progressVisual":{
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-progress.9.png"
+      },
+      "secondaryProgressVisual":{
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-secondary-progress.9.png"
+      },
+      "indeterminateVisual":{
+        "visualType":"IMAGE",
+        "pixelArea":[0.0, 0.0, 10.0, 1.0],
+        "wrapModeU":"REPEAT",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-indeterminate.png"
+      },
+      "indeterminateVisualAnimation":
+      [
+        {
+          "target":"indeterminateVisual",
+          "property":"pixelArea",
+          "initialValue":[0.0, 0.0, 10.0, 1.0],
+          "targetValue":[-1.0, 0.0, 10.0, 1.0],
+          "animator":
+          {
+            "alphaFunction":"DEFAULT",
+            "timePeriod":
+            {
+              "duration":0.8,
+              "delay":0
+            }
+          }
+        }
+      ],
+      "labelVisual":{
+        "visualType": "TEXT",
+        "textColor": [ 1.0, 1.0, 1.0, 1.0 ],
+        "pointSize" : 12.0, // Point size must always be provided to Text Visual
+        "horizontalAlignment": "CENTER",
+        "verticalAlignment": "CENTER"
+      },
+      "progressValue": 0.0,
+      "secondaryProgressValue":0.0,
+      "indeterminate": false
+    },
+    "CircularProgressBar":
+    {
+      "size":[64,64],
+      "trackVisual":{
+        "visualType":"ARC",
+        "mixColor":[0.0,0.165,0.302,1.0],
+        "thickness":4.0,
+        "startAngle":0.0,
+        "cap":"ROUND"
+      },
+      "progressVisual":{
+        "visualType":"ARC",
+        "mixColor":[0.0,0.549,1.0,1.0],
+        "thickness":4.0,
+        "startAngle":0.0,
+        "cap":"ROUND"
+      },
+      "secondaryProgressVisual":{
+        "visualType":"ARC",
+        "mixColor":[0.0,0.549,1.0,0.3],
+        "thickness":4.0,
+        "startAngle":0.0,
+        "cap":"ROUND"
+      },
+      "indeterminateVisual":{
+        "visualType":"ARC",
+        "mixColor":[0.02,0.71,0.525,1.0],
+        "thickness":4.0,
+        "startAngle":267.0,
+        "sweepAngle":75.0,
+        "cap":"ROUND"
+      },
+      "indeterminateVisualAnimation":
+      [
+        {
+          "target":"trackVisual",
+          "property":"opacity",
+          "targetValue": 0,
+          "animator":
+          {
+            "alphaFunction":"DEFAULT",
+            "timePeriod":
+            {
+              "duration":0,
+              "delay":0
+            }
+          }
+        },
+        {
+          "target":"secondaryProgressVisual",
+          "property":"opacity",
+          "targetValue": 0,
+          "animator":
+          {
+            "alphaFunction":"DEFAULT",
+            "timePeriod":
+            {
+              "duration":0,
+              "delay":0
+            }
+          }
+        },
+        {
+          "target":"progressVisual",
+          "property":"sweepAngle",
+          "initialValue": 75,
+          "targetValue": 180,
+          "animator":
+          {
+            "alphaFunction":[0.439, 0.0, 0.718, 0.428],
+            "timePeriod":
+            {
+              "duration":1.0,
+              "delay":0.0
+            }
+          }
+        },
+        {
+          "target":"progressVisual",
+          "property":"sweepAngle",
+          "targetValue": 75,
+          "animator":
+          {
+            "alphaFunction":[0.224, 0.571, 0.53, 1.0],
+            "timePeriod":
+            {
+              "duration":1.0,
+              "delay":2.0
+            }
+          }
+        },
+        {
+          "target":"progressVisual",
+          "property":"startAngle",
+          "initialValue": 87,
+          "targetValue": 1887,
+          "animator":
+          {
+            "alphaFunction":[0.33, 0.0, 0.3, 1.0],
+            "timePeriod":
+            {
+              "duration":3.0,
+              "delay":0.0
+            }
+          }
+        },
+        {
+          "target":"indeterminateVisual",
+          "property":"sweepAngle",
+          "initialValue": 75,
+          "targetValue": 180,
+          "animator":
+          {
+            "alphaFunction":[0.439, 0.0, 0.718, 0.428],
+            "timePeriod":
+            {
+              "duration":1.0,
+              "delay":0.0
+            }
+          }
+        },
+        {
+          "target":"indeterminateVisual",
+          "property":"sweepAngle",
+          "targetValue": 75,
+          "animator":
+          {
+            "alphaFunction":[0.224, 0.571, 0.53, 1.0],
+            "timePeriod":
+            {
+              "duration":1.0,
+              "delay":2.0
+            }
+          }
+        },
+        {
+          "target":"indeterminateVisual",
+          "property":"startAngle",
+          "initialValue": 267,
+          "targetValue": 2067,
+          "animator":
+          {
+            "alphaFunction":[0.33, 0.0, 0.3, 1.0],
+            "timePeriod":
+            {
+              "duration":3.0,
+              "delay":0.0
+            }
+          }
+        }
+      ],
+      "labelVisual":{
+        "visualType": "TEXT",
+        "textColor": [ 1.0, 1.0, 1.0, 1.0 ],
+        "pointSize" : 32.0, // Point size must always be provided to Text Visual
+        "horizontalAlignment": "CENTER",
+        "verticalAlignment": "CENTER"
+      },
+      "progressValue": 0.2,
+      "secondaryProgressValue":0.4,
+      "indeterminate": false
+    },
+    "Button":
+    {
+      "styles":["Tooltip"],
+      "initialAutoRepeatingDelay":2.0,
+      "nextAutoRepeatingDelay":0.9
+      // Note: Visuals added to Button will be used in all derived buttons unless overridden.
+    },
+    "PushButton":
+    {
+      "styles":["Button"],
+      "autoRepeating":false,
+      "togglable":false,
+      "labelPadding":[ 12.0, 12.0, 12.0, 12.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "horizontalAlignment": "CENTER",
+         "pointSize" : 24.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-up.9.png"
+       },
+       "selectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-down.9.png"
+       },
+       "disabledSelectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-down-disabled.9.png"
+       },
+       "disabledUnselectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-disabled.9.png"
+       }
+    },
+    "ToggleButton":
+    {
+      "styles":["Button"]
+    },
+    "CheckBoxButton":
+    {
+      "styles":["Button"],
+      "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "pointSize" : 24.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-unselected.png"
+      },
+      "selectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-selected.png"
+      },
+      "disabledUnselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-unselected-disabled.png"
+      },
+      "disabledSelectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-selected-disabled.png"
+      }
+    },
+    "RadioButton":
+    {
+      "styles":["Button"],
+      "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "pointSize" : 24.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-unselected.png"
+      },
+      "selectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-selected.png"
+      },
+      "disabledUnselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-unselected-disabled.png"
+      },
+      "disabledSelectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-selected-disabled.png"
+      }
+    }
+  }
+}
diff --git a/dali-toolkit/styles/1920x1080_rpi/images/cursor_handler_drop_center.png b/dali-toolkit/styles/1920x1080_rpi/images/cursor_handler_drop_center.png
new file mode 100644
index 0000000..244096f
Binary files /dev/null and b/dali-toolkit/styles/1920x1080_rpi/images/cursor_handler_drop_center.png differ
diff --git a/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_left.png b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_left.png
new file mode 100644
index 0000000..244096f
Binary files /dev/null and b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_left.png differ
diff --git a/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_right.png b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_right.png
new file mode 100644
index 0000000..244096f
Binary files /dev/null and b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_right.png differ
diff --git a/dali-toolkit/styles/360x360/images/cursor_handler_drop_center.png b/dali-toolkit/styles/360x360/images/cursor_handler_drop_center.png
index a9a2b9e..db31645 100644
Binary files a/dali-toolkit/styles/360x360/images/cursor_handler_drop_center.png and b/dali-toolkit/styles/360x360/images/cursor_handler_drop_center.png differ
diff --git a/dali-toolkit/styles/360x360/images/selection_handle_drop_left.png b/dali-toolkit/styles/360x360/images/selection_handle_drop_left.png
index d9ed8b8..72bf805 100644
Binary files a/dali-toolkit/styles/360x360/images/selection_handle_drop_left.png and b/dali-toolkit/styles/360x360/images/selection_handle_drop_left.png differ
diff --git a/dali-toolkit/styles/360x360/images/selection_handle_drop_right.png b/dali-toolkit/styles/360x360/images/selection_handle_drop_right.png
index f66b26b..6901e85 100644
Binary files a/dali-toolkit/styles/360x360/images/selection_handle_drop_right.png and b/dali-toolkit/styles/360x360/images/selection_handle_drop_right.png differ
diff --git a/dali-toolkit/styles/360x360/images/tw_bottom_btn_bg.png b/dali-toolkit/styles/360x360/images/tw_bottom_btn_bg.png
old mode 100755
new mode 100644
index 55522be..dfe2166
Binary files a/dali-toolkit/styles/360x360/images/tw_bottom_btn_bg.png and b/dali-toolkit/styles/360x360/images/tw_bottom_btn_bg.png differ
diff --git a/dali-toolkit/styles/480x800/images/cursor_handler_drop_center.png b/dali-toolkit/styles/480x800/images/cursor_handler_drop_center.png
index a9a2b9e..db31645 100644
Binary files a/dali-toolkit/styles/480x800/images/cursor_handler_drop_center.png and b/dali-toolkit/styles/480x800/images/cursor_handler_drop_center.png differ
diff --git a/dali-toolkit/styles/480x800/images/selection_handle_drop_left.png b/dali-toolkit/styles/480x800/images/selection_handle_drop_left.png
index d9ed8b8..72bf805 100644
Binary files a/dali-toolkit/styles/480x800/images/selection_handle_drop_left.png and b/dali-toolkit/styles/480x800/images/selection_handle_drop_left.png differ
diff --git a/dali-toolkit/styles/480x800/images/selection_handle_drop_right.png b/dali-toolkit/styles/480x800/images/selection_handle_drop_right.png
index f66b26b..6901e85 100644
Binary files a/dali-toolkit/styles/480x800/images/selection_handle_drop_right.png and b/dali-toolkit/styles/480x800/images/selection_handle_drop_right.png differ
diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index 3b5d1ce..4ebae21 100644
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -98,36 +98,35 @@
     },
     "TextSelectionPopup":
     {
-      "popupMaxSize":[656,36],
-      "optionDividerSize":[1,0],
-      "optionDividerPadding":[0.0,0.0,6.0,6.0],
-      "popupDividerColor":[1.0,1.0,1.0,1.0],
+      "popupMaxSize":[656,40],
+      "optionDividerSize":[0,0],
+      "optionDividerPadding":[0.0,0.0,0.0,0.0],
+      "popupDividerColor":[0.0,0.0,0.0,1.0],
       "popupIconColor":[1.0,1.0,1.0,1.0],
       "popupPressedColor":[0.24,0.72,0.8,0.11],
       "background": {
         "visualType": "IMAGE",
-        "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png",
-        "mixColor":[0.0,0.05,0.17,0.9]
+        "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png"
         },
       "backgroundBorder": {
         "visualType": "IMAGE",
-        "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png",
-        "mixColor":[0.0,0.0,0.0,0.0]
+        "url": "{DALI_IMAGE_DIR}IoT-selection-popup-border.9.png",
+        "mixColor":[1.0,1.0,1.0,1.0]
         },
       "popupFadeInDuration":0.25,
       "popupFadeOutDuration":0.25
     },
     "TextSelectionPopupButton":
     {
-      "minimumSize":[0,36],
-      "labelPadding":[0.0,0.0,0.0,0.0],
+      "minimumSize":[0,40],
+      "labelPadding":[-4.0,-4.0,0.0,0.0],
       "label":
       {
         "visualType":"TEXT",
-        "pointSize":18,
-        "textColor":[1.0,1.0,1.0,1.0],
+        "pointSize":6.0,
+        "textColor":[0.04,0.06,0.13,1.0],
         "fontFamily":"BreezeSans",
-        "fontStyle" : {"weight":"light"}
+        "fontStyle" : {"weight":"regular"}
       },
       "unselectedBackgroundVisual":
       {
diff --git a/dali-toolkit/styles/720x1280/images/cursor_handler_drop_center.png b/dali-toolkit/styles/720x1280/images/cursor_handler_drop_center.png
index 15c937a..209320f 100644
Binary files a/dali-toolkit/styles/720x1280/images/cursor_handler_drop_center.png and b/dali-toolkit/styles/720x1280/images/cursor_handler_drop_center.png differ
diff --git a/dali-toolkit/styles/720x1280/images/selection_handle_drop_left.png b/dali-toolkit/styles/720x1280/images/selection_handle_drop_left.png
index 149becb..55d7595 100644
Binary files a/dali-toolkit/styles/720x1280/images/selection_handle_drop_left.png and b/dali-toolkit/styles/720x1280/images/selection_handle_drop_left.png differ
diff --git a/dali-toolkit/styles/720x1280/images/selection_handle_drop_right.png b/dali-toolkit/styles/720x1280/images/selection_handle_drop_right.png
index 75035bc..c1b8d9f 100644
Binary files a/dali-toolkit/styles/720x1280/images/selection_handle_drop_right.png and b/dali-toolkit/styles/720x1280/images/selection_handle_drop_right.png differ
diff --git a/dali-toolkit/styles/debug-image-visual-shader-script.json b/dali-toolkit/styles/debug-image-visual-shader-script.json
new file mode 100644
index 0000000..2960524
--- /dev/null
+++ b/dali-toolkit/styles/debug-image-visual-shader-script.json
@@ -0,0 +1,80 @@
+//******************************************************************************
+//
+// Default debug image visual shader script for dali-toolkit
+// It will be used only if export DALI_DEBUG_IMAGE_VISUAL_SHADER=1
+//
+//******************************************************************************
+{
+  // Version of this debug script
+  "version" : "1.0.0",
+
+  // Range of color rate for debug
+  "minimumColorRate": 0.2,
+  "maximumColorRate": "0.7",
+
+  // Extra attributes for debug
+  // It is list of attributes' type and name what you want to add, include semi-colon.
+  // For example, "extraAttributes": ["mediump float aDebug;", "highp vec3 aDebug2;"]
+  "extraAttributes":
+  [
+  ],
+
+  // Extra varyings for debug
+  // It is list of varyings' type and name what you want to add, include semi-colon.
+  // For example, "extraVaryings": ["mediump float vDebug;", "highp vec3 vDebug2;"]
+  "extraVaryings":
+  [
+  ],
+
+  // Extra uniforms for debug
+  // It is list of uniforms' type and name what you want to add, include semi-colon.
+  // For example, "extraUniforms": ["mediump float uDebug;", "highp vec3 uDebug2;"]
+  "extraUniforms":
+  [
+  ],
+
+  // Logic for varying calculation
+  // For example, "applyVaryingsCode" : ["vDebug = aDebug;", "vDebug2 = aDebug2 * gl_Position.xyz / gl_Position.w;"]
+  "applyVaryingsCode":
+  [
+  ],
+
+
+  // Logic for red. (It show if we use YUV image)
+  // We can use macro keyword was defined or not by ~~_BOOL value.
+  "redChannelCodes":
+  {
+    "triggerCode":
+    [
+      "return IS_REQUIRED_YUV_TO_RGB_BOOL;"
+    ],
+    "ratioCode": "return 1.0;"
+  },
+
+  // Logic for green. (It show if we use unified YUV and RGB shader)
+  "greenChannelCodes":
+  {
+    "triggerCode": "return IS_REQUIRED_UNIFIED_YUV_AND_RGB_BOOL;",
+    "ratioCode":
+    [
+      "return 1.0;"
+    ]
+  },
+
+  // Logic for blue. (It show when we use GPU masking)
+  // Note that we can seperate each line as array.
+  "blueChannelCodes":
+  {
+    "triggerCode":
+    [
+      "bool triggerReturn = IS_REQUIRED_ALPHA_MASKING_BOOL;",
+      "",
+      "return triggerReturn;"
+    ],
+    "ratioCode":
+    [
+      "mediump float alpha = originColor.a;",
+      "return step(0.5, alpha);"
+    ]
+  }
+}
diff --git a/dali-toolkit/styles/images-common/00_popup_bg.png b/dali-toolkit/styles/images-common/00_popup_bg.png
index cc300fa..cb0968d 100644
Binary files a/dali-toolkit/styles/images-common/00_popup_bg.png and b/dali-toolkit/styles/images-common/00_popup_bg.png differ
diff --git a/dali-toolkit/styles/images-common/00_popup_bottom_bg.png b/dali-toolkit/styles/images-common/00_popup_bottom_bg.png
old mode 100755
new mode 100644
index c595eec..63529b4
Binary files a/dali-toolkit/styles/images-common/00_popup_bottom_bg.png and b/dali-toolkit/styles/images-common/00_popup_bottom_bg.png differ
diff --git a/dali-toolkit/styles/images-common/00_popup_bubble_bg.png b/dali-toolkit/styles/images-common/00_popup_bubble_bg.png
old mode 100755
new mode 100644
index ad3740b..f7c58bf
Binary files a/dali-toolkit/styles/images-common/00_popup_bubble_bg.png and b/dali-toolkit/styles/images-common/00_popup_bubble_bg.png differ
diff --git a/dali-toolkit/styles/images-common/00_popup_bubble_tail_bottom.png b/dali-toolkit/styles/images-common/00_popup_bubble_tail_bottom.png
old mode 100755
new mode 100644
index c1e6d8b..aba03ec
Binary files a/dali-toolkit/styles/images-common/00_popup_bubble_tail_bottom.png and b/dali-toolkit/styles/images-common/00_popup_bubble_tail_bottom.png differ
diff --git a/dali-toolkit/styles/images-common/00_popup_button_bg.png b/dali-toolkit/styles/images-common/00_popup_button_bg.png
index 10c7466..de719ef 100644
Binary files a/dali-toolkit/styles/images-common/00_popup_button_bg.png and b/dali-toolkit/styles/images-common/00_popup_button_bg.png differ
diff --git a/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png b/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png
index 7903ae2..b27254b 100644
Binary files a/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png and b/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png differ
diff --git a/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png b/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png
new file mode 100644
index 0000000..553056e
Binary files /dev/null and b/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png differ
diff --git a/dali-toolkit/styles/images-common/button-down.9.png b/dali-toolkit/styles/images-common/button-down.9.png
index f6e25ab..cb7df7b 100644
Binary files a/dali-toolkit/styles/images-common/button-down.9.png and b/dali-toolkit/styles/images-common/button-down.9.png differ
diff --git a/dali-toolkit/styles/images-common/button-up.9.png b/dali-toolkit/styles/images-common/button-up.9.png
index a2e2e01..252880d 100644
Binary files a/dali-toolkit/styles/images-common/button-up.9.png and b/dali-toolkit/styles/images-common/button-up.9.png differ
diff --git a/dali-toolkit/styles/images-common/checkbox-selected-disabled.png b/dali-toolkit/styles/images-common/checkbox-selected-disabled.png
index a6517b8..c5996ee 100644
Binary files a/dali-toolkit/styles/images-common/checkbox-selected-disabled.png and b/dali-toolkit/styles/images-common/checkbox-selected-disabled.png differ
diff --git a/dali-toolkit/styles/images-common/checkbox-selected.png b/dali-toolkit/styles/images-common/checkbox-selected.png
index e3a8c43..91be569 100644
Binary files a/dali-toolkit/styles/images-common/checkbox-selected.png and b/dali-toolkit/styles/images-common/checkbox-selected.png differ
diff --git a/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png b/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png
index 022c1cf..7aba7cf 100644
Binary files a/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png and b/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png differ
diff --git a/dali-toolkit/styles/images-common/checkbox-unselected.png b/dali-toolkit/styles/images-common/checkbox-unselected.png
index 58e9390..b8a7d0d 100644
Binary files a/dali-toolkit/styles/images-common/checkbox-unselected.png and b/dali-toolkit/styles/images-common/checkbox-unselected.png differ
diff --git a/dali-toolkit/styles/images-common/copy_paste_icon_cut.png b/dali-toolkit/styles/images-common/copy_paste_icon_cut.png
index f819fc6..3ec7d70 100644
Binary files a/dali-toolkit/styles/images-common/copy_paste_icon_cut.png and b/dali-toolkit/styles/images-common/copy_paste_icon_cut.png differ
diff --git a/dali-toolkit/styles/images-common/insertpoint-icon-pressed.png b/dali-toolkit/styles/images-common/insertpoint-icon-pressed.png
index 171b737..7652778 100644
Binary files a/dali-toolkit/styles/images-common/insertpoint-icon-pressed.png and b/dali-toolkit/styles/images-common/insertpoint-icon-pressed.png differ
diff --git a/dali-toolkit/styles/images-common/insertpoint-icon.png b/dali-toolkit/styles/images-common/insertpoint-icon.png
index 61ab852..fa55887 100644
Binary files a/dali-toolkit/styles/images-common/insertpoint-icon.png and b/dali-toolkit/styles/images-common/insertpoint-icon.png differ
diff --git a/dali-toolkit/styles/images-common/keyboard_focus.9.png b/dali-toolkit/styles/images-common/keyboard_focus.9.png
index 5590f15..dc0c116 100644
Binary files a/dali-toolkit/styles/images-common/keyboard_focus.9.png and b/dali-toolkit/styles/images-common/keyboard_focus.9.png differ
diff --git a/dali-toolkit/styles/images-common/magnifier.png b/dali-toolkit/styles/images-common/magnifier.png
index 1846be2..460f3da 100644
Binary files a/dali-toolkit/styles/images-common/magnifier.png and b/dali-toolkit/styles/images-common/magnifier.png differ
diff --git a/dali-toolkit/styles/images-common/popup_bg.png b/dali-toolkit/styles/images-common/popup_bg.png
index 3b2ff97..5e31ef6 100644
Binary files a/dali-toolkit/styles/images-common/popup_bg.png and b/dali-toolkit/styles/images-common/popup_bg.png differ
diff --git a/dali-toolkit/styles/images-common/popup_bubble_bg_ef.#.png b/dali-toolkit/styles/images-common/popup_bubble_bg_ef.#.png
index 462c9db..b4d1c3e 100644
Binary files a/dali-toolkit/styles/images-common/popup_bubble_bg_ef.#.png and b/dali-toolkit/styles/images-common/popup_bubble_bg_ef.#.png differ
diff --git a/dali-toolkit/styles/images-common/popup_bubble_tail_bottom_ef.png b/dali-toolkit/styles/images-common/popup_bubble_tail_bottom_ef.png
index 53b87fe..fd041ab 100644
Binary files a/dali-toolkit/styles/images-common/popup_bubble_tail_bottom_ef.png and b/dali-toolkit/styles/images-common/popup_bubble_tail_bottom_ef.png differ
diff --git a/dali-toolkit/styles/images-common/popup_bubble_tail_top_ef.png b/dali-toolkit/styles/images-common/popup_bubble_tail_top_ef.png
old mode 100755
new mode 100644
index 1ace985..a4c8431
Binary files a/dali-toolkit/styles/images-common/popup_bubble_tail_top_ef.png and b/dali-toolkit/styles/images-common/popup_bubble_tail_top_ef.png differ
diff --git a/dali-toolkit/styles/images-common/popup_tail_down.png b/dali-toolkit/styles/images-common/popup_tail_down.png
old mode 100755
new mode 100644
index 806ba0e..7fd2d8e
Binary files a/dali-toolkit/styles/images-common/popup_tail_down.png and b/dali-toolkit/styles/images-common/popup_tail_down.png differ
diff --git a/dali-toolkit/styles/images-common/popup_tail_left.png b/dali-toolkit/styles/images-common/popup_tail_left.png
index b2ed047..1d1115d 100644
Binary files a/dali-toolkit/styles/images-common/popup_tail_left.png and b/dali-toolkit/styles/images-common/popup_tail_left.png differ
diff --git a/dali-toolkit/styles/images-common/popup_tail_right.png b/dali-toolkit/styles/images-common/popup_tail_right.png
index 16b28e0..0c89048 100644
Binary files a/dali-toolkit/styles/images-common/popup_tail_right.png and b/dali-toolkit/styles/images-common/popup_tail_right.png differ
diff --git a/dali-toolkit/styles/images-common/popup_tail_up.png b/dali-toolkit/styles/images-common/popup_tail_up.png
index 599cf17..e483833 100644
Binary files a/dali-toolkit/styles/images-common/popup_tail_up.png and b/dali-toolkit/styles/images-common/popup_tail_up.png differ
diff --git a/dali-toolkit/styles/images-common/radio-button-selected-disabled.png b/dali-toolkit/styles/images-common/radio-button-selected-disabled.png
index 5c40e4b..4e30b7f 100644
Binary files a/dali-toolkit/styles/images-common/radio-button-selected-disabled.png and b/dali-toolkit/styles/images-common/radio-button-selected-disabled.png differ
diff --git a/dali-toolkit/styles/images-common/radio-button-selected.png b/dali-toolkit/styles/images-common/radio-button-selected.png
index d49cbb5..7c3afab 100644
Binary files a/dali-toolkit/styles/images-common/radio-button-selected.png and b/dali-toolkit/styles/images-common/radio-button-selected.png differ
diff --git a/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png b/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png
index 0c5fa5f..dc659f8 100644
Binary files a/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png and b/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png differ
diff --git a/dali-toolkit/styles/images-common/radio-button-unselected.png b/dali-toolkit/styles/images-common/radio-button-unselected.png
index 6f647e8..65d93c6 100644
Binary files a/dali-toolkit/styles/images-common/radio-button-unselected.png and b/dali-toolkit/styles/images-common/radio-button-unselected.png differ
diff --git a/dali-toolkit/styles/images-common/slider-popup-arrow.png b/dali-toolkit/styles/images-common/slider-popup-arrow.png
index 0675a57..1886ff8 100644
Binary files a/dali-toolkit/styles/images-common/slider-popup-arrow.png and b/dali-toolkit/styles/images-common/slider-popup-arrow.png differ
diff --git a/dali-toolkit/styles/images-common/slider-skin-handle.png b/dali-toolkit/styles/images-common/slider-skin-handle.png
index af8f7b6..cff8326 100644
Binary files a/dali-toolkit/styles/images-common/slider-skin-handle.png and b/dali-toolkit/styles/images-common/slider-skin-handle.png differ
diff --git a/dali-toolkit/styles/images-common/text-input-selection-handle-left.png b/dali-toolkit/styles/images-common/text-input-selection-handle-left.png
index ba10440..04cb862 100644
Binary files a/dali-toolkit/styles/images-common/text-input-selection-handle-left.png and b/dali-toolkit/styles/images-common/text-input-selection-handle-left.png differ
diff --git a/dali-toolkit/styles/images-common/text-input-selection-handle-right.png b/dali-toolkit/styles/images-common/text-input-selection-handle-right.png
index 3ab7a43..785e72e 100644
Binary files a/dali-toolkit/styles/images-common/text-input-selection-handle-right.png and b/dali-toolkit/styles/images-common/text-input-selection-handle-right.png differ
diff --git a/dali-toolkit/styles/images-common/tooltip-tail-above.png b/dali-toolkit/styles/images-common/tooltip-tail-above.png
index 9695929..175456a 100644
Binary files a/dali-toolkit/styles/images-common/tooltip-tail-above.png and b/dali-toolkit/styles/images-common/tooltip-tail-above.png differ
diff --git a/dali-toolkit/styles/images-common/tooltip-tail-below.png b/dali-toolkit/styles/images-common/tooltip-tail-below.png
index 3b4a0f9..698aa47 100644
Binary files a/dali-toolkit/styles/images-common/tooltip-tail-below.png and b/dali-toolkit/styles/images-common/tooltip-tail-below.png differ
diff --git a/docs/content/example-code/images/cards.jpg b/docs/content/example-code/images/cards.jpg
index 11bd590..f021eb1 100644
Binary files a/docs/content/example-code/images/cards.jpg and b/docs/content/example-code/images/cards.jpg differ
diff --git a/docs/content/figures/image-scaling/cards.jpg b/docs/content/figures/image-scaling/cards.jpg
index 9af5d02..fba2e85 100644
Binary files a/docs/content/figures/image-scaling/cards.jpg and b/docs/content/figures/image-scaling/cards.jpg differ
diff --git a/docs/content/figures/image-scaling/dog.jpg b/docs/content/figures/image-scaling/dog.jpg
index f7d2cc4..3318f4d 100644
Binary files a/docs/content/figures/image-scaling/dog.jpg and b/docs/content/figures/image-scaling/dog.jpg differ
diff --git a/docs/content/figures/image-scaling/door.jpg b/docs/content/figures/image-scaling/door.jpg
index 7317ea5..a1ac044 100644
Binary files a/docs/content/figures/image-scaling/door.jpg and b/docs/content/figures/image-scaling/door.jpg differ
diff --git a/docs/content/figures/image-scaling/gallery-large-12.jpg b/docs/content/figures/image-scaling/gallery-large-12.jpg
index 7173b85..929aca1 100644
Binary files a/docs/content/figures/image-scaling/gallery-large-12.jpg and b/docs/content/figures/image-scaling/gallery-large-12.jpg differ
diff --git a/docs/content/figures/image-scaling/liberty.jpg b/docs/content/figures/image-scaling/liberty.jpg
index e42dba7..1b5a294 100644
Binary files a/docs/content/figures/image-scaling/liberty.jpg and b/docs/content/figures/image-scaling/liberty.jpg differ
diff --git a/format b/format
deleted file mode 100755
index c5630b4..0000000
--- a/format
+++ /dev/null
@@ -1 +0,0 @@
-git diff -U0 --no-color HEAD^ | clang-format-diff -i -p1
\ No newline at end of file
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 0c218ca..d80c4e4 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    2.0.44
+Version:    2.3.19
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -14,6 +14,10 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dali2-core)
 BuildRequires:  pkgconfig(dali2-adaptor)
+BuildRequires:  pkgconfig(gles20)
+BuildRequires:  pkgconfig(glesv2)
+BuildRequires:  pkgconfig(egl)
+
 BuildRequires:  gettext
 BuildRequires:  pkgconfig(libtzplatform-config)
 
@@ -34,6 +38,7 @@ Requires:   %{name} = %{version}-%{release}
 Conflicts:  %{name}-resources_480x800
 Conflicts:  %{name}-resources_720x1280
 Conflicts:  %{name}-resources_1920x1080
+Conflicts:  %{name}-resources_1920x1080_rpi
 %description resources_360x360
 dali-toolkit default resource files for 360x360
 Contain po / sounds / common images / style / style images
@@ -44,6 +49,7 @@ Requires:   %{name} = %{version}-%{release}
 Conflicts:  %{name}-resources_360x360
 Conflicts:  %{name}-resources_720x1280
 Conflicts:  %{name}-resources_1920x1080
+Conflicts:  %{name}-resources_1920x1080_rpi
 %description resources_480x800
 dali-toolkit default resource files for 480x800
 Contain po / sounds / common images / style / style images
@@ -54,6 +60,7 @@ Requires:   %{name} = %{version}-%{release}
 Conflicts:  %{name}-resources_360x360
 Conflicts:  %{name}-resources_480x800
 Conflicts:  %{name}-resources_1920x1080
+Conflicts:  %{name}-resources_1920x1080_rpi
 %description resources_720x1280
 dali-toolkit default resource files for 720x1280
 Contain po / sounds / common images / style / style images
@@ -64,10 +71,23 @@ Requires:   %{name} = %{version}-%{release}
 Conflicts:  %{name}-resources_360x360
 Conflicts:  %{name}-resources_480x800
 Conflicts:  %{name}-resources_720x1280
+Conflicts:  %{name}-resources_1920x1080_rpi
 %description resources_1920x1080
 dali-toolkit default resource files for 1920x1080
 Contain po / sounds / common images / style / style images
 
+%package resources_1920x1080_rpi
+Summary:    default resource files for 1920x1080 on Raspberry Pi 4
+Requires:   %{name} = %{version}-%{release}
+Conflicts:  %{name}-resources_360x360
+Conflicts:  %{name}-resources_480x800
+Conflicts:  %{name}-resources_720x1280
+Conflicts:  %{name}-resources_1920x1080
+%description resources_1920x1080_rpi
+dali-toolkit default resource files for 1920x1080 on Raspberry Pi 4
+Contain po / sounds / common images / style / style images
+
+
 ##############################
 # devel
 ##############################
@@ -80,25 +100,65 @@ Requires:   %{name} = %{version}-%{release}
 Application development package for Dali 3D engine toolkit - headers and package config
 
 ##############################
-# dali-scene-loader
+# dali-scene3d
 ##############################
-%define dali2_scene_loader dali2-scene-loader
-%package -n %{dali2_scene_loader}
+%define dali2_scene3d dali2-scene3d
+%package -n %{dali2_scene3d}
 Summary:    DLI scene loading library
 Group:      System/Libraries
 License:    Apache-2.0
 Requires:   dali2-toolkit
 
-%description -n %{dali2_scene_loader}
+%description -n %{dali2_scene3d}
 Provides functionality for loading and displaying DLI format scenes. See README.md for more details.
 
-%package -n %{dali2_scene_loader}-devel
-Summary:    Development components for dali-scene-loader
+%package -n %{dali2_scene3d}-devel
+Summary:    Development components for dali-scene3d
+Group:      Development/Building
+Requires:   %{dali2_scene3d} = %{version}-%{release}
+
+%description -n %{dali2_scene3d}-devel
+Development components for dali-scene3d.
+
+##############################
+# dali-physics-2d
+##############################
+%define dali2_physics2d dali2-physics-2d
+%package -n %{dali2_physics2d}
+Summary:    Physics library 2D
+Group:      System/Libraries
+License:    Apache-2.0
+
+%description -n %{dali2_physics2d}
+Provides functionality for 2D physics simulation. See README.md for more details.
+
+%package -n %{dali2_physics2d}-devel
+Summary:    Development components for dali2-physics-2d
 Group:      Development/Building
-Requires:   %{dali2_scene_loader} = %{version}-%{release}
+Requires:   %{dali2_physics2d} = %{version}-%{release}
 
-%description -n %{dali2_scene_loader}-devel
-Development components for dali-scene-loader.
+%description -n %{dali2_physics2d}-devel
+Development components for dali2-physics-2d.
+
+##############################
+# dali-physics-3d
+##############################
+%define dali2_physics3d dali2-physics-3d
+%package -n %{dali2_physics3d}
+Summary:    Physics library 3D
+Group:      System/Libraries
+License:    Apache-2.0
+
+%description -n %{dali2_physics3d}
+Provides functionality for 3D physics simulation. See README.md for more details.
+
+%package -n %{dali2_physics3d}-devel
+Summary:    Development components for dali2-physics-3d
+Group:      Development/Building
+Requires:   %{dali2_physics3d} = %{version}-%{release}
+
+%description -n %{dali2_physics3d}-devel
+Development components for dali2-physics-3d.
 
 %define dali_data_rw_dir            %TZ_SYS_SHARE/dali/
 %define dali_data_ro_dir            %TZ_SYS_RO_SHARE/dali/
@@ -153,9 +213,7 @@ cmake \
 %if 0%{?enable_debug}
       -DCMAKE_BUILD_TYPE=Debug \
 %endif
-%if 0%{?enable_trace}
       -DENABLE_TRACE=ON \
-%endif
       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
       -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
@@ -199,9 +257,14 @@ mkdir -p %{buildroot}%{dali_toolkit_style_files}/720x1280
 cp -r dali-toolkit/styles/720x1280/* %{buildroot}%{dali_toolkit_style_files}/720x1280
 mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080
 cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080
+mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080_rpi
+cp -r dali-toolkit/styles/1920x1080_rpi/* %{buildroot}%{dali_toolkit_style_files}/1920x1080_rpi
 
 # Copy default feedback theme
 cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_style_files}
+
+# Copy default debug image visual shader script
+cp dali-toolkit/styles/debug-image-visual-shader-script.json %{buildroot}%{dali_toolkit_style_files}
 popd
 
 ##############################
@@ -244,6 +307,15 @@ case "$1" in
   ;;
 esac
 
+%pre resources_1920x1080_rpi
+case "$1" in
+  2)
+    pushd %{dali_toolkit_style_files}
+    rm -rf ./*
+    popd
+  ;;
+esac
+
 ##############################
 # Post Install
 ##############################
@@ -271,6 +343,11 @@ pushd %{dali_toolkit_style_files}/1920x1080
 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
 popd
 
+%post resources_1920x1080_rpi
+pushd %{dali_toolkit_style_files}/1920x1080_rpi
+for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
+popd
+
 ##############################
 # Pre Uninstall
 ##############################
@@ -319,6 +396,17 @@ case "$1" in
   ;;
 esac
 
+%preun resources_1920x1080_rpi
+case "$1" in
+  0)
+    %preun resources_1920x1080_rpi
+    pushd %{dali_toolkit_style_files}
+    mv images ./1920x1080_rpi
+    mv dali-toolkit-default-theme.json ./1920x1080_rpi
+    popd
+  ;;
+esac
+
 ##############################
 # Post Uninstall
 ##############################
@@ -362,6 +450,15 @@ case "$1" in
   ;;
 esac
 
+%postun resources_1920x1080_rpi
+case "$1" in
+  0)
+    pushd %{dali_toolkit_style_files}
+    rm -rf *
+    popd
+  ;;
+esac
+
 ##############################
 # Files in Binary Packages
 ##############################
@@ -387,6 +484,7 @@ esac
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/360x360/*
+%{dali_toolkit_style_files}/debug-image-visual-shader-script.json
 %{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*
 
@@ -396,6 +494,7 @@ esac
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/480x800/*
+%{dali_toolkit_style_files}/debug-image-visual-shader-script.json
 %{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*
 
@@ -405,6 +504,7 @@ esac
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/720x1280/*
+%{dali_toolkit_style_files}/debug-image-visual-shader-script.json
 %{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*
 
@@ -414,20 +514,72 @@ esac
 %{dali_toolkit_image_files}/*
 %{dali_toolkit_sound_files}/*
 %{dali_toolkit_style_files}/1920x1080/*
+%{dali_toolkit_style_files}/debug-image-visual-shader-script.json
+%{dali_toolkit_style_files}/default-feedback-theme.json
+%{_datadir}/locale/*/LC_MESSAGES/*
+
+%files resources_1920x1080_rpi
+%manifest dali-toolkit-resources.manifest
+%defattr(-,root,root,-)
+%{dali_toolkit_image_files}/*
+%{dali_toolkit_sound_files}/*
+%{dali_toolkit_style_files}/1920x1080_rpi/*
+%{dali_toolkit_style_files}/debug-image-visual-shader-script.json
 %{dali_toolkit_style_files}/default-feedback-theme.json
 %{_datadir}/locale/*/LC_MESSAGES/*
 
-%files -n %{dali2_scene_loader}
+%files -n %{dali2_scene3d}
+%if 0%{?enable_dali_smack_rules}
+%manifest dali-scene3d.manifest-smack
+%else
+%manifest dali-scene3d.manifest
+%endif
+%defattr(-,root,root,-)
+%{_libdir}/lib%{dali2_scene3d}.so
+%license LICENSE
+
+%files -n %{dali2_scene3d}-devel
+%defattr(-,root,root,-)
+%{_includedir}/dali-scene3d/public-api/*
+%{_includedir}/dali-scene3d/dali-scene3d.h
+%{_libdir}/pkgconfig/dali2-scene3d.pc
+
+%files -n %{dali2_physics2d}
+%if 0%{?enable_dali_smack_rules}
+%manifest dali-physics-2d.manifest-smack
+%else
+%manifest dali-physics-2d.manifest
+%endif
+%defattr(-,root,root,-)
+%{_libdir}/libchipmunk.so*
+%{_libdir}/libdali2-physics-2d.so*
+%license LICENSE
+
+%files -n %{dali2_physics2d}-devel
+%defattr(-,root,root,-)
+%{_includedir}/dali-physics/integration-api/*
+%{_includedir}/dali-physics/public-api/*
+%{_includedir}/dali-physics/dali-physics.h
+%{_includedir}/chipmunk/*
+%{_libdir}/pkgconfig/chipmunk2d.pc
+%{_libdir}/pkgconfig/dali2-physics-2d.pc
+
+%files -n %{dali2_physics3d}
 %if 0%{?enable_dali_smack_rules}
-%manifest dali-scene-loader.manifest-smack
+%manifest dali-physics-3d.manifest-smack
 %else
-%manifest dali-scene-loader.manifest
+%manifest dali-physics-3d.manifest
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/lib%{dali2_scene_loader}.so
+%{_libdir}/libbullet3.so*
+%{_libdir}/libdali2-physics-3d.so*
 %license LICENSE
 
-%files -n %{dali2_scene_loader}-devel
+%files -n %{dali2_physics3d}-devel
 %defattr(-,root,root,-)
-%{_includedir}/dali-scene-loader/public-api/*
-%{_libdir}/pkgconfig/dali2-scene-loader.pc
+%{_includedir}/dali-physics/integration-api/*
+%{_includedir}/dali-physics/public-api/*
+%{_includedir}/dali-physics/dali-physics.h
+%{_includedir}/bullet/*
+%{_libdir}/pkgconfig/dali2-physics-3d.pc
+%{_libdir}/pkgconfig/bullet3.pc
diff --git a/tools/navigation-mesh-exporter/NavigationMeshExport.py b/tools/navigation-mesh-exporter/NavigationMeshExport.py
new file mode 100644
index 0000000..16e90ef
--- /dev/null
+++ b/tools/navigation-mesh-exporter/NavigationMeshExport.py
@@ -0,0 +1,411 @@
+import bpy
+import struct
+import ctypes
+import tempfile
+import os
+import mathutils
+from mathutils import Matrix
+from mathutils import Vector
+
+def MakeVersion( maj, min ):
+    return ctypes.c_uint32((ctypes.c_uint32(maj).value << 16) | ctypes.c_uint32(min).value).value
+
+EXPORT_VERSION = MakeVersion( 1, 0 )
+
+# If BAKE_TRANSFORM is True the object transform is baked into vertices
+BAKE_TRANSFORM = False
+
+CHECKSUM = "NAVM" # 4 bytes of checksum
+
+# From GLTF addon
+def to_yup():
+    """Transform to Yup."""
+    return Matrix(
+        ((1.0, 0.0, 0.0, 0.0),
+         (0.0, 0.0, 1.0, 0.0),
+         (0.0, -1.0, 0.0, 0.0),
+         (0.0, 0.0, 0.0, 1.0))
+    )
+
+def to_yup3():
+    """Transform to Yup."""
+    return Matrix(
+        ((1.0, 0.0, 0.0),
+         (0.0, 0.0, 1.0),
+         (0.0, -1.0, 0.0))
+    )
+
+# struct NavMeshHeader
+# version 10
+# The script writes multiple binary buffers which are concatenated at the end once
+# the offsets are resolved
+class NavMeshHeader10:
+
+    # fields of NavMeshHeader
+
+    def __init__(self, outputPath):
+        self.outputPath = outputPath
+        self.meshObject = bpy.context.selected_objects[0]
+
+        self.checksum = CHECKSUM
+        self.version = EXPORT_VERSION
+
+        # fields of version
+        self.dataOffset = 0
+
+        self.vertexCount = 0
+        self.vertexDataOffset = 0
+
+        self.edgeCount = 0
+        self.edgeDataOffset = 0
+
+        self.polyCount = 0
+        self.polyDataOffset = 0
+
+        self.mesh = self.meshObject.data
+
+        # helper fields
+        self.edgeBufferSize = 0
+        self.vertexBufferSize = 0
+        self.polyBufferSize = 0
+        self.bufferHeaderSize = 0
+        self.endianness = 0 # TODO
+
+        with tempfile.TemporaryDirectory() as temp_dir:
+            self.tempDir = temp_dir
+
+        print(temp_dir)
+        os.makedirs(temp_dir, exist_ok=True)
+        return
+
+    def Process(self):
+
+        # the data offset will be filled at later stage
+        self.polyCount = len(self.mesh.polygons)
+        self.vertexCount = len(self.mesh.vertices)
+        self.edgeCount = len(self.mesh.edges)
+        return
+
+    # vertices format
+    # N x ( f, f, f ), indexed from 0
+    def WriteVertices(self, bakeTransform=True):
+        out = open(os.path.join(self.tempDir, "myvertex-vertices-nt.bin"), "wb")
+        i = 0
+        for vert in self.mesh.vertices:
+            fmt = '@fff'
+            co = vert.co.copy()
+            # for now bake transform into the mesh (it has to be aligned properly)
+            if bakeTransform:
+                print('baking')
+                co = self.meshObject.matrix_world @ Vector(co)
+
+            out.write(struct.pack(fmt, co[0], co[1], co[2]))
+            print(f'i: {i:d}: {co[0]:f}, {co[1]:f}, {co[2]:f}')
+            i += 1
+        self.vertexBufferSize = out.tell()
+        out.close()
+        return
+
+    # This function builds vertex map after finding duplicate vertices
+    # it is essential to do it as two or more vertices may appear as one
+    # in the editor, yet they may be defined as multiple vertices due to carrying
+    # different UVs or other attributes. NavMesh needs only coordinates and
+    # two vertices with the same coordinates are considered as one.
+    def CreateEdgeMap(self):
+        mesh = self.mesh
+        vertexBuffer = {}
+        i = 0
+        for v in mesh.vertices:
+            # using string of coordinates as a key
+            key = f'{v.co}'
+
+            if key in vertexBuffer:
+                vertexBuffer[key].append(i)
+            else:
+                vertexBuffer[key] = [i]
+            i += 1
+
+        # build substitute array
+        # value at each index will be either own (no substitute)
+        # or of another vertex so the keys of edges can be substituted
+
+        vertexSubstitute = []
+        for v in mesh.vertices:
+            key = f'{v.co}'
+            verts = vertexBuffer[key]
+
+            # store always only first index of vertex
+            vertexSubstitute.append(verts[0])
+
+        #for i in range(0, len(vertexSubstitute)):
+        #    print(f'{i} = {vertexSubstitute[i]}')
+
+        # build edge map
+        # we need to remap edge keys so we can point out to a single edge
+        # end remove duplicates
+        # Blender edge key is made of vertex indices sorted
+        origKeys = []
+        for e in mesh.edges:
+            v0 = e.vertices[0]
+            v1 = e.vertices[1]
+            key = [v0, v1]
+            key.sort()
+            origKeys.append(key)
+            #print(key)
+
+        # create new keys by using vertex substitutes
+        keyMap = {}
+        edgeMap = {}
+        edgeIndex = 0
+
+        for key in origKeys:
+            newKey = [vertexSubstitute[key[0]], vertexSubstitute[key[1]]]
+            newKey.sort()
+
+            # turn newkey into hashable string
+            newKeyStr = f'{newKey}'
+
+            #print(f'{key} -> {newKey}')
+
+            if newKeyStr in keyMap:
+                keyMap[newKeyStr].append(edgeIndex)
+            else:
+                keyMap[newKeyStr] = [edgeIndex]
+
+            # turn original key into string
+            edgeMap[f'{key}'] = keyMap[newKeyStr][0]
+            edgeIndex += 1
+
+        return edgeMap
+
+
+    """
+    Edge data stores:
+    Pair of vertices (by index)
+    Pair of polygons (by index)
+
+    The polygon index is stored as uint16_t.
+    It is possible that the edge belongs to a single polygon. In such case,
+    the maximum of 0xFFFFF is stored as an index.
+    The maximum index of polygon is 0xFFFE (65534).
+
+    The pair of polygons are stored in order to speed up lookup of adjacent
+    floor faces.
+    """
+    # N x ( f, f, f ), indexed from 0
+    def WriteEdges(self):
+        out = open(os.path.join(self.tempDir, "myvertex-edges.bin"), "wb")
+
+        # add vertices to the edge
+        edgeFaceList = []
+        for edge in self.mesh.edges:
+            edgeFaceList.append([])
+            edgeFaceList[-1].append(edge.vertices[0])
+            edgeFaceList[-1].append(edge.vertices[1])
+
+        edgeMap = self.CreateEdgeMap()
+
+        # for each polygon update the edges
+        for poly in self.mesh.polygons:
+            for ek in poly.edge_keys:
+                ekArray = [ ek[0], ek[1] ]
+                edgeIndexKey = f'{ekArray}'
+                edgeIndex = edgeMap[edgeIndexKey]
+                edgeFaceList[edgeIndex].append(poly.index)
+
+        # make sure each edge contains 4 items
+        for edge in edgeFaceList:
+            if len(edge) == 2:
+                edge.append( 0xffff )
+            if len(edge) == 3:
+                edge.append( 0xffff )
+        count = 0
+        for edge in edgeFaceList:
+            if len(edge) == 4:
+                count += 1
+        if count == len(edgeFaceList):
+            print("all correct!")
+        # save the data into file
+        fmt = '@HHHH'
+        i = 0
+        for edge in edgeFaceList:
+            out.write(struct.pack(fmt, edge[0], edge[1], edge[2], edge[3]))
+            print(f'i: {i:d}: {edge[0]:d}, {edge[1]:d}, {edge[2]:d}, {edge[3]:d}')
+            i += 1
+
+        self.edgeBufferSize = out.tell()
+
+        out.close()
+        return
+
+    ###################################################################
+    """
+    Writes buffer of polygons. Polys must be triangles.
+    The data contains:
+    - vertex indices 3*u16
+    - edge indices   3*u16
+    - normal vector of poly 3*f32
+    - center 3*f32 (we may need center point for navigation)
+    """
+    def WritePolys(self):
+        out = open(os.path.join(self.tempDir, "myvertex-polys.bin"), "wb")
+
+        # for each polygon update the edges
+
+        polyIndex = 0
+
+        edgeMap = self.CreateEdgeMap()
+
+        for poly in self.mesh.polygons:
+            edges = []
+            for ek in poly.edge_keys:
+                ekArray = [ ek[0], ek[1] ]
+                edgeIndexKey = f'{ekArray}'
+                edges.append(edgeMap[edgeIndexKey])
+
+            verts = poly.vertices
+            norm = poly.normal.copy()
+
+            # transform
+            print(f'{norm.x:f}, {norm.y:f}, {norm.z:f}')
+
+            center = poly.center
+
+            # calculate normal
+
+            fmt='@HHHHHHffffff'
+
+            out.write(struct.pack(fmt,
+                                  verts[0], verts[1], verts[2],
+                                  edges[0], edges[1], edges[2],
+                                  norm.x, norm.y, norm.z,
+                                  center.x, center.y, center.z))
+
+            print('{edges[0]}, {edges[1]}, {edges[2]}')
+        self.polyBufferSize = out.tell()
+        out.close()
+        return
+
+    def WriteBinary(self):
+
+        out = open(self.outputPath, "wb")
+
+        # write common header fields
+        c = bytes(CHECKSUM, "ascii")
+        csum = ctypes.c_uint32( (c[3] << 24) | (c[2] << 16) | (c[1] << 8) | c[0] ).value
+        fmt = "@II"
+        out.write(struct.pack(fmt, csum, self.version))
+
+        # write remaining fields
+        fmt = '@IIIIIIIfff'
+        gravity = bpy.context.scene.gravity.copy().normalized()
+        out.write(struct.pack(fmt,
+                              self.dataOffset,
+                              self.vertexCount,
+                              self.vertexDataOffset,
+                              self.edgeCount,
+                              self.edgeDataOffset,
+                              self.polyCount,
+                              self.polyDataOffset,
+                              gravity.x, gravity.y, gravity.z
+                              ))
+
+        self.bufferHeaderSize = out.tell()
+
+        out.close()
+
+        return
+
+    def Finalize(self):
+
+        self.dataOffset = self.bufferHeaderSize
+        self.vertexDataOffset = 0 # relative to data offset
+        self.edgeDataOffset = self.vertexBufferSize
+        self.polyDataOffset = self.edgeDataOffset + self.edgeBufferSize
+
+        # write header again
+        self.WriteBinary()
+
+        # concatenate files
+
+        with open(self.outputPath, "ab") as out, open(os.path.join(self.tempDir, "myvertex-vertices-nt.bin"), "rb") as file2:
+            out.write(file2.read())
+
+        with open(self.outputPath, "ab") as out, open(os.path.join(self.tempDir, "myvertex-edges.bin"), "rb") as file2:
+            out.write(file2.read())
+
+        with open(self.outputPath, "ab") as out, open(os.path.join(self.tempDir, "myvertex-polys.bin"), "rb") as file2:
+            out.write(file2.read())
+
+        return
+
+
+################################################################
+# UI
+
+# Navigation Mesh Exporter
+class OBJECT_OT_CustomOperator(bpy.types.Operator):
+    bl_idname = "object.custom_operator"
+    bl_label = "Export Navigation Mesh"
+
+    def execute(self, context):
+        bpy.ops.export.some_data('INVOKE_DEFAULT')
+        return {'FINISHED'}
+
+def submenu_func(self, context):
+    layout = self.layout
+    layout.operator("object.custom_operator")
+
+def menu_func(self, context):
+    layout = self.layout
+
+    # Add a submenu
+    layout.menu("VIEW3D_MT_custom_submenu", text="DALi")
+
+class CustomSubmenu(bpy.types.Menu):
+    bl_idname = "VIEW3D_MT_custom_submenu"
+    bl_label = "DALi"
+
+    def draw(self, context):
+        layout = self.layout
+        layout.operator("object.custom_operator")
+
+def register():
+    bpy.utils.register_class(OBJECT_OT_CustomOperator)
+    bpy.types.VIEW3D_MT_object_context_menu.append(menu_func)
+    bpy.utils.register_class(CustomSubmenu)
+    bpy.utils.register_class(ExportSomeData)
+def unregister():
+    bpy.utils.unregister_class(OBJECT_OT_CustomOperator)
+    bpy.types.VIEW3D_MT_object_context_menu.remove(menu_func)
+    bpy.utils.unregister_class(CustomSubmenu)
+    bpy.utils.unregister_class(ExportSomeData)
+
+# exporter
+class ExportSomeData(bpy.types.Operator):
+    bl_idname = "export.some_data"
+    bl_label = "Export DALi Navigation Mesh"
+
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+
+    @classmethod
+    def poll(cls, context):
+        return context.object is not None
+
+    def execute(self, context):
+        print(self.filepath)
+        navmesh = NavMeshHeader10( self.filepath )
+        navmesh.Process()
+        navmesh.WriteBinary()
+        navmesh.WriteVertices( False )
+        navmesh.WriteEdges()
+        navmesh.WritePolys()
+        navmesh.Finalize()
+        return {'FINISHED'}
+
+    def invoke(self, context, event):
+        context.window_manager.fileselect_add(self)
+        return {'RUNNING_MODAL'}
+
+if __name__ == "__main__":
+    register()
diff --git a/tools/navigation-mesh-exporter/README.md b/tools/navigation-mesh-exporter/README.md
new file mode 100644
index 0000000..fa8be14
--- /dev/null
+++ b/tools/navigation-mesh-exporter/README.md
@@ -0,0 +1,18 @@
+NavigationMeshExporter
+======================
+
+Script for Blender which allows exporting navigation (collision) mesh data.
+
+Register new operator:
+1. Open script in Blender (or copy paste as internal)
+2. Execute
+3. Nothing will happen but new operator will register
+
+Usage:
+
+1. Press RMB on the object to export
+2. Go to "DALi" group
+3. Select "Export Navigation Mesh"
+
+![Popup menu](screen.png)
+
diff --git a/tools/navigation-mesh-exporter/screen.png b/tools/navigation-mesh-exporter/screen.png
new file mode 100644
index 0000000..fda7c01
Binary files /dev/null and b/tools/navigation-mesh-exporter/screen.png differ